diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..1027042a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots (OPTIONAL)**
+If applicable, add screenshots to help explain your problem.
+
+**Logs**
+- Paste the output of the console window in a text file, and attach the text file.
+- If applicable (`logfile` set to 2), attach the `qconsole.log` file. On Windows, it can be found in **%APPDATA%\...\qconsole.log** and on Linux, it can be found on the home directory **~/.openmohaa/.../qconsole.log**.
+
+**Version information (please complete the following information):**
+ - OS: [e.g. `Debian`]
+ - OS Version [e.g `12`]
+ - OpenMoHAA Version: [e.g `0.70.0-alpha+0.0b1a20dcf win_msvc64-x86_64-debug`, can be found below **Common Initialization** in the console, or by typing `version`]
+
+**Dump (OPTIONAL)**
+You can include a core dump generated by the OS (`.dmp` file). If you compiled OpenMoHAA yourself, also add all output openmohaa binaries (except libopenal and libSDL).
+
+**Additional context (OPTIONAL)**
+Add any other context about the problem here.
diff --git a/.github/workflows/branches-build.yml b/.github/workflows/branches-build.yml
new file mode 100644
index 00000000..c3fa846a
--- /dev/null
+++ b/.github/workflows/branches-build.yml
@@ -0,0 +1,17 @@
+name: Build branch
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build-all:
+   uses: ./.github/workflows/shared-build.yml
+   with:
+      environment: "testing"
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
deleted file mode 100644
index a4935463..00000000
--- a/.github/workflows/build-cmake.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-name: Build
-
-on:
-  push:
-  pull_request:
-  workflow_call:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: RelWithDebInfo
-
-jobs:
-  build-platform-linux:
-    strategy:
-      matrix:
-        architecture: [
-          {name: 'amd64',   triple: 'x86_64-linux-gnu'},
-          {name: 'i686',    triple: 'i686-linux-gnu'},
-          {name: 'aarch64', triple: 'aarch64-linux-gnu'},
-          {name: 'armhf',   triple: 'arm-linux-gnueabihf'}
-        ]
-
-    name: "Building for platform linux-${{matrix.architecture.name}}"
-    runs-on: ubuntu-22.04
-
-    steps:
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_BUILD_PARALLEL_LEVEL=$(($(nproc) * 16))" >> $GITHUB_ENV
-#       echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
-
-    - name: Install required packages
-      run: |
-        sudo apt update && sudo apt install -y flex bison
-  
-    - name: Install required cross-platform packages (${{ matrix.architecture.triple }})
-      if: matrix.architecture.name != 'amd64'
-      run: sudo apt install -y gcc-12-${{ matrix.architecture.triple }} g++-12-${{ matrix.architecture.triple }}
-
-    # Setup SDL
-    - name: Set up SDL
-      id: sdl
-      uses: libsdl-org/setup-sdl@main
-      with:
-        version: sdl2-latest
-        build-type: Release
-        cmake-arguments: "-DCMAKE_C_COMPILER=clang
-          -DCMAKE_CXX_COMPILER=clang++
-          -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }}
-          -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }}"
-
-    - uses: actions/checkout@v3
-      with:
-        path: 'source'
-
-    - name: CMake Settings
-      run: |
-        echo "CMAKE_PARAM=--log-level=VERBOSE \
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
-        -DCMAKE_C_COMPILER=clang \
-        -DCMAKE_CXX_COMPILER=clang++ \
-        -DCMAKE_C_FLAGS=--target=${{ matrix.architecture.triple }} \
-        -DCMAKE_CXX_FLAGS=--target=${{ matrix.architecture.triple }} \
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
-
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-    - name: Test
-      working-directory: ${{github.workspace}}
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        cd "${{github.workspace}}/build"
-        ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Install
-      working-directory: ${{github.workspace}}
-      # Install to the directory defined in CMAKE_INSTALL_PREFIX
-      run: |
-        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        cp '${{steps.sdl.outputs.prefix}}/lib/libSDL2.so' '${{github.workspace}}/install'
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: out-linux-${{matrix.architecture.name}}
-        if-no-files-found: error
-        path:
-          ${{github.workspace}}/install
-
-  build-platform-windows:
-    strategy:
-      matrix:
-        architecture: [
-          {name: 'x64',   config: 'x64' },
-          {name: 'x86',   config: 'Win32' },
-          {name: 'arm64', config: 'ARM64' }
-        ]
-
-    name: "Building for platform windows-${{matrix.architecture.name}}"
-    runs-on: windows-2022
-
-    steps:
-    - name: Settings
-      working-directory: ${{github.workspace}}
-      run: |
-        echo "CMAKE_BUILD_PARALLEL_LEVEL=$((Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors * 16)" >> $GITHUB_ENV
-
-        # Setup SDL
-    - name: Set up SDL
-      id: sdl
-      uses: libsdl-org/setup-sdl@main
-      with:
-        version: sdl2-latest
-        build-type: Release
-        cmake-arguments: "-A ${{ matrix.architecture.config }}"
-
-    - name: Install Flex/Bison
-      working-directory: ${{github.workspace}}
-      run: |
-        mkdir thirdparties && cd thirdparties
-        git clone --depth 1 --single-branch --branch v2.5.25 https://github.com/lexxmark/winflexbison.git
-        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
-        cmake --build winflexbison-build --config Release --parallel
-        cmake --install winflexbison-build
-
-    - uses: actions/checkout@v3
-      with:
-        path: 'source'
-
-    - name: CMake Settings
-      run: |
-        echo "CMAKE_PARAM=-A ${{ matrix.architecture.config }} `
-        --log-level=VERBOSE `
-        -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} `
-        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
-        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
-        -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
-        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
-
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
-
-    - name: Build
-      working-directory: ${{github.workspace}}
-      run: |
-        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-
-    - name: Test
-      working-directory: ${{github.workspace}}
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: |
-        cd "${{github.workspace}}/build"
-        ctest -C ${{env.BUILD_TYPE}}
-
-    - name: Install
-      working-directory: ${{github.workspace}}
-      # Install to the directory defined in CMAKE_INSTALL_PREFIX
-      run: |
-        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
-        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/install'
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: out-windows-${{matrix.architecture.name}}
-        if-no-files-found: error
-        path: |
-          ${{github.workspace}}/install
-          !${{github.workspace}}/install/**/*.pdb
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: out-windows-${{matrix.architecture.name}}-pdb
-        if-no-files-found: error
-        path: |
-          ${{github.workspace}}/install
diff --git a/.github/workflows/codeql.yml b/.github/workflows/main-codeql.yml
similarity index 85%
rename from .github/workflows/codeql.yml
rename to .github/workflows/main-codeql.yml
index fc4f71a7..5de08e79 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/main-codeql.yml
@@ -20,6 +20,10 @@ on:
   schedule:
     - cron: '42 8 * * 1'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze
@@ -41,7 +45,13 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required packages
+      with:
+        packages: libopenal-dev libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+        version: "0.1"
 
     # Setup SDL
     - name: Set up SDL
@@ -52,7 +62,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +76,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹī¸ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -79,6 +89,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/shared-build-linux.yml b/.github/workflows/shared-build-linux.yml
new file mode 100644
index 00000000..9bbf28c3
--- /dev/null
+++ b/.github/workflows/shared-build-linux.yml
@@ -0,0 +1,246 @@
+##########################
+#
+# Linux
+# Ubuntu 22.04
+#
+# Using this version instead of 24.04 to use a lower GLIBC version (2.34).
+# ARM is used for more efficiency, and x64 is used for legacy architectures like PowerPC.
+##########################
+name: Linux build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          {name: 'amd64',   os: "ubuntu-22.04-arm", package: 'x86-64-linux-gnu',      triple: 'x86_64-linux-gnu',      arch_option: 'linux-x86_64'},
+          {name: 'i686',    os: "ubuntu-22.04-arm", package: 'i686-linux-gnu',        triple: 'i686-linux-gnu',        arch_option: 'linux-x86'},
+          {name: 'arm64',   os: "ubuntu-22.04-arm", package: 'aarch64-linux-gnu',     triple: 'aarch64-linux-gnu',     arch_option: 'linux-aarch64'},
+          {name: 'armhf',   os: "ubuntu-22.04-arm", package: 'arm-linux-gnueabihf',   triple: 'arm-linux-gnueabihf',   arch_option: 'linux-armv4'},
+          {name: 'powerpc', os: "ubuntu-22.04",     package: 'powerpc-linux-gnu',     triple: 'powerpc-linux-gnu',     arch_option: 'linux-ppc'},
+          {name: 'ppc64',   os: "ubuntu-22.04",     package: 'powerpc64-linux-gnu',   triple: 'powerpc64-linux-gnu',   arch_option: 'linux-ppc64'},
+          {name: 'ppc64el', os: "ubuntu-22.04-arm", package: 'powerpc64le-linux-gnu', triple: 'powerpc64le-linux-gnu', arch_option: 'linux-ppc64le'}
+        ]
+
+    name: "Building for platform linux-${{matrix.architecture.name}}"
+    runs-on: ${{ matrix.architecture.os }}
+    environment: ${{ inputs.environment }}
+    env:
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+        openal-soft-branch: '1.24.3'
+
+    steps:
+    ###
+    # Packages
+    ###
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required packages
+      with:
+        packages: flex bison ninja-build cmake clang libpulse-dev portaudio19-dev libasound2-dev libjack-dev libpipewire-0.3-dev qtbase5-dev libdbus-1-dev
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "HOST_TRIPLE=$(gcc -dumpmachine)" >> $GITHUB_ENV
+
+    - uses: awalsh128/cache-apt-pkgs-action@latest
+      name: Install required cross-platform packages (${{ matrix.architecture.package }})
+      if: env.HOST_TRIPLE != matrix.architecture.triple
+      with:
+        packages: gcc-12-${{ matrix.architecture.package }} g++-12-${{ matrix.architecture.package }}
+        version: "${{ runner.os }}-${{ runner.arch }}-v1"
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+        echo "CFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+        echo "CXXFLAGS='--target=${{ matrix.architecture.triple }}'" >> $GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        # Workaround for when changing the runner OS version
+        cmake-arguments: "-DCACHE_OS_VERSION=Ubuntu_22.04"
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build \
+        -DALSOFT_UTILS=OFF \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # WolfSSL
+    ###
+    - name: Cache WolfSSL
+      id: cache-wolfssl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/wolfssl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
+
+    # WolfSSL setup
+    - name: Checkout WolfSSL
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'wolfssl/wolfssl'
+        path: 'thirdparties/wolfssl'
+        ref: '${{ env.wolfssl-version }}'
+
+    # WolfSSL build
+    - name: Configure and install wolfssl
+      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/wolfssl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl/install' \
+            -DCMAKE_C_FLAGS="$CFLAGS -fPIC" \
+            -DCMAKE_CXX_FLAGS="$CFLAGS -fPIC" \
+            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=ON \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DCMAKE_SHARED_LINKER_FLAGS="-lm" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl/install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM=--log-level=VERBOSE \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Copy libraries
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.so.0 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.so.1 '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.so.4 '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
+
+    ###
+    # Artifacts
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-linux-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path:
+          ${{github.workspace}}/package
\ No newline at end of file
diff --git a/.github/workflows/shared-build-macos.yml b/.github/workflows/shared-build-macos.yml
new file mode 100644
index 00000000..d4ba04c1
--- /dev/null
+++ b/.github/workflows/shared-build-macos.yml
@@ -0,0 +1,239 @@
+##########################
+#
+# Apple macOS
+# macOS 15
+#
+# This version is used as the OS, as it's faster than other versions.
+##########################
+name: MacOS build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          #{name: 'x86_64',   triple: 'x86_64-apple-macos10.8'},
+          #{name: 'arm64',    triple: 'arm64-apple-macos11'}
+          #{name: 'x86_64',    build_name: 'x86_64'},
+          #{name: 'arm64',     build_name: 'arm64'},
+          # Compile into an universal binary
+          {name: 'multiarch(arm64-x86_64)', build_name: 'arm64;x86_64' }
+        ]
+
+    name: "Building for platform macos-${{matrix.architecture.name}}"
+    runs-on: "macos-15"
+    env:
+        openal-soft-branch: '1.24.3'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+
+    steps:
+    ###
+    # Packages
+    ###
+
+    - name: Install required packages
+      run: |
+        brew install git flex bison ninja cmake llvm perl
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $GITHUB_ENV
+        echo "CC=clang" >> $GITHUB_ENV
+        echo "CXX=clang++" >> $GITHUB_ENV
+        echo "MACOSX_DEPLOYMENT_TARGET=10.15" >> $GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        cmake-arguments: "-DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}'
+          -DCMAKE_VERBOSE_MAKEFILE=on"
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    # Use GCC instead of Clang because of missing SSE intrinsics
+    # It also doesn't enable altivec support on PowerPC by default
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    # soft-oal build
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+        -DCMAKE_VERBOSE_MAKEFILE=on
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # WolfSSL
+    ###
+# FIXME: Figure out how to compile WolfSSL cross-architecture
+#
+#    - name: Cache WolfSSL
+#      id: cache-wolfssl
+#      uses: actions/cache@v4
+#      with:
+#        path: 'thirdparties/wolfssl_install'
+#        key: ${{ runner.os }}-${{ matrix.architecture.name }}-wolfssl-${{ env.wolfssl-version }}-v1
+#
+#    # WolfSSL setup
+#    - name: Checkout WolfSSL
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      uses: actions/checkout@v4
+#      with:
+#        repository: 'wolfssl/wolfssl'
+#        path: 'thirdparties/wolfssl'
+#        ref: '${{ env.wolfssl-version }}'
+#
+#    # WolfSSL build
+#    - name: Configure and install wolfssl
+#      if: steps.cache-wolfssl.outputs.cache-hit != 'true'
+#      working-directory: ${{github.workspace}}/thirdparties/wolfssl
+#      run: |
+#        cmake -B ./build \
+#            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/wolfssl_install' \
+#            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+#            -DBUILD_SHARED_LIBS=OFF -DWOLFSSL_OPENSSLEXTRA=ON -DWOLFSSL_ASM=OFF -DWOLFSSL_EXAMPLES=OFF -DWOLFSSL_CURL=ON
+#        cmake --build ./build --config Release --parallel
+#        cmake --install ./build --config Release
+
+    ###
+    # cURL
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build \
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' \
+            -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+            -DCURL_USE_LIBPSL=OFF \
+            -DCURL_USE_WOLFSSL=OFF \
+            -DCURL_USE_LIBSSH2=OFF \
+            -DUSE_LIBIDN2=OFF \
+            -DUSE_NGHTTP2=OFF \
+            -DCURL_ENABLE_SSL=OFF \
+            -DCURL_ZLIB="" \
+            -DCURL_BROTLI="" \
+            -DCURL_ZSTD="" \
+            -DWolfSSL_ROOT='${{github.workspace}}/thirdparties/wolfssl_install'
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM=--log-level=VERBOSE \
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' \
+        -DCMAKE_VERBOSE_MAKEFILE=on \
+        -DCMAKE_OSX_ARCHITECTURES='${{ matrix.architecture.build_name }}' \
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal/install' \
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include/AL' \
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' \
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} \
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'" >> $GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        # Create hard-link and copy symbolic links
+        mkdir ${{github.workspace}}/package
+        cp -l ${{steps.sdl.outputs.prefix}}/lib/libSDL2-2.0.0.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/soft-oal/install/lib/libopenal.1.dylib '${{github.workspace}}/package/'
+        cp -l ${{github.workspace}}/thirdparties/curl/install/lib*/libcurl.4.dylib '${{github.workspace}}/package/'
+        if [ -d ${{github.workspace}}/install/bin ]; then cp -r ${{github.workspace}}/install/bin/openmohaa/. '${{github.workspace}}/package'; fi
+        if [ -d ${{github.workspace}}/install/lib ]; then cp -r ${{github.workspace}}/install/lib/openmohaa/. '${{github.workspace}}/package'; fi
+
+    ###
+    # Artifacts
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-macos-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path:
+          ${{github.workspace}}/package
diff --git a/.github/workflows/shared-build-windows.yml b/.github/workflows/shared-build-windows.yml
new file mode 100644
index 00000000..6aa11ad6
--- /dev/null
+++ b/.github/workflows/shared-build-windows.yml
@@ -0,0 +1,259 @@
+##########################
+#
+# Microsoft Windows
+# Windows Server 2025
+#
+##########################
+name: Windows build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+        
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: RelWithDebInfo
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        architecture: [
+          {name: 'x64',   os: 'windows-2025',   config: 'x64',    toolset: 'x64',        arch_option: 'VC-WIN64A'    },
+          {name: 'x86',   os: 'windows-2025',   config: 'Win32',  toolset: 'x64_x86',    arch_option: 'VC-WIN32'     },
+          {name: 'arm64', os: 'windows-11-arm', config: 'ARM64',  toolset: 'x64_arm64',  arch_option: 'VC-WIN64-ARM' }
+        ]
+
+    name: "Building for platform windows-${{matrix.architecture.name}}"
+    runs-on: ${{ matrix.architecture.os }}
+    environment: ${{ inputs.environment }}
+    env:
+        flexbison-branch: 'v2.5.25'
+        wolfssl-version: 'v5.7.6-stable'
+        curl-version: '8_12_1'
+        openal-soft-branch: '1.24.3'
+
+    steps:
+    ###
+    # Packages
+    ###
+
+    - name: Cache Flex/Bison
+      id: cache-flexbison
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/winflexbison-install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-flexbison-${{ env.flexbison-branch }}-v1
+
+    - name: Install Flex/Bison
+      if: steps.cache-flexbison.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}
+      run: |
+        mkdir thirdparties && cd thirdparties
+        git clone --depth 1 --single-branch --branch ${{ env.flexbison-branch }} https://github.com/lexxmark/winflexbison.git
+        cmake -B winflexbison-build -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/winflexbison-install' ./winflexbison
+        cmake --build winflexbison-build --config Release --parallel
+        cmake --install winflexbison-build --config Release
+
+    - name: Settings
+      working-directory: ${{github.workspace}}
+      run: |
+        echo "CMAKE_GENERATOR=Ninja Multi-Config" >> $env:GITHUB_ENV
+        echo "CC=cl.exe" >> $env:GITHUB_ENV
+        echo "CXX=cl.exe" >> $env:GITHUB_ENV
+        pushd "$($env:PROGRAMFILES)\Microsoft Visual Studio\*\*\VC\Auxiliary\Build"
+        cmd /c "vcvarsall.bat ${{ matrix.architecture.toolset }} & set" | ForEach-Object {
+          if ($_ -match "=") {
+            # Split into key=value
+            $var = $_.split("=", 2);
+            echo "$($var[0])=$($var[1])" >> $env:GITHUB_ENV
+          }
+        }
+        popd
+
+    - name: Cache Required Packages
+      id: cache-required-packages
+      uses: actions/cache@v4
+      with:
+        path: 'C:\Packages'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-required-packages-v1
+
+    - name: Install required packages
+      if: steps.cache-required-packages.outputs.cache-hit != 'true'
+      run: |
+        $DownloadPath="$($env:USERPROFILE)\Downloads"
+        if ("${{ matrix.architecture.config }}" -ieq "ARM64") {
+          Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-winarm64.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        } else {
+          Invoke-WebRequest "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "$DownloadPath\ninja-win.zip"
+        }
+        Expand-Archive -Path "$DownloadPath\ninja-win.zip" -DestinationPath "C:\Packages\ninja"
+        Invoke-WebRequest "https://download.qt.io/official_releases/jom/jom.zip" -OutFile "$DownloadPath\jom.zip"
+        Expand-Archive -Path "$DownloadPath\jom.zip" -DestinationPath "C:\Packages\jom"
+
+    - name: Setup required packages path
+      run: |
+        $env:PATH += ";C:\Packages\ninja;C:\Packages\jom;"
+        echo "PATH=$($env:PATH)" >> $env:GITHUB_ENV
+
+    ###
+    # SDL
+    ###
+
+    # Setup SDL
+    - name: Set up SDL
+      id: sdl
+      uses: libsdl-org/setup-sdl@main
+      with:
+        version: 2-latest
+        build-type: Release
+        cmake-arguments: ""
+
+    ###
+    # OpenAL
+    ###
+    - name: Cache OpenAL
+      id: cache-openal-soft
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/soft-oal/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-openal-soft-${{ env.openal-soft-branch }}-v1
+
+    # soft-oal setup
+    - name: Checkout soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'kcat/openal-soft'
+        path: 'thirdparties/soft-oal'
+        ref: '${{ env.openal-soft-branch }}'
+
+    # soft-oal build
+    # Statically link the CRT runtime into OAL as a workaround to prevent crashes
+    - name: Configure and install soft-oal
+      if: steps.cache-openal-soft.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/soft-oal
+      run: |
+        cmake -B ./build `
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/soft-oal/install' `
+        -DALSOFT_BUILD_ROUTER=OFF `
+        -DALSOFT_REQUIRE_WINMM=ON `
+        -DALSOFT_REQUIRE_DSOUND=ON `
+        -DALSOFT_REQUIRE_WASAPI=ON `
+        -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_MINSIZEREL="/MT /O2 /Ob2 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_MINSIZEREL="/MT /O1 /Ob1 /DNDEBUG" `
+        -DCMAKE_C_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG" `
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /Zi /O2 /Ob1 /DNDEBUG"
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+        # Unfortunately soft-oal produces a binary called OpenAL32 even in 64-bit
+        if (("x64", "ARM64") -icontains "${{ matrix.architecture.config }}") { Rename-Item -Path '.\install\bin\OpenAL32.dll' -NewName 'OpenAL64.dll' }
+
+    ###
+    # cURL
+    #
+    # Uses Schannel as SSL backend, native CAs are used
+    ###
+    - name: Cache cURL
+      id: cache-curl
+      uses: actions/cache@v4
+      with:
+        path: 'thirdparties/curl/install'
+        key: ${{ runner.os }}-${{ matrix.architecture.name }}-curl-${{ env.curl-version }}-v1
+
+    # cURL setup
+    - name: Checkout cURL
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      uses: actions/checkout@v4
+      with:
+        repository: 'curl/curl'
+        path: 'thirdparties/curl'
+        ref: 'curl-${{ env.curl-version }}'
+
+    # cURL build
+    - name: Configure and install curl
+      if: steps.cache-curl.outputs.cache-hit != 'true'
+      working-directory: ${{github.workspace}}/thirdparties/curl
+      run: |
+        cmake -B ./build `
+            -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/thirdparties/curl/install' `
+            -DCURL_USE_LIBPSL=OFF `
+            -DCURL_USE_SCHANNEL=ON
+        cmake --build ./build --config Release --parallel
+        cmake --install ./build --config Release
+
+    ###
+    # Project
+    ###
+
+    - uses: actions/checkout@v4
+      with:
+        path: 'source'
+
+    - name: CMake Settings
+      run: |
+        echo "CMAKE_PARAM= `
+        --log-level=VERBOSE `
+        -DCMAKE_INSTALL_PREFIX='${{github.workspace}}/install' `
+        -DGIT_REVISION_BUILD_NUMBER=${{ github.run_number }} `
+        -DBISON_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_bison.exe' `
+        -DOPENAL_LIBRARY='${{github.workspace}}/thirdparties/soft-oal' `
+        -DOPENAL_INCLUDE_DIR='${{github.workspace}}/thirdparties/soft-oal/install/include' `
+        -DCURL_ROOT='${{github.workspace}}/thirdparties/curl/install' `
+        -DFLEX_EXECUTABLE='${{github.workspace}}/thirdparties/winflexbison-install/win_flex.exe' `
+        -DPRODUCT_VERSION_STAGE='${{ env.RELEASE_STAGE }}'".Replace("`r", "").Replace("`n", "") >> $env:GITHUB_ENV
+
+    - name: Configure CMake
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake -B ./build ${{ env.CMAKE_PARAM }} ./source
+
+    - name: Build
+      working-directory: ${{github.workspace}}
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel
+
+    - name: Test
+      working-directory: ${{github.workspace}}
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: |
+        cd "${{github.workspace}}/build"
+        ctest -C ${{env.BUILD_TYPE}}
+
+    - name: Install
+      working-directory: ${{github.workspace}}
+      # Install to the directory defined in CMAKE_INSTALL_PREFIX
+      run: |
+        cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        New-Item -ItemType Directory '${{github.workspace}}/package'
+        Copy-Item '${{steps.sdl.outputs.prefix}}/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/soft-oal/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        Copy-Item '${{github.workspace}}/thirdparties/curl/install/bin/*.dll' -Destination '${{github.workspace}}/package'
+        if (Test-Path ${{github.workspace}}/install/bin) { Copy-Item '${{github.workspace}}/install/bin/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
+        if (Test-Path ${{github.workspace}}/install/lib) { Copy-Item '${{github.workspace}}/install/lib/*' -Include '*.dll','*.exe','*.pdb' -Destination '${{github.workspace}}/package' }
+
+    ###
+    # Artifact
+    ###
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-windows-${{matrix.architecture.name}}
+        if-no-files-found: error
+        path: |
+          ${{github.workspace}}/package
+          !${{github.workspace}}/package/**/*.pdb
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: out-windows-${{matrix.architecture.name}}-pdb
+        if-no-files-found: error
+        path: |
+          ${{github.workspace}}/package
\ No newline at end of file
diff --git a/.github/workflows/shared-build.yml b/.github/workflows/shared-build.yml
new file mode 100644
index 00000000..3bac5e21
--- /dev/null
+++ b/.github/workflows/shared-build.yml
@@ -0,0 +1,24 @@
+name: Shared build workflow
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+
+jobs:
+  build-platform-linux:
+    uses: ./.github/workflows/shared-build-linux.yml
+    with:
+      environment: ${{inputs.environment}}
+
+  build-platform-windows:
+    uses: ./.github/workflows/shared-build-windows.yml
+    with:
+      environment: ${{inputs.environment}}
+
+  build-platform-macos:
+    uses: ./.github/workflows/shared-build-macos.yml
+    with:
+      environment: ${{inputs.environment}}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/tags-publish-release.yml
similarity index 59%
rename from .github/workflows/publish-release.yml
rename to .github/workflows/tags-publish-release.yml
index 1ff4bcd0..a1d44b74 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/tags-publish-release.yml
@@ -6,7 +6,7 @@ on:
         - "v*.*.*"
 
 env:
-  RELEASE_TYPE: ${{ vars.RELEASE_TYPE || 'test' }}
+  RELEASE_STAGE: ${{ vars.RELEASE_STAGE || 'unstable' }}
   RELEASE_IS_PRERELEASE: ${{ vars.RELEASE_IS_PRELEASE }}
 
 permissions:
@@ -14,7 +14,9 @@ permissions:
 
 jobs:
   build-all:
-   uses: ./.github/workflows/build-cmake.yml
+   uses: ./.github/workflows/shared-build.yml
+   with:
+      environment: "release"
 
   deploy_all:
     strategy:
@@ -25,36 +27,42 @@ jobs:
         target_os: [
           'linux-amd64',
           'linux-i686',
-          'linux-aarch64',
+          'linux-arm64',
           'linux-armhf',
+          'linux-powerpc',
+          'linux-ppc64',
+          'linux-ppc64el',
           'windows-x64',
-          'windows-x86',
           'windows-x64-pdb',
+          'windows-x86',
           'windows-x86-pdb',
           'windows-arm64',
-          'windows-arm64-pdb'
+          'windows-arm64-pdb',
+          #'macos-x86_64',
+          #'macos-arm64',
+          'macos-multiarch(arm64-x86_64)',
         ]
 
-    runs-on: ubuntu-22.04
-    environment: release
+    runs-on: ubuntu-24.04
+    environment: "release"
     needs: [build-all]
 
     env:
       RELEASE_NAME: ${{ github.event.repository.name }}-${{github.ref_name}}-${{matrix.target_os}}
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: 'out-${{matrix.target_os}}'
         path: ${{github.workspace}}/${{matrix.target_os}}
 
     - name: Zip
-      working-directory: ${{github.workspace}}/${{matrix.target_os}}
-      run: zip -r ../${{ env.RELEASE_NAME }}.zip ./
+      working-directory: '${{github.workspace}}/${{matrix.target_os}}'
+      run: zip -r "../${{ env.RELEASE_NAME }}.zip" ./
 
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
-        name: '${{github.ref_name}}-${{env.RELEASE_TYPE}}'
+        name: '${{github.ref_name}}-${{env.RELEASE_STAGE}}'
         prerelease: ${{env.RELEASE_IS_PRERELEASE}}
         files: ${{github.workspace}}/${{ env.RELEASE_NAME }}.zip
diff --git a/.gitignore b/.gitignore
index d5cccbae..642e22a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ Makefile.local
 *.swp
 *tags
 *~
+/.vscode/
+/baseq3
 
 # OS X
 ####################
@@ -44,5 +46,6 @@ profile
 *.suo
 
 .vs
-out
 code_unfinished/*
+thirdparties/
+code/parser/generated/*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0b248ae..ba983bc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,69 +1,164 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(openmohaa)
 
-include(TargetArch.cmake)
+include(misc/cmake/TargetArch.cmake)
 
 target_architecture(TARGET_ARCH)
+list(LENGTH TARGET_ARCH TARGET_ARCH_COUNT)
 
+set(USE_INTERNAL_LIBS ON)
+if(USE_SYSTEM_LIBS)
+	set(USE_INTERNAL_LIBS OFF)
+endif()
+
+option(USE_INTERNAL_JPEG "If set, use bundled libjpeg." ${USE_INTERNAL_LIBS})
+option(USE_INTERNAL_MAD  "If set, use bundled libmad."  ${USE_INTERNAL_LIBS})
+option(USE_INTERNAL_ZLIB "If set, use bundled zlib."    ${USE_INTERNAL_LIBS})
+option(USE_RENDERER_DLOPEN "Whether to compile the renderer as separate pluggable modules" OFF)
+option(TARGET_LOCAL_SYSTEM "Indicate that the project will be compiled and installed for the local system" OFF)
 
 if(TARGET_GAME_TYPE)
 	message(SEND_ERROR "TARGET_GAME_TYPE is now unsupported, it is now done at runtime.")
 endif()
 
-
-set(TARGET_BASE_GAME "main")
+set(TARGET_BASE_GAME "./")
 set(CMAKE_DEBUG_POSTFIX "-dbg")
 
+#
+# Microsoft compiler specific parameters
+#
 if(MSVC)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	# Treat no return type as error
+	add_compile_options(/we4715)
+endif()
+
+#
+# Clang and GCC specific parameters
+#
+if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	add_compile_options(-Wno-comment)
+	# Treat no return type as error
+	add_compile_options(-Werror=return-type)
+endif()
+
+#
+# Clang specific parameters
+#
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# Ignore warnings for code like 'assert("Assert string")'
 	add_compile_options(-Wno-pointer-bool-conversion)
 endif()
 
+#
+# GCC specific parameters
+#
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+	# Add this option on gcc to prevent functions from having the STB_GNU_UNIQUE binding
+	# Otherwise, it would prevent libraries from being unloaded
+	# which will cause undefined behavior and crashes due to memory corruption
+	add_compile_options(-fno-gnu-unique)
+endif()
+
 if(DEBUG_MEMORY)
 	add_definitions(-D_DEBUG_MEM)
 endif()
 
-IF("${TARGET_ARCH}" STREQUAL "i386")
+if("${TARGET_ARCH}" STREQUAL "i386")
 	set(TARGET_ARCH_SUFFIX "x86")
-ELSE()
+else()
 	set(TARGET_ARCH_SUFFIX ${TARGET_ARCH})
-ENDIF()
+endif()
 
-message(STATUS "Architecture detected: ${TARGET_ARCH}, suffix set to ${TARGET_ARCH_SUFFIX}.")
+message(STATUS "Architecture detected: ${TARGET_ARCH}")
 
-IF(WIN32)
+if(TARGET_LOCAL_SYSTEM)
+	add_definitions(-DTARGET_LOCAL_SYSTEM)
+	# As it targets the local system, no need to know about the architecture used
+	set(TARGET_BIN_SUFFIX "")
+	message(STATUS "Binary suffix will not be used as the local system is the target")
+elseif(${TARGET_ARCH_COUNT} GREATER 1)
+	add_definitions(-DTARGET_MULTIPLE_ARCHITECTURES)
+	set(TARGET_BIN_SUFFIX ".multiarch")
+	message(STATUS "Multiple architectures were specified, suffix set to 'multiarch'.")
+else()
+	set(TARGET_BIN_SUFFIX ".${TARGET_ARCH}")
+	message(STATUS "Binary suffix set to '${TARGET_ARCH_SUFFIX}'.")
+endif()
+
+if(WIN32)
 	set(TARGET_PLATFORM_PREFIX "")
 	message(STATUS "Using Win32 naming convention")
-ELSEIF(UNIX)
+elseif(UNIX)
 	set(TARGET_PLATFORM_PREFIX "")
 	message(STATUS "Using Unix naming convention")
-ELSE()
+else()
 	set(TARGET_PLATFORM_PREFIX "")
-ENDIF()
+endif()
 
-IF(CMAKE_BUILD_TYPE MATCHES Debug)
-	add_definitions(-D_DEBUG)
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+	add_compile_definitions(_DEBUG)
 
+	# NOTE: The following may mess up function importation
 	#if(UNIX)
 	#	# Enable all exports so all functions name can be seen during executable crash
 	#	set(CMAKE_ENABLE_EXPORTS ON)
 	#	message(STATUS "Enabling exports on Unix for backtrace")
 	#endif()
-ENDIF()
+else()
+	# Non-debug builds
+	add_compile_definitions(NDEBUG)
+endif()
 
+if(APPLE)
+	# macOS doesn't search the executable path by default
+	# so, locate libraries like SDL in the executable path
+	set(CMAKE_INSTALL_RPATH "@executable_path")
+	set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+
+	if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
+		# Set the visibility to hidden on macOS to prevent shared libraries from
+		# using functions in the executable
+		# it's ok to hide them because the backtrace on macOS will still print the name of the functions
+		add_compile_options(-fvisibility=hidden)
+	endif()
+endif()
+
+#
+# Setup the installation directory
+#
+if(WIN32)
+	# By default, both DLLs and EXEs are in the same directory
+	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR bin)
+	set(BIN_INSTALL_SUBDIR ".")
+	set(LIB_INSTALL_SUBDIR ".")
+else()
+	# Unix
+	set(CMAKE_DEFAULT_INSTALL_RUNTIME_DIR lib${CMAKE_LIB_SUFFIX})
+	set(BIN_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
+	set(LIB_INSTALL_SUBDIR ${CMAKE_PROJECT_NAME})
+endif()
+
+# By default, put both binaries and shared libraries in the same directory
+# the game uses internal shared libraries that must be in the same folder as the binaries
+set(CMAKE_INSTALL_BINDIR ${CMAKE_DEFAULT_INSTALL_RUNTIME_DIR} CACHE PATH "Binary dir")
+set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Library dir")
+include(GNUInstallDirs)
+
+#
 # Common stuff
-
+#
 add_subdirectory("code/qcommon")
 add_subdirectory("code/gamespy")
 
+#
 # Application
-
+#
 add_subdirectory("code/sys")
 
+##
 ## Server app
+##
 add_subdirectory("code/server")
 
 add_executable(omohaaded "code/null/null_client.c" "code/null/null_input.c" "code/null/null_snddma.c")
@@ -73,57 +168,105 @@ target_compile_features(omohaaded PUBLIC c_variadic_macros)
 target_link_libraries(omohaaded PRIVATE omohserver)
 target_link_libraries(omohaaded PRIVATE syslib)
 target_link_libraries(omohaaded PRIVATE qcommon qcommon_standalone)
-# Gamespy dependency
+
+# Add the gamespy dependency
 target_include_directories(omohaaded PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server")
-set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+set_target_properties(omohaaded PROPERTIES OUTPUT_NAME "omohaaded${TARGET_BIN_SUFFIX}")
 set_target_properties(omohaaded PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
+INSTALL(TARGETS omohaaded DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+
 if (MSVC)
 	target_link_options(omohaaded PRIVATE "/MANIFEST:NO")
-	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION "./" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:omohaaded> DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR} OPTIONAL)
 endif()
 
-INSTALL(TARGETS omohaaded DESTINATION "./")
-
 if (NOT BUILD_NO_CLIENT)
+	##
 	## Client app
+	##
+	option(NO_MODERN_DMA "Use older sound-system" FALSE)
 
-	add_subdirectory("code/renderer")
-	add_subdirectory("code/sdl")
 	add_subdirectory("code/client")
-
-	#include("code/renderergl2/glsl/shaders.cmake")
-	#file(GLOB_RECURSE SOURCES_RENDERER "code/sdl/*.c" "code/renderercommon/*.c" "code/renderergl2/*.c" "code/renderergl2/*.cpp")
-	#list(FILTER SOURCES_RENDERER EXCLUDE REGEX "code/renderergl2/tr_subs.c")
-	#list(FILTER SOURCES_RENDERER EXCLUDE REGEX "code/renderergl2/tr_model.c")
+	add_subdirectory("code/renderercommon")
+	add_subdirectory("code/sdl")
 
 	add_executable(openmohaa "misc/dummy.c")
 	target_link_libraries(openmohaa PRIVATE syslib)
 	target_link_libraries(openmohaa PRIVATE omohserver)
 	target_link_libraries(openmohaa PRIVATE omohclient)
-	target_link_libraries(openmohaa PRIVATE omohrenderer omohsdl)
+	target_link_libraries(openmohaa PRIVATE omohrenderer)
 	target_link_libraries(openmohaa PRIVATE qcommon qcommon_standalone)
 
-	### Gamespy dependency
-	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib" "code/jpeg-8c")
-	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BASE_SUFFIX}${TARGET_ARCH_SUFFIX}")
+	# Add the gamespy dependency
+	target_include_directories(openmohaa PUBLIC "code/qcommon" "code/script" "code/gamespy" "code/server" "code/client" "code/uilib")
+	set_target_properties(openmohaa PROPERTIES OUTPUT_NAME "openmohaa${TARGET_BIN_SUFFIX}")
 	set_target_properties(openmohaa PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
 
-	target_link_libraries(openmohaa PRIVATE jpeg8)
-	if (USE_OPENAL)
-		# Try to use OpenAL
-		find_package(OpenAL)
-		if (OPENAL_FOUND)
-			target_compile_definitions(openmohaa PRIVATE USE_OPENAL=1)
-			target_include_directories(openmohaa PRIVATE ${OPENAL_INCLUDE_DIR})
-			target_link_libraries(openmohaa PRIVATE ${OPENAL_LIBRARY})
-		endif()
+	if(USE_INTERNAL_JPEG)
+		target_include_directories(openmohaa PUBLIC "code/jpeg-8c")
+		target_link_libraries(openmohaa PRIVATE jpeg8)
+	else()
+		find_package(JPEG REQUIRED)
+		target_include_directories(openmohaa PUBLIC ${JPEG_INCLUDE_DIRS})
+		target_link_libraries(openmohaa PRIVATE ${JPEG_LIBRARIES})
 	endif()
 
+	INSTALL(TARGETS openmohaa DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+
 	if (MSVC)
 		target_link_options(openmohaa PRIVATE "/MANIFEST:NO")
-		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION "./" OPTIONAL)
+		INSTALL(FILES $<TARGET_PDB_FILE:openmohaa> DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR} OPTIONAL)
 	endif()
 
-	INSTALL(TARGETS openmohaa DESTINATION "./")
+	if(UNIX AND NOT APPLE)
+		#
+		# Desktop entries installation on Unix
+		#
+		set(TARGET_ARCH ${TARGET_BIN_SUFFIX})
+
+		# Configure the .desktop entries with the arch suffix
+		configure_file(
+			misc/linux/org.openmoh.openmohaa.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop
+			@ONLY
+		)
+		configure_file(
+			misc/linux/org.openmoh.openmohaab.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop
+			@ONLY
+		)
+		configure_file(
+			misc/linux/org.openmoh.openmohaas.desktop.in
+			${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop
+			@ONLY
+		)
+
+		# Install .desktop entries
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaa.desktop  DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaab.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+		install(FILES ${CMAKE_BINARY_DIR}/misc/linux/org.openmoh.openmohaas.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
+		install(FILES misc/linux/org.openmoh.openmohaa.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
+
+		install(FILES misc/openmohaa.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/symbolic/apps/ RENAME org.openmoh.openmohaa.svg)
+	endif()
+endif()
+
+#
+# Launcher
+#
+add_subdirectory(code/Launcher)
+
+#
+# uninstall target
+#
+if(NOT TARGET uninstall)
+  configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+  add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
 endif()
diff --git a/README.md b/README.md
index d80136c2..9d221b94 100644
--- a/README.md
+++ b/README.md
@@ -1,130 +1,63 @@
 # OpenMoHAA
 
-![Build](https://github.com/openmoh/openmohaa/actions/workflows/build-cmake.yml/badge.svg?branch=main) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
+[![Build](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml/badge.svg?branch=main)](https://github.com/openmoh/openmohaa/actions/workflows/branches-build.yml) [![Release](https://img.shields.io/github/v/release/openmoh/openmohaa)](https://github.com/openmoh/openmohaa/releases) [![Downloads](https://img.shields.io/github/downloads/openmoh/openmohaa/total)](https://github.com/openmoh/openmohaa/releases)
 
 ![License](https://img.shields.io/github/license/openmoh/openmohaa) ![Commits](https://img.shields.io/github/commit-activity/t/openmoh/openmohaa)
 
 ![Discord](https://img.shields.io/discord/596049712579215361?logo=discord&logoColor=white&color=5865F2)
 
+![logo](misc/openmohaa-text-sm.png)
 
-```
-     / _ \ _ __   ___ _ __ |  \/  |/ _ \| | | |  / \      / \
-    | | | | '_ \ / _ \ '_ \| |\/| | | | | |_| | / _ \    / _ \
-    | |_| | |_) |  __/ | | | |  | | |_| |  _  |/ ___ \  / ___ \
-     \___/| .__/ \___|_| |_|_|  |_|\___/|_| |_/_/   \_\/_/   \_\
-          |_|
-```
+## Intro
 
-## Current State
+The main goal of OpenMoHAA is to ensure the future and continuity of **Medal of Honor: Allied Assault** (including Spearhead and Breakthrough expansions) on all platforms/architectures by providing new patches/features. Thanks to the ioquake3 project and the F.A.K.K SDK, OpenMoHAA has already reached more than half of its goal: an open-source version of MoH:AA (based on version 2.40) that is fully compatible with both the original game and expansions, in terms of network protocol, assets, and scripts. OpenMoHAA is compatible with both MOH:AA servers and clients (Spearhead and Breakthrough included).
 
-OpenMoHAA is still under development. The single-player campaign is not yet functional due to AI not being fully implemented, and due to the script engine having a few issues. But the `training` map can be played from start to end. The current focus is on multiplayer.
+## Getting started
 
-## Running
+- [Downloading and installing OpenMoHAA](docs/getting_started_installation.md)
+- [Running OpenMoHAA and using expansion assets](docs/getting_started_running.md)
+- [Game configuration](docs/configuration.md)
 
-Backup existing mohaa files, **cgamex86.dll** and **gamex86.dll** (set their extension to **.bak**)
+If you encounter any issues, please refer to the [FAQ](docs/faq.md) for possible solutions.
 
-a) extract archive to your MOHAA installation directory.
+## Current state
 
--or-
+### Single-player
 
-b) Copy all pak*.pk3 files and the sound/ directory from your **MOHAA/main** directory into openmohaa's 'main' directory.
+The entire single-player campaign should work (Allied Assault, Spearhead and Breakthrough). If you encounter any bug, please create a new [GitHub issue](https://github.com/openmoh/openmohaa/issues) describing them.
 
-If you have problems running the game :
+### Multiplayer
 
-You may need to install Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from
+The Multiplayer part is almost fully stable, all game modes including `Tug-of-War` from Medal of Honor: Spearhead, and `Liberation` from Medal of Honor: Breakthrough are implemented and are working as intended. Mods like `Freeze-Tag` are working as well.
 
-https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170
+OpenMoHAA can be used to [host](docs/getting_started_installation.md#server) a mohaa/mohaas/mohaab server and players can use OpenMoHAA to [play](docs/getting_started_installation.md#client) on any server. If some bugs/strange behavior occurs, the best way to report them is by [creating a new issue](https://github.com/openmoh/openmohaa/issues) on the [OpenMoHAA GitHub](https://github.com/openmoh/openmohaa) project with the steps to reproduce (with eventually the problematic mods).
 
-You can now start a local OpenMOHAA server or play on a server.
+One of the big multiplayer features are bots. They were introduced for testing and for entertainment purposes so players can have fun alone. See [Configuring bots](docs/configuration/server.md#bots) in the dedicated server configuration documentation to set them up.
 
-**Medal of Honor: Allied Assault Spearhead** and **Medal of Honor: Allied Assault Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable. To play an expansion, append the following command-line arguments to the executable:
+## Features
 
-- `+set com_target_game 1` for Spearhead (mohaas/mohta)
-- `+set com_target_game 2` for Breakthrough (mohaab/mohtt)
+- [List of new features](docs/features.md)
+- [Scripting](docs/scripting.md)
 
-On Windows, you can create a shortcut to OpenMoHAA with these command-line arguments.
-The default value of `com_target_game` is 0 for the base game.
+## Reporting issues
 
-With `com_target_game`, OpenMoHAA will support the network protocol accordingly
+If you encounter a bug, report it by creating a new [issue](https://github.com/openmoh/openmohaa/issues). Make sure to select the `Bug report` template and fill in the appropriate fields.
 
-### Playing with bots
-
-OpenMoHAA has a basic bot system that emulates real players. The maximum number of bots is defined by the `sv_maxbots` variable, and the number of initial bots is defined by the `sv_numbots` variable. Bots can also be added or removed using the `addbot` and `removebot` commands.
-
-This feature is a great way to test the gameplay and mods.
-
-## Builds
-
-### Server
-
-The server version can be built successfully, but some features are not functional. For example, the Actor and Vehicle systems are almost fully implemented, but they are not yet stable. This means that they may not work as expected and could cause crashes.
-
-Overall, the server and the fgame components are almost fully implemented, but they may not be completely stable. There could be some minor bugs (and rare crashes), but the game should be playable.
-
-### Client
-
-The client version of OpenMoHAA has undergone partial implementation, with the cgame module being nearly completed. Credits to the SDK of **Heavy Metal: F.A.K.K. 2** both the cgame and fgame modules.
-
-The current operational status for each component is as follow:
-
-| Component               | Full | Almost | Half | Early | Bad | Not working | Comment                                                           |
-|-------------------------|------|--------|------|-------|-----|-------------|-------------------------------------------------------------------|
-| Audio                   |      |        |      |       | x   |             | Very basic implementation from Quake III                          |
-| CG Module               |      | x      |      |       |     |             | Missing FX, Marks and decals                                      |
-| Client                  |      | x      |      |       |     |             | Missing GameSpy, server list, binds, map picker, ...              |
-| Collision               | x    |        |      |       |     |             |                                                                   |
-| Model/TIKI/Skeletor     | x    |        |      |       |     |             |                                                                   |
-| Renderer                |      | x      |      |       |     |             | Missing ghost, marks, sphere lights, sky portal, sun flare, swipe |
-| Server                  |      | x      |      |       |     |             | Probably a few bugs remaining                                     |
-| Server module (fgame)   |      | x      |      |       |     |             | Actor, vehicle, and few gameplay bugs                             |
-| UI                      |      |        | x    |       |     |             | Has core features only (menu, widgets, console, hud, urc loading) |
+If you need help or have a problem, you can head over to the [discussions](https://github.com/openmoh/openmohaa/discussions) or join the OpenMoHAA Discord server (the link is at the bottom of this README).
 
 ## Compiling
 
-OpenMoHAA supports any architecture, thanks to the CMake build system and cross-platform code/libraries. While the most common little-Endian architectures (arm, aarch64, x86, x86_64) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
-
-The following tools are required for all platforms:
-- CMake >= 3.5
-- Flex and Bison
-- A C++11 compiler is also required.
-
-The installation directory can be set to the MOHAA directory.
-
-By default, the build will produce both the client and dedicated server versions. The client build can be excluded by appending `-DBUILD_NO_CLIENT=1` to the CMake command-line arguments. Using this parameter will result in only the server portion being built.
-
-### Linux
-
-These are the tools required on Linux :
-- Clang >= 3.3 or GCC >= 4.8.1
-
-**clang-3.5** and **gcc-4.8.5** should work (tested on Ubuntu 16.04). Use the latest possible version of those compilers.
-
-SDL2 library is required (libsdl2-dev).
-
-1 line install command with latest clang version : `sudo apt-get install -y ninja-build cmake make clang-15 lld-15 flex bison libsdl2-dev`
-
-Example with **CMake**, **clang-15** and **ninja-build** installed:
-```sh
-mkdir .cmake && cd .cmake
-cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -G Ninja
-```
-
-### Windows
-
-Visual Studio (2019 or 2022) is generally preferred.
-
-Flex and Bison can be downloaded from here: https://github.com/lexxmark/winflexbison/releases/tag/v2.5.25
-
-Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe` to the CMake command-line to use the package from the link above.
+- See [Compiling OpenMoHAA](docs/compiling.md)
 
 ## Screenshots
 
-|                                                                               |                                                                      |
-|-------------------------------------------------------------------------------|----------------------------------------------------------------------|
-| ![](docs/images/opmtt-x86_64_0.56.0_1.png "Playing on a Breakthrough server") | ![](docs/images/opmtt-x86_64_0.56.0_2.png)                           |
-| ![](docs/images/opmtt-x86_64_0.56.0_3.png)                                    | ![](docs/images/opm-arm_53_tt_1.png "OpenMoHAA on Raspberry Pi 4 B") |
-| ![](docs/images/opm-x86_64_0.58.0_1.png "Playing Freeze-Tag mode with bots")  | ![](docs/images/opm-x86_64_0.58.0_2.png "Single-Player training")    |
+|                                                                                   |                                                                            |
+|-----------------------------------------------------------------------------------|----------------------------------------------------------------------------|
+| ![](docs/images/v0.60.0-x86_64/mohdm1_1.png)                                      | ![](docs/images/v0.60.0-x86_64/training_1.png)                               |
+| ![](docs/images/v0.60.0-x86_64/flughafen_1.png)                                   | ![](docs/images/v0.60.0-x86_64/flughafen_2.png)                            |
+| ![](docs/images/v0.60.0-x86_64/mohdm2_1.png "Playing Freeze-Tag mode with bots")  | ![](docs/images/v0.60.0-x86_64/training_3.png "Single-Player training")    |
 
+*More screenshots [here](docs/images)*
 
 ## Third party
 
diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in
new file mode 100644
index 00000000..7db7869a
--- /dev/null
+++ b/cmake_uninstall.cmake.in
@@ -0,0 +1,21 @@
+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt")
+endif()
+
+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+  message(STATUS "Uninstalling $ENV{DESTDIR}${file}")
+  if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    execute_process(
+      COMMAND "@CMAKE_COMMAND@" -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
+      )
+    if(NOT "${rm_retval}" STREQUAL 0)
+      message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}")
+    endif()
+  else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}")
+    message(STATUS "File $ENV{DESTDIR}${file} does not exist.")
+  endif()
+endforeach()
diff --git a/code/AL/al.h b/code/AL/al.h
index 413b3833..a4e3ad51 100644
--- a/code/AL/al.h
+++ b/code/AL/al.h
@@ -1,8 +1,40 @@
 #ifndef AL_AL_H
 #define AL_AL_H
 
-#if defined(__cplusplus)
+/* NOLINTBEGIN */
+#ifdef __cplusplus
 extern "C" {
+
+#ifdef _MSVC_LANG
+#define AL_CPLUSPLUS _MSVC_LANG
+#else
+#define AL_CPLUSPLUS __cplusplus
+#endif
+
+#ifndef AL_DISABLE_NOEXCEPT
+#if AL_CPLUSPLUS >= 201103L
+#define AL_API_NOEXCEPT noexcept
+#else
+#define AL_API_NOEXCEPT
+#endif
+#if AL_CPLUSPLUS >= 201703L
+#define AL_API_NOEXCEPT17 noexcept
+#else
+#define AL_API_NOEXCEPT17
+#endif
+
+#else /* AL_DISABLE_NOEXCEPT */
+
+#define AL_API_NOEXCEPT
+#define AL_API_NOEXCEPT17
+#endif
+
+#undef AL_CPLUSPLUS
+
+#else /* __cplusplus */
+
+#define AL_API_NOEXCEPT
+#define AL_API_NOEXCEPT17
 #endif
 
 #ifndef AL_API
@@ -15,14 +47,14 @@ extern "C" {
  #endif
 #endif
 
-#if defined(_WIN32)
+#ifdef _WIN32
  #define AL_APIENTRY __cdecl
 #else
  #define AL_APIENTRY
 #endif
 
 
-/** Deprecated macro. */
+/* Deprecated macros. */
 #define OPENAL
 #define ALAPI                                    AL_API
 #define ALAPIENTRY                               AL_APIENTRY
@@ -30,7 +62,7 @@ extern "C" {
 #define AL_ILLEGAL_ENUM                          AL_INVALID_ENUM
 #define AL_ILLEGAL_COMMAND                       AL_INVALID_OPERATION
 
-/** Supported AL version. */
+/* Supported AL versions. */
 #define AL_VERSION_1_0
 #define AL_VERSION_1_1
 
@@ -40,43 +72,43 @@ typedef char ALboolean;
 /** character */
 typedef char ALchar;
 
-/** signed 8-bit 2's complement integer */
+/** signed 8-bit integer */
 typedef signed char ALbyte;
 
 /** unsigned 8-bit integer */
 typedef unsigned char ALubyte;
 
-/** signed 16-bit 2's complement integer */
+/** signed 16-bit integer */
 typedef short ALshort;
 
 /** unsigned 16-bit integer */
 typedef unsigned short ALushort;
 
-/** signed 32-bit 2's complement integer */
+/** signed 32-bit integer */
 typedef int ALint;
 
 /** unsigned 32-bit integer */
 typedef unsigned int ALuint;
 
-/** non-negative 32-bit binary integer size */
+/** non-negative 32-bit integer size */
 typedef int ALsizei;
 
-/** enumerated 32-bit value */
+/** 32-bit enumeration value */
 typedef int ALenum;
 
-/** 32-bit IEEE754 floating-point */
+/** 32-bit IEEE-754 floating-point */
 typedef float ALfloat;
 
-/** 64-bit IEEE754 floating-point */
+/** 64-bit IEEE-754 floating-point */
 typedef double ALdouble;
 
-/** void type (for opaque pointers only) */
+/** void type (opaque pointers only) */
 typedef void ALvoid;
 
 
-/* Enumerant values begin at column 50. No tabs. */
+/* Enumeration values begin at column 50. Do not use tabs. */
 
-/** "no distance model" or "no buffer" */
+/** No distance model or no buffer */
 #define AL_NONE                                  0
 
 /** Boolean False. */
@@ -89,10 +121,10 @@ typedef void ALvoid;
 /**
  * Relative source.
  * Type:    ALboolean
- * Range:   [AL_TRUE, AL_FALSE]
+ * Range:   [AL_FALSE, AL_TRUE]
  * Default: AL_FALSE
  *
- * Specifies if the Source has relative coordinates.
+ * Specifies if the source uses relative coordinates.
  */
 #define AL_SOURCE_RELATIVE                       0x202
 
@@ -103,7 +135,8 @@ typedef void ALvoid;
  * Range:   [0 - 360]
  * Default: 360
  *
- * The angle covered by the inner cone, where the source will not attenuate.
+ * The angle covered by the inner cone, the area within which the source will
+ * not be attenuated by direction.
  */
 #define AL_CONE_INNER_ANGLE                      0x1001
 
@@ -112,8 +145,8 @@ typedef void ALvoid;
  * Range:   [0 - 360]
  * Default: 360
  *
- * The angle covered by the outer cone, where the source will be fully
- * attenuated.
+ * The angle covered by the outer cone, the area outside of which the source
+ * will be fully attenuated by direction.
  */
 #define AL_CONE_OUTER_ANGLE                      0x1002
 
@@ -123,7 +156,7 @@ typedef void ALvoid;
  * Range:   [0.5 - 2.0]
  * Default: 1.0
  *
- * A multiplier for the frequency (sample rate) of the source's buffer.
+ * A multiplier for the sample rate of the source's buffer.
  */
 #define AL_PITCH                                 0x1003
 
@@ -134,12 +167,12 @@ typedef void ALvoid;
  *
  * The source or listener location in three dimensional space.
  *
- * OpenAL, like OpenGL, uses a right handed coordinate system, where in a
- * frontal default view X (thumb) points right, Y points up (index finger), and
- * Z points towards the viewer/camera (middle finger).
+ * OpenAL uses a right handed coordinate system, like OpenGL, where with a
+ * default view, X points right (thumb), Y points up (index finger), and Z
+ * points towards the viewer/camera (middle finger).
  *
- * To switch from a left handed coordinate system, flip the sign on the Z
- * coordinate.
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_POSITION                              0x1004
 
@@ -148,8 +181,11 @@ typedef void ALvoid;
  * Type:    ALfloat[3], ALint[3]
  * Default: {0, 0, 0}
  *
- * Specifies the current direction in local space.
- * A zero-length vector specifies an omni-directional source (cone is ignored).
+ * Specifies the current direction in local space. A zero-length vector
+ * specifies an omni-directional source (cone is ignored).
+ *
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_DIRECTION                             0x1005
 
@@ -158,26 +194,30 @@ typedef void ALvoid;
  * Type:    ALfloat[3], ALint[3]
  * Default: {0, 0, 0}
  *
- * Specifies the current velocity in local space.
+ * Specifies the current velocity, relative to the position.
+ *
+ * To change from or to a left handed coordinate system, negate the Z
+ * component.
  */
 #define AL_VELOCITY                              0x1006
 
 /**
  * Source looping.
  * Type:    ALboolean
- * Range:   [AL_TRUE, AL_FALSE]
+ * Range:   [AL_FALSE, AL_TRUE]
  * Default: AL_FALSE
  *
- * Specifies whether source is looping.
+ * Specifies whether source playback loops.
  */
 #define AL_LOOPING                               0x1007
 
 /**
  * Source buffer.
- * Type:  ALuint
- * Range: any valid Buffer.
+ * Type:    ALuint
+ * Range:   any valid Buffer ID
+ * Default: AL_NONE
  *
- * Specifies the buffer to provide sound samples.
+ * Specifies the buffer to provide sound samples for a source.
  */
 #define AL_BUFFER                                0x1009
 
@@ -186,12 +226,12 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - ]
  *
- * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
- * of about -6dB. Each multiplicaton by 2 equals an amplification of about
- * +6dB.
+ * For sources, an initial linear gain value (before attenuation is applied).
+ * For the listener, an output linear gain adjustment.
  *
- * A value of 0.0 is meaningless with respect to a logarithmic scale; it is
- * silent.
+ * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
+ * of about -6dB. Each multiplication by 2 equals an amplification of about
+ * +6dB.
  */
 #define AL_GAIN                                  0x100A
 
@@ -200,8 +240,8 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - 1.0]
  *
- * The minimum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
+ * The minimum gain allowed for a source, after distance and cone attenuation
+ * are applied (if applicable).
  */
 #define AL_MIN_GAIN                              0x100D
 
@@ -210,31 +250,33 @@ typedef void ALvoid;
  * Type:  ALfloat
  * Range: [0.0 - 1.0]
  *
- * The maximum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
+ * The maximum gain allowed for a source, after distance and cone attenuation
+ * are applied (if applicable).
  */
 #define AL_MAX_GAIN                              0x100E
 
 /**
  * Listener orientation.
- * Type: ALfloat[6]
+ * Type:    ALfloat[6]
  * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0}
  *
  * Effectively two three dimensional vectors. The first vector is the front (or
- * "at") and the second is the top (or "up").
+ * "at") and the second is the top (or "up"). Both vectors are relative to the
+ * listener position.
  *
- * Both vectors are in local space.
+ * To change from or to a left handed coordinate system, negate the Z
+ * component of both vectors.
  */
 #define AL_ORIENTATION                           0x100F
 
 /**
  * Source state (query only).
- * Type:  ALint
+ * Type:  ALenum
  * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED]
  */
 #define AL_SOURCE_STATE                          0x1010
 
-/** Source state value. */
+/* Source state values. */
 #define AL_INITIAL                               0x1011
 #define AL_PLAYING                               0x1012
 #define AL_PAUSED                                0x1013
@@ -267,9 +309,9 @@ typedef void ALvoid;
  * Range:   [0.0 - ]
  * Default: 1.0
  *
- * The distance in units that no attenuation occurs.
+ * The distance in units that no distance attenuation occurs.
  *
- * At 0.0, no distance attenuation ever occurs on non-linear attenuation models.
+ * At 0.0, no distance attenuation occurs with non-linear attenuation models.
  */
 #define AL_REFERENCE_DISTANCE                    0x1020
 
@@ -292,7 +334,7 @@ typedef void ALvoid;
  * Default: 0.0
  *
  * The gain attenuation applied when the listener is outside of the source's
- * outer cone.
+ * outer cone angle.
  */
 #define AL_CONE_OUTER_GAIN                       0x1022
 
@@ -300,7 +342,7 @@ typedef void ALvoid;
  * Source maximum distance.
  * Type:    ALfloat
  * Range:   [0.0 - ]
- * Default: +inf
+ * Default: FLT_MAX
  *
  * The distance above which the source is not attenuated any further with a
  * clamped distance model, or where attenuation reaches 0.0 gain for linear
@@ -308,16 +350,16 @@ typedef void ALvoid;
  */
 #define AL_MAX_DISTANCE                          0x1023
 
-/** Source buffer position, in seconds */
+/** Source buffer offset, in seconds */
 #define AL_SEC_OFFSET                            0x1024
-/** Source buffer position, in sample frames */
+/** Source buffer offset, in sample frames */
 #define AL_SAMPLE_OFFSET                         0x1025
-/** Source buffer position, in bytes */
+/** Source buffer offset, in bytes */
 #define AL_BYTE_OFFSET                           0x1026
 
 /**
  * Source type (query only).
- * Type:  ALint
+ * Type:  ALenum
  * Range: [AL_STATIC, AL_STREAMING, AL_UNDETERMINED]
  *
  * A Source is Static if a Buffer has been attached using AL_BUFFER.
@@ -330,31 +372,30 @@ typedef void ALvoid;
  */
 #define AL_SOURCE_TYPE                           0x1027
 
-/** Source type value. */
+/* Source type values. */
 #define AL_STATIC                                0x1028
 #define AL_STREAMING                             0x1029
 #define AL_UNDETERMINED                          0x1030
 
-/** Buffer format specifier. */
+/** Unsigned 8-bit mono buffer format. */
 #define AL_FORMAT_MONO8                          0x1100
+/** Signed 16-bit mono buffer format. */
 #define AL_FORMAT_MONO16                         0x1101
+/** Unsigned 8-bit stereo buffer format. */
 #define AL_FORMAT_STEREO8                        0x1102
+/** Signed 16-bit stereo buffer format. */
 #define AL_FORMAT_STEREO16                       0x1103
 
-/** Buffer frequency (query only). */
+/** Buffer frequency/sample rate (query only). */
 #define AL_FREQUENCY                             0x2001
 /** Buffer bits per sample (query only). */
 #define AL_BITS                                  0x2002
 /** Buffer channel count (query only). */
 #define AL_CHANNELS                              0x2003
-/** Buffer data size (query only). */
+/** Buffer data size in bytes (query only). */
 #define AL_SIZE                                  0x2004
 
-/**
- * Buffer state.
- *
- * Not for public use.
- */
+/* Buffer state. Not for public use. */
 #define AL_UNUSED                                0x2010
 #define AL_PENDING                               0x2011
 #define AL_PROCESSED                             0x2012
@@ -363,32 +404,31 @@ typedef void ALvoid;
 /** No error. */
 #define AL_NO_ERROR                              0
 
-/** Invalid name paramater passed to AL call. */
+/** Invalid name (ID) passed to an AL call. */
 #define AL_INVALID_NAME                          0xA001
 
-/** Invalid enum parameter passed to AL call. */
+/** Invalid enumeration passed to AL call. */
 #define AL_INVALID_ENUM                          0xA002
 
-/** Invalid value parameter passed to AL call. */
+/** Invalid value passed to AL call. */
 #define AL_INVALID_VALUE                         0xA003
 
 /** Illegal AL call. */
 #define AL_INVALID_OPERATION                     0xA004
 
-/** Not enough memory. */
+/** Not enough memory to execute the AL call. */
 #define AL_OUT_OF_MEMORY                         0xA005
 
 
-/** Context string: Vendor ID. */
+/** Context string: Vendor name. */
 #define AL_VENDOR                                0xB001
 /** Context string: Version. */
 #define AL_VERSION                               0xB002
-/** Context string: Renderer ID. */
+/** Context string: Renderer name. */
 #define AL_RENDERER                              0xB003
 /** Context string: Space-separated extension list. */
 #define AL_EXTENSIONS                            0xB004
 
-
 /**
  * Doppler scale.
  * Type:    ALfloat
@@ -398,7 +438,6 @@ typedef void ALvoid;
  * Scale for source and listener velocities.
  */
 #define AL_DOPPLER_FACTOR                        0xC000
-AL_API void AL_APIENTRY alDopplerFactor(ALfloat value);
 
 /**
  * Doppler velocity (deprecated).
@@ -406,7 +445,6 @@ AL_API void AL_APIENTRY alDopplerFactor(ALfloat value);
  * A multiplier applied to the Speed of Sound.
  */
 #define AL_DOPPLER_VELOCITY                      0xC001
-AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value);
 
 /**
  * Speed of Sound, in units per second.
@@ -415,14 +453,13 @@ AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value);
  * Default: 343.3
  *
  * The speed at which sound waves are assumed to travel, when calculating the
- * doppler effect.
+ * doppler effect from source and listener velocities.
  */
 #define AL_SPEED_OF_SOUND                        0xC003
-AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value);
 
 /**
  * Distance attenuation model.
- * Type:    ALint
+ * Type:    ALenum
  * Range:   [AL_NONE, AL_INVERSE_DISTANCE, AL_INVERSE_DISTANCE_CLAMPED,
  *           AL_LINEAR_DISTANCE, AL_LINEAR_DISTANCE_CLAMPED,
  *           AL_EXPONENT_DISTANCE, AL_EXPONENT_DISTANCE_CLAMPED]
@@ -439,9 +476,8 @@ AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value);
  * distance calculated is clamped between the reference and max distances.
  */
 #define AL_DISTANCE_MODEL                        0xD000
-AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel);
 
-/** Distance model value. */
+/* Distance model values. */
 #define AL_INVERSE_DISTANCE                      0xD001
 #define AL_INVERSE_DISTANCE_CLAMPED              0xD002
 #define AL_LINEAR_DISTANCE                       0xD003
@@ -449,208 +485,223 @@ AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel);
 #define AL_EXPONENT_DISTANCE                     0xD005
 #define AL_EXPONENT_DISTANCE_CLAMPED             0xD006
 
-/** Renderer State management. */
-AL_API void AL_APIENTRY alEnable(ALenum capability);
-AL_API void AL_APIENTRY alDisable(ALenum capability);
-AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability);
+#ifndef AL_NO_PROTOTYPES
+/* Renderer State management. */
+AL_API void AL_APIENTRY alEnable(ALenum capability) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDisable(ALenum capability) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsEnabled(ALenum capability) AL_API_NOEXCEPT;
 
-/** State retrieval. */
-AL_API const ALchar* AL_APIENTRY alGetString(ALenum param);
-AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values);
-AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values);
-AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values);
-AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param);
-AL_API ALint AL_APIENTRY alGetInteger(ALenum param);
-AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param);
-AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param);
+/* Context state setting. */
+AL_API void AL_APIENTRY alDopplerFactor(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDopplerVelocity(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSpeedOfSound(ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDistanceModel(ALenum distanceModel) AL_API_NOEXCEPT;
+
+/* Context state retrieval. */
+AL_API const ALchar* AL_APIENTRY alGetString(ALenum param) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBooleanv(ALenum param, ALboolean *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetIntegerv(ALenum param, ALint *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFloatv(ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetDoublev(ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alGetBoolean(ALenum param) AL_API_NOEXCEPT;
+AL_API ALint AL_APIENTRY alGetInteger(ALenum param) AL_API_NOEXCEPT;
+AL_API ALfloat AL_APIENTRY alGetFloat(ALenum param) AL_API_NOEXCEPT;
+AL_API ALdouble AL_APIENTRY alGetDouble(ALenum param) AL_API_NOEXCEPT;
 
 /**
- * Error retrieval.
- *
- * Obtain the first error generated in the AL context since the last check.
+ * Obtain the first error generated in the AL context since the last call to
+ * this function.
  */
-AL_API ALenum AL_APIENTRY alGetError(void);
+AL_API ALenum AL_APIENTRY alGetError(void) AL_API_NOEXCEPT;
 
+/** Query for the presence of an extension on the AL context. */
+AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname) AL_API_NOEXCEPT;
 /**
- * Extension support.
- *
- * Query for the presence of an extension, and obtain any appropriate function
- * pointers and enum values.
+ * Retrieve the address of a function. The returned function may be context-
+ * specific.
  */
-AL_API ALboolean AL_APIENTRY alIsExtensionPresent(const ALchar *extname);
-AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname);
-AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename);
+AL_API void* AL_APIENTRY alGetProcAddress(const ALchar *fname) AL_API_NOEXCEPT;
+/**
+ * Retrieve the value of an enum. The returned value may be context-specific.
+ */
+AL_API ALenum AL_APIENTRY alGetEnumValue(const ALchar *ename) AL_API_NOEXCEPT;
 
 
-/** Set Listener parameters */
-AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value);
-AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values);
+/* Set listener parameters. */
+AL_API void AL_APIENTRY alListenerf(ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListener3f(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListenerfv(ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListeneri(ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListener3i(ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alListeneriv(ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Listener parameters */
-AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values);
+/* Get listener parameters. */
+AL_API void AL_APIENTRY alGetListenerf(ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListener3f(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListenerfv(ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListeneri(ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListener3i(ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetListeneriv(ALenum param, ALint *values) AL_API_NOEXCEPT;
 
 
-/** Create Source objects. */
-AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources);
-/** Delete Source objects. */
-AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources);
-/** Verify a handle is a valid Source. */
-AL_API ALboolean AL_APIENTRY alIsSource(ALuint source);
+/** Create source objects. */
+AL_API void AL_APIENTRY alGenSources(ALsizei n, ALuint *sources) AL_API_NOEXCEPT;
+/** Delete source objects. */
+AL_API void AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Verify an ID is for a valid source. */
+AL_API ALboolean AL_APIENTRY alIsSource(ALuint source) AL_API_NOEXCEPT;
 
-/** Set Source parameters. */
-AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value);
-AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values);
+/* Set source parameters. */
+AL_API void AL_APIENTRY alSourcef(ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3f(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcefv(ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei(ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3i(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Source parameters. */
-AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetSourcei(ALuint source,  ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetSourceiv(ALuint source,  ALenum param, ALint *values);
+/* Get source parameters. */
+AL_API void AL_APIENTRY alGetSourcef(ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3f(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcefv(ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei(ALuint source,  ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3i(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourceiv(ALuint source,  ALenum param, ALint *values) AL_API_NOEXCEPT;
 
 
-/** Play, replay, or resume (if paused) a list of Sources */
-AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources);
-/** Stop a list of Sources */
-AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources);
-/** Rewind a list of Sources */
-AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources);
-/** Pause a list of Sources */
-AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources);
+/** Play, restart, or resume a source, setting its state to AL_PLAYING. */
+AL_API void AL_APIENTRY alSourcePlay(ALuint source) AL_API_NOEXCEPT;
+/** Stop a source, setting its state to AL_STOPPED if playing or paused. */
+AL_API void AL_APIENTRY alSourceStop(ALuint source) AL_API_NOEXCEPT;
+/** Rewind a source, setting its state to AL_INITIAL. */
+AL_API void AL_APIENTRY alSourceRewind(ALuint source) AL_API_NOEXCEPT;
+/** Pause a source, setting its state to AL_PAUSED if playing. */
+AL_API void AL_APIENTRY alSourcePause(ALuint source) AL_API_NOEXCEPT;
 
-/** Play, replay, or resume a Source */
-AL_API void AL_APIENTRY alSourcePlay(ALuint source);
-/** Stop a Source */
-AL_API void AL_APIENTRY alSourceStop(ALuint source);
-/** Rewind a Source (set playback postiton to beginning) */
-AL_API void AL_APIENTRY alSourceRewind(ALuint source);
-/** Pause a Source */
-AL_API void AL_APIENTRY alSourcePause(ALuint source);
+/** Play, restart, or resume a list of sources atomically. */
+AL_API void AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Stop a list of sources atomically. */
+AL_API void AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Rewind a list of sources atomically. */
+AL_API void AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+/** Pause a list of sources atomically. */
+AL_API void AL_APIENTRY alSourcePausev(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
 
 /** Queue buffers onto a source */
-AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers);
+AL_API void AL_APIENTRY alSourceQueueBuffers(ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT;
 /** Unqueue processed buffers from a source */
-AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers);
+AL_API void AL_APIENTRY alSourceUnqueueBuffers(ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT;
 
 
-/** Create Buffer objects */
-AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers);
-/** Delete Buffer objects */
-AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers);
-/** Verify a handle is a valid Buffer */
-AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer);
+/** Create buffer objects */
+AL_API void AL_APIENTRY alGenBuffers(ALsizei n, ALuint *buffers) AL_API_NOEXCEPT;
+/** Delete buffer objects */
+AL_API void AL_APIENTRY alDeleteBuffers(ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT;
+/** Verify an ID is a valid buffer (including the NULL buffer) */
+AL_API ALboolean AL_APIENTRY alIsBuffer(ALuint buffer) AL_API_NOEXCEPT;
 
-/** Specifies the data to be copied into a buffer */
-AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
+/**
+ * Copies data into the buffer, interpreting it using the specified format and
+ * samplerate.
+ */
+AL_API void AL_APIENTRY alBufferData(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT;
 
-/** Set Buffer parameters, */
-AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value);
-AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values);
-AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value);
-AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
-AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values);
+/* Set buffer parameters. */
+AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBuffer3f(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferfv(ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferi(ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBuffer3i(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferiv(ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT;
 
-/** Get Buffer parameters. */
-AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value);
-AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values);
-AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value);
-AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values);
+/* Get buffer parameters. */
+AL_API void AL_APIENTRY alGetBufferf(ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3f(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferfv(ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferi(ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3i(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferiv(ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT;
+#endif /* AL_NO_PROTOTYPES */
 
-/** Pointer-to-function type, useful for dynamically getting AL entry points. */
-typedef void          (AL_APIENTRY *LPALENABLE)(ALenum capability);
-typedef void          (AL_APIENTRY *LPALDISABLE)(ALenum capability);
-typedef ALboolean     (AL_APIENTRY *LPALISENABLED)(ALenum capability);
-typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param);
-typedef void          (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values);
-typedef void          (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values);
-typedef ALboolean     (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param);
-typedef ALint         (AL_APIENTRY *LPALGETINTEGER)(ALenum param);
-typedef ALfloat       (AL_APIENTRY *LPALGETFLOAT)(ALenum param);
-typedef ALdouble      (AL_APIENTRY *LPALGETDOUBLE)(ALenum param);
-typedef ALenum        (AL_APIENTRY *LPALGETERROR)(void);
-typedef ALboolean     (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname);
-typedef void*         (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname);
-typedef ALenum        (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename);
-typedef void          (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources);
-typedef void          (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources);
-typedef ALboolean     (AL_APIENTRY *LPALISSOURCE)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources);
-typedef void          (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCESTOP)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source);
-typedef void          (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers);
-typedef void          (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers);
-typedef ALboolean     (AL_APIENTRY *LPALISBUFFER)(ALuint buffer);
-typedef void          (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei freq);
-typedef void          (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value);
-typedef void          (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3);
-typedef void          (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values);
-typedef void          (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value);
-typedef void          (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3);
-typedef void          (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values);
-typedef void          (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value);
-typedef void          (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3);
-typedef void          (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values);
-typedef void          (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value);
-typedef void          (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3);
-typedef void          (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values);
-typedef void          (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value);
-typedef void          (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel);
+/* Pointer-to-function types, useful for storing dynamically loaded AL entry
+ * points.
+ */
+typedef void          (AL_APIENTRY *LPALENABLE)(ALenum capability) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDISABLE)(ALenum capability) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISENABLED)(ALenum capability) AL_API_NOEXCEPT17;
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRING)(ALenum param) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBOOLEANV)(ALenum param, ALboolean *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETINTEGERV)(ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETFLOATV)(ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETDOUBLEV)(ALenum param, ALdouble *values) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALGETBOOLEAN)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALint         (AL_APIENTRY *LPALGETINTEGER)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALfloat       (AL_APIENTRY *LPALGETFLOAT)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALdouble      (AL_APIENTRY *LPALGETDOUBLE)(ALenum param) AL_API_NOEXCEPT17;
+typedef ALenum        (AL_APIENTRY *LPALGETERROR)(void) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISEXTENSIONPRESENT)(const ALchar *extname) AL_API_NOEXCEPT17;
+typedef void*         (AL_APIENTRY *LPALGETPROCADDRESS)(const ALchar *fname) AL_API_NOEXCEPT17;
+typedef ALenum        (AL_APIENTRY *LPALGETENUMVALUE)(const ALchar *ename) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERF)(ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENER3F)(ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERFV)(ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERI)(ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENER3I)(ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALLISTENERIV)(ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERF)(ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENER3F)(ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERFV)(ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERI)(ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENER3I)(ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETLISTENERIV)(ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGENSOURCES)(ALsizei n, ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDELETESOURCES)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISSOURCE)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEF)(ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCE3F)(ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEFV)(ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEI)(ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCE3I)(ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEIV)(ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEF)(ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCE3F)(ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEFV)(ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEI)(ALuint source, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCE3I)(ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETSOURCEIV)(ALuint source, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPLAYV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCESTOPV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEREWINDV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSEV)(ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPLAY)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCESTOP)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEREWIND)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEPAUSE)(ALuint source) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEQUEUEBUFFERS)(ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERS)(ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGENBUFFERS)(ALsizei n, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDELETEBUFFERS)(ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef ALboolean     (AL_APIENTRY *LPALISBUFFER)(ALuint buffer) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERDATA)(ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERF)(ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFER3F)(ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERFV)(ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERI)(ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFER3I)(ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALBUFFERIV)(ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERF)(ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFER3F)(ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERFV)(ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERI)(ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFER3I)(ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALGETBUFFERIV)(ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDOPPLERFACTOR)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDOPPLERVELOCITY)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALSPEEDOFSOUND)(ALfloat value) AL_API_NOEXCEPT17;
+typedef void          (AL_APIENTRY *LPALDISTANCEMODEL)(ALenum distanceModel) AL_API_NOEXCEPT17;
 
-#if defined(__cplusplus)
+#ifdef __cplusplus
 }  /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_AL_H */
diff --git a/code/AL/alc.h b/code/AL/alc.h
index 294e8b33..d048ca04 100644
--- a/code/AL/alc.h
+++ b/code/AL/alc.h
@@ -1,8 +1,40 @@
 #ifndef AL_ALC_H
 #define AL_ALC_H
 
-#if defined(__cplusplus)
+/* NOLINTBEGIN */
+#ifdef __cplusplus
 extern "C" {
+
+#ifdef _MSVC_LANG
+#define ALC_CPLUSPLUS _MSVC_LANG
+#else
+#define ALC_CPLUSPLUS __cplusplus
+#endif
+
+#ifndef AL_DISABLE_NOEXCEPT
+#if ALC_CPLUSPLUS >= 201103L
+#define ALC_API_NOEXCEPT noexcept
+#else
+#define ALC_API_NOEXCEPT
+#endif
+#if ALC_CPLUSPLUS >= 201703L
+#define ALC_API_NOEXCEPT17 noexcept
+#else
+#define ALC_API_NOEXCEPT17
+#endif
+
+#else /* AL_DISABLE_NOEXCEPT */
+
+#define ALC_API_NOEXCEPT
+#define ALC_API_NOEXCEPT17
+#endif
+
+#undef ALC_CPLUSPLUS
+
+#else /* __cplusplus */
+
+#define ALC_API_NOEXCEPT
+#define ALC_API_NOEXCEPT17
 #endif
 
 #ifndef ALC_API
@@ -15,14 +47,14 @@ extern "C" {
  #endif
 #endif
 
-#if defined(_WIN32)
+#ifdef _WIN32
  #define ALC_APIENTRY __cdecl
 #else
  #define ALC_APIENTRY
 #endif
 
 
-/** Deprecated macro. */
+/* Deprecated macros. */
 #define ALCAPI                                   ALC_API
 #define ALCAPIENTRY                              ALC_APIENTRY
 #define ALC_INVALID                              0
@@ -31,9 +63,9 @@ extern "C" {
 #define ALC_VERSION_0_1                          1
 
 /** Opaque device handle */
-typedef struct ALCdevice_struct ALCdevice;
+typedef struct ALCdevice ALCdevice;
 /** Opaque context handle */
-typedef struct ALCcontext_struct ALCcontext;
+typedef struct ALCcontext ALCcontext;
 
 /** 8-bit boolean */
 typedef char ALCboolean;
@@ -41,41 +73,41 @@ typedef char ALCboolean;
 /** character */
 typedef char ALCchar;
 
-/** signed 8-bit 2's complement integer */
+/** signed 8-bit integer */
 typedef signed char ALCbyte;
 
 /** unsigned 8-bit integer */
 typedef unsigned char ALCubyte;
 
-/** signed 16-bit 2's complement integer */
+/** signed 16-bit integer */
 typedef short ALCshort;
 
 /** unsigned 16-bit integer */
 typedef unsigned short ALCushort;
 
-/** signed 32-bit 2's complement integer */
+/** signed 32-bit integer */
 typedef int ALCint;
 
 /** unsigned 32-bit integer */
 typedef unsigned int ALCuint;
 
-/** non-negative 32-bit binary integer size */
+/** non-negative 32-bit integer size */
 typedef int ALCsizei;
 
-/** enumerated 32-bit value */
+/** 32-bit enumeration value */
 typedef int ALCenum;
 
-/** 32-bit IEEE754 floating-point */
+/** 32-bit IEEE-754 floating-point */
 typedef float ALCfloat;
 
-/** 64-bit IEEE754 floating-point */
+/** 64-bit IEEE-754 floating-point */
 typedef double ALCdouble;
 
 /** void type (for opaque pointers only) */
 typedef void ALCvoid;
 
 
-/* Enumerant values begin at column 50. No tabs. */
+/* Enumeration values begin at column 50. Do not use tabs. */
 
 /** Boolean False. */
 #define ALC_FALSE                                0
@@ -89,7 +121,7 @@ typedef void ALCvoid;
 /** Context attribute: <int> Hz. */
 #define ALC_REFRESH                              0x1008
 
-/** Context attribute: AL_TRUE or AL_FALSE. */
+/** Context attribute: AL_TRUE or AL_FALSE synchronous context? */
 #define ALC_SYNC                                 0x1009
 
 /** Context attribute: <int> requested Mono (3D) Sources. */
@@ -107,30 +139,32 @@ typedef void ALCvoid;
 /** Invalid context handle. */
 #define ALC_INVALID_CONTEXT                      0xA002
 
-/** Invalid enum parameter passed to an ALC call. */
+/** Invalid enumeration passed to an ALC call. */
 #define ALC_INVALID_ENUM                         0xA003
 
-/** Invalid value parameter passed to an ALC call. */
+/** Invalid value passed to an ALC call. */
 #define ALC_INVALID_VALUE                        0xA004
 
 /** Out of memory. */
 #define ALC_OUT_OF_MEMORY                        0xA005
 
 
-/** Runtime ALC version. */
+/** Runtime ALC major version. */
 #define ALC_MAJOR_VERSION                        0x1000
+/** Runtime ALC minor version. */
 #define ALC_MINOR_VERSION                        0x1001
 
-/** Context attribute list properties. */
+/** Context attribute list size. */
 #define ALC_ATTRIBUTES_SIZE                      0x1002
+/** Context attribute list properties. */
 #define ALC_ALL_ATTRIBUTES                       0x1003
 
 /** String for the default device specifier. */
 #define ALC_DEFAULT_DEVICE_SPECIFIER             0x1004
 /**
- * String for the given device's specifier.
+ * Device specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known device specifiers (list ends with an empty string).
  */
 #define ALC_DEVICE_SPECIFIER                     0x1005
@@ -141,9 +175,9 @@ typedef void ALCvoid;
 /** Capture extension */
 #define ALC_EXT_CAPTURE 1
 /**
- * String for the given capture device's specifier.
+ * Capture device specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known capture device specifiers (list ends with an empty string).
  */
 #define ALC_CAPTURE_DEVICE_SPECIFIER             0x310
@@ -158,80 +192,116 @@ typedef void ALCvoid;
 /** String for the default extended device specifier. */
 #define ALC_DEFAULT_ALL_DEVICES_SPECIFIER        0x1012
 /**
- * String for the given extended device's specifier.
+ * Device's extended specifier string.
  *
- * If device handle is NULL, it is instead a null-char separated list of
+ * If device handle is NULL, it is instead a null-character separated list of
  * strings of known extended device specifiers (list ends with an empty string).
  */
 #define ALC_ALL_DEVICES_SPECIFIER                0x1013
 
 
-/** Context management. */
-ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint* attrlist);
-ALC_API ALCboolean  ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcProcessContext(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcSuspendContext(ALCcontext *context);
-ALC_API void        ALC_APIENTRY alcDestroyContext(ALCcontext *context);
-ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void);
-ALC_API ALCdevice*  ALC_APIENTRY alcGetContextsDevice(ALCcontext *context);
+#ifndef ALC_NO_PROTOTYPES
+/* Context management. */
 
-/** Device management. */
-ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename);
-ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device);
+/** Create and attach a context to the given device. */
+ALC_API ALCcontext* ALC_APIENTRY alcCreateContext(ALCdevice *device, const ALCint *attrlist) ALC_API_NOEXCEPT;
+/**
+ * Makes the given context the active process-wide context. Passing NULL clears
+ * the active context.
+ */
+ALC_API ALCboolean  ALC_APIENTRY alcMakeContextCurrent(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Resumes processing updates for the given context. */
+ALC_API void        ALC_APIENTRY alcProcessContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Suspends updates for the given context. */
+ALC_API void        ALC_APIENTRY alcSuspendContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Remove a context from its device and destroys it. */
+ALC_API void        ALC_APIENTRY alcDestroyContext(ALCcontext *context) ALC_API_NOEXCEPT;
+/** Returns the currently active context. */
+ALC_API ALCcontext* ALC_APIENTRY alcGetCurrentContext(void) ALC_API_NOEXCEPT;
+/** Returns the device that a particular context is attached to. */
+ALC_API ALCdevice*  ALC_APIENTRY alcGetContextsDevice(ALCcontext *context) ALC_API_NOEXCEPT;
 
+/* Device management. */
+
+/** Opens the named playback device. */
+ALC_API ALCdevice* ALC_APIENTRY alcOpenDevice(const ALCchar *devicename) ALC_API_NOEXCEPT;
+/** Closes the given playback device. */
+ALC_API ALCboolean ALC_APIENTRY alcCloseDevice(ALCdevice *device) ALC_API_NOEXCEPT;
+
+/* Error support. */
+
+/** Obtain the most recent Device error. */
+ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device) ALC_API_NOEXCEPT;
+
+/* Extension support. */
 
 /**
- * Error support.
- *
- * Obtain the most recent Device error.
+ * Query for the presence of an extension on the device. Pass a NULL device to
+ * query a device-inspecific extension.
  */
-ALC_API ALCenum ALC_APIENTRY alcGetError(ALCdevice *device);
+ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname) ALC_API_NOEXCEPT;
+/**
+ * Retrieve the address of a function. Given a non-NULL device, the returned
+ * function may be device-specific.
+ */
+ALC_API ALCvoid*   ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname) ALC_API_NOEXCEPT;
+/**
+ * Retrieve the value of an enum. Given a non-NULL device, the returned value
+ * may be device-specific.
+ */
+ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname) ALC_API_NOEXCEPT;
+
+/* Query functions. */
+
+/** Returns information about the device, and error strings. */
+ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param) ALC_API_NOEXCEPT;
+/** Returns information about the device and the version of OpenAL. */
+ALC_API void           ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values) ALC_API_NOEXCEPT;
+
+/* Capture functions. */
 
 /**
- * Extension support.
- *
- * Query for the presence of an extension, and obtain any appropriate
- * function pointers and enum values.
+ * Opens the named capture device with the given frequency, format, and buffer
+ * size.
  */
-ALC_API ALCboolean ALC_APIENTRY alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname);
-ALC_API void*      ALC_APIENTRY alcGetProcAddress(ALCdevice *device, const ALCchar *funcname);
-ALC_API ALCenum    ALC_APIENTRY alcGetEnumValue(ALCdevice *device, const ALCchar *enumname);
+ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize) ALC_API_NOEXCEPT;
+/** Closes the given capture device. */
+ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Starts capturing samples into the device buffer. */
+ALC_API void       ALC_APIENTRY alcCaptureStart(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Stops capturing samples. Samples in the device buffer remain available. */
+ALC_API void       ALC_APIENTRY alcCaptureStop(ALCdevice *device) ALC_API_NOEXCEPT;
+/** Reads samples from the device buffer. */
+ALC_API void       ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) ALC_API_NOEXCEPT;
+#endif /* ALC_NO_PROTOTYPES */
 
-/** Query function. */
-ALC_API const ALCchar* ALC_APIENTRY alcGetString(ALCdevice *device, ALCenum param);
-ALC_API void           ALC_APIENTRY alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
+/* Pointer-to-function types, useful for storing dynamically loaded ALC entry
+ * points.
+ */
+typedef ALCcontext*    (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCcontext*    (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef ALCenum        (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname) ALC_API_NOEXCEPT17;
+typedef ALCvoid*       (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname) ALC_API_NOEXCEPT17;
+typedef ALCenum        (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname) ALC_API_NOEXCEPT17;
+typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values) ALC_API_NOEXCEPT17;
+typedef ALCdevice*     (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize) ALC_API_NOEXCEPT17;
+typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) ALC_API_NOEXCEPT17;
 
-/** Capture function. */
-ALC_API ALCdevice* ALC_APIENTRY alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
-ALC_API ALCboolean ALC_APIENTRY alcCaptureCloseDevice(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureStart(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureStop(ALCdevice *device);
-ALC_API void       ALC_APIENTRY alcCaptureSamples(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
-
-/** Pointer-to-function type, useful for dynamically getting ALC entry points. */
-typedef ALCcontext*    (ALC_APIENTRY *LPALCCREATECONTEXT)(ALCdevice *device, const ALCint *attrlist);
-typedef ALCboolean     (ALC_APIENTRY *LPALCMAKECONTEXTCURRENT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCPROCESSCONTEXT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCSUSPENDCONTEXT)(ALCcontext *context);
-typedef void           (ALC_APIENTRY *LPALCDESTROYCONTEXT)(ALCcontext *context);
-typedef ALCcontext*    (ALC_APIENTRY *LPALCGETCURRENTCONTEXT)(void);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCGETCONTEXTSDEVICE)(ALCcontext *context);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCOPENDEVICE)(const ALCchar *devicename);
-typedef ALCboolean     (ALC_APIENTRY *LPALCCLOSEDEVICE)(ALCdevice *device);
-typedef ALCenum        (ALC_APIENTRY *LPALCGETERROR)(ALCdevice *device);
-typedef ALCboolean     (ALC_APIENTRY *LPALCISEXTENSIONPRESENT)(ALCdevice *device, const ALCchar *extname);
-typedef void*          (ALC_APIENTRY *LPALCGETPROCADDRESS)(ALCdevice *device, const ALCchar *funcname);
-typedef ALCenum        (ALC_APIENTRY *LPALCGETENUMVALUE)(ALCdevice *device, const ALCchar *enumname);
-typedef const ALCchar* (ALC_APIENTRY *LPALCGETSTRING)(ALCdevice *device, ALCenum param);
-typedef void           (ALC_APIENTRY *LPALCGETINTEGERV)(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *values);
-typedef ALCdevice*     (ALC_APIENTRY *LPALCCAPTUREOPENDEVICE)(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
-typedef ALCboolean     (ALC_APIENTRY *LPALCCAPTURECLOSEDEVICE)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESTART)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESTOP)(ALCdevice *device);
-typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
-
-#if defined(__cplusplus)
-}
+#ifdef __cplusplus
+} /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_ALC_H */
diff --git a/code/AL/alext.h b/code/AL/alext.h
index 0447f2bb..3908e194 100644
--- a/code/AL/alext.h
+++ b/code/AL/alext.h
@@ -1,38 +1,22 @@
-/**
- * OpenAL cross platform audio library
- * Copyright (C) 2008 by authors.
- * This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA  02111-1307, USA.
- * Or go to http://www.gnu.org/copyleft/lgpl.html
- */
-
 #ifndef AL_ALEXT_H
 #define AL_ALEXT_H
 
+/* NOLINTBEGIN */
 #include <stddef.h>
-/* Define int64_t and uint64_t types */
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-#include <inttypes.h>
-#elif defined(_WIN32) && defined(__GNUC__)
+/* Define int64 and uint64 types */
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) ||             \
+    (defined(__cplusplus) && __cplusplus >= 201103L)
 #include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
 #elif defined(_WIN32)
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
+typedef __int64 _alsoft_int64_t;
+typedef unsigned __int64 _alsoft_uint64_t;
 #else
 /* Fallback if nothing above works */
-#include <inttypes.h>
+#include <stdint.h>
+typedef int64_t _alsoft_int64_t;
+typedef uint64_t _alsoft_uint64_t;
 #endif
 
 #include "alc.h"
@@ -42,6 +26,8 @@ typedef unsigned __int64 uint64_t;
 extern "C" {
 #endif
 
+struct _GUID;
+
 #ifndef AL_LOKI_IMA_ADPCM_format
 #define AL_LOKI_IMA_ADPCM_format 1
 #define AL_FORMAT_IMA_ADPCM_MONO16_EXT           0x10000
@@ -97,6 +83,31 @@ extern "C" {
 
 #ifndef AL_EXT_MCFORMATS
 #define AL_EXT_MCFORMATS 1
+/* Provides support for surround sound buffer formats with 8, 16, and 32-bit
+ * samples.
+ *
+ * QUAD8: Unsigned 8-bit, Quadraphonic (Front Left, Front Right, Rear Left,
+ *        Rear Right).
+ * QUAD16: Signed 16-bit, Quadraphonic.
+ * QUAD32: 32-bit float, Quadraphonic.
+ * REAR8: Unsigned 8-bit, Rear Stereo (Rear Left, Rear Right).
+ * REAR16: Signed 16-bit, Rear Stereo.
+ * REAR32: 32-bit float, Rear Stereo.
+ * 51CHN8: Unsigned 8-bit, 5.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Side Left, Side Right). Note that some audio systems may label
+ *         5.1's Side channels as Rear or Surround; they are equivalent for the
+ *         purposes of this extension.
+ * 51CHN16: Signed 16-bit, 5.1 Surround.
+ * 51CHN32: 32-bit float, 5.1 Surround.
+ * 61CHN8: Unsigned 8-bit, 6.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Center, Side Left, Side Right).
+ * 61CHN16: Signed 16-bit, 6.1 Surround.
+ * 61CHN32: 32-bit float, 6.1 Surround.
+ * 71CHN8: Unsigned 8-bit, 7.1 Surround (Front Left, Front Right, Front Center,
+ *         LFE, Rear Left, Rear Right, Side Left, Side Right).
+ * 71CHN16: Signed 16-bit, 7.1 Surround.
+ * 71CHN32: 32-bit float, 7.1 Surround.
+ */
 #define AL_FORMAT_QUAD8                          0x1204
 #define AL_FORMAT_QUAD16                         0x1205
 #define AL_FORMAT_QUAD32                         0x1206
@@ -133,9 +144,9 @@ extern "C" {
 
 #ifndef AL_EXT_STATIC_BUFFER
 #define AL_EXT_STATIC_BUFFER 1
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALint,ALenum,ALvoid*,ALsizei,ALsizei);
+typedef void (AL_APIENTRY*PFNALBUFFERDATASTATICPROC)(const ALuint,ALenum,ALvoid*,ALsizei,ALsizei) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format, ALvoid *data, ALsizei len, ALsizei freq);
+void AL_APIENTRY alBufferDataStatic(const ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -151,11 +162,11 @@ AL_API ALvoid AL_APIENTRY alBufferDataStatic(const ALint buffer, ALenum format,
 
 #ifndef ALC_EXT_thread_local_context
 #define ALC_EXT_thread_local_context 1
-typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context);
-typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void);
+typedef ALCboolean  (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context) ALC_API_NOEXCEPT17;
+typedef ALCcontext* (ALC_APIENTRY*PFNALCGETTHREADCONTEXTPROC)(void) ALC_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context);
-ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
+ALC_API ALCboolean  ALC_APIENTRY alcSetThreadContext(ALCcontext *context) ALC_API_NOEXCEPT;
+ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void) ALC_API_NOEXCEPT;
 #endif
 #endif
 
@@ -168,9 +179,9 @@ ALC_API ALCcontext* ALC_APIENTRY alcGetThreadContext(void);
 #define AL_SOFT_buffer_sub_data 1
 #define AL_BYTE_RW_OFFSETS_SOFT                  0x1031
 #define AL_SAMPLE_RW_OFFSETS_SOFT                0x1032
-typedef ALvoid (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei);
+typedef void (AL_APIENTRY*PFNALBUFFERSUBDATASOFTPROC)(ALuint,ALenum,const ALvoid*,ALsizei,ALsizei) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length);
+AL_API void AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const ALvoid *data,ALsizei offset,ALsizei length) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -187,12 +198,12 @@ AL_API ALvoid AL_APIENTRY alBufferSubDataSOFT(ALuint buffer,ALenum format,const
 #define AL_FOLDBACK_EVENT_STOP                   0x4113
 #define AL_FOLDBACK_MODE_MONO                    0x4101
 #define AL_FOLDBACK_MODE_STEREO                  0x4102
-typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK);
-typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void);
+typedef void (AL_APIENTRY*LPALFOLDBACKCALLBACK)(ALenum,ALsizei) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTART)(ALenum,ALsizei,ALsizei,ALfloat*,LPALFOLDBACKCALLBACK) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALREQUESTFOLDBACKSTOP)(void) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback);
-AL_API void AL_APIENTRY alRequestFoldbackStop(void);
+AL_API void AL_APIENTRY alRequestFoldbackStart(ALenum mode,ALsizei count,ALsizei length,ALfloat *mem,LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alRequestFoldbackStop(void) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -255,15 +266,15 @@ AL_API void AL_APIENTRY alRequestFoldbackStop(void);
 #define AL_SAMPLE_LENGTH_SOFT                    0x200A
 #define AL_SEC_LENGTH_SOFT                       0x200B
 
-typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
-typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*);
-typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum);
+typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY*LPALISBUFFERFORMATSUPPORTEDSOFT)(ALenum) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data);
-AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data);
-AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
+AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer, ALuint samplerate, ALenum internalformat, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, const ALvoid *data) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer, ALsizei offset, ALsizei samples, ALenum channels, ALenum type, ALvoid *data) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -294,13 +305,13 @@ AL_API ALboolean AL_APIENTRY alIsBufferFormatSupportedSOFT(ALenum format);
 #define ALC_6POINT1_SOFT                         0x1505
 #define ALC_7POINT1_SOFT                         0x1506
 
-typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*);
-typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum);
-typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei);
+typedef ALCdevice* (ALC_APIENTRY*LPALCLOOPBACKOPENDEVICESOFT)(const ALCchar*) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCISRENDERFORMATSUPPORTEDSOFT)(ALCdevice*,ALCsizei,ALCenum,ALCenum) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCRENDERSAMPLESSOFT)(ALCdevice*,ALCvoid*,ALCsizei) ALC_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName);
-ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type);
-ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples);
+ALC_API ALCdevice* ALC_APIENTRY alcLoopbackOpenDeviceSOFT(const ALCchar *deviceName) AL_API_NOEXCEPT;
+ALC_API ALCboolean ALC_APIENTRY alcIsRenderFormatSupportedSOFT(ALCdevice *device, ALCsizei freq, ALCenum channels, ALCenum type) AL_API_NOEXCEPT;
+ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffer, ALCsizei samples) AL_API_NOEXCEPT;
 #endif
 #endif
 
@@ -318,38 +329,764 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe
 #define AL_SOFT_source_latency 1
 #define AL_SAMPLE_OFFSET_LATENCY_SOFT            0x1200
 #define AL_SEC_OFFSET_LATENCY_SOFT               0x1201
-typedef int64_t ALint64SOFT;
-typedef uint64_t ALuint64SOFT;
-typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble);
-typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*);
-typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*);
-typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT);
-typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*);
-typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*);
+typedef _alsoft_int64_t ALint64SOFT;
+typedef _alsoft_uint64_t ALuint64SOFT;
+typedef void (AL_APIENTRY*LPALSOURCEDSOFT)(ALuint,ALenum,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCE3DSOFT)(ALuint,ALenum,ALdouble,ALdouble,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEDVSOFT)(ALuint,ALenum,const ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEDSOFT)(ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCE3DSOFT)(ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEDVSOFT)(ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEI64VSOFT)(ALuint,ALenum,const ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEI64SOFT)(ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCE3I64SOFT)(ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETSOURCEI64VSOFT)(ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value);
-AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3);
-AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values);
-AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value);
-AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3);
-AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values);
-AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value);
-AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3);
-AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values);
-AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value);
-AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3);
-AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values);
+AL_API void AL_APIENTRY alSourcedSOFT(ALuint source, ALenum param, ALdouble value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3dSOFT(ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcedvSOFT(ALuint source, ALenum param, const ALdouble *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcedSOFT(ALuint source, ALenum param, ALdouble *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3dSOFT(ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcedvSOFT(ALuint source, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alSourcei64vSOFT(ALuint source, ALenum param, const ALint64SOFT *values) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei64SOFT(ALuint source, ALenum param, ALint64SOFT *value) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSource3i64SOFT(ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetSourcei64vSOFT(ALuint source, ALenum param, ALint64SOFT *values) AL_API_NOEXCEPT;
 #endif
 #endif
 
+#ifndef ALC_EXT_DEFAULT_FILTER_ORDER
+#define ALC_EXT_DEFAULT_FILTER_ORDER 1
+#define ALC_DEFAULT_FILTER_ORDER                 0x1100
+#endif
+
+#ifndef AL_SOFT_deferred_updates
+#define AL_SOFT_deferred_updates 1
+#define AL_DEFERRED_UPDATES_SOFT                 0xC002
+typedef void (AL_APIENTRY*LPALDEFERUPDATESSOFT)(void) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPROCESSUPDATESSOFT)(void) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alDeferUpdatesSOFT(void) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alProcessUpdatesSOFT(void) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_block_alignment
+#define AL_SOFT_block_alignment 1
+#define AL_UNPACK_BLOCK_ALIGNMENT_SOFT           0x200C
+#define AL_PACK_BLOCK_ALIGNMENT_SOFT             0x200D
+#endif
+
+#ifndef AL_SOFT_MSADPCM
+#define AL_SOFT_MSADPCM 1
+#define AL_FORMAT_MONO_MSADPCM_SOFT              0x1302
+#define AL_FORMAT_STEREO_MSADPCM_SOFT            0x1303
+#endif
+
+#ifndef AL_SOFT_source_length
+#define AL_SOFT_source_length 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef AL_SOFT_buffer_length_query
+#define AL_SOFT_buffer_length_query 1
+/*#define AL_BYTE_LENGTH_SOFT                      0x2009*/
+/*#define AL_SAMPLE_LENGTH_SOFT                    0x200A*/
+/*#define AL_SEC_LENGTH_SOFT                       0x200B*/
+#endif
+
+#ifndef ALC_SOFT_pause_device
+#define ALC_SOFT_pause_device 1
+typedef void (ALC_APIENTRY*LPALCDEVICEPAUSESOFT)(ALCdevice *device) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCDEVICERESUMESOFT)(ALCdevice *device) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcDevicePauseSOFT(ALCdevice *device) ALC_API_NOEXCEPT;
+ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_EXT_BFORMAT
+#define AL_EXT_BFORMAT 1
+/* Provides support for B-Format ambisonic buffers (first-order, FuMa scaling
+ * and layout).
+ *
+ * BFORMAT2D_8: Unsigned 8-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_16: Signed 16-bit, 3-channel non-periphonic (WXY).
+ * BFORMAT2D_FLOAT32: 32-bit float, 3-channel non-periphonic (WXY).
+ * BFORMAT3D_8: Unsigned 8-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_16: Signed 16-bit, 4-channel periphonic (WXYZ).
+ * BFORMAT3D_FLOAT32: 32-bit float, 4-channel periphonic (WXYZ).
+ */
+#define AL_FORMAT_BFORMAT2D_8                    0x20021
+#define AL_FORMAT_BFORMAT2D_16                   0x20022
+#define AL_FORMAT_BFORMAT2D_FLOAT32              0x20023
+#define AL_FORMAT_BFORMAT3D_8                    0x20031
+#define AL_FORMAT_BFORMAT3D_16                   0x20032
+#define AL_FORMAT_BFORMAT3D_FLOAT32              0x20033
+#endif
+
+#ifndef AL_EXT_MULAW_BFORMAT
+#define AL_EXT_MULAW_BFORMAT 1
+#define AL_FORMAT_BFORMAT2D_MULAW                0x10031
+#define AL_FORMAT_BFORMAT3D_MULAW                0x10032
+#endif
+
+#ifndef ALC_SOFT_HRTF
+#define ALC_SOFT_HRTF 1
+#define ALC_HRTF_SOFT                            0x1992
+#define ALC_DONT_CARE_SOFT                       0x0002
+#define ALC_HRTF_STATUS_SOFT                     0x1993
+#define ALC_HRTF_DISABLED_SOFT                   0x0000
+#define ALC_HRTF_ENABLED_SOFT                    0x0001
+#define ALC_HRTF_DENIED_SOFT                     0x0002
+#define ALC_HRTF_REQUIRED_SOFT                   0x0003
+#define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
+#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
+#define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
+#define ALC_HRTF_SPECIFIER_SOFT                  0x1995
+#define ALC_HRTF_ID_SOFT                         0x1996
+typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index) ALC_API_NOEXCEPT;
+ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_gain_clamp_ex
+#define AL_SOFT_gain_clamp_ex 1
+#define AL_GAIN_LIMIT_SOFT                       0x200E
+#endif
+
+#ifndef AL_SOFT_source_resampler
+#define AL_SOFT_source_resampler
+#define AL_NUM_RESAMPLERS_SOFT                   0x1210
+#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
+#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
+#define AL_RESAMPLER_NAME_SOFT                   0x1213
+typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_source_spatialize
+#define AL_SOFT_source_spatialize
+#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
+#define AL_AUTO_SOFT                             0x0002
+#endif
+
+#ifndef ALC_SOFT_output_limiter
+#define ALC_SOFT_output_limiter
+#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
+#endif
+
+#ifndef ALC_SOFT_device_clock
+#define ALC_SOFT_device_clock 1
+typedef _alsoft_int64_t ALCint64SOFT;
+typedef _alsoft_uint64_t ALCuint64SOFT;
+#define ALC_DEVICE_CLOCK_SOFT                    0x1600
+#define ALC_DEVICE_LATENCY_SOFT                  0x1601
+#define ALC_DEVICE_CLOCK_LATENCY_SOFT            0x1602
+#define AL_SAMPLE_OFFSET_CLOCK_SOFT              0x1202
+#define AL_SEC_OFFSET_CLOCK_SOFT                 0x1203
+typedef void (ALC_APIENTRY*LPALCGETINTEGER64VSOFT)(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALC_API void ALC_APIENTRY alcGetInteger64vSOFT(ALCdevice *device, ALCenum pname, ALsizei size, ALCint64SOFT *values) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_direct_channels_remix
+#define AL_SOFT_direct_channels_remix 1
+#define AL_DROP_UNMATCHED_SOFT                   0x0001
+#define AL_REMIX_UNMATCHED_SOFT                  0x0002
+#endif
+
+#ifndef AL_SOFT_bformat_ex
+#define AL_SOFT_bformat_ex 1
+#define AL_AMBISONIC_LAYOUT_SOFT                 0x1997
+#define AL_AMBISONIC_SCALING_SOFT                0x1998
+
+/* Ambisonic layouts */
+#define AL_FUMA_SOFT                             0x0000
+#define AL_ACN_SOFT                              0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define AL_FUMA_SOFT*/
+#define AL_SN3D_SOFT                             0x0001
+#define AL_N3D_SOFT                              0x0002
+#endif
+
+#ifndef ALC_SOFT_loopback_bformat
+#define ALC_SOFT_loopback_bformat 1
+#define ALC_AMBISONIC_LAYOUT_SOFT                0x1997
+#define ALC_AMBISONIC_SCALING_SOFT               0x1998
+#define ALC_AMBISONIC_ORDER_SOFT                 0x1999
+#define ALC_MAX_AMBISONIC_ORDER_SOFT             0x199B
+
+#define ALC_BFORMAT3D_SOFT                       0x1507
+
+/* Ambisonic layouts */
+#define ALC_FUMA_SOFT                            0x0000
+#define ALC_ACN_SOFT                             0x0001
+
+/* Ambisonic scalings (normalization) */
+/*#define ALC_FUMA_SOFT*/
+#define ALC_SN3D_SOFT                            0x0001
+#define ALC_N3D_SOFT                             0x0002
+#endif
+
+#ifndef AL_SOFT_effect_target
+#define AL_SOFT_effect_target
+#define AL_EFFECTSLOT_TARGET_SOFT                0x199C
+#endif
+
+#ifndef AL_SOFT_events
+#define AL_SOFT_events 1
+#define AL_EVENT_CALLBACK_FUNCTION_SOFT          0x19A2
+#define AL_EVENT_CALLBACK_USER_PARAM_SOFT        0x19A3
+#define AL_EVENT_TYPE_BUFFER_COMPLETED_SOFT      0x19A4
+#define AL_EVENT_TYPE_SOURCE_STATE_CHANGED_SOFT  0x19A5
+#define AL_EVENT_TYPE_DISCONNECTED_SOFT          0x19A6
+typedef void (AL_APIENTRY*ALEVENTPROCSOFT)(ALenum eventType, ALuint object, ALuint param,
+    ALsizei length, const ALchar *message, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALEVENTCONTROLSOFT)(ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALEVENTCALLBACKSOFT)(ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTERSOFT)(ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVSOFT)(ALenum pname, void **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alEventControlSOFT(ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEventCallbackSOFT(ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT;
+AL_API void* AL_APIENTRY alGetPointerSOFT(ALenum pname) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetPointervSOFT(ALenum pname, void **values) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_SOFT_reopen_device
+#define ALC_SOFT_reopen_device
+typedef ALCboolean (ALC_APIENTRY*LPALCREOPENDEVICESOFT)(ALCdevice *device,
+    const ALCchar *deviceName, const ALCint *attribs) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCboolean ALC_APIENTRY alcReopenDeviceSOFT(ALCdevice *device, const ALCchar *deviceName,
+    const ALCint *attribs) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_callback_buffer
+#define AL_SOFT_callback_buffer
+#define AL_BUFFER_CALLBACK_FUNCTION_SOFT         0x19A0
+#define AL_BUFFER_CALLBACK_USER_PARAM_SOFT       0x19A1
+typedef ALsizei (AL_APIENTRY*ALBUFFERCALLBACKTYPESOFT)(ALvoid *userptr, ALvoid *sampledata, ALsizei numbytes) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALBUFFERCALLBACKSOFT)(ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERPTRSOFT)(ALuint buffer, ALenum param, ALvoid **value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFER3PTRSOFT)(ALuint buffer, ALenum param, ALvoid **value1, ALvoid **value2, ALvoid **value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETBUFFERPTRVSOFT)(ALuint buffer, ALenum param, ALvoid **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+AL_API void AL_APIENTRY alBufferCallbackSOFT(ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferPtrSOFT(ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBuffer3PtrSOFT(ALuint buffer, ALenum param, ALvoid **ptr0, ALvoid **ptr1, ALvoid **ptr2) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetBufferPtrvSOFT(ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_UHJ
+#define AL_SOFT_UHJ
+#define AL_FORMAT_UHJ2CHN8_SOFT                  0x19A2
+#define AL_FORMAT_UHJ2CHN16_SOFT                 0x19A3
+#define AL_FORMAT_UHJ2CHN_FLOAT32_SOFT           0x19A4
+#define AL_FORMAT_UHJ3CHN8_SOFT                  0x19A5
+#define AL_FORMAT_UHJ3CHN16_SOFT                 0x19A6
+#define AL_FORMAT_UHJ3CHN_FLOAT32_SOFT           0x19A7
+#define AL_FORMAT_UHJ4CHN8_SOFT                  0x19A8
+#define AL_FORMAT_UHJ4CHN16_SOFT                 0x19A9
+#define AL_FORMAT_UHJ4CHN_FLOAT32_SOFT           0x19AA
+
+#define AL_STEREO_MODE_SOFT                      0x19B0
+#define AL_NORMAL_SOFT                           0x0000
+#define AL_SUPER_STEREO_SOFT                     0x0001
+#define AL_SUPER_STEREO_WIDTH_SOFT               0x19B1
+#endif
+
+#ifndef AL_SOFT_UHJ_ex
+#define AL_SOFT_UHJ_ex
+#define AL_FORMAT_UHJ2CHN_MULAW_SOFT             0x19B3
+#define AL_FORMAT_UHJ2CHN_ALAW_SOFT              0x19B4
+#define AL_FORMAT_UHJ2CHN_IMA4_SOFT              0x19B5
+#define AL_FORMAT_UHJ2CHN_MSADPCM_SOFT           0x19B6
+#define AL_FORMAT_UHJ3CHN_MULAW_SOFT             0x19B7
+#define AL_FORMAT_UHJ3CHN_ALAW_SOFT              0x19B8
+#define AL_FORMAT_UHJ4CHN_MULAW_SOFT             0x19B9
+#define AL_FORMAT_UHJ4CHN_ALAW_SOFT              0x19BA
+#endif
+
+#ifndef ALC_SOFT_output_mode
+#define ALC_SOFT_output_mode
+#define ALC_OUTPUT_MODE_SOFT                     0x19AC
+#define ALC_ANY_SOFT                             0x19AD
+/*#define ALC_MONO_SOFT                            0x1500*/
+/*#define ALC_STEREO_SOFT                          0x1501*/
+#define ALC_STEREO_BASIC_SOFT                    0x19AE
+#define ALC_STEREO_UHJ_SOFT                      0x19AF
+#define ALC_STEREO_HRTF_SOFT                     0x19B2
+/*#define ALC_QUAD_SOFT                            0x1503*/
+#define ALC_SURROUND_5_1_SOFT                    0x1504
+#define ALC_SURROUND_6_1_SOFT                    0x1505
+#define ALC_SURROUND_7_1_SOFT                    0x1506
+#endif
+
+#ifndef AL_SOFT_source_start_delay
+#define AL_SOFT_source_start_delay
+typedef void (AL_APIENTRY*LPALSOURCEPLAYATTIMESOFT)(ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALSOURCEPLAYATTIMEVSOFT)(ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+void AL_APIENTRY alSourcePlayAtTimeSOFT(ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayAtTimevSOFT(ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_EXT_debug
+#define ALC_EXT_debug
+#define ALC_CONTEXT_FLAGS_EXT                    0x19CF
+#define ALC_CONTEXT_DEBUG_BIT_EXT                0x0001
+#endif
+
+#ifndef AL_EXT_debug
+#define AL_EXT_debug
+#define AL_DONT_CARE_EXT                         0x0002
+#define AL_DEBUG_OUTPUT_EXT                      0x19B2
+#define AL_DEBUG_CALLBACK_FUNCTION_EXT           0x19B3
+#define AL_DEBUG_CALLBACK_USER_PARAM_EXT         0x19B4
+#define AL_DEBUG_SOURCE_API_EXT                  0x19B5
+#define AL_DEBUG_SOURCE_AUDIO_SYSTEM_EXT         0x19B6
+#define AL_DEBUG_SOURCE_THIRD_PARTY_EXT          0x19B7
+#define AL_DEBUG_SOURCE_APPLICATION_EXT          0x19B8
+#define AL_DEBUG_SOURCE_OTHER_EXT                0x19B9
+#define AL_DEBUG_TYPE_ERROR_EXT                  0x19BA
+#define AL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_EXT    0x19BB
+#define AL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_EXT     0x19BC
+#define AL_DEBUG_TYPE_PORTABILITY_EXT            0x19BD
+#define AL_DEBUG_TYPE_PERFORMANCE_EXT            0x19BE
+#define AL_DEBUG_TYPE_MARKER_EXT                 0x19BF
+#define AL_DEBUG_TYPE_PUSH_GROUP_EXT             0x19C0
+#define AL_DEBUG_TYPE_POP_GROUP_EXT              0x19C1
+#define AL_DEBUG_TYPE_OTHER_EXT                  0x19C2
+#define AL_DEBUG_SEVERITY_HIGH_EXT               0x19C3
+#define AL_DEBUG_SEVERITY_MEDIUM_EXT             0x19C4
+#define AL_DEBUG_SEVERITY_LOW_EXT                0x19C5
+#define AL_DEBUG_SEVERITY_NOTIFICATION_EXT       0x19C6
+#define AL_DEBUG_LOGGED_MESSAGES_EXT             0x19C7
+#define AL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_EXT  0x19C8
+#define AL_MAX_DEBUG_MESSAGE_LENGTH_EXT          0x19C9
+#define AL_MAX_DEBUG_LOGGED_MESSAGES_EXT         0x19CA
+#define AL_MAX_DEBUG_GROUP_STACK_DEPTH_EXT       0x19CB
+#define AL_MAX_LABEL_LENGTH_EXT                  0x19CC
+#define AL_STACK_OVERFLOW_EXT                    0x19CD
+#define AL_STACK_UNDERFLOW_EXT                   0x19CE
+#define AL_CONTEXT_FLAGS_EXT                     0x19CF
+#define AL_BUFFER_EXT                            0x1009 /* Same as AL_BUFFER */
+#define AL_SOURCE_EXT                            0x19D0
+#define AL_FILTER_EXT                            0x19D1
+#define AL_EFFECT_EXT                            0x19D2
+#define AL_AUXILIARY_EFFECT_SLOT_EXT             0x19D3
+
+typedef void (AL_APIENTRY*ALDEBUGPROCEXT)(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECALLBACKEXT)(ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGEINSERTEXT)(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECONTROLEXT)(ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPUSHDEBUGGROUPEXT)(ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPOPDEBUGGROUPEXT)(void) AL_API_NOEXCEPT17;
+typedef ALuint (AL_APIENTRY*LPALGETDEBUGMESSAGELOGEXT)(ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALOBJECTLABELEXT)(ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETOBJECTLABELEXT)(ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTEREXT)(ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVEXT)(ALenum pname, void **values) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+void AL_APIENTRY alDebugMessageCallbackEXT(ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageInsertEXT(ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageControlEXT(ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alPushDebugGroupEXT(ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alPopDebugGroupEXT(void) AL_API_NOEXCEPT;
+ALuint AL_APIENTRY alGetDebugMessageLogEXT(ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT;
+void AL_APIENTRY alObjectLabelEXT(ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetObjectLabelEXT(ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerEXT(ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervEXT(ALenum pname, void **values) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef ALC_SOFT_system_events
+#define ALC_SOFT_system_events
+#define ALC_PLAYBACK_DEVICE_SOFT                 0x19D4
+#define ALC_CAPTURE_DEVICE_SOFT                  0x19D5
+#define ALC_EVENT_TYPE_DEFAULT_DEVICE_CHANGED_SOFT 0x19D6
+#define ALC_EVENT_TYPE_DEVICE_ADDED_SOFT         0x19D7
+#define ALC_EVENT_TYPE_DEVICE_REMOVED_SOFT       0x19D8
+#define ALC_EVENT_SUPPORTED_SOFT                 0x19D9
+#define ALC_EVENT_NOT_SUPPORTED_SOFT             0x19DA
+typedef void (ALC_APIENTRY*ALCEVENTPROCTYPESOFT)(ALCenum eventType, ALCenum deviceType,
+    ALCdevice *device, ALCsizei length, const ALCchar *message, void *userParam) ALC_API_NOEXCEPT17;
+typedef ALCenum (ALC_APIENTRY*LPALCEVENTISSUPPORTEDSOFT)(ALCenum eventType, ALCenum deviceType) ALC_API_NOEXCEPT17;
+typedef ALCboolean (ALC_APIENTRY*LPALCEVENTCONTROLSOFT)(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT17;
+typedef void (ALC_APIENTRY*LPALCEVENTCALLBACKSOFT)(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCenum ALC_APIENTRY alcEventIsSupportedSOFT(ALCenum eventType, ALCenum deviceType) ALC_API_NOEXCEPT;
+ALCboolean ALC_APIENTRY alcEventControlSOFT(ALCsizei count, const ALCenum *events, ALCboolean enable) ALC_API_NOEXCEPT;
+void ALC_APIENTRY alcEventCallbackSOFT(ALCEVENTPROCTYPESOFT callback, void *userParam) ALC_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_EXT_direct_context
+#define AL_EXT_direct_context
+typedef ALCvoid* (ALC_APIENTRY *LPALCGETPROCADDRESS2)(ALCdevice *device, const ALCchar *funcname) AL_API_NOEXCEPT17;
+
+typedef void (AL_APIENTRY *LPALENABLEDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDISABLEDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISENABLEDDIRECT)(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDOPPLERFACTORDIRECT)(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSPEEDOFSOUNDDIRECT)(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDISTANCEMODELDIRECT)(ALCcontext *context, ALenum distanceModel) AL_API_NOEXCEPT17;
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRINGDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBOOLEANVDIRECT)(ALCcontext *context, ALenum param, ALboolean *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETINTEGERVDIRECT)(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFLOATVDIRECT)(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETDOUBLEVDIRECT)(ALCcontext *context, ALenum param, ALdouble *values) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALGETBOOLEANDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALint (AL_APIENTRY *LPALGETINTEGERDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALfloat (AL_APIENTRY *LPALGETFLOATDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALdouble (AL_APIENTRY *LPALGETDOUBLEDIRECT)(ALCcontext *context, ALenum param) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPALGETERRORDIRECT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEXTENSIONPRESENTDIRECT)(ALCcontext *context, const ALchar *extname) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY *LPALGETPROCADDRESSDIRECT)(ALCcontext *context, const ALchar *fname) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPALGETENUMVALUEDIRECT)(ALCcontext *context, const ALchar *ename) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERFDIRECT)(ALCcontext *context, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENER3FDIRECT)(ALCcontext *context, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERFVDIRECT)(ALCcontext *context, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERIDIRECT)(ALCcontext *context, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENER3IDIRECT)(ALCcontext *context, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALLISTENERIVDIRECT)(ALCcontext *context, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERFDIRECT)(ALCcontext *context, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENER3FDIRECT)(ALCcontext *context, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERFVDIRECT)(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERIDIRECT)(ALCcontext *context, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENER3IDIRECT)(ALCcontext *context, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETLISTENERIVDIRECT)(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENSOURCESDIRECT)(ALCcontext *context, ALsizei n, ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETESOURCESDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISSOURCEDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEFDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3FDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEFVDIRECT)(ALCcontext *context, ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEIDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3IDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEIVDIRECT)(ALCcontext *context, ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEFDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3FDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEFVDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEIDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3IDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEIVDIRECT)(ALCcontext *context, ALuint source, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCESTOPDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEREWINDDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPAUSEDIRECT)(ALCcontext *context, ALuint source) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCESTOPVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEREWINDVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPAUSEVDIRECT)(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEQUEUEBUFFERSDIRECT)(ALCcontext *context, ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEUNQUEUEBUFFERSDIRECT)(ALCcontext *context, ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENBUFFERSDIRECT)(ALCcontext *context, ALsizei n, ALuint *buffers) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEBUFFERSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISBUFFERDIRECT)(ALCcontext *context, ALuint buffer) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERDATADIRECT)(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERFDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFER3FDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERFVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERIDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFER3IDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALBUFFERIVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERFDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3FDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERFVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERIDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3IDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERIVDIRECT)(ALCcontext *context, ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+/* ALC_EXT_EFX */
+typedef void (AL_APIENTRY *LPALGENEFFECTSDIRECT)(ALCcontext *context, ALsizei n, ALuint *effects) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEEFFECTSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *effects) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEFFECTDIRECT)(ALCcontext *context, ALuint effect) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFVDIRECT)(ALCcontext *context, ALuint effect, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENFILTERSDIRECT)(ALCcontext *context, ALsizei n, ALuint *filters) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEFILTERSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *filters) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISFILTERDIRECT)(ALCcontext *context, ALuint filter) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFVDIRECT)(ALCcontext *context, ALuint filter, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTSDIRECT)(ALCcontext *context, ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTSDIRECT)(ALCcontext *context, ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOTDIRECT)(ALCcontext *context, ALuint effectslot) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, const ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, const ALfloat *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALint *values) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFVDIRECT)(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *values) AL_API_NOEXCEPT17;
+/* AL_EXT_BUFFER_DATA_STATIC */
+typedef void (AL_APIENTRY *LPALBUFFERDATASTATICDIRECT)(ALCcontext *context, ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT17;
+/* AL_EXT_debug */
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECALLBACKDIRECTEXT)(ALCcontext *context, ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGEINSERTDIRECTEXT)(ALCcontext *context, ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALDEBUGMESSAGECONTROLDIRECTEXT)(ALCcontext *context, ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPUSHDEBUGGROUPDIRECTEXT)(ALCcontext *context, ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALPOPDEBUGGROUPDIRECTEXT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef ALuint (AL_APIENTRY*LPALGETDEBUGMESSAGELOGDIRECTEXT)(ALCcontext *context, ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALOBJECTLABELDIRECTEXT)(ALCcontext *context, ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETOBJECTLABELDIRECTEXT)(ALCcontext *context, ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY*LPALGETPOINTERDIRECTEXT)(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY*LPALGETPOINTERVDIRECTEXT)(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT17;
+/* AL_EXT_FOLDBACK */
+typedef void (AL_APIENTRY *LPALREQUESTFOLDBACKSTARTDIRECT)(ALCcontext *context, ALenum mode, ALsizei count, ALsizei length, ALfloat *mem, LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALREQUESTFOLDBACKSTOPDIRECT)(ALCcontext *context) AL_API_NOEXCEPT17;
+/* AL_SOFT_buffer_sub_data */
+typedef void (AL_APIENTRY *LPALBUFFERSUBDATADIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_latency */
+typedef void (AL_APIENTRY *LPALSOURCEDDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3DDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble,ALdouble,ALdouble) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEDVDIRECTSOFT)(ALCcontext*,ALuint,ALenum,const ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEDDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3DDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*,ALdouble*,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEDVDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALdouble*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEI64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCE3I64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT,ALint64SOFT,ALint64SOFT) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEI64VDIRECTSOFT)(ALCcontext*,ALuint,ALenum,const ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEI64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCE3I64DIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*,ALint64SOFT*,ALint64SOFT*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETSOURCEI64VDIRECTSOFT)(ALCcontext*,ALuint,ALenum,ALint64SOFT*) AL_API_NOEXCEPT17;
+/* AL_SOFT_deferred_updates */
+typedef void (AL_APIENTRY *LPALDEFERUPDATESDIRECTSOFT)(ALCcontext *context) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALPROCESSUPDATESDIRECTSOFT)(ALCcontext *context) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_resampler */
+typedef const ALchar* (AL_APIENTRY *LPALGETSTRINGIDIRECTSOFT)(ALCcontext *context, ALenum pname, ALsizei index) AL_API_NOEXCEPT17;
+/* AL_SOFT_events */
+typedef void (AL_APIENTRY *LPALEVENTCONTROLDIRECTSOFT)(ALCcontext *context, ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEVENTCALLBACKDIRECTSOFT)(ALCcontext *context, ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT17;
+typedef void* (AL_APIENTRY *LPALGETPOINTERDIRECTSOFT)(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETPOINTERVDIRECTSOFT)(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT17;
+/* AL_SOFT_callback_buffer */
+typedef void (AL_APIENTRY *LPALBUFFERCALLBACKDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERPTRDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **value) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFER3PTRDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **value1, ALvoid **value2, ALvoid **value3) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETBUFFERPTRVDIRECTSOFT)(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **values) AL_API_NOEXCEPT17;
+/* AL_SOFT_source_start_delay */
+typedef void (AL_APIENTRY *LPALSOURCEPLAYATTIMEDIRECTSOFT)(ALCcontext *context, ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALSOURCEPLAYATTIMEVDIRECTSOFT)(ALCcontext *context, ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT17;
+/* EAX */
+typedef ALenum (AL_APIENTRY *LPEAXSETDIRECT)(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPEAXGETDIRECT)(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPEAXSETBUFFERMODEDIRECT)(ALCcontext *context, ALsizei n, const ALuint *buffers, ALint value) AL_API_NOEXCEPT17;
+typedef ALenum (AL_APIENTRY *LPEAXGETBUFFERMODEDIRECT)(ALCcontext *context, ALuint buffer, ALint *pReserved) AL_API_NOEXCEPT17;
+#ifdef AL_ALEXT_PROTOTYPES
+ALCvoid* ALC_APIENTRY alcGetProcAddress2(ALCdevice *device, const ALCchar *funcName) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alEnableDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+void AL_APIENTRY alDisableDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsEnabledDirect(ALCcontext *context, ALenum capability) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDopplerFactorDirect(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSpeedOfSoundDirect(ALCcontext *context, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alDistanceModelDirect(ALCcontext *context, ALenum distanceModel) AL_API_NOEXCEPT;
+
+const ALchar* AL_APIENTRY alGetStringDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBooleanvDirect(ALCcontext *context, ALenum param, ALboolean *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetIntegervDirect(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFloatvDirect(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetDoublevDirect(ALCcontext *context, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alGetBooleanDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALint AL_APIENTRY alGetIntegerDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALfloat AL_APIENTRY alGetFloatDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+ALdouble AL_APIENTRY alGetDoubleDirect(ALCcontext *context, ALenum param) AL_API_NOEXCEPT;
+
+ALenum AL_APIENTRY alGetErrorDirect(ALCcontext *context) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsExtensionPresentDirect(ALCcontext *context, const ALchar *extname) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetProcAddressDirect(ALCcontext *context, const ALchar *fname) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY alGetEnumValueDirect(ALCcontext *context, const ALchar *ename) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alListenerfDirect(ALCcontext *context, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alListener3fDirect(ALCcontext *context, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alListenerfvDirect(ALCcontext *context, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alListeneriDirect(ALCcontext *context, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alListener3iDirect(ALCcontext *context, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alListenerivDirect(ALCcontext *context, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerfDirect(ALCcontext *context, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListener3fDirect(ALCcontext *context, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerfvDirect(ALCcontext *context, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListeneriDirect(ALCcontext *context, ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListener3iDirect(ALCcontext *context, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetListenerivDirect(ALCcontext *context, ALenum param, ALint *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenSourcesDirect(ALCcontext *context, ALsizei n, ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteSourcesDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsSourceDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcefDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3fDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcefvDirect(ALCcontext *context, ALuint source, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceiDirect(ALCcontext *context, ALuint source, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3iDirect(ALCcontext *context, ALuint source, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceivDirect(ALCcontext *context, ALuint source, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcefDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3fDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcefvDirect(ALCcontext *context, ALuint source, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourceiDirect(ALCcontext *context, ALuint source,  ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3iDirect(ALCcontext *context, ALuint source, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourceivDirect(ALCcontext *context, ALuint source,  ALenum param, ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceStopDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceRewindDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePauseDirect(ALCcontext *context, ALuint source) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceStopvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceRewindvDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePausevDirect(ALCcontext *context, ALsizei n, const ALuint *sources) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceQueueBuffersDirect(ALCcontext *context, ALuint source, ALsizei nb, const ALuint *buffers) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourceUnqueueBuffersDirect(ALCcontext *context, ALuint source, ALsizei nb, ALuint *buffers) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenBuffersDirect(ALCcontext *context, ALsizei n, ALuint *buffers) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteBuffersDirect(ALCcontext *context, ALsizei n, const ALuint *buffers) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsBufferDirect(ALCcontext *context, ALuint buffer) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferDataDirect(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei size, ALsizei samplerate) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferfDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value) AL_API_NOEXCEPT;
+void AL_APIENTRY alBuffer3fDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat value1, ALfloat value2, ALfloat value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferfvDirect(ALCcontext *context, ALuint buffer, ALenum param, const ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferiDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint value) AL_API_NOEXCEPT;
+void AL_APIENTRY alBuffer3iDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint value1, ALint value2, ALint value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alBufferivDirect(ALCcontext *context, ALuint buffer, ALenum param, const ALint *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferfDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3fDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *value1, ALfloat *value2, ALfloat *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferfvDirect(ALCcontext *context, ALuint buffer, ALenum param, ALfloat *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferiDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3iDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *value1, ALint *value2, ALint *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferivDirect(ALCcontext *context, ALuint buffer, ALenum param, ALint *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenEffectsDirect(ALCcontext *context, ALsizei n, ALuint *effects) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteEffectsDirect(ALCcontext *context, ALsizei n, const ALuint *effects) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsEffectDirect(ALCcontext *context, ALuint effect) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectiDirect(ALCcontext *context, ALuint effect, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectivDirect(ALCcontext *context, ALuint effect, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectfDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alEffectfvDirect(ALCcontext *context, ALuint effect, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectiDirect(ALCcontext *context, ALuint effect, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectivDirect(ALCcontext *context, ALuint effect, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectfDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetEffectfvDirect(ALCcontext *context, ALuint effect, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenFiltersDirect(ALCcontext *context, ALsizei n, ALuint *filters) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteFiltersDirect(ALCcontext *context, ALsizei n, const ALuint *filters) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsFilterDirect(ALCcontext *context, ALuint filter) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilteriDirect(ALCcontext *context, ALuint filter, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterivDirect(ALCcontext *context, ALuint filter, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterfDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alFilterfvDirect(ALCcontext *context, ALuint filter, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilteriDirect(ALCcontext *context, ALuint filter, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterivDirect(ALCcontext *context, ALuint filter, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterfDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetFilterfvDirect(ALCcontext *context, ALuint filter, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alGenAuxiliaryEffectSlotsDirect(ALCcontext *context, ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT;
+void AL_APIENTRY alDeleteAuxiliaryEffectSlotsDirect(ALCcontext *context, ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY alIsAuxiliaryEffectSlotDirect(ALCcontext *context, ALuint effectslot) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotiDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotivDirect(ALCcontext *context, ALuint effectslot, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotfDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alAuxiliaryEffectSlotfvDirect(ALCcontext *context, ALuint effectslot, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotiDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotivDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotfDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetAuxiliaryEffectSlotfvDirect(ALCcontext *context, ALuint effectslot, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferDataStaticDirect(ALCcontext *context, ALuint buffer, ALenum format, ALvoid *data, ALsizei size, ALsizei freq) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDebugMessageCallbackDirectEXT(ALCcontext *context, ALDEBUGPROCEXT callback, void *userParam) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageInsertDirectEXT(ALCcontext *context, ALenum source, ALenum type, ALuint id, ALenum severity, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alDebugMessageControlDirectEXT(ALCcontext *context, ALenum source, ALenum type, ALenum severity, ALsizei count, const ALuint *ids, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alPushDebugGroupDirectEXT(ALCcontext *context, ALenum source, ALuint id, ALsizei length, const ALchar *message) AL_API_NOEXCEPT;
+void AL_APIENTRY alPopDebugGroupDirectEXT(ALCcontext *context) AL_API_NOEXCEPT;
+ALuint AL_APIENTRY alGetDebugMessageLogDirectEXT(ALCcontext *context, ALuint count, ALsizei logBufSize, ALenum *sources, ALenum *types, ALuint *ids, ALenum *severities, ALsizei *lengths, ALchar *logBuf) AL_API_NOEXCEPT;
+void AL_APIENTRY alObjectLabelDirectEXT(ALCcontext *context, ALenum identifier, ALuint name, ALsizei length, const ALchar *label) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetObjectLabelDirectEXT(ALCcontext *context, ALenum identifier, ALuint name, ALsizei bufSize, ALsizei *length, ALchar *label) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerDirectEXT(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervDirectEXT(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alRequestFoldbackStartDirect(ALCcontext *context, ALenum mode, ALsizei count, ALsizei length, ALfloat *mem, LPALFOLDBACKCALLBACK callback) AL_API_NOEXCEPT;
+void AL_APIENTRY alRequestFoldbackStopDirect(ALCcontext *context) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferSubDataDirectSOFT(ALCcontext *context, ALuint buffer, ALenum format, const ALvoid *data, ALsizei offset, ALsizei length) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alSourcedDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3dDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble value1, ALdouble value2, ALdouble value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcedvDirectSOFT(ALCcontext *context, ALuint source, ALenum param, const ALdouble *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcedDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3dDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *value1, ALdouble *value2, ALdouble *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcedvDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALdouble *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcei64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT value) AL_API_NOEXCEPT;
+void AL_APIENTRY alSource3i64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT value1, ALint64SOFT value2, ALint64SOFT value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcei64vDirectSOFT(ALCcontext *context, ALuint source, ALenum param, const ALint64SOFT *values) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcei64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *value) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSource3i64DirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *value1, ALint64SOFT *value2, ALint64SOFT *value3) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetSourcei64vDirectSOFT(ALCcontext *context, ALuint source, ALenum param, ALint64SOFT *values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alDeferUpdatesDirectSOFT(ALCcontext *context) AL_API_NOEXCEPT;
+void AL_APIENTRY alProcessUpdatesDirectSOFT(ALCcontext *context) AL_API_NOEXCEPT;
+
+const ALchar* AL_APIENTRY alGetStringiDirectSOFT(ALCcontext *context, ALenum pname, ALsizei index) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alEventControlDirectSOFT(ALCcontext *context, ALsizei count, const ALenum *types, ALboolean enable) AL_API_NOEXCEPT;
+void AL_APIENTRY alEventCallbackDirectSOFT(ALCcontext *context, ALEVENTPROCSOFT callback, void *userParam) AL_API_NOEXCEPT;
+void* AL_APIENTRY alGetPointerDirectSOFT(ALCcontext *context, ALenum pname) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetPointervDirectSOFT(ALCcontext *context, ALenum pname, void **values) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alBufferCallbackDirectSOFT(ALCcontext *context, ALuint buffer, ALenum format, ALsizei freq, ALBUFFERCALLBACKTYPESOFT callback, ALvoid *userptr) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferPtrDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBuffer3PtrDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr0, ALvoid **ptr1, ALvoid **ptr2) AL_API_NOEXCEPT;
+void AL_APIENTRY alGetBufferPtrvDirectSOFT(ALCcontext *context, ALuint buffer, ALenum param, ALvoid **ptr) AL_API_NOEXCEPT;
+
+void AL_APIENTRY alSourcePlayAtTimeDirectSOFT(ALCcontext *context, ALuint source, ALint64SOFT start_time) AL_API_NOEXCEPT;
+void AL_APIENTRY alSourcePlayAtTimevDirectSOFT(ALCcontext *context, ALsizei n, const ALuint *sources, ALint64SOFT start_time) AL_API_NOEXCEPT;
+
+ALenum AL_APIENTRY EAXSetDirect(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY EAXGetDirect(ALCcontext *context, const struct _GUID *property_set_id, ALuint property_id, ALuint source_id, ALvoid *value, ALuint value_size) AL_API_NOEXCEPT;
+ALboolean AL_APIENTRY EAXSetBufferModeDirect(ALCcontext *context, ALsizei n, const ALuint *buffers, ALint value) AL_API_NOEXCEPT;
+ALenum AL_APIENTRY EAXGetBufferModeDirect(ALCcontext *context, ALuint buffer, ALint *pReserved) AL_API_NOEXCEPT;
+#endif
+#endif
+
+#ifndef AL_SOFT_bformat_hoa
+#define AL_SOFT_bformat_hoa
+#define AL_UNPACK_AMBISONIC_ORDER_SOFT           0x199D
+#endif
+
 #ifdef __cplusplus
 }
 #endif
+/* NOLINTEND */
 
 #endif
diff --git a/code/AL/efx-presets.h b/code/AL/efx-presets.h
index 86dcbda2..acd5bf39 100644
--- a/code/AL/efx-presets.h
+++ b/code/AL/efx-presets.h
@@ -2,6 +2,7 @@
 
 #ifndef EFX_PRESETS_H
 #define EFX_PRESETS_H
+/* NOLINTBEGIN */
 
 #ifndef EFXEAXREVERBPROPERTIES_DEFINED
 #define EFXEAXREVERBPROPERTIES_DEFINED
@@ -345,7 +346,7 @@ typedef struct {
 /* Driving Presets */
 
 #define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \
-    { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+    { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
 
 #define EFX_REVERB_PRESET_DRIVING_PITGARAGE \
     { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
@@ -399,4 +400,5 @@ typedef struct {
 #define EFX_REVERB_PRESET_SMALLWATERROOM \
     { 1.0000f, 0.7000f, 0.3162f, 0.4477f, 1.0000f, 1.5100f, 1.2500f, 1.1400f, 0.8913f, 0.0200f, { 0.0000f, 0.0000f, 0.0000f }, 1.4125f, 0.0300f, { 0.0000f, 0.0000f, 0.0000f }, 0.1790f, 0.1500f, 0.8950f, 0.1900f, 0.9920f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
 
+/* NOLINTEND */
 #endif /* EFX_PRESETS_H */
diff --git a/code/AL/efx.h b/code/AL/efx.h
index 57766983..1e93bf22 100644
--- a/code/AL/efx.h
+++ b/code/AL/efx.h
@@ -1,6 +1,8 @@
 #ifndef AL_EFX_H
 #define AL_EFX_H
 
+/* NOLINTBEGIN */
+#include <float.h>
 
 #include "alc.h"
 #include "al.h"
@@ -203,80 +205,80 @@ extern "C" {
 
 
 /* Effect object function types. */
-typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint);
-typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENEFFECTS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEEFFECTS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISEFFECT)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALEFFECTFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETEFFECTFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 /* Filter object function types. */
-typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint);
-typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENFILTERS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEFILTERS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISFILTER)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALFILTERFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETFILTERFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 /* Auxiliary Effect Slot object function types. */
-typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*);
-typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*);
-typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat);
-typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*);
-typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*);
+typedef void (AL_APIENTRY *LPALGENAUXILIARYEFFECTSLOTS)(ALsizei, ALuint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALDELETEAUXILIARYEFFECTSLOTS)(ALsizei, const ALuint*) AL_API_NOEXCEPT17;
+typedef ALboolean (AL_APIENTRY *LPALISAUXILIARYEFFECTSLOT)(ALuint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, const ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, const ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTI)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTIV)(ALuint, ALenum, ALint*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTF)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
+typedef void (AL_APIENTRY *LPALGETAUXILIARYEFFECTSLOTFV)(ALuint, ALenum, ALfloat*) AL_API_NOEXCEPT17;
 
 #ifdef AL_ALEXT_PROTOTYPES
-AL_API ALvoid AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects);
-AL_API ALvoid AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects);
-AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect);
-AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenEffects(ALsizei n, ALuint *effects) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteEffects(ALsizei n, const ALuint *effects) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 
-AL_API ALvoid AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters);
-AL_API ALvoid AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters);
-AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter);
-AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenFilters(ALsizei n, ALuint *filters) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteFilters(ALsizei n, const ALuint *filters) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 
-AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots);
-AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots);
-AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue);
-AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue);
-AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues);
+AL_API void AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint *effectslots) AL_API_NOEXCEPT;
+AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue) AL_API_NOEXCEPT;
+AL_API void AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues) AL_API_NOEXCEPT;
 #endif
 
 /* Filter ranges and defaults. */
@@ -757,5 +759,6 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum p
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
+/* NOLINTEND */
 
 #endif /* AL_EFX_H */
diff --git a/code/Launcher/CMakeLists.txt b/code/Launcher/CMakeLists.txt
new file mode 100644
index 00000000..133435ff
--- /dev/null
+++ b/code/Launcher/CMakeLists.txt
@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(Launcher)
+
+set(LAUNCHER_SOURCES "${CMAKE_SOURCE_DIR}/code/Launcher/launch_main.cpp")
+
+if (WIN32)
+    set(LAUNCHER_SOURCES ${LAUNCHER_SOURCES}
+    "${CMAKE_SOURCE_DIR}/code/Launcher/launch_win32.cpp"
+    "${CMAKE_SOURCE_DIR}/code/sys/win_resource.rc")
+else()
+    set(LAUNCHER_SOURCES ${LAUNCHER_SOURCES}
+    "${CMAKE_SOURCE_DIR}/code/Launcher/launch_linux.cpp")
+endif()
+
+function (create_launcher name type)
+    if (NOT BUILD_NO_CLIENT)
+        add_executable(openmohaa_launcher_${name} ${LAUNCHER_SOURCES})
+        target_include_directories(openmohaa_launcher_${name} PUBLIC "../qcommon")
+        target_compile_definitions(openmohaa_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type})
+        target_compile_features(openmohaa_launcher_${name} PRIVATE cxx_std_17)
+        set_target_properties(openmohaa_launcher_${name} PROPERTIES OUTPUT_NAME "launch_openmohaa_${name}${TARGET_BIN_SUFFIX}")
+
+        INSTALL(TARGETS openmohaa_launcher_${name} DESTINATION ${CMAKE_INSTALL_BINDIR}/${BIN_INSTALL_SUBDIR})
+    endif()
+
+    #add_executable(omohaaded_launcher_${name} ${LAUNCHER_SOURCES})
+    #target_include_directories(omohaaded_launcher_${name} PUBLIC "../qcommon")
+    #target_compile_definitions(omohaaded_launcher_${name} PRIVATE NO_RC_MANIFEST=1 TARGET_GAME=${type} DEDICATED=1)
+    #target_compile_features(omohaaded_launcher_${name} PRIVATE cxx_std_17)
+    #set_target_properties(omohaaded_launcher_${name} PROPERTIES OUTPUT_NAME "launch_omohaaded_${name}${TARGET_BIN_SUFFIX}")
+    #
+    #INSTALL(TARGETS omohaaded_launcher_${name} DESTINATION ${CMAKE_INSTALL_BINDIR}/${PROJECT_INSTALL_SUBDIR})
+endfunction()
+
+create_launcher(base 0)
+create_launcher(spearhead 1)
+create_launcher(breakthrough 2)
diff --git a/code/renderer/tr_vis.cpp b/code/Launcher/launch.h
similarity index 74%
rename from code/renderer/tr_vis.cpp
rename to code/Launcher/launch.h
index 0236e4e9..3ac1ff8c 100644
--- a/code/renderer/tr_vis.cpp
+++ b/code/Launcher/launch.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,15 +20,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_vis.cpp: visibility culling
+// launch.h: Base interface for starting programs
 
-#include "tr_local.h"
-#include "tr_vis.h"
+#include "q_platform.h"
 
-void R_VisDebug() {
-    // FIXME: unimplemented
-}
+#include <filesystem>
+#include <string>
+#include <vector>
 
-void R_VisDebugLoad(const char* szBSPName) {
-    // FIXME: unimplemented
-}
+std::filesystem::path GetProgramLocation();
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList);
diff --git a/code/Launcher/launch_linux.cpp b/code/Launcher/launch_linux.cpp
new file mode 100644
index 00000000..ee7e7764
--- /dev/null
+++ b/code/Launcher/launch_linux.cpp
@@ -0,0 +1,80 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: Windows implementation of the launcher
+
+#include "launch.h"
+
+#include <unistd.h>
+#include <spawn.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+
+#include <string>
+#include <iostream>
+
+extern "C" char** environ;
+
+std::filesystem::path GetProgramLocation()
+{
+    char path[FILENAME_MAX];
+    ssize_t count = readlink("/proc/self/exe", path, FILENAME_MAX);
+
+    return std::filesystem::path(std::string(path, (count > 0) ? count : 0)).parent_path();
+}
+
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList)
+{
+    pid_t pid;
+    std::string pathString = path.string();
+    size_t argCount = argumentList.size();
+    char** argv;
+    int status;
+
+    argv = new char*[argCount + 2];
+    argv[0] = (char*)pathString.c_str();
+
+    for (size_t i = 0; i < argCount; i++) {
+        argv[i + 1] = (char*)argumentList[i].c_str();
+    }
+    argv[argCount + 1] = NULL;
+
+    //status = posix_spawn(&pid, pathString.c_str(), NULL, NULL, argv, environ);
+    //delete[] argv;
+    //if (status != 0) {
+    //    std::cout << "posix_spawn returned error: " << status << std::endl;
+    //    return;
+    //}
+
+    //
+    // Using execve rather than posix_spawn
+    //  This replaces the current process that is not needed anyway
+    //
+    status = execve(pathString.c_str(), argv, environ);
+    delete[] argv;
+    if (status == -1) {
+        std::cout << "posix_spawn returned error: " << errno << std::endl;
+        return;
+    }
+
+    waitpid(pid, NULL, 0);
+}
diff --git a/code/Launcher/launch_main.cpp b/code/Launcher/launch_main.cpp
new file mode 100644
index 00000000..afefd20a
--- /dev/null
+++ b/code/Launcher/launch_main.cpp
@@ -0,0 +1,67 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: The launcher
+
+#include "launch.h"
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+const char* targetGameList[] =
+{
+    "Base",
+    "Spearhead",
+    "Breakthrough"
+};
+
+int main(int argc, const char* argv[]) {
+    std::vector<std::string> argumentList;
+#if !defined(DEDICATED) || !DEDICATED
+    const char* programName = "openmohaa" ARCH_SUFFIX DLL_SUFFIX EXE_EXT;
+#else
+    const char* programName = "omohaaded" ARCH_SUFFIX DLL_SUFFIX EXE_EXT;
+#endif
+
+    argumentList.push_back("+set");
+    argumentList.push_back("com_target_game");
+    argumentList.push_back(std::to_string(TARGET_GAME));
+
+    for (size_t i = 1; i < argc; i++) {
+        argumentList.push_back(argv[i]);
+    }
+
+    std::cout << "Using the target game: " << targetGameList[TARGET_GAME] << std::endl;
+    std::cout << std::endl;
+    std::cout << "Expected program name: " << programName << std::endl;
+
+    const std::filesystem::path programLocation = GetProgramLocation();
+    const std::filesystem::path programPath = programLocation / programName;
+
+    std::cout << "Program location: " << programLocation << std::endl;
+    std::cout << "Expected path: " << programPath << std::endl;
+
+    LaunchProgram(programPath, argumentList);
+
+    return 0;
+}
diff --git a/code/Launcher/launch_win32.cpp b/code/Launcher/launch_win32.cpp
new file mode 100644
index 00000000..ed506df7
--- /dev/null
+++ b/code/Launcher/launch_win32.cpp
@@ -0,0 +1,87 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// main.cpp: Windows implementation of the launcher
+
+#include "launch.h"
+
+#include <Windows.h>
+#include <string>
+#include <iostream>
+
+std::filesystem::path GetProgramLocation()
+{
+    wchar_t path[FILENAME_MAX] = { 0 };
+    GetModuleFileNameW(nullptr, path, FILENAME_MAX);
+
+    return std::filesystem::path(path).parent_path();
+}
+
+void LaunchProgram(const std::filesystem::path& path, const std::vector<std::string>& argumentList)
+{
+    PROCESS_INFORMATION processInfo;
+    STARTUPINFOW startupInfo;
+    BOOL returnValue;
+    std::wstring osCommandLine;
+    std::wstring commandLine;
+    size_t argCount = argumentList.size();
+
+    memset(&processInfo, 0, sizeof(processInfo));
+    memset(&startupInfo, 0, sizeof(startupInfo));
+    startupInfo.cb = sizeof(startupInfo);
+
+    for (size_t i = 0; i < argCount; i++) {
+        commandLine += L"\"";
+        commandLine += std::wstring(argumentList[i].begin(), argumentList[i].end());
+        commandLine += L"\"";
+        if (i != argCount - 1) {
+            commandLine += L" ";
+        }
+    }
+
+    osCommandLine = path.wstring();
+    osCommandLine += L" ";
+    osCommandLine += commandLine;
+
+    returnValue = CreateProcessW(
+        path.wstring().c_str(),
+        (LPWSTR)osCommandLine.c_str(),
+        NULL,
+        NULL,
+        FALSE,
+        0,
+        NULL,
+        std::filesystem::current_path().wstring().c_str(),
+        &startupInfo,
+        &processInfo
+    );
+
+    if (!returnValue) {
+        std::cout << "Error in CreateProcess: " << GetLastError() << std::endl;
+        return;
+    }
+
+    WaitForSingleObject(processInfo.hProcess, INFINITE);
+
+    CloseHandle(processInfo.hProcess);
+    CloseHandle(processInfo.hThread);
+}
diff --git a/code/autoupdater/autoupdater.c b/code/autoupdater/autoupdater.c
index 4a052027..e013a1f4 100644
--- a/code/autoupdater/autoupdater.c
+++ b/code/autoupdater/autoupdater.c
@@ -933,10 +933,13 @@ static void waitToApplyUpdates(void)
                OS forcibly closes the pipe), we will unblock. Then we can loop on
                kill() until the process is truly gone. */
             int x = 0;
+            struct timespec req;
+            req.tv_sec = 0;
+            req.tv_nsec = 100000000;
             read(3, &x, sizeof (x));
             info("Pipe has closed, waiting for process to fully go away now.");
             while (kill(options.waitforprocess, 0) == 0) {
-                usleep(100000);
+                nanosleep(&req, NULL);
             }
             #endif
         }
diff --git a/code/cgame/CMakeLists.txt b/code/cgame/CMakeLists.txt
index f771fcfe..a0423773 100644
--- a/code/cgame/CMakeLists.txt
+++ b/code/cgame/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(cgame)
 
 # Shared source files for modules
@@ -18,7 +18,7 @@ set(SOURCES_SHARED
 	"../script/scriptvariable.cpp"
 )
 
-file(GLOB_RECURSE SOURCES_BG "../fgame/bg_misc.cpp" "../fgame/bg_pmove.cpp" "../fgame/bg_slidemove.cpp")
+file(GLOB_RECURSE SOURCES_BG "../fgame/bg_misc.cpp" "../fgame/bg_pmove.cpp" "../fgame/bg_slidemove.cpp" "../fgame/bg_voteoptions.cpp")
 file(GLOB_RECURSE SOURCES_CGAME "./*.c" "./*.cpp")
 
 add_library(cgame SHARED ${SOURCES_CGAME} ${SOURCES_BG})
@@ -27,16 +27,11 @@ target_compile_features(cgame PUBLIC cxx_nullptr)
 target_compile_features(cgame PUBLIC c_variadic_macros)
 target_link_libraries(cgame PUBLIC qcommon)
 
-set_target_properties(cgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
-set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_ARCH_SUFFIX}")
-set_target_properties(cgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
+set_target_properties(cgame PROPERTIES PREFIX "")
+set_target_properties(cgame PROPERTIES OUTPUT_NAME "cgame${TARGET_BIN_SUFFIX}")
 
-INSTALL(
-	TARGETS cgame
-	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
-	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
-)
+INSTALL(TARGETS cgame DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION "${TARGET_BASE_GAME}" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:cgame> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
 endif()
\ No newline at end of file
diff --git a/code/cgame/cg_archive.cpp b/code/cgame/cg_archive.cpp
index 3609099f..3d944fb9 100644
--- a/code/cgame/cg_archive.cpp
+++ b/code/cgame/cg_archive.cpp
@@ -22,43 +22,175 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 #include "cg_archive.h"
+#include "cg_commands.h"
+#include "memarchiver.h"
+#include "../qcommon/tiki.h"
 
 void CG_ArchiveStuff(MemArchiver& archiver, int svsTime)
 {
-	// FIXME: unimplemented
+	archiver.SetBaseTime(svsTime);
+	commandManager.ArchiveToMemory(archiver);
+	CG_ArchiveVSSGlobals(archiver);
 }
 
-void CG_SaveStateToBuffer(void** out, int svsTime)
+size_t CG_SaveStateToBuffer(void** out, int svsTime)
 {
-	// FIXME: unimplemented
+	MemArchiver archiver;
+	size_t size;
+
+	archiver.SetupForWriting(0x200000);
+	CG_ArchiveStuff(archiver, svsTime);
+	size = archiver.BufferSize();
+	if (size && out) {
+		*out = archiver.ConfiscateBuffer();
+	}
+
+	return size;
 }
 
-void CG_LoadStateToBuffer(void* state, int size, int svsTime)
+qboolean CG_LoadStateToBuffer(void* state, size_t size, int svsTime)
 {
-	// FIXME: unimplemented
+	MemArchiver archiver;
+
+	archiver.SetupForReading((byte*)state, size);
+	CG_ArchiveStuff(archiver, svsTime);
+
+	return archiver.FinishedReading();
 }
 
 void CG_ArchiveStringContainer(MemArchiver& archiver, Container<str>* container)
 {
-	// FIXME: unimplemented
+    int num;
+    int i;
+
+	if (archiver.IsReading()) {
+		str tmp;
+
+		archiver.ArchiveInteger(&num);
+		container->ClearObjectList();
+
+		for (i = 0; i < num; i++) {
+			archiver.ArchiveString(&tmp);
+			container->AddObject(tmp);
+		}
+	} else {
+        num = container->NumObjects();
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+			str& tmp = container->ObjectAt(i + 1);
+			archiver.ArchiveString(&tmp);
+		}
+	}
 }
 
 void CG_ArchiveTikiPointer(MemArchiver& archiver, dtiki_t** pTiki)
 {
-	// FIXME: unimplemented
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*pTiki = cgi.R_Model_GetHandle(cgi.R_RegisterModel(tmp.c_str()));
+		} else {
+			*pTiki = NULL;
+		}
+	} else {
+		if (*pTiki) {
+			tmp = (*pTiki)->name;
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
 }
 
 void CG_ArchiveModelHandle(MemArchiver& archiver, qhandle_t* handle)
 {
-	// FIXME: unimplemented
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*handle = cgi.R_RegisterModel(tmp.c_str());
+		} else {
+			*handle = (qhandle_t)0;
+		}
+	} else {
+		if (*handle) {
+			tmp = cgi.R_GetModelName(*handle);
+		} else {
+			tmp = "";
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
 }
 
 void CG_ArchiveShaderHandle(MemArchiver& archiver, qhandle_t* handle)
 {
-	// FIXME: unimplemented
+    str tmp;
+
+	if (archiver.IsReading()) {
+		archiver.ArchiveString(&tmp);
+		if (tmp.length()) {
+			*handle = cgi.R_RegisterShader(tmp.c_str());
+		} else {
+			*handle = (qhandle_t)0;
+		}
+	} else {
+		if (*handle) {
+			tmp = cgi.R_GetShaderName(*handle);
+		} else {
+			tmp = "";
+		}
+
+		archiver.ArchiveString(&tmp);
+	}
 }
 
 void CG_ArchiveRefEntity(MemArchiver& archiver, refEntity_t* ref)
 {
-	// FIXME: unimplemented
+    archiver.ArchiveRaw(&ref->reType, sizeof(ref->reType));
+    archiver.ArchiveInteger(&ref->renderfx);
+
+    CG_ArchiveModelHandle(archiver, &ref->hModel);
+    CG_ArchiveModelHandle(archiver, &ref->hOldModel);
+
+    archiver.ArchiveVec3(ref->lightingOrigin);
+    archiver.ArchiveInteger(&ref->parentEntity);
+    archiver.ArchiveVec3(ref->axis[0]);
+    archiver.ArchiveVec3(ref->axis[1]);
+    archiver.ArchiveVec3(ref->axis[2]);
+    archiver.ArchiveBoolean(&ref->nonNormalizedAxes);
+    archiver.ArchiveVec3(ref->origin);
+    archiver.ArchiveRaw(ref->frameInfo, sizeof(ref->frameInfo));
+    archiver.ArchiveFloat(&ref->actionWeight);
+    archiver.ArchiveShort(&ref->wasframe);
+    archiver.ArchiveFloat(&ref->scale);
+    archiver.ArchiveVec3(ref->oldorigin);
+    archiver.ArchiveInteger(&ref->skinNum);
+
+    CG_ArchiveShaderHandle(archiver, &ref->customShader);
+    archiver.ArchiveRaw(ref->shaderRGBA, sizeof(ref->shaderRGBA));
+    archiver.ArchiveFloat(ref->shaderTexCoord);
+    archiver.ArchiveFloat(&ref->shaderTexCoord[1]);
+    archiver.ArchiveFloat(&ref->shaderTime);
+
+    archiver.ArchiveInteger(&ref->entityNumber);
+    archiver.ArchiveRaw(ref->surfaces, 32);
+    archiver.ArchiveFloat(ref->shader_data);
+    archiver.ArchiveFloat(&ref->shader_data[1]);
+
+    ref->bone_tag = NULL;
+    ref->bone_quat = NULL;
+    ref->of = NULL;
+    ref->nf = NULL;
+
+    CG_ArchiveTikiPointer(archiver, &ref->tiki);
+
+    archiver.ArchiveInteger(&ref->bonestart);
+    archiver.ArchiveInteger(&ref->morphstart);
+    archiver.ArchiveBoolean(&ref->hasMorph);
+    archiver.ArchiveFloat(&ref->radius);
+    archiver.ArchiveFloat(&ref->rotation);
 }
diff --git a/code/cgame/cg_archive.h b/code/cgame/cg_archive.h
index de095674..27ad8fbd 100644
--- a/code/cgame/cg_archive.h
+++ b/code/cgame/cg_archive.h
@@ -30,15 +30,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/container.h"
 #include "../qcommon/str.h"
 
-class MemArchiver {
-
-};
+class MemArchiver;
 
 extern "C" {
 #endif
 
-void CG_SaveStateToBuffer(void** out, int svsTime);
-void CG_LoadStateToBuffer(void* state, int size, int svsTime);
+size_t CG_SaveStateToBuffer(void** out, int svsTime);
+qboolean CG_LoadStateToBuffer(void* state, size_t size, int svsTime);
 
 #ifdef __cplusplus
 void CG_ArchiveStuff(MemArchiver& archiver, int svsTime);
diff --git a/code/cgame/cg_commands.cpp b/code/cgame/cg_commands.cpp
index 77506a88..0ccee1bc 100644
--- a/code/cgame/cg_commands.cpp
+++ b/code/cgame/cg_commands.cpp
@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_specialfx.h"
 #include "scriptexception.h"
 #include "tiki.h"
+#include "cg_archive.h"
+#include "memarchiver.h"
 
 refEntity_t *current_entity        = NULL;
 int          current_entity_number = -1;
@@ -43,14 +45,45 @@ void CacheResource(const char *stuff);
 
 ClientGameCommandManager commandManager;
 
-Event EV_Client_StartBlock("(", EV_DEFAULT, NULL, NULL, "Signals the beginning of a block of commands");
-Event EV_Client_EndBlock(")", EV_DEFAULT, NULL, NULL, "Signals the end of a block of commands");
-Event EV_Client_EmitterStartOff(
-    "startoff", EV_DEFAULT, NULL, NULL, "Signals an emitter to start in the off state (no tempmodels are emitted)"
+Event EV_Client_StartBlock
+(
+    "(",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signals the beginning of a block of commands"
 );
-Event EV_Client_SetAlpha("alpha", EV_DEFAULT, "f", "alpha", "Set the alpha of the spawned tempmodel");
-Event EV_Client_SetDieTouch(
-    "dietouch", EV_DEFAULT, NULL, NULL, "Set the spawned tempmodels to die when they touch a solid"
+Event EV_Client_EndBlock
+(
+    ")",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signals the end of a block of commands"
+);
+Event EV_Client_EmitterStartOff
+(
+    "startoff",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signals an emitter to start in the off state (no tempmodels are emitted)"
+);
+Event EV_Client_SetAlpha
+(
+    "alpha",
+    EV_DEFAULT,
+    "f",
+    "alpha",
+    "Set the alpha of the spawned tempmodel"
+);
+Event EV_Client_SetDieTouch
+(
+    "dietouch",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the spawned tempmodels to die when they touch a solid"
 );
 Event EV_Client_SetBounceFactor(
     "bouncefactor",
@@ -67,15 +100,46 @@ Event EV_Client_SetBounceSound(
     "sound [delay]",
     "When bouncing, what sound to play on impact and an option delay (default is 1 second) between playing this sound"
 );
-Event EV_Client_SetBounceSoundOnce(
-    "bouncesoundonce", EV_DEFAULT, "s", "sound", "When bouncing, what sound to play on impact one time"
+Event EV_Client_SetBounceSoundOnce
+(
+    "bouncesoundonce",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "When bouncing, what sound to play on impact one time"
 );
-Event EV_Client_SetScale("scale", EV_DEFAULT, "f", "scale", "Set the scale of a spawned tempmodel");
-Event EV_Client_SetScaleUpDown(
-    "scaleupdown", EV_DEFAULT, NULL, NULL, "Set the tempmodel to scale up to scale value and then down."
+Event EV_Client_SetScale
+(
+    "scale",
+    EV_DEFAULT,
+    "f",
+    "scale",
+    "Set the scale of a spawned tempmodel"
+);
+Event EV_Client_SetScaleUpDown
+(
+    "scaleupdown",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the tempmodel to scale up to scale value and then down."
+);
+Event EV_Client_SetScaleMin
+(
+    "scalemin",
+    EV_DEFAULT,
+    "f",
+    "scalemin",
+    "Set the minimum scale of a spawned tempmodel"
+);
+Event EV_Client_SetScaleMax
+(
+    "scalemax",
+    EV_DEFAULT,
+    "f",
+    "scalemax",
+    "Set the maximum scale of a spawned tempmodel"
 );
-Event EV_Client_SetScaleMin("scalemin", EV_DEFAULT, "f", "scalemin", "Set the minimum scale of a spawned tempmodel");
-Event EV_Client_SetScaleMax("scalemax", EV_DEFAULT, "f", "scalemax", "Set the maximum scale of a spawned tempmodel");
 Event EV_Client_SetModel(
     "model",
     EV_DEFAULT,
@@ -84,9 +148,21 @@ Event EV_Client_SetModel(
     "Set the modelname of the tempmodel.  If more than 1 model is specified, it will\n"
     "be randomly chosen when spawned"
 );
-Event EV_Client_SetLife("life", EV_DEFAULT, "f", "life", "Set the life (in seconds) of the spawned tempmodel");
-Event EV_Client_SetColor(
-    "color", EV_DEFAULT, "fffF", "red green blue alpha", "Set the color (modulate) of the spawned tempmodel."
+Event EV_Client_SetLife
+(
+    "life",
+    EV_DEFAULT,
+    "f",
+    "life",
+    "Set the life (in seconds) of the spawned tempmodel"
+);
+Event EV_Client_SetColor
+(
+    "color",
+    EV_DEFAULT,
+    "fffF",
+    "red green blue alpha",
+    "Set the color (modulate) of the spawned tempmodel."
 );
 Event EV_Client_SetRadialVelocity(
     "radialvelocity",
@@ -96,16 +172,32 @@ Event EV_Client_SetRadialVelocity(
     "Subtracts the particle origin from origin and multiplies by scale, then adds additional velocity\n"
     "between min and max... negative values bring toward origin\n"
 );
-Event EV_Client_SetVelocity(
-    "velocity", EV_DEFAULT, "f", "forwardVelocity", "Set the forward velocity of the spawned tempmodel"
+Event EV_Client_SetVelocity
+(
+    "velocity",
+    EV_DEFAULT,
+    "f",
+    "forwardVelocity",
+    "Set the forward velocity of the spawned tempmodel"
 );
-Event EV_Client_SetAngularVelocity(
-    "avelocity", EV_DEFAULT, "fff", "yawVel pitchVel rollVel", "Set the angular velocity of the spawned tempmodel"
+Event EV_Client_SetAngularVelocity
+(
+    "avelocity",
+    EV_DEFAULT,
+    "fff",
+    "yawVel pitchVel rollVel",
+    "Set the angular velocity of the spawned tempmodel"
 );
-Event EV_Client_SetColorVelocity(
-    "colorvelocity", EV_DEFAULT, "fff", "rVel gVel bVel", "Set the color velocity of the spawned dlight tempmodel"
+Event EV_Client_SetColorVelocity
+(
+    "colorvelocity",
+    EV_DEFAULT,
+    "fff",
+    "rVel gVel bVel",
+    "Set the color velocity of the spawned dlight tempmodel"
 );
-Event EV_Client_SetRandomVelocity(
+Event EV_Client_SetRandomVelocity
+(
     "randvel",
     EV_DEFAULT,
     "SfFSfFSfF",
@@ -119,7 +211,8 @@ Event EV_Client_SetRandomVelocity(
     "without randomness.\n"
     "This velocity is applied using the world axis"
 );
-Event EV_Client_SetRandomVelocityAlongAxis(
+Event EV_Client_SetRandomVelocityAlongAxis
+(
     "randvelaxis",
     EV_DEFAULT,
     "SfFSfFSfF",
@@ -134,7 +227,16 @@ Event EV_Client_SetRandomVelocityAlongAxis(
     "without randomness.\n"
     "This velocity is applied using the parent axis"
 );
-Event EV_Client_SetAccel(
+Event EV_Client_NoTagAxis
+(
+    "notagaxis",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Forces the effect to use the model's orientation for randvelaxis and offsetalongaxis"
+);
+Event EV_Client_SetAccel
+(
     "accel",
     EV_DEFAULT,
     "fff",
@@ -150,7 +252,8 @@ Event EV_Client_SetFriction(
     "Set the friction as a fraction of velocity per second... exact effect depends on physics rate:\n"
     "slowdown per second = [1 - (friction / physicsrate)] ^ physicsrate; physicsrate defaults to 10"
 );
-Event EV_Client_SetSpin(
+Event EV_Client_SetSpin
+(
     "spin",
     EV_DEFAULT,
     "f",
@@ -160,8 +263,13 @@ Event EV_Client_SetSpin(
 Event EV_Client_SetVaryColor(
     "varycolor", EV_DEFAULT, NULL, NULL, "Sets the color to vary by 0 to -20% of specified color"
 );
-Event EV_Client_SetSmokeParms(
-    "smokeparms", EV_DEFAULT, "fff", "typeinfo fademult scalemult", "Sets some misc parms for smoke"
+Event EV_Client_SetSmokeParms
+(
+    "smokeparms",
+    EV_DEFAULT,
+    "fff",
+    "typeinfo fademult scalemult",
+    "Sets some misc parms for smoke"
 );
 Event EV_Client_SetCount(
     "count",
@@ -172,18 +280,45 @@ Event EV_Client_SetCount(
     "This is only used for the originspawn and tagspawn commands,\n"
     "and not for emitters, use spawnrate instead"
 );
-Event EV_Client_SetFade("fade", EV_DEFAULT, NULL, NULL, "Set the tempmodel to fade out over it's life");
-Event EV_Client_SetFadeDelay("fadedelay", EV_DEFAULT, "f", "time", "Set the amount of time to delay a fade");
-Event EV_Client_SetFadeIn("fadein", EV_DEFAULT, "f", "time", "Set the tempmodel to fade in over the specified time");
-Event EV_Client_SetTwinkle(
+Event EV_Client_SetFade
+(
+    "fade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the tempmodel to fade out over it's life"
+);
+Event EV_Client_SetFadeDelay
+(
+    "fadedelay",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Set the amount of time to delay a fade"
+);
+Event EV_Client_SetFadeIn
+(
+    "fadein",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Set the tempmodel to fade in over the specified time"
+);
+Event EV_Client_SetTwinkle
+(
     "twinkle",
     EV_DEFAULT,
     "ffff",
     "mintimeoff maxtimeoff mintimeon maxtimeon",
     "Set the tempmodel to twinkle with the specified settings"
 );
-Event EV_Client_SetTrail(
-    "trail", EV_DEFAULT, "sssf", "shader startTag endTag life", "Set the tempmodel to have a swipe that follows it"
+Event EV_Client_SetTrail
+(
+    "trail",
+    EV_DEFAULT,
+    "sssf",
+    "shader startTag endTag life",
+    "Set the tempmodel to have a swipe that follows it"
 );
 Event EV_Client_SetSpawnRange(
     "spawnrange",
@@ -193,7 +328,8 @@ Event EV_Client_SetSpawnRange(
     "Sets the range in which this effect will spawn tempmodels.  If one number is specified, it is the max range\n"
     "and 0 is the min range; if two numbers are specified, the larger is the max range.\n"
 );
-Event EV_Client_SetSpawnRate(
+Event EV_Client_SetSpawnRate
+(
     "spawnrate",
     EV_DEFAULT,
     "f",
@@ -223,7 +359,8 @@ Event EV_Client_SetScaleRate(
     "Set the scaling rate of the spawned tempmodel\n"
     "If a negative rate is used, the model will shrink"
 );
-Event EV_Client_SetCircle(
+Event EV_Client_SetCircle
+(
     "circle",
     EV_DEFAULT,
     NULL,
@@ -250,10 +387,16 @@ Event EV_Client_SetInwardSphere(
     "spehere radius and some velocity so the models look like they're heading toward the\n"
     "center of the sphere."
 );
-Event EV_Client_SetRadius(
-    "radius", EV_DEFAULT, "f", "radius", "Set the radius of the sphere for the inwardsphere amd sphere settings"
+Event EV_Client_SetRadius
+(
+    "radius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the radius of the sphere for the inwardsphere amd sphere settings"
 );
-Event EV_Client_SetSwarm(
+Event EV_Client_SetSwarm
+(
     "swarm",
     EV_DEFAULT,
     "iff",
@@ -273,15 +416,24 @@ Event EV_Client_SetWavy(
     "If random is specified, the distance is between 0 and +specified distance\n"
     "If crandom is specified, the distance is between -specified and +specified distance"
 );
-Event EV_Client_SetAlign("align", EV_DEFAULT, NULL, NULL, "Align the tempmodels to the direction they are traveling");
-Event EV_Client_SetAlignOnce(
+Event EV_Client_SetAlign
+(
+    "align",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Align the tempmodels to the direction they are traveling"
+);
+Event EV_Client_SetAlignOnce
+(
     "alignonce",
     EV_DEFAULT,
     NULL,
     NULL,
     "Align the tempmodels to the direction they are traveling at the time they are initialized"
 );
-Event EV_Client_SetFlickerAlpha(
+Event EV_Client_SetFlickerAlpha
+(
     "flicker",
     EV_DEFAULT,
     NULL,
@@ -296,7 +448,8 @@ Event EV_Client_SetCollision(
     "Turn on collision for the tempmodel.\n"
     "If the keyword water is specified, then the tempmodel will collide with water"
 );
-Event EV_Client_TagSpawn(
+Event EV_Client_TagSpawn
+(
     "tagspawn",
     EV_DEFAULT,
     "s",
@@ -312,7 +465,8 @@ Event EV_Client_TagSpawnLinked(
     "Spawn tempmodels from the specified tag, linked to the entity at the tag.\n"
     "This command is followed by a ( to specify a block of commands that modify the tempmodels"
 );
-Event EV_Client_OriginSpawn(
+Event EV_Client_OriginSpawn
+(
     "originspawn",
     EV_DEFAULT,
     NULL,
@@ -320,7 +474,8 @@ Event EV_Client_OriginSpawn(
     "Spawn tempmodels from the origin.\n"
     "This command is followed by a ( to specify a block of commands that modify the tempmodels"
 );
-Event EV_Client_OriginBeamSpawn(
+Event EV_Client_OriginBeamSpawn
+(
     "originbeamspawn",
     EV_DEFAULT,
     NULL,
@@ -328,7 +483,8 @@ Event EV_Client_OriginBeamSpawn(
     "Spawn a beam from the origin.\n"
     "This command is followed by a ( to specify a block of commands that modify the beam"
 );
-Event EV_Client_OriginBeamEmitter(
+Event EV_Client_OriginBeamEmitter
+(
     "originbeamemitter",
     EV_DEFAULT,
     NULL,
@@ -336,7 +492,8 @@ Event EV_Client_OriginBeamEmitter(
     "Spawn beams from the origin.\n"
     "This command is followed by a ( to specify a block of commands that modify the beam"
 );
-Event EV_Client_TagEmitter(
+Event EV_Client_TagEmitter
+(
     "tagemitter",
     EV_DEFAULT,
     "ss",
@@ -344,7 +501,8 @@ Event EV_Client_TagEmitter(
     "Create an emitter that spawns tempmodels from the specified tag.\n"
     "This command is followed by a ( to specify a block of commands that modify the tempmodels"
 );
-Event EV_Client_OriginEmitter(
+Event EV_Client_OriginEmitter
+(
     "originemitter",
     EV_DEFAULT,
     "s",
@@ -352,54 +510,118 @@ Event EV_Client_OriginEmitter(
     "Create an emitter that spawns tempmodels from the origin.\n"
     "This command is followed by a ( to specify a block of commands that modify the tempmodels"
 );
-Event EV_Client_EmitterOn("emitteron", EV_DEFAULT, "s", "emitterName", "Turn the specified emitter on");
-Event EV_Client_EmitterOff("emitteroff", EV_DEFAULT, "s", "emitterName", "Turn the specified emitter off");
-Event EV_Client_Sound(
+Event EV_Client_EmitterOn
+(
+    "emitteron",
+    EV_DEFAULT,
+    "s",
+    "emitterName",
+    "Turn the specified emitter on"
+);
+Event EV_Client_EmitterOff
+(
+    "emitteroff",
+    EV_DEFAULT,
+    "s",
+    "emitterName",
+    "Turn the specified emitter off"
+);
+Event EV_Client_Sound
+(
     "sound",
     EV_DEFAULT,
     "sSFFFFS",
     "soundName channelName volume min_distance pitch randompitch randomvolume argstype",
     "Play the specified sound"
 );
-Event EV_Set_Current_Tiki(
+Event EV_Set_Current_Tiki
+(
     "settiki",
     EV_DEFAULT,
     "s",
     "settiki tikiname - all subsequent events are applied to this tiki",
     "sets the tiki the aliases should be on in the sound uberfile"
 );
-Event EV_Client_StopSound("stopsound", EV_DEFAULT, "i", "channel", "Stops the sound on the specified channel.");
-Event EV_Client_StopAliasChannel(
-    "stopaliaschannel", EV_DEFAULT, "s", "alias", "Stops the sound channel used by the specified alias."
+Event EV_Client_StopSound
+(
+    "stopsound",
+    EV_DEFAULT,
+    "i",
+    "channel",
+    "Stops the sound on the specified channel."
 );
-Event EV_Client_LoopSound(
-    "loopsound", EV_DEFAULT, "sFFf", "soundName volume min_distance pitch", "Play the specifed sound as a looping sound"
+Event EV_Client_StopAliasChannel
+(
+    "stopaliaschannel",
+    EV_DEFAULT,
+    "s",
+    "alias",
+    "Stops the sound channel used by the specified alias."
 );
-Event EV_Client_Cache("cache", EV_CACHE, "s", "resourceName", "Cache the specified resource");
-Event EV_Client_CacheImage(
+Event EV_Client_LoopSound
+(
+    "loopsound",
+    EV_DEFAULT,
+    "sFFf",
+    "soundName volume min_distance pitch",
+    "Play the specified sound as a looping sound"
+);
+// Added in 2.0
+Event EV_Client_StopLoopSound
+(
+    "stoploopsound",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop the looping sound"
+);
+Event EV_Client_Cache
+(
+    "cache",
+    EV_CACHE,
+    "s",
+    "resourceName",
+    "Cache the specified resource"
+);
+Event EV_Client_CacheImage
+(
     "cacheimage",
     EV_CACHE,
     "s",
     "imageName",
     "Cache the specified image (For menu graphics that should never be picmiped)"
 );
-Event EV_Client_CacheFont("cachefont", EV_CACHE, "s", "resourceName", "Cache the specified resource");
-Event EV_Client_AliasCache(
+Event EV_Client_CacheFont
+(
+    "cachefont",
+    EV_CACHE,
+    "s",
+    "resourceName",
+    "Cache the specified resource"
+);
+Event EV_Client_AliasCache
+(
     "aliascache",
     EV_DEFAULT,
     "ssSSSSSS",
     "alias realPath arg1 arg2 arg3 arg4 arg5 arg6",
     "Create an alias to the specified path and cache the resource"
 );
-Event EV_Client_Alias(
+Event EV_Client_Alias
+(
     "alias",
     EV_DEFAULT,
     "ssSSSSSS",
     "alias realPath arg1 arg2 arg3 arg4 arg5 arg6",
     "Create an alias to the specified path"
 );
-Event EV_Client_CacheAlias(
-    "cachefromalias", EV_DEFAULT, "s", "alias", "Caches all data matching a previously specified alias"
+Event EV_Client_CacheAlias
+(
+    "cachefromalias",
+    EV_DEFAULT,
+    "s",
+    "alias",
+    "Caches all data matching a previously specified alias"
 );
 Event EV_Client_Footstep(
     "footstep",
@@ -409,22 +631,29 @@ Event EV_Client_Footstep(
     "Play a footstep sound that is appropriate to the surface we are currently stepping on\n"
     "sRunning should be set to run, walk, or ladder"
 );
-Event EV_Client_Landing(
-    "footstep",
+Event EV_Client_Landing
+(
+    "landing",
     EV_DEFAULT,
     "FI",
     "fVolume iEquipment",
     "Play a landing sound that is appropriate to the surface we are landing on\n"
 );
-Event EV_Client_BodyFall(
+Event EV_Client_BodyFall
+(
     "bodyfall",
     EV_DEFAULT,
     "F",
     "fVolume",
     "Play a body fall sound that is appropriate to the surface we are falling on\n"
 );
-Event EV_Client_Client(
-    "client", EV_DEFAULT, "SSSSSS", "arg1 arg2 arg3 arg4 arg5 arg6", "Execute the specified command arg string"
+Event EV_Client_Client
+(
+    "client",
+    EV_DEFAULT,
+    "SSSSSS",
+    "arg1 arg2 arg3 arg4 arg5 arg6",
+    "Execute the specified command arg string"
 );
 Event EV_Client_OriginDynamicLight(
     "origindlight",
@@ -466,15 +695,36 @@ Event EV_Client_BlockDynamicLight(
     "The intensity is the radius of the light\n"
     "type is the type of light to create (lensflare,viewlensflare,additive)"
 );
-Event EV_Client_SetEntityColor(
-    "entcolor", EV_DEFAULT, "fffF", "red green blue alpha", "Set the color(modulate) of this entity"
+Event EV_Client_SetEntityColor
+(
+    "entcolor",
+    EV_DEFAULT,
+    "fffF",
+    "red green blue alpha",
+    "Set the color(modulate) of this entity"
 );
-Event EV_Client_SetTexAnimTime("texanimtime", EV_DEFAULT, "f", "time", "Set the texture animation speed");
-Event EV_Client_SetGlobalFade(
-    "globalfade", EV_DEFAULT, "S", "[in|out]", "Set the tempmodels to globally fade in or out together"
+Event EV_Client_SetTexAnimTime
+(
+    "texanimtime",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Set the texture animation speed"
 );
-Event EV_Client_SetParentLink(
-    "parentlink", EV_DEFAULT, NULL, NULL, "Set the tempmodels linked to the parent, so they move with the parent model"
+Event EV_Client_SetGlobalFade
+(
+    "globalfade",
+    EV_DEFAULT,
+    "S",
+    "[in|out]",
+    "Set the tempmodels to globally fade in or out together"
+);
+Event EV_Client_SetParentLink
+(
+    "parentlink", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the tempmodels linked to the parent, so they move with the parent model"
 );
 Event EV_Client_SetHardLink(
     "hardlink",
@@ -483,11 +733,24 @@ Event EV_Client_SetHardLink(
     NULL,
     "Set the tempmodels linked to the model they are spawned from, so they move with it"
 );
-Event EV_Client_SetRandomRoll(
-    "randomroll", EV_DEFAULT, NULL, NULL, "Set the tempmodels so they pick a random roll value every frame"
+Event EV_Client_SetRandomRoll
+(
+    "randomroll",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the tempmodels so they pick a random roll value every frame"
 );
-Event EV_Client_ParentAngles("parentangles", EV_DEFAULT, NULL, NULL, "Set the tempmodels angles to that of its parent");
-Event EV_Client_EmitterAngles(
+Event EV_Client_ParentAngles
+(
+    "parentangles",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the tempmodels angles to that of its parent"
+);
+Event EV_Client_EmitterAngles
+(
     "emitterangles",
     EV_DEFAULT,
     "FFF",
@@ -506,46 +769,109 @@ Event EV_Client_SetAngles(
     "from the first number to the first number plus the second number.\n"
     "If no keyword is explicitly specified, then the component will be just set\n"
 );
-Event EV_Client_SetRelativeAngles(
+Event EV_Client_SetRelativeAngles
+(
     "relativeangles",
     EV_DEFAULT,
     "",
     "",
     "makes the spawn angles get applied relative to the orientation of the model"
 );
-Event EV_Client_Swipe("swipe", EV_DEFAULT, "V", "origin", "Do a swipe and add it on to the swipe rendering list.");
-Event EV_Client_SwipeOn(
+Event EV_Client_Swipe
+(
+    "swipe",
+    EV_DEFAULT,
+    "V",
+    "origin",
+    "Do a swipe and add it on to the swipe rendering list."
+);
+Event EV_Client_SwipeOn
+(
     "swipeon",
     EV_DEFAULT,
     "ssff",
     "shader startTagName endTagNamelife life",
     "Signal the start of a swipe from the current tag"
 );
-Event EV_Client_SwipeOff("swipeoff", EV_DEFAULT, NULL, NULL, "Signal the end of a swipe");
-Event EV_Client_BeginTagBeamEmitter(
+Event EV_Client_SwipeOff
+(
+    "swipeoff",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signal the end of a swipe"
+);
+Event EV_Client_BeginTagBeamEmitter
+(
     "tagbeamemitter",
     EV_DEFAULT,
     "sss",
     "tagstart tagend name",
     "Create a beam emitter that uses 2 tags to determine it's start and end position"
 );
-Event EV_Client_BeginTagBeamSpawn(
+Event EV_Client_BeginTagBeamSpawn
+(
     "tagbeamspawn",
     EV_DEFAULT,
     "sf",
     "tagstart name",
     "Create a beam emitter that uses the tag to determine it's starting position."
 );
-Event EV_Client_AnimateOnce(
-    "animateonce", EV_DEFAULT, NULL, NULL, "Set a tempmodel to animate once and then get removed"
+Event EV_Client_AnimateOnce
+(
+    "animateonce",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set a tempmodel to animate once and then get removed"
 );
-Event EV_Client_SetAnim("anim", EV_DEFAULT, "s", "animation", "Set a tempmodel the the specified animation");
-Event EV_Client_SetSubdivisions("numsegments", EV_DEFAULT, "i", "numsegments", "Set the number of segments in a beam");
-Event EV_Client_SetMinOffset("minoffset", EV_DEFAULT, "f", "minoffset", "Set the minimum offset from center in a beam");
-Event EV_Client_SetMaxOffset("maxoffset", EV_DEFAULT, "f", "maxoffset", "Set the maximum offset from center in a beam");
-Event EV_Client_SetBeamShader("beamshader", EV_DEFAULT, "s", "shadername", "Set the shader to use for the beam");
-Event EV_Client_SetBeamLength(
-    "beamlength", EV_DEFAULT, "f", "length", "Set the length of the beam or trace length (for decals)"
+Event EV_Client_SetAnim
+(
+    "anim",
+    EV_DEFAULT,
+    "s",
+    "animation",
+    "Set a tempmodel the the specified animation"
+);
+Event EV_Client_SetSubdivisions
+(
+    "numsegments",
+    EV_DEFAULT,
+    "i",
+    "numsegments",
+    "Set the number of segments in a beam"
+);
+Event EV_Client_SetMinOffset
+(
+    "minoffset",
+    EV_DEFAULT,
+    "f",
+    "minoffset",
+    "Set the minimum offset from center in a beam"
+);
+Event EV_Client_SetMaxOffset
+(
+    "maxoffset",
+    EV_DEFAULT,
+    "f",
+    "maxoffset",
+    "Set the maximum offset from center in a beam"
+);
+Event EV_Client_SetBeamShader
+(
+    "beamshader",
+    EV_DEFAULT,
+    "s",
+    "shadername",
+    "Set the shader to use for the beam"
+);
+Event EV_Client_SetBeamLength
+(
+    "beamlength",
+    EV_DEFAULT,
+    "f",
+    "length",
+    "Set the length of the beam or trace length (for decals)"
 );
 Event EV_Client_SetBeamDelay(
     "beamdelay",
@@ -564,26 +890,45 @@ Event EV_Client_SetBeamToggleDelay(
     "If the keyword random is specified, the delay between toggling will occur randomly between 0 and the time "
     "specified"
 );
-Event EV_Client_SetBeamPersist("beampersist", EV_DEFAULT, NULL, NULL, "Make the beams persist instead of blinking out");
-Event EV_Client_SetBeamOffsetEndpoints(
-    "beam_offset_endpoints", EV_DEFAULT, NULL, NULL, "Make the beams endpoints offset to reduce the bunching up effect"
+Event EV_Client_SetBeamPersist
+(
+    "beampersist",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the beams persist instead of blinking out"
 );
-Event EV_Client_BeamSphere(
+Event EV_Client_SetBeamOffsetEndpoints
+(
+    "beam_offset_endpoints",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the beams endpoints offset to reduce the bunching up effect"
+);
+Event EV_Client_BeamSphere
+(
     "beamsphere",
     EV_DEFAULT,
     "i",
     "count",
     "Create a sphere shaped beam effect from the origin. Count is the number of beams"
 );
-Event EV_Client_Spread(
+Event EV_Client_Spread
+(
     "spread",
     EV_DEFAULT,
     "ff",
     "spreadx spready",
     "Add a random variance in the spawned beam in the forward direction by the amound specified in spreadx and spready"
 );
-Event EV_Client_UseLastTraceEnd(
-    "uselasttraceend", EV_DEFAULT, NULL, NULL, "Makes this trace command use the end results of the last trace command"
+Event EV_Client_UseLastTraceEnd
+(
+    "uselasttraceend",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes this trace command use the end results of the last trace command"
 );
 Event EV_Client_OffsetAlongAxis(
     "offsetalongaxis",
@@ -599,22 +944,32 @@ Event EV_Client_OffsetAlongAxis(
     "without randomness.\n"
     "This offset is applied using the model's local axis"
 );
-Event EV_Client_Cone(
+Event EV_Client_Cone
+(
     "cone",
     EV_DEFAULT,
     "ff",
     "height radius",
     "Randomly spawns the particle somewhere inside a cone along the model's local x axis"
 );
-Event EV_Client_SetEndAlpha("endalpha", EV_DEFAULT, "f", "alpha", "Set the alpha of the beam's endpoint");
-Event EV_Client_RandomChance(
+Event EV_Client_SetEndAlpha
+(
+    "endalpha",
+    EV_DEFAULT,
+    "f",
+    "alpha",
+    "Set the alpha of the beam's endpoint"
+);
+Event EV_Client_RandomChance
+(
     "randomchance",
     EV_DEFAULT,
     "fSSSSSS",
     "percentage [arg1] [arg2] [arg3] [arg4] [arg5] [arg6]",
     "Set the percentage chance that command will occur"
 );
-Event EV_Client_DelayedRepeat(
+Event EV_Client_DelayedRepeat
+(
     "delayedrepeat",
     EV_DEFAULT,
     "fiSSSSSS",
@@ -623,7 +978,8 @@ Event EV_Client_DelayedRepeat(
     "This is internally used to keep track of the commands this entity executes and will resolve naming conflicts.\n"
     "This is only useful if the command gets called continuously but must execute at regular intervals.\n"
 );
-Event EV_Client_CommandDelay(
+Event EV_Client_CommandDelay
+(
     "commanddelay",
     EV_DEFAULT,
     "fiSSSSSS",
@@ -638,25 +994,51 @@ Event EV_Client_BounceDecal(
     "maxamount temporary",
     "Put a mark when the tempmodel bounces and hits a surface\n"
     "maxamount = Max amount of decals to make when bouncing\n"
-    "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays aroung "
+    "temporary = specify 1 for a temporary mark that only appears for a short time, 0 for a decal that stays around "
     "longer (default is 0)\n"
 );
-Event EV_Client_SetDecalRadius("decalradius", EV_DEFAULT, "f", "radius", "Set the radius of the decal");
-Event EV_Client_SetDecalOrientation(
+Event EV_Client_SetDecalRadius
+(
+    "decalradius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the radius of the decal"
+);
+Event EV_Client_SetDecalOrientation
+(
     "orientation",
     EV_DEFAULT,
     "f",
     "degrees",
     "Set the degrees to orient the decal.  Specify 'random' to use a random orientation"
 );
-Event EV_Client_SetDecalShader(
-    "decalshader", EV_DEFAULT, "s", "shadername", "Set the shader to use for the impact decal"
+Event EV_Client_SetDecalShader
+(
+    "decalshader",
+    EV_DEFAULT,
+    "s",
+    "shadername",
+    "Set the shader to use for the impact decal"
 );
-Event EV_Client_SetTraceLength("tracelength", EV_DEFAULT, "f", "length", "Set the length of the trace for the decal");
-Event EV_Client_TraceSpawn(
-    "tracespawn", EV_DEFAULT, "s", "modelname", "Spawn the specified model when the trace hits a solid object"
+Event EV_Client_SetTraceLength
+(
+    "tracelength",
+    EV_DEFAULT,
+    "f",
+    "length",
+    "Set the length of the trace for the decal"
 );
-Event EV_Client_TagList(
+Event EV_Client_TraceSpawn
+(
+    "tracespawn",
+    EV_DEFAULT,
+    "s",
+    "modelname",
+    "Spawn the specified model when the trace hits a solid object"
+);
+Event EV_Client_TagList
+(
     "taglist",
     EV_DEFAULT,
     "ssSSSSSS",
@@ -671,71 +1053,137 @@ Event EV_Client_Lightstyle(
     "Set a lightstyle to determine the color of this tempmodel, the image\n"
     "specified is used to determine the look of the light style"
 );
-Event EV_Client_PhysicsRate(
+Event EV_Client_PhysicsRate
+(
     "physicsrate",
     EV_DEFAULT,
     "s",
     "rate",
     "Set the rate (in updates per second) for the tempmodel's physics to be updated"
+
 );
-Event EV_Client_Parallel("parallel", EV_DEFAULT, NULL, NULL, "Set tempmodel to be parallel to the viewer");
-Event EV_Client_AlwaysDraw(
+Event EV_Client_Parallel
+(
+    "parallel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set tempmodel to be parallel to the viewer"
+);
+Event EV_Client_AlwaysDraw
+(
     "alwaysdraw",
     EV_DEFAULT,
     NULL,
     NULL,
     "Set emitter/tempmodel to be alwaysdraw. Which can be turned off by alwaysdraw"
 );
-Event EV_Client_Detail(
-    "detail", EV_DEFAULT, NULL, NULL, "Set emitter/tempmodel to be detail. Which can be turned off by detail"
+Event EV_Client_Detail
+(
+    "detail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set emitter/tempmodel to be detail. Which can be turned off by detail"
 );
-Event EV_Client_Print("print", EV_DEFAULT, "s", "string", "Prints a string.");
-Event EV_Client_SetVolumetric(
-    "volumetric", EV_DEFAULT, NULL, NULL, "Set the effect to spawn volumetric sources rather than tempmodels"
+Event EV_Client_Print
+(
+    "print",
+    EV_DEFAULT,
+    "s",
+    "string",
+    "Prints a string."
+);
+// Added in 2.0
+Event EV_Client_PrintDeathMsg
+(
+    "printdeathmsg",
+    EV_DEFAULT,
+    "sssss",
+    "msg1, msg2, killer, victim, deathType",
+    "Prints a death message string.  Used to allow death messages to appear in their correct language on client machines.."
+);
+Event EV_Client_SetVolumetric
+(
+    "volumetric",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the effect to spawn volumetric sources rather than tempmodels"
+);
+Event EV_Client_Wind
+(
+    "wind",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the temp model be affected by wind"
+);
+Event EV_Client_SpriteGridLighting
+(
+    "spritegridlighting",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Calculates grid lighting for a sprite"
+);
+Event EV_Client_WaterOnly
+(
+    "wateronly",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "makes the temp model remove itself if it leaves water"
 );
-Event EV_Client_Wind("wind", EV_DEFAULT, NULL, NULL, "Makes the temp model be affected by wind");
-Event
-    EV_Client_SpriteGridLighting("spritegridlighting", EV_DEFAULT, NULL, NULL, "Calculates grid lighting for a sprite");
-Event EV_Client_WaterOnly("wateronly", EV_DEFAULT, NULL, NULL, "makes the temp model remove itself if it leaves water");
 Event EV_Client_SetAlignStretch(
     "alignstretch",
     EV_DEFAULT,
     "F",
     "scaleMultiplier",
-    "Aligns the temp model to the direction of travel, and stretches it betwen the last and current positions.\n"
+    "Aligns the temp model to the direction of travel, and stretches it between the last and current positions.\n"
 );
-Event EV_Client_SetClampVelocity(
+Event EV_Client_SetClampVelocity
+(
     "clampvel",
     EV_DEFAULT,
     "ffffff",
     "minX maxX minY maxY minZ maxZ",
     "sets the valid range for velocities along global axes.  Cannot be used with clampvelaxis."
 );
-Event EV_Client_SetClampVelocityAxis(
+Event EV_Client_SetClampVelocityAxis
+(
     "clampvelaxis",
     EV_DEFAULT,
     "ffffff",
     "minX maxX minY maxY minZ maxZ",
     "sets the valid range for velocities along oriented axes.  Cannot be used with clampvel."
 );
-Event EV_Client_Treads(
+Event EV_Client_Treads
+(
     "treads",
     EV_DEFAULT,
     "ssi",
     "tagName shader localrefnumber",
     "Spawn treads from the specified tag using the specified tread type."
 );
-Event EV_Client_Treads_Off(
-    "treadsoff", EV_DEFAULT, "si", "tagName localrefnumber", "Stops spawning treads from the specified tag."
+Event EV_Client_Treads_Off
+(
+    "treadsoff",
+    EV_DEFAULT,
+    "si",
+    "tagName localrefnumber",
+    "Stops spawning treads from the specified tag."
 );
-Event EV_Client_ViewKick(
+Event EV_Client_ViewKick
+(
     "viewkick",
     EV_DEFAULT,
     "fffffsff",
     "pitchmin pitchmax yawmin yawmax recenterspeed patters pitchmax yawmax scatterpitchmax",
     "Adds kick to the view of the owner when fired."
 );
-Event EV_Client_EyeLimits(
+Event EV_Client_EyeLimits
+(
     "eyelimits",
     EV_DEFAULT,
     "fff",
@@ -749,20 +1197,30 @@ Event EV_Client_EyeMovement(
     "fMovement",
     "Sets the amount of the head's movement to apply to the players view. 1 is full, 0 is none"
 );
-Event EV_Client_SFXStart(
+Event EV_Client_SFXStart
+(
     "sfx",
     EV_DEFAULT,
     "sSSSSSSSS",
     "sCommand arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8",
     "Used for adding commands to a special effect"
 );
-Event EV_Client_SFXStartDelayed(
+Event EV_Client_SFXStartDelayed
+(
     "delayedsfx",
     EV_DEFAULT,
     "fsSSSSSSSS",
     "fDelay sCommand arg1 arg2 arg3 arg4 arg5 arg6 arg7 arg8",
     "Used for adding commands to a special effect with a time delay"
 );
+Event EV_Client_PlayForceFeedback
+(
+    "playforcefeedback",
+    EV_DEFAULT,
+    "s",
+    "effectname",
+    "Starts a force feedback effect."
+);
 
 EffectsEventQueueNode EffectsEventQueue;
 
@@ -799,6 +1257,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_SetColorVelocity,           &ClientGameCommandManager::SetAngularVelocity        },
     {&EV_Client_SetRandomVelocity,          &ClientGameCommandManager::SetRandomVelocity         },
     {&EV_Client_SetRandomVelocityAlongAxis, &ClientGameCommandManager::SetRandomVelocityAlongAxis},
+    {&EV_Client_NoTagAxis,                  &ClientGameCommandManager::SetNoTagAxis              },
     {&EV_Client_SetAccel,                   &ClientGameCommandManager::SetAccel                  },
     {&EV_Client_SetFriction,                &ClientGameCommandManager::SetFriction               },
     {&EV_Client_SetSpin,                    &ClientGameCommandManager::SetSpin                   },
@@ -828,6 +1287,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_StopSound,                  &ClientGameCommandManager::StopSound                 },
     {&EV_Client_StopAliasChannel,           &ClientGameCommandManager::StopAliasChannel          },
     {&EV_Client_LoopSound,                  &ClientGameCommandManager::LoopSound                 },
+    {&EV_Client_StopLoopSound,              &ClientGameCommandManager::StopLoopSound             },
     {&EV_Client_Cache,                      &ClientGameCommandManager::Cache                     },
     {&EV_Client_CacheImage,                 &ClientGameCommandManager::CacheImage                },
     {&EV_Client_CacheFont,                  &ClientGameCommandManager::CacheFont                 },
@@ -890,6 +1350,7 @@ CLASS_DECLARATION(Listener, ClientGameCommandManager, NULL) {
     {&EV_Client_SetClampVelocity,           &ClientGameCommandManager::SetClampVel               },
     {&EV_Client_SetClampVelocityAxis,       &ClientGameCommandManager::SetClampVelAxis           },
     {&EV_Client_Print,                      &ClientGameCommandManager::Print                     },
+    {&EV_Client_PrintDeathMsg,              &ClientGameCommandManager::PrintDeathMsg             },
     {&EV_Client_EyeLimits,                  &ClientGameCommandManager::SetEyeLimits              },
     {&EV_Client_EyeMovement,                &ClientGameCommandManager::SetEyeMovement            },
     {&EV_Client_SFXStart,                   &ClientGameCommandManager::StartSFX                  },
@@ -961,9 +1422,11 @@ qboolean ClientGameCommandManager::PostEventForEntity(Event *ev, float fWait)
     EffectsEventQueueNode *node;
     int                    inttime;
 
-    if (!m_fEventWait || current_entity_number < 0) {
-        if (!str::icmp(ev->getName(), ")")) {
-            m_fEventWait = 0.0;
+    if (m_fEventWait < 0 || current_entity_number < 0) {
+        if (m_fEventWait != 0.0) {
+            if (!str::icmp(ev->getName(), ")")) {
+                m_fEventWait = 0.0;
+            }
         }
 
         delete ev;
@@ -980,7 +1443,7 @@ qboolean ClientGameCommandManager::PostEventForEntity(Event *ev, float fWait)
     event   = EffectsEventQueue.next;
     inttime = EVENT_msec + (fWait * 1000.0f + 0.5f);
 
-    while (event != &EffectsEventQueue && inttime > event->inttime) {
+    while (event != &EffectsEventQueue && inttime >= event->inttime) {
         event = event->next;
     }
 
@@ -1016,8 +1479,8 @@ void ClientGameCommandManager::SetBaseAndAmplitude(Event *ev, Vector& base, Vect
             base[j]      = ev->GetFloat(i++);
             amplitude[j] = ev->GetFloat(i++);
         } else {
-            base[j]      = 0.0;
-            amplitude[j] = atof(org.c_str());
+            base[j]      = atof(org.c_str());
+            amplitude[j] = 0.0;
         }
     }
 }
@@ -1040,6 +1503,13 @@ void ClientGameCommandManager::Print(Event *ev)
     }
 }
 
+void ClientGameCommandManager::PrintDeathMsg(Event* ev)
+{
+    if (current_entity) {
+        cgi.DPrintf("%d:%s\n", current_entity->entityNumber, ev->GetString(1).c_str());
+    }
+}
+
 qboolean ClientGameCommandManager::IsBlockCommand(const str& name)
 {
     if (!str::icmp(name, "originspawn")) {
@@ -1119,7 +1589,6 @@ void ClientGameCommandManager::CommandDelay(Event *ev)
         ev1->AddValue(ev->GetValue(i));
     }
 
-    delay = ev->GetFloat(1) * 1000;
     if (current_entity_number != -1) {
         PostEventForEntity(ev1, fWait);
     } else {
@@ -1129,6 +1598,16 @@ void ClientGameCommandManager::CommandDelay(Event *ev)
             current_tiki->name
         );
     }
+
+    if (IsBlockCommand(eventName)) {
+        m_fEventWait = fWait;
+    } else {
+        m_fEventWait = 0;
+    }
+
+    if (current_entity_number == -1 && m_fEventWait > 0) {
+        m_fEventWait = -1;
+    }
 }
 
 void ClientGameCommandManager::StartSFX(Event *ev)
@@ -1192,7 +1671,7 @@ void ClientGameCommandManager::StartSFXCommand(Event *ev, qboolean bDelayed)
     if (bBlockCommand) {
         ProcessEvent(ev1);
         pCommand->endfcn = endblockfcn;
-        endblockfcn = NULL;
+        endblockfcn      = NULL;
     } else {
         pCommand->pEvent = ev1;
     }
@@ -1735,7 +2214,9 @@ void ClientGameCommandManager::SetInwardSphere(Event *ev)
     }
 
     m_spawnthing->cgd.flags |= T_INWARDSPHERE;
-    m_spawnthing->sphereRadius = ev->GetFloat(1);
+    if (ev->NumArgs() > 0) {
+        m_spawnthing->sphereRadius = ev->GetFloat(1);
+    }
 }
 
 //=============
@@ -2164,7 +2645,9 @@ void ClientGameCommandManager::SetColorRange(Event *ev)
         return;
     }
 
-    // FIXME: unused stub??
+    //
+    // Unused
+    //
 }
 
 //=============
@@ -2244,6 +2727,15 @@ void ClientGameCommandManager::SetRandomVelocityAlongAxis(Event *ev)
     SetRandomVelocity(ev);
 }
 
+void ClientGameCommandManager::SetNoTagAxis(Event* ev)
+{
+    if (!m_spawnthing) {
+        return;
+    }
+
+    m_spawnthing->cgd.flags2 |= T2_NOTAGAXIS;
+}
+
 void ClientGameCommandManager::SetRadialVelocity(Event *ev)
 {
     if (!m_spawnthing) {
@@ -2324,7 +2816,7 @@ void ClientGameCommandManager::SetAngles(Event *ev)
 //=============
 // SetRelativeAngles
 //=============
-void ClientGameCommandManager::SetRelativeAngles(Event* ev)
+void ClientGameCommandManager::SetRelativeAngles(Event *ev)
 {
     if (!m_spawnthing) {
         return;
@@ -2381,7 +2873,9 @@ void ClientGameCommandManager::SetAccel(Event *ev)
     m_spawnthing->cgd.accel[1] = ev->GetFloat(2);
     m_spawnthing->cgd.accel[2] = ev->GetFloat(3);
 
-    m_spawnthing->cgd.flags2 |= T2_ACCEL;
+    if (!(m_spawnthing->cgd.flags & T_SWARM)) {
+        m_spawnthing->cgd.flags2 |= T2_ACCEL;
+    }
 }
 
 void ClientGameCommandManager::SetFriction(Event *ev)
@@ -2610,7 +3104,7 @@ spawnthing_t *ClientGameCommandManager::InitializeSpawnthing(spawnthing_t *sp)
     sp->cgd.parent             = -1;
     sp->cgd.tiki               = nullptr;
     sp->cgd.lightstyle         = -1;
-    sp->cgd.physicsRate        = 10;
+    sp->cgd.physicsRate        = cg_effect_physicsrate->integer;
     sp->cgd.shadername         = "beamshader";
     sp->cgd.decal_orientation  = 0;
     sp->cgd.decal_radius       = 10;
@@ -2704,8 +3198,7 @@ void ClientGameCommandManager::DeleteEmitters(dtiki_t *tiki)
     for (i = m_emitters.NumObjects(); i > 0; i--) {
         spawnthing = m_emitters.ObjectAt(i);
         if (spawnthing->cgd.tiki == tiki) {
-            m_emitters.RemoveObjectAt(i);
-            delete spawnthing;
+            FreeSpawnthing(spawnthing);
         }
     }
 }
@@ -2739,7 +3232,9 @@ void ClientGameCommandManager::BeginOriginSpawn(Event *ev)
     if (!m_pCurrentSfx) {
         m_spawnthing = &m_localemitter;
     }
-    if (!m_spawnthing) return;
+    if (!m_spawnthing) {
+        return;
+    }
     InitializeSpawnthing(m_spawnthing);
 
     // Set the origin based on the entity's origin
@@ -2997,15 +3492,16 @@ void ClientGameCommandManager::GetOrientation(int tagnum, spawnthing_t *sp)
 //===============
 // BeginTagSpawnLinked
 //===============
-void ClientGameCommandManager::BeginTagSpawnLinked(Event *ev) {
-    str tagname;
-    int tagnum;
-    int i;
+void ClientGameCommandManager::BeginTagSpawnLinked(Event *ev)
+{
+    str           tagname;
+    int           tagnum;
+    int           i;
     orientation_t ori;
 
     // Get the tagname and orientation
     tagname = ev->GetString(1);
-    tagnum = cgi.Tag_NumForName(current_tiki, tagname.c_str());
+    tagnum  = cgi.Tag_NumForName(current_tiki, tagname.c_str());
     if (tagnum == -1) {
         throw ScriptException("Tagname '%s' does not exist", tagname.c_str());
     }
@@ -3014,12 +3510,12 @@ void ClientGameCommandManager::BeginTagSpawnLinked(Event *ev) {
     endblockfcn = &ClientGameCommandManager::EndTagSpawn;
 
     // Create a new emitter
-    m_spawnthing = CreateNewEmitter();
-    m_spawnthing->tagnum = tagnum;
-    m_spawnthing->entnum = current_entity->entityNumber;
+    m_spawnthing           = CreateNewEmitter();
+    m_spawnthing->tagnum   = tagnum;
+    m_spawnthing->entnum   = current_entity->entityNumber;
     m_spawnthing->cgd.tiki = current_tiki;
     m_spawnthing->cgd.flags |= T_WAVE;
-    m_spawnthing->cgd.origin = Vector(0, 0, 0);
+    m_spawnthing->cgd.origin = current_entity->origin;
 
     ori = cgi.TIKI_Orientation(current_entity, tagnum);
 
@@ -3064,6 +3560,10 @@ void ClientGameCommandManager::BeginTagSpawn(Event *ev)
 //===============
 void ClientGameCommandManager::EndTagSpawn(void)
 {
+    if (!m_spawnthing) {
+        return;
+    }
+
     // Okay we should have a valid spawnthing, let's create a render entity
     SpawnEffect(m_spawnthing->count, 0);
 }
@@ -3366,7 +3866,7 @@ void ClientGameCommandManager::PlaySound(
     }
 
     if (!name || !soundAlias) {
-        Com_Printf(
+        cgi.DPrintf(
             "\nERROR PlaySound: %s needs an alias in ubersound.scr or uberdialog.scr - Please fix.\n",
             sound_name.c_str()
         );
@@ -3423,7 +3923,7 @@ void ClientGameCommandManager::PlaySound(
         } else {
             if (debugSound->integer) {
                 Com_Printf(
-                    "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overriden by code.\n\n",
+                    "\nWARNING: OVERRIDE OVERRIDE OVERRIDESound %s had all its parm overridden by code.\n\n",
                     sound_name.c_str()
                 );
             }
@@ -3488,6 +3988,11 @@ void ClientGameCommandManager::Sound(Event *ev)
     float volume       = -1.0;
     float min_distance = -1.0;
 
+    if (!current_entity) {
+        // don't play sound for nonexistent entities
+        return;
+    }
+
     if (ev->NumArgs() < 1) {
         return;
     }
@@ -3532,6 +4037,9 @@ void ClientGameCommandManager::StopSound(Event *ev)
     cgi.S_StopSound(current_entity_number, channel);
 }
 
+//===============
+// StopAliasChannel
+//===============
 void ClientGameCommandManager::StopAliasChannel(Event *ev)
 {
     str              sound_name;
@@ -3558,7 +4066,7 @@ void ClientGameCommandManager::StopAliasChannel(Event *ev)
     }
 
     if (!name || !soundAlias) {
-        Com_Printf("\nERROR stopaliaschannel: couldn't find alias %s\n", sound_name.c_str());
+        cgi.DPrintf("\nERROR stopaliaschannel: couldn't find alias %s\n", sound_name.c_str());
         return;
     }
 
@@ -3627,6 +4135,54 @@ void ClientGameCommandManager::LoopSound(Event *ev)
     current_centity->tikiLoopSoundFlags   = 0;
 }
 
+//===============
+// StopLoopSound
+//===============
+void ClientGameCommandManager::StopLoopSound(Event* ev)
+{
+    if (!current_centity) {
+        cgi.DPrintf("CCM::StopLoopSound : StopLoopSound in %s without current_centity\n", cgi.TIKI_Name(current_tiki));
+        return;
+    }
+
+    cgi.DPrintf("\n\nClientGameCommandManager::StopLoopSound\n\n");
+    current_centity->tikiLoopSound = (sfxHandle_t)0;
+}
+
+//===============
+// CacheImageResource
+//===============
+void CacheImageResource(const char* stuff) {
+    str real_stuff;
+    char filename[1024];
+
+    if (cgi.fsDebug->integer == 2) {
+        Com_Printf("client cacheimage: %s\n", stuff);
+    }
+
+    Q_strncpyz(filename, stuff, sizeof(filename));
+    cgi.FS_CanonicalFilename(filename);
+
+    cgi.R_RegisterShaderNoMip(filename);
+}
+
+//===============
+// CacheFontResource
+//===============
+void CacheFontResource(const char* stuff) {
+    str real_stuff;
+    char filename[1024];
+
+    if (cgi.fsDebug->integer == 2) {
+        Com_Printf("client cacheimage: %s\n", stuff);
+    }
+
+    Q_strncpyz(filename, stuff, sizeof(filename));
+    cgi.FS_CanonicalFilename(filename);
+
+    cgi.R_LoadFont(filename);
+}
+
 //===============
 // CacheResource
 //===============
@@ -3666,12 +4222,12 @@ void ClientGameCommandManager::Cache(Event *ev)
 
 void ClientGameCommandManager::CacheImage(Event *ev)
 {
-    // FIXME: stub
+    CacheImageResource(ev->GetString(1).c_str());
 }
 
 void ClientGameCommandManager::CacheFont(Event *ev)
 {
-    // FIXME: stub
+    CacheFontResource(ev->GetString(1).c_str());
 }
 
 //===============
@@ -3679,15 +4235,16 @@ void ClientGameCommandManager::CacheFont(Event *ev)
 //===============
 void AliasResource(dtiki_t *pmdl, const char *alias, const char *realname, const char *parameters)
 {
-    if (pmdl) {
-        if (!pmdl->a->alias_list) {
-            pmdl->a->alias_list = cgi.AliasList_New(pmdl->a->name);
-        }
-
-        cgi.Alias_ListAdd((AliasList_t *)pmdl->a->alias_list, alias, realname, parameters);
-    } else {
+    if (!pmdl) {
         cgi.Alias_Add(alias, realname, parameters);
+        return;
     }
+
+    if (!pmdl->a->alias_list) {
+        pmdl->a->alias_list = cgi.AliasList_New(pmdl->a->name);
+    }
+
+    cgi.Alias_ListAdd((AliasList_t*)pmdl->a->alias_list, alias, realname, parameters);
 }
 
 qboolean bLoadForMap(const char *psMapsBuffer, const char *name)
@@ -3708,7 +4265,7 @@ qboolean bLoadForMap(const char *psMapsBuffer, const char *name)
     }
 
     if (!token || !token[0]) {
-        Com_Printf("ERROR bLoadForMap: %s alias with empty maps specification.\n", name);
+        cgi.DPrintf("ERROR bLoadForMap: %s alias with empty maps specification.\n", name);
         return false;
     }
 
@@ -3748,19 +4305,32 @@ void ClientGameCommandManager::AliasCache(Event *ev)
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
-        if (!strcmp(ev->GetToken(i).c_str(), "maps")) {
+        str s = ev->GetString(i);
+
+        if (!s.icmp("maps")) {
             i++;
-            psMapsBuffer = ev->GetToken(i);
-        } else if (!strcmp(ev->GetToken(i).c_str(), "always")) {
-            bAlwaysLoaded = true;
-        } else {
-            strcat(parmbuffer, ev->GetToken(i));
-            strcat(parmbuffer, " ");
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
         }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+            continue;
+        }
+
+        strcat(parmbuffer, s);
+        strcat(parmbuffer, " ");
     }
 
-    if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+    if (bAlwaysLoaded) {
         AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
+    }
+
+    if (bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+        if (!bAlwaysLoaded) {
+            AliasResource(current_tiki, ev->GetString(1), ev->GetString(2), parmbuffer);
+        }
+
         CacheResource(ev->GetString(2));
     }
 }
@@ -3790,28 +4360,33 @@ void ClientGameCommandManager::Alias(Event *ev)
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
-        if (!strcmp(ev->GetToken(i).c_str(), "maps")) {
+        str s = ev->GetString(i);
+
+        if (!s.icmp("maps")) {
             i++;
-            psMapsBuffer = ev->GetToken(i);
-        } else if (!strcmp(ev->GetToken(i).c_str(), "always")) {
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
             bAlwaysLoaded = true;
+        } else if (subtitle) {
+            strcat(parmbuffer, "\"");
+            strcat(parmbuffer, s);
+            strcat(parmbuffer, "\" ");
+
+            subtitle = 0;
         } else {
+            subtitle = s.icmp("subtitle") == 0;
+
             if (!subtitle) {
-                if (!Q_stricmp(ev->GetToken(i), "subtitle") || !Q_stricmp(ev->GetToken(i), "forcesubtitle")) {
-                    subtitle = qtrue;
-                    strcat(parmbuffer, ev->GetToken(i));
-                } else {
-                    strcat(parmbuffer, ev->GetToken(i));
-                }
-            } else {
-                strcat(parmbuffer, "\"");
-                strcat(parmbuffer, ev->GetToken(i));
-                strcat(parmbuffer, "\"");
-                subtitle = qfalse;
+                subtitle = s.icmp("forcesubtitle") == 0;
             }
 
-            strcat(parmbuffer, " ");
+            strcat(parmbuffer, s);
         }
+
+        strcat(parmbuffer, " ");
     }
 
     if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
@@ -4274,14 +4849,11 @@ void ClientGameCommandManager::UpdateEmitter(
     float          scale = 1.0f;
     int            entnum;
 
-    if (current_entity)
-    {
-        scale = current_entity->scale;
+    if (current_entity) {
+        scale  = current_entity->scale;
         entnum = current_entity->entityNumber;
-    }
-    else
-    {
-        entnum = 1023;
+    } else {
+        entnum = ENTITYNUM_NONE;
     }
 
     // Find the emitter associated with this model
@@ -4306,17 +4878,19 @@ void ClientGameCommandManager::UpdateEmitter(
         if (m_spawnthing->cgd.flags & T_WAVE) {
             if (m_spawnthing->entnum == entnum) {
                 orientation_t ori;
-                int j;
+                int           j;
 
                 // Set the default origin (spawn from the parent's origin)
                 VectorCopy(entity_origin, m_spawnthing->cgd.origin);
-            
+
                 ori = cgi.TIKI_Orientation(current_entity, m_spawnthing->tagnum);
 
                 VectorCopy(current_entity->origin, m_spawnthing->linked_origin);
 
                 for (j = 0; j < 3; j++) {
-                    VectorMA(m_spawnthing->linked_origin, ori.origin[i], current_entity->axis[j], m_spawnthing->linked_origin);
+                    VectorMA(
+                        m_spawnthing->linked_origin, ori.origin[j], current_entity->axis[j], m_spawnthing->linked_origin
+                    );
                 }
                 MatrixMultiply(ori.axis, current_entity->axis, m_spawnthing->linked_axis);
             }
@@ -4374,7 +4948,7 @@ void ClientGameCommandManager::UpdateEmitter(
         }
 
         m_spawnthing->cgd.createTime   = cg.time;
-        m_spawnthing->cgd.parentOrigin = Vector(entity_origin);
+        m_spawnthing->cgd.parentOrigin = entity_origin;
 
         if (m_spawnthing->cgd.flags & T_DLIGHT) {
             cgi.R_AddLightToScene(
@@ -4406,7 +4980,8 @@ void ClientGameCommandManager::UpdateEmitter(
                 et->last_emit_time = cg.time;
             }
 
-            count = dtime / (m_spawnthing->spawnRate * (1.0f / cg_effectdetail->value));
+            count = dtime * cg_effectdetail->value / m_spawnthing->spawnRate;
+            et->last_emit_time += count * m_spawnthing->spawnRate;
 
             // This is kind of a nasty bit of code.  If the count is 1, just
             // spawn a single tempmodel, if it's greater than 1, then spawn the
@@ -4436,6 +5011,11 @@ void ClientGameCommandManager::UpdateEmitter(
 
                     SpawnEffect(1, dtime);
 
+                    et = m_spawnthing->GetEmitTime(entity_number);
+                    if (!et) {
+                        break;
+                    }
+
                     lerp += lerpfrac;
                 }
             }
@@ -4454,6 +5034,8 @@ void ClientGameCommandManager::UpdateEmitter(
         et->oldorigin            = save_origin;
         et->lerp_emitter         = qtrue;
     }
+
+    m_spawnthing = NULL;
 }
 
 //===============
@@ -4531,34 +5113,20 @@ bool ClientGameCommandManager::GetTagPositionAndOrientation(str tagname, orienta
     return ClientGameCommandManager::GetTagPositionAndOrientation(tagnum, new_or);
 }
 
-//===============
-// FreeAllTempModels
-//===============
-void ClientGameCommandManager::FreeAllTempModels(void)
-{
-    ctempmodel_t *p, *next;
-
-    // Go through all the temp models and run the physics if necessary,
-    // then add them to the ref
-    p = m_active_tempmodels.prev;
-    for (; p != &m_active_tempmodels; p = next) {
-        // grab next now, so if the local entity is freed we still have it
-        next = p->prev;
-        FreeTempModel(p);
-    }
-}
-
-void ClientGameCommandManager::FreeSomeTempModels(void)
-{
-    // FIXME: unimplemented
-}
-
 //===============
 // FreeAllEmitters
 //===============
 void ClientGameCommandManager::RestartAllEmitters(void)
 {
-    // FIXME: stub??
+    ctempmodel_t *p;
+
+    //
+    // FIXME: not sure if it's the right thing
+    //
+
+    for (p = m_active_tempmodels.prev; p != &m_active_tempmodels; p = p->next) {
+        p->cgd.createTime = cg.time;
+    }
 }
 
 //===============
@@ -4569,6 +5137,9 @@ void CG_RestartCommandManager()
     commandManager.FreeAllTempModels();
 }
 
+//=================
+// CG_CleanUpTempModels
+//=================
 void CG_CleanUpTempModels()
 {
     commandManager.FreeSomeTempModels();
@@ -4608,7 +5179,7 @@ void CG_ProcessInitCommands(dtiki_t *tiki, refEntity_t *ent)
         }
 
         if (!commandManager.SelectProcessEvent(ev)) {
-            Com_Printf(
+            cgi.DPrintf(
                 "^~^~^ CG_ProcessInitCommands: Bad init client command '%s' in '%s'\n", pcmd->args[0], tiki->name
             );
         }
@@ -4654,7 +5225,7 @@ void CG_ProcessCacheInitCommands(dtiki_t *tiki)
             }
 
             if (!commandManager.SelectProcessEvent(ev)) {
-                Com_Printf(
+                cgi.DPrintf(
                     "^~^~^ CG_ProcessInitCommands: Bad init client command '%s' in '%s'\n", pcmd->args[0], tiki->name
                 );
             }
@@ -4698,6 +5269,10 @@ void CG_UpdateEntityEmitters(int entnum, refEntity_t *ent, centity_t *cent)
             ent->tiki, ent->axis, cent->currentState.number, cent->currentState.parent, cent->lerpOrigin
         );
     }
+
+    // process events for the entity
+    commandManager.ProcessPendingEventsForEntity();
+
     current_entity        = old_entity;
     current_tiki          = old_tiki;
     current_centity       = oldcent;
@@ -4723,7 +5298,7 @@ qboolean CG_ProcessEntityCommands(int frame, int anim, int entnum, refEntity_t *
         current_centity       = cent;
         current_entity_number = entnum;
         current_tiki          = ent->tiki;
-        CG_AnimationDebugMessage(entnum, "Processing Ent Commands: Entity: %3d Anim:#(%i) Frame:#(%i)\n", anim, frame);
+        CG_AnimationDebugMessage(entnum, "Processing Ent Commands: Entity: %3d Anim:#(%i) Frame:#(%i)\n", entnum, anim, frame);
 
         for (i = 0; i < tikicmds.num_cmds; i++) {
             Event *ev;
@@ -4762,7 +5337,7 @@ void CG_ClientCommandDebugMessage(centity_t *cent, const char *fmt, ...)
         char    msg[1024];
 
         va_start(argptr, fmt);
-        vsprintf(msg, fmt, argptr);
+        Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);
 
         if ((!cg_debugAnimWatch->integer) || ((cg_debugAnimWatch->integer - 1) == cent->currentState.number)) {
@@ -4781,152 +5356,90 @@ void CG_ClientCommandDebugMessage(centity_t *cent, const char *fmt, ...)
 //=================
 void CG_ClientCommands(refEntity_t *ent, centity_t *cent, int slot)
 {
-#if 0
-    int anim;
-    int frame;
-
-    if (!tiki) {
-        return;
-    }
+    int      i;
+    int      iStartFrame, iEndFrame;
+    dtiki_t *tiki = ent->tiki;
+    int      iAnim;
+    float    fAnimLength;
+    int      iAnimFrames;
+    float    fAnimFrameMult;
+    int      iEntNumber;
+    float    time, lastTime;
+    int      lastAnim;
 
     if (paused->integer) {
         return;
     }
 
-    if (cent->currentState.eFlags & EF_DONT_PROCESS_COMMANDS) {
+    iAnim = ent->frameInfo[slot].index;
+
+    fAnimLength    = cgi.Anim_Time(tiki, iAnim);
+    iAnimFrames    = cgi.Anim_NumFrames(tiki, iAnim);
+    fAnimFrameMult = cgi.Anim_Frametime(tiki, iAnim);
+    iEntNumber     = cent->currentState.number;
+
+    time     = ent->frameInfo[slot].time;
+    lastTime = cent->animLastTimes[slot];
+    lastAnim = cent->animLast[slot];
+    cgi.Anim_NameForNum(tiki, iAnim);
+
+    if (time < 0 || time > fAnimLength) {
         return;
     }
 
-    assert(cent);
-
-    // don't do anything if the frame is illegal
-    if ((new_frame < 0) || (new_frame >= state->numframes)) {
+    if (time == fAnimLength && time < lastTime) {
         return;
     }
 
-#    if 0
-#        ifndef NDEBUG 
-   CG_ClientCommandDebugMessage( 
-      cent, 
-      "Client Commands: cg.time %d checking Entity %d anim %d frame %d\n", 
-      cg.time,
-      cent->currentState.number,
-      new_anim, 
-      new_frame
-      );
-#        endif
-#    endif
+    if (cgi.Anim_HasCommands(tiki, iAnim)) {
+        if (iAnim == lastAnim && time < lastTime) {
+            iStartFrame = (lastTime + 0.01) / fAnimFrameMult + 1.0;
+            iEndFrame   = (time + 0.01) / fAnimFrameMult + 1.0;
 
-    anim = state->last_cmd_anim - 1;
-    frame = state->last_cmd_frame;
+            for (i = iStartFrame; i < iAnimFrames; i++) {
+                CG_ProcessEntityCommands(i, iAnim, iEntNumber, ent, cent);
+            }
 
-    // if we had a last anim and it it wasn't same as ours then
-    // we need to run any exit commands from the last animation
-    if ((anim != new_anim) && (anim >= 0)) {
-        // play the exit command
-        CG_ProcessEntityCommands(TIKI_FRAME_EXIT, anim,
-                                 cent->currentState.number, ent, cent);
-#    ifndef NDEBUG
-        CG_ClientCommandDebugMessage(
-            cent, "Client Commands: Entity %d Exiting Anim: %s\n",
-            cent->currentState.number, cgi.Anim_NameForNum(tiki, anim));
-#    endif
-        frame = 0;
+            for (i = 0; i < iEndFrame; i++) {
+                CG_ProcessEntityCommands(i, iAnim, iEntNumber, ent, cent);
+            }
+        } else if (time >= 0.01) {
+            if (iAnim == lastAnim) {
+                iStartFrame = (lastTime + 0.01) / fAnimFrameMult + 1.0;
+            } else {
+                iStartFrame = 0;
+            }
+            iEndFrame = (time + 0.01) / fAnimFrameMult + 1.0;
 
-        // Reset the tiki looping sound if changing animation
-        cent->tikiLoopSound = NULL;
-    }
-
-    if (state->has_commands) {
-        // if we are entering a new animation, than
-        // we need to run any entry commands for the new animation
-        if (anim != new_anim) {
-            // play the exit command
-            CG_ProcessEntityCommands(TIKI_FRAME_ENTRY, new_anim,
-                                     cent->currentState.number, ent, cent);
-#    ifndef NDEBUG
-            CG_ClientCommandDebugMessage(
-                cent, "Client Commands: Entity %d Entering Anim: %s\n",
-                cent->currentState.number,
-                cgi.Anim_NameForNum(tiki, new_anim));
-#    endif
-        }
-
-        if (state->driven) {
-            // make sure we process this frame if we are on a new frame
-            // although this is a hack, it guarantees that the frame will be
-            // processed below.
-            frame %= state->numframes;
-            if (frame < new_frame) {
-                frame = new_frame;
+            for (i = iStartFrame; i < iEndFrame; i++) {
+                CG_ProcessEntityCommands(i, iAnim, iEntNumber, ent, cent);
             }
         } else {
-            //
-            // we need to catch up on the frames we haven't played yet
-            //
-            if ((new_frame != (frame - 1)) && (state->numframes > 1)) {
-                // and frame number so that it wraps properly
-                frame %= state->numframes;
-
-                // lerp to one minus the current frame
-                while (frame != new_frame) {
-#    ifndef NDEBUG
-                    CG_ClientCommandDebugMessage(
-                        cent,
-                        "Client Commands: cg.time %d Catching up Entity: %d "
-                        "Anim: %s frame: %d numframes: %d\n",
-                        cg.time, cent->currentState.number,
-                        cgi.Anim_NameForNum(tiki, new_anim), frame,
-                        state->numframes);
-#    endif
-                    state->last_cmd_time =
-                        cg.time + TIKI_FRAME_MAXFRAMERATE;
-                    CG_ProcessEntityCommands(frame, new_anim,
-                                             cent->currentState.number, ent,
-                                             cent);
-                    frame = (frame + 1) % state->numframes;
-                }
-            }
-        }
-
-        //
-        // handle the single frame and every frame case
-        //
-        if ((frame == new_frame) ||
-            ((cg.time > state->last_cmd_time) &&
-             (cent->currentState.eFlags & EF_EVERYFRAME))) {
-#    ifndef NDEBUG
-            CG_ClientCommandDebugMessage(
-                cent,
-                "Client Commands: cg.time %d Processing Entity: %d Anim: %s "
-                "frame: %d numframes: %d\n",
-                cg.time, cent->currentState.number,
-                cgi.Anim_NameForNum(tiki, new_anim), new_frame,
-                state->numframes);
-#    endif
-            state->last_cmd_time = cg.time + TIKI_FRAME_MAXFRAMERATE;
-            CG_ProcessEntityCommands(new_frame, new_anim,
-                                     cent->currentState.number, ent, cent);
+            CG_ProcessEntityCommands(TIKI_FRAME_FIRST, iAnim, iEntNumber, ent, cent);
         }
     }
 
     if (cent->clientFlags & CF_UPDATESWIPE) {
-        current_entity = ent;
-        current_centity = cent;
-        current_entity_number = cent->currentState.number;
-        current_tiki = tiki;
+        refEntity_t *old_entity = current_entity;
+        dtiki_t     *old_tiki   = current_tiki;
+        int          oldnum     = current_entity_number;
+        centity_t   *oldcent    = current_centity;
+
+        //
+        // swipe the entity
+        //
+        current_entity        = ent;
+        current_tiki          = ent->tiki;
+        current_centity       = cent;
+        current_entity_number = iEntNumber;
 
         commandManager.ProcessEvent(EV_Client_Swipe);
 
-        current_tiki = NULL;
-        current_entity_number = -1;
-        current_entity = NULL;
-        current_centity = NULL;
+        current_entity        = old_entity;
+        current_tiki          = old_tiki;
+        current_entity_number = oldnum;
+        current_centity       = oldcent;
     }
-
-    state->last_cmd_anim = new_anim + 1;
-    state->last_cmd_frame = new_frame + 1;
-#endif
 }
 
 //===============
@@ -4979,7 +5492,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
     current_tiki = NULL;
 
     // Update the loading screen
-    sprintf(tempName, "m%s", filename);
+    Com_sprintf(tempName, sizeof(tempName), "m%s", filename);
     cgi.LoadResource(tempName);
 
     bufstart = buffer;
@@ -4988,7 +5501,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
         Event *ev;
 
         // grab each line as we go
-        strcpy(com_token, COM_ParseExt(&buffer, qtrue));
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
         if (!com_token[0]) {
             break;
         }
@@ -4996,7 +5509,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
         if (!Q_stricmp(com_token, "end") || !Q_stricmp(com_token, "server")) {
             // skip the line
             while (1) {
-                strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
                 if (!com_token[0]) {
                     break;
                 }
@@ -5009,7 +5522,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
 
         // get the rest of the line
         while (1) {
-            strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
             if (!com_token[0]) {
                 break;
             }
@@ -5021,7 +5534,7 @@ qboolean CG_Command_ProcessFile(const char *filename, qboolean quiet, dtiki_t *c
     cgi.FS_FreeFile((void *)bufstart);
 
     // Update the loading screen
-    sprintf(tempName, "o%s", filename);
+    Com_sprintf(tempName, sizeof(tempName), "o%s", filename);
     cgi.LoadResource(tempName);
 
     return qtrue;
@@ -5115,7 +5628,14 @@ void CG_DumpAllClasses_f(void)
 
 EmitterLoader emitterLoader;
 
-Event EV_EmitterLoader_Emitter("emitter", EV_DEFAULT, "s", "emittername", "Create a new emitter");
+Event EV_EmitterLoader_Emitter
+(
+    "emitter",
+    EV_DEFAULT,
+    "s",
+    "emittername",
+    "Create a new emitter"
+);
 
 CLASS_DECLARATION(Listener, EmitterLoader, NULL) {
     {&EV_EmitterLoader_Emitter, &EmitterLoader::Emitter},
@@ -5320,7 +5840,7 @@ void ClientGameCommandManager::SetCurrentTiki(Event *ev)
     str tikiName;
 
     if (ev->NumArgs() != 1) {
-        Com_Printf("ERROR: settiki command takes 1 parameter.\n");
+        cgi.DPrintf("ERROR: settiki command takes 1 parameter.\n");
         return;
     }
 
@@ -5399,3 +5919,470 @@ void ClientGameCommandManager::EventViewKick(Event *ev)
         cg.viewkick[1] = -fYawMax;
     }
 }
+
+int ClientGameCommandManager::IdForTempModel(const ctempmodel_t *model)
+{
+    int index;
+
+    if (model == &m_active_tempmodels) {
+        return -1;
+    }
+
+    if (!model) {
+        return -2;
+    }
+
+    index = model - m_tempmodels;
+    if (index >= MAX_TEMPMODELS) {
+        return -2;
+    }
+
+    if (model != &m_tempmodels[index]) {
+        return -2;
+    }
+
+    return model - m_tempmodels;
+}
+
+ctempmodel_t *ClientGameCommandManager::TempModelForId(int id)
+{
+    if (id == -1) {
+        return &m_active_tempmodels;
+    }
+
+    if (id == -2) {
+        return NULL;
+    }
+
+    return &m_tempmodels[id];
+}
+
+int ClientGameCommandManager::IdForSpawnThing(const spawnthing_t *sp)
+{
+    int i;
+
+    if (!sp) {
+        return 0;
+    }
+
+    for (i = 1; i <= m_emitters.NumObjects(); i++) {
+        if (sp == m_emitters.ObjectAt(i)) {
+            return i;
+        }
+    }
+
+    return 0;
+}
+
+spawnthing_t *ClientGameCommandManager::SpawnThingForId(int id)
+{
+    if (!id) {
+        return 0;
+    }
+
+    return m_emitters.ObjectAt(id);
+}
+
+int ClientGameCommandManager::IdForVssSource(const cvssource_t *source)
+{
+    int index;
+
+    if (source == &m_active_vsssources) {
+        return -1;
+    }
+
+    if (!source) {
+        return -2;
+    }
+
+    index = source - m_vsssources;
+    if (index < 0 || index >= m_iAllocatedvsssources) {
+        return -2;
+    }
+
+    if (source != &m_vsssources[index]) {
+        return -2;
+    }
+
+    return source - m_vsssources;
+}
+
+cvssource_t *ClientGameCommandManager::VssSourceForId(int id)
+{
+    if (id == -1) {
+        return &m_active_vsssources;
+    }
+
+    if (id == -2) {
+        return 0;
+    }
+
+    return &m_vsssources[id];
+}
+
+void ClientGameCommandManager::ArchiveTempModelPointerToMemory(MemArchiver& archiver, ctempmodel_t **model)
+{
+    int id;
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&id);
+        *model = TempModelForId(id);
+    } else {
+        id = IdForTempModel(*model);
+        archiver.ArchiveInteger(&id);
+    }
+}
+
+void ClientGameCommandManager::ArchiveSpawnThingPointerToMemory(MemArchiver& archiver, spawnthing_t **sp)
+{
+    int id;
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&id);
+        *sp = SpawnThingForId(id);
+    } else {
+        id = IdForSpawnThing(*sp);
+        archiver.ArchiveInteger(&id);
+    }
+}
+
+void ClientGameCommandManager::ArchiveVssSourcePointerToMemory(MemArchiver& archiver, cvssource_t **source)
+{
+    int id;
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&id);
+        *source = VssSourceForId(id);
+    } else {
+        id = IdForVssSource(*source);
+        archiver.ArchiveInteger(&id);
+    }
+}
+
+void ClientGameCommandManager::ArchiveToMemory(MemArchiver& archiver)
+{
+    spawnthing_t *sp;
+    int           num;
+    int           i;
+
+    m_localemitter.ArchiveToMemory(archiver);
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            sp = new spawnthing_t();
+            sp->ArchiveToMemory(archiver);
+
+            m_emitters.AddObjectAt(i + 1, sp);
+        }
+    } else {
+        num = m_emitters.NumObjects();
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            sp = m_emitters[i];
+            sp->ArchiveToMemory(archiver);
+        }
+    }
+
+    ArchiveTempModelPointerToMemory(archiver, &m_active_tempmodels.prev);
+    ArchiveTempModelPointerToMemory(archiver, &m_active_tempmodels.next);
+    ArchiveTempModelPointerToMemory(archiver, &m_free_tempmodels);
+
+    for (i = 0; i < MAX_TEMPMODELS; i++) {
+        m_tempmodels[i].ArchiveToMemory(archiver);
+    }
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&num);
+        if (m_iAllocatedvsssources != num) {
+            m_iAllocatedvsssources = num;
+
+            m_vsssources = (cvssource_t *)cgi.Malloc(m_iAllocatedvsssources * sizeof(cvssource_t));
+            // instead of using memset, call the constructor
+            for (i = 0; i < m_iAllocatedvsssources; i++) {
+                new (&m_vsssources[i]) cvssource_t();
+            }
+        }
+    } else {
+        archiver.ArchiveInteger(&m_iAllocatedvsssources);
+    }
+
+    ArchiveVssSourcePointerToMemory(archiver, &m_active_vsssources.prev);
+    ArchiveVssSourcePointerToMemory(archiver, &m_active_vsssources.next);
+    ArchiveVssSourcePointerToMemory(archiver, &m_free_vsssources);
+
+    for (i = 0; i < m_iAllocatedvsssources; i++) {
+        m_vsssources[i].ArchiveToMemory(archiver);
+    }
+
+    archiver.ArchiveTime(&m_iLastVSSRepulsionTime);
+    m_command_time_manager.ArchiveToMemory(archiver);
+    archiver.ArchiveInteger(&m_seed);
+    archiver.ArchiveFloat(&m_fEventWait);
+
+    m_pCurrentSfx = NULL;
+}
+
+void commandthing_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    int num;
+    int i;
+
+    enttracker_t::ArchiveToMemory(archiver);
+
+    if (archiver.IsReading()) {
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            commandtime_t ct;
+
+            ct.ArchiveToMemory(archiver);
+            m_commandtimes.AddObject(ct);
+        }
+    } else {
+        num = m_commandtimes.NumObjects();
+
+        archiver.ArchiveInteger(&num);
+        m_commandtimes.ClearObjectList();
+
+        for (i = 0; i < num; i++) {
+            commandtime_t& ct = m_commandtimes.ObjectAt(i);
+
+            ct.ArchiveToMemory(archiver);
+        }
+    }
+}
+
+void cvssource_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    commandManager.ArchiveVssSourcePointerToMemory(archiver, &next);
+    commandManager.ArchiveVssSourcePointerToMemory(archiver, &prev);
+    commandManager.ArchiveVssSourcePointerToMemory(archiver, &stnext);
+    archiver.ArchiveInteger(&stindex);
+    archiver.ArchiveVector(&lastOrigin);
+    archiver.ArchiveFloat(&lastRadius);
+    archiver.ArchiveFloat(&lastDensity);
+    archiver.ArchiveVec3(lastColor);
+    archiver.ArchiveVec3(lastLighting);
+    archiver.ArchiveVector(&newOrigin);
+    archiver.ArchiveFloat(&newRadius);
+    archiver.ArchiveFloat(&newDensity);
+    archiver.ArchiveVec3(newColor);
+    archiver.ArchiveVec3(newLighting);
+    archiver.ArchiveFloat(&ooRadius);
+    archiver.ArchiveVector(&velocity);
+    archiver.ArchiveFloat(&startAlpha);
+    archiver.ArchiveInteger(&roll);
+    archiver.ArchiveVector(&repulsion);
+    archiver.ArchiveInteger(&lifeTime);
+    archiver.ArchiveInteger(&collisionmask);
+    archiver.ArchiveInteger(&parent);
+    archiver.ArchiveInteger(&flags);
+    archiver.ArchiveInteger(&flags2);
+    archiver.ArchiveInteger(&smokeType);
+    archiver.ArchiveFloat(&typeInfo);
+    archiver.ArchiveFloat(&fadeMult);
+    archiver.ArchiveFloat(&scaleMult);
+    archiver.ArchiveTime(&lastPhysicsTime);
+    archiver.ArchiveTime(&lastLightingTime);
+    archiver.ArchiveBoolean(&lastValid);
+}
+
+void ctempmodel_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    commandManager.ArchiveTempModelPointerToMemory(archiver, &next);
+    commandManager.ArchiveTempModelPointerToMemory(archiver, &prev);
+
+    cgd.ArchiveToMemory(archiver);
+    archiver.ArchiveString(&modelname);
+
+    CG_ArchiveRefEntity(archiver, &lastEnt);
+    CG_ArchiveRefEntity(archiver, &ent);
+
+    archiver.ArchiveInteger(&number);
+    archiver.ArchiveTime(&lastAnimTime);
+    archiver.ArchiveTime(&lastPhysicsTime);
+    archiver.ArchiveTime(&killTime);
+    archiver.ArchiveTime(&next_bouncesound_time);
+    archiver.ArchiveInteger(&seed);
+    archiver.ArchiveInteger(&twinkleTime);
+    archiver.ArchiveInteger(&aliveTime);
+    archiver.ArchiveBoolean(&addedOnce);
+    archiver.ArchiveBoolean(&lastEntValid);
+    commandManager.ArchiveSpawnThingPointerToMemory(archiver, &m_spawnthing);
+}
+
+void enttracker_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    archiver.ArchiveRaw(usedNumbers, sizeof(usedNumbers));
+}
+
+void emittertime_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    archiver.ArchiveInteger(&entity_number);
+    archiver.ArchiveTime(&last_emit_time);
+    archiver.ArchiveVector(&oldorigin);
+    archiver.ArchiveBoolean(&active);
+    archiver.ArchiveBoolean(&lerp_emitter);
+}
+
+void emitterthing_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    int num;
+    int i;
+
+    enttracker_t::ArchiveToMemory(archiver);
+
+    if (archiver.IsReading()) {
+        emittertime_t et;
+
+        archiver.ArchiveInteger(&num);
+        for (i = 0; i < num; i++) {
+            et.ArchiveToMemory(archiver);
+            m_emittertimes.AddObject(et);
+        }
+    } else {
+        num = m_emittertimes.NumObjects();
+        archiver.ArchiveInteger(&num);
+
+        for (i = 0; i < num; i++) {
+            emittertime_t& et = m_emittertimes[i];
+            et.ArchiveToMemory(archiver);
+        }
+    }
+
+    archiver.ArchiveBoolean(&startoff);
+}
+
+void cg_common_data::ArchiveToMemory(MemArchiver& archiver)
+{
+    archiver.ArchiveInteger(&life);
+    archiver.ArchiveTime(&createTime);
+    archiver.ArchiveVector(&origin);
+    archiver.ArchiveVector(&oldorigin);
+    archiver.ArchiveVector(&accel);
+    archiver.ArchiveVector(&angles);
+    archiver.ArchiveVector(&velocity);
+    archiver.ArchiveVector(&avelocity);
+    archiver.ArchiveVector(&parentOrigin);
+    archiver.ArchiveVector(&parentMins);
+    archiver.ArchiveVector(&parentMaxs);
+    archiver.ArchiveVector(&minVel);
+    archiver.ArchiveVector(&maxVel);
+    archiver.ArchiveFloat(color);
+    archiver.ArchiveFloat(&color[1]);
+    archiver.ArchiveFloat(&color[2]);
+    archiver.ArchiveFloat(&color[3]);
+    archiver.ArchiveFloat(&alpha);
+    archiver.ArchiveFloat(&scaleRate);
+    archiver.ArchiveFloat(&scalemin);
+    archiver.ArchiveFloat(&scalemax);
+    archiver.ArchiveFloat(&bouncefactor);
+    archiver.ArchiveInteger(&bouncecount);
+    archiver.ArchiveInteger(&maxbouncecount);
+    archiver.ArchiveString(&bouncesound);
+    archiver.ArchiveInteger(&bouncesound_delay);
+    archiver.ArchiveInteger(&flags);
+    archiver.ArchiveInteger(&flags2);
+
+    CG_ArchiveTikiPointer(archiver, &tiki);
+
+    archiver.ArchiveInteger(&swarmfreq);
+    archiver.ArchiveFloat(&swarmmaxspeed);
+    archiver.ArchiveFloat(&swarmdelta);
+    archiver.ArchiveFloat(&lightIntensity);
+    archiver.ArchiveInteger(&lightType);
+    archiver.ArchiveInteger(&fadeintime);
+    archiver.ArchiveInteger(&fadedelay);
+    archiver.ArchiveInteger(&parent);
+    archiver.ArchiveInteger(&collisionmask);
+    archiver.ArchiveInteger(&min_twinkletimeoff);
+    archiver.ArchiveInteger(&max_twinkletimeoff);
+    archiver.ArchiveInteger(&min_twinkletimeon);
+    archiver.ArchiveInteger(&max_twinkletimeon);
+    archiver.ArchiveInteger(&lightstyle);
+    archiver.ArchiveInteger(&physicsRate);
+    archiver.ArchiveFloat(&scale);
+    archiver.ArchiveFloat(&scale2);
+    archiver.ArchiveString(&swipe_shader);
+    archiver.ArchiveString(&swipe_tag_start);
+    archiver.ArchiveString(&swipe_tag_end);
+    archiver.ArchiveString(&shadername);
+    archiver.ArchiveFloat(&swipe_life);
+    archiver.ArchiveFloat(&friction);
+    archiver.ArchiveFloat(&spin_rotation);
+    archiver.ArchiveFloat(&decal_orientation);
+    archiver.ArchiveFloat(&decal_radius);
+}
+
+void spawnthing_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    emitterthing_t::ArchiveToMemory(archiver);
+
+    CG_ArchiveStringContainer(archiver, &m_modellist);
+    CG_ArchiveStringContainer(archiver, &m_taglist);
+
+    cgd.ArchiveToMemory(archiver);
+
+    archiver.ArchiveInteger(&entnum);
+    archiver.ArchiveVector(&origin_offset_base);
+    archiver.ArchiveVector(&origin_offset_amplitude);
+    archiver.ArchiveVector(&axis_offset_base);
+    archiver.ArchiveVector(&axis_offset_amplitude);
+    archiver.ArchiveVector(&randvel_base);
+    archiver.ArchiveVector(&randvel_amplitude);
+    archiver.ArchiveVector(&avelocity_base);
+    archiver.ArchiveVector(&avelocity_amplitude);
+    archiver.ArchiveVector(&angles_amplitude);
+    archiver.ArchiveVec3(axis[0]);
+    archiver.ArchiveVec3(axis[1]);
+    archiver.ArchiveVec3(axis[2]);
+    archiver.ArchiveVec3(tag_axis[0]);
+    archiver.ArchiveVec3(tag_axis[1]);
+    archiver.ArchiveVec3(tag_axis[2]);
+    archiver.ArchiveFloat(&life_random);
+    archiver.ArchiveFloat(&forwardVelocity);
+    archiver.ArchiveFloat(&sphereRadius);
+    archiver.ArchiveFloat(&coneHeight);
+    archiver.ArchiveFloat(&spawnRate);
+    archiver.ArchiveTime(&lastTime);
+    archiver.ArchiveInteger(&count);
+    archiver.ArchiveInteger(&tagnum);
+    archiver.ArchiveString(&emittername);
+    archiver.ArchiveString(&animName);
+    archiver.ArchiveFloat(dcolor);
+    archiver.ArchiveFloat(&dcolor[1]);
+    archiver.ArchiveFloat(&dcolor[2]);
+    archiver.ArchiveBoolean(&dlight);
+    archiver.ArchiveInteger(&numtempmodels);
+    archiver.ArchiveVec3(linked_origin);
+    archiver.ArchiveVec3(linked_axis[0]);
+    archiver.ArchiveVec3(linked_axis[1]);
+    archiver.ArchiveVec3(linked_axis[2]);
+    archiver.ArchiveFloat(&fMinRangeSquared);
+    archiver.ArchiveFloat(&fMaxRangeSquared);
+    archiver.ArchiveString(&startTag);
+    archiver.ArchiveString(&endTag);
+    archiver.ArchiveFloat(&length);
+    archiver.ArchiveFloat(&min_offset);
+    archiver.ArchiveFloat(&max_offset);
+    archiver.ArchiveFloat(&overlap);
+    archiver.ArchiveFloat(&numSubdivisions);
+    archiver.ArchiveFloat(&delay);
+    archiver.ArchiveFloat(&toggledelay);
+    archiver.ArchiveInteger(&beamflags);
+    archiver.ArchiveInteger(&numspherebeams);
+    archiver.ArchiveFloat(&endalpha);
+    archiver.ArchiveFloat(&spreadx);
+    archiver.ArchiveFloat(&spready);
+    archiver.ArchiveBoolean(&use_last_trace_end);
+}
+
+void commandtime_t::ArchiveToMemory(MemArchiver& archiver)
+{
+    archiver.ArchiveInteger(&entity_number);
+    archiver.ArchiveInteger(&command_number);
+    archiver.ArchiveTime(&last_command_time);
+}
diff --git a/code/cgame/cg_commands.h b/code/cgame/cg_commands.h
index a2097288..60e39dec 100644
--- a/code/cgame/cg_commands.h
+++ b/code/cgame/cg_commands.h
@@ -113,9 +113,11 @@ TIKI file, similar to ScriptMaster in the server game dll.
 #define T2_VARYCOLOR          (1 << 20)
 #define T2_SPIN               (1 << 21)
 #define T2_RELATIVEANGLES     (1 << 22)
+#define T2_NOTAGAXIS          (1 << 23)
 
 class spawnthing_t;
 class specialeffect_t;
+class MemArchiver;
 
 typedef enum {
     NOT_RANDOM,
@@ -181,6 +183,9 @@ public:
     float decal_orientation;
     float decal_radius;
     float spin_rotation;
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline cg_common_data::cg_common_data()
@@ -249,6 +254,9 @@ public:
     spawnthing_t *m_spawnthing;
 
     void (*touchfcn)(ctempmodel_t *ct, trace_t *trace);
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline ctempmodel_t::ctempmodel_t()
@@ -315,8 +323,44 @@ public:
     int          lastPhysicsTime;
     int          lastLightingTime;
     qboolean     lastValid;
+
+public:
+    cvssource_t();
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
+inline cvssource_t::cvssource_t()
+    : next(NULL)
+    , prev(NULL)
+    , stnext(NULL)
+    , stindex(0)
+    , lastRadius(0)
+    , lastDensity(0)
+    , lastColor {0}
+    , lastLighting {0}
+    , newRadius(0)
+    , newDensity(0)
+    , newColor {0}
+    , newLighting {0}
+    , ooRadius(0)
+    , startAlpha(0)
+    , roll(0)
+    , lifeTime(0)
+    , collisionmask(0)
+    , parent(0)
+    , flags(0)
+    , flags2(0)
+    , smokeType(0)
+    , typeInfo(0)
+    , fadeMult(0)
+    , scaleMult(0)
+    , lastPhysicsTime(0)
+    , lastLightingTime(0)
+    , lastValid(qfalse)
+{}
+
 class cvssourcestate_t
 {
 public:
@@ -387,6 +431,9 @@ public:
 protected:
     qboolean     usedNumbers[256];
     virtual void RemoveEntity(int entnum);
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline enttracker_t::enttracker_t()
@@ -437,6 +484,9 @@ public:
     Vector   oldorigin;
     qboolean active;
     qboolean lerp_emitter;
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 // emitterthing_t is used to keep track of the last time and emitter was updated
@@ -452,6 +502,9 @@ public:
     emittertime_t *GetEmitTime(int entnum);
     virtual void   RemoveEntity(int entnum);
     qboolean       startoff;
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline void emitterthing_t::RemoveEntity(int entnum)
@@ -510,18 +563,23 @@ public:
     int entity_number;
     int command_number;
     int last_command_time;
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 // This class is used for keeping track of the last time an entity executed a
 // particular command.  A command number must be assigned externally by the user
 class commandthing_t : public enttracker_t
 {
-    Container<commandtime_t *> m_commandtimes; // A list of entity numbers and the last time they
-                                               // executed a command
+    Container<commandtime_t> m_commandtimes; // A list of entity numbers and the last time they
+                                             // executed a command
 
 public:
     commandtime_t *GetLastCommandTime(int entnum, int commandnum);
     virtual void   RemoveEntity(int entnum);
+
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline void commandthing_t::RemoveEntity(int entnum)
@@ -532,7 +590,7 @@ inline void commandthing_t::RemoveEntity(int entnum)
     count = m_commandtimes.NumObjects();
 
     for (num = count; num >= 1; num--) {
-        ct = m_commandtimes.ObjectAt(num);
+        ct = &m_commandtimes.ObjectAt(num);
         if (ct->entity_number == entnum) {
             m_commandtimes.RemoveObjectAt(num);
         }
@@ -543,28 +601,27 @@ inline void commandthing_t::RemoveEntity(int entnum)
 
 inline commandtime_t *commandthing_t::GetLastCommandTime(int entnum, int commandnum)
 {
-    int            num, count;
-    commandtime_t *ct;
+    int num, count;
 
     // Search for this entity number
     count = m_commandtimes.NumObjects();
 
     for (num = 1; num <= count; num++) {
-        ct = m_commandtimes.ObjectAt(num);
+        commandtime_t *ct = &m_commandtimes.ObjectAt(num);
         if ((ct->entity_number == entnum) && (ct->command_number == commandnum)) {
             return ct;
         }
     }
 
     // Add a new entry if we didn't find it
-    ct                    = new commandtime_t;
-    ct->entity_number     = entnum;
-    ct->command_number    = commandnum;
-    ct->last_command_time = 0;
+    commandtime_t ct;
+    ct.entity_number     = entnum;
+    ct.command_number    = commandnum;
+    ct.last_command_time = 0;
 
     m_commandtimes.AddObject(ct);
 
-    return ct;
+    return &m_commandtimes.ObjectAt(m_commandtimes.NumObjects());
 }
 
 class spawnthing_t : public emitterthing_t
@@ -625,6 +682,9 @@ public:
     void (*touchfcn)(ctempmodel_t *ct, trace_t *trace);
     str  GetModel(void);
     void SetModel(str model);
+
+public:
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 inline void spawnthing_t::SetModel(str model)
@@ -704,6 +764,7 @@ private:
     void          SpawnVSSSource(int count, int timealive);
     void          EventViewKick(Event *ev);
     void          Print(Event *ev);
+    void          PrintDeathMsg(Event *ev); // Added in 2.0
     void          StartBlock(Event *ev);
     void          EndBlock(Event *ev);
     void          UpdateSpawnThing(spawnthing_t *ep);
@@ -729,6 +790,7 @@ private:
     void          SetScaleRate(Event *ev);
     void          SetRandomVelocity(Event *ev);
     void          SetRandomVelocityAlongAxis(Event *ev);
+    void          SetNoTagAxis(Event *ev); // Added in 2.0
     void          SetAccel(Event *ev);
     void          SetFriction(Event *ev);
     void          SetSpin(Event *ev);
@@ -790,6 +852,7 @@ private:
     void          StopSound(Event *ev);
     void          StopAliasChannel(Event *ev);
     void          LoopSound(Event *ev);
+    void          StopLoopSound(Event *ev); // Added in 2.0
     void          Cache(Event *ev);
     void          CacheImage(Event *ev);
     void          CacheFont(Event *ev);
@@ -824,8 +887,8 @@ private:
     void          SetClampVel(Event *ev);
     void          SetClampVelAxis(Event *ev);
     ctempmodel_t *AllocateTempModel(void);
-    qboolean      TempModelPhysics(ctempmodel_t *p, float ftime, float time2, float scale);
-    qboolean      TempModelRealtimeEffects(ctempmodel_t *p, float ftime, float time2, float scale);
+    qboolean      TempModelPhysics(ctempmodel_t *p, float ftime, float scale);
+    qboolean      TempModelRealtimeEffects(ctempmodel_t *p, float ftime, float scale);
     qboolean      LerpTempModel(refEntity_t *newEnt, ctempmodel_t *p, float frac);
     void          SpawnEffect(int count, int timealive);
     void          SpawnTempModel(int count);
@@ -871,13 +934,13 @@ public:
     void UpdateEmitter(dtiki_t *tiki, vec3_t axis[3], int entity_number, int parent_number, Vector entity_origin);
     void UpdateBeam(dtiki_t *tiki, int entity_number, spawnthing_t *beamthing);
     void PlaySound(
-        str    sound_name,
+        str          sound_name,
         const vec3_t origin       = NULL,
-        int    channel            = CHAN_AUTO,
-        float  volume             = -1,
-        float  min_distance       = -1,
-        float  pitch              = -1,
-        int    argstype           = 0
+        int          channel      = CHAN_AUTO,
+        float        volume       = -1,
+        float        min_distance = -1,
+        float        pitch        = -1,
+        int          argstype     = 0
     );
 
     spawnthing_t *InitializeSpawnthing(spawnthing_t *ep);
@@ -891,6 +954,7 @@ public:
     void InitializeEmitters(void);
     void RemoveClientEntity(int number, dtiki_t *tiki, centity_t *cent, ctempmodel_t *p = NULL);
     void ClearSwipes(void);
+    void FreeSpawnthing(spawnthing_t *sp);
     void ResetTempModels(void);
     void SpawnTempModel(int count, spawnthing_t *sp);
 
@@ -921,6 +985,21 @@ public:
     void ResetTreadMarkSources(Event *ev);
     void InitializeRainCvars();
     void InitializeBeams();
+
+    //
+    // archive stuff
+    //
+    int           IdForTempModel(const ctempmodel_t *model);
+    ctempmodel_t *TempModelForId(int id);
+    int           IdForSpawnThing(const spawnthing_t *sp);
+    spawnthing_t *SpawnThingForId(int id);
+    int           IdForVssSource(const cvssource_t *source);
+    cvssource_t  *VssSourceForId(int id);
+
+    void ArchiveTempModelPointerToMemory(MemArchiver& archiver, ctempmodel_t **model);
+    void ArchiveSpawnThingPointerToMemory(MemArchiver& archiver, spawnthing_t **sp);
+    void ArchiveVssSourcePointerToMemory(MemArchiver& archiver, cvssource_t **source);
+    void ArchiveToMemory(MemArchiver& archiver);
 };
 
 class EmitterLoader : public Listener
diff --git a/code/cgame/cg_consolecmds.c b/code/cgame/cg_consolecmds.c
index d9413d23..9ab3817f 100644
--- a/code/cgame/cg_consolecmds.c
+++ b/code/cgame/cg_consolecmds.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2008-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // text commands typed in at the local console, or executed by a key binding
 
 #include "cg_local.h"
+#include "../fgame/bg_voteoptions.h"
 
 void CG_TargetCommand_f(void);
 
@@ -159,17 +160,157 @@ baseshader_t *CG_GetShaderUnderCrosshair(qboolean bVerbose, trace_t *pRetTrace)
 
 static void CG_PrintContentTypes(int iContentFlags)
 {
-    // FIXME: unimplemented
+    if (iContentFlags & CONTENTS_SOLID) {
+        cgi.Printf(" solid");
+    }
+    if (iContentFlags & CONTENTS_LAVA) {
+        cgi.Printf(" lava");
+    }
+    if (iContentFlags & CONTENTS_SLIME) {
+        cgi.Printf(" slime");
+    }
+    if (iContentFlags & CONTENTS_WATER) {
+        cgi.Printf(" water");
+    }
+    if (iContentFlags & CONTENTS_FOG) {
+        cgi.Printf(" fog");
+    }
+    if (iContentFlags & CONTENTS_FENCE) {
+        cgi.Printf(" fence");
+    }
+    if (iContentFlags & CONTENTS_AREAPORTAL) {
+        cgi.Printf(" areaportal");
+    }
+    if (iContentFlags & CONTENTS_PLAYERCLIP) {
+        cgi.Printf(" playerclip");
+    }
+    if (iContentFlags & CONTENTS_VEHICLECLIP) {
+        cgi.Printf(" vehicleclip");
+    }
+    if (iContentFlags & CONTENTS_MONSTERCLIP) {
+        cgi.Printf(" monsterclip");
+    }
+    if (iContentFlags & CONTENTS_WEAPONCLIP) {
+        cgi.Printf(" weaponclip");
+    }
+    if (iContentFlags & CONTENTS_SHOOTONLY) {
+        cgi.Printf(" shootableonly");
+    }
+    if (iContentFlags & CONTENTS_ORIGIN) {
+        cgi.Printf(" origin");
+    }
+    if (iContentFlags & CONTENTS_TRANSLUCENT) {
+        cgi.Printf(" trans");
+    }
 }
 
 static void CG_PrintSurfaceProperties(int iSurfaceFlags)
 {
-    // FIXME: unimplemented
+    if (iSurfaceFlags & SURF_NODAMAGE) {
+        cgi.Printf(" nodamage");
+    }
+    if (iSurfaceFlags & SURF_SLICK) {
+        cgi.Printf(" slick");
+    }
+    if (iSurfaceFlags & SURF_SKY) {
+        cgi.Printf(" sky");
+    }
+    if (iSurfaceFlags & SURF_LADDER) {
+        cgi.Printf(" ladder");
+    }
+    if (iSurfaceFlags & SURF_NOIMPACT) {
+        cgi.Printf(" noimpact");
+    }
+    if (iSurfaceFlags & SURF_NOMARKS) {
+        cgi.Printf(" nomarks");
+    }
+    if (iSurfaceFlags & SURF_CASTSHADOW) {
+        cgi.Printf(" castshadow");
+    }
+    if (iSurfaceFlags & SURF_NODRAW) {
+        cgi.Printf(" nodraw");
+    }
+    if (iSurfaceFlags & SURF_NOLIGHTMAP) {
+        cgi.Printf(" nolightmap");
+    }
+    if (iSurfaceFlags & SURF_ALPHASHADOW) {
+        cgi.Printf(" alphashadow");
+    }
+    if (iSurfaceFlags & SURF_NOSTEPS) {
+        cgi.Printf(" nofootsteps");
+    }
+    if (iSurfaceFlags & SURF_NONSOLID) {
+        cgi.Printf(" nonsolid");
+    }
+    if (iSurfaceFlags & SURF_OVERBRIGHT) {
+        cgi.Printf(" overbright");
+    }
+    if (iSurfaceFlags & SURF_BACKSIDE) {
+        cgi.Printf(" backside");
+    }
+    if (iSurfaceFlags & SURF_NODLIGHT) {
+        cgi.Printf(" nodlight");
+    }
+    if (iSurfaceFlags & SURF_HINT) {
+        cgi.Printf(" hint");
+    }
+    if (iSurfaceFlags & SURF_PATCH) {
+        cgi.Printf(" patch");
+    }
 }
 
 static void CG_PrintSurfaceType(int iSurfType)
 {
-    // FIXME: unimplemented
+    switch (iSurfType & MASK_SURF_TYPE) {
+    case SURF_FOLIAGE:
+        cgi.Printf("foliage");
+        break;
+    case SURF_SNOW:
+        cgi.Printf("snow");
+        break;
+    case SURF_CARPET:
+        cgi.Printf("carpet");
+        break;
+    case SURF_SAND:
+        cgi.Printf("sand");
+        break;
+    case SURF_PUDDLE:
+        cgi.Printf("puddle");
+        break;
+    case SURF_GLASS:
+        cgi.Printf("glass");
+        break;
+    case SURF_GRAVEL:
+        cgi.Printf("gravel");
+        break;
+    case SURF_MUD:
+        cgi.Printf("mud");
+        break;
+    case SURF_DIRT:
+        cgi.Printf("dirt");
+        break;
+    case SURF_GRILL:
+        cgi.Printf("metal grill");
+        break;
+    case SURF_GRASS:
+        cgi.Printf("grass");
+        break;
+    case SURF_ROCK:
+        cgi.Printf("rock");
+        break;
+    case SURF_PAPER:
+        cgi.Printf("paper");
+        break;
+    case SURF_WOOD:
+        cgi.Printf("wood");
+        break;
+    case SURF_METAL:
+        cgi.Printf("metal");
+        break;
+    default:
+        cgi.Printf("!!*none specified*!!");
+        break;
+    }
 }
 
 void CG_GetCHShader(void)
@@ -215,9 +356,9 @@ void CG_EditCHShader(void)
 
     pShader = CG_GetShaderUnderCrosshair(qfalse, NULL);
     if (pShader) {
-        strcpy(name, "editspecificshader ");
-        strcat(name, pShader->shader);
-        strcat(name, "\n");
+        Q_strncpyz(name, "editspecificshader ", sizeof(name));
+        Q_strcat(name, sizeof(name), pShader->shader);
+        Q_strcat(name, sizeof(name), "\n");
         cgi.AddCommand(name);
     } else {
         cgi.Printf("No surface selected\n");
@@ -339,56 +480,65 @@ typedef struct {
 } consoleCommand_t;
 
 static consoleCommand_t commands[] = {
-    {"useweaponclass",        &CG_UseWeaponClass_f      },
-    {"weapnext",              &CG_NextWeapon_f          },
-    {"weapprev",              &CG_PrevWeapon_f          },
-    {"uselast",               &CG_UseLastWeapon_f       },
-    {"holster",               &CG_HolsterWeapon_f       },
-    {"weapdrop",              &CG_DropWeapon_f          },
-    {"toggleitem",            &CG_ToggleItem_f          },
-    {"+scores",               &CG_ScoresDown_f          },
-    {"-scores",               &CG_ScoresUp_f            },
-    {"viewpos",               &CG_Viewpos_f             },
-    {"sizeup",                &CG_SizeUp_f              },
-    {"sizedown",              &CG_SizeDown_f            },
-    {"cg_eventlist",          &CG_EventList_f           },
-    {"cg_eventhelp",          &CG_EventHelp_f           },
-    {"cg_dumpevents",         &CG_DumpEventHelp_f       },
-    {"cg_pendingevents",      &CG_PendingEvents_f       },
-    {"cg_classlist",          &CG_ClassList_f           },
-    {"cg_classtree",          &CG_ClassTree_f           },
-    {"cg_classevents",        &CG_ClassEvents_f         },
-    {"cg_dumpclassevents",    &CG_DumpClassEvents_f     },
-    {"cg_dumpallclasses",     &CG_DumpAllClasses_f      },
-    {"testemitter",           &CG_TestEmitter_f         },
-    {"triggertestemitter",    &CG_TriggerTestEmitter_f  },
-    {"prevemittercommand",    &CG_PrevEmitterCommand_f  },
-    {"nextemittercommand",    &CG_NextEmitterCommand_f  },
-    {"newemittercommand",     &CG_NewEmitterCommand_f   },
-    {"deleteemittercommand",  &CG_DeleteEmitterCommand_f},
-    {"dumpemitter",           &CG_DumpEmitter_f         },
-    {"loademitter",           &CG_LoadEmitter_f         },
-    {"resetvss",              &CG_ResetVSSSources       },
-    {"getchshader",           &CG_GetCHShader           },
-    {"editchshader",          &CG_EditCHShader          },
-    {"messagemode",           &CG_MessageMode_f         },
-    {"messagemode_all",       &CG_MessageMode_All_f     },
-    {"messagemode_team",      &CG_MessageMode_Team_f    },
-    {"messagemode_private",   &CG_MessageMode_Private_f },
-    {"say",                   &CG_MessageSingleAll_f    },
-    {"sayteam",               &CG_MessageSingleTeam_f   },
-    {"teamsay",               &CG_MessageSingleTeam_f   },
-    {"sayprivate",            &CG_MessageSingleClient_f },
-    {"sayone",                &CG_MessageSingleClient_f },
-    {"wisper",                &CG_MessageSingleClient_f },
-    {"instamsg_main",         &CG_InstaMessageMain_f    },
-    {"instamsg_group_a",      &CG_InstaMessageGroupA_f  },
-    {"instamsg_group_b",      &CG_InstaMessageGroupB_f  },
-    {"instamsg_group_c",      &CG_InstaMessageGroupC_f  },
-    {"instamsg_group_d",      &CG_InstaMessageGroupD_f  },
-    {"instamsg_group_e",      &CG_InstaMessageGroupE_f  },
-    {"pushmenu_teamselect",   &CG_PushMenuTeamSelect_f  },
-    {"pushmenu_weaponselect", &CG_PushMenuWeaponSelect_f},
+    {"useweaponclass",         &CG_UseWeaponClass_f        },
+    {"weapnext",               &CG_NextWeapon_f            },
+    {"weapprev",               &CG_PrevWeapon_f            },
+    {"uselast",                &CG_UseLastWeapon_f         },
+    {"holster",                &CG_HolsterWeapon_f         },
+    {"weapdrop",               &CG_DropWeapon_f            },
+    {"toggleitem",             &CG_ToggleItem_f            },
+    {"+scores",                &CG_ScoresDown_f            },
+    {"-scores",                &CG_ScoresUp_f              },
+    {"viewpos",                &CG_Viewpos_f               },
+    {"sizeup",                 &CG_SizeUp_f                },
+    {"sizedown",               &CG_SizeDown_f              },
+    {"cg_eventlist",           &CG_EventList_f             },
+    {"cg_eventhelp",           &CG_EventHelp_f             },
+    {"cg_dumpevents",          &CG_DumpEventHelp_f         },
+    {"cg_pendingevents",       &CG_PendingEvents_f         },
+    {"cg_classlist",           &CG_ClassList_f             },
+    {"cg_classtree",           &CG_ClassTree_f             },
+    {"cg_classevents",         &CG_ClassEvents_f           },
+    {"cg_dumpclassevents",     &CG_DumpClassEvents_f       },
+    {"cg_dumpallclasses",      &CG_DumpAllClasses_f        },
+    {"testemitter",            &CG_TestEmitter_f           },
+    {"triggertestemitter",     &CG_TriggerTestEmitter_f    },
+    {"prevemittercommand",     &CG_PrevEmitterCommand_f    },
+    {"nextemittercommand",     &CG_NextEmitterCommand_f    },
+    {"newemittercommand",      &CG_NewEmitterCommand_f     },
+    {"deleteemittercommand",   &CG_DeleteEmitterCommand_f  },
+    {"dumpemitter",            &CG_DumpEmitter_f           },
+    {"loademitter",            &CG_LoadEmitter_f           },
+    {"resetvss",               &CG_ResetVSSSources         },
+    {"getchshader",            &CG_GetCHShader             },
+    {"editchshader",           &CG_EditCHShader            },
+    {"messagemode",            &CG_MessageMode_f           },
+    {"messagemode_all",        &CG_MessageMode_All_f       },
+    {"messagemode_team",       &CG_MessageMode_Team_f      },
+    {"messagemode_private",    &CG_MessageMode_Private_f   },
+    {"say",                    &CG_MessageSingleAll_f      },
+    {"sayteam",                &CG_MessageSingleTeam_f     },
+    {"teamsay",                &CG_MessageSingleTeam_f     },
+    {"sayprivate",             &CG_MessageSingleClient_f   },
+    {"sayone",                 &CG_MessageSingleClient_f   },
+    {"wisper",                 &CG_MessageSingleClient_f   },
+    {"instamsg_main",          &CG_InstaMessageMain_f      },
+    {"instamsg_group_a",       &CG_InstaMessageGroupA_f    },
+    {"instamsg_group_b",       &CG_InstaMessageGroupB_f    },
+    {"instamsg_group_c",       &CG_InstaMessageGroupC_f    },
+    {"instamsg_group_d",       &CG_InstaMessageGroupD_f    },
+    {"instamsg_group_e",       &CG_InstaMessageGroupE_f    },
+    {"pushmenu_teamselect",    &CG_PushMenuTeamSelect_f    },
+    {"pushmenu_weaponselect",  &CG_PushMenuWeaponSelect_f  },
+    // Added in 2.0
+    {"pushcallvote",           &CG_PushCallVote_f          },
+    {"pushcallvotesublist",    &CG_PushCallVoteSubList_f   },
+    {"pushcallvotesubtext",    &CG_PushCallVoteSubText_f   },
+    {"pushcallvotesubinteger", &CG_PushCallVoteSubInteger_f},
+    {"pushcallvotesubfloat",   &CG_PushCallVoteSubFloat_f  },
+    {"pushcallvotesubclient",  &CG_PushCallVoteSubClient_f },
+    {"pushvote",               &CG_PushVote_f              },
+    {"callentryvote",          &CG_CallEntryVote_f         },
 };
 
 /*
@@ -555,5 +705,5 @@ int CG_WeaponCommandButtonBits(void)
         cg.iWeaponCommand = 0;
     }
 
-    return iShiftedWeaponCommand & WEAPON_COMMAND_MASK;
+    return iShiftedWeaponCommand & GetWeaponCommandMask(cg_protocol >= PROTOCOL_MOHTA_MIN ? WEAPON_COMMAND_MAX_VER17 : WEAPON_COMMAND_MAX_VER6);
 }
diff --git a/code/cgame/cg_drawtools.cpp b/code/cgame/cg_drawtools.cpp
index abc01c5f..043b3882 100644
--- a/code/cgame/cg_drawtools.cpp
+++ b/code/cgame/cg_drawtools.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -191,8 +191,8 @@ void CG_DrawDisconnect(void)
     }
 
     handle = cgi.R_RegisterShader("gfx/2d/net.tga");
-    w      = cgi.R_GetShaderWidth(handle);
-    h      = cgi.R_GetShaderHeight(handle);
+    w      = cgi.R_GetShaderWidth(handle) * cgs.uiHiResScale[0];
+    h      = cgi.R_GetShaderHeight(handle) * cgs.uiHiResScale[1];
     x      = ((float)cgs.glconfig.vidWidth - w) * 0.5;
     y      = (float)cgs.glconfig.vidHeight - h;
 
@@ -323,11 +323,15 @@ static void CG_DrawPauseIcon()
     }
     w = cgi.R_GetShaderWidth(handle);
     h = cgi.R_GetShaderHeight(handle);
-    x = w / 4;
-    y = cgs.glconfig.vidHeight - (1.25f * h);
+    if (cg.snap && cg.snap->ps.blend[3] > 0) {
+        y = cgs.glconfig.vidHeight * 0.45f - h / 2.f;
+    } else {
+        y = cgs.glconfig.vidHeight * 0.75f - h / 2.f;
+    }
+    x = (cgs.glconfig.vidWidth - w) / 2.f;
 
     cgi.R_SetColor(colorWhite);
-    cgi.R_DrawStretchPic(x, y, w, h, 0, 0, 1, 1, handle);
+    cgi.R_DrawStretchPic(x, y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0, 0, 1, 1, handle);
 }
 
 static void CG_DrawServerLag()
@@ -358,8 +362,8 @@ static void CG_DrawServerLag()
     }
 
     handle = cgi.R_RegisterShader("gfx/2d/slowserver");
-    w      = (float)cgi.R_GetShaderWidth(handle) / 4;
-    h      = (float)cgi.R_GetShaderHeight(handle) / 4;
+    w      = (float)cgi.R_GetShaderWidth(handle) * cgs.uiHiResScale[0] / 4;
+    h      = (float)cgi.R_GetShaderHeight(handle) * cgs.uiHiResScale[1] / 4;
     x      = ((float)cgs.glconfig.vidWidth - w) / 2;
     y      = (float)cgs.glconfig.vidHeight - h;
     cgi.R_DrawStretchPic(x, y, w, h, 0.0, 0.0, 1.0, 1.0, handle);
@@ -573,14 +577,18 @@ void CG_RefreshHudDrawElements()
 
 void CG_HudDrawElements()
 {
-    int   i;
-    float fX, fY;
-    float fWidth, fHeight;
+    int    i;
+    float  fX, fY;
+    float  fWidth, fHeight;
+    vec2_t virtualScale;
 
     if (!cg_huddraw_force->integer && !cg_hud->integer) {
         return;
     }
 
+    virtualScale[0] = cgs.glconfig.vidWidth / 640.0;
+    virtualScale[1] = cgs.glconfig.vidHeight / 480.0;
+
     for (i = 0; i < MAX_HUDDRAW_ELEMENTS; i++) {
         if ((!cgi.HudDrawElements[i].hShader && !cgi.HudDrawElements[i].string[0])
             || !cgi.HudDrawElements[i].vColor[3]) {
@@ -593,6 +601,13 @@ void CG_HudDrawElements()
         fWidth  = cgi.HudDrawElements[i].iWidth;
         fHeight = cgi.HudDrawElements[i].iHeight;
 
+        if (!cgi.HudDrawElements[i].bVirtualScreen) {
+            fWidth *= cgs.uiHiResScale[0];
+            fHeight *= cgs.uiHiResScale[1];
+            fX *= cgs.uiHiResScale[0];
+            fY *= cgs.uiHiResScale[1];
+        }
+
         if (cgi.HudDrawElements[i].iHorizontalAlign == HUD_ALIGN_X_CENTER) {
             if (cgi.HudDrawElements[i].bVirtualScreen) {
                 fX += 320.0 - fWidth * 0.5;
@@ -623,23 +638,21 @@ void CG_HudDrawElements()
 
         cgi.R_SetColor(cgi.HudDrawElements[i].vColor);
         if (cgi.HudDrawElements[i].string[0]) {
-            if (cgi.HudDrawElements[i].pFont) {
-                cgi.R_DrawString(
-                    cgi.HudDrawElements[i].pFont,
-                    cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                    fX,
-                    fY,
-                    -1,
-                    cgi.HudDrawElements[i].bVirtualScreen
-                );
+            fontheader_t *pFont = cgi.HudDrawElements[i].pFont;
+            if (!pFont) {
+                pFont = cgs.media.hudDrawFont;
+            }
+
+            if (cgi.HudDrawElements[i].bVirtualScreen) {
+                cgi.R_DrawString(pFont, cgi.LV_ConvertString(cgi.HudDrawElements[i].string), fX, fY, -1, virtualScale);
             } else {
                 cgi.R_DrawString(
-                    cgs.media.hudDrawFont,
+                    pFont,
                     cgi.LV_ConvertString(cgi.HudDrawElements[i].string),
-                    fX,
-                    fY,
+                    fX / cgs.uiHiResScale[0],
+                    fY / cgs.uiHiResScale[1],
                     -1,
-                    cgi.HudDrawElements[i].bVirtualScreen
+                    cgs.uiHiResScale
                 );
             }
         } else {
@@ -671,22 +684,25 @@ void CG_DrawObjectives()
 {
     float        vColor[4];
     float        fX, fY;
+    int          iNumObjectives;
+    float        fObjectivesTop;
     static float fWidth;
     float        fHeight;
     int          iNumLines[20];
     int          iTotalNumLines;
     int          i;
-    int          ii;
     int          iCurrentObjective;
     float        fTimeDelta;
+    const char  *pszLocalizedText;
+    const char  *pszLine;
 
     iTotalNumLines = 0;
     for (i = CS_OBJECTIVES; i < CS_OBJECTIVES + MAX_OBJECTIVES; ++i) {
-        CG_ProcessConfigString(i);
+        CG_ProcessConfigString(i, qfalse);
     }
 
-    iCurrentObjective = atoi(CG_ConfigString(CS_CURRENT_OBJECTIVE));
-    fTimeDelta        = cg.ObjectivesAlphaTime - cg.time;
+    iCurrentObjective         = atoi(CG_ConfigString(CS_CURRENT_OBJECTIVE));
+    fTimeDelta                = cg.ObjectivesAlphaTime - cg.time;
     cg.ObjectivesCurrentAlpha = cg.ObjectivesDesiredAlpha;
     if (fTimeDelta > 0) {
         cg.ObjectivesCurrentAlpha =
@@ -698,50 +714,78 @@ void CG_DrawObjectives()
         return;
     }
 
-    for (i = 0; i < MAX_OBJECTIVES; i++) {
-        if ((cg.Objectives[i].flags & 0xFFFFFFFE)) {
-            iNumLines[i] = 0;
+    // Added in 2.0
+    //  Get the minimum Y value, it should be below the compass
+    fObjectivesTop = cgi.UI_GetObjectivesTop();
+    iNumObjectives = 0;
 
-            for (ii = 0; ii < MAX_STRING_CHARS; ii++) {
-                if (cg.Objectives[i].text[ii] == '\n') {
-                    iTotalNumLines++;
-                    iNumLines[i]++;
-                } else if (!cg.Objectives[i].text[ii]) {
-                    iTotalNumLines++;
-                    iNumLines[i]++;
-                    break;
-                }
-            }
+    for (i = 0; i < MAX_OBJECTIVES; i++) {
+        if ((cg.Objectives[i].flags == OBJ_FLAG_NONE) || (cg.Objectives[i].flags & OBJ_FLAG_HIDDEN)) {
+            continue;
         }
+
+        iNumObjectives++;
+        iNumLines[i]     = 0;
+        pszLocalizedText = cgi.LV_ConvertString(cg.Objectives[i].text);
+
+        for (pszLine = strchr(pszLocalizedText, '\n'); pszLine; pszLine = strchr(pszLine + 1, '\n')) {
+            iNumLines[i]++;
+        }
+
+        iTotalNumLines += iNumLines[i];
     }
 
     fX        = 25.0;
-    fY        = 125.0;
-    fWidth    = (float)(25 * iTotalNumLines + 155) + 5.0 - 130.0;
+    fY        = fObjectivesTop + 5;
+    fWidth    = (float)(iTotalNumLines * 12 + fObjectivesTop + iNumObjectives * 25 + 32) - fY;
     vColor[2] = 0.2f;
     vColor[1] = 0.2f;
     vColor[0] = 0.2f;
     vColor[3] = cg.ObjectivesCurrentAlpha * 0.75;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawStretchPic(fX, fY, 450.0, fWidth, 0.0, 0.0, 1.0, 1.0, cgs.media.objectivesBackShader);
+    cgi.R_DrawStretchPic(
+        fX,
+        fY,
+        450.0 * cgs.uiHiResScale[0],
+        fWidth * cgs.uiHiResScale[1],
+        0.0,
+        0.0,
+        1.0,
+        1.0,
+        cgs.media.objectivesBackShader
+    );
 
     fX        = 30.0;
-    fY        = 130.0;
+    fY        = fObjectivesTop + 10;
     vColor[0] = 1.0;
     vColor[1] = 1.0;
     vColor[2] = 1.0;
     vColor[3] = cg.ObjectivesCurrentAlpha;
     cgi.R_SetColor(vColor);
-    cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString("Mission Objectives:"), fX, fY, -1, 0);
+    cgi.R_DrawString(
+        cgs.media.objectiveFont,
+        cgi.LV_ConvertString("Mission Objectives:"),
+        fX,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
     fY = fY + 5.0;
 
-    cgi.R_DrawString(cgs.media.objectiveFont, "_______________________________________________________", fX, fY, -1, 0);
-    fHeight = 155.0;
+    cgi.R_DrawString(
+        cgs.media.objectiveFont,
+        "_______________________________________________________",
+        fX,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
+    fHeight = fObjectivesTop + 35 * cgs.uiHiResScale[1];
 
     for (i = 0; i < MAX_OBJECTIVES; ++i) {
         qhandle_t hBoxShader;
 
-        if ((cg.Objectives[i].flags & OBJ_FLAG_HIDDEN) || !cg.Objectives[i].flags) {
+        if ((cg.Objectives[i].flags == OBJ_FLAG_NONE) || (cg.Objectives[i].flags & OBJ_FLAG_HIDDEN)) {
             continue;
         }
 
@@ -774,7 +818,14 @@ void CG_DrawObjectives()
         cgi.R_SetColor(vColor);
         fX = 55.0;
         fY = fHeight;
-        cgi.R_DrawString(cgs.media.objectiveFont, cgi.LV_ConvertString(cg.Objectives[i].text), 55.0, fHeight, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.objectiveFont,
+            cgi.LV_ConvertString(cg.Objectives[i].text),
+            55.0,
+            fY / cgs.uiHiResScale[1],
+            -1,
+            cgs.uiHiResScale
+        );
 
         fX        = 30.0;
         fY        = fHeight;
@@ -783,9 +834,19 @@ void CG_DrawObjectives()
         vColor[2] = 1.0;
         vColor[3] = cg.ObjectivesCurrentAlpha;
         cgi.R_SetColor(vColor);
-        cgi.R_DrawStretchPic(fX, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, hBoxShader);
+        cgi.R_DrawStretchPic(
+            fX * cgs.uiHiResScale[0],
+            fY,
+            16.0 * cgs.uiHiResScale[0],
+            16.0 * cgs.uiHiResScale[1],
+            0.0,
+            0.0,
+            1.0,
+            1.0,
+            hBoxShader
+        );
 
-        fHeight += 25 * iNumLines[i];
+        fHeight += iNumLines[i] * 12 + 25 * cgs.uiHiResScale[1];
     }
 }
 
@@ -809,7 +870,17 @@ void CG_DrawPlayerTeam()
 
     if (handle) {
         cgi.R_SetColor(NULL);
-        cgi.R_DrawStretchPic(96.0, cgs.glconfig.vidHeight - 46, 24.0, 24.0, 0.0, 0.0, 1.0, 1.0, handle);
+        cgi.R_DrawStretchPic(
+            96.0 * cgs.uiHiResScale[0],
+            cgs.glconfig.vidHeight - 46 * cgs.uiHiResScale[1],
+            24.0 * cgs.uiHiResScale[0],
+            24.0 * cgs.uiHiResScale[1],
+            0.0,
+            0.0,
+            1.0,
+            1.0,
+            handle
+        );
     }
 }
 
@@ -851,13 +922,28 @@ void CG_DrawPlayerEntInfo()
 
     if (handle) {
         cgi.R_SetColor(0);
-        cgi.R_DrawStretchPic(56.0, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, handle);
-        fX = 56.0 + 24.0;
+        cgi.R_DrawStretchPic(
+            fX, fY, 16.0 * cgs.uiHiResScale[0], 16.0 * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle
+        );
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.hudDrawFont, (char *)pszName, fX, fY, -1, 0);
-    cgi.R_DrawString(cgs.media.hudDrawFont, va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]), fX, fY + 20.0, -1, 0);
+    cgi.R_DrawString(
+        cgs.media.hudDrawFont,
+        (char *)pszName,
+        fX / cgs.uiHiResScale[0] + 24.0,
+        fY / cgs.uiHiResScale[1],
+        -1,
+        cgs.uiHiResScale
+    );
+    cgi.R_DrawString(
+        cgs.media.hudDrawFont,
+        va("%i", cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]),
+        fX / cgs.uiHiResScale[0] + 24.0,
+        fY / cgs.uiHiResScale[1] + 20.0,
+        -1,
+        cgs.uiHiResScale
+    );
 }
 
 void CG_UpdateAttackerDisplay()
@@ -896,7 +982,17 @@ void CG_UpdateAttackerDisplay()
 
         if (handle) {
             cgi.R_SetColor(0);
-            cgi.R_DrawStretchPic(56.0, fY, 24.0, 24.0, 0.0, 0.0, 1.0, 1.0, handle);
+            cgi.R_DrawStretchPic(
+                56.0 * cgs.uiHiResScale[0],
+                fY,
+                24.0 * cgs.uiHiResScale[0],
+                24.0 * cgs.uiHiResScale[1],
+                0.0,
+                0.0,
+                1.0,
+                1.0,
+                handle
+            );
         }
 
         if ((cg.snap->ps.stats[STAT_TEAM] == TEAM_ALLIES || cg.snap->ps.stats[STAT_TEAM] == TEAM_AXIS)
@@ -910,7 +1006,7 @@ void CG_UpdateAttackerDisplay()
             color[2] = 0.5;
         }
 
-        fX = 56.0 + 32.0;
+        fX = 56.0;
     } else {
         color[0] = 1.0;
         color[1] = 0.5;
@@ -918,11 +1014,15 @@ void CG_UpdateAttackerDisplay()
     }
 
     cgi.R_SetColor(color);
-    cgi.R_DrawString(cgs.media.attackerFont, pszName, fX, fY, -1, 0);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, pszName, fX / cgs.uiHiResScale[0] + 32.0, fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 }
 
 void CG_UpdateCountdown()
 {
+    const char *message = "";
+
     if (!cg.snap) {
         return;
     }
@@ -933,16 +1033,25 @@ void CG_UpdateCountdown()
         iSecondsLeft = (cgs.matchEndTime - cg.time) / 1000;
         if (iSecondsLeft >= 0) {
             iMinutesLeft = iSecondsLeft / 60;
-            cgi.Cvar_Set(
-                "ui_timemessage", va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60)
-            );
+            message      = va("%s %2i:%02i", cgi.LV_ConvertString("Time Left:"), iMinutesLeft, iSecondsLeft % 60);
         } else if (!cgs.matchEndTime) {
-            cgi.Cvar_Set("ui_timemessage", "");
+            message = "";
         }
     } else {
         // The match has not started yet
-        cgi.Cvar_Set("ui_timemessage", "Waiting For Players");
+        message = "Waiting For Players";
     }
+
+    if (strcmp(ui_timemessage->string, message)) {
+        cgi.Cvar_Set("ui_timemessage", message);
+    }
+}
+
+static void CG_RemoveStopwatch()
+{
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse\n");
+    cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse_wet\n");
 }
 
 void CG_DrawStopwatch()
@@ -950,38 +1059,55 @@ void CG_DrawStopwatch()
     int iFraction;
 
     if (!cg_hud->integer) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (!cgi.stopWatch->iStartTime) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cgi.stopWatch->iStartTime >= cgi.stopWatch->iEndTime) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cgi.stopWatch->iEndTime <= cg.time) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cg.ObjectivesCurrentAlpha >= 0.02) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
 
     if (cg.snap && cg.snap->ps.stats[STAT_HEALTH] <= 0) {
-        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_stopwatch\n");
+        CG_RemoveStopwatch();
         return;
     }
+    if (cgi.stopWatch->eType >= SWT_FUSE_WET) {
+        iFraction = cgi.stopWatch->iEndTime - cgi.stopWatch->iStartTime;
+    } else {
+        iFraction = cgi.stopWatch->iEndTime - cg.time;
+    }
 
-    iFraction = cgi.stopWatch->iEndTime - cg.time;
     cgi.Cvar_Set("ui_stopwatch", va("%i", iFraction));
-    cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_stopwatch\n");
+
+    switch (cgi.stopWatch->eType) {
+    case SWT_NORMAL:
+    default:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_stopwatch\n");
+        break;
+    case SWT_FUSE:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_fuse\n");
+        break;
+    case SWT_FUSE_WET:
+        cgi.Cmd_Execute(EXEC_NOW, "ui_removehud hud_fuse\n");
+        cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_fuse_wet\n");
+        break;
+    }
 }
 
 void CG_DrawInstantMessageMenu()
@@ -1005,7 +1131,9 @@ void CG_DrawInstantMessageMenu()
     x = 8.0;
     y = ((float)cgs.glconfig.vidHeight - h) * 0.5;
     cgi.R_SetColor(0);
-    cgi.R_DrawStretchPic(x, y, w, h, 0.0, 0.0, 1.0, 1.0, handle);
+    cgi.R_DrawStretchPic(
+        x * cgs.uiHiResScale[0], y, w * cgs.uiHiResScale[0], h * cgs.uiHiResScale[1], 0.0, 0.0, 1.0, 1.0, handle
+    );
 }
 
 void CG_DrawSpectatorView_ver_15()
@@ -1028,10 +1156,14 @@ void CG_DrawSpectatorView_ver_15()
     if (!bOnTeam) {
         cgi.Key_GetKeysForCommand("+attackprimary", &iKey1, &iKey2);
         pszString = cgi.LV_ConvertString(va("Press Fire(%s) to join the battle!", cgi.Key_KeynumToBindString(iKey1)));
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = cgs.glconfig.vidHeight - 64.0;
+        fX        = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = cgs.glconfig.vidHeight - 64.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(NULL);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, qfalse);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) {
@@ -1044,10 +1176,14 @@ void CG_DrawSpectatorView_ver_15()
                cgi.Key_KeynumToBindString(iKey1b))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 40.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 40.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1055,10 +1191,14 @@ void CG_DrawSpectatorView_ver_15()
         pszString =
             cgi.LV_ConvertString(va("Press Use(%s) to enter free spectate mode.", cgi.Key_KeynumToBindString(iKey1)));
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
     if (!(cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
@@ -1068,31 +1208,42 @@ void CG_DrawSpectatorView_ver_15()
             va("Press Use(%s) to enter player following spectate mode.", cgi.Key_KeynumToBindString(iKey1))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 
-    if ((cg.predicted_player_state.pm_flags & 0x80) != 0 && cg.snap && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
+    if ((cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW) != 0 && cg.snap
+        && cg.snap->ps.stats[STAT_INFOCLIENT] != -1) {
         int       iClientNum;
         qhandle_t hShader;
         vec4_t    color;
         char      buf[128];
 
         iClientNum = cg.snap->ps.stats[STAT_INFOCLIENT];
-        sprintf(buf, "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]);
+        Com_sprintf(
+            buf, sizeof(buf), "%s : %i", cg.clientinfo[iClientNum].name, cg.snap->ps.stats[STAT_INFOCLIENT_HEALTH]
+        );
 
-        hShader = 0;
+        hShader  = 0;
         color[0] = 0.5;
         color[1] = 1.0;
         color[2] = 0.5;
         color[3] = 1.0;
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) - 16) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 80.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - (cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) - 16) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 80.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(color);
-        cgi.R_DrawString(cgs.media.attackerFont, buf, fX, fY, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, buf, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
 
         if (cg.clientinfo[iClientNum].team == TEAM_ALLIES) {
             hShader = cgi.R_RegisterShader("textures/hud/allies");
@@ -1101,9 +1252,18 @@ void CG_DrawSpectatorView_ver_15()
         }
 
         if (hShader) {
-            fX -= 20.0;
             cgi.R_SetColor(NULL);
-            cgi.R_DrawStretchPic(fX, fY, 16.0, 16.0, 0.0, 0.0, 1.0, 1.0, hShader);
+            cgi.R_DrawStretchPic(
+                fX - 20.0 * cgs.uiHiResScale[0],
+                fY,
+                16.0 * cgs.uiHiResScale[0],
+                16.0 * cgs.uiHiResScale[1],
+                0.0,
+                0.0,
+                1.0,
+                1.0,
+                hShader
+            );
         }
     }
 }
@@ -1135,10 +1295,14 @@ void CG_DrawSpectatorView_ver_6()
         pszString = cgi.LV_ConvertString(va("Press Use(%s) to follow a player.", cgi.Key_KeynumToBindString(iKey1)));
     }
 
-    fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-    fY = (float)cgs.glconfig.vidHeight - 40.0;
+    fX = (float)(cgs.glconfig.vidWidth
+                 - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+       * 0.5;
+    fY = (float)cgs.glconfig.vidHeight - 40.0 * cgs.uiHiResScale[1];
     cgi.R_SetColor(0);
-    cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
 
     if (!bOnTeam && (cg.predicted_player_state.pm_flags & PMF_CAMERA_VIEW)) {
         cgi.Key_GetKeysForCommand("+moveup", &iKey1, &iKey2);
@@ -1149,10 +1313,14 @@ void CG_DrawSpectatorView_ver_6()
                cgi.Key_KeynumToBindString(iKey1b))
         );
 
-        fX = (float)(cgs.glconfig.vidWidth - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1)) * 0.5;
-        fY = (float)cgs.glconfig.vidHeight - 24.0;
+        fX = (float)(cgs.glconfig.vidWidth
+                     - cgi.UI_FontStringWidth(cgs.media.attackerFont, pszString, -1) * cgs.uiHiResScale[0])
+           * 0.5;
+        fY = (float)cgs.glconfig.vidHeight - 24.0 * cgs.uiHiResScale[1];
         cgi.R_SetColor(0);
-        cgi.R_DrawString(cgs.media.attackerFont, pszString, fX, fY, -1, 0);
+        cgi.R_DrawString(
+            cgs.media.attackerFont, pszString, fX / cgs.uiHiResScale[0], fY / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
     }
 }
 
@@ -1165,6 +1333,174 @@ void CG_DrawSpectatorView()
     }
 }
 
+void CG_DrawCrosshair()
+{
+    centity_t *friendEnt;
+    qhandle_t  shader;
+    vec3_t     forward;
+    vec3_t     end;
+    vec3_t     mins, maxs;
+    trace_t    trace;
+    float      x, y;
+    float      width, height;
+
+    shader = (qhandle_t)0;
+
+    if (!cg_hud->integer || !ui_crosshair->integer) {
+        return;
+    }
+
+    if (!cg.snap) {
+        return;
+    }
+
+    if ((cg.snap->ps.pm_flags & PMF_NO_HUD) || (cg.snap->ps.pm_flags & PMF_INTERMISSION)) {
+        return;
+    }
+
+    if (!cg.snap->ps.stats[STAT_CROSSHAIR]
+        && (!cg.snap->ps.stats[STAT_INZOOM] || cg.snap->ps.stats[STAT_INZOOM] > 30)) {
+        return;
+    }
+
+    // Fixed in OPM: R_RegisterShaderNoMip
+    //  Use R_RegisterShaderNoMip, as it's UI stuff
+
+    if (cgs.gametype != GT_FFA) {
+        AngleVectorsLeft(cg.refdefViewAngles, forward, NULL, NULL);
+
+        VectorMA(cg.refdef.vieworg, 8192, forward, end);
+        VectorClear(mins);
+        VectorClear(maxs);
+
+        CG_Trace(&trace, cg.refdef.vieworg, mins, maxs, end, 9999, MASK_SOLID, qfalse, qtrue, "CG_DrawCrosshair");
+
+        // ENTITYNUM_WORLD check added in OPM
+        if ((trace.entityNum != ENTITYNUM_NONE && trace.entityNum != ENTITYNUM_WORLD)
+            && trace.entityNum != cg.snap->ps.clientNum) {
+            int myFlags;
+
+            friendEnt = &cg_entities[trace.entityNum];
+            if (cgs.gametype != GT_SINGLE_PLAYER) {
+                myFlags = cg_entities[cg.snap->ps.clientNum].currentState.eFlags & EF_ANY_TEAM;
+            } else {
+                // the player will always be considered as an allied
+                // in single-player
+                myFlags = EF_ALLIES;
+            }
+
+            if (((myFlags & EF_ALLIES) && (friendEnt->currentState.eFlags & EF_ALLIES))
+                || ((myFlags & EF_AXIS) && (friendEnt->currentState.eFlags & EF_AXIS))) {
+                // friend
+                if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair_friend->string);
+                }
+            } else {
+                // enemy
+                if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
+                    shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
+                }
+            }
+        } else {
+            if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
+                shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
+            }
+        }
+    } else {
+        // FFA
+        if (cg.snap->ps.stats[STAT_CROSSHAIR]) {
+            shader = cgi.R_RegisterShaderNoMip(cg_crosshair->string);
+        }
+    }
+
+    if (shader) {
+        width  = cgi.R_GetShaderWidth(shader);
+        height = cgi.R_GetShaderHeight(shader);
+        x      = (cgs.glconfig.vidWidth - width) * 0.5f;
+        y      = (cgs.glconfig.vidHeight - height) * 0.5f;
+
+        cgi.R_SetColor(NULL);
+        cgi.R_DrawStretchPic(x, y, width * cgs.uiHiResScale[0], height * cgs.uiHiResScale[1], 0, 0, 1, 1, shader);
+    }
+}
+
+void CG_DrawVote()
+{
+    const char *text;
+    int         seconds;
+    int         percentYes;
+    int         percentNo;
+    int         percentUndecided;
+    float       x, y;
+    vec4_t      col;
+
+    if (!cgs.voteTime) {
+        return;
+    }
+
+    if (cgs.voteRefreshed) {
+        cgs.voteRefreshed = qfalse;
+    }
+
+    seconds = (30000 - (cg.time - cgs.voteTime)) / 1000 + 1;
+    if (seconds < 0) {
+        seconds = 0;
+    }
+
+    percentYes       = cgs.numVotesYes * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
+    percentNo        = cgs.numVotesNo * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
+    percentUndecided = cgs.numUndecidedVotes * 100 / (cgs.numUndecidedVotes + cgs.numVotesNo + cgs.numVotesYes);
+
+    x = 8 * cgs.uiHiResScale[0];
+    y = ((cgs.glconfig.vidHeight > 480) ? (cgs.glconfig.vidHeight * 0.725f) : (cgs.glconfig.vidHeight * 0.75f));
+
+    cgi.R_SetColor(NULL);
+
+    text = va("%s: %s", cgi.LV_ConvertString("Vote Running"), cgs.voteString);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
+
+    y += 12 * cgs.uiHiResScale[1];
+
+    text =
+        va("%s: %isec  %s: %i%%  %s: %i%%  %s: %i%%",
+           cgi.LV_ConvertString("Time"),
+           seconds,
+           cgi.LV_ConvertString("Yes"),
+           percentYes,
+           cgi.LV_ConvertString("No"),
+           percentNo,
+           cgi.LV_ConvertString("Undecided"),
+           percentUndecided);
+    cgi.R_DrawString(
+        cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+    );
+
+    if (cg.snap && !cg.snap->ps.voted) {
+        col[0] = 0.5;
+        col[1] = 1.0;
+        col[2] = 0.5;
+        col[3] = 1.0;
+        cgi.R_SetColor(col);
+
+        y += 12 * cgs.uiHiResScale[1];
+
+        text = cgi.LV_ConvertString("Vote now, it's your patriotic duty!");
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
+
+        y += 12 * cgs.uiHiResScale[1];
+
+        text = cgi.LV_ConvertString("To vote Yes, press F1. To vote No, press F2.");
+        cgi.R_DrawString(
+            cgs.media.attackerFont, text, x / cgs.uiHiResScale[0], y / cgs.uiHiResScale[1], -1, cgs.uiHiResScale
+        );
+        cgi.R_SetColor(NULL);
+    }
+}
+
 /*
 ==============
 CG_Draw2D
@@ -1183,5 +1519,7 @@ void CG_Draw2D(void)
     CG_DrawPlayerTeam();
     CG_DrawPlayerEntInfo();
     CG_UpdateAttackerDisplay();
+    CG_DrawVote();
     CG_DrawInstantMessageMenu();
+    CG_DrawCrosshair();
 }
diff --git a/code/cgame/cg_lightstyles.cpp b/code/cgame/cg_lightstyles.cpp
index dfb9e76f..3a280a66 100644
--- a/code/cgame/cg_lightstyles.cpp
+++ b/code/cgame/cg_lightstyles.cpp
@@ -59,7 +59,7 @@ qboolean CG_LightStyleColor(int style, int realtime, vec4_t color, qboolean clam
 
     time = realtime / 50;
     frac = (realtime - (time * 50.0f)) / 50.0f;
-    memset(color, 0, sizeof(color));
+    VectorClear4(color);
     if ((style < 0) || (style >= (MAX_LIGHTSTYLES * 2))) {
         cgi.DPrintf("CG_LightStyleColor: style out of range.\n");
         return qtrue;
diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index 1f2bbec5..86921201 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_public.h"
 
 #ifdef __cplusplus
+class MemArchiver;
+
 extern "C" {
 #endif
 
@@ -185,6 +187,7 @@ extern "C" {
         float min_dist;
         float width;
         char  shader[MAX_RAIN_SHADERS][MAX_STRING_CHARS];
+        char  currentShader[MAX_STRING_CHARS];
         int   numshaders;
     } crain_t;
 
@@ -267,6 +270,8 @@ extern "C" {
         qhandle_t hAlliedPlayerModelHandle;
         dtiki_t  *pAxisPlayerModel;
         qhandle_t hAxisPlayerModelHandle;
+        qboolean  serverAlliedModelValid;
+        qboolean  serverAxisModelValid;
 
         // view eyes
         vec3_t vOffsetViewAngles;
@@ -338,6 +343,7 @@ extern "C" {
         float        ObjectivesBaseAlpha;
         float        ObjectivesDesiredAlpha;
         float        ObjectivesCurrentAlpha;
+        int          ObjectivesCurrentIndex;
 
         // misc
         crain_t      rain;
@@ -376,6 +382,7 @@ extern "C" {
         float       screenXScale; // derived from glconfig
         float       screenYScale;
         float       screenXBias;
+        vec2_t      uiHiResScale;
 
         int serverCommandSequence; // reliable command stream counter
         int processedSnapshotNum;  // the number of snapshots cgame has requested
@@ -394,8 +401,19 @@ extern "C" {
         int        maxclients;
         int        cinematic;
         int        mapChecksum;
+        qboolean   useMapChecksum;
         char       mapname[MAX_QPATH];
 
+        //
+        // vote
+        //
+        int voteTime;
+        int numVotesYes;
+        int numVotesNo;
+        int numUndecidedVotes;
+        qboolean voteRefreshed;
+        char voteString[1024];
+
         //
         // locally derived information from gamestate
         //
@@ -416,6 +434,7 @@ extern "C" {
     extern cgs_t              cgs;
     extern cg_t               cg;
     extern clientGameImport_t cgi;
+    extern target_game_e      cg_target_game;
     extern int                cg_protocol;
     extern centity_t          cg_entities[MAX_GENTITIES];
     extern markPoly_t         *cg_markPolys;
@@ -458,6 +477,9 @@ extern "C" {
     extern cvar_t *cg_hud;
     extern cvar_t *cg_huddraw_force;
     extern cvar_t *cg_drawsvlag;
+    extern cvar_t *cg_crosshair;
+    extern cvar_t *cg_crosshair_friend;
+    extern cvar_t *ui_crosshair;
     extern cvar_t *vm_offset_max;
     extern cvar_t *vm_offset_speed;
     extern cvar_t *vm_sway_front;
@@ -484,11 +506,19 @@ extern "C" {
     extern cvar_t *voiceChat;
     extern cvar_t *cg_shadowscount;
     extern cvar_t *cg_shadowdebug;
+    extern cvar_t *ui_timemessage;
+
+    //
+    // Added in OPM
+    //
+    extern cvar_t *cg_fov;
+    extern cvar_t *cg_cheats;
 
     //
     // cg_main.c
     //
-    void        CG_ProcessConfigString(int num);
+    qboolean    CG_UseLargeLightmaps(const char* mapName);
+    void        CG_ProcessConfigString(int num, qboolean modelOnly);
     const char *CG_ConfigString(int index);
     void        CG_AddToTeamChat(const char *str);
     void        CG_NewClientinfo(int clientNum);
@@ -503,6 +533,9 @@ extern "C" {
     //
     // cg_modelanim.cpp
     //
+    void CG_ProcessPlayerModel();
+    void CG_ServerModelLoaded(const char* name, qhandle_t handle);
+    void CG_ServerModelUnloaded(qhandle_t handle);
     void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime);
     void CG_AttachEntity(
         refEntity_t *entity, refEntity_t *parent, dtiki_t *tiki, int tagnum, qboolean use_angles, vec3_t attach_offset
@@ -530,6 +563,8 @@ extern "C" {
     // cg_tempmodels.cpp
     //
     extern cvar_t *cg_showtempmodels;
+    extern cvar_t *cg_max_tempmodels;
+    extern cvar_t *cg_reserve_tempmodels;
     extern cvar_t *cg_detail;
     extern cvar_t *cg_effectdetail;
     extern cvar_t *cg_effect_physicsrate;
@@ -708,8 +743,8 @@ extern "C" {
     void CG_InitTestTreadMark();
     void CG_AddTreadMarks();
     int  CG_PermanentMark(
-         const vec3_t    origin,
-         const vec3_t    dir,
+         vec3_t          origin,
+         vec3_t          dir,
          float           orientation,
          float           fSScale,
          float           fTScale,
@@ -902,7 +937,8 @@ qboolean CG_LightStyleColor(int style, int realtime, vec4_t color, qboolean clam
     void CG_InstaMessageGroupD_f(void);
     void CG_InstaMessageGroupE_f(void);
     void CG_HudPrint_f(void);
-    int  CG_CheckCaptureKey(int key, qboolean down, unsigned int time);
+
+    qboolean CG_CheckCaptureKey(int key, qboolean down, unsigned int time);
 
     //
     // cg_vehicle.cpp
@@ -911,6 +947,9 @@ qboolean CG_LightStyleColor(int style, int realtime, vec4_t color, qboolean clam
     //
     // cg_volumetricsmoke.cpp
     void CG_ResetVSSSources(void);
+#ifdef __cplusplus
+    void CG_ArchiveVSSGlobals(MemArchiver& archiver);
+#endif
     void CG_AddVSSSources(void);
 
     extern cvar_t *vss_draw;
diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c
index 6df6b357..71295f3e 100644
--- a/code/cgame/cg_main.c
+++ b/code/cgame/cg_main.c
@@ -35,12 +35,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 clientGameImport_t        cgi;
 static clientGameExport_t cge;
 
-cvar_t   *paused;
-cvar_t   *developer;
-cg_t      cg;
-cgs_t     cgs;
-int       cg_protocol;
-centity_t cg_entities[MAX_GENTITIES];
+cvar_t       *paused;
+cvar_t       *developer;
+cg_t          cg;
+cgs_t         cgs;
+target_game_e cg_target_game = TG_INVALID;
+int           cg_protocol;
+centity_t     cg_entities[MAX_GENTITIES];
 
 cvar_t *cg_animSpeed;
 cvar_t *cg_debugAnim;
@@ -80,6 +81,9 @@ cvar_t *cg_acidtrip;
 cvar_t *cg_hud;
 cvar_t *cg_huddraw_force;
 cvar_t *cg_drawsvlag;
+cvar_t *cg_crosshair;
+cvar_t *cg_crosshair_friend;
+cvar_t *ui_crosshair;
 cvar_t *vm_offset_max;
 cvar_t *vm_offset_speed;
 cvar_t *vm_sway_front;
@@ -106,6 +110,13 @@ cvar_t *vm_lean_lower;
 cvar_t *voiceChat;
 cvar_t *cg_shadowscount;
 cvar_t *cg_shadowdebug;
+cvar_t *ui_timemessage;
+
+//
+// Added in OPM
+//
+cvar_t *cg_fov;
+cvar_t *cg_cheats;
 
 /*
 =================
@@ -151,14 +162,23 @@ void CG_RegisterCvars(void)
     cg_shadowdebug                = cgi.Cvar_Get("cg_shadowdebug", "0", 0);
     developer                     = cgi.Cvar_Get("developer", "0", 0);
     dm_playermodel                = cgi.Cvar_Get("dm_playermodel", "american_army", 3);
-    dm_playergermanmodel          = cgi.Cvar_Get("dm_playergermanmodel", "german_wehrmacht_soldier", 3);
+    dm_playergermanmodel          = cgi.Cvar_Get("dm_playergermanmodel", "german_wehrmacht_soldier", CVAR_ARCHIVE | CVAR_USERINFO);
     cg_forceModel                 = cgi.Cvar_Get("cg_forceModel", "0", CVAR_ARCHIVE);
-    cg_animationviewmodel         = cgi.Cvar_Get("cg_animationviewmodel", "0", 8);
+    cg_animationviewmodel         = cgi.Cvar_Get("cg_animationviewmodel", "0", CVAR_SYSTEMINFO);
     cg_hitmessages                = cgi.Cvar_Get("cg_hitmessages", "1", CVAR_ARCHIVE);
     cg_acidtrip                   = cgi.Cvar_Get("cg_acidtrip", "0", CVAR_CHEAT);
     cg_hud                        = cgi.Cvar_Get("cg_hud", "0", 0);
     cg_huddraw_force              = cgi.Cvar_Get("cg_huddraw_force", "0", CVAR_SAVEGAME);
     cg_drawsvlag                  = cgi.Cvar_Get("cg_drawsvlag", "1", CVAR_ARCHIVE);
+    cg_crosshair                  = cgi.Cvar_Get("cg_crosshair", "textures/hud/crosshair", CVAR_ARCHIVE);
+    if (cg_protocol >= PROTOCOL_MOHTA_MIN) {
+        cg_crosshair_friend = cgi.Cvar_Get("cg_crosshair_friend", "textures/hud/crosshair_friend", CVAR_ARCHIVE);
+    } else {
+        // on 1.11 and below, fallback to standard crosshair
+        // as it doesn't have crosshair_friend texture
+        cg_crosshair_friend = cgi.Cvar_Get("cg_crosshair_friend", "textures/hud/crosshair", CVAR_ARCHIVE);
+    }
+    ui_crosshair                  = cgi.Cvar_Get("ui_crosshair", "1", CVAR_ARCHIVE);
     vm_offset_max                 = cgi.Cvar_Get("vm_offset_max", "8.0", 0);
     vm_offset_speed               = cgi.Cvar_Get("vm_offset_speed", "8.0", 0);
     vm_sway_front                 = cgi.Cvar_Get("vm_sway_front", "0.1", 0);
@@ -184,53 +204,137 @@ void CG_RegisterCvars(void)
     vm_lean_lower                 = cgi.Cvar_Get("vm_lean_lower", "0.1", 0);
     voiceChat                     = cgi.Cvar_Get("cg_voicechat", "1", 0);
 
+    ui_timemessage = cgi.Cvar_Get("ui_timemessage", "", 0);
+
     // see if we are also running the server on this machine
     temp            = cgi.Cvar_Get("sv_running", "0", 0);
     cgs.localServer = temp->integer;
+
+    //
+    // Added in OPM
+    //
+
+    cg_fov = cgi.Cvar_Get("cg_fov", "80", CVAR_ARCHIVE);
+    cg_cheats = cgi.Cvar_Get("cheats", "0", CVAR_USERINFO | CVAR_SERVERINFO | CVAR_LATCH);
+}
+/*
+===============
+CG_UseLargeLightmaps
+
+Added in 2.0
+Returns true if the standard BSP file should be used, false if the smaller lightmap BSP file should be used
+===============
+*/
+qboolean CG_UseLargeLightmaps(const char* mapName) {
+	char buffer[MAX_QPATH];
+
+	Com_sprintf(buffer, sizeof(buffer), "maps/%s_sml.bsp", mapName);
+
+	if (cgi.FS_ReadFile(buffer, NULL, qtrue) == -1) {
+		return qtrue;
+	}
+
+	return cgi.Cvar_Get("r_largemap", "0", 0)->integer;
+}
+
+/*
+================
+CG_RegisterSoundsForFile
+
+Register the specified ubersound source file
+================
+*/
+void CG_RegisterSoundsForFile(const char *name)
+{
+    int startTime;
+    int endTime;
+
+    Com_Printf("\n\n-----------PARSING '%s'------------\n", name);
+    Com_Printf(
+        "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
+        "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
+    );
+
+    startTime = cgi.Milliseconds();
+    CG_Command_ProcessFile(name, qfalse, NULL);
+    endTime = cgi.Milliseconds();
+
+    Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
+    Com_Printf("-------------PARSING '%s' DONE---------------\n\n", name);
+}
+
+/*
+=================
+qsort_compare_strings
+
+perform case-insensitive sorting
+=================
+*/
+int qsort_compare_strings(const void *s1, const void *s2)
+{
+    return Q_stricmp(*(const char **)s1, *(const char **)s2);
 }
 
 /*
 =================
 CG_RegisterSounds
 
-called during a precache command
+Called during a precache command
 =================
 */
 void CG_RegisterSounds(void)
 {
-    int  startTime;
-    int  endTime;
-    char filename[MAX_QPATH];
+    char **fileList;
+    int    numFiles;
+    int    i;
 
-    Com_Printf("\n\n-----------PARSING UBERSOUND------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and "
-        "tiki-specific sounds for it won't work. To fix prefe"
-        "tch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
-    Com_sprintf(filename, sizeof(filename), "ubersound/ubersound.scr");
+    fileList = cgi.FS_ListFilteredFiles("ubersound/", "scr", "*.scr", qfalse, &numFiles, qtrue);
+    if (cg_target_game >= TG_MOHTA) {
+        // Fixed in 2.0
+        //  The behavior has changed, all aliases get cleared
+        if (cgs.gametype != GT_SINGLE_PLAYER) {
+            cgi.Alias_Clear();
+        }
+    } else {
+        if (!cgs.localServer) {
+            cgi.Alias_Clear();
+        }
+    }
+    
+    qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
 
-    startTime = cgi.Milliseconds();
-    CG_Command_ProcessFile(filename, 0, 0);
-    endTime = cgi.Milliseconds();
+    for (i = 0; i < numFiles; i++) {
+        // Added in 2.0
+        //  Since 2.0, all files in the ubersound folder
+        //  are parsed
+        CG_RegisterSoundsForFile(va("ubersound/%s", fileList[i]));
+    }
 
-    Com_Printf("Parse/Load time: %f seconds.\n", (endTime - startTime) / 1000.0f);
+    cgi.FS_FreeFileList(fileList);
+}
 
-    Com_Printf("-------------UBERSOUND DONE---------------\n\n");
-    Com_Printf("\n\n-----------PARSING UBERDIALOG------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and "
-        "tiki-specific sounds for it won't work. To fix prefe"
-        "tch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
-    Com_sprintf(filename, sizeof(filename), "ubersound/uberdialog.scr");
+/*
+================
+CG_IsHandleUnique
 
-    startTime = cgi.Milliseconds();
-    CG_Command_ProcessFile(filename, 0, 0);
-    endTime = cgi.Milliseconds() - startTime;
+Check if the model handle is unique
+================
+*/
+static qboolean CG_IsHandleUnique(qhandle_t handle) {
+    int i;
+    int numRef;
 
-    Com_Printf("Parse/Load time: %f seconds.\n", endTime / 1000.0f);
-    Com_Printf("-------------UBERDIALOG DONE---------------\n\n");
+    numRef = 0;
+    for (i = 0; i < MAX_MODELS; i++) {
+        if (cgs.model_draw[i] == handle) {
+            numRef++;
+            if (numRef >= 2) {
+                return qfalse;
+            }
+        }
+    }
+
+    return qtrue;
 }
 
 /*
@@ -238,86 +342,17 @@ void CG_RegisterSounds(void)
 CG_ProcessConfigString
 ================
 */
-void CG_ProcessConfigString(int num)
+void CG_ProcessConfigString(int num, qboolean modelOnly)
 {
-    const char *str = CG_ConfigString(num);
-    int         i;
+    const char* str;
+    int i;
 
-    switch (num) {
-    case CS_RAIN_DENSITY:
-        cg.rain.density = atof(str);
-        return;
-    case CS_RAIN_SPEED:
-        cg.rain.speed = atof(str);
-        return;
-    case CS_RAIN_SPEEDVARY:
-        cg.rain.speed_vary = atoi(str);
-        return;
-    case CS_RAIN_SLANT:
-        cg.rain.slant = atoi(str);
-        return;
-    case CS_RAIN_LENGTH:
-        cg.rain.length = atof(str);
-        return;
-    case CS_RAIN_MINDIST:
-        cg.rain.min_dist = atof(str);
-        return;
-    case CS_RAIN_WIDTH:
-        cg.rain.width = atof(str);
-        return;
-    case CS_RAIN_SHADER:
-        if (cg.rain.numshaders) {
-            for (i = 0; i < cg.rain.numshaders; i++) {
-                sprintf(cg.rain.shader[i], "%s%i", str, i);
-            }
-        } else {
-            strcpy(cg.rain.shader[0], str);
-        }
-        return;
-    case CS_RAIN_NUMSHADERS:
-        cg.rain.numshaders = atoi(str);
-        if (cg.rain.numshaders) {
-            for (i = 0; i < cg.rain.numshaders; i++) {
-                sprintf(cg.rain.shader[i], "%s%i", str, i);
-            }
-        }
-        return;
-    }
-
-    if (num >= CS_OBJECTIVES && num < CS_OBJECTIVES + MAX_OBJECTIVES) {
-        cobjective_t *objective = &cg.Objectives[num - CS_OBJECTIVES];
-        objective->flags        = atoi(Info_ValueForKey(str, "flags"));
-        strcpy(objective->text, Info_ValueForKey(str, "text"));
-    }
-
-    switch (num) {
-    case CS_MUSIC:
-        cgi.MUSIC_NewSoundtrack(str);
-        return;
-    case CS_WARMUP:
-        cg.matchStartTime = atoi(str);
-        return;
-    case CS_FOGINFO:
-        CG_ParseFogInfo(str);
-        return;
-    case CS_SKYINFO:
-        sscanf(str, "%f %d", &cg.sky_alpha, &cg.sky_portal);
-        return;
-    case CS_SERVERINFO:
-        CG_ParseServerinfo();
-        return;
-    case CS_LEVEL_START_TIME:
-        cgs.levelStartTime = atoi(str);
-        return;
-    case CS_MATCHEND:
-        cgs.matchEndTime = atoi(str);
-        return;
-    }
+    str = CG_ConfigString(num);
 
     if (num >= CS_MODELS && num < CS_MODELS + MAX_MODELS) {
         qhandle_t hOldModel = cgs.model_draw[num - CS_MODELS];
 
-        if (str && str[0]) {
+        if (str && str[0] && !modelOnly) {
             qhandle_t hModel = cgi.R_RegisterServerModel(str);
             dtiki_t  *tiki;
 
@@ -332,45 +367,161 @@ void CG_ProcessConfigString(int num)
             if (tiki) {
                 CG_ProcessCacheInitCommands(tiki);
             }
+
+            CG_ServerModelLoaded(str, hModel);
         } else {
             // clear out the model
-            if (hOldModel) {
+            if (hOldModel && CG_IsHandleUnique(hOldModel)) {
+                // Handle uniqueness added in OPM
                 cgi.R_UnregisterServerModel(hOldModel);
             }
             cgs.model_draw[num - CS_MODELS] = 0;
-        }
-    } else if (num >= CS_SOUNDS && num < CS_SOUNDS + MAX_SOUNDS) {
-        size_t len = strlen(str);
-        if (len) {
-            qboolean streamed;
-            char     buf[1024];
-            strcpy(buf, str);
 
-            streamed     = buf[len - 1] != '0';
-            buf[len - 1] = 0;
-            if (buf[0] != '*') {
-                cgs.sound_precache[num - CS_SOUNDS] = cgi.S_RegisterSound(buf, streamed);
+            if (!str || !str[0]) {
+                CG_ServerModelUnloaded(hOldModel);
             }
         }
-    } else if (num >= CS_LIGHTSTYLES && num < CS_LIGHTSTYLES + MAX_LIGHTSTYLES) {
-        CG_SetLightStyle(num - CS_LIGHTSTYLES, str);
-    } else if (num >= CS_PLAYERS && num < CS_PLAYERS + MAX_CLIENTS) {
-        const char *value;
+    }
 
-        value = Info_ValueForKey(str, "name");
-        if (value) {
-            strncpy(cg.clientinfo[num - CS_PLAYERS].name, value, sizeof(cg.clientinfo[num - CS_PLAYERS].name));
-        } else {
-            strncpy(
-                cg.clientinfo[num - CS_PLAYERS].name, "UnnamedSoldier", sizeof(cg.clientinfo[num - CS_PLAYERS].name)
-            );
+    if (!modelOnly) {
+        switch (num) {
+        case CS_RAIN_DENSITY:
+            cg.rain.density = atof(str);
+            return;
+        case CS_RAIN_SPEED:
+            cg.rain.speed = atof(str);
+            return;
+        case CS_RAIN_SPEEDVARY:
+            cg.rain.speed_vary = atoi(str);
+            return;
+        case CS_RAIN_SLANT:
+            cg.rain.slant = atoi(str);
+            return;
+        case CS_RAIN_LENGTH:
+            cg.rain.length = atof(str);
+            return;
+        case CS_RAIN_MINDIST:
+            cg.rain.min_dist = atof(str);
+            return;
+        case CS_RAIN_WIDTH:
+            cg.rain.width = atof(str);
+            return;
+        case CS_RAIN_SHADER:
+            Q_strncpyz(cg.rain.currentShader, str, sizeof(cg.rain.currentShader));
+            if (cg.rain.numshaders) {
+                // Fixed in OPM
+                //  not sure why some maps set a digit at the end...
+                size_t len = strlen(cg.rain.currentShader);
+                if (isdigit(cg.rain.currentShader[len - 1])) {
+                    cg.rain.currentShader[len - 1] = 0;
+                }
+            }
+            for (i = 0; i < cg.rain.numshaders; ++i) {
+                Com_sprintf(cg.rain.shader[i], sizeof(cg.rain.shader[i]), "%s%i", cg.rain.currentShader, i);
+            }
+            if (!cg.rain.numshaders) {
+                Q_strncpyz(cg.rain.shader[0], cg.rain.currentShader, sizeof(cg.rain.shader[0]));
+            }
+            return;
+        case CS_RAIN_NUMSHADERS:
+            cg.rain.numshaders = atoi(str);
+            if (cg.rain.numshaders) {
+                for (i = 0; i < cg.rain.numshaders; i++) {
+                    Com_sprintf(cg.rain.shader[i], sizeof(cg.rain.shader[i]), "%s%i", cg.rain.currentShader, i);
+                }
+            }
+            return;
+        case CS_CURRENT_OBJECTIVE:
+            cg.ObjectivesCurrentIndex = atoi(str);
+            return;
         }
 
-        value = Info_ValueForKey(str, "team");
-        if (value) {
-            cg.clientinfo[num - CS_PLAYERS].team = atoi(value);
-        } else {
-            cg.clientinfo[num - CS_PLAYERS].team = TEAM_NONE;
+        if (num >= CS_OBJECTIVES && num < CS_OBJECTIVES + MAX_OBJECTIVES) {
+            cobjective_t *objective = &cg.Objectives[num - CS_OBJECTIVES];
+            objective->flags        = atoi(Info_ValueForKey(str, "flags"));
+            Q_strncpyz(objective->text, Info_ValueForKey(str, "text"), sizeof(objective->text));
+        }
+
+        switch (num) {
+        case CS_MUSIC:
+            cgi.MUSIC_NewSoundtrack(str);
+            return;
+        case CS_WARMUP:
+            cg.matchStartTime = atoi(str);
+            return;
+        case CS_FOGINFO:
+            cg.farclipOverride = 0;
+            cg.farplaneColorOverride[0] = -1;
+            cg.farplaneColorOverride[1] = -1;
+            cg.farplaneColorOverride[2] = -1;
+            CG_ParseFogInfo(str);
+            return;
+        case CS_SKYINFO:
+            sscanf(str, "%f %d", &cg.sky_alpha, &cg.sky_portal);
+            return;
+        case CS_SERVERINFO:
+            CG_ParseServerinfo();
+            return;
+        case CS_LEVEL_START_TIME:
+            cgs.levelStartTime = atoi(str);
+            return;
+        case CS_VOTE_TIME:
+            cgs.voteTime = atoi(str);
+            cgs.voteRefreshed = qtrue;
+            break;
+        case CS_VOTE_STRING:
+            Q_strncpyz(cgs.voteString, str, sizeof(cgs.voteString));
+            break;
+        case CS_VOTE_YES:
+            cgs.numVotesYes = atoi(str);
+            cgs.voteRefreshed = qtrue;
+            break;
+        case CS_VOTE_NO:
+            cgs.numVotesNo = atoi(str);
+            cgs.voteRefreshed = qtrue;
+            break;
+        case CS_VOTE_UNDECIDED:
+            cgs.numUndecidedVotes = atoi(str);
+            cgs.voteRefreshed = qtrue;
+            break;
+        case CS_MATCHEND:
+            cgs.matchEndTime = atoi(str);
+            return;
+        }
+
+        if (num >= CS_SOUNDS && num < CS_SOUNDS + MAX_SOUNDS) {
+            size_t len = strlen(str);
+            if (len) {
+                qboolean streamed;
+                char     buf[1024];
+                Q_strncpyz(buf, str, sizeof(buf));
+        
+                streamed     = buf[len - 1] != '0';
+                buf[len - 1] = 0;
+                if (buf[0] != '*') {
+                    cgs.sound_precache[num - CS_SOUNDS] = cgi.S_RegisterSound(buf, streamed);
+                }
+            }
+        } else if (num >= CS_LIGHTSTYLES && num < CS_LIGHTSTYLES + MAX_LIGHTSTYLES) {
+            CG_SetLightStyle(num - CS_LIGHTSTYLES, str);
+        } else if (num >= CS_PLAYERS && num < CS_PLAYERS + MAX_CLIENTS) {
+            const char *value;
+        
+            value = Info_ValueForKey(str, "name");
+            if (value) {
+                strncpy(cg.clientinfo[num - CS_PLAYERS].name, value, sizeof(cg.clientinfo[num - CS_PLAYERS].name));
+            } else {
+                strncpy(
+                    cg.clientinfo[num - CS_PLAYERS].name, "UnnamedSoldier", sizeof(cg.clientinfo[num - CS_PLAYERS].name)
+                );
+            }
+        
+            value = Info_ValueForKey(str, "team");
+            if (value) {
+                cg.clientinfo[num - CS_PLAYERS].team = atoi(value);
+            } else {
+                cg.clientinfo[num - CS_PLAYERS].team = TEAM_NONE;
+            }
         }
     }
 }
@@ -423,14 +574,14 @@ void CG_PrepRefresh(void)
     cgs.media.binocularsOverlayShader  = cgi.R_RegisterShaderNoMip("textures/hud/binocularsoverlay");
     cgs.media.hudDrawFont              = cgi.R_LoadFont("verdana-14");
     cgs.media.attackerFont             = cgi.R_LoadFont("facfont-20");
-    cgs.media.objectiveFont            = cgi.R_LoadFont("courier-16");
+    cgs.media.objectiveFont            = cgi.R_LoadFont("facfont-20"); // was courier-16 before 2.0
     cgs.media.objectivesBackShader     = cgi.R_RegisterShaderNoMip("textures/hud/objectives_backdrop");
     cgs.media.checkedBoxShader         = cgi.R_RegisterShaderNoMip("textures/objectives/filledbox");
     cgs.media.uncheckedBoxShader       = cgi.R_RegisterShaderNoMip("textures/objectives/emptybox");
 
     // go through all the configstrings and process them
     for (i = CS_SYSTEMINFO + 1; i < MAX_CONFIGSTRINGS; i++) {
-        CG_ProcessConfigString(i);
+        CG_ProcessConfigString(i, qfalse);
     }
 }
 
@@ -457,6 +608,7 @@ void CG_GetRendererConfig(void)
     cgi.GetGlconfig(&cgs.glconfig);
     cgs.screenXScale = cgs.glconfig.vidWidth / 640.0;
     cgs.screenYScale = cgs.glconfig.vidHeight / 480.0;
+    cgi.UI_GetHighResolutionScale(cgs.uiHiResScale);
 }
 
 /*
@@ -469,6 +621,7 @@ Displays the info screen while loading media
 void CG_GameStateReceived(void)
 {
     const char *s;
+    int checksum;
 
     // clear everything
     memset(&cg, 0, sizeof(cg));
@@ -495,7 +648,10 @@ void CG_GameStateReceived(void)
     CG_ParseServerinfo();
 
     // load the new map
-    cgi.CM_LoadMap(cgs.mapname);
+    cgi.CM_LoadMap(cgs.mapname, &checksum);
+    if (cgs.useMapChecksum && checksum != cgs.mapChecksum && cgs.gametype != GT_SINGLE_PLAYER) {
+        cgi.Error(ERR_DROP, "Client/Server map checksum mismatch: %x/%x", checksum, cgs.mapChecksum);
+    }
 
     CG_InitMarks();
 
@@ -539,16 +695,6 @@ void CG_ServerRestarted(void)
     CG_InitializeObjectives();
 }
 
-void *CG_Malloc(int size)
-{
-    return malloc(size);
-}
-
-void CG_Free(void *ptr)
-{
-    free(ptr);
-}
-
 /*
 =================
 CG_Init
@@ -559,17 +705,20 @@ Called after every level change or subsystem restart
 void CG_Init(clientGameImport_t *imported, int serverMessageNum, int serverCommandSequence, int clientNum)
 {
     cgi = *imported;
-#if _DEBUG
-    cgi.Malloc = &CG_Malloc;
-    cgi.Free   = &CG_Free;
-#endif
 
     cg_protocol = cgi.Cvar_Get("com_protocol", "", 0)->integer;
+    cg_target_game = (target_game_e)cgi.Cvar_Get("com_target_game", "0", 0)->integer;
+
     CG_InitCGMessageAPI(&cge);
     CG_InitScoresAPI(&cge);
 
     memset(&cg, 0, sizeof(cg));
     memset(&cgs, 0, sizeof(cgs));
+    // clear fog values
+    cg.farclipOverride = 0;
+    cg.farplaneColorOverride[0] = -1;
+    cg.farplaneColorOverride[1] = -1;
+    cg.farplaneColorOverride[2] = -1;
 
     cg.clientNum              = clientNum;
     cgs.processedSnapshotNum  = serverMessageNum;
@@ -626,11 +775,14 @@ Called before every level change or subsystem restart
 void CG_Shutdown(void)
 {
     L_ShutdownEvents();
+    // Shutdown radar
+    cgi.CL_InitRadar(NULL, NULL, -1);
+
     // some mods may need to do cleanup work here,
     // like closing files or archiving session data
 
     // hide the stats screen
-    cgi.UI_HideMenu("StatsScreen", 1);
+    cgi.UI_HideMenu("StatsScreen", qtrue);
 
     // reset the scoreboard
     CG_PrepScoreBoardInfo();
@@ -745,7 +897,7 @@ void Com_Error(int level, const char *error, ...)
     char    text[1024];
 
     va_start(argptr, error);
-    vsprintf(text, error, argptr);
+    Q_vsnprintf(text, sizeof(text), error, argptr);
     va_end(argptr);
 
     cgi.Error(level, "%s", text);
@@ -757,7 +909,7 @@ void Com_Printf(const char *msg, ...)
     char    text[1024];
 
     va_start(argptr, msg);
-    vsprintf(text, msg, argptr);
+    Q_vsnprintf(text, sizeof(text), msg, argptr);
     va_end(argptr);
 
     cgi.Printf("%s", text);
@@ -788,10 +940,20 @@ void CG_ParseFogInfo_ver_15(const char *str)
 
 void CG_ParseFogInfo_ver_6(const char *str)
 {
-    cg.farclipOverride          = 0.0;
+    //
+    // clear all unsupported fields in protocol below version 15
+    //
+
+    // don't set the farplane_bias 0, otherwise the renderer will set a minimum value
+    cg.farplane_bias            = 0.001f;
+    cg.skyboxFarplane           = 0;
+    cg.skyboxSpeed              = 0;
+    cg.renderTerrain            = qtrue;
+    cg.farclipOverride          = -1.0;
     cg.farplaneColorOverride[0] = -1.0;
     cg.farplaneColorOverride[1] = -1.0;
     cg.farplaneColorOverride[2] = -1.0;
+
     sscanf(
         str,
         "%d %f %f %f %f",
diff --git a/code/cgame/cg_marks.c b/code/cgame/cg_marks.c
index fa91f7b3..27e681ac 100644
--- a/code/cgame/cg_marks.c
+++ b/code/cgame/cg_marks.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -36,93 +36,94 @@ MARK POLYS
 #define MAX_MARK_FRAGMENTS 128
 #define MAX_MARK_POINTS    384
 
-static vec3_t cg_vEntAngles;
-static vec3_t cg_vEntOrigin;
-static vec3_t cg_fEntAxis[3];
+static vec3_t   cg_vEntAngles;
+static vec3_t   cg_vEntOrigin;
+static vec3_t   cg_fEntAxis[3];
 static qboolean cg_bEntAnglesSet;
 
-static int cg_iLastEntIndex;
-static int cg_iLastEntTime;
+static int      cg_iLastEntIndex;
+static int      cg_iLastEntTime;
 static qboolean cg_bLastEntValid;
 
-markPoly_t* cg_freeMarkPolys;   // single linked list
-markObj_t cg_activeMarkObjs;
-markObj_t* cg_freeMarkObjs;
+markPoly_t *cg_freeMarkPolys; // single linked list
+markObj_t   cg_activeMarkObjs;
+markObj_t  *cg_freeMarkObjs;
 treadMark_t cg_treadMarks[MAX_TREAD_MARKS];
 
-markPoly_t* cg_markPolys;
-int cg_iNumMarkPolys;
-markObj_t* cg_markObjs;
-int cg_iNumFreeMarkObjs;
-int cg_iMinFreeMarkObjs;
-qboolean cg_bMarksInitialized;
-cvar_t* cg_treadmark_test;
+markPoly_t *cg_markPolys;
+int         cg_iNumMarkPolys;
+markObj_t  *cg_markObjs;
+int         cg_iNumFreeMarkObjs;
+int         cg_iMinFreeMarkObjs;
+qboolean    cg_bMarksInitialized;
+cvar_t     *cg_treadmark_test;
 
-vec3_t vec_upwards;
+vec3_t vec_upwards = {0, 0, 1};
 
 typedef struct cg_impactmarkinfo_s {
     vec3_t axis[3];
     vec3_t origin;
-    float fSCenter;
-    float fTCenter;
-    float texCoordScaleS;
-    float texCoordScaleT;
-    byte colors[4];
-    int leafnum;
+    float  fSCenter;
+    float  fTCenter;
+    float  texCoordScaleS;
+    float  texCoordScaleT;
+    byte   colors[4];
+    int    leafnum;
 } cg_impactmarkinfo_t;
 
 typedef struct cg_treadmarkinfo_s {
-    treadMark_t* pTread;
-    vec3_t vDirection;
-    vec3_t vRight;
-    float fStartDist;
-    float fStartTex;
-    float fStartAlpha;
-    float fLeftStartDist;
-    float fRightStartDist;
-    float fRightCenterDist;
-    float fLeftTexScale;
-    float fRightTexScale;
-    float fCenterTexScale;
-    float fLeftAlphaScale;
-    float fRightAlphaScale;
-    float fCenterAlphaScale;
-    float fOOWidth;
-    float fOODoubleWidth;
-    byte colors[4];
-    int leafnum;
+    treadMark_t *pTread;
+    vec3_t       vDirection;
+    vec3_t       vRight;
+    float        fStartDist;
+    float        fStartTex;
+    float        fStartAlpha;
+    float        fLeftStartDist;
+    float        fRightStartDist;
+    float        fRightCenterDist;
+    float        fLeftTexScale;
+    float        fRightTexScale;
+    float        fCenterTexScale;
+    float        fLeftAlphaScale;
+    float        fRightAlphaScale;
+    float        fCenterAlphaScale;
+    float        fOOWidth;
+    float        fOODoubleWidth;
+    byte         colors[4];
+    int          leafnum;
 } cg_treadmarkinfo_t;
 
 int CG_GetMarkFragments(
-    int numVerts,
-    const vec3_t* pVerts,
-    const vec3_t vProjection,
-    const vec3_t* pPointBuffer,
-    markFragment_t* pFragmentBuffer,
-    float fRadiusSquared
-) {
-    int i, j;
-    int iNumEnts;
-    int iCurrPoints, iCurrFragments;
-    int iCurrMaxPoints, iCurrMaxFragments;
-    int iNewPoints, iNewFragments;
-    clipHandle_t cmodel;
-    vec3_t vProjectionDir;
-    vec3_t vMins, vMaxs;
-    vec3_t vTemp;
-    vec3_t vAngles, vOrigin;
-    const vec3_t* pCurrPoint;
-    centity_t* pEntList[64];
-    entityState_t* pEnt;
-    markFragment_t* pCurrFragment;
-    markFragment_t* pFragment;
+    int             numVerts,
+    const vec3_t   *pVerts,
+    const vec3_t    vProjection,
+    const vec3_t   *pPointBuffer,
+    markFragment_t *pFragmentBuffer,
+    float           fRadiusSquared
+)
+{
+    int             i, j;
+    int             iNumEnts;
+    int             iCurrPoints, iCurrFragments;
+    int             iCurrMaxPoints, iCurrMaxFragments;
+    int             iNewPoints, iNewFragments;
+    clipHandle_t    cmodel;
+    vec3_t          vProjectionDir;
+    vec3_t          vMins, vMaxs;
+    vec3_t          vTemp;
+    vec3_t          vAngles, vOrigin;
+    const vec3_t   *pCurrPoint;
+    centity_t      *pEntList[64];
+    entityState_t  *pEnt;
+    markFragment_t *pCurrFragment;
+    markFragment_t *pFragment;
 
     iNewFragments = cgi.R_MarkFragments(
         numVerts,
         pVerts,
         vProjection,
         MAX_MARK_POINTS,
-        (float*)pPointBuffer,
+        (float *)pPointBuffer,
         MAX_MARK_FRAGMENTS,
         pFragmentBuffer,
         fRadiusSquared
@@ -141,12 +142,12 @@ int CG_GetMarkFragments(
         return iNewFragments;
     }
 
-    iCurrPoints = iNewPoints;
-    iCurrFragments = iNewFragments;
-    iCurrMaxPoints = MAX_MARK_POINTS - iNewPoints;
+    iCurrPoints       = iNewPoints;
+    iCurrFragments    = iNewFragments;
+    iCurrMaxPoints    = MAX_MARK_POINTS - iNewPoints;
     iCurrMaxFragments = MAX_MARK_FRAGMENTS - iNewFragments;
-    pCurrPoint = &pPointBuffer[iNewPoints];
-    pCurrFragment = &pFragmentBuffer[iNewFragments];
+    pCurrPoint        = &pPointBuffer[iNewPoints];
+    pCurrFragment     = &pFragmentBuffer[iNewFragments];
 
     VectorNormalize2(vProjection, vProjectionDir);
     ClearBounds(vMins, vMaxs);
@@ -170,7 +171,7 @@ int CG_GetMarkFragments(
         VectorCopy(pEntList[i]->lerpOrigin, vOrigin);
 
         cmodel = cgi.CM_InlineModel(pEnt->modelindex);
-        
+
         iNewFragments = cgi.R_MarkFragmentsForInlineModel(
             cmodel,
             vAngles,
@@ -179,7 +180,7 @@ int CG_GetMarkFragments(
             pVerts,
             vProjection,
             iCurrMaxPoints,
-            (float*)pCurrPoint,
+            (float *)pCurrPoint,
             iCurrMaxFragments,
             pCurrFragment,
             fRadiusSquared
@@ -191,7 +192,7 @@ int CG_GetMarkFragments(
         }
 
         iNewPoints = 0;
-        for (j = 0, pFragment = pCurrFragment; j < iNewPoints; j++, pFragment++) {
+        for (j = 0, pFragment = pCurrFragment; j < iNewFragments; j++, pFragment++) {
             pFragment->firstPoint += iCurrPoints;
             pFragment->iIndex = -pEnt->number;
             iNewPoints += pFragment->numPoints;
@@ -211,18 +212,19 @@ int CG_GetMarkFragments(
     return iCurrFragments;
 }
 
-static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
-    centity_t* pCEnt;
+static qboolean CG_GetMarkInlineModelOrientation(int iIndex)
+{
+    centity_t *pCEnt;
 
     if (iIndex == cg_iLastEntIndex && cg_iLastEntTime == cg.time) {
         return cg_bLastEntValid;
     }
 
     pCEnt = &cg_entities[-iIndex];
-    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.inlineDrawModel[ENTITYNUM_NONE])
-    {
+    if (pCEnt->currentValid && pCEnt->currentState.modelindex < cgs.numInlineModels) {
         VectorCopy(pCEnt->lerpAngles, cg_vEntAngles);
         VectorCopy(pCEnt->lerpOrigin, cg_vEntOrigin);
+        cg_bLastEntValid = qtrue;
 
         if (cg_vEntAngles[0] || cg_vEntAngles[1] || cg_vEntAngles[2]) {
             AngleVectorsLeft(cg_vEntAngles, cg_fEntAxis[0], cg_fEntAxis[1], cg_fEntAxis[2]);
@@ -233,7 +235,7 @@ static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
         }
 
         cg_iLastEntIndex = iIndex;
-        cg_iLastEntTime = cg.time;
+        cg_iLastEntTime  = cg.time;
         return cg_bLastEntValid;
     }
 
@@ -249,25 +251,24 @@ static qboolean CG_GetMarkInlineModelOrientation(int iIndex) {
     return qfalse;
 }
 
-static void CG_FragmentPosToWorldPos(const vec3_t vFrom, vec3_t vTo) {
-    if (cg_bEntAnglesSet)
-    {
+static void CG_FragmentPosToWorldPos(const vec3_t vFrom, vec3_t vTo)
+{
+    if (cg_bEntAnglesSet) {
         VectorMA(cg_vEntOrigin, vFrom[0], cg_fEntAxis[0], vTo);
         VectorMA(vTo, vFrom[1], cg_fEntAxis[1], vTo);
         VectorMA(vTo, vFrom[2], cg_fEntAxis[2], vTo);
-    }
-    else
-    {
+    } else {
         vTo[0] = cg_vEntOrigin[0] + *vFrom;
         vTo[1] = cg_vEntOrigin[1] + vFrom[1];
         vTo[2] = cg_vEntOrigin[2] + vFrom[2];
     }
 }
 
-qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
+qboolean CG_UpdateMarkPosition(markObj_t *pMark)
+{
     vec3_t v;
     vec3_t pt;
-    int iIndex;
+    int    iIndex;
 
     iIndex = pMark->markPolys->iIndex;
     if (!CG_GetMarkInlineModelOrientation(iIndex)) {
@@ -276,8 +277,7 @@ qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
 
     VectorCopy(pMark->markPolys->verts[0].xyz, v);
 
-    if (cg_bEntAnglesSet)
-    {
+    if (cg_bEntAnglesSet) {
         VectorScale(cg_fEntAxis[0], v[0], pt);
         VectorMA(pt, v[1], cg_fEntAxis[1], pt);
         VectorMA(pt, v[2], cg_fEntAxis[2], pt);
@@ -291,12 +291,8 @@ qboolean CG_UpdateMarkPosition(markObj_t* pMark) {
     return qtrue;
 }
 
-void CG_AddFragmentToScene(
-    int iIndex,
-    qhandle_t hShader,
-    int iNumVerts,
-    polyVert_t* pVerts
-) {
+void CG_AddFragmentToScene(int iIndex, qhandle_t hShader, int iNumVerts, polyVert_t *pVerts)
+{
     if (!iIndex) {
         cgi.R_AddPolyToScene(hShader, iNumVerts, pVerts, 0);
         return;
@@ -308,9 +304,9 @@ void CG_AddFragmentToScene(
     }
 
     if (cg_bEntAnglesSet) {
-        int i;
-        vec3_t vTmp;
-        polyVert_t* pCurrVert;
+        int         i;
+        vec3_t      vTmp;
+        polyVert_t *pCurrVert;
 
         for (i = 0; i < iNumVerts; i++) {
             pCurrVert = &pVerts[i];
@@ -323,8 +319,8 @@ void CG_AddFragmentToScene(
             VectorAdd(vTmp, cg_vEntOrigin, pCurrVert->xyz);
         }
     } else {
-        int i;
-        polyVert_t* pCurrVert;
+        int         i;
+        polyVert_t *pCurrVert;
 
         for (i = 0; i < iNumVerts; i++) {
             pCurrVert = &pVerts[i];
@@ -366,7 +362,7 @@ void CG_InitMarks(void)
         cgi.Free(cg_markPolys);
     }
 
-    cg_markPolys = (markPoly_t*)cgi.Malloc(sizeof(markPoly_t) * cg_iNumMarkPolys);
+    cg_markPolys = (markPoly_t *)cgi.Malloc(sizeof(markPoly_t) * cg_iNumMarkPolys);
 
     if (!cg_markPolys) {
         cgi.Error(ERR_DROP, "CG_InitMarks: Could not allocate array for mark polys");
@@ -376,7 +372,7 @@ void CG_InitMarks(void)
         cgi.Free(cg_markObjs);
     }
 
-    cg_markObjs = (markObj_t*)cgi.Malloc(sizeof(markObj_t) * iMaxMarks);
+    cg_markObjs = (markObj_t *)cgi.Malloc(sizeof(markObj_t) * iMaxMarks);
 
     if (!cg_markObjs) {
         cgi.Error(ERR_DROP, "CG_InitMarks: Could not allocate array for mark objects");
@@ -400,7 +396,7 @@ void CG_InitMarks(void)
     }
     cg_markObjs[i].nextMark = NULL;
 
-    cg_iNumFreeMarkObjs = iMaxMarks;
+    cg_iNumFreeMarkObjs  = iMaxMarks;
     cg_bMarksInitialized = qtrue;
 }
 
@@ -415,7 +411,7 @@ void CG_FreeMarkPoly(markPoly_t *le)
         return;
     }
 
-    le->nextPoly = cg_freeMarkPolys;
+    le->nextPoly     = cg_freeMarkPolys;
     cg_freeMarkPolys = le;
 }
 
@@ -424,11 +420,13 @@ void CG_FreeMarkPoly(markPoly_t *le)
 CG_FreeMarkObj
 ==================
 */
-void CG_FreeMarkObj(markObj_t* pMark) {
-    markPoly_t* pPoly;
-    markPoly_t* pNextPoly;
+void CG_FreeMarkObj(markObj_t *pMark)
+{
+    markPoly_t *pPoly;
+    markPoly_t *pNextPoly;
+
+    assert(pMark != &cg_activeMarkObjs);
 
-    pPoly = pMark->markPolys;
     for (pPoly = pMark->markPolys; pPoly; pPoly = pNextPoly) {
         pNextPoly = pPoly->nextPoly;
         CG_FreeMarkPoly(pPoly);
@@ -436,8 +434,8 @@ void CG_FreeMarkObj(markObj_t* pMark) {
 
     pMark->prevMark->nextMark = pMark->nextMark;
     pMark->nextMark->prevMark = pMark->prevMark;
-    pMark->nextMark = cg_freeMarkObjs;
-    cg_freeMarkObjs = pMark;
+    pMark->nextMark           = cg_freeMarkObjs;
+    cg_freeMarkObjs           = pMark;
     cg_iNumFreeMarkObjs++;
 }
 
@@ -446,13 +444,12 @@ void CG_FreeMarkObj(markObj_t* pMark) {
 CG_FreeBestMarkObj
 ==================
 */
-void CG_FreeBestMarkObj(qboolean bAllowFade) {
-    markObj_t* pMark;
+void CG_FreeBestMarkObj(qboolean bAllowFade)
+{
+    markObj_t *pMark;
 
-    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark)
-    {
-        if (pMark->lastVisTime < cg.time - 250)
-        {
+    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark) {
+        if (pMark->lastVisTime < cg.time - 250) {
             CG_FreeMarkObj(pMark);
             return;
         }
@@ -463,13 +460,14 @@ void CG_FreeBestMarkObj(qboolean bAllowFade) {
         return;
     }
 
-    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark)
-    {
+    for (pMark = cg_activeMarkObjs.prevMark; pMark != &cg_activeMarkObjs; pMark = pMark->prevMark) {
         if (!pMark->alphaFade || pMark->time > cg.time - 9000) {
-            pMark->time = cg.time - 9000;
-            pMark->alphaFade = 1;
+            break;
         }
     }
+
+    pMark->time = cg.time - 9000;
+    pMark->alphaFade = qtrue;
 }
 
 /*
@@ -479,11 +477,11 @@ CG_AllocMark
 Will allways succeed, even if it requires freeing an old active mark
 ===================
 */
-markObj_t* CG_AllocMark(int iNumPolys)
+markObj_t *CG_AllocMark(int iNumPolys)
 {
-    int iPolyCount;
-    markPoly_t* pPoly;
-    markObj_t* pMark;
+    int         iPolyCount;
+    markPoly_t *pPoly;
+    markObj_t  *pMark;
 
     if (!cg_bMarksInitialized) {
         return NULL;
@@ -493,79 +491,79 @@ markObj_t* CG_AllocMark(int iNumPolys)
         return NULL;
     }
 
+    if (iNumPolys > cg_iNumMarkPolys) {
+        // Added in OPM
+        //  Make sure to not over allocate polys
+        return NULL;
+    }
+
     if (cg_iNumFreeMarkObjs <= cg_iMinFreeMarkObjs) {
         CG_FreeBestMarkObj(1);
     }
 
-    pMark = cg_freeMarkObjs;
+    pMark           = cg_freeMarkObjs;
     cg_freeMarkObjs = cg_freeMarkObjs->nextMark;
 
     memset(pMark, 0, sizeof(markObj_t));
     pMark->lastVisTime = cg.time;
 
-    for (iPolyCount = 0; iPolyCount < iNumPolys; iPolyCount++)
-    {
+    for (iPolyCount = 0; iPolyCount < iNumPolys; iPolyCount++) {
         while (!cg_freeMarkPolys) {
             CG_FreeBestMarkObj(qfalse);
         }
 
-        pPoly = cg_freeMarkPolys;
+        pPoly            = cg_freeMarkPolys;
         cg_freeMarkPolys = pPoly->nextPoly;
 
         memset(pPoly, 0, sizeof(*pPoly));
-        pPoly->nextPoly = pMark->markPolys;
+        pPoly->nextPoly  = pMark->markPolys;
         pMark->markPolys = pPoly;
     }
 
-
     // link into the active list
-    pMark->nextMark = cg_activeMarkObjs.nextMark;
-    pMark->prevMark = &cg_activeMarkObjs;
+    pMark->nextMark                      = cg_activeMarkObjs.nextMark;
+    pMark->prevMark                      = &cg_activeMarkObjs;
     cg_activeMarkObjs.nextMark->prevMark = pMark;
-    cg_activeMarkObjs.nextMark = pMark;
+    cg_activeMarkObjs.nextMark           = pMark;
+
     cg_iNumFreeMarkObjs--;
+    assert(cg_iNumFreeMarkObjs >= 0);
+
     return pMark;
 }
 
-int CG_ImpactMark_GetLeafCallback(markFragment_t* mf, void* pCustom) {
-    return ((cg_impactmarkinfo_t*)pCustom)->leafnum;
+int CG_ImpactMark_GetLeafCallback(markFragment_t *mf, void *pCustom)
+{
+    return ((cg_impactmarkinfo_t *)pCustom)->leafnum;
 }
 
-qboolean CG_ImpactMark_PerPolyCallback(
-    const vec3_t* markPoints,
-    markFragment_t* mf,
-    polyVert_t* verts,
-    void* pCustom
-) {
-    int j;
-    polyVert_t* v;
-    cg_impactmarkinfo_t* pInfo;
+qboolean CG_ImpactMark_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
+{
+    int                  j;
+    polyVert_t          *v;
+    cg_impactmarkinfo_t *pInfo;
 
-    pInfo = (cg_impactmarkinfo_t*)pCustom;
+    pInfo = (cg_impactmarkinfo_t *)pCustom;
 
-    if (mf->iIndex >= 0)
-    {
+    if (mf->iIndex >= 0) {
         for (j = 0; j < mf->numPoints; j++) {
             vec3_t delta;
 
             v = &verts[j];
             VectorCopy(markPoints[j + mf->firstPoint], v->xyz);
             VectorSubtract(v->xyz, pInfo->origin, delta);
-            v->st[0] = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
-            v->st[1] = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
+            v->st[0]       = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
+            v->st[1]       = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
             v->modulate[0] = pInfo->colors[0];
             v->modulate[1] = pInfo->colors[1];
             v->modulate[2] = pInfo->colors[2];
             v->modulate[3] = pInfo->colors[3];
         }
-    }
-    else
-    {
+    } else {
         if (!CG_GetMarkInlineModelOrientation(mf->iIndex)) {
             return qfalse;
         }
 
-
         for (j = 0; j < mf->numPoints; j++) {
             vec3_t vWorldPos;
             vec3_t delta;
@@ -575,8 +573,8 @@ qboolean CG_ImpactMark_PerPolyCallback(
 
             CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
             VectorSubtract(vWorldPos, pInfo->origin, delta);
-            v->st[0] = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
-            v->st[1] = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
+            v->st[0]       = pInfo->fSCenter + DotProduct(delta, pInfo->axis[1]) * pInfo->texCoordScaleS;
+            v->st[1]       = pInfo->fTCenter + DotProduct(delta, pInfo->axis[2]) * pInfo->texCoordScaleT;
             v->modulate[0] = pInfo->colors[0];
             v->modulate[1] = pInfo->colors[1];
             v->modulate[2] = pInfo->colors[2];
@@ -618,24 +616,23 @@ void CG_ImpactMark(
     float        fTCenter
 )
 {
-    int i;
-    int numFragments;
-    float fSScale2, fTScale2;
-    float fSScale3, fTScale3;
-    vec3_t originalPoints[4];
-    vec3_t markPoints[MAX_MARK_POINTS];
-    vec3_t projection;
-    markFragment_t markFragments[MAX_MARK_FRAGMENTS], *mf;
-    vec3_t v;
-    float fRadiusSquared;
+    int                 i;
+    int                 numFragments;
+    float               fSScale2, fTScale2;
+    float               fSScale3, fTScale3;
+    vec3_t              originalPoints[4];
+    vec3_t              markPoints[MAX_MARK_POINTS];
+    vec3_t              projection;
+    markFragment_t      markFragments[MAX_MARK_FRAGMENTS], *mf;
+    vec3_t              v;
+    float               fRadiusSquared;
     cg_impactmarkinfo_t info;
 
     if (!cg_bMarksInitialized) {
         return;
     }
 
-    if (!cg_addMarks->integer
-        && markShader != cgs.media.shadowMarkShader
+    if (!cg_addMarks->integer && markShader != cgs.media.shadowMarkShader
         && markShader != cgs.media.footShadowMarkShader) {
         return;
     }
@@ -647,7 +644,7 @@ void CG_ImpactMark(
         fTScale = 1.0;
     }
 
-    fRadiusSquared = fSScale * fSScale + fTScale * fTScale;
+    fRadiusSquared      = fSScale * fSScale + fTScale * fTScale;
     info.texCoordScaleS = 0.5 / fSScale;
     info.texCoordScaleT = 0.5 / fTScale;
 
@@ -685,34 +682,24 @@ void CG_ImpactMark(
     // create the full polygon
     for (i = 0; i < 3; i++) {
         originalPoints[0][i] = origin[i] - fSScale2 * info.axis[1][i] - fTScale2 * info.axis[2][i];
-        originalPoints[1][i] = origin[i] + fSScale3 * info.axis[1][i] - fTScale3 * info.axis[2][i];
+        originalPoints[1][i] = origin[i] + fSScale3 * info.axis[1][i] - fTScale2 * info.axis[2][i];
         originalPoints[2][i] = origin[i] + fSScale3 * info.axis[1][i] + fTScale3 * info.axis[2][i];
-        originalPoints[3][i] = origin[i] - fSScale2 * info.axis[1][i] + fTScale2 * info.axis[2][i];
+        originalPoints[3][i] = origin[i] - fSScale2 * info.axis[1][i] + fTScale3 * info.axis[2][i];
     }
 
     // get the fragments
     VectorScale(dir, -32, projection);
 
-    numFragments = CG_GetMarkFragments(
-        4,
-        originalPoints,
-        projection,
-        markPoints,
-        markFragments,
-        fRadiusSquared
-    );
+    numFragments = CG_GetMarkFragments(4, originalPoints, projection, markPoints, markFragments, fRadiusSquared);
 
-    if (dolighting)
-    {
+    if (dolighting) {
         vec3_t vLight;
         cgi.R_GetLightingForDecal(vLight, dir, origin);
 
         info.colors[0] = (int)(red * vLight[0]);
         info.colors[1] = (int)(green * vLight[1]);
         info.colors[2] = (int)(blue * vLight[2]);
-    }
-    else
-    {
+    } else {
         info.colors[0] = (int)(red * 255.0f);
         info.colors[1] = (int)(green * 255.0f);
         info.colors[2] = (int)(blue * 255.0f);
@@ -730,8 +717,7 @@ void CG_ImpactMark(
     VectorAdd(origin, dir, v);
     info.leafnum = cgi.CM_PointLeafnum(v);
 
-    if (temporary)
-    {
+    if (temporary) {
         polyVert_t verts[8];
 
         for (i = 0, mf = markFragments; i < numFragments; i++, mf++) {
@@ -739,20 +725,18 @@ void CG_ImpactMark(
                 mf->numPoints = 8;
             }
 
-            if (CG_ImpactMark_PerPolyCallback(markPoints, mf, verts, (void*)&info)) {
+            if (CG_ImpactMark_PerPolyCallback(markPoints, mf, verts, (void *)&info)) {
                 CG_AddFragmentToScene(mf->iIndex, markShader, mf->numPoints, verts);
             }
         }
-    }
-    else
-    {
+    } else {
         CG_AssembleFinalMarks(
             markPoints,
             markFragments,
             numFragments,
             &CG_ImpactMark_PerPolyCallback,
             &CG_ImpactMark_GetLeafCallback,
-            (void*)&info,
+            (void *)&info,
             info.origin,
             sqrt(fRadiusSquared),
             markShader,
@@ -763,32 +747,31 @@ void CG_ImpactMark(
 }
 
 void CG_AssembleFinalMarks(
-    vec3_t           *markPoints,
-    markFragment_t   *markFragments,
-    int              numFragments,
-    qboolean         (*PerPolyCallback)(const vec3_t* markPoints, markFragment_t* mf, polyVert_t* verts, void* pCustom),
-    int              (*GetLeafCallback)(markFragment_t* mf, void* pCustom),
-    void             *pCustom,
-    vec3_t           pos,
-    float            radius,
-    qhandle_t        markShader,
-    qboolean         fadein,
-    qboolean         alphaFade
+    vec3_t         *markPoints,
+    markFragment_t *markFragments,
+    int             numFragments,
+    qboolean (*PerPolyCallback)(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom),
+    int (*GetLeafCallback)(markFragment_t *mf, void *pCustom),
+    void     *pCustom,
+    vec3_t    pos,
+    float     radius,
+    qhandle_t markShader,
+    qboolean  fadein,
+    qboolean  alphaFade
 )
 {
-    markObj_t* pMark;
-    markPoly_t* pPoly;
-    int iGroup, iFirstNewGroup;
-    int numFragsForMark;
-    int i;
-    markFragment_t* mf;
+    markObj_t      *pMark;
+    markPoly_t     *pPoly;
+    int             iGroup, iFirstNewGroup;
+    int             numFragsForMark;
+    int             i;
+    markFragment_t *mf;
 
     iFirstNewGroup = 0;
-    do
-    {
-        i = iFirstNewGroup;
-        mf = &markFragments[iFirstNewGroup];
-        iGroup = mf->iIndex;
+    do {
+        i               = iFirstNewGroup;
+        mf              = &markFragments[iFirstNewGroup];
+        iGroup          = mf->iIndex;
         numFragsForMark = 0;
 
         for (; i < numFragments; i++, mf++) {
@@ -804,19 +787,35 @@ void CG_AssembleFinalMarks(
             break;
         }
 
-        pMark->time = cg.time;
-        pMark->alphaFade = alphaFade;
+        pMark->time       = cg.time;
+        pMark->alphaFade  = alphaFade;
         pMark->markShader = markShader;
-        pMark->fadein = fadein;
+        pMark->fadein     = fadein;
         VectorCopy(pos, pMark->pos);
         pMark->radius = radius;
 
-        i = iFirstNewGroup;
-        mf = &markFragments[iFirstNewGroup];
+        i              = iFirstNewGroup;
+        mf             = &markFragments[iFirstNewGroup];
         iFirstNewGroup = 0;
 
         if (mf->iIndex < 0) {
-            VectorSubtract(pMark->pos, cg_entities[-mf->iIndex].lerpOrigin, pMark->pos);
+            centity_t *cent;
+            vec3_t pos;
+
+            cent = &cg_entities[-mf->iIndex];
+
+            VectorSubtract(pMark->pos, cent->lerpOrigin, pos);
+
+            if (cent->lerpAngles[0] || cent->lerpAngles[1] || cent->lerpAngles[2]) {
+                vec3_t axis[3];
+
+                // Fixed in OPM
+                //  Make the position completely local to the entity
+                AngleVectorsLeft(cent->lerpAngles, axis[0], axis[1], axis[2]);
+                MatrixTransformVectorRight(axis, pos, pMark->pos);
+            } else {
+                VectorCopy(pos, pMark->pos);
+            }
         }
 
         pPoly = pMark->markPolys;
@@ -836,8 +835,8 @@ void CG_AssembleFinalMarks(
 
                 if (PerPolyCallback(markPoints, mf, pPoly->verts, pCustom)) {
                     pPoly->numVerts = mf->numPoints;
-                    pPoly->iIndex = mf->iIndex;
-                    pPoly = pPoly->nextPoly;
+                    pPoly->iIndex   = mf->iIndex;
+                    pPoly           = pPoly->nextPoly;
                 }
             }
         }
@@ -894,15 +893,15 @@ CG_AddMarks
 
 void CG_AddMarks(void)
 {
-    int j;
-    int t;
-    int fade;
-    markObj_t* pMark;
-    markObj_t* pNext;
-    markPoly_t* pPoly;
-    polyVert_t* pVert;
-    polyVert_t tmpVerts[8];
-    int viewleafnum;
+    int         j;
+    int         t;
+    int         fade;
+    markObj_t  *pMark;
+    markObj_t  *pNext;
+    markPoly_t *pPoly;
+    polyVert_t *pVert;
+    polyVert_t  tmpVerts[8];
+    int         viewleafnum;
 
     if (!cg_bMarksInitialized) {
         return;
@@ -919,8 +918,7 @@ void CG_AddMarks(void)
         pNext = pMark->nextMark;
 
         // see if it is time to completely remove it
-        if (pMark->alphaFade && cg.time > pMark->time + MARK_TOTAL_TIME)
-        {
+        if (pMark->alphaFade && cg.time > pMark->time + MARK_TOTAL_TIME) {
             CG_FreeMarkObj(pMark);
             continue;
         }
@@ -937,26 +935,25 @@ void CG_AddMarks(void)
         }
 
         if (pMark->markPolys->iIndex < 0) {
-            if (CG_FrustumCullSphere(pMark->pos, pMark->radius)) {
-                continue;
-            }
-        } else {
             vec3_t vWorldPos;
             CG_FragmentPosToWorldPos(pMark->pos, vWorldPos);
             if (CG_FrustumCullSphere(vWorldPos, pMark->radius)) {
                 continue;
             }
+        } else {
+            if (CG_FrustumCullSphere(pMark->pos, pMark->radius)) {
+                continue;
+            }
         }
 
         pMark->lastVisTime = cg.time;
         if (pMark->fadein) {
             fade = 255 * (cg.time - pMark->time) / MARK_FADE_TIME;
             if (fade > 255) {
-                fade = 255;
+                fade          = 255;
                 pMark->fadein = 0;
             }
 
-
             for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly) {
                 for (j = 0; j < pPoly->numVerts; j++) {
                     pPoly->verts[j].modulate[3] = fade;
@@ -976,10 +973,8 @@ void CG_AddMarks(void)
             }
         }
 
-        for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly)
-        {
-            if (pPoly->iIndex < 0)
-            {
+        for (pPoly = pMark->markPolys; pPoly; pPoly = pPoly->nextPoly) {
+            if (pPoly->iIndex < 0) {
                 memcpy(tmpVerts, pPoly->verts, 24 * pPoly->numVerts);
                 pVert = tmpVerts;
             } else {
@@ -1007,7 +1002,8 @@ qboolean CG_CheckMakeMarkOnEntity(int iEntIndex)
         return qfalse;
     }
 
-    if (cg_entities[iEntIndex].currentState.modelindex < 0 || cg_entities[iEntIndex].currentState.modelindex > cgi.CM_NumInlineModels()) {
+    if (cg_entities[iEntIndex].currentState.modelindex < 0
+        || cg_entities[iEntIndex].currentState.modelindex > cgi.CM_NumInlineModels()) {
         return qfalse;
     }
 
@@ -1021,9 +1017,9 @@ void CG_InitTestTreadMark()
 
 int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStartPos, float fWidth, float fAlpha)
 {
-    int i;
-    int iTreadNum;
-    treadMark_t* pTread;
+    int          i;
+    int          iTreadNum;
+    treadMark_t *pTread;
 
     if (!cg_bMarksInitialized) {
         return -1;
@@ -1037,7 +1033,7 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     for (i = 0; i < MAX_TREAD_MARKS; i++) {
         if (!cg_treadMarks[i].iState) {
             iTreadNum = i;
-            pTread = &cg_treadMarks[i];
+            pTread    = &cg_treadMarks[i];
             break;
         }
     }
@@ -1047,11 +1043,11 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     }
 
     memset(pTread, 0, sizeof(*pTread));
-    pTread->iState = 1;
+    pTread->iState           = 1;
     pTread->iReferenceNumber = iReference;
-    pTread->iLastTime = cg.time;
-    pTread->hTreadShader = treadShader;
-    pTread->fWidth = fWidth * 0.5;
+    pTread->iLastTime        = cg.time;
+    pTread->hTreadShader     = treadShader;
+    pTread->fWidth           = fWidth * 0.5;
     VectorCopy(vStartPos, pTread->vMidPos);
     VectorCopy(vStartPos, pTread->vEndPos);
 
@@ -1065,33 +1061,390 @@ int CG_StartTreadMark(int iReference, qhandle_t treadShader, const vec3_t vStart
     return iTreadNum;
 }
 
-qboolean CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
+qboolean
+CG_MakeTreadMarkDecal_PerPolyCallback(const vec3_t *markPoints, markFragment_t *mf, polyVert_t *verts, void *pCustom)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    int                 j;
+    float               fDist;
+    float               fSideDist;
+    float               fSideAlpha;
+    float               fCenterAlpha;
+    float               fFrac;
+    float               fTex, fAlpha;
+    polyVert_t         *v;
+    cg_treadmarkinfo_t *pInfo;
+
+    pInfo = (cg_treadmarkinfo_t *)pCustom;
+
+    if (mf->iIndex < 0) {
+        vec3_t vWorldPos;
+
+        if (!CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            return qfalse;
+        }
+
+        for (j = 0; j < mf->numPoints; j++) {
+            v = &verts[j];
+            VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+            v->modulate[0] = pInfo->colors[0];
+            v->modulate[1] = pInfo->colors[1];
+            v->modulate[2] = pInfo->colors[2];
+            v->modulate[3] = pInfo->colors[3];
+
+            CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+            fSideDist = DotProduct(pInfo->vRight, vWorldPos) - pInfo->fRightCenterDist;
+            v->st[0]  = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+
+            fSideAlpha = fSideDist * pInfo->fOOWidth;
+            fDist      = DotProduct(vWorldPos, pInfo->vDirection);
+            if (fSideAlpha < 0) {
+                fSideAlpha = -fSideAlpha;
+                v->st[1]   = pInfo->fStartTex + ((fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale * fSideAlpha;
+            } else {
+                v->st[1] = pInfo->fStartTex + ((fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale * fSideAlpha)
+                         + ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha));
+                v->modulate[3] = pInfo->fStartAlpha
+                               + (1.0 - fSideAlpha)
+                                     * ((fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * pInfo->fCenterAlphaScale)
+                               + (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale * fSideAlpha;
+            }
+        }
+    } else {
+        for (j = 0; j < mf->numPoints; j++) {
+            v = &verts[j];
+            VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+            v->modulate[0] = pInfo->colors[0];
+            v->modulate[1] = pInfo->colors[1];
+            v->modulate[2] = pInfo->colors[2];
+            v->modulate[3] = pInfo->colors[3];
+
+            fSideDist = DotProduct(pInfo->vRight, v->xyz) - pInfo->fRightCenterDist;
+            v->st[0]  = (fSideDist + pInfo->pTread->fWidth) * pInfo->fOODoubleWidth;
+
+            fSideAlpha = fSideDist * pInfo->fOOWidth;
+            fDist      = DotProduct(v->xyz, pInfo->vDirection);
+            if (fSideAlpha < 0) {
+                fSideAlpha = -fSideAlpha;
+                fTex       = (fDist - pInfo->fLeftStartDist) * pInfo->fLeftTexScale;
+                fAlpha     = (fDist - pInfo->fLeftStartDist) * pInfo->fLeftAlphaScale;
+            } else {
+                fTex   = (fDist - pInfo->fRightStartDist) * pInfo->fRightTexScale;
+                fAlpha = (fDist - pInfo->fRightStartDist) * pInfo->fRightAlphaScale;
+            }
+
+            v->st[1] = pInfo->fStartTex + (fTex * fSideAlpha)
+                     + (fDist - pInfo->fStartDist) * pInfo->fCenterTexScale * (1.0 - fSideAlpha);
+            v->modulate[3] = pInfo->fStartAlpha
+                           + ((1.0 - fSideAlpha) * ((fDist - pInfo->fStartDist) * pInfo->fCenterAlphaScale))
+                           + (fAlpha * fSideAlpha);
+        }
+    }
+
+    return qtrue;
 }
 
 int CG_MakeTreadMarkDecal_GetLeafCallback(markFragment_t *mf, void *pCustom)
 {
-    return ((cg_treadmarkinfo_t*)pCustom)->leafnum;
+    return ((cg_treadmarkinfo_t *)pCustom)->leafnum;
 }
 
 void CG_MakeTreadMarkDecal(treadMark_t *pTread, qboolean bStartSegment, qboolean bTemporary)
 {
-    // FIXME: unimplemented
+    int                i;
+    int                numFragments;
+    vec3_t             originalPoints[4];
+    vec3_t             markPoints[MAX_MARK_POLYVERTS];
+    vec3_t             projection;
+    markFragment_t     markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t    *mf;
+    cg_treadmarkinfo_t info;
+    float              fEndAlpha, fEndTex;
+    float              fDist;
+    vec3_t             vStartCenter;
+    vec3_t             vEndCenter;
+    vec3_t             vDelta;
+    vec3_t             origin;
+    float              fRadiusSquared;
+
+    if (bStartSegment) {
+        VectorCopy(pTread->vStartVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vStartVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vMidVerts[1], originalPoints[3]);
+
+        info.fStartAlpha = pTread->fStartAlpha;
+        fEndAlpha        = pTread->fMidAlpha;
+        info.fStartTex   = pTread->fStartTexCoord;
+        fEndTex          = pTread->fMidTexCoord;
+
+        // Calculate the start center
+        VectorAdd(originalPoints[1], originalPoints[0], vStartCenter);
+        VectorScale(vStartCenter, 0.5, vStartCenter);
+        VectorCopy(pTread->vMidPos, vEndCenter);
+        VectorCopy(pTread->vStartDir, info.vDirection);
+    } else {
+        VectorCopy(pTread->vMidVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vEndVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vEndVerts[1], originalPoints[3]);
+
+        info.fStartAlpha = pTread->fMidAlpha;
+        fEndAlpha        = pTread->fEndAlpha;
+        info.fStartTex   = pTread->fMidTexCoord;
+        fEndTex          = pTread->fEndTexCoord;
+
+        VectorCopy(pTread->vMidPos, vStartCenter);
+        VectorCopy(pTread->vEndPos, vEndCenter);
+
+        // Calculate the direction
+        VectorSubtract(vEndCenter, vStartCenter, info.vDirection);
+        VectorNormalizeFast(info.vDirection);
+    }
+
+    CrossProduct(vec_upwards, info.vDirection, info.vRight);
+    info.fRightCenterDist = DotProduct(vEndCenter, info.vRight);
+    info.fOODoubleWidth   = 0.5 / pTread->fWidth;
+    info.fOOWidth         = info.fOODoubleWidth * 2;
+    info.fStartDist       = DotProduct(info.vDirection, vStartCenter);
+    info.fRightStartDist  = DotProduct(info.vDirection, originalPoints[1]);
+    info.fLeftStartDist   = DotProduct(info.vDirection, originalPoints[0]);
+
+    //
+    // Center
+    //
+
+    VectorSubtract(vEndCenter, vStartCenter, vDelta);
+    fDist = VectorLength(vDelta);
+
+    fRadiusSquared = (Square(fDist) + Square(pTread->fWidth)) * 0.25;
+
+    info.fCenterTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fCenterAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    //
+    // Right
+    //
+
+    VectorSubtract(originalPoints[2], originalPoints[1], vDelta);
+    fDist = VectorLength(vDelta);
+
+    info.fRightTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fRightAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    //
+    // Left
+    //
+
+    VectorSubtract(originalPoints[3], originalPoints[1], vDelta);
+    fDist = VectorLength(vDelta);
+
+    info.fLeftTexScale   = (fEndTex - info.fStartTex) / fDist;
+    info.fLeftAlphaScale = (fEndAlpha - info.fStartAlpha) / fDist;
+
+    VectorSet(projection, 0, 0, -32);
+    info.colors[0] = info.colors[1] = info.colors[2] = info.colors[3] = -1;
+
+    numFragments = CG_GetMarkFragments(4, originalPoints, projection, markPoints, markFragments, fRadiusSquared);
+    VectorAdd(vStartCenter, vEndCenter, origin);
+    VectorScale(origin, 0.5, origin);
+    info.leafnum = cgi.CM_PointLeafnum(origin);
+    info.pTread  = pTread;
+
+    if (bTemporary) {
+        for (i = 0; i < numFragments; i++) {
+            polyVert_t verts[8];
+
+            mf = &markFragments[i];
+            if (mf->numPoints > 8) {
+                mf->numPoints = 8;
+            }
+            if (CG_MakeTreadMarkDecal_PerPolyCallback(markPoints, mf, verts, &info)) {
+                CG_AddFragmentToScene(mf->iIndex, pTread->hTreadShader, mf->numPoints, verts);
+            }
+        }
+    } else {
+        CG_AssembleFinalMarks(
+            markPoints,
+            markFragments,
+            numFragments,
+            &CG_MakeTreadMarkDecal_PerPolyCallback,
+            &CG_MakeTreadMarkDecal_GetLeafCallback,
+            &info,
+            origin,
+            sqrt(fRadiusSquared),
+            pTread->hTreadShader,
+            qfalse,
+            qfalse
+        );
+    }
 }
 
-int CG_UpdateTreadMark(int iReference, vec_t *vNewPos, float fAlpha)
+int CG_UpdateTreadMark(int iReference, const vec3_t vNewPos, float fAlpha)
 {
-    // FIXME: unimplemented
+    int          i;
+    int          iTreadNum;
+    float        fDist;
+    float        fSplitLength;
+    float        fNewLength;
+    float        fTmp;
+    qboolean     bDoSegmentation;
+    vec3_t       vDelta, vDeltaNorm;
+    vec3_t       vDir, vMidDir;
+    vec3_t       vRight;
+    treadMark_t *pTread;
+
+    iTreadNum = -1;
+
+    for (i = 0; i < MAX_TREAD_MARKS; i++) {
+        if (cg_treadMarks[i].iReferenceNumber == iReference) {
+            iTreadNum = i;
+            pTread    = &cg_treadMarks[i];
+        }
+    }
+
+    if (iTreadNum == -1 || !pTread->iState) {
+        return -1;
+    }
+
+    pTread->iLastTime = cg.time;
+
+    if (VectorCompare(pTread->vEndPos, vNewPos)) {
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+        return 0;
+    }
+
+    VectorSubtract(vNewPos, pTread->vMidPos, vDelta);
+    fDist = VectorNormalize2(vDelta, vDeltaNorm);
+    if (pTread->iState == 1) {
+        fSplitLength    = 0;
+        bDoSegmentation = qfalse;
+    } else {
+        VectorAdd(vDeltaNorm, pTread->vStartDir, vMidDir);
+        VectorScale(vMidDir, 0.5, vMidDir);
+        VectorNormalizeFast(vMidDir);
+
+        fTmp         = DotProduct(vMidDir, vDeltaNorm);
+        fSplitLength = pTread->fWidth / fTmp;
+
+        if (fTmp < -0.5) {
+            fTmp = fTmp
+                 * (fTmp
+                        * (fTmp
+                               * (fTmp * (fTmp * (fTmp * -337.31875783205 + -1237.54375255107) + -1802.11467325687)
+                                  + -1303.19904613494)
+                           + -471.347871690988)
+                    + -70.0883838161826);
+        } else if (fTmp > 0.5) {
+            fTmp = fTmp
+                     * (fTmp
+                            * (fTmp
+                                   * (fTmp * (fTmp * (fTmp * -1507.55394345521 + 6580.58002318442) + -11860.0735285953)
+                                      + 11290.7510782536)
+                               + -5986.89654545347)
+                        + 1675.66417006387)
+                 + -192.426950291139;
+        } else {
+            fTmp = fTmp * (fTmp * -0.531387674508458 + -2.11e-14) + 1.00086138065435;
+        }
+
+        fNewLength = fSplitLength * fTmp;
+        if (fNewLength + 24 > fDist) {
+            bDoSegmentation = qfalse;
+        } else if (fSplitLength < -1) {
+            fSplitLength    = -fSplitLength;
+            bDoSegmentation = qtrue;
+        } else if (fDist > 256) {
+            bDoSegmentation = qtrue;
+        } else {
+            CrossProduct(vec_upwards, pTread->vStartDir, vRight);
+            VectorNormalizeFast(vRight);
+            bDoSegmentation = fabs(DotProduct(vRight, vDelta)) > 16;
+        }
+    }
+
+    if (pTread->iState == 2 && bDoSegmentation) {
+        VectorCopy(pTread->vMidVerts[0], pTread->vStartVerts[0]);
+        VectorCopy(pTread->vMidVerts[1], pTread->vStartVerts[1]);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        pTread->iState = 3;
+    } else if (pTread->iState == 0 || pTread->iState == 1) {
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        CrossProduct(vec_upwards, vDeltaNorm, vDir);
+        VectorMA(pTread->vMidPos, pTread->fWidth, vDir, pTread->vMidVerts[0]);
+        VectorMA(pTread->vMidPos, 0.0 - pTread->fWidth, vDir, pTread->vMidVerts[1]);
+        VectorMA(pTread->vEndPos, pTread->fWidth, vDir, pTread->vEndVerts[0]);
+        VectorMA(pTread->vEndPos, 0.0 - pTread->fWidth, vDir, pTread->vEndVerts[1]);
+
+        pTread->fEndTexCoord = fDist / 32.0;
+
+        if (pTread->iState == 1 && fDist > 8) {
+            VectorCopy(vDelta, pTread->vStartDir);
+            pTread->iState = 2;
+        }
+        return 0;
+    } else {
+        if (bDoSegmentation) {
+            CG_MakeTreadMarkDecal(pTread, qtrue, qfalse);
+
+            VectorCopy(pTread->vMidVerts[0], pTread->vStartVerts[0]);
+            VectorCopy(pTread->vMidVerts[1], pTread->vStartVerts[1]);
+            VectorSubtract(pTread->vEndPos, pTread->vMidPos, pTread->vStartDir);
+            VectorNormalizeFast(pTread->vStartDir);
+            VectorCopy(pTread->vEndPos, pTread->vMidPos);
+            pTread->fMidTexCoord = pTread->fEndTexCoord;
+            pTread->fMidAlpha    = pTread->fEndAlpha;
+
+            if (pTread->fStartTexCoord >= 1.0) {
+                pTread->fMidTexCoord -= (int)pTread->fStartTexCoord;
+                pTread->fStartTexCoord -= (int)pTread->fStartTexCoord;
+            }
+        }
+
+        VectorCopy(vNewPos, pTread->vEndPos);
+        pTread->fEndTexCoord = pTread->fMidTexCoord + fDist / 32.0;
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+    }
+
+    CrossProduct(vec_upwards, vMidDir, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vMidPos, fSplitLength, vRight, pTread->vMidVerts[0]);
+    VectorMA(pTread->vMidPos, 0.0 - fSplitLength, vRight, pTread->vMidVerts[1]);
+    CrossProduct(vec_upwards, vDeltaNorm, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vEndPos, pTread->fWidth, vRight, pTread->vEndVerts[0]);
+    VectorMA(pTread->vEndPos, 0.0 - pTread->fWidth, vRight, pTread->vEndVerts[1]);
+
     return 0;
 }
 
 void CG_AddTreadMarks()
 {
-    trace_t trace;
-    vec3_t vPos, vEnd;
-    int i;
+    treadMark_t *pTread;
+    trace_t      trace;
+    vec3_t       vPos, vEnd;
+    int          i;
 
     if (cg_treadmark_test->integer) {
         VectorCopy(cg.predicted_player_state.origin, vPos);
@@ -1112,39 +1465,38 @@ void CG_AddTreadMarks()
             "CG_AddTreadMarks test"
         );
 
-        if (trace.fraction < 1.0 && CG_UpdateTreadMark(1, trace.endpos, 0.f) == -1) {
+        if (trace.fraction < 1.0 && CG_UpdateTreadMark(1, trace.endpos, 1.0) == -1) {
             qhandle_t shader = cgi.R_RegisterShader("testtread");
 
-            CG_StartTreadMark(1, shader, trace.endpos, cg_treadmark_test->integer, 1.0f);
+            CG_StartTreadMark(1, shader, trace.endpos, cg_treadmark_test->integer, 1.0);
         }
     }
 
     for (i = 0; i < MAX_TREAD_MARKS; i++) {
-        if (!cg_treadMarks[i].iState) {
+        pTread = &cg_treadMarks[i];
+
+        if (!pTread->iState) {
             continue;
         }
 
-        if (cg.time - cg_treadMarks[i].iLastTime > 500) {
-            CG_MakeTreadMarkDecal(
-                &cg_treadMarks[i],
-                cg_treadMarks[i].iState == 3 ? qtrue : qfalse,
-                qfalse
-            );
-            cg_treadMarks[i].iState = 0;
-        }
-        else {
-            CG_MakeTreadMarkDecal(
-                &cg_treadMarks[i],
-                cg_treadMarks[i].iState == 3 ? qtrue : qfalse,
-                qtrue
-            );
+        if (cg.time - pTread->iLastTime > 500) {
+            if (pTread->iState == 3) {
+                CG_MakeTreadMarkDecal(pTread, qtrue, qfalse);
+            }
+            CG_MakeTreadMarkDecal(pTread, qfalse, qfalse);
+            pTread->iState = 0;
+        } else {
+            if (pTread->iState == 3) {
+                CG_MakeTreadMarkDecal(pTread, qtrue, qtrue);
+            }
+            CG_MakeTreadMarkDecal(pTread, qfalse, qtrue);
         }
     }
 }
 
 int CG_PermanentMark(
-    const vec3_t    origin,
-    const vec3_t    dir,
+    vec3_t          origin,
+    vec3_t          dir,
     float           orientation,
     float           fSScale,
     float           fTScale,
@@ -1159,8 +1511,148 @@ int CG_PermanentMark(
     void           *pVoidPolyVerts
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    byte            colors[4];
+    int             i, j;
+    int             numFragments;
+    float           fSScale2, fTScale2;
+    float           fSScale3, fTScale3;
+    float           texCoordScaleS, texCoordScaleT;
+    vec3_t          originalPoints[4];
+    vec3_t          markPoints[MAX_MARK_POLYVERTS];
+    vec3_t          projection;
+    vec3_t          vLight;
+    vec3_t          vTmp;
+    vec3_t          axis[3];
+    markFragment_t *mf;
+    polyVert_t     *pPolyVerts;
+    polyVert_t     *v;
+    clipHandle_t    cmodel;
+    trace_t         trace;
+    float           fRadiusSquared;
+
+    pPolyVerts = (polyVert_t *)pVoidPolyVerts;
+
+    VectorMA(origin, -2048, dir, vTmp);
+    VectorAdd(origin, dir, origin);
+    CG_Trace(
+        &trace, origin, vec3_origin, vec3_origin, vTmp, ENTITYNUM_NONE, MASK_MARK, qfalse, qtrue, "CG_PermanentMark"
+    );
+
+    if (trace.fraction == 1) {
+        return 0;
+    }
+
+    VectorCopy(trace.endpos, origin);
+    VectorCopy(trace.plane.normal, dir);
+
+    if (!fSScale) {
+        fSScale = 1.0;
+    }
+    if (!fTScale) {
+        fTScale = 1.0;
+    }
+    texCoordScaleT = 0.5 / fTScale;
+    texCoordScaleS = 0.5 / fSScale;
+    if (fSCenter < 0.0 || fSCenter > 1.0) {
+        fSCenter = 0.5;
+    }
+    if (fTCenter < 0.0 || fTCenter > 1.0) {
+        fTCenter = 0.5;
+    }
+    fRadiusSquared = fSScale * fSScale;
+    fRadiusSquared = fTScale * fTScale + fRadiusSquared;
+    fSScale2       = (fSScale * (1.0 - fSCenter)) * 2;
+    fTScale2       = (fTScale * (1.0 - fTCenter)) * 2;
+    fSScale3       = fSCenter * 2 * fSScale;
+    fTScale3       = fTCenter * 2 * fTScale;
+
+    VectorNormalize2(dir, axis[0]);
+    PerpendicularVector(axis[1], axis[0]);
+    RotatePointAroundVector(axis[2], axis[0], axis[1], orientation);
+    CrossProduct(axis[0], axis[2], axis[1]);
+
+    // create the full polygon
+    for (i = 0; i < 3; i++) {
+        originalPoints[0][i] = origin[i] - fSScale3 * axis[1][i] - fTScale3 * axis[2][i];
+        originalPoints[1][i] = origin[i] + fSScale2 * axis[1][i] - fTScale3 * axis[2][i];
+        originalPoints[2][i] = origin[i] + fSScale2 * axis[1][i] + fTScale2 * axis[2][i];
+        originalPoints[3][i] = origin[i] - fSScale3 * axis[1][i] + fTScale2 * axis[2][i];
+    }
+
+    VectorScale(dir, -32, projection);
+    numFragments = CG_GetMarkFragments(
+        ARRAY_LEN(originalPoints), originalPoints, projection, markPoints, pMarkFragments, fRadiusSquared
+    );
+
+    if (!dolighting) {
+        colors[0] = (int)(red * 255.0f);
+        colors[1] = (int)(green * 255.0f);
+        colors[2] = (int)(blue * 255.0f);
+    }
+
+    colors[3] = (int)(alpha * 255.0f);
+
+    for (i = 0, mf = pMarkFragments; i < numFragments; i++, mf++) {
+        vec3_t vWorldPos;
+        vec3_t delta;
+
+        if (mf->numPoints > 8) {
+            mf->numPoints = 8;
+        }
+
+        if (mf->iIndex >= 0) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, dir, v->xyz);
+
+                    colors[0] = (int)(red * vLight[0]);
+                    colors[1] = (int)(green * vLight[1]);
+                    colors[2] = (int)(blue * vLight[2]);
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                VectorSubtract(v->xyz, origin, delta);
+                v->st[0] = fSCenter + DotProduct(delta, axis[1]) * texCoordScaleS;
+                v->st[1] = fTCenter + DotProduct(delta, axis[2]) * texCoordScaleT;
+            }
+        } else if (CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+                    cgi.R_GetLightingForDecal(vLight, dir, v->xyz);
+
+                    colors[0] = (int)(red * vLight[0]);
+                    colors[1] = (int)(green * vLight[1]);
+                    colors[2] = (int)(blue * vLight[2]);
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                VectorSubtract(v->xyz, origin, delta);
+                v->st[0] = fSCenter + DotProduct(delta, axis[1]) * texCoordScaleS;
+                v->st[1] = fTCenter + DotProduct(delta, axis[2]) * texCoordScaleT;
+            }
+
+            mf->iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
+        } else {
+            mf->numPoints = 0;
+        }
+    }
+
+    return numFragments;
 }
 
 int CG_PermanentTreadMarkDecal(
@@ -1171,14 +1663,412 @@ int CG_PermanentTreadMarkDecal(
     void           *pVoidPolyVerts
 )
 {
-    // FIXME: unimplemented
-    return 0;
+    byte            colors[4];
+    int             i, j;
+    int             numFragments;
+    vec3_t          originalPoints[4];
+    vec3_t          markPoints[MAX_MARK_POLYVERTS];
+    vec3_t          projection;
+    vec3_t          vLight;
+    markFragment_t *mf;
+    polyVert_t     *pPolyVerts;
+    polyVert_t     *v;
+    clipHandle_t    cmodel;
+    float           fStartAlpha, fEndAlpha;
+    float           fStartTex, fEndTex;
+    float           fRightCenterDist;
+    float           fOOWidth, fOODoubleWidth;
+    float           fDist, fSideDist;
+    float           fFrac;
+    float           fStartDist, fRightStartDist, fLeftStartDist;
+    float           fCenterTexScale, fRightTexScale, fLeftTexScale;
+    float           fCenterAlphaScale, fRightAlphaScale, fLeftAlphaScale;
+    float           fSideAlpha, fCenterAlpha;
+    vec3_t          vStartCenter, vEndCenter;
+    vec3_t          vDirection;
+    vec3_t          vRight;
+    vec3_t          vDelta;
+    float           fRadiusSquared;
+
+    pPolyVerts = (polyVert_t *)pVoidPolyVerts;
+
+    if (bStartSegment) {
+        VectorCopy(pTread->vStartVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vStartVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vMidVerts[1], originalPoints[3]);
+
+        fStartAlpha = pTread->fStartAlpha;
+        fEndAlpha   = pTread->fMidAlpha;
+        fStartTex   = pTread->fStartTexCoord;
+        fEndTex     = pTread->fMidTexCoord;
+
+        // Calculate the start center
+        vStartCenter[0] = (originalPoints[1][0] + originalPoints[0][0]) * 0.5;
+        vStartCenter[1] = (originalPoints[1][1] + originalPoints[0][1]) * 0.5;
+        vStartCenter[2] = (originalPoints[1][2] + originalPoints[0][2]) * 0.5;
+        VectorCopy(pTread->vMidPos, vEndCenter);
+        VectorCopy(pTread->vStartDir, vDirection);
+    } else {
+        VectorCopy(pTread->vMidVerts[1], originalPoints[0]);
+        VectorCopy(pTread->vMidVerts[0], originalPoints[1]);
+        VectorCopy(pTread->vEndVerts[0], originalPoints[2]);
+        VectorCopy(pTread->vEndVerts[1], originalPoints[3]);
+
+        fStartAlpha = pTread->fMidAlpha;
+        fEndAlpha   = pTread->fEndAlpha;
+        fStartTex   = pTread->fMidTexCoord;
+        fEndTex     = pTread->fEndTexCoord;
+
+        VectorCopy(pTread->vMidPos, vStartCenter);
+        VectorCopy(pTread->vEndPos, vEndCenter);
+
+        // Calculate the direction
+        VectorSubtract(vEndCenter, vStartCenter, vDirection);
+        VectorNormalizeFast(vDirection);
+    }
+
+    CrossProduct(vec_upwards, vDirection, vRight);
+    fRightCenterDist = DotProduct(vEndCenter, vRight);
+    fOOWidth         = 1.0 / pTread->fWidth;
+    fOODoubleWidth   = 1.0 / (pTread->fWidth * 2);
+    fStartDist       = DotProduct(vDirection, vStartCenter);
+    fRightStartDist  = DotProduct(vDirection, originalPoints[1]);
+    fLeftStartDist   = DotProduct(vDirection, originalPoints[1]);
+
+    //
+    // Calculate center
+    //
+    VectorSubtract(vEndCenter, vStartCenter, vDelta);
+    fDist             = VectorLength(vDelta);
+    fCenterTexScale   = (fEndTex - fStartTex) / fDist;
+    fCenterAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+    fSideDist         = fDist;
+
+    //
+    // Calculate right
+    //
+    VectorSubtract(originalPoints[2], originalPoints[1], vDelta);
+    fDist            = VectorLength(vDelta);
+    fRightTexScale   = (fEndTex - fStartTex) / fDist;
+    fRightAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+
+    //
+    // Calculate left
+    //
+    VectorSubtract(originalPoints[3], originalPoints[0], vDelta);
+    fDist           = VectorLength(vDelta);
+    fLeftTexScale   = (fEndTex - fStartTex) / fDist;
+    fLeftAlphaScale = (fEndAlpha - fStartAlpha) / fDist;
+
+    VectorSet(projection, 0, 0, -32);
+    colors[0] = colors[1] = colors[2] = colors[3] = 0xff;
+
+    numFragments = CG_GetMarkFragments(
+        4, originalPoints, projection, markPoints, pMarkFragments, (Square(pTread->fWidth) + Square(fSideDist)) * 0.25
+    );
+
+    for (i = 0; i < numFragments; i++) {
+        vec3_t vWorldPos;
+
+        mf = &pMarkFragments[i];
+
+        if (mf->numPoints > 8) {
+            mf->numPoints = 8;
+        }
+
+        if (mf->iIndex >= 0) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, projection, v->xyz);
+
+                    colors[0] = vLight[0];
+                    colors[1] = vLight[1];
+                    colors[2] = vLight[2];
+                }
+
+                fSideDist  = DotProduct(v->xyz, vRight) - fRightCenterDist;
+                fSideAlpha = fSideDist * fOOWidth;
+                v->st[0]   = (fSideDist + pTread->fWidth) * fOODoubleWidth;
+
+                if (fSideAlpha < 0) {
+                    fSideAlpha = -fSideAlpha;
+                    v->st[1] =
+                        fStartTex + ((DotProduct(v->xyz, vDirection) - fLeftStartDist) * fLeftTexScale * fSideAlpha);
+                } else {
+                    v->st[1] =
+                        fStartTex + ((DotProduct(v->xyz, vDirection) - fRightStartDist) * fRightTexScale * fSideAlpha);
+                }
+
+                v->st[1] += (DotProduct(v->xyz, vDirection) - fStartDist) * fCenterTexScale * (1.0 - fSideAlpha);
+            }
+        } else if (CG_GetMarkInlineModelOrientation(mf->iIndex)) {
+            for (j = 0; j < mf->numPoints; j++) {
+                v = &pPolyVerts[mf->firstPoint + j];
+                VectorCopy(markPoints[mf->firstPoint + j], v->xyz);
+
+                if (dolighting) {
+                    cgi.R_GetLightingForDecal(vLight, projection, v->xyz);
+
+                    colors[0] = vLight[0];
+                    colors[1] = vLight[1];
+                    colors[2] = vLight[2];
+                }
+
+                v->modulate[0] = colors[0];
+                v->modulate[1] = colors[1];
+                v->modulate[2] = colors[2];
+                v->modulate[3] = colors[3];
+
+                CG_FragmentPosToWorldPos(v->xyz, vWorldPos);
+
+                fSideDist  = DotProduct(vWorldPos, vRight) - fRightCenterDist;
+                fSideAlpha = fSideDist * fOOWidth;
+                v->st[0]   = (fSideDist + pTread->fWidth) * fOODoubleWidth;
+
+                if (fSideAlpha < 0) {
+                    fSideAlpha = -fSideAlpha;
+                    v->st[1] =
+                        fStartTex + ((DotProduct(vWorldPos, vDirection) - fLeftStartDist) * fLeftTexScale * fSideAlpha);
+                } else {
+                    v->st[1] = fStartTex
+                             + ((DotProduct(vWorldPos, vDirection) - fRightStartDist) * fRightTexScale * fSideAlpha);
+                }
+
+                v->st[1] += (DotProduct(vWorldPos, vDirection) - fStartDist) * fCenterTexScale * (1.0 - fSideAlpha);
+            }
+
+            mf->iIndex = -cgi.CM_InlineModel(cg_entities[-mf->iIndex].currentState.modelindex);
+        } else {
+            mf->numPoints = 0;
+        }
+    }
+
+    return numFragments;
 }
 
 int CG_PermanentUpdateTreadMark(
     treadMark_t *pTread, float fAlpha, float fMinSegment, float fMaxSegment, float fMaxOffset, float fTexScale
 )
 {
-    // FIXME: unimplemented
+    trace_t  trace;
+    float    fDist;
+    float    fSplitLength;
+    float    fNewLength;
+    float    fTmp;
+    qboolean bDoSegmentation;
+    vec3_t   vPos;
+    vec3_t   vEnd;
+    vec3_t   vNewPos;
+    vec3_t   vDelta, vDeltaNorm;
+    vec3_t   vDir, vMidDir;
+    vec3_t   vRight;
+
+    VectorCopy(cg.predicted_player_state.origin, vPos);
+    VectorCopy(cg.predicted_player_state.origin, vEnd);
+
+    vPos[2] += 32;
+    vEnd[2] -= 256;
+
+    CG_Trace(
+        &trace,
+        vPos,
+        vec3_origin,
+        vec3_origin,
+        vEnd,
+        cg.snap->ps.clientNum,
+        MASK_TREADMARK,
+        qfalse,
+        qtrue,
+        "CG_PermanentUpdateTreadMark"
+    );
+
+    VectorCopy(trace.endpos, vNewPos);
+
+    if (cg.time - pTread->iLastTime > 500) {
+        VectorClear(pTread->vStartDir);
+        VectorClear(pTread->vStartVerts[0]);
+        VectorClear(pTread->vStartVerts[1]);
+        pTread->fStartTexCoord = 0;
+        pTread->fStartAlpha    = 0;
+
+        VectorClear(pTread->vMidPos);
+        VectorClear(pTread->vMidVerts[0]);
+        VectorClear(pTread->vMidVerts[1]);
+        pTread->fMidTexCoord = 0;
+        pTread->fMidAlpha    = 0;
+
+        VectorClear(pTread->vEndPos);
+        VectorClear(pTread->vEndVerts[0]);
+        VectorClear(pTread->vEndVerts[1]);
+        pTread->fEndTexCoord = 0;
+        pTread->fEndAlpha    = 0;
+
+        pTread->iState           = 1;
+        pTread->iReferenceNumber = 0;
+        pTread->iLastTime        = cg.time;
+        VectorCopy(vNewPos, pTread->vMidPos);
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha < 0) {
+            pTread->fMidAlpha = 255.0;
+        } else {
+            pTread->fMidAlpha = fAlpha * 255.0;
+        }
+        pTread->fEndAlpha = pTread->fMidAlpha;
+
+        return 0;
+    }
+
+    if (VectorCompare(pTread->vEndPos, vNewPos)) {
+        if (fAlpha < 0) {
+            return -1;
+        }
+
+        fTmp              = pTread->fEndAlpha;
+        pTread->fEndAlpha = fAlpha * 255;
+
+        //if (fabs(fTmp - pTread->fEndAlpha > 0.05)) {
+        // Fixed in OPM
+        //  Looks like this was accidental
+        if (fabs(fTmp - pTread->fEndAlpha) > 0.05) {
+            return -1;
+        }
+
+        return 0;
+    }
+
+    VectorSubtract(vNewPos, pTread->vMidPos, vDelta);
+    fDist = VectorNormalize2(vDelta, vDeltaNorm);
+
+    if (pTread->iState == 1) {
+        fSplitLength    = 0.0;
+        bDoSegmentation = qfalse;
+    } else {
+        VectorAdd(vDeltaNorm, pTread->vStartDir, vMidDir);
+        VectorScale(vMidDir, 0.5, vMidDir);
+        VectorNormalizeFast(vMidDir);
+
+        fTmp         = DotProduct(vMidDir, vDeltaNorm);
+        fSplitLength = pTread->fWidth / fTmp;
+
+        if (fTmp < -0.5) {
+            fNewLength =
+                fTmp
+                * (fTmp
+                       * (fTmp
+                              * (fTmp * (fTmp * (fTmp * -337.31875783205 + -1237.54375255107) + -1802.11467325687)
+                                 + -1303.19904613494)
+                          + -471.347871690988)
+                   + -70.0883838161826);
+        } else if (fTmp > 0.5) {
+            fNewLength =
+                fTmp
+                    * (fTmp
+                           * (fTmp
+                                  * (fTmp * (fTmp * (fTmp * -1507.55394345521 + 6580.58002318442) + -11860.0735285953)
+                                     + 11290.7510782536)
+                              + -5986.89654545347)
+                       + 1675.66417006387)
+                + -192.426950291139;
+        } else {
+            fNewLength = fTmp * (fTmp * -0.531387674508458 + -2.11e-14) + 1.00086138065435;
+        }
+
+        fNewLength *= fSplitLength;
+        if (fNewLength + fMinSegment > fDist) {
+            bDoSegmentation = qfalse;
+        } else if (fSplitLength < -1) {
+            fSplitLength    = -fSplitLength;
+            bDoSegmentation = qtrue;
+        } else if (fDist > fMaxSegment) {
+            bDoSegmentation = qtrue;
+        } else {
+            CrossProduct(vec_upwards, pTread->vStartDir, vRight);
+            VectorNormalizeFast(vRight);
+
+            if (fabs(DotProduct(vRight, vDelta)) > fMaxOffset) {
+                bDoSegmentation = qtrue;
+            } else {
+                bDoSegmentation = qfalse;
+            }
+        }
+    }
+
+    if (pTread->iState == 2 && bDoSegmentation) {
+        VectorCopy(pTread->vStartVerts[0], pTread->vMidVerts[0]);
+        VectorCopy(pTread->vStartVerts[1], pTread->vMidVerts[1]);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        pTread->iState = 3;
+
+        return 0;
+    } else if (pTread->iState == 1 || pTread->iState == 2) {
+        VectorCopy(vNewPos, pTread->vEndPos);
+
+        if (fAlpha >= 0.0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+
+        CrossProduct(vec_upwards, vDeltaNorm, vDir);
+        VectorMA(pTread->vMidPos, pTread->fWidth, vDir, pTread->vMidVerts[0]);
+        VectorMA(pTread->vMidPos, -pTread->fWidth, vDir, pTread->vMidVerts[1]);
+        VectorMA(pTread->vEndPos, pTread->fWidth, vDir, pTread->vEndVerts[0]);
+        VectorMA(pTread->vEndPos, -pTread->fWidth, vDir, pTread->vEndVerts[1]);
+
+        pTread->fEndTexCoord = fDist * fTexScale;
+
+        if (pTread->iState == 1 && fDist > 8.0) {
+            VectorCopy(vDelta, pTread->vStartDir);
+            pTread->iState = 2;
+        }
+
+        return 0;
+    } else if (bDoSegmentation) {
+        if (!pTread->iReferenceNumber) {
+            pTread->iReferenceNumber = 1;
+            return 1;
+        }
+
+        pTread->iReferenceNumber = 0;
+        VectorCopy(pTread->vStartVerts[0], pTread->vMidVerts[0]);
+        VectorCopy(pTread->vStartVerts[1], pTread->vMidVerts[1]);
+        VectorSubtract(pTread->vEndPos, pTread->vMidPos, pTread->vStartDir);
+        VectorNormalizeFast(pTread->vStartDir);
+
+        VectorCopy(pTread->vEndPos, pTread->vMidPos);
+        pTread->fMidTexCoord = pTread->fEndTexCoord;
+        pTread->fMidAlpha    = pTread->fEndAlpha;
+
+        if (pTread->fStartTexCoord >= 1.0) {
+            pTread->fStartTexCoord = pTread->fStartTexCoord - floor(pTread->fStartTexCoord);
+            pTread->fMidTexCoord   = pTread->fMidTexCoord - floor(pTread->fStartTexCoord);
+        }
+
+        VectorCopy(vNewPos, pTread->vEndPos);
+        pTread->fEndTexCoord = fDist * fTexScale + pTread->fMidTexCoord;
+        if (fAlpha >= 0) {
+            pTread->fEndAlpha = fAlpha * 255.0;
+        }
+    }
+
+    CrossProduct(vec_upwards, vMidDir, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vMidPos, fSplitLength, vRight, pTread->vMidVerts[0]);
+    VectorMA(pTread->vMidPos, -fSplitLength, vRight, pTread->vMidVerts[1]);
+    CrossProduct(vec_upwards, vDeltaNorm, vRight);
+    VectorNormalizeFast(vRight);
+    VectorMA(pTread->vEndPos, pTread->fWidth, vRight, pTread->vEndVerts[0]);
+    VectorMA(pTread->vEndPos, -pTread->fWidth, vRight, pTread->vEndVerts[1]);
+
     return 0;
 }
diff --git a/code/cgame/cg_modelanim.c b/code/cgame/cg_modelanim.c
index 49a67a2b..d47dc1cc 100644
--- a/code/cgame/cg_modelanim.c
+++ b/code/cgame/cg_modelanim.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,6 +26,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "tiki.h"
 
+static qboolean cg_forceModelAllowed = qfalse;
+
+/*
+===============
+CG_GetPlayerModelTiki
+===============
+*/
+const char *CG_GetPlayerModelTiki(const char *modelName)
+{
+    return va("models/player/%s.tik", modelName);
+}
+
+/*
+===============
+CG_GetPlayerLocalModelTiki
+===============
+*/
+const char *CG_GetPlayerLocalModelTiki(const char *modelName)
+{
+    return va("models/player/%s.tik", modelName);
+}
+
+/*
+===============
+CG_PlayerTeamIcon
+===============
+*/
 void CG_PlayerTeamIcon(refEntity_t *pModel, entityState_t *pPlayerState)
 {
     qboolean bInArtillery, bInTeam, bSpecialIcon;
@@ -180,6 +207,344 @@ void CG_PlayerTeamIcon(refEntity_t *pModel, entityState_t *pPlayerState)
     }
 }
 
+/*
+===============
+CG_InterpolateAnimParms
+
+Interpolate between current and next entity
+===============
+*/
+void CG_InterpolateAnimParms(entityState_t *state, entityState_t *sNext, refEntity_t *model)
+{
+    static cvar_t *vmEntity = NULL;
+    int            i;
+    float          t;
+    float          animLength;
+    float          t1, t2;
+
+    if (!vmEntity) {
+        vmEntity = cgi.Cvar_Get("viewmodelanim", "1", 0);
+    }
+
+    if (sNext && sNext->usageIndex == state->usageIndex) {
+        t1 = cg.time - cg.snap->serverTime;
+        t2 = cg.nextSnap->serverTime - cg.snap->serverTime;
+        t  = t1 / t2;
+
+        model->actionWeight = (sNext->actionWeight - state->actionWeight) * t + state->actionWeight;
+
+        for (i = 0; i < MAX_FRAMEINFOS; i++) {
+            if (sNext->frameInfo[i].weight) {
+                model->frameInfo[i].index = sNext->frameInfo[i].index;
+                if (sNext->frameInfo[i].index == state->frameInfo[i].index && state->frameInfo[i].weight) {
+                    model->frameInfo[i].weight =
+                        (sNext->frameInfo[i].weight - state->frameInfo[i].weight) * t + state->frameInfo[i].weight;
+
+                    if (sNext->frameInfo[i].time >= state->frameInfo[i].time) {
+                        model->frameInfo[i].time =
+                            (sNext->frameInfo[i].time - state->frameInfo[i].time) * t + state->frameInfo[i].time;
+                    } else {
+                        animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                        if (!animLength) {
+                            t1 = 0.0;
+                        } else {
+                            t1 = (animLength + sNext->frameInfo[i].time - state->frameInfo[i].time) * t
+                               + state->frameInfo[i].time;
+                        }
+
+                        t2 = t1;
+                        while (t2 > animLength) {
+                            t2 -= animLength;
+
+                            if (t2 == t1) {
+                                t2 = 1.0;
+                                break;
+                            }
+
+                            t1 = t2;
+                        }
+
+                        model->frameInfo[i].time = t2;
+                    }
+                } else {
+                    animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                    if (!animLength) {
+                        t1 = 0.0;
+                    } else {
+                        t1 = sNext->frameInfo[i].time - (cg.nextSnap->serverTime - cg.time) / 1000.0;
+                    }
+
+                    model->frameInfo[i].time   = Q_max(0, t1);
+                    model->frameInfo[i].weight = sNext->frameInfo[i].weight;
+                }
+            } else if (sNext->frameInfo[i].index == state->frameInfo[i].index) {
+                animLength = cgi.Anim_Time(model->tiki, sNext->frameInfo[i].index);
+                if (!animLength) {
+                    t1 = 0.0;
+                } else {
+                    t1 = (cg.time - cg.snap->serverTime) / 1000.0 + state->frameInfo[i].time;
+                }
+
+                model->frameInfo[i].index  = Q_clamp_int(state->frameInfo[i].index, 0, model->tiki->a->num_anims - 1);
+                model->frameInfo[i].time   = Q_min(animLength, t1);
+                model->frameInfo[i].weight = (1.0 - t) * state->frameInfo[i].weight;
+            } else {
+                model->frameInfo[i].index  = -1;
+                model->frameInfo[i].weight = 0.0;
+            }
+        }
+    } else {
+        // no next state, don't blend anims
+
+        model->actionWeight = state->actionWeight;
+        for (i = 0; i < MAX_FRAMEINFOS; i++) {
+            if (state->frameInfo[i].weight) {
+                model->frameInfo[i].index  = Q_clamp_int(state->frameInfo[i].index, 0, model->tiki->a->num_anims - 1);
+                model->frameInfo[i].time   = state->frameInfo[i].time;
+                model->frameInfo[i].weight = state->frameInfo[i].weight;
+            } else {
+                model->frameInfo[i].index  = -1;
+                model->frameInfo[i].weight = 0.0;
+            }
+        }
+    }
+
+    if (vmEntity->integer == state->number) {
+        static cvar_t *curanim;
+        if (!curanim) {
+            curanim = cgi.Cvar_Get("viewmodelanimslot", "1", 0);
+        }
+
+        cgi.Cvar_Set("viewmodelanimclienttime", va("%0.2f", model->frameInfo[curanim->integer].time));
+    }
+}
+
+/*
+===============
+CG_CastFootShadow
+
+Cast complex foot shadow using lights
+===============
+*/
+void CG_CastFootShadow(const vec_t *vLightPos, vec_t *vLightIntensity, int iTag, refEntity_t *model)
+{
+    int           i;
+    float         fAlpha;
+    float         fLength;
+    float         fWidth;
+    float         fAlphaOfs;
+    float         fOfs;
+    float         fPitchCos;
+    vec3_t        vPos;
+    vec3_t        vEnd;
+    vec3_t        vDelta;
+    vec3_t        vLightAngles;
+    trace_t       trace;
+    orientation_t oFoot;
+
+    VectorCopy(model->origin, vPos);
+    oFoot = cgi.TIKI_Orientation(model, iTag);
+    VectorMA(oFoot.origin, 2, oFoot.axis[1], vEnd);
+    for (i = 0; i < 3; i++) {
+        VectorMA(vPos, vEnd[i], model->axis[i], vPos);
+    }
+
+    if (cg_shadowdebug->integer) {
+        vec3_t vDir;
+
+        //
+        // show debug lines
+        //
+        memset(vDir, 0, sizeof(vDir));
+        for (i = 0; i < 3; ++i) {
+            VectorMA(vDir, oFoot.axis[0][i], model->axis[i], vDir);
+        }
+        VectorMA(vPos, 32.0, vDir, vEnd);
+        cgi.R_DebugLine(vPos, vEnd, 1.0, 0.0, 0.0, 1.0);
+
+        memset(vDir, 0, sizeof(vDir));
+        for (i = 0; i < 3; ++i) {
+            VectorMA(vDir, oFoot.axis[1][i], model->axis[i], vDir);
+        }
+        VectorMA(vPos, 32.0, vDir, vEnd);
+        cgi.R_DebugLine(vPos, vEnd, 0.0, 1.0, 0.0, 1.0);
+
+        memset(vDir, 0, sizeof(vDir));
+        for (i = 0; i < 3; ++i) {
+            VectorMA(vDir, oFoot.axis[2][i], model->axis[i], vDir);
+        }
+        VectorMA(vPos, 32.0, vDir, vEnd);
+        cgi.R_DebugLine(vPos, vEnd, 0.0, 0.0, 1.0, 1.0);
+    }
+
+    // calculate the direction
+    VectorSubtract(vLightPos, vPos, vDelta);
+    VectorNormalizeFast(vDelta);
+    vectoangles(vDelta, vLightAngles);
+
+    // normalize to 180 degrees
+    if (vLightAngles[0] > 180) {
+        vLightAngles[0] -= 360;
+    }
+
+    if (vLightAngles[0] > -5.7319679) {
+        // FIXME: what is -5.7319679?
+        return;
+    }
+
+    fPitchCos = cos(DEG2RAD(vLightAngles[0]));
+    if (fPitchCos > 0.955) {
+        fAlpha = 1.0 - (fPitchCos - 0.955) * 25;
+    } else {
+        fAlpha = 1.0;
+    }
+
+    fLength = fPitchCos * fPitchCos * 32.0 + fPitchCos * 8.0 + 10.0;
+    fOfs    = 0.5 - (-4.1 / tan(DEG2RAD(vLightAngles[0])) + 4.0 - fLength) / fLength * 0.5;
+    VectorMA(vPos, -96.0, vDelta, vEnd);
+    CG_Trace(&trace, vPos, vec3_origin, vec3_origin, vEnd, 0, MASK_FOOTSHADOW, qfalse, qtrue, "CG_CastFootShadow");
+
+    if (cg_shadowdebug->integer) {
+        cgi.R_DebugLine(vPos, vLightPos, 0.75, 0.75, 0.5, 1.0);
+        cgi.R_DebugLine(vPos, vEnd, 1.0, 1.0, 1.0, 1.0);
+    }
+
+    if (trace.fraction == 1.0) {
+        return;
+    }
+
+    trace.fraction -= 0.0427f;
+    if (trace.fraction < 0) {
+        trace.fraction = 0;
+    }
+
+    fWidth    = 10.f - (1.f - trace.fraction) * 6.f;
+    fAlphaOfs = (1.f - trace.fraction) * fAlpha;
+
+    fAlpha = Q_max(vLightIntensity[0], Q_max(vLightIntensity[1], vLightIntensity[2]));
+
+    if (fAlpha < 0.1) {
+        vLightIntensity[0] *= 0.1 / fAlpha * fAlphaOfs;
+        vLightIntensity[1] *= 0.1 / fAlpha * fAlphaOfs;
+        vLightIntensity[2] *= 0.1 / fAlpha * fAlphaOfs;
+    } else {
+        vLightIntensity[0] *= fAlphaOfs;
+        vLightIntensity[1] *= fAlphaOfs;
+        vLightIntensity[2] *= fAlphaOfs;
+    }
+
+    fAlpha = Q_max(vLightIntensity[0], Q_max(vLightIntensity[1], vLightIntensity[2]));
+    if (fAlpha > 0.6) {
+        vLightIntensity[0] *= 0.6 / fAlpha;
+        vLightIntensity[1] *= 0.6 / fAlpha;
+        vLightIntensity[2] *= 0.6 / fAlpha;
+    }
+
+    if (vLightIntensity[0] <= 0.01 && vLightIntensity[1] <= 0.01 && vLightIntensity[2] <= 0.01) {
+        return;
+    }
+
+    CG_ImpactMark(
+        cgs.media.footShadowMarkShader,
+        trace.endpos,
+        trace.plane.normal,
+        vLightAngles[1],
+        fWidth,
+        fLength,
+        vLightIntensity[0],
+        vLightIntensity[1],
+        vLightIntensity[2],
+        1.0,
+        qfalse,
+        qtrue,
+        qfalse,
+        qfalse,
+        0.5,
+        fOfs
+    );
+}
+
+/*
+===============
+CG_CastSimpleFeetShadow
+
+Cast basic feet shadow
+===============
+*/
+void CG_CastSimpleFeetShadow(
+    const trace_t *pTrace,
+    float          fWidth,
+    float          fAlpha,
+    int            iRightTag,
+    int            iLeftTag,
+    const dtiki_t *tiki,
+    refEntity_t   *model
+)
+{
+    int           i;
+    float         fShadowYaw;
+    float         fLength;
+    vec3_t        vPos, vRightPos, vLeftPos;
+    vec3_t        vDelta;
+    orientation_t oFoot;
+
+    //
+    // right foot
+    //
+    VectorCopy(pTrace->endpos, vRightPos);
+    oFoot = cgi.TIKI_Orientation(model, iRightTag);
+    VectorMA(oFoot.origin, 3, oFoot.axis[1], vPos);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(vRightPos, vPos[i], model->axis[i], vRightPos);
+    }
+
+    VectorMA(vRightPos, -2, oFoot.axis[1], vRightPos);
+
+    //
+    // left foot
+    //
+    VectorCopy(pTrace->endpos, vLeftPos);
+    oFoot = cgi.TIKI_Orientation(model, iLeftTag);
+    VectorMA(oFoot.origin, 3, oFoot.axis[1], vPos);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(vLeftPos, vPos[i], model->axis[i], vLeftPos);
+    }
+
+    VectorAdd(vRightPos, vLeftPos, vPos);
+    VectorScale(vPos, 0.5, vPos);
+    VectorSubtract(vRightPos, vLeftPos, vDelta);
+    VectorMA(vLeftPos, 0.5, vDelta, vPos);
+
+    // get the facing yaw
+    fShadowYaw = vectoyaw(vDelta);
+    fLength    = VectorNormalize(vDelta) * 0.5 + 12;
+    if (fLength < fWidth * 0.7) {
+        fLength = fWidth * 0.7;
+    }
+
+    // add the mark
+    CG_ImpactMark(
+        cgs.media.shadowMarkShader,
+        vPos,
+        pTrace->plane.normal,
+        fShadowYaw,
+        fWidth * 0.7,
+        fLength,
+        fAlpha,
+        fAlpha,
+        fAlpha,
+        1.0,
+        qfalse,
+        qtrue,
+        qfalse,
+        qfalse,
+        0.5,
+        0.5
+    );
+}
+
 /*
 ===============
 CG_EntityShadow
@@ -193,9 +558,15 @@ Returns the Z component of the surface being shadowed
 
 qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
 {
+    int     iTagL, iTagR;
+    float   alpha;
+    float   fWidth;
     vec3_t  end;
+    vec3_t  vMins, vMaxs;
+    vec3_t  vSize;
     trace_t trace;
-    float   alpha, radius;
+
+    iTagR = -1;
 
     if (cg_shadows->integer == 0) {
         return qfalse;
@@ -206,10 +577,29 @@ qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
         return qfalse;
     }
 
-    // no shadows when invisible
-    //   if ( cent->currentState.powerups & ( 1 << PW_INVIS ) ) {
-    //      return qfalse;
-    //   }
+    if (cg_shadows->integer == 2 && (model->renderfx & RF_SHADOW_PRECISE)) {
+        iTagL = cgi.Tag_NumForName(model->tiki, "Bip01 L Foot");
+        if (iTagL != -1) {
+            iTagR = cgi.Tag_NumForName(model->tiki, "Bip01 R Foot");
+        }
+
+        if (iTagR != -1) {
+            int    iNumLights, iCurrLight;
+            vec3_t avLightPos[16], avLightIntensity[16];
+
+            iNumLights = Q_clamp(cg_shadowscount->integer, 1, 8);
+            iNumLights = cgi.R_GatherLightSources(model->origin, avLightPos, avLightIntensity, iNumLights);
+            if (iNumLights) {
+                for (iCurrLight = 0; iCurrLight < iNumLights; iCurrLight++) {
+                    CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagL, model);
+                    CG_CastFootShadow(avLightPos[iCurrLight], avLightIntensity[iCurrLight], iTagR, model);
+                }
+
+                // shadow was casted properly
+                return qtrue;
+            }
+        }
+    }
 
     // send a trace down from the player to the ground
     VectorCopy(model->origin, end);
@@ -222,29 +612,46 @@ qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
         return qfalse;
     }
 
-    if ((cg_shadows->integer == 2) && (model->renderfx & RF_SHADOW_PRECISE)) {
+    // since 2.0: no shadow if solid
+    if (trace.startsolid || trace.allsolid) {
+        return qfalse;
+    }
+
+    if ((cg_shadows->integer == 3) && (model->renderfx & RF_SHADOW_PRECISE)) {
         return qtrue;
     }
 
     //
     // get the bounds of the current frame
     //
-    radius = model->scale * cgi.R_ModelRadius(model->hModel);
-
-    if (radius < 1) {
+    fWidth = model->scale * cgi.R_ModelRadius(model->hModel);
+    if (fWidth < 1) {
         return qfalse;
     }
 
     // fade the shadow out with height
-    alpha = (1.0 - trace.fraction) * 0.8f;
+    alpha = (1.0 - trace.fraction) * 0.65f;
 
-    if ((cg_shadows->integer == 3) && (model->renderfx & RF_SHADOW_PRECISE)) {
-        if (model->shaderRGBA[3] == 255) {
-            model->shaderRGBA[3] = alpha * 255;
+    if (model->renderfx & RF_SHADOW_PRECISE) {
+        iTagL = cgi.Tag_NumForName(model->tiki, "Bip01 L Foot");
+        if (iTagL != -1) {
+            iTagR = cgi.Tag_NumForName(model->tiki, "Bip01 R Foot");
+        }
+
+        if (iTagR != -1) {
+            if (cg_shadows->integer == 2) {
+                alpha *= 0.6f;
+            }
+
+            CG_CastSimpleFeetShadow(&trace, fWidth, alpha, iTagR, iTagL, model->tiki, model);
+            return qtrue;
         }
-        return qtrue;
     }
 
+    cgi.R_ModelBounds(model->hModel, vMins, vMaxs);
+    VectorSubtract(vMaxs, vMins, vSize);
+    VectorScale(vSize, 0.6f, vSize);
+
     // add the mark as a temporary, so it goes directly to the renderer
     // without taking a spot in the cg_marks array
     CG_ImpactMark(
@@ -252,15 +659,15 @@ qboolean CG_EntityShadow(centity_t *cent, refEntity_t *model)
         trace.endpos,
         trace.plane.normal,
         cent->lerpAngles[YAW],
-        radius,
-        radius,
+        vSize[1],
+        vSize[0],
         alpha,
         alpha,
         alpha,
         1,
         qfalse,
         qtrue,
-        qtrue,
+        qfalse,
         qfalse,
         0.5f,
         0.5f
@@ -286,7 +693,7 @@ void CG_AnimationDebugMessage(int number, const char *fmt, ...)
         char    msg[1024];
 
         va_start(argptr, fmt);
-        vsprintf(msg, fmt, argptr);
+        Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);
 
         if ((!cg_debugAnimWatch->integer) || ((cg_debugAnimWatch->integer - 1) == number)) {
@@ -316,10 +723,12 @@ void CG_AttachEntity(
     orientation_t or ;
     vec3_t tempAxis[3];
     vec3_t vOrigin;
+    vec3_t vDeltaLightOrg;
 
     or = cgi.TIKI_Orientation(parent, tagnum);
     //cgi.Printf( "th = %d %.2f %.2f %.2f\n", tikihandle, or.origin[ 0 ], or.origin[ 1 ], or.origin[ 2 ] );
 
+    VectorSubtract(entity->lightingOrigin, entity->origin, vDeltaLightOrg);
     VectorCopy(parent->origin, entity->origin);
 
     for (i = 0; i < 3; i++) {
@@ -337,17 +746,22 @@ void CG_AttachEntity(
     VectorCopy(entity->origin, entity->oldorigin);
 
     if (use_angles) {
-        MatrixMultiply(entity->axis, parent->axis, tempAxis);
-        MatrixMultiply(or.axis, tempAxis, entity->axis);
+        MatrixMultiply(entity->axis, or.axis, tempAxis);
+        MatrixMultiply(tempAxis, parent->axis, entity->axis);
     }
 
     entity->scale *= parent->scale;
     entity->renderfx |= (parent->renderfx & ~(RF_FLAGS_NOT_INHERITED | RF_LIGHTING_ORIGIN));
 
-    MatrixTransformVectorRight(entity->axis, entity->lightingOrigin, vOrigin);
+    MatrixTransformVectorRight(entity->axis, vDeltaLightOrg, vOrigin);
     VectorAdd(entity->origin, vOrigin, entity->lightingOrigin);
 }
 
+/*
+===============
+CG_AttachEyeEntity
+===============
+*/
 void CG_AttachEyeEntity(
     refEntity_t *entity, refEntity_t *parent, dtiki_t *tiki, int tagnum, qboolean use_angles, vec_t *attach_offset
 )
@@ -360,8 +774,7 @@ void CG_AttachEyeEntity(
         AnglesToAxis(cg.refdefViewAngles, entity->axis);
     }
 
-    if (attach_offset[0] || attach_offset[1] || attach_offset[2])
-    {
+    if (attach_offset[0] || attach_offset[1] || attach_offset[2]) {
         for (i = 0; i < 3; i++) {
             VectorMA(entity->origin, attach_offset[i], entity->axis[i], entity->origin);
         }
@@ -373,56 +786,219 @@ void CG_AttachEyeEntity(
     VectorCopy(parent->lightingOrigin, entity->lightingOrigin);
 }
 
+/*
+===============
+CG_IsValidServerModel
+===============
+*/
+qboolean CG_IsValidServerModel(const char *modelpath)
+{
+    const char *str;
+    int         i;
+
+    for (i = 1; i < MAX_MODELS; i++) {
+        str = CG_ConfigString(CS_MODELS + i);
+        if (!Q_stricmp(str, modelpath)) {
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+===============
+CG_CheckValidModels
+
+This verifies the allied player model and the german player model:
+- If they don't exist on the client, reset to the default allied player model
+- If they don't exist on the server, don't allow forceModel so the client explicitly know the skin isn't supported
+===============
+*/
+void CG_CheckValidModels()
+{
+    const char *modelpath;
+    qboolean    isDirty = qfalse;
+
+    if (dm_playermodel->modified) {
+        // Check for allied model
+        modelpath = va("models/player/%s.tik", dm_playermodel->string);
+        if (!cgi.R_RegisterModel(modelpath)) {
+            cgi.Printf(
+                "Allied model '%s' is invalid, resetting to '%s'\n", dm_playermodel->string, dm_playermodel->resetString
+            );
+
+            cgi.Cvar_Set("dm_playermodel", dm_playermodel->resetString);
+            modelpath = va("models/player/%s.tik", dm_playermodel->string);
+        }
+
+        cg.serverAlliedModelValid = CG_IsValidServerModel(modelpath);
+    }
+
+    if (dm_playergermanmodel->modified) {
+        // Check for axis model
+        modelpath = va("models/player/%s.tik", dm_playergermanmodel->string);
+        if (!cgi.R_RegisterModel(modelpath)) {
+            cgi.Printf(
+                "Allied model '%s' is invalid, resetting to '%s'\n",
+                dm_playergermanmodel->string,
+                dm_playergermanmodel->resetString
+            );
+
+            cgi.Cvar_Set("dm_playergermanmodel", dm_playergermanmodel->resetString);
+            modelpath = va("models/player/%s.tik", dm_playergermanmodel->string);
+        }
+
+        cg.serverAxisModelValid = CG_IsValidServerModel(modelpath);
+    }
+
+    if (dm_playermodel->modified || dm_playergermanmodel->modified) {
+        cg_forceModelAllowed = cg.serverAlliedModelValid && cg.serverAxisModelValid;
+    }
+}
+
+/*
+===============
+CG_ServerModelLoaded
+===============
+*/
+void CG_ServerModelLoaded(const char *name, qhandle_t handle)
+{
+    if (!Q_stricmpn(name, "models/player/", 14) && (!cg.serverAlliedModelValid || !cg.serverAxisModelValid)) {
+        char modelName[MAX_QPATH];
+        COM_StripExtension(name + 14, modelName, sizeof(modelName));
+
+        //
+        // The player model has been loaded on the server
+        // so try again parsing
+        //
+        if (!Q_stricmp(modelName, dm_playermodel->string)) {
+            dm_playermodel->modified = qtrue;
+        }
+        if (!Q_stricmp(modelName, dm_playergermanmodel->string)) {
+            dm_playergermanmodel->modified = qtrue;
+        }
+    }
+}
+
+/*
+===============
+CG_ServerModelUnloaded
+===============
+*/
+void CG_ServerModelUnloaded(qhandle_t handle)
+{
+#if 0
+    if (cg.serverAlliedModelValid && handle == cg.hAlliedPlayerModelHandle) {
+        dm_playermodel->modified = qtrue;
+    }
+    if (cg.serverAxisModelValid && handle == cg.hAxisPlayerModelHandle) {
+        dm_playergermanmodel->modified = qtrue;
+    }
+#endif
+}
+
+/*
+===============
+CG_UpdateForceModels
+===============
+*/
 void CG_UpdateForceModels()
 {
     qhandle_t hModel;
-    char* pszAlliesPartial;
-    char* pszAxisPartial;
-    char szAlliesModel[256];
-    char szAxisModel[256];
+    char     *pszAlliesPartial;
+    char     *pszAxisPartial;
+    char      szAlliesModel[256];
+    char      szAxisModel[256];
+    qboolean  isDirty;
 
-    if (cg.pAlliedPlayerModel && cg.pAxisPlayerModel && !dm_playermodel->modified && !dm_playergermanmodel->modified) {
+    isDirty = dm_playermodel->modified || dm_playergermanmodel->modified || cg_forceModel->modified;
+
+    if (!cg_forceModelAllowed) {
+        if (isDirty) {
+            cgi.Printf(
+                "One or more of the selected players model don't exist on the server or are not loaded, using the "
+                "default skin\n"
+            );
+        }
+
+        return;
+    }
+
+    if (cg.pAlliedPlayerModel && cg.pAxisPlayerModel && !isDirty) {
         return;
     }
 
     pszAlliesPartial = dm_playermodel->string;
-    pszAxisPartial = dm_playergermanmodel->string;
+    pszAxisPartial   = dm_playergermanmodel->string;
 
-    sprintf(szAlliesModel, "models/player/%s.tik", pszAlliesPartial);
-    sprintf(szAxisModel, "models/player/%s.tik", pszAxisPartial);
-    hModel = cgi.R_RegisterModel(szAlliesModel);
-    if (!hModel) hModel = cgi.R_RegisterModel("models/player/american_army.tik");
+    Com_sprintf(szAlliesModel, sizeof(szAlliesModel), "models/player/%s.tik", pszAlliesPartial);
+    Com_sprintf(szAxisModel, sizeof(szAxisModel), "models/player/%s.tik", pszAxisPartial);
+
+    hModel = cg.serverAlliedModelValid ? cgi.R_RegisterModel(szAlliesModel) : 0;
+    if (!hModel) {
+        Com_sprintf(szAlliesModel, sizeof(szAlliesModel), "models/player/%s.tik", dm_playermodel->resetString);
+        hModel = cgi.R_RegisterModel(szAlliesModel);
+    }
 
     if (hModel) {
         cg.hAlliedPlayerModelHandle = hModel;
-        cg.pAlliedPlayerModel = cgi.R_Model_GetHandle(hModel);
+        cg.pAlliedPlayerModel       = cgi.R_Model_GetHandle(hModel);
         if (!cg.pAlliedPlayerModel) {
             cg.hAlliedPlayerModelHandle = 0;
         }
     } else {
         cg.hAlliedPlayerModelHandle = 0;
-        cg.pAlliedPlayerModel = 0;
+        cg.pAlliedPlayerModel       = NULL;
     }
 
-    hModel = cgi.R_RegisterModel(szAxisModel);
-    if (!hModel) hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier.tik");
+    hModel = cg.serverAxisModelValid ? cgi.R_RegisterModel(szAxisModel) : 0;
+    if (!hModel) {
+        Com_sprintf(szAxisModel, sizeof(szAxisModel), "models/player/%s.tik", dm_playergermanmodel->resetString);
+        hModel = cgi.R_RegisterModel(szAxisModel);
+    }
 
     if (hModel) {
         cg.hAxisPlayerModelHandle = hModel;
-        cg.pAxisPlayerModel = cgi.R_Model_GetHandle(hModel);
+        cg.pAxisPlayerModel       = cgi.R_Model_GetHandle(hModel);
         if (!cg.pAxisPlayerModel) {
             cg.hAxisPlayerModelHandle = 0;
         }
     } else {
         cg.hAxisPlayerModelHandle = 0;
-        cg.pAxisPlayerModel = 0;
+        cg.pAxisPlayerModel       = 0;
     }
 
     // Clear modified flag
-    dm_playermodel->modified = qfalse;
-    dm_playergermanmodel->modified = qfalse;
+    //dm_playermodel->modified       = qfalse;
+    //dm_playergermanmodel->modified = qfalse;
 }
 
+/*
+===============
+CG_ProcessPlayerModel
+
+Checks player models, and update force models
+===============
+*/
+void CG_ProcessPlayerModel()
+{
+    CG_CheckValidModels();
+    if (cg_forceModel->integer) {
+        CG_UpdateForceModels();
+    }
+
+    // Clear modified flag
+    dm_playermodel->modified       = qfalse;
+    dm_playergermanmodel->modified = qfalse;
+    cg_forceModel->modified        = qfalse;
+}
+
+/*
+===============
+CG_ModelAnim
+===============
+*/
 void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
 {
     entityState_t *s1;
@@ -431,7 +1007,6 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     int            i;
     vec3_t         vMins, vMaxs, vTmp;
     const char    *szTagName;
-    static cvar_t *vmEntity = NULL;
     int            iAnimFlags;
 
     s1 = &cent->currentState;
@@ -443,10 +1018,6 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
 
     memset(&model, 0, sizeof(model));
 
-    if (!vmEntity) {
-        vmEntity = cgi.Cvar_Get("viewmodelanim", "1", 0);
-    }
-
     if (cent->interpolate) {
         sNext = &cent->nextState;
     }
@@ -568,8 +1139,8 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     model.tiki      = cgi.R_Model_GetHandle(cgs.model_draw[s1->modelindex]);
 
     if (s1->number != cg.snap->ps.clientNum && (s1->eType == ET_PLAYER || (s1->eFlags & EF_DEAD))) {
-        if (cg_forceModel->integer) {
-            CG_UpdateForceModels();
+        if (cg_forceModel->integer && cg_forceModelAllowed) {
+            //CG_UpdateForceModels();
 
             if (s1->eFlags & EF_AXIS) {
                 model.hModel = cg.hAxisPlayerModelHandle;
@@ -593,9 +1164,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
         if (!model.hModel || !model.tiki) {
             // Use a model in case it still doesn't exist
             if (s1->eFlags & EF_AXIS) {
-                model.hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier.tik");
+                model.hModel = cgi.R_RegisterModel(CG_GetPlayerModelTiki(dm_playergermanmodel->resetString));
             } else {
-                model.hModel = cgi.R_RegisterModel("models/player/american_army.tik");
+                model.hModel = cgi.R_RegisterModel(CG_GetPlayerModelTiki(dm_playermodel->resetString));
             }
             model.tiki      = cgi.R_Model_GetHandle(model.hModel);
             model.hOldModel = cgs.model_draw[s1->modelindex];
@@ -614,103 +1185,7 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
     model.renderfx |= s1->renderfx;
     cgi.TIKI_SetEyeTargetPos(model.tiki, model.entityNumber, s1->eyeVector);
 
-    if (sNext && sNext->usageIndex == s1->usageIndex) {
-        float t;
-        float animLength;
-        float t1, t2;
-
-        t1                 = cg.time - cg.snap->serverTime;
-        t2                 = cg.nextSnap->serverTime - cg.snap->serverTime;
-        t                  = t1 / t2;
-        model.actionWeight = (sNext->actionWeight - s1->actionWeight) * t + s1->actionWeight;
-
-        for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            if (sNext->frameInfo[i].weight) {
-                model.frameInfo[i].index = sNext->frameInfo[i].index;
-                if (sNext->frameInfo[i].index == s1->frameInfo[i].index && s1->frameInfo[i].weight) {
-                    model.frameInfo[i].weight =
-                        (sNext->frameInfo[i].weight - s1->frameInfo[i].weight) * t + s1->frameInfo[i].weight;
-
-                    if (sNext->frameInfo[i].time >= s1->frameInfo[i].time) {
-                        model.frameInfo[i].time =
-                            (sNext->frameInfo[i].time - s1->frameInfo[i].time) * t + s1->frameInfo[i].time;
-                    } else {
-                        animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                        if (!animLength) {
-                            t1 = 0.0;
-                        } else {
-                            t1 = (animLength + sNext->frameInfo[i].time - s1->frameInfo[i].time) * t
-                               + s1->frameInfo[i].time;
-                        }
-
-                        t2 = t1;
-                        while (t2 > animLength) {
-                            t2 -= animLength;
-                        }
-
-                        model.frameInfo[i].time = t2;
-                    }
-                } else {
-                    animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                    if (!animLength) {
-                        t1 = 0.0;
-                    } else {
-                        t1 = sNext->frameInfo[i].time - (cg.nextSnap->serverTime - cg.time) / 1000.0;
-                    }
-
-                    t2 = t1;
-                    if (t2 < 0.0) {
-                        t2 = 0.0;
-                    }
-
-                    model.frameInfo[i].time   = t2;
-                    model.frameInfo[i].weight = sNext->frameInfo[i].weight;
-                }
-            } else if (sNext->frameInfo[i].index == s1->frameInfo[i].index) {
-                animLength = cgi.Anim_Time(model.tiki, sNext->frameInfo[i].index);
-                if (!animLength) {
-                    t1 = 0.0;
-                } else {
-                    t1 = (cg.time - cg.snap->serverTime) / 1000.0 + s1->frameInfo[i].time;
-                }
-
-                t2 = t1;
-                if (t2 < animLength) {
-                    t2 = animLength;
-                }
-
-                model.frameInfo[i].index  = s1->frameInfo[i].index;
-                model.frameInfo[i].time   = t2;
-                model.frameInfo[i].weight = (1.0 - t) * s1->frameInfo[i].weight;
-            } else {
-                model.frameInfo[i].index  = -1;
-                model.frameInfo[i].weight = 0.0;
-            }
-        }
-    } else {
-        // no next state, don't blend anims
-
-        model.actionWeight = s1->actionWeight;
-        for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            if (s1->frameInfo[i].weight) {
-                model.frameInfo[i].index  = s1->frameInfo[i].index;
-                model.frameInfo[i].time   = s1->frameInfo[i].time;
-                model.frameInfo[i].weight = s1->frameInfo[i].weight;
-            } else {
-                model.frameInfo[i].index  = -1;
-                model.frameInfo[i].weight = 0.0;
-            }
-        }
-    }
-
-    if (vmEntity->integer == s1->number) {
-        static cvar_t *curanim;
-        if (!curanim) {
-            curanim = cgi.Cvar_Get("viewmodelanimslot", "1", 0);
-        }
-
-        cgi.Cvar_Set("viewmodelanimclienttime", va("%0.2f", model.frameInfo[curanim->integer].time));
-    }
+    CG_InterpolateAnimParms(s1, sNext, &model);
 
     if (cent->currentState.parent != ENTITYNUM_NONE) {
         int          iTagNum;
@@ -924,7 +1399,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
             if (!cg.pLastPlayerWorldModel || cg.pLastPlayerWorldModel != model.tiki) {
                 qhandle_t hModel;
                 char      fpsname[128];
+
                 COM_StripExtension(model.tiki->a->name, fpsname, sizeof(fpsname));
+                Q_strcat(fpsname, sizeof(fpsname), "_fps.tik");
 
                 hModel = cgi.R_RegisterModel(fpsname);
                 if (hModel) {
@@ -935,9 +1412,9 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
                     }
                 } else {
                     if (cg.snap->ps.stats[STAT_TEAM] == TEAM_AXIS) {
-                        hModel = cgi.R_RegisterModel("models/player/german_wehrmacht_soldier_fps.tik");
+                        hModel = cgi.R_RegisterModel(CG_GetPlayerLocalModelTiki(dm_playergermanmodel->resetString));
                     } else {
-                        hModel = cgi.R_RegisterModel("models/player/american_army_fps.tik");
+                        hModel = cgi.R_RegisterModel(CG_GetPlayerLocalModelTiki(dm_playermodel->resetString));
                     }
 
                     if (hModel) {
@@ -961,6 +1438,7 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
             memset(model.surfaces, 0, sizeof(model.surfaces));
 
             CG_ViewModelAnimation(&model);
+            model.renderfx |= RF_FRAMELERP;
             cgi.ForceUpdatePose(&model);
 
             if ((cent->currentState.eFlags & EF_UNARMED) || cg_drawviewmodel->integer <= 1
@@ -1057,7 +1535,12 @@ void CG_ModelAnim(centity_t *cent, qboolean bDoShaderTime)
         if (model.frameInfo[i].weight) {
             if (!((cent->animLastWeight >> i) & 1) || model.frameInfo[i].index != cent->animLast[i]) {
                 CG_ProcessEntityCommands(TIKI_FRAME_ENTRY, model.frameInfo[i].index, s1->number, &model, cent);
-                cent->animLastTimes[i] = 0.0;
+                if (cent->animLastTimes[i] == -1) {
+                    cent->animLast[i]      = model.frameInfo[i].index;
+                    cent->animLastTimes[i] = model.frameInfo[i].time;
+                } else {
+                    cent->animLastTimes[i] = 0;
+                }
             }
 
             CG_ClientCommands(&model, cent, i);
diff --git a/code/cgame/cg_nature.cpp b/code/cgame/cg_nature.cpp
index 304f0906..c7a623c8 100644
--- a/code/cgame/cg_nature.cpp
+++ b/code/cgame/cg_nature.cpp
@@ -51,16 +51,16 @@ void RainTouch(ctempmodel_t *ct, trace_t *trace)
 
 void ClientGameCommandManager::RainTouch(Event *ev)
 {
-    // FIXME: unimplemented
+    // Nothing to do
 }
 
 void ClientGameCommandManager::InitializeRainCvars()
 {
     int i;
 
-    cg_rain = cgi.Cvar_Get("cg_rain", "0", CVAR_ARCHIVE);
+    cg_rain = cgi.Cvar_Get("cg_rain", "1", CVAR_ARCHIVE);
     cg_rain_drawcoverage =
-        cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_SERVER_CREATED | CVAR_SYSTEMINFO);
+        cgi.Cvar_Get("cg_rain_drawcoverage", "0", CVAR_SAVEGAME | CVAR_RESETSTRING | CVAR_SYSTEMINFO);
 
     cg.rain.density    = 0.0;
     cg.rain.speed      = 2048.0f;
diff --git a/code/cgame/cg_parsemsg.cpp b/code/cgame/cg_parsemsg.cpp
index 6fad5ee6..fe723d77 100644
--- a/code/cgame/cg_parsemsg.cpp
+++ b/code/cgame/cg_parsemsg.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_local.h"
 #include "cg_parsemsg.h"
 #include "cg_specialfx.h"
+#include "cg_radar.h"
 
 #include "str.h"
 
@@ -37,6 +38,7 @@ typedef struct {
     vec3_t  *i_vEnd;
     int      i_iNumBullets;
     qboolean iLarge;
+    float    alpha;
     int      iTracerVisible;
     qboolean bIgnoreEntities;
 } bullet_tracer_t;
@@ -60,21 +62,22 @@ static vec3_t          flesh_impact_pos[MAX_IMPACTS];
 static vec3_t          flesh_impact_norm[MAX_IMPACTS];
 static int             flesh_impact_large[MAX_IMPACTS];
 
-void CG_MakeBulletHoleSound(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t* pPreTrace) {
-
-    int iSurfType;
-    float fVolume;
-    str sSoundName;
-    vec3_t vFrom, vDest;
+void CG_MakeBulletHoleSound(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t *pPreTrace)
+{
+    int     iSurfType;
+    float   fVolume;
+    str     sSoundName;
+    vec3_t  vFrom, vDest;
     trace_t trace;
 
     if (pPreTrace) {
         trace = *pPreTrace;
-    }
-    else {
+    } else {
         VectorMA(i_vPos, 2.0f, i_vNorm, vFrom);
         VectorMA(i_vPos, -4.0f, i_vNorm, vDest);
-        CG_Trace(&trace, vFrom, vec_zero, vec_zero, vDest, ENTITYNUM_NONE, MASK_SHOT, qfalse, qtrue, "CG_MakeBulletHole");
+        CG_Trace(
+            &trace, vFrom, vec_zero, vec_zero, vDest, ENTITYNUM_NONE, MASK_SHOT, qfalse, qtrue, "CG_MakeBulletHole"
+        );
     }
 
     iSurfType = trace.surfaceFlags & MASK_SURF_TYPE;
@@ -82,7 +85,12 @@ void CG_MakeBulletHoleSound(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarg
         iSurfType = SURF_PUDDLE;
     }
 
-    if (trace.fraction == 1.0f || trace.startsolid || (trace.surfaceFlags & SURF_SKY)) {
+    if (trace.fraction == 1) {
+        // no reason to make a sound if it nothing was hit
+        return;
+    }
+
+    if ((trace.surfaceFlags & SURF_SKY) || !CG_CheckMakeMarkOnEntity(trace.entityNum)) {
         return;
     }
 
@@ -149,55 +157,58 @@ void CG_MakeBulletHoleSound(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarg
     commandManager.PlaySound(sSoundName, vFrom, -1, fVolume, -1.f, -1.f, 1);
 }
 
-static void CG_MakeBulletHoleType(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, int iEffectNum, float fRadius, qboolean bMakeSound) {
+static void CG_MakeBulletHoleType(
+    const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, int iEffectNum, float fRadius, qboolean bMakeSound
+)
+{
     if (bMakeSound) {
-        str sBulletHole = "snd_bh_";
+        str   sBulletHole = "snd_bh_";
         float fVolume;
 
         switch (iEffectNum) {
-        case 0:
+        case SFX_BHIT_PAPER_LITE:
             sBulletHole += "paper";
             break;
-        case 2:
+        case SFX_BHIT_WOOD_LITE:
             sBulletHole += "wood";
             break;
-        case 4:
+        case SFX_BHIT_METAL_LITE:
             sBulletHole += "metal";
             break;
-        case 6:
+        case SFX_BHIT_STONE_LITE:
             sBulletHole += "stone";
             break;
-        case 8:
+        case SFX_BHIT_DIRT_LITE:
             sBulletHole += "dirt";
             break;
-        case 10:
+        case SFX_BHIT_GRILL_LITE:
             sBulletHole += "grill";
             break;
-        case 12:
+        case SFX_BHIT_GRASS_LITE:
             sBulletHole += "grass";
             break;
-        case 14:
+        case SFX_BHIT_MUD_LITE:
             sBulletHole += "mud";
             break;
-        case 16:
+        case SFX_BHIT_PUDDLE_LITE:
             sBulletHole += "puddle";
             break;
-        case 18:
+        case SFX_BHIT_GLASS_LITE:
             sBulletHole += "glass";
             break;
-        case 20:
+        case SFX_BHIT_GRAVEL_LITE:
             sBulletHole += "gravel";
             break;
-        case 22:
+        case SFX_BHIT_SAND_LITE:
             sBulletHole += "sand";
             break;
-        case 24:
+        case SFX_BHIT_FOLIAGE_LITE:
             sBulletHole += "foliage";
             break;
-        case 26:
+        case SFX_BHIT_SNOW_LITE:
             sBulletHole += "snow";
             break;
-        case 28:
+        case SFX_BHIT_CARPET_LITE:
             sBulletHole += "carpet";
             break;
         default:
@@ -221,14 +232,15 @@ static void CG_MakeBulletHoleType(const vec3_t i_vPos, const vec3_t i_vNorm, int
     sfxManager.MakeEffect_Normal(iEffectNum, i_vPos, i_vNorm);
 }
 
-static void CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t *pPreTrace, qboolean bMakeSound)
+static void
+CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLarge, trace_t *pPreTrace, qboolean bMakeSound)
 {
-    int iSurfType;
-    int iEffect;
-    float fRadius;
-    str sEffectModel;
-    str sBulletHole;
-    vec3_t vFrom, vDest;
+    int     iSurfType;
+    int     iEffect;
+    float   fRadius;
+    str     sEffectModel;
+    str     sBulletHole;
+    vec3_t  vFrom, vDest;
     trace_t trace;
 
     if (pPreTrace) {
@@ -236,7 +248,9 @@ static void CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLa
     } else {
         VectorMA(i_vPos, 2.0f, i_vNorm, vFrom);
         VectorMA(i_vPos, -4.0f, i_vNorm, vDest);
-        CG_Trace(&trace, vFrom, vec_zero, vec_zero, vDest, ENTITYNUM_NONE, MASK_SHOT, qfalse, qtrue, "CG_MakeBulletHole");
+        CG_Trace(
+            &trace, vFrom, vec_zero, vec_zero, vDest, ENTITYNUM_NONE, MASK_SHOT, qfalse, qtrue, "CG_MakeBulletHole"
+        );
     }
 
     iSurfType = trace.surfaceFlags & MASK_SURF_TYPE;
@@ -244,12 +258,17 @@ static void CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLa
         iSurfType = SURF_PUDDLE;
     }
 
-    if (trace.fraction == 1.0f || trace.startsolid || (trace.surfaceFlags & SURF_SKY)) {
+    if (trace.fraction == 1.0f || trace.startsolid) {
+        return;
+    }
+
+    if (trace.surfaceFlags & SURF_SKY) {
+        // ignore sky surfaces
         return;
     }
 
     VectorAdd(trace.endpos, trace.plane.normal, vFrom);
-    fRadius = 2.0f;
+    fRadius     = 2.0f;
     sBulletHole = "bhole_";
 
     switch (iSurfType) {
@@ -259,7 +278,7 @@ static void CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLa
         break;
     case SURF_SNOW:
         sBulletHole += "snow";
-        iEffect = SFX_BHIT_FOLIAGE_LITE;
+        iEffect = SFX_BHIT_SNOW_LITE;
         break;
     case SURF_CARPET:
         sBulletHole += "carpet";
@@ -275,7 +294,7 @@ static void CG_MakeBulletHole(const vec3_t i_vPos, const vec3_t i_vNorm, int iLa
         break;
     case SURF_GLASS:
         sBulletHole += "glass";
-        iEffect = SFX_BHIT_GRASS_LITE;
+        iEffect = SFX_BHIT_GLASS_LITE;
         break;
     case SURF_GRAVEL:
         fRadius = 0.f;
@@ -347,36 +366,48 @@ static void CG_MakeBubbleTrail(const vec3_t i_vStart, const vec3_t i_vEnd, int i
 {
     vec3_t vDir;
     vec3_t vPos;
-    float fDist;
-    float fMove;
+    float  fDist;
+    float  fMove;
 
     VectorSubtract(i_vEnd, i_vStart, vDir);
     fDist = VectorNormalize(vDir);
     VectorCopy(i_vStart, vPos);
 
-    fMove = random() * 8.f;
+    fMove = random() * 8.f * alpha;
     fDist -= fMove;
     while (fDist > 0.f) {
         VectorMA(vPos, fMove, vDir, vPos);
-        sfxManager.MakeEffect_Angles(32, vPos, vec_zero);
+        sfxManager.MakeEffect_Angles(SFX_WATER_TRAIL_BUBBLE, vPos, vec_zero);
 
-        fMove = 16.f + crandom() * 8.f;
+        fMove = 16.f + crandom() * 8.f * alpha;
         fDist -= fMove;
     }
 }
 
-static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd)
+static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd, int iLarge, float alpha)
 {
-    int iLife;
-    int iTracerLength;
-    float fLength, fDist;
+    int    iLife;
+    int    iTracerLength;
+    float  fLength, fDist;
     vec4_t fTracerColor;
     vec3_t vDir, vNewStart;
+    float  alphaMult;
+    float  scale;
 
     iTracerLength = 450.0f + random() * 150.f;
     VectorSubtract(i_vEnd, i_vStart, vDir);
     fLength = VectorNormalize(vDir);
+
+    if (iLarge > 1) {
+        alphaMult = random() * 0.2f + 0.9f;
+        scale     = iLarge * 2;
+    } else {
+        alphaMult = 1;
+        scale     = 1;
+    }
+
     fDist = 450.0f + random() * 150.f;
+
     if (fLength < fDist + 150.f) {
         float fFrac;
 
@@ -384,13 +415,15 @@ static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd)
             return;
         }
 
-        fFrac = fLength / (fDist + 150.0);
+        fFrac         = fLength / (fDist + 150.0);
         iTracerLength = (int)((float)iTracerLength * fFrac + 0.5f);
         fDist *= fFrac;
     }
 
-    iLife = (int)((fLength - fDist) / 12000.f * 1000.f);
-    if (iLife < 20) iLife = 20;
+    iLife = (int)((fLength - fDist) / 12000.f * 1000.f / (alpha * alphaMult));
+    if (iLife < 20) {
+        iLife = 20;
+    }
 
     VectorMA(i_vStart, fDist, vDir, vNewStart);
     fTracerColor[0] = 1.f;
@@ -404,7 +437,7 @@ static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd)
         0,
         1,
         1.0,
-        1.0,
+        scale,
         BEAM_INVERTED,
         1000.0,
         iLife,
@@ -427,53 +460,55 @@ static void CG_BulletTracerEffect(const vec3_t i_vStart, const vec3_t i_vEnd)
 }
 
 static void CG_MakeBulletTracerInternal(
-    const vec3_t   i_vBarrel,
-    const vec3_t   i_vStart,
-    const vec3_t  *i_vEnd,
-    int            i_iNumBullets,
-    qboolean       iLarge,
-    int            iTracerVisible,
-    qboolean       bIgnoreEntities
+    const vec3_t  i_vBarrel,
+    const vec3_t  i_vStart,
+    const vec3_t *i_vEnd,
+    int           i_iNumBullets,
+    qboolean      iLarge,
+    int           iTracerVisible,
+    qboolean      bIgnoreEntities,
+    float         alpha
 )
 {
-    vec3_t vPos;
-    int iBullet;
-    int iContinueCount;
-    int iDist;
-    int iHeadDist;
-    int iTravelDist;
-    float fLen, fDist;
-    trace_t trace;
+    vec3_t   vPos;
+    int      iBullet;
+    int      iContinueCount;
+    int      iDist;
+    int      iHeadDist;
+    int      iTravelDist;
+    float    fLen, fDist;
+    trace_t  trace;
     qboolean bStartInWater, bInWater;
     qboolean bBulletDone;
     qboolean bMadeTracer;
-    vec3_t vDir;
-    vec3_t vTrailStart;
-    vec3_t vTraceStart;
-    vec3_t vTraceEnd;
-    vec3_t vTmp;
-    int iNumImpacts;
-    trace_t tImpacts[128];
-    float fImpSndDistRA;
-    static float fImpSndDistLA;
-    float fImpSndDistRB;
-    float fImpSndDistLB;
-    int iImpSndIndexRA;
-    int iImpSndIndexRB;
-    int iImpSndIndexLB;
-    float fVolume;
-    float fPitch;
-    float fZingDistA, fZingDistB, fZingDistC;
-    vec3_t vZingPosA, vZingPosB, vZingPosC;
+    vec3_t   vDir;
+    vec3_t   vTrailStart;
+    vec3_t   vTraceStart;
+    vec3_t   vTraceEnd;
+    vec3_t   vTmp;
+    int      iNumImpacts;
+    trace_t  tImpacts[128];
+    float    fImpSndDistRA;
+    float    fImpSndDistLA;
+    float    fImpSndDistRB;
+    float    fImpSndDistLB;
+    int      iImpSndIndexRA;
+    int      iImpSndIndexLA;
+    int      iImpSndIndexRB;
+    int      iImpSndIndexLB;
+    float    fVolume;
+    float    fPitch;
+    float    fZingDistA, fZingDistB, fZingDistC;
+    vec3_t   vZingPosA, vZingPosB, vZingPosC;
 
-    fZingDistB = 9999.0;
-    fZingDistA = 9999.0;
-    fZingDistC = 9999.0;
+    fZingDistB  = 9999.0;
+    fZingDistA  = 9999.0;
+    fZingDistC  = 9999.0;
     iNumImpacts = 0;
 
     // check to see if it starts in water
     bStartInWater = (cgi.CM_PointContents(i_vStart, 0) & CONTENTS_FLUID) != 0;
-    
+
     for (iBullet = 0; iBullet < i_iNumBullets; iBullet++) {
         bInWater = bStartInWater;
         VectorCopy(i_vBarrel, vTrailStart);
@@ -481,8 +516,8 @@ static void CG_MakeBulletTracerInternal(
         fLen = VectorNormalize(vDir);
 
         trace.fraction = 0;
-        iDist = (int)fLen + 32;
-        bBulletDone = qfalse;
+        iDist          = (int)fLen + 32;
+        bBulletDone    = qfalse;
         iContinueCount = 0;
 
         if (bStartInWater) {
@@ -501,8 +536,7 @@ static void CG_MakeBulletTracerInternal(
                 if (iDist > BULLET_TRAVEL_DIST) {
                     iTravelDist += BULLET_TRAVEL_DIST;
                     iDist -= BULLET_TRAVEL_DIST;
-                }
-                else {
+                } else {
                     iTravelDist += iDist;
                     iDist = 0;
                 }
@@ -513,16 +547,7 @@ static void CG_MakeBulletTracerInternal(
 
                 while (trace.fraction < 1) {
                     if (bIgnoreEntities) {
-                        cgi.CM_BoxTrace(
-                            &trace,
-                            vTraceStart,
-                            vTraceEnd,
-                            vec_zero,
-                            vec_zero,
-                            0,
-                            MASK_SHOT,
-                            qfalse
-                        );
+                        cgi.CM_BoxTrace(&trace, vTraceStart, vTraceEnd, vec_zero, vec_zero, 0, MASK_SHOT_FLUID, qfalse);
 
                         if (trace.fraction == 1.0f) {
                             trace.entityNum = ENTITYNUM_NONE;
@@ -533,8 +558,7 @@ static void CG_MakeBulletTracerInternal(
                         if (trace.startsolid) {
                             trace.entityNum = ENTITYNUM_WORLD;
                         }
-                    }
-                    else {
+                    } else {
                         CG_Trace(
                             &trace,
                             vTraceStart,
@@ -542,7 +566,7 @@ static void CG_MakeBulletTracerInternal(
                             vec_zero,
                             vTraceStart,
                             ENTITYNUM_NONE,
-                            MASK_SHOT,
+                            MASK_SHOT_FLUID,
                             qfalse,
                             qfalse,
                             "CG_MakeBulletTracerInternal"
@@ -552,52 +576,44 @@ static void CG_MakeBulletTracerInternal(
                     if (trace.contents & CONTENTS_FLUID) {
                         fDist = DotProduct(vDir, trace.plane.normal) * -2.0f;
                         VectorMA(vDir, fDist, trace.plane.normal, vTmp);
-                        VectorAdd(vTmp, vTmp, trace.plane.normal);
+                        VectorMA(trace.plane.normal, 2.0, vTmp, trace.plane.normal);
                         VectorNormalizeFast(trace.plane.normal);
                     }
 
-                    if (!bInWater && trace.fraction < 1.0f && iNumImpacts <= 127)
-                    {
+                    if (!bInWater && trace.fraction < 1.0f && iNumImpacts < ARRAY_LEN(tImpacts)) {
                         memcpy(&tImpacts[iNumImpacts], &trace, sizeof(trace_t));
                         iNumImpacts++;
                     }
 
-                    if (iTracerVisible && !bMadeTracer)
-                    {
-                        CG_BulletTracerEffect(vTrailStart, trace.endpos);
+                    if (iTracerVisible && !bMadeTracer) {
+                        CG_BulletTracerEffect(vTrailStart, trace.endpos, iLarge, alpha);
                         bMadeTracer = qtrue;
                     }
 
                     if (trace.fraction < 1.0f) {
-                        if (((trace.surfaceFlags & (SURF_HINT | SURF_NODLIGHT | SURF_SNOW | SURF_FOLIAGE | SURF_DIRT)) || (trace.contents & CONTENTS_WATER))
-                            && iContinueCount < 5)
-                        {
-                            if (bInWater)
-                            {
-                                VectorSubtract(trace.endpos, vDir, vTmp);
-                                if (!(trace.contents & CONTENTS_FLUID)
-                                    && !(trace.surfaceFlags & SURF_PUDDLE)
-                                    && !(cgi.CM_PointContents(vTmp, 0) & CONTENTS_FLUID))
-                                {
-                                    CG_MakeBubbleTrail(vTrailStart, trace.endpos, iLarge);
+                        if (((trace.surfaceFlags & (SURF_HINT | SURF_NODLIGHT | SURF_SNOW | SURF_FOLIAGE | SURF_DIRT))
+                             || (trace.contents & CONTENTS_WATER))
+                            && iContinueCount < 5) {
+                            if (bInWater) {
+                                VectorMA(trace.endpos, -1.0, vDir, vTmp);
+
+                                if (!(trace.contents & CONTENTS_FLUID) && !(trace.surfaceFlags & SURF_PUDDLE)
+                                    && !(cgi.CM_PointContents(vTmp, 0) & CONTENTS_FLUID)) {
+                                    CG_MakeBubbleTrail(vTrailStart, trace.endpos, iLarge, alpha);
                                     VectorCopy(trace.endpos, vTrailStart);
                                     bInWater = qfalse;
                                 }
-                            }
-                            else if ((trace.contents & CONTENTS_FLUID) || (trace.surfaceFlags & SURF_PUDDLE)) {
+                            } else if ((trace.contents & CONTENTS_FLUID) || (trace.surfaceFlags & SURF_PUDDLE)) {
                                 VectorCopy(trace.endpos, vTrailStart);
                                 bInWater = qtrue;
                             }
 
-                            VectorAdd(vDir, vDir, vTraceStart);
-                            VectorAdd(vTraceStart, vTraceStart, trace.endpos);
+                            VectorMA(trace.endpos, 2.0, vDir, vTraceStart);
 
                             iContinueCount++;
-                        }
-                        else
-                        {
+                        } else {
                             trace.fraction = 1.0f;
-                            bBulletDone = qtrue;
+                            bBulletDone    = qtrue;
                         }
                     }
                 }
@@ -605,14 +621,14 @@ static void CG_MakeBulletTracerInternal(
         }
 
         if (bInWater) {
-            CG_MakeBubbleTrail(vTraceStart, trace.endpos, iLarge);
+            CG_MakeBubbleTrail(vTraceStart, trace.endpos, iLarge, alpha);
         }
 
         if (iTracerVisible) {
             iTracerVisible--;
         }
 
-        fLen = ProjectPointOnLine(i_vStart, i_vEnd[iBullet], cg.SoundOrg, vPos);
+        fLen      = ProjectPointOnLine(i_vStart, i_vEnd[iBullet], cg.SoundOrg, vPos);
         iHeadDist = (int)Distance(vPos, cg.SoundOrg);
         if (iHeadDist > 255) {
             continue;
@@ -629,7 +645,7 @@ static void CG_MakeBulletTracerInternal(
 
         if (fLen < 0.f) {
             VectorCopy(i_vStart, vPos);
-        } else if(fDist >= fLen) {
+        } else if (fDist >= fLen) {
             VectorCopy(i_vEnd[iBullet], vPos);
         }
 
@@ -652,52 +668,48 @@ static void CG_MakeBulletTracerInternal(
     }
 
     if (iNumImpacts > 2) {
-        fImpSndDistRA = 9999.0f;
-        fImpSndDistRB = 9999.0f;
+        fImpSndDistRA  = 9999.0f;
+        fImpSndDistRB  = 9999.0f;
+        fImpSndDistLA  = 9999.0f;
+        fImpSndDistLB  = 9999.0f;
         iImpSndIndexRA = 0;
+        iImpSndIndexLA = 0;
         iImpSndIndexRB = 0;
-        fImpSndDistLB = 9999.0f;
         iImpSndIndexLB = 0;
 
         for (iBullet = 0; iBullet < iNumImpacts; iBullet++) {
             CG_MakeBulletHole(
-                tImpacts[iImpSndIndexLB].endpos,
-                tImpacts[iImpSndIndexLB].plane.normal,
-                iLarge,
-                &tImpacts[iImpSndIndexLB],
-                qfalse
+                tImpacts[iBullet].endpos, tImpacts[iBullet].plane.normal, iLarge, &tImpacts[iBullet], qfalse
             );
 
-            VectorSubtract(tImpacts[iImpSndIndexLB].endpos, cg.SoundOrg, vTmp);
+            VectorSubtract(tImpacts[iBullet].endpos, cg.SoundOrg, vTmp);
             iHeadDist = VectorLength(vTmp);
 
-            if (DotProduct(vTmp, cg.SoundAxis[1]) <= 0.f)
-            {
-                if (iHeadDist < 9999.0f || iHeadDist < fImpSndDistLB) {
-                    if (iHeadDist < 9999.0f) {
-                        fImpSndDistRA = iHeadDist;
-                        fImpSndDistLB = 9999.0;
+            if (DotProduct(vTmp, cg.SoundAxis[1]) <= 0.f) {
+                if (iHeadDist < fImpSndDistLA || iHeadDist < fImpSndDistLB) {
+                    if (iHeadDist < fImpSndDistLA) {
+                        iImpSndIndexLB = iImpSndIndexLA;
+                        fImpSndDistLB  = fImpSndDistLA;
                         iImpSndIndexRA = iBullet;
+                        fImpSndDistRA  = iHeadDist;
                     } else if (iHeadDist < fImpSndDistLB) {
-                        fImpSndDistLB = iHeadDist;
+                        iImpSndIndexLB = iBullet;
+                        fImpSndDistLB  = iHeadDist;
                     }
                 }
-            }
-            else
-            {
-                if (iHeadDist < fImpSndDistRA || iHeadDist < fImpSndDistRB)
-                {
+            } else {
+                if (iHeadDist < fImpSndDistRA || iHeadDist < fImpSndDistRB) {
                     if (iHeadDist < fImpSndDistRA) {
                         iImpSndIndexRB = iImpSndIndexRA;
+                        fImpSndDistRB  = fImpSndDistRA;
                         iImpSndIndexRA = iBullet;
+                        fImpSndDistRA  = iHeadDist;
                     } else if (iHeadDist < fImpSndDistRB) {
-                        fImpSndDistRB = iHeadDist;
                         iImpSndIndexRB = iBullet;
+                        fImpSndDistRB  = iHeadDist;
                     }
                 }
             }
-
-            iImpSndIndexLB++;
         }
 
         if (fImpSndDistRA < 9999.0f) {
@@ -717,14 +729,28 @@ static void CG_MakeBulletTracerInternal(
                 );
             }
         }
+
+        if (fImpSndDistLA < 9999.0f) {
+            CG_MakeBulletHoleSound(
+                tImpacts[iImpSndIndexLA].endpos,
+                tImpacts[iImpSndIndexLA].plane.normal,
+                iLarge,
+                &tImpacts[iImpSndIndexLA]
+            );
+
+            if (fImpSndDistLB < 9999.0f) {
+                CG_MakeBulletHoleSound(
+                    tImpacts[iImpSndIndexLB].endpos,
+                    tImpacts[iImpSndIndexLB].plane.normal,
+                    iLarge,
+                    &tImpacts[iImpSndIndexLB]
+                );
+            }
+        }
     } else {
         for (iBullet = 0; iBullet < iNumImpacts; iBullet++) {
             CG_MakeBulletHole(
-                tImpacts[iBullet].endpos,
-                tImpacts[iBullet].plane.normal,
-                iNumImpacts,
-                &tImpacts[iBullet],
-                qtrue
+                tImpacts[iBullet].endpos, tImpacts[iBullet].plane.normal, iNumImpacts, &tImpacts[iBullet], qtrue
             );
         }
     }
@@ -732,15 +758,21 @@ static void CG_MakeBulletTracerInternal(
     if (fZingDistA < 9999.0f) {
         if (iLarge) {
             fVolume = 1.0f;
-            fPitch = 0.8f;
+            fPitch  = 0.8f;
         } else {
             fVolume = 0.8f;
-            fPitch = 1.0f;
+            fPitch  = 1.0f;
         }
 
         commandManager.PlaySound("snd_b_zing", vZingPosA, -1, fVolume, -1.0f, fPitch, 1);
-        commandManager.PlaySound("snd_b_zing", vZingPosB, -1, fVolume, -1.0f, fPitch, 1);
-        commandManager.PlaySound("snd_b_zing", vZingPosC, -1, fVolume, -1.0f, fPitch, 1);
+
+        if (fZingDistB != 9999) {
+            commandManager.PlaySound("snd_b_zing", vZingPosB, -1, fVolume, -1.0f, fPitch, 1);
+
+            if (fZingDistC != 9999) {
+                commandManager.PlaySound("snd_b_zing", vZingPosC, -1, fVolume, -1.0f, fPitch, 1);
+            }
+        }
     }
 }
 
@@ -774,13 +806,14 @@ static void CG_MakeBulletTracer(
     bullet_tracer->i_vEnd        = &bullet_tracer_bullets[bullet_tracers_count];
     bullet_tracer->i_iNumBullets = i_iNumBullets;
 
-    for (i = 0; i < i_iNumBullets; ++i) {
-        bullet_tracer_bullets[bullet_tracers_count][0]   = (*i_vEnd)[i];
-        bullet_tracer_bullets[bullet_tracers_count][1]   = (*i_vEnd)[i + 1];
-        bullet_tracer_bullets[bullet_tracers_count++][2] = (*i_vEnd)[i + 2];
+    for (i = 0; i < i_iNumBullets; i++, bullet_tracers_count++) {
+        bullet_tracer_bullets[bullet_tracers_count][0] = i_vEnd[i][0];
+        bullet_tracer_bullets[bullet_tracers_count][1] = i_vEnd[i][1];
+        bullet_tracer_bullets[bullet_tracers_count][2] = i_vEnd[i][2];
     }
 
     bullet_tracer->iLarge          = iLarge;
+    bullet_tracer->alpha           = alpha;
     bullet_tracer->iTracerVisible  = iTracerVisible;
     bullet_tracer->bIgnoreEntities = bIgnoreEntities;
 }
@@ -797,7 +830,8 @@ void CG_AddBulletTracers()
             bullet_tracers[i].i_iNumBullets,
             bullet_tracers[i].iLarge,
             bullet_tracers[i].iTracerVisible,
-            bullet_tracers[i].bIgnoreEntities
+            bullet_tracers[i].bIgnoreEntities,
+            bullet_tracers[i].alpha
         );
     }
 
@@ -807,26 +841,24 @@ void CG_AddBulletTracers()
 
 void CG_AddBulletImpacts()
 {
-    int i;
-    int iHeadDist;
-    float fVolume;
-    float fImpSndDistRA;
+    int          i;
+    int          iHeadDist;
+    float        fVolume;
+    float        fImpSndDistRA;
     static float fImpSndDistLA = 9999.f;
-    float fImpSndDistRB;
-    float fImpSndDistLB;
-    int iImpSndIndexRA;
-    int iImpSndIndexRB;
-    int iImpSndIndexLB;
-    vec3_t vTmp;
-    str sSoundName;
+    float        fImpSndDistRB;
+    float        fImpSndDistLB;
+    int          iImpSndIndexRA;
+    int          iImpSndIndexRB;
+    int          iImpSndIndexLB;
+    vec3_t       vTmp;
+    str          sSoundName;
 
-    if (wall_impact_count)
-    {
-        if (wall_impact_count > 4)
-        {
-            fImpSndDistRA = fImpSndDistLA;
-            fImpSndDistRB = fImpSndDistLA;
-            fImpSndDistLB = fImpSndDistLA;
+    if (wall_impact_count) {
+        if (wall_impact_count > 4) {
+            fImpSndDistRA  = fImpSndDistLA;
+            fImpSndDistRB  = fImpSndDistLA;
+            fImpSndDistLB  = fImpSndDistLA;
             iImpSndIndexRA = 0;
             iImpSndIndexRB = 0;
             iImpSndIndexLB = 0;
@@ -834,33 +866,28 @@ void CG_AddBulletImpacts()
             for (i = 0; i < wall_impact_count; i++) {
                 VectorSubtract(wall_impact_pos[i], cg.SoundOrg, vTmp);
                 iHeadDist = VectorLength(vTmp);
-                
-                if (DotProduct(vTmp, cg.SoundAxis[1]) > 0.f)
-                {
-                    if (iHeadDist < fImpSndDistRA || iHeadDist < fImpSndDistRB)
-                    {
+
+                if (DotProduct(vTmp, cg.SoundAxis[1]) > 0.f) {
+                    if (iHeadDist < fImpSndDistRA || iHeadDist < fImpSndDistRB) {
                         if (iHeadDist < fImpSndDistRA) {
-                            fImpSndDistRB = fImpSndDistRA;
-                            fImpSndDistRA = iHeadDist;
+                            fImpSndDistRB  = fImpSndDistRA;
+                            fImpSndDistRA  = iHeadDist;
                             iImpSndIndexRB = iImpSndIndexRA;
                             iImpSndIndexRA = i;
                         } else if (iHeadDist < fImpSndDistRB) {
-                            fImpSndDistRB = iHeadDist;
+                            fImpSndDistRB  = iHeadDist;
                             iImpSndIndexRB = i;
                         }
                     }
-                }
-                else
-                {
-                    if (iHeadDist < fImpSndDistLA || iHeadDist < fImpSndDistLB)
-                    {
+                } else {
+                    if (iHeadDist < fImpSndDistLA || iHeadDist < fImpSndDistLB) {
                         if (iHeadDist < fImpSndDistLA) {
-                            fImpSndDistRA = iHeadDist;
-                            fImpSndDistLB = fImpSndDistLA;
+                            fImpSndDistRA  = iHeadDist;
+                            fImpSndDistLB  = fImpSndDistLA;
                             iImpSndIndexLB = 0;
                             iImpSndIndexRA = i;
                         } else if (iHeadDist < fImpSndDistLB) {
-                            fImpSndDistLB = iHeadDist;
+                            fImpSndDistLB  = iHeadDist;
                             iImpSndIndexLB = i;
                         }
                     }
@@ -868,14 +895,15 @@ void CG_AddBulletImpacts()
             }
 
             if (fImpSndDistRA < fImpSndDistLA) {
-                if (wall_impact_type[iImpSndIndexRA]) {
+                if (wall_impact_type[iImpSndIndexRA] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[iImpSndIndexRA]) {
                         fVolume = 1.f;
                     } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexRA] == 2 || wall_impact_type[iImpSndIndexRA] == 3) {
+                    if (wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_LITE
+                        || wall_impact_type[iImpSndIndexRA] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
                     } else {
                         sSoundName = "snd_bh_wood";
@@ -906,10 +934,10 @@ void CG_AddBulletImpacts()
                             fVolume = 0.75f;
                         }
 
-                        if (wall_impact_type[iImpSndIndexRB] == 2 || wall_impact_type[iImpSndIndexRB] == 3) {
+                        if (wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_LITE
+                            || wall_impact_type[iImpSndIndexRB] == SFX_BHIT_WOOD_HARD) {
                             sSoundName = "snd_bh_metal";
-                        }
-                        else {
+                        } else {
                             sSoundName = "snd_bh_wood";
                         }
 
@@ -933,51 +961,39 @@ void CG_AddBulletImpacts()
             }
 
             if (fImpSndDistLA > 9999.0f) {
-                if (wall_impact_type[0]) {
+                if (wall_impact_type[0] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[0]) {
                         fVolume = 1.f;
                     } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[0] == 2 || wall_impact_type[0] == 3) {
+                    if (wall_impact_type[0] == SFX_BHIT_WOOD_LITE || wall_impact_type[0] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
-                    }
-                    else {
+                    } else {
                         sSoundName = "snd_bh_wood";
                     }
 
                     commandManager.PlaySound(sSoundName, wall_impact_pos[0], -1, fVolume, -1, -1, 1);
 
-                    sfxManager.MakeEffect_Normal(
-                        wall_impact_type[0],
-                        wall_impact_pos[0],
-                        wall_impact_norm[0]
-                    );
+                    sfxManager.MakeEffect_Normal(wall_impact_type[0], wall_impact_pos[0], wall_impact_norm[0]);
                 } else {
-                    CG_MakeBulletHole(
-                        wall_impact_pos[0],
-                        wall_impact_norm[0],
-                        wall_impact_large[0],
-                        NULL,
-                        qtrue
-                    );
+                    CG_MakeBulletHole(wall_impact_pos[0], wall_impact_norm[0], wall_impact_large[0], NULL, qtrue);
                 }
             }
 
             if (fImpSndDistLB < fImpSndDistLA) {
-                if (wall_impact_type[iImpSndIndexLB]) {
+                if (wall_impact_type[iImpSndIndexLB] != SFX_BHIT_PAPER_LITE) {
                     if (wall_impact_large[iImpSndIndexLB]) {
                         fVolume = 1.f;
-                    }
-                    else {
+                    } else {
                         fVolume = 0.75f;
                     }
 
-                    if (wall_impact_type[iImpSndIndexLB] == 2 || wall_impact_type[iImpSndIndexLB] == 3) {
+                    if (wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_LITE
+                        || wall_impact_type[iImpSndIndexLB] == SFX_BHIT_WOOD_HARD) {
                         sSoundName = "snd_bh_metal";
-                    }
-                    else {
+                    } else {
                         sSoundName = "snd_bh_wood";
                     }
 
@@ -998,48 +1014,60 @@ void CG_AddBulletImpacts()
                     );
                 }
             }
-        }
-        else
-        {
+        } else {
             for (i = 0; i < wall_impact_count; i++) {
-                CG_MakeBulletHole(
-                    wall_impact_pos[i],
-                    wall_impact_norm[i],
-                    wall_impact_large[i],
-                    NULL,
-                    qtrue
-                );
+                CG_MakeBulletHole(wall_impact_pos[i], wall_impact_norm[i], wall_impact_large[i], NULL, qtrue);
             }
         }
 
         wall_impact_count = 0;
     }
 
-    if (flesh_impact_count)
-    {
-        if (flesh_impact_count > 1)
-        {
-            fImpSndDistRA = 9999.0;
+    if (flesh_impact_count) {
+        if (flesh_impact_count > 1) {
+            fImpSndDistRA  = 9999.0;
+            fImpSndDistRB  = 9999.0;
             iImpSndIndexRA = 0;
+            iImpSndIndexRB = 0;
 
             for (i = 0; i < flesh_impact_count; i++) {
-                VectorSubtract(wall_impact_pos[i], cg.SoundOrg, vTmp);
+                VectorSubtract(flesh_impact_pos[i], cg.SoundOrg, vTmp);
                 iHeadDist = VectorLength(vTmp);
-                
-                if (DotProduct(vTmp, cg.SoundAxis[1]) > 0.f)
-                {
-                    if (iHeadDist < fImpSndDistRA)
-                    {
-                        fImpSndDistRA = iHeadDist;
+
+                if (DotProduct(vTmp, cg.SoundAxis[1]) > 0.f) {
+                    if (iHeadDist < fImpSndDistRB) {
+                        fImpSndDistRA  = iHeadDist;
                         iImpSndIndexRA = i;
                     }
-                }
-                else if (iHeadDist < fImpSndDistLA)
-                {
-                    fImpSndDistRA = iHeadDist;
+                } else if (iHeadDist < fImpSndDistLA) {
+                    fImpSndDistRA  = iHeadDist;
                     iImpSndIndexRA = i;
                 }
             }
+
+            if (fImpSndDistRA < 9999) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[iImpSndIndexRA] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[iImpSndIndexRA],
+                    flesh_impact_norm[iImpSndIndexRA]
+                );
+            }
+
+            if (fImpSndDistRB < 9999) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[iImpSndIndexRB] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[iImpSndIndexRB],
+                    flesh_impact_norm[iImpSndIndexRB]
+                );
+            }
+        } else {
+            for (i = 0; i < flesh_impact_count; i++) {
+                sfxManager.MakeEffect_Normal(
+                    flesh_impact_large[i] ? SFX_BHIT_HUMAN_UNIFORM_HARD : SFX_BHIT_HUMAN_UNIFORM_LITE,
+                    flesh_impact_pos[i],
+                    flesh_impact_norm[i]
+                );
+            }
         }
 
         flesh_impact_count = 0;
@@ -1068,22 +1096,33 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         return;
     }
 
-    switch (iType) {
-    case 13:
-        iBaseEffect = SFX_EXP_GREN_BASE;
-        break;
-    case 14:
-        iBaseEffect = SFX_EXP_BAZOOKA_BASE;
-        break;
-    case 15:
-        iBaseEffect = SFX_EXP_HEAVYSHELL_BASE;
-        break;
-    case 16:
-        iBaseEffect = SFX_EXP_TANK_BASE;
-        break;
-    default:
-        iBaseEffect = SFX_EXP_GREN_BASE;
-        break;
+    if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        switch (iType) {
+        case CGM_EXPLOSION_EFFECT_1:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        case CGM_EXPLOSION_EFFECT_2:
+            iBaseEffect = SFX_EXP_BAZOOKA_BASE;
+            break;
+        case CGM_EXPLOSION_EFFECT_3:
+            iBaseEffect = SFX_EXP_HEAVYSHELL_BASE;
+            break;
+        case CGM_EXPLOSION_EFFECT_4:
+            iBaseEffect = SFX_EXP_TANK_BASE;
+            break;
+        default:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        }
+    } else {
+        switch (iType) {
+        case CGM6_EXPLOSION_EFFECT_2:
+            iBaseEffect = SFX_EXP_BAZOOKA_BASE;
+            break;
+        default:
+            iBaseEffect = SFX_EXP_GREN_BASE;
+            break;
+        }
     }
 
     CG_Trace(
@@ -1105,24 +1144,27 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         fRadius     = 0;
         break;
     case SURF_SNOW:
-        switch (iBaseEffect)
-        {
+        switch (iBaseEffect) {
         case SFX_EXP_TANK_BASE:
             iSurfEffect = SFX_EXP_TANK_SNOW;
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_SNOW;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_SNOW;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_SNOW;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
-        fRadius     = 0;
+        fRadius = 0;
         break;
     case SURF_CARPET:
         iSurfEffect = SFX_EXP_GREN_CARPET;
@@ -1147,32 +1189,34 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         fRadius     = 0;
         break;
     case SURF_DIRT:
-        switch (iBaseEffect)
-        {
+        switch (iBaseEffect) {
         case SFX_EXP_TANK_BASE:
             iSurfEffect = SFX_EXP_TANK_DIRT;
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_DIRT;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_DIRT;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_DIRT;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
-        fRadius     = 0;
+        fRadius = 0;
         break;
     case SURF_GRILL:
         iSurfEffect = SFX_EXP_GREN_GRILL;
         fRadius     = 0;
         break;
     case SURF_GRASS:
-        switch (iBaseEffect)
-        {
+        switch (iBaseEffect) {
         case SFX_EXP_TANK_BASE:
             iSurfEffect = SFX_EXP_TANK_DIRT;
             break;
@@ -1184,27 +1228,32 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_GRASS;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         fRadius = 0;
         break;
     case SURF_ROCK:
-        switch (iBaseEffect)
-        {
+        switch (iBaseEffect) {
         case SFX_EXP_TANK_BASE:
             iSurfEffect = SFX_EXP_TANK_STONE;
             break;
         case SFX_EXP_BAZOOKA_BASE:
             iSurfEffect = SFX_EXP_BAZOOKA_STONE;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
             iSurfEffect = SFX_EXP_HEAVYSHELL_STONE;
             break;
         default:
             iSurfEffect = SFX_EXP_GREN_STONE;
-            iBaseEffect = -1;
+            if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+                iBaseEffect = -1;
+            }
             break;
         }
         break;
@@ -1252,7 +1301,9 @@ void CG_MakeExplosionEffect(const vec3_t vPos, int iType)
         );
     }
 
-    sfxManager.MakeEffect_Normal(iBaseEffect, vEnd, trace.plane.normal);
+    if (iBaseEffect != -1) {
+        sfxManager.MakeEffect_Normal(iBaseEffect, vEnd, trace.plane.normal);
+    }
 }
 
 void CG_MakeVehicleEffect(vec3_t i_vStart, vec3_t i_vEnd, vec3_t i_vDir)
@@ -1288,10 +1339,10 @@ void CG_ParseCGMessage_ver_15()
         iType = cgi.MSG_ReadBits(6);
 
         switch (iType) {
-        case 1:
-        case 2:
-        case 5:
-            if (iType == 1) {
+        case CGM_BULLET_1:
+        case CGM_BULLET_2:
+        case CGM_BULLET_5:
+            if (iType == CGM_BULLET_1) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1300,7 +1351,7 @@ void CG_ParseCGMessage_ver_15()
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
 
-            if (iType != 1) {
+            if (iType != CGM_BULLET_1) {
                 vTmp[0] = vStart[0];
                 vTmp[1] = vStart[1];
                 vTmp[2] = vStart[2];
@@ -1320,18 +1371,18 @@ void CG_ParseCGMessage_ver_15()
                 alpha = 1.0f;
             }
 
-            if (iType == 1) {
-                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
-            } else if (iType == 2) {
+            if (iType == CGM_BULLET_1) {
+                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue, alpha);
+            } else if (iType == CGM_BULLET_2) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
             } else {
                 CG_MakeBubbleTrail(vStart, vEndArray[0], iLarge, alpha);
             }
 
             break;
-        case 3:
-        case 4:
-            if (iType == 3) {
+        case CGM_BULLET_3:
+        case CGM_BULLET_4:
+            if (iType == CGM_BULLET_3) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1365,12 +1416,12 @@ void CG_ParseCGMessage_ver_15()
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, iCount, iLarge, iInfo, qtrue, alpha);
             }
             break;
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
-        case 11:
+        case CGM_BULLET_6:
+        case CGM_BULLET_7:
+        case CGM_BULLET_8:
+        case CGM_BULLET_9:
+        case CGM_BULLET_10:
+        case CGM_BULLET_11:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1378,7 +1429,7 @@ void CG_ParseCGMessage_ver_15()
             iLarge = cgi.MSG_ReadBits(2);
 
             switch (iType) {
-            case 6:
+            case CGM_BULLET_6:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
@@ -1387,16 +1438,16 @@ void CG_ParseCGMessage_ver_15()
                     wall_impact_count++;
                 }
                 break;
-            case 7:
+            case CGM_BULLET_7:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 6;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_STONE_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 8:
+            case CGM_BULLET_8:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1406,7 +1457,7 @@ void CG_ParseCGMessage_ver_15()
                     flesh_impact_count++;
                 }
                 break;
-            case 9:
+            case CGM_BULLET_9:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1416,21 +1467,21 @@ void CG_ParseCGMessage_ver_15()
                     flesh_impact_count++;
                 }
                 break;
-            case 10:
+            case CGM_BULLET_10:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 2;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_WOOD_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 11:
+            case CGM_BULLET_11:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 4;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_METAL_LITE;
                     wall_impact_count++;
                 }
                 break;
@@ -1439,7 +1490,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 12:
+        case CGM_MELEE_IMPACT:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1448,33 +1499,33 @@ void CG_ParseCGMessage_ver_15()
             vEnd[2]   = cgi.MSG_ReadCoord();
             CG_MeleeImpact(vStart, vEnd);
             break;
-        case 13:
-        case 14:
-        case 15:
-        case 16:
+        case CGM_EXPLOSION_EFFECT_1:
+        case CGM_EXPLOSION_EFFECT_2:
+        case CGM_EXPLOSION_EFFECT_3:
+        case CGM_EXPLOSION_EFFECT_4:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             CG_MakeExplosionEffect(vStart, iType);
             break;
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
+        case CGM_MAKE_EFFECT_1:
+        case CGM_MAKE_EFFECT_2:
+        case CGM_MAKE_EFFECT_3:
+        case CGM_MAKE_EFFECT_4:
+        case CGM_MAKE_EFFECT_5:
+        case CGM_MAKE_EFFECT_6:
+        case CGM_MAKE_EFFECT_7:
+        case CGM_MAKE_EFFECT_8:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(iType + SFX_EXP_GREN_PUDDLE, vStart, vEnd);
+            sfxManager.MakeEffect_Normal((iType - CGM_MAKE_EFFECT_1) + SFX_OIL_LEAK_BIG, vStart, vEnd);
             break;
 
-        case 26:
-        case 27:
+        case CGM_MAKE_CRATE_DEBRIS:
+        case CGM_MAKE_WINDOW_DEBRIS:
             {
                 str    sEffect;
                 char   cTmp[8];
@@ -1487,7 +1538,7 @@ void CG_ParseCGMessage_ver_15()
                 // get the integer as string
                 snprintf(cTmp, sizeof(cTmp), "%d", iLarge);
 
-                if (iType == 26) {
+                if (iType == CGM_MAKE_CRATE_DEBRIS) {
                     sEffect = "models/fx/crates/debris_";
                 } else {
                     sEffect = "models/fx/windows/debris_";
@@ -1504,7 +1555,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 28:
+        case CGM_BULLET_NO_BARREL_1:
             vTmp[0]         = cgi.MSG_ReadCoord();
             vTmp[1]         = cgi.MSG_ReadCoord();
             vTmp[2]         = cgi.MSG_ReadCoord();
@@ -1515,6 +1566,7 @@ void CG_ParseCGMessage_ver_15()
             vEndArray[0][1] = cgi.MSG_ReadCoord();
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(2);
+
             if (cgi.MSG_ReadBits(1)) {
                 int iAlpha = cgi.MSG_ReadBits(10);
                 alpha      = (float)iAlpha / 512.0;
@@ -1528,7 +1580,7 @@ void CG_ParseCGMessage_ver_15()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue, alpha);
             break;
 
-        case 29:
+        case CGM_BULLET_NO_BARREL_2:
             memset(vTmp, 0, sizeof(vTmp));
             vStart[0]       = cgi.MSG_ReadCoord();
             vStart[1]       = cgi.MSG_ReadCoord();
@@ -1537,6 +1589,7 @@ void CG_ParseCGMessage_ver_15()
             vEndArray[0][1] = cgi.MSG_ReadCoord();
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(1);
+
             if (cgi.MSG_ReadBits(1)) {
                 int iAlpha = cgi.MSG_ReadBits(10);
                 alpha      = (float)iAlpha / 512.0;
@@ -1550,9 +1603,13 @@ void CG_ParseCGMessage_ver_15()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue, alpha);
             break;
 
-        case 30:
+        case CGM_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].shaderName,
+                cgi.MSG_ReadString(),
+                sizeof(cgi.HudDrawElements[iInfo].shaderName)
+            );
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -1560,13 +1617,13 @@ void CG_ParseCGMessage_ver_15()
             CG_HudDrawShader(iInfo);
             break;
 
-        case 31:
+        case CGM_HUDDRAW_ALIGN:
             iInfo                                       = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iHorizontalAlign = cgi.MSG_ReadBits(2);
             cgi.HudDrawElements[iInfo].iVerticalAlign   = cgi.MSG_ReadBits(2);
             break;
 
-        case 32:
+        case CGM_HUDDRAW_RECT:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iX      = cgi.MSG_ReadShort();
             cgi.HudDrawElements[iInfo].iY      = cgi.MSG_ReadShort();
@@ -1574,46 +1631,52 @@ void CG_ParseCGMessage_ver_15()
             cgi.HudDrawElements[iInfo].iHeight = cgi.MSG_ReadShort();
             break;
 
-        case 33:
+        case CGM_HUDDRAW_VIRTUALSIZE:
             iInfo                                     = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].bVirtualScreen = cgi.MSG_ReadBits(1);
             break;
 
-        case 34:
+        case CGM_HUDDRAW_COLOR:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[0] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[1] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[2] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 35:
+        case CGM_HUDDRAW_ALPHA:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[3] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 36:
+        case CGM_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string)
+            );
             break;
 
-        case 37:
+        case CGM_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName)
+            );
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
             CG_HudDrawFont(iInfo);
             break;
 
-        case 38:
-        case 39:
-            {
-                int iOldEnt;
+        case CGM_NOTIFY_HIT:
+        case CGM_NOTIFY_KILL:
+            if (cg.snap) {
+                const char *soundName;
+                int         iOldEnt;
+
+                iOldEnt = current_entity_number;
 
-                iOldEnt               = current_entity_number;
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == 36) {
+                if (iType == CGM_NOTIFY_KILL) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
                     commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
@@ -1623,7 +1686,7 @@ void CG_ParseCGMessage_ver_15()
             }
             break;
 
-        case 40:
+        case CGM_VOICE_CHAT:
             {
                 int iOldEnt;
 
@@ -1639,29 +1702,58 @@ void CG_ParseCGMessage_ver_15()
                 if (iLarge) {
                     current_entity_number = iInfo;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 0);
-                } else {
+                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 0);
+                } else if (cg.snap) {
                     current_entity_number = cg.snap->ps.clientNum;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 1);
+                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 1);
                 }
 
+                CG_RadarClientSpeaks(iInfo);
                 current_entity_number = iOldEnt;
             }
             break;
-        case 41:
-            vStart[0] = cgi.MSG_ReadCoord();
-            vStart[1] = cgi.MSG_ReadCoord();
-            vStart[2] = cgi.MSG_ReadCoord();
-            vEnd[0]   = cgi.MSG_ReadCoord();
-            vEnd[1]   = cgi.MSG_ReadCoord();
-            vEnd[2]   = cgi.MSG_ReadCoord();
-            cgi.MSG_ReadByte();
-            cgi.MSG_ReadByte();
-            VectorSubtract(vEnd, vStart, vTmp);
+        case CGM_FENCEPOST:
+            {
+                int    iHalf;
+                vec3_t vForward, vRight, vUp;
+                float  fLength;
 
-            // FIXME: unimplemented
-            // ?? can't figure out what is this
+                vStart[0] = cgi.MSG_ReadCoord();
+                vStart[1] = cgi.MSG_ReadCoord();
+                vStart[2] = cgi.MSG_ReadCoord();
+                vEnd[0]   = cgi.MSG_ReadCoord();
+                vEnd[1]   = cgi.MSG_ReadCoord();
+                vEnd[2]   = cgi.MSG_ReadCoord();
+                iHalf     = cgi.MSG_ReadByte();
+                cgi.MSG_ReadByte();
+
+                VectorSubtract(vEnd, vStart, vForward);
+                fLength = VectorNormalize(vForward);
+                iCount  = fLength / 2.0;
+
+                MakeNormalVectors(vForward, vRight, vUp);
+
+                for (i = 0; i < iCount; i++) {
+                    vec3_t vOrg;
+                    vec3_t vNormal;
+
+                    VectorCopy(vStart, vOrg);
+
+                    VectorMA(vOrg, random(), vForward, vOrg);
+                    VectorMA(vOrg, crandom() * iHalf, vRight, vOrg);
+                    VectorMA(vOrg, crandom() * iHalf, vUp, vOrg);
+
+                    //
+                    // Spawn the fence wood effect
+                    //
+
+                    VectorSubtract(vStart, vOrg, vNormal);
+                    VectorNormalize(vNormal);
+
+                    sfxManager.MakeEffect_Normal(SFX_FENCE_WOOD, vOrg, vNormal);
+                }
+            }
             break;
         default:
             cgi.Error(ERR_DROP, "CG_ParseCGMessage: Unknown CGM message type");
@@ -1688,10 +1780,10 @@ void CG_ParseCGMessage_ver_6()
         iType = cgi.MSG_ReadBits(6);
 
         switch (iType) {
-        case 1:
-        case 2:
-        case 5:
-            if (iType == 1) {
+        case CGM6_BULLET_1:
+        case CGM6_BULLET_2:
+        case CGM6_BULLET_5:
+            if (iType == CGM6_BULLET_1) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1700,7 +1792,7 @@ void CG_ParseCGMessage_ver_6()
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
 
-            if (iType != 1) {
+            if (iType != CGM6_BULLET_1) {
                 vTmp[0] = vStart[0];
                 vTmp[1] = vStart[1];
                 vTmp[2] = vStart[2];
@@ -1711,18 +1803,18 @@ void CG_ParseCGMessage_ver_6()
             vEndArray[0][2] = cgi.MSG_ReadCoord();
             iLarge          = cgi.MSG_ReadBits(1);
 
-            if (iType == 1) {
-                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
-            } else if (iType == 2) {
+            if (iType == CGM6_BULLET_1) {
+                CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue);
+            } else if (iType == CGM6_BULLET_2) {
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
             } else {
                 CG_MakeBubbleTrail(vStart, vEndArray[0], iLarge);
             }
 
             break;
-        case 3:
-        case 4:
-            if (iType == 3) {
+        case CGM6_BULLET_3:
+        case CGM6_BULLET_4:
+            if (iType == CGM6_BULLET_3) {
                 vTmp[0] = cgi.MSG_ReadCoord();
                 vTmp[1] = cgi.MSG_ReadCoord();
                 vTmp[2] = cgi.MSG_ReadCoord();
@@ -1746,11 +1838,11 @@ void CG_ParseCGMessage_ver_6()
                 CG_MakeBulletTracer(vTmp, vStart, vEndArray, iCount, iLarge, iInfo, qtrue);
             }
             break;
-        case 6:
-        case 7:
-        case 8:
-        case 9:
-        case 10:
+        case CGM6_BULLET_6:
+        case CGM6_BULLET_7:
+        case CGM6_BULLET_8:
+        case CGM6_BULLET_9:
+        case CGM6_BULLET_10:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1758,16 +1850,16 @@ void CG_ParseCGMessage_ver_6()
             iLarge = cgi.MSG_ReadBits(1);
 
             switch (iType) {
-            case 6:
+            case CGM6_BULLET_6:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = 0;
+                    wall_impact_type[wall_impact_count]  = SFX_BHIT_PAPER_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 7:
+            case CGM6_BULLET_7:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1777,7 +1869,7 @@ void CG_ParseCGMessage_ver_6()
                     flesh_impact_count++;
                 }
                 break;
-            case 8:
+            case CGM6_BULLET_8:
                 if (flesh_impact_count < MAX_IMPACTS) {
                     // negative
                     VectorNegate(vEnd, vEnd);
@@ -1787,21 +1879,21 @@ void CG_ParseCGMessage_ver_6()
                     flesh_impact_count++;
                 }
                 break;
-            case 9:
+            case CGM6_BULLET_9:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = (iLarge != 0) + 2;
+                    wall_impact_type[wall_impact_count]  = iLarge ? SFX_BHIT_WOOD_HARD : SFX_BHIT_WOOD_LITE;
                     wall_impact_count++;
                 }
                 break;
-            case 10:
+            case CGM6_BULLET_10:
                 if (wall_impact_count < MAX_IMPACTS) {
                     VectorCopy(vStart, wall_impact_pos[wall_impact_count]);
                     VectorCopy(vEnd, wall_impact_norm[wall_impact_count]);
                     wall_impact_large[wall_impact_count] = iLarge;
-                    wall_impact_type[wall_impact_count]  = (iLarge != 0) + 4;
+                    wall_impact_type[wall_impact_count]  = iLarge ? SFX_BHIT_METAL_HARD : SFX_BHIT_METAL_LITE;
                     wall_impact_count++;
                 }
                 break;
@@ -1810,7 +1902,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 11:
+        case CGM6_MELEE_IMPACT:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
@@ -1819,31 +1911,31 @@ void CG_ParseCGMessage_ver_6()
             vEnd[2]   = cgi.MSG_ReadCoord();
             CG_MeleeImpact(vStart, vEnd);
             break;
-        case 12:
-        case 13:
+        case CGM6_EXPLOSION_EFFECT_1:
+        case CGM6_EXPLOSION_EFFECT_2:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             CG_MakeExplosionEffect(vStart, iType);
             break;
-        case 15:
-        case 16:
-        case 17:
-        case 18:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
+        case CGM6_MAKE_EFFECT_1:
+        case CGM6_MAKE_EFFECT_2:
+        case CGM6_MAKE_EFFECT_3:
+        case CGM6_MAKE_EFFECT_4:
+        case CGM6_MAKE_EFFECT_5:
+        case CGM6_MAKE_EFFECT_6:
+        case CGM6_MAKE_EFFECT_7:
+        case CGM6_MAKE_EFFECT_8:
             vStart[0] = cgi.MSG_ReadCoord();
             vStart[1] = cgi.MSG_ReadCoord();
             vStart[2] = cgi.MSG_ReadCoord();
             cgi.MSG_ReadDir(vEnd);
 
-            sfxManager.MakeEffect_Normal(iType + SFX_EXP_GREN_PUDDLE, vStart, vEnd);
+            sfxManager.MakeEffect_Normal((iType - CGM6_MAKE_EFFECT_1) + SFX_OIL_LEAK_BIG, vStart, vEnd);
             break;
 
-        case 23:
-        case 24:
+        case CGM6_MAKE_CRATE_DEBRIS:
+        case CGM6_MAKE_WINDOW_DEBRIS:
             {
                 str    sEffect;
                 char   cTmp[8];
@@ -1856,7 +1948,7 @@ void CG_ParseCGMessage_ver_6()
                 // get the integer as string
                 snprintf(cTmp, sizeof(cTmp), "%d", iLarge);
 
-                if (iType == 23) {
+                if (iType == CGM6_MAKE_CRATE_DEBRIS) {
                     sEffect = "models/fx/crates/debris_";
                 } else {
                     sEffect = "models/fx/windows/debris_";
@@ -1873,7 +1965,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 25:
+        case CGM6_BULLET_NO_BARREL_1:
             vTmp[0]         = cgi.MSG_ReadCoord();
             vTmp[1]         = cgi.MSG_ReadCoord();
             vTmp[2]         = cgi.MSG_ReadCoord();
@@ -1888,7 +1980,7 @@ void CG_ParseCGMessage_ver_6()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qtrue, qtrue);
             break;
 
-        case 26:
+        case CGM6_BULLET_NO_BARREL_2:
             memset(vTmp, 0, sizeof(vTmp));
             vStart[0]       = cgi.MSG_ReadCoord();
             vStart[1]       = cgi.MSG_ReadCoord();
@@ -1901,9 +1993,13 @@ void CG_ParseCGMessage_ver_6()
             CG_MakeBulletTracer(vTmp, vStart, vEndArray, 1, iLarge, qfalse, qtrue);
             break;
 
-        case 27:
+        case CGM6_HUDDRAW_SHADER:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].shaderName, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].shaderName,
+                cgi.MSG_ReadString(),
+                sizeof(cgi.HudDrawElements[iInfo].shaderName)
+            );
             cgi.HudDrawElements[iInfo].string[0]   = 0;
             cgi.HudDrawElements[iInfo].pFont       = NULL;
             cgi.HudDrawElements[iInfo].fontName[0] = 0;
@@ -1911,13 +2007,13 @@ void CG_ParseCGMessage_ver_6()
             CG_HudDrawShader(iInfo);
             break;
 
-        case 28:
+        case CGM6_HUDDRAW_ALIGN:
             iInfo                                       = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iHorizontalAlign = cgi.MSG_ReadBits(2);
             cgi.HudDrawElements[iInfo].iVerticalAlign   = cgi.MSG_ReadBits(2);
             break;
 
-        case 29:
+        case CGM6_HUDDRAW_RECT:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].iX      = cgi.MSG_ReadShort();
             cgi.HudDrawElements[iInfo].iY      = cgi.MSG_ReadShort();
@@ -1925,46 +2021,51 @@ void CG_ParseCGMessage_ver_6()
             cgi.HudDrawElements[iInfo].iHeight = cgi.MSG_ReadShort();
             break;
 
-        case 30:
+        case CGM6_HUDDRAW_VIRTUALSIZE:
             iInfo                                     = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].bVirtualScreen = cgi.MSG_ReadBits(1);
             break;
 
-        case 31:
+        case CGM6_HUDDRAW_COLOR:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[0] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[1] = cgi.MSG_ReadByte() / 255.0;
             cgi.HudDrawElements[iInfo].vColor[2] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 32:
+        case CGM6_HUDDRAW_ALPHA:
             iInfo                                = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].vColor[3] = cgi.MSG_ReadByte() / 255.0;
             break;
 
-        case 33:
+        case CGM6_HUDDRAW_STRING:
             iInfo                              = cgi.MSG_ReadByte();
             cgi.HudDrawElements[iInfo].hShader = 0;
-            strcpy(cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].string, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].string)
+            );
             break;
 
-        case 34:
+        case CGM6_HUDDRAW_FONT:
             iInfo = cgi.MSG_ReadByte();
-            strcpy(cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString());
+            Q_strncpyz(
+                cgi.HudDrawElements[iInfo].fontName, cgi.MSG_ReadString(), sizeof(cgi.HudDrawElements[iInfo].fontName)
+            );
             cgi.HudDrawElements[iInfo].hShader       = 0;
             cgi.HudDrawElements[iInfo].shaderName[0] = 0;
             // load the font
             CG_HudDrawFont(iInfo);
             break;
 
-        case 35:
-        case 36:
-            {
+        case CGM6_NOTIFY_HIT:
+        case CGM6_NOTIFY_KILL:
+            if (cg.snap) {
                 int iOldEnt;
 
-                iOldEnt               = current_entity_number;
+                iOldEnt = current_entity_number;
+
                 current_entity_number = cg.snap->ps.clientNum;
-                if (iType == 36) {
+                if (iType == CGM6_NOTIFY_KILL) {
                     commandManager.PlaySound("dm_kill_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
                 } else {
                     commandManager.PlaySound("dm_hit_notify", NULL, CHAN_LOCAL, 2.0, -1, -1, 1);
@@ -1974,7 +2075,7 @@ void CG_ParseCGMessage_ver_6()
             }
             break;
 
-        case 37:
+        case CGM6_VOICE_CHAT:
             {
                 int iOldEnt;
 
@@ -1991,10 +2092,10 @@ void CG_ParseCGMessage_ver_6()
                     current_entity_number = iInfo;
 
                     commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 0);
-                } else {
+                } else if (cg.snap) {
                     current_entity_number = cg.snap->ps.clientNum;
 
-                    commandManager.PlaySound(szTmp, vStart, CHAN_AUTO, -1, -1, -1, 1);
+                    commandManager.PlaySound(szTmp, vStart, CHAN_LOCAL, -1, -1, -1, 1);
                 }
 
                 current_entity_number = iOldEnt;
diff --git a/code/cgame/cg_predict.c b/code/cgame/cg_predict.c
index 7fc43553..4eeb4ac1 100644
--- a/code/cgame/cg_predict.c
+++ b/code/cgame/cg_predict.c
@@ -25,6 +25,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // interpolating between snapshots from the server or locally predicting
 // ahead the client's movement. It also handles local physics interaction,
 // like fragments bouncing off walls
+//
+// ADDITIONS:
+// - CG_InterpolatePlayerState() footer: Interpolate the lean angles
 
 #include "cg_local.h"
 
@@ -187,8 +190,9 @@ void CG_ShowTrace(trace_t *trace, int passent, const char *reason)
     assert(reason);
     assert(trace);
 
-    sprintf(
+    Com_sprintf(
         text,
+        sizeof(text),
         "%0.2f : Pass (%d) Frac %f Hit (%d): '%s'\n",
         (float)cg.time / 1000.0f,
         passent,
@@ -326,8 +330,18 @@ static void CG_InterpolatePlayerStateCamera(void)
     //
     VectorCopy(cg.predicted_player_state.camera_angles, cg.camera_angles);
     VectorCopy(cg.predicted_player_state.camera_origin, cg.camera_origin);
-    cg.camera_fov = cg.predicted_player_state.fov;
 
+    //
+    // Added in OPM
+    //  Use the specified fov specified by the server
+    //  when zooming
+    //
+    if (cg.predicted_player_state.stats[STAT_INZOOM]) {
+        cg.camera_fov = cg.predicted_player_state.fov;
+    } else {
+        cg.camera_fov = cg_fov->value;
+    }
+    
     // if the next frame is a teleport, we can't lerp to it
     if (cg.nextFrameCameraCut) {
         return;
@@ -339,13 +353,24 @@ static void CG_InterpolatePlayerStateCamera(void)
 
     f = (float)(cg.time - prev->serverTime) / (next->serverTime - prev->serverTime);
 
-    // interpolate fov
-    cg.camera_fov = prev->ps.fov + f * (next->ps.fov - prev->ps.fov);
+    if (cg.predicted_player_state.stats[STAT_INZOOM]) {
+        // interpolate fov
+        cg.camera_fov = prev->ps.fov + f * (next->ps.fov - prev->ps.fov);
+    } else {
+        cg.camera_fov = cg_fov->value;
+    }
 
     if (!(cg.snap->ps.pm_flags & PMF_CAMERA_VIEW)) {
         return;
     }
 
+    // Added in 2.0
+    if (cg.predicted_player_state.camera_flags & CF_CAMERA_ANGLES_TURRETMODE) {
+        VectorCopy(cg.nextSnap->ps.camera_origin, cg.camera_origin);
+        VectorCopy(cg.nextSnap->ps.camera_angles, cg.camera_angles);
+        return;
+    }
+
     for (i = 0; i < 3; i++) {
         cg.camera_origin[i] = prev->ps.camera_origin[i] + f * (next->ps.camera_origin[i] - prev->ps.camera_origin[i]);
         cg.camera_angles[i] = LerpAngle(prev->ps.camera_angles[i], next->ps.camera_angles[i], f);
@@ -405,6 +430,9 @@ static void CG_InterpolatePlayerState(qboolean grabAngles)
         }
         out->velocity[i] = prev->ps.velocity[i] + f * (next->ps.velocity[i] - prev->ps.velocity[i]);
     }
+
+    // interpolate the lean angle
+    out->fLeanAngle = LerpAngle(prev->ps.fLeanAngle, next->ps.fLeanAngle, f);
 }
 
 /*
@@ -487,8 +515,13 @@ void CG_PredictPlayerState(void)
         cg_pmove.leanSpeed = 2.f;
     } else {
         cg_pmove.alwaysAllowLean = qtrue;
+        if (cgs.gametype != GT_SINGLE_PLAYER) {
+            cg_pmove.leanMax = 40.f;
+        } else {
+            // Don't allow lean in single-player, like in the original game
+            cg_pmove.leanMax = 0;
+        }
 
-        cg_pmove.leanMax = 40.f;
         cg_pmove.leanAdd = 10.f;
         cg_pmove.leanRecoverSpeed = 15.f;
         cg_pmove.leanSpeed = 4.f;
@@ -509,7 +542,11 @@ void CG_PredictPlayerState(void)
     // the server time is beyond our current cg.time,
     // because predicted player positions are going to
     // be ahead of everything else anyway
-    if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport) {
+    // Added in OPM: prediction check
+    //  Don't use the next snapshot if the prediction is about to be disabled
+    //  this prevent "blinking" issues like when entering a vehicle turret gun
+    //  where arms would be seen shortly
+    if (cg.nextSnap && !cg.nextFrameTeleport && !cg.thisFrameTeleport && !(cg.nextSnap->ps.pm_flags & PMF_NO_PREDICTION)) {
         cg.predicted_player_state = cg.nextSnap->ps;
         cg.physicsTime            = cg.nextSnap->serverTime;
     } else {
diff --git a/code/cgame/cg_public.h b/code/cgame/cg_public.h
index 4aeda9cf..4e5de840 100644
--- a/code/cgame/cg_public.h
+++ b/code/cgame/cg_public.h
@@ -120,7 +120,9 @@ functions exported to the main executable
 
         // console variable interaction
         cvar_t *(*Cvar_Get)(const char *var_name, const char *value, int flags);
+        cvar_t *(*Cvar_Find)(const char *var_name);
         void (*Cvar_Set)(const char *var_name, const char *value);
+        void (*Cvar_CheckRange)(cvar_t* var, float min, float max, qboolean integral);
 
         // ClientCommand and ConsoleCommand parameter access
         int (*Argc)(void);
@@ -137,6 +139,8 @@ functions exported to the main executable
         void (*FS_FreeFile)(void *buf);
         int (*FS_WriteFile)(const char *qpath, const void *buffer, int size);
         void (*FS_WriteTextFile)(const char *qpath, const void *buffer, int size);
+        char** (*FS_ListFilteredFiles)(const char* path, const char* extension, const char* filter, qboolean wantSubs, int* numfiles, qboolean allowNonPureFilesOnDisk);
+        void (*FS_FreeFileList)(char **list);
         // add commands to the local console as if they were typed in
         // for map changing, etc.  The command is not executed immediately,
         // but will be executed in order the next time console commands
@@ -163,7 +167,7 @@ functions exported to the main executable
         void (*SendClientCommand)(const char *s);
 
         // CM functions
-        void (*CM_LoadMap)(const char *name);
+        void (*CM_LoadMap)(const char *name, int* checksum);
         clipHandle_t (*CM_InlineModel)(int index); // 0 = world, 1+ = bmodels
         int (*CM_NumInlineModels)(void);
         int (*CM_PointContents)(const vec3_t p, int headnode);
@@ -283,9 +287,11 @@ functions exported to the main executable
         qhandle_t (*R_RegisterModel)(const char *name);
         qhandle_t (*R_SpawnEffectModel)(const char *name, vec3_t pos, vec3_t axis[3]);
         qhandle_t (*R_RegisterServerModel)(const char *name);
+        const char * (*R_GetModelName)(qhandle_t hModel);
         void (*R_UnregisterServerModel)(qhandle_t hModel);
         qhandle_t (*R_RegisterShader)(const char *name);
         qhandle_t (*R_RegisterShaderNoMip)(const char *name);
+        const char* (*R_GetShaderName)(qhandle_t hShader);
         void (*R_AddRefEntityToScene)(const refEntity_t *ent, int parentEntityNumber);
         void (*R_AddRefSpriteToScene)(const refEntity_t *ent);
         void (*R_AddLightToScene)(const vec3_t origin, float intensity, float r, float g, float b, int type);
@@ -307,12 +313,12 @@ functions exported to the main executable
         ); // 0 = white
         fontheader_t *(*R_LoadFont)(const char *name);
         void (*R_DrawString)(
-            fontheader_t *font, const char *text, float x, float y, int maxLen, qboolean virtualScreen
+            fontheader_t *font, const char *text, float x, float y, int maxLen, const float *pvVirtualScreen
         );
         refEntity_t *(*R_GetRenderEntity)(int entityNumber);
         void (*R_ModelBounds)(clipHandle_t model, vec3_t mins, vec3_t maxs);
         float (*R_ModelRadius)(clipHandle_t model);
-        float (*R_Noise)(float x, float y, float z, float t);
+        float (*R_Noise)(float x, float y, float z, double t);
         void (*R_DebugLine)(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
         baseshader_t *(*GetShader)(int shaderNum);
         // =========== Swipes =============
@@ -356,6 +362,9 @@ functions exported to the main executable
         void (*UI_ShowMenu)(const char *name, qboolean bForce);
         void (*UI_HideMenu)(const char *name, qboolean bForce);
         int (*UI_FontStringWidth)(fontheader_t *font, const char *string, int maxLen);
+        // Added in 2.0
+        float (*UI_GetObjectivesTop)(void);
+        void (*UI_GetHighResolutionScale)(vec2_t scale);
 
         int (*Key_StringToKeynum)(const char *str);
         const char *(*Key_KeynumToBindString)(int keyNum);
@@ -426,6 +435,8 @@ functions exported to the main executable
         void (*CL_RestoreSavedCgameState)();
         void (*CL_ClearSavedCgameState)();
 
+        size_t (*getConfigStringIdNormalized)(size_t num);
+
         cvar_t       *fsDebug;
         hdelement_t  *HudDrawElements;
         clientAnim_t *anim;
@@ -459,8 +470,8 @@ functions exported to the main executable
         int (*CG_GetParent)(int entNum);
         float (*CG_GetObjectiveAlpha)();
         int (*CG_PermanentMark)(
-            const vec3_t    origin,
-            const vec3_t    dir,
+            vec3_t          origin,
+            vec3_t          dir,
             float           orientation,
             float           sScale,
             float           tScale,
@@ -499,8 +510,8 @@ functions exported to the main executable
         //
 		void (*CG_ReadNonPVSClient)(radarUnpacked_t* radarUnpacked);
 		void (*CG_UpdateRadar)();
-		void (*CG_SaveStateToBuffer)(void** out, int svsTime);
-		void (*CG_LoadStateToBuffer)(void** state, int size, int svsTime);
+		size_t (*CG_SaveStateToBuffer)(void** out, int svsTime);
+		qboolean (*CG_LoadStateToBuffer)(void* state, size_t size, int svsTime);
 		void (*CG_CleanUpTempModels)();
 
         // FIXME
diff --git a/code/cgame/cg_scoreboard.cpp b/code/cgame/cg_scoreboard.cpp
index fe3a0846..f6cb81c8 100644
--- a/code/cgame/cg_scoreboard.cpp
+++ b/code/cgame/cg_scoreboard.cpp
@@ -58,19 +58,19 @@ void CG_PrepScoreBoardInfo()
 {
     switch (cgs.gametype) {
     case GT_TEAM_ROUNDS:
-        strcpy(cg.scoresMenuName, "DM_Round_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "DM_Round_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_OBJECTIVE:
-        strcpy(cg.scoresMenuName, "Obj_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Obj_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_TOW:
-        strcpy(cg.scoresMenuName, "Tow_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Tow_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     case GT_LIBERATION:
-        strcpy(cg.scoresMenuName, "Lib_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "Lib_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     default:
-        strcpy(cg.scoresMenuName, "DM_Scoreboard");
+        Q_strncpyz(cg.scoresMenuName, "DM_Scoreboard", sizeof(cg.scoresMenuName));
         break;
     }
 }
@@ -296,14 +296,15 @@ void CG_ParseScores_ver_15()
 
                 switch (iClientTeam) {
                 case 1:
-                    strcpy(szString3, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("Spectators"), sizeof(szString3));
                     break;
                 case 2:
-                    strcpy(szString3, cgi.LV_ConvertString("Free-For-Allers"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("Free-For-Allers"), sizeof(szString3));
                     break;
                 case 3:
-                    sprintf(
+                    Com_sprintf(
                         szString3,
+                        sizeof(szString3),
                         "%s - %d %s",
                         cgi.LV_ConvertString("Allies"),
                         atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
@@ -312,8 +313,9 @@ void CG_ParseScores_ver_15()
                     iCurrentEntry++;
                     break;
                 case 4:
-                    sprintf(
+                    Com_sprintf(
                         szString3,
+                        sizeof(szString3),
                         "%s - %d %s",
                         cgi.LV_ConvertString("Axis"),
                         atoi(cgi.Argv(2 + iCurrentEntry + iDatumCount * i)),
@@ -322,7 +324,7 @@ void CG_ParseScores_ver_15()
                     iCurrentEntry++;
                     break;
                 default:
-                    strcpy(szString3, cgi.LV_ConvertString("No Team"));
+                    Q_strncpyz(szString3, cgi.LV_ConvertString("No Team"), sizeof(szString3));
                     break;
                 }
             } else if (iClientNum == -2) {
@@ -330,14 +332,14 @@ void CG_ParseScores_ver_15()
                 szString2[0] = 0;
                 szString3[0] = 0;
             } else {
-                strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString3, cg.clientinfo[iClientNum].name);
+                Q_strncpyz(szString2, va("%i", iClientNum), sizeof(szString2));
+                Q_strncpyz(szString3, cg.clientinfo[iClientNum].name, sizeof(szString3));
             }
 
-            strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString7, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+            Q_strncpyz(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+            Q_strncpyz(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+            Q_strncpyz(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
+            Q_strncpyz(szString7, cgi.Argv(5 + iCurrentEntry + iDatumCount * i), sizeof(szString7));
 
             if (cgs.gametype >= GT_TEAM_ROUNDS && iClientNum == -1
                 && (iClientTeam == TEAM_ALLIES || iClientTeam == TEAM_AXIS)) {
@@ -370,19 +372,19 @@ void CG_ParseScores_ver_15()
         } else {
             iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
             if (iClientNum >= 0) {
-                strcpy(szString2, va("%i", iClientNum));
-                strcpy(szString3, cg.clientinfo[iClientNum].name);
-                strcpy(szString4, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString5, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString6, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString7, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+                Q_strncpyz(szString2, va("%i", iClientNum), sizeof(szString2));
+                Q_strncpyz(szString3, cg.clientinfo[iClientNum].name, sizeof(szString3));
+                Q_strncpyz(szString4, cgi.Argv(1 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+                Q_strncpyz(szString5, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+                Q_strncpyz(szString6, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
+                Q_strncpyz(szString7, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString7));
             } else {
                 szString2[0] = 0;
                 if (iClientNum == -3) {
-                    strcpy(szString2, cgi.LV_ConvertString("Players"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Players"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else if (iClientNum == -2) {
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else {
                     // unknown
@@ -535,32 +537,32 @@ void CG_ParseScores_ver_6()
 
                 switch (iClientTeam) {
                 case 1:
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     break;
                 case 2:
-                    strcpy(szString2, cgi.LV_ConvertString("Free-For-Allers"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Free-For-Allers"), sizeof(szString2));
                     break;
                 case 3:
-                    strcpy(szString2, cgi.LV_ConvertString("Allies"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Allies"), sizeof(szString2));
                     break;
                 case 4:
-                    strcpy(szString2, cgi.LV_ConvertString("Axis"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Axis"), sizeof(szString2));
                     break;
                 default:
-                    strcpy(szString2, cgi.LV_ConvertString("No Team"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("No Team"), sizeof(szString2));
                     break;
                 }
             } else if (iClientNum == -2) {
                 // spectating
                 szString2[0] = 0;
             } else {
-                strcpy(szString2, cg.clientinfo[iClientNum].name);
+                Q_strncpyz(szString2, cg.clientinfo[iClientNum].name, sizeof(szString2));
             }
 
-            strcpy(szString3, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString4, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString5, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
-            strcpy(szString6, cgi.Argv(5 + iCurrentEntry + iDatumCount * i));
+            Q_strncpyz(szString3, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString3));
+            Q_strncpyz(szString4, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+            Q_strncpyz(szString5, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+            Q_strncpyz(szString6, cgi.Argv(5 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
 
             if (iClientNum == cg.snap->ps.clientNum) {
                 pItemTextColor = vThisClientTextColor;
@@ -587,17 +589,17 @@ void CG_ParseScores_ver_6()
         } else {
             iClientNum = atoi(cgi.Argv(iCurrentEntry + iDatumCount * i));
             if (iClientNum >= 0) {
-                strcpy(szString2, cg.clientinfo[iClientNum].name);
-                strcpy(szString3, cgi.Argv(1 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i));
-                strcpy(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i));
+                Q_strncpyz(szString2, cg.clientinfo[iClientNum].name, sizeof(szString2));
+                Q_strncpyz(szString3, cgi.Argv(1 + iCurrentEntry + iDatumCount * i), sizeof(szString3));
+                Q_strncpyz(szString4, cgi.Argv(2 + iCurrentEntry + iDatumCount * i), sizeof(szString4));
+                Q_strncpyz(szString5, cgi.Argv(3 + iCurrentEntry + iDatumCount * i), sizeof(szString5));
+                Q_strncpyz(szString6, cgi.Argv(4 + iCurrentEntry + iDatumCount * i), sizeof(szString6));
             } else {
                 if (iClientNum == -3) {
-                    strcpy(szString2, cgi.LV_ConvertString("Players"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Players"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else if (iClientNum == -2) {
-                    strcpy(szString2, cgi.LV_ConvertString("Spectators"));
+                    Q_strncpyz(szString2, cgi.LV_ConvertString("Spectators"), sizeof(szString2));
                     bIsHeader = qtrue;
                 } else {
                     // unknown
diff --git a/code/cgame/cg_servercmds.c b/code/cgame/cg_servercmds.c
index 9e932721..bc9f100a 100644
--- a/code/cgame/cg_servercmds.c
+++ b/code/cgame/cg_servercmds.c
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2008-2024 the OpenMoHAA team
+Copyright (C) 1999-2005 Id Software, Inc.
 
 This file is part of OpenMoHAA source code.
 
@@ -24,12 +25,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // cg_servercmds.c -- text commands sent by the server
 
 #include "cg_local.h"
+#include "../fgame/bg_voteoptions.h"
+#include "cg_servercmds_filter.h"
 
+/*
+================
+IsWeaponAllowed
+
+Returns true if the weapon is allowed
+================
+*/
 static const char *IsWeaponAllowed(int dmFlags, int flags)
 {
     return (dmFlags & flags) ? "0" : "1";
 }
 
+/*
+================
+QueryLandminesAllowed2
+
+Returns true if landmines is allowed by the map or by a dm flag
+================
+*/
 static qboolean QueryLandminesAllowed2(const char *mapname, int dmflags)
 {
     if (dmflags & DF_WEAPON_NO_LANDMINE) {
@@ -112,6 +129,7 @@ void CG_ParseServerinfo(void)
     char        map[MAX_QPATH];
     char       *spawnpos;
     const char *version;
+    const char *mapChecksumStr;
 
     info           = CG_ConfigString(CS_SERVERINFO);
     cgs.gametype   = atoi(Info_ValueForKey(info, "g_gametype"));
@@ -132,15 +150,27 @@ void CG_ParseServerinfo(void)
     cgi.Cvar_Set("cg_fraglimit", Info_ValueForKey(info, "fraglimit"));
     cgi.Cvar_Set("cg_timelimit", Info_ValueForKey(info, "timelimit"));
     cgi.Cvar_Set("cg_maxclients", Info_ValueForKey(info, "sv_gametype"));
+    cgi.Cvar_Set("cg_allowvote", Info_ValueForKey(info, "g_allowvote"));
     cgi.Cvar_Set("cg_obj_alliedtext1", Info_ValueForKey(info, "g_obj_alliedtext1"));
     cgi.Cvar_Set("cg_obj_alliedtext2", Info_ValueForKey(info, "g_obj_alliedtext2"));
     cgi.Cvar_Set("cg_obj_alliedtext3", Info_ValueForKey(info, "g_obj_alliedtext3"));
-    cgi.Cvar_Set("cg_obj_axistext1", Info_ValueForKey(info, "cg_obj_axistext1"));
-    cgi.Cvar_Set("cg_obj_axistext2", Info_ValueForKey(info, "cg_obj_axistext2"));
-    cgi.Cvar_Set("cg_obj_axistext3", Info_ValueForKey(info, "cg_obj_axistext3"));
+    cgi.Cvar_Set("cg_obj_alliedtext4", Info_ValueForKey(info, "g_obj_alliedtext4"));
+    cgi.Cvar_Set("cg_obj_alliedtext5", Info_ValueForKey(info, "g_obj_alliedtext5"));
+    cgi.Cvar_Set("cg_obj_axistext1", Info_ValueForKey(info, "g_obj_axistext1"));
+    cgi.Cvar_Set("cg_obj_axistext2", Info_ValueForKey(info, "g_obj_axistext2"));
+    cgi.Cvar_Set("cg_obj_axistext3", Info_ValueForKey(info, "g_obj_axistext3"));
+    cgi.Cvar_Set("cg_obj_axistext4", Info_ValueForKey(info, "g_obj_axistext4"));
+    cgi.Cvar_Set("cg_obj_axistext5", Info_ValueForKey(info, "g_obj_axistext5"));
     cgi.Cvar_Set("cg_scoreboardpic", Info_ValueForKey(info, "g_scoreboardpic"));
     cgi.Cvar_Set("cg_scoreboardpicover", Info_ValueForKey(info, "g_scoreboardpicover"));
-    cgs.mapChecksum = atoi(Info_ValueForKey(info, "sv_mapChecksum"));
+    mapChecksumStr = Info_ValueForKey(info, "sv_mapChecksum");
+    if (mapChecksumStr && mapChecksumStr[0]) {
+        cgs.mapChecksum    = atoi(mapChecksumStr);
+        cgs.useMapChecksum = qtrue;
+    } else {
+        cgs.mapChecksum    = 0;
+        cgs.useMapChecksum = qfalse;
+    }
 
     mapname = Info_ValueForKey(info, "mapname");
 
@@ -156,11 +186,15 @@ void CG_ParseServerinfo(void)
     if (spawnpos) {
         Q_strncpyz(map, mapname, spawnpos - mapname + 1);
     } else {
-        strcpy(map, mapname);
+        Q_strncpyz(map, mapname, sizeof(map));
     }
 
-    Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
-
+    if (CG_UseLargeLightmaps(mapname)) {
+        Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s.bsp", map);
+    } else {
+        Com_sprintf(cgs.mapname, sizeof(cgs.mapname), "maps/%s_sml.bsp", map);
+    }
+    
     // hide/show huds
     if (cgs.gametype) {
         cgi.Cmd_Execute(EXEC_NOW, "ui_addhud hud_timelimit\n");
@@ -184,17 +218,13 @@ CG_ConfigStringModified
 
 ================
 */
-static void CG_ConfigStringModified(void)
+static void CG_ConfigStringModified(int num, qboolean modelOnly)
 {
-    int num;
-
-    num = atoi(cgi.Argv(1));
-
     // get the gamestate from the client system, which will have the
     // new configstring already integrated
     cgi.GetGameState(&cgs.gameState);
 
-    CG_ProcessConfigString(num);
+    CG_ProcessConfigString(num, modelOnly);
 }
 
 /*
@@ -275,7 +305,7 @@ The string has been tokenized and can be retrieved with
 Cmd_Argc() / Cmd_Argv()
 =================
 */
-static void CG_ServerCommand(void)
+static void CG_ServerCommand(qboolean modelOnly)
 {
     const char *cmd;
 
@@ -287,7 +317,11 @@ static void CG_ServerCommand(void)
     }
 
     if (!strcmp(cmd, "cs")) {
-        CG_ConfigStringModified();
+        CG_ConfigStringModified(cgi.getConfigStringIdNormalized(atoi(cgi.Argv(1))), modelOnly);
+        return;
+    }
+
+    if (modelOnly) {
         return;
     }
 
@@ -298,12 +332,12 @@ static void CG_ServerCommand(void)
         }
         return;
     } else if (!strcmp(cmd, "printdeathmsg")) {
-        const char *s1, *s2, * attackerName, * victimName, *type;
+        const char *s1, *s2, *attackerName, *victimName, *type;
         const char *result1, *result2;
         int         hudColor;
 
-        result1 = NULL;
-        result2 = NULL;
+        result1      = NULL;
+        result2      = NULL;
         s1           = cgi.Argv(1);
         s2           = cgi.Argv(2);
         attackerName = cgi.Argv(3);
@@ -339,7 +373,14 @@ static void CG_ServerCommand(void)
     }
 
     if (!strcmp(cmd, "stufftext")) {
-        cgi.Cmd_Stuff(cgi.Argv(1));
+        char *cmd = cgi.Argv(1);
+        if (CG_IsStatementFiltered(cmd)) {
+            // Added in OPM
+            //  Don't execute filtered commands
+            return;
+        }
+
+        cgi.Cmd_Stuff(cmd);
         cgi.Cmd_Stuff("\n");
         return;
     }
@@ -364,6 +405,28 @@ static void CG_ServerCommand(void)
         return;
     }
 
+    if (!strcmp(cmd, "voteresult")) {
+        cmd = cgi.Argv(1);
+        if (*cmd) {
+            strcmp(cmd, "passed");
+        }
+    }
+
+    if (!strcmp(cmd, "vo0")) {
+        CG_VoteOptions_StartReadFromServer(cgi.Argv(1));
+        return;
+    }
+
+    if (!strcmp(cmd, "vo1")) {
+        CG_VoteOptions_ContinueReadFromServer(cgi.Argv(1));
+        return;
+    }
+
+    if (!strcmp(cmd, "vo2")) {
+        CG_VoteOptions_FinishReadFromServer(cgi.Argv(1));
+        return;
+    }
+
     cgi.Printf("Unknown client game command: %s\n", cmd);
 }
 
@@ -377,9 +440,20 @@ with this this snapshot.
 */
 void CG_ExecuteNewServerCommands(int latestSequence, qboolean differentServer)
 {
+    int lastServerCommandSequence;
+
+    lastServerCommandSequence = cgs.serverCommandSequence;
+
     while (cgs.serverCommandSequence < latestSequence) {
         if (cgi.GetServerCommand(++cgs.serverCommandSequence, differentServer)) {
-            CG_ServerCommand();
+            CG_ServerCommand(qtrue);
+        }
+    }
+
+    cgs.serverCommandSequence = lastServerCommandSequence;
+    while (cgs.serverCommandSequence < latestSequence) {
+        if (cgi.GetServerCommand(++cgs.serverCommandSequence, differentServer)) {
+            CG_ServerCommand(qfalse);
         }
     }
 }
diff --git a/code/cgame/cg_servercmds_filter.c b/code/cgame/cg_servercmds_filter.c
new file mode 100644
index 00000000..9e2170f7
--- /dev/null
+++ b/code/cgame/cg_servercmds_filter.c
@@ -0,0 +1,292 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// cg_servercmds_filter.c -- filtered server commands
+
+#include "cg_local.h"
+#include "cg_servercmds_filter.h"
+
+//
+// List of variables allowed to be changed by the server
+//
+static const char *whiteListedVariables[] = {
+    // some mods set this variable to make the sky uniform
+    "r_fastsky",
+
+    "ui_hud",
+    "subtitle0",
+    "subtitle1",
+    "subtitle2",
+    "subtitle3",
+    "name",
+
+    // for 3rd person server
+    "cg_3rd_person",
+    "cg_cameraverticaldisplacement"
+};
+
+//
+// List of variables allowed to be changed by the server
+//
+static const char *whiteListedLocalServerVariables[] = {"ui_hidemouse", "ui_showmouse", "cg_marks_add"};
+
+//
+// List of commands allowed to be executed by the server
+//
+static const char *whiteListedCommands[] = {
+    //
+    // HUD
+    //==========
+    "pushmenu",
+    "pushmenu_teamselect",
+    "pushmenu_weaponselect",
+    "popmenu",
+    "globalwidgetcommand", // used for mods adding custom HUDs
+    "ui_addhud",
+    "ui_removehud",
+    "echo", // to print stuff client-side
+
+    //
+    // Sounds
+    //==========
+    "tmstart",
+    "tmstartloop",
+    "tmstop",
+    "tmvolume",
+    "play",
+    "playmp3",
+    "stopmp3",
+
+    //
+    // Misc
+    //==========
+    "primarydmweapon",
+    "wait",
+    "+moveup", // workaround for mods that want to prevent inactivity when handling the spectate
+    "-moveup",
+    "screenshot",
+    "screenshotJPEG",
+    "levelshot",
+    "`stufftext" // Stufftext detection from Reborn, the player gets kicked without it
+};
+
+//
+// List of commands allowed to be executed locally
+// (when the client also runs the server)
+//
+static const char *whiteListedLocalServerCommands[] = {
+    // Used by briefings
+    "spmap",
+    "map",
+    "disconnect",
+
+    "cinematic",
+    "showmenu",
+    "hidemenu"
+};
+
+
+/*
+====================
+CG_IsVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsVariableFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedVariables); i++) {
+        if (!Q_stricmp(name, whiteListedVariables[i])) {
+            return qfalse;
+        }
+    }
+
+    if (cgs.localServer) {
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerVariables); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerVariables[i])) {
+                return qfalse;
+            }
+        }
+    }
+
+    // Filtered
+    return qtrue;
+}
+
+/*
+====================
+CG_IsSetVariableFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsSetVariableFiltered(const char *name, char type)
+{
+    cvar_t *var;
+
+    if (!CG_IsVariableFiltered(name)) {
+        return qfalse;
+    }
+
+    if (type != 'u' && type != 's') {
+        // Don't allow custom info variables to avoid flooding
+        // the client with many serverinfo and userinfo variables
+
+        var = cgi.Cvar_Find(name);
+        if (!var) {
+            // Allow as it doesn't exist
+            return qfalse;
+        }
+
+        if (var->flags & CVAR_USER_CREATED) {
+            // Allow, it's user-created, wouldn't cause issues
+            return qfalse;
+        }
+    }
+
+    // Filtered
+    return qtrue;
+}
+
+/*
+====================
+CG_IsCommandFiltered
+
+Returns whether or not the variable should be filtered
+====================
+*/
+static qboolean CG_IsCommandFiltered(const char *name)
+{
+    size_t i;
+
+    for (i = 0; i < ARRAY_LEN(whiteListedCommands); i++) {
+        if (!Q_stricmp(name, whiteListedCommands[i])) {
+            return qfalse;
+        }
+    }
+
+    if (cgs.localServer) {
+        // Allow more commands when the client is hosting the server
+        // Mostly used on single-player mode, like when briefings switch to the next map
+        for (i = 0; i < ARRAY_LEN(whiteListedLocalServerCommands); i++) {
+            if (!Q_stricmp(name, whiteListedLocalServerCommands[i])) {
+                return qfalse;
+            }
+        }
+    }
+
+    //
+    // Test variables
+    //
+    return CG_IsVariableFiltered(name);
+}
+
+/*
+====================
+RemoveEndToken
+====================
+*/
+static qboolean RemoveEndToken(char* com_token) {
+    char* p;
+
+    for (p = com_token; p[0]; p++) {
+        if (*p == ';') {
+            *p = 0;
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+====================
+CG_IsStatementFiltered
+
+Returns whether or not the statement is filtered
+====================
+*/
+qboolean CG_IsStatementFiltered(char *cmd)
+{
+    char* parsed;
+    char com_token[256];
+    qboolean bNextStatement = qfalse;
+
+    parsed = cmd;
+
+    for (Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token)); com_token[0]; Q_strncpyz(com_token, COM_ParseExt(&parsed, qtrue), sizeof(com_token))) {
+        bNextStatement = RemoveEndToken(com_token);
+
+        if (com_token[0] == ';') {
+            continue;
+        }
+
+        if (!Q_stricmp(com_token, "set") || !Q_stricmp(com_token, "setu") || !Q_stricmp(com_token, "seta")
+            || !Q_stricmp(com_token, "sets") || !Q_stricmp(com_token, "append")) {
+            char type;
+            
+            if (Q_stricmp(com_token, "append")) {
+                type = com_token[3];
+            } else {
+                type = 0;
+            }
+
+            //
+            // variable
+            //
+            Q_strncpyz(com_token, COM_ParseExt(&parsed, qfalse), sizeof(com_token));
+            bNextStatement |= RemoveEndToken(com_token);
+            if (com_token[0] == ';') {
+                continue;
+            }
+
+            if (CG_IsSetVariableFiltered(com_token, type)) {
+                return qtrue;
+            }
+        } else {
+            //
+            // normal command
+            //
+            if (CG_IsCommandFiltered(com_token)) {
+                return qtrue;
+            }
+        }
+
+        if (!bNextStatement) {
+            // Skip up to the next statement
+            while (parsed && parsed[0]) {
+                char c = parsed[0];
+
+                parsed++;
+                if (c == '\n' || c == ';') {
+                    break;
+                }
+            }
+        }
+    }
+
+    return qfalse;
+}
+
diff --git a/code/cgame/cg_servercmds_filter.h b/code/cgame/cg_servercmds_filter.h
new file mode 100644
index 00000000..f8351028
--- /dev/null
+++ b/code/cgame/cg_servercmds_filter.h
@@ -0,0 +1,30 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// cg_servercmds_filter.h -- filtered server commands
+
+#pragma once
+
+#include "cg_local.h"
+
+qboolean CG_IsStatementFiltered(char *cmd);
\ No newline at end of file
diff --git a/code/cgame/cg_snapshot.c b/code/cgame/cg_snapshot.c
index 1c64061d..06b6d67d 100644
--- a/code/cgame/cg_snapshot.c
+++ b/code/cgame/cg_snapshot.c
@@ -23,8 +23,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // DESCRIPTION:
 // things that happen on snapshot transition, not necessarily every
 // single frame
+//
+// ADDITIONS:
+// - CG_TransitionSnapshot() footer: set ps.walking to true if the ps has a ground entity
 
 #include "cg_local.h"
+#include "cg_radar.h"
 #include "tiki.h"
 
 /*
@@ -69,10 +73,10 @@ static void CG_ResetEntity(centity_t *cent)
     CG_RemoveClientEntity(cent->currentState.number, tiki, cent);
 
     // reset the animation for the entities
-    if (tiki && tiki->a->bIsCharacter) {
+    if (tiki) {
         for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            cent->animLast[i]      = cent->currentState.frameInfo[i].index;
-            cent->animLastTimes[i] = cent->currentState.frameInfo[i].time;
+            cent->animLast[i]      = -1;
+            cent->animLastTimes[i] = -1;
             if (cent->currentState.frameInfo[i].weight) {
                 cent->animLastWeight |= 1 << i;
             } else {
@@ -83,7 +87,8 @@ static void CG_ResetEntity(centity_t *cent)
     } else {
         // clear all the last animations
         for (i = 0; i < MAX_FRAMEINFOS; i++) {
-            cent->animLast[i] = -1;
+            cent->animLast[i]      = -1;
+            cent->animLastTimes[i] = 0.0;
         }
 
         cent->animLastWeight = 0;
@@ -206,6 +211,9 @@ static void CG_TransitionSnapshot(qboolean differentServer)
             cent->teleported  = qfalse;
         }
         CG_TransitionEntity(cent);
+
+        // remember time of snapshot this entity was last updated in
+        cent->snapShotTime = cg.snap->serverTime;
     }
 
     for (i = 0; i < cg.snap->number_of_sounds; i++) {
@@ -243,6 +251,15 @@ static void CG_TransitionSnapshot(qboolean differentServer)
             CG_TransitionPlayerState(ps, ops);
         }
     }
+
+    if (differentServer) {
+        cgi.CL_RestoreSavedCgameState();
+    } else {
+        cgi.CL_ClearSavedCgameState();
+    }
+
+    // this allows the view model to still look normal when the player is on ground
+    cg.snap->ps.walking = cg.snap->ps.groundEntityNum != ENTITYNUM_NONE;
 }
 
 /*
@@ -330,8 +347,10 @@ static snapshot_t *CG_ReadNextSnapshot(void)
     snapshot_t *dest;
 
     if (cg.latestSnapshotNum > cgs.processedSnapshotNum + 1000) {
-        cgi.Error(
-            ERR_DROP, "CG_ReadNextSnapshot: way out of range, %i > %i", cg.latestSnapshotNum, cgs.processedSnapshotNum
+        cgi.Printf(
+            "WARNING: CG_ReadNextSnapshot: way out of range, %i > %i\n",
+            cg.latestSnapshotNum,
+            cgs.processedSnapshotNum
         );
     }
 
diff --git a/code/cgame/cg_specialfx.cpp b/code/cgame/cg_specialfx.cpp
index 8f5abb61..48042803 100644
--- a/code/cgame/cg_specialfx.cpp
+++ b/code/cgame/cg_specialfx.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -38,7 +38,8 @@ static vec3_t g_vLadderstepMaxs;
 
 ClientSpecialEffectsManager sfxManager;
 
-Event EV_SFX_EffectDelay(
+Event EV_SFX_EffectDelay
+(
     "effectdelay",
     EV_DEFAULT,
     "iivvvvv",
@@ -94,7 +95,7 @@ void ClientSpecialEffectsManager::LoadEffects()
     cgi.DPrintf("Loading Special Effects...\n");
     AxisClear(axis);
 
-    for (i = 0; i < MAX_SPECIAL_EFFECTS; i++) {
+    for (i = 0; i < SFX_COUNT; i++) {
         switch (i) {
         case SFX_BHIT_PAPER_LITE:
             szEffectModel = "models/fx/bh_paper_lite.tik";
@@ -234,9 +235,15 @@ void ClientSpecialEffectsManager::LoadEffects()
             szEffectModel = "models/fx/bazookaexp_base.tik";
             break;
         case SFX_EXP_HEAVYSHELL_BASE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_base.tik";
             break;
         case SFX_EXP_TANK_BASE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_base.tik";
             break;
         case SFX_EXP_GREN_PAPER:
@@ -285,30 +292,57 @@ void ClientSpecialEffectsManager::LoadEffects()
             szEffectModel = "models/fx/grenexp_carpet.tik";
             break;
         case SFX_EXP_HEAVYSHELL_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_dirt.tik";
             break;
         case SFX_EXP_HEAVYSHELL_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_stone.tik";
             break;
         case SFX_EXP_HEAVYSHELL_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/heavyshellexp_snow.tik";
             break;
         case SFX_EXP_TANK_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_dirt.tik";
             break;
         case SFX_EXP_TANK_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_stone.tik";
             break;
         case SFX_EXP_TANK_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/tankexp_snow.tik";
             break;
         case SFX_EXP_BAZOOKA_DIRT:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_dirt.tik";
             break;
         case SFX_EXP_BAZOOKA_STONE:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_stone.tik";
             break;
         case SFX_EXP_BAZOOKA_SNOW:
+            if (cg_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+                continue;
+            }
             szEffectModel = "models/fx/bazookaexp_snow.tik";
             break;
         case SFX_WATER_RIPPLE_STILL:
@@ -478,7 +512,7 @@ void ClientSpecialEffectsManager::ExecuteEffect(
                 current_tiki   = NULL;
 
                 pCommand->emitter->cgd.origin = vPos;
-                if (pCommand->emitter->cgd.flags & T_ANGLES) {
+                if (!(pCommand->emitter->cgd.flags & T_ANGLES)) {
                     pCommand->emitter->cgd.angles = vAngles;
                 }
 
@@ -486,7 +520,7 @@ void ClientSpecialEffectsManager::ExecuteEffect(
                 AxisCopy(axis, pCommand->emitter->tag_axis);
                 pCommand->emitter->cgd.createTime = cg.time;
                 commandManager.SetSpawnthing(pCommand->emitter);
-            
+
                 (commandManager.*pCommand->endfcn)();
             }
         }
@@ -904,7 +938,144 @@ void CG_LandingSound(centity_t *ent, refEntity_t *pREnt, float volume, int iEqui
 
 void CG_BodyFallSound(centity_t *ent, refEntity_t *pREnt, float volume)
 {
-    // FIXME: unimplemented
+    int     contents;
+    int     surftype;
+    int     iEffectNum = -1;
+    vec3_t  vStart, vEnd;
+    vec3_t  midlegs;
+    str     sSoundName;
+    trace_t trace;
+
+    VectorCopy(ent->lerpOrigin, vStart);
+    vStart[2] += 8;
+
+    VectorCopy(vStart, vEnd);
+    vEnd[2] -= 64;
+
+    if (ent->currentState.eType == ET_PLAYER) {
+        CG_Trace(
+            &trace,
+            vStart,
+            g_vFootstepMins,
+            g_vFootstepMaxs,
+            vEnd,
+            ent->currentState.number,
+            MASK_PLAYERSOLID,
+            qtrue,
+            qtrue,
+            "Player Landing"
+        );
+    } else {
+        CG_Trace(
+            &trace,
+            vStart,
+            g_vFootstepMins,
+            g_vFootstepMaxs,
+            vEnd,
+            ent->currentState.number,
+            MASK_MONSTERSOLID,
+            qfalse,
+            qfalse,
+            "Monster Landing"
+        );
+    }
+
+    if (trace.fraction == 1) {
+        return;
+    }
+
+    sSoundName = "snd_bodyfall_";
+    contents   = CG_PointContents(trace.endpos, -1);
+    if (contents & MASK_WATER) {
+        // take our ground position and trace upwards
+        VectorCopy(trace.endpos, midlegs);
+        midlegs[2] += WATER_NO_SPLASH_HEIGHT;
+        contents = CG_PointContents(midlegs, -1);
+        if (contents & MASK_WATER) {
+            sSoundName += "wade";
+        } else {
+            sSoundName += "puddle";
+            iEffectNum = SFX_FOOT_PUDDLE;
+        }
+    } else {
+        surftype = trace.surfaceFlags & MASK_SURF_TYPE;
+        switch (surftype) {
+        case SURF_FOLIAGE:
+            sSoundName += "foliage";
+            iEffectNum = SFX_FOOT_GRASS;
+            break;
+        case SURF_SNOW:
+            sSoundName += "snow";
+            iEffectNum = SFX_FOOT_SNOW;
+            break;
+        case SURF_CARPET:
+            sSoundName += "carpet";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_SAND:
+            sSoundName += "sand";
+            iEffectNum = SFX_FOOT_SAND;
+            break;
+        case SURF_PUDDLE:
+            sSoundName += "puddle";
+            iEffectNum = SFX_FOOT_PUDDLE;
+            break;
+        case SURF_GLASS:
+            sSoundName += "glass";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_GRAVEL:
+            sSoundName += "gravel";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        case SURF_MUD:
+            sSoundName += "mud";
+            iEffectNum = SFX_FOOT_MUD;
+            break;
+        case SURF_DIRT:
+            sSoundName += "dirt";
+            iEffectNum = SFX_FOOT_DIRT;
+            break;
+        case SURF_GRILL:
+            sSoundName += "grill";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_GRASS:
+            sSoundName += "grass";
+            iEffectNum = SFX_FOOT_GRASS;
+            break;
+        case SURF_ROCK:
+            sSoundName += "stone";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        case SURF_PAPER:
+            sSoundName += "paper";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_WOOD:
+            sSoundName += "wood";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        case SURF_METAL:
+            sSoundName += "metal";
+            iEffectNum = SFX_FOOT_LIGHT_DUST;
+            break;
+        default:
+            sSoundName += "stone";
+            iEffectNum = SFX_FOOT_HEAVY_DUST;
+            break;
+        }
+    }
+
+    if (cg_debugFootsteps->integer) {
+        cgi.DPrintf("BodyFall: %s    volume: %.2f   effect = %i\n", sSoundName.c_str(), volume, iEffectNum);
+    }
+
+    commandManager.PlaySound(sSoundName, trace.endpos, -1, volume, -1, -1, 1);
+
+    if (iEffectNum != -1) {
+        sfxManager.MakeEffect_Angles(iEffectNum, trace.endpos, Vector(270, 0, 0));
+    }
 }
 
 /*
@@ -1023,5 +1194,5 @@ qboolean ClientSpecialEffectsManager::EffectsPending()
 
 specialeffect_t *ClientSpecialEffectsManager::GetTestEffectPointer()
 {
-    return &m_effects[SPECIAL_EFFECT_TEST];
+    return &m_effects[SFX_TEST_EFFECT];
 }
diff --git a/code/cgame/cg_specialfx.h b/code/cgame/cg_specialfx.h
index 4a84e52c..9df6c06d 100644
--- a/code/cgame/cg_specialfx.h
+++ b/code/cgame/cg_specialfx.h
@@ -170,12 +170,9 @@ public:
     specialeffectcommand_t *AddNewCommand();
 };
 
-#define MAX_SPECIAL_EFFECTS 99
-#define SPECIAL_EFFECT_TEST MAX_SPECIAL_EFFECTS - 1
-
 class ClientSpecialEffectsManager : public Listener
 {
-    specialeffect_t m_effects[99];
+    specialeffect_t m_effects[SFX_COUNT];
     qboolean        m_bEffectsLoaded;
     int             m_iNumPendingEvents;
 
diff --git a/code/cgame/cg_tempmodels.cpp b/code/cgame/cg_tempmodels.cpp
index 4fac5ac2..3ce3ab04 100644
--- a/code/cgame/cg_tempmodels.cpp
+++ b/code/cgame/cg_tempmodels.cpp
@@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tiki.h"
 
 cvar_t *cg_showtempmodels;
+cvar_t *cg_max_tempmodels;
+cvar_t *cg_reserve_tempmodels;
 cvar_t *cg_detail;
 cvar_t *cg_effectdetail;
 cvar_t *cg_effect_physicsrate;
@@ -77,6 +79,11 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t *p)
 
     RemoveClientEntity(p->number, p->cgd.tiki, NULL, p);
 
+    if (m_active_tempmodels.next == p) {
+        // use the next active temp model
+        m_active_tempmodels.next = p->next;
+    }
+
     // remove from the doubly linked active list
     p->prev->next = p->next;
     p->next->prev = p->prev;
@@ -84,8 +91,101 @@ void ClientGameCommandManager::FreeTempModel(ctempmodel_t *p)
     // the free list is only singly linked
     p->next           = m_free_tempmodels;
     m_free_tempmodels = p;
+
+    if (p->m_spawnthing) {
+        p->m_spawnthing->numtempmodels--;
+        // delete unused spawnthings
+        if (!p->m_spawnthing->numtempmodels) {
+            m_emitters.RemoveObject(p->m_spawnthing);
+
+            if (p->m_spawnthing == m_spawnthing) {
+                m_spawnthing = NULL;
+            }
+
+            delete p->m_spawnthing;
+        }
+
+        p->m_spawnthing = NULL;
+    }
 }
 
+//===============
+// FreeAllTempModels
+//===============
+void ClientGameCommandManager::FreeAllTempModels(void)
+{
+    ctempmodel_t *p, *next;
+
+    // Go through all the temp models and run the physics if necessary,
+    // then add them to the ref
+    p = m_active_tempmodels.prev;
+    for (; p != &m_active_tempmodels; p = next) {
+        // grab next now, so if the local entity is freed we still have it
+        next = p->prev;
+        FreeTempModel(p);
+    }
+}
+
+//===============
+// FreeSomeTempModels
+//===============
+void ClientGameCommandManager::FreeSomeTempModels(void)
+{
+    ctempmodel_t *model;
+    int           count = 0;
+    unsigned int  i;
+    unsigned int  numToFree;
+
+    if (!m_free_tempmodels) {
+        return;
+    }
+
+    for (model = m_active_tempmodels.prev; model != &m_active_tempmodels; model = model->prev) {
+        count++;
+    }
+
+    if (cg_reserve_tempmodels->integer <= (cg_max_tempmodels->integer - count)) {
+        // nothing to free
+        return;
+    }
+
+    numToFree = cg_reserve_tempmodels->integer - (cg_max_tempmodels->integer - count);
+
+    for (i = 0; i < numToFree; i++) {
+        FreeTempModel(m_active_tempmodels.prev);
+    }
+}
+
+//===============
+// FreeSpawnthing
+//===============
+void ClientGameCommandManager::FreeSpawnthing(spawnthing_t *sp)
+{
+    ctempmodel_t *model;
+    ctempmodel_t *prev;
+
+    if (sp->numtempmodels) {
+        for (model = m_active_tempmodels.prev; model != &m_active_tempmodels; model = prev) {
+            prev = model->prev;
+
+            if (model->m_spawnthing == sp) {
+                FreeTempModel(model);
+            }
+        }
+    } else {
+        m_emitters.RemoveObject(sp);
+
+        if (sp == m_spawnthing) {
+            m_spawnthing = NULL;
+        }
+
+        delete sp;
+    }
+}
+
+//===============
+// ResetTempModels
+//===============
 void ClientGameCommandManager::ResetTempModels(void)
 {
     // Go through all the active tempmodels and free them
@@ -99,6 +199,7 @@ void ClientGameCommandManager::ResetTempModels(void)
 }
 
 static int lastTempModelFrameTime = 0;
+int        next_tempmodel_warning = 0;
 
 void CG_ResetTempModels(void)
 {
@@ -127,10 +228,29 @@ void ClientGameCommandManager::InitializeTempModels(void)
 
 void ClientGameCommandManager::InitializeTempModelCvars(void)
 {
-    cg_showtempmodels     = cgi.Cvar_Get("cg_showtempmodels", "0", 0);
-    cg_detail             = cgi.Cvar_Get("detail", "1", 1);
-    cg_effectdetail       = cgi.Cvar_Get("cg_effectdetail", "0.2", 1);
-    cg_effect_physicsrate = cgi.Cvar_Get("cg_effect_physicsrate", "10", 1);
+    cg_showtempmodels = cgi.Cvar_Get("cg_showtempmodels", "0", 0);
+    cg_detail         = cgi.Cvar_Get("detail", "1", CVAR_ARCHIVE);
+
+    cg_effectdetail = cgi.Cvar_Get("cg_effectdetail", "0.2", CVAR_ARCHIVE);
+    cgi.Cvar_CheckRange(cg_effectdetail, 0.2, 1.0, qfalse);
+
+    cg_effect_physicsrate = cgi.Cvar_Get("cg_effect_physicsrate", "10", CVAR_ARCHIVE);
+    cg_max_tempmodels     = cgi.Cvar_Get("cg_max_tempmodels", "1100", CVAR_ARCHIVE);
+    cgi.Cvar_CheckRange(cg_max_tempmodels, 200, MAX_TEMPMODELS, qtrue);
+
+    cg_reserve_tempmodels = cgi.Cvar_Get("cg_reserve_tempmodels", "200", CVAR_ARCHIVE);
+
+    if (cg_max_tempmodels->integer > MAX_TEMPMODELS) {
+        // 2.40 sets the integer value directly rather than calling Cvar_Set()
+        //cg_max_tempmodels->integer = MAX_TEMPMODELS
+        cgi.Cvar_Set("cg_max_tempmodels", va("%i", MAX_TEMPMODELS));
+    }
+
+    if (cg_reserve_tempmodels->integer * 5 > cg_max_tempmodels->integer) {
+        // 2.40 sets the integer value directly rather than calling Cvar_Set()
+        //cg_reserve_tempmodels->integer = cg_max_tempmodels->integer / 5;
+        cgi.Cvar_Set("cg_reserve_tempmodels", va("%i", cg_max_tempmodels->integer / 5));
+    }
 }
 
 //===============
@@ -138,9 +258,10 @@ void ClientGameCommandManager::InitializeTempModelCvars(void)
 //===============
 void ClientGameCommandManager::AnimateTempModel(ctempmodel_t *p, Vector origin, refEntity_t *newEnt)
 {
-    int numframes;
-    int deltatime;
-    int frametime;
+    int   numframes;
+    int   deltatime;
+    int   frametime;
+    float prev;
 
     // This code is for animating tempmodels that are spawned from the client
     // side
@@ -165,10 +286,18 @@ void ClientGameCommandManager::AnimateTempModel(ctempmodel_t *p, Vector origin,
 
     // Go through all the frames, and process any commands associated with the
     // tempmodel as well
+    prev = deltatime;
     while (deltatime >= frametime) {
+        deltatime -= frametime;
         p->lastAnimTime += frametime;
         p->ent.wasframe = (p->ent.wasframe + 1) % numframes;
         CG_ProcessEntityCommands(p->ent.wasframe, p->ent.frameInfo[0].index, -1, &p->ent, NULL);
+
+        if (deltatime == prev) {
+            break;
+        }
+
+        prev = deltatime;
     }
 }
 
@@ -208,9 +337,10 @@ void ClientGameCommandManager::UpdateSwarm(ctempmodel_t *p)
     }
 }
 
-qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t *p, float ftime, float dtime, float scale)
+qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t *p, float ftime, float scale)
 {
     float fade, fadein;
+    float dtime;
     byte  tempColor[4];
 
     if (p->cgd.flags & (T_FADE | T_SCALEUPDOWN)) {
@@ -314,9 +444,11 @@ qboolean ClientGameCommandManager::TempModelRealtimeEffects(ctempmodel_t *p, flo
 
         p->ent.shaderRGBA[0] = (int)((float)tempColor[0] * vLighting[0]);
         p->ent.shaderRGBA[1] = (int)((float)tempColor[1] * vLighting[1]);
+        p->ent.shaderRGBA[2] = (int)((float)tempColor[2] * vLighting[2]);
     } else {
         p->ent.shaderRGBA[0] = tempColor[0];
         p->ent.shaderRGBA[1] = tempColor[1];
+        p->ent.shaderRGBA[2] = tempColor[2];
     }
 
     if (p->cgd.flags & T_FADEIN && (fadein < 1)) // Do the fadein effect
@@ -362,9 +494,19 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
     vec3_t axis[3];
 
     if (p->number != -1) {
+        refEntity_t *old_entity;
+        dtiki_t     *old_tiki;
+        int          oldnum;
+        float        oldscale;
+
         // Set the axis
         AnglesToAxis(p->cgd.angles, axis);
 
+        old_entity = current_entity;
+        old_tiki   = current_tiki;
+        oldnum     = current_entity_number;
+        oldscale   = current_scale;
+
         current_scale         = newEnt->scale;
         current_entity        = newEnt;
         current_tiki          = p->cgd.tiki;
@@ -380,14 +522,23 @@ void ClientGameCommandManager::OtherTempModelEffects(ctempmodel_t *p, Vector ori
             commandManager.ProcessEvent(ev);
         }
 
-        current_entity_number = -1;
-        current_tiki          = NULL;
-        current_entity        = NULL;
-        current_scale         = -1;
+        current_entity_number = oldnum;
+        current_tiki          = old_tiki;
+        current_entity        = old_entity;
+        current_scale         = oldscale;
+    }
+
+    if (p->cgd.flags2 & T2_ALIGNSTRETCH) {
+        Vector vDelta;
+        float  fScale;
+
+        vDelta = p->cgd.origin - p->cgd.oldorigin;
+        fScale = vDelta.length() * p->cgd.scale2;
+        VectorScale(newEnt->axis[0], fScale, newEnt->axis[0]);
     }
 }
 
-qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime, float time2, float scale)
+qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime, float scale)
 {
     int     dtime;
     Vector  parentOrigin(0, 0, 0);
@@ -395,6 +546,7 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
     Vector  tempangles;
     trace_t trace;
     float   dot;
+    int     i;
 
     VectorCopy(p->ent.origin, p->lastEnt.origin);
     AxisCopy(p->ent.axis, p->lastEnt.axis);
@@ -406,37 +558,40 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
 
     // Update based on swarm
     if (p->cgd.flags & T_SWARM) {
-        p->cgd.origin += ftime * p->cgd.velocity * scale;
+        p->cgd.origin += p->cgd.velocity * ftime * scale;
     }
-
     // Update the orign and the angles based on velocities first
-    if (p->cgd.flags2 & (T2_MOVE | T2_ACCEL)) {
-        p->cgd.origin = p->cgd.origin + (p->cgd.velocity * ftime * scale) + (time2 * p->cgd.accel);
+    else if (p->cgd.flags2 & (T2_MOVE | T2_ACCEL)) {
+        p->cgd.origin += p->cgd.velocity * ftime * scale;
     }
 
     // If linked to the parent or hardlinked, get the parent's origin
     if ((p->cgd.flags & (T_PARENTLINK | T_HARDLINK)) && (p->cgd.parent != ENTITYNUM_NONE)) {
-        centity_t *pc;
+        centity_t   *pc;
+        refEntity_t *e;
+
         pc = &cg_entities[p->cgd.parent];
-
-        if (pc->currentValid) {
-            refEntity_t *e;
-
-            e = cgi.R_GetRenderEntity(p->cgd.parent);
-
-            if (!e) {
-                return false;
-            }
-
-            parentOrigin = e->origin;
-            vectoangles(e->axis[0], parentAngles);
-        } else {
+        if (!pc->currentValid) {
             return false;
         }
+
+        e = cgi.R_GetRenderEntity(p->cgd.parent);
+        if (!e) {
+            return false;
+        }
+
+        parentOrigin = e->origin;
+        vectoangles(e->axis[0], parentAngles);
     } else if (p->cgd.flags & T_SWARM) {
         p->cgd.parentOrigin = p->cgd.velocity + p->cgd.accel * ftime * scale;
     }
 
+    if (p->cgd.flags2 & T2_WATERONLY) {
+        if (!(cgi.CM_PointContents(p->cgd.origin, 0) & (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA))) {
+            return false;
+        }
+    }
+
     // Align the object along it's traveling vector
     if (p->cgd.flags & T_ALIGN) {
         p->cgd.angles = p->cgd.velocity.toAngles();
@@ -457,12 +612,12 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
     p->cgd.angles[1] = AngleMod(p->cgd.angles[1]);
     p->cgd.angles[2] = AngleMod(p->cgd.angles[2]);
 
-    // Add in parent angles
-    tempangles = p->cgd.angles + parentAngles;
-
     // Convert to axis
     if ((p->cgd.flags & (T_ALIGN | T_RANDOMROLL | T_PARENTLINK | T_HARDLINK | T_ANGLES))
         || (p->cgd.flags2 & T2_AMOVE)) {
+        // Add in parent angles
+        tempangles = p->cgd.angles + parentAngles;
+
         AnglesToAxis(tempangles, p->ent.axis);
     }
 
@@ -503,70 +658,68 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
         }
 
         if (p->cgd.flags2 & T2_CLAMP_VEL) {
-            if (p->cgd.velocity.x < p->cgd.minVel.x) {
-                p->cgd.velocity.x = p->cgd.minVel.x;
-            }
-            if (p->cgd.velocity.y < p->cgd.minVel.y) {
-                p->cgd.velocity.y = p->cgd.minVel.y;
-            }
-            if (p->cgd.velocity.z < p->cgd.minVel.z) {
-                p->cgd.velocity.z = p->cgd.minVel.z;
-            }
-
-            if (p->cgd.velocity.x > p->cgd.maxVel.x) {
-                p->cgd.velocity.x = p->cgd.maxVel.x;
-            }
-            if (p->cgd.velocity.y > p->cgd.maxVel.y) {
-                p->cgd.velocity.y = p->cgd.maxVel.y;
-            }
-            if (p->cgd.velocity.z > p->cgd.maxVel.z) {
-                p->cgd.velocity.z = p->cgd.maxVel.z;
-            }
-        }
-
-        if (p->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
+            p->cgd.velocity.x = Q_clamp_float(p->cgd.velocity.x, p->cgd.minVel.x, p->cgd.maxVel.x);
+            p->cgd.velocity.y = Q_clamp_float(p->cgd.velocity.y, p->cgd.minVel.y, p->cgd.maxVel.y);
+            p->cgd.velocity.z = Q_clamp_float(p->cgd.velocity.z, p->cgd.minVel.z, p->cgd.maxVel.z);
+        } else if (p->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
             Vector localVelocity;
             localVelocity.x = DotProduct(p->cgd.velocity, p->ent.axis[0]);
             localVelocity.y = DotProduct(p->cgd.velocity, p->ent.axis[1]);
             localVelocity.z = DotProduct(p->cgd.velocity, p->ent.axis[2]);
 
-            if (localVelocity.x < p->cgd.minVel.x) {
-                localVelocity.x = p->cgd.minVel.x;
-            }
-            if (localVelocity.y < p->cgd.minVel.y) {
-                localVelocity.y = p->cgd.minVel.y;
-            }
-            if (localVelocity.z < p->cgd.minVel.z) {
-                localVelocity.z = p->cgd.minVel.z;
-            }
-
-            if (localVelocity.x > p->cgd.maxVel.x) {
-                localVelocity.x = p->cgd.maxVel.x;
-            }
-            if (localVelocity.y > p->cgd.maxVel.y) {
-                localVelocity.y = p->cgd.maxVel.y;
-            }
-            if (localVelocity.z > p->cgd.maxVel.z) {
-                localVelocity.z = p->cgd.maxVel.z;
-            }
+            localVelocity.x = Q_clamp_float(localVelocity.x, p->cgd.minVel.x, p->cgd.maxVel.x);
+            localVelocity.y = Q_clamp_float(localVelocity.y, p->cgd.minVel.y, p->cgd.maxVel.y);
+            localVelocity.z = Q_clamp_float(localVelocity.z, p->cgd.minVel.z, p->cgd.maxVel.z);
 
             p->cgd.velocity.x = DotProduct(localVelocity, p->ent.axis[0]);
             p->cgd.velocity.y = DotProduct(localVelocity, p->ent.axis[1]);
             p->cgd.velocity.z = DotProduct(localVelocity, p->ent.axis[2]);
         }
 
-        if (p->cgd.flags2 & T_ALIGN) {
-            // FIXME: vss wind
+        if (p->cgd.flags2 & T2_WIND_AFFECT) {
+            for (i = 0; i < 3; i++) {
+                float fWind;
+
+                switch (i) {
+                case 0:
+                    fWind = vss_wind_x->value;
+                    break;
+                case 1:
+                    fWind = vss_wind_y->value;
+                    break;
+                case 2:
+                    fWind = vss_wind_z->value;
+                    break;
+                }
+
+                if (fWind < 0) {
+                    if (p->cgd.velocity[i] > fWind) {
+                        p->cgd.velocity[i] -= ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] > fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    } else if (p->cgd.velocity[i] < fWind) {
+                        p->cgd.velocity[i] += ftime * vss_movement_dampen->value;
+                        if (p->cgd.velocity[i] < fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    }
+                } else {
+                    if (p->cgd.velocity[i] < fWind) {
+                        p->cgd.velocity[i] += ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] > fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    } else if (p->cgd.velocity[i] > fWind) {
+                        p->cgd.velocity[i] -= ftime * vss_wind_strength->value;
+                        if (p->cgd.velocity[i] < fWind) {
+                            p->cgd.velocity[i] = fWind;
+                        }
+                    }
+                }
+            }
         }
     } else {
-        if (p->touchfcn) {
-            p->touchfcn(p, &trace);
-        }
-
-        if (p->cgd.flags & T_DIETOUCH) {
-            return false;
-        }
-
         Vector normal;
 
         // Set the origin
@@ -581,14 +734,14 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
                 trace.endpos,
                 trace.plane.normal,
                 p->cgd.decal_orientation,
+                p->cgd.decal_radius,
                 p->cgd.color[0],
                 p->cgd.color[1],
                 p->cgd.color[2],
                 p->cgd.alpha,
                 p->cgd.flags & T_FADE,
-                p->cgd.decal_radius,
                 p->cgd.flags2 & T2_TEMPORARY_DECAL,
-                p->cgd.lightstyle,
+                qtrue,
                 p->cgd.flags & T_FADEIN
             );
 
@@ -610,9 +763,10 @@ qboolean ClientGameCommandManager::TempModelPhysics(ctempmodel_t *p, float ftime
         dot             = p->cgd.velocity * normal;
         p->cgd.velocity = p->cgd.velocity + ((-2 * dot) * normal);
         p->cgd.velocity *= p->cgd.bouncefactor;
+        p->cgd.avelocity *= -p->cgd.bouncefactor;
 
         // check for stop
-        if (trace.plane.normal[2] > 0 && p->cgd.velocity[2] < 40) {
+        if (trace.plane.normal[2] > 0 && p->cgd.velocity[2] < 45) {
             p->cgd.velocity  = Vector(0, 0, 0);
             p->cgd.avelocity = Vector(0, 0, 0);
             p->cgd.flags &= ~T_WAVE;
@@ -685,7 +839,7 @@ qboolean ClientGameCommandManager::LerpTempModel(refEntity_t *newEnt, ctempmodel
         // Add the parent ent's origin to the local origin
         VectorAdd(newEnt->origin, parentOrigin, newEnt->origin);
     } else {
-        if (p->cgd.flags2 & (T2_MOVE | T2_ACCEL)) {
+        if (p->cgd.flags2 & (T2_MOVE | T2_ACCEL) || (p->cgd.flags & T_SWARM)) {
             // Lerp the ent's origin
             for (i = 0; i < 3; i++) {
                 newEnt->origin[i] = p->lastEnt.origin[i] + frac * (p->ent.origin[i] - p->lastEnt.origin[i]);
@@ -741,16 +895,18 @@ void ClientGameCommandManager::AddTempModels(void)
     refEntity_t  *old_ent;
 
     // To counteract cg.time going backwards
-    if (lastTempModelFrameTime) {
-        if ((cg.time < lastTempModelFrameTime) || (cg.time - lastTempModelFrameTime > TOO_MUCH_TIME_PASSED)) {
-            p = m_active_tempmodels.prev;
-            for (; p != &m_active_tempmodels; p = next) {
-                next               = p->prev;
-                p->lastPhysicsTime = cg.time;
-            }
-            lastTempModelFrameTime = cg.time;
-            return;
+    if (lastTempModelFrameTime
+        && ((cg.time < lastTempModelFrameTime) || (cg.time - lastTempModelFrameTime > TOO_MUCH_TIME_PASSED))) {
+        p = m_active_tempmodels.prev;
+        for (; p != &m_active_tempmodels; p = next) {
+            next               = p->prev;
+            p->lastPhysicsTime = cg.time;
         }
+        lastTempModelFrameTime = cg.time;
+        return;
+    }
+
+    if (lastTempModelFrameTime) {
         frameTime = cg.time - lastTempModelFrameTime;
     } else {
         frameTime = 0;
@@ -763,6 +919,7 @@ void ClientGameCommandManager::AddTempModels(void)
     }
 
     memset(&newEnt, 0, sizeof(newEnt));
+    newEnt.parentEntity = ENTITYNUM_NONE;
     // Set this frame time for the next one
     effectTime  = (float)frameTime / 1000.0f;
     effectTime2 = effectTime * effectTime;
@@ -793,7 +950,7 @@ void ClientGameCommandManager::AddTempModels(void)
         current_tiki          = p->cgd.tiki;
         current_entity_number = p->number;
 
-        TempModelRealtimeEffects(p, effectTime, effectTime2, scale);
+        TempModelRealtimeEffects(p, effectTime, scale);
 
         if (p->lastPhysicsTime) {
             mstime = cg.time - p->lastPhysicsTime;
@@ -808,8 +965,7 @@ void ClientGameCommandManager::AddTempModels(void)
 
             if ((mstime >= physics_rate) || (p->cgd.flags2 & T2_PHYSICS_EVERYFRAME)) {
                 ftime = mstime / 1000.0f;
-                time2 = ftime * ftime;
-                ret   = TempModelPhysics(p, ftime, time2, scale);
+                ret   = TempModelPhysics(p, ftime, scale);
 
                 if (!ret) {
                     FreeTempModel(p);
@@ -823,9 +979,8 @@ void ClientGameCommandManager::AddTempModels(void)
         // Calculate the lerp value based on the time passed since last physics
         // time of this tempmodel
         lerpfrac = (float)(cg.time - p->lastPhysicsTime) / (float)physics_rate;
-
         // Clamp
-        if (lerpfrac > 1) {
+        if (lerpfrac > 1 || (p->cgd.flags2 & T2_PHYSICS_EVERYFRAME)) {
             lerpfrac = 1;
         }
         if (lerpfrac < 0) {
@@ -843,11 +998,10 @@ void ClientGameCommandManager::AddTempModels(void)
 
         // Run physics if the lastEnt is not valid to get a valid lerp
         if (!p->lastEntValid) {
-            float t, t2;
-            t  = physics_rate / 1000.0f;
-            t2 = t * t;
+            float t;
+            t = physics_rate / 1000.0f;
 
-            ret = TempModelPhysics(p, t, t2, scale);
+            ret = TempModelPhysics(p, t, scale);
             if (!ret) {
                 FreeTempModel(p);
                 continue;
@@ -872,12 +1026,12 @@ void ClientGameCommandManager::AddTempModels(void)
         }
 
         if (p->cgd.flags & T_WAVE) {
-            Vector origin;
+            vec3_t origin;
             float  axis[3][3];
 
-            origin = Vector(p->m_spawnthing->linked_origin) + Vector(p->m_spawnthing->linked_axis[0]) * newEnt.origin[0]
-                   + Vector(p->m_spawnthing->linked_axis[1]) * newEnt.origin[1]
-                   + Vector(p->m_spawnthing->linked_axis[2]) * newEnt.origin[2];
+            VectorMA(p->m_spawnthing->linked_origin, newEnt.origin[0], p->m_spawnthing->linked_axis[0], origin);
+            VectorMA(origin, newEnt.origin[1], p->m_spawnthing->linked_axis[1], origin);
+            VectorMA(origin, newEnt.origin[2], p->m_spawnthing->linked_axis[2], origin);
 
             VectorCopy(origin, newEnt.origin);
 
@@ -891,7 +1045,10 @@ void ClientGameCommandManager::AddTempModels(void)
         newEnt.reType     = p->ent.reType;
         newEnt.shaderTime = p->ent.shaderTime;
 
-        newEnt.frameInfo[0] = p->ent.frameInfo[0];
+        newEnt.frameInfo[0].index  = p->ent.frameInfo[0].index;
+        newEnt.frameInfo[0].weight = 1.0;
+        newEnt.frameInfo[0].time   = 0.0;
+
         newEnt.wasframe     = p->ent.wasframe;
         newEnt.actionWeight = 1.0;
         newEnt.entityNumber = ENTITYNUM_NONE;
@@ -901,6 +1058,9 @@ void ClientGameCommandManager::AddTempModels(void)
 
         OtherTempModelEffects(p, newEnt.origin, &newEnt);
 
+        VectorCopy(newEnt.origin, newEnt.lightingOrigin);
+        newEnt.radius = 4.0;
+
         // Add to the ref
         if (p->cgd.flags & T_DLIGHT) {
             // Tempmodel is a Dynamic Light
@@ -960,6 +1120,14 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
     Vector        delta;
     Vector        start;
     Vector        vForward, vLeft, vUp;
+    float         fDist;
+
+    delta = m_spawnthing->cgd.origin - cg.refdef.vieworg;
+    fDist = delta * delta * (cg.refdef.fov_x * cg.refdef.fov_x / 6400.0);
+    if (fDist >= m_spawnthing->fMaxRangeSquared || fDist < m_spawnthing->fMinRangeSquared) {
+        // don't draw above the distance
+        return;
+    }
 
     if (current_entity) {
         current_entity_scale = current_entity->scale;
@@ -1003,7 +1171,11 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
         p = AllocateTempModel();
 
         if (!p) {
-            cgi.DPrintf("Out of tempmodels\n");
+            if (cgi.Milliseconds() >= next_tempmodel_warning) {
+                // make sure to not spam the console with this message
+                cgi.DPrintf("Out of tempmodels\n");
+                next_tempmodel_warning = cgi.Milliseconds() + 1000;
+            }
             return;
         }
 
@@ -1013,7 +1185,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
         if (m_spawnthing->cgd.flags & T_WAVE) {
             p->m_spawnthing = m_spawnthing;
             m_spawnthing->numtempmodels++;
-            start           = Vector(0, 0, 0);
+            start = Vector(0, 0, 0);
         } else {
             p->m_spawnthing = NULL;
             start           = m_spawnthing->cgd.origin;
@@ -1027,15 +1199,23 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
 
         // Set up the origin of the tempmodel
         if (m_spawnthing->cgd.flags & T_SPHERE) {
-            // Create a random forward vector so the particles burst out in a
-            // sphere
-            newForward = Vector(crandom(), crandom(), crandom());
+            do {
+                // Create a random forward vector so the particles burst out in a
+                // sphere
+                newForward = Vector(crandom(), crandom(), crandom());
+            } while (newForward * newForward > 1.0);
         } else if (m_spawnthing->cgd.flags & T_CIRCLE) {
             if (m_spawnthing->sphereRadius != 0) // Offset by the radius
             {
                 Vector dst;
                 // Create a circular shaped burst around the up vector
-                float angle = ((float)count / (float)m_spawnthing->count) * 360; // * M_PI * 2;
+                float angle;
+
+                if (mcount == 1) {
+                    angle = random() * 360;
+                } else {
+                    angle = ((float)count / (float)m_spawnthing->count) * 360; // * M_PI * 2;
+                }
 
                 Vector end = Vector(vLeft) * m_spawnthing->sphereRadius * current_entity_scale;
                 RotatePointAroundVector(dst, Vector(vForward), end, angle);
@@ -1044,12 +1224,14 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
                 newForward = p->cgd.origin - m_spawnthing->cgd.origin;
                 newForward.normalize();
             }
-        } else if (m_spawnthing->cgd.flags & T_SPHERE) {
+        } else if (m_spawnthing->cgd.flags & T_INWARDSPHERE) {
             // Project the origin along a random ray, and set the forward
             // vector pointing back to the origin
             Vector dir, end;
 
-            dir = Vector(crandom(), crandom(), crandom());
+            do {
+                dir = Vector(crandom(), crandom(), crandom());
+            } while (dir * dir > 1.0);
 
             end = m_spawnthing->cgd.origin + dir * m_spawnthing->sphereRadius * current_entity_scale;
             VectorCopy(end, p->cgd.origin);
@@ -1078,10 +1260,9 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             cosa   = cos(fAngle);
 
             p->cgd.origin = start + vForward * fHeight;
-            p->cgd.origin += start + vLeft * (cosa * fRadius);
-            p->cgd.origin += start + vUp * (sina * fRadius);
-        } else if (m_spawnthing->sphereRadius != 0) // Offset in a spherical pattern
-        {
+            p->cgd.origin += vLeft * (cosa * fRadius);
+            p->cgd.origin += vUp * (sina * fRadius);
+        } else if (m_spawnthing->sphereRadius != 0) { // Offset in a spherical pattern
             Vector dir, end;
 
             dir = Vector(crandom(), crandom(), crandom());
@@ -1092,7 +1273,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             VectorCopy(end, p->cgd.origin);
             newForward = dir;
         } else {
-            VectorCopy(m_spawnthing->cgd.origin, p->cgd.origin);
+            VectorCopy(start, p->cgd.origin);
         }
 
         if (m_spawnthing->cgd.flags & T_SWARM && !(m_spawnthing->cgd.flags & (T_HARDLINK | T_PARENTLINK))) {
@@ -1287,7 +1468,7 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             p->cgd.avelocity[i] = m_spawnthing->avelocity_amplitude[i] * random() + m_spawnthing->avelocity_base[i];
 
             // Randomize angles or set absolute
-            p->cgd.angles[i] += random() * m_spawnthing->angles_amplitude[i];
+            p->cgd.angles[i] = m_spawnthing->angles_amplitude[i] * random() + m_spawnthing->cgd.angles[i];
         }
 
         // If forward velocity is set, just use that otherwise use random
@@ -1321,18 +1502,15 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
             }
         }
 
-        // Calculate one tick of velocity based on time alive ( passed in )
-        p->cgd.origin = p->cgd.origin + (p->cgd.velocity * ((float)p->aliveTime / 1000.0f) * current_entity_scale);
-
-        if (p->cgd.flags2 & T2_ACCEL) {
+        if (m_spawnthing->cgd.flags2 & T2_RADIALVELOCITY) {
             float fLength;
 
             p->cgd.velocity = p->cgd.origin - start;
 
             fLength = p->cgd.velocity.length();
             if (fLength) {
-                float fVel = m_spawnthing->cgd.velocity.x
-                           + (m_spawnthing->cgd.velocity.y + m_spawnthing->cgd.velocity.z * crandom()) / fLength;
+                float fVel = m_spawnthing->cgd.velocity[0]
+                           + (m_spawnthing->cgd.velocity[1] + m_spawnthing->cgd.velocity[2] * random()) / fLength;
 
                 p->cgd.velocity *= fVel;
             }
@@ -1343,20 +1521,22 @@ void ClientGameCommandManager::SpawnTempModel(int mcount)
                 (m_spawnthing->randvel_base[i] + m_spawnthing->randvel_amplitude[i] * random()) * current_entity_scale;
 
             if (m_spawnthing->cgd.flags & T_RANDVELAXIS) {
-                p->cgd.velocity += fVel * Vector(m_spawnthing->tag_axis[i]);
+                if (p->cgd.flags2 & T2_NOTAGAXIS) {
+                    p->cgd.velocity += fVel * Vector(m_spawnthing->axis[i]);
+                } else {
+                    p->cgd.velocity += fVel * Vector(m_spawnthing->tag_axis[i]);
+                }
             } else {
                 p->cgd.velocity[i] += fVel;
             }
         }
 
         if (p->cgd.flags & (T_ALIGN | T_DETAIL)) {
-            if (p->cgd.velocity.x && p->cgd.velocity.y) {
-                p->cgd.angles = p->cgd.velocity.toAngles();
-            }
-
-            p->cgd.origin += p->cgd.velocity * (p->aliveTime / 1000.0) * current_entity_scale;
+            p->cgd.angles = p->cgd.velocity.toAngles();
         }
 
+        p->cgd.origin += p->cgd.velocity * (p->aliveTime / 1000.0) * current_entity_scale;
+
         if (p->cgd.flags & T_AUTOCALCLIFE) {
             Vector  end, delta;
             float   length, speed;
diff --git a/code/cgame/cg_testemitter.cpp b/code/cgame/cg_testemitter.cpp
index 3fc360fe..760cd55f 100644
--- a/code/cgame/cg_testemitter.cpp
+++ b/code/cgame/cg_testemitter.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,6 +26,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cg_commands.h"
 #include "cg_specialfx.h"
 
+typedef enum te_mode_e {
+    TE_MODE_EMITTER,
+    TE_MODE_MODEL_ANIM,
+    TE_MODE_MODEL_INIT,
+    TE_MODE_SFX,
+} te_mode_t;
+
 cvar_t *cg_te_alpha;
 cvar_t *cg_te_dietouch;
 cvar_t *cg_te_bouncefactor;
@@ -101,6 +108,7 @@ cvar_t *cg_te_radial_scale;
 cvar_t *cg_te_radial_min;
 cvar_t *cg_te_radial_max;
 cvar_t *cg_te_friction;
+cvar_t *cg_te_spin; // Added in 2.0
 cvar_t *cg_te_varycolor;
 cvar_t *cg_te_spritegridlighting;
 cvar_t *cg_te_cone_height;
@@ -113,18 +121,22 @@ cvar_t *cg_te_tag;
 cvar_t *cg_te_xangles;
 cvar_t *cg_te_yangles;
 cvar_t *cg_te_zangles;
-class specialeffect_t;
-refEntity_t      te_refEnt;
-cvar_t          *cg_te_emittermodel;
-cvar_t          *cg_te_mode;
-cvar_t          *cg_te_mode_name;
-cvar_t          *cg_te_currCommand;
-cvar_t          *cg_te_numCommands;
-float            te_vEmitterOrigin[3];
-int              te_iNumCommands;
-int              te_iCurrCommand;
+cvar_t *cg_te_emittermodel;
+cvar_t *cg_te_mode;
+cvar_t *cg_te_mode_name;
+cvar_t *cg_te_currCommand;
+cvar_t *cg_te_numCommands;
+
+refEntity_t te_refEnt;
+float       te_vEmitterOrigin[3];
+int         te_iNumCommands;
+int         te_iCurrCommand;
+
 specialeffect_t *pTesteffect;
 
+specialeffectcommand_t *pCurrCommand;
+spawnthing_t           *pCurrSpawnthing;
+
 #define MAX_TESTEMITTERS_SAVE 32
 
 str cg_te_alphaG[MAX_TESTEMITTERS_SAVE];
@@ -202,6 +214,7 @@ str cg_te_radial_scaleG[MAX_TESTEMITTERS_SAVE];
 str cg_te_radial_minG[MAX_TESTEMITTERS_SAVE];
 str cg_te_radial_maxG[MAX_TESTEMITTERS_SAVE];
 str cg_te_frictionG[MAX_TESTEMITTERS_SAVE];
+str cg_te_spinG[MAX_TESTEMITTERS_SAVE]; // Added in 2.0
 str cg_te_varycolorG[MAX_TESTEMITTERS_SAVE];
 str cg_te_spritegridlightingG[MAX_TESTEMITTERS_SAVE];
 str cg_te_spawnrange_aG[MAX_TESTEMITTERS_SAVE];
@@ -291,6 +304,7 @@ void CG_SaveEffectCommandCvars(int iCommand)
     cg_te_radial_minG[iCommand]         = cg_te_radial_min->string;
     cg_te_radial_maxG[iCommand]         = cg_te_radial_max->string;
     cg_te_frictionG[iCommand]           = cg_te_friction->string;
+    cg_te_spinG[iCommand]               = cg_te_spin->string; // Added in 2.0
     cg_te_varycolorG[iCommand]          = cg_te_varycolor->string;
     cg_te_spritegridlightingG[iCommand] = cg_te_spritegridlighting->string;
     cg_te_spawnrange_aG[iCommand]       = cg_te_spawnrange_a->string;
@@ -302,77 +316,1674 @@ void CG_SaveEffectCommandCvars(int iCommand)
     cg_te_tagG[iCommand]                = cg_te_tag->string;
 }
 
+void CG_GetEffectCommandCvars(int iCommand)
+{
+    cgi.Cvar_Set("cg_te_alpha", cg_te_alphaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_dietouch", cg_te_dietouchG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_bouncefactor", cg_te_bouncefactorG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scale", cg_te_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalemin", cg_te_scaleminG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalemax", cg_te_scalemaxG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_model", cg_te_modelG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_life", cg_te_lifeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_r", cg_te_color_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_g", cg_te_color_gG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_color_b", cg_te_color_bG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_x", cg_te_accel_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_y", cg_te_accel_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_accel_z", cg_te_accel_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_count", cg_te_countG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fade", cg_te_fadeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fadedelay", cg_te_fadedelayG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_fadein", cg_te_fadeinG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrate", cg_te_spawnrateG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_x", cg_te_offsbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_y", cg_te_offsbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsbase_z", cg_te_offsbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_x", cg_te_offsamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_y", cg_te_offsamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_offsamp_z", cg_te_offsamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_scalerate", cg_te_scalerateG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_circle", cg_te_circleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_sphere", cg_te_sphereG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_insphere", cg_te_insphereG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radius", cg_te_radiusG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_align", cg_te_alignG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_flickeralpha", cg_te_flickeralphaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_collision", cg_te_collisionG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randomroll", cg_te_randomrollG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_p", cg_te_anglesbase_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_y", cg_te_anglesbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesbase_r", cg_te_anglesbase_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_p", cg_te_anglesamp_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_y", cg_te_anglesamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_anglesamp_r", cg_te_anglesamp_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_forwardvel", cg_te_forwardvelG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_x", cg_te_randvelbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_y", cg_te_randvelbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelbase_z", cg_te_randvelbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_x", cg_te_randvelamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_y", cg_te_randvelamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randvelamp_z", cg_te_randvelamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_x", cg_te_clampvelmin_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_x", cg_te_clampvelmax_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_y", cg_te_clampvelmin_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_y", cg_te_clampvelmax_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmin_z", cg_te_clampvelmin_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelmax_z", cg_te_clampvelmax_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_clampvelaxis", cg_te_clampvelaxisG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_volumetric", cg_te_volumetricG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_randaxis", cg_te_randaxisG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_x", cg_te_axisoffsbase_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_y", cg_te_axisoffsbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsbase_z", cg_te_axisoffsbase_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_x", cg_te_axisoffsamp_xG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_y", cg_te_axisoffsamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_axisoffsamp_z", cg_te_axisoffsamp_zG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_freq", cg_te_swarm_freqG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_maxspeed", cg_te_swarm_maxspeedG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_swarm_delta", cg_te_swarm_deltaG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_p", cg_te_avelbase_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_y", cg_te_avelbase_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelbase_r", cg_te_avelbase_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_p", cg_te_avelamp_pG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_y", cg_te_avelamp_yG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_avelamp_r", cg_te_avelamp_rG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_scale", cg_te_radial_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_min", cg_te_radial_minG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_radial_max", cg_te_radial_maxG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_friction", cg_te_frictionG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spin", cg_te_spinG[iCommand].c_str()); // Added in 2.0
+    cgi.Cvar_Set("cg_te_varycolor", cg_te_varycolorG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spritegridlighting", cg_te_spritegridlightingG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrange_a", cg_te_spawnrange_aG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_spawnrnage_b", cg_te_spawnrange_bG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_cone_height", cg_te_cone_heightG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_alignstretch_scale", cg_te_alignstretch_scaleG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_command_time", cg_te_command_timeG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_singlelinecommand", cg_te_singlelinecommandG[iCommand].c_str());
+    cgi.Cvar_Set("cg_te_tag", cg_te_tagG[iCommand].c_str());
+}
+
 void CG_ResetEffectCommandCvars()
 {
-    // FIXME: unimplemented
+    cgi.Cvar_Set("cg_te_alpha", "1");
+    cgi.Cvar_Set("cg_te_dietouch", "0");
+    cgi.Cvar_Set("cg_te_bouncefactor", "0.3");
+    cgi.Cvar_Set("cg_te_scale", "1");
+    cgi.Cvar_Set("cg_te_scalemin", "0");
+    cgi.Cvar_Set("cg_te_scalemax", "0");
+    cgi.Cvar_Set("cg_te_model", "none");
+    cgi.Cvar_Set("cg_te_life", "1");
+    cgi.Cvar_Set("cg_te_color_r", "1");
+    cgi.Cvar_Set("cg_te_color_g", "1");
+    cgi.Cvar_Set("cg_te_color_b", "1");
+    cgi.Cvar_Set("cg_te_accel_x", "0");
+    cgi.Cvar_Set("cg_te_accel_y", "0");
+    cgi.Cvar_Set("cg_te_accel_z", "0");
+    cgi.Cvar_Set("cg_te_count", "1");
+    cgi.Cvar_Set("cg_te_fade", "0");
+    cgi.Cvar_Set("cg_te_fadedelay", "0");
+    cgi.Cvar_Set("cg_te_fadein", "0");
+    cgi.Cvar_Set("cg_te_spawnrate", "1");
+    cgi.Cvar_Set("cg_te_offsbase_x", "0");
+    cgi.Cvar_Set("cg_te_offsbase_y", "0");
+    cgi.Cvar_Set("cg_te_offsbase_z", "0");
+    cgi.Cvar_Set("cg_te_offsamp_x", "0");
+    cgi.Cvar_Set("cg_te_offsamp_y", "0");
+    cgi.Cvar_Set("cg_te_offsamp_z", "0");
+    cgi.Cvar_Set("cg_te_scalerate", "0");
+    cgi.Cvar_Set("cg_te_circle", "0");
+    cgi.Cvar_Set("cg_te_sphere", "0");
+    cgi.Cvar_Set("cg_te_insphere", "0");
+    cgi.Cvar_Set("cg_te_radius", "0");
+    cgi.Cvar_Set("cg_te_align", "0");
+    cgi.Cvar_Set("cg_te_flickeralpha", "0");
+    cgi.Cvar_Set("cg_te_collision", "0");
+    cgi.Cvar_Set("cg_te_randomroll", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_p", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_y", "0");
+    cgi.Cvar_Set("cg_te_anglesbase_r", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_p", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_y", "0");
+    cgi.Cvar_Set("cg_te_anglesamp_r", "0");
+    cgi.Cvar_Set("cg_te_forwardvel", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_x", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_y", "0");
+    cgi.Cvar_Set("cg_te_randvelbase_z", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_x", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_y", "0");
+    cgi.Cvar_Set("cg_te_randvelamp_z", "0");
+    cgi.Cvar_Set("cg_te_clampvelmin_x", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_x", "9999");
+    cgi.Cvar_Set("cg_te_clampvelmin_y", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_y", "9999");
+    cgi.Cvar_Set("cg_te_clampvelmin_z", "-9999");
+    cgi.Cvar_Set("cg_te_clampvelmax_z", "9999");
+    cgi.Cvar_Set("cg_te_clampvelaxis", "0");
+    cgi.Cvar_Set("cg_te_volumetric", "0");
+    cgi.Cvar_Set("cg_te_randaxis", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_x", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_y", "0");
+    cgi.Cvar_Set("cg_te_axisoffsbase_z", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_x", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_y", "0");
+    cgi.Cvar_Set("cg_te_axisoffsamp_z", "0");
+    cgi.Cvar_Set("cg_te_swarm_freq", "0");
+    cgi.Cvar_Set("cg_te_swarm_maxspeed", "0");
+    cgi.Cvar_Set("cg_te_swarm_delta", "0");
+    cgi.Cvar_Set("cg_te_avelbase_p", "0");
+    cgi.Cvar_Set("cg_te_avelbase_y", "0");
+    cgi.Cvar_Set("cg_te_avelbase_r", "0");
+    cgi.Cvar_Set("cg_te_avelamp_p", "0");
+    cgi.Cvar_Set("cg_te_avelamp_y", "0");
+    cgi.Cvar_Set("cg_te_avelamp_r", "0");
+    cgi.Cvar_Set("cg_te_radial_scale", "0");
+    cgi.Cvar_Set("cg_te_radial_min", "0");
+    cgi.Cvar_Set("cg_te_radial_max", "0");
+    cgi.Cvar_Set("cg_te_friction", "0");
+    cgi.Cvar_Set("cg_te_spin", "0"); // Added in 2.0
+    cgi.Cvar_Set("cg_te_varycolor", "0");
+    cgi.Cvar_Set("cg_te_spritegridlighting", "0");
+    cgi.Cvar_Set("cg_te_spawnrange_a", "0");
+    cgi.Cvar_Set("cg_te_spawnrange_b", "0");
+    cgi.Cvar_Set("cg_te_cone_height", "0");
+    cgi.Cvar_Set("cg_te_alignstretch_scale", "0");
+    cgi.Cvar_Set("cg_te_command_time", "0");
+    cgi.Cvar_Set("cg_te_singlelinecommand", "");
+    cgi.Cvar_Set("cg_te_tag", "");
 }
 
 void CG_SetTestEmitterValues()
 {
-    // FIXME: unimplemented
+    int    i;
+    int    iTagNum;
+    vec3_t vAngles;
+    vec3_t vOrigin;
+    vec3_t axis[3];
+
+    pCurrSpawnthing->cgd.flags2 |= T2_ACCEL | T2_AMOVE | T2_MOVE;
+
+    if (te_refEnt.scale > 0 && Q_stricmp(cg_te_tag->string, "") && cg_te_mode->integer != TE_MODE_SFX) {
+        iTagNum = cgi.Tag_NumForName(te_refEnt.tiki, cg_te_tag->string);
+    } else {
+        iTagNum = -1;
+    }
+
+    VectorCopy(te_vEmitterOrigin, vOrigin);
+
+    if (iTagNum != -1) {
+        orientation_t oTag;
+
+        oTag = cgi.TIKI_Orientation(&te_refEnt, iTagNum);
+        for (i = 0; i < 3; ++i) {
+            VectorMA(vOrigin, oTag.origin[i], te_refEnt.axis[i], vOrigin);
+        }
+
+        R_ConcatRotations(oTag.axis, te_refEnt.axis, axis);
+    } else {
+        vAngles[0] = cg_te_xangles->value;
+        vAngles[1] = cg_te_yangles->value;
+        vAngles[2] = cg_te_zangles->value;
+        AnglesToAxis(vAngles, axis);
+    }
+
+    VectorCopy(vOrigin, pCurrSpawnthing->cgd.origin);
+    pCurrSpawnthing->SetModel(cg_te_model->string);
+
+    AxisCopy(axis, pCurrSpawnthing->axis);
+
+    pCurrSpawnthing->cgd.alpha        = cg_te_alpha->value;
+    pCurrSpawnthing->cgd.color[3]     = cg_te_alpha->value;
+    pCurrSpawnthing->cgd.bouncefactor = cg_te_bouncefactor->value;
+    pCurrSpawnthing->cgd.scale        = cg_te_scale->value;
+    pCurrSpawnthing->cgd.life         = cg_te_life->value * 1000.0;
+    pCurrSpawnthing->cgd.color[0]     = cg_te_color_r->value;
+    pCurrSpawnthing->cgd.color[1]     = cg_te_color_g->value;
+    pCurrSpawnthing->cgd.color[2]     = cg_te_color_b->value;
+
+    if (cg_te_varycolor->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_VARYCOLOR;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_VARYCOLOR;
+    }
+
+    if (cg_te_spritegridlighting->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_SPRITEGRIDLIGHTING;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_SPRITEGRIDLIGHTING;
+    }
+
+    pCurrSpawnthing->cgd.accel[0] = cg_te_accel_x->value;
+    pCurrSpawnthing->cgd.accel[1] = cg_te_accel_y->value;
+    pCurrSpawnthing->cgd.accel[2] = cg_te_accel_z->value;
+
+    pCurrSpawnthing->count     = cg_te_count->value;
+    pCurrSpawnthing->spawnRate = 1.0 / cg_te_spawnrate->value * 1000.0;
+
+    if (cg_te_spawnrange_a->value || cg_te_spawnrange_b->value) {
+        vAngles[0] = Square(cg_te_spawnrange_a->value);
+        vAngles[1] = Square(cg_te_spawnrange_b->value);
+
+        if (vAngles[0] > vAngles[1]) {
+            pCurrSpawnthing->fMaxRangeSquared = vAngles[0];
+            pCurrSpawnthing->fMinRangeSquared = vAngles[1];
+        } else {
+            pCurrSpawnthing->fMinRangeSquared = vAngles[0];
+            pCurrSpawnthing->fMaxRangeSquared = vAngles[2];
+        }
+    } else {
+        pCurrSpawnthing->fMinRangeSquared = 0.0;
+        pCurrSpawnthing->fMaxRangeSquared = 9.9999997e37f;
+    }
+
+    pCurrSpawnthing->cgd.scaleRate = cg_te_scalerate->value;
+    pCurrSpawnthing->sphereRadius  = cg_te_radius->value;
+
+    if (cg_te_cone_height->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_CONE;
+        pCurrSpawnthing->coneHeight = cg_te_cone_height->value;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_CONE;
+    }
+
+    pCurrSpawnthing->forwardVelocity = cg_te_forwardvel->value;
+    if (cg_te_friction->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_FRICTION;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_FRICTION;
+    }
+
+    //
+    // Added in 2.0
+    //
+    if (cg_te_spin->value) {
+        pCurrSpawnthing->cgd.flags2 |= T2_SPIN;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_SPIN;
+    }
+
+    pCurrSpawnthing->origin_offset_base[0]      = cg_te_offsbase_x->value;
+    pCurrSpawnthing->origin_offset_base[1]      = cg_te_offsbase_y->value;
+    pCurrSpawnthing->origin_offset_base[2]      = cg_te_offsbase_z->value;
+    pCurrSpawnthing->origin_offset_amplitude[0] = cg_te_offsamp_x->value;
+    pCurrSpawnthing->origin_offset_amplitude[1] = cg_te_offsamp_y->value;
+    pCurrSpawnthing->origin_offset_amplitude[2] = cg_te_offsamp_z->value;
+
+    pCurrSpawnthing->axis_offset_base[0]      = cg_te_axisoffsbase_x->value;
+    pCurrSpawnthing->axis_offset_base[1]      = cg_te_axisoffsbase_y->value;
+    pCurrSpawnthing->axis_offset_base[2]      = cg_te_axisoffsbase_z->value;
+    pCurrSpawnthing->axis_offset_amplitude[0] = cg_te_axisoffsamp_x->value;
+    pCurrSpawnthing->axis_offset_amplitude[1] = cg_te_axisoffsamp_y->value;
+    pCurrSpawnthing->axis_offset_amplitude[2] = cg_te_axisoffsamp_z->value;
+
+    pCurrSpawnthing->cgd.angles[0]       = cg_te_anglesbase_p->value;
+    pCurrSpawnthing->cgd.angles[1]       = cg_te_anglesbase_y->value;
+    pCurrSpawnthing->cgd.angles[2]       = cg_te_anglesbase_r->value;
+    pCurrSpawnthing->angles_amplitude[0] = cg_te_anglesamp_p->value;
+    pCurrSpawnthing->angles_amplitude[1] = cg_te_anglesamp_y->value;
+    pCurrSpawnthing->angles_amplitude[2] = cg_te_anglesamp_r->value;
+
+    if (!VectorCompare(pCurrSpawnthing->cgd.angles, vec_zero)
+        || !VectorCompare(pCurrSpawnthing->angles_amplitude, vec_zero)) {
+        pCurrSpawnthing->cgd.flags |= T_ANGLES;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_ANGLES;
+    }
+
+    pCurrSpawnthing->avelocity_base[0]      = cg_te_avelbase_p->value;
+    pCurrSpawnthing->avelocity_base[1]      = cg_te_avelbase_y->value;
+    pCurrSpawnthing->avelocity_base[2]      = cg_te_avelbase_r->value;
+    pCurrSpawnthing->avelocity_amplitude[0] = cg_te_avelamp_p->value;
+    pCurrSpawnthing->avelocity_amplitude[1] = cg_te_avelamp_y->value;
+    pCurrSpawnthing->avelocity_amplitude[2] = cg_te_avelamp_r->value;
+
+    pCurrSpawnthing->randvel_base[0]      = cg_te_randvelbase_x->value;
+    pCurrSpawnthing->randvel_base[1]      = cg_te_randvelbase_y->value;
+    pCurrSpawnthing->randvel_base[2]      = cg_te_randvelbase_z->value;
+    pCurrSpawnthing->randvel_amplitude[0] = cg_te_randvelamp_x->value;
+    pCurrSpawnthing->randvel_amplitude[1] = cg_te_randvelamp_y->value;
+    pCurrSpawnthing->randvel_amplitude[2] = cg_te_randvelamp_z->value;
+
+    if (cg_te_randaxis->integer) {
+        pCurrSpawnthing->cgd.flags |= T_RANDVELAXIS;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDVELAXIS;
+    }
+
+    if (cg_te_radial_scale->value || cg_te_radial_min->value || cg_te_radial_max->value) {
+        pCurrSpawnthing->cgd.velocity[0] = cg_te_radial_scale->value;
+        pCurrSpawnthing->cgd.velocity[1] = cg_te_radial_min->value;
+        pCurrSpawnthing->cgd.velocity[2] = cg_te_radial_max->value;
+        pCurrSpawnthing->cgd.velocity[2] -= pCurrSpawnthing->cgd.velocity[1];
+
+        pCurrSpawnthing->cgd.flags2 |= T2_RADIALVELOCITY;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_RADIALVELOCITY;
+    }
+
+    pCurrSpawnthing->cgd.minVel[0] = cg_te_clampvelmin_x->value;
+    pCurrSpawnthing->cgd.maxVel[0] = cg_te_clampvelmax_x->value;
+    pCurrSpawnthing->cgd.minVel[1] = cg_te_clampvelmin_y->value;
+    pCurrSpawnthing->cgd.maxVel[1] = cg_te_clampvelmax_y->value;
+    pCurrSpawnthing->cgd.minVel[2] = cg_te_clampvelmin_z->value;
+    pCurrSpawnthing->cgd.maxVel[2] = cg_te_clampvelmax_z->value;
+    pCurrSpawnthing->cgd.flags &= ~(T_GLOBALFADEIN | T_GLOBALFADEOUT);
+
+    if (pCurrSpawnthing->cgd.minVel[0] > -9999 || pCurrSpawnthing->cgd.minVel[1] > -9999
+        || pCurrSpawnthing->cgd.minVel[2] > -9999 || pCurrSpawnthing->cgd.maxVel[0] < 9999
+        || pCurrSpawnthing->cgd.maxVel[1] < 9999 || pCurrSpawnthing->cgd.maxVel[2] < 9999) {
+        if (cg_te_clampvelaxis->value) {
+            pCurrSpawnthing->cgd.flags |= T_GLOBALFADEOUT;
+        } else {
+            pCurrSpawnthing->cgd.flags |= T_GLOBALFADEIN;
+        }
+    }
+
+    pCurrSpawnthing->cgd.scalemin = cg_te_scalemin->value;
+    pCurrSpawnthing->cgd.scalemax = cg_te_scalemax->value;
+    if (pCurrSpawnthing->cgd.scalemin || pCurrSpawnthing->cgd.scalemax) {
+        pCurrSpawnthing->cgd.flags |= T_RANDSCALE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDSCALE;
+    }
+
+    if (cg_te_dietouch->integer) {
+        pCurrSpawnthing->cgd.flags |= T_DIETOUCH;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_DIETOUCH;
+    }
+
+    if (cg_te_fade->integer) {
+        pCurrSpawnthing->cgd.flags |= T_FADE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FADE;
+    }
+
+    if (cg_te_fadedelay->integer > 0) {
+        pCurrSpawnthing->cgd.flags |= T_FADE;
+        pCurrSpawnthing->cgd.fadedelay = cg_te_fadedelay->value * 1000.0;
+    }
+
+    if (cg_te_fadein->integer > 0) {
+        pCurrSpawnthing->cgd.flags |= T_FADEIN;
+        pCurrSpawnthing->cgd.fadeintime = cg_te_fadein->value * 1000.0;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FADEIN;
+    }
+
+    if (cg_te_circle->integer) {
+        pCurrSpawnthing->cgd.flags |= T_CIRCLE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_CIRCLE;
+    }
+
+    if (cg_te_sphere->integer) {
+        pCurrSpawnthing->cgd.flags |= T_SPHERE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_SPHERE;
+    }
+
+    if (cg_te_insphere->integer) {
+        pCurrSpawnthing->cgd.flags |= T_INWARDSPHERE;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_INWARDSPHERE;
+    }
+
+    if (cg_te_align->integer) {
+        pCurrSpawnthing->cgd.flags |= T_ALIGN;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_ALIGN;
+    }
+
+    if (cg_te_alignstretch_scale->integer) {
+        pCurrSpawnthing->cgd.flags |= T_ALIGN;
+        pCurrSpawnthing->cgd.flags2 |= T2_ALIGNSTRETCH;
+        pCurrSpawnthing->cgd.scale2 = cg_te_alignstretch_scale->value;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_ALIGNSTRETCH;
+    }
+
+    if (cg_te_flickeralpha->integer) {
+        pCurrSpawnthing->cgd.flags |= T_FLICKERALPHA;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_FLICKERALPHA;
+    }
+
+    if (cg_te_randomroll->integer) {
+        pCurrSpawnthing->cgd.flags |= T_RANDOMROLL;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_RANDOMROLL;
+    }
+
+    if (cg_te_volumetric->integer) {
+        pCurrSpawnthing->cgd.flags2 |= T2_VOLUMETRIC;
+    } else {
+        pCurrSpawnthing->cgd.flags2 &= ~T2_VOLUMETRIC;
+    }
+
+    if (cg_te_collision->integer == 2) {
+        pCurrSpawnthing->cgd.flags |= T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_WATER | CONTENTS_SOLID;
+    } else if (cg_te_collision->integer == 1 || (pCurrSpawnthing->cgd.flags & T_DIETOUCH)) {
+        pCurrSpawnthing->cgd.flags &= ~T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_SOLID;
+    } else {
+        pCurrSpawnthing->cgd.flags &= ~T_COLLISION;
+        pCurrSpawnthing->cgd.collisionmask = 0;
+    }
+
+    if (cg_te_swarm_freq->integer > 0 && cg_te_swarm_maxspeed->value > 0 && cg_te_swarm_delta->value > 0) {
+        pCurrSpawnthing->cgd.swarmfreq     = cg_te_swarm_freq->integer;
+        pCurrSpawnthing->cgd.swarmmaxspeed = cg_te_swarm_maxspeed->value;
+        pCurrSpawnthing->cgd.swarmdelta    = cg_te_swarm_delta->value;
+        pCurrSpawnthing->cgd.flags |= T_SWARM;
+        pCurrSpawnthing->cgd.flags &= ~T_SPHERE;
+    }
+
+    if (pCurrCommand) {
+        Event *pEvent;
+        int    argcount;
+
+        pCurrCommand->fCommandTime = cg_te_command_time->value;
+        pCurrCommand->endfcn       = &ClientGameCommandManager::TestEffectEndFunc;
+
+        if (pCurrCommand->pEvent) {
+            delete pCurrCommand->pEvent;
+            pCurrCommand->pEvent = NULL;
+        }
+
+        if (Q_stricmp(cg_te_singlelinecommand->string, "")) {
+            cgi.Cmd_TokenizeString(cg_te_singlelinecommand->string);
+
+            pEvent = new Event(cgi.Argv(0));
+
+            argcount = cgi.Argc();
+            for (i = 1; i < argcount; i++) {
+                pEvent->AddToken(cgi.Argv(i));
+            }
+
+            pCurrCommand->pEvent = pEvent;
+        }
+    }
 }
 
 void CG_UpdateTestEmitter(void)
 {
-    // FIXME: unimplemented
+    int            count;
+    Vector         vAng;
+    Vector         delta;
+    Vector         end, end2;
+    Vector         axis[3];
+    emittertime_t *et = NULL;
+
+    if (VectorCompare(te_vEmitterOrigin, vec_zero) || te_iNumCommands < 1) {
+        if (Q_stricmp(cg_te_mode_name->string, "Temp Emitter Off")) {
+            cgi.Cvar_Set("cg_te_mode_name", "Temp Emitter Off");
+        }
+        return;
+    }
+
+    cgi.Cvar_Set("cg_te_currCommand", va("%i", te_iCurrCommand + 1));
+    cgi.Cvar_Set("cg_te_numCommands", va("%i", te_iNumCommands));
+
+    switch (cg_te_mode->integer) {
+    case TE_MODE_MODEL_ANIM:
+        cgi.Cvar_Set("cg_te_mode_name", "Model Anim Mode");
+        break;
+    case TE_MODE_MODEL_INIT:
+        cgi.Cvar_Set("cg_te_mode_name", "Model Init Mode");
+        break;
+    case TE_MODE_SFX:
+        cgi.Cvar_Set("cg_te_mode_name", "SFX Mode");
+        break;
+    default:
+        cgi.Cvar_Set("cg_te_mode_name", "Emitter Mode");
+        break;
+    }
+
+    vAng[0] = cg_te_xangles->value;
+    vAng[1] = cg_te_yangles->value;
+    vAng[2] = cg_te_zangles->value;
+    AnglesToAxis(vAng, (vec3_t *)axis);
+
+    end = te_vEmitterOrigin + axis[0] * 50;
+    cgi.R_DebugLine(te_vEmitterOrigin, end, 1.0, 0.0, 0.0, 1.0);
+
+    end2 = end + axis[1] * 16 + axis[0] * -16;
+    cgi.R_DebugLine(end, end2, 1.0, 0.0, 0.0, 1.0);
+
+    end2 = end + axis[1] * -16 + axis[0] * -16;
+    cgi.R_DebugLine(end, end2, 1.0, 0.0, 0.0, 1.0);
+
+    if (cg_te_emittermodel->string[0]) {
+        //
+        // Initialize the entity
+        //
+
+        memset(&te_refEnt, 0, sizeof(te_refEnt));
+        te_refEnt.parentEntity  = ENTITYNUM_NONE;
+        te_refEnt.scale         = 1.0;
+        te_refEnt.shaderRGBA[0] = -1;
+        te_refEnt.shaderRGBA[1] = -1;
+        te_refEnt.shaderRGBA[2] = -1;
+        te_refEnt.shaderRGBA[3] = -1;
+
+        //
+        // Setup transforms
+        //
+
+        AxisCopy((const vec3_t *)axis, te_refEnt.axis);
+        VectorCopy(te_vEmitterOrigin, te_refEnt.origin);
+        VectorCopy(te_vEmitterOrigin, te_refEnt.lightingOrigin);
+
+        //
+        // Setup the model
+        //
+
+        te_refEnt.radius = 4.0;
+        te_refEnt.hModel = cgi.R_RegisterModel(cg_te_emittermodel->string);
+        te_refEnt.tiki   = cgi.R_Model_GetHandle(te_refEnt.hModel);
+
+        //
+        // Setup the shader
+        //
+
+        if (!Q_stricmp(cg_te_emittermodel->string, "*beam")) {
+            te_refEnt.reType       = RT_BEAM;
+            te_refEnt.customShader = cgi.R_RegisterShader("beamshader");
+        } else if (strstr(cg_te_emittermodel->string, ".spr")) {
+            te_refEnt.reType = RT_SPRITE;
+        } else {
+            te_refEnt.reType = RT_MODEL;
+        }
+
+        //
+        // Setup the animation
+        //
+
+        te_refEnt.frameInfo[0].index = cgi.Anim_NumForName(te_refEnt.tiki, "idle");
+        ;
+        if (te_refEnt.frameInfo[0].index < 0) {
+            te_refEnt.frameInfo[0].index = 0;
+        }
+        te_refEnt.frameInfo[0].weight = 1.0;
+        te_refEnt.frameInfo[0].time   = 0.0;
+        te_refEnt.actionWeight        = 1.0;
+        te_refEnt.entityNumber        = ENTITYNUM_NONE;
+
+        if (te_refEnt.reType == RT_SPRITE) {
+            cgi.R_AddRefSpriteToScene(&te_refEnt);
+        } else {
+            cgi.R_AddRefEntityToScene(&te_refEnt, ENTITYNUM_NONE);
+        }
+    } else {
+        te_refEnt.scale = 0.0;
+    }
+
+    cg_te_currCommand = cgi.Cvar_Get("cg_te_currCommand", "0", 0);
+    cg_te_numCommands = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
+
+    if (cg_te_mode->integer != TE_MODE_EMITTER) {
+        return;
+    }
+
+    pCurrCommand = pTesteffect->m_commands[te_iCurrCommand];
+    if (!pCurrCommand) {
+        return;
+    }
+
+    pCurrSpawnthing = pCurrCommand->emitter;
+    if (!pCurrSpawnthing) {
+        return;
+    }
+
+    CG_SetTestEmitterValues();
+
+    et = pCurrSpawnthing->GetEmitTime(1);
+    if (!et->active) {
+        return;
+    }
+
+    pCurrSpawnthing->cgd.createTime = cg.time;
+
+    if (et->last_emit_time > 0 && pCurrSpawnthing->spawnRate != 0) {
+        float dtime;
+        float lerp;
+        float lerpfrac;
+
+        dtime = cg.time - et->last_emit_time;
+        count = dtime / pCurrSpawnthing->spawnRate;
+        if (!count) {
+            return;
+        }
+
+        if (count == 1) {
+            commandManager.SpawnEffect(1, pCurrSpawnthing);
+            et->last_emit_time = cg.time;
+        } else {
+            lerpfrac = 1.0 / count;
+            for (lerp = 0.0;; lerp = lerp + lerpfrac) {
+                if (dtime <= pCurrSpawnthing->spawnRate) {
+                    break;
+                }
+
+                et->last_emit_time = cg.time;
+                dtime              = dtime - pCurrSpawnthing->spawnRate;
+                if (et->lerp_emitter) {
+                    pCurrSpawnthing->cgd.origin = et->oldorigin + delta * lerp;
+                }
+
+                commandManager.SpawnEffect(1, pCurrSpawnthing);
+            }
+        }
+    } else {
+        et->last_emit_time = cg.time;
+    }
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
 void CG_SortEffectCommands()
 {
-    // FIXME: unimplemented
+    int j, k;
+
+    for (j = 1; j < pTesteffect->m_iCommandCount; j++) {
+        for (k = 0; k < j; k++) {
+            if (pTesteffect->m_commands[k] > pTesteffect->m_commands[k + 1]) {
+                specialeffectcommand_t *command = pTesteffect->m_commands[k];
+
+                pTesteffect->m_commands[k]     = pTesteffect->m_commands[k + 1];
+                pTesteffect->m_commands[k + 1] = command;
+            }
+        }
+    }
 }
 
 void CG_TriggerTestEmitter_f(void)
 {
-    // FIXME: unimplemented
+    int    i;
+    vec3_t axis[3];
+
+    if (!cg_te_mode->integer) {
+        return;
+    }
+
+    if (!te_iNumCommands) {
+        return;
+    }
+
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    for (i = 0; i < te_iNumCommands; ++i) {
+        pCurrCommand = pTesteffect->m_commands[i];
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        if (!pCurrSpawnthing) {
+            return;
+        }
+
+        CG_GetEffectCommandCvars(i);
+        CG_SetTestEmitterValues();
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
+    CG_SortEffectCommands();
+
+    pCurrCommand    = pTesteffect->m_commands[0];
+    pCurrSpawnthing = pCurrCommand->emitter;
+    AxisCopy(pCurrSpawnthing->axis, axis);
+
+    // Spawn the effect
+    sfxManager.MakeEffect_Axis(SFX_TEST_EFFECT, pCurrSpawnthing->cgd.origin, axis);
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
-void CG_DumpBaseAndAmplitude(str *buff, char *prefix, Vector *base, Vector *amplitude)
+void CG_DumpBaseAndAmplitude(str *buff, const char *prefix, Vector *base, Vector *amplitude)
 {
-    // FIXME: unimplemented
+    int i;
+
+    if ((*amplitude)[0] || (*amplitude)[1] || (*amplitude)[2]) {
+        *buff += prefix;
+
+        for (i = 0; i < 3; i++) {
+            if (!(*amplitude)[i]) {
+                *buff += va(" %g", (*base)[i]);
+            } else if (!(*base)[i]) {
+                *buff += va(" random %g", (*amplitude)[i]);
+            } else if (-(*base)[i] == (*base)[i] + (*amplitude)[i]) {
+                *buff += va(" crandom %g", (*amplitude)[i] * 0.5);
+            } else {
+                *buff += va(" range %g %g", (*base)[i], (*amplitude)[i]);
+            }
+        }
+
+        *buff += "\n";
+    } else if ((*base)[0] || (*base)[1] || (*base)[2]) {
+        *buff += prefix;
+        *buff += va(" %g %g %g\n", (*base)[0], (*base)[1], (*base)[2]);
+    }
 }
 
 void CG_DumpEmitter_f(void)
 {
-    // FIXME: unimplemented
+    cvar_t *filename;
+    str     buff;
+    str     sTabbing;
+    str     old_buff;
+    int     iCurrCommand;
+    int     iTagNum;
+
+    if (te_iNumCommands < 1) {
+        return;
+    }
+
+    filename = cgi.Cvar_Get("cg_te_filename", "dump/emitter.txt", 0);
+    switch (cg_te_mode->integer) {
+    case TE_MODE_MODEL_ANIM:
+        sTabbing = "\t\t\t";
+        break;
+    case TE_MODE_MODEL_INIT:
+        sTabbing = "\t\t";
+        break;
+    case TE_MODE_SFX:
+        sTabbing = "\t\t";
+        break;
+    default:
+        sTabbing = "\t\t";
+        break;
+    }
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    if (cg_te_mode->integer == TE_MODE_EMITTER) {
+        iCurrCommand = te_iCurrCommand;
+    } else {
+        iCurrCommand = 0;
+    }
+
+    do {
+        pCurrCommand = pTesteffect->m_commands[iCurrCommand];
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        if (!pCurrSpawnthing) {
+            return;
+        }
+
+        CG_GetEffectCommandCvars(iCurrCommand);
+        CG_SetTestEmitterValues();
+
+        if (te_refEnt.scale > 0 && Q_stricmp(cg_te_tag->string, "") && cg_te_mode->integer != TE_MODE_SFX) {
+            iTagNum = cgi.Tag_NumForName(te_refEnt.tiki, cg_te_tag->string);
+        } else {
+            iTagNum = -1;
+        }
+
+        switch (cg_te_mode->integer) {
+        case TE_MODE_MODEL_ANIM:
+            buff += va("%s0", sTabbing.c_str());
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("commanddelay %g ", pCurrCommand->fCommandTime);
+            }
+
+            if (iTagNum != -1) {
+                buff += va("tagspawn %s\n", cg_te_tag->string);
+            } else {
+                buff += "originspawn\n";
+            }
+            break;
+        case TE_MODE_MODEL_INIT:
+            buff += sTabbing;
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("commanddelay %g ", pCurrCommand->fCommandTime);
+            }
+
+            if (iTagNum != -1) {
+                buff += va("tagspawn %s\n", cg_te_tag->string);
+            } else {
+                buff += "originspawn\n";
+            }
+            break;
+        case TE_MODE_SFX:
+            buff += sTabbing;
+
+            if (pCurrCommand->fCommandTime > 0) {
+                buff += va("delayedsfx %.3g originspawn\n", pCurrCommand->fCommandTime);
+            } else {
+                buff += "sfx originspawn\n";
+            }
+            break;
+        default:
+            if (iTagNum != -1) {
+                buff += va("%stagemitter %s name%i\n", sTabbing.c_str(), cg_te_tag->string, iCurrCommand + 1);
+            } else {
+                buff += va("%soriginemitter name%i\n", sTabbing.c_str(), iCurrCommand + 1);
+            }
+            break;
+        }
+
+        buff += sTabbing + "(\n";
+
+        if (pCurrSpawnthing->fMinRangeSquared > 0) {
+            buff +=
+                va("%s\tspawnrange %i %i\n",
+                   sTabbing.c_str(),
+                   (int)sqrt(pCurrSpawnthing->fMinRangeSquared),
+                   (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
+        } else if (pCurrSpawnthing->fMaxRangeSquared > 0) {
+            buff += va("%s\tspawnrange %i\n", sTabbing.c_str(), (int)sqrt(pCurrSpawnthing->fMaxRangeSquared));
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
+            buff += sTabbing + "\tvolumetric\n";
+        }
+
+        buff += va("%s\tspawnrate %g\n", sTabbing.c_str(), cg_te_spawnrate->value);
+        buff += va("%s\tmodel %s\n", sTabbing.c_str(), pCurrSpawnthing->m_modellist.ObjectAt(1).c_str());
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && pCurrSpawnthing->count > 1) {
+            buff += va("%s\tcount %i\n", sTabbing.c_str(), pCurrSpawnthing->count);
+        }
+
+        if (pCurrSpawnthing->cgd.alpha != 1.0) {
+            buff += va("%s\talpha %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.alpha);
+        }
+
+        buff +=
+            va("%s\tcolor %g %g %g\n",
+               sTabbing.c_str(),
+               pCurrSpawnthing->cgd.color[0],
+               pCurrSpawnthing->cgd.color[1],
+               pCurrSpawnthing->cgd.color[2]);
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.flags2 & T2_VARYCOLOR) {
+                buff += sTabbing + "\tvarycolor\n";
+            }
+            if (pCurrSpawnthing->cgd.flags2 & T2_SPRITEGRIDLIGHTING) {
+                buff += sTabbing + "\tspritegridlighting\n";
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_COLLISION) {
+            if (pCurrSpawnthing->cgd.collisionmask & CONTENTS_WATER) {
+                buff += sTabbing + "\tcollision water\n";
+            } else {
+                buff += sTabbing + "\tcollision\n";
+            }
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_COLLISION)) {
+            buff += va("%s\tbouncefactor %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.bouncefactor);
+        }
+
+        if (pCurrSpawnthing->cgd.scale != 1.0) {
+            buff += va("%s\tscale %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scale);
+        }
+
+        buff += va("%s\tlife %g\n", sTabbing.c_str(), cg_te_life->value);
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && pCurrSpawnthing->cgd.scaleRate) {
+            buff + va("%s\tscalerate %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scaleRate);
+        }
+
+        if (pCurrSpawnthing->sphereRadius) {
+            if (cg_te_cone_height->value) {
+                buff +=
+                    va("%s\tcone %g %g\n", sTabbing.c_str(), pCurrSpawnthing->coneHeight, pCurrSpawnthing->sphereRadius
+                    );
+            } else {
+                buff += va("%s\tradius %g\n", sTabbing.c_str(), pCurrSpawnthing->sphereRadius);
+            }
+        }
+
+        if (pCurrSpawnthing->forwardVelocity) {
+            buff += va("%s\tvelocity %g\n", sTabbing.c_str(), pCurrSpawnthing->forwardVelocity);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_RADIALVELOCITY) {
+            buff +=
+                va("%s\tradialvelocity %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.velocity[0],
+                   pCurrSpawnthing->cgd.velocity[1],
+                   pCurrSpawnthing->cgd.velocity[2]);
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_RANDVELAXIS) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\trandvelaxis", sTabbing.c_str()),
+                &pCurrSpawnthing->randvel_base,
+                &pCurrSpawnthing->randvel_amplitude
+            );
+        } else {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\trandvel", sTabbing.c_str()),
+                &pCurrSpawnthing->randvel_base,
+                &pCurrSpawnthing->randvel_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_CLAMP_VEL) {
+            buff +=
+                va("%s\tclampvel %g %g %g %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.minVel[0],
+                   pCurrSpawnthing->cgd.maxVel[0],
+                   pCurrSpawnthing->cgd.minVel[1],
+                   pCurrSpawnthing->cgd.maxVel[1],
+                   pCurrSpawnthing->cgd.minVel[2],
+                   pCurrSpawnthing->cgd.maxVel[2]);
+        } else if (pCurrSpawnthing->cgd.flags2 & T2_CLAMP_VEL_AXIS) {
+            buff +=
+                va("%s\tclampvelaxis %g %g %g %g %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.minVel[0],
+                   pCurrSpawnthing->cgd.maxVel[0],
+                   pCurrSpawnthing->cgd.minVel[1],
+                   pCurrSpawnthing->cgd.maxVel[1],
+                   pCurrSpawnthing->cgd.minVel[2],
+                   pCurrSpawnthing->cgd.maxVel[2]);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) {
+            if (pCurrSpawnthing->cgd.accel[0] || pCurrSpawnthing->cgd.accel[1] || pCurrSpawnthing->cgd.accel[2]) {
+                buff +=
+                    va("%s\tsmokeparms %g %g %g\n",
+                       sTabbing.c_str(),
+                       pCurrSpawnthing->cgd.accel[0],
+                       pCurrSpawnthing->cgd.accel[1],
+                       pCurrSpawnthing->cgd.accel[2]);
+            }
+        } else {
+            if (pCurrSpawnthing->cgd.accel[0] || pCurrSpawnthing->cgd.accel[1] || pCurrSpawnthing->cgd.accel[2]) {
+                buff +=
+                    va("%s\taccel %g %g %g\n",
+                       sTabbing.c_str(),
+                       pCurrSpawnthing->cgd.accel[0],
+                       pCurrSpawnthing->cgd.accel[1],
+                       pCurrSpawnthing->cgd.accel[2]);
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_FRICTION) {
+            buff += va("%s\tfriction %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.friction);
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_SPIN) {
+            buff += va("%s\tfriction %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.spin_rotation);
+        }
+
+        CG_DumpBaseAndAmplitude(
+            &buff,
+            va("%s\toffset", sTabbing.c_str()),
+            &pCurrSpawnthing->origin_offset_base,
+            &pCurrSpawnthing->origin_offset_amplitude
+        );
+        CG_DumpBaseAndAmplitude(
+            &buff,
+            va("%s\toffsetalongaxis", sTabbing.c_str()),
+            &pCurrSpawnthing->axis_offset_base,
+            &pCurrSpawnthing->axis_offset_amplitude
+        );
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_ANGLES)) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\tangles", sTabbing.c_str()),
+                &pCurrSpawnthing->cgd.angles,
+                &pCurrSpawnthing->angles_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.flags2 & T2_AMOVE) {
+            CG_DumpBaseAndAmplitude(
+                &buff,
+                va("%s\tavelocity", sTabbing.c_str()),
+                &pCurrSpawnthing->avelocity_base,
+                &pCurrSpawnthing->avelocity_amplitude
+            );
+        }
+
+        if (pCurrSpawnthing->cgd.scalemin) {
+            buff += va("%s\tscalemin %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scalemin);
+        }
+        if (pCurrSpawnthing->cgd.scalemax) {
+            buff += va("%s\tscalemax %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.scalemax);
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_DIETOUCH) {
+            buff += sTabbing + "\tdietouch\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.fadedelay > 0) {
+                buff += va("%s\tfadedelay %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.fadedelay / 1000.0);
+            } else if (pCurrSpawnthing->cgd.flags & T_FADE) {
+                buff += sTabbing + "\tfade\n";
+            }
+
+            if (pCurrSpawnthing->cgd.flags & T_FADEIN) {
+                buff += va("%s\tfadein %g\n", sTabbing.c_str(), pCurrSpawnthing->cgd.fadeintime / 1000.0);
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_CIRCLE) {
+            buff += sTabbing + "\tcircle\n";
+        }
+        if (pCurrSpawnthing->cgd.flags & T_SPHERE) {
+            buff += sTabbing + "\tsphere\n";
+        }
+        if (pCurrSpawnthing->cgd.flags & T_INWARDSPHERE) {
+            buff += sTabbing + "\tinwardsphere\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC)) {
+            if (pCurrSpawnthing->cgd.flags2 & T2_ALIGNSTRETCH) {
+                buff += va("%s\talignstretch %g", sTabbing.c_str(), pCurrSpawnthing->cgd.scale2);
+            } else if (pCurrSpawnthing->cgd.flags & T_ALIGN) {
+                buff += sTabbing + "\talign\n";
+            }
+
+            if (pCurrSpawnthing->cgd.flags & T_FLICKERALPHA) {
+                buff += sTabbing + "\tflickeralpha\n";
+            }
+        }
+
+        if (pCurrSpawnthing->cgd.flags & T_RANDOMROLL) {
+            buff += sTabbing + "\trandomroll\n";
+        }
+
+        if (!(pCurrSpawnthing->cgd.flags2 & T2_VOLUMETRIC) && (pCurrSpawnthing->cgd.flags & T_SWARM)) {
+            buff +=
+                va("%s\tswarm %i %g %g\n",
+                   sTabbing.c_str(),
+                   pCurrSpawnthing->cgd.swarmfreq,
+                   pCurrSpawnthing->cgd.swarmmaxspeed,
+                   pCurrSpawnthing->cgd.swarmdelta);
+        }
+
+        buff += sTabbing + ")\n\n";
+
+        iCurrCommand++;
+    } while (iCurrCommand < te_iNumCommands && cg_te_mode->integer != TE_MODE_EMITTER);
+
+    char *buffer;
+    str   szTmp;
+    int   iLen;
+
+    iLen = cgi.FS_ReadFile(filename->string, (void **)&buffer, qfalse);
+    if (iLen != -1) {
+        char FBuf[512];
+
+        COM_StripExtension(filename->string, FBuf, sizeof(FBuf));
+        szTmp = FBuf;
+        szTmp += ".old";
+
+        cgi.FS_WriteFile(szTmp.c_str(), buffer, iLen);
+    }
+
+    cgi.FS_WriteTextFile(filename->string, buff.c_str(), buff.length());
+
+    pCurrSpawnthing = NULL;
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_LoadBaseAndAmplitude(
-    char **pBufer, char *szCvarX, char *szCvarY, char *szCvarZ, char *szCvarXAmp, char *szCvarYAmp, char *szCvarZAmp
+    char      **pBufer,
+    const char *szCvarX,
+    const char *szCvarY,
+    const char *szCvarZ,
+    const char *szCvarXAmp,
+    const char *szCvarYAmp,
+    const char *szCvarZAmp
 )
 {
-    // FIXME: unimplemented
+    char com_token[MAX_TOKEN_CHARS];
+
+    const char *szCvarList[]    = {szCvarX, szCvarY, szCvarZ};
+    const char *szCvarAmpList[] = {szCvarXAmp, szCvarYAmp, szCvarZAmp};
+    int         i;
+
+    // Fixed in OPM
+    //  Use a loop rather than a copy-paste
+
+    for (i = 0; i < 3; i++) {
+        Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+        if (!com_token[0]) {
+            return;
+        }
+
+        if (!Q_stricmp(com_token, "random")) {
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+
+            cgi.Cvar_Set(szCvarAmpList[i], com_token);
+        } else if (!Q_stricmp(com_token, "crandom")) {
+            float fTmp;
+
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+
+            fTmp = atof(com_token);
+            cgi.Cvar_Set(szCvarList[i], va("%g", -fTmp));
+            cgi.Cvar_Set(szCvarAmpList[i], va("%g", fTmp * 2.0));
+        } else if (!Q_stricmp(com_token, "range")) {
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+            cgi.Cvar_Set(szCvarList[i], com_token);
+
+            Q_strncpyz(com_token, COM_ParseExt(pBufer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                return;
+            }
+            cgi.Cvar_Set(szCvarAmpList[i], com_token);
+        }
+    }
 }
 
 void CG_LoadEmitter_f(void)
 {
-    // FIXME: unimplemented
+    int     iCommandCount;
+    char   *buffer;
+    char   *bufstart;
+    char    com_token[MAX_TOKEN_CHARS];
+    cvar_t *filename;
+
+    if (te_iNumCommands <= 0) {
+        CG_TestEmitter_f();
+    } else {
+        CG_SaveEffectCommandCvars(te_iCurrCommand);
+    }
+    filename = cgi.Cvar_Get("cg_te_filename", "dump/emitter.txt", 0);
+
+    if (cgi.FS_ReadFile(filename->string, (void **)&buffer, qfalse) == -1) {
+        return;
+    }
+
+    Com_Printf("Loading emitter dump '%s'\n", filename->string);
+    bufstart      = buffer;
+    iCommandCount = 0;
+
+    while ((Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token))), com_token[0]) {
+        iCommandCount++;
+        if (te_iNumCommands < iCommandCount) {
+            CG_NewEmitterCommand_f();
+        }
+
+        te_iCurrCommand = iCommandCount - 1;
+        pCurrCommand    = pTesteffect->m_commands[iCommandCount - 1];
+        if (!pCurrCommand) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        pCurrSpawnthing = pCurrCommand->emitter;
+        commandManager.InitializeSpawnthing(pCurrSpawnthing);
+        pCurrCommand->fCommandTime = 0.0;
+        CG_ResetEffectCommandCvars();
+
+        if (com_token[0] == '0') {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 1));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+        } else if (!Q_stricmp(com_token, "delayedsfx") || !Q_stricmp(com_token, "sfx")) {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 3));
+            if (!Q_stricmp(com_token, "delayedsfx")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (!com_token[0]) {
+                    Com_Printf("Error loading effect dump\n");
+                    break;
+                }
+                cgi.Cvar_Set("cg_te_command_time", com_token);
+
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+                if (!com_token[0]) {
+                    Com_Printf("Error loading effect dump\n");
+                    break;
+                }
+            }
+        } else if (!Q_stricmp(com_token, "tagemitter") || !Q_stricmp(com_token, "originemitter")) {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 0));
+        } else {
+            cgi.Cvar_Set("cg_te_mode", va("%i", 2));
+        }
+
+        if (!Q_stricmp(com_token, "commanddelay")) {
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+            cgi.Cvar_Set("cg_te_command_time", com_token);
+
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+        }
+
+        if (!Q_stricmpn(com_token, "tag", 3)) {
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                Com_Printf("Error loading effect dump\n");
+                break;
+            }
+            cgi.Cvar_Set("cg_te_tag", com_token);
+        }
+
+        while (COM_ParseExt(&buffer, qfalse)) {}
+
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+        if (Q_stricmp(com_token, "(")) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
+        if (!com_token[0]) {
+            Com_Printf("Error loading effect dump\n");
+            break;
+        }
+
+        while (Q_stricmp(com_token, ")")) {
+            if (!Q_stricmp(com_token, "spawnrange")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spawnrange_a", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_spawnrange_b", com_token);
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "volumetric")) {
+                cgi.Cvar_Set("cg_te_volumetric", "1");
+            } else if (!Q_stricmp(com_token, "spawnrate")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spawnrate", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "model")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_model", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "count")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_count", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "alpha")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "color")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_color_r", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_color_g", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_color_b", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "varycolor")) {
+                cgi.Cvar_Set("cg_te_varycolor", "1");
+            } else if (!Q_stricmp(com_token, "spritegridlighting")) {
+                cgi.Cvar_Set("cg_te_spritegridlighting", "1");
+            } else if (!Q_stricmp(com_token, "collision")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_collision", "1");
+                } else {
+                    cgi.Cvar_Set("cg_te_collision", "1");
+                }
+            } else if (!Q_stricmp(com_token, "bouncefactor")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scale")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alpha", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "life")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_life", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scalerate")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalerate", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "radius")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_radius", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "cone")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_cone_height", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_radius", com_token);
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "velocity")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_forwardvel", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "radialvelocity")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_radial_scale", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_radial_min", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_radial_max", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "randvelaxis") || !Q_stricmp(com_token, "randvel")) {
+                if (!Q_stricmp(com_token, "randvelaxis")) {
+                    cgi.Cvar_Set("cg_te_randaxis", "1");
+
+                    CG_LoadBaseAndAmplitude(
+                        &buffer,
+                        "cg_te_randvelbase_x",
+                        "cg_te_randvelbase_y",
+                        "cg_te_randvelbase_z",
+                        "cg_te_randvelamp_x",
+                        "cg_te_randvelamp_y",
+                        "cg_te_randvelamp_z"
+                    );
+                }
+            } else if (!Q_stricmp(com_token, "clampvel") || !Q_stricmp(com_token, "clampvelaxis")) {
+                if (!Q_stricmp(com_token, "clampvelaxis")) {
+                    cgi.Cvar_Set("cg_te_clampvelaxis", "1");
+                }
+
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_clampvelmin_x", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_clampvelmax_x", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_clampvelmin_y", com_token);
+
+                            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                            if (com_token[0]) {
+                                cgi.Cvar_Set("cg_te_clampvelmax_y", com_token);
+
+                                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                                if (com_token[0]) {
+                                    cgi.Cvar_Set("cg_te_clampvelmin_z", com_token);
+
+                                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                                    if (com_token[0]) {
+                                        cgi.Cvar_Set("cg_te_clampvelmax_z", com_token);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "accel") || !Q_stricmp(com_token, "smokeparms")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_accel_x", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_accel_y", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_accel_z", com_token);
+                        }
+                    }
+                }
+            } else if (!Q_stricmp(com_token, "friction")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_friction", com_token);
+                }
+                // Added in 2.0
+                //  spin
+            } else if (!Q_stricmp(com_token, "spin")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_spin", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "offset")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_offsbase_x",
+                    "cg_te_offsbase_y",
+                    "cg_te_offsbase_z",
+                    "cg_te_offsamp_x",
+                    "cg_te_offsamp_y",
+                    "cg_te_offsamp_z"
+                );
+            } else if (!Q_stricmp(com_token, "offsetalongaxis")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_axisoffsbase_x",
+                    "cg_te_axisoffsbase_y",
+                    "cg_te_axisoffsbase_z",
+                    "cg_te_axisoffsamp_x",
+                    "cg_te_axisoffsamp_y",
+                    "cg_te_axisoffsamp_z"
+                );
+            } else if (!Q_stricmp(com_token, "angles")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_anglesbase_p",
+                    "cg_te_anglesbase_y",
+                    "cg_te_anglesbase_r",
+                    "cg_te_anglesamp_p",
+                    "cg_te_anglesamp_y",
+                    "cg_te_anglesamp_r"
+                );
+            } else if (!Q_stricmp(com_token, "avelocity")) {
+                CG_LoadBaseAndAmplitude(
+                    &buffer,
+                    "cg_te_avelbase_p",
+                    "cg_te_avelbase_y",
+                    "cg_te_avelbase_r",
+                    "cg_te_avelamp_p",
+                    "cg_te_avelamp_y",
+                    "cg_te_avelamp_r"
+                );
+            } else if (!Q_stricmp(com_token, "scalemin")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalemin", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "scalemax")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_scalemax", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "dietouch")) {
+                cgi.Cvar_Set("cg_te_dietouch", "1");
+            } else if (!Q_stricmp(com_token, "fade")) {
+                cgi.Cvar_Set("cg_te_fade", "1");
+            } else if (!Q_stricmp(com_token, "fadedelay")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_fadedelay", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "fadein")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_fadein", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "circle")) {
+                cgi.Cvar_Set("cg_te_circle", "1");
+            } else if (!Q_stricmp(com_token, "sphere")) {
+                cgi.Cvar_Set("cg_te_sphere", "1");
+            } else if (!Q_stricmp(com_token, "inwardsphere")) {
+                cgi.Cvar_Set("cg_te_insphere", "1");
+            } else if (!Q_stricmp(com_token, "align")) {
+                cgi.Cvar_Set("cg_te_align", "1");
+            } else if (!Q_stricmp(com_token, "alignstretch")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_alignstretch_scale", com_token);
+                }
+            } else if (!Q_stricmp(com_token, "flickeralpha")) {
+                cgi.Cvar_Set("cg_te_flickeralpha", "1");
+            } else if (!Q_stricmp(com_token, "randomroll")) {
+                cgi.Cvar_Set("cg_te_randomroll", "1");
+            } else if (!Q_stricmp(com_token, "swarm")) {
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                if (com_token[0]) {
+                    cgi.Cvar_Set("cg_te_swarm_freq", com_token);
+
+                    Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                    if (com_token[0]) {
+                        cgi.Cvar_Set("cg_te_swarm_maxspeed", com_token);
+
+                        Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+                        if (com_token[0]) {
+                            cgi.Cvar_Set("cg_te_swarm_delta", com_token);
+                        }
+                    }
+                }
+            }
+        }
+
+        CG_SaveEffectCommandCvars(te_iCurrCommand);
+    }
+
+    cgi.FS_FreeFile(bufstart);
+    return;
 }
 
 void CG_TestEmitter_f(void)
 {
-    // FIXME: unimplemented
+    vec3_t angles;
+
+    if (!pTesteffect->m_iCommandCount) {
+        pCurrCommand = pTesteffect->AddNewCommand();
+        if (!pCurrCommand) {
+            return;
+        }
+
+        pCurrSpawnthing       = new spawnthing_t();
+        pCurrCommand->emitter = pCurrSpawnthing;
+        commandManager.InitializeSpawnthing(pCurrSpawnthing);
+
+        te_iNumCommands++;
+    }
+
+    assert(pCurrSpawnthing);
+
+    VectorMA(cg.refdef.vieworg, 100.0, cg.refdef.viewaxis[0], te_vEmitterOrigin);
+    VectorSet(angles, 0, cg.refdefViewAngles[1], 0);
+    AnglesToAxis(angles, pCurrSpawnthing->axis);
+
+    pCurrSpawnthing->cgd.tiki = NULL;
+    CG_SetTestEmitterValues();
+
+    pCurrCommand    = NULL;
+    pCurrSpawnthing = NULL;
 }
 
 void CG_PrevEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand--;
+    if (te_iCurrCommand < 0) {
+        te_iCurrCommand = te_iNumCommands - 1;
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_NextEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand++;
+    if (te_iCurrCommand >= te_iNumCommands) {
+        te_iCurrCommand = 0;
+    }
+
+    CG_GetEffectCommandCvars(te_iCurrCommand);
 }
 
 void CG_NewEmitterCommand_f(void)
 {
-    // FIXME: unimplemented
+    if (te_iNumCommands >= MAX_TESTEMITTERS_SAVE) {
+        Com_Printf("Test effect can not have more than %i effect commands\n", MAX_TESTEMITTERS_SAVE);
+        return;
+    }
+
+    pCurrCommand = pTesteffect->AddNewCommand();
+    if (!pCurrCommand) {
+        return;
+    }
+
+    pCurrSpawnthing       = new spawnthing_t();
+    pCurrCommand->emitter = pCurrSpawnthing;
+    commandManager.InitializeSpawnthing(pCurrSpawnthing);
+
+    te_iNumCommands++;
+    CG_SaveEffectCommandCvars(te_iCurrCommand);
+
+    te_iCurrCommand = te_iNumCommands - 1;
+    CG_GetEffectCommandCvars(te_iCurrCommand);
+
+    Com_Printf("Test effect now has %i effect commands\n", te_iNumCommands);
 }
 
-void CG_DeleteEmitterCommand_f(void)
-{
-    // FIXME: unimplemented
-}
+void CG_DeleteEmitterCommand_f(void) {}
 
 void CG_InitTestEmitter(void)
 {
@@ -452,6 +2063,7 @@ void CG_InitTestEmitter(void)
     cg_te_radial_min         = cgi.Cvar_Get("cg_te_radial_min", "0", 0);
     cg_te_radial_max         = cgi.Cvar_Get("cg_te_radial_max", "0", 0);
     cg_te_friction           = cgi.Cvar_Get("cg_te_friction", "0", 0);
+    cg_te_spin               = cgi.Cvar_Get("cg_te_spin", "0", 0); // Added in 2.0
     cg_te_varycolor          = cgi.Cvar_Get("cg_te_varycolor", "0", 0);
     cg_te_spritegridlighting = cgi.Cvar_Get("cg_te_spritegridlighting", "0", 0);
     cg_te_spawnrange_a       = cgi.Cvar_Get("cg_te_spawnrange_a", "0", 0);
@@ -473,14 +2085,12 @@ void CG_InitTestEmitter(void)
     cg_te_mode         = cgi.Cvar_Get("cg_te_mode", "0", 0);
     cg_te_mode_name    = cgi.Cvar_Get("cg_te_mode_name", "Emitter Mode", 0);
     cg_te_currCommand  = cgi.Cvar_Get("cg_te_currCommand", "0", 0);
+    cg_te_numCommands  = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
 
-    te_vEmitterOrigin[2] = 0.0;
-    te_vEmitterOrigin[1] = 0.0;
-    te_vEmitterOrigin[0] = 0.0;
-    te_refEnt.scale      = 0.0;
-    cg_te_numCommands    = cgi.Cvar_Get("cg_te_numCommands", "0", 0);
-    te_iNumCommands      = 0;
-    te_iCurrCommand      = 0;
+    VectorClear(te_vEmitterOrigin);
+    te_refEnt.scale = 0.0;
+    te_iNumCommands = 0;
+    te_iCurrCommand = 0;
 
     pTesteffect = sfxManager.GetTestEffectPointer();
 }
diff --git a/code/cgame/cg_ui.cpp b/code/cgame/cg_ui.cpp
index aec50df4..c884fc97 100644
--- a/code/cgame/cg_ui.cpp
+++ b/code/cgame/cg_ui.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 #include "str.h"
+#include "../client/keycodes.h"
 
 void CG_MessageMode_f(void)
 {
@@ -61,8 +62,8 @@ void CG_MessageMode_Private_f(void)
         return;
     }
 
-    clientNum = atoi(cgi.Argv(1)) - 1;
-    if (clientNum < 0 || clientNum >= MAX_CLIENTS) {
+    clientNum = atoi(cgi.Argv(1));
+    if (clientNum < 1 || clientNum >= MAX_CLIENTS) {
         cgi.Printf(HUD_MESSAGE_CHAT_WHITE "Message Error: %s is a bad client number\n", cgi.Argv(1));
         return;
     }
@@ -119,7 +120,7 @@ void CG_MessageSingleClient_f(void)
 
         // copy the rest
         for (i = 2; i < cgi.Argc(); i++) {
-            sString += va("%s", cgi.Argv(i));
+            sString += va(" %s", cgi.Argv(i));
         }
 
         sString += "\n";
@@ -189,11 +190,39 @@ void CG_InstaMessageGroupE_f(void)
 
 void CG_HudPrint_f(void)
 {
-    cgi.Printf("\x1%s", cgi.Argv(0));
+    cgi.Printf("\x1%s", cgi.Argv(1));
 }
 
-int CG_CheckCaptureKey(int key, qboolean down, unsigned int time)
+qboolean CG_CheckCaptureKey(int key, qboolean down, unsigned int time)
 {
-    // FIXME: unimplemented
-    return 0;
+    char minKey = '1', maxKey = '9';
+
+    if (!cg.iInstaMessageMenu || !down) {
+        return qfalse;
+    }
+
+    if (cg_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        maxKey = '8';
+    }
+
+    if (key < minKey || key > maxKey) {
+        if (key == K_ESCAPE || key == '0') {
+            cg.iInstaMessageMenu = 0;
+            return qtrue;
+        }
+        return qfalse;
+    }
+
+    if (cg.iInstaMessageMenu == -1) {
+        if (key > '6') {
+            cg.iInstaMessageMenu = 0;
+        } else {
+            cg.iInstaMessageMenu = key - '0';
+        }
+    } else if (cg.iInstaMessageMenu > 0) {
+        cgi.SendClientCommand(va("dmmessage 0 *%i%i\n", cg.iInstaMessageMenu, key - '0'));
+        cg.iInstaMessageMenu = 0;
+    }
+
+    return qtrue;
 }
diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index ec2ce010..8da21cac 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -242,6 +242,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
     float      mat[3][3];
     vec3_t     vOldOrigin;
     vec3_t     vStart, vEnd, vMins, vMaxs;
+    vec3_t     vVelocity;
     trace_t    trace;
 
     VectorSet(vMins, -6, -6, -6);
@@ -297,6 +298,15 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
 
     VectorCopy(origin, vOldOrigin);
 
+    if (!cg.predicted_player_state.walking || (!(cg.predicted_player_state.pm_flags & PMF_FROZEN) && !(cg.predicted_player_state.pm_flags & PMF_NO_MOVE))) {
+        VectorCopy(cg.predicted_player_state.velocity, vVelocity);
+    } else {
+        //
+        // Added in OPM
+        //  When frozen, there must be no movement at all
+        VectorClear(vVelocity);
+    }
+
     if (bUseWorldPosition) {
         iMask = MASK_VIEWSOLID;
     } else {
@@ -367,7 +377,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
         }
 
         if (cg.predicted_player_state.walking) {
-            fVel   = VectorLength(cg.predicted_player_state.velocity);
+            fVel   = VectorLength(vVelocity);
             fPhase = fVel * 0.0015 + 0.9;
             cg.fCurrentViewBobPhase += (cg.frametime / 1000.0 + cg.frametime / 1000.0) * M_PI * fPhase;
 
@@ -446,7 +456,7 @@ void CG_OffsetFirstPersonView(refEntity_t *pREnt, qboolean bUseWorldPosition)
         AngleVectorsLeft(vDelta, mat[0], mat[1], mat[2]);
 
         CG_CalcViewModelMovement(
-            cg.fCurrentViewBobPhase, cg.fCurrentViewBobAmp, cg.predicted_player_state.velocity, vDelta
+            cg.fCurrentViewBobPhase, cg.fCurrentViewBobAmp, vVelocity, vDelta
         );
 
         VectorMA(pREnt->origin, vDelta[0], mat[0], pREnt->origin);
@@ -475,9 +485,16 @@ static int CG_CalcFov(void)
     int   contents;
     float fov_x, fov_y;
     int   inwater;
+    float fov_ratio;
 
-    fov_x = cg.camera_fov;
-    x     = cg.refdef.width / tan(fov_x / 360 * M_PI);
+    fov_ratio = (float)cg.refdef.width / (float)cg.refdef.height * (3.0 / 4.0);
+    if (fov_ratio == 1) {
+        fov_x = cg.camera_fov;
+    } else {
+        fov_x = RAD2DEG(atan(tan(DEG2RAD(cg.camera_fov / 2.0)) * fov_ratio)) * 2.0;
+    }
+
+    x = cg.refdef.width / tan(fov_x / 360 * M_PI);
     fov_y = atan2(cg.refdef.height, x);
     fov_y = fov_y * 360 / M_PI;
 
@@ -504,6 +521,44 @@ static int CG_CalcFov(void)
     return inwater;
 }
 
+/*
+===============
+CG_SetupFog
+
+Prepares fog values for rendering
+===============
+*/
+void CG_SetupFog() {
+    cg.refdef.farplane_distance = cg.farplane_distance;
+    cg.refdef.farplane_bias = cg.farplane_bias;
+    cg.refdef.farplane_color[0] = cg.farplane_color[0];
+    cg.refdef.farplane_color[1] = cg.farplane_color[1];
+    cg.refdef.farplane_color[2] = cg.farplane_color[2];
+    cg.refdef.farplane_cull = cg.farplane_cull;
+    cg.refdef.skybox_farplane = cg.skyboxFarplane;
+    cg.refdef.renderTerrain = cg.renderTerrain;
+    cg.refdef.farclipOverride = cg.farclipOverride;
+    cg.refdef.farplaneColorOverride[0] = cg.farplaneColorOverride[0];
+    cg.refdef.farplaneColorOverride[1] = cg.farplaneColorOverride[1];
+    cg.refdef.farplaneColorOverride[2] = cg.farplaneColorOverride[2];
+}
+
+/*
+===============
+CG_SetupPortalSky
+
+Sets portalsky values for rendering
+===============
+*/
+void CG_SetupPortalSky() {
+    cg.refdef.sky_alpha = cg.sky_alpha;
+    cg.refdef.sky_portal = cg.sky_portal;
+    VectorCopy(cg.sky_axis[0], cg.refdef.sky_axis[0]);
+    VectorCopy(cg.sky_axis[1], cg.refdef.sky_axis[1]);
+    VectorCopy(cg.sky_axis[2], cg.refdef.sky_axis[2]);
+    VectorMA(cg.sky_origin, cg.skyboxSpeed, cg.refdef.vieworg, cg.refdef.sky_origin);
+}
+
 /*
 ===============
 CG_CalcViewValues
@@ -520,17 +575,7 @@ static int CG_CalcViewValues(void)
 
     // calculate size of 3D view
     CG_CalcVrect();
-
-    // setup fog and far clipping plane
-    cg.refdef.farplane_distance = cg.farplane_distance;
-    VectorCopy(cg.farplane_color, cg.refdef.farplane_color);
-    cg.refdef.farplane_cull = cg.farplane_cull;
-
-    // setup portal sky
-    cg.refdef.sky_alpha  = cg.sky_alpha;
-    cg.refdef.sky_portal = cg.sky_portal;
-    memcpy(cg.refdef.sky_axis, cg.sky_axis, sizeof(cg.sky_axis));
-    VectorCopy(cg.sky_origin, cg.refdef.sky_origin);
+    CG_SetupFog();
 
     ps = &cg.predicted_player_state;
 
@@ -604,7 +649,9 @@ static int CG_CalcViewValues(void)
     // Set the aural axis of the player
     VectorCopy(cg.refdefViewAngles, SoundAngles);
     // yaw is purposely inverted because of the miles sound system
-    SoundAngles[YAW] = -SoundAngles[YAW];
+    // Commented out in OPM
+    //  Useless as SDL audio/AL is used
+    //SoundAngles[YAW] = -SoundAngles[YAW];
     AnglesToAxis(SoundAngles, cg.SoundAxis);
 
     // decide on third person view
@@ -623,6 +670,11 @@ static int CG_CalcViewValues(void)
         // Set the aural axis to the camera's angles
         VectorCopy(cg.camera_angles, cg.refdefViewAngles);
 
+        if (cg_protocol >= PROTOCOL_MOHTA_MIN && (ps->pm_flags & PMF_DAMAGE_ANGLES)) {
+            // Handle camera shake
+            VectorSubtract(cg.refdefViewAngles, cg.predicted_player_state.damage_angles, cg.refdefViewAngles);
+        }
+
         if (ps->camera_posofs[0] || ps->camera_posofs[1] || ps->camera_posofs[2]) {
             vec3_t vAxis[3], vOrg;
             AnglesToAxis(cg.refdefViewAngles, vAxis);
@@ -633,6 +685,9 @@ static int CG_CalcViewValues(void)
         // copy view values
         VectorCopy(cg.refdef.vieworg, cg.currentViewPos);
         VectorCopy(cg.refdefViewAngles, cg.currentViewAngles);
+        // since 2.0: also copy location data for sound
+        VectorCopy(cg.refdef.vieworg, cg.SoundOrg);
+        AnglesToAxis(cg.refdefViewAngles, cg.SoundAxis);
     }
 
     // position eye reletive to origin
@@ -674,7 +729,37 @@ float CG_SensitivityScale()
 
 void CG_AddLightShow()
 {
-    // FIXME: unimplemented
+    int i;
+    float fSlopeY, fSlopeZ;
+    float x, y, z;
+    vec3_t vOrg;
+    float r, g, b;
+    float fMax;
+
+    fSlopeY = tan(cg.refdef.fov_x * 0.5);
+    fSlopeZ = tan(cg.refdef.fov_y * 0.5);
+
+    for (i = 0; i < cg_acidtrip->integer; i++) {
+        x = pow(random(), 1.0 / 3.0) * 2048.0;
+        y = crandom() * x * fSlopeY;
+        z = crandom() * x * fSlopeZ;
+
+        VectorCopy(cg.refdef.vieworg, vOrg);
+        VectorMA(vOrg, x, cg.refdef.viewaxis[0], vOrg);
+        VectorMA(vOrg, y, cg.refdef.viewaxis[1], vOrg);
+        VectorMA(vOrg, z, cg.refdef.viewaxis[2], vOrg);
+
+        r = random();
+        g = random();
+        b = random();
+
+        fMax = Q_max(r, Q_max(g, b));
+        r /= fMax;
+        g /= fMax;
+        b /= fMax;
+
+        cgi.R_AddLightToScene(vOrg, (rand() & 0x1FF) + 0x80, r, g, b, 0);
+    }
 }
 
 qboolean CG_FrustumCullSphere(const vec3_t vPos, float fRadius) {
@@ -762,6 +847,15 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
         // no entities should be marked as interpolating
     }
 
+    //
+    // Added in OPM
+    //  Clamp the fov to avoid artifacts
+    if (cg_fov->value < 65) {
+        cgi.Cvar_Set("cg_fov", "65");
+    } else if (cg_fov->value > 120) {
+        cgi.Cvar_Set("cg_fov", "120");
+    }
+
     // update cg.predicted_player_state
     CG_PredictPlayerState();
 
@@ -774,10 +868,46 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
             CG_ScoresDown_f();
         } else if (cg.bIntermissionDisplay) {
             if (cg.nextSnap) {
-                if (cgi.Cvar_Get("g_success", "", 0)->integer) {
-                    cgi.UI_ShowMenu("StatsScreen_Success", qfalse);
+                if (cg_protocol >= PROTOCOL_MOHTA_MIN) {
+                    cvar_t* pMission = cgi.Cvar_Get("g_mission", "", CVAR_ARCHIVE);
+
+                    if (cgi.Cvar_Get("g_success", "", 0)->integer) {
+                        switch (pMission->integer)
+                        {
+                        default:
+                        case 0:
+                            cgi.UI_ShowMenu("mission_success_1", 0);
+                            cgi.Cvar_Set("g_t2l1", "1");
+                            break;
+                        case 2:
+                            cgi.UI_ShowMenu("mission_success_2", 0);
+                            cgi.Cvar_Set("g_t3l1", "1");
+                            break;
+                        case 3:
+                            cgi.UI_ShowMenu("mission_success_3", 0);
+                            break;
+                        }
+                    } else {
+                        switch (pMission->integer)
+                        {
+                        default:
+                        case 0:
+                            cgi.UI_ShowMenu("mission_failed_1", 0);
+                            break;
+                        case 2:
+                            cgi.UI_ShowMenu("mission_failed_2", 0);
+                            break;
+                        case 3:
+                            cgi.UI_ShowMenu("mission_failed_3", 0);
+                            break;
+                        }
+                    }
                 } else {
-                    cgi.UI_ShowMenu("StatsScreen_Failed", qfalse);
+                    if (cgi.Cvar_Get("g_success", "", 0)->integer) {
+                        cgi.UI_ShowMenu("StatsScreen_Success", qfalse);
+                    } else {
+                        cgi.UI_ShowMenu("StatsScreen_Failed", qfalse);
+                    }
                 }
             }
         } else {
@@ -789,16 +919,53 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
         if (cgs.gametype != GT_SINGLE_PLAYER) {
             CG_ScoresUp_f();
         } else {
-            if (cgi.Cvar_Get("g_success", "", 0)->integer) {
-                cgi.UI_ShowMenu("StatsScreen_Success", qfalse);
+            if (cg_protocol >= PROTOCOL_MOHTA_MIN) {
+                cvar_t* pMission = cgi.Cvar_Get("g_mission", "", CVAR_ARCHIVE);
+
+                if (cgi.Cvar_Get("g_success", "", 0)->integer) {
+                    switch (pMission->integer)
+                    {
+                    default:
+                    case 0:
+                        cgi.UI_HideMenu("mission_success_1", qtrue);
+                        break;
+                    case 2:
+                        cgi.UI_HideMenu("mission_success_2", qtrue);
+                        break;
+                    case 3:
+                        cgi.UI_HideMenu("mission_success_3", qtrue);
+                        break;
+                    }
+                } else {
+                    switch (pMission->integer)
+                    {
+                    default:
+                    case 0:
+                        cgi.UI_HideMenu("mission_failed_1", qtrue);
+                        break;
+                    case 2:
+                        cgi.UI_HideMenu("mission_failed_2", qtrue);
+                        break;
+                    case 3:
+                        cgi.UI_HideMenu("mission_failed_3", qtrue);
+                        break;
+                    }
+                }
             } else {
-                cgi.UI_ShowMenu("StatsScreen_Failed", qfalse);
+                if (cgi.Cvar_Get("g_success", "", 0)->integer) {
+                    cgi.UI_HideMenu("StatsScreen_Success", qtrue);
+                } else {
+                    cgi.UI_HideMenu("StatsScreen_Failed", qtrue);
+                }
             }
         }
 
         cg.bIntermissionDisplay = qfalse;
     }
 
+    // Added in OPM
+    CG_ProcessPlayerModel();
+
     // build the render lists
     if (!cg.hyperspace) {
         CG_AddPacketEntities(); // after calcViewValues, so predicted player state is correct
@@ -806,6 +973,7 @@ void CG_DrawActiveFrame(int serverTime, int frameTime, stereoFrame_t stereoView,
     }
 
     // finish up the rest of the refdef
+    CG_SetupPortalSky();
 
     cg.refdef.time = cg.time;
     memcpy(cg.refdef.areamask, cg.snap->areamask, sizeof(cg.refdef.areamask));
diff --git a/code/cgame/cg_viewmodelanim.c b/code/cgame/cg_viewmodelanim.c
index e53fe7ef..c3bb9f73 100644
--- a/code/cgame/cg_viewmodelanim.c
+++ b/code/cgame/cg_viewmodelanim.c
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static const char *AnimPrefixList[] = {
     "",
+    "unarmed",
     "papers",
     "colt45",
     "p38",
@@ -45,7 +46,6 @@ static const char *AnimPrefixList[] = {
     "bazooka",
     "panzerschreck",
     "shotgun",
-    "unarmed",
     //
     // Team Assault and Team Tactics weapons
     "mg42portable",
@@ -82,6 +82,7 @@ static const char *AnimPrefixList[] = {
 
 enum animPrefix_e {
     WPREFIX_NONE,
+    WPREFIX_UNARMED,
     WPREFIX_PAPERS,
     WPREFIX_COLT45,
     WPREFIX_P38,
@@ -99,7 +100,6 @@ enum animPrefix_e {
     WPREFIX_BAZOOKA,
     WPREFIX_PANZERSCHRECK,
     WPREFIX_SHOTGUN,
-    WPREFIX_UNARMED,
     //
     // Team Assault and Team Tactics weapons
     WPREFIX_MG42_PORTABLE,
@@ -308,6 +308,9 @@ int CG_GetVMAnimPrefixIndex()
         if (!Q_stricmp(szWeaponName, "Panzerschreck")) {
             return WPREFIX_PANZERSCHRECK;
         }
+        if (!Q_stricmp(szWeaponName, "Gewehrgranate")) {
+            return WPREFIX_KAR98_MORTAR;
+        }
         if (!Q_stricmp(szWeaponName, "Shotgun")) {
             return WPREFIX_SHOTGUN;
         }
@@ -335,9 +338,11 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
     char        szAnimName[MAX_QPATH];
     dtiki_t    *pTiki;
     qboolean    bAnimChanged;
+    qboolean    bWeaponChanged;
 
     fCrossblendFrac = 0.0;
-    bAnimChanged    = 0;
+    bAnimChanged    = qfalse;
+    bWeaponChanged  = qfalse; // Added in OPM
     pTiki           = pModel->tiki;
 
     if (cgi.anim->g_iLastEquippedWeaponStat == cg.snap->ps.stats[STAT_EQUIPPED_WEAPON]
@@ -346,13 +351,15 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
     } else {
         iAnimPrefixIndex                    = CG_GetVMAnimPrefixIndex();
         cgi.anim->g_iLastEquippedWeaponStat = cg.snap->ps.stats[STAT_EQUIPPED_WEAPON];
-        strcpy(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]));
+        Q_strncpyz(cgi.anim->g_szLastActiveItem, CG_ConfigString(CS_WEAPONS + cg.snap->ps.activeItems[1]), sizeof(cgi.anim->g_szLastActiveItem));
         cgi.anim->g_iLastAnimPrefixIndex = iAnimPrefixIndex;
-        bAnimChanged                     = qtrue;
+
+        bAnimChanged   = qtrue;
+        bWeaponChanged = qtrue;
     }
 
     if (cgi.anim->g_iLastVMAnim == -1) {
-        sprintf(szAnimName, "%s_idle", AnimPrefixList[iAnimPrefixIndex]);
+        Com_sprintf(szAnimName, sizeof(szAnimName), "%s_idle", AnimPrefixList[iAnimPrefixIndex]);
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index = cgi.Anim_NumForName(pTiki, szAnimName);
 
         if (cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index == -1) {
@@ -421,21 +428,28 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
             break;
         }
 
-        sprintf(szAnimName, "%s_%s", AnimPrefixList[iAnimPrefixIndex], pszAnimSuffix);
-        fCrossblendTime = cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
-        fCrossblendAmount = cgi.anim->g_iCurrentVMDuration / 1000.0;
+        Com_sprintf(szAnimName, sizeof(szAnimName), "%s_%s", AnimPrefixList[iAnimPrefixIndex], pszAnimSuffix);
+        if (!bWeaponChanged) {
+            fCrossblendTime =
+                cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
+            fCrossblendAmount = cgi.anim->g_iCurrentVMDuration / 1000.0;
 
-        if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0) {
-            fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
-            for (i = 0; i < MAX_FRAMEINFOS; ++i) {
-                if (cgi.anim->g_VMFrameInfo[i].weight) {
-                    if (i == cgi.anim->g_iCurrentVMAnimSlot) {
-                        cgi.anim->g_VMFrameInfo[i].weight = fCrossblendFrac;
-                    } else {
-                        cgi.anim->g_VMFrameInfo[i].weight *= (1.0 - fCrossblendFrac);
+            if (fCrossblendAmount < fCrossblendTime && fCrossblendAmount > 0.0) {
+                fCrossblendFrac = fCrossblendAmount / fCrossblendTime;
+                for (i = 0; i < MAX_FRAMEINFOS; ++i) {
+                    if (cgi.anim->g_VMFrameInfo[i].weight) {
+                        if (i == cgi.anim->g_iCurrentVMAnimSlot) {
+                            cgi.anim->g_VMFrameInfo[i].weight = fCrossblendFrac;
+                        } else {
+                            cgi.anim->g_VMFrameInfo[i].weight *= (1.0 - fCrossblendFrac);
+                        }
                     }
                 }
             }
+        } else {
+            fCrossblendTime   = 0;
+            fCrossblendAmount = 0;
+            fCrossblendFrac   = 0;
         }
 
         cgi.anim->g_iCurrentVMAnimSlot = (cgi.anim->g_iCurrentVMAnimSlot + 1) % MAX_FRAMEINFOS;
@@ -450,17 +464,31 @@ void CG_ViewModelAnimation(refEntity_t *pModel)
         cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].weight = 1.0;
         cgi.anim->g_iCurrentVMDuration                                 = 0;
 
-        fCrossblendTime = cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
-        if (!fCrossblendTime) {
+        if (!bWeaponChanged) {
+            fCrossblendTime =
+                cgi.Anim_CrossblendTime(pTiki, cgi.anim->g_VMFrameInfo[cgi.anim->g_iCurrentVMAnimSlot].index);
+            if (!fCrossblendTime) {
+                for (i = 0; i < MAX_FRAMEINFOS; ++i) {
+                    if (i != cgi.anim->g_iCurrentVMAnimSlot) {
+                        cgi.anim->g_VMFrameInfo[i].weight = 0.0;
+                    }
+                }
+
+                cgi.anim->g_bCrossblending = qfalse;
+            } else {
+                cgi.anim->g_bCrossblending = qtrue;
+            }
+        } else {
+            // Added in OPM
+            //  If there is a new weapon, don't do any crossblend
+            cgi.anim->g_bCrossblending = qfalse;
+
+            // clear crossblend values
             for (i = 0; i < MAX_FRAMEINFOS; ++i) {
                 if (i != cgi.anim->g_iCurrentVMAnimSlot) {
                     cgi.anim->g_VMFrameInfo[i].weight = 0.0;
                 }
             }
-
-            cgi.anim->g_bCrossblending = qfalse;
-        } else {
-            cgi.anim->g_bCrossblending = qtrue;
         }
     }
 
diff --git a/code/cgame/cg_volumetricsmoke.cpp b/code/cgame/cg_volumetricsmoke.cpp
index 758b0881..eeb6a3ce 100644
--- a/code/cgame/cg_volumetricsmoke.cpp
+++ b/code/cgame/cg_volumetricsmoke.cpp
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cg_local.h"
 #include "cg_commands.h"
+#include "memarchiver.h"
 
 const char *cg_vsstypes[] = {
     "default",
@@ -41,7 +42,9 @@ const char *cg_vsstypes[] = {
     "debris"
 };
 
-cvssource_t *vss_sorttable[16384];
+#define MAX_VSS_SORTS 16384
+
+cvssource_t *vss_sorttable[MAX_VSS_SORTS];
 
 static int             lastVSSFrameTime;
 static constexpr float MAX_VSS_COORDS            = 8096.0;
@@ -77,56 +80,57 @@ void VSS_AddRepulsion(cvssource_t *pA, cvssource_t *pB)
 
     VectorSubtract(pA->newOrigin, pB->newOrigin, vPush);
 
-    if (vPush[0] || vPush[1] || vPush[2]) {
-        fDist = VectorNormalize(vPush);
-        f     = fDist - pB->newRadius;
-
-        if (f > 0.0) {
-            f *= pA->ooRadius;
-            if (f > 1.49) {
-                f = 0.0;
-            } else {
-                f = f * (f * 0.0161 + -0.3104) + 1.2887;
-            }
-
-            if (f < 0.0) {
-                f = f * 1.1;
-            }
-
-            fForce = f;
-        } else {
-            fForce = 1.0;
-        }
-
-        f = fDist - pA->newRadius;
-        if (f > 0.0) {
-            f *= pB->ooRadius;
-            if (f > 1.49) {
-                f = 0.0;
-            } else {
-                f = f * (f * 0.0161 + -0.3104) + 1.2887;
-            }
-
-            if (f < 0.0) {
-                f = f * 1.1;
-            }
-
-            fForce += f;
-        } else {
-            fForce += 1.0;
-        }
-
-        if (fForce <= -0.05 && fForce >= 0.05) {
-            fForce = (pA->newRadius + pB->newRadius) * 0.03 * fForce;
-            VectorScale(vPush, fForce, vPush);
-
-            VectorAdd(pA->repulsion, vPush, pA->repulsion);
-            VectorSubtract(pB->repulsion, vPush, pB->repulsion);
-        }
-    } else {
+    if (!vPush[0] && !vPush[1] && !vPush[2]) {
         VectorSet(vPush, crandom(), crandom(), crandom());
         VectorAdd(pA->repulsion, vPush, pA->repulsion);
         VectorSubtract(pB->repulsion, vPush, pB->repulsion);
+        return;
+    }
+
+    fDist = VectorNormalize(vPush);
+    f     = fDist - pB->newRadius;
+
+    if (f > 0.0f) {
+        f *= pA->ooRadius;
+        if (f > 1.49f) {
+            f = 0.0f;
+        } else {
+            f = f * (f * 0.0161f + -0.3104f) + 1.2887f;
+        }
+
+        if (f < 0.0) {
+            f *= 1.1f;
+        }
+
+        fForce = f;
+    } else {
+        fForce = 1.0;
+    }
+
+    f = fDist - pA->newRadius;
+    if (f > 0.0) {
+        f *= pB->ooRadius;
+        if (f > 1.49f) {
+            f = 0.0f;
+        } else {
+            f = f * (f * 0.0161f + -0.3104f) + 1.2887f;
+        }
+
+        if (f < 0.0) {
+            f *= 1.1f;
+        }
+
+        fForce += f;
+    } else {
+        fForce += 1.0f;
+    }
+
+    if (fForce <= -0.05f || fForce >= 0.05f) {
+        fForce = (pA->newRadius + pB->newRadius) * 0.03f * fForce;
+        VectorScale(vPush, fForce, vPush);
+
+        VectorAdd(pA->repulsion, vPush, pA->repulsion);
+        VectorSubtract(pB->repulsion, vPush, pB->repulsion);
     }
 }
 
@@ -205,7 +209,7 @@ void ClientGameCommandManager::ResetVSSSources()
 
 void ClientGameCommandManager::ResetVSSSources(Event *ev)
 {
-    // FIXME: stub??
+    ResetVSSSources();
 }
 
 void CG_ResetVSSSources()
@@ -214,6 +218,11 @@ void CG_ResetVSSSources()
     lastVSSFrameTime = cg.time;
 }
 
+void CG_ArchiveVSSGlobals(MemArchiver& archiver)
+{
+    archiver.ArchiveTime(&lastVSSFrameTime);
+}
+
 void ClientGameCommandManager::InitializeVSSSources()
 {
     int i;
@@ -280,13 +289,13 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
 
     fWind = 0.0;
 
-    if ((pSource->flags2 & 5) != 0) {
+    if ((pSource->flags2 & (T2_ACCEL | T2_MOVE)) != 0) {
         VectorMA(pSource->velocity, ftime, pSource->repulsion, pSource->velocity);
     }
 
     pSource->lastOrigin = pSource->newOrigin;
 
-    if (pSource->flags & 0x800) {
+    if (pSource->flags & T_COLLISION) {
         trace.allsolid = qfalse;
         CG_ClipMoveToEntities(
             pSource->newOrigin, vec3_origin, vec3_origin, pSource->newOrigin, -1, MASK_VOLUMETRIC_SMOKE, &trace, qfalse
@@ -306,11 +315,11 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
         }
     }
 
-    if (pSource->flags2 & 5) {
+    if (pSource->flags2 & (T2_ACCEL | T2_MOVE)) {
         VectorMA(pSource->newOrigin, ftime, pSource->velocity, pSource->newOrigin);
     }
 
-    if (pSource->flags & 0x800) {
+    if (pSource->flags & T_COLLISION) {
         CG_Trace(
             &trace,
             pSource->lastOrigin,
@@ -328,6 +337,8 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
             float  fDot;
             vec3_t vNorm;
 
+            VectorCopy(trace.plane.normal, vNorm);
+
             VectorAdd(trace.endpos, trace.plane.normal, pSource->newOrigin);
             fDot = DotProduct(vNorm, pSource->velocity);
             VectorMA(pSource->velocity, fDot, vNorm, pSource->velocity);
@@ -352,7 +363,7 @@ qboolean VSS_SourcePhysics(cvssource_t *pSource, float ftime)
     }
 
     iSmokeType = abs(pSource->smokeType);
-    if (pSource->flags2 & 5) {
+    if (pSource->flags2 & (T2_ACCEL | T2_MOVE)) {
         VectorCopy(pSource->velocity, vVel);
 
         for (i = 0; i < 3; i++) {
@@ -613,7 +624,7 @@ qboolean VSS_LerpSource(cvssource_t *pCurrent, cvssourcestate_t *pState, float f
 {
     int i;
 
-    if (pCurrent->flags & 0xA0000) {
+    if (pCurrent->flags & (T_HARDLINK | T_PARENTLINK)) {
         Vector parentOrigin;
 
         for (i = 0; i < 3; i++) {
@@ -632,7 +643,7 @@ qboolean VSS_LerpSource(cvssource_t *pCurrent, cvssourcestate_t *pState, float f
 
         parentOrigin = e->origin;
         VectorAdd(pState->origin, parentOrigin, pState->origin);
-    } else if (pCurrent->flags2 & 5) {
+    } else if (pCurrent->flags2 & (T2_ACCEL | T2_MOVE)) {
         for (i = 0; i < 3; i++) {
             pState->origin[i] =
                 (pCurrent->newOrigin[i] - pCurrent->lastOrigin[i]) * fLerpFrac + pCurrent->lastOrigin[i];
@@ -735,9 +746,8 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
 
         pSource->startAlpha = (random() * 0.15 + 0.85) * fDensity;
         pSource->newDensity = 0.0;
-        if (m_spawnthing->cgd.flags & 1) {
+        if (m_spawnthing->cgd.flags & T_RANDSCALE) {
             pSource->newRadius = RandomizeRange(m_spawnthing->cgd.scalemin, m_spawnthing->cgd.scalemax);
-            ;
             if (pSource->newRadius > 32.0) {
                 pSource->newRadius = 32.0;
             }
@@ -766,16 +776,16 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
         pSource->roll      = anglemod(fAngle);
 
         if (random() < 0.5) {
-            pSource->flags |= 0x40000;
+            pSource->flags |= T_RANDOMROLL;
         }
 
         VectorCopy(m_spawnthing->axis[0], vNewForward);
-        if (m_spawnthing->cgd.flags & 4) {
+        if (m_spawnthing->cgd.flags & T_SPHERE) {
             VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
             do {
                 vNewForward = Vector(crandom(), crandom(), crandom());
             } while (Vector::Dot(vNewForward, vNewForward) < 1.0);
-        } else if (m_spawnthing->cgd.flags & 0x10) {
+        } else if (m_spawnthing->cgd.flags & T_CIRCLE) {
             if (m_spawnthing->sphereRadius != 0.0) {
                 Vector dst, end;
 
@@ -788,7 +798,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
 
                 fAngle += fAngleStep;
             }
-        } else if (m_spawnthing->cgd.flags & 8) {
+        } else if (m_spawnthing->cgd.flags & T_INWARDSPHERE) {
             Vector dir, end;
             do {
                 dir = Vector(crandom(), crandom(), crandom());
@@ -797,7 +807,7 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             end = m_spawnthing->cgd.origin + dir * m_spawnthing->sphereRadius;
             VectorCopy(end, pSource->newOrigin);
             vNewForward = dir * -1.0;
-        } else if (m_spawnthing->cgd.flags2 & 0x20000) {
+        } else if (m_spawnthing->cgd.flags2 & T2_CONE) {
             float fHeight, fRadius;
             float fAngle;
             float sina, cosa;
@@ -819,8 +829,6 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             VectorMA(m_spawnthing->cgd.origin, fRadius * cosa, m_spawnthing->axis[1], pSource->newOrigin);
             VectorMA(m_spawnthing->cgd.origin, fRadius * sina, m_spawnthing->axis[2], pSource->newOrigin);
         } else if (m_spawnthing->sphereRadius) {
-            VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
-        } else {
             Vector dir, end;
             do {
                 dir = Vector(crandom(), crandom(), crandom());
@@ -830,6 +838,8 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
             end = m_spawnthing->cgd.origin + dir * m_spawnthing->sphereRadius;
             VectorCopy(end, pSource->newOrigin);
             vNewForward = dir;
+        } else {
+            VectorCopy(m_spawnthing->cgd.origin, pSource->newOrigin);
         }
 
         for (i = 0; i < 3; i++) {
@@ -863,15 +873,14 @@ void ClientGameCommandManager::SpawnVSSSource(int count, int timealive)
         for (i = 0; i < 3; ++i) {
             float fDist = m_spawnthing->axis_offset_base[i] + random() * m_spawnthing->axis_offset_amplitude[i];
 
-            if (pSource->flags2 & 0x80) {
+            if (pSource->flags2 & T2_PARALLEL) {
                 pSource->newOrigin += Vector(m_spawnthing->axis[i]) * fDist;
             } else {
                 pSource->newOrigin += Vector(m_spawnthing->tag_axis[i]) * fDist;
             }
         }
 
-        pSource->velocity *= pSource->lifeTime / 1000.0;
-        pSource->newOrigin += pSource->velocity;
+        pSource->newOrigin += pSource->velocity * (pSource->lifeTime / 1000.0);
         if (vss_lighting_fps->integer) {
             cgi.R_GetLightingForSmoke(pSource->newLighting, pSource->newOrigin);
         }
@@ -884,251 +893,249 @@ void VSS_CalcRepulsionForces(cvssource_t *pActiveSources)
 {
     cvssource_t *pCurrent;
     cvssource_t *pComp;
+    qboolean     bXUp, bXDown;
+    qboolean     bYUp, bYDown;
+    qboolean     bZDown;
+    int          i;
+    int          iIndex;
+    int          iX, iY, iZ;
+    int          iMinX, iMinY, iMinZ;
+    int          iMaxX, iMaxY, iMaxZ;
+    float        fOfs;
+    cvssource_t *pSTLatch;
 
     pCurrent = pActiveSources->prev;
-    if (pCurrent != pActiveSources) {
-        qboolean     bXUp, bXDown;
-        qboolean     bYUp, bYDown;
-        qboolean     bZDown;
-        int          i;
-        int          iIndex;
-        int          iX, iY, iZ;
-        int          iMinX, iMinY, iMinZ;
-        int          iMaxX, iMaxY, iMaxZ;
-        float        fOfs;
-        cvssource_t *pSTLatch;
+    if (pCurrent == pActiveSources) {
+        return;
+    }
 
-        memset(vss_sorttable, 0, sizeof(vss_sorttable));
+    memset(vss_sorttable, 0, sizeof(vss_sorttable));
 
-        while (pCurrent != pActiveSources) {
-            VectorClear(pCurrent->repulsion);
+    for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
+        VectorClear(pCurrent->repulsion);
 
-            iIndex = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
-            iIndex |= ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32;
-            iIndex |= (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
+        iIndex = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
+        iIndex |= (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32) << 5;
+        iIndex |= (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
 
-            pCurrent->stnext      = vss_sorttable[iIndex];
-            vss_sorttable[iIndex] = pCurrent;
-            pCurrent->stindex     = iIndex;
-            pCurrent              = pCurrent->prev;
+        pCurrent->stnext      = vss_sorttable[iIndex];
+        vss_sorttable[iIndex] = pCurrent;
+        pCurrent->stindex     = iIndex;
+    }
+
+    for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
+        if (vss_sorttable[pCurrent->stindex] == pCurrent) {
+            pSTLatch = (cvssource_t *)-1;
+            pComp    = pCurrent->stnext;
+        } else {
+            pSTLatch = 0;
+            pComp    = vss_sorttable[pCurrent->stindex];
         }
 
-        for (pCurrent = pActiveSources->prev; pCurrent != pActiveSources; pCurrent = pCurrent->prev) {
-            if (vss_sorttable[pCurrent->stindex] == pCurrent) {
-                pSTLatch = (cvssource_t *)-1;
-                pComp    = pCurrent->stnext;
-            } else {
-                pSTLatch = 0;
-                pComp    = vss_sorttable[pCurrent->stindex];
+        for(; pComp; pComp = pComp->stnext) {
+            VSS_AddRepulsion(pCurrent, pComp);
+            if (!pSTLatch && pComp->stnext == pCurrent) {
+                pSTLatch = pComp;
+                // skip current
+                pComp    = pComp->stnext;
+            }
+        }
+
+        iX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
+        iY = (((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32) << 5;
+        iZ = (((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16) << 10;
+
+        fOfs  = pCurrent->newRadius + 1.49 + 48.0;
+        iMaxX = ((int)floor(pCurrent->newOrigin[0] + fOfs + 8192.0 + 0.5) / 96) % 32;
+        iMaxY = (((int)floor(pCurrent->newOrigin[1] + fOfs + 8192.0 + 0.5) / 96) % 32) << 5;
+        iMaxZ = (((int)floor(pCurrent->newOrigin[2] + fOfs + 8192.0 + 0.5) / 96) % 16) << 10;
+
+        iMinX = ((int)floor(pCurrent->newOrigin[0] - fOfs + 8192.0 + 0.5) / 96) % 32;
+        iMinY = (((int)floor(pCurrent->newOrigin[1] - fOfs + 8192.0 + 0.5) / 96) % 32) << 5;
+        iMinZ = (((int)floor(pCurrent->newOrigin[2] - fOfs + 8192.0 + 0.5) / 96) % 16) << 10;
+
+        bXUp   = (iMaxX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
+        bXDown = (iMinX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
+        bYUp   = (iMaxY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
+        bYDown = (iMinY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
+
+        iIndex = iMinZ | (pCurrent->stindex & 0xFFFFC3FF);
+        bZDown = iIndex != pCurrent->stindex;
+
+        if (iIndex == pCurrent->stindex) {
+            iIndex = iMaxY | (pCurrent->stindex & 0xFFFFFC1F);
+
+            i = 9;
+        } else {
+            i = 0;
+        }
+
+        for (; i < (bZDown ? 26 : 17); i++) {
+            switch (i) {
+            case 0:
+                iIndex = iMaxZ | (pCurrent->stindex & 0xFFFFC3FF);
+                break;
+            case 1:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 2:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 3:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 4:
+                iIndex = iMinY | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 5:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 6:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 7:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 8:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 9:
+                iIndex = iZ | (iIndex & 0xFFFFFFC3);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 10:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 11:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 12:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 13:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 14:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 15:
+                iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 16:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 17:
+                iIndex = iMinZ | (iIndex & 0xFFFFFCC3);
+                if (bXUp) {
+                    break;
+                }
+                continue;
+            case 18:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYUp) {
+                    break;
+                }
+                continue;
+            case 19:
+                iIndex = iMinY | (iIndex & 0xFFFFFC1F);
+                if (bXUp && bYDown) {
+                    break;
+                }
+                continue;
+            case 20:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYDown) {
+                    break;
+                }
+                continue;
+            case 21:
+                iIndex = iMinX | (iIndex & 0xFFFFFFE0);
+                if (bXDown && bYDown) {
+                    break;
+                }
+                continue;
+            case 22:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                if (bXDown) {
+                    break;
+                }
+                continue;
+            case 23:
+                iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
+                if (bXDown && bYUp) {
+                    break;
+                }
+                continue;
+            case 24:
+                iIndex = iX | (iIndex & 0xFFFFFFE0);
+                if (bYUp) {
+                    break;
+                }
+                continue;
+            case 25:
+                iIndex = iY | (iIndex & 0xFFFFFC1F);
+                break;
+            default:
+                assert(0); // This can't happen
+                break;
             }
 
-            while (pComp) {
+            for (pComp = vss_sorttable[iIndex]; pComp; pComp = pComp->stnext) {
                 VSS_AddRepulsion(pCurrent, pComp);
-                if (!pSTLatch && pComp->stnext == pCurrent) {
-                    pSTLatch = pComp;
-                    pComp    = pComp->stnext;
-                }
-
-                pComp = pComp->stnext;
             }
-            iX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5) / 96) % 32;
-            iY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5) / 96) % 32;
-            iY *= 2;
-            iZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5) / 96) % 16;
-            iZ <<= 10;
+        }
 
-            fOfs  = pCurrent->newRadius + 1.49 + 48.0;
-            iMaxX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 + fOfs) / 96) % 32;
-            iMaxY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 + fOfs) / 96) % 32;
-            iMaxY *= 2;
-            iMaxZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 + fOfs) / 96) % 16;
-            iMaxZ <<= 10;
-
-            iMinX = ((int)floor(pCurrent->newOrigin[0] + 8192.0 + 0.5 - fOfs) / 96) % 32;
-            iMinY = ((int)floor(pCurrent->newOrigin[1] + 8192.0 + 0.5 - fOfs) / 96) % 32;
-            iMinY *= 2;
-            iMinZ = ((int)floor(pCurrent->newOrigin[2] + 8192.0 + 0.5 - fOfs) / 96) % 16;
-            iMinZ <<= 10;
-
-            bXUp   = (iMaxX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
-            bXDown = (iMinX | (pCurrent->stindex & 0xFFFFFFE0)) != pCurrent->stindex;
-            bYUp   = (iMaxY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
-            bYDown = (iMinY | (pCurrent->stindex & 0xFFFFFC1F)) != pCurrent->stindex;
-
-            iIndex = iMinZ | (pCurrent->stindex & 0xFFFFFCC3);
-            bZDown = iIndex != pCurrent->stindex;
-
-            if (iIndex == pCurrent->stindex) {
-                iIndex = iMaxY | pCurrent->stindex & 0xFFFFFC1F;
-                i      = 9;
-            } else {
-                i = 0;
-            }
-
-            for(; i < (bZDown ? 26 : 17); i++) {
-                switch (i) {
-                case 0:
-                    iIndex = iMaxZ | (pCurrent->stindex & 0xFFFFFCC3);
-                    break;
-                case 1:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 2:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 3:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 4:
-                    iIndex = iMinY | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 5:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 6:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 7:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 8:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 9:
-                    iIndex = iZ | (iIndex & 0xFFFFFFC3);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 10:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 11:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 12:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 13:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 14:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 15:
-                    iIndex = iMaxX | (iIndex & 0xFFFFFFE0);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 16:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 17:
-                    iIndex = iMinZ | (iIndex & 0xFFFFFCC3);
-                    if (bXUp) {
-                        break;
-                    }
-                    continue;
-                case 18:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 19:
-                    iIndex = iMinY | (iIndex & 0xFFFFFC1F);
-                    if (bXUp && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 20:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYDown) {
-                        break;
-                    }
-                    continue;
-                case 21:
-                    iIndex = iMinX | (iIndex & 0xFFFFFFE0);
-                    if (bXDown && bYDown) {
-                        break;
-                    }
-                    continue;
-                case 22:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown) {
-                        break;
-                    }
-                    continue;
-                case 23:
-                    iIndex = iMaxY | (iIndex & 0xFFFFFC1F);
-                    if (bXDown && bYUp) {
-                        break;
-                    }
-                    continue;
-                case 24:
-                    iIndex = iX | (iIndex & 0xFFFFFFE0);
-                    if (bYUp) {
-                        break;
-                    }
-                    continue;
-                case 25:
-                    iIndex = iY | (iIndex & 0xFFFFFC1F);
-                    break;
-                }
-
-                for (pComp = vss_sorttable[iIndex]; pComp; pComp = pComp->stnext) {
-                    VSS_AddRepulsion(pCurrent, pComp);
-                }
-            }
-
-            if (pSTLatch == (cvssource_t *)-1) {
-                vss_sorttable[pCurrent->stindex] = pCurrent->stnext;
-            } else {
-                pSTLatch->stnext = pCurrent->stnext;
-            }
+        if (pSTLatch == (cvssource_t *)-1) {
+            vss_sorttable[pCurrent->stindex] = pCurrent->stnext;
+        } else {
+            pSTLatch->stnext = pCurrent->stnext;
         }
     }
 }
@@ -1216,13 +1223,13 @@ void ClientGameCommandManager::AddVSSSources()
         pComp = pCurrent->prev;
 
         newEnt.renderfx = 0;
-        if (pCurrent->flags < 0 && !cg_detail->integer) {
+        if ((pCurrent->flags & T_DETAIL) && !cg_detail->integer) {
             FreeVSSSource(pCurrent);
             continue;
         }
 
-        if ((pCurrent->flags2 & 0x4000) != 0) {
-            newEnt.renderfx = 0x4000000;
+        if ((pCurrent->flags2 & T2_ALWAYSDRAW) != 0) {
+            newEnt.renderfx = RF_ALWAYSDRAW;
         }
 
         if (pCurrent->lastPhysicsTime) {
@@ -1231,8 +1238,8 @@ void ClientGameCommandManager::AddVSSSources()
                 mstime = physics_rate;
             }
 
-            if (mstime >= physics_rate || (pCurrent->flags2 & 0x10) != 0) {
-                if (!VSS_SourcePhysics(pCurrent, (float)mstime * 0.001)) {
+            if (mstime >= physics_rate || (pCurrent->flags2 & T2_PHYSICS_EVERYFRAME) != 0) {
+                if (!VSS_SourcePhysics(pCurrent, (float)mstime / 1000.0)) {
                     FreeVSSSource(pCurrent);
                     continue;
                 }
@@ -1256,26 +1263,18 @@ void ClientGameCommandManager::AddVSSSources()
             }
         }
 
-        fLerpFrac = (cg.time - pCurrent->lastPhysicsTime) / physics_rate;
-        if (fLerpFrac > 1.0) {
-            fLerpFrac = 1.0;
-        } else if (fLerpFrac < 0.0) {
-            fLerpFrac = 0.0;
-        }
+        fLerpFrac = (float)(cg.time - pCurrent->lastPhysicsTime) / (float)physics_rate;
+        fLerpFrac = Q_clamp_float(fLerpFrac, 0, 1);
 
-        fLightingFrac = (cg.time - pCurrent->lastLightingTime) / lighting_rate;
-        if (fLightingFrac > 1.0) {
-            fLightingFrac = 1.0;
-        } else if (fLightingFrac < 0.0) {
-            fLightingFrac = 0.0;
-        }
+        fLightingFrac = (float)(cg.time - pCurrent->lastLightingTime) / (float)lighting_rate;
+        fLightingFrac = Q_clamp_float(fLightingFrac, 0, 1);
 
         if (lastVSSFrameTime) {
             pCurrent->lifeTime += frameTime;
         }
 
         if (!pCurrent->lastValid) {
-            if (!VSS_SourcePhysics(pCurrent, (float)physics_rate * 0.001)) {
+            if (!VSS_SourcePhysics(pCurrent, (float)physics_rate / 1000)) {
                 ClientGameCommandManager::FreeVSSSource(pCurrent);
                 continue;
             }
@@ -1329,12 +1328,12 @@ void ClientGameCommandManager::AddVSSSources()
                         pCurrent->roll -= j;
                     }
 
-                    if ((pCurrent->flags & 0x40000) != 0) {
+                    if ((pCurrent->flags & T_RANDOMROLL) != 0) {
                         newEnt.hModel = hModel;
                     } else {
                         newEnt.hModel = hModel2;
                     }
-                } else if ((pCurrent->flags & 0x40000) != 0) {
+                } else if ((pCurrent->flags & T_RANDOMROLL) != 0) {
                     newEnt.hModel = hModel;
                 } else {
                     newEnt.hModel = hModel2;
diff --git a/code/cgame/memarchiver.cpp b/code/cgame/memarchiver.cpp
new file mode 100644
index 00000000..a07c4211
--- /dev/null
+++ b/code/cgame/memarchiver.cpp
@@ -0,0 +1,241 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cg_local.h"
+#include "memarchiver.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/str.h"
+
+MemArchiver::MemArchiver()
+{
+    state = MEMARC_WRITING;
+    buffer = 0;
+    allocatedSize = 0;
+    bufferSize = 0;
+}
+
+MemArchiver::~MemArchiver()
+{
+    if (state == MEMARC_WRITING && buffer) {
+        cgi.Free(buffer);
+    }
+}
+
+void MemArchiver::SetupForWriting(size_t initialSize)
+{
+    this->state = MEMARC_WRITING;
+    this->buffer = (byte*)cgi.Malloc(initialSize);
+    this->allocatedSize = initialSize;
+    this->bufferSize = 0;
+}
+
+void MemArchiver::SetupForReading(byte* buffer, size_t size)
+{
+    this->state = MEMARC_READING;
+    this->buffer = buffer;
+    this->allocatedSize = size;
+    this->bufferSize = 0;
+}
+
+void MemArchiver::SetBaseTime(unsigned int time)
+{
+    this->svsTime = time;
+}
+
+size_t MemArchiver::BufferSize() const
+{
+    return bufferSize;
+}
+
+byte* MemArchiver::ConfiscateBuffer()
+{
+    byte* confiscatedBuffer = buffer;
+
+    buffer = NULL;
+    allocatedSize = 0;
+    bufferSize = 0;
+
+    return confiscatedBuffer;
+}
+
+bool MemArchiver::IsReading() const
+{
+    return !IsWriting();
+}
+
+bool MemArchiver::IsWriting() const
+{
+    return state == MEMARC_WRITING;
+}
+
+bool MemArchiver::FinishedReading() const
+{
+    return bufferSize == allocatedSize;
+}
+
+void MemArchiver::ArchiveByte(byte* value)
+{
+    ArchiveRaw(value, sizeof(byte));
+}
+
+void MemArchiver::ArchiveBoolean(qboolean* value)
+{
+    ArchiveRaw(value, sizeof(qboolean));
+}
+
+void MemArchiver::ArchiveChar(char* value)
+{
+    ArchiveRaw(value, sizeof(char));
+}
+
+void MemArchiver::ArchiveUChar(unsigned char* value)
+{
+    ArchiveRaw(value, sizeof(unsigned char));
+}
+
+void MemArchiver::ArchiveShort(short* value)
+{
+    ArchiveRaw(value, sizeof(short));
+}
+
+void MemArchiver::ArchiveInteger(int* value)
+{
+    ArchiveRaw(value, sizeof(int));
+}
+
+void MemArchiver::ArchiveSize(size_t* value)
+{
+    ArchiveRaw(value, sizeof(size_t));
+}
+
+void MemArchiver::ArchiveFloat(float* value)
+{
+    ArchiveRaw(value, sizeof(float));
+}
+
+void MemArchiver::ArchiveVec3(vec3_t value)
+{
+    ArchiveRaw(value, sizeof(vec3_t));
+}
+
+void MemArchiver::ArchiveVector(Vector* value)
+{
+    ArchiveFloat(&value->x);
+    ArchiveFloat(&value->y);
+    ArchiveFloat(&value->z);
+}
+
+void MemArchiver::ArchiveString(str* value)
+{
+    char tmp[4096];
+    int current = 0;
+
+    if (IsReading()) {
+        for (current = 0; current < 4096; current++) {
+            ArchiveReadRaw(&tmp[current], sizeof(char));
+            if (!tmp[current]) {
+                break;
+            }
+        }
+
+        if (current == 4096) {
+            tmp[current - 1] = 0;
+        }
+
+        *value = tmp;
+    } else {
+        ArchiveWriteRaw(value->c_str(), value->length() + 1);
+    }
+}
+
+void MemArchiver::ArchiveTime(int* value)
+{
+    int time;
+
+    if (IsReading()) {
+        ArchiveReadRaw(&time, sizeof(time));
+
+        if (time) {
+            time += svsTime;
+        }
+
+        *value = time;
+    } else {
+        time = *value;
+        if (time) {
+            time -= svsTime;
+        }
+
+        ArchiveWriteRaw(&time, sizeof(time));
+    }
+}
+
+void MemArchiver::ArchiveRaw(void* buffer, size_t size)
+{
+    if (IsReading()) {
+        ArchiveReadRaw(buffer, size);
+    } else {
+        ArchiveWriteRaw(buffer, size);
+    }
+}
+
+void MemArchiver::ArchiveReadRaw(void* buffer, size_t size)
+{
+    if (!size) {
+        return;
+    }
+
+    if (size + this->bufferSize > this->allocatedSize) {
+        Com_Error(ERR_DROP, "MemArchiver: tried to read past end of buffer");
+    }
+
+    memcpy(buffer, this->buffer + this->bufferSize, size);
+    this->bufferSize += size;
+}
+
+void MemArchiver::ArchiveWriteRaw(const void* buffer, size_t size)
+{
+    if (!size) {
+        return;
+    }
+
+    if (size + this->bufferSize > this->allocatedSize) {
+        if (!this->allocatedSize) {
+            this->allocatedSize = 1024;
+            this->buffer = (byte*)cgi.Malloc(this->allocatedSize);
+        } else {
+            byte* newBuffer;
+
+            do {
+                this->allocatedSize *= 2;
+            } while (size + this->bufferSize > this->allocatedSize);
+
+            newBuffer = (byte*)cgi.Malloc(this->allocatedSize);
+            memcpy(newBuffer, this->buffer, this->bufferSize);
+            cgi.Free(this->buffer);
+            this->buffer = newBuffer;
+        }
+    }
+
+    memcpy(this->buffer + this->bufferSize, buffer, size);
+    this->bufferSize += size;
+}
diff --git a/code/cgame/memarchiver.h b/code/cgame/memarchiver.h
new file mode 100644
index 00000000..87c2ae36
--- /dev/null
+++ b/code/cgame/memarchiver.h
@@ -0,0 +1,72 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// DESCRIPTION:
+// In-memory archiver
+
+#include "cg_local.h"
+
+class Vector;
+class str;
+
+typedef enum {
+    MEMARC_WRITING,
+    MEMARC_READING
+} archiverState_e;
+
+class MemArchiver {
+public:
+    MemArchiver();
+    ~MemArchiver();
+
+    void SetupForWriting(size_t initialSize);
+    void SetupForReading(byte* buffer, size_t size);
+    void SetBaseTime(unsigned int time);
+    size_t BufferSize() const;
+    byte* ConfiscateBuffer();
+    bool IsReading() const;
+    bool IsWriting() const;
+    bool FinishedReading() const;
+
+    void ArchiveByte(byte* value);
+    void ArchiveBoolean(qboolean* value);
+    void ArchiveChar(char* value);
+    void ArchiveUChar(unsigned char* value);
+    void ArchiveShort(short* value);
+    void ArchiveInteger(int* value);
+    void ArchiveSize(size_t* value);
+    void ArchiveFloat(float* value);
+    void ArchiveVec3(vec3_t value);
+    void ArchiveVector(Vector* value);
+    void ArchiveString(str* value);
+    void ArchiveTime(int* value);
+    void ArchiveRaw(void* buffer, size_t size);
+    void ArchiveReadRaw(void* buffer, size_t size);
+    void ArchiveWriteRaw(const void* buffer, size_t size);
+
+private:
+    archiverState_e state;
+    byte* buffer;
+    size_t bufferSize;
+    size_t allocatedSize;
+    int svsTime;
+};
diff --git a/code/client/CMakeLists.txt b/code/client/CMakeLists.txt
index 8ba2b753..259e055b 100644
--- a/code/client/CMakeLists.txt
+++ b/code/client/CMakeLists.txt
@@ -1,22 +1,84 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohclient)
 
 add_subdirectory("../cgame" "./cgame")
 
-file(GLOB_RECURSE SOURCES_CLIENT "./*.c*")
+file(GLOB SOURCES_CLIENT "./*.c*")
 file(GLOB_RECURSE SOURCES_UILIB "../uilib/*.c*")
 
+set(SOURCES_CLIENT ${SOURCES_CLIENT}
+	# Gamespy
+	"${CMAKE_SOURCE_DIR}/code/gamespy/cl_gamespy.c"
+)
+
 # Made as an interface and not static, as static only links used methods
 add_library(omohclient INTERFACE)
-target_sources(omohclient INTERFACE ${SOURCES_CLIENT} ${SOURCES_UILIB})
 target_compile_definitions(omohclient INTERFACE APP_MODULE)
 target_compile_features(omohclient INTERFACE cxx_nullptr)
 target_compile_features(omohclient INTERFACE c_variadic_macros)
-target_link_libraries(omohclient INTERFACE omohsdl)
+target_link_libraries(omohclient INTERFACE omohsdl_client)
 target_link_libraries(omohclient INTERFACE gcd)
 
 # Sound stuff
 target_compile_definitions(omohclient INTERFACE USE_CODEC_MP3)
 
-add_subdirectory("../libmad-0.15.1b" "./libmad")
-target_link_libraries(omohclient INTERFACE libmad)
\ No newline at end of file
+if (NOT NO_MODERN_DMA)
+	# Use OpenAL
+	find_package(OpenAL REQUIRED)
+
+	if (OPENAL_FOUND)
+		target_compile_definitions(omohclient INTERFACE USE_OPENAL=1 NO_MODERN_DMA=0)
+		if (MSVC)
+			target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR}/AL)
+		else()
+			target_include_directories(omohclient INTERFACE ${OPENAL_INCLUDE_DIR})
+		endif()
+
+		if(NOT USE_SYSTEM_LIBS)
+			target_compile_definitions(omohclient INTERFACE USE_OPENAL_DLOPEN=1)
+		else()
+			# Link against system OpenAL
+			target_link_libraries(omohclient INTERFACE OpenAL::OpenAL)
+		endif()
+	endif()
+
+	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.c$")
+	file(GLOB SOURCES_CLIENT_SND "./snd_*_new.c*" "./snd_codec*.c*")
+	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
+else()
+	#
+	# Fallback to old DMA sound system
+	#
+	message(NOTICE "OpenAL was explicitly disabled - fallback to old SDL sound system")
+	target_compile_definitions(omohclient INTERFACE NO_MODERN_DMA=1)
+	set(NO_MODERN_DMA TRUE)
+
+	list(FILTER SOURCES_CLIENT EXCLUDE REGEX "./snd_([a-zA-Z0-9_]+)\.cpp$")
+	file(GLOB_RECURSE SOURCES_CLIENT_SND "./new/*.c*")
+	list(APPEND SOURCES_CLIENT ${SOURCES_CLIENT_SND})
+endif()
+
+set(OLD_VALUE ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
+
+if(USE_INTERNAL_MAD)
+	add_subdirectory("../libmad" "./libmad" EXCLUDE_FROM_ALL)
+	target_link_libraries(omohclient INTERFACE mad)
+else()
+	include(FindPackageHandleStandardArgs)
+	find_path(LIBMAD_INCLUDE_DIRS mad.h)
+	find_library(LIBMAD_LIBRARIES mad)
+	find_package_handle_standard_args(
+		LibMad
+		DEFAULT_MSG
+		LIBMAD_LIBRARIES
+		LIBMAD_INCLUDE_DIRS
+	)
+	target_include_directories(omohclient INTERFACE ${LIBMAD_INCLUDE_DIRS})
+	target_link_libraries(omohclient INTERFACE ${LIBMAD_LIBRARIES})
+endif()
+
+set(BUILD_SHARED_LIBS ${OLD_VALUE} CACHE BOOL "" FORCE)
+
+target_sources(omohclient INTERFACE ${SOURCES_CLIENT} ${SOURCES_UILIB})
diff --git a/code/client/cl_avi.cpp b/code/client/cl_avi.cpp
index a6e018f0..051599a3 100644
--- a/code/client/cl_avi.cpp
+++ b/code/client/cl_avi.cpp
@@ -334,6 +334,9 @@ writing the actual data can begin
 */
 qboolean CL_OpenAVIForWriting( const char *fileName )
 {
+    return qfalse;
+    // Removed in OPM
+#if 0
   if( afd.fileOpen )
     return qfalse;
 
@@ -425,6 +428,7 @@ qboolean CL_OpenAVIForWriting( const char *fileName )
   afd.fileOpen = qtrue;
 
   return qtrue;
+#endif
 }
 
 /*
diff --git a/code/client/cl_cgame.cpp b/code/client/cl_cgame.cpp
index 6cd2f97c..e6737760 100644
--- a/code/client/cl_cgame.cpp
+++ b/code/client/cl_cgame.cpp
@@ -211,20 +211,20 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 	}
 
 	snapshot->numEntities = 0;
-	for ( i = 0 ; i < count ; i++ ) {
+	for(i = 0; i < MAX_ENTITIES_IN_SNAPSHOT; i++) {
+		parents[i] = -1;
+	}
+
+	for (i = 0; i < count; i++) {
 		s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
 		pnum = s1->parent;
 
 		if (pnum == ENTITYNUM_NONE) {
 			parents[s1->number] = -2;
-		}
-		else
-		{
+		} else {
 			if (parents[pnum] == -2) {
 				parents[s1->number] = -2;
-			}
-			else
-			{
+			} else {
 				// add it later
 				parents[s1->number] = pnum;
 				continue;
@@ -234,33 +234,37 @@ qboolean	CL_GetSnapshot( int snapshotNumber, snapshot_t *snapshot ) {
 		snapshot->entities[snapshot->numEntities++] = *s1;
 	}
 
-	for(pcount = 0; pcount < 8 && snapshot->numEntities != count; pcount++)
-	{
-		for (i = 0; i < count; i++)
-		{
+	for(pcount = 0; pcount < 8 && snapshot->numEntities != count; pcount++) {
+		for (i = 0; i < count; i++) {
 			s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
 			pnum = parents[s1->number];
 			if (pnum >= 0 && parents[pnum] == -2) {
+				parents[s1->number] = -2;
 				snapshot->entities[snapshot->numEntities++] = *s1;
 			}
 		}
 	}
 
-	if (pcount >= 8)
-	{
-		for (i = count; i < snapshot->numEntities; i++)
+	if (snapshot->numEntities != count) {
+		Com_DPrintf("CL_GetSnapshot: Not all children could find their parents.\n");
+
+		for (i = snapshot->numEntities; i < count; i++)
 		{
-			s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + i) & (MAX_PARSE_ENTITIES - 1)];
-			if (parents[s1->number] >= 0) {
-				Com_DPrintf(
-					"CL_GetSnapshot: entity %d with parent %d and model '%s' at %.2f %.2f %.2f, could not find parent.\n",
-					s1->number,
-					s1->parent,
-					CL_ConfigString(CS_MODELS + s1->modelindex),
-					s1->origin[0],
-					s1->origin[1],
-					s1->origin[2]
-				);
+			for (pnum = 0; pnum < count; pnum++) {
+				s1 = &cl.parseEntities[(clSnap->parseEntitiesNum + pnum) & (MAX_PARSE_ENTITIES - 1)];
+				if (parents[s1->number] >= 0) {
+					Com_DPrintf(
+						"CL_GetSnapshot: entity %d with parent %d and model '%s' at %.2f %.2f %.2f, could not find parent.\n",
+						s1->number,
+						s1->parent,
+						CL_ConfigString(CS_MODELS + s1->modelindex),
+						s1->origin[0],
+						s1->origin[1],
+						s1->origin[2]
+					);
+
+					parents[s1->number] = -2;
+				}
 			}
 		}
 	}
@@ -358,7 +362,9 @@ qboolean CL_ProcessServerCommand(const char* origString, const char* cmd, qboole
 		// because this function might be called from a module that would be unloaded
 		// inside Com_Error
         UI_ForceMenuOff(1);
-        Cbuf_AddText("disconnect;pushmenu disconnected");
+		// Fixed in OPM
+		//  Added a newline for next commands
+        Cbuf_AddText("disconnect;pushmenu disconnected\n");
         return qtrue;
     }
 
@@ -395,8 +401,8 @@ Set up argc/argv for the given command
 ===================
 */
 qboolean CL_GetServerCommand( int serverCommandNumber, qboolean differentServer ) {
-	char	*s;
-	char	*cmd;
+	char		*s;
+	char		*cmd;
 	static char bigConfigString[BIG_INFO_STRING];
 
 	// if we have irretrievably lost a reliable command, drop the connection
@@ -421,9 +427,39 @@ qboolean CL_GetServerCommand( int serverCommandNumber, qboolean differentServer
 		Com_DPrintf( "serverCommand: %i : %s\n", serverCommandNumber, s );
 	}
 
-	Cmd_TokenizeString( s );
+	Cmd_TokenizeString(s);
 	cmd = Cmd_Argv(0);
 
+	// Readded in OPM (from ioquake)
+	// Configstring big buffer
+	if (!strcmp(cmd, "bcs0")) {
+		Com_sprintf(bigConfigString, BIG_INFO_STRING, "cs %s \"%s", Cmd_Argv(1), Cmd_Argv(2));
+		return qfalse;
+	}
+
+	if (!strcmp(cmd, "bcs1")) {
+		s = Cmd_Argv(2);
+		if (strlen(bigConfigString) + strlen(s) >= BIG_INFO_STRING) {
+			Com_Error(ERR_DROP, "bcs exceeded BIG_INFO_STRING");
+		}
+		strcat(bigConfigString, s);
+		return qfalse;
+	}
+
+	if (!strcmp(cmd, "bcs2")) {
+		s = Cmd_Argv(2);
+		if (strlen(bigConfigString) + strlen(s) + 1 >= BIG_INFO_STRING) {
+			Com_Error(ERR_DROP, "bcs exceeded BIG_INFO_STRING");
+		}
+		strcat(bigConfigString, s);
+		strcat(bigConfigString, "\"");
+		s = bigConfigString;
+
+		// reparse
+		Cmd_TokenizeString(s);
+		cmd = Cmd_Argv(0);
+	}
+
 	return CL_ProcessServerCommand(s, cmd, differentServer);
 }
 
@@ -435,10 +471,10 @@ CL_CM_LoadMap
 Just adds default parameters that cgame doesn't need to know about
 ====================
 */
-void CL_CM_LoadMap( const char *mapname ) {
-	int		checksum;
-
-	CM_LoadMap( mapname, qtrue, &checksum );
+void CL_CM_LoadMap( const char *mapname, int *checksum ) {
+	CM_LoadMap( mapname, qtrue, checksum );
+	// prepare world vis data
+	re.SetWorldVisData(CM_VisibilityPointer());
 }
 
 /*
@@ -548,7 +584,7 @@ CL_RestoreSavedCgameState
 */
 void CL_RestoreSavedCgameState() {
 	if (cls.savedCgameState) {
-		cge->CG_LoadStateToBuffer(&cls.savedCgameState, cls.savedCgameStateSize, cl.snap.serverTime);
+		cge->CG_LoadStateToBuffer(cls.savedCgameState, cls.savedCgameStateSize, cl.snap.serverTime);
 	}
 }
 
@@ -580,6 +616,7 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 
 	cgi->Printf							= Com_Printf;
 	cgi->DPrintf						= Com_DPrintf;
+	cgi->DebugPrintf					= Com_DebugPrintf;
 
 	cgi->Malloc							= CL_CG_Malloc;
 	cgi->Free							= CL_CG_Free;
@@ -590,7 +627,9 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->LV_ConvertString				= Sys_LV_CL_ConvertString;
 
 	cgi->Cvar_Get						= Cvar_Get;
+	cgi->Cvar_Find						= Cvar_FindVar;
 	cgi->Cvar_Set						= Cvar_Set;
+	cgi->Cvar_CheckRange				= Cvar_CheckRange;
 
 	cgi->Argc							= Cmd_Argc;
 	cgi->Args							= Cmd_Args;
@@ -605,6 +644,8 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->FS_FreeFile					= FS_FreeFile;
 	cgi->FS_WriteFile					= FS_WriteFile;
 	cgi->FS_WriteTextFile				= FS_WriteTextFile;
+    cgi->FS_ListFilteredFiles			= FS_ListFilteredFiles;
+    cgi->FS_FreeFileList				= FS_FreeFileList;
 
 	cgi->SendConsoleCommand				= Cbuf_AddText;
 
@@ -676,9 +717,11 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->R_RegisterModel			= re.RegisterModel;
 	cgi->R_SpawnEffectModel			= re.SpawnEffectModel;
 	cgi->R_RegisterServerModel		= re.RegisterServerModel;
+	cgi->R_GetModelName				= re.GetModelName;
 	cgi->R_UnregisterServerModel	= re.UnregisterServerModel;
 	cgi->R_RegisterShader			= re.RegisterShader;
 	cgi->R_RegisterShaderNoMip		= re.RegisterShaderNoMip;
+	cgi->R_GetShaderName			= re.GetShaderName;
 
 	cgi->R_AddRefEntityToScene		= re.AddRefEntityToScene;
 	cgi->R_AddRefSpriteToScene		= re.AddRefSpriteToScene;
@@ -730,7 +773,9 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 
 	cgi->UI_ShowMenu				= UI_ShowMenu;
 	cgi->UI_HideMenu				= UI_HideMenu;
-	cgi->UI_FontStringWidth			= uie.FontStringWidth;
+	cgi->UI_FontStringWidth			= CL_FontStringWidth;
+	cgi->UI_GetObjectivesTop		= UI_GetObjectivesTop;
+	cgi->UI_GetHighResolutionScale  = UI_GetHighResolutionScale;
 	cgi->Key_StringToKeynum			= Key_StringToKeynum;
 	cgi->Key_KeynumToBindString		= Key_KeynumToBindString;
 	cgi->Key_GetKeysForCommand		= Key_GetKeysForCommand;
@@ -778,6 +823,8 @@ void CL_InitCGameDLL( clientGameImport_t *cgi, clientGameExport_t **cge ) {
 	cgi->CL_RestoreSavedCgameState	= CL_RestoreSavedCgameState;
 	cgi->CL_ClearSavedCgameState	= CL_ClearSavedCgameState;
 
+	cgi->getConfigStringIdNormalized = CPT_NormalizeConfigstring;
+
 	cgi->fsDebug					= fs_debug;
 	cgi->HudDrawElements			= cls.HudDrawElements;
 	cgi->anim						= &cls.anim;
@@ -877,7 +924,13 @@ void CL_InitCGame( void ) {
 	// find the current mapname
 	info = cl.gameState.stringData + cl.gameState.stringOffsets[ CS_SERVERINFO ];
 	mapname = Info_ValueForKey( info, "mapname" );
-	Com_sprintf( cl.mapname, sizeof( cl.mapname ), "maps/%s.bsp", mapname );
+
+	if (CL_UseLargeLightmap(mapname)) {
+		Com_sprintf(cl.mapname, sizeof(cl.mapname), "maps/%s.bsp", mapname);
+	} else {
+		// Added in 2.0
+		Com_sprintf(cl.mapname, sizeof(cl.mapname), "maps/%s_sml.bsp", mapname);
+	}
 
 	S_BeginRegistration();
 	CL_ShutdownCGame();
@@ -892,10 +945,17 @@ void CL_InitCGame( void ) {
 		CL_InitClientSavedData();
 	}
 
-	// init for this gamestate
-	// use the lastExecutedServerCommand instead of the serverCommandSequence
-	// otherwise server commands sent just before a gamestate are dropped
-	cge->CG_Init( &cgi, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum );
+	if (cl.snap.valid) {
+		// init for this gamestate
+		// use the lastExecutedServerCommand instead of the serverCommandSequence
+		// otherwise server commands sent just before a gamestate are dropped
+		cge->CG_Init(&cgi, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum);
+	} else {
+		// executing client commands from previous map/server might be an issue, some commands might be cs commands,
+		// like old CS_SYSTEMINFO configstrings which still contain the sv_serverId from previous map.
+		// It would cause the client to lose the game state number
+		cge->CG_Init(&cgi, clc.serverMessageSequence, clc.serverCommandSequence, clc.clientNum);
+	}
 
 	ClearNewConfigFlag();
 	TIKI_FinishLoad();
@@ -1070,6 +1130,42 @@ void CL_FirstSnapshot( void ) {
 		Cbuf_AddText( cl_activeAction->string );
 		Cvar_Set( "activeAction", "" );
 	}
+
+#ifdef USE_MUMBLE
+	if ((cl_useMumble->integer) && !mumble_islinked()) {
+		int ret = mumble_link(CLIENT_WINDOW_TITLE);
+		Com_Printf("Mumble: Linking to Mumble application %s\n", ret==0?"ok":"failed");
+	}
+#endif
+
+#ifdef USE_VOIP
+	if (!clc.voipCodecInitialized) {
+		int i;
+		int error;
+
+		clc.opusEncoder = opus_encoder_create(48000, 1, OPUS_APPLICATION_VOIP, &error);
+
+		if ( error ) {
+			Com_DPrintf("VoIP: Error opus_encoder_create %d\n", error);
+			return;
+		}
+
+		for (i = 0; i < MAX_CLIENTS; i++) {
+			clc.opusDecoder[i] = opus_decoder_create(48000, 1, &error);
+			if ( error ) {
+				Com_DPrintf("VoIP: Error opus_decoder_create(%d) %d\n", i, error);
+				return;
+			}
+			clc.voipIgnore[i] = qfalse;
+			clc.voipGain[i] = 1.0f;
+		}
+		clc.voipCodecInitialized = qtrue;
+		clc.voipMuteAll = qfalse;
+		Cmd_AddCommand ("voip", CL_Voip_f);
+		Cvar_Set("cl_voipSendTarget", "spatial");
+		Com_Memset(clc.voipTargets, ~0, sizeof(clc.voipTargets));
+	}
+#endif
 }
 
 static int lastSnapFlags;
@@ -1120,7 +1216,12 @@ void CL_SetCGameTime( void ) {
 	// allow pause in single player
 	if ( paused->integer && com_sv_running->integer ) {
 		// paused
-		CL_AdjustTimeDelta();
+		//CL_AdjustTimeDelta();
+		// Fixed in OPM
+		//  Keep in sync with the server time.
+		//  In OG, the game could lag for a short time
+		//  when pausing and unpausing frequently
+		cl.serverTimeDelta = cl.snap.serverTime - cls.realtime;
 		return;
 	}
 
diff --git a/code/client/cl_cin.cpp b/code/client/cl_cin.cpp
index fc3ada32..667a7ef2 100644
--- a/code/client/cl_cin.cpp
+++ b/code/client/cl_cin.cpp
@@ -35,6 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../uilib/ui_public.h"
 #include "snd_local.h"
 
+#include "cl_ui.h"
+
 #define MAXSIZE				8
 #define MINSIZE				4
 
@@ -55,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 static void RoQ_init( void );
+static void CL_FinishedCinematic();
 
 /******************************************************************************
 *
@@ -126,6 +129,10 @@ typedef struct {
 	int					playonwalls;
 	byte*				buf;
 	long				drawX, drawY;
+
+	long realTime;
+	long currTime;
+	long soundTime;
 } cin_cache;
 
 static cinematics_t		cin;
@@ -133,6 +140,10 @@ static cin_cache		cinTable[MAX_VIDEO_HANDLES];
 static int				currentHandle = -1;
 static int				CL_handle = -1;
 
+static connstate_t		oldClientState;
+
+static int				audioStartTime = 0;
+
 extern "C" int				s_soundtime;		// sample PAIRS
 
 
@@ -160,7 +171,7 @@ static int CIN_HandleForVideo(void) {
 }
 
 
-extern "C" int CL_ScaledMilliseconds(void);
+extern "C" int Com_Milliseconds(void);
 
 //-----------------------------------------------------------------------------
 // RllSetupTable
@@ -1142,24 +1153,20 @@ redump:
 		case	ZA_SOUND_MONO:
 			if (!cinTable[currentHandle].silent) {
 				ssize = RllDecodeMonoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags);
-                                S_RawSamples(0, ssize, 22050, 2, 1, (byte *)sbuf, 1.0f, -1);
+                //                S_RawSamples(0, ssize, 22050, 2, 1, (byte *)sbuf, 1.0f, -1);
 			}
 			break;
 		case	ZA_SOUND_STEREO:
 			if (!cinTable[currentHandle].silent) {
-				if (cinTable[currentHandle].numQuads == -1) {
-					S_Update();
-					s_rawend[0] = s_soundtime;
-				}
 				ssize = RllDecodeStereoToStereo( framedata, sbuf, cinTable[currentHandle].RoQFrameSize, 0, (unsigned short)cinTable[currentHandle].roq_flags);
-                                S_RawSamples(0, ssize, 22050, 2, 2, (byte *)sbuf, 1.0f, -1);
+                //                S_RawSamples(0, ssize, 22050, 2, 2, (byte *)sbuf, 1.0f, -1);
 			}
 			break;
 		case	ROQ_QUAD_INFO:
 			if (cinTable[currentHandle].numQuads == -1) {
 				readQuadInfo( framedata );
 				setupQuad( 0, 0 );
-				cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
+				cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = Com_Milliseconds();
 			}
 			if (cinTable[currentHandle].numQuads != 1) cinTable[currentHandle].numQuads = 0;
 			break;
@@ -1226,7 +1233,10 @@ redump:
 
 static void RoQ_init( void )
 {
-	cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = CL_ScaledMilliseconds();
+	cinTable[currentHandle].startTime = cinTable[currentHandle].lastTime = Com_Milliseconds();
+	cinTable[currentHandle].realTime = Com_Milliseconds();
+	cinTable[currentHandle].currTime = 0;
+	cinTable[currentHandle].soundTime = 0;
 
 	cinTable[currentHandle].RoQPlayed = 24;
 
@@ -1273,8 +1283,10 @@ static void RoQShutdown( void ) {
 		cinTable[currentHandle].iFile = 0;
 	}
 
+	S_StopMovieAudio();
+
 	if (cinTable[currentHandle].alterGameState) {
-		clc.state = CA_DISCONNECTED;
+		clc.state = oldClientState;
 		// we can't just do a vstr nextmap, because
 		// if we are aborting the intro cinematic with
 		// a devmap command, nextmap would be valid by
@@ -1286,8 +1298,29 @@ static void RoQShutdown( void ) {
 		}
 		CL_handle = -1;
 	}
+
 	cinTable[currentHandle].fileName[0] = 0;
 	currentHandle = -1;
+
+	CL_FinishedCinematic();
+}
+
+static void CL_FinishedCinematic()
+{
+	const  char* s;
+
+	if (!CL_FinishedIntro())
+	{
+		CL_FinishedStartStage();
+		return;
+	}
+
+    s = Cvar_VariableString("nextmap");
+    if (*s)
+    {
+        Cbuf_ExecuteText(EXEC_APPEND, va("%s\n", s));
+        Cvar_Set("nextmap", "");
+    }
 }
 
 /*
@@ -1328,8 +1361,11 @@ Fetch and decompress the pending frame
 
 e_status CIN_RunCinematic (int handle)
 {
-	int	start = 0;
-	int     thisTime = 0;
+	int deltaTime;
+	int frameTime;
+	int soundTime;
+	int newTime;
+	long tfps;
 
 	if (handle < 0 || handle>= MAX_VIDEO_HANDLES || cinTable[handle].status == FMV_EOF) return FMV_EOF;
 
@@ -1357,24 +1393,46 @@ e_status CIN_RunCinematic (int handle)
 		return cinTable[currentHandle].status;
 	}
 
-	thisTime = CL_ScaledMilliseconds();
-	if (cinTable[currentHandle].shader && (abs(thisTime - cinTable[currentHandle].lastTime))>100) {
-		cinTable[currentHandle].startTime += thisTime - cinTable[currentHandle].lastTime;
+	frameTime = Com_Milliseconds();
+	deltaTime = frameTime - cinTable[currentHandle].realTime;
+	if (deltaTime > 100) {
+		deltaTime = 100;
 	}
-	cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
 
-	start = cinTable[currentHandle].startTime;
-	while(  (cinTable[currentHandle].tfps != cinTable[currentHandle].numQuads)
+	newTime = cinTable[currentHandle].currTime + deltaTime;
+	if (cl_movieaudio->integer) {
+		soundTime = S_CurrentMoviePosition();
+		if (soundTime > cinTable[currentHandle].currTime || soundTime > cinTable[currentHandle].soundTime) {
+			cinTable[currentHandle].currTime = newTime + (deltaTime * (soundTime - newTime)) / 100;
+		}
+		else {
+			cinTable[currentHandle].currTime = newTime;
+		}
+
+        cinTable[currentHandle].soundTime = soundTime;
+	} else {
+		//
+		// Fixed in OPM
+		//
+		cinTable[currentHandle].currTime = newTime;
+	}
+
+	cinTable[currentHandle].realTime = frameTime;
+
+	tfps = (cinTable[currentHandle].currTime * 3) / 100;
+
+	while(  (tfps != cinTable[currentHandle].numQuads)
 		&& (cinTable[currentHandle].status == FMV_PLAY) ) 
 	{
 		RoQInterrupt();
-		if (start != cinTable[currentHandle].startTime) {
-			cinTable[currentHandle].tfps = (((CL_ScaledMilliseconds() - cinTable[currentHandle].startTime)*3)/100);
-			start = cinTable[currentHandle].startTime;
+
+		cinTable[currentHandle].realTime = Com_Milliseconds();
+		if (cinTable[currentHandle].realTime > frameTime + 66) {
+			break;
 		}
 	}
 
-	cinTable[currentHandle].lastTime = thisTime;
+	cinTable[currentHandle].lastTime = frameTime;
 
 	if (cinTable[currentHandle].status == FMV_LOOPED) {
 		cinTable[currentHandle].status = FMV_PLAY;
@@ -1422,7 +1480,7 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 
 	cin.currentHandle = currentHandle;
 
-	strcpy(cinTable[currentHandle].fileName, name);
+	Q_strncpyz(cinTable[currentHandle].fileName, name, sizeof(cinTable[currentHandle].fileName));
 
 	cinTable[currentHandle].ROQSize = 0;
 	cinTable[currentHandle].ROQSize = FS_FOpenFileRead (cinTable[currentHandle].fileName, &cinTable[currentHandle].iFile, qtrue, qtrue);
@@ -1468,10 +1526,6 @@ int CIN_PlayCinematic( const char *arg, int x, int y, int w, int h, int systemBi
 			clc.state = CA_CINEMATIC;
 		}
 
-		if (!cinTable[currentHandle].silent) {
-			s_rawend[0] = s_soundtime;
-		}
-
 		return currentHandle;
 	}
 	Com_DPrintf("trFMV::play(), invalid RoQ ID\n");
@@ -1593,33 +1647,96 @@ void CIN_DrawCinematic (int handle) {
 	cinTable[handle].dirty = qfalse;
 }
 
+static unsigned short CL_PlayRoQ(const char* name, const char* arg, const char* s) {
+	unsigned short RoQID;
+
+	Com_Memset(&cin, 0, sizeof(cinematics_t) );
+	currentHandle = CIN_HandleForVideo();
+
+	cin.currentHandle = currentHandle;
+
+	Q_strncpyz(cinTable[currentHandle].fileName, name, sizeof(cinTable[currentHandle].fileName));
+
+	cinTable[currentHandle].ROQSize = 0;
+	cinTable[currentHandle].ROQSize = FS_FOpenFileRead (cinTable[currentHandle].fileName, &cinTable[currentHandle].iFile, qtrue, qtrue);
+
+	if (cinTable[currentHandle].ROQSize<=0) {
+		Com_DPrintf("Can not find RoQ cinematic '%s'\n", name);
+		CL_FinishedCinematic();
+		return -1;
+	}
+
+	if ((s && s[0] == '1') || Q_stricmp(arg,"demoend.roq")==0 || Q_stricmp(arg,"end.roq")==0) {
+		cinTable[currentHandle].holdAtEnd = qtrue;
+    }
+
+    CIN_SetExtents(currentHandle, 0, 0, 640, 480);
+    cinTable[currentHandle].alterGameState = qtrue;
+
+    initRoQ();
+
+	FS_Read (cin.file, 16, cinTable[currentHandle].iFile);
+
+	RoQID = (unsigned short)(cin.file[0]) + (unsigned short)(cin.file[1])*256;
+	if (RoQID == 0x1084)
+	{
+		RoQ_init();
+//		FS_Read (cin.file, cinTable[currentHandle].RoQFrameSize+8, cinTable[currentHandle].iFile);
+
+		cinTable[currentHandle].status = FMV_PLAY;
+        Com_DPrintf("trFMV::play(), playing %s\n", arg);
+
+        if (cl_movieaudio->integer) {
+			audioStartTime = Com_Milliseconds();
+            S_SetupMovieAudio(name);
+        }
+
+		oldClientState = clc.state;
+        clc.state = CA_CINEMATIC;
+
+		if (cls.glconfig.maxTextureSize <= 256 || s && *s == '2') {
+			//cinTable[currentHandle].interlaced = qtrue;
+		}
+
+		CL_handle = currentHandle;
+
+		do {
+			SCR_RunCinematic();
+		} while (!cinTable[currentHandle].buf && cinTable[currentHandle].status == FMV_PLAY);
+
+		UI_CloseConsole();
+
+		return currentHandle;
+	}
+	Com_DPrintf("trFMV::play(), invalid RoQ ID\n");
+
+	RoQShutdown();
+	return -1;
+}
+
 void CL_PlayCinematic_f(void) {
 	char	*arg, *s;
-	int bits = CIN_system;
+	char	name[256];
 
-	Com_DPrintf("CL_PlayCinematic_f\n");
 	if (clc.state == CA_CINEMATIC) {
 		SCR_StopCinematic();
 	}
 
 	arg = Cmd_Argv( 1 );
+	Com_DPrintf("CL_PlayCinematic( %s )\n", arg);
 	s = Cmd_Argv(2);
 
-	if ((s && s[0] == '1') || Q_stricmp(arg,"demoend.roq")==0 || Q_stricmp(arg,"end.roq")==0) {
-		bits |= CIN_hold;
-	}
-	if (s && s[0] == '2') {
-		bits |= CIN_loop;
+	CL_StartHunkUsers(qfalse);
+    S_StopAllSounds2(qtrue);
+
+	Com_sprintf(name, sizeof(name), "video/%s", arg);
+
+	if (Q_stricmp(&name[strlen(name) - 4], ".roq")) {
+		Com_Printf("Bad or missing cinematic extension.\n");
+		return;
 	}
 
-	S_StopAllSounds( qtrue );
-
-	CL_handle = CIN_PlayCinematic( arg, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, bits );
-	if (CL_handle >= 0) {
-		do {
-			SCR_RunCinematic();
-		} while (cinTable[currentHandle].buf == NULL && cinTable[currentHandle].status == FMV_PLAY);		// wait for first frame (load codebook and sound)
-	}
+    CL_PlayRoQ(name, arg, s);
 }
 
 
@@ -1639,7 +1756,5 @@ void SCR_RunCinematic (void)
 void SCR_StopCinematic(void) {
 	if (CL_handle >= 0 && CL_handle < MAX_VIDEO_HANDLES) {
 		CIN_StopCinematic(CL_handle);
-		S_StopAllSounds( qtrue );
-		CL_handle = -1;
 	}
 }
diff --git a/code/client/cl_input.cpp b/code/client/cl_input.cpp
index b2eb30e8..e2f89d1f 100644
--- a/code/client/cl_input.cpp
+++ b/code/client/cl_input.cpp
@@ -56,6 +56,10 @@ qboolean	in_guimouse;
 
 kbutton_t	in_up, in_down;
 
+#ifdef USE_VOIP
+kbutton_t	in_voiprecord;
+#endif
+
 kbutton_t	in_buttons[16];
 
 qboolean	in_mlooking;
@@ -258,6 +262,20 @@ void IN_SpeedUp(void) {IN_KeyUp(&in_speed);}
 void IN_StrafeDown(void) {IN_KeyDown(&in_strafe);}
 void IN_StrafeUp(void) {IN_KeyUp(&in_strafe);}
 
+#ifdef USE_VOIP
+void IN_VoipRecordDown(void)
+{
+	IN_KeyDown(&in_voiprecord);
+	Cvar_Set("cl_voipSend", "1");
+}
+
+void IN_VoipRecordUp(void)
+{
+	IN_KeyUp(&in_voiprecord);
+	Cvar_Set("cl_voipSend", "0");
+}
+#endif
+
 void IN_Button0Down(void) {IN_KeyDown(&in_buttons[0]);}
 void IN_Button0Up(void) {IN_KeyUp(&in_buttons[0]);}
 void IN_Button1Down(void) {IN_KeyDown(&in_buttons[1]);}
@@ -432,7 +450,7 @@ void CL_MouseEvent( int dx, int dy, int time ) {
 		if( cl.mousey > cls.glconfig.vidHeight )
 			cl.mousey = cls.glconfig.vidHeight;
 	}
-	else
+	else if ( !paused->integer )
 	{
 		cl.mouseDx[cl.mouseIndex] += dx;
 		cl.mouseDy[cl.mouseIndex] += dy;
@@ -461,6 +479,16 @@ CL_JoystickMove
 void CL_JoystickMove( usercmd_t *cmd ) {
 	float	anglespeed;
 
+	float yaw     = j_yaw->value     * cl.joystickAxis[j_yaw_axis->integer];
+	float right   = j_side->value    * cl.joystickAxis[j_side_axis->integer];
+	float forward = j_forward->value * cl.joystickAxis[j_forward_axis->integer];
+	float pitch   = j_pitch->value   * cl.joystickAxis[j_pitch_axis->integer];
+	float up      = j_up->value      * cl.joystickAxis[j_up_axis->integer];
+
+	if ( in_speed.active ^ cl_run->integer ) {
+		cmd->buttons |= BUTTON_RUN;
+	}
+
 	if ( in_speed.active ) {
 		anglespeed = 0.001 * cls.frametime * cl_anglespeedkey->value;
 	} else {
@@ -468,18 +496,22 @@ void CL_JoystickMove( usercmd_t *cmd ) {
 	}
 
 	if ( !in_strafe.active ) {
-		cl.viewangles[YAW] += anglespeed * cl_yawspeed->value * cl.joystickAxis[AXIS_SIDE];
+		cl.viewangles[YAW] += anglespeed * yaw;
+		cmd->rightmove = ClampChar( cmd->rightmove + (int)right );
 	} else {
-		cmd->rightmove = ClampChar( cmd->rightmove + cl.joystickAxis[AXIS_SIDE] );
+		cl.viewangles[YAW] += anglespeed * right;
+		cmd->rightmove = ClampChar( cmd->rightmove + (int)yaw );
 	}
 
 	if ( in_mlooking ) {
-		cl.viewangles[PITCH] += anglespeed * cl_pitchspeed->value * cl.joystickAxis[AXIS_FORWARD];
+		cl.viewangles[PITCH] += anglespeed * forward;
+		cmd->forwardmove = ClampChar( cmd->forwardmove + (int)pitch );
 	} else {
-		cmd->forwardmove = ClampChar( cmd->forwardmove + cl.joystickAxis[AXIS_FORWARD] );
+		cl.viewangles[PITCH] += anglespeed * pitch;
+		cmd->forwardmove = ClampChar( cmd->forwardmove + (int)forward );
 	}
 
-	cmd->upmove = ClampChar( cmd->upmove + cl.joystickAxis[AXIS_UP] );
+	cmd->upmove = ClampChar( cmd->upmove + (int)up );
 }
 
 /*
@@ -565,6 +597,8 @@ void CL_MouseMove( usercmd_t *cmd ) {
 	mx *= cgameSensitivity;
 	my *= cgameSensitivity;
 
+	cmd->buttons |= BUTTON_ANY;
+
 	// add mouse X/Y movement to cmd
 	if(in_strafe.active)
 		cmd->rightmove = ClampChar(cmd->rightmove + m_side->value * mx);
@@ -575,6 +609,14 @@ void CL_MouseMove( usercmd_t *cmd ) {
 		cl.viewangles[PITCH] += m_pitch->value * my;
 	else
 		cmd->forwardmove = ClampChar(cmd->forwardmove - m_forward->value * my);
+
+	if (!isfinite(cl.viewangles[PITCH]) || !isfinite(cl.viewangles[YAW])) {
+		Com_DPrintf("Invalid client viewangles encountered (view pitch: %f, view yaw: %f)!\n", cl.viewangles[PITCH], cl.viewangles[YAW]);
+		Com_DPrintf("cgameSensitivity: %f | mx: %f | my: %f | m_pitch: %f | m_yaw: %f\n", cgameSensitivity, mx, my, m_pitch->value, m_yaw->value);
+		Com_DPrintf("Resetting client viewangles\n");
+		cl.viewangles[PITCH] = 0;
+		cl.viewangles[YAW] = 0;
+	}
 }
 
 /*
@@ -609,8 +651,8 @@ void CL_CmdButtons( usercmd_t *cmd ) {
 	if (UI_MenuActive() || UI_ConsoleIsOpen()) {
 		cmd->buttons |= BUTTON_TALK;
 	}
-
-	if (in_speed.active == !cl_run->integer) {
+	
+	if ( in_speed.active ^ cl_run->integer ) {
 		cmd->buttons |= BUTTON_RUN;
 	}
 
@@ -718,6 +760,12 @@ void CL_CreateNewCommands( void ) {
 
 	frame_msec = com_frameTime - old_com_frameTime;
 
+	// if running over 1000fps, act as if each frame is 1ms
+	// prevents divisions by zero
+	if ( frame_msec < 1 ) {
+		frame_msec = 1;
+	}
+
 	// if running less than 5fps, truncate the extra time to prevent
 	// unexpected moves after a hitch
 	if ( frame_msec > 200 ) {
@@ -818,8 +866,8 @@ qboolean CL_ReadyToSendPacket( void ) {
 	}
 
 	// check for exceeding cl_maxpackets
-	if ( cl_maxpackets->integer < 15 ) {
-		Cvar_Set( "cl_maxpackets", "15" );
+	if ( cl_maxpackets->integer < 30 ) {
+		Cvar_Set( "cl_maxpackets", "30" );
 	} else if ( cl_maxpackets->integer > 125 ) {
 		Cvar_Set( "cl_maxpackets", "125" );
 	}
@@ -909,6 +957,58 @@ void CL_WritePacket( void ) {
 		count = MAX_PACKET_USERCMDS;
 		Com_Printf("MAX_PACKET_USERCMDS\n");
 	}
+
+#ifdef USE_VOIP
+	if (clc.voipOutgoingDataSize > 0)
+	{
+		if((clc.voipFlags & VOIP_SPATIAL) || Com_IsVoipTarget(clc.voipTargets, sizeof(clc.voipTargets), -1))
+		{
+			MSG_WriteByte (&buf, clc_voipOpus);
+			MSG_WriteByte (&buf, clc.voipOutgoingGeneration);
+			MSG_WriteLong (&buf, clc.voipOutgoingSequence);
+			MSG_WriteByte (&buf, clc.voipOutgoingDataFrames);
+			MSG_WriteData (&buf, clc.voipTargets, sizeof(clc.voipTargets));
+			MSG_WriteByte(&buf, clc.voipFlags);
+			MSG_WriteShort (&buf, clc.voipOutgoingDataSize);
+			MSG_WriteData (&buf, clc.voipOutgoingData, clc.voipOutgoingDataSize);
+
+			// If we're recording a demo, we have to fake a server packet with
+			//  this VoIP data so it gets to disk; the server doesn't send it
+			//  back to us, and we might as well eliminate concerns about dropped
+			//  and misordered packets here.
+			if(clc.demorecording && !clc.demowaiting)
+			{
+				const int voipSize = clc.voipOutgoingDataSize;
+				msg_t fakemsg;
+				byte fakedata[MAX_MSGLEN];
+				MSG_Init (&fakemsg, fakedata, sizeof (fakedata));
+				MSG_Bitstream (&fakemsg);
+				MSG_WriteLong (&fakemsg, clc.reliableAcknowledge);
+				MSG_WriteByte (&fakemsg, svc_voipOpus);
+				MSG_WriteShort (&fakemsg, clc.clientNum);
+				MSG_WriteByte (&fakemsg, clc.voipOutgoingGeneration);
+				MSG_WriteLong (&fakemsg, clc.voipOutgoingSequence);
+				MSG_WriteByte (&fakemsg, clc.voipOutgoingDataFrames);
+				MSG_WriteShort (&fakemsg, clc.voipOutgoingDataSize );
+				MSG_WriteBits (&fakemsg, clc.voipFlags, VOIP_FLAGCNT);
+				MSG_WriteData (&fakemsg, clc.voipOutgoingData, voipSize);
+				MSG_WriteByte (&fakemsg, svc_EOF);
+				CL_WriteDemoMessage (&fakemsg, 0);
+			}
+
+			clc.voipOutgoingSequence += clc.voipOutgoingDataFrames;
+			clc.voipOutgoingDataSize = 0;
+			clc.voipOutgoingDataFrames = 0;
+		}
+		else
+		{
+			// We have data, but no targets. Silently discard all data
+			clc.voipOutgoingDataSize = 0;
+			clc.voipOutgoingDataFrames = 0;
+		}
+	}
+#endif
+
 	if ( count >= 1 ) {
 		if ( cl_showSend->integer ) {
 			Com_Printf( "(%i)", count );
@@ -965,16 +1065,6 @@ void CL_WritePacket( void ) {
 	}
 
 	CL_Netchan_Transmit (&clc.netchan, &buf);
-
-	// clients never really should have messages large enough
-	// to fragment, but in case they do, fire them all off
-	// at once
-	// TTimo: this causes a packet burst, which is bad karma for winsock
-	// added a WARNING message, we'll see if there are legit situations where this happens
-	while ( clc.netchan.unsentFragments ) {
-		Com_DPrintf( "WARNING: #462 unsent fragments (not supposed to happen!)\n" );
-		CL_Netchan_TransmitNextFragment( &clc.netchan );
-	}
 }
 
 /*
@@ -991,7 +1081,7 @@ void CL_SendCmd( void ) {
 	}
 
 	// don't send commands if paused
-	if ( com_sv_running->integer && paused->integer && paused->integer ) {
+	if ( com_sv_running->integer && paused->integer  ) {
 		return;
 	}
 
@@ -1086,6 +1176,85 @@ void CL_InitInput( void ) {
 	Cmd_AddCommand("+mlook", IN_MLookDown);
 	Cmd_AddCommand("-mlook", IN_MLookUp);
 
+#ifdef USE_VOIP
+	Cmd_AddCommand ("+voiprecord", IN_VoipRecordDown);
+	Cmd_AddCommand ("-voiprecord", IN_VoipRecordUp);
+#endif
+
 	cl_nodelta = Cvar_Get ("cl_nodelta", "0", 0);
 	cl_debugMove = Cvar_Get ("cl_debugMove", "0", 0);
 }
+
+/*
+============
+CL_ShutdownInput
+============
+*/
+void CL_ShutdownInput(void)
+{
+	Cmd_RemoveCommand("centerview");
+
+	Cmd_RemoveCommand("+moveup");
+	Cmd_RemoveCommand("-moveup");
+	Cmd_RemoveCommand("+movedown");
+	Cmd_RemoveCommand("-movedown");
+	Cmd_RemoveCommand("+left");
+	Cmd_RemoveCommand("-left");
+	Cmd_RemoveCommand("+right");
+	Cmd_RemoveCommand("-right");
+	Cmd_RemoveCommand("+forward");
+	Cmd_RemoveCommand("-forward");
+	Cmd_RemoveCommand("+back");
+	Cmd_RemoveCommand("-back");
+	Cmd_RemoveCommand("+lookup");
+	Cmd_RemoveCommand("-lookup");
+	Cmd_RemoveCommand("+lookdown");
+	Cmd_RemoveCommand("-lookdown");
+	Cmd_RemoveCommand("+strafe");
+	Cmd_RemoveCommand("-strafe");
+	Cmd_RemoveCommand("+moveleft");
+	Cmd_RemoveCommand("-moveleft");
+	Cmd_RemoveCommand("+moveright");
+	Cmd_RemoveCommand("-moveright");
+	Cmd_RemoveCommand("+speed");
+	Cmd_RemoveCommand("-speed");
+	Cmd_RemoveCommand("+attack");
+	Cmd_RemoveCommand("-attack");
+	Cmd_RemoveCommand("+button0");
+	Cmd_RemoveCommand("-button0");
+	Cmd_RemoveCommand("+button1");
+	Cmd_RemoveCommand("-button1");
+	Cmd_RemoveCommand("+button2");
+	Cmd_RemoveCommand("-button2");
+	Cmd_RemoveCommand("+button3");
+	Cmd_RemoveCommand("-button3");
+	Cmd_RemoveCommand("+button4");
+	Cmd_RemoveCommand("-button4");
+	Cmd_RemoveCommand("+button5");
+	Cmd_RemoveCommand("-button5");
+	Cmd_RemoveCommand("+button6");
+	Cmd_RemoveCommand("-button6");
+	Cmd_RemoveCommand("+button7");
+	Cmd_RemoveCommand("-button7");
+	Cmd_RemoveCommand("+button8");
+	Cmd_RemoveCommand("-button8");
+	Cmd_RemoveCommand("+button9");
+	Cmd_RemoveCommand("-button9");
+	Cmd_RemoveCommand("+button10");
+	Cmd_RemoveCommand("-button10");
+	Cmd_RemoveCommand("+button11");
+	Cmd_RemoveCommand("-button11");
+	Cmd_RemoveCommand("+button12");
+	Cmd_RemoveCommand("-button12");
+	Cmd_RemoveCommand("+button13");
+	Cmd_RemoveCommand("-button13");
+	Cmd_RemoveCommand("+button14");
+	Cmd_RemoveCommand("-button14");
+	Cmd_RemoveCommand("+mlook");
+	Cmd_RemoveCommand("-mlook");
+
+#ifdef USE_VOIP
+	Cmd_RemoveCommand("+voiprecord");
+	Cmd_RemoveCommand("-voiprecord");
+#endif
+}
diff --git a/code/client/cl_instantAction.cpp b/code/client/cl_instantAction.cpp
new file mode 100644
index 00000000..1501121a
--- /dev/null
+++ b/code/client/cl_instantAction.cpp
@@ -0,0 +1,640 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cl_ui.h"
+#include "cl_instantAction.h"
+#include "cl_uiserverlist.h"
+#include "../gamespy/sv_gamespy.h"
+
+Event EV_UIInstantAction_AcceptServer
+(
+    "acceptserver",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Connect to the current server"
+);
+
+Event EV_UIInstantAction_RejectServer
+(
+    "rejectserver",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Reject the current server"
+);
+
+Event EV_UIInstantAction_Cancel
+(
+    "ia_cancel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "cancel the server update"
+);
+
+Event EV_UIInstantAction_Refresh
+(
+    "ia_refresh",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Refresh the server list"
+);
+
+CLASS_DECLARATION(UIWidget, UIInstantAction, NULL) {
+    {&EV_UIInstantAction_AcceptServer, &UIInstantAction::Connect      },
+    {&EV_UIInstantAction_RejectServer, &UIInstantAction::Reject       },
+    {&EV_UIInstantAction_Cancel,       &UIInstantAction::CancelRefresh},
+    {&EV_UIInstantAction_Refresh,      &UIInstantAction::Refresh      },
+    {NULL,                             NULL                           }
+};
+
+struct ServerListInstance {
+    int              iServerType;
+    UIInstantAction *pServerList;
+};
+
+ServerListInstance g_IAServerListInst[2];
+
+UIInstantAction::UIInstantAction()
+{
+    state           = IA_INITIALIZE;
+    numFoundServers = 0;
+    numServers      = 0;
+    minPlayers      = 3;
+    startingMaxPing = 100;
+    endingMaxPing   = 1500;
+    maxServers      = -1;
+    servers         = NULL;
+    doneList[0]     = false;
+    doneList[1]     = false;
+    serverList[0]   = NULL;
+    serverList[1]   = NULL;
+
+    ReadIniFile();
+    EnableServerInfo(false);
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Disable));
+}
+
+UIInstantAction::~UIInstantAction()
+{
+    CleanUp();
+}
+
+void UIInstantAction::CleanUp()
+{
+    if (serverList[0]) {
+        ServerListFree(serverList[0]);
+        serverList[0] = NULL;
+    }
+
+    if (serverList[1]) {
+        ServerListFree(serverList[1]);
+        serverList[1] = NULL;
+    }
+
+    if (servers) {
+        delete[] servers;
+        servers = NULL;
+    }
+}
+
+void UIInstantAction::Init()
+{
+    const char *secret_key;
+    const char *game_name;
+
+    static const unsigned int iNumConcurrent = 10;
+
+    numFoundServers = 0;
+    numServers      = 0;
+    doneList[0]     = false;
+    doneList[1]     = false;
+
+    EnableServerInfo(false);
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("ia_noserverfound", new Event(EV_Widget_Disable));
+
+    Cvar_Set("ia_search_percentage", va("%d %%", 0));
+
+    if (com_target_game->integer < target_game_e::TG_MOHTT) {
+        g_IAServerListInst[0].iServerType = com_target_game->integer;
+        g_IAServerListInst[0].pServerList = this;
+
+        game_name  = GS_GetGameName(com_target_game->integer);
+        secret_key = GS_GetGameKey(com_target_game->integer);
+
+        serverList[0] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[0]
+        );
+
+        ServerListClear(serverList[0]);
+    } else {
+        g_IAServerListInst[0].iServerType = target_game_e::TG_MOHTT;
+        g_IAServerListInst[0].pServerList = this;
+
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTT);
+        secret_key = GS_GetGameKey(target_game_e::TG_MOHTT);
+
+        serverList[0] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[0]
+        );
+
+        ServerListClear(serverList[0]);
+
+        g_IAServerListInst[1].iServerType = target_game_e::TG_MOHTA;
+        g_IAServerListInst[1].pServerList = this;
+
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTA);
+        secret_key = GS_GetGameKey(target_game_e::TG_MOHTA);
+
+        serverList[1] = ServerListNew(
+            game_name,
+            game_name,
+            secret_key,
+            iNumConcurrent,
+            (void *)&IAServerListCallBack,
+            1,
+            (void *)&g_IAServerListInst[1]
+        );
+
+        ServerListClear(serverList[1]);
+    }
+
+    state           = IA_WAITING;
+    numFoundServers = 0;
+
+    ServerListUpdate(serverList[0], true);
+
+    if (serverList[1]) {
+        ServerListUpdate(serverList[1], true);
+    }
+
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("searchstatus", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("searchstatuslable", new Event(EV_Widget_Enable));
+}
+
+int UIInstantAction::GetServerIndex(int maxPing, int gameType)
+{
+    int bestPing   = 1500;
+    int bestServer = -1;
+    int i;
+
+    for (i = 0; i < numFoundServers; i++) {
+        const IAServer_t& IAServer = servers[i];
+
+        char *gameVer;
+        float fGameVer;
+        int   ping;
+        int   numPlayers;
+
+        if (IAServer.rejected) {
+            continue;
+        }
+
+        // Skip servers that don't match the provided game type
+        if (ServerGetIntValue(IAServer.server, "g_gametype_i", 1) != gameType) {
+            continue;
+        }
+
+        // Skip servers with high ping
+        ping = ServerGetPing(IAServer.server);
+        if (ping > maxPing) {
+            continue;
+        }
+
+        gameVer = ServerGetStringValue(IAServer.server, "gamever", "1.00");
+        if (com_target_demo->integer && *gameVer != 'd') {
+            // Skip retail servers on demo game
+            continue;
+        } else if (!com_target_demo->integer && *gameVer == 'd') {
+            // Skip demo servers on retail game
+            continue;
+        }
+
+        // Skip incompatible servers
+        fGameVer = atof(gameVer);
+        if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+            if (IAServer.serverGame.serverType == target_game_e::TG_MOHTT) {
+                if (fabs(fGameVer) < 2.3f) {
+                    continue;
+                }
+            } else {
+                if (fabs(fGameVer) < 2.1f) {
+                    continue;
+                }
+            }
+        } else {
+            if (fabs(fGameVer - com_target_version->value) > 0.1f) {
+                continue;
+            }
+        }
+
+        // Skip servers with a password
+        if (ServerGetIntValue(IAServer.server, "password", 0)) {
+            continue;
+        }
+
+        // Skip servers that don't match the minimum number of players
+        numPlayers = ServerGetIntValue(IAServer.server, "numplayers", 0);
+        if (numPlayers < minPlayers) {
+            continue;
+        }
+
+        // Skip full servers
+        if (numPlayers == ServerGetIntValue(IAServer.server, "maxplayers", 0)) {
+            continue;
+        }
+
+        // Skip servers with an higher ping than the best one
+        if (ping >= bestPing) {
+            continue;
+        }
+
+        //
+        // Found a potential server
+        //
+
+        bestPing   = ping;
+        bestServer = i;
+    }
+
+    return bestServer;
+}
+
+void UIInstantAction::ReadIniFile()
+{
+    char       *buffer;
+    const char *p;
+    const char *pVal;
+    int         intValue;
+    char        value[32];
+
+    if (!FS_ReadFileEx("iaction.ini", (void **)&buffer, qtrue)) {
+        return;
+    }
+
+    for (p = buffer; p; p = strstr(pVal, "\n")) {
+        if (sscanf(p, "%31s", value) != 1) {
+            break;
+        }
+
+        pVal = strstr(p, "=");
+        if (!pVal) {
+            break;
+        }
+
+        pVal++;
+
+        if (sscanf(pVal, "%d", &intValue) != 1) {
+            break;
+        }
+
+        if (!Q_stricmpn(value, "MinPlayers", 10)) {
+            minPlayers = intValue;
+        }
+
+        if (!Q_stricmpn(value, "StartingMaxPing", 15)) {
+            startingMaxPing = intValue;
+        }
+
+        if (!Q_stricmpn(value, "EndingMaxPing", 13)) {
+            endingMaxPing = intValue;
+        }
+
+        if (!Q_stricmpn(value, "MaxServers", 10)) {
+            maxServers = intValue;
+        }
+    }
+}
+
+void UIInstantAction::FindServer()
+{
+    int ping;
+    int i;
+
+    currentServer = -1;
+    state         = IA_NONE;
+
+    for (ping = startingMaxPing; ping < endingMaxPing; ping += 100) {
+        //
+        // Find the best server starting from FFA gametype first
+        //
+        for (i = 1; i < 7; i++) {
+            currentServer = GetServerIndex(ping, i);
+            if (currentServer >= 0) {
+                break;
+            }
+        }
+
+        if (currentServer >= 0) {
+            break;
+        }
+    }
+
+    menuManager.PassEventToWidget("ia_refresh_button", new Event(EV_Widget_Enable));
+    menuManager.PassEventToWidget("ia_cancel_button", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("searchstatus", new Event(EV_Widget_Disable));
+    menuManager.PassEventToWidget("searchstatuslable", new Event(EV_Widget_Disable));
+
+    if (currentServer < 0) {
+        EnableServerInfo(false);
+
+        menuManager.PassEventToWidget("ia_noserverfound", new Event(EV_Widget_Enable));
+        return;
+    }
+
+    const IAServer_t& IAServer   = servers[currentServer];
+    const char       *hostname   = ServerGetStringValue(IAServer.server, "hostname", "(NONE)");
+    const char       *gametype   = ServerGetStringValue(IAServer.server, "gametype", "(NONE)");
+    int               numplayers = ServerGetIntValue(IAServer.server, "numplayers", 0);
+    int               maxplayers = ServerGetIntValue(IAServer.server, "maxplayers", 0);
+    ping                         = ServerGetPing(IAServer.server);
+
+    Cvar_Set("ia_servername", va("  %s", hostname));
+    Cvar_Set("ia_ping", va("%d", ping));
+    Cvar_Set("ia_gametype", va("%s", gametype));
+    Cvar_Set("ia_players", va("%d", numplayers));
+    Cvar_Set("ia_maxplayers", va("%d", maxplayers));
+
+    EnableServerInfo(true);
+}
+
+void UIInstantAction::Connect(Event *ev)
+{
+    char *gameVer;
+    float fGameVer;
+    bool  bDiffVersion;
+    char  command[256];
+
+    if (currentServer < 0 || currentServer < numServers) {
+        return;
+    }
+
+    const IAServer_t& IAServer = servers[currentServer];
+
+    gameVer = ServerGetStringValue(IAServer.server, "gamever", "1.00");
+    if (gameVer[0] == 'd') {
+        gameVer++;
+    }
+
+    // Skip incompatible servers
+    fGameVer     = atof(gameVer);
+    bDiffVersion = false;
+    if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+        if (IAServer.serverGame.serverType == target_game_e::TG_MOHTT) {
+            if (fabs(fGameVer) < 2.3f) {
+                bDiffVersion = true;
+            }
+        } else {
+            if (fabs(fGameVer) < 2.1f) {
+                bDiffVersion = true;
+            }
+        }
+    } else {
+        if (fabs(fGameVer - com_target_version->value) > 0.1f) {
+            bDiffVersion = true;
+        }
+    }
+
+    if (bDiffVersion) {
+        if (fGameVer - com_target_version->value > 0) {
+            // Older version
+            UI_SetReturnMenuToCurrent();
+            Cvar_Set("com_errormessage", va("Server is version %s, you are using %s", gameVer, "2.40"));
+            UI_PushMenu("wrongversion");
+        } else {
+            // Server version is newer
+            Cvar_Set("dm_serverstatus", va("Can not connect to v%s server, you are using v%s", gameVer, "2.40"));
+        }
+    }
+
+    UI_SetReturnMenuToCurrent();
+    Cvar_Set("g_servertype", va("%d", servers[currentServer].serverGame.serverType));
+
+    Com_sprintf(
+        command,
+        sizeof(command),
+        "connect %s:%i\n",
+        ServerGetAddress(IAServer.server),
+        ServerGetIntValue(IAServer.server, "hostport", PORT_SERVER)
+    );
+    Cbuf_AddText(command);
+}
+
+void UIInstantAction::Reject(Event *ev)
+{
+    servers[currentServer].rejected = 1;
+    FindServer();
+}
+
+void UIInstantAction::Draw()
+{
+    switch (state) {
+    case IA_INITIALIZE:
+        Init();
+        break;
+    case IA_UPDATE:
+        Update();
+        break;
+    case IA_FINISHED:
+        FindServer();
+        break;
+    default:
+        break;
+    }
+
+    if (serverList[0]) {
+        ServerListThink(serverList[0]);
+    }
+
+    if (serverList[1]) {
+        ServerListThink(serverList[1]);
+    }
+}
+
+void UIInstantAction::Update()
+{
+    numFoundServers = 0;
+
+    // count the total number of servers from both server list
+    numServers = ServerListCount(serverList[0]);
+    if (serverList[1]) {
+        numServers += ServerListCount(serverList[1]);
+    }
+
+    state   = IA_FINISHED;
+    servers = new IAServer_t[numServers];
+
+    ServerListHalt(serverList[0]);
+    if (serverList[1]) {
+        ServerListHalt(serverList[1]);
+    }
+
+    ServerListThink(serverList[0]);
+    if (serverList[1]) {
+        ServerListThink(serverList[1]);
+    }
+
+    state = IA_SEARCHING;
+
+    // Start updating the first list
+    doneList[0] = false;
+    ServerListClear(serverList[0]);
+    ServerListUpdate(serverList[0], true);
+
+    // Update the second optional list
+    if (serverList[1]) {
+        doneList[1] = false;
+        ServerListClear(serverList[1]);
+        ServerListUpdate(serverList[1], true);
+    }
+}
+
+int UIInstantAction::AddServer(GServer server, const ServerGame_t& serverGame)
+{
+    servers[numFoundServers].server     = server;
+    servers[numFoundServers].serverGame = serverGame;
+    servers[numFoundServers].rejected   = false;
+    numFoundServers++;
+
+    return numFoundServers;
+}
+
+void UIInstantAction::CancelRefresh(Event *ev)
+{
+    state = IA_FINISHED;
+    ServerListHalt(serverList[0]);
+    ServerListHalt(serverList[1]);
+}
+
+void UIInstantAction::Refresh(Event *ev)
+{
+    state = IA_INITIALIZE;
+}
+
+void UIInstantAction::EnableServerInfo(bool enable)
+{
+    if (enable) {
+        menuManager.PassEventToWidget("iaservername_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_servername_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_ping_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_ping_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_gametype_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_gametype_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_players_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_players_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_maxplayers_label", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("ia_maxplayers_field", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("acceptserver", new Event(EV_Widget_Enable));
+        menuManager.PassEventToWidget("rejectserver", new Event(EV_Widget_Enable));
+    } else {
+        menuManager.PassEventToWidget("iaservername_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_servername_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_ping_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_ping_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_gametype_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_gametype_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_players_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_players_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_maxplayers_label", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("ia_maxplayers_field", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("acceptserver", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("rejectserver", new Event(EV_Widget_Disable));
+    }
+}
+
+void UIInstantAction::IAServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
+{
+    const ServerListInstance *pInstance   = (const ServerListInstance *)instance;
+    UIInstantAction          *pServerList = pInstance->pServerList;
+
+    if (msg == LIST_PROGRESS) {
+        if (pServerList->state == IA_WAITING) {
+            if (pInstance->iServerType == com_target_game->integer) {
+                pServerList->doneList[0] = true;
+            }
+
+            if (com_target_game->integer >= target_game_e::TG_MOHTT && pInstance->iServerType == target_game_e::TG_MOHTA) {
+                pServerList->doneList[1] = true;
+            }
+
+            if (pServerList->doneList[0] && (!pServerList->serverList[1] || pServerList->doneList[1])) {
+                pServerList->state = IA_UPDATE;
+            }
+        } else if (pServerList->state == IA_SEARCHING) {
+            ServerGame_t serverGame;
+            serverGame.serverType = pInstance->iServerType;
+            const int serverIndex = pServerList->AddServer((GServer)param1, serverGame);
+
+            Cvar_Set("ia_search_percentage", va("%d %%", 100 * serverIndex / pServerList->numServers));
+
+            if (pServerList->maxServers >= 0 && serverIndex >= pServerList->maxServers) {
+                // Reached the maximum number of servers, stop there
+                pServerList->doneList[0] = true;
+                ServerListHalt(pServerList->serverList[0]);
+
+                if (pServerList->serverList[1]) {
+                    pServerList->doneList[1] = true;
+                    ServerListHalt(pServerList->serverList[1]);
+                }
+
+                pServerList->state = IA_FINISHED;
+            }
+        }
+    } else if (msg == LIST_STATECHANGED && ServerListState(serverlist) == GServerListState::sl_idle) {
+        if (pInstance->iServerType == com_target_game->integer) {
+            pServerList->doneList[0] = true;
+        }
+
+        if (com_target_game->integer >= target_game_e::TG_MOHTT && pInstance->iServerType == target_game_e::TG_MOHTA) {
+            pServerList->doneList[1] = true;
+        }
+
+        if (pServerList->doneList[0] && (!pServerList->serverList[1] || pServerList->doneList[1])) {
+            if (pServerList->state == IA_WAITING) {
+                pServerList->state = IA_UPDATE;
+            }
+            if (pServerList->state == IA_SEARCHING) {
+                pServerList->state = IA_FINISHED;
+            }
+        }
+    }
+}
diff --git a/code/client/cl_instantAction.h b/code/client/cl_instantAction.h
new file mode 100644
index 00000000..9a838dc5
--- /dev/null
+++ b/code/client/cl_instantAction.h
@@ -0,0 +1,103 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// Added in 2.30
+//  Instantly find a server matching common criterias
+
+#pragma once
+
+#include "../gamespy/goaceng.h"
+
+typedef struct {
+    int serverType;
+} ServerGame_t;
+
+typedef struct {
+    GServer      server;
+    ServerGame_t serverGame;
+    bool         rejected;
+} IAServer_t;
+
+enum IAState_e {
+    IA_NONE,
+    IA_INITIALIZE,
+    IA_WAITING,
+    IA_UPDATE,
+    IA_SEARCHING,
+    IA_FINISHED
+};
+
+class UIInstantAction : public UIWidget
+{
+public:
+    CLASS_PROTOTYPE(UIInstantAction);
+
+public:
+    UIInstantAction();
+    ~UIInstantAction() override;
+
+    void CleanUp();
+    void Init();
+
+    int  GetServerIndex(int maxPing, int gameType);
+    void ReadIniFile();
+    void FindServer();
+    void Connect(Event *ev);
+    void Reject(Event *ev);
+    void Draw();
+    void Update();
+    int  AddServer(GServer server, const ServerGame_t& serverGame);
+    void CancelRefresh(Event *ev);
+    void Refresh(Event *ev);
+    void EnableServerInfo(bool enable);
+
+private:
+    static void IAServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
+
+private:
+    //
+    // List
+    //
+    bool        doneList[2];
+    GServerList serverList[2];
+    int         maxServers;
+
+    //
+    // Current states
+    //
+    IAState_e state;
+    int       numServers;
+    int       numFoundServers;
+
+    //
+    // Filters
+    //
+    int minPlayers;
+    int startingMaxPing;
+    int endingMaxPing;
+
+    //
+    // Servers
+    //
+    IAServer_t *servers;
+    int         currentServer;
+};
diff --git a/code/client/cl_inv.cpp b/code/client/cl_inv.cpp
index 1fbdda1a..850d766d 100644
--- a/code/client/cl_inv.cpp
+++ b/code/client/cl_inv.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,316 +22,1159 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( Listener, invlistener, NULL )
-{
-	{ NULL, NULL }
+typedef struct {
+    const char *string;
+    int         value;
+} equipment_event_table_t;
+
+static equipment_event_table_t s_equipTable[] = {
+    {"left",  1 },
+    {"right", 2 },
+    {"dual",  4 },
+    {"use",   8 },
+    {"none",  16},
+    {NULL,    0 }
 };
 
-invlistener::invlistener( inventory_t *i )
+Event evi_inv_changesound
+(
+    "inv_changesound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the sound to play when the inventory changes items"
+);
+Event evi_inv_selectsound
+(
+    "inv_selectsound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the sound to play when an inventory item is selected"
+);
+Event evi_inv_rejectsound
+(
+    "inv_rejectsound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the sound to play when an invalid inventory item is selected"
+);
+Event evi_inv_width
+(
+    "inv_width",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "Specifies the width of each of the main inv buttons"
+);
+Event evi_inv_height
+(
+    "inv_height",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "Specifies the height of each of the main inv buttons"
+);
+Event evi_inv_vertical_offset
+(
+    "inv_vert_offset",
+    EV_DEFAULT,
+    "i",
+    "offset",
+    "Specifies the vertical offset from the top of the screen for the inventory"
+);
+Event evi_inv_horizontal_offset
+(
+    "inv_horiz_offset",
+    EV_DEFAULT,
+    "i",
+    "offset",
+    "Specifies the horizontal offset from the right of the screen for the inventory"
+);
+Event evi_inv_align
+(
+    "inv_align",
+    EV_DEFAULT,
+    "s",
+    "side",
+    "Specifies the horizontal offset from the right of the screen for the inventory"
+);
+Event evi_inv_cascade
+(
+    "inv_cascade",
+    EV_DEFAULT,
+    "s",
+    "side",
+    "Specifies the side which to cascade inventory items"
+);
+Event evi_typedef
+(
+    "typedef",
+    EV_DEFAULT,
+    "s",
+    "type",
+    "Specifies which class of item you're editing"
+);
+Event evi_openbrace
+(
+    "{", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Open brace, useless"
+);
+Event evi_closebrace
+(
+    "}", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Close brace, useless"
+);
+Event evi_button_shader
+(
+    "button_shader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "The shader for the class button"
+);
+Event evi_hover_shader
+(
+    "hover_shader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "The shader for the class button when hovering"
+);
+Event evi_sel_shader
+(
+    "sel_shader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "The shader for the class button when selected"
+);
+Event evi_bg
+(
+    "bg",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "Shader for the background of the class submenu"
+);
+Event evi_bg_tile
+(
+    "bg_tile",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Specifies to tile the background of the class submenu"
+);
+Event evi_width
+(
+    "width",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "The width of the current item, or default width of all items depending on context"
+);
+Event evi_height
+(
+    "height",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "The height of the current item, or default width of all items depending on context"
+);
+Event evi_barwidth
+(
+    "barwidth",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "The width of the current item's ammo bar or default width of all items bar's depending on context"
+);
+Event evi_barheight(
+    "barheight",
+    EV_DEFAULT,
+    "i",
+    "barheight",
+    "The height of the current item's ammo bar, or default width of all items bar's depending on context"
+);
+Event evi_baroffsetx
+(
+    "baroffsetx",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "The x offset used to calculate ammo bar"
+);
+Event evi_baroffsety
+(
+    "baroffsety",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "The y offset used to calculate ammo bar"
+);
+Event evi_item
+(
+    "item",
+    EV_DEFAULT,
+    "s",
+    "item_name",
+    "The name of the current item"
+);
+Event evi_ammo
+(
+    "ammo",
+    EV_DEFAULT,
+    "s",
+    "ammo_name",
+    "The name of the current item's ammo"
+);
+Event evi_equip
+(
+    "equip",
+    EV_DEFAULT,
+    "sSSSSSSSSS",
+    "use use use use use use use use use use",
+    "Which ways you can use this item"
+);
+Event evi_checkammo
+(
+    "checkammo",
+    EV_DEFAULT,
+    "b",
+    "bool",
+    "Check if the weapon has ammo before using it"
+);
+Event evi_command
+(
+    "command",
+    EV_DEFAULT,
+    "s",
+    "command",
+    "Command to execute"
+);
+Event evi_model
+(
+    "invmodel",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Which model this item is"
+);
+Event evi_anim
+(
+    "invanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Which anim this item uses"
+);
+Event evi_scale
+(
+    "invscale",
+    EV_DEFAULT,
+    "f",
+    "scale",
+    "How much to scale the model"
+);
+Event evi_angles
+(
+    "invangles",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "The orientation of the model"
+);
+Event evi_angledeltas
+(
+    "invangledeltas",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "How to spin or bob the model"
+);
+Event evi_move
+(
+    "invmove",
+    EV_DEFAULT,
+    "s",
+    "movetype",
+    "How to move the model when selected.\n either bob or spin"
+);
+Event evi_rotateoffset
+(
+    "invrotateoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Offsets the origin of the model for rotation"
+);
+Event evi_offset
+(
+    "invoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Offsets the origin of the model for moving"
+);
+Event evi_hudmodel
+(
+    "hudmodel",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Which model this item is"
+);
+Event evi_hudanim
+(
+    "hudanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Which anim this item uses"
+);
+Event evi_hudscale
+(
+    "hudscale",
+    EV_DEFAULT,
+    "f",
+    "scale",
+    "How much to scale the model"
+);
+Event evi_hudangles
+(
+    "hudangles",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "The orientation of the model"
+);
+Event evi_hudangledeltas
+(
+    "hudangledeltas",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "How to spin or bob the model"
+);
+Event evi_hudmove
+(
+    "hudmove",
+    EV_DEFAULT,
+    "s",
+    "movetype",
+    "How to move the model when selected.\n either bob or spin"
+);
+Event evi_hudcompassangles
+(
+    "hudcompassangles",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Applies the special case compass angles to the model\n"
+);
+Event evi_hudcompassneedleangles
+(
+    "hudcompassneedleangles",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Applies the special case compass needle angles to the model\n"
+);
+Event evi_hudrotateoffset
+(
+    "hudrotateoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Offsets the origin of the model for rotation"
+);
+Event evi_hudoffset
+(
+    "hudoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Offsets the origin of the model for moving"
+);
+Event evi_bgshader
+(
+    "bgshader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "Shader to draw on the background of the item widget"
+);
+Event evi_barshader
+(
+    "barshader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "Shader to draw on the background of the item widget to display ammo counts"
+);
+Event evi_selitemshader
+(
+    "selitem_shader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "The shader for an item that is currently selected in the class submenu"
+);
+Event evi_selitemshaderontop
+(
+    "selitem_shaderontop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Whether the sel shader should be rendered after the model"
+);
+Event evi_modelwindow
+(
+    "modelwindow",
+    EV_DEFAULT,
+    "ffff",
+    "x y width height",
+    "Specifies the dimensions of the model window for the inventory in normalized coordinates"
+);
+
+CLASS_DECLARATION(Listener, invlistener, NULL) {
+    {&evi_inv_width,              &invlistener::InvWidth              },
+    {&evi_inv_height,             &invlistener::InvHeight             },
+    {&evi_inv_vertical_offset,    &invlistener::InvVertOffset         },
+    {&evi_inv_horizontal_offset,  &invlistener::InvHorizOffset        },
+    {&evi_inv_selectsound,        &invlistener::InvSelectSound        },
+    {&evi_inv_rejectsound,        &invlistener::InvRejectSound        },
+    {&evi_inv_changesound,        &invlistener::InvChangeSound        },
+    {&evi_inv_align,              &invlistener::InvAlign              },
+    {&evi_inv_cascade,            &invlistener::InvCascade            },
+    {&evi_typedef,                &invlistener::Typedef               },
+    {&evi_openbrace,              &invlistener::OpenBrace             },
+    {&evi_closebrace,             &invlistener::CloseBrace            },
+    {&evi_button_shader,          &invlistener::ButtonShader          },
+    {&evi_hover_shader,           &invlistener::HoverShader           },
+    {&evi_sel_shader,             &invlistener::SelShader             },
+    {&evi_bg,                     &invlistener::Background            },
+    {&evi_bg_tile,                &invlistener::BackgroundTile        },
+    {&evi_width,                  &invlistener::Width                 },
+    {&evi_height,                 &invlistener::Height                },
+    {&evi_barwidth,               &invlistener::BarWidth              },
+    {&evi_barheight,              &invlistener::BarHeight             },
+    {&evi_baroffsetx,             &invlistener::BarOffsetX            },
+    {&evi_baroffsety,             &invlistener::BarOffsetY            },
+    {&evi_item,                   &invlistener::Item                  },
+    {&evi_ammo,                   &invlistener::Ammo                  },
+    {&evi_equip,                  &invlistener::Equip                 },
+    {&evi_checkammo,              &invlistener::CheckAmmo             },
+    {&evi_command,                &invlistener::Command               },
+    {&evi_bgshader,               &invlistener::BGShader              },
+    {&evi_barshader,              &invlistener::BarShader             },
+    {&evi_selitemshader,          &invlistener::SelItemShader         },
+    {&evi_selitemshaderontop,     &invlistener::SelItemShaderOnTop    },
+    {&evi_modelwindow,            &invlistener::ModelWindow           },
+    {&evi_model,                  &invlistener::Model                 },
+    {&evi_anim,                   &invlistener::Anim                  },
+    {&evi_move,                   &invlistener::Move                  },
+    {&evi_rotateoffset,           &invlistener::RotateOffset          },
+    {&evi_offset,                 &invlistener::Offset                },
+    {&evi_scale,                  &invlistener::Scale                 },
+    {&evi_angles,                 &invlistener::Angles                },
+    {&evi_angledeltas,            &invlistener::AngleDeltas           },
+    {&evi_hudmodel,               &invlistener::HudModel              },
+    {&evi_hudanim,                &invlistener::HudAnim               },
+    {&evi_hudmove,                &invlistener::HudMove               },
+    {&evi_hudcompassangles,       &invlistener::HudCompassAngles      },
+    {&evi_hudcompassneedleangles, &invlistener::HudCompassNeedleAngles},
+    {&evi_hudrotateoffset,        &invlistener::HudRotateOffset       },
+    {&evi_hudoffset,              &invlistener::HudOffset             },
+    {&evi_hudscale,               &invlistener::HudScale              },
+    {&evi_hudangles,              &invlistener::HudAngles             },
+    {&evi_hudangledeltas,         &invlistener::HudAngleDeltas        },
+    {NULL,                        NULL                                }
+};
+
+invlistener::invlistener(inventory_t *i)
 {
-	// FIXME: stub
+    inv     = i;
+    curtype = 0;
 }
 
-invlistener::invlistener()
+invlistener::invlistener() {}
+
+void invlistener::verify_curitem(void)
 {
-	// FIXME: stub
+    if (!curitem) {
+        throw "no current item";
+    }
 }
 
-void invlistener::verify_curitem( void )
+void invlistener::verify_curtype(void)
 {
-	// FIXME: stub
+    if (!curtype) {
+        throw "no current type";
+    }
 }
 
-void invlistener::verify_curtype( void )
+void invlistener::verify_one_arg(Event *ev)
 {
-	// FIXME: stub
+    if (ev->NumArgs() != 1) {
+        throw "bad arg count";
+    }
 }
 
-void invlistener::verify_one_arg( Event *ev )
+bool invlistener::Load(Script& script)
 {
-	// FIXME: stub
+    str token;
+    str errortext;
+
+    while (script.TokenAvailable(true)) {
+        token = script.GetToken(true);
+
+        if (!token.length() || !ValidEvent(token)) {
+            throw "invalid token";
+        }
+
+        Event *event = new Event(token);
+
+        while (script.TokenAvailable(false)) {
+            event->AddToken(script.GetToken(false));
+        }
+
+        ProcessEvent(event);
+    }
+
+    return true;
 }
 
-bool invlistener::Load( Script& script )
+bool CL_LoadInventory(const char *filename, inventory_t *inv)
 {
-	// FIXME: stub
-	return false;
+    Script script;
+
+    Com_Printf("Loading inventory...\n");
+
+    inv->Clear();
+    invlistener listener(inv);
+
+    // Load the inventory file
+    script.LoadFile(filename);
+    return listener.Load(script);
 }
 
-void invlistener::InvSelectSound( Event *ev )
+inventory_t::inventory_t()
 {
-	// FIXME: stub
+    typewidth   = 64;
+    typeheight  = 64;
+    horizoffset = 0;
+    vertoffset  = 0;
+    align       = INV_ALIGN_RIGHT;
+    cascade     = INV_CASCADE_LEFT;
 }
 
-void invlistener::InvRejectSound( Event *ev )
+inventory_t::~inventory_t()
 {
-	// FIXME: stub
+    Clear();
 }
 
-void invlistener::InvChangeSound( Event *ev )
+inventory_t::inventory_t(const inventory_t& other)
 {
-	// FIXME: stub
+    typewidth   = other.typewidth;
+    typeheight  = other.typeheight;
+    horizoffset = other.horizoffset;
+    vertoffset  = other.vertoffset;
+    align       = other.align;
+    cascade     = other.cascade;
+    rejectsound = other.rejectsound;
+    selectsound = other.selectsound;
+    changesound = other.changesound;
+    types       = other.types;
 }
 
-void invlistener::InvWidth( Event *ev )
+inventory_t& inventory_t::operator=(const inventory_t& other)
 {
-	// FIXME: stub
+    Clear();
+
+    typewidth   = other.typewidth;
+    typeheight  = other.typeheight;
+    horizoffset = other.horizoffset;
+    vertoffset  = other.vertoffset;
+    align       = other.align;
+    cascade     = other.cascade;
+    rejectsound = other.rejectsound;
+    selectsound = other.selectsound;
+    changesound = other.changesound;
+    types       = other.types;
+
+    return *this;
 }
 
-void invlistener::InvHeight( Event *ev )
+void inventory_t::Clear()
 {
-	// FIXME: stub
+    types.ClearObjectList();
 }
 
-void invlistener::InvHorizOffset( Event *ev )
+void invlistener::InvAlign(Event *ev)
 {
-	// FIXME: stub
+    str side;
+
+    verify_one_arg(ev);
+
+    side = ev->GetString(1);
+
+    if (!str::icmp(side, "left")) {
+        inv->align = INV_ALIGN_LEFT;
+    } else if (!str::icmp(side, "right")) {
+        inv->align = INV_ALIGN_RIGHT;
+    } else {
+        warning(__FUNCTION__, "Invalid align side '%s'\n", side.c_str());
+    }
 }
 
-void invlistener::InvVertOffset( Event *ev )
+void invlistener::InvCascade(Event *ev)
 {
-	// FIXME: stub
+    str side;
+
+    verify_one_arg(ev);
+
+    side = ev->GetString(1);
+
+    if (!str::icmp(side, "left")) {
+        inv->cascade = INV_CASCADE_LEFT;
+    } else if (!str::icmp(side, "right")) {
+        inv->cascade = INV_CASCADE_RIGHT;
+    } else {
+        warning(__FUNCTION__, "Invalid cascade side '%s'\n", side.c_str());
+    }
 }
 
-void invlistener::InvAlign( Event *ev )
+void invlistener::InvWidth(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->typewidth = ev->GetInteger(1);
 }
 
-void invlistener::InvCascade( Event *ev )
+void invlistener::InvHeight(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->typeheight = ev->GetInteger(1);
 }
 
-void invlistener::Typedef( Event *ev )
+void invlistener::InvVertOffset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->vertoffset = ev->GetInteger(1);
 }
 
-void invlistener::OpenBrace( Event *ev )
+void invlistener::InvHorizOffset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->horizoffset = ev->GetInteger(1);
 }
 
-void invlistener::CloseBrace( Event *ev )
+void invlistener::InvSelectSound(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->selectsound = ev->GetString(1);
 }
 
-void invlistener::ButtonShader( Event *ev )
+void invlistener::InvRejectSound(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->rejectsound = ev->GetString(1);
 }
 
-void invlistener::HoverShader( Event *ev )
+void invlistener::InvChangeSound(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    inv->changesound = ev->GetString(1);
 }
 
-void invlistener::SelShader( Event *ev )
+void invlistener::Typedef(Event *ev)
 {
-	// FIXME: stub
+    str               type;
+    inventory_type_t *t;
+
+    verify_one_arg(ev);
+
+    type = ev->GetString(1);
+
+    t          = new inventory_type_t();
+    t->name    = type;
+    t->bg_tile = false;
+
+    curtype           = t;
+    curitem           = NULL;
+    defaultWidth      = 0;
+    defaultHeight     = 0;
+    defaultBarWidth   = 0;
+    defaultBarHeight  = 0;
+    defaultBarOffsetX = 0;
+    defaultBarOffsetY = 0;
+
+    inv->types.AddObject(t);
 }
 
-void invlistener::Background( Event *ev )
+void invlistener::OpenBrace(Event *ev) {}
+
+void invlistener::CloseBrace(Event *ev) {}
+
+void invlistener::ButtonShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curtype();
+
+    curtype->texture = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::BackgroundTile( Event *ev )
+void invlistener::HoverShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curtype();
+
+    curtype->hoverTexture = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::Width( Event *ev )
+void invlistener::SelShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curtype();
+
+    curtype->selTexture = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::Height( Event *ev )
+void invlistener::Background(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curtype();
+
+    curtype->bg = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::BarWidth( Event *ev )
+void invlistener::BackgroundTile(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curtype();
+
+    curtype->bg      = uWinMan.RegisterShader(ev->GetString(1));
+    curtype->bg_tile = true;
 }
 
-void invlistener::BarHeight( Event *ev )
+void invlistener::BGShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->bgshader = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::BarOffsetX( Event *ev )
+void invlistener::SelItemShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->selshader = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::BarOffsetY( Event *ev )
+void invlistener::SelItemShaderOnTop(Event *ev)
 {
-	// FIXME: stub
+    verify_curitem();
+
+    curitem->selShaderOnTop = true;
 }
 
-void invlistener::Item( Event *ev )
+void invlistener::BarShader(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->barshader = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void invlistener::Ammo( Event *ev )
+void invlistener::Width(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->width = ev->GetInteger(1);
+    } else {
+        defaultWidth = ev->GetInteger(1);
+    }
 }
 
-void invlistener::Equip( Event *ev )
+void invlistener::Height(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->height = ev->GetInteger(1);
+    } else {
+        defaultHeight = ev->GetInteger(1);
+    }
 }
 
-void invlistener::CheckAmmo( Event *ev )
+void invlistener::BarWidth(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->barwidth = ev->GetInteger(1);
+    } else {
+        defaultBarWidth = ev->GetInteger(1);
+    }
 }
 
-void invlistener::Command( Event *ev )
+void invlistener::BarHeight(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->barheight = ev->GetInteger(1);
+    } else {
+        defaultBarHeight = ev->GetInteger(1);
+    }
 }
 
-void invlistener::BGShader( Event *ev )
+void invlistener::BarOffsetY(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->baroffsetY = ev->GetInteger(1);
+    } else {
+        defaultBarOffsetY = ev->GetInteger(1);
+    }
 }
 
-void invlistener::BarShader( Event *ev )
+void invlistener::BarOffsetX(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    if (curitem) {
+        curitem->baroffsetX = ev->GetInteger(1);
+    } else {
+        defaultBarOffsetX = ev->GetInteger(1);
+    }
 }
 
-void invlistener::SelItemShader( Event *ev )
+void invlistener::Item(Event *ev)
 {
-	// FIXME: stub
+    str               type;
+    inventory_item_t *item;
+
+    verify_one_arg(ev);
+    verify_curtype();
+
+    item       = new inventory_item_t();
+    item->name = ev->GetString(1);
+
+    item->width      = defaultWidth;
+    item->height     = defaultHeight;
+    item->barwidth   = defaultBarWidth;
+    item->barheight  = defaultBarHeight;
+    item->baroffsetX = defaultBarOffsetX;
+    item->baroffsetY = defaultBarOffsetY;
+    item->equip      = 8;
+
+    curtype->items.AddObject(item);
+    curitem = curtype->items.ObjectAt(curtype->items.NumObjects());
 }
 
-void invlistener::SelItemShaderOnTop( Event *ev )
+void invlistener::Ammo(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->ammoname = ev->GetString(1);
 }
 
-void invlistener::RotateOffset( Event *ev )
+void invlistener::RotateOffset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.rotateoffset = ev->GetVector(1);
 }
 
-void invlistener::Offset( Event *ev )
+void invlistener::HudRotateOffset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.rotateoffset = ev->GetVector(1);
 }
 
-void invlistener::Model( Event *ev )
+void invlistener::Offset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.offset = ev->GetVector(1);
 }
 
-void invlistener::Anim( Event *ev )
+void invlistener::HudOffset(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.offset = ev->GetVector(1);
 }
 
-void invlistener::Scale( Event *ev )
+void invlistener::Command(Event *ev)
 {
-	// FIXME: stub
+    verify_curitem();
+
+    if (ev->NumArgs() <= 0) {
+        throw "command needs one or more args";
+    }
+
+    curitem->command = ev->GetString(1);
 }
 
-void invlistener::Angles( Event *ev )
+void invlistener::CheckAmmo(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    curitem->checkammo = ev->GetBoolean(1);
 }
 
-void invlistener::AngleDeltas( Event *ev )
+void invlistener::Equip(Event *ev)
 {
-	// FIXME: stub
+    int i;
+
+    verify_curitem();
+
+    if (ev->NumArgs() <= 0) {
+        throw "command needs one or more args";
+    }
+
+    curitem->equip = 0;
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        str equipstr = ev->GetString(i);
+        int tab;
+
+        for (tab = 0; s_equipTable[tab].string; tab++) {
+            if (equipstr == s_equipTable[tab].string) {
+                curitem->equip |= s_equipTable[tab].value;
+                break;
+            }
+        }
+
+        if (!s_equipTable[tab].string) {
+            throw "bad equip arguments";
+        }
+    }
 }
 
-void invlistener::Move( Event *ev )
+void invlistener::Model(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.model = ev->GetString(1);
 }
 
-void invlistener::ModelWindow( Event *ev )
+void invlistener::ModelWindow(Event *ev)
 {
-	// FIXME: stub
+    if (ev->NumArgs() != 4) {
+        throw "ModelWindow: bad arg count";
+    }
+
+    verify_curitem();
+
+    curitem->modelWindowX      = ev->GetFloat(1);
+    curitem->modelWindowY      = ev->GetFloat(2);
+    curitem->modelWindowWidth  = ev->GetFloat(3);
+    curitem->modelWindowHeight = ev->GetFloat(4);
 }
 
-void invlistener::HudRotateOffset( Event *ev )
+void invlistener::HudModel(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.model = ev->GetString(1);
 }
 
-void invlistener::HudOffset( Event *ev )
+void invlistener::Anim(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.anim = ev->GetString(1);
 }
 
-void invlistener::HudModel( Event *ev )
+void invlistener::HudAnim(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.anim = ev->GetString(1);
 }
 
-void invlistener::HudAnim( Event *ev )
+void invlistener::Scale(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.scale = ev->GetFloat(1);
 }
 
-void invlistener::HudScale( Event *ev )
+void invlistener::HudScale(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.scale = ev->GetFloat(1);
 }
 
-void invlistener::HudAngles( Event *ev )
+void invlistener::Angles(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.angles = ev->GetVector(1);
 }
 
-void invlistener::HudAngleDeltas( Event *ev )
+void invlistener::HudAngles(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.angles = ev->GetVector(1);
 }
 
-void invlistener::HudMove( Event *ev )
+void invlistener::AngleDeltas(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->invprops.angledeltas = ev->GetVector(1);
 }
 
-void invlistener::HudCompassAngles( Event *ev )
+void invlistener::HudAngleDeltas(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    curitem->hudprops.angledeltas = ev->GetVector(1);
 }
 
-void invlistener::HudCompassNeedleAngles( Event *ev )
+void invlistener::Move(Event *ev)
 {
-	// FIXME: stub
+    verify_one_arg(ev);
+    verify_curitem();
+
+    str arg = ev->GetString(1);
+
+    if (arg == "bob") {
+        curitem->invprops.move = INV_MOVE_BOB;
+    } else if (arg == "spin") {
+        curitem->invprops.move = INV_MOVE_SPIN;
+    } else {
+        throw "bad move arguments";
+    }
 }
 
-bool CL_LoadInventory( const char *filename, inventory_t *inv )
+void invlistener::HudMove(Event *ev)
 {
-	// FIXME: stub
-	return false;
+    verify_one_arg(ev);
+    verify_curitem();
+
+    str arg = ev->GetString(1);
+
+    if (arg == "bob") {
+        curitem->hudprops.move = INV_MOVE_BOB;
+    } else if (arg == "spin") {
+        curitem->hudprops.move = INV_MOVE_SPIN;
+    } else {
+        throw "bad move arguments";
+    }
 }
 
-inventory_item_t *CL_GetInvItemByName( inventory_t *inv, const char *name )
+void invlistener::HudCompassAngles(Event *ev)
 {
-	// FIXME: stub
-	return NULL;
+    verify_curitem();
+
+    curitem->anglesType = INV_HUDANGLES_COMPASS;
 }
 
-qboolean CL_HasInventoryItem( const char *name )
+void invlistener::HudCompassNeedleAngles(Event *ev)
 {
-	// FIXME: stub
-	return qfalse;
+    verify_curitem();
+
+    curitem->anglesType = INV_HUDANGLES_COMPASS_NEEDLE;
 }
 
-void CL_AmmoCount( const char *name, int *ammo_count, int *max_ammo_count )
+inventory_item_t *CL_GetInvItemByName(inventory_t *inv, const char *name)
 {
-	// FIXME: stub
+    if (!inv) {
+        return NULL;
+    }
+
+    for (int i = 1; i <= inv->types.NumObjects(); i++) {
+        const inventory_type_t *type = inv->types.ObjectAt(i);
+
+        for (int ii = 1; ii <= type->items.NumObjects(); ii++) {
+            inventory_item_t *item = type->items.ObjectAt(i);
+
+            if (!item) {
+                return NULL;
+            }
+
+            if (!str::icmp(item->name, name)) {
+                return item;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+qboolean CL_HasInventoryItem(const char *name)
+{
+    int i;
+
+    for (i = 2; i < 6; i++) {
+        int index = cl.snap.ps.activeItems[i];
+
+        if (index > 0) {
+            if (!str::icmp(name, CL_ConfigString(CS_WEAPONS + index))) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+void CL_AmmoCount(const char *name, int *ammo_count, int *max_ammo_count)
+{
+    int i;
+
+    *ammo_count     = 0;
+    *max_ammo_count = 0;
+
+    for (i = 0; i < ARRAY_LEN(cl.snap.ps.ammo_name_index); i++) {
+        int index = cl.snap.ps.ammo_name_index[i];
+        if (index) {
+            if (!str::icmp(name, CL_ConfigString(CS_WEAPONS + index))) {
+                *ammo_count     = cl.snap.ps.ammo_amount[i];
+                *max_ammo_count = cl.snap.ps.max_ammo_amount[i];
+                break;
+            }
+        }
+    }
 }
diff --git a/code/client/cl_inv.h b/code/client/cl_inv.h
index fef74f34..45cf58af 100644
--- a/code/client/cl_inv.h
+++ b/code/client/cl_inv.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,175 +20,198 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_INV_H__
-#define __CL_INV_H__
+#pragma once
 
-typedef enum { INV_MOVE_NONE, INV_MOVE_BOB, INV_MOVE_SPIN } inv_move_type;
-typedef enum { INV_CASCADE_LEFT, INV_CASCADE_RIGHT } inv_cascade_type;
-typedef enum { INV_HUDANGLES_BASE, INV_HUDANGLES_COMPASS, INV_HUDANGLES_COMPASS_NEEDLE } inv_hudangles_type;
+typedef enum {
+    INV_MOVE_NONE,
+    INV_MOVE_BOB,
+    INV_MOVE_SPIN
+} inv_move_type;
 
-class item_properties_t : public Class {
-public:
-	float scale;
-	Vector angles;
-	Vector angledeltas;
-	Vector rotateoffset;
-	Vector offset;
-	inv_move_type move;
-	str model;
-	str anim;
-};
+typedef enum {
+    INV_ALIGN_NONE,
+    INV_ALIGN_LEFT,
+    INV_ALIGN_RIGHT
+} inv_align_type;
 
-class inventory_item_t : public Class {
-public:
-	str name;
-	str ammoname;
-	int equip;
-	int width;
-	int height;
-	int barwidth;
-	int barheight;
-	int baroffsetY;
-	int baroffsetX;
-	float modelWindowX;
-	float modelWindowY;
-	float modelWindowWidth;
-	float modelWindowHeight;
-	bool selShaderOnTop;
-	bool checkammo;
-	str command;
-	inv_hudangles_type anglesType;
-	item_properties_t hudprops;
-	item_properties_t invprops;
-	UIReggedMaterial *bgshader;
-	UIReggedMaterial *barshader;
-	UIReggedMaterial *selshader;
-};
+typedef enum {
+    INV_CASCADE_LEFT,
+    INV_CASCADE_RIGHT
+} inv_cascade_type;
 
-class inventory_type_t {
-public:
-	str name;
-	bool bg_tile;
-	UIReggedMaterial *texture;
-	UIReggedMaterial *bg;
-	UIReggedMaterial *hoverTexture;
-	UIReggedMaterial *selTexture;
-	Container<inventory_item_t *> items;
+typedef enum {
+    INV_HUDANGLES_BASE,
+    INV_HUDANGLES_COMPASS,
+    INV_HUDANGLES_COMPASS_NEEDLE
+} inv_hudangles_type;
 
-	int IndexOfItemPtr( inventory_item_t *item );
-};
-
-inline
-int inventory_type_t::IndexOfItemPtr( inventory_item_t *item )
+class item_properties_t : public Class
 {
-	for( int i = items.NumObjects(); i > 0; i-- )
-	{
-		if( items.ObjectAt( i ) == item )
-		{
-			return i;
-		}
-	}
+public:
+    float         scale;
+    Vector        angles;
+    Vector        angledeltas;
+    Vector        rotateoffset;
+    Vector        offset;
+    inv_move_type move;
+    str           model;
+    str           anim;
+};
 
-	return 0;
+class inventory_item_t : public Class
+{
+public:
+    str                name;
+    str                ammoname;
+    int                equip;
+    int                width;
+    int                height;
+    int                barwidth;
+    int                barheight;
+    int                baroffsetY;
+    int                baroffsetX;
+    float              modelWindowX;
+    float              modelWindowY;
+    float              modelWindowWidth;
+    float              modelWindowHeight;
+    bool               selShaderOnTop;
+    bool               checkammo;
+    str                command;
+    inv_hudangles_type anglesType;
+    item_properties_t  hudprops;
+    item_properties_t  invprops;
+    UIReggedMaterial  *bgshader;
+    UIReggedMaterial  *barshader;
+    UIReggedMaterial  *selshader;
+};
+
+class inventory_type_t
+{
+public:
+    str                           name;
+    bool                          bg_tile;
+    UIReggedMaterial             *texture;
+    UIReggedMaterial             *bg;
+    UIReggedMaterial             *hoverTexture;
+    UIReggedMaterial             *selTexture;
+    Container<inventory_item_t *> items;
+
+    int IndexOfItemPtr(inventory_item_t *item);
+};
+
+inline int inventory_type_t::IndexOfItemPtr(inventory_item_t *item)
+{
+    for (int i = items.NumObjects(); i > 0; i--) {
+        if (items.ObjectAt(i) == item) {
+            return i;
+        }
+    }
+
+    return 0;
 }
 
-class inventory_t {
+class inventory_t
+{
 public:
-	int typewidth;
-	int typeheight;
-	int horizoffset;
-	int vertoffset;
-	int align;
-	inv_cascade_type cascade;
-	str selectsound;
-	str rejectsound;
-	str changesound;
-	Container<inventory_type_t *> types;
+    int                           typewidth;
+    int                           typeheight;
+    int                           horizoffset;
+    int                           vertoffset;
+    inv_align_type                align;
+    inv_cascade_type              cascade;
+    str                           selectsound;
+    str                           rejectsound;
+    str                           changesound;
+    Container<inventory_type_t *> types;
 
-	void Clear() { types.ClearObjectList(); }
+public:
+    inventory_t();
+    ~inventory_t();
+    inventory_t(const inventory_t& other);
+    inventory_t& operator=(const inventory_t& other);
+    void Clear();
 };
 
-class invlistener : public Listener {
+class invlistener : public Listener
+{
 protected:
-	inventory_t *inv;
-	inventory_type_t *curtype;
-	inventory_item_t *curitem;
-	int defaultWidth;
-	int defaultHeight;
-	int defaultBarWidth;
-	int defaultBarHeight;
-	int defaultBarOffsetX;
-	int defaultBarOffsetY;
+    inventory_t      *inv;
+    inventory_type_t *curtype;
+    inventory_item_t *curitem;
+    int               defaultWidth;
+    int               defaultHeight;
+    int               defaultBarWidth;
+    int               defaultBarHeight;
+    int               defaultBarOffsetX;
+    int               defaultBarOffsetY;
 
 public:
-	CLASS_PROTOTYPE( invlistener );
+    CLASS_PROTOTYPE(invlistener);
 
 protected:
-	void	verify_curitem( void );
-	void	verify_curtype( void );
-	void	verify_one_arg( Event *ev );
+    void verify_curitem(void);
+    void verify_curtype(void);
+    void verify_one_arg(Event *ev);
 
 public:
-	invlistener( inventory_t *i );
-	invlistener();
+    invlistener(inventory_t *i);
+    invlistener();
 
-	bool		Load( Script& script );
-	void		InvSelectSound( Event *ev );
-	void		InvRejectSound( Event *ev );
-	void		InvChangeSound( Event *ev );
-	void		InvWidth( Event *ev );
-	void		InvHeight( Event *ev );
-	void		InvHorizOffset( Event *ev );
-	void		InvVertOffset( Event *ev );
-	void		InvAlign( Event *ev );
-	void		InvCascade( Event *ev );
-	void		Typedef( Event *ev );
-	void		OpenBrace( Event *ev );
-	void		CloseBrace( Event *ev );
-	void		ButtonShader( Event *ev );
-	void		HoverShader( Event *ev );
-	void		SelShader( Event *ev );
-	void		Background( Event *ev );
-	void		BackgroundTile( Event *ev );
-	void		Width( Event *ev );
-	void		Height( Event *ev );
-	void		BarWidth( Event *ev );
-	void		BarHeight( Event *ev );
-	void		BarOffsetX( Event *ev );
-	void		BarOffsetY( Event *ev );
-	void		Item( Event *ev );
-	void		Ammo( Event *ev );
-	void		Equip( Event *ev );
-	void		CheckAmmo( Event *ev );
-	void		Command( Event *ev );
-	void		BGShader( Event *ev );
-	void		BarShader( Event *ev );
-	void		SelItemShader( Event *ev );
-	void		SelItemShaderOnTop( Event *ev );
-	void		RotateOffset( Event *ev );
-	void		Offset( Event *ev );
-	void		Model( Event *ev );
-	void		Anim( Event *ev );
-	void		Scale( Event *ev );
-	void		Angles( Event *ev );
-	void		AngleDeltas( Event *ev );
-	void		Move( Event *ev );
-	void		ModelWindow( Event *ev );
-	void		HudRotateOffset( Event *ev );
-	void		HudOffset( Event *ev );
-	void		HudModel( Event *ev );
-	void		HudAnim( Event *ev );
-	void		HudScale( Event *ev );
-	void		HudAngles( Event *ev );
-	void		HudAngleDeltas( Event *ev );
-	void		HudMove( Event *ev );
-	void		HudCompassAngles( Event *ev );
-	void		HudCompassNeedleAngles( Event *ev );
+    bool Load(Script& script);
+    void InvSelectSound(Event *ev);
+    void InvRejectSound(Event *ev);
+    void InvChangeSound(Event *ev);
+    void InvWidth(Event *ev);
+    void InvHeight(Event *ev);
+    void InvHorizOffset(Event *ev);
+    void InvVertOffset(Event *ev);
+    void InvAlign(Event *ev);
+    void InvCascade(Event *ev);
+    void Typedef(Event *ev);
+    void OpenBrace(Event *ev);
+    void CloseBrace(Event *ev);
+    void ButtonShader(Event *ev);
+    void HoverShader(Event *ev);
+    void SelShader(Event *ev);
+    void Background(Event *ev);
+    void BackgroundTile(Event *ev);
+    void Width(Event *ev);
+    void Height(Event *ev);
+    void BarWidth(Event *ev);
+    void BarHeight(Event *ev);
+    void BarOffsetX(Event *ev);
+    void BarOffsetY(Event *ev);
+    void Item(Event *ev);
+    void Ammo(Event *ev);
+    void Equip(Event *ev);
+    void CheckAmmo(Event *ev);
+    void Command(Event *ev);
+    void BGShader(Event *ev);
+    void BarShader(Event *ev);
+    void SelItemShader(Event *ev);
+    void SelItemShaderOnTop(Event *ev);
+    void RotateOffset(Event *ev);
+    void Offset(Event *ev);
+    void Model(Event *ev);
+    void Anim(Event *ev);
+    void Scale(Event *ev);
+    void Angles(Event *ev);
+    void AngleDeltas(Event *ev);
+    void Move(Event *ev);
+    void ModelWindow(Event *ev);
+    void HudRotateOffset(Event *ev);
+    void HudOffset(Event *ev);
+    void HudModel(Event *ev);
+    void HudAnim(Event *ev);
+    void HudScale(Event *ev);
+    void HudAngles(Event *ev);
+    void HudAngleDeltas(Event *ev);
+    void HudMove(Event *ev);
+    void HudCompassAngles(Event *ev);
+    void HudCompassNeedleAngles(Event *ev);
 };
 
-bool CL_LoadInventory( const char *filename, inventory_t *inv );
-inventory_item_t *CL_GetInvItemByName( inventory_t *inv, const char *name );
-qboolean CL_HasInventoryItem( const char *name );
-void CL_AmmoCount( const char *name, int *ammo_count, int *max_ammo_count );
-
-#endif // __CL_INV_H__
+bool              CL_LoadInventory(const char *filename, inventory_t *inv);
+inventory_item_t *CL_GetInvItemByName(inventory_t *inv, const char *name);
+qboolean          CL_HasInventoryItem(const char *name);
+void              CL_AmmoCount(const char *name, int *ammo_count, int *max_ammo_count);
diff --git a/code/client/cl_invrender.cpp b/code/client/cl_invrender.cpp
index bcb5125b..cfbdb3f1 100644
--- a/code/client/cl_invrender.cpp
+++ b/code/client/cl_invrender.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,204 +21,1037 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/tiki.h"
 
-CLASS_DECLARATION( UIWidget, FakkItemList, NULL )
-{
-	{ NULL, NULL }
+static inventory_t            s_processed_inv;
+static SafePtr<FakkInventory> s_main_inv;
+
+Event FakkInventory_Timeout("_timeout", EV_DEFAULT, NULL, NULL, "Timeout of the menu from inactivity");
+
+CLASS_DECLARATION(UIWidget, FakkInventory, NULL) {
+    {&W_MouseMoved,          &FakkInventory::OnMouseMove },
+    {&W_MouseEntered,        &FakkInventory::OnMouseEnter},
+    {&W_MouseExited,         &FakkInventory::OnMouseLeave},
+    {&W_LeftMouseDown,       &FakkInventory::OnMouseDown },
+    {&W_RightMouseDown,      &FakkInventory::OnMouseDown },
+    {&FakkInventory_Timeout, &FakkInventory::Timeout     },
+    {NULL,                   NULL                        }
 };
 
-FakkItemList::FakkItemList()
-{
-	// FIXME: stub
-}
-
-FakkItemList::~FakkItemList()
-{
-	// FIXME: stub
-}
-
-void FakkItemList::VerifyItemUp( inventory_item_t *item, qboolean warpmouse )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::setType( inventory_type_t *t )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::Create( float x, float y, FakkInventory *parent )
-{
-	// FIXME: stub
-}
-
-bool FakkItemList::HasAnyItems( void )
-{
-	// FIXME: stub
-	return false;
-}
-
-void FakkItemList::Draw( void )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnLeftMouseDown( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnRightMouseDown( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnLeftMouseUp( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnRightMouseUp( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnMouseMove( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnMouseEnter( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnMouseLeave( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::OnMenuKilled( Event *ev )
-{
-	// FIXME: stub
-}
-
-void FakkItemList::EquipItem( Event *ev )
-{
-	// FIXME: stub
-}
-
-CLASS_DECLARATION( UIWidget, FakkInventory, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, FakkItemList, NULL) {
+    {&W_LeftMouseDown,  &FakkItemList::OnLeftMouseDown },
+    {&W_RightMouseDown, &FakkItemList::OnRightMouseDown},
+    {&W_LeftMouseUp,    &FakkItemList::OnLeftMouseUp   },
+    {&W_RightMouseUp,   &FakkItemList::OnRightMouseUp  },
+    {&W_MouseMoved,     &FakkItemList::OnMouseMove     },
+    {&W_MouseEntered,   &FakkItemList::OnMouseEnter    },
+    {&W_MouseExited,    &FakkItemList::OnMouseLeave    },
+    {&W_Destroyed,      &FakkItemList::OnMenuKilled    },
+    {NULL,              NULL                           }
 };
 
+void CL_Draw3DModel(
+    float     x,
+    float     y,
+    float     w,
+    float     h,
+    qhandle_t model,
+    vec3_t    origin,
+    vec3_t    rotateoffset,
+    vec3_t    offset,
+    vec3_t    angle,
+    vec3_t    color,
+    str       anim
+)
+{
+    refdef_t    inv_refdef {};
+    refEntity_t ent {};
+    vec3_t      unprojoffset;
+    vec3_t      entaxis[3];
+
+    inv_refdef.fov_x   = 30;
+    inv_refdef.fov_y   = 30;
+    inv_refdef.x       = x;
+    inv_refdef.y       = y;
+    inv_refdef.width   = w;
+    inv_refdef.rdflags = RDF_HUD | RDF_NOWORLDMODEL;
+    inv_refdef.height  = h;
+    inv_refdef.time    = cl.serverTime;
+    re.ClearScene();
+
+    AnglesToAxis(angle, entaxis);
+
+    MatrixTransformVector(rotateoffset, entaxis, unprojoffset);
+
+    ent.scale        = 1.0;
+    ent.hModel       = model;
+    ent.entityNumber = 1023;
+    VectorAdd(origin, offset, ent.origin);
+    VectorAdd(ent.origin, unprojoffset, ent.origin);
+
+    ent.tiki = re.R_Model_GetHandle(model);
+    if (!ent.tiki) {
+        return;
+    }
+
+    if (anim.length()) {
+        static qboolean bInited = false;
+        static int      hModel[8];
+        static int      iUpdateTime[8];
+        static int      iIndex[8];
+        static float    fAnimTime[8];
+        static char     szAnimName[8][256];
+        int             i;
+        int             iCurrNum;
+
+        if (!bInited) {
+            for (i = 0; i < ARRAY_LEN(hModel); i++) {
+                iUpdateTime[i] = 0;
+                iIndex[i]      = -1;
+                hModel[i]      = -1;
+            }
+            bInited = true;
+        }
+
+        for (i = 0; i < ARRAY_LEN(hModel); i++) {
+            if (hModel[i] == model) {
+                break;
+            }
+        }
+
+        if (i == ARRAY_LEN(hModel)) {
+            iCurrNum = 0;
+
+            // Find a free slot
+            for (i = 0; i < ARRAY_LEN(hModel); i++) {
+                if (hModel[i] == -1) {
+                    iCurrNum = i;
+                    break;
+                }
+            }
+
+            if (i == ARRAY_LEN(hModel)) {
+                int iOldestNum, iOldestTime;
+
+                iOldestTime = iUpdateTime[0];
+                iOldestNum  = 0;
+
+                for (i = 1; i < ARRAY_LEN(hModel); i++) {
+                    if (iUpdateTime[i] < iOldestTime) {
+                        iOldestNum  = i;
+                        iOldestTime = iUpdateTime[i];
+                    }
+                }
+
+                iCurrNum = iOldestNum;
+            }
+
+            hModel[iCurrNum] = model;
+            iIndex[iCurrNum] = -1;
+            Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
+        } else {
+            iCurrNum = i;
+
+            if (!Q_stricmp(szAnimName[iCurrNum], anim)) {
+                fAnimTime[iCurrNum] += (cls.realtime - iUpdateTime[i]) * 0.001f;
+                iUpdateTime[iCurrNum] = cls.realtime;
+
+                if (TIKI_Anim_Time(ent.tiki, iIndex[iCurrNum]) < fAnimTime[iCurrNum]) {
+                    // Added in 2.0
+                    //  Clear tunak easter egg
+                    Cvar_Set("tunak", "0");
+                    iIndex[iCurrNum] = -1;
+                }
+            } else {
+                iIndex[iCurrNum] = -1;
+                Q_strncpyz(szAnimName[iCurrNum], anim, sizeof(szAnimName[iCurrNum]));
+            }
+        }
+
+        if (iIndex[iCurrNum] == -1) {
+            iIndex[iCurrNum]      = TIKI_Anim_NumForName(ent.tiki, szAnimName[iCurrNum]);
+            fAnimTime[iCurrNum]   = 0;
+            iUpdateTime[iCurrNum] = cls.realtime;
+        }
+
+        ent.frameInfo[0].index  = iIndex[iCurrNum];
+        ent.frameInfo[0].time   = fAnimTime[iCurrNum];
+        ent.frameInfo[0].weight = 1.f;
+        ent.actionWeight        = 1.f;
+    }
+
+    ent.shaderRGBA[0] = color[0] * 255;
+    ent.shaderRGBA[1] = color[1] * 255;
+    ent.shaderRGBA[2] = color[2] * 255;
+    ent.shaderRGBA[3] = color[3] * 255;
+
+    if (cge) {
+        vec3_t vViewAngles;
+
+        cge->CG_EyePosition(&inv_refdef.vieworg);
+        cge->CG_EyeAngles(&vViewAngles);
+        AnglesToAxis(vViewAngles, inv_refdef.viewaxis);
+
+        VectorCopy(ent.origin, unprojoffset);
+        MatrixTransformVector(unprojoffset, inv_refdef.viewaxis, ent.origin);
+        MatrixMultiply(entaxis, inv_refdef.viewaxis, ent.axis);
+        VectorAdd(ent.origin, inv_refdef.vieworg, ent.origin);
+    } else {
+        AnglesToAxis(angle, ent.axis);
+        AxisClear(inv_refdef.viewaxis);
+    }
+
+    re.AddRefEntityToScene(&ent, ENTITYNUM_NONE);
+    re.RenderScene(&inv_refdef);
+}
+
+bool CL_DoIHaveThisItem(const char *name)
+{
+    return true;
+}
+
+static void ProcessType(inventory_type_t *type)
+{
+    for (int i = 1; i < type->items.NumObjects(); i++) {
+        const inventory_item_t *item = type->items.ObjectAt(i);
+
+        if (!CL_DoIHaveThisItem(item->name)) {
+            type->items.RemoveObjectAt(i--);
+        }
+    }
+}
+
+static void ProcessInventory()
+{
+    for (int i = 1; i <= s_processed_inv.types.NumObjects(); i++) {
+        inventory_type_t *type = s_processed_inv.types.ObjectAt(i);
+
+        ProcessType(type);
+        if (!type->items.NumObjects()) {
+            delete type;
+            s_processed_inv.types.RemoveObjectAt(i--);
+        }
+    }
+}
+
+void UI_NextInventory()
+{
+    UI_DoInventory(false);
+
+    if (s_main_inv) {
+        s_main_inv->WarpTo(1);
+        s_main_inv->NextItem();
+    }
+}
+
+void UI_PrevInventory()
+{
+    UI_DoInventory(false);
+
+    if (s_main_inv) {
+        s_main_inv->WarpTo(1);
+        s_main_inv->PrevItem();
+    }
+}
+
+void UI_WarpInventory()
+{
+    UI_DoInventory(0);
+
+    if (Cmd_Argc() != 2) {
+        Com_Printf("Usage: warpinv <slot_name>");
+    }
+
+    if (s_main_inv) {
+        s_main_inv->WarpTo(Cmd_Argv(1));
+    }
+}
+
+void UI_DoInventory_f()
+{
+    UI_DoInventory(1);
+
+    if (s_main_inv) {
+        s_main_inv->WarpTo(1);
+    }
+}
+
+void UI_DoInventory(qboolean activate_mouse)
+{
+    if ((cl.snap.ps.stats[STAT_CINEMATIC] & 1) || s_main_inv) {
+        return;
+    }
+
+    ProcessInventory();
+
+    if (!s_processed_inv.types.NumObjects()) {
+        UI_UpdateCenterPrint("- No inventory -", 1);
+        return;
+    }
+
+    s_main_inv = new FakkInventory();
+    s_main_inv->setInventory(&s_processed_inv);
+
+    if (client_inv.align == INV_ALIGN_RIGHT) {
+        s_main_inv->InitFrame(
+            NULL,
+            client_inv.horizoffset + uid.vidWidth - client_inv.typewidth,
+            client_inv.vertoffset,
+            client_inv.typewidth,
+            client_inv.typeheight * client_inv.types.NumObjects(),
+            0
+        );
+    } else if (client_inv.align == INV_ALIGN_LEFT) {
+        s_main_inv->InitFrame(
+            NULL,
+            client_inv.horizoffset,
+            client_inv.vertoffset,
+            client_inv.typewidth,
+            client_inv.typeheight * client_inv.types.NumObjects(),
+            0
+        );
+    }
+
+    uWinMan.ActivateControl(s_main_inv);
+
+    if (activate_mouse) {
+        IN_MouseOn();
+    }
+
+    s_main_inv->m_mouse_active = true;
+}
+
+qboolean UI_CloseInventory()
+{
+    menuManager.PassEventToAllWidgets(EV_ClearInvItemReference);
+
+    if (!s_main_inv || s_main_inv->isDying()) {
+        return false;
+    }
+
+    delete s_main_inv;
+
+    UI_FocusMenuIfExists();
+    return true;
+}
 
 FakkInventory::FakkInventory()
 {
-	// FIXME: stub
+    m_currenttype = NULL;
+    AllowActivate(false);
+    UIWidget::setBackgroundColor(UColor(), true);
 }
 
 FakkInventory::~FakkInventory()
 {
-	// FIXME: stub
+    if (!uWinMan.IsDead()) {
+        VerifyTypeUp(NULL, false);
+    }
 }
 
-void FakkInventory::VerifyItemUp( inventory_item_t *item, qboolean warpmouse )
+int FakkInventory::FindFirstItem(int itemindex, int sign)
 {
-	// FIXME: stub
+    int i;
+
+    for (i = itemindex; i > 0 && i <= m_currenttype->items.NumObjects(); i += sign) {
+        const inventory_item_t *item = m_currenttype->items.ObjectAt(i);
+
+        if (CL_HasInventoryItem(item->name)) {
+            break;
+        }
+    }
+
+    return i;
 }
 
-void FakkInventory::setInventory( inventory_t *i )
+void FakkInventory::ChangeItem(int sign)
 {
-	// FIXME: stub
+    int               itemindex;
+    int               groupindex;
+    inventory_item_t *selitem;
+
+    if (!m_currenttype && !m_currentlist) {
+        WarpTo(1);
+    }
+
+    itemindex = m_currenttype->IndexOfItemPtr(m_currentlist->getHoverItem());
+    if (itemindex) {
+        itemindex = FindFirstItem(itemindex + sign, sign);
+        if (itemindex <= 0 || itemindex > m_currenttype->items.NumObjects()) {
+            groupindex = m_inv->types.IndexOfObject(m_currenttype);
+            if (groupindex) {
+                groupindex += sign;
+                if (groupindex > m_inv->types.NumObjects()) {
+                    groupindex = 1;
+                } else if (groupindex < 1) {
+                    groupindex = m_inv->types.NumObjects();
+                }
+
+                VerifyTypeUp(m_inv->types.ObjectAt(groupindex), false);
+
+                if (sign > 0) {
+                    itemindex = FindFirstItem(1, sign);
+                } else {
+                    itemindex = FindFirstItem(m_inv->types.ObjectAt(groupindex)->items.NumObjects(), sign);
+                }
+
+                if (itemindex > m_inv->types.ObjectAt(groupindex)->items.NumObjects()) {
+                    itemindex = 1;
+                }
+            } else {
+                VerifyTypeUp(m_inv->types.ObjectAt(1), false);
+                itemindex = FindFirstItem(1, sign);
+            }
+        }
+    } else {
+        itemindex = 1;
+    }
+
+    selitem = m_currenttype->items.ObjectAt(itemindex);
+    return m_currentlist->VerifyItemUp(selitem, false);
 }
 
-void FakkInventory::Draw( void )
+void FakkInventory::NextItem(void)
 {
-	// FIXME: stub
+    ChangeItem(1);
 }
 
-void FakkInventory::OnMouseMove( Event *ev )
+void FakkInventory::PrevItem(void)
 {
-	// FIXME: stub
+    ChangeItem(-1);
 }
 
-void FakkInventory::OnMouseLeave( Event *ev )
+void FakkInventory::Timeout(Event *ev)
 {
-	// FIXME: stub
+    UI_CloseInventory();
 }
 
-void FakkInventory::OnMouseEnter( Event *ev )
+void FakkInventory::PlaySound(invsound_t type)
 {
-	// FIXME: stub
+    switch (type) {
+    case invsound_t::selectsound:
+        S_StartLocalSound(m_inv->selectsound, qfalse);
+        break;
+    case invsound_t::rejectsound:
+        S_StartLocalSound(m_inv->rejectsound, qfalse);
+        break;
+    case invsound_t::changesound:
+        S_StartLocalSound(m_inv->changesound, qfalse);
+        break;
+    default:
+        break;
+    }
 }
 
-void FakkInventory::OnMouseDown( Event *ev )
+void FakkInventory::Draw(void)
 {
-	// FIXME: stub
+    int       i;
+    bool      mouse_in;
+    UIPoint2D clientPoint;
+
+    if (!m_inv) {
+        return;
+    }
+
+    clientPoint = UIPoint2D(uid.mouseX, uid.mouseY);
+    mouse_in    = uWinMan.FindResponder(clientPoint) == this;
+    clientPoint = getLocalPoint(clientPoint);
+
+    for (i = 1; i <= m_inv->types.NumObjects(); i++) {
+        inventory_type_t *type;
+        float             top;
+        UIReggedMaterial *torender;
+
+        type = m_inv->types.ObjectAt(i);
+        top  = m_inv->typeheight * (i - 1);
+        if (type == m_currenttype) {
+            if (mouse_in) {
+                torender = type->hoverTexture;
+            } else {
+                torender = type->selTexture;
+            }
+        } else {
+            torender = type->texture;
+        }
+
+        if (torender) {
+            uii.Rend_DrawPicStretched(
+                0, top, m_inv->typewidth, m_inv->typeheight, 0, 0, 1.f, 1.f, torender->GetMaterial()
+            );
+        }
+    }
 }
 
-void FakkInventory::WarpTo( const char *name )
+void FakkInventory::OnMouseDown(Event *ev)
 {
-	// FIXME: stub
+    inventory_type_t *oldtype;
+    UIPoint2D         p;
+    int               i;
+
+    p = MouseEventToClientPoint(ev);
+    i = (int)(p.y / m_inv->typeheight);
+
+    if (i + 1 > m_inv->types.NumObjects()) {
+        return;
+    }
+
+    oldtype = m_currenttype;
+    VerifyTypeUp(m_inv->types.ObjectAt(i + 1), true);
+
+    if (m_currentlist && m_currenttype == oldtype) {
+        m_currentlist->VerifyItemUp(m_currenttype->items.ObjectAt(1), true);
+    }
 }
 
-void FakkInventory::WarpTo( int slotnum )
+void FakkInventory::OnMouseMove(Event *ev) {}
+
+void FakkInventory::OnMouseLeave(Event *ev) {}
+
+void FakkInventory::OnMouseEnter(Event *ev)
 {
-	// FIXME: stub
+    SetHovermaterialActive(true);
 }
 
-void FakkInventory::NextItem( void )
+void FakkInventory::VerifyTypeUp(inventory_type_t *t, qboolean warpmouse)
 {
-	// FIXME: stub
+    CancelEventsOfType(FakkInventory_Timeout);
+    PostEvent(new Event(FakkInventory_Timeout), 5);
+
+    if (m_currenttype != t) {
+        if (m_currenttype) {
+            delete m_currenttype;
+        }
+
+        m_currenttype = t;
+        if (t) {
+            m_currentlist = new FakkItemList();
+            m_currentlist->setType(m_currenttype);
+
+            switch (m_inv->cascade) {
+            case INV_CASCADE_LEFT:
+                m_currentlist->Create(m_screenframe.pos.x, m_screenframe.pos.y, this);
+                break;
+            case INV_CASCADE_RIGHT:
+                m_currentlist->Create(m_screenframe.pos.x + m_screenframe.size.width, m_screenframe.pos.y, this);
+                break;
+            default:
+                break;
+            }
+        }
+
+        if (m_currenttype) {
+            PlaySound(invsound_t::changesound);
+        }
+    }
+
+    if (warpmouse && m_currentlist) {
+        int i;
+        int height = 0;
+
+        for (i = 1; i <= m_inv->types.NumObjects() && m_inv->types.ObjectAt(i) != t; i++) {
+            height += m_inv->typeheight;
+        }
+
+        CL_SetMousePos(
+            (int)((m_inv->typewidth / 2) + m_screenframe.pos.x),
+            (int)((m_inv->typeheight / 2 + height) + m_screenframe.pos.y)
+        );
+    }
 }
 
-void FakkInventory::PrevItem( void )
+void FakkInventory::WarpTo(int slotnum)
 {
-	// FIXME: stub
+    int i;
+
+    for (i = slotnum; i > 0 && i <= m_inv->types.NumObjects(); i++) {
+        inventory_type_t *t = m_inv->types.ObjectAt(i);
+        if (t) {
+            VerifyTypeUp(t, true);
+        }
+    }
 }
 
-qboolean FakkInventory::isDying( void )
+void FakkInventory::WarpTo(const char *name)
 {
-	// FIXME: stub
-	return qfalse;
+    int i;
+    int count;
+
+    count = m_inv->types.NumObjects();
+    for (i = 1; i <= count; i++) {
+        inventory_type_t *t = m_inv->types.ObjectAt(i);
+
+        if (name && str::icmp(t->name, name)) {
+            continue;
+        }
+
+        VerifyTypeUp(t, true);
+        if (name && m_currentlist && m_currenttype) {
+            m_currentlist->VerifyItemUp(m_currenttype->items.ObjectAt(1), true);
+        }
+    }
 }
 
-qboolean FakkInventory::KeyEvent( int key, unsigned int time )
+void FakkInventory::setInventory(inventory_t *i)
 {
-	// FIXME: stub
-	return qfalse;
+    m_inv = i;
 }
 
-void FakkInventory::PlaySound( invsound_t type )
+qboolean FakkInventory::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    char        bind[1024];
+    const char *cmd;
+    const char *name;
+    int         index;
+    bool        actionitemlist;
+    str         command;
+
+    if (cl.snap.ps.stats[STAT_CINEMATIC] & 1) {
+        UI_CloseInventory();
+        return false;
+    }
+
+    if (!m_inv->types.NumObjects()) {
+        return true;
+    }
+
+    actionitemlist = m_currenttype && m_currentlist && m_currentlist->getHoverItem() != NULL;
+
+    cmd = Key_GetBinding(key);
+    if (cmd) {
+        Q_strncpyz(bind, cmd, sizeof(bind));
+    } else {
+        bind[0] = 0;
+    }
+
+    if (bind[0]) {
+        name = strtok(bind, " ");
+        if (!str::icmp(name, "+attackleft")) {
+            command = "attackleft";
+        } else if (!str::icmp(name, "+attackright")) {
+            command = "attackright";
+        } else if (!str::icmp(name, "warpinv")) {
+            name = strtok(NULL, " ");
+        } else {
+            if (!str::icmp(name, "inventory")) {
+                UI_CloseInventory();
+                return qtrue;
+            } else if (!str::icmp(name, "nextinv")) {
+                NextItem();
+                return true;
+            } else if (!str::icmp(name, "previnv")) {
+                PrevItem();
+                return true;
+            }
+            name = NULL;
+        }
+    }
+
+    if (actionitemlist) {
+        if (m_mouse_active && (key == K_UPARROW || key == K_DOWNARROW) || (key == K_MWHEELUP || key == K_MWHEELDOWN)
+            || (name && !str::icmp(name, m_currenttype->name))) {
+            inventory_item_t *hoverItem = m_currentlist->getHoverItem();
+
+            if (m_currenttype->items.NumObjects()) {
+                index = m_currenttype->IndexOfItemPtr(hoverItem);
+
+                if (!index) {
+                    index = 1;
+                } else if (key == K_UPARROW || key == K_MWHEELUP) {
+                    index--;
+                    if (index < 1) {
+                        index = m_currenttype->items.NumObjects();
+                    }
+                } else {
+                    index++;
+                    if (index > m_currenttype->items.NumObjects()) {
+                        index = 1;
+                    }
+                }
+
+                m_currentlist->VerifyItemUp(m_currenttype->items.ObjectAt(index), true);
+                return true;
+            }
+        } else {
+            if (command.length()) {
+                if (!str::icmp(command, "attackleft")) {
+                    if (m_currentlist) {
+                        m_currentlist->OnLeftMouseDown(NULL);
+                    }
+                } else if (!str::icmp(command, "attackright")) {
+                    if (m_currentlist) {
+                        m_currentlist->OnRightMouseDown(NULL);
+                    }
+                }
+
+                PostponeEvent(FakkInventory_Timeout, 5.f);
+                return true;
+            }
+
+            if (name) {
+                WarpTo(name);
+                PostponeEvent(FakkInventory_Timeout, 5.f);
+                return true;
+            }
+
+            CL_Key_ForceCommand(key, time);
+            return true;
+        }
+    }
+
+    if (m_mouse_active && (key == K_UPARROW || key == K_DOWNARROW) || (key == K_MWHEELUP || key == K_MWHEELDOWN)) {
+        index = m_inv->types.IndexOfObject(m_currenttype);
+        if (!index) {
+            index = 1;
+        } else if (key == K_UPARROW || key == K_MWHEELUP) {
+            index--;
+            if (index < 1) {
+                index = m_inv->types.NumObjects();
+            }
+        } else {
+            index++;
+            if (index > m_inv->types.NumObjects()) {
+                index = 1;
+            }
+        }
+
+        VerifyTypeUp(m_inv->types.ObjectAt(index), true);
+        return qtrue;
+    }
+
+    if (m_mouse_active && (key == K_RIGHTARROW || key == K_LEFTARROW)) {
+        if (!m_currenttype || !m_currentlist) {
+            return qtrue;
+        }
+
+        if ((m_inv->cascade == INV_CASCADE_LEFT && key == K_LEFTARROW)
+            || (m_inv->cascade == INV_CASCADE_RIGHT && key == K_RIGHTARROW)) {
+            m_currentlist->VerifyItemUp(m_currenttype->items.ObjectAt(1), true);
+            return qtrue;
+        }
+
+        PostponeEvent(FakkInventory_Timeout, 5.f);
+        return true;
+    }
+
+    if (!name) {
+        PostponeEvent(FakkInventory_Timeout, 5.f);
+        return true;
+    }
+
+    WarpTo(name);
+    PostponeEvent(FakkInventory_Timeout, 5.f);
+    return true;
 }
 
-void FakkInventory::Timeout( Event *ev )
+qboolean FakkInventory::isDying(void)
 {
-	// FIXME: stub
+    return m_dying;
 }
 
-void FakkInventory::ChangeItem( int sign )
+FakkItemList::FakkItemList()
 {
-	// FIXME: stub
+    m_hoveritem    = NULL;
+    m_lastmenuitem = NULL;
+    m_parent       = NULL;
+    UIWidget::setBackgroundColor(UColor(), true);
 }
 
-int FakkInventory::FindFirstItem( int itemindex, int sign )
+FakkItemList::~FakkItemList() {}
+
+void FakkItemList::Create(float x, float y, FakkInventory *parent)
 {
-	// FIXME: stub
-	return 0;
+    UIRect2D rect;
+    int      i;
+    float    maxWidth = 0;
+
+    for (i = 1; i <= type->items.NumObjects(); i++) {
+        inventory_item_t *item = type->items.ObjectAt(i);
+        if (maxWidth <= item->width) {
+            maxWidth = item->width;
+        }
+
+        rect.size.height += item->height;
+    }
+
+    if (client_inv.cascade == INV_CASCADE_RIGHT) {
+        rect.pos.x      = x;
+        rect.pos.y      = y;
+        rect.size.width = maxWidth;
+
+        InitFrame(NULL, rect, 0);
+    } else if (client_inv.cascade == INV_CASCADE_LEFT) {
+        rect.pos.x      = x - maxWidth;
+        rect.pos.y      = y;
+        rect.size.width = maxWidth;
+
+        InitFrame(NULL, rect, 0);
+    }
+
+    Com_DPrintf("FakkItemList::Create : Invalid cascade for inventory list\n");
+    if (parent) {
+        m_parent = parent;
+    }
 }
 
-void CL_Draw3DModel( float x, float y, float w, float h, qhandle_t model, vec3_t origin, vec3_t rotateoffset, vec3_t offset, vec3_t angle, vec3_t color, str anim )
+bool FakkItemList::HasAnyItems(void)
 {
-	// FIXME: stub
+    int i;
+
+    for (i = 1; i <= type->items.NumObjects(); i++) {
+        inventory_item_t *item = type->items.ObjectAt(i);
+
+        if (CL_HasInventoryItem(item->name)) {
+            return true;
+        }
+    }
+
+    return false;
 }
 
-qboolean UI_CloseInventory( void )
+void FakkItemList::Draw(void) {}
+
+void FakkItemList::OnMouseEnter(Event *ev)
 {
-	// FIXME/ stub
-	return qfalse;
+    SetHovermaterialActive(true);
+}
+
+void FakkItemList::OnLeftMouseDown(Event *ev)
+{
+    char        bind[1024];
+    const char *cmd;
+    const char *name;
+
+    if ((cl.snap.ps.stats[STAT_CINEMATIC] & 1)) {
+        return;
+    }
+
+    if (m_parent) {
+        m_parent->CancelEventsOfType(FakkInventory_Timeout);
+        m_parent->PostEvent(new Event(FakkInventory_Timeout), 5);
+    }
+
+    if (ev) {
+        cmd = Key_GetBinding(K_MOUSE1);
+        if (cmd) {
+            Q_strncpyz(bind, cmd, sizeof(bind));
+        } else {
+            bind[0] = 0;
+        }
+
+        if (bind[0]) {
+            name = strtok(bind, " ");
+            if (str::icmp(name, "+attackleft")) {
+                if (!str::icmp(name, "+attackright")) {
+                    OnRightMouseDown(NULL);
+                }
+                return;
+            }
+        }
+    }
+
+    if (!CL_HasInventoryItem(m_lastmenuitem->name) || (m_lastmenuitem->equip & 16)) {
+        if (m_parent) {
+            m_parent->PlaySound(invsound_t::rejectsound);
+        }
+        return;
+    }
+
+    if (m_lastmenuitem->checkammo) {
+        int count;
+        int max;
+
+        CL_AmmoCount(m_lastmenuitem->ammoname, &count, &max);
+
+        if (!count) {
+            if (m_parent) {
+                m_parent->PlaySound(invsound_t::rejectsound);
+            }
+            return;
+        }
+    }
+
+    if (m_lastmenuitem->command.length()) {
+        uii.Cmd_Stuff(va("%s\n", m_lastmenuitem->command.c_str()));
+    } else if (m_lastmenuitem->equip & 4) {
+        uii.Cmd_Stuff(va("use \"%s\" dualhand\n", m_lastmenuitem->name.c_str()));
+    } else if (m_lastmenuitem->equip & 1) {
+        uii.Cmd_Stuff(va("use \"%s\" lefthand\n", m_lastmenuitem->name.c_str()));
+    } else if (m_lastmenuitem->equip & 8) {
+        uii.Cmd_Stuff(va("use \"%s\"\n", m_lastmenuitem->name.c_str()));
+    } else {
+        if (m_parent) {
+            m_parent->PlaySound(invsound_t::rejectsound);
+        }
+    }
+
+    if (m_parent) {
+        m_parent->PlaySound(invsound_t::selectsound);
+    }
+
+    if (m_parent && !m_parent->m_mouse_active) {
+        UI_CloseInventory();
+    }
+}
+
+void FakkItemList::OnRightMouseDown(Event *ev)
+{
+    char        bind[1024];
+    const char *cmd;
+    const char *name;
+
+    if ((cl.snap.ps.stats[STAT_CINEMATIC] & 1)) {
+        return;
+    }
+
+    if (m_parent) {
+        m_parent->CancelEventsOfType(FakkInventory_Timeout);
+        m_parent->PostEvent(new Event(FakkInventory_Timeout), 5);
+    }
+
+    if (ev) {
+        cmd = Key_GetBinding(K_MOUSE2);
+        if (cmd) {
+            Q_strncpyz(bind, cmd, sizeof(bind));
+        } else {
+            bind[0] = 0;
+        }
+
+        if (bind[0]) {
+            name = strtok(bind, " ");
+            if (str::icmp(name, "+attackright")) {
+                if (!str::icmp(name, "+attackleft")) {
+                    OnLeftMouseDown(NULL);
+                }
+                return;
+            }
+        }
+    }
+
+    if (!CL_HasInventoryItem(m_lastmenuitem->name) || (m_lastmenuitem->equip & 16)) {
+        if (m_parent) {
+            m_parent->PlaySound(invsound_t::rejectsound);
+        }
+        return;
+    }
+
+    if (m_lastmenuitem->checkammo) {
+        int count;
+        int max;
+
+        CL_AmmoCount(m_lastmenuitem->ammoname, &count, &max);
+
+        if (!count) {
+            if (m_parent) {
+                m_parent->PlaySound(invsound_t::rejectsound);
+            }
+            return;
+        }
+    }
+
+    if (m_lastmenuitem->command.length()) {
+        uii.Cmd_Stuff(va("%s\n", m_lastmenuitem->command.c_str()));
+    } else if (m_lastmenuitem->equip & 4) {
+        uii.Cmd_Stuff(va("use \"%s\" dualhand\n", m_lastmenuitem->name.c_str()));
+    } else if (m_lastmenuitem->equip & 1) {
+        uii.Cmd_Stuff(va("use \"%s\" righthand\n", m_lastmenuitem->name.c_str()));
+    } else if (m_lastmenuitem->equip & 8) {
+        uii.Cmd_Stuff(va("use \"%s\"\n", m_lastmenuitem->name.c_str()));
+    } else {
+        if (m_parent) {
+            m_parent->PlaySound(invsound_t::rejectsound);
+        }
+    }
+
+    if (m_parent) {
+        m_parent->PlaySound(invsound_t::selectsound);
+    }
+
+    if (m_parent && !m_parent->m_mouse_active) {
+        UI_CloseInventory();
+    }
+}
+
+void FakkItemList::OnLeftMouseUp(Event *ev) {}
+
+void FakkItemList::OnRightMouseUp(Event *ev) {}
+
+void FakkItemList::OnMouseLeave(Event *ev) {}
+
+void FakkItemList::VerifyItemUp(inventory_item_t *item, qboolean warpmouse)
+{
+    int               i;
+    int               height = 0;
+    inventory_item_t *ii     = NULL;
+
+    if (m_parent) {
+        m_parent->CancelEventsOfType(FakkInventory_Timeout);
+        m_parent->PostEvent(new Event(FakkInventory_Timeout), 5);
+    }
+
+    m_hoveritem    = item;
+    m_lastmenuitem = item;
+
+    if (m_parent) {
+        m_parent->PlaySound(changesound);
+    }
+
+    if (warpmouse) {
+        for (i = 1; i <= type->items.NumObjects(); i++) {
+            ii = type->items.ObjectAt(i);
+            if (ii == item) {
+                break;
+            }
+
+            height += ii->height;
+        }
+
+        if (ii) {
+            CL_SetMousePos(
+                (int)((ii->width / 2) + m_screenframe.pos.x), (int)((ii->height / 2 + height) + m_screenframe.pos.y)
+            );
+        }
+    }
+}
+
+void FakkItemList::OnMouseMove(Event *ev)
+{
+    int               i;
+    float             top;
+    inventory_item_t *newitem;
+    UIPoint2D         p;
+
+    top     = 0;
+    newitem = NULL;
+    p       = MouseEventToClientPoint(ev);
+
+    for (i = 1; i <= type->items.NumObjects(); i++) {
+        inventory_item_t *item = type->items.ObjectAt(i);
+        if (p.x >= 0 && item->width > p.x && p.y >= top && item->height + top > p.y) {
+            newitem = item;
+            break;
+        }
+
+        top += item->height;
+    }
+
+    if (newitem != m_hoveritem) {
+        VerifyItemUp(newitem, false);
+    }
+}
+
+void FakkItemList::OnMenuKilled(Event *ev)
+{
+    VerifyItemUp(NULL, false);
+}
+
+void FakkItemList::setType(inventory_type_t *t)
+{
+    type = t;
+}
+
+void FakkItemList::EquipItem(Event *ev) {}
+
+inventory_item_t *FakkItemList::getHoverItem() const
+{
+    return m_hoveritem;
 }
diff --git a/code/client/cl_invrender.h b/code/client/cl_invrender.h
index 643c4481..b7d09c66 100644
--- a/code/client/cl_invrender.h
+++ b/code/client/cl_invrender.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,79 +20,102 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_INVRENDER_H__
-#define __CL_INVRENDER_H__
+#pragma once
 
 class FakkInventory;
 
-typedef enum { selectsound, rejectsound, changesound } invsound_t;
-class FakkItemList : public UIWidget {
+typedef enum {
+    selectsound,
+    rejectsound,
+    changesound
+} invsound_t;
+
+class FakkItemList : public UIWidget
+{
 protected:
-	inventory_type_t *type;
-	uipopup_describe m_describe[ 10 ];
-	inventory_item_t *m_hoveritem;
-	inventory_item_t *m_lastmenuitem;
-	FakkInventory *m_parent;
-	float m_hovertop;
+    inventory_type_t *type;
+    uipopup_describe  m_describe[10];
+    inventory_item_t *m_hoveritem;
+    inventory_item_t *m_lastmenuitem;
+    FakkInventory    *m_parent;
+    float             m_hovertop;
 
 public:
-	CLASS_PROTOTYPE( FakkItemList );
+    CLASS_PROTOTYPE(FakkItemList);
 
-	FakkItemList();
-	~FakkItemList();
+    FakkItemList();
+    ~FakkItemList();
 
-	void	VerifyItemUp( inventory_item_t *item, qboolean warpmouse );
-	void	setType( inventory_type_t *t );
-	void	Create( float x, float y, FakkInventory *parent );
-	bool	HasAnyItems( void );
-	void	Draw( void ) override;
-	void	OnLeftMouseDown( Event *ev );
-	void	OnRightMouseDown( Event *ev );
-	void	OnLeftMouseUp( Event *ev );
-	void	OnRightMouseUp( Event *ev );
-	void	OnMouseMove( Event *ev );
-	void	OnMouseEnter( Event *ev );
-	void	OnMouseLeave( Event *ev );
-	void	OnMenuKilled( Event *ev );
-	void	EquipItem( Event *ev );
+    void VerifyItemUp(inventory_item_t *item, qboolean warpmouse);
+    void setType(inventory_type_t *t);
+    void Create(float x, float y, FakkInventory *parent);
+    bool HasAnyItems(void);
+    void Draw(void) override;
+    void OnLeftMouseDown(Event *ev);
+    void OnRightMouseDown(Event *ev);
+    void OnLeftMouseUp(Event *ev);
+    void OnRightMouseUp(Event *ev);
+    void OnMouseMove(Event *ev);
+    void OnMouseEnter(Event *ev);
+    void OnMouseLeave(Event *ev);
+    void OnMenuKilled(Event *ev);
+    void EquipItem(Event *ev);
+
+    inventory_item_t *getHoverItem() const;
 };
 
-class FakkInventory : public UIWidget {
+class FakkInventory : public UIWidget
+{
 protected:
-	inventory_t *m_inv;
-	SafePtr<FakkItemList> m_currentlist;
-	inventory_type_t *m_currenttype;
-	int m_currentitemnum;
+    inventory_t          *m_inv;
+    SafePtr<FakkItemList> m_currentlist;
+    inventory_type_t     *m_currenttype;
+    int                   m_currentitemnum;
 
 public:
-	CLASS_PROTOTYPE( FakkInventory );
-
-protected:
-	void		VerifyItemUp( inventory_item_t *item, qboolean warpmouse );
+    CLASS_PROTOTYPE(FakkInventory);
 
 public:
-	FakkInventory();
-	~FakkInventory();
+    qboolean m_mouse_active;
 
-	void		setInventory( inventory_t *i );
-	void		Draw( void ) override;
-	void		OnMouseMove( Event *ev );
-	void		OnMouseLeave( Event *ev );
-	void		OnMouseEnter( Event *ev );
-	void		OnMouseDown( Event *ev );
-	void		WarpTo( const char *name );
-	void		WarpTo( int slotnum );
-	void		NextItem( void );
-	void		PrevItem( void );
-	qboolean	isDying( void );
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		PlaySound( invsound_t type );
-	void		Timeout( Event *ev );
-	void		ChangeItem( int sign );
-	int			FindFirstItem( int itemindex, int sign );
+protected:
+    void VerifyTypeUp(inventory_type_t *t, qboolean warpmouse);
+
+public:
+    FakkInventory();
+    ~FakkInventory();
+
+    void     setInventory(inventory_t *i);
+    void     Draw(void) override;
+    void     OnMouseMove(Event *ev);
+    void     OnMouseLeave(Event *ev);
+    void     OnMouseEnter(Event *ev);
+    void     OnMouseDown(Event *ev);
+    void     WarpTo(const char *name);
+    void     WarpTo(int slotnum);
+    void     NextItem(void);
+    void     PrevItem(void);
+    qboolean isDying(void);
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     PlaySound(invsound_t type);
+    void     Timeout(Event *ev);
+    void     ChangeItem(int sign);
+    int      FindFirstItem(int itemindex, int sign);
 };
 
-void CL_Draw3DModel( float x, float y, float w, float h, qhandle_t model, vec3_t origin, vec3_t rotateoffset, vec3_t offset, vec3_t angle, vec3_t color, str anim );
-qboolean UI_CloseInventory( void );
+void CL_Draw3DModel(
+    float     x,
+    float     y,
+    float     w,
+    float     h,
+    qhandle_t model,
+    vec3_t    origin,
+    vec3_t    rotateoffset,
+    vec3_t    offset,
+    vec3_t    angle,
+    vec3_t    color,
+    str       anim
+);
 
-#endif // __CL_INVRENDER_H__
+void     UI_DoInventory(qboolean activate_mouse);
+qboolean UI_CloseInventory(void);
diff --git a/code/client/cl_keys.cpp b/code/client/cl_keys.cpp
index 39062da9..39474cb9 100644
--- a/code/client/cl_keys.cpp
+++ b/code/client/cl_keys.cpp
@@ -29,21 +29,20 @@ key up events are sent even if in console mode
 
 */
 
-int			nextHistoryLine;		// the last line in the history buffer, not masked
-int			historyLine;	// the line being displayed from history buffer
-							// will be <= nextHistoryLine
+int nextHistoryLine; // the last line in the history buffer, not masked
+int historyLine;     // the line being displayed from history buffer
+                     // will be <= nextHistoryLine
 
-qboolean	chat_team;
+qboolean chat_team;
 
-int			chat_playerNum;
+int chat_playerNum;
 
+qboolean key_overstrikeMode;
 
-qboolean	key_overstrikeMode;
-
-int				anykeydown;
-qkey_t		keys[MAX_KEYS];
-qkey_t		altkeys[MAX_KEYS];
-qkey_t		ctrlkeys[MAX_KEYS];
+int    anykeydown;
+qkey_t keys[MAX_KEYS];
+qkey_t altkeys[MAX_KEYS];
+qkey_t ctrlkeys[MAX_KEYS];
 
 qboolean menubound[MAX_KEYS];
 
@@ -51,289 +50,287 @@ qboolean alt_down;
 qboolean ctrl_down;
 
 typedef struct {
-	const char	*name;
-	int			keynum;
+    const char *name;
+    int         keynum;
 } keyname_t;
 
 // names not in this list can either be lowercase ascii, or '0xnn' hex sequences
-keyname_t keynames[] =
-{
-	{"TAB", K_TAB},
-	{"ENTER", K_ENTER},
-	{"ESCAPE", K_ESCAPE},
-	{"SPACE", K_SPACE},
-	{"BACKSPACE", K_BACKSPACE},
-	{"UPARROW", K_UPARROW},
-	{"DOWNARROW", K_DOWNARROW},
-	{"LEFTARROW", K_LEFTARROW},
-	{"RIGHTARROW", K_RIGHTARROW},
+keyname_t keynames[] = {
+    {"TAB",                   K_TAB                  },
+    {"ENTER",                 K_ENTER                },
+    {"ESCAPE",                K_ESCAPE               },
+    {"SPACE",                 K_SPACE                },
+    {"BACKSPACE",             K_BACKSPACE            },
+    {"UPARROW",               K_UPARROW              },
+    {"DOWNARROW",             K_DOWNARROW            },
+    {"LEFTARROW",             K_LEFTARROW            },
+    {"RIGHTARROW",            K_RIGHTARROW           },
 
-	{"ALT", K_ALT},
-	{"CTRL", K_CTRL},
-    {"SHIFT", K_SHIFT},
+    {"ALT",                   K_ALT                  },
+    {"CTRL",                  K_CTRL                 },
+    {"SHIFT",                 K_SHIFT                },
 
-	{"COMMAND", K_COMMAND},
+    {"COMMAND",               K_COMMAND              },
 
-	{"CAPSLOCK", K_CAPSLOCK},
+    {"CAPSLOCK",              K_CAPSLOCK             },
 
-	
-	{"F1", K_F1},
-	{"F2", K_F2},
-	{"F3", K_F3},
-	{"F4", K_F4},
-	{"F5", K_F5},
-	{"F6", K_F6},
-	{"F7", K_F7},
-	{"F8", K_F8},
-	{"F9", K_F9},
-	{"F10", K_F10},
-	{"F11", K_F11},
-	{"F12", K_F12},
-	{"F13", K_F13},
-	{"F14", K_F14},
-	{"F15", K_F15},
+    {"F1",                    K_F1                   },
+    {"F2",                    K_F2                   },
+    {"F3",                    K_F3                   },
+    {"F4",                    K_F4                   },
+    {"F5",                    K_F5                   },
+    {"F6",                    K_F6                   },
+    {"F7",                    K_F7                   },
+    {"F8",                    K_F8                   },
+    {"F9",                    K_F9                   },
+    {"F10",                   K_F10                  },
+    {"F11",                   K_F11                  },
+    {"F12",                   K_F12                  },
+    {"F13",                   K_F13                  },
+    {"F14",                   K_F14                  },
+    {"F15",                   K_F15                  },
 
-	{"INS", K_INS},
-	{"DEL", K_DEL},
-	{"PGDN", K_PGDN},
-	{"PGUP", K_PGUP},
-	{"HOME", K_HOME},
-	{"END", K_END},
+    {"INS",                   K_INS                  },
+    {"DEL",                   K_DEL                  },
+    {"PGDN",                  K_PGDN                 },
+    {"PGUP",                  K_PGUP                 },
+    {"HOME",                  K_HOME                 },
+    {"END",                   K_END                  },
 
-	{"MOUSE1", K_MOUSE1},
-	{"MOUSE2", K_MOUSE2},
-	{"MOUSE3", K_MOUSE3},
-	{"MOUSE4", K_MOUSE4},
-	{"MOUSE5", K_MOUSE5},
+    {"MOUSE1",                K_MOUSE1               },
+    {"MOUSE2",                K_MOUSE2               },
+    {"MOUSE3",                K_MOUSE3               },
+    {"MOUSE4",                K_MOUSE4               },
+    {"MOUSE5",                K_MOUSE5               },
 
-	{"MWHEELUP",	K_MWHEELUP },
-	{"MWHEELDOWN",	K_MWHEELDOWN },
+    {"MWHEELUP",              K_MWHEELUP             },
+    {"MWHEELDOWN",            K_MWHEELDOWN           },
 
-	{"JOY1", K_JOY1},
-	{"JOY2", K_JOY2},
-	{"JOY3", K_JOY3},
-	{"JOY4", K_JOY4},
-	{"JOY5", K_JOY5},
-	{"JOY6", K_JOY6},
-	{"JOY7", K_JOY7},
-	{"JOY8", K_JOY8},
-	{"JOY9", K_JOY9},
-	{"JOY10", K_JOY10},
-	{"JOY11", K_JOY11},
-	{"JOY12", K_JOY12},
-	{"JOY13", K_JOY13},
-	{"JOY14", K_JOY14},
-	{"JOY15", K_JOY15},
-	{"JOY16", K_JOY16},
-	{"JOY17", K_JOY17},
-	{"JOY18", K_JOY18},
-	{"JOY19", K_JOY19},
-	{"JOY20", K_JOY20},
-	{"JOY21", K_JOY21},
-	{"JOY22", K_JOY22},
-	{"JOY23", K_JOY23},
-	{"JOY24", K_JOY24},
-	{"JOY25", K_JOY25},
-	{"JOY26", K_JOY26},
-	{"JOY27", K_JOY27},
-	{"JOY28", K_JOY28},
-	{"JOY29", K_JOY29},
-	{"JOY30", K_JOY30},
-	{"JOY31", K_JOY31},
-	{"JOY32", K_JOY32},
+    {"JOY1",                  K_JOY1                 },
+    {"JOY2",                  K_JOY2                 },
+    {"JOY3",                  K_JOY3                 },
+    {"JOY4",                  K_JOY4                 },
+    {"JOY5",                  K_JOY5                 },
+    {"JOY6",                  K_JOY6                 },
+    {"JOY7",                  K_JOY7                 },
+    {"JOY8",                  K_JOY8                 },
+    {"JOY9",                  K_JOY9                 },
+    {"JOY10",                 K_JOY10                },
+    {"JOY11",                 K_JOY11                },
+    {"JOY12",                 K_JOY12                },
+    {"JOY13",                 K_JOY13                },
+    {"JOY14",                 K_JOY14                },
+    {"JOY15",                 K_JOY15                },
+    {"JOY16",                 K_JOY16                },
+    {"JOY17",                 K_JOY17                },
+    {"JOY18",                 K_JOY18                },
+    {"JOY19",                 K_JOY19                },
+    {"JOY20",                 K_JOY20                },
+    {"JOY21",                 K_JOY21                },
+    {"JOY22",                 K_JOY22                },
+    {"JOY23",                 K_JOY23                },
+    {"JOY24",                 K_JOY24                },
+    {"JOY25",                 K_JOY25                },
+    {"JOY26",                 K_JOY26                },
+    {"JOY27",                 K_JOY27                },
+    {"JOY28",                 K_JOY28                },
+    {"JOY29",                 K_JOY29                },
+    {"JOY30",                 K_JOY30                },
+    {"JOY31",                 K_JOY31                },
+    {"JOY32",                 K_JOY32                },
 
-	{"AUX1", K_AUX1},
-	{"AUX2", K_AUX2},
-	{"AUX3", K_AUX3},
-	{"AUX4", K_AUX4},
-	{"AUX5", K_AUX5},
-	{"AUX6", K_AUX6},
-	{"AUX7", K_AUX7},
-	{"AUX8", K_AUX8},
-	{"AUX9", K_AUX9},
-	{"AUX10", K_AUX10},
-	{"AUX11", K_AUX11},
-	{"AUX12", K_AUX12},
-	{"AUX13", K_AUX13},
-	{"AUX14", K_AUX14},
-	{"AUX15", K_AUX15},
-	{"AUX16", K_AUX16},
+    {"AUX1",                  K_AUX1                 },
+    {"AUX2",                  K_AUX2                 },
+    {"AUX3",                  K_AUX3                 },
+    {"AUX4",                  K_AUX4                 },
+    {"AUX5",                  K_AUX5                 },
+    {"AUX6",                  K_AUX6                 },
+    {"AUX7",                  K_AUX7                 },
+    {"AUX8",                  K_AUX8                 },
+    {"AUX9",                  K_AUX9                 },
+    {"AUX10",                 K_AUX10                },
+    {"AUX11",                 K_AUX11                },
+    {"AUX12",                 K_AUX12                },
+    {"AUX13",                 K_AUX13                },
+    {"AUX14",                 K_AUX14                },
+    {"AUX15",                 K_AUX15                },
+    {"AUX16",                 K_AUX16                },
 
-	{"KP_HOME",			K_KP_HOME },
-	{"KP_UPARROW",		K_KP_UPARROW },
-	{"KP_PGUP",			K_KP_PGUP },
-	{"KP_LEFTARROW",	K_KP_LEFTARROW },
-	{"KP_5",			K_KP_5 },
-	{"KP_RIGHTARROW",	K_KP_RIGHTARROW },
-	{"KP_END",			K_KP_END },
-	{"KP_DOWNARROW",	K_KP_DOWNARROW },
-	{"KP_PGDN",			K_KP_PGDN },
-	{"KP_ENTER",		K_KP_ENTER },
-	{"KP_INS",			K_KP_INS },
-	{"KP_DEL",			K_KP_DEL },
-	{"KP_SLASH",		K_KP_SLASH },
-	{"KP_MINUS",		K_KP_MINUS },
-	{"KP_PLUS",			K_KP_PLUS },
-	{"KP_NUMLOCK",		K_KP_NUMLOCK },
-	{"KP_STAR",			K_KP_STAR },
-	{"KP_EQUALS",		K_KP_EQUALS },
+    {"KP_HOME",               K_KP_HOME              },
+    {"KP_UPARROW",            K_KP_UPARROW           },
+    {"KP_PGUP",               K_KP_PGUP              },
+    {"KP_LEFTARROW",          K_KP_LEFTARROW         },
+    {"KP_5",                  K_KP_5                 },
+    {"KP_RIGHTARROW",         K_KP_RIGHTARROW        },
+    {"KP_END",                K_KP_END               },
+    {"KP_DOWNARROW",          K_KP_DOWNARROW         },
+    {"KP_PGDN",               K_KP_PGDN              },
+    {"KP_ENTER",              K_KP_ENTER             },
+    {"KP_INS",                K_KP_INS               },
+    {"KP_DEL",                K_KP_DEL               },
+    {"KP_SLASH",              K_KP_SLASH             },
+    {"KP_MINUS",              K_KP_MINUS             },
+    {"KP_PLUS",               K_KP_PLUS              },
+    {"KP_NUMLOCK",            K_KP_NUMLOCK           },
+    {"KP_STAR",               K_KP_STAR              },
+    {"KP_EQUALS",             K_KP_EQUALS            },
 
-	{"PAUSE", K_PAUSE},
-	
-	{"SEMICOLON", ';'},	// because a raw semicolon separates commands
+    {"PAUSE",                 K_PAUSE                },
 
-	{"WORLD_0", K_WORLD_0},
-	{"WORLD_1", K_WORLD_1},
-	{"WORLD_2", K_WORLD_2},
-	{"WORLD_3", K_WORLD_3},
-	{"WORLD_4", K_WORLD_4},
-	{"WORLD_5", K_WORLD_5},
-	{"WORLD_6", K_WORLD_6},
-	{"WORLD_7", K_WORLD_7},
-	{"WORLD_8", K_WORLD_8},
-	{"WORLD_9", K_WORLD_9},
-	{"WORLD_10", K_WORLD_10},
-	{"WORLD_11", K_WORLD_11},
-	{"WORLD_12", K_WORLD_12},
-	{"WORLD_13", K_WORLD_13},
-	{"WORLD_14", K_WORLD_14},
-	{"WORLD_15", K_WORLD_15},
-	{"WORLD_16", K_WORLD_16},
-	{"WORLD_17", K_WORLD_17},
-	{"WORLD_18", K_WORLD_18},
-	{"WORLD_19", K_WORLD_19},
-	{"WORLD_20", K_WORLD_20},
-	{"WORLD_21", K_WORLD_21},
-	{"WORLD_22", K_WORLD_22},
-	{"WORLD_23", K_WORLD_23},
-	{"WORLD_24", K_WORLD_24},
-	{"WORLD_25", K_WORLD_25},
-	{"WORLD_26", K_WORLD_26},
-	{"WORLD_27", K_WORLD_27},
-	{"WORLD_28", K_WORLD_28},
-	{"WORLD_29", K_WORLD_29},
-	{"WORLD_30", K_WORLD_30},
-	{"WORLD_31", K_WORLD_31},
-	{"WORLD_32", K_WORLD_32},
-	{"WORLD_33", K_WORLD_33},
-	{"WORLD_34", K_WORLD_34},
-	{"WORLD_35", K_WORLD_35},
-	{"WORLD_36", K_WORLD_36},
-	{"WORLD_37", K_WORLD_37},
-	{"WORLD_38", K_WORLD_38},
-	{"WORLD_39", K_WORLD_39},
-	{"WORLD_40", K_WORLD_40},
-	{"WORLD_41", K_WORLD_41},
-	{"WORLD_42", K_WORLD_42},
-	{"WORLD_43", K_WORLD_43},
-	{"WORLD_44", K_WORLD_44},
-	{"WORLD_45", K_WORLD_45},
-	{"WORLD_46", K_WORLD_46},
-	{"WORLD_47", K_WORLD_47},
-	{"WORLD_48", K_WORLD_48},
-	{"WORLD_49", K_WORLD_49},
-	{"WORLD_50", K_WORLD_50},
-	{"WORLD_51", K_WORLD_51},
-	{"WORLD_52", K_WORLD_52},
-	{"WORLD_53", K_WORLD_53},
-	{"WORLD_54", K_WORLD_54},
-	{"WORLD_55", K_WORLD_55},
-	{"WORLD_56", K_WORLD_56},
-	{"WORLD_57", K_WORLD_57},
-	{"WORLD_58", K_WORLD_58},
-	{"WORLD_59", K_WORLD_59},
-	{"WORLD_60", K_WORLD_60},
-	{"WORLD_61", K_WORLD_61},
-	{"WORLD_62", K_WORLD_62},
-	{"WORLD_63", K_WORLD_63},
-	{"WORLD_64", K_WORLD_64},
-	{"WORLD_65", K_WORLD_65},
-	{"WORLD_66", K_WORLD_66},
-	{"WORLD_67", K_WORLD_67},
-	{"WORLD_68", K_WORLD_68},
-	{"WORLD_69", K_WORLD_69},
-	{"WORLD_70", K_WORLD_70},
-	{"WORLD_71", K_WORLD_71},
-	{"WORLD_72", K_WORLD_72},
-	{"WORLD_73", K_WORLD_73},
-	{"WORLD_74", K_WORLD_74},
-	{"WORLD_75", K_WORLD_75},
-	{"WORLD_76", K_WORLD_76},
-	{"WORLD_77", K_WORLD_77},
-	{"WORLD_78", K_WORLD_78},
-	{"WORLD_79", K_WORLD_79},
-	{"WORLD_80", K_WORLD_80},
-	{"WORLD_81", K_WORLD_81},
-	{"WORLD_82", K_WORLD_82},
-	{"WORLD_83", K_WORLD_83},
-	{"WORLD_84", K_WORLD_84},
-	{"WORLD_85", K_WORLD_85},
-	{"WORLD_86", K_WORLD_86},
-	{"WORLD_87", K_WORLD_87},
-	{"WORLD_88", K_WORLD_88},
-	{"WORLD_89", K_WORLD_89},
-	{"WORLD_90", K_WORLD_90},
-	{"WORLD_91", K_WORLD_91},
-	{"WORLD_92", K_WORLD_92},
-	{"WORLD_93", K_WORLD_93},
-	{"WORLD_94", K_WORLD_94},
-	{"WORLD_95", K_WORLD_95},
+    {"SEMICOLON",             ';'                    }, // because a raw semicolon separates commands
 
-	{"WINDOWS", K_SUPER},
-	{"COMPOSE", K_COMPOSE},
-	{"MODE", K_MODE},
-	{"HELP", K_HELP},
-	{"PRINT", K_PRINT},
-	{"SYSREQ", K_SYSREQ},
-	{"SCROLLOCK", K_SCROLLOCK },
-	{"BREAK", K_BREAK},
-	{"MENU", K_MENU},
-	{"POWER", K_POWER},
-	{"EURO", K_EURO},
-	{"UNDO", K_UNDO},
+    {"WORLD_0",               K_WORLD_0              },
+    {"WORLD_1",               K_WORLD_1              },
+    {"WORLD_2",               K_WORLD_2              },
+    {"WORLD_3",               K_WORLD_3              },
+    {"WORLD_4",               K_WORLD_4              },
+    {"WORLD_5",               K_WORLD_5              },
+    {"WORLD_6",               K_WORLD_6              },
+    {"WORLD_7",               K_WORLD_7              },
+    {"WORLD_8",               K_WORLD_8              },
+    {"WORLD_9",               K_WORLD_9              },
+    {"WORLD_10",              K_WORLD_10             },
+    {"WORLD_11",              K_WORLD_11             },
+    {"WORLD_12",              K_WORLD_12             },
+    {"WORLD_13",              K_WORLD_13             },
+    {"WORLD_14",              K_WORLD_14             },
+    {"WORLD_15",              K_WORLD_15             },
+    {"WORLD_16",              K_WORLD_16             },
+    {"WORLD_17",              K_WORLD_17             },
+    {"WORLD_18",              K_WORLD_18             },
+    {"WORLD_19",              K_WORLD_19             },
+    {"WORLD_20",              K_WORLD_20             },
+    {"WORLD_21",              K_WORLD_21             },
+    {"WORLD_22",              K_WORLD_22             },
+    {"WORLD_23",              K_WORLD_23             },
+    {"WORLD_24",              K_WORLD_24             },
+    {"WORLD_25",              K_WORLD_25             },
+    {"WORLD_26",              K_WORLD_26             },
+    {"WORLD_27",              K_WORLD_27             },
+    {"WORLD_28",              K_WORLD_28             },
+    {"WORLD_29",              K_WORLD_29             },
+    {"WORLD_30",              K_WORLD_30             },
+    {"WORLD_31",              K_WORLD_31             },
+    {"WORLD_32",              K_WORLD_32             },
+    {"WORLD_33",              K_WORLD_33             },
+    {"WORLD_34",              K_WORLD_34             },
+    {"WORLD_35",              K_WORLD_35             },
+    {"WORLD_36",              K_WORLD_36             },
+    {"WORLD_37",              K_WORLD_37             },
+    {"WORLD_38",              K_WORLD_38             },
+    {"WORLD_39",              K_WORLD_39             },
+    {"WORLD_40",              K_WORLD_40             },
+    {"WORLD_41",              K_WORLD_41             },
+    {"WORLD_42",              K_WORLD_42             },
+    {"WORLD_43",              K_WORLD_43             },
+    {"WORLD_44",              K_WORLD_44             },
+    {"WORLD_45",              K_WORLD_45             },
+    {"WORLD_46",              K_WORLD_46             },
+    {"WORLD_47",              K_WORLD_47             },
+    {"WORLD_48",              K_WORLD_48             },
+    {"WORLD_49",              K_WORLD_49             },
+    {"WORLD_50",              K_WORLD_50             },
+    {"WORLD_51",              K_WORLD_51             },
+    {"WORLD_52",              K_WORLD_52             },
+    {"WORLD_53",              K_WORLD_53             },
+    {"WORLD_54",              K_WORLD_54             },
+    {"WORLD_55",              K_WORLD_55             },
+    {"WORLD_56",              K_WORLD_56             },
+    {"WORLD_57",              K_WORLD_57             },
+    {"WORLD_58",              K_WORLD_58             },
+    {"WORLD_59",              K_WORLD_59             },
+    {"WORLD_60",              K_WORLD_60             },
+    {"WORLD_61",              K_WORLD_61             },
+    {"WORLD_62",              K_WORLD_62             },
+    {"WORLD_63",              K_WORLD_63             },
+    {"WORLD_64",              K_WORLD_64             },
+    {"WORLD_65",              K_WORLD_65             },
+    {"WORLD_66",              K_WORLD_66             },
+    {"WORLD_67",              K_WORLD_67             },
+    {"WORLD_68",              K_WORLD_68             },
+    {"WORLD_69",              K_WORLD_69             },
+    {"WORLD_70",              K_WORLD_70             },
+    {"WORLD_71",              K_WORLD_71             },
+    {"WORLD_72",              K_WORLD_72             },
+    {"WORLD_73",              K_WORLD_73             },
+    {"WORLD_74",              K_WORLD_74             },
+    {"WORLD_75",              K_WORLD_75             },
+    {"WORLD_76",              K_WORLD_76             },
+    {"WORLD_77",              K_WORLD_77             },
+    {"WORLD_78",              K_WORLD_78             },
+    {"WORLD_79",              K_WORLD_79             },
+    {"WORLD_80",              K_WORLD_80             },
+    {"WORLD_81",              K_WORLD_81             },
+    {"WORLD_82",              K_WORLD_82             },
+    {"WORLD_83",              K_WORLD_83             },
+    {"WORLD_84",              K_WORLD_84             },
+    {"WORLD_85",              K_WORLD_85             },
+    {"WORLD_86",              K_WORLD_86             },
+    {"WORLD_87",              K_WORLD_87             },
+    {"WORLD_88",              K_WORLD_88             },
+    {"WORLD_89",              K_WORLD_89             },
+    {"WORLD_90",              K_WORLD_90             },
+    {"WORLD_91",              K_WORLD_91             },
+    {"WORLD_92",              K_WORLD_92             },
+    {"WORLD_93",              K_WORLD_93             },
+    {"WORLD_94",              K_WORLD_94             },
+    {"WORLD_95",              K_WORLD_95             },
 
-	{"PAD0_A", K_PAD0_A },
-	{"PAD0_B", K_PAD0_B },
-	{"PAD0_X", K_PAD0_X },
-	{"PAD0_Y", K_PAD0_Y },
-	{"PAD0_BACK", K_PAD0_BACK },
-	{"PAD0_GUIDE", K_PAD0_GUIDE },
-	{"PAD0_START", K_PAD0_START },
-	{"PAD0_LEFTSTICK_CLICK", K_PAD0_LEFTSTICK_CLICK },
-	{"PAD0_RIGHTSTICK_CLICK", K_PAD0_RIGHTSTICK_CLICK },
-	{"PAD0_LEFTSHOULDER", K_PAD0_LEFTSHOULDER },
-	{"PAD0_RIGHTSHOULDER", K_PAD0_RIGHTSHOULDER },
-	{"PAD0_DPAD_UP", K_PAD0_DPAD_UP },
-	{"PAD0_DPAD_DOWN", K_PAD0_DPAD_DOWN },
-	{"PAD0_DPAD_LEFT", K_PAD0_DPAD_LEFT },
-	{"PAD0_DPAD_RIGHT", K_PAD0_DPAD_RIGHT },
+    {"WINDOWS",               K_SUPER                },
+    {"COMPOSE",               K_COMPOSE              },
+    {"MODE",                  K_MODE                 },
+    {"HELP",                  K_HELP                 },
+    {"PRINT",                 K_PRINT                },
+    {"SYSREQ",                K_SYSREQ               },
+    {"SCROLLOCK",             K_SCROLLOCK            },
+    {"BREAK",                 K_BREAK                },
+    {"MENU",                  K_MENU                 },
+    {"POWER",                 K_POWER                },
+    {"EURO",                  K_EURO                 },
+    {"UNDO",                  K_UNDO                 },
 
-	{"PAD0_LEFTSTICK_LEFT", K_PAD0_LEFTSTICK_LEFT },
-	{"PAD0_LEFTSTICK_RIGHT", K_PAD0_LEFTSTICK_RIGHT },
-	{"PAD0_LEFTSTICK_UP", K_PAD0_LEFTSTICK_UP },
-	{"PAD0_LEFTSTICK_DOWN", K_PAD0_LEFTSTICK_DOWN },
-	{"PAD0_RIGHTSTICK_LEFT", K_PAD0_RIGHTSTICK_LEFT },
-	{"PAD0_RIGHTSTICK_RIGHT", K_PAD0_RIGHTSTICK_RIGHT },
-	{"PAD0_RIGHTSTICK_UP", K_PAD0_RIGHTSTICK_UP },
-	{"PAD0_RIGHTSTICK_DOWN", K_PAD0_RIGHTSTICK_DOWN },
-	{"PAD0_LEFTTRIGGER", K_PAD0_LEFTTRIGGER },
-	{"PAD0_RIGHTTRIGGER", K_PAD0_RIGHTTRIGGER },
+    {"PAD0_A",                K_PAD0_A               },
+    {"PAD0_B",                K_PAD0_B               },
+    {"PAD0_X",                K_PAD0_X               },
+    {"PAD0_Y",                K_PAD0_Y               },
+    {"PAD0_BACK",             K_PAD0_BACK            },
+    {"PAD0_GUIDE",            K_PAD0_GUIDE           },
+    {"PAD0_START",            K_PAD0_START           },
+    {"PAD0_LEFTSTICK_CLICK",  K_PAD0_LEFTSTICK_CLICK },
+    {"PAD0_RIGHTSTICK_CLICK", K_PAD0_RIGHTSTICK_CLICK},
+    {"PAD0_LEFTSHOULDER",     K_PAD0_LEFTSHOULDER    },
+    {"PAD0_RIGHTSHOULDER",    K_PAD0_RIGHTSHOULDER   },
+    {"PAD0_DPAD_UP",          K_PAD0_DPAD_UP         },
+    {"PAD0_DPAD_DOWN",        K_PAD0_DPAD_DOWN       },
+    {"PAD0_DPAD_LEFT",        K_PAD0_DPAD_LEFT       },
+    {"PAD0_DPAD_RIGHT",       K_PAD0_DPAD_RIGHT      },
 
-	{"PAD0_MISC1", K_PAD0_MISC1 },
-	{"PAD0_PADDLE1", K_PAD0_PADDLE1 },
-	{"PAD0_PADDLE2", K_PAD0_PADDLE2 },
-	{"PAD0_PADDLE3", K_PAD0_PADDLE3 },
-	{"PAD0_PADDLE4", K_PAD0_PADDLE4 },
-	{"PAD0_TOUCHPAD", K_PAD0_TOUCHPAD },
+    {"PAD0_LEFTSTICK_LEFT",   K_PAD0_LEFTSTICK_LEFT  },
+    {"PAD0_LEFTSTICK_RIGHT",  K_PAD0_LEFTSTICK_RIGHT },
+    {"PAD0_LEFTSTICK_UP",     K_PAD0_LEFTSTICK_UP    },
+    {"PAD0_LEFTSTICK_DOWN",   K_PAD0_LEFTSTICK_DOWN  },
+    {"PAD0_RIGHTSTICK_LEFT",  K_PAD0_RIGHTSTICK_LEFT },
+    {"PAD0_RIGHTSTICK_RIGHT", K_PAD0_RIGHTSTICK_RIGHT},
+    {"PAD0_RIGHTSTICK_UP",    K_PAD0_RIGHTSTICK_UP   },
+    {"PAD0_RIGHTSTICK_DOWN",  K_PAD0_RIGHTSTICK_DOWN },
+    {"PAD0_LEFTTRIGGER",      K_PAD0_LEFTTRIGGER     },
+    {"PAD0_RIGHTTRIGGER",     K_PAD0_RIGHTTRIGGER    },
 
-	//
-	// non-ioq3
-	//
-    {"LALT", K_ALT},
-    {"LCTRL", K_CTRL},
-    {"LSHIFT", K_SHIFT},
+    {"PAD0_MISC1",            K_PAD0_MISC1           },
+    {"PAD0_PADDLE1",          K_PAD0_PADDLE1         },
+    {"PAD0_PADDLE2",          K_PAD0_PADDLE2         },
+    {"PAD0_PADDLE3",          K_PAD0_PADDLE3         },
+    {"PAD0_PADDLE4",          K_PAD0_PADDLE4         },
+    {"PAD0_TOUCHPAD",         K_PAD0_TOUCHPAD        },
 
-	{NULL,0}
+ //
+  // non-ioq3
+  //
+    {"LALT",                  K_ALT                  },
+    {"LCTRL",                 K_CTRL                 },
+    {"LSHIFT",                K_SHIFT                },
+
+    {NULL,                    0                      }
 };
 
 /*
@@ -343,46 +340,45 @@ Message_Key
 In game talk message
 ================
 */
-void Message_Key( int key ) {
-	if (key == K_ESCAPE) {
-		Key_SetCatcher( Key_GetCatcher( ) & ~KEYCATCH_MESSAGE );
-		return;
-	}
+void Message_Key(int key)
+{
+    if (key == K_ESCAPE) {
+        Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE);
+        return;
+    }
 
-	if ( key == K_ENTER || key == K_KP_ENTER )
-	{
-		Key_SetCatcher( Key_GetCatcher( ) & ~KEYCATCH_MESSAGE );
-		return;
-	}
+    if (key == K_ENTER || key == K_KP_ENTER) {
+        Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_MESSAGE);
+        return;
+    }
 }
 
 //============================================================================
 
-
-qboolean Key_GetOverstrikeMode( void ) {
-	return key_overstrikeMode;
+qboolean Key_GetOverstrikeMode(void)
+{
+    return key_overstrikeMode;
 }
 
-
-void Key_SetOverstrikeMode( qboolean state ) {
-	key_overstrikeMode = state;
+void Key_SetOverstrikeMode(qboolean state)
+{
+    key_overstrikeMode = state;
 }
 
-
 /*
 ===================
 Key_IsDown
 ===================
 */
-qboolean Key_IsDown( int keynum ) {
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return qfalse;
-	}
+qboolean Key_IsDown(int keynum)
+{
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return qfalse;
+    }
 
-	return keys[keynum].down;
+    return keys[keynum].down;
 }
 
-
 /*
 ===================
 Key_StringToKeynum
@@ -396,48 +392,50 @@ the K_* names are matched up.
 to be configured even if they don't have defined names.
 ===================
 */
-int Key_StringToKeynum( const char *str ) {
-	keyname_t	*kn;
+int Key_StringToKeynum(const char *str)
+{
+    keyname_t *kn;
 
-	if ( !str || !str[0] ) {
-		return -1;
-	}
-	if ( !str[1] ) {
-		return str[0];
-	}
+    if (!str || !str[0]) {
+        return -1;
+    }
+    if (!str[1]) {
+        return str[0];
+    }
 
-	// check for hex code
-	if ( str[0] == '0' && str[1] == 'x' && strlen( str ) == 4) {
-		int		n1, n2;
+    // check for hex code
+    if (str[0] == '0' && str[1] == 'x' && strlen(str) == 4) {
+        int n1, n2;
 
-		n1 = str[2];
-		if ( n1 >= '0' && n1 <= '9' ) {
-			n1 -= '0';
-		} else if ( n1 >= 'a' && n1 <= 'f' ) {
-			n1 = n1 - 'a' + 10;
-		} else {
-			n1 = 0;
-		}
+        n1 = str[2];
+        if (n1 >= '0' && n1 <= '9') {
+            n1 -= '0';
+        } else if (n1 >= 'a' && n1 <= 'f') {
+            n1 = n1 - 'a' + 10;
+        } else {
+            n1 = 0;
+        }
 
-		n2 = str[3];
-		if ( n2 >= '0' && n2 <= '9' ) {
-			n2 -= '0';
-		} else if ( n2 >= 'a' && n2 <= 'f' ) {
-			n2 = n2 - 'a' + 10;
-		} else {
-			n2 = 0;
-		}
+        n2 = str[3];
+        if (n2 >= '0' && n2 <= '9') {
+            n2 -= '0';
+        } else if (n2 >= 'a' && n2 <= 'f') {
+            n2 = n2 - 'a' + 10;
+        } else {
+            n2 = 0;
+        }
 
-		return n1 * 16 + n2;
-	}
+        return n1 * 16 + n2;
+    }
 
-	// scan for a text match
-	for ( kn=keynames ; kn->name ; kn++ ) {
-		if ( !Q_stricmp( str,kn->name ) )
-			return kn->keynum;
-	}
+    // scan for a text match
+    for (kn = keynames; kn->name; kn++) {
+        if (!Q_stricmp(str, kn->name)) {
+            return kn->keynum;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -448,44 +446,45 @@ Returns a string (either a single ascii char, a K_* name, or a 0x11 hex string)
 given keynum.
 ===================
 */
-const char *Key_KeynumToString( int keynum ) {
-	keyname_t	*kn;
-	static	char	tinystr[5];
-	int			i, j;
+const char *Key_KeynumToString(int keynum)
+{
+    keyname_t  *kn;
+    static char tinystr[5];
+    int         i, j;
 
-	if ( keynum == -1 ) {
-		return "<KEY NOT FOUND>";
-	}
+    if (keynum == -1) {
+        return "<KEY NOT FOUND>";
+    }
 
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return "<OUT OF RANGE>";
-	}
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return "<OUT OF RANGE>";
+    }
 
-	// check for printable ascii (don't use quote)
-	if ( keynum > 32 && keynum < 127 && keynum != '"' && keynum != ';' ) {
-		tinystr[0] = keynum;
-		tinystr[1] = 0;
-		return tinystr;
-	}
+    // check for printable ascii (don't use quote)
+    if (keynum > 32 && keynum < 127 && keynum != '"' && keynum != ';') {
+        tinystr[0] = keynum;
+        tinystr[1] = 0;
+        return tinystr;
+    }
 
-	// check for a key string
-	for ( kn=keynames ; kn->name ; kn++ ) {
-		if (keynum == kn->keynum) {
-			return kn->name;
-		}
-	}
+    // check for a key string
+    for (kn = keynames; kn->name; kn++) {
+        if (keynum == kn->keynum) {
+            return kn->name;
+        }
+    }
 
-	// make a hex string
-	i = keynum >> 4;
-	j = keynum & 15;
+    // make a hex string
+    i = keynum >> 4;
+    j = keynum & 15;
 
-	tinystr[0] = '0';
-	tinystr[1] = 'x';
-	tinystr[2] = i > 9 ? i - 10 + 'a' : i + '0';
-	tinystr[3] = j > 9 ? j - 10 + 'a' : j + '0';
-	tinystr[4] = 0;
+    tinystr[0] = '0';
+    tinystr[1] = 'x';
+    tinystr[2] = i > 9 ? i - 10 + 'a' : i + '0';
+    tinystr[3] = j > 9 ? j - 10 + 'a' : j + '0';
+    tinystr[4] = 0;
 
-	return tinystr;
+    return tinystr;
 }
 
 /*
@@ -496,57 +495,58 @@ Returns a string (either a single ascii char, a K_* name, or a 0x11 hex string)
 given keynum.
 ===================
 */
-const char *Key_KeynumToBindString( int keynum ) {
-	keyname_t	*kn;
-	static	char	tinystr[5];
+const char *Key_KeynumToBindString(int keynum)
+{
+    keyname_t  *kn;
+    static char tinystr[5];
 
-	if ( keynum == -1 ) {
-		return "Not Bound";
-	}
+    if (keynum == -1) {
+        return "Not Bound";
+    }
 
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return "Out of Range";
-	}
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return "Out of Range";
+    }
 
-	// check for printable ascii (don't use quote)
-	if ( keynum > 32 && keynum < 127 && keynum != '"' && keynum != ';' ) {
-		tinystr[0] = keynum;
-		tinystr[1] = 0;
-		return tinystr;
-	}
+    // check for printable ascii (don't use quote)
+    if (keynum > 32 && keynum < 127 && keynum != '"' && keynum != ';') {
+        tinystr[0] = keynum;
+        tinystr[1] = 0;
+        return tinystr;
+    }
 
-	// check for a key string
-	for ( kn=keynames ; kn->name ; kn++ ) {
-		if (keynum == kn->keynum) {
-			return kn->name;
-		}
-	}
+    // check for a key string
+    for (kn = keynames; kn->name; kn++) {
+        if (keynum == kn->keynum) {
+            return kn->name;
+        }
+    }
 
-	return "Unknown Key";
+    return "Unknown Key";
 }
 
-
 /*
 ===================
 Key_SetBinding
 ===================
 */
-void Key_SetBinding( int keynum, const char *binding ) {
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return;
-	}
+void Key_SetBinding(int keynum, const char *binding)
+{
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return;
+    }
 
-	// free old bindings
-	if ( keys[ keynum ].binding ) {
-		Z_Free( keys[ keynum ].binding );
-	}
+    // free old bindings
+    if (keys[keynum].binding) {
+        Z_Free(keys[keynum].binding);
+    }
 
-	// allocate memory for new binding
-	keys[keynum].binding = CopyString( binding );
+    // allocate memory for new binding
+    keys[keynum].binding = CopyString(binding);
 
-	// consider this like modifying an archived cvar, so the
-	// file write will be triggered at the next oportunity
-	cvar_modifiedFlags |= CVAR_ARCHIVE;
+    // consider this like modifying an archived cvar, so the
+    // file write will be triggered at the next oportunity
+    cvar_modifiedFlags |= CVAR_ARCHIVE;
 }
 
 /*
@@ -554,22 +554,23 @@ void Key_SetBinding( int keynum, const char *binding ) {
 Key_SetAltBinding
 ===================
 */
-void Key_SetAltBinding( int keynum, const char *binding ) {
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return;
-	}
+void Key_SetAltBinding(int keynum, const char *binding)
+{
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return;
+    }
 
-	// free old bindings
-	if ( altkeys[ keynum ].binding ) {
-		Z_Free( altkeys[ keynum ].binding );
-	}
+    // free old bindings
+    if (altkeys[keynum].binding) {
+        Z_Free(altkeys[keynum].binding);
+    }
 
-	// allocate memory for new binding
-	altkeys[keynum].binding = CopyString( binding );
+    // allocate memory for new binding
+    altkeys[keynum].binding = CopyString(binding);
 
-	// consider this like modifying an archived cvar, so the
-	// file write will be triggered at the next oportunity
-	cvar_modifiedFlags |= CVAR_ARCHIVE;
+    // consider this like modifying an archived cvar, so the
+    // file write will be triggered at the next oportunity
+    cvar_modifiedFlags |= CVAR_ARCHIVE;
 }
 
 /*
@@ -577,36 +578,37 @@ void Key_SetAltBinding( int keynum, const char *binding ) {
 Key_SetCtrlBinding
 ===================
 */
-void Key_SetCtrlBinding( int keynum, const char *binding ) {
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return;
-	}
+void Key_SetCtrlBinding(int keynum, const char *binding)
+{
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return;
+    }
 
-	// free old bindings
-	if ( ctrlkeys[ keynum ].binding ) {
-		Z_Free( ctrlkeys[ keynum ].binding );
-	}
+    // free old bindings
+    if (ctrlkeys[keynum].binding) {
+        Z_Free(ctrlkeys[keynum].binding);
+    }
 
-	// allocate memory for new binding
-	ctrlkeys[ keynum ].binding = CopyString( binding );
+    // allocate memory for new binding
+    ctrlkeys[keynum].binding = CopyString(binding);
 
-	// consider this like modifying an archived cvar, so the
-	// file write will be triggered at the next oportunity
-	cvar_modifiedFlags |= CVAR_ARCHIVE;
+    // consider this like modifying an archived cvar, so the
+    // file write will be triggered at the next oportunity
+    cvar_modifiedFlags |= CVAR_ARCHIVE;
 }
 
-
 /*
 ===================
 Key_GetBinding
 ===================
 */
-const char *Key_GetBinding( int keynum ) {
-	if ( keynum < 0 || keynum >= MAX_KEYS ) {
-		return "";
-	}
+const char *Key_GetBinding(int keynum)
+{
+    if (keynum < 0 || keynum >= MAX_KEYS) {
+        return "";
+    }
 
-	return keys[ keynum ].binding;
+    return keys[keynum].binding;
 }
 
 /*
@@ -615,17 +617,18 @@ Key_GetKey
 ===================
 */
 
-int Key_GetKey(const char *binding) {
-  int i;
+int Key_GetKey(const char *binding)
+{
+    int i;
 
-  if (binding) {
-  	for (i=0 ; i < MAX_KEYS ; i++) {
-      if (keys[i].binding && Q_stricmp(binding, keys[i].binding) == 0) {
-        return i;
-      }
+    if (binding) {
+        for (i = 0; i < MAX_KEYS; i++) {
+            if (keys[i].binding && Q_stricmp(binding, keys[i].binding) == 0) {
+                return i;
+            }
+        }
     }
-  }
-  return -1;
+    return -1;
 }
 
 /*
@@ -633,19 +636,20 @@ int Key_GetKey(const char *binding) {
 Key_GetKeynameForCommand
 ===================
 */
-const char *Key_GetKeynameForCommand( const char *command ) {
-	int		i;
+const char *Key_GetKeynameForCommand(const char *command)
+{
+    int i;
 
-	for( i = 0; i < MAX_KEYS; i++ ) {
-		if( !keys[ i ].binding ) {
-			continue;
-		}
-		if( keys[ i ].down && !stricmp( command, keys[ i ].binding ) ) {
-			return Key_KeynumToString( i );
-		}
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (!keys[i].binding) {
+            continue;
+        }
+        if (keys[i].down && !stricmp(command, keys[i].binding)) {
+            return Key_KeynumToString(i);
+        }
+    }
 
-	return "Unknown Command";
+    return "Unknown Command";
 }
 
 /*
@@ -653,24 +657,25 @@ const char *Key_GetKeynameForCommand( const char *command ) {
 Key_GetKeysForCommand
 ===================
 */
-void Key_GetKeysForCommand( const char *command, int *key1, int *key2 ) {
-	int i;
+void Key_GetKeysForCommand(const char *command, int *key1, int *key2)
+{
+    int i;
 
-	*key1 = *key2 = -1;
+    *key1 = *key2 = -1;
 
-	for( i = 0; i < MAX_KEYS; i++ ) {
-		if( !keys[ i ].binding ) {
-			continue;
-		}
-		if( !stricmp( command, keys[ i ].binding ) ) {
-			if( *key1 == -1 ) {
-				*key1 = i;
-			} else {
-				*key2 = i;
-				return;
-			}
-		}
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (!keys[i].binding) {
+            continue;
+        }
+        if (!stricmp(command, keys[i].binding)) {
+            if (*key1 == -1) {
+                *key1 = i;
+            } else {
+                *key2 = i;
+                return;
+            }
+        }
+    }
 }
 
 /*
@@ -678,24 +683,22 @@ void Key_GetKeysForCommand( const char *command, int *key1, int *key2 ) {
 Key_Unbind_f
 ===================
 */
-void Key_Unbind_f (void)
+void Key_Unbind_f(void)
 {
-	int		b;
+    int b;
 
-	if (Cmd_Argc() != 2)
-	{
-		Com_Printf ("unbind <key> : remove commands from a key\n");
-		return;
-	}
+    if (Cmd_Argc() != 2) {
+        Com_Printf("unbind <key> : remove commands from a key\n");
+        return;
+    }
 
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	Key_SetBinding (b, "");
+    Key_SetBinding(b, "");
 }
 
 /*
@@ -703,24 +706,22 @@ void Key_Unbind_f (void)
 Key_Unaltbind_f
 ===================
 */
-void Key_Unaltbind_f (void)
+void Key_Unaltbind_f(void)
 {
-	int		b;
+    int b;
 
-	if (Cmd_Argc() != 2)
-	{
-		Com_Printf ("unaltbind <key> : remove commands from a key\n");
-		return;
-	}
+    if (Cmd_Argc() != 2) {
+        Com_Printf("unaltbind <key> : remove commands from a key\n");
+        return;
+    }
 
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	Key_SetAltBinding (b, "");
+    Key_SetAltBinding(b, "");
 }
 
 /*
@@ -728,24 +729,22 @@ void Key_Unaltbind_f (void)
 Key_Unctrlbind_f
 ===================
 */
-void Key_Unctrlbind_f (void)
+void Key_Unctrlbind_f(void)
 {
-	int		b;
+    int b;
 
-	if (Cmd_Argc() != 2)
-	{
-		Com_Printf ("unctrlbind <key> : remove commands from a key\n");
-		return;
-	}
+    if (Cmd_Argc() != 2) {
+        Com_Printf("unctrlbind <key> : remove commands from a key\n");
+        return;
+    }
 
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	Key_SetCtrlBinding (b, "");
+    Key_SetCtrlBinding(b, "");
 }
 
 /*
@@ -753,59 +752,58 @@ void Key_Unctrlbind_f (void)
 Key_Unbindall_f
 ===================
 */
-void Key_Unbindall_f (void)
+void Key_Unbindall_f(void)
 {
-	int		i;
+    int i;
 
-	for (i=0 ; i < MAX_KEYS; i++)
-		if (keys[i].binding)
-			Key_SetBinding (i, "");
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (keys[i].binding) {
+            Key_SetBinding(i, "");
+        }
+    }
 }
 
-
 /*
 ===================
 Key_Bind_f
 ===================
 */
-void Key_Bind_f (void)
+void Key_Bind_f(void)
 {
-	int			i, c, b;
-	char		cmd[1024];
+    int  i, c, b;
+    char cmd[1024];
 
-	c = Cmd_Argc();
+    c = Cmd_Argc();
 
-	if (c < 2)
-	{
-		Com_Printf ("bind <key> [command] : attach a command to a key\n");
-		return;
-	}
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    if (c < 2) {
+        Com_Printf("bind <key> [command] : attach a command to a key\n");
+        return;
+    }
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	if (c == 2)
-	{
-		if (keys[b].binding)
-			Com_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), keys[b].binding );
-		else
-			Com_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
-		return;
-	}
+    if (c == 2) {
+        if (keys[b].binding) {
+            Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), keys[b].binding);
+        } else {
+            Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
+        }
+        return;
+    }
 
-// copy the rest of the command line
-	cmd[0] = 0;		// start out with a null string
-	for (i=2 ; i< c ; i++)
-	{
-		strcat (cmd, Cmd_Argv(i));
-		if (i != (c-1))
-			strcat (cmd, " ");
-	}
+    // copy the rest of the command line
+    cmd[0] = 0; // start out with a null string
+    for (i = 2; i < c; i++) {
+        strcat(cmd, Cmd_Argv(i));
+        if (i != (c - 1)) {
+            strcat(cmd, " ");
+        }
+    }
 
-	Key_SetBinding (b, cmd);
+    Key_SetBinding(b, cmd);
 }
 
 /*
@@ -813,44 +811,42 @@ void Key_Bind_f (void)
 Key_AltBind_f
 ===================
 */
-void Key_AltBind_f (void)
+void Key_AltBind_f(void)
 {
-	int			i, c, b;
-	char		cmd[1024];
+    int  i, c, b;
+    char cmd[1024];
 
-	c = Cmd_Argc();
+    c = Cmd_Argc();
 
-	if (c < 2)
-	{
-		Com_Printf ("altbind <key> [command] : attach a command to a key\n");
-		return;
-	}
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    if (c < 2) {
+        Com_Printf("altbind <key> [command] : attach a command to a key\n");
+        return;
+    }
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	if (c == 2)
-	{
-		if (altkeys[b].binding)
-			Com_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), altkeys[b].binding );
-		else
-			Com_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
-		return;
-	}
+    if (c == 2) {
+        if (altkeys[b].binding) {
+            Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), altkeys[b].binding);
+        } else {
+            Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
+        }
+        return;
+    }
 
-// copy the rest of the command line
-	cmd[0] = 0;		// start out with a null string
-	for (i=2 ; i< c ; i++)
-	{
-		strcat (cmd, Cmd_Argv(i));
-		if (i != (c-1))
-			strcat (cmd, " ");
-	}
+    // copy the rest of the command line
+    cmd[0] = 0; // start out with a null string
+    for (i = 2; i < c; i++) {
+        strcat(cmd, Cmd_Argv(i));
+        if (i != (c - 1)) {
+            strcat(cmd, " ");
+        }
+    }
 
-	Key_SetAltBinding (b, cmd);
+    Key_SetAltBinding(b, cmd);
 }
 
 /*
@@ -858,44 +854,42 @@ void Key_AltBind_f (void)
 Key_AltBind_f
 ===================
 */
-void Key_CtrlBind_f (void)
+void Key_CtrlBind_f(void)
 {
-	int			i, c, b;
-	char		cmd[1024];
+    int  i, c, b;
+    char cmd[1024];
 
-	c = Cmd_Argc();
+    c = Cmd_Argc();
 
-	if (c < 2)
-	{
-		Com_Printf ("ctrlbind <key> [command] : attach a command to a key\n");
-		return;
-	}
-	b = Key_StringToKeynum (Cmd_Argv(1));
-	if (b==-1)
-	{
-		Com_Printf ("\"%s\" isn't a valid key\n", Cmd_Argv(1));
-		return;
-	}
+    if (c < 2) {
+        Com_Printf("ctrlbind <key> [command] : attach a command to a key\n");
+        return;
+    }
+    b = Key_StringToKeynum(Cmd_Argv(1));
+    if (b == -1) {
+        Com_Printf("\"%s\" isn't a valid key\n", Cmd_Argv(1));
+        return;
+    }
 
-	if (c == 2)
-	{
-		if (ctrlkeys[b].binding)
-			Com_Printf ("\"%s\" = \"%s\"\n", Cmd_Argv(1), ctrlkeys[b].binding );
-		else
-			Com_Printf ("\"%s\" is not bound\n", Cmd_Argv(1) );
-		return;
-	}
+    if (c == 2) {
+        if (ctrlkeys[b].binding) {
+            Com_Printf("\"%s\" = \"%s\"\n", Cmd_Argv(1), ctrlkeys[b].binding);
+        } else {
+            Com_Printf("\"%s\" is not bound\n", Cmd_Argv(1));
+        }
+        return;
+    }
 
-// copy the rest of the command line
-	cmd[0] = 0;		// start out with a null string
-	for (i=2 ; i< c ; i++)
-	{
-		strcat (cmd, Cmd_Argv(i));
-		if (i != (c-1))
-			strcat (cmd, " ");
-	}
+    // copy the rest of the command line
+    cmd[0] = 0; // start out with a null string
+    for (i = 2; i < c; i++) {
+        strcat(cmd, Cmd_Argv(i));
+        if (i != (c - 1)) {
+            strcat(cmd, " ");
+        }
+    }
 
-	Key_SetCtrlBinding (b, cmd);
+    Key_SetCtrlBinding(b, cmd);
 }
 
 /*
@@ -905,35 +899,34 @@ Key_WriteBindings
 Writes lines containing "bind key value"
 ============
 */
-void Key_WriteBindings( fileHandle_t f ) {
-	int		i;
+void Key_WriteBindings(fileHandle_t f)
+{
+    int i;
 
-	FS_Printf (f, "unbindall\n" );
+    FS_Printf(f, "unbindall\n");
 
-	for (i=0 ; i<MAX_KEYS ; i++) {
-		if (keys[i].binding && keys[i].binding[0] ) {
-			FS_Printf (f, "bind %s \"%s\"\n", Key_KeynumToString(i), keys[i].binding);
-
-		}
-
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (keys[i].binding && keys[i].binding[0]) {
+            FS_Printf(f, "bind %s \"%s\"\n", Key_KeynumToString(i), keys[i].binding);
+        }
+    }
 }
 
-
 /*
 ============
 Key_Bindlist_f
 
 ============
 */
-void Key_Bindlist_f( void ) {
-	int		i;
+void Key_Bindlist_f(void)
+{
+    int i;
 
-	for ( i = 0 ; i < MAX_KEYS ; i++ ) {
-		if ( keys[i].binding && keys[i].binding[0] ) {
-			Com_Printf( "%s \"%s\"\n", Key_KeynumToString(i), keys[i].binding );
-		}
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (keys[i].binding && keys[i].binding[0]) {
+            Com_Printf("%s \"%s\"\n", Key_KeynumToString(i), keys[i].binding);
+        }
+    }
 }
 
 /*
@@ -942,14 +935,15 @@ Key_AltBindlist_f
 
 ============
 */
-void Key_AltBindlist_f( void ) {
-	int		i;
+void Key_AltBindlist_f(void)
+{
+    int i;
 
-	for ( i = 0 ; i < MAX_KEYS ; i++ ) {
-		if ( altkeys[i].binding && altkeys[i].binding[0] ) {
-			Com_Printf( "%s \"%s\"\n", Key_KeynumToString(i), altkeys[i].binding );
-		}
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (altkeys[i].binding && altkeys[i].binding[0]) {
+            Com_Printf("%s \"%s\"\n", Key_KeynumToString(i), altkeys[i].binding);
+        }
+    }
 }
 
 /*
@@ -958,14 +952,15 @@ Key_CtrlBindlist_f
 
 ============
 */
-void Key_CtrlBindlist_f( void ) {
-	int		i;
+void Key_CtrlBindlist_f(void)
+{
+    int i;
 
-	for ( i = 0 ; i < MAX_KEYS ; i++ ) {
-		if ( ctrlkeys[i].binding && ctrlkeys[i].binding[0] ) {
-			Com_Printf( "%s \"%s\"\n", Key_KeynumToString(i), ctrlkeys[i].binding );
-		}
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (ctrlkeys[i].binding && ctrlkeys[i].binding[0]) {
+            Com_Printf("%s \"%s\"\n", Key_KeynumToString(i), ctrlkeys[i].binding);
+        }
+    }
 }
 
 /*
@@ -973,11 +968,13 @@ void Key_CtrlBindlist_f( void ) {
 Key_KeynameCompletion
 ============
 */
-void Key_KeynameCompletion( void(*callback)(const char *s) ) {
-	int		i;
+void Key_KeynameCompletion(void (*callback)(const char *s))
+{
+    int i;
 
-	for( i = 0; keynames[ i ].name != NULL; i++ )
-		callback( keynames[ i ].name );
+    for (i = 0; keynames[i].name != NULL; i++) {
+        callback(keynames[i].name);
+    }
 }
 
 /*
@@ -985,20 +982,27 @@ void Key_KeynameCompletion( void(*callback)(const char *s) ) {
 CL_InitKeyCommands
 ===================
 */
-void CL_InitKeyCommands( void ) {
-	// register our functions
-	Cmd_AddCommand ("bind",Key_Bind_f);
-	Cmd_AddCommand ("unbind",Key_Unbind_f);
-	Cmd_AddCommand ("altbind", Key_AltBind_f);
-	Cmd_AddCommand ("unaltbind", Key_Unaltbind_f);
-	Cmd_AddCommand ("ctrlbind", Key_CtrlBind_f);
-	Cmd_AddCommand ("unctrlbind", Key_Unctrlbind_f);
-	Cmd_AddCommand ("unbindall",Key_Unbindall_f);
-	Cmd_AddCommand ("bindlist",Key_Bindlist_f);
-	Cmd_AddCommand ("altbindlist", Key_AltBindlist_f);
-	Cmd_AddCommand ("ctrlbindlist", Key_AltBindlist_f);
+void CL_InitKeyCommands(void)
+{
+    int i;
 
-	memset( menubound, 0, sizeof( menubound ) );
+    // register our functions
+    Cmd_AddCommand("bind", Key_Bind_f);
+    Cmd_AddCommand("unbind", Key_Unbind_f);
+    Cmd_AddCommand("altbind", Key_AltBind_f);
+    Cmd_AddCommand("unaltbind", Key_Unaltbind_f);
+    Cmd_AddCommand("ctrlbind", Key_CtrlBind_f);
+    Cmd_AddCommand("unctrlbind", Key_Unctrlbind_f);
+    Cmd_AddCommand("unbindall", Key_Unbindall_f);
+    Cmd_AddCommand("bindlist", Key_Bindlist_f);
+    Cmd_AddCommand("altbindlist", Key_AltBindlist_f);
+    Cmd_AddCommand("ctrlbindlist", Key_AltBindlist_f);
+
+    memset(menubound, 0, sizeof(menubound));
+
+    for (i = K_F1; i <= K_F15; i++) {
+        menubound[i] = qtrue;
+    }
 }
 
 /*
@@ -1006,43 +1010,44 @@ void CL_InitKeyCommands( void ) {
 CL_AddKeyUpCommands
 ===================
 */
-void CL_AddKeyUpCommands( int key, char *kb, unsigned time) {
-	int i;
-	char button[1024], *buttonPtr;
-	char	cmd[1024];
-	qboolean keyevent;
+void CL_AddKeyUpCommands(int key, char *kb, unsigned time)
+{
+    int      i;
+    char     button[1024], *buttonPtr;
+    char     cmd[1024];
+    qboolean keyevent;
 
-	if ( !kb ) {
-		return;
-	}
-	keyevent = qfalse;
-	buttonPtr = button;
-	for ( i = 0; ; i++ ) {
-		if ( kb[i] == ';' || !kb[i] ) {
-			*buttonPtr = '\0';
-			if ( button[0] == '+') {
-				// button commands add keynum and time as parms so that multiple
-				// sources can be discriminated and subframe corrected
-				Com_sprintf (cmd, sizeof(cmd), "-%s %i %i\n", button+1, key, time);
-				Cbuf_AddText (cmd);
-				keyevent = qtrue;
-			} else {
-				if (keyevent) {
-					// down-only command
-					Cbuf_AddText (button);
-					Cbuf_AddText ("\n");
-				}
-			}
-			buttonPtr = button;
-			while ( (kb[i] <= ' ' || kb[i] == ';') && kb[i] != 0 ) {
-				i++;
-			}
-		}
-		*buttonPtr++ = kb[i];
-		if ( !kb[i] ) {
-			break;
-		}
-	}
+    if (!kb) {
+        return;
+    }
+    keyevent  = qfalse;
+    buttonPtr = button;
+    for (i = 0;; i++) {
+        if (kb[i] == ';' || !kb[i]) {
+            *buttonPtr = '\0';
+            if (button[0] == '+') {
+                // button commands add keynum and time as parms so that multiple
+                // sources can be discriminated and subframe corrected
+                Com_sprintf(cmd, sizeof(cmd), "-%s %i %i\n", button + 1, key, time);
+                Cbuf_AddText(cmd);
+                keyevent = qtrue;
+            } else {
+                if (keyevent) {
+                    // down-only command
+                    Cbuf_AddText(button);
+                    Cbuf_AddText("\n");
+                }
+            }
+            buttonPtr = button;
+            while ((kb[i] <= ' ' || kb[i] == ';') && kb[i] != 0) {
+                i++;
+            }
+        }
+        *buttonPtr++ = kb[i];
+        if (!kb[i]) {
+            break;
+        }
+    }
 }
 
 static int last_escape_time;
@@ -1054,217 +1059,229 @@ CL_KeyEvent
 Called by the system for both key up and key down events
 ===================
 */
-void CL_KeyEvent (int key, qboolean down, unsigned time) {
-	char	*kb;
-	char	cmd[1024];
+void CL_KeyEvent(int key, qboolean down, unsigned time)
+{
+    char *kb;
+    char  cmd[1024];
 
-	// update auto-repeat status and BUTTON_ANY status
-	keys[key].down = down;
+    // update auto-repeat status and BUTTON_ANY status
+    keys[key].down = down;
 
-	if (down) {
-		keys[key].repeats++;
-		if ( keys[key].repeats == 1) {
-			anykeydown++;
-		}
-	} else {
-		keys[key].repeats = 0;
-		anykeydown--;
-		if (anykeydown < 0) {
-			anykeydown = 0;
-		}
-	}
+    if (down) {
+        keys[key].repeats++;
+        if (keys[key].repeats == 1) {
+            anykeydown++;
+        }
+    } else {
+        keys[key].repeats = 0;
+        anykeydown--;
+        if (anykeydown < 0) {
+            anykeydown = 0;
+        }
+    }
 
-	if( ( key == K_ALT || key == K_INS ) && cl_altbindings->integer ) {
-		alt_down = down;
-	}
+    if ((key == K_ALT || key == K_INS) && cl_altbindings->integer) {
+        alt_down = down;
+    }
 
-	if( ( key == K_CTRL || key == K_DEL ) && cl_ctrlbindings->integer ) {
-		ctrl_down = down;
-	}
+    if ((key == K_CTRL || key == K_DEL) && cl_ctrlbindings->integer) {
+        ctrl_down = down;
+    }
 
-	if (down && !CL_FinishedIntro())
-	{
-		UI_StartStageKeyEvent();
-		return;
-	}
+    if (down && !CL_FinishedIntro()) {
+        UI_StartStageKeyEvent();
+        return;
+    }
 
-	if( clc.state > CA_DISCONNECTED && cge && !Key_GetCatcher() && cge->CG_CheckCaptureKey( key, down, time ) && key != K_ESCAPE )
-	{
-		if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE))
-			return;
-	}
+    if (clc.state > CA_DISCONNECTED && cge && !Key_GetCatcher() && cge->CG_CheckCaptureKey(key, down, time)
+        && key != K_ESCAPE) {
+        if (key != K_CONSOLE && (!keys[K_SHIFT].down || key != K_ESCAPE)) {
+            return;
+        }
+    }
 
-	if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE))
-	{
-		if( !down ) {
-			return;
-		}
+    if (key == K_CONSOLE || (keys[K_SHIFT].down && key == K_ESCAPE)) {
+        if (!down) {
+            return;
+        }
 
-		if( Cvar_VariableIntegerValue( "ui_console" ) )
-		{
-			UI_ToggleConsole();
-		}
-		else if( clc.state == CA_ACTIVE )
-		{
-			if( cg_gametype->integer ) {
-				UI_ToggleDMConsole( 300 );
-			}
-		}
-		return;
-	}
+        if (Cvar_VariableIntegerValue("ui_console")) {
+            UI_ToggleConsole();
+        } else if (clc.state == CA_ACTIVE) {
+            if (cg_gametype->integer) {
+                UI_ToggleDMConsole(300);
+            }
+        }
+        return;
+    }
 
-	if( down )
-	{
-		if( alt_down && key != K_ALT && key != K_INS ) {
-			altkeys[ key ].down = down;
-		}
-		if( down && ctrl_down && key != K_CTRL ) {
-			ctrlkeys[ key ].down = down;
-		}
-	}
+    if (down) {
+        if (alt_down && key != K_ALT && key != K_INS) {
+            altkeys[key].down = down;
+        }
+        if (down && ctrl_down && key != K_CTRL) {
+            ctrlkeys[key].down = down;
+        }
+    }
 
-	if( key != K_DEL ) {
-		ctrlkeys[ key ].down = down;
-	}
+    if (key != K_DEL) {
+        ctrlkeys[key].down = down;
+    }
 
-	if (key == K_ENTER)
-	{
-		if (down)
-		{
-			if (keys[K_ALT].down)
-			{
-				Key_ClearStates();
-				Cvar_SetValue( "r_fullscreen",
-						!Cvar_VariableIntegerValue( "r_fullscreen" ) );
-				return;
-			}
-		}
-	}
+    if (key == K_ENTER) {
+        if (down) {
+            if (keys[K_ALT].down) {
+                Key_ClearStates();
+                Cvar_SetValue("r_fullscreen", !Cvar_VariableIntegerValue("r_fullscreen"));
+                return;
+            }
+        }
+    }
 
+    if (key >= K_MOUSE1 && key <= K_MOUSE5) {
+        if (down) {
+            cl.mouseButtons |= (1 << (key - K_MOUSE1));
+        } else {
+            cl.mouseButtons &= ~(1 << (key - K_MOUSE1));
+        }
 
-	if( key == K_MOUSE1 || key == K_MOUSE2
-		|| key == K_MOUSE3 || key == K_MOUSE4
-		|| key == K_MOUSE5 )
-	{
-		if( down ) {
-			cl.mouseButtons |= ( 1 << ( key + (256 - K_MOUSE1) ) );
-		} else {
-			cl.mouseButtons &= ~( 1 << ( key + (256 - K_MOUSE1)) );
-		}
-	}
+        if (in_guimouse) {
+            return;
+        }
+    }
 
-	if (!in_guimouse || key <= K_MWHEELUP || key > K_JOY1)
-	{
-		// keys can still be used for bound actions
-		if (down && (key <= K_BACKSPACE || key == K_MOUSE4) &&
-			( clc.demoplaying || clc.state == CA_CINEMATIC ) && Key_GetCatcher() == 0 ) {
-			Cvar_Set( "nextdemo", "" );
-			key = K_ESCAPE;
-		}
+    // keys can still be used for bound actions
+    if (down && (key <= K_BACKSPACE || key == K_MOUSE4) && (clc.demoplaying || clc.state == CA_CINEMATIC)
+        && Key_GetCatcher() == 0) {
+        Cvar_Set("nextdemo", "");
+        key = K_ESCAPE;
+    }
 
-		// escape is always handled special
-		if( key == K_ESCAPE ) {
-			if( down ) {
-				qboolean wasup = UI_MenuUp();
-				UI_DeactiveFloatingWindows();
+    // escape is always handled special
+    if (key == K_ESCAPE) {
+        if (down) {
+            qboolean wasup = UI_MenuUp();
+            UI_DeactiveFloatingWindows();
 
-				if( clc.state == CA_CINEMATIC )
-				{
-					SCR_StopCinematic();
-					return;
-				}
+            if (clc.state == CA_CINEMATIC) {
+                SCR_StopCinematic();
+                return;
+            }
 
-				if( cls.realFrametime - last_escape_time <= 1000 ) {
-					UI_MenuEscape( "main" );
-					return;
-				}
+            if (cls.realFrametime - last_escape_time <= 1000) {
+                UI_MenuEscape("main");
+                return;
+            }
 
-				if( wasup ) {
-					UI_MenuEscape( "main" );
-					return;
-				}
+            if (wasup) {
+                UI_MenuEscape("main");
+                return;
+            }
 
-				if( cl.snap.ps.stats[ STAT_CINEMATIC ] & 1 && clc.state == CA_ACTIVE ) {
-					Cbuf_AddText( "skipcinematic\n" );
-					return;
-				}
+            if (cl.snap.ps.stats[STAT_CINEMATIC] & 1 && clc.state == CA_ACTIVE) {
+                Cbuf_AddText("skipcinematic\n");
+                return;
+            }
 
-				if( clc.state <= CA_DISCONNECTED || clc.state == CA_ACTIVE ) {
-					UI_MenuEscape( "main" );
-				}
-				return;
-			}
-		} else if( down ) {
-			if ( ( Key_GetCatcher( ) & KEYCATCH_UI && !menubound[ key ] ) || UI_BindActive() ) {
-				UI_KeyEvent( key, time );
-			} else if( cls.loading & KEYCATCH_MESSAGE ) {
-				Message_Key( key );
-			} else if( clc.state != CA_DISCONNECTED || menubound[key]) {
-				// send the bound action
-				kb = altkeys[ key ].binding;
-				if( !kb || !altkeys[ key ].down ) {
-					kb = ctrlkeys[ key ].binding;
-					if( !kb || !ctrlkeys[ key ].down ) {
-						kb = keys[ key ].binding;
-					}
-				}
-				if( !kb ) {
-					if( key >= 200 ) {
-						Com_Printf( "%s is unbound, use controls menu to set.\n"
-							, Key_KeynumToString( key ) );
-					}
-				} else if( kb[ 0 ] == '+' ) {
-					int i;
-					char button[ 1024 ], *buttonPtr;
-					buttonPtr = button;
-					for( i = 0;; i++ ) {
-						if( kb[ i ] == ';' || !kb[ i ] ) {
-							*buttonPtr = '\0';
-							if( button[ 0 ] == '+' ) {
-								// button commands add keynum and time as parms so that multiple
-								// sources can be discriminated and subframe corrected
-								Com_sprintf( cmd, sizeof( cmd ), "%s %i %i\n", button, key, time );
-								Cbuf_AddText( cmd );
-							}
-							else {
-								// down-only command
-								Cbuf_AddText( button );
-								Cbuf_AddText( "\n" );
-							}
-							buttonPtr = button;
-							while( ( kb[ i ] <= ' ' || kb[ i ] == ';' ) && kb[ i ] != 0 ) {
-								i++;
-							}
-						}
-						*buttonPtr++ = kb[ i ];
-						if( !kb[ i ] ) {
-							break;
-						}
-					}
-				} else {
-					// down-only command
-					Cbuf_AddText( kb );
-					Cbuf_AddText( "\n" );
-				}
-			}
-			return;
-		}
+            if (clc.state <= CA_DISCONNECTED || clc.state == CA_ACTIVE) {
+                UI_MenuEscape("main");
+            }
+            return;
+        }
+    } else if (down) {
+        if ((Key_GetCatcher() & KEYCATCH_UI && !menubound[key]) || UI_BindActive()) {
+            UI_KeyEvent(key, time);
+        } else if (cls.loading & KEYCATCH_MESSAGE) {
+            Message_Key(key);
+        } else if (clc.state != CA_DISCONNECTED || menubound[key]) {
+            // send the bound action
+            kb = altkeys[key].binding;
+            if (!kb || !altkeys[key].down) {
+                kb = ctrlkeys[key].binding;
+                if (!kb || !ctrlkeys[key].down) {
+                    kb = keys[key].binding;
+                }
+            }
+            if (!kb) {
+                if (key >= 200) {
+                    Com_Printf("%s is unbound, use controls menu to set.\n", Key_KeynumToString(key));
+                }
+            } else if (kb[0] == '+') {
+                int  i;
+                char button[1024], *buttonPtr;
+                buttonPtr = button;
+                for (i = 0;; i++) {
+                    if (kb[i] == ';' || !kb[i]) {
+                        *buttonPtr = '\0';
+                        if (button[0] == '+') {
+                            // button commands add keynum and time as parms so that multiple
+                            // sources can be discriminated and subframe corrected
+                            Com_sprintf(cmd, sizeof(cmd), "%s %i %i\n", button, key, time);
+                            Cbuf_AddText(cmd);
+                        } else {
+                            // down-only command
+                            Cbuf_AddText(button);
+                            Cbuf_AddText("\n");
+                        }
+                        buttonPtr = button;
+                        while ((kb[i] <= ' ' || kb[i] == ';') && kb[i] != 0) {
+                            i++;
+                        }
+                    }
+                    *buttonPtr++ = kb[i];
+                    if (!kb[i]) {
+                        break;
+                    }
+                }
+            } else {
+                // down-only command
+                Cbuf_AddText(kb);
+                Cbuf_AddText("\n");
+            }
+        }
+        return;
+    }
 
-		if( altkeys[ key ].down ) {
-			kb = altkeys[ key ].binding;
-			altkeys[ key ].down = false;
-			CL_AddKeyUpCommands( key, kb, time );
-		}
-		if( ctrlkeys[ key ].down ) {
-			kb = ctrlkeys[ key ].binding;
-			ctrlkeys[ key ].down = false;
-			CL_AddKeyUpCommands( key, kb, time );
-		}
+    if (altkeys[key].down) {
+        kb                = altkeys[key].binding;
+        altkeys[key].down = false;
+        CL_AddKeyUpCommands(key, kb, time);
+    }
+    if (ctrlkeys[key].down) {
+        kb                 = ctrlkeys[key].binding;
+        ctrlkeys[key].down = false;
+        CL_AddKeyUpCommands(key, kb, time);
+    }
 
-		CL_AddKeyUpCommands( key, keys[ key ].binding, time );
-	}
+    CL_AddKeyUpCommands(key, keys[key].binding, time);
 }
 
+/*
+===================
+CL_Key_ForceCommand
+===================
+*/
+void CL_Key_ForceCommand(int key, unsigned int time)
+{
+    const char *kb;
+    char        cmd[1024];
+
+    if (clc.state == CA_DISCONNECTED) {
+        return;
+    }
+
+    kb = keys[key].binding;
+    if (kb) {
+        if (*kb == '+') {
+            Com_sprintf(cmd, sizeof(cmd), "%s %i %i\n", kb, key, time);
+        } else {
+            Cbuf_AddText(keys[key].binding);
+            Cbuf_AddText("\n");
+        }
+    } else if (key > K_JOY12) {
+        Com_Printf("%s is unbound, use controls menu to set.\n", Key_KeynumToString(key));
+    }
+}
 
 /*
 ===================
@@ -1273,48 +1290,47 @@ CL_CharEvent
 Normal keyboard characters, already shifted / capslocked / etc
 ===================
 */
-void CL_CharEvent( int key ) {
-	// the console key should never be used as a char
-	if ( key == '`' || key == '~' ) {
-		return;
-	}
+void CL_CharEvent(int key)
+{
+    // the console key should never be used as a char
+    if (key == '`' || key == '~') {
+        return;
+    }
 
-	// delete is not a printable character and is
-	// otherwise handled by Field_KeyDownEvent
-	if ( key == 127 ) {
-		return;
-	}
+    // delete is not a printable character and is
+    // otherwise handled by Field_KeyDownEvent
+    if (key == 127) {
+        return;
+    }
 
-	// distribute the key down event to the apropriate handler
-	if ( Key_GetCatcher( ) & KEYCATCH_CONSOLE ) {
-		return;
-	}
+    // distribute the key down event to the apropriate handler
+    if (Key_GetCatcher() & KEYCATCH_CONSOLE) {
+        return;
+    }
 
-	if ( Key_GetCatcher( ) & KEYCATCH_UI ) {
-		UI_CharEvent( key );
-	}
+    if (Key_GetCatcher() & KEYCATCH_UI) {
+        UI_CharEvent(key);
+    }
 }
 
-
 /*
 ===================
 Key_ClearStates
 ===================
 */
-void Key_ClearStates (void)
+void Key_ClearStates(void)
 {
-	int		i;
+    int i;
 
-	anykeydown = 0;
+    anykeydown = 0;
 
-	for ( i=0 ; i < MAX_KEYS ; i++ ) {
-		if ( keys[i].down ) {
-			CL_KeyEvent( i, qfalse, 0 );
-
-		}
-		keys[i].down = 0;
-		keys[i].repeats = 0;
-	}
+    for (i = 0; i < MAX_KEYS; i++) {
+        if (keys[i].down) {
+            CL_KeyEvent(i, qfalse, 0);
+        }
+        keys[i].down    = 0;
+        keys[i].repeats = 0;
+    }
 }
 
 static int keyCatchers = 0;
@@ -1324,8 +1340,9 @@ static int keyCatchers = 0;
 Key_GetCatcher
 ====================
 */
-int Key_GetCatcher( void ) {
-	return cls.keyCatchers;
+int Key_GetCatcher(void)
+{
+    return cls.keyCatchers;
 }
 
 /*
@@ -1333,6 +1350,7 @@ int Key_GetCatcher( void ) {
 Key_SetCatcher
 ====================
 */
-void Key_SetCatcher( int catcher ) {
-	keyCatchers = catcher;
+void Key_SetCatcher(int catcher)
+{
+    cls.keyCatchers = catcher;
 }
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 59f84516..dd4ff10c 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -29,14 +29,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 #include "../qcommon/bg_compat.h"
 #include "../sys/sys_local.h"
-#ifdef USE_RENDERER_DLL
-#include "../sys/sys_loadlib.h"
-#endif
+#include "../sys/sys_update_checker.h"
+#include "../uilib/uimessage.h"
+
+extern "C" {
+	#include "../sys/sys_loadlib.h"
+}
 
 #include "../gamespy/gcdkey/gcdkeyc.h"
 
 #include <climits>
 
+#ifdef USE_RENDERER_DLOPEN
+cvar_t* cl_renderer;
+#endif
+
 cvar_t	*cl_nodelta;
 cvar_t	*cl_debugMove;
 
@@ -56,6 +63,8 @@ cvar_t	*cl_showTimeDelta;
 cvar_t	*cl_freezeDemo;
 
 cvar_t	*cl_shownet;
+cvar_t	*cl_netprofile;
+cvar_t	*cl_netprofileoverlay;
 cvar_t	*cl_showSend;
 cvar_t	*cl_timedemo;
 cvar_t	*cl_timedemoLog;
@@ -118,6 +127,7 @@ cvar_t	*cl_r_fullscreen;
 
 cvar_t	*cl_consoleKeys;
 cvar_t	*name;
+cvar_t	*cl_rate;
 
 clientActive_t		cl;
 clientConnection_t	clc;
@@ -127,19 +137,14 @@ clientGameExport_t	*cge;
 
 // Structure containing functions exported from refresh DLL
 refexport_t	re;
+#ifdef USE_RENDERER_DLOPEN
+static void	*rendererLib = NULL;
+#endif
 
 qboolean camera_reset;
 qboolean camera_active;
 vec3_t camera_offset;
 
-#ifdef USE_RENDERER_DLL
-// su44: for plugable renderer system
-refexport_t* (*DGetRefAPI)(int apiVersion, refimport_t * rimp) = NULL;
-static cvar_t  *cl_renderer = NULL;
-static void    *rendererLib = NULL;
-#endif // USE_RENDERER_DLL
-
-
 ping_t	cl_pinglist[MAX_PINGREQUESTS];
 
 typedef struct serverStatus_s
@@ -167,9 +172,28 @@ void CL_ShowIP_f(void);
 void CL_ServerStatus_f(void);
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg );
 
-void CL_GamespyServers_f( void );
-
 static qboolean cl_bCLSystemStarted = qfalse;
+static qboolean cl_updateNotified = qfalse;
+
+/*
+===============
+CL_UseLargeLightmap
+
+Added in 2.0
+Returns true if the standard BSP file should be used, false if the smaller lightmap BSP file should be used
+===============
+*/
+qboolean CL_UseLargeLightmap(const char* mapName) {
+	char buffer[MAX_QPATH];
+
+	Com_sprintf(buffer, sizeof(buffer), "maps/%s_sml.bsp", mapName);
+
+	if (FS_ReadFileEx(buffer, NULL, qtrue) == -1) {
+		return qtrue;
+	}
+
+	return Cvar_Get("r_largemap", "0", 0)->integer;
+}
 
 /*
 ===============
@@ -706,7 +730,7 @@ void CL_PlayDemo_f( void ) {
 
 	clc.state = CA_CONNECTED;
 	clc.demoplaying = qtrue;
-	Q_strncpyz( cls.servername, Cmd_Argv(1), sizeof( cls.servername ) );
+	Q_strncpyz( clc.servername, Cmd_Argv(1), sizeof( clc.servername ) );
 
 	// read demo messages until connected
 	while ( clc.state >= CA_CONNECTED && clc.state < CA_PRIMED ) {
@@ -769,7 +793,9 @@ void CL_ShutdownAll(qboolean shutdownRef) {
 	CL_cURL_Shutdown();
 #endif
 	// clear sounds
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_DisableSounds();
+#endif
 	// shutdown CGame
 	CL_ShutdownCGame();
 	// shutdown UI
@@ -779,9 +805,10 @@ void CL_ShutdownAll(qboolean shutdownRef) {
 	TIKI_FreeAll();
 
 	// shutdown the renderer
-	if ( re.Shutdown ) {
-		re.Shutdown( qfalse );		// don't destroy window or context
-	}
+	if(shutdownRef)
+		CL_ShutdownRef();
+	else if(re.Shutdown)
+		re.Shutdown(qfalse);		// don't destroy window or context
 
 	cls.uiStarted = qfalse;
 	cls.cgameStarted = qfalse;
@@ -801,7 +828,7 @@ void CL_FlushMemory( void ) {
 
 	// shutdown all the client stuff
 	CL_ShutdownCGame();
-	S_StopAllSounds( qtrue );
+	S_StopAllSounds2( qtrue );
 	UI_ClearState();
 	cls.rendererRegistered = qfalse;
 }
@@ -830,7 +857,7 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 
 	if (pszMapName) {
 		// if we are already connected to the local host, stay connected
-		if (clc.state >= CA_CONNECTED && !Q_stricmp(cls.servername, "localhost")) {
+		if (clc.state >= CA_CONNECTED && !Q_stricmp(clc.servername, "localhost")) {
 			clc.state = CA_CONNECTED;		// so the connect screen is drawn
 			Com_Memset(cls.updateInfoString, 0, sizeof(cls.updateInfoString));
 			Com_Memset(clc.serverMessage, 0, sizeof(clc.serverMessage));
@@ -841,11 +868,11 @@ void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 			// clear nextmap so the cinematic shutdown doesn't execute it
 			Cvar_Set("nextmap", "");
 			CL_Disconnect();
-			Q_strncpyz(cls.servername, "localhost", sizeof(cls.servername));
+			Q_strncpyz(clc.servername, "localhost", sizeof(clc.servername));
 			clc.state = CA_CHALLENGING;		// so the connect screen is drawn
             clc.connectStartTime = cls.realtime;
 			clc.connectTime = -RETRANSMIT_TIMEOUT;
-			NET_StringToAdr(cls.servername, &clc.serverAddress, NA_UNSPEC);
+			NET_StringToAdr(clc.servername, &clc.serverAddress, NA_UNSPEC);
 			// we don't need a challenge on the localhost
 
 			CL_CheckForResend();
@@ -868,7 +895,7 @@ void CL_ClearState( void )
 	CL_ShutdownCGame();
 
 	if( !com_sv_running->integer ) {
-		S_StopAllSounds( qtrue );
+		S_StopAllSounds2( qtrue );
 	}
 
 	UI_ClearState();
@@ -883,7 +910,7 @@ CL_UpdateGUID
 update cl_guid using QKEY_FILE and optional prefix
 ====================
 */
-static void CL_UpdateGUID( char *prefix, int prefix_len )
+static void CL_UpdateGUID( const char *prefix, int prefix_len )
 {
 	fileHandle_t f;
 	int len;
@@ -910,6 +937,8 @@ This is also called on Com_Error and Com_Quit, so it shouldn't cause any errors
 =====================
 */
 void CL_Disconnect() {
+	int mouseX, mouseY;
+
 	if ( !com_cl_running || !com_cl_running->integer ) {
 		return;
 	}
@@ -945,8 +974,16 @@ void CL_Disconnect() {
 		CL_WritePacket();
 	}
 
+	// Fixed in OPM
+	//  Don't reset the mouse every time the client disconnects
+	mouseX = cl.mousex;
+	mouseY = cl.mousey;
+
 	CL_ClearState ();
 
+	cl.mousex = mouseX;
+	cl.mousey = mouseY;
+
 	// wipe the client connection
 	Com_Memset( &clc, 0, sizeof( clientConnection_t ) );
 
@@ -1047,7 +1084,7 @@ void CL_RequestMotd( void ) {
 	Info_SetValueForKey( info, "renderer", cls.glconfig.renderer_string );
 	Info_SetValueForKey( info, "version", com_version->string );
 
-	NET_OutOfBandPrint( NS_CLIENT, cls.updateServer, "getmotd \"%s\"\n", info );
+	CL_NET_OutOfBandPrint( cls.updateServer, "getmotd \"%s\"\n", info );
 }
 
 /*
@@ -1130,7 +1167,7 @@ void CL_RequestAuthorization( void ) {
 
 	fs = Cvar_Get ("cl_anonymous", "0", CVAR_INIT|CVAR_SYSTEMINFO );
 
-	NET_OutOfBandPrint(NS_CLIENT, cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
+	CL_NET_OutOfBandPrint(cls.authorizeServer, "getKeyAuthorize %i %s", fs->integer, nums );
 }
 
 /*
@@ -1172,12 +1209,12 @@ void CL_Setenv_f( void ) {
 		char buffer[1024];
 		int i;
 
-		strcpy( buffer, Cmd_Argv(1) );
-		strcat( buffer, "=" );
+		Q_strncpyz( buffer, Cmd_Argv(1), sizeof( buffer ) );
+		Q_strcat( buffer, sizeof( buffer ), "=" );
 
 		for ( i = 2; i < argc; i++ ) {
-			strcat( buffer, Cmd_Argv( i ) );
-			strcat( buffer, " " );
+			Q_strcat( buffer, sizeof( buffer ), Cmd_Argv( i ) );
+			Q_strcat( buffer, sizeof( buffer ), " " );
 		}
 
 		putenv( buffer );
@@ -1199,28 +1236,32 @@ CL_Disconnect_f
 ==================
 */
 void CL_Disconnect_f( void ) {
-	if ( clc.state != CA_DISCONNECTED ) {
-		qboolean bConsoleState = UI_ConsoleIsOpen();
+	qboolean bConsoleState;
 
-        Com_Printf("\nDisconnected from server\n");
-        SV_Shutdown("Disconnected from server\n");
+	if ( clc.state == CA_DISCONNECTED ) {
+		return;
+	}
 
-        if (com_cl_running && com_cl_running->integer)
-        {
-            CL_AbnormalDisconnect();
-            CL_FlushMemory();
-            CL_StartHunkUsers(qfalse);
-            S_StopAllSounds(1);
-            S_TriggeredMusic_PlayIntroMusic();
-        }
+	bConsoleState = UI_ConsoleIsOpen();
 
-        UI_FocusMenuIfExists();
+	Com_Printf("\nDisconnected from server\n");
+	SV_Shutdown("Disconnected from server\n");
 
-		if (bConsoleState) {
-			UI_OpenConsole();
-		} else {
-			UI_CloseConsole();
-		}
+	if (com_cl_running && com_cl_running->integer)
+	{
+		CL_AbnormalDisconnect();
+		CL_FlushMemory();
+		CL_StartHunkUsers(qfalse);
+		S_StopAllSounds2(1);
+		S_TriggeredMusic_PlayIntroMusic();
+	}
+
+	UI_FocusMenuIfExists();
+
+	if (bConsoleState) {
+		UI_OpenConsole();
+	} else {
+		UI_CloseConsole();
 	}
 }
 
@@ -1232,22 +1273,22 @@ CL_Reconnect_f
 ================
 */
 void CL_Reconnect_f( void ) {
-	if ( !strlen( cls.servername ) || !strcmp( cls.servername, "localhost" ) ) {
+	if ( !strlen( clc.servername ) || !strcmp( clc.servername, "localhost" ) ) {
 		Com_Printf( "Can't reconnect to localhost.\n" );
 		return;
 	}
 	Cvar_Set("ui_singlePlayerActive", "0");
-	Cbuf_AddText( va("connect %s\n", cls.servername ) );
+	Cbuf_AddText( va("connect %s\n", clc.servername ) );
 }
 
 /*
 ================
-CL_Connect_f
+CL_Connect
 
 ================
 */
-void CL_Connect( const char *server ) {
-	char	serverString[ 22 ];
+void CL_Connect( const char *server, netadrtype_t family ) {
+	const char *serverString;
 
 	Cvar_Set( "ui_singlePlayerActive", "0" );
 
@@ -1273,22 +1314,25 @@ void CL_Connect( const char *server ) {
 	CL_FlushMemory( );
 	*/
 
-	Q_strncpyz( cls.servername, server, sizeof( cls.servername ) );
+	Q_strncpyz( clc.servername, server, sizeof( clc.servername ) );
 
-	if( !NET_StringToAdr( cls.servername, &clc.serverAddress, NA_IP ) ) {
+	if( !NET_StringToAdr( clc.servername, &clc.serverAddress, family ) ) {
 		Com_Printf( "Bad server address\n" );
 		clc.state = CA_DISCONNECTED;
+		UI_PushMenu("badserveraddy");
 		return;
 	}
 	if( clc.serverAddress.port == 0 ) {
 		clc.serverAddress.port = BigShort( PORT_SERVER );
 	}
-	Com_sprintf( serverString, sizeof( serverString ), "%i.%i.%i.%i:%i",
-		clc.serverAddress.ip[ 0 ], clc.serverAddress.ip[ 1 ],
-		clc.serverAddress.ip[ 2 ], clc.serverAddress.ip[ 3 ],
-		BigShort( clc.serverAddress.port ) );
+	serverString = NET_AdrToStringwPort(clc.serverAddress);
 
-	Com_Printf( "%s resolved to %s\n", cls.servername, serverString );
+	Com_Printf( "%s resolved to %s\n", clc.servername, serverString );
+
+	if (cl_guidServerUniq->integer)
+		CL_UpdateGUID(serverString, strlen(serverString));
+	else
+		CL_UpdateGUID(NULL, 0);
 
 	// if we aren't playing on a lan, we need to authenticate
 	// with the cd key
@@ -1298,11 +1342,14 @@ void CL_Connect( const char *server ) {
 	}
 	else {
 		clc.state = CA_CONNECTING;
+
+		// Set a client challenge number that ideally is mirrored back by the server.
+		clc.challenge = (((unsigned int)rand() << 16) ^ (unsigned int)rand()) ^ Com_Milliseconds();
 	}
 
 	clc.connectTime = -99999;	// CL_CheckForResend() will fire immediately
 	clc.connectPacketCount = 0;
-	clc.connectStartTime = 0;
+	clc.connectStartTime = cls.realtime;
 
 	// server connection string
 	Cvar_Set( "cl_currentServerAddress", server );
@@ -1315,17 +1362,36 @@ CL_Connect_f
 ================
 */
 // we have our own server provided to us by mohaaaa.co.uk
-void CL_Connect_f( void ) {
-	char	*server;
+void CL_Connect_f(void) {
+    const char *server;
+    int argc = Cmd_Argc();
+    netadrtype_t family = NA_UNSPEC;
 
 	if ( Cmd_Argc() != 2 ) {
 		Com_Printf( "usage: connect [server]\n");
 		return;
 	}
-	
-	server = Cmd_Argv (1);
 
-	CL_Connect( server );
+	if (argc != 2 && argc != 3) {
+		Com_Printf("usage: connect [-4|-6] server\n");
+		return;
+	}
+
+	if (argc == 2)
+		server = Cmd_Argv(1);
+	else
+	{
+		if (!strcmp(Cmd_Argv(1), "-4"))
+			family = NA_IP;
+		else if (!strcmp(Cmd_Argv(1), "-6"))
+			family = NA_IP6;
+		else
+			Com_Printf("warning: only -4 or -6 as address type understood.\n");
+
+		server = Cmd_Argv(2);
+	}
+
+	CL_Connect( server, family );
 }
 
 /*
@@ -1343,7 +1409,7 @@ void CL_MenuConnect_f( void ) {
 
 	server = Cmd_Argv( 1 );
 
-	CL_Connect( Cvar_VariableString( server ) );
+	CL_Connect( Cvar_VariableString( server ), NA_UNSPEC );
 }
 
 /*
@@ -1363,7 +1429,7 @@ void CL_FastConnect_f( void ) {
 			Com_Printf( "Server %i - '%s'\n", i, NET_AdrToString( cls.localServers[ i ].adr ) );
 		}
 
-		CL_Connect( cls.localServers[ 0 ].hostName );
+		CL_Connect( cls.localServers[ 0 ].hostName, NA_UNSPEC );
 		Cbuf_AddText( "popmenu 0 ; wait 500 ; popmenu 0 ; wait 500 ; popmenu 0\n" );
 		endTime = 123456789;
 	}
@@ -1437,7 +1503,11 @@ void CL_Rcon_f( void ) {
 		}
 	}
 
-	NET_SendPacket (NS_CLIENT, strlen(message)+1, message, to);
+	NET_SendPacket (NS_CLIENT, strlen(message) + 1, message, to);
+
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, strlen(message) + 1, NETPROF_PACKET_MESSAGE);
+	}
 }
 
 /*
@@ -1456,10 +1526,9 @@ void CL_SendPureChecksums( void ) {
 	// "cp"
 	// "Yf"
 	Com_sprintf(cMsg, sizeof(cMsg), "Yf ");
-	Q_strcat(cMsg, sizeof(cMsg), va("%d ", cl.serverId) );
 	Q_strcat(cMsg, sizeof(cMsg), pChecksums);
 	for (i = 0; i < 2; i++) {
-		cMsg[i] += 10;
+		cMsg[i] += '\n';
 	}
 	CL_AddReliableCommand( cMsg, qfalse );
 }
@@ -1488,6 +1557,12 @@ because the renderer doesn't know what graphics to reload
 =================
 */
 void CL_Vid_Restart_f( void ) {
+    soundsystemsavegame_t save;
+    char tm_filename[MAX_RES_NAME];
+    int tm_loopcount;
+    int tm_offset;
+    char current_soundtrack[128];
+
 	if (!CL_Allowed_Vid_Restart()) {
 		return;
 	}
@@ -1495,32 +1570,65 @@ void CL_Vid_Restart_f( void ) {
 	Com_Printf("-------- CL_Vid_Restart_f --------\n");
 	cls.vid_restart = qtrue;
 
-	// don't let them loop during the restart
-	S_StopAllSounds(qtrue);
+    //
+    // Save the current music
+    //
+    Q_strncpyz(tm_filename, S_GetMusicFilename(), sizeof(tm_filename));
+    tm_loopcount = S_GetMusicLoopCount();
+    tm_offset = S_GetMusicOffset();
 
 	SV_ClearSvsTimeFixups();
 
+    S_SaveData(&save);
+    Q_strncpyz(current_soundtrack, S_CurrentSoundtrack(), sizeof(current_soundtrack));
+
 	S_BeginRegistration();
 
+	// shutdown the UI
+	//CL_ShutdownUI();
 	// shutdown the renderer and clear the renderer interface
-	CL_ShutdownRef();
+    CL_ShutdownRef();
+
+    cls.rendererRegistered = qfalse;
+
 	// shutdown the CGame
 	CL_ShutdownCGame();
 	// initialize the renderer interface
 	CL_InitRef();
+	// initialize the UI
+	//CL_InitializeUI();
 	// initialize the ui library
 	UI_ResolutionChange();
-
-	cls.rendererRegistered = qfalse;
+	// clear aliases
+	Alias_Clear();
 
 	// unpause so the cgame definately gets a snapshot and renders a frame
 	Com_Unpause();
 
 	CL_StartHunkUsers(qfalse);
 
+#if !defined(NO_MODERN_DMA) || !NO_MODERN_DMA
+    s_bSoundPaused = true;
+    S_LoadData(&save);
+#else
+    S_Init();
+#endif
+
 	SV_FinishSvsTimeFixups();
 
-	S_Init();
+    S_ReLoad(&save);
+
+    if (tm_filename[0]) {
+        S_TriggeredMusic_SetupHandle(tm_filename, tm_loopcount, tm_offset, 0);
+    }
+
+    MUSIC_NewSoundtrack(current_soundtrack);
+
+	if (clc.state > CA_CONNECTED && clc.state != CA_CINEMATIC)
+	{
+		// send pure checksums
+		CL_SendPureChecksums();
+	}
 
 	cls.vid_restart = qfalse;
 	Com_Printf("----- finished CL_Vid_Restart_f ----\n");
@@ -1536,10 +1644,52 @@ handles will be invalid
 =================
 */
 void CL_Snd_Restart_f( void ) {
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Shutdown();
 	S_Init();
+    CL_Vid_Restart_f();
+#else
+	qboolean full;
+	soundsystemsavegame_t save;
+    char tm_filename[MAX_RES_NAME];
+	int tm_loopcount;
+	int tm_offset;
+	char current_soundtrack[128];
 
-	CL_Vid_Restart_f();
+	full = S_NeedFullRestart();
+
+    //
+    // Save the current music
+    //
+    Q_strncpyz(tm_filename, S_GetMusicFilename(), sizeof(tm_filename));
+    tm_loopcount = S_GetMusicLoopCount();
+    tm_offset = S_GetMusicOffset();
+
+	SV_ClearSvsTimeFixups();
+
+	S_SaveData(&save);
+	Q_strncpyz(current_soundtrack, S_CurrentSoundtrack(), sizeof(current_soundtrack));
+
+	S_Shutdown(qfalse);
+	S_Init(qfalse);
+
+	s_bSoundPaused = true;
+
+	S_LoadData(&save);
+
+	SV_FinishSvsTimeFixups();
+	S_ReLoad(&save);
+
+	if (tm_filename[0]) {
+		S_TriggeredMusic_SetupHandle(tm_filename, tm_loopcount, tm_offset, 0);
+	}
+
+	MUSIC_NewSoundtrack(current_soundtrack);
+
+	if (full) {
+		CL_Vid_Restart_f();
+	}
+#endif
 }
 
 
@@ -1604,7 +1754,7 @@ CL_Clientinfo_f
 void CL_Clientinfo_f( void ) {
 	Com_Printf( "--------- Client Information ---------\n" );
 	Com_Printf( "state: %i\n", clc.state );
-	Com_Printf( "Server: %s\n", cls.servername );
+	Com_Printf( "Server: %s\n", clc.servername );
 	Com_Printf ("User info settings:\n");
 	Info_Print( Cvar_InfoString( CVAR_USERINFO ) );
 	Com_Printf( "--------------------------------------\n" );
@@ -1661,6 +1811,13 @@ void CL_DownloadsComplete( void ) {
     Com_EventLoop();
 
     CL_StartHunkUsers(qfalse);
+
+	// set pure checksums
+	CL_SendPureChecksums();
+
+	CL_WritePacket();
+	CL_WritePacket();
+	CL_WritePacket();
 }
 
 /*
@@ -1798,7 +1955,7 @@ void CL_InitDownloads(void) {
     if (FS_ComparePaks( missingfiles, sizeof( missingfiles ), qfalse ) )
     {
       // NOTE TTimo I would rather have that printed as a modal message box
-      //   but at this point while joining the game we don't know wether we will successfully join or not
+      //   but at this point while joining the game we don't know whether we will successfully join or not
       Com_Printf( "\nWARNING: You are missing some files referenced by the server:\n%s"
                   "You might not be able to join the game\n"
                   "Go to the setting menu to turn on autodownload, or get the file elsewhere\n\n", missingfiles );
@@ -1857,12 +2014,12 @@ void CL_CheckForResend( void ) {
 //		if ( !Sys_IsLANAddress( clc.serverAddress ) ) {
 //			CL_RequestAuthorization();
 //		}
-		NET_OutOfBandPrint(NS_CLIENT, clc.serverAddress, "getchallenge");
+		CL_NET_OutOfBandPrint(clc.serverAddress, "getchallenge");
 		break;
 	case CA_AUTHORIZING:
 		// resend the cd key authorization
 		gcd_compute_response(cl_cdkey, Cmd_Argv(1), cls.gcdResponse, CDResponseMethod_REAUTH);
-		NET_OutOfBandPrint(NS_CLIENT, clc.serverAddress, "authorizeThis %s", cls.gcdResponse);
+		CL_NET_OutOfBandPrint(clc.serverAddress, "authorizeThis %s", cls.gcdResponse);
 		break;
 	case CA_CHALLENGING:
 /*
@@ -1886,13 +2043,13 @@ wombat: sending conect here: an example connect string from MOHAA looks like thi
 			Info_SetValueForKey(info, "protocol", va("%i", com_protocol->integer));
 		Info_SetValueForKey( info, "qport", va("%i", port ) );
 		Info_SetValueForKey(info, "challenge", va("%i", clc.challenge));
-		Info_SetValueForKey(info, "version", com_shortversion->string);
+		Info_SetValueForKey(info, "version", com_target_version->string);
 		if (com_target_game->integer == target_game_e::TG_MOHTT) {
 			// only send if maintt is loaded
 			Info_SetValueForKey(info, "clientType", "Breakthrough");
 		}
 
-		strcpy(data, "connect ");
+		Q_strncpyz(data, "connect ", sizeof(data));
     // TTimo adding " " around the userinfo string to avoid truncated userinfo on the server
     //   (Com_TokenizeString tokenizes around spaces)
     data[8] = '"';
@@ -1977,13 +2134,8 @@ void CL_MotdPacket( netadr_t from ) {
 CL_InitServerInfo
 ===================
 */
-void CL_InitServerInfo( serverInfo_t *server, serverAddress_t *address ) {
-	server->adr.type  = NA_IP;
-	server->adr.ip[0] = address->ip[0];
-	server->adr.ip[1] = address->ip[1];
-	server->adr.ip[2] = address->ip[2];
-	server->adr.ip[3] = address->ip[3];
-	server->adr.port  = address->port;
+void CL_InitServerInfo( serverInfo_t *server, netadr_t *address ) {
+	server->adr = *address;
 	server->clients = 0;
 	server->hostName[0] = '\0';
 	server->mapName[0] = '\0';
@@ -2003,14 +2155,14 @@ void CL_InitServerInfo( serverInfo_t *server, serverAddress_t *address ) {
 CL_ServersResponsePacket
 ===================
 */
-void CL_ServersResponsePacket( netadr_t from, msg_t *msg ) {
-	int				i, count, max, total;
-	serverAddress_t addresses[MAX_SERVERSPERPACKET];
+void CL_ServersResponsePacket( const netadr_t* from, msg_t *msg, qboolean extended ) {
+	int				i, j, count, total;
+	netadr_t addresses[MAX_SERVERSPERPACKET];
 	int				numservers;
 	byte*			buffptr;
 	byte*			buffend;
-
-	Com_Printf("CL_ServersResponsePacket\n");
+	
+	Com_Printf("CL_ServersResponsePacket from %s\n", NET_AdrToStringwPort(*from));
 
 	if (cls.numglobalservers == -1) {
 		// state to detect lack of servers or lack of response
@@ -2018,71 +2170,84 @@ void CL_ServersResponsePacket( netadr_t from, msg_t *msg ) {
 		cls.numGlobalServerAddresses = 0;
 	}
 
-	if (cls.nummplayerservers == -1) {
-		cls.nummplayerservers = 0;
-	}
-
 	// parse through server response string
 	numservers = 0;
 	buffptr    = msg->data;
 	buffend    = buffptr + msg->cursize;
-	while (buffptr+1 < buffend) {
-		// advance to initial token
-		do {
-			if (*buffptr++ == '\\')
-				break;
-		}
-		while (buffptr < buffend);
 
-		if ( buffptr >= buffend - 6 ) {
+	// advance to initial token
+	do
+	{
+		if(*buffptr == '\\' || (extended && *buffptr == '/'))
 			break;
+		
+		buffptr++;
+	} while (buffptr < buffend);
+
+	while (buffptr + 1 < buffend)
+	{
+		// IPv4 address
+		if (*buffptr == '\\')
+		{
+			buffptr++;
+
+			if (buffend - buffptr < sizeof(addresses[numservers].ip) + sizeof(addresses[numservers].port) + 1)
+				break;
+
+			for(i = 0; i < sizeof(addresses[numservers].ip); i++)
+				addresses[numservers].ip[i] = *buffptr++;
+
+			addresses[numservers].type = NA_IP;
 		}
+		// IPv6 address, if it's an extended response
+		else if (extended && *buffptr == '/')
+		{
+			buffptr++;
 
-		// parse out ip
-		addresses[numservers].ip[0] = *buffptr++;
-		addresses[numservers].ip[1] = *buffptr++;
-		addresses[numservers].ip[2] = *buffptr++;
-		addresses[numservers].ip[3] = *buffptr++;
-
+			if (buffend - buffptr < sizeof(addresses[numservers].ip6) + sizeof(addresses[numservers].port) + 1)
+				break;
+			
+			for(i = 0; i < sizeof(addresses[numservers].ip6); i++)
+				addresses[numservers].ip6[i] = *buffptr++;
+			
+			addresses[numservers].type = NA_IP6;
+			addresses[numservers].scope_id = from->scope_id;
+		}
+		else
+			// syntax error!
+			break;
+			
 		// parse out port
-		addresses[numservers].port = (*buffptr++)<<8;
+		addresses[numservers].port = (*buffptr++) << 8;
 		addresses[numservers].port += *buffptr++;
 		addresses[numservers].port = BigShort( addresses[numservers].port );
 
 		// syntax check
-		if (*buffptr != '\\') {
+		if (*buffptr != '\\' && *buffptr != '/')
 			break;
-		}
-
-		Com_DPrintf( "server: %d ip: %d.%d.%d.%d:%d\n",numservers,
-				addresses[numservers].ip[0],
-				addresses[numservers].ip[1],
-				addresses[numservers].ip[2],
-				addresses[numservers].ip[3],
-				addresses[numservers].port );
-
+	
 		numservers++;
-		if (numservers >= MAX_SERVERSPERPACKET) {
+		if (numservers >= MAX_SERVERSPERPACKET)
 			break;
-		}
-
-		// parse out EOT
-		if (buffptr[1] == 'E' && buffptr[2] == 'O' && buffptr[3] == 'T') {
-			break;
-		}
 	}
 
-	if (cls.masterNum == 0) {
-		count = cls.numglobalservers;
-		max = MAX_GLOBAL_SERVERS;
-	} else {
-		count = cls.nummplayerservers;
-		max = MAX_OTHER_SERVERS;
-	}
+	count = cls.numglobalservers;
 
-	for (i = 0; i < numservers && count < max; i++) {
+	for (i = 0; i < numservers && count < MAX_GLOBAL_SERVERS; i++) {
 		// build net address
-		serverInfo_t *server = (cls.masterNum == 0) ? &cls.globalServers[count] : &cls.mplayerServers[count];
+		serverInfo_t *server = &cls.globalServers[count];
+
+		// Tequila: It's possible to have sent many master server requests. Then
+		// we may receive many times the same addresses from the master server.
+		// We just avoid to add a server if it is still in the global servers list.
+		for (j = 0; j < count; j++)
+		{
+			if (NET_CompareAdr(cls.globalServers[j].adr, addresses[i]))
+				break;
+		}
+
+		if (j < count)
+			continue;
 
 		CL_InitServerInfo( server, &addresses[i] );
 		// advance to next slot
@@ -2090,29 +2255,18 @@ void CL_ServersResponsePacket( netadr_t from, msg_t *msg ) {
 	}
 
 	// if getting the global list
-	if (cls.masterNum == 0) {
-		if ( cls.numGlobalServerAddresses < MAX_GLOBAL_SERVERS ) {
-			// if we couldn't store the servers in the main list anymore
-			for (; i < numservers && count >= max; i++) {
-				serverAddress_t *addr;
-				// just store the addresses in an additional list
-				addr = &cls.globalServerAddresses[cls.numGlobalServerAddresses++];
-				addr->ip[0] = addresses[i].ip[0];
-				addr->ip[1] = addresses[i].ip[1];
-				addr->ip[2] = addresses[i].ip[2];
-				addr->ip[3] = addresses[i].ip[3];
-				addr->port  = addresses[i].port;
-			}
+	if ( count >= MAX_GLOBAL_SERVERS && cls.numGlobalServerAddresses < MAX_GLOBAL_SERVERS )
+	{
+		// if we couldn't store the servers in the main list anymore
+		for (; i < numservers && cls.numGlobalServerAddresses < MAX_GLOBAL_SERVERS; i++)
+		{
+			// just store the addresses in an additional list
+			cls.globalServerAddresses[cls.numGlobalServerAddresses++] = addresses[i];
 		}
 	}
 
-	if (cls.masterNum == 0) {
-		cls.numglobalservers = count;
-		total = count + cls.numGlobalServerAddresses;
-	} else {
-		cls.nummplayerservers = count;
-		total = count;
-	}
+	cls.numglobalservers = count;
+	total = count + cls.numGlobalServerAddresses;
 
 	Com_Printf("%d servers parsed (total %d)\n", numservers, total);
 }
@@ -2128,6 +2282,10 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	char	*s;
 	char	*c;
 	const char	*reason;
+	
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, msg->cursize, NETPROF_PACKET_MESSAGE);
+	}
 
 	MSG_BeginReadingOOB( msg );
 	MSG_ReadLong( msg );	// skip the -1
@@ -2212,7 +2370,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 
 	// echo request from server
 	if ( !Q_stricmp(c, "echo") ) {
-		NET_OutOfBandPrint( NS_CLIENT, from, "%s", Cmd_Argv(1) );
+		CL_NET_OutOfBandPrint(from, "%s", Cmd_Argv(1) );
 		return;
 	}
 
@@ -2220,7 +2378,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	if ( !Q_stricmp(c, "getKey") ) {
 		clc.state = CA_AUTHORIZING;
 		gcd_compute_response(cl_cdkey, Cmd_Argv(1), cls.gcdResponse, CDResponseMethod_NEWAUTH);
-		NET_OutOfBandPrint(NS_CLIENT, from, "authorizeThis %s", cls.gcdResponse);
+		CL_NET_OutOfBandPrint(from, "authorizeThis %s", cls.gcdResponse);
 		return;
 	}
 
@@ -2240,7 +2398,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 
 	// echo request from server
 	if ( !Q_strncmp(c, "getserversResponse", 18) ) {
-		CL_ServersResponsePacket( from, msg );
+		CL_ServersResponsePacket( &from, msg, qfalse );
 		return;
 	}
 
@@ -2335,6 +2493,13 @@ CL_CheckTimeout
 ==================
 */
 void CL_CheckTimeout( void ) {
+	if (com_sv_running->integer) {
+		// Added in OPM
+		//  Timeout should not be possible if the client is hosting the game
+		//  (like in single-player mode)
+		return;
+	}
+
 	//
 	// check timeout
 	//
@@ -2342,10 +2507,37 @@ void CL_CheckTimeout( void ) {
 		&& clc.state >= CA_CONNECTED && clc.state != CA_CINEMATIC
 	    && cls.realtime - clc.lastPacketTime > cl_timeout->value*1000) {
 		if (++cl.timeoutcount > 5) {	// timeoutcount saves debugger
-			Com_Printf ("\nServer connection timed out.\n");
-			Cbuf_AddText( "pushmenu servertimeout\n" );
-			CL_Disconnect();
-			return;
+			const char* info;
+			const char* maxclients;
+
+			info = &cl.gameState.stringData[cl.gameState.stringOffsets[CS_SERVERINFO]];
+			maxclients = Info_ValueForKey(info, "maxclients");
+			//
+			// Disconnect if the player isn't alone (single-player mode)
+			//
+			if (!maxclients || atoi(maxclients) != 1) {
+				qboolean bConsoleState;
+
+				bConsoleState = UI_ConsoleIsOpen();
+
+				Com_Printf("\nServer connection timed out.\n");
+				SV_Shutdown("\nServer connection timed out\n");
+
+				if (com_cl_running && com_cl_running->integer) {
+					CL_AbnormalDisconnect();
+					CL_FlushMemory();
+					CL_StartHunkUsers(qfalse);
+				}
+
+				UI_ForceMenuOff(qtrue);
+				UI_PushMenu("servertimeout");
+
+				if (bConsoleState) {
+					UI_OpenConsole();
+				} else {
+					UI_CloseConsole();
+				}
+			}
 		}
 	} else {
 		cl.timeoutcount = 0;
@@ -2391,7 +2583,7 @@ void CL_CheckUserinfo( void ) {
 	// send a reliable userinfo update if needed
 	if(cvar_modifiedFlags & CVAR_USERINFO)
 	{
-		if (Com_SanitizeName(name->string, szSanitizedName)) {
+		if (Com_SanitizeName(name->string, szSanitizedName, sizeof(szSanitizedName))) {
 			Cvar_Set("name", szSanitizedName);
 		}
 
@@ -2401,9 +2593,43 @@ void CL_CheckUserinfo( void ) {
 }
 
 void CL_SetFrameNumber(int frameNumber) {
+	if (!re.SetFrameNumber) {
+		return;
+	}
+
 	re.SetFrameNumber(frameNumber);
 }
 
+/*
+==================
+CL_VerifyUpdate
+
+Check for a new version and display a message box
+when a new version is available
+==================
+*/
+void CL_VerifyUpdate() {
+    if (cl_updateNotified) {
+        return;
+    }
+
+    int lastMajor, lastMinor, lastPatch;
+    if (updateChecker.CheckNewVersion(lastMajor, lastMinor, lastPatch)) {
+        cl_updateNotified = true;
+
+        const char *updateText =
+            va("A new update is available!\n"
+               "The latest version is v%d.%d.%d (you are running v%s).\n"
+               "Check https://github.com/openmoh/openmohaa for more.",
+               lastMajor,
+               lastMinor,
+               lastPatch,
+               PRODUCT_VERSION_NUMBER_STRING);
+
+        UIMessageDialog::ShowMessageBox("Update available", updateText);
+    }
+}
+
 /*
 ==================
 CL_Frame
@@ -2434,11 +2660,19 @@ void CL_Frame ( int msec ) {
 	}
 #endif
 
-	if ( clc.state == CA_DISCONNECTED && !UI_MenuActive()
-		&& !com_sv_running->integer ) {
-		// if disconnected, bring up the menu
-		S_StopAllSounds( qtrue );
-		UI_MenuEscape( "main" );
+	if (CL_FinishedIntro()) {
+		if (clc.state == CA_DISCONNECTED) {
+			if (!UI_MenuActive() && !com_sv_running->integer) {
+				// if disconnected, bring up the menu
+				S_StopAllSounds2(qtrue);
+				S_TriggeredMusic_PlayIntroMusic();
+				UI_MenuEscape("main");
+			}
+
+            CL_VerifyUpdate();
+		} else if (clc.state == CA_CINEMATIC) {
+			UI_ForceMenuOff(qtrue);
+		}
 	}
 
 	// if recording an avi, lock to a fixed fps
@@ -2473,7 +2707,7 @@ void CL_Frame ( int msec ) {
 					now.tm_min,
 					now.tm_sec );
 
-			Q_strncpyz( serverName, cls.servername, MAX_OSPATH );
+			Q_strncpyz( serverName, clc.servername, MAX_OSPATH );
 			// Replace the ":" in the address as it is not a valid
 			// file name character
 			p = strstr( serverName, ":" );
@@ -2507,6 +2741,31 @@ void CL_Frame ( int msec ) {
 
 	cls.timeScaled = com_timescale->integer != 1;
 
+	//
+	// Added in 2.0: network profiling
+	//
+	if (cl_netprofile->integer) {
+		if (!cls.netprofile.initialized) {
+			memset(&cls.netprofile, 0, sizeof(cls.netprofile));
+			cls.netprofile.initialized = qtrue;
+		}
+
+		if (cls.netprofile.rate != cl_rate->integer) {
+            cls.netprofile.rate = cl_rate->integer;
+
+            if (cls.netprofile.rate < 1000) {
+				cls.netprofile.rate = 1000;
+            } else if (cls.netprofile.rate > 90000) {
+				cls.netprofile.rate = 90000;
+			}
+		}
+
+		cls.netprofile.outPackets.updateTime = Com_Milliseconds();
+		cls.netprofile.inPackets.updateTime = cls.netprofile.outPackets.updateTime;
+	} else {
+		cls.netprofile.initialized = qfalse;
+	}
+
 	// see if we need to update any userinfo
 	CL_CheckUserinfo();
 
@@ -2595,15 +2854,15 @@ CL_ShutdownRef
 ============
 */
 void CL_ShutdownRef( void ) {
-	if ( !re.Shutdown ) {
-		return;
+	if ( re.Shutdown ) {
+		re.Shutdown( qtrue );
 	}
-	re.Shutdown( qtrue );
+
 	Com_Memset( &re, 0, sizeof( re ) );
-#ifdef USE_RENDERER_DLL
-	// su44: remember to unload renderer library
-	if(rendererLib) {
-		Sys_UnloadLibrary(rendererLib);
+
+#ifdef USE_RENDERER_DLOPEN
+	if ( rendererLib ) {
+		Sys_UnloadLibrary( rendererLib );
 		rendererLib = NULL;
 	}
 #endif
@@ -2653,6 +2912,15 @@ void *CL_RefMalloc(int size) {
 	return Z_TagMalloc( size, TAG_RENDERER );
 }
 
+/*
+============
+CL_RefFree
+============
+*/
+void CL_RefFree(void* ptr) {
+	Z_Free(ptr);
+}
+
 /*
 ============
 CL_RefClear
@@ -2708,7 +2976,7 @@ void CL_RefStaticClear( void ) {
 CL_CG_PermanentMark
 ============
 */
-int CL_CG_PermanentMark(const vec3_t origin, const vec3_t dir, float orientation,
+int CL_CG_PermanentMark(vec3_t origin, vec3_t dir, float orientation,
 	float fSScale, float fTScale, float red, float green, float blue, float alpha,
 	qboolean dolighting, float fSCenter, float fTCenter,
 	markFragment_t *pMarkFragments, void *pPolyVerts )
@@ -2771,22 +3039,105 @@ void CL_CG_EndTiki( dtiki_t *tiki ) {
 	}
 }
 
+/*
+============
+CL_CG_EndTiki
+============
+*/
 extern "C"
 int CL_ScaledMilliseconds(void) {
 	return Sys_Milliseconds()*com_timescale->value;
 }
 
+/*
+============
+CL_RefFS_WriteFile
+============
+*/
 void CL_RefFS_WriteFile(const char* qpath, const void* buffer, int size) {
 	FS_WriteFile(qpath, buffer, size);
 }
 
+/*
+============
+CL_RefFS_ListFiles
+============
+*/
 char** CL_RefFS_ListFiles(const char* name, const char* extension, int* numfilesfound) {
 	return FS_ListFiles(name, extension, qtrue, numfilesfound);
 }
 
+/*
+============
+CL_RefCIN_UploadCinematic
+============
+*/
 void CL_RefCIN_UploadCinematic(int handle) {
 }
 
+/*
+============
+CL_RefTIKI_GetNumChannels
+============
+*/
+int CL_RefTIKI_GetNumChannels(dtiki_t* tiki) {
+	return tiki->m_boneList.NumChannels();
+}
+
+/*
+============
+CL_RefTIKI_GetLocalChannel
+============
+*/
+int CL_RefTIKI_GetLocalChannel(dtiki_t* tiki, int channel) {
+	return tiki->m_boneList.LocalChannel(channel);
+}
+
+/*
+============
+CL_RefTIKI_GetLocalFromGlobal
+============
+*/
+int CL_RefTIKI_GetLocalFromGlobal(dtiki_t* tiki, int channel) {
+    return tiki->m_boneList.GetLocalFromGlobal(channel);
+}
+
+/*
+============
+CL_RefSKEL_GetMorphWeightFrame
+============
+*/
+int CL_RefSKEL_GetMorphWeightFrame(void* skeletor, int index, float time, int* data) {
+    return ((skeletor_c*)skeletor)->GetMorphWeightFrame(index, time, data);
+}
+
+/*
+============
+CL_RefSKEL_GetBoneParent
+============
+*/
+int CL_RefSKEL_GetBoneParent(void* skeletor, int boneIndex) {
+	return ((skeletor_c*)skeletor)->GetBoneParent(boneIndex);
+}
+
+/*
+============
+CL_GetRefSequence
+============
+*/
+int CL_GetRefSequence(void) {
+	return cls.refSequence;
+}
+
+/*
+============
+CL_IsRendererLoaded
+============
+*/
+qboolean CL_IsRendererLoaded(void) {
+	return re.Shutdown != NULL;
+}
+
 /*
 ============
 CL_InitRef
@@ -2795,12 +3146,40 @@ CL_InitRef
 void CL_InitRef( void ) {
 	refimport_t	ri;
 	refexport_t	*ret;
-#ifdef USE_RENDERER_DLL
-	char dllName[256];
+#ifdef USE_RENDERER_DLOPEN
+	GetRefAPI_t		GetRefAPI;
+	char			dllName[MAX_OSPATH];
 #endif
 
 	Com_Printf( "----- Initializing Renderer ----\n" );
 
+#ifdef USE_RENDERER_DLOPEN
+	cl_renderer = Cvar_Get("cl_renderer", "opengl1", CVAR_ARCHIVE | CVAR_LATCH);
+
+	Com_sprintf(dllName, sizeof(dllName), "renderer_%s" ARCH_SUFFIX DLL_SUFFIX DLL_EXT, cl_renderer->string);
+
+	if(!(rendererLib = Sys_LoadDll(dllName, qfalse)) && strcmp(cl_renderer->string, cl_renderer->resetString))
+	{
+		Com_Printf("failed:\n\"%s\"\n", Sys_LibraryError());
+		Cvar_ForceReset("cl_renderer");
+
+		Com_sprintf(dllName, sizeof(dllName), "renderer_opengl1" ARCH_SUFFIX DLL_SUFFIX DLL_EXT);
+		rendererLib = Sys_LoadDll(dllName, qfalse);
+	}
+
+	if(!rendererLib)
+	{
+		Com_Printf("failed:\n\"%s\"\n", Sys_LibraryError());
+		Com_Error(ERR_FATAL, "Failed to load renderer");
+	}
+
+	GetRefAPI = (GetRefAPI_t)Sys_LoadFunction(rendererLib, "GetRefAPI");
+	if(!GetRefAPI)
+	{
+		Com_Error(ERR_FATAL, "Can't load symbol GetRefAPI: '%s'",  Sys_LibraryError());
+	}
+#endif
+
 	ri.Cmd_AddCommand = Cmd_AddCommand;
 	ri.Cmd_RemoveCommand = Cmd_RemoveCommand;
 	ri.Cmd_Argc = Cmd_Argc;
@@ -2811,7 +3190,7 @@ void CL_InitRef( void ) {
 	ri.Milliseconds = CL_ScaledMilliseconds;
 	ri.LV_ConvertString = Sys_LV_CL_ConvertString;
 	ri.Malloc = CL_RefMalloc;
-	ri.Free = Z_Free;
+	ri.Free = CL_RefFree;
 	ri.Clear = CL_RefClear;
     ri.Hunk_Clear = CL_RefStaticClear;
 #ifdef HUNK_DEBUG
@@ -2824,8 +3203,10 @@ void CL_InitRef( void ) {
 	ri.CM_DrawDebugSurface = CM_DrawDebugSurface;
 
 	ri.FS_OpenFile = FS_FOpenFileRead;
+	ri.FS_OpenFileWrite = FS_FOpenFileWrite;
 	ri.FS_CloseFile = FS_FCloseFile;
 	ri.FS_Read = FS_Read;
+	ri.FS_Write = FS_Write;
 	ri.FS_Seek = FS_Seek;
 	ri.FS_ReadFile = FS_ReadFile;
 	ri.FS_ReadFileEx = FS_ReadFileEx;
@@ -2835,8 +3216,10 @@ void CL_InitRef( void ) {
 	ri.FS_ListFiles = CL_RefFS_ListFiles;
 	ri.FS_FileIsInPAK = FS_FileIsInPAK;
 	ri.FS_FileExists = FS_FileExists;
+	ri.FS_CanonicalFilename = FS_CanonicalFilename;
 	ri.Cvar_Get = Cvar_Get;
 	ri.Cvar_Set = Cvar_Set;
+	ri.Cvar_SetValue = Cvar_SetValue;
 	ri.Cvar_SetDefault = Cvar_SetDefault;
 
     ri.CM_EntityString = CM_EntityString;
@@ -2885,40 +3268,30 @@ void CL_InitRef( void ) {
     ri.Sys_GLimpInit = Sys_GLimpInit;
     ri.Sys_LowPhysicalMemory = Sys_LowPhysicalMemory;
 
-#ifdef USE_RENDERER_DLL
-	// su44: load renderer dll
-	cl_renderer = Cvar_Get("cl_renderer", "glom", CVAR_ARCHIVE);
-	Q_snprintf(dllName, sizeof(dllName), "renderer_%s" ARCH_STRING DLL_EXT, cl_renderer->string); 
-	Com_Printf("Loading \"%s\"...", dllName);
-	if((rendererLib = Sys_LoadLibrary(dllName)) == 0) {
-#ifdef _WIN32
-		Com_Error(ERR_FATAL, "failed:\n\"%s\"\n", Sys_LibraryError());
-#else
-		char            fn[1024];
+	//
+	// Added in OPM
+	//
+	ri.UI_LoadResource = UI_LoadResource;
+	ri.CM_PointLeafnum = CM_PointLeafnum;
+	ri.CM_LeafCluster = CM_LeafCluster;
 
-		Q_strncpyz(fn, Sys_Cwd(), sizeof(fn));
-		strncat(fn, "/", sizeof(fn) - strlen(fn) - 1);
-		strncat(fn, dllName, sizeof(fn) - strlen(fn) - 1);
+    ri.TIKI_CalcLodConsts = TIKI_CalcLodConsts;
+    ri.TIKI_CalculateBounds = TIKI_CalculateBounds;
+    ri.TIKI_FindTiki = TIKI_FindTiki;
+    ri.TIKI_RegisterTikiFlags = TIKI_RegisterTikiFlags;
+    ri.TIKI_GetSkeletor = TIKI_GetSkeletor;
+    ri.TIKI_GetSkel = TIKI_GetSkel;
+    ri.TIKI_GetSkelAnimFrame = TIKI_GetSkelAnimFrame;
+    ri.TIKI_GlobalRadius = TIKI_GlobalRadius;
+    ri.TIKI_FindSkelByHeader = TIKI_FindSkelByHeader;
+	ri.TIKI_GetNumChannels = CL_RefTIKI_GetNumChannels;
+    ri.TIKI_GetLocalChannel = CL_RefTIKI_GetLocalChannel;
+    ri.TIKI_GetLocalFromGlobal = CL_RefTIKI_GetLocalFromGlobal;
 
-		Com_Printf("Loading \"%s\"...", fn);
-		if((rendererLib = Sys_LoadLibrary(fn)) == 0)
-		{
-			Com_Error(ERR_FATAL, "failed:\n\"%s\"", Sys_LibraryError());
-		}
-#endif	/* _WIN32 */
-	}
+	ri.SKEL_GetBoneParent = CL_RefSKEL_GetBoneParent;
+	ri.SKEL_GetMorphWeightFrame = CL_RefSKEL_GetMorphWeightFrame;
 
-	Com_Printf("done\n");
-
-	DGetRefAPI = Sys_LoadFunction(rendererLib, "GetRefAPI");
-	if(!DGetRefAPI)
-	{
-		Com_Error(ERR_FATAL, "Can't load symbol GetRefAPI: '%s'",  Sys_LibraryError());
-	}
-	ret = DGetRefAPI( REF_API_VERSION, &ri );
-#else
 	ret = GetRefAPI( REF_API_VERSION, &ri );
-#endif
 
 #if defined __USEA3D && defined __A3D_GEOM
 	hA3Dg_ExportRenderGeom (ret);
@@ -2934,6 +3307,8 @@ void CL_InitRef( void ) {
 
 	// unpause so the cgame definately gets a snapshot and renders a frame
 	Cvar_Set( "cl_paused", "0" );
+
+	cls.refSequence++;
 }
 
 
@@ -2972,7 +3347,7 @@ void CL_VidMode_f( void ) {
 	mode = atoi( Cmd_Argv( 1 ) );
 
 	if( CL_SetVidMode( mode ) ) {
-		sprintf( text, "%d", mode );
+		Com_sprintf( text, sizeof( text ), "%d", mode );
 		Cvar_Set( "r_mode", text );
 	}
 }
@@ -2991,10 +3366,10 @@ void CL_TikiInfoCommand_f( void ) {
 	name = Cmd_Argv( 1 );
 
 	if( strchr( name, '/' ) ) {
-		strcpy( modelname, name );
+		Q_strncpyz( modelname, name, sizeof( modelname ) );
 	} else {
-		strcpy( modelname, "models/" );
-		strcat( modelname, name );
+		Q_strncpyz( modelname, "models/", sizeof( modelname ) );
+		Q_strcat( modelname, sizeof( modelname ), name );
 	}
 
 	COM_DefaultExtension( modelname, sizeof( modelname ), ".tik" );
@@ -3086,8 +3461,6 @@ it by filling it with 2048 bytes of random data.
 */
 static void CL_GenerateQKey(void)
 {
-	// FIXME: unimplemented
-	/*
 	int len = 0;
 	unsigned char buff[ QKEY_SIZE ];
 	fileHandle_t f;
@@ -3117,7 +3490,6 @@ static void CL_GenerateQKey(void)
 		FS_FCloseFile( f );
 		Com_Printf( "QKEY generated\n" );
 	}
-	*/
 }
 
 /*
@@ -3139,7 +3511,7 @@ void CL_Init( void ) {
 	start = Sys_Milliseconds();
 
 	CL_ClearState ();
-	S_StopAllSounds( qtrue );
+	S_StopAllSounds2( qtrue );
 
 	clc.state = CA_DISCONNECTED;	// no longer CA_UNINITIALIZED
 	Key_SetCatcher(KEYCATCH_UI);
@@ -3165,6 +3537,8 @@ void CL_Init( void ) {
 	cl_master = Cvar_Get ("cl_master", MASTER_SERVER_NAME, CVAR_ARCHIVE);
 	cl_timeNudge = Cvar_Get ("cl_timeNudge", "0", CVAR_TEMP );
 	cl_shownet = Cvar_Get ("cl_shownet", "0", CVAR_TEMP );
+	cl_netprofile = Cvar_Get("cl_netprofile", "0", CVAR_TEMP);
+	cl_netprofileoverlay = Cvar_Get("cl_netprofileoverlay", "0", CVAR_TEMP);
 	cl_showSend = Cvar_Get ("cl_showSend", "0", CVAR_TEMP );
 	cl_showTimeDelta = Cvar_Get ("cl_showTimeDelta", "0", CVAR_TEMP );
 	cl_freezeDemo = Cvar_Get ("cl_freezeDemo", "0", CVAR_TEMP );
@@ -3279,21 +3653,13 @@ void CL_Init( void ) {
 	cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE );
 
 	// userinfo
-	name = Cvar_Get ("name", "UnnamedSoldier", CVAR_USERINFO | CVAR_ARCHIVE );
-	Cvar_Get ("rate", "5000", CVAR_USERINFO | CVAR_ARCHIVE );
+	name = Cvar_Get ("name", va("UnnamedSoldier#%d", rand() % 100000), CVAR_USERINFO | CVAR_ARCHIVE);
+	cl_rate = Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("password", "", CVAR_USERINFO);
 	Cvar_Get ("dm_playermodel", "american_army", CVAR_USERINFO | CVAR_ARCHIVE );
 	Cvar_Get ("dm_playergermanmodel", "german_wehrmacht_soldier", CVAR_USERINFO | CVAR_ARCHIVE );
 
-	Cvar_Get ("cg_predictItems", "1", CVAR_USERINFO | CVAR_ARCHIVE );
-
-
-	// cgame might not be initialized before menu is used
-	Cvar_Get ("cg_viewsize", "100", CVAR_ARCHIVE );
-
-	Cvar_Get ("cg_running", "0", CVAR_ROM );
-
 	//
 	// register our commands
 	//
@@ -3312,7 +3678,6 @@ void CL_Init( void ) {
 	Cmd_AddCommand ("reconnect", CL_Reconnect_f);
 	Cmd_AddCommand ("localservers", CL_LocalServers_f);
 	Cmd_AddCommand ("globalservers", CL_GlobalServers_f);
-	Cmd_AddCommand ("refreshserverlist", CL_GamespyServers_f); // wombat: gamespy query
 	Cmd_AddCommand ("rcon", CL_Rcon_f);
 	Cmd_AddCommand ("setenv", CL_Setenv_f );
 	Cmd_AddCommand ("ping", CL_Ping_f );
@@ -3341,10 +3706,12 @@ void CL_Init( void ) {
 
 	Cvar_Set( "cl_running", "1" );
 
-	NET_Init();
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Init2();
+#else
+	S_Init(qtrue);
+#endif
 
-	// fixme: should we leave it?
 	CL_GenerateQKey();
 	Cvar_Get( "cl_guid", "", CVAR_USERINFO | CVAR_ROM );
 	CL_UpdateGUID( NULL, 0 );
@@ -3353,6 +3720,12 @@ void CL_Init( void ) {
 
 	end = Sys_Milliseconds();
 
+	if (com_gotOriginalConfig) {
+		// Added in OPM
+		//  Apply config tweaks after loading the original config
+		CL_ApplyOriginalConfigTweaks();
+	}
+
 	Com_Printf( "----- Client Initialization Complete ----- %i ms\n", start - end );
 }
 
@@ -3383,7 +3756,11 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	if(disconnect)
 		CL_Disconnect();
 
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
 	S_Shutdown();
+#else
+	S_Shutdown(qtrue);
+#endif
 	CL_ShutdownRef();
 
 	CL_ShutdownUI();
@@ -3411,6 +3788,8 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	Cmd_RemoveCommand ("video");
 	Cmd_RemoveCommand ("stopvideo");
 
+	CL_ShutdownInput();
+
 	Cvar_Set( "cl_running", "0" );
 
 	recursive = qfalse;
@@ -3430,6 +3809,7 @@ static void CL_SetServerInfo(serverInfo_t *server, const char *info, int ping) {
 			server->maxClients = atoi(Info_ValueForKey(info, "sv_maxclients"));
 			Q_strncpyz(server->game,Info_ValueForKey(info, "game"), MAX_NAME_LENGTH);
 			server->gameType = atoi(Info_ValueForKey(info, "gametype"));
+			Q_strncpyz(server->gameTypeString, Info_ValueForKey(info, "gametypestring"), sizeof(server->gameTypeString));
 			server->netType = atoi(Info_ValueForKey(info, "nettype"));
 			server->minPing = atoi(Info_ValueForKey(info, "minping"));
 			server->maxPing = atoi(Info_ValueForKey(info, "maxping"));
@@ -3475,26 +3855,82 @@ CL_ServerInfoPacket
 void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 	int		i, type;
 	char	info[MAX_INFO_STRING];
-	const char*	str;
 	char	*infoString;
 	int		prot;
+	char	*gamename;
+	char	*pszVersion;
+	char	*pszServerType;
+	qboolean gameMismatch;
 
 	infoString = MSG_ReadString( msg );
 
+	// if this isn't the correct gamename, ignore it
+	gamename = Info_ValueForKey( infoString, "gamename" );
+
+#ifdef LEGACY_PROTOCOL
+	// gamename is optional for legacy protocol
+	if (com_legacyprotocol->integer && !*gamename)
+		gameMismatch = qfalse;
+	else
+#endif
+		gameMismatch = !*gamename || strcmp(gamename, com_gamename->string) != 0;
+
+	if (gameMismatch)
+	{
+		Com_DPrintf( "Game mismatch in info packet: %s\n", infoString );
+		return;
+	}
+
 	// if this isn't the correct protocol version, ignore it
 	prot = atoi( Info_ValueForKey( infoString, "protocol" ) );
-	if ( prot != PROTOCOL_VERSION ) {
+
+	if(prot != com_protocol->integer
+#ifdef LEGACY_PROTOCOL
+	   && prot != com_legacyprotocol->integer
+#endif
+		&& (com_target_demo->integer || prot != protocol_version_demo)
+	  )
+	{
 		Com_DPrintf( "Different protocol info packet: %s\n", infoString );
 		return;
 	}
 
+	if (!com_target_demo->integer && protocol_version_demo != protocol_version_full && prot == protocol_version_demo) {
+		Com_DPrintf("Full version found compatible demo protocol version. %s\n", infoString);
+	}
+
+    pszVersion = Info_ValueForKey(infoString, "gamever");
+    pszServerType = Info_ValueForKey(infoString, "serverType");
+
+    if (*pszVersion) {
+        if (*pszVersion == 'd') {
+            pszVersion++;
+        }
+
+		if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+			if (atoi(pszServerType) == target_game_e::TG_MOHTT) {
+				if (fabs(atof(pszVersion)) < 2.3f) {
+					return;
+				}
+			} else {
+				if (fabs(atof(pszVersion)) < 2.1f) {
+					return;
+				}
+			}
+		} else {
+			if (fabs(atof(pszVersion) - com_target_version->value) > 0.1f) {
+				return;
+			}
+		}
+	}
+
 	// iterate servers waiting for ping response
 	for (i=0; i<MAX_PINGREQUESTS; i++)
 	{
 		if ( cl_pinglist[i].adr.port && !cl_pinglist[i].time && NET_CompareAdr( from, cl_pinglist[i].adr ) )
 		{
 			// calc ping time
-			cl_pinglist[i].time = cls.realtime - cl_pinglist[i].start + 1;
+			cl_pinglist[i].time = Sys_Milliseconds() - cl_pinglist[i].start;
 			Com_DPrintf( "ping time %dms from %s\n", cl_pinglist[i].time, NET_AdrToString( from ) );
 
 			// save of info
@@ -3506,12 +3942,12 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 			{
 				case NA_BROADCAST:
 				case NA_IP:
-					str = "udp";
 					type = 1;
 					break;
-
+				case NA_IP6:
+					type = 2;
+					break;
 				default:
-					str = "???";
 					type = 0;
 					break;
 			}
@@ -3546,24 +3982,16 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
 
 	// add this to the list
 	cls.numlocalservers = i+1;
-	cls.localServers[i].adr = from;
-	cls.localServers[i].clients = 0;
-	cls.localServers[i].hostName[0] = '\0';
-	cls.localServers[i].mapName[0] = '\0';
-	cls.localServers[i].maxClients = 0;
-	cls.localServers[i].maxPing = 0;
-	cls.localServers[i].minPing = 0;
-	cls.localServers[i].ping = -1;
-	cls.localServers[i].game[0] = '\0';
-	cls.localServers[i].gameType = 0;
-	cls.localServers[i].netType = from.type;
+	cls.bNewLocalServerInfo = true;
+	CL_InitServerInfo( &cls.localServers[i], &from );
+	CL_SetServerInfo( &cls.localServers[i], infoString, 0 );
 
 	Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
 	if (strlen(info)) {
 		if (info[strlen(info)-1] != '\n') {
-			strncat(info, "\n", sizeof(info) - 1);
+			Q_strcat(info, sizeof(info), "\n");
 		}
-		Com_Printf( "%s: %s", NET_AdrToString( from ), info );
+		Com_Printf( "%s: %s", NET_AdrToStringwPort( from ), info );
 	}
 }
 
@@ -3573,10 +4001,8 @@ CL_GetServerStatus
 ===================
 */
 serverStatus_t *CL_GetServerStatus( netadr_t from ) {
-	serverStatus_t *serverStatus;
 	int i, oldest, oldestTime;
 
-	serverStatus = NULL;
 	for (i = 0; i < MAX_SERVERSTATUSREQUESTS; i++) {
 		if ( NET_CompareAdr( from, cl_serverStatusList[i].address ) ) {
 			return &cl_serverStatusList[i];
@@ -3595,11 +4021,7 @@ serverStatus_t *CL_GetServerStatus( netadr_t from ) {
 			oldestTime = cl_serverStatusList[i].startTime;
 		}
 	}
-	if (oldest != -1) {
-		return &cl_serverStatusList[oldest];
-	}
-	serverStatusCount++;
-	return &cl_serverStatusList[serverStatusCount & (MAX_SERVERSTATUSREQUESTS-1)];
+	return &cl_serverStatusList[oldest];
 }
 
 /*
@@ -3621,7 +4043,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 		return qfalse;
 	}
 	// get the address
-	if ( !NET_StringToAdr( serverAddress, &to, NA_IP ) ) {
+	if ( !NET_StringToAdr( serverAddress, &to, NA_UNSPEC) ) {
 		return qfalse;
 	}
 	serverStatus = CL_GetServerStatus( to );
@@ -3633,7 +4055,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 
 	// if this server status request has the same address
 	if ( NET_CompareAdr( to, serverStatus->address) ) {
-		// if we recieved an response for this server status request
+		// if we received a response for this server status request
 		if (!serverStatus->pending) {
 			Q_strncpyz(serverStatusString, serverStatus->string, maxLen);
 			serverStatus->retrieved = qtrue;
@@ -3647,7 +4069,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 			serverStatus->retrieved = qfalse;
 			serverStatus->time = 0;
 			serverStatus->startTime = Com_Milliseconds();
-			NET_OutOfBandPrint( NS_CLIENT, to, "getstatus" );
+			CL_NET_OutOfBandPrint(to, "getstatus" );
 			return qfalse;
 		}
 	}
@@ -3659,7 +4081,7 @@ int CL_ServerStatus( const char *serverAddress, char *serverStatusString, int ma
 		serverStatus->retrieved = qfalse;
 		serverStatus->startTime = Com_Milliseconds();
 		serverStatus->time = 0;
-		NET_OutOfBandPrint( NS_CLIENT, to, "getstatus" );
+		CL_NET_OutOfBandPrint(to, "getstatus" );
 		return qfalse;
 	}
 	return qfalse;
@@ -3672,9 +4094,9 @@ CL_ServerStatusResponse
 */
 void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 	const char	*s;
-	char	info[MAX_INFO_STRING];
-	int		i, l, score, ping;
-	size_t	len;
+	char		info[MAX_INFO_STRING];
+	int			i, l, ping;
+	int			len;
 	serverStatus_t *serverStatus;
 
 	serverStatus = NULL;
@@ -3727,7 +4149,7 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 
 	if (serverStatus->print) {
 		Com_Printf("\nPlayers:\n");
-		Com_Printf("num: score: ping: name:\n");
+		Com_Printf("num: ping: name:\n");
 	}
 	for (i = 0, s = MSG_ReadStringLine( msg ); *s; s = MSG_ReadStringLine( msg ), i++) {
 
@@ -3735,16 +4157,14 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) {
 		Com_sprintf(&serverStatus->string[len], sizeof(serverStatus->string)-len, "\\%s", s);
 
 		if (serverStatus->print) {
-			score = ping = 0;
-			sscanf(s, "%d %d", &score, &ping);
+			ping = 0;
+			sscanf(s, "%d", &ping);
 			s = strchr(s, ' ');
-			if (s)
-				s = strchr(s+1, ' ');
 			if (s)
 				s++;
 			else
 				s = "unknown";
-			Com_Printf("%-2d   %-3d    %-3d   %s\n", i, score, ping, s );
+			Com_Printf("%-2d   %-3d   %s\n", i, ping, s );
 		}
 	}
 	len = strlen(serverStatus->string);
@@ -3773,6 +4193,7 @@ void CL_LocalServers_f( void ) {
 
 	// reset the list, waiting for response
 	cls.numlocalservers = 0;
+	cls.bNewLocalServerInfo = true;
 	cls.pingUpdateSource = AS_LOCAL;
 
 	for (i = 0; i < MAX_OTHER_SERVERS; i++) {
@@ -3797,176 +4218,122 @@ void CL_LocalServers_f( void ) {
 
 			to.type = NA_BROADCAST;
 			NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
+
+			if (cl_netprofile->integer) {
+				NetProfileAddPacket(&cls.netprofile.inPackets, strlen( message ), NETPROF_PACKET_MESSAGE);
+			}
+			
+			// Added in OPM (from ioquake3)
+			to.type = NA_MULTICAST6;
+			NET_SendPacket( NS_CLIENT, strlen( message ), message, to );
+
+			if (cl_netprofile->integer) {
+				NetProfileAddPacket(&cls.netprofile.inPackets, strlen(message), NETPROF_PACKET_MESSAGE);
+			}
 		}
 	}
 }
 
-/*
-==================
-CL_GamespyServers_f
-==================
-*/
-// currently about 1000 mohaa servers at a time. when set higher, buffer must be increased!
-#define MAX_GAMESPYSERVERS	16
-
-void CL_GamespyServers_f( void ) {
-	// FIXME: unimplemented
-#if 0
-	char buffer[10240];
-	int bytesRead;
-
-	int				i, count, max, total;
-	serverAddress_t addresses[MAX_GAMESPYSERVERS];
-	int				numservers;
-	byte*			buffptr;
-	byte*			buffend;
-
-//	if ( Cmd_Argc() < 1) {
-//		Com_Printf( "usage: gamespyservers [keywords]\n");
-//		return;
-//	}
-
-	Com_Printf( "Requesting servers from the GameSpy master...\n" );
-	Cvar_Set( "dm_serverstatus", "Getting List.");
-
-
-	if (!NETGS_CreateMasterSocket()) {
-		Com_Printf( "CL_GamespyServers_f: could not create socket.\n" );
-		return;
-	}
-	if (!NETGS_SendMasterRequest()) {
-		Com_Printf( "CL_GamespyServers_f: could not send master request.\n" );
-		return;
-	}
-	bytesRead = NETGS_ReceiveMasterResponse( buffer, sizeof(buffer) );
-	if (!bytesRead) {
-		Com_Printf( "CL_GamespyServers_f: Error in Response.\n" );
-		return;
-	}
-
-	// parse through server response string
-	numservers = 0;
-	buffptr    = ( byte * )buffer;
-	buffend    = buffptr + bytesRead;
-
-	while (buffptr+1 < buffend) {
-		if ( buffptr >= buffend - 6 ) {
-			break;
-		}
-
-		// parse out ip
-		addresses[numservers].ip[0] = *buffptr++;
-		addresses[numservers].ip[1] = *buffptr++;
-		addresses[numservers].ip[2] = *buffptr++;
-		addresses[numservers].ip[3] = *buffptr++;
-
-		// parse out port
-		addresses[numservers].port = *buffptr++;
-		addresses[numservers].port += (*buffptr++) << 8;
-
-		Com_DPrintf( "server: %d ip: %d.%d.%d.%d:%d\n",numservers,
-				addresses[numservers].ip[0],
-				addresses[numservers].ip[1],
-				addresses[numservers].ip[2],
-				addresses[numservers].ip[3],
-				BigShort(addresses[numservers].port) );
-
-		numservers++;
-		if (numservers >= MAX_GAMESPYSERVERS) {
-			break;
-		}
-
-		// parse out "\\final\\"
-		if (buffptr[0] == '\\' && buffptr[1] == 'f' && buffptr[2] == 'i' && buffptr[3] == 'n' && buffptr[4] == 'a' && buffptr[6] == 'l' && buffptr[6] == '\\') {
-			break;
-		}
-	}
-
-	cls.numglobalservers = 0;
-	cls.numGlobalServerAddresses = 0;
-
-	count = cls.numglobalservers;
-	max = MAX_GLOBAL_SERVERS;
-	for (i = 0; i < numservers && count < max; i++) {
-		// build net address
-		serverInfo_t *server = &cls.globalServers[count];
-
-		CL_InitServerInfo( server, &addresses[i] );
-		// advance to next slot
-		count++;
-	}
-
-
-	if ( cls.numGlobalServerAddresses < MAX_GLOBAL_SERVERS ) {
-		// if we couldn't store the servers in the main list anymore
-		for (; i < numservers && count >= max; i++) {
-			serverAddress_t *addr;
-			// just store the addresses in an additional list
-			addr = &cls.globalServerAddresses[cls.numGlobalServerAddresses++];
-			addr->ip[0] = addresses[i].ip[0];
-			addr->ip[1] = addresses[i].ip[1];
-			addr->ip[2] = addresses[i].ip[2];
-			addr->ip[3] = addresses[i].ip[3];
-			addr->port  = addresses[i].port;
-		}
-	}
-
-	cls.numglobalservers = count;
-	total = count + cls.numGlobalServerAddresses;
-
-	Com_Printf("%d servers parsed (total %d)\n", numservers, total);
-	Cvar_Set( "dm_serverstatus", "Server List Received.");
-	Cvar_SetValue( "dm_servercount", total );
-#endif
-}
-
-
 /*
 ==================
 CL_GlobalServers_f
+
+Originally master 0 was Internet and master 1 was MPlayer.
+ioquake3 2008; added support for requesting five separate master servers using 0-4.
+ioquake3 2017; made master 0 fetch all master servers and 1-5 request a single master server.
 ==================
 */
 void CL_GlobalServers_f( void ) {
 	netadr_t	to;
-	int			i;
-	int			count;
-	char		*buffptr;
-	char		command[1024];
+	int			count, i, masterNum;
+	char		command[1024], *masteraddress;
+	
+	if ((count = Cmd_Argc()) < 3 || (masterNum = atoi(Cmd_Argv(1))) < 0 || masterNum > MAX_MASTER_SERVERS)
+	{
+		Com_Printf("usage: globalservers <master# 0-%d> <protocol> [keywords]\n", MAX_MASTER_SERVERS);
+		return;	
+	}
 
-	if ( Cmd_Argc() < 3) {
-		Com_Printf( "usage: globalservers <master# 0-1> <protocol> [keywords]\n");
+	// request from all master servers
+	if ( masterNum == 0 ) {
+		int numAddress = 0;
+
+		for ( i = 1; i <= MAX_MASTER_SERVERS; i++ ) {
+			Com_sprintf(command, sizeof(command), "sv_master%d", i);
+			masteraddress = Cvar_VariableString(command);
+
+			if(!*masteraddress)
+				continue;
+
+			numAddress++;
+
+			Com_sprintf(command, sizeof(command), "globalservers %d %s %s\n", i, Cmd_Argv(2), Cmd_ArgsFrom(3));
+			Cbuf_AddText(command);
+		}
+
+		if ( !numAddress ) {
+			Com_Printf( "CL_GlobalServers_f: Error: No master server addresses.\n");
+		}
 		return;
 	}
 
-	cls.masterNum = atoi( Cmd_Argv(1) );
-
-	Com_Printf( "Requesting servers from the master...\n");
+	Com_sprintf(command, sizeof(command), "sv_master%d", masterNum);
+	masteraddress = Cvar_VariableString(command);
+	
+	if(!*masteraddress)
+	{
+		Com_Printf( "CL_GlobalServers_f: Error: No master server address given.\n");
+		return;	
+	}
 
 	// reset the list, waiting for response
 	// -1 is used to distinguish a "no response"
 
-	NET_StringToAdr( cl_master->string, &to, NA_IP );
-
-	if( cls.masterNum == 1 ) {
-		cls.nummplayerservers = -1;
-		cls.pingUpdateSource = AS_MPLAYER;
+	i = NET_StringToAdr(masteraddress, &to, NA_UNSPEC);
+	
+	if(!i)
+	{
+		Com_Printf( "CL_GlobalServers_f: Error: could not resolve address of master %s\n", masteraddress);
+		return;	
 	}
-	else {
-		cls.numglobalservers = -1;
-		cls.pingUpdateSource = AS_GLOBAL;
+	else if(i == 2)
+		to.port = BigShort(PORT_MASTER);
+
+	Com_Printf("Requesting servers from %s (%s)...\n", masteraddress, NET_AdrToStringwPort(to));
+
+	cls.numglobalservers = -1;
+	cls.pingUpdateSource = AS_GLOBAL;
+
+	// Use the extended query for IPv6 masters
+	if (to.type == NA_IP6 || to.type == NA_MULTICAST6)
+	{
+		int v4enabled = Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4;
+		
+		if(v4enabled)
+		{
+			Com_sprintf(command, sizeof(command), "getserversExt %s %s",
+				com_gamename->string, Cmd_Argv(2));
+		}
+		else
+		{
+			Com_sprintf(command, sizeof(command), "getserversExt %s %s ipv6",
+				com_gamename->string, Cmd_Argv(2));
+		}
 	}
-	to.type = NA_IP;
-	to.port = BigShort(PORT_MASTER);
+	//else if ( !Q_stricmp( com_gamename->string, LEGACY_MASTER_GAMENAME ) )
+	//	Com_sprintf(command, sizeof(command), "getservers %s",
+	//		Cmd_Argv(2));
+	else
+		Com_sprintf(command, sizeof(command), "getservers %s %s",
+			com_gamename->string, Cmd_Argv(2));
 
-	sprintf( command, "getservers %s", Cmd_Argv(2) );
+	for (i=3; i < count; i++)
+	{
+		Q_strcat(command, sizeof(command), " ");
+		Q_strcat(command, sizeof(command), Cmd_Argv(i));
+	}
 
-	// tack on keywords
-	buffptr = command + strlen( command );
-	count   = Cmd_Argc();
-	for (i=3; i<count; i++)
-		buffptr += sprintf( buffptr, " %s", Cmd_Argv(i) );
-
-	NET_OutOfBandPrint( NS_SERVER, to, "%s", command );
+	CL_NET_OutOfBandPrint( to, "%s", command );
 }
 
 
@@ -3981,22 +4348,22 @@ void CL_GetPing( int n, char *buf, int buflen, int *pingtime )
 	int		time;
 	int		maxPing;
 
-	if (!cl_pinglist[n].adr.port)
+	if (n < 0 || n >= MAX_PINGREQUESTS || !cl_pinglist[n].adr.port)
 	{
-		// empty slot
+		// empty or invalid slot
 		buf[0]    = '\0';
 		*pingtime = 0;
 		return;
 	}
 
-	str = NET_AdrToString( cl_pinglist[n].adr );
+	str = NET_AdrToStringwPort( cl_pinglist[n].adr );
 	Q_strncpyz( buf, str, buflen );
 
 	time = cl_pinglist[n].time;
 	if (!time)
 	{
 		// check for timeout
-		time = cls.realtime - cl_pinglist[n].start;
+		time = Sys_Milliseconds() - cl_pinglist[n].start;
 		maxPing = Cvar_VariableIntegerValue( "cl_maxPing" );
 		if( maxPing < 100 ) {
 			maxPing = 100;
@@ -4035,9 +4402,9 @@ CL_GetPingInfo
 */
 void CL_GetPingInfo( int n, char *buf, int buflen )
 {
-	if (!cl_pinglist[n].adr.port)
+	if (n < 0 || n >= MAX_PINGREQUESTS || !cl_pinglist[n].adr.port)
 	{
-		// empty slot
+		// empty or invalid slot
 		if (buflen)
 			buf[0] = '\0';
 		return;
@@ -4090,7 +4457,7 @@ CL_GetFreePing
 ping_t* CL_GetFreePing( void )
 {
 	ping_t*	pingptr;
-	ping_t*	best;
+	ping_t*	best;	
 	int		oldest;
 	int		i;
 	int		time;
@@ -4103,7 +4470,7 @@ ping_t* CL_GetFreePing( void )
 		{
 			if (!pingptr->time)
 			{
-				if (cls.realtime - pingptr->start < 500)
+				if (Sys_Milliseconds() - pingptr->start < 500)
 				{
 					// still waiting for response
 					continue;
@@ -4128,7 +4495,7 @@ ping_t* CL_GetFreePing( void )
 	for (i=0; i<MAX_PINGREQUESTS; i++, pingptr++ )
 	{
 		// scan for oldest
-		time = cls.realtime - pingptr->start;
+		time = Sys_Milliseconds() - pingptr->start;
 		if (time > oldest)
 		{
 			oldest = time;
@@ -4148,29 +4515,45 @@ void CL_Ping_f( void ) {
 	netadr_t	to;
 	ping_t*		pingptr;
 	char*		server;
+	int			argc;
+	netadrtype_t	family = NA_UNSPEC;
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf( "usage: ping [server]\n");
-		return;
+	argc = Cmd_Argc();
+
+	if ( argc != 2 && argc != 3 ) {
+		Com_Printf( "usage: ping [-4|-6] server\n");
+		return;	
+	}
+	
+	if(argc == 2)
+		server = Cmd_Argv(1);
+	else
+	{
+		if(!strcmp(Cmd_Argv(1), "-4"))
+			family = NA_IP;
+		else if(!strcmp(Cmd_Argv(1), "-6"))
+			family = NA_IP6;
+		else
+			Com_Printf( "warning: only -4 or -6 as address type understood.\n");
+		
+		server = Cmd_Argv(2);
 	}
 
 	Com_Memset( &to, 0, sizeof(netadr_t) );
 
-	server = Cmd_Argv(1);
-
-	if ( !NET_StringToAdr( server, &to, NA_IP ) ) {
+	if ( !NET_StringToAdr( server, &to, family ) ) {
 		return;
 	}
 
 	pingptr = CL_GetFreePing();
 
 	memcpy( &pingptr->adr, &to, sizeof (netadr_t) );
-	pingptr->start = cls.realtime;
+	pingptr->start = Sys_Milliseconds();
 	pingptr->time  = 0;
 
 	CL_SetServerInfoByAddress(pingptr->adr, NULL, 0);
-
-	NET_OutOfBandPrint( NS_CLIENT, to, "\x02getinfo" );
+		
+	CL_NET_OutOfBandPrint( to, "\x02getinfo xxx" );
 }
 
 /*
@@ -4223,10 +4606,10 @@ void CL_Dialog_f( void ) {
 		return;
 	}
 
-	strcpy( title, Cmd_Argv( 1 ) );
-	strcpy( cvar, Cmd_Argv( 2 ) );
-	strcpy( command, Cmd_Argv( 3 ) );
-	strcpy( cancelCommand, Cmd_Argv( 4 ) );
+	Q_strncpyz( title, Cmd_Argv( 1 ), sizeof( title ) );
+	Q_strncpyz( cvar, Cmd_Argv( 2 ), sizeof( cvar ) );
+	Q_strncpyz( command, Cmd_Argv( 3 ), sizeof( command ) );
+	Q_strncpyz( cancelCommand, Cmd_Argv( 4 ), sizeof( cancelCommand ) );
 
 	if( Cmd_Argc() > 5 ) {
 		width = atoi( Cmd_Argv( 5 ) );
@@ -4240,17 +4623,17 @@ void CL_Dialog_f( void ) {
 	}
 
 	if( Cmd_Argc() > 7 ) {
-		strcpy( shader, Cmd_Argv( 7 ) );
+		Q_strncpyz( shader, Cmd_Argv( 7 ), sizeof( shader ) );
 	} else {
 		shader[ 0 ] = 0;
 	}
 	if( Cmd_Argc() > 8 ) {
-		strcpy( okshader, Cmd_Argv( 8 ) );
+		Q_strncpyz( okshader, Cmd_Argv( 8 ), sizeof(okshader) );
 	} else {
 		okshader[ 0 ] = 0;
 	}
 	if( Cmd_Argc() > 9 ) {
-		strcpy( cancelshader, Cmd_Argv( 9 ) );
+		Q_strncpyz( cancelshader, Cmd_Argv( 9 ), sizeof(cancelshader) );
 	} else {
 		cancelshader[ 0 ] = 0;
 	}
@@ -4264,7 +4647,10 @@ CL_ServerRestarted
 ==================
 */
 void CL_ServerRestarted( void ) {
-	S_StopAllSounds( qfalse );
+	//S_StopAllSounds2( qfalse );
+	// Fixed in OPM
+	//  Also stop the music
+	S_StopAllSounds2( qtrue );
 
 	UI_ServerLoaded();
 	UI_ClearState();
@@ -4294,16 +4680,11 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 	if (slots < MAX_PINGREQUESTS) {
 		serverInfo_t *server = NULL;
 
-		max = (source == AS_GLOBAL) ? MAX_GLOBAL_SERVERS : MAX_OTHER_SERVERS;
 		switch (source) {
 			case AS_LOCAL :
 				server = &cls.localServers[0];
 				max = cls.numlocalservers;
 			break;
-			case AS_MPLAYER :
-				server = &cls.mplayerServers[0];
-				max = cls.nummplayerservers;
-			break;
 			case AS_GLOBAL :
 				server = &cls.globalServers[0];
 				max = cls.numglobalservers;
@@ -4312,6 +4693,8 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 				server = &cls.favoriteServers[0];
 				max = cls.numfavoriteservers;
 			break;
+			default:
+				return qfalse;
 		}
 		for (i = 0; i < max; i++) {
 			if (server[i].visible) {
@@ -4338,9 +4721,9 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 							}
 						}
 						memcpy(&cl_pinglist[j].adr, &server[i].adr, sizeof(netadr_t));
-						cl_pinglist[j].start = cls.realtime;
+						cl_pinglist[j].start = Sys_Milliseconds();
 						cl_pinglist[j].time = 0;
-						NET_OutOfBandPrint( NS_CLIENT, cl_pinglist[j].adr, "getinfo xxx" );
+						CL_NET_OutOfBandPrint( cl_pinglist[j].adr, "getinfo xxx" );
 						slots++;
 					}
 				}
@@ -4360,7 +4743,7 @@ qboolean CL_UpdateVisiblePings_f(int source) {
 				}
 			}
 		}
-	}
+	} 
 
 	if (slots) {
 		status = qtrue;
@@ -4385,32 +4768,53 @@ CL_ServerStatus_f
 ==================
 */
 void CL_ServerStatus_f(void) {
-	netadr_t	to;
+	netadr_t	to, *toptr = NULL;
 	char		*server;
 	serverStatus_t *serverStatus;
+	int			argc;
+	netadrtype_t	family = NA_UNSPEC;
 
-	Com_Memset( &to, 0, sizeof(netadr_t) );
+	argc = Cmd_Argc();
 
-	if ( Cmd_Argc() != 2 ) {
-		if ( clc.state != CA_ACTIVE || clc.demoplaying ) {
+	if ( argc != 2 && argc != 3 )
+	{
+		if (clc.state != CA_ACTIVE || clc.demoplaying)
+		{
 			Com_Printf ("Not connected to a server.\n");
-			Com_Printf( "Usage: serverstatus [server]\n");
+			Com_Printf( "usage: serverstatus [-4|-6] server\n");
 			return;
 		}
-		server = cls.servername;
+
+		toptr = &clc.serverAddress;
 	}
-	else {
-		server = Cmd_Argv(1);
+	
+	if(!toptr)
+	{
+		Com_Memset( &to, 0, sizeof(netadr_t) );
+	
+		if(argc == 2)
+			server = Cmd_Argv(1);
+		else
+		{
+			if(!strcmp(Cmd_Argv(1), "-4"))
+				family = NA_IP;
+			else if(!strcmp(Cmd_Argv(1), "-6"))
+				family = NA_IP6;
+			else
+				Com_Printf( "warning: only -4 or -6 as address type understood.\n");
+		
+			server = Cmd_Argv(2);
+		}
+
+		toptr = &to;
+		if ( !NET_StringToAdr( server, toptr, family ) )
+			return;
 	}
 
-	if ( !NET_StringToAdr( server, &to, NA_IP ) ) {
-		return;
-	}
+	CL_NET_OutOfBandPrint( *toptr, "getstatus" );
 
-	NET_OutOfBandPrint( NS_CLIENT, to, "getstatus" );
-
-	serverStatus = CL_GetServerStatus( to );
-	serverStatus->address = to;
+	serverStatus = CL_GetServerStatus( *toptr );
+	serverStatus->address = *toptr;
 	serverStatus->print = qtrue;
 	serverStatus->pending = qtrue;
 }
@@ -4476,7 +4880,7 @@ qboolean CL_CDKeyValidate( const char *key, const char *checksum ) {
 		}
 	}
 
-	sprintf(chs, "%02x", sum);
+	Com_sprintf(chs, sizeof(chs), "%02x", sum);
 
 	if (checksum && !Q_stricmp(chs, checksum)) {
 		return qtrue;
@@ -4498,3 +4902,15 @@ void TIKI_CG_Command_ProcessFile(char* filename, qboolean quiet, dtiki_t* curTik
 
 	Com_Printf("NO CGE \n");
 }
+
+void CL_ApplyOriginalConfigTweaks()
+{
+	cvar_t* snaps = Cvar_Get("snaps", "", 0);
+
+    // Those variables are not editable via UI so reset them
+	// snaps/maxpackets can also have wrong values due to them being changed
+	// via stufftext
+
+	Cvar_Set("snaps", snaps->resetString);
+	Cvar_Set("cl_maxpackets", cl_maxpackets->resetString);
+}
diff --git a/code/client/cl_net_chan.cpp b/code/client/cl_net_chan.cpp
index 1433c434..102d5524 100644
--- a/code/client/cl_net_chan.cpp
+++ b/code/client/cl_net_chan.cpp
@@ -132,7 +132,7 @@ CL_Netchan_TransmitNextFragment
 =================
 */
 void CL_Netchan_TransmitNextFragment( netchan_t *chan ) {
-	Netchan_TransmitNextFragment( chan );
+	Netchan_TransmitNextFragment( chan, cl_netprofile->integer ? &cls.netprofile.inPackets : NULL );
 }
 
 /*
@@ -144,7 +144,7 @@ void CL_Netchan_Transmit( netchan_t *chan, msg_t* msg ) {
 	MSG_WriteByte( msg, clc_EOF );
 
 	CL_Netchan_Encode( msg );
-	Netchan_Transmit( chan, msg->cursize, msg->data );
+	Netchan_Transmit( chan, msg->cursize, msg->data, cl_netprofile->integer ? &cls.netprofile.inPackets : NULL );
 }
 
 extern 	int oldsize;
@@ -158,10 +158,30 @@ CL_Netchan_Process
 qboolean CL_Netchan_Process( netchan_t *chan, msg_t *msg ) {
 	int ret;
 
-	ret = Netchan_Process( chan, msg );
+	ret = Netchan_Process( chan, msg, cl_netprofile->integer ? &cls.netprofile.outPackets : NULL );
 	if (!ret)
 		return qfalse;
 	CL_Netchan_Decode( msg );
 	newsize += msg->cursize;
 	return qtrue;
 }
+
+/*
+=================
+CL_NET_OutOfBandPrint
+=================
+*/
+void CL_NET_OutOfBandPrint(netadr_t adr, const char* format, ...) {
+    va_list	argptr;
+    char	string[MAX_MSGLEN];
+
+    va_start(argptr, format);
+    Q_vsnprintf(string, sizeof(string), format, argptr);
+    va_end(argptr);
+
+	NET_OutOfBandPrint(NS_CLIENT, adr, "%s", string);
+
+	if (cl_netprofile->integer) {
+		NetProfileAddPacket(&cls.netprofile.inPackets, strlen(string), NETPROF_PACKET_MESSAGE);
+	}
+}
diff --git a/code/client/cl_parse.cpp b/code/client/cl_parse.cpp
index 76a17cf4..68a9cc7e 100644
--- a/code/client/cl_parse.cpp
+++ b/code/client/cl_parse.cpp
@@ -223,13 +223,13 @@ qboolean CL_UnpackNonPVSClient(int* packed, radarUnpacked_t* unpacked) {
 		range = 0;
 	}
 
-	unpacked->x = x * range / 63.f;
-	unpacked->y = y * range / 63.f;
+	unpacked->x = x * range / (MAX_CLIENTS - 1);
+	unpacked->y = y * range / (MAX_CLIENTS - 1);
 
 	if (!bValid)
 	{
-		unpacked->x = x * range / 63.f * 1024;
-		unpacked->y = y * range / 63.f * 1024;
+		unpacked->x = x * range / (MAX_CLIENTS - 1) * 1024.0;
+		unpacked->y = y * range / (MAX_CLIENTS - 1) * 1024.0;
 	}
 
 	unpacked->yaw = yaw * 11.25f;
@@ -429,12 +429,24 @@ void CL_SystemInfoChanged( void ) {
 	// in some cases, outdated cp commands might get sent with this news serverId
 	cl.serverId = atoi( Info_ValueForKey( systemInfo, "sv_serverid" ) );
 
+#ifdef USE_VOIP
+#ifdef LEGACY_PROTOCOL
+	if(clc.compat)
+		clc.voipEnabled = qfalse;
+	else
+#endif
+	{
+		s = Info_ValueForKey( systemInfo, "sv_voipProtocol" );
+		clc.voipEnabled = !Q_stricmp(s, "opus");
+	}
+#endif
+
 	// don't set any vars when playing a demo
 	if ( clc.demoplaying ) {
 		return;
 	}
 
-	s = Info_ValueForKey( systemInfo, "sv_cheats" );
+	s = Info_ValueForKey( systemInfo, "cheats" );
 	cl_connectedToCheatServer = atoi( s );
 	if ( !cl_connectedToCheatServer ) {
 		Cvar_SetCheatState();
@@ -556,6 +568,7 @@ void CL_ParseGamestate( msg_t *msg ) {
             csNum = CPT_NormalizeConfigstring(i);
             if (csNum < 0 || csNum >= MAX_CONFIGSTRINGS) {
                 Com_Error(ERR_DROP, "configstring > MAX_CONFIGSTRINGS");
+				return;
             }
             s = MSG_ReadScrambledBigString(msg);
             len = strlen(s);
@@ -576,8 +589,7 @@ void CL_ParseGamestate( msg_t *msg ) {
 			//Com_Memset (&nullstate, 0, sizeof(nullstate));
 			MSG_GetNullEntityState(&nullstate);
 			es = &cl.entityBaselines[ newnum ];
-			// FIXME: frametime
-			MSG_ReadDeltaEntity( msg, &nullstate, es, newnum, 0.0);
+			MSG_ReadDeltaEntity( msg, &nullstate, es, newnum, cls.serverFrameTime);
 		} else {
 			Com_Error( ERR_DROP, "CL_ParseGamestate: bad command byte %i", cmd );
 		}
@@ -594,16 +606,25 @@ void CL_ParseGamestate( msg_t *msg ) {
 	// stop recording now so the demo won't have an unnecessary level load at the end.
 	if(cl_autoRecordDemo->integer && clc.demorecording)
 		CL_StopRecord_f();
-	
-	// reinitialize the filesystem if the game directory has changed
-	FS_ConditionalRestart( clc.checksumFeed, qfalse );
+
+	if (clc.state == CA_CONNECTED && !Cvar_Get("sv_paks", "", 0)->string[0]) {
+		// Added in 2.30
+		FS_Restart(clc.checksumFeed);
+	} else {
+		// reinitialize the filesystem if the game directory has changed
+		FS_ConditionalRestart(clc.checksumFeed, qfalse);
+	}
 
 	clc.state = CA_LOADING;
     if (!com_sv_running->integer)
     {
         const char *info = cl.gameState.stringData + cl.gameState.stringOffsets[CS_SERVERINFO];
-        UI_ClearState();
-        UI_BeginLoad(Info_ValueForKey(info, "mapname"));
+		const char *mapname = Info_ValueForKey(info, "mapname");
+		// Added in 2.0
+		Cvar_Set("mapname", mapname);
+
+		UI_ClearState();
+        UI_BeginLoad(mapname);
     }
 
 	// This used to call CL_StartHunkUsers, but now we enter the download state before loading the
@@ -784,6 +805,178 @@ void CL_ParseDownload ( msg_t *msg ) {
 	}
 }
 
+#ifdef USE_VOIP
+static
+qboolean CL_ShouldIgnoreVoipSender(int sender)
+{
+	if (!cl_voip->integer)
+		return qtrue;  // VoIP is disabled.
+	else if ((sender == clc.clientNum) && (!clc.demoplaying))
+		return qtrue;  // ignore own voice (unless playing back a demo).
+	else if (clc.voipMuteAll)
+		return qtrue;  // all channels are muted with extreme prejudice.
+	else if (clc.voipIgnore[sender])
+		return qtrue;  // just ignoring this guy.
+	else if (clc.voipGain[sender] == 0.0f)
+		return qtrue;  // too quiet to play.
+
+	return qfalse;
+}
+
+/*
+=====================
+CL_PlayVoip
+
+Play raw data
+=====================
+*/
+
+static void CL_PlayVoip(int sender, int samplecnt, const byte *data, int flags)
+{
+	if(flags & VOIP_DIRECT)
+	{
+		S_RawSamples(sender + 1, samplecnt, 48000, 2, 1,
+	             data, clc.voipGain[sender], -1);
+	}
+
+	if(flags & VOIP_SPATIAL)
+	{
+		S_RawSamples(sender + MAX_CLIENTS + 1, samplecnt, 48000, 2, 1,
+	             data, 1.0f, sender);
+	}
+}
+
+/*
+=====================
+CL_ParseVoip
+
+A VoIP message has been received from the server
+=====================
+*/
+static
+void CL_ParseVoip ( msg_t *msg, qboolean ignoreData ) {
+	static short decoded[VOIP_MAX_PACKET_SAMPLES*4]; // !!! FIXME: don't hard code
+
+	const int sender = MSG_ReadShort(msg);
+	const int generation = MSG_ReadByte(msg);
+	const int sequence = MSG_ReadLong(msg);
+	const int frames = MSG_ReadByte(msg);
+	const int packetsize = MSG_ReadShort(msg);
+	const int flags = MSG_ReadBits(msg, VOIP_FLAGCNT);
+	unsigned char encoded[4000];
+	int	numSamples;
+	int seqdiff;
+	int written = 0;
+	int i;
+
+	Com_DPrintf("VoIP: %d-byte packet from client %d\n", packetsize, sender);
+
+	if (sender < 0)
+		return;   // short/invalid packet, bail.
+	else if (generation < 0)
+		return;   // short/invalid packet, bail.
+	else if (sequence < 0)
+		return;   // short/invalid packet, bail.
+	else if (frames < 0)
+		return;   // short/invalid packet, bail.
+	else if (packetsize < 0)
+		return;   // short/invalid packet, bail.
+
+	if (packetsize > sizeof (encoded)) {  // overlarge packet?
+		int bytesleft = packetsize;
+		while (bytesleft) {
+			int br = bytesleft;
+			if (br > sizeof (encoded))
+				br = sizeof (encoded);
+			MSG_ReadData(msg, encoded, br);
+			bytesleft -= br;
+		}
+		return;   // overlarge packet, bail.
+	}
+
+	MSG_ReadData(msg, encoded, packetsize);
+
+	if (ignoreData) {
+		return; // just ignore legacy speex voip data
+	} else if (!clc.voipCodecInitialized) {
+		return;   // can't handle VoIP without libopus!
+	} else if (sender >= MAX_CLIENTS) {
+		return;   // bogus sender.
+	} else if (CL_ShouldIgnoreVoipSender(sender)) {
+		return;   // Channel is muted, bail.
+	}
+
+	// !!! FIXME: make sure data is narrowband? Does decoder handle this?
+
+	Com_DPrintf("VoIP: packet accepted!\n");
+
+	seqdiff = sequence - clc.voipIncomingSequence[sender];
+
+	// This is a new "generation" ... a new recording started, reset the bits.
+	if (generation != clc.voipIncomingGeneration[sender]) {
+		Com_DPrintf("VoIP: new generation %d!\n", generation);
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		clc.voipIncomingGeneration[sender] = generation;
+		seqdiff = 0;
+	} else if (seqdiff < 0) {   // we're ahead of the sequence?!
+		// This shouldn't happen unless the packet is corrupted or something.
+		Com_DPrintf("VoIP: misordered sequence! %d < %d!\n",
+		            sequence, clc.voipIncomingSequence[sender]);
+		// reset the decoder just in case.
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		seqdiff = 0;
+	} else if (seqdiff * VOIP_MAX_PACKET_SAMPLES*2 >= sizeof (decoded)) { // dropped more than we can handle?
+		// just start over.
+		Com_DPrintf("VoIP: Dropped way too many (%d) frames from client #%d\n",
+		            seqdiff, sender);
+		opus_decoder_ctl(clc.opusDecoder[sender], OPUS_RESET_STATE);
+		seqdiff = 0;
+	}
+
+	if (seqdiff != 0) {
+		Com_DPrintf("VoIP: Dropped %d frames from client #%d\n",
+		            seqdiff, sender);
+		// tell opus that we're missing frames...
+		for (i = 0; i < seqdiff; i++) {
+			assert((written + VOIP_MAX_PACKET_SAMPLES) * 2 < sizeof (decoded));
+			numSamples = opus_decode(clc.opusDecoder[sender], NULL, 0, decoded + written, VOIP_MAX_PACKET_SAMPLES, 0);
+			if ( numSamples <= 0 ) {
+				Com_DPrintf("VoIP: Error decoding frame %d from client #%d\n", i, sender);
+				continue;
+			}
+			written += numSamples;
+		}
+	}
+
+	numSamples = opus_decode(clc.opusDecoder[sender], encoded, packetsize, decoded + written, ARRAY_LEN(decoded) - written, 0);
+
+	if ( numSamples <= 0 ) {
+		Com_DPrintf("VoIP: Error decoding voip data from client #%d\n", sender);
+		numSamples = 0;
+	}
+
+	#if 0
+	static FILE *encio = NULL;
+	if (encio == NULL) encio = fopen("voip-incoming-encoded.bin", "wb");
+	if (encio != NULL) { fwrite(encoded, packetsize, 1, encio); fflush(encio); }
+	static FILE *decio = NULL;
+	if (decio == NULL) decio = fopen("voip-incoming-decoded.bin", "wb");
+	if (decio != NULL) { fwrite(decoded+written, numSamples*2, 1, decio); fflush(decio); }
+	#endif
+
+	written += numSamples;
+
+	Com_DPrintf("VoIP: playback %d bytes, %d samples, %d frames\n",
+	            written * 2, written, frames);
+
+	if(written > 0)
+		CL_PlayVoip(sender, written, (const byte *) decoded, flags);
+
+	clc.voipIncomingSequence[sender] = sequence + frames;
+}
+#endif
+
+
 /*
 =====================
 CL_ParseCommandString
@@ -932,8 +1125,16 @@ void CL_ParseServerMessage( msg_t *msg ) {
 			}
 			CL_ParseCGMessage( msg );
 			break;
+		case svc_voipSpeex:
+#ifdef USE_VOIP
+			CL_ParseVoip( msg, qtrue );
+#endif
+			break;
+		case svc_voipOpus:
+#ifdef USE_VOIP
+			CL_ParseVoip( msg, !clc.voipEnabled );
+#endif
+			break;
 		}
 	}
 }
-
-
diff --git a/code/client/cl_scrn.cpp b/code/client/cl_scrn.cpp
index 0f97ef05..a14769a1 100644
--- a/code/client/cl_scrn.cpp
+++ b/code/client/cl_scrn.cpp
@@ -343,7 +343,7 @@ void SCR_DrawDemoRecording( void ) {
 	}
 
 	pos = FS_FTell( clc.demofile );
-	sprintf( string, "RECORDING %s: %ik", clc.demoName, pos / 1024 );
+	Com_sprintf( string, sizeof( string ), "RECORDING %s: %ik", clc.demoName, pos / 1024 );
 
 	SCR_DrawStringExt( 320 - strlen( string ) * 4, 20, 8, string, g_color_table[7], qtrue, qfalse );
 }
@@ -520,16 +520,18 @@ text to the screen.
 ==================
 */
 void SCR_UpdateScreen( void ) {
-	static int	recursive;
+	static qboolean screen_recursive;
 
 	if ( !scr_initialized ) {
 		return;				// not initialized yet
 	}
 
-	if ( ++recursive > 2 ) {
-		Com_Error( ERR_FATAL, "SCR_UpdateScreen: recursively called" );
+	if (screen_recursive) {
+		// already called
+		return;
 	}
-	recursive = 1;
+
+	screen_recursive = qtrue;
 	
 	CL_StartHunkUsers(qfalse);
 	SCR_SimpleUpdateScreen();
@@ -553,6 +555,6 @@ void SCR_UpdateScreen( void ) {
 		}
 	}
 
-	recursive = 0;
+	screen_recursive = qfalse;
 }
 
diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index c061dca6..e8cef7f9 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -1,21 +1,21 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -29,159 +29,167 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_version.h"
 
 #include "cl_ui.h"
+#include "cl_uigamespy.h"
 
 #include <ctime>
 
 typedef struct {
-	float fadetime;
-	float starttime;
-	float endtime;
-	float alpha_start;
-	float alpha_end;
-	UIReggedMaterial *material;
+    float             fadetime;
+    float             starttime;
+    float             endtime;
+    float             alpha_start;
+    float             alpha_end;
+    UIReggedMaterial *material;
 } intro_stage_t;
 
-static qboolean ui_hud;
-static class UIFont *globalFont;
-static UIFloatingConsole *fakk_console;
+static qboolean             ui_hud;
+static class UIFont        *globalFont;
+static UIFloatingConsole   *fakk_console;
 static UIFloatingDMConsole *dm_console;
-static UIFloatingConsole *developer_console;
-static FakkMiniconsole *mini_console;
-static UIGMBox *gmbox;
-static UIDMBox *dmbox;
-static View3D *view3d;
-static Menu *mainmenu;
-static Menu *hud_weapons;
-static Menu *hud_items;
-static Menu *hud_health;
-static Menu *hud_ammo;
-static Menu *hud_compass;
-static Menu *hud_boss;
-static Menu *crosshairhud;
-static Menu *missionLog;
-qboolean server_loading;
-static qboolean server_loading_waiting;
-static str *s_intermediateconsole;
-static int ui_lastWeapHudState_Owned;
-static int ui_lastWeapHudState_Equipped = 0xFFFF;
-static int ui_weapHudTime;
-static int ui_itemHudTime;
-Menu *ui_pLoadingMenu;
-static Menu *ui_pConnectingMenu;
+static UIFloatingConsole   *developer_console;
+static FakkMiniconsole     *mini_console;
+static UIGMBox             *gmbox;
+static UIDMBox             *dmbox;
+static View3D              *view3d;
+static Menu                *mainmenu;
+static Menu                *hud_weapons;
+static Menu                *hud_items;
+static Menu                *hud_health;
+static Menu                *hud_ammo;
+static Menu                *hud_compass;
+static Menu                *hud_boss;
+static Menu                *crosshairhud;
+static Menu                *missionLog;
+qboolean                    server_loading;
+static qboolean             server_loading_waiting;
+static str                 *s_intermediateconsole;
+static int                  ui_lastWeapHudState_Owned;
+static int                  ui_lastWeapHudState_Equipped = 0xFFFF;
+static int                  ui_weapHudTime;
+static int                  ui_itemHudTime;
+Menu                       *ui_pLoadingMenu;
+static Menu                *ui_pConnectingMenu;
 
 static_media_t ui_static_materials;
-cvar_t *cl_greenfps;
-cvar_t *ui_GunneryEvaluation;
-cvar_t *ui_GroinShots;
-cvar_t *ui_RightArmShots;
-cvar_t *ui_LeftArmShots;
-cvar_t *ui_RightLegShots;
-cvar_t *ui_LeftLegShots;
-cvar_t *ui_TorsoShots;
-cvar_t *ui_HeadShots;
-cvar_t *ui_NumEnemysKilled;
-cvar_t *ui_NumObjectsDestroyed;
-cvar_t *ui_NumHitsTaken;
-cvar_t *ui_PreferredWeapon;
-cvar_t *ui_Accuracy;
-cvar_t *ui_NumObjectives;
-cvar_t *ui_NumComplete;
-cvar_t *ui_NumHits;
-cvar_t *ui_NumShotsFired;
-cvar_t *ui_gotmedal;
-cvar_t *ui_success;
-cvar_t *ui_failed;
-cvar_t *ui_returnmenu;
-cvar_t *ui_skip_eamovie;
-cvar_t *ui_skip_titlescreen;
-cvar_t *ui_skip_legalscreen;
-cvar_t *ui_titlescreen_fadein;
-cvar_t *ui_titlescreen_fadeout;
-cvar_t *ui_titlescreen_stay;
-cvar_t *ui_legalscreen_fadein;
-cvar_t *ui_legalscreen_fadeout;
-cvar_t *ui_legalscreen_stay;
-cvar_t *ui_drawcoords;
-cvar_t *ui_minicon;
-cvar_t *ui_gmbox;
-cvar_t *ui_consoleposition;
-cvar_t *ui_inventoryfile;
-cvar_t *ui_console;
-cvar_t *ui_newvidmode;
-cvar_t *ui_crosshair;
-cvar_t *ui_compass;
-cvar_t *ui_weaponsbar;
-cvar_t *ui_weaponsbartime;
-cvar_t *ui_itemsbar;
-cvar_t *ui_health_start;
-cvar_t *ui_health_end;
-cvar_t *ui_gmboxspam;
-cvar_t *ui_debugload;
-cvar_t *sound_overlay;
-cvar_t *ui_compass_scale;
+cvar_t        *cl_greenfps;
+cvar_t        *ui_GunneryEvaluation;
+cvar_t        *ui_GroinShots;
+cvar_t        *ui_RightArmShots;
+cvar_t        *ui_LeftArmShots;
+cvar_t        *ui_RightLegShots;
+cvar_t        *ui_LeftLegShots;
+cvar_t        *ui_TorsoShots;
+cvar_t        *ui_HeadShots;
+cvar_t        *ui_NumEnemysKilled;
+cvar_t        *ui_NumObjectsDestroyed;
+cvar_t        *ui_NumHitsTaken;
+cvar_t        *ui_PreferredWeapon;
+cvar_t        *ui_Accuracy;
+cvar_t        *ui_NumObjectives;
+cvar_t        *ui_NumComplete;
+cvar_t        *ui_NumHits;
+cvar_t        *ui_NumShotsFired;
+cvar_t        *ui_gotmedal;
+cvar_t        *ui_success;
+cvar_t        *ui_failed;
+cvar_t        *ui_returnmenu;
+cvar_t        *ui_skip_eamovie;
+cvar_t        *ui_skip_titlescreen;
+cvar_t        *ui_skip_legalscreen;
+cvar_t        *ui_titlescreen_fadein;
+cvar_t        *ui_titlescreen_fadeout;
+cvar_t        *ui_titlescreen_stay;
+cvar_t        *ui_legalscreen_fadein;
+cvar_t        *ui_legalscreen_fadeout;
+cvar_t        *ui_legalscreen_stay;
+cvar_t        *ui_drawcoords;
+cvar_t        *ui_minicon;
+cvar_t        *ui_gmbox;
+cvar_t        *ui_consoleposition;
+cvar_t        *ui_inventoryfile;
+cvar_t        *ui_console;
+cvar_t        *ui_newvidmode;
+cvar_t        *ui_crosshair;
+cvar_t        *ui_compass;
+cvar_t        *ui_weaponsbar;
+cvar_t        *ui_weaponsbartime;
+cvar_t        *ui_itemsbar;
+cvar_t        *ui_health_start;
+cvar_t        *ui_health_end;
+cvar_t        *ui_gmboxspam;
+cvar_t        *ui_debugload;
+cvar_t        *sound_overlay;
+cvar_t        *ui_compass_scale;
 
 static intro_stage_t intro_stage;
-static char server_mapname[ 64 ];
-static UIListCtrl *scoreboardlist;
-static Menu *scoreboard_menu;
-static float scoreboard_x;
-static float scoreboard_y;
-static float scoreboard_w;
-static float scoreboard_h;
-static qboolean scoreboard_header;
-cvar_t *cl_playintro;
-cvar_t *cl_movieaudio;
-static unsigned int startCountLow;
-static unsigned int startCountHigh;
-static unsigned int loadCountLow;
-static unsigned int loadCountHigh;
-static unsigned int loadCount;
-static unsigned int lastTime;
-static unsigned int loadNumber;
-static unsigned int totalLoadTime;
-static unsigned int currentLoadTime;
-unsigned char UIListCtrlItem[ 8 ];
+static char          server_mapname[64];
+static UIListCtrl   *scoreboardlist;
+static Menu         *scoreboard_menu;
+static float         scoreboard_x;
+static float         scoreboard_y;
+static float         scoreboard_w;
+static float         scoreboard_h;
+static qboolean      scoreboard_header;
+cvar_t              *cl_playintro;
+cvar_t              *cl_movieaudio;
+static unsigned int  startCountLow;
+static unsigned int  startCountHigh;
+static unsigned int  loadCountLow;
+static unsigned int  loadCountHigh;
+static unsigned int  loadCount;
+static unsigned int  lastTime   = 0;
+static unsigned int  updateTime = 0;
+static unsigned int  loadNumber;
+static unsigned int  totalLoadTime;
+static unsigned int  currentLoadTime;
+unsigned char        UIListCtrlItem[8];
 
-inventory_t client_inv;
-bind_t client_bind;
-static str scoreboard_menuname;
-static str ui_sCurrentLoadingMenu;
+static const float maxWidthRes  = 1920;
+static const float maxHeightRes = 1080;
+
+inventory_t              client_inv;
+bind_t                   client_bind;
+static str               scoreboard_menuname;
+static str               ui_sCurrentLoadingMenu;
 static Container<Menu *> hudList;
 
+const UColor UWhiteChatMessageColor(0.75, 0.75, 0.75);
+const UColor URedChatMessageColor(1.0, 0.25, 0.25);
+const UColor UGreenChatMessageColor(0.0, 1.0, 0.25, 1.0);
+
 void UI_MultiplayerMenuWidgetsUpdate(void);
+void UI_MultiplayerMainMenuWidgetsUpdate(void);
 void UI_MainMenuWidgetsUpdate(void);
 
 static UIRect2D getDefaultGMBoxRectangle(void);
 static UIRect2D getDefaultDMBoxRectangle(void);
 
-class ConsoleHider : public Listener {
+class ConsoleHider : public Listener
+{
 public:
-	CLASS_PROTOTYPE( ConsoleHider );
+    CLASS_PROTOTYPE(ConsoleHider);
 
-	void	HideConsole( Event *ev );
-	void	DeadConsole( Event *ev );
+    void HideConsole(Event *ev);
+    void DeadConsole(Event *ev);
 };
 
-
-CLASS_DECLARATION( Listener, ConsoleHider, NULL )
-{
-	{ &UIFloatingWindow::W_ClosePressed,	&ConsoleHider::HideConsole },
-	{ &W_Destroyed,							&ConsoleHider::DeadConsole },
-	{ NULL, NULL }
+CLASS_DECLARATION(Listener, ConsoleHider, NULL) {
+    {&UIFloatingWindow::W_ClosePressed, &ConsoleHider::HideConsole},
+    {&W_Destroyed,                      &ConsoleHider::DeadConsole},
+    {NULL,                              NULL                      }
 };
 
-void ConsoleHider::HideConsole( Event *ev )
+void ConsoleHider::HideConsole(Event *ev)
 {
-	UI_CloseConsole();
+    UI_CloseConsole();
 }
 
-void ConsoleHider::DeadConsole( Event *ev )
+void ConsoleHider::DeadConsole(Event *ev)
 {
-	if( fakk_console && !fakk_console->IsDying() )
-	{
-		delete fakk_console;
-		fakk_console = NULL;
-	}
+    if (fakk_console && !fakk_console->IsDying()) {
+        delete fakk_console;
+        fakk_console = NULL;
+    }
 }
 
 static ConsoleHider s_consolehider;
@@ -191,8 +199,9 @@ static ConsoleHider s_consolehider;
 ConsoleCommandHandler
 ====================
 */
-static void ConsoleCommandHandler( const char *txt ) {
-	Cbuf_AddText( txt );
+static void ConsoleCommandHandler(const char *txt)
+{
+    Cbuf_AddText(txt);
 }
 
 /*
@@ -200,61 +209,58 @@ static void ConsoleCommandHandler( const char *txt ) {
 getDefaultConsoleRectangle
 ====================
 */
-static UIRect2D getDefaultConsoleRectangle( void ) {
-	float f[ 4 ];
-	int i;
-	UIRect2D rect;
+static UIRect2D getDefaultConsoleRectangle(void)
+{
+    float    f[4];
+    int      i;
+    UIRect2D rect;
 
-	if( sscanf( ui_consoleposition->string, "%f %f %f %f", &f[ 0 ], &f[ 1 ], &f[ 2 ], &f[ 3 ] ) == 4 )
-	{
-		for( i = 0; i < 4; i++ ) {
-			f[ i ] = floor( f[ i ] );
-		}
+    if (sscanf(ui_consoleposition->string, "%f %f %f %f", &f[0], &f[1], &f[2], &f[3]) == 4) {
+        for (i = 0; i < 4; i++) {
+            f[i] = floor(f[i]);
+        }
 
-		rect.pos.x = f[ 0 ] - cls.glconfig.vidWidth;
-		rect.pos.y = f[ 1 ] - cls.glconfig.vidHeight;
-		rect.size.width = f[ 2 ] + 50.0;
-		rect.size.height = f[ 3 ] + 50.0;
-	}
-	else
-	{
-		rect.pos.x = 25.0;
-		rect.pos.y = 25.0;
-		rect.size.width = ( cls.glconfig.vidWidth - 50 );
-		rect.size.height = ( cls.glconfig.vidHeight / 2 );
-	}
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
+        rect.size.width  = f[2] + 50.0;
+        rect.size.height = f[3] + 50.0;
+    } else {
+        rect.pos.x       = 25.0;
+        rect.pos.y       = 25.0;
+        rect.size.width  = (uid.vidWidth - 50);
+        rect.size.height = (uid.vidHeight / 2);
+    }
 
-	return rect;
+    return rect;
 }
 
-class DMConsoleHider : public Listener {
+class DMConsoleHider : public Listener
+{
 public:
-	CLASS_PROTOTYPE( DMConsoleHider );
+    CLASS_PROTOTYPE(DMConsoleHider);
 
-	void		HideDMConsole( Event *ev );
-	void		DeadDMConsole( Event *ev );
+    void HideDMConsole(Event *ev);
+    void DeadDMConsole(Event *ev);
 };
 
-CLASS_DECLARATION( Listener, DMConsoleHider, NULL )
-{
-	{ &UIFloatingWindow::W_ClosePressed,	&DMConsoleHider::HideDMConsole },
-	{ &W_Deactivated,						&DMConsoleHider::HideDMConsole },
-	{ &W_Destroyed,							&DMConsoleHider::DeadDMConsole },
-	{ NULL, NULL }
+CLASS_DECLARATION(Listener, DMConsoleHider, NULL) {
+    {&UIFloatingWindow::W_ClosePressed, &DMConsoleHider::HideDMConsole},
+    {&W_Deactivated,                    &DMConsoleHider::HideDMConsole},
+    {&W_Destroyed,                      &DMConsoleHider::DeadDMConsole},
+    {NULL,                              NULL                          }
 };
 
-void DMConsoleHider::HideDMConsole( Event *ev )
+void DMConsoleHider::HideDMConsole(Event *ev)
 {
-	UI_CloseDMConsole();
+    UI_CloseDMConsole();
 }
 
-void DMConsoleHider::DeadDMConsole( Event *ev )
+void DMConsoleHider::DeadDMConsole(Event *ev)
 {
-	if( dm_console && !dm_console->IsDying() )
-	{
-		delete dm_console;
-		dm_console = NULL;
-	}
+    if (dm_console && !dm_console->IsDying()) {
+        delete dm_console;
+        dm_console = NULL;
+    }
 }
 
 static DMConsoleHider s_dmconsolehider;
@@ -264,13 +270,14 @@ static DMConsoleHider s_dmconsolehider;
 GetClientState
 ====================
 */
-static void GetClientState( uiClientState_t *state ) {
-	state->connectPacketCount = clc.connectPacketCount;
-	state->connState = clc.state;
-	Q_strncpyz( state->servername, cls.servername, sizeof( state->servername ) );
-	Q_strncpyz( state->updateInfoString, cls.updateInfoString, sizeof( state->updateInfoString ) );
-	Q_strncpyz( state->messageString, clc.serverMessage, sizeof( state->messageString ) );
-	state->clientNum = cl.snap.ps.clientNum;
+static void GetClientState(uiClientState_t *state)
+{
+    state->connectPacketCount = clc.connectPacketCount;
+    state->connState          = clc.state;
+    Q_strncpyz(state->servername, clc.servername, sizeof(state->servername));
+    Q_strncpyz(state->updateInfoString, cls.updateInfoString, sizeof(state->updateInfoString));
+    Q_strncpyz(state->messageString, clc.serverMessage, sizeof(state->messageString));
+    state->clientNum = cl.snap.ps.clientNum;
 }
 
 /*
@@ -278,26 +285,27 @@ static void GetClientState( uiClientState_t *state ) {
 LAN_LoadCachedServers
 ====================
 */
-void LAN_LoadCachedServers( void ) {
-	int size;
-	fileHandle_t fileIn;
-	cls.numglobalservers = cls.nummplayerservers = cls.numfavoriteservers = 0;
-	cls.numGlobalServerAddresses = 0;
-	if (FS_SV_FOpenFileRead("servercache.dat", &fileIn)) {
-		FS_Read(&cls.numglobalservers, sizeof(int), fileIn);
-		FS_Read(&cls.nummplayerservers, sizeof(int), fileIn);
-		FS_Read(&cls.numfavoriteservers, sizeof(int), fileIn);
-		FS_Read(&size, sizeof(int), fileIn);
-		if (size == sizeof(cls.globalServers) + sizeof(cls.favoriteServers) + sizeof(cls.mplayerServers)) {
-			FS_Read(&cls.globalServers, sizeof(cls.globalServers), fileIn);
-			FS_Read(&cls.mplayerServers, sizeof(cls.mplayerServers), fileIn);
-			FS_Read(&cls.favoriteServers, sizeof(cls.favoriteServers), fileIn);
-		} else {
-			cls.numglobalservers = cls.nummplayerservers = cls.numfavoriteservers = 0;
-			cls.numGlobalServerAddresses = 0;
-		}
-		FS_FCloseFile(fileIn);
-	}
+void LAN_LoadCachedServers(void)
+{
+    int          size;
+    fileHandle_t fileIn;
+    cls.numglobalservers = cls.nummplayerservers = cls.numfavoriteservers = 0;
+    cls.numGlobalServerAddresses                                          = 0;
+    if (FS_SV_FOpenFileRead("servercache.dat", &fileIn)) {
+        FS_Read(&cls.numglobalservers, sizeof(int), fileIn);
+        FS_Read(&cls.nummplayerservers, sizeof(int), fileIn);
+        FS_Read(&cls.numfavoriteservers, sizeof(int), fileIn);
+        FS_Read(&size, sizeof(int), fileIn);
+        if (size == sizeof(cls.globalServers) + sizeof(cls.favoriteServers) + sizeof(cls.mplayerServers)) {
+            FS_Read(&cls.globalServers, sizeof(cls.globalServers), fileIn);
+            FS_Read(&cls.mplayerServers, sizeof(cls.mplayerServers), fileIn);
+            FS_Read(&cls.favoriteServers, sizeof(cls.favoriteServers), fileIn);
+        } else {
+            cls.numglobalservers = cls.nummplayerservers = cls.numfavoriteservers = 0;
+            cls.numGlobalServerAddresses                                          = 0;
+        }
+        FS_FCloseFile(fileIn);
+    }
 }
 
 /*
@@ -305,54 +313,55 @@ void LAN_LoadCachedServers( void ) {
 LAN_SaveServersToCache
 ====================
 */
-void LAN_SaveServersToCache( void ) {
-	int size;
-	fileHandle_t fileOut = FS_SV_FOpenFileWrite("servercache.dat");
-	FS_Write(&cls.numglobalservers, sizeof(int), fileOut);
-	FS_Write(&cls.nummplayerservers, sizeof(int), fileOut);
-	FS_Write(&cls.numfavoriteservers, sizeof(int), fileOut);
-	size = sizeof(cls.globalServers) + sizeof(cls.favoriteServers) + sizeof(cls.mplayerServers);
-	FS_Write(&size, sizeof(int), fileOut);
-	FS_Write(&cls.globalServers, sizeof(cls.globalServers), fileOut);
-	FS_Write(&cls.mplayerServers, sizeof(cls.mplayerServers), fileOut);
-	FS_Write(&cls.favoriteServers, sizeof(cls.favoriteServers), fileOut);
-	FS_FCloseFile(fileOut);
+void LAN_SaveServersToCache(void)
+{
+    int          size;
+    fileHandle_t fileOut = FS_SV_FOpenFileWrite("servercache.dat");
+    FS_Write(&cls.numglobalservers, sizeof(int), fileOut);
+    FS_Write(&cls.nummplayerservers, sizeof(int), fileOut);
+    FS_Write(&cls.numfavoriteservers, sizeof(int), fileOut);
+    size = sizeof(cls.globalServers) + sizeof(cls.favoriteServers) + sizeof(cls.mplayerServers);
+    FS_Write(&size, sizeof(int), fileOut);
+    FS_Write(&cls.globalServers, sizeof(cls.globalServers), fileOut);
+    FS_Write(&cls.mplayerServers, sizeof(cls.mplayerServers), fileOut);
+    FS_Write(&cls.favoriteServers, sizeof(cls.favoriteServers), fileOut);
+    FS_FCloseFile(fileOut);
 }
 
-
 /*
 ====================
 LAN_ResetPings
 ====================
 */
-static void LAN_ResetPings(int source) {
-	int count,i;
-	serverInfo_t *servers = NULL;
-	count = 0;
+static void LAN_ResetPings(int source)
+{
+    int           count, i;
+    serverInfo_t *servers = NULL;
+    count                 = 0;
 
-	switch (source) {
-		case AS_LOCAL :
-			servers = &cls.localServers[0];
-			count = MAX_OTHER_SERVERS;
-			break;
-		case AS_MPLAYER :
-			servers = &cls.mplayerServers[0];
-			count = MAX_OTHER_SERVERS;
-			break;
-		case AS_GLOBAL :
-			servers = &cls.globalServers[0];
-			count = MAX_GLOBAL_SERVERS;
-			break;
-		case AS_FAVORITES :
-			servers = &cls.favoriteServers[0];
-			count = MAX_OTHER_SERVERS;
-			break;
-	}
-	if (servers) {
-		for (i = 0; i < count; i++) {
-			servers[i].ping = -1;
-		}
-	}
+    switch (source) {
+    case AS_LOCAL:
+        servers = &cls.localServers[0];
+        count   = MAX_OTHER_SERVERS;
+        break;
+    case AS_MPLAYER:
+        servers = &cls.mplayerServers[0];
+        count   = MAX_OTHER_SERVERS;
+        break;
+    case AS_GLOBAL:
+        servers = &cls.globalServers[0];
+        count   = MAX_GLOBAL_SERVERS;
+        break;
+    case AS_FAVORITES:
+        servers = &cls.favoriteServers[0];
+        count   = MAX_OTHER_SERVERS;
+        break;
+    }
+    if (servers) {
+        for (i = 0; i < count; i++) {
+            servers[i].ping = -1;
+        }
+    }
 }
 
 /*
@@ -360,49 +369,50 @@ static void LAN_ResetPings(int source) {
 LAN_AddServer
 ====================
 */
-static int LAN_AddServer(int source, const char *name, const char *address) {
-	int max, *count, i;
-	netadr_t adr;
-	serverInfo_t *servers = NULL;
-	max = MAX_OTHER_SERVERS;
-	count = NULL;
+static int LAN_AddServer(int source, const char *name, const char *address)
+{
+    int           max, *count, i;
+    netadr_t      adr;
+    serverInfo_t *servers = NULL;
+    max                   = MAX_OTHER_SERVERS;
+    count                 = NULL;
 
-	switch (source) {
-		case AS_LOCAL :
-			count = &cls.numlocalservers;
-			servers = &cls.localServers[0];
-			break;
-		case AS_MPLAYER :
-			count = &cls.nummplayerservers;
-			servers = &cls.mplayerServers[0];
-			break;
-		case AS_GLOBAL :
-			max = MAX_GLOBAL_SERVERS;
-			count = &cls.numglobalservers;
-			servers = &cls.globalServers[0];
-			break;
-		case AS_FAVORITES :
-			count = &cls.numfavoriteservers;
-			servers = &cls.favoriteServers[0];
-			break;
-	}
-	if (servers && *count < max) {
-		NET_StringToAdr( address, &adr, NA_IP );
-		for ( i = 0; i < *count; i++ ) {
-			if (NET_CompareAdr(servers[i].adr, adr)) {
-				break;
-			}
-		}
-		if (i >= *count) {
-			servers[*count].adr = adr;
-			Q_strncpyz(servers[*count].hostName, name, sizeof(servers[*count].hostName));
-			servers[*count].visible = qtrue;
-			(*count)++;
-			return 1;
-		}
-		return 0;
-	}
-	return -1;
+    switch (source) {
+    case AS_LOCAL:
+        count   = &cls.numlocalservers;
+        servers = &cls.localServers[0];
+        break;
+    case AS_MPLAYER:
+        count   = &cls.nummplayerservers;
+        servers = &cls.mplayerServers[0];
+        break;
+    case AS_GLOBAL:
+        max     = MAX_GLOBAL_SERVERS;
+        count   = &cls.numglobalservers;
+        servers = &cls.globalServers[0];
+        break;
+    case AS_FAVORITES:
+        count   = &cls.numfavoriteservers;
+        servers = &cls.favoriteServers[0];
+        break;
+    }
+    if (servers && *count < max) {
+        NET_StringToAdr(address, &adr, NA_IP);
+        for (i = 0; i < *count; i++) {
+            if (NET_CompareAdr(servers[i].adr, adr)) {
+                break;
+            }
+        }
+        if (i >= *count) {
+            servers[*count].adr = adr;
+            Q_strncpyz(servers[*count].hostName, name, sizeof(servers[*count].hostName));
+            servers[*count].visible = qtrue;
+            (*count)++;
+            return 1;
+        }
+        return 0;
+    }
+    return -1;
 }
 
 /*
@@ -410,67 +420,68 @@ static int LAN_AddServer(int source, const char *name, const char *address) {
 LAN_RemoveServer
 ====================
 */
-static void LAN_RemoveServer(int source, const char *addr) {
-	int *count, i;
-	serverInfo_t *servers = NULL;
-	count = NULL;
-	switch (source) {
-		case AS_LOCAL :
-			count = &cls.numlocalservers;
-			servers = &cls.localServers[0];
-			break;
-		case AS_MPLAYER :
-			count = &cls.nummplayerservers;
-			servers = &cls.mplayerServers[0];
-			break;
-		case AS_GLOBAL :
-			count = &cls.numglobalservers;
-			servers = &cls.globalServers[0];
-			break;
-		case AS_FAVORITES :
-			count = &cls.numfavoriteservers;
-			servers = &cls.favoriteServers[0];
-			break;
-	}
-	if (servers) {
-		netadr_t comp;
-		NET_StringToAdr( addr, &comp, NA_IP );
-		for (i = 0; i < *count; i++) {
-			if (NET_CompareAdr( comp, servers[i].adr)) {
-				int j = i;
-				while (j < *count - 1) {
-					Com_Memcpy(&servers[j], &servers[j+1], sizeof(servers[j]));
-					j++;
-				}
-				(*count)--;
-				break;
-			}
-		}
-	}
+static void LAN_RemoveServer(int source, const char *addr)
+{
+    int          *count, i;
+    serverInfo_t *servers = NULL;
+    count                 = NULL;
+    switch (source) {
+    case AS_LOCAL:
+        count   = &cls.numlocalservers;
+        servers = &cls.localServers[0];
+        break;
+    case AS_MPLAYER:
+        count   = &cls.nummplayerservers;
+        servers = &cls.mplayerServers[0];
+        break;
+    case AS_GLOBAL:
+        count   = &cls.numglobalservers;
+        servers = &cls.globalServers[0];
+        break;
+    case AS_FAVORITES:
+        count   = &cls.numfavoriteservers;
+        servers = &cls.favoriteServers[0];
+        break;
+    }
+    if (servers) {
+        netadr_t comp;
+        NET_StringToAdr(addr, &comp, NA_IP);
+        for (i = 0; i < *count; i++) {
+            if (NET_CompareAdr(comp, servers[i].adr)) {
+                int j = i;
+                while (j < *count - 1) {
+                    Com_Memcpy(&servers[j], &servers[j + 1], sizeof(servers[j]));
+                    j++;
+                }
+                (*count)--;
+                break;
+            }
+        }
+    }
 }
 
-
 /*
 ====================
 LAN_GetServerCount
 ====================
 */
-static int LAN_GetServerCount( int source ) {
-	switch (source) {
-		case AS_LOCAL :
-			return cls.numlocalservers;
-			break;
-		case AS_MPLAYER :
-			return cls.nummplayerservers;
-			break;
-		case AS_GLOBAL :
-			return cls.numglobalservers;
-			break;
-		case AS_FAVORITES :
-			return cls.numfavoriteservers;
-			break;
-	}
-	return 0;
+static int LAN_GetServerCount(int source)
+{
+    switch (source) {
+    case AS_LOCAL:
+        return cls.numlocalservers;
+        break;
+    case AS_MPLAYER:
+        return cls.nummplayerservers;
+        break;
+    case AS_GLOBAL:
+        return cls.numglobalservers;
+        break;
+    case AS_FAVORITES:
+        return cls.numfavoriteservers;
+        break;
+    }
+    return 0;
 }
 
 /*
@@ -478,34 +489,35 @@ static int LAN_GetServerCount( int source ) {
 LAN_GetLocalServerAddressString
 ====================
 */
-static void LAN_GetServerAddressString( int source, int n, char *buf, int buflen ) {
-	switch (source) {
-		case AS_LOCAL :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				Q_strncpyz(buf, NET_AdrToString( cls.localServers[n].adr) , buflen );
-				return;
-			}
-			break;
-		case AS_MPLAYER :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				Q_strncpyz(buf, NET_AdrToString( cls.mplayerServers[n].adr) , buflen );
-				return;
-			}
-			break;
-		case AS_GLOBAL :
-			if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-				Q_strncpyz(buf, NET_AdrToString( cls.globalServers[n].adr) , buflen );
-				return;
-			}
-			break;
-		case AS_FAVORITES :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				Q_strncpyz(buf, NET_AdrToString( cls.favoriteServers[n].adr) , buflen );
-				return;
-			}
-			break;
-	}
-	buf[0] = '\0';
+static void LAN_GetServerAddressString(int source, int n, char *buf, int buflen)
+{
+    switch (source) {
+    case AS_LOCAL:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            Q_strncpyz(buf, NET_AdrToString(cls.localServers[n].adr), buflen);
+            return;
+        }
+        break;
+    case AS_MPLAYER:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            Q_strncpyz(buf, NET_AdrToString(cls.mplayerServers[n].adr), buflen);
+            return;
+        }
+        break;
+    case AS_GLOBAL:
+        if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+            Q_strncpyz(buf, NET_AdrToString(cls.globalServers[n].adr), buflen);
+            return;
+        }
+        break;
+    case AS_FAVORITES:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            Q_strncpyz(buf, NET_AdrToString(cls.favoriteServers[n].adr), buflen);
+            return;
+        }
+        break;
+    }
+    buf[0] = '\0';
 }
 
 /*
@@ -513,51 +525,52 @@ static void LAN_GetServerAddressString( int source, int n, char *buf, int buflen
 LAN_GetServerInfo
 ====================
 */
-static void LAN_GetServerInfo( int source, int n, char *buf, int buflen ) {
-	char info[MAX_STRING_CHARS];
-	serverInfo_t *server = NULL;
-	info[0] = '\0';
-	switch (source) {
-		case AS_LOCAL :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.localServers[n];
-			}
-			break;
-		case AS_MPLAYER :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.mplayerServers[n];
-			}
-			break;
-		case AS_GLOBAL :
-			if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-				server = &cls.globalServers[n];
-			}
-			break;
-		case AS_FAVORITES :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.favoriteServers[n];
-			}
-			break;
-	}
-	if (server && buf) {
-		buf[0] = '\0';
-		Info_SetValueForKey( info, "hostname", server->hostName);
-		Info_SetValueForKey( info, "mapname", server->mapName);
-		Info_SetValueForKey( info, "clients", va("%i",server->clients));
-		Info_SetValueForKey( info, "sv_maxclients", va("%i",server->maxClients));
-		Info_SetValueForKey( info, "ping", va("%i",server->ping));
-		Info_SetValueForKey( info, "minping", va("%i",server->minPing));
-		Info_SetValueForKey( info, "maxping", va("%i",server->maxPing));
-		Info_SetValueForKey( info, "game", server->game);
-		Info_SetValueForKey( info, "gametype", va("%i",server->gameType));
-		Info_SetValueForKey( info, "nettype", va("%i",server->netType));
-		Info_SetValueForKey( info, "addr", NET_AdrToString(server->adr));
-		Q_strncpyz(buf, info, buflen);
-	} else {
-		if (buf) {
-			buf[0] = '\0';
-		}
-	}
+static void LAN_GetServerInfo(int source, int n, char *buf, int buflen)
+{
+    char          info[MAX_STRING_CHARS];
+    serverInfo_t *server = NULL;
+    info[0]              = '\0';
+    switch (source) {
+    case AS_LOCAL:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.localServers[n];
+        }
+        break;
+    case AS_MPLAYER:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.mplayerServers[n];
+        }
+        break;
+    case AS_GLOBAL:
+        if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+            server = &cls.globalServers[n];
+        }
+        break;
+    case AS_FAVORITES:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.favoriteServers[n];
+        }
+        break;
+    }
+    if (server && buf) {
+        buf[0] = '\0';
+        Info_SetValueForKey(info, "hostname", server->hostName);
+        Info_SetValueForKey(info, "mapname", server->mapName);
+        Info_SetValueForKey(info, "clients", va("%i", server->clients));
+        Info_SetValueForKey(info, "sv_maxclients", va("%i", server->maxClients));
+        Info_SetValueForKey(info, "ping", va("%i", server->ping));
+        Info_SetValueForKey(info, "minping", va("%i", server->minPing));
+        Info_SetValueForKey(info, "maxping", va("%i", server->maxPing));
+        Info_SetValueForKey(info, "game", server->game);
+        Info_SetValueForKey(info, "gametype", va("%i", server->gameType));
+        Info_SetValueForKey(info, "nettype", va("%i", server->netType));
+        Info_SetValueForKey(info, "addr", NET_AdrToString(server->adr));
+        Q_strncpyz(buf, info, buflen);
+    } else {
+        if (buf) {
+            buf[0] = '\0';
+        }
+    }
 }
 
 /*
@@ -565,34 +578,35 @@ static void LAN_GetServerInfo( int source, int n, char *buf, int buflen ) {
 LAN_GetServerPing
 ====================
 */
-static int LAN_GetServerPing( int source, int n ) {
-	serverInfo_t *server = NULL;
-	switch (source) {
-		case AS_LOCAL :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.localServers[n];
-			}
-			break;
-		case AS_MPLAYER :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.mplayerServers[n];
-			}
-			break;
-		case AS_GLOBAL :
-			if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-				server = &cls.globalServers[n];
-			}
-			break;
-		case AS_FAVORITES :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				server = &cls.favoriteServers[n];
-			}
-			break;
-	}
-	if (server) {
-		return server->ping;
-	}
-	return -1;
+static int LAN_GetServerPing(int source, int n)
+{
+    serverInfo_t *server = NULL;
+    switch (source) {
+    case AS_LOCAL:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.localServers[n];
+        }
+        break;
+    case AS_MPLAYER:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.mplayerServers[n];
+        }
+        break;
+    case AS_GLOBAL:
+        if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+            server = &cls.globalServers[n];
+        }
+        break;
+    case AS_FAVORITES:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            server = &cls.favoriteServers[n];
+        }
+        break;
+    }
+    if (server) {
+        return server->ping;
+    }
+    return -1;
 }
 
 /*
@@ -600,30 +614,31 @@ static int LAN_GetServerPing( int source, int n ) {
 LAN_GetServerPtr
 ====================
 */
-static serverInfo_t *LAN_GetServerPtr( int source, int n ) {
-	switch (source) {
-		case AS_LOCAL :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return &cls.localServers[n];
-			}
-			break;
-		case AS_MPLAYER :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return &cls.mplayerServers[n];
-			}
-			break;
-		case AS_GLOBAL :
-			if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-				return &cls.globalServers[n];
-			}
-			break;
-		case AS_FAVORITES :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return &cls.favoriteServers[n];
-			}
-			break;
-	}
-	return NULL;
+static serverInfo_t *LAN_GetServerPtr(int source, int n)
+{
+    switch (source) {
+    case AS_LOCAL:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return &cls.localServers[n];
+        }
+        break;
+    case AS_MPLAYER:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return &cls.mplayerServers[n];
+        }
+        break;
+    case AS_GLOBAL:
+        if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+            return &cls.globalServers[n];
+        }
+        break;
+    case AS_FAVORITES:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return &cls.favoriteServers[n];
+        }
+        break;
+    }
+    return NULL;
 }
 
 /*
@@ -631,68 +646,65 @@ static serverInfo_t *LAN_GetServerPtr( int source, int n ) {
 LAN_CompareServers
 ====================
 */
-static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int s2 ) {
-	int res;
-	serverInfo_t *server1, *server2;
+static int LAN_CompareServers(int source, int sortKey, int sortDir, int s1, int s2)
+{
+    int           res;
+    serverInfo_t *server1, *server2;
 
-	server1 = LAN_GetServerPtr(source, s1);
-	server2 = LAN_GetServerPtr(source, s2);
-	if (!server1 || !server2) {
-		return 0;
-	}
+    server1 = LAN_GetServerPtr(source, s1);
+    server2 = LAN_GetServerPtr(source, s2);
+    if (!server1 || !server2) {
+        return 0;
+    }
 
-	res = 0;
-	switch( sortKey ) {
-		case SORT_HOST:
-			res = Q_stricmp( server1->hostName, server2->hostName );
-			break;
+    res = 0;
+    switch (sortKey) {
+    case SORT_HOST:
+        res = Q_stricmp(server1->hostName, server2->hostName);
+        break;
 
-		case SORT_MAP:
-			res = Q_stricmp( server1->mapName, server2->mapName );
-			break;
-		case SORT_CLIENTS:
-			if (server1->clients < server2->clients) {
-				res = -1;
-			}
-			else if (server1->clients > server2->clients) {
-				res = 1;
-			}
-			else {
-				res = 0;
-			}
-			break;
-		case SORT_GAME:
-			if (server1->gameType < server2->gameType) {
-				res = -1;
-			}
-			else if (server1->gameType > server2->gameType) {
-				res = 1;
-			}
-			else {
-				res = 0;
-			}
-			break;
-		case SORT_PING:
-			if (server1->ping < server2->ping) {
-				res = -1;
-			}
-			else if (server1->ping > server2->ping) {
-				res = 1;
-			}
-			else {
-				res = 0;
-			}
-			break;
-	}
+    case SORT_MAP:
+        res = Q_stricmp(server1->mapName, server2->mapName);
+        break;
+    case SORT_CLIENTS:
+        if (server1->clients < server2->clients) {
+            res = -1;
+        } else if (server1->clients > server2->clients) {
+            res = 1;
+        } else {
+            res = 0;
+        }
+        break;
+    case SORT_GAME:
+        if (server1->gameType < server2->gameType) {
+            res = -1;
+        } else if (server1->gameType > server2->gameType) {
+            res = 1;
+        } else {
+            res = 0;
+        }
+        break;
+    case SORT_PING:
+        if (server1->ping < server2->ping) {
+            res = -1;
+        } else if (server1->ping > server2->ping) {
+            res = 1;
+        } else {
+            res = 0;
+        }
+        break;
+    }
 
-	if (sortDir) {
-		if (res < 0)
-			return 1;
-		if (res > 0)
-			return -1;
-		return 0;
-	}
-	return res;
+    if (sortDir) {
+        if (res < 0) {
+            return 1;
+        }
+        if (res > 0) {
+            return -1;
+        }
+        return 0;
+    }
+    return res;
 }
 
 /*
@@ -700,8 +712,9 @@ static int LAN_CompareServers( int source, int sortKey, int sortDir, int s1, int
 LAN_GetPingQueueCount
 ====================
 */
-static int LAN_GetPingQueueCount( void ) {
-	return (CL_GetPingQueueCount());
+static int LAN_GetPingQueueCount(void)
+{
+    return (CL_GetPingQueueCount());
 }
 
 /*
@@ -709,8 +722,9 @@ static int LAN_GetPingQueueCount( void ) {
 LAN_ClearPing
 ====================
 */
-static void LAN_ClearPing( int n ) {
-	CL_ClearPing( n );
+static void LAN_ClearPing(int n)
+{
+    CL_ClearPing(n);
 }
 
 /*
@@ -718,8 +732,9 @@ static void LAN_ClearPing( int n ) {
 LAN_GetPing
 ====================
 */
-static void LAN_GetPing( int n, char *buf, int buflen, int *pingtime ) {
-	CL_GetPing( n, buf, buflen, pingtime );
+static void LAN_GetPing(int n, char *buf, int buflen, int *pingtime)
+{
+    CL_GetPing(n, buf, buflen, pingtime);
 }
 
 /*
@@ -727,8 +742,9 @@ static void LAN_GetPing( int n, char *buf, int buflen, int *pingtime ) {
 LAN_GetPingInfo
 ====================
 */
-static void LAN_GetPingInfo( int n, char *buf, int buflen ) {
-	CL_GetPingInfo( n, buf, buflen );
+static void LAN_GetPingInfo(int n, char *buf, int buflen)
+{
+    CL_GetPingInfo(n, buf, buflen);
 }
 
 /*
@@ -736,87 +752,88 @@ static void LAN_GetPingInfo( int n, char *buf, int buflen ) {
 LAN_MarkServerVisible
 ====================
 */
-static void LAN_MarkServerVisible(int source, int n, qboolean visible ) {
-	if (n == -1) {
-		int count = MAX_OTHER_SERVERS;
-		serverInfo_t *server = NULL;
-		switch (source) {
-			case AS_LOCAL :
-				server = &cls.localServers[0];
-				break;
-			case AS_MPLAYER :
-				server = &cls.mplayerServers[0];
-				break;
-			case AS_GLOBAL :
-				server = &cls.globalServers[0];
-				count = MAX_GLOBAL_SERVERS;
-				break;
-			case AS_FAVORITES :
-				server = &cls.favoriteServers[0];
-				break;
-		}
-		if (server) {
-			for (n = 0; n < count; n++) {
-				server[n].visible = visible;
-			}
-		}
+static void LAN_MarkServerVisible(int source, int n, qboolean visible)
+{
+    if (n == -1) {
+        int           count  = MAX_OTHER_SERVERS;
+        serverInfo_t *server = NULL;
+        switch (source) {
+        case AS_LOCAL:
+            server = &cls.localServers[0];
+            break;
+        case AS_MPLAYER:
+            server = &cls.mplayerServers[0];
+            break;
+        case AS_GLOBAL:
+            server = &cls.globalServers[0];
+            count  = MAX_GLOBAL_SERVERS;
+            break;
+        case AS_FAVORITES:
+            server = &cls.favoriteServers[0];
+            break;
+        }
+        if (server) {
+            for (n = 0; n < count; n++) {
+                server[n].visible = visible;
+            }
+        }
 
-	} else {
-		switch (source) {
-			case AS_LOCAL :
-				if (n >= 0 && n < MAX_OTHER_SERVERS) {
-					cls.localServers[n].visible = visible;
-				}
-				break;
-			case AS_MPLAYER :
-				if (n >= 0 && n < MAX_OTHER_SERVERS) {
-					cls.mplayerServers[n].visible = visible;
-				}
-				break;
-			case AS_GLOBAL :
-				if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-					cls.globalServers[n].visible = visible;
-				}
-				break;
-			case AS_FAVORITES :
-				if (n >= 0 && n < MAX_OTHER_SERVERS) {
-					cls.favoriteServers[n].visible = visible;
-				}
-				break;
-		}
-	}
+    } else {
+        switch (source) {
+        case AS_LOCAL:
+            if (n >= 0 && n < MAX_OTHER_SERVERS) {
+                cls.localServers[n].visible = visible;
+            }
+            break;
+        case AS_MPLAYER:
+            if (n >= 0 && n < MAX_OTHER_SERVERS) {
+                cls.mplayerServers[n].visible = visible;
+            }
+            break;
+        case AS_GLOBAL:
+            if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+                cls.globalServers[n].visible = visible;
+            }
+            break;
+        case AS_FAVORITES:
+            if (n >= 0 && n < MAX_OTHER_SERVERS) {
+                cls.favoriteServers[n].visible = visible;
+            }
+            break;
+        }
+    }
 }
 
-
 /*
 =======================
 LAN_ServerIsVisible
 =======================
 */
-static int LAN_ServerIsVisible(int source, int n ) {
-	switch (source) {
-		case AS_LOCAL :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return cls.localServers[n].visible;
-			}
-			break;
-		case AS_MPLAYER :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return cls.mplayerServers[n].visible;
-			}
-			break;
-		case AS_GLOBAL :
-			if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
-				return cls.globalServers[n].visible;
-			}
-			break;
-		case AS_FAVORITES :
-			if (n >= 0 && n < MAX_OTHER_SERVERS) {
-				return cls.favoriteServers[n].visible;
-			}
-			break;
-	}
-	return qfalse;
+static int LAN_ServerIsVisible(int source, int n)
+{
+    switch (source) {
+    case AS_LOCAL:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return cls.localServers[n].visible;
+        }
+        break;
+    case AS_MPLAYER:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return cls.mplayerServers[n].visible;
+        }
+        break;
+    case AS_GLOBAL:
+        if (n >= 0 && n < MAX_GLOBAL_SERVERS) {
+            return cls.globalServers[n].visible;
+        }
+        break;
+    case AS_FAVORITES:
+        if (n >= 0 && n < MAX_OTHER_SERVERS) {
+            return cls.favoriteServers[n].visible;
+        }
+        break;
+    }
+    return qfalse;
 }
 
 /*
@@ -824,8 +841,9 @@ static int LAN_ServerIsVisible(int source, int n ) {
 LAN_UpdateVisiblePings
 =======================
 */
-qboolean LAN_UpdateVisiblePings(int source ) {
-	return CL_UpdateVisiblePings_f(source);
+qboolean LAN_UpdateVisiblePings(int source)
+{
+    return CL_UpdateVisiblePings_f(source);
 }
 
 /*
@@ -833,8 +851,9 @@ qboolean LAN_UpdateVisiblePings(int source ) {
 LAN_GetServerStatus
 ====================
 */
-int LAN_GetServerStatus( const char *serverAddress, char *serverStatus, int maxLen ) {
-	return CL_ServerStatus( serverAddress, serverStatus, maxLen );
+int LAN_GetServerStatus(const char *serverAddress, char *serverStatus, int maxLen)
+{
+    return CL_ServerStatus(serverAddress, serverStatus, maxLen);
 }
 
 /*
@@ -842,8 +861,9 @@ int LAN_GetServerStatus( const char *serverAddress, char *serverStatus, int maxL
 CL_GetGlConfig
 ====================
 */
-static void CL_GetGlconfig( glconfig_t *config ) {
-	*config = cls.glconfig;
+static void CL_GetGlconfig(glconfig_t *config)
+{
+    *config = cls.glconfig;
 }
 
 /*
@@ -851,19 +871,20 @@ static void CL_GetGlconfig( glconfig_t *config ) {
 CL_GetClipboardData
 ====================
 */
-static void CL_GetClipboardData( char *buf, int buflen ) {
-	char	*cbd;
+static void CL_GetClipboardData(char *buf, int buflen)
+{
+    char *cbd;
 
-	cbd = Sys_GetClipboardData();
+    cbd = Sys_GetClipboardData();
 
-	if ( !cbd ) {
-		*buf = 0;
-		return;
-	}
+    if (!cbd) {
+        *buf = 0;
+        return;
+    }
 
-	Q_strncpyz( buf, cbd, buflen );
+    Q_strncpyz(buf, cbd, buflen);
 
-	Z_Free( cbd );
+    Z_Free(cbd);
 }
 
 /*
@@ -871,8 +892,9 @@ static void CL_GetClipboardData( char *buf, int buflen ) {
 Key_KeynumToStringBuf
 ====================
 */
-static void Key_KeynumToStringBuf( int keynum, char *buf, int buflen ) {
-	Q_strncpyz( buf, Key_KeynumToString( keynum ), buflen );
+static void Key_KeynumToStringBuf(int keynum, char *buf, int buflen)
+{
+    Q_strncpyz(buf, Key_KeynumToString(keynum), buflen);
 }
 
 /*
@@ -880,16 +902,16 @@ static void Key_KeynumToStringBuf( int keynum, char *buf, int buflen ) {
 Key_GetBindingBuf
 ====================
 */
-static void Key_GetBindingBuf( int keynum, char *buf, int buflen ) {
-	const char	*value;
+static void Key_GetBindingBuf(int keynum, char *buf, int buflen)
+{
+    const char *value;
 
-	value = Key_GetBinding( keynum );
-	if ( value ) {
-		Q_strncpyz( buf, value, buflen );
-	}
-	else {
-		*buf = 0;
-	}
+    value = Key_GetBinding(keynum);
+    if (value) {
+        Q_strncpyz(buf, value, buflen);
+    } else {
+        *buf = 0;
+    }
 }
 
 /*
@@ -899,22 +921,23 @@ GetConfigString
 */
 static int GetConfigString(int index, char *buf, int size)
 {
-	int		offset;
+    int offset;
 
-	if (index < 0 || index >= MAX_CONFIGSTRINGS)
-		return qfalse;
+    if (index < 0 || index >= MAX_CONFIGSTRINGS) {
+        return qfalse;
+    }
 
-	offset = cl.gameState.stringOffsets[index];
-	if (!offset) {
-		if( size ) {
-			buf[0] = 0;
-		}
-		return qfalse;
-	}
+    offset = cl.gameState.stringOffsets[index];
+    if (!offset) {
+        if (size) {
+            buf[0] = 0;
+        }
+        return qfalse;
+    }
 
-	Q_strncpyz( buf, cl.gameState.stringData+offset, size);
+    Q_strncpyz(buf, cl.gameState.stringData + offset, size);
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -922,16 +945,18 @@ static int GetConfigString(int index, char *buf, int size)
 FloatAsInt
 ====================
 */
-static int FloatAsInt( float f ) {
-	int		temp;
+static int FloatAsInt(float f)
+{
+    int temp;
 
-	*(float *)&temp = f;
+    *(float *)&temp = f;
 
-	return temp;
+    return temp;
 }
 
-qboolean UI_usesUniqueCDKey( void ) {
-	return qfalse;
+qboolean UI_usesUniqueCDKey(void)
+{
+    return qfalse;
 }
 
 /*
@@ -939,31 +964,29 @@ qboolean UI_usesUniqueCDKey( void ) {
 getDefaultConsoleRectangle
 ====================
 */
-static UIRect2D getDefaultDMConsoleRectangle( void ) {
-	float f[ 4 ];
-	int i;
-	UIRect2D rect;
+static UIRect2D getDefaultDMConsoleRectangle(void)
+{
+    float    f[4];
+    int      i;
+    UIRect2D rect;
 
-	if( sscanf( ui_consoleposition->string, "%f %f %f %f", &f[ 0 ], &f[ 1 ], &f[ 2 ], &f[ 3 ] ) == 4 )
-	{
-		for( i = 0; i < 4; i++ ) {
-			f[ i ] = floor( f[ i ] );
-		}
+    if (sscanf(ui_consoleposition->string, "%f %f %f %f", &f[0], &f[1], &f[2], &f[3]) == 4) {
+        for (i = 0; i < 4; i++) {
+            f[i] = floor(f[i]);
+        }
 
-		rect.pos.x = f[ 0 ] - cls.glconfig.vidWidth;
-		rect.pos.y = f[ 1 ] - cls.glconfig.vidHeight;
-		rect.size.width = f[ 2 ] + 50.0;
-		rect.size.height = f[ 3 ] + 50.0;
-	}
-	else
-	{
-		rect.pos.x = 0;
-		rect.pos.y = cls.glconfig.vidHeight * 0.58;
-		rect.size.width = cls.glconfig.vidWidth;
-		rect.size.height = cls.glconfig.vidHeight * 0.415;
-	}
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
+        rect.size.width  = f[2] + 50.0;
+        rect.size.height = f[3] + 50.0;
+    } else {
+        rect.pos.x       = 0;
+        rect.pos.y       = uid.vidHeight * 0.58;
+        rect.size.width  = uid.vidWidth;
+        rect.size.height = uid.vidHeight * 0.415;
+    }
 
-	return rect;
+    return rect;
 }
 
 /*
@@ -971,31 +994,33 @@ static UIRect2D getDefaultDMConsoleRectangle( void ) {
 getDefaultConsoleRectangle
 ====================
 */
-static UIRect2D getQuickMessageDMConsoleRectangle( void ) {
-	float f[ 4 ];
-	int i;
-	UIRect2D rect;
+static UIRect2D getQuickMessageDMConsoleRectangle(void)
+{
+    float    f[4];
+    int      i;
+    UIRect2D rect;
 
-	if( sscanf( ui_consoleposition->string, "%f %f %f %f", &f[ 0 ], &f[ 1 ], &f[ 2 ], &f[ 3 ] ) == 4 )
-	{
-		for( i = 0; i < 4; i++ ) {
-			f[ i ] = floor( f[ i ] );
-		}
+    if (sscanf(ui_consoleposition->string, "%f %f %f %f", &f[0], &f[1], &f[2], &f[3]) == 4) {
+        for (i = 0; i < 4; i++) {
+            f[i] = floor(f[i]);
+        }
 
-		rect.pos.x = f[ 0 ] - cls.glconfig.vidWidth;
-		rect.pos.y = f[ 1 ] - cls.glconfig.vidHeight;
-		rect.size.width = f[ 2 ] + 50.0;
-		rect.size.height = f[ 3 ] + 50.0;
-	}
-	else
-	{
-		rect.pos.x = 0;
-		rect.pos.y = cls.glconfig.vidHeight * 0.65;
-		rect.size.width = cls.glconfig.vidWidth;
-		rect.size.height = 38.0;
-	}
+        rect.pos.x       = f[0] - uid.vidWidth;
+        rect.pos.y       = f[1] - uid.vidHeight;
+        rect.size.width  = f[2] + 50.0;
+        rect.size.height = f[3] + 50.0;
+    } else {
+        rect.pos.x      = 0;
+        rect.pos.y      = uid.vidHeight * 0.66;
+        rect.size.width = uid.vidWidth;
+        // Fixed in 2.0
+        //  Was 38.0 in 1.11 and below
+        //  This prevents characters to be seen from the DM console
+        //  in the quick message console
+        rect.size.height = 36.0 * uid.scaleRes[1];
+    }
 
-	return rect;
+    return rect;
 }
 
 /*
@@ -1003,25 +1028,24 @@ static UIRect2D getQuickMessageDMConsoleRectangle( void ) {
 UI_DMMessageModesMatch
 ====================
 */
-static qboolean UI_DMMessageModesMatch( int iMode ) {
-	qboolean bQuickMessage;
+static qboolean UI_DMMessageModesMatch(int iMode)
+{
+    qboolean bQuickMessage = qfalse;
 
-	if( iMode && ( iMode != 300 || dm_console->GetQuickMessageMode() ) )
-	{
-		if( iMode < 0 )
-		{
-			bQuickMessage = qtrue;
-			iMode = -iMode;
-		}
+    if (iMode && (iMode != 300 || dm_console->GetQuickMessageMode())) {
+        if (iMode < 0) {
+            bQuickMessage = qtrue;
+            iMode         = -iMode;
+        }
 
-		if( dm_console->GetQuickMessageMode() == bQuickMessage ) {
-			return dm_console->GetMessageMode() == iMode;
-		} else {
-			return qfalse;
-		}
-	} else {
-		return qtrue;
-	}
+        if (dm_console->GetQuickMessageMode() == bQuickMessage) {
+            return dm_console->GetMessageMode() == iMode;
+        } else {
+            return qfalse;
+        }
+    } else {
+        return qtrue;
+    }
 }
 
 /*
@@ -1029,92 +1053,101 @@ static qboolean UI_DMMessageModesMatch( int iMode ) {
 UI_SetDMConsoleMode
 ====================
 */
-static void UI_SetDMConsoleMode( int iMode ) {
-	qboolean bQuickMessage;
+static void UI_SetDMConsoleMode(int iMode)
+{
+    qboolean bQuickMessage;
 
-	if( UI_DMMessageModesMatch( iMode ) ) {
-		return;
-	}
+    if (UI_DMMessageModesMatch(iMode)) {
+        return;
+    }
 
-	if( iMode < 0 )
-	{
-		bQuickMessage = qtrue;
-		iMode = -iMode;
-	}
+    bQuickMessage = qfalse;
 
-	if( iMode == 300 ) {
-		bQuickMessage = dm_console->GetMessageMode();
-	}
+    if (iMode < 0) {
+        bQuickMessage = qtrue;
+        iMode         = -iMode;
+    }
 
-	if( dm_console->GetQuickMessageMode() )
-	{
-		if( !bQuickMessage )
-		{
-			dm_console->setFrame( getDefaultDMConsoleRectangle() );
-			dm_console->SetQuickMessageMode( qfalse );
-		}
-	}
-	else
-	{
-		if( bQuickMessage )
-		{
-			dm_console->setFrame( getDefaultDMConsoleRectangle() );
-			dm_console->SetQuickMessageMode( qfalse );
-		}
-	}
+    if (iMode == 300) {
+        iMode = dm_console->GetMessageMode();
+    }
 
-	dm_console->SetMessageMode( iMode );
+    if (dm_console->GetQuickMessageMode()) {
+        if (!bQuickMessage) {
+            dm_console->setFrame(getDefaultDMConsoleRectangle());
+            dm_console->SetQuickMessageMode(qfalse);
+        }
+    } else {
+        if (bQuickMessage) {
+            dm_console->setFrame(getQuickMessageDMConsoleRectangle());
+            dm_console->SetQuickMessageMode(bQuickMessage);
+        }
+    }
 
-	if( bQuickMessage )
-	{
-		if( iMode == 100 )
-		{
-			dm_console->setTitle( Sys_LV_CL_ConvertString( "Quick Chat (Press Enter to send) : Messaging to All" ) );
-		}
-		else if( iMode == 200 )
-		{
-			dm_console->setTitle( Sys_LV_CL_ConvertString( "Quick Chat (Press Enter to send) : Messaging to Team" ) );
-		}
-		else
-		{
-			dm_console->setTitle( va( "%s %i", Sys_LV_CL_ConvertString( "Quick Chat (Press Enter to send) : Messaging to Client" ), iMode ) );
-		}
-	}
-	else
-	{
-		if( iMode == 100 )
-		{
-			dm_console->setTitle( Sys_LV_CL_ConvertString( "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to All" ) );
-		}
-		else if( iMode == 100 )
-		{
-			dm_console->setTitle( Sys_LV_CL_ConvertString( "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to Team" ) );
-		}
-		else
-		{
-			dm_console->setTitle( va( "%s %i", Sys_LV_CL_ConvertString( "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to Client" ), iMode ) );
-		}
-	}
+    dm_console->SetMessageMode(iMode);
+
+    if (bQuickMessage) {
+        if (iMode == 100) {
+            dm_console->setTitle(Sys_LV_CL_ConvertString("Quick Chat (Press Enter to send) : Messaging to All"));
+        } else if (iMode == 200) {
+            dm_console->setTitle(Sys_LV_CL_ConvertString("Quick Chat (Press Enter to send) : Messaging to Team"));
+        } else {
+            dm_console->setTitle(
+                va("%s %i", Sys_LV_CL_ConvertString("Quick Chat (Press Enter to send) : Messaging to Client"), iMode)
+            );
+        }
+    } else {
+        if (iMode == 100) {
+            dm_console->setTitle(Sys_LV_CL_ConvertString(
+                "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to All"
+            ));
+        } else if (iMode == 200) {
+            dm_console->setTitle(Sys_LV_CL_ConvertString(
+                "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to Team"
+            ));
+        } else {
+            dm_console->setTitle(
+                va("%s %i",
+                   Sys_LV_CL_ConvertString(
+                       "Chat Window (Enter to send/close) (all|team|private to change mode) : Messaging to Client"
+                   ),
+                   iMode)
+            );
+        }
+    }
 }
 
-static void DMConsoleCommandHandler( const char *txt ) {
-	int iMode;
-	char szStringOut[1024];
+static void DMConsoleCommandHandler(const char *txt)
+{
+    int  iMode;
+    char szStringOut[1024];
 
-	iMode = 0;
+    iMode = 0;
 
-	if (dm_console->GetMessageMode() != 100)
-	{
-		if (dm_console->GetMessageMode() == 200) {
-			iMode = -1;
-		}
-		else {
-			iMode = dm_console->GetMessageMode();
-		}
-	}
+    if (dm_console->GetMessageMode() != 100) {
+        if (dm_console->GetMessageMode() == 200) {
+            iMode = -1;
+        } else {
+            iMode = dm_console->GetMessageMode();
+        }
+    }
 
-	Com_sprintf(szStringOut, sizeof(szStringOut), "dmmessage %i %s\n", iMode, txt);
-	CL_AddReliableCommand(szStringOut, qfalse);
+    Com_sprintf(szStringOut, sizeof(szStringOut), "dmmessage %i %s\n", iMode, txt);
+    CL_AddReliableCommand(szStringOut, qfalse);
+}
+
+/*
+====================
+getScreenWidth
+====================
+*/
+static float getScreenWidth()
+{
+    if (uid.bHighResScaling) {
+        return maxWidthRes;
+    } else {
+        return uid.vidWidth;
+    }
 }
 
 /*
@@ -1122,18 +1155,19 @@ static void DMConsoleCommandHandler( const char *txt ) {
 getNewConsole
 ====================
 */
-UIFloatingConsole* getNewConsole() {
-	const char* consoleName = va("%s console version %s", PRODUCT_NAME, PRODUCT_VERSION);
+UIFloatingConsole *getNewConsole()
+{
+    const char *consoleName = va("%s console version %s", PRODUCT_NAME, PRODUCT_VERSION);
 
-	UIFloatingConsole* console = new UIFloatingConsole;
-	console->Create(NULL, getDefaultConsoleRectangle(), consoleName, UWindowColor, UHudColor);
-	console->setConsoleHandler(ConsoleCommandHandler);
-	console->setConsoleBackground(UBlack, 0.8f);
-	console->setShow(false);
-	console->Connect(&s_consolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed);
-	console->Connect(&s_consolehider, W_Destroyed, W_Destroyed);
+    UIFloatingConsole *console = new UIFloatingConsole;
+    console->Create(NULL, getDefaultConsoleRectangle(), consoleName, UWindowColor, UHudColor);
+    console->setConsoleHandler(ConsoleCommandHandler);
+    console->setConsoleBackground(UBlack, 0.8f);
+    console->setShow(false);
+    console->Connect(&s_consolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed);
+    console->Connect(&s_consolehider, W_Destroyed, W_Destroyed);
 
-	return console;
+    return console;
 }
 
 /*
@@ -1141,27 +1175,32 @@ UIFloatingConsole* getNewConsole() {
 getNewDMConsole
 ====================
 */
-UIFloatingDMConsole *getNewDMConsole() {
-	UIFloatingDMConsole *console = new UIFloatingDMConsole;
-	Event *event;
+UIFloatingDMConsole *getNewDMConsole()
+{
+    UIFloatingDMConsole *console = new UIFloatingDMConsole;
+    Event               *event;
 
-	console->Create( NULL, getDefaultDMConsoleRectangle(),
-		"Chat Window (Enter to send/close) (all|team|private to change message mode) : Messaging to All",
-		UWindowColor, UHudColor );
+    console->Create(
+        NULL,
+        getDefaultDMConsoleRectangle(),
+        "Chat Window (Enter to send/close) (all|team|private to change message mode) : Messaging to All",
+        UWindowColor,
+        UHudColor
+    );
 
-	console->setConsoleHandler( DMConsoleCommandHandler );
-	console->setConsoleBackground( UBlack, 0.8f );
-	console->setShow( false );
-	console->Connect( &s_dmconsolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed );
-	console->Connect( &s_dmconsolehider, W_Destroyed, W_Destroyed );
+    console->setConsoleHandler(DMConsoleCommandHandler);
+    console->setConsoleBackground(UBlack, 0.8f);
+    console->setShow(false);
+    console->Connect(&s_dmconsolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed);
+    console->Connect(&s_dmconsolehider, W_Destroyed, W_Destroyed);
 
-	event = new Event( EV_Widget_Disable );
-	console->PassEventToWidget( "closebutton", event );
+    event = new Event(EV_Widget_Disable);
+    console->PassEventToWidget("closebutton", event);
 
-	event = new Event( EV_Widget_Disable );
-	console->PassEventToWidget( "minimizebutton", event );
+    event = new Event(EV_Widget_Disable);
+    console->PassEventToWidget("minimizebutton", event);
 
-	return console;
+    return console;
 }
 
 /*
@@ -1169,21 +1208,17 @@ UIFloatingDMConsole *getNewDMConsole() {
 getDefaultGMBoxRectangle
 ====================
 */
-static UIRect2D getDefaultGMBoxRectangle(void) {
+static UIRect2D getDefaultGMBoxRectangle(void)
+{
     UIRect2D dmRect = getDefaultDMBoxRectangle();
-    float height = cls.glconfig.vidHeight * ui_compass_scale->value * 0.25f;
-    float y = dmRect.size.height + dmRect.pos.y;
+    float    height = uid.vidHeight * ui_compass_scale->value * 0.25f;
+    float    y      = dmRect.size.height + dmRect.pos.y;
 
     if (height < y) {
-		height = y;
+        height = y;
     }
 
-    return UIRect2D(
-        20.0f,
-        height,
-        cls.glconfig.vidWidth - 20,
-        128.0f
-    );
+    return UIRect2D(20.0f, height, (getScreenWidth() - 20) * uid.scaleRes[0], 128.0f * uid.scaleRes[1]);
 }
 
 /*
@@ -1191,15 +1226,39 @@ static UIRect2D getDefaultGMBoxRectangle(void) {
 getDefaultDMBoxRectangle
 ====================
 */
-static UIRect2D getDefaultDMBoxRectangle(void) {
-    float width = cls.glconfig.vidWidth * ui_compass_scale->value * 0.2f;
+static UIRect2D getDefaultDMBoxRectangle(void)
+{
+    float width;
+    float screenWidth = getScreenWidth();
+   
+    width = screenWidth * uid.scaleRes[0] * ui_compass_scale->value * 0.2f;
 
-    return UIRect2D(
-        width,
-        0,
-        cls.glconfig.vidWidth - (width + 192.0f),
-        120.0f
-    );
+    return UIRect2D(width, 0, (screenWidth - (width + 192.0f)) * uid.scaleRes[0], 120.0f * uid.scaleRes[1]);
+}
+
+/*
+====================
+UI_GetObjectivesTop
+====================
+*/
+float UI_GetObjectivesTop(void)
+{
+    return getDefaultGMBoxRectangle().pos.y;
+}
+
+/*
+====================
+UI_GetObjectivesTop
+====================
+*/
+void UI_GetHighResolutionScale(vec2_t scale)
+{
+    if (uid.bHighResScaling) {
+        scale[0] = uid.scaleRes[0];
+        scale[1] = uid.scaleRes[1];
+    } else {
+        scale[0] = scale[1] = 1.0;
+    }
 }
 
 /*
@@ -1207,11 +1266,11 @@ static UIRect2D getDefaultDMBoxRectangle(void) {
 UI_ShowHudList
 ====================
 */
-void UI_ShowHudList( void ) {
-	for( int i = 1; i <= hudList.NumObjects(); i++ )
-	{
-		hudList.ObjectAt( i )->ForceShow();
-	}
+void UI_ShowHudList(void)
+{
+    for (int i = 1; i <= hudList.NumObjects(); i++) {
+        hudList.ObjectAt(i)->ForceShow();
+    }
 }
 
 /*
@@ -1219,11 +1278,11 @@ void UI_ShowHudList( void ) {
 UI_HideHudList
 ====================
 */
-void UI_HideHudList( void ) {
-	for( int i = 1; i <= hudList.NumObjects(); i++ )
-	{
-		hudList.ObjectAt( i )->ForceHide();
-	}
+void UI_HideHudList(void)
+{
+    for (int i = 1; i <= hudList.NumObjects(); i++) {
+        hudList.ObjectAt(i)->ForceHide();
+    }
 }
 
 /*
@@ -1231,15 +1290,15 @@ void UI_HideHudList( void ) {
 UI_DisplayHudList
 ====================
 */
-void UI_DisplayHudList( void ) {
-	for( int i = 1; i <= hudList.NumObjects(); i++ )
-	{
-		Menu *pMenu = hudList.ObjectAt( i );
-		UIWidget *pWidget = pMenu->GetContainerWidget();
+void UI_DisplayHudList(void)
+{
+    for (int i = 1; i <= hudList.NumObjects(); i++) {
+        Menu     *pMenu   = hudList.ObjectAt(i);
+        UIWidget *pWidget = pMenu->GetContainerWidget();
 
-		pMenu->ForceShow();
-		pWidget->Display( uWinMan.getFrame(), 1.0 );
-	}
+        pMenu->ForceShow();
+        pWidget->Display(uWinMan.getFrame(), 1.0);
+    }
 }
 
 /*
@@ -1247,139 +1306,129 @@ void UI_DisplayHudList( void ) {
 UI_PrintConsole
 ====================
 */
-void UI_PrintConsole( const char *msg )
+void UI_PrintConsole(const char *msg)
 {
-	UColor *pColor = NULL;
-	char szString[ 1024 ];
-	char szBlah[ 1024 ];
+    const UColor *pColor = NULL;
+    const char   *pszString;
+    char          szString[1024];
+    char          szBlah[1024];
+    qboolean      bPrintedDMBox = qfalse;
 
-	memcpy( szString, msg, sizeof( szString ) );
+    pszString = msg;
+    strncpy(szString, msg, 1024);
 
-	if( *szString < MESSAGE_MAX )
-	{
-		qboolean bNormalMessage = qfalse;
-		qboolean bDMMessage = qfalse;
-		qboolean bBold = qfalse;
-		qboolean bDeathMessage = qfalse;
+    if (*pszString < MESSAGE_MAX) {
+        qboolean bNormalMessage = qfalse;
+        qboolean bDMMessage     = qfalse;
+        qboolean bBold          = qfalse;
+        qboolean bDeathMessage  = qfalse;
 
-		switch( *szString )
-		{
-		case MESSAGE_YELLOW:
-			bNormalMessage = qtrue;
-			pColor = &UHudColor;
-			break;
-		case MESSAGE_CHAT_WHITE:
-			bDMMessage = qtrue;
-			pColor = &UGrey;
-			break;
-		case MESSAGE_WHITE:
-			bBold = qtrue;
-			pColor = &UWhite;
-			break;
-		case MESSAGE_CHAT_RED:
-			bDeathMessage = qtrue;
-			pColor = &ULightRed;
-			break;
-		case MESSAGE_CHAT_GREEN:
-			bDeathMessage = qtrue;
-			pColor = &UGreen;
-			break;
-		}
+        switch (*pszString) {
+        case MESSAGE_YELLOW:
+            bNormalMessage = qtrue;
+            pColor         = &UHudColor;
+            break;
+        case MESSAGE_CHAT_WHITE:
+            bDMMessage = qtrue;
+            pColor     = &UWhiteChatMessageColor;
+            break;
+        case MESSAGE_WHITE:
+            bBold  = qtrue;
+            pColor = &UWhite;
+            break;
+        case MESSAGE_CHAT_RED:
+            bDeathMessage = MESSAGE_CHAT_RED;
+            pColor        = &URedChatMessageColor;
+            break;
+        case MESSAGE_CHAT_GREEN:
+            bDeathMessage = MESSAGE_CHAT_GREEN;
+            pColor        = &UGreenChatMessageColor;
+            break;
+        }
 
-		msg++;
+        if (*pszString != 0) {
+            pszString++;
+        }
 
-		//
-		// print to the deathmatch console
-		//
-		if( dm_console && !bNormalMessage )
-		{
-			if( bDMMessage )
-			{
-				dm_console->AddDMMessageText( szString + 1, pColor );
-			}
-			else
-			{
-				dm_console->AddText( szString + 1, pColor );
-			}
-		}
+        //
+        // print to the deathmatch console
+        //
+        if (dm_console && !bNormalMessage) {
+            if (bDMMessage) {
+                dm_console->AddDMMessageText(szString + 1, pColor);
+            } else {
+                dm_console->AddText(szString + 1, pColor);
+            }
+        }
 
-		//
-		// print to the deathmatch message box
-		//
-		if( dmbox )
-		{
-			if( bDMMessage )
-			{
-				*szString = MESSAGE_CHAT_WHITE;
-				dmbox->Print( szString );
-				return;
-			}
-			else if( bDeathMessage )
-			{
-				dmbox->Print( szString );
-				*szString = MESSAGE_CHAT_RED;
-				return;
-			}
-		}
+        //
+        // print to the deathmatch message box
+        //
+        if (dmbox) {
+            if (bDMMessage) {
+                *szString = MESSAGE_CHAT_WHITE;
+                dmbox->Print(szString);
+                pszString     = msg + 1;
+                bPrintedDMBox = qtrue;
+            } else if (bDeathMessage) {
+                dmbox->Print(szString);
+                *szString     = bDeathMessage;
+                bPrintedDMBox = qtrue;
+            }
+        }
 
-		//
-		// print to the game message box
-		//
-		if( gmbox )
-		{
-			if( bBold )
-			{
-				*szString = MESSAGE_WHITE;
-				gmbox->Print( szString );
-				uii.Snd_PlaySound( "objective_text" );
-			}
-			else
-			{
-				gmbox->Print( szString + 1 );
-			}
+        //
+        // print to the game message box
+        //
+        if (gmbox && !bPrintedDMBox) {
+            if (bBold) {
+                *szString = MESSAGE_WHITE;
+                gmbox->Print(szString);
+                uii.Snd_PlaySound("objective_text");
+                pszString = msg + 1;
+            } else {
+                gmbox->Print(szString + 1);
+            }
 
-			if( !ui_gmboxspam->integer ) {
-				return;
-			}
+            if (!ui_gmboxspam->integer) {
+                return;
+            }
 
-			memcpy( szBlah, "Game Message: ", 15 );
-			strcat( szBlah, szString + 1 );
-		}
-	}
+            if (!bDMMessage) {
+                memcpy(szBlah, "Game Message: ", 15);
+                Q_strcat(szBlah, sizeof(szBlah), pszString);
+                pszString = szBlah;
+            }
+        }
+    }
 
-	if( *msg == 7 )
-	{
-		msg++;
-		if( mini_console )
-		{
-			mini_console->Print( msg + 1 );
-			return;
-		}
-	}
+    if (*pszString == '\a') {
+        pszString++;
+        if (mini_console) {
+            mini_console->Print(pszString);
+            return;
+        }
+    }
 
-	if( fakk_console )
-	{
-		if( s_intermediateconsole )
-		{
-			fakk_console->AddText( *s_intermediateconsole, NULL );
-			delete s_intermediateconsole;
-			s_intermediateconsole = NULL;
-		}
+    if (fakk_console) {
+        if (s_intermediateconsole) {
+            fakk_console->AddText(*s_intermediateconsole, NULL);
+            delete s_intermediateconsole;
+            s_intermediateconsole = NULL;
+        }
 
-		fakk_console->AddText( msg, pColor );
+        fakk_console->AddText(pszString, pColor);
 
-		if( mini_console ) {
-			mini_console->Print( msg );
-		}
-	}
-	else
-	{
-		if( !s_intermediateconsole ) {
-			s_intermediateconsole = new str;
-		}
+        if (mini_console) {
+            mini_console->Print(pszString);
+        }
+    } else {
+        if (!s_intermediateconsole) {
+            s_intermediateconsole = new str;
+        }
 
-		*s_intermediateconsole = msg;
-	}
+        *s_intermediateconsole = msg;
+    }
 }
 
 /*
@@ -1387,13 +1436,13 @@ void UI_PrintConsole( const char *msg )
 UI_PrintDeveloperConsole
 ====================
 */
-void UI_PrintDeveloperConsole( const char *msg )
+void UI_PrintDeveloperConsole(const char *msg)
 {
-	if( !developer_console ) {
-		return;
-	}
+    if (!developer_console) {
+        return;
+    }
 
-	developer_console->AddText( msg, NULL );
+    developer_console->AddText(msg, NULL);
 }
 
 /*
@@ -1401,39 +1450,38 @@ void UI_PrintDeveloperConsole( const char *msg )
 UI_UpdateContinueGame
 ====================
 */
-void UI_UpdateContinueGame( void ) {
-	cvar_t *var;
-	const char *name;
-	const char *archive_name;
-	int length;
-	Event *event;
+void UI_UpdateContinueGame(void)
+{
+    cvar_t     *var;
+    const char *name;
+    const char *archive_name;
+    int         length;
+    Event      *event;
 
-	var = Cvar_Get( "g_lastsave", "", 0 );
-	name = var->string;
+    var  = Cvar_Get("g_lastsave", "", 0);
+    name = var->string;
 
-	if( *name )
-	{
-		archive_name = Com_GetArchiveFileName( name, "sav" );
-		length = FS_ReadFileEx( archive_name, NULL, qtrue );
+    if (*name) {
+        archive_name = Com_GetArchiveFileName(name, "sav");
+        length       = FS_ReadFileEx(archive_name, NULL, qtrue);
 
-		if( length != -1 )
-		{
-			event = new Event( EV_Widget_Enable );
-			menuManager.PassEventToWidget( "continue game", event );
+        if (length != -1) {
+            event = new Event(EV_Widget_Enable);
+            menuManager.PassEventToWidget("continue game", event);
 
-			event = new Event( EV_Widget_Disable );
-			menuManager.PassEventToWidget( "new game", event );
-			return;
-		}
+            event = new Event(EV_Widget_Disable);
+            menuManager.PassEventToWidget("new game", event);
+            return;
+        }
 
-		Cvar_Set( "g_lastsave", "" );
-	}
+        Cvar_Set("g_lastsave", "");
+    }
 
-	event = new Event( EV_Widget_Disable );
-	menuManager.PassEventToWidget( "continue game", event );
+    event = new Event(EV_Widget_Disable);
+    menuManager.PassEventToWidget("continue game", event);
 
-	event = new Event( EV_Widget_Enable );
-	menuManager.PassEventToWidget( "new game", event );
+    event = new Event(EV_Widget_Enable);
+    menuManager.PassEventToWidget("new game", event);
 }
 
 /*
@@ -1441,8 +1489,9 @@ void UI_UpdateContinueGame( void ) {
 UI_MenuActive
 ====================
 */
-qboolean UI_MenuActive( void ) {
-	return menuManager.CurrentMenu() != NULL;
+qboolean UI_MenuActive(void)
+{
+    return menuManager.CurrentMenu() != NULL;
 }
 
 /*
@@ -1450,35 +1499,32 @@ qboolean UI_MenuActive( void ) {
 UI_FocusMenuIfExists
 ====================
 */
-void UI_FocusMenuIfExists( void ) {
-	Menu *currentMenu;
-	int r_mode;
+void UI_FocusMenuIfExists(void)
+{
+    Menu *currentMenu;
+    int   r_mode;
 
-	currentMenu = menuManager.CurrentMenu();
-	r_mode = Cvar_VariableValue( "r_mode" );
+    currentMenu = menuManager.CurrentMenu();
+    r_mode      = Cvar_VariableValue("r_mode");
 
-	if( currentMenu )
-	{
-		IN_MouseOn();
+    if (currentMenu) {
+        IN_MouseOn();
 
-		if( view3d->IsActive() ) {
-			uWinMan.DeactivateCurrentControl();
-		}
+        if (view3d->IsActive()) {
+            uWinMan.DeactivateCurrentControl();
+        }
 
-		currentMenu->ActivateMenu();
+        currentMenu->ActivateMenu();
 
-		if( ui_newvidmode->integer == -1 )
-		{
-			Cvar_Get( "ui_newvidmode", va( "%d", r_mode ), CVAR_SERVER_CREATED );
-			Cvar_SetValue( "ui_newvidmode", r_mode );
-		}
-	}
-	else
-	{
-		UI_ActivateView3D();
-		IN_MouseOff();
-		Cvar_SetValue( "ui_newvidmode", -1 );
-	}
+        if (ui_newvidmode->integer == -1) {
+            Cvar_Get("ui_newvidmode", va("%d", r_mode), CVAR_RESETSTRING);
+            Cvar_SetValue("ui_newvidmode", r_mode);
+        }
+    } else {
+        UI_ActivateView3D();
+        IN_MouseOff();
+        Cvar_SetValue("ui_newvidmode", -1);
+    }
 }
 
 /*
@@ -1486,14 +1532,15 @@ void UI_FocusMenuIfExists( void ) {
 UI_OpenConsole
 ====================
 */
-void UI_OpenConsole( void ) {
-	if( !fakk_console ) {
-		return;
-	}
+void UI_OpenConsole(void)
+{
+    if (!fakk_console) {
+        return;
+    }
 
-	fakk_console->setShow( true );
-	uWinMan.ActivateControl( fakk_console );
-	IN_MouseOn();
+    fakk_console->setShow(true);
+    uWinMan.ActivateControl(fakk_console);
+    IN_MouseOn();
 }
 
 /*
@@ -1501,8 +1548,9 @@ void UI_OpenConsole( void ) {
 UI_OpenConsole
 ====================
 */
-qboolean UI_ConsoleIsVisible( void ) {
-	return fakk_console && fakk_console->IsVisible();
+qboolean UI_ConsoleIsVisible(void)
+{
+    return fakk_console && fakk_console->IsVisible();
 }
 
 /*
@@ -1510,8 +1558,9 @@ qboolean UI_ConsoleIsVisible( void ) {
 UI_ConsoleIsOpen
 ====================
 */
-qboolean UI_ConsoleIsOpen( void ) {
-	return fakk_console && fakk_console->IsVisible() && fakk_console->IsActive();
+qboolean UI_ConsoleIsOpen(void)
+{
+    return fakk_console && fakk_console->IsVisible() && fakk_console->IsActive();
 }
 
 /*
@@ -1519,11 +1568,12 @@ qboolean UI_ConsoleIsOpen( void ) {
 UI_CloseConsole
 ====================
 */
-void UI_CloseConsole( void ) {
-	if( fakk_console && fakk_console->getShow() ) {
-		fakk_console->setShow( false );
-	}
-	UI_FocusMenuIfExists();
+void UI_CloseConsole(void)
+{
+    if (fakk_console && fakk_console->getShow()) {
+        fakk_console->setShow(false);
+    }
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -1531,16 +1581,17 @@ void UI_CloseConsole( void ) {
 UI_ToggleConsole
 ====================
 */
-void UI_ToggleConsole( void ) {
-	if( !fakk_console ) {
-		return;
-	}
+void UI_ToggleConsole(void)
+{
+    if (!fakk_console) {
+        return;
+    }
 
-	if( fakk_console->IsVisible() ) {
-		UI_CloseConsole();
-	} else {
-		UI_OpenConsole();
-	}
+    if (fakk_console->IsVisible()) {
+        UI_CloseConsole();
+    } else {
+        UI_OpenConsole();
+    }
 }
 
 /*
@@ -1548,15 +1599,16 @@ void UI_ToggleConsole( void ) {
 UI_OpenDMConsole
 ====================
 */
-void UI_OpenDMConsole( int iMode ) {
-	if( !dm_console ) {
-		return;
-	}
+void UI_OpenDMConsole(int iMode)
+{
+    if (!dm_console) {
+        return;
+    }
 
-	UI_SetDMConsoleMode( iMode );
-	dm_console->setShow( true );
-	uWinMan.ActivateControl( dm_console );
-	IN_MouseOff();
+    UI_SetDMConsoleMode(iMode);
+    dm_console->setShow(true);
+    uWinMan.ActivateControl(dm_console);
+    IN_MouseOff();
 }
 
 /*
@@ -1564,11 +1616,12 @@ void UI_OpenDMConsole( int iMode ) {
 UI_CloseDMConsole
 ====================
 */
-void UI_CloseDMConsole( void ) {
-	if( dm_console && dm_console->getShow() ) {
-		dm_console->setShow( false );
-	}
-	UI_FocusMenuIfExists();
+void UI_CloseDMConsole(void)
+{
+    if (dm_console && dm_console->getShow()) {
+        dm_console->setShow(false);
+    }
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -1576,23 +1629,21 @@ void UI_CloseDMConsole( void ) {
 UI_ToggleDMConsole
 ====================
 */
-void UI_ToggleDMConsole( int iMode ) {
-	if( !dm_console ) {
-		return;
-	}
+void UI_ToggleDMConsole(int iMode)
+{
+    if (!dm_console) {
+        return;
+    }
 
-	if( dm_console->IsVisible() )
-	{
-		if( UI_DMMessageModesMatch( iMode ) ) {
-			UI_CloseDMConsole();
-		} else {
-			UI_OpenDMConsole( iMode );
-		}
-	}
-	else
-	{
-		UI_OpenDMConsole( iMode );
-	}
+    if (dm_console->IsVisible()) {
+        if (UI_DMMessageModesMatch(iMode)) {
+            UI_CloseDMConsole();
+        } else {
+            UI_OpenDMConsole(iMode);
+        }
+    } else {
+        UI_OpenDMConsole(iMode);
+    }
 }
 
 /*
@@ -1600,14 +1651,15 @@ void UI_ToggleDMConsole( int iMode ) {
 UI_OpenDeveloperConsole
 ====================
 */
-void UI_OpenDeveloperConsole( void ) {
-	if( !developer_console ) {
-		return;
-	}
+void UI_OpenDeveloperConsole(void)
+{
+    if (!developer_console) {
+        return;
+    }
 
-	developer_console->setShow( true );
-	uWinMan.ActivateControl( developer_console );
-	IN_MouseOn();
+    developer_console->setShow(true);
+    uWinMan.ActivateControl(developer_console);
+    IN_MouseOn();
 }
 
 /*
@@ -1615,11 +1667,12 @@ void UI_OpenDeveloperConsole( void ) {
 UI_CloseDeveloperConsole
 ====================
 */
-void UI_CloseDeveloperConsole( void ) {
-	if( developer_console && developer_console->getShow() ) {
-		developer_console->setShow( false );
-	}
-	UI_FocusMenuIfExists();
+void UI_CloseDeveloperConsole(void)
+{
+    if (developer_console && developer_console->getShow()) {
+        developer_console->setShow(false);
+    }
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -1627,16 +1680,17 @@ void UI_CloseDeveloperConsole( void ) {
 UI_ToggleDeveloperConsole_f
 ====================
 */
-void UI_ToggleDeveloperConsole_f( void ) {
-	if( !developer_console ) {
-		return;
-	}
+void UI_ToggleDeveloperConsole_f(void)
+{
+    if (!developer_console) {
+        return;
+    }
 
-	if( developer_console->IsThisOrChildActive() ) {
-		UI_CloseDeveloperConsole();
-	} else {
-		UI_OpenDeveloperConsole();
-	}
+    if (developer_console->IsThisOrChildActive()) {
+        UI_CloseDeveloperConsole();
+    } else {
+        UI_OpenDeveloperConsole();
+    }
 }
 
 /*
@@ -1644,8 +1698,9 @@ void UI_ToggleDeveloperConsole_f( void ) {
 UI_KeyEvent
 ====================
 */
-void UI_KeyEvent( int key, unsigned int time ) {
-	uWinMan.KeyEvent( key, time );
+void UI_KeyEvent(int key, unsigned int time)
+{
+    uWinMan.KeyEvent(key, time);
 }
 
 /*
@@ -1653,8 +1708,9 @@ void UI_KeyEvent( int key, unsigned int time ) {
 UI_CharEvent
 ====================
 */
-void UI_CharEvent( int ch ) {
-	uWinMan.CharEvent( ch );
+void UI_CharEvent(int ch)
+{
+    uWinMan.CharEvent(ch);
 }
 
 /*
@@ -1662,12 +1718,15 @@ void UI_CharEvent( int ch ) {
 UI_ClearBackground
 ====================
 */
-void UI_ClearBackground( void ) {
-	re.Set2DWindow( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, 0, -1, -1 );
-	re.Scissor( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight );
-	re.SetColor( g_color_table[ 0 ] );
-	re.DrawBox( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight );
-	re.SetColor( NULL );
+void UI_ClearBackground(void)
+{
+    re.Set2DWindow(
+        0, 0, uid.vidWidth, uid.vidHeight, 0, uid.vidWidth, uid.vidHeight, 0, -1, 1
+    );
+    re.Scissor(0, 0, uid.vidWidth, uid.vidHeight);
+    re.SetColor(g_color_table[0]);
+    re.DrawBox(0, 0, uid.vidWidth, uid.vidHeight);
+    re.SetColor(NULL);
 }
 
 /*
@@ -1675,13 +1734,14 @@ void UI_ClearBackground( void ) {
 UI_ActivateView3D
 ====================
 */
-void UI_ActivateView3D( void ) {
-	if( !view3d ) {
-		return;
-	}
+void UI_ActivateView3D(void)
+{
+    if (!view3d) {
+        return;
+    }
 
-	view3d->setShow( true );
-	uWinMan.ActivateControl( view3d );
+    view3d->setShow(true);
+    uWinMan.ActivateControl(view3d);
 }
 
 /*
@@ -1689,17 +1749,46 @@ void UI_ActivateView3D( void ) {
 UI_DrawIntro
 ====================
 */
-void UI_DrawIntro( void ) {
-	if( clc.state == CA_CINEMATIC )
-	{
-		view3d->setShow( true );
-		return;
-	}
+void UI_DrawIntro(void)
+{
+    if (clc.state == CA_CINEMATIC) {
+        view3d->setShow(true);
+        return;
+    }
 
-	view3d->setShow( false );
-	UI_ClearBackground();
+    view3d->setShow(false);
+    UI_ClearBackground();
 
-	// FIXME: draw intro
+    if (cls.startStage < 3 || cls.startStage >= 12) {
+        return;
+    }
+
+    if (intro_stage.material->GetMaterial()) {
+        float  swidth;
+        float  sheight;
+        vec4_t color;
+
+        VectorSet4(color, 1, 1, 1, 1);
+        if (intro_stage.fadetime) {
+            float frac;
+
+            frac     = Q_clamp_float((cls.realtime - intro_stage.starttime) / intro_stage.fadetime, 0, 1);
+            color[0] = color[1] = color[2] =
+                intro_stage.alpha_start + frac * (intro_stage.alpha_end - intro_stage.alpha_start);
+        }
+
+        swidth  = view3d->getFrame().getMaxX();
+        sheight = view3d->getFrame().getMaxY();
+
+        re.SetColor(color);
+
+        re.DrawStretchPic(0.0, 0.0, swidth, sheight, 0.0, 0.0, 1.0, 1.0, intro_stage.material->GetMaterial());
+        re.SetColor(NULL);
+    }
+
+    if (cls.realtime >= intro_stage.endtime) {
+        CL_FinishedStartStage();
+    }
 }
 
 /*
@@ -1707,8 +1796,9 @@ void UI_DrawIntro( void ) {
 UI_MenuUp
 ====================
 */
-qboolean UI_MenuUp() {
-	return menuManager.CurrentMenu() != NULL;
+qboolean UI_MenuUp()
+{
+    return menuManager.CurrentMenu() != NULL;
 }
 
 /*
@@ -1718,13 +1808,13 @@ UI_FullscreenMenuUp
 */
 qboolean UI_FullscreenMenuUp()
 {
-	Menu *currentMenu = menuManager.CurrentMenu();
+    Menu *currentMenu = menuManager.CurrentMenu();
 
-	if( currentMenu ) {
-		return currentMenu->isFullscreen();
-	}
+    if (currentMenu) {
+        return currentMenu->isFullscreen();
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -1734,758 +1824,582 @@ UI_Update
 Updates the UI.
 ====================
 */
-void UI_Update(void) {
-	Menu* currentMenu;
-	UIRect2D	frame;
+void UI_Update(void)
+{
+    Menu    *currentMenu;
+    UIRect2D frame;
 
-	re.SetRenderTime(cls.realtime);
-	CL_FillUIDef();
-	uWinMan.ServiceEvents();
+    re.SetRenderTime(cls.realtime);
+    CL_FillUIDef();
+    uWinMan.ServiceEvents();
 
-	//
-	// draw the base HUD when in-game
-	//
-	if (cls.no_menus && clc.state == CA_ACTIVE)
-	{
-		view3d->setShow(true);
-		frame = uWinMan.getFrame();
-		view3d->Display(frame, 1.0);
+    //
+    // draw the base HUD when in-game
+    //
+    if (cls.no_menus && clc.state == CA_ACTIVE) {
+        view3d->setShow(true);
+        frame = uWinMan.getFrame();
+        view3d->Display(frame, 1.0);
 
-		if (ui_hud && !view3d->LetterboxActive())
-		{
-			// draw the health hud
-			if (hud_health)
-			{
-				hud_health->ForceShow();
-				frame = uWinMan.getFrame();
-				hud_health->GetContainerWidget()->Display(frame, 1.0);
-			}
+        if (ui_hud && !view3d->LetterboxActive()) {
+            // draw the health hud
+            if (hud_health) {
+                hud_health->ForceShow();
+                frame = uWinMan.getFrame();
+                hud_health->GetContainerWidget()->Display(frame, 1.0);
+            }
 
-			// draw the ammo hud
-			if (hud_ammo)
-			{
-				hud_ammo->ForceShow();
-				frame = uWinMan.getFrame();
-				hud_ammo->GetContainerWidget()->Display(frame, 1.0);
-			}
+            // draw the ammo hud
+            if (hud_ammo) {
+                hud_ammo->ForceShow();
+                frame = uWinMan.getFrame();
+                hud_ammo->GetContainerWidget()->Display(frame, 1.0);
+            }
 
-			// draw the compass hud
-			if (hud_compass)
-			{
-				hud_compass->ForceShow();
-				frame = uWinMan.getFrame();
-				hud_compass->GetContainerWidget()->Display(frame, 1.0);
-			}
-		}
-	}
+            // draw the compass hud
+            if (hud_compass) {
+                hud_compass->ForceShow();
+                frame = uWinMan.getFrame();
+                hud_compass->GetContainerWidget()->Display(frame, 1.0);
+            }
+        }
 
-	if (fakk_console)
-	{
-		if (ui_minicon->integer)
-		{
-			// toggle the mini-console
-			if (mini_console) {
-				mini_console->setRealShow(fakk_console->getShow() ^ 1);
-			}
-		}
-		else if (mini_console) {
-			mini_console->setRealShow(false);
-		}
-	}
+        return;
+    }
 
-	if (gmbox) {
-		gmbox->setRealShow(true);
-	}
+    if (fakk_console) {
+        if (ui_minicon->integer) {
+            // toggle the mini-console
+            if (mini_console) {
+                mini_console->setRealShow(fakk_console->getShow() ^ 1);
+            }
+        } else if (mini_console) {
+            mini_console->setRealShow(false);
+        }
+    }
 
-	if (dmbox) {
-		dmbox->setRealShow(true);
-	}
+    if (gmbox) {
+        gmbox->setRealShow(true);
+    }
 
-	currentMenu = menuManager.CurrentMenu();
+    if (dmbox) {
+        dmbox->setRealShow(true);
+    }
 
-	if (currentMenu == menuManager.FindMenu("main")) {
-		UI_MainMenuWidgetsUpdate();
-	}
+    currentMenu = menuManager.CurrentMenu();
 
-	// don't care about the intro
-	/*
-	if( CL_FinishedIntro() )
-	{
-	}
-	else
-	{
-		UI_DrawIntro();
-	}
-	*/
+    if (currentMenu == menuManager.FindMenu("main")) {
+        UI_MainMenuWidgetsUpdate();
+    } else if (currentMenu == menuManager.FindMenu("dm_main")) {
+        UI_MultiplayerMainMenuWidgetsUpdate();
+    }
 
-	if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu)
-	{
-		view3d->setShow(false);
-		UI_ClearBackground();
+    // don't care about the intro
+    if (!CL_FinishedIntro()) {
+        UI_DrawIntro();
+    } else if (!server_loading && (clc.state == CA_CONNECTING || clc.state == CA_CHALLENGING) && ui_pConnectingMenu) {
+        view3d->setShow(false);
+        UI_ClearBackground();
 
-		if (UI_BindActive())
-		{
-			Menu* bindMenu = menuManager.FindMenu("controls");
+        if (UI_BindActive()) {
+            Menu *bindMenu = menuManager.FindMenu("controls");
 
-			if (bindMenu)
-			{
-				Event* event = new Event(EV_UIFakkBindList_StopBind);
-				bindMenu->PassEventToWidget("bindlist", event);
-			}
-			else
-			{
-				uWinMan.SetBindActive(NULL);
-			}
-		}
+            if (bindMenu) {
+                Event *event = new Event(EV_UIFakkBindList_StopBind);
+                bindMenu->PassEventToWidget("bindlist", event);
+            } else {
+                uWinMan.SetBindActive(NULL);
+            }
+        }
 
-		if (clc.connectTime >= cls.realtime - 1000 * cl_connect_timeout->integer)
-		{
-			if (currentMenu != ui_pConnectingMenu)
-			{
-				UI_ForceMenuOff(true);
-				UI_DeactiveFloatingWindows();
-				UI_ForceMenu("connecting");
-				uWinMan.showCursor(true);
-			}
-		}
-		else
-		{
-			Com_Printf("\nConnect to server timed out\n");
-			UI_ForceMenuOff(true);
-			Cbuf_AddText("disconnect;pushmenu servertimeout");
-		}
-	}
-	else
-	{
-		if (currentMenu && currentMenu->isFullscreen() && (!server_loading || !ui_pLoadingMenu))
-		{
-			if (com_sv_running->integer && clc.state == CA_ACTIVE) {
-				Com_FakePause();
-			}
+        if (clc.connectStartTime >= cls.realtime - 1000 * cl_connect_timeout->integer) {
+            if (currentMenu != ui_pConnectingMenu) {
+                UI_ForceMenuOff(true);
+                UI_DeactiveFloatingWindows();
+                UI_ForceMenu("connecting");
+                uWinMan.showCursor(true);
+            }
+        } else {
+            Com_Printf("\nConnect to server timed out\n");
+            UI_ForceMenuOff(true);
+            Cbuf_AddText("disconnect;pushmenu servertimeout");
+        }
+    } else {
+        if (currentMenu && currentMenu->isFullscreen() && (!server_loading || !ui_pLoadingMenu)) {
+            if (com_sv_running->integer && clc.state == CA_ACTIVE) {
+                Com_FakePause();
+            }
 
-			view3d->setShow(false);
-		}
-		else if (!server_loading)
-		{
-			if (clc.state <= CA_PRIMED)
-			{
-				view3d->setShow(false);
-				UI_ClearBackground();
-			}
-			else if (clc.state == CA_PRIMED || clc.state == CA_ACTIVE)
-			{
-				Com_FakeUnpause();
-				view3d->setShow(true);
-			}
-			else
-			{
-				UI_ClearBackground();
-				view3d->setShow(false);
-			}
-		}
-		else
-		{
-			view3d->setShow(false);
-			UI_ClearBackground();
+            view3d->setShow(false);
+        } else if (!server_loading) {
+            if (clc.state <= CA_PRIMED) {
+                view3d->setShow(false);
+                UI_ClearBackground();
+            } else if (clc.state == CA_ACTIVE || clc.state == CA_CINEMATIC) {
+                Com_FakeUnpause();
+                view3d->setShow(true);
+            } else {
+                UI_ClearBackground();
+                view3d->setShow(false);
+            }
+        } else {
+            view3d->setShow(false);
+            UI_ClearBackground();
 
-			if (UI_BindActive())
-			{
-				Menu* bindMenu = menuManager.FindMenu("controls");
+            if (UI_BindActive()) {
+                Menu *bindMenu = menuManager.FindMenu("controls");
 
-				if (bindMenu)
-				{
-					Event* event = new Event(EV_UIFakkBindList_StopBind);
-					bindMenu->PassEventToWidget("bindlist", event);
-				}
-			}
-			else
-			{
-				uWinMan.SetBindActive(NULL);
-			}
+                if (bindMenu) {
+                    Event *event = new Event(EV_UIFakkBindList_StopBind);
+                    bindMenu->PassEventToWidget("bindlist", event);
+                }
+            } else {
+                uWinMan.SetBindActive(NULL);
+            }
 
-			if (ui_pLoadingMenu)
-			{
-				if (currentMenu != ui_pLoadingMenu)
-				{
-					UI_ForceMenuOff(true);
-					UI_DeactiveFloatingWindows();
-					UI_ForceMenu(ui_sCurrentLoadingMenu);
-					uWinMan.showCursor(false);
-				}
+            if (ui_pLoadingMenu) {
+                if (currentMenu != ui_pLoadingMenu) {
+                    UI_ForceMenuOff(true);
+                    UI_DeactiveFloatingWindows();
+                    UI_ForceMenu(ui_sCurrentLoadingMenu);
+                    uWinMan.showCursor(false);
+                }
 
-				if (!developer->integer && UI_ConsoleIsVisible()) {
-					UI_CloseConsole();
-				}
-			}
-			else if (ui_static_materials.loading)
-			{
-				ui_static_materials.loading->ReregisterMaterial();
-			}
-		}
-	}
+                if (!developer->integer && UI_ConsoleIsVisible()) {
+                    UI_CloseConsole();
+                }
+            } else if (ui_static_materials.loading) {
+                ui_static_materials.loading->GetMaterial();
+            }
+        }
+    }
 
-	// Hide the HUD when necessary
-	if (!ui_hud || clc.state != CA_ACTIVE || view3d->LetterboxActive()
-		|| (currentMenu && currentMenu->isFullscreen())
-		|| server_loading
-		|| ((cl.snap.ps.pm_flags & PMF_NO_HUD) || (cl.snap.ps.pm_flags & PMF_SPECTATE_FOLLOW)))
-	{
-		if (crosshairhud)
-		{
-			crosshairhud->ForceHide();
-		}
-		if (hud_weapons)
-		{
-			hud_weapons->ForceHide();
-			ui_weapHudTime = 0;
-		}
-		if (hud_items)
-		{
-			hud_items->ForceHide();
-			ui_itemHudTime = 0;
-		}
-		if (hud_health)
-		{
-			hud_health->ForceHide();
-		}
-		if (hud_ammo)
-		{
-			hud_ammo->ForceHide();
-		}
-		if (hud_compass)
-		{
-			hud_compass->ForceHide();
-		}
-		if (hud_boss)
-		{
-			hud_boss->ForceHide();
-		}
+    // Hide the HUD when necessary
+    if (!ui_hud || clc.state != CA_ACTIVE || view3d->LetterboxActive() || (currentMenu && currentMenu->isFullscreen())
+        || server_loading || ((cl.snap.ps.pm_flags & PMF_NO_HUD) || (cl.snap.ps.pm_flags & PMF_INTERMISSION))) {
+        if (crosshairhud) {
+            crosshairhud->ForceHide();
+        }
+        if (hud_weapons) {
+            hud_weapons->ForceHide();
+            ui_weapHudTime = 0;
+        }
+        if (hud_items) {
+            hud_items->ForceHide();
+            ui_itemHudTime = 0;
+        }
+        if (hud_health) {
+            hud_health->ForceHide();
+        }
+        if (hud_ammo) {
+            hud_ammo->ForceHide();
+        }
+        if (hud_compass) {
+            hud_compass->ForceHide();
+        }
+        if (hud_boss) {
+            hud_boss->ForceHide();
+        }
 
-		UI_HideHudList();
-	}
-	else
-	{
-		if (crosshairhud)
-		{
-			if (ui_crosshair->integer && cl.snap.ps.stats[STAT_CROSSHAIR]) {
-				crosshairhud->ForceShow();
-			}
-			else {
-				crosshairhud->ForceHide();
-			}
-		}
+        UI_HideHudList();
+    } else {
+        if (crosshairhud) {
+            if (ui_crosshair->integer && cl.snap.ps.stats[STAT_CROSSHAIR]) {
+                crosshairhud->ForceShow();
+            } else {
+                crosshairhud->ForceHide();
+            }
+        }
 
-		//
-		// show and highlight all weapons that the player holds
-		//
+        //
+        // show and highlight all weapons that the player holds
+        //
 
-		//
-		// try to show the weapons bar
-		//
-		if (hud_weapons)
-		{
-			if (ui_weaponsbar->integer)
-			{
-				int iEquippedDiff = 0;
-				int iOwnedDiff = 0;
+        //
+        // try to show the weapons bar
+        //
+        if (hud_weapons) {
+            if (ui_weaponsbar->integer) {
+                int iEquippedDiff = 0;
+                int iOwnedDiff    = 0;
 
-				if (ui_weaponsbar->integer == 2) {
-					ui_weapHudTime = cls.realtime + ui_weaponsbartime->value;
-				}
-				else if (ui_weaponsbar->integer != 3 && ui_itemHudTime && hud_items->isVisible()) {
-					ui_weapHudTime = 0;
-				}
+                if (ui_weaponsbar->integer == 2) {
+                    ui_weapHudTime = cls.realtime + ui_weaponsbartime->value;
+                } else if (ui_weaponsbar->integer != 3 && ui_itemHudTime && hud_items->isVisible()) {
+                    ui_weapHudTime = 0;
+                }
 
-				if (ui_lastWeapHudState_Owned != cl.snap.ps.stats[STAT_WEAPONS]
-					|| ui_lastWeapHudState_Equipped != cl.snap.ps.stats[STAT_EQUIPPED_WEAPON])
-				{
-					iOwnedDiff = cl.snap.ps.stats[STAT_WEAPONS] ^ ui_lastWeapHudState_Owned & 0x3F;
-					iEquippedDiff = (ui_lastWeapHudState_Equipped ^ cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) & 0x3F;
+                if (ui_lastWeapHudState_Owned != cl.snap.ps.stats[STAT_WEAPONS]
+                    || ui_lastWeapHudState_Equipped != cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) {
+                    iOwnedDiff    = cl.snap.ps.stats[STAT_WEAPONS] ^ ui_lastWeapHudState_Owned & 0x3F;
+                    iEquippedDiff = (ui_lastWeapHudState_Equipped ^ cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) & 0x3F;
 
-					// if we have different equipment, reset the weapons hud time
-					if (iOwnedDiff || iEquippedDiff) {
-						ui_weapHudTime = cls.realtime + ui_weaponsbartime->integer;
-					}
-				}
+                    // if we have different equipment, reset the weapons hud time
+                    if (iOwnedDiff || iEquippedDiff) {
+                        ui_weapHudTime = cls.realtime + ui_weaponsbartime->integer;
+                    }
+                }
 
-				//
-				// show weapons that the player holds
-				//
-				if (iOwnedDiff)
-				{
-					if (iOwnedDiff & 1)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 1)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("pistol_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("pistol_empty", event);
-						}
-					}
-					if (iOwnedDiff & 2)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 2)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("rifle_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("rifle_empty", event);
-						}
-					}
-					if (iOwnedDiff & 4)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 4)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("smg_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("smg_empty", event);
-						}
-					}
-					if (iOwnedDiff & 8)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 8)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("mg_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("mg_empty", event);
-						}
-					}
-					if (iOwnedDiff & 16)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 16)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("grenade_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("grenade_empty", event);
-						}
-					}
-					if (iOwnedDiff & 32)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 32)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("heavy_empty", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("heavy_empty", event);
-						}
-					}
-					ui_lastWeapHudState_Owned = cl.snap.ps.stats[STAT_WEAPONS] & 0x3F | ui_lastWeapHudState_Owned & ~0x3F;
-				}
-				//
-				// highlight currently equipped weapons
-				//
-				if (iEquippedDiff)
-				{
-					if (iEquippedDiff & 1)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 1)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("pistol_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("pistol_equipped", event);
-						}
-					}
-					if (iEquippedDiff & 2)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 2)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("rifle_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("rifle_equipped", event);
-						}
-					}
-					if (iEquippedDiff & 4)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 4)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("smg_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("smg_equipped", event);
-						}
-					}
-					if (iEquippedDiff & 8)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 8)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("mg_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("mg_equipped", event);
-						}
-					}
-					if (iEquippedDiff & 16)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 16)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("grenade_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("grenade_equipped", event);
-						}
-					}
-					if (iEquippedDiff & 32)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 32)
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("heavy_equipped", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("heavy_equipped", event);
-						}
-					}
-					ui_lastWeapHudState_Equipped = cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 0x3F | ui_lastWeapHudState_Equipped & ~0x3F;
-				}
+                //
+                // show weapons that the player holds
+                //
+                if (iOwnedDiff) {
+                    if (iOwnedDiff & 1) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 1) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("pistol_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("pistol_empty", event);
+                        }
+                    }
+                    if (iOwnedDiff & 2) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 2) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("rifle_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("rifle_empty", event);
+                        }
+                    }
+                    if (iOwnedDiff & 4) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 4) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("smg_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("smg_empty", event);
+                        }
+                    }
+                    if (iOwnedDiff & 8) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 8) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("mg_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("mg_empty", event);
+                        }
+                    }
+                    if (iOwnedDiff & 16) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 16) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("grenade_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("grenade_empty", event);
+                        }
+                    }
+                    if (iOwnedDiff & 32) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 32) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("heavy_empty", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("heavy_empty", event);
+                        }
+                    }
+                    ui_lastWeapHudState_Owned =
+                        cl.snap.ps.stats[STAT_WEAPONS] & 0x3F | ui_lastWeapHudState_Owned & ~0x3F;
+                }
+                //
+                // highlight currently equipped weapons
+                //
+                if (iEquippedDiff) {
+                    if (iEquippedDiff & 1) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 1) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("pistol_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("pistol_equipped", event);
+                        }
+                    }
+                    if (iEquippedDiff & 2) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 2) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("rifle_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("rifle_equipped", event);
+                        }
+                    }
+                    if (iEquippedDiff & 4) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 4) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("smg_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("smg_equipped", event);
+                        }
+                    }
+                    if (iEquippedDiff & 8) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 8) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("mg_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("mg_equipped", event);
+                        }
+                    }
+                    if (iEquippedDiff & 16) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 16) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("grenade_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("grenade_equipped", event);
+                        }
+                    }
+                    if (iEquippedDiff & 32) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 32) {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("heavy_equipped", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("heavy_equipped", event);
+                        }
+                    }
+                    ui_lastWeapHudState_Equipped =
+                        cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 0x3F | ui_lastWeapHudState_Equipped & ~0x3F;
+                }
 
-				if (!ui_weapHudTime)
-				{
-					if (hud_weapons->isVisible()) {
-						hud_weapons->ProcessEvent(EV_HideMenu);
-					}
-				}
-				else if (ui_weapHudTime < cls.realtime || ui_itemHudTime > ui_weapHudTime)
-				{
-					ui_weapHudTime = 0;
+                if (!ui_weapHudTime) {
+                    if (hud_weapons->isVisible()) {
+                        hud_weapons->ProcessEvent(EV_HideMenu);
+                    }
+                } else if (ui_weapHudTime < cls.realtime || ui_itemHudTime > ui_weapHudTime) {
+                    ui_weapHudTime = 0;
 
-					if (hud_weapons->isVisible()) {
-						hud_weapons->ProcessEvent(EV_HideMenu);
-					}
-				}
-				else if (!hud_weapons->isVisible())
-				{
-					Event* event = new Event(EV_ShowMenu);
-					event->AddInteger(false);
-					hud_weapons->ProcessEvent(event);
+                    if (hud_weapons->isVisible()) {
+                        hud_weapons->ProcessEvent(EV_HideMenu);
+                    }
+                } else if (!hud_weapons->isVisible()) {
+                    Event *event = new Event(EV_ShowMenu);
+                    event->AddInteger(false);
+                    hud_weapons->ProcessEvent(event);
 
-					if (hud_items->isVisible()) {
-						hud_items->ProcessEvent(EV_HideMenu);
-					}
-				}
-			}
-			else
-			{
-				hud_weapons->ForceHide();
-				ui_weapHudTime = 0;
-			}
-		}
+                    if (hud_items->isVisible()) {
+                        hud_items->ProcessEvent(EV_HideMenu);
+                    }
+                }
+            } else {
+                hud_weapons->ForceHide();
+                ui_weapHudTime = 0;
+            }
+        }
 
-		//
-		// try to show the item bar
-		//
-		if (hud_items)
-		{
-			if (ui_weaponsbar->integer && ui_itemsbar->integer)
-			{
-				int iEquippedDiff = 0;
-				int iOwnedDiff = 0;
+        //
+        // try to show the item bar
+        //
+        if (hud_items) {
+            if (ui_weaponsbar->integer && ui_itemsbar->integer) {
+                int iEquippedDiff = 0;
+                int iOwnedDiff    = 0;
 
-				if (ui_weaponsbar->integer == 3)
-				{
-					ui_itemHudTime = cls.realtime + ui_weaponsbartime->integer;
+                if (ui_weaponsbar->integer == 3) {
+                    ui_itemHudTime = cls.realtime + ui_weaponsbartime->integer;
 
-					if (ui_weapHudTime && hud_weapons->isVisible()) {
-						ui_itemHudTime = 0;
-					}
-				}
+                    if (ui_weapHudTime && hud_weapons->isVisible()) {
+                        ui_itemHudTime = 0;
+                    }
+                }
 
-				if (ui_lastWeapHudState_Owned != cl.snap.ps.stats[STAT_WEAPONS]
-					|| ui_lastWeapHudState_Equipped != cl.snap.ps.stats[STAT_EQUIPPED_WEAPON])
-				{
-					iOwnedDiff = cl.snap.ps.stats[STAT_WEAPONS] ^ ui_lastWeapHudState_Owned & 0xF00;
-					iEquippedDiff = (ui_lastWeapHudState_Equipped ^ cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) & 0xF00;
+                if (ui_lastWeapHudState_Owned != cl.snap.ps.stats[STAT_WEAPONS]
+                    || ui_lastWeapHudState_Equipped != cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) {
+                    iOwnedDiff    = cl.snap.ps.stats[STAT_WEAPONS] ^ ui_lastWeapHudState_Owned & 0xF00;
+                    iEquippedDiff = (ui_lastWeapHudState_Equipped ^ cl.snap.ps.stats[STAT_EQUIPPED_WEAPON]) & 0xF00;
 
-					// if we have different equipment, reset the weapons hud time
-					if (iOwnedDiff || iEquippedDiff) {
-						ui_weapHudTime = cls.realtime + ui_weaponsbartime->integer;
-					}
-				}
+                    // if we have different equipment, reset the weapons hud time
+                    if (iOwnedDiff || iEquippedDiff) {
+                        ui_weapHudTime = cls.realtime + ui_weaponsbartime->integer;
+                    }
+                }
 
-				//
-				// show items that the player holds
-				//
-				if (iOwnedDiff)
-				{
-					if (iOwnedDiff & 0x100)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 1)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot1_icon", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot1_icon", event);
-						}
-					}
-					if (iOwnedDiff & 0x200)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 2)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot2_icon", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot2_icon", event);
-						}
-					}
-					if (iOwnedDiff & 0x400)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 4)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot3_icon", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot3_icon", event);
-						}
-					}
-					if (iOwnedDiff & 0x800)
-					{
-						if (cl.snap.ps.stats[STAT_WEAPONS] & 8)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot4_icon", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot4_icon", event);
-						}
-					}
-					ui_lastWeapHudState_Owned = cl.snap.ps.stats[STAT_WEAPONS] & 0xF00 | (ui_lastWeapHudState_Owned & 0xF0);
-				}
-				//
-				// highlight currently equipped weapons
-				//
-				else if (iEquippedDiff)
-				{
-					if (iEquippedDiff & 0x100)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 1)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot1_highlight", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot1_highlight", event);
-						}
-					}
-					else if (iEquippedDiff & 0x200)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 2)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot2_highlight", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot2_highlight", event);
-						}
-					}
-					else if (iEquippedDiff & 0x400)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 4)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot3_highlight", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot3_highlight", event);
-						}
-					}
-					else if (iEquippedDiff & 0x800)
-					{
-						if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 8)
-						{
-							Event* event = new Event(EV_Widget_Disable);
-							hud_weapons->PassEventToWidget("slot4_highlight", event);
-						}
-						else
-						{
-							Event* event = new Event(EV_Widget_Enable);
-							hud_weapons->PassEventToWidget("slot4_highlight", event);
-						}
-					}
-					else
-					{
-						ui_lastWeapHudState_Equipped = cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 0xF00 | (ui_lastWeapHudState_Equipped & 0xF0);
-					}
-				}
+                //
+                // show items that the player holds
+                //
+                if (iOwnedDiff) {
+                    if (iOwnedDiff & 0x100) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 1) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot1_icon", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot1_icon", event);
+                        }
+                    }
+                    if (iOwnedDiff & 0x200) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 2) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot2_icon", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot2_icon", event);
+                        }
+                    }
+                    if (iOwnedDiff & 0x400) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 4) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot3_icon", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot3_icon", event);
+                        }
+                    }
+                    if (iOwnedDiff & 0x800) {
+                        if (cl.snap.ps.stats[STAT_WEAPONS] & 8) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot4_icon", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot4_icon", event);
+                        }
+                    }
+                    ui_lastWeapHudState_Owned =
+                        cl.snap.ps.stats[STAT_WEAPONS] & 0xF00 | (ui_lastWeapHudState_Owned & 0xF0);
+                }
+                //
+                // highlight currently equipped weapons
+                //
+                else if (iEquippedDiff) {
+                    if (iEquippedDiff & 0x100) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 1) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot1_highlight", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot1_highlight", event);
+                        }
+                    } else if (iEquippedDiff & 0x200) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 2) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot2_highlight", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot2_highlight", event);
+                        }
+                    } else if (iEquippedDiff & 0x400) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 4) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot3_highlight", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot3_highlight", event);
+                        }
+                    } else if (iEquippedDiff & 0x800) {
+                        if (cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 8) {
+                            Event *event = new Event(EV_Widget_Disable);
+                            hud_weapons->PassEventToWidget("slot4_highlight", event);
+                        } else {
+                            Event *event = new Event(EV_Widget_Enable);
+                            hud_weapons->PassEventToWidget("slot4_highlight", event);
+                        }
+                    } else {
+                        ui_lastWeapHudState_Equipped =
+                            cl.snap.ps.stats[STAT_EQUIPPED_WEAPON] & 0xF00 | (ui_lastWeapHudState_Equipped & 0xF0);
+                    }
+                }
 
-				if (!ui_itemHudTime)
-				{
-					if (hud_items->isVisible()) {
-						hud_items->ProcessEvent(EV_HideMenu);
-					}
-				}
-				else if (ui_itemHudTime < cls.realtime || ui_weapHudTime > ui_itemHudTime)
-				{
-					ui_itemHudTime = 0;
+                if (!ui_itemHudTime) {
+                    if (hud_items->isVisible()) {
+                        hud_items->ProcessEvent(EV_HideMenu);
+                    }
+                } else if (ui_itemHudTime < cls.realtime || ui_weapHudTime > ui_itemHudTime) {
+                    ui_itemHudTime = 0;
 
-					if (hud_items->isVisible()) {
-						hud_items->ProcessEvent(EV_HideMenu);
-					}
-				}
-				else if (!hud_items->isVisible())
-				{
-					Event* event = new Event(EV_ShowMenu);
-					event->AddInteger(false);
-					hud_items->ProcessEvent(event);
+                    if (hud_items->isVisible()) {
+                        hud_items->ProcessEvent(EV_HideMenu);
+                    }
+                } else if (!hud_items->isVisible()) {
+                    Event *event = new Event(EV_ShowMenu);
+                    event->AddInteger(false);
+                    hud_items->ProcessEvent(event);
 
-					if (hud_weapons->isVisible()) {
-						hud_weapons->ProcessEvent(EV_HideMenu);
-					}
-				}
-			}
-			else
-			{
-				hud_items->ForceHide();
-				ui_itemHudTime = 0;
-			}
-		}
+                    if (hud_weapons->isVisible()) {
+                        hud_weapons->ProcessEvent(EV_HideMenu);
+                    }
+                }
+            } else {
+                hud_items->ForceHide();
+                ui_itemHudTime = 0;
+            }
+        }
 
-		if (hud_health) {
-			hud_health->ForceShow();
-		}
+        if (hud_health) {
+            hud_health->ForceShow();
+        }
 
-		//
-		// show the ammo hud
-		//
-		str ammo = "hud_ammo_";
-		ammo += CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[ITEM_WEAPON]);
+        //
+        // show the ammo hud
+        //
+        str ammo = "hud_ammo_";
+        ammo += CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[ITEM_WEAPON]);
 
-		if (!hud_ammo || hud_ammo->m_name.icmp(ammo))
-		{
-			Menu* ammoMenu = menuManager.FindMenu(ammo);
-			if (ammoMenu)
-			{
-				if (ammoMenu != hud_ammo)
-				{
-					if (hud_ammo) {
-						hud_ammo->ForceHide();
-					}
-					hud_ammo = ammoMenu;
-				}
-			}
-			else
-			{
-				ammoMenu = menuManager.FindMenu("hud_ammo_");
-				if (ammoMenu)
-				{
-					if (ammoMenu != hud_ammo)
-					{
-						if (hud_ammo) {
-							hud_ammo->ForceHide();
-						}
-						hud_ammo = ammoMenu;
-					}
-				}
-			}
-		}
+        if (!hud_ammo || hud_ammo->m_name.icmp(ammo)) {
+            Menu *ammoMenu = menuManager.FindMenu(ammo);
+            if (ammoMenu) {
+                if (ammoMenu != hud_ammo) {
+                    if (hud_ammo) {
+                        hud_ammo->ForceHide();
+                    }
+                    hud_ammo = ammoMenu;
+                }
+            } else {
+                ammoMenu = menuManager.FindMenu("hud_ammo_");
+                if (ammoMenu) {
+                    if (ammoMenu != hud_ammo) {
+                        if (hud_ammo) {
+                            hud_ammo->ForceHide();
+                        }
+                        hud_ammo = ammoMenu;
+                    }
+                }
+            }
+        }
 
-		if (hud_ammo) {
-			hud_ammo->ForceShow();
-		}
+        if (hud_ammo) {
+            hud_ammo->ForceShow();
+        }
 
-		//
-		// show the compass
-		//
-		if (hud_compass)
-		{
-			if (ui_compass->integer) {
-				hud_compass->ForceShow();
-			}
-			else {
-				hud_compass->ForceHide();
-			}
-		}
+        //
+        // show the compass
+        //
+        if (hud_compass) {
+            if (ui_compass->integer) {
+                hud_compass->ForceShow();
+            } else {
+                hud_compass->ForceHide();
+            }
+        }
 
-		//
-		// show the boss health
-		//
-		if (hud_boss)
-		{
-			if (cl.snap.ps.stats[STAT_BOSSHEALTH] > 0 && !hud_boss->isVisible())
-			{
-				Event* event = new Event(EV_ShowMenu);
-				event->AddInteger(false);
-				hud_boss->ProcessEvent(event);
-			}
-			else if (hud_boss->isVisible())
-			{
-				hud_boss->ProcessEvent(EV_HideMenu);
-			}
-		}
+        //
+        // show the boss health
+        //
+        if (hud_boss) {
+            if (cl.snap.ps.stats[STAT_BOSSHEALTH] > 0 && !hud_boss->isVisible()) {
+                Event *event = new Event(EV_ShowMenu);
+                event->AddInteger(false);
+                hud_boss->ProcessEvent(event);
+            } else if (hud_boss->isVisible()) {
+                hud_boss->ProcessEvent(EV_HideMenu);
+            }
+        }
 
-		UI_ShowHudList();
-	}
+        UI_ShowHudList();
+    }
 
-	//
-	// show the scoreboard
-	//
-	if (scoreboard_menu)
-	{
-		if (scoreboardlist && scoreboardlist->IsVisible()) {
-			scoreboard_menu->ForceShow();
-		}
-		else {
-			scoreboard_menu->ForceHide();
-		}
-	}
+    //
+    // show the scoreboard
+    //
+    if (scoreboard_menu) {
+        if (scoreboardlist && scoreboardlist->IsVisible()) {
+            scoreboard_menu->ForceShow();
+        } else {
+            scoreboard_menu->ForceHide();
+        }
+    }
 
-	uWinMan.UpdateViews();
+    uWinMan.UpdateViews();
 }
 
 /*
@@ -2493,64 +2407,53 @@ void UI_Update(void) {
 UI_MultiplayerMenuWidgetsUpdate
 ====================
 */
-void UI_MultiplayerMenuWidgetsUpdate( void ) {
-	Event *event;
+void UI_MultiplayerMenuWidgetsUpdate(void)
+{
+    Event *event;
 
-	// allow the map change widget when running in-game
-	if( com_sv_running->integer )
-	{
-		event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "startnew", event );
+    // allow the map change widget when running in-game
+    if (com_sv_running->integer) {
+        event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("startnew", event);
 
-		if( clc.state > CA_PRIMED && !cg_gametype->integer )
-		{
-			event = new Event( EV_Widget_Disable );
-			menuManager.PassEventToWidget( "changemap", event );
-		}
-		else
-		{
-			event = new Event( EV_Widget_Enable );
-			menuManager.PassEventToWidget( "changemap", event );
-		}
-	}
-	else
-	{
-		event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "changemap", event );
+        if (clc.state > CA_PRIMED && !cg_gametype->integer) {
+            event = new Event(EV_Widget_Disable);
+            menuManager.PassEventToWidget("changemap", event);
+        } else {
+            event = new Event(EV_Widget_Enable);
+            menuManager.PassEventToWidget("changemap", event);
+        }
+    } else {
+        event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("changemap", event);
 
-		event = new Event( EV_Widget_Enable );
-		menuManager.PassEventToWidget( "startnew", event );
-	}
+        event = new Event(EV_Widget_Enable);
+        menuManager.PassEventToWidget("startnew", event);
+    }
 
-	// allow the disconnect widget when in-game
-	if( clc.state > CA_PRIMED )
-	{
-		event = new Event( EV_Widget_Enable );
-		menuManager.PassEventToWidget( "disconnect", event );
-	}
-	else
-	{
-		event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "disconnect", event );
-	}
+    // allow the disconnect widget when in-game
+    if (clc.state > CA_PRIMED) {
+        event = new Event(EV_Widget_Enable);
+        menuManager.PassEventToWidget("disconnect", event);
+    } else {
+        event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("disconnect", event);
+    }
 
-	// allow the join widget when in-game
-	if( com_sv_running->integer || clc.state > CA_PRIMED )
-	{
-		event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "joinlan", event );
+    // allow the join widget when in-game
+    if (com_sv_running->integer || clc.state > CA_PRIMED) {
+        event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("joinlan", event);
 
-		event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "joininternet", event );
-	}
-	else
-	{
-		event = new Event( EV_Widget_Enable );
-		menuManager.PassEventToWidget( "joinlan", event );
+        event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("joininternet", event);
+    } else {
+        event = new Event(EV_Widget_Enable);
+        menuManager.PassEventToWidget("joinlan", event);
 
-		event = new Event( EV_Widget_Enable );
-		menuManager.PassEventToWidget( "joininternet", event );
-	}
+        event = new Event(EV_Widget_Enable);
+        menuManager.PassEventToWidget("joininternet", event);
+    }
 }
 
 /*
@@ -2558,19 +2461,55 @@ void UI_MultiplayerMenuWidgetsUpdate( void ) {
 UI_MainMenuWidgetsUpdate
 ====================
 */
-void UI_MainMenuWidgetsUpdate( void ) {
-	if( clc.state > CA_PRIMED )
-	{
-		Event *event = new Event( EV_Widget_Enable );
-		menuManager.PassEventToWidget( "backtogame", event );
-	}
-	else
-	{
-		Event *event = new Event( EV_Widget_Disable );
-		menuManager.PassEventToWidget( "backtogame", event );
-	}
+void UI_MainMenuWidgetsUpdate(void)
+{
+    if (clc.state > CA_PRIMED) {
+        Event *event = new Event(EV_Widget_Enable);
+        menuManager.PassEventToWidget("backtogame", event);
+    } else {
+        Event *event = new Event(EV_Widget_Disable);
+        menuManager.PassEventToWidget("backtogame", event);
+    }
 
-	UI_UpdateContinueGame();
+    UI_UpdateContinueGame();
+}
+
+/*
+====================
+UI_MultiplayerMainMenuWidgetsUpdate
+====================
+*/
+// Added in 2.0
+void UI_MultiplayerMainMenuWidgetsUpdate(void)
+{
+    static const cvar_t *cg_allowvote = Cvar_Get("cg_allowvote", "1", 0);
+
+    if (cg_allowvote->integer) {
+        menuManager.PassEventToWidget("cantvote", new Event(EV_Widget_Disable));
+
+        if (atoi(CL_ConfigString(CS_VOTE_TIME))) {
+            menuManager.PassEventToWidget("callvotebutton", new Event(EV_Widget_Disable));
+
+            if (cl.snap.ps.voted) {
+                menuManager.PassEventToWidget("votebutton", new Event(EV_Widget_Disable));
+                menuManager.PassEventToWidget("alreadyvoted", new Event(EV_Widget_Enable));
+            } else {
+                menuManager.PassEventToWidget("votebutton", new Event(EV_Widget_Enable));
+                menuManager.PassEventToWidget("alreadyvoted", new Event(EV_Widget_Disable));
+            }
+        } else {
+            menuManager.PassEventToWidget("callvotebutton", new Event(EV_Widget_Enable));
+            menuManager.PassEventToWidget("votebutton", new Event(EV_Widget_Disable));
+            menuManager.PassEventToWidget("alreadyvoted", new Event(EV_Widget_Disable));
+        }
+    } else {
+        menuManager.PassEventToWidget("callvotebutton", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("votebutton", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("alreadyvoted", new Event(EV_Widget_Disable));
+        menuManager.PassEventToWidget("cantvote", new Event(EV_Widget_Enable));
+    }
+
+    UI_UpdateContinueGame();
 }
 
 /*
@@ -2580,26 +2519,23 @@ UI_ToggleMenu
 Toggle a menu
 ====================
 */
-void UI_ToggleMenu( str name ) {
-	Menu *menu;
+void UI_ToggleMenu(str name)
+{
+    Menu *menu;
 
-	menu = menuManager.CurrentMenu();
+    menu = menuManager.CurrentMenu();
 
-	if( menu )
-	{
-		UI_ForceMenuOff( false );
+    if (menu) {
+        UI_ForceMenuOff(false);
 
-		if( menu->m_name != name )
-		{
-			UI_PushMenu( name );
-		}
-	}
-	else
-	{
-		UI_PushMenu( name );
-	}
+        if (menu->m_name != name) {
+            UI_PushMenu(name);
+        }
+    } else {
+        UI_PushMenu(name);
+    }
 
-	UI_FocusMenuIfExists();
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -2607,13 +2543,14 @@ void UI_ToggleMenu( str name ) {
 UI_ToggleMenu_f
 ====================
 */
-void UI_ToggleMenu_f() {
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: togglemenu <menuname>\n" );
-		return;
-	}
+void UI_ToggleMenu_f()
+{
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: togglemenu <menuname>\n");
+        return;
+    }
 
-	UI_ToggleMenu( Cmd_Argv( 1 ) );
+    UI_ToggleMenu(Cmd_Argv(1));
 }
 
 /*
@@ -2621,33 +2558,32 @@ void UI_ToggleMenu_f() {
 UI_PopMenu
 ====================
 */
-void UI_PopMenu( qboolean restore_cvars ) {
-	Menu *menu;
+void UI_PopMenu(qboolean restore_cvars)
+{
+    Menu *menu;
 
-	if( uWinMan.DialogExists() ) {
-		uWinMan.RemoveAllDialogBoxes();
-		return;
-	}
+    if (uWinMan.DialogExists()) {
+        uWinMan.RemoveAllDialogBoxes();
+        return;
+    }
 
-	if( menuManager.CurrentMenu() ) {
-		menuManager.PopMenu( restore_cvars );
-	}
+    if (menuManager.CurrentMenu()) {
+        menuManager.PopMenu(restore_cvars);
+    }
 
-	UI_FocusMenuIfExists();
+    UI_FocusMenuIfExists();
 
-	menu = menuManager.CurrentMenu();
+    menu = menuManager.CurrentMenu();
 
-	if( menu )
-	{
-		if( !memcmp( menu->m_name.c_str(), "main", 5 ) )
-		{
-			UI_MainMenuWidgetsUpdate();
-		}
-		else if( !memcmp(menu->m_name.c_str(), "multiplayer", 12 ) )
-		{
-			UI_MultiplayerMenuWidgetsUpdate();
-		}
-	}
+    if (menu) {
+        if (!str::cmp(menu->m_name, "main")) {
+            UI_MainMenuWidgetsUpdate();
+        } else if (!str::cmp(menu->m_name, "dm_main")) {
+            UI_MultiplayerMainMenuWidgetsUpdate();
+        } else if (!str::cmp(menu->m_name, "multiplayer")) {
+            UI_MultiplayerMenuWidgetsUpdate();
+        }
+    }
 }
 
 /*
@@ -2655,8 +2591,9 @@ void UI_PopMenu( qboolean restore_cvars ) {
 UI_DeactiveFloatingWindows
 ====================
 */
-void UI_DeactiveFloatingWindows( void ) {
-	uWinMan.DeactiveFloatingWindows();
+void UI_DeactiveFloatingWindows(void)
+{
+    uWinMan.DeactiveFloatingWindows();
 }
 
 /*
@@ -2664,30 +2601,28 @@ void UI_DeactiveFloatingWindows( void ) {
 UI_PushMenu
 ====================
 */
-void UI_PushMenu( const char *name ) {
-	Menu *menu = menuManager.CurrentMenu();
-	qboolean bDiff = qfalse;
+void UI_PushMenu(const char *name)
+{
+    Menu    *menu  = menuManager.CurrentMenu();
+    qboolean bDiff = qfalse;
 
-	if( menu )
-	{
-		bDiff = strcmp( menu->m_name, name ) != 0;
-	}
+    if (menu) {
+        bDiff = strcmp(menu->m_name, name) != 0;
+    }
 
-	if( !bDiff || !ui_pLoadingMenu || menu != ui_pLoadingMenu )
-	{
-		menuManager.PushMenu( name );
-	}
+    if (!bDiff || !ui_pLoadingMenu || menu != ui_pLoadingMenu) {
+        menuManager.PushMenu(name);
+    }
 
-	UI_FocusMenuIfExists();
+    UI_FocusMenuIfExists();
 
-	if( !memcmp( name, "main", 5 ) )
-	{
-		UI_MainMenuWidgetsUpdate();
-	}
-	else if( !memcmp( name, "multiplayer", 12 ) )
-	{
-		UI_MultiplayerMenuWidgetsUpdate();
-	}
+    if (!str::cmp(name, "main")) {
+        UI_MainMenuWidgetsUpdate();
+    } else if (!str::cmp(name, "dm_main")) {
+        UI_MultiplayerMainMenuWidgetsUpdate();
+    } else if (!str::cmp(name, "multiplayer")) {
+        UI_MultiplayerMenuWidgetsUpdate();
+    }
 }
 
 /*
@@ -2695,21 +2630,20 @@ void UI_PushMenu( const char *name ) {
 UI_ForceMenu
 ====================
 */
-void UI_ForceMenu( const char *name ) {
-	Menu *menu = menuManager.CurrentMenu();
-	qboolean bDiff = qfalse;
+void UI_ForceMenu(const char *name)
+{
+    Menu    *menu  = menuManager.CurrentMenu();
+    qboolean bDiff = qfalse;
 
-	if( menu )
-	{
-		bDiff = strcmp( menu->m_name, name ) != 0;
-	}
+    if (menu) {
+        bDiff = strcmp(menu->m_name, name) != 0;
+    }
 
-	if( !menu || bDiff )
-	{
-		menuManager.ForceMenu( name );
-	}
+    if (!menu || bDiff) {
+        menuManager.ForceMenu(name);
+    }
 
-	UI_FocusMenuIfExists();
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -2717,21 +2651,21 @@ void UI_ForceMenu( const char *name ) {
 UI_ShowMenu
 ====================
 */
-void UI_ShowMenu( const char *name, qboolean bForce ) {
-	Menu *pMenu;
+void UI_ShowMenu(const char *name, qboolean bForce)
+{
+    Menu *pMenu;
 
-	pMenu = menuManager.FindMenu( name );
+    pMenu = menuManager.FindMenu(name);
 
-	if( pMenu )
-	{
-		if( bForce ) {
-			pMenu->ForceShow();
-		} else if( !pMenu->isVisible() ) {
-			Event *event = new Event( EV_ShowMenu );
-			event->AddInteger( false );
-			pMenu->ProcessEvent( event );
-		}
-	}
+    if (pMenu) {
+        if (bForce) {
+            pMenu->ForceShow();
+        } else if (!pMenu->isVisible()) {
+            Event *event = new Event(EV_ShowMenu);
+            event->AddInteger(false);
+            pMenu->ProcessEvent(event);
+        }
+    }
 }
 
 /*
@@ -2739,19 +2673,19 @@ void UI_ShowMenu( const char *name, qboolean bForce ) {
 UI_HideMenu
 ====================
 */
-void UI_HideMenu( const char *name, qboolean bForce ) {
-	Menu *pMenu;
+void UI_HideMenu(const char *name, qboolean bForce)
+{
+    Menu *pMenu;
 
-	pMenu = menuManager.FindMenu( name );
+    pMenu = menuManager.FindMenu(name);
 
-	if( pMenu )
-	{
-		if( bForce ) {
-			pMenu->ForceHide();
-		} else if( pMenu->isVisible() ) {
-			pMenu->ProcessEvent( EV_HideMenu );
-		}
-	}
+    if (pMenu) {
+        if (bForce) {
+            pMenu->ForceHide();
+        } else if (pMenu->isVisible()) {
+            pMenu->ProcessEvent(EV_HideMenu);
+        }
+    }
 }
 
 /*
@@ -2759,13 +2693,14 @@ void UI_HideMenu( const char *name, qboolean bForce ) {
 UI_PushMenu_f
 ====================
 */
-void UI_PushMenu_f( void ) {
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: pushmenu <menuname>\n" );
-		return;
-	}
+void UI_PushMenu_f(void)
+{
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: pushmenu <menuname>\n");
+        return;
+    }
 
-	UI_PushMenu( Cmd_Argv( 1 ) );
+    UI_PushMenu(Cmd_Argv(1));
 }
 
 /*
@@ -2773,59 +2708,56 @@ void UI_PushMenu_f( void ) {
 UI_PushMenuSP_f
 ====================
 */
-void UI_PushMenuSP_f( void ) {
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: pushmenu_sp <menuname>\n" );
-		return;
-	}
+void UI_PushMenuSP_f(void)
+{
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: pushmenu_sp <menuname>\n");
+        return;
+    }
 
-	if( ( !com_cl_running || !com_cl_running->integer
-		|| clc.state == CA_DISCONNECTED || !cg_gametype->integer )
-		&& ( !com_sv_running || !com_sv_running->integer || !g_gametype->integer ) )
-	{
-		UI_PushMenu( Cmd_Argv( 1 ) );
-	}
+    if ((!com_cl_running || !com_cl_running->integer || clc.state == CA_DISCONNECTED || !cg_gametype->integer)
+        && (!com_sv_running || !com_sv_running->integer || g_gametype->integer == GT_SINGLE_PLAYER)) {
+        UI_PushMenu(Cmd_Argv(1));
+    }
 }
+
 /*
 
 ====================
 UI_PushMenuMP_f
 ====================
 */
-void UI_PushMenuMP_f( void ) {
-	const char *cmd;
+void UI_PushMenuMP_f(void)
+{
+    const char *cmd;
 
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: pushmenu_mp <menuname>\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: pushmenu_mp <menuname>\n");
+        return;
+    }
 
-	if( com_cl_running && com_cl_running->integer
-		&& clc.state != CA_DISCONNECTED && cg_gametype->integer
-		&& com_sv_running && com_sv_running->integer && g_gametype->integer )
-	{
-		cmd = Cmd_Argv( 1 );
+    if (com_cl_running && com_cl_running->integer && clc.state != CA_DISCONNECTED && cg_gametype->integer
+        && com_sv_running && com_sv_running->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
+        cmd = Cmd_Argv(1);
 
-		//
-		// Push the right menu depending on the gametype
-		//
-		if( !Q_stricmp( cmd, "SelectTeam" ) )
-		{
-			switch( cg_gametype->integer )
-			{
-			case GT_FFA:
-				UI_PushMenu( "SelectFFAModel" );
-				break;
-			case GT_OBJECTIVE:
-				UI_PushMenu( "ObjSelectTeam" );
-				break;
-			default:
-				UI_PushMenu( "SelectTeam" );
-			}
-		} else {
-			UI_PushMenu( cmd );
-		}
-	}
+        //
+        // Push the right menu depending on the gametype
+        //
+        if (!Q_stricmp(cmd, "SelectTeam")) {
+            switch (cg_gametype->integer) {
+            case GT_FFA:
+                UI_PushMenu("SelectFFAModel");
+                break;
+            case GT_OBJECTIVE:
+                UI_PushMenu("ObjSelectTeam");
+                break;
+            default:
+                UI_PushMenu("SelectTeam");
+            }
+        } else {
+            UI_PushMenu(cmd);
+        }
+    }
 }
 
 /*
@@ -2833,13 +2765,14 @@ void UI_PushMenuMP_f( void ) {
 UI_ForceMenu_f
 ====================
 */
-void UI_ForceMenu_f( void ) {
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: forcemenu <menuname>\n" );
-		return;
-	}
+void UI_ForceMenu_f(void)
+{
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: forcemenu <menuname>\n");
+        return;
+    }
 
-	UI_ForceMenu( Cmd_Argv( 1 ) );
+    UI_ForceMenu(Cmd_Argv(1));
 }
 
 /*
@@ -2847,13 +2780,14 @@ void UI_ForceMenu_f( void ) {
 UI_PopMenu_f
 ====================
 */
-void UI_PopMenu_f( void ) {
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: popmenu <restore_cvars - set to 1 if you want all cvars restored to their original values>" );
-		return;
-	}
+void UI_PopMenu_f(void)
+{
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: popmenu <restore_cvars - set to 1 if you want all cvars restored to their original values>");
+        return;
+    }
 
-	UI_PopMenu( atoi( Cmd_Argv( 1 ) ) );
+    UI_PopMenu(atoi(Cmd_Argv(1)));
 }
 
 /*
@@ -2861,24 +2795,25 @@ void UI_PopMenu_f( void ) {
 UI_ShowMenu_f
 ====================
 */
-void UI_ShowMenu_f( void ) {
-	qboolean bForce;
-	const char *name;
+void UI_ShowMenu_f(void)
+{
+    qboolean    bForce;
+    const char *name;
 
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: showmenu <menuname>\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: showmenu <menuname>\n");
+        return;
+    }
 
-	name = Cmd_Argv( 1 );
+    name = Cmd_Argv(1);
 
-	if( Cmd_Argc() > 2 ) {
-		bForce = atoi( Cmd_Argv( 2 ) );
-	} else {
-		bForce = qfalse;
-	}
+    if (Cmd_Argc() > 2) {
+        bForce = atoi(Cmd_Argv(2));
+    } else {
+        bForce = qfalse;
+    }
 
-	UI_ShowMenu( name, bForce );
+    UI_ShowMenu(name, bForce);
 }
 
 /*
@@ -2886,24 +2821,25 @@ void UI_ShowMenu_f( void ) {
 UI_HideMenu_f
 ====================
 */
-void UI_HideMenu_f( void ) {
-	qboolean bForce;
-	const char *name;
+void UI_HideMenu_f(void)
+{
+    qboolean    bForce;
+    const char *name;
 
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: hidemenu <menuname>\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: hidemenu <menuname>\n");
+        return;
+    }
 
-	name = Cmd_Argv( 1 );
+    name = Cmd_Argv(1);
 
-	if( Cmd_Argc() > 2 ) {
-		bForce = atoi( Cmd_Argv( 2 ) );
-	} else {
-		bForce = qfalse;
-	}
+    if (Cmd_Argc() > 2) {
+        bForce = atoi(Cmd_Argv(2));
+    } else {
+        bForce = qfalse;
+    }
 
-	UI_HideMenu( name, bForce );
+    UI_HideMenu(name, bForce);
 }
 
 /*
@@ -2911,25 +2847,25 @@ void UI_HideMenu_f( void ) {
 UI_WidgetCommand_f
 ====================
 */
-void UI_WidgetCommand_f( void ) {
-	str name;
-	str commandstring;
+void UI_WidgetCommand_f(void)
+{
+    str name;
+    str commandstring;
 
-	if( Cmd_Argc() <= 2 ) {
-		Com_Printf( "Usage: widgetcommand <name> <args1...argsN>\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 2) {
+        Com_Printf("Usage: widgetcommand <name> <args1...argsN>\n");
+        return;
+    }
 
-	name = Cmd_Argv( 1 );
-	commandstring = Cmd_Argv( 2 );
-	Event *event = new Event( commandstring );
+    name          = Cmd_Argv(1);
+    commandstring = Cmd_Argv(2);
+    Event *event  = new Event(commandstring);
 
-	for( int i = 3; i < Cmd_Argc(); i++ )
-	{
-		event->AddToken( Cmd_Argv( i ) );
-	}
+    for (int i = 3; i < Cmd_Argc(); i++) {
+        event->AddToken(Cmd_Argv(i));
+    }
 
-	menuManager.PassEventToWidget( name, event );
+    menuManager.PassEventToWidget(name, event);
 }
 
 /*
@@ -2937,25 +2873,25 @@ void UI_WidgetCommand_f( void ) {
 UI_GlobalWidgetCommand_f
 ====================
 */
-void UI_GlobalWidgetCommand_f( void ) {
-	str name;
-	str commandstring;
+void UI_GlobalWidgetCommand_f(void)
+{
+    str name;
+    str commandstring;
 
-	if( Cmd_Argc() <= 2 ) {
-		Com_Printf( "Usage: globalwidgetcommand <name> <args1...argsN>\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 2) {
+        Com_Printf("Usage: globalwidgetcommand <name> <args1...argsN>\n");
+        return;
+    }
 
-	name = Cmd_Argv( 1 );
-	commandstring = Cmd_Argv( 2 );
-	Event *event = new Event( commandstring );
+    name          = Cmd_Argv(1);
+    commandstring = Cmd_Argv(2);
+    Event *event  = new Event(commandstring);
 
-	for( int i = 3; i < Cmd_Argc(); i++ )
-	{
-		event->AddToken( Cmd_Argv( i ) );
-	}
+    for (int i = 3; i < Cmd_Argc(); i++) {
+        event->AddToken(Cmd_Argv(i));
+    }
 
-	uWinMan.PassEventToWidget( name, event );
+    uWinMan.PassEventToWidget(name, event);
 }
 
 /*
@@ -2963,8 +2899,9 @@ void UI_GlobalWidgetCommand_f( void ) {
 UI_ListMenus_f
 ====================
 */
-void UI_ListMenus_f() {
-	menuManager.ListMenus();
+void UI_ListMenus_f()
+{
+    menuManager.ListMenus();
 }
 
 /*
@@ -2972,8 +2909,9 @@ void UI_ListMenus_f() {
 UI_BindActive
 ====================
 */
-qboolean UI_BindActive( void ) {
-	return uWinMan.BindActive() != NULL;
+qboolean UI_BindActive(void)
+{
+    return uWinMan.BindActive() != NULL;
 }
 
 /*
@@ -2981,14 +2919,15 @@ qboolean UI_BindActive( void ) {
 UI_SetReturnMenuToCurrent
 ====================
 */
-void UI_SetReturnMenuToCurrent( void ) {
-	Menu *currentMenu = menuManager.CurrentMenu();
+void UI_SetReturnMenuToCurrent(void)
+{
+    Menu *currentMenu = menuManager.CurrentMenu();
 
-	if( currentMenu ) {
-		Cvar_Set( "ui_returnmenu", currentMenu->m_name );
-	} else {
-		Cvar_Set( "ui_returnmenu", "" );
-	}
+    if (currentMenu) {
+        Cvar_Set("ui_returnmenu", currentMenu->m_name);
+    } else {
+        Cvar_Set("ui_returnmenu", "");
+    }
 }
 
 /*
@@ -2996,33 +2935,33 @@ void UI_SetReturnMenuToCurrent( void ) {
 UI_PushReturnMenu
 ====================
 */
-qboolean UI_PushReturnMenu() {
-	str sMenuName;
+qboolean UI_PushReturnMenu()
+{
+    str sMenuName;
 
-	if( !ui_returnmenu->string || !*ui_returnmenu->string ) {
-		return qfalse;
-	}
+    if (!ui_returnmenu->string || !*ui_returnmenu->string) {
+        return qfalse;
+    }
 
-	sMenuName = ui_returnmenu->string;
+    sMenuName = ui_returnmenu->string;
 
-	UI_PushMenu( sMenuName );
-	Cvar_Set( "ui_returnmenu", "" );
-	UI_FocusMenuIfExists();
+    UI_PushMenu(sMenuName);
+    Cvar_Set("ui_returnmenu", "");
+    UI_FocusMenuIfExists();
 
-	if( !menuManager.CurrentMenu() ) {
-		return qfalse;
-	}
+    if (!menuManager.CurrentMenu()) {
+        return qfalse;
+    }
 
-	if( !memcmp( sMenuName.c_str(), "main", 5 ) )
-	{
-		UI_MainMenuWidgetsUpdate();
-	}
-	else if( !memcmp( sMenuName.c_str(), "multiplayer", 12 ) )
-	{
-		UI_MultiplayerMenuWidgetsUpdate();
-	}
+    if (!str::cmp(sMenuName, "main")) {
+        UI_MainMenuWidgetsUpdate();
+    } else if (!str::cmp(sMenuName, "dm_main")) {
+        UI_MultiplayerMainMenuWidgetsUpdate();
+    } else if (!str::cmp(sMenuName, "multiplayer")) {
+        UI_MultiplayerMenuWidgetsUpdate();
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -3030,8 +2969,9 @@ qboolean UI_PushReturnMenu() {
 UI_PushReturnMenu_f
 ====================
 */
-void UI_PushReturnMenu_f( void ) {
-	UI_PushReturnMenu();
+void UI_PushReturnMenu_f(void)
+{
+    UI_PushReturnMenu();
 }
 
 /*
@@ -3039,59 +2979,54 @@ void UI_PushReturnMenu_f( void ) {
 UI_MenuEscape
 ====================
 */
-void UI_MenuEscape( const char *name ) {
-	if( server_loading ) {
-		return;
-	}
+void UI_MenuEscape(const char *name)
+{
+    if (server_loading) {
+        return;
+    }
 
-	if( uWinMan.BindActive() )
-	{
-		UI_KeyEvent( K_ESCAPE, qfalse );
-	}
-	else if( menuManager.CurrentMenu() != mainmenu || clc.state != CA_DISCONNECTED )
-	{
-		if( uWinMan.DialogExists() )
-		{
-			uWinMan.RemoveAllDialogBoxes();
-		}
-		else
-		{
-			if( menuManager.CurrentMenu() )
-			{
-				menuManager.PopMenu( qtrue );
-			}
-			else if( !Q_stricmp( name, "main" ) && clc.state > CA_PRIMED && cg_gametype->integer > 0 )
-			{
-				UI_PushMenu( "dm_main" );
-			}
-			else
-			{
-				UI_PushMenu( name );
-			}
+    if (uWinMan.BindActive()) {
+        UI_KeyEvent(K_ESCAPE, qfalse);
+        return;
+    }
 
-			UI_FocusMenuIfExists();
+    if (menuManager.CurrentMenu() == mainmenu && clc.state == CA_DISCONNECTED) {
+        if (developer->integer) {
+            if (UI_ConsoleIsVisible()) {
+                UI_CloseConsole();
+            } else {
+                UI_OpenConsole();
+            }
+        }
+        return;
+    }
 
-			if( menuManager.CurrentMenu() )
-			{
-				if( !memcmp( name, "main", 5 ) )
-				{
-					UI_MainMenuWidgetsUpdate();
-				}
-				else if( !memcmp( name, "multiplayer", 12 ) )
-				{
-					UI_MultiplayerMenuWidgetsUpdate();
-				}
-			}
-		}
-	}
-	else if( developer->integer )
-	{
-		if( UI_ConsoleIsVisible() ) {
-			UI_CloseConsole();
-		} else {
-			UI_OpenConsole();
-		}
-	}
+    if (uWinMan.DialogExists()) {
+        uWinMan.RemoveAllDialogBoxes();
+        return;
+    }
+
+    if (menuManager.CurrentMenu()) {
+        menuManager.PopMenu(qtrue);
+    } else if (!Q_stricmp(name, "main") && clc.state > CA_PRIMED && cg_gametype->integer > 0) {
+        // multiplayer
+        UI_PushMenu("dm_main");
+    } else {
+        // single-player
+        UI_PushMenu(name);
+    }
+
+    UI_FocusMenuIfExists();
+
+    if (menuManager.CurrentMenu()) {
+        if (!str::cmp(name, "main")) {
+            UI_MainMenuWidgetsUpdate();
+        } else if (!str::cmp(name, "dm_main")) {
+            UI_MultiplayerMainMenuWidgetsUpdate();
+        } else if (!str::cmp(name, "multiplayer")) {
+            UI_MultiplayerMenuWidgetsUpdate();
+        }
+    }
 }
 
 /*
@@ -3099,9 +3034,10 @@ void UI_MenuEscape( const char *name ) {
 UI_ForceMenuOff
 ====================
 */
-void UI_ForceMenuOff( bool force ) {
-	menuManager.ClearMenus( force );
-	UI_FocusMenuIfExists();
+void UI_ForceMenuOff(bool force)
+{
+    menuManager.ClearMenus(force);
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -3109,34 +3045,30 @@ void UI_ForceMenuOff( bool force ) {
 UI_UpdateConnectionString
 ====================
 */
-void UI_UpdateConnectionString( void ) {
-}
+void UI_UpdateConnectionString(void) {}
 
 /*
 ====================
 UI_ParseServerInfoMessage
 ====================
 */
-void UI_ParseServerInfoMessage( msg_t *msg ) {
-
-}
+void UI_ParseServerInfoMessage(msg_t *msg) {}
 
 /*
 ====================
 UI_DrawConnectText
 ====================
 */
-void UI_DrawConnectText( void ) {
-
-}
+void UI_DrawConnectText(void) {}
 
 /*
 ====================
 UI_DrawConnect
 ====================
 */
-void UI_DrawConnect( void ) {
-	Com_Printf( "UI_DrawConnect called\n" );
+void UI_DrawConnect(void)
+{
+    Com_Printf("UI_DrawConnect called\n");
 }
 
 /*
@@ -3144,55 +3076,49 @@ void UI_DrawConnect( void ) {
 CL_PingServers_f
 ====================
 */
-void CL_PingServers_f( void ) {
-	int i;
-	netadr_t adr;
-	char name[ 32 ];
-	const char *adrstring;
-	cvar_t *noudp;
-	cvar_t *noipx;
+void CL_PingServers_f(void)
+{
+    int         i;
+    netadr_t    adr;
+    char        name[32];
+    const char *adrstring;
+    cvar_t     *noudp;
+    cvar_t     *noipx;
 
-	Com_Printf( "pinging broadcast...\n" );
+    Com_Printf("pinging broadcast...\n");
 
-	noudp = Cvar_Get( "noudp", "0", CVAR_INIT );
-	if( !noudp->integer )
-	{
-		adr.type = NA_BROADCAST;
-		adr.port = BigShort( 12203 );
-		NET_OutOfBandPrint( NS_SERVER, adr, "info %i", 8 );
-	}
+    noudp = Cvar_Get("noudp", "0", CVAR_INIT);
+    if (!noudp->integer) {
+        adr.type = NA_BROADCAST;
+        adr.port = BigShort(12203);
+        CL_NET_OutOfBandPrint(adr, "info %i", 8);
+    }
 
-	noipx = Cvar_Get( "noipx", "0", CVAR_INIT );
-	if( !noipx->integer )
-	{
-		adr.type = NA_BROADCAST_IPX;
-		adr.port = BigShort( 12203 );
-		NET_OutOfBandPrint( NS_SERVER, adr, "info %i", 8 );
-	}
+    noipx = Cvar_Get("noipx", "0", CVAR_INIT);
+    if (!noipx->integer) {
+        adr.type = NA_BROADCAST_IPX;
+        adr.port = BigShort(12203);
+        CL_NET_OutOfBandPrint(adr, "info %i", 8);
+    }
 
-	for( i = 0; i < 16; i++ )
-	{
-		Com_sprintf( name, sizeof( name ), "adr%i", i );
-		adrstring = Cvar_VariableString( name );
+    for (i = 0; i < 16; i++) {
+        Com_sprintf(name, sizeof(name), "adr%i", i);
+        adrstring = Cvar_VariableString(name);
 
-		if( adrstring && *adrstring )
-		{
-			Com_Printf( "pinging %s...\n", adrstring );
+        if (adrstring && *adrstring) {
+            Com_Printf("pinging %s...\n", adrstring);
 
-			if( NET_StringToAdr( adrstring, &adr, NA_IP ) )
-			{
-				if( !adr.port ) {
-					adr.port = BigShort( 12203 );
-				}
+            if (NET_StringToAdr(adrstring, &adr, NA_IP)) {
+                if (!adr.port) {
+                    adr.port = BigShort(12203);
+                }
 
-				NET_OutOfBandPrint( NS_SERVER, adr, "info %i", 8 );
-			}
-			else
-			{
-				Com_Printf( "Bad address: %s\n", adrstring );
-			}
-		}
-	}
+                CL_NET_OutOfBandPrint(adr, "info %i", 8);
+            } else {
+                Com_Printf("Bad address: %s\n", adrstring);
+            }
+        }
+    }
 }
 
 /*
@@ -3200,19 +3126,19 @@ void CL_PingServers_f( void ) {
 UI_MapList_f
 ====================
 */
-void UI_MapList_f( void ) {
-	str mappath = "maps";
+void UI_MapList_f(void)
+{
+    str mappath = "maps";
 
-	if( Cmd_Argc() == 2 )
-	{
-		mappath += "/";
-		mappath += Cmd_Argv( 1 );
-	}
+    if (Cmd_Argc() == 2) {
+        mappath += "/";
+        mappath += Cmd_Argv(1);
+    }
 
-	MapRunnerClass *map = new MapRunnerClass;
-	map->Setup( "maps", mappath, ".bsp" );
+    MapRunnerClass *map = new MapRunnerClass;
+    map->Setup("maps", mappath, ".bsp", "_sml");
 
-	CL_SetMousePos( cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2 );
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3220,26 +3146,39 @@ void UI_MapList_f( void ) {
 UI_DMMapSelect_f
 ====================
 */
-void UI_DMMapSelect_f( void ) {
-	str basepath = "maps";
-	str mappath = "maps";
+void UI_DMMapSelect_f(void)
+{
+    str basepath = "maps";
+    str mappath;
+    str gametype;
 
-	if( Cmd_Argc() > 1 )
-	{
-		mappath += "/";
-		mappath += Cmd_Argv( 1 );
-	}
+    if (Cmd_Argc() > 1) {
+        const char *path;
 
-	if( Cmd_Argc() > 2 )
-	{
-		basepath += "/";
-		basepath += Cmd_Argv( 2 );
-	}
+        path = Cmd_Argv(1);
 
-	MpMapPickerClass *map = new MpMapPickerClass;
-	map->Setup( basepath, mappath );
+        if (strcmp(path, ".")) {
+            basepath += "/";
+            basepath += path;
+        }
 
-	CL_SetMousePos( cls.glconfig.vidWidth / 2, cls.glconfig.vidHeight / 2 );
+        if (Cmd_Argc() > 2) {
+            path = Cmd_Argv(2);
+            if (strcmp(path, ".")) {
+                mappath += "maps/";
+                mappath += path;
+            }
+        }
+
+        if (Cmd_Argc() > 3) {
+            gametype = Cmd_Argv(3);
+        }
+    }
+
+    MpMapPickerClass *map = new MpMapPickerClass;
+    map->Setup(basepath, mappath, gametype);
+
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3247,147 +3186,156 @@ void UI_DMMapSelect_f( void ) {
 UI_StartDMMap_f
 ====================
 */
-void UI_StartDMMap_f( void ) {
-	int iDedicated;
-	int iMaxClients;
-	int iUseGameSpy;
-	int iGameType = GT_FFA;
-	int iFragLimit;
-	int iTimeLimit;
-	int iTeamDamage;
-	int iInactiveSpectate;
-	int iInactiveKick;
-	const char *pszTemp;
-	const char *pszGameTypeString = "Free-For-All";
-	const char *pszMapName;
-	const char *pszMapListCvar = "sv_maplist";
-	const char *pszMapListString;
-	char szHostName[ 32 ];
+void UI_StartDMMap_f(void)
+{
+    int         iDedicated;
+    int         iMaxClients;
+    int         iUseGameSpy;
+    int         iGameType = GT_FFA;
+    int         iFragLimit;
+    int         iTimeLimit;
+    int         iTeamDamage;
+    int         iInactiveSpectate;
+    int         iInactiveKick;
+    const char *pszTemp;
+    const char *pszGameTypeString = "Free-For-All";
+    const char *pszMapName;
+    const char *pszMapListCvar = "sv_maplist";
+    const char *pszMapListString;
+    char        szHostName[32];
 
-	if( Cmd_Argc() > 1 )
-	{
-		iGameType = atoi( Cmd_Argv( 1 ) );
-		if( Cmd_Argc() > 2 ) {
-			pszGameTypeString = Cmd_Argv( 2 );
+    if (Cmd_Argc() > 1) {
+        iGameType = atoi(Cmd_Argv(1));
+        if (Cmd_Argc() > 2) {
+            pszGameTypeString = Cmd_Argv(2);
 
-			if( Cmd_Argc() > 3 ) {
-				pszMapListCvar = Cmd_Argv( 3 );
-			}
-		}
-	}
+            if (Cmd_Argc() > 3) {
+                pszMapListCvar = Cmd_Argv(3);
+            }
+        }
+    }
 
-	pszMapName = CvarGetForUI( "ui_dmmap", "" );
+    pszMapName = CvarGetForUI("ui_dmmap", "");
 
-	if( !*pszMapName ) {
-		return;
-	}
+    if (!*pszMapName) {
+        return;
+    }
 
-	iDedicated = atoi( CvarGetForUI( "ui_dedicated", "0" ) );
+    iDedicated = atoi(CvarGetForUI("ui_dedicated", "0"));
 
-	if( iDedicated < 0 ) {
-		iDedicated = 0;
-	} else if( iDedicated > 1 ) {
-		iDedicated = 1;
-	}
+    if (iDedicated < 0) {
+        iDedicated = 0;
+    } else if (iDedicated > 1) {
+        iDedicated = 1;
+    }
 
-	Cvar_SetValue( "ui_dedicated", iDedicated );
+    Cvar_SetValue("ui_dedicated", iDedicated);
 
-	iMaxClients = atoi( CvarGetForUI( "ui_maxclients", "0" ) );
+    iMaxClients = atoi(CvarGetForUI("ui_maxclients", "0"));
 
-	if( iMaxClients < 1 ) {
-		iMaxClients = 1;
-	} else if( iMaxClients > MAX_CLIENTS ) {
-		iMaxClients = MAX_CLIENTS;
-	}
+    if (iMaxClients < 1) {
+        iMaxClients = 1;
+    } else if (iMaxClients > MAX_CLIENTS) {
+        iMaxClients = MAX_CLIENTS;
+    }
 
-	Cvar_SetValue( "ui_maxclients", iMaxClients );
+    Cvar_SetValue("ui_maxclients", iMaxClients);
 
-	iUseGameSpy = atoi( CvarGetForUI( "ui_gamespy", "0" ) );
+    iUseGameSpy = atoi(CvarGetForUI("ui_gamespy", "0"));
 
-	if( iUseGameSpy < 0 ) {
-		iUseGameSpy = 0;
-	} else if( iUseGameSpy > 1 ) {
-		iUseGameSpy = 1;
-	}
+    if (iUseGameSpy < 0) {
+        iUseGameSpy = 0;
+    } else if (iUseGameSpy > 1) {
+        iUseGameSpy = 1;
+    }
 
-	Cvar_SetValue( "ui_gamespy", iUseGameSpy );
+    Cvar_SetValue("ui_gamespy", iUseGameSpy);
 
-	iFragLimit = atoi( CvarGetForUI( "ui_fraglimit", "0" ) );
+    iFragLimit = atoi(CvarGetForUI("ui_fraglimit", "0"));
 
-	if( iFragLimit < 0 ) {
-		iFragLimit = 0;
-	}
+    if (iFragLimit < 0) {
+        iFragLimit = 0;
+    }
 
-	Cvar_SetValue( "ui_fraglimit", iFragLimit );
+    Cvar_SetValue("ui_fraglimit", iFragLimit);
 
-	iTimeLimit = atoi( CvarGetForUI( "ui_timelimit", "0" ) );
+    iTimeLimit = atoi(CvarGetForUI("ui_timelimit", "0"));
 
-	if( iTimeLimit < 0 ) {
-		iTimeLimit = 0;
-	}
+    if (iTimeLimit < 0) {
+        iTimeLimit = 0;
+    }
 
-	Cvar_SetValue( "ui_timelimit", iTimeLimit );
+    Cvar_SetValue("ui_timelimit", iTimeLimit);
 
-	iTeamDamage = atoi( CvarGetForUI( "ui_teamdamage", "0" ) );
+    iTeamDamage = atoi(CvarGetForUI("ui_teamdamage", "0"));
 
-	if( iTeamDamage < 0 ) {
-		iTeamDamage = 0;
-	} else if( iTeamDamage > 1 ) {
-		iTeamDamage = 1;
-	}
+    if (iTeamDamage < 0) {
+        iTeamDamage = 0;
+    } else if (iTeamDamage > 1) {
+        iTeamDamage = 1;
+    }
 
-	Cvar_SetValue( "ui_teamdamage", iTeamDamage );
+    Cvar_SetValue("ui_teamdamage", iTeamDamage);
 
-	iInactiveSpectate = atoi( CvarGetForUI( "ui_inactivespectate", "0" ) );
+    iInactiveSpectate = atoi(CvarGetForUI("ui_inactivespectate", "0"));
 
-	if( iInactiveSpectate < 0 ) {
-		iInactiveSpectate = 0;
-	}
+    if (iInactiveSpectate < 0) {
+        iInactiveSpectate = 0;
+    }
 
-	Cvar_SetValue( "ui_inactivespectate", iInactiveSpectate );
+    Cvar_SetValue("ui_inactivespectate", iInactiveSpectate);
 
-	iInactiveKick = atoi( CvarGetForUI( "ui_inactivekick", "0" ) );
+    iInactiveKick = atoi(CvarGetForUI("ui_inactivekick", "0"));
 
-	if( iInactiveKick < 0 ) {
-		iInactiveKick = 0;
-	}
+    if (iInactiveKick < 0) {
+        iInactiveKick = 0;
+    }
 
-	Cvar_SetValue( "ui_inactivekick", iInactiveKick );
+    Cvar_SetValue("ui_inactivekick", iInactiveKick);
 
-	pszMapListString = CvarGetForUI( pszMapListCvar, "" );
+    pszMapListString = CvarGetForUI(pszMapListCvar, "");
 
-	pszTemp = CvarGetForUI( "ui_hostname", "Nameless Battle" );
-	Q_strncpyz( szHostName, pszTemp, sizeof( szHostName ) );
+    pszTemp = CvarGetForUI("ui_hostname", "Nameless Battle");
+    Q_strncpyz(szHostName, pszTemp, sizeof(szHostName));
 
-	for( int i = 0; i < sizeof( szHostName ); i++ )
-	{
-		if( szHostName[ i ] == ';' || szHostName[ i ] == '"' || szHostName[ i ] == '\\' ) {
-			szHostName[ i ] = '_';
-		}
-	}
+    for (int i = 0; i < sizeof(szHostName); i++) {
+        if (szHostName[i] == ';' || szHostName[i] == '"' || szHostName[i] == '\\') {
+            szHostName[i] = '_';
+        }
+    }
 
-	Cvar_Set( "ui_hostname", szHostName );
+    Cvar_Set("ui_hostname", szHostName);
 
-	Cbuf_AddText(
-		va( "set dedicated %i;"
-		"set sv_maxclients %i;"
-		"set sv_gamespy %i;"
-		"set g_gametype %i;"
-		"set g_gametypestring \"%s\";"
-		"set fraglimit %i;"
-		"set timelimit %i;"
-		"set g_teamdamage %i;"
-		"set g_inactivespectate %i;"
-		"set g_inactivekick %i;"
-		"set sv_maplist \"%s\";"
-		"set sv_hostname \"%s\";"
-		"set cheats 0;"
-		"wait;"
-		"map \"%s\"\n",
-		iDedicated, iMaxClients, iUseGameSpy, iGameType, pszGameTypeString,
-		iFragLimit, iTimeLimit, iTeamDamage,
-		iInactiveSpectate, iInactiveKick,
-		pszMapListString, szHostName, pszMapName ) );
+    Cbuf_AddText(
+        va("set dedicated %i;"
+           "set sv_maxclients %i;"
+           "set sv_gamespy %i;"
+           "set g_gametype %i;"
+           "set g_gametypestring \"%s\";"
+           "set fraglimit %i;"
+           "set timelimit %i;"
+           "set g_teamdamage %i;"
+           "set g_inactivespectate %i;"
+           "set g_inactivekick %i;"
+           "set sv_maplist \"%s\";"
+           "set sv_hostname \"%s\";"
+           "set cheats 0;"
+           "wait;"
+           "map \"%s\"\n",
+           iDedicated,
+           iMaxClients,
+           iUseGameSpy,
+           iGameType,
+           pszGameTypeString,
+           iFragLimit,
+           iTimeLimit,
+           iTeamDamage,
+           iInactiveSpectate,
+           iInactiveKick,
+           pszMapListString,
+           szHostName,
+           pszMapName)
+    );
 }
 
 /*
@@ -3395,25 +3343,26 @@ void UI_StartDMMap_f( void ) {
 UI_PlayerModel_f
 ====================
 */
-void UI_PlayerModel_f( void ) {
-	qboolean bGermanModel;
-	str modelpath = "models/player";
+void UI_PlayerModel_f(void)
+{
+    qboolean bGermanModel;
+    str      modelpath = "models/player";
 
-	bGermanModel = qfalse;
+    bGermanModel = qfalse;
 
-	if( Cmd_Argc() > 1 )
-	{
-		bGermanModel = atoi( Cmd_Argv( 1 ) ) ? qtrue : qfalse;
+    if (Cmd_Argc() > 1) {
+        bGermanModel = atoi(Cmd_Argv(1)) ? qtrue : qfalse;
 
-		if( Cmd_Argc() == 3 )
-		{
-			modelpath += "/";
-			modelpath += Cmd_Argv( 2 );
-		}
-	}
+        if (Cmd_Argc() == 3) {
+            modelpath += "/";
+            modelpath += Cmd_Argv(2);
+        }
+    }
 
-	PlayerModelPickerClass *picker = new PlayerModelPickerClass;
-	picker->Setup( "models/player", modelpath, bGermanModel );
+    PlayerModelPickerClass *picker = new PlayerModelPickerClass;
+    picker->Setup("models/player", modelpath, bGermanModel);
+
+    CL_SetMousePos(uid.vidWidth / 2, uid.vidHeight / 2);
 }
 
 /*
@@ -3421,16 +3370,23 @@ void UI_PlayerModel_f( void ) {
 UI_ApplyPlayerModel_f
 ====================
 */
-void UI_ApplyPlayerModel_f( void ) {
-	const char *pszUIPlayerModel;
+void UI_ApplyPlayerModel_f(void)
+{
+    const char *pszUIPlayerModel;
+    char        donotshowssindeorfr[64];
 
-	pszUIPlayerModel = CvarGetForUI( "ui_dm_playermodel", "american_army" );
-	Cvar_Set( "dm_playermodel", pszUIPlayerModel );
+    pszUIPlayerModel = CvarGetForUI("ui_dm_playermodel_set", "american_army");
+    Cvar_Set("dm_playermodel", pszUIPlayerModel);
 
-	pszUIPlayerModel = CvarGetForUI( "ui_dm_playergermanmodel", "german_wehrmacht_soldier" );
-	Cvar_Set( "ui_dm_playergermanmodel", pszUIPlayerModel );
+    pszUIPlayerModel = CvarGetForUI("ui_dm_playergermanmodel_set", "german_wehrmacht_soldier");
+    if (!Q_stricmpn(pszUIPlayerModel, "german_waffen", 14)) {
+        Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), pszUIPlayerModel + 14);
+        Cvar_Set("dm_playergermanmodel", donotshowssindeorfr);
+    } else {
+        Cvar_Set("dm_playergermanmodel", pszUIPlayerModel);
+    }
 
-	Cvar_Set( "name", CvarGetForUI( "ui_name", "*** Blank Name ***" ) );
+    Cvar_Set("name", CvarGetForUI("ui_name", "UnnamedSoldier"));
 }
 
 /*
@@ -3438,31 +3394,35 @@ void UI_ApplyPlayerModel_f( void ) {
 UI_GetPlayerModel_f
 ====================
 */
-void UI_GetPlayerModel_f( void ) {
-	const char *pszUIPlayerModel;
-	char donotshowssindeorfr[ 64 ];
+void UI_GetPlayerModel_f(void)
+{
+    const char *pszUIPlayerModel;
+    char        donotshowssindeorfr[64];
 
-	pszUIPlayerModel = CvarGetForUI( "dm_playermodel", "american_army" );
-	Cvar_Set( "ui_dm_playermodel", pszUIPlayerModel );
+    //
+    // Allies
+    //
+    pszUIPlayerModel = CvarGetForUI("dm_playermodel", "american_army");
+    Cvar_Set("ui_dm_playermodel", PM_FilenameToDisplayname(pszUIPlayerModel));
+    Cvar_Set("ui_dm_playermodel_set", pszUIPlayerModel);
+    Cvar_Set("ui_disp_playermodel", va("models/player/%s.tik", pszUIPlayerModel));
 
-	Cvar_Set( "ui_disp_playermodel", va( "models/player/%s.tik", pszUIPlayerModel ) );
+    //
+    // Axis
+    //
+    pszUIPlayerModel = CvarGetForUI("dm_playergermanmodel", "german_wehrmacht_soldier");
+    Cvar_Set("ui_dm_playergermanmodel", PM_FilenameToDisplayname(pszUIPlayerModel));
+    Cvar_Set("ui_dm_playergermanmodel_set", pszUIPlayerModel);
 
-	pszUIPlayerModel = CvarGetForUI( "dm_playergermanmodel", "german_wehrmacht_soldier" );
-	Cvar_Set( "ui_dm_playergermanmodel", pszUIPlayerModel );
+    if (!strncmp(pszUIPlayerModel, "german_waffen_", 14)) {
+        Q_strncpyz(donotshowssindeorfr, "german_waffenss_", sizeof(donotshowssindeorfr));
+        Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), pszUIPlayerModel + 14);
+        Cvar_Set("ui_disp_playergermanmodel", va("models/player/%s.tik", donotshowssindeorfr));
+    } else {
+        Cvar_Set("ui_disp_playergermanmodel", va("models/player/%s.tik", pszUIPlayerModel));
+    }
 
-	if( !strncmp( pszUIPlayerModel, "german_waffen_", 14 ) )
-	{
-		memcpy( donotshowssindeorfr, "german_waffenss_", 17 );
-		strncat( donotshowssindeorfr, pszUIPlayerModel + 14, 48 );
-	}
-	else
-	{
-		strncpy( donotshowssindeorfr, pszUIPlayerModel, sizeof( donotshowssindeorfr ) );
-	}
-
-	Cvar_Set( "ui_disp_playergermanmodel", va( "models/player/%s.tik", donotshowssindeorfr ) );
-
-	Cvar_Set( "ui_name", CvarGetForUI( "name", "*** Blank Name ***" ) );
+    Cvar_Set("ui_name", CvarGetForUI("name", "UnnamedSoldier"));
 }
 
 /*
@@ -3470,8 +3430,9 @@ void UI_GetPlayerModel_f( void ) {
 UI_SoundPicker_f
 ====================
 */
-void UI_SoundPicker_f( void ) {
-	new SoundPickerClass;
+void UI_SoundPicker_f(void)
+{
+    new SoundPickerClass;
 }
 
 /*
@@ -3479,11 +3440,12 @@ void UI_SoundPicker_f( void ) {
 UI_ViewSpawnList_f
 ====================
 */
-void UI_ViewSpawnList_f( void ) {
-	str modelpath = "models";
+void UI_ViewSpawnList_f(void)
+{
+    str modelpath = "models";
 
-	ViewSpawnerClass *picker = new ViewSpawnerClass;
-	picker->Setup( "models", modelpath, ".tik" );
+    ViewSpawnerClass *picker = new ViewSpawnerClass;
+    picker->Setup("models", modelpath, ".tik");
 }
 
 /*
@@ -3491,11 +3453,12 @@ void UI_ViewSpawnList_f( void ) {
 UI_LODSpawnList_f
 ====================
 */
-void UI_LODSpawnList_f( void ) {
-	str modelpath = "models";
+void UI_LODSpawnList_f(void)
+{
+    str modelpath = "models";
 
-	LODSpawnerClass *picker = new LODSpawnerClass;
-	picker->Setup( "models", modelpath, ".tik" );
+    LODSpawnerClass *picker = new LODSpawnerClass;
+    picker->Setup("models", modelpath, ".tik");
 }
 
 /*
@@ -3503,12 +3466,13 @@ void UI_LODSpawnList_f( void ) {
 UI_Notepad_f
 ====================
 */
-void UI_Notepad_f( void ) {
-	if( Cmd_Argc() > 1 ) {
-		UI_LoadNotepadFile( Cmd_Argv( 1 ) );
-	} else {
-		UI_LoadNotepadFile( NULL );
-	}
+void UI_Notepad_f(void)
+{
+    if (Cmd_Argc() > 1) {
+        UI_LoadNotepadFile(Cmd_Argv(1));
+    } else {
+        UI_LoadNotepadFile(NULL);
+    }
 }
 
 /*
@@ -3516,41 +3480,39 @@ void UI_Notepad_f( void ) {
 UI_EditScript_f
 ====================
 */
-void UI_EditScript_f( void ) {
-	const char *info;
-	const char *mname;
-	str mapname;
-	str mappath;
+void UI_EditScript_f(void)
+{
+    const char *info;
+    const char *mname;
+    str         mapname;
+    str         mappath;
 
-	// editscript only works in-game
-	if( clc.state != CA_ACTIVE )
-	{
-		Com_Printf( "You need to load a map to edit its script\n" );
-		return;
-	}
+    // editscript only works in-game
+    if (clc.state != CA_ACTIVE) {
+        Com_Printf("You need to load a map to edit its script\n");
+        return;
+    }
 
-	mname = Info_ValueForKey( &cl.gameState.stringData[ cl.gameState.stringOffsets[ CS_SERVERINFO ] ], "mapname" );
-	mapname = mname;
+    mname   = Info_ValueForKey(&cl.gameState.stringData[cl.gameState.stringOffsets[CS_SERVERINFO]], "mapname");
+    mapname = mname;
 
-	// remove the spawnpoint name
-	if( strchr( mname, '$' ) )
-	{
-		info = strchr( mname, '$' );
-		mapname[ info - mname ] = 0;
-	}
+    // remove the spawnpoint name
+    if (strchr(mname, '$')) {
+        info                  = strchr(mname, '$');
+        mapname[info - mname] = 0;
+    }
 
-	// make sure the map is loaded
-	if( !strcmp( mapname, "" ) )
-	{
-		Com_Printf( "No map loaded?\n" );
-		return;
-	}
+    // make sure the map is loaded
+    if (!strcmp(mapname, "")) {
+        Com_Printf("No map loaded?\n");
+        return;
+    }
 
-	mappath = "maps/" + mapname + ".scr";
+    mappath = "maps/" + mapname + ".scr";
 
-	if( !UI_LoadNotepadFile( mappath ) ) {
-		Com_Printf( "Couldn't load/find script file for %s\n", mappath.c_str() );
-	}
+    if (!UI_LoadNotepadFile(mappath)) {
+        Com_Printf("Couldn't load/find script file for %s\n", mappath.c_str());
+    }
 }
 
 /*
@@ -3558,19 +3520,20 @@ void UI_EditScript_f( void ) {
 UI_EditShader_f
 ====================
 */
-void UI_EditShader_f( void ) {
-	str shaderpath;
+void UI_EditShader_f(void)
+{
+    str shaderpath;
 
-	if( Cmd_Argc() != 2 ) {
-		Com_Printf( "Usage: Editshader <file>\n" );
-		return;
-	}
+    if (Cmd_Argc() != 2) {
+        Com_Printf("Usage: Editshader <file>\n");
+        return;
+    }
 
-	shaderpath = "scripts/" + str( Cmd_Argv( 1 ) ) + ".shader";
+    shaderpath = "scripts/" + str(Cmd_Argv(1)) + ".shader";
 
-	if( !UI_LoadNotepadFile( shaderpath ) ) {
-		Com_Printf( "Couldn't open shader named %s\n", shaderpath.c_str() );
-	}
+    if (!UI_LoadNotepadFile(shaderpath)) {
+        Com_Printf("Couldn't open shader named %s\n", shaderpath.c_str());
+    }
 }
 
 /*
@@ -3578,24 +3541,24 @@ void UI_EditShader_f( void ) {
 UI_EditSpecificShader_f
 ====================
 */
-void UI_EditSpecificShader_f( void ) {
-}
+void UI_EditSpecificShader_f(void) {}
 
 /*
 ====================
 UI_LoadMenu
 ====================
 */
-void UI_LoadMenu( const char *name ) {
-	char buffer[ 256 ];
+void UI_LoadMenu(const char *name)
+{
+    char buffer[256];
 
-	Com_sprintf( buffer, sizeof( buffer ), "ui/%s", name );
-	COM_StripExtension( buffer, buffer, sizeof( buffer ) );
-	Q_strcat( buffer, 256, ".urc" );
+    Com_sprintf(buffer, sizeof(buffer), "ui/%s", name);
+    COM_StripExtension(buffer, buffer, sizeof(buffer));
+    Q_strcat(buffer, 256, ".urc");
 
-	new UILayout( buffer );
-	uWinMan.CreateMenus();
-	UI_FocusMenuIfExists();
+    new UILayout(buffer);
+    uWinMan.CreateMenus();
+    UI_FocusMenuIfExists();
 }
 
 /*
@@ -3603,8 +3566,9 @@ void UI_LoadMenu( const char *name ) {
 UI_LoadMenu_f
 ====================
 */
-void UI_LoadMenu_f( void ) {
-	UI_LoadMenu( Cmd_Argv( 1 ) );
+void UI_LoadMenu_f(void)
+{
+    UI_LoadMenu(Cmd_Argv(1));
 }
 
 /*
@@ -3612,20 +3576,19 @@ void UI_LoadMenu_f( void ) {
 CvarGetForUI
 ====================
 */
-const char *CvarGetForUI( const char *name, const char *defval ) {
-	cvar_t *cvar = Cvar_FindVar( name );
+const char *CvarGetForUI(const char *name, const char *defval)
+{
+    cvar_t *cvar = Cvar_FindVar(name);
 
-	if( cvar ) {
-		if( cvar->latchedString && *cvar->latchedString ) {
-			return cvar->latchedString;
-		} else {
-			return cvar->string;
-		}
-	}
-	else
-	{
-		return defval;
-	}
+    if (cvar) {
+        if (cvar->latchedString && *cvar->latchedString) {
+            return cvar->latchedString;
+        } else {
+            return cvar->string;
+        }
+    } else {
+        return defval;
+    }
 }
 
 /*
@@ -3633,18 +3596,18 @@ const char *CvarGetForUI( const char *name, const char *defval ) {
 ListFilesForUI
 ====================
 */
-void ListFilesForUI( const char *filespec )
+void ListFilesForUI(const char *filespec)
 {
-	int nfiles;
-	char **filenames;
+    int    nfiles;
+    char **filenames;
 
-	filenames = FS_ListFiles( "", filespec, qfalse, &nfiles );
+    filenames = FS_ListFiles("", filespec, qfalse, &nfiles);
 
-	for( int i = 0; i < nfiles; i++ ) {
-		uie.AddFileToList( filenames[ i ] );
-	}
+    for (int i = 0; i < nfiles; i++) {
+        uie.AddFileToList(filenames[i]);
+    }
 
-	FS_FreeFileList( filenames );
+    FS_FreeFileList(filenames);
 }
 
 /*
@@ -3652,8 +3615,9 @@ void ListFilesForUI( const char *filespec )
 IsKeyDown
 ====================
 */
-int IsKeyDown( int key ) {
-	return keys[ key ].down;
+int IsKeyDown(int key)
+{
+    return keys[key].down;
 }
 
 /*
@@ -3661,19 +3625,19 @@ int IsKeyDown( int key ) {
 UI_WantsKeyboard
 ====================
 */
-void UI_WantsKeyboard() {
-	cls.keyCatchers |= KEYCATCH_UI;
+void UI_WantsKeyboard()
+{
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
 struct widgettrans_s {
-	const char *src;
-	const char *dst;
+    const char *src;
+    const char *dst;
 };
 
-static widgettrans_s s_widgettrans[ 2 ] =
-{
-	{ "Label", "FakkLabel" },
-	{ NULL, NULL }
+static widgettrans_s s_widgettrans[2] = {
+    {"Label", "FakkLabel"},
+    {NULL,    NULL       }
 };
 
 /*
@@ -3681,17 +3645,17 @@ static widgettrans_s s_widgettrans[ 2 ] =
 TranslateWidgetName
 ====================
 */
-const char *TranslateWidgetName( const char *widget ) {
-	widgettrans_s *trans = &s_widgettrans[ 0 ];
+const char *TranslateWidgetName(const char *widget)
+{
+    widgettrans_s *trans = &s_widgettrans[0];
 
-	for( int i = 0; trans->src != NULL; i++, trans++ )
-	{
-		if( !strcmp( trans->src, widget ) ) {
-			return trans->dst;
-		}
-	}
+    for (int i = 0; trans->src != NULL; i++, trans++) {
+        if (!strcmp(trans->src, widget)) {
+            return trans->dst;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -3699,8 +3663,9 @@ const char *TranslateWidgetName( const char *widget ) {
 UI_Cvar_Set
 ====================
 */
-void UI_Cvar_Set( const char *var_name, const char *value ) {
-	Cvar_Set2( var_name, value, qfalse );
+void UI_Cvar_Set(const char *var_name, const char *value)
+{
+    Cvar_Set2(var_name, value, qfalse);
 }
 
 /*
@@ -3708,20 +3673,63 @@ void UI_Cvar_Set( const char *var_name, const char *value ) {
 CL_FillUIDef
 ====================
 */
-void CL_FillUIDef( void ) {
-	CL_GetMouseState( &uid.mouseX, &uid.mouseY, &uid.mouseFlags );
-	uid.time = cls.realtime;
-	uid.vidHeight = cls.glconfig.vidHeight;
-	uid.vidWidth = cls.glconfig.vidWidth;
-	uid.uiHasMouse = in_guimouse != qfalse;
+void CL_FillUIDef(void)
+{
+    CL_GetMouseState(&uid.mouseX, &uid.mouseY, &uid.mouseFlags);
+    uid.time       = cls.realtime;
+    uid.vidHeight  = cls.glconfig.vidHeight;
+    uid.vidWidth   = cls.glconfig.vidWidth;
+    uid.uiHasMouse = in_guimouse != qfalse;
 }
 
-sfxHandle_t UI_RegisterSound( const char *sample, qboolean streamed ) {
-	return S_RegisterSound( sample, streamed, qfalse );
+/*
+====================
+UI_RegisterSound
+====================
+*/
+sfxHandle_t UI_RegisterSound(const char *sample, qboolean streamed)
+{
+    return S_RegisterSound(sample, streamed, qfalse);
 }
 
-void UI_StartLocalSound( const char *sound_name ) {
-	S_StartLocalSound( sound_name, qtrue );
+/*
+====================
+UI_FadeSound
+====================
+*/
+void UI_FadeSound(float fTime)
+{
+    S_FadeSound(fTime);
+}
+
+/*
+====================
+UI_StopAll
+====================
+*/
+void UI_StopAll()
+{
+    S_StopAllSounds2(qtrue);
+}
+
+/*
+====================
+UI_StartLocalSound
+====================
+*/
+void UI_StartLocalSound(const char *sound_name)
+{
+    S_StartLocalSound(sound_name, qtrue);
+}
+
+/*
+====================
+UI_StartLocalSoundDialog
+====================
+*/
+void UI_StartLocalSoundDialog(const char *sound_name)
+{
+    S_StartLocalSoundChannel(sound_name, qtrue, CHAN_DIALOG);
 }
 
 /*
@@ -3729,164 +3737,75 @@ void UI_StartLocalSound( const char *sound_name ) {
 CL_FillUIImports
 ====================
 */
-void CL_FillUIImports( void ) {
-	uii.Rend_DrawBox			= re.DrawBox;
-	uii.Rend_DrawPicStretched	= re.DrawStretchPic;
-	uii.Rend_DrawPicStretched2	= re.DrawStretchPic2;
-	uii.Rend_DrawPicTiled		= re.DrawTilePic;
-	uii.Rend_GetShaderHeight	= re.GetShaderHeight;
-	uii.Rend_GetShaderWidth		= re.GetShaderWidth;
-	uii.Rend_DrawString			= re.DrawString;
-	uii.Rend_LoadFont			= re.LoadFont;
-	uii.Rend_RegisterMaterial	= re.RegisterShaderNoMip;
-	uii.Rend_RefreshMaterial	= re.RefreshShaderNoMip;
-	uii.Rend_Scissor			= re.Scissor;
-	uii.Rend_Set2D				= re.Set2DWindow;
-	uii.Rend_SetColor			= re.SetColor;
+void CL_FillUIImports(void)
+{
+    uii.Rend_DrawBox           = re.DrawBox;
+    uii.Rend_DrawPicStretched  = re.DrawStretchPic;
+    uii.Rend_DrawPicStretched2 = re.DrawStretchPic2;
+    uii.Rend_DrawPicTiled      = re.DrawTilePic;
+    uii.Rend_GetShaderHeight   = re.GetShaderHeight;
+    uii.Rend_GetShaderWidth    = re.GetShaderWidth;
+    uii.Rend_DrawString        = re.DrawString;
+    uii.Rend_LoadFont          = re.LoadFont;
+    uii.Rend_RegisterMaterial  = re.RegisterShaderNoMip;
+    uii.Rend_RefreshMaterial   = re.RefreshShaderNoMip;
+    uii.Rend_Scissor           = re.Scissor;
+    uii.Rend_Set2D             = re.Set2DWindow;
+    uii.Rend_SetColor          = re.SetColor;
+    uii.Rend_ImageExists       = re.ImageExists;
 
-	uii.Cmd_Stuff						= Cbuf_AddText;
-	uii.Cvar_GetString					= CvarGetForUI;
-	uii.Cvar_Reset						= Cvar_Reset;
-	uii.Cvar_Find						= Cvar_FindVar;
-	uii.Cvar_Set						= Cvar_Set;
-	uii.File_PickFile					= PickFile;
-	uii.File_FreeFile					= FS_FreeFile;
-	uii.File_ListFiles					= ListFilesForUI;
-	uii.File_OpenFile					= FS_ReadFile;
-	uii.File_WriteFile					= FS_WriteTextFile;
-	uii.Snd_PlaySound					= UI_StartLocalSound;
-	uii.Snd_RegisterSound				= UI_RegisterSound;
-	uii.Alias_Add						= Alias_Add;
-	uii.Alias_FindRandom				= Alias_FindRandom;
-	uii.Sys_Error						= Com_Error;
-	uii.Sys_IsKeyDown					= IsKeyDown;
-	uii.Sys_Milliseconds				= Sys_Milliseconds;
-	uii.Sys_Printf						= Com_Printf;
-	uii.Sys_DPrintf						= Com_DPrintf;
-	uii.Sys_GetClipboard				= Sys_GetWholeClipboard;
-	uii.Sys_SetClipboard				= Sys_SetClipboard;
-	uii.Cmd_CompleteCommandByNumber		= Cmd_CompleteCommandByNumber;
-	uii.Cvar_CompleteCvarByNumber		= Cvar_CompleteVariableByNumber;
-	uii.UI_WantsKeyboard				= UI_WantsKeyboard;
-	uii.Client_TranslateWidgetName		= TranslateWidgetName;
-	uii.Connect							= CL_Connect;
-	uii.Key_GetKeynameForCommand		= Key_GetKeynameForCommand;
-	uii.Key_GetCommandForKey			= Key_GetBinding;
-	uii.Key_SetBinding					= Key_SetBinding;
-	uii.Key_GetKeysForCommand			= Key_GetKeysForCommand;
-	uii.Key_KeynumToString				= Key_KeynumToBindString;
+    uii.Cmd_Stuff                   = Cbuf_AddText;
+    uii.Cvar_GetString              = CvarGetForUI;
+    uii.Cvar_Reset                  = Cvar_Reset;
+    uii.Cvar_Find                   = Cvar_FindVar;
+    uii.Cvar_Set                    = UI_Cvar_Set;
+    uii.File_PickFile               = PickFile;
+    uii.File_FreeFile               = FS_FreeFile;
+    uii.File_ListFiles              = ListFilesForUI;
+    uii.File_OpenFile               = FS_ReadFile;
+    uii.File_WriteFile              = FS_WriteTextFile;
+    uii.Snd_PlaySound               = UI_StartLocalSound;
+    uii.Snd_PlaySoundDialog         = UI_StartLocalSoundDialog;
+    uii.Snd_RegisterSound           = UI_RegisterSound;
+    uii.Snd_FadeSound               = UI_FadeSound;
+    uii.Snd_StopAllSound            = UI_StopAll;
+    uii.Alias_Add                   = Alias_Add;
+    uii.Alias_FindRandom            = Alias_FindRandom;
+    uii.Sys_Error                   = Com_Error;
+    uii.Sys_IsKeyDown               = IsKeyDown;
+    uii.Sys_Milliseconds            = Sys_Milliseconds;
+    uii.Sys_Printf                  = Com_Printf;
+    uii.Sys_DPrintf                 = Com_DPrintf;
+    uii.Sys_GetClipboard            = Sys_GetWholeClipboard;
+    uii.Sys_SetClipboard            = Sys_SetClipboard;
+    uii.Cmd_CompleteCommandByNumber = Cmd_CompleteCommandByNumber;
+    uii.Cvar_CompleteCvarByNumber   = Cvar_CompleteVariableByNumber;
+    uii.UI_WantsKeyboard            = UI_WantsKeyboard;
+    uii.Client_TranslateWidgetName  = TranslateWidgetName;
+    uii.Connect                     = CL_Connect;
+    uii.Key_GetKeynameForCommand    = Key_GetKeynameForCommand;
+    uii.Key_GetCommandForKey        = Key_GetBinding;
+    uii.Key_SetBinding              = Key_SetBinding;
+    uii.Key_GetKeysForCommand       = Key_GetKeysForCommand;
+    uii.Key_KeynumToString          = Key_KeynumToBindString;
 
-	uii.GetConfigstring					= CL_ConfigString;
-	uii.UI_CloseDMConsole				= UI_CloseDMConsole;
+    uii.GetConfigstring   = CL_ConfigString;
+    uii.UI_CloseDMConsole = UI_CloseDMConsole;
 
-#if 0
-	uii.TIKI_RegisterModel				= TIKI_RegisterTiki;
-
-	uii.Cvar_Get						= Cvar_Get;
-	uii.Argc							= Cmd_Argc;
-	uii.Argv							= Cmd_Argv;
-	uii.Cmd_ExecuteText					= Cbuf_ExecuteText;
-	uii.FS_FOpenFile					= FS_FOpenFileByMode;
-	uii.FS_Read							= FS_Read;
-	uii.FS_Write						= FS_Write;
-	uii.FS_FCloseFile					= FS_FCloseFile;
-	uii.FS_GetFileList					= FS_GetFileList;
-	uii.FS_Seek							= FS_Seek;
-	uii.R_RegisterModel					= re.RegisterModel;
-	uii.R_RegisterSkin					= re.RegisterShader;
-	uii.R_RegisterShader				= re.RegisterShader;
-	uii.R_RegisterShaderNoMip			= re.RegisterShaderNoMip;
-	uii.R_ClearScene					= re.ClearScene;
-	uii.R_AddRefEntityToScene			= re.AddRefEntityToScene;
-	uii.R_AddPolyToScene				= re.AddPolyToScene;
-	uii.R_AddLightToScene				= re.AddLightToScene;
-	uii.R_RenderScene					= re.RenderScene;
-	uii.R_SetColor						= re.SetColor;
-	uii.R_DrawStretchPic				= re.DrawStretchPic;
-	uii.UpdateScreen					= SCR_UpdateScreen;
-	uii.S_StartLocalSound				= S_StartLocalSound;
-	uii.S_RegisterSound					= S_RegisterSound;
-	uii.Key_KeynumToStringBuf			= Key_KeynumToStringBuf;
-	uii.Key_KeynumToString				= Key_KeynumToString;
-	uii.Key_GetBindingBuf				= Key_GetBindingBuf;
-	uii.Key_IsDown						= Key_IsDown;
-	uii.Key_GetOverstrikeMode			= Key_GetOverstrikeMode;
-	uii.Key_SetOverstrikeMode			= Key_SetOverstrikeMode;
-	uii.Key_ClearStates					= Key_ClearStates;
-	uii.Key_GetCatcher					= Key_GetCatcher;
-	uii.Key_SetCatcher					= Key_SetCatcher;
-	uii.GetClipboardData				= CL_GetClipboardData;
-	uii.GetClientState					= GetClientState;
-	uii.GetGlconfig						= CL_GetGlconfig;
-	uii.GetConfigString					= GetConfigString;
-	uii.LAN_GetServerCount				= LAN_GetServerCount;
-	uii.LAN_GetServerAddressString		= LAN_GetServerAddressString;
-	uii.LAN_GetServerInfo				= LAN_GetServerInfo;
-	uii.LAN_GetPingQueueCount			= LAN_GetPingQueueCount;
-	uii.LAN_ServerStatus				= LAN_GetServerStatus;
-	uii.LAN_ClearPing					= LAN_ClearPing;
-	uii.LAN_GetPing						= LAN_GetPing;
-	uii.LAN_GetPingInfo					= LAN_GetPingInfo;
-	uii.LAN_GetServerPing				= LAN_GetServerPing;
-	uii.LAN_MarkServerVisible			= LAN_MarkServerVisible;
-	uii.LAN_UpdateVisiblePings			= LAN_UpdateVisiblePings;
-	uii.GetCDKey						= CLUI_GetCDKey;
-	uii.SetCDKey						= CLUI_SetCDKey;
-	uii.R_RegisterFont					= re.RegisterFont;
-	uii.R_Text_Width					= re.Text_Width;
-	uii.R_Text_Height					= re.Text_Height;
-	uii.R_Text_Paint					= re.Text_Paint;
-	uii.R_Text_PaintChar				= re.Text_PaintChar;
-	uii.R_GetShaderName					= re.GetShaderName;
-
-	uii.Cmd_Stuff = Cbuf_AddText;
-	uii.Cvar_GetString = CvarGetForUI;
-	uii.Cvar_Reset = Cvar_Reset;
-	uii.Cvar_Find = Cvar_FindVar;
-	uii.Cvar_Set = UI_Cvar_Set;
-	uii.File_PickFile = PickFile;
-	uii.File_FreeFile = FS_FreeFile;
-	uii.File_ListFiles = ListFilesForUI;
-	uii.File_OpenFile = FS_ReadFile;
-	uii.File_WriteFile = FS_WriteTextFile;
-	uii.Rend_SetColor = re.SetColor;
-	uii.Snd_PlaySound = UI_StartLocalSound;
-	uii.Snd_RegisterSound = UI_RegisterSound;
-	uii.Alias_Add = Alias_Add;
-	uii.Alias_FindRandom = Alias_FindRandom;
-	uii.Sys_Error = Com_Error;
-	uii.Sys_IsKeyDown = IsKeyDown;
-	uii.Sys_Milliseconds = Sys_Milliseconds;
-	uii.Sys_Printf = Com_Printf;
-	uii.Sys_DPrintf = Com_DPrintf;
-	uii.Sys_GetClipboard = Sys_GetWholeClipboard;
-	uii.Sys_SetClipboard = Sys_SetClipboard;
-	uii.Cmd_CompleteCommandByNumber = Cmd_CompleteCommandByNumber;
-	uii.Cvar_CompleteCvarByNumber = Cvar_CompleteVariableByNumber;
-	uii.UI_WantsKeyboard = UI_WantsKeyboard;
-	uii.Client_TranslateWidgetName = TranslateWidgetName;
-	uii.Connect = CL_Connect;
-	uii.Key_GetKeynameForCommand = Key_GetKeynameForCommand;
-	uii.Key_GetCommandForKey = Key_GetBinding;
-	uii.Key_SetBinding = Key_SetBinding;
-	uii.Key_GetKeysForCommand = Key_GetKeysForCommand;
-	uii.Key_KeynumToString = Key_KeynumToBindString;
-	uii.GetConfigstring = CL_ConfigString;
-	uii.UI_CloseDMConsole = UI_CloseDMConsole;
-#endif
+    uii.GetRefSequence = CL_GetRefSequence;
+    uii.IsRendererLoaded = CL_IsRendererLoaded;
 }
 
-
 /*
 ====================
 CL_BeginRegistration
 ====================
 */
-void CL_BeginRegistration( void )
+void CL_BeginRegistration(void)
 {
-	// init console stuff
-	re.BeginRegistration( &cls.glconfig );
-	uWinMan.CleanupShadersFromList();
+    // init console stuff
+    re.BeginRegistration(&cls.glconfig);
+    uWinMan.CleanupShadersFromList();
 }
 
 /*
@@ -3894,22 +3813,22 @@ void CL_BeginRegistration( void )
 CL_EndRegistration
 ====================
 */
-void CL_EndRegistration( void )
+void CL_EndRegistration(void)
 {
-	int start, end;
+    int start, end;
 
-	start = Sys_Milliseconds();
+    start = Sys_Milliseconds();
 
-	S_EndRegistration();
-	re.EndRegistration();
+    S_EndRegistration();
+    re.EndRegistration();
 
-	if( !Sys_LowPhysicalMemory() ) {
-		Com_TouchMemory();
-	}
+    if (!Sys_LowPhysicalMemory()) {
+        Com_TouchMemory();
+    }
 
-	end = Sys_Milliseconds();
+    end = Sys_Milliseconds();
 
-	Com_Printf( "CL_EndRegistration: %5.2f seconds\n", ( float )( start - end ) / 1000.0 );
+    Com_Printf("CL_EndRegistration: %5.2f seconds\n", (float)(start - end) / 1000.0);
 }
 
 /*
@@ -3917,23 +3836,35 @@ void CL_EndRegistration( void )
 UI_CreateDialog
 ====================
 */
-void UI_CreateDialog( const char *title, char *cvarname, const char *command, const char *cancelCommand, int width, int height, const char *shader, const char *okshader, const char *cancelshader ) {
-	UIDialog *dlg = new UIDialog;
-	UIRect2D rect = UIRect2D( ( cls.glconfig.vidWidth - width ) >> 1, ( cls.glconfig.vidHeight - height ) >> 1, width, height );
-	UColor bgColor = UWindowColor;
+void UI_CreateDialog(
+    const char *title,
+    char       *cvarname,
+    const char *command,
+    const char *cancelCommand,
+    int         width,
+    int         height,
+    const char *shader,
+    const char *okshader,
+    const char *cancelshader
+)
+{
+    UIDialog *dlg = new UIDialog;
+    UIRect2D  rect =
+        UIRect2D((uid.vidWidth - width) / 2, (uid.vidHeight - height) / 2, width, height);
+    UColor bgColor = UWindowColor;
 
-	dlg->Create( NULL, rect, title, bgColor, UHudColor );
-	dlg->LinkCvar( cvarname );
-	dlg->SetOKCommand( command );
-	dlg->SetCancelCommand( command );
-	dlg->SetLabelMaterial( uWinMan.RegisterShader( shader ) );
-	dlg->SetOkMaterial( uWinMan.RegisterShader( okshader ) );
+    dlg->Create(NULL, rect, title, bgColor, UHudColor);
+    dlg->LinkCvar(cvarname);
+    dlg->SetOKCommand(command);
+    dlg->SetCancelCommand(cancelCommand);
+    dlg->SetLabelMaterial(uWinMan.RegisterShader(shader));
+    dlg->SetOkMaterial(uWinMan.RegisterShader(okshader));
 
-	if( cancelshader ) {
-		dlg->SetCancelMaterial( uWinMan.RegisterShader( cancelshader ) );
-	}
+    if (cancelshader) {
+        dlg->SetCancelMaterial(uWinMan.RegisterShader(cancelshader));
+    }
 
-	uWinMan.ActivateControl( dlg );
+    uWinMan.ActivateControl(dlg);
 }
 
 /*
@@ -3941,67 +3872,83 @@ void UI_CreateDialog( const char *title, char *cvarname, const char *command, co
 UI_ResolutionChange
 ====================
 */
-void UI_ResolutionChange( void ) {
-	UIRect2D frame;
+void UI_ResolutionChange(void)
+{
+    UIRect2D frame;
 
-	ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
-	CL_FillUIImports();
-	CL_FillUIDef();
+    if (com_target_game->integer >= TG_MOHTA) {
+        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.75", CVAR_ARCHIVE | CVAR_LATCH);
+    } else {
+        // Older version doesn't have an adjustable compass, so assume 0.5 by default
+        ui_compass_scale = Cvar_Get("ui_compass_scale", "0.55", CVAR_ARCHIVE | CVAR_LATCH);
+    }
 
-	if( !uie.ResolutionChange ) {
-		return;
-	}
+    CL_FillUIImports();
+    CL_FillUIDef();
 
-	if( fakk_console )
-	{
-		frame = getDefaultConsoleRectangle();
-		fakk_console->setFrame( frame );
-	}
+    // Added in OPM
+    //  Scaling for high resolutions
+    if (uid.vidWidth > maxWidthRes && uid.vidHeight > maxHeightRes) {
+        const float vidRatio = (float)uid.vidWidth / (float)uid.vidHeight;
 
-	if( dm_console )
-	{
-		if( dm_console->GetQuickMessageMode() ) {
-			frame = getQuickMessageDMConsoleRectangle();
-		} else {
-			frame = getDefaultDMConsoleRectangle();
-		}
+        uid.scaleRes[0] = (float)uid.vidWidth / (maxHeightRes * vidRatio);
+        uid.scaleRes[1] = (float)uid.vidHeight / maxHeightRes;
+        //uid.scaleRes[0] = (float)uid.vidWidth / maxWidthRes;
+        //uid.scaleRes[1] = (float)uid.vidHeight / maxHeightRes;
+        uid.bHighResScaling = qtrue;
+    } else {
+        uid.scaleRes[0] = 1;
+        uid.scaleRes[1] = 1;
+        uid.bHighResScaling = qfalse;
+    }
 
-		dm_console->setFrame( frame );
-	}
+    if (!uie.ResolutionChange) {
+        return;
+    }
 
-	if( developer_console )
-	{
-		frame = getDefaultConsoleRectangle();
-		developer_console->setFrame( frame );
-	}
+    if (fakk_console) {
+        frame = getDefaultConsoleRectangle();
+        fakk_console->setFrame(frame);
+    }
 
-	if( scoreboardlist )
-	{
-		delete scoreboardlist;
-		scoreboardlist = NULL;
-		UI_CreateScoreboard();
-	}
+    if (dm_console) {
+        if (dm_console->GetQuickMessageMode()) {
+            frame = getQuickMessageDMConsoleRectangle();
+        } else {
+            frame = getDefaultDMConsoleRectangle();
+        }
 
-	uie.ResolutionChange();
-	menuManager.RealignMenus();
+        dm_console->setFrame(frame);
+    }
 
-	if( view3d )
-	{
-		frame = UIRect2D( 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight );
-		view3d->setFrame( frame );
-	}
+    if (developer_console) {
+        frame = getDefaultConsoleRectangle();
+        developer_console->setFrame(frame);
+    }
 
-	if( gmbox )
-	{
-		frame = getDefaultGMBoxRectangle();
-		gmbox->setFrame( frame );
-	}
+    if (scoreboardlist) {
+        delete scoreboardlist;
+        scoreboardlist = NULL;
+        UI_CreateScoreboard();
+    }
 
-	if( dmbox )
-	{
-		frame = getDefaultDMBoxRectangle();
-		dmbox->setFrame( frame );
-	}
+    uie.ResolutionChange();
+    menuManager.RealignMenus();
+
+    if (view3d) {
+        frame = UIRect2D(0, 0, uid.vidWidth, uid.vidHeight);
+        view3d->setFrame(frame);
+    }
+
+    if (gmbox) {
+        frame = getDefaultGMBoxRectangle();
+        gmbox->setFrame(frame);
+    }
+
+    if (dmbox) {
+        frame = getDefaultDMBoxRectangle();
+        dmbox->setFrame(frame);
+    }
 }
 
 /*
@@ -4009,16 +3956,17 @@ void UI_ResolutionChange( void ) {
 UI_FinishLoadingScreen_f
 ====================
 */
-void UI_FinishLoadingScreen_f( void ) {
-	Com_Unpause();
-	UI_ForceMenuOff( qtrue );
+void UI_FinishLoadingScreen_f(void)
+{
+    Com_Unpause();
+    UI_ForceMenuOff(qtrue);
 
-	ui_pLoadingMenu = NULL;
-	ui_sCurrentLoadingMenu = "";
-	server_loading = qfalse;
-	server_loading_waiting = qfalse;
+    ui_pLoadingMenu        = NULL;
+    ui_sCurrentLoadingMenu = "";
+    server_loading         = qfalse;
+    server_loading_waiting = qfalse;
 
-	UI_ActivateView3D();
+    UI_ActivateView3D();
 }
 
 /*
@@ -4026,22 +3974,23 @@ void UI_FinishLoadingScreen_f( void ) {
 S_ServerLoaded
 ====================
 */
-void S_ServerLoaded( void ) {
-	if( !svs.soundsNeedLoad ) {
-		return;
-	}
-	svs.soundsNeedLoad = qfalse;
+void S_ServerLoaded(void)
+{
+    if (!svs.soundsNeedLoad) {
+        return;
+    }
+    svs.soundsNeedLoad = qfalse;
 
-	Com_DPrintf( "Loading Previous Sound State.\n" );
-	S_StopAllSounds( qfalse );
-	
-	//S_TriggeredMusic_Stop();
-	//s_bSoundPaused = qtrue;
-	//S_ReLoad( &svs.soundSystem );
-	//
-	//if( svs.tm_filename[ 0 ] ) {
-	//	S_TriggeredMusic_SetupHandle( svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0 );
-	//}
+    Com_DPrintf("Loading Previous Sound State.\n");
+    S_StopAllSounds2(qfalse);
+
+    S_TriggeredMusic_Stop();
+    s_bSoundPaused = qtrue;
+    S_ReLoad(&svs.soundSystem);
+
+    if (svs.tm_filename[0]) {
+        S_TriggeredMusic_SetupHandle(svs.tm_filename, svs.tm_loopcount, svs.tm_offset, 0);
+    }
 }
 
 /*
@@ -4049,64 +3998,66 @@ void S_ServerLoaded( void ) {
 UI_ServerLoaded
 ====================
 */
-void UI_ServerLoaded( void ) {
-	Menu *pCurrentMenu;
-	cvar_t *pMaxClients;
-	Event *event;
+void UI_ServerLoaded(void)
+{
+    Menu   *pCurrentMenu;
+    cvar_t *pMaxClients;
+    Event  *event;
 
-	CL_UpdateSnapFlags();
-	SV_ServerLoaded();
-	S_FadeSound( 0 );
-	S_ServerLoaded();
+    CL_UpdateSnapFlags();
+    SV_ServerLoaded();
+    S_FadeSound(0);
+    S_ServerLoaded();
 
-	if( !server_loading ) {
-		return;
-	}
+    if (!server_loading) {
+        return;
+    }
 
-	UI_EndLoad();
-	pMaxClients = Cvar_Get( "sv_maxclients", "1", 0 );
+    UI_EndLoad();
+    pMaxClients = Cvar_Get("sv_maxclients", "1", 0);
 
-	if( com_sv_running->integer && pMaxClients->integer > 1 ) {
-		SV_Heartbeat_f();
-	}
+    if (com_sv_running->integer && pMaxClients->integer > 1) {
+        SV_Heartbeat_f();
+    }
 
-	uWinMan.showCursor( true );
+    uWinMan.showCursor(true);
 
-	if( !ui_pLoadingMenu )
-	{
-		UI_FinishLoadingScreen_f();
-		return;
-	}
+    if (!ui_pLoadingMenu) {
+        UI_FinishLoadingScreen_f();
+        return;
+    }
 
-	pCurrentMenu = menuManager.CurrentMenu();
+    pCurrentMenu = menuManager.CurrentMenu();
 
-	if( pCurrentMenu != ui_pLoadingMenu
-		|| !pCurrentMenu->GetNamedWidget( "continuebutton" )
-		|| !com_sv_running->integer
-		|| pMaxClients->integer > 1 )
-	{
-		UI_FinishLoadingScreen_f();
-		return;
-	}
+    if (pCurrentMenu != ui_pLoadingMenu || !pCurrentMenu->GetNamedWidget("continuebutton") || !com_sv_running->integer
+        || pMaxClients->integer > 1) {
+        UI_FinishLoadingScreen_f();
+        return;
+    }
 
-	server_loading_waiting = qtrue;
+    if (ui_sCurrentLoadingMenu == "loading_default") {
+        UI_FinishLoadingScreen_f();
+        return;
+    }
 
-	event = new Event( EV_Widget_Enable );
-	ui_pLoadingMenu->PassEventToWidget( "continuebutton", event );
+    server_loading_waiting = qtrue;
 
-	event = new Event( EV_Widget_Disable );
-	ui_pLoadingMenu->PassEventToWidget( "loadingflasher", event );
+    event = new Event(EV_Widget_Enable);
+    ui_pLoadingMenu->PassEventToWidget("continuebutton", event);
 
-	event = new Event( EV_Widget_Disable );
-	ui_pLoadingMenu->PassEventToWidget( "loadingbar", event );
+    event = new Event(EV_Widget_Disable);
+    ui_pLoadingMenu->PassEventToWidget("loadingflasher", event);
 
-	event = new Event( EV_Widget_Disable );
-	ui_pLoadingMenu->PassEventToWidget( "loadingbar_border", event );
+    event = new Event(EV_Widget_Disable);
+    ui_pLoadingMenu->PassEventToWidget("loadingbar", event);
 
-	event = new Event( EV_Widget_Activate );
-	ui_pLoadingMenu->PassEventToWidget( "continuebutton", event );
+    event = new Event(EV_Widget_Disable);
+    ui_pLoadingMenu->PassEventToWidget("loadingbar_border", event);
 
-	Com_FakePause();
+    event = new Event(EV_Widget_Activate);
+    ui_pLoadingMenu->PassEventToWidget("continuebutton", event);
+
+    Com_FakePause();
 }
 
 /*
@@ -4114,10 +4065,11 @@ void UI_ServerLoaded( void ) {
 UI_ClearCenterPrint
 ====================
 */
-void UI_ClearCenterPrint( void ) {
-	if( view3d ) {
-		view3d->ClearCenterPrint();
-	}
+void UI_ClearCenterPrint(void)
+{
+    if (view3d) {
+        view3d->ClearCenterPrint();
+    }
 }
 
 /*
@@ -4125,8 +4077,9 @@ void UI_ClearCenterPrint( void ) {
 UI_UpdateCenterPrint
 ====================
 */
-void UI_UpdateCenterPrint( const char *s, float alpha ) {
-	view3d->UpdateCenterPrint( s, alpha );
+void UI_UpdateCenterPrint(const char *s, float alpha)
+{
+    view3d->UpdateCenterPrint(s, alpha);
 }
 
 /*
@@ -4134,8 +4087,9 @@ void UI_UpdateCenterPrint( const char *s, float alpha ) {
 UI_UpdateLocationPrint
 ====================
 */
-void UI_UpdateLocationPrint( int x, int y, const char *s, float alpha ) {
-	view3d->UpdateLocationPrint( x, y, s, alpha );
+void UI_UpdateLocationPrint(int x, int y, const char *s, float alpha)
+{
+    view3d->UpdateLocationPrint(x, y, s, alpha);
 }
 
 /*
@@ -4143,25 +4097,25 @@ void UI_UpdateLocationPrint( int x, int y, const char *s, float alpha ) {
 UI_CenterPrint_f
 ====================
 */
-void UI_CenterPrint_f( void ) {
-	const char *s;
-	float alpha;
+void UI_CenterPrint_f(void)
+{
+    const char *s;
+    float       alpha;
 
-	if( Cmd_Argc() <= 1 ) {
-		Com_Printf( "Usage: centerprintf string [alpha]\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 1) {
+        Com_Printf("Usage: centerprintf string [alpha]\n");
+        return;
+    }
 
-	s = Cmd_Argv( 1 );
+    s = Cmd_Argv(1);
 
-	if( Cmd_Argc() > 2 ) {
-		alpha = atof( Cmd_Argv( 2 ) );
-	} else {
-		alpha = 1.0;
-	}
+    if (Cmd_Argc() > 2) {
+        alpha = atof(Cmd_Argv(2));
+    } else {
+        alpha = 1.0;
+    }
 
-
-	UI_UpdateCenterPrint( s, alpha );
+    UI_UpdateCenterPrint(s, alpha);
 }
 
 /*
@@ -4169,29 +4123,29 @@ void UI_CenterPrint_f( void ) {
 UI_LocationPrint_f
 ====================
 */
-void UI_LocationPrint_f( void ) {
-	int x, y;
-	const char *s;
-	float alpha;
+void UI_LocationPrint_f(void)
+{
+    int         x, y;
+    const char *s;
+    float       alpha;
 
-	if( Cmd_Argc() <= 3 ) {
-		Com_Printf( "Usage: locatinprint x y string [alpha]\n" );
-		return;
-	}
+    if (Cmd_Argc() <= 3) {
+        Com_Printf("Usage: locatinprint x y string [alpha]\n");
+        return;
+    }
 
-	x = atoi( Cmd_Argv( 1 ) );
-	y = atoi( Cmd_Argv( 2 ) );
+    x = atoi(Cmd_Argv(1));
+    y = atoi(Cmd_Argv(2));
 
-	s = Cmd_Argv( 3 );
+    s = Cmd_Argv(3);
 
-	if( Cmd_Argc() > 4 ) {
-		alpha = atof( Cmd_Argv( 4 ) );
-	} else {
-		alpha = 1.0;
-	}
+    if (Cmd_Argc() > 4) {
+        alpha = atof(Cmd_Argv(4));
+    } else {
+        alpha = 1.0;
+    }
 
-
-	UI_UpdateLocationPrint( x, y, s, alpha );
+    UI_UpdateLocationPrint(x, y, s, alpha);
 }
 
 /*
@@ -4199,9 +4153,10 @@ void UI_LocationPrint_f( void ) {
 UI_LoadInventory_f
 ====================
 */
-void UI_LoadInventory_f( void ) {
-	UI_CloseInventory();
-	CL_LoadInventory( ui_inventoryfile->string, &client_inv );
+void UI_LoadInventory_f(void)
+{
+    UI_CloseInventory();
+    CL_LoadInventory(ui_inventoryfile->string, &client_inv);
 }
 
 /*
@@ -4209,17 +4164,18 @@ void UI_LoadInventory_f( void ) {
 UI_ClearState
 ====================
 */
-void UI_ClearState( void ) {
-	S_FadeSound( 0.0 );
-	UI_ClearCenterPrint();
+void UI_ClearState(void)
+{
+    S_FadeSound(0.0);
+    UI_ClearCenterPrint();
 
-	if( gmbox ) {
-		gmbox->Clear();
-	}
+    if (gmbox) {
+        gmbox->Clear();
+    }
 
-	if( dmbox ) {
-		dmbox->Clear();
-	}
+    if (dmbox) {
+        dmbox->Clear();
+    }
 }
 
 /*
@@ -4227,74 +4183,66 @@ void UI_ClearState( void ) {
 UI_CheckRestart
 ====================
 */
-void UI_CheckRestart( void ) {
-	if( ui_console->integer && !fakk_console ) {
-		fakk_console = getNewConsole();
-	}
+void UI_CheckRestart(void)
+{
+    if (ui_console->integer && !fakk_console) {
+        fakk_console = getNewConsole();
+    }
 
-	if( !dm_console ) {
-		dm_console = getNewDMConsole();
-	}
+    if (!dm_console) {
+        dm_console = getNewDMConsole();
+    }
 
-	if( !ui_console->integer && fakk_console ) {
-		fakk_console->SendSignal( W_Destroyed );
-	}
+    if (!ui_console->integer && fakk_console) {
+        fakk_console->SendSignal(W_Destroyed);
+    }
 
-	if( ui_minicon->integer )
-	{
-		if( !mini_console )
-		{
-			UISize2D size;
-			UColor back = UColor( 0.0, 0.5, 1.0, 1.0 );
+    if (ui_minicon->integer) {
+        if (!mini_console) {
+            UISize2D size;
+            UColor   back = UColor(0.0, 0.5, 1.0, 1.0);
 
-			size.width = 500;
-			size.height = 100;
+            size.width  = 500;
+            size.height = 100;
 
-			mini_console = new FakkMiniconsole;
-			mini_console->Create( size, UHudColor, back, 0.3f );
-			mini_console->setAlwaysOnBottom( true );
-			mini_console->setBorderStyle( border_none );
-		}
-	}
-	else if( mini_console )
-	{
-		delete mini_console;
-		mini_console = NULL;
-	}
+            mini_console = new FakkMiniconsole;
+            mini_console->Create(size, UHudColor, back, 0.3f);
+            mini_console->setAlwaysOnBottom(true);
+            mini_console->setBorderStyle(border_none);
+        }
+    } else if (mini_console) {
+        delete mini_console;
+        mini_console = NULL;
+    }
 
-	if( ui_gmbox->integer )
-	{
-		if( !gmbox )
-		{
-			UIRect2D frame;
+    if (ui_gmbox->integer) {
+        if (!gmbox) {
+            UIRect2D frame;
 
-			gmbox = new UIGMBox;
-			frame = getDefaultGMBoxRectangle();
+            gmbox = new UIGMBox;
+            frame = getDefaultGMBoxRectangle();
 
-			gmbox->Create( frame, UHudColor, UHudColor, 0 );
-			gmbox->setAlwaysOnBottom( true );
-			gmbox->setBorderStyle( border_none );
-		}
-	}
-	else if( gmbox )
-	{
-		delete gmbox;
-		gmbox = NULL;
-	}
+            gmbox->Create(frame, UHudColor, UHudColor, 0);
+            gmbox->setAlwaysOnBottom(true);
+            gmbox->setBorderStyle(border_none);
+        }
+    } else if (gmbox) {
+        delete gmbox;
+        gmbox = NULL;
+    }
 
-	if( !dmbox )
-	{
-		UIRect2D frame;
+    if (!dmbox) {
+        UIRect2D frame;
 
-		dmbox = new UIDMBox;
-		frame = getDefaultDMBoxRectangle();
+        dmbox = new UIDMBox;
+        frame = getDefaultDMBoxRectangle();
 
-		dmbox->Create( frame, UHudColor, UHudColor, 0 );
-		dmbox->setAlwaysOnBottom( true );
-		dmbox->setBorderStyle( border_outline );
-	}
+        dmbox->Create(frame, UHudColor, UHudColor, 0);
+        dmbox->setAlwaysOnBottom(true);
+        dmbox->setBorderStyle(border_outline);
+    }
 
-	menuManager.CheckRestart();
+    menuManager.CheckRestart();
 }
 
 /*
@@ -4302,8 +4250,9 @@ void UI_CheckRestart( void ) {
 UI_ResetCvars
 ====================
 */
-void UI_ResetCvars( void ) {
-	menuManager.ResetCVars();
+void UI_ResetCvars(void)
+{
+    menuManager.ResetCVars();
 }
 
 /*
@@ -4311,10 +4260,11 @@ void UI_ResetCvars( void ) {
 UI_ShowMouse_f
 ====================
 */
-void UI_ShowMouse_f( void ) {
-	if( view3d->IsActive() ) {
-		uWinMan.DeactivateCurrentControl();
-	}
+void UI_ShowMouse_f(void)
+{
+    if (view3d->IsActive()) {
+        uWinMan.DeactivateCurrentControl();
+    }
 }
 
 /*
@@ -4322,23 +4272,24 @@ void UI_ShowMouse_f( void ) {
 UI_HideMouse_f
 ====================
 */
-void UI_HideMouse_f( void ) {
-	if( !view3d->IsActive() )
-	{
-		uWinMan.ActivateControl( view3d);
-		IN_MouseOff();
-	}
+void UI_HideMouse_f(void)
+{
+    if (!view3d->IsActive()) {
+        uWinMan.ActivateControl(view3d);
+        IN_MouseOff();
+    }
 }
 
-class TestListItem : public UIListCtrlItem {
-	str strings[ 3 ];
+class TestListItem : public UIListCtrlItem
+{
+    str strings[3];
 
 public:
-	virtual griditemtype_t getListItemType( int which ) const;
-	virtual str getListItemString( int i ) const;
-	virtual int getListItemValue( int which ) const;
-	virtual void DrawListItem( int iColumn, const UIRect2D &drawRect, bool bSelected, UIFont *pFont );
-	virtual qboolean IsHeaderEntry( void ) const;
+    virtual griditemtype_t getListItemType(int which) const;
+    virtual str            getListItemString(int i) const;
+    virtual int            getListItemValue(int which) const;
+    virtual void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont);
+    virtual qboolean       IsHeaderEntry(void) const;
 };
 
 /*
@@ -4346,68 +4297,70 @@ public:
 UI_TestListCtrl_f
 ====================
 */
-void UI_TestListCtrl_f( void ) {
-	UIFloatingWindow *wnd = new UIFloatingWindow;
-	UIListCtrl *control;
-	UIRect2D frame = UIRect2D( 20, 20, 400, 300 );
-	TestListItem *i1, *i2, *i3;
+void UI_TestListCtrl_f(void)
+{
+    UIFloatingWindow *wnd = new UIFloatingWindow;
+    UIListCtrl       *control;
+    UIRect2D          frame = UIRect2D(20, 20, 400, 300);
+    TestListItem     *i1, *i2, *i3;
 
-	wnd->Create( NULL, frame, "Test list control", UWindowColor, UHudColor );
+    wnd->Create(NULL, frame, "Test list control", UWindowColor, UHudColor);
 
-	control = new UIListCtrl;
-	control->InitFrame( wnd->getChildSpace(), frame.pos.x, frame.pos.y, frame.size.width, frame.size.height, border_none, "verdana-12" );
-	control->setBackgroundColor( UWhite, true );
-	control->AddColumn( "name", 0, 100, false, false );
-	control->AddColumn( "ping", 1, 64, false, false );
-	control->AddColumn( "IP", 2, 64, false, false );
+    control = new UIListCtrl;
+    control->InitFrame(
+        wnd->getChildSpace(), frame.pos.x, frame.pos.y, frame.size.width, frame.size.height, border_none, "verdana-12"
+    );
+    control->setBackgroundColor(UWhite, true);
+    control->AddColumn("name", 0, 100, false, false);
+    control->AddColumn("ping", 1, 64, false, false);
+    control->AddColumn("IP", 2, 64, false, false);
 
-	for( int i = 0; i < 100; i++ )
-	{
-		i1 = new TestListItem;
-		control->AddItem( i1 );
+    for (int i = 0; i < 100; i++) {
+        i1 = new TestListItem;
+        control->AddItem(i1);
 
-		i2 = new TestListItem;
-		control->AddItem( i2 );
+        i2 = new TestListItem;
+        control->AddItem(i2);
 
-		i3 = new TestListItem;
-		control->AddItem( i3 );
-	}
+        i3 = new TestListItem;
+        control->AddItem(i3);
+    }
 }
 
-class StatsUpdater : public Listener {
+class StatsUpdater : public Listener
+{
 public:
-	CLASS_PROTOTYPE( StatsUpdater );
+    CLASS_PROTOTYPE(StatsUpdater);
 
-	void	UpdateStats( Event *ev );
+    void UpdateStats(Event *ev);
 };
 
-Event EV_StatsUpdater_UpdateStats;
+Event EV_StatsUpdater_UpdateStats("updatestats", EV_DEFAULT, NULL, NULL, "Update the stats on the missionLog");
 
-CLASS_DECLARATION( Listener, StatsUpdater, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(Listener, StatsUpdater, NULL) {
+    {NULL, NULL}
 };
 
 static StatsUpdater statsUpdater;
-static str loadName;
+static str          loadName;
 
-void StatsUpdater::UpdateStats( Event *ev )
+void StatsUpdater::UpdateStats(Event *ev)
 {
-	cvar_t *pMaxClients = Cvar_Get( "sv_maxclients", "1", 0 );
+    cvar_t *pMaxClients = Cvar_Get("sv_maxclients", "1", 0);
 
-	if( !com_sv_running->integer || pMaxClients->integer > 1 ) {
-		return;
-	}
+    if (!com_sv_running->integer || pMaxClients->integer > 1) {
+        return;
+    }
 
-	if( paused && !paused->integer ) {
-		CL_AddReliableCommand( "stats", qfalse );
-	}
+    if (paused && !paused->integer) {
+        CL_AddReliableCommand("stats", qfalse);
+    }
 
-	Event *event = new Event( EV_StatsUpdater_UpdateStats );
-	PostEvent( event, 2.0 );
+    Event *event = new Event(EV_StatsUpdater_UpdateStats);
+    PostEvent(event, 2.0);
 }
 
-static int statsRequestTime;
+static int  statsRequestTime;
 static bool intermission_stats_up;
 static bool isMissionLogVisible;
 
@@ -4416,56 +4369,45 @@ static bool isMissionLogVisible;
 UI_ShowScoreboard_f
 ====================
 */
-void UI_ShowScoreboard_f( const char *pszMenuName ) {
-	if( pszMenuName )
-	{
-		if( scoreboard_menuname.length() )
-		{
-			if( str::icmp( scoreboard_menuname, pszMenuName ) ) {
-				scoreboard_menu->ForceHide();
-			}
-		}
+void UI_ShowScoreboard_f(const char *pszMenuName)
+{
+    if (pszMenuName) {
+        if (scoreboard_menuname.length() && str::icmp(scoreboard_menuname, pszMenuName) && scoreboard_menu) {
+            scoreboard_menu->ForceHide();
+        }
 
-		scoreboard_menuname = pszMenuName;
-	}
+        scoreboard_menuname = pszMenuName;
+    }
 
-	if( UI_MenuActive() )
-	{
-		if( scoreboard_menuname.length() )
-		{
-			scoreboard_menu = menuManager.FindMenu( scoreboard_menuname );
+    if (UI_MenuActive()) {
+        if (scoreboard_menuname.length()) {
+            scoreboard_menu = menuManager.FindMenu(scoreboard_menuname);
 
-			if( scoreboard_menu ) {
-				scoreboard_menu->ForceHide();
-			}
-		}
+            if (scoreboard_menu) {
+                scoreboard_menu->ForceHide();
+            }
+        }
 
-		if( scoreboardlist && scoreboardlist->IsVisible() )
-		{
-			scoreboardlist->setShow( false );
-		}
-	}
-	else
-	{
-		if( scoreboard_menuname.length() )
-		{
-			scoreboard_menu = menuManager.FindMenu( scoreboard_menuname );
+        if (scoreboardlist && scoreboardlist->IsVisible()) {
+            scoreboardlist->setShow(false);
+        }
+    } else {
+        if (scoreboard_menuname.length()) {
+            scoreboard_menu = menuManager.FindMenu(scoreboard_menuname);
 
-			if( scoreboard_menu )
-			{
-				UIWidget *widget = scoreboard_menu->GetContainerWidget();
-				if( widget ) {
-					widget->BringToFrontPropogated();
-				}
-				scoreboard_menu->ForceShow();
-			}
-		}
+            if (scoreboard_menu) {
+                UIWidget *widget = scoreboard_menu->GetContainerWidget();
+                if (widget) {
+                    widget->BringToFrontPropogated();
+                }
+                scoreboard_menu->ForceShow();
+            }
+        }
 
-		if( scoreboardlist && !scoreboardlist->IsVisible() )
-		{
-			scoreboardlist->setShow( true );
-		}
-	}
+        if (scoreboardlist && !scoreboardlist->IsVisible()) {
+            scoreboardlist->setShow(true);
+        }
+    }
 }
 
 /*
@@ -4473,80 +4415,85 @@ void UI_ShowScoreboard_f( const char *pszMenuName ) {
 UI_HideScoreboard_f
 ====================
 */
-void UI_HideScoreboard_f( void ) {
-	if( scoreboardlist )
-	{
-		scoreboardlist->setShow( false );
-	}
+void UI_HideScoreboard_f(void)
+{
+    if (scoreboardlist) {
+        scoreboardlist->setShow(false);
+    }
 
-	if( scoreboard_menuname.length() )
-	{
-		scoreboard_menu->ForceHide();
-	}
+    if (scoreboard_menuname.length()) {
+        // Fixed in 2.30 (scoreboard_menu check)
+        if (scoreboard_menu) {
+            scoreboard_menu->ForceHide();
+        }
+    }
 }
 
-class ScoreboardListItem : public UIListCtrlItem {
-	str strings[ 8 ];
-	qboolean bColorSet;
-	UColor backColor;
-	UColor textColor;
-	qboolean bTitleItem;
+class ScoreboardListItem : public UIListCtrlItem
+{
+    str      strings[8];
+    qboolean bColorSet;
+    UColor   backColor;
+    UColor   textColor;
+    qboolean bTitleItem;
 
 public:
-	ScoreboardListItem();
+    ScoreboardListItem();
 
-	void SetListItemStrings( const char *string1, const char *string2, const char *string3, const char *string4, const char *string5, const char *string6, const char *string7, const char *string8 );
-	virtual griditemtype_t getListItemType( int which ) const;
-	virtual str getListItemString( int i ) const;
-	virtual int getListItemValue( int which ) const;
-	virtual void DrawListItem( int iColumn, const UIRect2D &drawRect, bool bSelected, UIFont *pFont );
-	void SetColors( const UColor& newTextColor, const UColor& newBackColor );
-	void ClearColors( void );
-	void SetTitleItem( qboolean bSet );
-	virtual qboolean IsHeaderEntry( void ) const;
+    void SetListItemStrings(
+        const char *string1,
+        const char *string2,
+        const char *string3,
+        const char *string4,
+        const char *string5,
+        const char *string6,
+        const char *string7,
+        const char *string8
+    );
+    virtual griditemtype_t getListItemType(int which) const;
+    virtual str            getListItemString(int i) const;
+    virtual int            getListItemValue(int which) const;
+    virtual void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont);
+    void                   SetColors(const UColor& newTextColor, const UColor& newBackColor);
+    void                   ClearColors(void);
+    void                   SetTitleItem(qboolean bSet);
+    virtual qboolean       IsHeaderEntry(void) const;
 };
 
 ScoreboardListItem::ScoreboardListItem()
 {
-	bColorSet = false;
-	bTitleItem = false;
+    bColorSet  = false;
+    bTitleItem = false;
 }
 
-void ScoreboardListItem::DrawListItem( int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont )
+void ScoreboardListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont)
 {
-	DrawBox( drawRect, backColor, 1.0 );
-	pFont->setColor(textColor);
-	pFont->Print(
-		drawRect.pos.x + 1,
-		drawRect.pos.y,
-		Sys_LV_CL_ConvertString(getListItemString(iColumn)),
-		-1,
-		qfalse
-	);
+    DrawBox(drawRect, backColor, 1.0);
+    pFont->setColor(textColor);
+    pFont->Print((drawRect.pos.x + 1) / uid.scaleRes[0], drawRect.pos.y / uid.scaleRes[1], Sys_LV_CL_ConvertString(getListItemString(iColumn)), -1, uid.scaleRes);
 
-	if( bTitleItem )
-	{
-		UIRect2D lineRect;
-		UColor lineColor = backColor;
+    if (bTitleItem) {
+        UIRect2D lineRect;
+        UColor   lineColor = backColor;
 
-		lineRect = drawRect;
-		lineRect.pos.y += lineRect.size.height - 2.0;
-		lineRect.size.height = 2.0;
+        lineRect = drawRect;
+        lineRect.pos.y += lineRect.size.height - 2.0;
+        lineRect.size.height = 2.0;
 
-		DrawBox( lineRect, lineColor, 1.0 );
-	}
+        DrawBox(lineRect, lineColor, 1.0);
+    }
 }
 
-void ScoreboardListItem::SetColors( const UColor& newTextColor, const UColor& newBackColor )
+void ScoreboardListItem::SetColors(const UColor& newTextColor, const UColor& newBackColor)
 {
-	textColor = newTextColor;
-	backColor = newBackColor;
-	bColorSet = true;
+    textColor = newTextColor;
+    backColor = newBackColor;
+    bColorSet = true;
 }
 
-void ScoreboardListItem::ClearColors( void )
+void ScoreboardListItem::ClearColors(void)
 {
-	bColorSet = false;
+    bColorSet = false;
 }
 
 /*
@@ -4554,52 +4501,52 @@ void ScoreboardListItem::ClearColors( void )
 UI_CreateScoreboard
 ====================
 */
-void UI_CreateScoreboard( void ) {
-	int i;
-	int iColumnWidth;
-	float w, h, x, y;
-	float fColumnScale;
-	float fR, fG, fB, fA;
-	float fFontR, fFontG, fFontB, fFontA;
-	const char *pszColumnName;
+void UI_CreateScoreboard(void)
+{
+    int         i;
+    int         iColumnWidth;
+    float       w, h, x, y;
+    float       fColumnScale;
+    float       fR, fG, fB, fA;
+    float       fFontR, fFontG, fFontB, fFontA;
+    const char *pszColumnName;
 
-	if( !cge ) {
-		return;
-	}
+    if (!cge) {
+        return;
+    }
 
-	scoreboardlist = new UIListCtrl;
-	cge->CG_GetScoreBoardPosition( &x, &y, &w, &h );
-	scoreboard_x = x;
-	scoreboard_y = y;
-	scoreboard_w = w;
-	scoreboard_h = h;
+    scoreboardlist = new UIListCtrl;
+    cge->CG_GetScoreBoardPosition(&x, &y, &w, &h);
+    scoreboard_x = x;
+    scoreboard_y = y;
+    scoreboard_w = w;
+    scoreboard_h = h;
 
-	SCR_AdjustFrom640( &x, &y, &w, &h );
-	fColumnScale = cls.glconfig.vidWidth / 640.0;
-	cge->CG_GetScoreBoardColor( &fR, &fG, &fB, &fA );
-	cge->CG_GetScoreBoardFontColor( &fFontR, &fFontG, &fFontB, &fFontA );
+    SCR_AdjustFrom640(&x, &y, &w, &h);
+    fColumnScale = uid.vidWidth / 640.0;
+    cge->CG_GetScoreBoardColor(&fR, &fG, &fB, &fA);
+    cge->CG_GetScoreBoardFontColor(&fFontR, &fFontG, &fFontB, &fFontA);
 
-	scoreboardlist->InitFrame( NULL, x, y, w, h, -1, "verdana-12" );
-	scoreboardlist->setBackgroundColor( UColor( fR, fG, fB, fA ), true );
-	scoreboardlist->setForegroundColor( UColor( fFontR, fFontG, fFontB, fFontA ) );
+    scoreboardlist->InitFrame(NULL, x, y, w, h, -1, "verdana-12");
+    scoreboardlist->setBackgroundColor(UColor(fR, fG, fB, fA), true);
+    scoreboardlist->setForegroundColor(UColor(fFontR, fFontG, fFontB, fFontA));
 
-	for( i = 0; i < 8; i++ )
-	{
-		pszColumnName = cge->CG_GetColumnName( i, &iColumnWidth );
-		if( !pszColumnName ) {
-			break;
-		}
+    for (i = 0; i < 8; i++) {
+        pszColumnName = cge->CG_GetColumnName(i, &iColumnWidth);
+        if (!pszColumnName) {
+            break;
+        }
 
-		scoreboardlist->AddColumn( pszColumnName, i, iColumnWidth * fColumnScale + 0.5, false, false );
-	}
+        scoreboardlist->AddColumn(pszColumnName, i, iColumnWidth * fColumnScale + 0.5, false, false);
+    }
 
-	scoreboard_header = cge->CG_GetScoreBoardDrawHeader();
-	scoreboardlist->setShow( false );
-	scoreboardlist->AllowActivate( false );
-	scoreboardlist->setAlwaysOnBottom( true );
-	scoreboardlist->SetUseScrollBar( false );
-	scoreboardlist->SetDrawHeader( scoreboard_header );
-	scoreboardlist->setHeaderFont( "facfont-20" );
+    scoreboard_header = cge->CG_GetScoreBoardDrawHeader();
+    scoreboardlist->setShow(false);
+    scoreboardlist->AllowActivate(false);
+    scoreboardlist->setAlwaysOnBottom(true);
+    scoreboardlist->SetUseScrollBar(false);
+    scoreboardlist->SetDrawHeader(scoreboard_header);
+    scoreboardlist->setHeaderFont("facfont-20");
 }
 
 /*
@@ -4607,100 +4554,96 @@ void UI_CreateScoreboard( void ) {
 UI_SetScoreBoardItem
 ====================
 */
-void UI_SetScoreBoardItem( int iItemNumber,
-	const char *pszData1, const char *pszData2, const char *pszData3, const char *pszData4,
-	const char *pszData5, const char *pszData6, const char *pszData7, const char *pszData8,
-	const vec4_t pTextColor, const vec4_t pBackColor, qboolean bIsHeader )
+void UI_SetScoreBoardItem(
+    int          iItemNumber,
+    const char  *pszData1,
+    const char  *pszData2,
+    const char  *pszData3,
+    const char  *pszData4,
+    const char  *pszData5,
+    const char  *pszData6,
+    const char  *pszData7,
+    const char  *pszData8,
+    const vec4_t pTextColor,
+    const vec4_t pBackColor,
+    qboolean     bIsHeader
+)
 {
-	int i;
-	float x, y, w, h;
-	ScoreboardListItem *pItem;
+    int                 i;
+    float               x, y, w, h;
+    ScoreboardListItem *pItem;
 
-	if( iItemNumber >= 64 ) {
-		return;
-	}
+    if (iItemNumber >= 64) {
+        return;
+    }
 
-	if( scoreboardlist )
-	{
-		cge->CG_GetScoreBoardPosition( &x, &y, &w, &h );
+    if (scoreboardlist) {
+        cge->CG_GetScoreBoardPosition(&x, &y, &w, &h);
 
-		// Recreate the scoreboard if it has different rect
-		if( scoreboard_x != x
-			|| scoreboard_y != y
-			|| scoreboard_w != w
-			|| scoreboard_h != h
-			|| scoreboard_header != cge->CG_GetScoreBoardDrawHeader() )
-		{
-			delete scoreboardlist;
-			scoreboardlist = NULL;
-			UI_CreateScoreboard();
-		}
-	}
-	else
-	{
-		UI_CreateScoreboard();
-	}
+        // Recreate the scoreboard if it has different rect
+        if (scoreboard_x != x || scoreboard_y != y || scoreboard_w != w || scoreboard_h != h
+            || scoreboard_header != cge->CG_GetScoreBoardDrawHeader()) {
+            delete scoreboardlist;
+            scoreboardlist = NULL;
+            UI_CreateScoreboard();
+        }
+    } else {
+        UI_CreateScoreboard();
+    }
 
-	if( scoreboardlist )
-	{
-		if (iItemNumber + 1 > scoreboardlist->getNumItems()) {
-			pItem = new ScoreboardListItem;
-			scoreboardlist->AddItem(pItem);
-		}
-		else {
-			pItem = (ScoreboardListItem*)scoreboardlist->GetItem(iItemNumber + 1);
-		}
+    if (scoreboardlist) {
+        if (iItemNumber + 1 > scoreboardlist->getNumItems()) {
+            pItem = new ScoreboardListItem;
+            scoreboardlist->AddItem(pItem);
+        } else {
+            pItem = (ScoreboardListItem *)scoreboardlist->GetItem(iItemNumber + 1);
+        }
 
-		if( pItem )
-		{
-			if( !pszData1 ) {
-				pszData1 = "";
-			}
-			if( !pszData2 ) {
-				pszData2 = "";
-			}
-			if( !pszData3 ) {
-				pszData3 = "";
-			}
-			if( !pszData4 ) {
-				pszData4 = "";
-			}
-			if( !pszData5 ) {
-				pszData5 = "";
-			}
-			if( !pszData6 ) {
-				pszData6 = "";
-			}
-			if( !pszData7 ) {
-				pszData7 = "";
-			}
-			if( !pszData8 ) {
-				pszData8 = "";
-			}
+        if (pItem) {
+            if (!pszData1) {
+                pszData1 = "";
+            }
+            if (!pszData2) {
+                pszData2 = "";
+            }
+            if (!pszData3) {
+                pszData3 = "";
+            }
+            if (!pszData4) {
+                pszData4 = "";
+            }
+            if (!pszData5) {
+                pszData5 = "";
+            }
+            if (!pszData6) {
+                pszData6 = "";
+            }
+            if (!pszData7) {
+                pszData7 = "";
+            }
+            if (!pszData8) {
+                pszData8 = "";
+            }
 
-			pItem->SetListItemStrings( pszData1, pszData2, pszData3, pszData4, pszData5, pszData6, pszData7, pszData8 );
+            pItem->SetListItemStrings(pszData1, pszData2, pszData3, pszData4, pszData5, pszData6, pszData7, pszData8);
 
-			if( pTextColor && pBackColor )
-			{
-				UColor textColor, backColor;
+            if (pTextColor && pBackColor) {
+                UColor textColor, backColor;
 
-				textColor = UColor( pTextColor[ 0 ], pTextColor[ 1 ], pTextColor[ 2 ], pTextColor[ 3 ] );
-				backColor = UColor( pBackColor[ 0 ], pBackColor[ 1 ], pBackColor[ 2 ], pBackColor[ 3 ] );
-				pItem->SetColors( textColor, backColor );
-			}
-			else
-			{
-				pItem->ClearColors();
-			}
+                textColor = UColor(pTextColor[0], pTextColor[1], pTextColor[2], pTextColor[3]);
+                backColor = UColor(pBackColor[0], pBackColor[1], pBackColor[2], pBackColor[3]);
+                pItem->SetColors(textColor, backColor);
+            } else {
+                pItem->ClearColors();
+            }
 
-			for( i = 0; i < 8; i++ )
-			{
-				pItem->getListItemString( i );
-			}
+            for (i = 0; i < 8; i++) {
+                pItem->getListItemString(i);
+            }
 
-			pItem->SetTitleItem( bIsHeader );
-		}
-	}
+            pItem->SetTitleItem(bIsHeader);
+        }
+    }
 }
 
 /*
@@ -4708,11 +4651,11 @@ void UI_SetScoreBoardItem( int iItemNumber,
 UI_DeleteScoreBoardItems
 ====================
 */
-void UI_DeleteScoreBoardItems( int iMaxIndex ) {
-	while( iMaxIndex + 1 <= scoreboardlist->getNumItems() )
-	{
-		scoreboardlist->DeleteItem( scoreboardlist->getNumItems() );
-	}
+void UI_DeleteScoreBoardItems(int iMaxIndex)
+{
+    while (iMaxIndex + 1 <= scoreboardlist->getNumItems()) {
+        scoreboardlist->DeleteItem(scoreboardlist->getNumItems());
+    }
 }
 
 /*
@@ -4720,65 +4663,61 @@ void UI_DeleteScoreBoardItems( int iMaxIndex ) {
 UI_Hud_f
 ====================
 */
-void UI_Hud_f( void ) {
-	qboolean hide;
+void UI_Hud_f(void)
+{
+    qboolean hide;
 
-	if( Cmd_Argc() != 2 ) {
-		Com_Printf( "Usage: ui_hud [1|0]" );
-		return;
-	}
+    if (Cmd_Argc() != 2) {
+        Com_Printf("Usage: ui_hud [1|0]");
+        return;
+    }
 
-	ui_hud = atoi( Cmd_Argv( 1 ) );
-	hide = !ui_hud;
+    ui_hud = atoi(Cmd_Argv(1));
+    hide   = !ui_hud;
 
-	if( hud_weapons && hide )
-	{
-		hud_weapons->ForceHide();
-		ui_weapHudTime = 0;
-	}
+    if (hud_weapons && hide) {
+        hud_weapons->ForceHide();
+        ui_weapHudTime = 0;
+    }
 
-	if( hud_items && hide )
-	{
-		hud_items->ForceHide();
-		ui_itemHudTime = 0;
-	}
+    if (hud_items && hide) {
+        hud_items->ForceHide();
+        ui_itemHudTime = 0;
+    }
 
-	if( hud_health )
-	{
-		if( hide ) {
-			hud_health->ForceHide();
-		} else {
-			hud_health->ForceShow();
-		}
-	}
-	if( hud_ammo )
-	{
-		if( hide ) {
-			hud_ammo->ForceHide();
-		} else {
-			hud_ammo->ForceShow();
-		}
-	}
-	if( hud_compass )
-	{
-		if( hide ) {
-			hud_compass->ForceHide();
-		} else {
-			hud_compass->ForceShow();
-		}
-	}
+    if (hud_health) {
+        if (hide) {
+            hud_health->ForceHide();
+        } else {
+            hud_health->ForceShow();
+        }
+    }
+    if (hud_ammo) {
+        if (hide) {
+            hud_ammo->ForceHide();
+        } else {
+            hud_ammo->ForceShow();
+        }
+    }
+    if (hud_compass) {
+        if (hide) {
+            hud_compass->ForceHide();
+        } else {
+            hud_compass->ForceShow();
+        }
+    }
 
-	if( hide ) {
-		UI_HideHudList();
-	} else {
-		UI_ShowHudList();
-	}
+    if (hide) {
+        UI_HideHudList();
+    } else {
+        UI_ShowHudList();
+    }
 
-	if( ui_hud ) {
-		Cvar_Set( "cg_hud", "1" );
-	} else {
-		Cvar_Set( "cg_hud", "0" );
-	}
+    if (ui_hud) {
+        Cvar_Set("cg_hud", "1");
+    } else {
+        Cvar_Set("cg_hud", "0");
+    }
 }
 
 /*
@@ -4786,18 +4725,19 @@ void UI_Hud_f( void ) {
 UI_ClearConsole_f
 ====================
 */
-void UI_ClearConsole_f( void ) {
-	if( fakk_console ) {
-		fakk_console->Clear();
-	}
+void UI_ClearConsole_f(void)
+{
+    if (fakk_console) {
+        fakk_console->Clear();
+    }
 
-	if( dm_console ) {
-		dm_console->Clear();
-	}
+    if (dm_console) {
+        dm_console->Clear();
+    }
 
-	if( developer_console ) {
-		developer_console->Clear();
-	}
+    if (developer_console) {
+        developer_console->Clear();
+    }
 }
 
 /*
@@ -4805,8 +4745,9 @@ void UI_ClearConsole_f( void ) {
 CL_FinishedIntro
 ====================
 */
-qboolean CL_FinishedIntro( void ) {
-	return !cls.startStage;
+qboolean CL_FinishedIntro(void)
+{
+    return cls.startStage == 0;
 }
 
 /*
@@ -4814,8 +4755,89 @@ qboolean CL_FinishedIntro( void ) {
 CL_FinishedStartStage
 ====================
 */
-void CL_FinishedStartStage( void ) {
-	// FIXME: stub
+void CL_FinishedStartStage(void)
+{
+    int wait;
+
+    switch (cls.startStage++) {
+    case 1:
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic EAlogo.RoQ\n");
+        break;
+    case 2:
+        intro_stage.alpha_start = 0.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_titlescreen_fadein->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+
+        intro_stage.material = uWinMan.RegisterShader("mohaa_title");
+        break;
+    case 3:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_legalscreen_stay->value * 1000.0;
+        intro_stage.fadetime  = 0.0;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 4:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 0.0;
+
+        wait                  = ui_titlescreen_fadeout->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 5:
+        intro_stage.alpha_start = 0.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_legalscreen_fadein->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+
+        intro_stage.material = uWinMan.RegisterShader("legal");
+        break;
+    case 6:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 1.0;
+
+        wait                  = ui_legalscreen_stay->value * 1000.0;
+        intro_stage.fadetime  = 0.0;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 7:
+        intro_stage.alpha_start = 1.0;
+        intro_stage.alpha_end   = 0.0;
+
+        wait                  = ui_legalscreen_fadeout->value * 1000.0;
+        intro_stage.fadetime  = wait;
+        intro_stage.starttime = cls.realtime;
+        intro_stage.endtime   = cls.realtime + wait;
+        break;
+    case 8:
+        if (com_target_game->integer >= target_game_e::TG_MOHTA) {
+            cls.startStage = 0;
+            return;
+        }
+
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic 2015intro.RoQ\n");
+        break;
+    case 9:
+        Cbuf_ExecuteText(EXEC_NOW, "cinematic intro.RoQ\n");
+        break;
+    case 10:
+        cls.startStage = 0;
+        break;
+    default:
+        break;
+    }
 }
 
 /*
@@ -4823,45 +4845,37 @@ void CL_FinishedStartStage( void ) {
 UI_StartStageKeyEvent
 ====================
 */
-void UI_StartStageKeyEvent( void ) {
-	switch( cls.startStage )
-	{
-	case 2:
-		if( ui_skip_eamovie->integer ) {
-			SCR_StopCinematic();
-		}
-		break;
-	case 12:
-		SCR_StopCinematic();
-		break;
-	case 3:
-	case 4:
-	case 5:
-		if( ui_skip_titlescreen->integer )
-		{
-			cls.startStage = 5;
-			CL_FinishedStartStage();
-		}
-		break;
-	case 6:
-	case 7:
-	case 8:
-		if( ui_skip_legalscreen->integer )
-		{
-			cls.startStage = 8;
-			CL_FinishedStartStage();
-		}
-		break;
-	case 9:
-	case 10:
-	case 11:
-		if( ui_skip_legalscreen->integer )
-		{
-			cls.startStage = 11;
-			CL_FinishedStartStage();
-		}
-		break;
-	}
+void UI_StartStageKeyEvent(void)
+{
+    switch (cls.startStage) {
+    case 2:
+        if (ui_skip_eamovie->integer) {
+            SCR_StopCinematic();
+        }
+        break;
+    case 3:
+    case 4:
+    case 5:
+        if (ui_skip_titlescreen->integer) {
+            cls.startStage = 5;
+            CL_FinishedStartStage();
+        }
+        break;
+    case 6:
+    case 7:
+    case 8:
+        if (ui_skip_legalscreen->integer) {
+            cls.startStage = 8;
+            CL_FinishedStartStage();
+        }
+        break;
+    case 9:
+    case 10:
+        SCR_StopCinematic();
+        break;
+    default:
+        break;
+    }
 }
 
 /*
@@ -4869,10 +4883,11 @@ void UI_StartStageKeyEvent( void ) {
 UI_StartIntro_f
 ====================
 */
-void UI_StartIntro_f( void ) {
-	cls.startStage = 1;
-	IN_MouseOff();
-	CL_FinishedStartStage();
+void UI_StartIntro_f(void)
+{
+    cls.startStage = 1;
+    IN_MouseOff();
+    CL_FinishedStartStage();
 }
 
 /*
@@ -4880,17 +4895,15 @@ void UI_StartIntro_f( void ) {
 CL_TryStartIntro
 ====================
 */
-void CL_TryStartIntro( void ) {
-	if( developer->integer || !cl_playintro->integer )
-	{
-		UI_ToggleConsole();
-	}
-	else
-	{
-		// FIXME: no intro from now
-		//Cvar_Set( cl_playintro->name, "0" );
-		//UI_StartIntro_f();
-	}
+void CL_TryStartIntro(void)
+{
+    if (developer->integer || !cl_playintro->integer) {
+        UI_ToggleConsole();
+    } else {
+        // FIXME: no intro from now
+        Cvar_Set(cl_playintro->name, "0");
+        UI_StartIntro_f();
+    }
 }
 
 /*
@@ -4898,29 +4911,32 @@ void CL_TryStartIntro( void ) {
 SaveConsoleRectangle
 ====================
 */
-static void SaveConsoleRectangle( void ) {
-	bool wasMinimized;
-	UIRect2D r;
+static void SaveConsoleRectangle(void)
+{
+    bool     wasMinimized;
+    UIRect2D r;
 
-	if( !fakk_console ) {
-		return;
-	}
+    if (!fakk_console) {
+        return;
+    }
 
-	wasMinimized = fakk_console->IsMinimized();
+    wasMinimized = fakk_console->IsMinimized();
 
-	if( wasMinimized ) {
-		fakk_console->ProcessEvent( UIFloatingWindow::W_MinimizePressed );
-	}
+    if (wasMinimized) {
+        fakk_console->ProcessEvent(UIFloatingWindow::W_MinimizePressed);
+    }
 
-	if( !fakk_console->IsMinimized() ) {
-		r = fakk_console->getFrame();
+    if (!fakk_console->IsMinimized()) {
+        r = fakk_console->getFrame();
 
-		Cvar_Set( "ui_consoleposition", va( "%d %d %d %d", (int)r.pos.x, (int)r.pos.y, (int)r.size.width, (int)r.size.height ) );
-		
-		if( wasMinimized ) {
-			fakk_console->ProcessEvent( UIFloatingWindow::W_MinimizePressed );
-		}
-	}
+        Cvar_Set(
+            "ui_consoleposition", va("%d %d %d %d", (int)r.pos.x, (int)r.pos.y, (int)r.size.width, (int)r.size.height)
+        );
+
+        if (wasMinimized) {
+            fakk_console->ProcessEvent(UIFloatingWindow::W_MinimizePressed);
+        }
+    }
 }
 
 /*
@@ -4928,22 +4944,23 @@ static void SaveConsoleRectangle( void ) {
 LoadConsoleRectangle
 ====================
 */
-static void LoadConsoleRectangle( void ) {
-	bool wasMinimized;
+static void LoadConsoleRectangle(void)
+{
+    bool wasMinimized;
 
-	if( !fakk_console ) {
-		return;
-	}
+    if (!fakk_console) {
+        return;
+    }
 
-	wasMinimized = fakk_console->IsMinimized();
+    wasMinimized = fakk_console->IsMinimized();
 
-	if( wasMinimized ) {
-		fakk_console->ProcessEvent( UIFloatingWindow::W_MinimizePressed );
-	}
+    if (wasMinimized) {
+        fakk_console->ProcessEvent(UIFloatingWindow::W_MinimizePressed);
+    }
 
-	if( !fakk_console->IsMinimized() && wasMinimized ) {
-		fakk_console->ProcessEvent( UIFloatingWindow::W_MinimizePressed );
-	}
+    if (!fakk_console->IsMinimized() && wasMinimized) {
+        fakk_console->ProcessEvent(UIFloatingWindow::W_MinimizePressed);
+    }
 }
 
 /*
@@ -4951,21 +4968,19 @@ static void LoadConsoleRectangle( void ) {
 UI_AddHud_f
 ====================
 */
-void UI_AddHud_f( void ) {
-	Menu *hud = menuManager.FindMenu( Cmd_Argv( 1 ) );
+void UI_AddHud_f(void)
+{
+    Menu *hud = menuManager.FindMenu(Cmd_Argv(1));
 
-	if( hud )
-	{
-		if( !hudList.ObjectInList( hud ) ) {
-			hudList.AddObject( hud );
-		}
+    if (hud) {
+        if (!hudList.ObjectInList(hud)) {
+            hudList.AddObject(hud);
+        }
 
-		hud->ShowMenu( NULL );
-	}
-	else
-	{
-		Com_DPrintf( "Hud %s not found in menu system.\n", Cmd_Argv( 1 ) );
-	}
+        hud->ShowMenu(NULL);
+    } else {
+        Com_DPrintf("Hud %s not found in menu system.\n", Cmd_Argv(1));
+    }
 }
 
 /*
@@ -4973,14 +4988,14 @@ void UI_AddHud_f( void ) {
 UI_RemoveHud_f
 ====================
 */
-void UI_RemoveHud_f( void ) {
-	Menu *hud = menuManager.FindMenu( Cmd_Argv( 1 ) );
+void UI_RemoveHud_f(void)
+{
+    Menu *hud = menuManager.FindMenu(Cmd_Argv(1));
 
-	if( hud && hudList.ObjectInList( hud ) )
-	{
-		hud->ForceHide();
-		hudList.RemoveObject( hud );
-	}
+    if (hud && hudList.ObjectInList(hud)) {
+        hud->ForceHide();
+        hudList.RemoveObject(hud);
+    }
 }
 
 /*
@@ -4988,12 +5003,13 @@ void UI_RemoveHud_f( void ) {
 UI_StartServer_f
 ====================
 */
-void UI_StartServer_f( void ) {
-	const char *map = Cmd_Argv( 1 );
+void UI_StartServer_f(void)
+{
+    const char *map = Cmd_Argv(1);
 
-	if( strlen( map ) ) {
-		Cbuf_AddText( va( "map %s\n", map ) );
-	}
+    if (strlen(map)) {
+        Cbuf_AddText(va("map %s\n", map));
+    }
 }
 
 /*
@@ -5001,30 +5017,28 @@ void UI_StartServer_f( void ) {
 UI_ShowStatistics_f
 ====================
 */
-void UI_ShowStatistics_f() {
-	cvar_t *pMaxClients = Cvar_Get( "sv_maxclients", "1", 0 );
+void UI_ShowStatistics_f()
+{
+    cvar_t *pMaxClients = Cvar_Get("sv_maxclients", "1", 0);
 
-	if( !com_sv_running->integer || pMaxClients->integer > 1 ) {
-		return;
-	}
+    if (!com_sv_running->integer || pMaxClients->integer > 1) {
+        return;
+    }
 
-	if( missionLog && !isMissionLogVisible )
-	{
-		isMissionLogVisible = true;
-		missionLog->ShowMenu( NULL );
-		IN_MouseOn();
-	}
+    if (missionLog && !isMissionLogVisible) {
+        isMissionLogVisible = true;
+        missionLog->ShowMenu(NULL);
+        IN_MouseOn();
+    }
 
-	if( statsRequestTime + 2000 <= cls.realtime )
-	{
-		if( paused && !paused->integer )
-		{
-			statsRequestTime = cls.realtime;
-			CL_AddReliableCommand( "stats", qfalse );
-			Event *event = new Event( EV_StatsUpdater_UpdateStats );
-			statsUpdater.PostEvent( event, 2.0 );
-		}
-	}
+    if (statsRequestTime + 2000 <= cls.realtime) {
+        if (paused && !paused->integer) {
+            statsRequestTime = cls.realtime;
+            CL_AddReliableCommand("stats", qfalse);
+            Event *event = new Event(EV_StatsUpdater_UpdateStats);
+            statsUpdater.PostEvent(event, 2.0);
+        }
+    }
 }
 
 /*
@@ -5032,170 +5046,177 @@ void UI_ShowStatistics_f() {
 UI_HideStatistics_f
 ====================
 */
-void UI_HideStatistics_f() {
-	cvar_t *pMaxClients = Cvar_Get( "sv_maxclients", "1", 0 );
+void UI_HideStatistics_f()
+{
+    cvar_t *pMaxClients = Cvar_Get("sv_maxclients", "1", 0);
 
-	if( !com_sv_running->integer || pMaxClients->integer > 1 ) {
-		return;
-	}
+    if (!com_sv_running->integer || pMaxClients->integer > 1) {
+        return;
+    }
 
-	if( missionLog )
-	{
-		isMissionLogVisible = false;
-		missionLog->HideMenu( &EV_HideMenu );
-		IN_MouseOff();
-	}
+    if (missionLog) {
+        isMissionLogVisible = false;
+        missionLog->HideMenu(&EV_HideMenu);
+        IN_MouseOff();
+    }
 
-	statsUpdater.CancelEventsOfType( EV_StatsUpdater_UpdateStats );
+    statsUpdater.CancelEventsOfType(EV_StatsUpdater_UpdateStats);
 }
 
+/*
+====================
+UI_SalesScreen_f
+====================
+*/
+void UI_SalesScreen_f()
+{
+    if (random() > 0.5) {
+        Cbuf_AddText("pushmenu sales_splash1\n");
+    } else {
+        Cbuf_AddText("pushmenu sales_splash2\n");
+    }
+}
 
 /*
 ====================
 CL_ShutdownUI
 ====================
 */
-void CL_ShutdownUI( void ) {
-	if( !cls.uiStarted ) {
-		return;
-	}
+void CL_ShutdownUI(void)
+{
+    if (!cls.uiStarted) {
+        return;
+    }
 
-	if( s_intermediateconsole )
-	{
-		delete s_intermediateconsole;
-		s_intermediateconsole = NULL;
-	}
+    if (s_intermediateconsole) {
+        delete s_intermediateconsole;
+        s_intermediateconsole = NULL;
+    }
 
-	// remove all UI commands
-	Cmd_RemoveCommand( "pushmenu" );
-	Cmd_RemoveCommand( "forcemenu" );
-	Cmd_RemoveCommand( "popmenu" );
-	Cmd_RemoveCommand( "showmenu" );
-	Cmd_RemoveCommand( "widgetcommand" );
-	Cmd_RemoveCommand( "listmenus" );
-	Cmd_RemoveCommand( "togglemenu" );
-	Cmd_RemoveCommand( "loadmenu" );
-	Cmd_RemoveCommand( "maplist" );
-	Cmd_RemoveCommand( "dmmapselect" );
-	Cmd_RemoveCommand( "ui_startdmmap" );
-	Cmd_RemoveCommand( "viewspawnlist" );
-	Cmd_RemoveCommand( "lod_spawnlist" );
-	Cmd_RemoveCommand( "soundpicker" );
-	Cmd_RemoveCommand( "notepad" );
-	Cmd_RemoveCommand( "editscript" );
-	Cmd_RemoveCommand( "editshader" );
-	Cmd_RemoveCommand( "inv_restart" );
-	Cmd_RemoveCommand( "ui_showmouse" );
-	Cmd_RemoveCommand( "ui_hidemouse" );
-	Cmd_RemoveCommand( "ui_saveconsolepos" );
-	Cmd_RemoveCommand( "ui_loadconsolepos" );
-	Cmd_RemoveCommand( "ui_testlist" );
-	Cmd_RemoveCommand( "clear" );
-	Cmd_RemoveCommand( "ui_hud" );
-	Cmd_RemoveCommand( "ui_resetcvars" );
-	Cmd_RemoveCommand( "ui_checkrestart" );
-	Cmd_RemoveCommand( "ui_addhud" );
-	Cmd_RemoveCommand( "ui_removehud" );
-	Cmd_RemoveCommand( "centerprint" );
-	Cmd_RemoveCommand( "locationprint" );
-	Cmd_RemoveCommand( "startserver" );
-	Cmd_RemoveCommand( "finishloadingscreen" );
-	Cmd_RemoveCommand( "playermodel" );
-	Cmd_RemoveCommand( "ui_applyplayermodel" );
-	Cmd_RemoveCommand( "ui_getplayermodel" );
-	Cmd_RemoveCommand( "devcon" );
-	Cmd_RemoveCommand( "+statistics" );
-	Cmd_RemoveCommand( "-statistics" );
+    // remove all UI commands
+    Cmd_RemoveCommand("pushmenu");
+    Cmd_RemoveCommand("forcemenu");
+    Cmd_RemoveCommand("popmenu");
+    Cmd_RemoveCommand("showmenu");
+    Cmd_RemoveCommand("widgetcommand");
+    Cmd_RemoveCommand("listmenus");
+    Cmd_RemoveCommand("togglemenu");
+    Cmd_RemoveCommand("loadmenu");
+    Cmd_RemoveCommand("maplist");
+    Cmd_RemoveCommand("dmmapselect");
+    Cmd_RemoveCommand("ui_startdmmap");
+    Cmd_RemoveCommand("viewspawnlist");
+    Cmd_RemoveCommand("lod_spawnlist");
+    Cmd_RemoveCommand("soundpicker");
+    Cmd_RemoveCommand("notepad");
+    Cmd_RemoveCommand("editscript");
+    Cmd_RemoveCommand("editshader");
+    Cmd_RemoveCommand("inv_restart");
+    Cmd_RemoveCommand("ui_showmouse");
+    Cmd_RemoveCommand("ui_hidemouse");
+    Cmd_RemoveCommand("ui_saveconsolepos");
+    Cmd_RemoveCommand("ui_loadconsolepos");
+    Cmd_RemoveCommand("ui_testlist");
+    Cmd_RemoveCommand("clear");
+    Cmd_RemoveCommand("ui_hud");
+    Cmd_RemoveCommand("ui_resetcvars");
+    Cmd_RemoveCommand("ui_checkrestart");
+    Cmd_RemoveCommand("ui_addhud");
+    Cmd_RemoveCommand("ui_removehud");
+    Cmd_RemoveCommand("centerprint");
+    Cmd_RemoveCommand("locationprint");
+    Cmd_RemoveCommand("startserver");
+    Cmd_RemoveCommand("finishloadingscreen");
+    Cmd_RemoveCommand("playermodel");
+    Cmd_RemoveCommand("ui_applyplayermodel");
+    Cmd_RemoveCommand("ui_getplayermodel");
+    Cmd_RemoveCommand("devcon");
+    Cmd_RemoveCommand("+statistics");
+    Cmd_RemoveCommand("-statistics");
 
-	for( int i = 0; i < hudList.NumObjects(); i++ ) {
-		hudList.RemoveObjectAt( i );
-	}
+    for (int i = 0; i < hudList.NumObjects(); i++) {
+        hudList.RemoveObjectAt(i);
+    }
 
-	crosshairhud = menuManager.FindMenu( "crosshair" );
-	hud_weapons = menuManager.FindMenu( "hud_weapons" );
-	hud_items = menuManager.FindMenu( "hud_items" );
-	hud_health = menuManager.FindMenu( "hud_health" );
-	hud_compass = menuManager.FindMenu( "hud_compass" );
-	hud_boss = menuManager.FindMenu( "hud_boss" );
-	ui_pConnectingMenu = menuManager.FindMenu( "connecting" );
+    // Removed in 2.0
+    //  Crosshair is now handled by the cgame module
+    //crosshairhud       = menuManager.FindMenu("crosshair");
+    hud_weapons        = menuManager.FindMenu("hud_weapons");
+    hud_items          = menuManager.FindMenu("hud_items");
+    hud_health         = menuManager.FindMenu("hud_health");
+    hud_compass        = menuManager.FindMenu("hud_compass");
+    hud_boss           = menuManager.FindMenu("hud_boss");
+    ui_pConnectingMenu = menuManager.FindMenu("connecting");
 
-	// delete base hud
-	if( view3d )
-	{
-		delete view3d;
-		view3d = NULL;
-	}
-	if( fakk_console )
-	{
-		delete fakk_console;
-		fakk_console = NULL;
-	}
-	if( dm_console )
-	{
-		delete dm_console;
-		dm_console = NULL;
-	}
-	if( developer_console )
-	{
-		delete developer_console;
-		developer_console = NULL;
-	}
-	if( mini_console )
-	{
-		delete mini_console;
-		mini_console = NULL;
-	}
+    // delete base hud
+    if (view3d) {
+        delete view3d;
+        view3d = NULL;
+    }
+    if (fakk_console) {
+        delete fakk_console;
+        fakk_console = NULL;
+    }
+    if (dm_console) {
+        delete dm_console;
+        dm_console = NULL;
+    }
+    if (developer_console) {
+        delete developer_console;
+        developer_console = NULL;
+    }
+    if (mini_console) {
+        delete mini_console;
+        mini_console = NULL;
+    }
 
-	// delete game hud
-	if( crosshairhud ) {
-		crosshairhud = NULL;
-	}
-	if( hud_weapons ) {
-		hud_weapons = NULL;
-	}
-	if( hud_items ) {
-		hud_items = NULL;
-	}
-	if( hud_health ) {
-		hud_health = NULL;
-	}
-	if( hud_ammo ) {
-		hud_ammo = NULL;
-	}
-	if( hud_compass ) {
-		hud_compass = NULL;
-	}
-	if( hud_boss ) {
-		hud_boss = NULL;
-	}
+    // delete game hud
+    if (crosshairhud) {
+        crosshairhud = NULL;
+    }
+    if (hud_weapons) {
+        hud_weapons = NULL;
+    }
+    if (hud_items) {
+        hud_items = NULL;
+    }
+    if (hud_health) {
+        hud_health = NULL;
+    }
+    if (hud_ammo) {
+        hud_ammo = NULL;
+    }
+    if (hud_compass) {
+        hud_compass = NULL;
+    }
+    if (hud_boss) {
+        hud_boss = NULL;
+    }
 
-	// delete informations hud
-	if( scoreboardlist )
-	{
-		delete scoreboardlist;
-		scoreboardlist = NULL;
-	}
-	if( gmbox )
-	{
-		delete gmbox;
-		gmbox = NULL;
-	}
-	if( dmbox )
-	{
-		delete dmbox;
-		dmbox = NULL;
-	}
+    // delete informations hud
+    if (scoreboardlist) {
+        delete scoreboardlist;
+        scoreboardlist = NULL;
+    }
+    if (gmbox) {
+        delete gmbox;
+        gmbox = NULL;
+    }
+    if (dmbox) {
+        delete dmbox;
+        dmbox = NULL;
+    }
 
-	// clear inventory
-	client_inv.Clear();
+    // clear inventory
+    client_inv.Clear();
 
-	// shutdown the UI
-	uie.Shutdown();
+    // shutdown the UI
+    uie.Shutdown();
 
-	// delete all menus
-	menuManager.DeleteAllMenus();
+    // delete all menus
+    menuManager.DeleteAllMenus();
 
-	cls.uiStarted = false;
+    cls.uiStarted = false;
 }
 
 /*
@@ -5203,266 +5224,271 @@ void CL_ShutdownUI( void ) {
 CL_InitUI
 ====================
 */
-#define UI_OLD_API_VERSION	4
+#define UI_OLD_API_VERSION 4
 
-void CL_InitializeUI( void ) {
-	int nfiles;
-	char **filenames;
-	int i;
+void CL_InitializeUI(void)
+{
+    int    nfiles;
+    char **filenames;
+    int    i;
 
-	// Register all variables
-	ui_minicon = Cvar_Get( "ui_minicon", "0", 1 );
-	ui_gmbox = Cvar_Get( "ui_gmbox", "1", 1 );
-	ui_consoleposition = Cvar_Get( "ui_consoleposition", "", 1 );
-	ui_console = Cvar_Get("ui_console", "0", 1);
-	ui_crosshair = Cvar_Get("ui_crosshair", "1", 1);
-	ui_weaponsbar = Cvar_Get("ui_weaponsbar", "1", 1);
-	ui_weaponsbartime = Cvar_Get("ui_weaponsbartime", "2500", 1);
-	ui_itemsbar = Cvar_Get("ui_itemsbar", "0", 1);
-	sound_overlay = Cvar_Get("soundoverlay", "0", 0);
-	ui_debugload = Cvar_Get("ui_debugload", "0", 0);
-	Cvar_Get("ui_signshader", "", 0);
-	ui_compass = Cvar_Get("ui_compass", "1", 0);
-	ui_newvidmode = Cvar_Get("ui_newvidmode", "-1", 0);
-	ui_inventoryfile = Cvar_Get("ui_inventoryfile", "global/inventory.txt", 0);
-	ui_drawcoords = Cvar_Get("ui_drawcoords", "0", 0);
-	ui_health_start = Cvar_Get("ui_health_start", "0", 0);
-	ui_health_end = Cvar_Get("ui_health_end", "0", 0);
-	ui_GunneryEvaluation = Cvar_Get("ui_GunneryEvaluation", "0", 0);
-	ui_GroinShots = Cvar_Get("ui_GroinShots", "0", 0);
-	ui_RightArmShots = Cvar_Get("ui_RightArmShots", "0", 0);
-	ui_LeftArmShots = Cvar_Get("ui_LeftArmShots", "0", 0);
-	ui_RightLegShots = Cvar_Get("ui_RightLegShots", "0", 0);
-	ui_LeftLegShots = Cvar_Get("ui_LeftLegShots", "0", 0);
-	ui_TorsoShots = Cvar_Get("ui_TorsoShots", "0", 0);
-	ui_HeadShots = Cvar_Get("ui_HeadShots", "0", 0);
-	ui_NumEnemysKilled = Cvar_Get("ui_NumEnemysKilled", "0", 0);
-	ui_NumObjectsDestroyed = Cvar_Get("ui_NumObjectsDestroyed", "0", 0);
-	ui_NumHitsTaken = Cvar_Get("ui_NumHitsTaken", "0", 0);
-	ui_PreferredWeapon = Cvar_Get("ui_PreferredWeapon", "none", 0);
-	ui_Accuracy = Cvar_Get("ui_Accuracy", "0", 0);
-	ui_NumObjectives = Cvar_Get("ui_NumObjectives", "0", 0);
-	ui_NumComplete = Cvar_Get("ui_NumComplete", "0", 0);
-	ui_NumHits = Cvar_Get("ui_NumHits", "0", 0);
-	ui_NumShotsFired = Cvar_Get("ui_NumShotsFired", "0", 0);
-	ui_gmboxspam = Cvar_Get("ui_gmboxspam", "1", 0);
-	ui_gotmedal = Cvar_Get("ui_gotmedal", "0", 0);
-	ui_success = Cvar_Get("ui_success", "0", 0);
-	ui_failed = Cvar_Get("ui_failed", "0", 0);
-	ui_returnmenu = Cvar_Get("ui_returnmenu", "0", 0);
-	ui_skip_eamovie = Cvar_Get("ui_skip_eamovie", "0", 0);
-	ui_skip_titlescreen = Cvar_Get("ui_skip_titlescreen", "1", 0);
-	ui_skip_legalscreen = Cvar_Get("ui_skip_legalscreen", "1", 0);
-	ui_titlescreen_fadein = Cvar_Get("ui_titlescreen_fadein", "1", 0);
-	ui_titlescreen_fadeout = Cvar_Get( "ui_titlescreen_fadeout", "1", 0 );
-	ui_titlescreen_stay = Cvar_Get( "ui_titlescreen_stay", "3", 0 );
-	ui_legalscreen_fadein = Cvar_Get( "ui_legalscreen_fadein", "1", 0 );
-	ui_legalscreen_fadeout = Cvar_Get( "ui_legalscreen_fadeout", "1", 0 );
-	ui_legalscreen_stay = Cvar_Get( "ui_legalscreen_stay", "3", 0 );
-	cl_greenfps = Cvar_Get( "cl_greenfps", "0", 1 );
-	cl_playintro = Cvar_Get( "cl_playintro", "1", 0 );
-	cl_movieaudio = Cvar_Get( "cl_movieaudio", "1", 0 );
-	Cvar_Get( "ui_startmap", "", 1 );
-	Cvar_Get( "dlg_badsave", "This save game is invalid", 0 );
+    // Register all variables
+    ui_minicon         = Cvar_Get("ui_minicon", "0", 1);
+    ui_gmbox           = Cvar_Get("ui_gmbox", "1", 1);
+    ui_consoleposition = Cvar_Get("ui_consoleposition", "", 1);
+    ui_console         = Cvar_Get("ui_console", "0", 1);
+    ui_crosshair       = Cvar_Get("ui_crosshair", "1", 1);
+    ui_weaponsbar      = Cvar_Get("ui_weaponsbar", "1", 1);
+    ui_weaponsbartime  = Cvar_Get("ui_weaponsbartime", "2500", 1);
+    ui_itemsbar        = Cvar_Get("ui_itemsbar", "0", 1);
+    sound_overlay      = Cvar_Get("soundoverlay", "0", 0);
+    ui_debugload       = Cvar_Get("ui_debugload", "0", 0);
+    Cvar_Get("ui_signshader", "", 0);
+    ui_compass             = Cvar_Get("ui_compass", "1", 0);
+    ui_newvidmode          = Cvar_Get("ui_newvidmode", "-1", 0);
+    ui_inventoryfile       = Cvar_Get("ui_inventoryfile", "global/inventory.txt", 0);
+    ui_drawcoords          = Cvar_Get("ui_drawcoords", "0", 0);
+    ui_health_start        = Cvar_Get("ui_health_start", "0", 0);
+    ui_health_end          = Cvar_Get("ui_health_end", "0", 0);
+    ui_GunneryEvaluation   = Cvar_Get("ui_GunneryEvaluation", "0", 0);
+    ui_GroinShots          = Cvar_Get("ui_GroinShots", "0", 0);
+    ui_RightArmShots       = Cvar_Get("ui_RightArmShots", "0", 0);
+    ui_LeftArmShots        = Cvar_Get("ui_LeftArmShots", "0", 0);
+    ui_RightLegShots       = Cvar_Get("ui_RightLegShots", "0", 0);
+    ui_LeftLegShots        = Cvar_Get("ui_LeftLegShots", "0", 0);
+    ui_TorsoShots          = Cvar_Get("ui_TorsoShots", "0", 0);
+    ui_HeadShots           = Cvar_Get("ui_HeadShots", "0", 0);
+    ui_NumEnemysKilled     = Cvar_Get("ui_NumEnemysKilled", "0", 0);
+    ui_NumObjectsDestroyed = Cvar_Get("ui_NumObjectsDestroyed", "0", 0);
+    ui_NumHitsTaken        = Cvar_Get("ui_NumHitsTaken", "0", 0);
+    ui_PreferredWeapon     = Cvar_Get("ui_PreferredWeapon", "none", 0);
+    ui_Accuracy            = Cvar_Get("ui_Accuracy", "0", 0);
+    ui_NumObjectives       = Cvar_Get("ui_NumObjectives", "0", 0);
+    ui_NumComplete         = Cvar_Get("ui_NumComplete", "0", 0);
+    ui_NumHits             = Cvar_Get("ui_NumHits", "0", 0);
+    ui_NumShotsFired       = Cvar_Get("ui_NumShotsFired", "0", 0);
+    ui_gmboxspam           = Cvar_Get("ui_gmboxspam", "1", 0);
+    ui_gotmedal            = Cvar_Get("ui_gotmedal", "0", 0);
+    ui_success             = Cvar_Get("ui_success", "0", 0);
+    ui_failed              = Cvar_Get("ui_failed", "0", 0);
+    ui_returnmenu          = Cvar_Get("ui_returnmenu", "0", 0);
+    ui_skip_eamovie        = Cvar_Get("ui_skip_eamovie", "1", 0);
+    ui_skip_titlescreen    = Cvar_Get("ui_skip_titlescreen", "1", 0);
+    ui_skip_legalscreen    = Cvar_Get("ui_skip_legalscreen", "1", 0);
+    ui_titlescreen_fadein  = Cvar_Get("ui_titlescreen_fadein", "1", 0);
+    ui_titlescreen_fadeout = Cvar_Get("ui_titlescreen_fadeout", "1", 0);
+    ui_titlescreen_stay    = Cvar_Get("ui_titlescreen_stay", "3", 0);
+    ui_legalscreen_fadein  = Cvar_Get("ui_legalscreen_fadein", "1", 0);
+    ui_legalscreen_fadeout = Cvar_Get("ui_legalscreen_fadeout", "1", 0);
+    ui_legalscreen_stay    = Cvar_Get("ui_legalscreen_stay", "3", 0);
+    cl_greenfps            = Cvar_Get("cl_greenfps", "0", 1);
+    cl_playintro           = Cvar_Get("cl_playintro", "1", 0);
+    cl_movieaudio          = Cvar_Get("cl_movieaudio", "1", 0);
+    Cvar_Get("ui_startmap", "", 1);
+    Cvar_Get("dlg_badsave", "This save game is invalid", 0);
 
-	Cvar_Set( "cg_hud", ui_hud ? "1" : "0" );
+    Cvar_Set("cg_hud", ui_hud ? "1" : "0");
 
-	CL_FillUIDef();
-	CL_FillUIImports();
-	UI_InitExports();
-	uie.Init();
+    CL_FillUIDef();
+    CL_FillUIImports();
+    UI_InitExports();
+    uie.Init();
 
-	UI_LoadInventory_f();
-	UI_CreateScoreboard();
+    UI_LoadInventory_f();
+    UI_CreateScoreboard();
 
-	// New since mohta
-	// Version number
-	Cvar_Set("game_version", va("v%s", com_target_version->string));
+    // New since mohta
+    // Version number
+    Cvar_Set("game_version", va("v%s", com_target_version->string));
 
-	// Add all commands
-	Cmd_AddCommand( "pushmenu", UI_PushMenu_f );
-	Cmd_AddCommand( "pushmenu_sp", UI_PushMenuSP_f );
-	Cmd_AddCommand( "pushmenu_dm", UI_PushMenuMP_f );
-	Cmd_AddCommand( "forcemenu", UI_ForceMenu_f );
-	Cmd_AddCommand( "popmenu", UI_PopMenu_f );
-	Cmd_AddCommand( "showmenu", UI_ShowMenu_f );
-	Cmd_AddCommand( "hidemenu", UI_HideMenu_f );
-	Cmd_AddCommand( "widgetcommand", UI_WidgetCommand_f );
-	Cmd_AddCommand( "globalwidgetcommand", UI_GlobalWidgetCommand_f );
-	Cmd_AddCommand( "listmenus", UI_ListMenus_f );
-	Cmd_AddCommand( "togglemenu", UI_ToggleMenu_f );
-	Cmd_AddCommand( "loadmenu", UI_LoadMenu_f );
-	Cmd_AddCommand( "maplist", UI_MapList_f );
-	Cmd_AddCommand( "dmmapselect", UI_DMMapSelect_f );
-	Cmd_AddCommand( "ui_startdmmap", UI_StartDMMap_f );
-	Cmd_AddCommand( "viewspawnlist", UI_ViewSpawnList_f );
-	Cmd_AddCommand( "lod_spawnlist", UI_LODSpawnList_f );
-	Cmd_AddCommand( "soundpicker", UI_SoundPicker_f );
-	Cmd_AddCommand( "notepad", UI_Notepad_f );
-	Cmd_AddCommand( "editscript", UI_EditScript_f );
-	Cmd_AddCommand( "editshader", UI_EditShader_f );
-	Cmd_AddCommand( "editspecificshader", UI_EditSpecificShader_f );
-	Cmd_AddCommand( "inv_restart", UI_LoadInventory_f );
-	Cmd_AddCommand( "ui_showmouse", UI_ShowMouse_f );
-	Cmd_AddCommand( "ui_hidemouse", UI_HideMouse_f );
-	Cmd_AddCommand( "ui_saveconsolepos", SaveConsoleRectangle );
-	Cmd_AddCommand( "ui_loadconsolepos", LoadConsoleRectangle );
-	Cmd_AddCommand( "ui_testlist", UI_TestListCtrl_f );
-	Cmd_AddCommand( "clear", UI_ClearConsole_f );
-	Cmd_AddCommand( "ui_hud", UI_Hud_f );
-	Cmd_AddCommand( "ui_resetcvars", UI_ResetCvars );
-	Cmd_AddCommand( "ui_checkrestart", UI_CheckRestart );
-	Cmd_AddCommand( "centerprint", UI_CenterPrint_f );
-	Cmd_AddCommand( "locationprint", UI_LocationPrint_f );
-	Cmd_AddCommand( "ui_addhud", UI_AddHud_f );
-	Cmd_AddCommand( "ui_removehud", UI_RemoveHud_f );
-	Cmd_AddCommand( "startserver", UI_StartServer_f );
-	Cmd_AddCommand( "finishloadingscreen", UI_FinishLoadingScreen_f );
-	Cmd_AddCommand( "playermodel", UI_PlayerModel_f );
-	Cmd_AddCommand( "ui_applyplayermodel", UI_ApplyPlayerModel_f );
-	Cmd_AddCommand( "ui_getplayermodel", UI_GetPlayerModel_f );
-	Cmd_AddCommand( "+statistics", UI_ShowStatistics_f );
-	Cmd_AddCommand( "-statistics", UI_HideStatistics_f );
-	Cmd_AddCommand( "setreturnmenu", UI_SetReturnMenuToCurrent );
-	Cmd_AddCommand( "gotoreturnmenu", UI_PushReturnMenu_f );
+    // Add all commands
+    Cmd_AddCommand("pushmenu", UI_PushMenu_f);
+    Cmd_AddCommand("pushmenu_sp", UI_PushMenuSP_f);
+    Cmd_AddCommand("pushmenu_dm", UI_PushMenuMP_f);
+    Cmd_AddCommand("forcemenu", UI_ForceMenu_f);
+    Cmd_AddCommand("popmenu", UI_PopMenu_f);
+    Cmd_AddCommand("showmenu", UI_ShowMenu_f);
+    Cmd_AddCommand("hidemenu", UI_HideMenu_f);
+    Cmd_AddCommand("widgetcommand", UI_WidgetCommand_f);
+    Cmd_AddCommand("globalwidgetcommand", UI_GlobalWidgetCommand_f);
+    Cmd_AddCommand("listmenus", UI_ListMenus_f);
+    Cmd_AddCommand("togglemenu", UI_ToggleMenu_f);
+    Cmd_AddCommand("loadmenu", UI_LoadMenu_f);
+    Cmd_AddCommand("maplist", UI_MapList_f);
+    Cmd_AddCommand("dmmapselect", UI_DMMapSelect_f);
+    Cmd_AddCommand("ui_startdmmap", UI_StartDMMap_f);
+    Cmd_AddCommand("viewspawnlist", UI_ViewSpawnList_f);
+    Cmd_AddCommand("lod_spawnlist", UI_LODSpawnList_f);
+    Cmd_AddCommand("soundpicker", UI_SoundPicker_f);
+    Cmd_AddCommand("notepad", UI_Notepad_f);
+    Cmd_AddCommand("editscript", UI_EditScript_f);
+    Cmd_AddCommand("editshader", UI_EditShader_f);
+    Cmd_AddCommand("editspecificshader", UI_EditSpecificShader_f);
+    Cmd_AddCommand("inv_restart", UI_LoadInventory_f);
+    Cmd_AddCommand("ui_showmouse", UI_ShowMouse_f);
+    Cmd_AddCommand("ui_hidemouse", UI_HideMouse_f);
+    Cmd_AddCommand("ui_saveconsolepos", SaveConsoleRectangle);
+    Cmd_AddCommand("ui_loadconsolepos", LoadConsoleRectangle);
+    Cmd_AddCommand("ui_testlist", UI_TestListCtrl_f);
+    Cmd_AddCommand("clear", UI_ClearConsole_f);
+    Cmd_AddCommand("ui_hud", UI_Hud_f);
+    Cmd_AddCommand("ui_resetcvars", UI_ResetCvars);
+    Cmd_AddCommand("ui_checkrestart", UI_CheckRestart);
+    Cmd_AddCommand("centerprint", UI_CenterPrint_f);
+    Cmd_AddCommand("locationprint", UI_LocationPrint_f);
+    Cmd_AddCommand("ui_addhud", UI_AddHud_f);
+    Cmd_AddCommand("ui_removehud", UI_RemoveHud_f);
+    Cmd_AddCommand("startserver", UI_StartServer_f);
+    Cmd_AddCommand("finishloadingscreen", UI_FinishLoadingScreen_f);
+    Cmd_AddCommand("playermodel", UI_PlayerModel_f);
+    Cmd_AddCommand("ui_applyplayermodel", UI_ApplyPlayerModel_f);
+    Cmd_AddCommand("ui_getplayermodel", UI_GetPlayerModel_f);
+    Cmd_AddCommand("+statistics", UI_ShowStatistics_f);
+    Cmd_AddCommand("-statistics", UI_HideStatistics_f);
+    Cmd_AddCommand("setreturnmenu", UI_SetReturnMenuToCurrent);
+    Cmd_AddCommand("gotoreturnmenu", UI_PushReturnMenu_f);
+    Cmd_AddCommand("salesscreen", UI_SalesScreen_f);
+    Cmd_AddCommand("launchgamespy", UI_LaunchGameSpy_f);
 
-	if( developer->integer )
-	{
-		UColor bgColor;
+    if (developer->integer) {
+        UColor bgColor;
 
-		Cmd_AddCommand( "devcon", UI_ToggleDeveloperConsole_f );
+        Cmd_AddCommand("devcon", UI_ToggleDeveloperConsole_f);
 
-		developer_console = new UIFloatingConsole;
+        developer_console = new UIFloatingConsole;
 
-		bgColor = UWindowColor;
+        bgColor = UWindowColor;
 
-		developer_console->Create( NULL, getDefaultConsoleRectangle(), "Developer Console", bgColor, UHudColor );
-		developer_console->setConsoleHandler( ConsoleCommandHandler );
-		developer_console->setConsoleBackground( UBlack, 0.800000011920929 );
-		developer_console->setShow( false );
-		developer_console->Connect( &s_consolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed );
-		developer_console->Connect( &s_consolehider, W_Destroyed, W_Destroyed );
-	}
+        developer_console->Create(NULL, getDefaultConsoleRectangle(), "Developer Console", bgColor, UHudColor);
+        developer_console->setConsoleHandler(ConsoleCommandHandler);
+        developer_console->setConsoleBackground(UBlack, 0.800000011920929);
+        developer_console->setShow(false);
+        developer_console->Connect(&s_consolehider, UIFloatingWindow::W_ClosePressed, UIFloatingWindow::W_ClosePressed);
+        developer_console->Connect(&s_consolehider, W_Destroyed, W_Destroyed);
+    }
 
-	// Create the 3D view
-	view3d = new View3D;
-	view3d->setAlwaysOnBottom( true );
-	view3d->InitFrame( NULL, 0, 0, cls.glconfig.vidWidth, cls.glconfig.vidHeight, -1, "facfont-20" );
-	view3d->setName( "view3d" );
-	view3d->InitSubtitle();
+    // Create the 3D view
+    view3d = new View3D;
+    view3d->setAlwaysOnBottom(true);
+    view3d->InitFrame(NULL, 0, 0, uid.vidWidth, uid.vidHeight, -1, "facfont-20");
+    view3d->setName("view3d");
+    view3d->InitSubtitle();
 
-	memset( &intro_stage, 0, sizeof( intro_stage ) );
+    memset(&intro_stage, 0, sizeof(intro_stage));
 
-	// Register the loading material
-	ui_static_materials.loading = uWinMan.RegisterShader( "textures/menu/loading" );
+    // Register the loading material
+    ui_static_materials.loading = uWinMan.RegisterShader("textures/menu/loading");
 
-	if( ui_console->integer || developer->integer > 0 )
-	{
-		UColor bgColor = UWindowColor;
+    if (ui_console->integer || developer->integer > 0) {
+        UColor bgColor = UWindowColor;
 
-		// Create the console
-		fakk_console = getNewConsole();
+        // Create the console
+        fakk_console = getNewConsole();
 
-		bgColor = UColor( 0.0, 0.5, 1.0, 1.0 );
+        bgColor = UColor(0.0, 0.5, 1.0, 1.0);
 
-		// Create the mini console
-		mini_console = new FakkMiniconsole;
-		mini_console->Create( UISize2D( 500, 100 ), UWhite, bgColor, 0.2f );
-		mini_console->setAlwaysOnBottom( true );
-		mini_console->setBorderStyle( border_none );
-	}
+        // Create the mini console
+        mini_console = new FakkMiniconsole;
+        mini_console->Create(UISize2D(500, 100), UWhite, bgColor, 0.2f);
+        mini_console->setAlwaysOnBottom(true);
+        mini_console->setBorderStyle(border_none);
+    }
 
-	// Create the dm console
-	if( !dm_console ) {
-		dm_console = getNewDMConsole();
-	}
+    // Create the dm console
+    if (!dm_console) {
+        dm_console = getNewDMConsole();
+    }
 
-	// Create the game message box
-	if( ui_gmbox->integer && !gmbox )
-	{
-		gmbox = new UIGMBox;
-		gmbox->Create( getDefaultGMBoxRectangle(), UHudColor, UHudColor, 0.0 );
-		gmbox->setAlwaysOnBottom( true );
-		gmbox->setBorderStyle( border_none );
-	}
+    // Create the game message box
+    if (ui_gmbox->integer && !gmbox) {
+        gmbox = new UIGMBox;
+        gmbox->Create(getDefaultGMBoxRectangle(), UHudColor, UHudColor, 0.0);
+        gmbox->setAlwaysOnBottom(true);
+        gmbox->setBorderStyle(border_none);
+    }
 
-	// Create the deathmatch message box
-	if( !dmbox )
-	{
-		dmbox = new UIDMBox;
-		dmbox->Create( getDefaultDMBoxRectangle(), UHudColor, UHudColor, 0.0 );
-		dmbox->setAlwaysOnBottom( true );
-		dmbox->setBorderStyle( border_outline );
-	}
+    // Create the deathmatch message box
+    if (!dmbox) {
+        dmbox = new UIDMBox;
+        dmbox->Create(getDefaultDMBoxRectangle(), UHudColor, UHudColor, 0.0);
+        dmbox->setAlwaysOnBottom(true);
+        dmbox->setBorderStyle(border_outline);
+    }
 
-	// Load all urc files
-	filenames = FS_ListFiles( "ui/", "urc", qfalse, &nfiles );
+    // Load all urc files
+    filenames = FS_ListFiles("ui/", "urc", qfalse, &nfiles);
 
-	for( i = 0; i < nfiles; i++ )
-	{
-		char szFilename[ MAX_QPATH ];
+    for (i = 0; i < nfiles; i++) {
+        char szFilename[MAX_QPATH];
 
-		Com_sprintf( szFilename, sizeof( szFilename ), "ui/%s", filenames[ i ] );
-		new UILayout( szFilename );
-	}
+        Com_sprintf(szFilename, sizeof(szFilename), "ui/%s", filenames[i]);
+        new UILayout(szFilename);
+    }
 
-	FS_FreeFileList( filenames );
+    FS_FreeFileList(filenames);
 
-	uWinMan.CreateMenus();
+    uWinMan.CreateMenus();
 
-	// find the crosshair
-	crosshairhud		= menuManager.FindMenu( "crosshair" );
-	// find weapons hud
-	hud_weapons			= menuManager.FindMenu( "hud_weapons" );
-	// find items hud
-	hud_items			= menuManager.FindMenu( "hud_items" );
-	// find the health hud
-	hud_health			= menuManager.FindMenu( "hud_health" );
-	// find the compass hud
-	hud_compass			= menuManager.FindMenu( "hud_compass" );
-	// find the boss health hud
-	hud_boss			= menuManager.FindMenu( "hud_boss" );
-	// find the stats screen
-	missionLog			= menuManager.FindMenu( "StatsScreen" );
-	// find the connection menu
-	ui_pConnectingMenu	= menuManager.FindMenu( "connecting" );
+    // find the crosshair
+    // Removed in 2.0
+    //  Crosshair is now handled by the cgame module
+    //crosshairhud = menuManager.FindMenu("crosshair");
+    // find weapons hud
+    hud_weapons = menuManager.FindMenu("hud_weapons");
+    // find items hud
+    hud_items = menuManager.FindMenu("hud_items");
+    // find the health hud
+    hud_health = menuManager.FindMenu("hud_health");
+    // find the compass hud
+    hud_compass = menuManager.FindMenu("hud_compass");
+    // find the boss health hud
+    hud_boss = menuManager.FindMenu("hud_boss");
+    // find the stats screen
+    missionLog = menuManager.FindMenu("StatsScreen");
+    // find the connection menu
+    ui_pConnectingMenu = menuManager.FindMenu("connecting");
 
-	if( crosshairhud ) {
-		crosshairhud->ShowMenu( NULL );
-	}
-	if( hud_health ) {
-		hud_health->ShowMenu( NULL );
-	}
-	if( hud_compass ) {
-		hud_compass->ShowMenu( NULL );
-	}
+    if (crosshairhud) {
+        crosshairhud->ShowMenu(NULL);
+    }
+    if (hud_health) {
+        hud_health->ShowMenu(NULL);
+    }
+    if (hud_compass) {
+        hud_compass->ShowMenu(NULL);
+    }
 
-	// find the main menu
-	mainmenu = menuManager.FindMenu( "main" );
+    // find the main menu
+    mainmenu = menuManager.FindMenu("main");
 
-	IN_MouseOn();
+    IN_MouseOn();
 
-	// realign menus
-	menuManager.RealignMenus();
+    // realign menus
+    menuManager.RealignMenus();
 
-	// clear input
-	CL_ClearButtons();
+    // clear input
+    CL_ClearButtons();
 
-	cls.uiStarted = qtrue;
+    cls.uiStarted = qtrue;
+
+    if (!com_dedicated->integer) {
+        CL_TryStartIntro();
+    }
 }
 
-static char **loadStrings;
+static char        **loadStrings;
 static unsigned int *loadTimes;
-static char *loadStringsBuffer;
+static char         *loadStringsBuffer;
 
-class LoadResourceInfo {
+class LoadResourceInfo
+{
 public:
-	class LoadResourceInfo *next;
-	unsigned int loadCount;
-	char name[ 1 ];
+    class LoadResourceInfo *next;
+    unsigned int            loadCount;
+    char                    name[1];
 
 public:
-	LoadResourceInfo();
+    LoadResourceInfo();
 };
 
 static LoadResourceInfo *loadHead;
@@ -5472,11 +5498,12 @@ static LoadResourceInfo *loadHead;
 UI_BeginLoadResource
 ====================
 */
-void UI_BeginLoadResource( void ) {
-	clock_t time = clock();
+void UI_BeginLoadResource(void)
+{
+    clock_t time = clock();
 
-	startCountHigh = time >> 32;
-	startCountLow = time;
+    startCountHigh = time >> 32;
+    startCountLow  = time;
 }
 
 /*
@@ -5484,7 +5511,15 @@ void UI_BeginLoadResource( void ) {
 UI_EndLoadResource
 ====================
 */
-void UI_EndLoadResource( void ) {
+void UI_EndLoadResource(void)
+{
+    clock_t time;
+
+    time = clock() - (((clock_t)startCountHigh << 32) | startCountLow) + (((clock_t)loadCountHigh << 32) | loadCountLow);
+
+    loadCountHigh = time >> 32;
+    loadCountLow  = time;
+    loadCount     = time >> 25;
 }
 
 /*
@@ -5492,22 +5527,23 @@ void UI_EndLoadResource( void ) {
 UI_EndLoadResource
 ====================
 */
-void UI_EndLoadResource( const char *name ) {
-	LoadResourceInfo *newLoadHead;
+void UI_EndLoadResource(const char *name)
+{
+    LoadResourceInfo *newLoadHead;
 
-	if( !loadCount ) {
-		return;
-	}
+    if (!loadCount) {
+        return;
+    }
 
-	newLoadHead = ( LoadResourceInfo * )Z_Malloc( sizeof( LoadResourceInfo ) + strlen( name ) );
-	newLoadHead->next = loadHead;
-	newLoadHead->loadCount = loadCount;
-	strcpy( newLoadHead->name, name );
-	loadHead = newLoadHead;
+    newLoadHead            = (LoadResourceInfo *)Z_Malloc(sizeof(LoadResourceInfo) + strlen(name));
+    newLoadHead->next      = loadHead;
+    newLoadHead->loadCount = loadCount;
+    strcpy(newLoadHead->name, name);
+    loadHead = newLoadHead;
 
-	loadNumber++;
-	loadCountLow = 0;
-	loadCountHigh = 0;
+    loadNumber++;
+    loadCountLow  = 0;
+    loadCountHigh = 0;
 }
 
 /*
@@ -5515,25 +5551,25 @@ void UI_EndLoadResource( const char *name ) {
 UI_IsResourceLoaded
 ====================
 */
-qboolean UI_IsResourceLoaded( const char *name ) {
-	switch( *name )
-	{
-	case 97:
-	case 98:
-	case 99:
-	case 100:
-	case 101:
-	case 104:
-		return TIKI_FindTikiAnim( name + 1 ) != NULL;
-	case 103:
-		return SkeletorCacheFindFilename( name + 1, NULL );
-	case 107:
-		return S_IsSoundRegistered( name + 1 );
-	case 110:
-		return R_ImageExists( name + 1 );
-	default:
-		return qfalse;
-	}
+qboolean UI_IsResourceLoaded(const char *name)
+{
+    switch (*name) {
+    case 97:
+    case 98:
+    case 99:
+    case 100:
+    case 101:
+    case 104:
+        return TIKI_FindTikiAnim(name + 1) != NULL;
+    case 103:
+        return SkeletorCacheFindFilename(name + 1, NULL);
+    case 107:
+        return S_IsSoundRegistered(name + 1);
+    case 110:
+        return uii.Rend_ImageExists(name + 1);
+    default:
+        return qfalse;
+    }
 }
 
 /*
@@ -5541,34 +5577,28 @@ qboolean UI_IsResourceLoaded( const char *name ) {
 UI_RegisterLoadResource
 ====================
 */
-void UI_RegisterLoadResource( const char *name ) {
-	int i, j;
-	int low, high;
+void UI_RegisterLoadResource(const char *name)
+{
+    int i, j;
+    int low, high;
 
-	low = 0;
-	high = loadNumber - 1;
+    low  = 0;
+    high = loadNumber - 1;
 
-	while( low <= high )
-	{
-		i = ( high + low ) / 2;
-		j = strcmp( name, loadStrings[ i ] );
+    while (low <= high) {
+        i = (low + high) / 2;
+        j = strcmp(name, loadStrings[i]);
 
-		if( j >= 0 )
-		{
-			if( j <= 0 )
-			{
-				currentLoadTime += loadTimes[ i ];
-				loadTimes[ i ] = 0;
-				return;
-			}
-
-			low = i + 1;
-		}
-		else
-		{
-			high = i - 1;
-		}
-	}
+        if (j < 0) {
+            high = i - 1;
+        } else if (j > 0) {
+            low = i + 1;
+        } else {
+            currentLoadTime += loadTimes[i];
+            loadTimes[i] = 0;
+            break;
+        }
+    }
 }
 
 /*
@@ -5576,15 +5606,22 @@ void UI_RegisterLoadResource( const char *name ) {
 UI_TestUpdateScreen
 ====================
 */
-void UI_TestUpdateScreen( unsigned int timeout ) {
-	unsigned int newTime = Sys_Milliseconds();
+void UI_TestUpdateScreen(unsigned int timeout)
+{
+    unsigned int newTime = Sys_Milliseconds();
+    unsigned int startRenderTime, endRenderTime;
 
-	if( newTime - lastTime >= timeout )
-	{
-		lastTime = newTime;
-		Sys_PumpMessageLoop();
-		SCR_UpdateScreen();
-	}
+    if (timeout > 0 && (newTime - lastTime) < (timeout + updateTime)) {
+        return;
+    }
+
+    startRenderTime = Sys_Milliseconds();
+    Sys_PumpMessageLoop();
+    SCR_UpdateScreen();
+    endRenderTime = Sys_Milliseconds();
+
+    updateTime = Q_min(endRenderTime - startRenderTime, 1000);
+    lastTime   = endRenderTime;
 }
 
 /*
@@ -5592,13 +5629,14 @@ void UI_TestUpdateScreen( unsigned int timeout ) {
 UI_ClearResource
 ====================
 */
-void UI_ClearResource( void ) {
-	if( cls.loading == SS_DEAD || cls.loading != SS_GAME ) {
-		return;
-	}
+void UI_ClearResource(void)
+{
+    if (cls.loading == SS_DEAD || cls.loading != SS_GAME) {
+        return;
+    }
 
-	UI_BeginLoadResource();
-	UI_TestUpdateScreen( 0 );
+    UI_BeginLoadResource();
+    UI_TestUpdateScreen(0);
 }
 
 /*
@@ -5606,24 +5644,22 @@ void UI_ClearResource( void ) {
 UI_LoadResource
 ====================
 */
-void UI_LoadResource( const char *name ) {
-	if (cls.loading == SS_DEAD) {
-		return;
-	}
+void UI_LoadResource(const char *name)
+{
+    if (cls.loading == SS_DEAD) {
+        return;
+    }
 
-	if (cls.loading == SS_GAME)
-	{
-		UI_EndLoadResource();
-		UI_EndLoadResource(name);
-		UI_BeginLoadResource();
-	}
-	else if (cls.loading == SS_LOADING2)
-	{
-		UI_RegisterLoadResource(name);
-		Cvar_SetValue("loadingbar", (float)currentLoadTime / (float)totalLoadTime);
-	}
+    if (cls.loading == SS_GAME) {
+        UI_EndLoadResource();
+        UI_EndLoadResource(name);
+        UI_BeginLoadResource();
+    } else if (cls.loading == SS_LOADING2) {
+        UI_RegisterLoadResource(name);
+        Cvar_SetValue("loadingbar", (float)currentLoadTime / (float)totalLoadTime);
+    }
 
-	UI_TestUpdateScreen(333u);
+    UI_TestUpdateScreen(33);
 }
 
 /*
@@ -5631,12 +5667,12 @@ void UI_LoadResource( const char *name ) {
 UI_FreeLoadStrings
 ====================
 */
-void UI_FreeLoadStrings() {
-	if( loadStrings )
-	{
-		Z_Free( loadStrings );
-		loadStrings = NULL;
-	}
+void UI_FreeLoadStrings()
+{
+    if (loadStrings) {
+        Z_Free(loadStrings);
+        loadStrings = NULL;
+    }
 }
 
 /*
@@ -5644,15 +5680,15 @@ void UI_FreeLoadStrings() {
 UI_DeleteLoadInfo
 ====================
 */
-void UI_DeleteLoadInfo() {
-	LoadResourceInfo *ptr;
-	LoadResourceInfo *nextPtr;
+void UI_DeleteLoadInfo()
+{
+    LoadResourceInfo *ptr;
+    LoadResourceInfo *nextPtr;
 
-	for( ptr = loadHead; ptr != NULL; ptr = nextPtr )
-	{
-		nextPtr = ptr->next;
-		Z_Free( ptr );
-	}
+    for (ptr = loadHead; ptr != NULL; ptr = nextPtr) {
+        nextPtr = ptr->next;
+        Z_Free(ptr);
+    }
 }
 
 /*
@@ -5660,59 +5696,55 @@ void UI_DeleteLoadInfo() {
 UI_ParseLoadMapinfo
 ====================
 */
-bool UI_ParseLoadMapinfo(Script* scr) {
-	int size, index;
-	int allocLen;
-	char* pos;
-	const char* token;
-	char* newPos;
-	int time;
+bool UI_ParseLoadMapinfo(Script *scr)
+{
+    int         size, index;
+    int         allocLen;
+    char       *pos;
+    const char *token;
+    char       *newPos;
+    int         time;
 
-	loadNumber = scr->GetInteger(false);
-	size = scr->GetInteger(false);
-	scr->SkipWhiteSpace(true);
+    loadNumber = scr->GetInteger(false);
+    size       = scr->GetInteger(false);
+    scr->SkipWhiteSpace(true);
 
-	allocLen = size + sizeof(loadStrings[0]) * loadNumber + sizeof(loadTimes[0]) * loadNumber;
-	loadStrings = (char**)Z_Malloc(allocLen);
-	loadTimes = (unsigned int*)(loadStrings + loadNumber);
-	loadStringsBuffer = (char*)(loadTimes + loadNumber);
-	pos = loadStringsBuffer;
+    allocLen          = size + sizeof(loadStrings[0]) * loadNumber + sizeof(loadTimes[0]) * loadNumber;
+    loadStrings       = (char **)Z_Malloc(allocLen);
+    loadTimes         = (unsigned int *)(loadStrings + loadNumber);
+    loadStringsBuffer = (char *)(loadTimes + loadNumber);
+    pos               = loadStringsBuffer;
 
-	totalLoadTime = 0;
-	index = 0;
+    totalLoadTime = 0;
+    index         = 0;
 
-	do
-	{
-		token = scr->GetToken(true);
-		newPos = &pos[strlen(token) + 1];
-		strcpy(pos, token);
-		loadStrings[index] = pos;
+    do {
+        token  = scr->GetToken(true);
+        newPos = &pos[strlen(token) + 1];
+        strcpy(pos, token);
+        loadStrings[index] = pos;
 
-		time = scr->GetInteger(true);
+        time = scr->GetInteger(true);
 
-		if (UI_IsResourceLoaded(pos))
-		{
-			loadTimes[index] = 0;
-		}
-		else
-		{
-			loadTimes[index] = time;
-			totalLoadTime += time;
-		}
+        if (UI_IsResourceLoaded(pos)) {
+            loadTimes[index] = 0;
+        } else {
+            loadTimes[index] = time;
+            totalLoadTime += time;
+        }
 
-		pos = newPos;
-		index++;
-	} while (index != loadNumber);
+        pos = newPos;
+        index++;
+    } while (index != loadNumber);
 
-	assert(pos <= (char*)loadStrings + allocLen);
+    assert(pos <= (char *)loadStrings + allocLen);
 
-	if (newPos != loadStringsBuffer + size)
-	{
-		UI_FreeLoadStrings();
-		return false;
-	}
+    if (newPos != loadStringsBuffer + size) {
+        UI_FreeLoadStrings();
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -5720,35 +5752,35 @@ bool UI_ParseLoadMapinfo(Script* scr) {
 UI_ArchiveLoadMapinfo
 ====================
 */
-bool UI_ArchiveLoadMapinfo( const char *mapname ) {
-	Script scr;
-	int version;
-	byte *tempbuf;
-	int length;
-	bool success;
+bool UI_ArchiveLoadMapinfo(const char *mapname)
+{
+    Script scr;
+    int    version;
+    byte  *tempbuf;
+    int    length;
+    bool   success;
 
-	length = FS_ReadFile( loadName, ( void ** )&tempbuf );
+    length = FS_ReadFile(loadName, (void **)&tempbuf);
 
-	if( length <= 0 ) {
-		return false;
-	}
+    if (length <= 0) {
+        return false;
+    }
 
-	scr.LoadFile( loadName, length, ( const char * )tempbuf );
-	FS_FreeFile( tempbuf );
+    scr.LoadFile(loadName, length, (const char *)tempbuf);
+    FS_FreeFile(tempbuf);
 
-	version = scr.GetInteger( false );
-	scr.SkipWhiteSpace( true );
+    version = scr.GetInteger(false);
+    scr.SkipWhiteSpace(true);
 
-	if( version == 3 )
-	{
-		success = UI_ParseLoadMapinfo( &scr );
-	} else {
-		Com_Printf( "Expecting version %d map info file.  Map info is version %d.\n", 3, version );
-		success = false;
-	}
+    if (version == 3) {
+        success = UI_ParseLoadMapinfo(&scr);
+    } else {
+        Com_Printf("Expecting version %d map info file.  Map info is version %d.\n", 3, version);
+        success = false;
+    }
 
-	scr.Close();
-	return success;
+    scr.Close();
+    return success;
 }
 
 /*
@@ -5756,109 +5788,107 @@ bool UI_ArchiveLoadMapinfo( const char *mapname ) {
 UI_BeginLoad
 ====================
 */
-void UI_BeginLoad( const char *pszMapName ) {
-	str mapfile;
+void UI_BeginLoad(const char *pszMapName)
+{
+    str mapfile;
 
-	if( cls.loading )
-	{
-		if( cls.loading == SS_GAME ) {
-			UI_DeleteLoadInfo();
-		}
+    if (cls.loading) {
+        if (cls.loading == SS_GAME) {
+            UI_DeleteLoadInfo();
+        }
 
-		UI_FreeLoadStrings();
-		cls.loading = SS_DEAD;
-	}
+        UI_FreeLoadStrings();
+        cls.loading = SS_DEAD;
+    }
 
-	server_loading = qtrue;
-	server_loading_waiting = qfalse;
-	strcpy( server_mapname, pszMapName );
+    server_loading         = qtrue;
+    server_loading_waiting = qfalse;
+    strcpy(server_mapname, pszMapName);
 
-	if( str::icmp( ui_sCurrentLoadingMenu, server_mapname ) )
-	{
-		ui_sCurrentLoadingMenu = server_mapname;
-		ui_pLoadingMenu = menuManager.FindMenu( ui_sCurrentLoadingMenu );
-	}
+    if (str::icmp(ui_sCurrentLoadingMenu, server_mapname)) {
+        ui_sCurrentLoadingMenu = server_mapname;
+        ui_pLoadingMenu        = menuManager.FindMenu(ui_sCurrentLoadingMenu);
+    }
 
-	if( !ui_pLoadingMenu )
-	{
-		ui_sCurrentLoadingMenu = "loading_default";
-		ui_pLoadingMenu = menuManager.FindMenu( ui_sCurrentLoadingMenu );
-	}
+    if (!ui_pLoadingMenu) {
+        ui_sCurrentLoadingMenu = "loading_default";
+        ui_pLoadingMenu        = menuManager.FindMenu(ui_sCurrentLoadingMenu);
+    }
 
-	UI_ForceMenuOff( true );
-	UI_DeactiveFloatingWindows();
+    UI_ForceMenuOff(true);
+    UI_DeactiveFloatingWindows();
 
-	if (ui_pLoadingMenu)
-	{
-		if (!developer->integer && UI_ConsoleIsVisible()) {
-			UI_CloseConsole();
-		}
+    if (ui_pLoadingMenu) {
+        if (!developer->integer && UI_ConsoleIsVisible()) {
+            UI_CloseConsole();
+        }
 
-		ui_pLoadingMenu->PassEventToWidget("continuebutton", new Event(EV_Widget_Disable));
+        ui_pLoadingMenu->PassEventToWidget("continuebutton", new Event(EV_Widget_Disable));
 
-		loadName = "maps/";
-		loadName += pszMapName;
-		loadName += ".min";
-		mapfile = loadName + ".bsp";
+        loadName = "maps/";
+        loadName += pszMapName;
+        mapfile = loadName;
+        loadName += ".min";
 
-		if (UI_ArchiveLoadMapinfo(mapfile)) {
-			cls.loading = SS_LOADING2;
-		}
-		else {
-			cls.loading = SS_GAME;
-		}
+        if (CL_UseLargeLightmap(pszMapName)) {
+            mapfile += ".bsp";
+        } else {
+            // Added in 2.0
+            mapfile += "_sml.bsp";
+        }
 
-		if (cls.loading == SS_LOADING2)
-		{
-			ui_pLoadingMenu->PassEventToWidget("loadingflasher", new Event(EV_Widget_Disable));
-			ui_pLoadingMenu->PassEventToWidget("loadingbar", new Event(EV_Widget_Enable));
-			ui_pLoadingMenu->PassEventToWidget("loadingbar_border", new Event(EV_Widget_Enable));
+        if (UI_ArchiveLoadMapinfo(mapfile)) {
+            cls.loading = SS_LOADING2;
+        } else {
+            cls.loading = SS_GAME;
+        }
 
-			currentLoadTime = 0;
-			Cvar_SetValue("loadingbar", 0);
+        if (cls.loading == SS_LOADING2) {
+            ui_pLoadingMenu->PassEventToWidget("loadingflasher", new Event(EV_Widget_Disable));
+            ui_pLoadingMenu->PassEventToWidget("loadingbar", new Event(EV_Widget_Enable));
+            ui_pLoadingMenu->PassEventToWidget("loadingbar_border", new Event(EV_Widget_Enable));
 
-			L_ProcessPendingEvents();
+            currentLoadTime = 0;
+            Cvar_SetValue("loadingbar", 0);
 
-			lastTime = Sys_Milliseconds();
-			if (com_sv_running->integer) {
-				SCR_UpdateScreen();
-			}
-		}
-		else
-		{
-			ui_pLoadingMenu->PassEventToWidget("loadingflasher", new Event(EV_Widget_Enable));
-			ui_pLoadingMenu->PassEventToWidget("loadingbar", new Event(EV_Widget_Disable));
-			ui_pLoadingMenu->PassEventToWidget("loadingbar_border", new Event(EV_Widget_Disable));
+            L_ProcessPendingEvents();
 
-			UI_BeginLoadResource();
-			loadCountLow = 0;
-			loadCountHigh = 0;
-			loadHead = NULL;
-			loadNumber = 0;
+            lastTime = Sys_Milliseconds();
+            if (com_sv_running->integer) {
+                SCR_UpdateScreen();
+            }
+        } else {
+            ui_pLoadingMenu->PassEventToWidget("loadingflasher", new Event(EV_Widget_Enable));
+            ui_pLoadingMenu->PassEventToWidget("loadingbar", new Event(EV_Widget_Disable));
+            ui_pLoadingMenu->PassEventToWidget("loadingbar_border", new Event(EV_Widget_Disable));
 
-			cls.loading = SS_LOADING;
+            UI_BeginLoadResource();
+            loadCountLow  = 0;
+            loadCountHigh = 0;
+            loadHead      = NULL;
+            loadNumber    = 0;
 
-			L_ProcessPendingEvents();
-			lastTime = Sys_Milliseconds();
+            cls.loading = SS_LOADING;
 
-			if (com_sv_running->integer) {
-				SCR_UpdateScreen();
-			}
-		}
-	}
-	else
-	{
-		cls.loading = SS_LOADING;
+            L_ProcessPendingEvents();
+            lastTime = Sys_Milliseconds();
 
-		// process all events
-		L_ProcessPendingEvents();
+            if (com_sv_running->integer) {
+                SCR_UpdateScreen();
+            }
+        }
+    } else {
+        cls.loading = SS_LOADING;
 
-		lastTime = Sys_Milliseconds();
+        // process all events
+        L_ProcessPendingEvents();
 
-		if (com_sv_running->integer) {
-			SCR_UpdateScreen();
-		}
-	}
+        lastTime = Sys_Milliseconds();
+
+        if (com_sv_running->integer) {
+            SCR_UpdateScreen();
+        }
+    }
 }
 
 /*
@@ -5866,11 +5896,12 @@ void UI_BeginLoad( const char *pszMapName ) {
 UI_CompareLoadResources
 ====================
 */
-int UI_CompareLoadResources( const void *elem1, const void *elem2 ) {
-	LoadResourceInfo *e1 = *( LoadResourceInfo ** )elem1;
-	LoadResourceInfo *e2 = *( LoadResourceInfo ** )elem2;
+int UI_CompareLoadResources(const void *elem1, const void *elem2)
+{
+    LoadResourceInfo *e1 = *(LoadResourceInfo **)elem1;
+    LoadResourceInfo *e2 = *(LoadResourceInfo **)elem2;
 
-	return strcmp( e1->name, e2->name );
+    return strcmp(e1->name, e2->name);
 }
 
 /*
@@ -5878,79 +5909,72 @@ int UI_CompareLoadResources( const void *elem1, const void *elem2 ) {
 UI_EndLoad
 ====================
 */
-void UI_EndLoad( void ) {
-	LoadResourceInfo *ptr;
-	LoadResourceInfo **base;
-	int i;
-	fileHandle_t file;
-	int size;
-	char buf[ 1024 ];
+void UI_EndLoad(void)
+{
+    LoadResourceInfo  *ptr;
+    LoadResourceInfo **base;
+    int                i;
+    fileHandle_t       file;
+    int                size;
+    char               buf[1024];
 
-	if( !cls.loading ) {
-		return;
-	}
+    if (!cls.loading) {
+        return;
+    }
 
-	UI_LoadResource( "*end" );
+    UI_LoadResource("*end");
 
-	if( cls.loading == SS_GAME )
-	{
-		base = ( LoadResourceInfo ** )Z_Malloc( loadNumber * sizeof( LoadResourceInfo * ) );
+    if (cls.loading == SS_GAME) {
+        base = (LoadResourceInfo **)Z_Malloc(loadNumber * sizeof(LoadResourceInfo *));
 
-		i = 0;
-		for( ptr = loadHead; ptr != NULL; ptr = ptr->next )
-		{
-			base[ i ] = ptr;
-			i++;
-		}
+        i = 0;
+        for (ptr = loadHead; ptr != NULL; ptr = ptr->next) {
+            base[i] = ptr;
+            i++;
+        }
 
-		qsort( base, loadNumber, sizeof( LoadResourceInfo * ), UI_CompareLoadResources );
+        qsort(base, loadNumber, sizeof(LoadResourceInfo *), UI_CompareLoadResources);
 
-		size = 0;
-		for( i = 0; i < loadNumber; i++ )
-		{
-			ptr = base[ i ];
-			size += strlen( ptr->name ) + 1;
-		}
+        size = 0;
+        for (i = 0; i < loadNumber; i++) {
+            ptr = base[i];
+            size += strlen(ptr->name) + 1;
+        }
 
-		file = FS_FOpenFileWrite( loadName );
-		sprintf( buf, "%d\n%d %d\n", 3, loadNumber, size );
+        file = FS_FOpenFileWrite(loadName);
+        Com_sprintf(buf, sizeof(buf), "%d\n%d %d\n", 3, loadNumber, size);
 
-		FS_Write( buf, strlen( buf ), file );
+        FS_Write(buf, strlen(buf), file);
 
-		for( i = 0; i < loadNumber; i++ )
-		{
-			sprintf( buf, "%s\n%d\n", base[ i ]->name, base[ i ]->loadCount );
-			FS_Write( buf, strlen( buf ), file );
-		}
+        for (i = 0; i < loadNumber; i++) {
+            Com_sprintf(buf, sizeof(buf), "%s\n%d\n", base[i]->name, base[i]->loadCount);
+            FS_Write(buf, strlen(buf), file);
+        }
 
-		FS_FCloseFile( file );
-		Z_Free( base );
-		UI_DeleteLoadInfo();
-	}
-	else if( cls.loading == SS_LOADING2 )
-	{
-		if( ui_debugload->integer ) {
-			Com_Printf( "Following resources not accounted for on load:\n" );
-		}
+        FS_FCloseFile(file);
+        Z_Free(base);
+        UI_DeleteLoadInfo();
+    } else if (cls.loading == SS_LOADING2) {
+        if (ui_debugload->integer) {
+            Com_Printf("Following resources not accounted for on load:\n");
+        }
 
-		for( i = 0; i < loadNumber; i++ )
-		{
-			if( loadTimes[ i ] )
-			{
-				if( ui_debugload->integer ) {
-					Com_Printf( "%s\n", loadStrings[ i ] );
-				}
+        for (i = 0; i < loadNumber; i++) {
+            if (loadTimes[i]) {
+                if (ui_debugload->integer) {
+                    Com_Printf("%s\n", loadStrings[i]);
+                }
 
-				loadTimes[ i ] = 0;
-			}
-		}
+                loadTimes[i] = 0;
+            }
+        }
 
-		currentLoadTime = totalLoadTime;
-	}
+        currentLoadTime = totalLoadTime;
+    }
 
-	UI_FreeLoadStrings();
+    UI_FreeLoadStrings();
 
-	cls.loading = SS_DEAD;
+    cls.loading = SS_DEAD;
 }
 
 /*
@@ -5958,14 +5982,14 @@ void UI_EndLoad( void ) {
 UI_AbortLoad
 ====================
 */
-void UI_AbortLoad( void ) {
-	if( cls.loading )
-	{
-		if( cls.loading == SS_GAME ) {
-			UI_DeleteLoadInfo();
-		}
-		cls.loading = SS_DEAD;
-	}
+void UI_AbortLoad(void)
+{
+    if (cls.loading) {
+        if (cls.loading == SS_GAME) {
+            UI_DeleteLoadInfo();
+        }
+        cls.loading = SS_DEAD;
+    }
 }
 
 /*
@@ -5973,67 +5997,75 @@ void UI_AbortLoad( void ) {
 CL_FontStringWidth
 ====================
 */
-int CL_FontStringWidth( fontheader_t *pFont, const char *pszString, int iMaxLen ) {
-	return uie.FontStringWidth( pFont, pszString, iMaxLen );
+int CL_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
+{
+    return uie.FontStringWidth(pFont, pszString, iMaxLen);
 }
 
-griditemtype_t TestListItem::getListItemType( int which ) const
+griditemtype_t TestListItem::getListItemType(int which) const
 {
-	return TYPE_STRING;
+    return TYPE_STRING;
 }
 
-str TestListItem::getListItemString( int i ) const
+str TestListItem::getListItemString(int i) const
 {
-	return strings[ i ];
+    return strings[i];
 }
 
-int TestListItem::getListItemValue( int i ) const
+int TestListItem::getListItemValue(int i) const
 {
-	return atoi( strings[ i ] );
+    return atoi(strings[i]);
 }
 
-void TestListItem::DrawListItem( int iColumn, const UIRect2D &drawRect, bool bSelected, UIFont *pFont )
+void TestListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean TestListItem::IsHeaderEntry(void) const
 {
+    return qfalse;
 }
 
-qboolean TestListItem::IsHeaderEntry( void ) const
+void ScoreboardListItem::SetListItemStrings(
+    const char *string1,
+    const char *string2,
+    const char *string3,
+    const char *string4,
+    const char *string5,
+    const char *string6,
+    const char *string7,
+    const char *string8
+)
 {
-	return qfalse;
+    strings[0] = string1;
+    strings[1] = string2;
+    strings[2] = string3;
+    strings[3] = string4;
+    strings[4] = string5;
+    strings[5] = string6;
+    strings[6] = string7;
+    strings[7] = string8;
 }
 
-void ScoreboardListItem::SetListItemStrings( const char *string1, const char *string2, const char *string3, const char *string4, const char *string5, const char *string6, const char *string7, const char *string8 )
+griditemtype_t ScoreboardListItem::getListItemType(int i) const
 {
-	strings[ 0 ] = string1;
-	strings[ 1 ] = string2;
-	strings[ 2 ] = string3;
-	strings[ 3 ] = string4;
-	strings[ 4 ] = string5;
-	strings[ 5 ] = string6;
-	strings[ 6 ] = string7;
-	strings[ 7 ] = string8;
+    return bColorSet != 0 ? TYPE_OWNERDRAW : TYPE_STRING;
 }
 
-griditemtype_t ScoreboardListItem::getListItemType( int i ) const
+str ScoreboardListItem::getListItemString(int i) const
 {
-	return bColorSet != 0 ? TYPE_OWNERDRAW : TYPE_STRING;
+    return strings[i];
 }
 
-str ScoreboardListItem::getListItemString( int i ) const
+int ScoreboardListItem::getListItemValue(int i) const
 {
-	return strings[ i ];
+    return atoi(strings[i]);
 }
 
-int ScoreboardListItem::getListItemValue( int i ) const
+void ScoreboardListItem::SetTitleItem(qboolean bSet)
 {
-	return atoi( strings[ i ] );
+    bTitleItem = bSet;
 }
 
-void ScoreboardListItem::SetTitleItem( qboolean bSet )
+qboolean ScoreboardListItem::IsHeaderEntry(void) const
 {
-	bTitleItem = bSet;
-}
-
-qboolean ScoreboardListItem::IsHeaderEntry( void ) const
-{
-	return bTitleItem;
+    return bTitleItem;
 }
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 6b9afb07..ab3a001e 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,112 +20,137 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UI_H__
-#define __CL_UI_H__
+#pragma once
 
 #include "../uilib/ui_extern.h"
 #include "../uilib/uiwidget.h"
 
 typedef struct {
-	UIReggedMaterial *loading;
+    UIReggedMaterial *loading;
 } static_media_t;
 
 //
 // cvars
 //
-extern cvar_t* ui_health_start;
-extern cvar_t* ui_health_end;
-extern cvar_t* sound_overlay;
+extern cvar_t *ui_health_start;
+extern cvar_t *ui_health_end;
+extern cvar_t *sound_overlay;
+extern cvar_t *cl_movieaudio;
 
 //
 // initialization
 //
-void CL_FillUIDef( void );
-void CL_InitializeUI( void );
-void CL_ShutdownUI( void );
+void CL_FillUIDef(void);
+void CL_InitializeUI(void);
+void CL_ShutdownUI(void);
 
 //
 // general ui stuff
 //
-extern inventory_t client_inv;
-extern bind_t client_bind;
-extern cvar_t* cl_greenfps;
+extern inventory_t  client_inv;
+extern bind_t       client_bind;
+extern cvar_t      *cl_greenfps;
+extern qboolean     server_loading;
+extern const UColor UWhiteChatMessageColor;
+extern const UColor URedChatMessageColor;
+extern const UColor UGreenChatMessageColor;
 
-const char *CvarGetForUI( const char *name, const char *defval );
-void UI_ClearState( void );
-void CL_BeginRegistration( void );
-void CL_EndRegistration(void);
+const char *CvarGetForUI(const char *name, const char *defval);
+void        UI_ClearState(void);
+void        CL_BeginRegistration(void);
+void        CL_EndRegistration(void);
+float       UI_GetObjectivesTop(void);
+void        UI_GetHighResolutionScale(vec2_t scale);
 
 //
 // menu
 //
 extern Menu *ui_pLoadingMenu;
 
-void UI_ShowMenu( const char *name, qboolean bForce );
-void UI_HideMenu( const char *name, qboolean bForce );
-void UI_ForceMenuOff( bool force );
-void UI_PushMenu( const char *name );
-void UI_ForceMenu( const char *name );
-qboolean UI_BindActive( void );
-void UI_SetReturnMenuToCurrent(void);
-void UI_ActivateView3D( void );
-void UI_MenuEscape( const char *name );
-void UI_CreateScoreboard( void );
-qboolean UI_MenuActive( void );
-qboolean UI_MenuUp( void );
-void UI_FocusMenuIfExists(void);
-void UI_DrawConnect( void );
-void UI_CreateDialog( const char *title, char *cvarname, const char *command, const char *cancelCommand, int width, int height, const char *shader, const char *okshader, const char *cancelshader );
-void UI_ToggleDMConsole( int iMode );
-void UI_ShowScoreboard_f( const char *pszMenuName );
-void UI_HideScoreboard_f( void );
-void UI_SetScoreBoardItem( int iItemNumber,
-	const char *pszData1, const char *pszData2, const char *pszData3, const char *pszData4,
-	const char *pszData5, const char *pszData6, const char *pszData7, const char *pszData8,
-	const vec4_t pTextColor, const vec4_t pBackColor, qboolean bIsHeader );
-void UI_DeleteScoreBoardItems( int iMaxIndex );
+void     UI_ShowMenu(const char *name, qboolean bForce);
+void     UI_HideMenu(const char *name, qboolean bForce);
+void     UI_ForceMenuOff(bool force);
+void     UI_PushMenu(const char *name);
+void     UI_ForceMenu(const char *name);
+qboolean UI_BindActive(void);
+void     UI_SetReturnMenuToCurrent(void);
+void     UI_ActivateView3D(void);
+void     UI_MenuEscape(const char *name);
+void     UI_CreateScoreboard(void);
+qboolean UI_MenuActive(void);
+qboolean UI_MenuUp(void);
+void     UI_FocusMenuIfExists(void);
+void     UI_DrawConnect(void);
+void     UI_CreateDialog(
+        const char *title,
+        char       *cvarname,
+        const char *command,
+        const char *cancelCommand,
+        int         width,
+        int         height,
+        const char *shader,
+        const char *okshader,
+        const char *cancelshader
+    );
+void UI_ToggleDMConsole(int iMode);
+void UI_ShowScoreboard_f(const char *pszMenuName);
+void UI_HideScoreboard_f(void);
+void UI_SetScoreBoardItem(
+    int          iItemNumber,
+    const char  *pszData1,
+    const char  *pszData2,
+    const char  *pszData3,
+    const char  *pszData4,
+    const char  *pszData5,
+    const char  *pszData6,
+    const char  *pszData7,
+    const char  *pszData8,
+    const vec4_t pTextColor,
+    const vec4_t pBackColor,
+    qboolean     bIsHeader
+);
+void UI_DeleteScoreBoardItems(int iMaxIndex);
 
 //
 // ressources
 //
-void UI_BeginLoad( const char *pszMapName );
-void UI_EndLoad( void );
-void UI_AbortLoad( void );
-void UI_BeginLoadResource( void );
-void UI_EndLoadResource( void );
-void UI_EndLoadResource( const char *name );
-qboolean UI_IsResourceLoaded( const char *name );
-void UI_RegisterLoadResource( const char *name );
-void UI_ClearResource( void );
-void UI_LoadResource( const char *name );
+void     UI_BeginLoad(const char *pszMapName);
+void     UI_EndLoad(void);
+void     UI_AbortLoad(void);
+int      CL_FontStringWidth(fontheader_t* pFont, const char* pszString, int iMaxLen);
+void     UI_BeginLoadResource(void);
+void     UI_EndLoadResource(void);
+void     UI_EndLoadResource(const char *name);
+qboolean UI_IsResourceLoaded(const char *name);
+void     UI_RegisterLoadResource(const char *name);
+void     UI_ClearResource(void);
+void     UI_LoadResource(const char *name);
 
 //
 // windows
 //
-void UI_DeactiveFloatingWindows( void );
+void UI_DeactiveFloatingWindows(void);
 
 //
 // console
 //
-void UI_OpenConsole( void );
-qboolean UI_ConsoleIsVisible( void );
-qboolean UI_ConsoleIsOpen( void );
-void UI_CloseConsole( void );
-void UI_ToggleConsole( void );
-void UI_OpenDMConsole( int iMode );
-void UI_CloseDMConsole( void );
-void UI_ToggleDMConsole( int iMode );
-void UI_OpenDeveloperConsole( void );
-void UI_CloseDeveloperConsole( void );
-void UI_PrintConsole(const char* msg);
+void     UI_OpenConsole(void);
+qboolean UI_ConsoleIsVisible(void);
+qboolean UI_ConsoleIsOpen(void);
+void     UI_CloseConsole(void);
+void     UI_ToggleConsole(void);
+void     UI_OpenDMConsole(int iMode);
+void     UI_CloseDMConsole(void);
+void     UI_ToggleDMConsole(int iMode);
+void     UI_OpenDeveloperConsole(void);
+void     UI_CloseDeveloperConsole(void);
+void     UI_PrintConsole(const char *msg);
 
 //
 // callbacks
 //
-void UI_Update( void );
-void UI_ServerLoaded( void );
-void UI_ResolutionChange( void );
-void UI_KeyEvent( int key, unsigned int time );
-void UI_CharEvent( int ch );
-
-#endif /* __CL_UI_H__ */
+void UI_Update(void);
+void UI_ServerLoaded(void);
+void UI_ResolutionChange(void);
+void UI_KeyEvent(int key, unsigned int time);
+void UI_CharEvent(int ch);
diff --git a/code/client/cl_uibind.cpp b/code/client/cl_uibind.cpp
index 22ae1e58..8db44142 100644
--- a/code/client/cl_uibind.cpp
+++ b/code/client/cl_uibind.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,281 +24,529 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 bind_t::bind_t()
 {
-	// FIXME: stub
+    int i;
+
+    commandwidth       = 100;
+    commandheight      = 20;
+    primarykeywidth    = 100;
+    primarykeyheight   = 20;
+    alternatekeywidth  = 100;
+    alternatekeyheight = 20;
+    fillwidth          = 16;
+    fillmaterial       = NULL;
+
+    for (i = 0; i < ARRAY_LEN(headermats); i++) {
+        headermats[i] = NULL;
+    }
 }
 
 bind_t::~bind_t()
 {
-	Clear();
+    Clear();
 }
 
-void bind_t::Clear
-	(
-	void
-	)
-
+void bind_t::Clear(void)
 {
-	// FIXME: stub
+    for (int i = binds.NumObjects(); i > 0; i--) {
+        bind_item_t *bi;
+
+        bi = binds.ObjectAt(i);
+        binds.RemoveObjectAt(i);
+
+        if (bi) {
+            delete bi;
+        }
+    }
 }
 
-CLASS_DECLARATION( Listener, bindlistener, NULL )
-{
-	{ NULL, NULL }
+Event EV_Bind_Header
+(
+    "header",
+    EV_DEFAULT,
+    "iss",
+    "column_num name material",
+    "Set the header of each column"
+);
+Event EV_Bind_Width
+(
+    "bind_width",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "Width of the bind menu"
+);
+Event EV_Bind_Height
+(
+    "bind_height",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "Height of the bind menu"
+);
+Event EV_Bind_FillWidth
+(
+    "bind_fillwidth",
+    EV_DEFAULT,
+    "iS",
+    "width material",
+    "Width of the filling between widgets"
+);
+Event EV_Bind_CommandWidth
+(
+    "bind_commandwidth",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "Width of the command item"
+);
+Event EV_Bind_CommandHeight
+(
+    "bind_commandheight",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "Height of the command item"
+);
+Event EV_Bind_PrimaryKeyWidth
+(
+    "bind_primarykeywidth",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "Width of the primary key item"
+);
+Event EV_Bind_PrimaryKeyHeight
+(
+    "bind_primarykeyheight",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "Height of the primary key item"
+);
+Event EV_Bind_AlternateKeyWidth
+(
+    "bind_alternatekeywidth",
+    EV_DEFAULT,
+    "i",
+    "width",
+    "Width of the alternate key item"
+);
+Event EV_Bind_AlternateKeyHeight
+(
+    "bind_alternatekeyheight",
+    EV_DEFAULT,
+    "i",
+    "height",
+    "Height of the alternate key item"
+);
+Event EV_Bind_NewItem
+(
+    "binditem",
+    EV_DEFAULT,
+    "ss",
+    "name command",
+    "Create a new bind item in the interface"
+);
+Event EV_Bind_Align
+(
+    "align",
+    EV_DEFAULT,
+    "sSSSSS",
+    "arg1 arg2 arg3 arg4 arg5 arg6",
+    "Set the alignment on the bind menu"
+);
+Event EV_Bind_TitleForegroundColor
+(
+    "titleforegroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the title foreground"
+);
+Event EV_Bind_TitleBackgroundColor
+(
+    "titlebackgroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the title background"
+);
+Event EV_Bind_InactiveForegroundColor
+(
+    "inactiveforegroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the inactive button foreground"
+);
+Event EV_Bind_InactiveBackgroundColor
+(
+    "inactivebackgroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the inactive button background"
+);
+Event EV_Bind_ActiveForegroundColor
+(
+    "activeforegroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the active button foreground"
+);
+Event EV_Bind_ActiveBackgroundColor
+(
+    "activebackgroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the active button background"
+);
+Event EV_Bind_ActiveBorderColor
+(
+    "activebordercolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the active button border"
+);
+Event EV_Bind_HighlightForegroundColor
+(
+    "highlightforegroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the highlighted button foreground"
+);
+Event EV_Bind_HighlightBackgroundColor
+(
+    "highlightbackgroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the highlighted button background"
+);
+Event EV_Bind_SelectForegroundColor
+(
+    "selectforegroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the selected button foreground"
+);
+Event EV_Bind_SelectBackgroundColor
+(
+    "selectbackgroundcolor",
+    EV_DEFAULT,
+    "ffff",
+    "r g b a",
+    "Set the color for the selected button background"
+);
+Event EV_Bind_ChangeSound
+(
+    "changesound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the name of the sound to play when the highlighted item changes"
+);
+Event EV_Bind_ActiveSound
+(
+    "activesound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the name of the sound to play when the item is made active"
+);
+Event EV_Bind_EnterSound
+(
+    "entersound",
+    EV_DEFAULT,
+    "s",
+    "soundname",
+    "Set the name of the sound to play when the key is entered"
+);
+
+CLASS_DECLARATION(Listener, bindlistener, NULL) {
+    {&EV_Bind_Width,                    &bindlistener::Width                   },
+    {&EV_Bind_Height,                   &bindlistener::Height                  },
+    {&EV_Bind_FillWidth,                &bindlistener::FillWidth               },
+    {&EV_Bind_CommandWidth,             &bindlistener::CommandWidth            },
+    {&EV_Bind_CommandHeight,            &bindlistener::CommandHeight           },
+    {&EV_Bind_PrimaryKeyWidth,          &bindlistener::PrimaryKeyWidth         },
+    {&EV_Bind_PrimaryKeyHeight,         &bindlistener::PrimaryKeyHeight        },
+    {&EV_Bind_AlternateKeyWidth,        &bindlistener::AlternateKeyWidth       },
+    {&EV_Bind_AlternateKeyHeight,       &bindlistener::AlternateKeyHeight      },
+    {&EV_Bind_Header,                   &bindlistener::Header                  },
+    {&EV_Bind_NewItem,                  &bindlistener::NewItem                 },
+    {&EV_Bind_Align,                    &bindlistener::Align                   },
+    {&EV_Bind_TitleForegroundColor,     &bindlistener::TitleForegroundColor    },
+    {&EV_Bind_TitleBackgroundColor,     &bindlistener::TitleBackgroundColor    },
+    {&EV_Bind_InactiveForegroundColor,  &bindlistener::InactiveForegroundColor },
+    {&EV_Bind_InactiveBackgroundColor,  &bindlistener::InactiveBackgroundColor },
+    {&EV_Bind_ActiveForegroundColor,    &bindlistener::ActiveForegroundColor   },
+    {&EV_Bind_ActiveBackgroundColor,    &bindlistener::ActiveBackgroundColor   },
+    {&EV_Bind_ActiveBorderColor,        &bindlistener::ActiveBorderColor       },
+    {&EV_Bind_HighlightForegroundColor, &bindlistener::HighlightForegroundColor},
+    {&EV_Bind_HighlightBackgroundColor, &bindlistener::HighlightBackgroundColor},
+    {&EV_Bind_SelectForegroundColor,    &bindlistener::SelectForegroundColor   },
+    {&EV_Bind_SelectBackgroundColor,    &bindlistener::SelectBackgroundColor   },
+    {&EV_Bind_ChangeSound,              &bindlistener::ChangeSound             },
+    {&EV_Bind_ActiveSound,              &bindlistener::ActiveSound             },
+    {&EV_Bind_EnterSound,               &bindlistener::EnterSound              },
+    {NULL,                              NULL                                   }
 };
 
-bindlistener::bindlistener()
+bindlistener::bindlistener() {}
+
+bindlistener::bindlistener(bind_t *b)
 {
+    bind = b;
 }
 
-bindlistener::bindlistener
-	(
-	bind_t *b
-	)
-
+void bindlistener::Header(Event *ev)
 {
-	bind = b;
+    int num;
+
+    num = ev->GetInteger(1) - 1;
+    if (num > ARRAY_LEN(bind_t::headers)) {
+        return;
+    }
+
+    bind->headers[num] = ev->GetString(2);
+    if (ev->NumArgs() > 2) {
+        bind->headermats[num] = uWinMan.RegisterShader(ev->GetString(3));
+    }
 }
 
-bool bindlistener::Load
-	(
-	Script& script
-	)
-
+void bindlistener::ChangeSound(Event *ev)
 {
-	// FIXME: stub
-	return false;
+    bind->changesound = ev->GetString(1);
 }
 
-void bindlistener::Header
-	(
-	Event *ev
-	)
-
+void bindlistener::ActiveSound(Event *ev)
 {
-	// FIXME: stub
+    bind->activesound = ev->GetString(1);
 }
 
-void bindlistener::Width
-	(
-	Event *ev
-	)
-
+void bindlistener::EnterSound(Event *ev)
 {
-	// FIXME: stub
+    bind->entersound = ev->GetString(1);
 }
 
-void bindlistener::FillWidth
-	(
-	Event *ev
-	)
-
+void bindlistener::SelectForegroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->selectfgcolor.r = ev->GetFloat(1);
+    bind->selectfgcolor.g = ev->GetFloat(2);
+    bind->selectfgcolor.b = ev->GetFloat(3);
+    bind->selectfgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::Height
-	(
-	Event *ev
-	)
-
+void bindlistener::SelectBackgroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->selectbgcolor.r = ev->GetFloat(1);
+    bind->selectbgcolor.g = ev->GetFloat(2);
+    bind->selectbgcolor.b = ev->GetFloat(3);
+    bind->selectbgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::CommandWidth
-	(
-	Event *ev
-	)
-
+void bindlistener::TitleForegroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->titlefgcolor.r = ev->GetFloat(1);
+    bind->titlefgcolor.g = ev->GetFloat(2);
+    bind->titlefgcolor.b = ev->GetFloat(3);
+    bind->titlefgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::CommandHeight
-	(
-	Event *ev
-	)
-
+void bindlistener::TitleBackgroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->titlebgcolor.r = ev->GetFloat(1);
+    bind->titlebgcolor.g = ev->GetFloat(2);
+    bind->titlebgcolor.b = ev->GetFloat(3);
+    bind->titlebgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::PrimaryKeyWidth
-	(
-	Event *ev
-	)
-
+void bindlistener::ActiveBorderColor(Event *ev)
 {
-	// FIXME: stub
+    bind->activebordercolor.r = ev->GetFloat(1);
+    bind->activebordercolor.g = ev->GetFloat(2);
+    bind->activebordercolor.b = ev->GetFloat(3);
+    bind->activebordercolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::PrimaryKeyHeight
-	(
-	Event *ev
-	)
-
+void bindlistener::ActiveForegroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->activefgcolor.r = ev->GetFloat(1);
+    bind->activefgcolor.g = ev->GetFloat(2);
+    bind->activefgcolor.b = ev->GetFloat(3);
+    bind->activefgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::AlternateKeyWidth
-	(
-	Event *ev
-	)
-
+void bindlistener::ActiveBackgroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->activebgcolor.r = ev->GetFloat(1);
+    bind->activebgcolor.g = ev->GetFloat(2);
+    bind->activebgcolor.b = ev->GetFloat(3);
+    bind->activebgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::AlternateKeyHeight
-	(
-	Event *ev
-	)
-
+void bindlistener::InactiveForegroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->inactivefgcolor.r = ev->GetFloat(1);
+    bind->inactivefgcolor.g = ev->GetFloat(2);
+    bind->inactivefgcolor.b = ev->GetFloat(3);
+    bind->inactivefgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::NewItem
-	(
-	Event *ev
-	)
-
+void bindlistener::InactiveBackgroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->inactivebgcolor.r = ev->GetFloat(1);
+    bind->inactivebgcolor.g = ev->GetFloat(2);
+    bind->inactivebgcolor.b = ev->GetFloat(3);
+    bind->inactivebgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::Align
-	(
-	Event *ev
-	)
-
+void bindlistener::HighlightForegroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->highlightfgcolor.r = ev->GetFloat(1);
+    bind->highlightfgcolor.g = ev->GetFloat(2);
+    bind->highlightfgcolor.b = ev->GetFloat(3);
+    bind->highlightfgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::TitleForegroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::HighlightBackgroundColor(Event *ev)
 {
-	// FIXME: stub
+    bind->highlightbgcolor.r = ev->GetFloat(1);
+    bind->highlightbgcolor.g = ev->GetFloat(2);
+    bind->highlightbgcolor.b = ev->GetFloat(3);
+    bind->highlightbgcolor.a = ev->GetFloat(4);
 }
 
-void bindlistener::TitleBackgroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::Align(Event *ev)
 {
-	// FIXME: stub
+    int i;
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        str align = ev->GetString(i);
+
+        if (!str::icmp(align, "left")) {
+            bind->align |= WA_LEFT;
+        } else if (!str::icmp(align, "right")) {
+            bind->align |= WA_RIGHT;
+        } else if (!str::icmp(align, "top")) {
+            bind->align |= WA_TOP;
+        } else if (!str::icmp(align, "bottom")) {
+            bind->align |= WA_BOTTOM;
+        } else if (!str::icmp(align, "centerx")) {
+            bind->align |= WA_CENTERX;
+        } else if (!str::icmp(align, "centery")) {
+            bind->align |= WA_CENTERY;
+        }
+    }
 }
 
-void bindlistener::InactiveForegroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::NewItem(Event *ev)
 {
-	// FIXME: stub
+    bind_item_t      *bt;
+    UIReggedMaterial *mat = NULL;
+
+    if (ev->NumArgs() > 2) {
+        mat = uWinMan.RegisterShader(ev->GetString(3));
+    }
+
+    str n = ev->GetString(1);
+    str c = ev->GetString(2);
+
+    bt               = new bind_item_t;
+    bt->name         = n;
+    bt->command      = c;
+    bt->nameMaterial = mat;
+
+    bind->binds.AddObject(bt);
 }
 
-void bindlistener::InactiveBackgroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::Width(Event *ev)
 {
-	// FIXME: stub
+    bind->width = ev->GetInteger(1);
 }
 
-void bindlistener::ActiveForegroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::Height(Event *ev)
 {
-	// FIXME: stub
+    bind->height = ev->GetInteger(1);
 }
 
-void bindlistener::ActiveBackgroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::FillWidth(Event *ev)
 {
-	// FIXME: stub
+    bind->fillwidth = ev->GetInteger(1);
+
+    if (ev->NumArgs() > 1) {
+        bind->fillmaterial = uWinMan.RegisterShader(ev->GetString(2));
+    }
 }
 
-void bindlistener::ActiveBorderColor
-	(
-	Event *ev
-	)
-
+void bindlistener::CommandWidth(Event *ev)
 {
-	// FIXME: stub
+    bind->commandwidth = ev->GetInteger(1);
 }
 
-void bindlistener::HighlightForegroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::CommandHeight(Event *ev)
 {
-	// FIXME: stub
+    bind->commandheight = ev->GetInteger(1);
 }
 
-void bindlistener::HighlightBackgroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::PrimaryKeyWidth(Event *ev)
 {
-	// FIXME: stub
+    bind->primarykeywidth = ev->GetInteger(1);
 }
 
-void bindlistener::SelectForegroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::PrimaryKeyHeight(Event *ev)
 {
-	// FIXME: stub
+    bind->primarykeyheight = ev->GetInteger(1);
 }
 
-void bindlistener::SelectBackgroundColor
-	(
-	Event *ev
-	)
-
+void bindlistener::AlternateKeyWidth(Event *ev)
 {
-	// FIXME: stub
+    bind->alternatekeywidth = ev->GetInteger(1);
 }
 
-void bindlistener::ChangeSound
-	(
-	Event *ev
-	)
-
+void bindlistener::AlternateKeyHeight(Event *ev)
 {
-	// FIXME: stub
+    bind->alternatekeyheight = ev->GetInteger(1);
 }
 
-void bindlistener::ActiveSound
-	(
-	Event *ev
-	)
-
+bool bindlistener::Load(Script& script)
 {
-	// FIXME: stub
+    str token;
+    str errortext;
+
+    while (script.TokenAvailable(true)) {
+        token = script.GetToken(true);
+
+        if (!token.length() || !ValidEvent(token)) {
+            throw "invalid token";
+        }
+
+        Event *event = new Event(token);
+
+        while (script.TokenAvailable(false)) {
+            event->AddToken(script.GetToken(false));
+        }
+
+        ProcessEvent(event);
+    }
+
+    return true;
 }
 
-void bindlistener::EnterSound
-	(
-	Event *ev
-	)
-
+bool CL_LoadBind(const char *filename, bind_t *bind)
 {
-	// FIXME: stub
+    Script script;
+
+    bind->Clear();
+
+    bindlistener listener(bind);
+    script.LoadFile(filename);
+    // Load the bind file
+    return listener.Load(script);
 }
diff --git a/code/client/cl_uibind.h b/code/client/cl_uibind.h
index a1a3a41b..25813bc5 100644
--- a/code/client/cl_uibind.h
+++ b/code/client/cl_uibind.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,115 +20,109 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIBIND_H__
-#define __CL_UIBIND_H__
+#pragma once
 
-class bind_item_t {
+class bind_item_t
+{
 public:
-	str name;
-	str command;
-	UIReggedMaterial *nameMaterial;
+    str               name;
+    str               command;
+    UIReggedMaterial *nameMaterial;
 
-	bind_item_t();
-	bind_item_t( str name, str command, UIReggedMaterial *nameMaterial );
+    bind_item_t();
+    bind_item_t(str name, str command, UIReggedMaterial *nameMaterial);
 };
 
-inline
-bind_item_t::bind_item_t()
+inline bind_item_t::bind_item_t()
 {
-	nameMaterial = NULL;
+    nameMaterial = NULL;
 }
 
-inline
-bind_item_t::bind_item_t
-	(
-	str name,
-	str command,
-	UIReggedMaterial *nameMaterial
-	)
-
+inline bind_item_t::bind_item_t(str name, str command, UIReggedMaterial *nameMaterial)
 {
-	this->name = name;
-	this->command = command;
-	this->nameMaterial = nameMaterial;
+    this->name         = name;
+    this->command      = command;
+    this->nameMaterial = nameMaterial;
 }
 
-class bind_t {
+class bind_t
+{
 public:
-	int width;
-	int height;
-	int fillwidth;
-	int commandwidth;
-	int commandheight;
-	int primarykeywidth;
-	int primarykeyheight;
-	int alternatekeywidth;
-	int alternatekeyheight;
-	int align;
-	UColor titlebgcolor;
-	UColor titlefgcolor;
-	UColor activefgcolor;
-	UColor activebgcolor;
-	UColor activebordercolor;
-	UColor inactivefgcolor;
-	UColor inactivebgcolor;
-	UColor highlightfgcolor;
-	UColor highlightbgcolor;
-	UColor selectfgcolor;
-	UColor selectbgcolor;
-	str changesound;
-	str activesound;
-	str entersound;
-	str headers[ 3 ];
-	UIReggedMaterial *headermats[ 3 ];
-	UIReggedMaterial *fillmaterial;
-	Container<bind_item_t *> binds;
+    int                      width;
+    int                      height;
+    int                      fillwidth;
+    int                      commandwidth;
+    int                      commandheight;
+    int                      primarykeywidth;
+    int                      primarykeyheight;
+    int                      alternatekeywidth;
+    int                      alternatekeyheight;
+    int                      align;
+    UColor                   titlebgcolor;
+    UColor                   titlefgcolor;
+    UColor                   activefgcolor;
+    UColor                   activebgcolor;
+    UColor                   activebordercolor;
+    UColor                   inactivefgcolor;
+    UColor                   inactivebgcolor;
+    UColor                   highlightfgcolor;
+    UColor                   highlightbgcolor;
+    UColor                   selectfgcolor;
+    UColor                   selectbgcolor;
+    str                      changesound;
+    str                      activesound;
+    str                      entersound;
+    str                      headers[3];
+    UIReggedMaterial        *headermats[3];
+    UIReggedMaterial        *fillmaterial;
+    Container<bind_item_t *> binds;
 
 public:
-	bind_t();
-	~bind_t();
+    bind_t();
+    ~bind_t();
 
-	void Clear( void );
+    void Clear(void);
 };
 
-class bindlistener : public Listener {
+class bindlistener : public Listener
+{
 protected:
-	bind_t *bind;
+    bind_t *bind;
 
 public:
-	CLASS_PROTOTYPE( bindlistener );
+    CLASS_PROTOTYPE(bindlistener);
 
 public:
-	bindlistener();
-	bindlistener( bind_t *b );
+    bindlistener();
+    bindlistener(bind_t *b);
 
-	bool	Load( Script& script );
-	void	Header( Event *ev );
-	void	Width( Event *ev );
-	void	FillWidth( Event *ev );
-	void	Height( Event *ev );
-	void	CommandWidth( Event *ev );
-	void	CommandHeight( Event *ev );
-	void	PrimaryKeyWidth( Event *ev );
-	void	PrimaryKeyHeight( Event *ev );
-	void	AlternateKeyWidth( Event *ev );
-	void	AlternateKeyHeight( Event *ev );
-	void	NewItem( Event *ev );
-	void	Align( Event *ev );
-	void	TitleForegroundColor( Event *ev );
-	void	TitleBackgroundColor( Event *ev );
-	void	InactiveForegroundColor( Event *ev );
-	void	InactiveBackgroundColor( Event *ev );
-	void	ActiveForegroundColor( Event *ev );
-	void	ActiveBackgroundColor( Event *ev );
-	void	ActiveBorderColor( Event *ev );
-	void	HighlightForegroundColor( Event *ev );
-	void	HighlightBackgroundColor( Event *ev );
-	void	SelectForegroundColor( Event *ev );
-	void	SelectBackgroundColor( Event *ev );
-	void	ChangeSound( Event *ev );
-	void	ActiveSound( Event *ev );
-	void	EnterSound( Event *ev );
+    bool Load(Script& script);
+    void Header(Event *ev);
+    void Width(Event *ev);
+    void FillWidth(Event *ev);
+    void Height(Event *ev);
+    void CommandWidth(Event *ev);
+    void CommandHeight(Event *ev);
+    void PrimaryKeyWidth(Event *ev);
+    void PrimaryKeyHeight(Event *ev);
+    void AlternateKeyWidth(Event *ev);
+    void AlternateKeyHeight(Event *ev);
+    void NewItem(Event *ev);
+    void Align(Event *ev);
+    void TitleForegroundColor(Event *ev);
+    void TitleBackgroundColor(Event *ev);
+    void InactiveForegroundColor(Event *ev);
+    void InactiveBackgroundColor(Event *ev);
+    void ActiveForegroundColor(Event *ev);
+    void ActiveBackgroundColor(Event *ev);
+    void ActiveBorderColor(Event *ev);
+    void HighlightForegroundColor(Event *ev);
+    void HighlightBackgroundColor(Event *ev);
+    void SelectForegroundColor(Event *ev);
+    void SelectBackgroundColor(Event *ev);
+    void ChangeSound(Event *ev);
+    void ActiveSound(Event *ev);
+    void EnterSound(Event *ev);
 };
 
-#endif
+bool CL_LoadBind(const char* filename, bind_t* bind);
diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 357d7571..c55afa08 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
 Event EV_DMBox_Goin
 (
@@ -40,126 +41,116 @@ Event EV_DMBox_Decay
 	"Event to make the dmbox console line decay"
 );
 
-static float s_dmboxWidth = 384.0;
+static float s_dmboxWidth   = 384.0;
 static float s_dmboxOffsetX = 3.0f;
 static float s_dmboxOffsetY = 8.0f;
 
-CLASS_DECLARATION( UIWidget, UIDMBox, NULL )
-{
-	{ &W_SizeChanged,		&UIDMBox::OnSizeChanged },
-	{ &EV_DMBox_Goin,		&UIDMBox::MoveInEvent },
-	{ &EV_DMBox_Decay,		&UIDMBox::DecayEvent },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIDMBox, NULL) {
+    {&W_SizeChanged,  &UIDMBox::OnSizeChanged},
+    {&EV_DMBox_Goin,  &UIDMBox::MoveInEvent  },
+    {&EV_DMBox_Decay, &UIDMBox::DecayEvent   },
+    {NULL,            NULL                   }
 };
 
 UIDMBox::UIDMBox()
 {
-	m_numitems = 0;
-	m_reallyshown = true;
-	m_fontbold = NULL;
-	m_boxstate = boxstate_t::box_out;
-	m_iBeginDecay = 0;
-	m_boxtime = uid.time;
-	m_movespeed = 500;
+    m_numitems    = 0;
+    m_reallyshown = true;
+    m_fontbold    = NULL;
+    m_boxstate    = boxstate_t::box_out;
+    m_iBeginDecay = 0;
+    m_boxtime     = uid.time;
+    m_movespeed   = 500;
+    m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
-void UIDMBox::VerifyBoxOut( void )
+void UIDMBox::VerifyBoxOut(void)
 {
-	PostMoveinEvent();
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out)
-	{
-		ChangeBoxState(boxstate_t::box_moving_out);
-	}
+    PostMoveinEvent();
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out) {
+        ChangeBoxState(boxstate_t::box_moving_out);
+    }
 }
 
-void UIDMBox::ChangeBoxState( boxstate_t state )
+void UIDMBox::ChangeBoxState(boxstate_t state)
 {
-	m_boxstate = state;
-	m_boxtime = uid.time;
-	setShowState();
+    m_boxstate = state;
+    m_boxtime  = uid.time;
+    setShowState();
 
-	if (state == box_out) {
-		PostMoveinEvent();
-	}
+    if (state == box_out) {
+        PostMoveinEvent();
+    }
 }
 
-void UIDMBox::HandleBoxMoving( void )
+void UIDMBox::HandleBoxMoving(void)
 {
-	int delta;
-	UIRect2D newRect;
+    int      delta;
+    UIRect2D newRect;
 
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
+        return;
+    }
 
-	delta = m_movespeed * (uid.time - m_boxtime) / 1000;
-	m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
-	if (m_boxstate == boxstate_t::box_moving_out)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta + m_frame.pos.y;
+    delta     = m_movespeed * (uid.time - m_boxtime) / 1000;
+    m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
+    if (m_boxstate == boxstate_t::box_moving_out) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta + m_frame.pos.y;
 
-		if (newRect.pos.y <= 0.0)
-		{
-			newRect.pos.y = 0.0;
-			ChangeBoxState(boxstate_t::box_out);
-		}
-	}
-	else if (m_boxstate == boxstate_t::box_moving_in)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta - m_frame.pos.y;
+        if (newRect.pos.y <= 0.0) {
+            newRect.pos.y = 0.0;
+            ChangeBoxState(boxstate_t::box_out);
+        }
+    } else if (m_boxstate == boxstate_t::box_moving_in) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta - m_frame.pos.y;
 
-		if (newRect.pos.y <= -newRect.size.height)
-		{
-			newRect.pos.y = -newRect.size.height;
-			ChangeBoxState(boxstate_t::box_in);
-		}
-	}
-	else {
-		newRect = m_frame;
-	}
+        if (newRect.pos.y <= -newRect.size.height) {
+            newRect.pos.y = -newRect.size.height;
+            ChangeBoxState(boxstate_t::box_in);
+        }
+    } else {
+        newRect = m_frame;
+    }
 
-	setFrame(newRect);
+    setFrame(newRect);
 }
 
-void UIDMBox::PostMoveinEvent( void )
+void UIDMBox::PostMoveinEvent(void)
 {
-	if (m_boxstate != boxstate_t::box_out) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_out) {
+        return;
+    }
 
-	if (!EventPending(EV_DMBox_Goin)) {
-		PostEvent(EV_DMBox_Goin, 10.0);
-	}
-	else {
-		PostponeEvent(EV_DMBox_Goin, 10.0);
-	}
+    if (!EventPending(EV_DMBox_Goin)) {
+        PostEvent(EV_DMBox_Goin, 10.0);
+    } else {
+        PostponeEvent(EV_DMBox_Goin, 10.0);
+    }
 }
 
-void UIDMBox::PostDecayEvent( void )
+void UIDMBox::PostDecayEvent(void)
 {
-	if (!EventPending(EV_DMBox_Decay))
-	{
-		float fDelayTime;
-		int iNumLines;
-		int i;
-		const char* pszString = m_items[0].string.c_str();
+    if (!EventPending(EV_DMBox_Decay)) {
+        float       fDelayTime;
+        int         iNumLines;
+        int         i;
+        const char *pszString = m_items[0].string.c_str();
 
-		//
-		// Calculate the number of lines
-		//
-		iNumLines = 1;
-		for (i = 0; pszString[i]; i++)
-		{
-			if (pszString[i] == '\n') {
-				iNumLines++;
-			}
-		}
+        //
+        // Calculate the number of lines
+        //
+        iNumLines = 1;
+        for (i = 0; pszString[i]; i++) {
+            if (pszString[i] == '\n') {
+                iNumLines++;
+            }
+        }
 
         if (m_items[0].flags & DMBOX_ITEM_FLAG_BOLD) {
             fDelayTime = iNumLines * 8.0;
@@ -167,265 +158,268 @@ void UIDMBox::PostDecayEvent( void )
         //
         // Bold as twice more decay
         //
-		else if (m_items[0].flags & DMBOX_ITEM_FLAG_DEATH) {
-			fDelayTime = iNumLines * 6.0;
-		}
-		else {
-			fDelayTime = iNumLines * 5.0;
-		}
+        else if (m_items[0].flags & DMBOX_ITEM_FLAG_DEATH) {
+            fDelayTime = iNumLines * 6.0;
+        } else {
+            fDelayTime = iNumLines * 5.0;
+        }
 
-		m_iBeginDecay = cls.realtime;
-		m_iEndDecay = (int)(fDelayTime * 1000.0);
+        m_iBeginDecay = cls.realtime;
+        m_iEndDecay   = (int)(fDelayTime * 1000.0);
 
-		PostEvent(EV_DMBox_Decay, fDelayTime);
-	}
+        PostEvent(EV_DMBox_Decay, fDelayTime);
+    }
 }
 
-void UIDMBox::setShowState( void )
+void UIDMBox::setShowState(void)
 {
-	if (m_reallyshown) {
-		setShow(m_boxstate != box_in);
-	} else {
-		setShow(false);
-	}
+    if (m_reallyshown) {
+        setShow(m_boxstate != box_in);
+    } else {
+        setShow(false);
+    }
 }
 
-void UIDMBox::RemoveTopItem( void )
+void UIDMBox::RemoveTopItem(void)
 {
-	int i;
+    int i;
 
-	if (m_numitems > 0) {
-		for (i = 0; i < m_numitems - 1; i++) {
-			m_items[i] = m_items[i + 1];
-		}
+    if (m_numitems > 0) {
+        for (i = 0; i < m_numitems - 1; i++) {
+            m_items[i] = m_items[i + 1];
+        }
 
-		m_numitems--;
-	}
+        m_numitems--;
+    }
 }
 
-str UIDMBox::CalculateBreaks( UIFont *font, str text, float max_width )
+str UIDMBox::CalculateBreaks(UIFont *font, str text, float max_width)
 {
-	str newText, sTmp;
-	int i;
-	float fX;
-	float fwX, fsX;
+    str         newText;
+    float       fX;
+    float       fwX;
+    const char *current;
+    int         count;
 
-	Cmd_TokenizeString(text.c_str());
-	if (Cmd_Argc())
-	{
-		fX = 0.0;
-		fsX = font->getCharWidth(' ');
+    current = text;
+    fX      = 0.0;
 
-		for (i = 0; i < Cmd_Argc(); i++)
-		{
-			sTmp = Cmd_Argv(i);
+    for (count = font->DBCSGetWordBlockCount(current, -1); count;
+         current += count, count = font->DBCSGetWordBlockCount(current, -1)) {
+        fwX = font->getWidth(current, count);
 
-			fwX = font->getWidth(sTmp.c_str(), -1);
-			if (fwX + i <= max_width)
-			{
-				if (fwX + i + fX <= max_width)
-				{
-					newText += sTmp + " ";
-				} else {
-					newText += "\n" + sTmp + " ";
-				}
-			}
-			else
-			{
-				sTmp += "\n";
-				fX = 0.0;
-			}
-		}
-	} else {
-		newText = "";
-	}
+        if (fX + fwX > max_width) {
+            newText += "\n" + str(current, 0, count);
+            fX = 0;
+        } else {
+            newText += str(current, 0, count);
+        }
 
-	return newText;
+        fX += fwX;
+    }
+
+    return newText;
 }
 
-float UIDMBox::PrintWrap( UIFont *font, float x, float y, str text )
+float UIDMBox::PrintWrap(UIFont *font, float x, float y, str text)
 {
-	const char* p1, * p2;
-	size_t n, l;
-	float fY;
+    const char *p1, *p2;
+    size_t      n, l;
+    float       fY;
 
-	fY = y;
-	p1 = text.c_str();
-	l = text.length();
+    fY = y;
+    p1 = text.c_str();
+    l  = text.length();
 
-	for (;;)
-	{
-		p2 = strchr(p1, '\n');
-		if (!p2) {
-			break;
-		}
+    for (;;) {
+        p2 = strchr(p1, '\n');
+        if (!p2) {
+            break;
+        }
 
-		n = p2 - p1;
-		if (n >= l) {
-			break;
-		}
+        n = p2 - p1;
+        if (n >= l) {
+            break;
+        }
 
-		font->Print(x, fY, p1, p2 - p1, qfalse);
-		p1 = p2 + 1;
-		l -= n;
-		fY += font->getHeight(qfalse);
-	}
+        font->Print(x, fY, p1, p2 - p1, getHighResScale());
+        p1 = p2 + 1;
+        l -= n;
+        fY += font->getHeight();
+    }
 
-	font->Print(x, fY, p1, l, qfalse);
+    if (*p1) {
+        font->Print(x, fY, p1, l, getHighResScale());
+        fY += font->getHeight();
+    }
 
-	return font->getHeight(qfalse) + (fY - y);
+    return fY - y;
 }
 
-float UIDMBox::DrawItem( item_t *in, float x, float y, float alpha )
+float UIDMBox::DrawItem(item_t *in, float x, float y, float alpha)
 {
-	in->font->setColor(in->color);
-	in->font->setAlpha(alpha);
+    if (m_drawoutline) {
+        //
+        // Draw an outline
+        //
 
-	return PrintWrap(in->font, x, y, in->string);
+        in->font->setColor(UBlack);
+        in->font->setAlpha(alpha);
+
+        PrintWrap(in->font, x + 1, y + 2, in->string);
+        PrintWrap(in->font, x + 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y + 2, in->string);
+        PrintWrap(in->font, x - 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y - 2, in->string);
+        PrintWrap(in->font, x - 2, y - 1, in->string);
+        PrintWrap(in->font, x + 1, y - 2, in->string);
+        PrintWrap(in->font, x + 2, y - 1, in->string);
+        PrintWrap(in->font, x + 2, y, in->string);
+        PrintWrap(in->font, x - 2, y, in->string);
+        PrintWrap(in->font, x, y + 2, in->string);
+        PrintWrap(in->font, x, y - 2, in->string);
+    }
+
+    in->font->setColor(in->color);
+    in->font->setAlpha(alpha);
+
+    return PrintWrap(in->font, x, y, in->string);
 }
 
-void UIDMBox::Print( const char *text )
+void UIDMBox::Print(const char *text)
 {
-	const char* text1 = text;
+    const char *text1 = text;
 
-	if (m_numitems > 5)
-	{
-		//
-		// Overwrite an item
-		//
-		RemoveTopItem();
-	}
+    if (m_numitems > 5) {
+        //
+        // Overwrite an item
+        //
+        RemoveTopItem();
+    }
 
-	m_items[m_numitems].flags = 0;
+    m_items[m_numitems].flags = 0;
 
-	if (*text == MESSAGE_CHAT_WHITE)
-	{
-		m_items[m_numitems].color = UGrey;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
+    if (*text == MESSAGE_CHAT_WHITE) {
+        m_items[m_numitems].color = UWhiteChatMessageColor;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
 
-		text1 = text + 1;
-	}
-	else if (*text == MESSAGE_CHAT_RED)
-	{
-		m_items[m_numitems].color = ULightRed;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
+        text1 = text + 1;
+    } else if (*text == MESSAGE_CHAT_RED) {
+        m_items[m_numitems].color = URedChatMessageColor;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
-		text1 = text + 1;
-	}
-	else if (*text == MESSAGE_CHAT_GREEN)
-	{
-		m_items[m_numitems].color = UGreen;
+        text1 = text + 1;
+    } else if (*text == MESSAGE_CHAT_GREEN) {
+        m_items[m_numitems].color = UGreenChatMessageColor;
         m_items[m_numitems].font = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
-		text1 = text + 1;
-	}
-	else
-	{
-		m_items[m_numitems].color = m_foreground_color;
-		m_items[m_numitems].font = m_font;
-	}
+        text1 = text + 1;
+    } else {
+        m_items[m_numitems].color = m_foreground_color;
+        m_items[m_numitems].font  = m_font;
+    }
 
-	m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_dmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, Sys_LV_CL_ConvertString(text1), s_dmboxWidth);
 
-	m_numitems++;
-	VerifyBoxOut();
-	PostDecayEvent();
+    m_numitems++;
+    VerifyBoxOut();
+    PostDecayEvent();
 }
 
-void UIDMBox::OnSizeChanged( Event *ev )
+void UIDMBox::OnSizeChanged(Event *ev)
 {
-	s_dmboxWidth = m_frame.size.width;
+    s_dmboxWidth = m_frame.size.width;
 }
 
-void UIDMBox::Create( const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha )
+void UIDMBox::Create(const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha)
 {
-	InitFrame(NULL, rect, 0, "facfont-20");
+    InitFrame(NULL, rect, 0, "facfont-20");
 
-	if (!m_fontbold) {
-		m_fontbold = new UIFont("facfont-20");
-	}
+    if (!m_fontbold) {
+        m_fontbold = new UIFont("facfont-20");
+    }
 
-	m_fontbold->setColor(URed);
-	setBackgroundColor(back, true);
-	setForegroundColor(fore);
-	setBackgroundAlpha(alpha);
+    m_fontbold->setColor(URed);
+    setBackgroundColor(back, true);
+    setForegroundColor(fore);
+    setBackgroundAlpha(alpha);
 
-	Connect(this, W_SizeChanged, W_SizeChanged);
-	OnSizeChanged(NULL);
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    OnSizeChanged(NULL);
 
-	m_movespeed = rect.size.height * 3.0;
+    m_movespeed = rect.size.height * 3.0;
 
-	setShowState();
+    setShowState();
 }
 
-void UIDMBox::MoveInEvent( Event *ev )
+void UIDMBox::MoveInEvent(Event *ev) {}
+
+void UIDMBox::DecayEvent(Event *ev)
 {
+    RemoveTopItem();
+    if (m_numitems) {
+        PostDecayEvent();
+    }
 }
 
-void UIDMBox::DecayEvent( Event *ev )
+void UIDMBox::Draw(void)
 {
-	RemoveTopItem();
-	if (m_numitems) {
-		PostDecayEvent();
-	}
+    float fsY;
+    int   i;
+    float alpha;
+    float alphaScale;
+
+    alphaScale = 0.8f;
+    HandleBoxMoving();
+
+    if (!m_numitems) {
+        //
+        // Nothing to show
+        //
+        return;
+    }
+
+    m_font->setColor(m_foreground_color);
+    alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    alpha = (1.0 - alpha) * 4.0;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    if (cge) {
+        alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
+    }
+
+    fsY = DrawItem(m_items, s_dmboxOffsetX, s_dmboxOffsetY, alpha * alphaScale);
+    fsY = alpha <= 0.2 ? s_dmboxOffsetY : fsY + s_dmboxOffsetY;
+
+    for (i = 1; i < m_numitems; i++) {
+        fsY += DrawItem(&m_items[i], s_dmboxOffsetX, fsY, alphaScale);
+        if (fsY > m_frame.size.height) {
+            if (EventPending(EV_DMBox_Decay)) {
+                CancelEventsOfType(EV_DMBox_Decay);
+            }
+
+            PostEvent(EV_DMBox_Decay, 0.0);
+            break;
+        }
+    }
 }
 
-void UIDMBox::Draw( void )
+void UIDMBox::setRealShow(bool b)
 {
-	float fsY;
-	int i;
-	float alpha;
-	float alphaScale;
-
-	alphaScale = 0.8f;
-	HandleBoxMoving();
-
-	if (!m_numitems) {
-		//
-		// Nothing to show
-		//
-		return;
-	}
-
-	m_font->setColor(m_foreground_color);
-	alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
-	if (alpha > 1.0) alpha = 1.0;
-
-	alpha = (1.0 - alpha) * 4.0;
-	if (alpha > 1.0) alpha = 1.0;
-
-	if (cge) {
-		alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
-	}
-
-	fsY = DrawItem(m_items, s_dmboxOffsetX, s_dmboxOffsetY, alpha * alphaScale);
-	fsY = alpha <= 0.2 ? s_dmboxOffsetY : fsY + s_dmboxOffsetY;
-
-	for (i = 1; i < m_numitems; i++)
-	{
-		fsY += DrawItem(&m_items[i], s_dmboxOffsetX, fsY, alphaScale);
-		if (fsY > m_frame.size.height)
-		{
-			if (EventPending(EV_DMBox_Decay)) {
-				CancelEventsOfType(EV_DMBox_Decay);
-			}
-
-			PostEvent(EV_DMBox_Decay, 0.0);
-			break;
-		}
-	}
+    this->m_reallyshown = b;
+    setShowState();
 }
 
-void UIDMBox::setRealShow( bool b )
+void UIDMBox::Clear(void)
 {
-	this->m_reallyshown = b;
-	setShowState();
-}
-
-void UIDMBox::Clear( void )
-{
-	m_numitems = 0;
+    m_numitems = 0;
 }
diff --git a/code/client/cl_uidmbox.h b/code/client/cl_uidmbox.h
index cf8660e1..a02dab84 100644
--- a/code/client/cl_uidmbox.h
+++ b/code/client/cl_uidmbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIDMBOX_H__
-#define __CL_UIDMBOX_H__
+#pragma once
 
 static constexpr unsigned int DMBOX_ITEM_FLAG_BOLD = 2u;
 static constexpr unsigned int DMBOX_ITEM_FLAG_DEATH = 4u;
@@ -47,6 +46,8 @@ protected:
 	int m_movespeed;
 	int m_iBeginDecay;
 	int m_iEndDecay;
+	// Added in OPM
+	bool m_drawoutline;
 
 public:
 	CLASS_PROTOTYPE( UIDMBox );
@@ -75,5 +76,3 @@ public:
 	void		setRealShow( bool b );
 	void		Clear( void );
 };
-
-#endif /* __CL_UIDMBOX_H__ */
diff --git a/code/client/cl_uifilepicker.cpp b/code/client/cl_uifilepicker.cpp
index 9ccadb61..ad8914c9 100644
--- a/code/client/cl_uifilepicker.cpp
+++ b/code/client/cl_uifilepicker.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,72 +22,256 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( USignal, FilePickerClass, NULL )
+class FilePickerItem : public UIListCtrlItem
 {
-	{ NULL, NULL }
+    str strings[3];
+
+public:
+    FilePickerItem(const str& fileName, const str& date, const str& size);
+    int            getListItemValue(int which) const override;
+    griditemtype_t getListItemType(int which) const override;
+    str            getListItemString(int which) const override;
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+};
+
+CLASS_DECLARATION(USignal, FilePickerClass, NULL) {
+    {&EV_UIListBase_ItemSelected,      &FilePickerClass::FileSelected },
+    {&EV_UIListBase_ItemDoubleClicked, &FilePickerClass::FileChosen   },
+    {&W_Deactivated,                   &FilePickerClass::OnDeactivated},
+    {NULL,                             NULL                           }
 };
 
 FilePickerClass::FilePickerClass()
 {
-	// FIXME: stub
+    window = new UIFloatingWindow();
+    window->Create(
+        NULL,
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
+        "File Picker",
+        UColor(0.15f, 0.195f, 0.278f),
+        UHudColor
+    );
+    window->Connect(this, W_Deactivated, W_Deactivated);
+    listbox = new UIListCtrl();
+    listbox->InitFrame(window->getChildSpace(), window->getChildSpace()->getClientFrame(), 0);
+    listbox->setBackgroundColor(UColor(0.02f, 0.07f, 0.005f), true);
+    listbox->setForegroundColor(UHudColor);
+    listbox->AddColumn("File Name", 0, 175, false, false);
+    listbox->AddColumn("Date", 1, 125, false, false);
+    listbox->AddColumn("Size", 2, 100, true, false);
+
+    listbox->Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
+    listbox->Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
+    listbox->AllowActivate(true);
+
+    // Added in 2.0
+    //  Don't localize elements
+    listbox->SetDontLocalize();
 }
 
 FilePickerClass::~FilePickerClass()
 {
-	// FIXME: stub
+    if (listbox) {
+        delete listbox;
+        listbox = NULL;
+    }
+
+    if (window) {
+        delete window;
+        window = NULL;
+    }
 }
 
-void FilePickerClass::SetupFiles( void )
+void FilePickerClass::Setup(
+    const char *root_directory, const char *current_directory, const char *ext, const char *ignore_files
+)
 {
-	// FIXME: stub
+    Initialize(root_directory, current_directory, ext, ignore_files);
 }
 
-void FilePickerClass::GotoParentDirectory( void )
+void FilePickerClass::Initialize(
+    const char *root_directory, const char *current_directory, const char *ext, const char *ignore_files
+)
 {
-	// FIXME: stub
+    rootDirectory = root_directory;
+    if (rootDirectory.length() > 1 && rootDirectory[rootDirectory.length() - 1] != '/') {
+        rootDirectory += "/";
+    }
+
+    currentDirectory = current_directory;
+    if (currentDirectory.length() > 1 && currentDirectory[currentDirectory.length() - 1] != '/') {
+        currentDirectory += "/";
+    }
+
+    extension = ext;
+    if (ignore_files) {
+        ignoredFiles = ignore_files;
+    }
+
+    SetupFiles();
 }
 
-void FilePickerClass::GotoSubDirectory( str subdir )
+void FilePickerClass::GotoParentDirectory(void)
 {
-	// FIXME: stub
+    int i;
+
+    if (currentDirectory == rootDirectory) {
+        return;
+    }
+
+    for (i = currentDirectory.length() - 2; i > 0; i--) {
+        if (currentDirectory[i] == '/') {
+            break;
+        }
+    }
+
+    if (currentDirectory[i] == '/') {
+        i++;
+    }
+
+    currentDirectory = str(currentDirectory, 0, i);
+
+    // refresh files
+    SetupFiles();
 }
 
-void FilePickerClass::Initialize( const char *root_directory, const char *current_directory, const char *ext )
+void FilePickerClass::GotoSubDirectory(str subdir)
 {
-	// FIXME: stub
+    currentDirectory += subdir + "/";
+
+    // refresh files
+    SetupFiles();
 }
 
-void FilePickerClass::CloseWindow( void )
+void FilePickerClass::SetupFiles(void)
 {
-	// FIXME: stub
+    str    mappath;
+    str    work;
+    char **filenames;
+    int    numfiles;
+    int    i;
+    char   date[128];
+    char   size[128];
+
+    listbox->DeleteAllItems();
+
+    if (currentDirectory != rootDirectory) {
+        // create the parent directory item
+        listbox->AddItem(new FilePickerItem("..", "", ""));
+    }
+
+    // retrieve directories
+    filenames = FS_ListFiles(currentDirectory, "/", qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        const char *filename = filenames[i];
+
+        if (filename[0] == '.' || !strlen(filename)) {
+            continue;
+        }
+
+        work = "[";
+        work += filename;
+        work += "]";
+
+        FS_FileTime(currentDirectory + filename, date, size);
+
+        listbox->AddItem(new FilePickerItem(work, date, size));
+    }
+
+    FS_FreeFileList(filenames);
+
+    filenames = FS_ListFiles(currentDirectory, extension, qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        const char *filename = filenames[i];
+
+        if (ignoredFiles.length() && strstr(filename, ignoredFiles)) {
+            // Added in 2.0
+            //  Check for ignored files
+            continue;
+        }
+
+        work = filename;
+
+        FS_FileTime(currentDirectory + work, date, size);
+
+        listbox->AddItem(new FilePickerItem(work, date, size));
+    }
+
+    FS_FreeFileList(filenames);
+
+    window->setTitle(currentDirectory);
 }
 
-void FilePickerClass::FileSelected( Event *ev )
+void FilePickerClass::FileSelected(const str& currentDirectory, const str& partialName, const str& fullname) {}
+
+void FilePickerClass::FileSelected(Event *ev)
 {
-	// FIXME: stub
+    str name = listbox->GetItem(listbox->getCurrentItem())->getListItemString(0);
+
+    if (*name != '[' && *name != '.') {
+        FileSelected(currentDirectory, name, currentDirectory + name);
+    }
+
+    uii.Snd_PlaySound("sound/menu/scroll.wav");
 }
 
-void FilePickerClass::FileSelected( str &currentDirectory, str &partialName, str &fullname )
+void FilePickerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) {}
+
+void FilePickerClass::FileChosen(Event *ev)
 {
-	// FIXME: stub
+    str filename = listbox->GetItem(listbox->getCurrentItem())->getListItemString(0);
+
+    if (*filename == '[') {
+        uii.Snd_PlaySound("sound/menu/scroll.wav");
+
+        GotoSubDirectory(str(filename, 1, filename.length() - 1));
+    } else if (*filename == '.') {
+        GotoParentDirectory();
+    } else {
+        uii.Snd_PlaySound("sound/menu/apply.wav");
+
+        FileChosen(currentDirectory, filename, currentDirectory + filename);
+    }
 }
 
-void FilePickerClass::FileChosen( Event *ev )
+void FilePickerClass::CloseWindow(void)
 {
-	// FIXME: stub
+    PostEvent(EV_Remove, 0);
 }
 
-void FilePickerClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+void FilePickerClass::OnDeactivated(Event *ev)
 {
-	// FIXME: stub
+    CloseWindow();
 }
 
-void FilePickerClass::OnDeactivated( Event  *ev )
+FilePickerItem::FilePickerItem(const str& fileName, const str& date, const str& size)
 {
-	// FIXME: stub
+    strings[0] = fileName;
+    strings[1] = date;
+    strings[2] = size;
 }
 
-void FilePickerClass::Setup( const char *root_directory, const char *current_directory, const char *ext )
+int FilePickerItem::getListItemValue(int which) const
 {
-	// FIXME: stub
+    return atoi(strings[which]);
+}
+
+griditemtype_t FilePickerItem::getListItemType(int which) const
+{
+    return griditemtype_t::TYPE_STRING;
+}
+
+str FilePickerItem::getListItemString(int which) const
+{
+    return strings[which];
+}
+
+void FilePickerItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean FilePickerItem::IsHeaderEntry() const
+{
+    return qfalse;
 }
diff --git a/code/client/cl_uifilepicker.h b/code/client/cl_uifilepicker.h
index db726ea4..9881d9ee 100644
--- a/code/client/cl_uifilepicker.h
+++ b/code/client/cl_uifilepicker.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,40 +20,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIFILEPICKER_H__
-#define __CL_UIFILEPICKER_H__
+#pragma once
 
 class UIListCtrl;
 
-class FilePickerClass : public USignal {
-	UIFloatingWindow *window;
-	UIListCtrl *listbox;
-	str currentDirectory;
-	str rootDirectory;
-	str extension;
+class FilePickerClass : public USignal
+{
+    UIFloatingWindow *window;
+    UIListCtrl       *listbox;
+    str               currentDirectory;
+    str               rootDirectory;
+    str               extension;
+    // Added in 2.0
+    str               ignoredFiles;
 
 public:
-	CLASS_PROTOTYPE( FilePickerClass );
+    CLASS_PROTOTYPE(FilePickerClass);
 
 private:
-	void		SetupFiles( void );
-	void		GotoParentDirectory( void );
-	void		GotoSubDirectory( str subdir );
-	void		Initialize( const char *root_directory, const char *current_directory, const char *ext );
+    void SetupFiles(void);
+    void GotoParentDirectory(void);
+    void GotoSubDirectory(str subdir);
+    // ignore_files parameter, added in 2.0
+    void Initialize(const char *root_directory, const char *current_directory, const char *ext, const char* ignore_files);
 
 protected:
-	void			CloseWindow( void );
-	void			FileSelected( Event *ev );
-	virtual void	FileSelected( str &currentDirectory, str &partialName, str &fullname );
-	void			FileChosen( Event *ev );
-	virtual void	FileChosen( str &currentDirectory, str &partialName, str &fullname );
-	void			OnDeactivated( Event  *ev );
+    void         CloseWindow(void);
+    void         FileSelected(Event *ev);
+    virtual void FileSelected(const str& currentDirectory, const str& partialName, const str& fullname);
+    void         FileChosen(Event *ev);
+    virtual void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname);
+    void         OnDeactivated(Event *ev);
 
 public:
-	FilePickerClass();
-	~FilePickerClass();
+    FilePickerClass();
+    ~FilePickerClass();
 
-	void Setup( const char *root_directory, const char *current_directory, const char *ext );
+    void Setup(const char *root_directory, const char *current_directory, const char *ext, const char* ignore_files = NULL);
 };
-
-#endif /* __CL_UIFILEPICKER_H__ */
diff --git a/code/client/cl_uigamespy.cpp b/code/client/cl_uigamespy.cpp
new file mode 100644
index 00000000..843ae75c
--- /dev/null
+++ b/code/client/cl_uigamespy.cpp
@@ -0,0 +1,118 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// cl_uigamespy.cpp
+#include "cl_uigamespy.h"
+
+CLASS_DECLARATION(UIFloatingWindow, GameSpyDialog, NULL) {
+    {&W_Deactivated, &UIFloatingWindow::ClosePressed},
+    {NULL,           NULL                           }
+};
+
+GameSpyDialog::GameSpyDialog()
+    : overlay(NULL)
+    , label(NULL)
+    , closeButton(NULL)
+{
+    AddFlag(WF_ALWAYS_TOP);
+}
+
+GameSpyDialog::~GameSpyDialog()
+{
+    if (overlay) {
+        delete overlay;
+        overlay = NULL;
+    }
+
+    if (label) {
+        delete label;
+        label = NULL;
+    }
+
+    if (closeButton) {
+        delete closeButton;
+        closeButton = NULL;
+    }
+}
+
+void GameSpyDialog::FrameInitialized(void)
+{
+    UIFloatingWindow::FrameInitialized();
+
+    label = new UILabel();
+
+    label->InitFrame(getChildSpace(), getChildSpace()->getClientFrame(), 0);
+    label->setTitle(
+        "GameSpy's multiplayer matchmaking\n"
+        "and server browsing services, which were\n"
+        "essential for online gaming in many classic\n"
+        "titles including Medal of Honor: Allied Assault,\n"
+        "were permanently shut down in 2014."
+    );
+    label->setForegroundColor(UHudColor);
+
+    closeButton = new UIButton();
+    closeButton->InitFrame(getChildSpace(), UIRect2D(100, 150, 100, 30), 0);
+    closeButton->setTitle("Close");
+    closeButton->AllowActivate(true);
+    closeButton->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    overlay = new UIButton();
+    overlay->InitFrame(NULL, UIRect2D(0, 0, uid.vidWidth, uid.vidHeight), 0);
+    overlay->setBackgroundColor(UColor(0, 0, 0, 0.5f), true);
+    overlay->AllowActivate(true);
+
+    overlay->Connect(this, W_Button_Pressed, W_Deactivated);
+}
+
+void GameSpyDialog::Create(
+    UIWidget *parent, const UIRect2D& rect, const char *title, const UColor& bgColor, const UColor& fgColor
+)
+{
+    // First call parent's Create
+    UIFloatingWindow::Create(parent, rect, title, bgColor, fgColor);
+
+    // After creation, find minimize button by name and hide it
+    for (UIWidget *child = getFirstChild(); child; child = getNextChild(child)) {
+        if (strcmp(child->getName(), "minimizebutton") == 0) {
+            child->setShow(false);
+            break;
+        }
+    }
+}
+
+void UI_LaunchGameSpy_f(void)
+{
+    GameSpyDialog *dialog = new GameSpyDialog();
+
+    dialog->Create(
+        NULL,
+        UIRect2D((uid.vidWidth - 300) / 2, (uid.vidHeight - 200) / 2, 300, 200),
+        "GameSpy",
+        UColor(0.15f, 0.195f, 0.278f),
+        UHudColor
+    );
+
+    uWinMan.ActivateControl(dialog);
+
+    dialog->Connect(dialog, W_Deactivated, W_Deactivated);
+}
diff --git a/code/client/cl_uigamespy.h b/code/client/cl_uigamespy.h
new file mode 100644
index 00000000..8d1117d4
--- /dev/null
+++ b/code/client/cl_uigamespy.h
@@ -0,0 +1,50 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// cl_gamespy.h
+#ifndef __CL_GAMESPY_H__
+#define __CL_GAMESPY_H__
+
+#include "cl_ui.h"
+#include "keycodes.h"
+
+class GameSpyDialog : public UIFloatingWindow
+{
+private:
+    UIButton *overlay;
+    UILabel  *label;
+    UIButton *closeButton;
+
+protected:
+    void FrameInitialized(void) override;
+
+public:
+    GameSpyDialog();
+    ~GameSpyDialog();
+    void
+    Create(UIWidget *parent, const UIRect2D& rect, const char *title, const UColor& bgColor, const UColor& fgColor);
+
+    CLASS_PROTOTYPE(GameSpyDialog);
+};
+
+void UI_LaunchGameSpy_f(void);
+#endif
diff --git a/code/client/cl_uigmbox.cpp b/code/client/cl_uigmbox.cpp
index 82761c1b..18962d4a 100644
--- a/code/client/cl_uigmbox.cpp
+++ b/code/client/cl_uigmbox.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
 Event EV_GMBox_Goin
 (
@@ -40,371 +41,370 @@ Event EV_GMBox_Decay
 	"Event to make the gmbox console line decay"
 );
 
-static float s_gmboxWidth = 640.0;
+static float s_gmboxWidth   = 640.0;
 static float s_gmboxOffsetX = 3.0f;
 static float s_gmboxOffsetY = 0.0f;
 
-CLASS_DECLARATION( UIWidget, UIGMBox, NULL )
-{
-	{ &W_SizeChanged,		&UIGMBox::OnSizeChanged },
-	{ &EV_GMBox_Goin,		&UIGMBox::MoveInEvent },
-	{ &EV_GMBox_Decay,		&UIGMBox::DecayEvent },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIGMBox, NULL) {
+    {&W_SizeChanged,  &UIGMBox::OnSizeChanged},
+    {&EV_GMBox_Goin,  &UIGMBox::MoveInEvent  },
+    {&EV_GMBox_Decay, &UIGMBox::DecayEvent   },
+    {NULL,            NULL                   }
 };
 
 UIGMBox::UIGMBox()
 {
-	m_numitems = 0;
-	m_reallyshown = true;
-	m_fontbold = NULL;
-	m_boxstate = boxstate_t::box_out;
-	m_iBeginDecay = 0;
-	m_boxtime = uid.time;
-	m_movespeed = 500;
+    m_numitems    = 0;
+    m_reallyshown = true;
+    m_fontbold    = NULL;
+    m_boxstate    = boxstate_t::box_out;
+    m_iBeginDecay = 0;
+    m_boxtime     = uid.time;
+    m_movespeed   = 500;
+    m_drawoutline = com_target_game->integer >= target_game_e::TG_MOHTA;
 }
 
-void UIGMBox::VerifyBoxOut( void )
+void UIGMBox::VerifyBoxOut(void)
 {
-	PostMoveinEvent();
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out)
-	{
-		ChangeBoxState(boxstate_t::box_moving_out);
-	}
+    PostMoveinEvent();
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_out) {
+        ChangeBoxState(boxstate_t::box_moving_out);
+    }
 }
 
-void UIGMBox::ChangeBoxState( boxstate_t state )
+void UIGMBox::ChangeBoxState(boxstate_t state)
 {
-	m_boxstate = state;
-	m_boxtime = uid.time;
-	setShowState();
+    m_boxstate = state;
+    m_boxtime  = uid.time;
+    setShowState();
 
-	if (state == box_out) {
-		PostMoveinEvent();
-	}
+    if (state == box_out) {
+        PostMoveinEvent();
+    }
 }
 
-void UIGMBox::HandleBoxMoving( void )
+void UIGMBox::HandleBoxMoving(void)
 {
-	int delta;
-	UIRect2D newRect;
+    int      delta;
+    UIRect2D newRect;
 
-	if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_moving_out && m_boxstate != boxstate_t::box_moving_in) {
+        return;
+    }
 
-	delta = m_movespeed * (uid.time - m_boxtime) / 1000;
-	m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
-	if (m_boxstate == boxstate_t::box_moving_out)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta + m_frame.pos.y;
+    delta     = m_movespeed * (uid.time - m_boxtime) / 1000;
+    m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
+    if (m_boxstate == boxstate_t::box_moving_out) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta + m_frame.pos.y;
 
-		if (newRect.pos.y <= 0.0)
-		{
-			newRect.pos.y = 0.0;
-			ChangeBoxState(boxstate_t::box_out);
-		}
-	}
-	else if (m_boxstate == boxstate_t::box_moving_in)
-	{
-		newRect.size.width = m_frame.size.width;
-		newRect.size.height = m_frame.size.height;
-		newRect.pos.x = m_frame.pos.x;
-		newRect.pos.y = delta - m_frame.pos.y;
+        if (newRect.pos.y <= 0.0) {
+            newRect.pos.y = 0.0;
+            ChangeBoxState(boxstate_t::box_out);
+        }
+    } else if (m_boxstate == boxstate_t::box_moving_in) {
+        newRect.size.width  = m_frame.size.width;
+        newRect.size.height = m_frame.size.height;
+        newRect.pos.x       = m_frame.pos.x;
+        newRect.pos.y       = delta - m_frame.pos.y;
 
-		if (newRect.pos.y <= -newRect.size.height)
-		{
-			newRect.pos.y = -newRect.size.height;
-			ChangeBoxState(boxstate_t::box_in);
-		}
-	} else {
-		newRect = m_frame;
-	}
+        if (newRect.pos.y <= -newRect.size.height) {
+            newRect.pos.y = -newRect.size.height;
+            ChangeBoxState(boxstate_t::box_in);
+        }
+    } else {
+        newRect = m_frame;
+    }
 
-	setFrame(newRect);
+    setFrame(newRect);
 }
 
-void UIGMBox::PostMoveinEvent( void )
+void UIGMBox::PostMoveinEvent(void)
 {
-	if (m_boxstate != boxstate_t::box_out) {
-		return;
-	}
+    if (m_boxstate != boxstate_t::box_out) {
+        return;
+    }
 
-	if (!EventPending(EV_GMBox_Goin)) {
-		PostEvent(EV_GMBox_Goin, 10.0);
-	} else {
-		PostponeEvent(EV_GMBox_Goin, 10.0);
-	}
+    if (!EventPending(EV_GMBox_Goin)) {
+        PostEvent(EV_GMBox_Goin, 10.0);
+    } else {
+        PostponeEvent(EV_GMBox_Goin, 10.0);
+    }
 }
 
-void UIGMBox::PostDecayEvent( void )
+void UIGMBox::PostDecayEvent(void)
 {
-	if (!EventPending(EV_GMBox_Decay))
-	{
-		float fDelayTime;
-		int iNumLines;
-		int i;
-		const char* pszString = m_items[0].string.c_str();
+    if (!EventPending(EV_GMBox_Decay)) {
+        float       fDelayTime;
+        int         iNumLines;
+        int         i;
+        const char *pszString = m_items[0].string.c_str();
 
-		//
-		// Calculate the number of lines
-		//
-		iNumLines = 1;
-		for (i = 0; pszString[i]; i++)
-		{
-			if (pszString[i] == '\n') {
-				iNumLines++;
-			}
-		}
+        //
+        // Calculate the number of lines
+        //
+        iNumLines = 1;
+        for (i = 0; pszString[i]; i++) {
+            if (pszString[i] == '\n') {
+                iNumLines++;
+            }
+        }
 
-		//
-		// Bold as twice more decay
-		//
-		if (m_items[0].flags & GMBOX_ITEM_FLAG_BOLD) {
-			fDelayTime = iNumLines * 10.0;
-		} else {
-			fDelayTime = iNumLines * 5.0;
-		}
+        //
+        // Bold as twice more decay
+        //
+        if (m_items[0].flags & GMBOX_ITEM_FLAG_BOLD) {
+            fDelayTime = iNumLines * 10.0;
+        } else {
+            fDelayTime = iNumLines * 5.0;
+        }
 
-		m_iBeginDecay = cls.realtime;
-		m_iEndDecay = (int)(fDelayTime * 1000.0);
+        m_iBeginDecay = cls.realtime;
+        m_iEndDecay   = (int)(fDelayTime * 1000.0);
 
-		PostEvent(EV_GMBox_Decay, fDelayTime);
-	}
+        PostEvent(EV_GMBox_Decay, fDelayTime);
+    }
 }
 
-void UIGMBox::setShowState( void )
+void UIGMBox::setShowState(void)
 {
-	if (m_reallyshown) {
-		setShow(m_boxstate != box_in);
-	} else {
-		setShow(false);
-	}
+    if (m_reallyshown) {
+        setShow(m_boxstate != box_in);
+    } else {
+        setShow(false);
+    }
 }
 
-void UIGMBox::RemoveTopItem( void )
+void UIGMBox::RemoveTopItem(void)
 {
-	int i;
+    int i;
 
-	if (m_numitems > 0) {
-		for (i = 0; i < m_numitems - 1; i++) {
-			m_items[i] = m_items[i + 1];
-		}
+    if (m_numitems > 0) {
+        for (i = 0; i < m_numitems - 1; i++) {
+            m_items[i] = m_items[i + 1];
+        }
 
-		m_numitems--;
-	}
+        m_numitems--;
+    }
 }
 
-str UIGMBox::CalculateBreaks( UIFont *font, str text, float max_width )
+str UIGMBox::CalculateBreaks(UIFont *font, str text, float max_width)
 {
-	str newText, sTmp;
-	int i;
-	float fX;
-	float fwX, fsX;
+    str         newText;
+    float       fX;
+    float       fwX;
+    const char *current;
+    int         count;
 
-	Cmd_TokenizeString(text.c_str());
-	if (Cmd_Argc())
-	{
-		fX = 0.0;
-		fsX = font->getCharWidth(' ');
+    current = text;
+    fX      = 0.0;
 
-		for (i = 0; i < Cmd_Argc(); i++)
-		{
-			sTmp = Cmd_Argv(i);
+    for (count = font->DBCSGetWordBlockCount(current, -1); count;
+         current += count, count = font->DBCSGetWordBlockCount(current, -1)) {
+        fwX = font->getWidth(current, count);
 
-			fwX = font->getWidth(sTmp.c_str(), -1);
-			if (fwX + i <= max_width)
-			{
-				if (fwX + i + fX <= max_width)
-				{
-					newText += sTmp + " ";
-				} else {
-					newText += "\n" + sTmp + " ";
-				}
-			}
-			else
-			{
-				sTmp += "\n";
-				fX = 0.0;
-			}
-		}
-	} else {
-		newText = "";
-	}
+        if (fX + fwX > max_width) {
+            newText += "\n" + str(current, 0, count);
+            fX = 0;
+        } else {
+            newText += str(current, 0, count);
+        }
 
-	return newText;
+        fX += fwX;
+    }
+
+    return newText;
 }
 
-float UIGMBox::PrintWrap( UIFont *font, float x, float y, str text )
+float UIGMBox::PrintWrap(UIFont *font, float x, float y, str text)
 {
-	const char* p1, * p2;
-	size_t n, l;
-	float fY;
+    const char *p1, *p2;
+    size_t      n, l;
+    float       fY;
 
-	fY = y;
-	p1 = text.c_str();
-	l = text.length();
+    fY = y;
+    p1 = text.c_str();
+    l  = text.length();
 
-	for (;;)
-	{
-		p2 = strchr(p1, '\n');
-		if (!p2) {
-			break;
-		}
+    for (;;) {
+        p2 = strchr(p1, '\n');
+        if (!p2) {
+            break;
+        }
 
-		n = p2 - p1;
-		if (n >= l) {
-			break;
-		}
+        n = p2 - p1;
+        if (n >= l) {
+            break;
+        }
 
-		font->Print(x, fY, p1, p2 - p1, qfalse);
-		p1 = p2 + 1;
-		l -= n;
-		fY += font->getHeight(qfalse);
-	}
+        font->Print(x, fY, p1, p2 - p1, getHighResScale());
+        p1 = p2 + 1;
+        l -= n;
+        fY += font->getHeight();
+    }
 
-	font->Print(x, fY, p1, l, qfalse);
+    if (*p1) {
+        font->Print(x, fY, p1, l, getHighResScale());
+        fY += font->getHeight();
+    }
 
-	return font->getHeight(qfalse) + (fY - y);
+    return fY - y;
 }
 
-float UIGMBox::DrawItem( item_t *in, float x, float y, float alpha )
+float UIGMBox::DrawItem(item_t *in, float x, float y, float alpha)
 {
-	in->font->setColor(in->color);
-	in->font->setAlpha(alpha);
+    if (m_drawoutline) {
+        //
+        // Draw an outline
+        //
 
-	return PrintWrap(in->font, x, y, in->string);
+        in->font->setColor(UBlack);
+        in->font->setAlpha(alpha);
+
+        PrintWrap(in->font, x + 1, y + 2, in->string);
+        PrintWrap(in->font, x + 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y + 2, in->string);
+        PrintWrap(in->font, x - 2, y + 1, in->string);
+        PrintWrap(in->font, x - 1, y - 2, in->string);
+        PrintWrap(in->font, x - 2, y - 1, in->string);
+        PrintWrap(in->font, x + 1, y - 2, in->string);
+        PrintWrap(in->font, x + 2, y - 1, in->string);
+        PrintWrap(in->font, x + 2, y, in->string);
+        PrintWrap(in->font, x - 2, y, in->string);
+        PrintWrap(in->font, x, y + 2, in->string);
+        PrintWrap(in->font, x, y - 2, in->string);
+    }
+
+    in->font->setColor(in->color);
+    in->font->setAlpha(alpha);
+
+    return PrintWrap(in->font, x, y, in->string);
 }
 
-void UIGMBox::Print( const char *text )
+void UIGMBox::Print(const char *text)
 {
-	const char* text1 = text;
+    const char *text1 = text;
 
-	if (m_numitems > 4)
-	{
-		//
-		// Overwrite an item
-		//
-		RemoveTopItem();
-	}
+    if (m_numitems > 4) {
+        //
+        // Overwrite an item
+        //
+        RemoveTopItem();
+    }
 
-	m_items[m_numitems].flags = 0;
+    m_items[m_numitems].flags = 0;
 
-	if (*text == 3)
-	{
-		m_items[m_numitems].color = UWhite;
-		m_items[m_numitems].font = m_fontbold;
-		m_items[m_numitems].flags |= GMBOX_ITEM_FLAG_BOLD;
+    if (*text == MESSAGE_WHITE) {
+        m_items[m_numitems].color = UWhite;
+        m_items[m_numitems].font  = m_fontbold;
+        m_items[m_numitems].flags |= GMBOX_ITEM_FLAG_BOLD;
 
-		text1 = text + 1;
-	}
-	else
-	{
-		m_items[m_numitems].color = m_foreground_color;
-		m_items[m_numitems].font = m_font;
-	}
+        text1 = text + 1;
+    } else {
+        m_items[m_numitems].color = m_foreground_color;
+        m_items[m_numitems].font  = m_font;
+    }
 
-	m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, text1, s_gmboxWidth);
+    m_items[m_numitems].string = CalculateBreaks(m_items[m_numitems].font, Sys_LV_CL_ConvertString(text1), s_gmboxWidth);
 
-	m_numitems++;
-	VerifyBoxOut();
-	PostDecayEvent();
+    m_numitems++;
+    VerifyBoxOut();
+    PostDecayEvent();
 }
 
-void UIGMBox::OnSizeChanged( Event *ev )
+void UIGMBox::OnSizeChanged(Event *ev)
 {
-	s_gmboxWidth = m_frame.size.width;
+    s_gmboxWidth = m_frame.size.width;
 }
 
-void UIGMBox::Create( const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha )
+void UIGMBox::Create(const UIRect2D& rect, const UColor& fore, const UColor& back, float alpha)
 {
-	InitFrame(NULL, rect, 0, "facfont-20");
+    InitFrame(NULL, rect, 0, "facfont-20");
 
-	if (!m_fontbold) {
-		m_fontbold = new UIFont("facfont-20");
-	}
+    if (!m_fontbold) {
+        m_fontbold = new UIFont("facfont-20");
+    }
 
-	m_fontbold->setColor(URed);
-	setBackgroundColor(back, true);
-	setForegroundColor(fore);
-	setBackgroundAlpha(alpha);
+    m_fontbold->setColor(URed);
+    setBackgroundColor(back, true);
+    setForegroundColor(fore);
+    setBackgroundAlpha(alpha);
 
-	Connect(this, W_SizeChanged, W_SizeChanged);
-	OnSizeChanged(NULL);
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    OnSizeChanged(NULL);
 
-	m_movespeed = rect.size.height * 3.0;
+    m_movespeed = rect.size.height * 3.0;
 
-	setShowState();
+    setShowState();
 }
 
-void UIGMBox::MoveInEvent( Event *ev )
+void UIGMBox::MoveInEvent(Event *ev) {}
+
+void UIGMBox::DecayEvent(Event *ev)
 {
+    RemoveTopItem();
+    if (m_numitems) {
+        PostDecayEvent();
+    }
 }
 
-void UIGMBox::DecayEvent( Event *ev )
+void UIGMBox::Draw(void)
 {
-	RemoveTopItem();
-	if (m_numitems) {
-		PostDecayEvent();
-	}
+    float fsY;
+    int   i;
+    float alpha;
+    float alphaScale;
+
+    alphaScale = 1.0;
+    HandleBoxMoving();
+
+    if (!m_numitems) {
+        //
+        // Nothing to show
+        //
+        return;
+    }
+
+    m_font->setColor(m_foreground_color);
+    alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    alpha = (1.0 - alpha) * 4.0;
+    if (alpha > 1.0) {
+        alpha = 1.0;
+    }
+
+    if (cge) {
+        alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
+    }
+
+    fsY = DrawItem(m_items, s_gmboxOffsetX, s_gmboxOffsetY, alpha * alphaScale);
+    fsY = alpha <= 0.2 ? s_gmboxOffsetY : fsY + s_gmboxOffsetY;
+
+    for (i = 1; i < m_numitems; i++) {
+        fsY += DrawItem(&m_items[i], s_gmboxOffsetX, fsY, alphaScale);
+        if (fsY > m_frame.size.height) {
+            if (EventPending(EV_GMBox_Decay)) {
+                CancelEventsOfType(EV_GMBox_Decay);
+            }
+
+            PostEvent(EV_GMBox_Decay, 0.0);
+            break;
+        }
+    }
 }
 
-void UIGMBox::Draw( void )
+void UIGMBox::setRealShow(bool b)
 {
-	float fsY;
-	int i;
-	float alpha;
-	float alphaScale;
-
-	alphaScale = 1.0;
-	HandleBoxMoving();
-
-	if (!m_numitems) {
-		//
-		// Nothing to show
-		//
-		return;
-	}
-
-	m_font->setColor(m_foreground_color);
-	alpha = (float)(cls.realtime - m_iBeginDecay) / (float)m_iEndDecay;
-	if (alpha > 1.0) alpha = 1.0;
-
-	alpha = (1.0 - alpha) * 4.0;
-	if (alpha > 1.0) alpha = 1.0;
-
-	if (cge) {
-		alphaScale = 1.0 - cge->CG_GetObjectiveAlpha();
-	}
-
-	fsY = DrawItem(m_items, s_gmboxOffsetX, s_gmboxOffsetY, alpha * alphaScale);
-	fsY = alpha <= 0.2 ? s_gmboxOffsetY : fsY + s_gmboxOffsetY;
-
-	for (i = 1; i < m_numitems; i++)
-	{
-		fsY += DrawItem(&m_items[i], s_gmboxOffsetX, fsY, alphaScale);
-		if (fsY > m_frame.size.height)
-		{
-			if (EventPending(EV_GMBox_Decay)) {
-				CancelEventsOfType(EV_GMBox_Decay);
-			}
-
-			PostEvent(EV_GMBox_Decay, 0.0);
-			break;
-		}
-	}
+    this->m_reallyshown = b;
+    setShowState();
 }
 
-void UIGMBox::setRealShow( bool b )
+void UIGMBox::Clear(void)
 {
-	this->m_reallyshown = b;
-	setShowState();
+    m_numitems = 0;
 }
-
-void UIGMBox::Clear( void )
-{
-	m_numitems = 0;
-}
-
diff --git a/code/client/cl_uigmbox.h b/code/client/cl_uigmbox.h
index 6a904515..4090b45d 100644
--- a/code/client/cl_uigmbox.h
+++ b/code/client/cl_uigmbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIGMBOX_H__
-#define __CL_UIGMBOX_H__
+#pragma once
 
 static constexpr unsigned int GMBOX_ITEM_FLAG_BOLD = 1u;
 
@@ -44,6 +43,8 @@ protected:
 	int m_movespeed;
 	int m_iBeginDecay;
 	int m_iEndDecay;
+	// Added in OPM
+	bool m_drawoutline;
 
 public:
 	CLASS_PROTOTYPE( UIGMBox );
@@ -72,5 +73,3 @@ public:
 	void		setRealShow( bool b );
 	void		Clear( void );
 };
-
-#endif
diff --git a/code/client/cl_uilangame.cpp b/code/client/cl_uilangame.cpp
index 70d788d2..e821a464 100644
--- a/code/client/cl_uilangame.cpp
+++ b/code/client/cl_uilangame.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,44 +21,224 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIListCtrl, UILANGameClass, NULL )
+class LANGameItem : public UIListCtrlItem
 {
-	{ NULL, NULL }
+    str strings[6];
+
+public:
+    LANGameItem();
+    LANGameItem(
+        const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
+    );
+
+    int            getListItemValue(int which) const override;
+    griditemtype_t getListItemType(int which) const override;
+    str            getListItemString(int which) const override;
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+};
+
+Event EV_LANGame_JoinGame
+(
+    "joingame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Join the currently selected server"
+);
+
+CLASS_DECLARATION(UIListCtrl, UILANGameClass, NULL) {
+    {&EV_UIListBase_ItemSelected,      &UILANGameClass::SelectServer},
+    {&EV_UIListBase_ItemDoubleClicked, &UILANGameClass::JoinServer  },
+    {&EV_LANGame_JoinGame,             &UILANGameClass::JoinServer  },
+    {NULL,                             NULL                         }
 };
 
 UILANGameClass::UILANGameClass()
 {
-	// FIXME: stub
+    Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
+    Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
+    AllowActivate(true);
+    setHeaderFont("facfont-20");
+
+    m_iLastUpdateTime = 0;
+    m_noservers_mat   = uWinMan.RegisterShader("textures/menu/noservers");
+
+    //
+    // Added in OPM
+    //
+    m_bVirtual = false;
 }
 
-void UILANGameClass::SetupServers( void )
+void UILANGameClass::Draw(void)
 {
-	// FIXME: stub
+    if (cls.bNewLocalServerInfo) {
+        SetupServers();
+    }
+
+    UIListCtrl::Draw();
+
+    if (!getNumItems() && m_noservers_mat) {
+        float x, y, w, h;
+
+        w = re.GetShaderWidth(m_noservers_mat->GetMaterial()) * m_vVirtualScale[0];
+        h = re.GetShaderHeight(m_noservers_mat->GetMaterial()) * m_vVirtualScale[1];
+
+        UIRect2D frame = getClientFrame();
+        x              = (frame.size.width - w) * 0.5f;
+        y              = (frame.size.height - h) * 0.5f;
+
+        re.DrawStretchPic(x, y, w, h, 0, 0, 1, 1, m_noservers_mat->GetMaterial());
+    }
+
+    if (m_iLastUpdateTime && m_iLastUpdateTime < cls.realtime) {
+        Cvar_Set("cl_langamerefreshstatus", "Ready");
+        m_iLastUpdateTime = 0;
+    }
 }
 
-void UILANGameClass::Draw( void )
+void UILANGameClass::UpdateUIElement(void)
 {
-	// FIXME: stub
+    float width;
+
+    RemoveAllColumns();
+
+    width = getClientFrame().size.width - 16.f;
+
+    AddColumn(Sys_LV_CL_ConvertString("Server Name"), 0, width * 0.27f, false, false); // was 0.4
+    AddColumn(Sys_LV_CL_ConvertString("Map"), 1, width * 0.12f, false, false); // was 0.15
+    AddColumn(Sys_LV_CL_ConvertString("Players"), 2, width * 0.08f, true, true); // was 0.165
+    AddColumn(Sys_LV_CL_ConvertString("GameType"), 3, width * 0.118f, false, false); // was 0.22
+    AddColumn(Sys_LV_CL_ConvertString("Ping"), 4, width * 0.052f, true, false); // was 0.065
+    AddColumn(Sys_LV_CL_ConvertString("IP"), 5, width * 0.36f, false, false); // Added in OPM
+
+    uWinMan.ActivateControl(this);
+
+    SetupServers();
 }
 
-void UILANGameClass::SelectServer( Event *ev )
+void UILANGameClass::SetupServers(void)
 {
-	// FIXME: stub
+    int                 i;
+    LANGameItem        *pItem;
+    const serverInfo_t *pServerInfo;
+
+    for (i = 1; i <= cls.numlocalservers; i++) {
+        pServerInfo = &cls.localServers[i - 1];
+
+        if (i > getNumItems()) {
+            pItem = new LANGameItem();
+            AddItem(pItem);
+        } else {
+            pItem = static_cast<LANGameItem *>(GetItem(i));
+        }
+
+        *pItem = LANGameItem(
+            pServerInfo->hostName,
+            pServerInfo->mapName,
+            va("%02i/%02i", pServerInfo->clients, pServerInfo->maxClients),
+            pServerInfo->gameTypeString,
+            str(pServerInfo->ping),
+            // Added in OPM
+            NET_AdrToStringwPort(pServerInfo->adr)
+        );
+    }
+
+    while (cls.numlocalservers < getNumItems()) {
+        DeleteItem(getNumItems());
+    }
+
+    cls.bNewLocalServerInfo = false;
+    m_iLastUpdateTime       = 0;
 }
 
-void UILANGameClass::JoinServer( Event *ev )
+void UILANGameClass::SelectServer(Event *ev)
 {
-	// FIXME: stub
+    const serverInfo_t& serverInfo = cls.localServers[getCurrentItem() - 1];
+    static const char   info[]     = "\xFF\xFF\xFF\xFF\x02getinfo xxx";
+
+    Com_Printf("Requesting updated info from server...\n");
+    Cvar_Set("cl_langamerefreshstatus", "Requesting updated info from server...");
+
+    NET_SendPacket(NS_CLIENT, sizeof(info), info, serverInfo.adr);
+    m_iLastUpdateTime = cls.realtime + 3000;
 }
 
-qboolean UILANGameClass::KeyEvent( int key, unsigned int time )
+void UILANGameClass::JoinServer(Event *ev)
 {
-	// FIXME: stub
-	return qfalse;
+    if (!getCurrentItem()) {
+        return;
+    }
+
+    const serverInfo_t& serverInfo = cls.localServers[getCurrentItem() - 1];
+
+    UI_SetReturnMenuToCurrent();
+    CL_Connect(NET_AdrToStringwPort(serverInfo.adr), netadrtype_t::NA_UNSPEC);
 }
 
-void UILANGameClass::UpdateUIElement( void )
+qboolean UILANGameClass::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    switch (key) {
+    case K_ENTER:
+    case K_KP_ENTER:
+        JoinServer(NULL);
+        return true;
+    case K_UPARROW:
+        if (getCurrentItem() > 1) {
+            TrySelectItem(getCurrentItem() - 1);
+            SelectServer(NULL);
+        }
+        return false;
+    case K_DOWNARROW:
+        if (getCurrentItem() < getNumItems()) {
+            TrySelectItem(getCurrentItem() + 1);
+            SelectServer(NULL);
+        }
+        return false;
+    }
+
+    return UIListBase::KeyEvent(key, time);
+}
+
+LANGameItem::LANGameItem() {}
+
+LANGameItem::LANGameItem(
+    const str& hostName, const str& mapName, const str& players, const str& gameTypeString, const str& ping, const str& ipAddress
+)
+{
+    strings[0] = hostName;
+    strings[1] = mapName;
+    strings[2] = players;
+    strings[3] = gameTypeString;
+    strings[4] = ping;
+
+    //
+    // Added in OPM
+    //
+
+    strings[5] = ipAddress;
+}
+
+int LANGameItem::getListItemValue(int which) const
+{
+    return atoi(strings[which]);
+}
+
+griditemtype_t LANGameItem::getListItemType(int which) const
+{
+    return griditemtype_t::TYPE_STRING;
+}
+
+str LANGameItem::getListItemString(int which) const
+{
+    return strings[which];
+}
+
+void LANGameItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean LANGameItem::IsHeaderEntry() const
+{
+    return qfalse;
 }
diff --git a/code/client/cl_uilangame.h b/code/client/cl_uilangame.h
index 2351a6c6..c374cb81 100644
--- a/code/client/cl_uilangame.h
+++ b/code/client/cl_uilangame.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,29 +20,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UILANGAME_H__
-#define __CL_UILANGAME_H__
+#pragma once
 
-class UILANGameClass : public UIListCtrl {
+class UILANGameClass : public UIListCtrl
+{
 protected:
-	int m_iLastUpdateTime;
-	UIReggedMaterial *m_noservers_mat;
+    int               m_iLastUpdateTime;
+    UIReggedMaterial *m_noservers_mat;
 
 public:
-	CLASS_PROTOTYPE( UILANGameClass );
+    CLASS_PROTOTYPE(UILANGameClass);
 
 private:
-	void		SetupServers( void );
+    void SetupServers(void);
 
 protected:
-	void		Draw( void ) override;
-	void		SelectServer( Event *ev );
-	void		JoinServer( Event *ev );
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		UpdateUIElement( void ) override;
+    void     Draw(void) override;
+    void     SelectServer(Event *ev);
+    void     JoinServer(Event *ev);
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     UpdateUIElement(void) override;
 
 public:
-	UILANGameClass();
+    UILANGameClass();
 };
-
-#endif /* __CL_UILANGAME_H__ */
diff --git a/code/client/cl_uiloadsave.cpp b/code/client/cl_uiloadsave.cpp
index f0e9c9f1..206bb38b 100644
--- a/code/client/cl_uiloadsave.cpp
+++ b/code/client/cl_uiloadsave.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,63 +21,359 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIListCtrl, UIFAKKLoadGameClass, NULL )
+class FAKKLoadGameItem : public UIListCtrlItem
 {
-	{ NULL, NULL }
+    str strings[4];
+
+public:
+    FAKKLoadGameItem(const str& missionName, const str& elapsedTime, const str& dateTime, const str& fileName);
+
+    int            getListItemValue(int which) const override;
+    griditemtype_t getListItemType(int which) const override;
+    str            getListItemString(int which) const override;
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+};
+
+static UIFAKKLoadGameClass *loadgame_ui = NULL;
+
+Event EV_FAKKLoadGame_LoadGame
+(
+    "loadgame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Load the currently selected game"
+);
+Event EV_FAKKLoadGame_RemoveGame
+(
+    "removegame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Delete the currently selected game"
+);
+Event EV_FAKKLoadGame_DeleteGame
+(
+    "deletegame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Delete the currently selected game... for real"
+);
+Event EV_FAKKLoadGame_NoDeleteGame
+(
+    "nodeletegame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Delete the currently selected game... for real"
+);
+Event EV_FAKKLoadGame_SaveGame
+(
+    "savegame",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Save the currently selected game"
+);
+
+CLASS_DECLARATION(UIListCtrl, UIFAKKLoadGameClass, NULL) {
+    {&EV_UIListBase_ItemSelected,      &UIFAKKLoadGameClass::SelectGame  },
+    {&EV_UIListBase_ItemDoubleClicked, &UIFAKKLoadGameClass::LoadGame    },
+    {&EV_FAKKLoadGame_RemoveGame,      &UIFAKKLoadGameClass::RemoveGame  },
+    {&EV_FAKKLoadGame_DeleteGame,      &UIFAKKLoadGameClass::DeleteGame  },
+    {&EV_FAKKLoadGame_NoDeleteGame,    &UIFAKKLoadGameClass::NoDeleteGame},
+    {&EV_FAKKLoadGame_LoadGame,        &UIFAKKLoadGameClass::LoadGame    },
+    {&EV_FAKKLoadGame_SaveGame,        &UIFAKKLoadGameClass::SaveGame    },
+    {NULL,                             NULL                              }
 };
 
 UIFAKKLoadGameClass::UIFAKKLoadGameClass()
 {
-	// FIXME: stub
+    Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
+    Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
+    AllowActivate(true);
+    m_bRemovePending = false;
+
+    setHeaderFont("facfont-20");
+    loadgame_ui = this;
 }
 
-void UIFAKKLoadGameClass::SelectGame( Event *ev )
+UIFAKKLoadGameClass::~UIFAKKLoadGameClass()
 {
-	// FIXME: stub
+    loadgame_ui = NULL;
 }
 
-void UIFAKKLoadGameClass::LoadGame( Event *ev )
+void UIFAKKLoadGameClass::UpdateUIElement(void)
 {
-	// FIXME: stub
+    float width;
+
+    RemoveAllColumns();
+
+    width = getClientFrame().size.width;
+    AddColumn(Sys_LV_CL_ConvertString("Mission"), 0, width * 0.555, false, false);
+    AddColumn(Sys_LV_CL_ConvertString("Elapsed Time"), 1, width * 0.17f, true, true);
+    AddColumn(Sys_LV_CL_ConvertString("Date & Time Logged"), 2, width * 0.275f, true, true);
+
+    uWinMan.ActivateControl(this);
+
+    SetupFiles();
 }
 
-void UIFAKKLoadGameClass::SaveGame( Event *ev )
+void UIFAKKLoadGameClass::SetupFiles(void)
 {
-	// FIXME: stub
+    char      **filenames;
+    int         numfiles;
+    int         i;
+    const char *searchFolder = Com_GetArchiveFolder();
+
+    // cleanup
+    DeleteAllItems();
+
+    filenames = FS_ListFiles(searchFolder, "ssv", qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        const char      *filename;
+        str              work;
+        str              gametime;
+        str              date;
+        fileHandle_t     f;
+        savegamestruct_t save;
+
+        filename = filenames[i];
+        work     = searchFolder;
+        work += "/";
+        work += filename;
+
+        FS_FOpenFileRead(work, &f, qfalse, qtrue);
+        if (!f) {
+            continue;
+        }
+
+        FS_Read(&save, sizeof(savegamestruct_t), f);
+        FS_FCloseFile(f);
+        Com_SwapSaveStruct(&save);
+
+        if (save.version != SAVEGAME_STRUCT_VERSION) {
+            // wrong save game version
+            continue;
+        }
+
+        if (save.type != com_target_game->integer) {
+            continue;
+        }
+
+        gametime = (save.mapTime / 1000);
+        date     = save.time;
+
+        AddItem(new FAKKLoadGameItem(save.comment, gametime, date, save.saveName));
+    }
+
+    FS_FreeFileList(filenames);
+
+    // sort by date
+    SortByColumn(2);
+
+    // select the first item
+    TrySelectItem(1);
+    SelectGame(NULL);
 }
 
-void UIFAKKLoadGameClass::RemoveGame( Event *ev )
+void UIFAKKLoadGameClass::SelectGame(Event *ev)
 {
-	// FIXME: stub
+    UIWidget   *wid;
+    const char *shotName;
+
+    if (getCurrentItem() > 0) {
+        shotName = Com_GetArchiveFileName(GetItem(getCurrentItem())->getListItemString(3), "tga");
+    } else {
+        shotName = "textures/menu/no_saved_games.tga";
+    }
+
+    wid = findSibling("LoadSaveShot");
+    if (!wid) {
+        return;
+    }
+
+    wid->setMaterial(uWinMan.RefreshShader(shotName));
 }
 
-void UIFAKKLoadGameClass::DeleteGame( Event *ev )
+void UIFAKKLoadGameClass::RemoveGame(Event *ev)
 {
-	// FIXME: stub
+    if (m_bRemovePending || getCurrentItem() <= 0) {
+        return;
+    }
+
+    Cbuf_ExecuteText(
+        EXEC_NOW,
+        "dialog \"\" \"\" \"widgetcommand LoadSaveList deletegame\" \"widgetcommand LoadSaveList nodeletegame\" 256 64 "
+        "confirm_delete menu_button_trans menu_button_trans\n"
+    );
+    m_bRemovePending = true;
 }
 
-void UIFAKKLoadGameClass::NoDeleteGame( Event *ev )
+void UIFAKKLoadGameClass::NoDeleteGame(Event *ev)
 {
-	// FIXME: stub
+    m_bRemovePending = false;
 }
 
-qboolean UIFAKKLoadGameClass::KeyEvent( int key, unsigned int time )
+void UIFAKKLoadGameClass::DeleteGame(Event *ev)
 {
-	// FIXME: stub
-	return qfalse;
+    str     name;
+    cvar_t *var;
+    m_bRemovePending = false;
+
+    if (getCurrentItem() <= 0) {
+        return;
+    }
+
+    name = GetItem(getCurrentItem())->getListItemString(3);
+    var  = Cvar_Get("g_lastsave", "", 0);
+
+    if (!strcmp(name, var->string)) {
+        // Make sure the last save is not the save being deleted
+        Cvar_Set("g_lastsave", "");
+    }
+
+    Com_WipeSavegame(name);
+    SetupFiles();
 }
 
-void UIFAKKLoadGameClass::UpdateUIElement( void )
+void UIFAKKLoadGameClass::LoadGame(Event *ev)
 {
-	// FIXME: stub
+    char cmdString[266];
+    str  name;
+
+    if (getCurrentItem() <= 0) {
+        return;
+    }
+
+    name = GetItem(getCurrentItem())->getListItemString(3);
+    // Execute the command
+    Com_sprintf(cmdString, sizeof(cmdString), "loadgame %s\n", name.c_str());
+    Cbuf_AddText(cmdString);
 }
 
-void UIFAKKLoadGameClass::SetupFiles( void )
+void UIFAKKLoadGameClass::SaveGame(Event *ev)
 {
-	// FIXME: stub
+    Cbuf_ExecuteText(EXEC_NOW, "savegame");
 }
 
-void UI_SetupFiles( void ) {
-	// FIXME: stub
+qboolean UIFAKKLoadGameClass::KeyEvent(int key, unsigned int time)
+{
+    switch (key) {
+    case K_DEL:
+        RemoveGame(NULL);
+        return qtrue;
+    case K_ENTER:
+    case K_KP_ENTER:
+        LoadGame(NULL);
+        return qtrue;
+    case K_UPARROW:
+        if (getCurrentItem() > 1) {
+            TrySelectItem(getCurrentItem() - 1);
+            SelectGame(NULL);
+            return qtrue;
+        }
+        break;
+    case K_DOWNARROW:
+        if (getCurrentItem() < getNumItems()) {
+            TrySelectItem(getCurrentItem() + 1);
+            SelectGame(NULL);
+            return qtrue;
+        }
+        break;
+    default:
+        return UIListCtrl::KeyEvent(key, time);
+    }
+
+    return qfalse;
+}
+
+void UI_SetupFiles(void)
+{
+    if (loadgame_ui && loadgame_ui->getShow()) {
+        loadgame_ui->SetupFiles();
+    }
+}
+
+FAKKLoadGameItem::FAKKLoadGameItem(
+    const str& missionName, const str& elapsedTime, const str& dateTime, const str& fileName
+)
+{
+    strings[0] = missionName;
+    strings[1] = elapsedTime;
+    strings[2] = dateTime;
+    strings[3] = fileName;
+}
+
+int FAKKLoadGameItem::getListItemValue(int which) const
+{
+    return atoi(strings[which]);
+}
+
+griditemtype_t FAKKLoadGameItem::getListItemType(int which) const
+{
+    return griditemtype_t::TYPE_STRING;
+}
+
+str FAKKLoadGameItem::getListItemString(int which) const
+{
+    str itemstring;
+
+    switch (which) {
+    case 0:
+    case 3:
+        itemstring = strings[which];
+        break;
+    case 1:
+        {
+            int numseconds;
+            int numseconds_hours;
+            int seconds;
+
+            // hours
+            numseconds = atol(strings[1]);
+            itemstring += (numseconds / 3600);
+            itemstring += ":";
+
+            // minutes
+            numseconds_hours = numseconds % 3600;
+            if (numseconds_hours / 60 < 10) {
+                itemstring += "0";
+            }
+            itemstring += (numseconds_hours / 60);
+            itemstring += ":";
+
+            // seconds
+            seconds = numseconds_hours % 60;
+            if (seconds < 10) {
+                itemstring += "0";
+            }
+            itemstring += seconds;
+        }
+        break;
+    case 2:
+        {
+            time_t time;
+            char   buffer[2048];
+
+            time = atol(strings[2]);
+            strftime(buffer, sizeof(buffer), "%a %b %d %Y %H:%M:%S", localtime(&time));
+            itemstring = buffer;
+        }
+        break;
+    }
+
+    return itemstring;
+}
+
+void FAKKLoadGameItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean FAKKLoadGameItem::IsHeaderEntry() const
+{
+    return qfalse;
 }
diff --git a/code/client/cl_uiloadsave.h b/code/client/cl_uiloadsave.h
index 5f9deca9..4b29f48f 100644
--- a/code/client/cl_uiloadsave.h
+++ b/code/client/cl_uiloadsave.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,38 +20,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UILOADSAVE_H__
-#define __CL_UILOADSAVE_H__
+#pragma once
 
-class UIFAKKLoadGameClass : public UIListCtrl { 
-	bool m_bRemovePending; 
+class UIFAKKLoadGameClass : public UIListCtrl
+{
+    bool m_bRemovePending;
 
 public:
-	CLASS_PROTOTYPE( UIFAKKLoadGameClass );
+    CLASS_PROTOTYPE(UIFAKKLoadGameClass);
 
 protected:
-	void		SelectGame( Event *ev );
-	void		LoadGame( Event *ev );
-	void		SaveGame( Event *ev );
-	void		RemoveGame( Event *ev );
-	void		DeleteGame( Event *ev );
-	void		NoDeleteGame( Event *ev );
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		UpdateUIElement( void ) override;
+    void     SelectGame(Event *ev);
+    void     LoadGame(Event *ev);
+    void     SaveGame(Event *ev);
+    void     RemoveGame(Event *ev);
+    void     DeleteGame(Event *ev);
+    void     NoDeleteGame(Event *ev);
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     UpdateUIElement(void) override;
+
 public:
-	UIFAKKLoadGameClass();
+    UIFAKKLoadGameClass();
+    ~UIFAKKLoadGameClass();
 
-	void	SetupFiles( void );
+    void SetupFiles(void);
 };
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void UI_SetupFiles( void );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif 
diff --git a/code/client/cl_uimaprotationsetup.cpp b/code/client/cl_uimaprotationsetup.cpp
new file mode 100644
index 00000000..3189d19f
--- /dev/null
+++ b/code/client/cl_uimaprotationsetup.cpp
@@ -0,0 +1,457 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cl_ui.h"
+#include "cl_uimaprotationsetup.h"
+
+Event EV_MapListBox_RefreshMapList
+(
+    "RefreshMapList",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Refreshes the map list."
+);
+
+Event EV_MapRotationListBox_RefreshRotationList
+(
+    "RefreshRotationList",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Refreshed the map rotation list."
+);
+
+CLASS_DECLARATION(UIListBox, UIMapRotationListBox, NULL) {
+    {&EV_MapRotationListBox_RefreshRotationList, &UIMapRotationListBox::RefreshRotationList},
+    {NULL,                                       NULL                                      }
+};
+
+UIMapRotationListBox::UIMapRotationListBox() {}
+
+void UIMapRotationListBox::RefreshRotationList(Event *ev)
+{
+    DeleteAllItems();
+    PopulateRotationList();
+}
+
+void UIMapRotationListBox::PopulateRotationList()
+{
+    cvar_t     *filter;
+    cvar_t     *maplistVar;
+    const char *token;
+    char        mapBuffer[1024];
+
+    filter = Cvar_Get("g_maprotation_filter", "ffa", 0);
+    if (!Q_stricmp(filter->string, "obj")) {
+        maplistVar = Cvar_Get("ui_maplist_obj", "", 0);
+    } else if (!Q_stricmp(filter->string, "tow")) {
+        maplistVar = Cvar_Get("ui_maplist_tow", "", 0);
+    } else if (!Q_stricmp(filter->string, "lib")) {
+        maplistVar = Cvar_Get("ui_maplist_lib", "", 0);
+    } else if (!Q_stricmp(filter->string, "team")) {
+        maplistVar = Cvar_Get("ui_maplist_team", "", 0);
+    } else if (!Q_stricmp(filter->string, "round")) {
+        maplistVar = Cvar_Get("ui_maplist_round", "", 0);
+    } else {
+        maplistVar = Cvar_Get("ui_maplist_ffa", "", 0);
+    }
+
+    Q_strncpyz(mapBuffer, maplistVar->string, sizeof(mapBuffer));
+
+    for (token = strtok(mapBuffer, " /"); token; token = strtok(NULL, " /")) {
+        if (!Q_stricmp(token, "dm")) {
+            continue;
+        }
+        if (!Q_stricmp(token, "obj")) {
+            continue;
+        }
+        if (!Q_stricmp(token, "lib")) {
+            continue;
+        }
+
+        AddItem(token, NULL);
+    }
+}
+
+CLASS_DECLARATION(UIListBox, UIMapListBox, NULL) {
+    {&EV_MapListBox_RefreshMapList, &UIMapListBox::RefreshMapList},
+    {NULL,                          NULL                         }
+};
+
+UIMapListBox::UIMapListBox() {}
+
+void UIMapListBox::RefreshMapList(Event *ev)
+{
+    DeleteAllItems();
+    PopulateMapList();
+}
+
+void UIMapListBox::PopulateMapList()
+{
+    cvar_t *filter;
+    char  **filenames;
+    int     numfiles;
+    str     path;
+    int     i;
+    bool    bTugOfWar   = false;
+    bool    bObjective  = false;
+    bool    bLiberation = false;
+
+    filter = Cvar_Get("g_maprotation_filter", "ffa", 0);
+    if (!Q_stricmp(filter->string, "lib")) {
+        path        = "maps/lib/";
+        bLiberation = true;
+    } else if (!Q_stricmp(filter->string, "obj") || !Q_stricmp(filter->string, "tow")) {
+        path = "maps/obj/";
+        if (!Q_stricmp(filter->string, "tow")) {
+            bTugOfWar = true;
+        } else {
+            bObjective = true;
+        }
+    } else {
+        path = "maps/dm/";
+    }
+
+    filenames = FS_ListFiles(path, ".bsp", qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        const char *filename = filenames[i];
+        const char *token;
+        char        mapName[256];
+        char        tokenized[256];
+        bool        bHasMP  = false;
+        bool        bHasTOW = false;
+        bool        bHasLib = false;
+
+        Q_strncpyz(mapName, filename, sizeof(mapName));
+        mapName[strlen(mapName) - 4] = 0;
+
+        if (!COM_IsMapValid(mapName)) {
+            continue;
+        }
+
+        if (bTugOfWar || bLiberation) {
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
+
+            for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
+                if (bLiberation) {
+                    if (!Q_stricmp(token, "MP")) {
+                        bHasMP = true;
+                    }
+                    if (!Q_stricmp(token, "LIB")) {
+                        bHasLib = true;
+                    }
+                    if (bHasMP && bHasLib) {
+                        AddItem(mapName, NULL);
+                        break;
+                    }
+                }
+
+                if (bTugOfWar) {
+                    if (!Q_stricmp(token, "MP")) {
+                        bHasMP = true;
+                    }
+                    if (!Q_stricmp(token, "TOW")) {
+                        bHasTOW = true;
+                    }
+                    if (bHasMP && bHasTOW) {
+                        AddItem(mapName, NULL);
+                        break;
+                    }
+                }
+            }
+        } else if (bObjective) {
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
+
+            for (token = strtok(tokenized, "_"); token; token = strtok(NULL, "_")) {
+                if (!Q_stricmp(token, "obj")) {
+                    AddItem(mapName, NULL);
+                    break;
+                }
+            }
+
+            if (!Q_stricmp(mapName, "mp_ship_lib")) {
+                AddItem(mapName, NULL);
+            }
+        } else {
+            AddItem(mapName, NULL);
+        }
+    }
+
+    if (bObjective) {
+        path = "maps/lib/";
+
+        filenames = FS_ListFiles(path, ".bsp", qfalse, &numfiles);
+
+        for (i = 0; i < numfiles; i++) {
+            const char *filename = filenames[i];
+            const char *token;
+            char        mapName[256];
+            char        tokenized[256];
+
+            Q_strncpyz(mapName, filename, sizeof(mapName));
+            mapName[strlen(mapName) - 4] = 0;
+            Q_strncpyz(tokenized, mapName, sizeof(tokenized));
+
+            token = strtok(tokenized, "_");
+            if (!Q_stricmp(token, "obj") || !Q_stricmp(mapName, "mp_ship_lib")) {
+                AddItem(mapName, NULL);
+                break;
+            }
+        }
+    }
+
+    if (!bTugOfWar && !bObjective && !bLiberation) {
+        int type;
+
+        for (type = 0; type < 2; type++) {
+            if (type == 0) {
+                path = "maps/obj/";
+            } else {
+                path = "maps/lib/";
+            }
+
+            filenames = FS_ListFiles(path, ".bsp", qfalse, &numfiles);
+
+            for (i = 0; i < numfiles; i++) {
+                const char *filename = filenames[i];
+                char        mapName[256];
+
+                Q_strncpyz(mapName, filename, sizeof(mapName));
+                mapName[strlen(mapName) - 4] = 0;
+
+                if (!COM_IsMapValid(mapName)) {
+                    continue;
+                }
+
+                if (!Q_stricmp(mapName, "obj_team2") || !Q_stricmp(mapName, "obj_team4")) {
+                    continue;
+                }
+
+                AddItem(mapName, NULL);
+            }
+        }
+    }
+}
+
+CLASS_DECLARATION(UIButton, UIAddToRotationButton, NULL) {
+    {&W_LeftMouseUp, &UIAddToRotationButton::Released},
+    {NULL,           NULL                            }
+};
+
+void UIAddToRotationButton::Released(Event *ev)
+{
+    UIListBox *mapList;
+    UIListBox *rotationList;
+    size_t     prefixLength;
+    int        i;
+
+    mapList      = static_cast<UIListBox *>(uWinMan.FindWidget("Map List"));
+    rotationList = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
+
+    if (Cvar_Get("g_maprotation_filter", "ffa", 0)) {
+        prefixLength = strlen("obj/") + 1;
+    } else {
+        prefixLength = 1;
+    }
+
+    if (mapList && rotationList) {
+        size_t mapLength = 0;
+        int item = mapList->getCurrentItem();
+        str currentItemText;
+        
+        if (item) {
+            currentItemText = mapList->getItemText(item);
+        }
+
+        for (i = 1; i <= rotationList->getNumItems(); i++) {
+            str text = rotationList->getItemText(i);
+            if (text == currentItemText) {
+                // Added in OPM
+                //  Prevent adding duplicates
+                item = 0;
+                break;
+            }
+
+            mapLength += text.length();
+        }
+
+        if (item && prefixLength + mapLength + currentItemText.length() < 256) {
+            rotationList->AddItem(currentItemText, NULL);
+        }
+    }
+
+    UIButtonBase::Released(ev);
+}
+
+CLASS_DECLARATION(UIButton, UIRemoveFromRotationButton, NULL) {
+    {&W_LeftMouseUp, &UIRemoveFromRotationButton::Released},
+    {NULL,           NULL                                 }
+};
+
+void UIRemoveFromRotationButton::Released(Event *ev)
+{
+    UIListBox *list;
+
+    list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
+    if (list) {
+        list->DeleteItem(list->getCurrentItem());
+    }
+
+    UIButtonBase::Released(ev);
+}
+
+CLASS_DECLARATION(UIButton, UIRotationApplyButton, NULL) {
+    {&W_LeftMouseUp, &UIRotationApplyButton::Released},
+    {NULL,           NULL                            }
+};
+
+void UIRotationApplyButton::Released(Event *ev)
+{
+    UIListBox *list;
+    cvar_t    *filter;
+    str        cvarName;
+    str        maplistStr;
+    int        i;
+    bool       bObjective  = false;
+    bool       bLiberation = false;
+
+    filter = Cvar_Get("g_maprotation_filter", "ffa", 0);
+    if (!Q_stricmp(filter->string, "obj")) {
+        cvarName   = "ui_maplist_obj";
+        bObjective = true;
+    } else if (!Q_stricmp(filter->string, "tow")) {
+        cvarName   = "ui_maplist_obj";
+        bObjective = true;
+    } else if (!Q_stricmp(filter->string, "lib")) {
+        cvarName    = "ui_maplist_lib";
+        bLiberation = true;
+    } else if (!Q_stricmp(filter->string, "team")) {
+        cvarName = "ui_maplist_team";
+    } else if (!Q_stricmp(filter->string, "round")) {
+        cvarName = "ui_maplist_round";
+    } else {
+        cvarName = "ui_maplist_ffa";
+    }
+    Cvar_Set(cvarName, "");
+
+    list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
+    if (list) {
+        for (i = 1; i <= list->getNumItems(); i++) {
+            const char *token;
+            str         text = list->getItemText(i);
+            char        map[256];
+            bool        bHasTOW = false, bHasObj = false, bHasLib = false, bHasShip = false;
+
+            Q_strncpyz(map, text, sizeof(map));
+            for (token = strtok(map, "_"); token; token = strtok(NULL, "_")) {
+                if (!Q_stricmp(token, "TOW")) {
+                    bHasTOW = true;
+                    break;
+                }
+                if (!Q_stricmp(token, "obj")) {
+                    bHasObj = true;
+                    break;
+                }
+                if (!Q_stricmp(token, "lib")) {
+                    bHasLib = true;
+                    break;
+                }
+                if (!Q_stricmp(token, "ship")) {
+                    bHasShip = true;
+                    break;
+                }
+            }
+
+            if (bHasShip) {
+                maplistStr += "lib/";
+            } else if (bObjective || bHasTOW || bHasObj) {
+                maplistStr += "obj/";
+            } else if (bHasLib || bLiberation) {
+                maplistStr += "lib/";
+            } else {
+                maplistStr += "dm/";
+            }
+
+            maplistStr += text;
+
+            if (i == 1) {
+                Cvar_Set("ui_dmmap", maplistStr);
+            }
+
+            maplistStr += " ";
+        }
+    }
+
+    Cvar_Set(cvarName, maplistStr);
+
+    UIButtonBase::Released(ev);
+}
+
+CLASS_DECLARATION(UIButton, UIRotationMoveItemUpButton, NULL) {
+    {&W_LeftMouseUp, &UIRotationMoveItemUpButton::Released},
+    {NULL,           NULL                                 }
+};
+
+void UIRotationMoveItemUpButton::Released(Event *ev)
+{
+    UIListBox *list;
+    int        item;
+
+    list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
+    item = list->getCurrentItem();
+
+    if (item > 1 && list->getNumItems() > 1) {
+        str text = list->getItemText(item - 1);
+
+        list->DeleteItem(item - 1);
+        list->InsertItem(text, item);
+        list->setCurrentItem(item - 1);
+    }
+
+    UIButtonBase::Released(ev);
+}
+
+CLASS_DECLARATION(UIButton, UIRotationMoveItemDownButton, NULL) {
+    {&W_LeftMouseUp, &UIRotationMoveItemDownButton::Released},
+    {NULL,           NULL                                   }
+};
+
+void UIRotationMoveItemDownButton::Released(Event *ev)
+{
+    UIListBox *list;
+    int        item;
+
+    list = static_cast<UIListBox *>(uWinMan.FindWidget("Rotation List"));
+    item = list->getCurrentItem();
+
+    if (item < list->getNumItems() && list->getNumItems() > 1) {
+        str text = list->getItemText(item + 1);
+
+        list->DeleteItem(item + 1);
+        list->InsertItem(text, item);
+        list->setCurrentItem(item + 1);
+    }
+
+    UIButtonBase::Released(ev);
+}
diff --git a/code/client/cl_uimaprotationsetup.h b/code/client/cl_uimaprotationsetup.h
new file mode 100644
index 00000000..5f9f4045
--- /dev/null
+++ b/code/client/cl_uimaprotationsetup.h
@@ -0,0 +1,87 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "../uilib/uilistbox.h"
+
+class UIMapRotationListBox : public UIListBox
+{
+    CLASS_PROTOTYPE(UIMapRotationListBox);
+
+public:
+    UIMapRotationListBox();
+
+    void RefreshRotationList(Event *ev);
+    void PopulateRotationList();
+};
+
+class UIMapListBox : public UIListBox
+{
+    CLASS_PROTOTYPE(UIMapListBox);
+
+public:
+    UIMapListBox();
+
+    void RefreshMapList(Event *ev);
+    void PopulateMapList();
+};
+
+class UIAddToRotationButton : public UIButton
+{
+    CLASS_PROTOTYPE(UIAddToRotationButton);
+
+public:
+    void Released(Event *ev);
+};
+
+class UIRemoveFromRotationButton : public UIButton
+{
+    CLASS_PROTOTYPE(UIRemoveFromRotationButton);
+
+public:
+    void Released(Event *ev);
+};
+
+class UIRotationApplyButton : public UIButton
+{
+    CLASS_PROTOTYPE(UIRotationApplyButton);
+
+public:
+    void Released(Event *ev);
+};
+
+class UIRotationMoveItemUpButton : public UIButton
+{
+    CLASS_PROTOTYPE(UIRotationMoveItemUpButton);
+
+public:
+    void Released(Event *ev);
+};
+
+class UIRotationMoveItemDownButton : public UIButton
+{
+    CLASS_PROTOTYPE(UIRotationMoveItemDownButton);
+
+public:
+    void Released(Event *ev);
+};
diff --git a/code/client/cl_uimaprunner.cpp b/code/client/cl_uimaprunner.cpp
index 11f33873..20f4fbb9 100644
--- a/code/client/cl_uimaprunner.cpp
+++ b/code/client/cl_uimaprunner.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,47 +22,107 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( FilePickerClass, MapRunnerClass, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(FilePickerClass, MapRunnerClass, NULL) {
+    {NULL, NULL}
 };
 
-void MapRunnerClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+void MapRunnerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-	// FIXME: stub
+    str newName;
+
+    newName = "spmap " + str(fullname, 5, fullname.length() - 4) + "\n";
+    // insert the command
+    Cbuf_AddText(newName);
+
+    CloseWindow();
 }
 
-CLASS_DECLARATION( FilePickerClass, ViewSpawnerClass, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(FilePickerClass, UIPickFileClass, NULL) {
+    {NULL, NULL}
 };
 
-void ViewSpawnerClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+UIPickFileClass::UIPickFileClass()
 {
-	// FIXME: stub
+    retobj   = NULL;
+    retevent = NULL;
 }
 
-CLASS_DECLARATION( FilePickerClass, LODSpawnerClass, NULL )
+UIPickFileClass::~UIPickFileClass()
 {
-	{ NULL, NULL }
+    if (retevent) {
+        delete retevent;
+    }
+}
+
+void UIPickFileClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
+{
+    if (!retobj || !retevent) {
+        CloseWindow();
+        return;
+    }
+
+    retevent->AddString(fullname);
+    retobj->ProcessEvent(retevent);
+
+    retevent = NULL;
+    retobj   = NULL;
+
+    CloseWindow();
+}
+
+void PickFile(const char *name, Listener *obj, Event& event)
+{
+    UIPickFileClass *picker;
+    str              currentpath;
+    int              i;
+
+    picker           = new UIPickFileClass();
+    picker->retevent = new Event(event);
+    picker->retobj   = obj;
+
+    if (name && *name && strchr(name, '/')) {
+        currentpath = name;
+
+        for (i = currentpath.length() - 1; i > 0; i--) {
+            if (currentpath[i] == '/') {
+                break;
+            }
+        }
+
+        currentpath = str(currentpath, 0, i + 1);
+    } else {
+        currentpath = "";
+    }
+
+    picker->Setup("", currentpath, ".*", "");
+}
+
+CLASS_DECLARATION(FilePickerClass, ViewSpawnerClass, NULL) {
+    {NULL, NULL}
 };
 
-void LODSpawnerClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+void ViewSpawnerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-	// FIXME: stub
+    str newName;
+
+    newName = "viewspawn " + fullname + "\n";
+    // insert the command
+    Cbuf_AddText(newName);
+
+    CloseWindow();
 }
 
-CLASS_DECLARATION( FilePickerClass, UIPickFileClass, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(FilePickerClass, LODSpawnerClass, NULL) {
+    {NULL, NULL}
 };
 
-void UIPickFileClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+void LODSpawnerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-	// FIXME: stub
-}
+    str newName;
 
-void PickFile( const char *name, Listener *obj, Event& event  )
-{
-	// FIXME: stub
+    newName = "lod_spawn " + fullname + "\n";
+    // insert the command
+    Cbuf_AddText(newName);
+
+    CloseWindow();
 }
diff --git a/code/client/cl_uimaprunner.h b/code/client/cl_uimaprunner.h
index 7b03f30d..21d8a708 100644
--- a/code/client/cl_uimaprunner.h
+++ b/code/client/cl_uimaprunner.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,40 +20,44 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIMAPRUNNER_H__
-#define __CL_UIMAPRUNNER_H__
+#pragma once
 
-class MapRunnerClass : public FilePickerClass {
+class MapRunnerClass : public FilePickerClass
+{
 public:
-	CLASS_PROTOTYPE( MapRunnerClass );
+    CLASS_PROTOTYPE(MapRunnerClass);
 
-	void	FileChosen( str &currentDirectory, str &partialName, str &fullname ) override;
+    void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) override;
 };
 
-class ViewSpawnerClass : public FilePickerClass {
+class ViewSpawnerClass : public FilePickerClass
+{
 public:
-	CLASS_PROTOTYPE( ViewSpawnerClass );
+    CLASS_PROTOTYPE(ViewSpawnerClass);
 
-	void	FileChosen( str &currentDirectory, str &partialName, str &fullname ) override;
+    void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) override;
 };
 
-class LODSpawnerClass : public FilePickerClass {
+class LODSpawnerClass : public FilePickerClass
+{
 public:
-	CLASS_PROTOTYPE( LODSpawnerClass );
+    CLASS_PROTOTYPE(LODSpawnerClass);
 
-	void	FileChosen( str &currentDirectory, str &partialName, str &fullname ) override;
+    void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) override;
 };
 
-class UIPickFileClass : public FilePickerClass {
+class UIPickFileClass : public FilePickerClass
+{
 public:
-	Listener *retobj;
-	Event *retevent;
+    Listener *retobj;
+    Event    *retevent;
 
-	CLASS_PROTOTYPE( UIPickFileClass );
+    CLASS_PROTOTYPE(UIPickFileClass);
 
-	void	FileChosen( str &currentDirectory, str &partialName, str &fullname ) override;
+    UIPickFileClass();
+    ~UIPickFileClass();
+
+    void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) override;
 };
 
-void PickFile( const char *name, Listener *obj, Event& event );
-
-#endif /* __CL_UIMAPRUNNER_H__ */
+void PickFile(const char *name, Listener *obj, Event& event);
diff --git a/code/client/cl_uiminicon.cpp b/code/client/cl_uiminicon.cpp
index dcfbce1a..c1c8e6db 100644
--- a/code/client/cl_uiminicon.cpp
+++ b/code/client/cl_uiminicon.cpp
@@ -22,68 +22,179 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( UIWidget, FakkMiniconsole, NULL )
-{
-	{ NULL, NULL }
+Event EV_Minicon_Goin("_minicon_goin", EV_DEFAULT, NULL, NULL, "Event to make the miniconsole disappear");
+
+CLASS_DECLARATION(UIWidget, FakkMiniconsole, NULL) {
+    {&W_SizeChanged,   &FakkMiniconsole::OnSizeChanged},
+    {&EV_Minicon_Goin, &FakkMiniconsole::MoveInEvent  },
+    {NULL,             NULL                           }
 };
 
 FakkMiniconsole::FakkMiniconsole()
 {
-	// FIXME: stub
+    m_maxlines    = 0;
+    m_reallyshown = true;
+    m_boxstate    = boxstate_t::box_in;
+    m_boxtime     = uid.time;
+    m_movespeed   = 500;
 }
 
-
-void FakkMiniconsole::VerifyBoxOut( void )
+void FakkMiniconsole::setShowState(void)
 {
-	// FIXME: stub
+    if (m_reallyshown) {
+        setShow(m_boxstate != boxstate_t::box_in);
+    } else {
+        setShow(false);
+    }
 }
 
-void FakkMiniconsole::ChangeBoxState( boxstate_t state )
+void FakkMiniconsole::setRealShow(bool b)
 {
-	// FIXME: stub
+    m_reallyshown = b;
+    setShowState();
 }
 
-void FakkMiniconsole::HandleBoxMoving( void )
+void FakkMiniconsole::VerifyBoxOut(void)
 {
-	// FIXME: stub
+    PostMoveinEvent();
+
+    if (m_boxstate && m_boxstate != boxstate_t::box_out) {
+        ChangeBoxState(box_moving_out);
+    }
 }
 
-void FakkMiniconsole::PostMoveinEvent( void )
+void FakkMiniconsole::Print(const char *text)
 {
-	// FIXME: stub
+    str        *lastline;
+    const char *p;
+
+    if (!m_lines.NumObjects()) {
+        m_lines.AddObject({});
+    }
+
+    lastline = &m_lines.ObjectAt(m_lines.NumObjects());
+
+    if (*text) {
+        for (p = text; *p; p++) {
+            if (*p != '\n') {
+                *lastline += *p;
+            } else {
+                m_lines.AddObject({});
+                lastline = &m_lines.ObjectAt(m_lines.NumObjects());
+            }
+        }
+    }
+
+    if (lastline && lastline->length() > 128) {
+        Print("\n");
+    }
+
+    if (m_maxlines < 0) {
+        m_maxlines = 1;
+    }
+
+    while (m_lines.NumObjects() > this->m_maxlines) {
+        m_lines.RemoveObjectAt(1);
+    }
+
+    VerifyBoxOut();
 }
 
-void FakkMiniconsole::setShowState( void )
+void FakkMiniconsole::PostMoveinEvent(void)
 {
-	// FIXME: stub
+    if (m_boxstate != boxstate_t::box_out) {
+        return;
+    }
+
+    CancelEventsOfType(EV_Minicon_Goin);
+    PostEvent(new Event(EV_Minicon_Goin), 5.f);
 }
 
-void FakkMiniconsole::OnSizeChanged( Event *ev )
+void FakkMiniconsole::OnSizeChanged(Event *ev)
 {
-	// FIXME: stub
+    m_maxlines = m_frame.size.height / m_font->getHeight(getHighResScale());
 }
 
-void FakkMiniconsole::Print( const char *text )
+void FakkMiniconsole::MoveInEvent(Event *ev)
 {
-	// FIXME: stub
+    ChangeBoxState(boxstate_t::box_moving_in);
 }
 
-void FakkMiniconsole::Create( const UISize2D& size, const UColor& fore, const UColor& back, float alpha )
+void FakkMiniconsole::HandleBoxMoving(void)
 {
-	// FIXME: stub
+    int      delta;
+    UIRect2D newRect;
+
+    if (m_boxstate == boxstate_t::box_out || m_boxstate == boxstate_t::box_in) {
+        return;
+    }
+
+    delta     = m_movespeed * (uid.time - m_boxtime) / 1000;
+    m_boxtime = 1000 * delta / m_movespeed + m_boxtime;
+
+    switch (m_boxstate) {
+    case boxstate_t::box_moving_in:
+        newRect = UIRect2D(delta + m_frame.pos.x, m_frame.pos.y, m_frame.size.width, m_frame.size.height);
+        if (newRect.pos.x >= uid.vidWidth) {
+            newRect.pos.x = uid.vidWidth;
+            ChangeBoxState(boxstate_t::box_in);
+        }
+        break;
+    case boxstate_t::box_moving_out:
+        newRect = UIRect2D(-delta + m_frame.pos.x, m_frame.pos.y, m_frame.size.width, m_frame.size.height);
+        if (newRect.pos.x <= uid.vidWidth - newRect.size.width) {
+            newRect.pos.x = uid.vidWidth - newRect.size.width;
+            ChangeBoxState(boxstate_t::box_out);
+        }
+        break;
+    default:
+        ChangeBoxState(boxstate_t::box_in);
+        break;
+    }
+
+    setFrame(newRect);
 }
 
-void FakkMiniconsole::MoveInEvent( Event *ev )
+void FakkMiniconsole::Draw(void)
 {
-	// FIXME: stub
+    float aty;
+    int   i;
+
+    HandleBoxMoving();
+
+    m_font->setColor(m_foreground_color);
+    aty = m_frame.size.height - m_font->getHeight(getHighResScale());
+    for (i = m_lines.NumObjects(); i > 0; i--) {
+        if (-m_font->getHeight(getHighResScale()) >= aty) {
+            break;
+        }
+
+        m_font->Print(0, aty / getHighResScale()[1], m_lines.ObjectAt(i), -1, getHighResScale());
+        aty -= m_font->getHeight(getHighResScale());
+    }
 }
 
-void FakkMiniconsole::Draw( void )
+void FakkMiniconsole::Create(const UISize2D& size, const UColor& fore, const UColor& back, float alpha)
 {
-	// FIXME: stub
+    InitFrame(NULL, uid.vidWidth, 0, size.width, size.height, 0);
+
+    setBackgroundColor(back, true);
+    setForegroundColor(fore);
+    setBackgroundAlpha(alpha);
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    OnSizeChanged(NULL);
+
+    m_movespeed = size.width * 3;
+
+    setShowState();
 }
 
-void FakkMiniconsole::setRealShow( bool b )
+void FakkMiniconsole::ChangeBoxState(boxstate_t state)
 {
-	// FIXME: stub
+    m_boxstate = state;
+    m_boxtime  = uid.time;
+    setShowState();
+    if (state == boxstate_t::box_out) {
+        PostMoveinEvent();
+    }
 }
diff --git a/code/client/cl_uiminicon.h b/code/client/cl_uiminicon.h
index 791bf23d..3f49773d 100644
--- a/code/client/cl_uiminicon.h
+++ b/code/client/cl_uiminicon.h
@@ -20,38 +20,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIMINICON_H__
-#define __CL_UIMINICON_H__
+#pragma once
 
-class FakkMiniconsole : public UIWidget {
+class FakkMiniconsole : public UIWidget
+{
 protected:
-	Container<str> m_lines;
-	int m_maxlines;
-	bool m_reallyshown;
-	bool m_boxmovingout;
-	boxstate_t m_boxstate;
-	int m_boxtime;
-	int m_movespeed;
+    Container<str> m_lines;
+    int            m_maxlines;
+    bool           m_reallyshown;
+    bool           m_boxmovingout;
+    boxstate_t     m_boxstate;
+    int            m_boxtime;
+    int            m_movespeed;
 
 public:
-	CLASS_PROTOTYPE( FakkMiniconsole );
+    CLASS_PROTOTYPE(FakkMiniconsole);
 
 protected:
-	void		VerifyBoxOut( void );
-	void		ChangeBoxState( boxstate_t state );
-	void		HandleBoxMoving( void );
-	void		PostMoveinEvent( void );
-	void		setShowState( void );
+    void VerifyBoxOut(void);
+    void ChangeBoxState(boxstate_t state);
+    void HandleBoxMoving(void);
+    void PostMoveinEvent(void);
+    void setShowState(void);
 
 public:
-	FakkMiniconsole();
+    FakkMiniconsole();
 
-	void			OnSizeChanged( Event *ev );
-	void			Print( const char *text );
-	void			Create( const UISize2D& size, const UColor& fore, const UColor& back, float alpha );
-	void			MoveInEvent( Event *ev );
-	void			Draw( void ) override;
-	void			setRealShow( bool b );
+    void OnSizeChanged(Event *ev);
+    void Print(const char *text);
+    void Create(const UISize2D& size, const UColor& fore, const UColor& back, float alpha);
+    void MoveInEvent(Event *ev);
+    void Draw(void) override;
+    void setRealShow(bool b);
 };
-
-#endif
diff --git a/code/client/cl_uimpmappicker.cpp b/code/client/cl_uimpmappicker.cpp
index 2db4ac26..8146459f 100644
--- a/code/client/cl_uimpmappicker.cpp
+++ b/code/client/cl_uimpmappicker.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,73 +21,339 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( USignal, MpMapPickerClass, NULL )
+class MpMapPickerItem : public UIListCtrlItem
 {
-	{ NULL, NULL }
+    str m_string;
+    // Added in 2.0
+    str m_directory;
+
+public:
+    MpMapPickerItem(const str& string, const str& directory);
+
+    int            getListItemValue(int which) const override;
+    griditemtype_t getListItemType(int which) const override;
+    str            getListItemString(int which) const override;
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+};
+
+CLASS_DECLARATION(USignal, MpMapPickerClass, NULL) {
+    {&EV_UIListBase_ItemSelected,      &MpMapPickerClass::FileSelected },
+    {&EV_UIListBase_ItemDoubleClicked, &MpMapPickerClass::FileChosen   },
+    {&W_Deactivated,                   &MpMapPickerClass::OnDeactivated},
+    {NULL,                             NULL                            }
 };
 
 MpMapPickerClass::MpMapPickerClass()
 {
-	// FIXME: stub
+    window = new UIFloatingWindow();
+    window->Create(
+        NULL,
+        UIRect2D((uid.vidWidth - 300) / 2, (uid.vidHeight - 200) / 2, 300, 200),
+        "Select a Map",
+        UColor(0.15f, 0.195f, 0.278f),
+        UHudColor
+    );
+    window->setFont("facfont-20");
+    window->PassEventToWidget("closebutton", new Event(EV_Widget_Disable));
+    window->PassEventToWidget("minimizebutton", new Event(EV_Widget_Disable));
+    window->Connect(this, W_Deactivated, W_Deactivated);
+
+    listbox = new UIListCtrl();
+    listbox->InitFrame(window->getChildSpace(), window->getChildSpace()->getClientFrame(), 0);
+    listbox->SetDrawHeader(false);
+    listbox->setFont("facfont-20");
+    listbox->FrameInitialized();
+    listbox->AddColumn(Sys_LV_CL_ConvertString("Select a Map"), 0, 400, false, false);
+
+    listbox->Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
+    listbox->Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
+    listbox->AllowActivate(true);
+
+    // Added in 2.0
+    //  Don't localize elements
+    listbox->SetDontLocalize();
 }
 
 MpMapPickerClass::~MpMapPickerClass()
 {
-	// FIXME: stub
+    if (listbox) {
+        delete listbox;
+        listbox = NULL;
+    }
+
+    if (window) {
+        delete window;
+        window = NULL;
+    }
 }
 
-void MpMapPickerClass::SetupFiles( void )
+void MpMapPickerClass::Setup(const char *root_directory, const char *current_directory, const char *game_type)
 {
-	// FIXME: stub
+    Initialize(root_directory, current_directory, game_type);
 }
 
-void MpMapPickerClass::GotoParentDirectory( void )
+void MpMapPickerClass::Initialize(const char *root_directory, const char *current_directory, const char *game_type)
 {
-	// FIXME: stub
+    rootDirectory = root_directory;
+    if (rootDirectory.length() > 1 && rootDirectory[rootDirectory.length() - 1] != '/') {
+        rootDirectory += "/";
+    }
+
+    currentDirectory = current_directory;
+    if (currentDirectory.length() > 1 && currentDirectory[currentDirectory.length() - 1] != '/') {
+        currentDirectory += "/";
+    }
+
+    if (game_type) {
+        gameType = game_type;
+    }
+
+    SetupFiles();
 }
 
-void MpMapPickerClass::GotoSubDirectory( str subdir )
+void MpMapPickerClass::GotoParentDirectory(void)
 {
-	// FIXME: stub
+    uintptr_t i;
+
+    if (currentDirectory == rootDirectory) {
+        return;
+    }
+
+    for (i = currentDirectory.length() - 2; i > 0; i--) {
+        if (currentDirectory[i] == '/') {
+            break;
+        }
+    }
+
+    if (currentDirectory[i] == '/') {
+        i++;
+    }
+
+    currentDirectory = str(currentDirectory, 0, i);
+
+    // refresh files
+    SetupFiles();
 }
 
-void MpMapPickerClass::Initialize( const char *root_directory, const char *current_directory )
+void MpMapPickerClass::GotoSubDirectory(str subdir)
 {
-	// FIXME: stub
+    currentDirectory += subdir + "/";
+
+    // refresh files
+    SetupFiles();
 }
 
-void MpMapPickerClass::CloseWindow( void )
+void MpMapPickerClass::SetupFiles(void)
 {
-	// FIXME: stub
+    char **filenames;
+    int    numfiles;
+    int    i;
+    char   mapname[128];
+    bool   bTugOfWar = false, bObjective = false, bLiberation = false;
+
+    listbox->DeleteAllItems();
+
+    if (gameType == "tow") {
+        bTugOfWar = true;
+    } else if (gameType == "obj") {
+        bObjective = true;
+    } else if (gameType == "lib") {
+        bLiberation = true;
+    } else {
+        // retrieve directories
+        filenames = FS_ListFiles(rootDirectory, ".bsp", qfalse, &numfiles);
+
+        for (i = 0; i < numfiles; i++) {
+            const char *filename = filenames[i];
+
+            strcpy(mapname, filename);
+            mapname[strlen(mapname) - 4] = 0;
+
+            if (COM_IsMapValid(mapname)) {
+                listbox->AddItem(new MpMapPickerItem(mapname, rootDirectory));
+            }
+        }
+
+        FS_FreeFileList(filenames);
+    }
+
+    if (com_target_game->integer > target_game_e::TG_MOH) {
+        if (currentDirectory.length()) {
+            if (currentDirectory == "maps/-/") {
+                SetupSecondaryFiles(currentDirectory, bTugOfWar, bObjective, bLiberation);
+            } else {
+                SetupSecondaryFiles("maps/obj/", bTugOfWar, bObjective, bLiberation);
+                SetupSecondaryFiles("maps/lib/", bTugOfWar, bObjective, bLiberation);
+            }
+        }
+    }
+
+    listbox->SortByColumn(0);
 }
 
-void MpMapPickerClass::FileSelected( Event *ev )
+void MpMapPickerClass::SetupSecondaryFiles(const char *path, bool bTugOfWar, bool bObjective, bool bLiberation)
 {
-	// FIXME: stub
+    char **filenames;
+    int    numfiles;
+    int    i;
+    char   mapname[128];
+    char   string[1024];
+
+    filenames = FS_ListFiles(path, ".bsp", qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        const char *filename = filenames[i];
+        const char *token;
+
+        strcpy(mapname, filename);
+        mapname[strlen(mapname) - 4] = 0;
+
+        if (!COM_IsMapValid(mapname)) {
+            continue;
+        }
+
+        if (bTugOfWar || bObjective || bLiberation) {
+            bool bHasMP = false, bHasTOW = false, bHasLib = false;
+
+            strcpy(string, mapname);
+
+            for (token = strtok(string, "_"); token; token = strtok(NULL, "_")) {
+                if (bObjective) {
+                    if (!Q_stricmp(token, "obj")) {
+                        listbox->AddItem(new MpMapPickerItem(mapname, path));
+                    } else if (!Q_stricmp(token, "ship")) {
+                        listbox->AddItem(new MpMapPickerItem(mapname, path));
+                    }
+                }
+
+                if (bTugOfWar) {
+                    if (!Q_stricmp(token, "MP")) {
+                        bHasMP = true;
+                    }
+                    if (!Q_stricmp(token, "TOW")) {
+                        bHasTOW = true;
+                    }
+
+                    if (bHasMP && bHasTOW) {
+                        listbox->AddItem(new MpMapPickerItem(mapname, path));
+                    }
+                }
+
+                if (bLiberation) {
+                    if (!Q_stricmp(token, "MP")) {
+                        bHasMP = true;
+                    }
+                    if (!Q_stricmp(token, "LIB")) {
+                        bHasLib = true;
+                    }
+
+                    if (bHasMP && bHasLib) {
+                        listbox->AddItem(new MpMapPickerItem(mapname, path));
+                    }
+                }
+            }
+        } else {
+            if (!Q_stricmp(mapname, "obj_team2") || !Q_stricmp(mapname, "obj_team4")) {
+                continue;
+            }
+
+            listbox->AddItem(new MpMapPickerItem(mapname, path));
+        }
+    }
+
+    FS_FreeFileList(filenames);
 }
 
-void MpMapPickerClass::FileSelected( str& currentDirectory, str& partialName, str& fullname )
+void MpMapPickerClass::FileSelected(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-	// FIXME: stub
+    FileChosen(currentDirectory, partialName, fullname);
 }
 
-void MpMapPickerClass::FileChosen( Event *ev )
+void MpMapPickerClass::FileSelected(Event *ev)
 {
-	// FIXME: stub
+    if (!listbox->getCurrentItem()) {
+        return;
+    }
+
+    uii.Snd_PlaySound("sound/menu/apply.wav");
+
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
+
+    FileSelected(directory, name, directory + name);
 }
 
-void MpMapPickerClass::FileChosen( str& currentDirectory, str& partialName, str& fullname )
+void MpMapPickerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-	// FIXME: stub
+    const char *pszFilename;
+    str         sCommand;
+
+    pszFilename = fullname.c_str();
+    sCommand    = va("ui_dmmap %s\n", pszFilename + 5);
+
+    Cbuf_AddText(sCommand);
+    CloseWindow();
 }
 
-void MpMapPickerClass::OnDeactivated( Event *ev )
+void MpMapPickerClass::FileChosen(Event *ev)
 {
-	// FIXME: stub
+    if (!listbox->getCurrentItem()) {
+        return;
+    }
+
+    uii.Snd_PlaySound("sound/menu/apply.wav");
+
+    UIListCtrlItem *item      = listbox->GetItem(listbox->getCurrentItem());
+    str             name      = item->getListItemString(0);
+    str             directory = item->getListItemString(1);
+
+    FileSelected(directory, name, directory + name);
 }
 
-void MpMapPickerClass::Setup( const char *root_directory, const char *current_directory )
+void MpMapPickerClass::CloseWindow(void)
 {
-	// FIXME: stub
+    PostEvent(EV_Remove, 0);
+}
+
+void MpMapPickerClass::OnDeactivated(Event *ev)
+{
+    CloseWindow();
+}
+
+MpMapPickerItem::MpMapPickerItem(const str& string, const str& directory)
+{
+    m_string    = string;
+    m_directory = directory;
+}
+
+int MpMapPickerItem::getListItemValue(int which) const
+{
+    return atoi(m_string);
+}
+
+griditemtype_t MpMapPickerItem::getListItemType(int which) const
+{
+    return griditemtype_t::TYPE_STRING;
+}
+
+str MpMapPickerItem::getListItemString(int which) const
+{
+    switch (which) {
+    default:
+    case 0:
+        return m_string;
+    case 1:
+        return m_directory;
+    }
+}
+
+void MpMapPickerItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean MpMapPickerItem::IsHeaderEntry() const
+{
+    return qfalse;
 }
diff --git a/code/client/cl_uimpmappicker.h b/code/client/cl_uimpmappicker.h
index cfc85e64..8c6ed0c1 100644
--- a/code/client/cl_uimpmappicker.h
+++ b/code/client/cl_uimpmappicker.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,39 +20,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIMPMAPPICKER_H__
-#define __CL_UIMPMAPPICKER_H__
+#pragma once
 
 class UIFloatingWindow;
 
-class MpMapPickerClass : public USignal {
-	UIFloatingWindow *window;
-	UIListCtrl *listbox;
-	str currentDirectory;
-	str rootDirectory;
+class MpMapPickerClass : public USignal
+{
+    UIFloatingWindow *window;
+    UIListCtrl       *listbox;
+    str               currentDirectory;
+    str               rootDirectory;
+    str               gameType;
 
 public:
-	CLASS_PROTOTYPE( MpMapPickerClass );
+    CLASS_PROTOTYPE(MpMapPickerClass);
 
 private:
-	void		SetupFiles( void );
-	void		GotoParentDirectory( void );
-	void		GotoSubDirectory( str subdir );
-	void		Initialize( const char *root_directory, const char *current_directory );
+    void SetupFiles(void);
+    void SetupSecondaryFiles(const char *path, bool bTugOfWar, bool bObjective, bool bLiberation);
+    void GotoParentDirectory(void);
+    void GotoSubDirectory(str subdir);
+    void Initialize(const char *root_directory, const char *current_directory, const char *game_type);
 
 protected:
-	void			CloseWindow( void );
-	void			FileSelected( Event *ev );
-	virtual void	FileSelected( str& currentDirectory, str& partialName, str& fullname );
-	void			FileChosen( Event *ev );
-	virtual void	FileChosen( str& currentDirectory, str& partialName, str& fullname );
-	void			OnDeactivated( Event *ev );
+    void         CloseWindow(void);
+    void         FileSelected(Event *ev);
+    virtual void FileSelected(const str& currentDirectory, const str& partialName, const str& fullname);
+    void         FileChosen(Event *ev);
+    virtual void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname);
+    void         OnDeactivated(Event *ev);
 
 public:
-	MpMapPickerClass();
-	~MpMapPickerClass();
+    MpMapPickerClass();
+    ~MpMapPickerClass();
 
-	void		Setup( const char *root_directory, const char *current_directory );
+    // game_type was added in 2.0
+    void Setup(const char *root_directory, const char *current_directory, const char *game_type = NULL);
 };
-
-#endif /* __CL_UIMPMAPPICKER_H__ */
diff --git a/code/client/cl_uiplayermodelpicker.cpp b/code/client/cl_uiplayermodelpicker.cpp
index 6aa7b336..ca89a42d 100644
--- a/code/client/cl_uiplayermodelpicker.cpp
+++ b/code/client/cl_uiplayermodelpicker.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,62 +22,361 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( USignal, PlayerModelPickerClass, NULL )
+class PMPickerItem : public UIListCtrlItem
 {
-	{ NULL, NULL }
+    str m_string;
+
+public:
+    PMPickerItem(const str& string);
+
+    int            getListItemValue(int which) const override;
+    griditemtype_t getListItemType(int which) const override;
+    str            getListItemString(int which) const override;
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+};
+
+typedef struct {
+    const char *fileName;
+    const char *displayName;
+} PMPickerModel_t;
+
+static const PMPickerModel_t pickerModels[] = {
+  // 2.0 skins
+    {"allied_101st_captain",                    "US - 101st Airborne Captain"    },
+    {"allied_101st_infantry",                   "US - 101st Airborne Private 1"  },
+    {"allied_101st_scout",                      "US - 101st Airborne Private 2"  },
+    {"allied_501st_pir_scout",                  "US - 501st Paratrooper 1"       },
+    {"allied_501st_pir_soldier",                "US - 501st Paratrooper 2"       },
+ // 1.0 skins
+    {"allied_airborne",                         "US - 501st Paratrooper 3"       },
+ // Readded in OPM (was removed in 2.0)
+    {"allied_manon",                            "US - Manon"                     },
+ // 2.0 skins
+    {"allied_british_6th_airborne_captain",     "UK - 6th Airborne Captain"      },
+    {"allied_british_6th_airborne_paratrooper", "UK - 6th Airborne Paratrooper"  },
+ // 1.0 skins
+    {"allied_pilot",                            "US - Army Pilot"                },
+ // 2.0 skins
+    {"allied_russian_corporal",                 "RA - Corporal"                  },
+    {"allied_russian_crazy_boris",              "RA - Crazy Boris"               },
+    {"allied_russian_recon_scout",              "RA - Junior Lieutenant"         },
+    {"allied_russian_recon_soldier",            "RA - Black Sea Petty Officer"   },
+ // 1.0 skins
+    {"allied_sas",                              "UK - SAS Officer"               },
+    {"american_army",                           "US - Soldier"                   },
+    {"american_ranger",                         "US - Ranger"                    },
+ // 1.0 skins
+    {"german_afrika_officer",                   "DE - Afrika Officer"            },
+    {"german_afrika_private",                   "DE - Afrika Private"            },
+ // 2.0 skins
+    {"german_ardennes_artillery_commander",     "DE - Artillery Commander"       },
+    {"german_dday_colonel",                     "DE - Normandy Colonel"          },
+ // 1.0 skins
+    {"german_elite_officer",                    "DE - Elite Officer"             },
+    {"german_elite_sentry",                     "DE - Elite Sentry"              },
+    {"german_kradshutzen",                      "DE - Kradshutzen"               },
+    {"german_panzer_grenadier",                 "DE - Panzer Grenadier"          },
+    {"german_panzer_obershutze",                "DE - Panzer Obershutze"         },
+    {"german_panzer_shutze",                    "DE - Panzer Shutze"             },
+    {"german_panzer_tankcommander",             "DE - Panzer Tank Commander"     },
+    {"german_scientist",                        "DE - German Scientist"          },
+ // Those skins were superseded by german_waffenss
+    {"german_waffen_officer",                   "DE - Waffen Officer"            },
+    {"german_waffen_shutze",                    "DE - Waffen Shutze"             },
+ // 1.0 skins
+    {"german_waffenss_officer",                 "DE - Waffen Officer"            },
+    {"german_waffenss_shutze",                  "DE - Waffen Shutze"             },
+    {"german_wehrmacht_officer",                "DE - Wehrmacht Officer"         },
+    {"german_wehrmacht_soldier",                "DE - Wehrmacht Soldier"         },
+    {"german_winter_1",                         "DE - Winter Infantry 1"         },
+    {"german_winter_2",                         "DE - Winter Infantry 2"         },
+    {"german_worker",                           "DE - German Mechanic"           },
+ // 2.11 skins
+    {"allied_british_tank_corporal",            "UK - 6th Royal Tank Regiment"   },
+    {"allied_russian_seaman",                   "RA - Red Navy Seaman"           },
+    {"german_Panzer_Corporal",                  "DE - 1st Panzer Regiment"       },
+    {"allied_technician",                       "US - Air Force Technician"      },
+    {"german_stukageschwader",                  "DE - Stukageschwader"           },
+ // 2.30 skins
+    {"It_AX_Ital_Vol",                          "IT - 10th Army XXI Corps"       },
+    {"SC_AX_Ital_Inf",                          "IT - 6th Army 202nd Coastal Div"},
+    {"SC_AX_Ital_Inf2",                         "IT - 114th Inf Regiment"        },
+    {"SC_AX_ITAL_PARA",                         "IT - Paracadutista Militare"    },
+ // 2.40 skins
+    {"allied_Wheathers",                        "US - General Wheathers"         },
+    {"allied_US_Tank",                          "US - II Corps Tank Commander"   },
+    {"allied_US_Mask",                          "US - II Corps Infantry"         },
+    {"allied_british_Cmd",                      "UK - 10th Corps"                },
+    {"allied_british_Tank",                     "UK - 8th Army"                  },
+    {NULL,                                      NULL                             }
+};
+
+const char *PM_FilenameToDisplayname(const char *fileName)
+{
+    int i;
+
+    for (i = 0; pickerModels[i].fileName; i++) {
+        const PMPickerModel_t& model = pickerModels[i];
+
+        if (!Q_stricmp(model.fileName, fileName)) {
+            return model.displayName;
+        }
+    }
+
+    return fileName;
+}
+
+const char *PM_DisplaynameToFilename(const char *displayName)
+{
+    int i;
+
+    for (i = 0; pickerModels[i].fileName; i++) {
+        const PMPickerModel_t& model = pickerModels[i];
+
+        if (!Q_stricmp(model.displayName, displayName)) {
+            return model.fileName;
+        }
+    }
+
+    return displayName;
+}
+
+CLASS_DECLARATION(USignal, PlayerModelPickerClass, NULL) {
+    {&EV_UIListBase_ItemSelected,       &PlayerModelPickerClass::FileSelected },
+    {&EV_UIListBase_ItemDoubleClicked,  &PlayerModelPickerClass::FileChosen   },
+    {&UIFloatingWindow::W_ClosePressed, &PlayerModelPickerClass::OnDeactivated},
+    {&W_Deactivated,                    &PlayerModelPickerClass::OnDeactivated},
+    {NULL,                              NULL                                  }
 };
 
 PlayerModelPickerClass::PlayerModelPickerClass()
 {
-	// FIXME: stub
+    window = new UIFloatingWindow();
+    window->Create(
+        NULL,
+        UIRect2D((uid.vidWidth - 400) / 2, (uid.vidHeight - 300) / 2, 400, 300),
+        "Player Model Select...",
+        UColor(0.15f, 0.195f, 0.278f),
+        UHudColor
+    );
+    window->setFont("facfont-20");
+    window->PassEventToWidget("closebutton", new Event(EV_Widget_Disable));
+    window->PassEventToWidget("minimizebutton", new Event(EV_Widget_Disable));
+    window->Connect(this, W_Deactivated, W_Deactivated);
+
+    listbox = new UIListCtrl();
+    listbox->InitFrame(window->getChildSpace(), window->getChildSpace()->getClientFrame(), 0);
+    listbox->SetDrawHeader(false);
+    listbox->setFont("facfont-20");
+    listbox->FrameInitialized();
+    listbox->AddColumn("Player Model", 0, 400, false, false);
+
+    listbox->Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
+    listbox->Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
+    listbox->AllowActivate(true);
+
+    // Added in 2.0
+    //  Don't localize elements
+    listbox->SetDontLocalize();
+
+    m_bGermanModels = false;
 }
 
 PlayerModelPickerClass::~PlayerModelPickerClass()
 {
-	// FIXME: stub
+    if (listbox) {
+        delete listbox;
+        listbox = NULL;
+    }
+
+    if (window) {
+        delete window;
+        window = NULL;
+    }
 }
 
-void PlayerModelPickerClass::SetupFiles( void )
+void PlayerModelPickerClass::Setup(const char *root_directory, const char *current_directory, qboolean bGermanModels)
 {
-	// FIXME: stub
+    Initialize(root_directory, current_directory, bGermanModels);
 }
 
-void PlayerModelPickerClass::Initialize( const char *root_directory, const char *current_directory, qboolean bGermanModels )
+void PlayerModelPickerClass::Initialize(
+    const char *root_directory, const char *current_directory, qboolean bGermanModels
+)
 {
-	// FIXME: stub
+    rootDirectory   = root_directory;
+    m_bGermanModels = bGermanModels;
+    if (rootDirectory.length() > 1 && rootDirectory[rootDirectory.length() - 1] != '/') {
+        rootDirectory += "/";
+    }
+
+    currentDirectory = current_directory;
+    if (currentDirectory.length() > 1 && currentDirectory[currentDirectory.length() - 1] != '/') {
+        currentDirectory += "/";
+    }
+
+    SetupFiles();
 }
 
-void PlayerModelPickerClass::CloseWindow( void )
+void PlayerModelPickerClass::SetupFiles(void)
 {
-	// FIXME: stub
+    str         mappath;
+    char        work[128];
+    char      **filenames;
+    const char *displayName;
+    int         numfiles;
+    int         i;
+    int         iLen;
+    qboolean    bIsGerman;
+
+    // cleanup
+    listbox->DeleteAllItems();
+
+    if (m_bGermanModels) {
+        window->setTitle("Select Your Axis Player Model");
+    } else {
+        window->setTitle("Select Your Allied Player Model");
+    }
+
+    filenames = FS_ListFiles(currentDirectory, ".tik", qfalse, &numfiles);
+
+    for (i = 0; i < numfiles; i++) {
+        Q_strncpyz(work, filenames[i], sizeof(work));
+
+        if (strstr(work, "_fps")) {
+            // ignore view models
+            continue;
+        }
+
+        if (work[0] == '_') {
+            // ignore hidden models
+            continue;
+        }
+
+        // allied_manon readded in OPM
+        //if (!Q_stricmpn(work, "allied_manon")) {
+        //    continue;
+        //}
+
+        bIsGerman = !Q_stricmpn(work, "german", 6u) || !Q_stricmpn(work, "axis", 4u) || !Q_stricmpn(work, "it", 2u)
+                 || !Q_stricmpn(work, "sc", 2u);
+
+        if (m_bGermanModels != bIsGerman) {
+            continue;
+        }
+
+        // strip the extension
+        work[strlen(work) - 4] = 0;
+        displayName            = PM_FilenameToDisplayname(work);
+
+        listbox->AddItem(new PMPickerItem(displayName));
+    }
+
+    FS_FreeFileList(filenames);
+
+    listbox->SortByColumn(0);
 }
 
-void PlayerModelPickerClass::FileSelected( Event *ev )
+void PlayerModelPickerClass::FileSelected(
+    const str& name, const str& currentDirectory, const str& partialName, const str& fullname
+)
 {
-	// FIXME: stub
+    FileChosen(name, currentDirectory, partialName, fullname);
 }
 
-void PlayerModelPickerClass::FileSelected( str& currentDirectory, str& partialName, str& fullname )
+void PlayerModelPickerClass::FileSelected(Event *ev)
 {
-	// FIXME: stub
+    str  name;
+    char donotshowssindeorfr[64];
+    str  fullname;
+
+    name     = listbox->GetItem(listbox->getCurrentItem())->getListItemString(0);
+    fullname = PM_DisplaynameToFilename(name);
+
+    if (!Q_stricmpn(fullname, "german_waffen_", 14)) {
+        Q_strncpyz(donotshowssindeorfr, "german_waffenss_", sizeof(donotshowssindeorfr));
+        Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), fullname.c_str() + 14);
+    } else {
+        Q_strncpyz(donotshowssindeorfr, fullname, sizeof(donotshowssindeorfr));
+    }
+
+    FileSelected(name, currentDirectory, fullname, currentDirectory + donotshowssindeorfr);
 }
 
-void PlayerModelPickerClass::FileChosen( Event *ev )
+void PlayerModelPickerClass::FileChosen(
+    const str& name, const str& currentDirectory, const str& partialName, const str& fullname
+)
 {
-	// FIXME: stub
+    str sCommand;
+
+    if (m_bGermanModels) {
+        sCommand += "ui_dm_playergermanmodel \"" + name;
+        sCommand += "\" ; ui_dm_playergermanmodel_set " + partialName;
+        sCommand += " ; ui_disp_playergermanmodel " + fullname + ".tik";
+    } else {
+        sCommand += "ui_dm_playermodel \"" + name;
+        sCommand += "\" ; ui_dm_playermodel_set " + partialName;
+        sCommand += " ; ui_disp_playermodel " + fullname + ".tik";
+    }
+    sCommand += "\n";
+
+    Cbuf_AddText(sCommand);
+    CloseWindow();
 }
 
-void PlayerModelPickerClass::FileChosen( str& currentDirectory, str& partialName, str& fullname )
+void PlayerModelPickerClass::FileChosen(Event *ev)
 {
-	// FIXME: stub
+    str  name;
+    char donotshowssindeorfr[64];
+    str  fullname;
+
+    name     = listbox->GetItem(listbox->getCurrentItem())->getListItemString(0);
+    fullname = PM_DisplaynameToFilename(name);
+
+    if (!Q_stricmpn(fullname, "german_waffen_", 14)) {
+        Q_strncpyz(donotshowssindeorfr, "german_waffen_", sizeof(donotshowssindeorfr));
+        Q_strcat(donotshowssindeorfr, sizeof(donotshowssindeorfr), fullname.c_str() + 14);
+    } else {
+        Q_strncpyz(donotshowssindeorfr, fullname, sizeof(donotshowssindeorfr));
+    }
+
+    FileChosen(name, currentDirectory, fullname, currentDirectory + donotshowssindeorfr);
 }
 
-void PlayerModelPickerClass::OnDeactivated( Event *ev )
+void PlayerModelPickerClass::CloseWindow(void)
 {
-	// FIXME: stub
+    PostEvent(EV_Remove, 0);
 }
 
-void PlayerModelPickerClass::Setup( const char *root_directory, const char *current_directory, qboolean bGermanModels )
+void PlayerModelPickerClass::OnDeactivated(Event *ev)
 {
-	// FIXME: stub
+    CloseWindow();
+}
+
+PMPickerItem::PMPickerItem(const str& string)
+{
+    m_string = string;
+}
+
+int PMPickerItem::getListItemValue(int which) const
+{
+    return atoi(m_string);
+}
+
+griditemtype_t PMPickerItem::getListItemType(int which) const
+{
+    return griditemtype_t::TYPE_STRING;
+}
+
+str PMPickerItem::getListItemString(int which) const
+{
+    return m_string;
+}
+
+void PMPickerItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) {}
+
+qboolean PMPickerItem::IsHeaderEntry() const
+{
+    return qfalse;
 }
diff --git a/code/client/cl_uiplayermodelpicker.h b/code/client/cl_uiplayermodelpicker.h
index d33f53e4..2464b83e 100644
--- a/code/client/cl_uiplayermodelpicker.h
+++ b/code/client/cl_uiplayermodelpicker.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,37 +20,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIPLAYERMODELPICKER_H__
-#define __CL_UIPLAYERMODELPICKER_H__
+#pragma once
 
 class UIFloatingWindow;
 
-class PlayerModelPickerClass : public USignal {
-	UIFloatingWindow *window;
-	UIListCtrl *listbox;
-	str currentDirectory;
-	str rootDirectory;
-	qboolean m_bGermanModels;
+class PlayerModelPickerClass : public USignal
+{
+    UIFloatingWindow *window;
+    UIListCtrl       *listbox;
+    str               currentDirectory;
+    str               rootDirectory;
+    qboolean          m_bGermanModels;
+
 public:
-	CLASS_PROTOTYPE( PlayerModelPickerClass );
+    CLASS_PROTOTYPE(PlayerModelPickerClass);
 
 private:
-	void		SetupFiles( void );
-	void		Initialize( const char *root_directory, const char *current_directory, qboolean bGermanModels );
+    void SetupFiles(void);
+    void Initialize(const char *root_directory, const char *current_directory, qboolean bGermanModels);
 
 protected:
-	void			CloseWindow( void );
-	void			FileSelected( Event *ev );
-	virtual void	FileSelected( str& currentDirectory, str& partialName, str& fullname );
-	void			FileChosen( Event *ev );
-	virtual void	FileChosen( str& currentDirectory, str& partialName, str& fullname );
-	void			OnDeactivated( Event *ev );
+    void         CloseWindow(void);
+    void         FileSelected(Event *ev);
+    // The name parameter was added in 2.0.
+    virtual void FileSelected(const str& name, const str& currentDirectory, const str& partialName, const str& fullname);
+    void         FileChosen(Event *ev);
+    // The name parameter was added in 2.0.
+    virtual void FileChosen(const str& name, const str& currentDirectory, const str& partialName, const str& fullname);
+    void         OnDeactivated(Event *ev);
 
 public:
-	PlayerModelPickerClass();
-	~PlayerModelPickerClass();
+    PlayerModelPickerClass();
+    ~PlayerModelPickerClass();
 
-	void	Setup( const char *root_directory, const char *current_directory, qboolean bGermanModels );
+    void Setup(const char *root_directory, const char *current_directory, qboolean bGermanModels);
 };
 
-#endif /* __CL_UIPLAYERMODELPICKER_H__ */
+const char* PM_FilenameToDisplayname(const char* fileName);
+const char* PM_DisplaynameToFilename(const char* displayName);
diff --git a/code/client/cl_uiradar.cpp b/code/client/cl_uiradar.cpp
index be2c80ce..654ecc26 100644
--- a/code/client/cl_uiradar.cpp
+++ b/code/client/cl_uiradar.cpp
@@ -58,7 +58,7 @@ void UIRadar::Draw(void)
 	float inv;
 	float iconSize;
 	int blinkTime, speakTime;
-	float origin[2], axis[2];
+	vec2_t origin, axis;
 	float halfScale;
 	int i;
 
@@ -105,17 +105,17 @@ void UIRadar::Draw(void)
 	halfScale = iconSize * 0.5f;
 
 	for (i = 0; i < MAX_CLIENTS; i++) {
-		float delta[2];
-		float newOrg[2];
-		float screenOrg[2];
-		float length;
+		vec2_t delta;
+		vec2_t newOrg;
+		vec2_t screenOrg;
+		float  length;
 
 		radar = &g_radarClients[i];
 		if (i == g_radarClientNum) {
 			continue;
 		}
 
-		if (!g_radarClients[i].time) {
+		if (!radar->time) {
 			continue;
 		}
 
@@ -128,10 +128,13 @@ void UIRadar::Draw(void)
 			// make the icon blink
 			if (delta >= 0 && delta < speakTime && ((delta / blinkTime) % 2) == 0) {
 				continue;
+            }
+
+			if (delta < 0 || delta >= speakTime) {
+				radar->lastSpeakTime = 0;
 			}
 		}
 
-		radar->lastSpeakTime = 0;
 		delta[0] = radar->origin[0] - origin[0];
 		delta[1] = radar->origin[1] - origin[1];
 		newOrg[0] = -(delta[0] * axis[0] + delta[1] * axis[1]) * inv;
@@ -140,12 +143,12 @@ void UIRadar::Draw(void)
 
 		if (length > 1)
 		{
-			newOrg[0] = -(delta[0] * axis[0] + delta[1] * axis[1]) * inv * (1.f / length);
-			newOrg[1] = (delta[0] * axis[1] + delta[1] * -axis[0]) * inv * (1.f / length);
+			newOrg[0] *= 1.f / length;
+			newOrg[1] *= 1.f / length;
 		}
 
-		screenOrg[0] = -((halfScale * (1.141f * newOrg[1] + m_vVirtualScale[0])) - ((1.f + newOrg[1]) * 0.5f * m_frame.size.width));
-		screenOrg[1] = -((halfScale * (1.141f * newOrg[0] + m_vVirtualScale[1])) - ((1.f + newOrg[0]) * 0.5f * m_frame.size.height));
+		screenOrg[0] = -((halfScale * (1.414f * newOrg[1] + m_vVirtualScale[0])) - ((1.f + newOrg[1]) * 0.5f * m_frame.size.width));
+		screenOrg[1] = -((halfScale * (1.414f * newOrg[0] + m_vVirtualScale[1])) - ((1.f + newOrg[0]) * 0.5f * m_frame.size.height));
 
 		uii.Rend_DrawPicStretched2(
 			screenOrg[0],
diff --git a/code/client/cl_uiserverlist.cpp b/code/client/cl_uiserverlist.cpp
index c227d8f6..28e87c9b 100644
--- a/code/client/cl_uiserverlist.cpp
+++ b/code/client/cl_uiserverlist.cpp
@@ -25,7 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../gamespy/sv_gamespy.h"
 #include "../gamespy/common/gsPlatformSocket.h"
 
-Event EV_FAKKServerList_Connect(
+Event EV_FAKKServerList_Connect
+(
     "connect",
     EV_DEFAULT,
     NULL,
@@ -33,7 +34,8 @@ Event EV_FAKKServerList_Connect(
     "Connect to the specified server"
 );
 
-Event EV_FAKKServerList_RefreshServerList(
+Event EV_FAKKServerList_RefreshServerList
+(
     "refreshserverlist",
     EV_DEFAULT,
     NULL,
@@ -41,7 +43,8 @@ Event EV_FAKKServerList_RefreshServerList(
     "Refresh the serverlist"
 );
 
-Event EV_FAKKServerList_RefreshLANServerList(
+Event EV_FAKKServerList_RefreshLANServerList
+(
     "refreshlanserverlist",
     EV_DEFAULT,
     NULL,
@@ -49,7 +52,8 @@ Event EV_FAKKServerList_RefreshLANServerList(
     "Refresh the LAN serverlist"
 );
 
-Event EV_FAKKServerList_CancelRefresh(
+Event EV_FAKKServerList_CancelRefresh
+(
     "cancelrefresh",
     EV_DEFAULT,
     NULL,
@@ -57,7 +61,8 @@ Event EV_FAKKServerList_CancelRefresh(
     "Cancel serverlist Refresh"
 );
 
-Event EV_FAKKServerList_LANListing(
+Event EV_FAKKServerList_LANListing
+(
     "lanlisting",
     EV_DEFAULT,
     NULL,
@@ -65,7 +70,8 @@ Event EV_FAKKServerList_LANListing(
     "Makes this server list to LAN stuff when there's a choice between Internet & LAN servers"
 );
 
-Event EV_FAKKServerList_UpdateServer(
+Event EV_FAKKServerList_UpdateServer
+(
     "updateserver",
     EV_DEFAULT,
     NULL,
@@ -74,71 +80,83 @@ Event EV_FAKKServerList_UpdateServer(
 );
 
 struct ServerListInstance {
-    int iServerType;
-    UIFAKKServerList* serverList;
+    int               iServerType;
+    UIFAKKServerList *serverList;
 };
 
-class FAKKServerListItem : public UIListCtrlItem {
-    str m_strings[6];
-    str m_sVersion;
-    bool m_bDifferentVersion;
-    bool m_bFavorite;
-    bool m_bQueryDone;
-    bool m_bQueryFailed;
-    int m_iNumPlayers;
+class FAKKServerListItem : public UIListCtrlItem
+{
+    UIFAKKServerList *m_parent; // Added in OPM
+    str               m_strings[6];
+    str               m_sVersion;
+    bool              m_bDifferentVersion;
+    bool              m_bFavorite;
+    bool              m_bQueryDone;
+    bool              m_bQueryFailed;
+    int               m_iNumPlayers;
 
 public:
-    str m_sIP;
+    str          m_sIP;
     unsigned int m_uiRealIP;
-    int m_iPort;
-    int m_iGameSpyPort;
+    int          m_iPort;
+    int          m_iGameSpyPort;
 
 public:
-    FAKKServerListItem(str string1, str string2, str string3, str string4, str string5, str string6, str ver);
+    FAKKServerListItem(
+        UIFAKKServerList *parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver
+    );
 
     griditemtype_t getListItemType(int index) const override;
-    int getListItemValue(int i) const override;
-    str getListItemString(int i) const override;
-    void setListItemString(int i, str sNewString);
-    void DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont* pFont) override;
-    qboolean IsHeaderEntry() const override;
-    bool IsQueried() const;
-    void SetQueried(bool bIsQueried);
-    bool IfQueryFailed() const;
-    void SetQueryFailed(bool bFailed);
-    void SetNumPlayers(int iNum);
-    bool IsFavorite() const;
-    void SetFavorite(bool bIsFavorite);
-    str GetListItemVersion() const;
-    void SetListItemVersion(str sNewVer);
-    void SetDifferentVersion(bool bIsDifferentVersion);
-    bool IsDifferentVersion() const;
+    int            getListItemValue(int i) const override;
+    str            getListItemString(int i) const override;
+    void           setListItemString(int i, str sNewString);
+    void           DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont) override;
+    qboolean       IsHeaderEntry() const override;
+    bool           IsQueried() const;
+    void           SetQueried(bool bIsQueried);
+    bool           IfQueryFailed() const;
+    void           SetQueryFailed(bool bFailed);
+    void           SetNumPlayers(int iNum);
+    bool           IsFavorite() const;
+    void           SetFavorite(bool bIsFavorite);
+    str            GetListItemVersion() const;
+    void           SetListItemVersion(str sNewVer);
+    void           SetDifferentVersion(bool bIsDifferentVersion);
+    bool           IsDifferentVersion() const;
 };
 
-static int g_iTotalNumPlayers;
-qboolean g_bNumericSort = qfalse;
-qboolean g_bReverseSort = qfalse;
-qboolean g_NeedAdditionalLANSearch = qfalse;
-qboolean g_bDoneUpdating[2];
+static int         g_iTotalNumPlayers;
+qboolean           g_bNumericSort            = qfalse;
+qboolean           g_bReverseSort            = qfalse;
+qboolean           g_NeedAdditionalLANSearch = qfalse;
+qboolean           g_bDoneUpdating[2];
 ServerListInstance g_ServerListInst[2];
 
-void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, void* param1, void* param2);
-static void AddFilter(char* filter, const char* value);
+// Fixed in OPM
+//  It was a static vaariable inside UpdateServerListCallBack
+//  that was set to 0 when the mode changed. This caused some issues
+static int g_iServerQueryCount = 0;
+static int g_iServerTotalCount = 0;
 
-FAKKServerListItem::FAKKServerListItem(str string1, str string2, str string3, str string4, str string5, str string6, str ver)
+static void AddFilter(char *filter, const char *value);
+
+FAKKServerListItem::FAKKServerListItem(
+    UIFAKKServerList *parent, str string1, str string2, str string3, str string4, str string5, str string6, str ver
+)
 {
+    m_parent     = parent;
     m_strings[0] = string1;
     m_strings[1] = string2;
     m_strings[2] = string3;
     m_strings[3] = string4;
     m_strings[4] = string5;
     m_strings[5] = string6;
-    m_sVersion = ver;
+    m_sVersion   = ver;
 
-    m_bFavorite = false;
-    m_bQueryDone = false;
+    m_bFavorite    = false;
+    m_bQueryDone   = false;
     m_bQueryFailed = false;
-    m_iNumPlayers = 0;
+    m_iNumPlayers  = 0;
 }
 
 griditemtype_t FAKKServerListItem::getListItemType(int index) const
@@ -161,87 +179,101 @@ void FAKKServerListItem::setListItemString(int i, str sNewString)
     m_strings[i] = sNewString;
 }
 
-void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont* pFont)
+void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, bool bSelected, UIFont *pFont)
 {
     static cvar_t *pColoringType = Cvar_Get("cl_browserdetailedcolors", "0", CVAR_ARCHIVE);
-    
+    UIRect2D       newRect       = drawRect;
+    vec2_t         virtualScale  = {1.f, 1.f};
+
+    /*
+    if (m_parent->isVirtual()) {
+        virtualScale[0] = uid.vidWidth / 640.f;
+        virtualScale[1] = uid.vidHeight / 480.f;
+        newRect.size.width *= uid.vidWidth / 1024;
+        newRect.size.height *= uid.vidHeight / 768;
+    }
+    */
+
+    virtualScale[0] = m_parent->getHighResScale()[0];
+    virtualScale[1] = m_parent->getHighResScale()[1];
+
     if (!pColoringType->integer) {
         if (IfQueryFailed() || (IsDifferentVersion() && IsQueried())) {
             if (bSelected) {
-                DrawBox(drawRect, UColor(0.2f, 0.0f, 0.0f), 1.0);
+                DrawBox(newRect, UColor(0.2f, 0.0f, 0.0f), 1.0);
                 pFont->setColor(UColor(0.9f, 0.0f, 0.0f));
             } else {
-                DrawBox(drawRect, UColor(0.1f, 0.0f, 0.0f), 1.0);
+                DrawBox(newRect, UColor(0.1f, 0.0f, 0.0f), 1.0);
                 pFont->setColor(UColor(0.55f, 0.0f, 0.0f));
             }
         } else if (IsQueried()) {
             if (bSelected) {
-                DrawBox(drawRect, UColor(0.2f, 0.18f, 0.015f), 1.0);
+                DrawBox(newRect, UColor(0.2f, 0.18f, 0.015f), 1.0);
                 pFont->setColor(UColor(0.9f, 0.8f, 0.6f));
             } else {
-                DrawBox(drawRect, UColor(0.02f, 0.07f, 0.004f), 1.0);
+                DrawBox(newRect, UColor(0.02f, 0.07f, 0.004f), 1.0);
                 pFont->setColor(UHudColor);
             }
         } else {
             if (bSelected) {
-                DrawBox(drawRect, UColor(0.15f, 0.18f, 0.18f), 1.0);
+                DrawBox(newRect, UColor(0.15f, 0.18f, 0.18f), 1.0);
                 pFont->setColor(UColor(0.6f, 0.7f, 0.8f));
             } else {
-                DrawBox(drawRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
+                DrawBox(newRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
                 pFont->setColor(UColor(0.05f, 0.5f, 0.6f));
             }
         }
 
         pFont->Print(
-            drawRect.pos.x + 1.0,
-            drawRect.pos.y,
+            newRect.pos.x / virtualScale[0] + 1.0,
+            newRect.pos.y / virtualScale[1],
             getListItemString(iColumn).c_str(),
             -1,
-            qfalse
+            virtualScale
         );
     } else {
         if (IsDifferentVersion()) {
             if (IsQueried()) {
                 if (bSelected) {
-                    DrawBox(drawRect, UColor(0.25f, 0.0f, 0.0f), 1.0);
+                    DrawBox(newRect, UColor(0.25f, 0.0f, 0.0f), 1.0);
                     pFont->setColor(UColor(0.0f, 0.5f, 0.0f));
                 } else {
-                    DrawBox(drawRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
+                    DrawBox(newRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
                     pFont->setColor(UColor(0.0f, 0.35f, 0.0f));
                 }
             } else {
                 if (bSelected) {
-                    DrawBox(drawRect, UColor(0.25f, 0.0f, 0.0f), 1.0);
+                    DrawBox(newRect, UColor(0.25f, 0.0f, 0.0f), 1.0);
                     pFont->setColor(UColor(0.5f, 0.6f, 0.7f));
                 } else {
-                    DrawBox(drawRect, UColor(0.15f, 0.0f, 0.0f), 1.0);
+                    DrawBox(newRect, UColor(0.15f, 0.0f, 0.0f), 1.0);
                     pFont->setColor(UColor(0.05f, 0.4f, 0.5f));
                 }
             }
         } else if (IsQueried()) {
             if (bSelected) {
-                DrawBox(drawRect, UColor(0.2f, 0.18f, 0.015f), 1.0);
+                DrawBox(newRect, UColor(0.2f, 0.18f, 0.015f), 1.0);
                 pFont->setColor(UColor(0.9f, 0.8f, 0.6f));
             } else {
-                DrawBox(drawRect, UColor(0.02f, 0.07f, 0.005f), 1.0);
+                DrawBox(newRect, UColor(0.02f, 0.07f, 0.005f), 1.0);
                 pFont->setColor(UHudColor);
             }
         } else {
             if (bSelected) {
-                DrawBox(drawRect, UColor(0.15f, 0.18f, 0.18f), 1.0);
+                DrawBox(newRect, UColor(0.15f, 0.18f, 0.18f), 1.0);
                 pFont->setColor(UColor(0.6f, 0.7f, 0.8f));
             } else {
-                DrawBox(drawRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
+                DrawBox(newRect, UColor(0.005f, 0.07f, 0.02f), 1.0);
                 pFont->setColor(UColor(0.05f, 0.5f, 0.6f));
             }
 
             if (IfQueryFailed()) {
                 DrawBox(
                     UIRect2D(
-                        drawRect.pos.x,
-                        drawRect.pos.y + drawRect.size.height * 0.5 - 1.0 + drawRect.pos.y,
-                        drawRect.size.width,
-                        drawRect.size.height * 0.5 - 1.0 + drawRect.pos.y
+                        newRect.pos.x,
+                        newRect.pos.y + newRect.size.height * 0.5 - 1.0 + newRect.pos.y,
+                        newRect.size.width,
+                        newRect.size.height * 0.5 - 1.0 + newRect.pos.y
                     ),
                     URed,
                     0.3f
@@ -249,19 +281,19 @@ void FAKKServerListItem::DrawListItem(int iColumn, const UIRect2D& drawRect, boo
             }
 
             pFont->Print(
-                drawRect.pos.x + 1.0,
-                drawRect.pos.y,
+                newRect.pos.x / virtualScale[0] + 1.0,
+                newRect.pos.y / virtualScale[1],
                 getListItemString(iColumn).c_str(),
                 -1,
-                qfalse
+                virtualScale
             );
 
             if (IsDifferentVersion()) {
                 DrawBox(
                     UIRect2D(
-                        drawRect.pos.x,
-                        drawRect.pos.y + drawRect.size.height * 0.5 - 1.0 + drawRect.pos.y,
-                        drawRect.size.width,
+                        newRect.pos.x,
+                        newRect.pos.y + newRect.size.height * 0.5 - 1.0 + newRect.pos.y,
+                        newRect.size.width,
                         1.0
                     ),
                     URed,
@@ -343,66 +375,69 @@ bool FAKKServerListItem::IsDifferentVersion() const
     return m_bDifferentVersion;
 }
 
-CLASS_DECLARATION( UIListCtrl, UIFAKKServerList, NULL )
-{
-    { &EV_UIListBase_ItemSelected,              &UIFAKKServerList::SelectServer },
-    { &EV_UIListBase_ItemDoubleClicked,         &UIFAKKServerList::ConnectServer },
-    { &EV_FAKKServerList_RefreshServerList,     &UIFAKKServerList::RefreshServerList },
-    { &EV_FAKKServerList_RefreshLANServerList,  &UIFAKKServerList::RefreshLANServerList },
-    { &EV_FAKKServerList_CancelRefresh,         &UIFAKKServerList::CancelRefresh },
-    { &EV_FAKKServerList_Connect,               &UIFAKKServerList::ConnectServer },
-    { &EV_FAKKServerList_LANListing,            &UIFAKKServerList::MakeLANListing },
-    { &EV_FAKKServerList_UpdateServer,          &UIFAKKServerList::UpdateServer },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIListCtrl, UIFAKKServerList, NULL) {
+    {&EV_UIListBase_ItemSelected,             &UIFAKKServerList::SelectServer        },
+    {&EV_UIListBase_ItemDoubleClicked,        &UIFAKKServerList::ConnectServer       },
+    {&EV_FAKKServerList_RefreshServerList,    &UIFAKKServerList::RefreshServerList   },
+    {&EV_FAKKServerList_RefreshLANServerList, &UIFAKKServerList::RefreshLANServerList},
+    {&EV_FAKKServerList_CancelRefresh,        &UIFAKKServerList::CancelRefresh       },
+    {&EV_FAKKServerList_Connect,              &UIFAKKServerList::ConnectServer       },
+    {&EV_FAKKServerList_LANListing,           &UIFAKKServerList::MakeLANListing      },
+    {&EV_FAKKServerList_UpdateServer,         &UIFAKKServerList::UpdateServer        },
+    {NULL,                                    NULL                                   }
 };
 
 UIFAKKServerList::UIFAKKServerList()
 {
-	setBackgroundColor(UWhite, true);
+    setBackgroundColor(UWhite, true);
     Connect(this, EV_UIListBase_ItemDoubleClicked, EV_UIListBase_ItemDoubleClicked);
     Connect(this, EV_UIListBase_ItemSelected, EV_UIListBase_ItemSelected);
 
-	AllowActivate(true);
-	setHeaderFont("facfont-20");
-	m_serverList[0] = NULL;
-	m_serverList[1] = NULL;
-	m_bHasList = false;
-	m_bGettingList[0] = false;
-	m_bGettingList[1] = false;
-	m_bUpdatingList = false;
-	m_bLANListing = false;
-	m_iLastSortColumn = 2;
+    AllowActivate(true);
+    setHeaderFont("facfont-20");
+    m_serverList[0]   = NULL;
+    m_serverList[1]   = NULL;
+    m_bHasList        = false;
+    m_bGettingList[0] = false;
+    m_bGettingList[1] = false;
+    m_bUpdatingList   = false;
+    m_bLANListing     = false;
+    m_iLastSortColumn = 2;
 }
 
-void UIFAKKServerList::SelectServer( Event *ev )
-{
-}
+void UIFAKKServerList::SelectServer(Event *ev) {}
 
-void UIFAKKServerList::ConnectServer( Event *ev )
+void UIFAKKServerList::ConnectServer(Event *ev)
 {
-    const FAKKServerListItem* pItem;
+    const FAKKServerListItem *pItem;
 
     if (getCurrentItem() <= 0) {
         return;
     }
 
-    pItem = static_cast<const FAKKServerListItem*>(GetItem(getCurrentItem()));
+    pItem = static_cast<const FAKKServerListItem *>(GetItem(getCurrentItem()));
     if (pItem->IsDifferentVersion()) {
-        const char* message;
-        float neededVersion = com_target_version->value;
-        float serverVersion = atof(pItem->GetListItemVersion().c_str());
+        const char *message;
+        float       neededVersion = com_target_version->value;
+        float       serverVersion = atof(pItem->GetListItemVersion().c_str());
 
         // Tolerate patch version
         if (fabs(neededVersion - serverVersion) >= 0.1) {
             UI_SetReturnMenuToCurrent();
 
-            message = va("Server is version %s, you are targeting %s", pItem->GetListItemVersion().c_str(), com_target_version->string);
+            message =
+                va("Server is version %s, you are targeting %s",
+                   pItem->GetListItemVersion().c_str(),
+                   com_target_version->string);
             Cvar_Set("com_errormessage", message);
 
             UI_PushMenu("wrongversion");
         } else {
-            message = va("Can not connect to v%s server, you are targeting v%s", pItem->GetListItemVersion().c_str(), com_target_version->string);
-        
+            message =
+                va("Can not connect to v%s server, you are targeting v%s",
+                   pItem->GetListItemVersion().c_str(),
+                   com_target_version->string);
+
             Cvar_Set("dm_serverstatus", message);
         }
     } else {
@@ -416,10 +451,9 @@ void UIFAKKServerList::ConnectServer( Event *ev )
     }
 }
 
-qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
+qboolean UIFAKKServerList::KeyEvent(int key, unsigned int time)
 {
-    switch (key)
-    {
+    switch (key) {
     case K_ENTER:
     case K_KP_ENTER:
         ConnectServer(NULL);
@@ -440,17 +474,17 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
             SelectServer(NULL);
 
             return qtrue;
-        }
-        else {
+        } else {
             return qfalse;
         }
         break;
     case 'u':
     case 'U':
-        if (getCurrentItem() > 0)
-        {
-            const FAKKServerListItem* pItem = static_cast<const FAKKServerListItem*>(GetItem(getCurrentItem()));
-            ServerListAuxUpdate(m_serverList[0], pItem->m_sIP.c_str(), pItem->m_iGameSpyPort, true, GQueryType::qt_status);
+        if (getCurrentItem() > 0) {
+            const FAKKServerListItem *pItem = static_cast<const FAKKServerListItem *>(GetItem(getCurrentItem()));
+            ServerListAuxUpdate(
+                m_serverList[0], pItem->m_sIP.c_str(), pItem->m_iGameSpyPort, true, GQueryType::qt_status
+            );
         }
         return UIListCtrl::KeyEvent(key, time);
     case 'c':
@@ -460,25 +494,33 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
     case 'i':
     case 'I':
         {
-            int i, j;
-            const FAKKServerListItem* pServerItem1;
-            const FAKKServerListItem* pServerItem2;
-            int iNumErrors = 0;
+            int                       i, j;
+            const FAKKServerListItem *pServerItem1;
+            const FAKKServerListItem *pServerItem2;
+            int                       iNumErrors = 0;
 
             for (i = 1; i <= getNumItems(); i++) {
-                pServerItem1 = static_cast<const FAKKServerListItem*>(GetItem(i));
+                pServerItem1 = static_cast<const FAKKServerListItem *>(GetItem(i));
 
                 for (j = i + 1; j <= getNumItems(); j++) {
-                    pServerItem2 = static_cast<const FAKKServerListItem*>(GetItem(j));
+                    pServerItem2 = static_cast<const FAKKServerListItem *>(GetItem(j));
 
                     if (!str::icmp(pServerItem1->m_sIP.c_str(), pServerItem2->m_sIP.c_str())) {
                         if (pServerItem1->m_iPort == pServerItem2->m_iPort) {
-                            Com_DPrintf("*#*#* Duplicate server address: %s:%i\n", pServerItem1->m_sIP.c_str(), pServerItem1->m_iPort);
+                            Com_DPrintf(
+                                "*#*#* Duplicate server address: %s:%i\n",
+                                pServerItem1->m_sIP.c_str(),
+                                pServerItem1->m_iPort
+                            );
                             iNumErrors++;
                         }
 
                         if (pServerItem1->m_iGameSpyPort == pServerItem2->m_iGameSpyPort) {
-                            Com_DPrintf("*#*#* servers at IP %s sharing GameSpy port %i\n", pServerItem1->m_sIP.c_str(), pServerItem1->m_iGameSpyPort);
+                            Com_DPrintf(
+                                "*#*#* servers at IP %s sharing GameSpy port %i\n",
+                                pServerItem1->m_sIP.c_str(),
+                                pServerItem1->m_iGameSpyPort
+                            );
                             iNumErrors++;
                         }
                     }
@@ -493,7 +535,7 @@ qboolean UIFAKKServerList::KeyEvent( int key, unsigned int time )
     }
 }
 
-void UIFAKKServerList::UpdateUIElement( void )
+void UIFAKKServerList::UpdateUIElement(void)
 {
     float width;
 
@@ -511,13 +553,24 @@ void UIFAKKServerList::UpdateUIElement( void )
     uWinMan.ActivateControl(this);
 }
 
-void UIFAKKServerList::RefreshServerList( Event *ev )
+void UIFAKKServerList::RefreshServerList(Event *ev)
 {
-    int i;
-    FAKKServerListItem* pNewServerItem;
+    int                 i;
+    FAKKServerListItem *pNewServerItem;
+
+    if (m_serverList[0] && ServerListState(m_serverList[0]) != sl_idle) {
+        // Fixed in OPM
+        //  Only free the server list if it isn't currently being queried.
+        //  The server list must not be queried
+        return;
+    }
+
+    if (m_serverList[1] && ServerListState(m_serverList[1]) != sl_idle) {
+        return;
+    }
 
     for (i = 1; i <= getNumItems(); i++) {
-        pNewServerItem = static_cast<FAKKServerListItem*>(GetItem(i));
+        pNewServerItem = static_cast<FAKKServerListItem *>(GetItem(i));
         pNewServerItem->SetQueried(false);
         pNewServerItem->SetNumPlayers(0);
         pNewServerItem->SetQueryFailed(false);
@@ -525,6 +578,8 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
 
     if (m_serverList[0]) {
         ServerListClear(m_serverList[0]);
+        // Added in 2.0: Free the server list
+        //  Since 2.0, the UI no longer refreshes the server list when clicking "Browse Internet Servers"
         ServerListFree(m_serverList[0]);
         m_serverList[0] = NULL;
     }
@@ -534,8 +589,8 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
         ServerListFree(m_serverList[1]);
         m_serverList[1] = NULL;
     }
-    
-    if (!m_serverList[0]) {
+
+    if (!m_serverList[0] && (com_target_game->integer < target_game_e::TG_MOHTT || !m_serverList[1])) {
         NewServerList();
     }
 
@@ -544,14 +599,14 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
 
     Cvar_Set("dm_playercount", "0");
     {
-        char filter[2048] = { 0 };
-        static cvar_t* dm_max_players = Cvar_Get("dm_max_players", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_min_players = Cvar_Get("dm_min_players", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_show_demo_servers = Cvar_Get("dm_show_demo_servers", "1", CVAR_ARCHIVE);
-        static cvar_t* dm_realism_mode = Cvar_Get("dm_realism_mode", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_listen = Cvar_Get("dm_filter_listen", "1", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_empty = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
-        static cvar_t* dm_filter_full = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
+        char           filter[2048]         = {0};
+        static cvar_t *dm_max_players       = Cvar_Get("dm_max_players", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_min_players       = Cvar_Get("dm_min_players", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_show_demo_servers = Cvar_Get("dm_show_demo_servers", "1", CVAR_ARCHIVE);
+        static cvar_t *dm_realism_mode      = Cvar_Get("dm_realism_mode", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_listen     = Cvar_Get("dm_filter_listen", "1", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_empty      = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
+        static cvar_t *dm_filter_full       = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
 
         if (dm_min_players->integer) {
             AddFilter(filter, va("numplayers >= %d", dm_min_players->integer));
@@ -591,43 +646,46 @@ void UIFAKKServerList::RefreshServerList( Event *ev )
     m_bUpdatingList = true;
 }
 
-void UIFAKKServerList::RefreshLANServerList( Event *ev )
+void UIFAKKServerList::RefreshLANServerList(Event *ev)
 {
-    int i;
-    FAKKServerListItem* pNewServerItem;
+    int                 i;
+    FAKKServerListItem *pNewServerItem;
 
     for (i = 1; i <= getNumItems(); i++) {
-        pNewServerItem = static_cast<FAKKServerListItem*>(GetItem(i));
+        pNewServerItem = static_cast<FAKKServerListItem *>(GetItem(i));
         pNewServerItem->SetQueried(false);
         pNewServerItem->SetNumPlayers(0);
         pNewServerItem->SetQueryFailed(false);
     }
 
+    if (m_serverList[0]) {
+        ServerListClear(m_serverList[0]);
+    }
+
     if (m_serverList[1]) {
         ServerListClear(m_serverList[1]);
     }
 
-    if (m_serverList[0]) {
-        ServerListClear(m_serverList[0]);
-    } else {
+    if (!m_serverList[0] && (com_target_game->integer < target_game_e::TG_MOHTT || !m_serverList[1])) {
         NewServerList();
     }
 
-    g_bDoneUpdating[0] = false;
-    g_bDoneUpdating[1] = false;
+    g_bDoneUpdating[0]        = false;
+    g_bDoneUpdating[1]        = false;
     g_NeedAdditionalLANSearch = true;
 
     Cvar_Set("dm_playercount", "0");
     // Search all LAN servers from port 12300 to 12316
     ServerListLANUpdate(m_serverList[0], true, 12300, 12316, 1);
-    
+
     if (m_serverList[1]) {
         // If another game is supported search for it
         ServerListLANUpdate(m_serverList[1], true, 12300, 12316, 1);
     }
 }
 
-static void AddFilter(char* filter, const char* value) {
+static void AddFilter(char *filter, const char *value)
+{
     if (*filter) {
         strcat(filter, va(" and %s", value));
     } else {
@@ -635,17 +693,20 @@ static void AddFilter(char* filter, const char* value) {
     }
 }
 
-void UIFAKKServerList::CancelRefresh( Event *ev )
+void UIFAKKServerList::CancelRefresh(Event *ev)
 {
-	ServerListHalt(m_serverList[0]);
+    ServerListHalt(m_serverList[0]);
+    if (m_serverList[1]) {
+        ServerListHalt(m_serverList[1]);
+    }
 }
 
-void UIFAKKServerList::NewServerList( void )
+void UIFAKKServerList::NewServerList(void)
 {
-    int iNumConcurrent;
-    const char* secret_key;
-    const char* game_name;
-    cvar_t* pRateCvar = Cvar_Get("rate", "5000", CVAR_ARCHIVE | CVAR_USERINFO);
+    int         iNumConcurrent;
+    const char *secret_key;
+    const char *game_name;
+    cvar_t     *pRateCvar = Cvar_Get("rate", "5000", CVAR_ARCHIVE | CVAR_USERINFO);
 
     if (pRateCvar->integer <= 3000) {
         iNumConcurrent = 4;
@@ -657,97 +718,111 @@ void UIFAKKServerList::NewServerList( void )
         iNumConcurrent = 15;
     }
 
+    g_iServerQueryCount = 0;
+    g_iServerTotalCount = 0;
+
     if (com_target_game->integer < target_game_e::TG_MOHTT) {
-        game_name = GS_GetCurrentGameName();
+        game_name  = GS_GetCurrentGameName();
         secret_key = GS_GetCurrentGameKey();
 
         // standard mohaa server
         g_ServerListInst[0].iServerType = com_target_game->integer;
-        g_ServerListInst[0].serverList = this;
+        g_ServerListInst[0].serverList  = this;
 
         m_serverList[0] = ServerListNew(
             game_name,
             game_name,
             secret_key,
             iNumConcurrent,
-            (void*)&UpdateServerListCallBack,
+            (void *)&UpdateServerListCallBack,
             1,
-            (void*)&g_ServerListInst[0]
+            (void *)&g_ServerListInst[0]
         );
 
         m_serverList[1] = NULL;
     } else {
-        static cvar_t* dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", 1);
+        static cvar_t *dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", 1);
 
-        game_name = GS_GetGameName(target_game_e::TG_MOHTT);
+        game_name  = GS_GetGameName(target_game_e::TG_MOHTT);
         secret_key = GS_GetGameKey(target_game_e::TG_MOHTT);
 
         g_ServerListInst[0].iServerType = target_game_e::TG_MOHTT;
-        g_ServerListInst[0].serverList = this;
+        g_ServerListInst[0].serverList  = this;
 
         m_serverList[0] = ServerListNew(
             game_name,
             game_name,
             secret_key,
             iNumConcurrent,
-            (void*)&UpdateServerListCallBack,
+            (void *)&UpdateServerListCallBack,
             1,
-            (void*)&g_ServerListInst[0]
+            (void *)&g_ServerListInst[0]
         );
-        
+
         if (!dm_omit_spearhead->integer) {
             // Since mohtt is compatible with mohta
             // Search for both type of servers
-            game_name = GS_GetGameName(target_game_e::TG_MOHTA);
+            game_name  = GS_GetGameName(target_game_e::TG_MOHTA);
             secret_key = GS_GetGameKey(target_game_e::TG_MOHTA);
 
             g_ServerListInst[1].iServerType = target_game_e::TG_MOHTA;
-            g_ServerListInst[1].serverList = this;
+            g_ServerListInst[1].serverList  = this;
 
             m_serverList[1] = ServerListNew(
                 game_name,
                 game_name,
                 secret_key,
                 iNumConcurrent,
-                (void*)&UpdateServerListCallBack,
+                (void *)&UpdateServerListCallBack,
                 1,
-                (void*)&g_ServerListInst[1]
+                (void *)&g_ServerListInst[1]
             );
         }
     }
 }
 
-void UIFAKKServerList::MakeLANListing( Event *ev )
+void UIFAKKServerList::MakeLANListing(Event *ev)
 {
-	m_bLANListing = true;
+    m_bLANListing = true;
 }
 
-void UIFAKKServerList::UpdateServer( Event *ev )
+void UIFAKKServerList::UpdateServer(Event *ev)
 {
-	if (m_currentItem <= 0) {
-		return;
-	}
+    if (m_currentItem <= 0) {
+        return;
+    }
 
-    FAKKServerListItem* item = (FAKKServerListItem*)GetItem(getCurrentItem());
+    FAKKServerListItem *item = (FAKKServerListItem *)GetItem(getCurrentItem());
     ServerListAuxUpdate(m_serverList[0], item->m_sIP.c_str(), item->m_iGameSpyPort, true, GQueryType::qt_status);
+
+    if (com_target_game->integer >= target_game_e::TG_MOHTT) {
+        const cvar_t *dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
+        // check for Spearhead
+        if (!dm_omit_spearhead->integer) {
+            ServerListAuxUpdate(
+                m_serverList[1], item->m_sIP.c_str(), item->m_iGameSpyPort, true, GQueryType::qt_status
+            );
+        }
+    }
 }
 
-int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname )
+int UIFAKKServerList::ServerCompareFunction(const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname)
 {
-    int iCompResult;
-    int val1, val2;
-    const FAKKServerListItem* fi1 = static_cast<const FAKKServerListItem*>(i1);
-    const FAKKServerListItem* fi2 = static_cast<const FAKKServerListItem*>(i2);
+    int                       iCompResult;
+    int                       val1, val2;
+    const FAKKServerListItem *fi1 = static_cast<const FAKKServerListItem *>(i1);
+    const FAKKServerListItem *fi2 = static_cast<const FAKKServerListItem *>(i2);
 
-    if (fi1->IsFavorite() != fi2->IsFavorite())
-    {
+    if (fi1->IsFavorite() != fi2->IsFavorite()) {
         if (fi1->IsFavorite()) {
             iCompResult = -1;
         } else {
             iCompResult = 1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IsQueried() != fi2->IsQueried()) {
         if (fi1->IsQueried()) {
             iCompResult = -1;
@@ -755,16 +830,19 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             iCompResult = 1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IsDifferentVersion() != fi2->IsDifferentVersion()) {
-
         if (fi1->IsDifferentVersion()) {
             iCompResult = 1;
         } else {
             iCompResult = -1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (fi1->IfQueryFailed() != fi2->IfQueryFailed()) {
         if (fi1->IfQueryFailed()) {
             iCompResult = 1;
@@ -772,7 +850,9 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             iCompResult = -1;
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     } else if (g_bNumericSort) {
         val1 = fi1->getListItemValue(columnname);
         val2 = fi2->getListItemValue(columnname);
@@ -788,8 +868,7 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
         iCompResult = str::icmp(fi1->getListItemString(columnname), fi2->getListItemString(columnname));
     }
 
-    if (!iCompResult)
-    {
+    if (!iCompResult) {
         if (columnname != -2) {
             val1 = fi1->getListItemValue(2);
             val2 = fi2->getListItemValue(2);
@@ -822,11 +901,9 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
 
                 if (val1 < val2) {
                     iCompResult = 1;
-                }
-                else if (val1 > val2) {
+                } else if (val1 > val2) {
                     iCompResult = -1;
-                }
-                else {
+                } else {
                     iCompResult = 0;
                 }
             }
@@ -844,16 +921,17 @@ int UIFAKKServerList::ServerCompareFunction( const UIListCtrlItem *i1, const UIL
             }
         }
 
-        if (g_bReverseSort) iCompResult = -iCompResult;
+        if (g_bReverseSort) {
+            iCompResult = -iCompResult;
+        }
     }
 
     return iCompResult;
 }
 
-void UIFAKKServerList::Draw( void )
+void UIFAKKServerList::Draw(void)
 {
-    if (m_serverList[0])
-    {
+    if (m_serverList[0]) {
         GServerListState listState[2];
 
         ServerListThink(m_serverList[0]);
@@ -863,22 +941,17 @@ void UIFAKKServerList::Draw( void )
 
         listState[0] = ServerListState(m_serverList[0]);
         listState[1] = m_serverList[1] ? ServerListState(m_serverList[1]) : GServerListState::sl_idle;
-        if (listState[0] != GServerListState::sl_idle || listState[1] != GServerListState::sl_idle)
-        {
+        if (listState[0] != GServerListState::sl_idle || listState[1] != GServerListState::sl_idle) {
             menuManager.PassEventToWidget("refresh", new Event(EV_Widget_Disable));
             menuManager.PassEventToWidget("cancelrefresh", new Event(EV_Widget_Enable));
-        }
-        else
-        {
+        } else {
             menuManager.PassEventToWidget("refresh", new Event(EV_Widget_Enable));
             menuManager.PassEventToWidget("cancelrefresh", new Event(EV_Widget_Disable));
         }
     } else if (!m_bHasList) {
-
         if (m_bLANListing) {
             RefreshLANServerList(NULL);
-        }
-        else {
+        } else {
             RefreshServerList(NULL);
         }
 
@@ -900,14 +973,14 @@ void UIFAKKServerList::Draw( void )
     UIListCtrl::Draw();
 }
 
-void UIFAKKServerList::SortByColumn( int column )
+void UIFAKKServerList::SortByColumn(int column)
 {
-    int i;
-    bool exists = 0;
-    bool numeric = 0;
-    bool reverse = 0;
-    UIListCtrlItem* selected = NULL;
-    bool selvisible = false;
+    int             i;
+    bool            exists     = 0;
+    bool            numeric    = 0;
+    bool            reverse    = 0;
+    UIListCtrlItem *selected   = NULL;
+    bool            selvisible = false;
 
     for (i = 1; i <= m_columnlist.NumObjects(); i++) {
         const columndef_t& def = m_columnlist.ObjectAt(i);
@@ -915,7 +988,7 @@ void UIFAKKServerList::SortByColumn( int column )
             // found one
             numeric = def.numeric;
             reverse = def.reverse_sort;
-            exists = true;
+            exists  = true;
             break;
         }
     }
@@ -926,11 +999,11 @@ void UIFAKKServerList::SortByColumn( int column )
     }
 
     m_iLastSortColumn = column;
-    s_qsortcolumn = column;
-    s_qsortobject = this;
-    s_qsortreverse = reverse;
-    g_bNumericSort = numeric;
-    g_bReverseSort = reverse;
+    s_qsortcolumn     = column;
+    s_qsortobject     = this;
+    s_qsortreverse    = reverse;
+    g_bNumericSort    = numeric;
+    g_bReverseSort    = reverse;
 
     if (getCurrentItem()) {
         selected = m_itemlist.ObjectAt(getCurrentItem());
@@ -956,47 +1029,44 @@ void UIFAKKServerList::SortByColumn( int column )
     }
 }
 
-void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, void* param1, void* param2)
+void UIFAKKServerList::UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2)
 {
-    int i, j;
-    int iPort, iGameSpyPort;
-    unsigned int iRealIP;
-    str sAddress;
-    GServer server;
-    FAKKServerListItem* pNewServerItem;
-    static int iServerQueryCount = 0;
-    static int iServerTotalCount = 0;
-    UIFAKKServerList* uiServerList;
-    int iServerType;
+    int                 i, j;
+    int                 iPort, iGameSpyPort;
+    unsigned int        iRealIP;
+    str                 sAddress;
+    GServer             server;
+    FAKKServerListItem *pNewServerItem;
+    UIFAKKServerList   *uiServerList;
+    int                 iServerType;
     // filters
-    static cvar_t* dm_filter_empty = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_filter_full = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_filter_pure = Cvar_Get("dm_filter_pure", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_max_ping = Cvar_Get("dm_max_ping", "0", CVAR_ARCHIVE);
-    static cvar_t* dm_free_for_all = Cvar_Get("dm_free_for_all", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_objective_match = Cvar_Get("dm_objective_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_round_based_match = Cvar_Get("dm_round_based_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_team_match = Cvar_Get("dm_team_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_tow_match = Cvar_Get("dm_tow_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_liberation_match = Cvar_Get("dm_liberation_match", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_run_fast = Cvar_Get("dm_run_fast", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_run_normal = Cvar_Get("dm_run_normal", "1", CVAR_ARCHIVE);
-    static cvar_t* dm_omit_spearhead = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_empty      = Cvar_Get("dm_filter_empty", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_full       = Cvar_Get("dm_filter_full", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_filter_pure       = Cvar_Get("dm_filter_pure", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_max_ping          = Cvar_Get("dm_max_ping", "0", CVAR_ARCHIVE);
+    static cvar_t *dm_free_for_all      = Cvar_Get("dm_free_for_all", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_objective_match   = Cvar_Get("dm_objective_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_round_based_match = Cvar_Get("dm_round_based_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_team_match        = Cvar_Get("dm_team_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_tow_match         = Cvar_Get("dm_tow_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_liberation_match  = Cvar_Get("dm_liberation_match", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_run_fast          = Cvar_Get("dm_run_fast", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_run_normal        = Cvar_Get("dm_run_normal", "1", CVAR_ARCHIVE);
+    static cvar_t *dm_omit_spearhead    = Cvar_Get("dm_omit_spearhead", "0", CVAR_ARCHIVE);
 
-    iServerType = ((ServerListInstance*)instance)->iServerType;
-    uiServerList = ((ServerListInstance*)instance)->serverList;
+    iServerType    = ((ServerListInstance *)instance)->iServerType;
+    uiServerList   = ((ServerListInstance *)instance)->serverList;
     pNewServerItem = NULL;
-    server = (GServer)param1;
+    server         = (GServer)param1;
 
-    if (param2)
-    {
-        if (msg == LIST_PROGRESS && param2 == (void*)-1) {
+    if (param2) {
+        if (msg == LIST_PROGRESS && param2 == (void *)-1) {
             iRealIP = inet_addr(ServerGetAddress(server));
             ServerGetIntValue(server, "hostport", PORT_SERVER);
             iGameSpyPort = ServerGetQueryPort(server);
 
             for (i = 1; i <= uiServerList->getNumItems(); i++) {
-                pNewServerItem = static_cast<FAKKServerListItem*>(uiServerList->GetItem(i));
+                pNewServerItem = static_cast<FAKKServerListItem *>(uiServerList->GetItem(i));
                 if (pNewServerItem->m_uiRealIP == iRealIP && pNewServerItem->m_iGameSpyPort == iGameSpyPort) {
                     break;
                 }
@@ -1009,55 +1079,80 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
             return;
         }
 
-        Cvar_Set("dm_serverstatusbar", va("%i", param2));
+        //Cvar_Set("dm_serverstatusbar", va("%i", (int)(uintptr_t)param2));
+        // Fixed in OPM
+        //  As both lists are combined, show the correct percentage
+        Cvar_Set("dm_serverstatusbar", va("%i", 100 * g_iServerQueryCount / g_iServerTotalCount));
     }
 
-    if (msg == LIST_PROGRESS)
-    {
-        const char* pszHostName;
-        bool bDiffVersion;
-        str sServerName;
-        str sPlayers;
-        const char* pszGameVer;
+    if (msg == LIST_PROGRESS) {
+        const char *pszHostName;
+        bool        bDiffVersion;
+        bool        bIsDemo;
+        str         sServerName;
+        str         sPlayers;
+        const char *pszGameVer;
+        const char *pszGameVerNumber;
+        float       fGameVer;
 
-        pszHostName = ServerGetStringValue(server, "hostname", "(NONE)");
-        bDiffVersion = false;
-        pszGameVer = ServerGetStringValue(server, "gamever", "1.00");
+        pszHostName      = ServerGetStringValue(server, "hostname", "(NONE)");
+        bDiffVersion     = false;
+        bIsDemo          = false;
+        pszGameVer       = ServerGetStringValue(server, "gamever", "1.00");
+        pszGameVerNumber = pszGameVer;
+
+        if (pszGameVerNumber[0] == 'd') {
+            // demo server
+            pszGameVerNumber++;
+            bIsDemo = true;
+        }
+
+        fGameVer = atof(pszGameVerNumber);
 
         if (com_target_game->integer >= target_game_e::TG_MOHTT) {
             if (iServerType == target_game_e::TG_MOHTT) {
-                if (fabs(atof(pszGameVer) - com_target_version->value) > 0.1f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.1f) {
+                //    bDiffVersion = true;
+                //}
+                if (fabs(fGameVer) < 2.3f) {
                     bDiffVersion = true;
                 }
             } else {
-                if (fabs(atof(pszGameVer) - com_target_version->value) > 0.3f) {
+                //if (fabs(fGameVer - com_target_version->value) > 0.3f) {
+                //    bDiffVersion = true;
+                //}
+                if (fabs(fGameVer) < 2.1f) {
                     bDiffVersion = true;
                 }
             }
         } else {
-            if (fabs(atof(pszGameVer) - com_target_version->value) > 0.1f) {
+            if (fabs(fGameVer - com_target_version->value) > 0.1f) {
                 bDiffVersion = true;
             }
         }
         // always show the version
-        sServerName = va(" (%s) %s", pszGameVer, pszHostName);
+        if (!bIsDemo) {
+            sServerName = va(" (%s) %s", pszGameVerNumber, pszHostName);
+        } else {
+            sServerName = va(" (d%s) %s", pszGameVerNumber, pszHostName);
+        }
 
-        iRealIP = inet_addr(ServerGetAddress(server));
-        iPort = ServerGetIntValue(server, "hostport", PORT_SERVER);
+        iRealIP      = inet_addr(ServerGetAddress(server));
+        iPort        = ServerGetIntValue(server, "hostport", PORT_SERVER);
         iGameSpyPort = ServerGetQueryPort(server);
-        sAddress = va("%s:%i", ServerGetAddress(server), iPort);
+        sAddress     = va("%s:%i", ServerGetAddress(server), iPort);
         sPlayers = va("%d/%d", ServerGetIntValue(server, "numplayers", 0), ServerGetIntValue(server, "maxplayers", 0));
-        
+
         for (i = 1; i <= uiServerList->getNumItems(); i++) {
-            pNewServerItem = static_cast<FAKKServerListItem*>(uiServerList->GetItem(i));
+            pNewServerItem = static_cast<FAKKServerListItem *>(uiServerList->GetItem(i));
             if (pNewServerItem->m_uiRealIP == iRealIP && pNewServerItem->m_iGameSpyPort == iGameSpyPort) {
                 break;
             }
         }
 
         if (i > uiServerList->getNumItems() || !pNewServerItem) {
-            pNewServerItem = new FAKKServerListItem("?", sAddress, "?", "?/?", "?", "?", "?");
-            pNewServerItem->m_sIP = ServerGetAddress(server);
+            pNewServerItem             = new FAKKServerListItem(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
+            pNewServerItem->m_sIP      = ServerGetAddress(server);
             pNewServerItem->m_uiRealIP = iRealIP;
             pNewServerItem->m_iGameSpyPort = iGameSpyPort;
 
@@ -1077,15 +1172,12 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         pNewServerItem->SetQueried(true);
         pNewServerItem->SetNumPlayers(ServerGetIntValue(server, "numplayers", 0));
 
-        iServerQueryCount++;
-        Cvar_Set("dm_servercount", va("%d/%d", iServerQueryCount, iServerTotalCount));
+        g_iServerQueryCount++;
+        Cvar_Set("dm_servercount", va("%d/%d", g_iServerQueryCount, g_iServerTotalCount));
 
         uiServerList->SortByLastSortColumn();
-    }
-    else if (msg == LIST_STATECHANGED)
-    {
-        switch (ServerListState(serverlist))
-        {
+    } else if (msg == LIST_STATECHANGED) {
+        switch (ServerListState(serverlist)) {
         case GServerListState::sl_idle:
             if (com_target_game->integer >= target_game_e::TG_MOHTT) {
                 if (iServerType == target_game_e::TG_MOHTT) {
@@ -1109,14 +1201,17 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         case GServerListState::sl_listxfer:
             Cvar_Set("dm_serverstatus", "Getting List.");
             if (com_target_game->integer >= target_game_e::TG_MOHTT) {
-                if (iServerType == target_game_e::TG_MOHTT) uiServerList->m_bGettingList[0] = true;
-                if (iServerType == target_game_e::TG_MOHTA) uiServerList->m_bGettingList[1] = true;
+                if (iServerType == target_game_e::TG_MOHTT) {
+                    uiServerList->m_bGettingList[0] = true;
+                }
+                if (iServerType == target_game_e::TG_MOHTA) {
+                    uiServerList->m_bGettingList[1] = true;
+                }
             } else {
                 uiServerList->m_bGettingList[0] = true;
                 uiServerList->m_bGettingList[1] = false;
             }
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount = 0;
             return;
         case GServerListState::sl_lanlist:
             Cvar_Set("dm_serverstatus", "Searching LAN.");
@@ -1125,18 +1220,27 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         case GServerListState::sl_querying:
             Cvar_Set("dm_serverstatus", "Querying Servers.");
             uiServerList->m_bUpdatingList = true;
-            iServerQueryCount = 0;
-            iServerTotalCount = 0;
             break;
         default:
             break;
         }
 
-        if (!uiServerList->m_bGettingList[0] && !uiServerList->m_bGettingList[1]) {
-            return;
+        //if (!uiServerList->m_bGettingList[0] && !uiServerList->m_bGettingList[1]) {
+        //    return;
+        //}
+
+        // Rebuild the number of servers
+        g_iServerTotalCount = 0;
+        for(i = 0; i < ARRAY_LEN(uiServerList->m_serverList); i++) {
+            if (uiServerList->m_bGettingList[i] && uiServerList->m_serverList[i]) {
+                g_iServerTotalCount += ServerListCount(uiServerList->m_serverList[i]);
+            }
         }
 
-        iServerTotalCount += ServerListCount(serverlist);
+        // Removed in 2.0
+        //  Only add entries for servers that are queried successfully
+        //  it avoids unnecessary entries
+#if 0
         for (j = 0; j < ServerListCount(serverlist); j++) {
             GServer arrayServer = ServerListGetServer(serverlist, j);
         
@@ -1154,7 +1258,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
                 continue;
             }
 
-            pNewServerItem = new FAKKServerListItem("?", sAddress, "?", "?/?", "?", "?", "?");
+            pNewServerItem = new FAKKServerListItem(uiServerList, "?", sAddress, "?", "?/?", "?", "?", "?");
             pNewServerItem->m_sIP = ServerGetAddress(arrayServer);
             pNewServerItem->m_uiRealIP = iRealIP;
             pNewServerItem->m_iPort = PORT_SERVER;
@@ -1164,6 +1268,7 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
 
             uiServerList->AddItem(pNewServerItem);
         }
+#endif
 
         /*
         for (i = 1; i <= uiServerList->getNumItems(); i++)
@@ -1191,4 +1296,4 @@ void UpdateServerListCallBack(GServerList serverlist, int msg, void* instance, v
         }
         */
     }
-}
\ No newline at end of file
+}
diff --git a/code/client/cl_uiserverlist.h b/code/client/cl_uiserverlist.h
index d8638b32..91c46016 100644
--- a/code/client/cl_uiserverlist.h
+++ b/code/client/cl_uiserverlist.h
@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
+#include "../gamespy/goaceng.h"
+
 class UIFAKKServerList : public UIListCtrl {
 protected:
 	// need a new struct instead of gamespy
@@ -47,6 +49,7 @@ protected:
 	void			MakeLANListing( Event *ev );
 	void			UpdateServer( Event *ev );
 	static int		ServerCompareFunction( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname );
+    static void     UpdateServerListCallBack(GServerList serverlist, int msg, void *instance, void *param1, void *param2);
 public:
 	UIFAKKServerList();
 
diff --git a/code/client/cl_uisoundpicker.cpp b/code/client/cl_uisoundpicker.cpp
index a45c434c..384ac8ff 100644
--- a/code/client/cl_uisoundpicker.cpp
+++ b/code/client/cl_uisoundpicker.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,22 +22,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "cl_ui.h"
 
-CLASS_DECLARATION( FilePickerClass, SoundPickerClass, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(FilePickerClass, SoundPickerClass, NULL) {
+    {NULL, NULL}
 };
 
 SoundPickerClass::SoundPickerClass()
 {
-	// FIXME: stub
+    str         soundpath;
+    str         currentpath;
+    const char *varValue;
+    int         i;
+
+    soundpath = "sound";
+
+    varValue = UI_GetCvarString("ui_pickedsound", NULL);
+    if (varValue && *varValue) {
+        currentpath = varValue;
+
+        for (i = currentpath.length(); i > 0; i--) {
+            if (currentpath[i] == '/') {
+                break;
+            }
+        }
+
+        currentpath = str(currentpath, 0, i + 1);
+    } else {
+        currentpath = soundpath;
+    }
 }
 
-void SoundPickerClass::FileSelected( str &currentDirectory, str &partialName, str &fullname )
+void SoundPickerClass::FileSelected(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-
+    uii.Snd_PlaySound(fullname);
 }
 
-void SoundPickerClass::FileChosen( str &currentDirectory, str &partialName, str &fullname )
+void SoundPickerClass::FileChosen(const str& currentDirectory, const str& partialName, const str& fullname)
 {
-
+    uii.Cvar_Set("ui_pickedsound", fullname);
+    CloseWindow();
 }
diff --git a/code/client/cl_uisoundpicker.h b/code/client/cl_uisoundpicker.h
index 4ead3be2..6c6a9275 100644
--- a/code/client/cl_uisoundpicker.h
+++ b/code/client/cl_uisoundpicker.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,17 +20,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UISOUNDPICKER_H__
-#define __CL_UISOUNDPICKER_H__
+#pragma once
 
-class SoundPickerClass : public FilePickerClass {
+class SoundPickerClass : public FilePickerClass
+{
 public:
-	CLASS_PROTOTYPE( SoundPickerClass );
+    CLASS_PROTOTYPE(SoundPickerClass);
 
-	SoundPickerClass();
+    SoundPickerClass();
 
-	void	FileSelected( str &currentDirectory, str &partialName, str &fullname ) override;
-	void	FileChosen( str &currentDirectory, str &partialName, str &fullname ) override;
+    void FileSelected(const str& currentDirectory, const str& partialName, const str& fullname) override;
+    void FileChosen(const str& currentDirectory, const str& partialName, const str& fullname) override;
 };
-
-#endif /* __CL_UISOUNDPICKER_H__ */
diff --git a/code/client/cl_uistd.cpp b/code/client/cl_uistd.cpp
index 80e3ec53..4fd41c6e 100644
--- a/code/client/cl_uistd.cpp
+++ b/code/client/cl_uistd.cpp
@@ -24,601 +24,700 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110EV_DEFAULT301  U
 #include "../qcommon/localization.h"
 
 Event EV_Layout_PlayerStat
-	(
-	"playerstat",
-	EV_DEFAULT,
-	"i",
-	"playerstatValue",
-	"set playerstat for layout\n"
-	);
+(
+    "playerstat",
+    EV_DEFAULT,
+    "i",
+    "playerstatValue",
+    "set playerstat for layout\n"
+);
+// Added in 2.0
+Event EV_Layout_PlayerStatAlpha
+(
+    "playerstatalpha",
+    EV_DEFAULT,
+    "i",
+    "playerstatValue",
+    "set playerstat to control alpha for layout\n"
+);
 Event EV_Layout_PlayerStatConfigstring
-	(
-	"playerstatconfigstring",
-	EV_DEFAULT,
-	"i",
-	"playerstatValue",
-	"set playerstat for layout - will print out the corresponding configstring\n"
-	);
+(
+    "playerstatconfigstring",
+    EV_DEFAULT,
+    "i",
+    "playerstatValue",
+    "set playerstat for layout - will print out the corresponding configstring\n"
+);
 Event EV_Layout_MaxPlayerStat
-	(
-	"maxplayerstat",
-	EV_DEFAULT,
-	"i",
-	"maxPlayerstatValue",
-	"set the playerstat that holds the max value for that stat.  Used for statbars\n"
-	);
+(
+    "maxplayerstat",
+    EV_DEFAULT,
+    "i",
+    "maxPlayerstatValue",
+    "set the playerstat that holds the max value for that stat.  Used for statbars\n"
+);
 Event EV_Layout_ItemIndex
-	(
-	"itemstat",
-	EV_DEFAULT,
-	"i",
-	"itemstatValue",
-	"set itemstat for layout\n"
-	);
+(
+    "itemstat",
+    EV_DEFAULT,
+    "i",
+    "itemstatValue",
+    "set itemstat for layout\n"
+);
 Event EV_Layout_InventoryRenderModelIndex
-	(
-	"invmodelhand",
-	EV_DEFAULT,
-	"i",
-	"handindex",
-	"set the specified hand index to render a 3d model from\n"
-	);
+(
+    "invmodelhand",
+    EV_DEFAULT,
+    "i",
+    "handindex",
+    "set the specified hand index to render a 3d model from\n"
+);
 Event EV_Layout_Statbar
-	(
-	"statbar",
-	EV_DEFAULT,
-	"sII",
-	"orientation min max",
-	"make this label present the stat using a graphical bar.  Optionally specify a min and max value"
-	);
+(
+    "statbar",
+    EV_DEFAULT,
+    "sII",
+    "orientation min max",
+    "make this label present the stat using a graphical bar.  Optionally specify a min and max value"
+);
 Event EV_Layout_StatbarTileShader
-	(
-	"statbar_tileshader",
-	EV_DEFAULT,
-	"s",
-	"shader",
-	"set the tile shader for this statbar"
-	);
+(
+    "statbar_tileshader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "set the tile shader for this statbar"
+);
 Event EV_Layout_StatbarTileShader_Flash
-	(
-	"statbar_tileshader_flash",
-	EV_DEFAULT,
-	"s",
-	"shader",
-	"set the flash tile shader for this statbar"
-	);
+(
+    "statbar_tileshader_flash",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "set the flash tile shader for this statbar"
+);
 Event EV_Layout_StatbarShader
-	(
-	"statbar_shader",
-	EV_DEFAULT,
-	"s",
-	"shader",
-	"set the shader for this statbar"
-	);
+(
+    "statbar_shader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "set the shader for this statbar"
+);
 Event EV_Layout_StatbarShader_Flash
-	(
-	"statbar_shader_flash",
-	EV_DEFAULT,
-	"s",
-	"shader",
-	"set the flash shader for this statbar"
-	);
+(
+    "statbar_shader_flash",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "set the flash shader for this statbar"
+);
+// Added in 2.0
+Event EV_Layout_StatbarShader_Marker
+(
+    "statbar_shader_marker",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "set the marker shader for this statbar\nThis is drawn at the end of the status bar"
+);
 Event EV_Layout_Statbar_EndAngles
-	(
-	"statbar_endangles",
-	EV_DEFAULT,
-	"ff",
-	"startang endang",
-	"Sets the start and end angles for a circular stat bar"
-	);
+(
+    "statbar_endangles",
+    EV_DEFAULT,
+    "ff",
+    "startang endang",
+    "Sets the start and end angles for a circular stat bar"
+);
 Event EV_Layout_Statbar_NeedleWidth
-	(
-	"statbar_needlewidth",
-	EV_DEFAULT,
-	"f",
-	"width",
-	"Sets the width of the needle for a needle statbar"
-	);
+(
+    "statbar_needlewidth",
+    EV_DEFAULT,
+    "f",
+    "width",
+    "Sets the width of the needle for a needle statbar"
+);
 Event EV_Layout_Statbar_RotatorSize
-	(
-	"statbar_rotatorsize",
-	EV_DEFAULT,
-	"f",
-	"width",
-	"Sets the width of the needle for a needle statbar"
-	);
+(
+    "statbar_rotatorsize",
+    EV_DEFAULT,
+    "f",
+    "width",
+    "Sets the width of the needle for a needle statbar"
+);
 Event EV_Layout_DrawModelName
-	(
-	"invmodelname",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"set the name of the 3d model to render\n"
-	);
+(
+    "invmodelname",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "set the name of the 3d model to render\n"
+);
 Event EV_Layout_RenderModel
-	(
-	"rendermodel",
-	EV_DEFAULT,
-	"b",
-	"bool",
-	"Render the model specified by the cvar."
-	);
+(
+    "rendermodel",
+    EV_DEFAULT,
+    "b",
+    "bool",
+    "Render the model specified by the cvar."
+);
 Event EV_Layout_RenderModelOffset
-	(
-	"modeloffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Render model offset"
-	);
+(
+    "modeloffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Render model offset"
+);
 Event EV_Layout_RenderModelRotateOffset
-	(
-	"modelrotateoffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Render model rotation offset"
-	);
+(
+    "modelrotateoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Render model rotation offset"
+);
 Event EV_Layout_RenderModelAngles
-	(
-	"modelangles",
-	EV_DEFAULT,
-	"v",
-	"angles",
-	"Render model angles"
-	);
+(
+    "modelangles",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "Render model angles"
+);
 Event EV_Layout_RenderModelScale
-	(
-	"modelscale",
-	EV_DEFAULT,
-	"f",
-	"scale",
-	"Render model scale"
-	);
+(
+    "modelscale",
+    EV_DEFAULT,
+    "f",
+    "scale",
+    "Render model scale"
+);
 Event EV_Layout_RenderModelAnim
-	(
-	"modelanim",
-	EV_DEFAULT,
-	"s",
-	"anim",
-	"Render model anim"
-	);
+(
+    "modelanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Render model anim"
+);
 Event EV_ClearInvItemReference
-	(
-	"clearinvitemref",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"used internally when the inventory is reset\n"
-	);
+(
+    "clearinvitemref",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "used internally when the inventory is reset\n"
+);
 
-CLASS_DECLARATION( UILabel, UIFakkLabel, NULL )
-{
-	{ &EV_Layout_PlayerStat,					&UIFakkLabel::LayoutPlayerStat },
-	{ &EV_Layout_PlayerStatConfigstring,		&UIFakkLabel::LayoutPlayerStatConfigstring },
-	{ &EV_Layout_MaxPlayerStat,					&UIFakkLabel::LayoutMaxPlayerStat },
-	{ &EV_Layout_ItemIndex,						&UIFakkLabel::LayoutItemIndex },
-	{ &EV_Layout_InventoryRenderModelIndex,		&UIFakkLabel::InventoryRenderModelIndex },
-	{ &EV_Layout_Statbar,						&UIFakkLabel::LayoutStatbar },
-	{ &EV_Layout_StatbarTileShader,				&UIFakkLabel::LayoutStatbarTileShader },
-	{ &EV_Layout_StatbarShader,					&UIFakkLabel::LayoutStatbarShader },
-	{ &EV_Layout_StatbarTileShader_Flash,		&UIFakkLabel::LayoutStatbarTileShader_Flash },
-	{ &EV_Layout_StatbarShader_Flash,			&UIFakkLabel::LayoutStatbarShader_Flash },
-	{ &EV_Layout_Statbar_EndAngles,				&UIFakkLabel::LayoutStatbarEndAngles },
-	{ &EV_Layout_Statbar_NeedleWidth,			&UIFakkLabel::LayoutStatbarNeedleWidth },
-	{ &EV_Layout_Statbar_RotatorSize,			&UIFakkLabel::LayoutStatbarRotatorSize },
-	{ &EV_Layout_DrawModelName,					&UIFakkLabel::LayoutModelName },
-	{ &EV_Layout_RenderModel,					&UIFakkLabel::LayoutRenderModel },
-	{ &EV_Layout_RenderModelOffset,				&UIFakkLabel::LayoutRenderModelOffset },
-	{ &EV_Layout_RenderModelRotateOffset,		&UIFakkLabel::LayoutRenderModelRotateOffset },
-	{ &EV_Layout_RenderModelAngles,				&UIFakkLabel::LayoutRenderModelAngles },
-	{ &EV_Layout_RenderModelScale,				&UIFakkLabel::LayoutRenderModelScale },
-	{ &EV_Layout_RenderModelAnim,				&UIFakkLabel::LayoutRenderModelAnim },
-	{ &EV_ClearInvItemReference,				&UIFakkLabel::ClearInvItemReference },
-	{ NULL, NULL }
+CLASS_DECLARATION(UILabel, UIFakkLabel, NULL) {
+    {&EV_Layout_PlayerStat,                &UIFakkLabel::LayoutPlayerStat             },
+    {&EV_Layout_PlayerStatAlpha,           &UIFakkLabel::LayoutPlayerStatAlpha        },
+    {&EV_Layout_PlayerStatConfigstring,    &UIFakkLabel::LayoutPlayerStatConfigstring },
+    {&EV_Layout_MaxPlayerStat,             &UIFakkLabel::LayoutMaxPlayerStat          },
+    {&EV_Layout_ItemIndex,                 &UIFakkLabel::LayoutItemIndex              },
+    {&EV_Layout_InventoryRenderModelIndex, &UIFakkLabel::InventoryRenderModelIndex    },
+    {&EV_Layout_Statbar,                   &UIFakkLabel::LayoutStatbar                },
+    {&EV_Layout_StatbarTileShader,         &UIFakkLabel::LayoutStatbarTileShader      },
+    {&EV_Layout_StatbarShader,             &UIFakkLabel::LayoutStatbarShader          },
+    {&EV_Layout_StatbarTileShader_Flash,   &UIFakkLabel::LayoutStatbarTileShader_Flash},
+    {&EV_Layout_StatbarShader_Marker,      &UIFakkLabel::LayoutStatbarShader_Marker   },
+    {&EV_Layout_StatbarShader_Flash,       &UIFakkLabel::LayoutStatbarShader_Flash    },
+    {&EV_Layout_Statbar_EndAngles,         &UIFakkLabel::LayoutStatbarEndAngles       },
+    {&EV_Layout_Statbar_NeedleWidth,       &UIFakkLabel::LayoutStatbarNeedleWidth     },
+    {&EV_Layout_Statbar_RotatorSize,       &UIFakkLabel::LayoutStatbarRotatorSize     },
+    {&EV_Layout_DrawModelName,             &UIFakkLabel::LayoutModelName              },
+    {&EV_Layout_RenderModel,               &UIFakkLabel::LayoutRenderModel            },
+    {&EV_Layout_RenderModelOffset,         &UIFakkLabel::LayoutRenderModelOffset      },
+    {&EV_Layout_RenderModelRotateOffset,   &UIFakkLabel::LayoutRenderModelRotateOffset},
+    {&EV_Layout_RenderModelAngles,         &UIFakkLabel::LayoutRenderModelAngles      },
+    {&EV_Layout_RenderModelScale,          &UIFakkLabel::LayoutRenderModelScale       },
+    {&EV_Layout_RenderModelAnim,           &UIFakkLabel::LayoutRenderModelAnim        },
+    {&EV_ClearInvItemReference,            &UIFakkLabel::ClearInvItemReference        },
+    {NULL,                                 NULL                                       }
 };
 
 UIFakkLabel::UIFakkLabel()
 {
-	m_statbar_min = m_statbar_max = -1.0;
-	m_stat = -1;
-	m_stat_configstring = -1;
-	m_maxstat = -1;
-	m_itemindex = -1;
-	m_inventoryrendermodelindex = -1;
-	m_rendermodel = false;
-	m_statbar_or = L_STATBAR_NONE;
-	m_statbar_material = NULL;
-	m_statbar_material_flash = NULL;
-	m_lastitemindex = -1;
+    m_statbar_min = m_statbar_max = -1.0;
+    m_stat                        = -1;
+    m_stat_alpha                  = -1;
+    m_stat_configstring           = -1;
+    m_maxstat                     = -1;
+    m_itemindex                   = -1;
+    m_inventoryrendermodelindex   = -1;
+    m_rendermodel                 = false;
+    m_statbar_or                  = L_STATBAR_NONE;
+    m_statbar_material            = NULL;
+    m_statbar_material_flash      = NULL;
+    m_statbar_material_marker     = NULL;
+    m_lastitemindex               = -1;
 }
 
-void UIFakkLabel::LayoutPlayerStat( Event *ev )
+void UIFakkLabel::LayoutPlayerStat(Event *ev)
 {
-	m_stat = ev->GetInteger( 1 );
+    m_stat = ev->GetInteger(1);
 }
 
-void UIFakkLabel::LayoutPlayerStatConfigstring( Event *ev )
+void UIFakkLabel::LayoutPlayerStatAlpha(Event *ev)
 {
-	m_stat_configstring = ev->GetInteger( 1 );
+    m_stat_alpha = ev->GetInteger(1);
 }
 
-void UIFakkLabel::LayoutMaxPlayerStat( Event *ev )
+void UIFakkLabel::LayoutPlayerStatConfigstring(Event *ev)
 {
-	m_maxstat = ev->GetInteger( 1 );
+    m_stat_configstring = ev->GetInteger(1);
 }
 
-void UIFakkLabel::LayoutItemIndex( Event *ev )
+void UIFakkLabel::LayoutMaxPlayerStat(Event *ev)
 {
-	m_itemindex = ev->GetInteger( 1 );
+    m_maxstat = ev->GetInteger(1);
 }
 
-void UIFakkLabel::InventoryRenderModelIndex( Event *ev )
+void UIFakkLabel::LayoutItemIndex(Event *ev)
 {
-	m_inventoryrendermodelindex = ev->GetInteger( 1 );
+    m_itemindex = ev->GetInteger(1);
 }
 
-void UIFakkLabel::LayoutModelName( Event *ev )
+void UIFakkLabel::InventoryRenderModelIndex(Event *ev)
 {
-	m_sDrawModelName = ev->GetString( 1 );
+    m_inventoryrendermodelindex = ev->GetInteger(1);
 }
 
-void UIFakkLabel::ClearInvItemReference( Event *ev )
+void UIFakkLabel::LayoutModelName(Event *ev)
 {
-	m_lastitem = NULL;
-	m_lastitemindex = -1;
+    m_sDrawModelName = ev->GetString(1);
 }
 
-void UIFakkLabel::LayoutStatbar( Event *ev )
+void UIFakkLabel::ClearInvItemReference(Event *ev)
 {
-	str _or = ev->GetString( 1 );
-
-	if( ev->NumArgs() > 1 )
-	{
-		m_statbar_min = ev->GetFloat( 2 );
-		m_statbar_max = ev->GetFloat( 3 );
-	}
-
-	if( !str::icmp( _or, "horizontal" ) )
-	{
-		m_statbar_or = L_STATBAR_HORIZONTAL;
-	}
-	else if( !str::icmp( _or, "vertical_stagger_even" ) )
-	{
-		m_statbar_or = L_STATBAR_VERTICAL_STAGGER_EVEN;
-	}
-	else if( !str::icmp( _or, "vertical_stagger_odd" ) )
-	{
-		m_statbar_or = L_STATBAR_VERTICAL_STAGGER_ODD;
-	}
-	else if( !str::icmp( _or, "vertical" ) )
-	{
-		m_statbar_or = L_STATBAR_VERTICAL;
-	}
-	else if( !str::icmp( _or, "vertical_reverse" ) )
-	{
-		m_statbar_or = L_STATBAR_VERTICAL_REVERSE;
-	}
-	else if( !str::icmp( _or, "circular" ) )
-	{
-		m_statbar_or = L_STATBAR_CIRCULAR;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else if( !str::icmp( _or, "needle" ) )
-	{
-		m_statbar_or = L_STATBAR_NEEDLE;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else if( !str::icmp( _or, "rotator" ) )
-	{
-		m_statbar_or = L_STATBAR_ROTATOR;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else if( !str::icmp( _or, "compass" ) )
-	{
-		m_statbar_or = L_STATBAR_COMPASS;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else if( !str::icmp( _or, "spinner" ) )
-	{
-		m_statbar_or = L_STATBAR_SPINNER;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else if( !str::icmp( _or, "headingspinner" ) )
-	{
-		m_statbar_or = L_STATBAR_HEADING_SPINNER;
-
-		if( !m_statbar_material )
-		{
-			m_statbar_material = uWinMan.RegisterShader( "blank" );
-		}
-	}
-	else
-	{
-		warning( "LayoutPlayerStat", "Invalid statbar orientation: \"%s\"", _or.c_str() );
-	}
+    m_lastitem      = NULL;
+    m_lastitemindex = -1;
 }
 
-void UIFakkLabel::LayoutStatbarShader( Event *ev )
+void UIFakkLabel::LayoutStatbar(Event *ev)
 {
-	m_statbar_material = uWinMan.RegisterShader( ev->GetString( 1 ) );
+    str _or = ev->GetString(1);
+
+    if (ev->NumArgs() > 1) {
+        m_statbar_min = ev->GetFloat(2);
+        m_statbar_max = ev->GetFloat(3);
+    }
+
+    if (!str::icmp(_or, "horizontal")) {
+        m_statbar_or = L_STATBAR_HORIZONTAL;
+    } else if (!str::icmp(_or, "vertical_stagger_even")) {
+        m_statbar_or = L_STATBAR_VERTICAL_STAGGER_EVEN;
+    } else if (!str::icmp(_or, "vertical_stagger_odd")) {
+        m_statbar_or = L_STATBAR_VERTICAL_STAGGER_ODD;
+    } else if (!str::icmp(_or, "vertical")) {
+        m_statbar_or = L_STATBAR_VERTICAL;
+    } else if (!str::icmp(_or, "vertical_reverse")) {
+        m_statbar_or = L_STATBAR_VERTICAL_REVERSE;
+    } else if (!str::icmp(_or, "circular")) {
+        m_statbar_or = L_STATBAR_CIRCULAR;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else if (!str::icmp(_or, "needle")) {
+        m_statbar_or = L_STATBAR_NEEDLE;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else if (!str::icmp(_or, "rotator")) {
+        m_statbar_or = L_STATBAR_ROTATOR;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else if (!str::icmp(_or, "compass")) {
+        m_statbar_or = L_STATBAR_COMPASS;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else if (!str::icmp(_or, "spinner")) {
+        m_statbar_or = L_STATBAR_SPINNER;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else if (!str::icmp(_or, "headingspinner")) {
+        m_statbar_or = L_STATBAR_HEADING_SPINNER;
+
+        if (!m_statbar_material) {
+            m_statbar_material = uWinMan.RegisterShader("blank");
+        }
+    } else {
+        warning("LayoutPlayerStat", "Invalid statbar orientation: \"%s\"", _or.c_str());
+    }
 }
 
-void UIFakkLabel::LayoutStatbarTileShader( Event *ev )
+void UIFakkLabel::LayoutStatbarShader(Event *ev)
 {
-	m_statbar_material = uWinMan.RegisterShader( ev->GetString( 1 ) );
-	AddFlag( WF_TILESHADER );
+    m_statbar_material = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void UIFakkLabel::LayoutStatbarShader_Flash( Event *ev )
+void UIFakkLabel::LayoutStatbarTileShader(Event *ev)
 {
-	m_statbar_material_flash = uWinMan.RegisterShader( ev->GetString( 1 ) );
+    m_statbar_material = uWinMan.RegisterShader(ev->GetString(1));
+    AddFlag(WF_TILESHADER);
 }
 
-void UIFakkLabel::LayoutStatbarEndAngles( Event *ev )
+void UIFakkLabel::LayoutStatbarShader_Flash(Event *ev)
 {
-	m_angles[ 0 ] = ev->GetFloat( 1 );
-	m_angles[ 1 ] = ev->GetFloat( 2 );
+    m_statbar_material_flash = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void UIFakkLabel::LayoutStatbarNeedleWidth( Event *ev )
+void UIFakkLabel::LayoutStatbarShader_Marker(Event *ev)
 {
-	m_angles[ 2 ] = ev->GetFloat( 1 );
+    m_statbar_material_marker = uWinMan.RegisterShader(ev->GetString(1));
 }
 
-void UIFakkLabel::LayoutStatbarRotatorSize( Event *ev )
+void UIFakkLabel::LayoutStatbarEndAngles(Event *ev)
 {
-	m_angles[ 2 ] = ev->GetFloat( 1 );
-
-	if( ev->NumArgs() > 1 ) {
-		m_scale = ev->GetFloat( 2 );
-	} else {
-		m_scale = m_angles[ 2 ];
-	}
+    m_angles[0] = ev->GetFloat(1);
+    m_angles[1] = ev->GetFloat(2);
 }
 
-void UIFakkLabel::LayoutStatbarTileShader_Flash( Event *ev )
+void UIFakkLabel::LayoutStatbarNeedleWidth(Event *ev)
 {
-	m_statbar_material_flash = uWinMan.RegisterShader( ev->GetString( 1 ) );
-	AddFlag( WF_TILESHADER );
+    m_angles[2] = ev->GetFloat(1);
 }
 
-void UIFakkLabel::LayoutRenderModel( Event *ev )
+void UIFakkLabel::LayoutStatbarRotatorSize(Event *ev)
 {
-	m_rendermodel = ev->GetBoolean( 1 );
+    m_angles[2] = ev->GetFloat(1);
+
+    if (ev->NumArgs() > 1) {
+        m_scale = ev->GetFloat(2);
+    } else {
+        m_scale = m_angles[2];
+    }
 }
 
-void UIFakkLabel::LayoutRenderModelOffset( Event *ev )
+void UIFakkLabel::LayoutStatbarTileShader_Flash(Event *ev)
 {
-	Vector vec = ev->GetVector( 1 );
-	VectorCopy( vec, m_offset );
+    m_statbar_material_flash = uWinMan.RegisterShader(ev->GetString(1));
+    AddFlag(WF_TILESHADER);
 }
 
-void UIFakkLabel::LayoutRenderModelRotateOffset( Event *ev )
+void UIFakkLabel::LayoutRenderModel(Event *ev)
 {
-	Vector vec = ev->GetVector( 1 );
-	VectorCopy( vec, m_rotateoffset );
+    m_rendermodel = ev->GetBoolean(1);
 }
 
-void UIFakkLabel::LayoutRenderModelAngles( Event *ev )
+void UIFakkLabel::LayoutRenderModelOffset(Event *ev)
 {
-	Vector vec = ev->GetVector( 1 );
-	VectorCopy( vec, m_angles );
+    Vector vec = ev->GetVector(1);
+    VectorCopy(vec, m_offset);
 }
 
-void UIFakkLabel::LayoutRenderModelScale( Event *ev )
+void UIFakkLabel::LayoutRenderModelRotateOffset(Event *ev)
 {
-	m_scale = ev->GetFloat( 1 );
+    Vector vec = ev->GetVector(1);
+    VectorCopy(vec, m_rotateoffset);
 }
 
-void UIFakkLabel::LayoutRenderModelAnim( Event *ev )
+void UIFakkLabel::LayoutRenderModelAngles(Event *ev)
 {
-	m_anim = ev->GetString( 1 );
+    Vector vec = ev->GetVector(1);
+    VectorCopy(vec, m_angles);
 }
 
-void UIFakkLabel::DrawStatbar( float frac )
+void UIFakkLabel::LayoutRenderModelScale(Event *ev)
 {
-	vec4_t col;
-	float alpha;
-
-	col[0] = col[1] = col[2] = col[3] = 1.0;
-
-	switch (m_statbar_or)
-	{
-	case L_STATBAR_CIRCULAR:
-		DrawStatCircle(frac);
-		return;
-	case L_STATBAR_NEEDLE:
-		DrawStatNeedle(frac);
-		return;
-	case L_STATBAR_ROTATOR:
-		DrawStatRotator(frac);
-		return;
-	case L_STATBAR_COMPASS:
-		DrawStatCompass(frac);
-		return;
-	case L_STATBAR_SPINNER:
-	case L_STATBAR_HEADING_SPINNER:
-		DrawStatSpinner(frac);
-		return;
-	default:
-		break;
-	}
-
-	if (!frac) {
-		return;
-	}
-
-	if (frac != m_lastfrac) {
-		m_flashtime = uid.time;
-	}
-	m_lastfrac = frac;
-
-	alpha = 1.0 - ((float)uid.time - m_flashtime) / 1500.0;
-	if (alpha < 0.0) alpha = 0.0;
-	else if (alpha > 1.0) alpha = 1.0;
-
-	col[3] = alpha;
-
-	if (m_statbar_material)
-	{
-		if (m_flags & WF_TILESHADER)
-		{
-			switch (m_statbar_or)
-			{
-			case L_STATBAR_HORIZONTAL:
-			{
-				float width = frac * m_frame.size.width;
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material->GetMaterial());
-
-				if (alpha != 0.0 && m_statbar_material_flash)
-				{
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
-				}
-				break;
-			}
-			case L_STATBAR_VERTICAL:
-			case L_STATBAR_VERTICAL_REVERSE:
-			case L_STATBAR_VERTICAL_STAGGER_EVEN:
-			case L_STATBAR_VERTICAL_STAGGER_ODD:
-			{
-				float y = m_frame.size.height * (1.0 - frac);
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material->GetMaterial());
-
-				if (alpha != 0.0 && m_statbar_material_flash)
-				{
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
-				}
-				break;
-			}
-			default:
-				break;
-			}
-		}
-		else
-		{
-			switch (m_statbar_or)
-			{
-			case L_STATBAR_HORIZONTAL:
-			{
-				float width = frac * m_frame.size.width;
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0.0, 0.0, 1.0, 1.0, m_statbar_material->GetMaterial());
-
-				if(alpha != 0.0 && m_statbar_material_flash)
-				{
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0.0, 0.0, 1.0, 1.0, m_statbar_material_flash->GetMaterial());
-				}
-				break;
-			}
-			case L_STATBAR_VERTICAL:
-			case L_STATBAR_VERTICAL_STAGGER_EVEN:
-			case L_STATBAR_VERTICAL_STAGGER_ODD:
-			{
-				float y = m_frame.size.height * (1.0 - frac);
-				float height = m_frame.size.height * frac;
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawStretchPic(0.0, y, m_frame.size.width, height, 0.0, 1.0 - frac, 1.0, 1.0, m_statbar_material->GetMaterial());
-
-				if (alpha != 0.0 && m_statbar_material_flash)
-				{
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawStretchPic(0.0, y, m_frame.size.width, height, 0.0, 1.0 - frac, 1.0, 1.0, m_statbar_material_flash->GetMaterial());
-				}
-				break;
-			}
-			case L_STATBAR_VERTICAL_REVERSE:
-			{
-				float height = m_frame.size.height * frac;
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawStretchPic(0.0, 0.0, m_frame.size.width, height, 0.0, 0.0, 1.0, frac, m_statbar_material->GetMaterial());
-
-				if (alpha != 0.0 && m_statbar_material_flash)
-				{
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawStretchPic(0.0, 0.0, m_frame.size.width, height, 0.0, 0.0, 1.0, frac, m_statbar_material_flash->GetMaterial());
-				}
-				break;
-			}
-			default:
-				break;
-			}
-		}
-	}
-	else
-	{
-		switch (m_statbar_or)
-		{
-		case L_STATBAR_VERTICAL:
-		case L_STATBAR_VERTICAL_STAGGER_EVEN:
-		case L_STATBAR_VERTICAL_STAGGER_ODD:
-			DrawBox(
-				0.0,
-				m_frame.size.height * (1.0 - frac),
-				m_frame.size.width,
-				m_frame.size.height,
-				m_foreground_color,
-				1.0
-			);
-			break;
-		case L_STATBAR_HORIZONTAL:
-			DrawBox(
-				0.0,
-				0.0,
-				frac * m_frame.size.width,
-				m_frame.size.height,
-				m_foreground_color,
-				1.0
-			);
-			break;
-		default:
-			break;
-		}
-	}
+    m_scale = ev->GetFloat(1);
 }
 
-void UIFakkLabel::DrawStatCircle( float frac )
+void UIFakkLabel::LayoutRenderModelAnim(Event *ev)
 {
-	vec4_t col;
-	float alpha;
-	float fCurrAng, fEndAng, fNextAng;
-	vec2_t vVerts[3];
-	vec2_t vTexCoords[3];
+    m_anim = ev->GetString(1);
+}
+
+void UIFakkLabel::DrawStatbar(float frac)
+{
+    vec4_t    col;
+    float     alpha;
+    qhandle_t hMat;
+    float     w, h;
+    float     fvWidth, fvHeight;
+
+    col[0] = col[1] = col[2] = col[3] = 1.0;
+
+    switch (m_statbar_or) {
+    case L_STATBAR_CIRCULAR:
+        DrawStatCircle(frac);
+        return;
+    case L_STATBAR_NEEDLE:
+        DrawStatNeedle(frac);
+        return;
+    case L_STATBAR_ROTATOR:
+        DrawStatRotator(frac);
+        return;
+    case L_STATBAR_COMPASS:
+        DrawStatCompass(frac);
+        return;
+    case L_STATBAR_SPINNER:
+    case L_STATBAR_HEADING_SPINNER:
+        DrawStatSpinner(frac);
+        return;
+    default:
+        break;
+    }
+
+    if (!frac) {
+        return;
+    }
+
+    if (frac != m_lastfrac) {
+        m_flashtime = uid.time;
+    }
+    m_lastfrac = frac;
+
+    alpha = 1.0 - ((float)uid.time - m_flashtime) / 1500.0;
+    alpha = Q_clamp_float(alpha, 0, 1);
+
+    col[3] = alpha;
+
+    if (m_statbar_material) {
+        if (m_flags & WF_TILESHADER) {
+            switch (m_statbar_or) {
+            case L_STATBAR_HORIZONTAL:
+                {
+                    float width = frac * m_frame.size.width;
+
+                    fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material->GetMaterial());
+                    fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material->GetMaterial());
+
+                    re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material->GetMaterial());
+                    //re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material->GetMaterial());
+
+                    if (alpha != 0.0 && m_statbar_material_flash) {
+                        re.SetColor(col);
+
+                        fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material_flash->GetMaterial());
+                        fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material_flash->GetMaterial());
+
+                        re.DrawStretchPic(0.0, 0.0, width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material_flash->GetMaterial());
+                        //re.DrawTilePic(0.0, 0.0, width, m_frame.size.height, m_statbar_material_flash->GetMaterial());
+                    }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
+                    break;
+                }
+            case L_STATBAR_VERTICAL:
+            case L_STATBAR_VERTICAL_REVERSE:
+            case L_STATBAR_VERTICAL_STAGGER_EVEN:
+            case L_STATBAR_VERTICAL_STAGGER_ODD:
+                {
+                    float y = m_frame.size.height * (1.0 - frac);
+
+                    fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material->GetMaterial());
+                    fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material->GetMaterial());
+
+                    re.DrawStretchPic(0.0, y, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material->GetMaterial());
+                    //re.DrawTilePic(0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material->GetMaterial());
+
+                    if (alpha != 0.0 && m_statbar_material_flash) {
+                        re.SetColor(col);
+
+                        fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_statbar_material_flash->GetMaterial());
+                        fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_statbar_material_flash->GetMaterial());
+
+                        re.DrawStretchPic(0.0, y, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_statbar_material_flash->GetMaterial());
+                        //re.DrawTilePic(
+                        //    0.0, y, m_frame.size.width, m_frame.size.height, m_statbar_material_flash->GetMaterial()
+                        //);
+                    }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
+                    break;
+                }
+            default:
+                break;
+            }
+        } else {
+            switch (m_statbar_or) {
+            case L_STATBAR_HORIZONTAL:
+                {
+                    float width = frac * m_frame.size.width;
+
+                    re.DrawStretchPic(
+                        0.0, 0.0, width, m_frame.size.height, 0.0, 0.0, 1.0, 1.0, m_statbar_material->GetMaterial()
+                    );
+
+                    if (alpha != 0.0 && m_statbar_material_flash) {
+                        re.SetColor(col);
+                        re.DrawStretchPic(
+                            0.0,
+                            0.0,
+                            width,
+                            m_frame.size.height,
+                            0.0,
+                            0.0,
+                            1.0,
+                            1.0,
+                            m_statbar_material_flash->GetMaterial()
+                        );
+                    }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
+                    break;
+                }
+            case L_STATBAR_VERTICAL:
+            case L_STATBAR_VERTICAL_STAGGER_EVEN:
+            case L_STATBAR_VERTICAL_STAGGER_ODD:
+                {
+                    float y      = m_frame.size.height * (1.0 - frac);
+                    float height = m_frame.size.height * frac;
+
+                    re.DrawStretchPic(
+                        0.0, y, m_frame.size.width, height, 0.0, 1.0 - frac, 1.0, 1.0, m_statbar_material->GetMaterial()
+                    );
+
+                    if (alpha != 0.0 && m_statbar_material_flash) {
+                        re.SetColor(col);
+                        re.DrawStretchPic(
+                            0.0,
+                            y,
+                            m_frame.size.width,
+                            height,
+                            0.0,
+                            1.0 - frac,
+                            1.0,
+                            1.0,
+                            m_statbar_material_flash->GetMaterial()
+                        );
+                    }
+
+                    if (m_statbar_material_marker) {
+                        hMat = m_statbar_material_marker->GetMaterial();
+                        w    = re.GetShaderWidth(hMat);
+                        h    = re.GetShaderHeight(hMat);
+
+                        re.DrawStretchPic(
+                            m_frame.size.width * frac - w * 0.5,
+                            m_frame.size.height * 0.5 - h * 0.5,
+                            w,
+                            h,
+                            0,
+                            0,
+                            1,
+                            1,
+                            hMat
+                        );
+                    }
+                    break;
+                }
+            case L_STATBAR_VERTICAL_REVERSE:
+                {
+                    float height = m_frame.size.height * frac;
+
+                    re.DrawStretchPic(
+                        0.0, 0.0, m_frame.size.width, height, 0.0, 0.0, 1.0, frac, m_statbar_material->GetMaterial()
+                    );
+
+                    if (alpha != 0.0 && m_statbar_material_flash) {
+                        re.SetColor(col);
+                        re.DrawStretchPic(
+                            0.0,
+                            0.0,
+                            m_frame.size.width,
+                            height,
+                            0.0,
+                            0.0,
+                            1.0,
+                            frac,
+                            m_statbar_material_flash->GetMaterial()
+                        );
+                    }
+                    break;
+                }
+            default:
+                break;
+            }
+        }
+    } else {
+        switch (m_statbar_or) {
+        case L_STATBAR_VERTICAL:
+        case L_STATBAR_VERTICAL_STAGGER_EVEN:
+        case L_STATBAR_VERTICAL_STAGGER_ODD:
+            DrawBox(
+                0.0,
+                m_frame.size.height * (1.0 - frac),
+                m_frame.size.width,
+                m_frame.size.height,
+                m_foreground_color,
+                1.0
+            );
+            break;
+        case L_STATBAR_HORIZONTAL:
+            DrawBox(0.0, 0.0, frac * m_frame.size.width, m_frame.size.height, m_foreground_color, 1.0);
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+void UIFakkLabel::DrawStatCircle(float frac)
+{
+    vec4_t col;
+    float  alpha;
+    float  fCurrAng, fEndAng, fNextAng;
+    vec2_t vVerts[3];
+    vec2_t vTexCoords[3];
 
     col[0] = 1.f;
     col[1] = 1.f;
@@ -631,190 +730,181 @@ void UIFakkLabel::DrawStatCircle( float frac )
     m_lastfrac = frac;
 
     alpha = 1.f - (uid.time - m_flashtime) / 1500.f;
-    if (alpha < 0.f) alpha = 0.f;
-    else if (alpha > 1.f) alpha = 1.f;
+    if (alpha < 0.f) {
+        alpha = 0.f;
+    } else if (alpha > 1.f) {
+        alpha = 1.f;
+    }
 
     col[3] = alpha;
 
-	vVerts[0][0] = m_frame.size.width * 0.5f;
-	vVerts[0][1] = m_frame.size.height * 0.5f;
-	vTexCoords[0][0] = 0.5f;
-	vTexCoords[0][1] = 0.5f;
+    vVerts[0][0]     = m_frame.size.width * 0.5f;
+    vVerts[0][1]     = m_frame.size.height * 0.5f;
+    vTexCoords[0][0] = 0.5f;
+    vTexCoords[0][1] = 0.5f;
 
-	if (ui_health_start->value && ui_health_end->value) {
-		m_angles[0] = ui_health_start->value;
-		m_angles[1] = ui_health_end->value;
-	}
+    if (ui_health_start->value && ui_health_end->value) {
+        m_angles[0] = ui_health_start->value;
+        m_angles[1] = ui_health_end->value;
+    }
 
-	fCurrAng = m_angles[0];
-	fEndAng = frac * (m_angles[1] - fCurrAng) + fCurrAng;
+    fCurrAng = m_angles[0];
+    fEndAng  = frac * (m_angles[1] - fCurrAng) + fCurrAng;
     if (m_angles[1] > fCurrAng) {
         StatCircleTexCoord(fCurrAng, vTexCoords[1]);
         vVerts[1][0] = m_frame.size.width * vTexCoords[1][0];
         vVerts[1][1] = m_frame.size.height * vTexCoords[1][1];
-       
-		if ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90 == (int)fEndAng - (((int)fEndAng - 45) % 90 + 90) % 90)
-		{
+
+        if ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90
+            == (int)fEndAng - (((int)fEndAng - 45) % 90 + 90) % 90) {
             StatCircleTexCoord(fEndAng, vTexCoords[2]);
             vVerts[2][0] = m_frame.size.width * vTexCoords[2][0];
             vVerts[2][1] = m_frame.size.height * vTexCoords[2][1];
-		
+
             if (alpha && m_statbar_material_flash) {
                 re.SetColor(m_foreground_color);
             }
 
-            m_statbar_material->ReregisterMaterial();
             re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
             if (alpha && m_statbar_material_flash) {
                 re.SetColor(col);
-                m_statbar_material_flash->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
             }
-		}
-		else
-        {
-			while (fCurrAng > fEndAng)
-			{
-				fNextAng = ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90) + 90.0;
-				if (fNextAng > fEndAng) {
-					fNextAng = fEndAng;
-				}
+        } else {
+            while (fCurrAng > fEndAng) {
+                fNextAng = ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90) + 90.0;
+                if (fNextAng > fEndAng) {
+                    fNextAng = fEndAng;
+                }
 
                 StatCircleTexCoord(fNextAng, vTexCoords[2]);
                 vVerts[2][0] = m_frame.size.width * vTexCoords[2][0];
                 vVerts[2][1] = m_frame.size.height * vTexCoords[2][1];
 
-				if (alpha && m_statbar_material_flash) {
-					re.SetColor(m_foreground_color);
-				}
-
-				m_statbar_material->ReregisterMaterial();
-				re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
-			
-				if (alpha && m_statbar_material_flash) {
-					re.SetColor(col);
-					m_statbar_material_flash->ReregisterMaterial();
-					re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
-				}
-
-                vTexCoords[1][0] = vTexCoords[2][0];
-                vTexCoords[1][1] = vTexCoords[2][1];
-                vVerts[1][0] = vVerts[2][0];
-                vVerts[1][1] = vVerts[2][1];
-                fCurrAng = fNextAng;
-			}
-		}
-	} else {
-		StatCircleTexCoord(fCurrAng, vTexCoords[2]);
-		vVerts[2][0] = m_frame.size.width * vTexCoords[2][0];
-		vVerts[2][1] = m_frame.size.height * vTexCoords[2][1];
-		if ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90 == (int)fEndAng
-			- (((int)fEndAng - 45) % 90 + 90) % 90)
-		{
-			StatCircleTexCoord(fEndAng, vTexCoords[1]);
-            vVerts[1][0] = m_frame.size.width * vTexCoords[1][0];
-            vVerts[1][1] = m_frame.size.height * vTexCoords[1][1];
-		
-			if (alpha && m_statbar_material_flash) {
-				re.SetColor(m_foreground_color);
-			}
-
-			m_statbar_material->ReregisterMaterial();
-			re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
-		
-			if (alpha && m_statbar_material_flash) {
-				re.SetColor(col);
-				m_statbar_material_flash->ReregisterMaterial();
-				re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
-			}
-		}
-		else
-		{
-			while (fCurrAng > fEndAng)
-			{
-				fNextAng = ((int)fCurrAng - (((int)fCurrAng + 45) % 90 + 90) % 90);
-				if (fNextAng == fCurrAng) {
-					fNextAng -= 90.f;
-				}
-
-				if (fNextAng < fEndAng) {
-					fNextAng = fEndAng;
-				}
-
-				StatCircleTexCoord(fNextAng, vTexCoords[1]);
-                vVerts[1][0] = m_frame.size.width * vTexCoords[1][0];
-                vVerts[1][1] = m_frame.size.height * vTexCoords[1][1];
-			
                 if (alpha && m_statbar_material_flash) {
                     re.SetColor(m_foreground_color);
                 }
 
-                m_statbar_material->ReregisterMaterial();
                 re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
                 if (alpha && m_statbar_material_flash) {
                     re.SetColor(col);
-                    m_statbar_material_flash->ReregisterMaterial();
+                    re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
+                }
+
+                vTexCoords[1][0] = vTexCoords[2][0];
+                vTexCoords[1][1] = vTexCoords[2][1];
+                vVerts[1][0]     = vVerts[2][0];
+                vVerts[1][1]     = vVerts[2][1];
+                fCurrAng         = fNextAng;
+            }
+        }
+    } else {
+        StatCircleTexCoord(fCurrAng, vTexCoords[2]);
+        vVerts[2][0] = m_frame.size.width * vTexCoords[2][0];
+        vVerts[2][1] = m_frame.size.height * vTexCoords[2][1];
+        if ((int)fCurrAng - (((int)fCurrAng - 45) % 90 + 90) % 90
+            == (int)fEndAng - (((int)fEndAng - 45) % 90 + 90) % 90) {
+            StatCircleTexCoord(fEndAng, vTexCoords[1]);
+            vVerts[1][0] = m_frame.size.width * vTexCoords[1][0];
+            vVerts[1][1] = m_frame.size.height * vTexCoords[1][1];
+
+            if (alpha && m_statbar_material_flash) {
+                re.SetColor(m_foreground_color);
+            }
+
+            re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+
+            if (alpha && m_statbar_material_flash) {
+                re.SetColor(col);
+                re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
+            }
+        } else {
+            while (fCurrAng > fEndAng) {
+                fNextAng = ((int)fCurrAng - (((int)fCurrAng + 45) % 90 + 90) % 90);
+                if (fNextAng == fCurrAng) {
+                    fNextAng -= 90.f;
+                }
+
+                if (fNextAng < fEndAng) {
+                    fNextAng = fEndAng;
+                }
+
+                StatCircleTexCoord(fNextAng, vTexCoords[1]);
+                vVerts[1][0] = m_frame.size.width * vTexCoords[1][0];
+                vVerts[1][1] = m_frame.size.height * vTexCoords[1][1];
+
+                if (alpha && m_statbar_material_flash) {
+                    re.SetColor(m_foreground_color);
+                }
+
+                re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+
+                if (alpha && m_statbar_material_flash) {
+                    re.SetColor(col);
                     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
                 }
 
                 vTexCoords[2][0] = vTexCoords[1][0];
                 vTexCoords[2][1] = vTexCoords[1][1];
-                vVerts[2][0] = vVerts[1][0];
-                vVerts[2][1] = vVerts[1][1];
-                fCurrAng = fNextAng;
-			}
-		}
-	}
+                vVerts[2][0]     = vVerts[1][0];
+                vVerts[2][1]     = vVerts[1][1];
+                fCurrAng         = fNextAng;
+            }
+        }
+    }
 }
 
-void UIFakkLabel::DrawStatNeedle( float frac )
+void UIFakkLabel::DrawStatNeedle(float frac)
 {
-	vec4_t col;
-	float alpha;
-	float fTargAng;
-	float fSinVal;
-	float fCosVal;
-	vec2_t vCenter;
-	vec2_t vVerts[3];
-	vec2_t vTexCoords[3];
-	vec2_t vNeedleDir;
-	vec2_t vSideDir;
+    vec4_t col;
+    float  alpha;
+    float  fTargAng;
+    float  fSinVal;
+    float  fCosVal;
+    vec2_t vCenter;
+    vec2_t vVerts[3];
+    vec2_t vTexCoords[3];
+    vec2_t vNeedleDir;
+    vec2_t vSideDir;
 
-	col[0] = 1.f;
-	col[1] = 1.f;
-	col[2] = 1.f;
-	col[3] = 1.f;
+    col[0] = 1.f;
+    col[1] = 1.f;
+    col[2] = 1.f;
+    col[3] = 1.f;
 
-	if (m_lastfrac != frac) {
-		m_flashtime = uid.time;
-	}
-	m_lastfrac = frac;
+    if (m_lastfrac != frac) {
+        m_flashtime = uid.time;
+    }
+    m_lastfrac = frac;
 
-	alpha = 1.f - (uid.time - m_flashtime) / 1500.f;
-	if (alpha < 0.f) alpha = 0.f;
-	else if (alpha > 1.f) alpha = 1.f;
+    alpha = 1.f - (uid.time - m_flashtime) / 1500.f;
+    if (alpha < 0.f) {
+        alpha = 0.f;
+    } else if (alpha > 1.f) {
+        alpha = 1.f;
+    }
 
-	col[3] = alpha;
+    col[3] = alpha;
 
-	fTargAng = DEG2RAD(frac * (m_angles[1] - m_angles[0]) + m_angles[0]);
-	fSinVal = sin(fTargAng);
-	fCosVal = cos(fTargAng);
+    fTargAng = DEG2RAD(frac * (m_angles[1] - m_angles[0]) + m_angles[0]);
+    fSinVal  = sin(fTargAng);
+    fCosVal  = cos(fTargAng);
 
-	vSideDir[0] = m_frame.size.width * 0.5f;
-	vSideDir[1] = m_frame.size.height * 0.5f;
-	vCenter[0] = m_frame.size.width + fSinVal * vSideDir[0];
-	vCenter[1] = m_frame.size.height + -fCosVal * vSideDir[1];
-	vNeedleDir[0] = m_angles[2] * fCosVal;
-	vNeedleDir[1] = m_angles[2] * fSinVal;
+    vSideDir[0]   = m_frame.size.width * 0.5f;
+    vSideDir[1]   = m_frame.size.height * 0.5f;
+    vCenter[0]    = m_frame.size.width + fSinVal * vSideDir[0];
+    vCenter[1]    = m_frame.size.height + -fCosVal * vSideDir[1];
+    vNeedleDir[0] = m_angles[2] * fCosVal;
+    vNeedleDir[1] = m_angles[2] * fSinVal;
 
-	vVerts[0][0] = vCenter[0] - vNeedleDir[0];
-	vVerts[0][1] = vCenter[1] - vNeedleDir[1];
-	vVerts[1][0] = vCenter[0] + vNeedleDir[0];
-	vVerts[1][1] = vCenter[1] + vNeedleDir[1];
-	vVerts[2][0] = vSideDir[0] - vNeedleDir[1] - vNeedleDir[0];
-	vVerts[2][1] = vSideDir[1] + vNeedleDir[0] - vNeedleDir[1];
+    vVerts[0][0] = vCenter[0] - vNeedleDir[0];
+    vVerts[0][1] = vCenter[1] - vNeedleDir[1];
+    vVerts[1][0] = vCenter[0] + vNeedleDir[0];
+    vVerts[1][1] = vCenter[1] + vNeedleDir[1];
+    vVerts[2][0] = vSideDir[0] - vNeedleDir[1] - vNeedleDir[0];
+    vVerts[2][1] = vSideDir[1] + vNeedleDir[0] - vNeedleDir[1];
 
     vTexCoords[0][0] = 0.f;
     vTexCoords[0][1] = 0.f;
@@ -823,51 +913,47 @@ void UIFakkLabel::DrawStatNeedle( float frac )
     vTexCoords[2][0] = 0.f;
     vTexCoords[2][1] = 1.f;
 
-	if (alpha != 0.f) {
-		re.SetColor(m_foreground_color);
-	}
+    if (alpha != 0.f) {
+        re.SetColor(m_foreground_color);
+    }
 
-	m_statbar_material->ReregisterMaterial();
-	re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+    re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
-	if (alpha != 0.f && m_statbar_material_flash) {
-		re.SetColor(col);
-		m_statbar_material_flash->ReregisterMaterial();
-		re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
-	}
+    if (alpha != 0.f && m_statbar_material_flash) {
+        re.SetColor(col);
+        re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
+    }
 
-	vVerts[0][0] = vVerts[2][0];
-	vVerts[0][1] = vVerts[2][1];
-	vVerts[2][0] = m_angles[2] * vCenter[0] + m_frame.size.width * 0.5f - m_angles[2] * vCenter[1];
-	vVerts[2][1] = m_angles[2] * vCenter[1] + m_frame.size.height * 0.5f - m_angles[2] * -vCenter[0];
+    vVerts[0][0] = vVerts[2][0];
+    vVerts[0][1] = vVerts[2][1];
+    vVerts[2][0] = m_angles[2] * vCenter[0] + m_frame.size.width * 0.5f - m_angles[2] * vCenter[1];
+    vVerts[2][1] = m_angles[2] * vCenter[1] + m_frame.size.height * 0.5f - m_angles[2] * -vCenter[0];
 
     vTexCoords[0][0] = vTexCoords[2][0];
     vTexCoords[0][1] = vTexCoords[2][1];
 
-	if (alpha != 0.f && m_statbar_material_flash) {
-		re.SetColor(m_foreground_color);
-	}
+    if (alpha != 0.f && m_statbar_material_flash) {
+        re.SetColor(m_foreground_color);
+    }
 
-	m_statbar_material->ReregisterMaterial();
-	re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+    re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
-	if (alpha != 0.f && m_statbar_material_flash) {
-		m_statbar_material_flash->ReregisterMaterial();
-		re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
-	}
+    if (alpha != 0.f && m_statbar_material_flash) {
+        re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
+    }
 }
 
-void UIFakkLabel::DrawStatRotator( float frac )
+void UIFakkLabel::DrawStatRotator(float frac)
 {
-	vec4_t col;
-	float alpha;
-	float fTargAng;
-	float fSinVal, fCosVal;
+    vec4_t col;
+    float  alpha;
+    float  fTargAng;
+    float  fSinVal, fCosVal;
     vec2_t vCenter;
     vec2_t vVerts[3];
     vec2_t vTexCoords[3];
     vec2_t vNeedleDir;
-	vec2_t vSize;
+    vec2_t vSize;
 
     col[0] = 1.f;
     col[1] = 1.f;
@@ -880,288 +966,261 @@ void UIFakkLabel::DrawStatRotator( float frac )
     m_lastfrac = frac;
 
     alpha = 1.f - (uid.time - m_flashtime) / 1500.f;
-    if (alpha < 0.f) alpha = 0.f;
-    else if (alpha > 1.f) alpha = 1.f;
+    if (alpha < 0.f) {
+        alpha = 0.f;
+    } else if (alpha > 1.f) {
+        alpha = 1.f;
+    }
 
     col[3] = alpha;
 
-    fTargAng = DEG2RAD(frac * (m_angles[1] - m_angles[0]) + m_angles[0]);
-    fSinVal = sin(fTargAng);
-	fCosVal = cos(fTargAng);
-	vNeedleDir[0] = fSinVal;
-	vNeedleDir[1] = -fCosVal;
+    fTargAng      = DEG2RAD(frac * (m_angles[1] - m_angles[0]) + m_angles[0]);
+    fSinVal       = sin(fTargAng);
+    fCosVal       = cos(fTargAng);
+    vNeedleDir[0] = fSinVal;
+    vNeedleDir[1] = -fCosVal;
 
-	vSize[0] = (m_frame.size.width + m_frame.size.height) / m_frame.size.width * m_angles[2] * m_vVirtualScale[0];
-	vSize[1] = (m_frame.size.width + m_frame.size.height) / m_frame.size.height * m_scale * m_vVirtualScale[1];
+    vSize[0] = (m_frame.size.width + m_frame.size.height) / m_frame.size.width * m_angles[2] * getVirtualScale()[0];
+    vSize[1] = (m_frame.size.width + m_frame.size.height) / m_frame.size.height * m_scale * getVirtualScale()[1];
 
-	vCenter[0] = (m_frame.size.width * 0.5f - vSize[0]) * vNeedleDir[0] + m_frame.size.width * 0.5f;
-	vCenter[1] = (m_frame.size.height * 0.5f - vSize[1]) * vNeedleDir[1] + m_frame.size.height * 0.5f;
+    vCenter[0] = (m_frame.size.width * 0.5f - vSize[0]) * vNeedleDir[0] + m_frame.size.width * 0.5f;
+    vCenter[1] = (m_frame.size.height * 0.5f - vSize[1]) * vNeedleDir[1] + m_frame.size.height * 0.5f;
 
-	vVerts[0][0] = vCenter[0] - vSize[0];
-	vVerts[0][1] = vCenter[1] - vSize[1];
-	vVerts[1][0] = vCenter[0] + vSize[0];
-	vVerts[1][1] = vCenter[1] - vSize[1];
-	vVerts[2][0] = vCenter[0] - vSize[0];
-	vVerts[2][1] = vCenter[1] + vSize[1];
+    vVerts[0][0] = vCenter[0] - vSize[0];
+    vVerts[0][1] = vCenter[1] - vSize[1];
+    vVerts[1][0] = vCenter[0] + vSize[0];
+    vVerts[1][1] = vCenter[1] - vSize[1];
+    vVerts[2][0] = vCenter[0] - vSize[0];
+    vVerts[2][1] = vCenter[1] + vSize[1];
 
     vTexCoords[0][0] = 0.f;
     vTexCoords[0][1] = 0.f;
-	vTexCoords[1][0] = 1.f;
-	vTexCoords[1][1] = 0.f;
-	vTexCoords[2][0] = 0.f;
-	vTexCoords[2][1] = 1.f;
+    vTexCoords[1][0] = 1.f;
+    vTexCoords[1][1] = 0.f;
+    vTexCoords[2][0] = 0.f;
+    vTexCoords[2][1] = 1.f;
 
     if (alpha != 0.f && m_statbar_material_flash) {
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
     vVerts[0][0] = vVerts[2][0];
     vVerts[0][1] = vVerts[2][1];
-	vVerts[2][0] = vCenter[0] + vSize[0];
-	vVerts[2][1] = vCenter[1] + vSize[1];
+    vVerts[2][0] = vCenter[0] + vSize[0];
+    vVerts[2][1] = vCenter[1] + vSize[1];
 
     vTexCoords[0][0] = vTexCoords[2][0];
     vTexCoords[0][1] = vTexCoords[2][1];
-	vTexCoords[2][0] = 1.f;
-	vTexCoords[2][1] = 1.f;
+    vTexCoords[2][0] = 1.f;
+    vTexCoords[2][1] = 1.f;
 
     if (alpha != 0.f && m_statbar_material_flash) {
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 }
 
-void UIFakkLabel::DrawStatCompass( float frac )
-{
-	vec4_t col;
-	float fTargAng;
-	float fSinVal, fCosVal;
-	vec2_t vCenter;
-	vec2_t vVerts[3];
-	vec2_t vTexCoords[3];
-	vec2_t vCompassDir;
-	vec2_t vSideDir;
-
-	col[0] = col[1] = col[2] = col[3] = 1.0;
-
-	if (!cge) {
-		return;
-	}
-
-	static int iLastCompassTime = -9999, iLastTimeDelta = 0;
-	static float fLastPitch = 0, fLastYaw = 0, fLastYawDelta = 0;
-	static float fYawOffset = 0, fYawSpeed = 0;
-	static float fNeedleOffset = 0, fNeedleSpeed = 0;
-	int iTimeCount, iTimeDelta;
-	float fYawDelta, fYawDeltaDiff;
-	vec3_t vViewAngles;
-
-	cge->CG_EyeAngles(&vViewAngles);
-
-	vViewAngles[1] -= cl.snap.ps.stats[STAT_COMPASSNORTH] / 182.0f;
-
-	iTimeCount = uid.time - iLastCompassTime;
-	if (iTimeCount <= 1000)
-	{
-		fYawDelta = AngleSubtract(vViewAngles[1], fLastYaw);
-		if (fYawDelta > 0.1)
-		{
-			if ((fYawDelta > 0.0 && fLastYawDelta < fYawDelta)
-				|| (fYawDelta < 0.0 && fLastYawDelta > fYawDelta))
-			{
-
-				fYawSpeed += (fYawDelta - fLastYawDelta) * 0.75;
-				fYawOffset += (fYawDelta - fLastYawDelta) * 0.75;
-			}
-
-			if (fYawSpeed > 90.0) {
-				fYawSpeed = 90.0;
-			}
-			else if (fYawSpeed < 0.05) {
-				fYawSpeed = 0.05;
-			}
-
-		}
-
-		while (iTimeCount > 0)
-		{
-			iTimeDelta = iTimeCount;
-			if (iTimeCount > 15) {
-				iTimeDelta = 15;
-			}
-			iTimeCount -= iTimeDelta;
-
-			if (fabs(fYawOffset) >= 0.1 || fabs(fYawSpeed) >= 0.01)
-			{
-				fYawOffset += fYawSpeed * iTimeDelta;
-				if (fYawOffset > 0.0) {
-					fYawSpeed -= iTimeDelta * 0.00175;
-				}
-				else if (fYawOffset < 0.0) {
-					fYawSpeed += iTimeDelta * 0.00175;
-				}
-
-				if (fYawOffset > 40.0) {
-					fYawOffset = 40.0;
-					fYawSpeed = 0.0;
-				}
-				else if (fYawOffset < -40.0) {
-					fYawOffset = -40.0;
-					fYawSpeed = 0.0;
-				}
-
-				fYawSpeed -= iTimeDelta * 0.003;
-				if (fYawSpeed > 0.0) {
-					fYawSpeed -= iTimeDelta * 0.0004;
-				}
-				else {
-					fYawSpeed += iTimeDelta * 0.0004;
-					if (fYawSpeed > 0.0) {
-						fYawSpeed = 0.0;
-					}
-				}
-			}
-			else
-			{
-				iTimeCount = 0;
-				fYawOffset = 0.0;
-				fYawSpeed = 0.0;
-			}
-		}
-
-		fLastYawDelta = fYawDelta;
-		iLastTimeDelta = uid.time - iLastCompassTime;
-	}
-	else
-	{
-		fLastYawDelta = 0;
-		fYawOffset = 0;
-		fYawSpeed = 0;
-		iLastTimeDelta = 0;
-	}
-
-	fLastPitch = vViewAngles[0];
-	fLastYaw = vViewAngles[1];
-	iLastCompassTime = uid.time;
-
-	if (iLastTimeDelta)
-	{
-		if (fabs(fLastYawDelta) > 0.1) {
-			fNeedleOffset -= fLastYawDelta;
-		}
-
-		iTimeCount = iLastTimeDelta;
-		while (iTimeCount > 0)
-		{
-			iTimeDelta = iTimeCount;
-			if (iTimeCount > 15) {
-				iTimeDelta = 15;
-			}
-			iTimeCount -= iTimeDelta;
-
-			if (fabs(fNeedleOffset) >= 0.1 || fabs(fNeedleSpeed) >= 0.01) {
-
-				fNeedleOffset += iTimeDelta * fNeedleSpeed;
-				if (fNeedleOffset > 180.0) {
-					fNeedleOffset -= 360.0;
-				}
-				else if (fNeedleOffset < -180.0) {
-					fNeedleOffset += 360.0;
-				}
-
-				if (fNeedleOffset > 0.0) {
-					fNeedleSpeed -= iTimeDelta * 0.00175;
-				}
-				else if (fNeedleOffset < 0.0) {
-					fNeedleSpeed += iTimeDelta * 0.00175;
-				}
-
-				fNeedleSpeed -= fNeedleSpeed * 0.0025 * iTimeDelta;
-				if (fNeedleSpeed > 0.0) {
-					fNeedleSpeed -= iTimeDelta * 0.00035;
-					if (fNeedleSpeed < 0.0) {
-						fNeedleSpeed = 0.0;
-					}
-				}
-				else {
-					fNeedleSpeed += iTimeDelta * 0.00035;
-					if (fNeedleSpeed > 0.0) {
-						fNeedleSpeed = 0.0;
-					}
-				}
-			} else {
-				iTimeCount = 0;
-				fNeedleOffset = 0.0;
-				fNeedleSpeed = 0.0;
-			}
-		}
-	}
-	else
-	{
-		fNeedleOffset = 0.0;
-		fNeedleSpeed = 0.0;
-	}
-
-	fSinVal = sin(anglemod(fNeedleOffset + fLastYaw) / (180 / M_PI));
-	fCosVal = cos(anglemod(fNeedleOffset + fLastYaw) / (180 / M_PI));
-
-	vCompassDir[0] = fSinVal;
-	vCompassDir[1] = -fCosVal;
-
-	vCenter[0] = m_frame.size.width * 0.5;
-	vCenter[1] = m_frame.size.height * 0.5;
-	vTexCoords[0][0] = 0.0;
-	vTexCoords[0][1] = 0.0;
-	vTexCoords[1][0] = 1.0;
-	vTexCoords[1][1] = 0.0;
-	vTexCoords[2][0] = 0.0;
-	vTexCoords[2][1] = 1.0;
-
-	vVerts[0][0] = vCenter[0] + vCompassDir[0] * vCenter[0] - fCosVal * vCenter[1];
-	vVerts[1][0] = vCenter[0] + vCompassDir[0] * vCenter[0] + fCosVal * vCenter[1];
-	vVerts[2][0] = vCenter[0] - vCompassDir[0] * vCenter[0] - fCosVal * vCenter[1];
-	vVerts[0][1] = vCenter[1] + vCompassDir[1] * vCenter[1] - fSinVal * vCenter[0];
-	vVerts[1][1] = vCenter[1] + vCompassDir[1] * vCenter[1] + fSinVal * vCenter[0];
-	vVerts[2][1] = vCenter[1] - vCompassDir[1] * vCenter[1] - fSinVal * vCenter[0];
-
-	m_statbar_material->ReregisterMaterial();
-	re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
-
-	vVerts[0][0] = vVerts[2][0];
-	vVerts[0][1] = vVerts[2][1];
-	vTexCoords[0][0] = vTexCoords[2][0];
-	vTexCoords[0][1] = vTexCoords[2][1];
-	vTexCoords[2][0] = 1.0;
-	vTexCoords[2][1] = 1.0;
-
-	vVerts[2][0] = vCenter[0] + fCosVal * vCenter[1] - vCompassDir[0] * vCenter[0];
-	vVerts[2][1] = vCenter[1] * fSinVal + vCenter[0] - vCompassDir[1] * vCenter[1];
-
-	m_statbar_material->ReregisterMaterial();
-	re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
-}
-
-void UIFakkLabel::DrawStatSpinner( float frac )
+void UIFakkLabel::DrawStatCompass(float frac)
 {
     vec4_t col;
-    float alpha;
-    float fTargAng;
-    float fSinVal, fCosVal;
+    float  fTargAng;
+    float  fSinVal, fCosVal;
+    vec2_t vCenter;
+    vec2_t vVerts[3];
+    vec2_t vTexCoords[3];
+    vec2_t vCompassDir;
+    vec2_t vSideDir;
+
+    col[0] = col[1] = col[2] = col[3] = 1.0;
+
+    if (!cge) {
+        return;
+    }
+
+    static int   iLastCompassTime = -9999, iLastTimeDelta = 0;
+    static float fLastPitch = 0, fLastYaw = 0, fLastYawDelta = 0;
+    static float fYawOffset = 0, fYawSpeed = 0;
+    static float fNeedleOffset = 0, fNeedleSpeed = 0;
+    int          iTimeCount, iTimeDelta;
+    float        fYawDelta, fYawDeltaDiff;
+    vec3_t       vViewAngles;
+
+    cge->CG_EyeAngles(&vViewAngles);
+
+    vViewAngles[1] -= cl.snap.ps.stats[STAT_COMPASSNORTH] / 182.0f;
+
+    iTimeCount = uid.time - iLastCompassTime;
+    if (iTimeCount <= 1000) {
+        fYawDelta = AngleSubtract(vViewAngles[1], fLastYaw);
+        if (fYawDelta > 0.1) {
+            if ((fYawDelta > 0.0 && fLastYawDelta < fYawDelta) || (fYawDelta < 0.0 && fLastYawDelta > fYawDelta)) {
+                fYawSpeed += (fYawDelta - fLastYawDelta) * 0.75;
+                fYawOffset += (fYawDelta - fLastYawDelta) * 0.75;
+            }
+
+            if (fYawSpeed > 90.0) {
+                fYawSpeed = 90.0;
+            } else if (fYawSpeed < 0.05) {
+                fYawSpeed = 0.05;
+            }
+        }
+
+        while (iTimeCount > 0) {
+            iTimeDelta = iTimeCount;
+            if (iTimeCount > 15) {
+                iTimeDelta = 15;
+            }
+            iTimeCount -= iTimeDelta;
+
+            if (fabs(fYawOffset) >= 0.1 || fabs(fYawSpeed) >= 0.01) {
+                fYawOffset += fYawSpeed * iTimeDelta;
+                if (fYawOffset > 0.0) {
+                    fYawSpeed -= iTimeDelta * 0.00175;
+                } else if (fYawOffset < 0.0) {
+                    fYawSpeed += iTimeDelta * 0.00175;
+                }
+
+                if (fYawOffset > 40.0) {
+                    fYawOffset = 40.0;
+                    fYawSpeed  = 0.0;
+                } else if (fYawOffset < -40.0) {
+                    fYawOffset = -40.0;
+                    fYawSpeed  = 0.0;
+                }
+
+                fYawSpeed -= iTimeDelta * 0.003;
+                if (fYawSpeed > 0.0) {
+                    fYawSpeed -= iTimeDelta * 0.0004;
+                } else {
+                    fYawSpeed += iTimeDelta * 0.0004;
+                    if (fYawSpeed > 0.0) {
+                        fYawSpeed = 0.0;
+                    }
+                }
+            } else {
+                iTimeCount = 0;
+                fYawOffset = 0.0;
+                fYawSpeed  = 0.0;
+            }
+        }
+
+        fLastYawDelta  = fYawDelta;
+        iLastTimeDelta = uid.time - iLastCompassTime;
+    } else {
+        fLastYawDelta  = 0;
+        fYawOffset     = 0;
+        fYawSpeed      = 0;
+        iLastTimeDelta = 0;
+    }
+
+    fLastPitch       = vViewAngles[0];
+    fLastYaw         = vViewAngles[1];
+    iLastCompassTime = uid.time;
+
+    if (iLastTimeDelta) {
+        if (fabs(fLastYawDelta) > 0.1) {
+            fNeedleOffset -= fLastYawDelta;
+        }
+
+        iTimeCount = iLastTimeDelta;
+        while (iTimeCount > 0) {
+            iTimeDelta = iTimeCount;
+            if (iTimeCount > 15) {
+                iTimeDelta = 15;
+            }
+            iTimeCount -= iTimeDelta;
+
+            if (fabs(fNeedleOffset) >= 0.1 || fabs(fNeedleSpeed) >= 0.01) {
+                fNeedleOffset += iTimeDelta * fNeedleSpeed;
+                if (fNeedleOffset > 180.0) {
+                    fNeedleOffset -= 360.0;
+                } else if (fNeedleOffset < -180.0) {
+                    fNeedleOffset += 360.0;
+                }
+
+                if (fNeedleOffset > 0.0) {
+                    fNeedleSpeed -= iTimeDelta * 0.00175;
+                } else if (fNeedleOffset < 0.0) {
+                    fNeedleSpeed += iTimeDelta * 0.00175;
+                }
+
+                fNeedleSpeed -= fNeedleSpeed * 0.0025 * iTimeDelta;
+                if (fNeedleSpeed > 0.0) {
+                    fNeedleSpeed -= iTimeDelta * 0.00035;
+                    if (fNeedleSpeed < 0.0) {
+                        fNeedleSpeed = 0.0;
+                    }
+                } else {
+                    fNeedleSpeed += iTimeDelta * 0.00035;
+                    if (fNeedleSpeed > 0.0) {
+                        fNeedleSpeed = 0.0;
+                    }
+                }
+            } else {
+                iTimeCount    = 0;
+                fNeedleOffset = 0.0;
+                fNeedleSpeed  = 0.0;
+            }
+        }
+    } else {
+        fNeedleOffset = 0.0;
+        fNeedleSpeed  = 0.0;
+    }
+
+    fSinVal = sin(anglemod(fNeedleOffset + fLastYaw) / (180 / M_PI));
+    fCosVal = cos(anglemod(fNeedleOffset + fLastYaw) / (180 / M_PI));
+
+    vCompassDir[0] = fSinVal;
+    vCompassDir[1] = -fCosVal;
+
+    vCenter[0]       = m_frame.size.width * 0.5;
+    vCenter[1]       = m_frame.size.height * 0.5;
+    vTexCoords[0][0] = 0.0;
+    vTexCoords[0][1] = 0.0;
+    vTexCoords[1][0] = 1.0;
+    vTexCoords[1][1] = 0.0;
+    vTexCoords[2][0] = 0.0;
+    vTexCoords[2][1] = 1.0;
+
+    vVerts[0][0] = vCenter[0] + vCompassDir[0] * vCenter[0] - fCosVal * vCenter[1];
+    vVerts[1][0] = vCenter[0] + vCompassDir[0] * vCenter[0] + fCosVal * vCenter[1];
+    vVerts[2][0] = vCenter[0] - vCompassDir[0] * vCenter[0] - fCosVal * vCenter[1];
+    vVerts[0][1] = vCenter[1] + vCompassDir[1] * vCenter[1] - fSinVal * vCenter[0];
+    vVerts[1][1] = vCenter[1] + vCompassDir[1] * vCenter[1] + fSinVal * vCenter[0];
+    vVerts[2][1] = vCenter[1] - vCompassDir[1] * vCenter[1] - fSinVal * vCenter[0];
+
+    re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+
+    vVerts[0][0]     = vVerts[2][0];
+    vVerts[0][1]     = vVerts[2][1];
+    vTexCoords[0][0] = vTexCoords[2][0];
+    vTexCoords[0][1] = vTexCoords[2][1];
+    vTexCoords[2][0] = 1.0;
+    vTexCoords[2][1] = 1.0;
+
+    vVerts[2][0] = vCenter[0] + fCosVal * vCenter[1] - vCompassDir[0] * vCenter[0];
+    vVerts[2][1] = vCenter[1] * fSinVal + vCenter[0] - vCompassDir[1] * vCenter[1];
+
+    re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
+}
+
+void UIFakkLabel::DrawStatSpinner(float frac)
+{
+    vec4_t col;
+    float  alpha;
+    float  fTargAng;
+    float  fSinVal, fCosVal;
     vec2_t vCenter;
     vec2_t vVerts[3];
     vec2_t vTexCoords[3];
@@ -1179,43 +1238,46 @@ void UIFakkLabel::DrawStatSpinner( float frac )
     m_lastfrac = frac;
 
     alpha = 1.f - (uid.time - m_flashtime) / 1500.f;
-    if (alpha < 0.f) alpha = 0.f;
-    else if (alpha > 1.f) alpha = 1.f;
+    if (alpha < 0.f) {
+        alpha = 0.f;
+    } else if (alpha > 1.f) {
+        alpha = 1.f;
+    }
 
     col[3] = alpha;
 
-	if (m_statbar_or == L_STATBAR_HEADING_SPINNER) {
-		if (cge) {
-			vec3_t vViewAngles;
-			float fAngAlpha;
-			cge->CG_EyeAngles(&vViewAngles);
+    if (m_statbar_or == L_STATBAR_HEADING_SPINNER) {
+        if (cge) {
+            vec3_t vViewAngles;
+            float  fAngAlpha;
+            cge->CG_EyeAngles(&vViewAngles);
 
-			frac = (AngleSubtract(vViewAngles[1], frac * 360.f + 180.f) + 180.f) / 360.f;
-			if (frac < 0.f || frac > 1.f) {
-				frac = 0.f;
-			}
-		}
-	}
+            frac = (AngleSubtract(vViewAngles[1], frac * 360.f + 180.f) + 180.f) / 360.f;
+            if (frac < 0.f || frac > 1.f) {
+                frac = 0.f;
+            }
+        }
+    }
 
     fTargAng = DEG2RAD(frac * (m_angles[1] - m_angles[0]) + m_angles[0]);
-    fSinVal = sin(fTargAng);
-    fCosVal = cos(fTargAng);
+    fSinVal  = sin(fTargAng);
+    fCosVal  = cos(fTargAng);
 
-	vSideDir[0] = fCosVal;
-    vSideDir[1] = fSinVal;
+    vSideDir[0]    = fCosVal;
+    vSideDir[1]    = fSinVal;
     vCompassDir[0] = fSinVal;
-	vCompassDir[1] = -fCosVal;
-	vCenter[0] = m_frame.size.width * 0.5f;
-	vCenter[1] = m_frame.size.height * 0.5f;
+    vCompassDir[1] = -fCosVal;
+    vCenter[0]     = m_frame.size.width * 0.5f;
+    vCenter[1]     = m_frame.size.height * 0.5f;
 
-	vVerts[0][0] = (fSinVal * vCenter[0] + vCenter[0]) - (fCosVal * vCenter[1]);
-	vVerts[0][1] = (vCompassDir[1] * vCenter[1] + vCenter[1]) - (vSideDir[1] * vCenter[0]);
-	vVerts[1][0] = (fSinVal * vCenter[0] + vCenter[0]) + (fCosVal * vCenter[1]);
-	vVerts[1][1] = (vSideDir[1] * vCenter[0]) + (vCompassDir[1] * vCenter[1] + vCenter[1]);
-	vVerts[2][0] = vCenter[0] - fSinVal * vCenter[0] - fCosVal * vCenter[1];
-	vVerts[2][1] = vCenter[1] - vCompassDir[1] * vCenter[1] - vSideDir[1] * vCenter[0];
+    vVerts[0][0] = (fSinVal * vCenter[0] + vCenter[0]) - (fCosVal * vCenter[1]);
+    vVerts[0][1] = (vCompassDir[1] * vCenter[1] + vCenter[1]) - (vSideDir[1] * vCenter[0]);
+    vVerts[1][0] = (fSinVal * vCenter[0] + vCenter[0]) + (fCosVal * vCenter[1]);
+    vVerts[1][1] = (vSideDir[1] * vCenter[0]) + (vCompassDir[1] * vCenter[1] + vCenter[1]);
+    vVerts[2][0] = vCenter[0] - fSinVal * vCenter[0] - fCosVal * vCenter[1];
+    vVerts[2][1] = vCenter[1] - vCompassDir[1] * vCenter[1] - vSideDir[1] * vCenter[0];
 
-	vTexCoords[0][0] = 0.f;
+    vTexCoords[0][0] = 0.f;
     vTexCoords[0][1] = 0.f;
     vTexCoords[1][0] = 1.f;
     vTexCoords[1][1] = 0.f;
@@ -1226,11 +1288,9 @@ void UIFakkLabel::DrawStatSpinner( float frac )
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 
@@ -1248,283 +1308,334 @@ void UIFakkLabel::DrawStatSpinner( float frac )
         re.SetColor(m_foreground_color);
     }
 
-    m_statbar_material->ReregisterMaterial();
     re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material->GetMaterial());
 
     if (alpha != 0.f && m_statbar_material_flash) {
-        m_statbar_material_flash->ReregisterMaterial();
         re.DrawTrianglePic(vVerts, vTexCoords, m_statbar_material_flash->GetMaterial());
     }
 }
 
-void UIFakkLabel::StatCircleTexCoord( float fAng, vec3_t vTexCoord )
+void UIFakkLabel::StatCircleTexCoord(float fAng, vec3_t vTexCoord)
 {
-	int iSector;
-	float fSinVal, fCosVal;
+    int   iSector;
+    float fSinVal, fCosVal;
 
-	iSector = (AngleMod(fAng) + 45.f) / 90;
-	fSinVal = sin(DEG2RAD(fAng));
-	fCosVal = cos(DEG2RAD(fAng));
+    iSector = (AngleMod(fAng) + 45.f) / 90;
+    fSinVal = sin(DEG2RAD(fAng));
+    fCosVal = cos(DEG2RAD(fAng));
 
-	if (iSector >= 0) {
-		if (iSector == 0) {
-			vTexCoord[0] = 0.f;
-			vTexCoord[1] = 0.5f / fCosVal * fSinVal + 0.5f;
-		} else if (iSector == 1) {
-			vTexCoord[0] = 1.f;
-			vTexCoord[1] = -0.5f / fSinVal * fCosVal + 0.5f;
-		} else if (iSector == 2) {
-			vTexCoord[0] = fSinVal * (-0.5f * fCosVal) + 0.5f;
-			vTexCoord[1] = 1.f;
-		} else if (iSector == 4) {
-			vTexCoord[0] = 0.5f / fCosVal * fSinVal + 0.5f;
-			vTexCoord[1] = 0.f;
-		} else {
-			vTexCoord[0] = 0.f;
-			vTexCoord[1] = 0.5f / fSinVal * fCosVal + 0.5f;
-		}
-	} else {
-		vTexCoord[0] = 0.f;
-		vTexCoord[1] = 0.5f / fSinVal * fCosVal + 0.5f;
-	}
+    if (iSector >= 0) {
+        if (iSector == 0) {
+            vTexCoord[0] = 0.f;
+            vTexCoord[1] = 0.5f / fCosVal * fSinVal + 0.5f;
+        } else if (iSector == 1) {
+            vTexCoord[0] = 1.f;
+            vTexCoord[1] = -0.5f / fSinVal * fCosVal + 0.5f;
+        } else if (iSector == 2) {
+            vTexCoord[0] = fSinVal * (-0.5f * fCosVal) + 0.5f;
+            vTexCoord[1] = 1.f;
+        } else if (iSector == 4) {
+            vTexCoord[0] = 0.5f / fCosVal * fSinVal + 0.5f;
+            vTexCoord[1] = 0.f;
+        } else {
+            vTexCoord[0] = 0.f;
+            vTexCoord[1] = 0.5f / fSinVal * fCosVal + 0.5f;
+        }
+    } else {
+        vTexCoord[0] = 0.f;
+        vTexCoord[1] = 0.5f / fSinVal * fCosVal + 0.5f;
+    }
 }
 
-void UIFakkLabel::Draw( void )
+void UIFakkLabel::Draw(void)
 {
-	if( m_stat == -1 && m_itemindex == -1 && m_inventoryrendermodelindex == -1 )
-	{
-		if( m_stat_configstring != -1 )
-		{
-			m_font->setColor( m_foreground_color );
-			m_font->PrintJustified( getClientFrame(),
-				m_iFontAlignmentHorizontal,
-				m_iFontAlignmentVertical,
-				Sys_LV_CL_ConvertString( va( "%s", CL_ConfigString( cl.snap.ps.stats[ m_stat_configstring ] ) ) ),
-				m_bVirtual ? m_vVirtualScale : NULL );
+    if (m_stat_alpha != -1) {
+        float frac;
 
-			return;
-		}
+        frac = (cl.snap.ps.stats[m_stat_alpha] + 1) / 100.0;
+        frac = Q_clamp_float(frac, 0, 1);
 
-		if( !m_rendermodel && m_statbar_or == L_STATBAR_NONE && !m_sDrawModelName.length() )
-		{
-			UILabel::Draw();
-			return;
-		}
-	}
+        m_alpha = frac;
+    }
 
-	if( m_stat_configstring != -1 )
-	{
-		m_font->setColor( m_foreground_color );
-		m_font->PrintJustified( getClientFrame(),
-			m_iFontAlignmentHorizontal,
-			m_iFontAlignmentVertical,
-			Sys_LV_CL_ConvertString( va( "%s", CL_ConfigString( cl.snap.ps.stats[ m_stat_configstring ] ) ) ),
-			m_bVirtual ? m_vVirtualScale : NULL );
+    if (m_stat == -1 && m_itemindex == -1 && m_inventoryrendermodelindex == -1 && m_stat_configstring == -1
+        && !m_rendermodel && m_statbar_or == L_STATBAR_NONE) {
+        if (!m_sDrawModelName.length()) {
+            UILabel::Draw();
+            return;
+        }
+    }
 
-		return;
-	}
+    if (m_stat_configstring != -1) {
+        m_font->setColor(m_foreground_color);
 
-	if( m_stat == -1 )
-	{
-		float scale;
-		qhandle_t handle;
-		vec3_t origin;
-		vec3_t mins;
-		vec3_t maxs;
-		vec3_t angles;
-		vec3_t offset;
-		vec3_t rotateoffset;
-		vec4_t color;
-		str sAnimName;
-		float height;
+        if (m_bOutlinedText) {
+            m_font->PrintOutlinedJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
+                UBlack,
+                getVirtualScale()
+            );
+        } else {
+            m_font->PrintJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(cl.snap.ps.stats[m_stat_configstring]))),
+                getVirtualScale()
+            );
+        }
+        return;
+    }
 
-		if( m_itemindex != -1 )
-		{
-			if( m_itemindex < 0 )
-				return;
+    if (m_stat != -1) {
+        int delta = cl.snap.ps.stats[m_stat];
 
-			m_font->setColor( m_foreground_color );
-			m_font->PrintJustified( getClientFrame(),
-				m_iFontAlignmentHorizontal,
-				m_iFontAlignmentVertical,
-				Sys_LV_CL_ConvertString( va( "%s", CL_ConfigString( CS_WEAPONS + cl.snap.ps.activeItems[ m_itemindex ] ) ) ),
-				m_bVirtual ? m_vVirtualScale : NULL );
+        if (m_statbar_or == L_STATBAR_NONE) {
+            m_font->setColor(m_foreground_color);
 
-			return;
-		}
+            if (m_bOutlinedText) {
+                m_font->PrintOutlinedJustified(
+                    getClientFrame(),
+                    m_iFontAlignmentHorizontal,
+                    m_iFontAlignmentVertical,
+                    va("%d", delta),
+                    UBlack,
+                    getVirtualScale()
+                );
+            } else {
+                m_font->PrintJustified(
+                    getClientFrame(),
+                    m_iFontAlignmentHorizontal,
+                    m_iFontAlignmentVertical,
+                    va("%d", delta),
+                    getVirtualScale()
+                );
+            }
+            return;
+        }
 
-		if( m_inventoryrendermodelindex == -1 && !m_sDrawModelName.length() || !m_rendermodel )
-		{
-			float frac = 0.0;
+        if (m_statbar_or == L_STATBAR_VERTICAL_STAGGER_EVEN || m_statbar_or == L_STATBAR_VERTICAL_STAGGER_ODD) {
+            int stat;
 
-			if( m_statbar_or == L_STATBAR_NONE )
-				return;
+            if (m_maxstat < 0) {
+                stat = m_statbar_max;
+            } else {
+                stat = cl.snap.ps.stats[m_maxstat];
+            }
 
-			if( m_cvarname.length() )
-			{
-				frac = Cvar_VariableValue( m_cvarname ) / ( m_statbar_max - m_statbar_min );
-			}
+            delta = stat - cl.snap.ps.stats[m_stat];
 
-			if( frac > 1.0 )
-				frac = 1.0;
-			if( frac < 0.0 )
-				frac = 0.0;
+            if (delta & 1) {
+                if (m_statbar_or == L_STATBAR_VERTICAL_STAGGER_EVEN) {
+                    delta--;
+                } else {
+                    delta++;
+                }
+            }
 
-			DrawStatbar( frac );
-			return;
-		}
+            delta = stat - delta;
 
-		VectorSet4( color, 255, 255, 255, 255 );
+            if (m_maxstat >= 0 || m_statbar_min <= delta) {
+                if (delta < 0) {
+                    delta = 0;
+                }
+            } else {
+                delta = m_statbar_min;
+            }
+        }
 
-		if( m_rendermodel )
-		{
-			if( !m_cvarname.length() )
-				return;
+        float frac;
 
-			handle = re.RegisterModel( Cvar_VariableString( m_cvarname ) );
-			if( !handle )
-				return;
+        if (m_maxstat >= 0) {
+            frac = (float)delta / (float)cl.snap.ps.stats[m_maxstat];
+        } else {
+            frac = (float)delta / (float)(m_statbar_max - m_statbar_min);
+        }
 
-			VectorCopy( m_angles, angles );
-			VectorCopy( m_rotateoffset, rotateoffset );
-			VectorCopy( m_offset, offset );
-			scale = m_scale;
-			sAnimName = m_anim;
-		}
-		else if( m_sDrawModelName.length() )
-		{
-			if( m_lastitemindex != cl.snap.ps.activeItems[ m_inventoryrendermodelindex ] )
-			{
-				if( !m_lastitem )
-					m_lastitem = CL_GetInvItemByName( &client_inv, m_sDrawModelName );
-			}
+        if (frac > 1.0) {
+            frac = 1.0;
+        } else if (frac < 0.0) {
+            frac = 0.0;
+        }
 
-_shitlabel01:
-			if( !m_lastitem )
-				return;
+        DrawStatbar(frac);
+        return;
+    }
 
-			VectorCopy( m_lastitem->hudprops.rotateoffset, rotateoffset );
-			VectorCopy( m_lastitem->hudprops.offset, offset );
+    float     scale;
+    qhandle_t handle;
+    vec3_t    origin;
+    vec3_t    mins;
+    vec3_t    maxs;
+    vec3_t    angles;
+    vec3_t    offset;
+    vec3_t    rotateoffset;
+    vec4_t    color;
+    str       sAnimName;
+    float     height;
 
-			handle = re.RegisterModel( m_lastitem->hudprops.model );
+    if (m_itemindex != -1) {
+        if (m_itemindex < 0) {
+            return;
+        }
 
-			VectorCopy( m_lastitem->hudprops.angledeltas, angles );
+        if (cl.snap.ps.activeItems[m_itemindex] < 0 || cl.snap.ps.activeItems[m_itemindex] >= MAX_WEAPONS) {
+            // Fixed in OPM
+            //  Make sure to not overflow configstrings
+            return;
+        }
 
-			if( m_lastitem->hudprops.move == INV_MOVE_BOB )
-			{
-				float frac = uid.time / 600.0;
-				angles[ 0 ] += sin( frac ) * m_lastitem->hudprops.angledeltas[ 0 ];
-				angles[ 1 ] += sin( frac ) * m_lastitem->hudprops.angledeltas[ 1 ];
-				angles[ 2 ] += sin( frac ) * m_lastitem->hudprops.angledeltas[ 2 ];
-			}
-			else if( m_lastitem->hudprops.model == INV_MOVE_SPIN )
-			{
-				float frac = uid.time / 600.0;
-				angles[ 0 ] += frac * m_lastitem->hudprops.angledeltas[ 0 ];
-				angles[ 1 ] += frac * m_lastitem->hudprops.angledeltas[ 1 ];
-				angles[ 2 ] += frac * m_lastitem->hudprops.angledeltas[ 2 ];
-			}
+        m_font->setColor(m_foreground_color);
 
-			if( m_rendermodel )
-			{
-				VectorSet( mins, -16, -16, 0 );
-				VectorSet( maxs, 16, 16, 96 );
-			}
-			else
-			{
-				re.ModelBounds( handle, mins, maxs );
-			}
+        if (m_bOutlinedText) {
+            m_font->PrintOutlinedJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_itemindex]))),
+                UBlack,
+                getVirtualScale()
+            );
+        } else {
+            m_font->PrintJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                Sys_LV_CL_ConvertString(va("%s", CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_itemindex]))),
+                getVirtualScale()
+            );
+        }
 
-			origin[ 1 ] = ( mins[ 1 ] + maxs[ 1 ] ) * 0.5;
-			origin[ 2 ] = ( mins[ 1 ] + maxs[ 1 ] ) * -0.5;
+        return;
+    }
 
-			height = maxs[ 2 ] - mins[ 2 ];
+    if (m_inventoryrendermodelindex == -1 && !m_sDrawModelName.length() && !m_rendermodel) {
+        float frac = 0.0;
 
-			if( height < maxs[ 1 ] - mins[ 1 ] )
-				height = maxs[ 1 ] - mins[ 1 ];
+        if (m_statbar_or == L_STATBAR_NONE) {
+            return;
+        }
 
-			if( height <= maxs[ 0 ] - mins[ 0 ] )
-				height = maxs[ 0 ] - mins[ 0 ];
+        if (m_cvarname.length()) {
+            frac = Cvar_VariableValue(m_cvarname) / (m_statbar_max - m_statbar_min);
+        }
 
-			origin[ 0 ] = height * scale * 0.5 / 0.268f;
+        if (frac > 1.0) {
+            frac = 1.0;
+        }
+        if (frac < 0.0) {
+            frac = 0.0;
+        }
 
-			CL_Draw3DModel( m_screenframe.pos.x, m_screenframe.pos.y, m_screenframe.size.width, m_screenframe.size.height, handle, origin, rotateoffset, offset, angles, color, sAnimName );
-			return;
-		}
+        DrawStatbar(frac);
+        return;
+    }
 
-		if( m_lastitemindex == cl.snap.ps.activeItems[ m_inventoryrendermodelindex ] )
-			goto _shitlabel01;
+    VectorSet4(color, 255, 255, 255, 255);
 
-		if( m_lastitem == CL_GetInvItemByName( &client_inv, CL_ConfigString( CS_WEAPONS + cl.snap.ps.activeItems[ m_inventoryrendermodelindex ] ) ) )
-		{
-			m_lastitemindex = cl.snap.ps.activeItems[ m_inventoryrendermodelindex ];
-			goto _shitlabel01;
-		}
+    if (m_rendermodel) {
+        if (!m_cvarname.length()) {
+            return;
+        }
 
-		m_lastitem = CL_GetInvItemByName( &client_inv, CL_ConfigString( CS_WEAPONS + cl.snap.ps.activeItems[ m_inventoryrendermodelindex ] ) );
-		goto _shitlabel01;
-	}
+        handle = re.RegisterModel(Cvar_VariableString(m_cvarname));
+        if (!handle) {
+            return;
+        }
 
-	int delta = cl.snap.ps.stats[ m_stat ];
+        VectorCopy(m_angles, angles);
+        VectorCopy(m_rotateoffset, rotateoffset);
+        VectorCopy(m_offset, offset);
+        scale     = m_scale;
+        sAnimName = m_anim;
 
-	if( m_statbar_or )
-	{
-		if( m_statbar_or == L_STATBAR_VERTICAL_STAGGER_EVEN || m_statbar_or == L_STATBAR_VERTICAL_STAGGER_ODD )
-		{
-			int stat;
+        // Added in 2.11
+        //  Tunak easter egg
+        if (Cvar_Get("tunak", "0", 0)->integer) {
+            // Since 2.15, those animations start has 'zz' prefix
+            if (strstr(m_anim, "american")) {
+                sAnimName = "zzamericanspecialidle";
+            } else {
+                // Added in 2.15
+                sAnimName = "zzgermanspecialidle";
+            }
+        }
+    } else {
+        if (m_sDrawModelName.length()) {
+            if (!m_lastitem) {
+                m_lastitem = CL_GetInvItemByName(&client_inv, m_sDrawModelName);
+            }
+        } else {
+            if (m_inventoryrendermodelindex >= 0
+                && m_lastitemindex != cl.snap.ps.activeItems[m_inventoryrendermodelindex]) {
+                m_lastitem = CL_GetInvItemByName(
+                    &client_inv, CL_ConfigString(CS_WEAPONS + cl.snap.ps.activeItems[m_inventoryrendermodelindex])
+                );
+                m_lastitemindex = cl.snap.ps.activeItems[m_inventoryrendermodelindex];
+            }
+        }
 
-			if( m_maxstat < 0 ) {
-				stat = m_statbar_max;
-			} else {
-				stat = cl.snap.ps.stats[ m_maxstat ];
-			}
+        if (!m_lastitem) {
+            return;
+        }
 
-			delta = stat - cl.snap.ps.stats[ m_stat ];
+        VectorCopy(m_lastitem->hudprops.rotateoffset, rotateoffset);
+        VectorCopy(m_lastitem->hudprops.offset, offset);
+        scale  = m_lastitem->hudprops.scale;
+        handle = re.RegisterModel(m_lastitem->hudprops.model);
+        VectorCopy(m_lastitem->hudprops.angledeltas, angles);
 
-			if( delta & 1 )
-			{
-				if( m_statbar_or == L_STATBAR_VERTICAL_STAGGER_EVEN )
-					delta--;
-				else
-					delta++;
-			}
+        if (m_lastitem->hudprops.move == INV_MOVE_BOB) {
+            float frac = uid.time / 600.0;
+            angles[0] += sin(frac) * m_lastitem->hudprops.angledeltas[0];
+            angles[1] += sin(frac) * m_lastitem->hudprops.angledeltas[1];
+            angles[2] += sin(frac) * m_lastitem->hudprops.angledeltas[2];
+        } else if (m_lastitem->hudprops.model == INV_MOVE_SPIN) {
+            float frac = uid.time / 600.0;
+            angles[0] += frac * m_lastitem->hudprops.angledeltas[0];
+            angles[1] += frac * m_lastitem->hudprops.angledeltas[1];
+            angles[2] += frac * m_lastitem->hudprops.angledeltas[2];
+        }
+    }
 
-			delta = stat - delta;
+    if (m_rendermodel) {
+        VectorSet(mins, -16, -16, 0);
+        VectorSet(maxs, 16, 16, 96);
+    } else {
+        re.ModelBounds(handle, mins, maxs);
+    }
 
-			if( m_maxstat >= 0 || m_statbar_min <= delta )
-			{
-				if( delta < 0 )
-					delta = 0;
-			}
-			else
-			{
-				delta = m_statbar_min;
-			}
-		}
+    origin[1] = (mins[1] + maxs[1]) * 0.5;
+    origin[2] = (mins[2] + maxs[2]) * -0.5;
 
-		float frac;
+    height = maxs[2] - mins[2];
 
-		if( m_maxstat >= 0 )
-		{
-			frac = (float)delta / (float)cl.snap.ps.stats[m_maxstat];
-		}
-		else
-		{
-			frac = (float)delta / (float)(m_statbar_max - m_statbar_min);
-		}
+    if (height < maxs[1] - mins[1]) {
+        height = maxs[1] - mins[1];
+    }
 
-		if( frac > 1.0 ) frac = 1.0;
-		else if( frac < 0.0 ) frac = 0.0;
+    if (height < maxs[0] - mins[0]) {
+        height = maxs[0] - mins[0];
+    }
 
-		DrawStatbar( frac );
-		
-		return;
-	}
+    origin[0] = height * scale * 0.5 / 0.268f;
 
-	m_font->setColor( m_foreground_color );
-	m_font->PrintJustified( getClientFrame(),
-		m_iFontAlignmentHorizontal,
-		m_iFontAlignmentVertical,
-		va( "%d", delta ),
-		m_bVirtual ? m_vVirtualScale : NULL );
+    CL_Draw3DModel(
+        m_screenframe.pos.x,
+        m_screenframe.pos.y,
+        m_screenframe.size.width,
+        m_screenframe.size.height,
+        handle,
+        origin,
+        rotateoffset,
+        offset,
+        angles,
+        color,
+        sAnimName
+    );
+
+    set2D();
 }
diff --git a/code/client/cl_uistd.h b/code/client/cl_uistd.h
index c4fe9d7e..15a7afa3 100644
--- a/code/client/cl_uistd.h
+++ b/code/client/cl_uistd.h
@@ -20,85 +20,88 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UISTD_H__
-#define __CL_UISTD_H__
+#pragma once
 
 typedef enum {
-	L_STATBAR_NONE,
-	L_STATBAR_HORIZONTAL,
-	L_STATBAR_VERTICAL,
-	L_STATBAR_VERTICAL_REVERSE,
-	L_STATBAR_VERTICAL_STAGGER_EVEN,
-	L_STATBAR_VERTICAL_STAGGER_ODD,
-	L_STATBAR_CIRCULAR,
-	L_STATBAR_NEEDLE,
-	L_STATBAR_ROTATOR,
-	L_STATBAR_COMPASS,
-	L_STATBAR_SPINNER,
-	L_STATBAR_HEADING_SPINNER
+    L_STATBAR_NONE,
+    L_STATBAR_HORIZONTAL,
+    L_STATBAR_VERTICAL,
+    L_STATBAR_VERTICAL_REVERSE,
+    L_STATBAR_VERTICAL_STAGGER_EVEN,
+    L_STATBAR_VERTICAL_STAGGER_ODD,
+    L_STATBAR_CIRCULAR,
+    L_STATBAR_NEEDLE,
+    L_STATBAR_ROTATOR,
+    L_STATBAR_COMPASS,
+    L_STATBAR_SPINNER,
+    L_STATBAR_HEADING_SPINNER
 } statbar_orientation_t;
 
-class UIFakkLabel : public UILabel {
+extern Event EV_ClearInvItemReference;
+
+class UIFakkLabel : public UILabel
+{
 protected:
-	SafePtr<inventory_item_t> m_lastitem;
-	int m_lastitemindex;
-	int m_stat;
-	int m_stat_configstring;
-	int m_maxstat;
-	int m_itemindex;
-	int m_inventoryrendermodelindex;
-	str m_sDrawModelName;
-	qboolean m_rendermodel;
-	statbar_orientation_t m_statbar_or;
-	float m_statbar_min;
-	float m_statbar_max;
-	float m_lastfrac;
-	float m_flashtime;
-	vec3_t m_offset;
-	vec3_t m_rotateoffset;
-	vec3_t m_angles;
-	float m_scale;
-	str m_anim;
-	UIReggedMaterial *m_statbar_material;
-	UIReggedMaterial *m_statbar_material_flash;
+    SafePtr<inventory_item_t> m_lastitem;
+    int                       m_lastitemindex;
+    int                       m_stat;
+    int                       m_stat_alpha;
+    int                       m_stat_configstring;
+    int                       m_maxstat;
+    int                       m_itemindex;
+    int                       m_inventoryrendermodelindex;
+    str                       m_sDrawModelName;
+    qboolean                  m_rendermodel;
+    statbar_orientation_t     m_statbar_or;
+    float                     m_statbar_min;
+    float                     m_statbar_max;
+    float                     m_lastfrac;
+    float                     m_flashtime;
+    vec3_t                    m_offset;
+    vec3_t                    m_rotateoffset;
+    vec3_t                    m_angles;
+    float                     m_scale;
+    str                       m_anim;
+    UIReggedMaterial         *m_statbar_material;
+    UIReggedMaterial         *m_statbar_material_flash;
+	UIReggedMaterial         *m_statbar_material_marker;
 
 public:
-	CLASS_PROTOTYPE( UIFakkLabel );
+    CLASS_PROTOTYPE(UIFakkLabel);
 
-	UIFakkLabel();
+    UIFakkLabel();
 
-	void		LayoutPlayerStat( Event *ev );
-	void		LayoutPlayerStatConfigstring( Event *ev );
-	void		LayoutMaxPlayerStat( Event *ev );
-	void		LayoutItemIndex( Event *ev );
-	void		InventoryRenderModelIndex( Event *ev );
-	void		LayoutModelName( Event *ev );
-	void		ClearInvItemReference( Event *ev );
-	void		LayoutStatbar( Event *ev );
-	void		LayoutStatbarShader( Event *ev );
-	void		LayoutStatbarTileShader( Event *ev );
-	void		LayoutStatbarShader_Flash( Event *ev );
-	void		LayoutStatbarEndAngles( Event *ev );
-	void		LayoutStatbarNeedleWidth( Event *ev );
-	void		LayoutStatbarRotatorSize( Event *ev );
-	void		LayoutStatbarTileShader_Flash( Event *ev );
-	void		LayoutRenderModel( Event *ev );
-	void		LayoutRenderModelOffset( Event *ev );
-	void		LayoutRenderModelRotateOffset( Event *ev );
-	void		LayoutRenderModelAngles( Event *ev );
-	void		LayoutRenderModelScale( Event *ev );
-	void		LayoutRenderModelAnim( Event *ev );
+    void LayoutPlayerStat(Event *ev);
+    void LayoutPlayerStatAlpha(Event *ev); // Added in 2.0
+    void LayoutPlayerStatConfigstring(Event *ev);
+    void LayoutMaxPlayerStat(Event *ev);
+    void LayoutItemIndex(Event *ev);
+    void InventoryRenderModelIndex(Event *ev);
+    void LayoutModelName(Event *ev);
+    void ClearInvItemReference(Event *ev);
+    void LayoutStatbar(Event *ev);
+    void LayoutStatbarShader(Event *ev);
+    void LayoutStatbarTileShader(Event *ev);
+    void LayoutStatbarShader_Flash(Event *ev);
+    void LayoutStatbarShader_Marker(Event *ev); // Added in 2.0
+    void LayoutStatbarEndAngles(Event *ev);
+    void LayoutStatbarNeedleWidth(Event *ev);
+    void LayoutStatbarRotatorSize(Event *ev);
+    void LayoutStatbarTileShader_Flash(Event *ev);
+    void LayoutRenderModel(Event *ev);
+    void LayoutRenderModelOffset(Event *ev);
+    void LayoutRenderModelRotateOffset(Event *ev);
+    void LayoutRenderModelAngles(Event *ev);
+    void LayoutRenderModelScale(Event *ev);
+    void LayoutRenderModelAnim(Event *ev);
 
-	void		DrawStatbar( float frac );
-	void		DrawStatCircle( float frac );
-	void		DrawStatNeedle( float frac );
-	void		DrawStatRotator( float frac );
-	void		DrawStatCompass( float frac );
-	void		DrawStatSpinner( float frac );
-	void		StatCircleTexCoord( float fAng, vec3_t vTexCoord );
+    void DrawStatbar(float frac);
+    void DrawStatCircle(float frac);
+    void DrawStatNeedle(float frac);
+    void DrawStatRotator(float frac);
+    void DrawStatCompass(float frac);
+    void DrawStatSpinner(float frac);
+    void StatCircleTexCoord(float fAng, vec3_t vTexCoord);
 
-	void		Draw( void ) override;
+    void Draw(void) override;
 };
-
-#endif
-
diff --git a/code/client/cl_uiview3d.cpp b/code/client/cl_uiview3d.cpp
index 5bf6e78c..98440439 100644
--- a/code/client/cl_uiview3d.cpp
+++ b/code/client/cl_uiview3d.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,424 +21,852 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cl_ui.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIWidget, View3D, NULL )
-{
-	{ &W_Activated,			&View3D::OnActivate },
-	{ &W_Deactivated,		&View3D::OnDeactivate },
-	{ &W_LeftMouseDown,		&View3D::Pressed },
-	{ NULL, NULL }
+#include "../server/server.h"
+
+CLASS_DECLARATION(UIWidget, View3D, NULL) {
+    {&W_Activated,     &View3D::OnActivate  },
+    {&W_Deactivated,   &View3D::OnDeactivate},
+    {&W_LeftMouseDown, &View3D::Pressed     },
+    {NULL,             NULL                 }
 };
 
-#define MAX_SUBTITLES 4
-
-cvar_t* subs[MAX_SUBTITLES];
-cvar_t* teams[MAX_SUBTITLES];
-float fadeTime[MAX_SUBTITLES];
-float subLife[MAX_SUBTITLES];
-float alpha[MAX_SUBTITLES];
-char oldStrings[MAX_SUBTITLES][2048];
+cvar_t *subs[MAX_SUBTITLES];
+cvar_t *teams[MAX_SUBTITLES];
+float   fadeTime[MAX_SUBTITLES];
+float   subLife[MAX_SUBTITLES];
+float   alpha[MAX_SUBTITLES];
+char    oldStrings[MAX_SUBTITLES][2048];
 
 View3D::View3D()
 {
-	// set as transparent
-	setBackgroundColor(UClear, true);
-	// no border
-	setBorderStyle(border_none);
-	AllowActivate(true);
+    // set as transparent
+    setBackgroundColor(UClear, true);
+    // no border
+    setBorderStyle(border_none);
+    AllowActivate(true);
 
-	m_printfadetime = 0.0;
-	m_print_mat = NULL;
-	m_locationprint = qfalse;
+    m_printfadetime = 0.0;
+    m_print_mat     = NULL;
+    m_locationprint = qfalse;
 }
 
-void View3D::Draw
-	(
-	void
-	)
-
+void View3D::UpdateCenterPrint(const char *s, float alpha)
 {
-	if (clc.state != CA_DISCONNECTED) {
-		SCR_DrawScreenField();
-	}
+    m_printstring = s;
 
-	set2D();
+    if (s[0] == '@') {
+        m_print_mat = uWinMan.RegisterShader(s + 1);
+    } else {
+        m_print_mat = NULL;
+    }
 
-	re.SavePerformanceCounters();
-
-	Draw2D();
+    m_printalpha    = alpha;
+    m_printfadetime = 4000.0;
+    m_locationprint = qfalse;
 }
 
-void View3D::DrawLetterbox
-	(
-	void
-	)
-
+void View3D::UpdateLocationPrint(int x, int y, const char *s, float alpha)
 {
-	float frac;
-	vec4_t col;
-
-	col[0] = col[1] = col[2] = 0;
-	col[3] = 1;
-
-	frac = cl.snap.ps.stats[STAT_LETTERBOX] / 32767.0;
-	if (frac > 0.0) {
-		m_letterbox_active = true;
-		re.SetColor(col);
-
-		re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-		re.DrawBox(0.0, m_screenframe.size.height - m_screenframe.size.height * frac, m_screenframe.size.width, m_screenframe.size.height);
-	} else {
-		m_letterbox_active = false;
-	}
+    m_printstring   = s;
+    m_printalpha    = alpha;
+    m_printfadetime = 4000.0;
+    m_x_coord       = x;
+    m_y_coord       = y;
+    m_locationprint = qtrue;
 }
 
-void View3D::DrawFades
-	(
-	void
-	)
-
+void View3D::FrameInitialized(void)
 {
-	if (cl.snap.ps.blend[3] > 0) {
-		re.SetColor(cl.snap.ps.blend);
-		if (cl.snap.ps.stats[STAT_ADDFADE]) {
-			re.AddBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-		} else {
-            re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
-		}
-	}
+    Connect(this, W_Activated, W_Activated);
+    Connect(this, W_Deactivated, W_Deactivated);
 }
 
-void View3D::Draw2D
-	(
-	void
-	)
-
+void View3D::Pressed(Event *ev)
 {
-	if (!cls.no_menus) {
-		DrawFades();
-	}
-
-	DrawLetterbox();
-
-	if ((cl_debuggraph->integer || cl_timegraph->integer) && !cls.no_menus)
-	{
-		SCR_DrawDebugGraph();
-	}
-	else if (!cls.no_menus)
-	{
-		if (cge) {
-			cge->CG_Draw2D();
-		}
-
-		if (m_locationprint) {
-			LocationPrint();
-		} else {
-			CenterPrint();
-		}
-
-		if (!cls.no_menus)
-		{
-			DrawSoundOverlay();
-			DrawSubtitleOverlay();
-		}
-	}
-
-	if (fps->integer && !cls.no_menus)
-	{
-		DrawFPS();
-		DrawProf();
-	}
+    IN_MouseOff();
+    OnActivate(ev);
 }
 
-void View3D::DrawFPS
-	(
-	void
-	)
-
+void View3D::OnActivate(Event *ev)
 {
-	char string[128];
-
-	setFont("verdana-14");
-	if (fps->integer == 2)
-	{
-		re.SetColor(UBlack);
-		re.DrawBox(
-			0.0,
-			m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 4.0,
-			m_frame.pos.x + m_frame.size.width,
-			m_font->getHeight(qfalse) * 4.0
-		);
-	}
-
-	sprintf(string, "FPS %4.1f", currentfps);
-	if (currentfps > 23.94) {
-		if (cl_greenfps->integer) {
-			m_font->setColor(UGreen);
-		} else {
-			m_font->setColor(UWhite);
-		}
-	} else if (currentfps > 18.0) {
-		m_font->setColor(UYellow);
-	} else {
-		// low fps
-		m_font->setColor(URed);
-	}
-
-	m_font->Print(
-		m_font->getHeight(qfalse) * 10.0,
-		m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 3.0,
-		string,
-		-1,
-		qfalse
-	);
-
-	// Draw elements count
-	if (cl_greenfps->integer) {
-		m_font->setColor(UGreen);
-	}
-	else {
-		m_font->setColor(UWhite);
-	}
-
-	sprintf(string, "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
-
-	m_font->Print(
-		m_font->getHeight(qfalse) * 10.0,
-		m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse) * 2.0,
-		string,
-		-1,
-		qfalse
-	);
-
-	sprintf(string, "t%5d v%5d Mtex%5.2f", cls.total_tris, cls.total_verts, (float)cls.total_texels * 0.00000095367432);
-
-
-	m_font->Print(
-		m_font->getHeight(qfalse) * 10.0,
-		m_frame.pos.y + m_frame.size.height - m_font->getHeight(qfalse),
-		string,
-		-1,
-		qfalse
-	);
-
-	m_font->setColor(UBlack);
-}
-
-void View3D::DrawProf
-	(
-	void
-	)
-
-{
-	// Normal empty function
-}
-
-void View3D::PrintSound
-	(
-	int channel,
-	const char *name,
-	float vol,
-	int rvol,
-	float pitch,
-	float base,
-	int& line
-	)
-
-{
-	// FIXME: unimplemented
-}
-
-void View3D::DrawSoundOverlay
-	(
-	void
-	)
-
-{
-	setFont("verdana-14");
-	m_font->setColor(UWhite);
-
-	if (sound_overlay->integer) {
-		Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
-		Cvar_Set("sound_overlay", "0");
-	}
-}
-
-void View3D::CenterPrint
-	(
-	void
-	)
-
-{
-	// FIXME: unimplemented
-}
-
-void View3D::LocationPrint
-	(
-	void
-	)
-
-{
-	// FIXME: unimplemented
-}
-
-void View3D::OnActivate
-	(
-	Event *ev
-	)
-
-{
-	UIWidget* wid;
-    UList<UIWidget*> widgets;
+    UIWidget         *wid;
+    UList<UIWidget *> widgets;
 
     UI_CloseInventory();
-    cls.keyCatchers &= ~KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() & ~KEYCATCH_UI);
 
-	for (wid = getParent()->getFirstChild(); wid; wid = getParent()->getNextChild(wid))
-	{
-		if (wid->getAlwaysOnBottom() && wid != this) {
-			widgets.AddTail(wid);
-		}
-	}
+    for (wid = getParent()->getFirstChild(); wid; wid = getParent()->getNextChild(wid)) {
+        if (wid->getAlwaysOnBottom() && wid != this) {
+            widgets.AddTail(wid);
+        }
+    }
 
-	widgets.IterateFromHead();
-	while (widgets.IsCurrentValid())
-	{
-		widgets.getCurrent()->BringToFrontPropogated();
-		widgets.IterateNext();
-	}
+    widgets.IterateFromHead();
+    while (widgets.IsCurrentValid()) {
+        widgets.getCurrent()->BringToFrontPropogated();
+        widgets.IterateNext();
+    }
 }
 
-void View3D::OnDeactivate
-	(
-	Event *ev
-	)
-
+void View3D::OnDeactivate(Event *ev)
 {
-	cls.keyCatchers |= KEYCATCH_UI;
+    Key_SetCatcher(Key_GetCatcher() | KEYCATCH_UI);
 }
 
-void View3D::DrawSubtitleOverlay
-	(
-	void
-	)
-
+void View3D::DrawFPS(void)
 {
-	// FIXME: unimplemented
+    char string[128];
+
+    setFont("verdana-14");
+    if (fps->integer == 2) {
+        re.SetColor(UBlack);
+        re.DrawBox(
+            0.0,
+            m_frame.pos.y + m_frame.size.height - m_font->getHeight() * 4.0,
+            m_frame.pos.x + m_frame.size.width,
+            m_font->getHeight() * 4.0
+        );
+    }
+
+    Com_sprintf(string, sizeof(string), "FPS %4.1f", currentfps);
+    if (currentfps > 23.94) {
+        if (cl_greenfps->integer) {
+            m_font->setColor(UGreen);
+        } else {
+            m_font->setColor(UWhite);
+        }
+    } else if (currentfps > 18.0) {
+        m_font->setColor(UYellow);
+    } else {
+        // low fps
+        m_font->setColor(URed);
+    }
+
+    m_font->Print(
+        m_font->getHeight(getHighResScale()) * 10.0 / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale()) * 3.0) / getHighResScale()[1],
+        string,
+        -1,
+        getHighResScale()
+    );
+
+    // Draw elements count
+    if (cl_greenfps->integer) {
+        m_font->setColor(UGreen);
+    } else {
+        m_font->setColor(UWhite);
+    }
+
+    Com_sprintf(string, sizeof(string), "wt%5d wv%5d cl%d", cls.world_tris, cls.world_verts, cls.character_lights);
+
+    m_font->Print(
+        (m_font->getHeight(getHighResScale()) * 10.0) / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale()) * 2.0) / getHighResScale()[1],
+        string,
+        -1,
+        getHighResScale()
+    );
+
+    Com_sprintf(
+        string,
+        sizeof(string),
+        "t%5d v%5d Mtex%5.2f",
+        cls.total_tris,
+        cls.total_verts,
+        (float)cls.total_texels * 0.00000095367432
+    );
+
+    m_font->Print(
+        (m_font->getHeight(getHighResScale()) * 10.0) / getHighResScale()[0],
+        (m_frame.pos.y + m_frame.size.height - m_font->getHeight(getHighResScale())) / getHighResScale()[1],
+        string,
+        -1,
+        getHighResScale()
+    );
+
+    m_font->setColor(UBlack);
 }
 
-void View3D::ClearCenterPrint
-	(
-	void
-	)
-
+/*
+void ProfPrint(UIFont* m_font, float minY, int line, char* label, prof_var_t* var, int level)
 {
-	m_printfadetime = 0.0;
+
+}
+*/
+
+void View3D::DrawProf(void)
+{
+    // FIXME: unimplemented
 }
 
-void View3D::UpdateCenterPrint
-	(
-	const char *s,
-	float alpha
-	)
-
+void View3D::PrintSound(int channel, const char *name, float vol, int rvol, float pitch, float base, int& line)
 {
-	m_printstring = s;
+    char  buf[255];
+    float x;
+    float xStep;
+    float height;
 
-	if (s[0] == '@') {
-		m_print_mat = uWinMan.RegisterShader(s + 1);
-	} else {
-		m_print_mat = NULL;
-	}
+    height = m_font->getHeight(getHighResScale());
+    xStep  = height;
 
-	m_printalpha = alpha;
-	m_printfadetime = 4000.0;
-	m_locationprint = qfalse;
+    x = 0;
+    Com_sprintf(buf, sizeof(buf), "%d", channel);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    x += xStep + xStep;
+    Com_sprintf(buf, sizeof(buf), "%s", name);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    x += xStep * 30.0;
+    Com_sprintf(buf, sizeof(buf), "vol:%.2f", vol);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    x += xStep * 8;
+    Com_sprintf(buf, sizeof(buf), "rvol:%.2f", (float)(rvol / 128.f));
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    x += xStep * 5;
+    Com_sprintf(buf, sizeof(buf), "pit:%.2f", pitch);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    x += xStep * 5;
+    Com_sprintf(buf, sizeof(buf), "base:%d", (int)base);
+    m_font->Print(x, height * line + m_frame.pos.y, buf, -1, getHighResScale());
+
+    line++;
 }
 
-void View3D::UpdateLocationPrint
-	(
-	int x,
-	int y,
-	const char *s,
-	float alpha
-	)
-
+void View3D::DrawSoundOverlay(void)
 {
-	m_printstring = s;
-	m_printalpha = alpha;
-	m_printfadetime = 4000.0;
-	m_x_coord = x;
-	m_y_coord = y;
-	m_locationprint = qtrue;
+    setFont("verdana-14");
+    m_font->setColor(UWhite);
+
+    // FIXME: Unimplemented
+    if (sound_overlay->integer) {
+        Com_Printf("sound_overlay isn't supported with OpenAL/SDL right now.\n");
+        Cvar_Set("sound_overlay", "0");
+    }
 }
 
-qboolean View3D::LetterboxActive
-	(
-	void
-	)
-
+void DisplayServerNetProfileInfo(UIFont *font, float y, netprofclient_t *netprofile)
 {
-	return m_letterbox_active;
+    font->Print(104, y, va("%i", netprofile->inPackets.packetsPerSec));
+    font->Print(144, y, va("%i", netprofile->outPackets.packetsPerSec));
+    font->Print(184, y, va("%i", netprofile->inPackets.packetsPerSec + netprofile->outPackets.packetsPerSec));
+    font->Print(234, y, va("%i", netprofile->inPackets.percentFragmented));
+    font->Print(264, y, va("%i", netprofile->outPackets.percentFragmented));
+    font->Print(
+        294,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           )),
+        -1
+    );
+    font->Print(334, y, va("%i", netprofile->inPackets.percentDropped));
+    font->Print(364, y, va("%i", netprofile->outPackets.percentDropped));
+    font->Print(
+        394,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           )),
+        -1
+    );
+    font->Print(434, y, va("%i", netprofile->inPackets.percentDropped));
+    font->Print(464, y, va("%i", netprofile->outPackets.percentDropped));
+    font->Print(
+        494,
+        y,
+        va("%i",
+           (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess
+                                  + netprofile->inPackets.totalLengthConnectionLess)
+                          / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize))),
+        -1
+    );
+    font->Print(534, y, va("%i", netprofile->inPackets.bytesPerSec));
+    font->Print(594, y, va("%i", netprofile->outPackets.bytesPerSec));
+    font->Print(654, y, va("%i", netprofile->outPackets.bytesPerSec + netprofile->inPackets.bytesPerSec));
+    font->Print(714, y, va("%i", netprofile->rate));
+}
+
+void DisplayClientNetProfile(UIFont *font, float x, float y, netprofclient_t *netprofile)
+{
+    float columns[5];
+    float fontHeight;
+    float columnHeight;
+
+    fontHeight   = font->getHeight();
+    columns[0]   = x + 120;
+    columns[1]   = x + 230;
+    columns[2]   = x + 330;
+    columns[3]   = x + 430;
+    columns[4]   = x + 530;
+    columnHeight = y;
+
+    font->Print(x, y, va("Rate: %i", netprofile->rate));
+
+    columnHeight += fontHeight * 1.5;
+    font->Print(x, columnHeight, "Data Type");
+    font->Print(columns[0], columnHeight, "Packets per Sec");
+    font->Print(columns[1], columnHeight, "% Fragmented");
+    font->Print(columns[2], columnHeight, "% Dropped");
+    font->Print(columns[3], columnHeight, "% OOB data");
+    font->Print(columns[4], columnHeight, "Data per Sec");
+
+    columnHeight += fontHeight * 0.5;
+    font->Print(x, columnHeight, "----------");
+    font->Print(columns[0], columnHeight, "----------");
+    font->Print(columns[1], columnHeight, "----------");
+    font->Print(columns[2], columnHeight, "----------");
+    font->Print(columns[3], columnHeight, "----------");
+    font->Print(columns[4], columnHeight, "----------");
+
+    columnHeight += fontHeight;
+    font->Print(x, columnHeight, "Data In");
+    font->Print(columns[0], columnHeight, va("%i", netprofile->outPackets.packetsPerSec));
+    font->Print(columns[1], columnHeight, va("%i%%", netprofile->outPackets.percentFragmented));
+    font->Print(columns[2], columnHeight, va("%i%%", netprofile->outPackets.percentDropped));
+    font->Print(columns[3], columnHeight, va("%i%%", netprofile->outPackets.percentConnectionLess));
+    font->Print(columns[4], columnHeight, va("%i", netprofile->outPackets.bytesPerSec));
+
+    columnHeight += fontHeight;
+    font->Print(x, columnHeight, "Data Out");
+    font->Print(columns[0], columnHeight, va("%i", netprofile->inPackets.packetsPerSec));
+    font->Print(columns[1], columnHeight, va("%i%%", netprofile->inPackets.percentFragmented));
+    font->Print(columns[2], columnHeight, va("%i%%", netprofile->inPackets.percentDropped));
+    font->Print(columns[3], columnHeight, va("%i%%", netprofile->inPackets.percentConnectionLess));
+    font->Print(columns[4], columnHeight, va("%i", netprofile->inPackets.bytesPerSec));
+
+    columnHeight += fontHeight;
+
+    font->Print(x, columnHeight, "Total Data");
+
+    font->Print(
+        columns[0],
+        columnHeight,
+        va("%i", netprofile->inPackets.packetsPerSec + netprofile->outPackets.packetsPerSec)
+    );
+    font->Print(
+        columns[1],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented)
+                          / (float)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed)
+           ))
+    );
+    font->Print(
+        columns[2],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped)
+                          / (double)(netprofile->inPackets.totalProcessed + netprofile->outPackets.totalProcessed
+                          )))
+    );
+    font->Print(
+        columns[3],
+        columnHeight,
+        va("%i%%",
+           (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess
+                                  + netprofile->inPackets.totalLengthConnectionLess)
+                          / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize)))
+    );
+    font->Print(
+        columns[4],
+        columnHeight,
+        va("%i", netprofile->inPackets.bytesPerSec + netprofile->outPackets.bytesPerSec)
+    );
+}
+
+void View3D::DrawNetProfile(void)
+{
+    float fontHeight;
+    float yOffset;
+    int   i;
+
+    if (sv_netprofileoverlay->integer && sv_netprofile->integer && com_sv_running->integer) {
+        float           columnHeight;
+        float           valueHeight;
+        float           separatorHeight;
+        float           categoryHeight;
+        float           currentHeight;
+        netprofclient_t netproftotal;
+
+        setFont("verdana-14");
+        m_font->setColor(UWhite);
+
+        fontHeight = m_font->getHeight();
+        yOffset    = sv_netprofileoverlay->integer + 8;
+
+        if (svs.netprofile.rate) {
+            m_font->Print(8, yOffset, va("Server Net Profile          Max Rate: %i", svs.netprofile.rate), -1);
+        } else {
+            m_font->Print(8, yOffset, "Server Net Profile          Max Rate: none", -1);
+        }
+
+        columnHeight    = fontHeight + fontHeight + yOffset;
+        valueHeight     = columnHeight + fontHeight;
+        separatorHeight = fontHeight * 1.5 + columnHeight;
+        categoryHeight  = fontHeight * 0.5 + columnHeight;
+
+        m_font->Print(8, categoryHeight, "Data Source");
+        m_font->Print(8, separatorHeight, "---------------");
+        m_font->Print(104, columnHeight, "Packets per Sec");
+        m_font->Print(104, valueHeight, "In");
+        m_font->Print(144, valueHeight, "Out");
+        m_font->Print(184, valueHeight, "Total");
+        m_font->Print(104, separatorHeight, "---");
+        m_font->Print(144, separatorHeight, "-----");
+        m_font->Print(184, separatorHeight, "------");
+        m_font->Print(234, columnHeight, "% Fragmented");
+        m_font->Print(234, valueHeight, "In");
+        m_font->Print(264, valueHeight, "Out");
+        m_font->Print(294, valueHeight, "Total");
+        m_font->Print(234, separatorHeight, "---");
+        m_font->Print(264, separatorHeight, "-----");
+        m_font->Print(294, separatorHeight, "------");
+        m_font->Print(334, columnHeight, "% Dropped");
+        m_font->Print(334, valueHeight, "In");
+        m_font->Print(364, valueHeight, "Out");
+        m_font->Print(394, valueHeight, "Total");
+        m_font->Print(334, separatorHeight, "---");
+        m_font->Print(364, separatorHeight, "-----");
+        m_font->Print(394, separatorHeight, "------");
+        m_font->Print(434, columnHeight, "% OOB Data");
+        m_font->Print(434, valueHeight, "In");
+        m_font->Print(464, valueHeight, "Out");
+        m_font->Print(494, valueHeight, "Total");
+        m_font->Print(434, separatorHeight, "---");
+        m_font->Print(464, separatorHeight, "-----");
+        m_font->Print(494, separatorHeight, "------");
+        m_font->Print(534, columnHeight, "Data per Sec");
+        m_font->Print(534, valueHeight, "In");
+        m_font->Print(594, valueHeight, "Out");
+        m_font->Print(654, valueHeight, "Total");
+        m_font->Print(534, separatorHeight, "---");
+        m_font->Print(594, separatorHeight, "-----");
+        m_font->Print(654, separatorHeight, "------");
+        m_font->Print(714, categoryHeight, "Rate");
+        m_font->Print(714, separatorHeight, "------");
+
+        currentHeight = fontHeight * 2.5 + columnHeight;
+        SV_NET_CalcTotalNetProfile(&netproftotal, qfalse);
+        m_font->Print(8, columnHeight + fontHeight * 2.5, "Total");
+        DisplayServerNetProfileInfo(m_font, currentHeight, &netproftotal);
+
+        currentHeight += fontHeight * 1.5;
+        m_font->Print(8, currentHeight, "Clientless");
+        DisplayServerNetProfileInfo(m_font, currentHeight, &svs.netprofile);
+
+        currentHeight += fontHeight;
+
+        for (i = 0; i < svs.iNumClients; i++) {
+            client_t *client = &svs.clients[i];
+            if (client->state != CS_ACTIVE || !client->gentity) {
+                continue;
+            }
+
+            if (client->netchan.remoteAddress.type == NA_LOOPBACK) {
+                m_font->Print(8.0, currentHeight, va("#%i-Loopback", i), -1, 0);
+
+            } else {
+                m_font->Print(8.0, currentHeight, va("Client #%i", i), -1, 0);
+            }
+
+            DisplayServerNetProfileInfo(m_font, currentHeight, &client->netprofile);
+            currentHeight = currentHeight + fontHeight;
+        }
+    } else if (cl_netprofileoverlay->integer && cl_netprofile->integer && com_cl_running->integer) {
+        setFont("verdana-14");
+        m_font->setColor(UWhite);
+
+        fontHeight = m_font->getHeight();
+        yOffset    = cl_netprofileoverlay->integer + 16;
+
+        m_font->Print(16, yOffset, "Client Net Profile", -1);
+
+        NetProfileCalcStats(&cls.netprofile.outPackets, 500);
+        NetProfileCalcStats(&cls.netprofile.inPackets, 500);
+
+        DisplayClientNetProfile(m_font, 16, yOffset + fontHeight * 2, &cls.netprofile);
+    }
+}
+
+void View3D::Draw2D(void)
+{
+    if (!cls.no_menus) {
+        DrawFades();
+    }
+
+    DrawLetterbox();
+
+    if ((cl_debuggraph->integer || cl_timegraph->integer) && !cls.no_menus) {
+        SCR_DrawDebugGraph();
+    } else if (!cls.no_menus) {
+        if (cge) {
+            cge->CG_Draw2D();
+        }
+
+        if (m_locationprint) {
+            LocationPrint();
+        } else {
+            CenterPrint();
+        }
+
+        if (!cls.no_menus) {
+            DrawSoundOverlay();
+            DrawNetProfile();
+            DrawSubtitleOverlay();
+        }
+    }
+
+    if (fps->integer && !cls.no_menus) {
+        DrawFPS();
+        DrawProf();
+    }
+}
+
+void View3D::CenterPrint(void)
+{
+    float       alpha;
+    const char *p;
+    qhandle_t   mat;
+    float       x, y;
+    float       w, h;
+
+    if (!m_printfadetime) {
+        return;
+    }
+
+    p = Sys_LV_CL_ConvertString(m_printstring);
+    if (m_printfadetime > 3250) {
+        alpha = 1.f - (m_printfadetime - 3250.f) / 750.f * m_printalpha;
+    } else if (m_printfadetime >= 750) {
+        alpha = 1.f;
+    } else {
+        alpha = m_printfadetime / 750.f * m_printalpha;
+    }
+
+    alpha = Q_clamp_float(alpha, 0, 1);
+
+    if (!m_print_mat) {
+        UIRect2D frame;
+        m_font->setColor(UColor(0, 0, 0, alpha));
+
+        frame = getClientFrame();
+
+        m_font->PrintJustified(
+            UIRect2D(frame.pos.x + 1, frame.pos.y + 1, frame.size.width, frame.size.height),
+            m_iFontAlignmentHorizontal,
+            m_iFontAlignmentVertical,
+            p,
+            getVirtualScale()
+        );
+
+        m_font->setColor(UColor(1, 1, 1, alpha));
+
+        frame = getClientFrame();
+
+        m_font->PrintJustified(
+            frame, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, p, getVirtualScale()
+        );
+
+        m_font->setColor(UBlack);
+    } else if ((mat = m_print_mat->GetMaterial())) {
+        vec4_t col {alpha, alpha, alpha, alpha};
+
+        re.SetColor(col);
+
+        w = re.GetShaderWidth(mat);
+        h = re.GetShaderHeight(mat);
+        x = (m_frame.pos.x + m_frame.size.width - w) * 0.5f;
+        y = (m_frame.pos.y + m_frame.size.height - h) * 0.5f;
+
+        re.DrawStretchPic(x, y, w, h, 0, 0, 1, 1, mat);
+    }
+
+    m_printfadetime -= cls.frametime;
+
+    if (m_printfadetime < 0) {
+        m_printfadetime = 0;
+    }
+}
+
+void View3D::LocationPrint(void)
+{
+    fonthorzjustify_t horiz;
+    fontvertjustify_t vert;
+    int               x, y;
+    const char       *p;
+    float             alpha;
+    UIRect2D          frame;
+
+    if (!m_printfadetime) {
+        m_locationprint = false;
+        return;
+    }
+
+    horiz = FONT_JUSTHORZ_LEFT;
+    vert  = FONT_JUSTVERT_TOP;
+
+    p = Sys_LV_CL_ConvertString(m_printstring);
+    if (m_printfadetime > 3250) {
+        alpha = 1.f - (m_printfadetime - 3250.f) / 750.f * m_printalpha;
+    } else if (m_printfadetime >= 750) {
+        alpha = 1.f;
+    } else {
+        alpha = m_printfadetime / 750.f * m_printalpha;
+    }
+
+    alpha = Q_clamp_float(alpha, 0, 1);
+
+    x = m_x_coord / 640.f * m_screenframe.size.width;
+    y = (480 - m_font->getHeight(getHighResScale()) - m_y_coord) / 480.f * m_screenframe.size.height;
+
+    if (m_x_coord == -1) {
+        horiz = FONT_JUSTHORZ_CENTER;
+        x     = 0;
+    }
+    if (m_y_coord == -1) {
+        vert = FONT_JUSTVERT_CENTER;
+        y    = 0;
+    }
+
+    m_font->setColor(UColor(0, 0, 0, alpha));
+    frame = getClientFrame();
+
+    m_font->PrintJustified(
+        UIRect2D(frame.pos.x + x + 1, frame.pos.y + y + 1, frame.size.width, frame.size.height),
+        horiz,
+        vert,
+        p,
+        getVirtualScale()
+    );
+
+    m_font->setColor(UColor(1, 1, 1, alpha));
+    frame = getClientFrame();
+
+    m_font->PrintJustified(
+        UIRect2D(frame.pos.x + x, frame.pos.y + y, frame.size.width, frame.size.height),
+        horiz,
+        vert,
+        p,
+        getVirtualScale()
+    );
+
+    m_font->setColor(UBlack);
+    m_printfadetime -= cls.frametime;
+
+    if (m_printfadetime < 0) {
+        m_printfadetime = 0;
+    }
+}
+
+void View3D::DrawLetterbox(void)
+{
+    float  frac;
+    vec4_t col;
+
+    col[0] = col[1] = col[2] = 0;
+    col[3]                   = 1;
+
+    frac = (float)cl.snap.ps.stats[STAT_LETTERBOX] / MAX_LETTERBOX_SIZE;
+    if (frac <= 0) {
+        m_letterbox_active = false;
+        return;
+    }
+
+    m_letterbox_active = true;
+    re.SetColor(col);
+
+    re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height * frac);
+    re.DrawBox(
+        0.0,
+        m_screenframe.size.height - m_screenframe.size.height * frac,
+        m_screenframe.size.width,
+        m_screenframe.size.height
+    );
+}
+
+void View3D::DrawFades(void)
+{
+    if (cl.snap.ps.blend[3] > 0) {
+        re.SetColor(cl.snap.ps.blend);
+        if (cl.snap.ps.stats[STAT_ADDFADE]) {
+            re.AddBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
+        } else {
+            re.DrawBox(0.0, 0.0, m_screenframe.size.width, m_screenframe.size.height);
+        }
+    }
+}
+
+void View3D::Draw(void)
+{
+    if (clc.state != CA_DISCONNECTED) {
+        SCR_DrawScreenField();
+    }
+
+    set2D();
+
+    re.SavePerformanceCounters();
+
+    Draw2D();
 }
 
 float avWidth = 0.0;
 
-void View3D::InitSubtitle
-	(
-	void
-	)
-
+void View3D::InitSubtitle(void)
 {
-	float totalWidth;
+    float totalWidth;
 
-	for (int i = 0; i < 4; i++) {
-		subs[i] = Cvar_Get(va("subtitle%d", i), "", 0);
-		teams[i] = Cvar_Get(va("subteam%d", i), "0", 0);
-		strcpy(oldStrings[i], subs[i]->string);
-		fadeTime[i] = 4000.0;
-		subLife[i] = 4000.0;
-	}
+    for (int i = 0; i < 4; i++) {
+        subs[i]  = Cvar_Get(va("subtitle%d", i), "", 0);
+        teams[i] = Cvar_Get(va("subteam%d", i), "0", 0);
+        Q_strncpyz(oldStrings[i], subs[i]->string, sizeof(oldStrings[i]));
+        fadeTime[i] = 4000.0;
+        subLife[i]  = 4000.0;
+    }
 
-	totalWidth = 0.0;
-	for (char j = 'A'; j <= 'Z'; j++) {
-		totalWidth += m_font->getCharWidth(j);
-	}
+    totalWidth = 0.0;
+    for (char j = 'A'; j <= 'Z'; j++) {
+        totalWidth += m_font->getCharWidth(j);
+    }
 
-	avWidth = totalWidth / 26.0;
+    avWidth = totalWidth / 26.0;
 }
 
-void View3D::FrameInitialized
-	(
-	void
-	)
-
+void View3D::DrawSubtitleOverlay(void)
 {
-	Connect(this, W_Activated, W_Activated);
-	Connect(this, W_Deactivated, W_Deactivated);
+    cvar_t *subAlpha;
+    int     i;
+    float   minX, maxX;
+    int     line;
+
+    subAlpha = Cvar_Get("subAlpha", "0.5", 0);
+
+    setFont("facfont-20");
+    m_font->setColor(URed);
+
+    for (i = 0; i < MAX_SUBTITLES; i++) {
+        if (strcmp(oldStrings[i], subs[i]->string)) {
+            fadeTime[i] = 2500 * ((strlen(subs[i]->string) / 68) + 1.f) + 1500;
+            subLife[i]  = fadeTime[i];
+            Q_strncpyz(oldStrings[i], subs[i]->string, sizeof(oldStrings[i]));
+        }
+
+        if (fadeTime[i] > subLife[i] - 750.f) {
+            alpha[i] = 1.f - (fadeTime[i] - (subLife[i] - 750.f)) / 750.f;
+        } else if (fadeTime[i] < 750) {
+            alpha[i] = fadeTime[i] / 750.f;
+        } else {
+            alpha[i] = 1.f;
+        }
+
+        fadeTime[i] -= cls.frametime;
+        if (fadeTime[i] < 0) {
+            // Clear the subtitle
+            fadeTime[i]      = 0;
+            oldStrings[i][0] = 0;
+
+            if (subs[i]->string && subs[i]->string[0]) {
+                Cvar_Set(va("subtitle%d", i), "");
+            }
+        }
+    }
+
+    minX = m_screenframe.size.height - m_font->getHeight(getHighResScale()) * 10;
+    maxX = ((m_frame.pos.x + m_frame.size.width) - (m_frame.pos.x + m_frame.size.width) * 0.2f) / getHighResScale()[0];
+    line = 0;
+
+    for (i = 0; i < MAX_SUBTITLES; i++) {
+        if (fadeTime[i] <= 0) {
+            continue;
+        }
+
+        if (m_font->getWidth(subs[i]->string, sizeof(oldStrings[i])) > maxX) {
+            char  buf[2048];
+            char *c;
+            char *end;
+            char *start;
+            float total;
+            float width;
+            int   blockcount;
+
+            c = subs[i]->string;
+
+            total = 0;
+            end   = NULL;
+            start = buf;
+
+            while (*c) {
+                blockcount = m_font->DBCSGetWordBlockCount(c, -1);
+                if (!blockcount) {
+                    break;
+                }
+
+                width = m_font->getWidth(c, blockcount);
+
+                if (total + width > maxX) {
+                    m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
+                    m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], buf, -1, getHighResScale());
+
+                    m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
+                    m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], buf, -1, getHighResScale());
+
+                    line++;
+
+                    total = 0;
+                    start = buf;
+                }
+
+                end = start + blockcount + 1;
+                if (end > buf + MAX_STRING_CHARS) {
+                    Com_DPrintf("ERROR - word longer than possible line\n");
+                    break;
+                }
+
+                memcpy(start, c, blockcount);
+                start += blockcount;
+                total += width;
+                *start = 0;
+
+                c += blockcount;
+            }
+
+            m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
+            m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], buf, -1, getHighResScale());
+
+            m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
+            m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], buf, -1, getHighResScale());
+            line++;
+        } else {
+            m_font->setColor(UColor(0, 0, 0, alpha[i] * subAlpha->value));
+            m_font->Print(18, (m_font->getHeight(getHighResScale()) * line + minX + 1.f) / getHighResScale()[1], subs[i]->string, -1, getHighResScale());
+
+            m_font->setColor(UColor(1, 1, 1, alpha[i] * subAlpha->value));
+            m_font->Print(20, (m_font->getHeight(getHighResScale()) * line + minX) / getHighResScale()[1], subs[i]->string, -1, getHighResScale());
+
+            line++;
+        }
+    }
 }
 
-void View3D::Pressed
-	(
-	Event *ev
-	)
-
+void View3D::ClearCenterPrint(void)
 {
-	IN_MouseOff();
-	OnActivate(ev);
+    m_printfadetime = 0.0;
 }
 
-CLASS_DECLARATION( UIWidget, ConsoleView, NULL )
+qboolean View3D::LetterboxActive(void)
 {
-	{ NULL, NULL }
+    return m_letterbox_active;
+}
+
+CLASS_DECLARATION(UIWidget, ConsoleView, NULL) {
+    {NULL, NULL}
 };
 
-void ConsoleView::Draw
-	(
-	void
-	)
-
-{
-	// FIXME: unimplemented
-}
-
+void ConsoleView::Draw(void) {}
diff --git a/code/client/cl_uiview3d.h b/code/client/cl_uiview3d.h
index 31200c05..ef11c986 100644
--- a/code/client/cl_uiview3d.h
+++ b/code/client/cl_uiview3d.h
@@ -20,55 +20,57 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __CL_UIVIEW3D__
-#define __CL_UIVIEW3D__
+#pragma once
 
-class View3D : public UIWidget {
-	float m_printfadetime;
-	float m_printalpha;
-	str m_printstring;
-	UIReggedMaterial *m_print_mat;
-	qboolean m_locationprint;
-	int m_x_coord;
-	int m_y_coord;
-	qboolean m_letterbox_active;
+class View3D : public UIWidget
+{
+    float             m_printfadetime;
+    float             m_printalpha;
+    str               m_printstring;
+    UIReggedMaterial *m_print_mat;
+    qboolean          m_locationprint;
+    int               m_x_coord;
+    int               m_y_coord;
+    qboolean          m_letterbox_active;
 
 public:
-	CLASS_PROTOTYPE( View3D );
+    CLASS_PROTOTYPE(View3D);
 
 protected:
-	void		Draw( void ) override;
-	void		DrawLetterbox( void );
-	void		DrawFades( void );
-	void		Draw2D( void );
-	void		DrawFPS( void );
-	void		DrawProf( void );
-	void		PrintSound( int channel, const char *name, float vol, int rvol, float pitch, float base, int& line );
-	void		DrawSoundOverlay( void );
-	void		CenterPrint( void );
-	void		LocationPrint( void );
-	void		OnActivate( Event *ev );
-	void		OnDeactivate( Event *ev );
-	void		DrawSubtitleOverlay( void );
+    void Draw(void) override;
+    void DrawLetterbox(void);
+    void DrawFades(void);
+    void Draw2D(void);
+    void DrawFPS(void);
+    void DrawProf(void);
+    void PrintSound(int channel, const char *name, float vol, int rvol, float pitch, float base, int& line);
+    void DrawSoundOverlay(void);
+    void CenterPrint(void);
+    void LocationPrint(void);
+    void OnActivate(Event *ev);
+    void OnDeactivate(Event *ev);
+    void DrawSubtitleOverlay(void);
+
+    // Added in 2.0
+    void DrawNetProfile(void);
 
 public:
-	View3D();
+    View3D();
 
-	void			ClearCenterPrint( void );
-	void			UpdateCenterPrint( const char *s, float alpha );
-	void			UpdateLocationPrint( int x, int y, const char *s, float alpha );
-	qboolean		LetterboxActive( void );
-	void			InitSubtitle( void );
-	void			FrameInitialized( void ) override;
-	virtual void	Pressed( Event *ev );
+    void         ClearCenterPrint(void);
+    void         UpdateCenterPrint(const char *s, float alpha);
+    void         UpdateLocationPrint(int x, int y, const char *s, float alpha);
+    qboolean     LetterboxActive(void);
+    void         InitSubtitle(void);
+    void         FrameInitialized(void) override;
+    virtual void Pressed(Event *ev);
 };
 
-class ConsoleView : public UIWidget {
+class ConsoleView : public UIWidget
+{
 public:
-	CLASS_PROTOTYPE( ConsoleView );
+    CLASS_PROTOTYPE(ConsoleView);
 
 protected:
-	void Draw( void ) override;
+    void Draw(void) override;
 };
-
-#endif /* __CL_UIVIEW3D__ */
diff --git a/code/client/client.h b/code/client/client.h
index b6f44303..c693fbe8 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // client.h -- primary header for client
 
-#ifndef __CLIENT_H__
-#define __CLIENT_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -37,6 +36,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cl_curl.h"
 #endif /* USE_CURL */
 
+#ifdef USE_VOIP
+#include <opus.h>
+#endif
+
 // file full of random crap that gets used to create cl_guid
 #define QKEY_FILE "qkey"
 #define QKEY_SIZE 2048
@@ -175,6 +178,7 @@ typedef struct {
 	int			lastPacketSentTime;			// for retransmits during connection
 	int			lastPacketTime;				// for timeouts
 
+	char		servername[MAX_OSPATH];		// name of server from original connect (used by reconnect)
 	netadr_t	serverAddress;
 	int			connectTime;				// for connection retransmits
 	int			connectStartTime;
@@ -240,15 +244,42 @@ typedef struct {
 	int			timeDemoMaxDuration;	// maximum frame duration
 	unsigned char	timeDemoDurations[ MAX_TIMEDEMO_DURATIONS ];	// log of frame durations
 
+    float		aviVideoFrameRemainder;
+    float		aviSoundFrameRemainder;
+
+#ifdef USE_VOIP
+	qboolean voipEnabled;
+	qboolean voipCodecInitialized;
+
+	// incoming data...
+	// !!! FIXME: convert from parallel arrays to array of a struct.
+	OpusDecoder *opusDecoder[MAX_CLIENTS];
+	byte voipIncomingGeneration[MAX_CLIENTS];
+	int voipIncomingSequence[MAX_CLIENTS];
+	float voipGain[MAX_CLIENTS];
+	qboolean voipIgnore[MAX_CLIENTS];
+	qboolean voipMuteAll;
+
+	// outgoing data...
+	// if voipTargets[i / 8] & (1 << (i % 8)),
+	// then we are sending to clientnum i.
+	uint8_t voipTargets[(MAX_CLIENTS + 7) / 8];
+	uint8_t voipFlags;
+	OpusEncoder *opusEncoder;
+	int voipOutgoingDataSize;
+	int voipOutgoingDataFrames;
+	int voipOutgoingSequence;
+	byte voipOutgoingGeneration;
+	byte voipOutgoingData[1024];
+	float voipPower;
+#endif
+
 #ifdef LEGACY_PROTOCOL
 	qboolean compat;
 #endif
 
 	// big stuff at end of structure so most offsets are 15 bits or less
 	netchan_t	netchan;
-
-    float		aviVideoFrameRemainder;
-    float		aviSoundFrameRemainder;
 } clientConnection_t;
 
 extern	clientConnection_t clc;
@@ -298,8 +329,6 @@ typedef struct {
 	qboolean	cddialog;			// bring up the cd needed dialog next frame
 	qboolean	no_menus;
 
-	char		servername[MAX_OSPATH];		// name of server from original connect (used by reconnect)
-
 	// when the server clears the hunk, all of these must be restarted
 	qboolean	rendererRegistered;
 	qboolean	cgameStarted;
@@ -321,7 +350,7 @@ typedef struct {
 	serverInfo_t  globalServers[MAX_GLOBAL_SERVERS];
 	// additional global servers
 	int			numGlobalServerAddresses;
-	serverAddress_t		globalServerAddresses[MAX_GLOBAL_SERVERS];
+	netadr_t	globalServerAddresses[MAX_GLOBAL_SERVERS];
 
 	int			numfavoriteservers;
 	serverInfo_t	favoriteServers[MAX_OTHER_SERVERS];
@@ -352,14 +381,16 @@ typedef struct {
 	clientAnim_t anim;
 	stopWatch_t stopwatch;
 	void* savedCgameState;
-	int savedCgameStateSize;
+	size_t savedCgameStateSize;
 	char gcdResponse[73];
-	int unknown3_0;
-	int currentRate;
+	// Added in 2.0
+	netprofclient_t netprofile;
 	qhandle_t	charSetShader;
 	qhandle_t	whiteShader;
 	qhandle_t	consoleShader;
 	fontInfo_t	consoleFont;
+
+	int refSequence;
 } clientStatic_t;
 
 extern clientStatic_t	cls;
@@ -386,6 +417,8 @@ extern	cvar_t	*cl_connect_timeout;
 extern	cvar_t	*cl_maxpackets;
 extern	cvar_t	*cl_packetdup;
 extern	cvar_t	*cl_shownet;
+extern	cvar_t	*cl_netprofile;
+extern	cvar_t	*cl_netprofileoverlay;
 extern	cvar_t	*cl_showSend;
 extern	cvar_t	*cl_timeNudge;
 extern	cvar_t	*cl_showTimeDelta;
@@ -446,6 +479,32 @@ extern	cvar_t	*cl_r_fullscreen;
 
 extern	cvar_t	*cl_consoleKeys;
 
+#ifdef USE_MUMBLE
+extern	cvar_t	*cl_useMumble;
+extern	cvar_t	*cl_mumbleScale;
+#endif
+
+#ifdef USE_VOIP
+// cl_voipSendTarget is a string: "all" to broadcast to everyone, "none" to
+//  send to no one, or a comma-separated list of client numbers:
+//  "0,7,2,23" ... an empty string is treated like "all".
+extern	cvar_t	*cl_voipUseVAD;
+extern	cvar_t	*cl_voipVADThreshold;
+extern	cvar_t	*cl_voipSend;
+extern	cvar_t	*cl_voipSendTarget;
+extern	cvar_t	*cl_voipGainDuringCapture;
+extern	cvar_t	*cl_voipCaptureMult;
+extern	cvar_t	*cl_voipShowMeter;
+extern	cvar_t	*cl_voip;
+
+// 20ms at 48k
+#define VOIP_MAX_FRAME_SAMPLES		( 20 * 48 )
+
+// 3 frame is 60ms of audio, the max opus will encode at once
+#define VOIP_MAX_PACKET_FRAMES		3
+#define VOIP_MAX_PACKET_SAMPLES		( VOIP_MAX_FRAME_SAMPLES * VOIP_MAX_PACKET_FRAMES )
+#endif
+
 extern	cvar_t	*cg_gametype;
 
 extern	cvar_t* j_pitch;
@@ -471,7 +530,7 @@ void CL_AddReliableCommand(const char *cmd, qboolean isDisconnectCmd);
 
 void CL_StartHunkUsers( qboolean rendererOnly );
 
-void CL_Connect( const char *server );
+void CL_Connect( const char *server, netadrtype_t family );
 
 void CL_Disconnect_f (void);
 void CL_GetChallengePacket (void);
@@ -500,6 +559,10 @@ void UI_LoadResource( const char *name );
 
 qboolean CL_CheckPaused(void);
 
+int CL_GetRefSequence(void);
+qboolean CL_IsRendererLoaded(void);
+void CL_ApplyOriginalConfigTweaks();
+
 //
 // cl_input
 //
@@ -521,6 +584,7 @@ void IN_MouseOn( void );
 void IN_MouseOff( void );
 
 void CL_InitInput (void);
+void CL_ShutdownInput(void);
 void CL_SendCmd (void);
 void CL_ClearState (void);
 void CL_ReadPackets (void);
@@ -546,6 +610,10 @@ extern int cl_connectedToPureServer;
 extern int cl_connectedToCheatServer;
 extern msg_t *cl_currentMSG;
 
+#ifdef USE_VOIP
+void CL_Voip_f( void );
+#endif
+
 void CL_SystemInfoChanged( void );
 void CL_ParseServerMessage( msg_t *msg );
 
@@ -584,6 +652,7 @@ void Con_DrawCharacter (int cx, int line, int num);
 
 void Con_CheckResize (void);
 void Con_Init (void);
+void Con_Shutdown (void);
 void Con_Clear_f (void);
 void Con_ToggleConsole_f (void);
 void Con_DrawNotify (void);
@@ -671,6 +740,7 @@ void LAN_SaveServersToCache( void );
 void CL_Netchan_Transmit( netchan_t *chan, msg_t* msg);	//int length, const byte *data );
 void CL_Netchan_TransmitNextFragment( netchan_t *chan );
 qboolean CL_Netchan_Process( netchan_t *chan, msg_t *msg );
+void CL_NET_OutOfBandPrint( netadr_t adr, const char* format, ... );
 
 //
 // cl_avi.c
@@ -690,5 +760,3 @@ void CL_InitConsoleCommands( void );
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __CLIENT_H__
diff --git a/code/client/new/snd_local_new.h b/code/client/new/snd_local_new.h
index ac253ec8..69ae7dcf 100644
--- a/code/client/new/snd_local_new.h
+++ b/code/client/new/snd_local_new.h
@@ -58,6 +58,10 @@ typedef struct {
 
 void S_ChannelFree_Callback(channel_t* v);
 void S_LoadData(soundsystemsavegame_t* pSave);
+void S_SaveData(soundsystemsavegame_t* pSave);
+void S_ReLoad(soundsystemsavegame_t* pSave);
+
+extern qboolean s_bSoundPaused;
 
 #ifdef __cplusplus
 }
diff --git a/code/client/new/snd_main_new.cpp b/code/client/new/snd_main_new.cpp
index 3b6971be..2bb4aa37 100644
--- a/code/client/new/snd_main_new.cpp
+++ b/code/client/new/snd_main_new.cpp
@@ -21,11 +21,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "../snd_local.h"
+#include "../client.h"
+
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+
+qboolean s_bSoundPaused = qfalse;
 
 void S_Init2()
 {
     S_Init();
     SND_setup();
+
+    // HACK: S_RegisterSound returns 0 when unsuccessful, or it returns the the sfx handle
+    // But the first sfx handle is also 0...
+    S_RegisterSound("sound/null.wav", qfalse);
+
+    Cmd_AddCommand("tmstart", S_TriggeredMusic_Start);
+    Cmd_AddCommand("tmstartloop", S_TriggeredMusic_StartLoop);
+    Cmd_AddCommand("tmstop", S_TriggeredMusic_Stop);
 }
 
 /*
@@ -46,7 +59,18 @@ S_AddLoopingSound
 */
 void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float minDist, float maxDist, float pitch, int flags)
 {
+    if (!sfxHandle) {
+        return;
+    }
+
     // FIXME: unimplemented
+
+    if (VectorCompare(origin, vec3_origin)) {
+        // Consider it to be a local sound, uses the player origin
+        S_AddLoopingSound(cl.snap.ps.clientNum, cl.snap.ps.origin, velocity, sfxHandle);
+        return;
+    }
+
     S_AddLoopingSound(ENTITYNUM_WORLD, origin, velocity, sfxHandle);
 }
 
@@ -55,7 +79,7 @@ void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t s
 S_StopAllSounds
 =================
 */
-void S_StopAllSounds(qboolean stop_music)
+void S_StopAllSounds2(qboolean stop_music)
 {
     // Call the original function
     S_StopAllSounds();
@@ -83,12 +107,29 @@ void S_Respatialize(int entityNum, const vec3_t origin,
 {
     S_Respatialize(entityNum, origin, axis, 0);
 }
+
+/*
+=================
+S_StartLocalSoundChannel
+=================
+*/
+void S_StartLocalSound(const char* sound_name, qboolean force_load)
+{
+    sfxHandle_t h;
+
+    h = S_RegisterSound(sound_name, qfalse);
+
+    if (h) {
+        S_StartLocalSound(h, CHAN_LOCAL_SOUND);
+    }
+}
+
 /*
 =================
 S_StartLocalSound
 =================
 */
-void S_StartLocalSound(const char* sound_name, qboolean force_load)
+void S_StartLocalSoundChannel(const char* sound_name, qboolean force_load, int channel)
 {
     // FIXME: unimplemented
 }
@@ -340,6 +381,16 @@ void MUSIC_CheckForStoppedSongs(void)
     STUB();
 }
 
+/*
+==============
+S_CurrentSoundtrack
+==============
+*/
+const char* S_CurrentSoundtrack()
+{
+    return "";
+}
+
 /*
 =================
 S_IsSoundRegistered
@@ -404,22 +455,166 @@ void S_FadeSound(float fTime)
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_TriggeredMusic_Start
+==============
+*/
+void S_TriggeredMusic_Start()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstart <sound file>\n");
+        return;
+    }
+
+    S_StartBackgroundTrack(Cmd_Argv(1), "");
+}
+
+/*
+==============
+S_TriggeredMusic_StartLoop
+==============
+*/
+void S_TriggeredMusic_StartLoop()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstartloop <sound file>\n");
+        return;
+    }
+
+    S_StartBackgroundTrack(Cmd_Argv(1), Cmd_Argv(1));
+}
+
+/*
+==============
+S_TriggeredMusic_Stop
+==============
+*/
+void S_TriggeredMusic_Stop()
+{
+    S_StopBackgroundTrack();
+}
+
+/*
+==============
+S_TriggeredMusic_PlayIntroMusic
+==============
+*/
 void S_TriggeredMusic_PlayIntroMusic() {
+    S_StartBackgroundTrack("sound/music/mus_MainTheme.mp3", "");
+}
+
+/*
+==============
+S_TriggeredMusic_SetupHandle
+==============
+*/
+void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart) {
     // FIXME: unimplemented
 }
 
+/*
+==============
+S_GetMusicFilename
+==============
+*/
+const char* S_GetMusicFilename() {
+    // FIXME: unimplemented
+    return "";
+}
+
+/*
+==============
+S_GetMusicLoopCount
+==============
+*/
+int S_GetMusicLoopCount() {
+    // FIXME: unimplemented
+    return 0;
+}
+
+/*
+==============
+S_GetMusicOffset
+==============
+*/
+unsigned int S_GetMusicOffset() {
+    // FIXME: unimplemented
+    return 0;
+}
+
+/*
+==============
+callbackServer
+==============
+*/
 void callbackServer(int entnum, int channel_number, const char* name) {
     if (com_sv_running->integer) {
         SV_SoundCallback(entnum, channel_number, name);
     }
 }
 
+/*
+==============
+S_ChannelFree_Callback
+==============
+*/
 void S_ChannelFree_Callback(channel_t* v) {
     if (v->entnum & S_FLAG_DO_CALLBACK) {
         callbackServer(v->entnum & ~S_FLAG_DO_CALLBACK, v - s_channels, v->thesfx->soundName);
     }
 }
 
+/*
+==============
+S_LoadData
+==============
+*/
 void S_LoadData(soundsystemsavegame_t* pSave) {
     // FIXME: unimplemented
 }
+
+/*
+==============
+S_SaveData
+==============
+*/
+void S_SaveData(soundsystemsavegame_t* pSave) {
+    // FIXME: unimplemented
+}
+
+/*
+==============
+S_ReLoad
+==============
+*/
+void S_ReLoad(soundsystemsavegame_t* pSave) {
+    // FIXME: unimplemented
+}
+
+/*
+==============
+S_StopMovieAudio
+==============
+*/
+void S_StopMovieAudio() {
+}
+
+/*
+==============
+S_CurrentMoviePosition
+==============
+*/
+int S_CurrentMoviePosition() {
+    return 0;
+}
+
+/*
+==============
+S_SetupMovieAudio
+==============
+*/
+void S_SetupMovieAudio(const char* pszMovieName) {
+}
+
+#endif
diff --git a/code/client/new/snd_public_new.h b/code/client/new/snd_public_new.h
index d2a7f9a8..4b98fb86 100644
--- a/code/client/new/snd_public_new.h
+++ b/code/client/new/snd_public_new.h
@@ -30,8 +30,8 @@ void S_Respatialize(int entityNum, const vec3_t origin, vec3_t axis[3]);
 sfxHandle_t	S_RegisterSound(const char* sample, qboolean compressed, qboolean streamed);
 void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float minDist, float maxDist, float pitch, int flags);
 void S_StartLocalSound(const char* name, qboolean force_load);
+void S_StartLocalSoundChannel(const char* sound_name, qboolean force_load, int channel);
 void S_StartSound(const vec3_t origin, int entNum, int entChannel, sfxHandle_t sfxHandle, float volume, float minDist, float pitch, float maxDist, qboolean streamed);
-void S_StopAllSounds(qboolean stop_music);
 void S_ClearLoopingSounds(void);
 qboolean S_IsSoundRegistered(const char* name);
 void S_Init2();
@@ -64,7 +64,14 @@ qboolean MUSIC_PlaySong(const char* alias);
 void MUSIC_UpdateMusicVolumes(void);
 void MUSIC_CheckForStoppedSongs(void);
 
+void S_TriggeredMusic_Start();
+void S_TriggeredMusic_StartLoop();
+void S_TriggeredMusic_Stop();
+
+const char* S_CurrentSoundtrack();
+
 void S_StopSound(int entnum, int channel);
+void S_StopAllSounds2(qboolean stop_music);
 float S_GetSoundTime(sfxHandle_t handle);
 void S_SetGlobalAmbientVolumeLevel(float volume);
 void S_SetReverb(int reverb_type, float reverb_level);
@@ -73,6 +80,15 @@ qboolean S_IsSoundPlaying(int channelNumber, const char* name);
 void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t velocity, qboolean use_listener);
 void S_FadeSound(float fTime);
 void S_TriggeredMusic_PlayIntroMusic();
+void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart);
+
+const char* S_GetMusicFilename();
+int S_GetMusicLoopCount();
+unsigned int S_GetMusicOffset();
+
+void S_StopMovieAudio();
+int S_CurrentMoviePosition();
+void S_SetupMovieAudio(const char* pszMovieName);
 
 #ifdef __cplusplus
 }
diff --git a/code/client/qal.c b/code/client/qal.c
index 5cc40de2..78e0b80e 100644
--- a/code/client/qal.c
+++ b/code/client/qal.c
@@ -66,6 +66,7 @@ LPALGETSOURCEF qalGetSourcef;
 LPALGETSOURCE3F qalGetSource3f;
 LPALGETSOURCEFV qalGetSourcefv;
 LPALGETSOURCEI qalGetSourcei;
+LPALGETSOURCEIV qalGetSourceiv;
 LPALSOURCEPLAYV qalSourcePlayv;
 LPALSOURCESTOPV qalSourceStopv;
 LPALSOURCEREWINDV qalSourceRewindv;
@@ -80,7 +81,9 @@ LPALGENBUFFERS qalGenBuffers;
 LPALDELETEBUFFERS qalDeleteBuffers;
 LPALISBUFFER qalIsBuffer;
 LPALBUFFERDATA qalBufferData;
+LPALBUFFERI qalBufferi;
 LPALGETBUFFERF qalGetBufferf;
+LPALGETBUFFERFV qalGetBufferfv;
 LPALGETBUFFERI qalGetBufferi;
 LPALDOPPLERFACTOR qalDopplerFactor;
 LPALSPEEDOFSOUND qalSpeedOfSound;
@@ -184,6 +187,7 @@ qboolean QAL_Init(const char *libname)
 	qalGetSource3f = GPA("alGetSource3f");
 	qalGetSourcefv = GPA("alGetSourcefv");
 	qalGetSourcei = GPA("alGetSourcei");
+	qalGetSourceiv = GPA("alGetSourceiv");
 	qalSourcePlayv = GPA("alSourcePlayv");
 	qalSourceStopv = GPA("alSourceStopv");
 	qalSourceRewindv = GPA("alSourceRewindv");
@@ -198,7 +202,9 @@ qboolean QAL_Init(const char *libname)
 	qalDeleteBuffers = GPA("alDeleteBuffers");
 	qalIsBuffer = GPA("alIsBuffer");
 	qalBufferData = GPA("alBufferData");
+	qalBufferi = GPA("alBufferi");
 	qalGetBufferf = GPA("alGetBufferf");
+	qalGetBufferfv = GPA("alGetBufferfv");
 	qalGetBufferi = GPA("alGetBufferi");
 	qalDopplerFactor = GPA("alDopplerFactor");
 	qalSpeedOfSound = GPA("alSpeedOfSound");
@@ -283,6 +289,7 @@ void QAL_Shutdown( void )
 	qalGetSource3f = NULL;
 	qalGetSourcefv = NULL;
 	qalGetSourcei = NULL;
+	qalGetSourceiv = NULL;
 	qalSourcePlayv = NULL;
 	qalSourceStopv = NULL;
 	qalSourceRewindv = NULL;
@@ -298,6 +305,7 @@ void QAL_Shutdown( void )
 	qalIsBuffer = NULL;
 	qalBufferData = NULL;
 	qalGetBufferf = NULL;
+	qalGetBufferfv = NULL;
 	qalGetBufferi = NULL;
 	qalDopplerFactor = NULL;
 	qalSpeedOfSound = NULL;
diff --git a/code/client/qal.h b/code/client/qal.h
index a478eb53..c676b195 100644
--- a/code/client/qal.h
+++ b/code/client/qal.h
@@ -36,15 +36,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifdef USE_LOCAL_HEADERS
 #include "../AL/al.h"
 #include "../AL/alc.h"
+#include "../AL/alext.h"
 #else
 #if defined(_MSC_VER) || defined(__APPLE__)
   // MSVC users must install the OpenAL SDK which doesn't use the AL/*.h scheme.
   // OSX framework also needs this
   #include <al.h>
   #include <alc.h>
+  #include <alext.h>
 #else
   #include <AL/al.h>
   #include <AL/alc.h>
+  #include <AL/alext.h>
 #endif
 #endif
 
@@ -55,6 +58,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ALC_ALL_DEVICES_SPECIFIER                0x1013
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef USE_OPENAL_DLOPEN
 extern LPALENABLE qalEnable;
 extern LPALDISABLE qalDisable;
@@ -116,7 +123,7 @@ extern LPALBUFFERDATA qalBufferData;
 extern LPALBUFFERF qalBufferf;
 extern LPALBUFFER3F qalBuffer3f;
 extern LPALBUFFERFV qalBufferfv;
-extern LPALBUFFERF qalBufferi;
+extern LPALBUFFERI qalBufferi;
 extern LPALBUFFER3F qalBuffer3i;
 extern LPALBUFFERFV qalBufferiv;
 extern LPALGETBUFFERF qalGetBufferf;
@@ -248,4 +255,8 @@ extern LPALCCAPTURESAMPLES qalcCaptureSamples;
 qboolean QAL_Init(const char *libname);
 void QAL_Shutdown( void );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif	// __QAL_H__
diff --git a/code/client/snd_codec.h b/code/client/snd_codec.h
index 49970dff..8551827d 100644
--- a/code/client/snd_codec.h
+++ b/code/client/snd_codec.h
@@ -27,14 +27,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct snd_info_s
 {
 	int rate;
-	int width;
+	float width;
 	int channels;
 	int samples;
 	int size;
 	int dataofs;
+	int dataalign;
 } snd_info_t;
 
 typedef struct snd_codec_s snd_codec_t;
@@ -113,4 +118,8 @@ void S_OggOpus_CodecCloseStream(snd_stream_t *stream);
 int S_OggOpus_CodecReadStream(snd_stream_t *stream, int bytes, void *buffer);
 #endif // USE_CODEC_OPUS
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // !_SND_CODEC_H_
diff --git a/code/client/snd_codec_mp3.c b/code/client/snd_codec_mp3.c
index 80a02326..bcb60e60 100644
--- a/code/client/snd_codec_mp3.c
+++ b/code/client/snd_codec_mp3.c
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "snd_codec.h"
 
 // includes for the MP3 codec
-#include "../libmad-0.15.1b/synth.h"
+#include "mad.h"
 
 #define MP3_SAMPLE_WIDTH		2
 #define MP3_PCMSAMPLES_PERSLICE		32
@@ -622,7 +622,7 @@ int S_MP3_CodecReadStream(snd_stream_t* stream, int bytes, void* buffer)
     mp3info = stream->ptr;
 
     // Make sure we get complete frames all the way through.
-    bytes -= bytes % (stream->info.channels * stream->info.width);
+    bytes -= fmod(bytes, (stream->info.channels * stream->info.width));
 
     if (mp3info->buflen)
     {
diff --git a/code/client/snd_codec_wav.c b/code/client/snd_codec_wav.c
index 7fcdea59..7fed9bf3 100644
--- a/code/client/snd_codec_wav.c
+++ b/code/client/snd_codec_wav.c
@@ -133,6 +133,7 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 	char dump[16];
 	int bits;
 	int fmtlen = 0;
+	int bytealign;
 
 	// skip the riff wav header
 	FS_Read(dump, 12, file);
@@ -149,17 +150,22 @@ static qboolean S_ReadRIFFHeader(fileHandle_t file, snd_info_t *info)
 	info->channels = FGetLittleShort(file);
 	info->rate = FGetLittleLong(file);
 	FGetLittleLong(file);
-	FGetLittleShort(file);
+	bytealign = FGetLittleShort(file);
 	bits = FGetLittleShort(file);
 
-	if( bits < 8 )
-	{
-	  Com_Printf( S_COLOR_RED "ERROR: Less than 8 bit sound is not supported\n");
-	  return qfalse;
-	}
+	//if( bits < 8 )
+	//{
+	//  Com_Printf( S_COLOR_RED "ERROR: Less than 8 bit sound is not supported\n");
+	//  return qfalse;
+	//}
 
-	info->width = bits / 8;
+	info->width = bits / 8.0;
 	info->dataofs = 0;
+	if (bits == 16) {
+		info->dataalign = 1;
+	} else {
+		info->dataalign = (bytealign / info->channels - 4) / 4 * 8 + 1;
+	}
 
 	// Skip the rest of the format chunk if required
 	if(fmtlen > 16)
diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c
index 67720678..cfb0ca28 100644
--- a/code/client/snd_dma.c
+++ b/code/client/snd_dma.c
@@ -161,12 +161,12 @@ void S_Base_SoundList( void ) {
 	char	type[4][16];
 	char	mem[2][16];
 
-	strcpy(type[0], "16bit");
-	strcpy(type[1], "adpcm");
-	strcpy(type[2], "daub4");
-	strcpy(type[3], "mulaw");
-	strcpy(mem[0], "paged out");
-	strcpy(mem[1], "resident ");
+	Q_strncpyz(type[0], "16bit", sizeof(type[0]));
+	Q_strncpyz(type[1], "adpcm", sizeof(type[1]));
+	Q_strncpyz(type[2], "daub4", sizeof(type[2]));
+	Q_strncpyz(type[3], "mulaw", sizeof(type[3]));
+	Q_strncpyz(mem[0], "paged out", sizeof(mem[0]));
+	Q_strncpyz(mem[1], "resident ", sizeof(mem[1]));
 	total = 0;
 	for (sfx=s_knownSfx, i=0 ; i<s_numSfx ; i++, sfx++) {
 		size = sfx->soundLength;
@@ -303,7 +303,7 @@ static sfx_t *S_FindName( const char *name ) {
 	
 	sfx = &s_knownSfx[i];
 	Com_Memset (sfx, 0, sizeof(*sfx));
-	strcpy (sfx->soundName, name);
+	Q_strncpyz (sfx->soundName, name, sizeof(sfx->soundName));
 
 	sfx->next = sfxHash[hash];
 	sfxHash[hash] = sfx;
@@ -785,7 +785,11 @@ void S_Base_AddLoopingSound( int entityNum, const vec3_t origin, const vec3_t ve
 	}
 
 	if ( !sfx->soundLength ) {
-		Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		// Fixed in OPM
+		//  Why should it crash???
+		//Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		Com_Printf( "%s has length 0\n", sfx->soundName );
+		return;
 	}
 
 	VectorCopy( origin, loopSounds[entityNum].origin );
@@ -848,7 +852,11 @@ void S_Base_AddRealLoopingSound( int entityNum, const vec3_t origin, const vec3_
 	}
 
 	if ( !sfx->soundLength ) {
-		Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		// Fixed in OPM
+		//  Why should it crash???
+		//Com_Error( ERR_DROP, "%s has length 0", sfx->soundName );
+		Com_Printf( "%s has length 0", sfx->soundName );
+		return;
 	}
 	VectorCopy( origin, loopSounds[entityNum].origin );
 	VectorCopy( velocity, loopSounds[entityNum].velocity );
@@ -1581,7 +1589,9 @@ qboolean S_Base_Init( soundInterface_t *si ) {
 
 	if ( r ) {
 		s_soundStarted = 1;
-		s_soundMuted = 1;
+// Fixed in OPM
+//  The UI must be able to play sounds
+//		s_soundMuted = 1;
 //		s_numSfx = 0;
 
 		Com_Memset(sfxHash, 0, sizeof(sfx_t *)*LOOP_HASH);
diff --git a/code/client/snd_dma_new.cpp b/code/client/snd_dma_new.cpp
new file mode 100644
index 00000000..47fb79eb
--- /dev/null
+++ b/code/client/snd_dma_new.cpp
@@ -0,0 +1,830 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "snd_local.h"
+#include "snd_openal_new.h"
+#include "client.h"
+#include "cl_ui.h"
+
+typedef struct {
+    vec3_t origin;
+    vec3_t velocity;
+    sfx_t *sfx;
+    int    mergeFrame;
+} loopSound_t;
+
+qboolean s_bLastInitSound  = qfalse;
+qboolean s_bSoundStarted   = qfalse;
+qboolean s_bSoundPaused    = qfalse;
+qboolean s_bTryUnpause     = qfalse;
+int      s_iListenerNumber = 0;
+float    s_fAmbientVolume  = 1.f;
+
+int number_of_sfx_infos = 0;
+
+cvar_t *s_volume;
+cvar_t *s_loadas8bit;
+cvar_t *s_khz;
+cvar_t *s_show;
+cvar_t *s_testsound;
+cvar_t *s_separation;
+cvar_t *s_musicVolume;
+cvar_t *s_ambientVolume;
+
+sfx_info_t sfx_infos[MAX_SFX_INFOS];
+
+sfx_t s_knownSfx[MAX_SFX];
+int   s_numSfx;
+
+s_entity_t s_entity[MAX_GENTITIES];
+
+static int      s_registrationSequence;
+static qboolean s_inRegistration;
+
+cvar_t *s_mixPreStep;
+cvar_t *s_dialogscale;
+
+int         numLoopSounds;
+loopSound_t loopSounds[MAX_LOOP_SOUNDS];
+
+/*
+==============
+S_SoundInfo_f
+==============
+*/
+void S_SoundInfo_f()
+{
+    S_PrintInfo();
+}
+
+/*
+==============
+S_SoundDump_f
+==============
+*/
+void S_SoundDump_f()
+{
+    S_DumpInfo();
+}
+
+/*
+==============
+S_Init
+==============
+*/
+void S_Init(qboolean full_startup)
+{
+    int     iStart, iEnd;
+    cvar_t *cv;
+
+    Com_Printf("------- Sound Initialization (%s) -------\n", full_startup ? "full" : "partial");
+
+    iStart = Sys_Milliseconds();
+
+    s_volume         = Cvar_Get("s_volume", "0.9", CVAR_ARCHIVE);
+    s_musicVolume    = Cvar_Get("s_musicvolume", "0.9", CVAR_ARCHIVE);
+    s_ambientVolume  = Cvar_Get("s_ambientvolume", "1.00", CVAR_ARCHIVE);
+    s_separation     = Cvar_Get("s_separation", "0.5", CVAR_ARCHIVE);
+    s_khz            = Cvar_Get("s_khz", "44", CVAR_ARCHIVE | CVAR_SOUND_LATCH);
+    s_loadas8bit     = Cvar_Get("s_loadas8bit", "0", CVAR_ARCHIVE | CVAR_LATCH);
+    s_mixPreStep     = Cvar_Get("s_mixPreStep", "0.05", CVAR_ARCHIVE);
+    s_show           = Cvar_Get("s_show", "0", CVAR_CHEAT);
+    s_testsound      = Cvar_Get("s_testsound", "0", CVAR_CHEAT);
+    s_dialogscale    = Cvar_Get("s_dialogscale", "1", CVAR_ARCHIVE);
+    s_bLastInitSound = false;
+
+    cv = Cvar_Get("s_initsound", "1", 0);
+
+    if (cv->integer) {
+        Cmd_AddCommand("play", S_Play);
+        Cmd_AddCommand("soundlist", S_SoundList);
+        Cmd_AddCommand("soundinfo", S_SoundInfo_f);
+        Cmd_AddCommand("sounddump", S_SoundDump_f);
+
+        if (S_Driver_Init()) {
+            s_bLastInitSound = true;
+            s_bSoundStarted  = true;
+
+            if (full_startup) {
+                s_numSfx = 0;
+                S_StopAllSounds(true);
+            }
+
+            S_FindName("***DEFAULT***", -1);
+            S_SoundInfo_f();
+        }
+    } else {
+        Com_Printf("Sound Not Initializing.\n");
+        s_bSoundStarted = 0;
+    }
+
+    iEnd = Sys_Milliseconds();
+    Com_Printf("------- Sound Initialization Complete ------- %i ms\n", iEnd - iStart);
+}
+
+/*
+==============
+S_Shutdown
+==============
+*/
+void S_Shutdown(qboolean full_shutdown)
+{
+    int    i;
+    sfx_t *sfx;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    Com_Printf("------- Sound Shutdown (%s) -------\n", full_shutdown ? "full" : "partial");
+
+    S_Driver_Shutdown();
+    s_bSoundStarted = false;
+
+    Cmd_RemoveCommand("play");
+    Cmd_RemoveCommand("music");
+    Cmd_RemoveCommand("stopsound");
+    Cmd_RemoveCommand("soundlist");
+    Cmd_RemoveCommand("soundinfo");
+
+    if (full_shutdown) {
+        for (i = 0; i < s_numSfx; i++) {
+            sfx = &s_knownSfx[i];
+
+            if (sfx->name[0]) {
+                if (sfx->data) {
+                    Z_Free(sfx->data);
+                }
+
+                *sfx = {};
+            }
+        }
+
+        s_numSfx = 0;
+    }
+
+    Com_Printf("------- Sound Shutdown Complete -------\n");
+}
+
+/*
+==============
+S_NameExists
+==============
+*/
+qboolean S_NameExists(const char *name)
+{
+    int i;
+
+    if (strlen(name) >= MAX_RES_NAME) {
+        Com_DPrintf("Sound name too long: %s", name);
+        return qfalse;
+    }
+
+    for (i = 0; i < s_numSfx; i++) {
+        if (!strcmp(s_knownSfx[i].name, name)) {
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+==============
+S_FindName
+==============
+*/
+sfx_t *S_FindName(const char *name, int sequenceNumber)
+{
+    int    i;
+    sfx_t *sfx;
+
+    if (!name) {
+        Com_DPrintf("S_FindName: NULL\n");
+        return NULL;
+    }
+
+    if (!name[0]) {
+        Com_DPrintf("S_FindName: empty name\n");
+        return NULL;
+    }
+
+    if (strlen(name) >= MAX_RES_NAME) {
+        Com_DPrintf("Sound name too long: %s", name);
+        return NULL;
+    }
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (!strcmp(sfx->name, name)) {
+            if (sfx->registration_sequence != -1) {
+                sfx->registration_sequence = sequenceNumber;
+            }
+
+            return sfx;
+        }
+    }
+
+    sfx = &s_knownSfx[0];
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+        if (!sfx->name[0]) {
+            break;
+        }
+    }
+
+    if (i == s_numSfx) {
+        if (i == MAX_SFX) {
+            Com_Error(ERR_FATAL, "S_FindName: out of sfx_t");
+        }
+
+        sfx = &s_knownSfx[s_numSfx];
+        s_numSfx++;
+    }
+
+    *sfx = {};
+    // Fixed in OPM
+    //  strcpy was used before
+    //strcpy(sfx->name, name);
+    Q_strncpyz(sfx->name, name, sizeof(sfx->name));
+    sfx->registration_sequence = sequenceNumber;
+
+    return sfx;
+}
+
+/*
+==============
+S_BeginRegistration
+==============
+*/
+void S_BeginRegistration()
+{
+    int i;
+
+    Com_Printf("------- Sound Begin Registration -------\n");
+
+    S_StopAllSounds(true);
+
+    s_registrationSequence++;
+    s_inRegistration                    = true;
+    s_knownSfx[0].registration_sequence = s_registrationSequence;
+
+    Com_Printf("------- Sound Begin Registration Complete -------\n");
+
+    // Added in OPM
+    //  Reset all sound entities
+    //  OG doesn't do this but this makes sure
+    //  entities don't leak info from previous sessions
+    for (i = 0; i < ARRAY_LEN(s_entity); i++) {
+        s_entity[i] = s_entity_t{};
+    }
+}
+
+/*
+==============
+S_DefaultSound
+==============
+*/
+void S_DefaultSound(sfx_t *sfx)
+{
+    sfx->data = NULL;
+    sfx->iFlags |= SFX_FLAG_DEFAULT_SOUND;
+}
+
+/*
+==============
+S_IsSoundRegistered
+==============
+*/
+qboolean S_IsSoundRegistered(const char *name)
+{
+    char szCacheName[MAX_QPATH];
+    int  i;
+
+    if (!s_bSoundStarted) {
+        return qfalse;
+    }
+
+    for (i = 0; name[i] && i < MAX_QPATH; i++) {
+        szCacheName[i] = tolower(name[i]);
+    }
+    szCacheName[i] = 0;
+
+    if (i >= MAX_QPATH) {
+        Com_Printf("Sound name exceeds MAX_QPATH\n");
+        return qfalse;
+    }
+
+    return S_NameExists(szCacheName);
+}
+
+/*
+==============
+S_RegisterSound
+==============
+*/
+sfxHandle_t S_RegisterSound(const char *name, int streamed, qboolean force_load)
+{
+    char   szCacheName[MAX_QPATH];
+    sfx_t *sfx;
+    int    i;
+
+    if (!s_bSoundStarted) {
+        Com_Printf("ERROR:  Trying to register sound %s when soundsystem hasn't started.\n", name);
+        return 0;
+    }
+
+    if (!name) {
+        return 0;
+    }
+
+    for (i = 0; name[i] && i < MAX_QPATH; i++) {
+        szCacheName[i] = tolower(name[i]);
+    }
+    szCacheName[i] = 0;
+
+    if (i >= MAX_QPATH) {
+        Com_Printf("Sound name exceeds MAX_QPATH\n");
+        return 0;
+    }
+
+    sfx = S_FindName(szCacheName, s_registrationSequence);
+    if (!sfx) {
+        return 0;
+    }
+
+    if (!sfx->data) {
+        if (!S_LoadSound(sfx->name, sfx, streamed, force_load)) {
+            Com_DPrintf("Couldn't load sound: %s\n", sfx->name);
+            if (!S_LoadSound("sound/default.wav", sfx, streamed, 0)) {
+                Com_DPrintf("Couldn't load sound: sound/default.wav\n");
+                sfx->iFlags |= SFX_FLAG_DEFAULT_SOUND;
+                return 0;
+            }
+        }
+
+        sfx->iFlags &= ~SFX_FLAG_DEFAULT_SOUND;
+        sfx->sfx_info_index = 0;
+
+        for (i = 0; i < number_of_sfx_infos; i++) {
+            if (!Q_stricmp(sfx->name, sfx_infos[i].name)) {
+                sfx->sfx_info_index = i;
+                break;
+            }
+        }
+    }
+
+    return sfx - s_knownSfx;
+}
+
+/*
+==============
+S_GetSoundTime
+==============
+*/
+float S_GetSoundTime(sfxHandle_t handle)
+{
+    return s_knownSfx[handle].time_length;
+}
+
+/*
+==============
+S_EndRegistration
+==============
+*/
+void S_EndRegistration()
+{
+    int    i;
+    sfx_t *sfx;
+
+    Com_Printf("------- Sound End Registration -------\n");
+    s_inRegistration = qfalse;
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (!sfx->name[0]) {
+            continue;
+        }
+
+        if (sfx->registration_sequence && sfx->registration_sequence != s_registrationSequence) {
+            if (sfx->data) {
+                Z_Free(sfx->data);
+            }
+
+            *sfx = {};
+        }
+    }
+
+    Com_Printf("------- Sound End Registration Complete -------\n");
+}
+
+/*
+==============
+S_UpdateEntity
+==============
+*/
+void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t vel, qboolean use_listener)
+{
+    if (entityNum > MAX_GENTITIES) {
+        Com_Error(ERR_DROP, "S_UpdateEntityPosition: bad entitynum %i", entityNum);
+    }
+
+    VectorCopy(origin, s_entity[entityNum].position);
+    VectorCopy(vel, s_entity[entityNum].velocity);
+    s_entity[entityNum].use_listener = use_listener;
+    s_entity[entityNum].time         = cl.serverTime;
+}
+
+/*
+==============
+S_SetGlobalAmbientVolumeLevel
+==============
+*/
+void S_SetGlobalAmbientVolumeLevel(float volume)
+{
+    s_fAmbientVolume = volume;
+}
+
+/*
+==============
+S_StartSound
+==============
+*/
+void S_StartSound(
+    const vec3_t origin,
+    int          entnum,
+    int          entchannel,
+    sfxHandle_t  sfxHandle,
+    float        volume,
+    float        min_dist,
+    float        pitch,
+    float        maxDist,
+    int          streamed
+)
+{
+    if (s_show_sounds->integer > 0 && sfxHandle > 0 && sfxHandle < s_numSfx) {
+        Com_DPrintf("S_StartSound: %s\n", s_knownSfx[sfxHandle].name);
+    }
+
+    if (!s_bSoundStarted) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ sound system not yet started\n");
+        }
+        return;
+    }
+
+    if (server_loading) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ cannot start sounds while loading a server\n");
+        }
+        return;
+    }
+
+    if (sfxHandle < 0 || sfxHandle >= s_numSfx) {
+        Com_Error(ERR_DROP, "S_StartSound: handle %i out of range", sfxHandle);
+    }
+
+    if (!sfxHandle) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf("^~^~^ null handle\n");
+        }
+        return;
+    }
+
+    if (entnum && (entchannel == CHAN_DIALOG || entchannel == CHAN_DIALOG_SECONDARY) && s_dialogscale->value > 0) {
+        volume *= s_dialogscale->value;
+    }
+
+    S_Driver_StartSound(origin, entnum, entchannel, sfxHandle, volume, min_dist, pitch, maxDist, streamed);
+}
+
+/*
+==============
+S_StartLocalSound
+==============
+*/
+void S_StartLocalSound(const char *sound_name, qboolean force_load)
+{
+    sfxHandle_t      sfxHandle;
+    const char      *name;
+    AliasListNode_t *pSoundAlias = NULL;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!sound_name) {
+        return;
+    }
+
+    name = Alias_FindRandom(sound_name, &pSoundAlias);
+    if (!name) {
+        name = sound_name;
+    }
+
+    sfxHandle = S_RegisterSound(name, pSoundAlias ? pSoundAlias->streamed : qfalse, force_load);
+
+    if (!pSoundAlias) {
+        S_StartSound(NULL, s_iListenerNumber, CHAN_MENU, sfxHandle, -1.0, -1.0, 1.0, -1.0, qfalse);
+        return;
+    }
+
+    S_StartSound(
+        NULL,
+        s_iListenerNumber,
+        CHAN_MENU,
+        sfxHandle,
+        pSoundAlias->volume + random() * pSoundAlias->volumeMod,
+        -1.0,
+        pSoundAlias->pitch + random() * pSoundAlias->pitchMod,
+        pSoundAlias->maxDist,
+        pSoundAlias->streamed
+    );
+}
+
+/*
+==============
+S_StartLocalSoundChannel
+
+Added in 2.0
+Starts a local sound, with the specified channel
+==============
+*/
+void S_StartLocalSoundChannel(const char *sound_name, qboolean force_load, soundChannel_t channel)
+{
+    sfxHandle_t      sfxHandle;
+    const char      *name;
+    AliasListNode_t *pSoundAlias = NULL;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!sound_name) {
+        return;
+    }
+
+    name = Alias_FindRandom(sound_name, &pSoundAlias);
+    if (!name) {
+        name = sound_name;
+    }
+
+    sfxHandle = S_RegisterSound(name, pSoundAlias ? pSoundAlias->streamed : qfalse, force_load);
+
+    if (!pSoundAlias) {
+        S_StartSound(NULL, s_iListenerNumber, channel, sfxHandle, -1.0, -1.0, 1.0, -1.0, qfalse);
+        return;
+    }
+
+    S_StartSound(
+        0,
+        s_iListenerNumber,
+        channel,
+        sfxHandle,
+        pSoundAlias->volume + random() * pSoundAlias->volumeMod,
+        -1.0,
+        pSoundAlias->pitch + random() * pSoundAlias->pitchMod,
+        pSoundAlias->maxDist,
+        pSoundAlias->streamed
+    );
+}
+
+/*
+==============
+S_StopAllSounds
+==============
+*/
+void S_StopAllSounds(qboolean stop_music)
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    Com_Printf("------- S_StopAllSounds (%s) -------\n", stop_music ? "stop music" : "don't stop music");
+
+    // Tell the driver to stop all sounds
+    S_Driver_StopAllSounds(stop_music);
+
+    Com_Printf("------- S_StopAllSounds Complete-------\n");
+}
+
+/*
+==============
+S_ClearLoopingSounds
+==============
+*/
+void S_ClearLoopingSounds()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_ClearLoopingSounds();
+}
+
+/*
+==============
+S_AddLoopingSound
+==============
+*/
+void S_AddLoopingSound(
+    const vec3_t origin,
+    const vec3_t velocity,
+    sfxHandle_t  sfxHandle,
+    float        volume,
+    float        min_dist,
+    float        max_dist,
+    float        pitch,
+    int          flags
+)
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (sfxHandle < 0 || sfxHandle >= s_numSfx) {
+        Com_Error(ERR_DROP, "S_AddLoopingSound: handle %i out of range", sfxHandle);
+    }
+
+    if (!sfxHandle) {
+        return;
+    }
+
+    S_Driver_AddLoopingSound(origin, velocity, sfxHandle, volume, min_dist, max_dist, pitch, flags);
+}
+
+/*
+==============
+S_Respatialize
+==============
+*/
+void S_Respatialize(int entityNum, const vec3_t head, vec3_t axis[3])
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_Respatialize(entityNum, head, axis);
+}
+
+/*
+==============
+S_Update
+==============
+*/
+void S_Update()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (server_loading) {
+        return;
+    }
+
+    S_Driver_Update();
+}
+
+/*
+==============
+S_StopSound
+==============
+*/
+void S_StopSound(int entnum, int channel)
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (channel == CHAN_AUTO) {
+        return;
+    }
+
+    S_Driver_StopSound(entnum, channel);
+}
+
+/*
+==============
+S_SetReverb
+==============
+*/
+void S_SetReverb(int reverb_type, float reverb_level)
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_Driver_SetReverb(reverb_type, reverb_level);
+}
+
+/*
+==============
+S_Play
+==============
+*/
+void S_Play()
+{
+    int  i;
+    char name[MAX_QPATH];
+
+    if (Cmd_Argc() < 2) {
+        return;
+    }
+
+    for (i = 1; i < Cmd_Argc(); i++) {
+        if (strrchr(Cmd_Argv(i), '.')) {
+            Q_strncpyz(name, Cmd_Argv(i), sizeof(name));
+        } else {
+            Com_sprintf(name, sizeof(name), "%s.wav", Cmd_Argv(1));
+        }
+    }
+
+    S_StartLocalSound(name, qfalse);
+}
+
+/*
+==============
+S_SoundList
+==============
+*/
+void S_SoundList()
+{
+    int    i;
+    sfx_t *sfx;
+    int    size;
+    int    total = 0;
+
+    for (i = 0; i < s_numSfx; i++) {
+        sfx = &s_knownSfx[i];
+
+        if (sfx->registration_sequence) {
+            size = sfx->length * sfx->width;
+            total += size;
+            Com_Printf("(%2db) %6i : %s\n", sfx->width * 8, size, sfx->name);
+        }
+    }
+
+    Com_Printf("Total resident: %i\n", total);
+}
+
+/*
+==============
+S_ClearSoundBuffer
+==============
+*/
+void S_ClearSoundBuffer()
+{
+    // TODO: Remove once AL is fully implemented
+}
+
+/*
+==============
+S_GetMusicFilename
+==============
+*/
+const char* S_GetMusicFilename()
+{
+    return S_Driver_GetMusicFilename();
+}
+
+/*
+==============
+S_GetMusicLoopCount
+==============
+*/
+int S_GetMusicLoopCount()
+{
+    return S_Driver_GetMusicLoopCount();
+}
+
+/*
+==============
+S_GetMusicOffset
+==============
+*/
+unsigned int S_GetMusicOffset()
+{
+    return S_Driver_GetMusicOffset();
+}
diff --git a/code/client/snd_info.cpp b/code/client/snd_info.cpp
new file mode 100644
index 00000000..0d994107
--- /dev/null
+++ b/code/client/snd_info.cpp
@@ -0,0 +1,95 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "snd_local.h"
+#include "../qcommon/tiki.h"
+
+void load_sfx_info()
+{
+    TikiScript  tiki;
+    const char *token;
+    int         current_sound_file;
+    char        file_name[MAX_QPATH];
+
+    sfx_infos[0].name[0]            = 0;
+    sfx_infos[0].max_factor         = -1.0;
+    sfx_infos[0].loop_start         = -1;
+    sfx_infos[0].loop_end           = -1;
+    sfx_infos[0].max_number_playing = DEFAULT_SFX_NUMBER_PLAYING;
+    number_of_sfx_infos             = 1;
+
+    for (current_sound_file = 0; current_sound_file < 10; current_sound_file++) {
+        Com_sprintf(file_name, sizeof(file_name), "global/sound%d.txt", current_sound_file);
+
+        if (!tiki.LoadFile(file_name, qtrue)) {
+            continue;
+        }
+
+        Com_Printf("Loading %s\n", file_name);
+
+        while (tiki.TokenAvailable(qtrue)) {
+            token = tiki.GetToken(qtrue);
+
+            if (!Q_stricmp(token, "sound")) {
+                if (tiki.TokenAvailable(qtrue)) {
+                    token = tiki.GetToken(qtrue);
+
+                    if (number_of_sfx_infos == 1000) {
+                        Com_DPrintf("Too many sound infos specified\n");
+                        break;
+                    }
+
+                    Q_strncpyz(sfx_infos[number_of_sfx_infos].name, token, sizeof(sfx_infos[number_of_sfx_infos].name));
+                    sfx_infos[number_of_sfx_infos].max_factor         = -1.f;
+                    sfx_infos[number_of_sfx_infos].loop_start         = -1;
+                    sfx_infos[number_of_sfx_infos].loop_end           = -1;
+                    sfx_infos[number_of_sfx_infos].max_number_playing = DEFAULT_SFX_NUMBER_PLAYING;
+                    number_of_sfx_infos++;
+                }
+            } else if (!Q_stricmp(token, "loopstart")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                         = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].loop_start = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "loopend")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                       = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].loop_end = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "maxnumber")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                                 = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].max_number_playing = atoi(token);
+                }
+            } else if (!Q_stricmp(token, "maxfactor")) {
+                if (!tiki.TokenAvailable(qtrue)) {
+                    token                                         = tiki.GetToken(qtrue);
+                    sfx_infos[number_of_sfx_infos - 1].max_factor = atoi(token);
+                }
+            }
+        }
+    }
+
+    tiki.Close();
+
+    sfx_infos[0].name[0] = 0;
+}
diff --git a/code/client/snd_local.h b/code/client/snd_local.h
index d92c6700..04c6ba9f 100644
--- a/code/client/snd_local.h
+++ b/code/client/snd_local.h
@@ -27,6 +27,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/qcommon.h"
 #include "snd_public.h"
 
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+
 #define	PAINTBUFFER_SIZE		4096					// this is in samples
 
 #define SND_CHUNK_SIZE			1024					// samples
@@ -281,3 +283,7 @@ void S_PaintChannelFrom16_altivec( portable_samplepair_t paintbuffer[PAINTBUFFER
 #ifdef __cplusplus
 }
 #endif
+
+#else
+#  include "snd_local_new.h"
+#endif
diff --git a/code/client/snd_local_new.h b/code/client/snd_local_new.h
new file mode 100644
index 00000000..877df120
--- /dev/null
+++ b/code/client/snd_local_new.h
@@ -0,0 +1,252 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern cvar_t *s_volume;
+extern cvar_t *s_khz;
+extern cvar_t *s_loadas8bit;
+extern cvar_t *s_separation;
+extern cvar_t *s_musicVolume;
+extern cvar_t *s_ambientVolume;
+
+#define MAX_SOUNDSYSTEM_CHANNELS_3D        32
+#define MAX_SOUNDSYSTEM_CHANNELS_2D        32
+#define MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM 32
+#define MAX_SOUNDSYSTEM_POSITION_CHANNELS  (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM)
+#define MAX_SOUNDSYSTEM_SONGS              2
+#define MAX_SOUNDSYSTEM_MISC_CHANNELS      3
+#define MAX_SOUNDSYSTEM_CHANNELS                                                                             \
+    (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + MAX_SOUNDSYSTEM_SONGS \
+     + MAX_SOUNDSYSTEM_MISC_CHANNELS)
+#define MAX_SOUNDSYSTEM_LOOP_SOUNDS 64
+
+#define SOUNDSYSTEM_CHANNEL_MP3_ID \
+    (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + MAX_SOUNDSYSTEM_SONGS)
+#define SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID (SOUNDSYSTEM_CHANNEL_MP3_ID + 1)
+#define SOUNDSYSTEM_CHANNEL_MOVIE_ID         (SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID + 1)
+
+typedef struct {
+    int   format;
+    float rate;
+
+    float width;
+    int   channels;
+    int   samples;
+
+    int dataofs;
+    int datasize;
+    int dataalign;
+} wavinfo_t;
+
+typedef struct sfx_s {
+    int iFlags;
+
+    int   length;
+    int   width;
+    byte *data;
+    char  name[64];
+
+    int   registration_sequence;
+    int   sfx_info_index;
+    float time_length;
+
+    wavinfo_t    info;
+    unsigned int buffer;
+} sfx_t;
+
+typedef struct {
+    unsigned short wFormatTag;
+    unsigned short nChannels;
+    unsigned int   nSamplesPerSec;
+    unsigned int   nAvgBytesPerSec;
+    unsigned short nBlockAlign;
+    unsigned short wBitsPerSample;
+    unsigned short cbSize;
+} wavinfo_x_t;
+
+typedef struct {
+    char name[64];
+
+    int loop_start;
+    int loop_end;
+
+    int   max_number_playing;
+    float max_factor;
+} sfx_info_t;
+
+typedef struct {
+    vec3_t   position;
+    vec3_t   velocity;
+    int      time;
+    qboolean use_listener;
+} s_entity_t;
+
+typedef struct {
+    char alias[32];
+    char path[64];
+
+    int   mood_num;
+    int   flags;
+    float volume;
+    float fadetime;
+
+    int current_pos;
+    int current_state;
+} song_t;
+
+typedef struct {
+    int  iFlags;
+    char szName[64];
+} sfxsavegame_t;
+
+typedef struct {
+    qboolean      bPlaying;
+    int           iStatus;
+    sfxsavegame_t sfx;
+
+    int    iEntNum;
+    int    iEntChannel;
+    vec3_t vOrigin;
+    float  fVolume;
+    int    iBaseRate;
+    float  fNewPitchMult;
+    float  fMinDist;
+    float  fMaxDist;
+
+    int iStartTime;
+    int iTime;
+    int iNextCheckObstructionTime;
+    int iEndTime;
+
+    int iFlags;
+    int iOffset;
+    int iLoopCount;
+} channelbasesavegame_t;
+
+typedef struct {
+    channelbasesavegame_t Channels[MAX_SOUNDSYSTEM_CHANNELS];
+} soundsystemsavegame_t;
+
+enum channel_flags_t {
+    CHANNEL_FLAG_PLAY_DEFERRED  = 1,
+    CHANNEL_FLAG_LOCAL_LISTENER = 16,
+    CHANNEL_FLAG_NO_ENTITY      = 32,
+    CHANNEL_FLAG_PAUSED         = 64,
+    CHANNEL_FLAG_LOOPING        = 128,
+    // Added in OPM
+    CHANNEL_FLAG_MISSING_ENT    = 256,
+};
+
+enum sfx_flags_t {
+    SFX_FLAG_DEFAULT_SOUND = 1,
+    SFX_FLAG_MP3           = 2,
+    SFX_FLAG_STREAMED      = 4,
+    SFX_FLAG_NO_OFFSET     = 8,
+    SFX_FLAG_NULL          = 16,
+};
+
+enum loopsound_flags_t {
+    LOOPSOUND_FLAG_NO_PAN = 1
+};
+
+#define MAX_SFX         1400
+#define MAX_SFX_INFOS   1000
+#define MAX_LOOP_SOUNDS 64
+#define DEFAULT_SFX_NUMBER_PLAYING 10 //5
+
+extern qboolean   s_bLastInitSound;
+extern qboolean   s_bSoundStarted;
+extern qboolean   s_bSoundPaused;
+extern qboolean   s_bTryUnpause;
+extern int        s_iListenerNumber;
+extern float      s_fAmbientVolume;
+extern int        number_of_sfx_infos;
+extern sfx_info_t sfx_infos[];
+extern sfx_t      s_knownSfx[];
+extern int        s_numSfx;
+extern s_entity_t s_entity[];
+
+// The current sound driver.
+// Currently OPENAL
+#define SOUND_DRIVER OPENAL
+
+//
+// snd_info.cpp
+//
+void load_sfx_info();
+
+//
+// snd_dma_new.cpp
+//
+
+sfx_t *S_FindName(const char *name, int sequenceNumber);
+void   S_DefaultSound(sfx_t *sfx);
+
+void S_LoadData(soundsystemsavegame_t *pSave);
+void S_SaveData(soundsystemsavegame_t *pSave);
+void S_ClearSoundBuffer();
+
+//
+// snd_mem.c
+//
+qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load);
+
+#define S_StopAllSounds2 S_StopAllSounds
+
+//
+// Driver-specific functions
+//
+#define S_Call_SndDriver(driver, func)  S_##driver##_##func
+#define S_Call_SndDriverX(driver, func) S_Call_SndDriver(driver, func)
+
+#define S_Driver_Init                   S_Call_SndDriverX(SOUND_DRIVER, Init)
+#define S_Driver_Shutdown               S_Call_SndDriverX(SOUND_DRIVER, Shutdown)
+#define S_Driver_StartSound             S_Call_SndDriverX(SOUND_DRIVER, StartSound)
+#define S_Driver_AddLoopingSound        S_Call_SndDriverX(SOUND_DRIVER, AddLoopingSound)
+#define S_Driver_ClearLoopingSounds     S_Call_SndDriverX(SOUND_DRIVER, ClearLoopingSounds)
+#define S_Driver_StopSound              S_Call_SndDriverX(SOUND_DRIVER, StopSound)
+#define S_Driver_StopAllSounds          S_Call_SndDriverX(SOUND_DRIVER, StopAllSounds)
+#define S_Driver_Respatialize           S_Call_SndDriverX(SOUND_DRIVER, Respatialize)
+#define S_Driver_SetReverb              S_Call_SndDriverX(SOUND_DRIVER, SetReverb)
+#define S_Driver_Update                 S_Call_SndDriverX(SOUND_DRIVER, Update)
+#define S_Driver_GetMusicFilename       S_Call_SndDriverX(SOUND_DRIVER, GetMusicFilename)
+#define S_Driver_GetMusicLoopCount      S_Call_SndDriverX(SOUND_DRIVER, GetMusicLoopCount)
+#define S_Driver_GetMusicOffset         S_Call_SndDriverX(SOUND_DRIVER, GetMusicOffset)
+
+void S_PrintInfo();
+void S_DumpInfo();
+qboolean S_NeedFullRestart();
+void S_ReLoad(soundsystemsavegame_t* pSave);
+
+extern cvar_t *s_show_sounds;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/client/snd_mem_new.cpp b/code/client/snd_mem_new.cpp
new file mode 100644
index 00000000..0bf2dd63
--- /dev/null
+++ b/code/client/snd_mem_new.cpp
@@ -0,0 +1,566 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "snd_local.h"
+#include "cl_ui.h"
+
+byte *data_p;
+byte *iff_end;
+byte *last_chunk;
+byte *iff_data;
+int   iff_chunk_len;
+
+qboolean S_LoadMP3(const char *fileName, sfx_t *sfx);
+
+/*
+==============
+GetLittleShort
+==============
+*/
+short int GetLittleShort()
+{
+    union {
+        short value;
+        byte  bytes[2];
+    } val;
+
+#ifdef Q3_LITTLE_ENDIAN
+    val.bytes[0] = data_p[0];
+    val.bytes[1] = data_p[1];
+#else
+    val.bytes[0] = data_p[1];
+    val.bytes[1] = data_p[0];
+#endif
+
+    data_p += sizeof(short);
+    return val.value;
+}
+
+/*
+==============
+GetLittleLong
+==============
+*/
+int GetLittleLong()
+{
+    union {
+        int  value;
+        byte bytes[4];
+    } val;
+
+#ifdef Q3_LITTLE_ENDIAN
+    val.bytes[0] = data_p[0];
+    val.bytes[1] = data_p[1];
+    val.bytes[2] = data_p[2];
+    val.bytes[3] = data_p[3];
+#else
+    val.bytes[0] = data_p[3];
+    val.bytes[1] = data_p[2];
+    val.bytes[2] = data_p[1];
+    val.bytes[3] = data_p[0];
+#endif
+
+    data_p += sizeof(int);
+    return val.value;
+}
+
+/*
+==============
+SetLittleShort
+==============
+*/
+void SetLittleShort(int i)
+{
+    union {
+        short value;
+        byte  bytes[2];
+    } val;
+
+    val.value = i;
+
+#ifdef Q3_LITTLE_ENDIAN
+    data_p[0] = val.bytes[0];
+    data_p[1] = val.bytes[1];
+#else
+    data_p[0] = val.bytes[1];
+    data_p[1] = val.bytes[0];
+#endif
+
+    data_p += sizeof(short);
+}
+
+/*
+==============
+SetLittleLong
+==============
+*/
+void SetLittleLong(int i)
+{
+    union {
+        int  value;
+        byte bytes[4];
+    } val;
+
+    val.value = i;
+
+#ifdef Q3_LITTLE_ENDIAN
+    data_p[0] = val.bytes[0];
+    data_p[1] = val.bytes[1];
+    data_p[2] = val.bytes[2];
+    data_p[3] = val.bytes[3];
+#else
+    data_p[0] = val.bytes[3];
+    data_p[1] = val.bytes[2];
+    data_p[2] = val.bytes[1];
+    data_p[3] = val.bytes[0];
+#endif
+
+    data_p += sizeof(int);
+}
+
+/*
+==============
+FindNextChunk
+==============
+*/
+void FindNextChunk(const char *name)
+{
+    int value;
+
+    while (1) {
+        data_p = last_chunk;
+
+        if (last_chunk >= (byte *)iff_end) {
+            break;
+        }
+
+        data_p = last_chunk + 4;
+        value  = GetLittleLong();
+
+        iff_chunk_len = value;
+        if (value < 0) {
+            break;
+        }
+
+        data_p -= 8;
+        value++;
+        value &= ~1;
+
+        last_chunk = data_p + value + 8;
+        if (!strncmp((const char *)data_p, name, 4u)) {
+            return;
+        }
+    }
+
+    data_p = NULL;
+}
+
+/*
+==============
+FindChunk
+==============
+*/
+void FindChunk(const char *name)
+{
+    last_chunk = iff_data;
+    FindNextChunk(name);
+}
+
+/*
+==============
+DumpChunks
+==============
+*/
+void DumpChunks()
+{
+    char str[5];
+
+    str[4] = 0;
+
+    data_p = iff_data;
+    do {
+        memcpy(str, data_p, 4);
+        data_p += 4;
+
+        iff_chunk_len = GetLittleLong();
+
+        Com_Printf("0x%p : %s (%d)\n", data_p - 4, str, iff_chunk_len);
+
+        data_p += (iff_chunk_len + 1) & ~1;
+    } while (data_p < (byte *)iff_end);
+}
+
+/*
+==============
+GetWavinfo
+==============
+*/
+wavinfo_t GetWavinfo(const char *name, byte *wav, int wavlength)
+{
+    wavinfo_t info;
+    int       samples;
+    short     bytealign;
+
+    memset(&info, 0, sizeof(wavinfo_t));
+
+    if (!wav) {
+        return info;
+    }
+
+    iff_data = wav;
+    iff_end  = &wav[wavlength];
+    FindChunk("RIFF");
+
+    if (!data_p || strncmp((const char *)data_p + 8, "WAVE", 4u)) {
+        Com_Printf("Missing RIFF/WAVE chunks\n");
+        return info;
+    }
+
+    iff_data = data_p + 12;
+    FindChunk("fmt ");
+    if (!data_p) {
+        Com_Printf("Missing fmt chunk\n");
+        return info;
+    }
+
+    data_p += 8;
+
+    info.format = GetLittleShort();
+    if (info.format == 17) {
+        info.channels = GetLittleShort();
+        info.rate     = (float)GetLittleLong();
+        data_p += 4;
+
+        bytealign  = GetLittleShort();
+        info.width = (float)GetLittleShort() / 8.f;
+        data_p += 2;
+
+        FindChunk("data");
+        if (!data_p) {
+            Com_Printf("Missing data chunk\n");
+            return info;
+        }
+
+        data_p += 4;
+        if (info.width >= 1.0) {
+            samples = (int)((float)GetLittleLong() / info.width);
+        } else {
+            samples = (int)((float)GetLittleLong() * info.width);
+        }
+
+        if (!info.samples) {
+            info.samples = samples;
+        } else if (samples < info.samples) {
+            Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
+        }
+
+        info.dataofs   = data_p - wav;
+        info.datasize  = iff_chunk_len - bytealign + info.dataofs;
+        info.dataalign = (bytealign / info.channels - 4) / 4 * 8 + 1;
+    } else if (info.format == 1) {
+        info.channels = GetLittleShort();
+        info.rate     = (float)GetLittleLong();
+        data_p += 4;
+
+        bytealign  = GetLittleShort();
+        info.width = (float)GetLittleShort() / 8.f;
+
+        FindChunk("data");
+        if (!data_p) {
+            Com_Printf("Missing data chunk\n");
+            return info;
+        }
+
+        data_p += 4;
+        samples = (float)GetLittleLong() / info.width;
+
+        if (!info.samples) {
+            info.samples = samples;
+        } else if (samples < info.samples) {
+            Com_Error(ERR_DROP, "Sound %s has a bad loop length", name);
+        }
+
+        info.dataofs   = data_p - wav;
+        info.datasize  = iff_chunk_len;
+        info.dataalign = (bytealign / info.channels - 4) / 4 * 8 + 1;
+        // dataalign should always be 1
+        assert(info.dataalign == 1);
+    } else {
+        Com_Printf("Microsoft PCM format only\n");
+        return info;
+    }
+
+    return info;
+}
+
+/*
+==============
+DownSampleWav
+==============
+*/
+qboolean DownSampleWav(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
+{
+    int   newdatasize;
+    byte *datap;
+    int   i;
+    int   ii;
+    int   error;
+    int   width;
+    int   oldsamples;
+    int   oldrate;
+
+    newdatasize = 0;
+    datap       = &wav[info->dataofs];
+
+    if (info->channels > 1) {
+        Com_DPrintf("Could not downsample WAV file. Stereo WAVs not supported!\n");
+        return 0;
+    }
+
+    if (info->format != 1 || !info->dataofs) {
+        Com_DPrintf("Could not downsample WAV file. Not PCM format!\n");
+        return 0;
+    }
+
+    if (info->rate <= newkhz) {
+        return 0;
+    }
+
+    error = 0;
+    width = info->width;
+    for (i = 0; i < info->samples; i++) {
+        error += newkhz;
+        while (error > info->rate) {
+            error -= info->rate;
+            newdatasize += width;
+        }
+    }
+
+    oldsamples    = info->samples;
+    oldrate       = info->rate;
+    info->samples = newdatasize / width;
+    info->rate    = (float)newkhz;
+    newdatasize += info->dataofs;
+
+    *newdata = (byte *)Z_TagMalloc(newdatasize, TAG_SOUND);
+    memcpy(*newdata, wav, info->dataofs);
+
+    iff_data = *newdata;
+    iff_end  = *newdata + newdatasize;
+    FindChunk("RIFF");
+
+    if (!data_p || strncmp((const char *)data_p + 8, "WAVE", 4u)) {
+        Com_DPrintf("Missing RIFF/WAVE chunks\n");
+        return 0;
+    }
+
+    iff_data = data_p + 12;
+    FindChunk("fmt ");
+    if (!data_p) {
+        Com_DPrintf("Missing fmt chunk\n");
+        return 0;
+    }
+
+    data_p += 12;
+    SetLittleShort((int)info->rate);
+    data_p += 8;
+
+    FindChunk("data");
+    if (!data_p) {
+        Com_DPrintf("Missing data chunk\n");
+        return 0;
+    }
+
+    data_p += 4;
+    SetLittleLong((int)(info->samples * info->width));
+
+    error = 0;
+    for (i = 0; i < oldsamples; i++) {
+        error += newkhz;
+        while (error > oldrate) {
+            error -= oldrate;
+            for (ii = 0; ii < width; ii++) {
+                data_p[ii] = datap[ii];
+            }
+
+            data_p += width;
+        }
+
+        datap += width;
+    }
+
+    assert(iff_end - data_p == 0);
+
+    return newdatasize;
+}
+
+/*
+==============
+DownSampleWav_MILES
+==============
+*/
+int DownSampleWav_MILES(wavinfo_t *info, byte *wav, int wavlength, int newkhz, byte **newdata)
+{
+    // Fallback to software downsampling
+    return DownSampleWav(info, wav, wavlength, newkhz, newdata);
+}
+
+/*
+==============
+S_LoadSound
+==============
+*/
+qboolean S_LoadSound(const char *fileName, sfx_t *sfx, int streamed, qboolean force_load)
+{
+    int          size;
+    fileHandle_t file_handle;
+    char         tempName[MAX_RES_NAME + 1];
+    int          realKhz;
+
+    sfx->buffer = 0;
+
+    if (fileName[0] == '*') {
+        return qfalse;
+    }
+
+    if (streamed) {
+        sfx->length = 5000;
+        sfx->width  = 1;
+        sfx->iFlags |= SFX_FLAG_STREAMED;
+        sfx->time_length = 5000.0;
+        sfx->data        = NULL;
+        return qtrue;
+    }
+
+    if (clc.state != CA_LOADING && !force_load) {
+        Com_Printf("**************S_LoadSound: %s\n", fileName);
+    }
+
+    if (strstr(fileName, ".mp3")) {
+        return S_LoadMP3(fileName, sfx);
+    }
+
+    size = FS_FOpenFileRead(fileName, &file_handle, qfalse, qtrue);
+    if (size <= 0) {
+        if (file_handle) {
+            FS_FCloseFile(file_handle);
+        }
+        return qfalse;
+    }
+
+    sfx->data = (byte *)Z_TagMalloc(size, TAG_SOUND);
+
+    FS_Read(sfx->data, size, file_handle);
+    FS_FCloseFile(file_handle);
+    sfx->info = GetWavinfo(fileName, sfx->data, size);
+
+    if (sfx->info.channels != 1 && !streamed) {
+        Com_Printf("%s is a stereo wav file\n", fileName);
+        Z_Free(sfx->data);
+        sfx->data = NULL;
+        return qfalse;
+    }
+
+    if (!sfx->info.dataofs) {
+        sfx->iFlags |= SFX_FLAG_NO_OFFSET;
+    }
+
+    switch (s_khz->integer) {
+    case 11:
+        realKhz = 11025;
+        break;
+    case 22:
+    default:
+        realKhz = 22050;
+        break;
+    case 44:
+        realKhz = 44100;
+        break;
+    }
+
+    if (!(sfx->iFlags & SFX_FLAG_STREAMED) && realKhz < sfx->info.rate) {
+        byte *newdata;
+        int   newdatasize;
+
+        newdata = NULL;
+        if (sfx->iFlags & SFX_FLAG_NO_OFFSET) {
+            newdatasize = DownSampleWav_MILES(&sfx->info, sfx->data, size, realKhz, &newdata);
+        } else {
+            newdatasize = DownSampleWav(&sfx->info, sfx->data, size, realKhz, &newdata);
+        }
+
+        if (newdatasize) {
+            Z_Free(sfx->data);
+            sfx->data          = newdata;
+            sfx->info.datasize = newdatasize;
+        }
+    }
+
+    sfx->length      = sfx->info.samples;
+    sfx->width       = sfx->info.width;
+    sfx->time_length = sfx->info.samples / sfx->info.rate * 1000.f;
+
+    if (sfx->iFlags & SFX_FLAG_STREAMED) {
+        Z_Free(sfx->data);
+        sfx->data = NULL;
+    }
+
+    Com_sprintf(tempName, sizeof(tempName), "k%s", fileName);
+    UI_LoadResource(tempName);
+
+    if (strstr(fileName, "sound/null.wav")) {
+        sfx->iFlags |= SFX_FLAG_NULL;
+        return qtrue;
+    }
+
+    return qtrue;
+}
+
+/*
+==============
+S_LoadMP3
+==============
+*/
+qboolean S_LoadMP3(const char *fileName, sfx_t *sfx)
+{
+    int          length;
+    fileHandle_t file_handle;
+
+    length = FS_FOpenFileRead(fileName, &file_handle, 0, 1);
+    if (length <= 0) {
+        if (file_handle) {
+            FS_FCloseFile(file_handle);
+        }
+        return qfalse;
+    }
+
+    memset(&sfx->info, 0, sizeof(sfx->info));
+    sfx->data   = (byte *)Z_TagMalloc(length, TAG_SOUND);
+    sfx->length = length;
+    sfx->width  = 1;
+    FS_Read(sfx->data, length, file_handle);
+    FS_FCloseFile(file_handle);
+
+    sfx->iFlags |= SFX_FLAG_MP3;
+
+    return qtrue;
+}
diff --git a/code/renderer/tr_ghost.cpp b/code/client/snd_miles_new.cpp
similarity index 89%
rename from code/renderer/tr_ghost.cpp
rename to code/client/snd_miles_new.cpp
index 2b619982..16d86cb7 100644
--- a/code/renderer/tr_ghost.cpp
+++ b/code/client/snd_miles_new.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_ghost.cpp
+// See the header file for information
 
-#include "tr_local.h"
-#include "tr_ghost.h"
+#include "snd_miles_new.h"
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_image.c b/code/client/snd_miles_new.h
similarity index 83%
rename from code/renderergl2/new/tr_image.c
rename to code/client/snd_miles_new.h
index c8106ae3..1fd9e211 100644
--- a/code/renderergl2/new/tr_image.c
+++ b/code/client/snd_miles_new.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,4 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../tr_local.h"
+//
+// This file exists in the original source code.
+// But this driver won't be implemented, as OpenAL is a better sound system!
+//
+
+#pragma once
diff --git a/code/client/snd_openal.c b/code/client/snd_openal.c
index a5f4dadf..236f859a 100644
--- a/code/client/snd_openal.c
+++ b/code/client/snd_openal.c
@@ -233,7 +233,7 @@ static sfxHandle_t S_AL_BufferFind(const char *filename)
 		ptr = &knownSfx[sfx];
 		memset(ptr, 0, sizeof(*ptr));
 		ptr->masterLoopSrc = -1;
-		strcpy(ptr->filename, filename);
+		Q_strncpyz(ptr->filename, filename, sizeof(ptr->filename));
 	}
 
 	// Return the handle
diff --git a/code/client/snd_openal_new.cpp b/code/client/snd_openal_new.cpp
new file mode 100644
index 00000000..2e35801c
--- /dev/null
+++ b/code/client/snd_openal_new.cpp
@@ -0,0 +1,5045 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "snd_local.h"
+#include "snd_openal_new.h"
+#include "client.h"
+#include "../server/server.h"
+#include "snd_codec.h"
+
+typedef struct {
+    const char *funcname;
+    void      **funcptr;
+    bool        required;
+} extensions_table_t;
+
+#define MAX_MUSIC_SONGS 16
+
+static int   s_iNextLoopingWarning = 0;
+static int   s_iReverbType         = 0;
+static float s_fReverbLevel        = 0;
+static bool  s_bReverbChanged      = false;
+static bool  s_bFading             = false;
+static float s_fFadeVolume         = 1.f;
+static float s_fVelocityScale      = 0.005f;
+
+static constexpr float s_fVolumeGain = 1.f; // = 84.f;
+
+cvar_t *s_milesdriver;
+cvar_t *s_openaldevice;
+cvar_t *s_reverb;
+cvar_t *s_show_cpu;
+cvar_t *s_show_num_active_sounds;
+cvar_t *s_show_sounds;
+cvar_t *s_speaker_type;
+cvar_t *s_obstruction_cal_time;
+cvar_t *s_lastSoundTime;
+// Added in OPM
+cvar_t *s_openaldriver;
+cvar_t *s_alAvailableDevices;
+
+static float reverb_table[] = {
+    0.5f,   0.25f,        0.417f, 0.653f,      0.208f,      0.5f,   0.403f, 0.5f,   0.5f,
+    0.361f, 0.5f,         0.153f, 0.361f,      0.44400001f, 0.25f,  0.111f, 0.111f, 0.19400001f,
+    1.0f,   0.097000003f, 0.208f, 0.65200001f, 1.0f,        0.875f, 0.139f, 0.486f,
+};
+
+static vec3_t       vec_zero                   = {0, 0, 0};
+int                 s_iNumMilesAudioProviders  = 0;
+bool                s_bProvidersEmunerated     = false;
+static bool         al_initialized             = false;
+static bool         al_use_reverb              = false;
+static float        al_current_volume          = 0;
+static unsigned int al_frequency               = 22050;
+static ALCcontext  *al_context_id              = NULL;
+static ALCdevice   *al_device                  = NULL;
+static ALsizei      al_default_resampler_index = 0;
+static ALsizei      al_resampler_index         = 0;
+
+static ALboolean (*_alutLoadMP3_LOKI)(unsigned int buffer, const byte *data, int length);
+static void (*_alReverbScale_LOKI)();
+static void (*_alReverbDelay_LOKI)();
+
+static qboolean music_active            = qfalse;
+int             music_current_mood      = 0;
+int             music_fallback_mood     = 0;
+float           old_music_volume        = 1.f;
+float           music_volume            = 1.f;
+float           new_music_volume        = 1.f;
+float           music_volume_fade_time  = 0;
+long int        music_volume_start_time = 0;
+int             music_volume_direction  = 0;
+int             music_volume_changed    = 0;
+int             music_loaded            = 0;
+int             music_numsongs          = 0;
+int             music_currentsong       = 0;
+
+static qboolean enumeration_ext     = qfalse;
+static qboolean enumeration_all_ext = qfalse;
+
+static qboolean ima4_ext         = qfalse;
+static qboolean soft_block_align = qfalse;
+
+song_t            music_songs[MAX_MUSIC_SONGS];
+openal_internal_t openal;
+static float      s_fFadeStartTime;
+static float      s_fFadeStopTime;
+static char       current_soundtrack[128];
+
+static void S_OPENAL_PlayMP3();
+static void S_OPENAL_StopMP3();
+static void S_OPENAL_Pitch();
+static int
+S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin);
+static void   S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel);
+static bool   S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t *pSfx);
+static ALuint S_OPENAL_Format(float width, int channels);
+
+#define alDieIfError() __alDieIfError(__FILE__, __LINE__)
+
+#if defined(_WIN64)
+#    define ALDRIVER_DEFAULT "OpenAL64.dll"
+#elif defined(_WIN32)
+#    define ALDRIVER_DEFAULT "OpenAL32.dll"
+#elif defined(__APPLE__)
+#    define ALDRIVER_DEFAULT "libopenal.1.dylib"
+#elif defined(__OpenBSD__)
+#    define ALDRIVER_DEFAULT "libopenal.so"
+#else
+#    define ALDRIVER_DEFAULT "libopenal.so.1"
+#endif
+
+//
+// alext
+//
+#ifdef AL_SOFT_source_resampler
+LPALGETSTRINGISOFT qalGetStringiSOFT;
+#endif
+
+/*
+==============
+__alDieIfError
+==============
+*/
+static void __alDieIfError(const char *file, int line)
+{
+    ALint alErr = qalGetError();
+    if (alErr) {
+        if (s_show_sounds->integer) {
+            Com_DPrintf("OpenAL error, %s, line %i: [%s].\n", file, line, qalGetString(alErr));
+        }
+    }
+}
+
+/*
+==============
+S_OPENAL_NukeSource
+==============
+*/
+static void S_OPENAL_NukeSource(ALuint *srcptr)
+{
+    ALuint source;
+
+    source = *srcptr;
+    if (!*srcptr) {
+        return;
+    }
+
+    if (!qalIsSource(*srcptr)) {
+        return;
+    }
+
+    alDieIfError();
+    qalSourceStop(source);
+
+    alDieIfError();
+    qalSourcei(source, AL_BUFFER, 0);
+
+    alDieIfError();
+    qalDeleteSources(1, srcptr);
+
+    alDieIfError();
+    *srcptr = 0;
+}
+
+/*
+==============
+S_OPENAL_NukeBuffer
+==============
+*/
+static void S_OPENAL_NukeBuffer(ALuint *bufptr)
+{
+    if (!*bufptr) {
+        return;
+    }
+
+    if (!qalIsBuffer(*bufptr)) {
+        return;
+    }
+
+    alDieIfError();
+    qalDeleteBuffers(1, bufptr);
+
+    alDieIfError();
+    *bufptr = 0;
+}
+
+/*
+==============
+S_OPENAL_NukeChannel
+==============
+*/
+static void S_OPENAL_NukeChannel(openal_channel *channel)
+{
+    if (!channel) {
+        return;
+    }
+
+    S_OPENAL_NukeSource(&channel->source);
+    S_OPENAL_NukeBuffer(&channel->buffer);
+
+    if (channel->bufferdata) {
+        delete[] channel->bufferdata;
+    }
+}
+
+/*
+==============
+S_OPENAL_NukeContext
+==============
+*/
+static void S_OPENAL_NukeContext()
+{
+    int i;
+
+    Com_Printf("OpenAL: Destroying channels...\n");
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; ++i) {
+        S_OPENAL_NukeChannel(openal.channel[i]);
+    }
+
+    Com_Printf("OpenAL: Channels destroyed successfully.\n");
+
+    for (i = 0; i < s_numSfx; i++) {
+        S_OPENAL_NukeBuffer(&s_knownSfx[i].buffer);
+    }
+
+    S_OPENAL_NukeBuffer(&openal.movieSFX.buffer);
+
+    if (al_context_id) {
+        Com_Printf("OpenAL: Destroying context...\n");
+
+        qalcSuspendContext(al_context_id);
+        qalcMakeContextCurrent(NULL);
+        qalcDestroyContext(al_context_id);
+        al_context_id = NULL;
+
+        Com_Printf("OpenAL: Context destroyed successfully.\n");
+    }
+
+    if (al_device) {
+        Com_Printf("OpenAL: Closing device...\n");
+
+        qalcCloseDevice(al_device);
+        al_device = NULL;
+
+        Com_Printf("OpenAL: Device closed successfully.\n");
+    }
+}
+
+/*
+==============
+S_OPENAL_InitContext
+==============
+*/
+static bool S_OPENAL_InitContext()
+{
+    const char *dev;
+    int         attrlist[12];
+
+    Com_DPrintf("OpenAL: Context initialization\n");
+
+    dev = NULL;
+    if (s_openaldevice) {
+        dev = s_openaldevice->string;
+    }
+
+    if (dev && !*dev) {
+        dev = NULL;
+    }
+
+    // Device enumeration support
+    enumeration_all_ext = qalcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT");
+    enumeration_ext     = qalcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT");
+
+    if (enumeration_ext || enumeration_all_ext) {
+        char        devicenames[16384] = "";
+        const char *devicelist;
+#ifdef _WIN32
+        const char *defaultdevice;
+#endif
+        int curlen;
+
+        // get all available devices + the default device name.
+        if (enumeration_all_ext) {
+            devicelist = qalcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
+#ifdef _WIN32
+            defaultdevice = qalcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER);
+#endif
+        } else {
+            // We don't have ALC_ENUMERATE_ALL_EXT but normal enumeration.
+            devicelist = qalcGetString(NULL, ALC_DEVICE_SPECIFIER);
+#ifdef _WIN32
+            defaultdevice = qalcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+#endif
+            enumeration_ext = qtrue;
+        }
+
+#ifdef _WIN32
+        Com_DPrintf("OpenAL: Default playback device: \"%s\"\n", defaultdevice);
+#endif
+
+#ifdef _WIN32
+        // check whether the default device is generic hardware. If it is, change to
+        // Generic Software as that one works more reliably with various sound systems.
+        // If it's not, use OpenAL's default selection as we don't want to ignore
+        // native hardware acceleration.
+        if (!dev && defaultdevice && !strcmp(defaultdevice, "Generic Hardware")) {
+            dev = "Generic Software";
+        }
+#endif
+
+        // dump a list of available devices to a cvar for the user to see.
+
+        if (devicelist) {
+            while ((curlen = strlen(devicelist))) {
+                Q_strcat(devicenames, sizeof(devicenames), devicelist);
+                Q_strcat(devicenames, sizeof(devicenames), "\n");
+
+                devicelist += curlen + 1;
+            }
+        }
+
+        Com_Printf("OpenAL: List of available devices:\n%s\n", devicenames);
+
+        s_alAvailableDevices = Cvar_Get("s_alAvailableDevices", devicenames, CVAR_ROM | CVAR_NORESTART);
+    }
+
+    Com_Printf("OpenAL: Opening device \"%s\"...\n", dev ? dev : "{default}");
+
+    al_device = qalcOpenDevice(dev);
+    if (!al_device && dev) {
+        Com_Printf("Failed to open OpenAL device '%s', trying default.\n", dev);
+        al_device = qalcOpenDevice(NULL);
+    }
+
+    if (!al_device) {
+        Com_Printf("OpenAL: Could not open device\n");
+        S_OPENAL_NukeContext();
+        return false;
+    }
+
+    Com_Printf("OpenAL: Device opened successfully.\n");
+    switch (s_khz->integer) {
+    case 11:
+        al_frequency = 11025;
+        break;
+    default:
+    case 22:
+        al_frequency = 22050;
+        break;
+    case 44:
+        al_frequency = 44100;
+        break;
+    }
+
+    attrlist[0] = ALC_FREQUENCY;
+    attrlist[1] = al_frequency;
+    attrlist[2] = ALC_SYNC;
+    attrlist[3] = qfalse;
+
+    s_speaker_type->modified = false;
+
+#ifdef ALC_SOFT_output_mode
+    attrlist[4] = ALC_OUTPUT_MODE_SOFT;
+    // Disable HRTF by default
+    // For example, actual speakers that are recognized as headphones by the OS
+    // will not get forced HRTF
+    attrlist[6] = ALC_HRTF_SOFT;
+    attrlist[7] = ALC_FALSE;
+
+    switch (s_speaker_type->integer) {
+    // Two speakers
+    default:
+    case 0:
+        attrlist[5] = ALC_STEREO_SOFT;
+        break;
+    // Headphones
+    case 1:
+        attrlist[5] = ALC_STEREO_HRTF_SOFT;
+        // Allow HRTF mixing (without forcing in case it's unsupported)
+        attrlist[7] = ALC_DONT_CARE_SOFT;
+        break;
+    // Surround
+    case 2:
+        attrlist[5] = ALC_SURROUND_5_1_SOFT;
+        break;
+    // Quad speakers
+    case 3:
+        attrlist[5] = ALC_QUAD_SOFT;
+        break;
+    }
+#else
+#    pragma message("OpenAL: ALC_OUTPUT_MODE_SOFT unavailable")
+
+    Com_Printf(
+        "OpenAL: ALC_OUTPUT_MODE_SOFT is unavailable. The speaker type will be ignored, fallback to normal stereo.\n"
+    );
+    attrlist[4] = 0;
+    attrlist[5] = 0;
+#endif
+
+#ifdef ALC_SOFT_output_limiter
+    // Disable limiter
+    attrlist[8] = ALC_OUTPUT_LIMITER_SOFT;
+    attrlist[9] = ALC_FALSE;
+#endif
+    attrlist[10] = 0;
+    attrlist[11] = 0;
+
+    Com_Printf("OpenAL: Creating AL context...\n");
+    al_context_id = qalcCreateContext(al_device, attrlist);
+    if (!al_context_id) {
+        Com_Printf("OpenAL: Could not create context\n");
+        S_OPENAL_NukeContext();
+        return false;
+    }
+
+    Com_Printf("OpenAL: Context created successfully.\n");
+
+    qalcMakeContextCurrent(al_context_id);
+    alDieIfError();
+
+    Com_Printf("AL_VENDOR: %s\n", qalGetString(AL_VENDOR));
+    alDieIfError();
+
+    Com_Printf("AL_VERSION: %s\n", qalGetString(AL_VERSION));
+    alDieIfError();
+
+    Com_Printf("AL_RENDERER: %s\n", qalGetString(AL_RENDERER));
+    alDieIfError();
+
+    Com_Printf("AL_EXTENSIONS: %s\n", qalGetString(AL_EXTENSIONS));
+    alDieIfError();
+
+    qalDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
+    alDieIfError();
+
+    qalcProcessContext(al_context_id);
+    alDieIfError();
+
+    return true;
+}
+
+/*
+==============
+S_OPENAL_InitExtensions
+==============
+*/
+static bool S_OPENAL_InitExtensions()
+{
+    /*
+    extensions_table_t extensions_table[4] = {
+        "alutLoadMP3_LOKI",
+        (void **)&_alutLoadMP3_LOKI,
+        true,
+        "alReverbScale_LOKI",
+        (void **)&_alReverbScale_LOKI,
+        true,
+        "alReverbDelay_LOKI",
+        (void **)&_alReverbDelay_LOKI,
+        true
+    };
+    */
+
+    extensions_table_t extensions_table[] = {
+#ifdef AL_SOFT_source_resampler
+        extensions_table_t {
+                            "alGetStringiSOFT", (void **)&qalGetStringiSOFT,
+                            false, },
+#endif
+        extensions_table_t {NULL, NULL, NULL}
+    };
+
+    extensions_table_t *i;
+
+    for (i = extensions_table; i->funcname; ++i) {
+        *i->funcptr = NULL;
+    }
+
+    for (i = extensions_table; i->funcname; ++i) {
+        Com_Printf("AL extension: Looking up %ssymbol \"%s\"...", i->required ? "required " : "", i->funcname);
+
+        *i->funcptr = qalGetProcAddress(i->funcname);
+        if (!*i->funcptr) {
+            Com_Printf("...not found! %d [%s]\n", qalGetError(), qalGetString(qalGetError()));
+            if (i->required) {
+                S_OPENAL_NukeContext();
+                return false;
+            }
+            continue;
+        }
+
+        Com_Printf("...found.\n");
+    }
+
+    ima4_ext         = qalIsExtensionPresent("AL_EXT_IMA4");
+    soft_block_align = qalIsExtensionPresent("AL_SOFT_block_alignment");
+
+    qalGetError();
+    return true;
+}
+
+/*
+==============
+S_OPENAL_InitChannel
+==============
+*/
+static bool S_OPENAL_InitChannel(int idx, openal_channel *chan)
+{
+    openal.channel[idx] = chan;
+    VectorClear(chan->vOrigin);
+    chan->fVolume         = 1.0;
+    chan->fNewPitchMult   = 0.0;
+    chan->fMinDist        = 0.0;
+    chan->fMaxDist        = 0.0;
+    chan->pSfx            = 0;
+    chan->iEntNum         = 0;
+    chan->iEntChannel     = 0;
+    chan->iBaseRate       = 0;
+    chan->iStartTime      = 0;
+    chan->iTime           = 0;
+    chan->iEndTime        = 0;
+    chan->iFlags          = 0;
+    chan->iPausedOffset   = 0;
+    chan->source          = 0;
+    chan->buffer          = 0;
+    chan->bufferdata      = 0;
+    chan->fading          = FADE_NONE;
+    chan->fade_time       = 0;
+    chan->fade_start_time = 0;
+    chan->song_number     = 0;
+
+    qalGenSources(1, &chan->source);
+    alDieIfError();
+    qalSourcei(chan->source, AL_SOURCE_RELATIVE, true);
+    alDieIfError();
+
+#ifdef AL_SOFT_source_resampler
+    qalSourcei(chan->source, AL_SOURCE_RESAMPLER_SOFT, al_resampler_index);
+    alDieIfError();
+#endif
+
+    return true;
+}
+
+/*
+==============
+S_OPENAL_Init
+==============
+*/
+qboolean S_OPENAL_Init()
+{
+    int i;
+
+    if (al_initialized) {
+        Com_DPrintf("S_OPENAL_Init(): Called when sound is already initialized!\n");
+        return qtrue;
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; i++) {
+        openal.channel[i] = NULL;
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_LOOP_SOUNDS; i++) {
+        openal.loop_sounds[i] = {};
+    }
+
+    s_milesdriver            = Cvar_Get("s_milesdriver", "auto", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_openaldevice           = Cvar_Get("s_openaldevice", "", CVAR_SOUND_LATCH);
+    s_reverb                 = Cvar_Get("s_reverb", "0", CVAR_SOUND_LATCH | CVAR_ARCHIVE);
+    s_show_cpu               = Cvar_Get("s_show_cpu", "0", 0);
+    s_show_num_active_sounds = Cvar_Get("s_show_num_active_sounds", "0", 0);
+    s_show_sounds            = Cvar_Get("s_show_sounds", "0", 0);
+    s_speaker_type           = Cvar_Get("s_speaker_type", "0", CVAR_ARCHIVE);
+    s_obstruction_cal_time   = Cvar_Get("s_obstruction_cal_time", "500", CVAR_ARCHIVE);
+    //
+    // Added in OPM
+    //  Initialize the AL driver DLL
+    s_openaldriver = Cvar_Get("s_openaldriver", ALDRIVER_DEFAULT, CVAR_LATCH | CVAR_PROTECTED);
+
+    if (!QAL_Init(s_openaldriver->string)) {
+        Com_Printf("Failed to load library: \"%s\".\n", s_openaldriver->string);
+        if (!Q_stricmp(s_openaldriver->string, ALDRIVER_DEFAULT) || !QAL_Init(ALDRIVER_DEFAULT)) {
+            return qfalse;
+        }
+    }
+
+    if (!Cvar_Get("s_initsound", "1", 0)->integer) {
+        Com_Printf("OpenAL: s_initsound set to zero...disabling audio.\n");
+        return true;
+    }
+
+    if (!S_OPENAL_InitContext()) {
+        Com_Printf("OpenAL: initialization failed. No audio will play.\n");
+        return false;
+    }
+
+    if (!S_OPENAL_InitExtensions()) {
+        Com_Printf("OpenAL: A required extension is missing. No audio will play.\n");
+        return false;
+    }
+
+    al_use_reverb = false;
+    if (s_reverb->integer) {
+        STUB_DESC("reenable reverb support later.");
+
+        if (al_use_reverb) {
+            S_OPENAL_SetReverb(s_iReverbType, s_fReverbLevel);
+        } else {
+            Com_Printf("OpenAL: No reverb support. Reverb is disabled.\n");
+        }
+    }
+    s_reverb->modified = false;
+
+    al_current_volume = Square(s_volume->value);
+    qalListenerf(AL_GAIN, al_current_volume);
+    alDieIfError();
+
+#ifdef AL_SOFT_source_resampler
+    if (qalGetStringiSOFT) {
+        size_t numResamplers;
+        size_t i;
+
+        al_default_resampler_index = qalGetInteger(AL_DEFAULT_RESAMPLER_SOFT);
+        alDieIfError();
+        al_resampler_index = al_default_resampler_index;
+        numResamplers      = qalGetInteger(AL_NUM_RESAMPLERS_SOFT);
+        alDieIfError();
+
+        for (i = 0; i < numResamplers; i++) {
+            const ALchar *resamplerName = qalGetStringiSOFT(AL_RESAMPLER_NAME_SOFT, i);
+            if (Q_stristr(resamplerName, "spline")) {
+                Com_Printf("OpenAL: Using %s as the resampler.\n", resamplerName);
+                al_resampler_index = i;
+                break;
+            }
+        }
+    }
+#endif
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_3D; i++) {
+        if (!S_OPENAL_InitChannel(i, &openal.chan_3D[i])) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D; i++) {
+        if (!S_OPENAL_InitChannel(i + MAX_SOUNDSYSTEM_CHANNELS_3D, &openal.chan_2D[i])) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM; i++) {
+        if (!S_OPENAL_InitChannel(
+                i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D, &openal.chan_2D_stream[i]
+            )) {
+            return false;
+        }
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        if (!S_OPENAL_InitChannel(
+                i + MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM,
+                &openal.chan_song[i]
+            )) {
+            return false;
+        }
+    }
+
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_MP3_ID, &openal.chan_mp3)) {
+        return false;
+    }
+
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music)) {
+        return false;
+    }
+
+    if (!S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_MOVIE_ID, &openal.chan_movie)) {
+        return false;
+    }
+
+    //
+    // Disable sound virtualization on special channels
+    //  (triggered music, ambient sounds...)
+    //
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        openal.chan_song[i].set_no_virtualization();
+    }
+    openal.chan_mp3.set_no_virtualization();
+    openal.chan_trig_music.set_no_virtualization();
+    openal.chan_movie.set_no_virtualization();
+
+    Cmd_AddCommand("playmp3", S_OPENAL_PlayMP3);
+    Cmd_AddCommand("stopmp3", S_OPENAL_StopMP3);
+    Cmd_AddCommand("loadsoundtrack", S_loadsoundtrack);
+    Cmd_AddCommand("playsong", S_PlaySong);
+    Cmd_AddCommand("pitch", S_OPENAL_Pitch);
+    Cmd_AddCommand("tmstart", S_TriggeredMusic_Start);
+    Cmd_AddCommand("tmstartloop", S_TriggeredMusic_StartLoop);
+    Cmd_AddCommand("tmstop", S_TriggeredMusic_Stop);
+    // Added in 2.0
+    Cmd_AddCommand("tmvolume", S_TriggeredMusic_Volume);
+
+    S_OPENAL_ClearLoopingSounds();
+    load_sfx_info();
+    s_bProvidersEmunerated = true;
+    al_initialized         = true;
+
+    // Added in OPM
+    S_CodecInit();
+
+    return true;
+}
+
+/*
+==============
+S_OPENAL_Shutdown
+==============
+*/
+void S_OPENAL_Shutdown()
+{
+    if (!al_initialized) {
+        Com_DPrintf("S_OPENAL_Shutdown(): Called when sound is NOT initialized!\n");
+        return;
+    }
+
+    S_OPENAL_StopAllSounds(true);
+
+    Cmd_RemoveCommand("playmp3");
+    Cmd_RemoveCommand("stopmp3");
+    Cmd_RemoveCommand("loadsoundtrack");
+    Cmd_RemoveCommand("playsong");
+    Cmd_RemoveCommand("pitch");
+    Cmd_RemoveCommand("tmstart");
+    Cmd_RemoveCommand("tmstartloop");
+    Cmd_RemoveCommand("tmstop");
+    // Added in 2.0
+    Cmd_RemoveCommand("tmvolume");
+
+    S_OPENAL_NukeContext();
+
+    s_bProvidersEmunerated = false;
+    al_initialized         = false;
+
+    QAL_Shutdown();
+}
+
+/*
+==============
+S_FadeSound
+==============
+*/
+void S_FadeSound(float fTime)
+{
+    Com_Printf("Called FadeSound with: %f\n", fTime);
+
+    if (fTime > 0) {
+        s_bFading        = true;
+        s_fFadeStartTime = cls.realtime;
+        s_fFadeVolume    = 1;
+        s_fFadeStopTime  = cls.realtime + fTime;
+    } else {
+        s_fFadeVolume = 1;
+        s_bFading     = false;
+        // Fixed in OPM
+        //  Make sure to restore the music volume
+        //  in case the map restarts immediately after the intermission
+        music_volume_changed = true;
+    }
+}
+
+/*
+==============
+S_GetBaseVolume
+==============
+*/
+float S_GetBaseVolume()
+{
+    return s_volume->value * s_fFadeVolume;
+}
+
+/*
+==============
+S_NeedFullRestart
+==============
+*/
+qboolean S_NeedFullRestart()
+{
+    return Cvar_Get("s_initsound", "1", 0)->integer != s_bLastInitSound;
+}
+
+/*
+==============
+S_PrintInfo
+==============
+*/
+void S_PrintInfo()
+{
+    const char *dev;
+
+    Com_Printf("----- Sound Info -----\n");
+
+    if (s_bSoundStarted) {
+        dev = NULL;
+        if (s_openaldevice) {
+            dev = s_openaldevice->string;
+        }
+        if (!dev || !*dev) {
+            dev = "{default}";
+        }
+        Com_Printf("device - %s\n", dev);
+        if (al_use_reverb) {
+            Com_Printf("reverb - ON\n");
+        } else {
+            Com_Printf("reverb - OFF\n");
+        }
+        Com_Printf("samplebits - 16\n");
+        Com_Printf("speed - %d\n", al_frequency);
+        if (s_loadas8bit->integer) {
+            Com_Printf("Can NOT force all sounds to 8 bit in OpenAL, I think.\n");
+        }
+    } else {
+        Com_Printf("sound system not started\n");
+    }
+
+    Com_Printf("----------------------\n");
+}
+
+/*
+==============
+S_DumpStatus
+==============
+*/
+static void S_DumpStatus(const char *pszChanName, int iChanNum, openal_channel *channel)
+{
+    sfx_t *sfx;
+    ALint  status;
+
+    sfx = channel->pSfx;
+
+    qalGetSourceiv(channel->source, AL_SOURCE_STATE, &status);
+    alDieIfError();
+
+    if (status == AL_PLAYING || status == AL_PAUSED) {
+        const char *pszMode = status == AL_PLAYING ? "playing" : "paused";
+
+        if (sfx) {
+            if (sfx != (sfx_t *)-16 && sfx->name[0]) {
+                Com_Printf("%s channel %i - %s sfx %s\n", pszChanName, iChanNum, pszMode, sfx->name);
+            } else {
+                Com_Printf("%s channel %i - %s with nameless sfx\n", pszChanName, iChanNum, pszMode);
+            }
+        } else {
+            Com_Printf("%s channel %i - %s with NULL sfx\n", pszChanName, iChanNum, pszMode);
+        }
+    }
+}
+
+/*
+==============
+S_DumpInfo
+==============
+*/
+void S_DumpInfo()
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_3D; i++) {
+        S_DumpStatus("3D", i, openal.channel[i]);
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D; i++) {
+        S_DumpStatus("2D", i, openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + i]);
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM; i++) {
+        S_DumpStatus("2D stream", i, openal.channel[MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + i]);
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_MISC_CHANNELS; i++) {
+        S_DumpStatus(
+            "Misc",
+            i,
+            openal.channel
+                [MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM + i]
+        );
+    }
+}
+
+/*
+==============
+S_OPENAL_Pitch
+==============
+*/
+static void S_OPENAL_Pitch()
+{
+    Com_Printf("S_OPENAL_Pitch() needs to be implemented!\n");
+}
+
+/*
+==============
+S_OPENAL_LoadMP3
+==============
+*/
+static bool S_OPENAL_LoadMP3(const char *_path, openal_channel *chan)
+{
+    char       path[MAX_QPATH];
+    snd_info_t info;
+    ALuint     format;
+
+    chan->stop();
+
+    qalSourcei(chan->source, AL_BUFFER, 0);
+    alDieIfError();
+
+    Q_strncpyz(path, _path, sizeof(path));
+    path[MAX_QPATH - 1] = 0;
+
+    FS_CorrectCase(path);
+
+    // Try to load
+    chan->bufferdata = (ALubyte *)S_CodecLoad(path, &info);
+    if (!chan->bufferdata) {
+        return false;
+    }
+
+    format = S_OPENAL_Format(info.width, info.channels);
+
+    // Create a buffer
+    qalGenBuffers(1, &chan->buffer);
+    alDieIfError();
+
+    // Fill the buffer
+    if (info.size == 0) {
+        // We have no data to buffer, so buffer silence
+        byte dummyData[2] = {0};
+
+        qalBufferData(chan->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+    } else {
+        qalBufferData(chan->buffer, format, chan->bufferdata, info.size, info.rate);
+    }
+
+    alDieIfError();
+
+    // Free the memory
+    Hunk_FreeTempMemory(chan->bufferdata);
+    chan->bufferdata = NULL;
+
+    qalSourcei(chan->source, AL_BUFFER, chan->buffer);
+    alDieIfError();
+
+    chan->set_no_3d();
+
+    return true;
+}
+
+/*
+==============
+S_OPENAL_PlayMP3
+==============
+*/
+static void S_OPENAL_PlayMP3()
+{
+    const char *path;
+
+    if (Cmd_Argc() != 2) {
+        Com_Printf("playmp3 <mp3 file>\n");
+        return;
+    }
+
+    path = Cmd_Argv(1);
+    if (!S_OPENAL_LoadMP3(path, &openal.chan_mp3)) {
+        Com_Printf("Failed to play mp3 - %s\n", path);
+        return;
+    }
+
+    openal.chan_mp3.play();
+    Com_Printf("Playing mp3 - %s\n", path);
+}
+
+/*
+==============
+S_OPENAL_StopMP3
+==============
+*/
+static void S_OPENAL_StopMP3()
+{
+    S_OPENAL_NukeChannel(&openal.chan_mp3);
+}
+
+/*
+==============
+MUSIC_Pause
+==============
+*/
+void MUSIC_Pause()
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        openal.chan_song[i].pause();
+    }
+}
+
+/*
+==============
+MUSIC_Unpause
+==============
+*/
+void MUSIC_Unpause()
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        if (openal.chan_song[i].is_paused()) {
+            openal.chan_song[i].play();
+        }
+    }
+}
+
+/*
+==============
+S_PauseSound
+==============
+*/
+void S_PauseSound()
+{
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    s_bSoundPaused = true;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (pChannel->iEntChannel == CHAN_MENU) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        pChannel->pause();
+    }
+
+    if (openal.chan_mp3.is_playing()) {
+        openal.chan_mp3.pause();
+    }
+
+    MUSIC_Pause();
+    S_TriggeredMusic_Pause();
+}
+
+/*
+==============
+S_UnpauseSound
+==============
+*/
+void S_UnpauseSound()
+{
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (pChannel->is_paused() || (pChannel->iFlags & CHANNEL_FLAG_PLAY_DEFERRED)) {
+            pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
+            pChannel->play();
+        }
+    }
+
+    if (openal.chan_mp3.is_paused()) {
+        openal.chan_mp3.play();
+    }
+
+    MUSIC_Unpause();
+    S_TriggeredMusic_Unpause();
+
+    s_bSoundPaused = false;
+}
+
+/*
+==============
+S_OPENAL_ShouldPlay
+==============
+*/
+static qboolean S_OPENAL_ShouldPlay(sfx_t *pSfx)
+{
+    if (sfx_infos[pSfx->sfx_info_index].max_number_playing <= 0) {
+        return qtrue;
+    }
+
+    int iRemainingTimesToPlay;
+    int i;
+
+    iRemainingTimesToPlay = sfx_infos[pSfx->sfx_info_index].max_number_playing;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (pChannel->pSfx == pSfx && pChannel->is_playing()) {
+            iRemainingTimesToPlay--;
+            if (!iRemainingTimesToPlay) {
+                return qfalse;
+            }
+        }
+    }
+
+    return qtrue;
+}
+
+/*
+==============
+S_OPENAL_ShouldStart
+==============
+*/
+static qboolean S_OPENAL_ShouldStart(const vec3_t vOrigin, float fMinDist, float fMaxDist)
+{
+    vec3_t vDir;
+    vec3_t vListenerOrigin;
+    vec3_t alvec;
+
+    if (!al_initialized) {
+        return false;
+    }
+
+    qalGetListenerfv(AL_POSITION, alvec);
+
+    VectorCopy(alvec, vListenerOrigin);
+    VectorSubtract(vOrigin, vListenerOrigin, vDir);
+
+    return Square(fMaxDist) > VectorLengthSquared(vDir);
+}
+
+/*
+==============
+S_OPENAL_PickChannelBase
+==============
+*/
+static int S_OPENAL_PickChannelBase(int iEntNum, int iEntChannel, int iFirstChannel, int iLastChannel)
+{
+    int             i;
+    int             iBestChannel;
+    openal_channel *pChannel;
+
+    iBestChannel = -1;
+    if (iEntNum != ENTITYNUM_NONE && iEntChannel) {
+        bool bStoppedChannel = false;
+
+        for (i = iFirstChannel; i <= iLastChannel; i++) {
+            pChannel = openal.channel[i];
+            if (!pChannel) {
+                continue;
+            }
+
+            if (pChannel->is_free()) {
+                iBestChannel = i;
+                continue;
+            }
+
+            if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                pChannel->end_sample();
+                bStoppedChannel = 1;
+                iBestChannel    = i;
+                break;
+            }
+        }
+
+        if (!bStoppedChannel) {
+            for (i = 0; i < iFirstChannel; ++i) {
+                pChannel = openal.channel[i];
+                if (!pChannel || pChannel->is_free()) {
+                    continue;
+                }
+
+                if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                    bStoppedChannel = 1;
+                    break;
+                }
+            }
+
+            if (!bStoppedChannel) {
+                for (i = iLastChannel + 1; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+                    pChannel = openal.channel[i];
+                    if (!pChannel || pChannel->is_free()) {
+                        continue;
+                    }
+
+                    if (pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if (iBestChannel < 0) {
+        int iBestTime = 0x7FFFFFFF;
+
+        for (i = iFirstChannel; i <= iLastChannel; i++) {
+            pChannel = openal.channel[i];
+            if (!pChannel) {
+                continue;
+            }
+
+            if (pChannel->is_free()) {
+                return i;
+            }
+
+            if (pChannel->iEntNum == s_iListenerNumber && iEntNum != pChannel->iEntNum) {
+                continue;
+            }
+
+            if (pChannel->iEntChannel < iEntChannel
+                || (pChannel->iEntChannel == iEntChannel && pChannel->iStartTime < iBestTime)) {
+                iBestChannel = i;
+                iEntChannel  = pChannel->iEntChannel;
+                iBestTime    = pChannel->iStartTime;
+            }
+        }
+    }
+
+    return iBestChannel;
+}
+
+/*
+==============
+S_OPENAL_PickChannel3D
+==============
+*/
+static int S_OPENAL_PickChannel3D(int iEntNum, int iEntChannel)
+{
+    return S_OPENAL_PickChannelBase(iEntNum, iEntChannel, 0, MAX_SOUNDSYSTEM_CHANNELS_3D - 1);
+}
+
+/*
+==============
+S_OPENAL_PickChannel2D
+==============
+*/
+static int S_OPENAL_PickChannel2D(int iEntNum, int iEntChannel)
+{
+    return S_OPENAL_PickChannelBase(
+        iEntNum, iEntChannel, MAX_SOUNDSYSTEM_CHANNELS_3D, MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D - 1
+    );
+}
+
+/*
+==============
+S_OPENAL_PickChannel2DStreamed
+==============
+*/
+static int S_OPENAL_PickChannel2DStreamed(int iEntNum, int iEntChannel)
+{
+    return S_OPENAL_PickChannelBase(
+        iEntNum,
+        iEntChannel,
+        MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D,
+        MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D + MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM - 1
+    );
+}
+
+/*
+==============
+callbackServer
+==============
+*/
+void callbackServer(int entnum, int channel_number, const char *name)
+{
+    if (!com_sv_running->integer) {
+        return;
+    }
+
+    SV_SoundCallback(entnum, channel_number, name);
+}
+
+/*
+==============
+S_OPENAL_Start2DSound
+==============
+*/
+static void S_OPENAL_Start2DSound(
+    const vec3_t vOrigin,
+    int          iEntNum,
+    int          iEntChannel,
+    sfx_t       *pSfx,
+    float        fVolume,
+    float        fMinDistance,
+    float        fPitch,
+    float        fMaxDistance
+)
+{
+    int             iRealEntNum;
+    int             iFreeChannel;
+    openal_channel *pChannel;
+    float           fRealVolume;
+    bool            bSupportWaitTillSoundDone;
+
+    iRealEntNum = iEntNum & ~S_FLAG_DO_CALLBACK;
+
+    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
+        iFreeChannel = S_OPENAL_PickChannel2DStreamed(iRealEntNum, iEntChannel);
+    } else {
+        iFreeChannel = S_OPENAL_PickChannel2D(iRealEntNum, iEntChannel);
+    }
+
+    if (iFreeChannel < 0) {
+        Com_DPrintf(
+            "OpenAL: Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            (pSfx->iFlags & SFX_FLAG_STREAMED) ? "2Dstreamed" : "2D",
+            pSfx->name,
+            iRealEntNum,
+            S_ChannelNumToName(iEntChannel)
+        );
+        return;
+    }
+
+    if (iEntNum & S_FLAG_DO_CALLBACK) {
+        callbackServer(iRealEntNum, iFreeChannel, pSfx->name);
+    }
+
+    pChannel = openal.channel[iFreeChannel];
+    pChannel->force_free();
+
+    if (fVolume < 0) {
+        fVolume = 1;
+    }
+
+    fRealVolume       = S_GetBaseVolume() * fVolume;
+    pChannel->fVolume = fVolume;
+
+    if (pChannel->iEntChannel == CHAN_LOCAL) {
+        pChannel->iFlags |= CHANNEL_FLAG_LOCAL_LISTENER;
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_LOCAL_LISTENER;
+    }
+    pChannel->iFlags &= ~CHANNEL_FLAG_PAUSED;
+
+    if (fMinDistance < 0.0) {
+        fMinDistance = 200.0;
+    }
+    pChannel->fMinDist = fMinDistance;
+
+    if (fMaxDistance < 0.0) {
+        fMaxDistance = pChannel->fMinDist * 64;
+    }
+    pChannel->fMaxDist = fMaxDistance;
+
+    pChannel->fNewPitchMult = fPitch;
+    pChannel->pSfx          = pSfx;
+    pChannel->iEntNum       = iRealEntNum;
+    pChannel->iEntChannel   = iEntChannel;
+    if (iRealEntNum == ENTITYNUM_NONE) {
+        VectorClear(pChannel->vOrigin);
+        pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = 0;
+
+        if (vOrigin) {
+            VectorCopy(vOrigin, pChannel->vOrigin);
+        }
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = iRealEntNum;
+        if (vOrigin) {
+            VectorCopy(vOrigin, pChannel->vOrigin);
+
+            bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
+            pChannel->iTime           = cl.serverTime - 1;
+            if (bSupportWaitTillSoundDone) {
+                pChannel->iTime = 0;
+            }
+
+            if (s_entity[iEntNum].time < pChannel->iTime) {
+                // Fixed in OPM
+                //  Not sure if it's the real solution, but script_origin entities are usually
+                //  never sent to client so the sound will immediately get stopped
+                pChannel->iFlags |= CHANNEL_FLAG_MISSING_ENT;
+            }
+        } else {
+            VectorClear(pChannel->vOrigin);
+            pChannel->iTime = 0;
+        }
+    }
+
+    pChannel->iStartTime = cl.serverTime;
+    pChannel->iEndTime   = (int)(cl.serverTime + pSfx->time_length + 250.f);
+
+    if (iFreeChannel > MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D) {
+        // streamed
+        if (!pChannel->set_sfx(pSfx)) {
+            Com_DPrintf("OpenAL: Set stream error - %s\n", pSfx->name);
+            return;
+        }
+
+        pChannel->iBaseRate = pChannel->sample_playback_rate();
+        pChannel->set_no_3d();
+        fRealVolume = fRealVolume * s_fVolumeGain;
+    } else {
+        pChannel->stop();
+        pChannel->set_no_3d();
+        pChannel->set_sfx(pSfx);
+    }
+
+    pChannel->set_gain(fRealVolume);
+    pChannel->play();
+
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf(
+            "OpenAL: 2D - %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            cl.serverTime,
+            iFreeChannel,
+            pSfx->name,
+            fVolume,
+            fMinDistance,
+            fMaxDistance
+        );
+    }
+}
+
+/*
+==============
+S_OPENAL_StartSound
+==============
+*/
+void S_OPENAL_StartSound(
+    const vec3_t vOrigin,
+    int          iEntNum,
+    int          iEntChannel,
+    sfxHandle_t  sfxHandle,
+    float        fVolume,
+    float        fMinDist,
+    float        fPitch,
+    float        fMaxDist,
+    qboolean     bStreamed
+)
+{
+    int             iChannel;
+    openal_channel *pChannel;
+    sfx_info_t     *pSfxInfo;
+    sfx_t          *pSfx;
+    ALint           state;
+    bool            bOnlyUpdate;
+    bool            bSupportWaitTillSoundDone;
+
+    bOnlyUpdate = false;
+    pSfx        = &s_knownSfx[sfxHandle];
+    if (bStreamed) {
+        pSfx->iFlags |= SFX_FLAG_STREAMED;
+    }
+
+    if (!S_OPENAL_ShouldPlay(pSfx)) {
+        Com_DPrintf("OpenAL: ^~^~^ Not playing sound '%s'\n", pSfx->name);
+        return;
+    }
+
+    if ((pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3))
+        || iEntChannel == CHAN_MENU || iEntChannel == CHAN_LOCAL) {
+        S_OPENAL_Start2DSound(vOrigin, iEntNum, iEntChannel, pSfx, fVolume, fMinDist, fPitch, fMaxDist);
+        return;
+    }
+
+    bSupportWaitTillSoundDone = (iEntNum & S_FLAG_DO_CALLBACK) != 0;
+    iEntNum &= ~S_FLAG_DO_CALLBACK;
+
+    pSfxInfo = &sfx_infos[pSfx->sfx_info_index];
+    if (pSfx->iFlags & SFX_FLAG_STREAMED) {
+        Com_DPrintf("OpenAL: 3D sounds not supported - couldn't play '%s'\n", pSfx->name);
+        return;
+    }
+
+    iChannel = S_OPENAL_PickChannel3D(iEntNum, iEntChannel);
+    if (iChannel < 0) {
+        Com_DPrintf(
+            "OpenAL: Couldn't play %s sound '%s' for entity %i on channel %s\n",
+            (pSfx->iFlags & SFX_FLAG_STREAMED) ? "3Dstreamed" : "3D",
+            pSfx->name,
+            iEntNum,
+            S_ChannelNumToName(iEntChannel)
+        );
+        return;
+    }
+
+    if (bSupportWaitTillSoundDone) {
+        callbackServer(iEntNum, iChannel, pSfx->name);
+    }
+
+    pChannel                = &openal.chan_3D[iChannel];
+    pChannel->fNewPitchMult = fPitch;
+    pChannel->iEntChannel   = iEntChannel;
+    pChannel->iFlags &= ~(CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
+    state = pChannel->sample_status();
+
+    if (pChannel->iEntNum == iEntNum && (state == AL_PLAYING || state == AL_PAUSED) && pChannel->pSfx == pSfx) {
+        bOnlyUpdate = true;
+    } else {
+        pChannel->stop();
+        pChannel->iFlags &= ~(CHANNEL_FLAG_LOOPING | CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_LOCAL_LISTENER);
+        if (!pChannel->set_sfx(pSfx)) {
+            Com_DPrintf("OpenAL: Set sample error - %s\n", pSfx->name);
+            return;
+        }
+    }
+
+    if (fMinDist < 0.0) {
+        fMinDist = 200.0;
+        fMaxDist = 12800.0;
+    }
+    pChannel->fMinDist = fMinDist;
+    pChannel->fMaxDist = fMaxDist;
+
+    if (fVolume < 0.0) {
+        fVolume = 1.0;
+    }
+
+    pChannel->fVolume = S_GetBaseVolume() * fVolume;
+    pChannel->set_gain(pChannel->fVolume);
+
+    // Fixed in OPM
+    //  Setup the channel for 3D
+    pChannel->set_3d();
+
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf(
+            "OpenAL: %d (#%i) - %s (vol %f, mindist %f, maxdist %f)\n",
+            cl.serverTime,
+            iChannel,
+            pSfx->name,
+            pChannel->fVolume,
+            fMinDist,
+            fMaxDist
+        );
+    }
+
+    pChannel->set_velocity(0, 0, 0);
+    if (iEntNum == ENTITYNUM_NONE) {
+        if (vOrigin) {
+            VectorCopy(vOrigin, pChannel->vOrigin);
+        } else {
+            //VectorClear(vOrigin);
+            // Fixed in OPM
+            //  Tiny mistake found in original where the vOrigin parameter is set to 0
+            VectorClear(pChannel->vOrigin);
+        }
+
+        pChannel->set_position(pChannel->vOrigin[0], pChannel->vOrigin[1], pChannel->vOrigin[2]);
+        pChannel->iFlags |= CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = 0;
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_NO_ENTITY;
+        pChannel->iEntNum = iEntNum;
+        if (vOrigin) {
+            VectorCopy(vOrigin, pChannel->vOrigin);
+
+            bSupportWaitTillSoundDone = cl.serverTime - 1 < 0;
+            pChannel->iTime           = cl.serverTime - 1;
+            if (bSupportWaitTillSoundDone) {
+                pChannel->iTime = 0;
+            }
+
+            if (s_entity[iEntNum].time < pChannel->iTime) {
+                // Fixed in OPM
+                //  Not sure if it's the real solution, but script_origin entities are usually
+                //  never sent to client so the sound will immediately get stopped
+                pChannel->iFlags |= CHANNEL_FLAG_MISSING_ENT;
+            }
+        } else {
+            VectorClear(pChannel->vOrigin);
+            pChannel->iTime = 0;
+        }
+        pChannel->set_position(pChannel->vOrigin[0], pChannel->vOrigin[1], pChannel->vOrigin[2]);
+    }
+
+    if (pSfxInfo->loop_start != -1) {
+        pChannel->set_sample_loop_block(pSfxInfo->loop_start, pSfxInfo->loop_end);
+        pChannel->set_sample_loop_count(0);
+
+        pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
+        if (s_show_sounds->integer) {
+            Com_DPrintf("OpenAL: loopblock - %d to %d\n", pSfxInfo->loop_start, pSfxInfo->loop_end);
+        }
+    } else {
+        pChannel->set_sample_loop_count(1);
+    }
+
+    if (!bOnlyUpdate && S_OPENAL_ShouldStart(pChannel->vOrigin, pChannel->fMinDist, pChannel->fMaxDist)) {
+        // Fixed in OPM
+        //  Make sure to set the pitch before playing the sound
+        pChannel->iBaseRate = pSfx->info.rate;
+        pChannel->set_sample_playback_rate(pChannel->iBaseRate * pChannel->fNewPitchMult);
+        pChannel->fNewPitchMult = 0;
+
+        pChannel->play();
+        pChannel->iEndTime   = cl.serverTime + (int)pChannel->pSfx->time_length + 250;
+        pChannel->iStartTime = cl.serverTime;
+    }
+}
+
+/*
+==============
+S_OPENAL_AddLoopingSound
+==============
+*/
+void S_OPENAL_AddLoopingSound(
+    const vec3_t vOrigin,
+    const vec3_t vVelocity,
+    sfxHandle_t  sfxHandle,
+    float        fVolume,
+    float        fMinDist,
+    float        fMaxDist,
+    float        fPitch,
+    int          iFlags
+)
+{
+    int                  i;
+    int                  iFreeLoopSound;
+    sfx_t               *pSfx;
+    openal_loop_sound_t *pLoopSound;
+
+    iFreeLoopSound = -1;
+    pSfx           = &s_knownSfx[sfxHandle];
+    if (!pSfx || !pSfx->length) {
+        return;
+    }
+
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+        pLoopSound = &openal.loop_sounds[i];
+        if (pLoopSound->pSfx == pSfx && !pLoopSound->bInUse) {
+            iFreeLoopSound = i;
+            break;
+        }
+    }
+
+    if (iFreeLoopSound < 0) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+            pLoopSound = &openal.loop_sounds[i];
+            if (!pLoopSound->pSfx && !pLoopSound->bInUse) {
+                iFreeLoopSound       = i;
+                pLoopSound->bPlaying = false;
+                break;
+            }
+        }
+    }
+
+    if (iFreeLoopSound < 0) {
+        if (cls.realtime >= s_iNextLoopingWarning) {
+            Com_DPrintf("OpenAL: Too many looping sounds\n");
+            s_iNextLoopingWarning = cls.realtime + 1000;
+        }
+        return;
+    }
+
+    pLoopSound = &openal.loop_sounds[iFreeLoopSound];
+    VectorCopy(vOrigin, pLoopSound->vOrigin);
+    VectorCopy(vVelocity, pLoopSound->vVelocity);
+    pLoopSound->pSfx        = pSfx;
+    pLoopSound->bInUse      = true;
+    pLoopSound->iStartTime  = cls.realtime;
+    pLoopSound->fBaseVolume = fVolume;
+    pLoopSound->fMinDist    = fMinDist;
+    pLoopSound->fMaxDist    = fMaxDist;
+    pLoopSound->fPitch      = fPitch;
+    pLoopSound->iFlags      = iFlags;
+    pLoopSound->bCombine    = VectorCompare(vVelocity, vec_zero) == 0;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pSfx && openal.loop_sounds[i].bInUse) {
+                pLoopSound->iStartTime = openal.loop_sounds[i].iStartTime;
+                if (openal.loop_sounds[i].bPlaying) {
+                    pLoopSound->bPlaying = true;
+                    pLoopSound->iChannel = openal.loop_sounds[i].iChannel;
+                }
+            }
+        }
+    }
+}
+
+/*
+==============
+S_OPENAL_StopLoopingSound
+==============
+*/
+void S_OPENAL_StopLoopingSound(openal_loop_sound_t *pLoopSound)
+{
+    bool            bMayStop;
+    int             i;
+    openal_channel *pChannel;
+
+    if (!pLoopSound->bPlaying) {
+        return;
+    }
+    bMayStop = true;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx && openal.loop_sounds[i].bInUse) {
+                bMayStop = false;
+                break;
+            }
+        }
+    }
+
+    if (bMayStop) {
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf(
+                "OpenAL: %d (#%i) - stopped loop - %s\n",
+                cl.serverTime,
+                pLoopSound->iChannel,
+                openal.channel[pLoopSound->iChannel]->pSfx->name
+            );
+        }
+        openal.channel[pLoopSound->iChannel]->force_free();
+    }
+    pLoopSound->pSfx     = NULL;
+    pLoopSound->bPlaying = false;
+
+    if (pLoopSound->bCombine) {
+        for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+            if (openal.loop_sounds[i].pSfx == pLoopSound->pSfx) {
+                openal.loop_sounds[i].bPlaying = false;
+                openal.loop_sounds[i].pSfx     = NULL;
+            }
+        }
+    }
+}
+
+/*
+==============
+S_OPENAL_ClearLoopingSounds
+==============
+*/
+void S_OPENAL_ClearLoopingSounds()
+{
+    int i;
+
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+        openal.loop_sounds[i].bInUse = false;
+    }
+}
+
+/*
+==============
+S_OPENAL_StopLoopingSounds
+==============
+*/
+void S_OPENAL_StopLoopingSounds()
+{
+    int i;
+
+    for (i = 0; i < (MAX_SOUNDSYSTEM_CHANNELS_3D + MAX_SOUNDSYSTEM_CHANNELS_2D); i++) {
+        openal.loop_sounds[i].bInUse = false;
+        S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
+    }
+}
+
+/*
+==============
+S_OPENAL_StopSound
+==============
+*/
+void S_OPENAL_StopSound(int iEntNum, int iEntChannel)
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (!pChannel->is_free() && pChannel->iEntNum == iEntNum && pChannel->iEntChannel == iEntChannel) {
+            pChannel->end_sample();
+            break;
+        }
+    }
+}
+
+/*
+==============
+S_OPENAL_StopAllSounds
+==============
+*/
+void S_OPENAL_StopAllSounds(qboolean bStopMusic)
+{
+    int i;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    S_OPENAL_StopLoopingSounds();
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        openal_channel *pChannel = openal.channel[i];
+        if (pChannel) {
+            pChannel->force_free();
+        }
+    }
+
+    if (bStopMusic) {
+        MUSIC_FreeAllSongs();
+        S_TriggeredMusic_Stop();
+    }
+}
+
+/*
+==============
+S_OPENAL_Start2DLoopSound
+==============
+*/
+static int S_OPENAL_Start2DLoopSound(
+    openal_loop_sound_t *pLoopSound, float fVolume, float fVolumeToPlay, float fMinDistance, const vec3_t vLoopOrigin
+)
+{
+    int             iChannel;
+    int             iSoundOffset;
+    openal_channel *pChannel;
+
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
+        iChannel = S_OPENAL_PickChannel2DStreamed(0, 0);
+    } else {
+        iChannel = S_OPENAL_PickChannel2D(0, 0);
+    }
+
+    if (iChannel < 0) {
+        Com_DPrintf("OpenAL: Could not find a free 2D sound channel\n");
+        return iChannel;
+    }
+
+    pChannel = openal.channel[iChannel];
+    pChannel->force_free();
+    pChannel->fVolume = fVolume;
+
+    if (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN) {
+        pChannel->iFlags |= CHANNEL_FLAG_LOCAL_LISTENER;
+    } else {
+        pChannel->iFlags &= ~CHANNEL_FLAG_LOCAL_LISTENER;
+    }
+    pChannel->fMinDist = fMinDistance;
+
+    if (!pChannel->set_sfx(pLoopSound->pSfx)) {
+        Com_DPrintf("OpenAL: Set sample error (loopsound) - %s\n", pLoopSound->pSfx->name);
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
+        return -1;
+    }
+
+    pChannel->iEntNum     = 0;
+    pChannel->iEntChannel = 0;
+    pChannel->pSfx        = pLoopSound->pSfx;
+    pChannel->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
+    pChannel->iBaseRate = pChannel->sample_playback_rate();
+    VectorCopy(vLoopOrigin, pChannel->vOrigin);
+
+    iSoundOffset = (int)(pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
+                         * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0);
+    pChannel->set_sample_offset(iSoundOffset % pLoopSound->pSfx->length);
+    pChannel->set_sample_loop_count(0);
+    pChannel->fVolume = fVolumeToPlay;
+    pChannel->set_gain(fVolumeToPlay);
+    pChannel->start_sample();
+    if (s_show_sounds->integer > 0) {
+        Com_DPrintf(
+            "OpenAL: %d (#%i) - %s (vol %f)\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name, fVolume
+        );
+    }
+
+    return iChannel;
+}
+
+/*
+==============
+S_OPENAL_Start3DLoopSound
+==============
+*/
+static int S_OPENAL_Start3DLoopSound(
+    openal_loop_sound_t *pLoopSound,
+    float                fVolumeToPlay,
+    float                fMinDistance,
+    float                fMaxDistance,
+    const vec3_t         vLoopOrigin,
+    const vec3_t         vListenerOrigin
+)
+{
+    int             iChannel;
+    vec3_t          vDir;
+    int             iSoundOffset;
+    openal_channel *pChan3D;
+
+    if (pLoopSound->pSfx->iFlags & SFX_FLAG_STREAMED) {
+        return -1;
+    }
+
+    if (!pLoopSound->pSfx->data || !pLoopSound->pSfx->length) {
+        return -1;
+    }
+
+    iChannel = S_OPENAL_PickChannel3D(0, 0);
+    if (iChannel < 0) {
+        Com_DPrintf("OpenAL: Could not find a free channel\n");
+        return iChannel;
+    }
+
+    pChan3D = &openal.chan_3D[iChannel];
+    pChan3D->force_free();
+    pChan3D->iEntNum     = 0;
+    pChan3D->iEntChannel = 0;
+    pChan3D->fMinDist    = fMinDistance;
+    pChan3D->fMaxDist    = fMaxDistance;
+    pChan3D->set_3d();
+
+    if (!pChan3D->set_sfx(pLoopSound->pSfx)) {
+        Com_DPrintf("OpenAL: Set sample error - %s\n", pLoopSound->pSfx->name);
+        return -1;
+    }
+
+    pChan3D->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
+    VectorScale(pLoopSound->vVelocity, s_fVelocityScale, pLoopSound->vVelocity);
+    pChan3D->set_velocity(pLoopSound->vVelocity[0], pLoopSound->vVelocity[1], pLoopSound->vVelocity[2]);
+    pChan3D->pSfx = pLoopSound->pSfx;
+    pChan3D->iFlags |= CHANNEL_FLAG_PAUSED | CHANNEL_FLAG_NO_ENTITY;
+    pChan3D->iBaseRate = pChan3D->sample_playback_rate();
+
+    iSoundOffset = (int)((int)pLoopSound->pSfx->info.width * pLoopSound->pSfx->info.rate
+                         * (float)(cls.realtime - pLoopSound->iStartTime) / 1000.0)
+                 % pLoopSound->pSfx->length;
+    pChan3D->set_sample_offset(iSoundOffset);
+    pChan3D->set_sample_loop_count(0);
+    pChan3D->fVolume = fVolumeToPlay;
+    pChan3D->set_gain(fVolumeToPlay);
+    pChan3D->play();
+
+    S_OPENAL_reverb(iChannel, s_iReverbType, s_fReverbLevel);
+
+    return iChannel;
+}
+
+/*
+==============
+S_OPENAL_UpdateLoopSound
+==============
+*/
+static bool S_OPENAL_UpdateLoopSound(
+    openal_loop_sound_t *pLoopSound,
+    float                fVolumeToPlay,
+    float                fMinDistance,
+    float                fMaxDistance,
+    const vec3_t         vListenerOrigin,
+    const vec3_t         vTempAxis,
+    const vec3_t         vLoopOrigin
+)
+{
+    openal_channel *pChannel;
+    float           fVolume;
+    float           fMaxVolume;
+    vec3_t          vDir;
+    float           fDistance;
+
+    pChannel = openal.channel[pLoopSound->iChannel];
+    if (!pChannel) {
+        return false;
+    }
+
+    if (pChannel->pSfx != pLoopSound->pSfx) {
+        pLoopSound->bPlaying = 0;
+        return false;
+    }
+
+    pChannel->iStartTime = cl.serverTime;
+
+    if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET) || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+        || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+        vec3_t vOrigin;
+        int    iPan;
+
+        pChannel->fVolume = fVolumeToPlay / s_fVolumeGain;
+        fVolume           = S_GetBaseVolume() * pChannel->fVolume;
+        fMaxVolume        = fVolume;
+
+        if (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN) {
+            // Center the sound
+            iPan = 64;
+        } else {
+            VectorCopy(vLoopOrigin, vOrigin);
+            iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+
+            VectorSubtract(vListenerOrigin, vOrigin, vDir);
+            // Clamp the volume by distance
+            fDistance = VectorLength(vDir);
+            if (pChannel->fMinDist >= fDistance) {
+                fVolume = fMaxVolume;
+            } else {
+                fVolume = pChannel->fMinDist / fDistance * fMaxVolume;
+            }
+        }
+
+        pChannel->set_gain(fVolume);
+        pChannel->set_sample_pan(iPan);
+    } else {
+        pChannel->set_position(vLoopOrigin[0], vLoopOrigin[1], vLoopOrigin[2]);
+        pChannel->fVolume = fVolumeToPlay;
+        pChannel->set_gain(fVolumeToPlay);
+    }
+
+    if (s_bReverbChanged) {
+        // Make sure to update the reverb
+        S_OPENAL_reverb(pLoopSound->iChannel, s_iReverbType, s_fReverbLevel);
+    }
+
+    return true;
+}
+
+/*
+==============
+S_OPENAL_AddLoopSounds
+==============
+*/
+void S_OPENAL_AddLoopSounds(const vec3_t vTempAxis)
+{
+    int                  i, j;
+    static int           iLoopFrame = 0;
+    float                fDistance;
+    int                  iChannel;
+    vec3_t               vListenerOrigin;
+    vec3_t               vLoopOrigin;
+    openal_loop_sound_t *pLoopSound;
+    float                fTotalVolume;
+    float                fVolumeToPlay;
+    float                fMinDistance, fMaxDistance;
+    float                fVolume;
+    float                fPitch;
+    float                fMaxVolume, fMaxFactor;
+    openal_channel      *pChannel;
+    bool                 bAlreadyAdded[MAX_SOUNDSYSTEM_LOOP_SOUNDS] = {false};
+    vec3_t               alvec;
+
+    qalGetListenerfv(AL_POSITION, alvec);
+    VectorCopy(alvec, vListenerOrigin);
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_LOOP_SOUNDS; i++) {
+        vec3_t vDir;
+
+        if (bAlreadyAdded[i]) {
+            continue;
+        }
+
+        pLoopSound = &openal.loop_sounds[i];
+        if (!pLoopSound->pSfx) {
+            continue;
+        }
+        pChannel = openal.channel[pLoopSound->iChannel];
+
+        fMinDistance = pLoopSound->fMinDist;
+        if (fMinDistance < 0) {
+            fMinDistance = 200;
+        }
+
+        fMaxDistance = pLoopSound->fMaxDist;
+        if (fMaxDistance < 0) {
+            fMaxDistance = fMinDistance * 64;
+        }
+
+        fVolume = pLoopSound->fBaseVolume;
+        if (fVolume < 0) {
+            fVolume = 1;
+        }
+        fVolume = fVolume * s_fAmbientVolume;
+
+        fTotalVolume = 0.0;
+        fMaxVolume   = 0.0;
+
+        if (pLoopSound->bPlaying) {
+            pChannel->fNewPitchMult = pLoopSound->fPitch;
+        }
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    VectorSubtract(pLoopSound2->vOrigin, vListenerOrigin, vDir);
+                    VectorCopy(vDir, pLoopSound2->vRelativeOrigin);
+                    fDistance = VectorLength(pLoopSound2->vRelativeOrigin);
+
+                    if (fDistance <= fMinDistance) {
+                        fVolumeToPlay = fVolume;
+                    } else if (fDistance >= fMaxDistance) {
+                        fVolumeToPlay = 0;
+                    } else {
+                        fVolumeToPlay = fMinDistance * fMinDistance * fVolume / (fDistance * fDistance);
+                    }
+
+                    if (fMaxVolume < fVolumeToPlay) {
+                        fMaxVolume = fVolumeToPlay;
+                    }
+                    fTotalVolume += fVolumeToPlay;
+                    bAlreadyAdded[j] = true;
+                }
+            }
+        } else {
+            VectorSubtract(pLoopSound->vOrigin, vListenerOrigin, vDir);
+            VectorCopy(vDir, pLoopSound->vRelativeOrigin);
+            fDistance = VectorLength(pLoopSound->vRelativeOrigin);
+
+            if (fDistance <= fMinDistance) {
+                fTotalVolume = fVolume;
+            } else if (fDistance >= fMaxDistance) {
+                fTotalVolume = 0;
+            } else {
+                fTotalVolume = fMinDistance * fMinDistance * fVolume / (fDistance * fDistance);
+            }
+            pLoopSound->fVolume = fTotalVolume;
+            fMaxVolume          = fTotalVolume;
+        }
+
+        fMaxFactor = sfx_infos[pLoopSound->pSfx->sfx_info_index].max_factor;
+        if (fMaxFactor >= 1 && fMaxVolume * fMaxFactor < fTotalVolume) {
+            fTotalVolume = fMaxVolume * fMaxFactor;
+        }
+
+        if (fTotalVolume <= 0 && !(pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+            if (pLoopSound->bPlaying) {
+                if (s_show_sounds->integer > 0) {
+                    Com_DPrintf(
+                        "OpenAL: %d (#%i) - stopped loop - %s\n",
+                        cl.serverTime,
+                        pLoopSound->iChannel,
+                        openal.channel[pLoopSound->iChannel]->pSfx->name
+                    );
+                }
+
+                pChannel->stop();
+                pLoopSound->bPlaying = false;
+                if (pLoopSound->bCombine) {
+                    for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                        openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                        if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                            pLoopSound2->bPlaying = false;
+                        }
+                    }
+                }
+            }
+
+            continue;
+        }
+
+        VectorClear(vLoopOrigin);
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    VectorNormalize(pLoopSound2->vRelativeOrigin);
+
+                    VectorScale(
+                        pLoopSound2->vRelativeOrigin, pLoopSound2->fVolume / fTotalVolume, pLoopSound2->vRelativeOrigin
+                    );
+                    VectorAdd(pLoopSound2->vRelativeOrigin, vLoopOrigin, vLoopOrigin);
+                }
+            }
+
+            VectorNormalize(vLoopOrigin);
+            VectorMA(vListenerOrigin, fMinDistance * 0.5f, vLoopOrigin, vLoopOrigin);
+        } else {
+            VectorCopy(pLoopSound->vOrigin, vLoopOrigin);
+        }
+
+        if (pLoopSound->bPlaying) {
+            S_OPENAL_UpdateLoopSound(
+                pLoopSound,
+                S_GetBaseVolume() * s_fVolumeGain * fTotalVolume,
+                fMinDistance,
+                fMaxDistance,
+                vListenerOrigin,
+                vTempAxis,
+                vLoopOrigin
+            );
+
+            continue;
+        }
+
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf(
+                "OpenAL: %d (#%i) - started loop - %s\n", cl.serverTime, pLoopSound->iChannel, pLoopSound->pSfx->name
+            );
+        }
+
+        if (pLoopSound->pSfx->iFlags & (SFX_FLAG_NO_OFFSET)
+            || pLoopSound->pSfx->iFlags & (SFX_FLAG_STREAMED | SFX_FLAG_MP3)
+            || (pLoopSound->iFlags & LOOPSOUND_FLAG_NO_PAN)) {
+            iChannel = S_OPENAL_Start2DLoopSound(
+                pLoopSound, fVolume, S_GetBaseVolume() * s_fVolumeGain * fTotalVolume, fMinDistance, vLoopOrigin
+            );
+        } else {
+            iChannel = S_OPENAL_Start3DLoopSound(
+                pLoopSound,
+                S_GetBaseVolume() * s_fVolumeGain * fTotalVolume,
+                fMinDistance,
+                fMaxDistance,
+                vLoopOrigin,
+                vListenerOrigin
+            );
+        }
+
+        if (iChannel < 0) {
+            continue;
+        }
+
+        pLoopSound->bPlaying = true;
+        pLoopSound->iChannel = iChannel;
+
+        if (pLoopSound->bCombine) {
+            for (j = 0; j < MAX_LOOP_SOUNDS; j++) {
+                openal_loop_sound_t *pLoopSound2 = &openal.loop_sounds[j];
+
+                if (pLoopSound2->pSfx == pLoopSound->pSfx) {
+                    pLoopSound2->bPlaying = true;
+                    pLoopSound2->iChannel = iChannel;
+                }
+            }
+        }
+    }
+}
+
+/*
+==============
+S_OPENAL_Respatialize
+==============
+*/
+void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3])
+{
+    int             i;
+    vec3_t          vOrigin;
+    vec3_t          vVelocity;
+    vec3_t          vEntOrigin;
+    vec3_t          vEntVelocity;
+    vec3_t          vDir;
+    vec3_t          vUp;
+    vec3_t          vListenerOrigin;
+    int             iPan;
+    vec3_t          vTempAxis;
+    float           fMaxVolume;
+    float           fVolume;
+    float           fDist;
+    openal_channel *pChannel;
+    vec3_t          alvec {0};
+    vec3_t          alorientation[2];
+
+    if (cls.no_menus) {
+        return;
+    }
+
+    s_iListenerNumber = iEntNum;
+
+    //
+    // Velocity
+    //
+    VectorCopy(s_entity[iEntNum].velocity, alvec);
+    VectorScale(alvec, s_fVelocityScale, alvec);
+    qalListenerfv(AL_VELOCITY, alvec);
+    alDieIfError();
+
+    //
+    // Position
+    //
+    VectorCopy(vHeadPos, alvec);
+    VectorCopy(alvec, vListenerOrigin);
+    qalListenerfv(AL_POSITION, alvec);
+    alDieIfError();
+
+    //
+    // Orientation
+    //
+    alorientation[0][0] = vAxis[0][0];
+    alorientation[0][1] = vAxis[0][1];
+    alorientation[0][2] = vAxis[0][2];
+    alorientation[1][0] = vAxis[2][0];
+    alorientation[1][1] = vAxis[2][1];
+    alorientation[1][2] = vAxis[2][2];
+    qalListenerfv(AL_ORIENTATION, (const ALfloat *)alorientation);
+    alDieIfError();
+
+    VectorCopy(vAxis[1], vTempAxis);
+
+    fVolume = 1;
+    iPan    = 64;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        pChannel   = openal.channel[i];
+        fMaxVolume = S_GetBaseVolume() * pChannel->fVolume;
+
+        if (!pChannel) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        if (pChannel->iFlags & CHANNEL_FLAG_PAUSED) {
+            continue;
+        }
+
+        if (pChannel->iFlags & CHANNEL_FLAG_NO_ENTITY) {
+            VectorCopy(pChannel->vOrigin, vOrigin);
+
+            if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
+                VectorCopy(vListenerOrigin, vOrigin);
+                if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
+                    fVolume = fMaxVolume;
+                    iPan    = 64;
+                } else {
+                    pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
+                }
+            } else {
+                if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
+                    iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+                    VectorSubtract(vListenerOrigin, vOrigin, vDir);
+
+                    fDist = VectorLength(vDir);
+                    if (fDist <= pChannel->fMinDist + 0.001f) {
+                        fVolume = fMaxVolume;
+                    } else if (fDist >= pChannel->fMaxDist - 0.001f) {
+                        fVolume = 0;
+                    } else {
+                        fVolume = (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist))
+                                * fMaxVolume;
+                    }
+                } else {
+                    pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
+                }
+            }
+        } else if (pChannel->iFlags & CHANNEL_FLAG_LOCAL_LISTENER) {
+            VectorCopy(vListenerOrigin, vOrigin);
+            if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
+                fVolume = fMaxVolume;
+                iPan    = 64;
+            } else {
+                pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
+            }
+        } else {
+            if (s_entity[pChannel->iEntNum].time < pChannel->iTime) {
+                VectorCopy(pChannel->vOrigin, vOrigin);
+                if (!(pChannel->iFlags & CHANNEL_FLAG_LOOPING) && !(pChannel->iFlags & (CHANNEL_FLAG_MISSING_ENT))) {
+                    pChannel->end_sample();
+                    continue;
+                }
+            } else {
+                pChannel->iFlags &= ~CHANNEL_FLAG_MISSING_ENT;
+
+                VectorCopy(s_entity[pChannel->iEntNum].position, vEntOrigin);
+                VectorCopy(vEntOrigin, vOrigin);
+                VectorCopy(vOrigin, pChannel->vOrigin);
+                pChannel->iTime = s_entity[pChannel->iEntNum].time;
+            }
+
+            if (s_entity[pChannel->iEntNum].use_listener) {
+                VectorCopy(vListenerOrigin, vOrigin);
+            }
+
+            if (pChannel->iEntNum == s_iListenerNumber) {
+                if (vListenerOrigin[0] == vOrigin[0] && vListenerOrigin[2] == vOrigin[2]) {
+                    float fDelta = vListenerOrigin[1] - vOrigin[1];
+
+                    if (fDelta > 89.9f && fDelta < 90.09f) {
+                        VectorCopy(vListenerOrigin, vOrigin);
+                    }
+                }
+            }
+
+            if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
+                iPan = S_OPENAL_SpatializeStereoSound(vListenerOrigin, vTempAxis, vOrigin);
+                VectorSubtract(vListenerOrigin, vOrigin, vDir);
+                fDist = VectorLength(vDir);
+                if (fDist <= pChannel->fMinDist + 0.001f) {
+                    fVolume = fMaxVolume;
+                } else if (fDist >= pChannel->fMaxDist - 0.001f) {
+                    fVolume = 0;
+                } else {
+                    fVolume =
+                        (1.0 - (fDist - pChannel->fMinDist) / (pChannel->fMaxDist - pChannel->fMinDist)) * fMaxVolume;
+                }
+            } else {
+                pChannel->set_position(vOrigin[0], vOrigin[1], vOrigin[2]);
+                VectorCopy(s_entity[pChannel->iEntNum].velocity, vEntVelocity);
+                VectorCopy(vEntVelocity, vVelocity);
+                VectorScale(vVelocity, s_fVelocityScale, vVelocity);
+                pChannel->set_velocity(vVelocity[0], vVelocity[1], vVelocity[2]);
+            }
+        }
+
+        if (i >= MAX_SOUNDSYSTEM_CHANNELS_3D) {
+            pChannel->set_gain(fVolume);
+            pChannel->set_sample_pan(iPan);
+        }
+
+        if (s_bReverbChanged) {
+            S_OPENAL_reverb(i, s_iReverbType, s_fReverbLevel);
+        }
+    }
+
+    S_OPENAL_AddLoopSounds(vTempAxis);
+    s_bReverbChanged = false;
+}
+
+/*
+==============
+S_OPENAL_SpatializeStereoSound
+==============
+*/
+static int S_OPENAL_SpatializeStereoSound(const vec3_t listener_origin, const vec3_t listener_left, const vec3_t origin)
+{
+    float  lscale, rscale;
+    vec3_t source_vec;
+    float  pan;
+
+    VectorSubtract(origin, listener_origin, source_vec);
+    VectorNormalize(source_vec);
+
+    pan = s_separation->value + (1.f - s_separation->value) * -DotProduct(listener_left, source_vec);
+
+    if (pan < 0) {
+        pan = 0;
+    }
+
+    return ceilf(pan * 127);
+}
+
+/*
+==============
+S_OPENAL_reverb
+==============
+*/
+static void S_OPENAL_reverb(int iChannel, int iReverbType, float fReverbLevel)
+{
+    // FIXME: Connect source to effect slot
+    //  see https://github.com/kcat/openal-soft/blob/master/examples/alreverb.c
+
+    // No reverb currently.
+}
+
+/*
+==============
+S_OPENAL_SetReverb
+==============
+*/
+void S_OPENAL_SetReverb(int iType, float fLevel)
+{
+    s_fReverbLevel = fLevel;
+    s_iReverbType  = iType;
+    if (al_use_reverb) {
+        s_bReverbChanged = true;
+    }
+
+    // FIXME: generate effect and auxiliary effect slot
+    //  or destroy them
+    //  see https://github.com/kcat/openal-soft/blob/master/examples/alreverb.c
+}
+
+/*
+==============
+S_OPENAL_Update
+==============
+*/
+void S_OPENAL_Update()
+{
+    int             i;
+    openal_channel *pChannel;
+
+    if (cl.snap.ps.stats[STAT_CINEMATIC]) {
+        S_SetGlobalAmbientVolumeLevel(0.5f);
+    } else {
+        S_SetGlobalAmbientVolumeLevel(1.f);
+    }
+
+    if (paused->integer && !s_bSoundPaused) {
+        S_PauseSound();
+    } else if (!paused->integer && s_bSoundPaused) {
+        S_UnpauseSound();
+    }
+
+    if (s_bFading) {
+        s_fFadeVolume = 1.f - (cls.realtime - s_fFadeStartTime) / (s_fFadeStopTime - s_fFadeStartTime);
+        if (s_fFadeVolume < 0) {
+            s_fFadeVolume = 0;
+        }
+        music_volume_changed = true;
+    }
+
+    if (s_volume->modified) {
+        if (s_volume->value > 1) {
+            Cvar_Set("s_volume", "1.0");
+        } else if (s_volume->value < 0) {
+            Cvar_Set("s_volume", "0.0");
+        }
+
+        music_volume_changed = true;
+        s_volume->modified   = 0;
+        al_current_volume    = Square(s_volume->value);
+        qalListenerf(AL_GAIN, al_current_volume);
+        alDieIfError();
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        pChannel = openal.channel[i];
+        if (!pChannel) {
+            continue;
+        }
+
+        if (!pChannel->is_playing()) {
+            continue;
+        }
+
+        if (pChannel->fNewPitchMult <= 0) {
+            continue;
+        }
+
+        pChannel->set_sample_playback_rate(pChannel->iBaseRate * pChannel->fNewPitchMult);
+        pChannel->fNewPitchMult = 0;
+    }
+
+    if (s_speaker_type->modified) {
+        Cbuf_AddText("snd_restart\n");
+        s_speaker_type->modified = false;
+    }
+
+    if (s_reverb->modified) {
+        s_reverb->modified = false;
+
+        if (s_reverb->integer) {
+            if (al_use_reverb) {
+                S_OPENAL_SetReverb(s_iReverbType, s_fReverbLevel);
+            } else {
+                Com_Printf("OpenAL: No reverb support. Reverb is disabled.\n");
+            }
+        } else if (al_use_reverb) {
+            S_OPENAL_SetReverb(0, 0);
+        }
+    }
+
+    if (s_show_num_active_sounds->integer == 1) {
+        int num = 0;
+
+        for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+            pChannel = openal.channel[i];
+            if (pChannel && pChannel->is_playing()) {
+                ++num;
+            }
+        }
+        Com_DPrintf("OpenAL: Number of active sounds = %d\n", num);
+    }
+
+    Music_Update();
+
+    for (i = 0; i < MAX_LOOP_SOUNDS; i++) {
+        if (!openal.loop_sounds[i].bInUse) {
+            S_OPENAL_StopLoopingSound(&openal.loop_sounds[i]);
+        }
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_CHANNELS; i++) {
+        openal.channel[i]->update();
+    }
+}
+
+/*
+==============
+S_OPENAL_GetMusicFilename
+==============
+*/
+const char *S_OPENAL_GetMusicFilename()
+{
+    // Don't call into the channel if QAL initialisation did not succeed.
+    if (!al_initialized) {
+        return "";
+    }
+
+    if (!openal.chan_trig_music.is_playing() && !openal.chan_trig_music.is_paused()) {
+        return "";
+    }
+
+    return openal.tm_filename;
+}
+
+/*
+==============
+S_OPENAL_GetMusicLoopCount
+==============
+*/
+int S_OPENAL_GetMusicLoopCount()
+{
+    return openal.tm_loopcount;
+}
+
+/*
+==============
+S_OPENAL_GetMusicOffset
+==============
+*/
+unsigned int S_OPENAL_GetMusicOffset()
+{
+    return openal.chan_trig_music.sample_offset();
+}
+
+/*
+==============
+S_IsSoundPlaying
+==============
+*/
+qboolean S_IsSoundPlaying(int channel_number, const char *sfxName)
+{
+    openal_channel *pChannel = openal.channel[channel_number];
+    if (!pChannel) {
+        return false;
+    }
+
+    if (s_bSoundPaused) {
+        return false;
+    }
+
+    if (!pChannel->is_playing()) {
+        return false;
+    }
+
+    if (!pChannel->pSfx) {
+        return false;
+    }
+
+    if (strcmp(sfxName, pChannel->pSfx->name)) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+==============
+S_StoreBase
+==============
+*/
+static void S_StoreBase(channelbasesavegame_t *pBase, openal_channel *pChannel)
+{
+    if (!pChannel) {
+        return;
+    }
+
+    if (pChannel->iEntChannel == CHAN_MENU || pChannel->is_free()) {
+        pBase->bPlaying      = false;
+        pBase->iOffset       = 0;
+        pBase->iLoopCount    = 0;
+        pBase->sfx.szName[0] = 0;
+        pBase->sfx.iFlags    = 0;
+        pBase->fNewPitchMult = 1.f;
+        pBase->iBaseRate     = pChannel->iBaseRate;
+        pBase->iStatus       = 0;
+    } else {
+        pBase->bPlaying   = true;
+        pBase->iOffset    = pChannel->sample_offset();
+        pBase->iLoopCount = pChannel->sample_loop_count();
+        memcpy(pBase->sfx.szName, pChannel->pSfx->name, sizeof(pBase->sfx.szName));
+        pBase->sfx.iFlags    = pChannel->pSfx->iFlags;
+        pBase->iBaseRate     = pChannel->iBaseRate;
+        pBase->iStatus       = 0;
+        pBase->fNewPitchMult = (float)pBase->iBaseRate / (float)pChannel->sample_playback_rate();
+    }
+
+    pBase->iStartTime                = pChannel->iStartTime - cl.serverTime;
+    pBase->iEndTime                  = pChannel->iEndTime - cl.serverTime;
+    pBase->iEntChannel               = pChannel->iEntChannel;
+    pBase->iEntNum                   = pChannel->iEntNum;
+    pBase->iFlags                    = pChannel->iFlags;
+    pBase->fMaxDist                  = pChannel->fMaxDist;
+    pBase->fMinDist                  = pChannel->fMinDist;
+    pBase->iNextCheckObstructionTime = 0;
+    VectorCopy(pChannel->vOrigin, pBase->vOrigin);
+    pBase->iTime   = pChannel->iTime - cl.serverTime;
+    pBase->fVolume = pChannel->fVolume;
+}
+
+/*
+==============
+S_StartSoundFromBase
+==============
+*/
+static void
+S_StartSoundFromBase(channelbasesavegame_t *pBase, openal_channel *pChannel, sfx_t *pSfx, bool bStartUnpaused)
+{
+    if (!pChannel->set_sfx(pSfx)) {
+        Com_DPrintf("OpenAL: Set sample error - %s\n", pSfx->name);
+        pChannel->iFlags &= ~CHANNEL_FLAG_PLAY_DEFERRED;
+        return;
+    }
+
+    pChannel->iBaseRate = pChannel->sample_playback_rate();
+
+    if (sfx_infos[pSfx->sfx_info_index].loop_start != -1) {
+        pChannel->set_sample_loop_block(
+            sfx_infos[pSfx->sfx_info_index].loop_start, sfx_infos[pSfx->sfx_info_index].loop_end
+        );
+        pChannel->set_sample_loop_count(1);
+        pChannel->iFlags |= CHANNEL_FLAG_LOOPING;
+        if (s_show_sounds->integer > 0) {
+            Com_DPrintf(
+                "OpenAL: loopblock - %d to %d\n",
+                sfx_infos[pSfx->sfx_info_index].loop_start,
+                sfx_infos[pSfx->sfx_info_index].loop_end
+            );
+        }
+    } else {
+        pChannel->set_sample_loop_count(1);
+    }
+
+    pChannel->set_gain(pChannel->fVolume);
+    pChannel->set_sample_offset(pBase->iOffset);
+    pChannel->set_sample_playback_rate(pChannel->iBaseRate * pBase->fNewPitchMult);
+
+    if (bStartUnpaused) {
+        pChannel->resume_sample();
+    } else {
+        pChannel->iFlags |= CHANNEL_FLAG_PLAY_DEFERRED;
+    }
+
+    if (pChannel->iEntNum != ENTITYNUM_NONE) {
+        s_entity[pChannel->iEntNum].time = pChannel->iTime;
+        VectorCopy(pChannel->vOrigin, s_entity[pChannel->iEntNum].position);
+    }
+}
+
+/*
+==============
+S_LoadBase
+==============
+*/
+static void S_LoadBase(channelbasesavegame_t *pBase, openal_channel *pChannel, bool bStartUnpaused)
+{
+    sfxHandle_t handle;
+
+    if (!pChannel) {
+        return;
+    }
+
+    if (!pBase->bPlaying) {
+        return;
+    }
+
+    if (strstr(pBase->sfx.szName, "null.wav")) {
+        return;
+    }
+
+    handle = S_RegisterSound(pBase->sfx.szName, (pBase->sfx.iFlags & SFX_FLAG_STREAMED), false);
+
+    pChannel->iBaseRate     = pBase->iBaseRate;
+    pChannel->iStartTime    = pBase->iStartTime;
+    pChannel->iEndTime      = pBase->iEndTime;
+    pChannel->iEntChannel   = pBase->iEntChannel;
+    pChannel->iEntNum       = pBase->iEntNum;
+    pChannel->iFlags        = pBase->iFlags;
+    pChannel->fMaxDist      = pBase->fMaxDist;
+    pChannel->fMinDist      = pBase->fMinDist;
+    pChannel->fNewPitchMult = pBase->fNewPitchMult;
+    VectorCopy(pBase->vOrigin, pChannel->vOrigin);
+    pChannel->iTime   = pBase->iTime;
+    pChannel->fVolume = pBase->fVolume;
+    pChannel->pSfx    = &s_knownSfx[handle];
+
+    S_StartSoundFromBase(pBase, pChannel, &s_knownSfx[handle], bStartUnpaused);
+}
+
+/*
+==============
+S_SaveData
+==============
+*/
+void S_SaveData(soundsystemsavegame_t *pSave)
+{
+    int  i;
+    bool bSoundWasUnpaused;
+
+    bSoundWasUnpaused = !s_bSoundPaused;
+    if (!s_bSoundPaused) {
+        S_PauseSound();
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        S_StoreBase(&pSave->Channels[i], openal.channel[i]);
+    }
+
+    if (bSoundWasUnpaused) {
+        S_UnpauseSound();
+    }
+}
+
+/*
+==============
+S_ReLoad
+==============
+*/
+void S_ReLoad(soundsystemsavegame_t *pSave)
+{
+    int  i;
+    bool bSoundWasUnpaused;
+
+    bSoundWasUnpaused = !s_bSoundPaused;
+    if (!s_bSoundPaused) {
+        S_PauseSound();
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        S_LoadBase(&pSave->Channels[i], openal.channel[i], bSoundWasUnpaused);
+    }
+
+    if (bSoundWasUnpaused) {
+        S_UnpauseSound();
+    }
+}
+
+/*
+==============
+S_InitBase
+==============
+*/
+static void S_InitBase(channelbasesavegame_t *pBase)
+{
+    if (!pBase->bPlaying) {
+        return;
+    }
+
+    if (strstr(pBase->sfx.szName, "null.wav")) {
+        return;
+    }
+
+    SV_AddSvsTimeFixup(&pBase->iStartTime);
+    SV_AddSvsTimeFixup(&pBase->iEndTime);
+    SV_AddSvsTimeFixup(&pBase->iTime);
+}
+
+/*
+==============
+S_LoadData
+==============
+*/
+void S_LoadData(soundsystemsavegame_t *pSave)
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_POSITION_CHANNELS; i++) {
+        S_InitBase(&pSave->Channels[i]);
+    }
+}
+
+/*
+==============
+openal_channel::set_velocity
+==============
+*/
+void openal_channel::set_velocity(float v0, float v1, float v2)
+{
+    qalSource3f(source, AL_VELOCITY, v0, v1, v2);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_position
+==============
+*/
+void openal_channel::set_position(float v0, float v1, float v2)
+{
+    qalSource3f(source, AL_POSITION, v0, v1, v2);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_gain
+==============
+*/
+void openal_channel::set_gain(float gain)
+{
+    qalSourcef(source, AL_GAIN, gain);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_no_3d
+==============
+*/
+void openal_channel::set_no_3d()
+{
+    qalSource3f(source, AL_POSITION, 0, 0, 0);
+    alDieIfError();
+    qalSource3f(source, AL_VELOCITY, 0, 0, 0);
+    alDieIfError();
+    qalSourcei(source, AL_SOURCE_RELATIVE, true);
+    alDieIfError();
+    qalSourcei(source, AL_LOOPING, false);
+    alDieIfError();
+    qalSourcei(source, AL_ROLLOFF_FACTOR, 0);
+    alDieIfError();
+    qalSourcef(source, AL_GAIN, S_GetBaseVolume());
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_3d
+==============
+*/
+void openal_channel::set_3d()
+{
+    qalSourcei(source, AL_SOURCE_RELATIVE, false);
+    alDieIfError();
+    qalSourcei(source, AL_LOOPING, false);
+    alDieIfError();
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 1.0f);
+    alDieIfError();
+    qalSourcef(source, AL_GAIN, S_GetBaseVolume());
+    alDieIfError();
+    qalSourcei(source, AL_DISTANCE_MODEL, AL_LINEAR_DISTANCE_CLAMPED);
+    alDieIfError();
+    //
+    // Added in OPM
+    //
+    if (fMinDist > 0) {
+        qalSourcef(source, AL_REFERENCE_DISTANCE, fMinDist);
+        alDieIfError();
+    }
+    if (fMaxDist > 0) {
+        qalSourcef(source, AL_MAX_DISTANCE, fMaxDist);
+        alDieIfError();
+    }
+}
+
+/*
+==============
+openal_channel::play
+==============
+*/
+void openal_channel::play()
+{
+    qalSourcePlay(source);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_no_virtualization
+==============
+*/
+void openal_channel::set_no_virtualization()
+{
+#if AL_SOFT_direct_channels_remix
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_REMIX_UNMATCHED_SOFT);
+    alDieIfError();
+#elif AL_SOFT_direct_channels
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_TRUE);
+    alDieIfError();
+#endif
+}
+
+/*
+==============
+openal_channel::set_virtualization
+==============
+*/
+void openal_channel::set_virtualization()
+{
+#if AL_SOFT_direct_channels_remix || AL_SOFT_direct_channels
+    qalSourcei(source, AL_DIRECT_CHANNELS_SOFT, AL_FALSE);
+    alDieIfError();
+#endif
+}
+
+/*
+==============
+openal_channel::pause
+==============
+*/
+void openal_channel::pause()
+{
+    qalSourcePause(source);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::stop
+==============
+*/
+void openal_channel::stop()
+{
+    qalSourceStop(source);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::is_free
+==============
+*/
+bool openal_channel::is_free()
+{
+    ALint state = sample_status();
+
+    return state == AL_INITIAL || state == AL_STOPPED;
+}
+
+/*
+==============
+openal_channel::is_paused
+==============
+*/
+bool openal_channel::is_paused()
+{
+    ALint state = sample_status();
+
+    return state == AL_PAUSED;
+}
+
+/*
+==============
+openal_channel::is_playing
+==============
+*/
+bool openal_channel::is_playing()
+{
+    ALint state = sample_status();
+
+    return state == AL_PLAYING;
+}
+
+/*
+==============
+openal_channel::force_free
+==============
+*/
+void openal_channel::force_free()
+{
+    stop();
+    iFlags = 0;
+}
+
+/*
+==============
+openal_channel::set_sfx
+==============
+*/
+bool openal_channel::set_sfx(sfx_t *pSfx)
+{
+    ALint freq = 0;
+
+    assert(pSfx->length);
+
+    this->pSfx = pSfx;
+    if (!pSfx->buffer || !qalIsBuffer(pSfx->buffer)) {
+        if (pSfx->iFlags & SFX_FLAG_MP3) {
+            qalGenBuffers(1, &pSfx->buffer);
+            alDieIfError();
+
+            if (!S_OPENAL_LoadMP3_Codec(pSfx->name, pSfx)) {
+                qalDeleteBuffers(1, &pSfx->buffer);
+                alDieIfError();
+
+                Com_DPrintf("OpenAL: Failed to load MP3.\n");
+                return false;
+            }
+
+            alDieIfError();
+        } else {
+            ALenum fmt = S_OPENAL_Format(pSfx->info.width, pSfx->info.channels);
+
+            if (!fmt) {
+                Com_Printf(
+                    "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+                    pSfx->info.channels,
+                    (int)(pSfx->info.width * 8),
+                    pSfx->name
+                );
+                return false;
+            }
+
+            if (pSfx->info.dataalign > 1 && !soft_block_align) {
+                Com_DPrintf(
+                    "OpenAL: Alignment specified but AL doesn't support block alignment (%d).", pSfx->info.dataalign
+                );
+                return false;
+            }
+
+            qalGenBuffers(1, &pSfx->buffer);
+            alDieIfError();
+
+#if AL_SOFT_block_alignment
+            if (pSfx->info.dataalign > 1) {
+                qalBufferi(pSfx->buffer, AL_UNPACK_BLOCK_ALIGNMENT_SOFT, pSfx->info.dataalign);
+                alDieIfError();
+            }
+#endif
+
+            qalBufferData(
+                pSfx->buffer,
+                fmt,
+                &pSfx->data[pSfx->info.dataofs],
+                pSfx->info.datasize - pSfx->info.dataofs,
+                pSfx->info.rate
+            );
+            alDieIfError();
+        }
+    }
+
+    qalSourceStop(source);
+    alDieIfError();
+
+    qalSourcei(source, AL_BUFFER, pSfx->buffer);
+    alDieIfError();
+
+    qalSourcef(source, AL_PITCH, 1.0);
+    alDieIfError();
+
+    // Get the base frequency
+    qalGetBufferi(pSfx->buffer, AL_FREQUENCY, &freq);
+    alDieIfError();
+
+    iBaseRate = freq;
+
+    return true;
+}
+
+/*
+==============
+openal_channel::start_sample
+==============
+*/
+void openal_channel::start_sample()
+{
+    play();
+}
+
+/*
+==============
+openal_channel::stop_sample
+==============
+*/
+void openal_channel::stop_sample()
+{
+    pause();
+}
+
+/*
+==============
+openal_channel::resume_sample
+==============
+*/
+void openal_channel::resume_sample()
+{
+    play();
+}
+
+/*
+==============
+openal_channel::end_sample
+==============
+*/
+void openal_channel::end_sample()
+{
+    stop();
+}
+
+/*
+==============
+openal_channel::set_sample_pan
+==============
+*/
+void openal_channel::set_sample_pan(S32 pan)
+{
+    const float   panning           = (pan - 64) / 127.f;
+    const ALfloat sourcePosition[3] = {panning, 0, sqrtf(1.f - Square(panning))};
+
+    qalSourcef(source, AL_ROLLOFF_FACTOR, 0);
+    qalSourcei(source, AL_SOURCE_RELATIVE, AL_TRUE);
+    qalSourcefv(source, AL_POSITION, sourcePosition);
+}
+
+/*
+==============
+openal_channel::set_sample_playback_rate
+==============
+*/
+void openal_channel::set_sample_playback_rate(S32 rate)
+{
+    // Fixed in OPM
+    //  Set the pitch in OpenAL
+    qalSourcef(source, AL_PITCH, rate / (float)iBaseRate);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::sample_playback_rate
+==============
+*/
+S32 openal_channel::sample_playback_rate()
+{
+    float pitch = 1;
+    ALint freq  = 0;
+
+    // Fixed in OPM
+    //  The sample rate varies according to the pitch
+    qalGetSourcef(source, AL_PITCH, &pitch);
+    alDieIfError();
+
+    return buffer_frequency() * pitch;
+}
+
+/*
+==============
+openal_channel::buffer_frequency
+==============
+*/
+U32 openal_channel::buffer_frequency() const
+{
+    ALint freq = 0;
+
+    if (buffer) {
+        qalGetBufferi(buffer, AL_FREQUENCY, &freq);
+        alDieIfError();
+    } else if (pSfx) {
+        qalGetBufferi(pSfx->buffer, AL_FREQUENCY, &freq);
+        alDieIfError();
+    } else {
+        freq = 22050;
+    }
+
+    return freq;
+}
+
+/*
+==============
+openal_channel::sample_volume
+==============
+*/
+S32 openal_channel::sample_volume()
+{
+    ALfloat gain = 0;
+
+    qalGetSourcef(source, AL_GAIN, &gain);
+    alDieIfError();
+
+    return (gain / S_GetBaseVolume()) * 100;
+}
+
+/*
+==============
+openal_channel::sample_offset
+==============
+*/
+U32 openal_channel::sample_offset()
+{
+    ALint offset = 0;
+
+    qalGetSourcei(source, AL_SAMPLE_OFFSET, &offset);
+    alDieIfError();
+
+    return offset;
+}
+
+/*
+==============
+openal_channel::sample_ms_offset
+==============
+*/
+U32 openal_channel::sample_ms_offset()
+{
+    if (!is_playing()) {
+        return 0;
+    }
+
+    return sample_offset() * 1000ull / sample_playback_rate();
+}
+
+/*
+==============
+openal_channel::sample_loop_count
+==============
+*/
+U32 openal_channel::sample_loop_count()
+{
+    ALuint queued;
+    ALuint processed;
+    S32    left;
+
+    qalGetSourceiv(source, AL_BUFFERS_QUEUED, (ALint *)&queued);
+    alDieIfError();
+    qalGetSourcei(source, AL_BUFFERS_PROCESSED, (ALint *)&processed);
+    alDieIfError();
+
+    left = queued + ~processed;
+    if (left < 0) {
+        left = 0;
+    }
+    return left;
+}
+
+/*
+==============
+openal_channel::set_sample_offset
+==============
+*/
+void openal_channel::set_sample_offset(U32 offset)
+{
+    qalSourcei(source, AL_SAMPLE_OFFSET, offset);
+    alDieIfError();
+}
+
+/*
+==============
+openal_channel::set_sample_ms_offset
+==============
+*/
+void openal_channel::set_sample_ms_offset(U32 offset)
+{
+    set_sample_offset(offset * sample_playback_rate() / 1000);
+}
+
+/*
+==============
+openal_channel::set_sample_loop_count
+==============
+*/
+void openal_channel::set_sample_loop_count(S32 count)
+{
+    ALuint processed = 0;
+
+    stop();
+
+    qalGetSourceiv(source, AL_BUFFERS_PROCESSED, (ALint *)&processed);
+    alDieIfError();
+
+    for (ALuint i = 0; i < processed; i++) {
+        ALuint bufName;
+
+        qalSourceUnqueueBuffers(source, 1, &bufName);
+        alDieIfError();
+    }
+
+    if (buffer) {
+        for (S32 i = 0; i < count; i++) {
+            qalSourceQueueBuffers(source, 1, &buffer);
+            alDieIfError();
+        }
+    }
+
+    if (count == 0) {
+        qalSourcei(source, AL_LOOPING, true);
+        alDieIfError();
+    } else {
+        qalSourcei(source, AL_LOOPING, false);
+        alDieIfError();
+    }
+}
+
+/*
+==============
+openal_channel::set_sample_loop_block
+==============
+*/
+void openal_channel::set_sample_loop_block(S32 start_offset, S32 end_offset)
+{
+    // FIXME: unimplemented
+    STUB_DESC("sample_loop_block");
+}
+
+/*
+==============
+openal_channel::sample_status
+==============
+*/
+U32 openal_channel::sample_status()
+{
+    ALint retval;
+
+    qalGetSourcei(source, AL_SOURCE_STATE, &retval);
+    alDieIfError();
+
+    return retval;
+}
+
+/*
+==============
+MUSIC_LoadSoundtrackFile
+==============
+*/
+qboolean MUSIC_LoadSoundtrackFile(const char *filename)
+{
+    song_t *psong = NULL;
+    char    args[MAX_MUSIC_SONGS][MAX_RES_NAME];
+    int     numargs;
+    char    com_token[MAX_STRING_CHARS];
+    char    alias[128];
+    char    file[128];
+    char    load_path[128];
+    char   *buffer;
+    char    path[MAX_RES_NAME];
+    int     i;
+    byte   *data;
+
+    if (strrchr(filename, '.')) {
+        Com_sprintf(path, sizeof(path), "%s", filename);
+    } else {
+        Com_sprintf(path, sizeof(path), "%s.mus", filename);
+    }
+
+    music_numsongs = 0;
+
+    FS_ReadFile(path, (void **)&data);
+    if (!data) {
+        Com_DPrintf("OpenAL: Couldn't load %s\n", path);
+        return false;
+    }
+    Com_DPrintf("SOUNDTRACK: Loading %s\n", path);
+
+    MUSIC_StopAllSongs();
+
+    buffer       = (char *)data;
+    load_path[0] = 0;
+
+    while (1) {
+        Q_strncpyz(com_token, COM_GetToken(&buffer, true), sizeof(com_token));
+        if (!com_token[0]) {
+            break;
+        }
+
+        if (strlen(com_token) >= MAX_RES_NAME) {
+            Com_Printf("MUSIC_LoadSoundtrackFile: argument too long, truncating in %s\n", path);
+            com_token[MAX_RES_NAME - 1] = 0;
+        }
+
+        numargs = 1;
+        Q_strncpyz(args[0], com_token, sizeof(args[0]));
+
+        while (1) {
+            Q_strncpyz(com_token, COM_GetToken(&buffer, false), sizeof(com_token));
+            if (!com_token[0]) {
+                break;
+            }
+
+            if (strlen(com_token) >= MAX_RES_NAME) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: argument too long, truncating in %s\n", path);
+                com_token[MAX_RES_NAME - 1] = 0;
+            }
+
+            Q_strncpyz(args[numargs], com_token, sizeof(args[numargs]));
+            numargs++;
+        }
+
+        if (!Q_stricmp(args[0], "path")) {
+            Q_strncpyz(load_path, args[1], sizeof(load_path));
+            if (load_path[strlen(load_path) - 1] != '/' && load_path[strlen(load_path) - 1] != '\\') {
+                Q_strcat(load_path, sizeof(load_path), "/");
+            }
+        } else if (args[0][0] == '!') {
+            for (i = 0; i < music_numsongs; i++) {
+                psong = &music_songs[i];
+                if (!Q_stricmp(psong->alias, &args[0][1])) {
+                    break;
+                }
+            }
+
+            if (i == music_numsongs) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: song %s not found, command skipped in %s.\n", &args[0][1], path);
+                continue;
+            }
+
+            if (!Q_stricmp(args[1], "volume")) {
+                psong->volume = atof(args[2]);
+            } else if (!Q_stricmp(args[1], "fadetime")) {
+                psong->fadetime = atof(args[2]);
+            } else if (!Q_stricmp(args[1], "loop")) {
+                psong->flags |= 1;
+            } else if (!Q_stricmp(args[1], "restart")) {
+                psong->flags |= 2;
+            } else if (!Q_stricmp(args[1], "interrupt")) {
+                psong->fadetime = 0;
+                psong->flags |= 4 | 2;
+            } else {
+                Com_Printf(
+                    "MUSIC_LoadSoundtrackFile: unknown command %s for song %s in %s.\n", args[1], &args[0][1], path
+                );
+            }
+        } else {
+            if (numargs > 1) {
+                Q_strncpyz(alias, args[0], sizeof(alias));
+                Q_strncpyz(file, load_path, sizeof(file));
+                Q_strcat(file, sizeof(file), args[1]);
+            } else {
+                size_t len;
+
+                Q_strncpyz(file, load_path, sizeof(file));
+                Q_strcat(file, sizeof(file), args[1]);
+
+                len = strlen(args[0]);
+                if (len >= 4) {
+                    Q_strncpyz(alias, args[0], len - 4);
+                } else {
+                    alias[0] = 0;
+                }
+            }
+
+            if (music_numsongs >= MAX_MUSIC_SONGS) {
+                Com_Printf("MUSIC_LoadSoundtrackFile: Too many songs in %s, skipping %s.\n", path, alias);
+                continue;
+            }
+
+            psong = &music_songs[music_numsongs];
+            Q_strncpyz(psong->alias, alias, sizeof(psong->alias));
+            Q_strncpyz(psong->path, file, sizeof(psong->path));
+            music_songs[music_numsongs].fadetime    = 1.0;
+            music_songs[music_numsongs].volume      = 1.0;
+            music_songs[music_numsongs].flags       = 0;
+            music_songs[music_numsongs].current_pos = 0;
+            music_songs[music_numsongs].mood_num    = MusicMood_NameToNum(alias);
+            music_numsongs++;
+        }
+    }
+
+    if (!music_numsongs) {
+        Com_Printf("MUSIC_LoadSoundtrackFile: could not load %s, no songs defined.\n", path);
+        FS_FreeFile(data);
+        return false;
+    }
+
+    music_currentsong = -1;
+    FS_FreeFile(data);
+
+    if (music_current_mood == mood_none) {
+        MUSIC_UpdateMood(mood_normal, mood_normal);
+    }
+
+    return true;
+}
+
+/*
+==============
+MUSIC_SongValid
+==============
+*/
+qboolean MUSIC_SongValid(const char *mood)
+{
+    return MUSIC_FindSong(mood) != -1;
+}
+
+/*
+==============
+MUSIC_Loaded
+==============
+*/
+qboolean MUSIC_Loaded()
+{
+    return music_loaded;
+}
+
+/*
+==============
+Music_Update
+==============
+*/
+void Music_Update()
+{
+    int currentsong;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!music_active) {
+        return;
+    }
+
+    if (s_bSoundPaused) {
+        return;
+    }
+
+    MUSIC_CheckForStoppedSongs();
+
+    if (!MUSIC_Loaded() && music_active && strlen(current_soundtrack)) {
+        MUSIC_LoadSoundtrackFile(current_soundtrack);
+        music_loaded = true;
+    }
+
+    if (music_currentsong >= 0) {
+        currentsong = music_songs[music_currentsong].mood_num;
+    } else {
+        currentsong = -1;
+    }
+
+    if (music_current_mood == mood_none) {
+        if (MUSIC_Playing()) {
+            MUSIC_StopAllSongs();
+        }
+    } else if (music_current_mood != currentsong) {
+        const char *mood = MusicMood_NumToName(music_current_mood);
+        if (MUSIC_SongValid(mood) && MUSIC_Loaded() && strlen(current_soundtrack)) {
+            Com_DebugPrintf("Playing %s.\n", mood);
+            MUSIC_PlaySong(mood);
+        }
+    }
+
+    if (new_music_volume != music_volume) {
+        if (music_volume_fade_time > 0) {
+            if (music_volume_direction == 0) {
+                music_volume = (cls.realtime - music_volume_start_time) * (new_music_volume - old_music_volume)
+                                 / (music_volume_fade_time * 1000.f)
+                             + old_music_volume;
+
+                if (music_volume > new_music_volume) {
+                    music_volume         = new_music_volume;
+                    music_volume_changed = 1;
+                } else {
+                    music_volume_changed = 1;
+                }
+            } else if (music_volume_direction == 1) {
+                music_volume = 1.0
+                             - (cls.realtime - music_volume_start_time) * (old_music_volume - new_music_volume)
+                                   / (music_volume_fade_time * 1000.f);
+
+                if (music_volume >= new_music_volume) {
+                    music_volume_changed = true;
+                } else {
+                    music_volume         = new_music_volume;
+                    music_volume_changed = true;
+                }
+            } else {
+                music_volume_changed = true;
+            }
+        } else {
+            music_volume         = new_music_volume;
+            music_volume_changed = true;
+        }
+    }
+
+    MUSIC_UpdateMusicVolumes();
+}
+
+/*
+==============
+MUSIC_SongEnded
+==============
+*/
+void MUSIC_SongEnded()
+{
+    Com_DPrintf(
+        "MUSIC: Song ended, changing from [ %s ] to [ %s ]\n",
+        MusicMood_NumToName(music_current_mood),
+        MusicMood_NumToName(music_fallback_mood)
+    );
+    music_current_mood = music_fallback_mood;
+}
+
+/*
+==============
+MUSIC_NewSoundtrack
+==============
+*/
+void MUSIC_NewSoundtrack(const char *name)
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (!Q_stricmp(name, current_soundtrack)) {
+        return;
+    }
+
+    // Fixed in OPM
+    //  Make sure to not get past the end of the buffer
+    //strcpy(current_soundtrack, name);
+    Q_strncpyz(current_soundtrack, name, sizeof(current_soundtrack));
+
+    if (!Q_stricmp(current_soundtrack, "none") || !Q_stricmp(current_soundtrack, "")) {
+        music_active = qfalse;
+        if (MUSIC_Playing()) {
+            MUSIC_StopAllSongs();
+        }
+    } else {
+        music_active = qtrue;
+        MUSIC_LoadSoundtrackFile(name);
+        music_loaded = qtrue;
+    }
+}
+
+/*
+==============
+MUSIC_UpdateMood
+==============
+*/
+void MUSIC_UpdateMood(int current, int fallback)
+{
+    static int last_current_mood  = -1;
+    static int last_fallback_mood = -1;
+    static int current_mood       = -1;
+    static int fallback_mood      = -1;
+    qboolean   was_action;
+
+    if (current == current_mood && fallback == fallback_mood) {
+        return;
+    }
+
+    was_action          = current == last_current_mood && fallback == last_fallback_mood && current_mood == mood_action;
+    last_current_mood   = current_mood;
+    last_fallback_mood  = fallback_mood;
+    current_mood        = current;
+    music_current_mood  = current;
+    fallback_mood       = fallback;
+    music_fallback_mood = fallback;
+    music_active        = qtrue;
+
+    Com_DPrintf(
+        "MUSIC: changing from [ %s | %s ] to [ %s | %s ]\n",
+        MusicMood_NumToName(last_current_mood),
+        MusicMood_NumToName(last_fallback_mood),
+        MusicMood_NumToName(current_mood),
+        MusicMood_NumToName(fallback)
+    );
+
+    if (was_action) {
+        int songnum = MUSIC_FindSong(MusicMood_NumToName(current_mood));
+
+        if (songnum != -1 && (music_songs[songnum].flags & 4)) {
+            Com_DPrintf(
+                "MUSIC: restoring music from action state, skipping [ %s ] for [ %s ]\n",
+                MusicMood_NumToName(current_mood),
+                MusicMood_NumToName(fallback_mood)
+            );
+            music_current_mood = music_fallback_mood;
+        }
+    }
+}
+
+/*
+==============
+MUSIC_UpdateVolume
+==============
+*/
+void MUSIC_UpdateVolume(float volume, float fade_time)
+{
+    if (new_music_volume == volume && music_volume_fade_time == fade_time) {
+        return;
+    }
+
+    old_music_volume        = music_volume;
+    new_music_volume        = volume;
+    music_volume_fade_time  = fade_time;
+    music_volume_start_time = cls.realtime;
+
+    if (volume > music_volume) {
+        music_volume_direction = 0;
+    } else if (volume < music_volume) {
+        music_volume_direction = 1;
+    }
+}
+
+/*
+==============
+MUSIC_StopAllSongs
+==============
+*/
+void MUSIC_StopAllSongs()
+{
+    for (int i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        MUSIC_StopChannel(i);
+    }
+
+    music_currentsong = -1;
+}
+
+/*
+==============
+MUSIC_FreeAllSongs
+==============
+*/
+void MUSIC_FreeAllSongs()
+{
+    MUSIC_StopAllSongs();
+    MUSIC_UpdateMood(mood_none, mood_none);
+    current_soundtrack[0] = 0;
+    music_loaded          = false;
+
+    // Added in OPM
+    //  Clear the list of songs so the songs from previous maps
+    //  won't get played
+    music_numsongs = 0;
+}
+
+/*
+==============
+MUSIC_Playing
+==============
+*/
+qboolean MUSIC_Playing()
+{
+    return MUSIC_CurrentSongChannel() != -1;
+}
+
+/*
+==============
+MUSIC_FindSong
+==============
+*/
+int MUSIC_FindSong(const char *name)
+{
+    int i;
+
+    for (i = 0; i < music_numsongs; i++) {
+        if (!Q_stricmp(music_songs[i].alias, name)) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+/*
+==============
+S_loadsoundtrack
+==============
+*/
+void S_loadsoundtrack()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("loadsoundtrack <sound track file>\n");
+        return;
+    }
+
+    MUSIC_LoadSoundtrackFile(Cmd_Argv(1));
+    music_loaded = true;
+    Q_strncpyz(current_soundtrack, Cmd_Argv(1), sizeof(current_soundtrack));
+}
+
+/*
+==============
+S_CurrentSoundtrack
+==============
+*/
+const char *S_CurrentSoundtrack()
+{
+    return current_soundtrack;
+}
+
+/*
+==============
+S_PlaySong
+==============
+*/
+void S_PlaySong()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("playsong <song alias>\n");
+        return;
+    }
+
+    MUSIC_PlaySong(Cmd_Argv(1));
+    music_active = true;
+}
+
+/*
+==============
+MUSIC_CurrentSongChannel
+==============
+*/
+int MUSIC_CurrentSongChannel()
+{
+    int channel_number = -1;
+    int ch_idx         = 0;
+
+    for (ch_idx = 0; ch_idx < MAX_SOUNDSYSTEM_SONGS; ch_idx++) {
+        if (openal.chan_song[ch_idx].is_playing() && openal.chan_song[ch_idx].song_number == music_currentsong) {
+            channel_number = ch_idx;
+        }
+    }
+
+    return channel_number;
+}
+
+/*
+==============
+MUSIC_StopChannel
+==============
+*/
+void MUSIC_StopChannel(int channel_number)
+{
+    openal_channel *channel = &openal.chan_song[channel_number];
+
+    channel->pause();
+    if (music_songs[channel->song_number].flags & 2) {
+        music_songs[channel->song_number].current_pos = 0;
+    } else {
+        music_songs[channel->song_number].current_pos = channel->sample_ms_offset();
+    }
+
+    channel->stop();
+}
+
+/*
+==============
+MUSIC_PlaySong
+==============
+*/
+qboolean MUSIC_PlaySong(const char *alias)
+{
+    int                          channel_number;
+    song_t                      *song;
+    int                          songnum;
+    int                          channel_to_play_on;
+    int                          fading_song;
+    openal_channel_two_d_stream *song_channel;
+    unsigned int                 loop_start;
+    int                          rate;
+
+    fading_song = 0;
+    songnum     = MUSIC_FindSong(alias);
+
+    if (songnum == -1) {
+        return true;
+    }
+
+    song = &music_songs[songnum];
+
+    if (MUSIC_Playing() && songnum == music_currentsong) {
+        return true;
+    }
+
+    channel_number    = MUSIC_CurrentSongChannel();
+    music_currentsong = songnum;
+
+    if (channel_number != -1) {
+        if (song->flags & 4) {
+            MUSIC_StopChannel(channel_number);
+        } else {
+            song_channel                  = &openal.chan_song[channel_number];
+            song_channel->fading          = FADE_OUT;
+            song_channel->fade_time       = (int)song->fadetime;
+            song_channel->fade_start_time = cls.realtime;
+            fading_song                   = true;
+        }
+    }
+    channel_to_play_on = (fading_song != 0) && (channel_number == 0);
+    song_channel       = &openal.chan_song[channel_to_play_on];
+
+    if (song_channel->is_playing() || song_channel->is_paused()) {
+        MUSIC_StopChannel(channel_to_play_on);
+    }
+
+    if (!song_channel->queue_stream(song->path)) {
+        Com_DPrintf("Could not start music file '%s'!", song->path);
+        return false;
+    }
+
+    rate = song_channel->sample_playback_rate();
+
+    song_channel->song_number = songnum;
+    if (song->current_pos) {
+        song_channel->set_sample_ms_offset(song->current_pos);
+    } else {
+        song_channel->set_sample_offset(rate * 0.063f);
+    }
+
+    if (song->flags & 1) {
+        song_channel->set_sample_loop_count(0);
+        song_channel->set_sample_loop_block(rate * 0.063f, -1);
+    } else {
+        song_channel->set_sample_loop_count(1);
+    }
+
+    if (fading_song) {
+        song_channel->fading    = FADE_IN;
+        song_channel->fade_time = (int)song->fadetime;
+        song_channel->set_gain(0.0);
+        song_channel->fade_start_time = cls.realtime;
+    } else {
+        song_channel->fading = FADE_NONE;
+        song_channel->set_gain(S_GetBaseVolume() * (song->volume * s_ambientVolume->value) * s_fVolumeGain);
+    }
+
+    song_channel->play();
+
+    return true;
+}
+
+/*
+==============
+MUSIC_UpdateMusicVolumes
+==============
+*/
+void MUSIC_UpdateMusicVolumes()
+{
+    int          i;
+    unsigned int current_time;
+    float        new_volume, max_volume;
+
+    if (s_ambientVolume->modified || music_volume_changed) {
+        s_ambientVolume->modified = false;
+
+        for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+            if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+                continue;
+            }
+
+            if (openal.chan_song[i].fading != FADE_NONE) {
+                continue;
+            }
+
+            openal.chan_song[i].set_gain(
+                S_GetBaseVolume() * (music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value)
+                * s_fVolumeGain * music_volume
+            );
+        }
+    }
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+            continue;
+        }
+
+        switch (openal.chan_song[i].fading) {
+        case fade_t::FADE_IN:
+            max_volume = music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value;
+            new_volume = (unsigned int)(cls.realtime - openal.chan_song[i].fade_start_time)
+                       / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
+
+            if (new_volume > max_volume) {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (max_volume * s_fVolumeGain * music_volume));
+                openal.chan_song[i].fading = FADE_NONE;
+            } else {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * s_fVolumeGain * music_volume));
+            }
+            break;
+        case fade_t::FADE_OUT:
+            max_volume = music_songs[openal.chan_song[i].song_number].volume * s_ambientVolume->value;
+            new_volume = (unsigned int)(cls.realtime - openal.chan_song[i].fade_start_time)
+                       / (openal.chan_song[i].fade_time * 1000.f) * max_volume;
+
+            if (new_volume > 0) {
+                openal.chan_song[i].set_gain(S_GetBaseVolume() * (new_volume * s_fVolumeGain * music_volume));
+            } else {
+                MUSIC_StopChannel(i);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    if (s_musicVolume->modified || music_volume_changed) {
+        s_musicVolume->modified = false;
+        if (openal.chan_trig_music.is_playing() || openal.chan_trig_music.is_paused()) {
+            openal.chan_trig_music.set_gain(
+                S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain
+            );
+        }
+    }
+
+    music_volume_changed = false;
+}
+
+/*
+==============
+MUSIC_CheckForStoppedSongs
+==============
+*/
+void MUSIC_CheckForStoppedSongs()
+{
+    int i;
+
+    for (i = 0; i < MAX_SOUNDSYSTEM_SONGS; i++) {
+        if (!openal.chan_song[i].is_playing()) {
+            continue;
+        }
+
+        if (openal.chan_song[i].sample_loop_count()) {
+            continue;
+        }
+
+        MUSIC_FindSong(MusicMood_NumToName(music_fallback_mood));
+        if (!openal.chan_song[i].is_playing() && !openal.chan_song[i].is_paused()) {
+            MUSIC_SongEnded();
+        }
+    }
+}
+
+/*
+==============
+S_TriggeredMusic_SetupHandle
+==============
+*/
+void S_TriggeredMusic_SetupHandle(const char *pszName, int iLoopCount, int iOffset, qboolean autostart)
+{
+    char            *pszFilename;
+    const char      *pszRealName;
+    float            fVolume     = 1.0;
+    AliasListNode_t *pSoundAlias = NULL;
+    void            *stream      = NULL;
+
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_playing() || openal.chan_trig_music.is_paused()) {
+        Com_DPrintf("Didn't start new triggered music because some was already playing\n");
+        return;
+    }
+
+    openal.chan_trig_music.stop();
+    // Fixed in OPM
+    //  Use strncpy instead
+    //strcpy(openal.tm_filename, pszName);
+    Q_strncpyz(openal.tm_filename, pszName, sizeof(openal.tm_filename));
+
+    openal.tm_loopcount = iLoopCount;
+    openal.chan_trig_music.set_sample_loop_count(iLoopCount);
+    pszRealName = Alias_FindRandom(pszName, &pSoundAlias);
+
+    if (!pszRealName) {
+        pszRealName = pszName;
+    } else if (pSoundAlias) {
+        fVolume = random() * pSoundAlias->volumeMod + pSoundAlias->volume;
+    }
+
+    pszFilename = FS_BuildOSPath(Cvar_VariableString("fs_basepath"), FS_Gamedir(), pszRealName);
+
+    if (!openal.chan_trig_music.queue_stream(pszRealName)) {
+        S_OPENAL_InitChannel(SOUNDSYSTEM_CHANNEL_TRIGGER_MUSIC_ID, &openal.chan_trig_music);
+        Com_DPrintf("Could not start triggered music '%s'\n", pszName);
+        return;
+    }
+
+    openal.chan_trig_music.fVolume = fVolume;
+    openal.chan_trig_music.set_gain(S_GetBaseVolume() * (fVolume * s_musicVolume->value) * s_fVolumeGain);
+    openal.chan_trig_music.set_sample_loop_count(iLoopCount);
+    openal.chan_trig_music.set_sample_offset(iOffset);
+
+    // Fixed in OPM
+    //  Play the sound then pause it immediately
+    //  So it can be unpaused upon loading from save
+    openal.chan_trig_music.play();
+
+    if (!autostart) {
+        openal.chan_trig_music.pause();
+    }
+}
+
+/*
+==============
+S_TriggeredMusic_Start
+==============
+*/
+void S_TriggeredMusic_Start()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstart <sound file>\n");
+        return;
+    }
+
+    S_TriggeredMusic_SetupHandle(Cmd_Argv(1), 1, 0, true);
+}
+
+/*
+==============
+S_TriggeredMusic_StartLoop
+==============
+*/
+void S_TriggeredMusic_StartLoop()
+{
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmstartloop <sound file>\n");
+        return;
+    }
+
+    S_TriggeredMusic_SetupHandle(Cmd_Argv(1), 0, 0, true);
+}
+
+/*
+==============
+S_TriggeredMusic_Stop
+==============
+*/
+void S_TriggeredMusic_Stop()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    openal.chan_trig_music.stop();
+    // Fixed in OPM
+    //  Make sure to clear the triggered music in case snd_restart is called
+    openal.tm_filename[0] = 0;
+    openal.tm_loopcount   = 0;
+}
+
+/*
+==============
+S_TriggeredMusic_Volume
+
+Added in 2.0
+==============
+*/
+void S_TriggeredMusic_Volume()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (Cmd_Argc() != 2) {
+        Com_Printf("tmvolume <0-1>\n\n");
+        return;
+    }
+
+    openal.chan_trig_music.fVolume = atof(Cmd_Argv(1));
+    music_volume_changed           = true;
+}
+
+/*
+==============
+S_TriggeredMusic_Pause
+==============
+*/
+void S_TriggeredMusic_Pause()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_playing()) {
+        openal.chan_trig_music.pause();
+    }
+}
+
+/*
+==============
+S_TriggeredMusic_Unpause
+==============
+*/
+void S_TriggeredMusic_Unpause()
+{
+    if (!s_bSoundStarted) {
+        return;
+    }
+
+    if (openal.chan_trig_music.is_paused()) {
+        openal.chan_trig_music.play();
+    }
+
+    openal.chan_trig_music.set_gain(
+        S_GetBaseVolume() * (openal.chan_trig_music.fVolume * s_musicVolume->value) * s_fVolumeGain
+    );
+}
+
+/*
+==============
+S_TriggeredMusic_PlayIntroMusic
+==============
+*/
+void S_TriggeredMusic_PlayIntroMusic()
+{
+    S_TriggeredMusic_SetupHandle("sound/music/mus_MainTheme.mp3", 0, 0, true);
+}
+
+/*
+==============
+S_StopMovieAudio
+==============
+*/
+void S_StopMovieAudio()
+{
+    openal.chan_movie.stop();
+}
+
+/*
+==============
+S_SetupMovieAudio
+==============
+*/
+void S_SetupMovieAudio(const char *pszMovieName)
+{
+    char filename[MAX_QPATH];
+
+    S_StopMovieAudio();
+
+    COM_StripExtension(pszMovieName, filename, sizeof(filename));
+    Q_strcat(filename, sizeof(filename), ".mp3");
+
+    if (!openal.chan_movie.queue_stream(filename)) {
+        COM_StripExtension(pszMovieName, filename, sizeof(filename));
+        Q_strcat(filename, sizeof(filename), ".wav");
+
+        if (!openal.chan_movie.queue_stream(filename)) {
+            Com_DPrintf("Can't find any matching audio file for movie: %s\n", pszMovieName);
+            return;
+        }
+    }
+
+    openal.chan_movie.set_gain(S_GetBaseVolume() * 1.5f);
+    openal.chan_movie.play();
+
+    Com_DPrintf("Movie Audio setup: %s\n", filename);
+}
+
+/*
+==============
+S_CurrentMoviePosition
+==============
+*/
+int S_CurrentMoviePosition()
+{
+    return openal.chan_movie.sample_ms_offset();
+}
+
+/*
+=================
+S_AL_Format
+=================
+*/
+static ALuint S_OPENAL_Format(float width, int channels)
+{
+    ALuint format = AL_FORMAT_MONO16;
+
+    // Work out format
+    if (width == 1) {
+        if (channels == 1) {
+            format = AL_FORMAT_MONO8;
+        } else if (channels == 2) {
+            format = AL_FORMAT_STEREO8;
+        }
+    } else if (width == 2) {
+        if (channels == 1) {
+            format = AL_FORMAT_MONO16;
+        } else if (channels == 2) {
+            format = AL_FORMAT_STEREO16;
+        }
+    } else if (width == 0.5) {
+        if (ima4_ext && soft_block_align) {
+            if (channels == 1) {
+                format = AL_FORMAT_MONO_IMA4;
+            } else if (channels == 2) {
+                format = AL_FORMAT_STEREO_IMA4;
+            }
+        } else {
+            // unsupported
+            format = 0;
+        }
+    }
+
+    return format;
+}
+
+/*
+==============
+S_OPENAL_LoadMP3_Codec
+==============
+*/
+static bool S_OPENAL_LoadMP3_Codec(const char *_path, sfx_t *pSfx)
+{
+    void      *data;
+    snd_info_t info;
+    ALuint     format;
+
+    // Try to load
+    data = S_CodecLoad(_path, &info);
+    if (!data) {
+        return false;
+    }
+
+    format = S_OPENAL_Format(info.width, info.channels);
+
+    // Create a buffer
+    qalGenBuffers(1, &pSfx->buffer);
+    alDieIfError();
+
+    // Fill the buffer
+    if (info.size == 0) {
+        // We have no data to buffer, so buffer silence
+        byte dummyData[2] = {0};
+
+        qalBufferData(pSfx->buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+    } else {
+        qalBufferData(pSfx->buffer, format, data, info.size, info.rate);
+    }
+
+    alDieIfError();
+
+    // Free the memory
+    Hunk_FreeTempMemory(data);
+
+    return true;
+}
+
+/*
+==============
+openal_channel::update
+==============
+*/
+void openal_channel::update() {}
+
+/*
+==============
+openal_channel_two_d_stream::stop
+==============
+*/
+void openal_channel_two_d_stream::stop()
+{
+    openal_channel::stop();
+
+    clear_stream();
+}
+
+/*
+==============
+openal_channel_two_d_stream::set_sfx
+==============
+*/
+bool openal_channel_two_d_stream::set_sfx(sfx_t *pSfx)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    ALint         freq = 0;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    stop();
+
+    sampleLoopCount = 1;
+
+    this->pSfx = pSfx;
+    Q_strncpyz(this->fileName, pSfx->name, sizeof(this->fileName));
+
+    streamHandle = S_CodecLoad(pSfx->name, NULL);
+    if (!streamHandle) {
+        Com_DPrintf("OpenAL: Failed to load sound file.\n");
+        return false;
+    }
+
+    stream              = (snd_stream_t *)streamHandle;
+    pSfx->info.channels = stream->info.channels;
+    pSfx->info.dataofs  = stream->info.dataofs;
+    pSfx->info.datasize = stream->info.size;
+    pSfx->info.rate     = stream->info.rate;
+    pSfx->info.samples  = stream->info.samples;
+    pSfx->info.width    = stream->info.width;
+
+    pSfx->info.format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+    if (!pSfx->info.format) {
+        Com_DPrintf(
+            "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+            pSfx->info.channels,
+            (int)(pSfx->info.width * 8.f),
+            pSfx->name
+        );
+
+        S_CodecCloseStream(stream);
+        return false;
+    }
+
+    qalSourceStop(source);
+    alDieIfError();
+
+    qalGenBuffers(MAX_STREAM_BUFFERS, buffers);
+    alDieIfError();
+
+    // Read a smaller sample
+    bytesToRead      = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+    bytesRead        = S_CodecReadStream(stream, bytesToRead, rawData);
+    streamNextOffset = bytesRead;
+    if (!bytesRead) {
+        // Valid stream but no data?
+        S_CodecCloseStream(stream);
+        return true;
+    }
+
+#if AL_SOFT_block_alignment
+    if (stream->info.dataalign > 1 && soft_block_align) {
+        qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
+        alDieIfError();
+    }
+#endif
+
+    qalBufferData(buffers[currentBuf], pSfx->info.format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    iBaseRate  = stream->info.rate;
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+    streaming  = true;
+
+    return true;
+}
+
+/*
+==============
+openal_channel_two_d_stream::set_sample_loop_count
+==============
+*/
+void openal_channel_two_d_stream::set_sample_loop_count(S32 count)
+{
+    sampleLoopCount = count;
+    sampleLooped    = 0;
+}
+
+/*
+==============
+openal_channel_two_d_stream::openal_channel_two_d_stream
+==============
+*/
+openal_channel_two_d_stream::openal_channel_two_d_stream()
+{
+    int i;
+
+    streamHandle = NULL;
+    for (i = 0; i < MAX_STREAM_BUFFERS; i++) {
+        buffers[i] = 0;
+    }
+    currentBuf       = 0;
+    sampleLoopCount  = 0;
+    sampleLooped     = 0;
+    streamNextOffset = 0;
+    streaming        = false;
+}
+
+/*
+==============
+openal_channel_two_d_stream::openal_channel_two_d_stream
+==============
+*/
+openal_channel_two_d_stream::~openal_channel_two_d_stream()
+{
+    clear_stream();
+}
+
+/*
+==============
+openal_channel_two_d_stream::update
+==============
+*/
+void openal_channel_two_d_stream::update()
+{
+    snd_stream_t *stream = (snd_stream_t *)streamHandle;
+    unsigned int  bytesToRead, bytesRead;
+    ALuint        format;
+    ALint         numProcessedBuffers = 0, numQueuedBuffers = 0;
+    ALint         state = sample_status();
+    // 2 channels with a width of 2
+    char rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    if (!streaming || is_paused() || state == AL_INITIAL) {
+        return;
+    }
+
+    qalGetSourcei(source, AL_BUFFERS_PROCESSED, &numProcessedBuffers);
+    alDieIfError();
+
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    // Remove processed buffers after half of the queued buffers has been processed
+    if (numProcessedBuffers >= Q_max(numQueuedBuffers / 2, 1)) {
+        while (numProcessedBuffers-- > 0) {
+            ALuint tmpBuffer;
+            qalSourceUnqueueBuffers(source, 1, &tmpBuffer);
+        }
+    }
+
+    if (numQueuedBuffers >= MAX_STREAM_BUFFERS) {
+        return;
+    }
+
+    if (sampleLoopCount && sampleLooped >= sampleLoopCount) {
+        if (!is_playing()) {
+            // Can clear the stream
+            clear_stream();
+        }
+        return;
+    }
+
+    bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+
+    bytesRead = S_CodecReadStream(stream, bytesToRead, rawData);
+    streamNextOffset += bytesRead;
+    if (!bytesRead) {
+        S_CodecCloseStream(stream);
+
+        sampleLooped++;
+        if (sampleLoopCount && sampleLooped >= sampleLoopCount) {
+            // Finished the last loop
+            streamHandle = NULL;
+            return;
+        }
+
+        //
+        // Looped, start again from the beginning
+        //
+        streamHandle = S_CodecLoad(this->fileName, NULL);
+        if (!streamHandle) {
+            clear_stream();
+            return;
+        }
+
+        stream = (snd_stream_t *)streamHandle;
+        //
+        // Re-read the format, we never know...
+        //
+        format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+
+        bytesRead        = S_CodecReadStream(stream, bytesToRead, rawData);
+        streamNextOffset = bytesRead;
+        if (!bytesRead) {
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+            return;
+        }
+    }
+
+#if AL_SOFT_block_alignment
+    if (stream->info.dataalign > 1 && soft_block_align) {
+        qalBufferi(buffers[currentBuf], AL_UNPACK_BLOCK_ALIGNMENT_SOFT, stream->info.dataalign);
+        alDieIfError();
+    }
+#endif
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    if (!is_playing()) {
+        // The sample has stopped during stream
+        // Could be because the storage is slow enough for the buffer
+        // or because the storage was powering on after standby
+        play();
+    }
+
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+}
+
+/*
+==============
+openal_channel_two_d_stream::sample_offset
+==============
+*/
+U32 openal_channel_two_d_stream::sample_offset()
+{
+    snd_stream_t *stream              = (snd_stream_t *)streamHandle;
+    ALint         playerByteOffset    = 0;
+    ALint         numProcessedBuffers = 0;
+    ALint         numQueuedBuffers    = 0;
+    unsigned int  totalQueueLength    = 0;
+    unsigned int  bitsPerSample       = 0;
+    unsigned int  offset              = 0;
+    ALint         bits = 0, channels = 0;
+
+    if (!streaming) {
+        // no stream
+        return 0;
+    }
+
+    // Get the byte offset in the queue
+    qalGetSourcei(source, AL_BYTE_OFFSET, &playerByteOffset);
+    alDieIfError();
+
+    totalQueueLength = getQueueLength();
+    bitsPerSample    = getBitsPerSample();
+
+    assert(playerByteOffset < totalQueueLength);
+    assert(streamNextOffset >= totalQueueLength || stream);
+
+    if (streamNextOffset >= totalQueueLength) {
+        offset = streamNextOffset - totalQueueLength + playerByteOffset;
+    } else if (stream) {
+        // it probably means the sound is looped and will restart from the beginning
+        if (streamNextOffset + playerByteOffset <= totalQueueLength) {
+            // near the end of the stream
+            if (stream->info.size > totalQueueLength) {
+                offset = stream->info.size + streamNextOffset - totalQueueLength + playerByteOffset;
+            } else {
+                // the buffer is really small
+                offset = (streamNextOffset - totalQueueLength + playerByteOffset) % stream->info.size;
+            }
+        } else {
+            // it is past end of stream
+            // so, start from the beginning of the stream
+            offset = streamNextOffset + playerByteOffset - totalQueueLength;
+        }
+
+        assert(offset < stream->info.size);
+    } else {
+        offset = totalQueueLength - streamNextOffset + playerByteOffset;
+    }
+
+    return offset * 8 / bitsPerSample;
+}
+
+/*
+==============
+openal_channel_two_d_stream::buffer_frequency
+==============
+*/
+U32 openal_channel_two_d_stream::buffer_frequency() const
+{
+    unsigned int bufferId;
+    ALint        freq = 0;
+
+    bufferId = (currentBuf - 1) % MAX_STREAM_BUFFERS;
+    qalGetBufferi(buffers[bufferId], AL_FREQUENCY, &freq);
+    alDieIfError();
+
+    return freq;
+}
+
+/*
+==============
+openal_channel_two_d_stream::set_sample_offset
+==============
+*/
+void openal_channel_two_d_stream::set_sample_offset(U32 offset)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    unsigned int  byteOffset;
+    unsigned int  bitsPerSample;
+    unsigned int  streamPosition;
+    ALuint        format;
+    ALint         numQueuedBuffers;
+    bool          bWasPlaying;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    if (!streaming) {
+        return;
+    }
+
+    stream         = (snd_stream_t *)streamHandle;
+    streamPosition = getCurrentStreamPosition();
+    bitsPerSample  = getBitsPerSample();
+    byteOffset     = offset * bitsPerSample / 8;
+
+    if (byteOffset >= streamPosition && byteOffset < streamNextOffset) {
+        //
+        // Sample is in the currently streamed data
+        //
+        qalSourcei(source, AL_BYTE_OFFSET, byteOffset - streamPosition);
+        alDieIfError();
+
+        return;
+    }
+
+    bWasPlaying = is_playing();
+
+    if (stream) {
+        if (byteOffset < streamPosition) {
+            //
+            // New offset is before the current offset,
+            // reload the stream from the beginning
+            //
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+        } else if (byteOffset >= stream->info.size) {
+            //
+            // This shouldn't happen unless the file is different
+            // from the one used while saving
+            //
+            byteOffset %= stream->info.size;
+            S_CodecCloseStream(stream);
+            streamHandle = NULL;
+        }
+    }
+
+    if (!streamHandle) {
+        streamHandle = S_CodecLoad(this->fileName, NULL);
+        if (!streamHandle) {
+            clear_stream();
+            return;
+        }
+
+        stream           = (snd_stream_t *)streamHandle;
+        streamNextOffset = 0;
+    }
+
+    while (streamNextOffset <= byteOffset) {
+        streamPosition = streamNextOffset;
+
+        bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+        bytesRead   = S_CodecReadStream(stream, bytesToRead, rawData);
+        if (!bytesRead) {
+            clear_stream();
+            return;
+        }
+
+        streamNextOffset += bytesRead;
+    }
+
+    //
+    // Stop the sound and remove all buffers from the queue
+    //
+    qalSourceStop(source);
+    alDieIfError();
+
+    //
+    // Remove all buffers from the queue
+    //
+    numQueuedBuffers = 0;
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    while (numQueuedBuffers--) {
+        ALuint b;
+        qalSourceUnqueueBuffers(source, 1, &b);
+        alDieIfError();
+    }
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+
+    //
+    // Now set the source offset
+    //
+    qalSourcei(source, AL_BYTE_OFFSET, byteOffset - streamPosition);
+    alDieIfError();
+
+    if (bWasPlaying) {
+        //
+        // The sound was stopped when re-streaming
+        //
+        play();
+    }
+}
+
+/*
+==============
+openal_channel_two_d_stream::queue_stream
+==============
+*/
+bool openal_channel_two_d_stream::queue_stream(const char *fileName)
+{
+    snd_stream_t *stream;
+    unsigned int  bytesToRead, bytesRead;
+    ALint         freq   = 0;
+    ALuint        format = 0;
+    ALuint        old    = 0;
+    char          rawData[MAX_BUFFER_SAMPLES * 2 * 2];
+
+    // Store the filename so it can be looped later
+    Q_strncpyz(this->fileName, fileName, sizeof(this->fileName));
+    clear_stream();
+
+    sampleLoopCount = 1;
+
+    //
+    // Load the file
+    //
+    streamHandle = S_CodecLoad(this->fileName, NULL);
+    if (!streamHandle) {
+        return false;
+    }
+    stream = (snd_stream_t *)streamHandle;
+
+    iStartTime = cl.serverTime;
+    iEndTime   = (int)(cl.serverTime + (stream->info.samples / stream->info.rate * 1000.f));
+
+    format = S_OPENAL_Format(stream->info.width, stream->info.channels);
+    if (!format) {
+        Com_Printf(
+            "OpenAL: Bad Wave file (%d channels, %d bits) [%s].\n",
+            pSfx->info.channels,
+            (int)(pSfx->info.width * 8.f),
+            pSfx->name
+        );
+
+        S_CodecCloseStream(stream);
+        return false;
+    }
+
+    qalGenBuffers(MAX_STREAM_BUFFERS, buffers);
+    alDieIfError();
+
+    // Read a smaller sample
+    bytesToRead = Q_min(MAX_BUFFER_SAMPLES * stream->info.width * stream->info.channels, sizeof(rawData));
+    bytesRead   = S_CodecReadStream(stream, bytesToRead, rawData);
+    if (!bytesRead) {
+        // Valid stream but no data?
+        return true;
+    }
+
+    streamNextOffset = bytesRead;
+
+    qalBufferData(buffers[currentBuf], format, rawData, bytesRead, stream->info.rate);
+    alDieIfError();
+
+    qalSourceQueueBuffers(source, 1, &buffers[currentBuf]);
+    alDieIfError();
+
+    currentBuf = (currentBuf + 1) % MAX_STREAM_BUFFERS;
+
+    streaming = true;
+
+    return true;
+}
+
+/*
+==============
+openal_channel_two_d_stream::clear_stream
+==============
+*/
+void openal_channel_two_d_stream::clear_stream()
+{
+    if (!streaming) {
+        return;
+    }
+
+    qalSourceStop(source);
+    qalSourcei(source, AL_BUFFER, 0);
+    qalDeleteBuffers(MAX_STREAM_BUFFERS, buffers);
+
+    if (streamHandle) {
+        S_CodecCloseStream((snd_stream_t *)streamHandle);
+    }
+
+    fileName[0]  = 0;
+    streamHandle = NULL;
+
+    currentBuf       = 0;
+    streamNextOffset = 0;
+    streaming        = false;
+    sampleLooped     = 0;
+}
+
+/*
+==============
+openal_channel_two_d_stream::getQueueLength
+
+Return the total length of all buffers being streamed.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getQueueLength() const
+{
+    ALint        numQueuedBuffers = 0;
+    unsigned int totalQueueLength = 0;
+    unsigned int bufferId;
+    unsigned int i;
+
+    qalGetSourcei(source, AL_BUFFERS_QUEUED, &numQueuedBuffers);
+    alDieIfError();
+
+    for (i = 0; i < numQueuedBuffers; i++) {
+        ALint bufferSize = 0;
+
+        bufferId = (currentBuf - i - 1) % MAX_STREAM_BUFFERS;
+        qalGetBufferi(buffers[bufferId], AL_SIZE, &bufferSize);
+
+        totalQueueLength += bufferSize;
+    }
+
+    return totalQueueLength;
+}
+
+/*
+==============
+openal_channel_two_d_stream::getCurrentStreamPosition
+
+Return the current position in the sound being streamed.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getCurrentStreamPosition() const
+{
+    unsigned int queueLength = getQueueLength();
+
+    if (streamNextOffset >= queueLength) {
+        return streamNextOffset - queueLength;
+    } else if (streamHandle) {
+        snd_stream_t *stream = (snd_stream_t *)streamHandle;
+        return (stream->info.size + streamNextOffset - queueLength) % stream->info.size;
+    } else {
+        return queueLength - streamNextOffset;
+    }
+}
+
+/*
+==============
+openal_channel_two_d_stream::getBitsPerSample
+
+Return the number of bytes per sample.
+It assumes that all pending buffers have the same channels and bits.
+==============
+*/
+unsigned int openal_channel_two_d_stream::getBitsPerSample() const
+{
+    unsigned int bufferId;
+    ALint        bits = 0, channels = 0;
+
+    bufferId = (currentBuf - 1) % MAX_STREAM_BUFFERS;
+    qalGetBufferi(buffers[bufferId], AL_BITS, &bits);
+    alDieIfError();
+    qalGetBufferi(buffers[bufferId], AL_CHANNELS, &channels);
+    alDieIfError();
+
+    return bits * channels;
+}
diff --git a/code/client/snd_openal_new.h b/code/client/snd_openal_new.h
new file mode 100644
index 00000000..a22e2d6f
--- /dev/null
+++ b/code/client/snd_openal_new.h
@@ -0,0 +1,238 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "qal.h"
+
+#undef OPENAL
+
+typedef int          S32;
+typedef unsigned int U32;
+
+#define MAX_STREAM_BUFFERS              16
+#define MAX_BUFFER_SAMPLES              16384
+
+typedef enum {
+    FADE_NONE,
+    FADE_IN,
+    FADE_OUT
+} fade_t;
+
+typedef struct {
+    vec3_t vOrigin;
+    vec3_t vRelativeOrigin;
+    vec3_t vVelocity;
+
+    sfx_t   *pSfx;
+    qboolean bPlaying;
+
+    int   iChannel;
+    float fVolume;
+    float fPitch;
+
+    int      iStartTime;
+    qboolean bInUse;
+    qboolean bCombine;
+
+    float fBaseVolume;
+    float fMinDist;
+    float fMaxDist;
+    int   iFlags;
+} openal_loop_sound_t;
+
+struct openal_channel {
+    sfx_t *pSfx;
+    int    iEntNum;
+    int    iEntChannel;
+    vec3_t vOrigin;
+
+    float fVolume;
+    int   iBaseRate;
+    float fNewPitchMult;
+    float fMinDist;
+    float fMaxDist;
+
+    int iStartTime;
+    int iTime;
+    int iEndTime;
+    int iFlags;
+    int iPausedOffset;
+
+    int song_number;
+
+    fade_t fading;
+    int    fade_time;
+    int    fade_start_time;
+
+    ALuint   source;
+    ALuint   buffer;
+    ALubyte *bufferdata;
+
+public:
+    void         play();
+    virtual void stop();
+    void         pause();
+
+    void  set_no_3d();
+    void  set_3d();
+    void  set_no_virtualization();
+    void  set_virtualization();
+
+    void set_gain(float gain);
+    void set_velocity(float v0, float v1, float v2);
+    void set_position(float v0, float v1, float v2);
+
+    bool is_free();
+    bool is_paused();
+    bool is_playing();
+
+    void         force_free();
+    virtual bool set_sfx(sfx_t *pSfx);
+
+    void start_sample();
+    void stop_sample();
+    void resume_sample();
+    void end_sample();
+
+    void set_sample_pan(S32 pan);
+    void set_sample_playback_rate(S32 pan);
+    S32  sample_playback_rate();
+
+    S32          sample_volume();
+    virtual U32  sample_offset();
+    U32          sample_ms_offset();
+    U32          sample_loop_count();
+    virtual void set_sample_offset(U32 offset);
+    void         set_sample_ms_offset(U32 offset);
+    virtual void set_sample_loop_count(S32 count);
+    void         set_sample_loop_block(S32 start_offset, S32 end_offset);
+
+    U32 sample_status();
+
+public:
+    virtual void update();
+
+    virtual U32 buffer_frequency() const;
+};
+
+struct openal_channel_two_d_stream : public openal_channel {
+private:
+    char         fileName[64];
+    void        *streamHandle;
+    unsigned int buffers[MAX_STREAM_BUFFERS];
+    unsigned int currentBuf;
+    unsigned int sampleLoopCount;
+    unsigned int sampleLooped;
+    unsigned int streamNextOffset;
+    bool         streaming;
+
+public:
+    openal_channel_two_d_stream();
+    ~openal_channel_two_d_stream();
+
+    void stop() override;
+    bool set_sfx(sfx_t *pSfx) override;
+    void set_sample_loop_count(S32 count) override;
+    void update() override;
+    U32  sample_offset() override;
+    void set_sample_offset(U32 offset) override;
+
+    bool queue_stream(const char *fileName);
+
+protected:
+    U32 buffer_frequency() const override;
+
+private:
+    void clear_stream();
+
+    unsigned int getQueueLength() const;
+    unsigned int getCurrentStreamPosition() const;
+    unsigned int getBitsPerSample() const;
+};
+
+struct openal_movie_channel : public openal_channel {
+
+};
+
+struct openal_internal_t {
+    openal_channel              chan_3D[MAX_SOUNDSYSTEM_CHANNELS_3D];
+    openal_channel              chan_2D[MAX_SOUNDSYSTEM_CHANNELS_2D];
+    openal_channel_two_d_stream chan_2D_stream[MAX_SOUNDSYSTEM_CHANNELS_2D_STREAM];
+    openal_channel_two_d_stream chan_song[MAX_SOUNDSYSTEM_SONGS];
+    openal_channel_two_d_stream chan_mp3;
+    openal_channel_two_d_stream chan_trig_music;
+    openal_channel_two_d_stream chan_movie;
+
+    // Pointers to channels
+    openal_channel *channel[MAX_SOUNDSYSTEM_CHANNELS];
+
+    openal_loop_sound_t loop_sounds[MAX_SOUNDSYSTEM_LOOP_SOUNDS];
+
+    openal_channel movieChannel;
+    sfx_t          movieSFX;
+
+    char tm_filename[MAX_RES_NAME];
+    int  tm_loopcount;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    qboolean S_OPENAL_Init();
+    void     S_OPENAL_Shutdown();
+    void     S_OPENAL_StartSound(
+            const vec3_t vOrigin,
+            int          iEntNum,
+            int          iEntChannel,
+            sfxHandle_t  sfxHandle,
+            float        fVolume,
+            float        fMinDist,
+            float        fPitch,
+            float        fMaxDist,
+            qboolean     bStreamed
+        );
+    void S_OPENAL_AddLoopingSound(
+        const vec3_t vOrigin,
+        const vec3_t vVelocity,
+        sfxHandle_t  sfxHandle,
+        float        fVolume,
+        float        fMinDist,
+        float        fMaxDist,
+        float        fPitch,
+        int          iFlags
+    );
+    void S_OPENAL_ClearLoopingSounds();
+    void S_OPENAL_StopSound(int iEntNum, int iEntChannel);
+    void S_OPENAL_StopAllSounds(qboolean bStopMusic);
+    void S_OPENAL_Respatialize(int iEntNum, const vec3_t vHeadPos, const vec3_t vAxis[3]);
+    void S_OPENAL_SetReverb(int iType, float fLevel);
+    void S_OPENAL_Update();
+
+    const char  *S_OPENAL_GetMusicFilename();
+    int          S_OPENAL_GetMusicLoopCount();
+    unsigned int S_OPENAL_GetMusicOffset();
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/client/snd_public.h b/code/client/snd_public.h
index e37453f4..9edf4768 100644
--- a/code/client/snd_public.h
+++ b/code/client/snd_public.h
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -89,3 +91,96 @@ void S_MasterGain(float gain);
 #endif
 
 #include "new/snd_public_new.h"
+
+#else
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void S_SoundInfo_f();
+void S_SoundDump_f();
+void S_Init(qboolean full_startup);
+void S_Shutdown(qboolean full_shutdown);
+qboolean S_NameExists(const char* name);
+void S_BeginRegistration();
+qboolean S_IsSoundRegistered(const char* name);
+sfxHandle_t S_RegisterSound(const char* name, int streamed, qboolean force_load);
+float S_GetSoundTime(sfxHandle_t handle);
+void S_EndRegistration();
+void S_UpdateEntity(int entityNum, const vec3_t origin, const vec3_t vel, qboolean use_listener);
+void S_SetGlobalAmbientVolumeLevel(float volume);
+void S_StartSound(const vec3_t origin, int entnum, int entchannel, sfxHandle_t sfxHandle, float volume, float min_dist, float pitch, float maxDist, int streamed);
+void S_StartLocalSound(const char* sound_name, qboolean force_load);
+void S_StartLocalSoundChannel(const char* sound_name, qboolean force_load, soundChannel_t channel);
+void S_StopAllSounds(qboolean stop_music);
+void S_ClearLoopingSounds();
+void S_AddLoopingSound(const vec3_t origin, const vec3_t velocity, sfxHandle_t sfxHandle, float volume, float min_dist, float max_dist, float pitch, int flags);
+void S_Respatialize(int entityNum, const vec3_t head, vec3_t axis[3]);
+void S_Update();
+void S_StopSound(int entnum, int channel);
+void S_SetReverb(int reverb_type, float reverb_level);
+void S_Play();
+void S_SoundList();
+
+qboolean S_IsSoundPlaying(int channel_number, const char* sfxName);
+void S_FadeSound(float fTime);
+
+qboolean MUSIC_LoadSoundtrackFile(const char* filename);
+qboolean MUSIC_SongValid(const char* mood);
+qboolean MUSIC_Loaded();
+void Music_Update();
+void MUSIC_SongEnded();
+void MUSIC_NewSoundtrack(const char* name);
+void MUSIC_UpdateMood(int current, int fallback);
+void MUSIC_UpdateVolume(float volume, float fade_time);
+void MUSIC_StopAllSongs();
+void MUSIC_FreeAllSongs();
+qboolean MUSIC_Playing();
+int MUSIC_FindSong(const char* name);
+void S_loadsoundtrack();
+const char* S_CurrentSoundtrack();
+void S_PlaySong();
+int MUSIC_CurrentSongChannel();
+void MUSIC_StopChannel(int channel_number);
+qboolean MUSIC_PlaySong(const char* alias);
+void MUSIC_UpdateMusicVolumes();
+void MUSIC_CheckForStoppedSongs();
+void S_TriggeredMusic_SetupHandle(const char* pszName, int iLoopCount, int iOffset, qboolean autostart);
+void S_TriggeredMusic_Start();
+void S_TriggeredMusic_StartLoop();
+void S_TriggeredMusic_Stop();
+void S_TriggeredMusic_Volume();
+void S_TriggeredMusic_Pause();
+void S_TriggeredMusic_Unpause();
+void S_TriggeredMusic_PlayIntroMusic();
+void S_StopMovieAudio();
+void S_SetupMovieAudio(const char* pszMovieName);
+int S_CurrentMoviePosition();
+
+const char* S_GetMusicFilename();
+int S_GetMusicLoopCount();
+unsigned int S_GetMusicOffset();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef USE_VOIP
+void S_StartCapture( void );
+int S_AvailableCaptureSamples( void );
+void S_Capture( int samples, byte *data );
+void S_StopCapture( void );
+void S_MasterGain( float gain );
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/client/usignal.cpp b/code/client/usignal.cpp
index dad646e3..6e161b6e 100644
--- a/code/client/usignal.cpp
+++ b/code/client/usignal.cpp
@@ -120,7 +120,7 @@ bool UConnection::SendEvent
 		ptr = m_listeners.ObjectAt( i );
 		if( ptr )
 		{
-			Event *e = new Event( m_events.ObjectAt( i ) );
+			Event *e = new Event( *m_events.ObjectAt( i ) );
 
 			for( j = 1; j < numargs; j++ )
 			{
diff --git a/code/fgame/CMakeLists.txt b/code/fgame/CMakeLists.txt
index c688fa85..ed8fdc31 100644
--- a/code/fgame/CMakeLists.txt
+++ b/code/fgame/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(fgame)
 
 # Shared source files for modules
@@ -27,8 +27,24 @@ file(
 
 add_library(fgame SHARED ${SOURCES_GAME})
 
-find_package(BISON)
-find_package(FLEX)
+#
+# Workaround to get a recent version Flex and Bison executables in MacOS
+# as Bison 2.3 shipped with MacOS doesn't work
+#
+if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
+    execute_process(COMMAND brew --prefix bison RESULT_VARIABLE APP_RESULT OUTPUT_VARIABLE APP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (APP_RESULT EQUAL 0 AND EXISTS "${APP_PREFIX}")
+        set(BISON_EXECUTABLE "${APP_PREFIX}/bin/bison")
+    endif()
+
+    execute_process(COMMAND brew --prefix flex RESULT_VARIABLE APP_RESULT OUTPUT_VARIABLE APP_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (APP_RESULT EQUAL 0 AND EXISTS "${APP_PREFIX}")
+        set(FLEX_EXECUTABLE "${APP_PREFIX}/bin/flex")
+    endif()
+endif()
+
+find_package(BISON 3 REQUIRED)
+find_package(FLEX REQUIRED)
 
 if (FLEX_FOUND)
 	flex_target(fgame-lexer ${CMAKE_SOURCE_DIR}/code/parser/lex_source.txt ${CMAKE_SOURCE_DIR}/code/parser/generated/yyLexer.cpp DEFINES_FILE ${CMAKE_SOURCE_DIR}/code/parser/generated/yyLexer.h COMPILE_FLAGS "-Cem --nounistd")
@@ -50,16 +66,11 @@ target_compile_features(fgame PUBLIC cxx_nullptr)
 target_compile_features(fgame PUBLIC c_variadic_macros)
 target_link_libraries(fgame PUBLIC qcommon)
 
-set_target_properties(fgame PROPERTIES PREFIX "${TARGET_PLATFORM_PREFIX}")
-set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_ARCH_SUFFIX}")
-set_target_properties(fgame PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TARGET_BASE_GAME}")
+set_target_properties(fgame PROPERTIES PREFIX "")
+set_target_properties(fgame PROPERTIES OUTPUT_NAME "game${TARGET_BIN_SUFFIX}")
 
-INSTALL(
-	TARGETS fgame
-	LIBRARY DESTINATION "${TARGET_BASE_GAME}"
-	RUNTIME DESTINATION "${TARGET_BASE_GAME}"
-)
+INSTALL(TARGETS fgame DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
 
 if(MSVC)
-	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION "${TARGET_BASE_GAME}" OPTIONAL)
+	INSTALL(FILES $<TARGET_PDB_FILE:fgame> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
 endif()
diff --git a/code/fgame/DrivableVehicleTandem.cpp b/code/fgame/DrivableVehicleTandem.cpp
index 71af7245..164b6b6b 100644
--- a/code/fgame/DrivableVehicleTandem.cpp
+++ b/code/fgame/DrivableVehicleTandem.cpp
@@ -21,6 +21,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "DrivableVehicleTandem.h"
+#include "vehicleturret.h"
 
-// FIXME: unimplemented
+CLASS_DECLARATION(DrivableVehicle, DrivableVehicleTandem, "DrivableVehicleTandem") {
+    {NULL, NULL}
+};
+
+DrivableVehicleTandem::DrivableVehicleTandem()
+{
+}
+
+DrivableVehicleTandem::~DrivableVehicleTandem()
+{
+}
+
+void DrivableVehicleTandem::SpawnTurret(Event* ev)
+{
+    VehicleTurretGunTandem* pTurret = new VehicleTurretGunTandem();
+    int slot;
+
+    pTurret->SetBaseOrientation(orientation, NULL);
+    pTurret->setModel(ev->GetString(2));
+
+    slot = ev->GetInteger(1);
+    AttachTurretSlot(slot, pTurret, vec_zero, NULL);
+    pTurret->SetVehicleOwner(this);
+
+    pTurret->PostEvent(EV_TakeDamage, EV_POSTSPAWN);
+
+    UpdateTurretSlot(slot);
+
+    pTurret->ProcessPendingEvents();
+}
+
+void DrivableVehicleTandem::UpdateTurretSlot(int iSlot)
+{
+    DrivableVehicle::UpdateTurretSlot(iSlot);
+
+    if (Turrets[iSlot].ent && Turrets[iSlot].ent->isSubclassOf(VehicleTurretGunTandem)) {
+        VehicleTurretGunTandem* pTurret = static_cast<VehicleTurretGunTandem*>(Turrets[iSlot].ent.Pointer());
+        pTurret->UpdateLinkedTurret();
+    }
+}
 
diff --git a/code/fgame/DrivableVehicleTandem.h b/code/fgame/DrivableVehicleTandem.h
index 64b139d4..3bc5b916 100644
--- a/code/fgame/DrivableVehicleTandem.h
+++ b/code/fgame/DrivableVehicleTandem.h
@@ -21,3 +21,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #pragma once
+
+#include "vehicle.h"
+
+class DrivableVehicleTandem : public DrivableVehicle {
+private:
+    CLASS_PROTOTYPE(DrivableVehicleTandem);
+
+public:
+    DrivableVehicleTandem();
+    ~DrivableVehicleTandem();
+
+    void SpawnTurret(Event* ev) override;
+    void UpdateTurretSlot(int iSlot) override;
+};
diff --git a/code/fgame/Entities.cpp b/code/fgame/Entities.cpp
index 58d26cc7..25a53961 100644
--- a/code/fgame/Entities.cpp
+++ b/code/fgame/Entities.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,62 +31,289 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "sentient.h"
 #include "player.h"
 
-Container<ProjectileTarget*> g_projectileTargets;
+Container<ProjectileTarget *> g_projectileTargets;
 
-Event EV_PG_SetID("ID", EV_DEFAULT, "i", "ID", "Sets the ID for this projectile generator\nDefault=0:");
-Event EV_PG_SetModel(
-    "Model", EV_DEFAULT, "s", "Model", "Projectile model to use.\nDefault=models/projectiles/bazookashell.tik"
+/*QUAKED ProjectileGenerator_Target (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)
+
+  Place this target down and assign it a ProjectileGenerator ID and it will
+  shoot here....
+
+  Here are the params:
+
+  ID      <nIdNum>   (Generator ID number.)
+
+******************************************************************************/
+
+Event EV_PG_SetID
+(
+    "ID",
+    EV_DEFAULT,
+    "i",
+    "ID",
+    "Sets the ID for this projectile generator\nDefault=0:",
+    EV_NORMAL
 );
-Event EV_PG_MinDuration(
-    "MinDuration", EV_DEFAULT, "f", "MinDuration", "Sets the minimum duration of the bursts (in seconds)\nDefault=3"
+Event EV_PG_SetModel
+(
+    "Model",
+    EV_DEFAULT,
+    "s",
+    "Model",
+    "Projectile model to use.\nDefault=models/projectiles/bazookashell.tik",
+    EV_NORMAL
 );
-Event EV_PG_MaxDuration(
-    "MaxDuration", EV_DEFAULT, "f", "MaxDuration", "Sets the maximum duration of bursts(in seconds)\nDefault=3"
+Event EV_PG_MinDuration
+(
+    "MinDuration",
+    EV_DEFAULT,
+    "f",
+    "MinDuration",
+    "Sets the minimum duration of the bursts (in seconds)\nDefault=3",
+    EV_NORMAL
 );
-Event EV_PG_MinNumShots(
-    "MinNumShots", EV_DEFAULT, "i", "MinNumShots", "Sets the minimum # of shots to fire in a cycle\nDefault=1"
+Event EV_PG_MaxDuration
+(
+    "MaxDuration",
+    EV_DEFAULT,
+    "f",
+    "MaxDuration",
+    "Sets the maximum duration of bursts(in seconds)\nDefault=3",
+    EV_NORMAL
 );
-Event EV_PG_MaxNumShots(
-    "MaxNumShots", EV_DEFAULT, "i", "MaxNumShots", "Sets the maximum # of shots to fire in a cycle\nDefault=1"
+Event EV_PG_MinNumShots
+(
+    "MinNumShots",
+    EV_DEFAULT,
+    "i",
+    "MinNumShots",
+    "Sets the minimum # of shots to fire in a cycle\nDefault=1",
+    EV_NORMAL
+);
+Event EV_PG_MaxNumShots
+(
+    "MaxNumShots",
+    EV_DEFAULT,
+    "i",
+    "MaxNumShots",
+    "Sets the maximum # of shots to fire in a cycle\nDefault=1",
+    EV_NORMAL
+);
+Event EV_PG_Cycles
+(
+    "Cycles",
+    EV_DEFAULT,
+    "i",
+    "Cycles",
+    "Number of cycles. 0=infinte\nDefault=0",
+    EV_NORMAL
+);
+Event EV_PG_MinDelay
+(
+    "MinDelay",
+    EV_DEFAULT,
+    "f",
+    "MinDelay",
+    "Minimum time between bursts.\n",
+    EV_NORMAL
+);
+Event EV_PG_MaxDelay
+(
+    "MaxDelay",
+    EV_DEFAULT,
+    "f",
+    "MaxDelay",
+    "Maximum time between bursts\nDefault=10",
+    EV_NORMAL
+);
+Event EV_PG_Accuracy
+(
+    "Accuracy",
+    EV_DEFAULT,
+    "f",
+    "Accuracy",
+    "Accuracy 0-25 feet\nDefault=10",
+    EV_NORMAL
+);
+Event EV_PG_ClearTarget
+(
+    "ClearTarget",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Pick another target...",
+    EV_NORMAL
+);
+Event EV_PG_BeginCycle
+(
+    "BeginCycle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Startup the cycle..",
+    EV_NORMAL
+);
+Event EV_TickCycle
+(
+    "TickCycle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Tick the cycle..",
+    EV_NORMAL
+);
+Event EV_EndCycle
+(
+    "EndCycle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "End the cycle..",
+    EV_NORMAL
+);
+Event EV_TurnOn
+(
+    "TurnOn",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn On and begin the first cycle",
+    EV_NORMAL
+);
+Event EV_TurnOff
+(
+    "TurnOff",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn Off and cancel the current cycle (if any)",
+    EV_NORMAL
+);
+Event EV_Set_FireDelay
+(
+    "firedelay",
+    EV_DEFAULT,
+    "f",
+    "fFireDelay",
+    "Set the minimum time between shots from the weapon",
+    EV_NORMAL
+);
+Event EV_Initialize
+(
+    "initialize",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Initialize object",
+    EV_NORMAL
 );
-Event EV_PG_Cycles("Cycles", EV_DEFAULT, "i", "Cycles", "Number of cycles. 0=infinte\nDefault=0");
-Event EV_PG_MinDelay("MinDelay", EV_DEFAULT, "f", "MinDelay", "Minimum time between bursts.\n");
-Event EV_PG_MaxDelay("MaxDelay", EV_DEFAULT, "f", "MaxDelay", "Maximum time between bursts\nDefault=10");
-Event EV_PG_Accuracy("Accuracy", EV_DEFAULT, "f", "Accuracy", "Accuracy 0-25 feet\nDefault=10");
-Event EV_PG_ClearTarget("ClearTarget", EV_DEFAULT, NULL, NULL, "Pick another target...");
-Event EV_PG_BeginCycle("BeginCycle", EV_DEFAULT, NULL, NULL, "Startup the cycle..");
-Event EV_TickCycle("TickCycle", EV_DEFAULT, NULL, NULL, "Tick the cycle..");
-Event EV_EndCycle("EndCycle", EV_DEFAULT, NULL, NULL, "End the cycle..");
-Event EV_TurnOn("TurnOn", EV_DEFAULT, NULL, NULL, "Turn On and begin the first cycle");
-Event EV_TurnOff("TurnOff", EV_DEFAULT, NULL, NULL, "Turn Off and cancel the current cycle (if any)");
-Event
-    EV_Set_FireDelay("firedelay", EV_DEFAULT, "f", "fFireDelay", "Set the minimum time between shots from the weapon");
-Event EV_Initialize("initialize", EV_DEFAULT, NULL, NULL, "Initialize object");
 Event EV_Set_FireOnStartUp(
-    "FireOnStartUp", EV_DEFAULT, 0, "i", "Default=1; Set this to 0 if you don't want the PG to fire on startup."
+    "FireOnStartUp",
+    EV_DEFAULT,
+    NULL,
+    "i",
+    "Default=1; Set this to 0 if you don't want the PG to fire on startup.",
+    EV_NORMAL
 );
-Event EV_PG_isDonut("isdonut", EV_DEFAULT, "i", "isdonut", "will target donut");
-Event EV_PG_arcDonut("arc", EV_DEFAULT, "f", "arc", "arc in front of the player");
-Event EV_PG_minDonut("mindonut", EV_DEFAULT, "f", "mindonut", "min extent of donut from player");
-Event EV_PG_maxDonut("maxdonut", EV_DEFAULT, "f", "maxdonut", "max extent of donut from player");
-Event EV_PG_PlayPreImpactSound("playpreimpact", EV_DEFAULT, NULL, NULL, "Play a pre-impact sound");
-Event EV_PG_SetPreImpactSound("preimpactsound", EV_DEFAULT, "s", "Sound", "Set a pre-impact sound.");
-Event EV_PG_SetPreImpactSoundTime(
-    "preimpactsoundtime", EV_DEFAULT, "f", "delay", "Set the time before impact to play the preimpact sound."
+Event EV_PG_isDonut
+(
+    "isdonut",
+    EV_DEFAULT,
+    "i",
+    "isdonut",
+    "will target donut",
+    EV_NORMAL
 );
-Event EV_PG_SetPreImpactSoundProbability(
+Event EV_PG_arcDonut
+(
+    "arc",
+    EV_DEFAULT,
+    "f",
+    "arc",
+    "arc in front of the player",
+    EV_NORMAL
+);
+Event EV_PG_minDonut
+(
+    "mindonut",
+    EV_DEFAULT,
+    "f",
+    "mindonut",
+    "min extent of donut from player",
+    EV_NORMAL
+);
+Event EV_PG_maxDonut
+(
+    "maxdonut",
+    EV_DEFAULT,
+    "f",
+    "maxdonut",
+    "max extent of donut from player",
+    EV_NORMAL
+);
+Event EV_PG_PlayPreImpactSound
+(
+    "playpreimpact",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Play a pre-impact sound",
+    EV_NORMAL
+);
+Event EV_PG_SetPreImpactSound
+(
+    "preimpactsound",
+    EV_DEFAULT,
+    "s",
+    "Sound",
+    "Set a pre-impact sound.",
+    EV_NORMAL
+);
+Event EV_PG_SetPreImpactSoundTime
+(
+    "preimpactsoundtime",
+    EV_DEFAULT,
+    "f",
+    "delay",
+    "Set the time before impact to play the preimpact sound.",
+    EV_NORMAL
+);
+Event EV_PG_SetPreImpactSoundProbability
+(
     "preimpactsoundprob",
     EV_DEFAULT,
     "f",
     "probability",
     "Set the chance for a pre-impact sound to occur.\n"
-    "Range: ( 0.0, 1.0 ), with 0 having no chance, and 1 always occurring."
+    "Range: ( 0.0, 1.0 ), with 0 having no chance, and 1 always occurring.",
+    EV_NORMAL
 );
-Event EV_PG_SetLaunchSound("launchsound", EV_DEFAULT, "s", "Sound", "Set a launch sound for the projectile.");
-Event EV_PG_GetTargetEntity(
-    "gettargetentity", EV_DEFAULT, NULL, NULL, "Returns entity being targeted by the projectile generator,", EV_GETTER
+Event EV_PG_SetLaunchSound
+(
+    "launchsound",
+    EV_DEFAULT,
+    "s",
+    "Sound",
+    "Set a launch sound for the projectile.",
+    EV_NORMAL
+);
+Event EV_PG_GetTargetEntity
+(
+    "gettargetentity",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns entity being targeted by the projectile generator,",
+    EV_RETURN
+);
+Event EV_PG_IsTurnedOn
+(
+    "isturnedon",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns whether the generator is on or off.",
+    EV_RETURN
 );
-Event EV_PG_IsTurnedOn("isturnedon", EV_DEFAULT, NULL, NULL, "Returns whether the generator is on or off.", EV_GETTER);
 
 CLASS_DECLARATION(Entity, ProjectileTarget, "ProjectileGenerator_Target") {
     {&EV_PG_SetID, &ProjectileTarget::EventSetId},
@@ -100,7 +327,7 @@ void ClearProjectileTargets()
 
 ProjectileTarget::ProjectileTarget()
 {
-    m_iTarget = -1;
+    m_iID = -1;
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
     hideModel();
@@ -110,12 +337,19 @@ ProjectileTarget::ProjectileTarget()
 
 void ProjectileTarget::EventSetId(Event *ev)
 {
-    m_iTarget = ev->GetInteger(1);
+    m_iID = ev->GetInteger(1);
 }
 
-int ProjectileTarget::GetTarget() const
+int ProjectileTarget::GetId() const
 {
-    return m_iTarget;
+    return m_iID;
+}
+
+void ProjectileTarget::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveInteger(&m_iID);
 }
 
 CLASS_DECLARATION(Animate, ProjectileGenerator, "ProjectileGenerator") {
@@ -146,53 +380,47 @@ CLASS_DECLARATION(Animate, ProjectileGenerator, "ProjectileGenerator") {
 
 ProjectileGenerator::ProjectileGenerator()
 {
-	m_iId = -1;
-	m_fMinDuration = 1;
-	m_fMaxDuration = 3;
-	m_iCycles = 0;
-	m_fMinDelay = 3.0;
-	m_fMaxDelay = 10;
-	m_fAccuracy = 10;
-	m_iCurrentCycle = 0;
-	m_iMinNumShots = 1;
-	m_iMaxNumShots = 1;
-	m_fCurrentTime = 0;
-	m_fShotsPerSec = 0;
-	m_iTargetIndex = -1;
-	m_fLastShotTime = 0;
-	m_iAnimSlot = 0;
-	m_bIsTurnedOn = 0;
-	m_bFireOnStartUp = 1;
-	m_bIsDonut = 0;
-	m_fArcDonut = 0;
-	m_fMinDonut = 0;
-	m_fMaxDonut = 0;
-	m_pTarget = 0;
+    m_iId            = -1;
+    m_fMinDuration   = 1;
+    m_fMaxDuration   = 3;
+    m_iCycles        = 0;
+    m_fMinDelay      = 3.0;
+    m_fMaxDelay      = 10;
+    m_fAccuracy      = 10;
+    m_iCurrentCycle  = 0;
+    m_iMinNumShots   = 1;
+    m_iMaxNumShots   = 1;
+    m_fCurrentTime   = 0;
+    m_fShotsPerSec   = 0;
+    m_iTargetIndex   = -1;
+    m_fLastShotTime  = 0;
+    m_iAnimSlot      = 0;
+    m_bIsTurnedOn    = false;
+    m_bFireOnStartUp = true;
+    m_bIsDonut       = false;
+    m_fArcDonut      = 0;
+    m_fMinDonut      = 0;
+    m_fMaxDonut      = 0;
+    m_pTarget        = NULL;
 
     m_fCycleTime = 1;
     setMoveType(MOVETYPE_NONE);
     setSolidType(SOLID_NOT);
-    if (spawnflags & PT_SPAWNFLAG_PLAY_FIRE_SOUND)
-    {
-        if (spawnflags & PT_SPAWNFLAG_HIDDEN)
-        {
+    if (ShouldPlayFireSound()) {
+        if (ShouldHideModel()) {
             hideModel();
             edict->r.svFlags |= SVF_NOCLIENT;
         }
-    }
-    else
-    {
+    } else {
         hideModel();
     }
 
-    if (!LoadingSavegame && spawnflags & PT_SPAWNFLAG_TURN_ON)
-    {
+    if (!LoadingSavegame && ShouldStartOn()) {
         PostEvent(EV_TurnOn, 0.1f);
     }
 
     m_pCurrent = NULL;
-    if (!LoadingSavegame)
-    {
+    if (!LoadingSavegame) {
         PostEvent(EV_Initialize, 0.001f);
     }
 }
@@ -209,7 +437,22 @@ bool ProjectileGenerator::ShouldHideModel() const
 
 bool ProjectileGenerator::ShouldPlayFireSound() const
 {
-	return (spawnflags & PT_SPAWNFLAG_PLAY_FIRE_SOUND) ? true : false;
+    return (spawnflags & PT_SPAWNFLAG_PLAY_FIRE_SOUND) ? true : false;
+}
+
+bool ProjectileGenerator::ShouldPlayMotionSound() const
+{
+    return (spawnflags & PT_SPAWNFLAG_PLAY_MOTION_SOUND) ? true : false;
+}
+
+bool ProjectileGenerator::ShouldRotateYaw() const
+{
+    return (spawnflags & PT_SPAWNFLAG_ROTATE_YAW) ? true : false;
+}
+
+bool ProjectileGenerator::ShouldRotateRoll() const
+{
+    return (spawnflags & PT_SPAWNFLAG_ROTATE_ROLL) ? true : false;
 }
 
 void ProjectileGenerator::EventIsTurnedOn(Event *ev)
@@ -224,26 +467,27 @@ void ProjectileGenerator::EventGetTargetEntity(Event *ev)
 
 void ProjectileGenerator::EventLaunchSound(Event *ev)
 {
-    m_sLaunchSound = ev->GetString(1);;
+    m_sLaunchSound = ev->GetString(1);
 }
 
 void ProjectileGenerator::SetTarget(Event *ev)
 {
-    m_pTarget = ev->GetEntity(1);
+    SetTarget(ev->GetEntity(1));
+}
+
+void ProjectileGenerator::SetTarget(Entity *ent)
+{
+    m_pTarget = ent;
 }
 
 void ProjectileGenerator::OnInitialize(Event *ev)
 {
-    if (spawnflags & PT_SPAWNFLAG_SET_YAW)
-    {
-        angles.y += 180;
-        setAngles(angles);
-	}
-	if (spawnflags & PT_SPAWNFLAG_SET_ROLL)
-	{
-		angles.z += 180;
-		setAngles(angles);
-	}
+    if (ShouldRotateYaw()) {
+        angles.setYaw(angles.yaw() + 180);
+    }
+    if (ShouldRotateRoll()) {
+        angles.setRoll(angles.roll() + 180);
+    }
 }
 
 void ProjectileGenerator::TurnOff(Event *ev)
@@ -255,17 +499,43 @@ void ProjectileGenerator::TurnOff(Event *ev)
 
 void ProjectileGenerator::TurnOn(Event *ev)
 {
-    if (!m_bIsTurnedOn)
-	{
-		CancelEventsOfType(EV_PG_BeginCycle);
-		CancelEventsOfType(EV_TickCycle);
-		m_bIsTurnedOn = true;
+    if (!m_bIsTurnedOn) {
+        CancelEventsOfType(EV_PG_BeginCycle);
+        CancelEventsOfType(EV_TickCycle);
+        SetupNextCycle();
+        m_bIsTurnedOn = true;
     }
 }
 
 void ProjectileGenerator::SetupNextCycle()
 {
-    // FIXME: unimplemented
+    float numShots;
+    float delay;
+
+    if (m_iCycles && m_iCurrentCycle >= m_iCycles) {
+        m_pCurrent = NULL;
+        TurnOff(NULL);
+        return;
+    }
+
+    // retrieve the target
+    m_pCurrent   = ChooseTarget();
+    m_fCycleTime = G_Random(m_fMaxDuration - m_fMinDuration) + m_fMinDuration;
+
+    // get a random number of shots
+    numShots = m_iMinNumShots;
+    if (numShots < m_iMaxNumShots) {
+        numShots = rand() % (m_iMaxNumShots - m_iMinNumShots) + m_iMinNumShots;
+    }
+
+    // get a random delay
+    m_fShotsPerSec = numShots / m_fCycleTime;
+    delay          = 0.01f;
+    if (m_bIsTurnedOn || !m_bFireOnStartUp) {
+        delay = G_Random(m_fMaxDelay - m_fMinDelay) + m_fMinDelay;
+    }
+
+    PostEvent(EV_PG_BeginCycle, delay);
 }
 
 bool ProjectileGenerator::ShouldTargetRandom() const
@@ -273,9 +543,44 @@ bool ProjectileGenerator::ShouldTargetRandom() const
     return (spawnflags & PT_SPAWNFLAG_TARGET_RANDOM) ? true : false;
 }
 
-void ProjectileGenerator::ChooseTarget()
+Entity *ProjectileGenerator::ChooseTarget()
 {
-    // FIXME: unimplemented
+    int numTargets;
+
+    if (m_pTarget) {
+        m_vTargetOrg = GetTargetPos(m_pTarget);
+        return m_pTarget;
+    }
+
+    if (ShouldTargetPlayer()) {
+        Entity *target = G_FindTarget(this, "player");
+        if (target) {
+            m_vTargetOrg = GetTargetPos(target);
+            return target;
+        }
+    }
+
+    if (!m_projectileTargets.NumObjects()) {
+        GetLocalTargets();
+    }
+
+    numTargets = m_projectileTargets.NumObjects();
+    if (numTargets) {
+        ProjectileTarget *target;
+
+        if (ShouldTargetRandom()) {
+            target = m_projectileTargets.ObjectAt((rand() % numTargets) + 1);
+        } else {
+            m_iTargetIndex = (m_iTargetIndex + 1) % numTargets;
+            target         = m_projectileTargets.ObjectAt(m_iTargetIndex + 1);
+        }
+
+        m_vTargetOrg = GetTargetPos(target);
+        return target;
+    }
+
+    spawnflags |= PT_SPAWNFLAG_TARGET_PLAYER;
+    return ChooseTarget();
 }
 
 void ProjectileGenerator::GetLocalTargets()
@@ -283,11 +588,9 @@ void ProjectileGenerator::GetLocalTargets()
     int i;
 
     m_projectileTargets.ClearObjectList();
-    for (i = 1; i <= g_projectileTargets.NumObjects(); i++)
-    {
-        ProjectileTarget* target = g_projectileTargets.ObjectAt(i);
-        if (m_iId == target->GetTarget())
-        {
+    for (i = 1; i <= g_projectileTargets.NumObjects(); i++) {
+        ProjectileTarget *target = g_projectileTargets.ObjectAt(i);
+        if (m_iId == target->GetId()) {
             m_projectileTargets.AddObject(target);
         }
     }
@@ -298,9 +601,107 @@ bool ProjectileGenerator::ShouldTargetPlayer() const
     return (spawnflags & PT_SPAWNFLAG_TARGET_PLAYER) ? true : false;
 }
 
-void ProjectileGenerator::GetTargetPos(Entity *target)
+Vector ProjectileGenerator::GetTargetPos(Entity *target)
 {
-    // FIXME: unimplemented
+    Vector vOrg;
+    Vector vForward;
+    Vector vAngles;
+    float  fRandDonut;
+
+    if (!target) {
+        return Vector(0, 0, 0);
+    }
+
+    vOrg = target->origin;
+
+    if (target->IsSubclassOfActor()) {
+        vOrg += Vector(0, 0, 36);
+    }
+
+    if (m_bIsDonut) {
+        Entity *playerTarget = G_FindTarget(this, "player");
+
+        if (playerTarget) {
+            vAngles = playerTarget->client->ps.viewangles;
+        } else {
+            vAngles = target->angles;
+        }
+
+        if (rand() & 1) {
+            vAngles.setYaw(vAngles[1] + m_fArcDonut / 2.0);
+        } else {
+            vAngles.setYaw(vAngles[1] - m_fArcDonut / 2.0);
+        }
+
+        AngleVectors(vAngles, vForward, NULL, NULL);
+
+        fRandDonut = G_Random(m_fMaxDonut - m_fMinDonut) + m_fMinDonut;
+        vOrg += vForward * (fRandDonut * 16);
+    } else {
+        vAngles.setYaw(G_Random(360));
+        AngleVectors(vAngles, vForward, NULL, NULL);
+
+        fRandDonut = G_Random(m_fAccuracy) * 16;
+        vOrg += vForward * fRandDonut;
+    }
+
+    return vOrg;
+}
+
+void ProjectileGenerator::GetMuzzlePos(Vector& pos)
+{
+    orientation_t orient;
+
+    pos = origin;
+
+    if (GetRawTag("tag_barrel", &orient)) {
+        vec3_t axis[3];
+        int    i;
+
+        AnglesToAxis(angles, axis);
+        for (i = 0; i < 3; i++) {
+            VectorMA(pos, orient.origin[i], axis[i], pos);
+        }
+    }
+}
+
+void ProjectileGenerator::Fire()
+{
+    m_fLastShotTime = level.time;
+    SetWeaponAnim("Fire", 0);
+}
+
+void ProjectileGenerator::TryLaunchSound()
+{
+    if (m_sLaunchSound != "") {
+        Sound(m_sLaunchSound, CHAN_AUTO);
+    }
+}
+
+void ProjectileGenerator::SetWeaponAnim(const char *name, Event *ev)
+{
+    int animnum = gi.Anim_NumForName(edict->tiki, name);
+    if (animnum == -1) {
+        return;
+    }
+
+    StopAnimating(m_iAnimSlot);
+    RestartAnimSlot(m_iAnimSlot);
+
+    int idleanim = gi.Anim_NumForName(edict->tiki, "idle");
+
+    edict->s.frameInfo[m_iAnimSlot].index = idleanim;
+    m_iAnimSlot                           = (m_iAnimSlot + 1) & 3;
+    edict->s.frameInfo[m_iAnimSlot].index = idleanim;
+
+    if (ev) {
+        NewAnim(animnum, ev, m_iAnimSlot);
+    } else {
+        NewAnim(animnum, m_iAnimSlot);
+    }
+
+    SetOnceType(m_iAnimSlot);
+    RestartAnimSlot(m_iAnimSlot);
 }
 
 void ProjectileGenerator::EventAccuracy(Event *ev)
@@ -310,12 +711,12 @@ void ProjectileGenerator::EventAccuracy(Event *ev)
 
 void ProjectileGenerator::EventMaxDelay(Event *ev)
 {
-	m_fMaxDelay = ev->GetFloat(1);
+    m_fMaxDelay = ev->GetFloat(1);
 }
 
 void ProjectileGenerator::EventMinDelay(Event *ev)
 {
-	m_fMinDelay = ev->GetFloat(1);
+    m_fMinDelay = ev->GetFloat(1);
 }
 
 void ProjectileGenerator::EventFireOnStartUp(Event *ev)
@@ -330,12 +731,12 @@ void ProjectileGenerator::EventMaxNumShots(Event *ev)
 
 void ProjectileGenerator::EventMinNumShots(Event *ev)
 {
-	m_iMinNumShots = ev->GetInteger(1);
+    m_iMinNumShots = ev->GetInteger(1);
 }
 
 void ProjectileGenerator::EventCycles(Event *ev)
 {
-	m_iCycles = ev->GetInteger(1);
+    m_iCycles = ev->GetInteger(1);
 }
 
 void ProjectileGenerator::EventMaxDuration(Event *ev)
@@ -345,7 +746,7 @@ void ProjectileGenerator::EventMaxDuration(Event *ev)
 
 void ProjectileGenerator::EventMinDuration(Event *ev)
 {
-	m_fMinDuration = ev->GetFloat(1);
+    m_fMinDuration = ev->GetFloat(1);
 }
 
 void ProjectileGenerator::SetWeaponModel(Event *ev)
@@ -360,27 +761,42 @@ void ProjectileGenerator::EventSetId(Event *ev)
 
 void ProjectileGenerator::BeginCycle(Event *ev)
 {
-    // FIXME: unimplemented
+    if (!m_bIsTurnedOn) {
+        return;
+    }
+
+    if (!m_fShotsPerSec) {
+        SetupNextCycle();
+        return;
+    }
+
+    if (m_pCurrent) {
+        m_vTargetOrg = GetTargetPos(m_pCurrent);
+    }
+
+    m_iCurrentCycle++;
+    m_fCurrentTime = 0;
+
+    TickCycle(ev);
+
+    PostEvent(EV_EndCycle, m_fCycleTime);
 }
 
 void ProjectileGenerator::TickCycle(Event *ev)
 {
-	if (!m_bIsTurnedOn) {
-		return;
-	}
+    if (!m_bIsTurnedOn) {
+        return;
+    }
 
-	m_fCurrentTime += level.frametime * m_fShotsPerSec;
-	if (m_fCurrentTime >= 1.f)
-	{
-		float f = floor(m_fCurrentTime);
-		if (Attack(floor(f)))
-		{
-			m_fCurrentTime -= floor(f);
-		}
+    m_fCurrentTime += level.frametime * m_fShotsPerSec;
+    if (m_fCurrentTime >= 1.f) {
+        float f = floor(m_fCurrentTime);
+        if (Attack(floor(f))) {
+            m_fCurrentTime -= floor(f);
+        }
+    }
 
-	}
-
-	PostEvent(EV_TickCycle, 0.01f);
+    PostEvent(EV_TickCycle, 0.01f);
 }
 
 void ProjectileGenerator::EndCycle(Event *ev)
@@ -389,14 +805,14 @@ void ProjectileGenerator::EndCycle(Event *ev)
     SetupNextCycle();
 }
 
-void ProjectileGenerator::EventmaxDonut(Event* ev)
+void ProjectileGenerator::EventmaxDonut(Event *ev)
 {
     m_fMaxDonut = ev->GetFloat(1);
 }
 
-void ProjectileGenerator::EventminDonut(Event* ev)
+void ProjectileGenerator::EventminDonut(Event *ev)
 {
-	m_fMinDonut = ev->GetFloat(1);
+    m_fMinDonut = ev->GetFloat(1);
 }
 
 void ProjectileGenerator::EventarcDonut(Event *ev)
@@ -445,6 +861,45 @@ void ProjectileGenerator::Archive(Archiver& arc)
     arc.ArchiveObjectPointer((Class **)&m_pCurrent);
 }
 
+/*QUAKED ProjectileGenerator_Projectile (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)  LaunchSound x TargetRandom StartOn FlipYaw FlipRoll TargetPlayer HideModel
+
+  Allows you to launch projectiles without the need for actual AI.  Useful for faking large battles.
+  Here are the params:
+
+  ID <nIdNum>
+  Model		 <sModelName>			(Defaults to bazooka weapon)
+  Projectile <sModelName>			(Defaults to bazooka projectile)
+  MinDuration <nMinDur=1>           (Min burst cycle duration)
+  MaxDuration <nMaxDur=3>           (Max burst cycle duration)
+  Cycles <nCycles=0>                (0=infinite)
+  MinNumShots <nMinNumShots=1>      (Minimum # of shots per cycle)
+  MaxNumShots <nMaxNumShots=1>      (Maximum # of shots per cycle)
+
+  MinDelay <nDelay=2>               (min amount of time between cycles)
+  MaxDelay <nDelay=10>              (max amount of time between cycles)
+  Accuracy <nAccuracy=10>           (accuracy measured in feet. 0-25 feet range)
+  FireOnStartUp						(defaults to 1.  This flag tells the PG to fire immediately when turned on.  Then do its delay from then on.)
+
+  IsDonut	<nIsDonut=1>			(indicates to use donut to calculate impact location)
+  Arc		<nArc=#degrees)			(how many degrees does the arc have)
+  minDonut <nMinDonut=15>			(mindistance from player)
+  maxDonut <nMaxDonut=30>			(maxdistance from player)
+  launchsound <sSoundName>          (Defaults to no sound)
+
+  preimpactsound <sSoundName>       (Defaults to no sound)
+  preimpactsoundtime <nTime=1.0>    (Time before impact to begin preimpact sound)
+  preimpactsoundprob <nProb=0.0>    (Chance of an impact sound being played. 0..1 range )
+
+  Here are some useful script commands:
+
+  $<generatorName> TurnOn
+  $<generatorName> TurnOff
+  $<generatorName> playpreimpact     ( plays the preimpact sound immediately )
+  $<generatorName> gettargetentity   ( return the entity that is targeted )
+  $<generatorName> isturnedon        ( is the projectil generator turned on? )
+
+******************************************************************************/
+
 CLASS_DECLARATION(ProjectileGenerator, ProjectileGenerator_Projectile, "ProjectileGenerator_Projectile") {
     {&EV_Weapon_SetProjectile,            &ProjectileGenerator_Projectile::SetProjectileModel          },
     {&EV_PG_isDonut,                      &ProjectileGenerator_Projectile::EventisDonut                },
@@ -466,8 +921,8 @@ ProjectileGenerator_Projectile::ProjectileGenerator_Projectile()
 
     m_sProjectileModel = "models/projectiles/bazookashell.tik";
     setModel("models/weapons/bazooka.tik");
-    m_sPreImpactSound = "";
-    m_fImpactSoundTime = 1;
+    m_sPreImpactSound         = "";
+    m_fImpactSoundTime        = 1;
     m_fImpactSoundProbability = 0;
 }
 
@@ -496,9 +951,95 @@ void ProjectileGenerator_Projectile::SetProjectileModel(Event *ev)
     m_sProjectileModel = ev->GetString(1);
 }
 
+float ProjectileGenerator_Projectile::EstimateImpactTime(
+    const Vector& targetOrigin, const Vector& fromOrigin, float speed
+) const
+{
+    Vector delta = fromOrigin - targetOrigin;
+
+    return delta.length() / speed;
+}
+
 bool ProjectileGenerator_Projectile::Attack(int count)
 {
-    // FIXME: unimplemented
+    Projectile *proj;
+    static int  NukePlayer = 0;
+    Vector      dir(0, 0, 1);
+    float       speed = 500;
+
+    Vector muzzlePos = origin;
+    GetMuzzlePos(muzzlePos);
+
+    if (m_pCurrent) {
+        m_vTargetOrg = GetTargetPos(m_pCurrent);
+
+        if (m_bIsDonut) {
+            Entity *playerTarget = G_FindTarget(this, "player");
+
+            if (playerTarget) {
+                if (playerTarget->takedamage) {
+                    if (!Q_stricmp(targetname, "artillerykiller")) {
+                        NukePlayer++;
+                    }
+                } else {
+                    NukePlayer = 0;
+                }
+
+                if (NukePlayer > 2) {
+                    m_vTargetOrg = playerTarget->origin;
+                    muzzlePos    = playerTarget->origin;
+                    muzzlePos[2] += 256;
+                    NukePlayer = 0;
+                } else {
+                    muzzlePos = m_vTargetOrg;
+                    muzzlePos[2] += random() * 500.0 + 500.0;
+                }
+            } else {
+                muzzlePos = m_vTargetOrg;
+                muzzlePos[2] += 1000.0;
+            }
+        }
+
+        dir = m_vTargetOrg - muzzlePos;
+        dir.normalize();
+
+        Vector newAngles;
+        VectorToAngles(dir, newAngles);
+
+        if (ShouldRotateYaw()) {
+            newAngles.setYaw(newAngles.yaw() + 180);
+        }
+
+        if (ShouldRotateRoll()) {
+            newAngles.setRoll(newAngles.roll() + 180);
+        }
+
+        setAngles(newAngles);
+    } else {
+        AngleVectors(angles, dir, NULL, NULL);
+    }
+
+    Fire();
+    TryLaunchSound();
+
+    proj = ProjectileAttack(muzzlePos, dir, this, m_sProjectileModel, 1.0, speed);
+
+    if (proj->flags & FL_THINK) {
+        gi.DPrintf("Projectile used is thinking...pre-impact sound cannot be predicted.\n");
+        return true;
+    }
+
+    if (G_Random() <= m_fImpactSoundProbability && m_sPreImpactSound.length()) {
+        float time;
+
+        time = EstimateImpactTime(m_vTargetOrg, muzzlePos, speed);
+        time -= 1.0;
+
+        if (time > 0) {
+            PostEvent(EV_PG_PlayPreImpactSound, time);
+        }
+    }
+
     return true;
 }
 
@@ -512,6 +1053,36 @@ void ProjectileGenerator_Projectile::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fImpactSoundProbability);
 }
 
+/*QUAKED ProjectileGenerator_Gun (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) LaunchSound x TargetRandom StartOn FlipYaw FlipRoll TargetPlayer HideModel
+
+  Allows you to launch projectiles without the need for actual AI.  Useful for faking large battles.
+  Here are the params:
+
+  ID <nIdNum>
+  MinDuration <nMinDur=1>           (Min burst cycle duration)
+  MaxDuration <nMaxDur=3>           (Max burst cycle duration)
+  Cycles <nCycles=0>                (0=infinite)
+  MinNumShots <nMinNumShots=1>      (Minimum # of shots per cycle)
+  MaxNumShots <nMaxNumShots=1>      (Maximum # of shots per cycle)
+
+  MinDelay <nDelay=2>               (min amount of time between cycles)
+  MaxDelay <nDelay=10>              (max amount of time between cycles)
+  Accuracy <nAccuracy=10>           (accuracy measured in feet. 0-25 feet range)
+  launchsound <sSoundName>          (Defaults to no sound)
+  FireOnStartUp						(defaults to 1.  This flag tells the PG to fire immediately when turned on.  Then do its delay from then on.)
+
+  bulletLarge <0,1,2,3>				(whether to fire normal, rifle, artillery or larger bullets)
+  tracerSpeed <0,2>					(scale factor for tracer speed)
+
+  Here are some useful script commands:
+
+  $<generatorName> TurnOn
+  $<generatorName> TurnOff
+  $<generatorName> gettargetentity   ( return the entity that is targeted )
+  $<generatorName> isturnedon        ( is the projectil generator turned on? )
+
+******************************************************************************/
+
 Event EV_PG_SetFakeBullets(
     "fakebullets",
     EV_DEFAULT,
@@ -540,25 +1111,25 @@ CLASS_DECLARATION(ProjectileGenerator, ProjectileGenerator_Gun, "ProjectileGener
 
 ProjectileGenerator_Gun::ProjectileGenerator_Gun()
 {
-	m_fBulletRange = 4000;
-	m_fBulletDamage = 40;
-	m_iBulletCount = 1;
-    m_vBulletSpread = Vector(40, 40, 0);
-	m_iTracerFrequency = 0;
-	m_iBulletLarge = 0;
-	m_iMeansOfDeath = MOD_BULLET;
-	m_fBulletThroughWood = 0;
-	m_fBulletThroughMetal = 0;
-	m_iBulletKnockback = 0;
-	m_iAttackCount = 0;
-	m_fFireDelay = 1;
-	m_fTracerSpeed = 1.0;
-	m_bFakeBullets = 0;
+    m_fBulletRange        = 4000;
+    m_fBulletDamage       = 40;
+    m_iBulletCount        = 1;
+    m_vBulletSpread       = Vector(40, 40, 0);
+    m_iTracerFrequency    = 0;
+    m_iBulletLarge        = 0;
+    m_iMeansOfDeath       = MOD_BULLET;
+    m_fBulletThroughWood  = 0;
+    m_fBulletThroughMetal = 0;
+    m_iBulletKnockback    = 0;
+    m_iAttackCount        = 0;
+    m_fFireDelay          = 1;
+    m_fTracerSpeed        = 1.0;
+    m_bFakeBullets        = 0;
 }
 
 void ProjectileGenerator_Gun::SetFireDelay(Event *ev)
 {
-	m_fFireDelay = ev->GetFloat(1);
+    m_fFireDelay = ev->GetFloat(1);
 }
 
 void ProjectileGenerator_Gun::SetMeansOfDeath(Event *ev)
@@ -573,7 +1144,7 @@ void ProjectileGenerator_Gun::SetBulletThroughWood(Event *ev)
 
 void ProjectileGenerator_Gun::SetBulletThroughMetal(Event *ev)
 {
-	m_fBulletThroughMetal = ev->GetFloat(1);
+    m_fBulletThroughMetal = ev->GetFloat(1);
 }
 
 void ProjectileGenerator_Gun::SetBulletKnockback(Event *ev)
@@ -624,28 +1195,111 @@ void ProjectileGenerator_Gun::SetBulletRange(Event *ev)
 
 bool ProjectileGenerator_Gun::Attack(int count)
 {
-	// FIXME: unimplemented
-	return true;
+    Vector dir;
+    Vector right, up;
+    Vector muzzlePos;
+    int    iTracerCount = 0;
+
+    if (ShouldPlayFireSound() && m_fLastShotTime + m_fFireDelay > level.time) {
+        return false;
+    }
+
+    GetMuzzlePos(muzzlePos);
+
+    if (m_pCurrent) {
+        dir = m_vTargetOrg - muzzlePos;
+        dir.normalize();
+
+        Vector newAngles;
+        VectorToAngles(dir, newAngles);
+
+        AngleVectors(newAngles, NULL, right, up);
+
+        if (ShouldRotateYaw()) {
+            newAngles.setYaw(newAngles.yaw() + 180);
+        }
+
+        if (ShouldRotateRoll()) {
+            newAngles.setRoll(newAngles.roll() + 180);
+        }
+
+        setAngles(newAngles);
+    } else {
+        AngleVectors(angles, dir, right, up);
+    }
+
+    int iTracerFrequency = 0;
+
+    m_iAttackCount += count;
+    if (!m_iTracerFrequency) {
+        m_iTracerFrequency = 4;
+    }
+
+    if (!(m_iAttackCount % m_iTracerFrequency)) {
+        m_iAttackCount   = 0;
+        iTracerFrequency = count;
+    }
+
+    if (ShouldPlayFireSound()) {
+        Fire();
+    }
+
+    TryLaunchSound();
+
+    if (m_bFakeBullets) {
+        FakeBulletAttack(
+            muzzlePos,
+            muzzlePos,
+            dir,
+            right,
+            up,
+            m_fBulletRange,
+            m_fBulletDamage,
+            m_iBulletLarge,
+            m_vBulletSpread,
+            count,
+            this,
+            iTracerFrequency,
+            &iTracerCount,
+            m_fTracerSpeed
+        );
+    } else {
+        BulletAttack(
+            muzzlePos,
+            muzzlePos,
+            dir,
+            right,
+            up,
+            m_fBulletRange,
+            m_fBulletDamage,
+            m_iBulletLarge,
+            m_iBulletKnockback,
+            0,
+            m_iMeansOfDeath,
+            m_vBulletSpread,
+            count,
+            this,
+            iTracerFrequency,
+            &iTracerCount,
+            m_fBulletThroughWood,
+            m_fBulletThroughMetal,
+            NULL,
+            m_fTracerSpeed
+        );
+    }
+
+    return true;
+}
+
+bool ProjectileGenerator_Gun::TickWeaponAnim()
+{
+    return m_fLastShotTime + m_fFireDelay < level.time;
 }
 
 void ProjectileGenerator_Gun::TickCycle(Event *ev)
 {
-    if (!m_bIsTurnedOn) {
-        return;
-    }
-
-    m_fCurrentTime += level.frametime * m_fShotsPerSec;
-    if (m_fCurrentTime >= 1.f)
-    {
-        float f = floor(m_fCurrentTime);
-        if (Attack(floor(f)))
-        {
-            m_fCurrentTime -= floor(f);
-        }
-
-	}
-
-	PostEvent(EV_TickCycle, 0.01f);
+    ProjectileGenerator::TickCycle(ev);
+    TickWeaponAnim();
 }
 
 void ProjectileGenerator_Gun::Archive(Archiver& arc)
@@ -668,6 +1322,41 @@ void ProjectileGenerator_Gun::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fTracerSpeed);
 }
 
+/*QUAKED ProjectileGenerator_Heavy (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)  LaunchSound x TargetRandom StartOn FlipYaw FlipRoll TargetPlayer HideModel
+
+  Allows you to launch projectiles without the need for actual AI.  Useful for faking large battles.
+  Here are the params:
+
+  ID <nIdNum>
+  Model		 <sModelName>			(Defaults to bazooka weapon)
+  Projectile <sModelName>			(Defaults to bazooka projectile)
+  MinDuration <nMinDur=1>           (Min burst cycle duration)
+  MaxDuration <nMaxDur=3>           (Max burst cycle duration)
+  Cycles <nCycles=0>                (0=infinite)
+  MinNumShots <nMinNumShots=1>      (Minimum # of shots per cycle)
+  MaxNumShots <nMaxNumShots=1>      (Maximum # of shots per cycle)
+
+  MinDelay <nDelay=2>               (min amount of time between cycles)
+  MaxDelay <nDelay=10>              (max amount of time between cycles)
+  Accuracy <nAccuracy=10>           (accuracy measured in feet. 0-25 feet range)
+
+  FireOnStartUp						(defaults to 1.  This flag tells the PG to fire immediately when turned on.  Then do its delay from then on.)
+
+  IsDonut	<nIsDonut=1>			(indicates to use donut to calculate impact location)
+  Arc		<nArc=#degrees)			(how many degrees does the arc have)
+  minDonut <nMinDonut=15>			(mindistance from player)
+  maxDonut <nMaxDonut=30>			(maxdistance from player)
+  launchsound <sSoundName>          (Defaults to no sound)
+
+  Here are some useful script commands:
+
+  $<generatorName> TurnOn
+  $<generatorName> TurnOff
+  $<generatorName> gettargetentity   ( return the entity that is targeted )
+  $<generatorName> isturnedon        ( is the projectil generator turned on? )
+
+******************************************************************************/
+
 CLASS_DECLARATION(ProjectileGenerator, ProjectileGenerator_Heavy, "ProjectileGenerator_Heavy") {
     {&EV_Weapon_SetProjectile, &ProjectileGenerator_Heavy::SetProjectileModel},
     {NULL,                     NULL                                          }
@@ -690,8 +1379,67 @@ void ProjectileGenerator_Heavy::SetProjectileModel(Event *ev)
 
 bool ProjectileGenerator_Heavy::Attack(int count)
 {
-	// FIXME: unimplemented
-	return true;
+    static int NukePlayer = 0;
+    Vector     dir(0, 0, 1);
+    float      speed = 500;
+
+    Vector muzzlePos = origin;
+    GetMuzzlePos(muzzlePos);
+
+    if (m_pCurrent) {
+        m_vTargetOrg = GetTargetPos(m_pCurrent);
+
+        if (m_bIsDonut) {
+            Entity *playerTarget = G_FindTarget(this, "player");
+
+            if (playerTarget) {
+                if (playerTarget->takedamage) {
+                    if (!Q_stricmp(targetname, "artillerykiller")) {
+                        NukePlayer++;
+                    }
+                } else {
+                    NukePlayer = 0;
+                }
+
+                if (NukePlayer > 2) {
+                    m_vTargetOrg = playerTarget->origin;
+                    muzzlePos    = playerTarget->origin;
+                    muzzlePos[2] += 256;
+                    NukePlayer = 0;
+                } else {
+                    muzzlePos = m_vTargetOrg;
+                    muzzlePos[2] += random() * 1000.0 + 500.0;
+                }
+            } else {
+                muzzlePos = m_vTargetOrg;
+                muzzlePos[2] += 2000.0;
+            }
+        }
+
+        dir = m_vTargetOrg - muzzlePos;
+        dir.normalize();
+
+        Vector newAngles;
+        VectorToAngles(dir, newAngles);
+
+        if (ShouldRotateYaw()) {
+            newAngles.setYaw(newAngles.yaw() + 180);
+        }
+
+        if (ShouldRotateRoll()) {
+            newAngles.setRoll(newAngles.roll() + 180);
+        }
+
+        setAngles(newAngles);
+    } else {
+        AngleVectors(angles, dir, NULL, NULL);
+    }
+
+    TryLaunchSound();
+    // spawn the projectile
+    HeavyAttack(muzzlePos, dir, m_sProjectileModel, speed, this, NULL);
+
+    return true;
 }
 
 void ProjectileGenerator_Heavy::Archive(Archiver& arc)
@@ -701,21 +1449,171 @@ void ProjectileGenerator_Heavy::Archive(Archiver& arc)
     arc.ArchiveString(&m_sProjectileModel);
 }
 
-Event EV_DestroyModel("DestroyModel", EV_DEFAULT, "s", "DestroyModel", 0);
-Event EV_UsedModel("UsedModel", EV_DEFAULT, "s", "UsedModel", 0);
-Event EV_ExplosionSound("ExplosionSound", EV_DEFAULT, "s", "ExplosionSound", 0);
-Event EV_ActivateSound("ActivateSound", EV_DEFAULT, "s", "ActivateSound", 0);
-Event EV_TickSound("TickSound", EV_DEFAULT, "s", "TickSound", 0);
-Event EV_SetDamage("SetDamage", EV_DEFAULT, "f", "Damage", 0);
-Event EV_Radius("Radius", EV_DEFAULT, "f", "Radius", 0);
-Event EV_StopWatchDuration("StopWatchDuration", EV_DEFAULT, "f", "StopWatchDuration", 0);
-Event EV_SetThread("setthread", EV_DEFAULT, "s", "thread", "Set the thread to execute when this object is used");
-Event EV_SetUseThread("setusethread", EV_DEFAULT, "s", "thread", "Set the thread to execute when this object is used");
-Event EV_DoExplosion("Explode", EV_DEFAULT, NULL, NULL, "Cause the explosion to happen.");
-Event EV_SetTriggered("triggered", EV_DEFAULT, "i", "0 or 1", "Set the triggered status");
-Event EV_SetExplosionEffect("explosioneffect", EV_DEFAULT, "s", "effect model", "Set the explosion effect model");
-Event EV_SetExplosionOffset("explosionoffset", EV_DEFAULT, "v", "offset vector", "Set the explosion offset");
-Event EV_BlowUp("BlowUp", EV_DEFAULT, NULL, NULL, NULL);
+/*QUAKED ThrobbingBox_explosive (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel
+
+  Explosive throbbing box.  Connect to the object you want to make explode.
+
+  ReplaceModel - check this if you want the destroy model to replace the model instead of doing
+                 a model switch.
+
+
+  Parameters:
+		Model - name of pulse model (default=items/pulse_explosive.tik")
+		UsedModel - name of non-pulse version (default=items/explosive.tik")
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		ActivateSound - name of activation sound (default=plantbomb)
+		TickSound - name of 'ticking' sound (default=bombtick)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the stopwatch go (default=5 seconds)
+		DestroyModel - name of model to switch target to.
+		setthread - name of thread to call when the explosion happens...
+		setusethread - name of thread to call when explosive was placed.
+		explosionpos - vector of the position the explosion should occur
+
+  Note:
+	* Set stopwatchduration to 0 to prevent the explosion and stopwatch from happening.
+	* You may then send the Explode event to this object to make the explosion happen.
+
+ ---------------------------------------------------------------------------------------------
+
+*/
+
+Event EV_DestroyModel
+(
+    "DestroyModel",
+    EV_DEFAULT,
+    "s",
+    "DestroyModel",
+    NULL,
+    EV_NORMAL
+);
+Event EV_UsedModel
+(
+    "UsedModel",
+    EV_DEFAULT,
+    "s",
+    "UsedModel",
+    NULL,
+    EV_NORMAL
+);
+Event EV_ExplosionSound
+(
+    "ExplosionSound",
+    EV_DEFAULT,
+    "s",
+    "ExplosionSound",
+    NULL,
+    EV_NORMAL
+);
+Event EV_ActivateSound
+(
+    "ActivateSound",
+    EV_DEFAULT,
+    "s",
+    "ActivateSound",
+    NULL,
+    EV_NORMAL
+);
+Event EV_TickSound
+(
+    "TickSound",
+    EV_DEFAULT,
+    "s",
+    "TickSound",
+    NULL,
+    EV_NORMAL
+);
+Event EV_SetDamage
+(
+    "SetDamage",
+    EV_DEFAULT,
+    "f",
+    "Damage",
+    NULL,
+    EV_NORMAL
+);
+Event EV_Radius
+(
+    "Radius",
+    EV_DEFAULT,
+    "f",
+    "Radius",
+    NULL,
+    EV_NORMAL
+);
+Event EV_StopWatchDuration
+(
+    "StopWatchDuration",
+    EV_DEFAULT,
+    "f",
+    "StopWatchDuration",
+    NULL,
+    EV_NORMAL
+);
+Event EV_SetThread
+(
+    "setthread",
+    EV_DEFAULT,
+    "s",
+    "thread",
+    "Set the thread to execute when this object is used",
+    EV_NORMAL
+);
+Event EV_SetUseThread
+(
+    "setusethread",
+    EV_DEFAULT,
+    "s",
+    "thread",
+    "Set the thread to execute when this object is used",
+    EV_NORMAL
+);
+Event EV_DoExplosion
+(
+    "Explode",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Cause the explosion to happen.",
+    EV_NORMAL
+);
+Event EV_SetTriggered
+(
+    "triggered",
+    EV_DEFAULT,
+    "i",
+    "triggered",
+    "Set the triggered status (0 or 1)",
+    EV_NORMAL
+);
+Event EV_SetExplosionEffect
+(
+    "explosioneffect",
+    EV_DEFAULT,
+    "s",
+    "effectModel",
+    "Set the explosion effect model",
+    EV_NORMAL
+);
+Event EV_SetExplosionOffset
+(
+    "explosionoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Set the explosion offset",
+    EV_NORMAL
+);
+Event EV_BlowUp
+(
+    "BlowUp",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    NULL,
+    EV_NORMAL
+);
 
 CLASS_DECLARATION(Animate, ThrobbingBox_Explosive, "ThrobbingBox_Explosive") {
     {&EV_Use,                &ThrobbingBox_Explosive::OnUse               },
@@ -740,23 +1638,28 @@ ThrobbingBox_Explosive::ThrobbingBox_Explosive()
 {
     if (LoadingSavegame) {
         return;
-	}
+    }
 
-	setModel("items\\\\pulse_explosive.tik");
-    m_sUsedModel = "items/explosive.tik";
-    m_sSound = "explose_flak88";
+    setModel("items\\\\pulse_explosive.tik");
+    m_sUsedModel     = "items/explosive.tik";
+    m_sSound         = "explode_flak88";
     m_sActivateSound = "plantbomb";
-    m_sTickSound = "bombtick";
+    m_sTickSound     = "bombtick";
 
-    m_bUsed = false;
-    m_fExplosionDamage = 300;
-    m_fRadius = 300;
+    m_bUsed              = false;
+    m_fExplosionDamage   = 300;
+    m_fRadius            = 300;
     m_fStopwatchDuration = 5;
 
     m_sEffect = "emitters/mortar_higgins.tik";
     m_vOffset = Vector(0, 0, 0);
 }
 
+bool ThrobbingBox_Explosive::ShouldDoExplosion()
+{
+    return m_fStopwatchDuration;
+}
+
 void ThrobbingBox_Explosive::SetExplosionOffset(Event *ev)
 {
     m_vOffset = ev->GetVector(1);
@@ -774,38 +1677,27 @@ void ThrobbingBox_Explosive::SetTriggered(Event *ev)
 
 void ThrobbingBox_Explosive::DoExplosion(Event *ev)
 {
-    SpawnArgs sp;
-    ScriptModel* spawned;
+    SpawnArgs    sp;
+    ScriptModel *spawned;
 
     sp.setArg("model", m_sEffect);
     sp.setArg("origin", va("%f %f %f", origin.x, origin.y, origin.z));
     sp.setArg("classname", "ScriptModel");
 
-    if (target.length())
-    {
-        SimpleEntity* targetEnt = G_FindTarget(NULL, target.c_str());
-        if (targetEnt)
-        {
+    if (target.length()) {
+        SimpleEntity *targetEnt = G_FindTarget(NULL, target.c_str());
+        if (targetEnt) {
             sp.setArg("origin", va("%f %f %f", targetEnt->origin.x, targetEnt->origin.y, targetEnt->origin.z));
         }
     }
 
-    spawned = static_cast<ScriptModel*>(sp.Spawn());
-    if (spawned)
-    {
+    spawned = static_cast<ScriptModel *>(sp.Spawn());
+    if (spawned) {
         spawned->NewAnim("start");
         spawned->setSolidType(SOLID_NOT);
     }
 
-    RadiusDamage(
-        origin + Vector(0, 0, 128),
-        this,
-        this,
-        m_fExplosionDamage,
-        this,
-        MOD_EXPLOSION,
-        m_fRadius
-    );
+    RadiusDamage(origin + Vector(0, 0, 128), this, this, m_fExplosionDamage, this, MOD_EXPLOSION, m_fRadius);
 
     Sound(m_sSound, CHAN_BODY);
 
@@ -815,26 +1707,20 @@ void ThrobbingBox_Explosive::DoExplosion(Event *ev)
 
 void ThrobbingBox_Explosive::SetUseThread(Event *ev)
 {
-    if (ev->IsFromScript())
-    {
+    if (ev->IsFromScript()) {
         m_useThread.SetThread(ev->GetValue(1));
-    }
-    else
-    {
+    } else {
         m_useThread.Set(ev->GetString(1));
     }
 }
 
 void ThrobbingBox_Explosive::SetThread(Event *ev)
 {
-	if (ev->IsFromScript())
-	{
-		m_thread.SetThread(ev->GetValue(1));
-	}
-	else
-	{
+    if (ev->IsFromScript()) {
+        m_thread.SetThread(ev->GetValue(1));
+    } else {
         m_thread.Set(ev->GetString(1));
-	}
+    }
 }
 
 void ThrobbingBox_Explosive::SetStopWatchDuration(Event *ev)
@@ -859,122 +1745,90 @@ void ThrobbingBox_Explosive::TickSound(Event *ev)
 
 void ThrobbingBox_Explosive::ActivateSound(Event *ev)
 {
-	m_sActivateSound = ev->GetString(1);
+    m_sActivateSound = ev->GetString(1);
 }
 
 void ThrobbingBox_Explosive::ExplosionSound(Event *ev)
 {
-	m_sSound = ev->GetString(1);
+    m_sSound = ev->GetString(1);
 }
 
 void ThrobbingBox_Explosive::UsedModel(Event *ev)
 {
-	m_sUsedModel = ev->GetString(1);
+    m_sUsedModel = ev->GetString(1);
 }
 
 void ThrobbingBox_Explosive::SetDestroyModel(Event *ev)
 {
-	m_sDestroyedModel = ev->GetString(1);
+    m_sDestroyedModel = ev->GetString(1);
 }
 
 void ThrobbingBox_Explosive::OnBlowUp(Event *ev)
 {
-    Player* player;
-	Entity* targetEnt;
-	ScriptModel* mdl;
+    Player      *player;
+    Entity      *targetEnt;
+    ScriptModel *mdl;
 
     StopLoopSound();
     setSolidType(SOLID_NOT);
 
-    player = static_cast<Player*>(G_FindTarget(this, "player"));
+    player = static_cast<Player *>(G_FindTarget(this, "player"));
     if (player) {
         // clear the player's stopwatch
         player->SetStopwatch(0);
     }
 
-    if (target.length() && (targetEnt = static_cast<Entity*>(G_FindTarget(NULL, target.c_str()))) && m_sDestroyedModel.length())
-    {
-        if (spawnflags & TBE_SPAWNFLAG_DESTROYED_MODEL)
-		{
-			SpawnArgs sp;
+    if (target.length() && (targetEnt = static_cast<Entity *>(G_FindTarget(NULL, target.c_str())))
+        && m_sDestroyedModel.length()) {
+        if (spawnflags & TBE_SPAWNFLAG_DESTROYED_MODEL) {
+            SpawnArgs sp;
 
             sp.setArg("model", m_sDestroyedModel.c_str());
             sp.setArg("origin", va("%f %f %f", targetEnt->origin.x, targetEnt->origin.y, targetEnt->origin.z));
             sp.setArg("angles", va("%f %f %f", targetEnt->angles.x, targetEnt->angles.y, targetEnt->angles.z));
             sp.setArg("classname", "ScriptModel");
 
-            mdl = static_cast<ScriptModel*>(sp.Spawn());
-            if (mdl)
-            {
+            mdl = static_cast<ScriptModel *>(sp.Spawn());
+            if (mdl) {
                 mdl->NewAnim("start");
-                mdl->setSolidType(targetEnt->edict->solid);
+                mdl->setSolidType(static_cast<solid_t>(targetEnt->getSolidType()));
             }
 
-            if (targetEnt->IsSubclassOfVehicle())
-            {
-                Vehicle* veh = static_cast<Vehicle*>(targetEnt);
-                Entity* ent;
-                int i;
+            if (targetEnt->IsSubclassOfVehicle()) {
+                Vehicle *veh = static_cast<Vehicle *>(targetEnt);
+                Entity  *ent;
+                int      i;
 
                 // remove all turrets
-                for (i = 0; i < 8; i++)
-                {
+                for (i = 0; i < MAX_TURRETS; i++) {
                     ent = veh->QueryTurretSlotEntity(i);
-                    if (ent)
-                    {
+                    if (ent) {
                         ent->PostEvent(EV_Remove, 0);
                     }
                 }
 
-                for (i = 0; i < 32; i++)
-                {
+                for (i = 0; i < MAX_PASSENGERS; i++) {
                     ent = veh->QueryPassengerSlotEntity(i);
-                    if (ent)
-                    {
+                    if (ent) {
                         ent->Damage(this, this, ent->health * 2.f, vec_zero, vec_zero, vec_zero, 50, 0, MOD_VEHICLE);
                     }
                 }
 
                 ent = veh->QueryDriverSlotEntity(0);
-                if (ent)
-				{
-					ent->Damage(this, this, ent->health * 2.f, vec_zero, vec_zero, vec_zero, 50, 0, MOD_VEHICLE);
+                if (ent) {
+                    ent->takedamage = DAMAGE_YES;
+                    ent->Damage(this, this, ent->health * 2.f, vec_zero, vec_zero, vec_zero, 50, 0, MOD_VEHICLE);
                 }
             }
 
             targetEnt->PostEvent(EV_Remove, 0);
-        }
-        else
-        {
+        } else {
             targetEnt->setModel(m_sDestroyedModel.c_str());
         }
     }
 
-    if (m_fStopwatchDuration)
-    {
-        SpawnArgs sp;
-
-        sp.setArg("model", m_sEffect.c_str());
-        sp.setArg("origin", va("%f %f %f", origin.x, origin.y, origin.z));
-        sp.setArg("classname", "ScriptModel");
-
-        if (target.length() > 0 && (targetEnt = static_cast<Entity*>(G_FindTarget(NULL, target.c_str()))))
-        {
-            sp.setArg("origin", va("%f %f %f", targetEnt->origin.x, targetEnt->origin.y, targetEnt->origin.z));
-        }
-
-        mdl = static_cast<ScriptModel*>(sp.Spawn());
-        if (mdl)
-        {
-            mdl->NewAnim("start");
-            mdl->setSolidType(targetEnt->edict->solid);
-        }
-
-        RadiusDamage(Vector(), this, this, m_fExplosionDamage, this, MOD_EXPLOSION, m_fRadius);
-        Sound(m_sSound, CHAN_BODY);
-
-        m_thread.Execute(this);
-        PostEvent(EV_Remove, 0);
+    if (ShouldDoExplosion()) {
+        DoExplosion(NULL);
     }
 }
 
@@ -990,25 +1844,23 @@ void ThrobbingBox_Explosive::OnUse(Event *ev)
         return;
     }
 
-	m_bUsed = true;
+    m_bUsed = true;
 
-	setModel(m_sUsedModel);
+    setModel(m_sUsedModel);
 
-	if (m_fStopwatchDuration > 0)
-	{
-		Player* player = static_cast<Player*>(G_FindTarget(this, "player"));
-		player->SetStopwatch(m_fStopwatchDuration, SWT_FUSE);
-		LoopSound(m_sTickSound);
-	}
+    if (m_fStopwatchDuration > 0) {
+        Player *player = static_cast<Player *>(G_FindTarget(this, "player"));
+        player->SetStopwatch(m_fStopwatchDuration, SWT_NORMAL);
+        LoopSound(m_sTickSound);
+    }
 
-	// Play the activation sound
-	Sound(m_sActivateSound, CHAN_BODY);
+    // Play the activation sound
+    Sound(m_sActivateSound, CHAN_BODY);
 
-	Unregister(STRING_TRIGGER);
-	m_useThread.Execute(this);
+    Unregister(STRING_TRIGGER);
+    m_useThread.Execute(this);
 
-    if (m_fStopwatchDuration > 0)
-    {
+    if (m_fStopwatchDuration > 0) {
         PostEvent(EV_BlowUp, m_fStopwatchDuration);
     }
 }
@@ -1032,42 +1884,177 @@ void ThrobbingBox_Explosive::Archive(Archiver& arc)
     m_useThread.Archive(arc);
 }
 
+/*QUAKED ThrobbingBox_ExplodePlayerFlak88 (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)
+
+  Explosive throbbing box.  Connect to the object you want to make explode.
+
+
+  Parameters:
+		Model - name of pulse model (default=items/pulse_explosive.tik")
+		UsedModel - name of non-pulse version (default=items/explosive.tik")
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		ActivateSound - name of activation sound (default=plantbomb)
+		TickSound - name of 'ticking' sound (default=bombtick)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the stopwatch go (default=5 seconds)
+		setthread - name of thread to call when the explosion happens...
+
+ ---------------------------------------------------------------------------------------------
+*/
+
 CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerFlak88, "ThrobbingBox_ExplodePlayerFlak88") {
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodePlayerFlak88::ThrobbingBox_ExplodePlayerFlak88()
+{
+    spawnflags |= TBE_SPAWNFLAG_DESTROYED_MODEL;
+    m_sDestroyedModel = "statweapons/flak88_d.tik";
+    m_sEffect         = "fx/demodamage_flak88.tik";
+}
+
+/*QUAKED ThrobbingBox_ExplodeFlak88 (1.0 0.0 1.0) (-12 -12 -12) (12 12 12)
+
+  Explosive throbbing box.  Connect to the object you want to make explode.
+
+  Parameters:
+		Model - name of pulse model (default=items/pulse_explosive.tik")
+		UsedModel - name of non-pulse version (default=items/explosive.tik")
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		ActivateSound - name of activation sound (default=plantbomb)
+		TickSound - name of 'ticking' sound (default=bombtick)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the stopwatch go (default=5 seconds)
+		setthread - name of thread to call when the explosion happens...
+
+ ---------------------------------------------------------------------------------------------
+*/
+
 CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeFlak88, "ThrobbingBox_ExplodeFlak88") {
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodeFlak88::ThrobbingBox_ExplodeFlak88()
+{
+    m_sDestroyedModel = "statweapons/flak88_d.tik";
+    m_sEffect         = "fx/demodamage_flak88.tik";
+}
+
+/*QUAKED ThrobbingBox_ExplodeNebelwerfer (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel
+
+  Explosive throbbing box.  Connect to the object you want to make explode.
+
+  Parameters:
+		Model - name of pulse model (default=items/pulse_explosive.tik")
+		UsedModel - name of non-pulse version (default=items/explosive.tik")
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		ActivateSound - name of activation sound (default=plantbomb)
+		TickSound - name of 'ticking' sound (default=bombtick)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the stopwatch go (default=5 seconds)
+		setthread - name of thread to call when the explosion happens...
+
+ ---------------------------------------------------------------------------------------------
+*/
+
 CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodeNebelwerfer, "ThrobbingBox_ExplodeNebelwerfer") {
     {NULL, NULL}
 };
 
-CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer, "ThrobbingBox_ExplodeNebelwerfer") {
+ThrobbingBox_ExplodeNebelwerfer::ThrobbingBox_ExplodeNebelwerfer()
+{
+    m_sDestroyedModel = "statweapons/nebelwerfer_d.tik";
+}
+
+/*QUAKED ThrobbingBox_ExplodePlayerNebelwerfer (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel
+
+  Explosive throbbing box.  Connect to the object you want to make explode.
+
+  Parameters:
+		Model - name of pulse model (default=items/pulse_explosive.tik")
+		UsedModel - name of non-pulse version (default=items/explosive.tik")
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		ActivateSound - name of activation sound (default=plantbomb)
+		TickSound - name of 'ticking' sound (default=bombtick)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the stopwatch go (default=5 seconds)
+		setthread - name of thread to call when the explosion happens...
+
+ ---------------------------------------------------------------------------------------------
+*/
+
+CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_ExplodePlayerNebelwerfer, "ThrobbingBox_ExplodePlayerNebelwerfer") {
     {NULL, NULL}
 };
 
+ThrobbingBox_ExplodePlayerNebelwerfer::ThrobbingBox_ExplodePlayerNebelwerfer()
+{
+    spawnflags |= TBE_SPAWNFLAG_DESTROYED_MODEL;
+    m_sDestroyedModel = "statweapons/nebelwerfer_d.tik";
+}
+
+/*QUAKED ThrobbingBox_Stickybomb (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) ReplaceModel WetFuse
+
+  Stickybomb throbbing box.  Connect to the object you want to make explode.
+  When WetFuse is selected, the bomb will fizzle out and can only be destroyed by shooting it.
+
+  Parameters:
+		ExplosionSound - name of explosion sound (default=explode_flak88)
+		Damage - amount of damage to do (default=300)
+		radius - radius to do the damage (default=300)
+		stopwatchduration - how long should the fuse go (default=5 seconds)
+		setthread - name of thread to call when the explosion happens...
+		DestroyModel - name of model to switch target to.
+		setusethread - name of thread to call when stickybomb is placed.
+
+ ---------------------------------------------------------------------------------------------
+*/
+
 Event EV_StickyBombWet("stickybombwet", EV_DEFAULT, NULL, NULL, NULL);
 
-CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_Stickybomb, "ThrobbingBox_ExplodeNebelwerfer") {
+CLASS_DECLARATION(ThrobbingBox_Explosive, ThrobbingBox_Stickybomb, "ThrobbingBox_Stickybomb") {
     {&EV_Damage,        &ThrobbingBox_Stickybomb::OnBlowUp       },
     {&EV_Use,           &ThrobbingBox_Stickybomb::OnStickyBombUse},
     {&EV_StickyBombWet, &ThrobbingBox_Stickybomb::OnStickyBombWet},
     {NULL,              NULL                                     }
 };
 
+ThrobbingBox_Stickybomb::ThrobbingBox_Stickybomb()
+{
+    if (LoadingSavegame) {
+        return;
+    }
+
+    setModel("items/pulse_stickybomb.tik");
+    m_sUsedModel     = "items/stickybomb.tik";
+    m_sSound         = "explode_flak88";
+    m_sActivateSound = "stickybomb_plant";
+    m_sTickSound     = "stickybomb_fuse";
+
+    health                = 10;
+    m_fStopwatchStartTime = 0;
+
+    setSolidType(SOLID_BBOX);
+    takedamage = DAMAGE_NO;
+    setContents(CONTENTS_WEAPONCLIP);
+}
+
 void ThrobbingBox_Stickybomb::OnStickyBombWet(Event *ev)
 {
-    Player* player;
+    Player *player;
 
     CancelEventsOfType(EV_BlowUp);
     NewAnim("idle_fuse_wet");
+    StopLoopSound();
     Sound("stickybomb_fuse_out", CHAN_BODY);
 
-    player = static_cast<Player*>(G_FindTarget(this, "player"));
+    player = static_cast<Player *>(G_FindTarget(this, "player"));
     player->SetStopwatch(0, SWT_NORMAL);
-    player->SetStopwatch(m_fStopwatchDuration - (level.svsFloatTime - m_fStopwatchStartTime), SWT_FUSE);
+    player->SetStopwatch(m_fStopwatchDuration - (level.svsFloatTime - m_fStopwatchStartTime), SWT_FUSE_WET);
 }
 
 void ThrobbingBox_Stickybomb::OnStickyBombUse(Event *ev)
@@ -1077,14 +2064,14 @@ void ThrobbingBox_Stickybomb::OnStickyBombUse(Event *ev)
     }
 
     setSolidType(SOLID_BBOX);
+    setContents(CONTENTS_WEAPONCLIP);
     takedamage = DAMAGE_YES;
-    m_bUsed = true;
+    m_bUsed    = true;
 
     setModel(m_sUsedModel);
 
-    if (m_fStopwatchDuration > 0)
-    {
-        Player* player = static_cast<Player*>(G_FindTarget(this, "player"));
+    if (m_fStopwatchDuration > 0) {
+        Player *player = static_cast<Player *>(G_FindTarget(this, "player"));
         player->SetStopwatch(m_fStopwatchDuration, SWT_FUSE);
         LoopSound(m_sTickSound);
         m_fStopwatchStartTime = level.svsFloatTime;
@@ -1097,9 +2084,8 @@ void ThrobbingBox_Stickybomb::OnStickyBombUse(Event *ev)
     m_useThread.Execute(this);
     PostEvent(EV_BlowUp, m_fStopwatchDuration);
 
-    if (spawnflags & TBE_SPAWNFLAG_MAKE_WET)
-    {
-        PostEvent(EV_StickyBombWet, m_fStopwatchDuration * 0.5f * random() + m_fStopwatchDuration * 0.25f);
+    if (spawnflags & TBE_SPAWNFLAG_MAKE_WET) {
+        PostEvent(EV_StickyBombWet, G_Random(m_fStopwatchDuration / 2.0) + m_fStopwatchDuration / 4.0);
     }
 
     NewAnim("idle_fuse_lit");
@@ -1112,13 +2098,68 @@ void ThrobbingBox_Stickybomb::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fStopwatchStartTime);
 }
 
-Event EV_Complete("Complete", EV_DEFAULT, NULL, NULL, "Complete this objective.");
+/*QUAKED func_objective (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) StartOn
 
-Event EV_SetCurrent("SetCurrent", EV_DEFAULT, NULL, NULL, "Set this objective as current.");
+  object used to simplify placing objectives.  You may optionally connect this object to the
+  target you want to use for the compass position....
 
-Event EV_SetText("Text", EV_DEFAULT, "s", "text", "Set current text.");
+  Checkboxes:
+	StartOn - check this if you want this objective to be displayed when the level first loads
 
-Event EV_SetObjectiveNbr("ObjectiveNbr", EV_DEFAULT, "i", "index", "Sets the objective number.");
+  Parameters:
+
+  ObjectiveNbr <nObjNbr=0>
+  Text <sText>
+
+  Events:
+	TurnOn
+	TurnOff
+	Complete
+	Text <sNewText>
+	SetCurrent
+
+//---------------------------------------------------------------------------------------------
+*/
+
+Event EV_Complete
+(
+    "Complete",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Complete this objective.",
+    EV_NORMAL
+);
+
+Event EV_SetCurrent
+(
+    "SetCurrent",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set this objective as current.",
+    EV_NORMAL
+);
+
+Event EV_SetText
+(
+    "Text",
+    EV_DEFAULT,
+    "s",
+    "text",
+    "Set current text.",
+    EV_NORMAL
+);
+
+Event EV_SetObjectiveNbr
+(
+    "ObjectiveNbr",
+    EV_DEFAULT,
+    "i",
+    "index",
+    "Sets the objective number.",
+    EV_NORMAL
+);
 
 CLASS_DECLARATION(Entity, Objective, "func_objective") {
     {&EV_TurnOn,          &Objective::TurnOn         },
@@ -1202,131 +2243,289 @@ int Objective::GetObjectiveIndex() const
     return m_iObjectiveIndex;
 }
 
+/*QUAKED func_fencepost (0 1 0) ?
+  fencepost that can be blown up
+  "health" how much health the fence post should have (default 50)
+//---------------------------------------------------------------------------------------------
+*/
+
 CLASS_DECLARATION(Entity, FencePost, "func_fencepost") {
-    {&EV_Killed, NULL},
-    {NULL,       NULL}
+    {&EV_Killed, &FencePost::Killed},
+    {NULL,       NULL              }
 };
 
-Event EV_SetEnemyName("enemyname", EV_DEFAULT, "s", "enemyname", "");
-Event EV_SetEnemyName2("enemyname", EV_DEFAULT, "s", "enemyname", "", EV_GETTER);
-Event EV_GetEnemyName("enemyname", EV_DEFAULT, "s", "enemyname", "", EV_SETTER);
-Event EV_Sentient_GetDontDropWeapons("dontdropweapons", EV_DEFAULT, NULL, NULL, "dontdropweapons getter", EV_GETTER);
-Event EV_SetDontDropHealth("dontdrophealth", EV_DEFAULT, NULL, NULL, "dontdrophealth setter");
-Event EV_GetDontDropHealth("dontdrophealth", EV_DEFAULT, NULL, NULL, "dontdrophealth getter", EV_GETTER);
+FencePost::FencePost()
+{
+    max_health  = 20;
+    health      = 20;
+    damage_type = MOD_AAGUN;
+
+    if (!LoadingSavegame) {
+        PostEvent(EV_BecomeSolid, EV_POSTSPAWN);
+    }
+
+    takedamage = DAMAGE_YES;
+}
+
+void FencePost::Killed(Event *ev)
+{
+    Vector vMins, vMaxs;
+    Vector vStart, vEnd;
+    Vector vCenter;
+    float  fHalf;
+
+    vCenter = mins - maxs;
+    vCenter *= 0.5;
+
+    if (size.x > size.y) {
+        if (size.x > size.z) {
+            if (size.y > size.z) {
+                fHalf = size.y / 2.f;
+            } else {
+                fHalf = size.z / 2.f;
+            }
+
+            vMins[0] = mins[0];
+            vMaxs[0] = maxs[0];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[2] = vCenter[2];
+            vMaxs[2] = vCenter[2];
+        } else {
+            fHalf = size.x / 2.f;
+
+            vMins[2] = mins[2];
+            vMaxs[2] = maxs[2];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+        }
+    } else {
+        if (size.y > size.z) {
+            if (size.x > size.z) {
+                fHalf = size.x / 2.f;
+            } else {
+                fHalf = size.z / 2.f;
+            }
+
+            vMins[1] = mins[1];
+            vMaxs[1] = maxs[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+            vMins[2] = vCenter[2];
+            vMaxs[2] = vCenter[2];
+        } else {
+            fHalf = size.y / 2.f;
+
+            vMins[2] = mins[2];
+            vMaxs[2] = maxs[2];
+            vMins[1] = vCenter[1];
+            vMaxs[1] = vCenter[1];
+            vMins[0] = vCenter[0];
+            vMaxs[0] = vCenter[0];
+        }
+    }
+
+    MatrixTransformVector(vMins, orientation, vStart);
+    MatrixTransformVector(vMaxs, orientation, vEnd);
+
+    vStart += origin;
+    vEnd += origin;
+
+    if (fHalf > 255) {
+        fHalf = 255;
+    }
+
+    gi.SetBroadcastVisible(vStart, vEnd);
+    gi.MSG_StartCGM(CGM_FENCEPOST);
+    gi.MSG_WriteCoord(vStart[0]);
+    gi.MSG_WriteCoord(vStart[1]);
+    gi.MSG_WriteCoord(vStart[2]);
+    gi.MSG_WriteCoord(vEnd[0]);
+    gi.MSG_WriteCoord(vEnd[1]);
+    gi.MSG_WriteCoord(vEnd[2]);
+    gi.MSG_WriteByte((int)fHalf);
+    gi.MSG_WriteByte(0);
+    gi.MSG_EndCGM();
+
+    deadflag = DEAD_DEAD;
+
+    PostEvent(EV_Remove, 0);
+}
+
+Event EV_SetEnemyName
+(
+    "enemyname",
+    EV_DEFAULT,
+    "s",
+    "enemyname",
+    "",
+    EV_NORMAL
+);
+Event EV_SetEnemyName2
+(
+    "enemyname",
+    EV_DEFAULT,
+    "s",
+    "enemyname",
+    "",
+    EV_SETTER
+);
+Event EV_GetEnemyName
+(
+    "enemyname",
+    EV_DEFAULT,
+    "s",
+    "enemyname",
+    "",
+    EV_GETTER
+);
+Event EV_Sentient_GetDontDropWeapons
+(
+    "dontdropweapons",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "dontdropweapons getter",
+    EV_GETTER
+);
+Event EV_SetDontDropHealth
+(
+    "dontdrophealth",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "dontdrophealth setter",
+    EV_NORMAL
+);
+Event EV_GetDontDropHealth
+(
+    "dontdrophealth",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "dontdrophealth getter",
+    EV_GETTER
+);
 
 CLASS_DECLARATION(SimpleArchivedEntity, AISpawnPoint, "info_aispawnpoint") {
-    {&EV_Model, &AISpawnPoint::SetModel},
-    {&EV_GetModel, &AISpawnPoint::GetModel},
-    {&EV_SetHealth2, &AISpawnPoint::SetHealth},
-    {&EV_Entity_GetHealth, &AISpawnPoint::GetHealth},
-    {&EV_SetEnemyName, &AISpawnPoint::SetEnemyName},
-    {
-     &EV_SetEnemyName2,
-     &AISpawnPoint::SetEnemyName,
-     },
-    {&EV_GetEnemyName, &AISpawnPoint::GetEnemyName},
-    {&EV_Actor_SetAccuracy, &AISpawnPoint::SetAccuracy},
-    {&EV_Actor_GetAccuracy, &AISpawnPoint::GetAccuracy},
-    {&EV_Actor_SetAmmoGrenade, &AISpawnPoint::SetAmmoGrenade},
-    {&EV_Actor_GetAmmoGrenade, &AISpawnPoint::GetAmmoGrenade},
-    {&EV_Actor_SetBalconyHeight, &AISpawnPoint::SetBalconyHeight},
-    {&EV_Actor_GetBalconyHeight, &AISpawnPoint::GetBalconyHeight},
-    {&EV_Actor_SetDisguiseLevel, &AISpawnPoint::SetDisguiseLevel},
-    {&EV_Actor_GetDisguiseLevel, &AISpawnPoint::GetDisguiseLevel},
-    {&EV_Actor_SetDisguisePeriod2, &AISpawnPoint::SetDisguisePeriod},
-    {&EV_Actor_GetDisguisePeriod, &AISpawnPoint::GetDisguisePeriod},
-    {&EV_Actor_SetDisguiseRange2, &AISpawnPoint::SetDisguiseRange},
-    {&EV_Actor_GetDisguiseRange, &AISpawnPoint::GetDisguiseRange},
-    {&EV_Actor_SetEnemyShareRange2, &AISpawnPoint::SetEnemyShareRange},
-    {&EV_Actor_GetEnemyShareRange, &AISpawnPoint::GetEnemyShareRange},
-    {&EV_Actor_GetFixedLeash, &AISpawnPoint::GetFixedLeash},
-    {&EV_Actor_SetFixedLeash2, &AISpawnPoint::SetFixedLeash},
-    {&EV_Actor_SetGrenadeAwareness, &AISpawnPoint::SetGrenadeAwareness},
-    {&EV_Actor_GetGrenadeAwareness, &AISpawnPoint::GetGrenadeAwareness},
-    {&EV_Actor_SetGun, &AISpawnPoint::SetGun},
-    {&EV_Actor_GetGun, &AISpawnPoint::GetGun},
+    {&EV_Model,                       &AISpawnPoint::SetModel             },
+    {&EV_GetModel,                    &AISpawnPoint::GetModel             },
+    {&EV_SetHealth2,                  &AISpawnPoint::SetHealth            },
+    {&EV_Entity_GetHealth,            &AISpawnPoint::GetHealth            },
+    {&EV_SetEnemyName,                &AISpawnPoint::SetEnemyName         },
+    {&EV_SetEnemyName2,               &AISpawnPoint::SetEnemyName         },
+    {&EV_GetEnemyName,                &AISpawnPoint::GetEnemyName         },
+    {&EV_Actor_SetAccuracy,           &AISpawnPoint::SetAccuracy          },
+    {&EV_Actor_GetAccuracy,           &AISpawnPoint::GetAccuracy          },
+    {&EV_Actor_SetAmmoGrenade,        &AISpawnPoint::SetAmmoGrenade       },
+    {&EV_Actor_GetAmmoGrenade,        &AISpawnPoint::GetAmmoGrenade       },
+    {&EV_Actor_SetBalconyHeight,      &AISpawnPoint::SetBalconyHeight     },
+    {&EV_Actor_GetBalconyHeight,      &AISpawnPoint::GetBalconyHeight     },
+    {&EV_Actor_SetDisguiseLevel,      &AISpawnPoint::SetDisguiseLevel     },
+    {&EV_Actor_GetDisguiseLevel,      &AISpawnPoint::GetDisguiseLevel     },
+    {&EV_Actor_SetDisguisePeriod2,    &AISpawnPoint::SetDisguisePeriod    },
+    {&EV_Actor_GetDisguisePeriod,     &AISpawnPoint::GetDisguisePeriod    },
+    {&EV_Actor_SetDisguiseRange2,     &AISpawnPoint::SetDisguiseRange     },
+    {&EV_Actor_GetDisguiseRange,      &AISpawnPoint::GetDisguiseRange     },
+    {&EV_Actor_SetEnemyShareRange2,   &AISpawnPoint::SetEnemyShareRange   },
+    {&EV_Actor_GetEnemyShareRange,    &AISpawnPoint::GetEnemyShareRange   },
+    {&EV_Actor_GetFixedLeash,         &AISpawnPoint::GetFixedLeash        },
+    {&EV_Actor_SetFixedLeash2,        &AISpawnPoint::SetFixedLeash        },
+    {&EV_Actor_SetGrenadeAwareness,   &AISpawnPoint::SetGrenadeAwareness  },
+    {&EV_Actor_GetGrenadeAwareness,   &AISpawnPoint::GetGrenadeAwareness  },
+    {&EV_Actor_SetGun,                &AISpawnPoint::SetGun               },
+    {&EV_Actor_GetGun,                &AISpawnPoint::GetGun               },
     {&EV_Actor_GetMaxNoticeTimeScale, &AISpawnPoint::GetMaxNoticeTimeScale},
     {&EV_Actor_SetMaxNoticeTimeScale, &AISpawnPoint::SetMaxNoticeTimeScale},
-    {&EV_Actor_GetSoundAwareness, &AISpawnPoint::GetSoundAwareness},
-    {&EV_Actor_SetSoundAwareness, &AISpawnPoint::SetSoundAwareness},
-    {&EV_Actor_SetTypeAttack, &AISpawnPoint::SetTypeAttack},
-    {&EV_Actor_GetTypeAttack, &AISpawnPoint::GetTypeAttack},
-    {&EV_Actor_SetTypeDisguise, &AISpawnPoint::SetTypeDisguise},
-    {&EV_Actor_GetTypeDisguise, &AISpawnPoint::GetTypeDisguise},
-    {&EV_Actor_SetTypeGrenade, &AISpawnPoint::SetTypeGrenade},
-    {&EV_Actor_GetTypeGrenade, &AISpawnPoint::GetTypeGrenade},
-    {&EV_Actor_SetTypeIdle, &AISpawnPoint::SetTypeIdle},
-    {&EV_Actor_GetTypeIdle, &AISpawnPoint::GetTypeIdle},
-    {&EV_Actor_SetPatrolWaitTrigger, &AISpawnPoint::SetPatrolWaitTrigger},
-    {&EV_Actor_GetPatrolWaitTrigger, &AISpawnPoint::GetPatrolWaitTrigger},
-    {&EV_Actor_SetHearing, &AISpawnPoint::SetHearing},
-    {&EV_Actor_GetHearing, &AISpawnPoint::GetHearing},
-    {&EV_Actor_GetSight, &AISpawnPoint::GetSight},
-    {&EV_Actor_SetSight2, &AISpawnPoint::SetSight},
-    {&EV_Actor_SetFov, &AISpawnPoint::SetFov},
-    {&EV_Actor_GetFov, &AISpawnPoint::GetFov},
-    {&EV_Actor_SetLeash2, &AISpawnPoint::SetLeash},
-    {&EV_Actor_GetLeash, &AISpawnPoint::GetLeash},
-    {&EV_Actor_SetMinDistance, &AISpawnPoint::SetMinDistance},
-    {&EV_Actor_GetMinDistance, &AISpawnPoint::GetMinDistance},
-    {&EV_Actor_SetMaxDistance, &AISpawnPoint::SetMaxDistance},
-    {&EV_Actor_GetMaxDistance, &AISpawnPoint::GetMaxDistance},
-    {&EV_Actor_SetInterval2, &AISpawnPoint::SetInterval},
-    {&EV_Actor_GetInterval, &AISpawnPoint::GetInterval},
-    {&EV_Sentient_DontDropWeapons, &AISpawnPoint::SetDontDropWeapons},
-    {&EV_Sentient_GetDontDropWeapons, &AISpawnPoint::GetDontDropWeapons},
-    {&EV_SetDontDropHealth, &AISpawnPoint::SetDontDropHealth},
-    {&EV_GetDontDropHealth, &AISpawnPoint::GetDontDropHealth},
-    {&EV_Actor_GetFavoriteEnemy, &AISpawnPoint::GetFavoriteEnemy},
-    {&EV_Actor_SetFavoriteEnemy2, &AISpawnPoint::SetFavoriteEnemy},
-    {&EV_Actor_SetNoSurprise2, &AISpawnPoint::SetNoSurprise},
-    {&EV_Actor_GetNoSurprise, &AISpawnPoint::GetNoSurprise},
-    {&EV_Actor_SetPatrolPath, &AISpawnPoint::SetPatrolPath},
-    {&EV_Actor_GetPatrolPath, &AISpawnPoint::GetPatrolPath},
-    {&EV_Actor_SetTurret, &AISpawnPoint::SetTurret},
-    {&EV_Actor_GetTurret, &AISpawnPoint::GetTurret},
-    {&EV_Actor_SetAlarmNode, &AISpawnPoint::SetAlarmNode},
-    {&EV_Actor_GetAlarmNode, &AISpawnPoint::GetAlarmNode},
-    {&EV_Actor_SetWeapon, &AISpawnPoint::SetWeapon},
-    {&EV_Actor_GetWeapon, &AISpawnPoint::GetWeapon},
-    {&EV_SetTarget, &AISpawnPoint::SetTarget},
-    {&EV_GetTarget, &AISpawnPoint::GetTarget},
-    {&EV_Actor_SetVoiceType, &AISpawnPoint::SetVoiceType},
-    {&EV_Actor_GetVoiceType, &AISpawnPoint::GetVoiceType},
-    {&EV_Sentient_ForceDropWeapon, &AISpawnPoint::SetForceDropWeapon},
-    {&EV_Sentient_GetForceDropWeapon, &AISpawnPoint::GetForceDropWeapon},
-    {&EV_Sentient_ForceDropHealth, &AISpawnPoint::SetForceDropHealth},
-    {&EV_Sentient_GetForceDropHealth, &AISpawnPoint::GetForceDropHealth},
-    {NULL, NULL}
+    {&EV_Actor_GetSoundAwareness,     &AISpawnPoint::GetSoundAwareness    },
+    {&EV_Actor_SetSoundAwareness,     &AISpawnPoint::SetSoundAwareness    },
+    {&EV_Actor_SetTypeAttack,         &AISpawnPoint::SetTypeAttack        },
+    {&EV_Actor_GetTypeAttack,         &AISpawnPoint::GetTypeAttack        },
+    {&EV_Actor_SetTypeDisguise,       &AISpawnPoint::SetTypeDisguise      },
+    {&EV_Actor_GetTypeDisguise,       &AISpawnPoint::GetTypeDisguise      },
+    {&EV_Actor_SetTypeGrenade,        &AISpawnPoint::SetTypeGrenade       },
+    {&EV_Actor_GetTypeGrenade,        &AISpawnPoint::GetTypeGrenade       },
+    {&EV_Actor_SetTypeIdle,           &AISpawnPoint::SetTypeIdle          },
+    {&EV_Actor_GetTypeIdle,           &AISpawnPoint::GetTypeIdle          },
+    {&EV_Actor_SetPatrolWaitTrigger,  &AISpawnPoint::SetPatrolWaitTrigger },
+    {&EV_Actor_GetPatrolWaitTrigger,  &AISpawnPoint::GetPatrolWaitTrigger },
+    {&EV_Actor_SetHearing,            &AISpawnPoint::SetHearing           },
+    {&EV_Actor_GetHearing,            &AISpawnPoint::GetHearing           },
+    {&EV_Actor_GetSight,              &AISpawnPoint::GetSight             },
+    {&EV_Actor_SetSight2,             &AISpawnPoint::SetSight             },
+    {&EV_Actor_SetFov,                &AISpawnPoint::SetFov               },
+    {&EV_Actor_GetFov,                &AISpawnPoint::GetFov               },
+    {&EV_Actor_SetLeash2,             &AISpawnPoint::SetLeash             },
+    {&EV_Actor_GetLeash,              &AISpawnPoint::GetLeash             },
+    {&EV_Actor_SetMinDistance,        &AISpawnPoint::SetMinDistance       },
+    {&EV_Actor_GetMinDistance,        &AISpawnPoint::GetMinDistance       },
+    {&EV_Actor_SetMaxDistance,        &AISpawnPoint::SetMaxDistance       },
+    {&EV_Actor_GetMaxDistance,        &AISpawnPoint::GetMaxDistance       },
+    {&EV_Actor_SetInterval2,          &AISpawnPoint::SetInterval          },
+    {&EV_Actor_GetInterval,           &AISpawnPoint::GetInterval          },
+    {&EV_Sentient_DontDropWeapons,    &AISpawnPoint::SetDontDropWeapons   },
+    {&EV_Sentient_GetDontDropWeapons, &AISpawnPoint::GetDontDropWeapons   },
+    {&EV_SetDontDropHealth,           &AISpawnPoint::SetDontDropHealth    },
+    {&EV_GetDontDropHealth,           &AISpawnPoint::GetDontDropHealth    },
+    {&EV_Actor_GetFavoriteEnemy,      &AISpawnPoint::GetFavoriteEnemy     },
+    {&EV_Actor_SetFavoriteEnemy2,     &AISpawnPoint::SetFavoriteEnemy     },
+    {&EV_Actor_SetNoSurprise2,        &AISpawnPoint::SetNoSurprise        },
+    {&EV_Actor_GetNoSurprise,         &AISpawnPoint::GetNoSurprise        },
+    {&EV_Actor_SetPatrolPath,         &AISpawnPoint::SetPatrolPath        },
+    {&EV_Actor_GetPatrolPath,         &AISpawnPoint::GetPatrolPath        },
+    {&EV_Actor_SetTurret,             &AISpawnPoint::SetTurret            },
+    {&EV_Actor_GetTurret,             &AISpawnPoint::GetTurret            },
+    {&EV_Actor_SetAlarmNode,          &AISpawnPoint::SetAlarmNode         },
+    {&EV_Actor_GetAlarmNode,          &AISpawnPoint::GetAlarmNode         },
+    {&EV_Actor_SetWeapon,             &AISpawnPoint::SetWeapon            },
+    {&EV_Actor_GetWeapon,             &AISpawnPoint::GetWeapon            },
+    {&EV_SetTarget,                   &AISpawnPoint::SetTarget            },
+    {&EV_GetTarget,                   &AISpawnPoint::GetTarget            },
+    {&EV_Actor_SetVoiceType,          &AISpawnPoint::SetVoiceType         },
+    {&EV_Actor_GetVoiceType,          &AISpawnPoint::GetVoiceType         },
+    {&EV_Sentient_ForceDropWeapon,    &AISpawnPoint::SetForceDropWeapon   },
+    {&EV_Sentient_GetForceDropWeapon, &AISpawnPoint::GetForceDropWeapon   },
+    {&EV_Sentient_ForceDropHealth,    &AISpawnPoint::SetForceDropHealth   },
+    {&EV_Sentient_GetForceDropHealth, &AISpawnPoint::GetForceDropHealth   },
+    {NULL,                            NULL                                }
 };
 
 AISpawnPoint::AISpawnPoint()
 {
-	m_iHealth = 100;
-	m_iAccuracy = 20;
-	m_iAmmoGrenade = 0;
-	m_iBalconyHeight = 128;
-	m_iDisguiseLevel = 1;
-	m_fDisguisePeriod = 30000;
-	m_fDisguiseRange = 256;
-	m_fEnemyShareRange = 0;
-	m_fFixedLeash = 0.0;
-	m_fGrenadeAwareness = 20.0;
-	m_fMaxNoticeTimeScale = 1;
-	m_fSoundAwareness = 100;
-	m_bPatrolWaitTrigger = 0;
-	m_fHearing = 2048;
-	m_fSight = world->m_fAIVisionDistance;
-	m_fFov = 90;
-	m_fLeash = 512;
-	m_fMinDist = 128.0;
-	m_fMaxDist = 1024;
-	m_fInterval = 128.0;
-	m_bDontDropWeapons = 0;
-	m_bDontDropHealth = 0;
-	m_bNoSurprise = 0;
-	m_bForceDropWeapon = 0;
-	m_bForceDropHealth = 0;
+    m_iHealth = 100;
+
+    m_iAccuracy      = 20;
+    m_iAmmoGrenade   = 0;
+    m_iBalconyHeight = 128;
+
+    m_iDisguiseLevel  = 1;
+    m_fDisguisePeriod = 30000;
+    m_fDisguiseRange  = 256;
+
+    m_fEnemyShareRange = 0;
+    m_fFixedLeash      = 0.0;
+
+    m_fGrenadeAwareness   = 20.0;
+    m_fMaxNoticeTimeScale = 1;
+    m_fSoundAwareness     = 100;
+
+    m_bPatrolWaitTrigger = false;
+
+    m_fHearing  = 2048;
+    m_fSight    = world->m_fAIVisionDistance;
+    m_fFov      = 90;
+    m_fLeash    = 512;
+    m_fMinDist  = 128.0;
+    m_fMaxDist  = 1024;
+    m_fInterval = 128.0;
+
+    m_bDontDropWeapons = false;
+    m_bDontDropHealth  = false;
+    m_bNoSurprise      = false;
+    m_bForceDropWeapon = false;
+    m_bForceDropHealth = false;
 }
 
 void AISpawnPoint::GetForceDropHealth(Event *ev)
@@ -1336,7 +2535,10 @@ void AISpawnPoint::GetForceDropHealth(Event *ev)
 
 void AISpawnPoint::SetForceDropHealth(Event *ev)
 {
-    // This is a bug on original mohaab (2.30 and 2.40), it should be m_bForceDropHealth
+    // Fixed in OPM
+    //  This does look like a mistake on original mohaab (2.30 and 2.40)
+    //  it should be m_bForceDropHealth.
+    //  That's the reason why AI often don't drop weapons
     //m_bForceDropWeapon = ev->GetBoolean(1);
     m_bForceDropHealth = ev->GetBoolean(1);
 }
@@ -1503,12 +2705,12 @@ void AISpawnPoint::SetFov(Event *ev)
 
 void AISpawnPoint::SetSight(Event *ev)
 {
-    ev->AddFloat(m_fSight);
+    m_fSight = ev->GetFloat(1);
 }
 
 void AISpawnPoint::GetSight(Event *ev)
 {
-    m_fSight = ev->GetFloat(1);
+    ev->AddFloat(m_fSight);
 }
 
 void AISpawnPoint::GetHearing(Event *ev)
diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index c40028de..16ed9600 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -26,25 +26,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "animate.h"
 
 typedef enum {
-	CONTROLLER_ALLIES,
-	CONTROLLER_AXIS,
+    CONTROLLER_AXIS,
+    CONTROLLER_ALLIES,
     CONTROLLER_DRAW
 } eController;
 
-#define PT_SPAWNFLAG_PLAY_FIRE_SOUND    1
-#define PT_SPAWNFLAG_TARGET_RANDOM      4
-#define PT_SPAWNFLAG_TURN_ON            8
-#define PT_SPAWNFLAG_SET_YAW            16
-#define PT_SPAWNFLAG_SET_ROLL           32
-#define PT_SPAWNFLAG_TARGET_PLAYER      64
-#define PT_SPAWNFLAG_HIDDEN             128
+#define PT_SPAWNFLAG_PLAY_FIRE_SOUND   1
+#define PT_SPAWNFLAG_PLAY_MOTION_SOUND 2
+#define PT_SPAWNFLAG_TARGET_RANDOM     4
+#define PT_SPAWNFLAG_TURN_ON           8
+#define PT_SPAWNFLAG_ROTATE_YAW        16
+#define PT_SPAWNFLAG_ROTATE_ROLL       32
+#define PT_SPAWNFLAG_TARGET_PLAYER     64
+#define PT_SPAWNFLAG_HIDDEN            128
 
 void ClearProjectileTargets();
 
 class ProjectileTarget : public Entity
 {
 private:
-    int m_iTarget;
+    int m_iID;
 
 public:
     CLASS_PROTOTYPE(ProjectileTarget);
@@ -52,7 +53,9 @@ public:
     ProjectileTarget();
 
     void EventSetId(Event *ev);
-    int GetTarget() const;
+    int  GetId() const;
+
+    void Archive(Archiver& arc) override;
 };
 
 #define MAX_PROJECTILE_GENERATOR_TARGETS 16
@@ -101,20 +104,28 @@ public:
     bool ShouldStartOn() const;
     bool ShouldHideModel() const;
     bool ShouldPlayFireSound() const;
+    bool ShouldPlayMotionSound() const;
+    bool ShouldRotateYaw() const;
+    bool ShouldRotateRoll() const;
 
-    void EventIsTurnedOn(Event *ev);
-    void EventGetTargetEntity(Event *ev);
-    void EventLaunchSound(Event *ev);
-    void SetTarget(Event *ev);
-    void OnInitialize(Event *ev);
-    void TurnOff(Event *ev);
-    void TurnOn(Event *ev);
-    bool ShouldTargetRandom() const;
-    void ChooseTarget();
+    void    EventIsTurnedOn(Event *ev);
+    void    EventGetTargetEntity(Event *ev);
+    void    EventLaunchSound(Event *ev);
+    void    SetTarget(Event *ev);
+    void    SetTarget(Entity *ent);
+    void    OnInitialize(Event *ev);
+    void    TurnOff(Event *ev);
+    void    TurnOn(Event *ev);
+    bool    ShouldTargetRandom() const;
+    Entity *ChooseTarget();
 
     void         GetLocalTargets();
     bool         ShouldTargetPlayer() const;
-    void         GetTargetPos(Entity *target);
+    Vector       GetTargetPos(Entity *target);
+    void         GetMuzzlePos(Vector& pos);
+    void         Fire();
+    void         TryLaunchSound();
+    void         SetWeaponAnim(const char *name, Event *ev);
     void         EventAccuracy(Event *ev);
     void         EventMaxDelay(Event *ev);
     void         EventMinDelay(Event *ev);
@@ -125,11 +136,11 @@ public:
     void         EventMaxDuration(Event *ev);
     void         EventMinDuration(Event *ev);
     void         SetWeaponModel(Event *ev);
-	void         EventSetId(Event* ev);
-	void         EventmaxDonut(Event* ev);
-	void         EventminDonut(Event* ev);
-	void         EventarcDonut(Event* ev);
-	void         EventisDonut(Event* ev);
+    void         EventSetId(Event *ev);
+    void         EventmaxDonut(Event *ev);
+    void         EventminDonut(Event *ev);
+    void         EventarcDonut(Event *ev);
+    void         EventisDonut(Event *ev);
     virtual bool Attack(int count);
 
     void Archive(Archiver& arc) override;
@@ -154,8 +165,9 @@ public:
     void PlayPreImpactSound(Event *ev);
     void SetProjectileModel(Event *ev);
 
-    bool Attack(int count) override;
-    void Archive(Archiver& arc) override;
+    float EstimateImpactTime(const Vector& targetOrigin, const Vector& fromOrigin, float speed) const;
+    bool  Attack(int count) override;
+    void  Archive(Archiver& arc) override;
 };
 
 class ProjectileGenerator_Gun : public ProjectileGenerator
@@ -196,6 +208,7 @@ public:
     void SetBulletRange(Event *ev);
 
     bool Attack(int count) override;
+    bool TickWeaponAnim();
     void TickCycle(Event *ev) override;
     void Archive(Archiver& arc) override;
 };
@@ -238,6 +251,8 @@ public:
 
     ThrobbingBox_Explosive();
 
+    bool ShouldDoExplosion();
+
     void SetExplosionOffset(Event *ev);
     void SetExplosionEffect(Event *ev);
     void SetTriggered(Event *ev);
@@ -262,24 +277,36 @@ class ThrobbingBox_ExplodePlayerFlak88 : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerFlak88);
+
+public:
+    ThrobbingBox_ExplodePlayerFlak88();
 };
 
 class ThrobbingBox_ExplodeFlak88 : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodeFlak88);
+
+public:
+    ThrobbingBox_ExplodeFlak88();
 };
 
 class ThrobbingBox_ExplodeNebelwerfer : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodeNebelwerfer);
+
+public:
+    ThrobbingBox_ExplodeNebelwerfer();
 };
 
 class ThrobbingBox_ExplodePlayerNebelwerfer : public ThrobbingBox_Explosive
 {
 public:
     CLASS_PROTOTYPE(ThrobbingBox_ExplodePlayerNebelwerfer);
+
+public:
+    ThrobbingBox_ExplodePlayerNebelwerfer();
 };
 
 #define TBE_SPAWNFLAG_DESTROYED_MODEL 1
@@ -293,6 +320,8 @@ private:
 public:
     CLASS_PROTOTYPE(ThrobbingBox_Stickybomb);
 
+    ThrobbingBox_Stickybomb();
+
     void OnStickyBombWet(Event *ev);
     void OnStickyBombUse(Event *ev);
 
@@ -312,7 +341,7 @@ public:
 
     Objective();
 
-    void   Archive(Archiver  &arc) override;
+    void   Archive(Archiver& arc) override;
     void   TurnOn(Event *ev);
     void   TurnOff(Event *ev);
     void   Complete(Event *ev);
@@ -327,6 +356,10 @@ class FencePost : public Entity
 {
 public:
     CLASS_PROTOTYPE(FencePost);
+
+    FencePost();
+
+    void Killed(Event* ev) override;
 };
 
 class AISpawnPoint : public SimpleArchivedEntity
diff --git a/code/fgame/Tow_Entities.cpp b/code/fgame/Tow_Entities.cpp
index ea10c309..b59c2ec7 100644
--- a/code/fgame/Tow_Entities.cpp
+++ b/code/fgame/Tow_Entities.cpp
@@ -114,19 +114,105 @@ void TOWObjectiveMan::TakeOverObjective(eController controller, eController cont
     }
 }
 
-Event EV_SetController("ControlledBy", EV_DEFAULT, "i", "ControlledBy", "Sets the team controlling the objective");
-Event EV_TakeOver(
-    "TakeOver", EV_DEFAULT, "i", "TeamNum", "Sets the team controlling the objective. 0 = Axis, 1 = Allies"
+//---------------------------------------------------------------------------------------------
+/*QUAKED func_TOWObjective (1.0 0.0 1.0) (-12 -12 -12) (12 12 12) StartOn Respawner
+
+  This object is an extension of the standard objective object.  It is used for Tug of War
+  Maps.
+
+  object used to simplify placing objectives.  You may optionally connect this object to the
+  target you want to use for the compass position....
+
+  Checkboxes:
+	StartOn - check this if you want this objective to be displayed when the level first loads
+
+	Respawner - check this if the objective is the respawn point for a team.  If you set this
+	you must set ControlledBy to a valid team and not Neutral.
+
+
+  Parameters:
+  ControlledBy			0 = Axis, 1 = Allies, 2 = Neutral
+  AxisObjNum			1 - 5.  Set the objective number for the axis.  This will associate the objective with
+						the check box for the corresponding text in the score screen.
+  AlliesObjNum			1 - 5.  Set the objective number for the allies.  This will associate the objective with
+						the check box for the corresponding text in the score screen.
+
+  ObjectiveNbr			<nObjNbr=0>	Please ignore this for now.
+
+  Events:
+	TurnOn
+	TurnOff
+	Complete
+	Text <sNewText>
+	SetCurrent
+	SetController <ControlledBy> - This will set the starting controller default is neutral.  See ControlledBy var above.
+
+//---------------------------------------------------------------------------------------------
+*/
+
+Event EV_SetController
+(
+    "ControlledBy",
+    EV_DEFAULT,
+    "i",
+    "ControlledBy",
+    "Sets the team controlling the objective",
+    EV_NORMAL
 );
-Event EV_SetAxisObjNum("AxisObjNum", EV_DEFAULT, "i", "AxisObjNum", "Sets the objective number for the axis team");
-Event EV_SetAlliesObjNum(
-    "AlliesObjNum", EV_DEFAULT, "i", "AlliesObjNum", "Sets the objective number for the allies team"
+Event EV_TakeOver
+(
+    "TakeOver",
+    EV_DEFAULT,
+    "i",
+    "TeamNum",
+    "Sets the team controlling the objective. 0 = Axis, 1 = Allies",
+    EV_NORMAL
 );
-static Event EV_Initialize("initialize", EV_DEFAULT, 0, 0, "Initialize object");
-static Event EV_SetCurrent(
-    "SetCurrent", EV_DEFAULT, "i", "TeamNum", "Set this objective as the current objective for the specified team."
+Event EV_SetAxisObjNum
+(
+    "AxisObjNum",
+    EV_DEFAULT,
+    "i",
+    "AxisObjNum",
+    "Sets the objective number for the axis team",
+    EV_NORMAL
+);
+Event EV_SetAlliesObjNum
+(
+    "AlliesObjNum",
+    EV_DEFAULT,
+    "i",
+    "AlliesObjNum",
+    "Sets the objective number for the allies team",
+    EV_NORMAL
+);
+static Event EV_Initialize
+(
+    "initialize",
+    EV_DEFAULT,
+    0,
+    0,
+    "Initialize object",
+    EV_NORMAL
+);
+static Event EV_SetCurrent
+(
+    "SetCurrent",
+    EV_DEFAULT,
+    "i",
+    "TeamNum",
+    "Set this objective as the current objective for the specified team.",
+    EV_NORMAL
+);
+Event EV_GetController
+(
+    "ControlledBy",
+    EV_DEFAULT,
+    0,
+    0,
+    "Objective controller",
+    EV_GETTER
 );
-Event EV_GetController("ControlledBy", EV_DEFAULT, 0, 0, "Objective controller", EV_GETTER);
 
 CLASS_DECLARATION(Objective, TOWObjective, "func_towobjective") {
     {&EV_SetController,   &TOWObjective::SetController  },
@@ -183,18 +269,19 @@ void TOWObjective::TakeOver(Event *ev)
 
     switch (controller) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     default:
         break;
     }
 
     g_TOWObjectiveMan.TakeOverObjective(m_eController, controller);
+    m_eController = controller;
 
     if (m_bNoRespawnForLeading) {
         //
@@ -216,18 +303,18 @@ void TOWObjective::SetAxisObjNum(Event *ev)
 
 void TOWObjective::OnInitialize(Event *ev)
 {
-	m_sAlliesObjName = "tow_allied_obj" + str(m_iAlliesObjNum);
-	m_sAxisObjName = "tow_allied_obj" + str(m_iAxisObjNum);
+    m_sAlliesObjName = "tow_allied_obj" + str(m_iAlliesObjNum);
+    m_sAxisObjName   = "tow_axis_obj" + str(m_iAxisObjNum);
 
     switch (m_eController) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     case CONTROLLER_DRAW:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "0");
diff --git a/code/fgame/Tow_Entities.h b/code/fgame/Tow_Entities.h
index eee8cd6f..dca59a86 100644
--- a/code/fgame/Tow_Entities.h
+++ b/code/fgame/Tow_Entities.h
@@ -59,8 +59,8 @@ class TOWObjectiveMan
 {
 private:
     Container<TOWObjective *> m_towObjectives;
-    int                       m_iNumAxisObjectives;
     int                       m_iNumAlliesObjectives;
+    int                       m_iNumAxisObjectives;
 
 public:
     TOWObjectiveMan();
diff --git a/code/fgame/VehicleCollisionEntity.cpp b/code/fgame/VehicleCollisionEntity.cpp
index adf32d86..8c53faa6 100644
--- a/code/fgame/VehicleCollisionEntity.cpp
+++ b/code/fgame/VehicleCollisionEntity.cpp
@@ -24,72 +24,77 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "VehicleCollisionEntity.h"
 #include "g_phys.h"
 
-CLASS_DECLARATION( Entity, VehicleCollisionEntity, NULL )
-{
-	{ &EV_Damage,			&VehicleCollisionEntity::EventDamage },
-	{ NULL, NULL }
+Event EV_Owner
+(
+    "owner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "owner",
+    EV_GETTER
+);
+
+CLASS_DECLARATION(Entity, VehicleCollisionEntity, NULL) {
+    {&EV_Damage, &VehicleCollisionEntity::EventDamage},
+    {&EV_Owner,  &VehicleCollisionEntity::GetOwner   },
+    {NULL,       NULL                                }
 };
 
-VehicleCollisionEntity::VehicleCollisionEntity
-	(
-	Entity *ent
-	)
+VehicleCollisionEntity::VehicleCollisionEntity(Entity *ent)
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	edict->s.eType = ET_GENERAL;
+    edict->s.eType = ET_GENERAL;
 
-	m_pOwner = ent;
-	takedamage = DAMAGE_YES;
+    m_pOwner   = ent;
+    takedamage = DAMAGE_YES;
 
-	edict->s.renderfx &= ~RF_DONTDRAW;
-	edict->r.svFlags &= ~SVF_NOCLIENT;
+    showModel();
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_NOT);
 
-	setMoveType( MOVETYPE_PUSH );
-
-	edict->clipmask |= MASK_CLIP;
-	edict->s.eFlags |= EF_LINKANGLES;
+    edict->clipmask |= MASK_VEHICLE;
+    edict->s.eFlags |= EF_LINKANGLES;
 }
 
-VehicleCollisionEntity::VehicleCollisionEntity
-	(
-	void
-	)
+VehicleCollisionEntity::VehicleCollisionEntity(void)
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	gi.Error( ERR_DROP, "VehicleCollisionEntity Created with no parameters!\n" );
+    gi.Error(ERR_DROP, "VehicleCollisionEntity Created with no parameters!\n");
 }
 
-void VehicleCollisionEntity::EventDamage
-	(
-	Event *ev
-	)
+void VehicleCollisionEntity::GetOwner(Event *ev)
 {
-	Event *event = new Event( ev );
-
-	m_pOwner->ProcessEvent( event );
+    ev->AddListener(m_pOwner);
 }
 
-void VehicleCollisionEntity::Solid
-	(
-	void
-	)
+void VehicleCollisionEntity::Solid(void)
 {
-	setContents( CONTENTS_SOLID );
-	setSolidType( SOLID_BSP );
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
 }
 
-void VehicleCollisionEntity::NotSolid
-	(
-	void
-	)
+void VehicleCollisionEntity::NotSolid(void)
 {
-	setSolidType( SOLID_NOT );
+    setSolidType(SOLID_NOT);
+}
+
+void VehicleCollisionEntity::EventDamage(Event *ev)
+{
+    m_pOwner->ProcessEvent(*ev);
+}
+
+void VehicleCollisionEntity::Used(Event *ev)
+{
+    m_pOwner->ProcessEvent(*ev);
+}
+
+Entity *VehicleCollisionEntity::GetOwner() const
+{
+    return m_pOwner;
 }
diff --git a/code/fgame/VehicleCollisionEntity.h b/code/fgame/VehicleCollisionEntity.h
index f2b508a1..5185fc3c 100644
--- a/code/fgame/VehicleCollisionEntity.h
+++ b/code/fgame/VehicleCollisionEntity.h
@@ -21,40 +21,36 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // VehicleCollisionEntity.h : MOHAA vehicle collision
 
-#ifndef __VEHICLECOLLISIONENTITY_H__
-#define __VEHICLECOLLISIONENTITY_H__
+#pragma once
 
 #include "entity.h"
 
 class VehicleCollisionEntity : public Entity
 {
 private:
-	EntityPtr m_pOwner;
+    EntityPtr m_pOwner;
 
 private:
-	void			EventDamage( Event *ev );
+    void EventDamage(Event *ev);
+    void GetOwner(Event *ev);
+    void Used(Event *ev);
 
 public:
-	CLASS_PROTOTYPE( VehicleCollisionEntity );
+    CLASS_PROTOTYPE(VehicleCollisionEntity);
 
-	VehicleCollisionEntity( Entity *ent );
-	VehicleCollisionEntity();
+    VehicleCollisionEntity(Entity *ent);
+    VehicleCollisionEntity();
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 
-	void		Solid( void );
-	void		NotSolid( void );
+    void    Solid(void);
+    void    NotSolid(void);
+    Entity *GetOwner() const;
 };
 
-inline
-void VehicleCollisionEntity::Archive
-	(
-	Archiver& arc
-	)
+inline void VehicleCollisionEntity::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveSafePointer( &m_pOwner );
+    arc.ArchiveSafePointer(&m_pOwner);
 }
-
-#endif // __VEHICLECOLLISIONENTITY_H__
\ No newline at end of file
diff --git a/code/fgame/VehicleHalfTrack.cpp b/code/fgame/VehicleHalfTrack.cpp
index 72b83768..5e0341ad 100644
--- a/code/fgame/VehicleHalfTrack.cpp
+++ b/code/fgame/VehicleHalfTrack.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2018-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,42 +22,222 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleHalfTrack, "VehicleHalfTrack")
-{
-	{ &EV_Damage, &VehicleHalfTrack::EventDamage },
-	{ &EV_Killed, &VehicleHalfTrack::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleHalfTrack, "VehicleHalfTrack") {
+    {&EV_Damage, &VehicleHalfTrack::EventDamage},
+    {&EV_Killed, &VehicleHalfTrack::Killed     },
+    {NULL,       NULL                          }
 };
 
 VehicleHalfTrack::VehicleHalfTrack()
 {
-
-	;
 }
 
 void VehicleHalfTrack::Think()
 {
-	vmove_t vm;
-	flags |= FL_POSTTHINK;
+    vmove_t vm;
+    flags |= FL_POSTTHINK;
 
-	prev_velocity = velocity;
+    prev_velocity = velocity;
 
-	SetSlotsNonSolid();
+    SetSlotsNonSolid();
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 
-	SetSlotsSolid();
+    SetSlotsSolid();
 }
 
 void VehicleHalfTrack::Postthink()
 {
-	// FIXME: STUB
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    int          numnormals;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
+
+    primal_angles = angles;
+
+    if (drivable) {
+        if (m_bAutoPilot) {
+            AutoPilot();
+        }
+
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25 + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        temp = angles;
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        numnormals = 0;
+        for (index = 0; index < MAX_CORNERS; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8), t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+            start     = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end       = start + Vector(0, 0, -400);
+
+            trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_VEHICLE_TIRES, false, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0 || trace.startsolid) {
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        angles[2] = 0;
+
+        if (m_iNumNormals > 1) {
+            temp = normalsum / numnormals;
+            temp.normalize();
+            i = temp.CrossProduct(temp, j);
+
+            pitch     = i;
+            angles[0] = -pitch.toPitch();
+        }
+
+        turn = turnangle / 200.0;
+        if (groundentity) {
+            Vector newvel;
+            Vector flatvel;
+
+            velocity[0] *= 0.925f;
+            velocity[1] *= 0.925f;
+
+            flatvel = orientation[0];
+            velocity += flatvel * currentspeed;
+            flatvel[2] = 0;
+
+            drivespeed = Q_clamp_float(velocity * flatvel, -speed, speed);
+
+            newvel      = flatvel * drivespeed;
+            velocity[0] = newvel[0];
+            velocity[1] = newvel[1];
+            velocity[2] += drivespeed * jumpimpulse;
+
+            avelocity *= 0.05f;
+
+            if (steerinplace) {
+                if (drivespeed < 350) {
+                    drivespeed = 350;
+                }
+            }
+
+            avelocity.y += turn * drivespeed;
+        } else {
+            avelocity *= 0.1f;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed < 0) {
+            sound_name = "snd_backward";
+        } else {
+            sound_name = "snd_idle";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    n_angles = (angles - primal_angles) * level.frametime;
+    if (n_angles.x > 180 || n_angles.x < -180) {
+        n_angles.x = 0;
+    }
+    if (n_angles.y > 180 || n_angles.y < -180) {
+        n_angles.y = 0;
+    }
+    if (n_angles.z > 180 || n_angles.z < -180) {
+        n_angles.z = 0;
+    }
+
+    if (n_angles.x > -1 || n_angles.x < 1) {
+        n_angles.x = 0;
+    }
+    if (n_angles.y > -1 || n_angles.y < 1) {
+        n_angles.y = 0;
+    }
+    if (n_angles.z > -1 || n_angles.z < 1) {
+        n_angles.z = 0;
+    }
+
+    avelocity = n_angles;
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    last_origin = origin;
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
 }
 
-void VehicleHalfTrack::Killed(Event* ev)
+void VehicleHalfTrack::Killed(Event *ev)
 {
-	deadflag = DEAD_DEAD;
+    deadflag = DEAD_DEAD;
 }
diff --git a/code/fgame/VehicleSlot.cpp b/code/fgame/VehicleSlot.cpp
index c091e704..e4858da5 100644
--- a/code/fgame/VehicleSlot.cpp
+++ b/code/fgame/VehicleSlot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,131 +28,209 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 cVehicleSlot::cVehicleSlot()
 {
-	prev_takedamage = ( damage_t )-1;
-	prev_solid = ( solid_t )-1;
-	prev_contents = -1;
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
+    prev_contents   = -1;
+
+    prev_num_children = 0;
 }
 
-void cVehicleSlot::NotSolid
-	(
-	void
-	)
+void cVehicleSlot::NotSolid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & SLOT_BUSY)) {
+        return;
+    }
 
-	// Save previous values
-	prev_takedamage = ent->takedamage;
-	prev_solid = ent->edict->solid;
-	prev_contents = ent->edict->r.contents;
-	
-	ent->takedamage = DAMAGE_NO;
-	ent->setSolidType( SOLID_NOT );
+    if (!ent) {
+        return;
+    }
+
+    // Save previous values
+    prev_takedamage = ent->takedamage;
+    prev_solid      = ent->edict->solid;
+    prev_contents   = ent->edict->r.contents;
+
+    ent->takedamage = DAMAGE_NO;
+
+    prev_num_children = 0;
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        // Fixed in OPM
+        //  Check for solidity
+        if (sub && !sub->IsSubclassOfWeapon() && sub->getSolidType() != SOLID_NOT) {
+            // Fixed in OPM
+            //  Save children solidity so it can properly be restored later
+            prev_children_ent[prev_num_children]   = sub;
+            prev_children_solid[prev_num_children] = (solid_t)sub->getSolidType();
+            prev_num_children++;
+
+            sub->setSolidType(SOLID_NOT);
+        }
+    }
+
+    // Added in 2.0
+    // Commented in OPM
+    //  Not sure why since 2.0, players aren't made non-solid in slots
+    //if (!ent->IsSubclassOfPlayer()) {
+    //    ent->setSolidType(SOLID_NOT);
+    //}
+
+    ent->setSolidType(SOLID_NOT);
 }
 
-void cVehicleSlot::Solid
-	(
-	void
-	)
+void cVehicleSlot::Solid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i, j;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	// Restore previous values
-	ent->takedamage = prev_takedamage;
-	ent->setSolidType( prev_solid );
-	ent->edict->r.contents = prev_contents;
+    if (!ent) {
+        return;
+    }
 
-	// Save previous values
-	prev_takedamage = ( damage_t )-1;
-	prev_solid = ( solid_t )-1;
-	prev_contents = -1;
+    // Restore previous values
+    ent->takedamage = prev_takedamage;
+    ent->setSolidType(prev_solid);
+    ent->setContents(prev_contents);
+
+    // Save previous values
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
+    prev_contents   = -1;
+
+    //
+    // Fixed in OPM
+    //  Restore children solidity
+    //
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            for (j = 0; j < prev_num_children; j++) {
+                if (prev_children_ent[j] == sub) {
+                    sub->setSolidType(prev_children_solid[j]);
+                }
+            }
+
+            //sub->setSolidType(SOLID_NOT);
+        }
+    }
+
+    prev_num_children = 0;
 }
 
 cTurretSlot::cTurretSlot()
 {
-	owner_prev_takedamage = ( damage_t )-1;
-	owner_prev_solid = ( solid_t )-1;
-	owner_prev_contents = -1;
+    owner_prev_takedamage = (damage_t)-1;
+    owner_prev_solid      = (solid_t)-1;
+    owner_prev_contents   = -1;
 }
 
-void cTurretSlot::NotSolid
-	(
-	void
-	)
+void cTurretSlot::NotSolid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	cVehicleSlot::NotSolid();
+    if (!ent) {
+        return;
+    }
 
-	if( ent->IsSubclassOfTurretGun() )
-	{
-		TurretGun *turret = ( TurretGun * )ent.Pointer();
-		Entity *owner = turret->GetOwner();
+    // Save previous values
+    prev_takedamage = ent->takedamage;
+    prev_solid      = ent->edict->solid;
+    prev_contents   = ent->edict->r.contents;
 
-		if( owner )
-		{
-			owner_prev_takedamage = owner->takedamage;
-			owner_prev_solid = owner->edict->solid;
-			owner_prev_contents = owner->edict->r.contents;
+    ent->takedamage = DAMAGE_NO;
+    ent->setSolidType(SOLID_NOT);
 
-			owner->takedamage = DAMAGE_NO;
-			owner->setSolidType( SOLID_NOT );
-		}
-	}
+    if (ent->IsSubclassOfTurretGun()) {
+        TurretGun *turret = static_cast<TurretGun *>(ent.Pointer());
+        Entity    *owner  = turret->GetOwner();
+
+        if (owner) {
+            owner_prev_takedamage = owner->takedamage;
+            owner_prev_solid      = owner->edict->solid;
+            owner_prev_contents   = owner->edict->r.contents;
+
+            owner->takedamage = DAMAGE_NO;
+            owner->setSolidType(SOLID_NOT);
+        }
+    }
+
+    prev_num_children = 0;
+
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        // Fixed in OPM
+        //  Check for solidity
+        if (sub && !sub->IsSubclassOfWeapon() && sub->getSolidType() != SOLID_NOT) {
+            // Fixed in OPM
+            //  Save children solidity so it can properly be restored later
+            prev_children_ent[prev_num_children]   = sub;
+            prev_children_solid[prev_num_children] = (solid_t)sub->getSolidType();
+            prev_num_children++;
+
+            sub->setSolidType(SOLID_NOT);
+        }
+    }
 }
 
-void cTurretSlot::Solid
-	(
-	void
-	)
+void cTurretSlot::Solid(void)
 {
-	if( !( flags & FL_SWIM ) )
-	{
-		return;
-	}
+    int i, j;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!(flags & FL_SWIM)) {
+        return;
+    }
 
-	cVehicleSlot::NotSolid();
+    if (!ent) {
+        return;
+    }
 
-	if( ent->IsSubclassOfTurretGun() )
-	{
-		TurretGun *turret = ( TurretGun * )ent.Pointer();
-		Entity *owner = turret->GetOwner();
+    // Restore previous values
+    ent->takedamage = prev_takedamage;
+    ent->setSolidType(prev_solid);
 
-		if( owner )
-		{
-			owner->takedamage = owner_prev_takedamage;
-			owner->setSolidType( owner_prev_solid );
+    // Save previous values
+    prev_takedamage = (damage_t)-1;
+    prev_solid      = (solid_t)-1;
 
-			owner_prev_takedamage = ( damage_t )-1;
-			owner_prev_solid = ( solid_t )-1;
-		}
-	}
+    if (ent->IsSubclassOfTurretGun()) {
+        TurretGun *turret = static_cast<TurretGun *>(ent.Pointer());
+        Entity    *owner  = turret->GetOwner();
+
+        if (owner) {
+            owner->takedamage = owner_prev_takedamage;
+            owner->setSolidType(owner_prev_solid);
+
+            owner_prev_takedamage = (damage_t)-1;
+            owner_prev_solid      = (solid_t)-1;
+        }
+    }
+
+    //
+    // Fixed in OPM
+    //  Restore children solidity
+    //
+    for (i = 0; i < ent->numchildren; i++) {
+        Entity *sub = G_GetEntity(ent->children[i]);
+        if (sub && !sub->IsSubclassOfWeapon()) {
+            for (j = 0; j < prev_num_children; j++) {
+                if (prev_children_ent[j] == sub) {
+                    sub->setSolidType(prev_children_solid[j]);
+                }
+            }
+
+            //sub->setSolidType(SOLID_NOT);
+        }
+    }
+
+    prev_num_children = 0;
 }
diff --git a/code/fgame/VehicleSlot.h b/code/fgame/VehicleSlot.h
index 98e46523..509c3d31 100644
--- a/code/fgame/VehicleSlot.h
+++ b/code/fgame/VehicleSlot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,78 +23,76 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // VehicleSlot.h
 //
 
-#ifndef __VEHICLESLOT_H__
-#define __VEHICLESLOT_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
 #include "entity.h"
 
-#define SLOT_FREE		1
-#define SLOT_BUSY		2
-#define SLOT_UNUSED		4
+#define SLOT_FREE   1
+#define SLOT_BUSY   2
+#define SLOT_UNUSED 4
 
-class cVehicleSlot : public Class {
+class cVehicleSlot : public Class
+{
 public:
-	SafePtr<Entity> ent;
-	int flags;
-	int boneindex;
-	int enter_boneindex;
+    SafePtr<Entity> ent;
+    int             flags;
+    int             boneindex;
+    int             enter_boneindex;
 
-private:
-	damage_t prev_takedamage;
-	solid_t prev_solid;
-	int prev_contents;
+protected:
+    damage_t prev_takedamage;
+    solid_t  prev_solid;
+    int      prev_contents;
+
+    //
+    // Added in OPM
+    //  Used for properly saving and restoring children solidity
+    Entity *prev_children_ent[MAX_MODEL_CHILDREN];
+    solid_t prev_children_solid[MAX_MODEL_CHILDREN];
+    int     prev_num_children;
 
 public:
-	cVehicleSlot();
+    cVehicleSlot();
 
-	virtual void NotSolid( void );
-	virtual void Solid( void );
-	void Archive( Archiver& arc ) override;
+    virtual void NotSolid(void);
+    virtual void Solid(void);
+    void         Archive(Archiver& arc) override;
 };
 
-inline
-void cVehicleSlot::Archive
-	(
-	Archiver& arc
-	)
+inline void cVehicleSlot::Archive(Archiver& arc)
 {
-	Class::Archive( arc );
+    Class::Archive(arc);
 
-	arc.ArchiveSafePointer( &ent );
-	arc.ArchiveInteger( &flags );
-	arc.ArchiveInteger( &boneindex );
-	arc.ArchiveInteger( &enter_boneindex );
-	ArchiveEnum( prev_takedamage, damage_t );
-	ArchiveEnum( prev_solid, solid_t );
-	arc.ArchiveInteger( &prev_contents );
+    arc.ArchiveSafePointer(&ent);
+    arc.ArchiveInteger(&flags);
+    arc.ArchiveInteger(&boneindex);
+    arc.ArchiveInteger(&enter_boneindex);
+    ArchiveEnum(prev_takedamage, damage_t);
+    ArchiveEnum(prev_solid, solid_t);
+    arc.ArchiveInteger(&prev_contents);
 }
 
-class cTurretSlot : public cVehicleSlot {
-	damage_t owner_prev_takedamage;
-	solid_t owner_prev_solid;
-	int owner_prev_contents;
+class cTurretSlot : public cVehicleSlot
+{
+    damage_t owner_prev_takedamage;
+    solid_t  owner_prev_solid;
+    int      owner_prev_contents;
 
 public:
-	cTurretSlot();
+    cTurretSlot();
 
-	void NotSolid( void ) override;
-	void Solid( void ) override;
-	void Archive( Archiver& arc ) override;
+    void NotSolid(void) override;
+    void Solid(void) override;
+    void Archive(Archiver& arc) override;
 };
 
-inline
-void cTurretSlot::Archive
-	(
-	Archiver& arc
-	)
+inline void cTurretSlot::Archive(Archiver& arc)
 {
-	cVehicleSlot::Archive( arc );
+    cVehicleSlot::Archive(arc);
 
-	ArchiveEnum( owner_prev_takedamage, damage_t );
-	ArchiveEnum( owner_prev_solid, solid_t );
-	arc.ArchiveInteger( &owner_prev_contents );
+    ArchiveEnum(owner_prev_takedamage, damage_t);
+    ArchiveEnum(owner_prev_solid, solid_t);
+    arc.ArchiveInteger(&owner_prev_contents);
 }
-
-#endif // __VEHICLESLOT_H__
diff --git a/code/fgame/VehicleSoundEntity.cpp b/code/fgame/VehicleSoundEntity.cpp
index cc3f2c5a..284b4094 100644
--- a/code/fgame/VehicleSoundEntity.cpp
+++ b/code/fgame/VehicleSoundEntity.cpp
@@ -26,159 +26,128 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "vehicle.h"
 
 Event EV_VehicleSoundEntity_PostSpawn
-	(
-	"vehiclesoundentity_post",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"PostSpawn of a Vehicle Sound Entity"
-	);
+(
+    "vehiclesoundentity_post",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "PostSpawn of a Vehicle Sound Entity"
+);
 
 Event EV_VehicleSoundEntity_UpdateTraces
-	(
-	"vehiclesoudnentity_updatetraces",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Updates the traces of a Vehicle Sound Entity"
-	);
+(
+    "vehiclesoudnentity_updatetraces",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Updates the traces of a Vehicle Sound Entity"
+);
 
-CLASS_DECLARATION( Entity, VehicleSoundEntity, NULL )
-{
-	{ &EV_VehicleSoundEntity_PostSpawn,							&VehicleSoundEntity::EventPostSpawn },
-	{ &EV_VehicleSoundEntity_UpdateTraces,						&VehicleSoundEntity::EventUpdateTraces },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, VehicleSoundEntity, NULL) {
+    {&EV_VehicleSoundEntity_PostSpawn,    &VehicleSoundEntity::EventPostSpawn   },
+    {&EV_VehicleSoundEntity_UpdateTraces, &VehicleSoundEntity::EventUpdateTraces},
+    {NULL,                                NULL                                  }
 };
 
 VehicleSoundEntity::VehicleSoundEntity()
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	gi.Error( ERR_DROP, "VehicleSoundEntity Created with no parameters!\n" );
+    gi.Error(ERR_DROP, "VehicleSoundEntity Created with no parameters!\n");
 }
 
-VehicleSoundEntity::VehicleSoundEntity( Vehicle *owner )
+VehicleSoundEntity::VehicleSoundEntity(Vehicle *owner)
 {
-	m_pVehicle = owner;
-	m_bDoSoundStuff = false;
-	m_iTraceSurfaceFlags = 0;
+    m_pVehicle           = owner;
+    m_bDoSoundStuff      = false;
+    m_iTraceSurfaceFlags = 0;
 
-	PostEvent( EV_VehicleSoundEntity_PostSpawn, EV_POSTSPAWN );
+    PostEvent(EV_VehicleSoundEntity_PostSpawn, EV_POSTSPAWN);
 }
 
-void VehicleSoundEntity::Start
-	(
-	void
-	)
+void VehicleSoundEntity::Start(void)
 {
-	m_bDoSoundStuff = true;
+    m_bDoSoundStuff = true;
 }
 
-void VehicleSoundEntity::Stop
-	(
-	void
-	)
+void VehicleSoundEntity::Stop(void)
 {
-	m_bDoSoundStuff = false;
+    m_bDoSoundStuff = false;
 }
 
-void VehicleSoundEntity::Think
-	(
-	void
-	)
+void VehicleSoundEntity::Think(void)
 {
-	DoSoundStuff();
+    DoSoundStuff();
 }
 
-void VehicleSoundEntity::EventPostSpawn
-	(
-	Event *ev
-	)
+void VehicleSoundEntity::EventPostSpawn(Event *ev)
 {
-	setModel( "models/vehicles/vehiclesoundentity.tik" );
+    setModel("models/vehicles/vehiclesoundentity.tik");
 
-	PostEvent( EV_VehicleSoundEntity_UpdateTraces, 1.0f );
-	flags |= FL_THINK;
+    PostEvent(EV_VehicleSoundEntity_UpdateTraces, 1.0f);
+    flags |= FL_THINK;
 }
 
-void VehicleSoundEntity::EventUpdateTraces
-	(
-	Event *ev
-	)
+void VehicleSoundEntity::EventUpdateTraces(Event *ev)
 {
-	if( m_bDoSoundStuff )
-	{
-		m_pVehicle->SetSlotsNonSolid();
+    if (m_bDoSoundStuff) {
+        m_pVehicle->SetSlotsNonSolid();
 
-		trace_t trace = G_Trace(
-			origin,
-			vec3_origin,
-			vec3_origin,
-			Vector( origin[ 0 ], origin[ 1 ], origin[ 2 ] - 256.0f ),
-			m_pVehicle->edict,
-			MASK_SOUND,
-			qfalse,
-			"VehicleSoundEntity::DoSoundStuff"
-			);
+        trace_t trace = G_Trace(
+            origin,
+            vec3_origin,
+            vec3_origin,
+            Vector(origin[0], origin[1], origin[2] - 256.0f),
+            m_pVehicle->edict,
+            MASK_SOUND,
+            qfalse,
+            "VehicleSoundEntity::DoSoundStuff"
+        );
 
-		if( trace.fraction >= 1.0f )
-			m_iTraceSurfaceFlags = 0;
-		else
-			m_iTraceSurfaceFlags = trace.surfaceFlags;
+        if (trace.fraction >= 1.0f) {
+            m_iTraceSurfaceFlags = 0;
+        } else {
+            m_iTraceSurfaceFlags = trace.surfaceFlags;
+        }
 
-		m_pVehicle->SetSlotsSolid();
-	}
+        m_pVehicle->SetSlotsSolid();
+    }
 
-	PostEvent( EV_VehicleSoundEntity_UpdateTraces, 1.0f );
+    PostEvent(EV_VehicleSoundEntity_UpdateTraces, 1.0f);
 }
 
-void VehicleSoundEntity::DoSoundStuff
-	(
-	void
-	)
+void VehicleSoundEntity::DoSoundStuff(void)
 {
-	float pitch;
+    float pitch;
 
-	if( !m_bDoSoundStuff )
-	{
-		StopLoopSound();
-		return;
-	}
+    if (!m_bDoSoundStuff) {
+        StopLoopSound();
+        return;
+    }
 
-	pitch = ( velocity.length() - m_pVehicle->m_fSoundMinSpeed ) / ( m_pVehicle->m_fSoundMaxSpeed - m_pVehicle->m_fSoundMinSpeed );
-	if( pitch > 1.0f ) {
-		pitch = 1.0f;
-	} else if( pitch < 0.0f ) {
-		pitch = 0.0f;
-	}
+    pitch = (velocity.length() - m_pVehicle->m_fSoundMinSpeed)
+          / (m_pVehicle->m_fSoundMaxSpeed - m_pVehicle->m_fSoundMinSpeed);
+    if (pitch > 1.0f) {
+        pitch = 1.0f;
+    } else if (pitch < 0.0f) {
+        pitch = 0.0f;
+    }
 
-	pitch *= m_pVehicle->m_fSoundMinPitch + ( m_pVehicle->m_fSoundMaxPitch - m_pVehicle->m_fSoundMinPitch );
+    pitch *= m_pVehicle->m_fSoundMinPitch + (m_pVehicle->m_fSoundMaxPitch - m_pVehicle->m_fSoundMinPitch);
 
-	if( m_iTraceSurfaceFlags & SURF_DIRT )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_dirt", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_GRASS )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_grass", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_WOOD )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_wood", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & SURF_MUD )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_mud", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else if( m_iTraceSurfaceFlags & ( SURF_GRAVEL | SURF_ROCK ) )
-	{
-		LoopSound( m_pVehicle->m_sSoundSet + "treat_snd_stone", -1.0f, -1.0f, -1.0f, pitch );
-	}
-	else
-	{
-		StopLoopSound();
-	}
+    if (m_iTraceSurfaceFlags & SURF_DIRT) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_dirt", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_GRASS) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_grass", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_WOOD) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_wood", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & SURF_MUD) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_mud", -1.0f, -1.0f, -1.0f, pitch);
+    } else if (m_iTraceSurfaceFlags & (SURF_GRAVEL | SURF_ROCK) || m_iTraceSurfaceFlags == 0) {
+        LoopSound(m_pVehicle->m_sSoundSet + "tread_snd_stone", -1.0f, -1.0f, -1.0f, pitch);
+    } else {
+        StopLoopSound();
+    }
 }
diff --git a/code/fgame/VehicleSoundEntity.h b/code/fgame/VehicleSoundEntity.h
index fa41dc65..2b5c93d5 100644
--- a/code/fgame/VehicleSoundEntity.h
+++ b/code/fgame/VehicleSoundEntity.h
@@ -21,47 +21,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // VehicleSoundEntity.h : Sound helper for vehicles
 
-#ifndef __VEHICLESOUNDENTITY_H__
-#define __VEHICLESOUNDENTITY_H__
+#pragma once
 
 #include "entity.h"
 
 class Vehicle;
 
-class VehicleSoundEntity : public Entity {
+class VehicleSoundEntity : public Entity
+{
 private:
-	SafePtr<Vehicle> m_pVehicle;
-	bool m_bDoSoundStuff;
-	int m_iTraceSurfaceFlags;
+    SafePtr<Vehicle> m_pVehicle;
+    bool             m_bDoSoundStuff;
+    int              m_iTraceSurfaceFlags;
 
 public:
-	CLASS_PROTOTYPE( VehicleSoundEntity );
+    CLASS_PROTOTYPE(VehicleSoundEntity);
 
-	VehicleSoundEntity();
-	VehicleSoundEntity( Vehicle *owner );
+    VehicleSoundEntity();
+    VehicleSoundEntity(Vehicle *owner);
 
-	void			Start( void );
-	void			Stop( void );
-	void Think( void ) override;
-	void Archive( Archiver& arc ) override;
+    void Start(void);
+    void Stop(void);
+    void Think(void) override;
+    void Archive(Archiver& arc) override;
 
 private:
-	void			EventPostSpawn( Event *ev );
-	void			EventUpdateTraces( Event *ev );
-	void			DoSoundStuff( void );
+    void EventPostSpawn(Event *ev);
+    void EventUpdateTraces(Event *ev);
+    void DoSoundStuff(void);
 };
 
-inline
-void VehicleSoundEntity::Archive
-	(
-	Archiver& arc
-	)
+inline void VehicleSoundEntity::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveSafePointer( &m_pVehicle );
-	arc.ArchiveBool( &m_bDoSoundStuff );
-	arc.ArchiveInteger( &m_iTraceSurfaceFlags );
+    arc.ArchiveSafePointer(&m_pVehicle);
+    arc.ArchiveBool(&m_bDoSoundStuff);
+    arc.ArchiveInteger(&m_iTraceSurfaceFlags);
 }
-
-#endif // __VEHICLECOLLISIONENTITY_H__
\ No newline at end of file
diff --git a/code/fgame/VehicleTank.cpp b/code/fgame/VehicleTank.cpp
index 2fa63801..bcc17fba 100644
--- a/code/fgame/VehicleTank.cpp
+++ b/code/fgame/VehicleTank.cpp
@@ -23,127 +23,550 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "vehicle.h"
 #include "vehicleturret.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleTank, "VehicleTank")
-{
-	{ &EV_Damage, &VehicleTank::EventDamage },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleTank, "VehicleTank") {
+    {&EV_Damage, &VehicleTank::EventDamage},
+    {NULL,       NULL                     }
 };
 
 VehicleTank::VehicleTank()
 {
-	entflags |= FL_ROTATEDBOUNDS;
+    entflags |= FL_ROTATEDBOUNDS;
 }
 
 VehicleTank::~VehicleTank()
 {
-	entflags &= ~FL_ROTATEDBOUNDS;
+    entflags &= ~FL_ROTATEDBOUNDS;
 }
 
 qboolean VehicleTank::Drive(usercmd_t *ucmd)
 {
-	Vector i;
-	Vector j;
-	Vector k;
-	Vector vTmp;
+    Vector i;
+    Vector j;
+    Vector k;
+    Vector vTmp;
 
-	vTmp = velocity;
-	VectorNormalize(vTmp);
+    vTmp = velocity;
+    vTmp.normalize();
 
-	if (!driver.ent || !driver.ent->client)
-	{
-		return qfalse;
-	}
+    if (!driver.ent || !driver.ent->isClient()) {
+        return qfalse;
+    }
 
-	if (!drivable)
-	{
-		driver.ent->client->ps.pm_flags |= PMF_FROZEN;
-		ucmd->forwardmove = 0;
-		ucmd->rightmove = 0;
-		ucmd->upmove = 0;
-		return qfalse;
-	}
+    if (!drivable) {
+        driver.ent->client->ps.pm_flags |= PMF_FROZEN;
+        ucmd->forwardmove = 0;
+        ucmd->rightmove   = 0;
+        ucmd->upmove      = 0;
+        return qfalse;
+    }
 
-	moveimpulse = ucmd->forwardmove * (vTmp.length() + 1.0);
-	
-	m_bIsBraking = ucmd->forwardmove >> 31;
+    if (!m_bAutoPilot) {
+        //
+        // ignore client's control if the vehicle is in auto-pilot mode
+        //
+        moveimpulse = ucmd->forwardmove * (vTmp.length() + 1.0);
+        m_bIsBraking = ucmd->forwardmove < 0;
+        m_fAccelerator += ucmd->forwardmove * 0.005;
+        // acceleration must be an alpha value between [0, 1]
+        m_fAccelerator = Q_clamp_float(m_fAccelerator, 0, 1);
 
-	m_fAccelerator += ucmd->forwardmove * 0.005;
+        turnimpulse = -ucmd->rightmove;
+        jumpimpulse = ucmd->upmove;
+    }
 
-	if (m_fAccelerator < 0)
-	{
-		m_fAccelerator = 0.0;
-	}
+    VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
 
-	turnimpulse = -ucmd->rightmove;
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->RemoteControl(ucmd, (Sentient *)driver.ent.Pointer());
 
-	VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
-
-	if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient())
-	{
-		vtg->RemoteControl(ucmd, (Sentient *)driver.ent.Pointer());
-
-		if (ucmd->upmove)
-			turnimpulse -= AngleSubtract(angles[1], vtg->angles[1]);
-	}
-	return qtrue;
+        if (ucmd->upmove) {
+            turnimpulse -= AngleSubtract(angles[1], vtg->angles[1]);
+        }
+    }
+    return qtrue;
 }
 
 void VehicleTank::EventDamage(Event *ev)
 {
-	int mod;
-	mod = ev->GetInteger(9);
+    int mod;
+    mod = ev->GetInteger(9);
 
-	if (mod > MOD_VEHICLE && mod != MOD_SHOTGUN && mod != MOD_GRENADE)
-	{
-		Vehicle::EventDamage(ev);
-		if (g_gametype->integer == GT_SINGLE_PLAYER)
-		{
-			Player *p = (Player *)driver.ent.Pointer();
-			if (p)
-			{
-				if (p->IsSubclassOfPlayer())
-				{
-					p->m_iNumHitsTaken++;
-				}
-			}
-		}
-	}
+    if (g_gametype->integer == GT_TOW && !dmManager.RoundActive()) {
+        return;
+    }
+
+    switch (mod) {
+    case MOD_BULLET:
+    case MOD_BASH:
+    case MOD_FAST_BULLET:
+    case MOD_VEHICLE:
+    case MOD_SHOTGUN:
+    case MOD_GRENADE:
+        return;
+    }
+
+    Vehicle::EventDamage(ev);
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        Player *p = (Player *)driver.ent.Pointer();
+        if (p) {
+            if (p->IsSubclassOfPlayer()) {
+                p->m_iNumHitsTaken++;
+            }
+        }
+    }
 }
 
 void VehicleTank::Think()
 {
-	flags |= FL_POSTTHINK;
+    flags |= FL_POSTTHINK;
 }
 
 void VehicleTank::Postthink()
 {
-	// FIXME: STUB
+    float        turn;
+    Vector       i, j, k;
+    Vector       normalsum;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v, *last;
+    float        drivespeed;
+    Vector       primal_angles, primal_origin;
+    Vector       vTmp;
+    Vector       vAddedAngles;
+    Vector       n_angles;
+    float        dot;
+    Vector       newvel, flatvel;
+    Vector       anglediff;
+
+    primal_angles = angles;
+    primal_origin = origin;
+
+    if (!g_vehicle->integer || edict->s.renderfx & RF_DONTDRAW) {
+        // don't process physics
+        return;
+    }
+
+    if (m_pCollisionEntity) {
+        // use the collision entity for collision
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    }
+
+    prev_velocity = velocity;
+    SetSlotsNonSolid();
+
+    if (m_bAnimMove) {
+        AnimMoveVehicle();
+    } else {
+        if (!m_bMovementLocked) {
+            FactorOutAnglesOffset();
+            FactorOutOriginOffset();
+        }
+
+        MoveVehicle();
+    }
+
+    SetSlotsSolid();
+
+    if (m_vOldMins != vec_zero && m_vOldMaxs != vec_zero) {
+        mins = m_vOldMins;
+        maxs = m_vOldMaxs;
+    } else if (mins != vec_zero && maxs != vec_zero) {
+        m_vOldMins = mins;
+        m_vOldMaxs = maxs;
+    }
+
+    if (m_bAnimMove) {
+        moveimpulse = velocity.length() * level.frametime;
+        turnimpulse = avelocity[1] * level.frametime;
+    } else if (m_bAutoPilot) {
+        AutoPilot();
+    }
+
+    currentspeed = moveimpulse;
+    turnangle    = turnangle * 0.25 + turnimpulse;
+    turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+    real_velocity     = origin - prev_origin;
+    prev_origin       = origin;
+    prev_acceleration = real_acceleration;
+    real_acceleration = real_velocity - prev_velocity;
+    prev_velocity     = real_velocity;
+    acceleration      = real_acceleration - prev_acceleration;
+
+    UpdateBones();
+    UpdateShaderOffset();
+    UpdateTires();
+    UpdateNormals();
+
+    temp = angles;
+    temp.AngleVectorsLeft(&i, &j, &k);
+
+    velocity[0] *= 0.925f;
+    velocity[1] *= 0.925f;
+    turn = turnangle / 200.0;
+
+    flatvel = orientation[0];
+    velocity += flatvel * currentspeed;
+    flatvel[2] = 0;
+
+    dot         = velocity * flatvel;
+    dot         = Q_clamp_float(dot, -speed, speed);
+    newvel      = flatvel * dot;
+    velocity[0] = newvel[0];
+    velocity[1] = newvel[1];
+    avelocity *= 0.05f;
+    if (dot < 350) {
+        dot = 350;
+    }
+
+    avelocity.y += turn * dot;
+    angles += avelocity * level.frametime;
+    setAngles(angles);
+
+    if (Turrets[0].ent && Turrets[0].ent->IsSubclassOfVehicleTurretGun() && driver.ent
+        && driver.ent->IsSubclassOfSentient()) {
+        VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(Turrets[0].ent.Pointer());
+        if (jumpimpulse != 0) {
+            pTurret->SetUserViewAngles(pTurret->GetUserViewAngles() - Vector(0, avelocity[1] * level.frametime, 0));
+        }
+    }
+
+    drivespeed = acceleration * orientation[0];
+    UpdateSound();
+
+    if (AssertRotation(angles, primal_angles) != true) {
+        angles = primal_angles;
+    }
+
+    CalculateAnglesOffset(acceleration);
+    CalculateOriginOffset();
+
+    last_origin = origin;
+    anglediff   = (angles - primal_angles) * level.frametime;
+
+    if (anglediff.x > 180 || anglediff.x < -180) anglediff.x = 0;
+    if (anglediff.y > 180 || anglediff.y < -180) anglediff.y = 0;
+    if (anglediff.z > 180 || anglediff.z < -180) anglediff.z = 0;
+
+    if (anglediff.x > -1 || anglediff.x < 1) anglediff.x = 0;
+    if (anglediff.y > -1 || anglediff.y < 1) anglediff.y = 0;
+    if (anglediff.z > -1 || anglediff.z < 1) anglediff.z = 0;
+
+    avelocity = anglediff;
+
+    if (!m_bAnimMove && !m_bMovementLocked) {
+        FactorInOriginOffset();
+        FactorInAnglesOffset(&vAddedAngles);
+    }
+
+    CalculateAnimationData(vAddedAngles, m_vOriginOffset + m_vOriginOffset2);
+    if (m_pCollisionEntity) {
+        Vector vaDelta;
+
+        SetSlotsNonSolid();
+
+        vaDelta[0] = angledist(angles[0] - m_pCollisionEntity->angles[0]);
+        vaDelta[1] = angledist(angles[1] - m_pCollisionEntity->angles[1]);
+        vaDelta[2] = angledist(angles[2] - m_pCollisionEntity->angles[2]);
+
+        m_pCollisionEntity->Solid();
+
+        G_PushMove(m_pCollisionEntity, origin - primal_origin, vaDelta);
+        G_TouchTriggers(m_pCollisionEntity);
+
+        SetSlotsSolid();
+
+        m_pCollisionEntity->setOrigin(origin);
+        m_pCollisionEntity->setAngles(angles);
+    }
+
+    SetupVehicleSoundEntities();
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    //
+    // update slots
+    //
+    for (int ii = 0; ii < MAX_PASSENGERS; ii++) {
+        UpdatePassengerSlot(ii);
+    }
+
+    for (int ii = 0; ii < MAX_TURRETS; ii++) {
+        UpdateTurretSlot(ii);
+    }
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    if (m_pCollisionEntity) {
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    } else {
+        setSolidType(SOLID_BBOX);
+        setContents(CONTENTS_UNKNOWN2);
+    }
+
+    if ((driver.flags & SLOT_BUSY) && driver.ent) {
+        if (driver.ent->IsSubclassOfPlayer()) {
+            driver.ent->takedamage = DAMAGE_YES;
+            // Fixed in OPM.
+            //  It's probably a mistake in moh 2.0 and above,
+            //  the tank was non-solid with a player driver,
+            //  instead of the driver being non-solid.
+            //setSolidType(SOLID_NOT);
+
+            // Fixed in OPM
+            // Driver is made non-solid in Vehicle::MoveThink
+            //driver.ent->setSolidType(SOLID_NOT);
+        } else {
+            driver.ent->takedamage = DAMAGE_NO;
+            driver.ent->setSolidType(SOLID_NOT);
+        }
+    }
 }
 
 void VehicleTank::CalculateOriginOffset()
 {
-	// FIXME: STUB
+    int    index;
+    Vector vTireAvg;
+    Vector vMissHit;
+    Vector temp;
+    int    iNum = 0;
+    Vector acceleration;
+    Vector oldoffset;
+
+    oldoffset = m_vOriginOffset;
+    m_vOriginOffset += m_vOriginOffset2;
+    m_vOriginOffset2 = vec_zero;
+
+    for (index = 0; index < NUM_VEHICLE_TIRES; index++) {
+        if (m_bTireHit[index]) {
+            vTireAvg += origin - m_vTireEnd[index];
+            iNum++;
+        } else {
+            vMissHit = Corners[index];
+        }
+    }
+
+    if (m_iNumNormals > 0 && iNum == NUM_VEHICLE_TIRES - 1) {
+        Vector point;
+
+        temp = m_vNormalSum * (1.f / m_iNumNormals);
+        temp.normalize();
+        ProjectPointOnPlane(point, vMissHit, temp);
+        vTireAvg += point;
+
+        iNum++;
+    }
+
+    if (iNum == NUM_VEHICLE_TIRES) {
+        vec3_t vOriginCornerOffset;
+
+        vTireAvg *= 1.f / NUM_VEHICLE_TIRES;
+        MatrixTransformVector(m_vOriginCornerOffset, orientation, vOriginCornerOffset);
+        vTireAvg -= vOriginCornerOffset;
+        m_vOriginOffset2 += vTireAvg;
+    }
+
+    //m_vOriginOffset2 += vec_zero;
+    m_vOriginOffset -= m_vOriginOffset2;
+
+    if (!isfinite(m_vOriginOffset[0]) || !isfinite(m_vOriginOffset[1]) || !isfinite(m_vOriginOffset[2])) {
+        m_vOriginOffset = oldoffset;
+    }
 }
 
 void VehicleTank::UpdateSound()
 {
-	// FIXME: STUB
+    float pitch  = 1.f;
+    float volume = 1.f;
+
+    if (level.time < m_fNextSoundState) {
+        return;
+    }
+
+    pitch = (velocity.length() - m_fSoundMinSpeed) / (m_fSoundMaxSpeed - m_fSoundMinSpeed);
+    pitch = Q_clamp_float(pitch, 0, 1);
+    pitch = (m_fSoundMaxPitch - m_fSoundMinPitch) * pitch + m_fSoundMinPitch;
+
+    volume = (velocity.length() - m_fVolumeMinSpeed) / (m_fVolumeMaxSpeed - m_fVolumeMinSpeed);
+    volume = Q_clamp_float(volume, 0, 1);
+    volume = (m_fVolumeMaxPitch - m_fVolumeMinPitch) * volume + m_fVolumeMinPitch;
+
+    if (level.intermissiontime) {
+        m_eSoundState = ST_OFF;
+    }
+
+    switch (m_eSoundState) {
+    case ST_OFF:
+        StopLoopSound();
+        TurnOffVehicleSoundEntities();
+        m_fNextSoundState = level.time;
+        if (driver.ent || m_bAutoPilot) {
+            m_eSoundState = ST_OFF_TRANS_IDLE;
+        }
+        break;
+    case ST_OFF_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+        Sound(m_sSoundSet + "snd_on", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    case ST_IDLE_TRANS_OFF:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        Sound(m_sSoundSet + "snd_off", CHAN_AUTO);
+        StopLoopSound();
+        break;
+    case ST_IDLE:
+        m_fNextSoundState = level.time;
+        if (driver.ent || m_bAutoPilot) {
+            if (fabs(velocity * orientation[0]) > 150) {
+                m_eSoundState = ST_IDLE_TRANS_RUN;
+            } else if (fabs(turnimpulse) > 1) {
+                m_eSoundState = ST_IDLE_TRANS_TURN;
+            }
+        } else {
+            m_eSoundState = ST_IDLE_TRANS_OFF;
+        }
+
+        LoopSound(m_sSoundSet + "snd_idle");
+        TurnOffVehicleSoundEntities();
+        break;
+    case ST_IDLE_TRANS_RUN:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_RUN;
+        Sound(m_sSoundSet + "snd_revup", CHAN_AUTO);
+        Sound(m_sSoundSet + "snd_shift", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_RUN:
+        m_fNextSoundState = level.time;
+        if (fabs(velocity * orientation[0]) < 150) {
+            m_eSoundState = ST_RUN_TRANS_IDLE;
+        }
+        TurnOnVehicleSoundEntities();
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_RUN_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+        Sound(m_sSoundSet + "snd_revdown", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    case ST_IDLE_TRANS_TURN:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_TURN;
+        Sound(m_sSoundSet + "snd_revup", CHAN_AUTO);
+        Sound(m_sSoundSet + "snd_shift", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_TURN:
+        m_fNextSoundState = level.time;
+        if (fabs(turnimpulse) < 1) {
+            m_eSoundState = ST_TURN_TRANS_IDLE;
+        }
+        LoopSound(m_sSoundSet + "snd_run", volume, -1, -1, pitch);
+        break;
+    case ST_TURN_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState = ST_IDLE;
+        Sound(m_sSoundSet + "snd_revdown", CHAN_AUTO);
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+    default:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        break;
+    }
 }
 
-void VehicleTank::AttachDriverSlot(Event* ev)
+//
+// Fixed in OPM:
+//  This method only work when called from script.
+//  But it is not called automatically when the player actually uses the vehicle
+//  when that vehicle is unlocked.
+//  So the other native method is overridden instead
+/*
+void VehicleTank::AttachDriverSlot(Event *ev)
 {
-	Vehicle::AttachDriverSlot(ev);
+    Vehicle::AttachDriverSlot(ev);
 
-	VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
+    if (!driver.ent) {
+        //
+        // Added in OPM.
+        // original mohaa doesn't check if driver.ent is valid, which can cause crash if the attached entity is null.
+        // on single-player, it would crash while loading m5l2a when sv_maxclients is above 1.
+        // The reason of the crash is that attachdriverslot is called with $player which can be NULL on prespawn.
+        // $player is not created on prespawn when sv_maxclients is above 1
+        //
+        return;
+    }
 
-	if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient())
-	{
-		vtg->SetOwner((Sentient *)driver.ent.Pointer());
-		Think();
-		Postthink();
-		vtg->Think();
-	}
+    VehicleTurretGun *vtg = (VehicleTurretGun *)Turrets[0].ent.Pointer();
 
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->SetRemoteOwner(static_cast<Sentient *>(driver.ent.Pointer()));
+        Think();
+        Postthink();
+        vtg->Think();
+    }
+}
+*/
+
+void VehicleTank::AttachDriverSlot(int slot, Entity* ent, Vector vExitPosition)
+{
+    Vehicle::AttachDriverSlot(slot, ent, vExitPosition);
+
+    if (!driver.ent) {
+        //
+        // Added in OPM.
+        // original mohaa doesn't check if driver.ent is valid, which can cause crash if the attached entity is null.
+        // on single-player, it would crash while loading m5l2a when sv_maxclients is above 1.
+        // The reason of the crash is that attachdriverslot is called with $player which can be NULL on prespawn.
+        // $player is not created on prespawn when sv_maxclients is above 1
+        //
+        return;
+    }
+
+    VehicleTurretGun* vtg = static_cast<VehicleTurretGun*>(Turrets[0].ent.Pointer());
+
+    if (vtg && vtg->IsSubclassOfVehicleTurretGun() && driver.ent->IsSubclassOfSentient()) {
+        vtg->SetRemoteOwner(static_cast<Sentient*>(driver.ent.Pointer()));
+        Think();
+        Postthink();
+        vtg->Think();
+    }
 }
 
+void VehicleTank::DriverAdded()
+{
+    int i;
+
+    for (i = 0; i < MAX_TURRETS; i++) {
+        if (Turrets[i].flags & SLOT_BUSY && Turrets[i].ent && Turrets[i].ent->IsSubclassOfVehicleTurretGun()) {
+            VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(Turrets[i].ent.Pointer());
+            pTurret->TurretHasBeenMounted();
+        }
+    }
+}
diff --git a/code/fgame/VehicleWheelsX2.cpp b/code/fgame/VehicleWheelsX2.cpp
index 9b5179bc..a031499a 100644
--- a/code/fgame/VehicleWheelsX2.cpp
+++ b/code/fgame/VehicleWheelsX2.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,64 +22,667 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "debuglines.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX2, "VehicleWheelsX2")
-{
-	{ &EV_Damage, &VehicleWheelsX2::EventDamage },
-	{ &EV_Killed, &VehicleWheelsX2::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX2, "VehicleWheelsX2") {
+    {&EV_Damage, &VehicleWheelsX2::EventDamage},
+    {&EV_Killed, &VehicleWheelsX2::Killed     },
+    {NULL,       NULL                         }
 };
 
 VehicleWheelsX2::VehicleWheelsX2()
 {
-	m_iGear = 1;
-	m_iRPM = 0;
-	gravity = 1.0;
-	m_fDifferentialRatio = 4.8800001f;
-	m_fGearEfficiency = 0.69999999f;
-	m_fGearRatio[0] = -2.9400001f;
-	m_fGearRatio[1] = 2.9400001f;
-	m_fGearRatio[2] = 1.9400001f;
-	m_fGearRatio[3] = 1.0f;
-	m_fAccelerator = 0.0f;
-	m_bAutomatic = qtrue;
-	m_bBackSlipping = qfalse;
-	m_bFrontSlipping = qfalse;
+    gravity              = 1.0;
+    m_fDifferentialRatio = 4.88f;
+    m_fGearEfficiency    = 0.7f;
+    m_fGearRatio[0]      = -2.95f;
+    m_fGearRatio[1]      = 2.95f;
+    m_fGearRatio[2]      = 1.95f;
+    m_fGearRatio[3]      = 1.0f;
+    m_iGear              = 1;
+    m_iRPM               = 0;
+    m_fAccelerator       = 0.0f;
+    m_bAutomatic         = qtrue;
+    m_bBackSlipping      = qfalse;
+    m_bFrontSlipping     = qfalse;
 }
 
-void VehicleWheelsX2::UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright)
+void VehicleWheelsX2::Killed(Event *ev)
 {
-	// FIXME: STUB
+    deadflag = DEAD_DEAD;
 }
 
 float VehicleWheelsX2::TorqueLookup(int rpm)
 {
-	if (rpm <= 2099)
-		return 100.0;
-	if (rpm > 3599)
-		return 0.0;
-	return (100 * (3600 - rpm)) * 0.001;
+    if (rpm < 2100) {
+        return 100.0;
+    } else if (rpm >= 3600) {
+        return 0.0;
+    } else {
+        return (100 * (3600 - rpm)) / 1000.f;
+    }
+}
+
+void VehicleWheelsX2::UpdateVariables(
+    Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+)
+{
+    int    i;
+    Vector vNewCG;
+    Vector vBoxSize;
+    float  longspeed;
+    Vector _i, _j, _k;
+    Vector r_i, r_j, r_k;
+    Vector r_velocity;
+    float  dots[4];
+
+    r_velocity = velocity;
+
+    m_bIsSkidding = false;
+    vBoxSize      = maxs - mins;
+
+    SetControllerAngles(0, Vector(0, turnangle, 0));
+    SetControllerAngles(1, Vector(0, turnangle, 0));
+
+    vNewCG = localorigin;
+
+    if (vNewCG != m_vCG) {
+        m_vCG = vNewCG;
+        vNewCG -= localorigin;
+
+        m_fWheelBase      = vBoxSize.x;
+        m_fWheelFrontDist = vBoxSize.x * 0.5 - vNewCG.x;
+        m_fWheelBackDist  = vBoxSize.x * -0.5 + vNewCG.x;
+        m_fTrackWidth     = vBoxSize.y;
+    }
+
+    Vector vNewVpn = angles;
+    vNewVpn.AngleVectorsLeft(&r_i, &r_j, &r_k);
+    vNewVpn.y += turnangle;
+    vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+
+    dots[3] = r_velocity * *vpn * 0.02;
+    dots[2] = r_velocity * *vright * 0.02;
+    dots[1] = r_velocity * *t_vpn * 0.02;
+    dots[0] = r_velocity * *t_vright * 0.02;
+
+    m_sWheels[0].fTraction  = 0.8f;
+    m_sWheels[1].fTraction  = 0.9f;
+    m_sWheels[0].fYawOffset = 0;
+    m_sWheels[1].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[0].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[1].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[0].fLatDist   = m_fTrackWidth * -0.02;
+    m_sWheels[1].fLatDist   = m_fTrackWidth * 0.02;
+
+    // initialize the wheels
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].fLongForce = 0;
+        m_sWheels[i].fForce     = 0;
+
+        m_sWheels[i].vLongForce  = vec_zero;
+        m_sWheels[i].vLatForce   = vec_zero;
+        m_sWheels[i].vForce      = vec_zero;
+        m_sWheels[i].vVelocity   = vec_zero;
+        m_sWheels[i].bSkidding   = false;
+        m_sWheels[i].bSpinning   = false;
+        m_sWheels[i].fTorque     = 0;
+        m_sWheels[i].fLatTorque  = 0;
+        m_sWheels[i].fLongTorque = 0;
+    }
+
+    for (i = 0; i < 2; i++) {
+        Vector p1, p3, p4;
+        Vector vTp, vTr, vTu;
+        vec3_t p2;
+
+        p3 = Corners[i];
+        p3.normalize();
+
+        vectoangles(p3, p2);
+        p1    = vec_zero;
+        p1[1] = angles[1] + p2[1] + 90;
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vVelocity = vTp * RAD2DEG(m_vAngularVelocity.y) * fabs(m_sWheels[i].fLongDist) * level.frametime;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vVelocity * 50,
+            0.7f,
+            0.5f,
+            1.0f,
+            1.0f
+        );
+
+        p1    = vec_zero;
+        p1[1] = angles[1] + RAD2DEG(m_sWheels[i].fYawOffset);
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vOrientation = vTp;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vOrientation * 50,
+            0.7f,
+            0.0f,
+            1.0f,
+            1.0f
+        );
+    }
+
+    Vector  start, end;
+    Vector  boxoffset;
+    Vector  t_mins(-8, -8, -8);
+    Vector  t_maxs(8, 8, 8);
+    trace_t trace;
+
+    start = origin + *vpn * (m_vCG[0] - localorigin[0]) + *vright * (m_vCG[1] - localorigin[1])
+          + *vup * (m_vCG[2] - localorigin[2]);
+
+    end = start;
+    end[2] -= maxtracedist;
+
+    trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+    m_fInertia        = m_fMass * 100;
+    m_fWheelFrontLoad = m_fMass * 9.81 * fabs(m_fWheelFrontDist / m_fWheelBase);
+    m_fWheelBackLoad  = m_fMass * 9.81 * fabs(m_fWheelBackDist / m_fWheelBase);
+
+    longspeed = m_vAcceleration.length() * 0.02 * m_fMass / m_fWheelBase;
+    m_fWheelFrontLoad -= longspeed;
+    m_fWheelBackLoad += longspeed;
+    m_sWheels[0].fLoad = m_fWheelBackLoad;
+    m_sWheels[1].fLoad = m_fWheelFrontLoad;
+
+    float fMassShifted     = m_fTireRadius * M_PI;
+    m_fTireRotationalSpeed = dots[3] / (fMassShifted + fMassShifted);
+    m_iRPM                 = m_fTireRotationalSpeed * m_fGearRatio[m_iGear] * m_fDifferentialRatio * 10;
+    m_fMaxTraction =
+        TorqueLookup(m_iRPM) * m_fGearRatio[m_iGear] * m_fDifferentialRatio * m_fGearEfficiency / m_fTireRadius;
+    m_fTractionForce = m_fAccelerator * m_fMaxTraction;
+
+    if (m_bIsBraking && dots[3] > 0) {
+        m_fTractionForce = -fSign(dots[3]) * 1000 * dots[3];
+    }
+
+    for (i = 0; i < 2; i++) {
+        float maxgrip;
+
+        maxgrip = m_sWheels[i].fTraction * m_sWheels[i].fLoad * 9.81;
+        if (m_fTractionForce > maxgrip) {
+            m_fTractionForce       = maxgrip * 0.6;
+            m_sWheels[i].bSpinning = true;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        if (m_fTractionForce < -maxgrip) {
+            m_fTractionForce       = -maxgrip * 0.6;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        m_sWheels[i].fLongForce = this->m_sWheels[i].fLongForce + m_fTractionForce;
+        m_sWheels[i].vLongForce += m_sWheels[i].vOrientation * m_sWheels[i].fLongForce;
+    }
+
+    m_vResistance[0] =
+        -(velocity[0] * 0.02 * m_fRollingResistance + velocity[0] * 0.02 * m_fDrag * fabs(velocity[0] * 0.02));
+    m_vResistance[1] =
+        -(velocity[1] * 0.02 * m_fRollingResistance + velocity[1] * 0.02 * m_fDrag * fabs(velocity[1] * 0.02));
+    m_vResistance[2] =
+        -(velocity[2] * 0.02 * m_fRollingResistance + velocity[2] * 0.02 * m_fDrag * fabs(velocity[2] * 0.02));
+
+    m_fBrakingPerformance = -m_fRollingResistance - *vpn * Vector(0, 0, -1) * m_fMass;
+    if (dots[3] == 0) {
+        m_fBrakingPerformance = 0;
+    } else {
+        m_fBrakingPerformance = (dots[3] - (m_fTireRotationalSpeed * m_fTireRadius - m_fBrakingPerformance)) / dots[3];
+        m_fBrakingPerformance = (1.0 - m_fBrakingPerformance) * -(-m_fFrontBrakingForce - m_fBackBrakingForce);
+    }
+
+    if (r_velocity.length() * 0.02 > 0.01) {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+
+        for (i = 0; i < 2; i++) {
+            Vector va, vr;
+            Vector vVel;
+            Vector v1, v2;
+
+            va   = angles;
+            va.x = 0;
+            va.y += RAD2DEG(m_sWheels[i].fYawOffset);
+            va.z = 0;
+            va.AngleVectorsLeft(NULL, &vr, NULL);
+
+            vVel = m_sWheels[i].vVelocity + velocity;
+            // get the direction
+            v1 = vVel;
+            v1.normalize();
+            // get the angles
+            vectoangles(v1, v2);
+
+            m_sWheels[i].fSlipAngle = DEG2RAD(angledist(va.y - v2.y));
+            m_sWheels[i].fGripCoef  = m_sWheels[i].fSlipAngle * 0.15;
+            m_sWheels[i].fGripCoef  = Q_clamp_float(m_sWheels[i].fGripCoef, -1.2f, 1.2f);
+            m_sWheels[i].fLatForce += m_sWheels[i].fGripCoef * m_sWheels[i].fLoad * 9.81;
+
+            if (m_sWheels[i].fLoad * 2 * m_sWheels[i].fTraction < fabs(m_sWheels[i].fLatForce)) {
+                m_sWheels[i].fLatForce = m_sWheels[i].fLatForce / 9.81;
+                m_sWheels[i].bSkidding = true;
+                Com_Printf("Skidding %i!\n", i);
+            }
+
+            m_sWheels[i].vLatForce += vr * m_sWheels[i].fLatForce;
+
+            G_LineWidth(3.0);
+
+            G_DebugLine(
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vLatForce * 50 * (1.0 / m_fMass),
+                0.7f,
+                0.5f,
+                0.2f,
+                1.0f
+            );
+        }
+    } else {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+    }
+
+    m_vForce = vec_zero;
+
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].vForce = m_sWheels[i].vLatForce + m_sWheels[i].vLongForce;
+        m_vForce += m_sWheels[i].vForce;
+    }
+
+    m_vForce += m_vResistance;
+
+    G_LineWidth(5.0);
+
+    G_DebugLine(origin, origin + m_vTangForce * (1.0 / m_fMass) * 50, 1.0, 0.0, 1.0, 1.0);
+
+    m_vAcceleration = m_vForce * (1.0 / m_fMass) * 50;
+    m_fTorque       = 0;
+
+    for (i = 0; i < 2; i++) {
+        m_sWheels[i].fTorque += m_sWheels[i].fLongTorque + m_sWheels[i].fLatTorque;
+        m_fTorque += m_sWheels[i].fTorque;
+    }
+
+    m_vAngularAcceleration[1] = angledist(RAD2DEG(m_fTorque));
+    m_vAngularVelocity += m_vAngularAcceleration * level.frametime;
+    m_vAngularVelocity *= 0.825f;
+    avelocity = m_vAngularVelocity;
+
+    if (m_bAutomatic) {
+        //
+        // set the gear
+        //
+        if (m_iRPM >= 2100 && m_iGear <= 2) {
+            m_iGear++;
+        }
+        if (m_iRPM <= 600 && m_iGear > 1) {
+            m_iGear--;
+        }
+    }
+
+    prev_moveimpulse = moveimpulse;
 }
 
 void VehicleWheelsX2::Think()
 {
-	vmove_t vm;
+    vmove_t vm;
 
-	flags |= FL_POSTTHINK;
-	prev_velocity = velocity;
+    flags |= FL_POSTTHINK;
+    prev_velocity = velocity;
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 }
 
 void VehicleWheelsX2::Postthink()
 {
-	// FIXME: STUB
-}
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    Vector       normalsum_Front;
+    int          numnormals_Front;
+    Vector       normalsum_Back;
+    int          numnormals_Back;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
 
-void VehicleWheelsX2::Killed(Event* ev)
-{
-	deadflag = DEAD_DEAD;
-}
+    primal_angles = angles;
 
+    if (drivable) {
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25f + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        if (turnangle > maxturnrate) {
+            turnangle = maxturnrate;
+        } else if (turnangle < -maxturnrate) {
+            turnangle = -maxturnrate;
+        } else if (fabs(turnangle) < 2) {
+            turnangle = 0;
+        }
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        angles[0] = 0;
+        angles[2] = 0;
+
+        temp[0] = angles[0];
+        temp[1] = angles[1];
+        temp[2] = angles[2];
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        index            = 0;
+        numnormals_Front = 0;
+        numnormals_Back  = 0;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1 && !trace.startsolid) {
+                if (index > 2) {
+                    normalsum_Front += trace.plane.normal;
+                    numnormals_Front++;
+                } else {
+                    normalsum_Back += trace.plane.normal;
+                    numnormals_Back++;
+                }
+
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        if (angles[2] < 60 || angles[2] > 300) {
+            if (numnormals_Front > 1) {
+                m_vFrontNormal = normalsum_Front * (1.0 / numnormals_Front);
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vFrontAngles[1] = 0;
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Back > 1) {
+                m_vBackNormal = normalsum_Back * (1.0 / numnormals_Back);
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBackAngles[1] = 0;
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Front + numnormals_Back > 1) {
+                m_vBaseNormal = (normalsum_Front + normalsum_Back) * (1.0 / numnormals_Front + numnormals_Back);
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBaseAngles[1] = 0;
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+        }
+
+        n_angles    = m_vBaseAngles - angles;
+        n_angles[0] = angledist(n_angles[0]);
+        n_angles[1] = angledist(n_angles[1]);
+        n_angles[2] = angledist(n_angles[2]);
+
+        angles[0] += n_angles[0] * 4.5 * level.frametime;
+        angles[2] += n_angles[2] * 4.5 * level.frametime;
+
+        m_vPrevNormal = m_vBaseNormal;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            m_fFrontBrakingForce = 0.2f;
+            m_fBackBrakingForce  = 0.1f;
+        } else {
+            m_fFrontBrakingForce = 0;
+            m_fBackBrakingForce  = 0;
+        }
+
+        turn = turnangle * 0.005;
+
+        Vector _i, _j, _k;
+        Vector vNewVpn = angles;
+        vNewVpn.y += turnangle;
+
+        vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+        UpdateVariables(&acceleration, &i, &j, &k, &_i, &_j, &_k);
+
+        m_vAngles = angles;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            currentspeed = 0;
+        }
+
+        normalsum = vec_zero;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2] + Vector(0, 0, 10);
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0) {
+                float fCoef;
+
+                if (index > 2) {
+                    fCoef = m_fWheelFrontLoad / (m_fWheelFrontDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += _i * currentspeed * fCoef;
+                    normalsum += i * currentspeed * (1.0 - fCoef);
+                } else {
+                    fCoef = m_fWheelBackLoad / (m_fWheelBackDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += i * currentspeed * fCoef;
+                    normalsum += _i * currentspeed * (1.0 - fCoef);
+                }
+            }
+        }
+
+        AnglesToAxis(angles, orientation);
+
+        vmove_t vm;
+        SetMoveInfo(&vm);
+        m_sMoveGrid->SetMoveInfo(&vm);
+        m_sMoveGrid->SetOrientation(orientation);
+
+        if (m_sMoveGrid->CheckStuck()) {
+            angles = primal_angles;
+            AnglesToAxis(angles, orientation);
+        }
+
+        if (groundentity && (angles[2] < 60 || angles[2] > 300)) {
+            float  dot;
+            Vector newvel, flatvel;
+
+            velocity[0] *= 0.925f;
+            velocity[1] *= 0.925f;
+
+            newvel = orientation[0];
+            velocity += newvel * currentspeed;
+            newvel[2] = 0;
+
+            dot = velocity * newvel;
+            dot = Q_clamp_float(dot, -speed, speed);
+
+            if (dot > speed) {
+                dot = speed;
+            } else if (dot < -speed) {
+                dot = -speed;
+            } else if (fabs(dot) < 20) {
+                dot = 0;
+            }
+
+            flatvel = newvel * dot;
+
+            velocity[0] = flatvel[0];
+            velocity[1] = flatvel[1];
+            velocity[2] += jumpimpulse * dot;
+            avelocity *= 0.05f;
+
+            if (steerinplace) {
+                if (dot < 350) {
+                    dot = 350;
+                }
+
+                avelocity.y += turn * dot;
+            } else {
+                avelocity.y += turn * dot;
+            }
+        } else {
+            if (angles[2] > 60) {
+                angles[2]; // FIXME: ??
+            }
+
+            velocity += m_vAcceleration * level.frametime;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+
+        prev_origin = origin;
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed == 0) {
+            sound_name = "snd_idle";
+        } else {
+            sound_name = "snd_backward";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    vTmp = (angles - primal_angles) * level.frametime;
+    if (vTmp.x > 180 || vTmp.x < -180) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > 180 || vTmp.y < -180) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > 180 || vTmp.z < -180) {
+        vTmp.z = 0;
+    }
+
+    if (vTmp.x > -1 || vTmp.x < 1) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > -1 || vTmp.y < 1) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > -1 || vTmp.z < 1) {
+        vTmp.z = 0;
+    }
+
+    avelocity = vTmp;
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    last_origin = origin;
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
+}
diff --git a/code/fgame/VehicleWheelsX4.cpp b/code/fgame/VehicleWheelsX4.cpp
index 59aea106..27ef7276 100644
--- a/code/fgame/VehicleWheelsX4.cpp
+++ b/code/fgame/VehicleWheelsX4.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2018 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,69 +22,680 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "vehicle.h"
 #include "player.h"
+#include "debuglines.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX4, "VehicleWheelsX4")
-{
-	{ &EV_Damage, &VehicleWheelsX4::EventDamage },
-	{ &EV_Killed, &VehicleWheelsX4::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(DrivableVehicle, VehicleWheelsX4, "VehicleWheelsX4") {
+    {&EV_Damage, &VehicleWheelsX4::EventDamage},
+    {&EV_Killed, &VehicleWheelsX4::Killed     },
+    {NULL,       NULL                         }
 };
 
 VehicleWheelsX4::VehicleWheelsX4()
 {
-	m_iGear = 1;
-	m_iRPM = 0;
-	gravity = 1.0;
-	m_fDifferentialRatio = 4.8800001f;
-	m_fGearEfficiency = 0.69999999f;
-	m_fGearRatio[0] = -2.9400001f;
-	m_fGearRatio[1] = 2.9400001f;
-	m_fGearRatio[2] = 1.9400001f;
-	m_fGearRatio[3] = 1.0f;
-	m_fAccelerator = 0.0f;
-	m_bBackSlipping = qfalse;
-	m_bAutomatic = qtrue;
-	m_bFrontSlipping = qfalse;
+    gravity              = 1.0;
+    m_fDifferentialRatio = 4.88f;
+    m_fGearEfficiency    = 0.7f;
+    m_fGearRatio[0]      = -2.95f;
+    m_fGearRatio[1]      = 2.95f;
+    m_fGearRatio[2]      = 1.95f;
+    m_fGearRatio[3]      = 1.0f;
+    m_iGear              = 1;
+    m_iRPM               = 0;
+    m_fAccelerator       = 0.0f;
+    m_bAutomatic         = qtrue;
+    m_bBackSlipping      = qfalse;
+    m_bFrontSlipping     = qfalse;
 }
 
-void VehicleWheelsX4::UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright)
+void VehicleWheelsX4::UpdateVariables(
+    Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+)
 {
-	// FIXME: STUB
+    int    i;
+    Vector vNewCG;
+    Vector vBoxSize;
+    float  longspeed;
+    Vector _i, _j, _k;
+    Vector r_i, r_j, r_k;
+    Vector r_velocity;
+    float  dots[4];
+
+    r_velocity = velocity;
+
+    m_bIsSkidding = false;
+    vBoxSize      = maxs - mins;
+
+    SetControllerAngles(0, Vector(0, turnangle, 0));
+    SetControllerAngles(1, Vector(0, turnangle, 0));
+
+    vNewCG = localorigin;
+
+    if (vNewCG != m_vCG) {
+        m_vCG = vNewCG;
+        vNewCG -= localorigin;
+
+        m_fWheelBase      = vBoxSize.x;
+        m_fWheelFrontDist = vBoxSize.x * 0.5 - vNewCG.x;
+        m_fWheelBackDist  = vBoxSize.x * -0.5 + vNewCG.x;
+        m_fTrackWidth     = vBoxSize.y;
+    }
+
+    Vector vNewVpn = angles;
+    vNewVpn.AngleVectorsLeft(&r_i, &r_j, &r_k);
+    vNewVpn.y += turnangle;
+    vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+
+    dots[3] = r_velocity * *vpn * 0.02;
+    dots[2] = r_velocity * *vright * 0.02;
+    dots[1] = r_velocity * *t_vpn * 0.02;
+    dots[0] = r_velocity * *t_vright * 0.02;
+
+    m_sWheels[0].fTraction  = 0.8f;
+    m_sWheels[1].fTraction  = 0.9f;
+    m_sWheels[2].fTraction  = 0.8f;
+    m_sWheels[3].fTraction  = 0.9f;
+    m_sWheels[0].fYawOffset = 0;
+    m_sWheels[1].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[2].fYawOffset = 0;
+    m_sWheels[3].fYawOffset = DEG2RAD(turnangle);
+    m_sWheels[0].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[1].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[2].fLongDist  = m_fWheelBackDist * 0.02;
+    m_sWheels[3].fLongDist  = m_fWheelFrontDist * 0.02;
+    m_sWheels[0].fLatDist   = m_fTrackWidth * 0.5 * -0.02;
+    m_sWheels[1].fLatDist   = m_fTrackWidth * 0.5 * 0.02;
+    m_sWheels[2].fLatDist   = m_fTrackWidth * 0.5 * -0.02;
+    m_sWheels[3].fLatDist   = m_fTrackWidth * 0.5 * 0.02;
+
+    // initialize the wheels
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].fLongForce = 0;
+        m_sWheels[i].fForce     = 0;
+
+        m_sWheels[i].vLongForce  = vec_zero;
+        m_sWheels[i].vLatForce   = vec_zero;
+        m_sWheels[i].vForce      = vec_zero;
+        m_sWheels[i].vVelocity   = vec_zero;
+        m_sWheels[i].bSkidding   = false;
+        m_sWheels[i].bSpinning   = false;
+        m_sWheels[i].fTorque     = 0;
+        m_sWheels[i].fLatTorque  = 0;
+        m_sWheels[i].fLongTorque = 0;
+    }
+
+    for (i = 0; i < 4; i++) {
+        Vector p1, p3, p4;
+        Vector vTp, vTr, vTu;
+        vec3_t p2;
+
+        p3 = Corners[i];
+        p3.normalize();
+
+        vectoangles(p3, p2);
+        p1    = vec_zero;
+        p1[1] = angles[1] + p2[1] + 90;
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vVelocity = vTp * RAD2DEG(m_vAngularVelocity.y) * fabs(m_sWheels[i].fLongDist) * level.frametime;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vVelocity * 50,
+            0.7f,
+            0.5f,
+            1.0f,
+            1.0f
+        );
+
+        p1    = vec_zero;
+        p1[1] = angles[1] + RAD2DEG(m_sWheels[i].fYawOffset);
+        p1.AngleVectorsLeft(&vTp, &vTr, &vTu);
+
+        m_sWheels[i].vOrientation = vTp;
+
+        G_LineWidth(5.0);
+
+        G_DebugLine(
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+            origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vOrientation * 50,
+            0.7f,
+            0.0f,
+            1.0f,
+            1.0f
+        );
+    }
+
+    Vector  start, end;
+    Vector  boxoffset;
+    Vector  t_mins(-8, -8, -8);
+    Vector  t_maxs(8, 8, 8);
+    trace_t trace;
+
+    start = origin + *vpn * (m_vCG[0] - localorigin[0]) + *vright * (m_vCG[1] - localorigin[1])
+          + *vup * (m_vCG[2] - localorigin[2]);
+
+    end = start;
+    end[2] -= maxtracedist;
+
+    trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+    m_fInertia        = m_fMass * 100;
+    m_fWheelFrontLoad = m_fMass * 9.81 * fabs(m_fWheelFrontDist / m_fWheelBase);
+    m_fWheelBackLoad  = m_fMass * 9.81 * fabs(m_fWheelBackDist / m_fWheelBase);
+
+    longspeed = m_vAcceleration.length() * 0.02 * m_fMass / m_fWheelBase;
+    m_fWheelFrontLoad -= longspeed;
+    m_fWheelBackLoad += longspeed;
+    m_sWheels[0].fLoad = m_fWheelBackLoad / 2.0;
+    m_sWheels[1].fLoad = m_fWheelBackLoad / 2.0;
+    m_sWheels[2].fLoad = m_fWheelFrontLoad / 2.0;
+    m_sWheels[3].fLoad = m_fWheelFrontLoad / 2.0;
+
+    float fMassShifted     = m_fTireRadius * M_PI;
+    m_fTireRotationalSpeed = dots[3] / (fMassShifted + fMassShifted);
+    m_iRPM                 = m_fTireRotationalSpeed * m_fGearRatio[m_iGear] * m_fDifferentialRatio * 10;
+    m_fMaxTraction =
+        TorqueLookup(m_iRPM) * m_fGearRatio[m_iGear] * m_fDifferentialRatio * m_fGearEfficiency / m_fTireRadius;
+    m_fTractionForce = m_fAccelerator * m_fMaxTraction;
+
+    if (m_bIsBraking && dots[3] > 0) {
+        m_fTractionForce = -fSign(dots[3]) * 1000 * dots[3];
+    }
+
+    for (i = 0; i < 4; i++) {
+        float maxgrip;
+
+        maxgrip = m_sWheels[i].fTraction * m_sWheels[i].fLoad * 9.81;
+        if (m_fTractionForce > maxgrip) {
+            m_fTractionForce       = maxgrip * 0.6;
+            m_sWheels[i].bSpinning = true;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        if (m_fTractionForce < -maxgrip) {
+            m_fTractionForce       = -maxgrip * 0.6;
+            m_sWheels[i].bSkidding = true;
+            Com_Printf("Skidding!\n");
+        }
+
+        m_sWheels[i].fLongForce = this->m_sWheels[i].fLongForce + m_fTractionForce;
+        m_sWheels[i].vLongForce += m_sWheels[i].vOrientation * m_sWheels[i].fLongForce;
+    }
+
+    m_vResistance[0] =
+        -(velocity[0] * 0.02 * m_fRollingResistance + velocity[0] * 0.02 * m_fDrag * fabs(velocity[0] * 0.02));
+    m_vResistance[1] =
+        -(velocity[1] * 0.02 * m_fRollingResistance + velocity[1] * 0.02 * m_fDrag * fabs(velocity[1] * 0.02));
+    m_vResistance[2] =
+        -(velocity[2] * 0.02 * m_fRollingResistance + velocity[2] * 0.02 * m_fDrag * fabs(velocity[2] * 0.02));
+
+    m_fBrakingPerformance = -m_fRollingResistance - *vpn * Vector(0, 0, -1) * m_fMass;
+    if (dots[3] == 0) {
+        m_fBrakingPerformance = 0;
+    } else {
+        m_fBrakingPerformance = (dots[3] - (m_fTireRotationalSpeed * m_fTireRadius - m_fBrakingPerformance)) / dots[3];
+        m_fBrakingPerformance = (1.0 - m_fBrakingPerformance) * -(-m_fFrontBrakingForce - m_fBackBrakingForce);
+    }
+
+    if (r_velocity.length() * 0.02 > 0.01) {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+
+        for (i = 0; i < 2; i++) {
+            Vector va, vr;
+            Vector vVel;
+            Vector v1, v2;
+
+            va   = angles;
+            va.x = 0;
+            va.y += RAD2DEG(m_sWheels[i].fYawOffset);
+            va.z = 0;
+            va.AngleVectorsLeft(NULL, &vr, NULL);
+
+            vVel = m_sWheels[i].vVelocity + velocity;
+            // get the direction
+            v1 = vVel;
+            v1.normalize();
+            // get the angles
+            vectoangles(v1, v2);
+
+            m_sWheels[i].fSlipAngle = DEG2RAD(angledist(va.y - v2.y));
+            m_sWheels[i].fGripCoef  = m_sWheels[i].fSlipAngle * 0.15;
+            m_sWheels[i].fGripCoef  = Q_clamp_float(m_sWheels[i].fGripCoef, -1.2f, 1.2f);
+            m_sWheels[i].fLatForce += m_sWheels[i].fGripCoef * m_sWheels[i].fLoad * 9.81;
+
+            if (m_sWheels[i].fLoad * 2 * m_sWheels[i].fTraction < fabs(m_sWheels[i].fLatForce)) {
+                m_sWheels[i].fLatForce = m_sWheels[i].fLatForce / 9.81;
+                m_sWheels[i].bSkidding = true;
+                Com_Printf("Skidding %i!\n", i);
+            }
+
+            m_sWheels[i].vLatForce += vr * m_sWheels[i].fLatForce;
+
+            G_LineWidth(3.0);
+
+            G_DebugLine(
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j,
+                origin + Corners[i][0] * r_i + Corners[i][1] * r_j + m_sWheels[i].vLatForce * 50 * (1.0 / m_fMass),
+                0.7f,
+                0.5f,
+                0.2f,
+                1.0f
+            );
+        }
+    } else {
+        m_fTangForce = 0;
+        m_vTangForce = vec_zero;
+    }
+
+    m_vForce = vec_zero;
+
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].vForce = m_sWheels[i].vLatForce + m_sWheels[i].vLongForce;
+        m_vForce += m_sWheels[i].vForce;
+    }
+
+    m_vForce += m_vResistance;
+
+    G_LineWidth(5.0);
+
+    G_DebugLine(origin, origin + m_vTangForce * (1.0 / m_fMass) * 50, 1.0, 0.0, 1.0, 1.0);
+
+    m_vAcceleration = m_vForce * (1.0 / m_fMass) * 50;
+    m_fTorque       = 0;
+
+    for (i = 0; i < 4; i++) {
+        m_sWheels[i].fTorque += m_sWheels[i].fLongTorque + m_sWheels[i].fLatTorque;
+        m_fTorque += m_sWheels[i].fTorque;
+    }
+
+    m_vAngularAcceleration[1] = angledist(RAD2DEG(m_fTorque));
+    m_vAngularVelocity += m_vAngularAcceleration * level.frametime;
+    m_vAngularVelocity *= 0.825f;
+    avelocity = m_vAngularVelocity;
+
+    if (m_bAutomatic) {
+        //
+        // set the gear
+        //
+        if (m_iRPM >= 2100 && m_iGear <= 2) {
+            m_iGear++;
+        }
+        if (m_iRPM <= 600 && m_iGear > 1) {
+            m_iGear--;
+        }
+    }
+
+    prev_moveimpulse = moveimpulse;
+}
+
+void VehicleWheelsX4::Killed(Event *ev)
+{
+    deadflag = DEAD_DEAD;
 }
 
 float VehicleWheelsX4::TorqueLookup(int rpm)
 {
-	if (rpm <= 2099)
-		return 20.0;
-	if (rpm > 3599)
-		return 0.0;
-	return (20 * (3600 - rpm)) * 0.001;
+    if (rpm <= 2099) {
+        return 20.0;
+    }
+    if (rpm > 3599) {
+        return 0.0;
+    }
+    return (20 * (3600 - rpm)) * 0.001;
 }
 
 void VehicleWheelsX4::Think()
 {
-	vmove_t vm;
-	flags |= FL_POSTTHINK;
-	
-	prev_velocity = velocity;
+    vmove_t vm;
+    flags |= FL_POSTTHINK;
 
-	angles -= m_vAnglesOffset;
-	origin -= m_vOriginOffset;
+    prev_velocity = velocity;
 
-	mins = m_vOldMins;
-	maxs = m_vOldMaxs;
+    angles -= m_vAnglesOffset;
+    origin -= m_vOriginOffset;
 
-	SetMoveInfo(&vm);
-	VmoveSingle(&vm);
-	GetMoveInfo(&vm);
+    mins = m_vOldMins;
+    maxs = m_vOldMaxs;
+
+    SetMoveInfo(&vm);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
 }
 
 void VehicleWheelsX4::Postthink()
 {
-	// FIXME: STUB
-}
+    float        turn;
+    Vector       i, j, k;
+    int          index;
+    trace_t      trace;
+    Vector       normalsum;
+    Vector       normalsum_Front;
+    int          numnormals_Front;
+    Vector       normalsum_Back;
+    int          numnormals_Back;
+    Vector       temp;
+    Vector       pitch, roll;
+    Vector       acceleration;
+    Vector       atmp, atmp2, aup;
+    VehicleBase *v;
+    VehicleBase *last;
+    float        drivespeed;
+    Vector       primal_angles;
+    Vector       vTmp;
+    Vector       n_angles;
 
-void VehicleWheelsX4::Killed(Event* ev)
-{
-	deadflag = DEAD_DEAD;
+    primal_angles = angles;
+
+    if (drivable) {
+        if (m_bAutoPilot) {
+            AutoPilot();
+        } else {
+            moveimpulse *= 0.825f;
+            turnimpulse *= 0.825f;
+        }
+
+        currentspeed = moveimpulse;
+        turnangle    = turnangle * 0.25f + turnimpulse;
+        turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+        if (turnangle > maxturnrate) {
+            turnangle = maxturnrate;
+        } else if (turnangle < -maxturnrate) {
+            turnangle = -maxturnrate;
+        } else if (fabs(turnangle) < 2) {
+            turnangle = 0;
+        }
+
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+
+        angles[0] = 0;
+        angles[2] = 0;
+
+        temp[0] = angles[0];
+        temp[1] = angles[1];
+        temp[2] = angles[2];
+        temp.AngleVectorsLeft(&i, &j, &k);
+
+        j = vec_zero - j;
+
+        index            = 0;
+        numnormals_Front = 0;
+        numnormals_Back  = 0;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2];
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1 && !trace.startsolid) {
+                if (index > 2) {
+                    normalsum_Front += trace.plane.normal;
+                    numnormals_Front++;
+                } else {
+                    normalsum_Back += trace.plane.normal;
+                    numnormals_Back++;
+                }
+
+                normalsum += trace.plane.normal;
+            }
+        }
+
+        if (angles[2] < 60 || angles[2] > 300) {
+            if (numnormals_Front > 1) {
+                m_vFrontNormal = normalsum_Front * (1.0 / numnormals_Front);
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vFrontAngles[1] = 0;
+
+                temp              = m_vFrontNormal;
+                m_vFrontAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Back > 1) {
+                m_vBackNormal = normalsum_Back * (1.0 / numnormals_Back);
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBackAngles[1] = 0;
+
+                temp             = m_vBackNormal;
+                m_vBackAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+
+            if (numnormals_Front + numnormals_Back > 1) {
+                m_vBaseNormal = (normalsum_Front + normalsum_Back) * (1.0 / numnormals_Front + numnormals_Back);
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[0] = -temp.CrossProduct(temp, j).toPitch();
+                // no yaw
+                m_vBaseAngles[1] = 0;
+
+                temp             = m_vBaseNormal;
+                m_vBaseAngles[2] = temp.CrossProduct(temp, i).toPitch();
+            }
+        }
+
+        n_angles    = m_vBaseAngles - angles;
+        n_angles[0] = angledist(n_angles[0]);
+        n_angles[1] = angledist(n_angles[1]);
+        n_angles[2] = angledist(n_angles[2]);
+
+        angles[0] += n_angles[0] * 4.5 * level.frametime;
+        angles[2] += n_angles[2] * 4.5 * level.frametime;
+
+        m_vPrevNormal = m_vBaseNormal;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            m_fFrontBrakingForce = 0.2f;
+            m_fBackBrakingForce  = 0.1f;
+        } else {
+            m_fFrontBrakingForce = 0;
+            m_fBackBrakingForce  = 0;
+        }
+
+        turn = turnangle * 0.005;
+
+        Vector _i, _j, _k;
+        Vector vNewVpn = angles;
+        vNewVpn.y += turnangle;
+
+        vNewVpn.AngleVectorsLeft(&_i, &_j, &_k);
+        UpdateVariables(&acceleration, &i, &j, &k, &_i, &_j, &_k);
+
+        m_vAngles = angles;
+
+        if (currentspeed < 0 && velocity * i > 0) {
+            currentspeed = 0;
+        }
+
+        normalsum = vec_zero;
+
+        for (index = 0; index < 4; index++) {
+            Vector start, end;
+            Vector boxoffset;
+            Vector t_mins(-8, -8, -8);
+            Vector t_maxs(8, 8, 8);
+
+            boxoffset = Corners[index];
+
+            start = origin + i * boxoffset[0] + j * boxoffset[1] + k * boxoffset[2] + Vector(0, 0, 10);
+            end   = start;
+            end[2] -= maxtracedist;
+
+            trace = G_Trace(start, mins, maxs, end, this, MASK_SOLID, qfalse, "Vehicle::PostThink Corners");
+
+            if (trace.fraction != 1.0) {
+                float fCoef;
+
+                if (index > 2) {
+                    fCoef = m_fWheelFrontLoad / (m_fWheelFrontDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += _i * currentspeed * fCoef;
+                    normalsum += i * currentspeed * (1.0 - fCoef);
+                } else {
+                    fCoef = m_fWheelBackLoad / (m_fWheelBackDist / m_fWheelBase * m_fMass);
+                    fCoef = Q_clamp_float(fCoef, 0, 1);
+
+                    normalsum += i * currentspeed * fCoef;
+                    normalsum += _i * currentspeed * (1.0 - fCoef);
+                }
+            }
+        }
+
+        AnglesToAxis(angles, orientation);
+
+        vmove_t vm;
+        SetMoveInfo(&vm);
+        m_sMoveGrid->SetMoveInfo(&vm);
+        m_sMoveGrid->SetOrientation(orientation);
+
+        if (m_sMoveGrid->CheckStuck()) {
+            angles = primal_angles;
+            AnglesToAxis(angles, orientation);
+        }
+
+        m_fForwardForce = acceleration * i * 0.1;
+        m_fBackForce += -m_vAnglesOffset[0] * m_fBouncyCoef;
+        m_fBackForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[0] += m_fForwardForce + m_fBackForce * 12.0 * level.frametime;
+        m_vAnglesOffset[0] = Q_clamp_float(m_vAnglesOffset[0], m_fYawMin, m_fYawMax);
+
+        m_fLeftForce += acceleration * j * 0.1;
+        m_fRightForce += -m_vAnglesOffset[2] * m_fBouncyCoef;
+        m_fRightForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[2] += (m_fLeftForce + m_fRightForce) * 12.0 * level.frametime;
+        m_vAnglesOffset[2] = Q_clamp_float(m_vAnglesOffset[2], m_fRollMin, m_fRollMax);
+
+        m_fDownForce = acceleration[2];
+        m_fUpForce += -m_vOriginOffset[2] * m_fBouncyCoef;
+        m_fUpForce *= m_fSpringyCoef;
+
+        m_vAnglesOffset[2] += (m_fDownForce + m_fUpForce) * 12.0 * level.frametime;
+        m_vAnglesOffset[2] = Q_clamp_float(m_vAnglesOffset[2], m_fZMin, m_fZMax);
+
+        if (groundentity && (angles[2] < 60 || angles[2] > 300)) {
+            velocity += m_vAcceleration * level.frametime;
+        } else {
+            if (angles[2] > 60) {
+                angles[2]; // FIXME: ??
+            }
+
+            velocity += m_vAcceleration * level.frametime;
+        }
+
+        angles += avelocity * level.frametime;
+        setAngles(angles);
+
+        prev_origin = origin;
+    }
+
+    drivespeed = acceleration * orientation[0];
+
+    if (drivable && driver.ent) {
+        str sound_name;
+
+        if (currentspeed > 0) {
+            sound_name = "snd_forward";
+        } else if (currentspeed == 0) {
+            sound_name = "snd_idle";
+        } else {
+            sound_name = "snd_backward";
+        }
+
+        LoopSound(sound_name);
+    }
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    last_origin = origin;
+
+    vTmp = (angles - primal_angles) * level.frametime;
+    if (vTmp.x > 180 || vTmp.x < -180) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > 180 || vTmp.y < -180) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > 180 || vTmp.z < -180) {
+        vTmp.z = 0;
+    }
+
+    if (vTmp.x > -1 || vTmp.x < 1) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > -1 || vTmp.y < 1) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > -1 || vTmp.z < 1) {
+        vTmp.z = 0;
+    }
+
+    avelocity = vTmp;
+    origin += m_vOriginOffset;
+    setOrigin(origin);
+
+    angles += m_vAnglesOffset;
+    setAngles(angles);
+
+    if (driver.ent) {
+        driver.ent->setOrigin(origin + i * driveroffset[0] + j * driveroffset[1] + k * driveroffset[2]);
+
+        if (drivable) {
+            // clear the driver velocity
+            driver.ent->velocity = vec_zero;
+            // set the driver angles to the vehicle's angle
+            driver.ent->setAngles(angles);
+        }
+    }
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (int)(drivespeed / 4.f + v->angles[PITCH]) % 360;
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    if (!driver.ent && !velocity.length() && groundentity && !(watertype & CONTENTS_LAVA)) {
+        // make the vehicle stationary if it's completely immobile
+        flags &= ~FL_POSTTHINK;
+        if (drivable) {
+            setMoveType(MOVETYPE_STATIONARY);
+        }
+    }
 }
diff --git a/code/fgame/actor.cpp b/code/fgame/actor.cpp
index 3d843e78..5045e93e 100644
--- a/code/fgame/actor.cpp
+++ b/code/fgame/actor.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -46,12 +46,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "scriptexception.h"
 #include "parm.h"
 #include "../qcommon/tiki.h"
+#include "smokesprite.h"
 
 #include <cmath>
 
-Vector MINS(-15.0,-15.0,0.0);
-Vector MAXS(15.0,15.0,96.0);
-
 extern Vector PLAYER_BASE_MIN;
 extern Vector PLAYER_BASE_MAX;
 
@@ -59,2496 +57,2690 @@ bool bEntinfoInit = false;
 
 cvar_t *g_showinfo;
 
-const char * gAmericanVoices[] = {"a", "c", "h"};
-const char * gGermanVoices[] = {"a", "c", "d"};
+const char *gAmericanVoices[] = {"a", "c", "h"};
+const char *gGermanVoices[]   = {"a", "c", "d"};
+
+static const float DEFAULT_NEARBY_SQUAD_DIST = 1024;
+static const float MIN_BADPLACE_UPDATE_DIST  = 256;
 
 Event EV_Actor_SetGun
-	(
-	"gun",
-	EV_DEFAULT,
-	"s",
-	"s",
-	"specifies the gun to use"
-	);
-
+(
+    "gun",
+    EV_DEFAULT,
+    "s",
+    "s",
+    "specifies the gun to use",
+    EV_NORMAL
+);
 Event EV_Actor_SetGun2
-	(
-	"gun",
-	EV_DEFAULT,
-	"s",
-	"s",
-	"specifies the gun to use",
-	EV_SETTER
-	);
-
+(
+    "gun",
+    EV_DEFAULT,
+    "s",
+    "s",
+    "specifies the gun to use",
+    EV_SETTER
+);
 Event EV_Actor_GetGun
-	(
-	"gun",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the gun to being used",
-	2
-	);
-
+(
+    "gun",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the gun to being used",
+    EV_GETTER
+);
 Event EV_Actor_WeaponInternal
-	(
-	"weapon_internal",
-	EV_DEFAULT,
-	"s",
-	"s",
-	"internal use"
-	);
-
+(
+    "weapon_internal",
+    EV_DEFAULT,
+    "s",
+    "s",
+    "internal use",
+    EV_NORMAL
+);
 Event EV_Actor_TestAnim
-	(
-	"testanim",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"",
-	0
-	);
-
+(
+    "testanim",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "",
+    EV_NORMAL
+);
 Event EV_Actor_DistToEnemy
-	(
-	"distancetoenemy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the distance from the Actor to its enemy",
-	EV_GETTER
-	);
-
+(
+    "distancetoenemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the distance from the Actor to its enemy",
+    EV_GETTER
+);
 Event EV_Actor_MoveTo
-	(
-	"moveto",
-	EV_DEFAULT,
-	"ss",
-	"anim dest",
-	"Specify the location to move to, with animation anim."
-	);
-
+(
+    "moveto",
+    EV_DEFAULT,
+    "ss",
+    "anim dest",
+    "Specify the location to move to, with animation anim.",
+    EV_NORMAL
+);
 Event EV_Actor_WalkTo
-	(
-	"walkto",
-	EV_DEFAULT,
-	"s",
-	"dest",
-	"Specify the location to walk to."
-	);
-
+(
+    "walkto",
+    EV_DEFAULT,
+    "s",
+    "dest",
+    "Specify the location to walk to.",
+    EV_NORMAL
+);
 Event EV_Actor_RunTo
-	(
-	"runto",
-	EV_DEFAULT,
-	"s",
-	"dest",
-	"Specify the location to run to."
-	);
-
+(
+    "runto",
+    EV_DEFAULT,
+    "s",
+    "dest",
+    "Specify the location to run to.",
+    EV_NORMAL
+);
 Event EV_Actor_CrouchTo
-	(
-	"crouchto",
-	EV_DEFAULT,
-	"s",
-	"dest",
-	"Specify the location to crouch to."
-	);
-
+(
+    "crouchto",
+    EV_DEFAULT,
+    "s",
+    "dest",
+    "Specify the location to crouch to.",
+    EV_NORMAL
+);
 Event EV_Actor_CrawlTo
-	(
-	"crawlto",
-	EV_DEFAULT,
-	"s",
-	"dest",
-	"Specify the location to crawl to."
-	);
-
+(
+    "crawlto",
+    EV_DEFAULT,
+    "s",
+    "dest",
+    "Specify the location to crawl to.",
+    EV_NORMAL
+);
 Event EV_Actor_AimAt
-	(
-	"aimat",
-	EV_DEFAULT,
-	"s",
-	"target",
-	"Specify the target to aim at."
-	);
-
+(
+    "aimat",
+    EV_DEFAULT,
+    "s",
+    "target",
+    "Specify the target to aim at.",
+    EV_NORMAL
+);
 Event EV_Actor_Follow
-	(
-	"follow",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"Specify the entity to follow."
-	);
-
+(
+    "follow",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Specify the entity to follow.",
+    EV_NORMAL
+);
 Event EV_Actor_DeathEmbalm
-	(
-	"deathembalm",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"preps the dead actor for turning nonsolid gradually over time"
-	);
-
+(
+    "deathembalm",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "preps the dead actor for turning nonsolid gradually over time",
+    EV_NORMAL
+);
 Event EV_Actor_Anim
-	(
-	"anim",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play animation."
-	);
-
+(
+    "anim",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play animation.",
+    EV_NORMAL
+);
 Event EV_Actor_Anim_Scripted
-	(
-	"anim_scripted",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play scripted animation."
-	);
-
+(
+    "anim_scripted",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play scripted animation.",
+    EV_NORMAL
+);
 Event EV_Actor_Anim_Noclip
-	(
-	"anim_noclip",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play noclip animation."
-	);
-
+(
+    "anim_noclip",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play noclip animation.",
+    EV_NORMAL
+);
+Event EV_Actor_Anim_Attached
+(
+    "anim_attached",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play attached animation.",
+    EV_NORMAL
+);
 Event EV_Actor_AnimLoop
-	(
-	"animloop",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Loop animation."
-	);
-
+(
+    "animloop",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Loop animation.",
+    EV_NORMAL
+);
 Event EV_Actor_AnimScript
-	(
-	"animscript",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play the animation script"
-	);
-
+(
+    "animscript",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play the animation script",
+    EV_NORMAL
+);
 Event EV_Actor_AnimScript_Scripted
-	(
-	"animscript_scripted",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play the scripted animation script"
-	);
-
+(
+    "animscript_scripted",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play the scripted animation script",
+    EV_NORMAL
+);
 Event EV_Actor_AnimScript_Noclip
-	(
-	"animscript_noclip",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Play the noclip animation script"
-	);
-
+(
+    "animscript_noclip",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play the noclip animation script",
+    EV_NORMAL
+);
+// Added in 2.0
+//====
+Event EV_Actor_AnimScript_Attached
+(
+    "animscript_attached",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Play a noclip animation even when attached",
+    EV_NORMAL
+);
+//====
 Event EV_Actor_Reload_mg42
-	(
-	"reload_mg42",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Reload the mg42 - only used by machinegunner"
-	);
-
+(
+    "reload_mg42",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Reload the mg42 - only used by machinegunner",
+    EV_NORMAL
+);
 Event EV_Actor_Dumb
-	(
-	"dumb",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Make Actor dumb."
-	);
-
+(
+    "dumb",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make Actor dumb.",
+    EV_NORMAL
+);
 Event EV_Actor_Physics_On
-	(
-	"physics_on",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"turn physics on."
-	);
-
+(
+    "physics_on",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "turn physics on.",
+    EV_NORMAL
+);
 Event EV_Actor_Physics_Off
-	(
-	"physics_off",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"turn physics off."
-	);
-
+(
+    "physics_off",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "turn physics off.",
+    EV_NORMAL
+);
 Event EV_Actor_SetAnim
-	(
-	"setanim",
-	EV_DEFAULT,
-	"sifs",
-	"anim slot weight flagged",
-	"Set animation slot"
-	);
-
+(
+    "setanim",
+    EV_DEFAULT,
+    "sifs",
+    "anim slot weight flagged",
+    "Set animation slot",
+    EV_NORMAL
+);
 Event EV_Actor_SetAnimLength
-	(
-	"setanimlength",
-	EV_DEFAULT,
-	"f",
-	"time",
-	"Set the maximum time an animation will play"
-	);
-
+(
+    "setanimlength",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Set the maximum time an animation will play",
+    EV_NORMAL
+);
 Event EV_Actor_EndActionAnim
-	(
-	"endactionanim",
-	EV_DEFAULT,
-	"",
-	"",
-	"End any aiming/action animation which is currently playing"
-	);
-
+(
+    "endactionanim",
+    EV_DEFAULT,
+    "",
+    "",
+    "End any aiming/action animation which is currently playing",
+    EV_NORMAL
+);
 Event EV_Actor_SetMotionAnim
-	(
-	"setmotionanim",
-	EV_DEFAULT,
-	"s",
-	"anim",
-	"Set motion animation (handler scripts only)"
-	);
-
+(
+    "setmotionanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Set motion animation (handler scripts only)",
+    EV_NORMAL
+);
 Event EV_Actor_SetAimMotionAnim
-	(
-	"setaimmotionanim",
-	EV_DEFAULT,
-	"sss",
-	"anim_crouch anim_stand anim_high",
-	"Set aim motion animation (handler scripts only)"
-	);
-
-
-
+(
+    "setaimmotionanim",
+    EV_DEFAULT,
+    "ss",
+    "anim_crouch anim_stand",
+    "Set aim motion animation (handler scripts only)",
+    EV_NORMAL
+);
 Event EV_Actor_SetActionAnim
-	(
-	"setactionanim",
-	EV_DEFAULT,
-	"sff",
-	"base_anim lower_limit upper_limit",
-	"Set the base action animation and range that they cover"
-	);
-
+(
+    "setactionanim",
+    EV_DEFAULT,
+    "sff",
+    "base_anim lower_limit upper_limit",
+    "Set the base action animation and range that they cover",
+    EV_NORMAL
+);
 Event EV_Actor_UpperAnim
-	(
-	"upperanim",
-	EV_DEFAULT,
-	"s",
-	"anim",
-	"Set the upper body "
-	);
-
+(
+    "upperanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Set the upper body animation",
+    EV_NORMAL
+);
 Event EV_Actor_SetUpperAnim
-	(
-	"setupperanim",
-	EV_DEFAULT,
-	"s",
-	"anim",
-	"Set the upper body animation - used by animation script only"
-	);
-
+(
+    "setupperanim",
+    EV_DEFAULT,
+    "s",
+    "anim",
+    "Set the upper body animation - used by animation script only",
+    EV_NORMAL
+);
 Event EV_Actor_SetCrossblendTime
-	(
-	"blendtime",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set the crossblend time to something other than the default, in seconds",
-	EV_SETTER
-	);
-
+(
+    "blendtime",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the crossblend time to something other than the default, in seconds",
+    EV_SETTER
+);
 Event EV_Actor_GetCrossblendTime
-	(
-	"blendtime",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the crossblend time",
-	EV_GETTER
-	);
-
+(
+    "blendtime",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the crossblend time",
+    EV_GETTER
+);
 Event EV_Actor_SetPosition
-	(
-	"position",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The Position the Actor wants to be and should animate towards",
-	EV_SETTER
-	);
-
+(
+    "position",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The Position the Actor wants to be and should animate towards",
+    EV_SETTER
+);
 Event EV_Actor_GetPosition
-	(
-	"position",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The Position the Actor wants to be and should animate towards",
-	EV_GETTER
-	);
-
+(
+    "position",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The Position the Actor wants to be and should animate towards",
+    EV_GETTER
+);
 Event EV_Actor_SetEmotion
-	(
-	"emotion",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The method of setting the facial expression of the Actor",
-	EV_SETTER
-	);
-
+(
+    "emotion",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The method of setting the facial expression of the Actor",
+    EV_SETTER
+);
 Event EV_Actor_SetAnimFinal
-	(
-	"animfinal",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Whether the animation was succesfully finished",
-	EV_SETTER
-	);
-
+(
+    "animfinal",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Whether the animation was successfully finished",
+    EV_SETTER
+);
 Event EV_Actor_GetWeaponType
-	(
-	"weapontype",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The Weapon Type of the ",
-	EV_GETTER
-	);
-
+(
+    "weapontype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The Weapon Type of the Actor",
+    EV_GETTER
+);
 Event EV_Actor_GetWeaponGroup
-	(
-	"weapongroup",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Specifies weapon animation set to use in anim scripts",
-	EV_GETTER
-	);
-
+(
+    "weapongroup",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Specifies weapon animation set to use in anim scripts",
+    EV_GETTER
+);
 Event EV_Entity_Start
-	(
-	"entitystart",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Initialize a Actor."
-	);
-
+(
+    "entitystart",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Initialize a Actor.",
+    EV_NORMAL
+);
 Event EV_Actor_LookAt
-	(
-	"lookat",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"The actor will look at this entity."
-	);
-
+(
+    "lookat",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "The actor will look at this entity.",
+    EV_NORMAL
+);
 Event EV_Actor_EyesLookAt
-	(
-	"eyeslookat",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"The actor will look at this entity."
-	);
-
+(
+    "eyeslookat",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "The actor will look at this entity.",
+    EV_NORMAL
+);
 Event EV_Actor_PointAt
-	(
-	"pointat",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"The actor will point at this entity."
-	);
-
+(
+    "pointat",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "The actor will point at this entity.",
+    EV_NORMAL
+);
 Event EV_Actor_TurnTo
-	(
-	"turnto",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"The actor will turn to this entity."
-	);
-
+(
+    "turnto",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "The actor will turn to this entity.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTurnDoneError
-	(
-	"turndoneerror",
-	EV_DEFAULT,
-	"f",
-	"error",
-	"The error amount that turndone will occur for the turnto command."
-	);
-
+(
+    "turndoneerror",
+    EV_DEFAULT,
+    "f",
+    "error",
+    "The error amount that turndone will occur for the turnto command.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTurnDoneError2
-	(
-	"turndoneerror",
-	EV_DEFAULT,
-	"f",
-	"error",
-	"The error amount that turndone will occur for the turnto command.",
-	EV_SETTER
-	);
-
+(
+    "turndoneerror",
+    EV_DEFAULT,
+    "f",
+    "error",
+    "The error amount that turndone will occur for the turnto command.",
+    EV_SETTER
+);
 Event EV_Actor_GetTurnDoneError
-	(
-	"turndoneerror",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The error amount that turndone will occur for the turnto command.",
-	EV_GETTER
-	);
-
+(
+    "turndoneerror",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The error amount that turndone will occur for the turnto command.",
+    EV_GETTER
+);
 Event EV_Actor_IdleSayAnim
-	(
-	"idlesay",
-	EV_DEFAULT,
-	"s",
-	"animation",
-	"The name of an idle dialog animation to play"
-	);
-
+(
+    "idlesay",
+    EV_DEFAULT,
+    "s",
+    "animation",
+    "The name of an idle dialog animation to play",
+    EV_NORMAL
+);
 Event EV_Actor_SayAnim
-	(
-	"say",
-	EV_DEFAULT,
-	"s",
-	"animation",
-	"The name of a dialog animation to play"
-	);
-
+(
+    "say",
+    EV_DEFAULT,
+    "s",
+    "animation",
+    "The name of a dialog animation to play",
+    EV_NORMAL
+);
 Event EV_Actor_SetSayAnim
-	(
-	"setsay",
-	EV_DEFAULT,
-	"s",
-	"animation",
-	"The name of a dialog animation to play - used by animation script only"
-	);
-
+(
+    "setsay",
+    EV_DEFAULT,
+    "s",
+    "animation",
+    "The name of a dialog animation to play - used by animation script only",
+    EV_NORMAL
+);
 Event EV_Actor_DamagePuff
-	(
-	"damagepuff",
-	EV_DEFAULT,
-	"vv",
-	"position direction",
-	"Spawns a puff of 'blood' smoke at the speficied location in the specified direction."
-	);
-
+(
+    "damagepuff",
+    EV_DEFAULT,
+    "vv",
+    "position direction",
+    "Spawns a puff of 'blood' smoke at the specified location in the specified direction.",
+    EV_NORMAL
+);
 Event EV_Actor_SetAngleYawSpeed
-	(
-	"turnspeed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"The turn speed of the actor.",
-	EV_SETTER
-	);
-
+(
+    "turnspeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "The turn speed of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_SetAngleYawSpeed2
-	(
-	"turnspeed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"The turn speed of the actor."
-	);
-
+(
+    "turnspeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "The turn speed of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_GetAngleYawSpeed
-	(
-	"turnspeed",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The turn speed of the actor.",
-	EV_GETTER
-	);
-
+(
+    "turnspeed",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The turn speed of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetAimTarget
-	(
-	"setaimtarget",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"Sets the primary weapon's aim target."
-	);
-
+(
+    "setaimtarget",
+    EV_DEFAULT,
+    "ei",
+    "entity bMakeEnemy",
+    "Sets the primary weapon's aim target. if you pass a 1 for p2, the target will become the current enemy...",
+    EV_NORMAL
+);
 Event EV_Actor_ReadyToFire
-	(
-	"ReadyToFire",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns if ready to fire",
-	EV_RETURN
-	);
-
+(
+    "ReadyToFire",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns if ready to fire",
+    EV_RETURN
+);
 Event EV_Actor_AIOff
-	(
-	"ai_off",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Turns the AI off for this actor."
-	);
-
+(
+    "ai_off",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turns the AI off for this actor.",
+    EV_NORMAL
+);
 Event EV_Actor_AIOn
-	(
-	"ai_on",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Turns the AI on for this actor."
-	);
-
-Event EV_Actor_GetLocalYawFromVector
-	(
-	"GetLocalYawFromVector",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Turn a worldspace vector into a local space yaw",
-	EV_RETURN
-	);
-
+(
+    "ai_on",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turns the AI on for this actor.",
+    EV_NORMAL
+);
 Event EV_Actor_GetSight
-	(
-	"sight",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the vision distance of the actor.",
-	EV_GETTER
-	);
-
+(
+    "sight",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the vision distance of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetSight
-	(
-	"sight",
-	EV_DEFAULT,
-	"f",
-	"max_sight_range",
-	"Sets the vision distance of the actor.",
-	EV_SETTER
-	);
-
+(
+    "sight",
+    EV_DEFAULT,
+    "f",
+    "max_sight_range",
+    "Sets the vision distance of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_SetSight2
-	(
-	"sight",
-	EV_DEFAULT,
-	"f",
-	"max_sight_range",
-	"Sets the vision distance of the actor."
-	);
-
+(
+    "sight",
+    EV_DEFAULT,
+    "f",
+    "max_sight_range",
+    "Sets the vision distance of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_GetHearing
-	(
-	"hearing",
-	EV_DEFAULT,
-	"f",
-	"radius",
-	"The hearing radius of the actor",
-	EV_GETTER
-	);
-
+(
+    "hearing",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "The hearing radius of the actor",
+    EV_GETTER
+);
 Event EV_Actor_SetHearing
-	(
-	"hearing",
-	EV_DEFAULT,
-	"f",
-	"radius",
-	"The hearing radius of the actor"
-	);
-
+(
+    "hearing",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "The hearing radius of the actor",
+    EV_NORMAL
+);
 Event EV_Actor_SetHearing2
-	(
-	"hearing",
-	EV_DEFAULT,
-	"f",
-	"radius",
-	"The hearing radius of the actor",
-	EV_SETTER
-	);
-
+(
+    "hearing",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "The hearing radius of the actor",
+    EV_SETTER
+);
 Event EV_Actor_GetFov
-	(
-	"fov",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The fov angle of the actor",
-	EV_GETTER
-	);
-
+(
+    "fov",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The fov angle of the actor",
+    EV_GETTER
+);
 Event EV_Actor_SetFov
-	(
-	"fov",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"The fov angle of the actor"
-	);
-
+(
+    "fov",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "The fov angle of the actor",
+    EV_NORMAL
+);
 Event EV_Actor_SetFov2
-	(
-	"fov",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"The fov angle of the actor",
-	EV_SETTER
-	);
-
+(
+    "fov",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "The fov angle of the actor",
+    EV_SETTER
+);
 Event EV_Actor_SetTypeIdle
-	(
-	"type_idle",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the idle type of the actor."
-	);
-
+(
+    "type_idle",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the idle type of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTypeIdle2
-	(
-	"type_idle",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the idle type of the actor.",
-	EV_SETTER
-	);
-
+(
+    "type_idle",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the idle type of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_GetTypeIdle
-	(
-	"type_idle",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the idle type of the actor.",
-	EV_GETTER
-	);
-
+(
+    "type_idle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the idle type of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetTypeAttack
-	(
-	"type_attack",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the attack type of the actor."
-	);
-
+(
+    "type_attack",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the attack type of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTypeAttack2
-	(
-	"type_attack",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the attack type of the actor.",
-	EV_SETTER
-	);
-
+(
+    "type_attack",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the attack type of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_GetTypeAttack
-	(
-	"type_attack",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the attack type of the actor.",
-	EV_GETTER
-	);
-
+(
+    "type_attack",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the attack type of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetTypeDisguise
-	(
-	"type_disguise",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the disguise type of the actor."
-	);
-
+(
+    "type_disguise",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the disguise type of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTypeDisguise2
-	(
-	"type_disguise",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the disguise type of the actor.",
-	EV_SETTER
-	);
-
+(
+    "type_disguise",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the disguise type of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_GetTypeDisguise
-	(
-	"type_disguise",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the disguise type of the actor.",
-	EV_GETTER
-	);
-
+(
+    "type_disguise",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the disguise type of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetDisguiseLevel
-	(
-	"disguise_level",
-	EV_DEFAULT,
-	"i",
-	"value",
-	"Sets the disguise level of the actor. May be 1 or 2"
-	);
-
+(
+    "disguise_level",
+    EV_DEFAULT,
+    "i",
+    "value",
+    "Sets the disguise level of the actor. May be 1 or 2",
+    EV_NORMAL
+);
 Event EV_Actor_SetDisguiseLevel2
-	(
-	"disguise_level",
-	EV_DEFAULT,
-	"i",
-	"value",
-	"Sets the disguise level of the actor. May be 1 or 2",
-	EV_SETTER
-	);
-
+(
+    "disguise_level",
+    EV_DEFAULT,
+    "i",
+    "value",
+    "Sets the disguise level of the actor. May be 1 or 2",
+    EV_SETTER
+);
 Event EV_Actor_GetDisguiseLevel
-	(
-	"disguise_level",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the disguise level of the actor. May be 1 or 2",
-	EV_GETTER
-	);
-
+(
+    "disguise_level",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the disguise level of the actor. May be 1 or 2",
+    EV_GETTER
+);
 Event EV_Actor_SetTypeGrenade
-	(
-	"type_grenade",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the grenade type of the actor."
-	);
-
+(
+    "type_grenade",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the grenade type of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTypeGrenade2
-	(
-	"type_grenade",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the grenade type of the actor.",
-	EV_SETTER
-	);
-
+(
+    "type_grenade",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the grenade type of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_GetTypeGrenade
-	(
-	"type_grenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the grenade type of the actor.",
-	EV_GETTER
-	);
-
+(
+    "type_grenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the grenade type of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_SetPatrolPath
-	(
-	"patrolpath",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the patrol path for the actor (must have type set to patrol for effect)"
-	);
-
+(
+    "patrolpath",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the patrol path for the actor (must have type set to patrol for effect)",
+    EV_NORMAL
+);
 Event EV_Actor_SetPatrolPath2
-	(
-	"patrolpath",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the patrol path for the actor (must have type set to patrol for effect)",
-	EV_SETTER
-	);
-
+(
+    "patrolpath",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the patrol path for the actor (must have type set to patrol for effect)",
+    EV_SETTER
+);
 Event EV_Actor_GetPatrolPath
-	(
-	"patrolpath",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the name of the patrol path for the actor (must have type set to patrol for effect)",
-	EV_GETTER
-	);
-
+(
+    "patrolpath",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the name of the patrol path for the actor (must have type set to patrol for effect)",
+    EV_GETTER
+);
 Event EV_Actor_SetPatrolWaitTrigger
-	(
-	"waittrigger",
-	EV_DEFAULT,
-	"b",
-	"bool",
-	"If true, patrol guys and running men wait until triggered to move"
-	);
-
+(
+    "waittrigger",
+    EV_DEFAULT,
+    "b",
+    "bool",
+    "If true, patrol guys and running men wait until triggered to move",
+    EV_NORMAL
+);
 Event EV_Actor_SetPatrolWaitTrigger2
-	(
-	"waittrigger",
-	EV_DEFAULT,
-	"b",
-	"bool",
-	"If true, patrol guys and running men wait until triggered to move",
-	EV_SETTER
-	);
-
+(
+    "waittrigger",
+    EV_DEFAULT,
+    "b",
+    "bool",
+    "If true, patrol guys and running men wait until triggered to move",
+    EV_SETTER
+);
 Event EV_Actor_GetPatrolWaitTrigger
-	(
-	"waittrigger",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"If true, patrol guys and running men wait until triggered to move",
-	EV_GETTER
-	);
-
+(
+    "waittrigger",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "If true, patrol guys and running men wait until triggered to move",
+    EV_GETTER
+);
 Event EV_Actor_SetAlarmNode
-	(
-	"alarmnode",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the alarm node for the actor (must have type set to alarm for effect)"
-	);
-
+(
+    "alarmnode",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the alarm node for the actor (must have type set to alarm for effect)",
+    EV_NORMAL
+);
 Event EV_Actor_SetAlarmNode2
-	(
-	"alarmnode",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the alarm node for the actor (must have type set to alarm for effect)",
-	EV_SETTER
-	);
-
+(
+    "alarmnode",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the alarm node for the actor (must have type set to alarm for effect)",
+    EV_SETTER
+);
 Event EV_Actor_GetAlarmNode
-	(
-	"alarmnode",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the name of the alarm node for the actor (must have type set to alarm for effect)",
-	EV_GETTER
-	);
-
+(
+    "alarmnode",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the name of the alarm node for the actor (must have type set to alarm for effect)",
+    EV_GETTER
+);
+// Added in 2.30
+//====
+Event EV_Actor_SetPreAlarmThread
+(
+    "prealarmthread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the pre alarm thread for the actor (must have type set to alarm for effect)",
+    EV_NORMAL
+);
+Event EV_Actor_SetPreAlarmThread2
+(
+    "prealarmthread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the pre alarm thread for the actor (must have type set to alarm for effect)",
+    EV_SETTER
+);
+//====
 Event EV_Actor_SetAlarmThread
-	(
-	"alarmthread",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the alarm thread for the actor (must have type set to alarm for effect)"
-	);
-
+(
+    "alarmthread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the alarm thread for the actor (must have type set to alarm for effect)",
+    EV_NORMAL
+);
 Event EV_Actor_SetAlarmThread2
-	(
-	"alarmthread",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the alarm thread for the actor (must have type set to alarm for effect)",
-	EV_SETTER
-	);
-
+(
+    "alarmthread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the alarm thread for the actor (must have type set to alarm for effect)",
+    EV_SETTER
+);
 Event EV_Actor_GetAlarmThread
-	(
-	"alarmthread",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the name of the alarm thread for the actor (must have type set to alarm for effect)",
-	EV_GETTER
-	);
-
+(
+    "alarmthread",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the name of the alarm thread for the actor (must have type set to alarm for effect)",
+    EV_GETTER
+);
 Event EV_Actor_SetDisguiseAcceptThread
-	(
-	"disguise_accept_thread",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the thread for the actor to start when accepting papers"
-	);
-
+(
+    "disguise_accept_thread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the thread for the actor to start when accepting papers",
+    EV_NORMAL
+);
 Event EV_Actor_SetDisguiseAcceptThread2
-	(
-	"disguise_accept_thread",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the thread for the actor to start when accepting papers",
-	EV_SETTER
-	);
-
+(
+    "disguise_accept_thread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the thread for the actor to start when accepting papers",
+    EV_SETTER
+);
 Event EV_Actor_GetDisguiseAcceptThread
-	(
-	"disguise_accept_thread",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the name of the thread for the actor to start when accepting papers",
-	EV_GETTER
-	);
-
+(
+    "disguise_accept_thread",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the name of the thread for the actor to start when accepting papers",
+    EV_GETTER
+);
 Event EV_Actor_SetAccuracy
-	(
-	"accuracy",
-	EV_DEFAULT,
-	"f",
-	"value",
-	"Set percent to hit"
-	);
-
+(
+    "accuracy",
+    EV_DEFAULT,
+    "f",
+    "value",
+    "Set percent to hit",
+    EV_NORMAL
+);
 Event EV_Actor_SetAccuracy2
-	(
-	"accuracy",
-	EV_DEFAULT,
-	"f",
-	"value",
-	"Set percent to hit",
-	EV_SETTER
-	);
-
+(
+    "accuracy",
+    EV_DEFAULT,
+    "f",
+    "value",
+    "Set percent to hit",
+    EV_SETTER
+);
 Event EV_Actor_GetAccuracy
-	(
-	"accuracy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set percent to hit",
-	EV_GETTER
-	);
-
+(
+    "accuracy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set percent to hit",
+    EV_GETTER
+);
 Event EV_Actor_SetMinDistance
-	(
-	"mindist",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the minimum distance the AI tries to keep between itself and the player"
-	);
-
+(
+    "mindist",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the minimum distance the AI tries to keep between itself and the player",
+    EV_NORMAL
+);
 Event EV_Actor_SetMinDistance2
-	(
-	"mindist",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the minimum distance the AI tries to keep between itself and the player",
-	EV_SETTER
-	);
-
+(
+    "mindist",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the minimum distance the AI tries to keep between itself and the player",
+    EV_SETTER
+);
 Event EV_Actor_GetMinDistance
-	(
-	"mindist",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the minimum distance the AI tries to keep between itself and the player",
-	EV_GETTER
-	);
-
+(
+    "mindist",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the minimum distance the AI tries to keep between itself and the player",
+    EV_GETTER
+);
 Event EV_Actor_SetMaxDistance
-	(
-	"maxdist",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the maximum distance the AI tries to allow between itself and the player"
-	);
-
+(
+    "maxdist",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the maximum distance the AI tries to allow between itself and the player",
+    EV_NORMAL
+);
 Event EV_Actor_SetMaxDistance2
-	(
-	"maxdist",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the maximum distance the AI tries to allow between itself and the player",
-	EV_SETTER
-	);
-
+(
+    "maxdist",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the maximum distance the AI tries to allow between itself and the player",
+    EV_SETTER
+);
 Event EV_Actor_GetMaxDistance
-	(
-	"maxdist",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the maximum distance the AI tries to keep between itself and the player",
-	EV_GETTER
-	);
-
+(
+    "maxdist",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the maximum distance the AI tries to keep between itself and the player",
+    EV_GETTER
+);
 Event EV_Actor_GetLeash
-	(
-	"leash",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the maximum distance the AI will wander from its leash home",
-	EV_GETTER
-	);
-
+(
+    "leash",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the maximum distance the AI will wander from its leash home",
+    EV_GETTER
+);
 Event EV_Actor_SetLeash
-	(
-	"leash",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the maximum distance the AI will wander from its leash home",
-	EV_SETTER
-	);
-
+(
+    "leash",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the maximum distance the AI will wander from its leash home",
+    EV_SETTER
+);
 Event EV_Actor_SetLeash2
-	(
-	"leash",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the maximum distance the AI will wander from its leash home"
-	);
-
+(
+    "leash",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the maximum distance the AI will wander from its leash home",
+    EV_NORMAL
+);
 Event EV_Actor_GetInterval
-	(
-	"interval",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the distance AI tries to keep between squadmates while moving.",
-	EV_GETTER
-	);
-
+(
+    "interval",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the distance AI tries to keep between squadmates while moving.",
+    EV_GETTER
+);
 Event EV_Actor_SetInterval
-	(
-	"interval",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the distance AI tries to keep between squadmates while moving.",
-	EV_SETTER
-	);
-
+(
+    "interval",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the distance AI tries to keep between squadmates while moving.",
+    EV_SETTER
+);
 Event EV_Actor_SetInterval2
-	(
-	"interval",
-	EV_DEFAULT,
-	"f",
-	"distance",
-	"Sets the distance AI tries to keep between squadmates while moving."
-	);
-
+(
+    "interval",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the distance AI tries to keep between squadmates while moving.",
+    EV_NORMAL
+);
 Event EV_Actor_GetRunAnim
-	(
-	"GetRunAnim",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Internal usage",
-	EV_RETURN
-	);
-
+(
+    "GetRunAnim",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Internal usage",
+    EV_RETURN
+);
 Event EV_Actor_GetWalkAnim
-	(
-	"GetWalkAnim",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Internal usage",
-	EV_RETURN
-	);
-
+(
+    "GetWalkAnim",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Internal usage",
+    EV_RETURN
+);
 Event EV_Actor_GetAnimName
-	(
-	"animname",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the animname.",
-	EV_GETTER
-	);
-
+(
+    "animname",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the animname.",
+    EV_GETTER
+);
 Event EV_Actor_SetAnimName
-	(
-	"animname",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the animname.",
-	EV_SETTER
-	);
-
+(
+    "animname",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the animname.",
+    EV_SETTER
+);
 Event EV_Actor_SetDisguiseRange
-	(
-	"disguise_range",
-	EV_DEFAULT,
-	"f",
-	"range_in_units",
-	"Sets the maximum distance for disguise behavior to get triggered",
-	EV_SETTER
-	);
-
+(
+    "disguise_range",
+    EV_DEFAULT,
+    "f",
+    "range_in_units",
+    "Sets the maximum distance for disguise behavior to get triggered",
+    EV_SETTER
+);
 Event EV_Actor_SetDisguiseRange2
-	(
-	"disguise_range",
-	EV_DEFAULT,
-	"f",
-	"range_in_units",
-	"Sets the maximum distance for disguise behavior to get triggered"
-	);
-
+(
+    "disguise_range",
+    EV_DEFAULT,
+    "f",
+    "range_in_units",
+    "Sets the maximum distance for disguise behavior to get triggered",
+    EV_NORMAL
+);
 Event EV_Actor_GetDisguiseRange
-	(
-	"disguise_range",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the maximum distance for disguise behavior to get triggered",
-	EV_GETTER
-	);
-
+(
+    "disguise_range",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the maximum distance for disguise behavior to get triggered",
+    EV_GETTER
+);
 Event EV_Actor_SetDisguisePeriod
-	(
-	"disguise_period",
-	EV_DEFAULT,
-	"f",
-	"period_in_seconds",
-	"Sets the time between the end of one disguise behavior and start of the next",
-	EV_SETTER
-	);
-
+(
+    "disguise_period",
+    EV_DEFAULT,
+    "f",
+    "period_in_seconds",
+    "Sets the time between the end of one disguise behavior and start of the next",
+    EV_SETTER
+);
 Event EV_Actor_SetDisguisePeriod2
-	(
-	"disguise_period",
-	EV_DEFAULT,
-	"f",
-	"period_in_seconds",
-	"Sets the time between the end of one disguise behavior and start of the next"
-	);
-
+(
+    "disguise_period",
+    EV_DEFAULT,
+    "f",
+    "period_in_seconds",
+    "Sets the time between the end of one disguise behavior and start of the next",
+    EV_NORMAL
+);
 Event EV_Actor_GetDisguisePeriod
-	(
-	"disguise_period",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the time between the end of one disguise behavior and start of the next",
-	EV_GETTER
-	);
-
+(
+    "disguise_period",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the time between the end of one disguise behavior and start of the next",
+    EV_GETTER
+);
 Event EV_Actor_AttackPlayer
-	(
-	"attackplayer",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Force Actor to attack the player"
-	);
-
+(
+    "attackplayer",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Force Actor to attack the player",
+    EV_NORMAL
+);
 Event EV_Actor_SetSoundAwareness
-	(
-	"sound_awareness",
-	EV_DEFAULT,
-	"f",
-	"awareness_percent",
-	"sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius"
-	);
-
+(
+    "sound_awareness",
+    EV_DEFAULT,
+    "f",
+    "awareness_percent",
+    "sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades "
+    "to z"
+    "ero outside sound's radius",
+    EV_NORMAL
+);
 Event EV_Actor_SetSoundAwareness2
-	(
-	"sound_awareness",
-	EV_DEFAULT,
-	"f",
-	"awareness_percent",
-	"sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius",
-	EV_SETTER
-	);
-
+(
+    "sound_awareness",
+    EV_DEFAULT,
+    "f",
+    "awareness_percent",
+    "sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades "
+    "to z"
+    "ero outside sound's radius",
+    EV_SETTER
+);
 Event EV_Actor_GetSoundAwareness
-	(
-	"sound_awareness",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius",
-	EV_GETTER
-	);
-
+(
+    "sound_awareness",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades "
+    "to z"
+    "ero outside sound's radius",
+    EV_GETTER
+);
 Event EV_Actor_SetGrenadeAwareness
-	(
-	"gren_awareness",
-	EV_DEFAULT,
-	"f",
-	"awareness_percent",
-	"sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)"
-	);
-
-
+(
+    "gren_awareness",
+    EV_DEFAULT,
+    "f",
+    "awareness_percent",
+    "sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied "
+    "once e"
+    "very 0.4 seconds)",
+    EV_NORMAL
+);
 Event EV_Actor_SetGrenadeAwareness2
-	(
-	"gren_awareness",
-	EV_DEFAULT,
-	"f",
-	"awareness_percent",
-	"sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)",
-	EV_SETTER
-	);
-
+(
+    "gren_awareness",
+    EV_DEFAULT,
+    "f",
+    "awareness_percent",
+    "sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied "
+    "once e"
+    "very 0.4 seconds)",
+    EV_SETTER
+);
 Event EV_Actor_GetGrenadeAwareness
-	(
-	"gren_awareness",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)",
-	EV_GETTER
-	);
-
+(
+    "gren_awareness",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied "
+    "once e"
+    "very 0.4 seconds)",
+    EV_GETTER
+);
 Event EV_Actor_SetTurret
-	(
-	"turret",
-	EV_DEFAULT,
-	"s",
-	"turret",
-	"Sets the turret of the actor."
-	);
-
+(
+    "turret",
+    EV_DEFAULT,
+    "s",
+    "turret",
+    "Sets the turret of the actor.",
+    EV_NORMAL
+);
 Event EV_Actor_SetTurret2
-	(
-	"turret",
-	EV_DEFAULT,
-	"s",
-	"turret",
-	"Sets the turret of the actor.",
-	EV_SETTER
-	);
-
+(
+    "turret",
+    EV_DEFAULT,
+    "s",
+    "turret",
+    "Sets the turret of the actor.",
+    EV_SETTER
+);
 Event EV_Actor_GetTurret
-	(
-	"turret",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the turret of the actor.",
-	EV_GETTER
-	);
-
+(
+    "turret",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the turret of the actor.",
+    EV_GETTER
+);
 Event EV_Actor_AttachGrenade
-	(
-	"attachgrenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Used only by grenade return animations to tell the code when to attach the grenade to the actor"
-	);
-
+(
+    "attachgrenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Used only by grenade return animations to tell the code when to attach the grenade to the actor",
+    EV_NORMAL
+);
 Event EV_Actor_DetachGrenade
-	(
-	"detachgrenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Used only by grenade return animations to tell the code when to throw the grenade"
-	);
-
+(
+    "detachgrenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Used only by grenade return animations to tell the code when to throw the grenade",
+    EV_NORMAL
+);
 Event EV_Actor_FireGrenade
-	(
-	"fire_grenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Used only by grenade throw animations to tell the code when to throw a grenade"
-	);
-
+(
+    "fire_grenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Used only by grenade throw animations to tell the code when to throw a grenade",
+    EV_NORMAL
+);
 Event EV_Actor_EnableEnemy
-	(
-	"enableEnemy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"sets enableEnemy variable",
-	EV_SETTER
-	);
-
+(
+    "enableEnemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sets enableEnemy variable",
+    EV_SETTER
+);
 Event EV_Actor_EnablePain
-	(
-	"enablePain",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"sets enablePain variable",
-	EV_SETTER
-	);
-
+(
+    "enablePain",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sets enablePain variable",
+    EV_SETTER
+);
 Event EV_Actor_SetPainHandler
-	(
-	"painhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the current script that will handle pain events",
-	EV_SETTER
-	);
-
+(
+    "painhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the current script that will handle pain events",
+    EV_SETTER
+);
 Event EV_Actor_GetPainHandler
-	(
-	"painhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the current script that will handle pain events",
-	EV_GETTER
-	);
-
+(
+    "painhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the current script that will handle pain events",
+    EV_GETTER
+);
 Event EV_Actor_SetDeathHandler
-	(
-	"deathhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the current script that will handle death events",
-	EV_SETTER
-	);
-
+(
+    "deathhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the current script that will handle death events",
+    EV_SETTER
+);
 Event EV_Actor_GetDeathHandler
-	(
-	"deathhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the current script that will handle death events",
-	EV_GETTER
-	);
-
+(
+    "deathhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the current script that will handle death events",
+    EV_GETTER
+);
 Event EV_Actor_SetAttackHandler
-	(
-	"attackhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the current script that will handle attack events",
-	EV_SETTER
-	);
-
+(
+    "attackhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the current script that will handle attack events",
+    EV_SETTER
+);
 Event EV_Actor_GetAttackHandler
-	(
-	"attackhandler",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the current script that will handle attack events",
-	EV_GETTER
-	);
-
+(
+    "attackhandler",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the current script that will handle attack events",
+    EV_GETTER
+);
 Event EV_Actor_SetAmmoGrenade
-	(
-	"ammo_grenade",
-	EV_DEFAULT,
-	"i",
-	"grenade_count",
-	"Gives the AI some grenades"
-	);
-
+(
+    "ammo_grenade",
+    EV_DEFAULT,
+    "i",
+    "grenade_count",
+    "Gives the AI some grenades",
+    EV_NORMAL
+);
 Event EV_Actor_SetAmmoGrenade2
-	(
-	"ammo_grenade",
-	EV_DEFAULT,
-	"i",
-	"grenade_count",
-	"Gives the AI some grenades",
-	EV_SETTER
-	);
-
+(
+    "ammo_grenade",
+    EV_DEFAULT,
+    "i",
+    "grenade_count",
+    "Gives the AI some grenades",
+    EV_SETTER
+);
 Event EV_Actor_GetAmmoGrenade
-	(
-	"ammo_grenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns how many grenades an AI has",
-	EV_GETTER
-	);
-
+(
+    "ammo_grenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns how many grenades an AI has",
+    EV_GETTER
+);
 Event EV_Actor_SetMood
-	(
-	"mood",
-	EV_DEFAULT,
-	"s",
-	"new_mood",
-	"sets the AI mood... must be 'bored', 'nervous', 'curious', or 'alert'.",
-	EV_SETTER
-	);
-
+(
+    "mood",
+    EV_DEFAULT,
+    "s",
+    "new_mood",
+    "sets the AI mood... must be 'bored', 'nervous', 'curious', or 'alert'.",
+    EV_SETTER
+);
 Event EV_Actor_GetMood
-	(
-	"mood",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the AI mood: 'bored', 'nervous', 'curious', or 'alert'.",
-	EV_GETTER
-	);
-
+(
+    "mood",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the AI mood: 'bored', 'nervous', 'curious', or 'alert'.",
+    EV_GETTER
+);
 Event EV_Actor_SetHeadModel
-	(
-	"headmodel",
-	EV_DEFAULT,
-	"s",
-	"headmodel",
-	"sets the head model"
-	);
-
+(
+    "headmodel",
+    EV_DEFAULT,
+    "s",
+    "headmodel",
+    "sets the head model",
+    EV_NORMAL
+);
 Event EV_Actor_GetHeadModel
-	(
-	"headmodel",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the head model",
-	EV_GETTER
-	);
-
+(
+    "headmodel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the head model",
+    EV_GETTER
+);
 Event EV_Actor_SetHeadSkin
-	(
-	"headskin",
-	EV_DEFAULT,
-	"s",
-	"headskin",
-	"sets the head skin"
-	);
-
+(
+    "headskin",
+    EV_DEFAULT,
+    "s",
+    "headskin",
+    "sets the head skin",
+    EV_NORMAL
+);
 Event EV_Actor_GetHeadSkin
-	(
-	"headskin",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the head skin",
-	EV_GETTER
-	);
-
+(
+    "headskin",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the head skin",
+    EV_GETTER
+);
 Event EV_Actor_ShareEnemy
-	(
-	"share_enemy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"internal code use only - shares an AI's enemy with his squad mates."
-	);
-
+(
+    "share_enemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "internal code use only - shares an AI's enemy with his squad mates.",
+    EV_NORMAL
+);
 Event EV_Actor_ShareGrenade
-	(
-	"share_grenade",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"internal code use only - shares an AI's grenade with his squad mates."
-	);
-
+(
+    "share_grenade",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "internal code use only - shares an AI's grenade with his squad mates.",
+    EV_NORMAL
+);
 Event EV_Actor_InterruptPoint
-	(
-	"interrupt_point",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"hint from animation scripts to AI code that now is a good time to switch animations"
-	);
-
+(
+    "interrupt_point",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "hint from animation scripts to AI code that now is a good time to switch animations",
+    EV_NORMAL
+);
 Event EV_Actor_SetNoIdle
-	(
-	"no_idle",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Specifies if the actor will not go into idle after playing an animation",
-	EV_SETTER
-	);
-
+(
+    "no_idle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Specifies if the actor will not go into idle after playing an animation",
+    EV_SETTER
+);
 Event EV_Actor_GetNoIdle
-	(
-	"no_idle",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets if the actor will not go into idle after playing an animation",
-	EV_GETTER
-	);
-
+(
+    "no_idle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets if the actor will not go into idle after playing an animation",
+    EV_GETTER
+);
 Event EV_Actor_GetEnemy
-	(
-	"enemy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the actor's current enemy",
-	EV_GETTER
-	);
-
+(
+    "enemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the actor's current enemy",
+    EV_GETTER
+);
 Event EV_Actor_GetMaxNoticeTimeScale
-	(
-	"noticescale",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)",
-	EV_GETTER
-	);
-
+(
+    "noticescale",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)",
+    EV_GETTER
+);
 Event EV_Actor_SetMaxNoticeTimeScale
-	(
-	"noticescale",
-	EV_DEFAULT,
-	"f",
-	"multiplier",
-	"Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)",
-	EV_SETTER
-	);
-
+(
+    "noticescale",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)",
+    EV_SETTER
+);
 Event EV_Actor_SetMaxNoticeTimeScale2
-	(
-	"noticescale",
-	EV_DEFAULT,
-	"f",
-	"multiplier",
-	"Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)"
-	);
-
-Event EV_Actor_GetFixedLeash
-	(
-	"fixedleash",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset",
-	EV_GETTER
-	);
-
-Event EV_Actor_SetFixedLeash
-	(
-	"fixedleash",
-	EV_DEFAULT,
-	"f",
-	"multiplier",
-	"if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset",
-	EV_SETTER
-	);
-
-Event EV_Actor_SetFixedLeash2
-	(
-	"fixedleash",
-	EV_DEFAULT,
-	"f",
-	"multiplier",
-	"if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset"
-	);
-
+(
+    "noticescale",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)",
+    EV_NORMAL
+);
+Event EV_Actor_GetFixedLeash(
+    "fixedleash",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset",
+    EV_GETTER
+);
+Event EV_Actor_SetFixedLeash(
+    "fixedleash",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset",
+    EV_SETTER
+);
+Event EV_Actor_SetFixedLeash2(
+    "fixedleash",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset",
+    EV_NORMAL
+);
 Event EV_Actor_Holster
-	(
-	"holster",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Holster weapon"
-	);
-
+(
+    "holster",
+    EV_DEFAULT,
+    "i",
+    "holster",
+    "If non-zero, affects offhand. Holster weapon",
+    EV_NORMAL
+);
 Event EV_Actor_Unholster
-	(
-	"unholster",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Unholster weapon"
-	);
-
+(
+    "unholster",
+    EV_DEFAULT,
+    "i",
+    "holster",
+    "If non-zero, affects offhand. Unholster weapon",
+    EV_NORMAL
+);
 Event EV_Actor_IsEnemyVisible
-	(
-	"is_enemy_visible",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"0 if the enemy is not currently visible, 1 if he is"
-	);
-
+(
+    "is_enemy_visible",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "0 if the enemy is not currently visible, 1 if he is",
+    EV_NORMAL
+);
 Event EV_Actor_GetEnemyVisibleChangeTime
-	(
-	"enemy_visible_change_time",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the last time whether or not the enemy is visible changed, in seconds"
-	);
-
+(
+    "enemy_visible_change_time",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the last time whether or not the enemy is visible changed, in seconds",
+    EV_NORMAL
+);
 Event EV_Actor_GetLastEnemyVisibleTime
-	(
-	"last_enemy_visible_time",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the last time the enemy was visible, in seconds"
-	);
-
+(
+    "last_enemy_visible_time",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the last time the enemy was visible, in seconds",
+    EV_NORMAL
+);
 Event EV_Actor_SetFallHeight
-	(
-	"fallheight",
-	EV_DEFAULT,
-	"f",
-	"height",
-	"Set the fallheight",
-	EV_SETTER
-	);
-
+(
+    "fallheight",
+    EV_DEFAULT,
+    "f",
+    "height",
+    "Set the fallheight",
+    EV_SETTER
+);
 Event EV_Actor_SetFallHeight2
-	(
-	"fallheight",
-	EV_DEFAULT,
-	"f",
-	"height",
-	"Set the fallheight"
-	);
-
+(
+    "fallheight",
+    EV_DEFAULT,
+    "f",
+    "height",
+    "Set the fallheight",
+    EV_NORMAL
+);
 Event EV_Actor_GetFallHeight
-	(
-	"fallheight",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set the fallheight",
-	EV_GETTER
-	);
-
-Event EV_Actor_CanMoveTo
-	(
-	"canmoveto",
-	EV_DEFAULT,
-	"v",
-	"position",
-	"returns a boolean if the AI can move to a point; for use in anim scripts",
-	EV_RETURN
-	);
-
+(
+    "fallheight",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the fallheight",
+    EV_GETTER
+);
+Event EV_Actor_CanMoveTo(
+    "canmoveto",
+    EV_DEFAULT,
+    "v",
+    "position",
+    "returns a boolean if the AI can move to a point; for use in anim scripts",
+    EV_RETURN
+);
 Event EV_Actor_MoveDir
-	(
-	"movedir",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns a unit vector pointing in the current direction of motion, or zero if not moving.This still has meaning if velocity is zero but the AI is starting to move on a path.",
-	EV_GETTER
-	);
-
+(
+    "movedir",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns a unit vector pointing in the current direction of motion, or zero if not moving.This still has meaning "
+    "if v"
+    "elocity is zero but the AI is starting to move on a path.",
+    EV_GETTER
+);
 Event EV_Actor_ResetLeash
-	(
-	"resetleash",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"resets the AI's leash to their current position"
-	);
-
+(
+    "resetleash",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "resets the AI's leash to their current position",
+    EV_NORMAL
+);
 Event EV_Actor_IntervalDir
-	(
-	"intervaldir",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"the direction the AI would like to move to maintain its interval",
-	EV_GETTER
-	);
-
+(
+    "intervaldir",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "the direction the AI would like to move to maintain its interval",
+    EV_GETTER
+);
 Event EV_Actor_Tether
-	(
-	"tether",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"the entity to which the AI's leash should be tethered"
-	);
-
-Event EV_Actor_GetThinkState
-	(
-	"thinkstate",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"current ai think state; can be void, idle, pain, killed, attack, curious, disguise, or grenade.",
-	EV_GETTER
-	);
-
+(
+    "tether",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "the entity to which the AI's leash should be tethered",
+    EV_NORMAL
+);
+Event EV_Actor_GetThinkState(
+    "thinkstate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "current ai think state; can be void, idle, pain, killed, attack, curious, disguise, or grenade.",
+    EV_GETTER
+);
 Event EV_Actor_GetEnemyShareRange
-	(
-	"enemysharerange",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the range outside which the AI will not receive notification that a teammate has a new enemy",
-	EV_GETTER
-	);
-
+(
+    "enemysharerange",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the range outside which the AI will not receive notification that a teammate has a new enemy",
+    EV_GETTER
+);
 Event EV_Actor_SetEnemyShareRange
-	(
-	"enemysharerange",
-	EV_DEFAULT,
-	"f",
-	"range",
-	"sets the range outside which the AI will not receive notification that a teammate has a new enemy",
-	EV_SETTER
-	);
-
+(
+    "enemysharerange",
+    EV_DEFAULT,
+    "f",
+    "range",
+    "sets the range outside which the AI will not receive notification that a teammate has a new enemy",
+    EV_SETTER
+);
 Event EV_Actor_SetEnemyShareRange2
-	(
-	"enemysharerange",
-	EV_DEFAULT,
-	"f",
-	"range",
-	"sets the range outside which the AI will not receive notification that a teammate has a new enemy"
-	);
-
+(
+    "enemysharerange",
+    EV_DEFAULT,
+    "f",
+    "range",
+    "sets the range outside which the AI will not receive notification that a teammate has a new enemy",
+    EV_NORMAL
+);
 Event EV_Actor_SetWeapon
-	(
-	"weapon",
-	EV_DEFAULT,
-	"s",
-	"weapon_modelname",
-	"Sets the weapon.",
-	EV_SETTER
-	);
-
+(
+    "weapon",
+    EV_DEFAULT,
+    "s",
+    "weapon_modelname",
+    "Sets the weapon.",
+    EV_SETTER
+);
 Event EV_Actor_GetWeapon
-	(
-	"weapon",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the weapon.",
-	EV_GETTER
-	);
-
+(
+    "weapon",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the weapon.",
+    EV_GETTER
+);
 Event EV_Actor_GetVoiceType
-	(
-	"voicetype",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the voice type",
-	EV_GETTER
-	);
-
+(
+    "voicetype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the voice type",
+    EV_GETTER
+);
 Event EV_Actor_SetVoiceType
-	(
-	"voicetype",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set voicetype to magic letter postfix"
-	);
-
+(
+    "voicetype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set voicetype to magic letter postfix",
+    EV_NORMAL
+);
 Event EV_Actor_SetVoiceType2
-	(
-	"voicetype",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set voicetype to magic letter postfix",
-	EV_SETTER
-	);
-
+(
+    "voicetype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set voicetype to magic letter postfix",
+    EV_SETTER
+);
 Event EV_Actor_KickDir
-	(
-	"kickdir",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the direction the AI wants to kick",
-	EV_GETTER
-	);
-
+(
+    "kickdir",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the direction the AI wants to kick",
+    EV_GETTER
+);
 Event EV_Actor_GetNoLongPain
-	(
-	"nolongpain",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns 1 if long pain is not allowed, or 0 if long pain is allowed.",
-	EV_GETTER
-	);
-
+(
+    "nolongpain",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns 1 if long pain is not allowed, or 0 if long pain is allowed.",
+    EV_GETTER
+);
 Event EV_Actor_SetNoLongPain
-	(
-	"nolongpain",
-	EV_DEFAULT,
-	"i",
-	"allow",
-	"Set to 1 if long pain is not allowed, or 0 if long pain is allowed.",
-	EV_SETTER
-	);
-
+(
+    "nolongpain",
+    EV_DEFAULT,
+    "i",
+    "allow",
+    "Set to 1 if long pain is not allowed, or 0 if long pain is allowed.",
+    EV_SETTER
+);
 Event EV_Actor_SetNoLongPain2
-	(
-	"nolongpain",
-	EV_DEFAULT,
-	"i",
-	"allow",
-	"Set to 1 if long pain is not allowed, or 0 if long pain is allowed."
-	);
-
+(
+    "nolongpain",
+    EV_DEFAULT,
+    "i",
+    "allow",
+    "Set to 1 if long pain is not allowed, or 0 if long pain is allowed.",
+    EV_NORMAL
+);
 Event EV_Actor_GetFavoriteEnemy
-	(
-	"favoriteenemy",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets this AI's favorite enemy",
-	EV_GETTER
-	);
-
+(
+    "favoriteenemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets this AI's favorite enemy",
+    EV_GETTER
+);
 Event EV_Actor_SetFavoriteEnemy
-	(
-	"favoriteenemy",
-	EV_DEFAULT,
-	"e",
-	"ai_or_player",
-	"Gets this AI's favorite enemy",
-	EV_SETTER
-	);
-
+(
+    "favoriteenemy",
+    EV_DEFAULT,
+    "e",
+    "ai_or_player",
+    "Gets this AI's favorite enemy",
+    EV_SETTER
+);
 Event EV_Actor_SetFavoriteEnemy2
-	(
-	"favoriteenemy",
-	EV_DEFAULT,
-	"e",
-	"ai_or_player",
-	"Gets this AI's favorite enemy"
-	);
-
+(
+    "favoriteenemy",
+    EV_DEFAULT,
+    "e",
+    "ai_or_player",
+    "Gets this AI's favorite enemy",
+    EV_NORMAL
+);
 Event EV_Actor_GetMumble
-	(
-	"mumble",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns 1 if this guy is allowed to mumble, or 0 if he is not",
-	EV_GETTER
-	);
-
+(
+    "mumble",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns 1 if this guy is allowed to mumble, or 0 if he is not",
+    EV_GETTER
+);
 Event EV_Actor_SetMumble
-	(
-	"mumble",
-	EV_DEFAULT,
-	"i",
-	"can_mumble",
-	"Set to 1 if this guy is allowed to mumble, or 0 if he is not",
-	EV_SETTER
-	);
-
+(
+    "mumble",
+    EV_DEFAULT,
+    "i",
+    "can_mumble",
+    "Set to 1 if this guy is allowed to mumble, or 0 if he is not",
+    EV_SETTER
+);
 Event EV_Actor_SetMumble2
-	(
-	"mumble",
-	EV_DEFAULT,
-	"i",
-	"can_mumble",
-	"Set to 1 if this guy is allowed to mumble, or 0 if he is not"
-	);
-
+(
+    "mumble",
+    EV_DEFAULT,
+    "i",
+    "can_mumble",
+    "Set to 1 if this guy is allowed to mumble, or 0 if he is not",
+    EV_NORMAL
+);
 Event EV_Actor_GetBreathSteam
-	(
-	"breathsteam",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns 1 if this guy is allowed to have steamy breath, or 0 if he is not",
-	EV_GETTER
-	);
-
+(
+    "breathsteam",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns 1 if this guy is allowed to have steamy breath, or 0 if he is not",
+    EV_GETTER
+);
 Event EV_Actor_SetBreathSteam
-	(
-	"breathsteam",
-	EV_DEFAULT,
-	"i",
-	"can_breathe_out",
-	"Set to 1 if this guy is allowed to have steamy breath, or 0 if he is not",
-	EV_SETTER
-	);
-
+(
+    "breathsteam",
+    EV_DEFAULT,
+    "i",
+    "can_breathe_out",
+    "Set to 1 if this guy is allowed to have steamy breath, or 0 if he is not",
+    EV_SETTER
+);
 Event EV_Actor_SetBreathSteam2
-	(
-	"breathsteam",
-	EV_DEFAULT,
-	"i",
-	"can_breathe_out",
-	"Set to 1 if this guy is allowed to have steamy breath, or 0 if he is not"
-	);
-
+(
+    "breathsteam",
+    EV_DEFAULT,
+    "i",
+    "can_breathe_out",
+    "Set to 1 if this guy is allowed to have steamy breath, or 0 if he is not",
+    EV_NORMAL
+);
 Event EV_Actor_SetNextBreathTime
-	(
-	"nextbreathtime",
-	EV_DEFAULT,
-	"f",
-	"time_in_sec",
-	"Sets the next time the guy will breath out"
-	);
-
+(
+    "nextbreathtime",
+    EV_DEFAULT,
+    "f",
+    "time_in_sec",
+    "Sets the next time the guy will breath out",
+    EV_NORMAL
+);
 Event EV_Actor_CalcGrenadeToss
-	(
-	"calcgrenadetoss",
-	EV_DEFAULT,
-	"v",
-	"target_position",
-	"Called to calculate a grenade toss.  Must be called before a grenade throwing animation.\nReturns the name of the script to call with animscript if the toss can succeed, or  if the toss won't work.\nShould be called infrequently, and never during the middle of a grenade toss.",
-	EV_RETURN
-	);
-
+(
+    "calcgrenadetoss",
+    EV_DEFAULT,
+    "v",
+    "target_position",
+    "Called to calculate a grenade toss.  Must be called before a grenade throwing animation.\n"
+    "Returns the name of the script to call with animscript if the toss can succeed, or  if the toss won't work.\n"
+    "Should be called infrequently, and never during the middle of a grenade toss.",
+    EV_RETURN
+);
+Event EV_Actor_CalcGrenadeToss2
+(
+    "calcgrenadetoss2",
+    EV_DEFAULT,
+    "vf",
+    "target_position speed",
+    "Called to calculate a grenade toss.  Must be called before a grenade throwing animation.\n"
+    "Returns the name of the script to call with animscript if the toss can succeed, or  if the toss won't work.\n"
+    "Should be called infrequently, and never during the middle of a grenade toss.\n"
+    " The speed parameter is optional.  Pass a speed if you just want to override and throw no matter what...",
+    EV_RETURN
+);
 Event EV_Actor_GetNoSurprise
-	(
-	"nosurprise",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.\n",
-	EV_GETTER
-	);
-
+(
+    "nosurprise",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.\n",
+    EV_GETTER
+);
 Event EV_Actor_SetNoSurprise
-	(
-	"nosurprise",
-	EV_DEFAULT,
-	"i",
-	"nosurprise",
-	"set to 0 to allow this guy to play a surprised animation when first encountering an enemy.\n",
-	EV_SETTER
-	);
-
+(
+    "nosurprise",
+    EV_DEFAULT,
+    "i",
+    "nosurprise",
+    "set to 0 to allow this guy to play a surprised animation when first encountering an enemy.\n",
+    EV_SETTER
+);
 Event EV_Actor_SetNoSurprise2
-	(
-	"nosurprise",
-	EV_DEFAULT,
-	"i",
-	"nosurprise",
-	"set to 0 to allow this guy to play a surprised animation when first encountering an enemy.\n"
-	);
-
+(
+    "nosurprise",
+    EV_DEFAULT,
+    "i",
+    "nosurprise",
+    "set to 0 to allow this guy to play a surprised animation when first encountering an enemy.\n",
+    EV_NORMAL
+);
 Event EV_Actor_GetSilent
-	(
-	"silent",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets whether or not this guy is allowed to say stuff besides pain and death sounds",
-	EV_GETTER
-	);
-
+(
+    "silent",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets whether or not this guy is allowed to say stuff besides pain and death sounds",
+    EV_GETTER
+);
 Event EV_Actor_SetSilent
-	(
-	"silent",
-	EV_DEFAULT,
-	"i",
-	"silent",
-	"set to 0 to prevent this guy from saying stuff besides pain and death sounds.\n",
-	EV_SETTER
-	);
-
+(
+    "silent",
+    EV_DEFAULT,
+    "i",
+    "silent",
+    "set to 0 to prevent this guy from saying stuff besides pain and death sounds.\n",
+    EV_SETTER
+);
 Event EV_Actor_SetSilent2
-	(
-	"silent",
-	EV_DEFAULT,
-	"i",
-	"silent",
-	"set to 0 to prevent this guy from saying stuff besides pain and death sounds.\n"
-	);
-
+(
+    "silent",
+    EV_DEFAULT,
+    "i",
+    "silent",
+    "set to 0 to prevent this guy from saying stuff besides pain and death sounds.\n",
+    EV_NORMAL
+);
 Event EV_Actor_GetAvoidPlayer
-	(
-	"avoidplayer",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"is 0 if this AI won't automatically get out of the way, non-zero if he will\n",
-	EV_GETTER
-	);
-
+(
+    "avoidplayer",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "is 0 if this AI won't automatically get out of the way, non-zero if he will\n",
+    EV_GETTER
+);
 Event EV_Actor_SetAvoidPlayer
-	(
-	"avoidplayer",
-	EV_DEFAULT,
-	"i",
-	"allowavoid",
-	"set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.\n",
-	EV_SETTER
-	);
-
+(
+    "avoidplayer",
+    EV_DEFAULT,
+    "i",
+    "allowavoid",
+    "set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.\n",
+    EV_SETTER
+);
 Event EV_Actor_SetAvoidPlayer2
-	(
-	"avoidplayer",
-	EV_DEFAULT,
-	"i",
-	"allowavoid",
-	"set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.\n"
-	);
-
+(
+    "avoidplayer",
+    EV_DEFAULT,
+    "i",
+    "allowavoid",
+    "set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.\n",
+    EV_NORMAL
+);
 Event EV_Actor_SetMoveDoneRadius
-	(
-	"movedoneradius",
-	EV_DEFAULT,
-	"f",
-	"radius",
-	"Set the waittill movedone radius, default 0 means don't use manual radius",
-	EV_SETTER
-	);
-
-Event EV_Actor_BeDead
-	(
-	"bedead",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Forces the actor to be instantly and totally dead; no death animation is played"
-	);
-
+(
+    "movedoneradius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the waittill movedone radius, default 0 means don't use manual radius",
+    EV_SETTER
+);
+Event EV_Actor_GetMoveDoneRadius
+(
+    "movedoneradius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the waittill movedone radius, default 0 means don't use manual radius",
+    EV_GETTER
+);
+Event EV_Actor_BeDead(
+    "bedead",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Forces the actor to be instantly and totally dead; no death animation is played",
+    EV_NORMAL
+);
 Event EV_Actor_GetLookAroundAngle
-	(
-	"lookaround",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"gets the angle in degrees left or right of center that the AI will look around while patrolling",
-	EV_GETTER
-	);
-
+(
+    "lookaroundangle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the angle in degrees left or right of center that the AI will look around while patrolling",
+    EV_GETTER
+);
 Event EV_Actor_SetLookAroundAngle
-	(
-	"lookaround",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"gets the angle in degrees left or right of center that the AI will look around while patrolling",
-	EV_SETTER
-	);
-
+(
+    "lookaroundangle",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "gets the angle in degrees left or right of center that the AI will look around while patrolling",
+    EV_SETTER
+);
 Event EV_Actor_SetLookAroundAngle2
-	(
-	"lookaround",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"gets the angle in degrees left or right of center that the AI will look around while patrolling"
-	);
-
+(
+    "lookaroundangle",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "gets the angle in degrees left or right of center that the AI will look around while patrolling",
+    EV_NORMAL
+);
 Event EV_Actor_HasCompleteLookahead
-	(
-	"hascompletelookahead",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"returns true if there are no corners to turn on the rest of the AI's current path",
-	EV_GETTER
-	);
-
+(
+    "hascompletelookahead",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "returns true if there are no corners to turn on the rest of the AI's current path",
+    EV_GETTER
+);
 Event EV_Actor_PathDist
-	(
-	"pathdist",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"returns total distance along current path to the path goal",
-	EV_GETTER
-	);
-
+(
+    "pathdist",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "returns total distance along current path to the path goal",
+    EV_GETTER
+);
 Event EV_Actor_CanShootEnemyFrom
-	(
-	"canshootenemyfrom",
-	EV_DEFAULT,
-	"v",
-	"shootOrigin",
-	"Determines if it would be possible to shoot the sentient's enemy from the given position.",
-	EV_RETURN
-	);
-
+(
+    "canshootenemyfrom",
+    EV_DEFAULT,
+    "v",
+    "shootOrigin",
+    "Determines if it would be possible to shoot the sentient's enemy from the given position.",
+    EV_RETURN
+);
 Event EV_Actor_CanShoot
-	(
-	"canshoot",
-	EV_DEFAULT,
-	"v",
-	"shootOrigin",
-	"Determines if it would be possible to shoot the sentient's enemy from the given position.",
-	EV_RETURN
-	);
-
+(
+    "canshoot",
+    EV_DEFAULT,
+    "v",
+    "shootOrigin",
+    "Determines if it would be possible to shoot the sentient's enemy from the given position.",
+    EV_RETURN
+);
 Event EV_Actor_GetInReload
-	(
-	"inreload",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"returns non-zero if the AI is in a reload",
-	EV_GETTER
-	);
-
+(
+    "inreload",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "returns non-zero if the AI is in a reload",
+    EV_GETTER
+);
 Event EV_Actor_SetInReload
-	(
-	"inreload",
-	EV_DEFAULT,
-	"i",
-	"reloading",
-	"set to non-zero to indicate the AI is in a reload",
-	EV_SETTER
-	);
-
-Event EV_Actor_SetReloadCover
-	(
-	"setreloadcover",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"do this command to let the ai know it needs to reload; used to reload while going to cover"
-	);
-
+(
+    "inreload",
+    EV_DEFAULT,
+    "i",
+    "reloading",
+    "set to non-zero to indicate the AI is in a reload",
+    EV_SETTER
+);
+Event EV_Actor_SetReloadCover(
+    "setreloadcover",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "do this command to let the ai know it needs to reload; used to reload while going to cover",
+    EV_NORMAL
+);
 Event EV_Actor_BreakSpecial
-	(
-	"breakspecial",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"tell ai to break special attack"
-	);
-
+(
+    "breakspecial",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "tell ai to break special attack",
+    EV_NORMAL
+);
 Event EV_Actor_SetBalconyHeight
-	(
-	"balconyheight",
-	EV_DEFAULT,
-	"f",
-	"height",
-	"minimum height a balcony guy must fall to do special balcony death"
-	);
-
+(
+    "balconyheight",
+    EV_DEFAULT,
+    "f",
+    "height",
+    "minimum height a balcony guy must fall to do special balcony death",
+    EV_NORMAL
+);
 Event EV_Actor_SetBalconyHeight2
-	(
-	"balconyheight",
-	EV_DEFAULT,
-	"f",
-	"height",
-	"minimum height a balcony guy must fall to do special balcony death",
-	EV_SETTER
-	);
-
+(
+    "balconyheight",
+    EV_DEFAULT,
+    "f",
+    "height",
+    "minimum height a balcony guy must fall to do special balcony death",
+    EV_SETTER
+);
 Event EV_Actor_GetBalconyHeight
-	(
-	"balconyheight",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"minimum height a balcony guy must fall to do special balcony death",
-	EV_GETTER
-	);
+(
+    "balconyheight",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "minimum height a balcony guy must fall to do special balcony death",
+    EV_GETTER
+);
+//
+// Added in 2.0
+//====
+Event EV_Actor_SetVisibilityThreshold
+(
+    "nonvislevel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "visibility level in range 0-1 below which an enemy is treated as non-visible",
+    EV_NORMAL
+);
+Event EV_Actor_SetVisibilityThreshold2
+(
+    "nonvislevel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "visibility level in range 0-1 below which an enemy is treated as non-visible",
+    EV_SETTER
+);
+Event EV_Actor_GetVisibilityThreshold
+(
+    "nonvislevel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "visibility level in range 0-1 below which an enemy is treated as non-visible",
+    EV_GETTER
+);
+Event EV_Actor_SetDefaultVisibilityThreshold
+(
+    "defaultnonvislevel",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "updates the default value for 'nonvislevel'",
+    EV_NORMAL
+);
+Event EV_Actor_SetSuppressChance
+(
+    "suppresschance",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sets the percent chance of doing suppressing fire when appropriate (0-100)",
+    EV_NORMAL
+);
+Event EV_Actor_SetSuppressChance2
+(
+    "suppresschance",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sets the percent chance of doing suppressing fire when appropriate (0-100)",
+    EV_SETTER
+);
+Event EV_Actor_GetSuppressChance
+(
+    "suppresschance",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sets the percent chance of doing suppressing fire when appropriate (0-100)",
+    EV_GETTER
+);
+Event EV_Actor_SetIgnoreBadPlace
+(
+    "ignorebadplaces",
+    EV_DEFAULT,
+    "i",
+    "ignore",
+    "sets whether or not this AI guy will ignore bad places (0 = not suicidal)",
+    EV_NORMAL
+);
+Event EV_Actor_SetIgnoreBadPlace2
+(
+    "ignorebadplaces",
+    EV_DEFAULT,
+    "i",
+    "ignore",
+    "sets whether or not this AI guy will ignore bad places (0 = not suicidal)",
+    EV_SETTER
+);
+Event EV_Actor_GetIgnoreBadPlace
+(
+    "ignorebadplaces",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets whether or not this AI guy will ignore bad places (0 = not suicidal)",
+    EV_GETTER
+);
+Event EV_Actor_FindEnemy
+(
+    "findenemy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Finds the best enemy to target",
+    EV_RETURN
+);
+Event EV_Actor_DisableEnemySwitch
+(
+    "enemyswitchdisable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Disable enemy switching...",
+    EV_NORMAL
+);
+Event EV_Actor_EnableEnemySwitch
+(
+    "enemyswitchenable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Enable enemy switching...",
+    EV_NORMAL
+);
+Event EV_Actor_SetRunAnimRate
+(
+    "runanimrate",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "Set the rate at which the run animation plays back",
+    EV_SETTER
+);
+Event EV_Actor_SetRunAnimRate2
+(
+    "runanimrate",
+    EV_DEFAULT,
+    "f",
+    "multiplier",
+    "Set the rate at which the run animation plays back",
+    EV_NORMAL
+);
+Event EV_Actor_GetRunAnimRate
+(
+    "runanimrate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the rate at which the run animation plays back",
+    EV_GETTER
+);
+//====
+//
+// Added in 2.30
+//====
+Event EV_Actor_SetNationality
+(
+    "nationality",
+    EV_DEFAULT,
+    "s",
+    "nationality",
+    "Set the nationality of an actor. Valid entries are default, ger, it, usa, uk, and ussr.",
+    EV_NORMAL
+);
+Event EV_Actor_SetNationality2
+(
+    "nationality",
+    EV_DEFAULT,
+    "s",
+    "nationality",
+    "Set the nationality of an actor. Valid entries are default, ger, it, usa, uk, and ussr.",
+    EV_SETTER
+);
+Event EV_Actor_GetNationality
+(
+    "nationality",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the nationality of an actor. Return values are ger, it, usa, uk, ussr and unset.",
+    EV_GETTER
+);
+Event EV_Actor_WriteStats
+(
+    "writestats",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Used internally to write stats to a CSV file.",
+    EV_NORMAL
+);
+Event EV_Actor_CuriousOff
+(
+    "curiousoff",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn off an actor's curious state",
+    EV_NORMAL
+);
+Event EV_Actor_CuriousOn
+(
+    "curiouson",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn on an actor's curious state",
+    EV_NORMAL
+);
+//====
 
-CLASS_DECLARATION( SimpleActor, Actor, "Actor" )
-{
-	{ &EV_Entity_Start,							&Actor::EventStart },
-	{ &EV_Actor_MoveTo,							&Actor::MoveTo },
-	{ &EV_Actor_WalkTo,							&Actor::WalkTo },
-	{ &EV_Actor_RunTo,							&Actor::RunTo },
-	{ &EV_Actor_CrouchTo,						&Actor::CrouchTo },
-	{ &EV_Actor_CrawlTo,						&Actor::CrawlTo },
-	{ &EV_Actor_AimAt,							&Actor::AimAt },
-	{ &EV_Pain,									&Actor::EventPain },
-	{ &EV_Killed,								&Actor::EventKilled },
-	{ &EV_Actor_DeathEmbalm,					&Actor::DeathEmbalm },
-	{ &EV_Actor_Anim,							&Actor::PlayAnimation },
-	{ &EV_Actor_AnimLoop,						&Actor::PlayAnimation },
-	{ &EV_Actor_Anim_Scripted,					&Actor::PlayScriptedAnimation },
-	{ &EV_Actor_Anim_Noclip,					&Actor::PlayNoclipAnimation },
-	{ &EV_Actor_AnimScript,						&Actor::EventAnimScript },
-	{ &EV_Actor_AnimScript_Scripted,			&Actor::EventAnimScript_Scripted },
-	{ &EV_Actor_AnimScript_Noclip,				&Actor::EventAnimScript_Noclip },
-	{ &EV_Actor_Reload_mg42,					&Actor::EventReload_mg42 },
-	{ &EV_Actor_Dumb,							&Actor::Dumb },
-	{ &EV_Actor_Physics_On,						&Actor::PhysicsOn },
-	{ &EV_Actor_Physics_Off,					&Actor::PhysicsOff },
-	{ &EV_Actor_SetAnim,						&Actor::EventSetAnim },
-	{ &EV_Actor_SetAnimLength,					&SimpleActor::EventSetAnimLength },
-	{ &EV_Actor_EndActionAnim,					&Actor::EventEndActionAnim },
-	{ &EV_Actor_SetMotionAnim,					&Actor::EventSetMotionAnim },
-	{ &EV_Actor_SetAimMotionAnim,				&Actor::EventSetAimMotionAnim },
-	{ &EV_Actor_SetActionAnim,					&Actor::EventSetActionAnim },
-	{ &EV_Actor_UpperAnim,						&Actor::EventUpperAnim },
-	{ &EV_Actor_SetUpperAnim,					&Actor::EventSetUpperAnim },
-	{ &EV_Actor_SetCrossblendTime,				&SimpleActor::EventSetCrossblendTime },
-	{ &EV_Actor_GetCrossblendTime,				&SimpleActor::EventGetCrossblendTime },
-	{ &EV_Actor_GetPosition,					&SimpleActor::EventGetPosition },
-	{ &EV_Actor_SetPosition,					&SimpleActor::EventSetPosition },
-	{ &EV_Actor_SetEmotion,						&SimpleActor::EventSetEmotion },
-	{ &EV_Actor_SetAnimFinal,					&SimpleActor::EventSetAnimFinal },
-	{ &EV_Actor_GetWeaponType,					&SimpleActor::EventGetWeaponType },
-	{ &EV_Actor_GetWeaponGroup,					&SimpleActor::EventGetWeaponGroup },
-	{ &EV_Actor_LookAt,							&Actor::EventLookAt },
-	{ &EV_Actor_EyesLookAt,						&Actor::EventEyesLookAt },
-	{ &EV_Actor_PointAt,						&Actor::EventPointAt },
-	{ &EV_Actor_TurnTo,							&Actor::EventTurnTo },
-	{ &EV_Actor_SetTurnDoneError,				&Actor::EventSetTurnDoneError },
-	{ &EV_Actor_SetTurnDoneError2,				&Actor::EventSetTurnDoneError },
-	{ &EV_Actor_GetTurnDoneError,				&Actor::EventGetTurnDoneError },
-	{ &EV_Actor_IdleSayAnim,					&Actor::EventIdleSayAnim },
-	{ &EV_Actor_SayAnim,						&Actor::EventSayAnim },
-	{ &EV_Actor_SetSayAnim,						&Actor::EventSetSayAnim },
-	{ &EV_Sentient_UseItem,						&Actor::EventGiveWeapon },
-	{ &EV_Sentient_GiveWeapon,					&Actor::EventGiveWeapon },
-	{ &EV_Actor_SetWeapon,						&Actor::EventGiveWeapon },
-	{ &EV_Actor_GetWeapon,						&Actor::EventGetWeapon },
-	{ &EV_Actor_SetGun,							&Actor::EventGiveWeapon },
-	{ &EV_Actor_SetGun2,						&Actor::EventGiveWeapon },
-	{ &EV_Actor_GetGun,							&Actor::EventGetWeapon },
-	{ &EV_Actor_WeaponInternal,					&Actor::EventGiveWeaponInternal },
-	{ &EV_Actor_DamagePuff,						&Actor::EventDamagePuff },
-	{ &EV_Actor_SetAngleYawSpeed,				&Actor::EventSetAngleYawSpeed },
-	{ &EV_Actor_SetAngleYawSpeed2,				&Actor::EventSetAngleYawSpeed },
-	{ &EV_Actor_GetAngleYawSpeed,				&Actor::EventGetAngleYawSpeed },
-	{ &EV_Actor_SetAimTarget,					&Actor::EventSetAimTarget },
-	{ &EV_Actor_ReadyToFire,					&Actor::ReadyToFire },
-	{ &EV_Actor_AIOn,							&SimpleActor::EventAIOn },
-	{ &EV_Actor_AIOff,							&SimpleActor::EventAIOff },
-	{ &EV_Actor_GetLocalYawFromVector,			&Actor::GetLocalYawFromVector },
-	{ &EV_DeathSinkStart,						&Actor::DeathSinkStart },
-	{ &EV_Actor_GetSight,						&Actor::EventGetSight },
-	{ &EV_Actor_SetSight,						&Actor::EventSetSight },
-	{ &EV_Actor_SetSight2,						&Actor::EventSetSight },
-	{ &EV_Actor_GetHearing,						&Actor::EventGetHearing },
-	{ &EV_Actor_SetHearing,						&Actor::EventSetHearing },
-	{ &EV_Actor_SetHearing2,					&Actor::EventSetHearing },
-	{ &EV_Actor_SetFov,							&Actor::EventSetFov },
-	{ &EV_Actor_SetFov2,						&Actor::EventSetFov },
-	{ &EV_Actor_GetFov,							&Actor::EventGetFov },
-	{ &EV_Actor_DistToEnemy,					&Actor::EventDistToEnemy },
-	{ &EV_Actor_SetPatrolPath,					&Actor::EventSetPatrolPath },
-	{ &EV_Actor_SetPatrolPath2,					&Actor::EventSetPatrolPath },
-	{ &EV_Actor_GetPatrolPath,					&Actor::EventGetPatrolPath },
-	{ &EV_Actor_SetPatrolWaitTrigger,			&Actor::EventSetPatrolWaitTrigger },
-	{ &EV_Actor_SetPatrolWaitTrigger2,			&Actor::EventSetPatrolWaitTrigger },
-	{ &EV_Actor_GetPatrolWaitTrigger,			&Actor::EventGetPatrolWaitTrigger },
-	{ &EV_Actor_SetAccuracy,					&Actor::EventSetAccuracy },
-	{ &EV_Actor_SetAccuracy2,					&Actor::EventSetAccuracy },
-	{ &EV_Actor_GetAccuracy,					&Actor::EventGetAccuracy },
-	{ &EV_Actor_SetTypeIdle,					&Actor::EventSetTypeIdle },
-	{ &EV_Actor_SetTypeIdle2,					&Actor::EventSetTypeIdle },
-	{ &EV_Actor_GetTypeIdle,					&Actor::EventGetTypeIdle },
-	{ &EV_Actor_SetTypeAttack,					&Actor::EventSetTypeAttack },
-	{ &EV_Actor_SetTypeAttack2,					&Actor::EventSetTypeAttack },
-	{ &EV_Actor_GetTypeAttack,					&Actor::EventGetTypeAttack },
-	{ &EV_Actor_SetTypeDisguise,				&Actor::EventSetTypeDisguise },
-	{ &EV_Actor_SetTypeDisguise2,				&Actor::EventSetTypeDisguise },
-	{ &EV_Actor_GetTypeDisguise,				&Actor::EventGetTypeDisguise },
-	{ &EV_Actor_SetDisguiseLevel,				&Actor::EventSetDisguiseLevel },
-	{ &EV_Actor_SetDisguiseLevel2,				&Actor::EventSetDisguiseLevel },
-	{ &EV_Actor_GetDisguiseLevel,				&Actor::EventGetDisguiseLevel },
-	{ &EV_Actor_SetTypeGrenade,					&Actor::EventSetTypeGrenade },
-	{ &EV_Actor_SetTypeGrenade2,				&Actor::EventSetTypeGrenade },
-	{ &EV_Actor_GetTypeGrenade,					&Actor::EventGetTypeGrenade },
-	{ &EV_Actor_SetMinDistance,					&Actor::EventSetMinDistance },
-	{ &EV_Actor_SetMinDistance2,				&Actor::EventSetMinDistance },
-	{ &EV_Actor_GetMinDistance,					&Actor::EventGetMinDistance },
-	{ &EV_Actor_SetMaxDistance,					&Actor::EventSetMaxDistance },
-	{ &EV_Actor_SetMaxDistance2,				&Actor::EventSetMaxDistance },
-	{ &EV_Actor_GetMaxDistance,					&Actor::EventGetMaxDistance },
-	{ &EV_Actor_GetLeash,						&Actor::EventGetLeash },
-	{ &EV_Actor_SetLeash,						&Actor::EventSetLeash },
-	{ &EV_Actor_SetLeash2,						&Actor::EventSetLeash },
-	{ &EV_Actor_GetInterval,					&Actor::EventGetInterval },
-	{ &EV_Actor_SetInterval,					&Actor::EventSetInterval },
-	{ &EV_Actor_SetInterval2,					&Actor::EventSetInterval },
-	{ &EV_Actor_GetRunAnim,						&Actor::EventGetRunAnim },
-	{ &EV_Actor_GetWalkAnim,					&Actor::EventGetWalkAnim },
-	{ &EV_Actor_GetAnimName,					&Actor::EventGetAnimName },
-	{ &EV_Actor_SetAnimName,					&Actor::EventSetAnimName },
-	{ &EV_Actor_SetDisguiseRange,				&Actor::EventSetDisguiseRange },
-	{ &EV_Actor_SetDisguiseRange2,				&Actor::EventSetDisguiseRange },
-	{ &EV_Actor_GetDisguiseRange,				&Actor::EventGetDisguiseRange },
-	{ &EV_Actor_SetDisguisePeriod,				&Actor::EventSetDisguisePeriod },
-	{ &EV_Actor_SetDisguisePeriod2,				&Actor::EventSetDisguisePeriod },
-	{ &EV_Actor_GetDisguisePeriod,				&Actor::EventGetDisguisePeriod },
-	{ &EV_Actor_SetDisguiseAcceptThread,		&Actor::EventSetDisguiseAcceptThread },
-	{ &EV_Actor_SetDisguiseAcceptThread2,		&Actor::EventSetDisguiseAcceptThread },
-	{ &EV_Actor_GetDisguiseAcceptThread,		&Actor::EventGetDisguiseAcceptThread },
-	{ &EV_Actor_AttackPlayer,					&Actor::EventAttackPlayer },
-	{ &EV_Actor_SetAlarmNode,					&Actor::EventSetAlarmNode },
-	{ &EV_Actor_SetAlarmNode2,					&Actor::EventSetAlarmNode },
-	{ &EV_Actor_GetAlarmNode,					&Actor::EventGetAlarmNode },
-	{ &EV_Actor_SetAlarmThread,					&Actor::EventSetAlarmThread },
-	{ &EV_Actor_SetAlarmThread2,				&Actor::EventSetAlarmThread },
-	{ &EV_Actor_GetAlarmThread,					&Actor::EventGetAlarmThread },
-	{ &EV_Actor_SetSoundAwareness,				&Actor::EventSetSoundAwareness },
-	{ &EV_Actor_SetSoundAwareness2,				&Actor::EventSetSoundAwareness },
-	{ &EV_Actor_GetSoundAwareness,				&Actor::EventGetSoundAwareness },
-	{ &EV_Actor_SetGrenadeAwareness,			&Actor::EventSetGrenadeAwareness },
-	{ &EV_Actor_SetGrenadeAwareness2,			&Actor::EventSetGrenadeAwareness },
-	{ &EV_Actor_GetGrenadeAwareness,			&Actor::EventGetGrenadeAwareness },
-	{ &EV_Actor_SetTurret,						&Actor::EventSetTurret },
-	{ &EV_Actor_SetTurret2,						&Actor::EventSetTurret },
-	{ &EV_Actor_GetTurret,						&Actor::EventGetTurret },
-	{ &EV_Actor_AttachGrenade,					&Actor::Grenade_EventAttach },
-	{ &EV_Actor_DetachGrenade,					&Actor::Grenade_EventDetach },
-	{ &EV_Actor_FireGrenade,					&Actor::Grenade_EventFire },
-	{ &EV_Actor_EnableEnemy,					&Actor::EventEnableEnemy },
-	{ &EV_Actor_EnablePain,						&Actor::EventEnablePain },
-	{ &EV_Activate,								&Actor::EventActivate },
-	{ &EV_Actor_GetAmmoGrenade,					&Actor::EventGetAmmoGrenade },
-	{ &EV_Actor_SetAmmoGrenade,					&Actor::EventSetAmmoGrenade },
-	{ &EV_Actor_SetAmmoGrenade2,				&Actor::EventSetAmmoGrenade },
-	{ &EV_Actor_GetMood,						&Actor::EventGetMood },
-	{ &EV_Actor_SetMood,						&Actor::EventSetMood },
-	{ &EV_Actor_ShareEnemy,						&Actor::EventShareEnemy },
-	{ &EV_Actor_ShareGrenade,					&Actor::EventShareGrenade },
-	{ &EV_Actor_InterruptPoint,					&Actor::EventInterruptPoint },
-	{ &EV_Actor_GetPainHandler,					&SimpleActor::EventGetPainHandler },
-	{ &EV_Actor_SetPainHandler,					&SimpleActor::EventSetPainHandler },
-	{ &EV_Actor_GetDeathHandler,				&SimpleActor::EventGetDeathHandler },
-	{ &EV_Actor_SetDeathHandler,				&SimpleActor::EventSetDeathHandler },
-	{ &EV_Actor_GetAttackHandler,				&SimpleActor::EventGetAttackHandler },
-	{ &EV_Actor_SetAttackHandler,				&SimpleActor::EventSetAttackHandler },
-	{ &EV_Actor_SetHeadModel,					&Actor::EventSetHeadModel },
-	{ &EV_Actor_GetHeadModel,					&Actor::EventGetHeadModel },
-	{ &EV_Actor_SetHeadSkin,					&Actor::EventSetHeadSkin },
-	{ &EV_Actor_GetHeadSkin,					&Actor::EventGetHeadSkin },
-	{ &EV_Actor_SetNoIdle,						&Actor::EventSetNoIdle },
-	{ &EV_Actor_GetNoIdle,						&Actor::EventGetNoIdle },
-	{ &EV_Actor_GetEnemy,						&Actor::EventGetEnemy },
-	{ &EV_Actor_GetMaxNoticeTimeScale,			&Actor::EventGetMaxNoticeTimeScale },
-	{ &EV_Actor_SetMaxNoticeTimeScale,			&Actor::EventSetMaxNoticeTimeScale },
-	{ &EV_Actor_SetMaxNoticeTimeScale2,			&Actor::EventSetMaxNoticeTimeScale },
-	{ &EV_Actor_GetFixedLeash,					&Actor::EventGetFixedLeash },
-	{ &EV_Actor_SetFixedLeash,					&Actor::EventSetFixedLeash },
-	{ &EV_Actor_SetFixedLeash2,					&Actor::EventSetFixedLeash },
-	{ &EV_Actor_Holster,						&Actor::EventHolster },
-	{ &EV_Actor_Unholster,						&Actor::EventUnholster },
-	{ &EV_SoundDone,							&Actor::EventSoundDone },
-	{ &EV_Sound,								&Actor::EventSound },
-	{ &EV_Actor_IsEnemyVisible,					&Actor::EventIsEnemyVisible },
-	{ &EV_Actor_GetEnemyVisibleChangeTime,		&Actor::EventGetEnemyVisibleChangeTime },
-	{ &EV_Actor_GetLastEnemyVisibleTime,		&Actor::EventGetLastEnemyVisibleTime },
-	{ &EV_Actor_SetFallHeight,					&Actor::EventSetFallHeight },
-	{ &EV_Actor_GetFallHeight,					&Actor::EventGetFallHeight },
-	{ &EV_Actor_CanMoveTo,						&Actor::EventCanMoveTo },
-	{ &EV_Actor_MoveDir,						&Actor::EventMoveDir },
-	{ &EV_Actor_IntervalDir,					&Actor::EventIntervalDir },
-	{ &EV_Actor_ResetLeash,						&Actor::EventResetLeash },
-	{ &EV_Actor_Tether,							&Actor::EventTether },
-	{ &EV_Actor_GetThinkState,					&Actor::EventGetThinkState },
-	{ &EV_Actor_GetEnemyShareRange,				&Actor::EventGetEnemyShareRange },
-	{ &EV_Actor_SetEnemyShareRange,				&Actor::EventSetEnemyShareRange },
-	{ &EV_Actor_SetEnemyShareRange2,			&Actor::EventSetEnemyShareRange },
-	{ &EV_Actor_GetVoiceType,					&Actor::GetVoiceType },
-	{ &EV_Actor_SetVoiceType,					&Actor::SetVoiceType },
-	{ &EV_Actor_SetVoiceType2,					&Actor::SetVoiceType },
-	{ &EV_Remove,								&Actor::Remove },
-	{ &EV_Delete,								&Actor::Remove },
-	{ &EV_ScriptRemove,							&Actor::Remove },
-	{ &EV_Actor_KickDir,						&Actor::EventGetKickDir },
-	{ &EV_Actor_GetNoLongPain,					&Actor::EventGetNoLongPain },
-	{ &EV_Actor_SetNoLongPain,					&Actor::EventSetNoLongPain },
-	{ &EV_Actor_SetNoLongPain2,					&Actor::EventSetNoLongPain },
-	{ &EV_Actor_GetFavoriteEnemy,				&Actor::EventGetFavoriteEnemy },
-	{ &EV_Actor_SetFavoriteEnemy,				&Actor::EventSetFavoriteEnemy },
-	{ &EV_Actor_SetFavoriteEnemy2,				&Actor::EventSetFavoriteEnemy },
-	{ &EV_Actor_GetMumble,						&Actor::EventGetMumble },
-	{ &EV_Actor_SetMumble,						&Actor::EventSetMumble },
-	{ &EV_Actor_SetMumble2,						&Actor::EventSetMumble },
-	{ &EV_Actor_GetBreathSteam,					&Actor::EventGetBreathSteam },
-	{ &EV_Actor_SetBreathSteam,					&Actor::EventSetBreathSteam },
-	{ &EV_Actor_SetBreathSteam2,				&Actor::EventSetBreathSteam },
-	{ &EV_Actor_CalcGrenadeToss,				&Actor::EventCalcGrenadeToss },
-	{ &EV_Actor_GetNoSurprise,					&Actor::EventGetNoSurprise },
-	{ &EV_Actor_SetNoSurprise,					&Actor::EventSetNoSurprise },
-	{ &EV_Actor_SetNoSurprise2,					&Actor::EventSetNoSurprise },
-	{ &EV_Actor_GetSilent,						&Actor::EventGetSilent },
-	{ &EV_Actor_SetSilent,						&Actor::EventSetSilent },
-	{ &EV_Actor_SetSilent2,						&Actor::EventSetSilent },
-	{ &EV_Actor_GetAvoidPlayer,					&Actor::EventGetAvoidPlayer },
-	{ &EV_Actor_SetAvoidPlayer,					&Actor::EventSetAvoidPlayer },
-	{ &EV_Actor_SetAvoidPlayer2,				&Actor::EventSetAvoidPlayer },
-	{ &EV_Actor_SetMoveDoneRadius,				&Actor::EventSetMoveDoneRadius },
-	{ &EV_Actor_BeDead,							&Actor::EventBeDead },
-	{ &EV_Actor_GetLookAroundAngle,				&Actor::EventGetLookAroundAngle },
-	{ &EV_Actor_SetLookAroundAngle,				&Actor::EventSetLookAroundAngle },
-	{ &EV_Actor_SetLookAroundAngle2,			&Actor::EventSetLookAroundAngle },
-	{ &EV_Actor_HasCompleteLookahead,			&Actor::EventHasCompleteLookahead },
-	{ &EV_Actor_PathDist,						&Actor::EventPathDist },
-	{ &EV_Actor_CanShootEnemyFrom,				&Actor::EventCanShootEnemyFrom },
-	{ &EV_Actor_CanShoot,						&Actor::EventCanShoot },
-	{ &EV_Actor_GetInReload,					&Actor::EventGetInReload },
-	{ &EV_Actor_SetInReload,					&Actor::EventSetInReload },
-	{ &EV_Actor_SetReloadCover,					&Actor::EventSetReloadCover },
-	{ &EV_Actor_BreakSpecial,					&Actor::EventBreakSpecial },
-	{ &EV_Actor_SetBalconyHeight,				&Actor::EventSetBalconyHeight },
-	{ &EV_Actor_SetBalconyHeight2,				&Actor::EventSetBalconyHeight },
-	{ &EV_Actor_GetBalconyHeight,				&Actor::EventGetBalconyHeight },
-	{ &EV_CanSee,								&Actor::CanSee },
-	{ NULL, NULL }
+CLASS_DECLARATION(SimpleActor, Actor, "Actor") {
+    {&EV_Entity_Start,                        &Actor::EventStart                        },
+    {&EV_Actor_MoveTo,                        &Actor::MoveTo                            },
+    {&EV_Actor_WalkTo,                        &Actor::WalkTo                            },
+    {&EV_Actor_RunTo,                         &Actor::RunTo                             },
+    {&EV_Actor_CrouchTo,                      &Actor::CrouchTo                          },
+    {&EV_Actor_CrawlTo,                       &Actor::CrawlTo                           },
+    {&EV_Actor_AimAt,                         &Actor::AimAt                             },
+    {&EV_Pain,                                &Actor::EventPain                         },
+    {&EV_Killed,                              &Actor::EventKilled                       },
+    {&EV_Actor_DeathEmbalm,                   &Actor::DeathEmbalm                       },
+    {&EV_Actor_Anim,                          &Actor::PlayAnimation                     },
+    {&EV_Actor_AnimLoop,                      &Actor::PlayAnimation                     },
+    {&EV_Actor_Anim_Scripted,                 &Actor::PlayScriptedAnimation             },
+    {&EV_Actor_Anim_Noclip,                   &Actor::PlayNoclipAnimation               },
+    {&EV_Actor_Anim_Attached,                 &Actor::PlayAttachedAnimation             },
+    {&EV_Actor_AnimScript,                    &Actor::EventAnimScript                   },
+    {&EV_Actor_AnimScript_Scripted,           &Actor::EventAnimScript_Scripted          },
+    {&EV_Actor_AnimScript_Noclip,             &Actor::EventAnimScript_Noclip            },
+    // Added in 2.0
+    //====
+    {&EV_Actor_AnimScript_Attached,           &Actor::EventAnimScript_Attached          },
+    //====
+    {&EV_Actor_Reload_mg42,                   &Actor::EventReload_mg42                  },
+    {&EV_Actor_Dumb,                          &Actor::Dumb                              },
+    {&EV_Actor_Physics_On,                    &Actor::PhysicsOn                         },
+    {&EV_Actor_Physics_Off,                   &Actor::PhysicsOff                        },
+    {&EV_Actor_SetAnim,                       &Actor::EventSetAnim                      },
+    {&EV_Actor_SetAnimLength,                 &SimpleActor::EventSetAnimLength          },
+    {&EV_Actor_EndActionAnim,                 &Actor::EventEndActionAnim                },
+    {&EV_Actor_SetMotionAnim,                 &Actor::EventSetMotionAnim                },
+    {&EV_Actor_SetAimMotionAnim,              &Actor::EventSetAimMotionAnim             },
+    {&EV_Actor_SetActionAnim,                 &Actor::EventSetActionAnim                },
+    {&EV_Actor_UpperAnim,                     &Actor::EventUpperAnim                    },
+    {&EV_Actor_SetUpperAnim,                  &Actor::EventSetUpperAnim                 },
+    {&EV_Actor_SetCrossblendTime,             &SimpleActor::EventSetCrossblendTime      },
+    {&EV_Actor_GetCrossblendTime,             &SimpleActor::EventGetCrossblendTime      },
+    {&EV_Actor_GetPosition,                   &SimpleActor::EventGetPosition            },
+    {&EV_Actor_SetPosition,                   &SimpleActor::EventSetPosition            },
+    {&EV_Actor_SetEmotion,                    &SimpleActor::EventSetEmotion             },
+    {&EV_Actor_SetAnimFinal,                  &SimpleActor::EventSetAnimFinal           },
+    {&EV_Actor_GetWeaponType,                 &SimpleActor::EventGetWeaponType          },
+    {&EV_Actor_GetWeaponGroup,                &SimpleActor::EventGetWeaponGroup         },
+    {&EV_Actor_LookAt,                        &Actor::EventLookAt                       },
+    {&EV_Actor_EyesLookAt,                    &Actor::EventEyesLookAt                   },
+    {&EV_Actor_PointAt,                       &Actor::EventPointAt                      },
+    {&EV_Actor_TurnTo,                        &Actor::EventTurnTo                       },
+    {&EV_Actor_SetTurnDoneError,              &Actor::EventSetTurnDoneError             },
+    {&EV_Actor_SetTurnDoneError2,             &Actor::EventSetTurnDoneError             },
+    {&EV_Actor_GetTurnDoneError,              &Actor::EventGetTurnDoneError             },
+    {&EV_Actor_IdleSayAnim,                   &Actor::EventIdleSayAnim                  },
+    {&EV_Actor_SayAnim,                       &Actor::EventSayAnim                      },
+    {&EV_Actor_SetSayAnim,                    &Actor::EventSetSayAnim                   },
+    {&EV_Sentient_UseItem,                    &Actor::EventGiveWeapon                   },
+    {&EV_Sentient_GiveWeapon,                 &Actor::EventGiveWeapon                   },
+    {&EV_Actor_SetWeapon,                     &Actor::EventGiveWeapon                   },
+    {&EV_Actor_GetWeapon,                     &Actor::EventGetWeapon                    },
+    {&EV_Actor_SetGun,                        &Actor::EventGiveWeapon                   },
+    {&EV_Actor_SetGun2,                       &Actor::EventGiveWeapon                   },
+    {&EV_Actor_GetGun,                        &Actor::EventGetWeapon                    },
+    {&EV_Actor_WeaponInternal,                &Actor::EventGiveWeaponInternal           },
+    {&EV_Actor_DamagePuff,                    &Actor::EventDamagePuff                   },
+    {&EV_Actor_SetAngleYawSpeed,              &Actor::EventSetAngleYawSpeed             },
+    {&EV_Actor_SetAngleYawSpeed2,             &Actor::EventSetAngleYawSpeed             },
+    {&EV_Actor_GetAngleYawSpeed,              &Actor::EventGetAngleYawSpeed             },
+    {&EV_Actor_SetAimTarget,                  &Actor::EventSetAimTarget                 },
+    {&EV_Actor_ReadyToFire,                   &Actor::ReadyToFire                       },
+    {&EV_Actor_AIOn,                          &SimpleActor::EventAIOn                   },
+    {&EV_Actor_AIOff,                         &SimpleActor::EventAIOff                  },
+    {&EV_DeathSinkStart,                      &Actor::DeathSinkStart                    },
+    {&EV_Actor_GetSight,                      &Actor::EventGetSight                     },
+    {&EV_Actor_SetSight,                      &Actor::EventSetSight                     },
+    {&EV_Actor_SetSight2,                     &Actor::EventSetSight                     },
+    {&EV_Actor_GetHearing,                    &Actor::EventGetHearing                   },
+    {&EV_Actor_SetHearing,                    &Actor::EventSetHearing                   },
+    {&EV_Actor_SetHearing2,                   &Actor::EventSetHearing                   },
+    {&EV_Actor_SetFov,                        &Actor::EventSetFov                       },
+    {&EV_Actor_SetFov2,                       &Actor::EventSetFov                       },
+    {&EV_Actor_GetFov,                        &Actor::EventGetFov                       },
+    {&EV_Actor_DistToEnemy,                   &Actor::EventDistToEnemy                  },
+    {&EV_Actor_SetPatrolPath,                 &Actor::EventSetPatrolPath                },
+    {&EV_Actor_SetPatrolPath2,                &Actor::EventSetPatrolPath                },
+    {&EV_Actor_GetPatrolPath,                 &Actor::EventGetPatrolPath                },
+    {&EV_Actor_SetPatrolWaitTrigger,          &Actor::EventSetPatrolWaitTrigger         },
+    {&EV_Actor_SetPatrolWaitTrigger2,         &Actor::EventSetPatrolWaitTrigger         },
+    {&EV_Actor_GetPatrolWaitTrigger,          &Actor::EventGetPatrolWaitTrigger         },
+    {&EV_Actor_SetAccuracy,                   &Actor::EventSetAccuracy                  },
+    {&EV_Actor_SetAccuracy2,                  &Actor::EventSetAccuracy                  },
+    {&EV_Actor_GetAccuracy,                   &Actor::EventGetAccuracy                  },
+    {&EV_Actor_SetTypeIdle,                   &Actor::EventSetTypeIdle                  },
+    {&EV_Actor_SetTypeIdle2,                  &Actor::EventSetTypeIdle                  },
+    {&EV_Actor_GetTypeIdle,                   &Actor::EventGetTypeIdle                  },
+    {&EV_Actor_SetTypeAttack,                 &Actor::EventSetTypeAttack                },
+    {&EV_Actor_SetTypeAttack2,                &Actor::EventSetTypeAttack                },
+    {&EV_Actor_GetTypeAttack,                 &Actor::EventGetTypeAttack                },
+    {&EV_Actor_SetTypeDisguise,               &Actor::EventSetTypeDisguise              },
+    {&EV_Actor_SetTypeDisguise2,              &Actor::EventSetTypeDisguise              },
+    {&EV_Actor_GetTypeDisguise,               &Actor::EventGetTypeDisguise              },
+    {&EV_Actor_SetDisguiseLevel,              &Actor::EventSetDisguiseLevel             },
+    {&EV_Actor_SetDisguiseLevel2,             &Actor::EventSetDisguiseLevel             },
+    {&EV_Actor_GetDisguiseLevel,              &Actor::EventGetDisguiseLevel             },
+    {&EV_Actor_SetTypeGrenade,                &Actor::EventSetTypeGrenade               },
+    {&EV_Actor_SetTypeGrenade2,               &Actor::EventSetTypeGrenade               },
+    {&EV_Actor_GetTypeGrenade,                &Actor::EventGetTypeGrenade               },
+    {&EV_Actor_SetMinDistance,                &Actor::EventSetMinDistance               },
+    {&EV_Actor_SetMinDistance2,               &Actor::EventSetMinDistance               },
+    {&EV_Actor_GetMinDistance,                &Actor::EventGetMinDistance               },
+    {&EV_Actor_SetMaxDistance,                &Actor::EventSetMaxDistance               },
+    {&EV_Actor_SetMaxDistance2,               &Actor::EventSetMaxDistance               },
+    {&EV_Actor_GetMaxDistance,                &Actor::EventGetMaxDistance               },
+    {&EV_Actor_GetLeash,                      &Actor::EventGetLeash                     },
+    {&EV_Actor_SetLeash,                      &Actor::EventSetLeash                     },
+    {&EV_Actor_SetLeash2,                     &Actor::EventSetLeash                     },
+    {&EV_Actor_GetInterval,                   &Actor::EventGetInterval                  },
+    {&EV_Actor_SetInterval,                   &Actor::EventSetInterval                  },
+    {&EV_Actor_SetInterval2,                  &Actor::EventSetInterval                  },
+    {&EV_Actor_GetRunAnim,                    &Actor::EventGetRunAnim                   },
+    {&EV_Actor_GetWalkAnim,                   &Actor::EventGetWalkAnim                  },
+    {&EV_Actor_GetAnimName,                   &Actor::EventGetAnimName                  },
+    {&EV_Actor_SetAnimName,                   &Actor::EventSetAnimName                  },
+    {&EV_Actor_SetDisguiseRange,              &Actor::EventSetDisguiseRange             },
+    {&EV_Actor_SetDisguiseRange2,             &Actor::EventSetDisguiseRange             },
+    {&EV_Actor_GetDisguiseRange,              &Actor::EventGetDisguiseRange             },
+    {&EV_Actor_SetDisguisePeriod,             &Actor::EventSetDisguisePeriod            },
+    {&EV_Actor_SetDisguisePeriod2,            &Actor::EventSetDisguisePeriod            },
+    {&EV_Actor_GetDisguisePeriod,             &Actor::EventGetDisguisePeriod            },
+    {&EV_Actor_SetDisguiseAcceptThread,       &Actor::EventSetDisguiseAcceptThread      },
+    {&EV_Actor_SetDisguiseAcceptThread2,      &Actor::EventSetDisguiseAcceptThread      },
+    {&EV_Actor_GetDisguiseAcceptThread,       &Actor::EventGetDisguiseAcceptThread      },
+    {&EV_Actor_AttackPlayer,                  &Actor::EventAttackPlayer                 },
+    {&EV_Actor_SetAlarmNode,                  &Actor::EventSetAlarmNode                 },
+    {&EV_Actor_SetAlarmNode2,                 &Actor::EventSetAlarmNode                 },
+    {&EV_Actor_GetAlarmNode,                  &Actor::EventGetAlarmNode                 },
+    // Added in 2.30
+    //====
+    {&EV_Actor_SetPreAlarmThread,             &Actor::EventSetPreAlarmThread            },
+    {&EV_Actor_SetPreAlarmThread2,            &Actor::EventSetPreAlarmThread            },
+    //====
+    {&EV_Actor_SetAlarmThread,                &Actor::EventSetAlarmThread               },
+    {&EV_Actor_SetAlarmThread2,               &Actor::EventSetAlarmThread               },
+    {&EV_Actor_GetAlarmThread,                &Actor::EventGetAlarmThread               },
+    {&EV_Actor_SetSoundAwareness,             &Actor::EventSetSoundAwareness            },
+    {&EV_Actor_SetSoundAwareness2,            &Actor::EventSetSoundAwareness            },
+    {&EV_Actor_GetSoundAwareness,             &Actor::EventGetSoundAwareness            },
+    {&EV_Actor_SetGrenadeAwareness,           &Actor::EventSetGrenadeAwareness          },
+    {&EV_Actor_SetGrenadeAwareness2,          &Actor::EventSetGrenadeAwareness          },
+    {&EV_Actor_GetGrenadeAwareness,           &Actor::EventGetGrenadeAwareness          },
+    {&EV_Actor_SetTurret,                     &Actor::EventSetTurret                    },
+    {&EV_Actor_SetTurret2,                    &Actor::EventSetTurret                    },
+    {&EV_Actor_GetTurret,                     &Actor::EventGetTurret                    },
+    {&EV_Actor_AttachGrenade,                 &Actor::Grenade_EventAttach               },
+    {&EV_Actor_DetachGrenade,                 &Actor::Grenade_EventDetach               },
+    {&EV_Actor_FireGrenade,                   &Actor::Grenade_EventFire                 },
+    {&EV_Actor_EnableEnemy,                   &Actor::EventEnableEnemy                  },
+    {&EV_Actor_EnablePain,                    &Actor::EventEnablePain                   },
+    {&EV_Activate,                            &Actor::EventActivate                     },
+    {&EV_Actor_GetAmmoGrenade,                &Actor::EventGetAmmoGrenade               },
+    {&EV_Actor_SetAmmoGrenade,                &Actor::EventSetAmmoGrenade               },
+    {&EV_Actor_SetAmmoGrenade2,               &Actor::EventSetAmmoGrenade               },
+    {&EV_Actor_GetMood,                       &Actor::EventGetMood                      },
+    {&EV_Actor_SetMood,                       &Actor::EventSetMood                      },
+    {&EV_Actor_ShareEnemy,                    &Actor::EventShareEnemy                   },
+    {&EV_Actor_ShareGrenade,                  &Actor::EventShareGrenade                 },
+    {&EV_Actor_InterruptPoint,                &Actor::EventInterruptPoint               },
+    // Added in 2.0
+    //====
+    {&EV_Actor_GetVisibilityThreshold,        &Actor::EventGetVisibilityThreshold       },
+    {&EV_Actor_SetVisibilityThreshold,        &Actor::EventSetVisibilityThreshold       },
+    {&EV_Actor_SetVisibilityThreshold2,       &Actor::EventSetVisibilityThreshold       },
+    {&EV_Actor_SetDefaultVisibilityThreshold, &Actor::EventSetDefaultVisibilityThreshold},
+    {&EV_Actor_GetSuppressChance,             &Actor::EventGetSuppressChance            },
+    {&EV_Actor_SetSuppressChance,             &Actor::EventSetSuppressChance            },
+    {&EV_Actor_SetSuppressChance2,            &Actor::EventSetSuppressChance            },
+    //====
+    {&EV_Actor_GetPainHandler,                &Actor::EventGetPainHandler               },
+    {&EV_Actor_SetPainHandler,                &Actor::EventSetPainHandler               },
+    {&EV_Actor_GetDeathHandler,               &Actor::EventGetDeathHandler              },
+    {&EV_Actor_SetDeathHandler,               &Actor::EventSetDeathHandler              },
+    {&EV_Actor_GetAttackHandler,              &Actor::EventGetAttackHandler             },
+    {&EV_Actor_SetAttackHandler,              &Actor::EventSetAttackHandler             },
+    {&EV_Actor_SetHeadModel,                  &Actor::EventSetHeadModel                 },
+    {&EV_Actor_GetHeadModel,                  &Actor::EventGetHeadModel                 },
+    {&EV_Actor_SetHeadSkin,                   &Actor::EventSetHeadSkin                  },
+    {&EV_Actor_GetHeadSkin,                   &Actor::EventGetHeadSkin                  },
+    {&EV_Actor_SetNoIdle,                     &Actor::EventSetNoIdle                    },
+    {&EV_Actor_GetNoIdle,                     &Actor::EventGetNoIdle                    },
+    {&EV_Actor_GetEnemy,                      &Actor::EventGetEnemy                     },
+    {&EV_Actor_GetMaxNoticeTimeScale,         &Actor::EventGetMaxNoticeTimeScale        },
+    {&EV_Actor_SetMaxNoticeTimeScale,         &Actor::EventSetMaxNoticeTimeScale        },
+    {&EV_Actor_SetMaxNoticeTimeScale2,        &Actor::EventSetMaxNoticeTimeScale        },
+    {&EV_Actor_GetFixedLeash,                 &Actor::EventGetFixedLeash                },
+    {&EV_Actor_SetFixedLeash,                 &Actor::EventSetFixedLeash                },
+    {&EV_Actor_SetFixedLeash2,                &Actor::EventSetFixedLeash                },
+    {&EV_Actor_Holster,                       &Actor::EventHolster                      },
+    {&EV_Actor_Unholster,                     &Actor::EventUnholster                    },
+    {&EV_SoundDone,                           &Actor::EventSoundDone                    },
+    {&EV_Sound,                               &Actor::EventSound                        },
+    {&EV_Actor_IsEnemyVisible,                &Actor::EventIsEnemyVisible               },
+    {&EV_Actor_GetEnemyVisibleChangeTime,     &Actor::EventGetEnemyVisibleChangeTime    },
+    {&EV_Actor_GetLastEnemyVisibleTime,       &Actor::EventGetLastEnemyVisibleTime      },
+    {&EV_Actor_SetFallHeight,                 &Actor::EventSetFallHeight                },
+    {&EV_Actor_GetFallHeight,                 &Actor::EventGetFallHeight                },
+    {&EV_Actor_CanMoveTo,                     &Actor::EventCanMoveTo                    },
+    {&EV_Actor_MoveDir,                       &Actor::EventMoveDir                      },
+    {&EV_Actor_IntervalDir,                   &Actor::EventIntervalDir                  },
+    {&EV_Actor_ResetLeash,                    &Actor::EventResetLeash                   },
+    {&EV_Actor_Tether,                        &Actor::EventTether                       },
+    {&EV_Actor_GetThinkState,                 &Actor::EventGetThinkState                },
+    {&EV_Actor_GetEnemyShareRange,            &Actor::EventGetEnemyShareRange           },
+    {&EV_Actor_SetEnemyShareRange,            &Actor::EventSetEnemyShareRange           },
+    {&EV_Actor_SetEnemyShareRange2,           &Actor::EventSetEnemyShareRange           },
+    {&EV_Actor_GetVoiceType,                  &Actor::GetVoiceType                      },
+    {&EV_Actor_SetVoiceType,                  &Actor::SetVoiceType                      },
+    {&EV_Actor_SetVoiceType2,                 &Actor::SetVoiceType                      },
+    {&EV_Remove,                              &Actor::Remove                            },
+    {&EV_Delete,                              &Actor::Remove                            },
+    {&EV_ScriptRemove,                        &Actor::Remove                            },
+    {&EV_Actor_KickDir,                       &Actor::EventGetKickDir                   },
+    {&EV_Actor_GetNoLongPain,                 &Actor::EventGetNoLongPain                },
+    {&EV_Actor_SetNoLongPain,                 &Actor::EventSetNoLongPain                },
+    {&EV_Actor_SetNoLongPain2,                &Actor::EventSetNoLongPain                },
+    {&EV_Actor_GetFavoriteEnemy,              &Actor::EventGetFavoriteEnemy             },
+    {&EV_Actor_SetFavoriteEnemy,              &Actor::EventSetFavoriteEnemy             },
+    {&EV_Actor_SetFavoriteEnemy2,             &Actor::EventSetFavoriteEnemy             },
+    {&EV_Actor_GetMumble,                     &Actor::EventGetMumble                    },
+    {&EV_Actor_SetMumble,                     &Actor::EventSetMumble                    },
+    {&EV_Actor_SetMumble2,                    &Actor::EventSetMumble                    },
+    // Removed in 2.0
+    //====
+    //{&EV_Actor_GetBreathSteam,                &Actor::EventGetBreathSteam                     },
+    //{&EV_Actor_SetBreathSteam,                &Actor::EventSetBreathSteam                     },
+    //{&EV_Actor_SetBreathSteam2,               &Actor::EventSetBreathSteam                     },
+    //====
+    {&EV_Actor_CalcGrenadeToss,               &Actor::EventCalcGrenadeToss              },
+    {&EV_Actor_CalcGrenadeToss2,              &Actor::EventCalcGrenadeToss2             },
+    {&EV_Actor_GetNoSurprise,                 &Actor::EventGetNoSurprise                },
+    {&EV_Actor_SetNoSurprise,                 &Actor::EventSetNoSurprise                },
+    {&EV_Actor_SetNoSurprise2,                &Actor::EventSetNoSurprise                },
+    {&EV_Actor_GetSilent,                     &Actor::EventGetSilent                    },
+    {&EV_Actor_SetSilent,                     &Actor::EventSetSilent                    },
+    {&EV_Actor_SetSilent2,                    &Actor::EventSetSilent                    },
+    {&EV_Actor_GetAvoidPlayer,                &Actor::EventGetAvoidPlayer               },
+    {&EV_Actor_SetAvoidPlayer,                &Actor::EventSetAvoidPlayer               },
+    {&EV_Actor_SetAvoidPlayer2,               &Actor::EventSetAvoidPlayer               },
+    {&EV_Actor_SetMoveDoneRadius,             &Actor::EventSetMoveDoneRadius            },
+    {&EV_Actor_GetMoveDoneRadius,             &Actor::EventGetMoveDoneRadius            },
+    {&EV_Actor_BeDead,                        &Actor::EventBeDead                       },
+    {&EV_Actor_GetLookAroundAngle,            &Actor::EventGetLookAroundAngle           },
+    {&EV_Actor_SetLookAroundAngle,            &Actor::EventSetLookAroundAngle           },
+    {&EV_Actor_SetLookAroundAngle2,           &Actor::EventSetLookAroundAngle           },
+    {&EV_Actor_HasCompleteLookahead,          &Actor::EventHasCompleteLookahead         },
+    {&EV_Actor_PathDist,                      &Actor::EventPathDist                     },
+    {&EV_Actor_CanShootEnemyFrom,             &Actor::EventCanShootEnemyFrom            },
+    {&EV_Actor_CanShoot,                      &Actor::EventCanShoot                     },
+    {&EV_Actor_GetInReload,                   &Actor::EventGetInReload                  },
+    {&EV_Actor_SetInReload,                   &Actor::EventSetInReload                  },
+    {&EV_Actor_SetReloadCover,                &Actor::EventSetReloadCover               },
+    {&EV_Actor_BreakSpecial,                  &Actor::EventBreakSpecial                 },
+    {&EV_Actor_SetBalconyHeight,              &Actor::EventSetBalconyHeight             },
+    {&EV_Actor_SetBalconyHeight2,             &Actor::EventSetBalconyHeight             },
+    {&EV_Actor_GetBalconyHeight,              &Actor::EventGetBalconyHeight             },
+    // Removed in 2.0
+    //====
+    //{&EV_CanSee,                              &Actor::CanSee                            },
+    //====
+    // Added in 2.0
+    //====
+    {&EV_Actor_SetIgnoreBadPlace,             &Actor::EventSetIgnoreBadPlace            },
+    {&EV_Actor_SetIgnoreBadPlace2,            &Actor::EventSetIgnoreBadPlace            },
+    {&EV_Actor_GetIgnoreBadPlace,             &Actor::EventGetIgnoreBadPlace            },
+    {&EV_Actor_FindEnemy,                     &Actor::EventFindEnemy                    },
+    {&EV_Actor_EnableEnemySwitch,             &Actor::EventEnableEnemySwitch            },
+    {&EV_Actor_DisableEnemySwitch,            &Actor::EventDisableEnemySwitch           },
+    {&EV_Actor_SetRunAnimRate,                &Actor::EventSetRunAnimRate               },
+    {&EV_Actor_SetRunAnimRate2,               &Actor::EventSetRunAnimRate               },
+    {&EV_Actor_GetRunAnimRate,                &Actor::EventGetRunAnimRate               },
+    //====
+    // Added in 2.30
+    //====
+    {&EV_Stop,                                &Actor::Landed                            },
+    {&EV_Actor_SetNationality,                &Actor::SetNationality                    },
+    {&EV_Actor_SetNationality2,               &Actor::SetNationality                    },
+    {&EV_Actor_GetNationality,                &Actor::GetNationality                    },
+    {&EV_Actor_WriteStats,                    &Actor::EventWriteStats                   },
+    {&EV_Actor_CuriousOff,                    &Actor::EventCuriousOff                   },
+    {&EV_Actor_CuriousOn,                     &Actor::EventCuriousOn                    },
+    //====
+    {NULL,                                    NULL                                      }
 };
 
 Actor::GlobalFuncs_t Actor::GlobalFuncs[NUM_THINKS];
-const_str Actor::m_csThinkNames[NUM_THINKS] = {
-	STRING_VOID,
-	STRING_TURRET,
-	STRING_COVER,
-	STRING_PATROL,
-	STRING_RUNNER,
-	STRING_PAIN,
-	STRING_KILLED,
-	STRING_MOVETO,
-	STRING_IDLE,
-	STRING_CURIOUS,
-	STRING_DISGUISE_SALUTE,
-	STRING_DISGUISE_SENTRY,
-	STRING_DISGUISE_OFFICER,
-	STRING_DISGUISE_ROVER,
-	STRING_DISGUISE_NONE,
-	STRING_ALARM,
-	STRING_GRENADE,
-	STRING_MACHINEGUNNER,
-	STRING_DOG_IDLE,
-	STRING_DOG_ATTACK,
-	STRING_DOG_CURIOUS,
-	STRING_DOG_GRENADE,
-	STRING_ANIM,
-	STRING_ANIM_CURIOUS,
-	STRING_AIM,
-	STRING_BALCONY_IDLE,
-	STRING_BALCONY_CURIOUS,
-	STRING_BALCONY_ATTACK,
-	STRING_BALCONY_DISGUISE,
-	STRING_BALCONY_GRENADE,
-	STRING_BALCONY_PAIN,
-	STRING_BALCONY_KILLED,
-	STRING_WEAPONLESS,
-	STRING_NOCLIP,
-	STRING_DEAD
+const_str            Actor::m_csThinkNames[NUM_THINKS] = {
+    STRING_VOID,
+    STRING_TURRET,
+    STRING_COVER,
+    STRING_PATROL,
+    STRING_RUNNER,
+    STRING_PAIN,
+    STRING_KILLED,
+    STRING_MOVETO,
+    STRING_IDLE,
+    STRING_CURIOUS,
+    STRING_DISGUISE_SALUTE,
+    STRING_DISGUISE_SENTRY,
+    STRING_DISGUISE_OFFICER,
+    STRING_DISGUISE_ROVER,
+    STRING_DISGUISE_NONE,
+    STRING_ALARM,
+    STRING_GRENADE,
+    STRING_MACHINEGUNNER,
+    STRING_DOG_IDLE,
+    STRING_DOG_ATTACK,
+    STRING_DOG_CURIOUS,
+    STRING_DOG_GRENADE,
+    STRING_ANIM,
+    STRING_ANIM_CURIOUS,
+    STRING_AIM,
+    STRING_BALCONY_IDLE,
+    STRING_BALCONY_CURIOUS,
+    STRING_BALCONY_ATTACK,
+    STRING_BALCONY_DISGUISE,
+    STRING_BALCONY_GRENADE,
+    STRING_BALCONY_PAIN,
+    STRING_BALCONY_KILLED,
+    STRING_WEAPONLESS,
+    STRING_NOCLIP,
+    STRING_DEAD,
+    // Added in 2.0
+    STRING_BADPLACE,
+    // Added in 2.30
+    STRING_RUNANDSHOOT
 };
-const_str Actor::m_csThinkStateNames[ NUM_THINKSTATES ] = {
-	STRING_VOID,
-	STRING_IDLE,
-	STRING_PAIN,
-	STRING_KILLED,
-	STRING_ATTACK,
-	STRING_CURIOUS,
-	STRING_DISGUISE,
-	STRING_GRENADE,
-	STRING_NOCLIP
+const_str Actor::m_csThinkStateNames[NUM_THINKSTATES] = {
+    STRING_VOID,
+    STRING_IDLE,
+    STRING_PAIN,
+    STRING_KILLED,
+    STRING_ATTACK,
+    STRING_CURIOUS,
+    STRING_DISGUISE,
+    STRING_GRENADE,
+    STRING_BADPLACE, // Added in 2.0
+    STRING_NOCLIP
 };
 
-SafePtr< Actor > Actor::mBodyQueue[MAX_BODYQUEUE];
-int Actor::mCurBody;
-
+SafePtr<Actor> Actor::mBodyQueue[MAX_BODYQUEUE];
+int            Actor::mCurBody;
 
 /*
 ===============
@@ -2558,3011 +2750,391 @@ Constructor
 ===============
 */
 Actor::Actor()
+    : mVoiceType(-1)
 {
-	entflags |= EF_ACTOR;
+    entflags |= ECF_ACTOR;
 
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    m_pszDebugState = "";
+    m_pFallPath     = NULL;
+    m_iOriginTime   = -1;
 
-	edict->s.eType = ET_MODELANIM;
-	edict->r.svFlags |= SVF_USE_CURRENT_ORIGIN;
-	edict->r.ownerNum = ENTITYNUM_NONE;
-	edict->clipmask = MASK_MONSTERSOLID;
-	setMoveType( MOVETYPE_WALK );
-	mass = 175;
-	flags |= FL_THINK;
-	flags &= ~FL_ANIMATE;
-	setContentsSolid();
-	setSolidType( SOLID_BBOX );
-	m_fFov = 90.0f;
-	takedamage = DAMAGE_AIM;
-	m_fFovDot = cos( 0.5 * m_fFov * M_PI / 180 );
-	m_eAnimMode = 0;
-	Anim_Emotion(EMOTION_NONE);
-	m_bDoPhysics = true;
-	path_failed_time = 0;
-	health = 100;
-	max_health = 100;
-	m_fAngleYawSpeed = 360;
-	m_fHeadMaxTurnSpeed = 520;
-	m_bHeadAnglesAchieved = true;
-	VectorClear( m_vHeadDesiredAngles );
-	m_fLUpperArmTurnSpeed = 360;
-	m_bLUpperArmAnglesAchieved = true;
-	VectorClear( m_vLUpperArmDesiredAngles );
-	m_fTorsoMaxTurnSpeed = 120;
-	m_fTorsoCurrentTurnSpeed = 0;
-	m_bTorsoAnglesAchieved = true;
-	VectorClear( m_vTorsoDesiredAngles );
-	m_pLookEntity = NULL;
-	m_pPointEntity = NULL;
-	m_pTurnEntity = NULL;
-	VectorClear( edict->s.eyeVector );
-	m_bDoAI = true;
-	m_bTurretNoInitialCover = false;
-	m_bThink = false;
-	m_bAutoAvoidPlayer = true;
-	m_fHearing = 2048;
-	m_PainTime = 0;
-	m_fSight = world->m_fAIVisionDistance;
-	m_bNoLongPain = false;
-	hit_obstacle_time = 0;
-	VectorClear2D( obstacle_vel );
-	m_bLockThinkState = false;
-	InitThinkStates();
-	SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	m_fMinDistance = 128;
-	m_fMinDistanceSquared = Square(128);
-	m_fMaxDistance = 1024;
-	m_fMaxDistanceSquared = Square(1024);
-	m_fLeash = 512;
-	m_fLeashSquared = Square(512);
-	m_iEyeUpdateTime = level.inttime;
-	if( m_iEyeUpdateTime < 1000 )
-		m_iEyeUpdateTime = 1000;
-	m_iEyeUpdateTime += rand() % 100 + 100;
-	m_vIntervalDir = vec_zero;
-	m_iIntervalDirTime = 0;
-	edict->r.lastNetTime = -10000000;
-	m_iEnemyCheckTime = 0;
-	m_iEnemyChangeTime = 0;
-	m_iEnemyVisibleCheckTime = 0;
-	m_bNewEnemy = false;
-	m_bEnemyIsDisguised = false;
-	m_bEnemyVisible = false;
-	m_iEnemyVisibleChangeTime = 0;
-	m_iLastEnemyVisibleTime = 0;
-	m_iEnemyFovCheckTime = 0;
-	m_iEnemyFovChangeTime = 0;
-	m_bEnemyInFOV = false;
-	m_iIgnoreSoundsMask = 0;
-	m_State = -1;
-	m_iStateTime = 0;
-	m_iGunPositionCheckTime = 0;
-	m_vLastEnemyPos = vec_origin;
-	m_iLastEnemyPosChangeTime = 0;
-	m_vScriptGoal = vec_origin;
-	m_iNextWatchStepTime = 0;
-	m_iCuriousTime = 0;
-	m_iCuriousLevel = 0;
-	SetCuriousAnimHint(0);
-	m_bScriptGoalValid = false;
-	m_bNoSurprise = false;
-	memset( &m_pPotentialCoverNode, 0, sizeof( m_pPotentialCoverNode ) );
-	m_iPotentialCoverCount = 0;
-	m_pCoverNode = NULL;
-	m_csSpecialAttack = STRING_NULL;
-	m_sCurrentPathNodeIndex = -1;
-	m_iDisguiseLevel = 1;
-	m_iNextDisguiseTime = 1;
-	m_iDisguisePeriod = 30000;
-	m_bNeedReload = false;
-	m_bInReload = false;
-	m_bFaceEnemy = true;
-	m_fMaxDisguiseDistSquared = 256 * 256;
-	m_patrolCurrentNode = NULL;
-	m_csPatrolCurrentAnim = STRING_ANIM_RUN_SCR;
-	m_iSquadStandTime = 0;
-	m_bPatrolWaitTrigger = false;
-	m_fInterval = 128;
-	m_aimNode = NULL;
-	m_vHome = vec_origin;
-	m_bFixedLeash = false;
-	m_pTetherEnt = NULL;
-	m_pGrenade = NULL;
-	m_vGrenadePos = vec_origin;
-	m_eGrenadeMode = AI_GREN_TOSS_NONE;
-	m_iFirstGrenadeTime = 0;
-	m_bGrenadeBounced = false;
-	m_vGrenadeVel = vec_zero;
-	m_vKickDir = vec_zero;
-	m_fNoticeTimeScale = 1.0f;
-	m_iCanShootCheckTime = 0;
-	m_csAnimScript = STRING_ANIM_IDLE_SCR;
-	m_fSoundAwareness = 100;
-	m_fGrenadeAwareness = 20;
-	m_fMaxNoticeTimeScale = 1.0f;
-	m_bCanShootEnemy = false;
-	m_bEnableEnemy = true;
-	m_bDesiredEnableEnemy = true;
-	m_bEnablePain = true;
-	m_bAnimScriptSet = false;
-	m_AnimMode = 0;
-	m_csAnimName = STRING_EMPTY;
-	m_csSayAnim = STRING_EMPTY;
-	m_csUpperAnim = STRING_EMPTY;
-	m_fDfwRequestedYaw = 0;
-	m_fDfwDerivedYaw = 0;
-	m_vDfwPos = vec_zero;
-	m_fDfwTime = 0;
-	m_AlarmNode = NULL;
-	m_csHeadSkin = STRING_EMPTY;
-	m_iWallDodgeTimeout = 0;
-	m_csHeadModel = STRING_EMPTY;
-	m_csLoadOut = STRING_EMPTY;
-	m_iRunHomeTime = 0;
-	m_iLookFlags = 0;
-	m_csWeapon = STRING_EMPTY;
-	m_eDontFaceWallMode = 0;
-	m_WallDir = 0;
-	VectorClear2D( m_PrevObstacleNormal );
-	m_bNoIdleAfterAnim = false;
-	m_fMaxShareDistSquared = 0;
-	m_bBreathSteam = false;
-	m_fMoveDoneRadiusSquared = 0;
-	m_bForceAttackPlayer = false;
-	m_iNextLookTime = 0;
-	m_fLookAroundFov = 45;
-	m_bHasDesiredLookDest = false;
-	m_bHasDesiredLookAngles = false;
-	m_iLastFaceDecideTime = 0;
-	m_iOriginTime = -1;
-	m_fTurnDoneError = 0;
-	m_fBalconyHeight = 128;
-	m_bNoPlayerCollision = false;
-	m_pFallPath = NULL;
-	for( int i = 0; i < MAX_ORIGIN_HISTORY; i++ )
-	{
-		VectorClear2D( m_vOriginHistory[ i ] );
-	}
-	m_bAnimating = false;
-	m_iCurrentHistory = 0;
-	m_bDog = false;
-	m_bBecomeRunner = false;
-	mVoiceType = -1;
+    if (LoadingSavegame) {
+        return;
+    }
+
+    m_PainState            = 500;
+    m_iEnemyShowPapersTime = 0;
+    m_eGrenadeState        = eGrenadeState::AI_GRENSTATE_FLEE;
+
+    edict->s.eType = ET_MODELANIM;
+    edict->r.svFlags |= SVF_MONSTER;
+    edict->r.ownerNum = ENTITYNUM_NONE;
+    edict->clipmask   = MASK_MONSTERSOLID;
+    setMoveType(MOVETYPE_WALK);
+
+    mass = 175;
+    flags |= FL_THINK;
+    flags &= ~FL_ANIMATE;
+
+    setContentsSolid();
+    setSolidType(SOLID_BBOX);
+
+    m_fFov     = 90.0f;
+    takedamage = DAMAGE_AIM;
+    m_fFovDot  = cos(DEG2RAD(m_fFov / 2.0));
+
+    m_eAnimMode = ANIM_MODE_NONE;
+    Anim_Emotion(EMOTION_NONE);
+
+    m_bDoPhysics     = true;
+    path_failed_time = 0;
+
+    health     = 100;
+    max_health = 100;
+
+    m_fAngleYawSpeed      = 360;
+    m_fHeadMaxTurnSpeed   = 520;
+    m_bHeadAnglesAchieved = true;
+    VectorClear(m_vHeadDesiredAngles);
+
+    m_fLUpperArmTurnSpeed      = 360;
+    m_bLUpperArmAnglesAchieved = true;
+    VectorClear(m_vLUpperArmDesiredAngles);
+
+    m_fTorsoMaxTurnSpeed     = 120;
+    m_fTorsoCurrentTurnSpeed = 0;
+    m_bTorsoAnglesAchieved   = true;
+    VectorClear(m_vTorsoDesiredAngles);
+
+    m_pLookEntity  = NULL;
+    m_pPointEntity = NULL;
+    m_pTurnEntity  = NULL;
+
+    VectorClear(edict->s.eyeVector);
+
+    m_bDoAI                 = true;
+    m_bTurretNoInitialCover = false;
+    m_bThink                = false;
+    m_fSight                = world->m_fAIVisionDistance;
+    m_fHearing              = 2048;
+    m_PainTime              = 0;
+    m_bNoLongPain           = false;
+    hit_obstacle_time       = 0;
+    VectorClear2D(obstacle_vel);
+
+    m_bLockThinkState  = false;
+    m_bAutoAvoidPlayer = true;
+    m_bIsCurious       = true;
+
+    InitThinkStates();
+    SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+
+    m_fMinDistance        = 128;
+    m_fMinDistanceSquared = Square(m_fMinDistance);
+    m_fMaxDistance        = 1024;
+    m_fMaxDistanceSquared = Square(m_fMaxDistance);
+    m_fLeash              = 512;
+    m_fLeashSquared       = Square(m_fLeash);
+
+    m_iEyeUpdateTime = level.inttime;
+    if (m_iEyeUpdateTime < 1000) {
+        m_iEyeUpdateTime = 1000;
+    }
+    m_iEyeUpdateTime += rand() % 100 + 100;
+
+    m_vIntervalDir       = vec_zero;
+    m_iIntervalDirTime   = 0;
+    edict->r.lastNetTime = -10000000;
+
+    m_bNewEnemy               = false;
+    m_iEnemyCheckTime         = 0;
+    m_iEnemyChangeTime        = 0;
+    m_bEnemyIsDisguised       = false;
+    m_bEnemyVisible           = false;
+    m_iEnemyVisibleCheckTime  = 0;
+    m_iEnemyVisibleChangeTime = 0;
+    m_iLastEnemyVisibleTime   = 0;
+    m_fVisibilityAlpha        = 0;
+    m_fVisibilityThreshold    = 0.5f;
+    m_bHasVisibilityThreshold = false;
+
+    m_bEnemyInFOV         = false;
+    m_iEnemyFovCheckTime  = 0;
+    m_iEnemyFovChangeTime = 0;
+    m_iIgnoreSoundsMask   = 0;
+
+    m_State      = -1;
+    m_iStateTime = 0;
+
+    m_iGunPositionCheckTime   = 0;
+    m_vLastEnemyPos           = vec3_origin;
+    m_iLastEnemyPosChangeTime = 0;
+    m_vScriptGoal             = vec3_origin;
+    m_bScriptGoalValid        = false;
+    m_iNextWatchStepTime      = 0;
+
+    m_iCuriousTime  = 0;
+    m_iCuriousLevel = 0;
+    SetCuriousAnimHint(0);
+
+    m_bNoSurprise = false;
+    memset(&m_pPotentialCoverNode, 0, sizeof(m_pPotentialCoverNode));
+    m_iPotentialCoverCount = 0;
+    m_pCoverNode           = NULL;
+
+    m_csSpecialAttack       = STRING_NULL;
+    m_bNeedReload           = false;
+    m_bInReload             = false;
+    m_bFaceEnemy            = true;
+    m_sCurrentPathNodeIndex = -1;
+
+    m_iNextDisguiseTime       = 1;
+    m_iDisguisePeriod         = 30000;
+    m_fMaxDisguiseDistSquared = Square(256);
+    m_iDisguiseLevel          = 1;
+
+    m_patrolCurrentNode   = NULL;
+    m_csPatrolCurrentAnim = STRING_ANIM_RUN_SCR;
+    m_bPatrolWaitTrigger  = false;
+    m_fInterval           = 128;
+    m_iSquadStandTime     = 0;
+    m_aimNode             = NULL;
+
+    m_vHome       = vec3_origin;
+    m_bFixedLeash = false;
+    m_pTetherEnt  = NULL;
+
+    m_pGrenade          = NULL;
+    m_vGrenadePos       = vec3_origin;
+    m_iFirstGrenadeTime = 0;
+    m_bGrenadeBounced   = false;
+    m_eGrenadeMode      = AI_GREN_TOSS_NONE;
+    m_vGrenadeVel       = vec_zero;
+    m_vKickDir          = vec_zero;
+
+    m_fSoundAwareness     = 100;
+    m_fGrenadeAwareness   = 20;
+    m_fMaxNoticeTimeScale = 1.0f;
+    m_fNoticeTimeScale    = 1.0f;
+
+    m_iCanShootCheckTime  = 0;
+    m_bCanShootEnemy      = false;
+    m_bEnableEnemy        = true;
+    m_bDesiredEnableEnemy = true;
+    m_bEnablePain         = true;
+
+    m_csAnimScript   = STRING_ANIM_IDLE_SCR;
+    m_bAnimScriptSet = false;
+    m_AnimMode       = ANIM_MODE_NORMAL;
+    m_csAnimName     = STRING_EMPTY;
+    m_csSayAnim      = STRING_EMPTY;
+    m_csUpperAnim    = STRING_EMPTY;
+
+    m_fRunAnimRate     = 1;
+    m_fDfwRequestedYaw = 0;
+    m_fDfwDerivedYaw   = 0;
+    m_vDfwPos          = vec_zero;
+    m_fDfwTime         = 0;
+
+    m_AlarmNode = NULL;
+
+    m_iWallDodgeTimeout = 0;
+    m_WallDir           = 0;
+    VectorClear2D(m_PrevObstacleNormal);
+
+    m_csHeadModel      = STRING_EMPTY;
+    m_csHeadSkin       = STRING_EMPTY;
+    m_bNoIdleAfterAnim = false;
+    m_csWeapon         = STRING_EMPTY;
+    m_csLoadOut        = STRING_EMPTY;
+
+    m_fMaxShareDistSquared = 0;
+    m_iRunHomeTime         = 0;
+    m_iSuppressChance      = 50;
+
+    m_bBreathSteam = false;
+
+    m_fMoveDoneRadiusSquared = 0;
+
+    m_bForceAttackPlayer = false;
+
+    m_iLookFlags            = 0;
+    m_iNextLookTime         = 0;
+    m_fLookAroundFov        = 45;
+    m_bHasDesiredLookDest   = false;
+    m_bHasDesiredLookAngles = false;
+
+    m_eDontFaceWallMode   = 0;
+    m_iLastFaceDecideTime = 0;
+    m_iOriginTime         = -1;
+    m_fTurnDoneError      = 0;
+
+    m_fBalconyHeight     = 128;
+    m_bNoPlayerCollision = false;
+    for (int i = 0; i < MAX_ORIGIN_HISTORY; i++) {
+        VectorClear2D(m_vOriginHistory[i]);
+    }
+    m_iCurrentHistory = 0;
+    m_bAnimating      = false;
+    m_bIgnoreBadPlace = false;
+    m_iBadPlaceIndex  = 0;
+    m_bBecomeRunner   = false;
+    m_bEnemySwitch    = true;
+    m_iNationality    = ACTOR_NATIONALITY_DEFAULT;
+
+    if (g_aistats) {
+        PostEvent(EV_Actor_WriteStats, 1.0);
+    }
+
+    mVoiceType = -1;
+
+    //
+    // Added in OPM
+    //  The variable isn't set in original
+    //
+    m_bSilent = false;
+    m_bMumble = true;
 }
 
 /*
 ===============
-Actor::ShowInfo
+Actor::~Actor
 
-Prints basic actor information.
+Destructor
 ===============
 */
-void Actor::ShowInfo
-	(
-	void
-	)
+Actor::~Actor()
 {
-	Com_Printf( "-------------------------------------------------------------------------------\n" );
-	Com_Printf( "Info for Actor:\n" );
-	Com_Printf( "Current think type: %s %s\n", ThinkName().c_str(), ThinkStateName().c_str() );
-	Com_Printf( "leash: %f\n", m_fLeash );
-	Com_Printf( "mindist: %f\n", m_fMinDistance );
-	Com_Printf( "maxdist: %f\n", m_fMaxDistance );
+    EndStates();
+    ClearPatrolCurrentNode();
+    ClearAimNode();
+    ClearLookEntity();
+    ClearPointEntity();
+    ClearTurnEntity();
 
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ];
-	if( func->ShowInfo )
-		( this->*func->ShowInfo )( );
-
-	Com_Printf( "-------------------------------------------------------------------------------\n" );
-}
-
-/*
-===============
-Actor::MoveTo
-
-Move actor to specific location/listener with specific animation.
-===============
-*/
-void Actor::MoveTo
-	(
-	Event *ev
-	)
-{
-	m_csPatrolCurrentAnim = ev->GetConstString( 1 );
-
-	if( ev->IsVectorAt( 2 ) )
-	{
-		Vector vec = ev->GetVector( 2 );
-		SetPatrolCurrentNode( vec );
-	}
-	else
-	{
-		SetPatrolCurrentNode( ev->GetListener( 2 ) );
-	}
-
-	if( m_patrolCurrentNode )
-	{
-		m_vScriptGoal = origin;
-		m_bScriptGoalValid = true;
-	}
-
-	SetThinkIdle(THINK_RUNNER);
-}
-
-/*
-===============
-Actor::WalkTo
-
-Walk to specific location.
-===============
-*/
-void Actor::WalkTo
-	(
-	Event *ev
-	)
-{
-	Event event = EV_Listener_ExecuteScript;
-	event.AddConstString( STRING_GLOBAL_WALKTO_SCR );
-	event.AddValue( ev->GetValue( 1 ) );
-	ExecuteScript( &event );
-}
-
-/*
-===============
-Actor::RunTo
-
-Run to specific location.
-===============
-*/
-void Actor::RunTo
-	(
-	Event *ev
-	)
-{
-	Event event = EV_Listener_ExecuteScript;
-	event.AddConstString( STRING_GLOBAL_RUNTO_SCR );
-	event.AddValue( ev->GetValue( 1 ) );
-	ExecuteScript( &event );
-}
-
-/*
-===============
-Actor::CrouchTo
-
-Crouch to specific location.
-===============
-*/
-void Actor::CrouchTo
-	(
-	Event *ev
-	)
-{
-	Event event = EV_Listener_ExecuteScript;
-	event.AddConstString( STRING_GLOBAL_CROUCHTO_SCR );
-	event.AddValue( ev->GetValue( 1 ) );
-	ExecuteScript( &event );
-}
-
-/*
-===============
-Actor::CrawlTo
-
-Crawl to specific location.
-===============
-*/
-void Actor::CrawlTo
-	(
-	Event *ev
-	)
-{
-	Event event = EV_Listener_ExecuteScript;
-	event.AddConstString( STRING_GLOBAL_CRAWLTO_SCR );
-	event.AddValue( ev->GetValue( 1 ) );
-	ExecuteScript( &event );
-}
-
-/*
-===============
-Actor::AimAt
-
-Aim at specified target.
-===============
-*/
-void Actor::AimAt
-	(
-	Event *ev
-	)
-{
-
-	if( ev->IsVectorAt( 1 ) )
-	{
-		Vector orig = ev->GetVector(1);
-		if (m_aimNode)
-		{
-			if (m_aimNode->IsSubclassOfTempWaypoint())
-			{
-				delete m_aimNode;
-			}
-			m_aimNode = NULL;
-		}
-		TempWaypoint * twp = new TempWaypoint;
-		m_aimNode = twp;
-		m_aimNode->setOrigin(orig);
-	}
-	else
-	{
-		SetAimNode(ev->GetListener(1));
-	}
-
-	SetThinkIdle( m_aimNode != NULL ? THINK_AIM : THINK_IDLE);
-}
-
-/*
-===============
-Actor::DefaultRestart
-
-Default restart of current think state.
-===============
-*/
-void Actor::DefaultRestart
-	(
-	void
-	)
-{
-	EndState( m_ThinkLevel );
-	BeginState();
-}
-
-/*
-===============
-Actor::SuspendState
-
-Suspend current think state.
-===============
-*/
-void Actor::SuspendState
-	(
-	void
-	)
-{
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ];
-
-	if( func->SuspendState )
-		( this->*func->SuspendState )( );
-}
-
-/*
-===============
-Actor::ResumeState
-
-Resume current think state.
-===============
-*/
-void Actor::ResumeState
-	(
-	void
-	)
-{
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ];
-
-	if( func->ResumeState )
-		( this->*func->ResumeState )( );
-}
-
-/*
-===============
-Actor::BeginState
-
-Begin current think state.
-===============
-*/
-void Actor::BeginState
-	(
-	void
-	)
-{
-	m_Think[ m_ThinkLevel ] = m_ThinkMap[ m_ThinkState ];
-
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ];
-
-	if( func->BeginState )
-		( this->*func->BeginState )();
-
-	m_Think[ m_ThinkLevel ] = m_ThinkMap[ m_ThinkState ];
-}
-
-/*
-===============
-Actor::EndState
-
-End current think state.
-===============
-*/
-void Actor::EndState
-	(
-	int level
-	)
-{
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ level ] ];
-
-	m_Think[ level ] = THINK_VOID;
-
-	if( func->EndState )
-		( this->*func->EndState )();
-
-	if( m_pAnimThread )
-		m_pAnimThread->AbortRegistration( STRING_EMPTY, this );
-}
-
-/*
-===============
-Actor::RestartState
-
-Restart current think state.
-===============
-*/
-void Actor::RestartState
-	(
-	void
-	)
-{
-	GlobalFuncs_t *func = &GlobalFuncs[ m_Think[ m_ThinkLevel ] ];
-
-	if( func->RestartState)
-		( this->*func->RestartState)();
+    entflags &= ~ECF_ACTOR;
 }
 
 /*
 ===============
 Actor::setContentsSolid
-
 ===============
 */
-void Actor::setContentsSolid
-	(
-	void
-	)
+void Actor::setContentsSolid(void)
 {
-	setContents(CONTENTS_NOBOTCLIP);
+    setContents(CONTENTS_NOBOTCLIP);
 }
 
 /*
 ===============
-Actor::InitThinkStates
-
-Initialize think related stuff.
+Actor::EndStates
 ===============
 */
-void Actor::InitThinkStates
-	(
-	void
-	)
+void Actor::EndStates(void)
 {
-	for (size_t i = 0; i < NUM_THINKSTATES; i++)
-	{
-		m_ThinkMap[i] = THINK_VOID;
-	}
-	for (size_t i = 0; i < NUM_THINKLEVELS; i++)
-	{
-		m_Think[i] = THINK_VOID;
-		m_ThinkStates[i] = THINKSTATE_VOID;
-	}
-
-
-	m_ThinkMap[THINKSTATE_VOID] = THINK_VOID;
-	m_ThinkMap[THINKSTATE_IDLE] = THINK_IDLE;
-	m_ThinkMap[THINKSTATE_PAIN] = THINK_PAIN;
-	m_ThinkMap[THINKSTATE_KILLED] = THINK_KILLED;
-	m_ThinkMap[THINKSTATE_ATTACK] = THINK_TURRET;
-	m_ThinkMap[THINKSTATE_CURIOUS] = THINK_CURIOUS;
-	m_ThinkMap[THINKSTATE_DISGUISE] = THINK_DISGUISE_SALUTE;
-	m_ThinkMap[THINKSTATE_GRENADE] = THINK_GRENADE;
-	m_ThinkMap[THINKSTATE_NOCLIP] = THINK_NOCLIP;
-
-	m_ThinkLevel = THINKLEVEL_NORMAL;
-	m_ThinkState = THINKSTATE_VOID;
-	m_bDirtyThinkState = false;
-
+    for (int i = 0; i < NUM_THINKLEVELS; i++) {
+        EndState(i);
+    }
 }
 
 /*
 ===============
-Actor::UpdateEyeOrigin
-
-Update eye position.
+Actor::ClearStates
 ===============
 */
-void Actor::UpdateEyeOrigin
-	(
-	void
-	)
+void Actor::ClearStates(void)
 {
-	Vector eyeTag = vec_zero;
-
-	int currLvlTime = level.inttime;
-	int currTime = m_iEyeUpdateTime;
-
-	if (currLvlTime > currTime)
-	{
-
-		m_iEyeUpdateTime = NextUpdateTime(currTime, 100);
-
-		GetTag( "eyes bone", &eyeTag, &m_vEyeDir);
-
-		eyeposition = eyeTag - origin;
-
-		m_vEyeDir[2] = 0.0;
-		VectorNormalizeFast(m_vEyeDir);
-
-		if (eyeposition[0] < -10.5)
-		{
-			eyeposition[0] = -10.5;
-		}
-		if (eyeposition[0] > 10.5)
-			eyeposition[0] = 10.5;
-
-		if (eyeposition[1] < -10.5)
-		{
-			eyeposition[1] = -10.5;
-		}
-		if (eyeposition[1] > 10.5)
-			eyeposition[1] = 10.5;
-
-		if (eyeposition[2] < 4.5)
-		{
-			eyeposition[2] = 4.5;
-		}
-		if (eyeposition[2] > 89.5)
-			eyeposition[2] = 89.5;
-
-	}
+    for (int i = 0; i < NUM_THINKSTATES; i++) {
+        SetThink((eThinkState)i, THINK_VOID);
+    }
 }
 
 /*
 ===============
-Actor::RequireThink
-
-Do I need to think ?
+Actor::ResolveVoiceType
 ===============
 */
-bool Actor::RequireThink
-	(
-	void
-	)
+void Actor::ResolveVoiceType(void)
 {
-	if(G_GetEntity(0))
-		return ( level.inttime < edict->r.lastNetTime + 60000 );
-	else
-		return false;
-	
+    char validVoice[128];
+
+    if (mVoiceType != -1) {
+        if (m_Team == TEAM_AMERICAN) {
+            for (int i = 0; i < 3; i++) {
+                if (gAmericanVoices[i][0] == mVoiceType) {
+                    return;
+                }
+            }
+
+            validVoice[0] = '\0';
+            for (int i = 0; i < 3; i++) {
+                strcat(validVoice, gAmericanVoices[i]);
+                strcat(validVoice, " ");
+            }
+            Com_Printf("ERROR: Bad voice type %c.  Valid American voicetypes are: %s\n", mVoiceType, validVoice);
+        } else {
+            for (int i = 0; i < 3; i++) {
+                if (gGermanVoices[i][0] == mVoiceType) {
+                    return;
+                }
+            }
+
+            validVoice[0] = '\0';
+            for (int i = 0; i < 3; i++) {
+                strcat(validVoice, gGermanVoices[i]);
+                strcat(validVoice, " ");
+            }
+            Com_Printf("ERROR: Bad voice type %c.  Valid German voicetypes are: %s\n", mVoiceType, validVoice);
+        }
+
+        mVoiceType = -1;
+    }
+
+    if (mVoiceType == -1) {
+        int d = random() * 3.0 * 0.99;
+
+        if (m_Team == TEAM_AMERICAN) {
+            mVoiceType = gAmericanVoices[d][0];
+        } else {
+            mVoiceType = gGermanVoices[d][0];
+        }
+    }
 }
 
 /*
 ===============
-Actor::UpdateEnemy
+Actor::EventStart
 
-Update enemy w.r.t m_iEnemyCheckTime.
+Initialize actor.
 ===============
 */
-void Actor::UpdateEnemy
-	(
-	int iMaxDirtyTime
-	)
+void Actor::EventStart(Event *ev)
 {
-	if (level.inttime > iMaxDirtyTime + m_iEnemyCheckTime)
-		UpdateEnemyInternal();
+    ResolveVoiceType();
+    setSize(MINS, MAXS); //notsure
+
+    droptofloor(16384);
+
+    SetControllerTag(HEAD_TAG, gi.Tag_NumForName(edict->tiki, "Bip01 Head"));
+    SetControllerTag(TORSO_TAG, gi.Tag_NumForName(edict->tiki, "Bip01"));
+    SetControllerTag(ARMS_TAG, gi.Tag_NumForName(edict->tiki, "Bip01 L UpperArm"));
+
+    JoinNearbySquads(1024);
+
+    if (level.Spawned()) {
+        Unregister(STRING_SPAWN);
+    }
 }
 
 /*
 ===============
-Actor::UpdateEnemyInternal
-
-Real update enemy.
+Actor::ClearEnemies
 ===============
 */
-void Actor::UpdateEnemyInternal
-	(
-	void
-	)
+void Actor::ClearEnemies(void)
 {
-	
-	
-	for (Sentient *pSent = level.m_HeadSentient[1 - m_Team]; pSent; pSent = pSent->m_NextSentient)
-	{
-		m_PotentialEnemies.AddPotentialEnemy(pSent);
-	}
-
-	m_PotentialEnemies.CheckEnemies(this);
-	
-	if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy())
-		SetEnemy(m_PotentialEnemies.GetCurrentEnemy(), false);
-
-	m_fNoticeTimeScale += (level.inttime - m_iEnemyCheckTime) / 10000;
-
-	if (m_fNoticeTimeScale > m_fMaxNoticeTimeScale)
-		m_fNoticeTimeScale = m_fMaxNoticeTimeScale;
-
-	m_iEnemyCheckTime = level.inttime;
-}
-
-/*
-===============
-Actor::SetEnemy
-
-Set current enemy.
-===============
-*/
-void Actor::SetEnemy
-	(
-	Sentient *pEnemy,
-	bool bForceConfirmed
-	)
-{
-	if (pEnemy == m_Enemy)
-	{
-		return;
-	}
-
-	if (m_Enemy)
-	{
-		m_Enemy->m_iAttackerCount--;
-	}
-	m_bNewEnemy = m_Enemy == NULL;
-	//delete m_Enemy;
-
-	m_Enemy = pEnemy;
-
-	m_iEnemyChangeTime = level.inttime;
-
-	if (m_Enemy)
-	{
-		Event e1(EV_Actor_ShareEnemy);
-		//FIXME: macro
-		PostEvent(e1, 0.75);
-
-		if (m_Enemy->m_bHasDisguise)
-		{
-			if (level.inttime > m_iEnemyVisibleCheckTime)
-			{
-				//this cansee call changes m_bEnemyVisible and m_bEnemyInFOV
-				//FIXME: macro
-				CanSee(m_Enemy, 0, 0.828 * world->farplane_distance, false);
-			}
-		}
-
-		m_bEnemyIsDisguised = m_Enemy->m_bHasDisguise && (m_Enemy->m_bIsDisguised || !m_bEnemyVisible);
-
-		SetEnemyPos(m_Enemy->origin);
-
-		m_Enemy->m_iAttackerCount++;
-
-		if (bForceConfirmed)
-		{
-			m_PotentialEnemies.ConfirmEnemy(this, m_Enemy);
-		}
-	}
-}
-
-/*
-===============
-Actor::SetEnemyPos
-
-Update stored enemy position information.
-===============
-*/
-void Actor::SetEnemyPos
-(
-	Vector vPos
-)
-{
-	if (m_vLastEnemyPos != vPos)
-	{
-		m_iLastEnemyPosChangeTime = level.inttime;
-		m_vLastEnemyPos = vPos;
-		mTargetPos = m_vLastEnemyPos;
-		if (m_Enemy)
-		{
-			mTargetPos += m_Enemy->eyeposition;
-		}
-		else
-		{
-			mTargetPos.z += 88;
-		}
-
-		if (mTargetPos.z - EyePosition().z < 128)
-		{
-			mTargetPos.z -= 16;
-		}
-	}
-}
-
-/*
-===============
-Actor::ResetBodyQueue
-
-Clear body queue.
-Called upon Level::Cleanup()
-===============
-*/
-void Actor::ResetBodyQueue
-	(
-	void
-	)
-{
-	//weird useless loop ?
-
-	for (int i = MAX_BODYQUEUE-1; i >= 0; i--)
-	{
-		//do nothing.
-	}
-	//mBodyQueue
-	//this resets curBody, but all the magic happens in AddToBodyQue
-	mCurBody = 0;
-}
-
-/*
-===============
-Actor::AddToBodyQue
-
-Add this to body queue.
-===============
-*/
-void Actor::AddToBodyQue
-	(
-	void
-	)
-{
-	SafePtr<Actor> lastActor = mBodyQueue[mCurBody + 3];
-	
-
-
-	if (lastActor)
-	{
-		Event ev(EV_Remove);
-		lastActor->PostEvent(ev, 0);
-	}
-
-	mBodyQueue[mCurBody] = this;
-
-	//update current body index
-	mCurBody = (mCurBody + 1) % 5;
-	
-}
-
-/*
-===============
-Actor::GetAntiBunchPoint
-
-===============
-*/
-Vector Actor::GetAntiBunchPoint
-	(
-	void
-	)
-{
-	int count = 0;
-	Vector ret = vec_origin;
-	if (m_pNextSquadMate != this)
-	{
-		for (auto pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate)
-		{
-
-			Vector dist = origin - pSquadMate->origin;
-			float distSq = dist * dist;
-			if (distSq != 0)
-			{
-				if (Square(m_fInterval) > distSq)
-				{
-					count++;
-					ret += origin + (dist/sqrt(distSq)) * (m_fInterval - sqrt(distSq));
-				}
-			}
-		}
-
-		if (count)
-		{
-			if (count != 1)
-			{
-				ret /= count;
-			}
-		}
-		else
-		{
-			ret = origin;
-		}
-	}
-	return ret;
-}
-
-/*
-===============
-Actor::InitVoid
-
-Init void global func
-===============
-*/
-void Actor::InitVoid
-	(
-	GlobalFuncs_t *func
-	)
-{
-	func->IsState = &Actor::IsVoidState;
-}
-
-/*
-===============
-Actor::DumpCallTrace
-
-Dump useful debug info.
-===============
-*/
-const char *Actor::DumpCallTrace
-	(
-	const char *pszFmt,
-	...
-	) const
-{
-	cvar_t *sv_mapname;
-	tm *ptm; 
-	time_t t;
-	Vector vPlayer = vec_zero;
-	char szFile[64];
-	int i2;
-	//int i1;
-	int i;
-	char szTemp[65536];
-	char szTemp2[1024];
-
-	va_list va;
-	
-	va_start(va, pszFmt);
-	
-	sv_mapname = gi.Cvar_Get("mapname", "unknown", 0);
-
-	Player *p = (Player *)G_GetEntity(0);
-	if (p)
-	{
-		vPlayer = p->origin;
-	}
-
-	i = sprintf(
-		szTemp,
-		"map = %s\n"
-		"time = %i (%i:%02i)\n"
-		"entnum = %i, targetname = '%s'\n"
-		"origin = (%g %g %g)\n"
-		"think = %s, thinkstate = %s\n"
-		"type_idle = %s\n"
-		"type_attack = %s\n"
-		"m_State = %i, m_pszDebugState = %s\n"
-		"player is at (%g %g %g)\n"
-		"--------------------------------------\n",
-		sv_mapname->string,
-		level.inttime,
-		level.inttime / 60000,
-		level.inttime / 1000 - 60 * (level.inttime / 60000),
-		entnum,
-		targetname.c_str(),
-		origin[0],
-		origin[1],
-		origin[2],
-		ThinkName().c_str(),
-		ThinkStateName().c_str(),
-		Director.GetString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]).c_str(),
-		Director.GetString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]).c_str(),
-		m_State,
-		m_pszDebugState,
-		vPlayer[0],
-		vPlayer[1],
-		vPlayer[2]);
-
-	if (pszFmt)
-	{
-		i2 = i + vsprintf(&szTemp[i], pszFmt, va);
-	}
-	if (i2 != i)
-	{
-		strcpy(&szTemp[i2], "\n--------------------------------------\n");
-	}
-
-	t = time(0);
-	ptm = localtime(&t);
-	sprintf(
-		szFile,
-		"main\\ai_trace_%s_%i_%i_%02i%02i.log",
-		sv_mapname->string,
-		ptm->tm_mon + 1,
-		ptm->tm_mday,
-		ptm->tm_hour,
-		ptm->tm_min);
-
-	for (i=0; szFile[i]; i++)
-	{
-		if (szFile[i] == '\\' || szFile[i] == '/')
-			szFile[i] = '_';
-	}
-	sprintf(szTemp2, "Include '%s' in your bug report!", szFile);
-	//PreAssertMessage:
-	fprintf(stderr, "IMPORTANT: %s\n", szTemp2);
-	
-	va_end(va);
-
-	return ::va(
-		"\n"
-		"\t-------------------------- IMPORTANT REMINDER --------------------------\n"
-		"\n"
-		"\tinclude '%s' in your bug report! \n"
-		"\n"
-		"\t----------------------- END IMPORTANT REMINDER -----------------------\n"
-		"\n"
-		"%s",
-		szFile,
-		szTemp);
-}
-
-
-/*
-===============
-Actor::Init
-
-Initialize global actor variables.
-Called from G_InitGame()
-===============
-*/
-void Actor::Init
-	(
-	void
-	)
-{
-	g_showinfo = gi.Cvar_Get("g_showinfo", "0", 0);
-
-	for (int i = 0; i < NUM_THINKS; i++)
-	{
-		GlobalFuncs[i].ThinkState = NULL;
-		GlobalFuncs[i].BeginState = NULL;
-		GlobalFuncs[i].ResumeState = NULL;
-		GlobalFuncs[i].EndState = NULL;
-		GlobalFuncs[i].SuspendState = NULL;
-		GlobalFuncs[i].RestartState = &Actor::DefaultRestart;
-		GlobalFuncs[i].FinishedAnimation = NULL;
-		GlobalFuncs[i].PostShoot = NULL;
-		GlobalFuncs[i].Pain = &Actor::DefaultPain;
-		GlobalFuncs[i].Killed = &Actor::DefaultKilled;
-		GlobalFuncs[i].PassesTransitionConditions = NULL;
-		GlobalFuncs[i].ShowInfo = NULL;
-		GlobalFuncs[i].ReceiveAIEvent = &Actor::DefaultReceiveAIEvent;
-		GlobalFuncs[i].IsState = NULL;
-		GlobalFuncs[i].PathnodeClaimRevoked = NULL;
-	}
-
-	InitVoid(&GlobalFuncs[THINK_VOID]);
-	InitTurret(&GlobalFuncs[THINK_TURRET]);
-	InitCover(&GlobalFuncs[THINK_COVER]);
-	InitPatrol(&GlobalFuncs[THINK_PATROL]);
-	InitRunner(&GlobalFuncs[THINK_RUNNER]);
-	InitPain(&GlobalFuncs[THINK_PAIN]);
-	InitKilled(&GlobalFuncs[THINK_KILLED]);
-	InitIdle(&GlobalFuncs[THINK_IDLE]);
-	InitCurious(&GlobalFuncs[THINK_CURIOUS]);
-	InitDisguiseSalute(&GlobalFuncs[THINK_DISGUISE_SALUTE]);
-	InitDisguiseSentry(&GlobalFuncs[THINK_DISGUISE_SENTRY]);
-	InitDisguiseOfficer(&GlobalFuncs[THINK_DISGUISE_OFFICER]);
-	InitDisguiseRover(&GlobalFuncs[THINK_DISGUISE_ROVER]);
-	InitDisguiseNone(&GlobalFuncs[THINK_DISGUISE_NONE]);
-	InitAlarm(&GlobalFuncs[THINK_ALARM]);
-	InitGrenade(&GlobalFuncs[THINK_GRENADE]);
-	InitMachineGunner(&GlobalFuncs[THINK_MACHINEGUNNER]);
-	InitDogIdle(&GlobalFuncs[THINK_DOG_IDLE]);
-	InitDogAttack(&GlobalFuncs[THINK_DOG_ATTACK]);
-	InitDogCurious(&GlobalFuncs[THINK_DOG_CURIOUS]);
-	InitAnim(&GlobalFuncs[THINK_ANIM]);
-	InitAnimCurious(&GlobalFuncs[THINK_ANIM_CURIOUS]);
-	InitAim(&GlobalFuncs[THINK_AIM]);
-	InitBalconyIdle(&GlobalFuncs[THINK_BALCONY_IDLE]);
-	InitBalconyCurious(&GlobalFuncs[THINK_BALCONY_CURIOUS]);
-	InitBalconyAttack(&GlobalFuncs[THINK_BALCONY_ATTACK]);
-	InitBalconyDisguise(&GlobalFuncs[THINK_BALCONY_DISGUISE]);
-	InitBalconyGrenade(&GlobalFuncs[THINK_BALCONY_GRENADE]);
-	InitBalconyPain(&GlobalFuncs[THINK_BALCONY_PAIN]);
-	InitBalconyKilled(&GlobalFuncs[THINK_BALCONY_KILLED]);
-	InitWeaponless(&GlobalFuncs[THINK_WEAPONLESS]);
-	InitNoClip(&GlobalFuncs[THINK_NOCLIP]);
-	InitDead(&GlobalFuncs[THINK_DEAD]);
-	
-
-	
-	AddWaitTill(STRING_TRIGGER);
-	AddWaitTill(STRING_MOVE);
-	AddWaitTill(STRING_ANIMDONE);
-	AddWaitTill(STRING_VISIBLE);
-	AddWaitTill(STRING_UPPERANIMDONE);
-	AddWaitTill(STRING_SAYDONE);
-	AddWaitTill(STRING_FLAGGEDANIMDONE);
-	AddWaitTill(STRING_DEATH);
-	AddWaitTill(STRING_PAIN);
-	AddWaitTill(STRING_HASENEMY);
-	AddWaitTill(STRING_MOVEDONE);
-	AddWaitTill(STRING_SOUNDDONE);
-	AddWaitTill(STRING_TURNDONE);
-
-	gi.DPrintf("actor waittills registered\n");
-
-	if (developer->integer)
-	{
-		Com_Printf("sizeof(Actor) == %zi\n", sizeof(Actor));
-		//FIXME: magic ??
-		Com_Printf("Magic sizeof actor number: %zd\n", sizeof(Actor));
-	}
-}
-
-/*
-===============
-Actor::FixAIParameters
-
-Fix path related parameters.
-===============
-*/
-void Actor::FixAIParameters
-	(
-	void
-	)
-{
-	//FIXME: needs revision(silly mistakes)
-
-	float distmin, distmin2, distmax;
-	if (m_pTetherEnt)
-	{
-		float leash = 64;
-		if ( m_pTetherEnt->IsSubclassOfEntity() )
-		{
-			leash = m_pTetherEnt->angles.y - m_pTetherEnt->origin.y + m_pTetherEnt->angles.z + m_pTetherEnt->origin.z;
-		}
-		if ( leash <= m_fLeash)
-		{
-			distmin = m_fLeash;
-		}
-		else
-		{
-			Com_Printf("^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    increasing leash from %g to %g.\n"
-				"^~^~^ Leash must be larger than the size of the entity to which an AI is tethered.\n"
-				"\n",
-				entnum,
-				radnum,
-				targetname.c_str(),
-				m_fLeash,
-				leash);
-			m_fLeash = leash;
-			distmin = leash;
-			m_fLeashSquared = Square(leash);
-		}
-	}
-	else
-	{
-		distmin = m_fLeash;
-	}
-	if (m_fMinDistance <= distmin)
-	{
-		distmax = m_fMinDistance;
-	}
-	else
-	{
-		Com_Printf("^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing mindist from %g to %g to match leash.\n"
-			"^~^~^ Leash must be greater than mindist, or the AI will want to both run away and stay put.\n"
-			"\n",
-			entnum,
-			radnum,
-			targetname.c_str(),
-			m_fMinDistance,
-			distmin);
-		m_fMinDistance = distmin;
-		distmax = distmin;
-		m_fMinDistanceSquared = distmin * distmin;
-	}
-	distmax += 128;
-	if (distmax - 1 > m_fMaxDistance)
-	{
-		Com_Printf("^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    increasing maxdist from %g to %g to exceed mindist.\n"
-			"^~^~^ Maxdist should be %i greater than mindist, or the AI will want to both run away and charge, or just do oscillatory behavior.\n"
-			"\n",
-			entnum,
-			radnum,
-			targetname.c_str(),
-			m_fMaxDistance,
-			distmax,
-			128);
-		
-		m_fMaxDistance = distmax;
-		m_fMaxDistanceSquared = distmax * distmax;
-	}
-	if (world->farplane_distance > 0)
-	{
-		//FIXME: macro and floats
-		if (m_fMaxDistance > world->farplane_distance * 0.828 +1)
-		{
-			Com_Printf(
-				"^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing maxdist from %g to %g to be %g%% of farplane.\n"
-				"^~^~^ Maxdist should be this distance within fog, or AI will be able to see and attack through fog.\n"
-				"\n",
-				entnum,
-				radnum,
-				targetname.c_str(),
-				m_fMaxDistance,
-				world->farplane_distance * 0.828,
-				2.0);
-			distmin2 = m_fMinDistance;
-			m_fMaxDistance = world->farplane_distance * 0.828;
-			m_fMaxDistanceSquared = m_fMaxDistance * m_fMaxDistance;
-			if (distmin2 + 128.0 - 1.0 > m_fMaxDistance)
-			{
-				Com_Printf(
-					"^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing mindist from %g to %g to be less than maxdist "
-					"after fog adjustment.\n"
-					"\n",
-					entnum,
-					radnum,
-					targetname.c_str(),
-					distmin2,
-					m_fMaxDistance <= 128 ? 0 : m_fMaxDistance - 128);
-				m_fMinDistance = m_fMaxDistance - 128.0;
-				if (m_fMaxDistance - 128.0 < 0)
-				{
-					m_fMinDistance = 0.0;
-				}
-				m_fMinDistanceSquared = Square(m_fMinDistance);
-			}
-		}
-	}
-}
-
-
-/*
-===============
-Actor::AttackEntryAnimation
-
-Returns true if actor stands/draws his weapon.
-===============
-*/
-bool Actor::AttackEntryAnimation
-	(
-	void
-	)
-{
-	if (m_Enemy)
-	{
-
-		if (level.inttime >= level.m_iAttackEntryAnimTime + 3000)
-		{
-			float distSq = (m_Enemy->origin - origin).lengthXYSquared();
-
-			if (m_bNoSurprise || distSq >= Square(256))
-			{
-				if (distSq > Square(1024) && !(rand() & 3))
-				{
-					if (m_pNextSquadMate != this)
-					{
-						for (auto pSquadMate = m_pNextSquadMate; ; pSquadMate = pSquadMate->m_pNextSquadMate)
-						{
-							if (Square(m_fInterval) * Square(2) > (pSquadMate->origin - origin).lengthSquared())
-							{
-								break;
-							}
-							if (pSquadMate == this)
-							{
-								if (m_bNewEnemy)
-									Anim_Say(STRING_ANIM_SAY_SIGHTED_SCR, 200, false);
-
-								m_bNoSurprise = true;
-								m_bNewEnemy = false;
-								return false;
-							}
-						}
-						vec2_t vDelta;
-						vDelta[0] = m_Enemy->origin.x - origin.x;
-						vDelta[1] = m_Enemy->origin.y - origin.y;
-						if (vDelta[0] != 0 || vDelta[1] != 0)
-						{
-							SetDesiredYawDir(vDelta);
-						}
-
-						SetDesiredLookDir(m_Enemy->origin - origin);
-
-						m_csNextAnimString = STRING_ANIM_STANDIDENTIFY_SCR;
-
-						m_bNextForceStart = true;
-						m_bNoSurprise = true;
-						m_bNewEnemy = false;
-
-						return true;
-
-					}
-				}
-			}
-			else
-			{
-				//FIXME: macro
-				if ( rand() > distSq  * 0.0026041667) //rand() / 0x17F
-				{
-					//FIXME: macro
-					StartAnimation(1, STRING_ANIM_STANDSHOCK_SCR);
-					m_bNoSurprise = true;
-					m_bNewEnemy = false;
-
-					return true;
-				}
-			}
-		}
-
-		//FIXME: macro
-		if (m_bNewEnemy)
-			Anim_Say(STRING_ANIM_SAY_SIGHTED_SCR, 200, false);
-
-		m_bNoSurprise = true;
-		m_bNewEnemy = false;
-
-	}
-	return false;
-}
-
-/*
-===============
-Actor::CheckForThinkStateTransition
-
-Check for all thinkstates transitions.
-===============
-*/
-void Actor::CheckForThinkStateTransition
-	(
-	void
-	)
-{
-	if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL))
-	{
-		if (!m_bEnableEnemy)
-		{
-			CheckForTransition(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-		}
-		else
-		{
-			if (!CheckForTransition(THINKSTATE_ATTACK, THINKLEVEL_NORMAL))
-			{
-
-				if (!CheckForTransition(THINKSTATE_DISGUISE, THINKLEVEL_NORMAL))
-				{
-
-					if (CheckForTransition(THINKSTATE_CURIOUS, THINKLEVEL_NORMAL))
-					{
-						m_pszDebugState = "from_sight";
-					}
-					else
-					{
-						CheckForTransition(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-					}
-				}
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::CheckForTransition
-
-Check for thinkstate transition.
-===============
-*/
-bool Actor::CheckForTransition
-	(
-	eThinkState state,
-	eThinkLevel level
-	)
-{
-	GlobalFuncs_t *func;
-
-	if( m_ThinkStates[ level ] != state )
-	{
-		func = &GlobalFuncs[ m_ThinkMap[ state ] ];
-
-		if( func->PassesTransitionConditions && ( this->*( func->PassesTransitionConditions ) )() )
-		{
-			SetThinkState( state, THINKLEVEL_NORMAL);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-
-/*
-===============
-Actor::PassesTransitionConditions_Grenade
-
-Should actor transition think state to grenade ?
-===============
-*/
-bool Actor::PassesTransitionConditions_Grenade
-	(
-	void
-	)
-{
-	if( !m_bLockThinkState && m_bEnableEnemy && m_pGrenade )
-	{
-		return m_fGrenadeAwareness >= random();
-	}
-
-	return false;
-}
-
-/*
-===============
-Actor::PassesTransitionConditions_Attack
-
-Should actor transition think state to attack ?
-===============
-*/
-bool Actor::PassesTransitionConditions_Attack
-	(
-	void
-	)
-{
-	UpdateEnemy(0);
-
-	if( m_bLockThinkState )
-		return false;
-
-	if( m_Enemy && !( m_Enemy->flags & FL_NOTARGET ) )
-	{
-		if(EnemyIsDisguised())
-		{
-				return true;
-		}
-
-		if( m_PotentialEnemies.GetCurrentVisibility() > 0.999f )
-			return true;
-	}
-
-	return false;
-}
-
-/*
-===============
-Actor::PassesTransitionConditions_Disguise
-
-Should actor transition think state to disguise ?
-===============
-*/
-bool Actor::PassesTransitionConditions_Disguise
-	(
-	void
-	)
-{
-	if( m_bLockThinkState )
-		return false;
-
-	if( m_iNextDisguiseTime > level.inttime )
-		return false;
-
-	m_iNextDisguiseTime = level.inttime + 200;
-
-	UpdateEnemy(200);
-
-	if( !m_Enemy )
-		return false;
-
-	if(EnemyIsDisguised())
-	{
-		{
-			if( m_PotentialEnemies.GetCurrentVisibility() > 0.999f )
-			{
-				if( fabs( m_Enemy->origin[ 2 ] - origin[ 2 ] ) <= 48.0f )
-				{
-					vec2_t delta;
-					float fHorzDistanceSquared;
-
-					VectorSub2D(m_Enemy->origin, origin, delta);
-
-					fHorzDistanceSquared = VectorLength2DSquared(delta);
-
-					if(fHorzDistanceSquared > Square(32) && fHorzDistanceSquared < m_fMaxDisguiseDistSquared)
-					{
-						Player *player = ( Player * )G_GetEntity( 0 );
-						Vector pos = EyePosition();
-
-						return G_SightTrace(
-							pos,
-							vec_zero,
-							vec_zero,
-							player->centroid,
-							this,
-							player,
-							MASK_TRANSITION,
-							qfalse,
-							"Actor::PassesTransitionConditions_Disguise" );
-					}
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-/*
-===============
-Actor::PassesTransitionConditions_Curious
-
-Should actor transition think state to curious ?
-===============
-*/
-bool Actor::PassesTransitionConditions_Curious
-	(
-	void
-	)
-{
-	UpdateEnemy(200);
-
-	if( m_bLockThinkState )
-		return false;
-
-	if( !m_Enemy && m_iCuriousTime )
-	{
-		SetCuriousAnimHint(6);
-		return true;
-	}
-
-	if(m_Enemy && !EnemyIsDisguised() && m_PotentialEnemies.GetCurrentVisibility() <= 0.999f )
-	{
-		//THINKSTATE_CURIOUS
-		SetCuriousAnimHint(6);
-		return true;
-	}
-
-	return false;
-}
-
-/*
-===============
-Actor::UpdateEnableEnemy
-
-Enable/disable enemy based on desired value.
-Can be changed from script.
-===============
-*/
-void Actor::UpdateEnableEnemy
-	(
-	void
-	)
-{
-	if (m_bEnableEnemy != m_bDesiredEnableEnemy)
-	{
-		m_bEnableEnemy = m_bDesiredEnableEnemy;
-		if (m_bDesiredEnableEnemy)
-		{
-			SetLeashHome(origin);
-		}
-		else
-		{
-			if (m_ThinkStates[THINKLEVEL_NORMAL] <= THINKSTATE_DISGUISE)
-			{
-				SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-			}
-			SetEnemy(NULL, false);
-		}
-	}
-}
-
-/*
-===============
-Actor::ThinkStateTransitions
-
-Transition think state and level.
-Called when thinkstate/level are change.
-===============
-*/
-void Actor::ThinkStateTransitions
-	(
-	void
-	)
-{
-	int newThinkLevel;
-	int newThinkState;
-
-	//GlobalFuncs_t *func;// = &GlobalFuncs[m_Think[m_ThinkLevel]];
-
-	//loop on all think levels.
-	for (newThinkLevel = NUM_THINKLEVELS -1; newThinkLevel >= 0 ; newThinkLevel--)
-	{
-		newThinkState = m_ThinkStates[newThinkLevel];
-		//a new think level is found if it's think state is not THINKSTATE_VOID
-		if (newThinkState != THINKSTATE_VOID)
-		{
-			break;
-		}
-	}
-
-	if (m_ThinkMap[newThinkState] == m_Think[m_ThinkLevel])
-	{
-		if (newThinkLevel != m_ThinkLevel || m_ThinkState != newThinkState)
-		{
-			m_ThinkLevel = (eThinkLevel)newThinkLevel;
-			m_ThinkState = (eThinkState)newThinkState;
-			m_Think[newThinkLevel] = m_ThinkMap[newThinkState];
-		}
-		else
-		{
-			RestartState();
-		}
-	}
-	else
-	{
-		if (newThinkLevel > THINKLEVEL_NORMAL)
-		{
-			for (int i = 0 ; i < newThinkLevel; i++)
-			{
-				if (m_ThinkStates[i] == THINKSTATE_VOID)
-					EndState(i);
-			}
-		}
-
-		if (newThinkLevel > m_ThinkLevel)
-		{
-			SuspendState();
-
-			m_ThinkLevel = (eThinkLevel)newThinkLevel;
-			m_ThinkState = m_ThinkStates[newThinkLevel];
-			m_Think[newThinkLevel] = m_ThinkMap[m_ThinkState];
-
-			BeginState();
-			m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
-		}
-		else
-		{
-			EndState(m_ThinkLevel);
-
-			if (newThinkLevel == m_ThinkLevel)
-			{
-				m_ThinkState = m_ThinkStates[newThinkLevel];
-				m_Think[newThinkLevel] = m_ThinkMap[m_ThinkState];
-
-				BeginState();
-				m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
-			}
-			else
-			{
-				m_ThinkLevel = (eThinkLevel)newThinkLevel;
-				m_ThinkState = m_ThinkStates[newThinkLevel];
-
-
-				if (m_Think[newThinkLevel] != m_ThinkMap[m_ThinkState])
-				{
-					EndState(newThinkLevel);
-
-
-					m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
-
-					BeginState();
-					m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
-				}
-				else
-				{
-					ResumeState();
-				}
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::TransitionState
-
-===============
-*/
-void Actor::TransitionState
-	(
-	int iNewState,
-	int iPadTime
-	)
-{
-	//fixme: this is an inline function.
-	m_State = iNewState;
-	m_iStateTime = level.inttime + iPadTime;
-}
-
-/*
-===============
-Actor::ChangeAnim
-
-Change current animation.
-===============
-*/
-
-void Actor::ChangeAnim
-(
-	void
-)
-{
-	bool v3; // zf
-
-	if (m_pAnimThread)
-	{
-		if (g_scripttrace->integer)
-		{
-			if (m_pAnimThread->CanScriptTracePrint())
-				Com_Printf("--- Change Anim\n");
-		}
-		m_pAnimThread->AbortRegistration(
-			STRING_EMPTY,
-			this);
-		ScriptClass * sc = m_pAnimThread->GetScriptClass();
-		if (sc)
-		{
-			delete sc;
-		}
-		Com_Printf("ChangeAnim: m_pAnimThread aborted\n");
-	}
-
-	if (m_ThinkState != 4)                                // THINKSTATE_ATTACK
-	{
-		if (m_ThinkState <= 4)                              // THINKSTATE_ATTACK
-		{
-			if (m_ThinkState >= 2)                            // THINKSTATE_PAIN
-			{
-				if (m_bMotionAnimSet)
-					AnimFinished(m_iMotionSlot, true);
-				if (m_bActionAnimSet)
-					AnimFinished(m_iActionSlot, true);
-				v3 = m_bSayAnimSet == 0;
-			LABEL_13:
-				if (v3)
-					goto LABEL_14;
-				goto LABEL_20;
-			}
-			goto LABEL_21;
-		}
-		if (m_ThinkState != 7)                              // m_ThinkState != THINKSTATE_GRENADE
-		{
-		LABEL_21:
-			if (m_bMotionAnimSet)
-			{
-				if (!m_bLevelMotionAnim)
-					AnimFinished(m_iMotionSlot, true);
-			}
-			if (m_bActionAnimSet)
-			{
-				if (!m_bLevelActionAnim)
-					AnimFinished(m_iActionSlot, true);
-			}
-			if (m_bSayAnimSet && !m_bLevelSayAnim)
-			{
-			LABEL_20:
-				AnimFinished(m_iSaySlot, true);
-				goto LABEL_14;
-			}
-			goto LABEL_14;
-		}
-	}
-	if (m_bMotionAnimSet)
-		AnimFinished(m_iMotionSlot, true);
-	if (m_bActionAnimSet)
-		AnimFinished(m_iActionSlot, true);
-	if (m_bSayAnimSet)
-	{
-		v3 = m_bLevelSayAnim == 2;
-		goto LABEL_13;
-	}
-LABEL_14:
-	m_fCrossblendTime = 0.5;
-	m_pAnimThread = m_Anim.Create(this);
-	if (m_pAnimThread)
-	{
-		if (g_scripttrace->integer)
-		{
-			if (m_pAnimThread->CanScriptTracePrint())
-				Com_Printf("+++ Change Anim\n");
-		}
-		m_pAnimThread->Register(STRING_EMPTY, this);
-
-		m_pAnimThread->StartTiming();
-		Com_Printf("ChangeAnim: m_pAnimThread started\n");
-	}
-}
-/*
-void Actor::ChangeAnim
-	(
-	void
-	)
-{
-	if (m_pAnimThread)
-	{
-		if (g_scripttrace->integer && m_pAnimThread->CanScriptTracePrint())
-		{
-			Com_Printf("--- Change Anim\n");
-		}
-		m_pAnimThread->AbortRegistration(STRING_EMPTY, this);
-		ScriptClass * sc = m_pAnimThread->GetScriptClass();
-		if (sc)
-		{
-			delete sc;
-		}
-		Com_Printf("ChangeAnim: m_pAnimThread aborted\n");
-	}
-	
-	if (m_ThinkState != THINKSTATE_ATTACK)
-	{
-		if (m_ThinkState > THINKSTATE_ATTACK)
-		{
-			if (m_ThinkState != THINKSTATE_GRENADE)
-			{
-				if (m_bMotionAnimSet && !m_bLevelMotionAnim)
-					AnimFinished(m_iMotionSlot, true);
-				if (m_bActionAnimSet && !m_bLevelActionAnim)
-					AnimFinished(m_iActionSlot, true);
-				if (m_bSayAnimSet && !m_bLevelSayAnim)
-					AnimFinished(m_iSaySlot, true);
-			}
-			else
-			{
-				if (m_bMotionAnimSet)
-					AnimFinished(m_iMotionSlot, true);
-				if (m_bActionAnimSet)
-					AnimFinished(m_iActionSlot, true);
-				if (m_bSayAnimSet && m_bLevelSayAnim != 2)
-					AnimFinished(m_iSaySlot, true);
-
-			}
-
-		}
-		else
-		{
-			if (m_ThinkState < THINKSTATE_PAIN)
-			{
-				if (m_bMotionAnimSet && !m_bLevelMotionAnim)
-					AnimFinished(m_iMotionSlot, true);
-				if (m_bActionAnimSet && !m_bLevelActionAnim)
-					AnimFinished(m_iActionSlot, true);
-				if (m_bSayAnimSet && !m_bLevelSayAnim)
-					AnimFinished(m_iSaySlot, true);
-			}
-			else
-			{
-				if (m_bMotionAnimSet)
-					AnimFinished(m_iMotionSlot, true);
-				if (m_bActionAnimSet)
-					AnimFinished(m_iActionSlot, true);
-				if (m_bSayAnimSet)
-					AnimFinished(m_iSaySlot, true);
-			}
-
-		}
-
-	}
-	else
-	{
-		if (m_bMotionAnimSet)
-			AnimFinished(m_iMotionSlot, true);
-		if (m_bActionAnimSet)
-			AnimFinished(m_iActionSlot, true);
-		if (m_bSayAnimSet && m_bLevelSayAnim != 2)
-			AnimFinished(m_iSaySlot, true);
-	}
-
-	//FIXME: macro
-	m_fCrossblendTime = 0.5;
-
-	m_pAnimThread = m_Anim.Create(this);
-
-	if (m_pAnimThread)
-	{
-		if (g_scripttrace->integer)
-		{
-			if (m_pAnimThread->CanScriptTracePrint())
-				Com_Printf("+++ Change Anim\n");
-		}
-		m_pAnimThread->Register(STRING_EMPTY, this);
-
-		m_pAnimThread->StartTiming();
-		Com_Printf("ChangeAnim: m_pAnimThread started\n");
-	}
-}
-*/
-
-
-/*
-===============
-Actor::UpdateSayAnim
-
-Update say animation.
-===============
-*/
-void Actor::UpdateSayAnim
-	(
-	void
-	)
-{
-	gi.DPrintf("Actor::UpdateSayAnim 1\n");
-
-	if (m_ThinkState > THINKSTATE_KILLED)
-	{
-		gi.DPrintf("Actor::UpdateSayAnim 2\n");
-		int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(m_csSayAnim).c_str());
-		if (animnum == -1)
-		{
-			return;
-		}
-		gi.DPrintf("Actor::UpdateSayAnim 3\n");
-
-		int flags = gi.Anim_FlagsSkel(edict->tiki, animnum);
-
-		//FIXME: macro
-		if (flags & 256)
-		{
-			gi.DPrintf("Actor::UpdateSayAnim 4\n");
-			if ( !IsAttackState(m_ThinkState) && !IsGrenadeState(m_ThinkState) )
-			{
-				ChangeActionAnim();
-				if (flags & ANIM_NOACTION)
-				{
-					ChangeMotionAnim();
-
-					StartMotionAnimSlot(0, animnum, 1);
-
-					m_bLevelActionAnim = true;
-					m_bLevelMotionAnim = true;
-
-					m_iMotionSlot = m_iActionSlot = GetMotionSlot(0);
-				}
-				else
-				{
-					m_bActionAnimSet = true;
-
-					StartActionAnimSlot(animnum);
-
-					m_bLevelActionAnim = true;
-
-					m_iActionSlot = GetActionSlot(0);
-				}
-				ChangeSayAnim();
-				m_bSayAnimSet = true;
-				m_bLevelSayAnim = m_bNextLevelSayAnim;
-				m_bNextLevelSayAnim = 0;
-				m_iSaySlot = m_iActionSlot;
-				return;
-			}
-			gi.DPrintf("Actor::UpdateSayAnim 4\n");
-		}
-		else if (m_bNextLevelSayAnim == 2 || (!IsAttackState(m_ThinkState) && !IsGrenadeState(m_ThinkState)) )
-		{
-			gi.DPrintf("Actor::UpdateSayAnim 6\n");
-			ChangeSayAnim();
-			m_bSayAnimSet = true;
-			StartSayAnimSlot(animnum);
-			m_bLevelSayAnim = m_bNextLevelSayAnim;
-			m_bNextLevelSayAnim = 0;
-			m_iSaySlot = GetSaySlot();
-			gi.DPrintf("Actor::UpdateSayAnim 7\n");
-			return;
-		}
-	}
-
-	if (!m_bSayAnimSet)
-	{
-		Unregister(STRING_SAYDONE);
-		gi.DPrintf("Actor::UpdateSayAnim 8\n");
-	}
-}
-
-/*
-===============
-Actor::UpdateUpperAnim
-
-Update upper animation.
-===============
-*/
-void Actor::UpdateUpperAnim
-	(
-	void
-	)
-{
-	int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(m_csUpperAnim).c_str());
-	if (animnum != -1)
-	{
-		if (IsAttackState(m_ThinkState) || IsGrenadeState(m_ThinkState) || IsKilledState(m_ThinkState) || IsPainState(m_ThinkState))
-		{
-			if (!m_bActionAnimSet)
-			{
-				Unregister(STRING_UPPERANIMDONE);
-			}
-		}
-		else
-		{
-			ChangeActionAnim();
-			
-			m_bActionAnimSet = true;
-
-			StartActionAnimSlot(animnum);
-
-			m_bLevelActionAnim = true;
-			m_iActionSlot = SimpleActor::GetActionSlot(0);
-
-		}
-	}
-}
-
-/*
-===============
-Actor::UpdateAnim
-
-Update animation.
-===============
-*/
-void Actor::UpdateAnim
-	(
-	void
-	)
-{
-	m_bAnimating = true;
-	SimpleActor::UpdateAim();
-	if (SimpleActor::UpdateSelectedAnimation())
-	{
-		Com_Printf("ChangeAnim\n");
-		ChangeAnim();
-	}
-	Director.Unpause();
-	Director.Pause();
-
-	if (m_csSayAnim != STRING_EMPTY)
-	{
-		UpdateSayAnim();
-		m_csSayAnim = STRING_EMPTY;
-	}
-
-	if (m_csUpperAnim != STRING_EMPTY)
-	{
-		UpdateUpperAnim();
-		m_csUpperAnim = STRING_EMPTY;
-	}
-
-	if (!m_bSayAnimSet && !m_bDog)
-	{
-		SimpleActor::UpdateEmotion();
-	}
-
-	//FIXME: macro
-	for (int slot = 0; slot < 14; slot++)
-	{
-
-		//FIXME: better notation
-		if (!((m_bUpdateAnimDoneFlags >> slot) & 1) )
-		{
-			SimpleActor::UpdateAnimSlot(slot);
-		}
-	}
-
-	float fAnimTime, fAnimWeight, total_weight = 0, time = 0;
-	for (int slot = 0; slot < 14; slot++)
-	{
-		if ((m_weightType[slot] == 1 || m_weightType[slot] == 4) && animFlags[slot] & ANIM_LOOP)
-		{
-			UseSyncTime(slot, 1);
-			fAnimTime = AnimTime(slot);
-			fAnimWeight = edict->s.frameInfo[slot].weight;
-			time += fAnimTime * fAnimWeight;
-			if (std::isinf(time))
-			{
-				Com_Printf("ent %i, targetname '%s', anim '%s', slot %i, fAnimTime %f, fAnimWeight %f\n",
-					entnum,
-					targetname.c_str(),
-					AnimName(slot),
-					slot,
-					fAnimTime,
-					fAnimWeight);
-			}
-			total_weight += fAnimWeight;
-		}
-		else
-		{
-			UseSyncTime(slot, 0);
-		}
-	}
-
-	if (total_weight != 0)
-	{
-		SetSyncRate(time / total_weight);
-	}
-
-	PostAnimate();
-}
-
-/*
-===============
-Actor::StoppedWaitFor
-
-Called when stopped wait for an actor.
-===============
-*/
-void Actor::StoppedWaitFor
-(
-	const_str name,
-	bool bDeleting
-)
-{
-	g_iInThinks++;
-
-	GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
-
-	if (func->FinishedAnimation)
-	{
-		(this->*func->FinishedAnimation)();
-	}
-
-	g_iInThinks--;
-}
-
-/*
-===============
-Actor::ValidGrenadePath
-
-Returns true if grenade trajectory is valid.
-i.e grenade can get from vFrom to vTo with vVel with any obstacles.
-===============
-*/
-bool Actor::ValidGrenadePath
-	(
-	const Vector& vFrom,
-	const Vector& vTo,
-	Vector& vVel
-	)
-{
-	//FIXME: macros
-	float fGravity, fTime1, fTime2, fTime3, fTimeLand;
-	Vector mins(-4, -4, -4);
-	Vector maxs(4, 4, 4);
-
-	Vector vPoint1, vPoint2, vPoint3;
-
-	if (vVel.lengthSquared() > 589824)
-	{
-		return false;
-	}
-	fGravity = 0.8 * sv_gravity->value;
-
-	fTime1 = vVel.z * fGravity / 0.5;
-
-	vPoint1.x = vVel.x * fTime1 + vFrom.x;
-	vPoint1.y = vVel.y * fTime1 + vFrom.y;
-	vPoint1.z = vVel.z * fTime1 * 0.75 + vFrom.z;
-
-	maxs.z = fGravity * 0.125 * fTime1 * fTime1 + 4;
-
-	if (ai_debug_grenades->integer)
-	{
-		G_DebugLine(vFrom, vPoint1, 1.0, 0.5, 0.5, 1.0);
-	}
-
-	if (G_SightTrace(vFrom,
-		mins,
-		maxs,
-		vPoint1,
-		this,
-		NULL,
-		//FIXME: macro
-		1107569409,
-		qfalse,
-		"Actor::ValidGrenadePath 1"))
-	{
-		fTime2 = fTime1 + fTime1;
-
-		vPoint2.x = vVel.x * fTime2 + vFrom.x;
-		vPoint2.y = vVel.y * fTime2 + vFrom.y;
-		vPoint2.z = vVel.z * fTime2 * 0.5 + vFrom.z;
-
-		if (ai_debug_grenades->integer)
-		{
-			G_DebugLine(vPoint1, vPoint2, 1.0, 0.5, 0.5, 1.0);
-		}
-		if (G_SightTrace(vPoint1,
-			mins,
-			maxs,
-			vPoint2,
-			this,
-			NULL,
-			//FIXME: macro
-			1107569409,
-			qfalse,
-			"Actor::ValidGrenadePath 2"))
-		{
-			if (fabs(vVel.y) >= fabs(vVel.x))
-			{
-				fTimeLand = (vTo.y - vFrom.y) / vVel.y;
-			}
-			else
-			{
-				fTimeLand = (vTo.x - vFrom.x) / vVel.x;
-			}
-
-			fTime3 = (fTime2 + fTimeLand) / 2;
-			maxs.z = fGravity * 0.03125 * (fTimeLand - fTime2) * (fTimeLand - fTime2) + 4;
-
-
-			vPoint3.x = vVel.x * fTime3 + vFrom.x;
-			vPoint3.y = vVel.y * fTime3 + vFrom.y;
-			vPoint3.z = (vVel.z - fGravity * 0.5 * fTime3) * fTime3 + vFrom.z; 
-			
-			if (ai_debug_grenades->integer)
-			{
-				G_DebugLine(vPoint2, vPoint3, 1.0, 0.5, 0.5, 1.0);
-			}
-			if (G_SightTrace(vPoint2,
-				mins,
-				maxs,
-				vPoint3,
-				this,
-				NULL,
-				//FIXME: macro
-				1107569409,
-				qfalse,
-				"Actor::ValidGrenadePath 3"))
-			{
-
-				if (ai_debug_grenades->integer)
-				{
-					G_DebugLine(vPoint3, vTo, 1.0, 0.5, 0.5, 1.0);
-				}
-				trace_t trace = G_Trace(vPoint3, mins, maxs, vTo, this, 1107569409, qfalse, "Actor::ValidGrenadePath 4");
-				if (!trace.allsolid)
-				{
-					if (trace.ent)
-					{
-						if (trace.ent->entity->IsSubclassOfSentient())
-						{
-							Sentient *sen = (Sentient *)trace.ent->entity;
-							if (sen->m_Team != m_Team)
-							{
-								return true;
-							}
-						}
-
-					}
-				}
-				else if(trace.entityNum == 1022 && trace.plane.normal[2] >= 1)
-				{
-					return true;
-				}
-			}
-		}
-	}
-	return false;
-}
-
-/*
-===============
-Actor::CalcThrowVelocity
-
-Calculates required grenade throw velocity to get grenade from vFrom to vTo.
-===============
-*/
-Vector Actor::CalcThrowVelocity
-	(
-	const Vector& vFrom,
-	const Vector& vTo
-	)
-{
-	
-	Vector ret;
-	Vector vDelta;
-	float v10; // ST0C_4
-	float v11; // fst3
-	//////
-	float fGravity;
-	float fVelHorz;
-	float fVelVert;
-	float fDeltaZ;
-	float fDistance;
-	float fHorzDistSquared;
-	float fOOTime;
-
-	fGravity = 0.8 * sv_gravity->value;
-
-	vDelta = vTo - vFrom;
-
-	fVelHorz = vDelta.x;
-	fVelVert = vDelta.y;
-	fDeltaZ = vDelta.z;
-
-	fHorzDistSquared = fVelVert * fVelVert + fVelHorz * fVelHorz;
-
-	fDistance = sqrt(fDeltaZ * fDeltaZ + fHorzDistSquared);
-
-	// original irl equation: v10 = sqrt(fGravity * 0.5 * fHorzDistSquared / (fDistance * trigMult ))
-	// trigMult = (cos(th)/ tan(al) - sin(th)/tanSquared(al))
-	// al = inital velocity angle with ground plane.
-	// th = angle between vDelta and ground plane.
-	// mohaa devs decided to let trigMult be 1, for the sake of simplicity I guess.
-	v10 = sqrt(fGravity * 0.5 * fHorzDistSquared / fDistance);
-
-
-	// no I dea what this means.
-	// maybe it's related to their angle choice.
-	// calculates the 1/distanceSquared necessary for fOOTime calculation.
-	v11 = (fDistance + fDeltaZ) / (fDistance - fDeltaZ) / fHorzDistSquared;
-
-	// 1/(speed * sqrt(1/distanceSquared))
-	// 1/(speed * 1/distance)
-	// 1/(1/time)
-	// time
-	fOOTime = 1 / (v10 * sqrt(v11));
-
-	ret.z = v10;
-	ret.x = fVelHorz / fOOTime;
-	ret.y = fVelVert / fOOTime;
-	return ret;
-}
-
-/*
-===============
-Actor::CanThrowGrenade
-
-Returns required velocity to throw grenade from vFrom to vTo.
-Or vec_zero if it's not possible.
-===============
-*/
-Vector Actor::CanThrowGrenade
-	(
-	const Vector& vFrom,
-	const Vector& vTo
-	)
-{
-	Vector vVel = vec_zero;
-
-	vVel = CalcThrowVelocity(vFrom, vTo);
-	if ( vVel == vec_zero || !ValidGrenadePath(vFrom, vTo, vVel))
-	{
-		return vec_zero;
-	}
-	else
-	{
-		return vVel;
-	}
-}
-
-/*
-===============
-Actor::CalcRollVelocity
-
-Calculates required grenade roll velocity to get grenade from vFrom to vTo.
-Roll here means a low toss.
-===============
-*/
-Vector Actor::CalcRollVelocity
-	(
-	const Vector& vFrom,
-	const Vector& vTo
-	)
-{
-	float fOOTime, fVelVert, fVelHorz, fGravity;
-	Vector vDelta = vFrom - vTo, vRet;
-
-	// you must throw from above.
-	// start point must be above (higher) than end point.
-	if (vDelta.z > 0)
-	{
-		fGravity = 0.8 * sv_gravity->value;
-
-		// Required down velocity to hit the ground twice as fast as freefall time.
-		vRet.z = sqrt(vDelta.z * fGravity);
-
-
-		
-		// accel = speed / time, hence : time = speed / accel, 0.21961521 is an arbitary scalar.
-		// since the scalar is way less than 1, it will take more time to hit the ground than to arrive to target dest.
-		// this is kinda like a low toss rather than a roll. if I understand correctly.
-		fOOTime = vRet.z / fGravity * 0.21961521;
-
-		// speed = distance / time
-		vRet.x = fVelHorz = -vDelta.x / fOOTime;
-		vRet.y = fVelVert = -vDelta.y / fOOTime;
-
-		
-		return vRet;
-	}
-	else
-	{
-		return vec_zero;
-	}
-}
-
-/*
-===============
-Actor::CanRollGrenade
-
-Returns required velocity to roll grenade from vFrom to vTo.
-Or vec_zero if it's not possible.
-Roll here means a low toss.
-===============
-*/
-Vector Actor::CanRollGrenade
-	(
-	const Vector& vFrom,
-	const Vector& vTo
-	)
-{
-	Vector vVel = vec_zero;
-	vVel = CalcRollVelocity(vFrom, vTo);
-	if (vVel == vec_zero || !ValidGrenadePath(vFrom, vTo, vVel))
-	{
-		return vec_zero;
-	}
-	else
-	{
-		return vVel;
-	}
-}
-
-/*
-===============
-Actor::CanTossGrenadeThroughHint
-
-Returns true if actor can toss grenade through specified hint.
-pvVel and peMode are modified.
-===============
-*/
-bool Actor::CanTossGrenadeThroughHint
-	(
-	GrenadeHint *pHint,
-	const Vector& vFrom,
-	const Vector& vTo,
-	bool bDesperate,
-	Vector *pvVel,
-	eGrenadeTossMode *peMode
-	)
-{
-	float fGravity = 0.8 * sv_gravity->value;
-	float fAngle, fTemp, fTemp2, fTemp3, fTemp4, /*fVelVert, fVelHorz,*/ fRange, fRangeSquared, fDist, fDistSquared, fHeight;
-	bool bSuccess = false;
-
-	Vector vDelta, vHintDelta;
-
-	if (!bDesperate)
-	{
-		vHintDelta = pHint->origin - vFrom;
-		vDelta = vFrom - vTo;
-		
-		fDist = vDelta.lengthXY();
-		fDistSquared = fDist * fDist;
-
-		fRange = vHintDelta.z * fDist - vDelta.z * vHintDelta.lengthXY();
-
-		if (fRange == 0)
-		{
-			return false;
-		}
-		fTemp4 = 1 / fRange;
-		fRange = (fDist - vHintDelta.lengthXY()) / fRange;
-
-		if (fRange <= 0)
-		{
-			return false;
-		}
-
-		fTemp = sqrt(fRange * (fDist * (fGravity * 0.5 * vHintDelta.lengthXY())));
-		fTemp2 = (vHintDelta.z * fDistSquared - vDelta.z * vHintDelta.lengthXYSquared()) * fGravity * 0.5;
-		fTemp3 = fTemp / vHintDelta.lengthXY();
-
-		pvVel->x = vHintDelta.x * fTemp3;
-		pvVel->y = vHintDelta.y * fTemp3;
-		pvVel->z = 0.5 * fTemp2 / fTemp * fTemp4;
-
-		*peMode = AI_GREN_TOSS_HINT;
-
-		return ValidGrenadePath(vFrom, pHint->origin, *pvVel);
-	}
-
-	vHintDelta = pHint->origin - vFrom;
-
-
-	fRange = vHintDelta.lengthXY();
-	fRangeSquared = fRange * fRange;
-
-	if (fRangeSquared != 0)
-	{
-		fDist = vHintDelta.length();
-		fHeight = fRangeSquared * fGravity / 589824.0 + vHintDelta.z;
-		if (-fHeight <= -fDist)
-		{
-			fAngle = (atan2(vHintDelta.z / fRangeSquared, 1.0) + atan2(fHeight / fDist, sqrt(1.0 - fHeight / fDist * (fHeight / fDist)))) / 2;
-			pvVel->x = vHintDelta.x * 768.0 / fRangeSquared * cos(fAngle);
-			pvVel->y = vHintDelta.y * 768.0 / fRangeSquared * cos(fAngle);
-			pvVel->z = 768.0 * cos(fAngle);
-			return ValidGrenadePath(vFrom, pHint->origin, *pvVel);
-		}
-	}
-
-	return bSuccess;
-}
-
-/*
-===============
-Actor::GrenadeThrowPoint
-
-Returns real grenade throw point.
-===============
-*/
-Vector Actor::GrenadeThrowPoint
-	(
-	const Vector& vFrom,
-	const Vector& vDelta,
-	const_str csAnim
-	)
-{
-	vec2_t axis;
-	Vector vRet;
-
-	VectorCopy2D(vDelta, axis);
-	VectorNormalize2D(axis);
-
-	if (csAnim == STRING_ANIM_GRENADEKICK_SCR)
-	{
-		vRet = vFrom;
-		vRet.z += 8;
-		return vRet;
-	}
-	else
-	{
-		if (csAnim > STRING_ANIM_GRENADEKICK_SCR)
-		{
-			if (csAnim != STRING_ANIM_GRENADETHROW_SCR && csAnim != STRING_ANIM_GRENADETOSS_SCR)
-			{
-				vRet = vFrom;
-				vRet.z += 80;
-				return vRet;
-			}
-			else
-			{
-				vRet.x = vFrom.x - axis[0] * 34 + axis[1] * 8;
-				vRet.y = vFrom.y - axis[0] * 8 - axis[1] * 34;
-				vRet.z = 52 + vFrom.z;
-				return vRet;
-			}
-		}
-		else
-		{
-			if (csAnim != STRING_ANIM_GRENADERETURN_SCR)
-			{
-				vRet = vFrom;
-				vRet.z += 80;
-				return vRet;
-			}
-			else
-			{
-
-				vRet.x = vFrom.x + axis[0] * 25 + axis[1] * 2;
-				vRet.y = vFrom.y - axis[0] * 2 + axis[1] * 25;
-				vRet.z = 89 + vFrom.z;
-				return vRet;
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::CalcKickVelocity
-
-Calculates required grenade kick velocity.
-===============
-*/
-Vector Actor::CalcKickVelocity
-	(
-	Vector& vDelta,
-	float fDist
-	) const
-{
-	float fScale, fGravity;
-	Vector ret;
-	float v4;
-
-	fGravity = 0.8 * sv_gravity->value;
-
-	fScale = 0.57735032 * fDist;
-	v4 = sqrt(fGravity * 0.5 / (fScale - vDelta[2]));
-	ret[0] = vDelta[0] * v4;
-	ret[1] = vDelta[1] * v4;
-	ret[2] = fScale * v4;
-
-	return ret;
-}
-
-/*
-===============
-Actor::CanKickGrenade
-
-Returns true if actor can kick grenade from vFrom to vTo.
-Or false if it's not possible.
-pvVel is changed.
-===============
-*/
-bool Actor::CanKickGrenade
-	(
-	Vector &vFrom,
-	Vector &vTo,
-	Vector &vFace,
-	Vector *pvVel
-	)
-{
-	Vector vEnd, vStart, vDelta, vVel;
-	float fDist, fGravity, fScale;
-	fGravity = sv_gravity->value * 0.8;
-	if (fGravity <= 0.0)
-	{
-		return false;
-	}
-
-	vStart = GrenadeThrowPoint(vFrom, vFace, STRING_ANIM_GRENADEKICK_SCR);
-	vDelta = vTo - vStart;
-
-	fDist = vDelta.lengthXY();
-	if (vDelta.z >= 0 || Vector::Dot(vDelta, vFace) < 0.0 || fDist < 256 || fDist >= 255401.28 / fGravity + 192.0)
-	{
-		return false;
-	}
-
-	if (fDist < 512)
-		fScale = 192.0 / fDist + 0.25;
-	else
-		fScale = 1.0 - 192.0 / fDist;
-
-
-
-	vEnd = vStart + vDelta;
-
-
-	vDelta[0] *= fScale;
-	vDelta[1] *= fScale;
-
-	*pvVel = CalcKickVelocity(vDelta, fScale * fDist);
-
-
-	if (*pvVel == vec_zero || !ValidGrenadePath(vStart, vEnd, *pvVel))
-	{
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-}
-
-/*
-===============
-Actor::GrenadeWillHurtTeamAt
-
-Returns true if grenade will hurt team at vTo.
-===============
-*/
-bool Actor::GrenadeWillHurtTeamAt
-	(
-	const Vector& vTo
-	)
-{
-	if (m_pNextSquadMate == this)
-	{
-		return false;
-	}
-
-	for (Actor * pSquadMate = (Actor *)m_pNextSquadMate.Pointer(); pSquadMate != this; pSquadMate = (Actor *)pSquadMate->m_pNextSquadMate.Pointer())
-	{
-		if ((pSquadMate->origin-vTo).length() <= 65536)
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-/*
-===============
-Actor::CanGetGrenadeFromAToB
-
-Returns true if actor can get a grenade from vFrom to vTo.
-pvVel is the kick/roll/throw velocity.
-peMode is the possible toss mode.
-===============
-*/
-bool Actor::CanGetGrenadeFromAToB
-	(
-	const Vector& vFrom,
-	const Vector& vTo,
-	bool bDesperate,
-	Vector *pvVel,
-	eGrenadeTossMode *peMode
-	)
-{
-	float fDot;
-	Vector vHint;
-	Vector vStart;
-	Vector vAxisY;
-	Vector vAxisX;
-	Vector vDelta;
-	Vector vDelta2 = vec_zero;
-	int nHints;
-	GrenadeHint *apHint[4];
-	float fRangeSquared;
-
-	if (sv_gravity->value <= 0)
-		return false;
-
-	vDelta = vTo - vFrom;
-	fRangeSquared = vDelta.lengthSquared();
-
-	//range < 256
-	if (fRangeSquared < Square(256))
-		return false;
-	if (bDesperate)
-	{
-		vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADERETURN_SCR);
-	}
-
-	//range < 32
-	if (fRangeSquared < Square(1024))
-	{
-		if (!bDesperate)
-		{
-			vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETOSS_SCR);
-		}
-
-		*pvVel = CanRollGrenade(vStart, vTo);
-
-		if (*pvVel != vec_zero)
-		{
-			*peMode = AI_GREN_TOSS_ROLL;
-			return true;
-		}
-
-		if (!bDesperate)
-		{
-			vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETHROW_SCR);
-		}
-
-		*pvVel = CanThrowGrenade(vStart, vTo);
-
-		if (*pvVel != vec_zero)
-		{
-			*peMode = AI_GREN_TOSS_THROW;
-			return true;
-		}
-	}
-
-	if (!bDesperate)
-	{
-		return false;
-	}
-
-	nHints = GrenadeHint::GetClosestSet(apHint, 4, vStart, Square(1024));
-
-	for (int i = 0; i <= nHints; i++)
-	{
-		if (bDesperate)
-		{
-			vStart = GrenadeThrowPoint(vFrom, vDelta2, STRING_ANIM_GRENADERETURN_SCR);
-			if (CanTossGrenadeThroughHint(apHint[i], vStart, vTo, bDesperate, pvVel, peMode))
-				return true;
-			continue;
-		}
-
-		vHint = apHint[i]->origin;
-		vDelta2 = vHint - vFrom;
-
-		fDot = DotProduct2D(vDelta2, vDelta);
-		if (fDot >= 0 && fDot * fDot <= vDelta.lengthXYSquared() * vDelta2.lengthXYSquared() * 0.89999998)
-		{
-			vStart = GrenadeThrowPoint(vFrom, vDelta2, STRING_ANIM_GRENADETOSS_SCR);
-			if (CanTossGrenadeThroughHint(apHint[i], vStart, vTo, bDesperate, pvVel, peMode))
-				return true;
-		}
-
-		
-	}
-
-	*peMode = AI_GREN_TOSS_NONE;
-	return false;
-}
-
-/*
-===============
-Actor::DecideToThrowGrenade
-
-Returns true if actor will throw grenade to vTo.
-pvVel is the kick/roll/throw velocity.
-peMode is the toss mode.
-===============
-*/
-bool Actor::DecideToThrowGrenade
-	(
-	const Vector& vTo,
-	Vector *pvVel,
-	eGrenadeTossMode *peMode
-	)
-{
-	if (Sentient::AmmoCount("grenade"))
-	{
-		if (!GrenadeWillHurtTeamAt(vTo))
-		{
-			return CanGetGrenadeFromAToB(origin, vTo, false, pvVel, peMode);
-		}
-	}
-	return false;
-}
-
-/*
-===============
-Actor::Grenade_EventFire
-
-Throw grenade animation
-===============
-*/
-void Actor::Grenade_EventFire
-	(
-	Event *ev
-	)
-{
-	const_str csAnim;
-	str strGrenade;
-	float speed;
-	Vector pos, dir, vStart;
-
-	gi.Tag_NumForName(edict->tiki, "tag_weapon_right");
-	
-	if (m_eGrenadeMode == AI_GREN_TOSS_ROLL)
-	{
-		csAnim = STRING_ANIM_GRENADETHROW_SCR;
-	}
-	else
-	{
-		csAnim = STRING_ANIM_GRENADETOSS_SCR;
-	}
-
-	vStart = GrenadeThrowPoint(origin, orientation[0], csAnim);
-
-	dir = m_vGrenadeVel;
-
-	speed = VectorNormalize(dir);
-
-	if (m_Team == TEAM_AMERICAN)
-	{
-		strGrenade = "models/projectiles/M2FGrenade.tik";
-	}
-	else
-	{
-		strGrenade = "models/projectiles/steilhandgranate.tik";
-	}
-
-	ProjectileAttack(vStart, dir, this, strGrenade, 0, speed);
-
-	UseAmmo("grenade", 1);
-
-}
-
-/*
-===============
-Actor::GenericGrenadeTossThink
-
-Called when actor in grenade state.
-i.e. actor noticed a grenade and must think fast.
-===============
-*/
-void Actor::GenericGrenadeTossThink
-	(
-	void
-	)
-{
-	Vector vGrenadeVel = vec_zero;
-	eGrenadeTossMode eGrenadeMode;
-
-	if (m_Enemy && level.inttime >= m_iStateTime + 200)
-	{
-		if (CanGetGrenadeFromAToB(
-			origin,
-			m_Enemy->velocity - m_Enemy->origin,
-			false,
-			&vGrenadeVel,
-			&eGrenadeMode))
-		{
-			m_vGrenadeVel = vGrenadeVel;
-			m_eGrenadeMode = eGrenadeMode;
-		}
-		m_iStateTime = level.inttime;
-	}
-
-	SetDesiredYawDir(m_vGrenadeVel);
-	ContinueAnimation();
-}
-
-/*
-===============
-Actor::CanSee
-
-Returns true to script if actor cansee entity.
-===============
-*/
-void Actor::CanSee
-	(
-	Event *ev
-	)
-{
-	float fov = 0;
-	float vision_distance = 0;
-
-	if (m_Think[m_ThinkLevel] != THINK_MACHINEGUNNER || !m_pTurret)
-	{
-		return Entity::CanSee(ev);
-	}
-	switch (ev->NumArgs())
-	{
-		case 1:
-		{
-			//do nothing
-		}
-		break;
-		case 2:
-		{
-			fov = ev->GetFloat(2);
-			if (fov < 0 || fov> 360)
-			{
-				ScriptError("fov must be in range 0 <= fov <= 360");
-			}
-		}
-		break;
-		case 3:
-		{
-			vision_distance = ev->GetFloat(3);
-			if (vision_distance < 0)
-			{
-				ScriptError("vision distance must be >= 0");
-			}
-		}
-			break;
-		default:
-		{
-			ScriptError("cansee should have 1, 2, or 3 arguments");
-		}
-		break;
-	}
-
-
-	Entity *ent = ev->GetEntity(1);
-	if (!ent)
-	{
-		ScriptError("NULL entity in parameter 1");
-	}
-	else
-	{
-		int cansee = MachineGunner_CanSee(ent, fov, vision_distance);
-		ev->AddInteger(cansee);
-	}
-}
-
-/*
-===============
-Actor::Think
-
-Think function for actor.
-Calls think function related to the current thinkstate.
-===============
-*/
-void Actor::Think
-	(
-	void
-	)
-{
-	int v1, v2, v3, tempHistory,ohIndex;
-	m_bAnimating = false; 
-	if (g_ai->integer
-		&& m_bDoAI
-		&& edict->tiki)
-	{
-		//gi.DPrintf("Actor::Think 1\n");
-		Director.iPaused++;
-		
-		v1 = level.inttime;
-		v2 = v1 / 125;
-		v3 = v1 / 125;
-		if (v1 / 125 < 0)
-			v3 = v2 + 3;
-		tempHistory = v2 - (v3 & 0xFFFFFFFC);
-
-		if (m_iCurrentHistory != tempHistory)
-		{
-			m_iCurrentHistory = tempHistory;
-			ohIndex = tempHistory - 1;
-			if (ohIndex < 0)
-			{
-				ohIndex = 3;
-			}
-
-			VectorCopy2D(origin, m_vOriginHistory[ohIndex]);
-		}
-		if (m_bNoPlayerCollision)
-		{
-			Entity *ent = G_GetEntity(0);
-			if (!IsTouching(ent))
-			{
-				Com_Printf("(entnum %d, radnum %d) is going solid after not getting stuck in the player\n", entnum, radnum);
-				setSolidType(SOLID_BBOX);
-				m_bNoPlayerCollision = false;
-			}
-		}
-		//gi.DPrintf("Actor::Think 2\n");
-		m_eNextAnimMode = -1;
-		FixAIParameters();
-		UpdateEnableEnemy();
-
-		if (m_pTetherEnt)
-		{
-			m_vHome = m_pTetherEnt->origin;
-		}
-
-		//gi.DPrintf("Actor::Think 3\n");
-		if (m_bBecomeRunner)
-		{
-			parm.movefail = false;
-			if (m_ThinkMap[THINKSTATE_IDLE] != THINK_RUNNER && m_ThinkMap[THINKSTATE_IDLE] != THINK_PATROL)
-			{
-				parm.movefail = true;
-			}
-		}
-
-		if (m_bDirtyThinkState)
-		{
-			m_bDirtyThinkState = false;
-			ThinkStateTransitions();
-		}
-
-		//gi.DPrintf("Actor::Think 4\n");
-		GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
-
-		if (func->ThinkState)
-			(this->*func->ThinkState)();
-
-		m_bNeedReload = false;
-		mbBreakSpecialAttack = false;
-		Director.Unpause();
-		
-		//gi.DPrintf("Actor::Think 5: entnum %d, classname: %s\n", entnum, G_GetEntity(0) ? G_GetEntity(0)->getClassname() : "");
-	}
-}
-
-/*
-===============
-Actor::PostThink
-
-Called after think is finished.
-===============
-*/
-void Actor::PostThink
-	(
-	bool bDontFaceWall
-	)
-{
-	CheckUnregister();
-	if (bDontFaceWall)
-	{
-		if (!m_pTurnEntity || m_ThinkState != THINKSTATE_IDLE)
-		{
-			DontFaceWall();
-		}
-	}
-	UpdateAngles();
-	UpdateAnim();
-	DoMove();
-	//gi.DPrintf("Actor::PostThink 1\n");
-	UpdateBoneControllers();
-	//gi.DPrintf("Actor::PostThink 2\n");
-	UpdateFootsteps();
+    m_PotentialEnemies.RemoveAll();
+    SetEnemy(NULL, false);
 }
 
 /*
@@ -5572,40 +3144,45 @@ Actor::SetMoveInfo
 Copies current move information to mm.
 ===============
 */
-void Actor::SetMoveInfo
-	(
-	mmove_t *mm
-	)
+void Actor::SetMoveInfo(mmove_t *mm)
 {
-	memset(mm, 0, sizeof(mmove_t));
+    memset(mm, 0, sizeof(mmove_t));
 
-	mm->velocity[0] = velocity.x;
-	mm->velocity[1] = velocity.y;
-	mm->velocity[2] = velocity.z;
+    velocity.copyTo(mm->velocity);
+    origin.copyTo(mm->origin);
 
-	mm->origin[0] = origin.x;
-	mm->origin[1] = origin.y;
-	mm->origin[2] = origin.z;
+    mm->entityNum = entnum;
 
-	mm->entityNum = entnum;
+    mm->walking     = m_walking;
+    mm->groundPlane = m_groundPlane;
+    VectorCopy(m_groundPlaneNormal, mm->groundPlaneNormal);
 
-	mm->walking = m_walking;
+    mm->frametime = level.frametime;
 
-	mm->groundPlane = m_groundPlane;
-	mm->groundPlaneNormal[0] = m_groundPlaneNormal[0];
-	mm->groundPlaneNormal[1] = m_groundPlaneNormal[1];
-	mm->groundPlaneNormal[2] = m_groundPlaneNormal[2];
+    if (m_bNoPlayerCollision) {
+        mm->tracemask = MASK_TARGETPATH;
+    } else {
+        mm->tracemask = MASK_PATHSOLID;
+    }
 
-	mm->frametime = level.frametime;
+    VectorCopy(MINS, mm->mins);
+    VectorCopy(MAXS, mm->maxs);
+    mm->maxs[2] = 94;
+}
 
-	mm->mins[0] = MINS.x;
-	mm->mins[1] = MINS.y;
-	mm->mins[2] = MINS.z;
-	mm->maxs[0] = MAXS.x;
-	mm->maxs[1] = MAXS.y;
-	mm->maxs[2] = MAXS.z;
+/*
+===============
+Actor::DoFailSafeMove
 
-	mm->tracemask = m_bNoPlayerCollision == false ? MASK_PATHSOLID : MASK_TARGETPATH;
+===============
+*/
+void Actor::DoFailSafeMove(vec3_t dest)
+{
+    Com_Printf("(entnum %d, radnum %d) blocked, doing failsafe\n", entnum, radnum);
+
+    VectorCopy(dest, m_NoClipDest);
+
+    SetThinkState(THINKSTATE_NOCLIP, THINKLEVEL_NOCLIP);
 }
 
 /*
@@ -5615,159 +3192,110 @@ Actor::GetMoveInfo
 Fetch current move information from mm.
 ===============
 */
-void Actor::GetMoveInfo
-	(
-	mmove_t *mm
-	)
+void Actor::GetMoveInfo(mmove_t *mm)
 {
-	//FIXME: macros
-	m_walking = mm->walking;
-	m_groundPlane = mm->groundPlane;
-	m_groundPlaneNormal = mm->groundPlaneNormal;
-	groundentity = NULL;
+    trace_t trace;
 
-	TouchStuff(mm);
+    m_walking     = mm->walking;
+    m_groundPlane = mm->groundPlane;
+    VectorCopy(mm->groundPlaneNormal, m_groundPlaneNormal);
+    groundentity = NULL;
 
-	if (m_eAnimMode >= 2)
-	{
-		if (m_eAnimMode <= 3)
-		{
-			if (mm->hit_temp_obstacle)
-			{
-				if (mm->hit_temp_obstacle & 1)
-				{
-					m_Path.Clear();
-					Player *p = (Player *)G_GetEntity(0);
+    TouchStuff(mm);
 
-					if (!IsTeamMate(p))
-					{
-						if (!m_bEnableEnemy)
-						{
-							m_bDesiredEnableEnemy = true;
-							m_bEnableEnemy = true;
-							SetLeashHome(origin);
-						}
+    switch (m_eAnimMode) {
+    case ANIM_MODE_DEST:
+        if (!mm->hit_temp_obstacle && mm->hit_obstacle) {
+            trace = G_Trace(
+                m_Dest,
+                PLAYER_BASE_MIN,
+                PLAYER_BASE_MAX,
+                m_Dest - Vector(0, 0, 16384),
+                (Entity *)NULL,
+                MASK_MOVEINFO,
+                false,
+                "Actor::GetMoveInfo"
+            );
 
-						BecomeTurretGuy();
+            DoFailSafeMove(trace.endpos);
+        } else if (mm->hit_temp_obstacle && (mm->hit_temp_obstacle & 1)) {
+            Player *p;
 
-						m_PotentialEnemies.ConfirmEnemy(this, p);
-						m_bForceAttackPlayer = true;
-					}
-				}
-				velocity = vec_zero;
-				return;
-			}
-			if (mm->hit_obstacle)
-			{
-				if (level.inttime >= m_Path.Time() + 1000)
-				{
-					m_Path.ReFindPath(origin, this);
-				}
-				else
-				{
-					if (!m_Path.NextNode() || 
-							(!(m_Path.NextNode()->bAccurate && m_Path.IsSide())
-							&& m_Path.NextNode() == m_Path.CurrentNode()
-							&& m_Path.CurrentNode() != m_Path.StartNode())
-						)
-					{
-						m_Path.Clear();
-						velocity = vec_zero;
-						return;
-					}
+            p = static_cast<Player *>(G_GetEntity(0));
 
-					if (m_Path.CurrentNode() == m_Path.StartNode())
-					{
-						Com_Printf(
-							"^~^~^ BAD FAILSAFE: %.2f %.2f %.2f, '%s'\n",
-							origin[0],
-							origin[1],
-							origin[2],
-							targetname.c_str());
-					}
+            if (!IsTeamMate(p)) {
+                if (!m_bEnableEnemy) {
+                    m_bDesiredEnableEnemy = true;
+                    UpdateEnableEnemy();
+                }
 
-					DoFailSafeMove(m_Path.NextNode()->point);
-				}
-			}
-			else if (velocity.lengthXYSquared() < -0.69999999 && level.inttime >= m_Path.Time() + 1000)
-			{
-				m_Path.ReFindPath(origin, this);
-			}
-		}
-		else if (m_eAnimMode == 4)
-		{
-			if (mm->hit_temp_obstacle)
-			{
-				if (mm->hit_temp_obstacle & 1)
-				{
-					m_Path.Clear();
-					Player *p = (Player *)G_GetEntity(0);
+                BecomeTurretGuy();
+                ForceAttackPlayer();
+            }
+        }
+        break;
+    case ANIM_MODE_PATH:
+    case ANIM_MODE_PATH_GOAL:
+        if (mm->hit_temp_obstacle) {
+            if (mm->hit_temp_obstacle & 1) {
+                Player *p;
 
-					if (!IsTeamMate(p))
-					{
-						if (!m_bEnableEnemy)
-						{
-							m_bDesiredEnableEnemy = true;
-							m_bEnableEnemy = true;
-							SetLeashHome(origin);
-						}
+                m_Path.Clear();
+                p = static_cast<Player *>(G_GetEntity(0));
 
-						BecomeTurretGuy();
+                if (!IsTeamMate(p)) {
+                    if (!m_bEnableEnemy) {
+                        m_bDesiredEnableEnemy = true;
+                        UpdateEnableEnemy();
+                    }
 
-						m_PotentialEnemies.ConfirmEnemy(this, p);
-						m_bForceAttackPlayer = true;
-					}
-				}
-			}
-			else if (mm->hit_obstacle)
-			{
-				Vector end = m_Dest;
-				end.z -= 16384.0;
-				trace_t trace = G_Trace(
-					Vector(m_Dest),
-					Vector(PLAYER_BASE_MIN),
-					Vector(PLAYER_BASE_MAX),
-					Vector(end),
-					NULL,
-					1,
-					qfalse,
-					"Actor::GetMoveInfo");
+                    BecomeTurretGuy();
+                    ForceAttackPlayer();
+                }
+            }
 
-				DoFailSafeMove(trace.endpos);
-			}
-		}
-	}
+            VectorClear(velocity);
+        } else if (mm->hit_obstacle) {
+            if (level.inttime >= m_Path.Time() + 1000) {
+                m_Path.ReFindPath(origin, this);
+            } else {
+                PathInfo *node = m_Path.NextNode();
 
-	setOrigin(mm->origin);
+                if (!node
+                    || !m_Path.IsAccurate()
+                           && (node == m_Path.LastNode() && m_Path.CurrentNode() != m_Path.StartNode())) {
+                    m_Path.Clear();
+                    VectorClear(velocity);
+                    return;
+                }
 
-	if (VectorLengthSquared(mm->velocity) < 1)
-	{
-		velocity = vec_zero;
-	}
-	else
-	{
-		velocity = mm->velocity;
-	}
+                if (m_Path.CurrentNode() == m_Path.StartNode()) {
+                    Com_Printf(
+                        "^~^~^ BAD FAILSAFE: %.2f %.2f %.2f, '%s'\n",
+                        origin[0],
+                        origin[1],
+                        origin[2],
+                        targetname.c_str()
+                    );
+                }
 
-}
+                DoFailSafeMove(node->point);
+            }
+        } else if (DotProduct2D(mm->velocity, velocity) < -0.7f && level.inttime >= m_Path.Time() + 1000) {
+            m_Path.ReFindPath(origin, this);
+        }
+        break;
+    default:
+        break;
+    }
 
-/*
-===============
-Actor::DoFailSafeMove
+    setOrigin(mm->origin);
 
-===============
-*/
-void Actor::DoFailSafeMove
-	(
-	vec3_t dest
-	)
-{
-	Com_Printf("(entnum %d, radnum %d) blocked, doing failsafe\n", entnum, radnum);
-
-	VectorCopy(dest, m_NoClipDest);
-
-
-	SetThinkState(THINKSTATE_NOCLIP, THINKLEVEL_NOCLIP);
+    if (VectorLengthSquared(mm->velocity) < 1) {
+        VectorClear(velocity);
+    } else {
+        VectorCopy(mm->velocity, velocity);
+    }
 }
 
 /*
@@ -5776,66 +3304,1636 @@ Actor::TouchStuff
 
 ===============
 */
-void Actor::TouchStuff
-	(
-	mmove_t *mm
-	)
+void Actor::TouchStuff(mmove_t *mm)
 {
-	int i, j;
-	gentity_t  *other;
-	Event		*event;
+    int        i, j;
+    gentity_t *other;
+    Event     *event;
 
-	if (getMoveType() != MOVETYPE_NOCLIP)
-	{
-		G_TouchTriggers( this );
-	}
+    if (getMoveType() != MOVETYPE_NOCLIP) {
+        G_TouchTriggers(this);
+    }
 
-	for (i = 0; i < mm->numtouch; i++)
-	{
-		other = &g_entities[mm->touchents[i]];
+    for (i = 0; i < mm->numtouch; i++) {
+        other = &g_entities[mm->touchents[i]];
 
-		for (j = 0; j < i; j++)
-		{
-			gentity_t *ge = &g_entities[j];
+        for (j = 0; j < i; j++) {
+            if (&g_entities[j] == other) {
+                break;
+            }
+        }
 
-			if (ge == other)
-				break;
-		}
+        if (j != i) {
+            // duplicated
+            continue;
+        }
 
-		if (j != i)
-		{
-			// duplicated
-			continue;
-		}
+        // Don't bother touching the world
+        if (!other->entity || other->entity == world) {
+            continue;
+        }
 
-		// Don't bother touching the world
-		if ((!other->entity) || (other->entity == world))
-		{
-			continue;
-		}
+        event = new Event(EV_Touch);
+        event->AddEntity(this);
+        other->entity->ProcessEvent(event);
 
-		event = new Event(EV_Touch);
-		event->AddEntity(this);
-		other->entity->ProcessEvent(event);
-
-		event = new Event(EV_Touch);
-		event->AddEntity(other->entity);
-		ProcessEvent(event);
-	}
+        event = new Event(EV_Touch);
+        event->AddEntity(other->entity);
+        ProcessEvent(event);
+    }
 }
 
 /*
 ===============
-Actor::ExtractConstraints
+Actor::ResetBoneControllers
 
+Reset Bone Controllers.
 ===============
 */
-void Actor::ExtractConstraints
-	(
-	mmove_t *mm
-	)
+void Actor::ResetBoneControllers(void)
 {
-	// not found in ida
+    if (edict->s.bone_tag[HEAD_TAG] != -1) {
+        SetControllerAngles(HEAD_TAG, vec_zero);
+    }
+    if (edict->s.bone_tag[TORSO_TAG] != -1) {
+        SetControllerAngles(TORSO_TAG, vec_zero);
+    }
+    if (edict->s.bone_tag[ARMS_TAG] != -1) {
+        SetControllerAngles(ARMS_TAG, vec_zero);
+    }
+}
+
+/*
+===============
+Actor::UpdateBoneControllers
+
+Update Bone Controllers.
+Reversed incorrectly, since decompiled output has different behaviour as reversed output.
+===============
+*/
+void Actor::UpdateBoneControllers(void)
+{
+    float  pitchError, yawError, error;
+    float  max_change, max_accel_change, min_accel_change;
+    Vector headAngles, torsoAngles;
+    float  tolerable_error;
+    vec3_t LocalLookAngles;
+    float  torsoYawError;
+
+    if (m_bHasDesiredLookAngles) {
+        vec3_t        myAxis[3];
+        vec3_t        eyePosition;
+        vec3_t        lookAxis[3];
+        vec3_t        endPosition;
+        vec3_t        worldLookAngles;
+        vec3_t        lineVec;
+        int           tagnum;
+        orientation_t tag_or;
+        Vector        vError;
+
+        if (g_showlookat->integer == entnum || g_showlookat->integer == -1) {
+            tagnum = gi.Tag_NumForName(edict->tiki, "eyes bone");
+            tag_or = G_TIKI_Orientation(edict, tagnum & TAG_MASK);
+            AnglesToAxis(angles, myAxis);
+
+            VectorCopy(origin, eyePosition);
+
+            for (int i = 0; i < 3; i++) {
+                VectorMA(eyePosition, tag_or.origin[i], myAxis[i], eyePosition);
+            }
+
+            Vector vEndPoint;
+
+            if (m_bHasDesiredLookDest) {
+                vEndPoint = m_vDesiredLookDest;
+            } else if (m_pLookEntity) {
+                if (m_pLookEntity->IsSubclassOfSentient()) {
+                    Sentient *sent = static_cast<Sentient *>(m_pLookEntity.Pointer());
+                    vEndPoint      = sent->EyePosition();
+                } else {
+                    vEndPoint = m_pLookEntity->centroid;
+                }
+            }
+
+            for (int i = 0; i < 3; i++) {
+                worldLookAngles[i] = m_DesiredLookAngles[i] + angles[i];
+            }
+
+            AnglesToAxis(worldLookAngles, lookAxis);
+
+            Vector vEndPointDir = vEndPoint - eyePosition;
+            vEndPointDir.normalize();
+
+            // calculate the error
+            Vector vError = vEndPointDir - lookAxis[0];
+
+            if (vError.length() >= 0.1f) {
+                VectorSet(lineVec, 128, 0, 0);
+                VectorCopy(eyePosition, endPosition);
+
+                for (int i = 0; i < 3; i++) {
+                    VectorMA(endPosition, lineVec[i], lookAxis[i], endPosition);
+                }
+            } else {
+                int boxalpha;
+
+                VectorCopy(vEndPoint, endPosition);
+
+                if (vError.length() >= 0.04f) {
+                    boxalpha = (vError.length() - 0.1f) / 0.06f;
+                } else {
+                    boxalpha = 1;
+                }
+
+                G_DebugLine(vEndPoint + Vector(8, 8, 8), vEndPoint + Vector(8, 8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, -8, 8), vEndPoint + Vector(8, -8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(-8, 8, 8), vEndPoint + Vector(-8, 8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(-8, -8, 8), vEndPoint + Vector(-8, -8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, 8, 8), vEndPoint + Vector(8, -8, 8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, 8, -8), vEndPoint + Vector(8, -8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(-8, 8, 8), vEndPoint + Vector(-8, -8, 8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(-8, 8, -8), vEndPoint + Vector(-8, -8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, 8, 8), vEndPoint + Vector(-8, 8, 8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, 8, -8), vEndPoint + Vector(-8, 8, -8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, -8, 8), vEndPoint + Vector(-8, -8, 8), 0, 0, boxalpha, boxalpha);
+                G_DebugLine(vEndPoint + Vector(8, -8, -8), vEndPoint + Vector(-8, -8, -8), 0, 0, boxalpha, boxalpha);
+            }
+            G_DebugLine(eyePosition, endPosition, 0, 0, 1, 1);
+
+            VectorSet(lineVec, 0, 0, -2);
+            for (int i = 0; i < 3; i++) {
+                VectorMA(eyePosition, lineVec[i], lookAxis[i], eyePosition);
+                VectorMA(endPosition, lineVec[i], lookAxis[i], endPosition);
+            }
+
+            G_DebugLine(eyePosition, endPosition, 0, 0, 1, 1);
+
+            VectorSet(lineVec, 0, 2, 0);
+            for (int i = 0; i < 3; i++) {
+                VectorMA(eyePosition, lineVec[i], lookAxis[i], eyePosition);
+                VectorMA(endPosition, lineVec[i], lookAxis[i], endPosition);
+            }
+
+            G_DebugLine(eyePosition, endPosition, 0, 0, 1, 1);
+        }
+
+        VectorCopy(m_DesiredLookAngles, LocalLookAngles);
+
+        Vector EyeDelta;
+        Vector fwd;
+
+        EyeDelta = LocalLookAngles;
+        EyeDelta.AngleVectorsLeft(&fwd, NULL, NULL);
+        VectorCopy(fwd, edict->s.eyeVector);
+    } else {
+        VectorClear(edict->s.eyeVector);
+        VectorClear(LocalLookAngles);
+    }
+
+    torsoAngles = GetControllerAngles(TORSO_TAG);
+    headAngles  = GetControllerAngles(HEAD_TAG);
+
+    yawError      = LocalLookAngles[1] - (torsoAngles[1] + headAngles[1]);
+    pitchError    = LocalLookAngles[0] - headAngles[0];
+    torsoYawError = LocalLookAngles[1] - torsoAngles[1];
+
+    if (torsoYawError > 180) {
+        torsoYawError -= 360;
+    } else if (torsoYawError < -180) {
+        torsoYawError += 360;
+    }
+
+    if (torsoYawError >= 0) {
+        if (yawError < -120) {
+            yawError += 360;
+        }
+    } else {
+        if (yawError > 120) {
+            yawError -= 360;
+        }
+    }
+
+    if (!(m_iLookFlags & 1)) {
+        if (yawError > 25) {
+            max_change = (yawError - 25) * 0.2f;
+        } else if (yawError < -25) {
+            max_change = (yawError + 25) * 0.2f;
+        } else {
+            max_change = 0;
+        }
+
+        tolerable_error = yawError + headAngles[1];
+        if (-torsoAngles[1] < tolerable_error) {
+            max_change = Q_clamp_float(max_change, -torsoAngles[1], tolerable_error);
+        } else {
+            max_change = Q_clamp_float(max_change, tolerable_error, -torsoAngles[1]);
+        }
+
+        max_accel_change = m_fTorsoCurrentTurnSpeed + level.frametime * 15;
+        min_accel_change = m_fTorsoCurrentTurnSpeed - level.frametime * 15;
+
+        max_change = Q_clamp_float(max_change, min_accel_change, max_accel_change);
+        max_change = Q_clamp_float(
+            max_change, level.frametime * -m_fTorsoCurrentTurnSpeed, level.frametime * m_fTorsoCurrentTurnSpeed
+        );
+
+        torsoAngles[1] += max_change;
+
+        if (torsoAngles[1] > 30) {
+            max_change -= torsoAngles[1] - 30;
+            torsoAngles[1] = 30;
+        } else if (torsoAngles[1] < -30) {
+            max_change -= torsoAngles[1] + 30;
+            torsoAngles[1] = -30;
+        }
+
+        m_fTorsoCurrentTurnSpeed = max_change;
+
+        // clear pitch/roll
+        torsoAngles[0] = 0;
+        torsoAngles[2] = 0;
+
+        SetControllerAngles(TORSO_TAG, torsoAngles);
+        yawError -= max_change;
+    }
+
+    if (yawError > 15.f) {
+        max_change = (yawError - 15.f) * level.frametime * 4.f;
+    } else if (yawError < -15.f) {
+        max_change = (yawError + 15.f) * level.frametime * 4.f;
+    } else {
+        max_change = 0;
+    }
+
+    if (-headAngles[1] < yawError) {
+        max_change = Q_clamp_float(max_change, -headAngles[1], yawError);
+    } else {
+        max_change = Q_clamp_float(max_change, yawError, -headAngles[1]);
+    }
+
+    max_change =
+        Q_clamp_float(max_change, level.frametime * -m_fHeadMaxTurnSpeed, level.frametime * m_fHeadMaxTurnSpeed);
+
+    headAngles[1] += max_change;
+    // clamp head yaw to 60 degrees
+    headAngles[1] = Q_clamp_float(headAngles[1], -60, 60);
+
+    error = 15.f;
+
+    if (fabs(LocalLookAngles[0]) < 15) {
+        error = fabs(LocalLookAngles[0]);
+    }
+
+    if (pitchError > error) {
+        max_change = (pitchError - error) * 0.2f;
+    } else if (pitchError < -error) {
+        max_change = (pitchError + error) * 0.2f;
+    } else {
+        max_change = 0;
+    }
+
+    max_change =
+        Q_clamp_float(max_change, level.frametime * -m_fHeadMaxTurnSpeed, level.frametime * m_fHeadMaxTurnSpeed);
+    headAngles[0] += max_change;
+    // clamp head pitch to 35 degrees
+    headAngles[0] = Q_clamp_float(headAngles[0], -35, 35);
+    headAngles[2] = 0;
+
+    if (m_iLookFlags & 1) {
+        // half view
+        headAngles[0] /= 2.f;
+        headAngles[1] /= 2.f;
+    }
+
+    SetControllerAngles(HEAD_TAG, headAngles);
+
+    Vector tmp_angles;
+    Vector new_angles;
+
+    // arms
+    tmp_angles = GetControllerAngles(ARMS_TAG);
+
+    max_change = m_vLUpperArmDesiredAngles[1] - tmp_angles[1];
+    if (max_change > 180) {
+        max_change -= 360;
+    } else if (max_change < -180) {
+        max_change += 360;
+    }
+
+    max_change =
+        Q_clamp_float(max_change, level.frametime * -m_fLUpperArmTurnSpeed, level.frametime * m_fLUpperArmTurnSpeed);
+    // set the new arms angles
+    new_angles[0] = m_vLUpperArmDesiredAngles[0];
+    new_angles[1] = tmp_angles[1] + max_change;
+    new_angles[2] = 0;
+    SetControllerAngles(ARMS_TAG, new_angles);
+}
+
+/*
+===============
+Actor::setOriginEvent
+===============
+*/
+void Actor::setOriginEvent(Vector org)
+{
+    float dist;
+    bool  bRejoin = false;
+
+    dist = (org - origin).lengthSquared();
+
+    if (dist > Square(DEFAULT_NEARBY_SQUAD_DIST)) {
+        bRejoin = true;
+        DisbandSquadMate(this);
+    }
+
+    m_iOriginTime = level.inttime;
+
+    VectorCopy2D(org, m_vOriginHistory[0]);
+    VectorCopy2D(org, m_vOriginHistory[1]);
+    VectorCopy2D(org, m_vOriginHistory[2]);
+    VectorCopy2D(org, m_vOriginHistory[3]);
+
+    VectorClear(velocity);
+
+    if (level.Spawned()) {
+        SafeSetOrigin(org);
+    } else {
+        setOrigin(org);
+    }
+
+    m_vHome = origin;
+
+    if (bRejoin) {
+        JoinNearbySquads(DEFAULT_NEARBY_SQUAD_DIST);
+    }
+
+    if (dist > Square(MIN_BADPLACE_UPDATE_DIST)) {
+        UpdateBadPlaces();
+    }
+}
+
+/*
+===============
+Actor::SafeSetOrigin
+
+Safe set origin.
+===============
+*/
+void Actor::SafeSetOrigin(vec3_t newOrigin)
+{
+    // don't update the origin if it's the same
+    if (newOrigin == origin) {
+        return;
+    }
+
+    setOrigin(newOrigin);
+
+    if (!m_bNoPlayerCollision) {
+        Player *p = (Player *)G_GetEntity(0);
+
+        // Added in 2.30
+        //  Solidity check.
+        //  If the Actor is already nonsolid the player won't get stuck
+        if (p && IsTouching(p) && getSolidType() != SOLID_NOT) {
+            Com_Printf("(entnum %d, radnum %d) is going not solid to not get stuck in the player\n", entnum, radnum);
+            m_bNoPlayerCollision = true;
+            setSolidType(SOLID_NOT);
+        }
+    }
+}
+
+/*
+===============
+Actor::DoMove
+
+Move the actor based on m_eAnimMode.
+===============
+*/
+void Actor::DoMove(void)
+{
+    mmove_t mm;
+    trace_t trace;
+
+    if (m_eAnimMode != ANIM_MODE_ATTACHED
+        && (!m_bDoPhysics || m_iOriginTime == level.inttime || m_pGlueMaster || bindmaster)) {
+        return;
+    }
+
+    switch (m_eAnimMode) {
+    case ANIM_MODE_NORMAL:
+        SetMoveInfo(&mm);
+
+        VectorCopy2D(frame_delta, mm.desired_dir);
+        mm.desired_speed = VectorNormalize2D(mm.desired_dir) / level.frametime;
+
+        if (mm.desired_speed > m_maxspeed) {
+            mm.desired_speed = m_maxspeed;
+        }
+
+        MmoveSingle(&mm);
+        GetMoveInfo(&mm);
+        break;
+    case ANIM_MODE_PATH:
+        MovePath(frame_delta.length() / level.frametime);
+        break;
+    case ANIM_MODE_PATH_GOAL:
+        MovePathGoal(frame_delta.length() / level.frametime);
+        break;
+    case ANIM_MODE_DEST:
+        MoveDest(frame_delta.length() / level.frametime);
+        break;
+    case ANIM_MODE_SCRIPTED:
+        setAngles(angles + Vector(0, angular_delta, 0));
+        trace = G_Trace(
+            origin, mins, maxs, origin + frame_delta, this, edict->clipmask & ~MASK_SCRIPT_SLAVE, true, "Actor"
+        );
+        SafeSetOrigin(trace.endpos);
+        velocity = frame_delta / level.frametime;
+        break;
+    case ANIM_MODE_NOCLIP:
+        setAngles(angles + Vector(0, angular_delta, 0));
+        SafeSetOrigin(origin + frame_delta);
+        velocity = frame_delta / level.frametime;
+        break;
+    case ANIM_MODE_FALLING_PATH:
+        SafeSetOrigin(m_pFallPath->pos[m_pFallPath->currentPos]);
+        m_pFallPath->currentPos++;
+        velocity = vec_zero;
+        break;
+    case ANIM_MODE_ATTACHED:
+        {
+            Vector frame_offset;
+            Vector attach_angles;
+
+            frame_offset = edict->s.attach_offset;
+            frame_offset += frame_delta;
+            frame_offset.copyTo(edict->s.attach_offset);
+            setOrigin();
+
+            attach_angles = angles;
+            attach_angles[1] += angular_delta;
+            setAngles(attach_angles);
+
+            velocity = frame_delta / level.frametime;
+            break;
+        }
+    default:
+        break;
+    }
+
+    m_maxspeed = 1000000.0f;
+}
+
+/*
+===============
+Actor::UpdateAngles
+
+Update current angles.
+===============
+*/
+void Actor::UpdateAngles(void)
+{
+    float max_change, error, dist;
+
+    if (m_YawAchieved) {
+        return;
+    }
+
+    error = m_DesiredYaw - angles[1];
+    if (error > 180) {
+        error -= 360;
+    } else if (error < -180) {
+        error += 360;
+    }
+
+    dist = m_fAngleYawSpeed * level.frametime;
+    if (error < -dist) {
+        max_change = -dist;
+    } else if (error > dist) {
+        max_change = dist;
+    } else {
+        max_change = error;
+        StopTurning();
+    }
+
+    setAngles(Vector(0, angles[1] + max_change, 0));
+}
+
+/*
+===============
+Actor::SetLeashHome
+
+Set leash home.
+===============
+*/
+void Actor::SetLeashHome(Vector vHome)
+{
+    if (!m_bFixedLeash) {
+        m_vHome = vHome;
+    }
+}
+
+/*
+===============
+Actor::GunPosition
+
+Returns current gun position.
+===============
+*/
+Vector Actor::GunPosition(void)
+{
+    if (m_iGunPositionCheckTime < level.inttime) {
+        m_iGunPositionCheckTime = level.inttime;
+        Weapon *weap            = GetActiveWeapon(WEAPON_MAIN);
+        if (weap) {
+            weap->GetMuzzlePosition(m_vGunPosition);
+        } else {
+            m_vGunPosition = vec_zero;
+        }
+    }
+    return m_vGunPosition;
+}
+
+/*
+===============
+Actor::CanSee
+
+Returns true if actor cansee entity through fov and vision_distance.
+===============
+*/
+bool Actor::CanSee(Entity *e1, float fov, float vision_distance, bool bNoEnts)
+{
+    bool bCanSee = Sentient::CanSee(e1, fov, vision_distance, false);
+    if (e1 == m_Enemy) {
+        m_iEnemyVisibleCheckTime = level.inttime;
+        // Added in 2.0.
+        //  Check for obfuscation like smoke sprite
+        m_fVisibilityAlpha = 0;
+        if (bCanSee) {
+            m_fVisibilityAlpha = 1.0f - G_VisualObfuscation(VirtualEyePosition(), m_Enemy->EyePosition());
+            if (m_fVisibilityAlpha < m_fVisibilityThreshold) {
+                // enemy is obfuscated behind something
+                bCanSee = false;
+            }
+        }
+
+        if (bCanSee) {
+            SetEnemyPos(m_Enemy->origin);
+            m_bEnemyIsDisguised     = m_Enemy->m_bIsDisguised;
+            m_iLastEnemyVisibleTime = level.inttime;
+        }
+
+        if (bCanSee != m_bEnemyVisible) {
+            m_bEnemyVisible           = !m_bEnemyVisible;
+            m_iEnemyVisibleChangeTime = level.inttime;
+        }
+
+        if (fov != 0) {
+            m_iEnemyFovCheckTime = level.inttime;
+            if (bCanSee != m_bEnemyInFOV) {
+                m_bEnemyInFOV         = !m_bEnemyInFOV;
+                m_iEnemyFovChangeTime = level.inttime;
+            }
+        }
+    }
+
+    return bCanSee;
+}
+
+/*
+===============
+Actor::WithinVisionDistance
+
+Returns true if entity is witthin vision distance.
+===============
+*/
+bool Actor::WithinVisionDistance(Entity *ent) const
+{
+    float distance = world->farplane_distance;
+
+    if (!distance || distance < m_fSight) {
+        return WithinDistance(ent, m_fSight);
+    }
+
+    return WithinDistance(ent, distance);
+}
+
+/*
+===============
+Actor::InFOV
+
+Returns true if positin is within fov.
+===============
+*/
+bool Actor::InFOV(Vector pos, float check_fov, float check_fovdot)
+{
+    if (check_fov == 360) {
+        return true;
+    }
+
+    Vector delta = pos - VirtualEyePosition();
+    if (!delta.x && !delta.y) {
+        return true;
+    }
+
+    float fDot = DotProduct2D(delta, orientation[0]);
+    if (fDot < 0) {
+        return false;
+    }
+
+    return Square(fDot) > (delta.lengthXYSquared() * Square(check_fovdot));
+}
+
+/*
+===============
+Actor::CanShoot
+
+Returns true if actor can shoot entity.
+===============
+*/
+bool Actor::CanShoot(Entity *ent)
+{
+    bool   bCanShoot = false;
+    Vector vGunPos;
+
+    if (FriendlyInLineOfFire(ent)) {
+        // Added in 2.0
+        //  Check if a friend is in sight
+        bCanShoot = false;
+    } else if (ent->IsSubclassOfSentient()) {
+        Sentient *sen = static_cast<Sentient *>(ent);
+
+        vGunPos   = GunPosition();
+        bCanShoot = false;
+
+        if (WithinFarplaneDistance(origin - ent->origin) && AreasConnected(ent)) {
+            if (G_SightTrace(
+                    vGunPos,
+                    vec_zero,
+                    vec_zero,
+                    sen->centroid,
+                    this,
+                    sen,
+                    MASK_CANSEE,
+                    false,
+                    "Actor::CanShoot centroid"
+                )) {
+                bCanShoot = true;
+            } else if (G_SightTrace(
+                           vGunPos,
+                           vec_zero,
+                           vec_zero,
+                           sen->EyePosition(),
+                           this,
+                           sen,
+                           MASK_CANSEE,
+                           false,
+                           "Actor::CanShoot eyes"
+                       )) {
+                bCanShoot = true;
+            }
+        }
+    } else {
+        bCanShoot = false;
+        if (AreasConnected(ent)) {
+            vGunPos   = GunPosition();
+            bCanShoot = CanSeeFrom(vGunPos, ent);
+        }
+    }
+
+    if (ent == m_Enemy) {
+        m_iCanShootCheckTime = level.inttime;
+        m_bCanShootEnemy     = bCanShoot;
+    }
+
+    return bCanShoot;
+}
+
+/*
+===============
+Actor::CanSeeFrom
+
+Returns true if actor can see entity from pos.
+===============
+*/
+bool Actor::CanSeeFrom(vec3_t pos, Entity *ent)
+{
+    if (!WithinFarplaneDistance(pos)) {
+        // outside the farplane
+        return false;
+    }
+
+    if (ent->flags & FL_NOTARGET) {
+        // ent must be ignored by AI
+        return false;
+    }
+
+    return G_SightTrace(pos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, false, "Actor::CanSeeFrom");
+}
+
+/*
+===============
+Actor::EnemyInFOV
+
+Returns true if enemy is within fov.
+===============
+*/
+bool Actor::EnemyInFOV(int iMaxDirtyTime)
+{
+    if (level.inttime > iMaxDirtyTime + m_iEnemyFovCheckTime) {
+        if (m_bEnemyInFOV != InFOV(m_Enemy->centroid)) {
+            m_bEnemyInFOV         = !m_bEnemyInFOV;
+            m_iEnemyFovChangeTime = level.inttime;
+        }
+        m_iEnemyFovCheckTime = level.inttime;
+    }
+
+    return m_bEnemyInFOV;
+}
+
+/*
+===============
+Actor::CanSeeEnemy
+
+Returns true if actor can see enemy.
+===============
+*/
+bool Actor::CanSeeEnemy(int iMaxDirtyTime)
+{
+    if (level.inttime > iMaxDirtyTime + m_iEnemyVisibleCheckTime) {
+        CanSee(m_Enemy, 0, world->farplane_distance * 0.828f, false);
+    }
+
+    return m_bEnemyVisible;
+}
+
+/*
+===============
+Actor::CanShootEnemy
+
+Returns true if actor can shoot enemy.
+===============
+*/
+bool Actor::CanShootEnemy(int iMaxDirtyTime)
+{
+    if (level.inttime > iMaxDirtyTime + m_iCanShootCheckTime) {
+        CanShoot(m_Enemy);
+    }
+
+    return m_bCanShootEnemy;
+}
+
+/*
+===============
+Actor::FriendlyInLineOfFire
+===============
+*/
+bool Actor::FriendlyInLineOfFire(Entity *other)
+{
+    Vector delta;
+    float  inverseDot;
+
+    if (g_target_game <= target_game_e::TG_MOH) {
+        return false;
+    }
+
+    delta      = other->origin - origin;
+    inverseDot = 1.0 / (delta * delta);
+
+    for (Sentient *pSquad = m_pNextSquadMate; pSquad != this; pSquad = pSquad->m_pNextSquadMate) {
+        Vector squadDelta;
+        float  squadDot;
+
+        squadDelta = pSquad->origin - origin;
+        squadDot   = squadDelta * delta;
+        if (squadDot >= 0) {
+            Vector org;
+
+            org = squadDot * inverseDot * delta - squadDelta;
+            if (org * org >= Square(64)) {
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+/*
+===============
+Actor::VirtualEyePosition
+===============
+*/
+Vector Actor::VirtualEyePosition()
+{
+    if (m_pTurret && CurrentThink() == THINK_MACHINEGUNNER) {
+        // return the turret eye position
+        return m_pTurret->EyePosition();
+    } else {
+        return EyePosition();
+    }
+}
+
+/*
+===============
+Actor::CanTarget
+
+Actor can target.
+===============
+*/
+bool Actor::CanTarget(void)
+{
+    return true;
+}
+
+/*
+===============
+Actor::IsImmortal
+
+Actor is immortal ?
+===============
+*/
+bool Actor::IsImmortal(void)
+{
+    return false;
+}
+
+/*
+===============
+Actor::ShowInfo
+
+Prints basic actor information.
+===============
+*/
+void Actor::ShowInfo(void)
+{
+    Com_Printf("-------------------------------------------------------------------------------\n");
+    Com_Printf("Info for Actor:\n");
+    Com_Printf("Current think type: %s %s\n", ThinkStateName().c_str(), ThinkName().c_str());
+    Com_Printf("leash: %f\n", m_fLeash);
+    Com_Printf("mindist: %f\n", m_fMinDistance);
+    Com_Printf("maxdist: %f\n", m_fMaxDistance);
+
+    GlobalFuncs_t *func = &GlobalFuncs[CurrentThink()];
+    if (func->ShowInfo) {
+        (this->*func->ShowInfo)();
+    }
+
+    Com_Printf("-------------------------------------------------------------------------------\n");
+}
+
+/*
+===============
+Actor::ShowInfo
+
+Display actor info.
+===============
+*/
+void Actor::ShowInfo(float fDot, float fDist)
+{
+    float          fMaxDist, fMinDot;
+    static cvar_t *g_entinfo_max;
+
+    if (!bEntinfoInit) {
+        g_entinfo_max = gi.Cvar_Get("g_entinfo_max", "2048", 0);
+        bEntinfoInit  = true;
+    }
+
+    fMinDot  = 0.9f;
+    fMaxDist = g_entinfo_max->value;
+
+    if (IsKilledState(m_ThinkState)) {
+        fMinDot  = 0.99f;
+        fMaxDist = 512;
+    }
+
+    if (g_entinfo->integer != 4) {
+        if (fDot <= fMinDot) {
+            if (fDot <= 0 || fDist >= 256) {
+                return;
+            }
+        }
+
+        if (fMaxDist <= fDist || fDist <= 64) {
+            return;
+        }
+    }
+    if (!m_bEnableEnemy) {
+        Vector a = origin;
+        a.z += maxs.z + 74;
+
+        G_DebugString(a, 1.0, 1.0, 1.0, 1.0, "DISABLED");
+    }
+
+    {
+        Vector a = origin;
+        a.z += maxs.z + 56;
+
+        G_DebugString(a, 1.0, 1.0, 1.0, 1.0, "%i:%i:%s:%.1f", entnum, radnum, targetname.c_str(), health);
+    }
+
+    if (m_Enemy) {
+        Vector a = origin;
+        a.z += maxs.z + 38;
+
+        G_DebugString(
+            a,
+            1.0,
+            1.0,
+            1.0,
+            1.0,
+            "%i:%s:%.1f:%i",
+            m_Enemy->entnum,
+            m_Enemy->targetname.c_str(),
+            m_Enemy->health,
+            m_PotentialEnemies.GetCurrentThreat()
+        );
+    }
+
+    if (IsCuriousState(m_ThinkState)) {
+        Vector a = origin;
+        a.z += maxs.z + 20;
+
+        G_DebugString(
+            a,
+            1.0,
+            1.0,
+            1.0,
+            1.0,
+            "%s:%%%.1f",
+            Director.GetString(m_csThinkStateNames[THINKSTATE_CURIOUS]).c_str(),
+            m_PotentialEnemies.GetCurrentVisibility() * 100
+        );
+    } else {
+        Vector a = origin;
+        a.z += maxs.z + 20;
+
+        G_DebugString(a, 1.0, 1.0, 1.0, 1.0, "%s", ThinkStateName().c_str());
+    }
+
+    {
+        Vector a = origin;
+        a.z += maxs.z + 2;
+
+        str sAnimThreadFile = m_pAnimThread ? m_pAnimThread->FileName() : "(null)";
+
+        G_DebugString(
+            a,
+            1.0,
+            1.0,
+            1.0,
+            1.0,
+            "%s:%s:%i - %s",
+            ThinkName().c_str(),
+            m_pszDebugState,
+            m_State,
+            sAnimThreadFile.c_str()
+        );
+    }
+
+    if (g_entinfo->integer == 1) {
+        if (m_pGrenade) {
+            G_DebugLine(m_pGrenade->origin, m_vGrenadePos, 1.0, 0.0, 0.0, 1.0);
+        }
+
+        Vector a = m_vHome;
+        a.z += maxs.z + 18;
+
+        G_DebugLine(centroid, a, 0.0, 1.0, 0.0, 1.0);
+
+        G_DebugCircle(a, m_fLeash, 0.0, 1.0, 0.0, 1.0, true);
+
+        G_DebugCircle(centroid, m_fMinDistance, 1.0, 0.0, 0.0, 1.0, true);
+
+        G_DebugCircle(centroid, m_fMaxDistance, 0.0, 0.0, 1.0, 1.0, true);
+    } else if (g_entinfo->integer == 2) {
+        G_DebugCircle(centroid, m_fHearing, 1.0, 0.0, 0.0, 1.0, true);
+        G_DebugCircle(centroid, m_fSight, 0.0, 0.0, 1.0, 1.0, true);
+    }
+}
+
+/*
+===============
+Actor::ThinkName
+===============
+*/
+str Actor::ThinkName(void) const
+{
+    return Director.GetString(m_csThinkNames[CurrentThink()]);
+}
+
+/*
+===============
+Actor::ThinkStateName
+===============
+*/
+str Actor::ThinkStateName(void) const
+{
+    return Director.GetString(m_csThinkStateNames[m_ThinkState]);
+}
+
+/*
+===============
+Actor::MoveTo
+
+Move actor to specific location/listener with specific animation.
+===============
+*/
+void Actor::MoveTo(Event *ev)
+{
+    m_csPatrolCurrentAnim = ev->GetConstString(1);
+
+    if (ev->IsVectorAt(2)) {
+        Vector vec = ev->GetVector(2);
+        SetPatrolCurrentNode(vec);
+    } else {
+        SetPatrolCurrentNode(ev->GetListener(2));
+    }
+
+    if (m_patrolCurrentNode) {
+        m_vScriptGoal      = origin;
+        m_bScriptGoalValid = true;
+    }
+
+    SetThinkIdle(THINK_RUNNER);
+}
+
+/*
+===============
+Actor::WalkTo
+
+Walk to specific location.
+===============
+*/
+void Actor::WalkTo(Event *ev)
+{
+    Event event = Event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_WALKTO_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::RunTo
+
+Run to specific location.
+===============
+*/
+void Actor::RunTo(Event *ev)
+{
+    Event event = Event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_RUNTO_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::CrouchTo
+
+Crouch to specific location.
+===============
+*/
+void Actor::CrouchTo(Event *ev)
+{
+    Event event = Event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_CROUCHTO_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::CrawlTo
+
+Crawl to specific location.
+===============
+*/
+void Actor::CrawlTo(Event *ev)
+{
+    Event event = Event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_CRAWLTO_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::ClearAimNode
+
+Clear aim node.
+===============
+*/
+void Actor::ClearAimNode(void)
+{
+    if (m_aimNode) {
+        if (m_aimNode->IsSubclassOfTempWaypoint()) {
+            delete m_aimNode;
+        }
+        m_aimNode = NULL;
+    }
+}
+
+/*
+===============
+Actor::SetAimNode
+
+Change aim node.
+===============
+*/
+void Actor::SetAimNode(const Vector& vec)
+{
+    ClearAimNode();
+
+    m_aimNode = new TempWaypoint();
+    m_aimNode->setOrigin(vec);
+}
+
+/*
+===============
+Actor::SetAimNode
+
+Change aim node.
+===============
+*/
+void Actor::SetAimNode(Listener *l)
+{
+    ClearAimNode();
+    if (l) {
+        if (!l->inheritsFrom(&SimpleEntity::ClassInfo)) {
+            ScriptError(
+                "Bad aim node with classname '%s' specified for '%s' at (%f %f %f)\n",
+                l->getClassname(),
+                targetname.c_str(),
+                origin.x,
+                origin.y,
+                origin.z
+            );
+        }
+        m_aimNode = (SimpleEntity *)l;
+    }
+}
+
+/*
+===============
+Actor::AimAt
+
+Aim at specified target.
+===============
+*/
+void Actor::AimAt(Event *ev)
+{
+    if (ev->IsVectorAt(1)) {
+        SetAimNode(ev->GetVector(1));
+    } else {
+        SetAimNode(ev->GetListener(1));
+    }
+
+    SetThinkIdle(m_aimNode ? THINK_AIM : THINK_IDLE);
+}
+
+/*
+===============
+Actor::LookAtLookEntity
+
+Change current look entity.
+===============
+*/
+void Actor::LookAtLookEntity(void)
+{
+    Vector dir;
+
+    if (m_pLookEntity->IsSubclassOfSentient()) {
+        Sentient *sen = static_cast<Sentient *>(m_pLookEntity.Pointer());
+        dir           = sen->EyePosition() - EyePosition();
+    } else {
+        dir = m_pLookEntity->centroid - EyePosition();
+    }
+
+    SetDesiredLookDir(dir);
+}
+
+/*
+===============
+Actor::IdleLook
+
+Idle look behaviour.
+===============
+*/
+void Actor::IdleLook(void)
+{
+    if (m_pLookEntity) {
+        LookAtLookEntity();
+    } else {
+        ForwardLook();
+    }
+}
+
+/*
+===============
+Actor::IdleLook
+
+Idle look behaviour.
+===============
+*/
+void Actor::IdleLook(vec3_t dir)
+{
+    if (m_pLookEntity) {
+        LookAtLookEntity();
+    } else {
+        SetDesiredLookDir(dir);
+    }
+}
+
+/*
+===============
+Actor::ClearLookEntity
+
+Clear look entity.
+===============
+*/
+void Actor::ClearLookEntity(void)
+{
+    if (m_pLookEntity) {
+        if (m_pLookEntity->IsSubclassOfTempWaypoint()) {
+            delete m_pLookEntity;
+        }
+        m_pLookEntity = NULL;
+    }
+}
+
+/*
+===============
+Actor::LookAt
+
+Change current look entity.
+===============
+*/
+void Actor::LookAt(const Vector& vec)
+{
+    if (g_showlookat->integer == entnum || g_showlookat->integer == -1) {
+        Com_Printf(
+            "Script lookat: %i %i %s looking at point %.0f %.0f %.0f\n",
+            entnum,
+            radnum,
+            targetname.c_str(),
+            vec.x,
+            vec.y,
+            vec.z
+        );
+    }
+
+    ClearLookEntity();
+
+    m_pLookEntity = new TempWaypoint();
+    m_pLookEntity->setOrigin(vec);
+}
+
+/*
+===============
+Actor::LookAt
+
+Change current look entity.
+===============
+*/
+void Actor::LookAt(Listener *l)
+{
+    ClearLookEntity();
+    if (!l) {
+        if (g_showlookat->integer == entnum || g_showlookat->integer == -1) {
+            Com_Printf("Script lookat: %i %i %s cleared lookat\n", entnum, radnum, TargetName().c_str());
+        }
+        return;
+    }
+
+    if (!l->isSubclassOf(SimpleEntity)) {
+        ScriptError(
+            "Bad look entity with classname '%s' specified for '%s' at (%f %f %f)\n",
+            l->getClassname(),
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z
+        );
+    }
+
+    if (l != this) {
+        l = (SimpleEntity *)l;
+        if (g_showlookat->integer == entnum || g_showlookat->integer == -1) {
+            Com_Printf(
+                "Script lookat: %i %i %s looking at point %.0f %.0f %.0f\n",
+                entnum,
+                radnum,
+                targetname.c_str(),
+                ((SimpleEntity *)l)->origin.x,
+                ((SimpleEntity *)l)->origin.y,
+                ((SimpleEntity *)l)->origin.z
+            );
+        }
+        m_pLookEntity = (SimpleEntity *)l;
+    }
+}
+
+/*
+===============
+Actor::EventLookAt
+
+Look at event.
+===============
+*/
+void Actor::EventLookAt(Event *ev)
+{
+    if (ev->IsVectorAt(1)) {
+        LookAt(ev->GetVector(1));
+    } else {
+        LookAt(ev->GetListener(1));
+    }
+
+    m_iLookFlags = 0;
+}
+
+/*
+===============
+Actor::EventEyesLookAt
+
+Eyes look at event.
+===============
+*/
+void Actor::EventEyesLookAt(Event *ev)
+{
+    EventLookAt(ev);
+
+    m_iLookFlags = LOOK_FLAG_EYE;
+}
+
+/*
+===============
+Actor::NoPoint
+
+Don't point at anything.
+===============
+*/
+void Actor::NoPoint(void)
+{
+    VectorClear(m_vLUpperArmDesiredAngles);
+}
+
+/*
+===============
+Actor::IdlePoint
+
+Idle point behaviour.
+===============
+*/
+void Actor::IdlePoint(void)
+{
+    if (!m_pPointEntity) {
+        NoPoint();
+        return;
+    }
+
+    Vector delta = m_pPointEntity->centroid - origin;
+    delta.normalize();
+
+    Vector pointAngles = delta.toAngles();
+    pointAngles.y -= angles.y;
+
+    pointAngles += Vector(0, 30, 0);
+    pointAngles.y = AngleNormalize180(delta.y);
+    pointAngles.y = Q_clamp_float(pointAngles.y, -80, 100);
+
+    m_vLUpperArmDesiredAngles[0] = pointAngles[0];
+    m_vLUpperArmDesiredAngles[1] = pointAngles[1];
+    m_vLUpperArmDesiredAngles[2] = pointAngles[2];
+}
+
+/*
+===============
+Actor::ClearPointEntity
+
+Clear point entity.
+===============
+*/
+void Actor::ClearPointEntity(void)
+{
+    if (m_pPointEntity) {
+        if (m_pPointEntity->IsSubclassOfTempWaypoint()) {
+            delete m_pPointEntity;
+        }
+        m_pPointEntity = NULL;
+    }
+}
+
+/*
+===============
+Actor::PointAt
+
+Change point entity.
+===============
+*/
+void Actor::PointAt(const Vector& vec)
+{
+    ClearPointEntity();
+
+    m_pPointEntity = new TempWaypoint();
+    m_pPointEntity->setOrigin(vec);
+}
+
+/*
+===============
+Actor::PointAt
+
+Change point entity.
+===============
+*/
+void Actor::PointAt(Listener *l)
+{
+    ClearPointEntity();
+
+    if (l) {
+        if (l->isSubclassOf(SimpleEntity)) {
+            ScriptError(
+                "Bad point entity with classname '%s' specified for '%s' at (%f %f %f)\n",
+                l->getClassname(),
+                targetname.c_str(),
+                origin.x,
+                origin.y,
+                origin.z
+            );
+        }
+
+        if (l != this) {
+            m_pPointEntity = static_cast<SimpleEntity *>(l);
+        }
+    }
+}
+
+/*
+===============
+Actor::EventPointAt
+
+Point at event.
+===============
+*/
+void Actor::EventPointAt(Event *ev)
+{
+    if (ev->IsVectorAt(1)) {
+        PointAt(ev->GetVector(1));
+    } else {
+        PointAt(ev->GetListener(1));
+    }
+}
+
+/*
+===============
+Actor::IdleTurn
+
+Idle turn behaviour.
+===============
+*/
+void Actor::IdleTurn(void)
+{
+    if (!m_pTurnEntity) {
+        return;
+    }
+
+    for (int i = 0; i < 2; i++) {
+        if (m_pTurnEntity == this) {
+            StopTurning();
+            m_pTurnEntity = NULL;
+            return;
+        }
+
+        SetDesiredYawDest(m_pTurnEntity->centroid);
+
+        float error = m_DesiredYaw - angles[1];
+        if (error > 180) {
+            error -= 360;
+        } else if (error < -180) {
+            error += 360;
+        }
+
+        if (error >= m_fTurnDoneError + 0.001f || error <= -m_fTurnDoneError - 0.001f) {
+            return;
+        }
+
+        SafePtr<SimpleEntity> prevTurnEntity = m_pTurnEntity;
+
+        Director.Unpause();
+        Unregister(STRING_TURNDONE);
+        Director.Pause();
+
+        if (m_pTurnEntity == prevTurnEntity) {
+            break;
+        }
+    }
+}
+
+/*
+===============
+Actor::ClearTurnEntity
+
+Clear turn entity.
+===============
+*/
+void Actor::ClearTurnEntity(void)
+{
+    if (m_pTurnEntity) {
+        if (m_pTurnEntity->IsSubclassOfTempWaypoint()) {
+            delete m_pTurnEntity;
+        }
+        m_pTurnEntity = NULL;
+    }
+}
+
+/*
+===============
+Actor::TurnTo
+
+Change turn entity.
+===============
+*/
+void Actor::TurnTo(const Vector& vec)
+{
+    ClearTurnEntity();
+
+    m_pTurnEntity = new TempWaypoint();
+    m_pTurnEntity->setOrigin(vec);
+}
+
+/*
+===============
+Actor::TurnTo
+
+Change turn entity.
+===============
+*/
+void Actor::TurnTo(Listener *l)
+{
+    ClearTurnEntity();
+
+    if (!l) {
+        m_pTurnEntity = this;
+        return;
+    }
+
+    if (!l->isSubclassOf(SimpleEntity)) {
+        ScriptError(
+            "Bad turn entity with classname '%s' specified for '%s' at (%f %f %f)\n",
+            l->getClassname(),
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z
+        );
+    }
+
+    m_pTurnEntity = (SimpleEntity *)l;
+}
+
+/*
+===============
+Actor::EventTurnTo
+
+Turn to event.
+===============
+*/
+void Actor::EventTurnTo(Event *ev)
+{
+    if (ev->IsVectorAt(1)) {
+        TurnTo(ev->GetVector(1));
+    } else {
+        TurnTo(ev->GetListener(1));
+    }
+}
+
+/*
+===============
+Actor::EventSetTurnDoneError
+
+Set the error amount that turndone will occur for the turnto command.
+===============
+*/
+void Actor::EventSetTurnDoneError(Event *ev)
+{
+    m_fTurnDoneError = ev->GetFloat(1);
+    if (m_fTurnDoneError < 0) {
+        m_fTurnDoneError = 0;
+        ScriptError("turndoneerror was set to a negative value - capped to 0");
+    }
+}
+
+/*
+===============
+Actor::EventGetTurnDoneError
+
+Get the error amount that turndone will occur for the turnto command.
+===============
+*/
+void Actor::EventGetTurnDoneError(Event *ev)
+{
+    ev->AddFloat(m_fTurnDoneError);
 }
 
 /*
@@ -5847,18 +4945,15 @@ Give weapon to actor.
 Called from STRING_GLOBAL_WEAPON_SCR.
 ===============
 */
-void Actor::EventGiveWeaponInternal
-	(
-	Event *ev
-	)
+void Actor::EventGiveWeaponInternal(Event *ev)
 {
-	Holster();
-	RemoveWeapons();
-	str weapName = ev->GetString(1);
-	if (giveItem(weapName))
-	{
-		Unholster();
-	}
+    Holster();
+    RemoveWeapons();
+
+    const str weapName = ev->GetString(1);
+    if (weapName.length() > 0 && giveItem(weapName)) {
+        Unholster();
+    }
 }
 
 /*
@@ -5868,32 +4963,27 @@ Actor::EventGiveWeapon
 Give weapon to actor.
 ===============
 */
-void Actor::EventGiveWeapon
-	(
-	Event *ev
-	)
+void Actor::EventGiveWeapon(Event *ev)
 {
-	Event e1(EV_Listener_ExecuteScript);
-	str weapName = ev->GetString(1);
-	weapName.tolower();
-	const_str csWeapName = Director.AddString(weapName);
+    Event event(EV_Listener_ExecuteScript);
 
-	m_csLoadOut = csWeapName;
+    str weapName = ev->GetString(1);
+    weapName.tolower();
 
-	if (csWeapName == STRING_MG42)
-	{
-		csWeapName = STRING_MP40;
-	}
+    m_csLoadOut = Director.AddString(weapName);
 
-	m_csWeapon = csWeapName;
+    if (m_csLoadOut == STRING_MG42) {
+        m_csWeapon = STRING_MP40;
+    } else {
+        m_csWeapon = m_csLoadOut;
+    }
 
-	setModel();
+    setModel();
 
-	e1.AddConstString(STRING_GLOBAL_WEAPON_SCR);
-	e1.AddString(weapName);
-	glbs.Printf("EventGiveWeapon script: %s weapName: %s \n", Director.GetString(STRING_GLOBAL_WEAPON_SCR).c_str(), weapName.c_str());
-	ExecuteScript(&e1);
+    event.AddConstString(STRING_GLOBAL_WEAPON_SCR);
+    event.AddString(weapName);
 
+    ExecuteScript(&event);
 }
 
 /*
@@ -5903,1460 +4993,9 @@ Actor::EventGetWeapon
 Returns weapon path to script.
 ===============
 */
-void Actor::EventGetWeapon
-	(
-	Event *ev
-	)
+void Actor::EventGetWeapon(Event *ev)
 {
-	ev->AddConstString(m_csWeapon);
-}
-
-/*
-===============
-Actor::FireWeapon
-
-Fire weapon from script.
-===============
-*/
-void Actor::FireWeapon
-	(
-	Event *ev
-	)
-{
-	Sentient::FireWeapon(WEAPON_MAIN, FIRE_PRIMARY);
-}
-
-/*
-===============
-Actor::CanTarget
-
-Actor can target.
-===============
-*/
-bool Actor::CanTarget
-	(
-	void
-	)
-{
-	return true;
-}
-
-/*
-===============
-Actor::IsImmortal
-
-Actor is immortal ?
-===============
-*/
-bool Actor::IsImmortal
-	(
-	void
-	)
-{
-	return false;
-}
-
-bool Actor::IsVoidState
-	(
-	int state
-	)
-{
-	return true;
-}
-
-bool Actor::IsCuriousState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_CURIOUS;
-}
-
-bool Actor::IsDisguiseState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_DISGUISE;
-}
-
-bool Actor::IsAttackState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_ATTACK;
-}
-
-bool Actor::IsGrenadeState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_GRENADE;
-}
-
-bool Actor::IsPainState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_PAIN;
-}
-
-bool Actor::IsKilledState
-	(
-	int state
-	)
-{
-	return state == THINKSTATE_KILLED;
-}
-
-bool Actor::IsMachineGunnerState
-	(
-	int state
-	)
-{
-	return true;
-}
-
-bool Actor::IsDogState
-	(
-	int state
-	)
-{
-	return true;
-}
-
-/*
-===============
-Actor::IgnoreSoundSet
-
-Make actor ignore iType sound.
-===============
-*/
-void Actor::IgnoreSoundSet
-	(
-	int iType
-	)
-{
-	m_iIgnoreSoundsMask |= 1 << iType;
-}
-
-/*
-===============
-Actor::IgnoreSoundSetAll
-
-Make actor ignore all types of sound.
-===============
-*/
-void Actor::IgnoreSoundSetAll
-	(
-	void
-	)
-{
-	m_iIgnoreSoundsMask = ~AI_EVENT_NONE;
-}
-
-/*
-===============
-Actor::IgnoreSoundClear
-
-Don't ignore iType of sound.
-===============
-*/
-void Actor::IgnoreSoundClear
-	(
-	int iType
-	)
-{
-	m_iIgnoreSoundsMask &= ~iType;
-}
-
-/*
-===============
-Actor::IgnoreSoundClearAll
-
-Make actor ignore no type of sound.
-===============
-*/
-void Actor::IgnoreSoundClearAll
-	(
-	void
-	)
-{
-	m_iIgnoreSoundsMask = 0;
-}
-
-/*
-===============
-Actor::IgnoreSoundClearAll
-
-returns true if actor should ignore iType of sound.
-===============
-*/
-bool Actor::IgnoreSound
-	(
-	int iType
-	)
-{
-	return ( m_iIgnoreSoundsMask >> iType ) & 1;
-}
-
-/*
-===============
-Actor::EventShareEnemy
-
-Share enemy with squad mates.
-===============
-*/
-void Actor::EventShareEnemy
-	(
-	Event *ev
-	)
-{
-
-	if (m_Enemy)
-	{
-		if (!EnemyIsDisguised())
-		{
-			for (Actor * pSquadMate = (Actor *)m_pNextSquadMate.Pointer(); pSquadMate != this; pSquadMate = (Actor *)pSquadMate->m_pNextSquadMate.Pointer())
-			{
-				if (pSquadMate->IsSubclassOfActor())
-				{
-					Vector dist = pSquadMate->origin - origin;
-					float distSq = dist * dist;
-					if (pSquadMate->m_fMaxShareDistSquared == 0.0 || distSq <= pSquadMate->m_fMaxShareDistSquared)
-					{
-						pSquadMate->m_PotentialEnemies.ConfirmEnemyIfCanSeeSharerOrEnemy(pSquadMate, this, m_Enemy);
-					}
-				}
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::EventShareGrenade
-
-Share grenade with squad mates.
-===============
-*/
-void Actor::EventShareGrenade
-	(
-		Event *ev
-	)
-{
-	
-	if (m_pGrenade)
-	{
-		for (Actor * pSquadMate = (Actor *)m_pNextSquadMate.Pointer(); pSquadMate != this; pSquadMate = (Actor *)pSquadMate->m_pNextSquadMate.Pointer())
-		{
-			if (pSquadMate->IsSubclassOfActor())
-			{
-				if (!pSquadMate->m_pGrenade)
-				{
-					Vector dist = pSquadMate->origin - origin;
-					float distSq = Square(dist);
-					
-					if (distSq < Square(768))
-					{
-						
-						if (DoesTheoreticPathExist(pSquadMate->origin, 1536))
-						{
-							pSquadMate->SetGrenade(m_pGrenade);
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::ReceiveAIEvent
-
-Calls proper RecieveAIEvent for current ThinkState.
-===============
-*/
-void Actor::ReceiveAIEvent
-	(
-	vec3_t event_origin,
-	int iType,
-	Entity *originator,
-	float fDistSquared,
-	float fMaxDistSquared
-	)
-{
-	if (originator != this && originator != GetActiveWeapon(WEAPON_MAIN))
-	{
-
-		GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
-
-		if (func->ReceiveAIEvent)
-			(this->*func->ReceiveAIEvent)(event_origin, iType, originator, fDistSquared, fMaxDistSquared);
-	}
-}
-
-/*
-===============
-Actor::DefaultReceiveAIEvent
-
-Default AI event handler.
-===============
-*/
-void Actor::DefaultReceiveAIEvent
-	(
-	vec3_t event_origin,
-	int iType,
-	Entity *originator,
-	float fDistSquared,
-	float fMaxDistSquared
-	)
-{
-	if (!IsDead())
-	{
-		if (!originator->IsDead() && originator->IsSubclassOfSentient() && ((Sentient *)originator)->m_Team == m_Team && !IsSquadMate((Sentient *)originator))
-		{
-			MergeWithSquad((Sentient *)originator);
-		}
-
-		switch (iType)
-		{
-		case AI_EVENT_WEAPON_FIRE:
-		case AI_EVENT_WEAPON_IMPACT:
-			if ( Square(m_fHearing) > fDistSquared)
-				WeaponSound(iType, event_origin, fDistSquared, fMaxDistSquared, originator);
-			break;
-		case AI_EVENT_EXPLOSION:
-		case AI_EVENT_MISC:
-		case AI_EVENT_MISC_LOUD:
-			if ( Square(m_fHearing) > fDistSquared)
-				CuriousSound(iType, event_origin, fDistSquared, fMaxDistSquared);
-			break;
-		case AI_EVENT_AMERICAN_VOICE:
-		case AI_EVENT_GERMAN_VOICE:
-		case AI_EVENT_AMERICAN_URGENT:
-		case AI_EVENT_GERMAN_URGENT:
-			if ( Square(m_fHearing) > fDistSquared)
-				VoiceSound(iType, event_origin, fDistSquared, fMaxDistSquared, originator);
-			break;
-		case AI_EVENT_FOOTSTEP:
-			if ( Square(m_fHearing) > fDistSquared)
-				FootstepSound(event_origin, fDistSquared, fMaxDistSquared, originator);
-			break;
-		case AI_EVENT_GRENADE:
-			GrenadeNotification(originator);
-			break;
-		default:
-			{
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"unknown ai_event type\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("iType = %i", iType));
-				assert(false && assertStr);
-			}
-			break;
-		}
-	}
-}
-
-/*
-===============
-Actor::PriorityForEventType
-
-Returns priority for event type.
-===============
-*/
-int Actor::PriorityForEventType
-	(
-	int iType
-	)
-{
-	switch( iType )
-	{
-
-	//FIXME: return macros
-	case AI_EVENT_WEAPON_FIRE:
-		return 7;
-	case AI_EVENT_WEAPON_IMPACT:
-		return 5;
-	case AI_EVENT_EXPLOSION:
-		return 6;
-	case AI_EVENT_AMERICAN_VOICE:
-	case AI_EVENT_GERMAN_VOICE:
-		return 3;
-	case AI_EVENT_AMERICAN_URGENT:
-	case AI_EVENT_GERMAN_URGENT:
-		return 4;
-	case AI_EVENT_MISC:
-		return 1;
-	case AI_EVENT_MISC_LOUD:
-	case AI_EVENT_FOOTSTEP:
-		return 2;
-	case AI_EVENT_GRENADE:
-		return 8;
-	default:
-		assert( !"PriorityForEventType: unknown ai_event type" );
-		return 0;
-	}
-}
-
-/*
-===============
-Actor::CuriousSound
-
-Handles curious sound.
-===============
-*/
-void Actor::CuriousSound
-	(
-	int iType,
-	vec3_t sound_origin,
-	float fDistSquared,
-	float fMaxDistSquared
-	)
-{
-	float v7, v8, fRangeFactor = 1.0;
-	int iPriority;
-	if (m_bEnableEnemy)
-	{
-		if (m_ThinkStates[THINKLEVEL_NORMAL] == THINKSTATE_IDLE || m_ThinkStates[THINKLEVEL_NORMAL] == THINKSTATE_CURIOUS)
-		{
-			//FIXME: name variables.
-			if (fMaxDistSquared != 0.0)
-			{
-				v7 = 1*(1.0/3) - fDistSquared * (1*(1.0 / 3)) / fMaxDistSquared;
-				if (v7 <= 1.0)
-					fRangeFactor = v7;
-			}
-			v8 = fRangeFactor * m_fSoundAwareness;
-			//FIXME: macro
-			if (v8 >= rand() * 0.000000046566129)
-			{
-				RaiseAlertnessForEventType(iType);
-				iPriority = PriorityForEventType(iType);
-				if (iPriority >= m_iCuriousLevel)
-				{
-					m_iCuriousLevel = iPriority;
-					if (iType == AI_EVENT_WEAPON_IMPACT)
-					{
-						//FIXME: macro
-						if (fDistSquared <= Square(192))
-							SetCuriousAnimHint(1);
-					}
-					else if (iType > AI_EVENT_WEAPON_IMPACT)
-					{
-						if (iType == AI_EVENT_EXPLOSION)
-						{
-							//FIXME: macro
-							if (fDistSquared <= Square(768))
-								SetCuriousAnimHint(3);
-						}
-						else
-						{
-							SetCuriousAnimHint(5);
-						}
-					}
-					else if (iType == AI_EVENT_WEAPON_FIRE)
-					{
-						//FIXME: macro
-						if (fDistSquared <= Square(512))
-							SetCuriousAnimHint(2);
-					}
-					else
-					{
-						SetCuriousAnimHint(5);
-					}
-
-					SetEnemyPos(sound_origin);
-					
-					EndCurrentThinkState();
-					SetThinkState(THINKSTATE_CURIOUS, THINKLEVEL_NORMAL);
-
-					m_pszDebugState = G_AIEventStringFromType(iType);
-				}
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::WeaponSound
-
-Handles weapon sound.
-===============
-*/
-void Actor::WeaponSound
-	(
-	int iType,
-	vec3_t sound_origin,
-	float fDistSquared,
-	float fMaxDistSquared,
-	Entity *originator
-	)
-{
-	Sentient *pOwner;
-	gi.Printf("Actor::WeaponSound");
-	if (originator->IsSubclassOfWeapon())
-	{
-		pOwner = ((Weapon *)originator)->GetOwner();
-	}
-	else
-	{
-		if (!originator->IsSubclassOfProjectile())
-		{
-			char assertStr[16317] = { 0 };
-			strcpy(assertStr, "\"Actor::WeaponSound: non-weapon made a weapon sound.\\n\"\n\tMessage: ");
-			Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("class = %s", originator->getClassname()));
-			assert(false && assertStr);
-			
-			return;
-		}
-		pOwner = ((Projectile *)originator)->GetOwner();
-	}
-
-	if (!pOwner)
-	{
-		return;
-	}
-	Sentient *pEnemy;
-
-	pEnemy = pOwner->m_Enemy;
-	if (pOwner->m_Team == m_Team)
-	{
-		if (!pEnemy)
-		{
-			if (pOwner->IsSubclassOfActor())
-			{
-				Actor *pAOwner = (Actor *)pOwner;
-				//FIXME: macro
-				if (originator->IsSubclassOfWeapon() && pAOwner->m_Think[0] == THINK_MACHINEGUNNER)
-				{
-					Weapon *pWOriginator = (Weapon *)originator;
-					if (pWOriginator->aim_target)
-					{
-						if (pWOriginator->aim_target->IsSubclassOfSentient())
-						{
-							if (((Sentient *)(pWOriginator->aim_target.Pointer()))->m_Team != pAOwner->m_Team)
-								pEnemy = (Sentient *)(pWOriginator->aim_target.Pointer());
-						}
-						else if (pAOwner->m_Team == TEAM_GERMAN)
-						{
-							for (pEnemy = level.m_HeadSentient[1]; ; pEnemy = pEnemy->m_NextSentient)
-							{
-								if (!pEnemy)
-								{
-									return;
-								}
-								Vector vDist = pEnemy->centroid - pWOriginator->aim_target->origin;
-								if (vDist.lengthSquared() <= 2304 || vDist.lengthSquared() != 2304)
-								{
-									break;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		if (!pEnemy)
-			return;
-	}
-	else
-	{
-		if (!pEnemy)
-			return;
-	}
-
-	//v14 = &this->m_PotentialEnemies;
-	if (m_PotentialEnemies.CaresAboutPerfectInfo(pEnemy))
-	{
-		float fDist = sqrt(fDistSquared);
-		if (NoticeShot(pOwner, pEnemy, fDist))
-		{
-			m_PotentialEnemies.ConfirmEnemy(this, pOwner);
-			CuriousSound(iType, sound_origin, fDistSquared, fMaxDistSquared);
-		}
-	}
-}
-
-/*
-===============
-Actor::FootstepSound
-
-Handles footstep sound.
-===============
-*/
-void Actor::FootstepSound
-	(
-	vec3_t sound_origin,
-	float fDistSquared,
-	float fMaxDistSquared,
-	Entity *originator
-	)
-{
-	if (originator->IsSubclassOfSentient())
-	{
-		if ( (m_ThinkStates[THINKLEVEL_NORMAL] == THINKSTATE_IDLE || m_ThinkStates[THINKLEVEL_NORMAL] == THINKSTATE_CURIOUS ) && m_bEnableEnemy)
-		{
-			if (NoticeFootstep((Sentient *)originator))
-			{
-				CuriousSound(AI_EVENT_FOOTSTEP, sound_origin, fDistSquared, fMaxDistSquared);
-			}
-		}
-	}
-	else
-	{
-		char assertStr[16317] = { 0 };
-		strcpy(assertStr, "\"'ai_event footstep' in a tiki used by something besides AI or player.\\n\"\n\tMessage: ");
-		Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
-		assert(false && assertStr);
-	}
-}
-
-/*
-===============
-Actor::VoiceSound
-
-Handles voice sound.
-===============
-*/
-void Actor::VoiceSound
-	(
-	int iType,
-	vec3_t sound_origin,
-	float fDistSquared,
-	float fMaxDistSquared,
-	Entity *originator
-	)
-{
-	bool bFriendly;
-	//FIXME: macros
-	if ((m_ThinkStates[THINKLEVEL_NORMAL] != THINKSTATE_IDLE && m_ThinkStates[THINKLEVEL_NORMAL] != THINKSTATE_CURIOUS) || !m_bEnableEnemy)
-		return;
-
-	bFriendly = m_Team == TEAM_GERMAN;
-	
-	if (iType <= AI_EVENT_GERMAN_VOICE)
-	{
-		assert(iType == AI_EVENT_AMERICAN_VOICE);
-	}
-	else
-	{
-		assert(iType <= AI_EVENT_GERMAN_URGENT);
-
-		if (iType == AI_EVENT_AMERICAN_URGENT)
-		{
-			bFriendly = m_Team == TEAM_AMERICAN;
-		}
-	}
-
-	if (bFriendly)
-	{
-		if (NoticeVoice((Sentient *)originator))
-		{
-			CuriousSound(iType, sound_origin, fDistSquared, fMaxDistSquared);
-		}
-	}
-
-}
-
-/*
-===============
-Actor::GrenadeNotification
-
-Handles grenade notification.
-===============
-*/
-void Actor::GrenadeNotification
-	(
-	Entity *originator
-	)
-{
-	if (!m_pGrenade)
-	{
-		if (CanSeeFOV(originator))
-		{
-			assert(originator->IsSubclassOfProjectile());
-
-			SetGrenade(originator);
-			Event e1(EV_Actor_ShareGrenade);
-			PostEvent(e1, 0.5);
-
-			Anim_Say(STRING_ANIM_SAY_GRENADE_SIGHTED_SCR, 0, true);
-		}
-	}
-
-	if (m_pGrenade == originator)
-	{
-
-		float fGrav, fDeltaZ, fVelDivGrav, fTimeLand;
-		vec2_t vLand;
-		vec2_t vMove;
-
-		fGrav = sv_gravity->value * m_pGrenade->gravity;
-
-		fDeltaZ = originator->origin[2] - origin[2];
-
-		fVelDivGrav = originator->velocity[2] / fGrav;
-
-		//from s=v*t + 0.5*a*t^2, apply for z velocity, solve.
-		fTimeLand = fVelDivGrav + sqrt((fDeltaZ + fDeltaZ) / fGrav + Square(fVelDivGrav));
-
-
-		VectorMA2D(originator->origin, fTimeLand, originator->velocity, vLand);
-
-		VectorSub2D(m_vGrenadePos, vLand, vMove);
-		
-		if (VectorLength2D(vMove) > 16)
-		{
-			m_vGrenadePos = Vector(vLand[0], vLand[1], origin[2]);
-			m_bGrenadeBounced = true;
-		}
-		
-	}
-}
-
-/*
-===============
-Actor::SetGrenade
-
-Set current grenade.
-===============
-*/
-void Actor::SetGrenade
-	(
-	Entity *pGrenade
-	)
-{
-	m_pGrenade = pGrenade;
-	
-	m_bGrenadeBounced = true;
-	
-	m_iFirstGrenadeTime = level.inttime;
-
-	m_vGrenadePos = pGrenade->origin;
-
-}
-
-/*
-===============
-Actor::NotifySquadmateKilled
-
-Handle squadmate killed notification.
-===============
-*/
-void Actor::NotifySquadmateKilled
-	(
-	Sentient *pSquadMate,
-	Sentient *pAttacker
-	)
-{
-	if (m_PotentialEnemies.CaresAboutPerfectInfo(pAttacker))
-	{
-
-		Vector dist = pSquadMate->origin - origin;
-		float distSq = dist * dist;
-		if (distSq < m_fSight*m_fSight)
-		{
-			bool shouldConfirm = false;
-			if (gi.AreasConnected(edict->r.areanum,pSquadMate->edict->r.areanum))
-			{
-				shouldConfirm = G_SightTrace(
-					EyePosition(),
-					vec_zero,
-					vec_zero,
-					pSquadMate->EyePosition(),
-					this,
-					pSquadMate,
-					MASK_TRANSITION,
-					qfalse,
-					"Actor::NotifySquadmateKilled");
-			}
-			//FIXME: macro for that constant
-			if (!shouldConfirm)
-			{
-				if (distSq <= Square(768))
-				{
-					Vector start, end;
-					if (origin.z <= pSquadMate->origin.z)
-					{
-						start = origin;
-						end = pSquadMate->origin;
-					}
-					else
-					{
-						start = pSquadMate->origin;
-						end = origin;
-					}
-					shouldConfirm = m_Path.DoesTheoreticPathExist(start, end, this, 1536, 0, 0);
-				}
-			}
-			if (shouldConfirm)
-			{
-				m_PotentialEnemies.ConfirmEnemy(this, pAttacker);
-			}
-		}
-	}
-}
-
-/*
-===============
-Actor::RaiseAlertnessForEventType
-
-Raise alertness(enemy notice) for specifc event.
-===============
-*/
-void Actor::RaiseAlertnessForEventType
-	(
-	int iType
-	)
-{
-	float fAmount;
-
-	switch (iType)
-	{
-	case AI_EVENT_WEAPON_FIRE:
-		fAmount = 0.2f;
-	case AI_EVENT_WEAPON_IMPACT:
-		fAmount = 0.1f;
-	case AI_EVENT_EXPLOSION:
-		fAmount = 0.4f;
-	case AI_EVENT_AMERICAN_VOICE:
-	case AI_EVENT_AMERICAN_URGENT:
-		if (m_Team == TEAM_AMERICAN)
-			return;
-		fAmount = 0.25f;
-	case AI_EVENT_MISC:
-		fAmount = 0.02f;
-	case AI_EVENT_MISC_LOUD:
-	case AI_EVENT_FOOTSTEP:
-		fAmount = 0.05f;
-	case AI_EVENT_GRENADE:
-		fAmount = 0.04f;
-		break;
-	case AI_EVENT_GERMAN_VOICE:
-	case AI_EVENT_GERMAN_URGENT:
-		if (m_Team == TEAM_AMERICAN)
-		{
-			RaiseAlertness(0.25);
-		}
-	default:
-		char assertStr[16317] = { 0 };
-		strcpy(assertStr, "\"Actor::RaiseAlertnessForEventType: unknown event type\\n\"\n\tMessage: ");
-		Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
-		assert(false && assertStr);
-		return;
-		break;
-	}
-	RaiseAlertness(fAmount);
-}
-
-/*
-===============
-Actor::RaiseAlertness
-
-Lower enemy notice time by fAmount.
-===============
-*/
-void Actor::RaiseAlertness
-	(
-	float fAmount
-	)
-{
-	float fMaxAmount;
-
-	fMaxAmount = m_fNoticeTimeScale * 2/3;
-
-	m_fNoticeTimeScale -= fAmount <= fMaxAmount ? fAmount : fMaxAmount;
-}
-
-/*
-===============
-Actor::CanSee
-
-Returns true if actor cansee entity through fov and vision_distance.
-===============
-*/
-bool Actor::CanSee
-	(
-	Entity *e1,
-	float fov,
-	float vision_distance,
-	bool bNoEnts
-	)
-{
-	bool canSee = Sentient::CanSee(e1, fov, vision_distance, false);
-	if (e1 == m_Enemy)
-	{
-		m_iEnemyVisibleCheckTime = level.inttime;
-		if (canSee)
-		{
-			SetEnemyPos(e1->origin);
-			m_bEnemyIsDisguised = m_Enemy->m_bIsDisguised;
-			m_iEnemyCheckTime = level.inttime;
-			m_iLastEnemyVisibleTime = level.inttime;
-		}
-		
-		if (canSee != m_bEnemyVisible)
-		{
-			m_bEnemyVisible = true;
-			m_iEnemyVisibleChangeTime = level.inttime;
-		}
-
-		if (fov != 0)
-		{
-			
-			m_iEnemyFovCheckTime = level.inttime;
-			if (canSee != m_bEnemyInFOV)
-			{
-				m_bEnemyInFOV = true;
-				m_iEnemyFovChangeTime = level.inttime;
-			}
-		}
-	}
-	return canSee;
-}
-
-/*
-===============
-Actor::GunPosition
-
-Returns current gun position.
-===============
-*/
-Vector Actor::GunPosition
-	(
-	void
-	)
-{
-	if (m_iGunPositionCheckTime < level.inttime)
-	{
-		m_iGunPositionCheckTime = level.inttime;
-		Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
-		if (weap)
-		{
-			weap->GetMuzzlePosition(&m_vGunPosition);
-		}
-		else
-		{
-			m_vGunPosition = vec_zero;
-		}
-	}
-	return m_vGunPosition;
-}
-
-/*
-===============
-Actor::WithinVisionDistance
-
-Returns true if entity is witthin vision distance.
-===============
-*/
-bool Actor::WithinVisionDistance
-	(
-	Entity *ent
-	) const
-{
-	float fRadius = world->m_fAIVisionDistance;
-
-	if(fRadius == 0 )
-	{
-		fRadius = m_fSight;
-	}
-	else if( m_fSight <= fRadius )
-	{
-		fRadius = m_fSight;
-	}
-
-	if( ent )
-	{
-		Vector vDelta = ent->origin - origin;
-		//it's basically the same as vDelta.length() < fRadius,
-		//but this is faster because sqrt in vDelta.length() is slower than multiplication.
-		return vDelta.lengthSquared() < Square(fRadius);
-	}
-
-	return false;
-}
-
-/*
-===============
-Actor::InFOV
-
-Returns true if positin is within fov.
-===============
-*/
-bool Actor::InFOV
-	(
-	Vector pos,
-	float check_fov,
-	float check_fovdot
-	)
-{
-
-	bool bInFov = true;
-	if (check_fov != 360.0)
-	{
-		Vector delta = pos - EyePosition();
-		if (delta.x == 0 && delta.y == 0)
-		{
-			return bInFov;
-		}
-		bInFov = false;
-		
-		
-		float fDot = DotProduct2D(delta, orientation[0]);
-		if (fDot >= 0)
-		{
-			bInFov = Square(fDot) > delta.lengthXYSquared() * Square(check_fovdot);
-		}
-		
-	}
-	return bInFov;
-}
-
-/*
-===============
-Actor::EnemyInFOV
-
-Returns true if enemy is within fov.
-===============
-*/
-bool Actor::EnemyInFOV
-	(
-	int iMaxDirtyTime
-	)
-{
-	if (level.inttime > iMaxDirtyTime + m_iEnemyFovCheckTime)
-	{
-		bool bInFov = InFOV(m_Enemy->centroid, m_fFov, m_fFovDot);
-		if (m_bEnemyInFOV != bInFov)
-		{
-			m_bEnemyInFOV = !m_bEnemyInFOV;
-			m_iEnemyFovChangeTime = level.inttime;
-		}
-		m_iEnemyFovCheckTime = level.inttime;
-
-	}
-	return m_iEnemyFovCheckTime;
-}
-
-/*
-===============
-Actor::InFOV
-
-Returns true if pos is within fov.
-===============
-*/
-bool Actor::InFOV
-	(
-	Vector pos
-	)
-{
-	return InFOV(pos, m_fFov, m_fFovDot);
-}
-
-/*
-===============
-Actor::InFOV
-
-Returns true if ent is within fov.
-===============
-*/
-bool Actor::InFOV
-	(
-	Entity *ent
-	)
-{
-	if (ent == m_Enemy)
-	{
-		return EnemyInFOV(0);
-	}
-	else
-	{
-		return InFOV(ent->centroid, m_fFov, m_fFovDot);
-	}
-}
-
-bool Actor::CanSeeNoFOV
-	(
-	Entity *ent
-	)
-{
-	if (ent == m_Enemy)
-	{
-		return CanSeeEnemy(0);
-	}
-	else
-	{
-		bool bCanSee = false;
-		if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum))
-		{
-			bCanSee = CanSeeFrom(EyePosition(), ent);
-		}
-		return bCanSee;
-	}
-}
-
-bool Actor::CanSeeFOV
-	(
-	Entity *ent
-	)
-{
-	//fixme: this is an inline function.
-	if (ent == m_Enemy)
-	{
-		return CanSeeEnemyFOV(0, 0);
-	}
-	else
-	{
-		bool bCanSee = false;
-		if (InFOV(ent->centroid, m_fFov, m_fFovDot) && gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum))
-		{
-			bCanSee = CanSeeFrom(EyePosition(), ent);
-		}
-		return bCanSee;
-	}
-}
-
-bool Actor::CanSeeEnemyFOV
-	(
-	int iMaxFovDirtyTime,
-	int iMaxSightDirtyTime
-	)
-{
-	return EnemyInFOV(iMaxFovDirtyTime) && CanSeeEnemy(iMaxSightDirtyTime);
-}
-
-/*
-===============
-Actor::CanShoot
-
-Returns true if actor can shoot entity.
-===============
-*/
-bool Actor::CanShoot
-	(
-	Entity *ent
-	)
-{
-	bool bCanShootEnemy = false;
-	if (ent->IsSubclassOfSentient())
-	{
-		Sentient * sen = (Sentient *)ent;
-		//FIXME: macro.
-		if (world->farplane_distance == 0 || Square(world->farplane_distance * 0.828) > (origin - sen->origin).lengthSquared())
-		{
-			if (gi.AreasConnected(
-				edict->r.areanum,
-				sen->edict->r.areanum))
-			{
-				if (G_SightTrace(
-					GunPosition(),
-					vec_zero,
-					vec_zero,
-					sen->centroid,
-					this,
-					sen,
-					MASK_CANSEE,
-					qfalse,
-					"Actor::CanShoot centroid")
-					||	G_SightTrace(
-						GunPosition(),
-						vec_zero,
-						vec_zero,
-						sen->EyePosition(),
-						this,
-						sen,
-						MASK_CANSEE,
-						qfalse,
-						"Actor::CanShoot eyes"))
-				{
-					bCanShootEnemy = true;
-				}
-			}
-		}
-		if (m_Enemy)
-		{
-			m_bCanShootEnemy = bCanShootEnemy;
-			m_iCanShootCheckTime = level.inttime;
-		}
-	}
-	else
-	{
-
-		if (gi.AreasConnected(
-			edict->r.areanum,
-			ent->edict->r.areanum))
-		{
-			if (CanSeeFrom(GunPosition(), ent))
-			{
-				bCanShootEnemy = true;
-			}
-		}
-	}
-
-	return bCanShootEnemy;
-}
-
-/*
-===============
-Actor::CanSeeFrom
-
-Returns true if actor can see entity from pos.
-===============
-*/
-bool Actor::CanSeeFrom
-	(
-	vec3_t pos,
-	Entity *ent
-	)
-{
-	Vector vPos(pos);
-	bool bCanSee = false;
-	if (world->farplane_distance == 0 || Square(world->farplane_distance * 0.828) > (origin - ent->origin).lengthSquared())
-	{
-		if (!ent->IsSubclassOfActor() && G_SightTrace(vPos, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, qfalse, "Actor::CanSeeFrom"))
-		{
-			bCanSee = true;
-		}
-	}
-	return bCanSee;
-}
-
-/*
-===============
-Actor::CanSeeEnemy
-
-Returns true if actor can see enemy.
-===============
-*/
-bool Actor::CanSeeEnemy
-	(
-	int iMaxDirtyTime
-	)
-{
-	//FIXME: macro
-	if (level.inttime > iMaxDirtyTime + m_iEnemyVisibleCheckTime)
-		CanSee(m_Enemy, 0, 0.828 * world->farplane_distance, false);
-
-	return m_bEnemyVisible;
-}
-
-/*
-===============
-Actor::CanShootEnemy
-
-Returns true if actor can shoot enemy.
-===============
-*/
-bool Actor::CanShootEnemy
-	(
-	int iMaxDirtyTime
-	)
-{
-	if( level.inttime > iMaxDirtyTime + m_iCanShootCheckTime )
-		CanShoot( m_Enemy );
-
-	return m_bCanShootEnemy;
-}
-
-/*
-===============
-Actor::ShowInfo
-
-Display actor info.
-===============
-*/
-void Actor::ShowInfo
-	(
-	float fDot,
-	float fDist
-	)
-{
-	float fMaxDist, fMinDot;
-	static cvar_t *g_entinfo_max;
-
-	if (!bEntinfoInit)
-	{
-		g_entinfo_max = gi.Cvar_Get("g_entinfo_max", "2048", 0);
-		bEntinfoInit = true;
-	}
-
-	fMinDot = 0.9f;
-	fMaxDist = g_entinfo_max->value;
-
-	if ( IsKilledState(m_ThinkState) )
-	{
-		fMinDot = 0.99f;
-		fMaxDist = 512;
-	}
-
-	if (g_entinfo->integer != 4)
-	{
-		if (fDot <= fMinDot)
-		{
-			if (fDot <= 0 || fDist >= 256)
-				return;
-		}
-
-		if (fMaxDist <= fDist || fDist <= 64)
-			return;
-	}
-	if (!m_bEnableEnemy)
-	{
-		Vector a = origin;
-		a.z += maxs.z + 74;
-
-		G_DebugString(a, 1.0, 1.0, 1.0, 1.0, "DISABLED");
-	}
-	
-	{
-		Vector a = origin;
-		a.z += maxs.z + 56;
-
-
-		G_DebugString(
-			a,
-			1.0,
-			1.0,
-			1.0,
-			1.0,
-			"%i:%i:%s:%.1f",
-			entnum,
-			radnum,
-			targetname.c_str(),
-			health);
-	}
-
-	if (m_Enemy)
-	{
-		Vector a = origin;
-		a.z += maxs.z + 38;
-
-
-		G_DebugString(
-			a,
-			1.0,
-			1.0,
-			1.0,
-			1.0,
-			"%i:%s:%.1f:%i",
-            m_Enemy->entnum,
-            m_Enemy->targetname.c_str(),
-            m_Enemy->health,
-			m_PotentialEnemies.GetCurrentThreat());
-	}
-
-	if ( IsCuriousState(m_ThinkState) )
-	{
-
-		Vector a = origin;
-		a.z += maxs.z + 20;
-
-
-		G_DebugString(
-			a,
-			1.0,
-			1.0,
-			1.0,
-			1.0,
-			"%s:%%%.1f",
-			Director.GetString(m_csThinkStateNames[THINKSTATE_CURIOUS]).c_str(),
-			m_PotentialEnemies.GetCurrentVisibility() * 100);
-	}
-	else
-	{
-
-		Vector a = origin;
-		a.z += maxs.z + 20;
-
-
-		G_DebugString(
-			a,
-			1.0,
-			1.0,
-			1.0,
-			1.0,
-			"%s",
-			ThinkStateName().c_str());
-	}
-
-
-	{
-		Vector a = origin;
-		a.z += maxs.z + 2;
-
-		str sAnimThreadFile = m_pAnimThread ? m_pAnimThread->FileName() : "(null)";
-
-
-	
-		G_DebugString(
-			a,
-			1.0,
-			1.0,
-			1.0,
-			1.0,
-			"%s:%s:%i - %s",
-			ThinkName().c_str(),
-			m_pszDebugState,
-			m_State,
-			sAnimThreadFile.c_str());
-	}
-
-	if (g_entinfo->integer == 1)
-	{
-		if (m_pGrenade)
-			G_DebugLine(m_pGrenade->origin, m_vGrenadePos, 1.0, 0.0, 0.0, 1.0);
-
-		Vector a = m_vHome;
-		a.z += maxs.z + 18;
-
-		G_DebugLine(centroid, a, 0.0, 1.0, 0.0, 1.0);
-
-		G_DebugCircle(a, m_fLeash, 0.0, 1.0, 0.0, 1.0, qtrue);
-
-		G_DebugCircle(
-			centroid,
-			m_fMinDistance,
-			1.0,
-			0.0,
-			0.0,
-			1.0,
-			qtrue);
-
-		G_DebugCircle(
-			centroid,
-			m_fMaxDistance,
-			0.0,
-			0.0,
-			1.0,
-			1.0,
-			qtrue);
-	}
-	else if (g_entinfo->integer == 2)
-	{
-		G_DebugCircle(
-			centroid,
-			m_fHearing,
-			1.0,
-			0.0,
-			0.0,
-			1.0,
-			qtrue);
-		G_DebugCircle(
-			centroid,
-			m_fSight,
-			0.0,
-			0.0,
-			1.0,
-			1.0,
-			qtrue);
-	}
+    ev->AddConstString(m_csWeapon);
 }
 
 /*
@@ -7366,15 +5005,10 @@ Actor::DefaultPain
 Default pain handler.
 ===============
 */
-void Actor::DefaultPain
-	(
-	Event *ev
-	)
+void Actor::DefaultPain(Event *ev)
 {
-	gi.Printf("DefaultPain event");
-	SetThink(THINKSTATE_PAIN, THINK_PAIN);
-
-	HandlePain(ev);
+    SetThink(THINKSTATE_PAIN, THINK_PAIN);
+    HandlePain(ev);
 }
 
 /*
@@ -7384,49 +5018,55 @@ Actor::HandlePain
 Hangled pain event.
 ===============
 */
-void Actor::HandlePain
-	(
-	Event *ev
-	)
+void Actor::HandlePain(Event *ev)
 {
-	gi.Printf("HandlePain");
-	Event e1(EV_Listener_ExecuteScript);
-	if (m_bEnablePain)
-	{
+    int     i;
+    Event   event(EV_Listener_ExecuteScript);
+    int     num;
+    Entity *attacker;
 
-		e1.AddConstString(STRING_GLOBAL_PAIN_SCR);
+    if (!m_bEnablePain) {
+        return;
+    }
 
-		for (int i = 1; i <= ev->NumArgs(); i++)
-		{
-			e1.AddValue(ev->GetValue(i));
-		}
-		ExecuteScript(&e1);
-		
-		SetThinkState(THINKSTATE_PAIN, THINKLEVEL_PAIN);
+    attacker = ev->GetEntity(1);
+    if (attacker && attacker->IsSubclassOfSentient() && IsTeamMate(static_cast<Sentient *>(attacker))) {
+        return;
+    }
 
-		RaiseAlertness(0.5);
+    if (!m_bNoLongPain) {
+        event.AddConstString(STRING_GLOBAL_PAIN_SCR);
 
-		m_PainTime = level.inttime;
+        num = ev->NumArgs();
+        for (i = 1; i <= num; i++) {
+            event.AddValue(ev->GetValue(i));
+        }
 
-		Entity *ent = ev->GetEntity(1);
-		if (ent && ent->IsSubclassOfSentient() && !IsTeamMate((Sentient *)ent))
-		{
-			m_pLastAttacker = ent;
+        ExecuteScript(&event);
+        SetThinkState(THINKSTATE_PAIN, THINKLEVEL_PAIN);
+    }
 
-			m_iCuriousLevel = 9;
+    RaiseAlertness(0.5f);
 
-			//FIXME: macro
-			SetCuriousAnimHint(7);
+    m_PainTime = level.inttime;
 
-			if (m_bEnableEnemy && m_ThinkStates[THINKLEVEL_NORMAL] == THINKSTATE_IDLE)
-			{
-				SetEnemyPos(ent->origin);
-				m_pszDebugState = "from_pain";
-				SetThinkState(THINKSTATE_CURIOUS, THINKLEVEL_NORMAL);
-			}
-		}
-		Unregister(STRING_PAIN);
-	}
+    if (attacker && attacker->IsSubclassOfSentient() && !IsTeamMate(static_cast<Sentient *>(attacker))) {
+        m_pLastAttacker = attacker;
+
+        m_iCuriousLevel = 9;
+
+        //FIXME: macro
+        SetCuriousAnimHint(7);
+
+        // Added in 2.30 the m_bIsCurous check
+        if (m_bEnableEnemy && m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_IDLE && m_bIsCurious) {
+            SetEnemyPos(attacker->origin);
+            m_pszDebugState = "from_pain";
+            SetThinkState(THINKSTATE_CURIOUS, THINKLEVEL_IDLE);
+        }
+    }
+
+    Unregister(STRING_PAIN);
 }
 
 /*
@@ -7436,18 +5076,17 @@ Actor::EventPain
 Pain event.
 ===============
 */
-void Actor::EventPain
-	(
-	Event *ev
-	)
+void Actor::EventPain(Event *ev)
 {
-	ShowInfo();
+    if (g_showinfo->integer) {
+        ShowInfo();
+    }
 
-	GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
+    GlobalFuncs_t *func = &GlobalFuncs[CurrentThink()];
 
-	gi.Printf("pain event");
-	if (func->Pain)
-		(this->*func->Pain)(ev);
+    if (func->Pain) {
+        (this->*func->Pain)(ev);
+    }
 }
 
 /*
@@ -7457,17 +5096,11 @@ Actor::DefaultKilled
 Default killed handler.
 ===============
 */
-void Actor::DefaultKilled
-	(
-	Event *ev,
-	bool bPlayDeathAnim
-	)
+void Actor::DefaultKilled(Event *ev, bool bPlayDeathAnim)
 {
-	ClearStates();
-
-	SetThink(THINKSTATE_KILLED, THINK_KILLED);
-
-	HandleKilled(ev, bPlayDeathAnim);
+    ClearStates();
+    SetThink(THINKSTATE_KILLED, THINK_KILLED);
+    HandleKilled(ev, bPlayDeathAnim);
 }
 
 /*
@@ -7477,36 +5110,28 @@ Actor::HandleKilled
 Hangled killed event.
 ===============
 */
-void Actor::HandleKilled
-	(
-	Event *ev,
-	bool bPlayDeathAnim
-	)
+void Actor::HandleKilled(Event *ev, bool bPlayDeathAnim)
 {
-	deadflag = DEAD_DEAD;
-	health = 0.0;
-	if (bPlayDeathAnim)
-	{
-		Event e1(EV_Listener_ExecuteScript);
-		e1.AddConstString(STRING_GLOBAL_KILLED_SCR);
-		for (int i = 1; i < ev->NumArgs(); i++)
-		{
-			e1.AddValue(ev->GetValue(i));
-		}
-		ExecuteScript(&e1);
-	}
-	else
-	{
-		SetThink(THINKSTATE_KILLED, THINK_DEAD);
-	}
+    deadflag = DEAD_DEAD;
+    health   = 0.0;
 
-	ClearThinkStates();
+    if (bPlayDeathAnim) {
+        Event event(EV_Listener_ExecuteScript, ev->NumArgs() + 1);
+        event.AddConstString(STRING_GLOBAL_KILLED_SCR);
+        for (int i = 1; i <= ev->NumArgs(); i++) {
+            event.AddValue(ev->GetValue(i));
+        }
+        ExecuteScript(&event);
+    } else {
+        SetThink(THINKSTATE_KILLED, THINK_DEAD);
+    }
 
-	SetThinkState(THINKSTATE_KILLED, THINKLEVEL_KILLED);
+    ClearThinkStates();
 
-	gi.DPrintf("Waittill death unregisterd\n");
-	Unregister(STRING_DEATH);
-	Unregister(STRING_PAIN);
+    SetThinkState(THINKSTATE_KILLED, THINKLEVEL_KILLED);
+
+    Unregister(STRING_DEATH);
+    Unregister(STRING_PAIN);
 }
 
 /*
@@ -7516,25 +5141,19 @@ Actor::DispatchEventKilled
 Dispatch killed event.
 ===============
 */
-void Actor::DispatchEventKilled
-	(
-	Event *ev,
-	bool bPlayDeathAnim
-	)
+void Actor::DispatchEventKilled(Event *ev, bool bPlayDeathAnim)
 {
-	GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
+    GlobalFuncs_t *func = &GlobalFuncs[CurrentThink()];
 
-	if (func->Killed)
-		(this->*func->Killed)(ev, bPlayDeathAnim);
-	
-	SetEnemy(NULL, false);
+    assert(func->Killed);
+    (this->*func->Killed)(ev, bPlayDeathAnim);
 
-	DisbandSquadMate(this);
-	if (bPlayDeathAnim)
-	{
-		DropInventoryItems();
-	}
+    SetEnemy(NULL, false);
 
+    DisbandSquadMate(this);
+    if (bPlayDeathAnim) {
+        DropInventoryItems();
+    }
 }
 
 /*
@@ -7544,34 +5163,33 @@ Actor::EventKilled
 Killed event.
 ===============
 */
-void Actor::EventKilled
-	(
-	Event *ev
-	)
+void Actor::EventKilled(Event *ev)
 {
-	DispatchEventKilled(ev, true);
+    Entity   *attacker;
+    Sentient *pBuddy;
+    Sentient *sent;
+    Player   *player;
 
-	Player *p1 = (Player *)ev->GetEntity(1);
-	if (p1)
-	{
-		if (p1->IsSubclassOfPlayer() && p1->m_Team == m_Team)
-		{
-			p1->m_iNumEnemiesKilled++;
-		}
-		if (p1->IsSubclassOfSentient())
-		{
-			for (Sentient *pSent = level.m_HeadSentient[m_Team]; pSent; pSent = pSent->m_NextSentient)
-			{
-				if (pSent != this)
-				{
-					if (pSent->IsSubclassOfActor())
-						NotifySquadmateKilled(pSent, p1);
-				}
-			}
-		}
+    DispatchEventKilled(ev, true);
 
-	}
+    attacker = ev->GetEntity(1);
+    if (attacker && attacker->IsSubclassOfPlayer()) {
+        player = static_cast<Player *>(attacker);
+        if (player->m_Team != m_Team) {
+            player->m_iNumEnemiesKilled++;
+        }
+    }
 
+    if (attacker && attacker->IsSubclassOfSentient()) {
+        sent = static_cast<Sentient *>(attacker);
+
+        for (pBuddy = level.m_HeadSentient[m_Team]; pBuddy; pBuddy = pBuddy->m_NextSentient) {
+            if (pBuddy != this && pBuddy->IsSubclassOfActor()) {
+                Actor *actor = static_cast<Actor *>(pBuddy);
+                actor->NotifySquadmateKilled(this, sent);
+            }
+        }
+    }
 }
 
 /*
@@ -7581,12 +5199,10 @@ Actor::EventBeDead
 Become dead.
 ===============
 */
-void Actor::EventBeDead
-	(
-	Event *ev
-	)
+void Actor::EventBeDead(Event *ev)
 {
-	DispatchEventKilled(ev, false);
+    health = 0;
+    DispatchEventKilled(ev, false);
 }
 
 /*
@@ -7596,26 +5212,19 @@ Actor::DeathEmbalm
 preps the dead actor for turning nonsolid gradually over time
 ===============
 */
-void Actor::DeathEmbalm
-	(
-	Event *ev
-	)
+void Actor::DeathEmbalm(Event *ev)
 {
-	if (maxs[2] > 8)
-	{
-		maxs[2] -= 4;
-		if (maxs[2] > 8)
-		{
-			Event e1(EV_Actor_DeathEmbalm);
-			PostEvent(e1, 0.5);
-		}
-		else
-		{
-			maxs[2] = 8.0;
-		}
+    if (maxs.z > 8) {
+        maxs.z -= 4;
 
-		setSize(mins, maxs);
-	}
+        if (maxs.z > 8) {
+            PostEvent(EV_Actor_DeathEmbalm, 0.5f);
+        } else {
+            maxs.z = 8.0;
+        }
+
+        setSize(mins, maxs);
+    }
 }
 
 /*
@@ -7625,16 +5234,4318 @@ Actor::DeathSinkStart
 Makes the actor sink into the ground and then get removed(this starts it).
 ===============
 */
-void Actor::DeathSinkStart
-	(
-	Event *ev
-	)
+void Actor::DeathSinkStart(Event *ev)
 {
-	flags &= ~FL_BLOOD;
+    setMoveType(MOVETYPE_NONE);
+    flags &= ~FL_THINK;
+    Entity::DeathSinkStart(ev);
+}
 
-	setMoveType(MOVETYPE_NONE);
+/*
+===============
+Actor::FireWeapon
 
-	Entity::DeathSinkStart(ev);
+Fire weapon from script.
+===============
+*/
+void Actor::FireWeapon(Event *ev)
+{
+    if (ev->NumArgs() > 0 && ev->GetInteger(1) == WEAPON_OFFHAND) {
+        // shoot using off hand
+        Sentient::FireWeapon(WEAPON_OFFHAND, FIRE_PRIMARY);
+    } else {
+        Sentient::FireWeapon(WEAPON_MAIN, FIRE_PRIMARY);
+    }
+}
+
+/*
+===============
+Actor::PlayAnimation
+
+Play animation
+===============
+*/
+void Actor::PlayAnimation(Event *ev)
+{
+    Event event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_ANIM_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::PlayScriptedAnimation
+
+Play scripted animation
+===============
+*/
+void Actor::PlayScriptedAnimation(Event *ev)
+{
+    Event event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_ANIM_SCRIPTED_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::PlayNoclipAnimation
+
+Play noclip animation
+===============
+*/
+void Actor::PlayNoclipAnimation(Event *ev)
+{
+    Event event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_ANIM_NOCLIP_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::PlayAttachedAnimation
+
+Play attached animation
+===============
+*/
+void Actor::PlayAttachedAnimation(Event *ev)
+{
+    Event event(EV_Listener_ExecuteScript, 2);
+    event.AddConstString(STRING_GLOBAL_ANIM_ATTACHED_SCR);
+    event.AddValue(ev->GetValue(1));
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::MoveDest
+
+Play noclip animation
+===============
+*/
+void Actor::MoveDest(float fMoveSpeed)
+{
+    mmove_t mm;
+    vec2_t  offset;
+
+    SetMoveInfo(&mm);
+
+    mm.desired_speed = fMoveSpeed;
+    if (mm.desired_speed > m_maxspeed) {
+        mm.desired_speed = m_maxspeed;
+    }
+
+    VectorSub2D(m_Dest, origin, offset);
+    VectorNormalize2D(offset);
+    VectorCopy2D(offset, mm.desired_dir);
+
+    MmoveSingle(&mm);
+
+    GetMoveInfo(&mm);
+}
+
+/*
+===============
+Actor::MovePath
+
+Move on path.
+===============
+*/
+void Actor::MovePath(float fMoveSpeed)
+{
+    mmove_t      mm;
+    const float *dir;
+    vec2_t       delta;
+
+    SetMoveInfo(&mm);
+
+    mm.desired_speed = fMoveSpeed;
+    if (mm.desired_speed > m_maxspeed) {
+        mm.desired_speed = m_maxspeed;
+    }
+
+    m_Path.UpdatePos(origin);
+
+    if (ai_debugpath->integer) {
+        Vector    pos, dest;
+        PathInfo *current_path;
+
+        pos = origin;
+        pos.z += 32;
+
+        VectorAdd2D(origin, m_Path.CurrentDelta(), dest);
+        dest[2] = origin[2] + 32;
+
+        G_DebugLine(pos, dest, 1, 0, 0, 1);
+
+        for (current_path = m_Path.CurrentNode(); current_path != m_Path.LastNode(); current_path--) {
+            pos  = current_path->point;
+            dest = (current_path - 1)->point;
+
+            G_DebugLine(pos + Vector(0, 0, 32), dest + Vector(0, 0, 32), 0, 1, 0, 1);
+        }
+    }
+
+    VectorCopy2D(m_Path.CurrentDelta(), mm.desired_dir);
+    MmoveSingle(&mm);
+
+    if (!mm.hit_obstacle) {
+        if (m_WallDir) {
+            if (level.inttime >= m_iWallDodgeTimeout) {
+                m_WallDir = 0;
+            } else if (DotProduct2D(mm.desired_dir, m_PrevObstacleNormal) > 0
+                       && CrossProduct2D(mm.desired_dir, m_PrevObstacleNormal) < 0) {
+                m_iWallDodgeTimeout = level.inttime + 1000;
+                m_WallDir           = -m_WallDir;
+            }
+        }
+        GetMoveInfo(&mm);
+        return;
+    }
+
+    velocity.copyTo(mm.velocity);
+    origin.copyTo(mm.origin);
+    mm.groundPlane = m_groundPlane;
+    mm.walking     = m_walking;
+    VectorCopy(m_groundPlaneNormal, mm.groundPlaneNormal);
+    VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
+
+    m_Path.UpdatePos(mm.hit_origin);
+
+    if (m_Path.NextNode() && m_Path.IsAccurate()) {
+        dir = m_Path.CurrentPathDir();
+
+        m_iWallDodgeTimeout = level.inttime + 1000;
+        VectorSub2D(m_Path.NextNode()->point, mm.hit_origin, delta);
+
+        if (delta[0] * dir[1] > delta[1] * dir[0]) {
+            m_WallDir         = -1;
+            mm.desired_dir[0] = -mm.obstacle_normal[1];
+            mm.desired_dir[1] = mm.obstacle_normal[0];
+        } else {
+            mm.desired_dir[0] = mm.obstacle_normal[1];
+            mm.desired_dir[1] = -mm.obstacle_normal[0];
+        }
+
+        MmoveSingle(&mm);
+
+        if (!mm.hit_obstacle) {
+            GetMoveInfo(&mm);
+            return;
+        }
+
+        velocity.copyTo(mm.velocity);
+        origin.copyTo(mm.origin);
+
+        mm.groundPlane = m_groundPlane;
+        mm.walking     = m_walking;
+        VectorCopy(m_groundPlaneNormal, mm.groundPlaneNormal);
+        VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
+
+        if (m_WallDir == (char)-1) {
+            mm.desired_dir[0] = -mm.obstacle_normal[1];
+            mm.desired_dir[1] = mm.obstacle_normal[0];
+        } else {
+            mm.desired_dir[0] = mm.obstacle_normal[1];
+            mm.desired_dir[1] = -mm.obstacle_normal[0];
+        }
+
+        MmoveSingle(&mm);
+        GetMoveInfo(&mm);
+    } else {
+        if (m_Path.NextNode() && !m_Path.IsAccurate() && m_WallDir == 0) {
+            dir = m_Path.CurrentPathDir();
+
+            VectorSub2D(m_Path.NextNode()->point, mm.hit_origin, delta);
+
+            if (DotProduct2D(dir, delta) >= 0) {
+                float cross = CrossProduct2D(dir, delta);
+                if (cross <= -16) {
+                    mm.desired_dir[0] = -mm.obstacle_normal[1];
+                    mm.desired_dir[1] = mm.obstacle_normal[0];
+
+                    MmoveSingle(&mm);
+                    GetMoveInfo(&mm);
+                    return;
+
+                } else if (cross >= 16) {
+                    mm.desired_dir[0] = mm.obstacle_normal[1];
+                    mm.desired_dir[1] = -mm.obstacle_normal[0];
+
+                    MmoveSingle(&mm);
+                    GetMoveInfo(&mm);
+                    return;
+                }
+            }
+        }
+
+        if (m_WallDir == 0) {
+            dir = m_Path.CurrentPathDir();
+
+            if (m_Path.NextNode()) {
+                dir = m_Path.NextNode()->dir;
+            }
+
+            if (dir[0] * mm.obstacle_normal[1] > dir[1] * mm.obstacle_normal[0]) {
+                m_WallDir         = 1;
+                mm.desired_dir[0] = mm.obstacle_normal[1];
+                mm.desired_dir[1] = -mm.obstacle_normal[0];
+            } else {
+                m_WallDir         = -1;
+                mm.desired_dir[0] = -mm.obstacle_normal[1];
+                mm.desired_dir[1] = mm.obstacle_normal[0];
+            }
+
+            MmoveSingle(&mm);
+            if (mm.hit_obstacle) {
+                m_WallDir           = 0;
+                m_iWallDodgeTimeout = 0;
+            } else {
+                m_iWallDodgeTimeout = level.inttime + 1000;
+            }
+        } else {
+            if (m_WallDir >= 0) {
+                mm.desired_dir[0] = mm.obstacle_normal[1];
+                mm.desired_dir[1] = -mm.obstacle_normal[0];
+            } else {
+                mm.desired_dir[0] = -mm.obstacle_normal[1];
+                mm.desired_dir[1] = mm.obstacle_normal[0];
+            }
+
+            MmoveSingle(&mm);
+
+            if (mm.hit_obstacle) {
+                m_WallDir           = 0;
+                m_iWallDodgeTimeout = 0;
+            }
+        }
+
+        GetMoveInfo(&mm);
+    }
+}
+
+/*
+===============
+Actor::MovePathGoal
+
+Move on path end(goal).
+===============
+*/
+void Actor::MovePathGoal(float fMoveSpeed)
+{
+    vec2_t vDelta;
+    float  fSlowdownSpeed;
+    float  fTimeToGo;
+    float  fDeltaSquareLen;
+
+    if (!m_Path.HasCompleteLookahead()) {
+        MovePath(fMoveSpeed);
+        m_fPathGoalTime = 0;
+        return;
+    }
+
+    VectorSub2D(origin, m_Path.CurrentPathGoal(), vDelta);
+    fDeltaSquareLen = VectorLength2DSquared(vDelta);
+    fTimeToGo       = m_fPathGoalTime - level.time;
+
+    if (fTimeToGo > -0.001f) {
+        fSlowdownSpeed = sqrt(fDeltaSquareLen) * (2.f / (fTimeToGo + level.frametime));
+
+        if (fSlowdownSpeed > (fMoveSpeed + 0.001f) && fSlowdownSpeed > sv_runspeed->value * 0.4f) {
+            m_fPathGoalTime = 0;
+            StartAnimation(ANIM_MODE_PATH_GOAL, m_Anim);
+            MovePath(fMoveSpeed);
+        } else {
+            MovePath(fSlowdownSpeed);
+            if (level.time >= m_fPathGoalTime) {
+                m_eAnimMode = ANIM_MODE_NORMAL;
+            }
+        }
+    } else if (fDeltaSquareLen < Square(fMoveSpeed * 0.5 * 0.5)) {
+        fTimeToGo       = 0.5f;
+        m_fPathGoalTime = level.time + fTimeToGo;
+        if (m_csPathGoalEndAnimScript == STRING_EMPTY) {
+            m_csPathGoalEndAnimScript = STRING_ANIM_IDLE_SCR;
+        }
+        m_bStartPathGoalEndAnim = true;
+    } else {
+        MovePath(fMoveSpeed);
+        m_fPathGoalTime = 0;
+        return;
+    }
+}
+
+/*
+===============
+Actor::Dumb
+
+Make actor dumb.
+===============
+*/
+void Actor::Dumb(Event *ev)
+{
+    Event event(EV_Listener_ExecuteScript);
+    event.AddConstString(STRING_GLOBAL_DISABLE_AI_SCR);
+    ExecuteScript(&event);
+}
+
+/*
+===============
+Actor::PhysicsOn
+
+Disable PhysicsOff.
+===============
+*/
+void Actor::PhysicsOff(Event *ev)
+{
+    m_bDoPhysics = false;
+}
+
+/*
+===============
+Actor::PhysicsOn
+
+Enable physics.
+===============
+*/
+void Actor::PhysicsOn(Event *ev)
+{
+    m_bDoPhysics = true;
+}
+
+/*
+===============
+Actor::EventGetMood
+
+Get current mood.
+===============
+*/
+void Actor::EventGetMood(Event *ev)
+{
+    ev->AddConstString(m_csMood);
+}
+
+/*
+===============
+Actor::EventSetMood
+
+Set current mood.
+===============
+*/
+void Actor::EventSetMood(Event *ev)
+{
+    m_csMood = ev->GetConstString(1);
+    if (m_csMood != STRING_BORED && m_csMood != STRING_NERVOUS && m_csMood != STRING_CURIOUS
+        && m_csMood != STRING_ALERT) {
+        m_csMood = STRING_BORED;
+        ScriptError("invalid mood - setting to bored");
+    }
+}
+
+/*
+===============
+Actor::EventDamagePuff
+
+Spawns a puff of 'blood' smoke at the specified location in the specified direction.
+===============
+*/
+void Actor::EventDamagePuff(Event *ev)
+{
+    Vector pos = ev->GetVector(1);
+    Vector dir = ev->GetVector(2);
+    int    bulletbits;
+
+    // Fixed in OPM
+    //  Large bullet flag normally take 2 bits since 2.0.
+    //  However, in OG Spearhead and Breakthrough, EventDamagePuff
+    //  mistakenly uses 1 bit which causes a parse message error
+    bulletbits = (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) ? 2 : 1;
+
+    gi.SetBroadcastVisible(pos, NULL);
+
+    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_8));
+    gi.MSG_WriteCoord(pos.x);
+    gi.MSG_WriteCoord(pos.y);
+    gi.MSG_WriteCoord(pos.z);
+
+    gi.MSG_WriteDir(dir);
+    gi.MSG_WriteBits(0, bulletbits);
+    gi.MSG_EndCGM();
+}
+
+/*
+===============
+Actor::EventGetAngleYawSpeed
+
+Get current AngleYawSpeed.
+===============
+*/
+void Actor::EventGetAngleYawSpeed(Event *ev)
+{
+    ev->AddFloat(m_fAngleYawSpeed);
+}
+
+/*
+===============
+Actor::EventSetAngleYawSpeed
+
+Set current AngleYawSpeed.
+===============
+*/
+void Actor::EventSetAngleYawSpeed(Event *ev)
+{
+    float speed = ev->GetFloat(1);
+    if (speed <= 0) {
+        ScriptError("Attempting to set illegal turnspeed %f", speed);
+    }
+    m_fAngleYawSpeed = speed;
+}
+
+/*
+===============
+Actor::EventSetAimTarget
+
+Set current weapon's aim tagret.
+===============
+*/
+void Actor::EventSetAimTarget(Event *ev)
+{
+    Entity *ent;
+    Weapon *weap;
+
+    ent = ev->GetEntity(1);
+    if (!ent) {
+        // Added in 2.0
+        //  Check for NULL
+        ScriptError("EventSetAimTarget::NULL entity given as first argument.");
+        return;
+    }
+
+    weap = GetActiveWeapon(WEAPON_MAIN);
+    weap->SetAimTarget(ent);
+
+    // Added in 2.0
+    //  Make the ent an enemy
+    if (ev->NumArgs() > 1 && ev->GetInteger(2) == 1 && ent->IsSubclassOfSentient()) {
+        SetEnemy(static_cast<Sentient *>(ent), false);
+    }
+}
+
+/*
+===============
+Actor::ReadyToFire
+
+Returns true if weapon is ready to fire.
+===============
+*/
+void Actor::ReadyToFire(Event *ev)
+{
+    Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
+    if (weap) {
+        ev->AddInteger(weap->ReadyToFire(FIRE_PRIMARY, true));
+    } else {
+        ev->AddInteger(0);
+    }
+}
+
+/*
+===============
+Actor::EventGetSight
+
+Return current sight (vision distance).
+===============
+*/
+void Actor::EventGetSight(Event *ev)
+{
+    ev->AddFloat(m_fSight);
+}
+
+/*
+===============
+Actor::EventSetSight
+
+Set current sight (vision distance).
+===============
+*/
+void Actor::EventSetSight(Event *ev)
+{
+    m_fSight = ev->GetFloat(1);
+}
+
+/*
+===============
+Actor::EventGetHearing
+
+Get current hearing distance.
+===============
+*/
+void Actor::EventGetHearing(Event *ev)
+{
+    ev->AddFloat(m_fHearing);
+}
+
+/*
+===============
+Actor::EventSetHearing
+
+Set current hearing distance.
+===============
+*/
+void Actor::EventSetHearing(Event *ev)
+{
+    m_fHearing = ev->GetFloat(1);
+}
+
+/*
+===============
+Actor::EventGetFov
+
+Get current fov.
+===============
+*/
+void Actor::EventGetFov(Event *ev)
+{
+    ev->AddFloat(m_fFov);
+}
+
+/*
+===============
+Actor::EventSetFov
+
+Set current fov.
+============
+*/
+void Actor::EventSetFov(Event *ev)
+{
+    float fov = ev->GetFloat(1);
+    if (fov < 0 || fov > 360) {
+        ScriptError("fov must be in the range [0,360]");
+    }
+    m_fFov    = fov;
+    m_fFovDot = cos(fov * 0.5f * M_PI / 180.0);
+}
+
+/*
+===============
+Actor::ClearPatrolCurrentNode
+
+Clear current patrol node.
+===============
+*/
+void Actor::ClearPatrolCurrentNode(void)
+{
+    if (m_patrolCurrentNode) {
+        if (m_patrolCurrentNode->IsSubclassOfTempWaypoint()) {
+            delete m_patrolCurrentNode;
+        }
+        m_patrolCurrentNode = NULL;
+    }
+}
+
+/*
+===============
+Actor::NextPatrolCurrentNode
+
+Switch to next patrol node.
+===============
+*/
+void Actor::NextPatrolCurrentNode(void)
+{
+    if (m_bScriptGoalValid) {
+        if (m_patrolCurrentNode->origin == m_vScriptGoal) {
+            m_bScriptGoalValid = false;
+        }
+    }
+
+    if (m_patrolCurrentNode->IsSubclassOfTempWaypoint()) {
+        ClearPatrolCurrentNode();
+    } else {
+        m_patrolCurrentNode = m_patrolCurrentNode->Next();
+    }
+}
+
+/*
+===============
+Actor::SetPatrolCurrentNode
+
+Set current patrol node.
+===============
+*/
+void Actor::SetPatrolCurrentNode(Vector& vec)
+{
+    ClearPatrolCurrentNode();
+
+    m_patrolCurrentNode = new TempWaypoint();
+    m_patrolCurrentNode->setOrigin(vec);
+}
+
+/*
+===============
+Actor::SetPatrolCurrentNode
+
+Set current patrol node.
+===============
+*/
+void Actor::SetPatrolCurrentNode(Listener *l)
+{
+    ClearPatrolCurrentNode();
+
+    if (l && !l->isSubclassOf(SimpleEntity)) {
+        ScriptError(
+            "Bad patrol path with classname '%s' specified for '%s' at (%f %f %f)\n",
+            l->getClassname(),
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z
+        );
+    }
+
+    m_patrolCurrentNode = static_cast<SimpleEntity *>(l);
+}
+
+/*
+===============
+Actor::EventSetPatrolPath
+
+Set current patrol path.
+===============
+*/
+void Actor::EventSetPatrolPath(Event *ev)
+{
+    SetPatrolCurrentNode(ev->GetListener(1));
+}
+
+/*
+===============
+Actor::EventGetPatrolPath
+
+Get current patrol path.
+===============
+*/
+void Actor::EventGetPatrolPath(Event *ev)
+{
+    ev->AddListener(m_patrolCurrentNode);
+}
+
+/*
+===============
+Actor::EventSetPatrolWaitTrigger
+
+Set m_bPatrolWaitTrigger.
+===============
+*/
+void Actor::EventSetPatrolWaitTrigger(Event *ev)
+{
+    m_bPatrolWaitTrigger = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::EventGetPatrolWaitTrigger
+
+Get m_bPatrolWaitTrigger.
+===============
+*/
+void Actor::EventGetPatrolWaitTrigger(Event *ev)
+{
+    ev->AddInteger(m_bPatrolWaitTrigger);
+}
+
+/*
+===============
+Actor::ShowInfo_PatrolCurrentNode
+
+Show current patrol node info.
+===============
+*/
+void Actor::ShowInfo_PatrolCurrentNode(void)
+{
+    if (m_patrolCurrentNode) {
+        Com_Printf("current patrol node: %s\n", m_patrolCurrentNode->targetname.c_str());
+    } else {
+        Com_Printf("no current patrol node\n");
+    }
+}
+
+/*
+===============
+Actor::ShowInfo_AimNode
+
+Show current aim node info.
+===============
+*/
+void Actor::ShowInfo_AimNode(void)
+{
+    if (m_aimNode) {
+        Com_Printf("aim node: %s\n", m_aimNode->targetname.c_str());
+    } else {
+        Com_Printf("no current aim node\n");
+    }
+}
+
+/*
+===============
+Actor::MoveOnPathWithSquad
+
+Move on path with squad.
+===============
+*/
+bool Actor::MoveOnPathWithSquad(void)
+{
+    const float *pvMyDir, *pvHisDir;
+    vec2_t       vDelta;
+    Sentient    *pSquadMate;
+    float        fIntervalSquared;
+    vec2_t       vMyNormalDir;
+    float        fDistSquared;
+
+    if (level.inttime < m_iSquadStandTime + 500) {
+        return false;
+    }
+
+    if (!PathExists() || PathComplete()) {
+        return false;
+    }
+
+    pvMyDir          = PathDelta();
+    fIntervalSquared = Square(m_fInterval);
+    if (m_iSquadStandTime) {
+        fIntervalSquared *= 2;
+    }
+
+    pSquadMate = static_cast<Sentient *>(G_GetEntity(0));
+
+    if (IsTeamMate(pSquadMate)) {
+        VectorSub2D(pSquadMate->origin, origin, vDelta);
+        fDistSquared = VectorLength2DSquared(vDelta);
+
+        if (fIntervalSquared > fDistSquared && DotProduct2D(vDelta, pvMyDir) > 0) {
+            VectorSub2D(velocity, pSquadMate->velocity, vMyNormalDir);
+            VectorNormalize2D(vMyNormalDir);
+
+            if (fDistSquared - DotProduct2D(vDelta, vMyNormalDir) < Square(48)) {
+                m_iSquadStandTime = level.inttime;
+                return false;
+            }
+        }
+    }
+
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        if (!pSquadMate->IsSubclassOfActor()) {
+            continue;
+        }
+
+        Actor *pActorSquadMate = static_cast<Actor *>(pSquadMate);
+
+        VectorSub2D(pActorSquadMate->origin, origin, vDelta);
+        fDistSquared = VectorLength2DSquared(vDelta);
+
+        if (fDistSquared >= fIntervalSquared || DotProduct2D(vDelta, pvMyDir) <= 0) {
+            continue;
+        }
+
+        if (!pActorSquadMate->PathExists() || pActorSquadMate->PathComplete()) {
+            pvHisDir = pActorSquadMate->velocity;
+
+            if (VectorLength2DSquared(pvHisDir) <= 8) {
+                continue;
+            }
+        } else {
+            pvHisDir = pActorSquadMate->PathDelta();
+        }
+
+        if (DotProduct2D(pvMyDir, pvHisDir) >= 0
+            && (entnum >= pActorSquadMate->entnum || DotProduct2D(pvHisDir, vDelta) >= 0)) {
+            m_iSquadStandTime = level.inttime;
+            return false;
+        }
+    }
+
+    m_iSquadStandTime = 0;
+    return true;
+}
+
+/*
+===============
+Actor::MoveToWaypointWithPlayer
+
+Move to waypoint with player.
+===============
+*/
+bool Actor::MoveToWaypointWithPlayer(void)
+{
+    vec2_t    pvMyDir;
+    vec2_t    vDelta;
+    float     fIntervalSquared;
+    vec2_t    vMyNormalDir;
+    float     fDistSquared;
+    Sentient *pSquadMate;
+
+    if (level.inttime < m_iSquadStandTime + 500) {
+        return false;
+    }
+
+    fIntervalSquared = Square(m_fInterval);
+    if (m_iSquadStandTime) {
+        fIntervalSquared += fIntervalSquared;
+    }
+
+    pSquadMate = static_cast<Sentient *>(G_GetEntity(0));
+    if (!IsTeamMate(pSquadMate)) {
+        return true;
+    }
+
+    VectorSub2D(pSquadMate->origin, origin, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
+
+    if (fDistSquared >= fIntervalSquared) {
+        m_iSquadStandTime = 0;
+        return true;
+    }
+
+    VectorSub2D(m_patrolCurrentNode->origin, origin, pvMyDir);
+    if (DotProduct2D(vDelta, pvMyDir) <= 0) {
+        m_iSquadStandTime = 0;
+        return true;
+    }
+
+    VectorSub2D(velocity, pSquadMate->velocity, vMyNormalDir);
+    VectorNormalize2D(vMyNormalDir);
+
+    if (fDistSquared - DotProduct2D(vDelta, vMyNormalDir) >= Square(48)) {
+        m_iSquadStandTime = 0;
+        return true;
+    }
+
+    m_iSquadStandTime = level.inttime;
+    return false;
+}
+
+/*
+===============
+Actor::PatrolNextNodeExists
+
+Returns true if next patrol node exits.
+===============
+*/
+bool Actor::PatrolNextNodeExists(void)
+{
+    if (!m_patrolCurrentNode) {
+        return false;
+    }
+
+    if (m_patrolCurrentNode->IsSubclassOfTempWaypoint()) {
+        return false;
+    }
+
+    if (!m_patrolCurrentNode->Next()) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===============
+Actor::UpdatePatrolCurrentNode
+
+Update current patrol node.
+===============
+*/
+void Actor::UpdatePatrolCurrentNode(void)
+{
+    if (!m_patrolCurrentNode) {
+        return;
+    }
+
+    if (m_patrolCurrentNode->IsSubclassOfWaypoint()) {
+        vec2_t delta;
+        VectorSub2D(origin, m_patrolCurrentNode->origin, delta);
+
+        if (fabs(delta[0]) < 16.0 && fabs(delta[1]) < 16.0) {
+            NextPatrolCurrentNode();
+        }
+    } else if (PathExists() && PathComplete()) {
+        NextPatrolCurrentNode();
+    }
+}
+
+/*
+===============
+Actor::MoveToPatrolCurrentNode
+
+
+===============
+*/
+bool Actor::MoveToPatrolCurrentNode(void)
+{
+    UpdatePatrolCurrentNode();
+
+    if (!m_patrolCurrentNode || m_bPatrolWaitTrigger) {
+        IdleLook();
+        Anim_Idle();
+        return false;
+    }
+
+    if (m_patrolCurrentNode->IsSubclassOfWaypoint()) {
+        if (MoveToWaypointWithPlayer()) {
+            DesiredAnimation(ANIM_MODE_DEST, m_csPatrolCurrentAnim);
+            FaceMotion();
+        } else {
+            Anim_Stand();
+            IdleLook();
+        }
+
+        SetDest(m_patrolCurrentNode->origin);
+
+        if (!m_fMoveDoneRadiusSquared || m_patrolCurrentNode->Next()) {
+            return false;
+        }
+
+        vec2_t delta;
+        VectorSub2D(m_patrolCurrentNode->origin, origin, delta);
+        return VectorLength2DSquared(delta) <= m_fMoveDoneRadiusSquared;
+    } else {
+        SetPath(m_patrolCurrentNode->origin, "Actor::MoveToPatrolCurrentNode", 0, NULL, 0);
+
+        if (!PathExists()) {
+            IdleLook();
+            Anim_Idle();
+            // tell scripts the move has failed
+            parm.movefail = true;
+            return false;
+        }
+
+        if (MoveOnPathWithSquad()) {
+            if (PatrolNextNodeExists()) {
+                DesiredAnimation(ANIM_MODE_PATH, m_csPatrolCurrentAnim);
+            } else {
+                DesiredAnimation(ANIM_MODE_PATH_GOAL, m_csPatrolCurrentAnim);
+            }
+
+            FaceMotion();
+        } else {
+            Anim_Stand();
+            IdleLook();
+        }
+
+        if (!m_fMoveDoneRadiusSquared) {
+            return false;
+        }
+
+        if (PathComplete()) {
+            return true;
+        }
+
+        if (!m_Path.HasCompleteLookahead()) {
+            return false;
+        }
+
+        if (m_patrolCurrentNode->Next()) {
+            return false;
+        }
+
+        const float *delta = PathDelta();
+        return VectorLength2DSquared(delta) <= m_fMoveDoneRadiusSquared;
+    }
+}
+
+/*
+===============
+Actor::EventSetAccuracy
+
+Set current accuracy.
+===============
+*/
+void Actor::EventSetAccuracy(Event *ev)
+{
+    mAccuracy = ev->GetFloat(1) / 100.f;
+}
+
+/*
+===============
+Actor::EventGetAccuracy
+
+Get current accuracy.
+===============
+*/
+void Actor::EventGetAccuracy(Event *ev)
+{
+    ev->AddFloat(mAccuracy * 100.f);
+}
+
+/*
+===============
+Actor::EventSetMinDistance
+===============
+*/
+void Actor::EventSetMinDistance(Event *ev)
+{
+    m_fMinDistance = ev->GetFloat(1);
+
+    if (m_fMinDistance < 0) {
+        m_fMinDistance = 0;
+        Com_Printf(
+            "^~^~^ Warning: mindist negative, forcing to %g for entity %i, targetname '%s'\n",
+            m_fMinDistance,
+            entnum,
+            TargetName().c_str()
+        );
+    }
+
+    m_fMinDistanceSquared = Square(m_fMinDistance);
+}
+
+/*
+===============
+Actor::EventGetMinDistance
+===============
+*/
+void Actor::EventGetMinDistance(Event *ev)
+{
+    ev->AddFloat(m_fMinDistance);
+}
+
+/*
+===============
+Actor::EventSetMaxDistance
+===============
+*/
+void Actor::EventSetMaxDistance(Event *ev)
+{
+    m_fMaxDistance = ev->GetFloat(1);
+
+    if (m_fMaxDistance < 256) {
+        m_fMaxDistance = 256;
+
+        Com_Printf(
+            "^~^~^ Warning: maxdist too small, forcing to %g for entity %i, targetname '%s'\n",
+            m_fMaxDistance,
+            entnum,
+            targetname.c_str()
+        );
+    }
+
+    m_fMaxDistanceSquared = Square(m_fMaxDistance);
+}
+
+/*
+===============
+Actor::EventGetMaxDistance
+===============
+*/
+void Actor::EventGetMaxDistance(Event *ev)
+{
+    ev->AddFloat(m_fMaxDistance);
+}
+
+/*
+===============
+Actor::EventGetLeash
+===============
+*/
+void Actor::EventGetLeash(Event *ev)
+{
+    ev->AddFloat(m_fLeash);
+}
+
+/*
+===============
+Actor::EventSetLeash
+===============
+*/
+void Actor::EventSetLeash(Event *ev)
+{
+    m_fLeash        = ev->GetFloat(1);
+    m_fLeashSquared = Square(m_fLeash);
+}
+
+/*
+===============
+Actor::EventGetInterval
+===============
+*/
+void Actor::EventGetInterval(Event *ev)
+{
+    ev->AddFloat(m_fInterval);
+}
+
+/*
+===============
+Actor::EventSetInterval
+===============
+*/
+void Actor::EventSetInterval(Event *ev)
+{
+    m_fInterval = ev->GetFloat(1);
+}
+
+/*
+===============
+Actor::EventDistToEnemy
+===============
+*/
+void Actor::EventDistToEnemy(Event *ev)
+{
+    if (!m_Enemy) {
+        ev->AddFloat(0);
+        return;
+    }
+
+    ev->AddFloat((origin - m_Enemy->origin).length());
+}
+
+/*
+===============
+Actor::Init
+
+Initialize global actor variables.
+Called from G_InitGame()
+===============
+*/
+void Actor::Init(void)
+{
+    g_showinfo = gi.Cvar_Get("g_showinfo", "0", 0);
+
+    for (int i = 0; i < NUM_THINKS; i++) {
+        GlobalFuncs[i].ThinkState                 = NULL;
+        GlobalFuncs[i].BeginState                 = NULL;
+        GlobalFuncs[i].ResumeState                = NULL;
+        GlobalFuncs[i].EndState                   = NULL;
+        GlobalFuncs[i].SuspendState               = NULL;
+        GlobalFuncs[i].RestartState               = &Actor::DefaultRestart;
+        GlobalFuncs[i].FinishedAnimation          = NULL;
+        GlobalFuncs[i].PostShoot                  = NULL;
+        GlobalFuncs[i].Pain                       = &Actor::DefaultPain;
+        GlobalFuncs[i].Killed                     = &Actor::DefaultKilled;
+        GlobalFuncs[i].PassesTransitionConditions = NULL;
+        GlobalFuncs[i].ShowInfo                   = NULL;
+        GlobalFuncs[i].ReceiveAIEvent             = &Actor::DefaultReceiveAIEvent;
+        GlobalFuncs[i].IsState                    = NULL;
+        GlobalFuncs[i].PathnodeClaimRevoked       = NULL;
+    }
+
+    InitVoid(&GlobalFuncs[THINK_VOID]);
+    InitTurret(&GlobalFuncs[THINK_TURRET]);
+    InitCover(&GlobalFuncs[THINK_COVER]);
+    InitPatrol(&GlobalFuncs[THINK_PATROL]);
+    InitRunner(&GlobalFuncs[THINK_RUNNER]);
+    InitIdle(&GlobalFuncs[THINK_IDLE]);
+    InitPain(&GlobalFuncs[THINK_PAIN]);
+    InitKilled(&GlobalFuncs[THINK_KILLED]);
+    InitCurious(&GlobalFuncs[THINK_CURIOUS]);
+    InitAlarm(&GlobalFuncs[THINK_ALARM]);
+    InitDisguiseSalute(&GlobalFuncs[THINK_DISGUISE_SALUTE]);
+    InitDisguiseSentry(&GlobalFuncs[THINK_DISGUISE_SENTRY]);
+    InitDisguiseOfficer(&GlobalFuncs[THINK_DISGUISE_OFFICER]);
+    InitDisguiseRover(&GlobalFuncs[THINK_DISGUISE_ROVER]);
+    InitDisguiseNone(&GlobalFuncs[THINK_DISGUISE_NONE]);
+    InitGrenade(&GlobalFuncs[THINK_GRENADE]);
+    InitMachineGunner(&GlobalFuncs[THINK_MACHINEGUNNER]);
+    InitDogIdle(&GlobalFuncs[THINK_DOG_IDLE]);
+    InitDogAttack(&GlobalFuncs[THINK_DOG_ATTACK]);
+    InitDogCurious(&GlobalFuncs[THINK_DOG_CURIOUS]);
+    InitAnim(&GlobalFuncs[THINK_ANIM]);
+    InitAnimCurious(&GlobalFuncs[THINK_ANIM_CURIOUS]);
+    InitAim(&GlobalFuncs[THINK_AIM]);
+    InitBalconyIdle(&GlobalFuncs[THINK_BALCONY_IDLE]);
+    InitBalconyCurious(&GlobalFuncs[THINK_BALCONY_CURIOUS]);
+    InitBalconyAttack(&GlobalFuncs[THINK_BALCONY_ATTACK]);
+    InitBalconyDisguise(&GlobalFuncs[THINK_BALCONY_DISGUISE]);
+    InitBalconyGrenade(&GlobalFuncs[THINK_BALCONY_GRENADE]);
+    InitBalconyPain(&GlobalFuncs[THINK_BALCONY_PAIN]);
+    InitBalconyKilled(&GlobalFuncs[THINK_BALCONY_KILLED]);
+    InitWeaponless(&GlobalFuncs[THINK_WEAPONLESS]);
+    InitNoClip(&GlobalFuncs[THINK_NOCLIP]);
+    InitDead(&GlobalFuncs[THINK_DEAD]);
+    // Added in 2.0
+    InitBadPlace(&GlobalFuncs[THINK_BADPLACE]);
+    // Added in 2.30
+    InitRunAndShoot(&GlobalFuncs[THINK_RUN_AND_SHOOT]);
+
+    AddWaitTill(STRING_VISIBLE);
+    AddWaitTill(STRING_PAIN);
+    AddWaitTill(STRING_DEATH);
+    AddWaitTill(STRING_HASENEMY);
+    AddWaitTill(STRING_FLAGGEDANIMDONE);
+    AddWaitTill(STRING_UPPERANIMDONE);
+    AddWaitTill(STRING_SAYDONE);
+    AddWaitTill(STRING_SOUNDDONE);
+    AddWaitTill(STRING_ANIMDONE);
+    AddWaitTill(STRING_MOVEDONE);
+    AddWaitTill(STRING_TRIGGER);
+    AddWaitTill(STRING_MOVE);
+    AddWaitTill(STRING_TURNDONE);
+
+    if (developer->integer) {
+        Com_Printf("sizeof(Actor) == %zi\n", sizeof(Actor));
+        //FIXME: magic ??
+        Com_Printf("Magic sizeof actor number: %zd\n", sizeof(Actor) - 64);
+    }
+}
+
+/*
+===============
+Actor::UpdateEyeOrigin
+
+Update eye position.
+===============
+*/
+void Actor::UpdateEyeOrigin(void)
+{
+    Vector eyeTag = vec_zero;
+
+    int currLvlTime = level.inttime;
+    int currTime    = m_iEyeUpdateTime;
+
+    if (currLvlTime > currTime) {
+        m_iEyeUpdateTime = NextUpdateTime(currTime, 100);
+
+        GetTag("eyes bone", &eyeTag, &m_vEyeDir);
+
+        eyeposition = eyeTag - origin;
+
+        m_vEyeDir[2] = 0.0;
+        m_vEyeDir.normalizefast();
+
+        eyeposition[0] = Q_clamp_float(eyeposition[0], -10.5f, 10.5f);
+        eyeposition[1] = Q_clamp_float(eyeposition[1], -10.5f, 10.5f);
+        eyeposition[2] = Q_clamp_float(eyeposition[2], 4.5f, 89.5f);
+    }
+}
+
+/*
+===============
+Actor::RequireThink
+
+Do I need to think ?
+===============
+*/
+bool Actor::RequireThink(void)
+{
+    if (G_GetEntity(0)) {
+        return (level.inttime < edict->r.lastNetTime + 60000);
+    } else {
+        return false;
+    }
+}
+
+/*
+===============
+Actor::UpdateEnemyInternal
+
+Real update enemy.
+===============
+*/
+void Actor::UpdateEnemyInternal(void)
+{
+    // Added in 2.0
+    DetectSmokeGrenades();
+
+    for (Sentient *pSent = level.m_HeadSentient[1 - m_Team]; pSent; pSent = pSent->m_NextSentient) {
+        m_PotentialEnemies.AddPotentialEnemy(pSent);
+    }
+
+    m_PotentialEnemies.CheckEnemies(this);
+
+    if (m_Enemy != m_PotentialEnemies.GetCurrentEnemy() && (m_bEnemySwitch || !m_Enemy)) {
+        SetEnemy(m_PotentialEnemies.GetCurrentEnemy(), false);
+    }
+
+    m_fNoticeTimeScale += (level.inttime - m_iEnemyCheckTime) / 10000.f;
+
+    if (m_fNoticeTimeScale > m_fMaxNoticeTimeScale) {
+        m_fNoticeTimeScale = m_fMaxNoticeTimeScale;
+    }
+
+    m_iEnemyCheckTime = level.inttime;
+}
+
+/*
+===============
+Actor::UpdateEnemy
+
+Update enemy w.r.t m_iEnemyCheckTime.
+===============
+*/
+void Actor::UpdateEnemy(int iMaxDirtyTime)
+{
+    if (level.inttime > iMaxDirtyTime + m_iEnemyCheckTime) {
+        UpdateEnemyInternal();
+    }
+}
+
+/*
+===============
+Actor::DetectSmokeGrenades
+===============
+*/
+void Actor::DetectSmokeGrenades(void)
+{
+    SmokeSprite *sprite;
+
+    if (m_Enemy) {
+        return;
+    }
+
+    sprite = G_GetRandomSmokeSprite();
+    if (!sprite || !sprite->owner) {
+        return;
+    }
+
+    if (sprite->owner->m_Team != m_Team) {
+        return;
+    }
+
+    const Vector eyePos       = VirtualEyePosition();
+    const float  fDistSquared = (sprite->origin - eyePos).lengthSquared();
+
+    if (fDistSquared > Square(256) || InFOV(sprite->origin)) {
+        if (G_SightTrace(
+                eyePos, vec_zero, vec_zero, sprite->origin, this, NULL, MASK_CANSEE, false, "Actor::DetectSmokeGrenades"
+            )) {
+            m_PotentialEnemies.ConfirmEnemy(this, sprite->owner);
+        }
+    }
+}
+
+/*
+===============
+Actor::SetEnemy
+
+Set current enemy.
+===============
+*/
+void Actor::SetEnemy(Sentient *pEnemy, bool bForceConfirmed)
+{
+    if (pEnemy == m_Enemy) {
+        return;
+    }
+
+    if (m_Enemy) {
+        m_Enemy->m_iAttackerCount--;
+    }
+    m_bNewEnemy = m_Enemy == NULL;
+    m_Enemy     = pEnemy;
+
+    m_iEnemyChangeTime = level.inttime;
+
+    if (m_Enemy) {
+        PostEvent(EV_Actor_ShareEnemy, 0.75f);
+
+        m_bEnemyIsDisguised = m_Enemy->m_bHasDisguise && (m_Enemy->m_bIsDisguised || !CanSeeEnemy(0));
+
+        SetEnemyPos(m_Enemy->origin);
+        m_Enemy->m_iAttackerCount++;
+
+        if (bForceConfirmed) {
+            m_PotentialEnemies.ConfirmEnemy(this, m_Enemy);
+        }
+    }
+}
+
+/*
+===============
+Actor::SetEnemyPos
+
+Update stored enemy position information.
+===============
+*/
+void Actor::SetEnemyPos(Vector vPos)
+{
+    if (m_vLastEnemyPos == vPos) {
+        return;
+    }
+
+    m_iLastEnemyPosChangeTime = level.inttime;
+    m_vLastEnemyPos           = vPos;
+    mTargetPos                = m_vLastEnemyPos;
+
+    if (!m_Enemy) {
+        mTargetPos.z += 88;
+    } else if (m_Enemy->m_bIsAnimal) {
+        mTargetPos.z += 10;
+    } else {
+        mTargetPos += m_Enemy->eyeposition;
+    }
+
+    if (mTargetPos.z - EyePosition().z < 128) {
+        mTargetPos.z -= 16;
+    }
+}
+
+static bool UnknownAnim(const char *name, dtiki_t *tiki)
+{
+    ScriptException::next_bIsForAnim = true;
+    ScriptError("unknown animation '%s' in '%s'", name, tiki->a->name);
+}
+
+/*
+===============
+Actor::EventSetAnim
+
+Set animation event.
+===============
+*/
+void Actor::EventSetAnim(Event *ev)
+{
+    const_str name   = 0;
+    float     weight = 1;
+    int       slot   = 0;
+    int       anim;
+    const_str flagVal;
+    qboolean  flagged = false;
+
+    switch (ev->NumArgs()) {
+    case 4:
+        flagVal = ev->GetConstString(4);
+        flagged = true;
+        if (flagVal != STRING_FLAGGED) {
+            ScriptError("unknown keyword '%s', expected 'flagged'", Director.GetString(flagVal).c_str());
+        }
+    case 3:
+        weight = ev->GetFloat(3);
+        if (weight < 0) {
+            ScriptError("Negative anim weight not allowed");
+        }
+
+        if (!weight) {
+            return;
+        }
+    case 2:
+        slot = ev->GetInteger(2);
+        if (slot > 2) {
+            ScriptError("Bad animation slot, only 0 and 1 supported");
+        }
+    case 1:
+        name = ev->GetConstString(1);
+        anim = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str());
+        if (anim == -1) {
+            UnknownAnim(Director.GetString(name).c_str(), edict->tiki);
+        }
+        break;
+    default:
+        ScriptError("bad number of arguments");
+        break;
+    }
+
+    if (!slot) {
+        flagged = true;
+    }
+
+    if (flagged) {
+        parm.motionfail = true;
+    }
+
+    if (!m_bLevelMotionAnim) {
+        if (slot) {
+            m_weightType[GetMotionSlot(slot)] = 0;
+        } else {
+            ChangeMotionAnim();
+            m_bMotionAnimSet = true;
+        }
+
+        StartMotionAnimSlot(slot, anim, weight);
+        if (flagged) {
+            m_iMotionSlot   = GetMotionSlot(slot);
+            parm.motionfail = false;
+        }
+    }
+}
+
+/*
+===============
+Actor::EventEndActionAnim
+
+End action animation.
+===============
+*/
+void Actor::EventEndActionAnim(Event *ev)
+{
+    parm.upperfail = true;
+    if (!m_bLevelActionAnim) {
+        ChangeActionAnim();
+        parm.upperfail = false;
+    }
+}
+
+/*
+===============
+Actor::EventSetMotionAnim
+
+Set motion animation.
+===============
+*/
+void Actor::EventSetMotionAnim(Event *ev)
+{
+    int       anim;
+    const_str name;
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    name = ev->GetConstString(1);
+    anim = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+
+    if (anim == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    parm.motionfail = true;
+
+    if (!m_bLevelMotionAnim) {
+        ChangeMotionAnim();
+
+        // start the animation
+        m_bMotionAnimSet = true;
+        StartMotionAnimSlot(0, anim, 2.0);
+        // set the slot
+        m_iMotionSlot = GetMotionSlot(0);
+
+        parm.motionfail = false;
+    }
+}
+
+/*
+===============
+Actor::EventSetAimMotionAnim
+
+Set aim motion animation.
+===============
+*/
+void Actor::EventSetAimMotionAnim(Event *ev)
+{
+    const_str name;
+    int       anim_crouch, anim_stand, anim_high;
+
+    if (ev->NumArgs() != 3) {
+        ScriptError("bad number of arguments");
+    }
+
+    name        = ev->GetConstString(1);
+    anim_crouch = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+    if (anim_crouch == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    name       = ev->GetConstString(2);
+    anim_stand = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+    if (anim_stand == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    name      = ev->GetConstString(3);
+    anim_high = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+    if (anim_high == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    parm.motionfail = true;
+
+    if (!m_bLevelMotionAnim) {
+        ChangeMotionAnim();
+
+        m_bMotionAnimSet = true;
+        UpdateAimMotion();
+
+        StartAimMotionAnimSlot(0, anim_crouch);
+        StartAimMotionAnimSlot(1, anim_stand);
+        StartAimMotionAnimSlot(2, anim_high);
+
+        m_iMotionSlot   = GetMotionSlot(1);
+        parm.motionfail = false;
+    }
+}
+
+/*
+===============
+Actor::EventSetActionAnim
+
+Set action animation.
+===============
+*/
+void Actor::EventSetActionAnim(Event *ev)
+{
+    const_str name;
+    int       anim_forward, anim_up, anim_down;
+    str       derivedName;
+
+    if (ev->NumArgs() != 3) {
+        ScriptError("bad number of arguments");
+    }
+
+    name             = ev->GetConstString(1);
+    m_fAimLimit_down = ev->GetFloat(2);
+    if (m_fAimLimit_down >= 0) {
+        m_fAimLimit_down = -0.001f;
+        ScriptError("Positive lower_limit not allowed");
+    }
+
+    m_fAimLimit_up = ev->GetFloat(3);
+    if (m_fAimLimit_up <= 0) {
+        m_fAimLimit_up = 0.001f;
+        ScriptError("Negative upper_limit not allowed");
+    }
+
+    anim_forward = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+    if (anim_forward == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    derivedName = Director.GetString(name) + "_up";
+    anim_up     = gi.Anim_NumForName(edict->tiki, derivedName);
+    if (anim_up == -1) {
+        UnknownAnim(derivedName, edict->tiki);
+    }
+
+    derivedName = Director.GetString(name) + "_down";
+    anim_down   = gi.Anim_NumForName(edict->tiki, derivedName);
+    if (anim_down == -1) {
+        UnknownAnim(derivedName, edict->tiki);
+    }
+
+    parm.upperfail = true;
+    if (!m_bLevelActionAnim) {
+        ChangeActionAnim();
+        m_bAimAnimSet    = true;
+        m_bActionAnimSet = true;
+        UpdateAim();
+
+        StartAimAnimSlot(0, anim_up);
+        StartAimAnimSlot(1, anim_forward);
+        StartAimAnimSlot(2, anim_down);
+        m_iActionSlot  = GetActionSlot(0);
+        parm.upperfail = false;
+    }
+}
+
+/*
+===============
+Actor::EventUpperAnim
+
+Set upper body.
+===============
+*/
+void Actor::EventUpperAnim(Event *ev)
+{
+    int       anim;
+    const_str name;
+
+    if (ev->NumArgs()) {
+        if (ev->NumArgs() != 1) {
+            ScriptError("bad number of arguments");
+        }
+
+        name = ev->GetConstString(1);
+        anim = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+        if (anim == -1) {
+            UnknownAnim(Director.GetString(name), edict->tiki);
+        }
+
+        m_csUpperAnim = name;
+    } else if (m_bLevelActionAnim) {
+        AnimFinished(m_iActionSlot, true);
+    }
+}
+
+/*
+===============
+Actor::EventSetUpperAnim
+
+Set upper body animation.
+===============
+*/
+void Actor::EventSetUpperAnim(Event *ev)
+{
+    int       anim;
+    const_str name;
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    name = ev->GetConstString(1);
+    anim = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+    if (anim == -1) {
+        UnknownAnim(Director.GetString(name), edict->tiki);
+    }
+
+    parm.upperfail = true;
+
+    if (!m_bLevelActionAnim) {
+        ChangeActionAnim();
+        m_bActionAnimSet = true;
+
+        StartActionAnimSlot(anim);
+        m_iActionSlot = GetActionSlot(0);
+
+        parm.upperfail = false;
+    }
+}
+
+/*
+===============
+Actor::SoundSayAnim
+
+Returns true if animation not found.
+===============
+*/
+bool Actor::SoundSayAnim(const_str name, byte bLevelSayAnim)
+{
+    if (gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str()) != -1) {
+        return false;
+    }
+
+    ChangeSayAnim();
+    m_bSayAnimSet   = true;
+    m_bLevelSayAnim = bLevelSayAnim;
+    m_iSaySlot      = -2;
+
+    Com_Printf(
+        "Couldn't find animation '%s' in '%s' - trying sound alias instead.\n",
+        Director.GetString(name).c_str(),
+        edict->tiki->a->name
+    );
+
+    Sound(Director.GetString(name), CHAN_AUTO, 0, 0, NULL, 0, 0, 1, 1, -1);
+
+    return true;
+}
+
+/*
+===============
+Actor::EventIdleSayAnim
+
+Play idle say dialogue.
+===============
+*/
+void Actor::EventIdleSayAnim(Event *ev)
+{
+    const_str name;
+
+    if (!ev->NumArgs() && m_bLevelSayAnim == 1) {
+        AnimFinished(m_iSaySlot, true);
+        return;
+    }
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    name = ev->GetConstString(1);
+
+    if (m_ThinkState == THINKSTATE_KILLED || m_ThinkState == THINKSTATE_PAIN || m_ThinkState == THINKSTATE_ATTACK
+        || m_ThinkState == THINKSTATE_GRENADE || !SoundSayAnim(name, 1)) {
+        m_csSayAnim         = name;
+        m_bNextLevelSayAnim = 1;
+    }
+}
+
+/*
+===============
+Actor::EventSayAnim
+
+Play idle dialogue.
+===============
+*/
+void Actor::EventSayAnim(Event *ev)
+{
+    const_str name;
+
+    if (!ev->NumArgs() && m_bLevelSayAnim) {
+        AnimFinished(m_iSaySlot, true);
+        return;
+    }
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    name = ev->GetConstString(1);
+
+    if (m_ThinkState == THINKSTATE_KILLED || m_ThinkState == THINKSTATE_PAIN || !SoundSayAnim(name, 2)) {
+        m_csSayAnim         = name;
+        m_bNextLevelSayAnim = 2;
+    }
+}
+
+/*
+===============
+Actor::EventSetSayAnim
+
+Set say animation.
+===============
+*/
+void Actor::EventSetSayAnim(Event *ev)
+{
+    int       anim;
+    int       animflags;
+    const_str name;
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    if (m_bLevelSayAnim) {
+        return;
+    }
+
+    name         = ev->GetConstString(1);
+    parm.sayfail = true;
+    anim         = gi.Anim_NumForName(edict->tiki, Director.GetString(name));
+
+    if (anim == -1) {
+        ChangeSayAnim();
+        m_bSayAnimSet = true;
+        m_iSaySlot    = -2;
+
+        Com_Printf(
+            "Couldn't find animation '%s' in '%s' - trying sound alias instead.\n",
+            Director.GetString(name).c_str(),
+            edict->tiki->a->name
+        );
+        Sound(Director.GetString(name), CHAN_AUTO, 0, 0, NULL, 0, 0, true, true);
+        return;
+    }
+
+    animflags = gi.Anim_FlagsSkel(edict->tiki, anim);
+    if (animflags & TAF_HASUPPER) {
+        if (m_bLevelActionAnim) {
+            if (!m_bSayAnimSet) {
+                m_iSaySlot = m_iActionSlot;
+            }
+            return;
+        }
+
+        if (flags & TAF_HASDELTA) {
+            if (m_bLevelMotionAnim) {
+                if (!m_bSayAnimSet) {
+                    m_iSaySlot = m_iMotionSlot;
+                }
+                return;
+            }
+
+            ChangeActionAnim();
+            ChangeMotionAnim();
+            StartMotionAnimSlot(0, anim, 1.0);
+
+            m_iMotionSlot = m_iActionSlot = GetMotionSlot(0);
+        } else {
+            ChangeActionAnim();
+            m_bActionAnimSet = true;
+            StartActionAnimSlot(anim);
+            m_iActionSlot = GetActionSlot(0);
+        }
+
+        ChangeSayAnim();
+        m_bSayAnimSet = true;
+        m_iSaySlot    = m_iActionSlot;
+    } else {
+        ChangeSayAnim();
+        m_bSayAnimSet = true;
+        StartSayAnimSlot(anim);
+        m_iSaySlot = GetSaySlot();
+    }
+
+    parm.sayfail = false;
+}
+
+/*
+===============
+Actor::ChangeAnim
+
+Change current animation.
+===============
+*/
+
+void Actor::ChangeAnim(void)
+{
+    if (m_pAnimThread) {
+        if (g_scripttrace->integer && m_pAnimThread->CanScriptTracePrint()) {
+            Com_Printf("--- Change Anim\n");
+        }
+
+        m_pAnimThread->AbortRegistration(STRING_EMPTY, this);
+        delete m_pAnimThread->GetScriptClass();
+        // The animation thread must be deleted afterwards
+        assert(!m_pAnimThread);
+    }
+
+    switch (m_ThinkState) {
+    case THINKSTATE_PAIN:
+    case THINKSTATE_KILLED:
+        if (m_bMotionAnimSet) {
+            AnimFinished(m_iMotionSlot, true);
+        }
+        if (m_bActionAnimSet) {
+            AnimFinished(m_iActionSlot, true);
+        }
+        if (m_bSayAnimSet) {
+            AnimFinished(m_iSaySlot, true);
+        }
+        break;
+    case THINKSTATE_ATTACK:
+    case THINKSTATE_GRENADE:
+        if (m_bMotionAnimSet) {
+            AnimFinished(m_iMotionSlot, true);
+        }
+        if (m_bActionAnimSet) {
+            AnimFinished(m_iActionSlot, true);
+        }
+        if (m_bSayAnimSet && m_bLevelSayAnim != 2) {
+            AnimFinished(m_iSaySlot, true);
+        }
+        break;
+    default:
+        if (m_bMotionAnimSet && m_bLevelMotionAnim == 0) {
+            AnimFinished(m_iMotionSlot, true);
+        }
+        if (m_bActionAnimSet && m_bLevelActionAnim == 0) {
+            AnimFinished(m_iActionSlot, true);
+        }
+        if (m_bSayAnimSet && m_bLevelSayAnim == 0) {
+            AnimFinished(m_iSaySlot, true);
+        }
+        break;
+    }
+
+    m_fCrossblendTime = 0.5f;
+    m_pAnimThread     = m_Anim.Create(this);
+    if (m_pAnimThread) {
+        if (g_scripttrace->integer && m_pAnimThread->CanScriptTracePrint()) {
+            Com_Printf("+++ Change Anim\n");
+        }
+
+        m_pAnimThread->Register(STRING_EMPTY, this);
+        m_pAnimThread->StartTiming();
+    }
+}
+
+/*
+===============
+Actor::UpdateSayAnim
+
+Update say animation.
+===============
+*/
+void Actor::UpdateSayAnim(void)
+{
+    int anim;
+    int animflags;
+
+    if (m_ThinkState == THINKSTATE_KILLED || m_ThinkState == THINKSTATE_PAIN) {
+        if (!m_bSayAnimSet) {
+            Unregister(STRING_SAYDONE);
+        }
+        return;
+    }
+
+    anim = gi.Anim_NumForName(edict->tiki, Director.GetString(m_csSayAnim));
+    if (anim == -1) {
+        return;
+    }
+
+    animflags = gi.Anim_FlagsSkel(edict->tiki, anim);
+    if (animflags & TAF_HASUPPER) {
+        if (m_ThinkState == THINKSTATE_ATTACK || m_ThinkState == THINKSTATE_GRENADE) {
+            if (!m_bSayAnimSet) {
+                Unregister(STRING_SAYDONE);
+            }
+            return;
+        }
+
+        ChangeActionAnim();
+
+        if (animflags & TAF_HASDELTA) {
+            ChangeMotionAnim();
+            StartMotionAnimSlot(0, anim, 1.0);
+
+            m_bLevelActionAnim = true;
+            m_bLevelMotionAnim = true;
+            m_iMotionSlot = m_iActionSlot = GetMotionSlot(0);
+        } else {
+            m_bActionAnimSet = true;
+            StartActionAnimSlot(anim);
+            m_bLevelActionAnim = true;
+            m_iActionSlot      = GetActionSlot(0);
+        }
+
+        ChangeSayAnim();
+        m_bSayAnimSet       = true;
+        m_bLevelSayAnim     = m_bNextLevelSayAnim;
+        m_bNextLevelSayAnim = false;
+        m_iSaySlot          = m_iActionSlot;
+    } else if (m_bNextLevelSayAnim != 2 && (m_ThinkState == THINKSTATE_ATTACK || m_ThinkState == THINKSTATE_GRENADE)) {
+        if (!m_bSayAnimSet) {
+            Unregister(STRING_SAYDONE);
+        }
+    } else {
+        ChangeSayAnim();
+
+        m_bSayAnimSet = true;
+        StartSayAnimSlot(anim);
+
+        m_bLevelSayAnim     = m_bNextLevelSayAnim;
+        m_bNextLevelSayAnim = 0;
+        m_iSaySlot          = GetSaySlot();
+        return;
+    }
+}
+
+/*
+===============
+Actor::UpdateUpperAnim
+
+Update upper animation.
+===============
+*/
+void Actor::UpdateUpperAnim(void)
+{
+    int anim;
+
+    anim = gi.Anim_NumForName(edict->tiki, Director.GetString(m_csUpperAnim).c_str());
+    if (anim == -1) {
+        return;
+    }
+
+    if (m_ThinkState == THINKSTATE_ATTACK || m_ThinkState == THINKSTATE_GRENADE || m_ThinkState == THINKSTATE_KILLED
+        || m_ThinkState == THINKSTATE_PAIN) {
+        if (!m_bActionAnimSet) {
+            Unregister(STRING_UPPERANIMDONE);
+        }
+
+        return;
+    }
+
+    gi.Anim_FlagsSkel(edict->tiki, anim);
+
+    ChangeActionAnim();
+
+    m_bActionAnimSet = true;
+    StartActionAnimSlot(anim);
+    m_bLevelActionAnim = true;
+    m_iActionSlot      = GetActionSlot(0);
+}
+
+/*
+===============
+Actor::UpdateAnim
+
+Update animation.
+===============
+*/
+void Actor::UpdateAnim(void)
+{
+    float time;
+    float total_weight;
+    float fAnimTime;
+    float fAnimWeight;
+
+    m_bAnimating = true;
+    UpdateAim();
+
+    if (UpdateSelectedAnimation()) {
+        ChangeAnim();
+    }
+
+    Director.Unpause();
+    Director.Pause();
+
+    if (m_csSayAnim != STRING_EMPTY) {
+        UpdateSayAnim();
+        m_csSayAnim = STRING_EMPTY;
+    }
+
+    if (m_csUpperAnim != STRING_EMPTY) {
+        UpdateUpperAnim();
+        m_csUpperAnim = STRING_EMPTY;
+    }
+
+    if (!m_bSayAnimSet && !m_bIsAnimal) {
+        UpdateEmotion();
+    }
+
+    for (int slot = 0; slot < MAX_FRAMEINFOS - 2; slot++) {
+        if (!((m_bUpdateAnimDoneFlags >> slot) & 1)) {
+            UpdateAnimSlot(slot);
+        }
+    }
+
+    time         = 0;
+    total_weight = 0;
+
+    for (int slot = 0; slot < MAX_FRAMEINFOS - 2; slot++) {
+        if (m_weightType[slot] != ANIM_WEIGHT_MOTION && m_weightType[slot] != ANIM_WEIGHT_CROSSBLEND_2) {
+            UseSyncTime(slot, 0);
+            continue;
+        }
+
+        if (!IsRepeatType(slot)) {
+            UseSyncTime(slot, 0);
+            continue;
+        }
+
+        UseSyncTime(slot, 1);
+        fAnimTime   = AnimTime(slot);
+        fAnimWeight = GetWeight(slot);
+        time += fAnimTime * fAnimWeight;
+
+        if (!isfinite(time)) {
+            Com_Printf(
+                "ent %i, targetname '%s', anim '%s', slot %i, fAnimTime %f, fAnimWeight %f\n",
+                entnum,
+                targetname.c_str(),
+                AnimName(slot),
+                slot,
+                fAnimTime,
+                fAnimWeight
+            );
+        }
+        total_weight += fAnimWeight;
+    }
+
+    if (total_weight != 0) {
+        float rate;
+
+        rate = time / total_weight;
+        if (m_Team != TEAM_GERMAN) {
+            rate /= 1.45f;
+        }
+
+        SetSyncRate(rate / m_fRunAnimRate);
+    }
+
+    PostAnimate();
+}
+
+/*
+===============
+Actor::Think
+
+Think function for actor.
+Calls think function related to the current thinkstate.
+===============
+*/
+void Actor::Think(void)
+{
+    int iNewCurrentHistory;
+
+    if (!g_ai->integer) {
+        // AI is disabled
+        return;
+    }
+
+    if (!m_bDoAI) {
+        return;
+    }
+
+    if (!edict->tiki) {
+        return;
+    }
+
+    m_bAnimating = false;
+
+    Director.Pause();
+
+    iNewCurrentHistory = level.inttime / 125 % 4;
+    if (m_iCurrentHistory != iNewCurrentHistory) {
+        m_iCurrentHistory = iNewCurrentHistory;
+
+        if (iNewCurrentHistory >= 1) {
+            VectorCopy2D(origin, m_vOriginHistory[iNewCurrentHistory - 1]);
+        } else {
+            VectorCopy2D(origin, m_vOriginHistory[3]);
+        }
+    }
+
+    if (m_bNoPlayerCollision) {
+        Entity *player = G_GetEntity(0);
+
+        if (!IsTouching(player)) {
+            Com_Printf("(entnum %d, radnum %d) is going solid after not getting stuck in the player\n", entnum, radnum);
+            setSolidType(SOLID_BBOX);
+            m_bNoPlayerCollision = false;
+        }
+    }
+
+    m_eNextAnimMode = -1;
+    FixAIParameters();
+    UpdateEnableEnemy();
+
+    if (m_pTetherEnt) {
+        m_vHome = m_pTetherEnt->origin;
+    }
+
+    parm.movefail = false;
+    if (m_bBecomeRunner && m_ThinkMap[THINKSTATE_IDLE] != THINK_RUNNER && m_ThinkMap[THINKSTATE_IDLE] != THINK_PATROL) {
+        parm.movefail = true;
+    }
+
+    if (m_bDirtyThinkState) {
+        m_bDirtyThinkState = false;
+        ThinkStateTransitions();
+    }
+
+    GlobalFuncs_t *Think = &GlobalFuncs[m_Think[m_ThinkLevel]];
+
+    if (Think->ThinkState) {
+        (this->*Think->ThinkState)();
+    }
+
+    m_bNeedReload        = false;
+    mbBreakSpecialAttack = false;
+
+    Director.Unpause();
+}
+
+/*
+===============
+Actor::CheckUnregister
+
+Notify scripts when the actor has:
+- Finished moving
+- Has a new enemy
+- And/or if the enemy is visible
+===============
+*/
+void Actor::CheckUnregister(void)
+{
+    m_bBecomeRunner = false;
+
+    if (parm.movefail) {
+        parm.movedone = false;
+        Unregister(STRING_MOVEDONE);
+    }
+
+    if (m_Enemy) {
+        Unregister(STRING_HASENEMY);
+    }
+
+    if (m_bEnemyVisible) {
+        Unregister(STRING_VISIBLE);
+    }
+}
+
+/*
+===============
+Actor::PostThink
+
+Called after think is finished.
+===============
+*/
+void Actor::PostThink(bool bDontFaceWall)
+{
+    CheckUnregister();
+
+    if (bDontFaceWall && (!m_pTurnEntity || m_ThinkState != THINKSTATE_IDLE)) {
+        DontFaceWall();
+    }
+
+    if (is_paused) {
+        return;
+    }
+
+    UpdateAngles();
+    UpdateAnim();
+    DoMove();
+    UpdateBoneControllers();
+    UpdateFootsteps();
+}
+
+/*
+===============
+Actor::AnimFinished
+
+===============
+*/
+void Actor::AnimFinished(int slot, bool stop)
+{
+    if (stop && slot >= 0) {
+        animFlags[slot] |= ANIM_NOACTION;
+    }
+
+    if (slot == m_iMotionSlot) {
+        if (stop) {
+            m_iMotionSlot      = -1;
+            m_bLevelMotionAnim = false;
+        }
+
+        MPrintf("flagged anim finished slot %d\n", slot);
+        Unregister(STRING_FLAGGEDANIMDONE);
+    }
+
+    if (slot == m_iActionSlot) {
+        if (stop) {
+            ChangeActionAnim();
+        }
+
+        if (m_csUpperAnim == STRING_EMPTY) {
+            MPrintf("upper anim finished slot %d\n", slot);
+            Unregister(STRING_UPPERANIMDONE);
+        }
+    }
+
+    if (slot == m_iSaySlot) {
+        if (stop) {
+            ChangeSayAnim();
+        }
+
+        if (m_csSayAnim == STRING_EMPTY) {
+            MPrintf("say anim finished slot %d\n", slot);
+            Unregister(STRING_SAYDONE);
+        }
+    } else if (slot == GetSaySlot() && stop) {
+        ChangeSayAnim();
+    }
+}
+
+/*
+===============
+Actor::AnimFinished
+
+===============
+*/
+void Actor::AnimFinished(int slot)
+{
+    animFlags[slot] &= ~ANIM_FINISHED;
+    AnimFinished(slot, !IsRepeatType(slot));
+}
+
+/*
+===============
+Actor::SetThink
+
+Modifies think num of current thinkstate inside m_ThinkMap.
+===============
+*/
+void Actor::SetThink(eThinkState state, eThinkNum think)
+{
+    m_ThinkMap[state] = think;
+
+    if (m_ThinkState == state) {
+        m_bDirtyThinkState = true;
+    }
+}
+
+/*
+===============
+Actor::SetThink
+
+Set think to idle.
+===============
+*/
+void Actor::SetThinkIdle(eThinkNum think_idle)
+{
+    eThinkNum think_curious;
+
+    switch (think_idle) {
+    case THINK_PATROL:
+    case THINK_RUNNER:
+        think_curious   = THINK_CURIOUS;
+        m_bBecomeRunner = true;
+        break;
+    case THINK_MACHINEGUNNER:
+        think_curious = THINK_MACHINEGUNNER;
+        break;
+    case THINK_DOG_IDLE:
+        think_curious = THINK_DOG_CURIOUS;
+        SetThink(THINKSTATE_GRENADE, THINK_DOG_CURIOUS);
+        break;
+    case THINK_ANIM:
+        think_curious = THINK_ANIM_CURIOUS;
+        break;
+    case THINK_BALCONY_IDLE:
+        think_curious = THINK_BALCONY_CURIOUS;
+        break;
+    default:
+        think_curious = THINK_CURIOUS;
+        break;
+    }
+
+    SetThink(THINKSTATE_IDLE, think_idle);
+    SetThink(THINKSTATE_CURIOUS, think_curious);
+}
+
+/*
+===============
+Actor::GetThinkType
+
+Get think for csName.
+===============
+*/
+int Actor::GetThinkType(const_str csName)
+{
+    int i;
+
+    for (i = 0; i < NUM_THINKS; i++) {
+        if (m_csThinkNames[i] == csName) {
+            return i;
+        }
+    }
+
+    ScriptError("unknown think type '%s'", Director.GetString(csName).c_str());
+}
+
+/*
+===============
+Actor::SetThinkState
+
+Set thinkstate.
+===============
+*/
+void Actor::SetThinkState(eThinkState state, eThinkLevel level)
+{
+    eThinkNum map;
+
+    if (state == THINKSTATE_ATTACK) {
+        m_csIdleMood = STRING_NERVOUS;
+        map          = m_ThinkMap[THINKSTATE_ATTACK];
+
+        if (map != THINK_ALARM && map != THINK_WEAPONLESS && map != THINK_DOG_ATTACK && !GetWeapon(WEAPON_MAIN)) {
+            Com_Printf(
+                "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    forcing weaponless attack state.\n"
+                "^~^~^ Level designers should specify 'type_attack weaponless' for this guy.\n",
+                entnum,
+                radnum,
+                TargetName().c_str()
+            );
+
+            SetThink(THINKSTATE_ATTACK, THINK_WEAPONLESS);
+        }
+    }
+
+    m_ThinkStates[level] = state;
+
+    if (m_ThinkLevel <= level) {
+        m_bDirtyThinkState = true;
+    }
+}
+
+/*
+===============
+Actor::EndCurrentThinkState
+
+End current think state.
+===============
+*/
+void Actor::EndCurrentThinkState(void)
+{
+    SetThinkState(THINKSTATE_VOID, m_ThinkLevel);
+}
+
+/*
+===============
+Actor::ClearThinkStates
+
+Clear all thinkstates.
+===============
+*/
+void Actor::ClearThinkStates(void)
+{
+    for (int i = 0; i < NUM_THINKLEVELS; i++) {
+        SetThinkState(THINKSTATE_VOID, (eThinkLevel)i);
+    }
+}
+
+/*
+===============
+Actor::EventSetAlarmNode
+===============
+*/
+void Actor::EventSetAlarmNode(Event *ev)
+{
+    Listener *l = ev->GetListener(1);
+    if (l && !l->isSubclassOf(SimpleEntity)) {
+        ScriptError("Alarm node must be an entity");
+    }
+
+    m_AlarmNode = static_cast<SimpleEntity *>(l);
+}
+
+/*
+===============
+Actor::EventGetAlarmNode
+===============
+*/
+void Actor::EventGetAlarmNode(Event *ev)
+{
+    ev->AddListener(m_AlarmNode);
+}
+
+/*
+===============
+Actor::EventSetPreAlarmThread
+===============
+*/
+void Actor::EventSetPreAlarmThread(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_PreAlarmThread.SetThread(ev->GetValue());
+    } else {
+        m_PreAlarmThread.Set(ev->GetString(1));
+    }
+}
+
+/*
+===============
+Actor::EventSetAlarmThread
+===============
+*/
+void Actor::EventSetAlarmThread(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_AlarmThread.SetThread(ev->GetValue());
+    } else {
+        m_AlarmThread.Set(ev->GetString(1));
+    }
+}
+
+/*
+===============
+Actor::EventGetAlarmThread
+===============
+*/
+void Actor::EventGetAlarmThread(Event *ev)
+{
+    m_AlarmThread.GetScriptValue(&ev->GetValue());
+}
+
+/*
+===============
+Actor::EventSetSoundAwareness
+===============
+*/
+void Actor::EventSetSoundAwareness(Event *ev)
+{
+    m_fSoundAwareness = ev->GetFloat(1);
+}
+
+/*
+===============
+Actor::EventGetSoundAwareness
+===============
+*/
+void Actor::EventGetSoundAwareness(Event *ev)
+{
+    ev->AddFloat(m_fSoundAwareness);
+}
+
+/*
+===============
+Actor::EventSetGrenadeAwareness
+===============
+*/
+void Actor::EventSetGrenadeAwareness(Event *ev)
+{
+    m_fGrenadeAwareness = ev->GetFloat(1);
+}
+
+/*
+===============
+Actor::EventGetGrenadeAwareness
+===============
+*/
+void Actor::EventGetGrenadeAwareness(Event *ev)
+{
+    ev->AddFloat(m_fGrenadeAwareness);
+}
+
+/*
+===============
+Actor::EventSetTypeIdle
+===============
+*/
+void Actor::EventSetTypeIdle(Event *ev)
+{
+    bool (*AllowedState)(int state);
+    eThinkNum think;
+
+    think        = (eThinkNum)GetThinkType(ev->GetConstString(1));
+    AllowedState = Actor::GlobalFuncs[think].IsState;
+
+    if (!AllowedState(THINKSTATE_IDLE)) {
+        SetThinkIdle(THINK_IDLE);
+        ScriptError("Invalid idle think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
+    }
+
+    SetThinkIdle(think);
+}
+
+/*
+===============
+Actor::EventGetTypeIdle
+===============
+*/
+void Actor::EventGetTypeIdle(Event *ev)
+{
+    ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]);
+}
+
+/*
+===============
+Actor::EventSetTypeAttack
+===============
+*/
+void Actor::EventSetTypeAttack(Event *ev)
+{
+    bool (*AllowedState)(int state);
+    eThinkNum think;
+
+    think        = (eThinkNum)GetThinkType(ev->GetConstString(1));
+    AllowedState = Actor::GlobalFuncs[think].IsState;
+
+    if (!AllowedState(THINKSTATE_ATTACK)) {
+        SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+        ScriptError("Invalid attack think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
+    }
+
+    SetThink(THINKSTATE_ATTACK, think);
+}
+
+/*
+===============
+Actor::EventGetTypeAttack
+===============
+*/
+void Actor::EventGetTypeAttack(Event *ev)
+{
+    ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]);
+}
+
+/*
+===============
+Actor::EventSetTypeDisguise
+===============
+*/
+void Actor::EventSetTypeDisguise(Event *ev)
+{
+    bool (*AllowedState)(int state);
+    eThinkNum think;
+
+    think        = (eThinkNum)GetThinkType(ev->GetConstString(1));
+    AllowedState = Actor::GlobalFuncs[think].IsState;
+
+    if (!AllowedState(THINKSTATE_DISGUISE)) {
+        SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
+        ScriptError("Invalid disguise think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
+    }
+
+    SetThink(THINKSTATE_DISGUISE, think);
+}
+
+/*
+===============
+Actor::EventSetDisguiseAcceptThread
+===============
+*/
+void Actor::EventSetDisguiseAcceptThread(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_DisguiseAcceptThread.SetThread(ev->GetValue());
+    } else {
+        m_DisguiseAcceptThread.Set(ev->GetString(1));
+    }
+}
+
+/*
+===============
+Actor::EventGetDisguiseAcceptThread
+===============
+*/
+void Actor::EventGetDisguiseAcceptThread(Event *ev)
+{
+    m_DisguiseAcceptThread.GetScriptValue(&ev->GetValue());
+}
+
+/*
+===============
+Actor::EventGetTypeDisguise
+===============
+*/
+void Actor::EventGetTypeDisguise(Event *ev)
+{
+    ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_DISGUISE]]);
+}
+
+/*
+===============
+Actor::EventSetDisguiseLevel
+===============
+*/
+void Actor::EventSetDisguiseLevel(Event *ev)
+{
+    m_iDisguiseLevel = ev->GetInteger(1);
+
+    if (m_iDisguiseLevel != 1 && m_iDisguiseLevel != 2) {
+        m_iDisguiseLevel = 1;
+        ScriptError("bad disguise level %d for %s, setting to 1\n", m_iDisguiseLevel, TargetName().c_str());
+    }
+}
+
+/*
+===============
+Actor::EventGetDisguiseLevel
+===============
+*/
+void Actor::EventGetDisguiseLevel(Event *ev)
+{
+    ev->AddInteger(m_iDisguiseLevel);
+}
+
+/*
+===============
+Actor::EventSetTypeGrenade
+===============
+*/
+void Actor::EventSetTypeGrenade(Event *ev)
+{
+    bool (*AllowedState)(int state);
+    eThinkNum think;
+
+    think        = (eThinkNum)GetThinkType(ev->GetConstString(1));
+    AllowedState = Actor::GlobalFuncs[think].IsState;
+
+    if (!AllowedState(THINKSTATE_GRENADE)) {
+        SetThink(THINKSTATE_GRENADE, THINK_GRENADE);
+        ScriptError("Invalid grenade think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
+    }
+
+    SetThink(THINKSTATE_GRENADE, think);
+}
+
+/*
+===============
+Actor::EventGetTypeGrenade
+===============
+*/
+void Actor::EventGetTypeGrenade(Event *ev)
+{
+    ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]);
+}
+
+/*
+===============
+Actor::InitThinkStates
+
+Initialize think related stuff.
+===============
+*/
+void Actor::InitThinkStates(void)
+{
+    for (size_t i = 0; i < NUM_THINKSTATES; i++) {
+        m_ThinkMap[i] = THINK_VOID;
+    }
+
+    for (size_t i = 0; i < NUM_THINKLEVELS; i++) {
+        m_Think[i]       = THINK_VOID;
+        m_ThinkStates[i] = THINKSTATE_VOID;
+    }
+
+    m_ThinkMap[THINKSTATE_VOID]     = THINK_VOID;
+    m_ThinkMap[THINKSTATE_IDLE]     = THINK_IDLE;
+    m_ThinkMap[THINKSTATE_PAIN]     = THINK_PAIN;
+    m_ThinkMap[THINKSTATE_KILLED]   = THINK_KILLED;
+    m_ThinkMap[THINKSTATE_ATTACK]   = THINK_TURRET;
+    m_ThinkMap[THINKSTATE_CURIOUS]  = THINK_CURIOUS;
+    m_ThinkMap[THINKSTATE_DISGUISE] = THINK_DISGUISE_SALUTE;
+    m_ThinkMap[THINKSTATE_GRENADE]  = THINK_GRENADE;
+    m_ThinkMap[THINKSTATE_BADPLACE] = THINK_BADPLACE;
+    m_ThinkMap[THINKSTATE_NOCLIP]   = THINK_NOCLIP;
+
+    m_ThinkLevel       = THINKLEVEL_IDLE;
+    m_ThinkState       = THINKSTATE_VOID;
+    m_bDirtyThinkState = false;
+}
+
+/*
+===============
+Actor::DefaultRestart
+
+Default restart of current think state.
+===============
+*/
+void Actor::DefaultRestart(void)
+{
+    EndState(m_ThinkLevel);
+    BeginState();
+}
+
+/*
+===============
+Actor::SuspendState
+
+Suspend current think state.
+===============
+*/
+void Actor::SuspendState(void)
+{
+    GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
+
+    if (think->SuspendState) {
+        (this->*think->SuspendState)();
+    }
+}
+
+/*
+===============
+Actor::ResumeState
+
+Resume current think state.
+===============
+*/
+void Actor::ResumeState(void)
+{
+    GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
+
+    if (think->ResumeState) {
+        (this->*think->ResumeState)();
+    }
+}
+
+/*
+===============
+Actor::BeginState
+
+Begin current think state.
+===============
+*/
+void Actor::BeginState(void)
+{
+    GlobalFuncs_t *think;
+
+    m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
+    think                 = &GlobalFuncs[CurrentThink()];
+
+    if (think->BeginState) {
+        (this->*think->BeginState)();
+    }
+
+    m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
+}
+
+/*
+===============
+Actor::EndState
+
+End current think state.
+===============
+*/
+void Actor::EndState(int level)
+{
+    GlobalFuncs_t *think;
+
+    think          = &GlobalFuncs[m_Think[level]];
+    m_Think[level] = THINK_VOID;
+
+    if (think->EndState) {
+        (this->*think->EndState)();
+    }
+
+    if (m_pAnimThread) {
+        m_pAnimThread->AbortRegistration(STRING_EMPTY, this);
+    }
+}
+
+/*
+===============
+Actor::RestartState
+
+Restart current think state.
+===============
+*/
+void Actor::RestartState(void)
+{
+    GlobalFuncs_t *think = &GlobalFuncs[CurrentThink()];
+
+    if (think->RestartState) {
+        (this->*think->RestartState)();
+    }
+}
+
+/*
+===============
+Actor::UpdateEnableEnemy
+
+Enable/disable enemy based on desired value.
+Can be changed from script.
+===============
+*/
+void Actor::UpdateEnableEnemy(void)
+{
+    if (m_bEnableEnemy == m_bDesiredEnableEnemy) {
+        // no change
+        return;
+    }
+
+    m_bEnableEnemy = m_bDesiredEnableEnemy;
+
+    if (m_bEnableEnemy) {
+        SetLeashHome(origin);
+    } else {
+        if (m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_ATTACK || m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_CURIOUS
+            || m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_DISGUISE) {
+            SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        }
+
+        SetEnemy(NULL, false);
+    }
+}
+
+/*
+===============
+Actor::ThinkStateTransitions
+
+Transition think state and level.
+Called when thinkstate/level are change.
+===============
+*/
+void Actor::ThinkStateTransitions(void)
+{
+    int         i;
+    eThinkLevel newThinkLevel;
+
+    for (newThinkLevel = THINKLEVEL_NOCLIP; newThinkLevel; newThinkLevel = (eThinkLevel)(newThinkLevel - 1)) {
+        if (m_ThinkStates[newThinkLevel]) {
+            break;
+        }
+    }
+
+    if (m_ThinkMap[m_ThinkStates[newThinkLevel]] != CurrentThink()) {
+        for (i = 0; i < newThinkLevel; i++) {
+            if (!m_ThinkStates[i]) {
+                EndState(i);
+            }
+        }
+
+        if (newThinkLevel > m_ThinkLevel) {
+            SuspendState();
+            m_ThinkLevel = newThinkLevel;
+            m_ThinkState = m_ThinkStates[m_ThinkLevel];
+            BeginState();
+        } else {
+            EndState(m_ThinkLevel);
+
+            if (newThinkLevel == m_ThinkLevel) {
+                m_ThinkState = m_ThinkStates[m_ThinkLevel];
+                BeginState();
+            } else {
+                m_ThinkLevel = newThinkLevel;
+                m_ThinkState = m_ThinkStates[m_ThinkLevel];
+
+                if (CurrentThink() == m_ThinkMap[m_ThinkState]) {
+                    ResumeState();
+                } else {
+                    EndState(m_ThinkLevel);
+                    BeginState();
+                }
+            }
+        }
+    } else if (newThinkLevel == m_ThinkLevel && m_ThinkState == m_ThinkStates[m_ThinkLevel]) {
+        RestartState();
+    } else {
+        m_ThinkLevel          = newThinkLevel;
+        m_ThinkState          = m_ThinkStates[m_ThinkLevel];
+        m_Think[m_ThinkLevel] = m_ThinkMap[m_ThinkState];
+    }
+}
+
+/*
+===============
+Actor::FixAIParameters
+
+Fix path related parameters.
+===============
+*/
+void Actor::FixAIParameters(void)
+{
+    float fMinLeash;
+
+    if (m_pTetherEnt) {
+        fMinLeash = 64;
+        if (m_pTetherEnt->IsSubclassOfEntity()) {
+            Entity *pEnt = static_cast<Entity *>(m_pTetherEnt.Pointer());
+            fMinLeash    = pEnt->maxs[0] - pEnt->mins[1] + pEnt->maxs[1] - pEnt->mins[1];
+        }
+
+        if (m_fLeash < fMinLeash) {
+            Com_Printf(
+                "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    increasing leash from %g to %g.\n"
+                "^~^~^ Leash must be larger than the size of the entity to which an AI is tethered.\n"
+                "\n",
+                entnum,
+                radnum,
+                TargetName().c_str(),
+                m_fLeash,
+                fMinLeash
+            );
+
+            m_fLeash        = fMinLeash;
+            m_fLeashSquared = Square(fMinLeash);
+        }
+    }
+
+    if (m_fLeash < m_fMinDistance) {
+        Com_Printf(
+            "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing mindist from %g to %g to match "
+            "leash.\n"
+            "^~^~^ Leash must be greater than mindist, or the AI will want to both run away and stay put.\n"
+            "\n",
+            entnum,
+            radnum,
+            TargetName().c_str(),
+            m_fMinDistance,
+            m_fLeash
+        );
+
+        m_fMinDistance        = m_fLeash;
+        m_fMinDistanceSquared = Square(m_fMinDistance);
+    }
+
+    if (m_fMaxDistance < m_fMinDistance + 128.0 - 1.0) {
+        Com_Printf(
+            "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    increasing maxdist from %g to %g to exceed "
+            "mindist.\n"
+            "^~^~^ Maxdist should be %i greater than mindist, or the AI will want to both run away and charge, or just "
+            "do oscillitaroy behavior.\n"
+            "\n",
+            entnum,
+            radnum,
+            TargetName().c_str(),
+            m_fMaxDistance,
+            m_fMinDistance + 128.0,
+            128
+        );
+
+        m_fMaxDistance        = m_fMinDistance + 128;
+        m_fMaxDistanceSquared = Square(m_fMaxDistance);
+    }
+
+    if (world->farplane_distance > 0 && m_fMaxDistance > world->farplane_distance * 0.828f) {
+        Com_Printf(
+            "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing maxdist from %g to %g to be %g%% "
+            "of farplane.\n"
+            "^~^~^ Maxdist should be this distance within fog, or AI will be able to see and attack through fog.\n"
+            "\n",
+            entnum,
+            radnum,
+            TargetName().c_str(),
+            m_fMaxDistance,
+            world->farplane_distance * 0.828,
+            2.0
+        );
+
+        m_fMaxDistance        = world->farplane_distance * 0.828f;
+        m_fMaxDistanceSquared = Square(m_fMaxDistance);
+
+        if (m_fMaxDistance < m_fMinDistance + 128.0 - 1.0) {
+            Com_Printf(
+                "^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    reducing mindist from %g to %g to be less "
+                "than maxdist after fog adjustment.\n"
+                "\n",
+                entnum,
+                radnum,
+                TargetName().c_str(),
+                m_fMinDistance,
+                ((m_fMaxDistance > 128) ? (m_fMaxDistance - 128) : 0)
+            );
+
+            m_fMinDistance = m_fMaxDistance - 128;
+            if (m_fMinDistance < 0) {
+                m_fMinDistance = 0;
+            }
+
+            m_fMinDistanceSquared = Square(m_fMinDistance);
+        }
+    }
+}
+
+/*
+===============
+Actor::AttackEntryAnimation
+
+Returns true if actor stands/draws his weapon.
+===============
+*/
+bool Actor::AttackEntryAnimation(void)
+{
+    float  fDistSquared;
+    vec2_t vDelta;
+
+    if (!m_Enemy) {
+        return false;
+    }
+
+    if (level.inttime >= level.m_iAttackEntryAnimTime + 3000) {
+        VectorSub2D(m_Enemy->origin, origin, vDelta);
+        fDistSquared = VectorLength2DSquared(vDelta);
+
+        if (!m_bNoSurprise && fDistSquared < Square(256)) {
+            if (fDistSquared / 384.f < rand()) {
+                StartAnimation(ANIM_MODE_NORMAL, STRING_ANIM_STANDSHOCK_SCR);
+                m_bNoSurprise = true;
+                m_bNewEnemy   = true;
+                return true;
+            }
+        } else if (fDistSquared > Square(1024) && (rand() % 4) == 0) {
+            Sentient *pSquadMate;
+
+            for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+                if (Square(m_fInterval) * 4 > (pSquadMate->origin - origin).lengthSquared()) {
+                    SetDesiredYawDest(m_Enemy->origin);
+                    SetDesiredLookDir(m_Enemy->origin - origin);
+
+                    StartAnimation(ANIM_MODE_NORMAL, STRING_ANIM_STANDIDENTIFY_SCR);
+                    m_bNoSurprise = true;
+                    m_bNewEnemy   = false;
+
+                    return true;
+                }
+            }
+        }
+    }
+
+    if (m_bNewEnemy) {
+        Anim_Say(STRING_ANIM_SAY_SIGHTED_SCR, 200, true);
+    }
+
+    m_bNoSurprise = true;
+    m_bNewEnemy   = false;
+    return false;
+}
+
+/*
+===============
+Actor::CheckForThinkStateTransition
+
+Check for all thinkstates transitions.
+===============
+*/
+void Actor::CheckForThinkStateTransition(void)
+{
+    if (CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)
+        || CheckForTransition(THINKSTATE_BADPLACE, THINKLEVEL_IDLE)) {
+        return;
+    }
+
+    if (!m_bEnableEnemy) {
+        CheckForTransition(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
+
+    if (CheckForTransition(THINKSTATE_ATTACK, THINKLEVEL_IDLE)
+        || CheckForTransition(THINKSTATE_DISGUISE, THINKLEVEL_IDLE)) {
+        return;
+    }
+
+    if (CheckForTransition(THINKSTATE_CURIOUS, THINKLEVEL_IDLE)) {
+        m_pszDebugState = "from_sight";
+        return;
+    }
+
+    CheckForTransition(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+}
+
+/*
+===============
+Actor::CheckForTransition
+
+Check for thinkstate transition.
+===============
+*/
+bool Actor::CheckForTransition(eThinkState state, eThinkLevel level)
+{
+    GlobalFuncs_t *func;
+
+    if (m_ThinkStates[level] == state) {
+        return false;
+    }
+
+    func = &GlobalFuncs[m_ThinkMap[state]];
+    if (!func->PassesTransitionConditions) {
+        return false;
+    }
+
+    if (!(this->*(func->PassesTransitionConditions))()) {
+        return false;
+    }
+
+    SetThinkState(state, THINKLEVEL_IDLE);
+    return true;
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_Grenade
+
+Should actor transition think state to grenade ?
+===============
+*/
+bool Actor::PassesTransitionConditions_Grenade(void)
+{
+    if (!m_bIsCurious) {
+        // Added in 2.30
+        return false;
+    }
+
+    if (m_bLockThinkState || !m_bEnableEnemy) {
+        return false;
+    }
+
+    if (!m_pGrenade) {
+        return false;
+    }
+
+    return m_fGrenadeAwareness >= random();
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_BadPlace
+
+Should actor transition think state to bad place?
+===============
+*/
+bool Actor::PassesTransitionConditions_BadPlace(void)
+{
+    if (m_bLockThinkState) {
+        return false;
+    }
+
+    return m_iBadPlaceIndex != 0;
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_Attack
+
+Should actor transition think state to attack ?
+===============
+*/
+bool Actor::PassesTransitionConditions_Attack(void)
+{
+    UpdateEnemy(0);
+
+    if (m_bLockThinkState) {
+        return false;
+    }
+
+    if (!m_Enemy || (m_Enemy->flags & FL_NOTARGET)) {
+        return false;
+    }
+
+    if (EnemyIsDisguised() || !m_PotentialEnemies.IsEnemyConfirmed()) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_Disguise
+
+Should actor transition think state to disguise ?
+===============
+*/
+bool Actor::PassesTransitionConditions_Disguise(void)
+{
+    vec2_t vDelta;
+    float  fDistSquared;
+
+    if (m_bLockThinkState) {
+        return false;
+    }
+
+    if (m_iNextDisguiseTime > level.inttime) {
+        return false;
+    }
+
+    m_iNextDisguiseTime = level.inttime + 200;
+
+    UpdateEnemy(200);
+
+    if (!m_Enemy) {
+        return false;
+    }
+
+    if (!EnemyIsDisguised()) {
+        return false;
+    }
+
+    if (!m_PotentialEnemies.IsEnemyConfirmed()) {
+        return false;
+    }
+
+    if (fabs(m_Enemy->origin[2] - origin[2]) > 48) {
+        return false;
+    }
+
+    VectorSub2D(m_Enemy->origin, origin, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
+    if (fDistSquared <= Square(32) || fDistSquared >= m_fMaxDisguiseDistSquared) {
+        return false;
+    }
+
+    Entity *player = G_GetEntity(0);
+
+    return G_SightTrace(
+        EyePosition(),
+        vec_zero,
+        vec_zero,
+        player->centroid,
+        this,
+        player,
+        MASK_TRANSITION,
+        false,
+        "Actor::PassesTransitionConditions_Disguise"
+    );
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_Curious
+
+Should actor transition think state to curious ?
+===============
+*/
+bool Actor::PassesTransitionConditions_Curious(void)
+{
+    UpdateEnemy(200);
+
+    if (m_bLockThinkState) {
+        return false;
+    }
+
+    if (!m_Enemy && m_iCuriousTime) {
+        SetCuriousAnimHint(6);
+        return true;
+    }
+
+    if (m_Enemy && !EnemyIsDisguised() && !m_PotentialEnemies.IsEnemyConfirmed()) {
+        SetCuriousAnimHint(6);
+        return true;
+    }
+
+    return false;
+}
+
+/*
+===============
+Actor::PassesTransitionConditions_Idle
+
+Should actor transition think state to idle ?
+===============
+*/
+bool Actor::PassesTransitionConditions_Idle(void)
+{
+    if (m_bEnableEnemy) {
+        UpdateEnemy(500);
+    }
+
+    if (m_bLockThinkState) {
+        return false;
+    }
+
+    if (!m_Enemy && !m_iCuriousTime) {
+        return true;
+    }
+
+    return false;
+}
+
+/*
+===============
+Actor::EventGetRunAnim
+===============
+*/
+void Actor::EventGetRunAnim(Event *ev)
+{
+    ev->AddConstString(GetRunAnim());
+}
+
+/*
+===============
+Actor::EventGetWalkAnim
+===============
+*/
+void Actor::EventGetWalkAnim(Event *ev)
+{
+    ev->AddConstString(GetWalkAnim());
+}
+
+/*
+===============
+Actor::PathDistanceAlongVector
+
+Returns projected distance from vDir along path.
+===============
+*/
+float Actor::PathDistanceAlongVector(vec3_t vDir)
+{
+    const float *delta = m_Path.CurrentDelta();
+
+    return DotProduct2D(delta, vDir);
+}
+
+/*
+===============
+Actor::FaceEnemyOrMotion
+
+
+===============
+*/
+void Actor::FaceEnemyOrMotion(int iTimeIntoMove)
+{
+    vec2_t vDelta;
+
+    VectorSub2D(origin, m_vLastEnemyPos, vDelta);
+
+    if (iTimeIntoMove <= 999) {
+        m_bFaceEnemy = true;
+    } else if (m_Path.CurrentNodeIndex() != m_sCurrentPathNodeIndex) {
+        float fDist;
+
+        fDist = PathDistanceAlongVector(vDelta);
+
+        if (fDist > 0 || VectorLength2DSquared(vDelta) * 4096 < Square(fDist)) {
+            m_bFaceEnemy = false;
+        } else {
+            m_bFaceEnemy = true;
+        }
+
+        m_sCurrentPathNodeIndex = m_Path.CurrentNodeIndex();
+    }
+
+    if (!m_bFaceEnemy) {
+        FaceMotion();
+        return;
+    }
+
+    if (vDelta[0] < 15 && vDelta[0] > -15 && vDelta[1] < 15 && vDelta[1] > -15) {
+        FaceMotion();
+        return;
+    }
+
+    vDelta[0] = -vDelta[0];
+    vDelta[1] = -vDelta[1];
+    FaceDirectionDuringMotion(vDelta);
+}
+
+/*
+===============
+Actor::FaceDirectionDuringMotion
+
+Face direction during motion.
+===============
+*/
+void Actor::FaceDirectionDuringMotion(vec3_t vLook)
+{
+    float yaw;
+
+    SetDesiredLookDir(vLook);
+
+    if (!velocity[0] && !velocity[1]) {
+        SetDesiredYawDir(vLook);
+        return;
+    }
+
+    float fDot         = DotProduct2D(velocity, vLook);
+    float fDotSquared  = Square(fDot);
+    float fMagsSquared = VectorLength2DSquared(vLook) * VectorLength2DSquared(velocity);
+
+    yaw = velocity.toYaw();
+
+    if (fDotSquared < fMagsSquared / 2.f) {
+        if (velocity.y * vLook[0] > velocity.x * vLook[1]) {
+            yaw -= 90;
+        } else {
+            yaw -= 270;
+        }
+
+        if (yaw < 0) {
+            yaw += 360;
+        }
+    } else if (fDot < 0) {
+        yaw -= 180;
+
+        if (yaw < 0) {
+            yaw += 360;
+        }
+    }
+
+    SetDesiredYaw(yaw);
+}
+
+/*
+===============
+Actor::EventGetAnimName
+===============
+*/
+void Actor::EventGetAnimName(Event *ev)
+{
+    ev->AddConstString(m_csAnimName);
+}
+
+/*
+===============
+Actor::EventSetAnimName
+===============
+*/
+void Actor::EventSetAnimName(Event *ev)
+{
+    m_csAnimName = ev->GetConstString(1);
+}
+
+/*
+===============
+Actor::EventSetDisguiseRange
+===============
+*/
+void Actor::EventSetDisguiseRange(Event *ev)
+{
+    m_fMaxDisguiseDistSquared = ev->GetFloat(1);
+    m_fMaxDisguiseDistSquared = Square(m_fMaxDisguiseDistSquared);
+}
+
+/*
+===============
+Actor::EventGetDisguiseRange
+===============
+*/
+void Actor::EventGetDisguiseRange(Event *ev)
+{
+    ev->AddFloat(sqrt(m_fMaxDisguiseDistSquared));
+}
+
+/*
+===============
+Actor::EventSetDisguisePeriod
+===============
+*/
+void Actor::EventSetDisguisePeriod(Event *ev)
+{
+    m_iDisguisePeriod = ev->GetFloat(1) * 1000 + 0.5;
+}
+
+/*
+===============
+Actor::EventGetDisguisePeriod
+===============
+*/
+void Actor::EventGetDisguisePeriod(Event *ev)
+{
+    ev->AddFloat(m_iDisguisePeriod / 1000.0);
+}
+
+/*
+===============
+Actor::FaceMotion
+
+===============
+*/
+void Actor::FaceMotion(void)
+{
+    vec2_t vDelta;
+
+    if (VectorLength2DSquared(velocity) > 1) {
+        vec3_t dir;
+
+        VectorCopy2D(velocity, dir);
+        VectorSub2D(origin, m_vOriginHistory[m_iCurrentHistory], vDelta);
+
+        if (VectorLength2DSquared(vDelta) >= 1 && DotProduct2D(vDelta, dir) > 0) {
+            VectorCopy2D(vDelta, dir);
+        }
+
+        dir[2] = 0;
+
+        if (m_ThinkState == THINKSTATE_IDLE) {
+            IdleLook(dir);
+        } else {
+            SetDesiredLookDir(dir);
+        }
+
+        SetDesiredYawDir(dir);
+    } else if (m_ThinkState == THINKSTATE_IDLE) {
+        IdleLook();
+    } else {
+        ForwardLook();
+    }
+}
+
+/*
+===============
+Actor::ForceAttackPlayer
+===============
+*/
+void Actor::ForceAttackPlayer(void)
+{
+    m_PotentialEnemies.ConfirmEnemy(this, static_cast<Sentient *>(G_GetEntity(0)));
+    m_bForceAttackPlayer = true;
+}
+
+/*
+===============
+Actor::EventAttackPlayer
+===============
+*/
+void Actor::EventAttackPlayer(Event *ev)
+{
+    if (!G_GetEntity(0)) {
+        ScriptError("player doesn't exist");
+    }
+
+    ForceAttackPlayer();
+}
+
+/*
+===============
+Actor::EventShareEnemy
+
+Share enemy with squad mates.
+===============
+*/
+void Actor::EventShareEnemy(Event *ev)
+{
+    Sentient *pSquadMate;
+
+    if (!m_Enemy) {
+        return;
+    }
+
+    if (EnemyIsDisguised()) {
+        return;
+    }
+
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        if (!pSquadMate->IsSubclassOfActor()) {
+            continue;
+        }
+
+        Actor *pActorSquadMate = static_cast<Actor *>(pSquadMate);
+
+        if (!m_fMaxShareDistSquared || m_fMaxShareDistSquared < (pActorSquadMate->origin - origin).lengthSquared()) {
+            pActorSquadMate->m_PotentialEnemies.ConfirmEnemyIfCanSeeSharerOrEnemy(pActorSquadMate, this, m_Enemy);
+        }
+    }
+}
+
+/*
+===============
+Actor::EventShareGrenade
+
+Share grenade with squad mates.
+===============
+*/
+void Actor::EventShareGrenade(Event *ev)
+{
+    Sentient *pSquadMate;
+
+    if (!m_pGrenade) {
+        return;
+    }
+
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        if (!pSquadMate->IsSubclassOfActor()) {
+            continue;
+        }
+
+        Actor *pActorSquadMate = static_cast<Actor *>(pSquadMate);
+
+        if (pActorSquadMate->m_pGrenade) {
+            continue;
+        }
+
+        if ((pSquadMate->origin - origin).lengthSquared() < Square(768)
+            && DoesTheoreticPathExist(pSquadMate->origin, 1536)) {
+            pActorSquadMate->SetGrenade(m_pGrenade);
+        }
+    }
+}
+
+/*
+===============
+Actor::ReceiveAIEvent
+
+Calls proper RecieveAIEvent for current ThinkState.
+===============
+*/
+void Actor::ReceiveAIEvent(
+    vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
+)
+{
+    if (originator) {
+        if (originator == this || originator == GetActiveWeapon(WEAPON_MAIN)) {
+            return;
+        }
+    }
+
+    GlobalFuncs_t *func = &GlobalFuncs[CurrentThink()];
+
+    if (func->ReceiveAIEvent) {
+        (this->*func->ReceiveAIEvent)(event_origin, iType, originator, fDistSquared, fMaxDistSquared);
+    }
+}
+
+/*
+===============
+Actor::DefaultReceiveAIEvent
+
+Default AI event handler.
+===============
+*/
+void Actor::DefaultReceiveAIEvent(
+    vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
+)
+{
+    if (IsDead()) {
+        return;
+    }
+
+    if (originator && !originator->IsDead() && originator->IsSubclassOfSentient()
+        && ((Sentient *)originator)->m_Team == m_Team && !IsSquadMate((Sentient *)originator)) {
+        MergeWithSquad((Sentient *)originator);
+    }
+
+    switch (iType) {
+    case AI_EVENT_WEAPON_FIRE:
+    case AI_EVENT_WEAPON_IMPACT:
+        if (fDistSquared < Square(m_fHearing)) {
+            WeaponSound(iType, event_origin, fDistSquared, fMaxDistSquared, originator);
+        }
+        break;
+    case AI_EVENT_EXPLOSION:
+    case AI_EVENT_MISC:
+    case AI_EVENT_MISC_LOUD:
+        if (fDistSquared < Square(m_fHearing)) {
+            CuriousSound(iType, event_origin, fDistSquared, fMaxDistSquared);
+        }
+        break;
+    case AI_EVENT_AMERICAN_VOICE:
+    case AI_EVENT_GERMAN_VOICE:
+    case AI_EVENT_AMERICAN_URGENT:
+    case AI_EVENT_GERMAN_URGENT:
+        if (fDistSquared < Square(m_fHearing)) {
+            VoiceSound(iType, event_origin, fDistSquared, fMaxDistSquared, originator);
+        }
+        break;
+    case AI_EVENT_FOOTSTEP:
+        if (fDistSquared < Square(m_fHearing)) {
+            FootstepSound(event_origin, fDistSquared, fMaxDistSquared, originator);
+        }
+        break;
+    case AI_EVENT_GRENADE:
+        GrenadeNotification(originator);
+        break;
+    case AI_EVENT_BADPLACE:
+        UpdateBadPlaces();
+        break;
+    default:
+        {
+            char assertStr[16317] = {0};
+            strcpy(assertStr, "\"unknown ai_event type\"\n\tMessage: ");
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("iType = %i", iType));
+            assert(false && assertStr);
+        }
+        break;
+    }
+}
+
+/*
+===============
+Actor::PriorityForEventType
+
+Returns priority for event type.
+===============
+*/
+int Actor::PriorityForEventType(int iType)
+{
+    switch (iType) {
+        //FIXME: return macros
+    case AI_EVENT_WEAPON_FIRE:
+        return 7;
+    case AI_EVENT_WEAPON_IMPACT:
+        return 5;
+    case AI_EVENT_EXPLOSION:
+        return 6;
+    case AI_EVENT_AMERICAN_VOICE:
+    case AI_EVENT_GERMAN_VOICE:
+        return 3;
+    case AI_EVENT_AMERICAN_URGENT:
+    case AI_EVENT_GERMAN_URGENT:
+        return 4;
+    case AI_EVENT_MISC:
+        return 1;
+    case AI_EVENT_MISC_LOUD:
+    case AI_EVENT_FOOTSTEP:
+        return 2;
+    case AI_EVENT_GRENADE:
+        return 8;
+    default:
+        assert(!"PriorityForEventType: unknown ai_event type");
+        return 0;
+    }
+}
+
+const char *DebugStringForEvent(int iType)
+{
+    switch (iType) {
+    case AI_EVENT_WEAPON_FIRE:
+        return "weapon_fire";
+    case AI_EVENT_WEAPON_IMPACT:
+        return "weapon_impact";
+    case AI_EVENT_EXPLOSION:
+        return "explosion";
+    case AI_EVENT_AMERICAN_VOICE:
+        return "american_voice";
+    case AI_EVENT_GERMAN_VOICE:
+        return "german_voice";
+    case AI_EVENT_AMERICAN_URGENT:
+        return "american_urgent";
+    case AI_EVENT_GERMAN_URGENT:
+        return "german_urgent";
+    case AI_EVENT_MISC:
+        return "misc";
+    case AI_EVENT_MISC_LOUD:
+        return "misc_loud";
+    case AI_EVENT_FOOTSTEP:
+        return "footstep";
+    case AI_EVENT_GRENADE:
+        return "grenade";
+    default:
+        return "????";
+    }
+}
+
+/*
+===============
+Actor::CuriousSound
+
+Handles curious sound.
+===============
+*/
+void Actor::CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared)
+{
+    float fRangeFactor;
+    int   iPriority;
+
+    if (!m_bEnableEnemy) {
+        return;
+    }
+
+    if (m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_IDLE && m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_CURIOUS) {
+        return;
+    }
+
+    if (!m_bIsCurious) {
+        // Added in 2.30
+        return;
+    }
+
+    fRangeFactor = 1.0;
+    if (fMaxDistSquared) {
+        fRangeFactor = (4.0 / 3.0 - ((4.0 / 3.0 * fDistSquared) / fMaxDistSquared));
+        if (fRangeFactor > 1) {
+            fRangeFactor = 1;
+        }
+    }
+
+    if ((fRangeFactor * m_fSoundAwareness) < random()) {
+        return;
+    }
+
+    RaiseAlertnessForEventType(iType);
+    // get the priority
+    iPriority = PriorityForEventType(iType);
+
+    if (iPriority < m_iCuriousLevel) {
+        return;
+    }
+
+    m_iCuriousLevel = iPriority;
+    switch (iType) {
+    case AI_EVENT_WEAPON_IMPACT:
+        if (fDistSquared <= Square(192)) {
+            SetCuriousAnimHint(1);
+        }
+        break;
+    case AI_EVENT_EXPLOSION:
+        if (fDistSquared <= Square(768)) {
+            SetCuriousAnimHint(3);
+        }
+        break;
+    case AI_EVENT_WEAPON_FIRE:
+        if (fDistSquared <= Square(512)) {
+            SetCuriousAnimHint(2);
+        }
+        break;
+    default:
+        SetCuriousAnimHint(5);
+        break;
+    }
+
+    SetEnemyPos(sound_origin);
+
+    EndCurrentThinkState();
+    SetThinkState(THINKSTATE_CURIOUS, THINKLEVEL_IDLE);
+
+    m_pszDebugState = DebugStringForEvent(iType);
+}
+
+/*
+===============
+Actor::WeaponSound
+
+Handles weapon sound.
+===============
+*/
+void Actor::WeaponSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator)
+{
+    Sentient *pOwner;
+
+    if (originator->IsSubclassOfWeapon()) {
+        pOwner = static_cast<Weapon *>(originator)->GetOwner();
+    } else if (originator->IsSubclassOfProjectile()) {
+        pOwner = static_cast<Projectile *>(originator)->GetOwner();
+    } else if (originator->IsSubclassOfSentient()) {
+        pOwner = static_cast<Sentient *>(originator);
+    } else {
+        char assertStr[16317] = {0};
+        strcpy(assertStr, "\"Actor::WeaponSound: non-weapon made a weapon sound.\\n\"\n\tMessage: ");
+        Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("class = %s", originator->getClassname()));
+        assert(false && assertStr);
+
+        return;
+    }
+
+    if (!pOwner) {
+        return;
+    }
+
+    Sentient *pEnemy;
+
+    pEnemy = pOwner;
+
+    if (pOwner->m_Team == m_Team) {
+        pEnemy = pOwner->m_Enemy;
+    }
+
+    if (pOwner->m_Team == m_Team && !pEnemy && pOwner->IsSubclassOfActor() && originator->IsSubclassOfWeapon()) {
+        Actor  *pActor  = static_cast<Actor *>(pOwner);
+        Weapon *pWeapon = static_cast<Weapon *>(originator);
+
+        if (pActor->m_Think[THINKLEVEL_IDLE] == THINK_MACHINEGUNNER && pWeapon->aim_target) {
+            if (pWeapon->aim_target->IsSubclassOfSentient()) {
+                Sentient *pTarget = static_cast<Sentient *>(pWeapon->aim_target.Pointer());
+                if (pTarget->m_Team == m_Team) {
+                    pEnemy = pTarget;
+                }
+            } else if (!m_Team) {
+                for (pEnemy = level.m_HeadSentient[TEAM_AMERICAN]; pEnemy; pEnemy = pEnemy->m_NextSentient) {
+                    if ((pEnemy->origin - pWeapon->aim_target->centroid).lengthSquared() < Square(48)) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if (pEnemy && m_PotentialEnemies.CaresAboutPerfectInfo(pEnemy) && NoticeShot(pOwner, pEnemy, sqrt(fDistSquared))) {
+        if (pOwner->m_Team != m_Team) {
+            m_PotentialEnemies.ConfirmEnemy(this, pOwner);
+        }
+
+        CuriousSound(iType, sound_origin, fDistSquared, fMaxDistSquared);
+    }
+}
+
+/*
+===============
+Actor::FootstepSound
+
+Handles footstep sound.
+===============
+*/
+void Actor::FootstepSound(vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator)
+{
+    if (!originator->IsSubclassOfSentient()) {
+        char assertStr[16317] = {0};
+        strcpy(assertStr, "\"'ai_event footstep' in a tiki used by something besides AI or player.\\n\"\n\tMessage: ");
+        Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
+        assert(false && assertStr);
+        return;
+    }
+
+    if (m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_IDLE && m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_CURIOUS) {
+        return;
+    }
+
+    if (!m_bEnableEnemy) {
+        return;
+    }
+
+    if (!NoticeFootstep(static_cast<Sentient *>(originator))) {
+        return;
+    }
+
+    CuriousSound(AI_EVENT_FOOTSTEP, sound_origin, fDistSquared, fMaxDistSquared);
+}
+
+/*
+===============
+Actor::VoiceSound
+
+Handles voice sound.
+===============
+*/
+void Actor::VoiceSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator)
+{
+    bool bFriendly;
+
+    if (m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_IDLE && m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_CURIOUS) {
+        return;
+    }
+
+    if (!m_bEnableEnemy) {
+        return;
+    }
+
+    switch (iType) {
+    case AI_EVENT_AMERICAN_VOICE:
+    case AI_EVENT_AMERICAN_URGENT:
+        bFriendly = m_Team == TEAM_AMERICAN;
+        break;
+    case AI_EVENT_GERMAN_VOICE:
+    case AI_EVENT_GERMAN_URGENT:
+        bFriendly = m_Team == TEAM_GERMAN;
+        break;
+    default:
+        break;
+    }
+
+    if (!bFriendly) {
+        CuriousSound(iType, sound_origin, fDistSquared, fMaxDistSquared);
+    } else if (NoticeVoice(static_cast<Sentient *>(originator))) {
+        CuriousSound(iType, sound_origin, fDistSquared, fMaxDistSquared);
+    }
+}
+
+/*
+===============
+Actor::GrenadeNotification
+
+Handles grenade notification.
+===============
+*/
+void Actor::GrenadeNotification(Entity *originator)
+{
+    if (!m_pGrenade && CanSeeFOV(originator) && originator->IsSubclassOfProjectile()) {
+        Projectile *proj          = static_cast<Projectile *>(originator);
+        Entity     *projOwner     = NULL;
+        Sentient   *sentientOwner = NULL;
+
+        SetGrenade(originator);
+        PostEvent(EV_Actor_ShareGrenade, 0.5f);
+
+        if (proj->owner != ENTITYNUM_NONE) {
+            projOwner = G_GetEntity(proj->owner);
+        }
+
+        if (projOwner && projOwner->IsSubclassOfSentient()) {
+            sentientOwner = static_cast<Sentient *>(projOwner);
+        }
+
+        if (!sentientOwner || sentientOwner->m_Team != m_Team) {
+            Anim_Say(STRING_ANIM_SAY_GRENADE_SIGHTED_SCR, 0, true);
+        }
+    }
+
+    if (m_pGrenade == originator) {
+        float  fTimeLand;
+        float  fVelDivGrav;
+        vec2_t vLand;
+        vec2_t vMove;
+
+        fVelDivGrav = originator->velocity[2] / (sv_gravity->value * m_pGrenade->gravity);
+        fTimeLand   = fVelDivGrav
+                  + sqrt(
+                        Square(fVelDivGrav)
+                        + Square(originator->origin[2] - origin[2]) / (sv_gravity->value * m_pGrenade->gravity)
+                  );
+
+        VectorMA2D(originator->origin, fTimeLand, originator->velocity, vLand);
+        VectorSub2D(m_vGrenadePos, vLand, vMove);
+
+        if (VectorLength2DSquared(vMove) > Square(4)) {
+            VectorCopy2D(vLand, m_vGrenadePos);
+            m_vGrenadePos[2]  = origin[2];
+            m_bGrenadeBounced = true;
+        }
+    }
+}
+
+/*
+===============
+Actor::SetGrenade
+
+Set current grenade.
+===============
+*/
+void Actor::SetGrenade(Entity *pGrenade)
+{
+    m_pGrenade          = pGrenade;
+    m_bGrenadeBounced   = true;
+    m_iFirstGrenadeTime = level.inttime;
+    m_vGrenadePos       = pGrenade->origin;
+}
+
+/*
+===============
+Actor::UpdateBadPlaces
+
+Update bad places, with a new path
+===============
+*/
+void Actor::UpdateBadPlaces(void)
+{
+    m_iBadPlaceIndex = 0;
+    if (m_bIgnoreBadPlace) {
+        return;
+    }
+
+    if (PathExists()) {
+        m_Path.ReFindPath(origin, this);
+    }
+
+    m_iBadPlaceIndex = level.GetNearestBadPlace(origin, 64, 1 << m_Team);
+}
+
+/*
+===============
+Actor::NotifySquadmateKilled
+
+Handle squadmate killed notification.
+===============
+*/
+void Actor::NotifySquadmateKilled(Sentient *pSquadMate, Sentient *pAttacker)
+{
+    Vector vDelta;
+    float  fSquareDist;
+    bool   bCanSee;
+
+    if (!m_PotentialEnemies.CaresAboutPerfectInfo(pAttacker)) {
+        return;
+    }
+
+    vDelta      = pSquadMate->origin - origin;
+    fSquareDist = vDelta.lengthSquared();
+    if (fSquareDist > Square(m_fSight)) {
+        return;
+    }
+
+    bCanSee = false;
+    if (AreasConnected(pSquadMate)) {
+        bCanSee = G_SightTrace(
+            VirtualEyePosition(),
+            vec_zero,
+            vec_zero,
+            pSquadMate->EyePosition(),
+            this,
+            pSquadMate,
+            MASK_AI_CANSEE,
+            false,
+            "Actor::NotifySquadmateKilled"
+        );
+    }
+
+    if (!bCanSee) {
+        if (fSquareDist > Square(768)) {
+            return;
+        }
+
+        if (origin.z > pSquadMate->origin.z) {
+            if (!m_Path.DoesTheoreticPathExist(origin, pSquadMate->origin, this, 1536, NULL, 0)) {
+                return;
+            }
+        } else {
+            if (!m_Path.DoesTheoreticPathExist(pSquadMate->origin, origin, this, 1536, NULL, 0)) {
+                return;
+            }
+        }
+    }
+
+    m_PotentialEnemies.ConfirmEnemy(this, pAttacker);
+}
+
+/*
+===============
+Actor::RaiseAlertnessForEventType
+
+Raise alertness(enemy notice) for specifc event.
+===============
+*/
+void Actor::RaiseAlertnessForEventType(int iType)
+{
+    switch (iType) {
+    case AI_EVENT_WEAPON_FIRE:
+        RaiseAlertness(0.2f);
+        break;
+    case AI_EVENT_WEAPON_IMPACT:
+        RaiseAlertness(0.1f);
+        break;
+    case AI_EVENT_EXPLOSION:
+        RaiseAlertness(0.4f);
+        break;
+    case AI_EVENT_AMERICAN_VOICE:
+    case AI_EVENT_AMERICAN_URGENT:
+        if (m_Team == TEAM_GERMAN) {
+            RaiseAlertness(0.25f);
+        }
+        break;
+    case AI_EVENT_GERMAN_VOICE:
+    case AI_EVENT_GERMAN_URGENT:
+        if (m_Team == TEAM_AMERICAN) {
+            RaiseAlertness(0.25);
+        }
+        break;
+    case AI_EVENT_MISC:
+        RaiseAlertness(0.02f);
+        break;
+    case AI_EVENT_MISC_LOUD:
+    case AI_EVENT_FOOTSTEP:
+        RaiseAlertness(0.05f);
+        break;
+    case AI_EVENT_GRENADE:
+        RaiseAlertness(0.04f);
+        break;
+    default:
+        char assertStr[16317] = {0};
+        strcpy(assertStr, "\"Actor::RaiseAlertnessForEventType: unknown event type\\n\"\n\tMessage: ");
+        Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
+        assert(false && assertStr);
+        return;
+        break;
+    }
+}
+
+/*
+===============
+Actor::RaiseAlertness
+
+Lower enemy notice time by fAmount.
+===============
+*/
+void Actor::RaiseAlertness(float fAmount)
+{
+    if (fAmount > m_fNoticeTimeScale * (2.0 / 3.0)) {
+        fAmount = m_fNoticeTimeScale * (2.0 / 3.0);
+    }
+
+    m_fNoticeTimeScale -= fAmount;
 }
 
 /*
@@ -7645,31 +9556,22 @@ Returns true if shooter is an enemy.
 Otherwise the shooter is a team mate and target is registered an enemy if he's visible/reachable.
 ===============
 */
-bool Actor::NoticeShot
-	(
-	Sentient *pShooter,
-	Sentient *pTarget,
-	float fDist
-	)
+bool Actor::NoticeShot(Sentient *pShooter, Sentient *pTarget, float fDist)
 {
-	gi.Printf("Notice shot");
-	if (pShooter->m_Team != m_Team)
-	{
-		return true;
-	}
+    if (pShooter->m_Team != m_Team) {
+        return true;
+    }
 
-	m_bEnemyIsDisguised = false;
+    m_bEnemyIsDisguised = false;
 
-	if (pTarget)
-	{
-		if (DoesTheoreticPathExist(pShooter->origin, fDist * 1.5) || CanSee(pTarget, 0, 0.828 * world->farplane_distance, false))
-		{
-			m_PotentialEnemies.ConfirmEnemy(this, pTarget);
-		}
-	}
-
-	return false;
+    if (pTarget) {
+        if (DoesTheoreticPathExist(pShooter->origin, fDist * 1.5f)
+            || CanSee(pTarget, 0, world->farplane_distance * 0.828, false)) {
+            m_PotentialEnemies.ConfirmEnemy(this, pTarget);
+        }
+    }
 
+    return false;
 }
 
 /*
@@ -7680,15 +9582,13 @@ Returns true if actor should notice this footstep sound (pedestrian is not visib
 Otherwise returns false.
 ===============
 */
-bool Actor::NoticeFootstep
-	(
-	Sentient *pPedestrian
-	)
+bool Actor::NoticeFootstep(Sentient *pPedestrian)
 {
-	if (m_Team == pPedestrian->m_Team || pPedestrian->m_bIsDisguised)
-		return false;
+    if (m_Team == pPedestrian->m_Team || pPedestrian->m_bIsDisguised) {
+        return false;
+    }
 
-	return !CanSeeFOV(pPedestrian);
+    return !CanSeeFOV(pPedestrian);
 }
 
 /*
@@ -7699,603 +9599,2549 @@ Returns true if actor should notice this voice sound (vocalist is not visible fo
 Otherwise returns false.
 ===============
 */
-bool Actor::NoticeVoice
-	(
-	Sentient *pVocallist
-	)
+bool Actor::NoticeVoice(Sentient *pVocallist)
 {
-	if (IsSquadMate(pVocallist))
-		return false;
-
-	return !CanSeeFOV(pVocallist);
+    return !IsSquadMate(pVocallist) && !CanSeeFOV(pVocallist);
 }
 
 /*
 ===============
-Actor::ClearLookEntity
+Actor::ValidGrenadePath
 
-Clear look entity.
+Returns true if grenade trajectory is valid.
+i.e grenade can get from vFrom to vTo with vVel with any obstacles.
 ===============
 */
-void Actor::ClearLookEntity
-	(
-	void
-	)
+bool Actor::ValidGrenadePath(const Vector& vFrom, const Vector& vTo, Vector& vVel)
 {
-	if (m_pLookEntity)
-	{
-		if (m_pLookEntity->IsSubclassOfTempWaypoint())
-		{
-			delete m_pLookEntity;
-		}
-		m_pLookEntity = NULL;
-	}
+    vec3_t  mins, maxs;
+    Vector  vPoint1, vPoint2, vPoint3;
+    float   fTime, fTimeLand;
+    trace_t trace;
+    float   fGravity;
+
+    VectorSet(mins, -4, -4, -4);
+    VectorSet(maxs, 4, 4, 4);
+
+    if (vVel.lengthSquared() > Square(768)) {
+        return false;
+    }
+
+    fGravity = sv_gravity->value * 0.8f;
+
+    fTime = vVel.z / fGravity * 0.5f;
+
+    vPoint1.x = vVel.x * fTime + vFrom.x;
+    vPoint1.y = vVel.y * fTime + vFrom.y;
+    vPoint1.z = vVel.z * fTime * 0.75 + vFrom.z;
+    maxs[2]   = fGravity / 8.0f * fTime * fTime + 4.0f;
+
+    if (ai_debug_grenades->integer) {
+        G_DebugLine(vFrom, vPoint1, 1.0, 0.5, 0.5, 1.0);
+    }
+
+    if (!G_SightTrace(vFrom, mins, maxs, vPoint1, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 1")) {
+        return false;
+    }
+
+    fTime *= 2;
+    vPoint2.x = vVel.x * fTime + vFrom.x;
+    vPoint2.y = vVel.y * fTime + vFrom.y;
+    vPoint2.z = vVel.z * fTime * 0.5 + vFrom.z;
+
+    if (ai_debug_grenades->integer) {
+        G_DebugLine(vPoint1, vPoint2, 1.0, 0.5, 0.5, 1.0);
+    }
+
+    if (!G_SightTrace(vPoint1, mins, maxs, vPoint2, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 2")) {
+        return false;
+    }
+
+    if (fabs(vVel.x) > fabs(vVel.y)) {
+        fTimeLand = (vTo.x - vFrom.x) / vVel.x;
+    } else {
+        fTimeLand = (vTo.y - vFrom.y) / vVel.y;
+    }
+
+    maxs[2] = fGravity / 32.f * (fTimeLand - fTime) * (fTimeLand - fTime) + 4;
+    fTime   = (fTime + fTimeLand) * 0.5f;
+
+    vPoint3.x = vVel.x * fTime + vFrom.x;
+    vPoint3.y = vVel.y * fTime + vFrom.y;
+    vPoint3.z = vFrom.z + (vVel.z - fGravity * 0.5 * fTime) * fTime;
+
+    if (ai_debug_grenades->integer) {
+        G_DebugLine(vPoint2, vPoint3, 1.0, 0.5, 0.5, 1.0);
+    }
+    if (!G_SightTrace(vPoint2, mins, maxs, vPoint3, this, NULL, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 3")) {
+        return false;
+    }
+    if (ai_debug_grenades->integer) {
+        G_DebugLine(vPoint3, vTo, 1.0, 0.5, 0.5, 1.0);
+    }
+
+    trace = G_Trace(vPoint3, mins, maxs, vTo, this, MASK_GRENADEPATH, false, "Actor::ValidGrenadePath 4");
+    if (!trace.allsolid) {
+        if (!trace.ent) {
+            return true;
+        }
+
+        if (trace.ent->entity->IsSubclassOfSentient() && static_cast<Sentient *>(trace.ent->entity)->m_Team != m_Team) {
+            return true;
+        }
+    }
+
+    if (trace.entityNum != ENTITYNUM_WORLD || trace.plane.normal[2] < 0.999f) {
+        return false;
+    }
+
+    return true;
 }
 
 /*
 ===============
-Actor::LookAt
+Actor::CalcThrowVelocity
 
-Change current look entity.
+Calculates required grenade throw velocity to get grenade from vFrom to vTo.
 ===============
 */
-void Actor::LookAt
-	(
-	const Vector& vec
-	)
+Vector Actor::CalcThrowVelocity(const Vector& vFrom, const Vector& vTo)
 {
-	if (g_showlookat->integer == entnum || g_showlookat->integer == -1)
-	{
-		Com_Printf(
-			"Script lookat: %i %i %s looking at point %.0f %.0f %.0f\n",
-			entnum,
-			radnum,
-			targetname.c_str(),
-			vec.x,
-			vec.y,
-			vec.z);
-	}
+    Vector vDelta;
+    float  fHorzDistSquared, fDistance;
+    float  fVelHorz, fVelVert;
 
-	ClearLookEntity();
+    vDelta           = vTo - vFrom;
+    fHorzDistSquared = vDelta.lengthXYSquared();
+    fDistance        = sqrt(fHorzDistSquared + Square(vDelta.z));
 
-	TempWaypoint *twp = new TempWaypoint();
-	m_pLookEntity = twp;
+    // original irl equation: v10 = sqrt(fGravity * 0.5 * fHorzDistSquared / (fDistance * trigMult ))
+    // trigMult = (cos(th)/ tan(al) - sin(th)/tanSquared(al))
+    // al = inital velocity angle with ground plane.
+    // th = angle between vDelta and ground plane.
+    // mohaa devs decided to let trigMult be 1, for the sake of simplicity I guess.
+    fVelVert = sqrt(sv_gravity->value * 0.8f * 0.5f * fHorzDistSquared / fDistance);
 
-	m_pLookEntity->setOrigin(vec);
+    // no I dea what this means.
+    // maybe it's related to their angle choice.
+    // calculates the 1/distanceSquared necessary for fOOTime calculation.
+    fVelHorz = sqrt((fDistance + vDelta.z) / (fDistance - vDelta.z) / fHorzDistSquared) * fVelVert;
 
+    // 1/(speed * sqrt(1/distanceSquared))
+    // 1/(speed * 1/distance)
+    // 1/(1/time)
+    // time
+    return Vector(vDelta.x * fVelHorz, vDelta.y * fVelHorz, fVelVert);
 }
 
 /*
 ===============
-Actor::LookAt
+Actor::CanThrowGrenade
 
-Change current look entity.
+Returns required velocity to throw grenade from vFrom to vTo.
+Or vec_zero if it's not possible.
 ===============
 */
-void Actor::LookAt
-	(
-	Listener *l
-	)
+Vector Actor::CanThrowGrenade(const Vector& vFrom, const Vector& vTo)
 {
-	ClearLookEntity();
-	if ( l )
-	{
-		if (!l->inheritsFrom(&SimpleEntity::ClassInfo))
-		{
-			ScriptError("Bad look entity with classname '%s' specified for '%s' at (%f %f %f)\n", 
-				l->getClassname(),
-				targetname.c_str(),
-				origin.x,
-				origin.y,
-				origin.z
-				);
-		}
-		if (l != this)
-		{
-			l = (SimpleEntity*)l;
-			if (g_showlookat->integer == entnum || g_showlookat->integer == -1)
-			{
-				Com_Printf(
-					"Script lookat: %i %i %s looking at point %.0f %.0f %.0f\n",
-					entnum,
-					radnum,
-					targetname.c_str(),
-					((SimpleEntity*)l)->origin.x,
-					((SimpleEntity*)l)->origin.y,
-					((SimpleEntity*)l)->origin.z);
-			}
-			m_pLookEntity = (SimpleEntity*)l;
-		}
-	}
+    Vector vVel;
+
+    vVel = CalcThrowVelocity(vFrom, vTo);
+
+    if (vVel != vec_zero && ValidGrenadePath(vFrom, vTo, vVel)) {
+        return vVel;
+    } else {
+        return vec_zero;
+    }
 }
 
 /*
 ===============
-Actor::ForwardLook
-
+Actor::CalcRollVelocity
 
+Calculates required grenade roll velocity to get grenade from vFrom to vTo.
+Roll here means a low toss.
 ===============
 */
-void Actor::ForwardLook
-	(
-	void
-	)
+Vector Actor::CalcRollVelocity(const Vector& vFrom, const Vector& vTo)
 {
-	//fixme: this is an inline function.
-	m_bHasDesiredLookAngles = false;
+    Vector vDelta;
+    float  fVelVert;
+    float  fOOTime;
+
+    // you must throw from above.
+    // start point must be above (higher) than end point.
+    if (vTo.z >= vFrom.z) {
+        return vec_zero;
+    }
+
+    vDelta = vTo - vFrom;
+    // Required down velocity to hit the ground twice as fast as freefall time.
+    fVelVert = sqrt(-vDelta.z * sv_gravity->value * 0.8f);
+
+    // accel = speed / time, hence : time = speed / accel, 0.21961521 is an arbitary scalar.
+    // since the scalar is way less than 1, it will take more time to hit the ground than to arrive to target dest.
+    // this is kinda like a low toss rather than a roll. if I understand correctly.
+    fOOTime = sv_gravity->value * 0.8f * 0.21961521f / fVelVert;
+
+    // speed = distance / time
+    return Vector(vDelta.x * fOOTime, vDelta.y * fOOTime, fVelVert);
 }
 
 /*
 ===============
-Actor::LookAtLookEntity
+Actor::CanRollGrenade
 
-Change current look entity.
+Returns required velocity to roll grenade from vFrom to vTo.
+Or vec_zero if it's not possible.
+Roll here means a low toss.
 ===============
 */
-void Actor::LookAtLookEntity
-	(
-	void
-	)
+Vector Actor::CanRollGrenade(const Vector& vFrom, const Vector& vTo)
 {
-	Vector dir;
-	if (m_pLookEntity->IsSubclassOfSentient())
-	{
-		dir = ((Sentient *)m_pLookEntity.Pointer())->EyePosition() - EyePosition();
-	}
-	else
-	{
-		dir = m_pLookEntity->centroid - EyePosition();
-	}
+    Vector vVel;
 
-	SetDesiredLookDir(dir);
+    vVel = CalcRollVelocity(vFrom, vTo);
+
+    if (vVel != vec_zero && ValidGrenadePath(vFrom, vTo, vVel)) {
+        return vVel;
+    } else {
+        return vec_zero;
+    }
 }
 
 /*
 ===============
-Actor::IdleLook
+Actor::CanTossGrenadeThroughHint
 
-Idle look behaviour.
+Returns true if actor can toss grenade through specified hint.
+pvVel and peMode are modified.
 ===============
 */
-void Actor::IdleLook
-	(
-	void
-	)
+bool Actor::CanTossGrenadeThroughHint(
+    GrenadeHint *pHint, const Vector& vFrom, const Vector& vTo, bool bDesperate, Vector *pvVel, eGrenadeTossMode *peMode
+)
 {
-	if (m_pLookEntity)
-	{
-		LookAtLookEntity();
-	}
-	else
-	{
-		m_bHasDesiredLookAngles = false;
-	}
+    Vector vDelta;
+    float  fHeight;
+    float  fDistSquared, fDist;
+    float  fRangeSquared, fRange;
+    float  fVelHorz, fVelVert;
+    float  fTemp;
+    float  fAngle;
+    bool   bSuccess;
+    float  fGravity;
+
+    fGravity = sv_gravity->value * 0.8f;
+
+    if (bDesperate) {
+        vDelta = pHint->origin - vFrom;
+
+        fDistSquared = vDelta.lengthXYSquared();
+        if (!fDistSquared) {
+            return false;
+        }
+
+        fDist         = sqrt(fDistSquared);
+        fRangeSquared = vDelta.z * vDelta.z + fDistSquared;
+        fRange        = sqrt(fRangeSquared);
+        fHeight       = fGravity * fDistSquared / Square(768) + vDelta.z;
+
+        if (fabs(fHeight) > fabs(fRange)) {
+            return false;
+        }
+
+        fAngle   = (asin(fHeight / fRange) + atan(vDelta.z / fDist)) * 0.5f;
+        fVelVert = sin(fAngle) * 768.f;
+        fVelHorz = 768.f / fDist * cos(fAngle);
+
+        pvVel->x = fVelHorz * vDelta.x;
+        pvVel->y = fVelHorz * vDelta.y;
+        pvVel->z = fVelVert;
+
+        *peMode  = AI_GREN_TOSS_HINT;
+        bSuccess = ValidGrenadePath(vFrom, pHint->origin, *pvVel);
+    } else {
+        vDelta       = pHint->origin - vFrom;
+        fDistSquared = vDelta.lengthXYSquared();
+        fDist        = sqrt(fDistSquared);
+
+        vDelta        = vTo - vFrom;
+        fRangeSquared = vDelta.x * vDelta.x + vDelta.y * vDelta.y;
+        fRange        = sqrt(fRangeSquared);
+        fHeight       = vDelta.z * fRange - vDelta.z * fDist;
+
+        if (!fHeight) {
+            return false;
+        }
+
+        fHeight  = 1.f / fHeight;
+        fVelHorz = (fRange - fDist) * fHeight;
+        if (fVelHorz <= 0) {
+            return false;
+        }
+
+        fTemp    = sqrt(fGravity * 0.5f * fDist * fRange * fVelHorz);
+        fVelVert = (fRangeSquared * vDelta.z - fDistSquared * vDelta.z) * fGravity * 0.5f / fTemp * fHeight;
+        fVelHorz = fTemp / fDist;
+
+        pvVel->x = (pHint->origin.x - vFrom.x) * fVelHorz;
+        pvVel->y = (pHint->origin.y - vFrom.y) * fVelHorz;
+        pvVel->z = fVelVert;
+
+        *peMode = AI_GREN_TOSS_HINT;
+
+        bSuccess = ValidGrenadePath(vFrom, pHint->origin, *pvVel);
+    }
+
+    return bSuccess;
 }
 
 /*
 ===============
-Actor::IdleLook
+Actor::GrenadeThrowPoint
 
-Idle look behaviour.
+Returns real grenade throw point.
 ===============
 */
-void Actor::IdleLook
-	(
-	vec3_t dir
-	)
+Vector Actor::GrenadeThrowPoint(const Vector& vFrom, const Vector& vDelta, const_str csAnim)
 {
-	if (m_pLookEntity)
-	{
-		LookAtLookEntity();
-	}
-	else
-	{
-		SetDesiredLookDir(dir);
-	}
+    vec2_t axis;
+
+    VectorCopy2D(vDelta, axis);
+    VectorNormalize2D(axis);
+
+    switch (csAnim) {
+    case STRING_ANIM_GRENADEKICK_SCR:
+        return Vector(vFrom.x, vFrom.y, vFrom.z + 8);
+    case STRING_ANIM_GRENADETHROW_SCR:
+    case STRING_ANIM_GRENADETOSS_SCR:
+        return Vector(
+            axis[0] * -34.0 + vFrom.x - axis[1] * -8.0, axis[1] * -34.0 + vFrom.y + axis[0] * -8.0, vFrom.z + 52
+        );
+    case STRING_ANIM_GRENADERETURN_SCR:
+        return Vector(
+            axis[0] * 25.0 + vFrom.x - axis[1] * -2.0, axis[1] * 25.0 + vFrom.y + axis[0] * -2.0, vFrom.z + 89
+        );
+        break;
+    default:
+        return vFrom + Vector(0, 0, 80);
+    }
 }
 
 /*
 ===============
-Actor::SetDesiredLookDir
+Actor::CalcKickVelocity
 
-Change desired look direction.
+Calculates required grenade kick velocity.
 ===============
 */
-void Actor::SetDesiredLookDir
-	(
-	vec3_t dir
-	)
+Vector Actor::CalcKickVelocity(Vector& vDelta, float fDist) const
 {
-	m_bHasDesiredLookAngles = true;
-	vectoangles( dir, m_DesiredLookAngles );
-	m_DesiredLookAngles[ 1 ] = m_DesiredLookAngles[ 1 ] - angles[ 1 ];
-	m_DesiredLookAngles[ 1 ] = AngleNormalize180( m_DesiredLookAngles[ 1 ] );
-	m_DesiredLookAngles[ 0 ] = AngleNormalize180( m_DesiredLookAngles[ 0 ] );
+    float fScale = sqrt(sv_gravity->value * 0.8f * 0.5f / (fDist * 0.57735032 - vDelta.z));
+
+    return Vector(vDelta.x * fScale, vDelta.y * fScale, fDist * 0.57735032 * fScale);
 }
 
 /*
 ===============
-Actor::SetDesiredLookAnglesRelative
+Actor::CanKickGrenade
 
-Change desired look angles relatively.
+Returns true if actor can kick grenade from vFrom to vTo.
+Or false if it's not possible.
+pvVel is changed.
 ===============
 */
-void Actor::SetDesiredLookAnglesRelative
-	(
-	vec3_t ang
-	)
+bool Actor::CanKickGrenade(Vector& vFrom, Vector& vTo, Vector& vFace, Vector *pvVel)
 {
-	m_bHasDesiredLookAngles = true;
-	m_DesiredLookAngles[ 0 ] = AngleNormalize180( ang[ 0 ] );
-	m_DesiredLookAngles[ 1 ] = AngleNormalize180( ang[ 1 ] );
-	m_DesiredLookAngles[ 2 ] = AngleNormalize180( ang[ 2 ] );
+    Vector vDelta, vStart, vEnd;
+    float  fDist, fScale;
+
+    if (sv_gravity->value <= 0) {
+        return false;
+    }
+
+    vStart = GrenadeThrowPoint(vFrom, vFace, STRING_ANIM_GRENADEKICK_SCR);
+    vDelta = vTo - vStart;
+    if (vDelta.z >= 0) {
+        return false;
+    }
+
+    if (DotProduct(vDelta, vFace) < 0) {
+        return false;
+    }
+
+    fDist = VectorLength2D(vDelta);
+    if (fDist < 256 || fDist >= (255401.28f / sv_gravity->value * 0.8f + 192.f)) {
+        return false;
+    }
+
+    if (fDist < 512) {
+        fScale = 192.0f / fDist + 0.25f;
+    } else {
+        fScale = 1.0f - 192.0f / fDist;
+    }
+
+    vDelta.x *= fScale;
+    vDelta.y *= fScale;
+    vEnd = vStart + vDelta;
+
+    *pvVel = CalcKickVelocity(vDelta, fDist);
+
+    if (*pvVel == vec_zero || !ValidGrenadePath(vStart, vEnd, *pvVel)) {
+        return false;
+    }
+
+    return true;
 }
 
 /*
 ===============
-Actor::EventLookAt
+Actor::GrenadeWillHurtTeamAt
 
-Look at event.
+Returns true if grenade will hurt team at vTo.
 ===============
 */
-void Actor::EventLookAt
-	(
-	Event *ev
-	)
+bool Actor::GrenadeWillHurtTeamAt(const Vector& vTo)
 {
-	if (ev->IsVectorAt(1))
-	{
-		LookAt(ev->GetVector(1));
-	}
-	else
-	{
-		LookAt(ev->GetListener(1));
-	}
+    Sentient *pSquadMate;
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        if ((pSquadMate->origin - vTo).length() < 65536) {
+            return true;
+        }
+    }
 
-	m_iLookFlags = 0;//LOOK_NORMAL
+    return false;
 }
 
 /*
 ===============
-Actor::EventEyesLookAt
+Actor::CanGetGrenadeFromAToB
 
-Eyes look at event.
+Returns true if actor can get a grenade from vFrom to vTo.
+pvVel is the kick/roll/throw velocity.
+peMode is the possible toss mode.
 ===============
 */
-void Actor::EventEyesLookAt
-	(
-	Event *ev
-	)
+bool Actor::CanGetGrenadeFromAToB(
+    const Vector& vFrom, const Vector& vTo, bool bDesperate, Vector *pvVel, eGrenadeTossMode *peMode
+)
 {
-	EventLookAt(ev);
+    static constexpr unsigned int MAX_GRENADE_HINTS = 4;
 
-	m_iLookFlags = 1;//LOOK_EYE
+    float        fRangeSquared;
+    GrenadeHint *apHint[MAX_GRENADE_HINTS];
+    int          nHints;
+    int          i;
+    Vector       vDelta;
+    Vector       vAxisX, vAxisY;
+    Vector       vStart;
+    Vector       vHint;
+    float        fDot;
+
+    if (sv_gravity->value <= 0) {
+        return false;
+    }
+
+    vDelta        = vTo - vFrom;
+    fRangeSquared = vDelta.lengthSquared();
+
+    if (fRangeSquared < Square(256)) {
+        return false;
+    }
+
+    if (bDesperate) {
+        vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADERETURN_SCR);
+    }
+
+    if (fRangeSquared < Square(1024)) {
+        if (!bDesperate) {
+            vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETOSS_SCR);
+        }
+
+        *pvVel = CanRollGrenade(vStart, vTo);
+
+        if (*pvVel != vec_zero) {
+            *peMode = AI_GREN_TOSS_ROLL;
+            return true;
+        }
+
+        if (!bDesperate) {
+            vStart = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETHROW_SCR);
+        }
+
+        *pvVel = CanThrowGrenade(vStart, vTo);
+
+        if (*pvVel != vec_zero) {
+            *peMode = AI_GREN_TOSS_THROW;
+            return true;
+        }
+    } else if (!bDesperate) {
+        return false;
+    }
+
+    nHints = GrenadeHint::GetClosestSet(apHint, MAX_GRENADE_HINTS, vStart, Square(1024));
+
+    for (i = 0; i < nHints; i++) {
+        if (!bDesperate) {
+            fDot = DotProduct2D(vHint, vDelta);
+            if (fDot < 0) {
+                continue;
+            }
+
+            if ((vHint.lengthXYSquared() * 0.9f * vDelta.lengthXYSquared()) >= (fDot * fDot)) {
+                continue;
+            }
+        }
+
+        vStart =
+            GrenadeThrowPoint(vFrom, vHint, bDesperate ? STRING_ANIM_GRENADERETURN_SCR : STRING_ANIM_GRENADETOSS_SCR);
+        if (CanTossGrenadeThroughHint(apHint[i], vStart, vTo, bDesperate, pvVel, peMode)) {
+            return true;
+        }
+    }
+
+    *peMode = AI_GREN_TOSS_NONE;
+    return false;
 }
 
 /*
 ===============
-Actor::NoPoint
+Actor::DecideToThrowGrenade
 
-Don't point at anything.
+Returns true if actor will throw grenade to vTo.
+pvVel is the kick/roll/throw velocity.
+peMode is the toss mode.
 ===============
 */
-void Actor::NoPoint
-	(
-	void
-	)
+bool Actor::DecideToThrowGrenade(const Vector& vTo, Vector *pvVel, eGrenadeTossMode *peMode, bool bDesperate)
 {
-	VectorClear(m_vLUpperArmDesiredAngles);
+    if (!AmmoCount("grenade")) {
+        return false;
+    }
+
+    if (GrenadeWillHurtTeamAt(vTo)) {
+        return false;
+    }
+
+    return CanGetGrenadeFromAToB(origin, vTo, bDesperate, pvVel, peMode);
 }
 
 /*
 ===============
-Actor::IdlePoint
+Actor::GenericGrenadeTossThink
 
-Idle point behaviour.
+Called when actor in grenade state.
+i.e. actor noticed a grenade and must think fast.
 ===============
 */
-void Actor::IdlePoint
-	(
-	void
-	)
+void Actor::GenericGrenadeTossThink(void)
 {
-	if (m_pPointEntity)
-	{
-		Vector delta = m_pPointEntity->centroid - origin;
-		Vector v2;
-		VectorNormalize(delta);
-		v2 = delta.toAngles();
+    Vector           vGrenadeVel = vec_zero;
+    eGrenadeTossMode eGrenadeMode;
 
-		float yaw = AngleNormalize180(v2[1] - angles[1] + 30);
-		if (yaw > 100)
-			yaw = 100;
-		if (yaw < -80)
-			yaw = -80;
-		m_vLUpperArmDesiredAngles[0] = v2[0];
-		m_vLUpperArmDesiredAngles[1] = yaw;
-		m_vLUpperArmDesiredAngles[2] = v2[2];
-	}
-	else
-	{
-		NoPoint();
-	}
+    if (m_Enemy && level.inttime >= m_iStateTime + 200) {
+        if (CanGetGrenadeFromAToB(origin, m_Enemy->origin + m_Enemy->velocity, false, &vGrenadeVel, &eGrenadeMode)) {
+            m_vGrenadeVel  = vGrenadeVel;
+            m_eGrenadeMode = eGrenadeMode;
+        }
+        m_iStateTime = level.inttime;
+    }
+
+    SetDesiredYawDir(m_vGrenadeVel);
+    ContinueAnimation();
 }
 
 /*
 ===============
-Actor::ClearPointEntity
+Actor::Grenade_EventFire
 
-Clear point entity.
+Throw grenade animation
 ===============
 */
-void Actor::ClearPointEntity
-	(
-	void
-	)
+void Actor::Grenade_EventFire(Event *ev)
 {
-	if (m_pPointEntity)
-	{
-		if (m_pPointEntity->IsSubclassOfTempWaypoint())
-		{
-			delete m_pPointEntity;
-		}
-		m_pPointEntity = NULL;
-	}
+    Vector    dir;
+    Vector    pos;
+    float     speed;
+    str       strGrenade;
+    const_str csAnim;
+
+    gi.Tag_NumForName(edict->tiki, "tag_weapon_right");
+
+    if (m_eGrenadeMode == AI_GREN_TOSS_ROLL) {
+        csAnim = STRING_ANIM_GRENADETOSS_SCR;
+    } else {
+        csAnim = STRING_ANIM_GRENADETHROW_SCR;
+    }
+
+    pos   = GrenadeThrowPoint(origin, orientation[0], csAnim);
+    dir   = m_vGrenadeVel;
+    speed = dir.normalize();
+
+    if (g_protocol >= PROTOCOL_MOHTA_MIN) {
+        // Added in 2.30
+        switch (m_iNationality) {
+        case ACTOR_NATIONALITY_ITALIAN:
+            strGrenade = "models/projectiles/Bomba_ai.tik";
+            break;
+        case ACTOR_NATIONALITY_RUSSIAN:
+            strGrenade = "models/projectiles/Russian_F1_grenade_ai.tik";
+            break;
+        case ACTOR_NATIONALITY_BRITISH:
+            strGrenade = "models/projectiles/Mills_grenade_ai.tik";
+            break;
+        case ACTOR_NATIONALITY_AMERICAN:
+            strGrenade = "models/projectiles/M2FGrenade_ai.tik";
+            break;
+        case ACTOR_NATIONALITY_GERMAN:
+            strGrenade = "models/projectiles/steilhandgranate_ai.tik";
+            break;
+        default:
+            // fallback to team
+            if (m_Team != TEAM_GERMAN) {
+                strGrenade = "models/projectiles/M2FGrenade_ai.tik";
+            } else {
+                strGrenade = "models/projectiles/steilhandgranate_ai.tik";
+            }
+            break;
+        }
+    } else {
+        if (m_Team != TEAM_GERMAN) {
+            strGrenade = "models/projectiles/M2FGrenade.tik";
+        } else {
+            strGrenade = "models/projectiles/steilhandgranate.tik";
+        }
+    }
+
+    ProjectileAttack(pos, dir, this, strGrenade, 0, speed);
+    UseAmmo("grenade", 1);
 }
 
 /*
 ===============
-Actor::PointAt
-
-Change point entity.
+Actor::EventSetTurret
 ===============
 */
-void Actor::PointAt
-	(
-	const Vector& vec
-	)
+void Actor::EventSetTurret(Event *ev)
 {
-	ClearPointEntity();
-
-	TempWaypoint *twp = new TempWaypoint();
-	m_pPointEntity = twp;
-	m_pPointEntity->setOrigin(vec);
+    Listener *l = ev->GetListener(1);
+    if (l && l->isSubclassOf(TurretGun)) {
+        m_pTurret = (TurretGun *)l;
+    }
 }
 
 /*
 ===============
-Actor::PointAt
-
-Change point entity.
+Actor::EventGetTurret
 ===============
 */
-void Actor::PointAt
-	(
-	Listener* l
-	)
+void Actor::EventGetTurret(Event *ev)
 {
-	ClearPointEntity();
-	if (l)
-	{
-		if (l->inheritsFrom(&SimpleEntity::ClassInfo))
-		{
-			ScriptError("Bad point entity with classname '%s' specified for '%s' at (%f %f %f)\n",
-				l->getClassname(),
-				targetname.c_str(),
-				origin.x,
-				origin.y,
-				origin.z);
-		}
-		if (l != this)
-		{
-			m_pPointEntity = (SimpleEntity *)l;
-		}
-	}
+    ev->AddListener(m_pTurret);
 }
 
 /*
 ===============
-Actor::EventPointAt
-
-Point at event.
+Actor::EventGetAmmoGrenade
 ===============
 */
-void Actor::EventPointAt
-	(
-	Event *ev
-	)
+void Actor::EventGetAmmoGrenade(Event *ev)
 {
-	if (ev->IsVectorAt(1))
-	{
-		
-		PointAt(ev->GetVector(1));
-	}
-	else
-	{
-		PointAt(ev->GetListener(1));
-	}
+    ev->AddInteger(AmmoCount("grenade"));
 }
 
 /*
 ===============
-Actor::ClearTurnEntity
-
-Clear turn entity.
+Actor::EventSetAmmoGrenade
 ===============
 */
-void Actor::ClearTurnEntity
-	(
-	void
-	)
+void Actor::EventSetAmmoGrenade(Event *ev)
 {
-	if (m_pTurnEntity)
-	{
-		if (m_pTurnEntity->IsSubclassOfTempWaypoint())
-		{
-			delete m_pTurnEntity;
-		}
-		m_pTurnEntity = NULL;
-	}
+    GiveAmmo("grenade", ev->GetInteger(1));
 }
 
 /*
 ===============
-Actor::TurnTo
-
-Change turn entity.
+Actor::EventEnableEnemy
 ===============
 */
-void Actor::TurnTo
-	(
-	const Vector& vec
-	)
+void Actor::EventEnableEnemy(Event *ev)
 {
-	ClearTurnEntity();
-
-	TempWaypoint *twp = new TempWaypoint();
-	m_pTurnEntity = twp;
-	m_pTurnEntity->setOrigin(vec);
+    m_bDesiredEnableEnemy = ev->GetBoolean(1);
 }
 
 /*
 ===============
-Actor::TurnTo
-
-Change turn entity.
+Actor::EventEnablePain
 ===============
 */
-void Actor::TurnTo
-	(
-	Listener *l
-	)
+void Actor::EventEnablePain(Event *ev)
 {
-	ClearTurnEntity();
-	if (l)
-	{
-		if (!l->inheritsFrom(&SimpleEntity::ClassInfo))
-		{
-			ScriptError("Bad turn entity with classname '%s' specified for '%s' at (%f %f %f)\n",
-				l->getClassname(),
-				targetname.c_str(),
-				origin.x,
-				origin.y,
-				origin.z);
-		}
-
-		m_pTurnEntity = (SimpleEntity *)l;
-	}
-	else
-	{
-		m_pTurnEntity = this;
-	}
+    m_bEnablePain = ev->GetBoolean(1);
+    if (!m_bEnablePain) {
+        SetThinkState(THINKSTATE_VOID, THINKLEVEL_PAIN);
+    }
 }
 
 /*
 ===============
-Actor::IdleTurn
-
-Idle turn behaviour.
+Actor::EventActivate
 ===============
 */
-void Actor::IdleTurn
-	(
-	void
-	)
+void Actor::EventActivate(Event *ev)
 {
-	if (m_pTurnEntity)
-	{
-		for (int i = 0; i <= 1; i++)
-		{
-			if (m_pTurnEntity == this)
-			{
-				StopTurning();
-				m_pTurnEntity = NULL;
-				return;
-			}
-			vec2_t facedir;
-			VectorSub2D(m_pTurnEntity->centroid, origin, facedir);
-			if (facedir[0] || facedir[1])
-			{
-				SetDesiredYawDir(facedir);
-			}
-
-			float error = AngleNormalize180(m_DesiredYaw - angles[1]);
-
-			if (error >= m_fTurnDoneError + 0.001 || -(m_fTurnDoneError + 0.001) >= error)
-			{
-				return;
-			}
-
-			SafePtr<SimpleEntity> prevTurnEntity = m_pTurnEntity;
-
-			Director.Unpause();
-			Unregister(STRING_TURNDONE);
-			Director.Pause();
-
-
-			if (m_pTurnEntity == prevTurnEntity)
-			{
-				break;
-			}
-		}
-	}
+    m_bPatrolWaitTrigger = false;
+    Unregister(STRING_TRIGGER);
 }
 
 /*
 ===============
-Actor::EventTurnTo
-
-Turn to event.
+Actor::EventInterruptPoint
 ===============
 */
-void Actor::EventTurnTo
-	(
-	Event *ev
-	)
+void Actor::EventInterruptPoint(Event *ev)
 {
-	if (ev->IsVectorAt(1))
-	{
-		TurnTo(ev->GetVector(1));
-	}
-	else
-	{
-		TurnTo(ev->GetListener(1));
-	}
+    GlobalFuncs_t *interrupt = &GlobalFuncs[m_Think[m_ThinkLevel]];
+
+    if (interrupt->PostShoot) {
+        (this->*interrupt->PostShoot)();
+    }
 }
 
 /*
 ===============
-Actor::EventSetTurnDoneError
-
-Set the error amount that turndone will occur for the turnto command.
+Actor::EventGetVisibilityThreshold
 ===============
 */
-void Actor::EventSetTurnDoneError
-	(
-	Event *ev
-	)
+void Actor::EventGetVisibilityThreshold(Event *ev)
 {
-	m_fTurnDoneError = ev->GetFloat(1);
-	if (m_fTurnDoneError < 0)
-	{
-		m_fTurnDoneError = 0;
-		ScriptError("turndoneerror was set to a negative value - capped to 0");
-	}
+    ev->AddFloat(m_fVisibilityThreshold);
 }
 
 /*
 ===============
-Actor::EventGetTurnDoneError
-
-Get the error amount that turndone will occur for the turnto command.
+Actor::EventSetVisibilityThreshold
 ===============
 */
-void Actor::EventGetTurnDoneError
-	(
-	Event *ev
-	)
+void Actor::EventSetVisibilityThreshold(Event *ev)
 {
-	ev->AddFloat(m_fTurnDoneError);
+    float threshold;
+
+    threshold = ev->GetFloat(1);
+
+    if (threshold < 0 || threshold > 1) {
+        ScriptError("DefaultNonVisLevel must be in range 0-1");
+    }
+
+    m_bHasVisibilityThreshold = true;
+    m_fVisibilityThreshold    = threshold;
+}
+
+/*
+===============
+Actor::EventSetDefaultVisibilityThreshold
+===============
+*/
+void Actor::EventSetDefaultVisibilityThreshold(Event *ev)
+{
+    float threshold;
+
+    threshold = ev->GetFloat(1);
+
+    if (threshold < 0 || threshold > 1) {
+        ScriptError("DefaultNonVisLevel must be in range 0-1");
+    }
+
+    if (!m_bHasVisibilityThreshold) {
+        m_fVisibilityThreshold = threshold;
+    }
+}
+
+/*
+===============
+Actor::EventGetSuppressChance
+===============
+*/
+void Actor::EventGetSuppressChance(Event *ev)
+{
+    ev->AddInteger(m_iSuppressChance);
+}
+
+/*
+===============
+Actor::EventSetSuppressChance
+===============
+*/
+void Actor::EventSetSuppressChance(Event *ev)
+{
+    m_iSuppressChance = ev->GetInteger(1);
+    if (m_iSuppressChance != ev->GetFloat(1)) {
+        Com_Printf(
+            "WARNING: suppresschance should be an integer in the range 0 - 100, was set to %g for entnum %i (%s)\n",
+            (double)ev->GetFloat(1),
+            entnum,
+            TargetName().c_str()
+        );
+    }
+
+    if (m_iSuppressChance > 100) {
+        Com_Printf(
+            "WARNING: suppresschance should be in the range 0 - 100, was set to %i for entnum %i (%s)\n",
+            m_iSuppressChance,
+            entnum,
+            TargetName().c_str()
+        );
+
+        if (m_iSuppressChance >= 0) {
+            m_iSuppressChance = 100;
+        } else {
+            m_iSuppressChance = 0;
+        }
+    }
+}
+
+/*
+===============
+Actor::EventAnimScript
+===============
+*/
+void Actor::EventAnimScript(Event *ev)
+{
+    m_csAnimScript   = ev->GetConstString(1);
+    m_bAnimScriptSet = true;
+    m_AnimMode       = ANIM_MODE_NORMAL;
+
+    SetThinkIdle(THINK_ANIM);
+}
+
+/*
+===============
+Actor::EventAnimScript_Scripted
+===============
+*/
+void Actor::EventAnimScript_Scripted(Event *ev)
+{
+    m_csAnimScript   = ev->GetConstString(1);
+    m_bAnimScriptSet = true;
+    m_AnimMode       = ANIM_MODE_SCRIPTED;
+
+    SetThinkIdle(THINK_ANIM);
+}
+
+/*
+===============
+Actor::EventAnimScript_Noclip
+===============
+*/
+void Actor::EventAnimScript_Noclip(Event *ev)
+{
+    m_csAnimScript   = ev->GetConstString(1);
+    m_bAnimScriptSet = true;
+    m_AnimMode       = ANIM_MODE_NOCLIP;
+
+    SetThinkIdle(THINK_ANIM);
+}
+
+/*
+===============
+Actor::EventAnimScript_Attached
+===============
+*/
+void Actor::EventAnimScript_Attached(Event *ev)
+{
+    m_csAnimScript   = ev->GetConstString(1);
+    m_bAnimScriptSet = true;
+    m_AnimMode       = ANIM_MODE_ATTACHED;
+
+    SetThinkIdle(THINK_ANIM);
+}
+
+/*
+===============
+Actor::EventReload_mg42
+===============
+*/
+void Actor::EventReload_mg42(Event *ev)
+{
+    if (m_State != ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
+        if (m_State == ACTOR_STATE_MACHINE_GUNNER_READY) {
+            m_bAnimScriptSet = true;
+            TransitionState(ACTOR_STATE_MACHINE_GUNNER_RELOADING, 0);
+        } else {
+            Unregister(STRING_ANIMDONE);
+        }
+    }
+}
+
+/*
+===============
+Actor::CanMovePathWithLeash
+===============
+*/
+bool Actor::CanMovePathWithLeash(void) const
+{
+    vec2_t delta;
+
+    if (!PathExists()) {
+        return false;
+    }
+
+    VectorSub2D(origin, m_vHome, delta);
+    if (VectorLength2DSquared(delta) >= m_fLeashSquared && DotProduct2D(m_Path.CurrentDelta(), delta) >= 0) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===============
+Actor::MovePathWithLeash
+===============
+*/
+bool Actor::MovePathWithLeash(void)
+{
+    if (!CanMovePathWithLeash()) {
+        Anim_Aim();
+        return false;
+    }
+
+    Anim_RunToInOpen(ANIM_MODE_PATH);
+    FaceMotion();
+
+    return true;
+}
+
+/*
+===============
+Actor::GunTarget
+===============
+*/
+Vector Actor::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward)
+{
+    static cvar_t  *aifSupressScatter = gi.Cvar_Get("g_aiSupressScatter", "2.0", 0);
+    static cvar_t  *aifCoverFactor    = gi.Cvar_Get("g_aimcoverfactor", "0.80", 0);
+    static cvar_t  *aiMaxDeviation    = gi.Cvar_Get("g_aimaxdeviation", "0.965", 0);
+    static cvar_t  *aiMinAccuracy     = gi.Cvar_Get("g_aiminaccuracy", "0.33", 0);
+    static cvar_t  *aiScatterWide     = gi.Cvar_Get("g_aiScatterWide", "16.0", 0);
+    static cvar_t  *aiScatterHeight   = gi.Cvar_Get("g_aiScatterHeight", "45.0", 0);
+    static cvar_t  *aiRanges[4];
+    static qboolean doInit = true;
+    float           fAccuracy, fCoverFactor;
+    Vector          aimDir;
+
+    fCoverFactor = mAccuracy * ((1.0 - m_fVisibilityAlpha) * aiMinAccuracy->value + m_fVisibilityAlpha);
+
+    if (doInit) {
+        aiRanges[0] = gi.Cvar_Get("g_aishortrange", "500", 0);
+        aiRanges[1] = gi.Cvar_Get("g_aimediumrange", "700", 0);
+        aiRanges[2] = gi.Cvar_Get("g_ailongrange", "1000", 0);
+        aiRanges[3] = gi.Cvar_Get("g_aisniperrange", "2200", 0);
+        doInit      = false;
+    }
+
+    if (m_aimNode) {
+        Vector centroid = m_aimNode->centroid;
+
+        if (m_aimNode->IsSubclassOfActor()) {
+            Actor *pActor = static_cast<Actor *>(m_aimNode.Pointer());
+            if (pActor->IsOnFloor()) {
+                centroid = m_aimNode->origin + Vector(0, 0, 12);
+            }
+        }
+
+        aimDir = centroid - Vector(position);
+        aimDir.normalize();
+
+        if (DotProduct(forward, aimDir) < 0.866f) {
+            return centroid;
+        }
+    }
+
+    Vector dir = mTargetPos - EyePosition();
+    dir.normalize();
+
+    if (g_target_game > target_game_e::TG_MOH) {
+        if (DotProduct(forward, dir) < aiMaxDeviation->value) {
+            Vector vOut;
+
+            VectorMA(position, 2048, forward, vOut);
+
+            return vOut;
+        }
+    }
+
+    if (mTargetPos == vec_zero) {
+        Vector vOut;
+
+        AnglesToAxis(angles, orientation);
+
+        vOut = Vector(orientation[0]) * 2048;
+        vOut += EyePosition();
+
+        return vOut;
+    }
+
+    Player *player = NULL;
+    Weapon *weapon;
+    float   scatterMult = 1.f;
+    Vector  vPos;
+    Vector  vDelta;
+
+    if (m_Enemy) {
+        if (!m_Enemy->IsSubclassOfPlayer() && fabs(m_Enemy->origin.z - origin.z) >= 128) {
+            // half towards for the player
+            scatterMult = 0.5f;
+        }
+
+        vDelta = m_Enemy->centroid - centroid;
+        weapon = GetActiveWeapon(WEAPON_MAIN);
+        if (weapon) {
+            fAccuracy = vDelta.length() / aiRanges[weapon->mAIRange]->value;
+            if (fAccuracy < 1) {
+                fAccuracy = 1;
+            }
+
+            scatterMult = fAccuracy * 0.75f;
+        }
+
+        if (m_Enemy->IsSubclassOfPlayer()) {
+            player = static_cast<Player *>(m_Enemy.Pointer());
+            vPos   = player->centroid;
+
+            if (!G_SightTrace(
+                    GunPosition(), vec_zero, vec_zero, vPos, m_Enemy, this, MASK_CANSEE, false, "Actor::GunTarget 1"
+                )) {
+                fCoverFactor *= aifCoverFactor->value;
+                vPos = m_Enemy->EyePosition();
+            }
+        }
+    }
+
+    if (m_State == ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE) {
+        scatterMult = aifSupressScatter->value;
+    }
+
+    Vector error(0, 0, 0);
+
+    fAccuracy = (1.0 - fCoverFactor) * 2 * scatterMult;
+    if (fAccuracy < 0) {
+        fAccuracy = 0;
+    }
+
+    if (player) {
+        error[0] = fAccuracy * aiScatterWide->value * crandom();
+        error[1] = fAccuracy * aiScatterWide->value * crandom();
+        error[2] = fAccuracy * aiScatterHeight->value * crandom();
+        vPos     = player->centroid;
+    } else {
+        error[0] = fAccuracy * 32.0 * crandom();
+        error[1] = fAccuracy * 32.0 * crandom();
+        error[2] = fAccuracy * 48.0 * crandom();
+        vPos     = mTargetPos;
+    }
+
+    if (m_Enemy && m_Enemy->GetVehicleTank()) {
+        vPos.z -= 128;
+    }
+
+    return vPos + error;
+}
+
+/*
+===============
+Actor::setModel
+===============
+*/
+qboolean Actor::setModel(void)
+{
+    str      name;
+    qboolean success;
+
+    if (model != "") {
+        if (m_csLoadOut != STRING_EMPTY) {
+            name = "weapon|" + Director.GetString(m_csLoadOut) + "|";
+        }
+
+        if (m_csHeadModel == STRING_EMPTY) {
+            m_csHeadModel = Director.AddString(level.GetRandomHeadModel(model));
+        }
+
+        if (m_csHeadModel != STRING_EMPTY) {
+            name += "headmodel|" + Director.GetString(m_csHeadModel) + "|";
+        }
+
+        if (m_csHeadSkin == STRING_EMPTY) {
+            m_csHeadSkin = Director.AddString(level.GetRandomHeadSkin(model));
+        }
+
+        if (m_csHeadSkin != STRING_EMPTY) {
+            name += "headskin|" + Director.GetString(m_csHeadSkin) + "|";
+        }
+
+        name += model;
+    }
+
+    level.skel_index[edict->s.number] = -1;
+
+    success = gi.setmodel(edict, name);
+    return success;
+}
+
+/*
+===============
+Actor::EventSetHeadModel
+===============
+*/
+void Actor::EventSetHeadModel(Event *ev)
+{
+    m_csHeadModel = ev->GetConstString(1);
+    setModel();
+}
+
+/*
+===============
+Actor::EventGetHeadModel
+===============
+*/
+void Actor::EventGetHeadModel(Event *ev)
+{
+    ev->AddConstString(m_csHeadModel);
+}
+
+/*
+===============
+Actor::EventSetHeadSkin
+===============
+*/
+void Actor::EventSetHeadSkin(Event *ev)
+{
+    m_csHeadSkin = ev->GetConstString(1);
+    setModel();
+}
+
+/*
+===============
+Actor::EventGetHeadSkin
+===============
+*/
+void Actor::EventGetHeadSkin(Event *ev)
+{
+    ev->AddConstString(m_csHeadSkin);
+}
+
+/*
+===============
+Actor::SetPathWithLeash
+===============
+*/
+void Actor::SetPathWithLeash(Vector vDestPos, const char *description, int iMaxDirtyTime)
+{
+    vec2_t vDelta;
+
+    VectorSub2D(vDestPos, m_vHome, vDelta);
+
+    if (VectorLength2DSquared(vDelta) > m_fLeashSquared) {
+        ClearPath();
+        return;
+    }
+
+    VectorSub2D(origin, m_vHome, vDelta);
+
+    if (VectorLength2DSquared(vDelta) > m_fLeashSquared) {
+        ClearPath();
+        return;
+    }
+
+    SetPath(vDestPos, description, iMaxDirtyTime, m_vHome, m_fLeashSquared);
+}
+
+/*
+===============
+Actor::SetPathWithLeash
+===============
+*/
+void Actor::SetPathWithLeash(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime)
+{
+    if (!pDestNode) {
+        if (m_bPathErrorTime + 5000 < level.inttime) {
+            m_bPathErrorTime = level.inttime;
+            Com_Printf(
+                "^~^~^ No destination node specified for '%s' at (%f %f %f)\n",
+                TargetName().c_str(),
+                origin[0],
+                origin[1],
+                origin[2]
+            );
+        }
+
+        ClearPath();
+        return;
+    }
+
+    SetPathWithLeash(pDestNode->origin, description, iMaxDirtyTime);
+}
+
+/*
+===============
+Actor::FindPathAwayWithLeash
+===============
+*/
+void Actor::FindPathAwayWithLeash(vec3_t vAwayFrom, vec3_t vDirPreferred, float fMinSafeDist)
+{
+    m_Path.FindPathAway(origin, vAwayFrom, vDirPreferred, this, fMinSafeDist, m_vHome, m_fLeashSquared);
+    ShortenPathToAvoidSquadMates();
+}
+
+/*
+===============
+Actor::FindPathNearWithLeash
+===============
+*/
+void Actor::FindPathNearWithLeash(vec3_t vNearbyTo, float fCloseDistSquared)
+{
+    vec2_t vDelta;
+
+    VectorSub2D(vNearbyTo, m_vHome, vDelta);
+
+    if ((sqrt(m_fLeashSquared * fCloseDistSquared) * 2 + m_fLeashSquared + fCloseDistSquared)
+        < VectorLength2DSquared(vDelta)) {
+        return;
+    }
+
+    VectorSub2D(origin, m_vHome, vDelta);
+
+    if (VectorLength2DSquared(vDelta) > m_fLeashSquared) {
+        return;
+    }
+
+    m_Path.FindPathNear(origin, vNearbyTo, this, 0, fCloseDistSquared, m_vHome, m_fLeashSquared);
+    ShortenPathToAvoidSquadMates();
+}
+
+/*
+===============
+Actor::GetAntiBunchPoint
+
+===============
+*/
+Vector Actor::GetAntiBunchPoint(void)
+{
+    float     fMinDistSquared;
+    Vector    vDelta;
+    Sentient *pSquadMate;
+    Vector    vFinalPos;
+    int       nAvoid;
+
+    fMinDistSquared = m_fInterval * m_fInterval;
+    nAvoid          = 0;
+
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        float fLengthSquared, fLength;
+
+        fLengthSquared = vDelta.lengthSquared();
+        if (!fLengthSquared) {
+            continue;
+        }
+
+        if (fLengthSquared >= fMinDistSquared) {
+            continue;
+        }
+
+        fLength = sqrt(fLengthSquared);
+        vDelta *= 1.0f / fLength;
+        vFinalPos += origin + vDelta * (m_fInterval - fLength);
+    }
+
+    if (!nAvoid) {
+        return origin;
+    } else if (nAvoid == 1) {
+        return vFinalPos;
+    } else {
+        vFinalPos *= 1.f / nAvoid;
+        return vFinalPos;
+    }
+}
+
+/*
+===============
+Actor::AutoArchiveModel
+===============
+*/
+bool Actor::AutoArchiveModel(void)
+{
+    return false;
+}
+
+/*
+===============
+Actor::AddToBodyQue
+
+Add this to body queue.
+===============
+*/
+void Actor::AddToBodyQue(void)
+{
+    if (mBodyQueue[mCurBody]) {
+        mBodyQueue[mCurBody]->PostEvent(EV_Remove, 0);
+    }
+
+    mBodyQueue[mCurBody] = this;
+
+    //update current body index
+    mCurBody = (mCurBody + 1) % MAX_BODYQUEUE;
+}
+
+/*
+===============
+Actor::ResetBodyQueue
+
+Clear body queue.
+Called upon Level::Cleanup()
+===============
+*/
+void Actor::ResetBodyQueue(void)
+{
+    //weird useless loop ?
+
+    for (int i = 0; i < MAX_BODYQUEUE; i++) {
+        //do nothing.
+    }
+    //mBodyQueue
+    //this resets curBody, but all the magic happens in AddToBodyQue
+    mCurBody = 0;
+}
+
+/*
+===============
+Actor::EventSetNoIdle
+===============
+*/
+void Actor::EventSetNoIdle(Event *ev)
+{
+    m_bNoIdleAfterAnim = ev->GetInteger(1);
+}
+
+/*
+===============
+Actor::EventGetNoIdle
+===============
+*/
+void Actor::EventGetNoIdle(Event *ev)
+{
+    ev->AddInteger(m_bNoIdleAfterAnim);
+}
+
+/*
+===============
+Actor::EventGetEnemy
+===============
+*/
+void Actor::EventGetEnemy(Event *ev)
+{
+    ev->AddListener(m_Enemy);
+}
+
+/*
+===============
+Actor::EventSetMaxNoticeTimeScale
+===============
+*/
+void Actor::EventSetMaxNoticeTimeScale(Event *ev)
+{
+    float fScale;
+
+    fScale = ev->GetFloat(1);
+    if (fScale <= 0) {
+        Com_Printf("^~^~^ ERROR: noticescale: value must be greater than 0\n");
+        return;
+    }
+
+    m_fMaxNoticeTimeScale = fScale * 0.01f;
+}
+
+/*
+===============
+Actor::EventGetMaxNoticeTimeScale
+===============
+*/
+void Actor::EventGetMaxNoticeTimeScale(Event *ev)
+{
+    ev->AddFloat(m_fMaxNoticeTimeScale * 100);
+}
+
+/*
+===============
+Actor::EventSetFixedLeash
+===============
+*/
+void Actor::EventSetFixedLeash(Event *ev)
+{
+    m_bFixedLeash = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::EventGetFixedLeash
+===============
+*/
+void Actor::EventGetFixedLeash(Event *ev)
+{
+    ev->AddInteger(m_bFixedLeash);
+}
+
+/*
+===============
+Actor::Holster
+===============
+*/
+void Actor::Holster(void)
+{
+    if (activeWeaponList[WEAPON_MAIN]) {
+        DeactivateWeapon(WEAPON_MAIN);
+    }
+}
+
+/*
+===============
+Actor::HolsterOffHand
+===============
+*/
+void Actor::HolsterOffHand(void)
+{
+    if (activeWeaponList[WEAPON_OFFHAND]) {
+        DeactivateWeapon(WEAPON_OFFHAND);
+    }
+}
+
+/*
+===============
+Actor::Unholster
+===============
+*/
+void Actor::Unholster(void)
+{
+    Weapon *weap;
+
+    if (!activeWeaponList[WEAPON_MAIN]) {
+        weap = GetWeapon(0);
+        if (weap) {
+            useWeapon(weap, WEAPON_MAIN);
+            ActivateNewWeapon();
+        }
+    }
+}
+
+/*
+===============
+Actor::UnholsterOffHand
+===============
+*/
+void Actor::UnholsterOffHand(void)
+{
+    Weapon *weap;
+
+    if (!activeWeaponList[WEAPON_OFFHAND]) {
+        weap = GetWeapon(0);
+        if (weap) {
+            useWeapon(weap, WEAPON_OFFHAND);
+            ActivateNewWeapon();
+        }
+    }
+}
+
+/*
+===============
+Actor::EventHolster
+===============
+*/
+void Actor::EventHolster(Event *ev)
+{
+    if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
+        HolsterOffHand();
+    } else {
+        Holster();
+    }
+}
+
+/*
+===============
+Actor::EventUnholster
+===============
+*/
+void Actor::EventUnholster(Event *ev)
+{
+    if (ev->NumArgs() > 0 && ev->GetInteger(1) > 0) {
+        UnholsterOffHand();
+    } else {
+        Unholster();
+    }
+}
+
+/*
+===============
+Actor::EventIsEnemyVisible
+===============
+*/
+void Actor::EventIsEnemyVisible(Event *ev)
+{
+    ev->AddInteger(m_bEnemyVisible);
+}
+
+/*
+===============
+Actor::EventGetEnemyVisibleChangeTime
+===============
+*/
+void Actor::EventGetEnemyVisibleChangeTime(Event *ev)
+{
+    ev->AddFloat(m_iEnemyVisibleChangeTime / 100.f);
+}
+
+/*
+===============
+Actor::EventGetLastEnemyVisibleTime
+===============
+*/
+void Actor::EventGetLastEnemyVisibleTime(Event *ev)
+{
+    ev->AddFloat(m_iLastEnemyVisibleTime / 100.f);
+}
+
+/*
+===============
+Actor::EventSoundDone
+===============
+*/
+void Actor::EventSoundDone(Event *ev)
+{
+    int channelNum;
+    str sfxName;
+
+    channelNum = ev->GetInteger(1);
+    sfxName    = ev->GetString(2);
+
+    if (gi.S_IsSoundPlaying(channelNum, sfxName)) {
+        Event event(EV_SoundDone);
+        event.AddInteger(channelNum);
+        event.AddString(sfxName);
+        PostEvent(event, level.frametime);
+    } else if (m_bSayAnimSet && m_iSaySlot == -2) {
+        ChangeSayAnim();
+        if (m_csSayAnim == STRING_EMPTY) {
+            Unregister(STRING_SAYDONE);
+        }
+    } else {
+        Unregister(STRING_SOUNDDONE);
+    }
+}
+
+/*
+===============
+Actor::EventSound
+===============
+*/
+void Actor::EventSound(Event *ev)
+{
+    if (g_gametype->integer == GT_SINGLE_PLAYER || m_Team == TEAM_AMERICAN) {
+        ProcessSoundEvent(ev, true);
+    } else {
+        ProcessSoundEvent(ev, false);
+    }
+}
+
+/*
+===============
+Actor::EventSetFallHeight
+===============
+*/
+void Actor::EventSetFallHeight(Event *ev)
+{
+    float fHeight = ev->GetFloat(1);
+
+    if (fHeight < MIN_FALLHEIGHT) {
+        ScriptError("value less than %d not allowed", MIN_FALLHEIGHT);
+    }
+    if (fHeight > MAX_FALLHEIGHT) {
+        ScriptError("value greater than %d not allowed", MAX_FALLHEIGHT);
+    }
+
+    m_Path.SetFallHeight(fHeight);
+}
+
+/*
+===============
+Actor::EventGetFallHeight
+===============
+*/
+void Actor::EventGetFallHeight(Event *ev)
+{
+    ev->AddFloat(m_Path.GetFallHeight());
+}
+
+/*
+===============
+Actor::EventCanMoveTo
+===============
+*/
+void Actor::EventCanMoveTo(Event *ev)
+{
+    Vector    vDest;
+    vec2_t    vDelta;
+    float     fDistSquared;
+    float     fIntervalSquared;
+    Sentient *pSquadMate;
+
+    vDest = ev->GetVector(1);
+
+    VectorSub2D(vDest, m_vHome, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
+
+    if (fDistSquared >= m_fLeashSquared) {
+        ev->AddInteger(0);
+        return;
+    }
+
+    if (m_Enemy) {
+        VectorSub2D(vDest, m_Enemy->origin, vDelta);
+        fDistSquared = VectorLength2DSquared(vDelta);
+
+        if (fDistSquared <= m_fMinDistanceSquared || fDistSquared >= m_fMaxDistanceSquared) {
+            ev->AddInteger(false);
+            return;
+        }
+    }
+
+    if (m_fInterval) {
+        fIntervalSquared = Square(m_fInterval);
+
+        for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+            fDistSquared = (vDest - pSquadMate->origin).lengthSquared();
+
+            if (fDistSquared >= fIntervalSquared) {
+                continue;
+            }
+
+            if ((origin - pSquadMate->origin).lengthSquared() > fDistSquared) {
+                ev->AddInteger(false);
+                return;
+            }
+        }
+    }
+
+    for (pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        Actor *pActor;
+
+        if (pSquadMate->IsSubclassOfActor()) {
+            pActor = static_cast<Actor *>(pSquadMate);
+            if (!pActor->m_Enemy) {
+                continue;
+            }
+
+            VectorSub2D(pActor->m_Enemy->origin, pSquadMate->origin, vDelta);
+        } else {
+            VectorCopy2D(pSquadMate->orientation[0], vDelta);
+        }
+
+        float fIntercept = CrossProduct2D(vDelta, pSquadMate->origin);
+        float a1         = CrossProduct2D(vDelta, origin) - fIntercept;
+        float a2         = CrossProduct2D(vDelta, vDest) - fIntercept;
+
+        if (signbit(a1) != signbit(a2)) {
+            ev->AddInteger(false);
+            return;
+        }
+    }
+
+    ev->AddInteger(true);
+}
+
+/*
+===============
+Actor::EventMoveDir
+===============
+*/
+void Actor::EventMoveDir(Event *ev)
+{
+    vec3_t vDir;
+
+    VectorClear(vDir);
+
+    if (!PathGoalSlowdownStarted()) {
+        VectorCopy2D(velocity, vDir);
+
+        if (velocity.x || velocity.y) {
+            VectorCopy2D(velocity, vDir);
+            VectorNormalize2D(vDir);
+            vDir[2] = 0;
+        } else if (PathExists() && !PathComplete()) {
+            VectorCopy2D(PathDelta(), vDir);
+            VectorNormalize2D(vDir);
+            vDir[2] = 0;
+        }
+    }
+
+    ev->AddVector(vDir);
+}
+
+/*
+===============
+Actor::EventIntervalDir
+===============
+*/
+void Actor::EventIntervalDir(Event *ev)
+{
+    if (level.inttime >= m_iIntervalDirTime + 250) {
+        m_vIntervalDir     = vec_zero;
+        m_iIntervalDirTime = level.inttime;
+
+        if (m_Enemy) {
+            m_vIntervalDir = GetAntiBunchPoint() - origin;
+            if (m_vIntervalDir.x || m_vIntervalDir.y) {
+                m_vIntervalDir.normalizefast();
+            }
+        }
+    }
+
+    ev->AddVector(m_vIntervalDir);
+}
+
+/*
+===============
+Actor::EventResetLeash
+===============
+*/
+void Actor::EventResetLeash(Event *ev)
+{
+    m_vHome      = origin;
+    m_pTetherEnt = NULL;
+}
+
+/*
+===============
+Actor::EventTether
+===============
+*/
+void Actor::EventTether(Event *ev)
+{
+    m_pTetherEnt = ev->GetSimpleEntity(1);
+}
+
+/*
+===============
+Actor::ShortenPathToAttack
+===============
+*/
+bool Actor::ShortenPathToAttack(float fMinDist)
+{
+    float     fMinDistSquared;
+    PathInfo *pathnode;
+    Vector    vEyePos;
+
+    if (!PathExists() || PathComplete()) {
+        return false;
+    }
+
+    if (!PathAvoidsSquadMates()) {
+        return false;
+    }
+
+    fMinDistSquared = Square(fMinDist);
+    for (pathnode = CurrentPathNode(); pathnode > LastPathNode(); pathnode--) {
+        if ((pathnode->point - origin).lengthSquared() < fMinDistSquared) {
+            continue;
+        }
+
+        if (CanSeeFrom(pathnode->point - eyeposition, m_Enemy)) {
+            m_Path.TrimPathFromEnd(pathnode - LastPathNode());
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/*
+===============
+Actor::StrafeToAttack
+===============
+*/
+void Actor::StrafeToAttack(float fDist, vec3_t vDir)
+{
+    static const vec3_t mins = {-16, -16, 16};
+    static const vec3_t maxs = {16, 16, 128};
+    Vector              vSpot;
+    Vector              vDelta;
+    Vector              vEnemyCentroid;
+
+    VectorScale(vDir, fDist, vDelta);
+    VectorAdd(origin, vDelta, vSpot);
+
+    float fDistSquared = (vSpot - m_vLastEnemyPos).lengthSquared();
+    if (fDistSquared >= m_fMaxDistanceSquared || fDistSquared <= m_fMinDistanceSquared) {
+        ClearPath();
+        return;
+    }
+
+    if (!G_SightTrace(origin, mins, maxs, vSpot, this, NULL, MASK_TARGETPATH, true, "Actor::StrafeToAttack 1")) {
+        ClearPath();
+        return;
+    }
+
+    vEnemyCentroid = m_vLastEnemyPos;
+    vEnemyCentroid.z += m_Enemy->centroid.z - m_Enemy->origin.z;
+
+    if (!G_SightTrace(
+            vDelta + EyePosition(),
+            vec3_origin,
+            vec3_origin,
+            vEnemyCentroid,
+            this,
+            m_Enemy,
+            MASK_CANSEE,
+            false,
+            "Actor::StrafeToAttack 1"
+        )) {
+        ClearPath();
+        return;
+    }
+
+    SetPathWithLeash(vSpot, NULL, 0);
+}
+
+/*
+===============
+Actor::EventGetThinkState
+===============
+*/
+void Actor::EventGetThinkState(Event *ev)
+{
+    ev->AddConstString(m_csThinkStateNames[m_ThinkState]);
+}
+
+/*
+===============
+Actor::EventGetEnemyShareRange
+===============
+*/
+void Actor::EventGetEnemyShareRange(Event *ev)
+{
+    ev->AddFloat(sqrt(m_fMaxShareDistSquared));
+}
+
+/*
+===============
+Actor::EventSetEnemyShareRange
+===============
+*/
+void Actor::EventSetEnemyShareRange(Event *ev)
+{
+    float fLength          = ev->GetFloat(1);
+    m_fMaxShareDistSquared = Square(fLength);
+}
+
+/*
+===============
+Actor::GetVoiceType
+===============
+*/
+void Actor::GetVoiceType(Event *ev)
+{
+    //voice type in actor is a char.
+    ev->AddString(va("%c", mVoiceType));
+}
+
+/*
+===============
+Actor::SetVoiceType
+===============
+*/
+void Actor::SetVoiceType(Event *ev)
+{
+    //voice type in actor is a char.
+    const str vType = ev->GetString(1);
+
+    if (vType.length() && vType[0]) {
+        mVoiceType = vType[0];
+    } else {
+        mVoiceType = -1;
+    }
+}
+
+/*
+===============
+Actor::FindSniperNodeAndSetPath
+===============
+*/
+PathNode *Actor::FindSniperNodeAndSetPath(bool *pbTryAgain)
+{
+    PathNode *pSniperNode;
+
+    pSniperNode = PathManager.FindNearestSniperNode(this, origin, m_Enemy);
+
+    if (!pSniperNode) {
+        *pbTryAgain = false;
+        return NULL;
+    }
+
+    SetPathWithLeash(pSniperNode, NULL, 0);
+
+    if (!PathExists()) {
+        pSniperNode->MarkTemporarilyBad();
+        *pbTryAgain = true;
+        return NULL;
+    }
+
+    if (!PathComplete() && !PathAvoidsSquadMates()) {
+        pSniperNode->MarkTemporarilyBad();
+        *pbTryAgain = true;
+        return NULL;
+    }
+
+    *pbTryAgain = true;
+    return pSniperNode;
+}
+
+/*
+===============
+Actor::Remove
+===============
+*/
+void Actor::Remove(Event *ev)
+{
+    EndStates();
+
+    if (deadflag != DEAD_DEAD) {
+        deadflag = DEAD_DEAD;
+        health   = 0;
+        Unregister(STRING_DEATH);
+    }
+
+    Delete();
+}
+
+/*
+===============
+Actor::EventGetKickDir
+===============
+*/
+void Actor::EventGetKickDir(Event *ev)
+{
+    ev->AddVector(m_vKickDir);
+}
+
+/*
+===============
+Actor::EventGetNoLongPain
+===============
+*/
+void Actor::EventGetNoLongPain(Event *ev)
+{
+    ev->AddInteger(m_bNoLongPain || m_Team == TEAM_AMERICAN);
+}
+
+/*
+===============
+Actor::EventSetNoLongPain
+===============
+*/
+void Actor::EventSetNoLongPain(Event *ev)
+{
+    m_bNoLongPain = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::DontFaceWall
+===============
+*/
+void Actor::DontFaceWall(void)
+{
+    trace_t   trace;
+    Vector    start, end;
+    float     fAngle, fSinAngle, fCosAngle;
+    float     fEyeRadius;
+    float     fErrorLerp;
+    vec2_t    vDelta;
+    PathNode *pNode;
+
+    if (m_pCoverNode && m_pCoverNode->nodeflags & (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE)) {
+        m_eDontFaceWallMode = 1;
+        return;
+    }
+
+    if (velocity.lengthXYSquared() > Square(8)) {
+        m_eDontFaceWallMode = 2;
+        return;
+    }
+
+    fAngle = AngleNormalize360(m_YawAchieved ? angles.y : m_DesiredYaw);
+
+    fErrorLerp = (level.time - m_fDfwTime) * 0.5;
+    if (fErrorLerp > 1) {
+        fErrorLerp = 1;
+    }
+
+    VectorSub2D(m_vDfwPos, origin, vDelta);
+
+    if (Square(fErrorLerp * -14.0 + 16.0) > VectorLength2DSquared(vDelta)
+        && (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0
+            || fabs(AngleNormalize180(m_fDfwDerivedYaw - m_DesiredYaw)) <= fErrorLerp * -29.0 + 30.0)) {
+        if (AvoidingFacingWall()) {
+            SetDesiredYaw(m_fDfwDerivedYaw);
+        }
+        return;
+    }
+
+    m_vDfwPos          = origin;
+    m_fDfwRequestedYaw = fAngle;
+    m_fDfwTime         = level.time;
+
+    fSinAngle = sin(DEG2RAD(fAngle));
+    fCosAngle = cos(DEG2RAD(fAngle));
+
+    VectorSub2D(EyePosition(), origin, vDelta);
+    start = EyePosition();
+    start.x -= origin.x;
+    start.y -= origin.y;
+    fEyeRadius = VectorLength2D(start);
+    start.x    = origin.x + fEyeRadius * fCosAngle;
+    start.y    = origin.y + fEyeRadius * fSinAngle;
+    end.x      = start.x + fCosAngle * 64;
+    end.y      = start.y + fSinAngle * 64;
+    end.z      = start.z;
+
+    trace = G_Trace(start, vec_zero, vec_zero, end, this, MASK_CANSEE, false, "Actor::DontFaceWall");
+
+    if (trace.entityNum == ENTITYNUM_NONE || trace.fraction > 0.999f || trace.startsolid) {
+        m_eDontFaceWallMode = 3;
+        m_fDfwDerivedYaw    = m_fDfwRequestedYaw;
+        return;
+    }
+
+    if (trace.entityNum != ENTITYNUM_WORLD && !trace.ent->entity->AIDontFace()) {
+        m_eDontFaceWallMode = 4;
+        m_fDfwDerivedYaw    = m_fDfwRequestedYaw;
+        return;
+    }
+
+    if (trace.plane.normal[2] < -0.7f || trace.plane.normal[2] > 0.7f) {
+        m_eDontFaceWallMode = 5;
+        m_fDfwDerivedYaw    = m_fDfwRequestedYaw;
+        return;
+    }
+
+    if (m_Enemy && (m_Enemy->origin * trace.plane.normal - trace.plane.dist) < 0) {
+        end = m_Enemy->origin;
+    } else {
+        end = start + 128 * (end - start);
+    }
+
+    pNode = PathManager.FindCornerNodeForWall(origin, end, this, 0.0f, trace.plane.normal);
+    if (pNode) {
+        SetDesiredYawDest(pNode->m_PathPos);
+    } else if (trace.fraction > 0.46875f) {
+        if (m_DesiredYaw < 90.0) {
+            SetDesiredYaw(m_DesiredYaw + 270);
+        } else {
+            SetDesiredYaw(m_DesiredYaw - 90);
+        }
+        m_eDontFaceWallMode = 8;
+    } else {
+        SetDesiredYawDir(trace.plane.normal);
+        m_eDontFaceWallMode = 7;
+    }
+
+    m_fDfwDerivedYaw = m_DesiredYaw;
+}
+
+/*
+===============
+Actor::IsVoidState
+===============
+*/
+bool Actor::IsVoidState(int state)
+{
+    return true;
+}
+
+/*
+===============
+Actor::IsIdleState
+===============
+*/
+bool Actor::IsIdleState(int state)
+{
+    return state == THINKSTATE_IDLE;
+}
+
+/*
+===============
+Actor::IsCuriousState
+===============
+*/
+bool Actor::IsCuriousState(int state)
+{
+    return state == THINKSTATE_CURIOUS;
+}
+
+/*
+===============
+Actor::IsDisguiseState
+===============
+*/
+bool Actor::IsDisguiseState(int state)
+{
+    return state == THINKSTATE_DISGUISE;
+}
+
+/*
+===============
+Actor::IsAttackState
+===============
+*/
+bool Actor::IsAttackState(int state)
+{
+    return state == THINKSTATE_ATTACK;
+}
+
+/*
+===============
+Actor::IsGrenadeState
+===============
+*/
+bool Actor::IsGrenadeState(int state)
+{
+    return state == THINKSTATE_GRENADE;
+}
+
+/*
+===============
+Actor::IsBadPlaceState
+===============
+*/
+bool Actor::IsBadPlaceState(int state)
+{
+    return state == THINKSTATE_BADPLACE;
+}
+
+/*
+===============
+Actor::IsPainState
+===============
+*/
+bool Actor::IsPainState(int state)
+{
+    return state == THINKSTATE_PAIN;
+}
+
+/*
+===============
+Actor::IsKilledState
+===============
+*/
+bool Actor::IsKilledState(int state)
+{
+    return state == THINKSTATE_KILLED;
+}
+
+/*
+===============
+Actor::IsNoClipState
+===============
+*/
+bool Actor::IsNoClipState(int state)
+{
+    return state == THINKSTATE_NOCLIP;
+}
+
+/*
+===============
+Actor::InitVoid
+
+Init void global func
+===============
+*/
+void Actor::InitVoid(GlobalFuncs_t *func)
+{
+    func->IsState = &Actor::IsVoidState;
+}
+
+/*
+===============
+Actor::BecomeCorpse
+===============
+*/
+void Actor::BecomeCorpse(void)
+{
+    AddToBodyQue();
+
+    setContents(CONTENTS_TRIGGER);
+    edict->r.svFlags &= ~SVF_MONSTER;
+    setSolidType(SOLID_NOT);
+
+    CheckGround();
+    if (groundentity) {
+        setMoveType(MOVETYPE_NONE);
+    } else {
+        // enable physics if on air
+        setMoveType(MOVETYPE_TOSS);
+    }
+
+    // don't cast shadow
+    edict->s.renderfx &= ~RF_SHADOW;
+
+    PostEvent(EV_DeathSinkStart, 10);
+}
+
+/*
+===============
+Actor::EventGetFavoriteEnemy
+===============
+*/
+void Actor::EventGetFavoriteEnemy(Event *ev)
+{
+    ev->AddEntity(m_FavoriteEnemy);
+}
+
+/*
+===============
+Actor::EventSetFavoriteEnemy
+===============
+*/
+void Actor::EventSetFavoriteEnemy(Event *ev)
+{
+    m_FavoriteEnemy = static_cast<Sentient *>(ev->GetEntity(1));
+}
+
+/*
+===============
+Actor::EventFindEnemy
+===============
+*/
+void Actor::EventFindEnemy(Event *ev)
+{
+    if (level.inttime > m_iEnemyCheckTime + 200) {
+        UpdateEnemyInternal();
+    }
+
+    ev->AddEntity(m_Enemy);
+}
+
+/*
+===============
+Actor::EventGetMumble
+===============
+*/
+void Actor::EventGetMumble(Event *ev)
+{
+    ev->AddInteger(m_bMumble);
+}
+
+/*
+===============
+Actor::EventSetMumble
+===============
+*/
+void Actor::EventSetMumble(Event *ev)
+{
+    m_bMumble = ev->GetInteger(1) != false;
+}
+
+/*
+===============
+Actor::EventGetBreathSteam
+===============
+*/
+void Actor::EventGetBreathSteam(Event *ev)
+{
+    ev->AddInteger(m_bBreathSteam);
+}
+
+/*
+===============
+Actor::EventSetBreathSteam
+===============
+*/
+void Actor::EventSetBreathSteam(Event *ev)
+{
+    m_bBreathSteam = ev->GetInteger(1) != false;
+}
+
+/*
+===============
+Actor::EventSetNextBreathTime
+===============
+*/
+void Actor::EventSetNextBreathTime(Event *ev)
+{
+    ScriptVariable var;
+    ScriptThread  *thread;
+
+    thread = Director.CreateThread("global/breathe.scr", "nextbreathtime");
+
+    // pass the breath time as the first argument
+    var.setFloatValue(ev->GetFloat(1));
+    thread->Execute(&var, 1);
+}
+
+/*
+===============
+Actor::EventCalcGrenadeToss2
+===============
+*/
+void Actor::EventCalcGrenadeToss2(Event *ev)
+{
+    Vector vTargetPos;
+    Vector vFrom;
+    Vector vPoint;
+    Vector vDelta;
+    Vector vVel;
+    Vector vPointTarget(0, 0, 0);
+    float  speed;
+    float  fDistSquared;
+
+    vFrom        = origin;
+    speed        = 0;
+    vTargetPos   = ev->GetVector(1);
+    vDelta       = vTargetPos - vFrom;
+    fDistSquared = vDelta.lengthSquared();
+
+    if (ev->NumArgs() > 1) {
+        speed = ev->GetFloat(2);
+    }
+
+    if (fDistSquared < Square(1024)) {
+        // See if it can roll
+        vPoint = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETOSS_SCR);
+        vVel   = CanRollGrenade(vPoint, vTargetPos);
+
+        if (vVel != vPointTarget) {
+            m_vGrenadeVel  = vVel;
+            m_eGrenadeMode = AI_GREN_TOSS_ROLL;
+            ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
+            SetDesiredYawDir(m_vGrenadeVel);
+            return;
+        }
+    }
+
+    if (!speed) {
+        vPoint = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETHROW_SCR);
+        vVel   = CanThrowGrenade(vPoint, vTargetPos);
+
+        if (vVel != vec_zero) {
+            m_vGrenadeVel  = vVel;
+            m_eGrenadeMode = AI_GREN_TOSS_THROW;
+            ev->AddConstString(STRING_ANIM_GRENADETHROW_SCR);
+            SetDesiredYawDir(m_vGrenadeVel);
+        } else {
+            ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
+        }
+        return;
+    }
+
+    vPoint = GrenadeThrowPoint(vFrom, vDelta, STRING_ANIM_GRENADETHROW_SCR);
+
+    vVel = vTargetPos - vPoint;
+    vVel.normalize();
+    vVel *= speed;
+
+    m_vGrenadeVel  = vVel;
+    m_eGrenadeMode = AI_GREN_TOSS_THROW;
+
+    ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
+    SetDesiredYawDir(m_vGrenadeVel);
+}
+
+/*
+===============
+Actor::EventCalcGrenadeToss
+===============
+*/
+void Actor::EventCalcGrenadeToss(Event *ev)
+{
+    bool bSuccess;
+
+    if (ev->NumArgs() > 1) {
+        bSuccess = ev->GetBoolean(2);
+    }
+
+    if (!DecideToThrowGrenade(ev->GetVector(1), &m_vGrenadeVel, &m_eGrenadeMode, bSuccess)) {
+        ev->AddConstString(STRING_EMPTY);
+        return;
+    }
+
+    switch (m_eGrenadeMode) {
+    case AI_GREN_TOSS_ROLL:
+        ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
+        break;
+    case AI_GREN_TOSS_HINT:
+    case AI_GREN_TOSS_THROW:
+        ev->AddConstString(STRING_ANIM_GRENADETHROW_SCR);
+        break;
+    default:
+        {
+            char assertStr[16384] = {0};
+            strcpy(assertStr, "\"invalid return condition for Actor::EventCalcGrenadeToss\"\n\tMessage: ");
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
+            assert(false && assertStr);
+        }
+        break;
+    }
+
+    SetDesiredYawDir(m_vGrenadeVel);
+}
+
+/*
+===============
+Actor::EventGetNoSurprise
+===============
+*/
+void Actor::EventGetNoSurprise(Event *ev)
+{
+    ev->AddInteger(m_bNoSurprise);
+}
+
+/*
+===============
+Actor::EventSetNoSurprise
+===============
+*/
+void Actor::EventSetNoSurprise(Event *ev)
+{
+    m_bNoSurprise = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::EventGetSilent
+===============
+*/
+void Actor::EventGetSilent(Event *ev)
+{
+    ev->AddInteger(m_bSilent);
+}
+
+/*
+===============
+Actor::EventSetSilent
+===============
+*/
+void Actor::EventSetSilent(Event *ev)
+{
+    m_bSilent = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::EventGetAvoidPlayer
+===============
+*/
+void Actor::EventGetAvoidPlayer(Event *ev)
+{
+    ev->AddInteger(m_bAutoAvoidPlayer);
+}
+
+/*
+===============
+Actor::EventSetAvoidPlayer
+===============
+*/
+void Actor::EventSetAvoidPlayer(Event *ev)
+{
+    m_bAutoAvoidPlayer = ev->GetBoolean(1);
+}
+
+/*
+===============
+Actor::PathnodeClaimRevoked
+===============
+*/
+void Actor::PathnodeClaimRevoked(PathNode *node)
+{
+    int iThinkLevel;
+
+    for (iThinkLevel = m_ThinkLevel; iThinkLevel >= 0; --iThinkLevel) {
+        GlobalFuncs_t *func = &GlobalFuncs[m_Think[iThinkLevel]];
+
+        if (func->PathnodeClaimRevoked) {
+            (this->*func->PathnodeClaimRevoked)();
+        }
+    }
+
+    node->Relinquish();
+    m_pCoverNode = NULL;
+}
+
+/*
+===============
+Actor::SetPathToNotBlockSentient
+===============
+*/
+void Actor::SetPathToNotBlockSentient(Sentient *pOther)
+{
+    Vector vAway;
+    Vector vPerp;
+    Vector vDest;
+
+    if (!pOther) {
+        return;
+    }
+
+    if (pOther->IsDead()) {
+        return;
+    }
+
+    if (!IsTeamMate(pOther)) {
+        return;
+    }
+
+    if (pOther->velocity.lengthSquared() <= 1) {
+        return;
+    }
+
+    vAway = origin - pOther->origin;
+
+    if (vAway.lengthSquared() >= Square(48)) {
+        return;
+    }
+
+    if (DotProduct2D(pOther->velocity, vAway) <= 0) {
+        return;
+    }
+
+    if (CrossProduct2D(pOther->velocity, vAway) >= 0) {
+        vPerp[0] = -pOther->velocity[1];
+        vPerp[1] = pOther->velocity[0];
+    } else {
+        vPerp[0] = pOther->velocity[1];
+        vPerp[1] = -pOther->velocity[0];
+    }
+    vPerp[2] = 0;
+    vPerp.normalizefast();
+
+    vDest = origin + vPerp * 48;
+
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 1")) {
+        SetPathWithinDistance(vDest, NULL, 96, 0);
+    }
+
+    if (PathExists()) {
+        return;
+    }
+
+    vDest = origin - vPerp * 48;
+
+    if (G_SightTrace(vDest, mins, maxs, vDest, this, pOther, MASK_SOLID, false, "Actor::SetPathToNotBlockSentient 2")) {
+        SetPathWithinDistance(vDest, NULL, 96, 0);
+    }
+
+    if (PathExists()) {
+        return;
+    }
+
+    FindPathAway(pOther->origin, vAway * 100, 96);
 }
 
 /*
@@ -8305,1538 +12151,419 @@ Actor::LookAround
 Look around behaviour.
 ===============
 */
-void Actor::LookAround
-	(
-	float fFovAdd
-	)
+void Actor::LookAround(float fFovAdd)
 {
-	Vector vDest, vAngle;
-	float fModTime;
+    float   fModTime;
+    vec3_t  vAngle;
+    vec3_t  vDest;
+    trace_t trace;
 
-	if (level.inttime >= m_iNextLookTime)
-	{
-		fModTime = level.time;
-		vAngle = angles;
+    if (level.inttime >= m_iNextLookTime) {
+        VectorCopy(angles, vAngle);
+        fModTime = level.time / 8 - floor(level.time / 8);
 
-		vAngle.y += fFovAdd * (2*(fModTime * 0.125 - floor(fModTime * 0.125)) - 1.0);
-		vAngle.x += (noise1(fModTime * 1.005309626678312 + entnum) + 1.0) * 15.0;
+        vAngle[1] = fFovAdd * (fModTime * 2 - 1) + vAngle[1];
+        vAngle[0] += (noise1(entnum + level.time * 1.005309626678312f) + 1) * 15;
+        AngleVectors(vAngle, vDest, NULL, NULL);
 
-		AngleVectors(vAngle, vDest, NULL, NULL);
+        Vector vEyePos = EyePosition();
 
-		vDest += EyePosition() * 1024;
-		trace_t trace = G_Trace(EyePosition(), vec_zero, vec_zero, vDest, this, 25, qfalse, "Actor::LookAround");
-		if (trace.fraction > 0.125)
-		{
-			m_bHasDesiredLookDest = true;
-			VectorCopy(trace.endpos, m_vDesiredLookDest);
-			m_iNextLookTime = level.inttime + rand() % 500 + 750;
-		}
-		else
-		{
-			m_bHasDesiredLookDest = false;
-			m_iNextLookTime = level.inttime + 187;
-		}
-	}
+        VectorMA(vEyePos, 1024, vDest, vDest);
 
-	
-	if (m_bHasDesiredLookDest)
-	{
-		SetDesiredLookDir(m_vDesiredLookDest - EyePosition());
-	}
-	else
-	{
-		m_bHasDesiredLookAngles = false;
-	}
+        trace = G_Trace(EyePosition(), vec_zero, vec_zero, vDest, this, MASK_LOOK, false, "Actor::LookAround");
+        if (trace.fraction > 0.125) {
+            m_bHasDesiredLookDest = true;
+            VectorCopy(trace.endpos, m_vDesiredLookDest);
+            m_iNextLookTime = level.inttime + (rand() % 500) + 750;
+        } else {
+            m_bHasDesiredLookDest = false;
+            m_iNextLookTime       = level.inttime + 187;
+        }
+    }
+
+    if (m_bHasDesiredLookDest) {
+        SetDesiredLookDir(m_vDesiredLookDest - EyePosition());
+    } else {
+        ForwardLook();
+    }
 }
 
 /*
 ===============
-Actor::SoundSayAnim
-
-Returns true if animation not found.
+Actor::EventGetLookAroundAngle
 ===============
 */
-bool Actor::SoundSayAnim
-	(
-	const_str name,
-	byte bLevelSayAnim
-	)
+void Actor::EventGetLookAroundAngle(Event *ev)
 {
-	int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str());
-	if (animnum == -1)
-	{
-		ChangeSayAnim();
-		m_bSayAnimSet = true;
-		m_iSaySlot = -2;
-		m_bLevelSayAnim = bLevelSayAnim;
+    // Fixed in OPM
+    //  Seems like a mistake in 2.40 and below, it should return a float instead
+    //ev->GetFloat(m_fLookAroundFov);
 
-		Com_Printf(
-			"Couldn't find animation '%s' in '%s' - trying sound alias instead.\n",
-			Director.GetString(name).c_str(),
-			edict->tiki->a->name);
-
-		Sound(Director.GetString(name), 0, 0, 0, NULL, 0, 1, 1, -1);
-
-		return true;
-	}
-	return false;
-}
-
-static bool UnknownAnim(const char *name, dtiki_t *tiki)
-{
-	ScriptException::next_bIsForAnim = true;
-	ScriptError("unknown animation '%s' in '%s'", name, tiki->a->name);
+    ev->AddFloat(m_fLookAroundFov);
 }
 
 /*
 ===============
-Actor::EventSetAnim
-
-Set animation event.
+Actor::EventSetLookAroundAngle
 ===============
 */
-void Actor::EventSetAnim
-	(
-	Event *ev
-	)
+void Actor::EventSetLookAroundAngle(Event *ev)
 {
-	//"anim slot weight flagged"
-	int numArgs = ev->NumArgs(), slot = 0, animnum;
-	float weight = 1;
-	const_str anim, flagVal;
-	qboolean flagged = qfalse;
+    float fLookAroundFov;
 
-	//FIXME: better notation, but this works for now.
-	if (numArgs < 1 || numArgs > 4)
-	{
-		ScriptError("bad number of arguments");
-	}
-	else if (numArgs == 1)
-	{
-		anim = ev->GetConstString(1);
-		animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-		if (animnum == -1)
-		{
-			UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-		}
-	}
-	else if (numArgs == 2)
-	{
-		anim = ev->GetConstString(1);
-		animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-		if (animnum == -1)
-		{
-			UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-		}
-		slot = ev->GetInteger(2);
-		if (slot > 2)
-		{
-			ScriptError("Bad animation slot, only 0 and 1 supported");
-		}
-	}
-	else if (numArgs == 3)
-	{
-		weight = ev->GetFloat(3);
-		if (weight < 0)
-		{
-			ScriptError("Negative anim weight not allowed");
-		}
-		if (weight != 0)
-		{
-			slot = ev->GetInteger(2);
-			if (slot > 2)
-			{
-				ScriptError("Bad animation slot, only 0 and 1 supported");
-			}
-		}
+    fLookAroundFov = ev->GetFloat(1);
+    if (fLookAroundFov < 0.0 || fLookAroundFov > 60.0) {
+        ScriptError("lookaroundangle must be >= 0 and <= 60");
+    }
 
-		anim = ev->GetConstString(1);
-		animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-		if (animnum == -1)
-		{
-			UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-		}
-	}
-	else if (numArgs == 4)
-	{
-		flagVal = ev->GetConstString(4);
-		flagged = qtrue;
-		if (flagVal != STRING_FLAGGED)
-		{
-			ScriptError("unknown keyword '%s', expected 'flagged'", Director.GetString(flagVal).c_str());
-		}
-		weight = ev->GetFloat(3);
-		if (weight < 0)
-		{
-			ScriptError("Negative anim weight not allowed");
-		}
-		if (weight != 0)
-		{
-			slot = ev->GetInteger(2);
-			if (slot > 2)
-			{
-				ScriptError("Bad animation slot, only 0 and 1 supported");
-			}
-		}
-
-		anim = ev->GetConstString(1);
-		animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-		if (animnum == -1)
-		{
-			UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-		}
-	}
-	
-	if (!slot)
-	{
-		flagged = qtrue;
-	}
-	if (flagged)
-	{
-		parm.motionfail = qtrue;
-	}
-	if (!m_bLevelMotionAnim)
-	{
-		if (slot)
-		{
-			m_weightType[GetMotionSlot(slot)] = 0;
-		}
-		else
-		{
-			ChangeMotionAnim();
-			m_bMotionAnimSet = true;
-		}
-		StartMotionAnimSlot(slot, animnum, weight);
-		if (flagged)
-		{
-			m_iMotionSlot = GetMotionSlot(slot);
-			parm.motionfail = qfalse;
-		}
-	}
+    m_fLookAroundFov = fLookAroundFov;
 }
 
 /*
 ===============
-Actor::EventIdleSayAnim
-
-Play idle say dialogue.
+Actor::DumpAnimInfo
 ===============
 */
-void Actor::EventIdleSayAnim
-	(
-	Event *ev
-	)
+void Actor::DumpAnimInfo(void)
 {
-	const_str name;
-	if (ev->NumArgs())
-	{
-		if (ev->NumArgs() != 1)
-		{
-			ScriptError("bad number of arguments");
-		}
+    vec3_t LocalLookAngles;
+    Vector actualHeadAngle, actualTorsoAngle;
 
-		name = ev->GetConstString(1);
+    Animate::DumpAnimInfo();
 
-		if (m_ThinkState <= THINKSTATE_ATTACK || IsGrenadeState(m_ThinkState))
-		{
-			m_csSayAnim = name;
-			//FIXME: macro
-			m_bNextLevelSayAnim = 1;
-		}
-		else
-		{
-			if (!SoundSayAnim(name, 1) )
-			{
-				m_csSayAnim = name;
-				//FIXME: macro
-				m_bNextLevelSayAnim = 1;
-			}
+    if (m_bHasDesiredLookAngles) {
+        VectorCopy(m_DesiredLookAngles, LocalLookAngles);
+    } else {
+        VectorClear(LocalLookAngles);
+    }
 
-		}
-	}
-	else if (m_bLevelSayAnim == 1)
-	{
-		AnimFinished(m_iSaySlot, true);
-	}
+    actualHeadAngle  = GetControllerAngles(HEAD_TAG);
+    actualTorsoAngle = GetControllerAngles(TORSO_TAG);
+
+    MPrintf(
+        "Desired look yaw: %.1f, pitch: %.1f.  Head yaw: %.1f, pitch %.1f.  Torso yaw: %.1f, pitch: %.1f\n",
+        LocalLookAngles[1],
+        LocalLookAngles[0],
+        actualHeadAngle[1],
+        actualHeadAngle[0],
+        actualTorsoAngle[1],
+        actualTorsoAngle[0]
+    );
 }
 
 /*
 ===============
-Actor::EventSayAnim
+Actor::DumpCallTrace
 
-Play idle dialogue.
+Dump useful debug info.
 ===============
 */
-void Actor::EventSayAnim
-	(
-	Event *ev
-	)
+const char *Actor::DumpCallTrace(const char *pszFmt, ...) const
 {
-	const_str name;
-	if (ev->NumArgs())
-	{
-		if (ev->NumArgs() != 1)
-		{
-			ScriptError("bad number of arguments");
-		}
+    char    szTemp[65536];
+    int     i;
+    int     i1, i2;
+    char    szFile[MAX_QPATH];
+    Vector  vPlayer;
+    time_t  t;
+    tm     *ptm;
+    cvar_t *sv_mapname;
 
-		name = ev->GetConstString(1);
+    va_list args;
 
-		if (m_ThinkState <= THINKSTATE_KILLED || !SoundSayAnim(name, 2))
-		{
-			m_csSayAnim = name;
-			//FIXME: macro
-			m_bNextLevelSayAnim = 2;
-			gi.DPrintf("Actor::EventSayAnim: 1 %s\n", targetname.c_str());
-		}
-		gi.DPrintf("Actor::EventSayAnim: 2 %s\n", targetname.c_str());
-	}
-	else if (m_bLevelSayAnim == 1)
-	{
-		AnimFinished(m_iSaySlot, true);
-		gi.DPrintf("Actor::EventSayAnim: 3 %s\n", targetname.c_str());
-	}
-	gi.DPrintf("Actor::EventSayAnim: 4 %s\n", targetname.c_str());
+    va_start(args, pszFmt);
+
+    sv_mapname = gi.Cvar_Get("mapname", "unknown", 0);
+
+    Player *p = (Player *)G_GetEntity(0);
+    if (p) {
+        vPlayer = p->origin;
+    }
+
+    i1 = Com_sprintf(
+        szTemp,
+        sizeof(szTemp),
+        "map = %s\n"
+        "time = %i (%i:%02i)\n"
+        "entnum = %i, targetname = '%s'\n"
+        "origin = (%g %g %g)\n"
+        "think = %s, thinkstate = %s\n"
+        "type_idle = %s\n"
+        "type_attack = %s\n"
+        "m_State = %i, m_pszDebugState = %s\n"
+        "player is at (%g %g %g)\n"
+        "--------------------------------------\n",
+        sv_mapname->string,
+        level.inttime,
+        level.inttime / 60000,
+        level.inttime / 1000 - 60 * (level.inttime / 60000),
+        entnum,
+        targetname.c_str(),
+        origin[0],
+        origin[1],
+        origin[2],
+        ThinkName().c_str(),
+        ThinkStateName().c_str(),
+        Director.GetString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]).c_str(),
+        Director.GetString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]).c_str(),
+        m_State,
+        m_pszDebugState,
+        vPlayer[0],
+        vPlayer[1],
+        vPlayer[2]
+    );
+
+    i2 = i1;
+    if (pszFmt) {
+        va_list args2;
+        va_copy(args2, args);
+        i2 = i1 + Q_vsnprintf(szTemp + i1, sizeof(szTemp) - i1, pszFmt, args);
+    }
+
+    va_end(args);
+
+    if (i1 != i2) {
+        strcpy(&szTemp[i2], "\n--------------------------------------\n");
+    }
+
+    t   = time(0);
+    ptm = localtime(&t);
+    Com_sprintf(
+        szFile,
+        sizeof(szFile),
+        "main\\ai_trace_%s_%i_%i_%02i%02i.log",
+        sv_mapname->string,
+        ptm->tm_mon + 1,
+        ptm->tm_mday,
+        ptm->tm_hour,
+        ptm->tm_min
+    );
+
+    for (i = 5; szFile[i]; i++) {
+        if (szFile[i] == '\\' || szFile[i] == '/') {
+            szFile[i] = '_';
+        }
+    }
+
+    fprintf(stderr, "IMPORTANT: Include '%s' in your bug report!\n", szFile);
+
+    return va(
+        "\n"
+        "\t-------------------------- IMPORTANT REMINDER --------------------------\n"
+        "\n"
+        "\tinclude '%s' in your bug report! \n"
+        "\n"
+        "\t----------------------- END IMPORTANT REMINDER -----------------------\n"
+        "\n"
+        "%s",
+        szFile,
+        &szTemp[i1]
+    );
 }
 
 /*
 ===============
-Actor::EventSetSayAnim
-
-Set say animation.
+Actor::EventSetMoveDoneRadius
 ===============
 */
-void Actor::EventSetSayAnim
-	(
-	Event *ev
-	)
+void Actor::EventSetMoveDoneRadius(Event *ev)
 {
-	const_str name;
-	str sName;
-	if (ev->NumArgs() != 1)
-	{
-		ScriptError("bad number of arguments");
-	}
-
-	if (m_bLevelSayAnim == 0)
-	{
-		name = ev->GetConstString(1);
-
-		parm.sayfail = qtrue;
-		sName = Director.GetString(name);
-		int animnum = gi.Anim_NumForName(edict->tiki, sName.c_str());
-
-		Com_Printf("EventSetSayAnim sName: %s, animnum: %d, mVoiceType: %d\n", sName.c_str(), animnum, mVoiceType);
-		if (!SoundSayAnim(name, m_bLevelSayAnim))
-		{
-			int flags = gi.Anim_FlagsSkel(edict->tiki, animnum);
-			if (flags & TAF_HASUPPER)
-			{
-				if (m_bLevelActionAnim)
-				{
-					if (!m_bSayAnimSet)
-					{
-						m_iSaySlot = m_iActionSlot;
-					}
-					return;
-				}
-				if (flags & TAF_HASDELTA)
-				{
-					if (m_bLevelMotionAnim)
-					{
-						if (!m_bSayAnimSet)
-						{
-							m_iSaySlot = m_iMotionSlot;
-						}
-						return;
-					}
-					ChangeActionAnim();
-					ChangeMotionAnim();
-					StartMotionAnimSlot(0, animnum, 1.0);
-
-					m_iMotionSlot = m_iActionSlot = GetMotionSlot(0);
-				}
-				else
-				{
-					ChangeActionAnim();
-					m_bActionAnimSet = true;
-					StartActionAnimSlot(animnum);
-					m_iActionSlot = GetActionSlot(0);
-				}
-				ChangeSayAnim();
-				m_bSayAnimSet = true;
-				m_iSaySlot = m_iActionSlot;
-			}
-			else
-			{
-				ChangeSayAnim();
-				m_bSayAnimSet = true;
-				StartSayAnimSlot(animnum);
-				m_iSaySlot = GetSaySlot();
-
-			}
-
-		}
-		parm.sayfail = qfalse;
-	}
+    float radius             = ev->GetFloat(1);
+    m_fMoveDoneRadiusSquared = Square(radius);
 }
 
 /*
 ===============
-Actor::EventSetMotionAnim
-
-Set motion animation.
+Actor::EventGetMoveDoneRadius
 ===============
 */
-void Actor::EventSetMotionAnim
-	(
-	Event *ev
-	)
+void Actor::EventGetMoveDoneRadius(Event *ev)
 {
-	gi.DPrintf("Actor::EventSetMotionAnim\n");
-
-	if (ev->NumArgs() != 1)
-	{
-		ScriptError("bad number of arguments");
-	}
-	const_str anim = ev->GetConstString(1);
-	str animstr = Director.GetString(anim);
-	int animnum = gi.Anim_NumForName(edict->tiki, animstr.c_str());
-	if (animnum == -1)
-	{
-		UnknownAnim(animstr.c_str(), edict->tiki);
-	}
-
-	gi.DPrintf("Actor::EventSetMotionAnim %s %d\n", animstr.c_str(), animnum);
-	parm.motionfail = qtrue;
-
-	if (!m_bLevelMotionAnim)
-	{
-		ChangeMotionAnim();
-		m_bMotionAnimSet = true;
-		StartMotionAnimSlot(0, animnum, 1.0);
-		m_iMotionSlot = GetMotionSlot(0);
-		parm.motionfail = qfalse;
-	}
+    ev->AddFloat(sqrtf(m_fMoveDoneRadiusSquared));
 }
 
 /*
 ===============
-Actor::EventSetAimMotionAnim
+Actor::StoppedWaitFor
 
-Set aim motion animation.
+Called when stopped wait for an actor.
 ===============
 */
-void Actor::EventSetAimMotionAnim
-	(
-	Event *ev
-	)
+void Actor::StoppedWaitFor(const_str name, bool bDeleting)
 {
-	int anim_crouch, anim_stand, anim_high;
-	const_str name;
-	if (ev->NumArgs() != 3)
-	{
-		ScriptError("bad number of arguments");
-	}
+    g_iInThinks++;
 
-	//FIXME: maybe inline func ?
+    GlobalFuncs_t *func = &GlobalFuncs[CurrentThink()];
 
-	name = ev->GetConstString(1);
-	anim_crouch = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str());
-	if (anim_crouch == -1)
-	{
-		UnknownAnim(Director.GetString(name).c_str(), edict->tiki);
-	}
-
-	name = ev->GetConstString(2);
-	anim_stand = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str());
-	if (anim_stand == -1)
-	{
-		UnknownAnim(Director.GetString(name).c_str(), edict->tiki);
-	}
-
-	name = ev->GetConstString(3);
-	anim_high = gi.Anim_NumForName(edict->tiki, Director.GetString(name).c_str());
-	if (anim_high == -1)
-	{
-		UnknownAnim(Director.GetString(name).c_str(), edict->tiki);
-	}
-
-
-	parm.motionfail = qtrue;
-
-	if (!m_bLevelMotionAnim)
-	{
-		ChangeMotionAnim();
-		m_bMotionAnimSet = true;
-		UpdateAimMotion();
-		StartAimMotionAnimSlot(0, anim_crouch);
-		StartAimMotionAnimSlot(1, anim_stand);
-		StartAimMotionAnimSlot(2, anim_high);
-		m_iMotionSlot = GetMotionSlot(1);
-		parm.motionfail = qfalse;
-	}
+    if (func->FinishedAnimation) {
+        (this->*func->FinishedAnimation)();
+    }
 
+    g_iInThinks--;
 }
 
 /*
 ===============
-Actor::EventSetActionAnim
-
-Set action animation.
+Actor::EventHasCompleteLookahead
 ===============
 */
-void Actor::EventSetActionAnim
-	(
-	Event *ev
-	)
+void Actor::EventHasCompleteLookahead(Event *ev)
 {
-	if (ev->NumArgs() != 3)
-	{
-		ScriptError("bad number of arguments");
-	}
-
-	m_fAimLimit_down = ev->GetFloat(2);
-	if (m_fAimLimit_down > 0)
-	{
-		m_fAimLimit_down = -0.001f;
-		ScriptError("Positive lower_limit not allowed");
-	}
-
-	m_fAimLimit_up = ev->GetFloat(3);
-	if (m_fAimLimit_up <= 0)
-	{
-		m_fAimLimit_up = 0.001f;
-		ScriptError("Negative upper_limit not allowed");
-	}
-
-	const_str anim = ev->GetConstString(1);
-	int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-	if (animnum == -1)
-	{
-		UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-	}
-	
-	const_str anim2 = ev->GetConstString(2);
-	int animnum2 = gi.Anim_NumForName(edict->tiki, Director.GetString(anim2));
-	if (animnum2 == -1)
-	{
-		UnknownAnim(Director.GetString(anim2).c_str(), edict->tiki);
-	}
-
-	const_str anim3 = ev->GetConstString(3);
-	int animnum3 = gi.Anim_NumForName(edict->tiki, Director.GetString(anim3));
-	if (animnum3 == -1)
-	{
-		UnknownAnim(Director.GetString(anim3).c_str(), edict->tiki);
-	}
-	
-	parm.upperfail = qtrue;
-	if (!m_bLevelActionAnim)
-	{
-		ChangeActionAnim();
-		m_bAimAnimSet = true;
-		m_bActionAnimSet = true;
-		UpdateAim();
-		
-		StartAimAnimSlot(0, animnum);
-		StartAimAnimSlot(1, anim2);
-		StartAimAnimSlot(2, anim3);
-		m_iActionSlot = GetActionSlot(0);
-		parm.upperfail = qfalse;
-	}
+    ev->AddInteger(PathExists() && PathHasCompleteLookahead());
 }
 
 /*
 ===============
-Actor::EventUpperAnim
-
-Set upper body.
+Actor::EventPathDist
 ===============
 */
-void Actor::EventUpperAnim
-	(
-	Event *ev
-	)
+void Actor::EventPathDist(Event *ev)
 {
-	if (ev->NumArgs())
-	{
-		if (ev->NumArgs() != 1)
-		{
-			ScriptError("bad number of arguments");
-		}
-		const_str anim = ev->GetConstString(1);
-		int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-		if (animnum == -1)
-		{
-			UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-		}
+    if (!PathExists() || PathComplete()) {
+        ev->AddFloat(0);
+        return;
+    }
 
-		m_csUpperAnim = anim;
-	}
-	else if (m_bLevelActionAnim)
-	{
-		AnimFinished(m_iActionSlot, true);
-	}
+    ev->AddFloat(PathDist());
 }
 
 /*
 ===============
-Actor::EventSetUpperAnim
-
-Set upper body animation.
+Actor::EventCanShootEnemyFrom
 ===============
 */
-void Actor::EventSetUpperAnim
-	(
-	Event *ev
-	)
+void Actor::EventCanShootEnemyFrom(Event *ev)
 {
-	if (ev->NumArgs() != 1)
-	{
-		ScriptError("bad number of arguments");
-	}
+    if (!m_Enemy) {
+        ev->AddInteger(false);
+        return;
+    }
 
-	const_str anim = ev->GetConstString(1);
-	int animnum = gi.Anim_NumForName(edict->tiki, Director.GetString(anim).c_str());
-	if (animnum == -1)
-	{
-		UnknownAnim(Director.GetString(anim).c_str(), edict->tiki);
-	}
-
-	parm.upperfail = qtrue;
-	if (!m_bLevelActionAnim)
-	{
-		ChangeActionAnim();
-		m_bActionAnimSet = true;
-		StartActionAnimSlot(animnum);
-		m_iActionSlot = SimpleActor::GetActionSlot(0);
-		parm.upperfail = qfalse;
-	}
+    ev->AddInteger(CanSeeFrom(ev->GetVector(1), m_Enemy));
 }
 
 /*
 ===============
-Actor::EventSetUpperAnim
-
-End action animation.
+Actor::EventSetInReload
 ===============
 */
-void Actor::EventEndActionAnim
-	(
-	Event *ev
-	)
+void Actor::EventSetInReload(Event *ev)
 {
-	parm.upperfail = qtrue;
-	if (!m_bLevelActionAnim)
-	{
-		ChangeActionAnim();
-		parm.upperfail = qfalse;
-	}
+    m_bInReload = ev->GetBoolean(1);
 }
 
 /*
 ===============
-Actor::EventDamagePuff
-
-Spawns a puff of 'blood' smoke at the speficied location in the specified direction.
+Actor::EventGetInReload
 ===============
 */
-void Actor::EventDamagePuff
-	(
-	Event *ev
-	)
+void Actor::EventGetInReload(Event *ev)
 {
-	
-	Vector pos = ev->GetVector(1), dir = ev->GetVector(2);
-	gi.SetBroadcastVisible(pos, NULL);
-	//FIXME: macro
-	gi.MSG_StartCGM(7);
-	gi.MSG_WriteCoord(pos.x);
-	gi.MSG_WriteCoord(pos.y);
-	gi.MSG_WriteCoord(pos.z);
-
-	gi.MSG_WriteDir(dir);
-	gi.MSG_WriteBits(0, 1);
-	gi.MSG_EndCGM();
+    ev->AddInteger(m_bInReload);
 }
 
 /*
 ===============
-Actor::SafeSetOrigin
-
-Safe set origin.
+Actor::EventSetReloadCover
 ===============
 */
-void Actor::SafeSetOrigin
-	(
-	vec3_t newOrigin
-	)
+void Actor::EventSetReloadCover(Event *ev)
 {
-	if (newOrigin == origin)
-	{
-		return;
-	}
-
-	setOrigin(newOrigin);
-
-	if (!m_bNoPlayerCollision)
-	{
-		Player *p = (Player *)G_GetEntity(0);
-		if (p && IsTouching(p))
-		{
-			Com_Printf("(entnum %d, radnum %d) is going not solid to not get stuck in the player\n", entnum, radnum);
-			m_bNoPlayerCollision = true;
-			setSolidType(SOLID_NOT);
-		}
-	}
+    m_bNeedReload = ev->GetBoolean(1);
 }
 
 /*
 ===============
-Actor::DoMove
-
-Move the actor based on m_eAnimMode.
+Actor::EventBreakSpecial
 ===============
 */
-void Actor::DoMove
-	(
-	void
-	)
+void Actor::EventBreakSpecial(Event *ev)
 {
-	mmove_t mm;
-	//FIXME: macros
-	if (m_bDoPhysics
-		&& m_iOriginTime != level.inttime
-		&& !m_pGlueMaster
-		&& !bindmaster)
-	{
-		switch (m_eAnimMode)
-		{
-		case 1://normal i guess ?
-		{
-			SetMoveInfo(&mm);
-
-			VectorCopy2D(frame_delta, mm.desired_dir);
-			float frameDeltaLen = VectorNormalize2D(mm.desired_dir);
-
-			mm.desired_speed = frameDeltaLen / level.frametime;
-
-			if (mm.desired_speed > m_maxspeed)
-				mm.desired_speed = m_maxspeed;
-
-			MmoveSingle(&mm);
-			GetMoveInfo(&mm);
-
-		}
-			break;
-		case 2://path
-		{
-			MovePath(frame_delta.length() / level.frametime);
-		}
-			break;
-		case 3://path_goal (end) ?
-		{
-			MovePathGoal(frame_delta.length() / level.frametime);
-		}
-			break;
-		case 4://dest
-		{
-			MoveDest(frame_delta.length() / level.frametime);
-		}
-			break;
-		case 5://scripted
-		{
-			trace_t trace;
-			trace = G_Trace(origin, mins, maxs, frame_delta + origin, this, edict->clipmask & 0xF9FFE47D, qtrue, "Actor");
-			SafeSetOrigin(trace.endpos);
-			velocity = frame_delta / level.frametime;
-		}
-			break;
-		case 6://noclip
-		{
-			SafeSetOrigin(frame_delta+origin);
-			velocity = frame_delta / level.frametime;
-		}
-			break;
-		case 7://falling path
-		{
-			SafeSetOrigin(m_pFallPath->pos[m_pFallPath->currentPos]);
-			m_pFallPath->currentPos++;
-			velocity = vec_zero;
-		}
-			break;
-		default:
-			break;
-		}
-		m_maxspeed = 1000000.0f;
-	}
+    mbBreakSpecialAttack = true;
 }
 
 /*
 ===============
-Actor::AnimFinished
-
+Actor::EventCanShoot
 ===============
 */
-void Actor::AnimFinished
-	(
-	int slot,
-	bool stop
-	)
+void Actor::EventCanShoot(Event *ev)
 {
-	if (stop && slot >= 0)
-		animFlags[slot] |= ANIM_NOACTION;
-	if (slot == m_iMotionSlot)
-	{
-		if (stop)
-		{
-			m_bLevelMotionAnim = false;
-			m_iMotionSlot = -1;
-		}
-		MPrintf("flagged anim finished slot %d\n", slot);
-		Unregister(STRING_FLAGGEDANIMDONE);
-	}
-	if (slot == m_iActionSlot)
-	{
-		if (stop)
-			ChangeActionAnim();
-		if (m_csUpperAnim == STRING_EMPTY)
-		{
-			MPrintf("upper anim finished slot %d\n", slot);
-			Unregister(STRING_UPPERANIMDONE);
-		}
-	}
-	if (slot == m_iSaySlot)
-	{
-		if (stop)
-			ChangeSayAnim();
-		if (m_csSayAnim == STRING_EMPTY)
-		{
-			MPrintf("say anim finished slot %d\n", slot);
-			//gi.DPrintf("unregister STRING_SAYDONE\n");
-			Unregister(STRING_SAYDONE);
-		}
-	}
-	else if (slot == GetSaySlot() && stop)
-	{
-		ChangeSayAnim();
-	}
+    Entity *ent;
+
+    ent = ev->GetEntity(1);
+
+    if (!ent) {
+        ScriptError("canshoot applied to NULL listener");
+    }
+
+    ev->AddInteger(CanShoot(ent));
 }
 
 /*
 ===============
-Actor::AnimFinished
-
+Actor::EventSetBalconyHeight
 ===============
 */
-void Actor::AnimFinished
-	(
-	int slot
-	)
+void Actor::EventSetBalconyHeight(Event *ev)
 {
-	animFlags[slot] &= ~ANIM_FINISHED;
-	AnimFinished(slot, ((animFlags[slot] & ANIM_LOOP) != ANIM_LOOP));
+    m_fBalconyHeight = ev->GetFloat(1);
 }
 
 /*
 ===============
-Actor::PlayAnimation
-
-Play animation
+Actor::EventSetIgnoreBadPlace
 ===============
 */
-void Actor::PlayAnimation
-	(
-	Event *ev
-	)
+void Actor::EventSetIgnoreBadPlace(Event *ev)
 {
-	Event e1(EV_Listener_ExecuteScript);
-	e1.AddConstString(STRING_GLOBAL_ANIM_SCR);
-	e1.AddValue(ev->GetValue(1));
-	ExecuteScript(&e1);
+    if (m_bIgnoreBadPlace == ev->GetBoolean(1)) {
+        return;
+    }
+
+    m_bIgnoreBadPlace = ev->GetBoolean(1);
+
+    if (level.m_badPlaces.NumObjects() && m_bIgnoreBadPlace) {
+        UpdateBadPlaces();
+    }
 }
 
 /*
 ===============
-Actor::PlayScriptedAnimation
-
-Play scripted animation
+Actor::EventGetIgnoreBadPlace
 ===============
 */
-void Actor::PlayScriptedAnimation
-	(
-	Event *ev
-	)
+void Actor::EventGetIgnoreBadPlace(Event *ev)
 {
-	Event e1(EV_Listener_ExecuteScript);
-	e1.AddConstString(STRING_GLOBAL_ANIM_SCRIPTED_SCR);
-	e1.AddValue(ev->GetValue(1));
-	ExecuteScript(&e1);
+    ev->AddInteger(m_bIgnoreBadPlace);
 }
 
 /*
 ===============
-Actor::PlayNoclipAnimation
-
-Play noclip animation
+Actor::EventGetBalconyHeight
 ===============
 */
-void Actor::PlayNoclipAnimation
-	(
-	Event *ev
-	)
+void Actor::EventGetBalconyHeight(Event *ev)
 {
-	Event e1(EV_Listener_ExecuteScript);
-	e1.AddConstString(STRING_GLOBAL_ANIM_NOCLIP_SCR);
-	e1.AddValue(ev->GetValue(1));
-	ExecuteScript(&e1);
+    ev->AddFloat(m_fBalconyHeight);
 }
 
 /*
 ===============
-Actor::MoveDest
-
-Play noclip animation
+Actor::BecomeTurretGuy
 ===============
 */
-void Actor::MoveDest
-	(
-	float fMoveSpeed
-	)
+void Actor::BecomeTurretGuy(void)
 {
-	mmove_t mm;
-	vec2_t offset;
+    SetThinkIdle(THINK_IDLE);
 
-	SetMoveInfo(&mm);
+    SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
+    SetThink(THINKSTATE_GRENADE, THINK_GRENADE);
 
-	if (fMoveSpeed > m_maxspeed)
-		fMoveSpeed = m_maxspeed;
-
-	mm.desired_speed = fMoveSpeed;
-
-	VectorSub2D(m_Dest, origin, offset);
-
-	VectorNormalize2D2(offset, mm.desired_dir);
-
-	MmoveSingle(&mm);
-
-	GetMoveInfo(&mm);
-}
-
-/*
-===============
-Actor::MovePath
-
-Move on path.
-===============
-*/
-void Actor::MovePath
-	(
-	float fMoveSpeed
-	)
-{
-	//FIXME: macros
-	mmove_t mm;
-
-
-
-	SetMoveInfo(&mm);
-
-	mm.desired_speed = fMoveSpeed;
-	if (mm.desired_speed > m_maxspeed)
-	{
-		mm.desired_speed = m_maxspeed;
-	}
-
-	m_Path.UpdatePos(origin);
-
-	if (ai_debugpath->integer)
-	{
-
-		Vector pos, dest;
-		pos = origin;
-		pos.z += 32;
-		dest = m_Path.CurrentDelta();
-		dest += origin;
-		dest.z += 32;
-		G_DebugLine(pos, dest, 1, 0, 0, 1);
-		for (PathInfo *current_path = m_Path.CurrentNode(); current_path != m_Path.LastNode(); current_path = m_Path.NextNode())
-		{
-			pos = current_path->point;
-			pos.z += 32;
-
-			dest = m_Path.NextNode()->point;
-			dest.z += 32;
-			G_DebugLine(pos, dest, 0, 1, 0, 1);
-		}
-	}
-
-	VectorCopy2D(m_Path.CurrentDelta(), mm.desired_dir);
-
-	MmoveSingle(&mm);
-	if (!mm.hit_obstacle)
-	{
-		if (m_WallDir)
-		{
-			if (level.inttime >= m_iWallDodgeTimeout)
-			{
-				m_WallDir = 0;
-			}
-			else
-			{
-				if (DotProduct2D(mm.desired_dir, m_PrevObstacleNormal) > 0 && CrossProduct2D(mm.desired_dir, m_PrevObstacleNormal) < 0)
-				{
-					m_iWallDodgeTimeout = level.inttime + 1000;
-					m_WallDir = -m_WallDir;
-				}
-			}
-		}
-		GetMoveInfo(&mm);
-		return;
-	}
-
-	velocity.copyTo(mm.velocity);
-	origin.copyTo(mm.origin);
-	mm.groundPlane = m_groundPlane;
-	mm.walking = m_walking;
-	m_groundPlaneNormal.copyTo(mm.groundPlaneNormal);
-	VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
-
-	m_Path.UpdatePos(mm.hit_origin);
-	if (!m_Path.NextNode())
-	{
-		if (!m_WallDir)
-		{
-			auto dir = m_Path.CurrentDelta();
-			if (m_Path.NextNode())
-			{
-				dir = m_Path.NextNode()->dir;
-			}
-
-			if (dir[1] * mm.obstacle_normal[0] < dir[0] * mm.obstacle_normal[1])
-			{
-				mm.desired_dir[0] = mm.obstacle_normal[0];
-				mm.desired_dir[1] = -mm.obstacle_normal[1];
-				m_WallDir = 1;
-			}
-			else
-			{
-				mm.desired_dir[0] = -mm.obstacle_normal[0];
-				mm.desired_dir[1] = mm.obstacle_normal[1];
-				m_WallDir = -1;
-			}
-			MmoveSingle(&mm);
-			if (!mm.hit_obstacle)
-			{
-				m_iWallDodgeTimeout = level.inttime + 1000;
-			}
-			else
-			{
-				m_WallDir = 0;
-				m_iWallDodgeTimeout = 0;
-			}
-			GetMoveInfo(&mm);
-			return;
-		}
-	}
-
-	if (! (m_Path.NextNode() && m_Path.NextNode()->bAccurate && m_Path.IsSide()) )
-	{
-		if (m_WallDir)
-		{
-			if (m_WallDir < 0)
-			{
-				mm.desired_dir[0] = -mm.obstacle_normal[1];
-				mm.desired_dir[1] = mm.obstacle_normal[0];
-			}
-			else
-			{
-				mm.desired_dir[0] = mm.obstacle_normal[1];
-				mm.desired_dir[1] = -mm.obstacle_normal[0];
-			}
-			MmoveSingle(&mm);
-			if (mm.hit_obstacle)
-			{
-				m_WallDir = 0;
-				m_iWallDodgeTimeout = 0;
-			}
-			GetMoveInfo(&mm);
-			return;
-		}
-		else
-		{
-
-			auto dir = m_Path.CurrentDelta();
-			auto pNextNode = m_Path.NextNode();
-
-			if (pNextNode)
-			{
-				dir = pNextNode->dir;
-			}
-
-			vec2_t vDelta;
-			vDelta[0] = pNextNode->point[1] - mm.hit_origin[0];
-			vDelta[1] = pNextNode->point[0] - mm.hit_origin[1];
-
-			if (DotProduct2D(dir, vDelta) >= 0)
-			{
-				float fCross = CrossProduct2D(dir, vDelta);
-				if (fCross <= -16)
-				{
-					mm.desired_dir[1] = mm.obstacle_normal[0];
-					mm.desired_dir[0] = -mm.obstacle_normal[1];
-				}
-				else
-				{
-					if (fCross >= 16)
-					{
-					
-						mm.desired_dir[0] = mm.obstacle_normal[1];
-						mm.desired_dir[1] = -mm.obstacle_normal[0];
-						MmoveSingle(&mm);
-						GetMoveInfo(&mm);
-						return;
-					}
-				}
-			}
-			{
-				if (!m_WallDir)
-				{
-					auto dir = m_Path.CurrentDelta();
-					if (m_Path.NextNode())
-					{
-						dir = m_Path.NextNode()->dir;
-					}
-
-					if (dir[1] * mm.obstacle_normal[0] < dir[0] * mm.obstacle_normal[1])
-					{
-						mm.desired_dir[0] = mm.obstacle_normal[1];
-						mm.desired_dir[1] = -mm.obstacle_normal[0];
-						m_WallDir = 1;
-					}
-					else
-					{
-						mm.desired_dir[0] = -mm.obstacle_normal[1];
-						mm.desired_dir[1] = mm.obstacle_normal[0];
-						m_WallDir = -1;
-					}
-					MmoveSingle(&mm);
-					if (!mm.hit_obstacle)
-					{
-						m_iWallDodgeTimeout = level.inttime + 1000;
-					}
-					else
-					{
-						m_WallDir = 0;
-						m_iWallDodgeTimeout = 0;
-					}
-					GetMoveInfo(&mm);
-					return;
-				}
-				else if (m_WallDir < 0)
-				{
-					mm.desired_dir[0] = -mm.obstacle_normal[1];
-					mm.desired_dir[1] = mm.obstacle_normal[0];
-				}
-				else
-				{
-					mm.desired_dir[0] = mm.obstacle_normal[1];
-					mm.desired_dir[1] = -mm.obstacle_normal[0];
-				}
-				MmoveSingle(&mm);
-				if (mm.hit_obstacle)
-				{
-					m_WallDir = 0;
-					m_iWallDodgeTimeout = 0;
-				}
-				GetMoveInfo(&mm);
-				return;
-			}
-		}
-	}
-
-	m_iWallDodgeTimeout = level.inttime + 1000;
-
-	{
-		auto dir = m_Path.CurrentDelta();
-		auto pNextNode = m_Path.NextNode();
-
-		if (pNextNode)
-		{
-			dir = pNextNode->dir;
-		}
-
-		vec2_t vDelta;
-		vDelta[0] = pNextNode->point[1] - mm.hit_origin[0];
-		vDelta[1] = pNextNode->point[0] - mm.hit_origin[1];
-
-		if (vDelta[0] * dir[1] <= vDelta[1] * dir[0])
-		{
-			mm.desired_dir[0] = mm.obstacle_normal[1];
-			mm.desired_dir[1] = -mm.obstacle_normal[0];
-			m_WallDir = 1;
-		}
-		else
-		{
-			mm.desired_dir[0] = -mm.obstacle_normal[1];
-			mm.desired_dir[1] = mm.obstacle_normal[0];
-			m_WallDir = -1;
-		}
-		MmoveSingle(&mm);
-		if (mm.hit_obstacle)
-		{
-			VectorCopy(velocity, mm.velocity);
-			VectorCopy(origin, mm.origin);
-			mm.groundPlane = m_groundPlane;
-			mm.walking = m_walking;
-			VectorCopy(m_groundPlaneNormal, mm.groundPlaneNormal);
-
-			VectorCopy2D(mm.obstacle_normal, m_PrevObstacleNormal);
-
-			if (m_WallDir == char(-1))
-			{
-				mm.desired_dir[0] = -mm.obstacle_normal[1];
-				mm.desired_dir[1] = mm.obstacle_normal[0];
-			}
-			else
-			{
-				mm.desired_dir[0] = mm.obstacle_normal[1];
-				mm.desired_dir[1] = -mm.obstacle_normal[0];
-			}
-			MmoveSingle(&mm);
-		}
-	}
-	GetMoveInfo(&mm);
-}
-
-/*
-===============
-Actor::MovePathGoal
-
-Move on path end(goal).
-===============
-*/
-void Actor::MovePathGoal
-	(
-	float fMoveSpeed
-	)
-{
-	float fTimeToGo, fDeltaSquareLen, fSlowdownSpeed;
-	vec2_t vDelta;
-
-	if (!m_Path.HasCompleteLookahead())
-	{
-		MovePath(fMoveSpeed);
-		m_fPathGoalTime = 0;
-		return;
-	}
-	fTimeToGo = m_fPathGoalTime - level.time;
-
-
-	VectorSub2D(origin, m_Path.LastNode()->point, vDelta);
-
-	fDeltaSquareLen = VectorLength2DSquared(vDelta);
-	if (fTimeToGo <= -0.001)
-	{
-		if (fDeltaSquareLen < (Square(fMoveSpeed * Square(0.5))))
-		{
-			fTimeToGo = 0.5;
-			m_fPathGoalTime = level.time + fTimeToGo;
-			if (m_csPathGoalEndAnimScript == STRING_EMPTY)
-			{
-				m_csPathGoalEndAnimScript = STRING_ANIM_IDLE_SCR;
-			}
-			m_bStartPathGoalEndAnim = true;
-		}
-		else
-		{
-			MovePath(fMoveSpeed);
-			m_fPathGoalTime = 0;
-			return;
-		}
-	}
-
-	fSlowdownSpeed = sqrt(fDeltaSquareLen) * (2 / (fTimeToGo + level.frametime));
-	if (fSlowdownSpeed > fMoveSpeed + 0.001 && fSlowdownSpeed > 0.4 * sv_runspeed->value)
-	{
-		m_fPathGoalTime = 0;
-		StartAnimation(3, m_Anim);
-		MovePath(fMoveSpeed);
-	}
-	else
-	{
-		MovePath(fSlowdownSpeed);
-		if (level.time >= m_fPathGoalTime)
-		{
-			m_eAnimMode = 1;
-			Com_Printf("m_eAnimMode MovePathGoal \n");
-		}
-	}
-}
-
-/*
-===============
-Actor::Dumb
-
-Make actor dumb.
-===============
-*/
-void Actor::Dumb
-	(
-	Event *ev
-	)
-{
-	Event e1(EV_Listener_ExecuteScript);
-	e1.AddConstString(STRING_GLOBAL_DISABLE_AI_SCR);
-	ExecuteScript(&e1);
-}
-
-/*
-===============
-Actor::PhysicsOn
-
-Enable physics.
-===============
-*/
-void Actor::PhysicsOn
-	(
-	Event *ev
-	)
-{
-	m_bDoPhysics = true;
-}
-
-/*
-===============
-Actor::PhysicsOn
-
-Disable PhysicsOff.
-===============
-*/
-void Actor::PhysicsOff
-	(
-	Event *ev
-	)
-{
-	m_bDoPhysics = false;
-}
-
-/*
-===============
-Actor::EventStart
-
-Initialize actor.
-===============
-*/
-void Actor::EventStart
-	(
-	Event *ev
-	)
-{
-	ResolveVoiceType();
-	setSize(MINS, MAXS);//notsure
-
-	droptofloor(16384);
-	
-	SetControllerTag( HEAD_TAG, gi.Tag_NumForName( edict->tiki, "Bip01 Head" ) );
-	SetControllerTag( TORSO_TAG, gi.Tag_NumForName( edict->tiki, "Bip01" ) );
-	SetControllerTag( ARMS_TAG, gi.Tag_NumForName( edict->tiki, "Bip01 L UpperArm" ) );
-
-	JoinNearbySquads();
-
-	if (level.Spawned())
-	{
-		Unregister(STRING_SPAWN);
-	}
-}
-
-/*
-===============
-Actor::EventGetMood
-
-Get current mood.
-===============
-*/
-void Actor::EventGetMood
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csMood);
-}
-
-/*
-===============
-Actor::EventSetMood
-
-Set current mood.
-===============
-*/
-void Actor::EventSetMood
-	(
-	Event *ev
-	)
-{
-	m_csMood = ev->GetConstString(1);
-	if (m_csMood > STRING_ALERT)
-	{
-		m_csMood = STRING_BORED;
-		ScriptError("invalid mood - setting to bored");
-	}
-}
-
-/*
-===============
-Actor::EventGetAngleYawSpeed
-
-Get current AngleYawSpeed.
-===============
-*/
-void Actor::EventGetAngleYawSpeed
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fAngleYawSpeed);
-}
-
-/*
-===============
-Actor::EventSetAngleYawSpeed
-
-Set current AngleYawSpeed.
-===============
-*/
-void Actor::EventSetAngleYawSpeed
-	(
-	Event *ev
-	)
-{
-	float speed = ev->GetFloat(1);
-	if (speed <= 0)
-	{
-		ScriptError("Attempting to set illegal turnspeed %f", speed);
-	}
-	m_fAngleYawSpeed = speed;
-}
-
-/*
-===============
-Actor::EventSetAimTarget
-
-Set current weapon's aim tagret.
-===============
-*/
-void Actor::EventSetAimTarget
-	(
-	Event *ev
-	)
-{
-	Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
-	weap->SetAimTarget(ev->GetEntity(1));
-}
-
-/*
-===============
-Actor::UpdateAngles
-
-Update current angles.
-===============
-*/
-void Actor::UpdateAngles
-	(
-	void
-	)
-{
-	float max_change, error, dist;
-
-	if (!m_YawAchieved)
-	{
-
-		error = m_DesiredYaw - angles[1];
-		if (error <= 180)
-		{
-			if (error < -180.0)
-				error += 360;
-		}
-		else
-		{
-			error -= 360;
-		}
-
-		dist = m_fAngleYawSpeed * level.frametime;
-		if (-dist <= error)
-		{
-			max_change = dist;
-			if (error <= dist)
-			{
-				max_change = error;
-				StopTurning();
-			}
-		}
-		else
-		{
-			max_change = -dist;
-		}
-		setAngles(Vector{0, angles[1] + max_change, 0});
-	}
-}
-
-/*
-===============
-Actor::SetLeashHome
-
-Set leash home.
-===============
-*/
-void Actor::SetLeashHome
-(
-	Vector vHome
-)
-{
-	if (!m_bFixedLeash)
-	{
-		m_vHome = vHome;
-	}
-}
-
-/*
-===============
-Actor::AimAtTargetPos
-
-Aim at mTargetPos.
-===============
-*/
-void Actor::AimAtTargetPos
-	(
-	void
-	)
-{
-	Vector vDir = mTargetPos - EyePosition() + Vector(0, 0, 16);
-	SetDesiredLookDir(vDir);
-	m_DesiredGunDir[0] = 360.0f - vDir.toPitch();
-	m_DesiredGunDir[1] = vDir.toYaw();
-	m_DesiredGunDir[2] = 0;
-
-	SetDesiredYawDir(vDir);
-}
-
-/*
-===============
-Actor::AimAtAimNode
-
-Aim at m_aimNode.
-===============
-*/
-void Actor::AimAtAimNode
-	(
-	void
-	)
-{
-	mTargetPos = m_aimNode->origin;
-
-	AimAtTargetPos();
+    if (CurrentThink() == THINK_TURRET && Turret_DecideToSelectState()) {
+        TransitionState(ACTOR_STATE_TURRET_COMBAT, 0);
+    }
 }
 
 /*
@@ -9847,4963 +12574,219 @@ Aiming at enemy behaviour.
 Usally called after SetEnemyPos()
 ===============
 */
-void Actor::AimAtEnemyBehavior
-	(
-	void
-	)
+void Actor::AimAtEnemyBehavior(void)
 {
-	AimAtTargetPos();
-
-	Anim_Aim();
+    AimAtTargetPos();
+    Anim_Aim();
 }
 
 /*
 ===============
-Actor::FaceMotion
-
+Actor::EventEnableEnemySwitch
 ===============
 */
-void Actor::FaceMotion
-	(
-	void
-	)
+void Actor::EventEnableEnemySwitch(Event *ev)
 {
-	Vector delta;
-
-	if (VectorLength2DSquared(velocity) > 1)
-	{
-		vec3_t dir;
-		velocity.copyTo(dir);
-		delta = origin - m_vOriginHistory[m_iCurrentHistory];
-
-		if (delta.lengthXYSquared() >= 1)
-		{
-			if (DotProduct2D(velocity, delta) > 0)
-			{
-				delta.copyTo(dir);
-			}
-		}
-
-		if (IsIdleState(m_ThinkState))
-		{
-			IdleLook(dir);
-		}
-		else
-		{
-			SetDesiredLookDir(dir);
-		}
-
-		SetDesiredYawDir(dir);
-	}
-	else if (IsIdleState(m_ThinkState) && m_pLookEntity)
-	{
-		LookAtLookEntity();
-	}
-	else
-	{
-		m_bHasDesiredLookAngles = false;
-	}
+    m_bEnemySwitch = true;
 }
 
 /*
 ===============
-Actor::FaceDirectionDuringMotion
-
-Face direction during motion.
+Actor::EventDisableEnemySwitch
 ===============
 */
-void Actor::FaceDirectionDuringMotion
-	(
-	vec3_t vLook
-	)
+void Actor::EventDisableEnemySwitch(Event *ev)
 {
-	float yaw;
-
-	SetDesiredLookDir(vLook);
-
-
-	if (velocity[0] != 0 || velocity[1] != 0)
-	{
-		float fMagsSquared = VectorLength2DSquared(vLook) * VectorLength2DSquared(velocity);
-		float fDot = DotProduct2D(velocity, vLook);
-		float fDotSquared = Square(fDot);
-
-		yaw = velocity.toYaw();
-
-		float fYaw2;
-		if (fMagsSquared * 0.5 < fDotSquared)
-		{
-			if (fDot >= 0)
-			{
-				fYaw2 = yaw;
-			}
-			else if (yaw - 180 >= 0)
-			{
-				fYaw2 = yaw - 180;
-			}
-			else
-			{
-				fYaw2 = yaw - 180 + 360;
-			}
-		}
-		else
-		{
-			if (vLook[0] * velocity[1] <= vLook[1] * velocity[0])
-			{
-				fYaw2 = yaw - 270;
-			}
-			else
-			{
-				fYaw2 = yaw - 90;
-			}
-
-			if (fYaw2 < 0)
-			{
-				fYaw2 += 360;
-			}
-		}
-
-		SetDesiredYaw(fYaw2);
-	}
-	else
-	{
-		SetDesiredYawDir(vLook);
-	}
-
+    m_bEnemySwitch = false;
 }
 
 /*
 ===============
-Actor::PathDistanceAlongVector
-
-Returns projected distance from vDir along path.
+Actor::EventSetRunAnimRate
 ===============
 */
-float Actor::PathDistanceAlongVector
-	(
-	vec3_t vDir
-	)
+void Actor::EventSetRunAnimRate(Event *ev)
 {
-	Vector vDelta = m_Path.CurrentDelta();
-
-	return DotProduct2D( vDelta, vDir );
+    m_fRunAnimRate = ev->GetFloat(1);
 }
 
 /*
 ===============
-Actor::FaceEnemyOrMotion
-
-
+Actor::EventGetRunAnimRate
 ===============
 */
-void Actor::FaceEnemyOrMotion
-	(
-	int iTimeIntoMove
-	)
+void Actor::EventGetRunAnimRate(Event *ev)
 {
-	Vector vDelta = origin - m_vLastEnemyPos;
-	vDelta.z = 0;
-	if (iTimeIntoMove > 999)
-	{
-		if (m_Path.CurrentNodeIndex() != m_sCurrentPathNodeIndex)
-		{
-			float fDist = PathDistanceAlongVector(vDelta);
-			m_bFaceEnemy = fDist <= 0 || vDelta.lengthXYSquared() * Square(64) >= Square(fDist);
-
-			m_sCurrentPathNodeIndex = m_Path.CurrentNodeIndex();
-		}
-	}
-	else
-	{
-		m_bFaceEnemy = true;
-	}
-
-	if (m_bFaceEnemy && (vDelta.x >= 15.0 || vDelta.x <= -15.0 || vDelta.y >= 15.0 || vDelta.y <= -15.0))
-	{
-		vDelta.x = -vDelta.x;
-		vDelta.y = -vDelta.y;
-		FaceDirectionDuringMotion(vDelta);
-	}
-	else
-	{
-		FaceMotion();
-	}
+    ev->AddFloat(m_fRunAnimRate);
 }
 
 /*
 ===============
-Actor::NextUpdateTime
-
-Returns next update time.
+Actor::Landed
 ===============
 */
-int Actor::NextUpdateTime
-	(
-	int iLastUpdateTime,
-	int iUpdatePeriod
-	)
+void Actor::Landed(Event *ev)
 {
-	int i = iLastUpdateTime;
+    if (groundentity && groundentity->entity != world) {
+        warning("Actor::Landed", "Actor %d has landed on an entity that might move\n", entnum);
+    }
 
-	do
-		i += iUpdatePeriod;
-	while( i < level.inttime );
-
-	return i;
+    setMoveType(MOVETYPE_NONE);
 }
 
 /*
 ===============
-Actor::ResetBoneControllers
-
-Reset Bone Controllers.
+Actor::IsOnFloor
 ===============
 */
-void Actor::ResetBoneControllers
-	(
-	void
-	)
+bool Actor::IsOnFloor(void)
 {
-
-	if (edict->s.bone_tag[HEAD_TAG] != -1)
-	{
-		
-		SetControllerAngles(HEAD_TAG, vec_zero);
-	}
-	if (edict->s.bone_tag[TORSO_TAG] != -1)
-	{
-		SetControllerAngles(TORSO_TAG, vec_zero);
-	}
-	if (edict->s.bone_tag[ARMS_TAG] != -1)
-	{
-		SetControllerAngles(ARMS_TAG, vec_zero);
-	}
+    str name = AnimName(0);
+    name.toupper();
+    return strstr(name, "FLOOR") != NULL;
 }
 
 /*
 ===============
-Actor::UpdateBoneControllers
-
-Update Bone Controllers.
-Reversed incorrectly, since decompiled output has different behaviour as reversed output.
+Actor::GetNationality
 ===============
 */
-void Actor::UpdateBoneControllers
-	(
-	void
-	)
-	
+void Actor::GetNationality(Event *ev)
 {
-	int v1; // eax
-	float v2; // fst7
-	float v3; // ebx
-	float v4; // fst7
-	float error; // fst5
-	float v6; // fst3
-	float v7; // ST34_4
-	float torsoYawError; // edx
-	float fErr1; // fst7
-	float v10; // tt
-	float v11; // fst5
-	float v12; // fst7
-	float v13; // fst5
-	float fErr2; // fst3
-	float fAng1; // fst4
-	float fAng2; // fst5
-	float v17; // fst1
-	float fAng3; // fst4
-	float v19; // fst3
-	float fAng3_; // fst5
-	float fFrameTorsoDist; // fst4
-	float fAng4; // fst5
-	float v23; // fst4
-	float fAng5; // fst6
-	float v25; // ST48_4
-	float v26; // ST38_4
-	float fAng6; // fst6
-	float v28; // fst5
-	float v29; // fst4
-	float fAng7; // fst5
-	float fAng8; // fst2
-	float v32; // fst1
-	float fAng9; // fst6
-	float v34; // fst6
-	float v35; // fst3
-	float v36; // fst1
-	float fAng10; // fst5
-	float v38; // fst3
-	float v39; // fst6
-	float v40; // fst3
-	float v41; // fst5
-	float v42; // fst5
-	float v43; // t1
-	float v44; // fst4
-	float v45; // t2
-	float v46; // fst5
-	float v47; // fst7
-	float v48; // fst5
-	float fAng11; // fst5
-	float v50; // fst5
-	float fAng12; // fst5
-	float v52; // t0
-	float v53; // fst5
-	float v54; // fst7
-	float v55; // fst6
-	float fAng13; // fst7
-	float v57; // fst6
-	float v58; // fst7
-	float v59; // fst6
-	float v60; // fst7
-	float v61; // fst6
-	float fAng15; // fst7
-	float v63; // tt
-	float v64; // fst6
-	float v65; // t0
-	float v66; // fst6
-	float v67; // fst2
-	float v68; // tt
-	float v69; // fst4
-	float v70; // t1
-	float v71; // fst4
-	float v72; // t2
-	float v73; // fst4
-	float v74; // tt
-	float v75; // fst4
-	int16_t tagnum; // ax
-	signed int v77; // ebx
-	float v78; // fst7
-	float v79; // fst6
-	float v80; // fst5
-	int *v81; // eax
-	float v82; // fst4
-	float v83; // fst3
-	float v84; // fst4
-	float v85; // t2
-	float v86; // tt
-	float v87; // fst4
-	float v88; // fst5
-	float v89; // fst6
-	float v90; // t0
-	float v91; // eax
-	signed int v92; // edx
-	float *v93; // eax
-	float v94; // fst7
-	float v95; // fst5
-	float v96; // t0
-	float v97; // fst5
-	float v98; // t1
-	float v99; // fst5
-	float v100; // fst6
-	signed int fAlpha; // ebx
-	float fAlpha2; // ST34_4 MAPDST
-	int *v104; // eax
-	signed int v105; // edx
-	float v106; // fst6
-	float v107; // fst5
-	float v108; // fst4
-	float v109; // fst3
-	float v110; // fst7
-	float v111; // fst2
-	float v112; // fst0
-	float v113; // fst1
-	float v114; // fst2
-	float v115; // t1
-	float v116; // fst1
-	float v117; // fst3
-	float v118; // tt
-	float v119; // fst2
-	float v120; // fst5
-	float v121; // t0
-	float v122; // fst2
-	float v123; // fst7
-	float v124; // fst6
-	float v125; // t1
-	float v126; // fst3
-	float v127; // t2
-	float v128; // fst3
-	float v129; // tt
-	int *v130; // eax
-	signed int v131; // edx
-	float v132; // fst6
-	float v133; // fst5
-	float v134; // fst4
-	float v135; // fst3
-	float v136; // fst7
-	float v137; // fst2
-	float v138; // fst0
-	float v139; // fst1
-	float v140; // fst2
-	float v141; // tt
-	float v142; // fst1
-	float v143; // fst3
-	float v144; // t1
-	float v145; // fst2
-	float v146; // fst5
-	float v147; // t2
-	float v148; // fst2
-	float v149; // fst7
-	float v150; // fst6
-	float v151; // tt
-	float v152; // fst3
-	float v153; // t0
-	float v154; // fst3
-	float v155; // t1
-	signed int v156; // ebx
-	float v157; // fst7
-	float v158; // fst6
-	float v159; // fst5
-	int *v160; // eax
-	float v161; // fst4
-	float v162; // fst3
-	float v163; // fst4
-	float v164; // t1
-	float v165; // t2
-	float v166; // fst4
-	float v167; // fst5
-	float v168; // fst6
-	float v169; // tt
-	SimpleEntityPtr v170; // ecx
-	struct gentity_s *v171; // esi
-	float v172; // [esp+2Ch] [ebp-20Ch]
-	float v173; // [esp+2Ch] [ebp-20Ch]
-	float v174; // [esp+7Ch] [ebp-1BCh]
-	float v175; // [esp+80h] [ebp-1B8h]
-	float v176; // [esp+84h] [ebp-1B4h]
-	Vector v177; // [esp+90h] [ebp-1A8h]
-	Vector v178; // [esp+A0h] [ebp-198h]
-	float v179; // [esp+B0h] [ebp-188h]
-	float v180; // [esp+B4h] [ebp-184h]
-	float v181; // [esp+B8h] [ebp-180h]
-	float v182[3]; // [esp+C0h] [ebp-178h]
-	float fDist; // [esp+DCh] [ebp-15Ch]
-	float v184; // [esp+E0h] [ebp-158h]
-	float v185; // [esp+E4h] [ebp-154h]
-	float v186; // [esp+E8h] [ebp-150h]
-	float v187[3]; // [esp+F0h] [ebp-148h]
-	float v188; // [esp+100h] [ebp-138h]
-	float v189; // [esp+104h] [ebp-134h]
-	float v190; // [esp+108h] [ebp-130h]
-	float vLookDest[3]; // [esp+110h] [ebp-128h]
-	orientation_t tag_or; // [esp+120h] [ebp-118h]
-	float v193[3]; // [esp+150h] [ebp-E8h]
-	float v194[4]; // [esp+160h] [ebp-D8h]
-	float v195[3]; // [esp+170h] [ebp-C8h]
-	float lookAxis[3][3]; // [esp+180h] [ebp-B8h]
-	float v197[3]; // [esp+1B0h] [ebp-88h]
-	float myAxis[3][3]; // [esp+1C0h] [ebp-78h]
-	float LocalLookAngles[3]; // [esp+1F0h] [ebp-48h]
-	float torsoAngles[3]; // [esp+200h] [ebp-38h]
-	float headAngles[3]; // [esp+210h] [ebp-28h]
-	int v202; // [esp+220h] [ebp-18h]
-
-	torsoAngles[2] = 0.0;
-	headAngles[0] = 0.0;
-	headAngles[1] = 0.0;
-	headAngles[2] = 0.0;
-	torsoAngles[0] = 0.0;
-	torsoAngles[1] = 0.0;
-	if (m_bHasDesiredLookAngles)
-	{
-		v1 = g_showlookat->integer;
-		if (v1 != entnum && v1 != -1)
-		{
-		ACTOR_UPDATEBONECONTROLLERS_4:
-			v2 = m_DesiredLookAngles[0];
-			LocalLookAngles[0] = m_DesiredLookAngles[0];
-			LocalLookAngles[1] = m_DesiredLookAngles[1];
-			v3 = m_DesiredLookAngles[2];
-			v178[0] = 0.0;
-			LocalLookAngles[2] = v3;
-			v177[2] = v3;
-			v178[1] = 0.0;
-			v178[2] = 0.0;
-			v177[0] = v2;
-			v177[1] = LocalLookAngles[1];
-			v177.AngleVectorsLeft(&v178);
-			edict->s.eyeVector[0] = v178[0];
-			edict->s.eyeVector[1] = v178[1];
-			edict->s.eyeVector[2] = v178[2];
-			goto ACTOR_UPDATEBONECONTROLLERS_5;
-		}
-		tagnum = gi.Tag_NumForName(edict->tiki, "eyes bone");
-		v77 = 0;
-		tag_or = G_TIKI_Orientation(edict, tagnum & 0x3FF);
-		AnglesToAxis(angles, myAxis);
-		v197[0] = origin[0];
-		v197[1] = origin[1];
-		v78 = v197[0];
-		v79 = v197[1];
-		v80 = origin[2];
-		v197[2] = origin[2];
-		v81 = &v202;
-		while (1)
-		{
-			v82 = tag_or.origin[v77++];
-			v78 = v78 + *(v81 - 24) * v82;
-			v83 = v82;
-			v84 = *(v81 - 23) * v82;
-			v85 = v83 * *(v81 - 22);
-			v81 += 3;
-			v86 = v84 + v79;
-			v87 = v80;
-			v88 = v86;
-			v89 = v85 + v87;
-			if (v77 > 2)
-				break;
-			v90 = v88;
-			v80 = v89;
-			v79 = v90;
-		}
-		v197[2] = v89;
-		v197[1] = v88;
-		v197[0] = v78;
-		vLookDest[0] = 0.0;
-		vLookDest[1] = 0.0;
-		vLookDest[2] = 0.0;
-		if (m_bHasDesiredLookDest)
-		{
-			v188 = m_vDesiredLookDest[0];
-			v189 = m_vDesiredLookDest[1];
-			v91 = m_vDesiredLookDest[2];
-		ACTOR_UPDATEBONECONTROLLERS_105:
-			v190 = v91;
-			vLookDest[0] = v188;
-			vLookDest[2] = v91;
-			vLookDest[1] = v189;
-			goto ACTOR_UPDATEBONECONTROLLERS_106;
-		}
-		v170 = this->m_pLookEntity;
-		if (v170)
-		{
-			if (!v170->IsSubclassOfSentient())
-			{
-				v188 = v170->centroid[0];
-				v189 = v170->centroid[1];
-				v91 = v170->centroid[2];
-				goto ACTOR_UPDATEBONECONTROLLERS_105;
-			}
-			((Sentient *)v170.Pointer())->EyePosition().copyTo(vLookDest);
-		}
-	ACTOR_UPDATEBONECONTROLLERS_106:
-		v92 = 0;
-		v93 = angles;
-		do
-		{
-			v94 = *v93;
-			++v93;
-			v194[v92] = v94 + m_DesiredLookAngles[v92];
-			++v92;
-		} while (v92 <= 2);
-		AnglesToAxis(v194, lookAxis);
-		v188 = vLookDest[0] - v197[0];
-		v189 = vLookDest[1] - v197[1];
-		v190 = vLookDest[2] - v197[2];
-		VectorNormalize(&v188);
-		v187[0] = v188;
-		v187[1] = v189;
-		v187[2] = v190;
-		v95 = v188 - lookAxis[0][0];
-		v184 = v95;
-		v96 = v95 * v95;
-		v97 = v189 - lookAxis[0][1];
-		v185 = v97;
-		v98 = v97 * v97;
-		v99 = v190 - lookAxis[0][2];
-		v186 = v99;
-		v100 = v99 * v99 + v98 + v96;
-		fDist = sqrt(v100);
-		if (fDist >= 0.1)
-		{
-			v193[0] = 128.0;
-			v156 = 0;
-			v193[1] = 0.0;
-			v157 = v197[0];
-			v158 = v197[1];
-			v159 = v197[2];
-			v195[1] = v197[1];
-			v160 = &v202;
-			v193[2] = 0.0;
-			v195[0] = v197[0];
-			v195[2] = v197[2];
-			while (1)
-			{
-				v161 = v193[v156++];
-				v157 = v157 + *(v160 - 40) * v161;
-				v162 = v161;
-				v163 = *(v160 - 39) * v161;
-				v164 = v162 * *(v160 - 38);
-				v160 += 3;
-				v165 = v163 + v158;
-				v166 = v159;
-				v167 = v165;
-				v168 = v164 + v166;
-				if (v156 > 2)
-					break;
-				v169 = v167;
-				v159 = v168;
-				v158 = v169;
-			}
-			v195[2] = v168;
-			v195[1] = v167;
-			v195[0] = v157;
-		}
-		else
-		{
-			v195[0] = vLookDest[0];
-			v195[1] = vLookDest[1];
-			v195[2] = vLookDest[2];
-			fDist = sqrt(v100);
-			if (fDist >= 0.039999999)
-			{
-				fDist = sqrt(v184 * v184 + v185 * v185 + v186 * v186);
-				fAlpha = ((0.1 - fDist) / 0.060000002);
-			}
-			else
-			{
-				fAlpha = 1;
-			}
-			v187[0] = vLookDest[0] + 8.0;
-			v182[0] = vLookDest[0] + 8.0;
-			v187[1] = vLookDest[1] + 8.0;
-			v187[2] = vLookDest[2] + -8.0;
-			fAlpha2 = fAlpha;
-			v182[1] = vLookDest[1] + 8.0;
-			v182[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v182, v187, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + 8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = 8.0;
-			v180 = -8.0;
-			v181 = -8.0;
-			v182[0] = 8.0;
-			v182[1] = -8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + -8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + 8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = -8.0;
-			v180 = 8.0;
-			v181 = -8.0;
-			v182[0] = -8.0;
-			v182[1] = 8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + -8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = -8.0;
-			v180 = -8.0;
-			v181 = -8.0;
-			v182[0] = -8.0;
-			v182[1] = -8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + -8.0;
-			v178[1] = vLookDest[1] + -8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + 8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + 8.0;
-			v179 = 8.0;
-			v180 = -8.0;
-			v181 = 8.0;
-			v182[0] = 8.0;
-			v182[1] = 8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + 8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = 8.0;
-			v180 = -8.0;
-			v181 = -8.0;
-			v182[0] = 8.0;
-			v182[1] = 8.0;
-			v182[2] = -8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + -8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + 8.0;
-			v179 = -8.0;
-			v180 = -8.0;
-			v181 = 8.0;
-			v182[0] = -8.0;
-			v182[1] = 8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + -8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = -8.0;
-			v180 = -8.0;
-			v181 = -8.0;
-			v182[0] = -8.0;
-			v182[1] = 8.0;
-			v182[2] = -8.0;
-			v178[0] = vLookDest[0] + -8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + -8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + 8.0;
-			v177[2] = vLookDest[2] + 8.0;
-			v179 = -8.0;
-			v180 = 8.0;
-			v181 = 8.0;
-			v182[0] = 8.0;
-			v182[1] = 8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + 8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v179 = -8.0;
-			v180 = 8.0;
-			v181 = -8.0;
-			v182[0] = 8.0;
-			v182[1] = 8.0;
-			v182[2] = -8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + 8.0;
-			v178[2] = vLookDest[2] + -8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[0] = vLookDest[0];
-			v187[1] = vLookDest[1];
-			v187[2] = vLookDest[2];
-			v177[0] = vLookDest[0] + -8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + 8.0;
-			v179 = -8.0;
-			v180 = -8.0;
-			v181 = 8.0;
-			v182[0] = 8.0;
-			v182[1] = -8.0;
-			v182[2] = 8.0;
-			v178[0] = vLookDest[0] + 8.0;
-			v178[1] = vLookDest[1] + -8.0;
-			v178[2] = vLookDest[2] + 8.0;
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-			v187[1] = vLookDest[1];
-			v177[0] = vLookDest[0] + -8.0;
-			v187[0] = vLookDest[0];
-			v187[2] = vLookDest[2];
-			v179 = -8.0;
-			v180 = -8.0;
-			v181 = -8.0;
-			v182[0] = 8.0;
-			v182[1] = -8.0;
-			v182[2] = -8.0;
-			v177[1] = vLookDest[1] + -8.0;
-			v177[2] = vLookDest[2] + -8.0;
-			v178[0] = 8.0 + vLookDest[0];
-			v178[1] = vLookDest[1] + -8.0;
-			v178[2] = -8.0 + vLookDest[2];
-			G_DebugLine(v178, v177, 0.0, 0.0, fAlpha2, fAlpha2);
-		}
-		G_DebugLine(v197, v195, 0.0, 0.0, 1.0, 1.0);
-		v104 = &v202;
-		v105 = 0;
-		v106 = v197[1];
-		v107 = v197[2];
-		v108 = v195[0];
-		v109 = v195[1];
-		v110 = v195[2];
-		v193[0] = 0.0;
-		v193[1] = 0.0;
-		v193[2] = -2.0;
-		v174 = v197[0];
-		while (1)
-		{
-			v111 = v193[v105++];
-			v112 = *(v104 - 40) * v111;
-			v108 = v108 + v112;
-			v174 = v174 + v112;
-			v113 = v111;
-			v114 = *(v104 - 39) * v111;
-			v115 = v113 * *(v104 - 38);
-			v104 += 3;
-			v116 = v109;
-			v117 = v106 + v114;
-			v118 = v114 + v116;
-			v119 = v107;
-			v120 = v118;
-			v121 = v119 + v115;
-			v122 = v110;
-			v123 = v121;
-			v124 = v115 + v122;
-			if (v105 > 2)
-				break;
-			v125 = v117;
-			v126 = v124;
-			v106 = v125;
-			v127 = v126;
-			v128 = v123;
-			v110 = v127;
-			v129 = v128;
-			v109 = v120;
-			v107 = v129;
-		}
-		v195[2] = v124;
-		v195[1] = v120;
-		v195[0] = v108;
-		v197[2] = v123;
-		v197[1] = v117;
-		v197[0] = v174;
-		G_DebugLine(v197, v195, 0.0, 0.0, 1.0, 1.0);
-		v130 = &v202;
-		v131 = 0;
-		v132 = v197[1];
-		v133 = v197[2];
-		v134 = v195[0];
-		v135 = v195[1];
-		v136 = v195[2];
-		v193[0] = 0.0;
-		v193[1] = 2.0;
-		v193[2] = 0.0;
-		v175 = v197[0];
-		while (1)
-		{
-			v137 = v193[v131++];
-			v138 = *(v130 - 40) * v137;
-			v134 = v134 + v138;
-			v175 = v175 + v138;
-			v139 = v137;
-			v140 = *(v130 - 39) * v137;
-			v141 = v139 * *(v130 - 38);
-			v130 += 3;
-			v142 = v135;
-			v143 = v132 + v140;
-			v144 = v140 + v142;
-			v145 = v133;
-			v146 = v144;
-			v147 = v145 + v141;
-			v148 = v136;
-			v149 = v147;
-			v150 = v141 + v148;
-			if (v131 > 2)
-				break;
-			v151 = v143;
-			v152 = v150;
-			v132 = v151;
-			v153 = v152;
-			v154 = v149;
-			v136 = v153;
-			v155 = v154;
-			v135 = v146;
-			v133 = v155;
-		}
-		v195[2] = v150;
-		v195[1] = v146;
-		v195[0] = v134;
-		v197[2] = v149;
-		v197[1] = v143;
-		v197[0] = v175;
-		G_DebugLine(v197, v195, 0.0, 0.0, 1.0, 1.0);
-		goto ACTOR_UPDATEBONECONTROLLERS_4;
-	}
-	v171 = edict;
-	v171->s.eyeVector[2] = 0.0;
-	v171->s.eyeVector[1] = 0.0;
-	v171->s.eyeVector[0] = 0.0;
-	LocalLookAngles[2] = 0.0;
-	LocalLookAngles[1] = 0.0;
-	LocalLookAngles[0] = 0.0;
-ACTOR_UPDATEBONECONTROLLERS_5:
-	GetControllerAngles(1).copyTo(v177);
-	torsoAngles[2] = v177[2];
-	torsoAngles[0] = v177[0];
-	torsoAngles[1] = v177[1];
-	GetControllerAngles(0).copyTo(v177);
-	v4 = LocalLookAngles[0];
-	headAngles[2] = v177[2];
-	headAngles[1] = v177[1];
-	headAngles[0] = v177[0];
-	error = LocalLookAngles[1] - (torsoAngles[1] + v177[1]);
-	v6 = LocalLookAngles[1] - torsoAngles[1];
-	v176 = LocalLookAngles[0] - v177[0];
-	v7 = v6;
-	torsoYawError = v7;
-	if (v6 > 180.0)
-	{
-		v172 = v6 - 360.0;
-	ACTOR_UPDATEBONECONTROLLERS_7:
-		torsoYawError = v172;
-		goto ACTOR_UPDATEBONECONTROLLERS_8;
-	}
-	if (v6 < -180.0)
-	{
-		v172 = v6 + 360.0;
-		goto ACTOR_UPDATEBONECONTROLLERS_7;
-	}
-ACTOR_UPDATEBONECONTROLLERS_8:
-	if (torsoYawError >= 0.0)
-	{
-		if (error < -120.0)
-			error = error + 360.0;
-	}
-	else if (error > 120.0)
-	{
-		error = error - 360.0;
-	}
-	if (!((((uint8_t)this->m_iLookFlags) ^ 1) & 1))
-	{
-		fAng6 = error;
-		goto ACTOR_UPDATEBONECONTROLLERS_25;
-	}
-	if (error <= 25.0)
-	{
-		if (-25.0 <= error)
-		{
-			v12 = error;
-			v13 = 0.0;
-			goto ACTOR_UPDATEBONECONTROLLERS_15;
-		}
-		fErr1 = 0.2 * (error + 25.0);
-	}
-	else
-	{
-		fErr1 = (error - 25.0) * 0.2;
-	}
-	v10 = error;
-	v11 = fErr1;
-	v12 = v10;
-	fDist = v11;
-	v13 = fDist;
-ACTOR_UPDATEBONECONTROLLERS_15:
-	fErr2 = v12 + headAngles[1];
-	fAng1 = -torsoAngles[1];
-	v173 = fErr2;
-	if (fErr2 > fAng1)
-	{
-		fErr2 = fAng1;
-		fAng1 = v173;
-	}
-	if (fErr2 <= v13)
-	{
-		v74 = fAng1;
-		v75 = v13;
-		fAng2 = v74;
-		if (v75 <= v74)
-			fAng2 = v75;
-	}
-	else
-	{
-		fAng2 = fErr2;
-	}
-	v17 = level.frametime * 15.0;
-	fAng3 = this->m_fTorsoCurrentTurnSpeed + v17;
-	v19 = this->m_fTorsoCurrentTurnSpeed - v17;
-	if (fAng2 <= fAng3)
-	{
-		fAng3 = fAng2;
-		if (v19 > fAng2)
-			fAng3 = v19;
-	}
-	fAng3_ = fAng3;
-	fFrameTorsoDist = level.frametime * this->m_fTorsoMaxTurnSpeed;
-	if (-fFrameTorsoDist <= fAng3_)
-	{
-		v72 = fFrameTorsoDist;
-		v73 = fAng3_;
-		fAng4 = v72;
-		if (v73 <= v72)
-			fAng4 = v73;
-	}
-	else
-	{
-		fAng4 = -fFrameTorsoDist;
-	}
-	v23 = torsoAngles[1] + fAng4;
-	torsoAngles[1] = v23;
-	if (v23 <= 30.0)
-	{
-		v71 = torsoAngles[1];
-		if (torsoAngles[1] >= -30.0)
-		{
-			fAng5 = fAng4;
-		}
-		else
-		{
-			torsoAngles[1] = -30.0;
-			fAng5 = fAng4 - (v71 + 30.0);
-		}
-	}
-	else
-	{
-		torsoAngles[1] = 30.0;
-		fAng5 = fAng4 - (v23 - 30.0);
-	}
-	this->m_fTorsoCurrentTurnSpeed = fAng5;
-	v25 = fAng5;
-	v26 = v12;
-	torsoAngles[0] = 0.0;
-	torsoAngles[2] = 0.0;
-	SetControllerAngles(1, torsoAngles);
-	v4 = LocalLookAngles[0];
-	fAng6 = v26 - v25;
-ACTOR_UPDATEBONECONTROLLERS_25:
-	if (fAng6 > 15.0)
-	{
-		v28 = fAng6 - 15.0;
-	ACTOR_UPDATEBONECONTROLLERS_27:
-		v29 = level.frametime;
-		fAng7 = v28 * 4.0 * v29;
-		goto ACTOR_UPDATEBONECONTROLLERS_28;
-	}
-	if (-15.0 > fAng6)
-	{
-		v28 = fAng6 + 15.0;
-		goto ACTOR_UPDATEBONECONTROLLERS_27;
-	}
-	v29 = level.frametime;
-	fAng7 = 0.0;
-ACTOR_UPDATEBONECONTROLLERS_28:
-	fAng8 = fAng6;
-	v32 = fAng6;
-	fAng9 = -headAngles[1];
-	if (v32 > fAng9)
-	{
-		fAng8 = fAng9;
-		fAng9 = v32;
-	}
-	if (fAng8 <= fAng7)
-	{
-		if (fAng7 <= fAng9)
-		{
-			v34 = headAngles[1];
-		}
-		else
-		{
-			v68 = v29;
-			v69 = fAng9;
-			v34 = headAngles[1];
-			v70 = v69;
-			v29 = v68;
-			fAng7 = v70;
-		}
-	}
-	else
-	{
-		fAng7 = fAng8;
-		v34 = headAngles[1];
-	}
-	v35 = this->m_fHeadMaxTurnSpeed;
-	v36 = -(v29 * v35);
-	if (v36 <= fAng7)
-	{
-		v67 = fAng7;
-		fAng10 = v29 * v35;
-		if (v67 <= fAng10)
-			fAng10 = v67;
-	}
-	else
-	{
-		fAng10 = v36;
-	}
-	v38 = v34;
-	v39 = this->m_fHeadMaxTurnSpeed;
-	v40 = fAng10 + v38;
-	v41 = 60.0;
-	headAngles[1] = v40;
-	if (v40 > 60.0)
-		goto ACTOR_UPDATEBONECONTROLLERS_37;
-	v42 = v29;
-	if (headAngles[1] < -60.0)
-	{
-		v41 = -60.0;
-	ACTOR_UPDATEBONECONTROLLERS_37:
-		v43 = v29;
-		v44 = v41;
-		v42 = v43;
-		headAngles[1] = v44;
-	}
-	v45 = v42;
-	v46 = v4;
-	v47 = v45;
-	v48 = fabs(v46);
-	if (v48 >= 15.0)
-	{
-		fAng11 = 15.0;
-	}
-	else
-	{
-		fDist = v48;
-		fAng11 = fDist;
-	}
-	if (v176 > fAng11)
-	{
-		v50 = v176 - fAng11;
-	ACTOR_UPDATEBONECONTROLLERS_42:
-		fDist = 0.2 * v50;
-		fAng12 = fDist;
-		goto ACTOR_UPDATEBONECONTROLLERS_43;
-	}
-	if (-fAng11 > v176)
-	{
-		v50 = fAng11 + v176;
-		goto ACTOR_UPDATEBONECONTROLLERS_42;
-	}
-	fAng12 = 0.0;
-ACTOR_UPDATEBONECONTROLLERS_43:
-	v52 = fAng12;
-	v53 = v47;
-	v54 = v52;
-	v55 = v39 * v53;
-	if (-v55 <= v52)
-	{
-		v65 = v55;
-		v66 = v54;
-		fAng13 = v65;
-		if (v66 <= v65)
-			fAng13 = v66;
-	}
-	else
-	{
-		fAng13 = -v55;
-	}
-	v57 = fAng13 + headAngles[0];
-	v58 = 35.0;
-	headAngles[0] = v57;
-	if (v57 > 35.0 || (v58 = -35.0, headAngles[0] < -35.0))
-		headAngles[0] = v58;
-	headAngles[2] = 0.0;
-	if (this->m_iLookFlags & 1)
-	{
-		headAngles[0] = 0.5 * headAngles[0];
-		headAngles[1] = 0.5 * headAngles[1];
-	}
-	SetControllerAngles(0, headAngles);
-	v177[0] = 0.0;
-	v177[1] = 0.0;
-	v177[2] = 0.0;
-	v178[0] = 0.0;
-	v178[1] = 0.0;
-	v178[2] = 0.0;
-	GetControllerAngles(2).copyTo(v177);
-	v179 = v177[0];
-	v180 = v177[1];
-	v181 = v177[2];
-	v59 = m_vLUpperArmDesiredAngles[1] - v180;
-	v60 = v59;
-	if (v59 <= 180.0)
-	{
-		if (v59 < -180.0)
-			v60 = v59 + 360.0;
-	}
-	else
-	{
-		v60 = v59 - 360.0;
-	}
-	v61 = this->m_fLUpperArmTurnSpeed * level.frametime;
-	if (-v61 <= v60)
-	{
-		v63 = v61;
-		v64 = v60;
-		fAng15 = v63;
-		if (v64 <= v63)
-			fAng15 = v64;
-	}
-	else
-	{
-		fAng15 = -v61;
-	}
-	v178[0] = this->m_vLUpperArmDesiredAngles[0];
-	v178[1] = fAng15 + v177[1];
-	v178[2] = 0.0;
-	SetControllerAngles(2, v178);
-}
-
-/*
-void Actor::UpdateBoneControllers()
-{
-	Vector torsoAngles, headAngles, LocalLookAngles, vec1, vLookDest, vec2, vLookDir, lineVec, eyePosition;
-	float  error, pitchError, torsoYawError, fAlpha; //, min_accel_change, max_accel_change, max_change, yawError, tolerable_error
-
-	if (m_bHasDesiredLookAngles)
-	{
-		if (g_showlookat->integer == entnum || g_showlookat->integer == -1)
-		{
-			float myAxis[3][3], lookAxis[3][3];
-			orientation_t tag_or;
-			GetRawTag("eyes bone", &tag_or);
-
-			AnglesToAxis(angles, myAxis);
-
-			vec1 = origin;
-
-			for (int i = 0; i < 3; i++)
-			{
-				//sizeof(orientation_t);
-				VectorMA(vec1, tag_or.origin[i], myAxis[i], vec1);
-
-			}
-
-
-			if (m_bHasDesiredLookDest)
-			{
-				vLookDest = m_vDesiredLookDest;
-			}
-			else if (m_pLookEntity)
-			{
-				if (m_pLookEntity->IsSubclassOfSentient())
-				{
-					vLookDest = ((Sentient *)m_pLookEntity.Pointer())->EyePosition();
-				}
-				else
-				{
-					vLookDest = m_pLookEntity->centroid;
-				}
-			}
-			else
-			{
-				vLookDest = vec_zero;
-			}
-
-
-			AnglesToAxis(angles + m_DesiredLookAngles, lookAxis);
-
-			vec2 = vLookDest - vec1;
-
-			VectorNormalize(vec2);
-
-			float fDist = (vec2 - lookAxis[0]).length();
-			if (fDist >= 0.1)
-			{
-				lineVec = Vector(128, 0, 0);
-				for (int i = 0; i < 3; i++)
-				{
-					VectorMA(vec1, lineVec[i], lookAxis[i], vLookDir);
-				}
-
-			}
-			else
-			{
-				vLookDir = vLookDest;
-
-				if (fDist >= 0.04)
-				{
-					fAlpha = ((0.1 - fDist) / 0.06);
-				}
-				else
-				{
-					fAlpha = 1;
-				}
-
-				G_DebugLine(vLookDest + Vector(8, 8, 8), vLookDest + Vector(8, 8, -8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, -8, 8), vLookDest + Vector(8, -8, -8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(-8, 8, 8), vLookDest + Vector(-8, 8, -8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, 8, 8), vLookDest + Vector(8, -8, 8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(-8, 8, -8), vLookDest + Vector(-8, -8, -8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, 8, 8), vLookDest + Vector(-8, 8, 8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, 8, -8), vLookDest + Vector(-8, 8, -8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, -8, 8), vLookDest + Vector(-8, -8, 8), 0, 0, fAlpha, fAlpha);
-				G_DebugLine(vLookDest + Vector(8, -8, -8), vLookDest + Vector(-8, -8, -8), 0, 0, fAlpha, fAlpha);
-			}
-
-			G_DebugLine(vec1, vLookDir, 0, 0, 1, 1);
-
-
-			for (int i = 0; i < 3; i++)
-			{
-				//sizeof(orientation_t);
-				VectorMA(vLookDir, Vector(0, 0, -2)[i], lookAxis[i], vLookDir);
-				VectorMA(vec1, Vector(0, 0, -2)[i], lookAxis[i], vec1);
-
-			}
-
-			G_DebugLine(vec1, vLookDir, 0, 0, 1, 1);
-
-
-			for (int i = 0; i < 3; i++)
-			{
-				//sizeof(orientation_t);
-				VectorMA(vLookDir, Vector(0, 2, 0)[i], lookAxis[i], vLookDir);
-				VectorMA(vec1, Vector(0, 2, 0)[i], lookAxis[i], vec1);
-
-			}
-
-			G_DebugLine(vec1, vLookDir, 0, 0, 1, 1);
-
-		}
-
-
-		LocalLookAngles = m_DesiredLookAngles;
-
-		eyePosition = vec_zero;
-		VectorClear(edict->s.eyeVector);
-		LocalLookAngles.AngleVectorsLeft(&eyePosition, NULL, NULL);
-		VectorCopy(eyePosition, edict->s.eyeVector);
-
-	}
-	else
-	{
-		VectorClear(edict->s.eyeVector);
-
-		LocalLookAngles = vec_zero;
-	}
-	headAngles = GetControllerAngles(HEAD_TAG);
-	torsoAngles = GetControllerAngles(TORSO_TAG);
-
-
-	torsoYawError = LocalLookAngles[1] - torsoAngles[1];
-	error = torsoYawError - headAngles[1];
-
-	pitchError = LocalLookAngles[0] - headAngles[0];
-
-	if (torsoYawError <= 180)
-	{
-		if (torsoYawError < -180.0)
-			torsoYawError += 360;
-	}
-	else
-	{
-		torsoYawError -= 360;
-	}
-
-	if (torsoYawError >= 0.0)
-	{
-		if (error < -120.0)
-			error += 360.0;
-	}
-	else if (error > 120.0)
-	{
-		error -= 360.0;
-	}
-
-	float fErr1, fErr2, fAng1, fAng2, fAng3, fFrameTorsoDist, fAng4, fAng5, fAng6, fAng7;
-	float fAng8, fAng9, fAng10;
-	if (m_iLookFlags)
-	{
-		fAng6 = error;
-	}
-	else
-	{
-		if (error <= 25.0)
-		{
-			if (error >= -25.0)
-			{
-				fErr1 = 0.0;
-				//goto LABEL_15;
-			}
-			else
-			{
-				fErr1 = (error + 25.0) * 0.2;
-			}
-		}
-		else
-		{
-			fErr1 = (error - 25.0) * 0.2;
-		}
-
-		fErr2 = error + headAngles[1];
-
-		fAng1 = -torsoAngles[1];
-
-		if (fErr2 > fAng1)
-		{
-			fErr2 = -torsoAngles[1];
-			fAng1 = error + headAngles[1];
-		}
-
-		if (fErr2 <= error)
-		{
-			fAng2 = fAng1;
-			if (error <= fAng1)
-				fAng2 = error;
-		}
-		else
-		{
-			fAng2 = fErr2;
-		}
-
-
-		fAng3 = m_fTorsoCurrentTurnSpeed + level.frametime * 15.0;
-
-		if (fAng2 <= fAng3)
-		{
-			fAng3 = fAng2;
-			if (fAng2 < m_fTorsoCurrentTurnSpeed - level.frametime * 15.0)
-				fAng3 = m_fTorsoCurrentTurnSpeed + level.frametime * 15.0;
-		}
-
-		fFrameTorsoDist = level.frametime * m_fTorsoMaxTurnSpeed;
-
-		if (-fFrameTorsoDist <= fAng3)
-		{
-			fAng4 = fFrameTorsoDist;
-			if (fAng3 <= fFrameTorsoDist)
-				fAng4 = fAng3;
-		}
-		else
-		{
-			fAng4 = -fFrameTorsoDist;
-		}
-
-		torsoAngles[1] += fAng4;
-		if (torsoAngles[1] <= 30.0)
-		{
-			if (torsoAngles[1] >= -30.0)
-			{
-				fAng5 = fAng4;
-			}
-			else
-			{
-				torsoAngles[1] = -30.0;
-				fAng5 = fAng4 - (torsoAngles[1] + 30.0);
-			}
-		}
-		else
-		{
-			torsoAngles[1] = 30.0;
-			fAng5 = fAng4 - (torsoAngles[1] - 30.0);
-		}
-
-		m_fTorsoCurrentTurnSpeed = fAng5;
-
-		//only yaw (left/right) angles are allowed.
-		torsoAngles[0] = 0.0;
-		torsoAngles[2] = 0.0;
-		SetControllerAngles(TORSO_TAG, torsoAngles);
-		//gi.Printf("Torso angles: %f %f %f\n", torsoAngles.x, torsoAngles.y, torsoAngles.z);
-
-		fAng6 = error - fAng5;
-	}
-
-	if (fAng6 > 15.0)
-	{
-		fAng7 = (fAng6 - 15.0) * 4.0 * level.frametime;
-	}
-	else if (-15.0 > fAng6)
-	{
-		fAng7 = (fAng6 + 15.0) * 4.0 * level.frametime;
-	}
-	else
-	{
-		fAng7 = 0.0;
-	}
-
-	fAng8 = fAng6;
-	fAng9 = -headAngles[1];
-
-	if (fAng8 > fAng9)
-	{
-		fAng8 = -headAngles[1];
-		fAng9 = fAng6;
-	}
-
-	if (fAng8 > fAng7)
-	{
-		fAng7 = fAng8;
-	}
-	else if (fAng7 > fAng9)
-	{
-		fAng7 = fAng9;
-	}
-
-	if (-(level.frametime * m_fHeadMaxTurnSpeed) <= fAng7)
-	{
-		fAng10 = (level.frametime * m_fHeadMaxTurnSpeed);
-		if (fAng7 <= fAng10)
-			fAng10 = fAng7;
-	}
-	else
-	{
-		fAng10 = -(level.frametime * m_fHeadMaxTurnSpeed);
-	}
-
-	headAngles[1] += fAng10;
-	if (headAngles[1] > 60)
-	{
-		headAngles[1] = 60;
-	}
-	else if (headAngles[1] < -60)
-	{
-		headAngles[1] = -60;
-	}
-
-	float fAng11, fAng12, fAng13;
-
-	fAng11 = fabs(LocalLookAngles[0]);
-
-	if (fAng11 > 15)
-	{
-		fAng11 = 15;
-	}
-
-	if (pitchError > fAng11)
-	{
-		fAng12 = 0.2 * (pitchError - fAng11);
-	}
-	else if (-fAng11 > pitchError)
-	{
-		fAng12 = 0.2 * (pitchError + fAng11);
-	}
-	else
-	{
-		fAng12 = 0;
-	}
-
-
-	if (-(level.frametime * m_fHeadMaxTurnSpeed) <= fAng12)
-	{
-		fAng13 = (level.frametime * m_fHeadMaxTurnSpeed);
-		if (fAng12 <= fAng13)
-			fAng13 = fAng12;
-	}
-	else
-	{
-		fAng13 = -(level.frametime * m_fHeadMaxTurnSpeed);
-	}
-
-	headAngles[0] += fAng13;
-
-	if (headAngles[0] > 35.0)
-		headAngles[0] = 35.0;
-	else if (headAngles[0] < -35.0)
-		headAngles[0] = -35.0;
-
-	headAngles[2] = 0.0;
-
-	if (m_iLookFlags)
-	{
-		headAngles[0] *= 0.5;
-		headAngles[1] *= 0.5;
-	}
-
-	SetControllerAngles(HEAD_TAG, headAngles);
-	//gi.Printf("Head angles: %f %f %f\n", headAngles.x, headAngles.y, headAngles.z);
-
-
-	Vector armAngles = GetControllerAngles(ARMS_TAG);
-
-	float fAng14 = m_vLUpperArmDesiredAngles[1] - armAngles[1];
-
-	if (fAng14 <= 180.0)
-	{
-		if (fAng14 < -180.0)
-			fAng14 += 360.0;
-	}
-	else
-	{
-		fAng14 -= 360.0;
-	}
-
-	float fAng15;
-
-	if (-(level.frametime * m_fLUpperArmTurnSpeed) <= fAng14)
-	{
-		fAng15 = (level.frametime * m_fLUpperArmTurnSpeed);
-		if (fAng14 <= fAng15)
-			fAng15 = fAng14;
-	}
-	else
-	{
-		fAng15 = -(level.frametime * m_fLUpperArmTurnSpeed);
-	}
-
-	Vector newArmAngles(m_vLUpperArmDesiredAngles[0], fAng15 + armAngles[1], 0);
-	SetControllerAngles(ARMS_TAG, newArmAngles);
-	//gi.Printf("Arm angles: %f %f %f\n", newArmAngles.x, newArmAngles.y, newArmAngles.z);
-
-	/////////////////////////////////////////////
-	return;
-	/////////////////////////////////////////////
-}
-
-*/
-/*
-===============
-Actor::ReadyToFire
-
-Returns true if weapon is ready to fire.
-===============
-*/
-void Actor::ReadyToFire
-	(
-	Event *ev
-	)
-{
-	bool ready;
-
-	Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
-
-	ready = weap && weap->ReadyToFire(FIRE_PRIMARY, true);
-
-	ev->AddInteger(ready);
+    switch (m_iNationality) {
+    case ACTOR_NATIONALITY_DEFAULT:
+    default:
+        switch (m_Team) {
+        case TEAM_AMERICAN:
+            ev->AddString("usa");
+            break;
+        case TEAM_GERMAN:
+            ev->AddString("ger");
+            break;
+        default:
+            ev->AddString("unset");
+            break;
+        }
+        break;
+    case ACTOR_NATIONALITY_AMERICAN:
+        ev->AddString("usa");
+        break;
+    case ACTOR_NATIONALITY_GERMAN:
+        ev->AddString("ger");
+        break;
+    case ACTOR_NATIONALITY_ITALIAN:
+        ev->AddString("it");
+        break;
+    case ACTOR_NATIONALITY_BRITISH:
+        ev->AddString("uk");
+        break;
+    case ACTOR_NATIONALITY_RUSSIAN:
+        ev->AddString("ussr");
+        break;
+    }
 }
 
 /*
 ===============
-Actor::GetLocalYawFromVector
-
-Returns local yaw from vector. EV_Actor_GetLocalYawFromVector
+Actor::SetNationality
 ===============
 */
-void Actor::GetLocalYawFromVector
-	(
-	Event *ev
-	)
+void Actor::SetNationality(Event *ev)
 {
-	float yaw;
-	Vector vec;
+    str name;
 
-	vec = ev->GetVector(1);
-	yaw = vectoyaw(vec) + 180.0f;
-	yaw = AngleSubtract(yaw, angles[1]);
-	ev->AddFloat(yaw);
+    if (ev->NumArgs() != 1) {
+        ScriptError(
+            "Bad bad nationality specified for '%s' at (%f %f %f)\n",
+            TargetName().c_str(),
+            origin[0],
+            origin[1],
+            origin[2]
+        );
+    }
+
+    name = ev->GetString(1);
+
+    if (!str::icmpn(name, "default", 8)) {
+        m_iNationality = ACTOR_NATIONALITY_DEFAULT;
+    } else if (!str::icmpn(name, "ger", 4)) {
+        m_iNationality = ACTOR_NATIONALITY_GERMAN;
+    } else if (!str::icmpn(name, "it", 3)) {
+        m_iNationality = ACTOR_NATIONALITY_ITALIAN;
+    } else if (!str::icmpn(name, "usa", 4)) {
+        m_iNationality = ACTOR_NATIONALITY_AMERICAN;
+    } else if (!str::icmpn(name, "uk", 3)) {
+        m_iNationality = ACTOR_NATIONALITY_BRITISH;
+    } else if (!str::icmpn(name, "ussr", 5)) {
+        m_iNationality = ACTOR_NATIONALITY_RUSSIAN;
+    } else {
+        ScriptError(
+            "Bad bad nationality specified for '%s', must be one of: ger, it, usa, uk, ussr or default\n",
+            TargetName().c_str()
+        );
+    }
 }
 
 /*
 ===============
-Actor::EventGetSight
-
-Return current sight (vision distance).
+Actor::EventWriteStats
 ===============
 */
-void Actor::EventGetSight
-	(
-	Event *ev
-	)
+void Actor::EventWriteStats(Event *ev)
 {
-	ev->AddFloat(m_fSight);
+    if (g_aistats->integer) {
+        level.WriteActorStats(this);
+    }
 }
 
 /*
 ===============
-Actor::EventSetSight
-
-Set current sight (vision distance).
+Actor::EventCuriousOff
 ===============
 */
-void Actor::EventSetSight
-	(
-	Event *ev
-	)
+void Actor::EventCuriousOff(Event *ev)
 {
-	m_fSight = ev->GetFloat(1);
+    m_bIsCurious = false;
 }
 
 /*
 ===============
-Actor::EventGetHearing
-
-Get current hearing distance.
+Actor::EventCuriousOn
 ===============
 */
-void Actor::EventGetHearing
-	(
-	Event *ev
-	)
+void Actor::EventCuriousOn(Event *ev)
 {
-	ev->AddFloat(m_fHearing);
+    m_bIsCurious = true;
 }
 
 /*
 ===============
-Actor::EventSetHearing
-
-Set current hearing distance.
+Actor::EventSetDestIdle
 ===============
 */
-void Actor::EventSetHearing
-	(
-	Event *ev
-	)
+void Actor::EventSetDestIdle(Event *ev) {}
+
+/*
+===============
+Actor::EventSetDestIdle2
+===============
+*/
+void Actor::EventSetDestIdle2(Event *ev) {}
+
+/*
+===============
+Actor::IsDisabled
+===============
+*/
+bool Actor::IsDisabled() const
 {
-	m_fHearing = ev->GetFloat(1);
+    return !m_bDoAI;
 }
 
 /*
 ===============
-Actor::ClearPatrolCurrentNode
-
-Clear current patrol node.
-===============
-*/
-void Actor::ClearPatrolCurrentNode
-	(
-	void
-	)
-{
-	if (m_patrolCurrentNode)
-	{
-		if (m_patrolCurrentNode->IsSubclassOfTempWaypoint())
-		{
-			delete m_patrolCurrentNode;
-		}
-		m_patrolCurrentNode = NULL;
-	}
-}
-
-/*
-===============
-Actor::NextPatrolCurrentNode
-
-Switch to next patrol node.
-===============
-*/
-void Actor::NextPatrolCurrentNode
-	(
-	void
-	)
-{
-	if (m_bScriptGoalValid)
-	{
-		if (m_patrolCurrentNode->origin == m_vScriptGoal)
-		{
-			m_bScriptGoalValid = false;
-		}
-	}
-	if (m_patrolCurrentNode->IsSubclassOfTempWaypoint())
-	{
-		ClearPatrolCurrentNode();
-	}
-	else
-	{
-		m_patrolCurrentNode = m_patrolCurrentNode->Next();
-	}
-}
-
-/*
-===============
-Actor::SetPatrolCurrentNode
-
-Set current patrol node.
-===============
-*/
-void Actor::SetPatrolCurrentNode
-	(
-	Vector& vec
-	)
-{
-	ClearPatrolCurrentNode();
-	
-	TempWaypoint * twp = new TempWaypoint();
-
-	m_patrolCurrentNode = twp;
-
-	m_patrolCurrentNode->setOrigin(vec);
-
-}
-
-/*
-===============
-Actor::SetPatrolCurrentNode
-
-Set current patrol node.
-===============
-*/
-void Actor::SetPatrolCurrentNode
-	(
-	Listener *l
-	)
-{
-	ClearPatrolCurrentNode();
-	
-	if (!l->inheritsFrom(&SimpleEntity::ClassInfo))
-	{
-		ScriptError("Bad patrol path with classname '%s' specified for '%s' at (%f %f %f)\n",
-			l->getClassname(),
-			targetname.c_str(),
-			origin.x,
-			origin.y,
-			origin.z
-			);
-	}
-
-	m_patrolCurrentNode = (SimpleEntity *)l;
-}
-
-/*
-===============
-Actor::EventSetPatrolPath
-
-Set current patrol path.
-===============
-*/
-void Actor::EventSetPatrolPath
-	(
-	Event *ev
-	)
-{
-	SetPatrolCurrentNode(ev->GetListener(1));
-}
-
-/*
-===============
-Actor::EventGetPatrolPath
-
-Get current patrol path.
-===============
-*/
-void Actor::EventGetPatrolPath
-	(
-	Event *ev
-	)
-{
-	ev->AddListener(m_patrolCurrentNode);
-}
-
-/*
-===============
-Actor::EventSetPatrolWaitTrigger
-
-Set m_bPatrolWaitTrigger.
-===============
-*/
-void Actor::EventSetPatrolWaitTrigger
-	(
-	Event *ev
-	)
-{
-	m_bPatrolWaitTrigger = ev->GetBoolean(1);
-}
-
-/*
-===============
-Actor::EventGetPatrolWaitTrigger
-
-Get m_bPatrolWaitTrigger.
-===============
-*/
-void Actor::EventGetPatrolWaitTrigger
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bPatrolWaitTrigger);
-}
-
-/*
-===============
-Actor::ShowInfo_PatrolCurrentNode
-
-Show current patrol node info.
-===============
-*/
-void Actor::ShowInfo_PatrolCurrentNode
-	(
-	void
-	)
-{
-
-	if (m_patrolCurrentNode)
-	{
-		Com_Printf("current patrol node: %s\n", m_patrolCurrentNode->targetname.c_str());
-	}
-	else
-	{
-		Com_Printf("no current patrol node\n");
-	}
-}
-
-/*
-===============
-Actor::MoveOnPathWithSquad
-
-Move on path with squad.
-===============
-*/
-bool Actor::MoveOnPathWithSquad
-	(
-	void
-	)
-{
-	float fDistSquared, fIntervalSquared;
-	vec2_t vMyNormalDir, vDelta, vHisDir;
-	Player *p;
-
-	//FIXMEL: macro
-	if (level.inttime < m_iSquadStandTime + 500 || !PathExists() || PathComplete())
-	{
-		return false;
-	}
-	fIntervalSquared = Square(m_fInterval);
-	if (m_iSquadStandTime)
-	{
-		fIntervalSquared *= 2;
-	}
-
-	p = (Player *)G_GetEntity(0);
-	
-	if (IsTeamMate(p))
-	{
-		VectorSub2D(p->origin, origin, vDelta);
-		fDistSquared = VectorLength2DSquared(vDelta);
-		if (fIntervalSquared > fDistSquared && DotProduct2D(vDelta, PathDelta()) > 0)
-		{
-			VectorSub2D(velocity, p->velocity, vMyNormalDir);
-			VectorNormalize2D(vMyNormalDir);
-			if (fDistSquared - DotProduct2D(vDelta, vMyNormalDir) < 2304)
-			{
-				m_iSquadStandTime = level.inttime;
-				return false;
-			}
-		}
-	}
-
-	for (Actor *pSquadMate = (Actor *)m_pNextSquadMate.Pointer(); pSquadMate != this; pSquadMate = (Actor *)pSquadMate->m_pNextSquadMate.Pointer())
-	{
-		if (!pSquadMate->IsSubclassOfActor())
-		{
-			continue;
-		}
-		VectorSub2D(pSquadMate->origin, origin, vDelta);
-		fDistSquared = VectorLength2DSquared(vDelta);
-		if (fDistSquared >= fIntervalSquared || DotProduct2D(vDelta, PathDelta()) <= 0)
-		{
-			
-			continue;
-		}
-		if (pSquadMate->PathExists() || pSquadMate->PathComplete())
-		{
-			VectorCopy2D(pSquadMate->velocity, vHisDir);
-			if (VectorLength2DSquared(vHisDir) <= 8)
-			{
-				continue;
-			}
-		}
-		else
-		{
-			VectorCopy2D(pSquadMate->PathDelta(), vHisDir);
-
-		}
-
-		if (DotProduct2D(PathDelta(), vHisDir) >= 0 && (entnum == pSquadMate->entnum || DotProduct2D(vHisDir, vDelta) >= 0))
-		{
-			m_iSquadStandTime = level.inttime;
-			return false;
-		}
-	}
-	m_iSquadStandTime = 0;
-	return true;
-}
-
-/*
-===============
-Actor::MoveToWaypointWithPlayer
-
-Move to waypoint with player.
-===============
-*/
-bool Actor::MoveToWaypointWithPlayer
-	(
-	void
-	)
-{
-	float fIntervalSquared, fDistSquared;
-	vec2_t vMyNormalDir, vDelta, vMyDir;
-
-	if (level.inttime < m_iSquadStandTime + 500)
-	{
-		return false;
-	}
-	
-	fIntervalSquared = Square(m_fInterval);
-	if (m_iSquadStandTime)
-	{
-		fIntervalSquared += fIntervalSquared;
-	}
-
-	Player *p = (Player *)G_GetEntity(0);
-	if (IsTeamMate(p))
-	{
-		vDelta[0] = p->origin[0] - origin[0];
-		vDelta[1] = p->origin[1] - origin[1];
-		fDistSquared = VectorLength2DSquared(vDelta);
-
-		if (fDistSquared >= fIntervalSquared)
-		{
-			m_iSquadStandTime = 0;
-			return true;
-		}
-
-		vMyDir[0] = m_patrolCurrentNode->origin[0] - origin[0];
-		vMyDir[1] = m_patrolCurrentNode->origin[1] - origin[1];
-		if (DotProduct2D(vDelta, vMyDir) < 0)
-		{
-			m_iSquadStandTime = 0;
-			return true;
-		}
-
-		vMyNormalDir[0] = velocity[0] - p->velocity[0];
-		vMyNormalDir[1] = velocity[1] - p->velocity[1];
-		VectorNormalize2D(vMyNormalDir);
-
-		if (fDistSquared - DotProduct2D(vDelta, vMyNormalDir) > 2304)
-		{
-			m_iSquadStandTime = 0;
-			return true;
-		}
-		m_iSquadStandTime = level.inttime;
-	}
-	return false;
-}
-
-/*
-===============
-Actor::PatrolNextNodeExists
-
-Returns true if next patrol node exits.
-===============
-*/
-bool Actor::PatrolNextNodeExists
-	(
-	void
-	)
-{
-	return m_patrolCurrentNode && !( m_patrolCurrentNode->IsSubclassOfTempWaypoint() ) && m_patrolCurrentNode->Next();
-}
-
-/*
-===============
-Actor::UpdatePatrolCurrentNode
-
-Update current patrol node.
-===============
-*/
-void Actor::UpdatePatrolCurrentNode
-	(
-	void
-	)
-{
-	bool next = false;
-	if (m_patrolCurrentNode)
-	{
-		if (m_patrolCurrentNode->IsSubclassOfTempWaypoint())
-		{
-			if (fabs(origin[0] - m_patrolCurrentNode->origin[0]) < 16.0
-				&& fabs(origin[1] - m_patrolCurrentNode->origin[1]) < 16.0)
-			{
-				next = true;
-			}
-		}
-		else if(PathExists() && PathComplete())
-		{
-
-			next = true;
-		}
-
-	}
-	if (next)
-	{
-		NextPatrolCurrentNode();
-	}
-}
-
-/*
-===============
-Actor::MoveToPatrolCurrentNode
-
+Actor::ExtractConstraints
 
 ===============
 */
-bool Actor::MoveToPatrolCurrentNode
-	(
-	void
-	)
-{
-	UpdatePatrolCurrentNode();
-	if (m_patrolCurrentNode && !m_bPatrolWaitTrigger)
-	{
-		Vector delta;
-		if (m_patrolCurrentNode->IsSubclassOfWaypoint())
-		{
-			if (MoveToWaypointWithPlayer())
-			{
-				m_bNextForceStart = false;
-				m_eNextAnimMode = 4;
-				m_csNextAnimString = m_csPatrolCurrentAnim;
-				FaceMotion();
-			}
-			else
-			{
-				Anim_Stand();
-				IdleLook();
-			}
-			
-			SetDest(m_patrolCurrentNode->origin);
-
-			if (m_fMoveDoneRadiusSquared == 0.0 || m_patrolCurrentNode->Next())
-				return false;
-			delta = m_patrolCurrentNode->origin - origin;
-		}
-		else
-		{
-			SimpleActor::SetPath(
-				m_patrolCurrentNode->origin,
-				"Actor::MoveToPatrolCurrentNode",
-				0,
-				NULL,
-				0);
-			if (!PathExists())
-			{
-				IdleLook();
-
-				Anim_Idle();
-				parm.movefail = qtrue;
-				return false;
-			}
-			if (MoveOnPathWithSquad())
-			{
-				if (PatrolNextNodeExists())
-				{
-					m_eNextAnimMode = 2;
-				}
-				else
-				{
-					m_eNextAnimMode = 3;
-				}
-				m_csNextAnimString = m_csPatrolCurrentAnim;
-				m_bNextForceStart = false;
-				FaceMotion();
-			}
-			else
-			{
-				Anim_Stand();
-				IdleLook();
-			}
-
-			if (m_fMoveDoneRadiusSquared == 0)
-				return false;
-
-			if (PathComplete())
-			{
-				return true;
-			}
-
-			if (!m_Path.HasCompleteLookahead() || m_patrolCurrentNode->Next())
-			{
-				return false;
-			}
-			delta = PathDelta();
-		}
-		return m_fMoveDoneRadiusSquared >= delta.lengthXYSquared();
-		
-	}
-
-
-	IdleLook();
-	Anim_Idle();
-	return false;
-}
-
-/*
-===============
-Actor::ClearAimNode
-
-Clear aim node.
-===============
-*/
-void Actor::ClearAimNode
-	(
-	void
-	)
-{
-	if (m_aimNode)
-	{
-
-		if (m_aimNode->IsSubclassOfTempWaypoint())
-		{
-			delete m_aimNode;
-		}
-		m_aimNode = NULL;
-	}
-}
-
-/*
-===============
-Actor::SetAimNode
-
-Change aim node.
-===============
-*/
-void Actor::SetAimNode
-	(
-	Vector& vec
-	)
-{
-	ClearAimNode();
-
-	TempWaypoint * twp = new TempWaypoint();
-	m_aimNode = twp;
-
-	m_aimNode->setOrigin(vec);
-}
-
-/*
-===============
-Actor::SetAimNode
-
-Change aim node.
-===============
-*/
-void Actor::SetAimNode
-	(
-	Listener *l
-	)
-{
-	ClearAimNode();
-	if (l)
-	{
-		if (!l->inheritsFrom(&SimpleEntity::ClassInfo))
-		{
-			ScriptError(
-				"Bad aim node with classname '%s' specified for '%s' at (%f %f %f)\n",
-				l->getClassname(),
-				targetname.c_str(),
-				origin.x,
-				origin.y,
-				origin.z);
-		}
-		m_aimNode = (SimpleEntity *)l;
-	}
-}
-
-/*
-===============
-Actor::ShowInfo_AimNode
-
-Show current aim node info.
-===============
-*/
-void Actor::ShowInfo_AimNode
-	(
-	void
-	)
-{
-	if (m_aimNode)
-	{
-		Com_Printf("aim node: %s\n", m_aimNode->targetname.c_str());
-	}
-	else
-	{
-		Com_Printf("no current aim node\n");
-	}
-}
-
-/*
-===============
-Actor::EventSetAccuracy
-
-Set current accuracy.
-===============
-*/
-void Actor::EventSetAccuracy
-	(
-	Event *ev
-	)
-{
-	mAccuracy = ev->GetFloat(1) / 100;
-}
-
-/*
-===============
-Actor::EventGetAccuracy
-
-Get current accuracy.
-===============
-*/
-void Actor::EventGetAccuracy
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(mAccuracy * 100);
-}
-
-/*
-===============
-Actor::GetThinkType
-
-Get think for csName.
-===============
-*/
-int Actor::GetThinkType
-	(
-	const_str csName
-	)
-{
-	int result = 0;
-	while (m_csThinkNames[result] != csName)
-	{
-		if (++result > NUM_THINKS - 1)
-		{
-			ScriptError("unknown think type '%s'", Director.GetString(csName).c_str());
-		}
-	}
-	return result;
-}
-
-/*
-===============
-Actor::SetThink
-
-Modifies think num of current thinkstate inside m_ThinkMap.
-===============
-*/
-void Actor::SetThink
-	(
-	eThinkState state,
-	eThinkNum think
-	)
-{
-	m_ThinkMap[state] = think;
-	if (m_ThinkState == state)
-		m_bDirtyThinkState = true;
-}
-
-/*
-===============
-Actor::SetThink
-
-Set think to idle.
-===============
-*/
-void Actor::SetThinkIdle
-	(
-	eThinkNum think_idle
-	)
-{
-	eThinkNum think_curious;
-
-	switch (think_idle)
-	{
-	case THINK_PATROL:
-	case THINK_RUNNER:
-		m_bBecomeRunner = true;
-		think_curious = THINK_CURIOUS;
-		break;
-	case THINK_MACHINEGUNNER:
-		think_curious = THINK_MACHINEGUNNER;
-		break;
-	case THINK_DOG_IDLE:
-		think_curious = THINK_DOG_CURIOUS;
-		SetThink(THINKSTATE_GRENADE, think_curious);
-		break;
-	case THINK_ANIM:
-		think_curious = THINK_ANIM_CURIOUS;
-		break;
-	case THINK_BALCONY_IDLE:
-		think_curious = THINK_BALCONY_CURIOUS;
-		break;
-	default:
-		think_curious = THINK_CURIOUS;
-		break;
-	}
-
-
-	SetThink(THINKSTATE_IDLE, think_idle);
-
-	SetThink(THINKSTATE_CURIOUS, think_curious);
-}
-
-/*
-===============
-Actor::SetThinkState
-
-Set thinkstate.
-===============
-*/
-void Actor::SetThinkState
-	(
-	eThinkState state,
-	eThinkLevel level
-	)
-{
-	if (IsAttackState(state))
-	{
-		m_csIdleMood = STRING_NERVOUS;
-		if (m_ThinkMap[THINKSTATE_ATTACK] != THINK_ALARM && m_ThinkMap[THINKSTATE_ATTACK] != THINK_WEAPONLESS && m_ThinkMap[THINKSTATE_ATTACK] != THINK_DOG_ATTACK && !GetWeapon(WEAPON_MAIN))
-		{
-			Com_Printf(
-				"^~^~^ LD ERROR: (entnum %i, radnum %i, targetname '%s'):    forcing weaponless attack state.\n"
-				"^~^~^ Level designers should specify 'type_attack weaponless' for this guy.\n",
-				entnum,
-				radnum,
-				targetname.c_str());
-			SetThink(THINKSTATE_ATTACK, THINK_WEAPONLESS);
-		}
-	}
-
-	m_ThinkStates[level] = state;
-
-	if (level >= m_ThinkLevel)
-	{
-		m_bDirtyThinkState = true;
-	}
-
-}
-
-/*
-===============
-Actor::EndCurrentThinkState
-
-End current think state.
-===============
-*/
-void Actor::EndCurrentThinkState
-	(
-	void
-	)
-{
-	SetThinkState(THINKSTATE_VOID, m_ThinkLevel);
-}
-
-/*
-===============
-Actor::ClearThinkStates
-
-Clear all thinkstates.
-===============
-*/
-void Actor::ClearThinkStates
-	(
-	void
-	)
-{
-	for (int i = 0; i <= NUM_THINKLEVELS -1; i++)
-	{
-		SetThinkState(THINKSTATE_VOID, (eThinkLevel)i);
-	}
-}
-
-/*
-===============
-Actor::CurrentThink
-
-Current think.
-===============
-*/
-int Actor::CurrentThink
-	(
-	void
-	) const
-{
-	return m_Think[ m_ThinkLevel ];
-}
-
-/*
-===============
-Actor::IsAttacking
-
-Returns true if actor is in attack state.
-===============
-*/
-bool Actor::IsAttacking
-	(
-	void
-	) const
-{
-	return m_ThinkStates[ THINKLEVEL_NORMAL ] == THINKSTATE_ATTACK;
-}
-
-/*
-===============
-Actor::EventGetFov
-
-Get current fov.
-===============
-*/
-void Actor::EventGetFov
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fFov);
-}
-
-/*
-===============
-Actor::EventSetFov
-
-Set current fov.
-============
-*/
-void Actor::EventSetFov
-	(
-	Event *ev
-	)
-{
-	float fov = ev->GetFloat(1);
-	if (fov < 0 || fov > 360)
-	{
-		ScriptError("fov must be in the range [0,360]");
-	}
-	m_fFov = fov;
-	m_fFovDot = cos(0.5 * fov * M_PI / 180.0);
-}
-
-void Actor::EventSetDestIdle
-	(
-	Event *ev
-	)
-{
-	// not found in ida
-}
-
-void Actor::EventSetDestIdle2
-	(
-	Event *ev
-	)
-{
-	// not found in ida
-}
-
-void Actor::EventSetTypeIdle
-	(
-	Event *ev
-	)
-{
-	eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1));
-	glbs.Printf("EventSetTypeIdle %s : %d\n", ev->GetString(1).c_str(), think);
-	if (!Actor::GlobalFuncs[think].IsState(THINKSTATE_IDLE))
-	{
-		SetThinkIdle(THINK_IDLE);
-		ScriptError("Invalid idle think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
-	}
-
-	SetThinkIdle(think);
-}
-
-void Actor::EventGetTypeIdle
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_IDLE]]);
-}
-
-void Actor::EventSetTypeAttack
-	(
-	Event *ev
-	)
-{
-	eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1));
-	glbs.Printf("EventSetTypeAttack %s : %d\n", ev->GetString(1).c_str(), think);
-	//check if the wanted think is an attack one.
-	if (!Actor::GlobalFuncs[think].IsState(THINKSTATE_ATTACK))
-	{
-		SetThink(THINKSTATE_ATTACK, THINK_TURRET);
-
-		ScriptError("Invalid attack think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
-	}
-
-	SetThink(THINKSTATE_ATTACK, think);
-}
-
-void Actor::EventGetTypeAttack
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_ATTACK]]);
-}
-
-void Actor::EventSetTypeDisguise
-	(
-	Event *ev
-	)
-{
-	eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1));
-	glbs.Printf("EventSetTypeDisguise %s : %d\n", ev->GetString(1).c_str(), think);
-	if (!Actor::GlobalFuncs[think].IsState(THINKSTATE_DISGUISE))
-	{
-		SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
-
-		ScriptError("Invalid disguise think '%s'", Director.GetString(m_csThinkNames[think]).c_str());
-	}
-
-	SetThink(THINKSTATE_DISGUISE, think);
-}
-
-void Actor::EventGetTypeDisguise
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_DISGUISE]]);
-}
-
-void Actor::EventSetDisguiseLevel
-	(
-	Event *ev
-	)
-{
-	m_iDisguiseLevel = ev->GetInteger(1);
-	if (m_iDisguiseLevel -1 > 1)
-	{
-		m_iDisguiseLevel = 1;
-		ScriptError("bad disguise level %d for %s, setting to 1\n", m_iDisguiseLevel, targetname.c_str());
-	}
-}
-
-void Actor::EventGetDisguiseLevel
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_iDisguiseLevel);
-}
-
-void Actor::EventSetTypeGrenade
-	(
-	Event *ev
-	)
-{
-	eThinkNum think = (eThinkNum)GetThinkType(ev->GetConstString(1));
-	glbs.Printf("EventSetTypeGrenade %s : %d\n", ev->GetString(1).c_str(), think);
-	if (!Actor::GlobalFuncs[think].IsState(THINKSTATE_GRENADE))
-	{
-		SetThink(THINKSTATE_GRENADE, THINK_GRENADE);
-
-		ScriptError("Invalid grenade think '%s'", Director.GetString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]).c_str());
-	}
-	
-	SetThink(THINKSTATE_GRENADE, think);
-}
-
-void Actor::EventGetTypeGrenade
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csThinkNames[m_ThinkMap[THINKSTATE_GRENADE]]);
-}
-
-void Actor::EventSetMinDistance
-	(
-	Event *ev
-	)
-{
-	m_fMinDistance = ev->GetFloat(1);
-
-	if (m_fMinDistance < 0)
-	{
-		m_fMinDistance = 0;
-		Com_Printf(
-			"^~^~^ Warning: mindist negative, forcing to %g for entity %i, targetname '%s'\n",
-			m_fMinDistance,
-			entnum,
-			targetname.c_str());
-	}
-	m_fMinDistanceSquared = m_fMinDistance * m_fMinDistance;
-}
-
-void Actor::EventGetMinDistance
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fMinDistance);
-}
-
-void Actor::EventSetMaxDistance
-	(
-	Event *ev
-	)
-{
-	m_fMaxDistance = ev->GetFloat(1);
-	//FIXME: macro
-	if (m_fMaxDistance < 256)
-	{
-		m_fMaxDistance = 256;
-		Com_Printf(
-			"^~^~^ Warning: maxdist too small, forcing to %g for entity %i, targetname '%s'\n",
-			m_fMaxDistance,
-			entnum,
-			targetname.c_str());
-	}
-	m_fMaxDistanceSquared = m_fMaxDistance * m_fMaxDistance;
-}
-
-void Actor::EventGetMaxDistance
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fMaxDistance);
-}
-
-void Actor::EventSetLeash
-	(
-	Event *ev
-	)
-{
-	m_fLeash = ev->GetFloat(1);
-	m_fLeashSquared = Square(m_fLeash);
-}
-
-void Actor::EventGetLeash
-(
-	Event *ev
-)
-{
-	ev->AddFloat(m_fLeash);
-}
-
-void Actor::EventSetInterval
-	(
-	Event *ev
-	)
-{
-	m_fInterval = ev->GetFloat(1);
-}
-
-void Actor::EventDistToEnemy
-	(
-	Event *ev
-	)
-{
-	float dist = 0;
-	if (m_Enemy)
-	{
-		Vector distV = origin - m_Enemy->origin;
-		dist = distV.length();
-	}
-	ev->AddFloat(dist);
-}
-
-void Actor::EventGetInterval
-(
-	Event *ev
-)
-{
-	ev->AddFloat(m_fInterval);
-}
-
-void Actor::EventGetRunAnim
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(GetRunAnim());
-}
-
-void Actor::EventGetWalkAnim
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(GetWalkAnim());
-}
-
-void Actor::EventSetAnimName
-	(
-	Event *ev
-	)
-{
-	m_csAnimName = ev->GetConstString(1);
-}
-
-void Actor::EventGetAnimName
-(
-	Event *ev
-)
-{
-	ev->AddConstString(m_csAnimName);
-}
-
-void Actor::EventSetDisguiseRange
-	(
-	Event *ev
-	)
-{
-	float range = ev->GetFloat(1);
-	m_fMaxDisguiseDistSquared = Square(range);
-}
-
-void Actor::EventGetDisguiseRange
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(sqrt(m_fMaxDisguiseDistSquared));
-}
-
-void Actor::EventSetDisguisePeriod
-	(
-	Event *ev
-	)
-{
-	m_iDisguisePeriod = ev->GetFloat(1) * 1000 + 0.5;
-}
-
-void Actor::EventGetDisguisePeriod
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_iDisguisePeriod / 1000.0);
-}
-
-void Actor::EventSetDisguiseAcceptThread
-	(
-	Event *ev
-	)
-{
-
-	if (ev->IsFromScript())
-	{
-		m_DisguiseAcceptThread.SetThread(ev->GetValue());
-	}
-	else
-	{
-
-		m_DisguiseAcceptThread.Set(ev->GetString(1));
-	}
-}
-
-void Actor::EventGetDisguiseAcceptThread
-	(
-	Event *ev
-	)
-{
-	m_DisguiseAcceptThread.GetScriptValue(&ev->GetValue());
-}
-
-void Actor::EventAttackPlayer
-	(
-	Event *ev
-	)
-{
-	Player *pPlayer = (Player *)G_GetEntity(0);
-	if (!pPlayer)
-	{
-		ScriptError("player doesn't exist");
-	}
-	else
-	{
-		m_PotentialEnemies.ConfirmEnemy(this, pPlayer);
-		m_bForceAttackPlayer = true;
-	}
-}
-
-void Actor::ForceAttackPlayer
-	(
-	void
-	)
-{
-	m_PotentialEnemies.ConfirmEnemy(this, (Sentient *)G_GetEntity(0));
-}
-
-void Actor::EventSetAlarmNode
-	(
-	Event *ev
-	)
-{
-	Listener *l = ev->GetListener(1);
-	if (l)
-	{
-		if (!l->inheritsFrom(&SimpleEntity::ClassInfo))
-		{
-			ScriptError("Alarm node must be an entity");
-		}
-	}
-	m_AlarmNode = (SimpleEntity *)l;
-}
-
-void Actor::EventGetAlarmNode
-	(
-	Event *ev
-	)
-{
-	ev->AddListener(m_AlarmNode);
-}
-
-void Actor::EventSetAlarmThread
-	(
-	Event *ev
-	)
-{
-	if (ev->IsFromScript())
-	{
-		m_AlarmThread.SetThread(ev->GetValue());
-	}
-	else
-	{
-
-		m_AlarmThread.Set(ev->GetString(1));
-	}
-}
-
-void Actor::EventGetAlarmThread
-	(
-	Event *ev
-	)
-{
-	
-	m_AlarmThread.GetScriptValue(&ev->GetValue());
-}
-
-void Actor::EventSetSoundAwareness
-	(
-	Event *ev
-	)
-{
-	m_fSoundAwareness = ev->GetFloat(1);
-}
-
-void Actor::EventGetSoundAwareness
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fSoundAwareness);
-}
-
-void Actor::EventSetGrenadeAwareness
-	(
-	Event *ev
-	)
-{
-	m_fGrenadeAwareness = ev->GetFloat(1);
-}
-
-void Actor::EventGetGrenadeAwareness
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fGrenadeAwareness);
-}
-
-str Actor::ThinkName
-	(
-	void
-	) const
-{
-	return Director.GetString( m_csThinkNames[ m_Think[ m_ThinkLevel ] ] );
-}
-
-str Actor::ThinkStateName
-	(
-	void
-	) const
-{
-	return Director.GetString( m_csThinkStateNames[ m_ThinkState ] );
-}
-
-void Actor::EventSetTurret
-	(
-	Event *ev
-	)
-{
-	Listener *l = ev->GetListener(1);
-	if (l->inheritsFrom(&TurretGun::ClassInfo))
-	{
-		m_pTurret = (TurretGun *)l;
-	}
-}
-
-void Actor::EventGetTurret
-	(
-	Event *ev
-	)
-{
-	ev->AddListener(m_pTurret);
-}
-
-void Actor::EventEnableEnemy
-	(
-	Event *ev
-	)
-{
-	m_bDesiredEnableEnemy = ev->GetBoolean(1);
-}
-
-void Actor::EventEnablePain
-	(
-	Event *ev
-	)
-{
-	m_bEnablePain = ev->GetBoolean(1);
-}
-
-void Actor::EventActivate
-	(
-	Event *ev
-	)
-{
-	m_bPatrolWaitTrigger = false;
-	Unregister(STRING_TRIGGER);
-}
-
-void Actor::EventGetAmmoGrenade
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(AmmoCount("grenade"));
-}
-
-void Actor::EventSetAmmoGrenade
-	(
-	Event *ev
-	)
-{
-	GiveAmmo("grenade", ev->GetInteger(1));
-}
-
-void Actor::EventInterruptPoint
-	(
-	Event *ev
-	)
-{
-
-	GlobalFuncs_t *func = &GlobalFuncs[m_Think[m_ThinkLevel]];
-	
-	if (func->PostShoot)
-		(this->*func->PostShoot)();
-}
-
-void Actor::EventAnimScript
-	(
-	Event *ev
-	)
-{
-	m_bAnimScriptSet = true;
-	m_csAnimScript = ev->GetConstString(1);
-
-	//FIXME: macro
-	m_AnimMode = 1;
-
-
-	SetThinkIdle(THINK_ANIM);
-}
-
-void Actor::EventAnimScript_Scripted
-	(
-	Event *ev
-	)
-{
-	m_bAnimScriptSet = true;
-	m_csAnimScript = ev->GetConstString(1);
-
-	//FIXME: macro
-	m_AnimMode = 5;
-
-
-	SetThinkIdle(THINK_ANIM);
-}
-
-void Actor::EventAnimScript_Noclip
-	(
-	Event *ev
-	)
-{
-	m_bAnimScriptSet = true;
-	m_csAnimScript = ev->GetConstString(1);
-	//FIXME: macro
-	m_AnimMode = 6;
-
-
-	SetThinkIdle(THINK_ANIM);
-}
-
-void Actor::EventReload_mg42
-	(
-	Event *ev
-	)
-{
-	//FIXME: macos/enum
-	if (m_State != 1201)
-	{
-		if (m_State == 1200)
-		{
-			m_bAnimScriptSet = true;
-			TransitionState(1201, 0);
-		}
-		else
-		{
-			Unregister(STRING_ANIMDONE);
-		}
-	}
-}
-
-void Actor::SetPathWithLeash
-	(
-	Vector vDestPos,
-	const char *description,
-	int iMaxDirtyTime
-	)
-{
-	vec2_t dist = { vDestPos[0] - m_vHome[0],  vDestPos[1] - m_vHome[1] };
-	float distSq = DotProduct2D(dist, dist);
-	if (distSq <= m_fLeashSquared)
-	{
-		dist[0] = origin[0] - m_vHome[0];
-		dist[1] = origin[1] - m_vHome[1];
-		distSq = DotProduct2D(dist, dist);
-		if (distSq <= m_fLeashSquared)
-		{
-			SetPath(
-				vDestPos,
-				description,
-				iMaxDirtyTime,
-				m_vHome,
-				m_fLeashSquared);
-		}
-	}
-	else
-	{
-		ClearPath();
-	}
-}
-
-void Actor::SetPathWithLeash
-	(
-	SimpleEntity *pDestNode,
-	const char *description,
-	int iMaxDirtyTime
-	)
-{
-	if (pDestNode)
-	{
-		SetPathWithLeash(
-			pDestNode->origin,
-			description,
-			iMaxDirtyTime);
-	}
-	else
-	{
-		if (m_bPathErrorTime + 5000 < level.inttime)
-		{
-			m_bPathErrorTime = level.inttime;
-			Com_Printf(
-				"^~^~^ No destination node specified for '%s' at (%f %f %f)\n",
-				targetname.c_str(),
-				origin[0],
-				origin[1],
-				origin[2]);
-		}
-		ClearPath();
-	}
-}
-
-void Actor::FindPathAwayWithLeash
-	(
-	vec3_t vAwayFrom,
-	vec3_t vDirPreferred,
-	float fMinSafeDist
-	)
-{
-	m_Path.FindPathAway(
-		origin,
-		vAwayFrom,
-		vDirPreferred,
-		this,
-		fMinSafeDist,
-		m_vHome,
-		m_fLeashSquared);
-	ShortenPathToAvoidSquadMates();
-}
-
-void Actor::FindPathNearWithLeash
-	(
-	vec3_t vNearbyTo,
-	float fCloseDistSquared
-	)
-{
-	vec2_t dist = {vNearbyTo[0] - m_vHome[0],  vNearbyTo[1] - m_vHome[1]};
-	float distSq = DotProduct2D(dist,dist);
-	
-	if (distSq <= m_fLeashSquared + fCloseDistSquared + 2 * sqrt(m_fLeashSquared * fCloseDistSquared))
-	{
-		dist[0] = origin[0] - m_vHome[0];
-		dist[1] = origin[1] - m_vHome[1];
-		distSq = DotProduct2D(dist, dist);
-		if (distSq <= m_fLeashSquared)
-		{
-			m_Path.FindPathNear(
-				origin,
-				vNearbyTo,
-				this,
-				0,
-				fCloseDistSquared,
-				m_vHome,
-				m_fLeashSquared);
-			ShortenPathToAvoidSquadMates();
-		}
-
-	}
-}
-
-bool Actor::CanMovePathWithLeash
-	(
-	void
-	) const
-{
-	vec2_t delta;
-
-	if( PathExists() )
-	{
-		delta[ 0 ] = origin[ 0 ] - m_vHome[ 0 ];
-		delta[ 1 ] = origin[ 1 ] - m_vHome[ 1 ];
-
-		return ( VectorLength2DSquared( delta ) < m_fLeashSquared ) || ( DotProduct2D( delta, m_Path.CurrentDelta() ) < 0.0f );
-	}
-
-	return false;
-}
-
-bool Actor::MovePathWithLeash
-	(
-	void
-	)
-{
-	if( CanMovePathWithLeash() )
-	{
-		Anim_RunToInOpen( 2 );
-		FaceMotion();
-		return true;
-	}
-	else
-	{
-		Anim_Aim();
-		return false;
-	}
-}
-
-bool Actor::ShortenPathToAttack
-	(
-	float fMinDist
-	)
-{
-	if (PathExists() && !PathComplete() && PathAvoidsSquadMates())
-	{
-		for (auto current_node = CurrentPathNode(); current_node >= LastPathNode(); current_node--)
-		{
-			Vector dist = current_node->point - origin;
-			if (dist * dist >= fMinDist * fMinDist)
-			{
-				if (CanSeeFrom(eyeposition + current_node->point, m_Enemy))
-				{
-					m_Path.TrimPathFromEnd((current_node - LastPathNode()) / 32);
-					return true;
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-void Actor::StrafeToAttack
-	(
-	float fDist,
-	vec3_t vDir
-	)
-{
-	Vector vEnemyCentroid, vDelta, vSpot, vDestPos;
-	Vector mins(-16,-16,16);
-	Vector maxs(16,16,128);
-
-	vDestPos = vDir;
-	vDestPos *= fDist;
-	vDestPos += origin;
-
-	vDelta = vDestPos - m_vLastEnemyPos;
-
-	if (m_fMaxDistanceSquared <= vDelta.lengthSquared() || vDelta.lengthSquared() <= m_fMinDistanceSquared )
-	{
-		ClearPath();
-		return;
-	}
-	if (!G_SightTrace(
-		origin,
-		mins,
-		maxs,
-		vDestPos,
-		this,
-		NULL,
-		//FIXME: macro
-		1107437825,
-		qtrue,
-		"Actor::StrafeToAttack 1"))
-	{
-		ClearPath();
-		return;
-	}
-	vSpot = vDir;
-	vSpot *= fDist;
-
-	vDelta = m_vLastEnemyPos;
-	vDelta.z += m_Enemy->centroid.z - m_Enemy->origin.z;
-
-	if (!G_SightTrace(
-		EyePosition() + vSpot,
-		vec_zero,
-		vec_zero,
-		vDelta,
-		this,
-		m_Enemy,
-		//FIXME: macro
-		33819417,
-		qfalse,
-		"Actor::StrafeToAttack 1"))
-	{
-		SetPathWithLeash(vDestPos, NULL, 0);
-	}
-	else
-	{
-		ClearPath();
-
-	}
-}
-
-Vector Actor::GunTarget
-	(
-	bool bNoCollision
-	)
-{
-	float accuracy;
-	static bool doInit = true;
-	static cvar_t *aiRanges[4];
-	Vector vRet;
-
-	if (doInit)
-	{
-		aiRanges[0] = gi.Cvar_Get("g_aishortrange", "500", 0);
-		aiRanges[1] = gi.Cvar_Get("g_aimediumrange", "700", 0);
-		aiRanges[2] = gi.Cvar_Get("g_ailongrange", "1000", 0);
-		aiRanges[3] = gi.Cvar_Get("g_aisniperrange", "2200", 0);
-		doInit = false;
-	}
-
-	if (mTargetPos == vec_zero)
-	{
-		AnglesToAxis(origin, orientation);
-		vRet = Vector(orientation[0]) * 2048 + EyePosition();
-		return vRet;
-	}
-	float scatterMult = 1;
-
-	Player *player = NULL;
-	if (m_Enemy)
-	{
-		if (m_Enemy->IsSubclassOfPlayer())
-		{
-			player = (Player *)m_Enemy.Pointer();
-
-
-			Weapon *weap = GetActiveWeapon(WEAPON_MAIN);
-			Vector dir;
-			dir = player->centroid - centroid;
-
-			if (weap)
-			{
-
-				MPrintf("WEAPON RANGE: %f  dist: %f\n", aiRanges[weap->mAIRange]->value, dir.length());
-				scatterMult = dir.length() / aiRanges[weap->mAIRange]->value;
-				if (dir.length() > aiRanges[weap->mAIRange]->value)
-				{
-					if (scatterMult > 1)
-					{
-						accuracy = mAccuracy / scatterMult;
-					}
-					MPrintf("OUT OF RANGE - scatterMult: %f\n", scatterMult);
-				}
-			}
-			else
-			{
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"ERROR Actor::GunTarget without a weapon\\n\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
-				assert(false && assertStr);
-			}
-		}
-		else if (fabs(m_Enemy->origin[2] - origin[2]) >= 128)
-		{
-			scatterMult = 0.5;
-		}
-	}
-
-	if (random2() > accuracy)
-	{
-		MPrintf("MISS - scatterMult: %f\n", scatterMult);
-		
-		if (player)
-		{
-			static cvar_t *scatterHeight;
-			static cvar_t *scatterWide;
-			static bool doInitScatters = false;
-			int lastTrail;
-			
-			lastTrail = player->mCurTrailOrigin - 1;
-			if (lastTrail < 0)
-				lastTrail = 1;
-			
-			vRet = player->mvTrail[lastTrail];
-			//continue here:
-			//Player *tPlayer = player + 12*lastTrail;//weird
-			if (!G_SightTrace(GunPosition(), vec_zero, vec_zero, player->mvTrail[lastTrail], this, player, 33819417, 0, "Actor::GunTarget 1"))
-			{
-				vRet = player->mvTrailEyes[lastTrail];
-			}
-			if (!doInitScatters)
-			{
-				scatterWide = gi.Cvar_Get("g_aiScatterWide", "16.0", 0);
-				scatterHeight = gi.Cvar_Get("g_aiScatterHeight", "45.0", 0);
-				doInitScatters = true;
-			}
-			vRet.x += crandom() * scatterWide->value * scatterMult;
-			vRet.y += crandom() * scatterWide->value * scatterMult;
-			vRet.z += crandom() * scatterHeight->value * scatterMult;
-			
-			if (player &&  player->GetVehicleTank())
-			{
-				vRet.z -= 128;
-			}
-		}
-		else
-		{
-			int sign;
-
-			if (random() > 0.5)
-				sign = 1;
-			else
-				sign = -1;
-			vRet.x = sign * 32 * (random() + 1);
-
-			if (random() > 0.5)
-				sign = 1;
-			else
-				sign = -1;
-			vRet.y = sign * 32 * (random() + 1);
-
-			if (random() > 0.5)
-				sign = 1;
-			else
-				sign = -1;
-			vRet.z = sign * 48 * (random() + 1);
-
-			vRet += mTargetPos;
-
-			if (player &&  player->GetVehicleTank())
-			{
-				vRet.z -= 128;
-			}
-		}
-		return vRet;
-	}
-
-	MPrintf("HIT\n");
-
-	if (player)
-	{
-		vRet = player->centroid;
-	}
-	else
-	{
-		vRet = mTargetPos;
-	}
-
-	if (m_Enemy)
-	{
-		if (!G_SightTrace(GunPosition(), vec_zero, vec_zero, vRet, this, m_Enemy, 33819417, qfalse, "Actor::GunTarget 1"))
-		{
-			vRet = EyePosition();
-		}
-	}
-
-	if (player &&  player->GetVehicleTank())
-	{
-		vRet.z -= 128;
-	}
-	return vRet;
-}
-
-qboolean Actor::setModel
-	(
-	void
-	)
-{
-	str headModel, headSkin, weapon;
-	headModel = level.GetRandomHeadModel(model);
-	headSkin = level.GetRandomHeadSkin(model);
-	//qboolean bSuccess;
-	str name = "", tempstr;
-
-	if (model != "")
-	{
-		if (m_csLoadOut != STRING_EMPTY)
-		{
-
-			name = "weapon|" + Director.GetString(m_csLoadOut) + "|";
-		}
-
-		if (m_csHeadModel == STRING_EMPTY)
-		{
-			m_csHeadModel = Director.AddString(level.GetRandomHeadModel(model));
-		}
-
-		if (m_csHeadModel != STRING_EMPTY)
-		{
-			name += "headmodel|" + Director.GetString(m_csHeadModel) + "|";
-		}
-
-		if (m_csHeadSkin == STRING_EMPTY)
-		{
-			m_csHeadSkin = Director.AddString(level.GetRandomHeadSkin(model));
-		}
-
-		if (m_csHeadSkin != STRING_EMPTY)
-		{
-			name += "headskin|" + Director.GetString(m_csHeadSkin) + "|";//FIXME: not sure of this last "|"
-		}
-		name += model;
-	}
-	gi.DPrintf2("Actor::setModel(): name: %s, model: %s, headModel: %s, headSkin: %s\n", name.c_str(), model.c_str(), headModel.c_str(), headSkin.c_str());
-	level.skel_index[edict->s.number] = -1;
-	return gi.setmodel(edict, name);
-}
-
-void Actor::EventSetHeadModel
-	(
-	Event *ev
-	)
-{
-
-	m_csHeadModel = ev->GetConstString(1);
-	setModel();
-}
-
-void Actor::EventGetHeadModel
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csHeadModel);
-}
-
-void Actor::EventSetHeadSkin
-	(
-	Event *ev
-	)
-{
-	m_csHeadSkin = ev->GetConstString(1);
-	setModel();
-}
-
-void Actor::EventGetHeadSkin
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csHeadSkin);
-}
-
-void Actor::EventSetNoIdle
-	(
-	Event *ev
-	)
-{
-	m_bNoIdleAfterAnim = ev->GetInteger(1);
-}
-
-void Actor::EventGetNoIdle
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bNoIdleAfterAnim);
-}
-
-void Actor::EventGetEnemy
-	(
-	Event *ev
-	)
-{
-	ev->AddListener(m_Enemy);
-}
-
-void Actor::EventSetMaxNoticeTimeScale
-	(
-	Event *ev
-	)
-{
-	float noticeScale; // fst7
-
-	noticeScale = ev->GetFloat(1);
-	if (noticeScale <= 0.0)
-	{
-		Com_Printf("^~^~^ ERROR: noticescale: value must be greater than 0\n");
-	}
-	else
-	{
-		m_fMaxNoticeTimeScale = noticeScale / 100;
-	}
-}
-
-void Actor::EventGetMaxNoticeTimeScale
-	(
-	Event *ev
-	)
-{
-	
-	ev->AddFloat(m_fMaxNoticeTimeScale * 100);
-}
-
-void Actor::EventSetFixedLeash
-	(
-	Event *ev
-	)
-{
-	m_bFixedLeash = ev->GetBoolean(1);
-}
-
-void Actor::EventGetFixedLeash
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bFixedLeash);
-}
-
-void Actor::Holster
-	(
-	void
-	)
-{
-	if (activeWeaponList[0])
-	{
-		DeactivateWeapon(WEAPON_MAIN);
-	}
-}
-
-void Actor::Unholster
-	(
-	void
-	)
-{
-	Weapon *weap;
-
-	if (!activeWeaponList[0])
-	{
-		weap = GetWeapon(WEAPON_MAIN);
-		if (weap)
-		{
-			useWeapon(weap, WEAPON_MAIN);
-			ActivateNewWeapon();
-		}
-	}
-}
-
-void Actor::EventHolster
-	(
-	Event *ev
-	)
-{
-	if (activeWeaponList[WEAPON_MAIN])
-	{
-		DeactivateWeapon(WEAPON_MAIN);
-	}
-}
-
-void Actor::EventUnholster
-	(
-	Event *ev
-	)
-{
-	Unholster();
-}
-
-void Actor::EventSoundDone
-	(
-	Event *ev
-	)
-{
-	//soundChannel_t
-	int channel = ev->GetInteger(1);
-	str name = ev->GetString(2);
-	if (gi.S_IsSoundPlaying(channel, name))
-	{
-		Event e1(EV_SoundDone);
-		e1.AddInteger(channel);
-		e1.AddString(name);
-		PostEvent(e1, level.frametime);
-	}
-	else if (m_bSayAnimSet && m_iSaySlot == -2) //FIXME: macro
-	{
-		ChangeSayAnim();
-		if (m_csSayAnim == STRING_EMPTY)
-		{
-			//gi.DPrintf("unregister STRING_SAYDONE\n");
-			Unregister(STRING_SAYDONE);
-		}
-	}
-	else
-	{
-		Unregister(STRING_SOUNDDONE);
-	}
-}
-
-void Actor::EventSound
-	(
-	Event *ev
-	)
-{
-	ProcessSoundEvent(ev, m_Team == TEAM_AMERICAN);
-}
-
-void Actor::EventIsEnemyVisible
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bEnemyVisible);
-}
-
-void Actor::EventGetEnemyVisibleChangeTime
-	(
-	Event *ev
-	)
-{
-	//FIXME: /100 ??
-	ev->AddFloat(m_iEnemyVisibleChangeTime / 100);
-}
-
-void Actor::EventGetLastEnemyVisibleTime
-	(
-	Event *ev
-	)
-{
-	//FIXME: /100 ??
-	ev->AddFloat(m_iLastEnemyVisibleTime / 100 );
-}
-
-void Actor::EventSetFallHeight
-	(
-	Event *ev
-	)
-{
-	float fHeight = ev->GetFloat(1);
-
-	if (fHeight < MIN_FALLHEIGHT)
-	{
-		ScriptError("value less than %d not allowed", MIN_FALLHEIGHT);
-	}
-	if (fHeight > MAX_FALLHEIGHT)
-	{
-		ScriptError("value greater than %d not allowed", MAX_FALLHEIGHT);
-	}
-
-	m_Path.SetFallHeight(fHeight);
-}
-
-void Actor::EventGetFallHeight
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_Path.GetFallHeight());
-}
-
-void Actor::EventCanMoveTo
-	(
-	Event *ev
-	)
-{
-	float fIntervalSquared, fDistSquared;
-	vec2_t vDelta;
-	Vector vDest;
-
-	vDest = ev->GetVector(1);
-	VectorSub2D(vDest, m_vHome, vDelta);
-	fDistSquared = VectorLength2DSquared(vDelta);
-	if (fDistSquared >= m_fLeashSquared)
-	{
-		ev->AddInteger(0);
-		return;
-	}
-	else if(m_Enemy != NULL)
-	{
-		VectorSub2D(vDest, m_Enemy->origin, vDelta);
-		fDistSquared = VectorLength2DSquared(vDelta);
-		if (m_fMinDistanceSquared >= fDistSquared || fDistSquared >= m_fMaxDistanceSquared)
-		{
-			ev->AddInteger(qfalse);
-			return;
-		}
-	}
-	if (m_fInterval == 0)
-	{
-		for (auto pSquadMate = m_pNextSquadMate; pSquadMate != this ; pSquadMate = pSquadMate->m_pNextSquadMate)
-		{
-			float v27, v29, v30, v32, v33, v34, v35, v37, v38;
-			if (pSquadMate->IsSubclassOfActor())
-			{
-				Sentient *pEnemy = pSquadMate->m_Enemy;
-				if (pEnemy)
-				{
-					v27 = pSquadMate->origin[0];
-					v29 = pEnemy->origin[0] - v27;
-					v30 = pSquadMate->origin[1];
-					v32 = pEnemy->origin[1] - v30;
-				}
-				else
-				{
-					continue;
-				}
-			}
-			else
-			{
-				v27 = pSquadMate->origin[0];
-				v29 = pSquadMate->orientation[0][0];
-				v32 = pSquadMate->orientation[0][1];
-				v30 = pSquadMate->origin[1];
-			}
-			v33 = v32 * origin[0];
-			v34 = v27 * v32 - v30 * v29;
-			v35 = v33 - v29 * origin[1] - v34;
-			v37 = v32 * vDest[0];
-			v38 = v37 - v29 * vDest[1] - v34;
-
-			// check if they both have different sign.
-			if (((int)v38 ^ (int)v35) < 0)
-			{
-				ev->AddInteger(qfalse);
-				return;
-			}
-		}
-		ev->AddInteger(qtrue);
-		return;
-	}
-
-	fIntervalSquared = Square(m_fInterval);
-
-	for (auto pSquadMate = m_pNextSquadMate; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate)
-	{
-		Vector vDel;
-		vDel = vDest - pSquadMate->origin;
-		if (fIntervalSquared <= vDest.lengthSquared())
-		{
-			continue;
-		}
-
-		if ((origin-pSquadMate->origin).lengthSquared() > vDest.lengthSquared())
-		{
-			break;
-		}
-	}
-	ev->AddInteger(qfalse);
-}
-
-void Actor::EventMoveDir
-	(
-	Event *ev
-	)
-{
-	
-	vec2_t vec;
-	if (!PathGoalSlowdownStarted())
-	{
-		vec[0] = velocity.x;
-		vec[1] = velocity.y;
-		if ( velocity.x == 0 && velocity.y == 0 && PathExists() && !PathComplete())
-		{
-				vec[0] = PathDelta()[0];
-				vec[1] = PathDelta()[1];
-		}
-		VectorNormalize2D(vec);
-	}
-
-	ev->AddVector(vec);
-}
-
-void Actor::EventIntervalDir
-	(
-	Event *ev
-	)
-{
-	//FIXME: macro
-	if (level.inttime >= m_iIntervalDirTime + 250)
-	{
-		m_vIntervalDir = vec_zero;
-		m_iIntervalDirTime = level.inttime;
-		if (m_Enemy)
-		{
-			m_vIntervalDir = GetAntiBunchPoint() - origin;
-			if (m_vIntervalDir.x != 0 || m_vIntervalDir.y != 0)
-			{
-				VectorNormalizeFast(m_vIntervalDir);
-			}
-		}
-	}
-	
-	ev->AddVector(m_vIntervalDir);
-}
-
-void Actor::EventResetLeash
-	(
-	Event *ev
-	)
-{
-	m_vHome = origin;
-	//delete m_pTetherEnt;
-	m_pTetherEnt = NULL;
-}
-
-void Actor::EventTether
-	(
-	Event *ev
-	)
-{
-	m_pTetherEnt = ev->GetSimpleEntity(1);
-}
-
-void Actor::EventGetThinkState
-	(
-	Event *ev
-	)
-{
-	ev->AddConstString(m_csThinkStateNames[m_ThinkState]);
-}
-
-void Actor::EventGetEnemyShareRange
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fMaxShareDistSquared);
-}
-
-void Actor::EventSetEnemyShareRange
-	(
-	Event *ev
-	)
-{
-	float fRange = ev->GetFloat(1);
-	m_fMaxShareDistSquared = fRange * fRange;
-}
-
-void Actor::EventGetKickDir
-	(
-	Event *ev
-	)
-{
-	ev->AddVector(m_vKickDir);
-}
-
-void Actor::EventGetNoLongPain
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bNoLongPain);
-}
-
-void Actor::EventSetNoLongPain
-	(
-	Event *ev
-	)
-{
-	m_bNoLongPain = ev->GetBoolean(1);
-}
-
-void Actor::EventGetFavoriteEnemy
-	(
-	Event *ev
-	)
-{
-	ev->AddEntity(m_FavoriteEnemy);
-}
-
-void Actor::EventSetFavoriteEnemy
-	(
-	Event *ev
-	)
-{
-	Sentient *fEnemy = (Sentient*)ev->GetEntity(1);
-	m_FavoriteEnemy = fEnemy;
-}
-
-void Actor::EventGetMumble
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bMumble);
-}
-
-void Actor::EventSetMumble
-	(
-	Event *ev
-	)
-{
-	m_bMumble = ev->GetInteger(1);
-}
-
-void Actor::EventGetBreathSteam
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bBreathSteam);
-}
-
-void Actor::EventSetBreathSteam
-	(
-	Event *ev
-	)
-{
-	m_bBreathSteam = ev->GetInteger(1);
-}
-
-void Actor::EventSetNextBreathTime
-	(
-	Event *ev
-	)
-{
-	ScriptVariable sVar;
-	ScriptThread *t = Director.CreateThread("global/breathe.scr", "nextbreathtime");
-	
-	sVar.setFloatValue(ev->GetFloat(1));
-	t->Execute(&sVar, 1);
-}
-
-void Actor::EventCalcGrenadeToss
-	(
-	Event *ev
-	)
-{
-	//FIXME: macros
-	Vector vTarget;
-	vTarget = ev->GetVector(1);
-	if (DecideToThrowGrenade(vTarget, &m_vGrenadeVel, &m_eGrenadeMode))
-	{
-		if (m_eGrenadeMode == AI_GREN_TOSS_ROLL)
-		{
-			ev->AddConstString(STRING_ANIM_GRENADETOSS_SCR);
-		}
-		else
-		{
-			if (m_eGrenadeMode > AI_GREN_TOSS_ROLL ? m_eGrenadeMode == AI_GREN_TOSS_HINT : m_eGrenadeMode == AI_GREN_TOSS_THROW)
-			{
-				ev->AddConstString(STRING_ANIM_GRENADETHROW_SCR);
-			}
-			else
-			{
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"invalid return condition for Actor::EventCalcGrenadeToss\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
-				assert(false && assertStr);
-			}
-
-		}
-		
-		SetDesiredYawDir(m_vGrenadeVel);
-	}
-	else
-	{
-		ev->AddConstString(STRING_EMPTY);
-	}
-}
-
-void Actor::EventGetNoSurprise
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bNoSurprise);
-}
-
-void Actor::EventSetNoSurprise
-	(
-	Event *ev
-	)
-{
-
-	m_bNoSurprise = ev->GetBoolean(1);
-}
-
-void Actor::EventGetSilent
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bSilent);
-}
-
-void Actor::EventSetSilent
-	(
-	Event *ev
-	)
-{
-	m_bSilent = ev->GetBoolean(1);
-}
-
-void Actor::EventGetAvoidPlayer
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bAutoAvoidPlayer);
-}
-
-void Actor::EventSetAvoidPlayer
-	(
-	Event *ev
-	)
-{
-	m_bAutoAvoidPlayer = ev->GetBoolean(1);
-}
-
-void Actor::EventGetLookAroundAngle
-	(
-	Event *ev
-	)
-{
-	//FIXME: weird
-	//ev->GetFloat(m_fLookAroundFov);
-	ev->AddFloat(m_fLookAroundFov);
-}
-
-void Actor::EventSetLookAroundAngle
-	(
-	Event *ev
-	)
-{
-	float angle = ev->GetFloat(1);
-	if (angle < 0.0 || angle > 60.0)
-	{
-		ScriptError("lookaroundangle must be >= 0 and <= 60");
-	}
-	m_fLookAroundFov = angle;
-}
-
-void Actor::EventHasCompleteLookahead
-	(
-	Event *ev
-	)
-{
-	int completeLH = PathExists() && PathHasCompleteLookahead();
-	
-	ev->AddInteger(completeLH);
-}
-
-void Actor::EventPathDist
-	(
-	Event *ev
-	)
-{
-	float dist = 0;
-	if (PathExists() && !PathComplete())
-	{
-		dist = PathDist();
-	}
-	ev->AddFloat(dist);
-}
-
-void Actor::EventCanShootEnemyFrom
-	(
-	Event *ev
-	)
-{
-	int canShoot = false;
-	if (m_Enemy)
-	{
-		canShoot = CanSeeFrom(ev->GetVector(1), m_Enemy);
-	}
-	ev->AddInteger(canShoot);
-}
-
-void Actor::EventCanShoot
-	(
-	Event *ev
-	)
-{
-	Entity *target = ev->GetEntity(1);
-
-	if (!target)
-	{
-		ScriptError("canshoot applied to null listener");
-	}
-
-	ev->AddInteger(CanShoot(target));
-}
-
-void Actor::EventSetInReload
-	(
-	Event *ev
-	)
-{
-
-	m_bInReload = ev->GetBoolean(1);
-}
-
-void Actor::EventGetInReload
-	(
-	Event *ev
-	)
-{
-	ev->AddInteger(m_bInReload);
-}
-
-void Actor::EventSetReloadCover
-	(
-	Event *ev
-	)
-{
-	m_bNeedReload = ev->GetBoolean(1);
-}
-
-void Actor::EventBreakSpecial
-	(
-	Event *ev
-	)
-{
-	mbBreakSpecialAttack = true;
-}
-
-void Actor::GetVoiceType
-	(
-	Event *ev
-	)
-{
-	//voice type in actor is a char.
-	const char *vType = va("%c", mVoiceType);
-	str vTypeStr = vType;
-	ev->AddString(vTypeStr);
-}
-
-void Actor::SetVoiceType
-	(
-	Event *ev
-	)
-{
-	//voice type in actor is a char.
-	str vType = ev->GetString(1);
-	if (vType[0])
-	{
-		mVoiceType = vType[0];
-	}
-	else
-	{
-		//FIXME: enum
-		mVoiceType = -1;
-	}
-}
-
-void Actor::ResolveVoiceType
-	(
-	void
-	)
-{
-	char validVoice[128];
-
-	if (mVoiceType == -1)
-	{
-		int d = 3.0 * 0.99 * random();
-		if (m_Team == TEAM_AMERICAN)
-		{
-			mVoiceType = gAmericanVoices[d][0];
-		}
-		else
-		{
-			mVoiceType = gGermanVoices[d][0];
-		}
-	}
-	else
-	{
-		if (m_Team == TEAM_AMERICAN)
-		{
-			for (int i = 0; i < 3 ; i++)
-			{
-				if (gAmericanVoices[i][0] == mVoiceType)
-				{
-					return;
-				}
-			}
-
-			validVoice[0] = '\0';
-			for (int i = 0; i < 3; i++)
-			{
-				strcat(validVoice, gAmericanVoices[i]);
-				strcat(validVoice, " ");
-			}
-			Com_Printf("ERROR: Bad voice type %c.  Valid American voicetypes are: %s\n", mVoiceType, validVoice);
-			mVoiceType = -1;
-
-			int d = 3.0 * 0.99 * random();
-			mVoiceType = gAmericanVoices[d][0];
-		}
-		else
-		{
-
-			for (int i = 0; i < 3; i++)
-			{
-				if (gGermanVoices[i][0] == mVoiceType)
-				{
-					return;
-				}
-			}
-
-			validVoice[0] = '\0';
-			for (int i = 0; i < 3; i++)
-			{
-				strcat(validVoice, gGermanVoices[i]);
-				strcat(validVoice, " ");
-			}
-			Com_Printf("ERROR: Bad voice type %c.  Valid German voicetypes are: %s\n", mVoiceType, validVoice);
-			mVoiceType = -1;
-
-			int d = 3.0 * 0.99 * random();
-			mVoiceType = gGermanVoices[d][0];
-		}
-
-	}
-}
-
-void Actor::EventSetBalconyHeight
-	(
-	Event *ev
-	)
-{
-	m_fBalconyHeight = ev->GetFloat(1);
-}
-
-void Actor::EventGetBalconyHeight
-	(
-	Event *ev
-	)
-{
-	ev->AddFloat(m_fBalconyHeight);
-}
-
-PathNode *Actor::FindSniperNodeAndSetPath
-	(
-	bool *pbTryAgain
-	)
-{
-	PathNode *pSniperNode = PathManager.FindNearestSniperNode( this, origin, m_Enemy );
-
-	if( pSniperNode )
-	{
-		SetPathWithLeash( pSniperNode, NULL, 0 );
-
-		if( PathExists() && ( PathComplete() || PathAvoidsSquadMates() ) )
-		{
-			*pbTryAgain = true;
-			return pSniperNode;
-		}
-
-		pSniperNode->MarkTemporarilyBad();
-		*pbTryAgain = false;
-	}
-	else
-	{
-		*pbTryAgain = true;
-	}
-
-	return NULL;
-}
-
-void Actor::Remove
-	(
-	Event *ev
-	)
-{
-	EndStates();
-
-	if (deadflag != DEAD_DEAD)
-	{
-		health = 0;
-		deadflag = DEAD_DEAD;
-	}
-
-	Delete();
-}
-
-void Actor::DontFaceWall
-	(
-	void
-	)
-{
-	//PathNode *pNode;
-	vec2_t vDelta;
-	float /*fErrorLerp,*/ fEyeRadius, fCosAngle, fSinAngle, fAngle, fAngleRad, fTime;
-	Vector start;
-	Vector end;
-	
-	//FIXME: macro: AI_*
-	if (m_pCoverNode && m_pCoverNode->nodeflags & (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))
-	{
-		m_eDontFaceWallMode = 1;
-		return;
-	}
-
-	if (velocity.lengthXYSquared() > Square(8))
-	{
-		m_eDontFaceWallMode = 2;
-		return;
-	}
-
-	fAngle = AngleNormalize360(m_YawAchieved ? angles.y : m_DesiredYaw);
-
-	fTime = (level.time - m_fDfwTime) * 0.5;
-	if (fTime > 1)
-	{
-		fTime = 1;
-	}
-
-
-	VectorSub2D(m_vDfwPos, origin, vDelta);
-
-	if (Square(fTime * -14.0 + 16.0) > VectorLength2DSquared(vDelta) 
-		&& (fabs(AngleNormalize180(m_fDfwRequestedYaw - m_DesiredYaw)) <= fTime * -29.0 + 30.0
-				|| fabs(AngleNormalize180(m_fDfwDerivedYaw - m_DesiredYaw)) <= fTime * -29.0 + 30.0)
-		)
-	{
-		if (m_eDontFaceWallMode <= 8)
-		{
-			SetDesiredYaw(m_fDfwDerivedYaw);
-		}
-	}
-	else
-	{
-		m_vDfwPos = origin;
-		m_fDfwRequestedYaw = fAngle;
-		m_fDfwTime = level.time;
-
-		fAngleRad = fAngle * M_PI / 180;
-		fSinAngle = sin(fAngleRad);
-		fCosAngle = cos(fAngleRad);
-
-		VectorSub2D(EyePosition(), origin, vDelta);
-		fEyeRadius = VectorLength2D(vDelta);
-
-		start = vec_zero;
-		start.x = fEyeRadius * fCosAngle + origin.x;
-		start.y = fEyeRadius * fSinAngle + origin.y;
-
-		end = vec_zero;
-		end.x = 64 * fCosAngle + start.x;
-		end.x = 64 * fSinAngle + start.y;
-		trace_t trace = G_Trace(start, vec_zero, vec_zero, end, this, 33819417, qfalse, "Actor::DontFaceWall");
-		if (trace.entityNum == 1023 || trace.fraction >= 1 || trace.startsolid)
-		{
-			m_eDontFaceWallMode = 3;
-		}
-		else if (trace.entityNum == 1022 || trace.ent->entity->AIDontFace())
-		{
-			if (trace.plane.normal[2] < -0.69999999 || trace.plane.normal[2] > 0.69999999)
-			{
-				m_eDontFaceWallMode = 5;
-			}
-			else
-			{
-				if (m_Enemy && Vector::Dot(trace.plane.normal, m_Enemy->origin) - trace.plane.dist < 0 )
-				{
-					end = m_Enemy->origin;
-				}
-				else
-				{
-					end = start + (end - start)*128;
-				}
-
-
-				PathNode *node = PathManager.FindCornerNodeForWall(origin, end, this, 0.0f, trace.plane.normal);
-				if (node)
-				{
-
-					VectorSub2D(node->m_PathPos, origin, vDelta);
-					if (vDelta[0] != 0 || vDelta[1] != 0)
-					{
-						SetDesiredYawDir(vDelta);
-					}
-					m_eDontFaceWallMode = 6;
-				}
-				else if (trace.fraction <= 0.46875)
-				{
-					SetDesiredYawDir(trace.plane.normal);
-					m_eDontFaceWallMode = 7;
-				}
-				else
-				{
-					if (m_DesiredYaw < 90.0)
-						m_DesiredYaw += 270.0;
-					else
-						m_DesiredYaw -=  90.0;
-
-					m_YawAchieved = false;
-					m_eDontFaceWallMode = 8;
-				}
-				m_fDfwDerivedYaw = m_DesiredYaw;
-				return;
-			}
-		}
-		else
-		{
-			m_eDontFaceWallMode = 4;
-		}
-
-		m_fDfwDerivedYaw = m_fDfwRequestedYaw;
-	}
-
-}
-
-bool Actor::AvoidingFacingWall
-	(
-	void
-	) const
-{
-	return m_eDontFaceWallMode <= 8;
-}
-
-void Actor::EndStates
-	(
-	void
-	)
-{
-	for (int i = 0; i < NUM_THINKLEVELS; i++)
-	{
-		GlobalFuncs_t *func = &GlobalFuncs[m_Think[i]];
-		
-		if (func->EndState)
-			(this->*func->EndState)();
-
-		if (m_pAnimThread)
-		{
-			m_pAnimThread->AbortRegistration(STRING_EMPTY, this);
-		}
-	}
-}
-
-void Actor::ClearStates
-	(
-	void
-	)
-{
-	for (int i = 0; i < NUM_THINKSTATES; i++)
-	{
-		SetThink((eThinkState)i, THINK_VOID);
-	}
-}
-
-void Actor::CheckUnregister
-	(
-	void
-	)
-{
-	m_bBecomeRunner = false;
-	if (parm.movefail)
-	{
-		parm.movedone = false;
-		Unregister(STRING_MOVEDONE);
-	}
-	if (m_Enemy)
-	{
-		Unregister(STRING_HASENEMY);
-	}
-	if (m_bEnemyVisible)
-	{
-		Unregister(STRING_VISIBLE);
-	}
-}
-
-void Actor::BecomeCorpse
-	(
-	void
-	)
-{
-	Event e1(EV_DeathSinkStart);
-
-	AddToBodyQue();
-
-	edict->r.contents = CONTENTS_TRIGGER;
-	edict->r.svFlags &= ~SVF_USE_CURRENT_ORIGIN;
-	setSolidType(SOLID_NOT);
-	movetype = MOVETYPE_NONE;
-	edict->s.renderfx &= ~RF_SHADOW;
-
-	
-	PostEvent(e1, 20);
-}
-
-void Actor::PathnodeClaimRevoked
-	(
-	PathNode *node
-	)
-{
-	for (int i = m_ThinkLevel; i >= 0; --i)
-	{
-
-
-		GlobalFuncs_t *func = &GlobalFuncs[m_Think[i]];
-		if (func->PathnodeClaimRevoked)
-			(this->*func->PathnodeClaimRevoked)();
-	}
-	node->Relinquish();
-	m_pCoverNode = NULL;
-}
-
-void Actor::SetPathToNotBlockSentient
-	(
-	Sentient *pOther
-	)
-{
-	Vector vDest, vPerp, vAway;
-
-	if (pOther)
-	{
-		if (!pOther->IsDead())
-		{
-			if (IsTeamMate(pOther))
-			{
-				if (pOther->velocity.lengthSquared() > 1)
-				{
-					vDest = origin - pOther->origin;
-					if (vDest.lengthSquared() < 2304 && DotProduct2D(pOther->velocity, vDest) > 0)
-					{
-						if (CrossProduct2D(vDest, pOther->velocity) >= 0)
-						{
-							vPerp.x = -pOther->velocity.y;
-							vPerp.y = pOther->velocity.x;
-							vPerp.z = 0;
-						}
-						else
-						{
-							vPerp.x = pOther->velocity.y;
-							vPerp.y = -pOther->velocity.x;
-							vPerp.z = 0;
-						}
-
-						VectorNormalizeFast(vPerp);
-						
-						vAway = vPerp * 48 + origin;
-
-						if (G_SightTrace(
-							vAway,
-							mins,
-							maxs,
-							vAway,
-							this,
-							pOther,
-							33557249,
-							0,
-							"Actor::SetPathToNotBlockSentient 1"))
-						{
-							SetPathWithinDistance(vAway, NULL, 96, 0);
-						}
-
-						if (!PathExists())
-						{
-							vAway = vDest;
-							VectorNormalizeFast(vAway);
-
-							vAway = vAway * 48 + origin;
-							if (G_SightTrace(
-								vAway,
-								mins,
-								maxs,
-								vAway,
-								this,
-								pOther,
-								33557249,
-								0,
-								"Actor::SetPathToNotBlockSentient 2"))
-							{
-								SetPathWithinDistance(vAway, NULL, 96, 0);
-							}
-
-							if (!PathExists())
-							{
-								vAway = vPerp * 48 - origin;
-								if (G_SightTrace(
-									vAway,
-									mins,
-									maxs,
-									vAway,
-									this,
-									pOther,
-									33557249,
-									0,
-									"Actor::SetPathToNotBlockSentient 3"))
-								{
-									SetPathWithinDistance(vAway, NULL, 96, 0);
-								}
-
-								if (!PathExists())
-								{
-									vAway = vDest;
-									VectorNormalizeFast(vAway);
-
-									FindPathAway(origin, vAway * 100, 96);
-
-								}
-							}
-
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-void Actor::EventSetMoveDoneRadius
-	(
-	Event *ev
-	)
-{
-	float moveDoneR = ev->GetFloat(1);
-	m_fMoveDoneRadiusSquared = Square(moveDoneR);
-}
-
-
-bool Actor::CalcFallPath
-	(
-	void
-	)
-{
-	float startTime, animTime, startDeltaTime, nextTime;
-	vec3_t vAbsDelta, vRelDelta, pos[200];
-	int anim, loop, /*currentPos,*/ i;
-	mmove_t mm;
-
-	SetMoveInfo(&mm);
-
-	mm.desired_speed = 80;
-	mm.tracemask &= 0xFDFFF4FF;
-
-	VectorCopy2D(orientation[0], mm.desired_dir);
-
-	anim = gi.Anim_NumForName(edict->tiki, "death_balcony_intro");
-	animTime = gi.Anim_Time(edict->tiki, anim);
-
-	startTime = 0.65F;
-
-	i = 0;
-	while (true)
-	{
-		MmoveSingle(&mm);
-		
-		i++;
-		VectorCopy(mm.origin, pos[i]);
-
-		if (i >= 200)
-		{
-			break;
-		}
-
-		if (mm.hit_obstacle)
-		{
-			for (float j = 0.65f; j < animTime; j = nextTime)
-			{
-				nextTime = j + level.frametime;
-				if (nextTime >= animTime - 0.01f)
-					nextTime = animTime;
-				startDeltaTime = j;
-				gi.Anim_DeltaOverTime(
-					edict->tiki,
-					anim,
-					startDeltaTime,
-					nextTime,
-					vAbsDelta);
-				MatrixTransformVector(vAbsDelta, orientation, vRelDelta);
-
-				i++;
-				
-				VectorAdd(vRelDelta, mm.origin, mm.origin);
-				VectorCopy(mm.origin, pos[i]);
-
-				if (i >= 200)
-					return false;
-			}
-			mm.desired_speed = 0;
-			mm.groundPlane = qfalse;
-			mm.walking = qfalse;
-			mm.velocity[0] = 0;
-			mm.velocity[1] = 0;
-			mm.velocity[2] = -171;
-			
-			loop = i;
-
-			while (true)
-			{
-				MmoveSingle(&mm);
-
-				i++;
-				VectorCopy(mm.origin, pos[i]);
-
-				if (i >= 200)
-				{
-					break;
-				}
-
-				if (mm.hit_obstacle)
-					return false;
-
-				if (mm.groundPlane)
-				{
-					if (m_fBalconyHeight > origin[2] - pos[i][2])
-						return false;
-
-					m_pFallPath = (FallPath *)gi.Malloc((sizeof(FallPath::pos)) * i + (sizeof(FallPath) - sizeof(FallPath::pos)));
-
-					m_pFallPath->length = i;
-
-					m_pFallPath->currentPos = 0;
-					m_pFallPath->startTime = startTime;
-					m_pFallPath->loop = loop;
-
-					if (i > 0)
-					{
-						for (int j = i; j ; j--)
-						{
-							VectorCopy(pos[j], m_pFallPath->pos[j]);
-						}
-					}
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-
-		if (mm.groundPlane)
-		{
-			startTime -= level.frametime;
-			if (startTime >= 0)
-				continue;
-		}
-		return false;
-	}
-	return false;
-
-}
-
-void Actor::ClearEnemies
-	(
-	void
-	)
-{
-	m_PotentialEnemies.RemoveAll();
-	SetEnemy( NULL, false );
-}
-
-bool Actor::EnemyIsDisguised
-	(
-	void
-	)
-{
-	return ( m_bEnemyIsDisguised || (m_Enemy && m_Enemy->m_bIsDisguised) ) && ( !m_bForceAttackPlayer && m_ThinkState != THINKSTATE_ATTACK );
-}
-
-void Actor::setOriginEvent
-	(
-	Vector org
-	)
-{
-	bool bRejoin = false;
-	//FIXME: macro
-	if ((org - origin).lengthSquared() > Square(1024))
-	{
-		bRejoin = true;
-		DisbandSquadMate(this);
-	}
-	
-	m_iOriginTime = level.inttime;
-
-	VectorCopy2D(org, m_vOriginHistory[0]);
-	VectorCopy2D(org, m_vOriginHistory[1]);
-	VectorCopy2D(org, m_vOriginHistory[2]);
-
-	VectorClear(velocity);
-
-	if (level.Spawned())
-	{
-		SafeSetOrigin(org);
-	}
-	else
-	{
-		setOrigin(org);
-	}
-
-	m_vHome = origin;
-
-	if (bRejoin)
-	{
-		//FIXME: macro
-		JoinNearbySquads();
-	}
-}
-
-void Actor::DumpAnimInfo
-	(
-	void
-	)
-{
-	Animate::DumpAnimInfo();
-	Vector desiredLook = m_bHasDesiredLookAngles ? m_DesiredLookAngles : vec_zero;
-	//FIXME: macros: bones
-	Vector head = GetControllerAngles(HEAD_TAG);
-	Vector torso = GetControllerAngles(TORSO_TAG);
-	MPrintf("Desired look yaw: %.1f, pitch: %.1f.  Head yaw: %.1f, pitch %.1f.  Torso yaw: %.1f, pitch: %.1f\n",
-		desiredLook.x,
-		desiredLook.y,
-		head.x,
-		head.y,
-		torso.x,
-		torso.y
-		);
-
-}
-
-bool Actor::AutoArchiveModel
-	(
-	void
-	)
-{
-	return false;
-}
+void Actor::ExtractConstraints(mmove_t *mm) {}
diff --git a/code/fgame/actor.h b/code/fgame/actor.h
index 7b91c024..7274f8ce 100644
--- a/code/fgame/actor.h
+++ b/code/fgame/actor.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // actor.h: Base class for character AI.
 
-#ifndef __ACTOR_H__
-#define __ACTOR_H__
+#pragma once
 
 #include "g_local.h"
 #include "simpleactor.h"
@@ -137,271 +136,446 @@ extern Event EV_Actor_DeathEmbalm;
 // Bones used by actor
 
 //#define ACTOR_MOUTH_TAG  0
-#define ACTOR_HEAD_TAG   0
-#define ACTOR_TORSO_TAG  1
+#define ACTOR_HEAD_TAG  0
+#define ACTOR_TORSO_TAG 1
 
 // Dialog stuff
 
-#define LIP_SYNC_HZ  20.0
+#define LIP_SYNC_HZ                   20.0
 
 #define MAX_DIALOG_PARAMETERS_LENGTH  100
 
-#define MAX_DIALOG_PARM_LENGTH  64
-#define MAX_DIALOG_PARMS  10
+#define MAX_DIALOG_PARM_LENGTH        64
+#define MAX_DIALOG_PARMS              10
 
-#define DIALOG_PARM_TYPE_NONE          0
-#define DIALOG_PARM_TYPE_PLAYERHAS     1
-#define DIALOG_PARM_TYPE_PLAYERHASNOT  2
-#define DIALOG_PARM_TYPE_HAS           3
-#define DIALOG_PARM_TYPE_HASNOT        4
-#define DIALOG_PARM_TYPE_DEPENDS       5
-#define DIALOG_PARM_TYPE_DEPENDSNOT    6  
+#define DIALOG_PARM_TYPE_NONE         0
+#define DIALOG_PARM_TYPE_PLAYERHAS    1
+#define DIALOG_PARM_TYPE_PLAYERHASNOT 2
+#define DIALOG_PARM_TYPE_HAS          3
+#define DIALOG_PARM_TYPE_HASNOT       4
+#define DIALOG_PARM_TYPE_DEPENDS      5
+#define DIALOG_PARM_TYPE_DEPENDSNOT   6
 
-typedef struct
-{
-	byte type;
-	char parm[ MAX_DIALOG_PARM_LENGTH ];
+typedef struct {
+    byte type;
+    char parm[MAX_DIALOG_PARM_LENGTH];
 } DialogParm_t;
 
-typedef struct DialogNode_s
-{
-	char alias_name[MAX_ALIAS_NAME_LENGTH];
-	int random_flag;
-	int number_of_parms;
-	float random_percent;
-	DialogParm_t parms[MAX_DIALOG_PARMS];
-	struct DialogNode_s *next;
+typedef struct DialogNode_s {
+    char                 alias_name[MAX_ALIAS_NAME_LENGTH];
+    int                  random_flag;
+    int                  number_of_parms;
+    float                random_percent;
+    DialogParm_t         parms[MAX_DIALOG_PARMS];
+    struct DialogNode_s *next;
 } DialogNode_t;
 
-typedef enum
-{
-	IS_INANIMATE,
-	IS_MONSTER,
-	IS_ENEMY,
-	IS_CIVILIAN,
-	IS_FRIEND,
-	IS_ANIMAL,
-	NUM_ACTORTYPES
+typedef enum {
+    IS_INANIMATE,
+    IS_MONSTER,
+    IS_ENEMY,
+    IS_CIVILIAN,
+    IS_FRIEND,
+    IS_ANIMAL,
+    NUM_ACTORTYPES
 } actortype_t;
 
 // Stimuli types
 
-#define STIMULI_ALL    -1
-#define STIMULI_NONE    0
-#define STIMULI_SIGHT   (1<<0)
-#define STIMULI_SOUND   (1<<1)
-#define STIMULI_PAIN    (1<<2)
-#define STIMULI_SCRIPT  (1<<3)
+#define STIMULI_ALL       -1
+#define STIMULI_NONE      0
+#define STIMULI_SIGHT     (1 << 0)
+#define STIMULI_SOUND     (1 << 1)
+#define STIMULI_PAIN      (1 << 2)
+#define STIMULI_SCRIPT    (1 << 3)
 
 #define MAX_INACTIVE_TIME 30.0
 
 // State flags
 
-#define STATE_FLAG_IN_PAIN			(1<<0)
-#define STATE_FLAG_MELEE_HIT		(1<<1)
-#define STATE_FLAG_TOUCHED			(1<<2)
-#define STATE_FLAG_ACTIVATED		(1<<3)
-#define STATE_FLAG_USED				(1<<4)
-#define STATE_FLAG_TWITCH			(1<<5)
-#define STATE_FLAG_BLOCKED_HIT		(1<<6)
-#define STATE_FLAG_SMALL_PAIN		(1<<7)
-#define STATE_FLAG_OTHER_DIED		(1<<8)
-#define STATE_FLAG_STUCK			(1<<9)
-#define STATE_FLAG_NO_PATH			(1<<10)
+#define STATE_FLAG_IN_PAIN     (1 << 0)
+#define STATE_FLAG_MELEE_HIT   (1 << 1)
+#define STATE_FLAG_TOUCHED     (1 << 2)
+#define STATE_FLAG_ACTIVATED   (1 << 3)
+#define STATE_FLAG_USED        (1 << 4)
+#define STATE_FLAG_TWITCH      (1 << 5)
+#define STATE_FLAG_BLOCKED_HIT (1 << 6)
+#define STATE_FLAG_SMALL_PAIN  (1 << 7)
+#define STATE_FLAG_OTHER_DIED  (1 << 8)
+#define STATE_FLAG_STUCK       (1 << 9)
+#define STATE_FLAG_NO_PATH     (1 << 10)
 
 // Actor modes
 
-#define ACTOR_MODE_NONE			0
-#define ACTOR_MODE_IDLE			1
-#define ACTOR_MODE_AI			2
-#define ACTOR_MODE_SCRIPT		3
-#define ACTOR_MODE_TALK			4
+#define ACTOR_MODE_NONE   0
+#define ACTOR_MODE_IDLE   1
+#define ACTOR_MODE_AI     2
+#define ACTOR_MODE_SCRIPT 3
+#define ACTOR_MODE_TALK   4
 
 // Pain types
 
-#define PAIN_SMALL  0
-#define PAIN_BIG    1
+#define PAIN_SMALL 0
+#define PAIN_BIG   1
 
-typedef struct
-{
-	EntityPtr ent;	
-	unsigned int state_flags;
+typedef struct {
+    EntityPtr    ent;
+    unsigned int state_flags;
 } part_t;
 
 // Actor flags
 
-#define ACTOR_FLAG_NOISE_HEARD					0
-#define ACTOR_FLAG_INVESTIGATING				1
-#define ACTOR_FLAG_DEATHGIB						2
-#define ACTOR_FLAG_DEATHFADE					3
-#define ACTOR_FLAG_NOCHATTER					4
-#define ACTOR_FLAG_INACTIVE						5
-#define ACTOR_FLAG_ANIM_DONE					6
-#define ACTOR_FLAG_STATE_DONE_TIME_VALID		7
-#define ACTOR_FLAG_AI_ON						8
-#define ACTOR_FLAG_LAST_CANSEEENEMY				9
-#define ACTOR_FLAG_LAST_CANSEEENEMY_NOFOV		10
-#define ACTOR_FLAG_DIALOG_PLAYING				11
-#define ACTOR_FLAG_ALLOW_TALK					12
-#define ACTOR_FLAG_DAMAGE_ONCE_ON				13
-#define ACTOR_FLAG_DAMAGE_ONCE_DAMAGED			14
-#define ACTOR_FLAG_BOUNCE_OFF					15
-#define ACTOR_FLAG_NOTIFY_OTHERS_AT_DEATH		16
-#define ACTOR_FLAG_HAS_THING1					17
-#define ACTOR_FLAG_HAS_THING2					18
-#define ACTOR_FLAG_HAS_THING3					19
-#define ACTOR_FLAG_HAS_THING4					20
-#define ACTOR_FLAG_LAST_ATTACK_HIT				21
-#define ACTOR_FLAG_STARTED						22
-#define ACTOR_FLAG_ALLOW_HANGBACK				23
-#define ACTOR_FLAG_USE_GRAVITY					24
-#define ACTOR_FLAG_SPAWN_FAILED					25
-#define ACTOR_FLAG_FADING_OUT					26
-#define ACTOR_FLAG_DEATHSHRINK					27
-#define ACTOR_FLAG_DEATHSINK					28
-#define ACTOR_FLAG_STAYSOLID					29
-#define ACTOR_FLAG_STUNNED						30
-#define ACTOR_FLAG_ALLOW_FALL					31
-#define ACTOR_FLAG_FINISHED						32
-#define ACTOR_FLAG_IN_LIMBO						33
-#define ACTOR_FLAG_CAN_WALK_ON_OTHERS			34
-#define ACTOR_FLAG_PUSHABLE						35
-#define ACTOR_FLAG_LAST_TRY_TALK				36
-#define ACTOR_FLAG_ATTACKABLE_BY_ACTORS			37
-#define ACTOR_FLAG_TARGETABLE					38
-#define ACTOR_FLAG_ATTACK_ACTORS				39
-#define ACTOR_FLAG_IMMORTAL						40
-#define ACTOR_FLAG_TURNING_HEAD					41
-#define ACTOR_FLAG_DIE_COMPLETELY				42
-#define ACTOR_FLAG_BLEED_AFTER_DEATH			43
-#define ACTOR_FLAG_IGNORE_STUCK_WARNING			44
-#define ACTOR_FLAG_IGNORE_OFF_GROUND_WARNING	45
-#define ACTOR_FLAG_ALLOWED_TO_KILL				46
-#define ACTOR_FLAG_TOUCH_TRIGGERS				47
-#define ACTOR_FLAG_IGNORE_WATER					48
-#define ACTOR_FLAG_NEVER_IGNORE_SOUNDS			49
-#define ACTOR_FLAG_SIMPLE_PATHFINDING			50
-#define ACTOR_FLAG_HAVE_MOVED					51
-#define ACTOR_FLAG_NO_PAIN_SOUNDS				52
-#define ACTOR_FLAG_UPDATE_BOSS_HEALTH			53
-#define ACTOR_FLAG_IGNORE_PAIN_FROM_ACTORS		54
-#define ACTOR_FLAG_DAMAGE_ALLOWED				55
-#define ACTOR_FLAG_ALWAYS_GIVE_WATER			56
+#define ACTOR_FLAG_NOISE_HEARD               0
+#define ACTOR_FLAG_INVESTIGATING             1
+#define ACTOR_FLAG_DEATHGIB                  2
+#define ACTOR_FLAG_DEATHFADE                 3
+#define ACTOR_FLAG_NOCHATTER                 4
+#define ACTOR_FLAG_INACTIVE                  5
+#define ACTOR_FLAG_ANIM_DONE                 6
+#define ACTOR_FLAG_STATE_DONE_TIME_VALID     7
+#define ACTOR_FLAG_AI_ON                     8
+#define ACTOR_FLAG_LAST_CANSEEENEMY          9
+#define ACTOR_FLAG_LAST_CANSEEENEMY_NOFOV    10
+#define ACTOR_FLAG_DIALOG_PLAYING            11
+#define ACTOR_FLAG_ALLOW_TALK                12
+#define ACTOR_FLAG_DAMAGE_ONCE_ON            13
+#define ACTOR_FLAG_DAMAGE_ONCE_DAMAGED       14
+#define ACTOR_FLAG_BOUNCE_OFF                15
+#define ACTOR_FLAG_NOTIFY_OTHERS_AT_DEATH    16
+#define ACTOR_FLAG_HAS_THING1                17
+#define ACTOR_FLAG_HAS_THING2                18
+#define ACTOR_FLAG_HAS_THING3                19
+#define ACTOR_FLAG_HAS_THING4                20
+#define ACTOR_FLAG_LAST_ATTACK_HIT           21
+#define ACTOR_FLAG_STARTED                   22
+#define ACTOR_FLAG_ALLOW_HANGBACK            23
+#define ACTOR_FLAG_USE_GRAVITY               24
+#define ACTOR_FLAG_SPAWN_FAILED              25
+#define ACTOR_FLAG_FADING_OUT                26
+#define ACTOR_FLAG_DEATHSHRINK               27
+#define ACTOR_FLAG_DEATHSINK                 28
+#define ACTOR_FLAG_STAYSOLID                 29
+#define ACTOR_FLAG_STUNNED                   30
+#define ACTOR_FLAG_ALLOW_FALL                31
+#define ACTOR_FLAG_FINISHED                  32
+#define ACTOR_FLAG_IN_LIMBO                  33
+#define ACTOR_FLAG_CAN_WALK_ON_OTHERS        34
+#define ACTOR_FLAG_PUSHABLE                  35
+#define ACTOR_FLAG_LAST_TRY_TALK             36
+#define ACTOR_FLAG_ATTACKABLE_BY_ACTORS      37
+#define ACTOR_FLAG_TARGETABLE                38
+#define ACTOR_FLAG_ATTACK_ACTORS             39
+#define ACTOR_FLAG_IMMORTAL                  40
+#define ACTOR_FLAG_TURNING_HEAD              41
+#define ACTOR_FLAG_DIE_COMPLETELY            42
+#define ACTOR_FLAG_BLEED_AFTER_DEATH         43
+#define ACTOR_FLAG_IGNORE_STUCK_WARNING      44
+#define ACTOR_FLAG_IGNORE_OFF_GROUND_WARNING 45
+#define ACTOR_FLAG_ALLOWED_TO_KILL           46
+#define ACTOR_FLAG_TOUCH_TRIGGERS            47
+#define ACTOR_FLAG_IGNORE_WATER              48
+#define ACTOR_FLAG_NEVER_IGNORE_SOUNDS       49
+#define ACTOR_FLAG_SIMPLE_PATHFINDING        50
+#define ACTOR_FLAG_HAVE_MOVED                51
+#define ACTOR_FLAG_NO_PAIN_SOUNDS            52
+#define ACTOR_FLAG_UPDATE_BOSS_HEALTH        53
+#define ACTOR_FLAG_IGNORE_PAIN_FROM_ACTORS   54
+#define ACTOR_FLAG_DAMAGE_ALLOWED            55
+#define ACTOR_FLAG_ALWAYS_GIVE_WATER         56
 
+// Look flags
+
+#define LOOK_FLAG_EYE (1 << 0)
 
 // The last actor_flag number and this one (ACTOR_FLAG_MAX) should match
 
-#define ACTOR_FLAG_MAX								56
+#define ACTOR_FLAG_MAX     56
 
-#define MAX_ORIGIN_HISTORY	4
-#define MAX_COVER_NODES		16
-#define MAX_BODYQUEUE		5
+#define MAX_ORIGIN_HISTORY 4
+#define MAX_COVER_NODES    16
+#define MAX_BODYQUEUE      5
 
-typedef enum
-{
-	AI_GREN_TOSS_NONE,
-	AI_GREN_TOSS_THROW,
-	AI_GREN_TOSS_ROLL,
-	AI_GREN_TOSS_HINT,
-	AI_GREN_KICK
+typedef enum {
+    AI_GREN_TOSS_NONE,
+    AI_GREN_TOSS_THROW,
+    AI_GREN_TOSS_ROLL,
+    AI_GREN_TOSS_HINT,
+    AI_GREN_KICK
 } eGrenadeTossMode;
 
-typedef enum
-{
-	AI_GRENSTATE_FLEE,
-	AI_GRENSTATE_THROW_ACQUIRE,
-	AI_GRENSTATE_THROW,
-	AI_GRENSTATE_KICK_ACQUIRE,
-	AI_GRENSTATE_KICK,
-	AI_GRENSTATE_MARTYR_ACQUIRE,
-	AI_GRENSTATE_MARTYR,
-	AI_GRENSTATE_UNK,
-	AI_GRENSTATE_FLEE_SUCCESS, //fled the grenade succesfully, i'm safe
-	AI_GRENSTATE_FLEE_FAIL, //failed to flee, I'm gonna get hurt or die :'(
+typedef enum {
+    AI_GRENSTATE_FLEE,
+    AI_GRENSTATE_THROW_ACQUIRE,
+    AI_GRENSTATE_THROW,
+    AI_GRENSTATE_KICK_ACQUIRE,
+    AI_GRENSTATE_KICK,
+    AI_GRENSTATE_MARTYR_ACQUIRE,
+    AI_GRENSTATE_MARTYR,
+    AI_GRENSTATE_UNK,
+    AI_GRENSTATE_FLEE_SUCCESS, //fled the grenade successfully, I'm safe
+    AI_GRENSTATE_FLEE_FAIL,    //failed to flee, I'm gonna get hurt or die :'(
 } eGrenadeState;
 
 typedef struct {
-	byte length;
-	byte currentPos;
-	byte loop;
-	float startTime;
-	vec3_t pos[ 1 ];
+    byte   length;
+    byte   currentPos;
+    byte   loop;
+    float  startTime;
+    vec3_t pos[1];
 } FallPath;
 
-enum eThinkState
-{
-	THINKSTATE_VOID,
-	THINKSTATE_IDLE,
-	THINKSTATE_PAIN,
-	THINKSTATE_KILLED,
-	THINKSTATE_ATTACK,
-	THINKSTATE_CURIOUS,
-	THINKSTATE_DISGUISE,
-	THINKSTATE_GRENADE,
-	THINKSTATE_NOCLIP,
-	NUM_THINKSTATES,
+enum eThinkState {
+    THINKSTATE_VOID,
+    THINKSTATE_IDLE,
+    THINKSTATE_PAIN,
+    THINKSTATE_KILLED,
+    THINKSTATE_ATTACK,
+    THINKSTATE_CURIOUS,
+    THINKSTATE_DISGUISE,
+    THINKSTATE_BADPLACE, // Added in 2.0
+    THINKSTATE_GRENADE,
+    THINKSTATE_NOCLIP,
+    NUM_THINKSTATES,
 };
 
-#define AI_EVENT_NONE				0
-#define AI_EVENT_WEAPON_FIRE		1
-#define AI_EVENT_WEAPON_IMPACT		2
-#define AI_EVENT_EXPLOSION			3
-#define AI_EVENT_AMERICAN_VOICE		4
-#define AI_EVENT_GERMAN_VOICE		5
-#define AI_EVENT_AMERICAN_URGENT	6
-#define AI_EVENT_GERMAN_URGENT		7
-#define AI_EVENT_MISC				8
-#define AI_EVENT_MISC_LOUD			9
-#define AI_EVENT_FOOTSTEP			10
-#define AI_EVENT_GRENADE			11
-
-enum eThinkNum
-{
-	THINK_VOID,
-	THINK_TURRET,
-	THINK_COVER,
-	THINK_PATROL,
-	THINK_RUNNER,
-	THINK_PAIN,
-	THINK_KILLED,
-	THINK_MOVETO,
-	THINK_IDLE,
-	THINK_CURIOUS,
-	THINK_DISGUISE_SALUTE,
-	THINK_DISGUISE_SENTRY,
-	THINK_DISGUISE_OFFICER,
-	THINK_DISGUISE_ROVER,
-	THINK_DISGUISE_NONE,
-	THINK_ALARM,
-	THINK_GRENADE,
-	THINK_MACHINEGUNNER,
-	THINK_DOG_IDLE,
-	THINK_DOG_ATTACK,
-	THINK_DOG_CURIOUS,
-	THINK_DOG_GRENADE,
-	THINK_ANIM,
-	THINK_ANIM_CURIOUS,
-	THINK_AIM,
-	THINK_BALCONY_IDLE,
-	THINK_BALCONY_CURIOUS,
-	THINK_BALCONY_ATTACK,
-	THINK_BALCONY_DISGUISE,
-	THINK_BALCONY_GRENADE,
-	THINK_BALCONY_PAIN,
-	THINK_BALCONY_KILLED,
-	THINK_WEAPONLESS,
-	THINK_NOCLIP,
-	THINK_DEAD,
-	NUM_THINKS,
+enum eThinkNum {
+    THINK_VOID,
+    THINK_TURRET,
+    THINK_COVER,
+    THINK_PATROL,
+    THINK_RUNNER,
+    THINK_PAIN,
+    THINK_KILLED,
+    THINK_MOVETO,
+    THINK_IDLE,
+    THINK_CURIOUS,
+    THINK_DISGUISE_SALUTE,
+    THINK_DISGUISE_SENTRY,
+    THINK_DISGUISE_OFFICER,
+    THINK_DISGUISE_ROVER,
+    THINK_DISGUISE_NONE,
+    THINK_ALARM,
+    THINK_GRENADE,
+    THINK_MACHINEGUNNER,
+    THINK_DOG_IDLE,
+    THINK_DOG_ATTACK,
+    THINK_DOG_CURIOUS,
+    THINK_DOG_GRENADE,
+    THINK_ANIM,
+    THINK_ANIM_CURIOUS,
+    THINK_AIM,
+    THINK_BALCONY_IDLE,
+    THINK_BALCONY_CURIOUS,
+    THINK_BALCONY_ATTACK,
+    THINK_BALCONY_DISGUISE,
+    THINK_BALCONY_GRENADE,
+    THINK_BALCONY_PAIN,
+    THINK_BALCONY_KILLED,
+    THINK_WEAPONLESS,
+    THINK_NOCLIP,
+    THINK_DEAD,
+    THINK_BADPLACE,      // Added in 2.0
+    THINK_RUN_AND_SHOOT, // Added in 2.30
+    NUM_THINKS,
 };
 
-enum eThinkLevel
-{
-	THINKLEVEL_NORMAL, //I think it should be THINKLEVEL_IDLE
-	THINKLEVEL_PAIN,
-	THINKLEVEL_KILLED,
-	THINKLEVEL_NOCLIP,
-	NUM_THINKLEVELS
+enum eThinkLevel {
+    THINKLEVEL_IDLE,
+    THINKLEVEL_PAIN,
+    THINKLEVEL_KILLED,
+    THINKLEVEL_NOCLIP,
+    NUM_THINKLEVELS
+};
+
+enum eActorNationality {
+    ACTOR_NATIONALITY_DEFAULT,
+    ACTOR_NATIONALITY_AMERICAN,
+    ACTOR_NATIONALITY_GERMAN,
+    ACTOR_NATIONALITY_ITALIAN,
+    ACTOR_NATIONALITY_BRITISH,
+    ACTOR_NATIONALITY_RUSSIAN,
+};
+
+//
+// Actor states
+//
+enum eActorState {
+    ACTOR_STATE_DISGUISE       = 0,
+    ACTOR_STATE_TURRET         = 100,
+    ACTOR_STATE_BALCONY_ATTACK = 200,
+    ACTOR_STATE_COVER          = 300,
+    ACTOR_STATE_PAIN           = 500,
+    ACTOR_STATE_ALARM          = 600,
+    ACTOR_STATE_KILLED         = 700,
+    ACTOR_STATE_BALCONY_KILLED = 800,
+    ACTOR_STATE_WEAPONLESS     = 900,
+    ACTOR_STATE_ANIMATION      = 1000,
+    ACTOR_STATE_CURIOUS        = 1100,
+    ACTOR_STATE_MACHINE_GUNNER = 1200,
+    // Added in 2.30
+    ACTOR_STATE_RUN_AND_SHOOT = 1300,
+};
+
+//
+// Disguise think state
+//
+enum eActorState_Disguise {
+    ACTOR_STATE_DISGUISE_START = ACTOR_STATE_DISGUISE,
+    ACTOR_STATE_DISGUISE_WAIT  = ACTOR_STATE_DISGUISE_START,
+    ACTOR_STATE_DISGUISE_PAPERS,
+    ACTOR_STATE_DISGUISE_ACCEPT,
+    ACTOR_STATE_DISGUISE_ENEMY,
+    ACTOR_STATE_DISGUISE_HALT,
+    ACTOR_STATE_DISGUISE_DENY,
+};
+
+//
+// Turret think state
+//
+enum eActorState_Turret {
+    ACTOR_STATE_TURRET_START  = ACTOR_STATE_TURRET,
+    ACTOR_STATE_TURRET_COMBAT = ACTOR_STATE_TURRET_START,
+    ACTOR_STATE_TURRET_REACQUIRE,
+    ACTOR_STATE_TURRET_TAKE_SNIPER_NODE,
+    ACTOR_STATE_TURRET_SNIPER_NODE,
+    ACTOR_STATE_TURRET_RUN_HOME,
+    ACTOR_STATE_TURRET_RUN_AWAY,
+    ACTOR_STATE_TURRET_CHARGE,
+    ACTOR_STATE_TURRET_GRENADE,
+    ACTOR_STATE_TURRET_INTRO_AIM,
+    ACTOR_STATE_TURRET_FAKE_ENEMY,
+    ACTOR_STATE_TURRET_COVER_INSTEAD,
+    ACTOR_STATE_TURRET_BECOME_COVER,
+    ACTOR_STATE_TURRET_WAIT,
+    ACTOR_STATE_TURRET_SHOOT,             // Added in 2.0
+    ACTOR_STATE_TURRET_RETARGET_SUPPRESS, // Added in 2.0
+    ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE,
+    ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_SMALL,
+    ACTOR_STATE_TURRET_RETARGET_PATH_EXACT,
+    ACTOR_STATE_TURRET_RETARGET_PATH_NEAR,
+    ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_MEDIUM,
+    ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_LARGE,
+    ACTOR_STATE_TURRET_RETARGET_STEP_FACE_MEDIUM,
+    ACTOR_STATE_TURRET_RETARGET_STEP_FACE_LARGE,
+    ACTOR_STATE_TURRET_NUM_STATES
+};
+
+//
+// Balcony attack think state
+//
+enum eActorState_BalconyAttack {
+    ACTOR_STATE_BALCONY_ATTACK_START      = ACTOR_STATE_BALCONY_ATTACK,
+    ACTOR_STATE_BALCONY_ATTACK_FIND_ENEMY = ACTOR_STATE_BALCONY_ATTACK_START,
+    ACTOR_STATE_BALCONY_ATTACK_TARGET,
+    ACTOR_STATE_BALCONY_ATTACK_SHOOT
+};
+
+//
+// Balcony cover think state
+//
+enum eActorState_Cover {
+    ACTOR_STATE_COVER_START     = ACTOR_STATE_COVER,
+    ACTOR_STATE_COVER_NEW_ENEMY = ACTOR_STATE_COVER_START,
+    ACTOR_STATE_COVER_FIND_COVER,
+    ACTOR_STATE_COVER_TAKE_COVER,
+    ACTOR_STATE_COVER_FINISH_RELOADING,
+    ACTOR_STATE_COVER_SPECIAL_ATTACK,
+    ACTOR_STATE_COVER_FIND_ENEMY,
+    ACTOR_STATE_COVER_SEARCH_NODE,
+    ACTOR_STATE_COVER_TARGET,
+    ACTOR_STATE_COVER_HIDE,
+    ACTOR_STATE_COVER_SHOOT,
+    ACTOR_STATE_COVER_GRENADE,
+    ACTOR_STATE_COVER_HUNT_ENEMY,
+    ACTOR_STATE_COVER_LOOP,
+    ACTOR_STATE_COVER_FAKE_ENEMY,
+};
+
+//
+// Pain think state
+//
+enum eActorState_Pain {
+    ACTOR_STATE_PAIN_START   = ACTOR_STATE_PAIN,
+    ACTOR_STATE_PAIN_INITIAL = ACTOR_STATE_PAIN_START,
+    ACTOR_STATE_PAIN_MAIN
+};
+
+//
+// Alarm think state
+//
+enum eActorState_Alarm {
+    ACTOR_STATE_ALARM_START = ACTOR_STATE_ALARM,
+    ACTOR_STATE_ALARM_IDLE  = ACTOR_STATE_ALARM_START,
+    ACTOR_STATE_ALARM_MOVE
+};
+
+//
+// Killed think state
+//
+enum eActorState_Killed {
+    ACTOR_STATE_KILLED_START = ACTOR_STATE_KILLED,
+    ACTOR_STATE_KILLED_BEGIN = ACTOR_STATE_KILLED_START,
+    ACTOR_STATE_KILLED_END
+};
+
+//
+// Balcony killed think state
+//
+enum eActorState_BalconyKilled {
+    ACTOR_STATE_BALCONY_KILLED_START = ACTOR_STATE_BALCONY_KILLED,
+    ACTOR_STATE_BALCONY_KILLED_BEGIN = ACTOR_STATE_BALCONY_KILLED_START,
+    ACTOR_STATE_BALCONY_KILLED_INTRO,
+    ACTOR_STATE_BALCONY_KILLED_LOOP,
+    ACTOR_STATE_BALCONY_KILLED_LOOP_END,
+    ACTOR_STATE_BALCONY_KILLED_OUTTRO,
+    ACTOR_STATE_BALCONY_KILLED_END,
+    ACTOR_STATE_BALCONY_KILLED_NORMAL,
+};
+
+//
+// Weaponless think state
+//
+enum eActorState_WeaponLess {
+    ACTOR_STATE_WEAPONLESS_START  = ACTOR_STATE_WEAPONLESS,
+    ACTOR_STATE_WEAPONLESS_NORMAL = ACTOR_STATE_WEAPONLESS_START,
+    ACTOR_STATE_WEAPONLESS_GRENADE,
+    ACTOR_STATE_WEAPONLESS_LOOP
+};
+
+//
+// Animation think state
+//
+enum eActorState_Animation {
+    ACTOR_STATE_ANIMATION_START   = ACTOR_STATE_ANIMATION,
+    ACTOR_STATE_ANIMATION_INITIAL = ACTOR_STATE_ANIMATION_START,
+    ACTOR_STATE_ANIMATION_MAIN,
+};
+
+//
+// Curious think state
+//
+enum eActorState_Curious {
+    ACTOR_STATE_CURIOUS_START = ACTOR_STATE_CURIOUS,
+    ACTOR_STATE_CURIOUS_BEGIN = ACTOR_STATE_CURIOUS_START,
+    ACTOR_STATE_CURIOUS_RUNNING
+};
+
+//
+// Machine gunner think state
+//
+enum eActorState_MachineGunner {
+    ACTOR_STATE_MACHINE_GUNNER_START = ACTOR_STATE_MACHINE_GUNNER,
+    ACTOR_STATE_MACHINE_GUNNER_READY = ACTOR_STATE_MACHINE_GUNNER_START,
+    ACTOR_STATE_MACHINE_GUNNER_RELOADING
+};
+
+//
+// Run and shoot think state
+//
+enum eActorState_RunAndShoot {
+    ACTOR_STATE_RUN_AND_SHOOT_START = ACTOR_STATE_RUN_AND_SHOOT,
+    ACTOR_STATE_RUN_AND_SHOOT_RUN   = ACTOR_STATE_RUN_AND_SHOOT_START,
+    ACTOR_STATE_RUN_AND_SHOOT_RUNNING
 };
 
 class Actor;
@@ -409,1173 +583,1574 @@ typedef SafePtr<Actor> ActorPtr;
 
 class Actor : public SimpleActor
 {
-	struct GlobalFuncs_t {
-		void ( Actor::*ThinkState )( void );
-		void ( Actor::*BeginState )( void );
-		void ( Actor::*ResumeState )( void );
-		void ( Actor::*EndState )( void );
-		void ( Actor::*SuspendState )( void );
-		void ( Actor::*RestartState )( void );
-		void ( Actor::*FinishedAnimation )( void );
-		void ( Actor::*PostShoot )( void );
-		void ( Actor::*Pain )( Event *ev );
-		void ( Actor::*Killed )( Event *ev, bool bPlayDeathAnim );
-		bool ( Actor::*PassesTransitionConditions )( void );
-		void ( Actor::*ShowInfo )( void );
-		void ( Actor::*PathnodeClaimRevoked )( void );
-		void ( Actor::*ReceiveAIEvent )( vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared );
-		bool ( *IsState )( int state );
-	};
+    struct GlobalFuncs_t {
+        void (Actor::*ThinkState)(void);
+        void (Actor::*BeginState)(void);
+        void (Actor::*ResumeState)(void);
+        void (Actor::*EndState)(void);
+        void (Actor::*SuspendState)(void);
+        void (Actor::*RestartState)(void);
+        void (Actor::*FinishedAnimation)(void);
+        void (Actor::*PostShoot)(void);
+        void (Actor::*Pain)(Event *ev);
+        void (Actor::*Killed)(Event *ev, bool bPlayDeathAnim);
+        bool (Actor::*PassesTransitionConditions)(void);
+        void (Actor::*ShowInfo)(void);
+        void (Actor::*PathnodeClaimRevoked)(void);
+        void (Actor::*ReceiveAIEvent)(
+            vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
+        );
+        bool (*IsState)(int state);
+    };
 
 public:
-	/* GlobalFuncs: contains different funcs needed for each actor think 
+    /* GlobalFuncs: contains different funcs needed for each actor think 
 	 * think is basically a mode for the actor
 	 * when m_ThinkLevel changes, new think value is inside m_Think
 	 * to access current think : m_Think[m_ThinkLevel]
 	 * to access GlobalFuncs related to current think
 	 * GlobalFuncs[m_Think[m_ThinkLevel]];
 	 **/
-	static GlobalFuncs_t GlobalFuncs[NUM_THINKS];
-	/* const string array containig think names */
-	static const_str m_csThinkNames[NUM_THINKS];
-	/* const string array containig think state names */
-	static const_str m_csThinkStateNames[NUM_THINKSTATES];
-	/* map contating every think value for each thinkstate */
-	eThinkNum m_ThinkMap[NUM_THINKSTATES];
-	/* think state for every think level */
-	eThinkState m_ThinkStates[NUM_THINKLEVELS];
-	/* think value for every think level */
-	eThinkNum m_Think[NUM_THINKLEVELS];
-	/* current think level
+    static GlobalFuncs_t GlobalFuncs[NUM_THINKS];
+    /* const string array containig think names */
+    static const_str m_csThinkNames[NUM_THINKS];
+    /* const string array containig think state names */
+    static const_str m_csThinkStateNames[NUM_THINKSTATES];
+    /* map contating every think value for each thinkstate */
+    eThinkNum m_ThinkMap[NUM_THINKSTATES];
+    /* think state for every think level */
+    eThinkState m_ThinkStates[NUM_THINKLEVELS];
+    /* think value for every think level */
+    eThinkNum m_Think[NUM_THINKLEVELS];
+    /* current think level
 	 * think levels are more like priorities
 	 * highest level is used.
 	 **/
-	eThinkLevel m_ThinkLevel;
-	/* current think state*/
-	eThinkState m_ThinkState;
-	/* current state (different than think state) */
-	int m_State;
-	/* current state change time */
-	int m_iStateTime;
-	/* should lock think state ? */
-	bool m_bLockThinkState;
-	/* think state changed */
-	bool m_bDirtyThinkState;
-	/*  debug state for m_State */
-	const char *m_pszDebugState;
-	/* currently animating ( used in G_RunFrame ) */
-	bool m_bAnimating;
-	/* Am I a doggo ? */
-	bool m_bDog;
-	/* char refereing to voice type, chec gAmericanVoices and gGermanVoices */
-	int mVoiceType;
-	/* check EV_Actor_GetSilent, EV_Actor_SetSilent and EV_Actor_SetSilent2 */
-	bool m_bSilent;
-	/* check EV_Actor_GetNoSurprise, EV_Actor_SetNoSurprise and EV_Actor_SetNoSurprise2 */
-	bool m_bNoSurprise;
-	/* actor can mumble ? */
-	bool m_bMumble;
-	/* actor is allowed to have steamy breath */
-	bool m_bBreathSteam;
-	/* const string of head model */
-	const_str m_csHeadModel;
-	/* const string of head skin */
-	const_str m_csHeadSkin;
-	/* const string of weapon model */
-	const_str m_csWeapon;
-	/* const string of REAL weapon model (check Actor::EventGiveWeapon) */
-	const_str m_csLoadOut;
-	/* favorite enemy */
-	SentientPtr m_FavoriteEnemy;
-	/* last time enemy was checked */
-	int m_iEnemyCheckTime;
-	/* last time enemy was changed */
-	int m_iEnemyChangeTime;
-	/* last time a visible(CanSee) enemy was checked */
-	int m_iEnemyVisibleCheckTime;
-	/* last time a visible(CanSee) enemy was changed */
-	int m_iEnemyVisibleChangeTime;
-	/* last time a visible(CanSee) enemy was seen */
-	int m_iLastEnemyVisibleTime;
-	/* last time a visible(CanSee + infov) enemy was checked */
-	int m_iEnemyFovCheckTime;
-	/* last time a visible(CanSee + infov) enemy was changed */
-	int m_iEnemyFovChangeTime;
-	/* last known enemy position. */
-	Vector m_vLastEnemyPos;
-	/* last time enemy position was changed. */
-	int m_iLastEnemyPosChangeTime;
-	/*  check EV_Actor_GetEnemyShareRange and EV_Actor_SetEnemyShareRange */
-	float m_fMaxShareDistSquared;
-	/* can actor shoot enemy ? */
-	bool m_bCanShootEnemy;
-	/* last time m_bCanShootEnemy was changed */
-	int m_iCanShootCheckTime;
-	/* desired enable enemy(changed from script) */
-	bool m_bDesiredEnableEnemy;
-	/* enable enemy (change from code only, Actor::UpdateEnableEnemy) */
-	bool m_bEnableEnemy;
-	/* can take pain ? */
-	bool m_bEnablePain;
-	/* allow long pain ? */
-	bool m_bNoLongPain;
-	/* last set enemy is new ? */
-	bool m_bNewEnemy;
-	/* is enemy disguised ? */
-	bool m_bEnemyIsDisguised;
-	/* is enemy visible (CanSee) ? */
-	bool m_bEnemyVisible;
-	/* is enemy in fov (CanSee) ? */
-	bool m_bEnemyInFOV;
-	/* attack player even if disguised. */
-	bool m_bForceAttackPlayer;
-	/* actor should avoud player (Actor::IdleThink) (get out of the players way) */
-	bool m_bAutoAvoidPlayer;
-	/* actor will not go into idle after playing an animation */
-	bool m_bNoIdleAfterAnim;
-	/* is anim script set ? */
-	bool m_bAnimScriptSet;
-	/* const string of anim script path */
-	const_str m_csAnimScript;
-	/* anim mode */
-	int m_AnimMode;
-	/* Don't Face Wall request yaw. */
-	float m_fDfwRequestedYaw;
-	/* Don't Face Wall derived yaw. */
-	float m_fDfwDerivedYaw;
-	/* Don't Face Wall derived position. */
-	Vector m_vDfwPos;
-	/* Don't Face Wall time. */
-	float m_fDfwTime;
-	/* last time GunPostiton() was called */
-	int m_iGunPositionCheckTime;
-	/* gun position */
-	Vector m_vGunPosition;
-	int m_iWallDodgeTimeout;
-	vec2_t m_PrevObstacleNormal;
-	char m_WallDir;
-	/* EV_Actor_SetMoveDoneRadius */
-	float m_fMoveDoneRadiusSquared;
-	/* last time origin was changed */
-	int m_iOriginTime;
-	/* should I face enemy ? */
-	bool m_bFaceEnemy;
-	/* physics on/off ? */
-	bool m_bDoPhysics;
-	/* should become runner/patrol guy */
-	bool m_bBecomeRunner;
-	/* If true, patrol guys and running men wait until triggered to move */
-	bool m_bPatrolWaitTrigger;
-	bool m_bScriptGoalValid;
-	Vector m_vScriptGoal;
-	int m_iNextWatchStepTime;
-	/* current patrol node */
-	SafePtr<SimpleEntity> m_patrolCurrentNode;
-	/* current patrol anim */
-	const_str m_csPatrolCurrentAnim;
-	int m_iSquadStandTime;
-	/* distance AI tries to keep between squadmates while moving. */
-	float m_fInterval;
-	int m_iIntervalDirTime;
-	/* the direction the AI would like to move to maintain its interval */
-	Vector m_vIntervalDir;
-	short m_sCurrentPathNodeIndex;
-	/* current pain state(similar to m_State) */
-	int m_PainState;
-	/* last time actor switched to curious state. */
-	int m_iCuriousTime;
-	/* Current level of curiousity. It's value is from PriorityForEventType() */
-	int m_iCuriousLevel;
-	int m_iCuriousAnimHint;
-	/* next time to check for state change to disguise. PassesTransitionConditions_Disguise() */
-	int m_iNextDisguiseTime;
-	/* EV_Actor_SetDisguisePeriod */
-	int m_iDisguisePeriod;
-	/* EV_Actor_SetDisguiseRange */
-	float m_fMaxDisguiseDistSquared;
-	/* next time enemy should show papers */
-	int m_iEnemyShowPapersTime;
-	/* the thread for actor when accepting papers */
-	ScriptThreadLabel m_DisguiseAcceptThread;
-	/* disguise level of the actor, might be 1 or 2 */
-	int m_iDisguiseLevel;
-	/* node for actor to raise alaram against player. */
-	SafePtr< SimpleEntity > m_AlarmNode;
-	/* alarm thread for actor */
-	ScriptThreadLabel m_AlarmThread;
-	/* used for turret actot to run back to home Turret_SelectState() */
-	int m_iRunHomeTime;
-	/* no cover path for initial turret state */
-	bool m_bTurretNoInitialCover;
-	/* potential cover nodes */
-	PathNode *m_pPotentialCoverNode[MAX_COVER_NODES];
-	/* potential cover node count */
-	int m_iPotentialCoverCount;
-	/* current cover node */
-	PathNode *m_pCoverNode;
-	/* special cover node attack script. */
-	const_str m_csSpecialAttack;
-	/* actor is reloading */
-	bool m_bInReload;
-	/* actor needs reloading */
-	bool m_bNeedReload;
-	/* should break(stop) special attack ? */
-	bool mbBreakSpecialAttack;
-	/* grenade has bounced ? (usually means actor should flee) */
-	bool m_bGrenadeBounced;
-	/* current grenade */
-	SafePtr<Entity> m_pGrenade;
-	/* grenade position */
-	Vector m_vGrenadePos;
-	/* first time grenade was noticed */
-	int m_iFirstGrenadeTime;
-	/* grenade state */
-	eGrenadeState m_eGrenadeState;
-	/* grenade mode */
-	eGrenadeTossMode m_eGrenadeMode;
-	/* grenade velocity */
-	Vector m_vGrenadeVel;
-	/* grenade kick direction */
-	Vector m_vKickDir;
-	/* falling path */
-	FallPath *m_pFallPath;
-	/* minimum height a balcony guy must fall to do special balcony death */
-	float m_fBalconyHeight;
-	/* actor should not collide with player */
-	bool m_bNoPlayerCollision;
-	/* multiplier in time to notice an enemy */
-	float m_fNoticeTimeScale;
-	/* max multiplier in time to notice an enemy */
-	float m_fMaxNoticeTimeScale;
-	/* set of potential enemies */
-	ActorEnemySet m_PotentialEnemies;
-	/* vision distance of the actor */
-	float m_fSight;
-	/* hearing radius of the actor */
-	float m_fHearing;
-	/* EV_Actor_GetSoundAwareness */
-	float m_fSoundAwareness;
-	/* EV_Actor_GetGrenadeAwareness */
-	float m_fGrenadeAwareness;
-	/* mask of AI_EVENT* bits for the actor to ignore. */
-	int m_iIgnoreSoundsMask;
-	/* fov angle of the actor */
-	float m_fFov;
-	/* used for infov check */
-	float m_fFovDot;
-	/* eye update time */
-	int m_iEyeUpdateTime;
-	/* eye direction */
-	Vector m_vEyeDir;
-	/* next time to look around */
-	int m_iNextLookTime;
-	/* fov angle for look around */
-	float m_fLookAroundFov;
-	/* entity to look at */
-	SafePtr<SimpleEntity> m_pLookEntity;
-	/* look flags(should be a bool) */
-	int m_iLookFlags;
-	/* entity to point at */
-	SafePtr<SimpleEntity> m_pPointEntity;
-	/* entity to turn to */
-	SafePtr<SimpleEntity> m_pTurnEntity;
-	/* allowed error(difference) in angles after doing turnto command */
-	float m_fTurnDoneError;
-	/* turn speed of the actor */
-	float m_fAngleYawSpeed;
-	/* node to aim at */
-	SafePtr<SimpleEntity> m_aimNode;
-	/* dont face wall mode */
-	int m_eDontFaceWallMode;
-	int m_iLastFaceDecideTime;
-	/*  origin history */
-	vec2_t m_vOriginHistory[MAX_ORIGIN_HISTORY];
-	/* current origin history index */
-	int m_iCurrentHistory;
-	bool m_bHeadAnglesAchieved;
-	bool m_bLUpperArmAnglesAchieved;
-	bool m_bTorsoAnglesAchieved;
-	bool align3;
-	/* max head turn speed */
-	float m_fHeadMaxTurnSpeed;
-	/* desired head angles */
-	vec3_t m_vHeadDesiredAngles;
-	/* up arm turn speed */
-	float m_fLUpperArmTurnSpeed;
-	/* upper arm desired angles */
-	vec3_t m_vLUpperArmDesiredAngles;
-	/* max torso turn speed */
-	float m_fTorsoMaxTurnSpeed;
-	/* currnet torso turn speed */
-	float m_fTorsoCurrentTurnSpeed;
-	/* desired torso angles */
-	vec3_t m_vTorsoDesiredAngles;
-	/* global body queue */
-	static SafePtr< Actor > mBodyQueue[MAX_BODYQUEUE];
-	/* current body queue index */
-	static int mCurBody;
-	/* leash home */
-	Vector m_vHome;
-	/* tether entity */
-	SafePtr<SimpleEntity> m_pTetherEnt;
-	/* minimum distance actor tries to keep between itself and the player */
-	float m_fMinDistance;
-	/* square of minimum distance actor tries to keep between itself and the player */
-	float m_fMinDistanceSquared;
-	/* maximum distance actor tries to allow between itself and the player */
-	float m_fMaxDistance;
-	/* square of maximum distance actor tries to allow between itself and the player */
-	float m_fMaxDistanceSquared;
-	/* maximum distance actor will wander from its leash home */
-	float m_fLeash;
-	/* square of maximum distance actor will wander from its leash home */
-	float m_fLeashSquared;
-	/* if true, leash will not change. */
-	bool m_bFixedLeash;
+    eThinkLevel m_ThinkLevel;
+    /* current think state*/
+    eThinkState m_ThinkState;
+    /* current state (different than think state) */
+    int m_State;
+    /* current state change time */
+    int m_iStateTime;
+    /* should lock think state ? */
+    bool m_bLockThinkState;
+    /* think state changed */
+    bool m_bDirtyThinkState;
+    /*  debug state for m_State */
+    const char *m_pszDebugState;
+    /* currently animating ( used in G_RunFrame ) */
+    bool m_bAnimating;
+    /* 2.0: ignore bad place? */
+    bool m_bIgnoreBadPlace;
+    /* 2.0: bad place index? (0=none) */
+    int m_iBadPlaceIndex;
+    /* char refereing to voice type, chec gAmericanVoices and gGermanVoices */
+    int mVoiceType;
+    /* check EV_Actor_GetSilent, EV_Actor_SetSilent and EV_Actor_SetSilent2 */
+    bool m_bSilent;
+    /* check EV_Actor_GetNoSurprise, EV_Actor_SetNoSurprise and EV_Actor_SetNoSurprise2 */
+    bool m_bNoSurprise;
+    /* actor can mumble ? */
+    bool m_bMumble;
+    /* actor is allowed to have steamy breath */
+    bool m_bBreathSteam;
+    /* const string of head model */
+    const_str m_csHeadModel;
+    /* const string of head skin */
+    const_str m_csHeadSkin;
+    /* const string of weapon model */
+    const_str m_csWeapon;
+    /* const string of REAL weapon model (check Actor::EventGiveWeapon) */
+    const_str m_csLoadOut;
+    /* favorite enemy */
+    SentientPtr m_FavoriteEnemy;
+    /* last time enemy was checked */
+    int m_iEnemyCheckTime;
+    /* last time enemy was changed */
+    int m_iEnemyChangeTime;
+    /* last time a visible(CanSee) enemy was checked */
+    int m_iEnemyVisibleCheckTime;
+    /* last time a visible(CanSee) enemy was changed */
+    int m_iEnemyVisibleChangeTime;
+    /* last time a visible(CanSee) enemy was seen */
+    int m_iLastEnemyVisibleTime;
+    /* 2.0: visibility alpha */
+    float m_fVisibilityAlpha;
+    /* 2.0: max visibility threshold */
+    float m_fVisibilityThreshold;
+    /* last time a visible(CanSee + infov) enemy was checked */
+    int m_iEnemyFovCheckTime;
+    /* last time a visible(CanSee + infov) enemy was changed */
+    int m_iEnemyFovChangeTime;
+    /* last known enemy position. */
+    Vector m_vLastEnemyPos;
+    /* last time enemy position was changed. */
+    int m_iLastEnemyPosChangeTime;
+    /*  check EV_Actor_GetEnemyShareRange and EV_Actor_SetEnemyShareRange */
+    float m_fMaxShareDistSquared;
+    /* can actor shoot enemy ? */
+    bool m_bCanShootEnemy;
+    /* 2.0: does it has visibility threshold set? */
+    bool m_bHasVisibilityThreshold;
+    /* last time m_bCanShootEnemy was changed */
+    int m_iCanShootCheckTime;
+    /* desired enable enemy(changed from script) */
+    bool m_bDesiredEnableEnemy;
+    /* enable enemy (change from code only, Actor::UpdateEnableEnemy) */
+    bool m_bEnableEnemy;
+    /* can take pain ? */
+    bool m_bEnablePain;
+    /* allow long pain ? */
+    bool m_bNoLongPain;
+    /* last set enemy is new ? */
+    bool m_bNewEnemy;
+    /* is enemy disguised ? */
+    bool m_bEnemyIsDisguised;
+    /* is enemy visible (CanSee) ? */
+    bool m_bEnemyVisible;
+    /* is enemy in fov (CanSee) ? */
+    bool m_bEnemyInFOV;
+    /* attack player even if disguised. */
+    bool m_bForceAttackPlayer;
+    /* actor should avoud player (Actor::IdleThink) (get out of the players way) */
+    bool m_bAutoAvoidPlayer;
+    /* actor will not go into idle after playing an animation */
+    bool m_bNoIdleAfterAnim;
+    /* is anim script set ? */
+    bool m_bAnimScriptSet;
+    /* const string of anim script path */
+    const_str m_csAnimScript;
+    /* anim mode */
+    int m_AnimMode;
+    /* 2.0: the run anim rate */
+    float m_fRunAnimRate;
+    /* Don't Face Wall request yaw. */
+    float m_fDfwRequestedYaw;
+    /* Don't Face Wall derived yaw. */
+    float m_fDfwDerivedYaw;
+    /* Don't Face Wall derived position. */
+    Vector m_vDfwPos;
+    /* Don't Face Wall time. */
+    float m_fDfwTime;
+    /* last time GunPostiton() was called */
+    int m_iGunPositionCheckTime;
+    /* gun position */
+    Vector m_vGunPosition;
+    int    m_iWallDodgeTimeout;
+    vec2_t m_PrevObstacleNormal;
+    char   m_WallDir;
+    /* EV_Actor_SetMoveDoneRadius */
+    float m_fMoveDoneRadiusSquared;
+    /* last time origin was changed */
+    int m_iOriginTime;
+    /* should I face enemy ? */
+    bool m_bFaceEnemy;
+    /* physics on/off ? */
+    bool m_bDoPhysics;
+    /* should become runner/patrol guy */
+    bool m_bBecomeRunner;
+    /* If true, patrol guys and running men wait until triggered to move */
+    bool   m_bPatrolWaitTrigger;
+    bool   m_bScriptGoalValid;
+    Vector m_vScriptGoal;
+    int    m_iNextWatchStepTime;
+    /* current patrol node */
+    SafePtr<SimpleEntity> m_patrolCurrentNode;
+    /* current patrol anim */
+    const_str m_csPatrolCurrentAnim;
+    int       m_iSquadStandTime;
+    /* distance AI tries to keep between squadmates while moving. */
+    float m_fInterval;
+    int   m_iIntervalDirTime;
+    /* the direction the AI would like to move to maintain its interval */
+    Vector m_vIntervalDir;
+    short  m_sCurrentPathNodeIndex;
+    /* current pain state(similar to m_State) */
+    int m_PainState;
+    /* last time actor switched to curious state. */
+    int m_iCuriousTime;
+    /* Current level of curiousity. It's value is from PriorityForEventType() */
+    int m_iCuriousLevel;
+    int m_iCuriousAnimHint;
+    /* next time to check for state change to disguise. PassesTransitionConditions_Disguise() */
+    int m_iNextDisguiseTime;
+    /* EV_Actor_SetDisguisePeriod */
+    int m_iDisguisePeriod;
+    /* EV_Actor_SetDisguiseRange */
+    float m_fMaxDisguiseDistSquared;
+    /* next time enemy should show papers */
+    int m_iEnemyShowPapersTime;
+    /* the thread for actor when accepting papers */
+    ScriptThreadLabel m_DisguiseAcceptThread;
+    /* disguise level of the actor, might be 1 or 2 */
+    int m_iDisguiseLevel;
+    /* node for actor to raise alaram against player. */
+    SafePtr<SimpleEntity> m_AlarmNode;
+    /* alarm thread for actor */
+    ScriptThreadLabel m_AlarmThread;
+    /* 2.30: pre-alarm thread for actor */
+    ScriptThreadLabel m_PreAlarmThread;
+    /* 2.0: Suppress chance */
+    int m_iSuppressChance;
+    /* used for turret actot to run back to home Turret_SelectState() */
+    int m_iRunHomeTime;
+    /* no cover path for initial turret state */
+    bool m_bTurretNoInitialCover;
+    /* potential cover nodes */
+    PathNode *m_pPotentialCoverNode[MAX_COVER_NODES];
+    /* potential cover node count */
+    int m_iPotentialCoverCount;
+    /* current cover node */
+    PathNode *m_pCoverNode;
+    /* special cover node attack script. */
+    const_str m_csSpecialAttack;
+    /* actor is reloading */
+    bool m_bInReload;
+    /* actor needs reloading */
+    bool m_bNeedReload;
+    /* should break(stop) special attack ? */
+    bool mbBreakSpecialAttack;
+    /* 2.30: is the AI curious? */
+    bool m_bIsCurious;
+    /* grenade has bounced ? (usually means actor should flee) */
+    bool m_bGrenadeBounced;
+    /* current grenade */
+    SafePtr<Entity> m_pGrenade;
+    /* grenade position */
+    Vector m_vGrenadePos;
+    /* first time grenade was noticed */
+    int m_iFirstGrenadeTime;
+    /* grenade state */
+    eGrenadeState m_eGrenadeState;
+    /* grenade mode */
+    eGrenadeTossMode m_eGrenadeMode;
+    /* grenade velocity */
+    Vector m_vGrenadeVel;
+    /* grenade kick direction */
+    Vector m_vKickDir;
+    /* falling path */
+    FallPath *m_pFallPath;
+    /* minimum height a balcony guy must fall to do special balcony death */
+    float m_fBalconyHeight;
+    /* actor should not collide with player */
+    bool m_bNoPlayerCollision;
+    /* multiplier in time to notice an enemy */
+    float m_fNoticeTimeScale;
+    /* max multiplier in time to notice an enemy */
+    float m_fMaxNoticeTimeScale;
+    /* set of potential enemies */
+    ActorEnemySet m_PotentialEnemies;
+    /* vision distance of the actor */
+    float m_fSight;
+    /* hearing radius of the actor */
+    float m_fHearing;
+    /* EV_Actor_GetSoundAwareness */
+    float m_fSoundAwareness;
+    /* EV_Actor_GetGrenadeAwareness */
+    float m_fGrenadeAwareness;
+    /* mask of AI_EVENT* bits for the actor to ignore. */
+    int m_iIgnoreSoundsMask;
+    /* fov angle of the actor */
+    float m_fFov;
+    /* used for infov check */
+    float m_fFovDot;
+    /* eye update time */
+    int m_iEyeUpdateTime;
+    /* eye direction */
+    Vector m_vEyeDir;
+    /* next time to look around */
+    int m_iNextLookTime;
+    /* fov angle for look around */
+    float m_fLookAroundFov;
+    /* entity to look at */
+    SafePtr<SimpleEntity> m_pLookEntity;
+    /* look flags(should be a bool) */
+    int m_iLookFlags;
+    /* entity to point at */
+    SafePtr<SimpleEntity> m_pPointEntity;
+    /* entity to turn to */
+    SafePtr<SimpleEntity> m_pTurnEntity;
+    /* allowed error(difference) in angles after doing turnto command */
+    float m_fTurnDoneError;
+    /* turn speed of the actor */
+    float m_fAngleYawSpeed;
+    /* node to aim at */
+    SafePtr<SimpleEntity> m_aimNode;
+    /* dont face wall mode */
+    int m_eDontFaceWallMode;
+    int m_iLastFaceDecideTime;
+    /*  origin history */
+    vec2_t m_vOriginHistory[MAX_ORIGIN_HISTORY];
+    /* current origin history index */
+    int  m_iCurrentHistory;
+    bool m_bHeadAnglesAchieved;
+    bool m_bLUpperArmAnglesAchieved;
+    bool m_bTorsoAnglesAchieved;
+    bool align3;
+    /* max head turn speed */
+    float m_fHeadMaxTurnSpeed;
+    /* desired head angles */
+    vec3_t m_vHeadDesiredAngles;
+    /* up arm turn speed */
+    float m_fLUpperArmTurnSpeed;
+    /* upper arm desired angles */
+    vec3_t m_vLUpperArmDesiredAngles;
+    /* max torso turn speed */
+    float m_fTorsoMaxTurnSpeed;
+    /* currnet torso turn speed */
+    float m_fTorsoCurrentTurnSpeed;
+    /* desired torso angles */
+    vec3_t m_vTorsoDesiredAngles;
+    /* global body queue */
+    static SafePtr<Actor> mBodyQueue[MAX_BODYQUEUE];
+    /* current body queue index */
+    static int mCurBody;
+    /* leash home */
+    Vector m_vHome;
+    /* tether entity */
+    SafePtr<SimpleEntity> m_pTetherEnt;
+    /* minimum distance actor tries to keep between itself and the player */
+    float m_fMinDistance;
+    /* square of minimum distance actor tries to keep between itself and the player */
+    float m_fMinDistanceSquared;
+    /* maximum distance actor tries to allow between itself and the player */
+    float m_fMaxDistance;
+    /* square of maximum distance actor tries to allow between itself and the player */
+    float m_fMaxDistanceSquared;
+    /* maximum distance actor will wander from its leash home */
+    float m_fLeash;
+    /* square of maximum distance actor will wander from its leash home */
+    float m_fLeashSquared;
+    /* if true, leash will not change. */
+    bool m_bFixedLeash;
+    /* 2.0: if true, enemy switch will be disabled. */
+    bool m_bEnemySwitch;
+    /* 2.30: the nationality index. */
+    int m_iNationality;
 
 public:
-	CLASS_PROTOTYPE( Actor );
+    CLASS_PROTOTYPE(Actor);
 
 protected:
-	void MoveTo( Event *ev );
-	void WalkTo( Event *ev );
-	void RunTo( Event *ev );
-	void CrouchTo( Event *ev );
-	void CrawlTo( Event *ev );
-	void AimAt( Event *ev );
-	void DefaultRestart( void );
-	void SuspendState( void );
-	void ResumeState( void );
-	void BeginState( void );
-	void EndState( int level );
-	void RestartState( void );
+    void MoveTo(Event *ev);
+    void WalkTo(Event *ev);
+    void RunTo(Event *ev);
+    void CrouchTo(Event *ev);
+    void CrawlTo(Event *ev);
+    void AimAt(Event *ev);
+    void DefaultRestart(void);
+    void SuspendState(void);
+    void ResumeState(void);
+    void BeginState(void);
+    void EndState(int level);
+    void RestartState(void);
 
 public:
-	Actor();
-	
-	virtual void setContentsSolid( void ) override;
-	void InitThinkStates( void );
-	void UpdateEyeOrigin( void );
-	bool RequireThink( void );
-	void UpdateEnemy( int iMaxDirtyTime );
-	void UpdateEnemyInternal( void );
-	void SetEnemy( Sentient *pEnemy, bool bForceConfirmed );
-	void SetEnemyPos( Vector vPos );
-	static void ResetBodyQueue( void );
-	void AddToBodyQue( void );
-	Vector GetAntiBunchPoint( void );
-	static void InitVoid( GlobalFuncs_t *func );
-	virtual const char *DumpCallTrace( const char *pszFmt, ... ) const override;
-	static void Init( void );
-	void FixAIParameters( void );
-	bool AttackEntryAnimation( void );
-	void CheckForThinkStateTransition( void );
-	bool CheckForTransition( eThinkState state, eThinkLevel level );
-	bool PassesTransitionConditions_Grenade( void );
-	bool PassesTransitionConditions_Attack( void );
-	bool PassesTransitionConditions_Disguise( void );
-	bool PassesTransitionConditions_Curious( void );
-	bool PassesTransitionConditions_Idle( void );
-	void UpdateEnableEnemy( void );
-	void ThinkStateTransitions( void );
-	void TransitionState( int iNewState, int iPadTime );
-	void ChangeAnim( void );
-	void UpdateSayAnim( void );
-	void UpdateUpperAnim( void );
-	void UpdateAnim( void );
-	virtual void StoppedWaitFor( const_str name, bool bDeleting ) override;
-	static void InitTurret( GlobalFuncs_t *func );
-	void Begin_Turret( void );
-	void End_Turret( void );
-	void Suspend_Turret( void );
-	void Think_Turret( void );
-	void FinishedAnimation_Turret( void );
-	void ReceiveAIEvent_Turret( vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared );
-	void InterruptPoint_Turret( void );
-	void PathnodeClaimRevoked_Turret( void );
-	bool Turret_IsRetargeting( void ) const;
-	bool Turret_DecideToSelectState( void );
-	void Turret_SelectState( void );
-	bool Turret_CheckRetarget( void );
-	bool Turret_TryToBecomeCoverGuy( void );
-	void Turret_BeginRetarget( void );
-	void Turret_NextRetarget( void );
-	void Turret_SideStep( int iStepSize, vec3_t vDir );
-	void State_Turret_Combat( void );
-	void State_Turret_Reacquire( void );
-	void State_Turret_TakeSniperNode( void );
-	void State_Turret_SniperNode( void );
-	bool State_Turret_RunHome( bool bAttackOnFail );
-	void State_Turret_RunAway( void );
-	void State_Turret_Charge( void );
-	void State_Turret_Grenade( void );
-	void State_Turret_FakeEnemy( void );
-	void State_Turret_Wait( void );
-	void State_Turret_Retarget_Sniper_Node( void );
-	void State_Turret_Retarget_Step_Side_Small( void );
-	void State_Turret_Retarget_Path_Exact( void );
-	void State_Turret_Retarget_Path_Near( void );
-	void State_Turret_Retarget_Step_Side_Medium( void );
-	void State_Turret_Retarget_Step_Side_Large( void );
-	void State_Turret_Retarget_Step_Face_Medium( void );
-	void State_Turret_Retarget_Step_Face_Large( void );
-	static void InitCover( GlobalFuncs_t *func );
-	bool Cover_IsValid( PathNode *node );
-	bool Cover_SetPath( PathNode *node );
-	void Cover_FindCover( bool bCheckAll );
-	void Begin_Cover( void );
-	void End_Cover( void );
-	void Suspend_Cover( void );
-	void Think_Cover( void );
-	void FinishedAnimation_Cover( void );
-	void PathnodeClaimRevoked_Cover( void );
-	void State_Cover_NewEnemy( void );
-	void State_Cover_FindCover( void );
-	void State_Cover_TakeCover( void );
-	void State_Cover_FinishReloading( void );
-	void State_Cover_SpecialAttack( void );
-	void State_Cover_Target( void );
-	void State_Cover_Hide( void );
-	void State_Cover_Shoot( void );
-	void State_Cover_Grenade( void );
-	void State_Cover_FindEnemy( void );
-	void State_Cover_SearchNode( void );
-	void State_Cover_HuntEnemy( void );
-	void State_Cover_FakeEnemy( void );
-	static void InitPatrol( GlobalFuncs_t *func );
-	void Begin_Patrol( void );
-	void End_Patrol( void );
-	void Resume_Patrol( void );
-	void Think_Patrol( void );
-	void ShowInfo_Patrol( void );
-	void IdleThink( void );
-	static void InitRunner( GlobalFuncs_t *func );
-	void Begin_Runner( void );
-	void End_Runner( void );
-	void Resume_Runner( void );
-	void Think_Runner( void );
-	void ShowInfo_Runner( void );
-	static void InitAlarm( GlobalFuncs_t *func );
-	void Begin_Alarm( void );
-	void End_Alarm( void );
-	void State_Alarm_StartThread( void );
-	void State_Alarm_Move( void );
-	void State_Alarm_Idle( void );
-	void Think_Alarm( void );
-	void FinishedAnimation_Alarm( void );
-	static void InitNoClip( GlobalFuncs_t *func );
-	bool IsNoClipState( int state );
-	void Think_NoClip( void );
-	bool ValidGrenadePath( const Vector& vFrom, const Vector& vTo, Vector& vVel );
-	static Vector CalcThrowVelocity( const Vector& vFrom, const Vector& vTo );
-	Vector CanThrowGrenade( const Vector& vFrom, const Vector& vTo );
-	static Vector CalcRollVelocity( const Vector& vFrom, const Vector& vTo );
-	Vector CanRollGrenade( const Vector& vFrom, const Vector& vTo );
-	bool CanTossGrenadeThroughHint( GrenadeHint *pHint, const Vector& vFrom, const Vector& vTo, bool bDesperate, Vector *pvVel, eGrenadeTossMode *peMode );
-	static Vector GrenadeThrowPoint( const Vector& vFrom, const Vector& vDelta, const_str csAnim );
-	Vector CalcKickVelocity( Vector& vDelta, float fDist ) const;
-	bool CanKickGrenade( Vector &vFrom, Vector &vTo, Vector &vFace, Vector *pvVel );
-	bool GrenadeWillHurtTeamAt( const Vector& vTo );
-	bool CanGetGrenadeFromAToB( const Vector& vFrom, const Vector& vTo, bool bDesperate, Vector *pvVel, eGrenadeTossMode *peMode );
-	bool DecideToThrowGrenade( const Vector& vTo, Vector *pvVel, eGrenadeTossMode *peMode );
-	void Grenade_EventFire( Event *ev );
-	void GenericGrenadeTossThink( void );
-	static void InitGrenade( GlobalFuncs_t *func );
-	bool Grenade_Acquire( eGrenadeState eNextState, const_str csReturnAnim );
-	void Grenade_Flee( void );
-	void Grenade_ThrowAcquire( void );
-	void Grenade_Throw( void );
-	void Grenade_KickAcquire( void );
-	void Grenade_Kick( void );
-	void Grenade_MartyrAcquire( void );
-	void Grenade_Martyr( void );
-	void Grenade_Wait( void );
-	void Grenade_NextThinkState( void );
-	void Grenade_EventAttach( Event *ev );
-	void Grenade_EventDetach( Event *ev );
-	void Begin_Grenade( void );
-	void End_Grenade( void );
-	void Resume_Grenade( void );
-	void Think_Grenade( void );
-	void FinishedAnimation_Grenade( void );
-	static void InitCurious( GlobalFuncs_t *func );
-	void SetCuriousAnimHint( int iAnimHint );
-	void Begin_Curious( void );
-	void End_Curious( void );
-	void Resume_Curious( void );
-	void Suspend_Curious( void );
-	void Think_Curious( void );
-	void FinishedAnimation_Curious( void );
-	void LookAtCuriosity( void );
-	void TimeOutCurious( void );
-	void State_Disguise_Wait( void );
-	void State_Disguise_Papers( void );
-	void State_Disguise_Fake_Papers( void );
-	void State_Disguise_Enemy( void );
-	void State_Disguise_Halt( void );
-	void State_Disguise_Accept( void );
-	void State_Disguise_Deny( void );
-	static void InitDisguiseSalute( GlobalFuncs_t *func );
-	void Begin_DisguiseSalute( void );
-	void End_DisguiseSalute( void );
-	void Resume_DisguiseSalute( void );
-	void Suspend_DisguiseSalute( void );
-	void Think_DisguiseSalute( void );
-	void FinishedAnimation_DisguiseSalute( void );
-	static void InitDisguiseSentry( GlobalFuncs_t *func );
-	void Begin_DisguiseSentry( void );
-	void End_DisguiseSentry( void );
-	void Resume_DisguiseSentry( void );
-	void Suspend_DisguiseSentry( void );
-	void Think_DisguiseSentry( void );
-	static void InitDisguiseOfficer( GlobalFuncs_t *func );
-	void Begin_DisguiseOfficer( void );
-	void End_DisguiseOfficer( void );
-	void Resume_DisguiseOfficer( void );
-	void Suspend_DisguiseOfficer( void );
-	void Think_DisguiseOfficer( void );
-	static void InitDisguiseRover( GlobalFuncs_t *func );
-	void Begin_DisguiseRover( void );
-	void End_DisguiseRover( void );
-	void Resume_DisguiseRover( void );
-	void Suspend_DisguiseRover( void );
-	void Think_DisguiseRover( void );
-	static void InitDisguiseNone( GlobalFuncs_t *func );
-	static void InitIdle( GlobalFuncs_t *func );
-	void Begin_Idle( void );
-	void Think_Idle( void );
-	static void InitMachineGunner( GlobalFuncs_t *func );
-	void Begin_MachineGunner( void );
-	void End_MachineGunner( void );
-	void BecomeTurretGuy( void );
-	void Think_MachineGunner( void );
-	void ThinkHoldGun( void );
-	void FinishedAnimation_MachineGunner( void );
-	bool MachineGunner_CanSee( Entity *ent, float fov, float vision_distance );
-	void CanSee( Event *ev );
-	static void InitDogIdle( GlobalFuncs_t *func );
-	static void InitDogAttack( GlobalFuncs_t *func );
-	static void InitDogCurious( GlobalFuncs_t *func );
-	void Begin_Dog( void );
-	void End_Dog( void );
-	void Think_Dog_Idle( void );
-	void Think_Dog_Attack( void );
-	void Think_Dog_Curious( void );
-	static void InitAnim( GlobalFuncs_t *func );
-	void Begin_Anim( void );
-	void Think_Anim( void );
-	void FinishedAnimation_Anim( void );
-	void ShowInfo_Anim( void );
-	static void InitAnimCurious( GlobalFuncs_t *func );
-	void Begin_AnimCurious( void );
-	void Think_AnimCurious( void );
-	void FinishedAnimation_AnimCurious( void );
-	static void InitAim( GlobalFuncs_t *func );
-	void Begin_Aim( void );
-	void Think_Aim( void );
-	void ShowInfo_Aim( void );
-	static void InitBalconyIdle( GlobalFuncs_t *func );
-	static void InitBalconyCurious( GlobalFuncs_t *func );
-	static void InitBalconyAttack( GlobalFuncs_t *func );
-	static void InitBalconyDisguise( GlobalFuncs_t *func );
-	static void InitBalconyGrenade( GlobalFuncs_t *func );
-	static void InitBalconyPain( GlobalFuncs_t *func );
-	static void InitBalconyKilled( GlobalFuncs_t *func );
-	void Pain_Balcony( Event *ev );
-	void Killed_Balcony( Event *ev, bool bPlayDeathAnim );
-	void Think_BalconyAttack( void );
-	void Begin_BalconyAttack( void );
-	void FinishedAnimation_BalconyAttack( void );
-	void State_Balcony_PostShoot( void );
-	void State_Balcony_FindEnemy( void );
-	void State_Balcony_Target( void );
-	void State_Balcony_Shoot( void );
-	void Begin_BalconyKilled( void );
-	void End_BalconyKilled( void );
-	void Think_BalconyKilled( void );
-	void FinishedAnimation_BalconyKilled( void );
-	bool CalcFallPath( void );
-	static void InitPain( GlobalFuncs_t *func );
-	void Begin_Pain( void );
-	void Think_Pain( void );
-	void FinishedAnimation_Pain( void );
-	static void InitDead( GlobalFuncs_t *func );
-	static void InitKilled( GlobalFuncs_t *func );
-	void Begin_Killed( void );
-	void Think_Killed( void );
-	void FinishedAnimation_Killed( void );
-	static void InitWeaponless( GlobalFuncs_t *func );
-	void Begin_Weaponless( void );
-	void Suspend_Weaponless( void );
-	void Think_Weaponless( void );
-	void FinishedAnimation_Weaponless( void );
-	void State_Weaponless_Normal( void );
-	void State_Weaponless_Grenade( void );
-	virtual void Think( void ) override;
-	void PostThink( bool bDontFaceWall );
-	virtual void SetMoveInfo( mmove_t *mm ) override;
-	virtual void GetMoveInfo( mmove_t *mm ) override;
-	void DoFailSafeMove( vec3_t dest );
-	void TouchStuff( mmove_t *mm );
-	void ExtractConstraints( mmove_t *mm );
-	void EventGiveWeaponInternal( Event *ev );
-	void EventGiveWeapon( Event *ev );
-	void EventGetWeapon( Event *ev );
-	void FireWeapon( Event *ev );
-	virtual bool CanTarget( void ) override;
-	virtual bool IsImmortal( void ) override;
-	static bool IsVoidState( int state );
-	static bool IsIdleState( int state );
-	static bool IsCuriousState( int state );
-	static bool IsDisguiseState( int state );
-	static bool IsAttackState( int state );
-	static bool IsGrenadeState( int state );
-	static bool IsPainState( int state );
-	static bool IsKilledState( int state );
-	static bool IsMachineGunnerState( int state );
-	static bool IsDogState( int state );
-	void IgnoreSoundSet( int iType );
-	void IgnoreSoundSetAll( void );
-	void IgnoreSoundClear( int iType );
-	void IgnoreSoundClearAll( void );
-	bool IgnoreSound( int iType );
-	void EventShareEnemy( Event *ev );
-	void EventShareGrenade( Event *ev );
-	void ReceiveAIEvent( vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared );
-	void DefaultReceiveAIEvent( vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared );
-	int PriorityForEventType( int iType );
-	void CuriousSound( int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared );
-	void WeaponSound( int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator );
-	void FootstepSound( vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator );
-	void VoiceSound( int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator );
-	void GrenadeNotification( Entity *originator );
-	void SetGrenade( Entity *pGrenade );
-	void NotifySquadmateKilled( Sentient *pSquadMate, Sentient *pAttacker );
-	void RaiseAlertnessForEventType( int iType );
-	void RaiseAlertness( float fAmount );
-	virtual bool CanSee( Entity *e1, float fov, float vision_distance, bool bNoEnts ) override;
-	virtual Vector GunPosition( void ) override;
-	bool WithinVisionDistance( Entity *ent ) const;
-	bool InFOV( Vector pos, float check_fov, float check_fovdot );
-	bool EnemyInFOV( int iMaxDirtyTime );
-	bool InFOV( Vector pos );
-	bool InFOV( Entity *ent );
-	bool CanSeeNoFOV( Entity *ent );
-	bool CanSeeFOV( Entity *ent );
-	bool CanSeeEnemyFOV( int iMaxFovDirtyTime, int iMaxSightDirtyTime );
-	bool CanShoot( Entity *ent );
-	virtual bool CanSeeFrom( vec3_t pos, Entity *ent );
-	bool CanSeeEnemy( int iMaxDirtyTime );
-	bool CanShootEnemy( int iMaxDirtyTime );
-	void ShowInfo( void );
-	virtual void ShowInfo( float fDot, float fDist ) override;
-	void DefaultPain( Event *ev );
-	void HandlePain( Event *ev );
-	void EventPain( Event *ev );
-	void DefaultKilled( Event *ev, bool bPlayDeathAnim );
-	void HandleKilled( Event *ev, bool bPlayDeathAnim );
-	void DispatchEventKilled( Event *ev, bool bPlayDeathAnim );
-	void EventKilled( Event *ev );
-	void EventBeDead( Event *ev );
-	void DeathEmbalm( Event *ev );
-	void DeathSinkStart( Event *ev );
-	bool NoticeShot( Sentient *pShooter, Sentient *pTarget, float fDist );
-	bool NoticeFootstep( Sentient *pPedestrian );
-	bool NoticeVoice( Sentient *pVocallist );
-	void ClearLookEntity( void );
-	void LookAt( const Vector& vec );
-	void LookAt( Listener *l );
-	void ForwardLook( void );
-	void LookAtLookEntity( void );
-	void IdleLook( void );
-	void IdleLook( vec3_t dir );
-	void SetDesiredLookDir( vec3_t dir );
-	void SetDesiredLookAnglesRelative( vec3_t ang );
-	void EventLookAt( Event *ev );
-	void EventEyesLookAt( Event *ev );
-	void NoPoint( void );
-	void IdlePoint( void );
-	void ClearPointEntity( void );
-	void PointAt( const Vector& vec );
-	void PointAt( Listener* l );
-	void EventPointAt( Event *ev );
-	void ClearTurnEntity( void );
-	void TurnTo( const Vector& vec );
-	void TurnTo( Listener *l  );
-	void IdleTurn( void );
-	void EventTurnTo( Event *ev );
-	void EventSetTurnDoneError( Event *ev );
-	void EventGetTurnDoneError( Event *ev );
-	void LookAround( float fFovAdd );
-	bool SoundSayAnim( const_str name, byte bLevelSayAnim );
-	void EventSetAnim( Event *ev );
-	void EventIdleSayAnim( Event *ev );
-	void EventSayAnim( Event *ev );
-	void EventSetSayAnim( Event *ev );
-	void EventSetMotionAnim( Event *ev );
-	void EventSetAimMotionAnim( Event *ev );
-	void EventSetActionAnim( Event *ev );
-	void EventUpperAnim( Event *ev );
-	void EventSetUpperAnim( Event *ev );
-	void EventEndActionAnim( Event *ev );
-	void EventDamagePuff( Event *ev );
-	void SafeSetOrigin( vec3_t newOrigin );
-	void DoMove( void );
-	void AnimFinished( int slot, bool stop );
-	virtual void AnimFinished( int slot ) override;
-	void PlayAnimation( Event *ev );
-	void PlayScriptedAnimation( Event *ev );
-	void PlayNoclipAnimation( Event *ev );
-	void MoveDest( float fMoveSpeed );
-	void MovePath( float fMoveSpeed );
-	void MovePathGoal( float fMoveSpeed );
-	void Dumb( Event *ev );
-	void PhysicsOn( Event *ev );
-	void PhysicsOff( Event *ev );
-	void EventStart( Event *ev );
-	void EventGetMood( Event *ev );
-	void EventSetMood( Event *ev );
-	void EventGetAngleYawSpeed( Event *ev );
-	void EventSetAngleYawSpeed( Event *ev );
-	void EventSetAimTarget( Event *ev );
-	void UpdateAngles( void );
-	void SetLeashHome( Vector vHome );
-	void AimAtTargetPos( void );
-	void AimAtAimNode( void );
-	void AimAtEnemyBehavior( void );
-	void FaceMotion( void );
-	void FaceDirectionDuringMotion( vec3_t vLook );
-	float PathDistanceAlongVector( vec3_t vDir );
-	void FaceEnemyOrMotion( int iTimeIntoMove );
-	static int NextUpdateTime( int iLastUpdateTime, int iUpdatePeriod );
-	void ResetBoneControllers( void );
-	void UpdateBoneControllers( void );
-	void ReadyToFire( Event *ev );
-	void GetLocalYawFromVector( Event *ev );
-	void EventGetSight( Event *ev );
-	void EventSetSight( Event *ev );
-	void EventGetHearing( Event *ev );
-	void EventSetHearing( Event *ev );
-	void ClearPatrolCurrentNode( void );
-	void NextPatrolCurrentNode( void );
-	void SetPatrolCurrentNode( Vector& vec );
-	void SetPatrolCurrentNode( Listener *l );
-	void EventSetPatrolPath( Event *ev );
-	void EventGetPatrolPath( Event *ev );
-	void EventSetPatrolWaitTrigger( Event *ev );
-	void EventGetPatrolWaitTrigger( Event *ev );
-	void ShowInfo_PatrolCurrentNode( void );
-	bool MoveOnPathWithSquad( void );
-	bool MoveToWaypointWithPlayer( void );
-	bool PatrolNextNodeExists( void );
-	void UpdatePatrolCurrentNode( void );
-	bool MoveToPatrolCurrentNode( void );
-	void ClearAimNode( void );
-	void SetAimNode( Vector& vec );
-	void SetAimNode( Listener *l );
-	void ShowInfo_AimNode( void );
-	void EventSetAccuracy( Event *ev );
-	void EventGetAccuracy( Event *ev );
-	int GetThinkType( const_str csName );
-	void SetThink( eThinkState state, eThinkNum think );
-	void SetThinkIdle( eThinkNum think_idle );
-	void SetThinkState( eThinkState state, eThinkLevel level );
-	void EndCurrentThinkState( void );
-	void ClearThinkStates( void );
-	int CurrentThink( void ) const;
-	bool IsAttacking( void ) const;
-	void EventGetFov( Event *ev );
-	void EventSetFov( Event *ev );
-	void EventSetDestIdle( Event *ev );
-	void EventSetDestIdle2( Event *ev );
-	void EventSetTypeIdle( Event *ev );
-	void EventGetTypeIdle( Event *ev );
-	void EventSetTypeAttack( Event *ev );
-	void EventGetTypeAttack( Event *ev );
-	void EventSetTypeDisguise( Event *ev );
-	void EventGetTypeDisguise( Event *ev );
-	void EventSetDisguiseLevel( Event *ev );
-	void EventGetDisguiseLevel( Event *ev );
-	void EventSetTypeGrenade( Event *ev );
-	void EventGetTypeGrenade( Event *ev );
-	void EventSetMinDistance( Event *ev );
-	void EventGetMinDistance( Event *ev );
-	void EventSetMaxDistance( Event *ev );
-	void EventGetMaxDistance( Event *ev );
-	void EventGetLeash( Event *ev );
-	void EventSetLeash( Event *ev );
-	void EventGetInterval( Event *ev );
-	void EventSetInterval( Event *ev );
-	void EventDistToEnemy( Event *ev );
-	void EventGetRunAnim( Event *ev );
-	void EventGetWalkAnim( Event *ev );
-	void EventGetAnimName( Event *ev );
-	void EventSetAnimName( Event *ev );
-	void EventSetDisguiseRange( Event *ev );
-	void EventGetDisguiseRange( Event *ev );
-	void EventSetDisguisePeriod( Event *ev );
-	void EventGetDisguisePeriod( Event *ev );
-	void EventSetDisguiseAcceptThread( Event *ev );
-	void EventGetDisguiseAcceptThread( Event *ev );
-	void EventAttackPlayer( Event *ev );
-	void ForceAttackPlayer( void );
-	void EventSetAlarmNode( Event *ev );
-	void EventGetAlarmNode( Event *ev );
-	void EventSetAlarmThread( Event *ev );
-	void EventGetAlarmThread( Event *ev );
-	void EventSetSoundAwareness( Event *ev );
-	void EventGetSoundAwareness( Event *ev );
-	void EventSetGrenadeAwareness( Event *ev );
-	void EventGetGrenadeAwareness( Event *ev );
-	str ThinkName( void ) const;
-	str ThinkStateName( void ) const;
-	void EventSetTurret( Event *ev );
-	void EventGetTurret( Event *ev );
-	void EventEnableEnemy( Event *ev );
-	void EventEnablePain( Event *ev );
-	void EventActivate( Event *ev );
-	void EventGetAmmoGrenade( Event *ev );
-	void EventSetAmmoGrenade( Event *ev );
-	void EventInterruptPoint( Event *ev );
-	void EventAnimScript( Event *ev );
-	void EventAnimScript_Scripted( Event *ev );
-	void EventAnimScript_Noclip( Event *ev );
-	void EventReload_mg42( Event *ev );
-	void SetPathWithLeash( Vector vDestPos, const char *description, int iMaxDirtyTime );
-	void SetPathWithLeash( SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime );
-	void FindPathAwayWithLeash( vec3_t vAwayFrom, vec3_t vDirPreferred, float fMinSafeDist );
-	void FindPathNearWithLeash( vec3_t vNearbyTo, float fCloseDistSquared );
-	bool CanMovePathWithLeash( void ) const;
-	bool MovePathWithLeash( void );
-	bool ShortenPathToAttack( float fMinDist );
-	void StrafeToAttack( float fDist, vec3_t vDir );
-	virtual Vector GunTarget( bool bNoCollision ) override;
-	virtual qboolean setModel( void ) override;
-	void EventSetHeadModel( Event *ev );
-	void EventGetHeadModel( Event *ev );
-	void EventSetHeadSkin( Event *ev );
-	void EventGetHeadSkin( Event *ev );
-	void EventSetNoIdle( Event *ev );
-	void EventGetNoIdle( Event *ev );
-	void EventGetEnemy( Event *ev );
-	void EventSetMaxNoticeTimeScale( Event *ev );
-	void EventGetMaxNoticeTimeScale( Event *ev );
-	void EventSetFixedLeash( Event *ev );
-	void EventGetFixedLeash( Event *ev );
-	void Holster( void );
-	void Unholster( void );
-	void EventHolster( Event *ev );
-	void EventUnholster( Event *ev );
-	void EventSoundDone( Event *ev );
-	void EventSound( Event *ev );
-	void EventIsEnemyVisible( Event *ev );
-	void EventGetEnemyVisibleChangeTime( Event *ev );
-	void EventGetLastEnemyVisibleTime( Event *ev );
-	void EventSetFallHeight( Event *ev );
-	void EventGetFallHeight( Event *ev );
-	void EventCanMoveTo( Event *ev );
-	void EventMoveDir( Event *ev );
-	void EventIntervalDir( Event *ev );
-	void EventResetLeash( Event *ev );
-	void EventTether( Event *ev );
-	void EventGetThinkState( Event *ev );
-	void EventGetEnemyShareRange( Event *ev );
-	void EventSetEnemyShareRange( Event *ev );
-	void EventGetKickDir( Event *ev );
-	void EventGetNoLongPain( Event *ev );
-	void EventSetNoLongPain( Event *ev );
-	void EventGetFavoriteEnemy( Event *ev );
-	void EventSetFavoriteEnemy( Event *ev );
-	void EventGetMumble( Event *ev );
-	void EventSetMumble( Event *ev );
-	void EventGetBreathSteam( Event *ev );
-	void EventSetBreathSteam( Event *ev );
-	void EventSetNextBreathTime( Event *ev );
-	void EventCalcGrenadeToss( Event *ev );
-	void EventGetNoSurprise( Event *ev );
-	void EventSetNoSurprise( Event *ev );
-	void EventGetSilent( Event *ev );
-	void EventSetSilent( Event *ev );
-	void EventGetAvoidPlayer( Event *ev );
-	void EventSetAvoidPlayer( Event *ev );
-	void EventGetLookAroundAngle( Event *ev );
-	void EventSetLookAroundAngle( Event *ev );
-	void EventHasCompleteLookahead( Event *ev );
-	void EventPathDist( Event *ev );
-	void EventCanShootEnemyFrom( Event *ev );
-	void EventCanShoot( Event *ev );
-	void EventSetInReload( Event *ev );
-	void EventGetInReload( Event *ev );
-	void EventSetReloadCover( Event *ev );
-	void EventBreakSpecial( Event *ev );
-	void GetVoiceType( Event *ev );
-	void SetVoiceType( Event *ev );
-	void ResolveVoiceType( void );
-	void EventSetBalconyHeight( Event *ev );
-	void EventGetBalconyHeight( Event *ev );
-	PathNode *FindSniperNodeAndSetPath( bool *pbTryAgain );
-	void Remove( Event *ev );
-	void DontFaceWall( void );
-	bool AvoidingFacingWall( void ) const;
-	void EndStates( void );
-	void ClearStates( void );
-	void CheckUnregister( void );
-	void BecomeCorpse( void );
-	virtual void PathnodeClaimRevoked( PathNode *node ) override;
-	void SetPathToNotBlockSentient( Sentient *pOther );
-	void EventSetMoveDoneRadius( Event *ev );
-	virtual void ClearEnemies( void ) override;
-	bool EnemyIsDisguised( void );
-	virtual void setOriginEvent( Vector org ) override;
-	virtual void DumpAnimInfo( void ) override;
-	static void ArchiveStatic( Archiver& arc );
-	virtual void Archive( Archiver& arc ) override;
-	virtual bool AutoArchiveModel( void ) override;
+    Actor();
+    ~Actor();
+
+    virtual void        setContentsSolid(void) override;
+    void                InitThinkStates(void);
+    void                UpdateEyeOrigin(void);
+    bool                RequireThink(void);
+    void                UpdateEnemy(int iMaxDirtyTime);
+    void                UpdateEnemyInternal(void);
+    void                DetectSmokeGrenades(void);
+    void                SetEnemy(Sentient *pEnemy, bool bForceConfirmed);
+    void                SetEnemyPos(Vector vPos);
+    static void         ResetBodyQueue(void);
+    void                AddToBodyQue(void);
+    Vector              GetAntiBunchPoint(void);
+    static void         InitVoid(GlobalFuncs_t *func);
+    virtual const char *DumpCallTrace(const char *pszFmt, ...) const override;
+    static void         Init(void);
+    void                FixAIParameters(void);
+    bool                AttackEntryAnimation(void);
+    void                CheckForThinkStateTransition(void);
+    bool                CheckForTransition(eThinkState state, eThinkLevel level);
+    bool                PassesTransitionConditions_Grenade(void);
+    bool                PassesTransitionConditions_BadPlace(void); // Added in 2.0
+    bool                PassesTransitionConditions_Attack(void);
+    bool                PassesTransitionConditions_Disguise(void);
+    bool                PassesTransitionConditions_Curious(void);
+    bool                PassesTransitionConditions_Idle(void);
+    void                UpdateEnableEnemy(void);
+    void                ThinkStateTransitions(void);
+    void                TransitionState(int iNewState, int iPadTime = 0);
+    void                ChangeAnim(void);
+    void                UpdateSayAnim(void);
+    void                UpdateUpperAnim(void);
+    void                UpdateAnim(void);
+    virtual void        StoppedWaitFor(const_str name, bool bDeleting) override;
+    static void         InitTurret(GlobalFuncs_t *func);
+    void                Begin_Turret(void);
+    void                End_Turret(void);
+    void                Suspend_Turret(void);
+    void                Think_Turret(void);
+    void                FinishedAnimation_Turret(void);
+    void                ReceiveAIEvent_Turret(
+                       vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
+                   );
+    void          InterruptPoint_Turret(void);
+    void          PathnodeClaimRevoked_Turret(void);
+    bool          Turret_IsRetargeting(void) const;
+    bool          Turret_DecideToSelectState(void);
+    void          Turret_SelectState(void);
+    bool          Turret_CheckRetarget(void);
+    bool          Turret_TryToBecomeCoverGuy(void);
+    void          Turret_BeginRetarget(void);
+    void          Turret_NextRetarget(void);
+    void          Turret_SideStep(int iStepSize, vec3_t vDir);
+    void          State_Turret_Combat(void);
+    void          State_Turret_Reacquire(void);
+    void          State_Turret_TakeSniperNode(void);
+    void          State_Turret_SniperNode(void);
+    bool          State_Turret_RunHome(bool bAttackOnFail);
+    void          State_Turret_RunAway(void);
+    void          State_Turret_Charge(void);
+    void          State_Turret_Grenade(void);
+    void          State_Turret_FakeEnemy(void);
+    void          State_Turret_Wait(void);
+    void          State_Turret_Shoot(void);             // Added in 2.0
+    void          State_Turret_Retarget_Suppress(void); // Added in 2.0
+    void          State_Turret_Retarget_Sniper_Node(void);
+    void          State_Turret_Retarget_Step_Side_Small(void);
+    void          State_Turret_Retarget_Path_Exact(void);
+    void          State_Turret_Retarget_Path_Near(void);
+    void          State_Turret_Retarget_Step_Side_Medium(void);
+    void          State_Turret_Retarget_Step_Side_Large(void);
+    void          State_Turret_Retarget_Step_Face_Medium(void);
+    void          State_Turret_Retarget_Step_Face_Large(void);
+    static void   InitCover(GlobalFuncs_t *func);
+    bool          Cover_IsValid(PathNode *node);
+    bool          Cover_SetPath(PathNode *node);
+    void          Cover_FindCover(bool bCheckAll);
+    void          Begin_Cover(void);
+    void          End_Cover(void);
+    void          Suspend_Cover(void);
+    void          Think_Cover(void);
+    void          FinishedAnimation_Cover(void);
+    void          PathnodeClaimRevoked_Cover(void);
+    void          State_Cover_NewEnemy(void);
+    void          State_Cover_FindCover(void);
+    void          State_Cover_TakeCover(void);
+    void          State_Cover_FinishReloading(void);
+    void          State_Cover_SpecialAttack(void);
+    void          State_Cover_Target(void);
+    void          State_Cover_Hide(void);
+    void          State_Cover_Shoot(void);
+    void          State_Cover_Grenade(void);
+    void          State_Cover_FindEnemy(void);
+    void          State_Cover_SearchNode(void);
+    void          State_Cover_HuntEnemy(void);
+    void          State_Cover_FakeEnemy(void);
+    static void   InitPatrol(GlobalFuncs_t *func);
+    void          Begin_Patrol(void);
+    void          End_Patrol(void);
+    void          Resume_Patrol(void);
+    void          Think_Patrol(void);
+    void          ShowInfo_Patrol(void);
+    void          IdleThink(void);
+    static void   InitRunner(GlobalFuncs_t *func);
+    void          Begin_Runner(void);
+    void          End_Runner(void);
+    void          Resume_Runner(void);
+    void          Think_Runner(void);
+    void          ShowInfo_Runner(void);
+    static void   InitAlarm(GlobalFuncs_t *func);
+    void          Begin_Alarm(void);
+    void          End_Alarm(void);
+    void          State_Alarm_StartThread(void);
+    void          State_Alarm_Move(void);
+    void          State_Alarm_Idle(void);
+    void          Think_Alarm(void);
+    void          FinishedAnimation_Alarm(void);
+    static void   InitNoClip(GlobalFuncs_t *func);
+    bool          IsNoClipState(int state);
+    void          Think_NoClip(void);
+    bool          ValidGrenadePath(const Vector         &vFrom, const Vector         &vTo, Vector         &vVel);
+    static Vector CalcThrowVelocity(const Vector& vFrom, const Vector& vTo);
+    Vector        CanThrowGrenade(const Vector       &vFrom, const Vector       &vTo);
+    static Vector CalcRollVelocity(const Vector& vFrom, const Vector& vTo);
+    Vector        CanRollGrenade(const Vector       &vFrom, const Vector       &vTo);
+    bool          CanTossGrenadeThroughHint(
+                 GrenadeHint      *pHint,
+                 const Vector             &vFrom,
+                 const Vector             &vTo,
+                 bool              bDesperate,
+                 Vector           *pvVel,
+                 eGrenadeTossMode *peMode
+             );
+    static Vector GrenadeThrowPoint(const Vector& vFrom, const Vector& vDelta, const_str csAnim);
+    Vector        CalcKickVelocity(Vector       &vDelta, float fDist) const;
+    bool          CanKickGrenade(Vector         &vFrom, Vector         &vTo, Vector         &vFace, Vector *pvVel);
+    bool          GrenadeWillHurtTeamAt(const Vector         &vTo);
+    bool          CanGetGrenadeFromAToB(
+                 const Vector         &vFrom, const Vector         &vTo, bool bDesperate, Vector *pvVel, eGrenadeTossMode *peMode
+             );
+    bool        DecideToThrowGrenade(const Vector       &vTo, Vector *pvVel, eGrenadeTossMode *peMode, bool bDesperate);
+    void        Grenade_EventFire(Event *ev);
+    void        GenericGrenadeTossThink(void);
+    static void InitGrenade(GlobalFuncs_t *func);
+    bool        Grenade_Acquire(eGrenadeState eNextState, const_str csReturnAnim);
+    void        Grenade_Flee(void);
+    void        Grenade_ThrowAcquire(void);
+    void        Grenade_Throw(void);
+    void        Grenade_KickAcquire(void);
+    void        Grenade_Kick(void);
+    void        Grenade_MartyrAcquire(void);
+    void        Grenade_Martyr(void);
+    void        Grenade_Wait(void);
+    void        Grenade_NextThinkState(void);
+    void        Grenade_EventAttach(Event *ev);
+    void        Grenade_EventDetach(Event *ev);
+    void        Begin_Grenade(void);
+    void        End_Grenade(void);
+    void        Resume_Grenade(void);
+    void        Think_Grenade(void);
+    void        FinishedAnimation_Grenade(void);
+    static void InitCurious(GlobalFuncs_t *func);
+    void        SetCuriousAnimHint(int iAnimHint);
+    void        Begin_Curious(void);
+    void        End_Curious(void);
+    void        Resume_Curious(void);
+    void        Suspend_Curious(void);
+    void        Think_Curious(void);
+    void        FinishedAnimation_Curious(void);
+    void        LookAtCuriosity(void);
+    void        TimeOutCurious(void);
+    void        State_Disguise_Wait(void);
+    void        State_Disguise_Papers(void);
+    void        State_Disguise_Fake_Papers(void);
+    void        State_Disguise_Enemy(void);
+    void        State_Disguise_Halt(void);
+    void        State_Disguise_Accept(void);
+    void        State_Disguise_Deny(void);
+    static void InitDisguiseSalute(GlobalFuncs_t *func);
+    void        Begin_DisguiseSalute(void);
+    void        End_DisguiseSalute(void);
+    void        Resume_DisguiseSalute(void);
+    void        Suspend_DisguiseSalute(void);
+    void        Think_DisguiseSalute(void);
+    void        FinishedAnimation_DisguiseSalute(void);
+    static void InitDisguiseSentry(GlobalFuncs_t *func);
+    void        Begin_DisguiseSentry(void);
+    void        End_DisguiseSentry(void);
+    void        Resume_DisguiseSentry(void);
+    void        Suspend_DisguiseSentry(void);
+    void        Think_DisguiseSentry(void);
+    static void InitDisguiseOfficer(GlobalFuncs_t *func);
+    void        Begin_DisguiseOfficer(void);
+    void        End_DisguiseOfficer(void);
+    void        Resume_DisguiseOfficer(void);
+    void        Suspend_DisguiseOfficer(void);
+    void        Think_DisguiseOfficer(void);
+    static void InitDisguiseRover(GlobalFuncs_t *func);
+    void        Begin_DisguiseRover(void);
+    void        End_DisguiseRover(void);
+    void        Resume_DisguiseRover(void);
+    void        Suspend_DisguiseRover(void);
+    void        Think_DisguiseRover(void);
+    static void InitDisguiseNone(GlobalFuncs_t *func);
+    static void InitIdle(GlobalFuncs_t *func);
+    void        Begin_Idle(void);
+    void        Think_Idle(void);
+    static void InitMachineGunner(GlobalFuncs_t *func);
+    void        Begin_MachineGunner(void);
+    void        End_MachineGunner(void);
+    void        BecomeTurretGuy(void);
+    void        ThinkHoldGun_TurretGun(void);        // Added in 2.0
+    void        Think_MachineGunner_TurretGun(void); // Added in 2.0
+    void        Think_MachineGunner(void);
+    void        FinishedAnimation_MachineGunner(void);
+    bool        MachineGunner_CanSee(Entity *ent, float fov, float vision_distance);
+    static void InitDogIdle(GlobalFuncs_t *func);
+    static void InitDogAttack(GlobalFuncs_t *func);
+    static void InitDogCurious(GlobalFuncs_t *func);
+    void        Begin_Dog(void);
+    void        End_Dog(void);
+    void        Think_Dog_Idle(void);
+    void        Think_Dog_Attack(void);
+    void        Think_Dog_Curious(void);
+    static void InitAnim(GlobalFuncs_t *func);
+    void        Begin_Anim(void);
+    void        Think_Anim(void);
+    void        FinishedAnimation_Anim(void);
+    void        ShowInfo_Anim(void);
+    static void InitAnimCurious(GlobalFuncs_t *func);
+    void        Begin_AnimCurious(void);
+    void        Think_AnimCurious(void);
+    void        FinishedAnimation_AnimCurious(void);
+    static void InitAim(GlobalFuncs_t *func);
+    void        Begin_Aim(void);
+    void        Think_Aim(void);
+    void        ShowInfo_Aim(void);
+    static void InitBalconyIdle(GlobalFuncs_t *func);
+    static void InitBalconyCurious(GlobalFuncs_t *func);
+    static void InitBalconyAttack(GlobalFuncs_t *func);
+    static void InitBalconyDisguise(GlobalFuncs_t *func);
+    static void InitBalconyGrenade(GlobalFuncs_t *func);
+    static void InitBalconyPain(GlobalFuncs_t *func);
+    static void InitBalconyKilled(GlobalFuncs_t *func);
+    void        Pain_Balcony(Event *ev);
+    void        Killed_Balcony(Event *ev, bool bPlayDeathAnim);
+    void        Think_BalconyAttack(void);
+    void        Begin_BalconyAttack(void);
+    void        FinishedAnimation_BalconyAttack(void);
+    void        State_Balcony_PostShoot(void);
+    void        State_Balcony_FindEnemy(void);
+    void        State_Balcony_Target(void);
+    void        State_Balcony_Shoot(void);
+    void        Begin_BalconyKilled(void);
+    void        End_BalconyKilled(void);
+    void        Think_BalconyKilled(void);
+    void        FinishedAnimation_BalconyKilled(void);
+    bool        CalcFallPath(void);
+    static void InitPain(GlobalFuncs_t *func);
+    void        Begin_Pain(void);
+    void        Think_Pain(void);
+    void        FinishedAnimation_Pain(void);
+    static void InitDead(GlobalFuncs_t *func);
+    static void InitKilled(GlobalFuncs_t *func);
+    void        Begin_Killed(void);
+    void        Think_Killed(void);
+    void        FinishedAnimation_Killed(void);
+    static void InitWeaponless(GlobalFuncs_t *func);
+    void        Begin_Weaponless(void);
+    void        Suspend_Weaponless(void);
+    void        Think_Weaponless(void);
+    void        FinishedAnimation_Weaponless(void);
+    void        State_Weaponless_Normal(void);
+    void        State_Weaponless_Grenade(void);
+    static void InitBadPlace(GlobalFuncs_t *func);
+    // Added in 2.0
+    //====
+    void Begin_BadPlace(void);
+    void End_BadPlace(void);
+    void Think_BadPlace(void);
+    //====
+    // Added in 2.30
+    //====
+    static void InitRunAndShoot(GlobalFuncs_t *func);
+    void        Begin_RunAndShoot(void);
+    void        End_RunAndShoot(void);
+    void        Resume_RunAndShoot(void);
+    void        Think_RunAndShoot(void);
+    void        ShowInfo_RunAndShoot(void);
+    void        State_RunAndShoot_Running(void);
+    bool        RunAndShoot_MoveToPatrolCurrentNode(void);
+    //====
+    virtual void Think(void) override;
+    void         PostThink(bool bDontFaceWall);
+    virtual void SetMoveInfo(mmove_t *mm) override;
+    virtual void GetMoveInfo(mmove_t *mm) override;
+    void         DoFailSafeMove(vec3_t dest);
+    void         TouchStuff(mmove_t *mm);
+    void         ExtractConstraints(mmove_t *mm);
+    void         EventGiveWeaponInternal(Event *ev);
+    void         EventGiveWeapon(Event *ev);
+    void         EventGetWeapon(Event *ev);
+    void         FireWeapon(Event *ev);
+    bool         FriendlyInLineOfFire(Entity *other); // Added in 2.0
+    Vector       VirtualEyePosition();                // Added in 2.0
+    virtual bool CanTarget(void) override;
+    virtual bool IsImmortal(void) override;
+    static bool  IsVoidState(int state);
+    static bool  IsIdleState(int state);
+    static bool  IsCuriousState(int state);
+    static bool  IsDisguiseState(int state);
+    static bool  IsAttackState(int state);
+    static bool  IsGrenadeState(int state);
+    static bool  IsBadPlaceState(int state); // Added in 2.0
+    static bool  IsPainState(int state);
+    static bool  IsKilledState(int state);
+    static bool  IsMachineGunnerState(int state);
+    static bool  IsDogState(int state);
+    void         IgnoreSoundSet(int iType);
+    void         IgnoreSoundSetAll(void);
+    void         IgnoreSoundClear(int iType);
+    void         IgnoreSoundClearAll(void);
+    bool         IgnoreSound(int iType);
+    void         EventShareEnemy(Event *ev);
+    void         EventShareGrenade(Event *ev);
+    void ReceiveAIEvent(vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared);
+    void DefaultReceiveAIEvent(
+        vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
+    );
+    int  PriorityForEventType(int iType);
+    void CuriousSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared);
+    void WeaponSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator);
+    void FootstepSound(vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator);
+    void VoiceSound(int iType, vec3_t sound_origin, float fDistSquared, float fMaxDistSquared, Entity *originator);
+    void GrenadeNotification(Entity *originator);
+    void SetGrenade(Entity *pGrenade);
+    void UpdateBadPlaces(void); // Added in 2.0
+    void NotifySquadmateKilled(Sentient *pSquadMate, Sentient *pAttacker);
+    void RaiseAlertnessForEventType(int iType);
+    void RaiseAlertness(float fAmount);
+    virtual bool CanSee(Entity *e1, float fov, float vision_distance, bool bNoEnts) override;
+    using Sentient::CanSee;
+    virtual Vector GunPosition(void) override;
+    bool           WithinVisionDistance(Entity *ent) const;
+    bool           InFOV(Vector pos, float check_fov, float check_fovdot);
+    bool           EnemyInFOV(int iMaxDirtyTime);
+    bool           InFOV(Vector pos);
+    bool           InFOV(Entity *ent);
+    bool           CanSeeNoFOV(Entity *ent);
+    bool           CanSeeFOV(Entity *ent);
+    bool           CanSeeEnemyFOV(int iMaxFovDirtyTime, int iMaxSightDirtyTime);
+    bool           CanShoot(Entity *ent);
+    virtual bool   CanSeeFrom(vec3_t pos, Entity *ent);
+    bool           CanSeeEnemy(int iMaxDirtyTime);
+    bool           CanShootEnemy(int iMaxDirtyTime);
+    void           ShowInfo(void);
+    virtual void   ShowInfo(float fDot, float fDist) override;
+    void           DefaultPain(Event *ev);
+    void           HandlePain(Event *ev);
+    void           EventPain(Event *ev);
+    void           DefaultKilled(Event *ev, bool bPlayDeathAnim);
+    void           HandleKilled(Event *ev, bool bPlayDeathAnim);
+    void           DispatchEventKilled(Event *ev, bool bPlayDeathAnim);
+    void           EventKilled(Event *ev);
+    void           EventBeDead(Event *ev);
+    void           DeathEmbalm(Event *ev);
+    void           DeathSinkStart(Event *ev);
+    bool           NoticeShot(Sentient *pShooter, Sentient *pTarget, float fDist);
+    bool           NoticeFootstep(Sentient *pPedestrian);
+    bool           NoticeVoice(Sentient *pVocallist);
+    void           ClearLookEntity(void);
+    void           LookAt(const Vector          &vec);
+    void           LookAt(Listener *l);
+    void           ForwardLook(void);
+    void           LookAtLookEntity(void);
+    void           IdleLook(void);
+    void           IdleLook(vec3_t dir);
+    void           SetDesiredLookDir(vec3_t dir);
+    void           SetDesiredLookAnglesRelative(vec3_t ang);
+    void           EventLookAt(Event *ev);
+    void           EventEyesLookAt(Event *ev);
+    void           NoPoint(void);
+    void           IdlePoint(void);
+    void           ClearPointEntity(void);
+    void           PointAt(const Vector          &vec);
+    void           PointAt(Listener *l);
+    void           EventPointAt(Event *ev);
+    void           ClearTurnEntity(void);
+    void           TurnTo(const Vector          &vec);
+    void           TurnTo(Listener *l);
+    void           IdleTurn(void);
+    void           EventTurnTo(Event *ev);
+    void           EventSetTurnDoneError(Event *ev);
+    void           EventGetTurnDoneError(Event *ev);
+    void           LookAround(float fFovAdd);
+    bool           SoundSayAnim(const_str name, byte bLevelSayAnim);
+    void           EventSetAnim(Event *ev);
+    void           EventIdleSayAnim(Event *ev);
+    void           EventSayAnim(Event *ev);
+    void           EventSetSayAnim(Event *ev);
+    void           EventSetMotionAnim(Event *ev);
+    void           EventSetAimMotionAnim(Event *ev);
+    void           EventSetActionAnim(Event *ev);
+    void           EventUpperAnim(Event *ev);
+    void           EventSetUpperAnim(Event *ev);
+    void           EventEndActionAnim(Event *ev);
+    void           EventDamagePuff(Event *ev);
+    void           SafeSetOrigin(vec3_t newOrigin);
+    void           DoMove(void);
+    void           AnimFinished(int slot, bool stop);
+    virtual void   AnimFinished(int slot) override;
+    void           PlayAnimation(Event *ev);
+    void           PlayScriptedAnimation(Event *ev);
+    void           PlayNoclipAnimation(Event *ev);
+    void           PlayAttachedAnimation(Event *ev); // Added in 2.0
+    void           MoveDest(float fMoveSpeed);
+    void           MovePath(float fMoveSpeed);
+    void           MovePathGoal(float fMoveSpeed);
+    void           Dumb(Event *ev);
+    void           PhysicsOn(Event *ev);
+    void           PhysicsOff(Event *ev);
+    void           EventStart(Event *ev);
+    void           EventGetMood(Event *ev);
+    void           EventSetMood(Event *ev);
+    void           EventGetAngleYawSpeed(Event *ev);
+    void           EventSetAngleYawSpeed(Event *ev);
+    void           EventSetAimTarget(Event *ev);
+    void           UpdateAngles(void);
+    void           SetLeashHome(Vector vHome);
+    void           AimAtTargetPos(void);
+    void           AimAtAimNode(void);
+    void           AimAtEnemyBehavior(void);
+    void           FaceMotion(void);
+    void           FaceDirectionDuringMotion(vec3_t vLook);
+    float          PathDistanceAlongVector(vec3_t vDir);
+    void           FaceEnemyOrMotion(int iTimeIntoMove);
+    static int     NextUpdateTime(int iLastUpdateTime, int iUpdatePeriod);
+    void           ResetBoneControllers(void);
+    void           UpdateBoneControllers(void);
+    void           ReadyToFire(Event *ev);
+    void           EventGetSight(Event *ev);
+    void           EventSetSight(Event *ev);
+    void           EventGetHearing(Event *ev);
+    void           EventSetHearing(Event *ev);
+    void           ClearPatrolCurrentNode(void);
+    void           NextPatrolCurrentNode(void);
+    void           SetPatrolCurrentNode(Vector          &vec);
+    void           SetPatrolCurrentNode(Listener *l);
+    void           EventSetPatrolPath(Event *ev);
+    void           EventGetPatrolPath(Event *ev);
+    void           EventSetPatrolWaitTrigger(Event *ev);
+    void           EventGetPatrolWaitTrigger(Event *ev);
+    void           ShowInfo_PatrolCurrentNode(void);
+    bool           MoveOnPathWithSquad(void);
+    bool           MoveToWaypointWithPlayer(void);
+    bool           PatrolNextNodeExists(void);
+    void           UpdatePatrolCurrentNode(void);
+    bool           MoveToPatrolCurrentNode(void);
+    void           ClearAimNode(void);
+    void           SetAimNode(const Vector          &vec);
+    void           SetAimNode(Listener *l);
+    void           ShowInfo_AimNode(void);
+    void           EventSetAccuracy(Event *ev);
+    void           EventGetAccuracy(Event *ev);
+    int            GetThinkType(const_str csName);
+    void           SetThink(eThinkState state, eThinkNum think);
+    void           SetThinkIdle(eThinkNum think_idle);
+    void           SetThinkState(eThinkState state, eThinkLevel level);
+    void           EndCurrentThinkState(void);
+    void           ClearThinkStates(void);
+    int            CurrentThink(void) const;
+    bool           IsAttacking(void) const;
+    void           EventGetFov(Event *ev);
+    void           EventSetFov(Event *ev);
+    void           EventSetDestIdle(Event *ev);
+    void           EventSetDestIdle2(Event *ev);
+    void           EventSetTypeIdle(Event *ev);
+    void           EventGetTypeIdle(Event *ev);
+    void           EventSetTypeAttack(Event *ev);
+    void           EventGetTypeAttack(Event *ev);
+    void           EventSetTypeDisguise(Event *ev);
+    void           EventGetTypeDisguise(Event *ev);
+    void           EventSetDisguiseLevel(Event *ev);
+    void           EventGetDisguiseLevel(Event *ev);
+    void           EventSetTypeGrenade(Event *ev);
+    void           EventGetTypeGrenade(Event *ev);
+    void           EventSetMinDistance(Event *ev);
+    void           EventGetMinDistance(Event *ev);
+    void           EventSetMaxDistance(Event *ev);
+    void           EventGetMaxDistance(Event *ev);
+    void           EventGetLeash(Event *ev);
+    void           EventSetLeash(Event *ev);
+    void           EventGetInterval(Event *ev);
+    void           EventSetInterval(Event *ev);
+    void           EventDistToEnemy(Event *ev);
+    void           EventGetRunAnim(Event *ev);
+    void           EventGetWalkAnim(Event *ev);
+    void           EventGetAnimName(Event *ev);
+    void           EventSetAnimName(Event *ev);
+    void           EventSetDisguiseRange(Event *ev);
+    void           EventGetDisguiseRange(Event *ev);
+    void           EventSetDisguisePeriod(Event *ev);
+    void           EventGetDisguisePeriod(Event *ev);
+    void           EventSetDisguiseAcceptThread(Event *ev);
+    void           EventGetDisguiseAcceptThread(Event *ev);
+    void           EventAttackPlayer(Event *ev);
+    void           ForceAttackPlayer(void);
+    void           EventSetAlarmNode(Event *ev);
+    void           EventGetAlarmNode(Event *ev);
+    void           EventSetPreAlarmThread(Event *ev); // Added in 2.30
+    void           EventSetAlarmThread(Event *ev);
+    void           EventGetAlarmThread(Event *ev);
+    void           EventSetSoundAwareness(Event *ev);
+    void           EventGetSoundAwareness(Event *ev);
+    void           EventSetGrenadeAwareness(Event *ev);
+    void           EventGetGrenadeAwareness(Event *ev);
+    str            ThinkName(void) const;
+    str            ThinkStateName(void) const;
+    void           EventSetTurret(Event *ev);
+    void           EventGetTurret(Event *ev);
+    void           EventEnableEnemy(Event *ev);
+    void           EventEnablePain(Event *ev);
+    void           EventActivate(Event *ev);
+    void           EventGetAmmoGrenade(Event *ev);
+    void           EventSetAmmoGrenade(Event *ev);
+    void           EventInterruptPoint(Event *ev);
+    // Added in 2.0
+    //====
+    void EventGetVisibilityThreshold(Event *ev);
+    void EventSetVisibilityThreshold(Event *ev);
+    void EventSetDefaultVisibilityThreshold(Event *ev);
+    void EventGetSuppressChance(Event *ev);
+    void EventSetSuppressChance(Event *ev);
+    //====
+    void             EventAnimScript(Event *ev);
+    void             EventAnimScript_Scripted(Event *ev);
+    void             EventAnimScript_Noclip(Event *ev);
+    void             EventAnimScript_Attached(Event *ev);
+    void             EventReload_mg42(Event *ev);
+    void             SetPathWithLeash(Vector vDestPos, const char *description, int iMaxDirtyTime);
+    void             SetPathWithLeash(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime);
+    void             FindPathAwayWithLeash(vec3_t vAwayFrom, vec3_t vDirPreferred, float fMinSafeDist);
+    void             FindPathNearWithLeash(vec3_t vNearbyTo, float fCloseDistSquared);
+    bool             CanMovePathWithLeash(void) const;
+    bool             MovePathWithLeash(void);
+    bool             ShortenPathToAttack(float fMinDist);
+    void             StrafeToAttack(float fDist, vec3_t vDir);
+    virtual Vector   GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward) override;
+    virtual qboolean setModel(void) override;
+    void             EventSetHeadModel(Event *ev);
+    void             EventGetHeadModel(Event *ev);
+    void             EventSetHeadSkin(Event *ev);
+    void             EventGetHeadSkin(Event *ev);
+    void             EventSetNoIdle(Event *ev);
+    void             EventGetNoIdle(Event *ev);
+    void             EventGetEnemy(Event *ev);
+    void             EventSetMaxNoticeTimeScale(Event *ev);
+    void             EventGetMaxNoticeTimeScale(Event *ev);
+    void             EventSetFixedLeash(Event *ev);
+    void             EventGetFixedLeash(Event *ev);
+    void             Holster(void);
+    void             HolsterOffHand(void); // Added in 2.0
+    void             Unholster(void);
+    void             UnholsterOffHand(void); // Added in 2.0
+    void             EventHolster(Event *ev);
+    void             EventUnholster(Event *ev);
+    void             EventSoundDone(Event *ev);
+    void             EventSound(Event *ev);
+    void             EventIsEnemyVisible(Event *ev);
+    void             EventGetEnemyVisibleChangeTime(Event *ev);
+    void             EventGetLastEnemyVisibleTime(Event *ev);
+    void             EventSetFallHeight(Event *ev);
+    void             EventGetFallHeight(Event *ev);
+    void             EventCanMoveTo(Event *ev);
+    void             EventMoveDir(Event *ev);
+    void             EventIntervalDir(Event *ev);
+    void             EventResetLeash(Event *ev);
+    void             EventTether(Event *ev);
+    void             EventGetThinkState(Event *ev);
+    void             EventGetEnemyShareRange(Event *ev);
+    void             EventSetEnemyShareRange(Event *ev);
+    void             EventGetKickDir(Event *ev);
+    void             EventGetNoLongPain(Event *ev);
+    void             EventSetNoLongPain(Event *ev);
+    void             EventGetFavoriteEnemy(Event *ev);
+    void             EventSetFavoriteEnemy(Event *ev);
+    void             EventFindEnemy(Event *ev); // Added in 2.0
+    void             EventGetMumble(Event *ev);
+    void             EventSetMumble(Event *ev);
+    void             EventGetBreathSteam(Event *ev);
+    void             EventSetBreathSteam(Event *ev);
+    void             EventSetNextBreathTime(Event *ev);
+    void             EventCalcGrenadeToss2(Event *ev);
+    void             EventCalcGrenadeToss(Event *ev);
+    void             EventGetNoSurprise(Event *ev);
+    void             EventSetNoSurprise(Event *ev);
+    void             EventGetSilent(Event *ev);
+    void             EventSetSilent(Event *ev);
+    void             EventGetAvoidPlayer(Event *ev);
+    void             EventSetAvoidPlayer(Event *ev);
+    void             EventGetLookAroundAngle(Event *ev);
+    void             EventSetLookAroundAngle(Event *ev);
+    void             EventHasCompleteLookahead(Event *ev);
+    void             EventPathDist(Event *ev);
+    void             EventCanShootEnemyFrom(Event *ev);
+    void             EventCanShoot(Event *ev);
+    void             EventSetInReload(Event *ev);
+    void             EventGetInReload(Event *ev);
+    void             EventSetReloadCover(Event *ev);
+    void             EventBreakSpecial(Event *ev);
+    void             GetVoiceType(Event *ev);
+    void             SetVoiceType(Event *ev);
+    void             ResolveVoiceType(void);
+    void             EventSetBalconyHeight(Event *ev);
+    void             EventGetBalconyHeight(Event *ev);
+    // Added in 2.0
+    //====
+    void EventSetIgnoreBadPlace(Event *ev);
+    void EventGetIgnoreBadPlace(Event *ev);
+    void EventEnableEnemySwitch(Event *ev);
+    void EventDisableEnemySwitch(Event *ev);
+    void EventSetRunAnimRate(Event *ev);
+    void EventGetRunAnimRate(Event *ev);
+    void Landed(Event *ev);
+    bool IsOnFloor(void);
+    //====
+    // Added in 2.30
+    //====
+    void GetNationality(Event *ev);
+    void SetNationality(Event *ev);
+    void EventWriteStats(Event *ev);
+    void EventCuriousOff(Event *ev);
+    void EventCuriousOn(Event *ev);
+    //====
+    PathNode    *FindSniperNodeAndSetPath(bool *pbTryAgain);
+    void         Remove(Event *ev);
+    void         DontFaceWall(void);
+    bool         AvoidingFacingWall(void) const;
+    void         EndStates(void);
+    void         ClearStates(void);
+    void         CheckUnregister(void);
+    void         BecomeCorpse(void);
+    virtual void PathnodeClaimRevoked(PathNode *node) override;
+    void         SetPathToNotBlockSentient(Sentient *pOther);
+    void         EventSetMoveDoneRadius(Event *ev);
+    void         EventGetMoveDoneRadius(Event *ev); // Added in 2.0
+    virtual void ClearEnemies(void) override;
+    bool         EnemyIsDisguised(void);
+    virtual void setOriginEvent(Vector org) override;
+    virtual void DumpAnimInfo(void) override;
+    static void  ArchiveStatic(Archiver &arc);
+    virtual void Archive(Archiver& arc) override;
+    virtual bool AutoArchiveModel(void) override;
+    virtual bool IsDisabled() const override; // Added in 2.30
 };
 
-#define SAVE_FLAG_NEW_ANIM						(1<<0)
-#define SAVE_FLAG_FORWARD_SPEED				(1<<1)
-#define SAVE_FLAG_BEHAVIOR						(1<<2)
-#define SAVE_FLAG_PATH							(1<<3)
-#define SAVE_FLAG_NOISE							(1<<4)
-#define SAVE_FLAG_SCRIPT_THREAD				(1<<5)
-#define SAVE_FLAG_ACTOR_THREAD				(1<<6)
-#define SAVE_FLAG_KILL_THREAD					(1<<7)
-#define SAVE_FLAG_STATE							(1<<8)
-#define SAVE_FLAG_IDLE_THREAD					(1<<7)
-#define SAVE_FLAG_PARTS							(1<<10)
-#define SAVE_FLAG_TRIGGER						(1<<11)
-#define SAVE_FLAG_STATE_FLAGS					(1<<12)
-#define SAVE_FLAG_COMMAND						(1<<13)
-#define SAVE_FLAG_STAGE							(1<<14)
-#define SAVE_FLAG_NUM_OF_SPAWNS				(1<<15)
-#define SAVE_FLAG_SPAWN_PARENT				(1<<16)
-#define SAVE_FLAG_DIALOG						(1<<17)
-#define SAVE_FLAG_SAVED_STUFF					(1<<18)
-#define SAVE_FLAG_LAST_ANIM_EVENT			(1<<19)
-#define SAVE_FLAG_PICKUP_ENT					(1<<20)
-#define SAVE_FLAG_PAIN							(1<<21)
-#define SAVE_FLAG_SPAWN_ITEMS					(1<<22)
+#define SAVE_FLAG_NEW_ANIM        (1 << 0)
+#define SAVE_FLAG_FORWARD_SPEED   (1 << 1)
+#define SAVE_FLAG_BEHAVIOR        (1 << 2)
+#define SAVE_FLAG_PATH            (1 << 3)
+#define SAVE_FLAG_NOISE           (1 << 4)
+#define SAVE_FLAG_SCRIPT_THREAD   (1 << 5)
+#define SAVE_FLAG_ACTOR_THREAD    (1 << 6)
+#define SAVE_FLAG_KILL_THREAD     (1 << 7)
+#define SAVE_FLAG_STATE           (1 << 8)
+#define SAVE_FLAG_IDLE_THREAD     (1 << 7)
+#define SAVE_FLAG_PARTS           (1 << 10)
+#define SAVE_FLAG_TRIGGER         (1 << 11)
+#define SAVE_FLAG_STATE_FLAGS     (1 << 12)
+#define SAVE_FLAG_COMMAND         (1 << 13)
+#define SAVE_FLAG_STAGE           (1 << 14)
+#define SAVE_FLAG_NUM_OF_SPAWNS   (1 << 15)
+#define SAVE_FLAG_SPAWN_PARENT    (1 << 16)
+#define SAVE_FLAG_DIALOG          (1 << 17)
+#define SAVE_FLAG_SAVED_STUFF     (1 << 18)
+#define SAVE_FLAG_LAST_ANIM_EVENT (1 << 19)
+#define SAVE_FLAG_PICKUP_ENT      (1 << 20)
+#define SAVE_FLAG_PAIN            (1 << 21)
+#define SAVE_FLAG_SPAWN_ITEMS     (1 << 22)
 
-inline void Actor::ArchiveStatic
-	(
-	Archiver &arc
-	)
+/*
+===============
+Actor::TransitionState
+
+===============
+*/
+inline void Actor::TransitionState(int iNewState, int iPadTime)
 {
-	for( int i = MAX_BODYQUEUE - 1; i >= 0; i-- )
-	{
-		arc.ArchiveSafePointer( &mBodyQueue[ i ] );
-	}
-
-	arc.ArchiveInteger( &mCurBody );
+    m_State      = iNewState;
+    m_iStateTime = level.inttime + iPadTime;
 }
 
-inline void Actor::Archive
-	(
-	Archiver &arc
-	)
+/*
+===============
+Actor::NextUpdateTime
+
+Returns next update time.
+===============
+*/
+inline int Actor::NextUpdateTime(int iLastUpdateTime, int iUpdatePeriod)
 {
-	SimpleActor::Archive( arc );
+    int i = iLastUpdateTime;
 
-	for( int i = NUM_THINKSTATES - 1; i >= 0; i-- )
-	{
-		ArchiveEnum(m_ThinkMap[i], eThinkNum);
-	}
+    do {
+        i += iUpdatePeriod;
+    } while (i < level.inttime);
 
-	for( int i = NUM_THINKLEVELS - 1; i >= 0; i-- )
-	{
-		ArchiveEnum(m_ThinkStates[i], eThinkState);
-		ArchiveEnum(m_Think[i], eThinkNum);
-	}
+    return i;
+}
 
-	ArchiveEnum(m_ThinkLevel, eThinkLevel);
-	ArchiveEnum(m_ThinkState, eThinkState);
-	arc.ArchiveInteger( &m_State);
-	arc.ArchiveInteger( &m_iStateTime);
-	arc.ArchiveBool( &m_bLockThinkState);
-	arc.ArchiveBool( &m_bDirtyThinkState );
-	arc.ArchiveInteger( &mVoiceType );
-	arc.ArchiveBool( &m_bSilent);
-	arc.ArchiveBool( &m_bNoSurprise);
-	arc.ArchiveBool( &m_bMumble);
-	arc.ArchiveBool( &m_bBreathSteam);
+/*
+===============
+Actor::InFOV
 
-	Director.ArchiveString( arc, m_csHeadModel );
-	Director.ArchiveString( arc, m_csHeadSkin );
-	Director.ArchiveString( arc, m_csWeapon );
-	Director.ArchiveString( arc, m_csLoadOut );
-	arc.ArchiveSafePointer( &m_FavoriteEnemy );
-	arc.ArchiveInteger( &m_iEnemyCheckTime );
-	arc.ArchiveInteger( &m_iEnemyChangeTime );
-	arc.ArchiveInteger( &m_iEnemyVisibleCheckTime );
-	arc.ArchiveInteger( &m_iEnemyVisibleChangeTime );
-	arc.ArchiveInteger( &m_iLastEnemyVisibleTime );
-	arc.ArchiveInteger( &m_iEnemyFovCheckTime );
-	arc.ArchiveInteger( &m_iEnemyFovChangeTime );
-	arc.ArchiveVector( &m_vLastEnemyPos );
-	arc.ArchiveInteger( &m_iLastEnemyPosChangeTime );
-	arc.ArchiveFloat( &m_fMaxShareDistSquared );
-	arc.ArchiveInteger( &m_iCanShootCheckTime );
-	arc.ArchiveBool( &m_bCanShootEnemy );
-	arc.ArchiveBool( &m_bDesiredEnableEnemy );
-	arc.ArchiveBool( &m_bEnableEnemy );
-	arc.ArchiveBool( &m_bEnablePain );
-	arc.ArchiveBool( &m_bNoLongPain );
-	arc.ArchiveBool( &m_bNewEnemy );
-	arc.ArchiveBool( &m_bEnemyIsDisguised );
-	arc.ArchiveBool( &m_bEnemyVisible );
-	arc.ArchiveBool( &m_bEnemyInFOV );
-	arc.ArchiveBool( &m_bForceAttackPlayer );
-	arc.ArchiveBool( &m_bAutoAvoidPlayer );
-	arc.ArchiveBool( &m_bNoIdleAfterAnim );
-	Director.ArchiveString( arc, m_csAnimScript );
-	arc.ArchiveBool( &m_bAnimScriptSet );
-	arc.ArchiveInteger( &m_AnimMode );
-	arc.ArchiveFloat( &m_fDfwRequestedYaw );
-	arc.ArchiveFloat( &m_fDfwDerivedYaw );
-	arc.ArchiveVector( &m_vDfwPos );
-	arc.ArchiveFloat( &m_fDfwTime );
-	arc.ArchiveInteger( &m_iGunPositionCheckTime );
-	arc.ArchiveVector( &m_vGunPosition );
-	arc.ArchiveInteger( &m_iWallDodgeTimeout );
-	arc.ArchiveFloat( &m_PrevObstacleNormal[ 0 ] );
-	arc.ArchiveFloat( &m_PrevObstacleNormal[ 1 ] );
-	arc.ArchiveChar( &m_WallDir );
-	arc.ArchiveFloat( &m_fMoveDoneRadiusSquared );
-	arc.ArchiveBool( &m_bFaceEnemy );
-	arc.ArchiveBool( &m_bDoPhysics );
-	arc.ArchiveBool( &m_bPatrolWaitTrigger );
-	arc.ArchiveBool( &m_bBecomeRunner );
-	arc.ArchiveBool( &m_bScriptGoalValid );
-	arc.ArchiveVector( &m_vScriptGoal );
-	arc.ArchiveInteger( &m_iNextWatchStepTime );
-	arc.ArchiveSafePointer( &m_patrolCurrentNode );
-	Director.ArchiveString( arc, m_csPatrolCurrentAnim );
-	arc.ArchiveInteger( &m_iSquadStandTime );
-	arc.ArchiveFloat( &m_fInterval );
-	arc.ArchiveInteger( &m_iIntervalDirTime );
-	arc.ArchiveVector( &m_vIntervalDir );
-	arc.ArchiveShort( &m_sCurrentPathNodeIndex );
-	arc.ArchiveInteger( &m_PainState );
-	arc.ArchiveInteger( &m_iCuriousTime );
-	arc.ArchiveInteger( &m_iCuriousLevel );
-	arc.ArchiveInteger( &m_iCuriousAnimHint );
-	arc.ArchiveInteger( &m_iNextDisguiseTime );
-	arc.ArchiveInteger( &m_iDisguisePeriod );
-	arc.ArchiveFloat( &m_fMaxDisguiseDistSquared );
-	arc.ArchiveInteger( &m_iEnemyShowPapersTime );
-	m_DisguiseAcceptThread.Archive( arc );
-	arc.ArchiveInteger( &m_iDisguiseLevel );
-	arc.ArchiveSafePointer( &m_AlarmNode );
-	m_AlarmThread.Archive( arc );
-	arc.ArchiveInteger( &m_iRunHomeTime );
-	arc.ArchiveBool( &m_bTurretNoInitialCover );
-	arc.ArchiveInteger( &m_iPotentialCoverCount );
+Returns true if pos is within fov.
+===============
+*/
+inline bool Actor::InFOV(Vector pos)
+{
+    return InFOV(pos, m_fFov, m_fFovDot);
+}
 
-	for( int i = MAX_COVER_NODES - 1; i >= 0; i-- )
-	{
-		arc.ArchiveObjectPointer( ( Class ** ) &m_pPotentialCoverNode[ i ] );
-	}
+/*
+===============
+Actor::InFOV
 
-	arc.ArchiveObjectPointer( ( Class ** )&m_pCoverNode );
-	Director.ArchiveString( arc, m_csSpecialAttack );
+Returns true if ent is within fov.
+===============
+*/
+inline bool Actor::InFOV(Entity *ent)
+{
+    if (ent == m_Enemy) {
+        return EnemyInFOV(0);
+    } else {
+        return InFOV(ent->centroid);
+    }
+}
 
-	arc.ArchiveBool( &m_bInReload);
-	arc.ArchiveBool( &m_bNeedReload);
-	arc.ArchiveBool( &mbBreakSpecialAttack);
-	arc.ArchiveBool( &m_bGrenadeBounced);
-	arc.ArchiveSafePointer( &m_pGrenade);
-	arc.ArchiveVector( &m_vGrenadePos);
-	arc.ArchiveInteger( &m_iFirstGrenadeTime);
-	ArchiveEnum( m_eGrenadeState, eGrenadeState );
-	ArchiveEnum( m_eGrenadeMode, eGrenadeTossMode );
-	arc.ArchiveVector( &m_vGrenadeVel);
-	arc.ArchiveVector( &m_vKickDir);
-	arc.ArchiveFloat( &m_fNoticeTimeScale);
-	arc.ArchiveFloat( &m_fMaxNoticeTimeScale);
-	m_PotentialEnemies.Archive( arc );
-	arc.ArchiveFloat( &m_fSight );
-	arc.ArchiveFloat( &m_fHearing );
-	arc.ArchiveFloat( &m_fSoundAwareness );
-	arc.ArchiveFloat( &m_fGrenadeAwareness );
-	arc.ArchiveInteger( &m_iIgnoreSoundsMask );
-	arc.ArchiveFloat( &m_fFov );
-	arc.ArchiveFloat( &m_fFovDot );
-	arc.ArchiveInteger( &m_iEyeUpdateTime );
-	arc.ArchiveVector( &m_vEyeDir );
-	arc.ArchiveInteger( &m_iNextLookTime );
-	arc.ArchiveFloat( &m_fLookAroundFov );
-	arc.ArchiveSafePointer( &m_pLookEntity );
-	arc.ArchiveInteger( &m_iLookFlags );
-	arc.ArchiveSafePointer( &m_pPointEntity );
-	arc.ArchiveSafePointer( &m_pTurnEntity );
-	arc.ArchiveFloat( &m_fTurnDoneError );
-	arc.ArchiveFloat( &m_fAngleYawSpeed );
-	arc.ArchiveSafePointer( &m_aimNode );
-	arc.ArchiveInteger( &m_eDontFaceWallMode );
-	arc.ArchiveInteger( &m_iLastFaceDecideTime );
-	arc.ArchiveBool( &m_bHeadAnglesAchieved );
-	arc.ArchiveBool( &m_bLUpperArmAnglesAchieved );
-	arc.ArchiveBool( &m_bTorsoAnglesAchieved );
-	arc.ArchiveFloat( &m_fHeadMaxTurnSpeed );
-	arc.ArchiveVec3( m_vHeadDesiredAngles );
-	arc.ArchiveFloat( &m_fLUpperArmTurnSpeed );
-	arc.ArchiveVec3( m_vLUpperArmDesiredAngles );
-	arc.ArchiveFloat( &m_fTorsoMaxTurnSpeed );
-	arc.ArchiveFloat( &m_fTorsoCurrentTurnSpeed );
-	arc.ArchiveVec3( m_vTorsoDesiredAngles );
-	arc.ArchiveVector( &m_vHome );
-	arc.ArchiveSafePointer( &m_pTetherEnt );
-	arc.ArchiveFloat( &m_fMinDistance );
-	arc.ArchiveFloat( &m_fMinDistanceSquared );
-	arc.ArchiveFloat( &m_fMaxDistance );
-	arc.ArchiveFloat( &m_fMaxDistanceSquared );
-	arc.ArchiveFloat( &m_fLeash );
-	arc.ArchiveFloat( &m_fLeashSquared );
-	arc.ArchiveBool( &m_bFixedLeash );
-	arc.ArchiveBool( &m_bAnimating );
-	arc.ArchiveBool( &m_bDog );
+inline bool Actor::CanSeeNoFOV(Entity *ent)
+{
+    bool bCanSee;
 
-	byte length;
+    if (ent == m_Enemy) {
+        return CanSeeEnemy(0);
+    }
 
-	if( arc.Saving() )
-	{
-		if( m_pFallPath )
-			length = m_pFallPath->length;
-		else
-			length = 0;
-	}
-	arc.ArchiveByte( &length );
+    bCanSee = false;
 
-	if( length )
-	{
-		if( arc.Loading() )
-		{
-			m_pFallPath = ( FallPath * )gi.Malloc((sizeof(FallPath::pos)) * length + (sizeof(FallPath) - sizeof(FallPath::pos)));
-			m_pFallPath->length = length;
-		}
+    if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)) {
+        bCanSee = CanSee(ent, 0, 0, false);
+    }
 
-		arc.ArchiveByte( &m_pFallPath->currentPos );
-		arc.ArchiveByte( &m_pFallPath->loop );
+    return bCanSee;
+}
 
-		for( int i = 0; i < length; i++ )
-		{
-			arc.ArchiveVec3( m_pFallPath->pos[ i ] );
-		}
-	}
+inline bool Actor::CanSeeFOV(Entity *ent)
+{
+    bool bCanSee;
 
-	arc.ArchiveFloat( &m_fBalconyHeight );
-	arc.ArchiveBool( &m_bNoPlayerCollision );
+    if (ent == m_Enemy) {
+        return CanSeeEnemyFOV(0, 0);
+    }
 
-	for( int i = MAX_ORIGIN_HISTORY - 1; i >= 0; i-- )
-	{
-		arc.ArchiveVec2( m_vOriginHistory[ i ] );
-	}
+    bCanSee = false;
 
-	arc.ArchiveInteger( &m_iCurrentHistory );
+    if (InFOV(ent) && AreasConnected(ent)) {
+        bCanSee = CanSee(ent, 0, 0, false);
+    }
 
-	// set the model
-	setModel();
+    return bCanSee;
+}
+
+inline bool Actor::CanSeeEnemyFOV(int iMaxFovDirtyTime, int iMaxSightDirtyTime)
+{
+    return EnemyInFOV(iMaxFovDirtyTime) && CanSeeEnemy(iMaxSightDirtyTime);
+}
+
+/*
+===============
+Actor::AimAtTargetPos
+
+Aim at mTargetPos.
+===============
+*/
+inline void Actor::AimAtTargetPos(void)
+{
+    Vector v, v2;
+
+    v  = mTargetPos - EyePosition();
+    v2 = v;
+    v2[2] += 16;
+
+    SetDesiredLookDir(v2);
+
+    m_DesiredGunDir[0] = 360.0f - v.toPitch();
+    m_DesiredGunDir[1] = v.toYaw();
+    m_DesiredGunDir[2] = 0;
+
+    SetDesiredYaw(m_DesiredGunDir[1]);
+}
+
+/*
+===============
+Actor::AimAtAimNode
+
+Aim at m_aimNode.
+===============
+*/
+inline void Actor::AimAtAimNode(void)
+{
+    mTargetPos = m_aimNode->centroid;
+
+    AimAtTargetPos();
+}
+
+/*
+===============
+Actor::IgnoreSoundSet
+
+Make actor ignore iType sound.
+===============
+*/
+inline void Actor::IgnoreSoundSet(int iType)
+{
+    m_iIgnoreSoundsMask |= 1 << iType;
+}
+
+/*
+===============
+Actor::IgnoreSoundSetAll
+
+Make actor ignore all types of sound.
+===============
+*/
+inline void Actor::IgnoreSoundSetAll(void)
+{
+    m_iIgnoreSoundsMask = 0xffff;
+}
+
+/*
+===============
+Actor::IgnoreSoundClear
+
+Don't ignore iType of sound.
+===============
+*/
+inline void Actor::IgnoreSoundClear(int iType)
+{
+    m_iIgnoreSoundsMask &= ~(1 << iType);
+}
+
+/*
+===============
+Actor::IgnoreSoundClearAll
+
+Make actor ignore no type of sound.
+===============
+*/
+inline void Actor::IgnoreSoundClearAll(void)
+{
+    m_iIgnoreSoundsMask = 0;
+}
+
+/*
+===============
+Actor::IgnoreSoundClearAll
+
+returns true if actor should ignore iType of sound.
+===============
+*/
+inline bool Actor::IgnoreSound(int iType)
+{
+    return (m_iIgnoreSoundsMask >> iType) & 1;
+}
+
+/*
+===============
+Actor::CurrentThink
+
+Current think.
+===============
+*/
+inline int Actor::CurrentThink(void) const
+{
+    return m_Think[m_ThinkLevel];
+}
+
+/*
+===============
+Actor::IsAttacking
+
+Returns true if actor is in attack state.
+===============
+*/
+inline bool Actor::IsAttacking(void) const
+{
+    return m_ThinkStates[THINKLEVEL_IDLE] == THINKSTATE_ATTACK;
+}
+
+inline void Actor::ArchiveStatic(Archiver& arc)
+{
+    for (int i = 0; i < MAX_BODYQUEUE; i++) {
+        arc.ArchiveSafePointer(&mBodyQueue[i]);
+    }
+
+    arc.ArchiveInteger(&mCurBody);
+}
+
+inline void Actor::Archive(Archiver& arc)
+{
+    int i;
+
+    SimpleActor::Archive(arc);
+
+    for (i = 0; i < NUM_THINKSTATES; i++) {
+        ArchiveEnum(m_ThinkMap[i], eThinkNum);
+    }
+
+    for (i = 0; i < NUM_THINKLEVELS; i++) {
+        ArchiveEnum(m_ThinkStates[i], eThinkState);
+        ArchiveEnum(m_Think[i], eThinkNum);
+    }
+
+    ArchiveEnum(m_ThinkLevel, eThinkLevel);
+    ArchiveEnum(m_ThinkState, eThinkState);
+    arc.ArchiveInteger(&m_State);
+    arc.ArchiveInteger(&m_iStateTime);
+    arc.ArchiveBool(&m_bLockThinkState);
+    arc.ArchiveBool(&m_bDirtyThinkState);
+
+    arc.ArchiveBool(&m_bAnimating);
+
+    arc.ArchiveBool(&m_bIgnoreBadPlace);
+    arc.ArchiveInteger(&m_iBadPlaceIndex);
+
+    arc.ArchiveInteger(&mVoiceType);
+    arc.ArchiveBool(&m_bSilent);
+
+    arc.ArchiveBool(&m_bNoSurprise);
+    arc.ArchiveBool(&m_bMumble);
+    arc.ArchiveBool(&m_bBreathSteam);
+    arc.ArchiveBool(&m_bIsCurious);
+
+    Director.ArchiveString(arc, m_csHeadModel);
+    Director.ArchiveString(arc, m_csHeadSkin);
+    Director.ArchiveString(arc, m_csWeapon);
+    Director.ArchiveString(arc, m_csLoadOut);
+
+    arc.ArchiveSafePointer(&m_FavoriteEnemy);
+    arc.ArchiveInteger(&m_iEnemyCheckTime);
+    arc.ArchiveInteger(&m_iEnemyChangeTime);
+    arc.ArchiveInteger(&m_iEnemyVisibleCheckTime);
+    arc.ArchiveInteger(&m_iEnemyVisibleChangeTime);
+    arc.ArchiveInteger(&m_iLastEnemyVisibleTime);
+    arc.ArchiveFloat(&m_fVisibilityAlpha);
+    arc.ArchiveFloat(&m_fVisibilityThreshold);
+    arc.ArchiveInteger(&m_iEnemyFovCheckTime);
+    arc.ArchiveInteger(&m_iEnemyFovChangeTime);
+    arc.ArchiveVector(&m_vLastEnemyPos);
+    arc.ArchiveInteger(&m_iLastEnemyPosChangeTime);
+    arc.ArchiveFloat(&m_fMaxShareDistSquared);
+    arc.ArchiveInteger(&m_iCanShootCheckTime);
+    arc.ArchiveBool(&m_bCanShootEnemy);
+    arc.ArchiveBool(&m_bHasVisibilityThreshold);
+    arc.ArchiveBool(&m_bDesiredEnableEnemy);
+    arc.ArchiveBool(&m_bEnableEnemy);
+    arc.ArchiveBool(&m_bEnablePain);
+    arc.ArchiveBool(&m_bNoLongPain);
+    arc.ArchiveBool(&m_bNewEnemy);
+    arc.ArchiveBool(&m_bEnemyIsDisguised);
+    arc.ArchiveBool(&m_bEnemyVisible);
+    arc.ArchiveBool(&m_bEnemyInFOV);
+    arc.ArchiveBool(&m_bForceAttackPlayer);
+    arc.ArchiveBool(&m_bAutoAvoidPlayer);
+
+    arc.ArchiveBool(&m_bNoIdleAfterAnim);
+    Director.ArchiveString(arc, m_csAnimScript);
+    arc.ArchiveBool(&m_bAnimScriptSet);
+    arc.ArchiveInteger(&m_AnimMode);
+    arc.ArchiveFloat(&m_fRunAnimRate);
+    arc.ArchiveFloat(&m_fDfwRequestedYaw);
+    arc.ArchiveFloat(&m_fDfwDerivedYaw);
+    arc.ArchiveVector(&m_vDfwPos);
+    arc.ArchiveFloat(&m_fDfwTime);
+    arc.ArchiveInteger(&m_iGunPositionCheckTime);
+    arc.ArchiveVector(&m_vGunPosition);
+
+    arc.ArchiveInteger(&m_iWallDodgeTimeout);
+    arc.ArchiveFloat(&m_PrevObstacleNormal[0]);
+    arc.ArchiveFloat(&m_PrevObstacleNormal[1]);
+    arc.ArchiveChar(&m_WallDir);
+    arc.ArchiveFloat(&m_fMoveDoneRadiusSquared);
+
+    arc.ArchiveBool(&m_bFaceEnemy);
+    arc.ArchiveBool(&m_bDoPhysics);
+    arc.ArchiveBool(&m_bPatrolWaitTrigger);
+    arc.ArchiveBool(&m_bBecomeRunner);
+    arc.ArchiveBool(&m_bScriptGoalValid);
+    arc.ArchiveVector(&m_vScriptGoal);
+    arc.ArchiveInteger(&m_iNextWatchStepTime);
+
+    arc.ArchiveSafePointer(&m_patrolCurrentNode);
+    Director.ArchiveString(arc, m_csPatrolCurrentAnim);
+    arc.ArchiveInteger(&m_iSquadStandTime);
+    arc.ArchiveFloat(&m_fInterval);
+    arc.ArchiveInteger(&m_iIntervalDirTime);
+    arc.ArchiveVector(&m_vIntervalDir);
+    arc.ArchiveShort(&m_sCurrentPathNodeIndex);
+    arc.ArchiveInteger(&m_PainState);
+
+    arc.ArchiveInteger(&m_iCuriousTime);
+    arc.ArchiveInteger(&m_iCuriousLevel);
+    arc.ArchiveInteger(&m_iCuriousAnimHint);
+    arc.ArchiveInteger(&m_iNextDisguiseTime);
+    arc.ArchiveInteger(&m_iDisguisePeriod);
+    arc.ArchiveFloat(&m_fMaxDisguiseDistSquared);
+    arc.ArchiveInteger(&m_iEnemyShowPapersTime);
+
+    m_DisguiseAcceptThread.Archive(arc);
+    arc.ArchiveInteger(&m_iDisguiseLevel);
+    arc.ArchiveSafePointer(&m_AlarmNode);
+    m_AlarmThread.Archive(arc);
+    m_PreAlarmThread.Archive(arc);
+
+    arc.ArchiveInteger(&m_iSuppressChance);
+    arc.ArchiveInteger(&m_iRunHomeTime);
+    arc.ArchiveBool(&m_bTurretNoInitialCover);
+    arc.ArchiveInteger(&m_iPotentialCoverCount);
+
+    for (i = 0; i < MAX_COVER_NODES; i++) {
+        arc.ArchiveObjectPointer((Class **)&m_pPotentialCoverNode[i]);
+    }
+
+    arc.ArchiveObjectPointer((Class **)&m_pCoverNode);
+
+    Director.ArchiveString(arc, m_csSpecialAttack);
+    arc.ArchiveBool(&m_bInReload);
+    arc.ArchiveBool(&m_bNeedReload);
+    arc.ArchiveBool(&mbBreakSpecialAttack);
+
+    arc.ArchiveBool(&m_bGrenadeBounced);
+    arc.ArchiveSafePointer(&m_pGrenade);
+    arc.ArchiveVector(&m_vGrenadePos);
+    arc.ArchiveInteger(&m_iFirstGrenadeTime);
+    ArchiveEnum(m_eGrenadeState, eGrenadeState);
+    ArchiveEnum(m_eGrenadeMode, eGrenadeTossMode);
+    arc.ArchiveVector(&m_vGrenadeVel);
+    arc.ArchiveVector(&m_vKickDir);
+
+    arc.ArchiveFloat(&m_fNoticeTimeScale);
+    arc.ArchiveFloat(&m_fMaxNoticeTimeScale);
+    m_PotentialEnemies.Archive(arc);
+
+    arc.ArchiveFloat(&m_fSight);
+    arc.ArchiveFloat(&m_fHearing);
+    arc.ArchiveFloat(&m_fSoundAwareness);
+    arc.ArchiveFloat(&m_fGrenadeAwareness);
+    arc.ArchiveInteger(&m_iIgnoreSoundsMask);
+
+    arc.ArchiveFloat(&m_fFov);
+    arc.ArchiveFloat(&m_fFovDot);
+    arc.ArchiveInteger(&m_iEyeUpdateTime);
+    arc.ArchiveVector(&m_vEyeDir);
+    arc.ArchiveInteger(&m_iNextLookTime);
+    arc.ArchiveFloat(&m_fLookAroundFov);
+    arc.ArchiveSafePointer(&m_pLookEntity);
+    arc.ArchiveInteger(&m_iLookFlags);
+    arc.ArchiveSafePointer(&m_pPointEntity);
+    arc.ArchiveSafePointer(&m_pTurnEntity);
+    arc.ArchiveFloat(&m_fTurnDoneError);
+    arc.ArchiveFloat(&m_fAngleYawSpeed);
+    arc.ArchiveSafePointer(&m_aimNode);
+    arc.ArchiveInteger(&m_eDontFaceWallMode);
+    arc.ArchiveInteger(&m_iLastFaceDecideTime);
+
+    arc.ArchiveBool(&m_bHeadAnglesAchieved);
+    arc.ArchiveBool(&m_bLUpperArmAnglesAchieved);
+    arc.ArchiveBool(&m_bTorsoAnglesAchieved);
+    arc.ArchiveFloat(&m_fHeadMaxTurnSpeed);
+    arc.ArchiveVec3(m_vHeadDesiredAngles);
+    arc.ArchiveFloat(&m_fLUpperArmTurnSpeed);
+    arc.ArchiveVec3(m_vLUpperArmDesiredAngles);
+    arc.ArchiveFloat(&m_fTorsoMaxTurnSpeed);
+    arc.ArchiveFloat(&m_fTorsoCurrentTurnSpeed);
+    arc.ArchiveVec3(m_vTorsoDesiredAngles);
+
+    arc.ArchiveVector(&m_vHome);
+    arc.ArchiveSafePointer(&m_pTetherEnt);
+
+    arc.ArchiveFloat(&m_fMinDistance);
+    arc.ArchiveFloat(&m_fMinDistanceSquared);
+    arc.ArchiveFloat(&m_fMaxDistance);
+    arc.ArchiveFloat(&m_fMaxDistanceSquared);
+
+    arc.ArchiveFloat(&m_fLeash);
+    arc.ArchiveFloat(&m_fLeashSquared);
+    arc.ArchiveBool(&m_bFixedLeash);
+
+    byte length;
+
+    if (arc.Saving()) {
+        if (m_pFallPath) {
+            length = m_pFallPath->length;
+        } else {
+            length = 0;
+        }
+    }
+    arc.ArchiveByte(&length);
+
+    if (arc.Loading() && length) {
+        m_pFallPath =
+            (FallPath *)gi.Malloc((sizeof(FallPath::pos)) * length + (sizeof(FallPath) - sizeof(FallPath::pos)));
+        m_pFallPath->length = length;
+    }
+
+    if (length) {
+        arc.ArchiveByte(&m_pFallPath->currentPos);
+        arc.ArchiveByte(&m_pFallPath->loop);
+
+        for (i = 0; i < length; i++) {
+            arc.ArchiveVec3(m_pFallPath->pos[i]);
+        }
+    }
+
+    arc.ArchiveFloat(&m_fBalconyHeight);
+    arc.ArchiveBool(&m_bNoPlayerCollision);
+
+    for (i = 0; i < MAX_ORIGIN_HISTORY; i++) {
+        arc.ArchiveVec2(m_vOriginHistory[i]);
+    }
+
+    arc.ArchiveInteger(&m_iCurrentHistory);
+
+    arc.ArchiveBool(&m_bEnemySwitch);
+    arc.ArchiveInteger(&m_iNationality);
+
+    // set the model
+    setModel();
+}
+
+/*
+===============
+Actor::SetDesiredLookDir
+
+Change desired look direction.
+===============
+*/
+inline void Actor::SetDesiredLookDir(vec3_t dir)
+{
+    m_bHasDesiredLookAngles = true;
+    vectoangles(dir, m_DesiredLookAngles);
+
+    m_DesiredLookAngles[1] = m_DesiredLookAngles[1] - angles[1];
+    m_DesiredLookAngles[1] = AngleNormalize180(m_DesiredLookAngles[1]);
+    m_DesiredLookAngles[0] = AngleNormalize180(m_DesiredLookAngles[0]);
+}
+
+/*
+===============
+Actor::SetDesiredLookAnglesRelative
+
+Change desired look angles relatively.
+===============
+*/
+inline void Actor::SetDesiredLookAnglesRelative(vec3_t ang)
+{
+    m_bHasDesiredLookAngles = true;
+    m_DesiredLookAngles[0]  = AngleNormalize180(ang[0]);
+    m_DesiredLookAngles[1]  = AngleNormalize180(ang[1]);
+    m_DesiredLookAngles[2]  = AngleNormalize180(ang[2]);
+}
+
+/*
+===============
+Actor::ForwardLook
+===============
+*/
+inline void Actor::ForwardLook(void)
+{
+    m_bHasDesiredLookAngles = false;
+}
+
+inline bool Actor::EnemyIsDisguised(void)
+{
+    if (!m_bEnemyIsDisguised && !m_Enemy->m_bIsDisguised) {
+        return false;
+    }
+
+    if (m_bForceAttackPlayer) {
+        return false;
+    }
+
+    if (m_ThinkState == THINKSTATE_ATTACK) {
+        return false;
+    }
+
+    return true;
+}
+
+inline bool Actor::AvoidingFacingWall(void) const
+{
+    return m_eDontFaceWallMode > 5 && m_eDontFaceWallMode <= 8;
 }
 
 #if 0
@@ -1761,4 +2336,3 @@ class SpinningPlant : public Actor
 		void	GetClip( Event *ev );
 	};
 */
-#endif
\ No newline at end of file
diff --git a/code/fgame/actor_aim.cpp b/code/fgame/actor_aim.cpp
index bffea18b..df0c95ca 100644
--- a/code/fgame/actor_aim.cpp
+++ b/code/fgame/actor_aim.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,52 +24,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAim
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitAim(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Aim;
-	func->ThinkState					= &Actor::Think_Aim;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->ShowInfo						= &Actor::ShowInfo_Aim;
-	func->IsState						= &Actor::IsIdleState;
-}
-void Actor::Begin_Aim
-	(
-	void
-	)
-{
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
-	ClearPath();
-}
-void Actor::Think_Aim
-	(
-	void
-	)
-{
-	if( !RequireThink() )
-		return;
-
-	UpdateEyeOrigin();
-	NoPoint();
-	m_pszDebugState = "";
-	Anim_Aim();
-
-	if( m_aimNode )
-	{
-		AimAtAimNode();
-	}
-
-	CheckForThinkStateTransition();
-	PostThink( true );
+    func->BeginState                 = &Actor::Begin_Aim;
+    func->ThinkState                 = &Actor::Think_Aim;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->ShowInfo                   = &Actor::ShowInfo_Aim;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::ShowInfo_Aim
-	(
-	void
-	)
+void Actor::Begin_Aim(void)
 {
-	ShowInfo_AimNode();
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
+    ClearPath();
+}
+
+void Actor::Think_Aim(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    m_pszDebugState = "";
+    Anim_Aim();
+
+    if (m_aimNode) {
+        AimAtAimNode();
+    }
+
+    CheckForThinkStateTransition();
+    PostThink(true);
+}
+
+void Actor::ShowInfo_Aim(void)
+{
+    ShowInfo_AimNode();
 }
diff --git a/code/fgame/actor_alarm.cpp b/code/fgame/actor_alarm.cpp
index b404fb96..57514a9e 100644
--- a/code/fgame/actor_alarm.cpp
+++ b/code/fgame/actor_alarm.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,143 +24,108 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAlarm
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitAlarm(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Alarm;
-	func->EndState						= &Actor::End_Alarm;
-	func->ThinkState					= &Actor::Think_Alarm;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->IsState						= &Actor::IsAttackState;
+    func->BeginState                 = &Actor::Begin_Alarm;
+    func->EndState                   = &Actor::End_Alarm;
+    func->ThinkState                 = &Actor::Think_Alarm;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->IsState                    = &Actor::IsAttackState;
 }
 
-void Actor::Begin_Alarm
-	(
-	void
-	)
+void Actor::Begin_Alarm(void)
 {
-	DoForceActivate();
+    DoForceActivate();
 
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
 
-	if( m_AlarmNode )
-	{
-		SetPath( m_AlarmNode, "Actor::Begin_Alarm", 0 );
+    if (!m_AlarmNode) {
+        State_Alarm_StartThread();
+        return;
+    }
 
-		if( PathExists() )
-		{
-			TransitionState(601, 0);
-		}
-		else
-		{
-			TransitionState(600, 0);
-			parm.movefail = true;
-		}
-	}
-	else
-	{
-		SetLeashHome( origin );
-		TransitionState(600, 0);
-		m_AlarmThread.Execute( this );
-	}
+    SetPath(m_AlarmNode, "Actor::Begin_Alarm", 0);
+
+    if (PathExists()) {
+        TransitionState(ACTOR_STATE_ALARM_MOVE, 0);
+    } else {
+        TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+        parm.movefail = true;
+    }
 }
 
-void Actor::End_Alarm
-	(
-	void
-	)
+void Actor::End_Alarm(void)
 {
-	parm.movefail = true;
+    parm.movefail = true;
 }
 
-void Actor::State_Alarm_StartThread
-	(
-	void
-	)
+void Actor::State_Alarm_StartThread(void)
 {
-	if( m_AlarmNode )
-		SetLeashHome( m_AlarmNode->origin );
-	else
-		SetLeashHome( origin );
+    SetLeashHome(m_AlarmNode ? m_AlarmNode->origin : origin);
+    // Added in 2.30.
+    //  Execute the pre-alarm thread
+    m_PreAlarmThread.Execute(this);
 
-	TransitionState(600, 0);
-	m_AlarmThread.Execute();
+    TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+    m_AlarmThread.Execute(this);
 }
 
-void Actor::State_Alarm_Move
-	(
-	void
-	)
+void Actor::State_Alarm_Move(void)
 {
-	if( PathExists() )
-	{
-		if( PathComplete() )
-		{
-			Anim_Aim();
-			AimAtTargetPos();
-		}
-		else
-		{
-			Anim_RunToAlarm( 2 );
-			FaceMotion();
-		}
-	}
-	else
-	{
-		TransitionState(600, 0);
-		parm.movefail = true;
+    if (!PathExists()) {
+        TransitionState(ACTOR_STATE_ALARM_IDLE, 0);
+        parm.movefail = true;
 
-		Anim_Aim();
-		AimAtTargetPos();
-	}
+        Anim_Aim();
+        AimAtTargetPos();
+    } else if (PathComplete()) {
+        Anim_Aim();
+        AimAtTargetPos();
+        State_Alarm_StartThread();
+    } else {
+        Anim_RunToAlarm(ANIM_MODE_PATH);
+        FaceMotion();
+    }
 }
 
-void Actor::State_Alarm_Idle
-	(
-	void
-	)
+void Actor::State_Alarm_Idle(void)
 {
-	AimAtTargetPos();
-	SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    Anim_Aim();
+    AimAtTargetPos();
+    SetThink(THINKSTATE_ATTACK, THINK_TURRET);
 }
 
-void Actor::Think_Alarm
-	(
-	void
-	)
+void Actor::Think_Alarm(void)
 {
-	if( !RequireThink() )
-		return;
+    if (!RequireThink()) {
+        return;
+    }
 
-	parm.movefail = false;
+    parm.movefail = false;
 
-	UpdateEyeOrigin();
-	NoPoint();
+    UpdateEyeOrigin();
+    NoPoint();
 
-	if( m_State == 600 )
-	{
-		m_pszDebugState = "idle";
-		State_Alarm_Idle();
-	}
-	else if( m_State == 601 )
-	{
-		m_pszDebugState = "move";
-		State_Alarm_Move();
-	}
-	else
-	{
-		Com_Printf( "Actor::Think_Alarm: invalid think state %i\n", m_State );
-	}
+    switch (m_State) {
+    case ACTOR_STATE_ALARM_IDLE:
+        m_pszDebugState = "idle";
+        State_Alarm_Idle();
+        break;
+    case ACTOR_STATE_ALARM_MOVE:
+        m_pszDebugState = "move";
+        State_Alarm_Move();
+        break;
+    default:
+        Com_Printf("Actor::Think_Alarm: invalid think state %i\n", m_State);
+        break;
+    }
+
+    PostThink(true);
 }
 
-void Actor::FinishedAnimation_Alarm
-	(
-	void
-	)
+void Actor::FinishedAnimation_Alarm(void)
 {
-	// not needed
-	return;
+    // not needed
+    return;
 }
diff --git a/code/fgame/actor_anim.cpp b/code/fgame/actor_anim.cpp
index 3066c737..6a8db069 100644
--- a/code/fgame/actor_anim.cpp
+++ b/code/fgame/actor_anim.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,81 +24,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAnim
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitAnim(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Anim;
-	func->BeginState					= &Actor::Begin_Anim;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Anim;
-	func->ShowInfo						= &Actor::ShowInfo_Anim;
-	func->IsState						= &Actor::IsIdleState;
+    func->ThinkState                 = &Actor::Think_Anim;
+    func->BeginState                 = &Actor::Begin_Anim;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Anim;
+    func->ShowInfo                   = &Actor::ShowInfo_Anim;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::Begin_Anim
-	(
-	void
-	)
+void Actor::Begin_Anim(void)
 {
-	m_csMood = m_csIdleMood;
-	ClearPath();
-	StopTurning();
-	TransitionState(1000, 0);
+    m_csMood = m_csIdleMood;
+    ClearPath();
+    StopTurning();
+    TransitionState(ACTOR_STATE_ANIMATION_INITIAL, 0);
 }
 
-void Actor::Think_Anim
-	(
-	void
-	)
+void Actor::Think_Anim(void)
 {
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		IdlePoint();
-		IdleLook();
-		if (m_State == 1000)
-		{
-			m_bNextForceStart = true;
+    if (!RequireThink()) {
+        return;
+    }
 
-			m_bAnimScriptSet = false;
-			m_pszDebugState = "initial";
-			TransitionState(1001, 0);
-		}
-		else if (m_State == 1001)
-		{
-			m_bNextForceStart = false;
-			m_pszDebugState = "main";
-		}
-		m_eNextAnimMode = m_AnimMode;
-		m_csNextAnimString = m_csAnimScript;
+    UpdateEyeOrigin();
+    IdlePoint();
+    IdleLook();
 
-		CheckForThinkStateTransition();
-		IdleTurn();
-		PostThink(false);
-	}
+    if (m_State == ACTOR_STATE_ANIMATION_INITIAL) {
+        m_pszDebugState = "initial";
+        m_bAnimScriptSet = false;
+        StartAnimation(m_AnimMode, m_csAnimScript);
+        TransitionState(ACTOR_STATE_ANIMATION_MAIN, 0);
+    } else if (m_State == ACTOR_STATE_ANIMATION_MAIN) {
+        m_bNextForceStart = false;
+        m_pszDebugState = "main";
+        DesiredAnimation(m_AnimMode, m_csAnimScript);
+    }
+
+    CheckForThinkStateTransition();
+    IdleTurn();
+    PostThink(false);
 }
 
-void Actor::FinishedAnimation_Anim
-	(
-	void
-	)
+void Actor::FinishedAnimation_Anim(void)
 {
-	if (!m_bAnimScriptSet)
-	{
-		if (m_bNoIdleAfterAnim)
-			m_csAnimScript = STRING_ANIM_CONTINUE_LAST_ANIM_SCR;
-		else
-			SetThinkIdle(THINK_IDLE);
-		Unregister(STRING_ANIMDONE);
-	}
+    if (m_bAnimScriptSet) {
+        return;
+    }
+
+    if (m_bNoIdleAfterAnim) {
+        m_csAnimScript = STRING_ANIM_CONTINUE_LAST_ANIM_SCR;
+    } else {
+        SetThinkIdle(THINK_IDLE);
+    }
+
+    Unregister(STRING_ANIMDONE);
 }
 
-void Actor::ShowInfo_Anim
-	(
-	void
-	)
+void Actor::ShowInfo_Anim(void)
 {
-	Com_Printf("anim script: %s, anim mode %d\n", Director.GetString(m_csAnimScript).c_str(), m_AnimMode);
+    Com_Printf("anim script: %s, anim mode %d\n", Director.GetString(m_csAnimScript).c_str(), m_AnimMode);
 }
diff --git a/code/fgame/actor_animapi.cpp b/code/fgame/actor_animapi.cpp
index 6e87eaa6..11c5a5b8 100644
--- a/code/fgame/actor_animapi.cpp
+++ b/code/fgame/actor_animapi.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,289 +23,201 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // actor_animapi.cpp: Base actor animation script
 
 #include "actor.h"
+#include "scriptthread.h"
 
-const_str SimpleActor::GetRunAnim
-	(
-	void
-	)
+const_str SimpleActor::GetRunAnim(void)
 {
-	if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) )
-		return STRING_ANIM_RUN_SCR;
-	else
-		return STRING_ANIM_CROUCH_RUN_SCR;
+    if (m_csCurrentPosition == STRING_PRONE) {
+        return STRING_ANIM_CROUCH_RUN_SCR;
+    }
+
+    if (m_csCurrentPosition >= STRING_PRONE && m_csCurrentPosition <= STRING_CROUCHRUN && m_csCurrentPosition >= STRING_CROUCH) {
+        return STRING_ANIM_CROUCH_RUN_SCR;
+    } else {
+        return STRING_ANIM_RUN_SCR;
+    }
 }
 
-const_str SimpleActor::GetWalkAnim
-	(
-	void
-	)
+const_str SimpleActor::GetWalkAnim(void)
 {
-	if( m_csCurrentPosition != STRING_PRONE && ( m_csCurrentPosition < STRING_PRONE || m_csCurrentPosition > STRING_CROUCHRUN ) )
-		return STRING_ANIM_WALK_SCR;
-	else
-		return STRING_ANIM_CROUCH_WALK_SCR;
+    if (m_csCurrentPosition == STRING_PRONE) {
+        return STRING_ANIM_CROUCH_WALK_SCR;
+    }
+
+    if (m_csCurrentPosition >= STRING_PRONE && m_csCurrentPosition <= STRING_CROUCHRUN && m_csCurrentPosition >= STRING_CROUCH) {
+        return STRING_ANIM_CROUCH_WALK_SCR;
+    } else {
+        return STRING_ANIM_WALK_SCR;
+    }
 }
 
-void SimpleActor::Anim_Attack
-	(
-	void
-	)
+void SimpleActor::Anim_Attack(void)
 {
-	DesiredAnimation(1, m_AttackHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, m_AttackHandler);
 }
 
-void SimpleActor::Anim_Sniper
-	(
-	void
-	)
+void SimpleActor::Anim_Suppress(void)
 {
-	DesiredAnimation(1, m_SniperHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_SUPPRESS_SCR);
 }
 
-void SimpleActor::Anim_Aim
-	(
-	void
-	)
+void SimpleActor::Anim_Sniper(void)
 {
-	DesiredAnimation(1, STRING_ANIM_AIM_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, m_SniperHandler);
 }
 
-void SimpleActor::Anim_Shoot
-	(
-	void
-	)
+void SimpleActor::Anim_Aim(void)
 {
-	DesiredAnimation(1, STRING_ANIM_SHOOT_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_AIM_SCR);
 }
 
-void SimpleActor::Anim_Idle
-	(
-	void
-	)
+void SimpleActor::Anim_Shoot(void)
 {
-	DesiredAnimation(1, STRING_ANIM_IDLE_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_SHOOT_SCR);
 }
 
-void SimpleActor::Anim_Crouch
-	(
-	void
-	)
+void SimpleActor::Anim_Idle(void)
 {
-	DesiredAnimation(1, STRING_ANIM_CROUCH_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_IDLE_SCR);
 }
 
-void SimpleActor::Anim_Prone
-	(
-	void
-	)
+void SimpleActor::Anim_Crouch(void)
 {
-	DesiredAnimation(1, STRING_ANIM_PRONE_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_CROUCH_SCR);
 }
 
-void SimpleActor::Anim_Stand
-	(
-	void
-	)
+void SimpleActor::Anim_Prone(void)
 {
-	DesiredAnimation(1, STRING_ANIM_STAND_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_PRONE_SCR);
 }
 
-void SimpleActor::Anim_Cower
-	(
-	void
-	)
+void SimpleActor::Anim_Stand(void)
 {
-	DesiredAnimation(1, STRING_ANIM_COWER_SCR);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_STAND_SCR);
 }
 
-void SimpleActor::Anim_Killed
-	(
-	void
-	)
+void SimpleActor::Anim_Cower(void)
 {
-	Com_Printf("m_eAnimMode Anim_Killed \n");
-	DesiredAnimation(1, m_DeathHandler);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_COWER_SCR);
 }
 
-void SimpleActor::Anim_StartPain
-	(
-	void
-	)
+void SimpleActor::Anim_Killed(void)
 {
-	Com_Printf("m_eAnimMode Anim_StartPain \n");
-	StartAnimation(1, m_PainHandler);
-	
+    DesiredAnimation(ANIM_MODE_NORMAL, m_DeathHandler);
 }
 
-void SimpleActor::Anim_Pain
-	(
-	void
-	)
+void SimpleActor::Anim_StartPain(void)
 {
-	ContinueAnimation();
+    StartAnimation(ANIM_MODE_NORMAL, m_PainHandler);
 }
 
-
-void SimpleActor::Anim_CrouchRunTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_Pain(void)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_RUN_SCR);
+    ContinueAnimation();
 }
 
-void SimpleActor::Anim_CrouchWalkTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_CrouchRunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_WALK_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_RUN_SCR);
 }
 
-void SimpleActor::Anim_StandRunTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_CrouchWalkTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_CROUCH_WALK_SCR);
 }
 
-void SimpleActor::Anim_StandWalkTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_StandRunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_WALK_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SCR);
 }
 
-void SimpleActor::Anim_RunTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_StandWalkTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, GetRunAnim());
+    DesiredAnimation(eAnimMode, STRING_ANIM_WALK_SCR);
 }
 
-void SimpleActor::Anim_WalkTo
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunTo(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, GetWalkAnim());
+    DesiredAnimation(eAnimMode, GetRunAnim());
 }
 
-void SimpleActor::Anim_RunAwayFiring
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunAwayFiring(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNAWAYFIRING_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNAWAYFIRING_SCR);
 }
 
-void SimpleActor::Anim_RunToShooting
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToShooting(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SHOOT_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUN_SHOOT_SCR);
 }
 
-void SimpleActor::Anim_RunToAlarm
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToAlarm(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_ALARM_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_ALARM_SCR);
 }
 
-void SimpleActor::Anim_RunToCasual
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToCasual(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_CASUAL_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_CASUAL_SCR);
 }
 
-void SimpleActor::Anim_RunToCover
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToCover(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_COVER_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_COVER_SCR);
 }
 
-void SimpleActor::Anim_RunToDanger
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToDanger(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DANGER_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DANGER_SCR);
 }
 
-void SimpleActor::Anim_RunToDive
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToDive(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DIVE_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_DIVE_SCR);
 }
 
-void SimpleActor::Anim_RunToFlee
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToFlee(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_FLEE_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_FLEE_SCR);
 }
 
-void SimpleActor::Anim_RunToInOpen
-	(
-	int eAnimMode
-	)
+void SimpleActor::Anim_RunToInOpen(int eAnimMode)
 {
-	DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_INOPEN_SCR);
+    DesiredAnimation(eAnimMode, STRING_ANIM_RUNTO_INOPEN_SCR);
 }
 
-void SimpleActor::Anim_Emotion
-	(
-	eEmotionMode eEmotMode
-	)
+void SimpleActor::Anim_WalkTo(int eAnimMode)
 {
-	m_eEmotionMode = eEmotMode;
+    DesiredAnimation(eAnimMode, GetWalkAnim());
 }
 
-void SimpleActor::Anim_Say
-	(
-	const_str csSayAnimScript,
-	int iMinTimeSinceLastSay,
-	bool bCanInterrupt
-	)
+void SimpleActor::Anim_Emotion(eEmotionMode eEmotMode)
 {
-	if (!m_bSayAnimSet || bCanInterrupt)
-	{
-		if (level.inttime > m_iVoiceTime + iMinTimeSinceLastSay)
-		{
-			ScriptThreadLabel label;
-
-			label.TrySetScript(csSayAnimScript);
-			label.Execute(this);
-		}
-	}
+    m_eEmotionMode = eEmotMode;
 }
 
-void SimpleActor::Anim_FullBody
-	(
-	const_str csFullBodyAnim,
-	int eAnimMode
-	)
+void SimpleActor::Anim_Say(const_str csSayAnimScript, int iMinTimeSinceLastSay, bool bCanInterrupt)
 {
-	if( m_csAnimName == csFullBodyAnim )
-	{
-		DesiredAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
-	}
-	else
-	{
-		m_csAnimName = csFullBodyAnim;
-		StartAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
-	}
+    if (m_bSayAnimSet && !bCanInterrupt) {
+        return;
+    }
+
+    if (level.inttime <= iMinTimeSinceLastSay + m_iVoiceTime) {
+        return;
+    }
+
+    ScriptThreadLabel label;
+
+    label.TrySetScript(csSayAnimScript);
+    label.Create(this)->Execute();
+}
+
+void SimpleActor::Anim_FullBody(const_str csFullBodyAnim, int eAnimMode)
+{
+    if (m_csAnimName == csFullBodyAnim) {
+        DesiredAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
+    } else {
+        m_csAnimName = csFullBodyAnim;
+        StartAnimation(eAnimMode, STRING_ANIM_FULLBODY_SCR);
+    }
 }
diff --git a/code/fgame/actor_animcurious.cpp b/code/fgame/actor_animcurious.cpp
index f2426f39..ffdd9353 100644
--- a/code/fgame/actor_animcurious.cpp
+++ b/code/fgame/actor_animcurious.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,56 +24,47 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitAnimCurious
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitAnimCurious(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_AnimCurious;
-	func->BeginState					= &Actor::Begin_AnimCurious;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Curious;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Anim;
-	func->ShowInfo						= &Actor::ShowInfo_Anim;
-	func->IsState						= &Actor::IsCuriousState;
+    func->ThinkState                 = &Actor::Think_AnimCurious;
+    func->BeginState                 = &Actor::Begin_AnimCurious;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Anim;
+    func->ShowInfo                   = &Actor::ShowInfo_Anim;
+    func->IsState                    = &Actor::IsCuriousState;
 }
 
-void Actor::Begin_AnimCurious
-	(
-	void
-	)
+void Actor::Begin_AnimCurious(void)
 {
-	DoForceActivate();
+    DoForceActivate();
 
-	m_csMood = STRING_CURIOUS;
-	StartAnimation(m_AnimMode, m_csAnimScript);
-	StopTurning();
-	m_iCuriousTime = level.inttime;
+    m_csMood       = STRING_CURIOUS;
+    m_iCuriousTime = level.inttime;
+    StopTurning();
+    StartAnimation(m_AnimMode, m_csAnimScript);
 }
 
-void Actor::Think_AnimCurious
-	(
-	void
-	)
+void Actor::Think_AnimCurious(void)
 {
-	if( !RequireThink() )
-		return;
+    if (!RequireThink()) {
+        return;
+    }
 
-	UpdateEyeOrigin();
-	m_pszDebugState = "";
-	LookAtCuriosity();
-	TimeOutCurious();
-	DesiredAnimation(m_AnimMode, m_csAnimScript);
-	CheckForThinkStateTransition();
-	PostThink( false );
+    UpdateEyeOrigin();
+
+    m_pszDebugState = "";
+    LookAtCuriosity();
+    TimeOutCurious();
+
+    DesiredAnimation(m_AnimMode, m_csAnimScript);
+    CheckForThinkStateTransition();
+
+    PostThink(false);
 }
 
-void Actor::FinishedAnimation_AnimCurious
-	(
-	void
-	)
+void Actor::FinishedAnimation_AnimCurious(void)
 {
-	if( m_State == 1101 )
-	{
-		TransitionState(1100, 0);
-	}
+    if (m_State == ACTOR_STATE_CURIOUS_RUNNING) {
+        TransitionState(ACTOR_STATE_CURIOUS_BEGIN, 0);
+    }
 }
diff --git a/code/fgame/actor_badplace.cpp b/code/fgame/actor_badplace.cpp
new file mode 100644
index 00000000..096834ce
--- /dev/null
+++ b/code/fgame/actor_badplace.cpp
@@ -0,0 +1,84 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// actor_badplace.cpp
+
+#include "actor.h"
+
+void Actor::InitBadPlace(GlobalFuncs_t *func)
+{
+    func->ThinkState                 = &Actor::Think_BadPlace;
+    func->BeginState                 = &Actor::Begin_BadPlace;
+    func->EndState                   = &Actor::End_BadPlace;
+    func->ResumeState                = &Actor::Begin_BadPlace;
+    func->SuspendState               = &Actor::End_BadPlace;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_BadPlace;
+    func->IsState                    = &Actor::IsBadPlaceState;
+}
+
+void Actor::Begin_BadPlace(void)
+{
+    DoForceActivate();
+
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
+
+    badplace_t& badplace = level.m_badPlaces.ObjectAt(m_iBadPlaceIndex);
+
+    FindPathAway(badplace.m_vOrigin, origin - badplace.m_vOrigin, badplace.m_fRadius + 64);
+}
+
+void Actor::End_BadPlace(void)
+{
+    m_iBadPlaceIndex = 0;
+}
+
+void Actor::Think_BadPlace(void)
+{
+    if (m_bEnableEnemy) {
+        UpdateEnemy(200);
+    }
+
+    m_pszDebugState = "";
+    NoPoint();
+
+    if (!PathExists() || PathComplete() || !m_iBadPlaceIndex) {
+        m_iBadPlaceIndex = 0;
+        if (!m_Enemy || (m_Enemy->flags & FL_NOTARGET)) {
+            SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        } else {
+            SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        }
+    }
+
+    if (m_Enemy) {
+        m_pszDebugState = "badplace_shoot";
+        FaceEnemyOrMotion(m_iStateTime);
+        Anim_RunAwayFiring(ANIM_MODE_PATH);
+    } else {
+        m_pszDebugState = "badplace_run";
+        FaceMotion();
+        Anim_RunToInOpen(ANIM_MODE_PATH);
+    }
+
+    PostThink(false);
+}
diff --git a/code/fgame/actor_balcony.cpp b/code/fgame/actor_balcony.cpp
index a567e2b4..ab181089 100644
--- a/code/fgame/actor_balcony.cpp
+++ b/code/fgame/actor_balcony.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,366 +25,393 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "scriptexception.h"
 
-void Actor::InitBalconyIdle
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyIdle(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Idle;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->Pain							= &Actor::Pain_Balcony;
-	func->Killed						= &Actor::Killed_Balcony;
-	func->IsState						= &Actor::IsIdleState;
+    func->ThinkState                 = &Actor::Think_Idle;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->Pain                       = &Actor::Pain_Balcony;
+    func->Killed                     = &Actor::Killed_Balcony;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::InitBalconyCurious
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyCurious(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Curious;
-	func->BeginState					= &Actor::Begin_Curious;
-	func->EndState						= &Actor::End_Curious;
-	func->ResumeState					= &Actor::Resume_Curious;
-	func->SuspendState					= &Actor::Suspend_Curious;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Curious;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Curious;
-	func->IsState						= &Actor::IsCuriousState;
-	func->Pain							= &Actor::Pain_Balcony;
-	func->Killed						= &Actor::Killed_Balcony;
+    func->ThinkState                 = &Actor::Think_Curious;
+    func->BeginState                 = &Actor::Begin_Curious;
+    func->EndState                   = &Actor::End_Curious;
+    func->ResumeState                = &Actor::Resume_Curious;
+    func->SuspendState               = &Actor::Suspend_Curious;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Curious;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
+    func->IsState                    = &Actor::IsCuriousState;
+    func->Pain                       = &Actor::Pain_Balcony;
+    func->Killed                     = &Actor::Killed_Balcony;
 }
 
-void Actor::InitBalconyAttack
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyAttack(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_BalconyAttack;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->BeginState					= &Actor::Begin_BalconyAttack;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_BalconyAttack;
-	func->Pain							= &Actor::Pain_Balcony;
-	func->Killed						= &Actor::Killed_Balcony;
-	func->IsState						= &Actor::IsAttackState;
-	func->PostShoot						= &Actor::State_Balcony_PostShoot;
+    func->ThinkState                 = &Actor::Think_BalconyAttack;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->BeginState                 = &Actor::Begin_BalconyAttack;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_BalconyAttack;
+    func->Pain                       = &Actor::Pain_Balcony;
+    func->Killed                     = &Actor::Killed_Balcony;
+    func->IsState                    = &Actor::IsAttackState;
+    func->PostShoot                  = &Actor::State_Balcony_PostShoot;
 }
 
-void Actor::InitBalconyDisguise
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyDisguise(GlobalFuncs_t *func)
 {
-	func->IsState = &Actor::IsDisguiseState;
+    func->IsState = &Actor::IsDisguiseState;
 }
 
-void Actor::InitBalconyGrenade
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyGrenade(GlobalFuncs_t *func)
 {
-	func->IsState = &Actor::IsGrenadeState;
+    func->IsState = &Actor::IsGrenadeState;
 }
 
-void Actor::InitBalconyPain
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyPain(GlobalFuncs_t *func)
 {
-	func->BeginState				= &Actor::Begin_Pain;
-	func->ThinkState				= &Actor::Think_Pain;
-	func->FinishedAnimation			= &Actor::FinishedAnimation_Pain;
-	func->Pain						= &Actor::Pain_Balcony;
-	func->Killed					= &Actor::Killed_Balcony;
-	func->IsState					= &Actor::IsPainState;
+    func->BeginState        = &Actor::Begin_Pain;
+    func->ThinkState        = &Actor::Think_Pain;
+    func->FinishedAnimation = &Actor::FinishedAnimation_Pain;
+    func->Pain              = &Actor::Pain_Balcony;
+    func->Killed            = &Actor::Killed_Balcony;
+    func->IsState           = &Actor::IsPainState;
 }
 
-void Actor::InitBalconyKilled
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitBalconyKilled(GlobalFuncs_t *func)
 {
-	func->BeginState				= &Actor::Begin_BalconyKilled;
-	func->EndState					= &Actor::End_BalconyKilled;
-	func->ThinkState				= &Actor::Think_BalconyKilled;
-	func->FinishedAnimation			= &Actor::FinishedAnimation_BalconyKilled;
-	func->IsState					= &Actor::IsKilledState;
+    func->BeginState        = &Actor::Begin_BalconyKilled;
+    func->EndState          = &Actor::End_BalconyKilled;
+    func->ThinkState        = &Actor::Think_BalconyKilled;
+    func->FinishedAnimation = &Actor::FinishedAnimation_BalconyKilled;
+    func->IsState           = &Actor::IsKilledState;
 }
 
-void Actor::Pain_Balcony
-	(
-	Event *ev
-	)
+void Actor::Pain_Balcony(Event *ev)
 {
-	SetThink( THINKSTATE_PAIN, THINK_BALCONY_PAIN);
-	HandlePain( ev );
+    SetThink(THINKSTATE_PAIN, THINK_BALCONY_PAIN);
+    HandlePain(ev);
 }
 
-void Actor::Killed_Balcony
-	(
-	Event *ev,
-	bool bPlayDeathAnim
-	)
+void Actor::Killed_Balcony(Event *ev, bool bPlayDeathAnim)
 {
-	ClearStates();
-	SetThink( THINKSTATE_KILLED, THINK_BALCONY_KILLED);
-	HandleKilled( ev, true );
+    ClearStates();
+    SetThink(THINKSTATE_KILLED, THINK_BALCONY_KILLED);
+    HandleKilled(ev, true);
 
-	if( !bPlayDeathAnim )
-		ScriptError( "cannot do 'bedead' on balcony guys" );
+    if (!bPlayDeathAnim) {
+        ScriptError("cannot do 'bedead' on balcony guys");
+    }
 }
 
-void Actor::Begin_BalconyAttack
-	(
-	void
-	)
+void Actor::Begin_BalconyAttack(void)
 {
-	TransitionState(200, 0);
+    TransitionState(ACTOR_STATE_BALCONY_ATTACK_FIND_ENEMY, 0);
 }
 
-void Actor::State_Balcony_PostShoot
-	(
-	void
-	)
+void Actor::State_Balcony_PostShoot(void)
 {
-	if( m_Enemy )
-	{
-		TransitionState(201, 0);
-	}
+    if (m_Enemy) {
+        TransitionState(ACTOR_STATE_BALCONY_ATTACK_TARGET, 0);
+    }
 }
 
-void Actor::State_Balcony_FindEnemy
-	(
-	void
-	)
+void Actor::State_Balcony_FindEnemy(void)
 {
-	m_bHasDesiredLookAngles = false;
-	Anim_Aim();
+    m_bHasDesiredLookAngles = false;
+    Anim_Aim();
 
-	if( CanSeeEnemy( 200 ) )
-	{
-		TransitionState(201, 0);
-	}
+    if (CanSeeEnemy(200)) {
+        TransitionState(ACTOR_STATE_BALCONY_ATTACK_TARGET, 0);
+    }
 }
 
-void Actor::State_Balcony_Target
-	(
-	void
-	)
+void Actor::State_Balcony_Target(void)
 {
-	Anim_Aim();
-	AimAtTargetPos();
+    Anim_Aim();
+    AimAtTargetPos();
 
-	if( level.inttime > m_iStateTime + 1000 )
-	{
-		if( CanSeeEnemy( 0 ) && CanShootEnemy( 0 ) )
-		{
-			TransitionState(202, 0);
-		}
-		else
-		{
-			ClearPath();
-			TransitionState(200, 0);
-		}
-	}
+    if (level.inttime > m_iStateTime + 1000) {
+        if (CanSeeEnemy(0) && CanShootEnemy(0)) {
+            TransitionState(ACTOR_STATE_BALCONY_ATTACK_SHOOT, 0);
+        } else {
+            ClearPath();
+            TransitionState(ACTOR_STATE_BALCONY_ATTACK_FIND_ENEMY, 0);
+        }
+    }
 }
 
-void Actor::State_Balcony_Shoot
-	(
-	void
-	)
+void Actor::State_Balcony_Shoot(void)
 {
-	Anim_Shoot();
-	AimAtTargetPos();
+    Anim_Shoot();
+    AimAtTargetPos();
 }
 
-void Actor::Think_BalconyAttack
-	(
-	void
-	)
+void Actor::Think_BalconyAttack(void)
 {
-	if( !RequireThink() )
-		return;
+    if (!RequireThink()) {
+        return;
+    }
 
-	UpdateEyeOrigin();
-	UpdateEnemy( 500 );
+    UpdateEyeOrigin();
+    UpdateEnemy(500);
 
-	if( !m_Enemy )
-	{
-		SetThinkState( THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-		IdleThink();
-		return;
-	}
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        IdleThink();
+        return;
+    }
 
-	NoPoint();
+    NoPoint();
 
-	if( m_State == 201 )
-	{
-		m_pszDebugState = "target";
-		State_Balcony_Target();
-	}
-	else if( m_State == 202 )
-	{
-		m_pszDebugState = "shoot";
-		State_Balcony_Shoot();
-	}
-	else if( m_State == 200 )
-	{
-		m_pszDebugState = "findenemy";
-		State_Balcony_FindEnemy();
-	}
-	else
-	{
-		Com_Printf( "Actor::Think_BalconyAttack: invalid think state %i\n", m_State );
-		assert( 0 );
-	}
+    switch (m_State) {
+    case ACTOR_STATE_BALCONY_ATTACK_TARGET:
+        m_pszDebugState = "target";
+        State_Balcony_Target();
+        break;
+    case ACTOR_STATE_BALCONY_ATTACK_SHOOT:
+        m_pszDebugState = "shoot";
+        State_Balcony_Shoot();
+        break;
+    case ACTOR_STATE_BALCONY_ATTACK_FIND_ENEMY:
+        m_pszDebugState = "findenemy";
+        State_Balcony_FindEnemy();
+        break;
+    default:
+        Com_Printf("Actor::Think_BalconyAttack: invalid think state %i\n", m_State);
+        assert(0);
+        break;
+    }
 
-	PostThink( true );
+    PostThink(true);
 }
 
-void Actor::FinishedAnimation_BalconyAttack
-	(
-	void
-	)
+void Actor::FinishedAnimation_BalconyAttack(void)
 {
-	if( m_State == 202 )
-		State_Balcony_PostShoot();
+    if (m_State == ACTOR_STATE_BALCONY_ATTACK_SHOOT) {
+        State_Balcony_PostShoot();
+    }
 }
 
-void Actor::Begin_BalconyKilled
-	(
-	void
-	)
+bool Actor::CalcFallPath(void)
 {
-	ClearPath();
-	ResetBoneControllers();
+    mmove_t mm;
+    int currentPos = 0;
+    int loop;
+    vec3_t pos[200];
+    float startDeltaTime;
+    float nextTime;
+    vec3_t vRelDelta;
+    vec3_t vAbsDelta;
+    float animTime;
+    int anim;
+    int i;
+    float startTime;
 
-	PostEvent( EV_Actor_DeathEmbalm, 0.05f );
+    SetMoveInfo(&mm);
 
-	if( CalcFallPath() )
-		TransitionState(800, 0);
-	else
-		TransitionState(806, 0);
+    mm.tracemask &= ~(CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX);
+    mm.desired_speed = 80;
+    VectorCopy2D(orientation[0], mm.desired_dir);
+
+    anim     = gi.Anim_NumForName(edict->tiki, "death_balcony_intro");
+    animTime = gi.Anim_Time(edict->tiki, anim);
+    startTime = 0.65f;
+
+    for (;;) {
+        MmoveSingle(&mm);
+        VectorCopy(mm.origin, pos[currentPos]);
+
+        currentPos++;
+        if (currentPos >= ARRAY_LEN(pos)) {
+            return false;
+        }
+
+        if (mm.hit_obstacle) {
+            break;
+        }
+
+        if (!mm.groundPlane) {
+            return false;
+        }
+
+        startTime -= level.frametime;
+        if (startTime < 0) {
+            return false;
+        }
+    }
+
+    for (startDeltaTime = 0.65f; startDeltaTime < animTime; startDeltaTime = nextTime) {
+        nextTime = startDeltaTime + level.frametime;
+        if (nextTime >= animTime - 0.01f) {
+            nextTime = animTime;
+        }
+
+        gi.Anim_DeltaOverTime(edict->tiki, anim, startDeltaTime, nextTime, vRelDelta);
+        MatrixTransformVector(vRelDelta, orientation, vAbsDelta);
+
+        VectorAdd(mm.origin, vAbsDelta, mm.origin);
+        VectorCopy(mm.origin, pos[currentPos]);
+
+        currentPos++;
+        if (currentPos >= ARRAY_LEN(pos)) {
+            return false;
+        }
+    }
+
+    loop = currentPos;
+
+    mm.desired_speed = 0;
+    mm.groundPlane = qfalse;
+    mm.walking = false;
+    VectorSet(mm.velocity, 0, 0, -171);
+
+    do {
+        MmoveSingle(&mm);
+        VectorCopy(mm.origin, pos[currentPos]);
+
+        currentPos++;
+        if (currentPos >= ARRAY_LEN(pos)) {
+            return false;
+        }
+
+        if (mm.hit_obstacle) {
+            return false;
+        }
+    } while (!mm.groundPlane);
+
+    if (origin[2] - pos[currentPos - 1][2] < m_fBalconyHeight) {
+        return false;
+    }
+
+    m_pFallPath = (FallPath*)gi.Malloc(sizeof(FallPath) + sizeof(FallPath::pos) * (currentPos - 1));
+    m_pFallPath->length = currentPos;
+    m_pFallPath->currentPos = 0;
+    m_pFallPath->startTime = startTime;
+    m_pFallPath->loop = loop;
+
+    for (i = 0; i < currentPos; i++) {
+        VectorCopy(pos[i], m_pFallPath->pos[i]);
+    }
+
+    return true;
 }
 
-void Actor::End_BalconyKilled
-	(
-	void
-	)
+void Actor::Begin_BalconyKilled(void)
 {
-	if( m_pFallPath )
-	{
-		gi.Free(m_pFallPath);
-		m_pFallPath = NULL;
-	}
+    ClearPath();
+    ResetBoneControllers();
+
+    PostEvent(EV_Actor_DeathEmbalm, 0.05f);
+
+    if (CalcFallPath()) {
+        TransitionState(ACTOR_STATE_BALCONY_KILLED_BEGIN, 0);
+    } else {
+        TransitionState(ACTOR_STATE_BALCONY_KILLED_NORMAL, 0);
+    }
 }
 
-void Actor::Think_BalconyKilled
-	(
-	void
-	)
+void Actor::End_BalconyKilled(void)
 {
-	int animnum;
-
-	Unregister( STRING_ANIMDONE );
-
-	if( m_State == 805 )
-	{
-		m_pszDebugState = "end";
-	}
-	else
-	{
-		NoPoint();
-		m_bHasDesiredLookAngles = false;
-		StopTurning();
-
-		switch( m_State )
-		{
-		case 800:
-			m_bNextForceStart = true;
-			m_eNextAnimMode = 7;
-			m_pszDebugState = "begin";
-			m_csNextAnimString = STRING_ANIM_NO_KILLED_SCR;
-
-			animnum = gi.Anim_NumForName(edict->tiki, "death_balcony_intro");
-
-			ChangeMotionAnim();
-
-			m_bMotionAnimSet = true;
-			m_iMotionSlot = GetMotionSlot(0);
-			m_weightType[m_iMotionSlot] = 1;
-			m_weightCrossBlend[m_iMotionSlot] = 0.0;
-			m_weightBase[m_iMotionSlot] = 1.0;
-
-			NewAnim( animnum, m_iMotionSlot );
-			SetTime( m_iMotionSlot, m_pFallPath->startTime );
-			UpdateNormalAnimSlot( m_iMotionSlot );
-			TransitionState(801, 0);
-			break;
-		case 801:
-			m_bNextForceStart = false;
-			m_pszDebugState = "intro";
-			m_eNextAnimMode = 7;
-			m_csNextAnimString = STRING_ANIM_NO_KILLED_SCR;
-			break;
-		case 802:
-			m_pszDebugState = "loop";
-			Anim_FullBody( STRING_DEATH_BALCONY_LOOP, 7 );
-			break;
-		case 803:
-			TransitionState(804, 0);
-			StopAllAnimating();
-		case 804:
-			m_pszDebugState = "outtro";
-			Anim_FullBody( STRING_DEATH_BALCONY_OUTTRO, 1 );
-			break;
-		case 806:
-			m_pszDebugState = "normal";
-			Anim_Killed();
-			break;
-		default:
-			Com_Printf( "Actor::Think_BalconyKilled: invalid think state %i\n", m_State );
-			assert( 0 );
-		}
-
-		PostThink( false );
-
-		if( m_State >= 800 )
-		{
-			if( m_State == 801 )
-			{
-				if( m_pFallPath->currentPos >= m_pFallPath->length )
-				{
-					TransitionState(803, 0);
-				}
-				else if (m_pFallPath->currentPos >= m_pFallPath->loop)
-				{
-					TransitionState(802, 0);
-				}
-			}
-			else if( m_State == 802 )
-			{
-				if (m_pFallPath->currentPos >= m_pFallPath->length)
-				{
-					TransitionState(803, 0);
-				}
-			}
-		}
-	}
+    if (m_pFallPath) {
+        gi.Free(m_pFallPath);
+        m_pFallPath = NULL;
+    }
 }
 
-void Actor::FinishedAnimation_BalconyKilled
-	(
-	void
-	)
+void Actor::Think_BalconyKilled(void)
 {
-	if( m_State == 804 || m_State == 806 )
-	{
-		BecomeCorpse();
-		TransitionState(805, 0);
-	}
-	else if( m_State == 801 )
-	{
-		TransitionState(802, 0);
-		StopAllAnimating();
-	}
+    int animnum;
+
+    Unregister(STRING_ANIMDONE);
+
+    if (m_State == ACTOR_STATE_BALCONY_KILLED_END) {
+        m_pszDebugState = "";
+        return;
+    }
+
+    NoPoint();
+    ForwardLook();
+
+    switch (m_State) {
+    case ACTOR_STATE_BALCONY_KILLED_BEGIN:
+        m_bNextForceStart = true;
+        m_eNextAnimMode = ANIM_MODE_FALLING_PATH;
+        m_pszDebugState = "begin";
+        m_csNextAnimString = STRING_ANIM_NO_KILLED_SCR;
+
+        animnum = gi.Anim_NumForName(edict->tiki, "death_balcony_intro");
+
+        ChangeMotionAnim();
+
+        m_bMotionAnimSet = true;
+        m_iMotionSlot = GetMotionSlot(0);
+        m_weightType[m_iMotionSlot] = ANIM_WEIGHT_MOTION;
+        m_weightCrossBlend[m_iMotionSlot] = 0.0;
+        m_weightBase[m_iMotionSlot] = 1.0;
+
+        NewAnim(animnum, m_iMotionSlot);
+        SetTime(m_iMotionSlot, m_pFallPath->startTime);
+        UpdateNormalAnimSlot(m_iMotionSlot);
+        TransitionState(ACTOR_STATE_BALCONY_KILLED_INTRO, 0);
+        break;
+    case ACTOR_STATE_BALCONY_KILLED_INTRO:
+        m_bNextForceStart = false;
+        m_pszDebugState = "intro";
+        m_eNextAnimMode = ANIM_MODE_FALLING_PATH;
+        m_csNextAnimString = STRING_ANIM_NO_KILLED_SCR;
+        break;
+    case ACTOR_STATE_BALCONY_KILLED_LOOP:
+        m_pszDebugState = "loop";
+        Anim_FullBody(STRING_DEATH_BALCONY_LOOP, 7);
+        break;
+    case ACTOR_STATE_BALCONY_KILLED_LOOP_END:
+        TransitionState(804, 0);
+        StopAllAnimating();
+    case ACTOR_STATE_BALCONY_KILLED_OUTTRO:
+        m_pszDebugState = "outtro";
+        Anim_FullBody(STRING_DEATH_BALCONY_OUTTRO, 1);
+        break;
+    case ACTOR_STATE_BALCONY_KILLED_NORMAL:
+        m_pszDebugState = "normal";
+        Anim_Killed();
+        break;
+    default:
+        Com_Printf("Actor::Think_BalconyKilled: invalid think state %i\n", m_State);
+        assert(0);
+    }
+
+    PostThink(false);
+
+    if (m_State >= ACTOR_STATE_BALCONY_KILLED_BEGIN) {
+        if (m_State == ACTOR_STATE_BALCONY_KILLED_INTRO) {
+            if (m_pFallPath->currentPos >= m_pFallPath->length) {
+                TransitionState(ACTOR_STATE_BALCONY_KILLED_LOOP_END, 0);
+            }
+            else if (m_pFallPath->currentPos >= m_pFallPath->loop) {
+                TransitionState(ACTOR_STATE_BALCONY_KILLED_LOOP, 0);
+            }
+        } else if (m_State == ACTOR_STATE_BALCONY_KILLED_LOOP) {
+            if (m_pFallPath->currentPos >= m_pFallPath->length) {
+                TransitionState(ACTOR_STATE_BALCONY_KILLED_LOOP_END, 0);
+            }
+        }
+    }
+}
+
+void Actor::FinishedAnimation_BalconyKilled(void)
+{
+    switch (m_State) {
+    case ACTOR_STATE_BALCONY_KILLED_OUTTRO:
+    case ACTOR_STATE_BALCONY_KILLED_NORMAL:
+        BecomeCorpse();
+        TransitionState(ACTOR_STATE_BALCONY_KILLED_END, 0);
+        break;
+    case ACTOR_STATE_BALCONY_KILLED_INTRO:
+        TransitionState(ACTOR_STATE_BALCONY_KILLED_LOOP, 0);
+        StopAllAnimating();
+        break;
+    }
 }
diff --git a/code/fgame/actor_cover.cpp b/code/fgame/actor_cover.cpp
index 011ddf7d..8350849b 100644
--- a/code/fgame/actor_cover.cpp
+++ b/code/fgame/actor_cover.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,915 +24,709 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitCover
-	(
-	GlobalFuncs_t *func
-	)
-{
-	func->ThinkState					= &Actor::Think_Cover;
-	func->BeginState					= &Actor::Begin_Cover;
-	func->EndState						= &Actor::End_Cover;
-	func->SuspendState					= &Actor::Suspend_Cover;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Cover;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->IsState						= &Actor::IsAttackState;
-	func->PathnodeClaimRevoked			= &Actor::PathnodeClaimRevoked_Cover;
-}
-
-void Actor::Begin_Cover
-	(
-	void
-	)
-{
-	DoForceActivate();
-	m_csIdleMood = STRING_NERVOUS;
-	m_csMood = STRING_ALERT;
-
-	if( m_pCoverNode )
-	{
-		TransitionState(302, 0);
-		return;
-	}
-
-	TransitionState(300, 0);
-
-	if( level.inttime < m_iEnemyChangeTime + 200 )
-	{
-		SetLeashHome( origin );
-
-		if( AttackEntryAnimation() )
-		{
-			m_bLockThinkState = true;
-			TransitionState(312, 0);
-		}
-	}
-}
-
-void Actor::End_Cover
-	(
-	void
-	)
-{
-	m_pszDebugState = "";
-
-	if( m_pCoverNode )
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode = NULL;
-	}
-
-	TransitionState(-1, 0);
-}
-
-void Actor::Suspend_Cover
-	(
-	void
-	)
-{
-	if( m_pCoverNode )
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode->MarkTemporarilyBad();
-		m_pCoverNode = NULL;
-	}
-
-	TransitionState(301, 0);
-}
-
-void Actor::State_Cover_NewEnemy
-	(
-	void
-	)
-{
-	m_bHasDesiredLookAngles = true;
-
-	Cover_FindCover( true );
-
-	if( m_pCoverNode && PathExists() && PathComplete() )
-	{
-		Anim_RunToCover( 3 );
-		TransitionState(302, 0);
-	}
-	else
-	{
-		Anim_Aim();
-		AimAtTargetPos();
-		TransitionState(307, 0);
-	}
-}
-
-void Actor::State_Cover_FindCover
-	(
-	void
-	)
-{
-	Anim_Aim();
-	AimAtTargetPos();
-	Cover_FindCover( false );
-
-	if( m_pCoverNode )
-	{
-		if( PathExists() && !PathComplete() )
-		{
-			Anim_RunToCover(3);
-			TransitionState(302, 0);
-		}
-		else
-		{
-			TransitionState(307, 0);
-		}
-	}
-	else
-	{
-		if( !m_iPotentialCoverCount )
-		{
-			SetThink( THINKSTATE_ATTACK, THINK_TURRET );
-		}
-	}
-}
-
-void Actor::State_Cover_TakeCover
-	(
-	void
-	)
-{
-	if( PathExists() && !PathComplete() )
-	{
-		FaceEnemyOrMotion( level.inttime - m_iStateTime );
-		Anim_RunToCover( 3 );
-		m_csPathGoalEndAnimScript = m_bInReload ? STRING_ANIM_RUNTO_COVER_SCR : STRING_ANIM_IDLE_SCR;
-	}
-	else
-	{
-		ClearPath();
-		m_eAnimMode = 1;
-		TransitionState(303, 0);
-		State_Cover_FinishReloading();
-	}
-}
-
 static int Cover_HideTime(int iTeam)
 {
-	if (iTeam == TEAM_AMERICAN)
-	{
-		return rand() % 2001 + 2000;
-	}
-	else
-	{
-		return rand() % 11001 + 4000;
-	}
+    if (iTeam == TEAM_AMERICAN) {
+        return rand() % 2001 + 2000;
+    } else {
+        return rand() % 11001 + 4000;
+    }
 }
 
-void Actor::State_Cover_FinishReloading
-	(
-	void
-	)
+bool Actor::Cover_IsValid(PathNode *node)
 {
-	if( m_bInReload )
-	{
-		ContinueAnimation();
-		AimAtTargetPos();
-		return;
-	}
+    Vector sight_origin = node->origin + eyeposition;
 
-	Weapon *pWeap = GetWeapon( 0 );
+    if (node->IsClaimedByOther(this)) {
+        return false;
+    }
 
-	if( !pWeap || pWeap->GetFireType( FIRE_PRIMARY ) == FT_PROJECTILE || pWeap->GetFireType( FIRE_PRIMARY ) == FT_SPECIAL_PROJECTILE )
-	{
-		if( m_pCoverNode->nodeflags & AI_DUCK )
-		{
-			Anim_Crouch();
-		}
-		else
-		{
-			Anim_Stand();
-		}
+    if (node->nodeflags & (AI_CONCEALMENT | AI_LOW_WALL_ARC)) {
+        return true;
+    }
 
-		m_sCurrentPathNodeIndex = -1;
+    if (!CanSeeFrom(sight_origin, m_Enemy)) {
+        return true;
+    }
 
-		TransitionState(308, Cover_HideTime(m_Team));
+    if (!(node->nodeflags & AI_DUCK)) {
+        return false;
+    }
 
-		Anim_Aim();
-		AimAtTargetPos();
-		return;
-	}
+    if (CanSee(sight_origin - Vector(0, 0, 32), 0, 0, false)) {
+        return false;
+    }
 
-	SetDesiredYaw(angles[1]);
-	
-	SafeSetOrigin( origin );
-	m_eNextAnimMode = 1;
-	m_bNextForceStart = false;
-	m_csNextAnimString = m_csSpecialAttack;
-	TransitionState(304, 0);
+    return true;
 }
 
-void Actor::State_Cover_Target
-	(
-	void
-	)
+bool Actor::Cover_SetPath(PathNode *node)
 {
-	DontFaceWall();
+    float     origin_ratio;
+    Vector    enemy_offset;
+    PathInfo *current_node;
+    Vector    enemy_origin;
+    vec2_t    vDelta;
+    float     fMinDistSquared;
+    float     fPathDist;
 
-	if( m_eDontFaceWallMode <= 8 )
-	{
-		TransitionState(305, 0);
-		State_Cover_FindEnemy();
-		return;
-	}
+    SetPathWithLeash(node, NULL, 0);
 
-	Anim_Aim();
-	AimAtTargetPos();
+    if (!PathExists()) {
+        return false;
+    }
 
-	if( level.inttime > m_iStateTime + 300 && fabs( m_DesiredYaw - angles[ 1 ] ) < 0.001f )
-	{
-		Vector end = m_vLastEnemyPos + velocity;
-		if( DecideToThrowGrenade( end, &m_vGrenadeVel, &m_eGrenadeMode ) )
-		{
-			SetDesiredYawDir(m_vGrenadeVel);
-			m_eNextAnimMode = 1;
-			m_bNextForceStart = false;
-			m_csNextAnimString = m_eGrenadeMode == AI_GREN_TOSS_ROLL ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR;
-			TransitionState(310, 0);
-		}
-		else if( CanSeeEnemy( 500 ) && CanShootEnemy( 500 ) )
-		{
-			TransitionState(309, 0);
-		}
-		else
-		{
-			TransitionState(308, Cover_HideTime(m_Team));
+    fPathDist       = PathDist();
+    fMinDistSquared = Square(fPathDist);
 
-		}
-	}
+    if ((node->origin - origin).lengthSquared() * 4 <= fMinDistSquared && fPathDist > 128.0f) {
+        return false;
+    }
+
+    if (PathComplete()) {
+        return true;
+    }
+
+    enemy_origin = m_Enemy->origin;
+    VectorSub2D(enemy_origin, origin, vDelta);
+
+    origin_ratio = VectorLength2DSquared(vDelta) * 0.64f;
+    if (origin_ratio > Square(192)) {
+        origin_ratio = Square(192);
+    }
+
+    for (current_node = CurrentPathNode() - 1; current_node >= LastPathNode(); current_node--) {
+        VectorSub2D(enemy_origin, current_node->point, enemy_offset);
+
+        if (VectorLength2DSquared(enemy_offset) <= origin_ratio) {
+            return false;
+        }
+
+        if (DotProduct2D(enemy_offset, current_node->dir) >= 0) {
+            continue;
+        }
+
+        if (DotProduct2D(enemy_offset, current_node->dir) < -current_node->dist) {
+            continue;
+        }
+
+        if (Square(CrossProduct2D(enemy_offset, current_node->dir)) <= origin_ratio) {
+            return false;
+        }
+    }
+
+    return PathAvoidsSquadMates() != false;
 }
 
-void Actor::State_Cover_Hide
-(
-	void
-)
+void Actor::Cover_FindCover(bool bCheckAll)
 {
-	if (m_Enemy)
-	{
-		SetEnemyPos(origin);
-	}
+    if (m_pCoverNode) {
+        if (Cover_IsValid(m_pCoverNode) && Cover_SetPath(m_pCoverNode)) {
+            return;
+        }
 
-	if (!m_pCoverNode)
-	{
-		TransitionState(301, 0);
-		State_Cover_FindCover();
-		return;
-	}
+        m_pCoverNode->Relinquish();
+        m_pCoverNode = NULL;
+    }
 
-	m_csSpecialAttack = m_pCoverNode->GetSpecialAttack(this);
-	MPrintf("special: %d", m_csSpecialAttack);
+    if (!m_iPotentialCoverCount) {
+        m_iPotentialCoverCount =
+            PathManager.FindPotentialCover(this, origin, m_Enemy, m_pPotentialCoverNode, MAX_COVER_NODES);
+    }
 
-	if (m_csSpecialAttack)
-	{
-		SetDesiredYaw(m_pCoverNode->angles[1]);
-		SafeSetOrigin(m_pCoverNode->origin);
-		m_eNextAnimMode = 1;
-		m_bNextForceStart = false;
-		m_csNextAnimString = m_csSpecialAttack;
-		TransitionState(304, 0);
-		return;
-	}
+    if (!m_iPotentialCoverCount) {
+        return;
+    }
 
-	bool bCanShoot = CanShootEnemy(500);
-	if (CanSeeEnemy(500))
-	{
-		if (bCanShoot)
-		{
-			Vector vDelta = m_Enemy->origin - origin;
+    PathNode *pNode;
 
-			if (VectorLength2DSquared(vDelta) * 0.75f <= Square(DotProduct2D(vDelta, orientation[0])))
-			{
-				TransitionState(307, 0);
-			}
-			else
-			{
-				TransitionState(309, 0);
-				State_Cover_Shoot();
-			}
-			return;
-		}
+    while (m_iPotentialCoverCount) {
+        m_iPotentialCoverCount--;
+        pNode                                         = m_pPotentialCoverNode[m_iPotentialCoverCount];
+        m_pPotentialCoverNode[m_iPotentialCoverCount] = NULL;
 
+        if (Cover_IsValid(pNode) && Cover_SetPath(pNode)) {
+            break;
+        }
 
-		m_pCoverNode->Relinquish();
-		m_pCoverNode->MarkTemporarilyBad();
-		m_pCoverNode = NULL;
-		TransitionState(305, 0);
-		State_Cover_FindEnemy();
-		return;
-	}
-
-	if (bCanShoot)
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode->MarkTemporarilyBad();
-		m_pCoverNode = NULL;
-		TransitionState(305, 0);
-		State_Cover_FindEnemy();
-		return;
-	}
-
-	if (m_Team == TEAM_AMERICAN)
-	{
-		if (level.inttime >= m_iLastFaceDecideTime + 1000)
-		{
-			m_iLastFaceDecideTime = level.inttime;
-			PathNode *node = PathManager.FindCornerNodeForExactPath(this, m_Enemy, m_fLeash + m_fMaxDistance);
-
-			if (!node)
-			{
-				m_bHasDesiredLookAngles = false;
-				Anim_Stand();
-				m_PotentialEnemies.FlagBadEnemy(m_Enemy);
-				UpdateEnemy(-1);
-				return;
-			}
-
-			Vector vDelta = node->m_PathPos - origin;
-
-			if (vDelta[0] || vDelta[1])
-			{
-				SetDesiredYawDir(vDelta);
-			}
-		}
-
-		Anim_Aim();
-	}
-	else
-	{
-		if (level.inttime >= m_iLastFaceDecideTime + 1000)
-		{
-			m_iLastFaceDecideTime = level.inttime;
-			Vector eyepos = EyePosition();
-			Vector end = m_vLastEnemyPos + eyeposition;
-			trace_t trace = G_Trace(
-				eyepos,
-				vec_zero,
-				vec_zero,
-				end,
-				this,
-				(CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA),
-				false,
-				"State_Cover");
-
-			PathNode *node = PathManager.FindCornerNodeForWall(origin, m_vLastEnemyPos, this, 0.0f, trace.plane.normal);
-
-			if (node)
-			{
-				Vector vDelta = node->m_PathPos - origin;
-
-				if (vDelta[0] || vDelta[1])
-				{
-					SetDesiredYawDir(vDelta);
-				}
-
-				m_eDontFaceWallMode = 6;
-			}
-			else
-			{
-				AimAtTargetPos();
-				DontFaceWall();
-			}
-		}
-
-		if (m_eDontFaceWallMode <= 8)
-		{
-			Anim_Stand();
-		}
-		else
-		{
-			Anim_Aim();
-		}
-	}
-
-	if (level.inttime <= m_iStateTime)
-		return;
-
-	PathNode *pNode = (PathNode *)G_FindRandomSimpleTarget(m_pCoverNode->target);
-
-	m_pCoverNode->Relinquish();
-	m_pCoverNode = NULL;
-
-	if (!pNode)
-	{
-		Anim_Stand();
-		TransitionState(305, rand() & 0x7FF);
-		return;
-	}
-
-	assert(pNode->IsSubclassOfPathNode());
-	if (pNode->IsSubclassOfPathNode())
-	{
-		if (!pNode->IsClaimedByOther(this))
-		{
-			SetPath(pNode, "Actor::State_Cover_Target", 0);
-
-			if (PathExists())
-			{
-				m_pCoverNode = pNode;
-				pNode->Claim(this);
-				Anim_RunToDanger(3);
-				TransitionState(306, 0);
-			}
-		}
-	}
+        if (!bCheckAll || !m_iPotentialCoverCount) {
+            return;
+        }
+    }
 
+    m_pCoverNode = pNode;
+    m_pCoverNode->Claim(this);
+    memset(m_pPotentialCoverNode, 0, sizeof(m_pPotentialCoverNode));
+    m_iPotentialCoverCount = 0;
 }
 
-void Actor::State_Cover_Shoot
-(
-	void
-)
+void Actor::InitCover(GlobalFuncs_t *func)
 {
-	if (m_bNeedReload)
-	{
-		Cover_FindCover(true);
-
-		if (m_pCoverNode)
-		{
-			Anim_RunToCover(3);
-			FaceEnemyOrMotion(0);
-			TransitionState(302, 0);
-			return;
-		}
-	}
-
-	Anim_Shoot();
-	AimAtTargetPos();
-
-	if (level.inttime > m_iStateTime + 10000)
-	{
-		gi.cvar_set("g_monitornum", va("%i", entnum));
-		assert(!"anim/shoot.scr took over 10 seconds");
-		Com_Error(ERR_DROP, "anim/shoot.scr took over 10 seconds, entnum = %i, targetname = %s", entnum, targetname.c_str());
-	}
+    func->ThinkState                 = &Actor::Think_Cover;
+    func->BeginState                 = &Actor::Begin_Cover;
+    func->EndState                   = &Actor::End_Cover;
+    func->SuspendState               = &Actor::Suspend_Cover;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Cover;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->IsState                    = &Actor::IsAttackState;
+    func->PathnodeClaimRevoked       = &Actor::PathnodeClaimRevoked_Cover;
 }
 
-void Actor::State_Cover_Grenade
-	(
-	void
-	)
+void Actor::Begin_Cover(void)
 {
-	GenericGrenadeTossThink();
+    DoForceActivate();
+    m_csIdleMood = STRING_NERVOUS;
+    m_csMood     = STRING_ALERT;
+
+    if (m_pCoverNode) {
+        TransitionState(ACTOR_STATE_COVER_TAKE_COVER, 0);
+        return;
+    }
+
+    TransitionState(ACTOR_STATE_COVER_NEW_ENEMY, 0);
+
+    if (level.inttime < m_iEnemyChangeTime + 200) {
+        SetLeashHome(origin);
+
+        if (AttackEntryAnimation()) {
+            m_bLockThinkState = true;
+            TransitionState(ACTOR_STATE_COVER_LOOP, 0);
+        }
+    }
 }
 
-void Actor::State_Cover_SpecialAttack
-	(
-	void
-	)
+void Actor::End_Cover(void)
 {
-	m_bHasDesiredLookAngles = false;
+    m_pszDebugState = "";
 
-	assert( m_pCoverNode );
-	if( !m_pCoverNode )
-	{
-		TransitionState(305, 0);
-		State_Cover_FindEnemy();
-		return;
-	}
+    if (m_pCoverNode) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode = NULL;
+    }
 
-	if( mbBreakSpecialAttack )
-	{
-		if( m_pCoverNode )
-		{
-			m_pCoverNode->Relinquish();
-			m_pCoverNode = NULL;
-		}
-
-		TransitionState(305, 0);
-		State_Cover_FindEnemy();
-		return;
-	}
-
-	if( level.inttime >= m_iLastEnemyPosChangeTime + level.intframetime || !m_csSpecialAttack )
-	{
-		m_csSpecialAttack = m_pCoverNode->GetSpecialAttack( this );
-
-		if( !m_csSpecialAttack )
-		{
-			TransitionState(305, 0);
-			State_Cover_FindEnemy();
-			return;
-		}
-	}
-
-	SetDesiredYaw(angles[1]);
-
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = m_csSpecialAttack;
-	m_bNextForceStart = false;
+    TransitionState(-1, 0);
 }
 
-void Actor::State_Cover_FindEnemy
-	(
-	void
-	)
+void Actor::Suspend_Cover(void)
 {
-	if( m_Team == TEAM_AMERICAN )
-	{
-		m_bHasDesiredLookAngles = false;
+    if (m_pCoverNode) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode->MarkTemporarilyBad();
+        m_pCoverNode = NULL;
+    }
 
-__setpath:
-		Anim_Stand();
-		SetPathWithLeash( m_vLastEnemyPos, NULL, 0 );
-		ShortenPathToAvoidSquadMates();
-		if( PathExists() && !PathComplete() && PathAvoidsSquadMates() )
-		{
-			TransitionState(311, 0);
-		}
-		else
-		{
-			m_bTurretNoInitialCover = true;
-			SetThink( THINKSTATE_ATTACK, THINK_TURRET );
-		}
-
-		return;
-	}
-
-	AimAtTargetPos();
-	Anim_Aim();
-	DontFaceWall();
-
-	if( CanSeeEnemy( 200 ) )
-	{
-		if( m_eDontFaceWallMode > 8 )
-		{
-			TransitionState(307, 0);
-		}
-
-		goto __setpath;
-	}
-
-	if( m_eDontFaceWallMode <= 8 || level.inttime > m_iStateTime + 500 )
-	{
-		goto __setpath;
-	}
+    TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
 }
 
-void Actor::State_Cover_SearchNode
-	(
-	void
-	)
+void Actor::State_Cover_NewEnemy(void)
 {
-	m_bHasDesiredLookAngles = false;
+    ForwardLook();
+    Cover_FindCover(true);
 
-	if( CanSeeEnemy( 200 ) )
-	{
-		Anim_Aim();
-		AimAtTargetPos();
-		TransitionState(307, 0);
-		return;
-	}
-
-	if( PathExists() && !PathComplete() )
-	{
-		FaceEnemyOrMotion( level.inttime - m_iStateTime );
-		Anim_RunToDanger( 3 );
-	}
-	else
-	{
-		Anim_Aim();
-		AimAtTargetPos();
-
-		if( level.inttime > m_iStateTime + 3000 )
-		{
-			TransitionState(301, 0);
-		}
-	}
+    if (m_pCoverNode && PathExists() && !PathComplete()) {
+        Anim_RunToCover(ANIM_MODE_PATH_GOAL);
+        TransitionState(ACTOR_STATE_COVER_TAKE_COVER, 0);
+    } else {
+        Anim_Aim();
+        AimAtTargetPos();
+        TransitionState(ACTOR_STATE_COVER_TARGET, 0);
+    }
 }
 
-void Actor::State_Cover_HuntEnemy
-	(
-	void
-	)
+void Actor::State_Cover_FindCover(void)
 {
-	FaceEnemyOrMotion( level.inttime - m_iStateTime );
-	MovePathWithLeash();
+    Anim_Aim();
+    AimAtTargetPos();
+    Cover_FindCover(false);
 
-	if( PathExists() && !PathComplete() )
-	{
-		if( CanSeeEnemy( 300 ) )
-		{
-			TransitionState(307, 0);
-		}
-	}
-	else
-	{
-		TransitionState(305, rand() & 0x7FF);
-
-		if( m_pCoverNode )
-		{
-			m_pCoverNode->Relinquish();
-			m_pCoverNode = NULL;
-		}
-	}
+    if (m_pCoverNode) {
+        if (PathExists() && !PathComplete()) {
+            Anim_RunToCover(ANIM_MODE_PATH_GOAL);
+            TransitionState(ACTOR_STATE_COVER_TAKE_COVER, 0);
+        } else {
+            TransitionState(ACTOR_STATE_COVER_TARGET, 0);
+        }
+    } else if (!m_iPotentialCoverCount) {
+        SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    }
 }
 
-void Actor::State_Cover_FakeEnemy
-	(
-	void
-	)
+void Actor::State_Cover_TakeCover(void)
 {
-	AimAtTargetPos();
-	Anim_Aim();
-
-	if( level.inttime >= m_iStateTime )
-	{
-		SetThinkState( THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+    if (PathExists() && !PathComplete()) {
+        FaceEnemyOrMotion(level.inttime - m_iStateTime);
+        Anim_RunToCover(ANIM_MODE_PATH_GOAL);
+        SetPathGoalEndAnim(m_bInReload ? STRING_ANIM_RUNTO_COVER_SCR : STRING_ANIM_IDLE_SCR);
+    } else {
+        ClearPath();
+        m_eAnimMode = ANIM_MODE_NORMAL;
+        TransitionState(ACTOR_STATE_COVER_FINISH_RELOADING, 0);
+        State_Cover_FinishReloading();
+    }
 }
 
-void Actor::Think_Cover
-	(
-	void
-	)
+void Actor::State_Cover_FinishReloading(void)
 {
-	if( !RequireThink() )
-	{
-		return;
-	}
+    Weapon    *pWeapon;
+    firetype_t eFireType;
 
-	UpdateEyeOrigin();
-	NoPoint();
-	UpdateEnemy( 500 );
+    if (m_bInReload) {
+        ContinueAnimation();
+        AimAtTargetPos();
+        return;
+    }
 
-	if( m_State == 312 )
-	{
-		ContinueAnimation();
-	}
-	else
-	{
-		m_bLockThinkState = false;
-		if( m_Enemy )
-		{
-			if( m_State == 313 )
-			{
-				TransitionState(300, 0);
-			}
-		}
-		else
-		{
-			if( m_State != 313 )
-			{
-				TransitionState(313, (rand() & 0x7FF) + 1000);
-			}
-		}
+    pWeapon = GetWeapon(WEAPON_MAIN);
+    if (pWeapon) {
+        eFireType = pWeapon->GetFireType(FIRE_PRIMARY);
+    }
 
-		switch( m_State )
-		{
-		case 300:
-			m_pszDebugState = "NewEnemy";
-			State_Cover_NewEnemy();
-			break;
-		case 301:
-			m_pszDebugState = "FindCover";
-			State_Cover_FindCover();
-			break;
-		case 302:
-			m_pszDebugState = "TakeCover";
-			State_Cover_TakeCover();
-			break;
-		case 303:
-			m_pszDebugState = "FinishReloading";
-			State_Cover_FinishReloading();
-			break;
-		case 304:
-			m_pszDebugState = "SpecialAttack";
-			State_Cover_SpecialAttack();
-			break;
-		case 305:
-			m_pszDebugState = "FindEnemy";
-			State_Cover_FindEnemy();
-			break;
-		case 306:
-			m_pszDebugState = "SearchNode";
-			State_Cover_SearchNode();
-			break;
-		case 307:
-			m_pszDebugState = "Target";
-			State_Cover_Target();
-			break;
-		case 308:
-			m_pszDebugState = "Hide";
-			State_Cover_Hide();
-			break;
-		case 309:
-			m_pszDebugState = "Shoot";
-			State_Cover_Shoot();
-			break;
-		case 310:
-			m_pszDebugState = "Grenade";
-			State_Cover_Grenade();
-			break;
-		case 311:
-			m_pszDebugState = "HuntEnemy";
-			State_Cover_HuntEnemy();
-			break;
-		case 313:
-			m_pszDebugState = "FakeEnemy";
-			State_Cover_FakeEnemy();
-			break;
-		default:
-			Com_Printf( "Actor::Think_Cover: invalid think state %i\n", m_State );
-			assert( 0 );
-			break;
-		}
+    if (pWeapon && eFireType != FT_PROJECTILE && eFireType != FT_SPECIAL_PROJECTILE
+        && (m_csSpecialAttack = m_pCoverNode->GetSpecialAttack(this)) != 0) {
+        SetDesiredYaw(m_pCoverNode->angles.yaw());
+        SafeSetOrigin(m_pCoverNode->origin);
+        DesiredAnimation(ANIM_MODE_NORMAL, m_csSpecialAttack);
+        TransitionState(ACTOR_STATE_COVER_SPECIAL_ATTACK, 0);
+    } else {
+        if (m_pCoverNode->nodeflags & AI_DUCK) {
+            Anim_Crouch();
+        } else {
+            Anim_Stand();
+        }
 
-		CheckForTransition( THINKSTATE_GRENADE, THINKLEVEL_NORMAL );
-	}
+        TransitionState(ACTOR_STATE_COVER_HIDE, Cover_HideTime(m_Team));
 
-	if( m_State != 305 && m_State != 307 && m_State != 308 && m_State != 309 )
-	{
-		PostThink( true );
-	}
-	else
-	{
-		PostThink( false );
-	}
+        Anim_Aim();
+        AimAtTargetPos();
+    }
 }
 
-void Actor::FinishedAnimation_Cover
-	(
-	void
-	)
+void Actor::State_Cover_Target(void)
 {
-	if( m_State == 309 )
-	{
-		if( m_Enemy && !m_Enemy->IsDead() && CanSeeEnemy( 500 ) && CanShootEnemy( 500 ) )
-		{
-			TransitionState(309, 0);
-		}
-		else
-		{
-			TransitionState(301, 0);
-		}
-	}
-	else if( m_State == 310 || m_State == 312 )
-	{
-		TransitionState(301, 0);
-	}
+    DontFaceWall();
+
+    if (AvoidingFacingWall()) {
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, 0);
+        State_Cover_FindEnemy();
+        return;
+    }
+
+    Anim_Aim();
+    AimAtTargetPos();
+
+    if (level.inttime <= m_iStateTime + 300) {
+        return;
+    }
+
+    if (fabs(m_DesiredYaw - angles[1]) >= 0.001f) {
+        return;
+    }
+
+    if (DecideToThrowGrenade(m_vLastEnemyPos + velocity, &m_vGrenadeVel, &m_eGrenadeMode, false)) {
+        SetDesiredYawDir(m_vGrenadeVel);
+        DesiredAnimation(
+            ANIM_MODE_NORMAL,
+            m_eGrenadeMode == AI_GREN_TOSS_ROLL ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR
+        );
+        TransitionState(ACTOR_STATE_COVER_GRENADE);
+    } else if (CanSeeEnemy(500) && CanShootEnemy(500)) {
+        TransitionState(ACTOR_STATE_COVER_SHOOT, 0);
+    } else {
+        TransitionState(ACTOR_STATE_COVER_HIDE, Cover_HideTime(m_Team));
+    }
 }
 
-void Actor::PathnodeClaimRevoked_Cover
-	(
-	void
-	)
+void Actor::State_Cover_Hide(void)
 {
-	TransitionState(301, 0);
+    PathNode *pNode;
+    trace_t   trace;
+    bool      bCanShoot, bCanSee;
+
+    if (m_Enemy) {
+        SetEnemyPos(m_Enemy->origin);
+    }
+
+    if (!m_pCoverNode) {
+        TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
+        State_Cover_FindCover();
+        return;
+    }
+
+    m_csSpecialAttack = m_pCoverNode->GetSpecialAttack(this);
+    MPrintf("special: %d", m_csSpecialAttack);
+
+    if (m_csSpecialAttack) {
+        SetDesiredYaw(m_pCoverNode->angles.yaw());
+        SafeSetOrigin(m_pCoverNode->origin);
+        DesiredAnimation(ANIM_MODE_NORMAL, m_csSpecialAttack);
+        TransitionState(ACTOR_STATE_COVER_SPECIAL_ATTACK, 0);
+        return;
+    }
+
+    bCanSee   = CanSeeEnemy(500);
+    bCanShoot = CanShootEnemy(500);
+
+    if (bCanSee && bCanShoot) {
+        vec2_t vDelta;
+
+        VectorSub2D(m_Enemy->origin, origin, vDelta);
+        if (VectorLength2DSquared(vDelta) * 0.75f > Square(DotProduct2D(vDelta, orientation[0]))) {
+            TransitionState(ACTOR_STATE_COVER_SHOOT);
+        } else {
+            TransitionState(ACTOR_STATE_COVER_TARGET);
+        }
+
+        State_Cover_Shoot();
+        return;
+    }
+
+    if (bCanSee || bCanShoot) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode->MarkTemporarilyBad();
+        m_pCoverNode = NULL;
+
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY);
+        State_Cover_FindEnemy();
+        return;
+    }
+
+    if (m_Team == TEAM_AMERICAN) {
+        if (level.inttime >= m_iLastFaceDecideTime + 1000) {
+            m_iLastFaceDecideTime = level.inttime;
+            pNode                 = PathManager.FindCornerNodeForExactPath(this, m_Enemy, m_fLeash + m_fMaxDistance);
+
+            if (!pNode) {
+                ForwardLook();
+                Anim_Stand();
+                m_PotentialEnemies.FlagBadEnemy(m_Enemy);
+                UpdateEnemy(-1);
+                return;
+            }
+
+            SetDesiredYawDest(pNode->m_PathPos);
+        }
+
+        Anim_Aim();
+    } else {
+        if (level.inttime >= m_iLastFaceDecideTime + 1000) {
+            m_iLastFaceDecideTime = level.inttime;
+
+            trace = G_Trace(
+                EyePosition(), vec_zero, vec_zero, m_vLastEnemyPos + eyeposition, this, MASK_LOOK, false, "State_Cover"
+            );
+
+            pNode = PathManager.FindCornerNodeForWall(origin, m_vLastEnemyPos, this, 0.0f, trace.plane.normal);
+
+            if (pNode) {
+                SetDesiredYawDest(pNode->m_PathPos);
+                m_eDontFaceWallMode = 6;
+            } else {
+                AimAtTargetPos();
+                DontFaceWall();
+            }
+        }
+
+        if (m_eDontFaceWallMode == 7 || m_eDontFaceWallMode == 8) {
+            Anim_Stand();
+        } else {
+            Anim_Aim();
+        }
+    }
+
+    if (level.inttime <= m_iStateTime) {
+        return;
+    }
+
+    pNode = (PathNode *)G_FindRandomSimpleTarget(m_pCoverNode->Target());
+
+    m_pCoverNode->Relinquish();
+    m_pCoverNode = NULL;
+
+    if (!pNode) {
+        Anim_Stand();
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, rand() & 0x7FF);
+        return;
+    }
+
+    assert(pNode->IsSubclassOfPathNode());
+
+    if (pNode->IsSubclassOfPathNode() && !pNode->IsClaimedByOther(this)) {
+        SetPath(pNode, "Actor::State_Cover_Target", 0);
+
+        if (PathExists()) {
+            m_pCoverNode = pNode;
+            pNode->Claim(this);
+            Anim_RunToDanger(ANIM_MODE_PATH_GOAL);
+            TransitionState(ACTOR_STATE_COVER_SEARCH_NODE, 0);
+        }
+    }
 }
 
-bool Actor::Cover_IsValid
-	(
-	PathNode *node
-	)
+void Actor::State_Cover_Shoot(void)
 {
-	if( !node->IsClaimedByOther( this ) )
-	{
-		if( node->nodeflags & AI_CONCEALMENT )
-		{
-			return true;
-		}
-		else if( CanSeeFrom( origin + eyeposition, m_Enemy ) )
-		{
-			if( !( node->nodeflags & AI_DUCK ) )
-			{
-				return false;
-			}
-			else if( CanSeeFrom( origin + eyeposition - Vector( 0, 0, 32 ), m_Enemy ) )
-			{
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-		else
-		{
-			return true;
-		}
-	}
-	else
-	{
-		return false;
-	}
+    if (m_bNeedReload) {
+        Cover_FindCover(true);
+
+        if (m_pCoverNode) {
+            Anim_RunToCover(ANIM_MODE_PATH_GOAL);
+            FaceEnemyOrMotion(0);
+            TransitionState(ACTOR_STATE_COVER_TAKE_COVER, 0);
+            return;
+        }
+    }
+
+    Anim_Shoot();
+    AimAtTargetPos();
+
+    // FIXME: debug build only?
+    if (level.inttime > m_iStateTime + 10000) {
+        gi.cvar_set("g_monitornum", va("%i", entnum));
+        assert(!"anim/shoot.scr took over 10 seconds");
+        Com_Error(
+            ERR_DROP, "anim/shoot.scr took over 10 seconds, entnum = %i, targetname = %s", entnum, TargetName().c_str()
+        );
+    }
 }
-bool Actor::Cover_SetPath
-	(
-	PathNode *node
-	)
+
+void Actor::State_Cover_Grenade(void)
 {
-	SetPathWithLeash( node, NULL, 0 );
-
-	if( !PathExists() )
-	{
-		return false;
-	}
-
-	float origin_ratio;
-	Vector enemy_offset;
-	PathInfo *current_node;
-	Vector enemy_origin;
-	Vector vDelta;
-	float fMinDistSquared;
-	float fPathDist;
-
-	fPathDist = PathDist();
-	fMinDistSquared = fPathDist * fPathDist;
-	vDelta = node->origin - origin;
-
-	if( fMinDistSquared >= vDelta.lengthSquared() * 4.0f )
-	{
-		if( fPathDist > 128.0f )
-		{
-			return false;
-		}
-	}
-
-	if( !PathComplete() )
-	{
-		enemy_origin = m_Enemy->origin;
-		vDelta = enemy_origin - origin;
-
-		if( VectorLength2DSquared( vDelta ) * 0.64f > 192 * 192 )
-		{
-			origin_ratio = 192 * 192;
-		}
-
-		for( current_node = CurrentPathNode() - 1; current_node >= LastPathNode(); current_node-- )
-		{
-			vDelta[ 0 ] = origin[ 0 ] - current_node->point[ 0 ];
-			vDelta[ 1 ] = origin[ 1 ] - current_node->point[ 1 ];
-
-			if( origin_ratio >= VectorLength2DSquared( vDelta ) )
-			{
-				return false;
-			}
-
-			float fDot = DotProduct2D( vDelta, current_node->dir );
-			if( fDot < 0.0f && -current_node->dist <= fDot )
-			{
-				if( ( vDelta[ 0 ] * current_node->dir[ 0 ] - vDelta[ 1 ] * current_node->dir[ 1 ] ) * ( vDelta[ 0 ] * current_node->dir[ 0 ] - vDelta[ 1 ] * current_node->dir[ 1 ] ) )
-				{
-					return false;
-				}
-			}
-		}
-	}
-
-	return true;
+    GenericGrenadeTossThink();
 }
 
-void Actor::Cover_FindCover
-	(
-	bool bCheckAll
-	)
+void Actor::State_Cover_SpecialAttack(void)
 {
+    ForwardLook();
 
-	if( m_pCoverNode )
-	{
-		if( Cover_IsValid( m_pCoverNode ) && Cover_SetPath( m_pCoverNode ) )
-		{
-			return;
-		}
+    assert(m_pCoverNode);
+    if (!m_pCoverNode) {
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, 0);
+        State_Cover_FindEnemy();
+        return;
+    }
 
-		m_pCoverNode->Relinquish();
-		m_pCoverNode = NULL;
-	}
+    if (mbBreakSpecialAttack) {
+        if (m_pCoverNode) {
+            m_pCoverNode->Relinquish();
+            m_pCoverNode = NULL;
+        }
 
-	if( !m_iPotentialCoverCount )
-	{
-		m_iPotentialCoverCount = PathManager.FindPotentialCover( this, origin, m_Enemy, m_pPotentialCoverNode, 16 );
-	}
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, 0);
+        State_Cover_FindEnemy();
+        return;
+    }
 
-	if( m_iPotentialCoverCount )
-	{
-		PathNode *pNode = NULL;
+    if (level.inttime >= m_iLastEnemyPosChangeTime + level.intframetime || !m_csSpecialAttack) {
+        m_csSpecialAttack = m_pCoverNode->GetSpecialAttack(this);
+    }
 
-		while( m_iPotentialCoverCount )
-		{
-			m_iPotentialCoverCount--;
-			pNode = m_pPotentialCoverNode[ m_iPotentialCoverCount ];
-			m_pPotentialCoverNode[ m_iPotentialCoverCount ] = NULL;
+    if (!m_csSpecialAttack) {
+        TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, 0);
+        State_Cover_FindEnemy();
+        return;
+    }
 
-			if( Cover_IsValid( pNode ) && Cover_SetPath( pNode ) )
-			{
-				break;
-			}
+    if (m_csSpecialAttack > STRING_ANIM_HIGHWALL_SCR || m_csSpecialAttack < STRING_ANIM_LOWWALL_SCR) {
+        SetDesiredYaw(m_pCoverNode->angles.yaw());
+    } else {
+        AimAtTargetPos();
+    }
 
-			if( !bCheckAll )
-			{
-				return;
-			}
-		}
-
-		m_pCoverNode = pNode;
-		m_pCoverNode->Claim( this );
-		memset( m_pPotentialCoverNode, 0, sizeof( m_pPotentialCoverNode ) );
-		m_iPotentialCoverCount = 0;
-	}
+    DesiredAnimation(ANIM_MODE_NORMAL, m_csSpecialAttack);
 }
 
+void Actor::State_Cover_FindEnemy(void)
+{
+    if (m_Team == TEAM_AMERICAN) {
+        ForwardLook();
+        Anim_Stand();
+    } else {
+        AimAtTargetPos();
+        Anim_Aim();
+        DontFaceWall();
+
+        if (CanSeeEnemy(200) && !AvoidingFacingWall()) {
+            TransitionState(ACTOR_STATE_COVER_TARGET);
+        } else if (!AvoidingFacingWall() && level.inttime <= m_iStateTime + 500) {
+            return;
+        }
+    }
+
+    SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
+    ShortenPathToAvoidSquadMates();
+
+    if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) {
+        TransitionState(ACTOR_STATE_COVER_HUNT_ENEMY);
+    } else {
+        m_bTurretNoInitialCover = true;
+        SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    }
+}
+
+void Actor::State_Cover_SearchNode(void)
+{
+    ForwardLook();
+
+    if (CanSeeEnemy(200)) {
+        Anim_Aim();
+        AimAtTargetPos();
+        TransitionState(ACTOR_STATE_COVER_TARGET, 0);
+        return;
+    }
+
+    if (PathExists() && !PathComplete()) {
+        FaceEnemyOrMotion(level.inttime - m_iStateTime);
+        Anim_RunToDanger(ANIM_MODE_PATH_GOAL);
+        return;
+    }
+
+    Anim_Aim();
+    AimAtTargetPos();
+
+    if (level.inttime > m_iStateTime + 3000) {
+        TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
+    }
+}
+
+void Actor::State_Cover_HuntEnemy(void)
+{
+    FaceEnemyOrMotion(level.inttime - m_iStateTime);
+    MovePathWithLeash();
+
+    if (PathExists() && !PathComplete()) {
+        if (CanSeeEnemy(300)) {
+            TransitionState(ACTOR_STATE_COVER_TARGET, 0);
+        }
+        return;
+    }
+
+    TransitionState(ACTOR_STATE_COVER_FIND_ENEMY, rand() & 0x7FF);
+
+    if (m_pCoverNode) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode = NULL;
+    }
+}
+
+void Actor::State_Cover_FakeEnemy(void)
+{
+    AimAtTargetPos();
+    Anim_Aim();
+
+    if (level.inttime >= m_iStateTime) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    }
+}
+
+void Actor::Think_Cover(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    UpdateEnemy(500);
+
+    if (m_State == ACTOR_STATE_COVER_LOOP) {
+        ContinueAnimation();
+    } else {
+        m_bLockThinkState = false;
+        if (m_Enemy) {
+            if (m_State == ACTOR_STATE_COVER_FAKE_ENEMY) {
+                TransitionState(ACTOR_STATE_COVER_NEW_ENEMY, 0);
+            }
+        } else {
+            if (m_State != ACTOR_STATE_COVER_FAKE_ENEMY) {
+                TransitionState(ACTOR_STATE_COVER_FAKE_ENEMY, (rand() & 0x7FF) + 1000);
+            }
+        }
+
+        switch (m_State) {
+        case ACTOR_STATE_COVER_START:
+            m_pszDebugState = "NewEnemy";
+            State_Cover_NewEnemy();
+            break;
+        case ACTOR_STATE_COVER_FIND_COVER:
+            m_pszDebugState = "FindCover";
+            State_Cover_FindCover();
+            break;
+        case ACTOR_STATE_COVER_TAKE_COVER:
+            m_pszDebugState = "TakeCover";
+            State_Cover_TakeCover();
+            break;
+        case ACTOR_STATE_COVER_FINISH_RELOADING:
+            m_pszDebugState = "FinishReloading";
+            State_Cover_FinishReloading();
+            break;
+        case ACTOR_STATE_COVER_SPECIAL_ATTACK:
+            m_pszDebugState = "SpecialAttack";
+            State_Cover_SpecialAttack();
+            break;
+        case ACTOR_STATE_COVER_FIND_ENEMY:
+            m_pszDebugState = "FindEnemy";
+            State_Cover_FindEnemy();
+            break;
+        case ACTOR_STATE_COVER_SEARCH_NODE:
+            m_pszDebugState = "SearchNode";
+            State_Cover_SearchNode();
+            break;
+        case ACTOR_STATE_COVER_TARGET:
+            m_pszDebugState = "Target";
+            State_Cover_Target();
+            break;
+        case ACTOR_STATE_COVER_HIDE:
+            m_pszDebugState = "Hide";
+            State_Cover_Hide();
+            break;
+        case ACTOR_STATE_COVER_SHOOT:
+            m_pszDebugState = "Shoot";
+            State_Cover_Shoot();
+            break;
+        case ACTOR_STATE_COVER_GRENADE:
+            m_pszDebugState = "Grenade";
+            State_Cover_Grenade();
+            break;
+        case ACTOR_STATE_COVER_HUNT_ENEMY:
+            m_pszDebugState = "HuntEnemy";
+            State_Cover_HuntEnemy();
+            break;
+        case ACTOR_STATE_COVER_FAKE_ENEMY:
+            m_pszDebugState = "FakeEnemy";
+            State_Cover_FakeEnemy();
+            break;
+        default:
+            Com_Printf("Actor::Think_Cover: invalid think state %i\n", m_State);
+            assert(0);
+            break;
+        }
+
+        if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+            CheckForTransition(THINKSTATE_BADPLACE, THINKLEVEL_IDLE);
+        }
+    }
+
+    if (m_State == ACTOR_STATE_COVER_HIDE || m_State == ACTOR_STATE_COVER_FIND_ENEMY
+        || m_State == ACTOR_STATE_COVER_TARGET || m_State == ACTOR_STATE_COVER_SHOOT) {
+        PostThink(false);
+    } else {
+        PostThink(true);
+    }
+}
+
+void Actor::FinishedAnimation_Cover(void)
+{
+    if (m_State == ACTOR_STATE_COVER_SHOOT) {
+        if (m_Enemy && !m_Enemy->IsDead() && CanSeeEnemy(500) && CanShootEnemy(500)) {
+            TransitionState(ACTOR_STATE_COVER_SHOOT, 0);
+        } else {
+            TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
+        }
+    } else if (m_State == ACTOR_STATE_COVER_GRENADE || m_State == ACTOR_STATE_COVER_LOOP) {
+        TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
+    }
+}
+
+void Actor::PathnodeClaimRevoked_Cover(void)
+{
+    TransitionState(ACTOR_STATE_COVER_FIND_COVER, 0);
+}
diff --git a/code/fgame/actor_curious.cpp b/code/fgame/actor_curious.cpp
index e948230d..19e51e5d 100644
--- a/code/fgame/actor_curious.cpp
+++ b/code/fgame/actor_curious.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,485 +24,254 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitCurious
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitCurious(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Curious;
-	func->BeginState					= &Actor::Begin_Curious;
-	func->EndState						= &Actor::End_Curious;
-	func->ResumeState					= &Actor::Resume_Curious;
-	func->SuspendState					= &Actor::Suspend_Curious;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Cover;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Curious;
-	func->IsState						= &Actor::IsCuriousState;
+    func->ThinkState                 = &Actor::Think_Curious;
+    func->BeginState                 = &Actor::Begin_Curious;
+    func->EndState                   = &Actor::End_Curious;
+    func->ResumeState                = &Actor::Resume_Curious;
+    func->SuspendState               = &Actor::Suspend_Curious;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Curious;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
+    func->IsState                    = &Actor::IsCuriousState;
 }
 
-void Actor::Begin_Curious
-	(
-	void
-	)
+void Actor::SetCuriousAnimHint(int iAnimHint)
 {
-	Vector vDelta;
-	//float fDistSquared;
-
-	DoForceActivate();
-	m_csMood = STRING_CURIOUS;
-	Anim_Emotion(EMOTION_CURIOUS);
-
-	if (level.inttime > level.m_iCuriousVoiceTime + 3000)
-	{
-		if (m_iCuriousAnimHint == 5)
-		{
-			Anim_Say(
-				STRING_ANIM_SAY_CURIOUS_SOUND_SCR,
-				8000,
-				false);
-			level.m_iCuriousVoiceTime = level.inttime;
-		}
-		else if (m_iCuriousAnimHint == 6)
-		{
-			Anim_Say(
-				STRING_ANIM_SAY_CURIOUS_SIGHT_SCR,
-				8000,
-				false);
-			level.m_iCuriousVoiceTime = level.inttime;
-		}
-	}
-
-	m_iCuriousTime = level.inttime;
-
-	SetLeashHome(origin);
-	if (m_bScriptGoalValid)
-	{
-		SetPath(
-			m_vScriptGoal,
-			"",
-			0,
-			NULL,
-			0.0);
-		ShortenPathToAvoidSquadMates();
-		if (!PathExists())
-		{
-			m_bScriptGoalValid = false;
-		}
-	}
-	TransitionState(1100, 0);
-
-	if (!m_bScriptGoalValid)
-	{
-		//check if last enemy pos is within leash area (distance to m_vHome is <= m_fLeash)
-		vDelta = m_vLastEnemyPos - m_vHome;
-		if (vDelta.lengthSquared() <= m_fLeashSquared)
-		{
-			//it's within leash area, go check it.
-			SetPath(m_vLastEnemyPos, NULL, 0, NULL, 0.0);
-		}
-		else
-		{
-			//it's NOT within leash area,
-
-			//am I within leash area ?
-			if ((origin - m_vHome).lengthSquared() <= m_fLeashSquared)
-			{
-				//I'm inside leash area,
-				//Try to go towards enemy as much as possible without leaving leash area.
-				//vDest = vHome + U * leash
-				//U = unit vector of vDelta.
-				SetPath(vDelta * sqrt(m_fLeashSquared / vDelta.lengthSquared()) + m_vHome, NULL, 0, NULL, 0.0);
-			}
-			else
-			{
-				//I'm outside leash area,
-				//go to enemy, it doesn't matter.
-				SetPath(m_vLastEnemyPos, NULL, 0, NULL, 0.0);
-			}
-		}
-
-		ShortenPathToAvoidSquadMates();
-		if (m_iCuriousAnimHint <= 3)
-		{
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_STANDFLINCH_SCR;
-
-			m_bNextForceStart = true;
-			m_bLockThinkState = true;
-			TransitionState(1101, 0);
-		}
-		else if(m_Enemy && m_PotentialEnemies.GetCurrentVisibility() < 0.1)
-		{
-			vec2_t vDel;
-			VectorSub2D(m_vLastEnemyPos, origin, vDel);
-			if (vDel[0] != 0 || vDel[1] != 0)
-			{ 
-				SetDesiredYawDir(vDel);
-			}
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_SURPRISE_SCR;
-
-			m_bNextForceStart = true;
-			m_bLockThinkState = true;
-			TransitionState(1101, 0);
-		}
-	}
-
-	m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF);
+    m_iCuriousAnimHint = iAnimHint;
 }
 
-
-void Actor::End_Curious
-	(
-	void
-	)
+void Actor::Begin_Curious(void)
 {
-	m_iCuriousTime = 0;
-	m_iCuriousLevel = 0;
+    float  fDistSquared;
+    Vector vDelta;
+
+    DoForceActivate();
+    m_csMood = STRING_CURIOUS;
+    Anim_Emotion(EMOTION_CURIOUS);
+
+    if (level.inttime > level.m_iCuriousVoiceTime + 3000) {
+        if (m_iCuriousAnimHint == 5) {
+            Anim_Say(STRING_ANIM_SAY_CURIOUS_SOUND_SCR, 8000, false);
+            level.m_iCuriousVoiceTime = level.inttime;
+        } else if (m_iCuriousAnimHint == 6) {
+            Anim_Say(STRING_ANIM_SAY_CURIOUS_SIGHT_SCR, 8000, false);
+            level.m_iCuriousVoiceTime = level.inttime;
+        }
+    }
+
+    m_iCuriousTime = level.inttime;
+
+    SetLeashHome(origin);
+    if (m_bScriptGoalValid) {
+        SetPath(m_vScriptGoal, NULL, 0, NULL, 0.0);
+        ShortenPathToAvoidSquadMates();
+        if (!PathExists()) {
+            m_bScriptGoalValid = false;
+        }
+    }
+    TransitionState(ACTOR_STATE_CURIOUS_BEGIN, 0);
+
+    if (!m_bScriptGoalValid) {
+        //check if last enemy pos is within leash area (distance to m_vHome is <= m_fLeash)
+        vDelta       = m_vLastEnemyPos - m_vHome;
+        fDistSquared = vDelta.lengthSquared();
+
+        if (fDistSquared > m_fLeashSquared && (origin - m_vHome).lengthSquared() <= m_fLeashSquared) {
+            //I'm inside leash area,
+            //Try to go towards enemy as much as possible without leaving leash area.
+            //vDest = vHome + U * leash
+            //U = unit vector of vDelta.
+            SetPath(m_vHome + sqrt(m_fLeashSquared / fDistSquared) * vDelta, NULL, 0, NULL, 0);
+            ShortenPathToAvoidSquadMates();
+        } else {
+            //I'm outside leash area,
+            //go to enemy, it doesn't matter.
+            SetPath(m_vLastEnemyPos, NULL, 0, NULL, 0);
+            ShortenPathToAvoidSquadMates();
+        }
+
+        if (m_iCuriousAnimHint <= 3 && m_iCuriousAnimHint >= 1) {
+            StartAnimation(ANIM_MODE_NORMAL, STRING_ANIM_STANDFLINCH_SCR);
+            TransitionState(ACTOR_STATE_CURIOUS_RUNNING);
+            m_bLockThinkState = true;
+        } else if (m_Enemy && m_PotentialEnemies.GetCurrentVisibility() < 0.1) {
+            SetDesiredYawDest(m_vLastEnemyPos);
+            StartAnimation(ANIM_MODE_NORMAL, STRING_ANIM_SURPRISE_SCR);
+            TransitionState(ACTOR_STATE_CURIOUS_RUNNING);
+            m_bLockThinkState = true;
+        }
+    }
+
+    m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF);
 }
 
-void Actor::Resume_Curious
-	(
-	void
-	)
+void Actor::End_Curious(void)
 {
-	Begin_Curious();
+    m_iCuriousTime  = 0;
+    m_iCuriousLevel = 0;
 }
 
-void Actor::Suspend_Curious
-	(
-	void
-	)
+void Actor::Resume_Curious(void)
 {
-	End_Curious();
+    Begin_Curious();
 }
 
-void Actor::Think_Curious
-	(
-	void
-	)
+void Actor::Suspend_Curious(void)
 {
-	//horrible function!
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		NoPoint();
-		UpdateEnemy(100);
-
-		if(m_State == 1101)
-		{
-			ContinueAnimation();
-			//LABEL_16:
-			CheckForThinkStateTransition();
-			glbs.Printf("Think_Curious CheckForThinkStateTransition 1\n");
-			PostThink(true);
-			return;
-		}
-
-		m_bLockThinkState = false;
-		
-		if (!PathExists() || PathComplete())
-		{
-			//v1 = &this->baseSimpleActor.baseSentient.m_Enemy;
-			//goto LABEL_6;
-			
-			ClearPath();
-			Anim_Stand();
-			LookAtCuriosity();
-
-			if (!m_Enemy || EnemyIsDisguised())
-			{
-				if (level.inttime > m_iCuriousTime + 500)
-				{
-					glbs.Printf("Think_Curious m_Enemy: %s EnemyIsDisguised: %s\n", m_Enemy ? "true": "false", EnemyIsDisguised() ? "true" : "false");
-					SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-					m_iCuriousTime = 0;
-				}
-			}
-			CheckForThinkStateTransition();
-			glbs.Printf("Think_Curious CheckForThinkStateTransition 2\n");
-			PostThink(true);
-			return;
-		}
-
-		if (!m_Enemy || CanSeeEnemy(100))
-		{
-			ClearPath();
-			Anim_Stand();
-			LookAtCuriosity();
-			if (!m_Enemy || EnemyIsDisguised())
-			{
-				if (level.inttime > m_iCuriousTime + 500)
-				{
-					SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-					m_iCuriousTime = 0;
-				}
-			}
-			CheckForThinkStateTransition();
-			glbs.Printf("Think_Curious CheckForThinkStateTransition 3\n");
-			PostThink(true);
-			return;
-		}
-		else
-		{
-			if (m_iCuriousLevel <= 5)
-			{
-				if (!InFOV(m_vLastEnemyPos, m_fFov, m_fFovDot))
-				{
-
-					if ((m_bScriptGoalValid || CanMovePathWithLeash())
-						&& MoveOnPathWithSquad())
-					{
-						if (PatrolNextNodeExists())
-						{
-							m_eNextAnimMode = 2;
-						}
-						else
-						{
-							//v11 = SimpleActor::GetRunAnim(this);
-							m_eNextAnimMode = 3;
-						}
-						m_csNextAnimString = GetRunAnim();
-						m_bNextForceStart = false;
-
-						FaceMotion();
-					}
-					else
-					{
-						Anim_Stand();
-					}
-
-					if (level.inttime >= m_iNextWatchStepTime
-						&& velocity.lengthSquared() >= 4.0)
-					{
-						SetDesiredLookDir(velocity);
-
-						m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF) + 500;
-					}
-					else
-					{
-						LookAtCuriosity();
-					}
-					CheckForThinkStateTransition();
-					glbs.Printf("Think_Curious CheckForThinkStateTransition 4\n");
-					PostThink(true);
-					return;
-				}
-				else
-				{
-
-					Vector vEnd = EyePosition() - m_vLastEnemyPos;
-					VectorNormalizeFast(vEnd);
-
-					vEnd += m_vLastEnemyPos;
-					if (!G_SightTrace(EyePosition(), vec_zero, vec_zero, vEnd, this, NULL, 33819417, qfalse, "Actor::Think_Curious"))
-					{
-						if ((m_bScriptGoalValid || CanMovePathWithLeash())
-							&& MoveOnPathWithSquad())
-						{
-							if (PatrolNextNodeExists())
-							{
-								m_eNextAnimMode = 2;
-							}
-							else
-							{
-								//v11 = SimpleActor::GetRunAnim(this);
-								m_eNextAnimMode = 3;
-							}
-							m_csNextAnimString = GetRunAnim();
-							m_bNextForceStart = false;
-
-							FaceMotion();
-						}
-						else
-						{
-							Anim_Stand();
-						}
-
-						if (level.inttime >= m_iNextWatchStepTime
-							&& velocity.lengthSquared() >= 4.0)
-						{
-							SetDesiredLookDir(velocity);
-							
-							m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF) + 500;
-						}
-						else
-						{
-							LookAtCuriosity();
-						}
-						CheckForThinkStateTransition();
-						glbs.Printf("Think_Curious CheckForThinkStateTransition 5\n");
-						PostThink(true);
-						return;
-					}
-					else
-					{
-
-						ClearPath();
-						Anim_Stand();
-						LookAtCuriosity();
-						if (!m_Enemy || EnemyIsDisguised())
-						{
-							if (level.inttime > m_iCuriousTime + 500)
-							{
-								SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-								m_iCuriousTime = 0;
-							}
-						}
-						CheckForThinkStateTransition();
-						glbs.Printf("Think_Curious CheckForThinkStateTransition 6\n");
-						PostThink(true);
-						return;
-					}
-				}
-			}
-			else
-			{
-				if ((PathGoal()-origin).lengthSquared() >= 2304)
-				{
-					if ((m_bScriptGoalValid || CanMovePathWithLeash())
-						&& MoveOnPathWithSquad())
-					{
-						if (PatrolNextNodeExists())
-						{
-							m_eNextAnimMode = 2;
-						}
-						else
-						{
-							//v11 = SimpleActor::GetRunAnim(this);
-							m_eNextAnimMode = 3;
-						}
-						m_csNextAnimString = GetRunAnim();
-						m_bNextForceStart = false;
-
-						FaceMotion();
-					}
-					else
-					{
-						Anim_Stand();
-					}
-
-					if (level.inttime >= m_iNextWatchStepTime
-						&& velocity.lengthSquared() >= 4.0)
-					{
-						SetDesiredLookDir(velocity);
-
-						m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF) + 500;
-					}
-					else
-					{
-						LookAtCuriosity();
-					}
-					CheckForThinkStateTransition();
-					glbs.Printf("Think_Curious CheckForThinkStateTransition 7\n");
-					PostThink(true);
-					return;
-				}
-			}
-			ClearPath();
-			Anim_Stand();
-			LookAtCuriosity();
-			if (!m_Enemy || EnemyIsDisguised())
-			{
-				if (level.inttime > m_iCuriousTime + 500)
-				{
-					SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-					m_iCuriousTime = 0;
-				}
-			}
-			CheckForThinkStateTransition();
-			glbs.Printf("Think_Curious CheckForThinkStateTransition 8\n");
-			PostThink(true);
-			return;
-		}
-	}
+    End_Curious();
 }
 
-void Actor::FinishedAnimation_Curious
-	(
-	void
-	)
+void Actor::Think_Curious(void)
 {
-	FinishedAnimation_AnimCurious();
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    UpdateEnemy(100);
+
+    if (m_State == ACTOR_STATE_CURIOUS_RUNNING) {
+        ContinueAnimation();
+        CheckForThinkStateTransition();
+        PostThink(true);
+        return;
+    }
+
+    m_bLockThinkState = false;
+
+    if (!PathExists() || PathComplete()) {
+        ClearPath();
+        Anim_Stand();
+        LookAtCuriosity();
+        TimeOutCurious();
+
+        CheckForThinkStateTransition();
+        PostThink(true);
+        return;
+    }
+
+    if (m_Enemy && CanSeeEnemy(100)) {
+        ClearPath();
+        Anim_Stand();
+        LookAtCuriosity();
+        TimeOutCurious();
+
+        CheckForThinkStateTransition();
+        PostThink(true);
+        return;
+    }
+
+    if (m_iCuriousLevel <= 5) {
+        if (InFOV(m_vLastEnemyPos, m_fFov, m_fFovDot)) {
+            Vector vEnd;
+
+            vEnd = EyePosition() - m_vLastEnemyPos;
+            vEnd.normalizefast();
+            vEnd += m_vLastEnemyPos;
+
+            if (G_SightTrace(
+                    EyePosition(), vec_zero, vec_zero, vEnd, this, NULL, MASK_CANSEE, qfalse, "Actor::Think_Curious"
+                )) {
+                ClearPath();
+                Anim_Stand();
+                LookAtCuriosity();
+                TimeOutCurious();
+
+                CheckForThinkStateTransition();
+                PostThink(true);
+                return;
+            }
+        }
+    } else if ((PathGoal() - origin).lengthSquared() < Square(48)) {
+        ClearPath();
+        Anim_Stand();
+        LookAtCuriosity();
+        TimeOutCurious();
+
+        CheckForThinkStateTransition();
+        PostThink(true);
+        return;
+    }
+
+    if ((m_bScriptGoalValid || CanMovePathWithLeash()) && MoveOnPathWithSquad()) {
+        if (PatrolNextNodeExists()) {
+            DesiredAnimation(ANIM_MODE_PATH, GetRunAnim());
+        } else {
+            DesiredAnimation(ANIM_MODE_PATH_GOAL, GetRunAnim());
+        }
+
+        FaceMotion();
+    } else {
+        Anim_Stand();
+    }
+
+    if (level.inttime >= m_iNextWatchStepTime && velocity.lengthSquared() >= Square(2)) {
+        SetDesiredLookDir(velocity);
+        m_iNextWatchStepTime = level.inttime + (rand() & 0x1FF) + 500;
+    } else {
+        LookAtCuriosity();
+    }
+
+    CheckForThinkStateTransition();
+    PostThink(true);
 }
 
-
-void Actor::LookAtCuriosity
-	(
-	void
-	)
+void Actor::LookAtCuriosity(void)
 {
-	Vector vAngles;
-	float fLookScale;
-	unsigned int iSeed;
-	if (m_Enemy && EnemyIsDisguised())
-	{
-		SetDesiredLookDir(m_Enemy->origin - origin);
-		fLookScale = 0.25;
-	}
-	else
-	{
-		vAngles = m_vLastEnemyPos - origin;
-		if (vAngles.x < 15.0 && vAngles.x > -15.0 && vAngles.y < 15.0 && vAngles.y > -15.0)
-		{
-			SetDesiredLookAnglesRelative(vec_zero);
-		}
-		else
-		{
-			SetDesiredLookDir(vAngles);
-			if (velocity.x == 0.0
-				&& velocity.y == 0.0)
-			{
-				SetDesiredYawDir(vAngles);
-			}
-			else
-			{
-				FaceMotion();
-			}
-		}
-		fLookScale = 1;
-	}
-	
-	//FIXME: wth is this ! @_@
-	iSeed = 1664525 * (-783751945 * ((level.inttime - m_iCuriousTime) & 0xFFFFFF00) + m_iCuriousTime);
+    unsigned int iSeed;
+    float        fLookScale;
+    vec3_t       vAngles;
 
-	vAngles.x = fLookScale * ((1664525 * (iSeed + 1013904223) + 1013904223) * 0.000000013969839) + m_DesiredLookAngles[0];
-	vAngles.y = (iSeed + 1013904223) * 0.000000027939677 * fLookScale + m_DesiredLookAngles[1];
-	vAngles.z = m_DesiredLookAngles[2];
+    if (m_Enemy && !EnemyIsDisguised()) {
+        SetDesiredLookDir(m_Enemy->origin - origin);
+        fLookScale = 0.25;
+    } else {
+        Vector v;
 
-	if (vAngles.x >= -90.0)
-	{
-		if (vAngles.x > 90.0)
-			vAngles.x = 90.0;
-	}
-	else
-	{
-		vAngles.x = -90.0;
-	}
+        v = m_vLastEnemyPos - origin;
+        if (v[0] < 15 && v[0] > -15 && v[1] < 15 && v[1] > -15) {
+            SetDesiredLookAnglesRelative(vec_zero);
+        } else {
+            SetDesiredLookDir(v);
+            if (velocity.x || velocity.y) {
+                FaceMotion();
+            } else {
+                SetDesiredYawDir(v);
+            }
+        }
+        fLookScale = 1;
+    }
 
-	SetDesiredLookAnglesRelative(vAngles);
+    iSeed = 0x19660D * (m_iCuriousTime - 0x2EB71B09 * ((level.inttime - m_iCuriousTime) & 0xFFFFFF00)) + 0x3C6EF35F;
 
+    vAngles[0] = m_DesiredLookAngles[0] + (float)iSeed / (float)0x4444444 * fLookScale;
+    vAngles[1] = m_DesiredLookAngles[1] + (float)iSeed / (float)0x2222222 * fLookScale;
+    vAngles[2] = m_DesiredLookAngles[2];
+    // clamp
+    vAngles[0] = Q_clamp_float(vAngles[0], -90, 90);
+
+    SetDesiredLookAnglesRelative(vAngles);
 }
 
-void Actor::TimeOutCurious
-	(
-	void
-	)
+void Actor::TimeOutCurious(void)
 {
-	//FIXME: macros
-	if (!m_Enemy || EnemyIsDisguised())
-	{
-		if (level.inttime > m_iCuriousTime + 500)
-		{
-			SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-			m_iCuriousTime = 0;
-		}
-	}
+    if (m_Enemy && !EnemyIsDisguised()) {
+        return;
+    }
+
+    if (level.inttime <= m_iCuriousTime + 500) {
+        return;
+    }
+
+    SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    m_iCuriousTime = 0;
 }
 
-void Actor::SetCuriousAnimHint
-	(
-	int iAnimHint
-	)
+void Actor::FinishedAnimation_Curious(void)
 {
-	m_iCuriousAnimHint = iAnimHint;
+    if (m_State == ACTOR_STATE_CURIOUS_RUNNING) {
+        TransitionState(ACTOR_STATE_CURIOUS_BEGIN, 0);
+    }
 }
diff --git a/code/fgame/actor_disguise_common.cpp b/code/fgame/actor_disguise_common.cpp
index 636d7d82..dec23b79 100644
--- a/code/fgame/actor_disguise_common.cpp
+++ b/code/fgame/actor_disguise_common.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,174 +24,115 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-
-void Actor::InitDisguiseNone
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDisguiseNone(GlobalFuncs_t *func)
 {
-	func->IsState = &Actor::IsDisguiseState;
+    func->IsState = &Actor::IsDisguiseState;
 }
 
-void Actor::State_Disguise_Wait
-	(
-	void
-	)
+void Actor::State_Disguise_Wait(void)
 {
-	vec2_t vDelta;
-	float fDistSquared;
-	VectorSub2D(origin, m_Enemy->origin, vDelta);
+    float  fDistSquared;
+    vec2_t vDelta;
 
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DISGUISE_WAIT_SCR;
-	m_bNextForceStart = false;
+    VectorSub2D(origin, m_Enemy->origin, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
 
-	fDistSquared =  VectorLength2DSquared(vDelta);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_WAIT_SCR);
 
-	if (m_fMaxDisguiseDistSquared > fDistSquared * 4)
-	{
-		TransitionState(1, 0);
-	}
-	else
-	{
-		if (level.inttime > m_iStateTime + 3000)
-		{
-			if (fDistSquared <= 65536)
-			{
-				TransitionState(1, 0);
-			}
-			else
-			{
-				SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-			}
-		}
-	}
+    if (fDistSquared * 4 < m_fMaxDisguiseDistSquared) {
+        TransitionState(ACTOR_STATE_DISGUISE_PAPERS);
+        return;
+    }
+
+    if (level.inttime <= m_iStateTime + 3000) {
+        return;
+    }
+
+    if (fDistSquared > Square(256)) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    } else {
+        TransitionState(ACTOR_STATE_DISGUISE_PAPERS);
+    }
 }
 
-void Actor::State_Disguise_Papers
-	(
-	void
-	)
+void Actor::State_Disguise_Papers(void)
 {
-	vec2_t vDelta;
+    vec2_t vDelta;
 
-	m_csNextAnimString = STRING_ANIM_DISGUISE_PAPERS_SCR;
-	m_eNextAnimMode = 1;
-	m_bNextForceStart = false;
-	if (m_iEnemyShowPapersTime < m_Enemy->m_ShowPapersTime)
-	{
-		if (level.m_iPapersLevel < m_iDisguiseLevel)
-		{
-			m_State = 5;
-		}
-		else
-		{
-			if (m_DisguiseAcceptThread.IsSet())
-				m_DisguiseAcceptThread.Execute(this);
-			TransitionState(2, 0);
-		}
-	}
-	else
-	{
-		if (level.inttime > m_iStateTime + 12000)
-		{
-			TransitionState(3, 0);
-		}
-		else
-		{
-			VectorSub2D(origin, m_Enemy->origin, vDelta);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
 
-			if (VectorLength2DSquared(vDelta) > 65536)
-			{
-				TransitionState(4, 0);
-			}
-		}
-	}
+    if (m_iEnemyShowPapersTime >= m_Enemy->m_ShowPapersTime) {
+        if (level.inttime > m_iStateTime + 12000) {
+            TransitionState(ACTOR_STATE_DISGUISE_ENEMY);
+        } else {
+            VectorSub2D(origin, m_Enemy->origin, vDelta);
+
+            if (VectorLength2DSquared(vDelta) > Square(256)) {
+                TransitionState(ACTOR_STATE_DISGUISE_HALT, 0);
+            }
+        }
+    } else if (level.m_iPapersLevel < m_iDisguiseLevel) {
+        TransitionState(ACTOR_STATE_DISGUISE_DENY);
+    } else {
+        if (m_DisguiseAcceptThread.IsSet()) {
+            m_DisguiseAcceptThread.Execute(this);
+        }
+
+        TransitionState(ACTOR_STATE_DISGUISE_ACCEPT);
+    }
 }
 
-void Actor::State_Disguise_Fake_Papers
-	(
-	void
-	)
+void Actor::State_Disguise_Fake_Papers(void)
 {
-	vec2_t vDelta;
+    vec2_t vDelta;
 
-	m_csNextAnimString = STRING_ANIM_DISGUISE_PAPERS_SCR;
-	m_eNextAnimMode = 1;
-	m_bNextForceStart = false;
-	if (m_iEnemyShowPapersTime < m_Enemy->m_ShowPapersTime || level.inttime > m_iStateTime + 12000)
-	{
-		TransitionState(3, 0);
-	}
-	else
-	{
-		VectorSub2D(origin, m_Enemy->origin, vDelta);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
 
-		if (VectorLength2DSquared(vDelta) > 65536)
-		{
-			TransitionState(4, 0);
-		}
-	}
+    if (m_iEnemyShowPapersTime < m_Enemy->m_ShowPapersTime || level.inttime > m_iStateTime + 12000) {
+        TransitionState(ACTOR_STATE_DISGUISE_ENEMY);
+        return;
+    }
 
+    VectorSub2D(origin, m_Enemy->origin, vDelta);
+
+    if (VectorLength2DSquared(vDelta) > Square(256)) {
+        TransitionState(ACTOR_STATE_DISGUISE_HALT, 0);
+    }
 }
 
-void Actor::State_Disguise_Enemy
-	(
-	void
-	)
+void Actor::State_Disguise_Enemy(void)
 {
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DISGUISE_ENEMY_SCR;
-	m_bNextForceStart = false;
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_ENEMY_SCR);
 
-	if (level.inttime > m_iStateTime + 3000 && !m_Enemy->IsSubclassOfActor())
-	{
-		SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-	}
+    if (level.inttime > m_iStateTime + 3000 && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
 }
 
-void Actor::State_Disguise_Halt
-	(
-	void
-	)
+void Actor::State_Disguise_Halt(void)
 {
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DISGUISE_HALT_SCR;
-	m_bNextForceStart = false;
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_HALT_SCR);
 
-	if (level.inttime > m_iStateTime + 1500 && !m_Enemy->IsSubclassOfActor())
-	{
-		SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-	}
+    if (level.inttime > m_iStateTime + 1500 && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
 }
 
-void Actor::State_Disguise_Accept
-	(
-	void
-	)
+void Actor::State_Disguise_Accept(void)
 {
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DISGUISE_ACCEPT_SCR;
-	m_bNextForceStart = false;
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_ACCEPT_SCR);
 
-	if (level.inttime > m_iStateTime + 3000 )
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-		SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
-	}
+    if (level.inttime > m_iStateTime + 3000) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
+    }
 }
 
-void Actor::State_Disguise_Deny
-	(
-	void
-	)
+void Actor::State_Disguise_Deny(void)
 {
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DISGUISE_DENY_SCR;
-	m_bNextForceStart = false;
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_DENY_SCR);
 
-	if (level.inttime > m_iStateTime + 3000)
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+    if (level.inttime > m_iStateTime + 3000) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    }
 }
diff --git a/code/fgame/actor_disguise_officer.cpp b/code/fgame/actor_disguise_officer.cpp
new file mode 100644
index 00000000..8293312f
--- /dev/null
+++ b/code/fgame/actor_disguise_officer.cpp
@@ -0,0 +1,135 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// actor_disguise_officier.cpp
+
+#include "actor.h"
+
+void Actor::InitDisguiseOfficer(GlobalFuncs_t *func)
+{
+    func->ThinkState                 = &Actor::Think_DisguiseOfficer;
+    func->BeginState                 = &Actor::Begin_DisguiseOfficer;
+    func->EndState                   = &Actor::End_DisguiseOfficer;
+    func->ResumeState                = &Actor::Resume_DisguiseOfficer;
+    func->SuspendState               = &Actor::Suspend_DisguiseOfficer;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Disguise;
+    func->IsState                    = &Actor::IsDisguiseState;
+}
+
+void Actor::Begin_DisguiseOfficer(void)
+{
+    m_csMood = STRING_BORED;
+    assert(m_Enemy);
+
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
+
+    if ((EnemyIsDisguised() || (m_Enemy->flags & FL_NOTARGET)) && level.m_bAlarm != qtrue) {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
+
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
+        m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
+
+        TransitionState(ACTOR_STATE_DISGUISE_PAPERS);
+    } else {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
+}
+
+void Actor::End_DisguiseOfficer(void)
+{
+    m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
+}
+
+void Actor::Resume_DisguiseOfficer(void)
+{
+    Begin_DisguiseOfficer();
+}
+
+void Actor::Suspend_DisguiseOfficer(void)
+{
+    End_DisguiseOfficer();
+}
+
+void Actor::Think_DisguiseOfficer(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    ContinueAnimation();
+    UpdateEnemy(1500);
+
+    assert(m_Enemy);
+
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
+
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET) && m_State != ACTOR_STATE_DISGUISE_ENEMY) {
+        TransitionState(ACTOR_STATE_DISGUISE_ENEMY, 0);
+    }
+
+    if (level.m_bAlarm == qtrue) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
+
+    SetDesiredYawDest(m_Enemy->origin);
+    SetDesiredLookDir(m_Enemy->origin - origin);
+
+    switch (m_State) {
+    case ACTOR_STATE_DISGUISE_ENEMY:
+        m_pszDebugState = "enemy";
+        State_Disguise_Enemy();
+        break;
+    case ACTOR_STATE_DISGUISE_HALT:
+        m_pszDebugState = "halt";
+        State_Disguise_Halt();
+        break;
+    case ACTOR_STATE_DISGUISE_PAPERS:
+        m_pszDebugState = "papers";
+        State_Disguise_Fake_Papers();
+        break;
+    default:
+        {
+            Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
+            char assertStr[16317] = {0};
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
+            assert(!assertStr);
+        }
+        break;
+    }
+
+    if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+        CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE);
+    }
+
+    PostThink(true);
+}
diff --git a/code/fgame/actor_disguise_officier.cpp b/code/fgame/actor_disguise_officier.cpp
deleted file mode 100644
index 2508b20b..00000000
--- a/code/fgame/actor_disguise_officier.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// actor_disguise_officier.cpp
-
-#include "actor.h"
-
-
-void Actor::InitDisguiseOfficer
-	(
-	GlobalFuncs_t *func
-	)
-{
-	func->ThinkState						= &Actor::Think_DisguiseOfficer;
-	func->BeginState						= &Actor::Begin_DisguiseOfficer;
-	func->EndState							= &Actor::End_DisguiseOfficer;
-	func->ResumeState						= &Actor::Resume_DisguiseOfficer;
-	func->SuspendState						= &Actor::Suspend_DisguiseOfficer;
-	func->PassesTransitionConditions		= &Actor::PassesTransitionConditions_Disguise;
-	func->IsState							= &Actor::IsDisguiseState;
-}
-
-void Actor::Begin_DisguiseOfficer
-	(
-	void
-	)
-{
-	vec2_t vDelta;
-	m_csMood = STRING_BORED;
-	assert(m_Enemy);
-
-	if (m_Enemy)
-	{
-		if ( (EnemyIsDisguised() || m_Enemy->IsSubclassOfActor())  && !level.m_bAlarm)
-		{
-			VectorSub2D(m_Enemy->origin, origin, vDelta);
-
-			if (vDelta[0] != 0 || vDelta[1] != 0)
-			{
-				SetDesiredYawDir(vDelta);
-			}
-
-			SetDesiredLookDir(m_Enemy->origin - origin);
-
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_DISGUISE_PAPERS_SCR;
-			m_bNextForceStart = false;
-
-
-			m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
-			TransitionState(1, 0);
-		}
-		else
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-	}
-	else
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
-}
-
-void Actor::End_DisguiseOfficer
-	(
-	void
-	)
-{
-	m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
-}
-
-void Actor::Resume_DisguiseOfficer
-	(
-	void
-	)
-{
-	Begin_DisguiseOfficer();
-}
-
-void Actor::Suspend_DisguiseOfficer
-	(
-	void
-	)
-{
-	End_DisguiseOfficer();
-}
-
-void Actor::Think_DisguiseOfficer
-	(
-	void
-	)
-{
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		NoPoint();
-		ContinueAnimation();
-		UpdateEnemy(1500);
-		assert(m_Enemy);
-
-		if (!m_Enemy)
-		{
-			SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-			return;
-		}
-		if (!EnemyIsDisguised() && !(m_Enemy->IsSubclassOfActor()) && m_State != 3)
-		{
-			TransitionState(3, 0);
-		}
-		if (level.m_bAlarm)
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-			return;
-		}
-		vec2_t vDelta;
-
-		VectorSub2D(m_Enemy->origin, origin, vDelta);
-
-		if (vDelta[0] != 0 || vDelta[1] != 0)
-		{
-			SetDesiredYawDir(vDelta);
-		}
-
-		SetDesiredLookDir(m_Enemy->origin - origin);
-
-		if (m_State == 3)
-		{
-			m_pszDebugState = "enemy";
-			State_Disguise_Enemy();
-		}
-		else if (m_State > 3)
-		{
-			if (m_State != 4)
-			{
-				Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
-				assert(!assertStr);
-			}
-			else
-			{
-				m_pszDebugState = "halt";
-				Actor::State_Disguise_Halt();
-			}
-		}
-		else
-		{
-			if (m_State == 1)
-			{
-				m_pszDebugState = "papers";
-				State_Disguise_Fake_Papers();
-			}
-			else
-			{
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
-				assert(!assertStr);
-			}
-		}
-		CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL);
-		PostThink(true);
-	}
-}
diff --git a/code/fgame/actor_disguise_rover.cpp b/code/fgame/actor_disguise_rover.cpp
index 1fe5aec8..d8773f24 100644
--- a/code/fgame/actor_disguise_rover.cpp
+++ b/code/fgame/actor_disguise_rover.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,163 +24,116 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitDisguiseRover
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDisguiseRover(GlobalFuncs_t *func)
 {
-	func->ThinkState						= &Actor::Think_DisguiseRover;
-	func->BeginState						= &Actor::Begin_DisguiseRover;
-	func->EndState							= &Actor::End_DisguiseRover;
-	func->ResumeState						= &Actor::Resume_DisguiseRover;
-	func->SuspendState						= &Actor::Suspend_DisguiseRover;
-	func->PassesTransitionConditions		= &Actor::PassesTransitionConditions_Disguise;
-	func->IsState							= &Actor::IsDisguiseState;
+    func->ThinkState                 = &Actor::Think_DisguiseRover;
+    func->BeginState                 = &Actor::Begin_DisguiseRover;
+    func->EndState                   = &Actor::End_DisguiseRover;
+    func->ResumeState                = &Actor::Resume_DisguiseRover;
+    func->SuspendState               = &Actor::Suspend_DisguiseRover;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Disguise;
+    func->IsState                    = &Actor::IsDisguiseState;
 }
 
-void Actor::Begin_DisguiseRover
-	(
-	void
-	)
+void Actor::Begin_DisguiseRover(void)
 {
+    m_csMood = STRING_BORED;
+    assert(m_Enemy);
 
-	vec2_t vDelta;
-	m_csMood = STRING_BORED;
-	assert(m_Enemy);
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
 
-	if (m_Enemy)
-	{
-		if ((EnemyIsDisguised() || m_Enemy->IsSubclassOfActor()) && !level.m_bAlarm)
-		{
-			VectorSub2D(m_Enemy->origin, origin, vDelta);
+    if ((EnemyIsDisguised() || (m_Enemy->flags & FL_NOTARGET)) && level.m_bAlarm != qtrue) {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
 
-			if (vDelta[0] != 0 || vDelta[1] != 0)
-			{
-				SetDesiredYawDir(vDelta);
-			}
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_PAPERS_SCR);
+        m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
 
-			SetDesiredLookDir(m_Enemy->origin - origin);
-
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_DISGUISE_PAPERS_SCR;
-			m_bNextForceStart = false;
-
-			m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
-			TransitionState(1, 0);
-		}
-		else
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-	}
-	else
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+        TransitionState(ACTOR_STATE_DISGUISE_PAPERS);
+    } else {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
 }
 
-void Actor::End_DisguiseRover
-	(
-	void
-	)
+void Actor::End_DisguiseRover(void)
 {
-	m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
+    m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
 }
 
-void Actor::Resume_DisguiseRover
-	(
-	void
-	)
+void Actor::Resume_DisguiseRover(void)
 {
-	Begin_DisguiseRover();
+    Begin_DisguiseRover();
 }
 
-void Actor::Suspend_DisguiseRover
-	(
-	void
-	)
+void Actor::Suspend_DisguiseRover(void)
 {
-	End_DisguiseRover();
+    End_DisguiseRover();
 }
 
-void Actor::Think_DisguiseRover
-	(
-	void
-	)
+void Actor::Think_DisguiseRover(void)
 {
-	if (!RequireThink())
-	{
-		return;
-	}
-	UpdateEyeOrigin();
-	NoPoint();
-	ContinueAnimation();
-	UpdateEnemy(1500);
+    if (!RequireThink()) {
+        return;
+    }
 
-	assert(m_Enemy != NULL);
+    UpdateEyeOrigin();
+    NoPoint();
+    ContinueAnimation();
+    UpdateEnemy(1500);
 
-	if (!m_Enemy)
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-		return;
-	}
+    assert(m_Enemy);
 
-	if (!EnemyIsDisguised() && !m_Enemy->IsSubclassOfActor() && m_State != 3)
-	{
-		TransitionState(3, 0);
-	}
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
 
-	if (level.m_bAlarm)
-	{
-		SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		return;
-	}
-	
-	{
-		vec2_t facedir;
-		facedir[0] = m_Enemy->origin[0] - origin[0];
-		facedir[1] = m_Enemy->origin[1] - origin[1];
-		if (facedir[0] != 0 || facedir[1] != 0)
-		{
-			SetDesiredYawDir(facedir);
-		}
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET) && m_State != ACTOR_STATE_DISGUISE_ENEMY) {
+        TransitionState(ACTOR_STATE_DISGUISE_ENEMY, 0);
+    }
 
-	}
-	
-	SetDesiredLookDir(m_Enemy->origin - origin);
+    if (level.m_bAlarm == qtrue) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
 
-	if (m_State == 2)
-	{
-		m_pszDebugState = "accept";
-		State_Disguise_Accept();
-	}
-	else if(m_State > 2)
-	{
-		if (m_State == 3)
-		{
-			m_pszDebugState = "enemy";
-			State_Disguise_Enemy();
-		}
-		else if (m_State == 4)
-		{
-			m_pszDebugState = "halt";
-			State_Disguise_Halt();
-		}
-		else
-		{
-			assert(!"invalid think state");
-		}
-	}
-	else if (m_State == 1)
-	{
-		m_pszDebugState = "papers";
-		State_Disguise_Papers();
-	}
-	else
-	{
-		assert(!"invalid think state");
-	}
+    SetDesiredYawDest(m_Enemy->origin);
+    SetDesiredLookDir(m_Enemy->origin - origin);
 
-	CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL);
-	PostThink(true);
+    switch (m_State) {
+    case ACTOR_STATE_DISGUISE_ACCEPT:
+        m_pszDebugState = "accept";
+        State_Disguise_Accept();
+        break;
+    case ACTOR_STATE_DISGUISE_ENEMY:
+        m_pszDebugState = "enemy";
+        State_Disguise_Enemy();
+        break;
+    case ACTOR_STATE_DISGUISE_HALT:
+        m_pszDebugState = "halt";
+        State_Disguise_Halt();
+        break;
+    case ACTOR_STATE_DISGUISE_PAPERS:
+        m_pszDebugState = "papers";
+        State_Disguise_Fake_Papers();
+        break;
+    default:
+        {
+            Com_Printf("Actor::Think_DisguiseOfficer: invalid think state %i\n", m_State);
+            char assertStr[16317] = {0};
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
+            assert(!assertStr);
+        }
+        break;
+    }
+
+    if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+        CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE);
+    }
+
+    PostThink(true);
 }
diff --git a/code/fgame/actor_disguise_salute.cpp b/code/fgame/actor_disguise_salute.cpp
index 0a23e89f..75aa6041 100644
--- a/code/fgame/actor_disguise_salute.cpp
+++ b/code/fgame/actor_disguise_salute.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,133 +24,85 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitDisguiseSalute
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDisguiseSalute(GlobalFuncs_t *func)
 {
-	func->ThinkState						= &Actor::Think_DisguiseSalute;
-	func->BeginState						= &Actor::Begin_DisguiseSalute;
-	func->EndState							= &Actor::End_DisguiseSalute;
-	func->ResumeState						= &Actor::Resume_DisguiseSalute;
-	func->SuspendState						= &Actor::Suspend_DisguiseSalute;
-	func->PassesTransitionConditions		= &Actor::PassesTransitionConditions_Disguise;
-	func->IsState							= &Actor::IsDisguiseState;
+    func->ThinkState                 = &Actor::Think_DisguiseSalute;
+    func->BeginState                 = &Actor::Begin_DisguiseSalute;
+    func->EndState                   = &Actor::End_DisguiseSalute;
+    func->ResumeState                = &Actor::Resume_DisguiseSalute;
+    func->SuspendState               = &Actor::Suspend_DisguiseSalute;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_DisguiseSalute;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Disguise;
+    func->IsState                    = &Actor::IsDisguiseState;
 }
 
-void Actor::Begin_DisguiseSalute
-	(
-	void
-	)
+void Actor::Begin_DisguiseSalute(void)
 {
-	vec2_t vDelta; 
-	
-	Com_Printf("Saluting guy....\n");
-	
-	m_csMood = STRING_BORED;
-	assert(m_Enemy);
+    Com_Printf("Saluting guy....\n");
 
+    m_csMood = STRING_BORED;
+    assert(m_Enemy);
 
-	if (m_Enemy)
-	{
-		if ((EnemyIsDisguised() || m_Enemy->IsSubclassOfActor()) && !level.m_bAlarm)
-		{
-			VectorSub2D(m_Enemy->origin, origin, vDelta);
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
 
-			if (vDelta[0] != 0 || vDelta[1] != 0)
-			{
-				SetDesiredYawDir(vDelta);
-			}
+    if ((EnemyIsDisguised() || (m_Enemy->flags & FL_NOTARGET)) && level.m_bAlarm != qtrue) {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
 
-			SetDesiredLookDir(m_Enemy->origin - origin);
-
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_DISGUISE_SALUTE_SCR;
-			m_bNextForceStart = false;
-
-
-			m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
-			TransitionState(1, 0);
-		}
-		else
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-	}
-	else
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_SALUTE_SCR);
+    } else {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
 }
 
-void Actor::End_DisguiseSalute
-	(
-	void
-	)
+void Actor::End_DisguiseSalute(void)
 {
-	m_iNextDisguiseTime = level.inttime + m_iDisguisePeriod;
+    m_iNextDisguiseTime = level.inttime + m_iDisguisePeriod;
 }
 
-void Actor::Resume_DisguiseSalute
-	(
-	void
-	)
+void Actor::Resume_DisguiseSalute(void)
 {
-	Begin_DisguiseSalute();
+    Begin_DisguiseSalute();
 }
 
-void Actor::Suspend_DisguiseSalute
-	(
-	void
-	)
+void Actor::Suspend_DisguiseSalute(void)
 {
-	End_DisguiseSalute();
+    End_DisguiseSalute();
 }
 
-void Actor::Think_DisguiseSalute
-	(
-	void
-	)
+void Actor::Think_DisguiseSalute(void)
 {
-	NoPoint();
-	ContinueAnimation();
-	UpdateEnemy(2000);
+    NoPoint();
+    ContinueAnimation();
+    UpdateEnemy(2000);
 
-	assert(m_Enemy != NULL);
+    assert(m_Enemy != NULL);
 
-	if (m_Enemy)
-	{
-		if (!EnemyIsDisguised() && !m_Enemy->IsSubclassOfActor() && level.m_bAlarm)
-		{
-			{
-				vec2_t facedir;
-				facedir[0] = m_Enemy->origin[0] - origin[0];
-				facedir[1] = m_Enemy->origin[1] - origin[1];
-				if (facedir[0] != 0 || facedir[1] != 0)
-				{
-					SetDesiredYawDir(facedir);
-				}
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
 
-			}
-			SetDesiredLookDir(m_Enemy->origin - origin);
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
 
-			PostThink(true);
-		}
-		else
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-	}
-	else
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+    if (level.m_bAlarm == qtrue) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
+
+    SetDesiredYawDest(m_Enemy->origin);
+    SetDesiredLookDir(m_Enemy->origin - origin);
+
+    PostThink(true);
 }
 
-void Actor::FinishedAnimation_DisguiseSalute
-	(
-	void
-	)
+void Actor::FinishedAnimation_DisguiseSalute(void)
 {
-	SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
+    SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
 }
diff --git a/code/fgame/actor_disguise_sentry.cpp b/code/fgame/actor_disguise_sentry.cpp
index e833e1b5..345e18c2 100644
--- a/code/fgame/actor_disguise_sentry.cpp
+++ b/code/fgame/actor_disguise_sentry.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,164 +24,118 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitDisguiseSentry
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDisguiseSentry(GlobalFuncs_t *func)
 {
-	func->ThinkState						= &Actor::Think_DisguiseSentry;
-	func->BeginState						= &Actor::Begin_DisguiseSentry;
-	func->EndState							= &Actor::End_DisguiseSentry;
-	func->ResumeState						= &Actor::Resume_DisguiseSentry;
-	func->SuspendState						= &Actor::Suspend_DisguiseSentry;
-	func->PassesTransitionConditions		= &Actor::PassesTransitionConditions_Disguise;
-	func->IsState							= &Actor::IsDisguiseState;
+    func->ThinkState                 = &Actor::Think_DisguiseSentry;
+    func->BeginState                 = &Actor::Begin_DisguiseSentry;
+    func->EndState                   = &Actor::End_DisguiseSentry;
+    func->ResumeState                = &Actor::Resume_DisguiseSentry;
+    func->SuspendState               = &Actor::Suspend_DisguiseSentry;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Disguise;
+    func->IsState                    = &Actor::IsDisguiseState;
 }
 
-void Actor::Begin_DisguiseSentry
-	(
-	void
-	)
+void Actor::Begin_DisguiseSentry(void)
 {
-	vec2_t vDelta;
+    m_csMood = STRING_BORED;
+    assert(m_Enemy);
 
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
 
-	m_csMood = STRING_BORED;
+    if ((EnemyIsDisguised() || (m_Enemy->flags & FL_NOTARGET)) && level.m_bAlarm != qtrue) {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
 
-	assert(m_Enemy);
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DISGUISE_WAIT_SCR);
+        m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
 
-	if (m_Enemy)
-	{
-		if ((EnemyIsDisguised() || m_Enemy->IsSubclassOfActor()) && !level.m_bAlarm)
-		{
-			VectorSub2D(m_Enemy->origin, origin, vDelta);
-
-			if (vDelta[0] != 0 || vDelta[1] != 0)
-			{
-				SetDesiredYawDir(vDelta);
-			}
-
-			SetDesiredLookDir(m_Enemy->origin - origin);
-
-			m_eNextAnimMode = 1;
-			m_csNextAnimString = STRING_ANIM_DISGUISE_WAIT_SCR;
-			m_bNextForceStart = false;
-
-			m_iEnemyShowPapersTime = m_Enemy->m_ShowPapersTime;
-			TransitionState(1, 0);
-		}
-		else
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-	}
-	else
-	{
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-	}
+        TransitionState(ACTOR_STATE_DISGUISE_WAIT);
+    } else {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    }
 }
 
-void Actor::End_DisguiseSentry
-	(
-	void
-	)
+void Actor::End_DisguiseSentry(void)
 {
-	m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
+    m_iNextDisguiseTime = level.inttime + (m_State ? m_iDisguisePeriod : 500);
 }
 
-void Actor::Resume_DisguiseSentry
-	(
-	void
-	)
+void Actor::Resume_DisguiseSentry(void)
 {
-	Begin_DisguiseSentry();
+    Begin_DisguiseSentry();
 }
 
-void Actor::Suspend_DisguiseSentry
-	(
-	void
-	)
+void Actor::Suspend_DisguiseSentry(void)
 {
-	End_DisguiseSentry();
+    End_DisguiseSentry();
 }
 
-void Actor::Think_DisguiseSentry
-	(
-	void
-	)
+void Actor::Think_DisguiseSentry(void)
 {
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		NoPoint();
-		ContinueAnimation();
-		UpdateEnemy(1500);
+    if (!RequireThink()) {
+        return;
+    }
 
-		assert(m_Enemy != NULL);
+    UpdateEyeOrigin();
+    NoPoint();
+    ContinueAnimation();
+    UpdateEnemy(1500);
 
-		if (!m_Enemy)
-		{
-			SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-			return;
-		}
-		if (!EnemyIsDisguised() && !m_Enemy->IsSubclassOfActor() && m_State != 3)
-		{
-			TransitionState(3, 0);
-		}
+    assert(m_Enemy != NULL);
 
-		if (level.m_bAlarm)
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-		else
-		{
+    if (!m_Enemy) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
+    if (!EnemyIsDisguised() && !(m_Enemy->flags & FL_NOTARGET) && m_State != ACTOR_STATE_DISGUISE_ENEMY) {
+        TransitionState(ACTOR_STATE_DISGUISE_ENEMY, 0);
+    }
 
-			{
-				vec2_t facedir;
-				facedir[0] = m_Enemy->origin[0] - origin[0];
-				facedir[1] = m_Enemy->origin[1] - origin[1];
-				if (facedir[0] != 0 || facedir[1] != 0)
-				{
-					SetDesiredYawDir(facedir);
-				}
+    if (level.m_bAlarm) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        return;
+    }
 
-			}
+    SetDesiredYawDest(m_Enemy->origin);
+    SetDesiredLookDir(m_Enemy->origin - origin);
 
-			SetDesiredLookDir(m_Enemy->origin - origin);
+    switch (m_State) {
+    case ACTOR_STATE_DISGUISE_WAIT:
+        m_pszDebugState = "wait";
+        State_Disguise_Wait();
+        break;
+    case ACTOR_STATE_DISGUISE_PAPERS:
+        m_pszDebugState = "papers";
+        State_Disguise_Papers();
+        break;
+    case ACTOR_STATE_DISGUISE_ACCEPT:
+        m_pszDebugState = "accept";
+        State_Disguise_Accept();
+        break;
+    case ACTOR_STATE_DISGUISE_ENEMY:
+        m_pszDebugState = "enemy";
+        State_Disguise_Enemy();
+        break;
+    case ACTOR_STATE_DISGUISE_HALT:
+        m_pszDebugState = "halt";
+        State_Disguise_Halt();
+        break;
+    case ACTOR_STATE_DISGUISE_DENY:
+        m_pszDebugState = "deny";
+        State_Disguise_Deny();
+        break;
+    default:
+        Com_Printf("Actor::Think_DisguiseSentry: invalid think state %i\n", m_State);
+        assert(!"invalid think state");
+        break;
+    }
 
-			switch (m_State)
-			{
-			case 0:
-				m_pszDebugState = "wait";
-				State_Disguise_Wait();
-				break;
-			case 1:
-				m_pszDebugState = "papers";
-				State_Disguise_Papers();
-				break;
-			case 2:
-				m_pszDebugState = "accept";
-				State_Disguise_Accept();
-				break;
-			case 3:
-				m_pszDebugState = "enemy";
-				State_Disguise_Enemy();
-				break;
-			case 4:
-				m_pszDebugState = "halt";
-				State_Disguise_Halt();
-				break;
-			case 5:
-				m_pszDebugState = "deny";
-				State_Disguise_Deny();
-				break;
-			default:
-				Com_Printf("Actor::Think_DisguiseSentry: invalid think state %i\n", m_State);
-				assert(!"invalid think state");
-				break;
-			}
-			CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL);
-			PostThink(true);
-		}
-	}
+    if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+        CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE);
+    }
+
+    PostThink(true);
 }
diff --git a/code/fgame/actor_dog.cpp b/code/fgame/actor_dog.cpp
index 46dcb909..023f4297 100644
--- a/code/fgame/actor_dog.cpp
+++ b/code/fgame/actor_dog.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,176 +24,125 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitDogIdle
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDogIdle(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Dog;
-	func->EndState						= &Actor::End_Dog;
-	func->ThinkState					= &Actor::Think_Dog_Idle;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->IsState						= &Actor::IsDogState;
+    func->BeginState                 = &Actor::Begin_Dog;
+    func->EndState                   = &Actor::End_Dog;
+    func->ThinkState                 = &Actor::Think_Dog_Idle;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->IsState                    = &Actor::IsDogState;
 }
 
-void Actor::InitDogAttack
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDogAttack(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Dog;
-	func->EndState						= &Actor::End_Dog;
-	func->ThinkState					= &Actor::Think_Dog_Attack;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->IsState						= &Actor::IsDogState;
+    func->BeginState                 = &Actor::Begin_Dog;
+    func->EndState                   = &Actor::End_Dog;
+    func->ThinkState                 = &Actor::Think_Dog_Attack;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->IsState                    = &Actor::IsDogState;
 }
 
-void Actor::InitDogCurious
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDogCurious(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Dog;
-	func->EndState						= &Actor::End_Dog;
-	func->ThinkState					= &Actor::Think_Dog_Curious;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Curious;
-	func->IsState						= &Actor::IsDogState;
+    func->BeginState                 = &Actor::Begin_Dog;
+    func->EndState                   = &Actor::End_Dog;
+    func->ThinkState                 = &Actor::Think_Dog_Curious;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Curious;
+    func->IsState                    = &Actor::IsDogState;
 }
 
-void Actor::Begin_Dog
-	(
-	void
-	)
+bool Actor::IsDogState(int state)
 {
-	m_bDog = true;
+    return true;
 }
 
-void Actor::End_Dog
-	(
-	void
-	)
+void Actor::Begin_Dog(void)
 {
-	;
+    m_bIsAnimal = true;
 }
 
-void Actor::Think_Dog_Idle
-	(
-	void
-	)
+void Actor::End_Dog(void)
 {
-	if( !RequireThink() )
-	{
-		return;
-	}
-
-	UpdateEyeOrigin();
-	m_pszDebugState = "Dog_Idle";
-	m_bHasDesiredLookAngles = false;
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DOG_IDLE_SCR;
-	CheckForThinkStateTransition();
-	PostThink( false );
+    ;
 }
 
-void Actor::Think_Dog_Attack
-	(
-	void
-	)
+void Actor::Think_Dog_Idle(void)
 {
-	if (!RequireThink())
-	{
-		return;
-	}
+    if (!RequireThink()) {
+        return;
+    }
 
-	UpdateEyeOrigin();
-	m_pszDebugState = "Dog_Attack";
+    UpdateEyeOrigin();
+    m_pszDebugState = "Dog_Idle";
 
-	if (m_Enemy && !(m_Enemy->IsSubclassOfActor()))
-	{
+    NoPoint();
+    ForwardLook();
 
-		SetPath(m_Enemy->origin, NULL, 0, NULL, 0.0);
-		if (PathExists())
-		{
-			vec2_t delta;
-			VectorSub2D(m_Enemy->origin, origin, delta);
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DOG_IDLE_SCR);
 
-			if (VectorLength2DSquared(delta) >= 8000)
-			{
-				FaceMotion();
-				m_csNextAnimString = STRING_ANIM_DOG_CHASE_SCR;
-				m_eNextAnimMode = 2;
-			}
-			else
-			{
-				{
-					vec2_t facedir;
-					facedir[0] = m_Enemy->origin[0] - origin[0];
-					facedir[1] = m_Enemy->origin[1] - origin[1];
-					if (facedir[0] != 0 || facedir[1] != 0)
-					{
-						SetDesiredYawDir(facedir);
-					}
-
-				}
-				SetDesiredLookDir(m_Enemy->origin - origin);
-				m_eNextAnimMode = 1;
-				m_csNextAnimString = STRING_ANIM_DOG_ATTACK_SCR;
-			}
-			m_bNextForceStart = false;
-			CheckForThinkStateTransition();
-			PostThink(false);
-			return;
-		}
-
-		{
-			vec2_t facedir;
-			facedir[0] = m_Enemy->origin[0] - origin[0];
-			facedir[1] = m_Enemy->origin[1] - origin[1];
-			if (facedir[0] != 0 || facedir[1] != 0)
-			{
-				SetDesiredYawDir(facedir);
-			}
-
-		}
-		SetDesiredLookDir(m_Enemy->origin - origin);
-	}
-	m_bNextForceStart = false;
-	m_eNextAnimMode = 1;
-	m_csNextAnimString = STRING_ANIM_DOG_CURIOUS_SCR;
-	TransitionState(20, 0);
-
-	CheckForThinkStateTransition();
-	PostThink(false);
+    CheckForThinkStateTransition();
+    PostThink(false);
 }
 
-void Actor::Think_Dog_Curious
-	(
-	void
-	)
+void Actor::Think_Dog_Attack(void)
 {
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		m_pszDebugState = "Dog_Curious";
+    if (!RequireThink()) {
+        return;
+    }
 
-		if (m_Enemy && !m_Enemy->IsSubclassOfActor())
-		{
-			vec2_t vDelta;
-			VectorSub2D(m_Enemy->origin, origin, vDelta);
+    UpdateEyeOrigin();
+    m_pszDebugState = "Dog_Attack";
 
-			if (vDelta[0] != 0 || vDelta[1] != 0)
-			{
-				SetDesiredYawDir(vDelta);
-			}
+    if (!m_Enemy || (m_Enemy->flags & FL_NOTARGET)) {
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DOG_CURIOUS_SCR);
+        TransitionState(20);
 
-			SetDesiredLookDir(m_Enemy->origin - origin);
+        CheckForThinkStateTransition();
+        PostThink(false);
+        return;
+    }
 
-		}
-		m_bNextForceStart = false;
-		m_eNextAnimMode = 1;
-		m_csNextAnimString = STRING_ANIM_DOG_CURIOUS_SCR;
+    SetPath(m_Enemy->origin, NULL, 0, NULL, 0.0);
 
-		CheckForThinkStateTransition();
-		PostThink(false);
-	}
+    if (PathExists()) {
+        vec2_t delta;
+        VectorSub2D(m_Enemy->origin, origin, delta);
+
+        if (VectorLength2DSquared(delta) >= 8000) {
+            FaceMotion();
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_DOG_CHASE_SCR);
+        } else {
+            SetDesiredYawDest(m_Enemy->origin);
+            SetDesiredLookDir(m_Enemy->origin - origin);
+            DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DOG_ATTACK_SCR);
+        }
+    } else {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
+        DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DOG_CURIOUS_SCR);
+        TransitionState(20);
+    }
+
+    CheckForThinkStateTransition();
+    PostThink(false);
+}
+
+void Actor::Think_Dog_Curious(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    m_pszDebugState = "Dog_Curious";
+
+    if (m_Enemy && !(m_Enemy->flags & FL_NOTARGET)) {
+        SetDesiredYawDest(m_Enemy->origin);
+        SetDesiredLookDir(m_Enemy->origin - origin);
+    }
+
+    DesiredAnimation(ANIM_MODE_NORMAL, STRING_ANIM_DOG_CURIOUS_SCR);
+
+    CheckForThinkStateTransition();
+    PostThink(false);
 }
diff --git a/code/fgame/actor_grenade.cpp b/code/fgame/actor_grenade.cpp
index 7a75aed3..6a6d355b 100644
--- a/code/fgame/actor_grenade.cpp
+++ b/code/fgame/actor_grenade.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,661 +25,530 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "weaputils.h"
 
-void Actor::InitGrenade
-	(
-	GlobalFuncs_t *func
-	)
+bool Actor::Grenade_Acquire(eGrenadeState eNextState, const_str csReturnAnim)
 {
-	func->ThinkState					= &Actor::Think_Grenade;
-	func->BeginState					= &Actor::Begin_Grenade;
-	func->EndState						= &Actor::End_Grenade;
-	func->ResumeState					= &Actor::Resume_Grenade;
-	func->SuspendState					= &Actor::End_Grenade;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Grenade;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Grenade;
-	func->IsState						= &Actor::IsGrenadeState;
+    vec3_t vDest;
+    bool   bRetVal = false;
+
+    if (m_bGrenadeBounced) {
+        m_bGrenadeBounced = false;
+        bRetVal           = true;
+
+        VectorSubtract(origin, m_vGrenadePos, vDest);
+        VectorNormalizeFast(vDest);
+
+        VectorMA(m_vGrenadePos, 16, vDest, vDest);
+
+        SetPath(vDest, NULL, 0, NULL, 0);
+    }
+
+    if (!PathExists()) {
+        m_bGrenadeBounced = true;
+        m_eGrenadeState   = AI_GRENSTATE_FLEE;
+        Grenade_Flee();
+        return false;
+    }
+
+    if (PathComplete()) {
+        ForwardLook();
+
+        if (VectorLength2DSquared(m_pGrenade->velocity) >= Square(32)) {
+            Anim_Stand();
+        } else {
+            m_pGrenade->velocity = vec_zero;
+            m_eGrenadeState      = eNextState;
+            DesiredAnimation(ANIM_MODE_NORMAL, csReturnAnim);
+        }
+    } else {
+        Anim_RunToCasual(ANIM_MODE_PATH_GOAL);
+        VectorSub2D(origin, m_vGrenadePos, vDest);
+
+        if (VectorLength2DSquared(vDest) > Square(32)) {
+            FaceMotion();
+        } else {
+            SetDesiredYawDest(m_vGrenadePos);
+        }
+    }
+
+    return bRetVal;
 }
 
-bool Actor::Grenade_Acquire
-	(
-	eGrenadeState eNextState,
-	const_str csReturnAnim
-	)
+void Actor::InitGrenade(GlobalFuncs_t *func)
 {
-	bool bRetVal = false;
-	Vector vDest;
-	if (m_bGrenadeBounced)
-	{
-		bRetVal = true;
-		vDest = origin - m_vGrenadePos;
-		vDest = vDest * 16 + m_vGrenadePos;
-		SetPath(vDest, NULL, 0, NULL, 0.0);
-	}
-	if (PathExists())
-	{
-		if (PathComplete())
-		{
-			m_bHasDesiredLookAngles = false;
-			if (m_pGrenade->velocity.lengthXYSquared() >= 1024)
-			{
-				Anim_Stand();
-			}
-			else
-			{
-				m_pGrenade->velocity = vec_zero;
-
-				m_eNextAnimMode = 1;
-				m_eGrenadeState = eNextState;
-				m_bNextForceStart = false;
-				m_csNextAnimString = csReturnAnim;
-			}
-		}
-		else
-		{
-			Anim_RunToCasual(3);
-
-			vec2_t delta;
-			VectorSub2D(origin, m_vGrenadePos, delta);
-
-			if (VectorLength2DSquared(delta) > 1024.0)
-			{
-				FaceMotion();
-			}
-			else
-			{
-				{
-					vec2_t facedir;
-					facedir[0] = m_vGrenadePos[0] - origin[0];
-					facedir[1] = m_vGrenadePos[1] - origin[1];
-					if (facedir[0] != 0 || facedir[1] != 0)
-					{
-						SetDesiredYawDir(facedir);
-					}
-
-				}
-			}
-		}
-	}
-	else
-	{
-		m_bGrenadeBounced = true;
-		m_eGrenadeState = AI_GRENSTATE_FLEE;
-		Grenade_Flee();
-		bRetVal = false;
-	}
-
-	return bRetVal;
+    func->ThinkState                 = &Actor::Think_Grenade;
+    func->BeginState                 = &Actor::Begin_Grenade;
+    func->EndState                   = &Actor::End_Grenade;
+    func->ResumeState                = &Actor::Resume_Grenade;
+    func->SuspendState               = &Actor::End_Grenade;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Grenade;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Grenade;
+    func->IsState                    = &Actor::IsGrenadeState;
 }
 
-void Actor::Grenade_Flee
-	(
-	void
-	)
+void Actor::Grenade_Flee(void)
 {
-	//float origin_ratio;
-	float fMinCloseDistSquared;
-	float fCosAngle;
-	float fSinAngle;
-	float fAngle;
-	vec2_t vDirAway;
-	vec2_t vDirPreferred;
+    vec2_t    vDirPreferred;
+    vec2_t    vDirAway;
+    float     fAngle, fSinAngle, fCosAngle;
+    float     fMinCloseDistSquared;
+    vec2_t    grenade_offset;
+    float     origin_ratio;
+    PathInfo *current_node;
 
-	if (m_bGrenadeBounced)
-	{
-		fAngle = (rand() - 0x3FFFFFFF) * -0.00000000146291807926716;
+    if (m_bGrenadeBounced) {
+        fAngle    = (rand() - 0x3FFFFFFF) / 683565275.f;
+        fSinAngle = sin(fAngle);
+        fCosAngle = cos(fAngle);
 
-		fSinAngle = sin(fAngle);
-		fCosAngle = cos(fAngle);
+        VectorSub2D(origin, m_vGrenadePos, vDirAway);
 
-		VectorSub2D(origin, m_vGrenadePos, vDirAway);
+        vDirPreferred[0] = vDirAway[0] * fCosAngle - vDirAway[1] * fSinAngle;
+        vDirPreferred[1] = vDirAway[0] * fSinAngle + vDirAway[1] * fCosAngle;
 
-		vDirPreferred[0] = vDirAway[0] * fCosAngle - fSinAngle * vDirAway[1];
-		vDirPreferred[1] = vDirAway[0] * fSinAngle + vDirAway[1] * fCosAngle;
+        FindPathAway(m_vGrenadePos, vDirPreferred, 512);
 
-		FindPathAway(m_vGrenadePos, vDirPreferred, 512);
+        if (PathExists() && !PathComplete()) {
+            fMinCloseDistSquared = VectorLength2DSquared(vDirAway) * 0.64f;
 
-		if (PathExists() && !PathComplete())
-		{
-			fMinCloseDistSquared = VectorLength2DSquared(vDirAway) * 0.63999999;
-		
-			if (fMinCloseDistSquared < 1024)
-				fMinCloseDistSquared = 0;
+            if (fMinCloseDistSquared < Square(64)) {
+                fMinCloseDistSquared = 0;
+            }
 
-			vec2_t grenade_offset;
-			for (auto current_node = CurrentPathNode(); current_node >= LastPathNode(); current_node--)
-			{
-				VectorSub2D(m_vGrenadePos, current_node->point, grenade_offset);
-				if (current_node->dist > 0 && DotProduct2D(grenade_offset, current_node->dir) <= current_node->dist)
-				{
-					if (Square(CrossProduct2D(grenade_offset, current_node->dir)) < fMinCloseDistSquared)
-					{
-						ClearPath();
-						break;
-					}
-				}
-			}
-		}
-		m_bGrenadeBounced = false;
-	}
+            for (current_node = CurrentPathNode(); current_node >= LastPathNode(); current_node--) {
+                VectorSub2D(m_vGrenadePos, current_node->point, grenade_offset);
 
-	if (PathExists() && !PathComplete())
-	{
-		Sentient *pOwner = NULL;
-		if (m_pGrenade && m_pGrenade->IsSubclassOfProjectile())
-			pOwner = ((Projectile *)m_pGrenade.Pointer())->GetOwner();
+                origin_ratio = DotProduct2D(grenade_offset, current_node->dir);
+                if (origin_ratio <= 0) {
+                    continue;
+                }
 
-		if (pOwner && pOwner->m_Team == m_Team)
-			Anim_RunTo(3);
-		else
-			Anim_RunToFlee(3);
-		FaceMotion();
-	}
-	else
-	{
+                if (origin_ratio > current_node->dist) {
+                    continue;
+                }
 
-		if ((origin - m_vGrenadePos).lengthXYSquared() >= 100352 
-			|| !G_SightTrace(
-			centroid,
-			vec_zero,
-			vec_zero,
-			m_vGrenadePos,
-			this,
-			m_pGrenade,
-			33819417,
-			0,
-			"Actor::Grenade_Flee"))
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE_SUCCESS;
-			Anim_Attack();
-			AimAtTargetPos();
-		}
-		else
-		{
-			m_bHasDesiredLookAngles = false;
-			m_eGrenadeState = AI_GRENSTATE_FLEE_FAIL;
-			Anim_Cower();
-		}
-	}
+                if (Square(CrossProduct2D(grenade_offset, current_node->dir)) < fMinCloseDistSquared) {
+                    ClearPath();
+                    break;
+                }
+            }
+        }
+
+        m_bGrenadeBounced = false;
+    }
+
+    if (PathExists() && !PathComplete()) {
+        Sentient *pOwner = NULL;
+
+        if (m_pGrenade && m_pGrenade->IsSubclassOfProjectile()) {
+            pOwner = static_cast<Projectile *>(m_pGrenade.Pointer())->GetOwner();
+        }
+
+        if (pOwner && pOwner->m_Team == m_Team) {
+            Anim_RunTo(ANIM_MODE_PATH_GOAL);
+        } else {
+            Anim_RunToFlee(ANIM_MODE_PATH_GOAL);
+        }
+
+        FaceMotion();
+    }
+    else if ((origin - m_vGrenadePos).lengthXYSquared() >= 100352
+        || !G_SightTrace(
+            centroid, vec_zero, vec_zero, m_vGrenadePos, this, m_pGrenade, MASK_CANSEE, 0, "Actor::Grenade_Flee"
+        )) {
+        m_eGrenadeState = AI_GRENSTATE_FLEE_SUCCESS;
+        Anim_Attack();
+        AimAtTargetPos();
+    } else {
+        m_eGrenadeState = AI_GRENSTATE_FLEE_FAIL;
+        ForwardLook();
+        Anim_Cower();
+    }
 }
 
-void Actor::Grenade_ThrowAcquire
-	(
-	void
-	)
+void Actor::Grenade_ThrowAcquire(void)
 {
-	if (!Grenade_Acquire(AI_GRENSTATE_THROW, STRING_ANIM_GRENADERETURN_SCR)
-		&& !CanGetGrenadeFromAToB(
-			m_vGrenadePos,
-			m_vLastEnemyPos,
-			true,
-			&m_vGrenadeVel,
-			&m_eGrenadeMode))
-	{
-		m_bGrenadeBounced = true;
-		m_eGrenadeState = AI_GRENSTATE_FLEE;
-		Grenade_Flee();
-	}
+    if (Grenade_Acquire(AI_GRENSTATE_THROW, STRING_ANIM_GRENADERETURN_SCR)) {
+        return;
+    }
+
+    if (CanGetGrenadeFromAToB(m_vGrenadePos, m_vLastEnemyPos, true, &m_vGrenadeVel, &m_eGrenadeMode)) {
+        return;
+    }
+
+    m_eGrenadeState   = AI_GRENSTATE_FLEE;
+    m_bGrenadeBounced = true;
+    Grenade_Flee();
 }
 
-void Actor::Grenade_Throw
-	(
-	void
-	)
+void Actor::Grenade_Throw(void)
 {
-	m_bHasDesiredLookAngles = false;
-
-	SetDesiredYawDir(m_vGrenadeVel);
-
-	ContinueAnimation();
+    ForwardLook();
+    SetDesiredYawDir(m_vGrenadeVel);
+    ContinueAnimation();
 }
 
-void Actor::Grenade_KickAcquire
-	(
-	void
-	)
+void Actor::Grenade_KickAcquire(void)
 {
-	Vector vFace = vec_zero;
-	if (!Grenade_Acquire(AI_GRENSTATE_KICK, STRING_ANIM_GRENADEKICK_SCR))
-	{
-		VectorSub2D(m_vGrenadePos, origin, vFace);
-		if (CanKickGrenade(m_vGrenadePos, m_vLastEnemyPos, vFace, &m_vGrenadeVel))
-		{
-			m_vKickDir = Vector(m_vGrenadeVel[0], m_vGrenadeVel[1], 0);
-			
-			VectorNormalizeFast(m_vKickDir);
-		}
-		else
-		{
-			m_bGrenadeBounced = true;
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-		}
-	}
+    Vector vDelta;
+
+    if (Grenade_Acquire(AI_GRENSTATE_KICK, STRING_ANIM_GRENADEKICK_SCR)) {
+        return;
+    }
+
+    vDelta   = m_vGrenadePos - origin;
+    vDelta.z = 0;
+
+    if (CanKickGrenade(m_vGrenadePos, m_vLastEnemyPos, vDelta, &m_vGrenadeVel)) {
+        m_vKickDir   = m_vGrenadeVel;
+        m_vKickDir.z = 0;
+        m_vKickDir.normalizefast();
+    } else {
+        m_eGrenadeState   = AI_GRENSTATE_FLEE;
+        m_bGrenadeBounced = true;
+        Grenade_Flee();
+    }
 }
 
-void Actor::Grenade_Kick
-	(
-	void
-	)
+void Actor::Grenade_Kick(void)
 {
-	m_bHasDesiredLookAngles = false;
-	ContinueAnimation();
+    ForwardLook();
+    ContinueAnimation();
 }
 
-void Actor::Grenade_MartyrAcquire
-	(
-	void
-	)
+void Actor::Grenade_MartyrAcquire(void)
 {
-	Vector vDest;
-	if (m_bGrenadeBounced)
-	{
-		m_bGrenadeBounced = false;
+    vec3_t vDest;
 
-		vDest = origin - m_vGrenadePos;
-		VectorNormalizeFast(vDest);
+    if (m_bGrenadeBounced) {
+        m_bGrenadeBounced = false;
 
-		vDest = vDest * 88 + m_vGrenadePos;
+        VectorSubtract(origin, m_vGrenadePos, vDest);
+        VectorNormalizeFast(vDest);
+        VectorMA(m_vGrenadePos, 88, vDest, vDest);
 
-		SetPath(vDest, NULL, 0, NULL, 0.0);
-	}
+        SetPath(vDest, NULL, 0, NULL, 0.0);
+    }
 
-	if (PathExists())
-	{
-		if (PathComplete())
-		{
-			m_bHasDesiredLookAngles = false;
+    if (!PathExists()) {
+        m_bGrenadeBounced = true;
+        m_eGrenadeState   = AI_GRENSTATE_FLEE;
+        Grenade_Flee();
+        return;
+    }
 
-			vDest = vec_zero;
-			m_pGrenade->velocity = vec_zero;
+    if (PathComplete()) {
+        ForwardLook();
+        m_pGrenade->velocity = vec_zero;
 
-			//weird ? m_pGrenade->velocity is vec_zero ???
-			if (m_pGrenade->velocity.lengthXYSquared() < 1024)
-			{
-				m_pGrenade->velocity = vec_zero;
+        if (m_pGrenade->velocity.lengthXYSquared() < Square(32)) {
+            m_pGrenade->velocity = vec_zero;
 
-				m_eGrenadeState = AI_GRENSTATE_MARTYR;
-				m_iStateTime = level.inttime;
-				Grenade_Martyr();
-			}
-		}
-		else
-		{
-			Anim_RunToCasual(3);
-			m_csPathGoalEndAnimScript = STRING_ANIM_GRENADEMARTYR_SCR;
-			if ((origin-m_vGrenadePos).lengthXYSquared() > 16384)
-			{
-				FaceMotion();
-			}
-			else
-			{
-				if (m_vGrenadePos - origin != vec_zero)
-				{
-					SetDesiredYawDir(m_vGrenadePos - origin);
-				}
-			}
-		}
-	}
-	else
-	{
-		m_bGrenadeBounced = true;
-		m_eGrenadeState = AI_GRENSTATE_FLEE;
-		Grenade_Flee();
-	}
+            m_eGrenadeState = AI_GRENSTATE_MARTYR;
+            m_iStateTime    = level.inttime;
+            Grenade_Martyr();
+        }
+    } else {
+        Anim_RunToCasual(ANIM_MODE_PATH_GOAL);
+        SetPathGoalEndAnim(STRING_ANIM_GRENADEMARTYR_SCR);
+
+        VectorSub2D(origin, m_vGrenadePos, vDest);
+        if (VectorLength2DSquared(vDest) > Square(128)) {
+            FaceMotion();
+        } else {
+            SetDesiredYawDest(m_vGrenadePos);
+        }
+    }
 }
 
-void Actor::Grenade_Martyr
-	(
-	void
-	)
+void Actor::Grenade_Martyr(void)
 {
-	if (m_pGrenade && level.inttime >= (m_iStateTime + 1000) - 0.5)
-	{
-		Projectile *m_pPGrenade = (Projectile *)m_pGrenade.Pointer();
+    if (m_pGrenade && level.inttime >= (m_iStateTime + 1000) - 0.5) {
+        static_cast<Projectile *>(m_pGrenade.Pointer())->SetMartyr(entnum);
+    }
 
-		m_pPGrenade->m_bHurtOwnerOnly = true;
-		m_pPGrenade->owner = entnum;
-		
-	}
-
-	m_bHasDesiredLookAngles = false;
-	ContinueAnimation();
+    ForwardLook();
+    ContinueAnimation();
 }
 
-void Actor::Grenade_Wait
-	(
-	void
-	)
+void Actor::Grenade_Wait(void)
 {
-	if (rand() & 0xF)
-	{
-		Anim_Cower();
-	}
-	else
-	{
-		Anim_Stand();
-		
-		Grenade_NextThinkState();
-	}
+    if (rand() & 0xF) {
+        Anim_Cower();
+    } else {
+        Anim_Stand();
+        Grenade_NextThinkState();
+    }
 }
 
-void Actor::Grenade_NextThinkState
-	(
-	void
-	)
+void Actor::Grenade_NextThinkState(void)
 {
-	if (m_Enemy && !(m_Enemy->IsSubclassOfActor()))
-		SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-	else
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
+    if (!m_Enemy || (m_Enemy->flags & FL_NOTARGET)) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        return;
+    }
+
+    SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
 }
 
-void Actor::Grenade_EventAttach
-	(
-	Event *ev
-	)
+void Actor::Grenade_EventAttach(Event *ev)
 {
-	if (m_pGrenade)
-	{
-		eGrenadeTossMode eMode;
-		Vector vVel;
-		int tagnum = gi.Tag_NumForName(edict->tiki, "tag_weapon_right");
-		if (tagnum >= 0)
-		{
-			vVel = vec_zero;
-			m_pGrenade->attach(
-				entnum,
-				tagnum,
-				qtrue,
-				vec3_origin);
-		}
-		m_pGrenade->avelocity = vec3_origin;
+    if (!m_pGrenade) {
+        return;
+    }
 
-		if (CanGetGrenadeFromAToB(
-			origin,
-			m_vLastEnemyPos,
-			true,
-			&vVel,
-			&eMode))
-		{
-			m_vGrenadeVel = vVel;
-			m_eGrenadeMode = eMode;
-		}
+    int              tagnum;
+    Vector           vVel;
+    eGrenadeTossMode eMode;
 
-		SetDesiredYawDir(m_vGrenadeVel);
-	}
+    tagnum = gi.Tag_NumForName(edict->tiki, "tag_weapon_right");
+    if (tagnum >= 0) {
+        m_pGrenade->attach(entnum, tagnum, qtrue, vec3_origin);
+    }
+
+    m_pGrenade->avelocity = vec3_origin;
+
+    if (CanGetGrenadeFromAToB(origin, m_vLastEnemyPos, true, &vVel, &eMode)) {
+        m_vGrenadeVel  = vVel;
+        m_eGrenadeMode = eMode;
+    }
+
+    SetDesiredYawDir(m_vGrenadeVel);
 }
 
-void Actor::Grenade_EventDetach
-	(
-	Event *ev
-	)
+void Actor::Grenade_EventDetach(Event *ev)
 {
-	if (m_pGrenade)
-	{
-		m_pGrenade->detach();
-		m_pGrenade->setOrigin(GrenadeThrowPoint(origin, orientation[0], m_eGrenadeMode == AI_GREN_KICK ? STRING_ANIM_GRENADEKICK_SCR : STRING_ANIM_GRENADERETURN_SCR));
-		m_pGrenade->velocity = m_vGrenadeVel;
+    if (!m_pGrenade) {
+        return;
+    }
 
-		m_pGrenade->edict->r.ownerNum = edict->s.number;
-		m_pGrenade->groundentity = NULL;
-		
-	}
+    const_str csAnim;
+
+    m_pGrenade->detach();
+    csAnim = m_eGrenadeMode == AI_GREN_KICK ? STRING_ANIM_GRENADEKICK_SCR : STRING_ANIM_GRENADERETURN_SCR;
+
+    m_pGrenade->setOrigin(GrenadeThrowPoint(origin, orientation[0], csAnim));
+    m_pGrenade->velocity = m_vGrenadeVel;
+
+    m_pGrenade->edict->r.ownerNum = edict->s.number;
+    m_pGrenade->groundentity      = NULL;
 }
 
-void Actor::Begin_Grenade
-	(
-	void
-	)
+void Actor::Begin_Grenade(void)
 {
-	DoForceActivate();
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
+    DoForceActivate();
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
 
-	if (m_pGrenade)
-	{
-		if (m_pGrenade->enemy)
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-		//LABEL_4:
-			Grenade_Flee();
-			return;
-		}
+    if (!m_pGrenade) {
+        if (m_Enemy && (m_Enemy->flags & FL_NOTARGET)) {
+            SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+        } else if (m_Team != TEAM_GERMAN) {
+            SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+        } else {
+            if (!IsTeamMate(static_cast<Sentient *>(G_GetEntity(0)))) {
+                ForceAttackPlayer();
+            }
+        }
 
-		if (m_pGrenade->edict->r.ownerNum == entnum)
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
-		bool bHasThrowTarget = true;
-		float fDistSquared;
-		Vector vDelta;
-		if (!m_Enemy)
-		{
-			Sentient *pEnemy = (Sentient *)G_GetEntity(m_pGrenade->edict->r.ownerNum);
+        return;
+    }
 
-			if (pEnemy && pEnemy->m_Team != m_Team)
-			{
-				SetEnemyPos(pEnemy->origin);
-			}
-			else
-			{
-				bHasThrowTarget = false;
-			}
-		}
-		if (!bHasThrowTarget)
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
-		vDelta = m_vGrenadePos - origin;
-		vDelta.z = 0;
-		fDistSquared = vDelta.lengthXYSquared();
-		if (fDistSquared >= 65536)
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
+    if (m_pGrenade->enemy || m_pGrenade->edict->r.ownerNum == entnum) {
+        m_eGrenadeState = AI_GRENSTATE_FLEE;
+        Grenade_Flee();
+        return;
+    }
 
-		if (fDistSquared > 16384 && GrenadeWillHurtTeamAt(m_vGrenadePos))
-		{
-			m_pGrenade->enemy = this;
+    if (m_pGrenade) {
+        vec3_t vDelta;
+        float  fDistSquared;
+        bool   bHasThrowTarget;
 
-			m_eGrenadeState = AI_GRENSTATE_MARTYR_ACQUIRE;
-			Grenade_MartyrAcquire();
-			return;
-		}
+        bHasThrowTarget = true;
+        if (!m_Enemy) {
+            Sentient *pEnemy = static_cast<Sentient *>(G_GetEntity(m_pGrenade->edict->r.ownerNum));
 
-		if (GrenadeWillHurtTeamAt(m_vLastEnemyPos))
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
+            if (pEnemy && pEnemy->m_Team != m_Team) {
+                SetEnemyPos(pEnemy->origin);
+            } else {
+                bHasThrowTarget = false;
+            }
+        }
 
-		if (CanKickGrenade(m_vGrenadePos, m_vLastEnemyPos, vDelta, &m_vGrenadeVel))
-		{
-			m_eGrenadeMode = AI_GREN_KICK;
+        if (!bHasThrowTarget) {
+            m_eGrenadeState = AI_GRENSTATE_FLEE;
+            Grenade_Flee();
+            return;
+        }
 
-			m_vKickDir = Vector(m_vGrenadeVel[0], m_vGrenadeVel[1], 0);
-			VectorNormalizeFast(m_vKickDir);
+        VectorSub2D(m_vGrenadePos, origin, vDelta);
+        fDistSquared = VectorLength2DSquared(vDelta);
 
-			m_pGrenade->enemy = this; 
-			
-			m_eGrenadeState = AI_GRENSTATE_KICK_ACQUIRE;
-			PostponeEvent(EV_Projectile_Explode, 0.25);
-			Grenade_KickAcquire();
-			return;
-		}
+        if (fDistSquared >= Square(256)) {
+            m_eGrenadeState = AI_GRENSTATE_FLEE;
+            Grenade_Flee();
+            return;
+        }
 
-		if (!CanGetGrenadeFromAToB(m_vGrenadePos, m_vLastEnemyPos, true, &m_vGrenadeVel, &m_eGrenadeMode))
-		{
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
+        if (fDistSquared > 16384 && GrenadeWillHurtTeamAt(m_vGrenadePos)) {
+            m_pGrenade->enemy = this;
 
-		m_pGrenade->enemy = this;
+            m_eGrenadeState = AI_GRENSTATE_MARTYR_ACQUIRE;
+            Grenade_MartyrAcquire();
+            return;
+        }
 
-		m_eGrenadeState = AI_GRENSTATE_THROW_ACQUIRE;
-		PostponeEvent(EV_Projectile_Explode, 0.75);
-		if (!Grenade_Acquire(AI_GRENSTATE_THROW, STRING_ANIM_GRENADERETURN_SCR)
-			&& !Actor::CanGetGrenadeFromAToB(m_vGrenadePos, m_vLastEnemyPos, true, &m_vGrenadeVel, &m_eGrenadeMode))
-		{
-			m_bGrenadeBounced = true;
-			m_eGrenadeState = AI_GRENSTATE_FLEE;
-			Grenade_Flee();
-			return;
-		}
-	}
-	else
-	{
-		if (m_Enemy && !m_Enemy->IsSubclassOfActor())
-		{
-			SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_NORMAL);
-		}
-		else if (m_Team == TEAM_AMERICAN)
-		{
-			SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-		}
-		else
-		{
-			if (!IsTeamMate((Sentient*)G_GetEntity(0)))
-				ForceAttackPlayer();
-		}
-	}
+        if (GrenadeWillHurtTeamAt(m_vLastEnemyPos)) {
+            m_eGrenadeState = AI_GRENSTATE_FLEE;
+            Grenade_Flee();
+            return;
+        }
+
+        Vector vFace = vDelta;
+        if (CanKickGrenade(m_vGrenadePos, m_vLastEnemyPos, vFace, &m_vGrenadeVel)) {
+            m_eGrenadeMode = AI_GREN_KICK;
+
+            m_vKickDir   = m_vGrenadeVel;
+            m_vKickDir.z = 0;
+            m_vKickDir.normalizefast();
+
+            m_pGrenade->enemy = this;
+            m_eGrenadeState   = AI_GRENSTATE_KICK_ACQUIRE;
+
+            PostponeEvent(EV_Projectile_Explode, 0.25);
+            Grenade_KickAcquire();
+            return;
+        }
+
+        if (!CanGetGrenadeFromAToB(m_vGrenadePos, m_vLastEnemyPos, true, &m_vGrenadeVel, &m_eGrenadeMode)) {
+            m_eGrenadeState = AI_GRENSTATE_FLEE;
+            Grenade_Flee();
+            return;
+        }
+
+        m_pGrenade->enemy = this;
+
+        m_eGrenadeState = AI_GRENSTATE_THROW_ACQUIRE;
+        PostponeEvent(EV_Projectile_Explode, 0.75);
+
+        Grenade_ThrowAcquire();
+    } else if (m_Enemy && !m_Enemy->IsSubclassOfActor()) {
+        SetThinkState(THINKSTATE_ATTACK, THINKLEVEL_IDLE);
+    } else if (m_Team == TEAM_AMERICAN) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    } else {
+        if (!IsTeamMate((Sentient *)G_GetEntity(0))) {
+            ForceAttackPlayer();
+        }
+    }
 }
 
-void Actor::End_Grenade
-	(
-	void
-	)
+void Actor::End_Grenade(void)
 {
-	m_pszDebugState = "";
+    m_pszDebugState = "";
 }
 
-void Actor::Resume_Grenade
-	(
-	void
-	)
+void Actor::Resume_Grenade(void)
 {
-	if (m_pGrenade)
-		Begin_Grenade();
-	else
-		Grenade_NextThinkState();
+    if (m_pGrenade) {
+        Begin_Grenade();
+    } else {
+        Grenade_NextThinkState();
+    }
 }
 
-void Actor::Think_Grenade
-	(
-	void
-	)
+void Actor::FinishedAnimation_Grenade(void)
 {
-	if (m_bEnableEnemy)
-		UpdateEnemy(200);
-	m_pszDebugState = "";
-	NoPoint();
-
-	if (level.inttime - m_iFirstGrenadeTime > 8000)
-	{
-		Anim_Stand();
-		Grenade_NextThinkState();
-		PostThink(false);
-		return;
-	}
-
-	if (!m_pGrenade)
-	{
-		if (m_eGrenadeState && m_eGrenadeState != AI_GRENSTATE_FLEE_FAIL)
-		{
-			// weird ? no such thing as 8 ?
-			// FIXME?
-			if (m_eGrenadeMode == (eGrenadeTossMode)8)
-				Anim_Attack();
-			else
-				Anim_Stand();
-			Grenade_NextThinkState();
-		}
-		else
-		{
-			m_pszDebugState = "Wait";
-			Grenade_Wait();
-		}
-		PostThink(false);
-		return;
-	}
-
-	switch (m_eGrenadeState)
-	{
-	case AI_GRENSTATE_FLEE:
-	case AI_GRENSTATE_FLEE_SUCCESS:
-	case AI_GRENSTATE_FLEE_FAIL:
-		m_pszDebugState = "RunAway";
-		Grenade_Flee();
-		break;
-	case AI_GRENSTATE_THROW_ACQUIRE:
-		m_pszDebugState = "ThrowAcquire";
-		Grenade_ThrowAcquire();
-		break;
-	case AI_GRENSTATE_THROW:
-		m_pszDebugState = "Throw";
-		Grenade_Throw();
-		break;
-	case AI_GRENSTATE_KICK_ACQUIRE:
-		m_pszDebugState = "KickAcquire";
-		Grenade_KickAcquire();
-		break;
-	case AI_GRENSTATE_KICK:
-		m_pszDebugState = "Kick";
-		m_bHasDesiredLookAngles = false;
-		ContinueAnimation();
-		break;
-	case AI_GRENSTATE_MARTYR_ACQUIRE:
-		m_pszDebugState = "MartyrAcquire";
-		Grenade_MartyrAcquire();
-		break;
-	case AI_GRENSTATE_MARTYR:
-		m_pszDebugState = "Martyr";
-		Grenade_Martyr();
-		break;
-	default:
-		m_pszDebugState = "***Invalid***";
-		char assertStr[16317] = { 0 };
-		strcpy(assertStr, "\"invalid grenade state\"\n\tMessage: ");
-		Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
-		assert(!assertStr);
-		break;
-	}
-
-	PostThink(false);
+    switch (m_eGrenadeState) {
+    case AI_GRENSTATE_FLEE:
+    case AI_GRENSTATE_THROW_ACQUIRE:
+    case AI_GRENSTATE_KICK_ACQUIRE:
+    case AI_GRENSTATE_MARTYR_ACQUIRE:
+    case AI_GRENSTATE_MARTYR:
+    case AI_GRENSTATE_FLEE_SUCCESS:
+    case AI_GRENSTATE_FLEE_FAIL:
+        return;
+    case AI_GRENSTATE_THROW:
+    case AI_GRENSTATE_KICK:
+        Grenade_NextThinkState();
+        break;
+    default:
+        char assertStr[16317] = {0};
+        Q_strncpyz(assertStr, "\"invalid grenade state in FinishedAnimation()\"\n\tMessage: ", sizeof(assertStr));
+        Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("state = %i", m_eGrenadeState));
+        assert(!assertStr);
+        break;
+    }
 }
 
-void Actor::FinishedAnimation_Grenade
-	(
-	void
-	)
+void Actor::Think_Grenade(void)
 {
-	switch (m_eGrenadeState)
-	{
-	case AI_GRENSTATE_FLEE:
-	case AI_GRENSTATE_THROW_ACQUIRE:
-	case AI_GRENSTATE_KICK_ACQUIRE:
-	case AI_GRENSTATE_MARTYR_ACQUIRE:
-	case AI_GRENSTATE_MARTYR:
-	case AI_GRENSTATE_FLEE_SUCCESS:
-	case AI_GRENSTATE_FLEE_FAIL:
-		return;
-	case AI_GRENSTATE_THROW:
-	case AI_GRENSTATE_KICK:
-		Grenade_NextThinkState();
-		break;
-	default:
-		char assertStr[16317] = { 0 };
-		strcpy(assertStr, "\"invalid grenade state in FinishedAnimation()\"\n\tMessage: ");
-		Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("state = %i", m_eGrenadeState));
-		assert(!assertStr);
-		break;
-	}
+    if (m_bEnableEnemy) {
+        UpdateEnemy(200);
+    }
+
+    m_pszDebugState = "";
+    NoPoint();
+
+    if (level.inttime - m_iFirstGrenadeTime > 8000) {
+        Anim_Stand();
+        Grenade_NextThinkState();
+        PostThink(false);
+        return;
+    }
+
+    if (m_pGrenade) {
+        switch (m_eGrenadeState) {
+        case AI_GRENSTATE_FLEE:
+        case AI_GRENSTATE_FLEE_SUCCESS:
+        case AI_GRENSTATE_FLEE_FAIL:
+            m_pszDebugState = "RunAway";
+            Grenade_Flee();
+            break;
+        case AI_GRENSTATE_THROW_ACQUIRE:
+            m_pszDebugState = "ThrowAcquire";
+            Grenade_ThrowAcquire();
+            break;
+        case AI_GRENSTATE_THROW:
+            m_pszDebugState = "Throw";
+            Grenade_Throw();
+            break;
+        case AI_GRENSTATE_KICK_ACQUIRE:
+            m_pszDebugState = "KickAcquire";
+            Grenade_KickAcquire();
+            break;
+        case AI_GRENSTATE_KICK:
+            m_pszDebugState         = "Kick";
+            m_bHasDesiredLookAngles = false;
+            ContinueAnimation();
+            break;
+        case AI_GRENSTATE_MARTYR_ACQUIRE:
+            m_pszDebugState = "MartyrAcquire";
+            Grenade_MartyrAcquire();
+            break;
+        case AI_GRENSTATE_MARTYR:
+            m_pszDebugState = "Martyr";
+            Grenade_Martyr();
+            break;
+        default:
+            m_pszDebugState       = "***Invalid***";
+            char assertStr[16317] = {0};
+            strcpy(assertStr, "\"invalid grenade state\"\n\tMessage: ");
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
+            assert(!assertStr);
+            break;
+        }
+    } else if (m_eGrenadeState && m_eGrenadeState != AI_GRENSTATE_FLEE_FAIL) {
+        if (m_eGrenadeMode == AI_GRENSTATE_FLEE_SUCCESS) {
+            Anim_Attack();
+        } else {
+            Anim_Stand();
+        }
+        Grenade_NextThinkState();
+    } else {
+        m_pszDebugState = "Wait";
+        Grenade_Wait();
+    }
+
+    PostThink(false);
 }
diff --git a/code/fgame/actor_idle.cpp b/code/fgame/actor_idle.cpp
index 72d90f28..8b15dba8 100644
--- a/code/fgame/actor_idle.cpp
+++ b/code/fgame/actor_idle.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,105 +24,57 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitIdle
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitIdle(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Idle;
-	func->ThinkState					= &Actor::Think_Idle;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->IsState						= &Actor::IsIdleState;
+    func->BeginState                 = &Actor::Begin_Idle;
+    func->ThinkState                 = &Actor::Think_Idle;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::Begin_Idle
-	(
-	void
-	)
+void Actor::Begin_Idle(void)
 {
-	glbs.Printf("Begin_Idle\n");
-	m_csMood = m_csIdleMood;
-	ClearPath();
+    m_csMood = m_csIdleMood;
+    ClearPath();
 }
 
-void Actor::Think_Idle
-	(
-	void
-	)
+void Actor::IdleThink(void)
 {
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		m_pszDebugState = "";
-		CheckForThinkStateTransition();
-		IdleThink();
-	}
+    IdlePoint();
+    IdleLook();
+
+    if (PathExists() && PathComplete()) {
+        ClearPath();
+    }
+
+    if (m_bAutoAvoidPlayer && !PathExists()) {
+        SetPathToNotBlockSentient(static_cast<Sentient *>(G_GetEntity(0)));
+    }
+
+    if (PathExists()) {
+        Anim_WalkTo(ANIM_MODE_PATH);
+        if (PathDist() > 128.0) {
+            FaceMotion();
+        } else {
+            IdleTurn();
+        }
+    } else {
+        Anim_Idle();
+        IdleTurn();
+    }
+
+    PostThink(true);
 }
 
-void Actor::IdleThink
-(
-	void
-)
+void Actor::Think_Idle(void)
 {
-	IdlePoint();
-	IdleLook();
-	if (PathExists() && PathComplete())
-	{
-		ClearPath();
-	}
-	if (m_bAutoAvoidPlayer && !PathExists())
-	{
-		SetPathToNotBlockSentient((Sentient *)G_GetEntity(0));
-	}
+    if (!RequireThink()) {
+        return;
+    }
 
-	if (PathExists())
-	{
-		Anim_WalkTo(2);
-		if (PathDist() <= 128.0)
-			IdleTurn();
-		else
-			FaceMotion();
-	}
-	else
-	{
-		Anim_Idle();
-		IdleTurn();
-	}
+    UpdateEyeOrigin();
+    m_pszDebugState = "";
 
-	PostThink(true);
-
-}
-
-
-/*
-===============
-Actor::PassesTransitionConditions_Idle
-
-Should actor transition think state to idle ?
-===============
-*/
-bool Actor::PassesTransitionConditions_Idle
-(
-	void
-)
-{
-	glbs.Printf("PassesTransitionConditions_Idle\n");
-
-	UpdateEnemy(500);
-
-	if (m_bLockThinkState)
-		return false;
-
-	if (!m_Enemy && !m_iCuriousTime)
-		return true;
-
-	return false;
-}
-
-bool Actor::IsIdleState
-(
-	int state
-)
-{
-	return state == THINKSTATE_IDLE;
+    CheckForThinkStateTransition();
+    IdleThink();
 }
\ No newline at end of file
diff --git a/code/fgame/actor_killed.cpp b/code/fgame/actor_killed.cpp
index 366f7cde..bea83635 100644
--- a/code/fgame/actor_killed.cpp
+++ b/code/fgame/actor_killed.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,67 +24,49 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitDead
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitDead(GlobalFuncs_t *func)
 {
-	func->IsState = &Actor::IsKilledState;
+    func->IsState = &Actor::IsKilledState;
 }
 
-void Actor::InitKilled
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitKilled(GlobalFuncs_t *func)
 {
-	func->BeginState				= &Actor::Begin_Killed;
-	func->ThinkState				= &Actor::Think_Killed;
-	func->FinishedAnimation			= &Actor::FinishedAnimation_Killed;
-	func->IsState					= &Actor::IsKilledState;
+    func->BeginState        = &Actor::Begin_Killed;
+    func->ThinkState        = &Actor::Think_Killed;
+    func->FinishedAnimation = &Actor::FinishedAnimation_Killed;
+    func->IsState           = &Actor::IsKilledState;
 }
 
-void Actor::Begin_Killed
-	(
-	void
-	)
+void Actor::Begin_Killed(void)
 {
-	Event e1(EV_Actor_DeathEmbalm); // ebx
+    ClearPath();
+    ResetBoneControllers();
 
-	ClearPath();
-	ResetBoneControllers();
-
-	PostEvent(
-		e1,
-		0.05f);
-	TransitionState(700, 0);
+    PostEvent(EV_Actor_DeathEmbalm, 0.05f);
+    TransitionState(ACTOR_STATE_KILLED_BEGIN, 0);
 }
 
-void Actor::Think_Killed
-	(
-	void
-	)
+void Actor::Think_Killed(void)
 {
-	Unregister(STRING_ANIMDONE);
-	if (m_State == 700)
-	{
-		m_pszDebugState = "begin";
-		NoPoint();
-		m_bHasDesiredLookAngles = false;
-		StopTurning();
-		Anim_Killed();
-		PostThink(false);
-	}
-	else
-	{
-		m_pszDebugState = "end";
-	}
+    Unregister(STRING_ANIMDONE);
+
+    if (m_State != ACTOR_STATE_KILLED_BEGIN) {
+        m_pszDebugState = "end";
+        return;
+    }
+
+    m_pszDebugState = "begin";
+
+    NoPoint();
+    ForwardLook();
+    StopTurning();
+
+    Anim_Killed();
+    PostThink(false);
 }
 
-void Actor::FinishedAnimation_Killed
-	(
-	void
-	)
+void Actor::FinishedAnimation_Killed(void)
 {
-	BecomeCorpse();
-	TransitionState(701, 0);
+    BecomeCorpse();
+    TransitionState(ACTOR_STATE_KILLED_END);
 }
diff --git a/code/fgame/actor_machinegunner.cpp b/code/fgame/actor_machinegunner.cpp
index ddb52d66..f79690f3 100644
--- a/code/fgame/actor_machinegunner.cpp
+++ b/code/fgame/actor_machinegunner.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,337 +24,289 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 #include "weapturret.h"
+#include "bg_local.h"
 
-extern Vector MINS;
-extern Vector MAXS;
-
-void Actor::InitMachineGunner
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitMachineGunner(GlobalFuncs_t *func)
 {
-	func->BeginState				= &Actor::Begin_MachineGunner;
-	func->EndState					= &Actor::End_MachineGunner;
-	func->ThinkState				= &Actor::Think_MachineGunner;
-	func->IsState					= &Actor::IsMachineGunnerState;
-	func->FinishedAnimation			= &Actor::FinishedAnimation_MachineGunner;
+    func->BeginState        = &Actor::Begin_MachineGunner;
+    func->EndState          = &Actor::End_MachineGunner;
+    func->ThinkState        = &Actor::Think_MachineGunner;
+    func->IsState           = &Actor::IsMachineGunnerState;
+    func->FinishedAnimation = &Actor::FinishedAnimation_MachineGunner;
 }
 
-void Actor::Begin_MachineGunner
-	(
-	void
-	)
+bool Actor::IsMachineGunnerState(int state)
 {
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
-
-	if (m_pTurret)
-	{
-		Sentient *pOwner;
-		m_pTurret->m_bHadOwner = true;
-		pOwner = m_pTurret->GetOwner();
-		if (pOwner)
-		{
-			Com_Printf(
-				"^~^~^ Actor (entnum %d, radnum %d, targetname '%s') cannot use turret (entnum %d, radnum %d, targetname '%s')"
-				" since it is already being used by Actor (entnum %d, radnum %d, targetname '%s')\n",
-				entnum,
-				radnum,
-				targetname.c_str(),
-				m_pTurret->entnum,
-				m_pTurret->radnum,
-				m_pTurret->TargetName().c_str(),
-				pOwner->entnum,
-				pOwner->radnum,
-				pOwner->TargetName().c_str());
-		}
-		else
-		{
-			Holster();
-
-			m_pTurret->TurretBeginUsed(this);
-			TransitionState(1200, 0);
-		}
-	}
-	else
-	{
-		Com_Printf(
-			"^~^~^ Actor (entnum %d, radnum %d, targetname '%s') has no turret specified\n",
-			entnum,
-			radnum,
-			targetname.c_str());
-	}
-}
-void Actor::End_MachineGunner
-	(
-	void
-	)
-{
-	if (!GetWeapon(WEAPON_MAIN))
-		giveItem("models/weapons/mp40.tik");
-
-	Unholster();
-	if (m_pTurret)
-	{
-		if (m_pTurret->GetOwner() == this)
-		{
-			m_pTurret->TurretEndUsed();
-		}
-	}
-}
-void Actor::BecomeTurretGuy
-	(
-	void
-	)
-{
-	SetThinkIdle(THINK_IDLE);
-
-	SetThink(THINKSTATE_ATTACK, THINK_TURRET);
-	SetThink(THINKSTATE_DISGUISE, THINK_DISGUISE_SALUTE);
-	SetThink(THINKSTATE_GRENADE, THINK_GRENADE);
-
-	if (CurrentThink() == THINK_IDLE && Turret_DecideToSelectState())
-	{
-		TransitionState(100, 0);
-	}
+    return true;
 }
 
-void Actor::Think_MachineGunner
-	(
-	void
-	)
+void Actor::Begin_MachineGunner(void)
 {
-	if (RequireThink())
-	{
-		if (m_pTurret && m_pTurret->GetOwner() == this && !m_bNoPlayerCollision)
-		{
-			if (!m_bEnableEnemy)
-			{
-				ThinkHoldGun();
-				return;
-			}
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
 
-			if (level.inttime < m_iEnemyCheckTime + 200)
-			{
-				ThinkHoldGun();
-				return;
-			}
-			
-			m_iEnemyCheckTime = level.inttime;
+    if (!m_pTurret) {
+        Com_Printf(
+            "^~^~^ Actor (entnum %d, radnum %d, targetname '%s') has no turret specified\n",
+            entnum,
+            radnum,
+            targetname.c_str()
+        );
 
-			if (m_pTurret->CanTarget(G_GetEntity(0)->centroid))
-			{
-				ThinkHoldGun();
-				return;
-			}
-			if (!m_pGrenade || m_fGrenadeAwareness < rand() * 0.000000046566129)
-			{
-				if (!G_SightTrace(
-					EyePosition(),
-					vec_zero,
-					vec_zero,
-					G_GetEntity(0)->centroid,
-					this,
-					G_GetEntity(0),
-					33819417,
-					qfalse,
-					"Actor::Think_MachineGunner"))
-				{
-					ThinkHoldGun();
-					return;
-				}
-				if (m_ThinkStates[THINKLEVEL_NORMAL] != THINKSTATE_IDLE)
-				{
-					BecomeTurretGuy();
-					return;
-				}
+        return;
+    }
 
-				if (m_Enemy && !m_Enemy->IsSubclassOfActor() && !EnemyIsDisguised() && m_PotentialEnemies.GetCurrentVisibility() >= 1)
-				{
-					BecomeTurretGuy();
-					return;
-				}
+    Sentient *pOwner;
+    m_pTurret->m_bHadOwner = true;
+    pOwner                 = m_pTurret->GetOwner();
+    if (m_pTurret->GetOwner()) {
+        Com_Printf(
+            "^~^~^ Actor (entnum %d, radnum %d, targetname '%s') cannot use turret (entnum %d, radnum %d, "
+            "targetname '%s')"
+            " since it is already being used by Actor (entnum %d, radnum %d, targetname '%s')\n",
+            entnum,
+            radnum,
+            targetname.c_str(),
+            m_pTurret->entnum,
+            m_pTurret->radnum,
+            m_pTurret->targetname.c_str(),
+            m_pTurret->GetOwner()->entnum,
+            m_pTurret->GetOwner()->radnum,
+            m_pTurret->GetOwner()->targetname.c_str()
+        );
+    } else {
+        Holster();
 
-				if (!m_Enemy || !m_Enemy->IsSubclassOfActor() || EnemyIsDisguised() || m_PotentialEnemies.GetCurrentVisibility() > 1)
-				{
-					ThinkHoldGun();
-					return;
-				}
-
-				SetCuriousAnimHint(6);
-			}
-		}
-		BecomeTurretGuy();
-	}
+        m_pTurret->TurretBeginUsed(this);
+        TransitionState(ACTOR_STATE_MACHINE_GUNNER_READY);
+    }
 }
 
-void Actor::ThinkHoldGun
-	(
-	void
-	)
+void Actor::End_MachineGunner(void)
 {
-	Vector end;
-	trace_t trace;
-	float temp;
-	float temp2;
-	float machine_gunner_hands_up_stand;
-	float heightDiff;
-	float right;
-	//vec3_t newOrigin;
-	Vector offset;
-	Vector start;
-	//vec3_t new_angles;
-	Vector vForward;
-
-	UpdateEyeOrigin();
-	m_pszDebugState = "";
-	if (m_State == 1200)
-	{
-		if (m_pTurret->IsFiring())
-		{
-			if (m_pTurret->aim_target == G_GetEntity(0))
-			{
-				m_bNoSurprise = true;
-			}
-			m_csNextAnimString = STRING_ANIM_MG42_SHOOT_SCR;
-		}
-		else
-		{
-			m_csNextAnimString = STRING_ANIM_MG42_IDLE_SCR;
-		}
-	}
-	else
-	{
-		m_csNextAnimString = STRING_ANIM_MG42_RELOAD_SCR;
-		m_bAnimScriptSet = false;
-	}
-	m_eNextAnimMode = 8;
-	m_bNextForceStart = false;
-
-	CheckUnregister();
-
-	StopTurning();
-
-	setAngles(Vector(0,m_pTurret->angles[1],0));
-
-	vForward = Vector(m_pTurret->orientation[0]) * -39 + m_pTurret->origin;
-
-	if (m_State == 1201)
-	{
-		heightDiff = 71.6f;
-	}
-	else
-	{
-		heightDiff = 71.8f;
-	}
-
-	machine_gunner_hands_up_stand = origin[2] - (m_pTurret->origin[2] - heightDiff);
-
-
-	if (machine_gunner_hands_up_stand < 0)
-	{
-		if (m_State == 1201)
-		{
-			temp = (machine_gunner_hands_up_stand - m_pTurret->origin[2]) / 39;
-			if (temp >= -1.0 && temp <= 1.0)
-			{
-				right = atan2(temp / sqrt(temp*-temp + 1), 1) * 180 / M_PI;
-				m_pTurret->setAngles(Vector(right, m_pTurret->angles[1], m_pTurret->angles[2]));
-			}
-		}
-		else
-		{
-			m_fCrouchWeight = machine_gunner_hands_up_stand / 17.1;
-			if (m_fCrouchWeight < -1.0)
-			{
-				m_fCrouchWeight = -1.0;
-			}
-
-		}
-		temp2 = m_fCrouchWeight * 2.6;
-		offset.x = (-(-9.3*m_fCrouchWeight + 23.4)) * orientation[0][0] + vForward.x;
-		offset.y = (-(-9.3*m_fCrouchWeight + 23.4)) * orientation[0][0] + vForward.y;
-	}
-	else
-	{
-		m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7);
-		if (m_fCrouchWeight > 1.0)
-		{
-			m_fCrouchWeight = 1.0;
-		}
-
-		temp2 = m_fCrouchWeight * -1.6;
-		offset.x = (-(-3*m_fCrouchWeight + 23.4)) * orientation[0][0] + vForward.x;
-		offset.y = (-(-3*m_fCrouchWeight + 23.4)) * orientation[0][0] + vForward.y;
-	}
-
-	start.x = (temp2 + 10.3) * orientation[1][0] + offset.x;
-	start.y = (temp2 + 10.3) * orientation[1][1] + offset.y;
-
-	if (m_fCrouchWeight >= 0.5)
-		m_csCurrentPosition = STRING_CROUCH;
-	else
-		m_csCurrentPosition = STRING_STAND;
-
-	UpdateAimMotion();
-	UpdateAnim();
-	start.z = origin.z + 18.0;
-
-	end = start;
-	end.z = origin.z - 94.0;
-
-	trace = G_Trace(start, MINS, MAXS, end, this, 1107437825, qfalse, "Actor::ThinkHoldGun");
-
-	if (trace.fraction != 1.0 && !trace.startsolid && !trace.allsolid && trace.ent)
-		SafeSetOrigin(trace.endpos);
-
-	velocity = vec_zero;
-
-	UpdateBoneControllers();
-	UpdateFootsteps();
+    if (!GetWeapon(WEAPON_MAIN)) {
+        giveItem("models/weapons/mp40.tik");
+    }
 
+    Unholster();
+    if (m_pTurret) {
+        m_pTurret->m_bHadOwner = true;
+        if (m_pTurret->GetOwner() == this) {
+            m_pTurret->TurretEndUsed();
+        }
+    }
 }
 
-void Actor::FinishedAnimation_MachineGunner
-	(
-	void
-	)
+void Actor::ThinkHoldGun_TurretGun(void)
 {
-	if (!m_bAnimScriptSet && m_State == 1201)
-	{
-		TransitionState(1200, 0);
-		Unregister(STRING_ANIMDONE);
-	}
+    Vector  vForward;
+    vec3_t  new_angles;
+    vec3_t  offset;
+    vec3_t  newOrigin;
+    float   right;
+    float   heightDiff;
+    float   machine_gunner_hands_up_stand;
+    float   temp;
+    trace_t trace;
+    Vector  end;
+
+    if (m_State != ACTOR_STATE_MACHINE_GUNNER_READY) {
+        DesiredAnimation(ANIM_MODE_FROZEN, STRING_ANIM_MG42_RELOAD_SCR);
+        m_bAnimScriptSet = false;
+    } else if (m_pTurret->IsFiring()) {
+        if (m_pTurret->aim_target == G_GetEntity(0)) {
+            m_bNoSurprise = true;
+        }
+
+        DesiredAnimation(ANIM_MODE_FROZEN, STRING_ANIM_MG42_SHOOT_SCR);
+    } else {
+        DesiredAnimation(ANIM_MODE_FROZEN, STRING_ANIM_MG42_IDLE_SCR);
+    }
+
+    CheckUnregister();
+    StopTurning();
+
+    VectorSet(new_angles, 0, m_pTurret->angles[1], 0);
+    setAngles(new_angles);
+
+    VectorScale(m_pTurret->orientation[0], -39, offset);
+    VectorAdd(m_pTurret->origin, offset, newOrigin);
+
+    if (m_State == ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
+        heightDiff = 71.6f;
+    } else {
+        heightDiff = 71.8f;
+    }
+
+    newOrigin[2] -= heightDiff;
+    machine_gunner_hands_up_stand = origin[2] - newOrigin[2];
+
+    if (machine_gunner_hands_up_stand < 0) {
+        if (m_State == ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
+            m_fCrouchWeight = 0;
+
+            temp = (origin[2] + 71.6f - m_pTurret->origin[2]) / 39.0f;
+            if (temp >= -1.0 && temp <= 1.0) {
+                m_pTurret->angles[0] = RAD2DEG(atan(temp / sqrt(temp * -temp + 1)));
+                m_pTurret->setAngles(m_pTurret->angles);
+            }
+        } else {
+            m_fCrouchWeight = machine_gunner_hands_up_stand / 17.1f;
+            if (m_fCrouchWeight < -1.0f) {
+                m_fCrouchWeight = -1.0f;
+            }
+        }
+
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 9.3), offset);
+        VectorAdd2D(newOrigin, offset, newOrigin);
+        VectorScale2D(orientation[1], 10.3 + m_fCrouchWeight * 2.6, offset);
+        VectorAdd2D(newOrigin, offset, newOrigin);
+    } else {
+        m_fCrouchWeight = machine_gunner_hands_up_stand / (heightDiff - 38.7);
+        if (m_fCrouchWeight > 1.0) {
+            m_fCrouchWeight = 1.0;
+        }
+
+        VectorScale2D(orientation[0], -(23.4 - m_fCrouchWeight * 3.0), offset);
+        VectorAdd2D(newOrigin, offset, newOrigin);
+        VectorScale2D(orientation[1], 10.3 - m_fCrouchWeight * 1.6, offset);
+        VectorAdd2D(newOrigin, offset, newOrigin);
+    }
+
+    if (m_fCrouchWeight >= 0.5) {
+        m_csCurrentPosition = STRING_CROUCH;
+    } else {
+        m_csCurrentPosition = STRING_STAND;
+    }
+
+    UpdateAimMotion();
+    UpdateAnim();
+
+    newOrigin[2] = origin[2] + 18.0;
+
+    end[0] = newOrigin[0];
+    end[1] = newOrigin[1];
+    end[2] = origin[2] - 94.0;
+    trace  = G_Trace(newOrigin, MINS, MAXS, end, this, MASK_PATHSOLID, qfalse, "Actor::ThinkHoldGun_TurretGun");
+
+    if (trace.fraction != 1.0 && !trace.startsolid && !trace.allsolid && trace.ent) {
+        SafeSetOrigin(trace.endpos);
+    }
+
+    VectorClear(velocity);
+    UpdateBoneControllers();
+    UpdateFootsteps();
 }
 
-bool Actor::MachineGunner_CanSee
-	(
-	Entity *ent,
-	float fov,
-	float vision_distance
-	)
+void Actor::Think_MachineGunner_TurretGun(void)
 {
-	float delta[2];
+    if (!m_bEnableEnemy) {
+        ThinkHoldGun_TurretGun();
+        return;
+    }
 
-	delta[0] = ent->centroid[0] - centroid[0];
-	delta[1] = ent->centroid[1] - centroid[1];
-	if ((vision_distance <= 0.0f) || (delta[0] * delta[0] + delta[1] * delta[1]) <= (vision_distance * vision_distance))
-	{
-		if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum) &&
-			((fov <= 0.0f || fov >= 360.0f) ||
-			(FovCheck(delta, cos(fov * (0.5 * M_PI / 180.0))))))
-		{
-			return G_SightTrace(centroid,
-				vec_zero,
-				vec_zero,
-				ent->centroid,
-				m_pTurret,
-				ent,
-				MASK_CANSEE,
-				0,
-				"Actor::MachineGunner_CanSee");
-		}
-	}
+    if (level.inttime < m_iEnemyCheckTime + 200) {
+        ThinkHoldGun_TurretGun();
+        return;
+    }
 
-	return false;
+    UpdateEnemyInternal();
+
+    if (m_Team == TEAM_AMERICAN) {
+        // Added in 2.30
+        ThinkHoldGun_TurretGun();
+        return;
+    }
+
+    if (m_pTurret->AI_CanTarget(G_GetEntity(0)->centroid)) {
+        ThinkHoldGun_TurretGun();
+        return;
+    }
+
+    if (m_pGrenade && rand() / 21474836.f <= m_fGrenadeAwareness) {
+        BecomeTurretGuy();
+        return;
+    }
+
+    if (!G_SightTrace(
+            EyePosition(),
+            vec_zero,
+            vec_zero,
+            static_cast<Sentient *>(G_GetEntity(0))->EyePosition(),
+            this,
+            G_GetEntity(0),
+            MASK_CANSEE,
+            qfalse,
+            "Actor::Think_MachineGunner"
+        )) {
+        ThinkHoldGun_TurretGun();
+        return;
+    }
+
+    if (m_ThinkStates[THINKLEVEL_IDLE] != THINKSTATE_IDLE) {
+        BecomeTurretGuy();
+        return;
+    }
+
+    if (m_Enemy && !(m_Enemy->flags & FL_NOTARGET) && !EnemyIsDisguised() && m_PotentialEnemies.IsEnemyConfirmed()) {
+        BecomeTurretGuy();
+        return;
+    }
+
+    if (m_Enemy && m_iCuriousTime || (m_Enemy && !EnemyIsDisguised() && !m_PotentialEnemies.IsEnemyConfirmed())) {
+        m_iCuriousAnimHint = 6;
+        BecomeTurretGuy();
+        return;
+    }
+
+    ThinkHoldGun_TurretGun();
+}
+
+void Actor::Think_MachineGunner(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    if (m_pTurret && m_pTurret->GetOwner() == this && !m_bNoPlayerCollision) {
+        UpdateEyeOrigin();
+        Think_MachineGunner_TurretGun();
+    } else {
+        BecomeTurretGuy();
+    }
+}
+
+void Actor::FinishedAnimation_MachineGunner(void)
+{
+    if (!m_bAnimScriptSet && m_State == ACTOR_STATE_MACHINE_GUNNER_RELOADING) {
+        TransitionState(ACTOR_STATE_MACHINE_GUNNER_READY, 0);
+        Unregister(STRING_ANIMDONE);
+    }
+}
+
+bool Actor::MachineGunner_CanSee(Entity *ent, float fov, float vision_distance)
+{
+    float delta[2];
+
+    delta[0] = ent->centroid[0] - centroid[0];
+    delta[1] = ent->centroid[1] - centroid[1];
+    if ((vision_distance <= 0.0f)
+        || (delta[0] * delta[0] + delta[1] * delta[1]) <= (vision_distance * vision_distance)) {
+        if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)
+            && ((fov <= 0.0f || fov >= 360.0f) || (FovCheck(delta, cos(fov * (0.5 * M_PI / 180.0)))))) {
+            return G_SightTrace(
+                centroid,
+                vec_zero,
+                vec_zero,
+                ent->centroid,
+                m_pTurret,
+                ent,
+                MASK_CANSEE,
+                0,
+                "Actor::MachineGunner_CanSee"
+            );
+        }
+    }
+
+    return false;
 }
diff --git a/code/fgame/actor_noclip.cpp b/code/fgame/actor_noclip.cpp
index 738580cb..749cdb91 100644
--- a/code/fgame/actor_noclip.cpp
+++ b/code/fgame/actor_noclip.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,87 +24,62 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitNoClip
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitNoClip(GlobalFuncs_t *func)
 {
-	func->ThinkState	= &Actor::Think_NoClip;
-	func->IsState		= &Actor::IsIdleState;
+    func->ThinkState = &Actor::Think_NoClip;
+    func->IsState    = &Actor::IsIdleState;
 }
 
-bool Actor::IsNoClipState
-	(
-	int state
-	)
+void Actor::Think_NoClip(void)
 {
-	return state == THINKSTATE_NOCLIP;
-}
-
-void Actor::Think_NoClip
-	(
-	void
-	)
-{
-	//FIXME: not sure of naming
-	bool done = false;
-	Vector newOrigin = vec_zero;
-	Vector total_offset;
-	Vector total_offset_unit;
-	float total_dist;
-	//vec3_t frame_offset;
-	float frame_dist;
-
-	m_pszDebugState = "";
-
-	ContinueAnimationAllowNoPath();
-
-	CheckUnregister();
-	UpdateAngles();
-	UpdateAnim();
-
-	total_offset = m_NoClipDest - origin;
-	total_dist = VectorNormalize2(total_offset, total_offset_unit);
-
-	frame_dist = level.frametime * m_maxspeed;
-
-	if (frame_dist >= frame_delta.lengthSquared())
-	{
-		frame_dist = frame_delta.lengthSquared();
-	}
-
-	if (frame_dist < total_dist)
-	{
-		newOrigin = total_offset_unit * frame_dist + origin;
-
-	}
-	else
-	{
-		done = true;
-		newOrigin = m_NoClipDest;
-	}
-
-	SafeSetOrigin(newOrigin);
-	
-	velocity = total_offset_unit / level.frametime;
-
-	if (velocity.lengthSquared() < 1)
-	{
-		done = true;
-		velocity = vec_zero;
-	}
-	groundentity = NULL;
-
-	if (done)
-	{
-		Com_Printf(
-			"(entnum %d, radnum %d) failsafe finished\n",
-			entnum,
-			radnum);
-		EndCurrentThinkState();
-	}
-
-	UpdateBoneControllers();
-	UpdateFootsteps();
-
+    float  frame_dist;
+    vec3_t frame_offset;
+    float  total_dist;
+    vec3_t total_offset;
+    Vector newOrigin;
+    bool   done = false;
+
+    m_pszDebugState = "";
+
+    ContinueAnimationAllowNoPath();
+
+    CheckUnregister();
+    UpdateAngles();
+    UpdateAnim();
+
+    VectorSubtract(m_NoClipDest, origin, total_offset);
+    total_dist = VectorNormalize2(total_offset, frame_offset);
+    frame_dist = VectorLength(frame_delta);
+
+    if (frame_dist > m_maxspeed * level.frametime) {
+        frame_dist = m_maxspeed * level.frametime;
+    }
+
+    if (frame_dist < total_dist) {
+        VectorScale(frame_offset, frame_dist, frame_offset);
+        VectorAdd(origin, frame_offset, newOrigin);
+    } else {
+        VectorCopy(m_NoClipDest, newOrigin);
+        done = true;
+    }
+
+    SafeSetOrigin(newOrigin);
+
+    velocity[0] = frame_offset[0] / level.frametime;
+    velocity[1] = frame_offset[1] / level.frametime;
+    velocity[2] = frame_offset[2] / level.frametime;
+
+    if (VectorLengthSquared(velocity) < 1) {
+        VectorClear(velocity);
+        done = true;
+    }
+    groundentity = NULL;
+
+    if (done) {
+        Com_Printf("(entnum %d, radnum %d) failsafe finished\n", entnum, radnum);
+        EndCurrentThinkState();
+    }
+
+    UpdateBoneControllers();
+    UpdateFootsteps();
 }
diff --git a/code/fgame/actor_pain.cpp b/code/fgame/actor_pain.cpp
index ca8e8e2f..4deb13bf 100644
--- a/code/fgame/actor_pain.cpp
+++ b/code/fgame/actor_pain.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,55 +24,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitPain
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitPain(GlobalFuncs_t *func)
 {
-	func->BeginState					= &Actor::Begin_Pain;
-	func->ThinkState					= &Actor::Think_Pain;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Pain;
-	func->IsState						= &Actor::IsPainState;
+    func->BeginState        = &Actor::Begin_Pain;
+    func->ThinkState        = &Actor::Think_Pain;
+    func->FinishedAnimation = &Actor::FinishedAnimation_Pain;
+    func->IsState           = &Actor::IsPainState;
 }
 
-void Actor::Begin_Pain
-	(
-	void
-	)
+void Actor::Begin_Pain(void)
 {
-	m_PainState = 500;
+    m_PainState = ACTOR_STATE_PAIN_INITIAL;
 }
 
-void Actor::Think_Pain
-	(
-	void
-	)
+void Actor::Think_Pain(void)
 {
-	NoPoint();
+    NoPoint();
+    ForwardLook();
+    UpdateEyeOrigin();
 
-	m_bHasDesiredLookAngles = false;
+    if (m_PainState == ACTOR_STATE_PAIN_INITIAL) {
+        m_pszDebugState = "initial";
+        Anim_StartPain();
+        m_PainState = ACTOR_STATE_PAIN_MAIN;
+    } else if (m_PainState == ACTOR_STATE_PAIN_MAIN) {
+        m_pszDebugState = "main";
+        Anim_Pain();
+    }
 
-	UpdateEyeOrigin();
-
-	if (m_PainState == 500)
-	{
-		m_pszDebugState = "initial";
-		Anim_StartPain();
-		m_PainState = 501;
-	}
-	else if (m_PainState == 501)
-	{
-		m_pszDebugState = "main";
-		Anim_Pain();
-	}
-	PostThink(false);
+    PostThink(false);
 }
 
-void Actor::FinishedAnimation_Pain
-	(
-	void
-	)
+void Actor::FinishedAnimation_Pain(void)
 {
-	if (m_PainState != 500)
-		EndCurrentThinkState();
+    if (m_PainState != ACTOR_STATE_PAIN_START) {
+        EndCurrentThinkState();
+    }
 }
diff --git a/code/fgame/actor_patrol.cpp b/code/fgame/actor_patrol.cpp
index 77e57e08..bcf9f4ac 100644
--- a/code/fgame/actor_patrol.cpp
+++ b/code/fgame/actor_patrol.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,92 +24,77 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitPatrol
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitPatrol(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Patrol;
-	func->BeginState					= &Actor::Begin_Patrol;
-	func->EndState						= &Actor::End_Patrol;
-	func->ResumeState					= &Actor::Resume_Patrol;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->ShowInfo						= &Actor::ShowInfo_Patrol;
-	func->IsState						= &Actor::IsIdleState;
+    func->ThinkState                 = &Actor::Think_Patrol;
+    func->BeginState                 = &Actor::Begin_Patrol;
+    func->EndState                   = &Actor::End_Patrol;
+    func->ResumeState                = &Actor::Resume_Patrol;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->ShowInfo                   = &Actor::ShowInfo_Patrol;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::Begin_Patrol
-	(
-	void
-	)
+void Actor::Begin_Patrol(void)
 {
-	m_csMood = STRING_BORED;
-	StopTurning();
-	ClearPath();
+    m_csMood = STRING_BORED;
+    StopTurning();
+    ClearPath();
 }
 
-void Actor::End_Patrol
-	(
-	void
-	)
+void Actor::End_Patrol(void)
 {
-
-	parm.movefail = true;
+    parm.movefail = true;
 }
 
-void Actor::Resume_Patrol
-	(
-	void
-	)
+void Actor::Resume_Patrol(void) {}
+
+void Actor::Think_Patrol(void)
 {
-	;
+    bool bMoveInRadius;
+
+    if (!RequireThink()) {
+        return;
+    }
+
+    parm.movefail = false;
+
+    UpdateEyeOrigin();
+    NoPoint();
+
+    m_pszDebugState       = "";
+    m_csPatrolCurrentAnim = STRING_ANIM_PATROL_SCR;
+    bMoveInRadius         = MoveToPatrolCurrentNode();
+
+    if (m_fLookAroundFov > 1.0) {
+        LookAround(m_fLookAroundFov);
+    }
+
+    CheckForThinkStateTransition();
+
+    if (!m_patrolCurrentNode) {
+        SetThinkIdle(THINK_IDLE);
+        m_bScriptGoalValid = false;
+
+        parm.movedone = true;
+        Unregister(STRING_MOVEDONE);
+    } else if (bMoveInRadius) {
+        ClearPatrolCurrentNode();
+        SetThinkIdle(THINK_IDLE);
+        // Added in OPM
+        //  Not sure why it was not cleared originally.
+        //  Once you reach your goal, there is no point
+        //  in leaving it set to true
+        m_bScriptGoalValid = false;
+
+        parm.movedone = true;
+        Unregister(STRING_MOVEDONE);
+    }
+
+    PostThink(true);
 }
 
-void Actor::Think_Patrol
-	(
-	void
-	)
+void Actor::ShowInfo_Patrol(void)
 {
-	if (Actor::RequireThink())
-	{
-		parm.movefail = false;
-
-		UpdateEyeOrigin();
-		NoPoint();
-
-		m_pszDebugState = "";
-		m_csPatrolCurrentAnim = STRING_ANIM_PATROL_SCR;
-
-		if (m_fLookAroundFov > 1.0)
-			LookAround(m_fLookAroundFov);
-
-		CheckForThinkStateTransition();
-		if (m_patrolCurrentNode)
-		{
-			if (!MoveToPatrolCurrentNode())
-			{
-				PostThink(true);
-				return;
-			}
-		}
-		else
-		{
-			SetThinkIdle(THINK_IDLE);
-			m_bScriptGoalValid = false;
-		}
-		parm.movedone = true;
-
-		Unregister(STRING_MOVEDONE);
-
-		PostThink(true);
-		return;
-	}
-}
-
-void Actor::ShowInfo_Patrol
-	(
-	void
-	)
-{
-	ShowInfo_PatrolCurrentNode();
+    ShowInfo_PatrolCurrentNode();
 }
diff --git a/code/fgame/actor_runandshoot.cpp b/code/fgame/actor_runandshoot.cpp
new file mode 100644
index 00000000..1939dbb2
--- /dev/null
+++ b/code/fgame/actor_runandshoot.cpp
@@ -0,0 +1,175 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// actor_runandshoot.cpp
+//
+// Added in 2.30
+//
+
+#include "actor.h"
+
+void Actor::InitRunAndShoot(GlobalFuncs_t *func)
+{
+    func->ThinkState                 = &Actor::Think_RunAndShoot;
+    func->BeginState                 = &Actor::Begin_RunAndShoot;
+    func->EndState                   = &Actor::End_RunAndShoot;
+    func->ResumeState                = &Actor::Resume_RunAndShoot;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->ShowInfo                   = &Actor::ShowInfo_RunAndShoot;
+    func->IsState                    = &Actor::IsAttackState;
+}
+
+void Actor::Begin_RunAndShoot(void)
+{
+    if (m_patrolCurrentNode) {
+        m_State = ACTOR_STATE_RUN_AND_SHOOT_RUNNING;
+    } else {
+        m_State = ACTOR_STATE_RUN_AND_SHOOT_RUN;
+    }
+}
+
+void Actor::End_RunAndShoot(void)
+{
+    m_vHome      = origin;
+    m_pTetherEnt = NULL;
+}
+
+void Actor::Resume_RunAndShoot(void) {}
+
+void Actor::Think_RunAndShoot(void)
+{
+    if (m_State == ACTOR_STATE_RUN_AND_SHOOT_RUNNING) {
+        State_RunAndShoot_Running();
+    } else if (m_State == ACTOR_STATE_RUN_AND_SHOOT_RUN) {
+        SetThink(THINKSTATE_ATTACK, THINK_COVER);
+    }
+}
+
+void Actor::ShowInfo_RunAndShoot(void) {}
+
+void Actor::State_RunAndShoot_Running(void)
+{
+    Entity *player;
+    bool    bMoveDone;
+
+    if (!RequireThink()) {
+        return;
+    }
+
+    parm.movefail = false;
+    UpdateEyeOrigin();
+    NoPoint();
+
+    m_pszDebugState = "";
+    bMoveDone       = RunAndShoot_MoveToPatrolCurrentNode();
+
+    CheckForThinkStateTransition();
+    player = G_GetEntity(0);
+    if (player) {
+        vec2_t delta;
+
+        VectorSub2D(player->origin, origin, delta);
+
+        if (VectorLength2DSquared(delta) < Square(150)) {
+            ClearPatrolCurrentNode();
+        }
+    }
+
+    if (!m_patrolCurrentNode) {
+        if (m_Enemy) {
+            SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+        } else {
+            SetThinkIdle(THINK_IDLE);
+        }
+
+        m_bScriptGoalValid = false;
+        parm.movedone      = true;
+
+        Unregister(STRING_MOVEDONE);
+    } else if (bMoveDone) {
+        ClearPatrolCurrentNode();
+
+        if (m_Enemy) {
+            SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+        } else {
+            SetThinkIdle(THINK_IDLE);
+        }
+
+        parm.movedone = true;
+
+        Unregister(STRING_MOVEDONE);
+    }
+
+    Unregister(STRING_MOVE);
+
+    CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE);
+    PostThink(true);
+}
+
+bool Actor::RunAndShoot_MoveToPatrolCurrentNode(void)
+{
+    UpdatePatrolCurrentNode();
+
+    if (!m_patrolCurrentNode || m_bPatrolWaitTrigger) {
+        IdleLook();
+        Anim_Idle();
+        return false;
+    }
+
+    SetPath(m_patrolCurrentNode->origin, "Actor::RunAndShoot_MoveToPatrolCurrentNode", 0, NULL, 0);
+
+    if (!PathExists()) {
+        IdleLook();
+        Anim_Idle();
+
+        parm.movefail = true;
+        return false;
+    }
+
+    if (MoveOnPathWithSquad()) {
+        if (m_Enemy) {
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_RUNTO_INOPEN_SCR);
+            AimAtTargetPos();
+        } else {
+            DesiredAnimation(ANIM_MODE_PATH, STRING_ANIM_CROUCH_RUN_SCR);
+            FaceMotion();
+        }
+    } else if (m_Enemy) {
+        AimAtTargetPos();
+        Anim_Attack();
+    } else {
+        Anim_Stand();
+        IdleLook();
+    }
+
+    if (m_fMoveDoneRadiusSquared) {
+        if (PathComplete()) {
+            return true;
+        }
+
+        if (m_Path.HasCompleteLookahead() && !m_patrolCurrentNode->Next()) {
+            return VectorLength2DSquared(PathDelta()) <= m_fMoveDoneRadiusSquared;
+        }
+    }
+
+    return false;
+}
diff --git a/code/fgame/actor_runner.cpp b/code/fgame/actor_runner.cpp
index 9aaab8f3..d0c906b9 100644
--- a/code/fgame/actor_runner.cpp
+++ b/code/fgame/actor_runner.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,90 +24,74 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitRunner
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitRunner(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Runner;
-	func->BeginState					= &Actor::Begin_Runner;
-	func->EndState						= &Actor::End_Runner;
-	func->ResumeState					= &Actor::Resume_Runner;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Idle;
-	func->ShowInfo						= &Actor::ShowInfo_Runner;
-	func->IsState						= &Actor::IsIdleState;
+    func->ThinkState                 = &Actor::Think_Runner;
+    func->BeginState                 = &Actor::Begin_Runner;
+    func->EndState                   = &Actor::End_Runner;
+    func->ResumeState                = &Actor::Resume_Runner;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Idle;
+    func->ShowInfo                   = &Actor::ShowInfo_Runner;
+    func->IsState                    = &Actor::IsIdleState;
 }
 
-void Actor::Begin_Runner
-	(
-	void
-	)
+void Actor::Begin_Runner(void)
 {
-	m_csMood = STRING_NERVOUS;
-	m_csIdleMood = STRING_NERVOUS;
-	StopTurning();
-	ClearPath();
+    m_csMood     = STRING_NERVOUS;
+    m_csIdleMood = STRING_NERVOUS;
+    StopTurning();
+    ClearPath();
 }
 
-void Actor::End_Runner
-	(
-	void
-	)
+void Actor::End_Runner(void)
 {
-	parm.movefail = true;
+    parm.movefail = true;
 }
 
-void Actor::Resume_Runner
-	(
-	void
-	)
+void Actor::Resume_Runner(void) {}
+
+void Actor::Think_Runner(void)
 {
-	;
+    bool bMoveInRadius;
+
+    if (!RequireThink()) {
+        return;
+    }
+
+    parm.movefail = false;
+
+    UpdateEyeOrigin();
+    NoPoint();
+    m_pszDebugState = "";
+
+    bMoveInRadius = MoveToPatrolCurrentNode();
+    CheckForThinkStateTransition();
+
+    if (!m_patrolCurrentNode) {
+        SetThinkIdle(THINK_IDLE);
+        m_bScriptGoalValid = false;
+
+        parm.movedone = true;
+        Unregister(STRING_MOVEDONE);
+    } else if (bMoveInRadius) {
+        ClearPatrolCurrentNode();
+        SetThinkIdle(THINK_IDLE);
+        // Added in OPM
+        //  Not sure why it was not cleared originally.
+        //  Once you reach your goal, there is no point
+        //  in leaving it set to true
+        m_bScriptGoalValid = false;
+
+        parm.movedone = true;
+        Unregister(STRING_MOVEDONE);
+    }
+
+    Unregister(STRING_MOVE);
+
+    PostThink(true);
 }
 
-void Actor::Think_Runner
-	(
-	void
-	)
+void Actor::ShowInfo_Runner(void)
 {
-	if (RequireThink())
-	{
-		parm.movefail = false;
-
-		UpdateEyeOrigin();
-		NoPoint();
-		m_pszDebugState = "";
-
-		CheckForThinkStateTransition();
-
-		if (m_patrolCurrentNode)
-		{
-			if (!MoveToPatrolCurrentNode())
-			{
-				Unregister(STRING_MOVE);
-				PostThink(true);
-				return;
-			}
-		}
-		else
-		{
-			SetThinkIdle(THINK_IDLE);
-			m_bScriptGoalValid = false;
-		}
-
-		parm.movedone = true;
-		Unregister(STRING_MOVEDONE);
-
-		Unregister(STRING_MOVE);
-		PostThink(true);
-		return;
-	}
-}
-
-void Actor::ShowInfo_Runner
-	(
-	void
-	)
-{
-	ShowInfo_PatrolCurrentNode();
+    ShowInfo_PatrolCurrentNode();
 }
diff --git a/code/fgame/actor_turret.cpp b/code/fgame/actor_turret.cpp
index 25fbee14..8db46a58 100644
--- a/code/fgame/actor_turret.cpp
+++ b/code/fgame/actor_turret.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,1112 +24,866 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitTurret
-(
-	GlobalFuncs_t *func
+void Actor::InitTurret(GlobalFuncs_t *func)
+{
+    func->ThinkState                 = &Actor::Think_Turret;
+    func->BeginState                 = &Actor::Begin_Turret;
+    func->EndState                   = &Actor::End_Turret;
+    func->SuspendState               = &Actor::Suspend_Turret;
+    func->RestartState               = NULL;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Turret;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->PostShoot                  = &Actor::InterruptPoint_Turret;
+    func->ReceiveAIEvent             = &Actor::ReceiveAIEvent_Turret;
+    func->IsState                    = &Actor::IsAttackState;
+    func->PathnodeClaimRevoked       = &Actor::PathnodeClaimRevoked_Turret;
+}
+
+bool Actor::Turret_IsRetargeting(void) const
+{
+    return m_State > ACTOR_STATE_TURRET_SHOOT && m_State < ACTOR_STATE_TURRET_NUM_STATES;
+}
+
+bool Actor::Turret_DecideToSelectState(void)
+{
+    switch (m_State) {
+    case ACTOR_STATE_TURRET_COMBAT:
+        if (level.inttime > m_iStateTime + 5000) {
+            InterruptPoint_Turret();
+        }
+        return false;
+    case ACTOR_STATE_TURRET_REACQUIRE:
+    case ACTOR_STATE_TURRET_GRENADE:
+    case ACTOR_STATE_TURRET_TAKE_SNIPER_NODE:
+    case ACTOR_STATE_TURRET_FAKE_ENEMY:
+    case ACTOR_STATE_TURRET_SHOOT:
+        return false;
+    }
+
+    return !Turret_IsRetargeting();
+}
+
+void Actor::Turret_SelectState(void)
+{
+    float  fDistSquared;
+    vec2_t vDelta;
+
+    if (!m_Enemy) {
+        TransitionState(ACTOR_STATE_TURRET_FAKE_ENEMY, (rand() & 0x7FF) + 250);
+        return;
+    }
+
+    VectorSub2D(origin, m_vHome, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
+
+    if (m_State == ACTOR_STATE_TURRET_RUN_HOME && fDistSquared > (m_fLeashSquared * 0.64 + 64.0)) {
+        if (PathExists() && !PathComplete()) {
+            return;
+        }
+    } else if (fDistSquared <= m_fLeashSquared * 1.21 + 256.0) {
+        m_iRunHomeTime = 0;
+    } else if (!m_iRunHomeTime) {
+        m_iRunHomeTime = level.inttime + (rand() & 0xFFF) + 1000;
+    } else if (level.inttime >= m_iRunHomeTime) {
+        m_iRunHomeTime = 0;
+
+        ClearPath();
+        SetPath(m_vHome, NULL, 0, NULL, 0.0);
+        ShortenPathToAvoidSquadMates();
+
+        if (!PathExists()) {
+            Com_Printf(
+                "^~^~^ (entnum %i, radnum %d, targetname '%s') cannot reach his leash home\n",
+                entnum,
+                radnum,
+                targetname.c_str()
+            );
+        } else if (!PathComplete()) {
+            TransitionState(ACTOR_STATE_TURRET_RUN_HOME, 0);
+            return;
+        }
+    }
+
+    VectorSub2D(origin, m_Enemy->origin, vDelta);
+    fDistSquared = VectorLength2DSquared(vDelta);
+
+    if (m_State == ACTOR_STATE_TURRET_RUN_AWAY && fDistSquared < m_fMinDistanceSquared * 2.25) {
+        return;
+    }
+
+    if (fDistSquared < m_fMinDistanceSquared) {
+        ClearPath();
+        TransitionState(ACTOR_STATE_TURRET_RUN_AWAY, 0);
+        return;
+    }
+
+    if (fDistSquared > m_fMaxDistanceSquared) {
+        if (m_Team == TEAM_GERMAN && (m_Enemy->origin - m_vHome).lengthSquared() >= Square(m_fLeash + m_fMaxDistance)
+            && !CanSeeEnemy(200)) {
+            ClearPath();
+            TransitionState(ACTOR_STATE_TURRET_WAIT, 0);
+        } else if (m_State != ACTOR_STATE_TURRET_CHARGE) {
+            ClearPath();
+            TransitionState(ACTOR_STATE_TURRET_CHARGE, 0);
+        }
+    } else {
+        if (DecideToThrowGrenade(m_vLastEnemyPos + m_Enemy->velocity, &m_vGrenadeVel, &m_eGrenadeMode, false)) {
+            SetDesiredYawDir(m_vGrenadeVel);
+
+            DesiredAnimation(
+                ANIM_MODE_NORMAL,
+                m_eGrenadeMode == AI_GREN_TOSS_ROLL ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR
+            );
+            TransitionState(ACTOR_STATE_TURRET_GRENADE, 0);
+            return;
+        }
+
+        if (m_State != ACTOR_STATE_TURRET_COMBAT && m_State != ACTOR_STATE_TURRET_SNIPER_NODE
+            && m_State != ACTOR_STATE_TURRET_WAIT && m_State != ACTOR_STATE_TURRET_SHOOT) {
+            ClearPath();
+            TransitionState(ACTOR_STATE_TURRET_COMBAT);
+        }
+    }
+}
+
+bool Actor::Turret_CheckRetarget(void)
+{
+    if (level.inttime < m_iStateTime + 5000 || level.inttime < m_iLastHitTime + 5000) {
+        return false;
+    }
+
+    Turret_BeginRetarget();
+
+    return true;
+}
+
+void Actor::Begin_Turret(void)
+{
+    DoForceActivate();
+    m_csMood = STRING_ALERT;
+
+    ClearPath();
+
+    if (m_Enemy) {
+        TransitionState(ACTOR_STATE_TURRET_COVER_INSTEAD, 0);
+    } else {
+        TransitionState(ACTOR_STATE_TURRET_FAKE_ENEMY, (rand() & 0x7FF) + 250);
+    }
+}
+
+void Actor::End_Turret(void)
+{
+    if (m_pCoverNode && m_State != ACTOR_STATE_TURRET_BECOME_COVER) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode = NULL;
+    }
+    TransitionState(-1, 0);
+}
+
+void Actor::Suspend_Turret(void)
+{
+    if (!m_Enemy) {
+        TransitionState(ACTOR_STATE_TURRET_COVER_INSTEAD, 0);
+    } else if (m_State == ACTOR_STATE_TURRET_GRENADE || m_State == ACTOR_STATE_TURRET_INTRO_AIM) {
+        Turret_BeginRetarget();
+    }
+}
+
+void Actor::State_Turret_Combat(void)
+{
+    if (CanSeeEnemy(200)) {
+        ClearPath();
+        Anim_Attack();
+        AimAtTargetPos();
+        Turret_CheckRetarget();
+        return;
+    }
+
+    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
+        SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
+        ShortenPathToAvoidSquadMates();
+    }
+
+    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
+        FindPathNearWithLeash(m_vLastEnemyPos, m_fMinDistanceSquared * 4);
+        if (!ShortenPathToAttack(0.0)) {
+            ClearPath();
+        }
+        ShortenPathToAvoidSquadMates();
+    }
+
+    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
+        m_pszDebugState = "combat->chill";
+        Turret_BeginRetarget();
+        return;
+    }
+
+    m_pszDebugState = "combat->move";
+    if (!MovePathWithLeash()) {
+        m_pszDebugState = "combat->move->aim";
+        Turret_BeginRetarget();
+        return;
+    }
+
+    Turret_CheckRetarget();
+}
+
+void Actor::Turret_BeginRetarget(void)
+{
+    SetEnemyPos(m_Enemy->origin);
+    AimAtEnemyBehavior();
+
+    // Replaced in 2.0
+    //  Use the Retarget_Suppress state instead of the Retarget_Sniper_Node state
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        TransitionState(ACTOR_STATE_TURRET_RETARGET_SUPPRESS, 0);
+    } else {
+        TransitionState(ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE, 0);
+    }
+}
+
+void Actor::Turret_NextRetarget(void)
+{
+    vec2_t vDelta;
+
+    m_State++;
+    if (m_State < ACTOR_STATE_TURRET_NUM_STATES) {
+        TransitionState(m_State);
+        return;
+    }
+
+    VectorSub2D(origin, m_vHome, vDelta);
+
+    if (VectorLength2DSquared(vDelta) >= m_fLeashSquared) {
+        SetPath(m_vHome, NULL, 0, NULL, 0.0);
+        ShortenPathToAvoidSquadMates();
+
+        if (PathExists() && !PathComplete()) {
+            TransitionState(ACTOR_STATE_TURRET_RUN_HOME, 0);
+            State_Turret_RunHome(true);
+            return;
+        }
+    }
+
+    if (m_Team == TEAM_AMERICAN) {
+        if (!CanSeeEnemy(200)) {
+            m_PotentialEnemies.FlagBadEnemy(m_Enemy);
+            UpdateEnemy(-1);
+        }
+
+        if (!m_Enemy) {
+            Anim_Stand();
+            return;
+        }
+
+        TransitionState(ACTOR_STATE_TURRET_COMBAT, 0);
+        State_Turret_Combat();
+    } else if (CanSeeEnemy(200)) {
+        m_pszDebugState = "Retarget->Combat";
+        TransitionState(ACTOR_STATE_TURRET_COMBAT, 0);
+        State_Turret_Combat();
+    } else {
+        TransitionState(ACTOR_STATE_TURRET_WAIT, 0);
+        State_Turret_Wait();
+    }
+}
+
+void Actor::Turret_SideStep(int iStepSize, vec3_t vDir)
+{
+    AimAtEnemyBehavior();
+    StrafeToAttack(iStepSize, vDir);
+
+    if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) {
+        TransitionState(ACTOR_STATE_TURRET_REACQUIRE);
+        return;
+    }
+
+    StrafeToAttack(-iStepSize, vDir);
+
+    if (PathExists() && !PathComplete() && PathAvoidsSquadMates()) {
+        TransitionState(ACTOR_STATE_TURRET_REACQUIRE);
+        return;
+    }
+
+    Turret_NextRetarget();
+}
+
+void Actor::State_Turret_Shoot(void)
+{
+    assert(g_target_game > target_game_e::TG_MOH);
+
+    if (CanSeeEnemy(200) || FriendlyInLineOfFire(m_Enemy)) {
+        TransitionState(ACTOR_STATE_TURRET_COMBAT);
+        State_Turret_Combat();
+        return;
+    }
+
+    if (level.inttime >= m_iStateTime + 15000) {
+        Turret_SelectState();
+        if (m_State == ACTOR_STATE_TURRET_SHOOT) {
+            Turret_BeginRetarget();
+        }
+    }
+}
+
+void Actor::State_Turret_Retarget_Suppress(void)
+{
+    trace_t trace;
+
+    assert(g_target_game > target_game_e::TG_MOH);
+
+    if (rand() % 100 >= m_iSuppressChance) {
+        AimAtEnemyBehavior();
+        Turret_NextRetarget();
+        return;
+    }
+
+    if (level.inttime >= m_iLastEnemyVisibleTime + 15000) {
+        AimAtEnemyBehavior();
+        Turret_NextRetarget();
+        return;
+    }
+
+    if (FriendlyInLineOfFire(m_Enemy)) {
+        AimAtEnemyBehavior();
+        Turret_NextRetarget();
+        return;
+    }
+
+    trace = G_Trace(
+        EyePosition(),
+        vec_zero,
+        vec_zero,
+        m_Enemy->EyePosition(),
+        this,
+        MASK_CANSEE,
+        qfalse,
+        "Actor::State_Turret_Retarget_Suppress"
+    );
+    if (trace.fraction <= 0.5f) {
+        AimAtEnemyBehavior();
+        Turret_NextRetarget();
+        return;
+    }
+
+    if (trace.fraction != 1.f && trace.plane.normal[2] >= 0.7f) {
+        AimAtEnemyBehavior();
+        Turret_NextRetarget();
+        return;
+    }
+
+    TransitionState(ACTOR_STATE_TURRET_SHOOT);
+    State_Turret_Shoot();
+}
+
+void Actor::State_Turret_Retarget_Sniper_Node(void)
+{
+    PathNode *pSniperNode;
+    bool      bTryAgain;
+
+    AimAtEnemyBehavior();
+    if (m_pCoverNode) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode = NULL;
+    }
+
+    pSniperNode = FindSniperNodeAndSetPath(&bTryAgain);
+    if (pSniperNode) {
+        m_pCoverNode = pSniperNode;
+        pSniperNode->Claim(this);
+        TransitionState(ACTOR_STATE_TURRET_TAKE_SNIPER_NODE);
+        State_Turret_TakeSniperNode();
+    } else if (bTryAgain) {
+        ContinueAnimation();
+    } else {
+        Turret_NextRetarget();
+    }
+}
+
+void Actor::State_Turret_Retarget_Step_Side_Small(void)
+{
+    Turret_SideStep((rand() & 64) - 32, orientation[1]);
+}
+
+void Actor::State_Turret_Retarget_Path_Exact(void)
+{
+    AimAtEnemyBehavior();
+    SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
+
+    if (!ShortenPathToAttack(128)) {
+        Turret_NextRetarget();
+        return;
+    }
+
+    ShortenPathToAvoidSquadMates();
+
+    if (!PathExists()) {
+        Turret_NextRetarget();
+        return;
+    }
+
+    TransitionState(ACTOR_STATE_TURRET_REACQUIRE, 0);
+}
+
+void Actor::State_Turret_Retarget_Path_Near(void)
+{
+    AimAtEnemyBehavior();
+    FindPathNearWithLeash(m_vLastEnemyPos, m_fMinDistanceSquared);
+
+    if (ShortenPathToAttack(128)) {
+        TransitionState(ACTOR_STATE_TURRET_REACQUIRE, 0);
+    } else {
+        Turret_NextRetarget();
+    }
+}
+
+void Actor::State_Turret_Retarget_Step_Side_Medium(void)
+{
+    Turret_SideStep((rand() & 256) - 128, orientation[1]);
+}
+
+void Actor::State_Turret_Retarget_Step_Side_Large(void)
+{
+    Turret_SideStep((rand() & 512) - 256, orientation[1]);
+}
+
+void Actor::State_Turret_Retarget_Step_Face_Medium(void)
+{
+    Turret_SideStep((rand() & 256) - 128, orientation[0]);
+}
+
+void Actor::State_Turret_Retarget_Step_Face_Large(void)
+{
+    Turret_SideStep((rand() & 512) - 256, orientation[0]);
+}
+
+void Actor::State_Turret_Reacquire(void)
+{
+    if (!PathExists() || PathComplete()) {
+        m_pszDebugState = "Retarget->Cheat";
+        SetEnemyPos(m_Enemy->origin);
+        TransitionState(ACTOR_STATE_TURRET_COMBAT, 0);
+        State_Turret_Combat();
+        return;
+    }
+
+    if (CanMovePathWithLeash()) {
+        Anim_RunToInOpen(ANIM_MODE_PATH_GOAL);
+        FaceEnemyOrMotion(level.inttime - m_iStateTime);
+    } else {
+        Turret_BeginRetarget();
+    }
+}
+
+void Actor::State_Turret_TakeSniperNode(void)
+{
+    if (!PathExists() || PathComplete()) {
+        AimAtEnemyBehavior();
+        TransitionState(ACTOR_STATE_TURRET_SNIPER_NODE, 0);
+        return;
+    }
+
+    FaceMotion();
+    Anim_RunToDanger(ANIM_MODE_PATH_GOAL);
+}
+
+void Actor::State_Turret_SniperNode(void)
+{
+    AimAtTargetPos();
+    Anim_Sniper();
+
+    if (Turret_CheckRetarget()) {
+        m_pCoverNode->Relinquish();
+        m_pCoverNode->MarkTemporarilyBad();
+        m_pCoverNode = NULL;
+    }
+}
+
+bool Actor::State_Turret_RunHome(bool bAttackOnFail)
+{
+    SetPath(m_vHome, NULL, 0, NULL, 0.0);
+    ShortenPathToAvoidSquadMates();
+
+    if (!PathExists() || PathComplete()) {
+        Com_Printf(
+            "^~^~^ (entnum %i, radnum %i, targetname '%s') cannot reach his leash home\n",
+            entnum,
+            radnum,
+            targetname.c_str()
+        );
+        if (bAttackOnFail) {
+            m_pszDebugState = "home->combat";
+            State_Turret_Combat();
+        }
+        return false;
+    }
+
+    FaceMotion();
+    Anim_RunToInOpen(ANIM_MODE_PATH);
+    return true;
+}
+
+void Actor::State_Turret_RunAway(void)
+{
+    if (!PathExists() || PathComplete()) {
+        FindPathAwayWithLeash(m_vLastEnemyPos, origin - m_Enemy->origin, 1.5 * m_fMinDistance);
+    }
+
+    if (!PathExists() || PathComplete()) {
+        m_pszDebugState = "runaway->combat";
+        State_Turret_Combat();
+        return;
+    }
+
+    if (!CanMovePathWithLeash()) {
+        m_pszDebugState = "runaway->leash->combat";
+        State_Turret_Combat();
+        return;
+    }
+
+    Anim_RunAwayFiring(ANIM_MODE_PATH);
+    FaceEnemyOrMotion(level.inttime - m_iStateTime);
+}
+
+void Actor::State_Turret_Charge(void)
+{
+    SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
+    ShortenPathToAvoidSquadMates();
+
+    if (!PathExists()) {
+        m_pszDebugState = "charge->near";
+        FindPathNearWithLeash(m_vLastEnemyPos, m_fMaxDistanceSquared);
+
+        if (!ShortenPathToAttack(0)) {
+            ClearPath();
+        }
+    }
+
+    if (!PathExists() || PathComplete() || !PathAvoidsSquadMates()) {
+        ClearPath();
+
+        if (CanSeeEnemy(500)) {
+            m_pszDebugState = "charge->combat";
+            State_Turret_Combat();
+            return;
+        }
+
+        m_pszDebugState = "charge->chill";
+
+        ForwardLook();
+        Anim_Idle();
+
+        if (m_Team == TEAM_AMERICAN || m_PotentialEnemies.HasAlternateEnemy()) {
+            m_PotentialEnemies.FlagBadEnemy(m_Enemy);
+            UpdateEnemy(-1);
+        }
+
+        if (m_Enemy) {
+            Turret_CheckRetarget();
+        }
+    } else if (!MovePathWithLeash()) {
+        m_pszDebugState = "charge->leash->combat";
+        TransitionState(ACTOR_STATE_TURRET_COMBAT, 0);
+        State_Turret_Combat();
+        return;
+    }
+}
+
+void Actor::State_Turret_Grenade(void)
+{
+    GenericGrenadeTossThink();
+}
+
+void Actor::State_Turret_FakeEnemy(void)
+{
+    AimAtTargetPos();
+    Anim_Aim();
+
+    if (level.inttime >= m_iStateTime) {
+        SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+    }
+}
+
+void Actor::State_Turret_Wait(void)
+{
+    PathNode *pNode;
+
+    if (CanSeeEnemy(500) || CanShootEnemy(500)) {
+        if (Turret_TryToBecomeCoverGuy()) {
+            m_pszDebugState = "Wait->CoverInstead";
+            ContinueAnimation();
+        } else {
+            m_pszDebugState = "Wait->Combat";
+            TransitionState(ACTOR_STATE_TURRET_COMBAT);
+            State_Turret_Combat();
+        }
+        return;
+    }
+
+    if (level.inttime >= m_iLastEnemyVisibleTime + 25000) {
+        m_iLastEnemyVisibleTime = level.inttime;
+        m_vLastEnemyPos         = m_Enemy->origin;
+        Turret_BeginRetarget();
+    }
+
+    if (level.inttime >= m_iLastFaceDecideTime + 1500) {
+        m_iLastFaceDecideTime = level.inttime + (rand() & 0x1FF);
+
+        pNode = PathManager.FindCornerNodeForExactPath(this, m_Enemy, 0);
+
+        if (pNode) {
+            SetDesiredYawDest(pNode->m_PathPos);
+            m_eDontFaceWallMode = 6;
+        } else {
+            AimAtTargetPos();
+            DontFaceWall();
+        }
+    }
+
+    if (m_eDontFaceWallMode == 7 || m_eDontFaceWallMode == 8) {
+        Anim_Stand();
+    } else {
+        Anim_Aim();
+    }
+}
+
+void Actor::Think_Turret(void)
+{
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    UpdateEnemy(200);
+
+    if (m_Enemy && m_State == ACTOR_STATE_TURRET_COVER_INSTEAD) {
+        if (!m_bTurretNoInitialCover && Turret_TryToBecomeCoverGuy()) {
+            m_pszDebugState = "CoverInstead";
+
+            CheckUnregister();
+            UpdateAngles();
+            DoMove();
+            UpdateBoneControllers();
+            UpdateFootsteps();
+            return;
+        }
+
+        m_bTurretNoInitialCover = false;
+        Turret_SelectState();
+
+        if (m_State == ACTOR_STATE_TURRET_COMBAT && !CanSeeEnemy(0)) {
+            Turret_BeginRetarget();
+        }
+
+        SetLeashHome(origin);
+
+        if (level.inttime < m_iEnemyChangeTime + 200 && AttackEntryAnimation()) {
+            TransitionState(ACTOR_STATE_TURRET_INTRO_AIM);
+            m_bLockThinkState = true;
+        }
+    }
+
+    if (level.inttime > m_iStateTime + 3000) {
+        Turret_SelectState();
+    }
+
+    if (m_State == ACTOR_STATE_TURRET_INTRO_AIM) {
+        m_pszDebugState = "IntroAnim";
+        AimAtTargetPos();
+        ContinueAnimation();
+
+        if (m_State == ACTOR_STATE_TURRET_WAIT) {
+            PostThink(false);
+        } else {
+            PostThink(true);
+        }
+        return;
+    }
+
+    m_bLockThinkState = false;
+
+    if (!m_Enemy && m_State != ACTOR_STATE_TURRET_FAKE_ENEMY && m_State != ACTOR_STATE_TURRET_RUN_HOME) {
+        TransitionState(ACTOR_STATE_TURRET_FAKE_ENEMY, (rand() + 250) & 0x7FF);
+    }
+
+    if (!m_Enemy && m_State != ACTOR_STATE_TURRET_FAKE_ENEMY) {
+        if (m_State != ACTOR_STATE_TURRET_RUN_HOME
+            || (origin - m_vHome).lengthXYSquared() <= (m_fLeashSquared * 0.64f + 64.0f)
+            || !State_Turret_RunHome(false)) {
+            m_pszDebugState = "Idle";
+            SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+            IdleThink();
+        } else {
+            m_pszDebugState = "Idle->RunHome";
+            PostThink(true);
+        }
+        return;
+    }
+
+    if (m_Enemy && m_State == ACTOR_STATE_TURRET_FAKE_ENEMY) {
+        Turret_BeginRetarget();
+    }
+
+    if (Turret_DecideToSelectState()) {
+        Turret_SelectState();
+    }
+
+    switch (m_State) {
+    case ACTOR_STATE_TURRET_COMBAT:
+        m_pszDebugState = "Combat";
+        State_Turret_Combat();
+        break;
+    case ACTOR_STATE_TURRET_REACQUIRE:
+        m_pszDebugState = "Reacquire";
+        State_Turret_Reacquire();
+        break;
+    case ACTOR_STATE_TURRET_TAKE_SNIPER_NODE:
+        m_pszDebugState = "TakeSniperNode";
+        State_Turret_TakeSniperNode();
+        break;
+    case ACTOR_STATE_TURRET_SNIPER_NODE:
+        m_pszDebugState = "SniperNode";
+        State_Turret_SniperNode();
+        break;
+    case ACTOR_STATE_TURRET_RUN_HOME:
+        m_pszDebugState = "RunHome";
+        State_Turret_RunHome(true);
+        break;
+    case ACTOR_STATE_TURRET_RUN_AWAY:
+        m_pszDebugState = "RunAway";
+        State_Turret_RunAway();
+        break;
+    case ACTOR_STATE_TURRET_CHARGE:
+        m_pszDebugState = "Charge";
+        State_Turret_Charge();
+        break;
+    case ACTOR_STATE_TURRET_GRENADE:
+        m_pszDebugState = "Grenade";
+        State_Turret_Grenade();
+        break;
+    case ACTOR_STATE_TURRET_FAKE_ENEMY:
+        m_pszDebugState = "FakeEnemy";
+        State_Turret_FakeEnemy();
+        break;
+    case ACTOR_STATE_TURRET_BECOME_COVER:
+        m_pszDebugState = "BecomeCover";
+        ContinueAnimation();
+        break;
+    case ACTOR_STATE_TURRET_WAIT:
+        m_pszDebugState = "Wait";
+        State_Turret_Wait();
+        break;
+    case ACTOR_STATE_TURRET_SHOOT:
+        m_pszDebugState = "Shoot";
+        State_Turret_Shoot();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_SUPPRESS:
+        m_pszDebugState = "Retarget_Suppress";
+        State_Turret_Retarget_Suppress();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE:
+        m_pszDebugState = "Retarget_Sniper_Node";
+        State_Turret_Retarget_Sniper_Node();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_SMALL:
+        m_pszDebugState = "Retarget_Step_Side_Small";
+        State_Turret_Retarget_Step_Side_Small();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_PATH_EXACT:
+        m_pszDebugState = "Retarget_Path_Exact";
+        State_Turret_Retarget_Path_Exact();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_PATH_NEAR:
+        m_pszDebugState = "Retarget_Path_Near";
+        State_Turret_Retarget_Path_Near();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_MEDIUM:
+        m_pszDebugState = "Retarget_Step_Side_Medium";
+        State_Turret_Retarget_Step_Side_Medium();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_LARGE:
+        m_pszDebugState = "Retarget_Step_Side_Large";
+        State_Turret_Retarget_Step_Side_Large();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_STEP_FACE_MEDIUM:
+        m_pszDebugState = "Retarget_Step_Face_Medium";
+        State_Turret_Retarget_Step_Face_Medium();
+        break;
+    case ACTOR_STATE_TURRET_RETARGET_STEP_FACE_LARGE:
+        m_pszDebugState = "Retarget_Step_Face_Large";
+        State_Turret_Retarget_Step_Face_Large();
+        break;
+    default:
+        Com_Printf("Actor::Think_Turret: invalid think state %i\n", m_State);
+        assert(!"invalid think state");
+        break;
+    }
+
+    if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+        CheckForTransition(THINKSTATE_BADPLACE, THINKLEVEL_IDLE);
+    }
+
+    if (m_State == ACTOR_STATE_TURRET_WAIT) {
+        PostThink(false);
+    } else {
+        PostThink(true);
+    }
+}
+
+void Actor::ReceiveAIEvent_Turret(
+    vec3_t event_origin, int iType, Entity *originator, float fDistSquared, float fMaxDistSquared
 )
 {
-	func->ThinkState					= &Actor::Think_Turret;
-	func->BeginState					= &Actor::Begin_Turret;
-	func->EndState						= &Actor::End_Turret;
-	func->SuspendState					= &Actor::Suspend_Turret;
-	func->RestartState					= NULL;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Turret;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->PostShoot						= &Actor::InterruptPoint_Turret;
-	func->ReceiveAIEvent				= &Actor::ReceiveAIEvent_Turret;
-	func->IsState						= &Actor::IsAttackState;
-	func->PathnodeClaimRevoked			= &Actor::PathnodeClaimRevoked_Turret;
+    if (iType == AI_EVENT_WEAPON_IMPACT && m_Enemy && fDistSquared <= Square(128)) {
+        Turret_TryToBecomeCoverGuy();
+        return;
+    }
+
+    DefaultReceiveAIEvent(origin, iType, originator, fDistSquared, fMaxDistSquared);
 }
 
-void Actor::Begin_Turret
-(
-	void
-)
+bool Actor::Turret_TryToBecomeCoverGuy(void)
 {
-	DoForceActivate();
-	m_csMood = STRING_ALERT;
+    PathNode *pOldCover = m_pCoverNode;
 
-	ClearPath();
+    Cover_FindCover(true);
 
-	if (m_Enemy)
-	{
-		TransitionState(110, 0);
-	}
-	else
-	{
-		TransitionState(109, (rand() & 0x7FF) + 250);
-	}
+    if (m_pCoverNode) {
+        TransitionState(ACTOR_STATE_TURRET_BECOME_COVER, 0);
+        SetThink(THINKSTATE_ATTACK, THINK_COVER);
+        return true;
+    }
+
+    if (pOldCover) {
+        m_pCoverNode = pOldCover;
+        m_pCoverNode->Claim(this);
+    }
+
+    return false;
 }
 
-void Actor::End_Turret
-(
-	void
-)
+void Actor::FinishedAnimation_Turret(void)
 {
-	if (m_pCoverNode && m_State != 111)
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode = NULL;
-	}
-	TransitionState(-1, 0);
+    if (m_State == ACTOR_STATE_TURRET_GRENADE || m_State == ACTOR_STATE_TURRET_INTRO_AIM
+        || m_State == ACTOR_STATE_TURRET_SHOOT) {
+        Turret_SelectState();
+    }
 }
 
-void Actor::Suspend_Turret
-(
-	void
-)
+void Actor::InterruptPoint_Turret(void)
 {
-	if (!m_Enemy)
-	{
-		TransitionState(110, 0);
-	}
-	else
-	{
-		if (m_State <= 108)
-		{
-			SetEnemyPos(m_Enemy->origin);
-			AimAtEnemyBehavior();
-			TransitionState(113, 0);
-		}
-	}
+    if (m_Enemy && !Turret_TryToBecomeCoverGuy() && m_State == ACTOR_STATE_TURRET_COMBAT) {
+        m_iStateTime = level.inttime;
+        Turret_SelectState();
+    }
 }
 
-void Actor::Think_Turret
-(
-	void
-)
+void Actor::PathnodeClaimRevoked_Turret(void)
 {
-
-
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		NoPoint();
-		UpdateEnemy(200);
-
-		if (m_Enemy && m_State == 110)
-		{
-			if (!m_bTurretNoInitialCover && Turret_TryToBecomeCoverGuy())
-			{
-					m_pszDebugState = "CoverInstead";
-					CheckUnregister();
-					UpdateAngles();
-					DoMove();
-					UpdateBoneControllers();
-					UpdateFootsteps();
-					return;
-			}
-
-			m_bTurretNoInitialCover = false;
-
-			Turret_SelectState();
-
-			if (m_State == 100 && !CanSeeEnemy(0))
-			{
-				Turret_BeginRetarget();
-			}
-
-			SetLeashHome(origin);
-
-			if (level.inttime < m_iEnemyChangeTime + 200)
-			{
-				if (AttackEntryAnimation())
-				{
-					m_bLockThinkState = true;
-					TransitionState(108, 0);
-				}
-			}
-		}
-
-		if (level.inttime > m_iStateTime + 3000)
-			Turret_SelectState();
-
-		if (m_State == 108)
-		{
-			m_pszDebugState = "IntroAnim";
-			AimAtTargetPos();
-			ContinueAnimation();
-		}
-		else
-		{
-			m_bLockThinkState = false;
-			if (!m_Enemy && m_State != 109 && m_State != 104)
-			{
-				TransitionState(109, ((rand() + 250) & 0x7FF));
-			}
-			if (!m_Enemy)
-			{
-				if (m_State != 109)
-				{
-					if (m_State != 104
-						|| (origin - m_vHome).lengthXYSquared() <= 0.64f * m_fLeashSquared + 64.0f
-						|| !State_Turret_RunHome(false))
-					{
-						m_pszDebugState = "Idle";
-						SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-						IdleThink();
-					}
-					else
-					{
-						m_pszDebugState = "Idle->RunHome";
-						PostThink(true);
-					}
-					return;
-				}
-			}
-			if (m_Enemy && m_State == 109)
-			{
-				Turret_BeginRetarget();
-			}
-
-			if (Turret_DecideToSelectState())
-				Turret_SelectState();
-
-			switch (m_State)
-			{
-			case 100:
-				m_pszDebugState = "Combat";
-				State_Turret_Combat();
-				break;
-			case 101:
-				m_pszDebugState = "Reacquire";
-				State_Turret_Reacquire();
-				break;
-			case 102:
-				m_pszDebugState = "TakeSniperNode";
-				if (!PathExists() || PathComplete())
-				{
-					AimAtEnemyBehavior();
-					TransitionState(103, 0);
-				}
-				else
-				{
-					FaceMotion();
-					Anim_RunToDanger(3);
-				}
-				break;
-			case 103:
-				m_pszDebugState = "SniperNode";
-				State_Turret_SniperNode();
-				break;
-			case 104:
-				m_pszDebugState = "RunHome";
-				State_Turret_RunHome(true);
-				break;
-			case 105:
-				m_pszDebugState = "RunAway";
-				State_Turret_RunAway();
-				break;
-			case 106:
-				m_pszDebugState = "Charge";
-				State_Turret_Charge();
-				break;
-			case 107:
-				m_pszDebugState = "Grenade";
-				State_Turret_Grenade();
-				break;
-			case 109:
-				m_pszDebugState = "FakeEnemy";
-				State_Turret_FakeEnemy();
-				break;
-			case 111:
-				m_pszDebugState = "BecomeCover";
-				ContinueAnimation();
-				break;
-			case 112:
-				m_pszDebugState = "Wait";
-				State_Turret_Wait();
-				break;
-			case 113:
-				m_pszDebugState = "Retarget_Sniper_Node";
-				State_Turret_Retarget_Sniper_Node();
-				break;
-			case 114:
-				m_pszDebugState = "Retarget_Step_Side_Small";
-				State_Turret_Retarget_Step_Side_Small();
-				break;
-			case 115:
-				m_pszDebugState = "Retarget_Path_Exact";
-				State_Turret_Retarget_Path_Exact();
-				break;
-			case 116:
-				m_pszDebugState = "Retarget_Path_Near";
-				State_Turret_Retarget_Path_Near();
-				break;
-			case 117:
-				m_pszDebugState = "Retarget_Step_Side_Medium";
-				State_Turret_Retarget_Step_Side_Medium();
-				break;
-			case 118:
-				m_pszDebugState = "Retarget_Step_Side_Large";
-				State_Turret_Retarget_Step_Side_Large();
-				break;
-			case 119:
-				m_pszDebugState = "Retarget_Step_Face_Medium";
-				State_Turret_Retarget_Step_Face_Medium();
-				break;
-			case 120:
-				m_pszDebugState = "Retarget_Step_Face_Large";
-				State_Turret_Retarget_Step_Face_Large();
-				break;
-			default:
-				Com_Printf("Actor::Think_Turret: invalid think state %i\n", m_State);
-				assert(!"invalid think state");
-				break;
-			}
-			CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL);
-		}
-		if (m_State == 112)
-		{
-			PostThink(false);
-		}
-		else
-		{
-			PostThink(true);
-		}
-	}
-}
-
-void Actor::FinishedAnimation_Turret
-(
-	void
-)
-{
-	if (m_State <= 108)
-	{
-		Turret_SelectState();
-	}
-}
-
-void Actor::ReceiveAIEvent_Turret
-(
-	vec3_t event_origin,
-	int iType,
-	Entity *originator,
-	float fDistSquared,
-	float fMaxDistSquared
-)
-{
-	if (iType == AI_EVENT_WEAPON_IMPACT)
-	{
-		if (m_Enemy && fDistSquared <= Square(128))
-		{
-			Turret_TryToBecomeCoverGuy();
-		}
-	}
-	else
-	{
-		DefaultReceiveAIEvent(
-			origin,
-			iType,
-			originator,
-			fDistSquared,
-			fMaxDistSquared);
-	}
-}
-
-void Actor::InterruptPoint_Turret
-(
-	void
-)
-{
-	if (m_Enemy && !Turret_TryToBecomeCoverGuy() && m_State == 100)
-	{
-		m_iStateTime = level.inttime;
-		Turret_SelectState();
-	}
-}
-
-void Actor::PathnodeClaimRevoked_Turret
-(
-	void
-)
-{
-	if (m_Enemy == NULL)
-	{
-		TransitionState(110, 0);
-	}
-	else
-	{
-		Turret_BeginRetarget();
-	}
-}
-
-bool Actor::Turret_IsRetargeting
-(
-	void
-) const
-{
-	return m_State <= 120;
-}
-
-bool Actor::Turret_DecideToSelectState
-(
-	void
-)
-{
-	switch (m_State)
-	{
-	case 100:
-		if (level.inttime > m_iStateTime + 5000)
-		{
-			InterruptPoint_Turret();
-		}
-		return false;
-	case 101:
-	case 107:
-	case 102:
-	case 109:
-		return false;
-	}
-	return !Turret_IsRetargeting();
-}
-
-void Actor::Turret_SelectState
-(
-	void
-)
-{
-	vec2_t vDelta;
-	float fDistSquared;
-	if (!m_Enemy)
-	{
-		TransitionState(109, rand() & 0x7FF + 250);
-		return;
-	}
-
-	VectorSub2D(origin, m_vHome, vDelta);
-	fDistSquared = VectorLength2DSquared(vDelta);
-
-	if (m_State == 104 && fDistSquared > m_fLeashSquared * 0.64 + 64.0)
-	{
-		if (PathExists() && !PathComplete())
-			return;
-	}
-	else if (fDistSquared <= m_fLeashSquared * 1.21 + 256.0)
-	{
-		m_iRunHomeTime = 0;
-	}
-	else if (m_iRunHomeTime == 0)
-	{
-		m_iRunHomeTime = level.inttime + (rand() & 0xFFF) + 1000;
-	}
-	else if (level.inttime >= m_iRunHomeTime)
-	{
-		m_iRunHomeTime = 0;
-
-		ClearPath();
-		SetPath(m_vHome, NULL, 0, NULL, 0.0);
-		ShortenPathToAvoidSquadMates();
-
-		if (PathExists() && !PathComplete())
-		{
-			TransitionState(104, 0);
-			return;
-		}
-		else
-		{
-			Com_Printf(
-				"^~^~^ (entnum %i, radnum %d, targetname '%s') cannot reach his leash home\n",
-				entnum,
-				radnum,
-				targetname.c_str());
-		}
-	}
-
-	VectorSub2D(origin, m_Enemy->origin, vDelta);
-	fDistSquared = VectorLength2DSquared(vDelta);
-
-	if (m_State == 105)
-	{
-		if (m_fMinDistanceSquared * 2.25 > fDistSquared)
-			return;
-	}
-
-	if (m_fMinDistanceSquared > fDistSquared)
-	{
-		ClearPath();
-		TransitionState(105, 0);
-		return;
-	}
-
-	if (fDistSquared > m_fMaxDistanceSquared)
-	{
-		bool bSmthing = false;
-		if (m_Team == TEAM_GERMAN)
-		{
-			if ((m_Enemy->origin - m_vHome).lengthSquared() >= Square(m_fLeash + m_fMaxDistance) && !CanSeeEnemy(200))
-				bSmthing = true;
-		}
-		if (bSmthing)
-		{
-			ClearPath();
-			TransitionState(112, 0);
-		}
-		else
-		{
-			if (m_State == 106)
-				return;
-			ClearPath();
-			TransitionState(106, 0);
-		}
-		return;
-	}
-
-	if (DecideToThrowGrenade(m_Enemy->velocity + m_vLastEnemyPos, &m_vGrenadeVel, &m_eGrenadeMode))
-	{
-		m_bNextForceStart = false;
-		SetDesiredYawDir(m_vGrenadeVel);
-
-		m_eNextAnimMode = 1;
-		m_csNextAnimString = (m_eGrenadeMode == AI_GREN_TOSS_ROLL) ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR;
-		TransitionState(107, 0);
-		return;
-	}
-
-	if (m_State != 100 && m_State != 103 && m_State != 112)
-	{
-		ClearPath();
-		TransitionState(100, 0);
-	}
-}
-
-bool Actor::Turret_CheckRetarget
-(
-	void
-)
-{
-	if (level.inttime < m_iStateTime + 5000 || level.inttime < m_iLastHitTime + 5000)
-		return false;
-
-	Turret_BeginRetarget();
-
-	return true;
-}
-
-bool Actor::Turret_TryToBecomeCoverGuy
-(
-	void
-)
-{
-	PathNode* pOldCover = m_pCoverNode;
-	Cover_FindCover(true);
-	if (m_pCoverNode)
-	{
-		TransitionState(111, 0);
-		SetThink(THINKSTATE_ATTACK, THINK_COVER);
-		return true;
-	}
-	else
-	{
-		if (pOldCover)
-		{
-			m_pCoverNode = pOldCover;
-			m_pCoverNode->Claim(this);
-		}
-		return false;
-	}
-}
-
-void Actor::Turret_BeginRetarget
-(
-	void
-)
-{
-	SetEnemyPos(m_Enemy->origin);
-	AimAtEnemyBehavior();
-
-	TransitionState(113, 0);
-
-}
-
-void Actor::Turret_NextRetarget
-(
-	void
-)
-{
-	vec2_t vDelta;
-	float fDistSquared;
-
-
-	m_State++;
-
-	if (Turret_IsRetargeting())
-	{
-		m_iStateTime = level.inttime;
-		return;
-	}
-
-	VectorSub2D(origin, m_vHome, vDelta);
-	fDistSquared = VectorLength2DSquared(vDelta);
-
-	if (fDistSquared >= m_fLeashSquared)
-	{
-		SetPath(m_vHome, NULL, 0, NULL, 0.0);
-		ShortenPathToAvoidSquadMates();
-		if (PathExists() && !PathComplete())
-		{
-			TransitionState(104, 0);
-			State_Turret_RunHome(true);
-			return;
-		}
-	}
-
-	if (m_Team == TEAM_AMERICAN)
-	{
-		if (!CanSeeEnemy(200))
-		{
-			m_PotentialEnemies.FlagBadEnemy(m_Enemy);
-			UpdateEnemy(-1);
-		}
-		if (!m_Enemy)
-		{
-			Anim_Stand();
-			return;
-		}
-		TransitionState(100, 0);
-		State_Turret_Combat();
-		
-	}
-	else
-	{
-		if (CanSeeEnemy(200))
-		{
-			m_pszDebugState = "Retarget->Combat";
-			TransitionState(100, 0);
-			State_Turret_Combat();
-		}
-		else
-		{
-			TransitionState(112, 0);
-			State_Turret_Wait();
-		}
-	}
-}
-
-void Actor::Turret_SideStep
-(
-	int iStepSize,
-	vec3_t vDir
-)
-{
-	AimAtEnemyBehavior();
-	//v3 = iStepSize;
-	StrafeToAttack(iStepSize, vDir);
-	if ((PathExists()
-		&& !PathComplete()
-		&& PathAvoidsSquadMates())
-		|| ((StrafeToAttack(-iStepSize, vDir),
-			PathExists())
-			&& !PathComplete()
-			&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Combat
-(
-	void
-)
-{
-	if (CanSeeEnemy(200))
-	{
-		ClearPath();
-		Anim_Attack();
-		AimAtTargetPos();
-		Turret_CheckRetarget();
-		return;
-	}
-	if (!PathExists() || PathComplete() || !PathAvoidsSquadMates())
-	{
-		SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
-		ShortenPathToAvoidSquadMates();
-	}
-	if (!PathExists() || PathComplete() || !PathAvoidsSquadMates())
-	{
-		FindPathNearWithLeash(m_vLastEnemyPos, 4.0 * m_fMinDistanceSquared);
-		if (!ShortenPathToAttack(0.0))
-			ClearPath();
-		ShortenPathToAvoidSquadMates();
-	}
-	if (!PathExists()
-		|| PathComplete()
-		|| !PathAvoidsSquadMates())
-	{
-		m_pszDebugState = "combat->chill";
-		Turret_BeginRetarget();
-	}
-	else
-	{
-		m_pszDebugState = "combat->move";
-		if (!MovePathWithLeash())
-		{
-			m_pszDebugState = "combat->move->aim";
-			Turret_BeginRetarget();
-		}
-		else
-		{
-			Turret_CheckRetarget();
-		}
-	}
-
-}
-
-void Actor::State_Turret_Reacquire
-(
-	void
-)
-{
-	/*Sentient *v1; // ecx
-	float v2; // ST08_4
-	float v3; // ST0C_4
-	Sentient *v4; // ecx
-	float v5; // ST08_4
-	float v6; // ST0C_4
-	*/
-	if (PathExists() && !PathComplete())
-	{
-		if (CanMovePathWithLeash())
-		{
-			Anim_RunToInOpen(3);
-			FaceEnemyOrMotion(level.inttime - m_iStateTime);
-		}
-		else
-		{
-			Turret_BeginRetarget();
-		}
-	}
-	else
-	{
-		m_pszDebugState = "Retarget->Cheat";
-		SetEnemyPos(m_Enemy->origin);
-		TransitionState(100, 0);
-		State_Turret_Combat();
-	}
-}
-
-void Actor::State_Turret_TakeSniperNode
-(
-	void
-)
-{
-	if (PathExists() && !PathComplete())
-	{
-		FaceMotion();
-		Anim_RunToDanger(3);
-	}
-	else
-	{
-		AimAtEnemyBehavior();
-		TransitionState(103, 0);
-	}
-}
-
-void Actor::State_Turret_SniperNode
-(
-	void
-)
-{
-	AimAtTargetPos();
-	Anim_Sniper();
-	if (Turret_CheckRetarget())
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode->MarkTemporarilyBad();
-		m_pCoverNode = NULL;
-	}
-}
-
-bool Actor::State_Turret_RunHome
-(
-	bool bAttackOnFail
-)
-{
-
-	SetPath(m_vHome, NULL, 0, NULL, 0.0);
-	ShortenPathToAvoidSquadMates();
-	if (!PathExists() || PathComplete())
-	{
-		Com_Printf(
-			"^~^~^ (entnum %i, radnum %i, targetname '%s') cannot reach his leash home\n",
-			entnum,
-			radnum,
-			targetname.c_str());
-		if (bAttackOnFail)
-		{
-			m_pszDebugState = "home->combat";
-			State_Turret_Combat();
-		}
-		return false;
-	}
-	else
-	{
-		FaceMotion();
-		Anim_RunToInOpen(2);
-		return true;
-	}
-}
-
-void Actor::State_Turret_RunAway
-(
-	void
-)
-{
-	if (!PathExists() || PathComplete())
-	{
-		FindPathAwayWithLeash(m_vLastEnemyPos, origin - m_Enemy->origin, 1.5 * m_fMinDistance);
-	}
-	if (!PathExists() || PathComplete())
-	{
-		m_pszDebugState = "runaway->combat";
-		State_Turret_Combat();
-		return;
-	}
-	if (!CanMovePathWithLeash())
-	{
-		m_pszDebugState = "runaway->leash->combat";
-		State_Turret_Combat();
-		return;
-	}
-	Anim_RunAwayFiring(2);
-	FaceEnemyOrMotion(level.inttime - m_iStateTime);
-}
-
-void Actor::State_Turret_Charge
-(
-	void
-)
-{
-	SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
-	ShortenPathToAvoidSquadMates();
-	if (!PathExists())
-	{
-		m_pszDebugState = "charge->near";
-		FindPathNearWithLeash(m_vLastEnemyPos, m_fMaxDistanceSquared);
-		if (!ShortenPathToAttack(0))
-			ClearPath();
-	}
-	if (!PathExists() || PathComplete() || !PathAvoidsSquadMates())
-	{
-		ClearPath();
-		if (CanSeeEnemy(500))
-		{
-			m_pszDebugState = "charge->combat";
-			State_Turret_Combat();
-			return;
-		}
-		m_bHasDesiredLookAngles = false;
-		m_pszDebugState = "charge->chill";
-		Anim_Idle();
-		if (m_Team != TEAM_AMERICAN)
-		{
-			//v1 = &this->m_PotentialEnemies;
-			if (!m_PotentialEnemies.HasAlternateEnemy())
-			{
-
-				if (m_Enemy)
-					Turret_CheckRetarget();
-				return;
-			}
-		}
-		m_PotentialEnemies.FlagBadEnemy(m_Enemy);
-		UpdateEnemy(-1);
-		if (m_Enemy)
-			Turret_CheckRetarget();
-		return;
-	}
-	if (!MovePathWithLeash())
-	{
-		m_pszDebugState = "charge->leash->combat";
-		TransitionState(100, 0);
-		State_Turret_Combat();
-		return;
-	}
-}
-
-void Actor::State_Turret_Grenade
-(
-	void
-)
-{
-	GenericGrenadeTossThink();
-}
-
-void Actor::State_Turret_FakeEnemy
-(
-	void
-)
-{
-	AimAtTargetPos();
-	Anim_Aim();
-	if (level.inttime >= m_iStateTime)
-		SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-}
-
-void Actor::State_Turret_Wait
-(
-	void
-)
-{
-	PathNode *pNode;
-	if (CanSeeEnemy(500) || CanShootEnemy(500))
-	{
-		bool bSmth;
-
-		pNode = m_pCoverNode;
-		Cover_FindCover(true);
-
-		if (m_pCoverNode)
-		{
-			TransitionState(111, 0);
-			SetThink(THINKSTATE_ATTACK, THINK_COVER);
-			bSmth = true;
-		}
-		else
-		{
-			if (pNode)
-			{
-				m_pCoverNode = pNode;
-				m_pCoverNode->Claim(this);
-			}
-			bSmth = false;
-		}
-		if (bSmth)
-		{
-			m_pszDebugState = "Wait->CoverInstead";
-			ContinueAnimation();
-		}
-		else
-		{
-			m_pszDebugState = "Wait->Combat";
-			TransitionState(100, 0);
-			State_Turret_Combat();
-		}
-	}
-	else
-	{
-		if (level.inttime >= m_iLastFaceDecideTime + 1500)
-		{
-			m_iLastFaceDecideTime = level.inttime + (rand() & 0x1FF);
-
-
-
-
-
-
-			pNode = PathManager.FindCornerNodeForExactPath(this, m_Enemy, 0);
-
-			if (pNode)
-			{
-				if (pNode->m_PathPos - origin != vec_zero)
-				{
-					SetDesiredYawDir(pNode->m_PathPos - origin);
-				}
-				m_eDontFaceWallMode = 6;
-			}
-			else
-			{
-				AimAtTargetPos();
-				DontFaceWall();
-			}
-		}
-		if (m_eDontFaceWallMode > 8)
-			Anim_Aim();
-		else
-			Anim_Stand();
-	}
-}
-
-void Actor::State_Turret_Retarget_Sniper_Node
-(
-	void
-)
-{
-	PathNode *pSniperNode;
-	bool bTryAgain;
-
-	AimAtEnemyBehavior();
-	if (m_pCoverNode)
-	{
-		m_pCoverNode->Relinquish();
-		m_pCoverNode = NULL;
-	}
-	pSniperNode = FindSniperNodeAndSetPath(&bTryAgain);
-	if (pSniperNode)
-	{
-		m_pCoverNode = pSniperNode;
-		pSniperNode->Claim(this);
-		TransitionState(102, 0);
-
-		State_Turret_TakeSniperNode();
-	}
-	else if (bTryAgain)
-	{
-		ContinueAnimation();
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Path_Exact
-(
-	void
-)
-{
-	AimAtEnemyBehavior();
-	SetPathWithLeash(m_vLastEnemyPos, NULL, 0);
-	if (ShortenPathToAttack(128)
-		&& (ShortenPathToAvoidSquadMates(), PathExists()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Path_Near
-(
-	void
-)
-{
-	AimAtEnemyBehavior();
-	FindPathNearWithLeash(m_vLastEnemyPos, m_fMinDistanceSquared);
-	if (ShortenPathToAttack(128))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Step_Side_Small
-(
-	void
-)
-{
-	int iRand; // esi
-
-	iRand = (rand() & 64) - 32;
-	AimAtEnemyBehavior();
-	StrafeToAttack(iRand, orientation[1]);
-	if ((PathExists() && !PathComplete() && PathAvoidsSquadMates())
-		|| ((Actor::StrafeToAttack(-iRand, orientation[1]),
-			PathExists())
-		&& !PathComplete()
-		&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Step_Side_Medium
-(
-	void
-)
-{
-	int iRand; // esi
-
-	iRand = (rand() & 256) - 128;
-	AimAtEnemyBehavior();
-	StrafeToAttack(iRand, orientation[1]);
-	if ((PathExists() && !PathComplete() && PathAvoidsSquadMates())
-		|| ((Actor::StrafeToAttack(-iRand, orientation[1]),
-			PathExists())
-		&& !PathComplete()
-		&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Step_Side_Large
-(
-	void
-)
-{
-	int iRand; // esi
-
-	iRand = (rand() & 512) - 256;
-	AimAtEnemyBehavior();
-	StrafeToAttack(iRand, orientation[1]);
-	if ((PathExists() && !PathComplete() && PathAvoidsSquadMates())
-		|| ((Actor::StrafeToAttack(-iRand, orientation[1]),
-			PathExists())
-		&& !PathComplete()
-		&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Step_Face_Medium
-(
-	void
-)
-{
-	int iRand; // esi
-
-	iRand = (rand() & 256) - 128;
-	AimAtEnemyBehavior();
-	StrafeToAttack(iRand, orientation[0]);
-	if ((PathExists() && !PathComplete() && PathAvoidsSquadMates())
-		|| ((Actor::StrafeToAttack(-iRand, orientation[0]),
-			PathExists())
-		&& !PathComplete()
-		&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
-}
-
-void Actor::State_Turret_Retarget_Step_Face_Large
-(
-	void
-)
-{
-	int iRand; // esi
-
-	iRand = (rand() & 512) - 256;
-	AimAtEnemyBehavior();
-	StrafeToAttack(iRand, orientation[0]);
-	if ((PathExists() && !PathComplete() && PathAvoidsSquadMates())
-		|| ((Actor::StrafeToAttack(-iRand, orientation[0]),
-			PathExists())
-		&& !PathComplete()
-		&& PathAvoidsSquadMates()))
-	{
-		TransitionState(101, 0);
-	}
-	else
-	{
-		Turret_NextRetarget();
-	}
+    if (!m_Enemy) {
+        TransitionState(ACTOR_STATE_TURRET_COVER_INSTEAD, 0);
+    } else {
+        Turret_BeginRetarget();
+    }
 }
diff --git a/code/fgame/actor_weaponless.cpp b/code/fgame/actor_weaponless.cpp
index f4251243..ebc03f8e 100644
--- a/code/fgame/actor_weaponless.cpp
+++ b/code/fgame/actor_weaponless.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,168 +24,128 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "actor.h"
 
-void Actor::InitWeaponless
-	(
-	GlobalFuncs_t *func
-	)
+void Actor::InitWeaponless(GlobalFuncs_t *func)
 {
-	func->ThinkState					= &Actor::Think_Weaponless;
-	func->BeginState					= &Actor::Begin_Weaponless;
-	func->SuspendState					= &Actor::Suspend_Weaponless;
-	func->PassesTransitionConditions	= &Actor::PassesTransitionConditions_Attack;
-	func->FinishedAnimation				= &Actor::FinishedAnimation_Weaponless;
-	func->IsState						= &Actor::IsAttackState;
+    func->ThinkState                 = &Actor::Think_Weaponless;
+    func->BeginState                 = &Actor::Begin_Weaponless;
+    func->SuspendState               = &Actor::Suspend_Weaponless;
+    func->PassesTransitionConditions = &Actor::PassesTransitionConditions_Attack;
+    func->FinishedAnimation          = &Actor::FinishedAnimation_Weaponless;
+    func->IsState                    = &Actor::IsAttackState;
 }
 
-void Actor::Begin_Weaponless
-	(
-	void
-	)
+void Actor::Begin_Weaponless(void)
 {
+    DoForceActivate();
 
-	DoForceActivate();
+    m_csMood     = STRING_ALERT;
+    m_csIdleMood = STRING_NERVOUS;
 
-	m_csMood = STRING_ALERT;
-	m_csIdleMood = STRING_NERVOUS;
+    if (level.inttime < m_iEnemyChangeTime + 200) {
+        SetLeashHome(origin);
+        if (AttackEntryAnimation()) {
+            m_bLockThinkState = true;
 
-	if (level.inttime < m_iEnemyChangeTime + 200)
-	{
-		SetLeashHome(origin);
-		if (AttackEntryAnimation())
-		{
-			m_bLockThinkState = true;
-
-			TransitionState(902, 0);
-		}
-	}
-	TransitionState(900, 0);
+            TransitionState(ACTOR_STATE_WEAPONLESS_LOOP, 0);
+        }
+    }
+    TransitionState(ACTOR_STATE_WEAPONLESS_START, 0);
 }
 
-void Actor::Suspend_Weaponless
-	(
-	void
-	)
+void Actor::Suspend_Weaponless(void)
 {
-	if (m_State <= 902)
-	{
-		TransitionState(900, 0);
-	}
-
+    if (m_State == ACTOR_STATE_WEAPONLESS_GRENADE || m_State == ACTOR_STATE_WEAPONLESS_LOOP) {
+        TransitionState(ACTOR_STATE_WEAPONLESS_START, 0);
+    }
 }
 
-void Actor::Think_Weaponless
-	(
-	void
-	)
+void Actor::State_Weaponless_Normal(void)
 {
+    int iStateTime;
+    if (m_bScriptGoalValid) {
+        SetPath(m_vScriptGoal, NULL, 0, NULL, 0);
+    }
 
-	if (RequireThink())
-	{
-		UpdateEyeOrigin();
-		NoPoint();
-		UpdateEnemy(500);
+    if (PathExists() && !PathComplete()) {
+        FaceMotion();
+        Anim_RunToDanger(ANIM_MODE_PATH_GOAL);
+        return;
+    }
 
+    m_bScriptGoalValid = false;
 
-		if (m_State == 902)
-		{
-			ContinueAnimation();
-		}
-		else
-		{
-			m_bLockThinkState = false;
-			if (!m_Enemy)
-			{
-				SetThinkState(THINKSTATE_IDLE, THINKLEVEL_NORMAL);
-				IdleThink();
-				return;
-			}
-			if (m_State == 900)
-			{
-				State_Weaponless_Normal();
-			}
-			else if (m_State == 901)
-			{
-				State_Weaponless_Grenade();
-			}
-			else
-			{
-				Com_Printf("Think_Weaponless: invalid think state %i\n", m_State);
-				char assertStr[16317] = { 0 };
-				strcpy(assertStr, "\"invalid think state\"\n\tMessage: ");
-				Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i",	m_State));
-				assert(!assertStr);
-			}
-			CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_NORMAL);
-		}
-		PostThink(true);
-		if (GetWeapon(WEAPON_MAIN))
-			SetThink(THINKSTATE_ATTACK, THINK_TURRET);
-	}
+    AimAtTargetPos();
+    Anim_Stand();
+
+    if (level.inttime < m_iStateTime) {
+        return;
+    }
+
+    if (DecideToThrowGrenade(m_Enemy->origin + m_Enemy->velocity, &m_vGrenadeVel, &m_eGrenadeMode, false)) {
+        SetDesiredYawDir(m_vGrenadeVel);
+        DesiredAnimation(
+            ANIM_MODE_NORMAL,
+            m_eGrenadeMode == AI_GREN_TOSS_ROLL ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR
+        );
+        TransitionState(ACTOR_STATE_WEAPONLESS_GRENADE);
+    } else {
+        TransitionState(ACTOR_STATE_WEAPONLESS_START, 1000);
+    }
 }
 
-void Actor::FinishedAnimation_Weaponless
-	(
-	void
-	)
+void Actor::Think_Weaponless(void)
 {
-	if (m_State <= 902)
-	{
-		TransitionState(900, 4000);
-	}
+    if (!RequireThink()) {
+        return;
+    }
+
+    UpdateEyeOrigin();
+    NoPoint();
+    UpdateEnemy(500);
+
+    if (m_State == ACTOR_STATE_WEAPONLESS_LOOP) {
+        ContinueAnimation();
+    } else {
+        m_bLockThinkState = false;
+
+        if (!m_Enemy) {
+            SetThinkState(THINKSTATE_IDLE, THINKLEVEL_IDLE);
+            IdleThink();
+            return;
+        }
+
+        if (m_State == ACTOR_STATE_WEAPONLESS_START) {
+            State_Weaponless_Normal();
+        } else if (m_State == ACTOR_STATE_WEAPONLESS_GRENADE) {
+            State_Weaponless_Grenade();
+        } else {
+            Com_Printf("Think_Weaponless: invalid think state %i\n", m_State);
+            char assertStr[16317] = {0};
+            Q_strncpyz(assertStr, "\"invalid think state\"\n\tMessage: ", sizeof(assertStr));
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace("thinkstate = %i", m_State));
+            assert(!assertStr);
+        }
+
+        if (!CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE)) {
+            CheckForTransition(THINKSTATE_GRENADE, THINKLEVEL_IDLE);
+        }
+    }
+
+    PostThink(true);
+
+    if (GetWeapon(WEAPON_MAIN)) {
+        SetThink(THINKSTATE_ATTACK, THINK_TURRET);
+    }
 }
 
-void Actor::State_Weaponless_Normal
-	(
-	void
-	)
+void Actor::FinishedAnimation_Weaponless(void)
 {
-	int iStateTime;
-	if (m_bScriptGoalValid)
-		SetPath(
-			m_vScriptGoal,
-			NULL,
-			0,
-			NULL,
-			0); 
-	if (PathExists() && !PathComplete())
-	{
-		FaceMotion();
-		Anim_RunToDanger(3);
-	}
-	else
-	{
-		m_bScriptGoalValid = false;
-
-		AimAtTargetPos();
-		
-		Anim_Stand();
-		if (level.inttime >= m_iStateTime)
-		{
-			if (DecideToThrowGrenade(m_Enemy->velocity + m_Enemy->origin, &m_vGrenadeVel, &m_eGrenadeMode))
-			{
-				SetDesiredYawDir(m_vGrenadeVel);
-
-				m_State = 901;
-				m_eNextAnimMode = 1;
-				m_bNextForceStart = false;
-				m_csNextAnimString = (m_eGrenadeMode == AI_GREN_TOSS_ROLL) ? STRING_ANIM_GRENADETOSS_SCR : STRING_ANIM_GRENADETHROW_SCR;
-				iStateTime = level.inttime;
-			}
-			else
-			{
-				m_State = 900;
-				iStateTime = level.inttime + 1000;
-			}
-			m_iStateTime = iStateTime;
-		}
-	}
+    if (m_State == ACTOR_STATE_WEAPONLESS_GRENADE || m_State == ACTOR_STATE_WEAPONLESS_LOOP) {
+        TransitionState(ACTOR_STATE_WEAPONLESS_NORMAL, 4000);
+    }
 }
 
-
-void Actor::State_Weaponless_Grenade
-(
-	void
-)
+void Actor::State_Weaponless_Grenade(void)
 {
-	GenericGrenadeTossThink();
+    GenericGrenadeTossThink();
 }
diff --git a/code/fgame/actorenemy.cpp b/code/fgame/actorenemy.cpp
index 43340b76..86733706 100644
--- a/code/fgame/actorenemy.cpp
+++ b/code/fgame/actorenemy.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,694 +23,538 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // actorenemy.cpp:
 
 #include "actorenemy.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "sentient.h"
 #include "actor.h"
 
-ActorEnemy::ActorEnemy()
+float ActorEnemy::UpdateLMRF(Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible)
 {
-	m_pEnemy = NULL;
-	m_vLastKnownPos = vec_zero;
+    float  fMaxRange, fRange, fRangeScale, fNormalizedRange;
+    float  fForward;
+    float  fFovScale;
+    float  fMinSightTime;
+    float  fLMRF;
+    float  fFarPlane;
+    Vector vDelta;
+    float  fObfuscation;
+
+    *pbInFovAndRange = false;
+    *pbVisible       = false;
+
+    vDelta    = pSelf->VirtualEyePosition() - GetEnemy()->origin;
+    vDelta[2] = 0;
+
+    fRange    = vDelta.lengthXYSquared();
+    fMaxRange = pSelf->m_fSight;
+
+    if (world->farplane_distance > 0) {
+        fFarPlane = world->farplane_distance * 0.828f;
+
+        if (fMaxRange > fFarPlane) {
+            fMaxRange = fFarPlane;
+        }
+    }
+
+    if (fRange > Square(fMaxRange)) {
+        return 8.0;
+    }
+
+    fForward = sqrt(fRange);
+
+    fMinSightTime = -DotProduct2D(pSelf->m_vEyeDir, vDelta);
+    if (fMinSightTime < 0) {
+        return 8.0;
+    }
+
+    fMinSightTime += 128;
+    if (pSelf->m_fFovDot * fForward > fMinSightTime) {
+        return 8.0;
+    }
+
+    *pbInFovAndRange = true;
+    if (!pSelf->CanSee(m_pEnemy, 0, 0, false)) {
+        return 8.0;
+    }
+
+    // Added in 2.0.
+    //  Check for obfuscation
+    fObfuscation = G_VisualObfuscation(pSelf->VirtualEyePosition(), m_pEnemy->EyePosition());
+    if (fObfuscation >= 1.f) {
+        return 8.0;
+    }
+
+    *pbVisible = true;
+
+    fFovScale = (fMinSightTime / (fForward + 128.0) * -1.3 - (pSelf->m_fFovDot * 0.2 - 1.5)) / (1.0 - pSelf->m_fFovDot);
+    fRangeScale      = fForward / fMaxRange;
+    fNormalizedRange = (((fRangeScale * 16.0 + -16.0) * fRangeScale + -1.0) * fRangeScale + 7.0) * fRangeScale;
+    fNormalizedRange = fNormalizedRange / 3.0;
+
+    fLMRF = Square(m_pEnemy->stealthMovementScale * fNormalizedRange) * (fForward + 128.0) / fMinSightTime;
+    fLMRF *= pSelf->m_fNoticeTimeScale * g_ai_noticescale->value;
+    if (fLMRF < fFovScale) {
+        return fFovScale;
+    }
+
+    return fLMRF;
 }
 
-ActorEnemy::~ActorEnemy()
+float ActorEnemy::UpdateVisibility(Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible)
 {
-	//no need
+    float fLMRF, fFrameTime;
+
+    fFrameTime = level.time - m_fLastLookTime;
+
+    m_fLastLookTime = level.time;
+
+    fLMRF = UpdateLMRF(pSelf, pbInFovAndRange, pbVisible);
+    if (fLMRF < 8.0) {
+        m_fVisibility += fFrameTime / fLMRF;
+    } else if (m_fVisibility < 1.0) {
+        m_fVisibility -= fFrameTime * 0.25;
+        if (m_fVisibility < 0.0) {
+            m_fVisibility = 0.0;
+        }
+    }
+
+    m_fTotalVisibility = m_fVisibility + GetEnemy()->m_fPlayerSightLevel;
+    if (m_fTotalVisibility > 1) {
+        m_fVisibility      = 1;
+        m_fTotalVisibility = 1;
+    }
+    return m_fTotalVisibility;
 }
 
-float ActorEnemy::UpdateVisibility
-	(
-	Actor *pSelf,
-	bool *pbInFovAndRange,
-	bool *pbVisible
-	)
+int ActorEnemy::UpdateThreat(Actor *pSelf)
 {
-	float fLMRF, fFrameTime;
+    static float fRangeThreatSquared[] = {
+        Square(2048),
+        Square(1400),
+        Square(1100),
+        Square(916),
+        Square(784),
+        Square(683),
+        Square(600),
+        Square(529),
+        Square(466),
+        Square(410),
+        Square(357),
+        Square(305),
+        Square(254),
+        Square(200),
+        Square(137)
+    };
+    static int iWeaponThreat[7][5] = {
+        {5,  3,  1,  1, 1},
+        {8,  6,  4,  2, 1},
+        {10, 9,  7,  8, 4},
+        {12, 10, 8,  4, 3},
+        {12, 12, 9,  7, 4},
+        {12, 10, 5,  2, 1},
+        {10, 12, 10, 7, 5}
+    };
+    int    iWeapon;
+    int    iZone;
+    Vector vDelta;
+    int    i;
 
-	fFrameTime = level.time - m_fLastLookTime;
+    m_iThreat              = 0;
+    m_fCurrentRangeSquared = 1e38f;
 
-	m_fLastLookTime = level.time;
+    if (m_pEnemy->m_bIsDisguised || m_fTotalVisibility < 0.999f || level.inttime < m_iNextEnemyTime) {
+        return m_iThreat;
+    }
 
-	fLMRF = UpdateLMRF(pSelf, pbInFovAndRange, pbVisible);
-	if (fLMRF < 8.0)
-	{
-		m_fVisibility += fFrameTime / fLMRF;
-	}
-	else
-	{
-		if (m_fVisibility < 1.0)
-		{
-			m_fVisibility -= fFrameTime * 0.25;
-			if (m_fVisibility < 0.0)
-				m_fVisibility = 0.0;
-		}
-	}
+    m_iThreat = 10000;
+    if (m_bVisible) {
+        m_iThreat = 10500;
+    }
 
-	m_fTotalVisibility = m_fVisibility + GetEnemy()->m_fPlayerSightLevel;
-	if (m_fTotalVisibility > 1)
-	{
-		m_fVisibility = 1;
-		m_fTotalVisibility = 1;
-	}
-	return m_fTotalVisibility;
+    vDelta                 = m_pEnemy->origin - pSelf->origin;
+    m_fCurrentRangeSquared = vDelta.lengthSquared();
+
+    if (m_fCurrentRangeSquared < Square(256)) {
+        iZone = 0;
+    } else if (m_fCurrentRangeSquared < Square(768)) {
+        iZone = 1;
+    } else if (m_fCurrentRangeSquared < Square(1280)) {
+        iZone = 2;
+    } else if (m_fCurrentRangeSquared < Square(2048)) {
+        iZone = 3;
+    } else {
+        iZone = 4;
+    }
+
+    Weapon *pEnemyWeapon = m_pEnemy->GetActiveWeapon(WEAPON_MAIN);
+    iWeapon              = 0;
+
+    if (pEnemyWeapon) {
+        int iWeapClass = pEnemyWeapon->GetWeaponClass();
+        if (iWeapClass & WEAPON_CLASS_PISTOL) {
+            iWeapon = 1;
+        } else if (iWeapClass & WEAPON_CLASS_RIFLE) {
+            iWeapon = 2;
+        } else if (iWeapClass & WEAPON_CLASS_SMG) {
+            iWeapon = 3;
+        } else if (iWeapClass & WEAPON_CLASS_MG) {
+            iWeapon = 4;
+        } else if (iWeapClass & WEAPON_CLASS_GRENADE) {
+            iWeapon = 5;
+        } else {
+            iWeapon = 6;
+        }
+    }
+
+    for (i = 0; i < ARRAY_LEN(fRangeThreatSquared) && fRangeThreatSquared[i] > m_fCurrentRangeSquared; i++) {}
+
+    m_iThreat += iWeaponThreat[iWeapon][iZone] + m_pEnemy->m_iThreatBias + i;
+
+    float fMinSafeDistSquared = 1.21 * pSelf->m_fMinDistanceSquared + 16384;
+
+    if (m_fCurrentRangeSquared < fMinSafeDistSquared) {
+        m_iThreat += 500 - (sqrt(m_fCurrentRangeSquared / fMinSafeDistSquared) * 500);
+    }
+
+    vec2_t vLine;
+    VectorSub2D(m_vLastKnownPos, pSelf->origin, vLine);
+    float     fDot = DotProduct2D(vLine, m_vLastKnownPos);
+    Sentient *pSquadMate;
+    for (pSquadMate = m_pEnemy->m_pNextSquadMate; pSquadMate != m_pEnemy; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        if (fDot > DotProduct2D(vLine, pSquadMate->origin)) {
+            m_iThreat -= 4;
+        }
+    }
+
+    if (m_pEnemy->IsSubclassOfActor()) {
+        Actor *pActorEnemy = static_cast<Actor *>(m_pEnemy.Pointer());
+        if (pActorEnemy->m_ThinkState == THINKSTATE_PAIN) {
+            m_iThreat -= 2;
+        }
+    }
+
+    fDot = vDelta * pSelf->orientation[0];
+    if (fDot > 0) {
+        if (m_fCurrentRangeSquared * 0.5 >= Square(fDot) && m_fCurrentRangeSquared * 0.5 > Square(fDot)) {
+            m_iThreat++;
+        }
+    } else {
+        if (m_fCurrentRangeSquared * 0.5 > Square(fDot)) {
+            m_iThreat++;
+        }
+    }
+    int iEnemyDiscount = m_pEnemy->m_iAttackerCount;
+
+    if (m_pEnemy == pSelf->m_Enemy) {
+        iEnemyDiscount -= 2;
+        if (level.inttime < pSelf->m_iEnemyChangeTime + 1000) {
+            m_iThreat += 5;
+        }
+    }
+
+    if (iEnemyDiscount > 4) {
+        iEnemyDiscount = 4;
+    }
+    m_iThreat -= iEnemyDiscount;
+
+    if (m_pEnemy == pSelf->m_pLastAttacker) {
+        m_iThreat += 5;
+    }
+    if (m_pEnemy == pSelf->m_FavoriteEnemy) {
+        m_iThreat += 250;
+    }
+    return m_iThreat;
 }
 
-int ActorEnemy::UpdateThreat
-	(
-	Actor *pSelf
-	)
-{
-	//FIXME: macro
-	static float fRangeThreatSquared[15];
-	static int iWeaponThreat[7][5];
-	int iWeapon;
-	int iZone;
-	Vector vDelta;
-
-	m_iThreat = 0;
-	m_fCurrentRangeSquared = 1e38f;
-
-	if (m_pEnemy->m_bIsDisguised || m_fTotalVisibility < 1)
-		return m_iThreat;
-
-	m_iThreat = 10000;
-	if (m_bVisible == true)
-		m_iThreat = 10500;
-
-	vDelta = m_pEnemy->origin - pSelf->origin;
-	m_fCurrentRangeSquared = vDelta.lengthSquared();
-
-	if (m_fCurrentRangeSquared >= 65536.0)
-	{
-		if (m_fCurrentRangeSquared >= 589824.0)
-		{
-			if (m_fCurrentRangeSquared >= 1638400.0)
-			{
-				if (m_fCurrentRangeSquared >= 4194304.0)
-					iZone = 4;
-				else
-					iZone = 3;
-			}
-			else
-			{
-				iZone = 2;
-			}
-		}
-		else
-		{
-			iZone = 1;
-		}
-	}
-	else
-	{
-		iZone = 0;
-	}
-
-	Weapon *pEnemyWeapon = m_pEnemy->GetActiveWeapon(WEAPON_MAIN);
-	iWeapon = 0;
-
-	if (pEnemyWeapon)
-	{
-		int iWeapClass = pEnemyWeapon->GetWeaponClass();
-		if (iWeapClass & WEAPON_CLASS_PISTOL)
-		{
-			iWeapon = 1;
-		}
-		else if (iWeapClass & WEAPON_CLASS_RIFLE)
-		{
-			iWeapon = 2;
-		}
-		else if (iWeapClass & WEAPON_CLASS_SMG)
-		{
-			iWeapon = 3;
-		}
-		else if (iWeapClass & WEAPON_CLASS_MG)
-		{
-			iWeapon = 4;
-		}
-		else if(iWeapClass & WEAPON_CLASS_GRENADE)
-		{
-			iWeapon = 5;
-		}
-		else
-		{
-			iWeapon = 6;
-		}
-	}
-
-	int i=0;
-	if (m_fCurrentRangeSquared > 4194304)
-	{
-		for (; i < 15 && fRangeThreatSquared[i] > m_fCurrentRangeSquared; i++)
-		{
-		}
-	}
-
-	m_iThreat += iWeaponThreat[iZone][iWeapon] + m_pEnemy->m_iThreatBias + i;
-
-	float fMinSafeDistSquared = 1.21 * pSelf->m_fMinDistanceSquared + 16384;
-
-	if (m_fCurrentRangeSquared < fMinSafeDistSquared)
-	{
-		m_iThreat -= (sqrt(m_fCurrentRangeSquared / fMinSafeDistSquared) * 500) + 500;
-	}
-
-	Vector vLine = m_vLastKnownPos - pSelf->origin;
-	float fDot = DotProduct2D(vLine, m_vLastKnownPos);
-	for (Sentient  *pSquadMate = m_pEnemy->m_pNextSquadMate; pSquadMate != m_pEnemy; pSquadMate = pSquadMate->m_pNextSquadMate)
-	{
-		if (fDot > DotProduct2D(vLine, pSquadMate->origin))
-		{
-			m_iThreat -= 4;
-		}
-	}
-
-	Actor *pAEnemy = (Actor *)m_pEnemy.Pointer();
-	if (pAEnemy->IsSubclassOfActor() && pAEnemy->m_ThinkState == THINKSTATE_PAIN)
-	{
-		m_iThreat -= 2;
-	}
-
-	fDot = Vector::Dot(vDelta, pSelf->orientation[0]);
-	if (fDot <= 0 )
-	{
-		if (m_fCurrentRangeSquared * 0.5 > Square(fDot))
-		{
-			m_iThreat++;
-		}
-	}
-	else
-	{
-		if (m_fCurrentRangeSquared * 0.5 >= Square(fDot))
-		{
-			if (m_fCurrentRangeSquared * 0.5 > Square(fDot))
-			{
-				m_iThreat++;
-			}
-		}
-	}
-	int iEnemyDiscount = m_pEnemy->m_iAttackerCount;
-
-	if (m_pEnemy == pSelf->m_Enemy)
-	{
-		iEnemyDiscount -= 2;
-		if (level.inttime < pSelf->m_iEnemyChangeTime + 1000)
-			m_iThreat += 5;
-	}
-
-	if (iEnemyDiscount > 4)
-		iEnemyDiscount = 4;
-	m_iThreat -= iEnemyDiscount;
-
-	if (m_pEnemy == pSelf->m_pLastAttacker)
-	{
-		m_iThreat += 5;
-	}
-	if (m_pEnemy == pSelf->m_FavoriteEnemy)
-		m_iThreat += 250;
-	return m_iThreat;
-}
-
-Sentient *ActorEnemy::GetEnemy
-	(
-	void
-	) const
-{
-	return m_pEnemy;
-}
-
-float ActorEnemy::GetVisibility
-	(
-	void
-	) const
-{
-	return m_fVisibility;
-}
-
-int ActorEnemy::GetThreat
-	(
-	void
-	) const
-{
-	return m_iThreat;
-}
-
-float ActorEnemy::GetRangeSquared
-	(
-	void
-	) const
-{
-	return m_fCurrentRangeSquared;
-}
-
-float ActorEnemy::UpdateLMRF
-	(
-	Actor *pSelf,
-	bool *pbInFovAndRange,
-	bool *pbVisible
-	)
-{
-	//FIXME: variable names, I did my best
-	Vector vDelta;
-	float fFarPlane, fLMRF, /*fMinSightTime,*/ fFovScale, fForward, /*fNormalizedRange,*/ fRangeScale, fRange/*, fMaxRange*/ ;
-	float fTmp1, fTmp2, fTmp3;
-
-	*pbInFovAndRange = false;
-	*pbVisible = false;
-
-	vDelta = pSelf->EyePosition() - GetEnemy()->origin;
-
-	fFarPlane = world->farplane_distance;
-	
-	fRange = pSelf->m_fSight;
-
-	if (fFarPlane > 0)
-	{
-		fRange = fFarPlane * 0.828;
-		if (pSelf->m_fSight <= fRange)
-			fRange = pSelf->m_fSight;
-	}
-
-
-	if (vDelta.lengthXYSquared() > Square(fRange))
-	{
-		return 8.0;
-	}
-
-	fForward = vDelta.lengthXY();
-
-	if (-DotProduct2D(vDelta, pSelf->m_vEyeDir) < 0)
-	{
-		return 8.0;
-	}
-
-	fTmp2 = 128.0 - DotProduct2D(vDelta, pSelf->m_vEyeDir);
-	
-	if (fForward * pSelf->m_fFovDot > fTmp2)
-	{
-		return 8.0;
-	}
-
-	*pbInFovAndRange = true;
-
-	if (!pSelf->CanSee(m_pEnemy, 0, 0, false))
-	{
-		return 8.0;
-	}
-	
-	*pbVisible = true;
-	fTmp1 = fForward + 128.0;
-	*pbVisible = true;
-	fTmp3 = fTmp1 / fTmp2;
-	fRangeScale = fForward
-		/ fRange
-		* (((fForward / fRange * 16.0 + -16.0) * (fForward / fRange) + -1.0) * (fForward / fRange) + 7.0)
-		/ 3.0
-		* GetEnemy()->stealthMovementScale;
-	fFovScale = (1 / fTmp3 * -1.3 - (pSelf->m_fFovDot * 0.2 - 1.5)) / (1.0 - pSelf->m_fFovDot);
-	fLMRF = g_ai_noticescale->value * pSelf->m_fNoticeTimeScale * (fTmp3 * fRangeScale + fTmp3 * fRangeScale);
-	if (fFovScale > fLMRF)
-		fLMRF = fFovScale;
-	return fLMRF;
-}
-
-
 ActorEnemySet::ActorEnemySet()
 {
-	m_pCurrentEnemy = NULL;
-	m_iCheckCount = 0;
-
-	if (m_pCurrentEnemy)
-	{
-		//delete m_pCurrentEnemy;
-		m_pCurrentEnemy = NULL;
-	}
-	
-	m_iCurrentThreat = 0;
-	m_fCurrentVisibility = 0.0;
+    m_iCheckCount        = 0;
+    m_pCurrentEnemy      = NULL;
+    m_iCurrentThreat     = 0;
+    m_fCurrentVisibility = 0.0;
 }
 
-ActorEnemySet::~ActorEnemySet()
+ActorEnemy *ActorEnemySet::AddPotentialEnemy(Sentient *pEnemy)
 {
+    ActorEnemy NewEnemy;
 
+    if (pEnemy->IsDead() || pEnemy->m_iThreatBias == THREATBIAS_IGNOREME) {
+        return NULL;
+    }
+
+    for (int i = 0; i < m_Enemies.NumObjects(); i++) {
+        ActorEnemy *pActorEnemy = &m_Enemies[i];
+        if (pActorEnemy->m_pEnemy == pEnemy) {
+            pActorEnemy->m_iAddTime = level.inttime;
+            return pActorEnemy;
+        }
+    }
+
+    NewEnemy.m_iAddTime             = level.inttime;
+    NewEnemy.m_iNextEnemyTime       = 0;
+    NewEnemy.m_fLastLookTime        = level.time;
+    NewEnemy.m_fVisibility          = 0.0;
+    NewEnemy.m_fTotalVisibility     = 0.0;
+    NewEnemy.m_iThreat              = 0;
+    NewEnemy.m_pEnemy               = pEnemy;
+    NewEnemy.m_fCurrentRangeSquared = 1e38f;
+    NewEnemy.m_vLastKnownPos        = vec_zero;
+    NewEnemy.m_iLastSightChangeTime = 0;
+    NewEnemy.m_bVisible             = false;
+
+    int index = m_Enemies.AddObject(NewEnemy);
+    return m_Enemies.AddressOfObjectAt(index);
 }
 
-ActorEnemy *ActorEnemySet::AddPotentialEnemy
-	(
-	Sentient *pEnemy
-	)
+void ActorEnemySet::FlagBadEnemy(Sentient *pEnemy)
 {
-	ActorEnemy NewEnemy;
-	
-	if (pEnemy->IsDead() || pEnemy->m_iThreatBias == THREATBIAS_IGNOREME)
-	{
-		return NULL;
-	}
+    ActorEnemy *pActorEnemy = NULL;
 
-	for (int i = 0; i < m_Enemies.NumObjects(); i++)
-	{
-		ActorEnemy *pActorEnemy = &m_Enemies[i];
-		if (pActorEnemy->m_pEnemy == pEnemy)
-		{
-			pActorEnemy->m_iAddTime = level.inttime;
-			return pActorEnemy;
-		}
-	}
+    for (int i = 1; i <= m_Enemies.NumObjects(); i++) {
+        if (m_Enemies.ObjectAt(i).m_pEnemy == pEnemy) {
+            pActorEnemy = m_Enemies.AddressOfObjectAt(i);
+            break;
+        }
+    }
 
-	NewEnemy.m_fVisibility = 0.0;
-	NewEnemy.m_fTotalVisibility = 0.0;
-	NewEnemy.m_iAddTime = level.inttime;
-	NewEnemy.m_fLastLookTime = level.time;
-	NewEnemy.m_iThreat = 0;
+    if (!pActorEnemy) {
+        return;
+    }
 
-	NewEnemy.m_pEnemy = pEnemy;
+    // Added in 2.0.
+    //  Set the reaction time
+    pActorEnemy->m_iNextEnemyTime = level.inttime + 5000;
 
-	NewEnemy.m_fCurrentRangeSquared = 1e38f;
+    pActorEnemy->m_fLastLookTime        = level.time;
+    pActorEnemy->m_fVisibility          = 0.0;
+    pActorEnemy->m_fTotalVisibility     = 0.0;
+    pActorEnemy->m_iThreat              = 0;
+    pActorEnemy->m_iLastSightChangeTime = level.inttime;
+    pActorEnemy->m_bVisible             = false;
 
-	NewEnemy.m_iLastSightChangeTime = 0;
-	NewEnemy.m_vLastKnownPos = vec_zero;
-
-	NewEnemy.m_bVisible = false;
-
-
-
-	return &m_Enemies[m_Enemies.AddObject(NewEnemy)-1];
+    if (pEnemy == m_pCurrentEnemy) {
+        m_pCurrentEnemy      = NULL;
+        m_fCurrentVisibility = 0.0;
+        m_iCurrentThreat     = 0;
+    }
 }
 
-void ActorEnemySet::FlagBadEnemy
-	(
-	Sentient *pEnemy
-	)
+void ActorEnemySet::CheckEnemies(Actor *pSelf)
 {
-	ActorEnemy *pActorEnemy;
-	for (int i = 0; i < m_Enemies.NumObjects(); i++)
-	{
-		pActorEnemy = &m_Enemies[i];
-		if (pActorEnemy->m_pEnemy == pEnemy)
-		{
-			break;
-		}
+    float fVisibility;
+    int   iThreat;
+    int   i;
+    int   nChecked;
+    bool  bInFovAndRange;
+    bool  bVisible;
+    float fRangeSquared;
 
-		if (i+1 == m_Enemies.NumObjects())
-			return;
-	}
+    ActorEnemy *pActorEnemy;
 
-	pActorEnemy->m_iThreat = 0;
-	pActorEnemy->m_fVisibility = 0.0;
-	pActorEnemy->m_fTotalVisibility = 0.0;
-	pActorEnemy->m_fLastLookTime = level.time;
+    for (i = 1; i <= m_Enemies.NumObjects();) {
+        pActorEnemy = &m_Enemies[i - 1];
+        if (!pActorEnemy->GetEnemy() || pActorEnemy->GetEnemy()->m_Team == pSelf->m_Team
+            || pActorEnemy->GetEnemy()->IsDead() || level.inttime > pActorEnemy->m_iAddTime + 10000
+            || pActorEnemy->GetEnemy()->m_iThreatBias == THREATBIAS_IGNOREME || pActorEnemy->GetEnemy()->IsDisabled()) {
+            m_Enemies.RemoveObjectAt(i);
+        } else {
+            i++;
+        }
+    }
 
-	pActorEnemy->m_bVisible = false;
-	pActorEnemy->m_iLastSightChangeTime = level.inttime;
+    if (!m_Enemies.NumObjects()) {
+        m_iCurrentThreat = 0;
+        m_pCurrentEnemy  = NULL;
+        return;
+    }
 
-	if (pEnemy ==  m_pCurrentEnemy)
-	{
-		if (m_pCurrentEnemy)
-		{
-			//delete m_pCurrentEnemy;
-			m_pCurrentEnemy = NULL;
-		}
-		m_fCurrentVisibility = 0.0;
-		m_iCurrentThreat = 0;
-	}
+    bInFovAndRange = false;
+    for (nChecked = 0; nChecked < m_Enemies.NumObjects() && !bInFovAndRange; nChecked++) {
+        m_iCheckCount++;
+        if (m_iCheckCount > m_Enemies.NumObjects()) {
+            m_iCheckCount = 1;
+        }
+
+        pActorEnemy = &m_Enemies[m_iCheckCount - 1];
+
+        fVisibility = pActorEnemy->UpdateVisibility(pSelf, &bInFovAndRange, &bVisible);
+        if (fVisibility > 0) {
+            if (fVisibility >= m_fCurrentVisibility) {
+                m_fCurrentVisibility = fVisibility;
+                m_pCurrentEnemy      = pActorEnemy->GetEnemy();
+            } else if (pActorEnemy->m_pEnemy == m_pCurrentEnemy) {
+                m_fCurrentVisibility = fVisibility;
+            }
+
+            if (g_showawareness->integer) {
+                Com_Printf(
+                    "ent #%3i: enemy #%i: awareness = %5.1f%%, threat = %i\n",
+                    pSelf->entnum,
+                    pActorEnemy->GetEnemy()->entnum,
+                    (fVisibility * 100.0),
+                    0
+                );
+            }
+        } else if (pActorEnemy->m_pEnemy == m_pCurrentEnemy) {
+            m_iCurrentThreat     = 0;
+            m_pCurrentEnemy      = NULL;
+            m_fCurrentVisibility = 0;
+        }
+
+        if (bVisible) {
+            if (!pActorEnemy->m_bVisible) {
+                pActorEnemy->m_bVisible             = true;
+                pActorEnemy->m_iLastSightChangeTime = level.inttime;
+            }
+            pActorEnemy->m_vLastKnownPos = pActorEnemy->m_pEnemy->origin;
+        } else if (pActorEnemy->m_bVisible) {
+            pActorEnemy->m_bVisible             = false;
+            pActorEnemy->m_iLastSightChangeTime = level.inttime;
+        }
+    }
+
+    if (m_pCurrentEnemy && m_pCurrentEnemy->IsDead()) {
+        m_pCurrentEnemy      = NULL;
+        m_iCurrentThreat     = 0;
+        m_fCurrentVisibility = 0;
+    }
+
+    m_iCurrentThreat = 0;
+    fRangeSquared    = 1e37f;
+
+    if (m_fCurrentVisibility >= 0.999f) {
+        for (i = 1; i <= m_Enemies.NumObjects(); i++) {
+            pActorEnemy = &m_Enemies.ObjectAt(i);
+            pActorEnemy->UpdateThreat(pSelf);
+            iThreat = pActorEnemy->GetThreat();
+
+            if (m_iCurrentThreat >= iThreat) {
+                if (m_iCheckCount != iThreat) {
+                    continue;
+                }
+
+                if (pActorEnemy->GetRangeSquared() < fRangeSquared) {
+                    continue;
+                }
+            }
+
+            m_iCurrentThreat = pActorEnemy->GetThreat();
+            m_pCurrentEnemy  = pActorEnemy->GetEnemy();
+            fRangeSquared    = pActorEnemy->m_fCurrentRangeSquared;
+        }
+    }
+
+    if ((!m_pCurrentEnemy || !m_pCurrentEnemy->m_bIsDisguised) && m_iCurrentThreat <= 0) {
+        m_pCurrentEnemy      = NULL;
+        m_iCurrentThreat     = 0;
+        m_fCurrentVisibility = 0;
+    }
 }
 
-void ActorEnemySet::CheckEnemies
-	(
-	Actor *pSelf
-	)
+bool ActorEnemySet::HasAlternateEnemy(void) const
 {
-	float fRangeSquared;
-	bool bVisible;
-	bool bInFovAndRange;
-	//int nChecked;
-	//int iThreat;
-	float fVisibility;
+    for (int i = 1; i <= m_Enemies.NumObjects(); i++) {
+        const ActorEnemy& actorEnemy = m_Enemies.ObjectAt(i);
 
-	ActorEnemy *pActorEnemy;
-
-
-	for (int i = 1; i <= m_Enemies.NumObjects();i++)
-	{
-		pActorEnemy = &m_Enemies[i-1];
-		if (!pActorEnemy->m_pEnemy 
-			|| pActorEnemy->m_pEnemy->m_Team == pSelf->m_Team 
-			|| pActorEnemy->m_pEnemy->IsDead() 
-			|| level.inttime > pActorEnemy->m_iAddTime + 10000
-			|| pActorEnemy->m_pEnemy->m_iThreatBias == THREATBIAS_IGNOREME)
-		{
-			m_Enemies.RemoveObjectAt(i);
-			i--;//decrease i in order to not miss next object in container.
-		}
-	}
-
-	if (!m_Enemies.NumObjects())
-	{
-		m_iCurrentThreat = 0;
-		if (m_pCurrentEnemy)
-		{
-			//delete m_pCurrentEnemy;
-			m_pCurrentEnemy = NULL;
-		}
-	}
-	else
-	{
-		for (int i = 0; i < m_Enemies.NumObjects(); i++)
-		{
-			m_iCheckCount++;
-			if (m_iCheckCount > m_Enemies.NumObjects())
-				m_iCheckCount = 1;
-
-			pActorEnemy = &m_Enemies[m_iCheckCount-1];
-
-			fVisibility = pActorEnemy->UpdateVisibility(pSelf, &bInFovAndRange, &bVisible);
-			if (fVisibility <= 0.0)
-			{
-				if (pActorEnemy->m_pEnemy == m_pCurrentEnemy)
-				{
-					m_iCurrentThreat = 0;
-					m_pCurrentEnemy = NULL;
-					m_fCurrentVisibility = 0.0;
-				}
-			}
-			else
-			{
-				if (fVisibility < m_fCurrentVisibility)
-				{
-					if (pActorEnemy->m_pEnemy == m_pCurrentEnemy)
-					{
-						m_fCurrentVisibility = fVisibility;
-					}
-				}
-				else
-				{
-					m_pCurrentEnemy = pActorEnemy->m_pEnemy;
-					m_fCurrentVisibility = fVisibility;
-				}
-
-				if (g_showawareness->integer)
-				{
-					Com_Printf(
-						"ent #%3i: enemy #%i: awareness = %5.1f%%, threat = %i\n",
-						pSelf->entnum,
-						pActorEnemy->m_pEnemy->entnum,
-						(fVisibility * 100.0),
-						0);
-				}
-			}
-
-			if (bVisible)
-			{
-				if (!pActorEnemy->m_bVisible)
-				{
-					pActorEnemy->m_bVisible = true;
-					pActorEnemy->m_iLastSightChangeTime = level.inttime;
-				}
-				pActorEnemy->m_vLastKnownPos = pActorEnemy->m_pEnemy->origin;
-			}
-			else if (pActorEnemy->m_bVisible)
-			{
-				pActorEnemy->m_bVisible = false;
-				pActorEnemy->m_iLastSightChangeTime = level.inttime;
-			}
-
-			if (bInFovAndRange)
-			{
-				break;
-			}
-		}
-
-		if (m_pCurrentEnemy && m_pCurrentEnemy->IsDead())
-		{
-			m_pCurrentEnemy = NULL;
-			m_iCurrentThreat = 0;
-			m_fCurrentVisibility = 0.0;
-		}
-
-		m_iCurrentThreat = 0;
-
-		fRangeSquared = 1e37f;
-
-		if (m_fCurrentVisibility >= 1)
-		{
-			for (int i = 1;i <= m_Enemies.NumObjects(); i++)
-			{
-				pActorEnemy = &m_Enemies[i-1];
-				pActorEnemy->UpdateThreat(pSelf);
-				if (m_iCurrentThreat < pActorEnemy->m_iThreat || (m_iCheckCount == pActorEnemy->m_iThreat && fRangeSquared > pActorEnemy->m_fCurrentRangeSquared))
-				{
-					m_iCurrentThreat = pActorEnemy->m_iThreat;
-					m_pCurrentEnemy = pActorEnemy->m_pEnemy;
-					fRangeSquared = pActorEnemy->m_fCurrentRangeSquared;
-				}
-			}
-		}
-
-		if ((!m_pCurrentEnemy || !m_pCurrentEnemy->m_bIsDisguised) && m_iCurrentThreat <= 0)
-		{
-			m_pCurrentEnemy = NULL;
-			m_iCurrentThreat = 0;
-			m_fCurrentVisibility = 0.0;
-		}
-	}
+        if (actorEnemy.GetVisibility() >= 0.999f && actorEnemy.GetEnemy() != m_pCurrentEnemy) {
+            return true;
+        }
+    }
+    return false;
 }
 
-Sentient *ActorEnemySet::GetCurrentEnemy
-	(
-	void
-	) const
+void ActorEnemySet::RemoveAll(void)
 {
-	return m_pCurrentEnemy;
+    m_Enemies.ClearObjectList();
+    m_iCheckCount        = 0;
+    m_pCurrentEnemy      = NULL;
+    m_fCurrentVisibility = 0.0;
+    m_iCurrentThreat     = 0;
 }
 
-float ActorEnemySet::GetCurrentVisibility
-	(
-	void
-	) const
+void ActorEnemySet::ConfirmEnemy(Actor *pSelf, Sentient *pEnemy)
 {
-	return m_fCurrentVisibility;
+    ActorEnemy *pActorEnemy;
+
+    pSelf->m_bEnemyIsDisguised = false;
+    pActorEnemy                = ActorEnemySet::AddPotentialEnemy(pEnemy);
+    if (!pActorEnemy) {
+        return;
+    }
+
+    // Added in 2.0.
+    //  Ignore if below reaction time
+    if (level.inttime < pActorEnemy->m_iNextEnemyTime) {
+        return;
+    }
+
+    pActorEnemy->m_fVisibility      = 1.0;
+    pActorEnemy->m_fTotalVisibility = 1.0;
+    pActorEnemy->m_vLastKnownPos    = pEnemy->origin;
+
+    if (m_fCurrentVisibility < 1.0) {
+        m_iCurrentThreat     = pActorEnemy->UpdateThreat(pSelf);
+        m_fCurrentVisibility = 1.0;
+        m_pCurrentEnemy      = pEnemy;
+    }
 }
 
-int ActorEnemySet::GetCurrentThreat
-	(
-	void
-	) const
+void ActorEnemySet::ConfirmEnemyIfCanSeeSharerOrEnemy(Actor *pSelf, Actor *pSharer, Sentient *pEnemy)
 {
-	return m_iCurrentThreat;
+    ActorEnemy *pActorEnemy;
+
+    pSelf->m_bEnemyIsDisguised = false;
+    pActorEnemy                = ActorEnemySet::AddPotentialEnemy(pEnemy);
+    if (!pActorEnemy) {
+        return;
+    }
+
+    // Added in 2.0.
+    //  Ignore if below reaction time
+    if (level.inttime < pActorEnemy->m_iNextEnemyTime) {
+        return;
+    }
+
+    if (pActorEnemy->m_fTotalVisibility >= 1.f) {
+        pActorEnemy->m_vLastKnownPos = pEnemy->origin;
+        return;
+    }
+
+    if (!pActorEnemy->m_bVisible
+        && !pSelf->CanSee(pSharer, pSelf->m_bSilent ? 90 : 0, world->farplane_distance * 0.828f, false)) {
+        return;
+    }
+
+    pActorEnemy->m_fVisibility      = 1.0;
+    pActorEnemy->m_fTotalVisibility = 1.0;
+    pActorEnemy->m_vLastKnownPos    = pEnemy->origin;
+
+    if (m_fCurrentVisibility < 1.0) {
+        m_iCurrentThreat     = pActorEnemy->UpdateThreat(pSelf);
+        m_fCurrentVisibility = 1.0;
+        m_pCurrentEnemy      = pEnemy;
+    }
 }
 
-qboolean ActorEnemySet::IsEnemyConfirmed
-	(
-	void
-	) const
+bool ActorEnemySet::CaresAboutPerfectInfo(Sentient *pEnemy)
 {
-	// not found in ida
-	return false;
-}
+    ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy);
+    if (!pActorEnemy) {
+        return false;
+    }
 
-bool ActorEnemySet::HasAlternateEnemy
-	(
-	void
-	) const
-{
-	ActorEnemy *pActorEnemy;
-	for (int i = 0; i < m_Enemies.NumObjects(); i++)
-	{
-		pActorEnemy = &m_Enemies[i];
-		if (pActorEnemy->m_pEnemy != m_pCurrentEnemy)
-		{
-			return true;
-		}
-	}
-	return false;
-}
+    // Added in 2.0.
+    //  Ignore if below reaction time
+    if (level.inttime < pActorEnemy->m_iNextEnemyTime) {
+        return false;
+    }
 
-void ActorEnemySet::RemoveAll
-	(
-	void
-	)
-{
-	m_Enemies.ClearObjectList();
-	m_iCheckCount = 0;
-	if (m_pCurrentEnemy)
-	{
-		//delete m_pCurrentEnemy;
-		m_pCurrentEnemy = NULL;
-	}
-	m_fCurrentVisibility = 0.0;
-	m_iCurrentThreat = 0;
-}
+    if (pActorEnemy->m_fTotalVisibility < 1.0f) {
+        return true;
+    }
 
-void ActorEnemySet::ConfirmEnemy
-	(
-	Actor *pSelf,
-	Sentient *pEnemy
-	)
-{
-	pSelf->m_bEnemyIsDisguised = false;
-	ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy);
-	if (pActorEnemy)
-	{
-		pActorEnemy->m_fVisibility = 1.0;
-		pActorEnemy->m_fTotalVisibility = 1.0;
-		pActorEnemy->m_vLastKnownPos = pEnemy->origin;
-		if (m_fCurrentVisibility < 1.0)
-		{
-			m_iCurrentThreat = pActorEnemy->UpdateThreat(pSelf);
-			m_fCurrentVisibility = 1.0;
-			m_pCurrentEnemy = pEnemy;
-		}
-	}
-}
+    if ((pEnemy->origin - pActorEnemy->m_vLastKnownPos).lengthSquared() <= Square(512)) {
+        return false;
+    }
 
-void ActorEnemySet::ConfirmEnemyIfCanSeeSharerOrEnemy
-	(
-	Actor *pSelf,
-	Actor *pSharer,
-	Sentient *pEnemy
-	)
-{
-	pSelf->m_bEnemyIsDisguised = false;
-	ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy);
-	if (pActorEnemy)
-	{
-		if (pActorEnemy->m_fTotalVisibility > 0)
-		{
-			pActorEnemy->m_vLastKnownPos = pEnemy->origin;
-			return;
-		}
-		if (!pActorEnemy->m_bVisible)
-		{
-			if (!pSelf->CanSee(
-				pSharer,
-				pSelf->m_bSilent ? 90.0f : 0,
-				0.828 * world->farplane_distance, false))
-				return;
-		}
-		pActorEnemy->m_fVisibility = 1.0;
-		pActorEnemy->m_fTotalVisibility = 1.0;
-		pActorEnemy->m_vLastKnownPos = pEnemy->origin;
-		if (m_fCurrentVisibility < 1.0)
-		{
-			m_iCurrentThreat = pActorEnemy->UpdateThreat(pSelf);
-			m_fCurrentVisibility = 1.0;
-			m_pCurrentEnemy = pEnemy;
-		}
-	}
-}
-
-bool ActorEnemySet::CaresAboutPerfectInfo
-	(
-	Sentient *pEnemy
-	)
-{
-	ActorEnemy *pActorEnemy = ActorEnemySet::AddPotentialEnemy(pEnemy);
-	if (pActorEnemy)
-	{
-		if (pActorEnemy->m_fTotalVisibility < 1.0 || (pEnemy->origin - pActorEnemy->m_vLastKnownPos).lengthSquared() > 262144)
-		{
-			return true;
-		}
-	}
-	return false;
+    return true;
 }
diff --git a/code/fgame/actorenemy.h b/code/fgame/actorenemy.h
index 270322ad..3029379b 100644
--- a/code/fgame/actorenemy.h
+++ b/code/fgame/actorenemy.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // actorenemy.h
 
-#ifndef __ACTORENEMY_H__
-#define __ACTORENEMY_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -32,92 +31,125 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 class Actor;
 class Sentient;
 
-class ActorEnemy : public Class {
+class ActorEnemy : public Class
+{
 public:
-	int m_iAddTime;
-	float m_fLastLookTime;
-	float m_fVisibility;
-	float m_fTotalVisibility;
-	int m_iThreat;
-	SafePtr<Sentient> m_pEnemy;
-	float m_fCurrentRangeSquared;
-	Vector m_vLastKnownPos;
-	int m_iLastSightChangeTime;
-	bool m_bVisible;
+    int               m_iAddTime;
+    int               m_iNextEnemyTime; // Added in 2.0
+    float             m_fLastLookTime;
+    float             m_fVisibility;
+    float             m_fTotalVisibility;
+    int               m_iThreat;
+    SafePtr<Sentient> m_pEnemy;
+    float             m_fCurrentRangeSquared;
+    Vector            m_vLastKnownPos;
+    int               m_iLastSightChangeTime;
+    bool              m_bVisible;
 
-	ActorEnemy();
-	virtual ~ActorEnemy();
-	float UpdateVisibility( Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible );
-	int UpdateThreat( Actor *pSelf );
-	Sentient *GetEnemy( void ) const;
-	float GetVisibility( void ) const;
-	int GetThreat( void ) const;
-	float GetRangeSquared( void ) const;
+    float     UpdateVisibility(Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible);
+    int       UpdateThreat(Actor *pSelf);
+    Sentient *GetEnemy(void) const;
+    float     GetVisibility(void) const;
+    int       GetThreat(void) const;
+    float     GetRangeSquared(void) const;
 
-	void Archive( Archiver & ) override;
+    void Archive(Archiver&) override;
 
 protected:
-	float UpdateLMRF( Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible );
+    float UpdateLMRF(Actor *pSelf, bool *pbInFovAndRange, bool *pbVisible);
 };
 
-inline void ActorEnemy::Archive
-	(
-	Archiver& arc
-	)
+inline void ActorEnemy::Archive(Archiver& arc)
 {
-	Class::Archive( arc );
+    Class::Archive(arc);
 
-	arc.ArchiveInteger( &m_iAddTime );
-	arc.ArchiveFloat( &m_fLastLookTime );
-	arc.ArchiveFloat( &m_fVisibility );
-	arc.ArchiveFloat( &m_fTotalVisibility );
-	arc.ArchiveInteger( &m_iThreat );
-	arc.ArchiveSafePointer( &m_pEnemy );
-	arc.ArchiveFloat( &m_fCurrentRangeSquared );
-	arc.ArchiveVector( &m_vLastKnownPos );
-	arc.ArchiveInteger( &m_iLastSightChangeTime );
-	arc.ArchiveBool( &m_bVisible );
+    arc.ArchiveInteger(&m_iAddTime);
+    arc.ArchiveFloat(&m_fLastLookTime);
+    arc.ArchiveFloat(&m_fVisibility);
+    arc.ArchiveFloat(&m_fTotalVisibility);
+    arc.ArchiveInteger(&m_iThreat);
+    arc.ArchiveSafePointer(&m_pEnemy);
+    arc.ArchiveFloat(&m_fCurrentRangeSquared);
+    arc.ArchiveVector(&m_vLastKnownPos);
+    arc.ArchiveInteger(&m_iLastSightChangeTime);
+    arc.ArchiveBool(&m_bVisible);
 }
 
-class ActorEnemySet : public Class {
+inline Sentient *ActorEnemy::GetEnemy(void) const
+{
+    return m_pEnemy;
+}
+
+inline float ActorEnemy::GetVisibility(void) const
+{
+    return m_fVisibility;
+}
+
+inline int ActorEnemy::GetThreat(void) const
+{
+    return m_iThreat;
+}
+
+inline float ActorEnemy::GetRangeSquared(void) const
+{
+    return m_fCurrentRangeSquared;
+}
+
+class ActorEnemySet : public Class
+{
 protected:
-	Container<ActorEnemy> m_Enemies;
-	int m_iCheckCount;
-	SafePtr<Sentient> m_pCurrentEnemy;
-	float m_fCurrentVisibility;
-	int m_iCurrentThreat;
+    Container<ActorEnemy> m_Enemies;
+    int                   m_iCheckCount;
+    SafePtr<Sentient>     m_pCurrentEnemy;
+    float                 m_fCurrentVisibility;
+    int                   m_iCurrentThreat;
+
 public:
-	ActorEnemySet();
-	virtual ~ActorEnemySet();
+    ActorEnemySet();
 
-	ActorEnemy *AddPotentialEnemy( Sentient *pEnemy );
-	void FlagBadEnemy( Sentient *pEnemy );
-	void CheckEnemies( Actor *pSelf );
-	Sentient *GetCurrentEnemy( void ) const;
-	float GetCurrentVisibility( void ) const;
-	int GetCurrentThreat( void ) const;
-	qboolean IsEnemyConfirmed( void ) const;
-	bool HasAlternateEnemy( void ) const;
-	void RemoveAll( void );
-	void ConfirmEnemy( Actor *pSelf, Sentient *pEnemy );
-	void ConfirmEnemyIfCanSeeSharerOrEnemy( Actor *pSelf, Actor *pSharer, Sentient *pEnemy );
-	bool CaresAboutPerfectInfo( Sentient *pEnemy );
+    ActorEnemy *AddPotentialEnemy(Sentient *pEnemy);
+    void        FlagBadEnemy(Sentient *pEnemy);
+    void        CheckEnemies(Actor *pSelf);
+    Sentient   *GetCurrentEnemy(void) const;
+    float       GetCurrentVisibility(void) const;
+    int         GetCurrentThreat(void) const;
+    qboolean    IsEnemyConfirmed(void) const;
+    bool        HasAlternateEnemy(void) const;
+    void        RemoveAll(void);
+    void        ConfirmEnemy(Actor *pSelf, Sentient *pEnemy);
+    void        ConfirmEnemyIfCanSeeSharerOrEnemy(Actor *pSelf, Actor *pSharer, Sentient *pEnemy);
+    bool        CaresAboutPerfectInfo(Sentient *pEnemy);
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 };
 
-inline void ActorEnemySet::Archive
-	(
-	Archiver& arc
-	)
+inline Sentient *ActorEnemySet::GetCurrentEnemy(void) const
 {
-	Class::Archive( arc );
-
-	m_Enemies.Archive( arc, ArchiveClass< ActorEnemy > );
-	arc.ArchiveInteger( &m_iCheckCount );
-	arc.ArchiveSafePointer( &m_pCurrentEnemy );
-	arc.ArchiveFloat( &m_fCurrentVisibility );
-	arc.ArchiveInteger( &m_iCurrentThreat );
+    return m_pCurrentEnemy;
 }
 
-#endif /* actorenemy.h */
\ No newline at end of file
+inline float ActorEnemySet::GetCurrentVisibility(void) const
+{
+    return m_fCurrentVisibility;
+}
+
+inline int ActorEnemySet::GetCurrentThreat(void) const
+{
+    return m_iCurrentThreat;
+}
+
+inline qboolean ActorEnemySet::IsEnemyConfirmed(void) const
+{
+    return m_fCurrentVisibility > 0.999f;
+}
+
+inline void ActorEnemySet::Archive(Archiver& arc)
+{
+    Class::Archive(arc);
+
+    m_Enemies.Archive(arc);
+    arc.ArchiveInteger(&m_iCheckCount);
+    arc.ArchiveSafePointer(&m_pCurrentEnemy);
+    arc.ArchiveFloat(&m_fCurrentVisibility);
+    arc.ArchiveInteger(&m_iCurrentThreat);
+}
diff --git a/code/fgame/actorpath.cpp b/code/fgame/actorpath.cpp
index 6fead750..0c90e846 100644
--- a/code/fgame/actorpath.cpp
+++ b/code/fgame/actorpath.cpp
@@ -26,633 +26,528 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 ActorPath::ActorPath()
 {
-	m_FallHeight		= 96;
-	m_path				= NULL;
-	m_pathlen			= 0;
-	m_fLookAhead		= 4096.0f;
-	m_bChangeLookAhead	= true;
+    m_FallHeight       = 96;
+    m_path             = NULL;
+    m_pathlen          = 0;
+    m_fLookAhead       = 4096;
+    m_bChangeLookAhead = true;
 
-	Clear();
+    Clear();
 }
 
 ActorPath::~ActorPath()
 {
-	if( m_path )
-		delete m_path;
+    if (m_path) {
+        delete[] m_path;
+    }
 }
 
-void ActorPath::Clear
-	(
-	void
-	)
+void ActorPath::Clear(void)
 {
-	m_startpathpos = 0;
-	m_pathpos = 0;
-	m_Side = false;
-	m_Time = -10000000;
-	m_delta[ 0 ] = 0;
-	m_delta[ 1 ] = 0;
+    m_startpathpos = NULL;
+    m_pathpos      = NULL;
+    m_Side         = false;
+    m_Time         = -10000000;
+    VectorClear2D(m_delta);
+    m_TotalDist = PathManager.total_dist;
 }
 
-bool ActorPath::DoesTheoreticPathExist
-	(
-	float *start,
-	float *end,
-	class SimpleActor *ent,
-	float maxPath,
-	float *vLeashHome,
-	float fLeashDistSquared
-	)
+void ActorPath::ForceShortLookahead(void)
 {
-	return PathSearch::FindPath( start, end, ent, maxPath, NULL, 0, m_FallHeight ) != 0;
+    m_fLookAhead = 4096.0f;
 }
 
-void ActorPath::FindPath
-	(
-	float *start,
-	float *end,
-	Entity *ent,
-	float maxPath,
-	float *vLeashHome,
-	float fLeashDistSquared
-	)
+float ActorPath::PathLookAhead(float total_area, Vector& end, float *origin)
 {
-	int depth = PathManager.FindPath( start, end, ent, maxPath, vLeashHome, fLeashDistSquared, m_FallHeight );
+    float     area = total_area;
+    float     s;
+    float     t;
+    vec2_t    normal;
+    vec2_t    delta;
+    Vector    pos;
+    float     fallheight;
+    PathInfo *current_path = m_pathpos;
 
-	if( depth )
-	{
-		if( depth > m_pathlen )
-		{
-			if( m_path )
-				delete[] m_path;
+    pos = current_path->point;
 
-			m_pathlen = 10 * (( depth - 1 ) / 10) + 10;
-			m_path = new PathInfo[ m_pathlen ];
-		}
+    while (1) {
+        if (current_path == m_path) {
+            end                    = current_path->point;
+            m_HasCompleteLookahead = true;
+            return area;
+        }
 
-		m_startpathpos = PathManager.GeneratePath( m_path );
-		m_pathpos = m_startpathpos;
-		m_TotalDist = PathManager.total_dist;
-		m_Side = false;
-		m_Time = level.inttime;
-		UpdatePos( start );
-	}
-	else
-	{
-		Clear();
-	}
+        fallheight = current_path->point[2] - origin[2];
+
+        if (fallheight > 94.0f || fallheight < -94.0f) {
+            end                    = current_path->point;
+            m_HasCompleteLookahead = false;
+            return area;
+        }
+
+        current_path--;
+
+        // calculate the normal
+        normal[0] = current_path->point[1] - pos[1];
+        normal[1] = pos[0] - current_path->point[0];
+        VectorNormalize2D(normal);
+        VectorSub2D(current_path->point, origin, delta);
+
+        t = fabs(DotProduct2D(delta, normal)) * current_path->dist;
+
+        if (t >= area) {
+            break;
+        }
+
+        area -= t;
+        pos = current_path->point;
+    }
+
+    t = area / t;
+    s = 1.0f - t;
+
+    end[0] = pos[0] * s + current_path->point[0] * t;
+    end[1] = pos[1] * s + current_path->point[1] * t;
+    end[2] = pos[2] * s + current_path->point[2] * t;
+
+    m_HasCompleteLookahead = false;
+    return 0;
 }
 
-void ActorPath::FindPathAway
-	(
-	float *start,
-	float *avoid,
-	float *vPreferredDir,
-	Entity *ent,
-	float fMinSafeDist,
-	float *vLeashHome,
-	float fLeashDistSquared
-	)
+bool ActorPath::DoesTheoreticPathExist(
+    float *start, float *end, class SimpleActor *ent, float maxPath, float *vLeashHome, float fLeashDistSquared
+)
 {
-	int depth = PathManager.FindPathAway( start, avoid, vPreferredDir, ent, fMinSafeDist, vLeashHome, fLeashDistSquared, m_FallHeight );
-
-	if( depth )
-	{
-		if( depth > m_pathlen )
-		{
-			if( m_path )
-				delete m_path;
-
-			m_pathlen = 10 * ( depth - 1 ) / 10 + 10;
-			m_path = new PathInfo[ m_pathlen ];
-		}
-
-		m_startpathpos = PathManager.GeneratePathAway( m_path );
-		m_pathpos = m_startpathpos;
-		m_TotalDist = PathManager.total_dist;
-		m_Side = false;
-		m_Time = level.inttime;
-		UpdatePos( start );
-	}
-	else
-	{
-		Clear();
-	}
+    return PathSearch::FindPath(start, end, ent, maxPath, NULL, 0, m_FallHeight) != 0;
 }
 
-void ActorPath::FindPathNear
-	(
-	float *start,
-	float *nearby,
-	Entity *ent,
-	float maxPath,
-	float fRadiusSquared,
-	float *vLeashHome,
-	float fLeashDistSquared
-	)
+void ActorPath::FindPath(
+    float *start, float *end, Entity *ent, float maxPath, float *vLeashHome, float fLeashDistSquared
+)
 {
-	int depth = PathManager.FindPathNear( start, nearby, ent, maxPath, fRadiusSquared, vLeashHome, fLeashDistSquared, m_FallHeight );
+    int depth;
 
-	if( depth )
-	{
-		if( depth > m_pathlen )
-		{
-			if( m_path )
-				delete m_path;
+    depth = PathManager.FindPath(start, end, ent, maxPath, vLeashHome, fLeashDistSquared, m_FallHeight);
 
-			m_pathlen = 10 * ( depth - 1 ) / 10 + 10;
-			m_path = new PathInfo[ m_pathlen ];
-		}
+    if (!depth) {
+        Clear();
+        return;
+    }
 
-		m_startpathpos = PathManager.GeneratePathNear( m_path );
-		m_pathpos = m_startpathpos;
-		m_TotalDist = PathManager.total_dist;
-		m_Side = false;
-		m_Time = level.inttime;
-		UpdatePos( start );
-	}
-	else
-	{
-		Clear();
-	}
+    if (depth > m_pathlen) {
+        if (m_path) {
+            delete[] m_path;
+        }
+
+        m_pathlen = 10 * ((depth - 1) / 10) + 10;
+        m_path    = new PathInfo[m_pathlen];
+    }
+
+    m_startpathpos = PathManager.GeneratePath(m_path);
+    m_pathpos      = m_startpathpos;
+    m_TotalDist    = PathManager.total_dist;
+    m_Side         = false;
+    m_Time         = level.inttime;
+    UpdatePos(start);
 }
 
-void ActorPath::ReFindPath
-	(
-	float *start,
-	Entity *ent
-	)
+void ActorPath::FindPathAway(
+    float  *start,
+    float  *avoid,
+    float  *vPreferredDir,
+    Entity *ent,
+    float   fMinSafeDist,
+    float  *vLeashHome,
+    float   fLeashDistSquared
+)
 {
-	int depth = PathManager.FindPath( start, m_path->point, ent, 0, NULL, 0, m_FallHeight );
+    int depth;
 
-	if( depth )
-	{
-		if( depth > m_pathlen )
-		{
-			if( m_path )
-				delete m_path;
+    depth = PathManager.FindPathAway(
+        start, avoid, vPreferredDir, ent, fMinSafeDist, vLeashHome, fLeashDistSquared, m_FallHeight
+    );
 
-			m_pathlen = 10 * ( depth - 1 ) / 10 + 10;
-			m_path = new PathInfo[ m_pathlen ];
-		}
+    if (!depth) {
+        Clear();
+        return;
+    }
 
-		m_startpathpos = PathManager.GeneratePath( m_path );
-		m_pathpos = m_startpathpos;
-		m_TotalDist = PathManager.total_dist;
-		m_Side = false;
-		m_Time = level.inttime;
-		UpdatePos( start );
-	}
-	else
-	{
-		Clear();
-	}
+    if (depth > m_pathlen) {
+        if (m_path) {
+            delete[] m_path;
+        }
+
+        m_pathlen = 10 * (depth - 1) / 10 + 10;
+        m_path    = new PathInfo[m_pathlen];
+    }
+
+    m_startpathpos = PathManager.GeneratePathAway(m_path);
+    m_pathpos      = m_startpathpos;
+    m_TotalDist    = PathManager.total_dist;
+    m_Side         = false;
+    m_Time         = level.inttime;
+    UpdatePos(start);
 }
 
-float ActorPath::PathLookAhead
-	(
-	float total_area,
-	Vector& end,
-	float *origin
-	)
+void ActorPath::FindPathNear(
+    float  *start,
+    float  *nearby,
+    Entity *ent,
+    float   maxPath,
+    float   fRadiusSquared,
+    float  *vLeashHome,
+    float   fLeashDistSquared
+)
 {
-	float		area = total_area;
-	float		s;
-	float		t;
-	float		normal[ 2 ];
-	float		delta[ 2 ];
-	Vector		pos;
-	float		fallheight;
-	PathInfo	*current_path = m_pathpos;
+    int depth;
 
-	while( 1 )
-	{
-		pos = current_path->point;
+    depth = PathManager.FindPathNear(
+        start, nearby, ent, maxPath, fRadiusSquared, vLeashHome, fLeashDistSquared, m_FallHeight
+    );
 
-		if( current_path == m_path )
-			break;
+    if (!depth) {
+        Clear();
+        return;
+    }
 
-		fallheight = current_path->point[ 2 ] - origin[ 2 ];
+    if (depth > m_pathlen) {
+        if (m_path) {
+            delete[] m_path;
+        }
 
-		if( fallheight > 94.0f || fallheight < -94.0f )
-		{
-			VectorCopy( current_path->point, end );
-			m_HasCompleteLookahead = false;
-			return area;
-		}
+        m_pathlen = 10 * (depth - 1) / 10 + 10;
+        m_path    = new PathInfo[m_pathlen];
+    }
 
-		current_path--;
-
-		normal[ 0 ] = current_path->point[ 1 ] - pos[ 1 ];
-		normal[ 1 ] = pos[ 0 ] - current_path->point[ 0 ];
-
-		VectorNormalize2D( normal );
-
-		delta[ 0 ] = current_path->point[ 0 ] - origin[ 0 ];
-		delta[ 1 ] = current_path->point[ 1 ] - origin[ 1 ];
-
-		t = fabs( DotProduct2D( delta, normal ) ) * current_path->dist;
-
-		if( t >= area )
-		{
-			t = area / t;
-			s = 1.0f - t;
-
-			end[ 0 ] = current_path->point[ 0 ] * t + pos[ 0 ] * s;
-			end[ 1 ] = current_path->point[ 1 ] * t + pos[ 1 ] * s;
-			end[ 2 ] = current_path->point[ 2 ] * t + pos[ 2 ] * s;
-			m_HasCompleteLookahead = false;
-			return 0;
-		}
-
-		area -= t;
-	}
-
-	VectorCopy( current_path->point, end );
-	m_HasCompleteLookahead = true;
-
-	return area;
+    m_startpathpos = PathManager.GeneratePathNear(m_path);
+    m_pathpos      = m_startpathpos;
+    m_TotalDist    = PathManager.total_dist;
+    m_Side         = false;
+    m_Time         = level.inttime;
+    UpdatePos(start);
 }
 
-void ActorPath::UpdatePos
-	(
-	float *origin,
-	float fNodeRadius
-	)
+void ActorPath::ReFindPath(float *start, Entity *ent)
 {
-	Vector end;
-	float s = 0;
-	float t = 0;
-	vec2_t delta;
-	float current_dot = 0;
-	float previous_dot = 0;
-	Vector pos;
-	PathInfo *current_path = NULL;
-	vec2_t dir;
-	Vector end2;
-	vec2_t delta2;
-	vec2_t dir2;
+    int    depth;
+    vec3_t point;
+    // this is a critical bug in all versions of mohaa, it passes directly m_path->point
+    // but m_path can be deleted afterwards, leaving a dangling pointer to the path_end
+    // global variable
+    VectorCopy(m_path->point, point);
 
-	if( m_pathpos == m_path )
-	{
-		end = m_pathpos->point;
-		m_bChangeLookAhead = true;
-		m_HasCompleteLookahead = true;
-		m_delta[ 0 ] = end[ 0 ] - origin[ 0 ];
-		m_delta[ 1 ] = end[ 1 ] - origin[ 1 ];
-		VectorNormalize2D2( m_delta, dir );
-	}
-	else if( m_fLookAhead >= 4096.0f )
-	{
-		if( m_fLookAhead - 4096.0f >= PathLookAhead( m_fLookAhead, end, origin ) )
-		{
-			Vector mins = Vector( -15, -15, 0 );
-			Vector maxs = Vector( 15, 15, 60 );
-			Vector e = end + Vector( 0, 0, 32 );
+    depth = PathManager.FindPath(start, point, ent, 0, NULL, 0, m_FallHeight);
 
-			pos = origin + Vector( 0, 0, 32 );
+    if (!depth) {
+        Clear();
+        return;
+    }
 
-			if( G_SightTrace(
-				pos,
-				mins,
-				maxs,
-				e,
-				( gentity_t * )NULL, // g_entities[ 0 ].entity
-				0,
-				MASK_PLAYERSOLID,
-				false,
-				"Actor::UpdatePos 2" ) != true )
-			{
-				if( m_bChangeLookAhead )
-				{
-					m_fLookAhead -= 2048.0f;
-					m_bChangeLookAhead = false;
-				}
-				else
-				{
-					m_fLookAhead *= 0.5f;
-				}
+    if (depth > m_pathlen) {
+        if (m_path) {
+            delete[] m_path;
+        }
 
-				if( m_fLookAhead < 4096.0f )
-				{
-					m_fLookAhead = 4096.0f;
-				}
+        m_pathlen = 10 * (depth - 1) / 10 + 10;
+        m_path    = new PathInfo[m_pathlen];
+    }
 
-				PathLookAhead( 4096.0f, end, origin );
-				goto __setdelta;
-			}
-		}
-
-		m_fLookAhead += 1024.0f;
-
-		if( m_fLookAhead > 65536.0f )
-			m_fLookAhead = 65536.0f;
-
-		m_bChangeLookAhead = true;
-
-__setdelta:
-
-		m_delta[ 0 ] = end[ 0 ] - origin[ 0 ];
-		m_delta[ 1 ] = end[ 1 ] - origin[ 1 ];
-
-		VectorNormalize2D2( m_delta, dir );
-	}
-	else if( PathLookAhead( 4096.0f, end, origin ) < 4096.0f - m_fLookAhead )
-	{
-		PathLookAhead( m_fLookAhead, end2, origin );
-
-		Vector mins = Vector( -15, -15, 0 );
-		Vector maxs = Vector( 15, 15, 60 );
-		Vector e = end2 + Vector( 0, 0, 32 );
-
-		pos = origin + Vector( 0, 0, 32 );
-
-		if( G_SightTrace(
-			pos,
-			mins,
-			maxs,
-			e,
-			( gentity_t * )NULL,
-			0,
-			MASK_MONSTERSOLID,
-			false,
-			"Actor::UpdatePos 1" ) != true )
-		{
-			m_fLookAhead += 1024.0f;
-
-			if( m_fLookAhead > 4096.0f )
-				m_fLookAhead = 4096.0f;
-		}
-		else
-		{
-			m_fLookAhead -= 1024.0f;
-
-			if( m_fLookAhead < 1024.0f )
-				m_fLookAhead = 1024.0f;
-
-			PathLookAhead( m_fLookAhead, end2, origin );
-		}
-
-		delta[ 0 ] = end2[ 0 ] - origin[ 0 ];
-		delta[ 1 ] = end2[ 1 ] - origin[ 1 ];
-		VectorNormalize2D2( delta, dir2 );
-
-		m_delta[ 0 ] = end[ 0 ] - origin[ 0 ];
-		m_delta[ 1 ] = end[ 1 ] - origin[ 1 ];
-		VectorNormalize2D2( m_delta, dir );
-
-		if( DotProduct2D( dir, dir2 ) > 0.7f )
-		{
-			m_delta[ 0 ] = delta[ 0 ];
-			m_delta[ 1 ] = delta[ 1 ];
-		}
-
-		m_bChangeLookAhead = true;
-	}
-	else
-	{
-		m_fLookAhead -= 1024.0f;
-
-		if( m_fLookAhead < 1024.0f )
-			m_fLookAhead = 1024.0f;
-
-		m_delta[ 0 ] = end[ 0 ] - origin[ 0 ];
-		m_delta[ 1 ] = end[ 1 ] - origin[ 1 ];
-		VectorNormalize2D2( m_delta, dir );
-
-		m_bChangeLookAhead = true;
-	}
-
-	current_path = m_pathpos;
-
-	while( 1 )
-	{
-		delta2[ 0 ] = current_path->point[ 0 ] - origin[ 0 ];
-		delta2[ 1 ] = current_path->point[ 1 ] - origin[ 1 ];
-		current_dot = DotProduct2D( delta2, dir ) - fNodeRadius;
-
-		if( current_dot >= 0.0f )
-			break;
-
-		previous_dot = current_dot;
-
-		if( current_path == LastNode() )
-			break;
-
-		current_path--;
-	}
-
-	if( current_path != m_pathpos )
-	{
-		m_pathpos = current_path + 1;
-
-		t = previous_dot / ( previous_dot - current_dot );
-		s = 1.0f - t;
-
-		/*m_pathpos->point[ 0 ] = m_pathpos->point[ 0 ] * s + current_path->point[ 0 ] * t;
-		m_pathpos->point[ 1 ] = m_pathpos->point[ 1 ] * s + current_path->point[ 1 ] * t;
-		m_pathpos->point[ 2 ] = m_pathpos->point[ 2 ] * s + current_path->point[ 2 ] * t;*/
-
-		VectorCopy( current_path->point, m_pathpos->point );
-		
-		current_path->dist *= s;
-
-		m_Side = true;
-	}
-	else
-	{
-		m_Side = false;
-	}
+    m_startpathpos = PathManager.GeneratePath(m_path);
+    m_pathpos      = m_startpathpos;
+    m_TotalDist    = PathManager.total_dist;
+    m_Side         = false;
+    m_Time         = level.inttime;
+    UpdatePos(start);
 }
 
-bool ActorPath::Complete
-	(
-	const float *origin
-	) const
+void ActorPath::UpdatePos(float *origin, float fNodeRadius)
 {
-	if( !m_HasCompleteLookahead )
-		return false;
+    Vector    end;
+    float     s = 0;
+    float     t = 0;
+    vec2_t    delta;
+    float     current_dot  = 0;
+    float     previous_dot = 0;
+    Vector    pos;
+    PathInfo *current_path = NULL;
+    vec2_t    dir;
+    Vector    end2;
+    vec2_t    delta2;
+    vec2_t    dir2;
 
-	if( !m_path )
-		return true;
+    if (m_pathpos == m_path) {
+        end                    = m_pathpos->point;
+        m_bChangeLookAhead     = true;
+        m_HasCompleteLookahead = true;
+        VectorSub2D(end, origin, m_delta);
+        VectorNormalize2D2(m_delta, dir);
+    } else if (m_fLookAhead >= 4096.0f) {
+        if (PathLookAhead(m_fLookAhead, end, origin) > (m_fLookAhead - 4096.0f)
+            || G_SightTrace(
+                origin + Vector(0, 0, 32),
+                Vector(-15, -15, 0),
+                Vector(15, 15, 60),
+                end + Vector(0, 0, 32),
+                g_entities[0].entity,
+                NULL,
+                MASK_ACTORPATH,
+                false,
+                "Actor::UpdatePos 2"
+            )) {
+            m_fLookAhead += 1024.0f;
 
-	if( fabs( origin[ 0 ] - m_path->point[ 0 ] ) < 16.0f &&
-		fabs( origin[ 1 ] - m_path->point[ 1 ] ) < 16.0f )
-	{
-		return true;
-	}
+            if (m_fLookAhead > Square(256)) {
+                m_fLookAhead = Square(256);
+            }
 
-	return false;
+            m_bChangeLookAhead = true;
+        } else {
+            if (m_bChangeLookAhead) {
+                m_fLookAhead -= 2048.0f;
+                m_bChangeLookAhead = false;
+            } else {
+                m_fLookAhead /= 2.f;
+            }
+
+            if (m_fLookAhead < 4096.0f) {
+                m_fLookAhead = 4096.0f;
+            }
+
+            PathLookAhead(m_fLookAhead, end, origin);
+        }
+
+        VectorSub2D(end, origin, m_delta);
+        VectorNormalize2D2(m_delta, dir);
+    } else if (PathLookAhead(4096.0f, end, origin) < 4096.0f - m_fLookAhead) {
+        PathLookAhead(m_fLookAhead, end2, origin);
+
+        if (!G_SightTrace(
+                origin + Vector(0, 0, 32),
+                Vector(-15, -15, 0),
+                Vector(15, 15, 60),
+                end2 + Vector(0, 0, 32),
+                g_entities[0].entity,
+                0,
+                MASK_ACTORPATH,
+                false,
+                "Actor::UpdatePos 1"
+            )) {
+            m_fLookAhead -= 1024.0f;
+
+            if (m_fLookAhead < 1024.0f) {
+                m_fLookAhead = 1024.0f;
+            }
+
+            PathLookAhead(m_fLookAhead, end2, origin);
+        } else {
+            m_fLookAhead += 1024.0f;
+
+            if (m_fLookAhead > 4096.0f) {
+                m_fLookAhead = 4096.0f;
+            }
+        }
+
+        VectorSub2D(end2, origin, delta);
+        VectorNormalize2D2(delta, dir2);
+
+        VectorSub2D(end, origin, delta);
+        VectorNormalize2D2(m_delta, dir);
+
+        if (DotProduct2D(dir, dir2) > 0.7f) {
+            VectorCopy2D(delta, m_delta);
+            VectorCopy2D(dir2, dir);
+        }
+
+        m_bChangeLookAhead = true;
+    } else {
+        m_fLookAhead -= 1024.0f;
+
+        if (m_fLookAhead < 1024.0f) {
+            m_fLookAhead = 1024.0f;
+        }
+
+        VectorSub2D(end, origin, m_delta);
+        VectorNormalize2D2(m_delta, dir);
+
+        m_bChangeLookAhead = true;
+    }
+
+    // Added in OPM.
+	//  The check was added to make sure to stop if it's the last node
+    for (current_path = m_pathpos; current_path >= LastNode(); current_path--) {
+        VectorSub2D(current_path->point, origin, delta2);
+        //current_dot = DotProduct2D(delta2, dir) - fNodeRadius;
+        // Removed in 2.0
+        //  fNodeRadius is now unused?
+        current_dot = DotProduct2D(delta2, dir);
+
+        if (current_dot >= 0) {
+            break;
+        }
+
+        previous_dot = current_dot;
+    }
+
+    if (current_path != m_pathpos) {
+        m_pathpos = current_path + 1;
+
+        t = previous_dot / (previous_dot - current_dot);
+        s = 1.0f - t;
+
+        m_pathpos->point[0] = m_pathpos->point[0] * s + current_path->point[0] * t;
+        m_pathpos->point[1] = m_pathpos->point[1] * s + current_path->point[1] * t;
+        m_pathpos->point[2] = m_pathpos->point[2] * s + current_path->point[2] * t;
+
+        current_path->dist *= s;
+        assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+
+        m_Side = true;
+    } else {
+        m_Side = false;
+    }
+
+    // Added in 2.0.
+    //  Make sure to clear the delta if it's invalid (NaN, infinite...)
+    if (!isfinite(m_delta[0]) || !isfinite(m_delta[1])) {
+        VectorClear2D(m_delta);
+    }
 }
 
-PathInfo *ActorPath::StartNode
-	(
-	void
-	) const
+bool ActorPath::Complete(const float *origin) const
 {
-	return m_startpathpos;
+    if (!m_HasCompleteLookahead) {
+        return false;
+    }
+
+    if (fabs(origin[0] - m_path->point[0]) < 16.0f && fabs(origin[1] - m_path->point[1]) < 16.0f) {
+        return true;
+    }
+
+    return false;
 }
 
-PathInfo *ActorPath::CurrentNode
-	(
-	void
-	) const
+void ActorPath::TrimPathFromEnd(int nNodesPop)
 {
-	return m_pathpos;
+    int iLastPos;
+
+    iLastPos = m_path - m_pathpos;
+    if (iLastPos < 0) {
+        Clear();
+        return;
+    }
+
+    m_pathpos -= nNodesPop;
+    for (int i = 0; i < iLastPos; i++) {
+        m_path[i] = m_path[i + nNodesPop];
+    }
 }
 
-int ActorPath::CurrentNodeIndex
-	(
-	void
-	) const
+void ActorPath::Shorten(float fDistRemove)
 {
-	return m_pathpos ? m_pathpos - m_path : -1;
+    while (m_path->dist >= fDistRemove) {
+        fDistRemove -= m_path->dist;
+        TrimPathFromEnd(1);
+        if (!m_pathpos) {
+            return;
+        }
+    }
+
+    m_path->point[0] += m_path->dir[0] * -fDistRemove;
+    m_path->point[1] += m_path->dir[1] * -fDistRemove;
+    // Fixed in OPM.
+    //  This is a bug in mohaa as it can write past the end of the class instance
+    //m_path->point[2] += m_path->dir[2] * -fDistRemove;
+    m_path->dist -= fDistRemove;
+    assert(m_path->dist > -1e+07 && m_path->dist < 1e+07);
 }
 
-PathInfo *ActorPath::NextNode
-	(
-	void
-	) const
+PathInfo *ActorPath::StartNode(void) const
 {
-	return m_pathpos == m_path ? NULL : m_pathpos - 1;
+    return m_startpathpos;
 }
 
-PathInfo *ActorPath::LastNode
-	(
-	void
-	) const
+PathInfo *ActorPath::CurrentNode(void) const
 {
-	return m_path;
+    return m_pathpos;
 }
 
-Vector ActorPath::CurrentPathDir
-	(
-	void
-	) const
+int ActorPath::CurrentNodeIndex(void) const
 {
-	return Vector( m_pathpos->dir[ 0 ], m_pathpos->dir[ 1 ], 0 );
+    return m_pathpos ? m_pathpos - m_path : -1;
 }
 
-float *ActorPath::CurrentPathGoal
-	(
-	void
-	) const
+PathInfo *ActorPath::NextNode(void) const
 {
-	return m_pathpos->point;
+    return m_pathpos == m_path ? NULL : m_pathpos - 1;
 }
 
-int ActorPath::Time
-	(
-	void
-	) const
+PathInfo *ActorPath::LastNode(void) const
 {
-	return m_Time;
+    return m_path;
 }
 
-Vector ActorPath::CurrentDelta
-	(
-	void
-	) const
+const float *ActorPath::CurrentPathDir(void) const
 {
-	return Vector( m_delta[ 0 ], m_delta[ 1 ], 0 );
+    if (m_pathpos == m_path) {
+        return m_delta;
+    } else {
+        return m_pathpos[-1].dir;
+    }
 }
 
-bool ActorPath::IsAccurate
-	(
-	void
-	) const
+const float *ActorPath::CurrentPathGoal(void) const
 {
-	return m_pathpos->bAccurate;
+    return m_path->point;
 }
 
-float ActorPath::TotalDist
-	(
-	void
-	) const
+int ActorPath::Time(void) const
 {
-	return m_TotalDist;
+    return m_Time;
 }
 
-void ActorPath::SetFallHeight
-	(
-	float fHeight
-	)
+const float *ActorPath::CurrentDelta(void) const
 {
-	m_FallHeight = fHeight;
+    return m_delta;
 }
 
-float ActorPath::GetFallHeight
-	(
-	void
-	) const
+bool ActorPath::IsAccurate(void) const
 {
-	return m_FallHeight;
+    if (m_pathpos == m_path) {
+        return false;
+    }
+
+    if (!m_pathpos[-1].bAccurate) {
+        return false;
+    }
+
+    if (!m_Side) {
+        return false;
+    }
+
+    return true;
 }
 
-void ActorPath::TrimPathFromEnd
-	(
-	int nNodesPop
-	)
+void ActorPath::SetFallHeight(float fHeight)
 {
-	int iLastPos = m_path - m_pathpos;
-
-	if( iLastPos - nNodesPop > 0 )
-	{
-		for( int i = 0; i < iLastPos; i++ )
-		{
-			m_path[ i ] = m_path[ i + nNodesPop ];
-		}
-	}
-	else
-	{
-		Clear();
-	}
+    m_FallHeight = fHeight;
 }
 
-void ActorPath::Shorten
-	(
-	float fDistRemove
-	)
+float ActorPath::GetFallHeight(void) const
 {
-	if( m_path->dist > fDistRemove )
-	{
-		m_path->point[ 0 ] += m_path->dir[ 0 ] * -fDistRemove;
-		m_path->point[ 1 ] += m_path->dir[ 1 ] * -fDistRemove;
-		m_path->point[ 2 ] += m_path->point[ 2 ] * -fDistRemove;
-		m_path->dist -= fDistRemove;
-	}
-	else
-	{
-		while( fDistRemove - m_path->dist > m_path->dist )
-		{
-			TrimPathFromEnd( 1 );
-
-			if( !m_pathpos )
-				return;
-		}
-	}
+    return m_FallHeight;
 }
 
-bool ActorPath::HasCompleteLookahead
-	(
-	void
-	) const
+bool ActorPath::HasCompleteLookahead(void) const
 {
-	return m_HasCompleteLookahead;
+    return m_HasCompleteLookahead;
 }
 
-bool ActorPath::IsSide
-	(
-	void
-	) const
+float ActorPath::TotalDist(void) const
 {
-	return m_Side;
+    return m_TotalDist;
 }
 
-void ActorPath::ForceShortLookahead
-	(
-	void
-	)
+bool ActorPath::IsSide(void) const
 {
-	m_fLookAhead = 4096.0f;
+    return m_Side;
 }
diff --git a/code/fgame/actorpath.h b/code/fgame/actorpath.h
index 095faa8a..ced7fcc6 100644
--- a/code/fgame/actorpath.h
+++ b/code/fgame/actorpath.h
@@ -22,138 +22,145 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // actorpath.h: Actor path
 
-#ifndef __ACTORPATH_H__
-#define __ACTORPATH_H__
-
+#pragma once
 
 #define MIN_FALLHEIGHT 18
 #define MAX_FALLHEIGHT 1024
-class ActorPath {
-	// path list
-	PathInfo *m_path;
-	int m_pathlen;
 
-	// path position
-	PathInfo *m_pathpos;
+class ActorPath
+{
+    // path list
+    PathInfo *m_path;
+    int       m_pathlen;
 
-	// starting path position
-	PathInfo *m_startpathpos;
-	vec2_t m_delta;
-	bool m_Side;
-	int m_Time;
-	float m_TotalDist;
-	short int m_FallHeight;
-	bool m_HasCompleteLookahead;
-	float m_fLookAhead;
-	bool m_bChangeLookAhead;
+    // path position
+    PathInfo *m_pathpos;
+
+    // starting path position
+    PathInfo *m_startpathpos;
+    vec2_t    m_delta;
+    bool      m_Side;
+    int       m_Time;
+    float     m_TotalDist;
+    short int m_FallHeight;
+    bool      m_HasCompleteLookahead;
+    float     m_fLookAhead;
+    bool      m_bChangeLookAhead;
 
 private:
-	float				PathLookAhead( float total_area, Vector& end, float *origin );
+    float PathLookAhead(float total_area, Vector& end, float *origin);
 
 public:
-	ActorPath();
-	~ActorPath();
+    ActorPath();
+    ~ActorPath();
 
-	void				Clear( void );
-	bool				DoesTheoreticPathExist( float *start, float *end, class SimpleActor *ent, float maxPath, float *vLeashHome, float fLeashDistSquared );
-	void				FindPath( float *start, float *end, Entity *ent, float maxPath, float *vLeashHome, float fLeashDistSquared );
-	void				FindPathAway( float *start, float *avoid, float *vPreferredDir, Entity *ent, float fMinSafeDist, float *vLeashHome, float fLeashDistSquared );
-	void				FindPathNear( float *start, float *nearby, Entity *ent, float maxPath, float fRadiusSquared, float *vLeashHome, float fLeashDistSquared );
-	void				ReFindPath( float *start, Entity *ent );
-	void				UpdatePos( float *origin, float fNodeRadius = 0.0f );
-	bool				Complete( const float *origin ) const;
-	PathInfo			*StartNode( void ) const;
-	PathInfo			*CurrentNode( void ) const;
-	int					CurrentNodeIndex( void ) const;
-	PathInfo			*NextNode( void ) const;
-	PathInfo			*LastNode( void ) const;
-	Vector				CurrentPathDir( void ) const;
-	float				*CurrentPathGoal( void ) const;
-	int					Time( void ) const;
-	Vector				CurrentDelta( void ) const;
-	bool				IsAccurate( void ) const;
-	float				TotalDist( void ) const;
-	void				SetFallHeight( float fHeight );
-	float				GetFallHeight( void ) const;
-	void				TrimPathFromEnd( int nNodesPop );
-	void				Shorten( float fDistRemove );
-	bool				HasCompleteLookahead( void ) const;
-	bool				IsSide( void ) const;
-	void				ForceShortLookahead( void );
+    void Clear(void);
+    bool DoesTheoreticPathExist(
+        float *start, float *end, class SimpleActor *ent, float maxPath, float *vLeashHome, float fLeashDistSquared
+    );
+    void FindPath(float *start, float *end, Entity *ent, float maxPath, float *vLeashHome, float fLeashDistSquared);
+    void FindPathAway(
+        float  *start,
+        float  *avoid,
+        float  *vPreferredDir,
+        Entity *ent,
+        float   fMinSafeDist,
+        float  *vLeashHome,
+        float   fLeashDistSquared
+    );
+    void FindPathNear(
+        float  *start,
+        float  *nearby,
+        Entity *ent,
+        float   maxPath,
+        float   fRadiusSquared,
+        float  *vLeashHome,
+        float   fLeashDistSquared
+    );
+    void         ReFindPath(float *start, Entity *ent);
+    void         UpdatePos(float *origin, float fNodeRadius = 0.0f);
+    bool         Complete(const float *origin) const;
+    PathInfo    *StartNode(void) const;
+    PathInfo    *CurrentNode(void) const;
+    int          CurrentNodeIndex(void) const;
+    PathInfo    *NextNode(void) const;
+    PathInfo    *LastNode(void) const;
+    const float *CurrentPathDir(void) const;
+    const float *CurrentPathGoal(void) const;
+    int          Time(void) const;
+    const float *CurrentDelta(void) const;
+    bool         IsAccurate(void) const;
+    float        TotalDist(void) const;
+    void         SetFallHeight(float fHeight);
+    float        GetFallHeight(void) const;
+    void         TrimPathFromEnd(int nNodesPop);
+    void         Shorten(float fDistRemove);
+    bool         HasCompleteLookahead(void) const;
+    void         ForceShortLookahead(void);
 
-	virtual void Archive( Archiver& arc );
+    virtual void Archive(Archiver& arc);
+
+    bool IsSide(void) const;
 };
 
-inline void ActorPath::Archive
-	(
-	Archiver& arc
-	)
+inline void ActorPath::Archive(Archiver& arc)
 {
-	int pos;
-	int startpathpos;
+    int index;
+    int i;
 
-	arc.ArchiveInteger( &m_pathlen );
+    arc.ArchiveInteger(&m_pathlen);
 
-	if( m_pathlen )
-	{
-		if( arc.Loading() )
-		{
-			m_path = new PathInfo[ m_pathlen ];
-		}
+    if (m_pathlen) {
+        if (arc.Loading()) {
+            m_path = new PathInfo[m_pathlen];
+        }
 
-		if( m_pathlen > 0 )
-		{
-			for( int i = 0; i < m_pathlen; i++ )
-			{
-				m_path->Archive( arc );
-			}
-		}
+        for (i = 0; i < m_pathlen; i++) {
+            m_path[i].Archive(arc);
+        }
 
-		if( !arc.Saving() )
-		{
-			arc.ArchiveInteger( &pos );
-			if( pos == -1 )
-				m_pathpos = NULL;
-			else
-				m_pathpos = &m_path[ pos ];
+        if (!arc.Saving()) {
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
+                m_pathpos = NULL;
+            } else {
+                m_pathpos = &m_path[index];
+            }
 
-			arc.ArchiveInteger( &startpathpos );
-			if( startpathpos == -1 )
-				m_startpathpos = NULL;
-			else
-				m_startpathpos = &m_path[ pos ];
-		}
-		else
-		{
-			if( m_pathpos )
-				pos = m_pathpos - m_path;
-			else
-				pos = -1;
+            arc.ArchiveInteger(&index);
+            if (index == -1) {
+                m_startpathpos = NULL;
+            } else {
+                m_startpathpos = &m_path[index];
+            }
+        } else {
+            if (m_pathpos) {
+                index = m_pathpos - m_path;
+            } else {
+                index = -1;
+            }
 
-			arc.ArchiveInteger( &pos );
+            arc.ArchiveInteger(&index);
 
-			if( m_startpathpos )
-				pos = m_startpathpos - m_path;
-			else
-				pos = -1;
+            if (m_startpathpos) {
+                index = m_startpathpos - m_path;
+            } else {
+                index = -1;
+            }
 
-			arc.ArchiveInteger( &pos );
-		}
-	}
-	else if( arc.Loading() )
-	{
-		m_pathpos = 0;
-	}
+            arc.ArchiveInteger(&index);
+        }
+    } else if (arc.Loading()) {
+        m_pathpos = 0;
+    }
 
-	arc.ArchiveVec2( m_delta );
-	arc.ArchiveBool( &m_Side );
-	arc.ArchiveInteger( &m_Time );
-	arc.ArchiveFloat( &m_TotalDist );
-	arc.ArchiveShort( &m_FallHeight );
-	arc.ArchiveShort( &m_FallHeight );
-	arc.ArchiveBool( &m_HasCompleteLookahead );
-	arc.ArchiveFloat( &m_fLookAhead );
-	arc.ArchiveBool( &m_bChangeLookAhead );
+    arc.ArchiveVec2(m_delta);
+    arc.ArchiveBool(&m_Side);
+    arc.ArchiveInteger(&m_Time);
+    arc.ArchiveFloat(&m_TotalDist);
+    arc.ArchiveShort(&m_FallHeight);
+    arc.ArchiveShort(&m_FallHeight);
+    arc.ArchiveBool(&m_HasCompleteLookahead);
+    arc.ArchiveFloat(&m_fLookAhead);
+    arc.ArchiveBool(&m_bChangeLookAhead);
 }
-
-#endif /* actorpath.h */
diff --git a/code/fgame/ammo.cpp b/code/fgame/ammo.cpp
index 64667f7a..de9b8c53 100644
--- a/code/fgame/ammo.cpp
+++ b/code/fgame/ammo.cpp
@@ -21,163 +21,172 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // ammo.cpp: Base class for all ammunition for entities derived from the Weapon class.
-// 
+//
 // AmmoEntity is the Class which represents ammo that the player "sees" and "
 // picks up" in the game
 //
-// Ammo is the Class which is used to keep track of how much ammo a player has 
+// Ammo is the Class which is used to keep track of how much ammo a player has
 // in his inventory
 
 #include "ammo.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION( Item, AmmoEntity, NULL )
-	{
-		{ NULL, NULL }
-	};
+Event EV_AmmoEntity_PostSpawn
+(
+    "ammoentity_postspawn",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Ammo Entity Post Spawn"
+);
 
-AmmoEntity::AmmoEntity
-   (
-   )
+CLASS_DECLARATION(Item, AmmoEntity, NULL) {
+    {&EV_AmmoEntity_PostSpawn, &AmmoEntity::EventPostSpawn},
+    {NULL,                     NULL                       }
+};
 
-	{
-   if ( LoadingSavegame )
-      {
-      // all data will be setup by the archive function
-      return;
-      }
-   setName( "UnknownAmmo" );
-   amount       = 0;
-	}
+AmmoEntity::AmmoEntity()
+{
+    if (LoadingSavegame) {
+        // all data will be setup by the archive function
+        return;
+    }
+    setName("UnknownAmmo");
+    amount = 0;
 
-Item *AmmoEntity::ItemPickup
-   (
-   Entity *other, 
-	qboolean add_to_inventory
-   )
+    PostEvent(EV_AmmoEntity_PostSpawn, EV_POSTSPAWN);
+}
 
-   {
-   Sentient *player;
-	str      realname;
-	AliasListNode_t *ret;
+Item *AmmoEntity::ItemPickup(Entity *other, qboolean add_to_inventory)
+{
+    Sentient *player;
+    Weapon   *pWeap;
 
-   if ( !other->isSubclassOf( Player ) )
-      return NULL;
+    if (!other->IsSubclassOfPlayer()) {
+        return NULL;
+    }
 
-   player = ( Sentient * )other;
+    player = (Sentient *)other;
 
-	// Play pickup sound
-   realname = GetRandomAlias( "snd_pickup", &ret );
-   if ( realname.length() > 1 )
-		player->Sound( realname, CHAN_ITEM );
+    if (player->AmmoCount(item_name.c_str()) == player->MaxAmmoCount(item_name.c_str())) {
+        // don't pickup if the player already has max ammo
+        return NULL;
+    }
 
-   // Cancel some events
-	CancelEventsOfType( EV_Item_DropToFloor );
-	CancelEventsOfType( EV_Item_Respawn );
-   CancelEventsOfType( EV_FadeOut );
+    // Play pickup sound
+    player->Sound(sPickupSound, CHAN_ITEM);
 
-   // Hide the model
-	setSolidType( SOLID_NOT );
-	hideModel();
+    // Cancel some events
+    CancelEventsOfType(EV_Item_DropToFloor);
+    CancelEventsOfType(EV_Item_Respawn);
+    CancelEventsOfType(EV_FadeOut);
 
-   // Respawn?
-	if ( !Respawnable() )
-		PostEvent( EV_Remove, FRAMETIME );
-   else 
-		PostEvent( EV_Item_Respawn, RespawnTime() );
+    // Hide the model
+    setSolidType(SOLID_NOT);
+    hideModel();
 
-   // Give the ammo to the player
-   player->GiveAmmo( item_name, amount );
-   return NULL; // This doesn't create any items
-   }
+    // Respawn?
+    if (!Respawnable()) {
+        PostEvent(EV_Remove, FRAMETIME);
+    } else {
+        PostEvent(EV_Item_Respawn, RespawnTime());
+    }
 
+    // Notify scripts about the pickup
+    Unregister(STRING_PICKUP);
+
+    // Tell the player about the ammo being picked
+    gi.SendServerCommand(
+        other->edict - g_entities,
+        "print \"" HUD_MESSAGE_YELLOW "%s\"",
+        gi.LV_ConvertString(va("Got %d %s Rounds", amount, item_name.c_str()))
+    );
+
+    // Give the ammo to the player
+    player->GiveAmmo(item_name, amount);
+
+    // Make the weapon reload if the weapon has an empty clip
+    pWeap = player->GetActiveWeapon(WEAPON_MAIN);
+    if (pWeap && !pWeap->HasAmmoInClip(FIRE_PRIMARY) && pWeap->CheckReload(FIRE_PRIMARY)) {
+        pWeap->SetShouldReload(qtrue);
+    }
+
+    return NULL; // This doesn't create any items
+}
+
+void AmmoEntity::EventPostSpawn(Event *ev)
+{
+    vec3_t fullmins;
+    vec3_t fullmaxs;
+
+    setMoveType(MOVETYPE_TOSS);
+    if (edict->tiki) {
+        gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
+        setSize(fullmins, fullmaxs);
+        link();
+    }
+
+    droptofloor(256);
+}
 
 // This is the Class that is used to keep track of ammo in the player's inventory.
 // It is not an entit, just a name and an amount.
 
-CLASS_DECLARATION( Class, Ammo, NULL )
-   {
-      {NULL, NULL}
-   };
+CLASS_DECLARATION(Class, Ammo, NULL) {
+    {NULL, NULL}
+};
 
-Ammo::Ammo
-   (
-   )
+Ammo::Ammo()
+    : amount(0)
+    , maxamount(0)
+    , name_index(0)
+{
+    if (LoadingSavegame) {
+        // all data will be setup by the archive function
+        return;
+    }
+    setName("UnknownAmmo");
+    setAmount(0);
+    setMaxAmount(100);
+}
 
-   {
-   if ( LoadingSavegame )
-      {
-      // all data will be setup by the archive function
-      return;
-      }
-   setName( "UnknownAmmo" );
-   setAmount( 0 );
-   setMaxAmount( 100 );
-   }
+void Ammo::setAmount(int a)
+{
+    amount = a;
 
-void Ammo::setAmount
-   (
-   int a
-   )
+    if ((maxamount > 0) && (amount > maxamount)) {
+        amount = maxamount;
+    }
+}
 
-   {
-   amount = a;
+int Ammo::getAmount(void)
+{
+    return amount;
+}
 
-   if ( ( maxamount > 0 ) && ( amount > maxamount ) )
-      amount = maxamount;
-   }
+void Ammo::setMaxAmount(int a)
+{
+    maxamount = a;
+}
 
-int Ammo::getAmount
-   (
-   void
-   )
+int Ammo::getMaxAmount(void)
+{
+    return maxamount;
+}
 
-   {
-   return amount;
-   }
+void Ammo::setName(str n)
+{
+    name       = n;
+    name_index = gi.itemindex(name) + CS_WEAPONS;
+}
 
-void Ammo::setMaxAmount
-   (
-   int a
-   )
+str Ammo::getName(void)
+{
+    return name;
+}
 
-   {
-   maxamount = a;
-   }
-
-int Ammo::getMaxAmount
-   (
-   void
-   )
-
-   {
-   return maxamount;
-   }
-
-void Ammo::setName
-   (
-   str n
-   )
-
-   {
-   name = n;
-   name_index = gi.itemindex( name ) + CS_WEAPONS;
-   }
-
-str Ammo::getName
-   (
-   void
-   )
-
-   {
-   return name;
-   }
-
-int Ammo::getIndex
-   (
-   void
-   )
-
-   {
-   return name_index;
-   }
+int Ammo::getIndex(void)
+{
+    return name_index;
+}
diff --git a/code/fgame/ammo.h b/code/fgame/ammo.h
index 3b8b3b9e..24cb172c 100644
--- a/code/fgame/ammo.h
+++ b/code/fgame/ammo.h
@@ -22,62 +22,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // ammo.h: Base class for all ammunition for entities derived from the Weapon class.
 
-#ifndef __AMMO_H__
-#define __AMMO_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
 
 class AmmoEntity : public Item
-	{
-	public:
-      CLASS_PROTOTYPE( AmmoEntity );
+{
+public:
+    CLASS_PROTOTYPE(AmmoEntity);
 
-	                  AmmoEntity();
-      Item   *ItemPickup( Entity *other, qboolean add_to_inventory ) override;
-	};
+    AmmoEntity();
+    Item *ItemPickup(Entity *other, qboolean add_to_inventory) override;
+    void  EventPostSpawn(Event *ev);
+};
 
 class Ammo : public Class
-	{
-   int amount;
-   int maxamount;
-   str name;
-   int name_index;
+{
+    int amount;
+    int maxamount;
+    str name;
+    int name_index;
 
-	public:
-      CLASS_PROTOTYPE( Ammo );
+public:
+    CLASS_PROTOTYPE(Ammo);
 
-	                  Ammo();
-                     Ammo(str name, int amount, int name_index );
+    Ammo();
+    Ammo(str name, int amount, int name_index);
 
-      void           setAmount( int a );
-      int            getAmount( void );
-      void           setMaxAmount( int a );
-      int            getMaxAmount( void );
-      void           setName( str name);
-      str            getName( void );
-      int            getIndex( void );
-      void Archive( Archiver &arc ) override;
-	};
+    void setAmount(int a);
+    int  getAmount(void);
+    void setMaxAmount(int a);
+    int  getMaxAmount(void);
+    void setName(str name);
+    str  getName(void);
+    int  getIndex(void);
+    void Archive(Archiver& arc) override;
+};
 
-inline void Ammo::Archive
-	(
-	Archiver &arc
-	)
+inline void Ammo::Archive(Archiver& arc)
+{
+    Class::Archive(arc);
 
-   {
-   Class::Archive( arc );
-
-   arc.ArchiveInteger( &amount );
-   arc.ArchiveInteger( &maxamount );
-   arc.ArchiveString( &name );
-	//
-	// name_index not archived, because it is auto-generated by gi.itemindex
-	//
-   if ( arc.Loading() )
-      {
-      setName( name );
-      }
-   }
-
-#endif /* ammo.h */
+    arc.ArchiveInteger(&amount);
+    arc.ArchiveInteger(&maxamount);
+    arc.ArchiveString(&name);
+    arc.ArchiveInteger(&name_index);
+    //
+    // name_index not archived, because it is auto-generated by gi.itemindex
+    //
+    if (arc.Loading()) {
+        setName(name);
+    }
+}
diff --git a/code/fgame/animate.cpp b/code/fgame/animate.cpp
index b24b26cb..5855f110 100644
--- a/code/fgame/animate.cpp
+++ b/code/fgame/animate.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -32,48 +32,35 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern Event EV_Entity_Start;
 
 // Leg Animation events
-Event EV_SetAnim("anim", EV_ZERO, "s", "animName", "Exec anim commands on server or client.", EV_NORMAL);
-Event EV_SetSyncTime("setsynctime", EV_ZERO, "f", "synctime", "Set sync time for entity.");
-Event EV_SetFrame(
-    "setframe",
+Event EV_SetAnim
+(
+    "anim",
     EV_ZERO,
-    "iS",
-    "frameNumber animName",
-    "Set the frame on the legs, if anim is not specified, current is assumed.",
+    "s",
+    "animName",
+    "Exec anim commands on server or client.",
     EV_NORMAL
 );
-Event EV_AnimDone("animdone", EV_ZERO, NULL, NULL, "Legs animation has finished, not for script use.", EV_NORMAL);
-Event EV_FrameDelta(
-    "setmovedelta", EV_ZERO, "vf", "moveDelta moveTime", "movement from animation, not for script use.", EV_NORMAL
-);
-Event EV_Torso_Anim("torso_anim", EV_ZERO, "s", "animName", "set the torso animation to animName.", EV_NORMAL);
-Event EV_Torso_SetFrame(
-    "torso_setframe",
+Event EV_SetSyncTime
+(
+    "setsynctime",
     EV_ZERO,
-    "iS",
-    "frameNumber animName",
-    "Set the frame on the torso, if anim is not specified, current is assumed.",
+    "f",
+    "synctime",
+    "Set sync time for entity.",
     EV_NORMAL
 );
-Event EV_Torso_AnimDone(
-    "torso_animdone", EV_ZERO, NULL, NULL, "Torso animation has finished, not for script use.", EV_NORMAL
+Event EV_Animate_IsLoopingAnim
+(
+    "isloopinganim",
+    EV_DEFAULT,
+    "s",
+    "anim_name",
+    "returns 1 if the anim is a looping anim, or 0 otherwise",
+    EV_RETURN
 );
-Event EV_Torso_StopAnimating(
-    "torso_stopanimating",
-    EV_ZERO,
-    NULL,
-    NULL,
-    "stop the torso from animating.  Animation will end at the end of current cycle.",
-    EV_NORMAL
-);
-Event EV_NewAnim(
-    "animate_newanim", EV_ZERO, "ii", "animNum slot", "Start a new animation, not for script use.", EV_NORMAL
-);
-Event EV_ViewAnim("viewanim", EV_DEFAULT, "s", "anim", "testing");
-Event EV_Animate_IsLoopingAnim(
-    "isloopinganim", EV_DEFAULT, "s", "anim_name", "returns 1 if the anim is a looping anim, or 0 otherwise", EV_RETURN
-);
-Event EV_Animate_SetYawfromBone(
+Event EV_Animate_SetYawfromBone
+(
     "setyawfrombone",
     EV_DEFAULT,
     "s",
@@ -81,7 +68,8 @@ Event EV_Animate_SetYawfromBone(
     "Set the yaw of the model based on the current animation time",
     EV_NORMAL
 );
-Event EV_Animate_PlayerSpawn(
+Event EV_Animate_PlayerSpawn
+(
     "playerspawn",
     EV_DEFAULT,
     "sFVFF",
@@ -101,10 +89,33 @@ Event EV_Animate_PlayerSpawn(
     "one second later.",
     EV_NORMAL
 );
-Event EV_Animate_PlayerSpawn_Utility(
-    "testmojo", EV_DEFAULT, "sv", "model_name vector_offset", "INTERNAL EVENT", EV_NORMAL
+Event EV_Animate_PlayerSpawn_Utility
+(
+    "testmojo",
+    EV_DEFAULT,
+    "sv",
+    "model_name vector_offset",
+    "INTERNAL EVENT",
+    EV_NORMAL
+);
+Event EV_Animate_PauseAnim
+(
+    "pauseanims",
+    EV_DEFAULT,
+    "i",
+    "pause",
+    "Pause (or unpause) animations",
+    EV_NORMAL
+);
+Event EV_Animate_Client_Sound
+(
+    "_client_sound",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    NULL,
+    EV_NORMAL
 );
-Event EV_Animate_PauseAnim("pauseanims", EV_DEFAULT, "i", "pause", "Pause (or unpause) animations");
 
 CLASS_DECLARATION(Entity, Animate, "animate") {
     {&EV_SetControllerAngles,         &Animate::SetControllerAngles    },
@@ -115,16 +126,54 @@ CLASS_DECLARATION(Entity, Animate, "animate") {
     {&EV_Animate_PlayerSpawn,         &Animate::EventPlayerSpawn       },
     {&EV_Animate_PlayerSpawn_Utility, &Animate::EventPlayerSpawnUtility},
     {&EV_Animate_PauseAnim,           &Animate::EventPauseAnim         },
+    {&EV_Animate_Client_Sound,        &Animate::ClientSound            },
     {NULL,                            NULL                             }
 };
 
+static size_t GetLongestClientCmdLength(const tiki_cmd_t& cmds)
+{
+    size_t ii;
+    size_t longest = 0;
+
+    for (ii = 0; ii < cmds.num_cmds; ii++) {
+        const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+        size_t                  length     = strlen(single_cmd.args[0]);
+        if (length > longest) {
+            longest = length;
+        }
+    }
+
+    return longest;
+}
+
+static size_t GetLongestClientCmdAllFramesLength(dtiki_t *tiki, int animnum, int numframes)
+{
+    tiki_cmd_t cmds;
+    size_t     longest = 0;
+    int        i;
+
+    for (i = 0; i < numframes; i++) {
+        // we want normal frame commands to occur right on the frame
+        if (gi.Frame_Commands_Client(tiki, animnum, i, &cmds)) {
+            size_t length = GetLongestClientCmdLength(cmds);
+            if (length > longest) {
+                longest = length;
+            }
+        }
+    }
+
+    return longest;
+}
+
 Animate::Animate()
 {
-    entflags |= EF_ANIMATE;
+    entflags |= ECF_ANIMATE;
+
+    syncTime = 0.0f;
+    syncRate = 1.0f;
 
     pauseSyncTime = 0.0f;
-    syncTime      = 0.0f;
-    syncRate      = 1.0f;
+    is_paused     = false;
 
     frame_delta   = vec_zero;
     angular_delta = 0;
@@ -149,7 +198,7 @@ Animate::Animate()
 
 Animate::~Animate()
 {
-    entflags &= ~EF_ANIMATE;
+    entflags &= ~ECF_ANIMATE;
 }
 
 void Animate::ForwardExec(Event *ev)
@@ -164,7 +213,6 @@ void Animate::ForwardExec(Event *ev)
         );
     }
 
-
     NewAnim(ev->GetString(1), 0);
     RestartAnimSlot(0);
 }
@@ -217,11 +265,10 @@ void Animate::NewAnim(int animnum, int slot, float weight)
     animFlags[slot] = ANIM_LOOP | ANIM_NODELTA | ANIM_NOEXIT;
 
     if (!(gi.Anim_FlagsSkel(edict->tiki, animnum) & ANIM_LOOP)) {
-        animFlags[slot] &= ~ANIM_LOOP;
+        SetOnceType(slot);
     }
 
-    edict->s.frameInfo[slot].weight = weight;
-
+    SetWeight(slot, weight);
     animtimes[slot]  = gi.Anim_Time(edict->tiki, animnum);
     frametimes[slot] = gi.Anim_Frametime(edict->tiki, animnum);
 
@@ -229,7 +276,8 @@ void Animate::NewAnim(int animnum, int slot, float weight)
         edict->s.eType = ET_MODELANIM;
     }
 
-    qboolean hascommands = gi.Anim_HasCommands(edict->tiki, animnum);
+    qboolean hascommands =
+        gi.Anim_HasCommands(edict->tiki, animnum) || gi.Anim_HasCommands_Client(edict->tiki, animnum);
 
     // enter this animation
     if (newanim) {
@@ -241,18 +289,53 @@ void Animate::NewAnim(int animnum, int slot, float weight)
             int ii, j;
 
             for (ii = 0; ii < cmds.num_cmds; ii++) {
-                ev = new AnimationEvent(cmds.cmds[ii].args[0]);
+                const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
 
-                ev->SetAnimationNumber(animnum);
-                ev->SetAnimationFrame(0);
+                AnimationEvent ev(single_cmd.args[0], single_cmd.num_args);
 
-                for (j = 1; j < cmds.cmds[ii].num_args; j++) {
-                    ev->AddToken(cmds.cmds[ii].args[j]);
+                ev.SetAnimationNumber(animnum);
+                ev.SetAnimationFrame(0);
+
+                for (j = 1; j < single_cmd.num_args; j++) {
+                    ev.AddToken(single_cmd.args[j]);
                 }
 
                 ProcessEvent(ev);
             }
         }
+
+        if (gi.Frame_Commands_Client(edict->tiki, animnum, TIKI_FRAME_ENTRY, &cmds)) {
+            size_t longest = GetLongestClientCmdLength(cmds);
+            int    ii, j;
+
+            if (longest) {
+                char *cmdName = (char *)alloca(longest + 8 + 1);
+
+                for (ii = 0; ii < cmds.num_cmds; ii++) {
+                    const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+                    int                     eventNum;
+
+                    Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
+
+                    eventNum = Event::FindEventNum(cmdName);
+
+                    AnimationEvent ev(eventNum, single_cmd.num_args);
+                    if (!ev.eventnum) {
+                        continue;
+                    }
+
+                    ev.SetAnimationNumber(animnum);
+                    ev.SetAnimationFrame(0);
+
+                    for (j = 1; j < single_cmd.num_args; j++) {
+                        ev.AddToken(single_cmd.args[j]);
+                    }
+
+                    ProcessEvent(ev);
+                }
+            }
+        }
     }
 
     if (!hascommands) {
@@ -272,37 +355,75 @@ void Animate::NewAnim(int animnum, int slot, float weight)
             int ii, j;
 
             for (ii = 0; ii < cmds.num_cmds; ii++) {
-                ev = new AnimationEvent(cmds.cmds[ii].args[0]);
+                const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+
+                ev = new AnimationEvent(single_cmd.args[0], single_cmd.num_args);
 
                 ev->SetAnimationNumber(animnum);
                 ev->SetAnimationFrame(i);
 
-                for (j = 1; j < cmds.cmds[ii].num_args; j++) {
-                    ev->AddToken(cmds.cmds[ii].args[j]);
+                for (j = 1; j < single_cmd.num_args; j++) {
+                    ev->AddToken(single_cmd.args[j]);
                 }
 
                 PostEvent(ev, time, 1 << slot);
             }
         }
     }
+
+    time = 0.0f;
+
+    const size_t longestAllFrames = GetLongestClientCmdAllFramesLength(edict->tiki, animnum, numframes);
+    if (longestAllFrames) {
+        char *cmdName = (char *)alloca(longestAllFrames + 8 + 1);
+
+        for (i = 0; i < numframes; i++, time += frametimes[slot]) {
+            // we want normal frame commands to occur right on the frame
+            if (gi.Frame_Commands_Client(edict->tiki, animnum, i, &cmds)) {
+                int ii, j;
+
+                for (ii = 0; ii < cmds.num_cmds; ii++) {
+                    const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+                    int                     eventNum;
+
+                    Q_strncpyz(cmdName, "_client_", longestAllFrames + 8 + 1);
+                    Q_strncpyz(cmdName + 8, single_cmd.args[0], longestAllFrames + 1);
+
+                    eventNum = Event::FindEventNum(cmdName);
+
+                    AnimationEvent ev(eventNum, single_cmd.num_args);
+                    if (!ev.eventnum) {
+                        continue;
+                    }
+
+                    ev.SetAnimationNumber(animnum);
+                    ev.SetAnimationFrame(i);
+
+                    for (j = 1; j < single_cmd.num_args; j++) {
+                        ev.AddToken(single_cmd.args[j]);
+                    }
+
+                    PostEvent(ev, time, 1 << slot);
+                }
+            }
+        }
+    }
 }
 
 void Animate::NewAnim(int animnum, Event& newevent, int slot, float weight)
 {
-    if (animnum == -1) {
+    if (animnum != -1) {
+        NewAnim(animnum, slot);
+        SetAnimDoneEvent(newevent, slot);
+    } else {
         PostEvent(newevent, level.frametime);
     }
-
-    NewAnim(animnum, slot);
-    SetAnimDoneEvent(newevent, slot);
 }
 
 void Animate::NewAnim(int animnum, Event *newevent, int slot, float weight)
 {
-    if (animnum == -1) {
-        if (newevent) {
-            PostEvent(newevent, level.frametime);
-        }
+    if (animnum == -1 && newevent) {
+        PostEvent(newevent, level.frametime);
     }
 
     NewAnim(animnum, slot);
@@ -311,7 +432,7 @@ void Animate::NewAnim(int animnum, Event *newevent, int slot, float weight)
 
 void Animate::NewAnim(const char *animname, int slot, float weight)
 {
-    int animnum = gi.Anim_Random(edict->tiki, animname);
+    int animnum = gi.Anim_NumForName(edict->tiki, animname);
 
     if (animnum != -1) {
         NewAnim(animnum, slot);
@@ -320,19 +441,25 @@ void Animate::NewAnim(const char *animname, int slot, float weight)
 
 void Animate::NewAnim(const char *animname, Event *endevent, int slot, float weight)
 {
-    int animnum = gi.Anim_Random(edict->tiki, animname);
+    int animnum = gi.Anim_NumForName(edict->tiki, animname);
 
     if (animnum != -1) {
-        NewAnim(animnum, endevent, slot);
+        NewAnim(animnum, slot, weight);
+        SetAnimDoneEvent(endevent, slot);
+    } else if (endevent) {
+        PostEvent(endevent, level.frametime);
     }
 }
 
 void Animate::NewAnim(const char *animname, Event& endevent, int slot, float weight)
 {
-    int animnum = gi.Anim_Random(edict->tiki, animname);
+    int animnum = gi.Anim_NumForName(edict->tiki, animname);
 
     if (animnum != -1) {
-        NewAnim(animnum, endevent, slot);
+        NewAnim(animnum, slot, weight);
+        SetAnimDoneEvent(endevent, slot);
+    } else {
+        PostEvent(endevent, level.frametime);
     }
 }
 
@@ -381,9 +508,8 @@ void Animate::StopAnimating(int slot)
         edict->s.frameInfo[slot].index = 1;
     }
 
-    edict->s.frameInfo[slot].weight = 0.0f;
-
     animFlags[slot] = ANIM_LOOP | ANIM_NODELTA | ANIM_NOEXIT | ANIM_PAUSED;
+    SetWeight(slot, 0);
     animtimes[slot] = 0.0f;
 
     SlotChanged(slot);
@@ -403,7 +529,8 @@ void Animate::DoExitCommands(int slot)
         int ii, j;
 
         for (ii = 0; ii < cmds.num_cmds; ii++) {
-            tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+            const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+
             ev = new AnimationEvent(single_cmd.args[0], single_cmd.num_args);
 
             ev->SetAnimationNumber(edict->s.frameInfo[slot].index);
@@ -417,6 +544,38 @@ void Animate::DoExitCommands(int slot)
         }
     }
 
+    if (gi.Frame_Commands_Client(edict->tiki, edict->s.frameInfo[slot].index, TIKI_FRAME_EXIT, &cmds)) {
+        size_t longest = GetLongestClientCmdLength(cmds);
+        if (longest) {
+            char *cmdName = (char *)alloca(longest + 8 + 1);
+            int   ii, j;
+
+            for (ii = 0; ii < cmds.num_cmds; ii++) {
+                const tiki_singlecmd_t& single_cmd = cmds.cmds[ii];
+                int                     eventNum;
+
+                Q_strncpyz(cmdName, "_client_", longest + 8 + 1);
+                Q_strncpyz(cmdName + 8, single_cmd.args[0], longest + 1);
+
+                eventNum = Event::FindEventNum(cmdName);
+
+                AnimationEvent ev(eventNum, single_cmd.num_args);
+                if (!ev.eventnum) {
+                    continue;
+                }
+
+                ev.SetAnimationNumber(edict->s.frameInfo[slot].index);
+                ev.SetAnimationFrame(0);
+
+                for (j = 1; j < single_cmd.num_args; j++) {
+                    ev.AddToken(single_cmd.args[j]);
+                }
+
+                PostEvent(ev, 0);
+            }
+        }
+    }
+
     animFlags[slot] |= ANIM_NOEXIT;
 }
 
@@ -437,7 +596,7 @@ int Animate::NumAnims(void)
 
 const char *Animate::AnimName(int slot)
 {
-    return gi.Anim_NameForNum(edict->tiki, edict->s.frameInfo[slot].index);
+    return gi.Anim_NameForNum(edict->tiki, CurrentAnim(slot));
 }
 
 void Animate::AnimFinished(int slot)
@@ -465,31 +624,31 @@ void Animate::PreAnimate(void)
 
 void Animate::PostAnimate(void)
 {
-	float  startTime;
-	float  deltaSyncTime;
-	float  total_weight;
-	float  total_angular_delta;
-	Vector vFrameDelta;
-	bool   hasAction = false;
+    float  startTime;
+    float  deltaSyncTime;
+    float  total_weight;
+    float  total_angular_delta;
+    float  beforeFrameTime;
+    Vector vFrameDelta;
+    bool   hasAction = false;
 
     if (!edict->tiki) {
         return;
     }
 
-    deltaSyncTime = syncTime;
+    deltaSyncTime   = syncTime;
+    beforeFrameTime = level.frametime / 10.f;
 
     if (!pauseSyncTime) {
         syncTime = 1.0f / syncRate * level.frametime + deltaSyncTime;
     }
 
-    total_weight = 0;
+    total_weight        = 0;
     total_angular_delta = 0;
 
     for (int i = 0; i < MAX_FRAMEINFOS; i++) {
-        if (edict->s.frameInfo[i].weight > 0.0f) {
-            if (!(animFlags[i] & ANIM_NOACTION)) {
-                hasAction = true;
-            }
+        if (edict->s.frameInfo[i].weight > 0.0f && !(animFlags[i] & ANIM_NOACTION)) {
+            hasAction = true;
         }
 
         if (animFlags[i] & ANIM_PAUSED) {
@@ -509,84 +668,92 @@ void Animate::PostAnimate(void)
             animFlags[i] |= ANIM_FINISHED;
             RestartAnimSlot(i);
         } else {
-            if (!(animFlags[i] & ANIM_NODELTA)) {
-                if (gi.Anim_HasDelta(edict->tiki, edict->s.frameInfo[i].index)) {
-                    float vDelta[3];
-                    float angleDelta;
+            if (!(animFlags[i] & ANIM_NODELTA) && gi.Anim_HasDelta(edict->tiki, edict->s.frameInfo[i].index)) {
+                vec3_t vDelta;
+                float  angleDelta;
 
-                    //
-                    // Get the animation's delta position from start time
-                    //
-                    gi.Anim_DeltaOverTime(edict->tiki, edict->s.frameInfo[i].index, startTime, edict->s.frameInfo[i].time, vDelta);
-                    vFrameDelta += Vector(vDelta) * edict->s.frameInfo[i].weight;
-                    total_weight += edict->s.frameInfo[i].weight;
+                //
+                // Get the animation's delta position from start time
+                //
+                gi.Anim_DeltaOverTime(
+                    edict->tiki, edict->s.frameInfo[i].index, startTime, edict->s.frameInfo[i].time, vDelta
+                );
+                VectorScale(vDelta, edict->s.frameInfo[i].weight, vDelta);
+                vFrameDelta += vDelta;
+                total_weight += edict->s.frameInfo[i].weight;
 
-                    //
-                    // Get the animation's delta angle from start time
-                    //
-                    gi.Anim_AngularDeltaOverTime(edict->tiki, edict->s.frameInfo[i].index, startTime, edict->s.frameInfo[i].time, &angleDelta);
-                    total_angular_delta += angleDelta * edict->s.frameInfo[i].weight;
-
-                }
+                //
+                // Get the animation's delta angle from start time
+                //
+                gi.Anim_AngularDeltaOverTime(
+                    edict->tiki, edict->s.frameInfo[i].index, startTime, edict->s.frameInfo[i].time, &angleDelta
+                );
+                angleDelta *= edict->s.frameInfo[i].weight;
+                total_angular_delta += angleDelta;
             }
 
             animFlags[i] &= ~ANIM_NODELTA;
 
-            float animTime;
             if (animFlags[i] & ANIM_SYNC) {
-                animTime = animtimes[i];
+                if (edict->s.frameInfo[i].time < animtimes[i]) {
+                    continue;
+                }
             } else {
-                animTime = animtimes[i] - 0.01f;
-            }
-
-            if (edict->s.frameInfo[i].time >= animTime) {
-                if (animFlags[i] & ANIM_LOOP) {
-                    animFlags[i] |= ANIM_FINISHED;
-
-                    do {
-                        edict->s.frameInfo[i].time -= animtimes[i];
-                    } while (edict->s.frameInfo[i].time >= animtimes[i]);
-
-                    if (edict->s.frameInfo[i].time < 0) {
-                        edict->s.frameInfo[i].time = 0;
-                    }
-
-                } else {
-                    if (startTime != animtimes[i]) {
-                        animFlags[i] |= ANIM_FINISHED;
-                    }
-
-                    edict->s.frameInfo[i].time = animtimes[i];
+                // Fixed in OPM
+                //  Previously, beforeFrameTime was a constant of 0.01.
+                //  It caused issues when the number of server frames per second
+                //  was higher. Some animation events were not executing properly.
+                if (edict->s.frameInfo[i].time < (animtimes[i] - beforeFrameTime)) {
+                    continue;
                 }
             }
-        }
 
-        if (total_weight) {
-            vFrameDelta *= 1.f / total_weight;
-            total_angular_delta *= 1.f / total_weight;
-        }
+            if (IsRepeatType(i)) {
+                animFlags[i] |= ANIM_FINISHED;
 
-        MatrixTransformVector(vFrameDelta, orientation, frame_delta);
-        angular_delta = total_angular_delta;
+                do {
+                    edict->s.frameInfo[i].time -= animtimes[i];
+                } while (edict->s.frameInfo[i].time >= animtimes[i]);
 
-        while (syncTime > 1.0f) {
-            syncTime -= 1.0f;
-        }
+                if (edict->s.frameInfo[i].time < 0) {
+                    edict->s.frameInfo[i].time = 0;
+                }
 
-        total_weight = level.frametime * 4.0f;
+            } else {
+                if (startTime != animtimes[i]) {
+                    animFlags[i] |= ANIM_FINISHED;
+                }
 
-        if (hasAction) {
-            edict->s.actionWeight += total_weight;
-
-            if (edict->s.actionWeight > 1.0f) {
-                edict->s.actionWeight = 1.0f;
+                edict->s.frameInfo[i].time = animtimes[i];
             }
-        } else {
-            edict->s.actionWeight -= total_weight;
+        }
+    }
 
-            if (edict->s.actionWeight < 0.0f) {
-                edict->s.actionWeight = 0.0f;
-            }
+    if (total_weight) {
+        vFrameDelta *= 1.f / total_weight;
+        total_angular_delta *= 1.f / total_weight;
+    }
+
+    MatrixTransformVector(vFrameDelta, orientation, frame_delta);
+    angular_delta = total_angular_delta;
+
+    while (syncTime >= 1.0f) {
+        syncTime -= 1.0f;
+    }
+
+    total_weight = level.frametime * 4.0f;
+
+    if (hasAction) {
+        edict->s.actionWeight += total_weight;
+
+        if (edict->s.actionWeight > 1.0f) {
+            edict->s.actionWeight = 1.0f;
+        }
+    } else {
+        edict->s.actionWeight -= total_weight;
+
+        if (edict->s.actionWeight < 0.0f) {
+            edict->s.actionWeight = 0.0f;
         }
     }
 }
@@ -630,8 +797,8 @@ void Animate::Pause(int slot, int pause)
     if (pause) {
         animFlags[slot] |= ANIM_PAUSED;
     } else {
-        if ((animFlags[slot] & ANIM_PAUSED)) {
-            if ((animFlags[slot] & ANIM_SYNC)) {
+        if (animFlags[slot] & ANIM_PAUSED) {
+            if (animFlags[slot] & ANIM_SYNC) {
                 SlotChanged(animFlags[slot]);
             }
 
@@ -643,14 +810,14 @@ void Animate::Pause(int slot, int pause)
 void Animate::UseSyncTime(int slot, int sync)
 {
     if (sync) {
-        if (animFlags[slot] & ANIM_SYNC) {
-            return;
+        if (!(animFlags[slot] & ANIM_SYNC)) {
+            animFlags[slot] |= ANIM_SYNC;
+            SlotChanged(slot);
         }
-
-        animFlags[slot] = (animFlags[slot] | (ANIM_SYNC | ANIM_NODELTA)) & ~ANIM_FINISHED;
     } else {
         if (animFlags[slot] & ANIM_SYNC) {
-            animFlags[slot] = (animFlags[slot] | ANIM_NODELTA) & ~(ANIM_FINISHED | ANIM_SYNC);
+            animFlags[slot] &= ~ANIM_SYNC;
+            SlotChanged(slot);
         }
     }
 }
@@ -880,6 +1047,11 @@ void Animate::DumpAnimInfo(void)
     MPrintf("actionWeight: %f\n", edict->s.actionWeight);
 }
 
+void Animate::ClientSound(Event *ev)
+{
+    PlayNonPvsSound(ev->GetString(1));
+}
+
 void Animate::EventPauseAnim(Event *ev)
 {
     is_paused = ev->GetInteger(1) ? true : false;
diff --git a/code/fgame/animate.h b/code/fgame/animate.h
index 479a5d72..724a640f 100644
--- a/code/fgame/animate.h
+++ b/code/fgame/animate.h
@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // animate.h -- Animate class
 
-#ifndef __ANIMATE_H__
-#define __ANIMATE_H__
+#pragma once
 
 #if defined(GAME_DLL)
 #    include "entity.h"
@@ -132,6 +131,8 @@ public:
     virtual void DumpAnimInfo();
     void         SlotChanged(int slot);
 
+    void ClientSound(Event *ev);
+
     // FIXME: delete this, fakk2 remnant
     int NumFrames(int slot = 0);
 };
@@ -168,22 +169,24 @@ inline void Animate::PauseSyncTime(int pause)
 
 inline void Animate::Archive(Archiver& arc)
 {
+    int i;
+
     Entity::Archive(arc);
 
-    for (int i = MAX_FRAMEINFOS - 1; i >= 0; i--) {
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
         arc.ArchiveInteger(&animFlags[i]);
     }
     arc.ArchiveFloat(&syncTime);
     arc.ArchiveFloat(&syncRate);
     arc.ArchiveInteger(&pauseSyncTime);
     arc.ArchiveBool(&is_paused);
-    for (int i = MAX_FRAMEINFOS - 1; i >= 0; i--) {
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
         arc.ArchiveEventPointer(&doneEvents[i]);
     }
-    for (int i = MAX_FRAMEINFOS - 1; i >= 0; i--) {
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
         arc.ArchiveFloat(&animtimes[i]);
     }
-    for (int i = MAX_FRAMEINFOS - 1; i >= 0; i--) {
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
         arc.ArchiveFloat(&frametimes[i]);
     }
     arc.ArchiveVector(&frame_delta);
@@ -209,5 +212,3 @@ inline int Animate::NumFrames(int slot)
 {
     return gi.Anim_NumFrames(edict->tiki, edict->s.frameInfo[slot].index);
 }
-
-#endif /* animate.h */
diff --git a/code/fgame/animationevent.cpp b/code/fgame/animationevent.cpp
index 245f930b..6b0cee1e 100644
--- a/code/fgame/animationevent.cpp
+++ b/code/fgame/animationevent.cpp
@@ -29,13 +29,20 @@ CLASS_DECLARATION(Event, AnimationEvent, NULL) {
     {NULL, NULL}
 };
 
-AnimationEvent::AnimationEvent(str command, int numArgs)
+AnimationEvent::AnimationEvent(const char* command, int numArgs)
     : Event(command, numArgs)
 {
     anim_number = 0;
     anim_frame  = 0;
 }
 
+AnimationEvent::AnimationEvent(int eventNum, int numArgs)
+    : Event(eventNum, numArgs)
+{
+    anim_number = 0;
+    anim_frame = 0;
+}
+
 AnimationEvent::AnimationEvent(const Event& ev)
     : Event(ev)
 {
diff --git a/code/fgame/animationevent.h b/code/fgame/animationevent.h
index 357a6e52..3260c152 100644
--- a/code/fgame/animationevent.h
+++ b/code/fgame/animationevent.h
@@ -35,7 +35,8 @@ public:
     void *operator new(size_t size);
     void  operator delete(void *ptr);
 
-    AnimationEvent(str command, int numArgs = 0);
+    AnimationEvent(const char* command, int numArgs = 0);
+    AnimationEvent(int eventNum, int numArgs = 0);
     AnimationEvent(const Event& ev);
     AnimationEvent();
 
diff --git a/code/fgame/archive.cpp b/code/fgame/archive.cpp
index f66c2f02..a151ee7e 100644
--- a/code/fgame/archive.cpp
+++ b/code/fgame/archive.cpp
@@ -28,347 +28,369 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <lz77.h>
 
 #ifdef GAME_DLL
-#include "../fgame/entity.h"
+#    include "../fgame/entity.h"
 #endif
 
-enum
-{
-	ARC_NULL, ARC_Vector, ARC_Vec2, ARC_Vec3, ARC_Vec4, ARC_Integer, ARC_Unsigned, ARC_Byte, ARC_Char, ARC_Short, ARC_UnsignedShort,
-	ARC_Float, ARC_Double, ARC_Boolean, ARC_String, ARC_Raw, ARC_Object, ARC_ObjectPointer,
-	ARC_SafePointer, ARC_EventPointer, ARC_Quat, ARC_Entity, ARC_Bool,
-	ARC_Position, ARC_Size,
-	ARC_NUMTYPES
+enum {
+    ARC_NULL,
+    ARC_Vector,
+    ARC_Vec2,
+    ARC_Vec3,
+    ARC_Vec4,
+    ARC_Integer,
+    ARC_Unsigned,
+    ARC_Byte,
+    ARC_Char,
+    ARC_Short,
+    ARC_UnsignedShort,
+    ARC_Float,
+    ARC_Double,
+    ARC_Boolean,
+    ARC_String,
+    ARC_Raw,
+    ARC_Object,
+    ARC_ObjectPointer,
+    ARC_SafePointer,
+    ARC_EventPointer,
+    ARC_Quat,
+    ARC_Entity,
+    ARC_Bool,
+    ARC_Position,
+    ARC_Size,
+    ARC_NUMTYPES
 };
 
-static const char *typenames[] =
-{
-	"NULL", "vector", "vec2", "vec3", "vec4", "int", "unsigned", "byte", "char", "short", "unsigned short",
-	"float", "double", "qboolean", "string", "raw data", "object", "objectpointer",
-	"safepointer", "eventpointer", "quaternion", "entity", "bool",
-	"position", "size"
-};
+static const char *typenames[] = {
+    "NULL",   "vector",        "vec2",           "vec3",         "vec4",       "int",      "unsigned", "byte",
+    "char",   "short",         "unsigned short", "float",        "double",     "qboolean", "string",   "raw data",
+    "object", "objectpointer", "safepointer",    "eventpointer", "quaternion", "entity",   "bool",     "position",
+    "size"};
 
-#define ArchiveHeader   ( *( int * )"MHAA" )
-#define ArchiveVersion	14							// This must be changed any time the format changes!
-#define ArchiveInfo     "MOHAA Archive Version 14"	// This must be changed any time the format changes!
+#define ArchiveHeader  (LittleLong(*(int *)"MHAA"))
+#define ArchiveVersion 14                             // This must be changed any time the format changes!
+#define ArchiveInfo    "OPENMOHAA Archive Version 14" // This must be changed any time the format changes!
 
-CLASS_DECLARATION( Class, FileRead, NULL )
+ArchiveFile::ArchiveFile()
 {
-	{ NULL, NULL }
-};
-
-FileRead::FileRead()
-{
-	length = 0;
-	buffer = NULL;
-	pos = 0;
+    length       = 0;
+    buffer       = 0;
+    pos          = 0;
+    bufferlength = 0;
+    writing      = 0;
+    opened       = 0;
 }
 
-FileRead::~FileRead()
+ArchiveFile::~ArchiveFile()
 {
-	Close();
+    Close();
 }
 
-void FileRead::Close
-	(
-	bool bDoCompression
-	)
+void ArchiveFile::Close()
 {
-	if( bDoCompression )
-	{
-		byte *tempbuf;
-		size_t out_len;
+    if (writing) {
+        gi.FS_WriteFile(filename.c_str(), buffer, length);
+    }
 
-		tempbuf = ( byte * )glbs.Malloc( ( length >> 6 ) + length + 27 );
+    if (buffer) {
+        gi.Free((void *)buffer);
+        buffer = NULL;
+    }
 
-		// Set the signature
-		tempbuf[ 0 ] = 'C';
-		tempbuf[ 1 ] = 'S';
-		tempbuf[ 2 ] = 'V';
-		tempbuf[ 3 ] = 'G';
-		*( size_t * )( tempbuf + 4 ) = length;
-
-		// Compress the data
-		if( g_lz77.Compress( buffer, length, tempbuf + 8, &out_len ) )
-		{
-			glbs.Error( ERR_DROP, "Compression of SaveGame Failed!\n" );
-			return;
-		}
-
-		glbs.FS_WriteFile( filename.c_str(), tempbuf, out_len + 8 );
-		glbs.Free( tempbuf );
-	}
-
-	if( buffer )
-	{
-		glbs.Free( ( void * )buffer );
-		buffer = NULL;
-	}
-
-	filename = "";
-	length = 0;
-	pos = 0;
+    writing  = false;
+    filename = "";
+    length   = 0;
+    pos      = 0;
 }
 
-const char *FileRead::Filename
-(
-void
-)
+const char *ArchiveFile::Filename(void)
 {
-	return filename.c_str();
+    return filename.c_str();
 }
 
-size_t FileRead::Length
-(
-void
-)
+qboolean ArchiveFile::Compress()
 {
-	return length;
+#ifdef Q3_BIG_ENDIAN
+    // FIXME: Decompressing crashes on big-endian architectures
+    return false;
+#endif
+
+    byte  *tempbuf;
+    size_t out_len;
+    size_t tempbuf_len;
+
+    tempbuf_len = (length >> 6) + length + 27;
+    tempbuf     = (byte *)gi.Malloc(tempbuf_len);
+
+    // Set the signature
+    tempbuf[0]               = 'C';
+    tempbuf[1]               = 'S';
+    tempbuf[2]               = 'V';
+    tempbuf[3]               = 'G';
+    *(size_t *)(tempbuf + 4) = length;
+
+    // Compress the data
+    if (g_lz77.Compress(buffer, length, tempbuf + 8, &out_len)) {
+        gi.Error(ERR_DROP, "Compression of SaveGame Failed!\n");
+        return false;
+    }
+
+    gi.Free(buffer);
+    buffer       = tempbuf;
+    length       = out_len + 8;
+    bufferlength = tempbuf_len;
+
+    return true;
 }
 
-size_t FileRead::Pos
-(
-void
-)
+size_t ArchiveFile::Length(void)
 {
-	return pos - buffer;
+    return length;
 }
 
-qboolean FileRead::Seek
-(
-size_t newpos
-)
+size_t ArchiveFile::Pos(void)
 {
-	if( !buffer )
-	{
-		return false;
-	}
-
-	if( newpos > length )
-	{
-		return false;
-	}
-
-	pos = buffer + newpos;
-
-	return true;
+    return pos - buffer;
 }
 
-qboolean FileRead::Open
-	(
-	const char *name
-	)
+size_t ArchiveFile::Tell(void)
 {
-	byte  *tempbuf;
-	assert( name );
-
-	assert( !buffer );
-	Close();
-
-	if( !name )
-	{
-		return false;
-	}
-
-	length = glbs.FS_ReadFile( name, ( void ** )&tempbuf, qtrue );
-	if( length == ( size_t )( -1 ) )
-	{
-		return false;
-	}
-	// create our own space
-	buffer = ( byte * )glbs.Malloc( length );
-	// copy the file over to our space
-	memcpy( buffer, tempbuf, length );
-	// free the file
-	glbs.FS_FreeFile( tempbuf );
-	// set the file name
-	filename = name;
-
-	pos = buffer;
-
-	char FileHeader[ 4 ];
-	Read( FileHeader, sizeof( FileHeader ) );
-
-	if( FileHeader[ 0 ] != 'C' || FileHeader[ 1 ] != 'S' || FileHeader[ 2 ] != 'V' || FileHeader[ 3 ] != 'G' )
-	{
-		pos = buffer;
-	}
-	else
-	{
-		uint32_t new_len;
-		size_t iCSVGLength;
-
-		Read( &new_len, sizeof(uint32_t) );
-		tempbuf = ( byte * )glbs.Malloc( new_len );
-
-		if( g_lz77.Decompress( pos, length - 8, tempbuf, &iCSVGLength ) || iCSVGLength != new_len )
-		{
-			glbs.Error( ERR_DROP, "Decompression of save game failed\n" );
-			return false;
-		}
-
-		glbs.Free( buffer );
-
-		buffer = tempbuf;
-		length = iCSVGLength;
-		pos = buffer;
-	}
-
-	return true;
+    return pos - buffer;
 }
 
-qboolean FileRead::Read
-	(
-	void *dest,
-	size_t size
-	)
+qboolean ArchiveFile::Seek(size_t newpos)
 {
-	assert( dest );
-	assert( buffer );
-	assert( pos );
+    if (!buffer) {
+        return false;
+    }
 
-	if( !dest )
-	{
-		return false;
-	}
+    if (newpos > length) {
+        return false;
+    }
 
-	if( size <= 0 )
-	{
-		return false;
-	}
+    pos = buffer + newpos;
 
-	if( ( pos + size ) > ( buffer + length ) )
-	{
-		return false;
-	}
-
-	memcpy( dest, pos, size );
-	pos += size;
-
-	return true;
+    return true;
 }
 
-CLASS_DECLARATION( Class, Archiver, NULL )
+qboolean ArchiveFile::OpenRead(const char *name)
 {
-	{ NULL, NULL }
-};
+    byte *tempbuf;
+    assert(name);
+
+    assert(!buffer);
+    Close();
+
+    if (!name) {
+        return false;
+    }
+
+    length = gi.FS_ReadFile(name, (void **)&tempbuf, qtrue);
+    if (length == (size_t)(-1) || length == 0) {
+        return false;
+    }
+    // create our own space
+    buffer       = (byte *)gi.Malloc(length);
+    bufferlength = length;
+    // copy the file over to our space
+    memcpy(buffer, tempbuf, length);
+    // free the file
+    gi.FS_FreeFile(tempbuf);
+    // set the file name
+    filename = name;
+
+    pos     = buffer;
+    writing = false;
+    opened  = true;
+
+    char FileHeader[4];
+    Read(FileHeader, sizeof(FileHeader));
+
+    if (FileHeader[0] != 'C' || FileHeader[1] != 'S' || FileHeader[2] != 'V' || FileHeader[3] != 'G') {
+        pos = buffer;
+    } else {
+        uint32_t new_len;
+        size_t   iCSVGLength;
+
+        new_len = 0;
+        Read(&new_len, sizeof(uint32_t));
+        new_len = LittleLong(new_len);
+        tempbuf = (byte *)gi.Malloc(new_len);
+
+        if (g_lz77.Decompress(pos, length - 8, tempbuf, &iCSVGLength) || iCSVGLength != new_len) {
+            gi.Error(ERR_DROP, "Decompression of save game failed\n");
+            return false;
+        }
+
+        gi.Free(buffer);
+
+        buffer       = tempbuf;
+        length       = iCSVGLength;
+        bufferlength = length;
+        pos          = buffer;
+    }
+
+    return true;
+}
+
+qboolean ArchiveFile::OpenWrite(const char *name)
+{
+    this->length = 0;
+    // 4 MiB buffer
+    this->bufferlength = 4 * 1024 * 1024;
+    this->buffer       = (byte *)gi.Malloc(bufferlength);
+    this->filename     = name;
+    this->pos          = buffer;
+    this->writing      = true;
+    this->opened       = true;
+
+    return true;
+}
+
+qboolean ArchiveFile::Read(void *dest, size_t size)
+{
+    if (!size) {
+        return false;
+    }
+
+    if ((pos + size) > (buffer + length)) {
+        return false;
+    }
+
+    memcpy(dest, pos, size);
+    pos += size;
+
+    return true;
+}
+
+qboolean ArchiveFile::Write(const void *source, size_t size)
+{
+    if ((pos + size) > (buffer + bufferlength)) {
+        byte *oldbuf;
+
+        do {
+            bufferlength *= 2;
+        } while ((pos + size) > (buffer + bufferlength));
+
+        oldbuf = buffer;
+        // reallocate a bigger buffer
+        buffer = (byte *)gi.Malloc(bufferlength);
+        memcpy(buffer, oldbuf, length);
+        // free the old buffer
+        gi.Free(oldbuf);
+        // set the position with the new buffer
+        pos = buffer + (pos - oldbuf);
+    }
+
+    memcpy(pos, source, size);
+    pos += size;
+
+    if (length < (pos - buffer)) {
+        length = (pos - buffer);
+    }
+
+    return true;
+}
 
 Archiver::Archiver()
 {
-	file = 0;
-	fileerror = false;
-	harderror = true;
-	m_iNumBytesIO = 0;
-	silent = false;
-	assert( ( sizeof( typenames ) / sizeof( typenames[ 0 ] ) ) == ARC_NUMTYPES );
+    archivemode = ARCHIVE_WRITE;
+    fileerror   = false;
+    harderror   = true;
+    Reset();
+    silent = false;
+
+    assert((sizeof(typenames) / sizeof(typenames[0])) == ARC_NUMTYPES);
 }
 
 Archiver::~Archiver()
 {
-	if( file )
-	{
-		Close();
-	}
-
-	readfile.Close();
+    if (archivemode != ARCHIVE_NONE) {
+        Close();
+    }
 }
 
-void Archiver::FileError
-	(
-	const char *fmt,
-	...
-	)
+void Archiver::FileError(const char *fmt, ...)
 {
-	va_list	argptr;
-	char		text[ 1024 ];
+    va_list argptr;
+    char    text[1024];
 
-	va_start( argptr, fmt );
-	vsprintf( text, fmt, argptr );
-	va_end( argptr );
+    va_start(argptr, fmt);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
+    va_end(argptr);
 
-	fileerror = true;
-	Close();
-	if( archivemode == ARCHIVE_READ )
-	{
-		if( harderror )
-		{
-			glbs.Error( ERR_DROP, "Error while loading %s : %s\n", filename.c_str(), text );
-		}
-		else if( !silent )
-		{
-			glbs.Printf( "Error while loading %s : %s\n", filename.c_str(), text );
-		}
-	}
-	else
-	{
-		if( harderror )
-		{
-			glbs.Error( ERR_DROP, "Error while writing to %s : %s\n", filename.c_str(), text );
-		}
-		else if( !silent )
-		{
-			glbs.Printf( "Error while writing to %s : %s\n", filename.c_str(), text );
-		}
-	}
+    fileerror = true;
+    Close();
+    if (archivemode == ARCHIVE_READ) {
+        if (harderror) {
+            gi.Error(ERR_DROP, "Error while loading %s : %s\n", filename.c_str(), text);
+        } else if (!silent) {
+            gi.Printf("Error while loading %s : %s\n", filename.c_str(), text);
+        }
+    } else if (archivemode == ARCHIVE_WRITE) {
+        if (harderror) {
+            gi.Error(ERR_DROP, "Error while writing to %s : %s\n", filename.c_str(), text);
+        } else if (!silent) {
+            gi.Printf("Error while writing to %s : %s\n", filename.c_str(), text);
+        }
+    } else {
+        if (harderror) {
+            gi.Error(ERR_DROP, "Error while neither reading nor writing: %s\n", text);
+        } else {
+            gi.Printf("Error while neither reading nor writing: %s\n", text);
+        }
+    }
 }
 
-void Archiver::Close
-	(
-	void
-	)
+void Archiver::Close(void)
 {
-	if( file )
-	{
-		if( archivemode == ARCHIVE_WRITE )
-		{
-			int numobjects;
+    if (archivemode == ARCHIVE_NONE) {
+        // nothing to process
+        return;
+    }
 
-			// write out the number of classpointers
-			glbs.FS_Seek( file, numclassespos, FS_SEEK_SET );
-			numclassespos = glbs.FS_Tell( file );
-			numobjects = classpointerList.NumObjects();
-			ArchiveInteger( &numobjects );
-		}
+    if (archivemode == ARCHIVE_WRITE) {
+        int    numobjects;
+        size_t pos;
 
-		glbs.FS_FCloseFile( file );
-		file = 0;
+        // write out the number of classpointers
+        pos = archivefile.Tell();
+        archivefile.Seek(numclassespos);
+        numobjects = classpointerList.NumObjects();
+        ArchiveInteger(&numobjects);
+        // compress the file
+        archivefile.Seek(pos);
+        archivefile.Compress();
+    }
 
-		readfile.Close();
-		// Re-open and compress the file
-		readfile.Open( filename.c_str() );
-		readfile.Close( true );
-	}
+    archivefile.Close();
 
-	readfile.Close();
+    if (archivemode == ARCHIVE_READ) {
+        int              i, num;
+        pointer_fixup_t *fixup;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		int i, num;
-		Class * classptr;
-		pointer_fixup_t *fixup;
+        num = fixupList.NumObjects();
+        for (i = 1; i <= num; i++) {
+            fixup = fixupList.ObjectAt(i);
+            if (fixup->type == pointer_fixup_ptr) {
+                LightClass **fixupptr;
+                fixupptr  = (LightClass **)fixup->ptr;
+                *fixupptr = classpointerList.ObjectAt(fixup->index);
+            } else if (fixup->type == pointer_fixup_normal) {
+                Class **fixupptr;
+                fixupptr  = (Class **)fixup->ptr;
+                *fixupptr = static_cast<Class *>(classpointerList.ObjectAt(fixup->index));
+            } else if (fixup->type == pointer_fixup_safe) {
+                SafePtrBase *fixupptr;
+                fixupptr = (SafePtrBase *)fixup->ptr;
+                fixupptr->InitSafePtr(static_cast<Class *>(classpointerList.ObjectAt(fixup->index)));
+            }
+            delete fixup;
+        }
+        fixupList.FreeObjectList();
+        classpointerList.FreeObjectList();
+    }
 
-		num = fixupList.NumObjects();
-		for( i = 1; i <= num; i++ )
-		{
-			fixup = fixupList.ObjectAt( i );
-			classptr = classpointerList.ObjectAt( fixup->index );
-			if( fixup->type == pointer_fixup_normal )
-			{
-				Class ** fixupptr;
-				fixupptr = ( Class ** )fixup->ptr;
-				*fixupptr = classptr;
-			}
-			else if( fixup->type == pointer_fixup_safe )
-			{
-				SafePtrBase * fixupptr;
-				fixupptr = ( SafePtrBase * )fixup->ptr;
-				fixupptr->InitSafePtr( classptr );
-			}
-			delete fixup;
-		}
-		fixupList.FreeObjectList();
-		classpointerList.FreeObjectList();
-	}
+    archivemode = ARCHIVE_NONE;
 }
 
 /****************************************************************************************
@@ -377,245 +399,90 @@ File Read/Write functions
 
 *****************************************************************************************/
 
-qboolean Archiver::Read
-(
-const char *name,
-qboolean harderror
-)
+qboolean Archiver::Read(const char *name, qboolean harderror)
 {
-	unsigned header;
-	unsigned version;
-	str		info;
-	int      num;
-	int      i;
-	Class    *null;
+    unsigned header;
+    unsigned version;
+    str      info;
+    int      num;
+    int      i;
+    Class   *null;
 
-	this->harderror = harderror;
+    this->harderror   = harderror;
+    this->fileerror   = false;
+    this->archivemode = ARCHIVE_READ;
+    this->filename    = name;
 
-	assert( name );
-	if( !name )
-	{
-		FileError( "NULL pointer for filename in Archiver::Read.\n" );
-		return false;
-	}
+    if (!archivefile.OpenRead(filename.c_str())) {
+        if (harderror) {
+            FileError("Couldn't open file.");
+        }
+        return false;
+    }
 
-	fileerror = false;
+    ArchiveUnsigned(&header);
+    if (header != ArchiveHeader) {
+        archivefile.Close();
+        FileError("Not a valid MOHAA archive.");
+        return false;
+    }
 
-	archivemode = ARCHIVE_READ;
+    ArchiveUnsigned(&version);
+    if (version > ArchiveVersion) {
+        archivefile.Close();
+        FileError("Archive is from version %u.  Check http://www.x-null.net for an update.", version);
+        return false;
+    }
 
-	filename = name;
+    if (version < ArchiveVersion) {
+        archivefile.Close();
+        FileError("Archive is out of date.");
+        return false;
+    }
 
-	if( !readfile.Open( filename.c_str() ) )
-	{
-		if( harderror )
-		{
-			FileError( "Couldn't open file." );
-		}
-		fileerror = true;
-		return false;
-	}
+    ArchiveString(&info);
+    gi.DPrintf("%s\n", info.c_str());
 
-	ArchiveUnsigned( &header );
-	if( header != ArchiveHeader )
-	{
-		readfile.Close();
-		FileError( "Not a valid MOHAA archive." );
-		return false;
-	}
+    // setup out class pointers
+    ArchiveInteger(&num);
+    classpointerList.Resize(num);
+    null = NULL;
+    for (i = 1; i <= num; i++) {
+        classpointerList.AddObject(null);
+    }
 
-	ArchiveUnsigned( &version );
-	if( version > ArchiveVersion )
-	{
-		readfile.Close();
-		FileError( "Archive is from version %u.  Check http://www.x-null.net for an update.", version );
-		return false;
-	}
-
-	if( version < ArchiveVersion )
-	{
-		readfile.Close();
-		FileError( "Archive is out of date." );
-		return false;
-	}
-
-	ArchiveString( &info );
-
-	// setup out class pointers
-	ArchiveInteger( &num );
-	classpointerList.Resize( num );
-	null = NULL;
-	for( i = 1; i <= num; i++ )
-	{
-		classpointerList.AddObject( null );
-	}
-
-	return true;
+    return true;
 }
 
-qboolean Archiver::Create
-	(
-	const char *name,
-	qboolean harderror
-	)
+qboolean Archiver::Create(const char *name, qboolean harderror)
 {
-	unsigned header;
-	unsigned version;
-	str      info;
-	int      numZero = 0;
+    unsigned header;
+    unsigned version;
+    str      info;
+    int      numZero = 0;
 
-	this->harderror = harderror;
+    this->harderror   = harderror;
+    this->fileerror   = false;
+    this->archivemode = ARCHIVE_WRITE;
+    this->filename    = name;
 
-	assert( name );
-	if( !name )
-	{
-		FileError( "NULL pointer for filename in Archiver::Create.\n" );
-		return false;
-	}
+    if (!archivefile.OpenWrite(filename.c_str())) {
+        FileError("Couldn't open file.");
+        return false;
+    }
 
-	fileerror = false;
+    header = ArchiveHeader;
+    ArchiveUnsigned(&header);
+    version = ArchiveVersion;
+    ArchiveUnsigned(&version);
+    info = ArchiveInfo;
+    ArchiveString(&info);
 
-	archivemode = ARCHIVE_WRITE;
+    numclassespos = archivefile.Tell();
+    ArchiveInteger(&numZero);
+    Reset();
 
-	filename = name;
-
-	file = glbs.FS_FOpenFileWrite( filename.c_str() );
-	if( !file )
-	{
-		FileError( "Couldn't open file." );
-		return false;
-	}
-
-	header = ArchiveHeader;
-	ArchiveUnsigned( &header );
-	version = ArchiveVersion;
-	ArchiveUnsigned( &version );
-	info = ArchiveInfo;
-	ArchiveString( &info );
-
-	numclassespos = glbs.FS_Tell( file );
-	ArchiveInteger( &numZero );
-
-	m_iNumBytesIO = 0;
-
-	return true;
-}
-
-
-inline void Archiver::CheckRead
-(
-void
-)
-{
-	assert( archivemode == ARCHIVE_READ );
-	if( !fileerror && ( archivemode != ARCHIVE_READ ) )
-	{
-		FileError( "File read during a write operation." );
-	}
-}
-
-inline void Archiver::CheckWrite
-(
-void
-)
-{
-	assert( archivemode == ARCHIVE_WRITE );
-	if( !fileerror && ( archivemode != ARCHIVE_WRITE ) )
-	{
-		FileError( "File write during a read operation." );
-	}
-}
-
-inline fileSize_t Archiver::ReadSize
-(
-void
-)
-{
-	fileSize_t s;
-
-	s = 0;
-	if( !fileerror )
-	{
-		readfile.Read( &s, sizeof( s ) );
-	}
-
-	return s;
-}
-
-inline void Archiver::CheckSize
-(
-int type,
-fileSize_t size
-)
-{
-	fileSize_t s;
-
-	if( !fileerror )
-	{
-		s = ReadSize();
-
-		if( size != s )
-		{
-			FileError( "Invalid data size of %d on %s.", s, typenames[ type ] );
-		}
-	}
-}
-
-inline void Archiver::WriteSize(fileSize_t size)
-{
-	glbs.FS_Write( &size, sizeof( size ), file );
-}
-
-inline int Archiver::ReadType
-(
-void
-)
-{
-	int t;
-
-	if( !fileerror )
-	{
-		readfile.Read( &t, sizeof( t ) );
-
-		return t;
-	}
-
-	return ARC_NULL;
-}
-
-inline void Archiver::WriteType
-	(
-	int type
-	)
-{
-	glbs.FS_Write( &type, sizeof( type ), file );
-}
-
-
-inline void Archiver::CheckType
-	(
-	int type
-	)
-{
-	int t;
-
-	assert( ( type >= 0 ) && ( type < ARC_NUMTYPES ) );
-
-	if( !fileerror )
-	{
-		t = ReadType();
-		if( t != type )
-		{
-			if( t < ARC_NUMTYPES )
-			{
-				FileError( "Expecting %s, Should be %s", typenames[ type ], typenames[ t ] );
-				assert( 0 );
-			}
-			else
-			{
-				FileError( "Expecting %s, Should be %i (Unknown type)", typenames[ type ], t );
-			}
-		}
-	}
+    return true;
 }
 
 /****************************************************************************************
@@ -626,628 +493,704 @@ File Archive functions
 
 //#define ARCHIVE_USE_TYPES 1
 
-inline void Archiver::ArchiveData
-	(
-	int type,
-	void *data,
-	size_t size
-	)
-{
-	if( archivemode == ARCHIVE_READ )
-	{
-#ifndef NDEBUG
-		CheckRead();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-		CheckType( type );
-#endif
-
-		if( !fileerror && size )
-		{
-			m_iNumBytesIO += size;
-			readfile.Read( data, size );
-		}
-	}
-	else
-	{
-#ifndef NDEBUG
-		CheckWrite();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-		WriteType( type );
-#endif
-
-		if( !fileerror && size )
-		{
-			m_iNumBytesIO += size;
-			glbs.FS_Write( data, size, file );
-		}
-	}
+template<typename v>
+void ArchiveSwapValue(v* value) {
+    LittleSwap(value, sizeof(v));
 }
 
-
-#define ARCHIVE( func, type )							\
-void Archiver::Archive##func							\
-	(													\
-	type * v											\
-	)													\
-														\
-{														\
-	ArchiveData( ARC_##func, v, sizeof( type ) );		\
+template<typename v>
+void ArchiveSwapValue(v* value, size_t size) {
+    for (size_t i = 0; i < size; i++) {
+        LittleSwap(&value[i], sizeof(value[i]));
+    }
 }
 
-ARCHIVE( Vector, Vector );
-ARCHIVE( Integer, int );
-ARCHIVE( Unsigned, unsigned );
-ARCHIVE( Size, long );
-ARCHIVE( Byte, byte );
-ARCHIVE( Char, char );
-ARCHIVE( Short, short );
-ARCHIVE( UnsignedShort, unsigned short );
-ARCHIVE( Float, float );
-ARCHIVE( Double, double );
-ARCHIVE( Boolean, qboolean );
-ARCHIVE( Quat, Quat );
-ARCHIVE( Bool, bool );
-ARCHIVE( Position, int );
+template<>
+void ArchiveSwapValue<Vector>(Vector* value) {
+    for (int i = 0; i < 3; i++) {
+        (*value)[i] = LittleFloat((*value)[i]);
+    }
+}
 
-void Archiver::ArchiveSvsTime
-	(
-	int *time
-	)
+template<>
+void ArchiveSwapValue<Quat>(Quat* value) {
+    for (int i = 0; i < 4; i++) {
+        (*value)[i] = LittleFloat((*value)[i]);
+    }
+}
+
+#define ARCHIVE(func, type)                             \
+    void Archiver::Archive##func(type *v)               \
+    {                                                   \
+        if (archivemode == ARCHIVE_WRITE) {             \
+            type nv = *v;                               \
+            ArchiveSwapValue(&nv);                      \
+            ArchiveData(ARC_##func, &nv, sizeof(type)); \
+        } else {                                        \
+            ArchiveData(ARC_##func, v, sizeof(type));   \
+            ArchiveSwapValue(v);                        \
+        }                                               \
+    }
+
+ARCHIVE(Vector, Vector);
+ARCHIVE(Integer, int);
+ARCHIVE(Unsigned, unsigned);
+ARCHIVE(Byte, byte);
+ARCHIVE(Char, char);
+ARCHIVE(Short, short);
+ARCHIVE(UnsignedShort, unsigned short);
+ARCHIVE(Float, float);
+ARCHIVE(Double, double);
+ARCHIVE(Boolean, qboolean);
+ARCHIVE(Quat, Quat);
+ARCHIVE(Bool, bool);
+ARCHIVE(Position, int);
+ARCHIVE(Size, long);
+
+void Archiver::ArchiveSvsTime(int *time)
 {
 #ifdef GAME_DLL
-	if( archivemode == ARCHIVE_READ )
-	{
-		ArchiveInteger( time );
-		glbs.AddSvsTimeFixup( time );
-	}
-	else
-	{
-		*time -= level.svsTime;
-		ArchiveInteger( time );
-		*time += level.svsTime;
-	}
+    if (archivemode == ARCHIVE_READ) {
+        ArchiveInteger(time);
+        gi.AddSvsTimeFixup(time);
+    } else {
+        *time -= level.svsTime;
+        ArchiveInteger(time);
+        *time += level.svsTime;
+    }
 #endif
 }
 
-void Archiver::ArchiveVec2
-	(
-	vec2_t vec
-	)
+void Archiver::ArchiveVec2(vec2_t vec)
 {
-	ArchiveData( ARC_Vec2, vec, sizeof( vec2_t ) );
+    if (archivemode == ARCHIVE_WRITE) {
+        vec2_t nv = { vec[0], vec[1] };
+        ArchiveSwapValue(nv, 2);
+        ArchiveData(ARC_Vec2, nv, sizeof(vec2_t));
+    } else {
+        ArchiveData(ARC_Vec2, vec, sizeof(vec2_t));
+        ArchiveSwapValue(vec, 2);
+    }
 }
 
-void Archiver::ArchiveVec3
-	(
-	vec3_t vec
-	)
+void Archiver::ArchiveVec3(vec3_t vec)
 {
-	ArchiveData( ARC_Vec3, vec, sizeof( vec3_t ) );
+    if (archivemode == ARCHIVE_WRITE) {
+        vec3_t nv = { vec[0], vec[1], vec[2]};
+        ArchiveSwapValue(nv, 3);
+        ArchiveData(ARC_Vec3, nv, sizeof(vec3_t));
+    } else {
+        ArchiveData(ARC_Vec3, vec, sizeof(vec3_t));
+        ArchiveSwapValue(vec, 3);
+    }
 }
 
-void Archiver::ArchiveVec4
-	(
-	vec4_t vec
-	)
+void Archiver::ArchiveVec4(vec4_t vec)
 {
-	ArchiveData( ARC_Vec4, vec, sizeof( vec4_t ) );
+    if (archivemode == ARCHIVE_WRITE) {
+        vec4_t nv = { vec[0], vec[1], vec[2], vec[3] };
+        ArchiveSwapValue(nv, 4);
+        ArchiveData(ARC_Vec4, nv, sizeof(vec4_t));
+    } else {
+        ArchiveData(ARC_Vec4, vec, sizeof(vec4_t));
+        ArchiveSwapValue(vec, 4);
+    }
 }
 
-void Archiver::ArchiveObjectPointer
-(
-Class ** ptr
-)
+void Archiver::ArchiveObjectPointer(LightClass **ptr)
 {
-	int index = 0;
+    int index = 0;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		pointer_fixup_t *fixup;
-		ArchiveData( ARC_ObjectPointer, &index, sizeof( index ) );
+    if (archivemode == ARCHIVE_READ) {
+        pointer_fixup_t *fixup;
 
-		// Check for a NULL pointer
-		assert( ptr );
-		if( !ptr )
-		{
-			FileError( "NULL pointer in ArchiveObjectPointer." );
-		}
+        ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
 
-		//
-		// see if the variable was NULL
-		//
-		if( index == ARCHIVE_NULL_POINTER )
-		{
-			*ptr = NULL;
-		}
-		else
-		{
-			// init the pointer with NULL until we can fix it
-			*ptr = NULL;
+        //
+        // see if the variable was NULL
+        //
+        if (index == ARCHIVE_NULL_POINTER) {
+            *ptr = NULL;
+        } else {
+            // init the pointer with NULL until we can fix it
+            *ptr = NULL;
 
-			fixup = new pointer_fixup_t;
-			fixup->ptr = ( void ** )ptr;
-			fixup->index = index;
-			fixup->type = pointer_fixup_normal;
-			fixupList.AddObject( fixup );
-		}
-	}
-	else
-	{
-		if( *ptr )
-		{
-			index = classpointerList.AddUniqueObject( *ptr );
-		}
-		else
-		{
-			index = ARCHIVE_NULL_POINTER;
-		}
-		ArchiveData( ARC_ObjectPointer, &index, sizeof( index ) );
-	}
+            fixup        = new pointer_fixup_t;
+            fixup->ptr   = (void **)ptr;
+            fixup->index = index;
+            fixup->type  = pointer_fixup_ptr;
+            fixupList.AddObject(fixup);
+        }
+    } else {
+        if (*ptr) {
+            index = classpointerList.AddUniqueObject(*ptr);
+        } else {
+            index = ARCHIVE_NULL_POINTER;
+        }
+
+        index = LittleLong(index);
+        ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+    }
 }
 
-void Archiver::ArchiveObjectPosition( void *obj )
+void Archiver::ArchiveObjectPointer(Class **ptr)
 {
-	int index = 0;
+    int index = 0;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		ArchivePosition( &index );
-		classpointerList.AddObjectAt( index, ( Class * )obj );
-	}
-	else
-	{
-		index = classpointerList.AddUniqueObject( ( Class * )obj );
-		ArchivePosition( &index );
-	}
+    if (archivemode == ARCHIVE_READ) {
+        pointer_fixup_t *fixup;
+
+        ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+        index = LittleLong(index);
+
+        //
+        // see if the variable was NULL
+        //
+        if (index == ARCHIVE_NULL_POINTER) {
+            *ptr = NULL;
+        } else {
+            // init the pointer with NULL until we can fix it
+            *ptr = NULL;
+
+            fixup        = new pointer_fixup_t;
+            fixup->ptr   = (void **)ptr;
+            fixup->index = index;
+            fixup->type  = pointer_fixup_normal;
+            fixupList.AddObject(fixup);
+        }
+    } else {
+        if (*ptr) {
+            index = classpointerList.AddUniqueObject(*ptr);
+        } else {
+            index = ARCHIVE_NULL_POINTER;
+        }
+
+        index = LittleLong(index);
+        ArchiveData(ARC_ObjectPointer, &index, sizeof(index));
+    }
 }
 
-void Archiver::ArchiveSafePointer
-(
-SafePtrBase * ptr
-)
+void Archiver::ArchiveSafePointer(SafePtrBase *ptr)
 {
-	int index = 0;
+    int index = 0;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		pointer_fixup_t *fixup;
+    if (archivemode == ARCHIVE_READ) {
+        pointer_fixup_t *fixup;
 
-		ArchiveData( ARC_SafePointer, &index, sizeof( index ) );
+        ArchiveData(ARC_SafePointer, &index, sizeof(index));
+        index = LittleLong(index);
 
-		// Check for a NULL pointer
-		assert( ptr );
-		if( !ptr )
-		{
-			FileError( "NULL pointer in ReadSafePointer." );
-		}
+        //
+        // see if the variable was NULL
+        //
+        if (index == ARCHIVE_NULL_POINTER) {
+            ptr->InitSafePtr(NULL);
+        } else {
+            // init the pointer with NULL until we can fix it
+            ptr->InitSafePtr(NULL);
 
-		//
-		// see if the variable was NULL
-		//
-		if( index == ARCHIVE_NULL_POINTER )
-		{
-			ptr->InitSafePtr( NULL );
-		}
-		else
-		{
-			// init the pointer with NULL until we can fix it
-			ptr->InitSafePtr( NULL );
+            // Add new fixup
+            fixup        = new pointer_fixup_t;
+            fixup->ptr   = (void **)ptr;
+            fixup->index = index;
+            fixup->type  = pointer_fixup_safe;
+            fixupList.AddObject(fixup);
+        }
+    } else {
+        if (ptr->Pointer()) {
+            Class *obj;
 
-			// Add new fixup
-			fixup = new pointer_fixup_t;
-			fixup->ptr = ( void ** )ptr;
-			fixup->index = index;
-			fixup->type = pointer_fixup_safe;
-			fixupList.AddObject( fixup );
-		}
-	}
-	else
-	{
-		if( ptr->Pointer() )
-		{
-			Class * obj;
-
-			obj = ptr->Pointer();
-			index = classpointerList.AddUniqueObject( obj );
-		}
-		else
-		{
-			index = ARCHIVE_NULL_POINTER;
-		}
-		ArchiveData( ARC_SafePointer, &index, sizeof( index ) );
-	}
+            obj   = ptr->Pointer();
+            index = classpointerList.AddUniqueObject(obj);
+        } else {
+            index = ARCHIVE_NULL_POINTER;
+        }
+        index = LittleLong(index);
+        ArchiveData(ARC_SafePointer, &index, sizeof(index));
+    }
 }
 
-void Archiver::ArchiveEventPointer
-(
-Event ** ev
-)
+void Archiver::ArchiveEventPointer(Event **ev)
 {
-	int index;
-
-	if( archivemode == ARCHIVE_READ )
-	{
-#ifndef NDEBUG
-		CheckRead();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-		CheckType( ARC_EventPointer );
-#endif
-		ArchiveInteger( &index );
-
-		if( !fileerror )
-		{
-			if( index == ARCHIVE_POINTER_VALID )
-			{
-				*ev = new Event;
-				( *ev )->Archive( *this );
-			}
-			else
-			{
-				( *ev ) = NULL;
-			}
-		}
-	}
-	else
-	{
-#ifndef NDEBUG
-		CheckWrite();
-#endif
-		if( *ev )
-		{
-			index = ARCHIVE_POINTER_VALID;
-		}
-		else
-		{
-			index = ARCHIVE_NULL_POINTER;
-		}
+    int index;
 
 #ifdef ARCHIVE_USE_TYPES
-		WriteType( ARC_EventPointer );
+    CheckType(ARC_EventPointer);
 #endif
 
-		ArchiveInteger( &index );
-		if( *ev )
-		{
-			( *ev )->Archive( *this );
-		}
-	}
+    if (archivemode == ARCHIVE_READ) {
+#ifndef NDEBUG
+        CheckRead();
+#endif
+        ArchiveInteger(&index);
+
+        if (!fileerror) {
+            if (index == ARCHIVE_POINTER_VALID) {
+                *ev = new Event;
+                (*ev)->Archive(*this);
+            } else {
+                (*ev) = NULL;
+            }
+        }
+    } else {
+#ifndef NDEBUG
+        CheckWrite();
+#endif
+        if (*ev) {
+            index = ARCHIVE_POINTER_VALID;
+        } else {
+            index = ARCHIVE_NULL_POINTER;
+        }
+
+        ArchiveInteger(&index);
+        if (*ev) {
+            (*ev)->Archive(*this);
+        }
+    }
 }
 
-void Archiver::ArchiveRaw
-(
-void *data,
-size_t size
-)
+void Archiver::ArchiveRaw(void *data, size_t size)
 {
-	ArchiveData( ARC_Raw, data, size );
+    ArchiveData(ARC_Raw, data, size);
 }
 
-void Archiver::ArchiveString
-(
-str * string
-)
+void Archiver::ArchiveString(str *string)
 {
-	if( archivemode == ARCHIVE_READ )
-	{
-		fileSize_t	s;
-		char		*data;
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(ARC_String);
+#endif
+
+    if (archivemode == ARCHIVE_READ) {
+        fileSize_t s;
+        char      *data;
 
 #ifndef NDEBUG
-		CheckRead();
-#endif
-#ifdef ARCHIVE_USE_TYPES
-		CheckType( ARC_String );
+        CheckRead();
 #endif
+        if (!fileerror) {
+            s = ReadSize();
+            if (!fileerror) {
+                data = new char[s + 1];
+                if (data) {
+                    if (s) {
+                        archivefile.Read(data, s);
+                    }
+                    data[s] = 0;
 
-		if( !fileerror )
-		{
-			s = ReadSize();
-			if( !fileerror )
-			{
-				data = new char[ s + 1 ];
-				if( data )
-				{
-					if( s )
-					{
-						readfile.Read( data, s );
-					}
-					data[ s ] = 0;
+                    *string = data;
 
-					*string = data;
-
-					delete[] data;
-				}
-			}
-		}
-	}
-	else
-	{
+                    delete[] data;
+                }
+            }
+        }
+    } else {
 #ifndef NDEBUG
-		CheckWrite();
+        CheckWrite();
 #endif
-#ifdef ARCHIVE_USE_TYPES
-		WriteType( ARC_String );
-#endif
-		WriteSize( (fileSize_t)string->length() );
-		glbs.FS_Write( ( void * )string->c_str(), string->length(), file );
-	}
+        WriteSize(string->length());
+        archivefile.Write(string->c_str(), string->length());
+    }
 }
 
-void Archiver::ArchiveConfigString( int cs )
+Class *Archiver::ReadObject(void)
 {
-#ifdef GAME_DLL
-	str s;
+    ClassDef *cls;
+    Class    *obj;
+    str       classname;
+    size_t    objstart;
+    size_t    endpos;
+    int       index;
+    size_t    size;
+    qboolean  isent;
+    int       type;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		ArchiveString( &s );
-		glbs.setConfigstring( cs, s.c_str() );
-	}
-	else
-	{
-		s = glbs.getConfigstring( cs );
-		ArchiveString( &s );
-	}
-#endif
-}
+    CheckRead();
 
-Class * Archiver::ReadObject
-	(
-	void
-	)
-{
-	ClassDef	*cls;
-	Class		*obj;
-	str		classname;
-	size_t		objstart;
-	size_t		endpos;
-	int      index;
-	size_t	size;
-	qboolean isent;
-	int      type;
+    type = ReadType();
+    if ((type != ARC_Object) && (type != ARC_Entity)) {
+        FileError("Expecting %s or %s", typenames[ARC_Object], typenames[ARC_Entity]);
+    }
 
-	CheckRead();
+    size = ReadSize();
+    ArchiveString(&classname);
 
-	type = ReadType();
-	if( ( type != ARC_Object ) && ( type != ARC_Entity ) )
-	{
-		FileError( "Expecting %s or %s", typenames[ ARC_Object ], typenames[ ARC_Entity ] );
-	}
+    cls = getClass(classname.c_str());
+    if (!cls) {
+        FileError("Invalid class %s.", classname.c_str());
+    }
 
-	size = ReadSize();
-	ArchiveString( &classname );
+#if defined(GAME_DLL)
+    isent = checkInheritance(&Entity::ClassInfo, cls);
+    if (type == ARC_Entity) {
+        if (!isent) {
+            FileError("Non-Entity class object '%s' saved as an Entity based object.", classname.c_str());
+        }
 
-	cls = getClass( classname.c_str() );
-	if( !cls )
-	{
-		FileError( "Invalid class %s.", classname.c_str() );
-	}
-
-#if defined ( GAME_DLL )
-	isent = checkInheritance( &Entity::ClassInfo, cls );
-	if( type == ARC_Entity )
-	{
-		if( !isent )
-		{
-			FileError( "Non-Entity class object '%s' saved as an Entity based object.", classname.c_str() );
-		}
-
-		ArchiveInteger( &level.spawn_entnum );
-		//
-		// make sure to setup spawnflags properly
-		//
-		ArchiveInteger( &level.spawnflags );
-	}
-	else if( isent )
-	{
-		FileError( "Entity class object '%s' saved as non-Entity based object.", classname.c_str() );
-	}
+        ArchiveInteger(&level.spawn_entnum);
+        //
+        // make sure to setup spawnflags properly
+        //
+        ArchiveInteger(&level.spawnflags);
+    } else if (isent) {
+        FileError("Entity class object '%s' saved as non-Entity based object.", classname.c_str());
+    }
 #else
-	isent = false;
+    isent = false;
 #endif
 
-	ArchiveInteger( &index );
-	objstart = readfile.Pos();
+    ArchiveInteger(&index);
+    objstart = archivefile.Pos();
 
+    obj = (Class *)cls->newInstance();
+    if (!obj) {
+        FileError("Failed to on new instance of class %s.", classname.c_str());
+    } else {
+        obj->Archive(*this);
+    }
 
-	obj = ( Class * )cls->newInstance();
-	if( !obj )
-	{
-		FileError( "Failed to on new instance of class %s.", classname.c_str() );
-	}
-	else
-	{
-		obj->Archive( *this );
-	}
+    if (!fileerror) {
+        endpos = archivefile.Pos();
+        if ((endpos - objstart) > size) {
+            FileError("Object read past end of object's data");
+        } else if ((endpos - objstart) < size) {
+            FileError("Object didn't read entire data from file");
+        }
+    }
 
-	if( !fileerror )
-	{
-		endpos = readfile.Pos();
-		if( ( endpos - objstart ) > size )
-		{
-			FileError( "Object read past end of object's data" );
-		}
-		else if( ( endpos - objstart ) < size )
-		{
-			FileError( "Object didn't read entire data from file" );
-		}
-	}
+    //
+    // register this pointer with our list
+    //
+    classpointerList.AddObjectAt(index, obj);
 
-	//
-	// register this pointer with our list
-	//
-	classpointerList.AddObjectAt( index, obj );
-
-	return obj;
+    return obj;
 }
 
-void Archiver::ArchiveObject
-	(
-	Class *obj
-	)
+void Archiver::ArchiveObject(Class *obj)
 {
-	str		classname;
-	int      index;
-	fileSize_t	size;
-	qboolean isent;
+    str        classname;
+    int        index;
+    fileSize_t size;
+    qboolean   isent;
 
-	if( archivemode == ARCHIVE_READ )
-	{
-		ClassDef	*cls;
-		size_t		objstart;
-		size_t		endpos;
-		int      type;
+    if (archivemode == ARCHIVE_READ) {
+        ClassDef *cls;
+        size_t    objstart;
+        size_t    endpos;
+        int       type;
 
-		CheckRead();
-		type = ReadType();
-		if( ( type != ARC_Object ) && ( type != ARC_Entity ) )
-		{
-			FileError( "Expecting %s or %s", typenames[ ARC_Object ], typenames[ ARC_Entity ] );
-		}
+        CheckRead();
+        type = ReadType();
+        if ((type != ARC_Object) && (type != ARC_Entity)) {
+            FileError("Expecting %s or %s", typenames[ARC_Object], typenames[ARC_Entity]);
+        }
 
-		size = ReadSize();
-		ArchiveString( &classname );
+        size = ReadSize();
+        ArchiveString(&classname);
 
-		cls = getClass( classname.c_str() );
-		if( !cls )
-		{
-			FileError( "Invalid class %s.", classname.c_str() );
-		}
+        cls = getClass(classname.c_str());
+        if (!cls) {
+            FileError("Invalid class %s.", classname.c_str());
+        }
 
-		if( obj->classinfo() != cls )
-		{
-			FileError( "Archive has a '%s' object, but was expecting a '%s' object.", classname.c_str(), obj->getClassname() );
-		}
+        if (obj->classinfo() != cls) {
+            FileError(
+                "Archive has a '%s' object, but was expecting a '%s' object.", classname.c_str(), obj->getClassname()
+            );
+        }
 
-#if defined ( GAME_DLL )
-		isent = obj->isSubclassOf( Entity );
-		if( type == ARC_Entity )
-		{
-			int entnum;
-			if( !isent )
-			{
-				FileError( "Non-Entity class object '%s' saved as an Entity based object.", classname.c_str() );
-			}
+#if defined(GAME_DLL)
+        isent = obj->isSubclassOf(Entity);
+        if (type == ARC_Entity) {
+            int entnum;
+            if (!isent) {
+                FileError("Non-Entity class object '%s' saved as an Entity based object.", classname.c_str());
+            }
 
-			ArchiveInteger( &entnum );
-			( ( Entity * )obj )->entnum = entnum;
-			//
-			// make sure to setup spawnflags properly
-			//
-			ArchiveInteger( &level.spawnflags );
-		}
-		else if( isent )
-		{
-			FileError( "Entity class object '%s' saved as non-Entity based object.", classname.c_str() );
-		}
+            ArchiveInteger(&entnum);
+            ((Entity *)obj)->entnum = entnum;
+            //
+            // make sure to setup spawnflags properly
+            //
+            ArchiveInteger(&level.spawnflags);
+        } else if (isent) {
+            FileError("Entity class object '%s' saved as non-Entity based object.", classname.c_str());
+        }
 #else
-		isent = false;
+        isent = false;
 #endif
 
-		ArchiveInteger( &index );
-		objstart = readfile.Pos();
+        ArchiveInteger(&index);
+        objstart = archivefile.Pos();
 
-		obj->Archive( *this );
+        obj->Archive(*this);
 
-		if( !fileerror )
-		{
-			endpos = readfile.Pos();
-			if( ( endpos - objstart ) > size )
-			{
-				FileError( "Object read past end of object's data" );
-			}
-			else if( ( endpos - objstart ) < size )
-			{
-				FileError( "Object didn't read entire data from file" );
-			}
-		}
+        if (!fileerror) {
+            endpos = archivefile.Pos();
+            if ((endpos - objstart) > size) {
+                FileError("Object read past end of object's data");
+            } else if ((endpos - objstart) < size) {
+                FileError("Object didn't read entire data from file");
+            }
+        }
 
-		//
-		// register this pointer with our list
-		//
-		classpointerList.AddObjectAt( index, obj );
-	}
-	else
-	{
-		long		sizepos;
-		long		objstart = 0;
-		long		endpos;
+        //
+        // register this pointer with our list
+        //
+        classpointerList.AddObjectAt(index, obj);
+    } else {
+        long sizepos;
+        long objstart = 0;
+        long endpos;
 
-		assert( obj );
-		if( !obj )
-		{
-			FileError( "NULL object in WriteObject" );
-		}
+        assert(obj);
+        if (!obj) {
+            FileError("NULL object in WriteObject");
+        }
 
-#if defined ( GAME_DLL )
-		isent = obj->isSubclassOf( Entity );
+#if defined(GAME_DLL)
+        isent = obj->isSubclassOf(Entity);
 #else
-		isent = false;
+        isent = false;
 #endif
 
-		CheckWrite();
-		if( isent )
-		{
-			WriteType( ARC_Entity );
-		}
-		else
-		{
-			WriteType( ARC_Object );
-		}
+        CheckWrite();
+        if (isent) {
+            WriteType(ARC_Entity);
+        } else {
+            WriteType(ARC_Object);
+        }
 
-		sizepos = glbs.FS_Tell( file );
-		size = 0;
-		WriteSize( size );
+        sizepos = archivefile.Tell();
+        size    = 0;
+        WriteSize(size);
 
-		classname = obj->getClassname();
-		ArchiveString( &classname );
+        classname = obj->getClassname();
+        ArchiveString(&classname);
 
-#if defined ( GAME_DLL )
-		if( isent )
-		{
-			// Write out the entity number
-			ArchiveInteger( &( ( Entity * )obj )->entnum );
-			//
-			// make sure to setup spawnflags properly
-			//
-			ArchiveInteger( &( ( Entity * )obj )->spawnflags );
-		}
+#if defined(GAME_DLL)
+        if (isent) {
+            // Write out the entity number
+            ArchiveInteger(&((Entity *)obj)->entnum);
+            //
+            // make sure to setup spawnflags properly
+            //
+            ArchiveInteger(&((Entity *)obj)->spawnflags);
+        }
 #endif
 
-		// write out pointer index for this class pointer
-		index = classpointerList.AddUniqueObject( obj );
-		ArchiveInteger( &index );
+        // write out pointer index for this class pointer
+        index = classpointerList.AddUniqueObject(obj);
+        ArchiveInteger(&index);
 
-		if( !fileerror )
-		{
-			objstart = glbs.FS_Tell( file );
-			obj->Archive( *this );
-		}
+        if (!fileerror) {
+            objstart = archivefile.Tell();
+            obj->Archive(*this);
+        }
 
-		if( !fileerror )
-		{
-			endpos = glbs.FS_Tell( file );
-			size = endpos - objstart;
-			glbs.FS_Seek( file, sizepos, FS_SEEK_SET );
-			WriteSize( size );
+        if (!fileerror) {
+            endpos = archivefile.Tell();
+            size   = endpos - objstart;
+            archivefile.Seek(sizepos);
+            WriteSize(size);
 
-			if( !fileerror )
-			{
-				glbs.FS_Seek( file, endpos, FS_SEEK_SET );
-			}
-		}
-	}
+            if (!fileerror) {
+                archivefile.Seek(archivefile.Length());
+            }
+        }
+    }
 }
 
-qboolean Archiver::ObjectPositionExists( void *obj )
+void Archiver::ArchiveObject(SafePtrBase* obj)
 {
-	return classpointerList.IndexOfObject( ( Class * )obj ) != 0;
+    ArchiveSafePointer(obj);
 }
 
-void Archiver::SetSilent( bool bSilent )
+void Archiver::ArchiveObjectPosition(LightClass *obj)
 {
-	silent = bSilent;
+    int index = 0;
+
+    if (archivemode == ARCHIVE_READ) {
+        ArchivePosition(&index);
+        classpointerList.AddObjectAt(index, (Class *)obj);
+    } else {
+        index = classpointerList.AddUniqueObject((Class *)obj);
+        ArchivePosition(&index);
+    }
+}
+
+qboolean Archiver::ObjectPositionExists(void *obj)
+{
+    return classpointerList.IndexOfObject((Class *)obj) != 0;
+}
+
+void Archiver::CheckRead(void)
+{
+    assert(archivemode == ARCHIVE_READ);
+    if (!fileerror && (archivemode != ARCHIVE_READ)) {
+        FileError("File read during a write operation.");
+    }
+}
+
+void Archiver::CheckWrite(void)
+{
+    assert(archivemode == ARCHIVE_WRITE);
+    if (!fileerror && (archivemode != ARCHIVE_WRITE)) {
+        FileError("File write during a read operation.");
+    }
+}
+
+qboolean Archiver::Read(str& name, qboolean harderror)
+{
+    return Read(name.c_str(), harderror);
+}
+
+qboolean Archiver::Create(str& name, qboolean harderror)
+{
+    return Create(name.c_str(), harderror);
+}
+
+qboolean Archiver::Loading(void)
+{
+    return (archivemode == ARCHIVE_READ) ? qtrue : qfalse;
+}
+
+qboolean Archiver::Saving(void)
+{
+    return (archivemode == ARCHIVE_WRITE) ? qtrue : qfalse;
+}
+
+qboolean Archiver::NoErrors(void)
+{
+    return fileerror ? qfalse : qtrue;
+}
+
+size_t Archiver::Counter() const
+{
+    return m_iNumBytesIO;
+}
+
+void Archiver::Reset()
+{
+    m_iNumBytesIO = 0;
+}
+
+fileSize_t Archiver::ReadSize(void)
+{
+    fileSize_t s;
+
+    s = 0;
+    if (!fileerror) {
+        archivefile.Read(&s, sizeof(s));
+        LittleSwap(&s, sizeof(s));
+    }
+
+    return s;
+}
+
+void Archiver::CheckSize(int type, fileSize_t size)
+{
+    fileSize_t s;
+
+    if (!fileerror) {
+        s = ReadSize();
+
+        if (size != s) {
+            FileError("Invalid data size of %d on %s.", s, typenames[type]);
+        }
+    }
+}
+
+void Archiver::WriteSize(fileSize_t size)
+{
+    LittleSwap(&size, sizeof(size));
+    archivefile.Write(&size, sizeof(fileSize_t));
+}
+
+int Archiver::ReadType(void)
+{
+    int t;
+
+    if (!fileerror) {
+        archivefile.Read(&t, sizeof(t));
+        t = LittleLong(t);
+
+        return t;
+    }
+
+    return ARC_NULL;
+}
+
+void Archiver::WriteType(int type)
+{
+    int nt = LittleLong(type);
+    archivefile.Write(&nt, sizeof(nt));
+}
+
+void Archiver::CheckType(int type)
+{
+    int t;
+
+    assert((type >= 0) && (type < ARC_NUMTYPES));
+
+    if (archivemode == ARCHIVE_READ) {
+        if (!fileerror) {
+            t = ReadType();
+            if (t != type) {
+                if (t < ARC_NUMTYPES) {
+                    FileError("Expecting %s, Should be %s", typenames[type], typenames[t]);
+                    assert(0);
+                }
+                else {
+                    FileError("Expecting %s, Should be %i (Unknown type)", typenames[type], t);
+                }
+            }
+        }
+    } else {
+        WriteType(type);
+    }
+}
+
+void Archiver::ArchiveData(int type, void *data, size_t size)
+{
+#ifdef ARCHIVE_USE_TYPES
+    CheckType(type);
+#endif
+
+    if (archivemode == ARCHIVE_READ) {
+#ifndef NDEBUG
+        CheckRead();
+#endif
+        if (!fileerror && size) {
+            m_iNumBytesIO += size;
+            archivefile.Read(data, size);
+        }
+    } else {
+#ifndef NDEBUG
+        CheckWrite();
+#endif
+
+        if (!fileerror && size) {
+            m_iNumBytesIO += size;
+            archivefile.Write(data, size);
+        }
+    }
+}
+
+void Archiver::ArchiveConfigString(int cs)
+{
+    str s;
+
+    if (archivemode == ARCHIVE_READ) {
+        ArchiveString(&s);
+        gi.setConfigstring(cs, s.c_str());
+    } else {
+        s = gi.getConfigstring(cs);
+        ArchiveString(&s);
+    }
+}
+
+void Archiver::SetSilent(bool bSilent)
+{
+    silent = bSilent;
 }
diff --git a/code/fgame/archive.h b/code/fgame/archive.h
index 39e7ad2e..0e584fd8 100644
--- a/code/fgame/archive.h
+++ b/code/fgame/archive.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,390 +22,329 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // archive.h: OpenMoHAA Archiver
 
-#ifndef __ARCHIVE_H__
-#define __ARCHIVE_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
 #include "str.h"
 #include "vector.h"
 
-#define ARCHIVE_NULL_POINTER ( -654321 )
-#define ARCHIVE_POINTER_VALID ( 0 )
-#define ARCHIVE_POINTER_NULL ( ARCHIVE_NULL_POINTER )
-#define ARCHIVE_POINTER_SELF_REFERENTIAL ( -123456 )
+#define ARCHIVE_NULL_POINTER             (-654321)
+#define ARCHIVE_POINTER_VALID            (0)
+#define ARCHIVE_POINTER_NULL             (ARCHIVE_NULL_POINTER)
+#define ARCHIVE_POINTER_SELF_REFERENTIAL (-123456)
 #define ARCHIVE_USE_TYPES
 
-#define ARCHIVE_WRITE 0
-#define ARCHIVE_READ  1
+typedef enum {
+    ARCHIVE_NONE,
+    ARCHIVE_WRITE,
+    ARCHIVE_READ
+} archivemode_e;
 
-enum
-{
-	pointer_fixup_normal,
-	pointer_fixup_safe
+enum {
+    pointer_fixup_ptr,
+    pointer_fixup_normal,
+    pointer_fixup_safe
 };
 
-typedef struct
-{
-	void **ptr;
-	int  index;
-	int  type;
+typedef struct {
+    void **ptr;
+    int    index;
+    int    type;
 } pointer_fixup_t;
 
 using fileSize_t = uint32_t;
 
-class FileRead : public Class
+class ArchiveFile
 {
 protected:
-	str				filename;
-	size_t         length;
-	byte           *buffer;
-	byte           *pos;
+    str    filename;
+    size_t length;
+    byte  *buffer;
+    byte  *pos;
+    size_t bufferlength;
+    bool   writing;
+    bool   opened;
 
 public:
-	CLASS_PROTOTYPE( FileRead );
-
-	FileRead();
-	~FileRead();
-	void				Close( bool bDoCompression = false );
-	const char     *Filename( void );
-	size_t         Length( void );
-	size_t         Pos( void );
-	qboolean       Seek( size_t newpos );
-	qboolean       Open( const char *name );
-	qboolean       Read( void *dest, size_t size );
+    ArchiveFile();
+    ~ArchiveFile();
+    void        Close();
+    const char *Filename(void);
+    qboolean    Compress();
+    size_t      Length(void);
+    size_t      Pos(void);
+    size_t      Tell(void);
+    qboolean    Seek(size_t newpos);
+    qboolean    OpenRead(const char *name);
+    qboolean    OpenWrite(const char *name);
+    qboolean    Read(void *dest, size_t size);
+    qboolean    Write(const void *source, size_t size);
 };
 
-class Archiver : public Class
+class Archiver
 {
 private:
-	Container<Class *>				classpointerList;
-	Container<pointer_fixup_t *>	fixupList;
+    Container<LightClass *>      classpointerList;
+    Container<pointer_fixup_t *> fixupList;
 
 protected:
-	str					filename;
-	qboolean			fileerror;
-	fileHandle_t		file;
-	FileRead			readfile;
-	int					archivemode;
-	int					numclassespos;
-	qboolean			harderror;
-	size_t				m_iNumBytesIO;
-	qboolean			silent;
+    str         filename;
+    qboolean    fileerror;
+    ArchiveFile archivefile;
+    int         archivemode;
+    int         numclassespos;
+    qboolean    harderror;
+    size_t      m_iNumBytesIO;
+    qboolean    silent;
 
-	void				CheckRead( void );
-	void				CheckType( int type );
-	int            ReadType( void );
-	fileSize_t			ReadSize( void );
-	void				CheckSize( int type, fileSize_t size );
-	void				ArchiveData( int type, void *data, size_t size );
+    void       CheckRead(void);
+    void       CheckType(int type);
+    int        ReadType(void);
+    fileSize_t ReadSize(void);
+    void       CheckSize(int type, fileSize_t size);
+    void       ArchiveData(int type, void *data, size_t size);
 
-	void				CheckWrite( void );
-	void				WriteType( int type );
-	void				WriteSize(fileSize_t size );
+    void CheckWrite(void);
+    void WriteType(int type);
+    void WriteSize(fileSize_t size);
 
 public:
-	CLASS_PROTOTYPE( Archiver );
+    Archiver();
+    ~Archiver();
+    void FileError(const char *fmt, ...);
+    void Close(void);
 
-	Archiver();
-	~Archiver();
-	void				FileError( const char *fmt, ... );
-	void				Close( void );
+    qboolean Read(str& name, qboolean harderror = qtrue);
+    qboolean Read(const char *name, qboolean harderror = qtrue);
+    Class   *ReadObject(void);
 
-	qboolean       Read( str &name, qboolean harderror = qtrue );
-	qboolean       Read( const char *name, qboolean harderror = qtrue );
-	Class				*ReadObject( void );
+    qboolean Create(str& name, qboolean harderror = qtrue);
+    qboolean Create(const char *name, qboolean harderror = qtrue);
 
-	qboolean       Create( str &name, qboolean harderror = qtrue );
-	qboolean       Create( const char *name, qboolean harderror = qtrue );
+    qboolean Loading(void);
+    qboolean Saving(void);
+    qboolean NoErrors(void);
 
-	qboolean       Loading( void );
-	qboolean       Saving( void );
-	qboolean       NoErrors( void );
+    void ArchiveVector(Vector *vec);
+    void ArchiveQuat(Quat *quat);
+    void ArchiveInteger(int *num);
+    void ArchiveUnsigned(unsigned *unum);
+    void ArchiveSize(long *unum);
+    void ArchiveByte(byte *num);
+    void ArchiveChar(char *ch);
+    void ArchiveShort(short *num);
+    void ArchiveUnsignedShort(unsigned short *num);
+    void ArchiveFloat(float *num);
+    void ArchiveDouble(double *num);
+    void ArchiveBoolean(qboolean *boolean);
+    void ArchiveString(str *string);
+    void ArchiveObjectPointer(LightClass **ptr);
+    void ArchiveObjectPointer(Class **ptr);
+    void ArchiveObjectPosition(LightClass *obj);
+    void ArchiveSafePointer(SafePtrBase *ptr);
+    void ArchiveEventPointer(Event **ev);
+    void ArchiveBool(bool *boolean);
+    void ArchivePosition(int *pos);
+    void ArchiveSvsTime(int *time);
+    void ArchiveVec2(vec2_t vec);
+    void ArchiveVec3(vec3_t vec);
+    void ArchiveVec4(vec4_t vec);
 
-	void  			ArchiveVector( Vector * vec );
-	void  			ArchiveQuat( Quat * quat );
-	void			ArchiveInteger( int * num );
-	void  			ArchiveUnsigned( unsigned * unum );
-	void  			ArchiveSize( long * unum );
-	void			ArchiveByte( byte * num );
-	void			ArchiveChar( char * ch );
-	void			ArchiveShort( short * num );
-	void			ArchiveUnsignedShort( unsigned short * num );
-	void			ArchiveFloat( float * num );
-	void			ArchiveDouble( double * num );
-	void  			ArchiveBoolean( qboolean * boolean );
-	void  			ArchiveString( str * string );
-	void			ArchiveConfigString( int cs );
-	void			ArchiveObjectPointer( Class ** ptr );
-	void			ArchiveObjectPosition( void *obj );
-	void			ArchiveSafePointer( SafePtrBase * ptr );
-	void			ArchiveEventPointer( Event ** ev );
-	void  			ArchiveBool( bool * boolean );
-	void			ArchivePosition( int * pos );
-	void			ArchiveSvsTime( int * time );
-	void  			ArchiveVec2( vec2_t vec );
-	void  			ArchiveVec3( vec3_t vec );
-	void  			ArchiveVec4( vec4_t vec );
+    void ArchiveRaw(void *data, size_t size);
+    void ArchiveObject(Class *obj);
+    void ArchiveObject(SafePtrBase *obj); // Added in OPM
 
-	void			ArchiveRaw( void *data, size_t size );
-	void			ArchiveObject( Class *obj );
+    qboolean ObjectPositionExists(void *obj);
 
-	qboolean		ObjectPositionExists( void * obj );
-
-	void			SetSilent( bool bSilent );
+    void   Reset();
+    size_t Counter() const;
 
+    void ArchiveConfigString(int cs);
+    void SetSilent(bool bSilent);
 };
 
-inline qboolean Archiver::Read
-(
-str &name,
-qboolean harderror
-)
+template<class Type>
+inline void Container<Type>::Archive(Archiver& arc, void (*ArchiveFunc)(Archiver& arc, Type *obj))
 {
-	return Read( name.c_str(), harderror );
-}
+    Type *obj;
+    int   num;
+    int   i;
 
-inline qboolean Archiver::Create
-(
-str &name,
-qboolean harderror
-)
-{
-	return Create( name.c_str(), harderror );
-}
+    if (arc.Loading()) {
+        arc.ArchiveInteger(&num);
+        Resize(num);
 
-inline qboolean Archiver::Loading
-(
-void
-)
-{
-	return (archivemode == ARCHIVE_READ) ? qtrue : qfalse;
-}
+        if (num > numobjects) {
+            numobjects = num;
+        }
 
-inline qboolean Archiver::Saving
-(
-void
-)
-{
-	return (archivemode == ARCHIVE_WRITE) ? qtrue : qfalse;
-}
+        for (i = 0; i < num; i++) {
+            obj = new (objlist + i) Type();
+            ArchiveFunc(arc, obj);
+        }
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
 
-inline qboolean Archiver::NoErrors
-(
-void
-)
-{
-	return fileerror ? qfalse : qtrue;
-}
-
-template< class Type >
-inline void Container<Type>::Archive
-	(
-	Archiver& arc,
-	void( *ArchiveFunc )( Archiver& arc, Type *obj )
-	)
-{
-	int num;
-	int i;
-
-	if( arc.Loading() )
-	{
-		arc.ArchiveInteger( &num );
-		Resize( num );
-	}
-	else
-	{
-		num = numobjects;
-		arc.ArchiveInteger( &num );
-	}
-
-	for( i = 1; i <= num; i++ )
-	{
-		if( num > numobjects ) {
-			numobjects = num;
-		}
-
-		ArchiveFunc( arc, &objlist[ i - 1 ] );
-	}
+        for (i = 0; i < num; i++) {
+            ArchiveFunc(arc, &objlist[i]);
+        }
+    }
 }
 
 template<>
-inline void Container<str>::Archive
-(
-Archiver &arc
-)
+inline void Container<str>::Archive(Archiver& arc)
 {
-	int i, num;
+    int i, num;
 
-	if( arc.Loading() )
-	{
-		ClearObjectList();
-		arc.ArchiveInteger( &num );
-		Resize( num );
-	}
-	else
-	{
-		num = numobjects;
-		arc.ArchiveInteger( &num );
-	}
-	for( i = 1; i <= num; i++ )
-	{
-		arc.ArchiveString( AddressOfObjectAt( i ) );
-	}
+    if (arc.Loading()) {
+        ClearObjectList();
+        arc.ArchiveInteger(&num);
+        Resize(num);
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+    }
+    for (i = 1; i <= num; i++) {
+        arc.ArchiveString(AddressOfObjectAt(i));
+    }
 }
 
 template<>
-inline void Container<Vector>::Archive
-(
-Archiver &arc
-)
+inline void Container<Vector>::Archive(Archiver& arc)
 {
-	int i, num;
+    int i, num;
 
-	if( arc.Loading() )
-	{
-		ClearObjectList();
-		arc.ArchiveInteger( &num );
-		Resize( num );
-	}
-	else
-	{
-		num = numobjects;
-		arc.ArchiveInteger( &num );
-	}
-	for( i = 1; i <= num; i++ )
-	{
-		arc.ArchiveVector( AddressOfObjectAt( i ) );
-	}
+    if (arc.Loading()) {
+        ClearObjectList();
+        arc.ArchiveInteger(&num);
+        Resize(num);
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+    }
+    for (i = 1; i <= num; i++) {
+        arc.ArchiveVector(AddressOfObjectAt(i));
+    }
 }
 
 template<>
-inline void Container<int>::Archive
-(
-Archiver &arc
-)
+inline void Container<int>::Archive(Archiver& arc)
 {
-	int i, num;
+    int i, num;
 
-	if( arc.Loading() )
-	{
-		ClearObjectList();
-		arc.ArchiveInteger( &num );
-		Resize( num );
-	}
-	else
-	{
-		num = numobjects;
-		arc.ArchiveInteger( &num );
-	}
-	for( i = 1; i <= num; i++ )
-	{
-		arc.ArchiveInteger( AddressOfObjectAt( i ) );
-	}
+    if (arc.Loading()) {
+        ClearObjectList();
+        arc.ArchiveInteger(&num);
+        Resize(num);
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+    }
+    for (i = 1; i <= num; i++) {
+        arc.ArchiveInteger(AddressOfObjectAt(i));
+    }
 }
 
 template<>
-inline void Container<float>::Archive
-(
-Archiver &arc
-)
+inline void Container<float>::Archive(Archiver& arc)
 {
-	int i, num;
+    int i, num;
 
-	if( arc.Loading() )
-	{
-		ClearObjectList();
-		arc.ArchiveInteger( &num );
-		Resize( num );
-	}
-	else
-	{
-		num = numobjects;
-		arc.ArchiveInteger( &num );
-	}
-	for( i = 1; i <= num; i++ )
-	{
-		arc.ArchiveFloat( AddressOfObjectAt( i ) );
-	}
+    if (arc.Loading()) {
+        ClearObjectList();
+        arc.ArchiveInteger(&num);
+        Resize(num);
+    } else {
+        num = numobjects;
+        arc.ArchiveInteger(&num);
+    }
+    for (i = 1; i <= num; i++) {
+        arc.ArchiveFloat(AddressOfObjectAt(i));
+    }
 }
 
-template< typename c >
-inline void ArchiveClass
-	(
-	Archiver& arc,
-	c *obj
-	)
+template<typename c>
+inline void ArchiveClass(Archiver& arc, c *obj)
 {
-	arc.ArchiveObject( obj );
+    arc.ArchiveObject(obj);
+}
+
+template<typename Type>
+void Container<Type>::Archive(Archiver& arc)
+{
+    Archive(arc, ArchiveClass<Type>);
 }
 
 #ifndef NO_ARCHIVE
 
-template< typename key, typename value >
-void con_set< key, value >::Archive
-	(
-	Archiver& arc
-	)
+template<typename key, typename value>
+void con_set<key, value>::Archive(Archiver& arc)
 {
-	Entry *e;
-	int hash;
-	int i;
+    Entry *e = NULL;
+    int    hash;
+    int    i;
 
-	arc.ArchiveUnsigned( &tableLength );
-	arc.ArchiveUnsigned( &threshold );
-	arc.ArchiveUnsigned( &count );
-	arc.ArchiveUnsignedShort( &tableLengthIndex );
+    arc.ArchiveUnsigned(&tableLength);
+    arc.ArchiveUnsigned(&threshold);
+    arc.ArchiveUnsigned(&count);
+    arc.ArchiveUnsignedShort(&tableLengthIndex);
 
-	if( arc.Loading() )
-	{
-		if( tableLength != 1 )
-		{
-			table = new Entry *[ tableLength ]();
-			memset( table, 0, tableLength * sizeof( Entry * ) );
-		}
+    if (arc.Loading()) {
+        if (tableLength != 1) {
+            table = new (NewTable(tableLength)) Entry *[tableLength]();
+            memset(table, 0, tableLength * sizeof(Entry *));
+        }
 
-		for( i = 0; i < count; i++ )
-		{
-			e = new Entry;
-			e->Archive( arc );
+        for (i = 0; i < count; i++) {
+            e = new Entry;
+            e->Archive(arc);
 
-			hash = HashCode< key >( e->key ) % tableLength;
+            hash = HashCode<key>(e->GetKey()) % tableLength;
 
-			e->next = table[ hash ];
-			table[ hash ] = e;
-		}
-	}
-	else
-	{
-		for( i = tableLength - 1; i >= 0; i-- )
-		{
-			for( e = table[ i ]; e != NULL; e = e->next )
-			{
-				e->Archive( arc );
-			}
-		}
-	}
+            e->next     = table[hash];
+            table[hash] = e;
+        }
+
+        defaultEntry = e;
+    } else {
+#    ifndef NDEBUG
+        int total;
+
+        total = 0;
+
+        for (i = 0; i < tableLength; i++) {
+            for (e = table[i]; e != NULL; e = e->next) {
+                e->Archive(arc);
+                total++;
+            }
+        }
+        // it must match the number of elements
+        assert(total == count);
+#    else
+        for (i = 0; i < tableLength; i++) {
+            for (e = table[i]; e != NULL; e = e->next) {
+                e->Archive(arc);
+            }
+        }
+#    endif
+    }
 }
 
-template< typename key, typename value >
-void con_map< key, value >::Archive
-	(
-	Archiver& arc
-	)
+template<typename key, typename value>
+void con_map<key, value>::Archive(Archiver& arc)
 {
-	m_con_set.Archive( arc );
+    m_con_set.Archive(arc);
 }
 
 #endif
 
-#define ArchiveEnum( thing, type )  \
-   {                                \
-   int tempInt;                     \
-                                    \
-   tempInt = ( int )( thing );      \
-   arc.ArchiveInteger( &tempInt );  \
-   ( thing ) = ( type )tempInt;     \
-   } 
-
-#endif // __ARCHIVE_H__
+#define ArchiveEnum(thing, type)      \
+    {                                 \
+        int tempInt;                  \
+                                      \
+        tempInt = (int)(thing);       \
+        arc.ArchiveInteger(&tempInt); \
+        (thing) = (type)tempInt;      \
+    }
diff --git a/code/fgame/armor.h b/code/fgame/armor.h
index e1b97a5c..ee2f838e 100644
--- a/code/fgame/armor.h
+++ b/code/fgame/armor.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // armor.h: Standard armor that prevents a percentage of damage per hit. 
 
-#ifndef __ARMOR_H__
-#define __ARMOR_H__
+#pragma once
 
 #include "weapon.h" 
 
@@ -40,5 +39,3 @@ class Armor : public Item
 
       qboolean Pickupable( Entity *other ) override;
    };
-
-#endif /* armor.h */
diff --git a/code/fgame/barrels.cpp b/code/fgame/barrels.cpp
index e23a0096..7d85a04b 100644
--- a/code/fgame/barrels.cpp
+++ b/code/fgame/barrels.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 /*****************************************************************************
 /*QUAKED func_barrel (0 0.25 0.5) ? INDESTRUCTABLE
 Brush model barrel object
-Bashing only makes thunk or gong sounds (depending on wether it's full or not)
+Bashing only makes thunk or gong sounds (depending on whether it's full or not)
 Bullets and explosions effects are dependant apon the type of barrel.
 "barreltype" sets the type of barrel that it is. Valid settings are:
 - "water" makes the barrel be filled with water.
@@ -45,562 +45,444 @@ Does nothing special at all. It's just a poor empty barrel. aww :(
 ******************************************************************************/
 
 Event EV_Barrel_Think
-	(
+(
 	"_barrel_think",
 	EV_DEFAULT,
 	NULL,
 	NULL,
 	"think function for a barrel."
-	);
+);
 
 Event EV_Barrel_Setup
-	(
+(
 	"_barrel_setup",
 	EV_DEFAULT,
 	NULL,
 	NULL,
 	"Does the post spawn setup of the barrel"
-	);
+);
 
 Event EV_Barrel_SetType
-	(
+(
 	"barreltype",
 	EV_DEFAULT,
 	"s",
 	"type",
 	"Sets the barrel's type"
-	);
+);
 
-CLASS_DECLARATION( Entity, BarrelObject, "func_barrel" )
-{
-	{ &EV_Barrel_Setup,					&BarrelObject::BarrelSetup },
-	{ &EV_Barrel_Think,					&BarrelObject::BarrelThink },
-	{ &EV_Barrel_SetType,				&BarrelObject::BarrelSetType },
-	{ &EV_Damage,						&BarrelObject::BarrelDamaged },
-	{ &EV_Killed,						&BarrelObject::BarrelKilled },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, BarrelObject, "func_barrel") {
+    {&EV_Barrel_Setup,   &BarrelObject::BarrelSetup  },
+    {&EV_Barrel_Think,   &BarrelObject::BarrelThink  },
+    {&EV_Barrel_SetType, &BarrelObject::BarrelSetType},
+    {&EV_Damage,         &BarrelObject::BarrelDamaged},
+    {&EV_Killed,         &BarrelObject::BarrelKilled },
+    {NULL,               NULL                        }
 };
 
 BarrelObject::BarrelObject()
 {
+    AddWaitTill(STRING_DEATH);
 
-	AddWaitTill(STRING_DEATH);
+    if (LoadingSavegame) {
+        return;
+    }
 
-	if (LoadingSavegame)
-	{
-		return;
-	}
+    edict->s.eType = ET_GENERAL;
 
-	edict->s.eType = ET_GENERAL;
+    m_iBarrelType  = 0;
+    m_fFluidAmount = 0;
+    m_fHeightFluid = 0;
 
-	m_iBarrelType = 0;
-	m_fFluidAmount = 0;
-	m_fHeightFluid = 0;
+    for (int i = 0; i < MAX_BARREL_LEAKS; i++) {
+        m_bLeaksActive[i] = 0;
+    }
 
-	for( int i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		m_bLeaksActive[ i ] = 0;
-	}
+    m_fDamageSoundTime = 0;
+    mass               = 500;
+    max_health         = 75;
+    health             = 75;
+    deadflag           = DEAD_NO;
+    takedamage         = DAMAGE_YES;
+    m_vJitterAngles    = vec_zero;
 
-	m_fDamageSoundTime = 0;
-	mass = 500;
-	max_health = 75;
-	health = 75;
-	deadflag = DEAD_NO;
-	takedamage = DAMAGE_YES;
-	m_vJitterAngles = vec_zero;
-
-	PostEvent( EV_Barrel_Setup, EV_POSTSPAWN );
+    PostEvent(EV_Barrel_Setup, EV_POSTSPAWN);
 }
 
-int BarrelObject::PickBarrelLeak
-	(
-	void
-	)
+int BarrelObject::PickBarrelLeak(void)
 {
-	int iHighest;
-	float fHighestHeight;
+    int   iHighest;
+    float fHighestHeight;
 
-	for( int i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( !m_bLeaksActive[ i ] ) {
-			return i;
-		}
-	}
+    for (int i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (!m_bLeaksActive[i]) {
+            return i;
+        }
+    }
 
-	fHighestHeight = m_vLeaks[ 0 ][ 2 ];
-	iHighest = 0;
+    fHighestHeight = m_vLeaks[0][2];
+    iHighest       = 0;
 
-	for( int i = 1; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( m_vLeaks[ 0 ][ 2 ] > fHighestHeight )
-		{
-			fHighestHeight = m_vLeaks[ 0 ][ 2 ];
-			iHighest = i;
-		}
-	}
+    for (int i = 1; i < MAX_BARREL_LEAKS; i++) {
+        if (m_vLeaks[0][2] > fHighestHeight) {
+            fHighestHeight = m_vLeaks[0][2];
+            iHighest       = i;
+        }
+    }
 
-	return iHighest;
+    return iHighest;
 }
 
-void BarrelObject::BarrelSetup
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelSetup(Event *ev)
 {
-	setMoveType( MOVETYPE_PUSH );
-	setSolidType( SOLID_BSP );
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 
-	m_vStartAngles = angles;
-	m_fJitterScale = 64.0f / size[ 2 ];
+    m_vStartAngles = angles;
+    m_fJitterScale = 64.0f / size[2];
 
-	m_fFluidAmount = size[ 0 ] * size[ 1 ] * size[ 2 ] / 150.0f;
-	m_fHeightFluid = m_fFluidAmount / size[ 2 ];
+    m_fFluidAmount = size[0] * size[1] * size[2] / 150.0f;
+    m_fHeightFluid = m_fFluidAmount / size[2];
 
-	// Position the barrel correctly
-	CheckGround();
+    // Position the barrel correctly
+    CheckGround();
 }
 
-void BarrelObject::BarrelSetType
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelSetType(Event *ev)
 {
-	str sType = ev->GetString( 1 );
+    str sType = ev->GetString(1);
 
-	if( !sType.icmp( "oil" ) )
-	{
-		health = 75;
-		m_iBarrelType = BARREL_OIL;
+    if (!sType.icmp("oil")) {
+        health        = 75;
+        m_iBarrelType = BARREL_OIL;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-		CacheResource( "models/fx/barrel_oil_destroyed.tik" );
-	}
-	else if( !sType.icmp( "water" ) )
-	{
-		health = 75;
-		m_iBarrelType = BARREL_WATER;
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+        CacheResource("models/fx/barrel_oil_destroyed.tik");
+    } else if (!sType.icmp("water")) {
+        health        = 75;
+        m_iBarrelType = BARREL_WATER;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-		CacheResource( "models/fx/barrel_water_destroyed.tik" );
-	}
-	else if( !sType.icmp( "gas" ) )
-	{
-		spawnflags &= ~BARREL_INDESTRUCTABLE;
-		health = 75;
-		m_iBarrelType = BARREL_GAS;
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+        CacheResource("models/fx/barrel_water_destroyed.tik");
+    } else if (!sType.icmp("gas")) {
+        spawnflags &= ~BARREL_INDESTRUCTABLE;
+        health        = 75;
+        m_iBarrelType = BARREL_GAS;
 
-		CacheResource( "models/fx/barrel_gas_destroyed.tik" );
-	}
-	else
-	{
-		health = 75;
-		m_iBarrelType = BARREL_EMPTY;
+        CacheResource("models/fx/barrel_gas_destroyed.tik");
+    } else {
+        health        = 75;
+        m_iBarrelType = BARREL_EMPTY;
 
-		CacheResource( "models/fx/barrel_empty_destroyed.tik" );
-	}
+        CacheResource("models/fx/barrel_empty_destroyed.tik");
+    }
 
-	max_health = health;
+    max_health = health;
 }
 
-void BarrelObject::BarrelThink
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelThink(Event *ev)
 {
-	int i;
-	int iBiggestLeak;
-	float fFluidTop;
+    int   i;
+    int   iBiggestLeak;
+    float fFluidTop;
 
-	iBiggestLeak = 0;
+    iBiggestLeak = 0;
 
-	fFluidTop = m_fFluidAmount / m_fHeightFluid + ( mins[ 2 ] + origin[ 2 ] );
-	for( i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( !m_bLeaksActive[ i ] ) {
-			continue;
-		}
+    fFluidTop = m_fFluidAmount / m_fHeightFluid + (mins[2] + origin[2]);
+    for (i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (!m_bLeaksActive[i]) {
+            continue;
+        }
 
-		// Send infos to clients
-		if( m_vLeaks[ i ][ 2 ] <= fFluidTop )
-		{
-			gi.SetBroadcastVisible( m_vLeaks[ i ], m_vLeaks[ i ] );
+        // Send infos to clients
+        if (m_vLeaks[i][2] > fFluidTop) {
+            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
 
-			if( m_vLeaks[ i ][ 2 ] <= fFluidTop - 1.3f )
-			{
-				if( m_vLeaks[ i ][ 2 ] <= fFluidTop - 3.0f )
-				{
-					// big leak
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+            }
 
-					if( m_iBarrelType == BARREL_OIL )
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
-					}
-					else
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
-					}
+            gi.MSG_WriteCoord(m_vLeaks[i][0]);
+            gi.MSG_WriteCoord(m_vLeaks[i][1]);
+            gi.MSG_WriteCoord(m_vLeaks[i][2]);
+            gi.MSG_WriteDir(m_vLeakNorms[i]);
+            gi.MSG_EndCGM();
 
-					m_fFluidAmount -= 1.0f;
-					iBiggestLeak |= 4;
-				}
-				else
-				{
-					// medium leak
+            m_bLeaksActive[i] = qfalse;
+        } else {
+            gi.SetBroadcastVisible(m_vLeaks[i], m_vLeaks[i]);
 
-					if( m_iBarrelType == BARREL_OIL )
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
-					}
-					else
-					{
-						gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
-					}
+            if (m_vLeaks[i][2] > fFluidTop - 1.3f) {
+                // small leak
 
-					m_fFluidAmount -= 0.75f;
-					iBiggestLeak |= 2;
-				}
-			}
-			else
-			{
-				// small leak
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+                }
 
-				if( m_iBarrelType == BARREL_OIL )
-				{
-					gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-				}
-				else
-				{
-					gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-				}
+                m_fFluidAmount -= 0.5f;
+                iBiggestLeak |= 1;
+            } else if (m_vLeaks[i][2] > fFluidTop - 3.0f) {
+                // medium leak
 
-				m_fFluidAmount -= 0.5f;
-				iBiggestLeak |= 1;
-			}
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_2));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_6));
+                }
 
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 0 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 1 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 2 ] );
-			gi.MSG_WriteDir( m_vLeakNorms[ i ] );
-			gi.MSG_EndCGM();
-		}
-		else
-		{
-			gi.SetBroadcastVisible( m_vLeaks[ i ], m_vLeaks[ i ] );
+                m_fFluidAmount -= 0.75f;
+                iBiggestLeak |= 2;
+            } else {
+                // big leak
 
-			if( m_iBarrelType == BARREL_OIL )
-			{
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-			}
-			else
-			{
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-			}
+                if (m_iBarrelType == BARREL_OIL) {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_1));
+                } else {
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_5));
+                }
 
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 0 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 1 ] );
-			gi.MSG_WriteCoord( m_vLeaks[ i ][ 2 ] );
-			gi.MSG_WriteDir( m_vLeakNorms[ i ] );
-			gi.MSG_EndCGM();
+                m_fFluidAmount -= 1.0f;
+                iBiggestLeak |= 4;
+            }
 
-			m_bLeaksActive[ i ] = qfalse;
-		}
-	}
+            gi.MSG_WriteCoord(m_vLeaks[i][0]);
+            gi.MSG_WriteCoord(m_vLeaks[i][1]);
+            gi.MSG_WriteCoord(m_vLeaks[i][2]);
+            gi.MSG_WriteDir(m_vLeakNorms[i]);
+            gi.MSG_EndCGM();
+        }
+    }
 
-	if( m_vJitterAngles[ 0 ] == 0.0f && m_vJitterAngles[ 2 ] == 0.0f )
-	{
-		if( !VectorCompare( angles, m_vStartAngles ) )
-		{
-			setAngles( m_vStartAngles );
-		}
-	}
+    if (m_vJitterAngles[0] == 0.0f && m_vJitterAngles[2] == 0.0f) {
+        if (!VectorCompare(angles, m_vStartAngles)) {
+            setAngles(m_vStartAngles);
+        }
+    }
+    else {
+        Vector ang;
 
-	setAngles( Vector( m_vStartAngles[ 0 ] + m_vJitterAngles[ 0 ], m_vStartAngles[ 1 ], m_vStartAngles[ 2 ] + m_vJitterAngles[ 2 ] ) );
+        ang = m_vStartAngles;
+        ang[0] += m_vJitterAngles[0];
+        ang[2] += m_vJitterAngles[2];
+        setAngles(ang);
 
-	if( m_vJitterAngles[ 0 ] > 0.0f )
-	{
-		m_vJitterAngles[ 0 ] -= 1.f / 3.f * m_fJitterScale;
+        if (m_vJitterAngles[0] < 0) {
+            m_vJitterAngles[0] += 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 0 ] > 0.0f )
-		{
-			m_vJitterAngles[ 0 ] = 0.0f;
-		}
-	}
-	else if( m_vJitterAngles[ 0 ] < 0.0f )
-	{
-		m_vJitterAngles[ 0 ] += 1.f / 3.f * m_fJitterScale;
+            if (m_vJitterAngles[0] > 0) {
+                m_vJitterAngles[0] = 0;
+            }
+        } else if (m_vJitterAngles[0] > 0) {
+            m_vJitterAngles[0] -= 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 0 ] < 0.0f )
-		{
-			m_vJitterAngles[ 0 ] = 0.0f;
-		}
-	}
+            if (m_vJitterAngles[0] < 0) {
+                m_vJitterAngles[0] = 0;
+            }
+        }
 
-	m_vJitterAngles[ 0 ] = -m_vJitterAngles[ 0 ];
+        m_vJitterAngles[0] = -m_vJitterAngles[0];
 
-	if( m_vJitterAngles[ 2 ] > 0.0f )
-	{
-		m_vJitterAngles[ 2 ] -= 1.f / 3.f * m_fJitterScale;
+        if (m_vJitterAngles[2] < 0) {
+            m_vJitterAngles[2] += 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 2 ] > 0.0f )
-		{
-			m_vJitterAngles[ 2 ] = 0.0f;
-		}
-	}
-	else if( m_vJitterAngles[ 2 ] < 0.0f )
-	{
-		m_vJitterAngles[ 2 ] += 1.f / 3.f * m_fJitterScale;
+            if (m_vJitterAngles[2] > 0) {
+                m_vJitterAngles[2] = 0;
+            }
+        } else if (m_vJitterAngles[2] > 0) {
+            m_vJitterAngles[2] -= 1.f / 3.f * m_fJitterScale;
 
-		if( m_vJitterAngles[ 2 ] < 0.0f )
-		{
-			m_vJitterAngles[ 2 ] = 0.0f;
-		}
-	}
+            if (m_vJitterAngles[2] < 0) {
+                m_vJitterAngles[2] = 0;
+            }
+        }
 
-	m_vJitterAngles[ 2 ] = -m_vJitterAngles[ 2 ];
+        m_vJitterAngles[2] = -m_vJitterAngles[2];
+    }
 
-	// Check for at least one active leak to play a sound
-	for( i = 0; i < MAX_BARREL_LEAKS; i++ )
-	{
-		if( m_bLeaksActive[ i ] ) {
-			break;
-		}
-	}
+    // Check for at least one active leak to play a sound
+    for (i = 0; i < MAX_BARREL_LEAKS; i++) {
+        if (m_bLeaksActive[i]) {
+            break;
+        }
+    }
 
-	// Play a leak sound
-	if( i != MAX_BARREL_LEAKS && iBiggestLeak )
-	{
-		if( !( iBiggestLeak & 4 ) )
-		{
-			if( iBiggestLeak & 2 )
-			{
-				// medium leak
-				LoopSound( "liquid_leak", 0.60f, -1.0f, -1.0f, 0.90f );
-			}
-			else
-			{
-				// small leak
-				LoopSound( "liquid_leak", 0.30f, -1.0f, -1.0f, 0.80f );
-			}
-		}
-		else
-		{
-			// big leak
-			LoopSound( "liquid_leak", 1.0f, -1.0f, -1.0f, 1.0f );
-		}
-	}
+    // Play a leak sound
+    if (i != MAX_BARREL_LEAKS && iBiggestLeak) {
+        if (iBiggestLeak & 4) {
+            // big leak
+            LoopSound("liquid_leak", 1, -1, -1, 1);
+        } else if (iBiggestLeak & 2) {
+            // medium leak
+            LoopSound("liquid_leak", 0.6, -1, -1, 0.9);
+        } else {
+            // small leak
+            LoopSound("liquid_leak", 0.3, -1, -1, 0.8);
+        }
+    }
 
-	if( i == MAX_BARREL_LEAKS ) {
-		StopLoopSound();
-	}
+    if (i == MAX_BARREL_LEAKS) {
+        StopLoopSound();
+    }
 
-	if( m_vJitterAngles[ 0 ] || m_vJitterAngles[ 2 ] || i < MAX_BARREL_LEAKS )
-	{
-		m_fLastEffectTime += 0.075f;
+    if (m_vJitterAngles[0] || m_vJitterAngles[2] || i < MAX_BARREL_LEAKS) {
+        m_fLastEffectTime += 0.075f;
 
-		if( level.time >= m_fLastEffectTime )
-		{
-			m_fLastEffectTime = level.time + 0.075f;
-		}
+        if (m_fLastEffectTime <= level.time) {
+            m_fLastEffectTime = level.time + 0.075f;
+        }
 
-		PostEvent( EV_Barrel_Think, m_fLastEffectTime - level.time );
-	}
+        PostEvent(EV_Barrel_Think, m_fLastEffectTime - level.time);
+    }
 }
 
-void BarrelObject::BarrelDamaged
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelDamaged(Event *ev)
 {
-	Vector vDir;
-	Vector vForward;
-	Vector vRight;
-	int iDamage;
-	int iMeansOfDeath;
-	Vector vHitPos;
-	Vector vHitDirection;
-	Vector vHitNormal;
+    Vector vDir;
+    Vector vForward;
+    Vector vRight;
+    int    iDamage;
+    int    iMeansOfDeath;
+    Vector vHitPos;
+    Vector vHitDirection;
+    Vector vHitNormal;
 
-	if( !takedamage )
-	{
-		return;
-	}
+    if (!takedamage) {
+        return;
+    }
 
-	iDamage = ev->GetInteger( 2 );
-	iMeansOfDeath = ev->GetInteger( 9 );
-	vHitPos = ev->GetVector( 4 );
-	vHitDirection = ev->GetVector( 5 );
-	vHitNormal = ev->GetVector( 6 );
+    iDamage       = ev->GetInteger(2);
+    iMeansOfDeath = ev->GetInteger(9);
+    vHitPos       = ev->GetVector(4);
+    vHitDirection = ev->GetVector(5);
+    vHitNormal    = ev->GetVector(6);
 
-	vDir = ( vHitDirection - vHitNormal ) * 0.5f;
-	AngleVectors( angles, vForward, vRight, NULL );
+    vDir = (vHitDirection - vHitNormal) * 0.5f;
+    AngleVectors(angles, vForward, vRight, NULL);
 
-	m_vJitterAngles[ 0 ] += DotProduct( vDir, vForward ) * m_fJitterScale * 0.0275f * ( float )iDamage;
-	m_vJitterAngles[ 2 ] += DotProduct( vDir, vRight ) * m_fJitterScale * 0.0275f * ( float )iDamage;
+    m_vJitterAngles[0] += DotProduct(vDir, vForward) * m_fJitterScale * 0.0275f * (float)iDamage;
+    m_vJitterAngles[2] += DotProduct(vDir, vRight) * m_fJitterScale * 0.0275f * (float)iDamage;
 
-	if( m_vJitterAngles[ 0 ] > m_fJitterScale * 1.5f )
-	{
-		m_vJitterAngles[ 0 ] = m_fJitterScale * 1.5f;
-	}
-	else if( m_vJitterAngles[ 0 ]  < -( m_fJitterScale * 1.5f ) )
-	{
-		m_vJitterAngles[ 0 ] = -( m_fJitterScale * 1.5f );
-	}
+    if (m_vJitterAngles[0] > m_fJitterScale * 1.5f) {
+        m_vJitterAngles[0] = m_fJitterScale * 1.5f;
+    } else if (m_vJitterAngles[0] < -(m_fJitterScale * 1.5f)) {
+        m_vJitterAngles[0] = -(m_fJitterScale * 1.5f);
+    }
 
-	if( m_vJitterAngles[ 2 ] > m_fJitterScale * 1.5f )
-	{
-		m_vJitterAngles[ 2 ] = m_fJitterScale * 1.5f;
-	}
-	else if( m_vJitterAngles[ 2 ] < -( m_fJitterScale * 1.5f ) )
-	{
-		m_vJitterAngles[ 2 ] = -( m_fJitterScale * 1.5f );
-	}
+    if (m_vJitterAngles[2] > m_fJitterScale * 1.5f) {
+        m_vJitterAngles[2] = m_fJitterScale * 1.5f;
+    } else if (m_vJitterAngles[2] < -(m_fJitterScale * 1.5f)) {
+        m_vJitterAngles[2] = -(m_fJitterScale * 1.5f);
+    }
 
-	if( !( spawnflags & BARREL_INDESTRUCTABLE ) )
-	{
-		if( ( iMeansOfDeath == MOD_VEHICLE || iMeansOfDeath == MOD_ROCKET ||
-			iMeansOfDeath == MOD_GRENADE || iMeansOfDeath == MOD_EXPLODEWALL ||
-			iMeansOfDeath == MOD_EXPLOSION || m_iBarrelType == BARREL_GAS ) &&
-			iMeansOfDeath != MOD_BASH
-			)
-		{
-			if( iDamage >= health )
-			{
-				PostEvent( EV_Killed, 0.01f );
-				takedamage = DAMAGE_NO;
-				return;
-			}
+    if (!(spawnflags & BARREL_INDESTRUCTABLE)) {
+        if ((iMeansOfDeath == MOD_VEHICLE || iMeansOfDeath == MOD_ROCKET || iMeansOfDeath == MOD_GRENADE
+             || iMeansOfDeath == MOD_EXPLODEWALL || iMeansOfDeath == MOD_EXPLOSION || m_iBarrelType == BARREL_GAS)
+            && iMeansOfDeath != MOD_BASH) {
+            if (iDamage >= health) {
+                PostEvent(EV_Killed, 0.01f);
+                takedamage = DAMAGE_NO;
+                return;
+            }
 
-			if( m_iBarrelType == BARREL_GAS )
-			{
-				iDamage /= 2;
+            if (m_iBarrelType == BARREL_GAS) {
+                iDamage /= 2;
 
-				health -= iDamage;
-				if( health < 1.0f )
-					health = 1.0f;
-			}
-		}
-	}
+                health -= iDamage;
+                if (health < 1.0f) {
+                    health = 1.0f;
+                }
+            }
+        }
+    }
 
-	if( !EventPending( EV_Barrel_Think ) )
-	{
-		m_fLastEffectTime = level.time - 0.075f;
-		ProcessEvent( EV_Barrel_Think );
-	}
+    if (!EventPending(EV_Barrel_Think)) {
+        m_fLastEffectTime = level.time - 0.075f;
+        ProcessEvent(EV_Barrel_Think);
+    }
 
-	if( m_iBarrelType <= BARREL_WATER )
-	{
-		int index = PickBarrelLeak();
+    if (m_iBarrelType <= BARREL_WATER) {
+        int index = PickBarrelLeak();
 
-		if( vHitPos[ 2 ] <= m_fFluidAmount / m_fHeightFluid + origin[ 2 ] + mins[ 2 ] )
-		{
-			m_bLeaksActive[ index ] = qtrue;
-			m_vLeaks[ index ] = vHitPos;
-			m_vLeakNorms[ index ] = vHitNormal;
+        if (vHitPos[2] <= m_fFluidAmount / m_fHeightFluid + origin[2] + mins[2]) {
+            m_bLeaksActive[index] = qtrue;
+            m_vLeaks[index]       = vHitPos;
+            m_vLeakNorms[index]   = vHitNormal;
 
-			gi.SetBroadcastVisible( vHitPos, vHitPos );
+            gi.SetBroadcastVisible(vHitPos, vHitPos);
 
-			if( m_iBarrelType == BARREL_OIL )
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_4));
-			else
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_8));
-		}
-		else
-		{
-			gi.SetBroadcastVisible( vHitPos, vHitPos );
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_4));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_8));
+            }
+        } else {
+            gi.SetBroadcastVisible(vHitPos, vHitPos);
 
-			if( m_iBarrelType == BARREL_OIL )
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
-			else
-				gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
-		}
+            if (m_iBarrelType == BARREL_OIL) {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_3));
+            } else {
+                gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_EFFECT_7));
+            }
+        }
 
-		gi.MSG_WriteCoord( vHitPos[ 0 ] );
-		gi.MSG_WriteCoord( vHitPos[ 1 ] );
-		gi.MSG_WriteCoord( vHitPos[ 2 ] );
-		gi.MSG_WriteDir( vHitNormal );
-		gi.MSG_EndCGM();
-	}
+        gi.MSG_WriteCoord(vHitPos[0]);
+        gi.MSG_WriteCoord(vHitPos[1]);
+        gi.MSG_WriteCoord(vHitPos[2]);
+        gi.MSG_WriteDir(vHitNormal);
+        gi.MSG_EndCGM();
+    }
 }
 
-void BarrelObject::BarrelKilled
-	(
-	Event *ev
-	)
+void BarrelObject::BarrelKilled(Event *ev)
 {
-	float fFluidTop;
-	Vector vPos;
-	str sModel;
+    float  fFluidTop;
+    Vector vPos;
+    str    sModel;
 
-	setSolidType( SOLID_NOT );
-	PostEvent( EV_Remove, 0.05f );
+    setSolidType(SOLID_NOT);
+    PostEvent(EV_Remove, 0.05f);
 
-	vPos[ 2 ] = ( mins[ 2 ] + origin[ 2 ] );
-	fFluidTop = m_fFluidAmount / m_fHeightFluid + vPos[ 2 ];
+    vPos[2]   = (mins[2] + origin[2]);
+    fFluidTop = m_fFluidAmount / m_fHeightFluid + vPos[2];
 
-	if( m_iBarrelType == BARREL_GAS )
-	{
-		RadiusDamage(
-			centroid,
-			this,
-			this,
-			200,
-			this,
-			MOD_EXPLOSION,
-			350,
-			24 );
+    if (m_iBarrelType == BARREL_GAS) {
+        RadiusDamage(centroid, this, this, 200, this, MOD_EXPLOSION, 350, 24);
 
-		sModel = "models/fx/barrel_gas_destroyed.tik";
-	}
-	else if( m_iBarrelType == BARREL_WATER )
-	{
-		if( vPos[ 2 ] + 0.25f * maxs[ 2 ] <= fFluidTop )
-		{
-			sModel = "models/fx/barrel_water_destroyed.tik";
-		}
-		else
-		{
-			sModel = "models/fx/barrel_empty_destroyed.tik";
-		}
-	}
-	else if( m_iBarrelType == BARREL_OIL )
-	{
-		if( vPos[ 2 ] + 0.25f * maxs[ 2 ] > fFluidTop )
-		{
-			sModel = "models/fx/barrel_empty_destroyed.tik";
-		}
-		else
-		{
-			RadiusDamage(
-				centroid,
-				this,
-				this,
-				200,
-				this,
-				MOD_EXPLOSION,
-				350,
-				24 );
+        sModel = "models/fx/barrel_gas_destroyed.tik";
+    } else if (m_iBarrelType == BARREL_WATER) {
+        if (vPos[2] + 0.25f * maxs[2] <= fFluidTop) {
+            sModel = "models/fx/barrel_water_destroyed.tik";
+        } else {
+            sModel = "models/fx/barrel_empty_destroyed.tik";
+        }
+    } else if (m_iBarrelType == BARREL_OIL) {
+        if (vPos[2] + 0.25f * maxs[2] > fFluidTop) {
+            sModel = "models/fx/barrel_empty_destroyed.tik";
+        } else {
+            RadiusDamage(centroid, this, this, 200, this, MOD_EXPLOSION, 350, 24);
 
-			sModel = "models/fx/barrel_oil_destroyed.tik";
-		}
-	}
-	else
-	{
-		sModel = "models/fx/barrel_empty_destroyed.tik";
-	}
+            sModel = "models/fx/barrel_oil_destroyed.tik";
+        }
+    } else {
+        sModel = "models/fx/barrel_empty_destroyed.tik";
+    }
 
-	Animate *exp = new Animate;
+    Animate *exp = new Animate;
 
-	// Spawn an explosion effect
-	exp->edict->s.renderfx |= RF_DONTDRAW;
-	exp->setModel( sModel );
+    // Spawn an explosion effect
+    exp->edict->s.renderfx |= RF_DONTDRAW;
+    exp->setModel(sModel);
 
-	vPos = origin + ( maxs + mins ) * 0.5f;
+    vPos = origin + (maxs + mins) * 0.5f;
 
-	exp->setAngles( Vector( -90, 0, 0 ) );
-	exp->setOrigin( vPos );
-	exp->NewAnim( "idle" );
+    exp->setAngles(Vector(-90, 0, 0));
+    exp->setOrigin(vPos);
+    exp->NewAnim("idle");
 
-	exp->PostEvent( EV_Remove, 0.1f );
-	exp->Unregister( STRING_DEATH );
+    exp->PostEvent(EV_Remove, 0.1f);
+    exp->Unregister(STRING_DEATH);
 }
diff --git a/code/fgame/barrels.h b/code/fgame/barrels.h
index 78caaf43..18f67451 100644
--- a/code/fgame/barrels.h
+++ b/code/fgame/barrels.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,73 +22,66 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // barrels.h : Barrels
 
-#ifndef __BARRELOBJECT_H__
-#define __BARRELOBJECT_H__
+#pragma once
 
 #include "entity.h"
 
-#define BARREL_INDESTRUCTABLE		1
-#define MAX_BARREL_LEAKS			4
+#define BARREL_INDESTRUCTABLE 1
+#define MAX_BARREL_LEAKS      4
 
-enum
-{
-	BARREL_EMPTY,
-	BARREL_OIL,
-	BARREL_WATER,
-	BARREL_GAS
+enum {
+    BARREL_EMPTY,
+    BARREL_OIL,
+    BARREL_WATER,
+    BARREL_GAS
 };
 
-class BarrelObject : public Entity {
-	int m_iBarrelType;
-	float m_fFluidAmount;
-	float m_fHeightFluid;
-	qboolean m_bLeaksActive[ MAX_BARREL_LEAKS ];
-	Vector m_vLeaks[ MAX_BARREL_LEAKS ];
-	Vector m_vLeakNorms[ MAX_BARREL_LEAKS ];
-	Vector m_vJitterAngles;
-	Vector m_vStartAngles;
-	float m_fJitterScale;
-	float m_fLastEffectTime;
-	float m_fDamageSoundTime;
+class BarrelObject : public Entity
+{
+    int      m_iBarrelType;
+    float    m_fFluidAmount;
+    float    m_fHeightFluid;
+    qboolean m_bLeaksActive[MAX_BARREL_LEAKS];
+    Vector   m_vLeaks[MAX_BARREL_LEAKS];
+    Vector   m_vLeakNorms[MAX_BARREL_LEAKS];
+    Vector   m_vJitterAngles;
+    Vector   m_vStartAngles;
+    float    m_fJitterScale;
+    float    m_fLastEffectTime;
+    float    m_fDamageSoundTime;
 
 public:
-	CLASS_PROTOTYPE( BarrelObject );
+    CLASS_PROTOTYPE(BarrelObject);
 
-	BarrelObject();
+    BarrelObject();
 
-	int				PickBarrelLeak( void );
+    int PickBarrelLeak(void);
 
-	void			BarrelSetup( Event *ev );
-	void			BarrelSetType( Event *ev );
-	void			BarrelThink( Event *ev );
-	void			BarrelDamaged( Event *ev );
-	void			BarrelKilled( Event *ev );
+    void BarrelSetup(Event *ev);
+    void BarrelSetType(Event *ev);
+    void BarrelThink(Event *ev);
+    void BarrelDamaged(Event *ev);
+    void BarrelKilled(Event *ev);
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 };
 
-inline void BarrelObject::Archive
-	(
-	Archiver& arc
-	)
+inline void BarrelObject::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveInteger( &m_iBarrelType );
-	arc.ArchiveFloat( &m_fFluidAmount );
-	arc.ArchiveFloat( &m_fHeightFluid );
-	arc.ArchiveVector( &m_vJitterAngles );
-	arc.ArchiveVector( &m_vStartAngles );
-	arc.ArchiveFloat( &m_fJitterScale );
-	arc.ArchiveFloat( &m_fLastEffectTime );
-	arc.ArchiveFloat( &m_fDamageSoundTime );
+    arc.ArchiveInteger(&m_iBarrelType);
+    arc.ArchiveFloat(&m_fFluidAmount);
+    arc.ArchiveFloat(&m_fHeightFluid);
+    arc.ArchiveVector(&m_vJitterAngles);
+    arc.ArchiveVector(&m_vStartAngles);
+    arc.ArchiveFloat(&m_fJitterScale);
+    arc.ArchiveFloat(&m_fLastEffectTime);
+    arc.ArchiveFloat(&m_fDamageSoundTime);
 
-	for( int i = MAX_BARREL_LEAKS - 1; i >= 0; i-- )
-	{
-		arc.ArchiveBoolean( &m_bLeaksActive[ i ] );
-		arc.ArchiveVector( &m_vLeaks[ i ] );
-		arc.ArchiveVector( &m_vLeakNorms[ i ] );
-	}
+    for (int i = MAX_BARREL_LEAKS - 1; i >= 0; i--) {
+        arc.ArchiveBoolean(&m_bLeaksActive[i]);
+        arc.ArchiveVector(&m_vLeaks[i]);
+        arc.ArchiveVector(&m_vLeakNorms[i]);
+    }
 }
-
-#endif // __BARRELOBJECT_H__
diff --git a/code/fgame/baseimp.h b/code/fgame/baseimp.h
index 5eaff5e9..205a3ca1 100644
--- a/code/fgame/baseimp.h
+++ b/code/fgame/baseimp.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __BASEIMP_H__
-#define __BASEIMP_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,5 +85,3 @@ void CacheResource( const char *name );
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/code/fgame/beam.cpp b/code/fgame/beam.cpp
index c298a826..6163ce32 100644
--- a/code/fgame/beam.cpp
+++ b/code/fgame/beam.cpp
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "beam.h"
 #include "../qcommon/qfiles.h"
 #include "game.h"
+#include <utility>
 
 /*****************************************************************************/
 /*QUAKED func_beam (0 0.25 .5) (-8 -8 -8) (8 8 8) START_ON PERSIST WAVE NOISE
@@ -103,7 +104,7 @@ Event EV_FuncBeam_Minoffset
    EV_DEFAULT,
    "f",
    "min_offset",
-   "Set the minimun offset the beam can travel above, below, forward or back of it's endpoints",
+   "Set the minimum offset the beam can travel above, below, forward or back of it's endpoints",
 	EV_NORMAL
    );
 Event EV_FuncBeam_Overlap
@@ -765,19 +766,19 @@ void FuncBeam::Activate
 }
 
 void FuncBeam::UpdateEndpoint
-   (
-   Event *ev
-   )
+	(
+    Event* ev
+	)
 
-   {
-   if ( end )
-      {
-      Event *ev1 = new Event( ev );
+{
+    if (end)
+    {
+        Event* ev1 = new Event(std::move(*ev));
 
-      VectorCopy( end->origin, edict->s.origin2 );
-	  PostEvent( ev1, level.frametime );
-      }
-   }
+        VectorCopy(end->origin, edict->s.origin2);
+        PostEvent(ev1, level.frametime);
+    }
+}
 
 void FuncBeam::UpdateOrigin
    (
@@ -786,8 +787,8 @@ void FuncBeam::UpdateOrigin
 
    {
    if ( origin_target )
-      {
-      Event *ev1 = new Event( ev );
+   {
+       Event* ev1 = new Event(std::move(*ev));
 
       setOrigin(  origin_target->centroid );
 	  PostEvent( ev1, level.frametime );
diff --git a/code/fgame/beam.h b/code/fgame/beam.h
index 5cea8b7d..abd72ee7 100644
--- a/code/fgame/beam.h
+++ b/code/fgame/beam.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // beam.h: Beam
 
-#ifndef __BEAM_H__
-#define __BEAM_H__
+#pragma once
 
 #include "g_local.h"
 #include "scriptslave.h"
@@ -123,5 +122,3 @@ inline void FuncBeam::Archive
       SetBeamShader( shader );
       }
    }
-
-#endif // __BEAM_H__
diff --git a/code/fgame/bg_local.h b/code/fgame/bg_local.h
index 143d2f5d..93ed4584 100644
--- a/code/fgame/bg_local.h
+++ b/code/fgame/bg_local.h
@@ -22,67 +22,68 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // bg_local.h -- local definitions for the bg (both games) files
 
-#define	MIN_WALK_NORMAL	0.7f		// can't walk on very steep slopes
+#define MIN_WALK_NORMAL 0.7f // can't walk on very steep slopes
 
-#define	JUMP_VELOCITY	270
+#define JUMP_VELOCITY   270
 
-#define	TIMER_LAND		130
-#define	TIMER_GESTURE	(34*66+50)
+#define TIMER_LAND      130
+#define TIMER_GESTURE   (34 * 66 + 50)
 
-#define	OVERCLIP		1.001f
+#define OVERCLIP        1.001f
 
-#define HEAD_TAG		0
-#define TORSO_TAG		1
-#define ARMS_TAG		2
-#define PELVIS_TAG		3
-#define MOUTH_TAG		4
+#define HEAD_TAG        0
+#define TORSO_TAG       1
+#define ARMS_TAG        2
+#define PELVIS_TAG      3
+#define MOUTH_TAG       4
 
 // all of the locals will be zeroed before each
 // pmove, just to make damn sure we don't have
 // any differences when running on client or server
 typedef struct {
-	vec3_t		forward, left, up;
-	vec3_t		flat_forward, flat_left, flat_up;
-	float		frametime;
+    vec3_t forward, left, up;
+    vec3_t flat_forward, flat_left, flat_up;
+    float  frametime;
 
-	int			msec;
+    int msec;
 
-	qboolean	walking;
-	qboolean	groundPlane;
-	trace_t		groundTrace;
+    qboolean walking;
+    qboolean groundPlane;
+    trace_t  groundTrace;
 
-	float		impactSpeed;
+    float impactSpeed;
 
-	vec3_t		previous_origin;
-	vec3_t		previous_velocity;
-	int			previous_waterlevel;
+    vec3_t previous_origin;
+    vec3_t previous_velocity;
+    int    previous_waterlevel;
 } pml_t;
 
-extern	pmove_t		*pm;
-extern	pml_t		pml;
+extern pmove_t *pm;
+extern pml_t    pml;
 
 // movement parameters
-extern	float	pm_stopspeed;
-extern	float	pm_duckScale;
-extern	float	pm_swimScale;
-extern	float	pm_wadeScale;
+extern float pm_stopspeed;
+extern float pm_duckScale;
+extern float pm_swimScale;
+extern float pm_wadeScale;
 
-extern	float	pm_accelerate;
-extern	float	pm_airaccelerate;
-extern	float	pm_wateraccelerate;
-extern	float	pm_flyaccelerate;
+extern float pm_accelerate;
+extern float pm_airaccelerate;
+extern float pm_wateraccelerate;
+extern float pm_flyaccelerate;
 
-extern	float	pm_friction;
-extern	float	pm_waterfriction;
-extern	float	pm_flightfriction;
+extern float pm_friction;
+extern float pm_waterfriction;
+extern float pm_flightfriction;
 
-extern	int		c_pmove;
+extern const vec3_t MINS;
+extern const vec3_t MAXS;
 
-void PM_ClipVelocity( vec3_t in, vec3_t normal, vec3_t out, float overbounce );
-void PM_AddTouchEnt( int entityNum );
-void PM_AddEvent( int newEvent );
-
-qboolean	PM_SlideMove( qboolean gravity );
-void		PM_StepSlideMove( qboolean gravity );
+extern int c_pmove;
 
+void PM_ClipVelocity(vec3_t in, vec3_t normal, vec3_t out, float overbounce);
+void PM_AddTouchEnt(int entityNum);
+void PM_AddEvent(int newEvent);
 
+qboolean PM_SlideMove(qboolean gravity);
+void     PM_StepSlideMove(qboolean gravity);
diff --git a/code/fgame/bg_misc.cpp b/code/fgame/bg_misc.cpp
index 246b1e44..b7f63276 100644
--- a/code/fgame/bg_misc.cpp
+++ b/code/fgame/bg_misc.cpp
@@ -31,9 +31,7 @@ BG_EvaluateTrajectoryDelta
 For determining velocity at a given time
 ================
 */
-void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t result ) {
-
-}
+void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result) {}
 
 // FIXME: OLD Q3 CODE
 #if 0
@@ -50,9 +48,9 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 {
 
 	gitem_t	*item;
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	int		upperBound;
-#endif
+#    endif
 
 	if ( ent->modelindex < 1 || ent->modelindex >= bg_numItems ) {
 		Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: index out of range" );
@@ -71,7 +69,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		return qtrue;
 
 	case IT_ARMOR:
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( bg_itemlist[ps->stats[STAT_PERSISTANT_POWERUP]].giTag == PW_SCOUT ) {
 			return qfalse;
 		}
@@ -87,22 +85,22 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		if ( ps->stats[STAT_ARMOR] >= upperBound ) {
 			return qfalse;
 		}
-#else
+#    else
 		if ( ps->stats[STAT_ARMOR] >= ps->stats[STAT_MAX_HEALTH] * 2 ) {
 			return qfalse;
 		}
-#endif
+#    endif
 		return qtrue;
 
 	case IT_HEALTH:
 		// small and mega healths will go over the max, otherwise
 		// don't pick up if already at max
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( bg_itemlist[ps->stats[STAT_PERSISTANT_POWERUP]].giTag == PW_GUARD ) {
 			upperBound = ps->stats[STAT_MAX_HEALTH];
 		}
 		else
-#endif
+#    endif
 		if ( item->quantity == 5 || item->quantity == 100 ) {
 			if ( ps->stats[STAT_HEALTH] >= ps->stats[STAT_MAX_HEALTH] * 2 ) {
 				return qfalse;
@@ -118,7 +116,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 	case IT_POWERUP:
 		return qtrue;	// powerups are always picked up
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	case IT_PERSISTANT_POWERUP:
 		// can only hold one item at a time
 		if ( ps->stats[STAT_PERSISTANT_POWERUP] ) {
@@ -134,10 +132,10 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 		}
 
 		return qtrue;
-#endif
+#    endif
 
 	case IT_TEAM: // team items, such as flags
-#ifdef MISSIONPACK		
+#    ifdef MISSIONPACK		
 		if( gametype == GT_1FCTF ) {
 			// neutral flag can always be picked up
 			if( item->giTag == PW_NEUTRALFLAG ) {
@@ -153,7 +151,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 				}
 			}
 		}
-#endif
+#    endif
 		if( gametype == GT_CTF ) {
 			// ent->modelindex2 is non-zero on items if they are dropped
 			// we need to know this because we can pick up our dropped flag (and return it)
@@ -171,11 +169,11 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
 			}
 		}
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 		if( gametype == GT_HARVESTER ) {
 			return qtrue;
 		}
-#endif
+#    endif
 		return qfalse;
 
 	case IT_HOLDABLE:
@@ -188,11 +186,11 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play
         case IT_BAD:
             Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: IT_BAD" );
         default:
-#ifndef Q3_VM
-#ifndef NDEBUG
+#    ifndef Q3_VM
+#        ifndef NDEBUG
           Com_Printf("BG_CanItemBeGrabbed: unknown enum %d\n", item->giType );
-#endif
-#endif
+#        endif
+#    endif
          break;
 	}
 
@@ -297,8 +295,7 @@ void BG_EvaluateTrajectoryDelta( const trajectory_t *tr, int atTime, vec3_t resu
 BG_TouchJumpPad
 ========================
 */
-void BG_TouchJumpPad( playerState_t *ps, entityState_t *jumppad ) {
-}
+void BG_TouchJumpPad(playerState_t *ps, entityState_t *jumppad) {}
 
 /*
 ========================
@@ -308,43 +305,41 @@ This is done after each set of usercmd_t on the server,
 and after local prediction on the client
 ========================
 */
-void BG_PlayerStateToEntityState( playerState_t *ps, entityState_t *s, qboolean snap )
+void BG_PlayerStateToEntityState(playerState_t *ps, entityState_t *s, qboolean snap)
 {
-	if ( ps->pm_type == PM_NOCLIP ) {
-		s->eType = 0;//ET_INVISIBLE;
-	//} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
-	//	s->eType = 0;//ET_INVISIBLE;
-	} else {
-		s->eType = ET_PLAYER;
-	}
+    if (ps->pm_type == PM_NOCLIP) {
+        s->eType = 0; //ET_INVISIBLE;
+        //} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
+        //	s->eType = 0;//ET_INVISIBLE;
+    } else {
+        s->eType = ET_PLAYER;
+    }
 
-	s->number = ps->clientNum;
+    s->number = ps->clientNum;
 
-	VectorCopy( ps->origin, s->origin );
-	if ( snap ) {
-		SnapVector( s->origin );
-	}
-	// set the trDelta for flag direction
-	VectorCopy( ps->velocity, s->pos.trDelta );
+    VectorCopy(ps->origin, s->origin);
+    if (snap) {
+        SnapVector(s->origin);
+    }
+    // set the trDelta for flag direction
+    VectorCopy(ps->velocity, s->pos.trDelta);
 
-	VectorCopy( ps->viewangles, s->angles );
-	if ( snap ) {
-		SnapVector( s->angles );
-	}
+    VectorCopy(ps->viewangles, s->angles);
+    if (snap) {
+        SnapVector(s->angles);
+    }
 
-	//s->angles2[YAW] = ps->movementDir;
-	s->clientNum = ps->clientNum;		// ET_PLAYER looks here instead of at number
-										// so corpses can also reference the proper config
-	//s->eFlags = ps->eFlags;
-	//if ( ps->stats[STAT_HEALTH] <= 0 ) {
-	//	s->eFlags |= EF_DEAD;
-	//} else {
-	//	s->eFlags &= ~EF_DEAD;
-	//}
-
-	
-	s->groundEntityNum = ps->groundEntityNum;
+    //s->angles2[YAW] = ps->movementDir;
+    s->clientNum = ps->clientNum; // ET_PLAYER looks here instead of at number
+                                  // so corpses can also reference the proper config
+    //s->eFlags = ps->eFlags;
+    //if ( ps->stats[STAT_HEALTH] <= 0 ) {
+    //	s->eFlags |= EF_DEAD;
+    //} else {
+    //	s->eFlags &= ~EF_DEAD;
+    //}
 
+    s->groundEntityNum = ps->groundEntityNum;
 }
 
 /*
@@ -355,37 +350,35 @@ This is done after each set of usercmd_t on the server,
 and after local prediction on the client
 ========================
 */
-void BG_PlayerStateToEntityStateExtraPolate( playerState_t *ps, entityState_t *s, int time, qboolean snap )
+void BG_PlayerStateToEntityStateExtraPolate(playerState_t *ps, entityState_t *s, int time, qboolean snap)
 {
-	if ( ps->pm_type == PM_NOCLIP ) {
-		s->eType = 0;//ET_INVISIBLE;
-	//} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
-	//	s->eType = 0;//ET_INVISIBLE;
-	} else {
-		s->eType = ET_PLAYER;
-	}
+    if (ps->pm_type == PM_NOCLIP) {
+        s->eType = 0; //ET_INVISIBLE;
+        //} else if ( ps->stats[STAT_HEALTH] <= GIB_HEALTH ) {
+        //	s->eType = 0;//ET_INVISIBLE;
+    } else {
+        s->eType = ET_PLAYER;
+    }
 
-	s->number = ps->clientNum;
+    s->number = ps->clientNum;
 
-	VectorCopy( ps->origin, s->origin );
-	if ( snap ) {
-		SnapVector( s->origin );
-	}
-	// set the trDelta for flag direction and linear prediction
-	VectorCopy( ps->velocity, s->pos.trDelta );
-	// set the time for linear prediction
-	s->pos.trTime = time;
+    VectorCopy(ps->origin, s->origin);
+    if (snap) {
+        SnapVector(s->origin);
+    }
+    // set the trDelta for flag direction and linear prediction
+    VectorCopy(ps->velocity, s->pos.trDelta);
+    // set the time for linear prediction
+    s->pos.trTime = time;
 
-	VectorCopy( ps->viewangles, s->angles );
-	if ( snap ) {
-		SnapVector( s->angles );
-	}
-	s->clientNum = ps->clientNum;		// ET_PLAYER looks here instead of at number
-										// so corpses can also reference the proper config
-
-
-	s->groundEntityNum = ps->groundEntityNum;
+    VectorCopy(ps->viewangles, s->angles);
+    if (snap) {
+        SnapVector(s->angles);
+    }
+    s->clientNum = ps->clientNum; // ET_PLAYER looks here instead of at number
+                                  // so corpses can also reference the proper config
 
+    s->groundEntityNum = ps->groundEntityNum;
 }
 
 /*
@@ -398,30 +391,30 @@ and after local prediction on the client
 */
 int BG_MapCGMToProtocol(int protocol, int messageNumber)
 {
-	int newMessageNumber = messageNumber;
+    int newMessageNumber = messageNumber;
 
-	if (protocol >= PROTOCOL_MOHTA_MIN) {
-		// no need translation
-		return messageNumber;
-	}
+    if (protocol >= PROTOCOL_MOHTA_MIN) {
+        // no need translation
+        return messageNumber;
+    }
 
-	if (messageNumber > 40) {
-		// unsupported...
-		return messageNumber;
-	}
+    if (messageNumber > 40) {
+        // unsupported...
+        return messageNumber;
+    }
 
-	if (messageNumber >= 17) {
-		return messageNumber - 3;
-	}
+    if (messageNumber >= 17) {
+        return messageNumber - 3;
+    }
 
-	if (messageNumber == 15 || messageNumber == 16) {
-		// return explosion effect number 2
-		return 14;
-	}
+    if (messageNumber == 15 || messageNumber == 16) {
+        // return explosion effect number 2
+        return 14;
+    }
 
-	if (messageNumber > 10) {
-		return messageNumber - 1;
-	}
+    if (messageNumber > 10) {
+        return messageNumber - 1;
+    }
 
-	return newMessageNumber;
+    return newMessageNumber;
 }
\ No newline at end of file
diff --git a/code/fgame/bg_pmove.cpp b/code/fgame/bg_pmove.cpp
index 7e152df3..613bc78b 100644
--- a/code/fgame/bg_pmove.cpp
+++ b/code/fgame/bg_pmove.cpp
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -27,28 +28,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "bg_public.h"
 #include "bg_local.h"
 
-pmove_t		*pm;
-pml_t		pml;
+pmove_t *pm;
+pml_t    pml;
 
 // movement parameters
-float	pm_stopspeed = 50.0f;
-float	pm_duckScale = 0.25f;
-float	pm_swimScale = 1.0f;
-float	pm_wadeScale = 0.70f;
+float pm_stopspeed = 50.0f;
+float pm_duckScale = 0.25f;
+float pm_swimScale = 1.0f;
+float pm_wadeScale = 0.70f;
 
-float	pm_accelerate = 8.0f;
-float	pm_airaccelerate = 1.0f;
-float	pm_wateraccelerate = 8.0f;
+float pm_accelerate      = 8.0f;
+float pm_airaccelerate   = 1.0f;
+float pm_wateraccelerate = 8.0f;
 
-float	pm_friction = 6.0f;
-float	pm_waterfriction = 2.0f;
-float	pm_slipperyfriction = 0.25f;
-float	pm_strafespeed = 0.85f;
-float	pm_backspeed = 0.80f;
-float	pm_flightfriction = 3.0f;
-float	PM_NOCLIPfriction = 5.0f;
+float pm_friction         = 6.0f;
+float pm_waterfriction    = 2.0f;
+float pm_slipperyfriction = 0.25f;
+float pm_strafespeed      = 0.85f;
+float pm_backspeed        = 0.80f;
+float pm_flightfriction   = 3.0f;
+float PM_NOCLIPfriction   = 5.0f;
 
-int		c_pmove = 0;
+const vec3_t MINS = {-15, -15, 0};
+const vec3_t MAXS = {15, 15, 94};
+
+int c_pmove = 0;
 
 /*
 ===============
@@ -56,36 +60,35 @@ PM_AddEvent
 
 ===============
 */
-void PM_AddEvent( int newEvent ) {
-
-}
+void PM_AddEvent(int newEvent) {}
 
 /*
 ===============
 PM_AddTouchEnt
 ===============
 */
-void PM_AddTouchEnt( int entityNum ) {
-	int		i;
+void PM_AddTouchEnt(int entityNum)
+{
+    int i;
 
-	if ( entityNum == ENTITYNUM_WORLD ) {
-		return;
-	}
+    if (entityNum == ENTITYNUM_WORLD) {
+        return;
+    }
 
-	if ( pm->numtouch == MAXTOUCH ) {
-		return;
-	}
+    if (pm->numtouch == MAXTOUCH) {
+        return;
+    }
 
-	// see if it is already added
-	for ( i = 0 ; i < pm->numtouch ; i++ ) {
-		if ( pm->touchents[ i ] == entityNum ) {
-			return;
-		}
-	}
+    // see if it is already added
+    for (i = 0; i < pm->numtouch; i++) {
+        if (pm->touchents[i] == entityNum) {
+            return;
+        }
+    }
 
-	// add it
-	pm->touchents[pm->numtouch] = entityNum;
-	pm->numtouch++;
+    // add it
+    pm->touchents[pm->numtouch] = entityNum;
+    pm->numtouch++;
 }
 
 /*
@@ -93,25 +96,15 @@ void PM_AddTouchEnt( int entityNum ) {
 PM_StartTorsoAnim
 ===================
 */
-static void PM_StartTorsoAnim( int anim ) {
+static void PM_StartTorsoAnim(int anim) {}
 
-}
-static void PM_StartLegsAnim( int anim ) {
+static void PM_StartLegsAnim(int anim) {}
 
-}
+static void PM_ContinueLegsAnim(int anim) {}
 
-static void PM_ContinueLegsAnim( int anim ) {
-
-}
-
-static void PM_ContinueTorsoAnim( int anim ) {
-	
-}
-
-static void PM_ForceLegsAnim( int anim ) {
-	
-}
+static void PM_ContinueTorsoAnim(int anim) {}
 
+static void PM_ForceLegsAnim(int anim) {}
 
 /*
 ==================
@@ -120,48 +113,44 @@ PM_ClipVelocity
 Slide off of the impacting surface
 ==================
 */
-void PM_ClipVelocity( vec3_t in, vec3_t normal, vec3_t out, float overbounce )
+void PM_ClipVelocity(vec3_t in, vec3_t normal, vec3_t out, float overbounce)
 {
-	float	backoff;
-	float	dir_z;
-	float	normal2[ 3 ];
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	if( normal[ 2 ] >= pm_wadeScale )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    if (normal[2] >= pm_wadeScale) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-		normal2[ 0 ] = in[ 0 ] * DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] * DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-		VectorNormalize( normal2 );
+        VectorNormalize(normal2);
 
-		dir_z = -normal2[ 2 ];
+        dir_z = -normal2[2];
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / dir_z;
-	}
-	else
-	{
-		backoff = DotProduct( in, normal );
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / dir_z;
+    } else {
+        backoff = DotProduct(in, normal);
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = in[ 2 ] - normal[ 2 ] * backoff;
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = in[2] - normal[2] * backoff;
+    }
 }
 
-
 /*
 ==================
 PM_Friction
@@ -169,76 +158,65 @@ PM_Friction
 Handles both ground friction and water friction
 ==================
 */
-static void PM_Friction( void ) {
-	vec3_t	vec;
-	float	*vel;
-	float	speed, newspeed, control;
-	float	drop;
+static void PM_Friction(void)
+{
+    vec3_t vec;
+    float *vel;
+    float  speed, newspeed, control;
+    float  drop;
 
-	vel = pm->ps->velocity;
+    vel = pm->ps->velocity;
 
-	VectorCopy( vel, vec );
-	if( pml.walking )
-	{
-		// ignore slope movement
-		vec[ 2 ] = 0;
-	}
+    VectorCopy(vel, vec);
+    if (pml.walking) {
+        // ignore slope movement
+        vec[2] = 0;
+    }
 
-	speed = VectorLength( vec );
-	if( speed < 1 )
-	{
-		// allow sinking underwater
-		vel[ 0 ] = 0;
-		vel[ 1 ] = 0;
+    speed = VectorLength(vec);
+    if (speed < 1) {
+        // allow sinking underwater
+        vel[0] = 0;
+        vel[1] = 0;
 
-		return;
-	}
+        return;
+    }
 
-	drop = 0;
+    drop = 0;
 
-	if( pml.walking )
-	{
-		control = ( speed < pm_stopspeed ) ? pm_stopspeed : speed;
+    if (pml.walking) {
+        control = (speed < pm_stopspeed) ? pm_stopspeed : speed;
 
-		// if getting knocked back, no friction
-		if( pml.groundTrace.surfaceFlags & SURF_SLICK )
-		{
-			drop += control * pm_slipperyfriction * pml.frametime;
-		}
-		else
-		{
-			drop += control * pm_friction * pml.frametime;
-		}
-	}
+        // if getting knocked back, no friction
+        if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+            drop += control * pm_slipperyfriction * pml.frametime;
+        } else {
+            drop += control * pm_friction * pml.frametime;
+        }
+    }
 
-	// apply water friction even if just wading
-	if( pm->waterlevel )
-	{
-		if( pm->watertype & CONTENTS_SLIME )
-		{
-			drop += speed * pm_waterfriction * 5 * pm->waterlevel * pml.frametime;
-		}
-		else
-		{
-			drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
-		}
-	}
+    // apply water friction even if just wading
+    if (pm->waterlevel) {
+        if (pm->watertype & CONTENTS_SLIME) {
+            drop += speed * pm_waterfriction * 5 * pm->waterlevel * pml.frametime;
+        } else {
+            drop += speed * pm_waterfriction * pm->waterlevel * pml.frametime;
+        }
+    }
 
-	// scale the velocity
-	newspeed = speed - drop;
-	if( newspeed < 0 )
-	{
-		newspeed = 0;
-	}
+    // scale the velocity
+    newspeed = speed - drop;
+    if (newspeed < 0) {
+        newspeed = 0;
+    }
 
-	newspeed /= speed;
+    newspeed /= speed;
 
-	vel[ 0 ] = vel[ 0 ] * newspeed;
-	vel[ 1 ] = vel[ 1 ] * newspeed;
-	vel[ 2 ] = vel[ 2 ] * newspeed;
+    vel[0] = vel[0] * newspeed;
+    vel[1] = vel[1] * newspeed;
+    vel[2] = vel[2] * newspeed;
 }
 
-
 /*
 ==============
 PM_Accelerate
@@ -246,27 +224,25 @@ PM_Accelerate
 Handles user intended acceleration
 ==============
 */
-static void PM_Accelerate( vec3_t wishdir, float wishspeed, float accel )
+static void PM_Accelerate(vec3_t wishdir, float wishspeed, float accel)
 {
-	vec3_t		wishVelocity;
-	vec3_t		pushDir;
-	float		pushLen;
-	float		canPush;
+    vec3_t wishVelocity;
+    vec3_t pushDir;
+    float  pushLen;
+    float  canPush;
 
-	VectorScale( wishdir, wishspeed, wishVelocity );
-	VectorSubtract( wishVelocity, pm->ps->velocity, pushDir );
-	pushLen = VectorNormalize( pushDir );
+    VectorScale(wishdir, wishspeed, wishVelocity);
+    VectorSubtract(wishVelocity, pm->ps->velocity, pushDir);
+    pushLen = VectorNormalize(pushDir);
 
-	canPush = accel*pml.frametime*wishspeed;
-	if (canPush > pushLen) {
-		canPush = pushLen;
-	}
+    canPush = accel * pml.frametime * wishspeed;
+    if (canPush > pushLen) {
+        canPush = pushLen;
+    }
 
-	VectorMA( pm->ps->velocity, canPush, pushDir, pm->ps->velocity );
+    VectorMA(pm->ps->velocity, canPush, pushDir, pm->ps->velocity);
 }
 
-
-
 /*
 ============
 PM_CmdScale
@@ -276,30 +252,30 @@ This allows the clients to use axial -127 to 127 values for all directions
 without getting a sqrt(2) distortion in speed.
 ============
 */
-static float PM_CmdScale( usercmd_t *cmd ) {
-	int		max;
-	float	total;
-	float	scale;
-	float	fmove, smove;
+static float PM_CmdScale(usercmd_t *cmd)
+{
+    int   max;
+    float total;
+    float scale;
+    float fmove, smove;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	max = fabs( fmove );
-	if(fabs( smove ) > max ) {
-		max = fabs( smove );
-	}
-	if (fabs( cmd->upmove ) > max ) {
-		max = fabs( cmd->upmove );
-	}
-	if ( !max ) {
-		return 0;
-	}
+    max = fabs(fmove);
+    if (fabs(smove) > max) {
+        max = fabs(smove);
+    }
+    if (fabs(cmd->upmove) > max) {
+        max = fabs(cmd->upmove);
+    }
+    if (!max) {
+        return 0;
+    }
 
-	total = sqrt( ( float )( fmove * fmove
-		+ smove * smove + cmd->upmove * cmd->upmove ) );
-	scale = ( float )pm->ps->speed * max / ( 127.0 * total );
+    total = sqrt((float)(fmove * fmove + smove * smove + cmd->upmove * cmd->upmove));
+    scale = (float)pm->ps->speed * max / (127.0 * total);
 
-	return scale;
+    return scale;
 }
 
 //============================================================================
@@ -310,33 +286,29 @@ PM_CheckTerminalVelocity
 =============
 */
 #define TERMINAL_VELOCITY 1200
-void PM_CheckTerminalVelocity
-	(
-	void
-	)
+
+void PM_CheckTerminalVelocity(void)
 {
-	float oldspeed;
-	float speed;
+    float oldspeed;
+    float speed;
 
-	//
-	// how fast were we falling
-	//
-	oldspeed = -pml.previous_velocity[ 2 ];
+    //
+    // how fast were we falling
+    //
+    oldspeed = -pml.previous_velocity[2];
 
-	//
-	// how fast are we falling
-	//
-	speed = -pm->ps->velocity[ 2 ];
+    //
+    // how fast are we falling
+    //
+    speed = -pm->ps->velocity[2];
 
-	if( speed <= 0 )
-	{
-		return;
-	}
+    if (speed <= 0) {
+        return;
+    }
 
-	if( ( oldspeed <= TERMINAL_VELOCITY ) && ( speed > TERMINAL_VELOCITY ) )
-	{
-		pm->pmoveEvent = EV_TERMINAL_VELOCITY;
-	}
+    if ((oldspeed <= TERMINAL_VELOCITY) && (speed > TERMINAL_VELOCITY)) {
+        pm->pmoveEvent = EV_TERMINAL_VELOCITY;
+    }
 }
 
 /*
@@ -396,18 +368,13 @@ PM_GetMove
 
 ===================
 */
-void PM_GetMove
-	(
-	float *pfForward,
-	float *pfRight
-	)
+void PM_GetMove(float *pfForward, float *pfRight)
 {
-	*pfForward = pm->cmd.forwardmove;
-	if( *pfForward < 0 )
-	{
-		*pfForward *= pm_backspeed;
-	}
-	*pfRight = pm->cmd.rightmove * pm_strafespeed;
+    *pfForward = pm->cmd.forwardmove;
+    if (*pfForward < 0) {
+        *pfForward *= pm_backspeed;
+    }
+    *pfRight = pm->cmd.rightmove * pm_strafespeed;
 }
 
 /*
@@ -416,184 +383,161 @@ PM_AirMove
 
 ===================
 */
-static void PM_AirMove( void )
+static void PM_AirMove(void)
 {
-	vec3_t		wishvel;
-	float		   fmove;
-	float       smove;
-	vec3_t		wishdir;
-	float		   wishspeed;
-	float		   scale;
-	usercmd_t	cmd;
+    vec3_t    wishvel;
+    float     fmove;
+    float     smove;
+    vec3_t    wishdir;
+    float     wishspeed;
+    float     scale;
+    usercmd_t cmd;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	pm->ps->pm_time = 0;
+    pm->ps->pm_time = 0;
 
-	cmd = pm->cmd;
-	scale = PM_CmdScale( &cmd );
+    cmd   = pm->cmd;
+    scale = PM_CmdScale(&cmd);
 
-	wishvel[ 0 ] = pml.flat_forward[ 0 ] * fmove - pml.flat_left[ 0 ] * smove;
-	wishvel[ 1 ] = pml.flat_forward[ 1 ] * fmove - pml.flat_left[ 1 ] * smove;
-	wishvel[ 2 ] = 0;
+    wishvel[0] = pml.flat_forward[0] * fmove - pml.flat_left[0] * smove;
+    wishvel[1] = pml.flat_forward[1] * fmove - pml.flat_left[1] * smove;
+    wishvel[2] = 0;
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	// not on ground, so little effect on velocity
-	PM_Accelerate( wishdir, wishspeed, pm_airaccelerate );
+    // not on ground, so little effect on velocity
+    PM_Accelerate(wishdir, wishspeed, pm_airaccelerate);
 
-	// we may have a ground plane that is very steep, even
-	// though we don't have a groundentity
-	// slide along the steep plane
-	if( pml.groundPlane )
-	{
-		PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP );
-	}
+    // we may have a ground plane that is very steep, even
+    // though we don't have a groundentity
+    // slide along the steep plane
+    if (pml.groundPlane) {
+        PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
+    }
 
-	PM_StepSlideMove( qtrue );
+    PM_StepSlideMove(qtrue);
 
-	PM_CheckTerminalVelocity();
+    PM_CheckTerminalVelocity();
 }
 
-static vec3_t min3x3 = { -8, 0, 0 };
-static vec3_t max3x3 = { 4, 4, 8 };
-static vec3_t base_rightfoot_pos = { -5.25301f, -3.10885f, 0 };
-static vec3_t base_leftfoot_pos = { -0.123711f, 10.4893f, 0 };
+static vec3_t min3x3             = {-8, 0, 0};
+static vec3_t max3x3             = {4, 4, 8};
+static vec3_t base_rightfoot_pos = {-5.25301f, -3.10885f, 0};
+static vec3_t base_leftfoot_pos  = {-0.123711f, 10.4893f, 0};
 
-qboolean PM_FeetOnGround
-	(
-	vec3_t pos
-	)
+qboolean PM_FeetOnGround(vec3_t pos)
 {
-	vec3_t start;
-	vec3_t end;
-	trace_t trace;
+    vec3_t  start;
+    vec3_t  end;
+    trace_t trace;
 
-	VectorCopy( pos, start );
-	VectorCopy( pos, end );
-	end[ 2 ] -= 16.01f;
+    VectorCopy(pos, start);
+    VectorCopy(pos, end);
+    end[2] -= 16.01f;
 
-	pm->trace( &trace, start, min3x3, max3x3, end, pm->ps->clientNum, pm->tracemask, true, false );
+    pm->trace(&trace, start, min3x3, max3x3, end, pm->ps->clientNum, pm->tracemask, true, false);
 
-	return trace.fraction != 1.0f;
+    return trace.fraction != 1.0f;
 }
 
-qboolean PM_FindBestFallPos
-	(
-	vec3_t pos,
-	vec3_t bestdir
-	)
-{ 
-	trace_t trace;
-	vec3_t ang;
-	vec3_t dir;
-	vec3_t start;
-	vec3_t end;
-	vec3_t move;
-	int i;
-	qboolean set;
-	float radius;
+qboolean PM_FindBestFallPos(vec3_t pos, vec3_t bestdir)
+{
+    trace_t  trace;
+    vec3_t   ang;
+    vec3_t   dir;
+    vec3_t   start;
+    vec3_t   end;
+    vec3_t   move;
+    int      i;
+    qboolean set;
+    float    radius;
 
-	VectorClear( bestdir );
+    VectorClear(bestdir);
 
-	set = qfalse;
+    set = qfalse;
 
-	radius = pm->maxs[ 0 ] - pm->mins[ 0 ] + 1.0f;
+    radius = pm->maxs[0] - pm->mins[0] + 1.0f;
 
-	VectorCopy( pos, start );
-	start[ 2 ] -= 16.1f;
+    VectorCopy(pos, start);
+    start[2] -= 16.1f;
 
-	VectorSet( ang, 0, pm->ps->viewangles[ 1 ], 0 );
-	for( i = 0; i < 16; i++, ang[ 1 ] += 22.5f )
-	{
-		AngleVectorsLeft( ang, dir, NULL, NULL );
-		VectorMA( pos, radius, dir, move );
+    VectorSet(ang, 0, pm->ps->viewangles[1], 0);
+    for (i = 0; i < 16; i++, ang[1] += 22.5f) {
+        AngleVectorsLeft(ang, dir, NULL, NULL);
+        VectorMA(pos, radius, dir, move);
 
-		pm->trace( &trace, pos, pm->mins, pm->maxs, move, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        pm->trace(&trace, pos, pm->mins, pm->maxs, move, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-		VectorCopy( trace.endpos, end );
-		end[ 2 ] = start[ 2 ];
+        VectorCopy(trace.endpos, end);
+        end[2] = start[2];
 
-		pm->trace( &trace, trace.endpos, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( trace.fraction == 1.0f )
-		{
-			VectorCopy( trace.endpos, end );
-			pm->trace( &trace, end, pm->mins, pm->maxs, start, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        pm->trace(&trace, trace.endpos, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if (trace.fraction == 1.0f) {
+            VectorCopy(trace.endpos, end);
+            pm->trace(&trace, end, pm->mins, pm->maxs, start, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-			if( trace.fraction < 1.0f )
-			{
-				VectorAdd( bestdir, trace.plane.normal, bestdir );
-				set = qtrue;
-			}
-		}
-	}
+            if (trace.fraction < 1.0f) {
+                VectorAdd(bestdir, trace.plane.normal, bestdir);
+                set = qtrue;
+            }
+        }
+    }
 
-	if( !set || !VectorNormalize( bestdir ) )
-	{
-		return qfalse;
-	}
+    if (!set || !VectorNormalize(bestdir)) {
+        return qfalse;
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
-void PM_CheckFeet
-	(
-	vec3_t vWishdir
-	)
+void PM_CheckFeet(vec3_t vWishdir)
 {
-	vec3_t		temp;
-	trace_t		trace;
+    vec3_t  temp;
+    trace_t trace;
 
-	if( pm->stepped )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    if (pm->stepped) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( !pm->ps->walking )
-	{
-		return;
-	}
+    if (!pm->ps->walking) {
+        return;
+    }
 
-	VectorMA( pm->ps->origin, 0.2f, pm->ps->velocity, temp );
-	temp[ 2 ] = pm->ps->origin[ 2 ] + 2;
-	if( PM_FeetOnGround( pm->ps->origin ) || PM_FeetOnGround( temp ) )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    VectorMA(pm->ps->origin, 0.2f, pm->ps->velocity, temp);
+    temp[2] = pm->ps->origin[2] + 2;
+    if (PM_FeetOnGround(pm->ps->origin) || PM_FeetOnGround(temp)) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( pm->ps->feetfalling > 0 )
-	{
-		pm->ps->feetfalling--;
-	}
+    if (pm->ps->feetfalling > 0) {
+        pm->ps->feetfalling--;
+    }
 
-	if( !pm->ps->feetfalling )
-	{
-		if( !PM_FindBestFallPos( pm->ps->origin, pm->ps->falldir ) ) {
-			return;
-		}
+    if (!pm->ps->feetfalling) {
+        if (!PM_FindBestFallPos(pm->ps->origin, pm->ps->falldir)) {
+            return;
+        }
 
-		pm->ps->feetfalling = 5;
-	}
+        pm->ps->feetfalling = 5;
+    }
 
-	VectorMA( pm->ps->origin, 15.0f * pml.frametime, pm->ps->falldir, temp );
+    VectorMA(pm->ps->origin, 15.0f * pml.frametime, pm->ps->falldir, temp);
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, temp, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( trace.fraction == 0 )
-	{
-		pm->ps->feetfalling = 0;
-		return;
-	}
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, temp, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (trace.fraction == 0) {
+        pm->ps->feetfalling = 0;
+        return;
+    }
 
-	if( ( vWishdir[ 0 ] == 0.0f && vWishdir[ 1 ] == 0.0f ) ||
-		DotProduct( vWishdir, pm->ps->falldir ) > 0.0f )
-	{
-		pm->ps->walking = qfalse;
-		VectorCopy( trace.endpos, pm->ps->origin );
-	}
+    if ((vWishdir[0] == 0.0f && vWishdir[1] == 0.0f) || DotProduct(vWishdir, pm->ps->falldir) > 0.0f) {
+        pm->ps->walking = qfalse;
+        VectorCopy(trace.endpos, pm->ps->origin);
+    }
 }
 
 /*
@@ -602,90 +546,81 @@ PM_WalkMove
 
 ===================
 */
-static void PM_WalkMove( void ) {
-	int			i;
-	vec3_t		wishvel;
-	float		fmove, smove;
-	vec3_t		wishdir;
-	float		wishspeed;
-	float		scale;
-	usercmd_t	cmd;
-	float		accelerate;
+static void PM_WalkMove(void)
+{
+    int       i;
+    vec3_t    wishvel;
+    float     fmove, smove;
+    vec3_t    wishdir;
+    float     wishspeed;
+    float     scale;
+    usercmd_t cmd;
+    float     accelerate;
 
-	PM_Friction();
+    PM_Friction();
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	cmd = pm->cmd;
-	scale = PM_CmdScale( &cmd );
+    cmd   = pm->cmd;
+    scale = PM_CmdScale(&cmd);
 
-	if( ( pm->cmd.buttons & BUTTON_RUN ) && fmove && !smove )
-	{
-		pm->ps->pm_time += pml.msec;
-	}
-	else
-	{
-		pm->ps->pm_time = 0;
-	}
+    if ((pm->cmd.buttons & BUTTON_RUN) && fmove && !smove) {
+        pm->ps->pm_time += pml.msec;
+    } else {
+        pm->ps->pm_time = 0;
+    }
 
-	// project the forward and right directions onto the ground plane
-	PM_ClipVelocity( pml.flat_forward, pml.groundTrace.plane.normal, pml.flat_forward, OVERCLIP );
-	PM_ClipVelocity( pml.flat_left, pml.groundTrace.plane.normal, pml.flat_left, OVERCLIP );
-	//
-	VectorNormalize( pml.flat_forward );
-	VectorNormalize( pml.flat_left );
+    // project the forward and right directions onto the ground plane
+    PM_ClipVelocity(pml.flat_forward, pml.groundTrace.plane.normal, pml.flat_forward, OVERCLIP);
+    PM_ClipVelocity(pml.flat_left, pml.groundTrace.plane.normal, pml.flat_left, OVERCLIP);
+    //
+    VectorNormalize(pml.flat_forward);
+    VectorNormalize(pml.flat_left);
 
-	for( i = 0; i < 3; i++ )
-	{
-		wishvel[ i ] = pml.flat_forward[ i ] * fmove - pml.flat_left[ i ] * smove;
-	}
+    for (i = 0; i < 3; i++) {
+        wishvel[i] = pml.flat_forward[i] * fmove - pml.flat_left[i] * smove;
+    }
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	// clamp the speed lower if wading or walking on the bottom
-	if( pm->waterlevel )
-	{
-		float	waterScale;
+    // clamp the speed lower if wading or walking on the bottom
+    if (pm->waterlevel) {
+        float waterScale;
 
-		if( pm->waterlevel == 1.0f )
-		{
-			waterScale = 0.80f;
-		}
-		else
-		{
-			waterScale = 0.5f;
-		}
+        if (pm->waterlevel == 1.0f) {
+            waterScale = 0.80f;
+        } else {
+            waterScale = 0.5f;
+        }
 
-		if( wishspeed > pm->ps->speed * waterScale ) {
-			wishspeed = pm->ps->speed * waterScale;
-		}
-	}
+        if (wishspeed > pm->ps->speed * waterScale) {
+            wishspeed = pm->ps->speed * waterScale;
+        }
+    }
 
-	if( pml.groundTrace.surfaceFlags & SURF_SLICK ) {
-		accelerate = pm_airaccelerate;
-	} else {
-		accelerate = pm_accelerate;
-	}
+    if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+        accelerate = pm_airaccelerate;
+    } else {
+        accelerate = pm_accelerate;
+    }
 
-	PM_Accelerate( wishdir, wishspeed, accelerate );
+    PM_Accelerate(wishdir, wishspeed, accelerate);
 
-	if( pml.groundTrace.surfaceFlags & SURF_SLICK ) {
-		pm->ps->velocity[ 2 ] -= pm->ps->gravity * pml.frametime;
-	}
+    if (pml.groundTrace.surfaceFlags & SURF_SLICK) {
+        pm->ps->velocity[2] -= pm->ps->gravity * pml.frametime;
+    }
 
-	// slide along the ground plane
-	PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
-		pm->ps->velocity, OVERCLIP );
+    // slide along the ground plane
+    PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
 
-	// don't do anything if standing still
-	if( pm->ps->velocity[ 0 ] || pm->ps->velocity[ 1 ] )
-	{
-		PM_StepSlideMove( qtrue );
-	}
+    // don't do anything if standing still
+    if (pm->ps->velocity[0] || pm->ps->velocity[1]) {
+        PM_StepSlideMove(qtrue);
+    }
 
-	PM_CheckFeet( wishdir );
+    PM_CheckFeet(wishdir);
 }
 
 /*
@@ -693,100 +628,105 @@ static void PM_WalkMove( void ) {
 PM_DeadMove
 ==============
 */
-static void PM_DeadMove( void ) {
-	float	forward;
+static void PM_DeadMove(void)
+{
+    float forward;
 
-	if ( !pml.walking ) {
-		return;
-	}
+    if (!pml.walking) {
+        return;
+    }
 
-	// extra friction
+    // extra friction
 
-	forward = VectorLength (pm->ps->velocity);
-	forward -= 20;
-	if ( forward <= 0 ) {
-		VectorClear (pm->ps->velocity);
-	} else {
-		VectorNormalize (pm->ps->velocity);
-		VectorScale (pm->ps->velocity, forward, pm->ps->velocity);
-	}
+    forward = VectorLength(pm->ps->velocity);
+    forward -= 20;
+    if (forward <= 0) {
+        VectorClear(pm->ps->velocity);
+    } else {
+        VectorNormalize(pm->ps->velocity);
+        VectorScale(pm->ps->velocity, forward, pm->ps->velocity);
+    }
 }
 
-
 /*
 ===============
 PM_NoclipMove
 ===============
 */
-static void PM_NoclipMove( void )
+static void PM_NoclipMove(void)
 {
-	float	   speed;
-	float    drop;
-	float    friction;
-	float    control;
-	float    newspeed;
-	int		i;
-	vec3_t	wishvel;
-	float		fmove;
-	float    smove;
-	vec3_t	wishdir;
-	float		wishspeed;
-	float		scale;
+    float  speed;
+    float  drop;
+    float  friction;
+    float  control;
+    float  newspeed;
+    int    i;
+    vec3_t wishvel;
+    float  fmove;
+    float  smove;
+    vec3_t wishdir;
+    float  wishspeed;
+    float  scale;
 
-	pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-	pm->ps->groundEntityNum = ENTITYNUM_NONE;
+    pm->ps->viewheight      = DEFAULT_VIEWHEIGHT;
+    pm->ps->groundEntityNum = ENTITYNUM_NONE;
 
-	// friction
+    // friction
 
-	speed = VectorLength( pm->ps->velocity );
-	if( speed < 1 )
-	{
-		VectorCopy( vec3_origin, pm->ps->velocity );
-	}
-	else
-	{
-		drop = 0;
+    speed = VectorLength(pm->ps->velocity);
+    if (speed < 1) {
+        VectorCopy(vec3_origin, pm->ps->velocity);
+    } else {
+        drop = 0;
 
-		// extra friction
-		friction = pm_friction * 1.5;
+        // extra friction
+        friction = pm_friction * 1.5;
 
-		control = speed < pm_stopspeed ? pm_stopspeed : speed;
-		drop += control * friction * pml.frametime;
+        control = speed < pm_stopspeed ? pm_stopspeed : speed;
+        drop += control * friction * pml.frametime;
 
-		// scale the velocity
-		newspeed = speed - drop;
-		if( newspeed < 0 )
-		{
-			newspeed = 0;
-		}
-		newspeed /= speed;
+        // scale the velocity
+        newspeed = speed - drop;
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
 
-		VectorScale( pm->ps->velocity, newspeed, pm->ps->velocity );
-	}
+        VectorScale(pm->ps->velocity, newspeed, pm->ps->velocity);
+    }
 
-	// accelerate
-	// allow the player to move twice as fast in noclip
-	scale = PM_CmdScale( &pm->cmd ) * 2;
+    // accelerate
+    // allow the player to move twice as fast in noclip
+    scale = PM_CmdScale(&pm->cmd) * 2;
 
-	PM_GetMove( &fmove, &smove );
+    PM_GetMove(&fmove, &smove);
 
-	pm->ps->pm_time = 0;
+    pm->ps->pm_time = 0;
 
-	for( i = 0; i < 3; i++ )
-	{
-		wishvel[ i ] = pml.flat_forward[ i ] * fmove - pml.flat_left[ i ] * smove;
-	}
+    for (i = 0; i < 3; i++) {
+        wishvel[i] = pml.flat_forward[i] * fmove - pml.flat_left[i] * smove;
+    }
 
-	wishvel[ 2 ] += pm->cmd.upmove;
+    wishvel[2] += pm->cmd.upmove;
 
-	VectorCopy( wishvel, wishdir );
-	wishspeed = VectorNormalize( wishdir );
-	wishspeed *= scale;
+    VectorCopy(wishvel, wishdir);
+    wishspeed = VectorNormalize(wishdir);
+    wishspeed *= scale;
 
-	PM_Accelerate( wishdir, wishspeed, pm_accelerate );
+    PM_Accelerate(wishdir, wishspeed, pm_accelerate);
 
-	// move
-	VectorMA( pm->ps->origin, pml.frametime, pm->ps->velocity, pm->ps->origin );
+    // move
+    VectorMA(pm->ps->origin, pml.frametime, pm->ps->velocity, pm->ps->origin);
+
+    // Added in 2.0
+    //  If the player is out of bounds in noclip mode,
+    //  teleport it back to the (0,0,0) coordinates
+    for (i = 0; i < 3; i++) {
+        if (fabs(pm->ps->origin[i]) >= MAX_MAP_BOUNDS - 512) {
+            VectorClear(pm->ps->origin);
+            break;
+        }
+    }
 }
 
 //============================================================================
@@ -798,74 +738,62 @@ PM_CrashLand
 Check for hard landings that generate sound events
 =================
 */
-static void PM_CrashLand( void )
+static void PM_CrashLand(void)
 {
-	float delta;
-	float	dist;
-	float	vel;
-	float	acc;
-	float	t;
-	float	a, b, c, den;
+    float delta;
+    float dist;
+    float vel;
+    float acc;
+    float t;
+    float a, b, c, den;
 
-	// calculate the exact velocity on landing
-	dist = pm->ps->origin[ 2 ] - pml.previous_origin[ 2 ];
-	vel = pml.previous_velocity[ 2 ];
-	acc = -pm->ps->gravity;
+    // calculate the exact velocity on landing
+    dist = pm->ps->origin[2] - pml.previous_origin[2];
+    vel  = pml.previous_velocity[2];
+    acc  = -pm->ps->gravity;
 
-	a = acc / 2;
-	b = vel;
-	c = -dist;
+    a = acc / 2;
+    b = vel;
+    c = -dist;
 
-	den = b * b - 4 * a * c;
-	if( den < 0 )
-	{
-		return;
-	}
+    den = b * b - 4 * a * c;
+    if (den < 0) {
+        return;
+    }
 
-	//t = ( -b - sqrt( den ) ) / ( 2 * a );
-	t = sqrt( den ) + vel;
+    //t = ( -b - sqrt( den ) ) / ( 2 * a );
+    t = sqrt(den) + vel;
 
-	//delta = vel + t * acc;
-	delta = vel - t;
-	delta = delta * delta * 0.0001;
+    //delta = vel + t * acc;
+    delta = vel - t;
+    delta = delta * delta * 0.0001;
 
-	// reduce falling damage if there is standing water
-	if( pm->waterlevel == 2 )
-	{
-		delta *= 0.25f;
-	}
+    // reduce falling damage if there is standing water
+    if (pm->waterlevel == 2) {
+        delta *= 0.25f;
+    }
 
-	if( pm->waterlevel == 1 )
-	{
-		delta *= 0.5f;
-	}
+    if (pm->waterlevel == 1) {
+        delta *= 0.5f;
+    }
 
-	if( delta < 1 )
-	{
-		return;
-	}
+    if (delta < 1) {
+        return;
+    }
 
-	// SURF_NODAMAGE is used for bounce pads where you don't ever
-	// want to take damage or play a crunch sound
-	if( !( pml.groundTrace.surfaceFlags & SURF_NODAMAGE ) )
-	{
-		if( delta > 100 )
-		{
-			pm->pmoveEvent = EV_FALL_FATAL;
-		}
-		else if( delta > 80 )
-		{
-			pm->pmoveEvent = EV_FALL_FAR;
-		}
-		else if( delta > 40 )
-		{
-			pm->pmoveEvent = EV_FALL_MEDIUM;
-		}
-		else if( delta > 20 )
-		{
-			pm->pmoveEvent = EV_FALL_SHORT;
-		}
-	}
+    // SURF_NODAMAGE is used for bounce pads where you don't ever
+    // want to take damage or play a crunch sound
+    if (!(pml.groundTrace.surfaceFlags & SURF_NODAMAGE)) {
+        if (delta > 100) {
+            pm->pmoveEvent = EV_FALL_FATAL;
+        } else if (delta > 80) {
+            pm->pmoveEvent = EV_FALL_FAR;
+        } else if (delta > 40) {
+            pm->pmoveEvent = EV_FALL_MEDIUM;
+        } else if (delta > 20) {
+            pm->pmoveEvent = EV_FALL_SHORT;
+        }
+    }
 }
 
 /*
@@ -889,43 +817,45 @@ void PM_CheckStuck(void) {
 PM_CorrectAllSolid
 =============
 */
-static int PM_CorrectAllSolid( trace_t *trace )
+static int PM_CorrectAllSolid(trace_t *trace)
 {
-	int			i, j, k;
-	vec3_t		point;
+    int    i, j, k;
+    vec3_t point;
 
-	if ( pm->debugLevel ) {
-		Com_Printf("%i:allsolid\n", c_pmove);
-	}
+    if (pm->debugLevel) {
+        Com_Printf("%i:allsolid\n", c_pmove);
+    }
 
-	// jitter around
-	for (i = -1; i <= 1; i++) {
-		for (j = -1; j <= 1; j++) {
-			for (k = -1; k <= 1; k++) {
-				VectorCopy(pm->ps->origin, point);
-				point[0] += (float) i;
-				point[1] += (float) j;
-				point[2] += (float) k;
-				pm->trace( trace, point, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false );
-				if ( !trace->allsolid && !trace->startsolid ) {
-					point[0] = pm->ps->origin[0];
-					point[1] = pm->ps->origin[1];
-					point[2] = pm->ps->origin[2] - 0.25;
+    // jitter around
+    for (i = -1; i <= 1; i++) {
+        for (j = -1; j <= 1; j++) {
+            for (k = -1; k <= 1; k++) {
+                VectorCopy(pm->ps->origin, point);
+                point[0] += (float)i;
+                point[1] += (float)j;
+                point[2] += (float)k;
+                pm->trace(trace, point, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false);
+                if (!trace->allsolid && !trace->startsolid) {
+                    point[0] = pm->ps->origin[0];
+                    point[1] = pm->ps->origin[1];
+                    point[2] = pm->ps->origin[2] - 0.25;
 
-					pm->trace( trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false );
-					pml.groundTrace = *trace;
-					pm->ps->groundTrace = *trace;
-					return qtrue;
-				}
-			}
-		}
-	}
+                    pm->trace(
+                        trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, false
+                    );
+                    pml.groundTrace     = *trace;
+                    pm->ps->groundTrace = *trace;
+                    return qtrue;
+                }
+            }
+        }
+    }
 
-	//pm->ps->groundEntityNum = ENTITYNUM_NONE;
-	//pml.groundPlane = qfalse;
-	//pml.walking = qfalse;
+    //pm->ps->groundEntityNum = ENTITYNUM_NONE;
+    //pml.groundPlane = qfalse;
+    //pml.walking = qfalse;
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -933,146 +863,140 @@ static int PM_CorrectAllSolid( trace_t *trace )
 PM_GroundTrace
 =============
 */
-static void PM_GroundTrace( void ) {
-	vec3_t		point;
-	trace_t		trace;
+static void PM_GroundTrace(void)
+{
+    vec3_t  point;
+    trace_t trace;
 
-	point[ 0 ] = pm->ps->origin[ 0 ];
-	point[ 1 ] = pm->ps->origin[ 1 ];
-	point[ 2 ] = pm->ps->origin[ 2 ] - 0.25f;
+    point[0] = pm->ps->origin[0];
+    point[1] = pm->ps->origin[1];
+    point[2] = pm->ps->origin[2] - 0.25f;
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-	pml.groundTrace = trace;
-	pm->ps->groundTrace = trace;
+    pml.groundTrace     = trace;
+    pm->ps->groundTrace = trace;
 
-	// do something corrective if the trace starts in a solid...
-	if ( trace.allsolid || trace.startsolid )
-	{
-		if( !PM_CorrectAllSolid( &trace ) ) {
-			trace.fraction = 1.0f;
-		}
-	}
+    // do something corrective if the trace starts in a solid...
+    if (trace.allsolid || trace.startsolid) {
+        if (!PM_CorrectAllSolid(&trace)) {
+            trace.fraction = 1.0f;
+        }
+    }
 
-	// if the trace didn't hit anything, we are in free fall
-	if ( trace.fraction == 1.0 )
-	{
-		pm->ps->groundEntityNum = ENTITYNUM_NONE;
-		pml.groundPlane = qfalse;
-		pml.walking = qfalse;
+    // if the trace didn't hit anything, we are in free fall
+    if (trace.fraction == 1.0) {
+        pm->ps->groundEntityNum = ENTITYNUM_NONE;
+        pml.groundPlane         = qfalse;
+        pml.walking             = qfalse;
 
-		pm->ps->walking = pml.walking;
-		pm->ps->groundPlane = pml.groundPlane;
-		return;
-	}
+        pm->ps->walking     = pml.walking;
+        pm->ps->groundPlane = pml.groundPlane;
+        return;
+    }
 
-	// check if getting thrown off the ground
-	if( pm->ps->velocity[ 2 ] > 0.0f && DotProduct( pm->ps->velocity, trace.plane.normal ) > 150.0f )
-	{
-		if ( pm->debugLevel ) {
-			Com_Printf("%i:kickoff\n", c_pmove);
-		}
+    // check if getting thrown off the ground
+    if (pm->ps->velocity[2] > 0.0f && DotProduct(pm->ps->velocity, trace.plane.normal) > 150.0f) {
+        if (pm->debugLevel) {
+            Com_Printf("%i:kickoff\n", c_pmove);
+        }
 
-		pm->ps->groundEntityNum = ENTITYNUM_NONE;
-		pml.groundPlane = qfalse;
-		pml.walking = qfalse;
+        pm->ps->groundEntityNum = ENTITYNUM_NONE;
+        pml.groundPlane         = qfalse;
+        pml.walking             = qfalse;
 
-		pm->ps->walking = pml.walking;
-		pm->ps->groundPlane = pml.groundPlane;
-		return;
-	}
+        pm->ps->walking     = pml.walking;
+        pm->ps->groundPlane = pml.groundPlane;
+        return;
+    }
 
-	// slopes that are too steep will not be considered onground
-	if( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-	{
-		vec3_t oldvel;
-		float d;
+    // slopes that are too steep will not be considered onground
+    if (trace.plane.normal[2] < MIN_WALK_NORMAL) {
+        vec3_t oldvel;
+        float  d;
 
-		if ( pm->debugLevel ) {
-			Com_Printf("%i:steep\n", c_pmove);
-		}
+        if (pm->debugLevel) {
+            Com_Printf("%i:steep\n", c_pmove);
+        }
 
-		VectorCopy( pm->ps->velocity, oldvel );
-		VectorSet( pm->ps->velocity, 0, 0, -1.0f / pml.frametime );
-		PM_SlideMove( qfalse );
+        VectorCopy(pm->ps->velocity, oldvel);
+        VectorSet(pm->ps->velocity, 0, 0, -1.0f / pml.frametime);
+        PM_SlideMove(qfalse);
 
-		d = VectorLength( pm->ps->velocity );
-		VectorCopy( oldvel, pm->ps->velocity );
+        d = VectorLength(pm->ps->velocity);
+        VectorCopy(oldvel, pm->ps->velocity);
 
-		if( d > ( 0.1f / pml.frametime ) )
-		{
-			pm->ps->groundEntityNum = ENTITYNUM_NONE;
-			pml.groundPlane = qtrue;
-			pml.walking = qfalse;
+        if (d > (0.1f / pml.frametime)) {
+            pm->ps->groundEntityNum = ENTITYNUM_NONE;
+            pml.groundPlane         = qtrue;
+            pml.walking             = qfalse;
 
-			pm->ps->walking = pml.walking;
-			pm->ps->groundPlane = pml.groundPlane;
-			return;
-		}
-	}
+            pm->ps->walking     = pml.walking;
+            pm->ps->groundPlane = pml.groundPlane;
+            return;
+        }
+    }
 
-	pml.groundPlane = qtrue;
-	pml.walking = qtrue;
+    pml.groundPlane = qtrue;
+    pml.walking     = qtrue;
 
-	if ( pm->ps->groundEntityNum == ENTITYNUM_NONE )
-	{
-		// just hit the ground
-		if ( pm->debugLevel ) {
-			Com_Printf( "%i:Land\n", c_pmove );
-		}
+    if (pm->ps->groundEntityNum == ENTITYNUM_NONE) {
+        // just hit the ground
+        if (pm->debugLevel) {
+            Com_Printf("%i:Land\n", c_pmove);
+        }
 
-		PM_CrashLand();
-	}
+        PM_CrashLand();
+    }
 
-	pm->ps->groundEntityNum = trace.entityNum;
+    pm->ps->groundEntityNum = trace.entityNum;
 
-	PM_AddTouchEnt( trace.entityNum );
+    PM_AddTouchEnt(trace.entityNum);
 
-	pm->ps->walking = pml.walking;
-	pm->ps->groundPlane = pml.groundPlane;
+    pm->ps->walking     = pml.walking;
+    pm->ps->groundPlane = pml.groundPlane;
 }
 
-
 /*
 =============
 PM_SetWaterLevel	FIXME: avoid this twice?  certainly if not moving
 =============
 */
-static void PM_SetWaterLevel( void ) {
-	vec3_t		point;
-	int			cont;
-	int			sample1;
-	int			sample2;
+static void PM_SetWaterLevel(void)
+{
+    vec3_t point;
+    int    cont;
+    int    sample1;
+    int    sample2;
 
-	//
-	// get waterlevel, accounting for ducking
-	//
-	pm->waterlevel = 0;
-	pm->watertype = 0;
+    //
+    // get waterlevel, accounting for ducking
+    //
+    pm->waterlevel = 0;
+    pm->watertype  = 0;
 
-	point[0] = pm->ps->origin[0];
-	point[1] = pm->ps->origin[1];
-	point[2] = pm->ps->origin[2] + MINS_Z + 1;
-	cont = pm->pointcontents( point, pm->ps->clientNum );
+    point[0] = pm->ps->origin[0];
+    point[1] = pm->ps->origin[1];
+    point[2] = pm->ps->origin[2] + MINS_Z + 1;
+    cont     = pm->pointcontents(point, pm->ps->clientNum);
 
-	if ( cont & MASK_WATER ) {
-		sample2 = pm->ps->viewheight - MINS_Z;
-		sample1 = sample2 / 2;
-
-		pm->watertype = cont;
-		pm->waterlevel = 1;
-		point[2] = pm->ps->origin[2] + MINS_Z + sample1;
-		cont = pm->pointcontents (point, pm->ps->clientNum );
-		if ( cont & MASK_WATER ) {
-			pm->waterlevel = 2;
-			point[2] = pm->ps->origin[2] + MINS_Z + sample2;
-			cont = pm->pointcontents (point, pm->ps->clientNum );
-			if ( cont & MASK_WATER ){
-				pm->waterlevel = 3;
-			}
-		}
-	}
+    if (cont & MASK_WATER) {
+        sample2 = pm->ps->viewheight - MINS_Z;
+        sample1 = sample2 / 2;
 
+        pm->watertype  = cont;
+        pm->waterlevel = 1;
+        point[2]       = pm->ps->origin[2] + MINS_Z + sample1;
+        cont           = pm->pointcontents(point, pm->ps->clientNum);
+        if (cont & MASK_WATER) {
+            pm->waterlevel = 2;
+            point[2]       = pm->ps->origin[2] + MINS_Z + sample2;
+            cont           = pm->pointcontents(point, pm->ps->clientNum);
+            if (cont & MASK_WATER) {
+                pm->waterlevel = 3;
+            }
+        }
+    }
 }
 
 /*
@@ -1082,159 +1006,134 @@ PM_CheckDuck
 Sets mins, maxs, and pm->ps->viewheight
 ==============
 */
-static void PM_CheckDuck( void )
+static void PM_CheckDuck(void)
 {
-	pm->mins[ 0 ] = -15.0f;
-	pm->mins[ 1 ] = -15.0f;
+    pm->mins[0] = -15.0f;
+    pm->mins[1] = -15.0f;
 
-	pm->maxs[ 0 ] = 15.0f;
-	pm->maxs[ 1 ] = 15.0f;
+    pm->maxs[0] = 15.0f;
+    pm->maxs[1] = 15.0f;
 
-	pm->mins[ 2 ] = MINS_Z;
+    pm->mins[2] = MINS_Z;
 
-	if( pm->ps->pm_type == PM_DEAD )
-	{
-		pm->maxs[ 2 ] = DEAD_MINS_Z;
-		pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		return;
-	}
+    if (pm->ps->pm_type == PM_DEAD) {
+        pm->maxs[2]        = DEAD_MINS_Z;
+        pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        return;
+    }
 
-	if (pm->protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		//
-		// Prone was removed in 2.0
-		//
-		if (pm->ps->pm_flags & PMF_DUCKED)
-		{
-			pm->maxs[2] = 54.f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
-		}
-		else
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-	} else {
-		if ((pm->ps->pm_flags & (PMF_DUCKED | PMF_VIEW_PRONE)) == (PMF_DUCKED | PMF_VIEW_PRONE))
-		{
-			pm->maxs[2] = 54.0f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_DUCKED)
-		{
-			pm->maxs[2] = 60.0f;
-			pm->ps->viewheight = CROUCH_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_PRONE)
-		{
-			pm->maxs[2] = 20.0f;
-			pm->ps->viewheight = PRONE_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_DUCK_RUN)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->mins[2] = 54.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-		else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START)
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
-		}
-		else
-		{
-			pm->maxs[2] = 94.0f;
-			pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
-		}
-	}
+    if (pm->protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        //
+        // Prone was removed in 2.0
+        //
+        if (pm->ps->pm_flags & PMF_DUCKED) {
+            pm->maxs[2]        = 54.f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START) {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
+        } else {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        }
+    } else {
+        if ((pm->ps->pm_flags & (PMF_DUCKED | PMF_VIEW_PRONE)) == (PMF_DUCKED | PMF_VIEW_PRONE)) {
+            pm->maxs[2]        = 54.0f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_DUCKED) {
+            pm->maxs[2]        = 60.0f;
+            pm->ps->viewheight = CROUCH_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_PRONE) {
+            pm->maxs[2]        = 20.0f;
+            pm->ps->viewheight = PRONE_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_DUCK_RUN) {
+            pm->maxs[2]        = 94.0f;
+            pm->mins[2]        = 54.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        } else if (pm->ps->pm_flags & PMF_VIEW_JUMP_START) {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = JUMP_START_VIEWHEIGHT;
+        } else {
+            pm->maxs[2]        = 94.0f;
+            pm->ps->viewheight = DEFAULT_VIEWHEIGHT;
+        }
+    }
 }
 
-
-
 //===================================================================
 
-
 /*
 ===============
 PM_Footsteps
 ===============
 */
-static void PM_Footsteps( void ) {
-	float		bobmove;
-	int			old;
-	qboolean	footstep;
+static void PM_Footsteps(void)
+{
+    float    bobmove;
+    int      old;
+    qboolean footstep;
 
-	//
-	// calculate speed and cycle to be used for
-	// all cyclic walking effects
-	//
-	pm->xyspeed = sqrt( pm->ps->velocity[0] * pm->ps->velocity[0]
-		+  pm->ps->velocity[1] * pm->ps->velocity[1] );
+    //
+    // calculate speed and cycle to be used for
+    // all cyclic walking effects
+    //
+    pm->xyspeed = sqrt(pm->ps->velocity[0] * pm->ps->velocity[0] + pm->ps->velocity[1] * pm->ps->velocity[1]);
 
-	if ( pm->ps->groundEntityNum == ENTITYNUM_NONE ) {
+    if (pm->ps->groundEntityNum == ENTITYNUM_NONE) {
+        //		if ( pm->ps->powerups[PW_INVULNERABILITY] ) {
+        //			PM_ContinueLegsAnim( LEGS_IDLECR );
+        //		}
+        // airborne leaves position in cycle intact, but doesn't advance
+        if (pm->waterlevel > 1) {
+            //			PM_ContinueLegsAnim( LEGS_SWIM );
+        }
+        return;
+    }
 
-//		if ( pm->ps->powerups[PW_INVULNERABILITY] ) {
-//			PM_ContinueLegsAnim( LEGS_IDLECR );
-//		}
-		// airborne leaves position in cycle intact, but doesn't advance
-		if ( pm->waterlevel > 1 ) {
-//			PM_ContinueLegsAnim( LEGS_SWIM );
-		}
-		return;
-	}
+    // if not trying to move
+    if (!pm->cmd.forwardmove && !pm->cmd.rightmove) {
+        if (pm->xyspeed < 5) {
+            pm->ps->bobCycle = 0; // start at beginning of cycle again
+            if (pm->ps->pm_flags & PMF_DUCKED) {
+                //				PM_ContinueLegsAnim( LEGS_IDLECR );
+            } else {
+                //				PM_ContinueLegsAnim( LEGS_IDLE );
+            }
+        }
+        return;
+    }
 
-	// if not trying to move
-	if ( !pm->cmd.forwardmove && !pm->cmd.rightmove ) {
-		if (  pm->xyspeed < 5 ) {
-			pm->ps->bobCycle = 0;	// start at beginning of cycle again
-			if ( pm->ps->pm_flags & PMF_DUCKED ) {
-//				PM_ContinueLegsAnim( LEGS_IDLECR );
-			} else {
-//				PM_ContinueLegsAnim( LEGS_IDLE );
-			}
-		}
-		return;
-	}
+    footstep = qfalse;
 
+    if (!(pm->cmd.buttons & BUTTON_RUN)) {
+        bobmove = 0.4f; // faster speeds bob faster
 
-	footstep = qfalse;
+        footstep = qtrue;
+    } else {
+        bobmove = 0.3f; // walking bobs slow
+    }
 
+    // check for footstep / splash sounds
+    old              = pm->ps->bobCycle;
+    pm->ps->bobCycle = (int)(old + bobmove * pml.msec) & 255;
 
-	if( !( pm->cmd.buttons & BUTTON_RUN ) )
-	{
-		bobmove = 0.4f;	// faster speeds bob faster
-
-		footstep = qtrue;
-	} else {
-		bobmove = 0.3f;	// walking bobs slow
-	}
-
-	// check for footstep / splash sounds
-	old = pm->ps->bobCycle;
-	pm->ps->bobCycle = (int)( old + bobmove * pml.msec ) & 255;
-
-	// if we just crossed a cycle boundary, play an apropriate footstep event
-	if ( ( ( old + 64 ) ^ ( pm->ps->bobCycle + 64 ) ) & 128 ) {
-		if ( pm->waterlevel == 0 ) {
-			// on ground will only play sounds if running
-			if ( footstep && !pm->noFootsteps ) {
-//				PM_AddEvent( PM_FootstepForSurface() );
-			}
-		} else if ( pm->waterlevel == 1 ) {
-			// splashing
-//			PM_AddEvent( EV_FOOTSPLASH );
-		} else if ( pm->waterlevel == 2 ) {
-			// wading / swimming at surface
-//			PM_AddEvent( EV_SWIM );
-		} else if ( pm->waterlevel == 3 ) {
-			// no sound when completely underwater
-
-		}
-	}
+    // if we just crossed a cycle boundary, play an apropriate footstep event
+    if (((old + 64) ^ (pm->ps->bobCycle + 64)) & 128) {
+        if (pm->waterlevel == 0) {
+            // on ground will only play sounds if running
+            if (footstep && !pm->noFootsteps) {
+                //				PM_AddEvent( PM_FootstepForSurface() );
+            }
+        } else if (pm->waterlevel == 1) {
+            // splashing
+            //			PM_AddEvent( EV_FOOTSPLASH );
+        } else if (pm->waterlevel == 2) {
+            // wading / swimming at surface
+            //			PM_AddEvent( EV_SWIM );
+        } else if (pm->waterlevel == 3) {
+            // no sound when completely underwater
+        }
+    }
 }
 
 /*
@@ -1244,62 +1143,51 @@ PM_WaterEvents
 Generate sound events for entering and leaving water
 ==============
 */
-static void PM_WaterEvents( void )
+static void PM_WaterEvents(void)
 {
-	// FIXME?
-	//
-	// if just entered a water volume, play a sound
-	//
-	if( !pml.previous_waterlevel && pm->waterlevel )
-	{
-		pm->pmoveEvent = EV_WATER_TOUCH;
-	}
+    // FIXME?
+    //
+    // if just entered a water volume, play a sound
+    //
+    if (!pml.previous_waterlevel && pm->waterlevel) {
+        pm->pmoveEvent = EV_WATER_TOUCH;
+    }
 
-	//
-	// if just completely exited a water volume, play a sound
-	//
-	if( pml.previous_waterlevel && !pm->waterlevel )
-	{
-		pm->pmoveEvent = EV_WATER_LEAVE;
-	}
+    //
+    // if just completely exited a water volume, play a sound
+    //
+    if (pml.previous_waterlevel && !pm->waterlevel) {
+        pm->pmoveEvent = EV_WATER_LEAVE;
+    }
 
-	//
-	// check for head just going under water
-	//
-	if( ( pml.previous_waterlevel != 3 ) && ( pm->waterlevel == 3 ) )
-	{
-		pm->pmoveEvent = EV_WATER_UNDER;
-	}
+    //
+    // check for head just going under water
+    //
+    if ((pml.previous_waterlevel != 3) && (pm->waterlevel == 3)) {
+        pm->pmoveEvent = EV_WATER_UNDER;
+    }
 
-	//
-	// check for head just coming out of water
-	//
-	if( ( pml.previous_waterlevel == 3 ) && ( pm->waterlevel != 3 ) )
-	{
-		pm->pmoveEvent = EV_WATER_CLEAR;
-	}
+    //
+    // check for head just coming out of water
+    //
+    if ((pml.previous_waterlevel == 3) && (pm->waterlevel != 3)) {
+        pm->pmoveEvent = EV_WATER_CLEAR;
+    }
 }
 
-
 /*
 ===============
 PM_BeginWeaponChange
 ===============
 */
-static void PM_BeginWeaponChange( int weapon ) {
-
-}
-
+static void PM_BeginWeaponChange(int weapon) {}
 
 /*
 ===============
 PM_FinishWeaponChange
 ===============
 */
-static void PM_FinishWeaponChange( void ) {
-	
-}
-
+static void PM_FinishWeaponChange(void) {}
 
 /*
 ==============
@@ -1307,18 +1195,18 @@ PM_TorsoAnimation
 
 ==============
 */
-static void PM_TorsoAnimation( void ) {
-	//if ( pm->ps->weaponstate == WEAPON_READY ) {
-	//	if ( pm->ps->weapon == WP_GAUNTLET ) {
-	//		PM_ContinueTorsoAnim( TORSO_STAND2 );
-	//	} else {
-	//		PM_ContinueTorsoAnim( TORSO_STAND );
-	//	}
-	//	return;
-	//}
+static void PM_TorsoAnimation(void)
+{
+    //if ( pm->ps->weaponstate == WEAPON_READY ) {
+    //	if ( pm->ps->weapon == WP_GAUNTLET ) {
+    //		PM_ContinueTorsoAnim( TORSO_STAND2 );
+    //	} else {
+    //		PM_ContinueTorsoAnim( TORSO_STAND );
+    //	}
+    //	return;
+    //}
 }
 
-
 /*
 ==============
 PM_Weapon
@@ -1326,9 +1214,7 @@ PM_Weapon
 Generates weapon events and modifes the weapon counter
 ==============
 */
-static void PM_Weapon( void ) {
-	
-}
+static void PM_Weapon(void) {}
 
 /*
 ================
@@ -1336,19 +1222,16 @@ PM_Animate
 ================
 */
 
-static void PM_Animate( void ) {
-
-}
-
+static void PM_Animate(void) {}
 
 /*
 ================
 PM_DropTimers
 ================
 */
-static void PM_DropTimers( void )
+static void PM_DropTimers(void)
 {
-	pm->ps->pm_flags &= ~PMF_RESPAWNED;
+    pm->ps->pm_flags &= ~PMF_RESPAWNED;
 }
 
 /*
@@ -1359,47 +1242,39 @@ This can be used as another entry point when only the viewangles
 are being updated isntead of a full move
 ================
 */
-void PM_UpdateViewAngles( playerState_t *ps, const usercmd_t *cmd )
+void PM_UpdateViewAngles(playerState_t *ps, const usercmd_t *cmd)
 {
-	short	temp;
-	int	i;
+    short temp;
+    int   i;
 
-	if( ps->pm_flags & PMF_FROZEN )
-	{
-		// no view changes at all
-		return;
-	}
+    if (ps->pm_flags & PMF_FROZEN) {
+        // no view changes at all
+        return;
+    }
 
-	if( ps->stats[ STAT_HEALTH ] <= 0 )
-	{
-		// no view changes at all
-		return;
-	}
+    if (ps->stats[STAT_HEALTH] <= 0) {
+        // no view changes at all
+        return;
+    }
 
-	// circularly clamp the angles with deltas
-	for( i = 0; i < 3; i++ )
-	{
-		temp = cmd->angles[ i ] + ps->delta_angles[ i ];
-		if( i == PITCH )
-		{
-			// don't let the player look up or down more than 90 degrees
-			if( temp > 16000 )
-			{
-				ps->delta_angles[ i ] = 16000 - cmd->angles[ i ];
-				temp = 16000;
-			}
-			else if( temp < -16000 )
-			{
-				ps->delta_angles[ i ] = -16000 - cmd->angles[ i ];
-				temp = -16000;
-			}
-		}
+    // circularly clamp the angles with deltas
+    for (i = 0; i < 3; i++) {
+        temp = cmd->angles[i] + ps->delta_angles[i];
+        if (i == PITCH) {
+            // don't let the player look up or down more than 90 degrees
+            if (temp > 16000) {
+                ps->delta_angles[i] = 16000 - cmd->angles[i];
+                temp                = 16000;
+            } else if (temp < -16000) {
+                ps->delta_angles[i] = -16000 - cmd->angles[i];
+                temp                = -16000;
+            }
+        }
 
-		ps->viewangles[ i ] = SHORT2ANGLE( temp );
-	}
+        ps->viewangles[i] = SHORT2ANGLE(temp);
+    }
 }
 
-
 /*
 ================
 PmoveSingle
@@ -1407,237 +1282,216 @@ PmoveSingle
 ================
 */
 
-void PmoveSingle( pmove_t *pmove )
+void PmoveSingle(pmove_t *pmove)
 {
-	vec3_t tempVec;
-	qboolean walking;
+    vec3_t   tempVec;
+    qboolean walking;
 
-	pm = pmove;
+    pm = pmove;
 
-	// this counter lets us debug movement problems with a journal
-	// by setting a conditional breakpoint fot the previous frame
-	c_pmove++;
+    // this counter lets us debug movement problems with a journal
+    // by setting a conditional breakpoint fot the previous frame
+    c_pmove++;
 
-	// clear results
-	pm->numtouch = 0;
-	pm->watertype = 0;
-	pm->waterlevel = 0;
+    // clear results
+    pm->numtouch   = 0;
+    pm->watertype  = 0;
+    pm->waterlevel = 0;
 
-	if( pm->ps->stats[ STAT_HEALTH ] <= 0 ) {
-		pm->tracemask &= ~( CONTENTS_BODY | CONTENTS_NOBOTCLIP );	// corpses can fly through bodies
-	}
+    if (pm->ps->stats[STAT_HEALTH] <= 0) {
+        pm->tracemask &= ~(CONTENTS_BODY | CONTENTS_NOBOTCLIP); // corpses can fly through bodies
+    }
 
-	if( pmove->cmd.buttons & BUTTON_TALK )
-	{
-		pmove->cmd.forwardmove = 0;
-		pmove->cmd.rightmove = 0;
-		pmove->cmd.upmove = 0;
-		pmove->cmd.buttons = BUTTON_TALK;
-		pm->ps->fLeanAngle = 0.0f;
-	}
+    if (pmove->cmd.buttons & BUTTON_TALK) {
+        pmove->cmd.forwardmove = 0;
+        pmove->cmd.rightmove   = 0;
+        pmove->cmd.upmove      = 0;
+        pmove->cmd.buttons     = BUTTON_TALK;
+        pm->ps->fLeanAngle     = 0.0f;
+    }
 
-	if( pm->ps->pm_type == PM_CLIMBWALL )
-	{
-		pm->ps->fLeanAngle = 0.0f;
-		pm->cmd.buttons &= ~( BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT );
-	}
+    if (pm->ps->pm_type == PM_CLIMBWALL) {
+        pm->ps->fLeanAngle = 0.0f;
+        pm->cmd.buttons &= ~(BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT);
+    }
 
-	// clear all pmove local vars
-	memset( &pml, 0, sizeof( pml ) );
+    // clear all pmove local vars
+    memset(&pml, 0, sizeof(pml));
 
-	// determine the time
-	pml.msec = pmove->cmd.serverTime - pm->ps->commandTime;
-	if ( pml.msec < 1 ) {
-		pml.msec = 1;
-	} else if ( pml.msec > 200 ) {
-		pml.msec = 200;
-	}
+    // determine the time
+    pml.msec = pmove->cmd.serverTime - pm->ps->commandTime;
+    if (pml.msec < 1) {
+        pml.msec = 1;
+    } else if (pml.msec > 200) {
+        pml.msec = 200;
+    }
 
-	pm->ps->commandTime = pmove->cmd.serverTime;
+    pm->ps->commandTime = pmove->cmd.serverTime;
 
-	// save old org in case we get stuck
-	VectorCopy( pm->ps->origin, pml.previous_origin );
+    // save old org in case we get stuck
+    VectorCopy(pm->ps->origin, pml.previous_origin);
 
-	// save old velocity for crashlanding
-	VectorCopy( pm->ps->velocity, pml.previous_velocity );
+    // save old velocity for crashlanding
+    VectorCopy(pm->ps->velocity, pml.previous_velocity);
 
-	pml.frametime = pml.msec * 0.001;
+    pml.frametime = pml.msec * 0.001;
 
-    if ((pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT) &&
-        (pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) != (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) &&
-        (!pm->cmd.forwardmove || pm->alwaysAllowLean) &&
-        (!pm->cmd.rightmove || pm->alwaysAllowLean) &&
-        (!pm->cmd.upmove || pm->alwaysAllowLean))
-	{
-		if( pm->cmd.buttons & BUTTON_LEAN_LEFT )
-		{
-			if( pm->ps->fLeanAngle <= -pm->leanMax)
-			{
-				pm->ps->fLeanAngle = -pm->leanMax;
-			}
-			else
-			{
-				float fAngle = pml.frametime * ( -pm->leanMax - pm->ps->fLeanAngle ) * pm->leanAdd;
-				float fLeanAngle = pml.frametime * -pm->leanSpeed;
+    if ((pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)
+         && (pm->cmd.buttons & (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT)) != (BUTTON_LEAN_LEFT | BUTTON_LEAN_RIGHT))
+        && (!pm->cmd.forwardmove || pm->alwaysAllowLean) && (!pm->cmd.rightmove || pm->alwaysAllowLean)
+        && (!pm->cmd.upmove || pm->alwaysAllowLean)) {
+        if (pm->cmd.buttons & BUTTON_LEAN_LEFT) {
+            if (pm->ps->fLeanAngle <= -pm->leanMax) {
+                pm->ps->fLeanAngle = -pm->leanMax;
+            } else {
+                float fAngle     = pml.frametime * (-pm->leanMax - pm->ps->fLeanAngle) * pm->leanAdd;
+                float fLeanAngle = pml.frametime * -pm->leanSpeed;
 
-				if( fAngle <= fLeanAngle ) {
-					fLeanAngle = fAngle;
-				}
+                if (fAngle <= fLeanAngle) {
+                    fLeanAngle = fAngle;
+                }
 
-				pm->ps->fLeanAngle += fLeanAngle;
-			}
-		}
-		else
-		{
-			if( pm->ps->fLeanAngle >= pm->leanMax )
-			{
-				pm->ps->fLeanAngle = pm->leanMax;
-			}
-			else
-			{
-				float fAngle = pm->leanMax - pm->ps->fLeanAngle;
-				float fLeanAngle = pml.frametime * pm->leanSpeed;
-				float fMult = pml.frametime * fAngle * pm->leanAdd;
+                pm->ps->fLeanAngle += fLeanAngle;
+            }
+        } else {
+            if (pm->ps->fLeanAngle >= pm->leanMax) {
+                pm->ps->fLeanAngle = pm->leanMax;
+            } else {
+                float fAngle     = pm->leanMax - pm->ps->fLeanAngle;
+                float fLeanAngle = pml.frametime * pm->leanSpeed;
+                float fMult      = pml.frametime * fAngle * pm->leanAdd;
 
-				if( fLeanAngle <= fMult )
-				{
-					fLeanAngle = fMult;
-				}
-				else
-				{
-					fLeanAngle = fMult;
-				}
+                if (fLeanAngle <= fMult) {
+                    fLeanAngle = fMult;
+                } else {
+                    fLeanAngle = fMult;
+                }
 
-				pm->ps->fLeanAngle += fLeanAngle;
-			}
-		}
-	}
-	else if( pm->ps->fLeanAngle )
-	{
-		float fAngle = pm->ps->fLeanAngle * pml.frametime * pm->leanRecoverSpeed;
+                pm->ps->fLeanAngle += fLeanAngle;
+            }
+        }
+    } else if (pm->ps->fLeanAngle) {
+        float fAngle = pm->ps->fLeanAngle * pml.frametime * pm->leanRecoverSpeed;
 
-		if( pm->ps->fLeanAngle <= 0.0f )
-		{
-			float fLeanAngle = pml.frametime * -pm->leanSpeed;
+        if (pm->ps->fLeanAngle <= 0.0f) {
+            float fLeanAngle = pml.frametime * -pm->leanSpeed;
 
-			if( fAngle <= fLeanAngle )
-			{
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle >= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
-			pm->ps->fLeanAngle -= fLeanAngle;
-		}
-		else
-		{
-			float fLeanAngle = pml.frametime * pm->leanSpeed;
+            pm->ps->fLeanAngle -= fLeanAngle;
+            if (pm->ps->fLeanAngle > 0) {
+                pm->ps->fLeanAngle = 0;
+            }
+        } else {
+            float fLeanAngle = pml.frametime * pm->leanSpeed;
 
-			if(fAngle >= fLeanAngle) {
-				fLeanAngle = fAngle;
-			}
+            if (fLeanAngle <= fAngle) {
+                fLeanAngle = fAngle;
+            }
 
-			pm->ps->fLeanAngle -= fLeanAngle;
-		}
-	}
+            pm->ps->fLeanAngle -= fLeanAngle;
+            if (pm->ps->fLeanAngle < 0) {
+                pm->ps->fLeanAngle = 0;
+            }
+        }
+    }
 
-	if (pm->ps->pm_flags & PMF_NO_LEAN) {
-		pm->ps->fLeanAngle = 0;
-	}
+    if (pm->ps->pm_flags & PMF_NO_LEAN) {
+        pm->ps->fLeanAngle = 0;
+    }
 
-	// update the viewangles
-	PM_UpdateViewAngles( pm->ps, &pm->cmd );
+    // update the viewangles
+    PM_UpdateViewAngles(pm->ps, &pm->cmd);
 
-	AngleVectorsLeft( pm->ps->viewangles, pml.forward, pml.left, pml.up );
-	VectorClear( tempVec );
-	tempVec[ YAW ] = pm->ps->viewangles[ YAW ];
-	AngleVectorsLeft( tempVec, pml.flat_forward, pml.flat_left, pml.flat_up );
+    AngleVectorsLeft(pm->ps->viewangles, pml.forward, pml.left, pml.up);
+    VectorClear(tempVec);
+    tempVec[YAW] = pm->ps->viewangles[YAW];
+    AngleVectorsLeft(tempVec, pml.flat_forward, pml.flat_left, pml.flat_up);
 
-	if ( pm->ps->pm_type >= PM_DEAD )
-	{
-		pm->cmd.forwardmove = 0;
-		pm->cmd.rightmove = 0;
-		pm->cmd.upmove = 0;
-		pm->ps->fLeanAngle = 0.0f;
-	}
+    if (pm->ps->pm_type >= PM_DEAD) {
+        pm->cmd.forwardmove = 0;
+        pm->cmd.rightmove   = 0;
+        pm->cmd.upmove      = 0;
+        pm->ps->fLeanAngle  = 0.0f;
+    }
 
-	if ( pm->ps->pm_type == PM_NOCLIP )
-	{
-		PM_NoclipMove();
-		PM_DropTimers();
-		return;
-	}
+    if (pm->ps->pm_type == PM_NOCLIP) {
+        PM_NoclipMove();
+        PM_DropTimers();
+        return;
+    }
 
-	if( ( pm->ps->pm_flags & PMF_NO_MOVE ) || ( pm->ps->pm_flags & PMF_FROZEN ) )
-	{
-		PM_CheckDuck();
-		return;
-	}
+    if ((pm->ps->pm_flags & PMF_NO_MOVE) || (pm->ps->pm_flags & PMF_FROZEN)) {
+        PM_CheckDuck();
+        return;
+    }
 
-	// set watertype, and waterlevel
-	PM_SetWaterLevel();
-	pml.previous_waterlevel = pmove->waterlevel;
+    // set watertype, and waterlevel
+    PM_SetWaterLevel();
+    pml.previous_waterlevel = pmove->waterlevel;
 
-	// set mins, maxs, and viewheight
-	PM_CheckDuck();
+    // set mins, maxs, and viewheight
+    PM_CheckDuck();
 
-	// set groundentity
-	PM_GroundTrace();
+    // set groundentity
+    PM_GroundTrace();
 
-	if ( pm->ps->pm_type == PM_DEAD ) {
-		PM_DeadMove();
-	}
+    if (pm->ps->pm_type == PM_DEAD) {
+        PM_DeadMove();
+    }
 
-	PM_DropTimers();
+    PM_DropTimers();
 
-	if ( pml.walking ) {
-		// walking on ground
-		PM_WalkMove();
-	} else {
-		// airborne
-		PM_AirMove();
-	}
+    if (pml.walking) {
+        // walking on ground
+        PM_WalkMove();
+    } else {
+        // airborne
+        PM_AirMove();
+    }
 
-	walking = pml.walking;
+    walking = pml.walking;
 
-	// set groundentity, watertype, and waterlevel
-	PM_GroundTrace();
-	PM_SetWaterLevel();
+    // set groundentity, watertype, and waterlevel
+    PM_GroundTrace();
+    PM_SetWaterLevel();
 
-	// don't fall down stairs or do really short falls
-	if( !pml.walking && ( walking || ( ( pml.previous_velocity[ 2 ] >= 0 ) && ( pm->ps->velocity[ 2 ] <= 0 ) ) ) )
-	{
-		vec3_t   point;
-		trace_t  trace;
+    // don't fall down stairs or do really short falls
+    if (!pml.walking && (walking || ((pml.previous_velocity[2] >= 0) && (pm->ps->velocity[2] <= 0)))) {
+        vec3_t  point;
+        trace_t trace;
 
-		point[ 0 ] = pm->ps->origin[ 0 ];
-		point[ 1 ] = pm->ps->origin[ 1 ];
-		point[ 2 ] = pm->ps->origin[ 2 ] - STEPSIZE;
+        point[0] = pm->ps->origin[0];
+        point[1] = pm->ps->origin[1];
+        point[2] = pm->ps->origin[2] - STEPSIZE;
 
-		pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( ( trace.fraction < 1.0f ) && ( !trace.allsolid ) )
-		{
-			VectorCopy( trace.endpos, pm->ps->origin );
+        pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if ((trace.fraction < 1.0f) && (!trace.allsolid)) {
+            VectorCopy(trace.endpos, pm->ps->origin);
 
-			// allow client to smooth out the step
-			pm->stepped = qtrue;
+            // allow client to smooth out the step
+            pm->stepped = qtrue;
 
-			// requantify the player's position
-			PM_GroundTrace();
-			PM_SetWaterLevel();
-		}
-	}
+            // requantify the player's position
+            PM_GroundTrace();
+            PM_SetWaterLevel();
+        }
+    }
 
-	// entering / leaving water splashes
-	PM_WaterEvents();
+    // entering / leaving water splashes
+    PM_WaterEvents();
 }
 
-void Pmove_GroundTrace( pmove_t *pmove )
+void Pmove_GroundTrace(pmove_t *pmove)
 {
-	memset( &pml, 0, sizeof( pml ) );
-	pml.msec = 1;
-	pml.frametime = 0.001f;
-	pm = pmove;
-	PM_CheckDuck();
-	PM_GroundTrace();
+    memset(&pml, 0, sizeof(pml));
+    pml.msec      = 1;
+    pml.frametime = 0.001f;
+    pm            = pmove;
+    PM_CheckDuck();
+    PM_GroundTrace();
 }
 
 /*
@@ -1647,219 +1501,234 @@ Pmove
 Can be called by either the server or the client
 ================
 */
-void Pmove( pmove_t *pmove ) {
-	int			finalTime;
-
-	finalTime = pmove->cmd.serverTime;
-
-	if( finalTime < pmove->ps->commandTime ) {
-		return;	// should not happen
-	}
-
-	if( finalTime > pmove->ps->commandTime + 1000 ) {
-		pmove->ps->commandTime = finalTime - 1000;
-	}
-
-	// chop the move up if it is too long, to prevent framerate
-	// dependent behavior
-	while( pmove->ps->commandTime != finalTime ) {
-		int		msec;
-
-		msec = finalTime - pmove->ps->commandTime;
-
-		if( pmove->pmove_fixed )
-		{
-			if( msec > pmove->pmove_msec )
-			{
-				msec = pmove->pmove_msec;
-			}
-		}
-		else if( msec > 66 ) {
-			msec = 66;
-		}
-
-		pmove->cmd.serverTime = pmove->ps->commandTime + msec;
-		PmoveSingle( pmove );
-	}
-}
-static void PmoveAdjustViewAngleSettings_OnLadder( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+void Pmove(pmove_t *pmove)
 {
-	float fDelta;
-	float deltayaw;
-	float yawAngle;
-	float temp;
+    int finalTime;
 
-	vAngles[ 0 ] = 0.0f;
-	vAngles[ 2 ] = 0.0f;
+    finalTime = pmove->cmd.serverTime;
 
-	if( vViewAngles[ 0 ] > 73.0f ) {
-		vViewAngles[ 0 ] = 73.0f;
-	}
+    if (finalTime < pmove->ps->commandTime) {
+        return; // should not happen
+    }
 
-	deltayaw = AngleSubtract( vViewAngles[ 1 ], vAngles[ 1 ] );
+    if (finalTime > pmove->ps->commandTime + 1000) {
+        pmove->ps->commandTime = finalTime - 1000;
+    }
 
-	yawAngle = 70.0f;
-	if( deltayaw <= 70.0f )
-	{
-		yawAngle = deltayaw;
-		if( deltayaw < -70.0f )
-		{
-			yawAngle = -70.0f;
-		}
-	}
+    // chop the move up if it is too long, to prevent framerate
+    // dependent behavior
+    while (pmove->ps->commandTime != finalTime) {
+        int msec;
 
-	vViewAngles[ 1 ] = vAngles[ 1 ] + yawAngle;
+        msec = finalTime - pmove->ps->commandTime;
 
-	fDelta = sqrt( yawAngle * yawAngle + vViewAngles[ 0 ] * vViewAngles[ 0 ] );
+        if (pmove->pmove_fixed) {
+            if (msec > pmove->pmove_msec) {
+                msec = pmove->pmove_msec;
+            }
+        } else if (msec > 66) {
+            msec = 66;
+        }
 
-	if( vViewAngles[ 0 ] <= 0.0f ) {
-		temp = 80.0f;
-	} else {
-		temp = 73.0f;
-	}
-
-	if( fDelta > temp )
-	{
-		float deltalimit = temp * 1.0f / fDelta;
-		vViewAngles[ 0 ] *= deltalimit;
-		vViewAngles[ 1 ] = yawAngle * deltalimit + vAngles[ 1 ];
-	}
+        pmove->cmd.serverTime = pmove->ps->commandTime + msec;
+        PmoveSingle(pmove);
+    }
 }
 
-void PmoveAdjustAngleSettings( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+static void PmoveAdjustViewAngleSettings_OnLadder(
+    vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState
+)
 {
-	vec3_t temp, temp2;
-	vec3_t armsAngles, torsoAngles, headAngles;
-	float fTmp;
+    float fDelta;
+    float deltayaw;
+    float yawAngle;
+    float temp;
 
-	if( pPlayerState->pm_type == PM_CLIMBWALL )
-	{
-		PmoveAdjustViewAngleSettings_OnLadder( vViewAngles, vAngles, pPlayerState, pEntState );
-		VectorSet( pEntState->bone_angles[ TORSO_TAG ], 0, 0, 0 );
-		VectorSet( pEntState->bone_angles[ ARMS_TAG ], 0, 0, 0 );
-		VectorSet( pEntState->bone_angles[ PELVIS_TAG ], 0, 0, 0 );
-		QuatSet( pEntState->bone_quat[ TORSO_TAG ], 0, 0, 0, 1 );
-		QuatSet( pEntState->bone_quat[ ARMS_TAG ], 0, 0, 0, 1 );
-		QuatSet( pEntState->bone_quat[ PELVIS_TAG ], 0, 0, 0, 1 );
+    vAngles[0] = 0.0f;
+    vAngles[2] = 0.0f;
 
-		AnglesSubtract( vViewAngles, vAngles, headAngles );
-		VectorScale( headAngles, 0.5f, pEntState->bone_angles[ HEAD_TAG ] );
+    if (vViewAngles[0] > 73.0f) {
+        vViewAngles[0] = 73.0f;
+    }
 
-		EulerToQuat( headAngles, pEntState->bone_quat[ HEAD_TAG ] );
-		return;
-	}
+    deltayaw = AngleSubtract(vViewAngles[1], vAngles[1]);
 
-	if( pPlayerState->pm_type != PM_DEAD )
-	{
-		fTmp = AngleMod( vViewAngles[ 1 ] );
-		VectorSet( vAngles, 0, fTmp, 0 );
+    yawAngle = 70.0f;
+    if (deltayaw <= 70.0f) {
+        yawAngle = deltayaw;
+        if (deltayaw < -70.0f) {
+            yawAngle = -70.0f;
+        }
+    }
 
-		if( !( pPlayerState->pm_flags & PMF_VIEW_PRONE ) || ( pPlayerState->pm_flags & PMF_DUCKED ) )
-		{
-			fTmp = AngleMod( vViewAngles[ 0 ] );
+    vViewAngles[1] = vAngles[1] + yawAngle;
 
-			VectorSet( temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f );
-			VectorSet( temp2, fTmp, 0, pPlayerState->fLeanAngle );
+    fDelta = sqrt(yawAngle * yawAngle + vViewAngles[0] * vViewAngles[0]);
 
-			if( fTmp > 180.0f ) {
-				temp2[ 0 ] = fTmp - 360.0f;
-			}
+    if (vViewAngles[0] <= 0.0f) {
+        temp = 80.0f;
+    } else {
+        temp = 73.0f;
+    }
 
-			temp2[ 0 ] = 0.90f * temp2[ 0 ] * 0.70f;
+    if (fDelta > temp) {
+        float deltalimit = temp * 1.0f / fDelta;
+        vViewAngles[0] *= deltalimit;
+        vViewAngles[1] = yawAngle * deltalimit + vAngles[1];
+    }
+}
 
-			AnglesSubtract( temp, temp2, headAngles );
-			VectorCopy( headAngles, pEntState->bone_angles[ HEAD_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ HEAD_TAG ], pEntState->bone_quat[ HEAD_TAG ] );
+void PmoveAdjustAngleSettings(vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState)
+{
+    vec3_t temp, temp2;
+    vec3_t armsAngles, torsoAngles, headAngles;
+    float  fTmp;
 
-			if( temp2[ 0 ] <= 0.0f )
-			{
-				fTmp = -0.1f;
-			}
-			else{
-				fTmp = 0.3f;
-			}
+    if (pPlayerState->pm_type == PM_DEAD) {
+        // set the default angles
+        VectorSet(pEntState->bone_angles[HEAD_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+        QuatSet(pEntState->bone_quat[HEAD_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
+    } else if (pPlayerState->pm_type == PM_CLIMBWALL) {
+        PmoveAdjustViewAngleSettings_OnLadder(vViewAngles, vAngles, pPlayerState, pEntState);
+        VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+        VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+        QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+        QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
 
-			VectorSet( temp, fTmp * temp2[ 0 ], 0, pPlayerState->fLeanAngle * 0.8f );
-			VectorCopy( temp, pEntState->bone_angles[ PELVIS_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ PELVIS_TAG ], pEntState->bone_quat[ PELVIS_TAG ] );
+        AnglesSubtract(vViewAngles, vAngles, headAngles);
+        VectorScale(headAngles, 0.5f, pEntState->bone_angles[HEAD_TAG]);
 
-			float fDelta = ( 1.0f - fTmp ) * temp2[ 0 ];
+        EulerToQuat(headAngles, pEntState->bone_quat[HEAD_TAG]);
+    } else {
+        if (pPlayerState->pm_flags & PMF_TURRET) {
+            vAngles[2] = 0;
+            // Added in 2.0
+            //  Clients checking this flag will draw an icon
+            //  above the head of teammates
+            pEntState->eFlags |= EF_PLAYER_ARTILLERY;
+        } else {
+            fTmp = AngleMod(vViewAngles[1]);
+            VectorSet(vAngles, 0, fTmp, 0);
+            pEntState->eFlags &= ~EF_PLAYER_ARTILLERY;
+        }
 
-			if( vViewAngles[ 0 ] <= 0.0f )
-			{
-				VectorSet( torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f );
-				VectorSet( armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f );
-			}
-			else
-			{
-				VectorSet( torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f );
-				VectorSet( armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f );
-			}
+        if (pPlayerState->pm_flags & PMF_TURRET) {
+            // set the default angles
+            VectorSet(pEntState->bone_angles[TORSO_TAG], 0, 0, 0);
+            VectorSet(pEntState->bone_angles[ARMS_TAG], 0, 0, 0);
+            VectorSet(pEntState->bone_angles[PELVIS_TAG], 0, 0, 0);
+            QuatSet(pEntState->bone_quat[TORSO_TAG], 0, 0, 0, 1);
+            QuatSet(pEntState->bone_quat[ARMS_TAG], 0, 0, 0, 1);
+            QuatSet(pEntState->bone_quat[PELVIS_TAG], 0, 0, 0, 1);
 
-			VectorCopy( torsoAngles, pEntState->bone_angles[ TORSO_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ TORSO_TAG ], pEntState->bone_quat[ TORSO_TAG ] );
+            AnglesSubtract(vViewAngles, vAngles, headAngles);
+            // Added in 2.0
+            //  Prevent rotating the player head like a monster
+            if (headAngles[1] > 90) {
+                headAngles[1] = 90;
+            }
+            if (headAngles[1] < -90) {
+                headAngles[1] = -90;
+            }
 
-			VectorCopy( armsAngles, pEntState->bone_angles[ ARMS_TAG ] );
-			EulerToQuat( pEntState->bone_angles[ ARMS_TAG ], pEntState->bone_quat[ ARMS_TAG ] );
-			return;
-		}
-	}
+            VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
+            EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
+            return;
+        }
 
-	// set the default angles
-	VectorSet( pEntState->bone_angles[ HEAD_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ TORSO_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ ARMS_TAG ], 0, 0, 0 );
-	VectorSet( pEntState->bone_angles[ PELVIS_TAG ], 0, 0, 0 );
-	QuatSet( pEntState->bone_quat[ HEAD_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ TORSO_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ ARMS_TAG ], 0, 0, 0, 1 );
-	QuatSet( pEntState->bone_quat[ PELVIS_TAG ], 0, 0, 0, 1 );
+        fTmp = AngleMod(vViewAngles[0]);
+
+        VectorSet(temp, fTmp, 0, pPlayerState->fLeanAngle * 0.60f);
+        VectorSet(temp2, fTmp, 0, pPlayerState->fLeanAngle);
+
+        if (fTmp > 180.0f) {
+            temp2[0] = fTmp - 360.0f;
+        }
+
+        temp2[0] = 0.90f * temp2[0] * 0.70f;
+
+        AnglesSubtract(temp, temp2, headAngles);
+        VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
+        EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
+
+        if (temp2[0] <= 0.0f) {
+            fTmp = -0.1f;
+        } else {
+            fTmp = 0.3f;
+        }
+
+        VectorSet(temp, fTmp * temp2[0], 0, pPlayerState->fLeanAngle * 0.8f);
+        VectorCopy(temp, pEntState->bone_angles[PELVIS_TAG]);
+        EulerToQuat(pEntState->bone_angles[PELVIS_TAG], pEntState->bone_quat[PELVIS_TAG]);
+
+        float fDelta = (1.0f - fTmp) * temp2[0];
+
+        if (vViewAngles[0] <= 0.0f) {
+            VectorSet(torsoAngles, fDelta * 0.60f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+            VectorSet(armsAngles, fDelta * 0.40f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+        } else {
+            VectorSet(torsoAngles, fDelta * 0.70f, 0, pPlayerState->fLeanAngle * 0.2f * -0.1f);
+            VectorSet(armsAngles, fDelta * 0.30f, 0, pPlayerState->fLeanAngle * 0.2f * 1.1f);
+        }
+
+        VectorCopy(torsoAngles, pEntState->bone_angles[TORSO_TAG]);
+        EulerToQuat(pEntState->bone_angles[TORSO_TAG], pEntState->bone_quat[TORSO_TAG]);
+
+        VectorCopy(armsAngles, pEntState->bone_angles[ARMS_TAG]);
+        EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+    }
 }
 
 // Used to set arms angles accordingly, calculated client-side
 // Without it, the arms will look like it has latency
-void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState )
+void PmoveAdjustAngleSettings_Client(
+    vec_t *vViewAngles, vec_t *vAngles, playerState_t *pPlayerState, entityState_t *pEntState
+)
 {
     vec3_t torsoAngles;
-    int i;
+    int    i;
 
-	if (pPlayerState->pm_type == PM_DEAD)
-	{
-		for (i = 0; i < NUM_BONE_CONTROLLERS; i++) {
+    if (pPlayerState->pm_type == PM_DEAD) {
+        for (i = 0; i < NUM_BONE_CONTROLLERS; i++) {
             VectorClear(pEntState->bone_angles[i]);
             QuatClear(pEntState->bone_quat[i]);
-		}
-	}
-	else if (pPlayerState->pm_type == PM_CLIMBWALL)
-    {
-		vec3_t headAngles;
+        }
+    } else if (pPlayerState->pm_type == PM_CLIMBWALL) {
+        vec3_t headAngles;
 
         PmoveAdjustViewAngleSettings_OnLadder(vViewAngles, vAngles, pPlayerState, pEntState);
-		VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0.0, pPlayerState->fLeanAngle * 0.7);
+        VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0.0, pPlayerState->fLeanAngle * 0.7);
 
-		if (torsoAngles[0] > 180.0) {
-			torsoAngles[0] -= 180.0;
-		}
+        if (torsoAngles[0] > 180.0) {
+            torsoAngles[0] -= 180.0;
+        }
 
-		torsoAngles[0] += 8.0;
+        torsoAngles[0] += 8.0;
 
         VectorClear(pEntState->bone_angles[TORSO_TAG]);
         QuatClear(pEntState->bone_quat[TORSO_TAG]);
         VectorClear(pEntState->bone_angles[PELVIS_TAG]);
         QuatClear(pEntState->bone_quat[PELVIS_TAG]);
 
-		VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
-		EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
+        VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
+        EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
 
-		// head angles
+        // head angles
         AnglesSubtract(vViewAngles, vAngles, headAngles);
         headAngles[0] *= 0.5;
-		AnglesSubtract(headAngles, torsoAngles, headAngles);
+        AnglesSubtract(headAngles, torsoAngles, headAngles);
         VectorCopy(headAngles, pEntState->bone_angles[HEAD_TAG]);
         EulerToQuat(pEntState->bone_angles[HEAD_TAG], pEntState->bone_quat[HEAD_TAG]);
-	}
-    else {
-		// Clear the head, torso and pelvis
+    } else {
+        // Clear the head, torso and pelvis
         VectorClear(pEntState->bone_angles[HEAD_TAG]);
         QuatClear(pEntState->bone_quat[HEAD_TAG]);
         VectorClear(pEntState->bone_angles[TORSO_TAG]);
@@ -1867,8 +1736,8 @@ void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, player
         VectorClear(pEntState->bone_angles[PELVIS_TAG]);
         QuatClear(pEntState->bone_quat[PELVIS_TAG]);
 
-		VectorSet(vAngles, 0, AngleMod(vViewAngles[1]), 0);
-		VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0, pPlayerState->fLeanAngle * 0.7);
+        VectorSet(vAngles, 0, AngleMod(vViewAngles[1]), 0);
+        VectorSet(torsoAngles, AngleMod(vViewAngles[0]), 0, pPlayerState->fLeanAngle * 0.7);
 
         if (torsoAngles[0] > 180.0) {
             torsoAngles[0] -= 360.0;
@@ -1877,5 +1746,5 @@ void PmoveAdjustAngleSettings_Client( vec_t *vViewAngles, vec_t *vAngles, player
         torsoAngles[0] += 8.0;
         VectorCopy(torsoAngles, pEntState->bone_angles[ARMS_TAG]);
         EulerToQuat(pEntState->bone_angles[ARMS_TAG], pEntState->bone_quat[ARMS_TAG]);
-	}
+    }
 }
diff --git a/code/fgame/bg_public.h b/code/fgame/bg_public.h
index 7c0404b4..840d1ffd 100644
--- a/code/fgame/bg_public.h
+++ b/code/fgame/bg_public.h
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -25,34 +26,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // because games can change separately from the main system version, we need a
 // second version that must match between game and cgame
 
-#ifndef __BG_PUBLIC_H__
-#define __BG_PUBLIC_H__
+#pragma once
 
-#define GAME_VERSION          "mohaa-base-1"
+#define GAME_VERSION "mohaa-base-1"
 
-#define DEFAULT_GRAVITY       800
+static const int MINS_X        = -15;
+static const int MINS_Y        = -15;
+static const int MINS_Z        = 0; // IneQuation: bounding box and viewheights to match MoHAA
+static const int MAXS_X        = 15;
+static const int MAXS_Y        = 15;
+static const int MAXS_Z        = 94;
+static const int DEAD_MINS_Z   = 32;
+static const int CROUCH_MAXS_Z = 49;
 
-#define SCORE_NOT_PRESENT     -9999 // for the CS_SCORES[12] when only one player is present
-
-#define VOTE_TIME             30000 // 30 seconds before vote times out
-
-#define MINS_Z                0
-#define MINS_X                -15
-#define MINS_Y                -15
-#define MAXS_X                15
-#define MAXS_Y                15
-
-#define MINS_Z                0 // IneQuation: bounding box and viewheights to match MoHAA
-#define MAXS_Z                96
-
-#define DEAD_MINS_Z           32
-#define CROUCH_MAXS_Z         49
-#define DEFAULT_VIEWHEIGHT    82
-#define CROUCH_RUN_VIEWHEIGHT 64
-#define JUMP_START_VIEWHEIGHT 52
-#define CROUCH_VIEWHEIGHT     48
-#define PRONE_VIEWHEIGHT      16
-#define DEAD_VIEWHEIGHT       8
+static const unsigned int DEFAULT_VIEWHEIGHT    = 82;
+static const unsigned int CROUCH_RUN_VIEWHEIGHT = 64;
+static const unsigned int JUMP_START_VIEWHEIGHT = 52;
+static const unsigned int CROUCH_VIEWHEIGHT     = 48;
+static const unsigned int PRONE_VIEWHEIGHT      = 16;
+static const unsigned int DEAD_VIEWHEIGHT       = 8;
 
 //
 // config strings are a general means of communicating variable length strings
@@ -140,10 +132,10 @@ extern "C" {
         GT_MAX_GAME_TYPE
     } gametype_t;
 
-//
-// scale to use when evaluating entityState_t::constantLight scale
-//
-#define CONSTANTLIGHT_RADIUS_SCALE 8
+    //
+    // scale to use when evaluating entityState_t::constantLight scale
+    //
+    static const float CONSTANTLIGHT_RADIUS_SCALE = 8;
 
     typedef enum {
         GENDER_MALE,
@@ -151,30 +143,31 @@ extern "C" {
         GENDER_NEUTER
     } gender_t;
 
-    // su44: vma indexes are sent as 4 bits
-    // see playerState_t::iViewModelAnim
-    typedef enum {
-        VMA_IDLE,
-        VMA_CHARGE,
-        VMA_FIRE,
-        VMA_FIRE_SECONDARY,
-        VMA_RECHAMBER,
-        VMA_RELOAD,
-        VMA_RELOAD_SINGLE,
-        VMA_RELOAD_END,
-        VMA_PULLOUT,
-        VMA_PUTAWAY,
-        VMA_LADDERSTEP,
-        VMA_ENABLE,
-        VMA_CUSTOMANIMATION,
-        VMA_NUMANIMATIONS
-    } viewmodelanim_t;
+    enum vmAnim_e {
+        VM_ANIM_DISABLED,
+        VM_ANIM_IDLE,
+        VM_ANIM_CHARGE,
+        VM_ANIM_FIRE,
+        VM_ANIM_FIRE_SECONDARY,
+        VM_ANIM_RECHAMBER,
+        VM_ANIM_RELOAD,
+        VM_ANIM_RELOAD_SINGLE,
+        VM_ANIM_RELOAD_END,
+        VM_ANIM_PULLOUT,
+        VM_ANIM_PUTAWAY,
+        VM_ANIM_LADDERSTEP,
+        VM_ANIM_IDLE_0,
+        VM_ANIM_IDLE_1,
+        VM_ANIM_IDLE_2,
+    };
 
-// su44: playerState_t::activeItems[8] slots
-// they are sent as 16 bits
-// TODO: find out rest of them
-#define ITEM_AMMO   0 // current ammo
-#define ITEM_WEAPON 1 // current mainhand weapon
+    // su44: playerState_t::activeItems[8] slots
+    // they are sent as 16 bits
+    // TODO: find out rest of them
+    enum itemtype_e {
+        ITEM_AMMO,
+        ITEM_WEAPON
+    };
 
     /*
 ===================================================================================
@@ -187,17 +180,12 @@ movement on the server game.
 ===================================================================================
 */
 
-#define MAX_CLIP_PLANES         5
-#define MIN_WALK_NORMAL         0.7f // can't walk on very steep slopes
+    static const unsigned int MAX_CLIP_PLANES = 5;
+    static const float        MIN_WALK_NORMAL = 0.7f; // can't walk on very steep slopes
 
-#define STEPSIZE                18
+    static const float STEPSIZE = 18;
 
-#define WATER_TURBO_SPEED       1.35f
-#define WATER_TURBO_TIME        1200
-#define MINIMUM_RUNNING_TIME    800
-#define MINIMUM_WATER_FOR_TURBO 90
-
-#define OVERCLIP                1.001f
+    static const float OVERCLIP = 1.001f;
 
     // su44: our pmtype_t enum must be the same
     // as in MoHAA, because playerState_t::pm_type
@@ -251,8 +239,9 @@ movement on the server game.
 #endif
 
 // moh pm_flags
-#define PMF_DUCKED     (1 << 0)
-#define PMF_VIEW_PRONE (1 << 1)
+#define PMF_DUCKED        (1 << 0)
+#define PMF_VIEW_PRONE    (1 << 1)
+#define PMF_DAMAGE_ANGLES (1 << 1) // in protocol >= 15
 //
 // 2 Flags removed in team tactics
 //
@@ -269,25 +258,28 @@ movement on the server game.
 #define PMF_LEVELEXIT       (1 << 11)
 #define PMF_NO_GRAVITY      (1 << 12)
 #define PMF_NO_HUD          (1 << 13)
-#define PMF_UNKNOWN         (1 << 14)
+#define PMF_TURRET          (1 << 14)
 #define PMF_NO_LEAN         (1 << 15)
 
-// moveposflags
-#define MPF_POSITION_STANDING  (1 << 0)
-#define MPF_POSITION_CROUCHING (1 << 1)
-#define MPF_POSITION_PRONE     (1 << 2)
-#define MPF_POSITION_OFFGROUND (1 << 3)
+    // moveposflags
+    enum moveposflags_e {
+        MPF_POSITION_STANDING  = (1 << 0),
+        MPF_POSITION_CROUCHING = (1 << 1),
+        MPF_POSITION_PRONE     = (1 << 2),
+        MPF_POSITION_OFFGROUND = (1 << 3),
+        MPF_MOVEMENT_WALKING   = (1 << 4),
+        MPF_MOVEMENT_RUNNING   = (1 << 5),
+        MPF_MOVEMENT_FALLING   = (1 << 6),
+    };
 
-#define MPF_MOVEMENT_WALKING   (1 << 4)
-#define MPF_MOVEMENT_RUNNING   (1 << 5)
-#define MPF_MOVEMENT_FALLING   (1 << 6)
+#define MAXTOUCH 32
 
-#define MAXTOUCH               32
-
-#define MOVERESULT_NONE        0 // nothing blocking
-#define MOVERESULT_TURNED      1 // move blocked, but player turned to avoid it
-#define MOVERESULT_BLOCKED     2 // move blocked by slope or wall
-#define MOVERESULT_HITWALL     3 // player ran into wall
+    enum moveresult_e {
+        MOVERESULT_NONE,    // nothing blocking
+        MOVERESULT_TURNED,  // move blocked, but player turned to avoid it
+        MOVERESULT_BLOCKED, // move blocked by slope or wall
+        MOVERESULT_HITWALL  // player ran into wall
+    };
 
     typedef struct {
         // state (in / out)
@@ -339,7 +331,7 @@ movement on the server game.
         //
         // Openmohaa addition
         //
-        int protocol;
+        int   protocol;
         float leanSpeed;
         float leanRecoverSpeed;
         float leanAdd;
@@ -359,35 +351,33 @@ movement on the server game.
 
     //===================================================================================
 
-#define MAX_LETTERBOX_SIZE   0x7fff
+    static const unsigned int MAX_LETTERBOX_SIZE = 0x7fff;
 
-#define ITEM_NAME_AMMO       0
-#define ITEM_NAME_WEAPON     1
-
-#define WEAPON_CLASS_PISTOL  (1 << 0)
-#define WEAPON_CLASS_RIFLE   (1 << 1)
-#define WEAPON_CLASS_SMG     (1 << 2)
-#define WEAPON_CLASS_MG      (1 << 3)
-#define WEAPON_CLASS_GRENADE (1 << 4)
-#define WEAPON_CLASS_HEAVY   (1 << 5)
-#define WEAPON_CLASS_CANNON  (1 << 6)
-#define WEAPON_CLASS_ITEM    (1 << 7)
-#define WEAPON_CLASS_ITEM1   (1 << 8)
-#define WEAPON_CLASS_ITEM2   (1 << 9)
-#define WEAPON_CLASS_ITEM3   (1 << 10)
-#define WEAPON_CLASS_ITEM4   (1 << 11)
-#define WEAPON_CLASS_ANY_ITEM \
-    (WEAPON_CLASS_ITEM | WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 | WEAPON_CLASS_ITEM4)
-
-#define WEAPON_CLASS_PRIMARY   (!(WEAPON_CLASS_PISTOL | WEAPON_CLASS_GRENADE))
-#define WEAPON_CLASS_SECONDARY (WEAPON_CLASS_PISTOL | WEAPON_CLASS_GRENADE)
-#define WEAPON_CLASS_THROWABLE (WEAPON_CLASS_GRENADE | WEAPON_CLASS_ITEM)
-#define WEAPON_CLASS_MISC                                                                                   \
-    (WEAPON_CLASS_CANNON | WEAPON_CLASS_ITEM | WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 \
-     | WEAPON_CLASS_ITEM4)
-#define WEAPON_CLASS_ITEMINDEX (WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 | WEAPON_CLASS_ITEM4)
-
-#define STAT_DEAD_YAW          5 // su44: Is there a DEAD_YAW stat in MoHAA?
+    enum weaponclass_e {
+        WEAPON_CLASS_PISTOL  = (1 << 0),
+        WEAPON_CLASS_RIFLE   = (1 << 1),
+        WEAPON_CLASS_SMG     = (1 << 2),
+        WEAPON_CLASS_MG      = (1 << 3),
+        WEAPON_CLASS_GRENADE = (1 << 4),
+        WEAPON_CLASS_HEAVY   = (1 << 5),
+        WEAPON_CLASS_CANNON  = (1 << 6),
+        WEAPON_CLASS_ITEM    = (1 << 7),
+        WEAPON_CLASS_ITEM1   = (1 << 8),
+        WEAPON_CLASS_ITEM2   = (1 << 9),
+        WEAPON_CLASS_ITEM3   = (1 << 10),
+        WEAPON_CLASS_ITEM4   = (1 << 11),
+        WEAPON_CLASS_ANY_ITEM =
+            (WEAPON_CLASS_ITEM | WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 | WEAPON_CLASS_ITEM4),
+        WEAPON_CLASS_ITEM_SLOT_BITS =
+            (WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 | WEAPON_CLASS_ITEM4),
+        WEAPON_CLASS_PRIMARY   = (!(WEAPON_CLASS_PISTOL | WEAPON_CLASS_GRENADE)),
+        WEAPON_CLASS_SECONDARY = (WEAPON_CLASS_PISTOL | WEAPON_CLASS_GRENADE),
+        WEAPON_CLASS_THROWABLE = (WEAPON_CLASS_GRENADE | WEAPON_CLASS_ITEM),
+        WEAPON_CLASS_MISC =
+            (WEAPON_CLASS_CANNON | WEAPON_CLASS_ITEM | WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3
+             | WEAPON_CLASS_ITEM4),
+        WEAPON_CLASS_ITEMINDEX = (WEAPON_CLASS_ITEM1 | WEAPON_CLASS_ITEM2 | WEAPON_CLASS_ITEM3 | WEAPON_CLASS_ITEM4)
+    };
 
     // player_state->persistant[] indexes
     // these fields are the only part of player_state that isn't
@@ -400,6 +390,7 @@ movement on the server game.
 
 // entityState_t->eFlags
 // su44: eFlags used in MoHAA
+#define EF_EVERYFRAME 0x00000008
 #define EF_CLIMBWALL  0x00000010
 #define EF_UNARMED    0x00000020 // su44: this player has his weapon holstered
 #define EF_LINKANGLES 0x00000040
@@ -407,6 +398,8 @@ movement on the server game.
 #define EF_AXIS       0x00000100 // su44: this player is in axis team
 #define EF_ANY_TEAM   (EF_ALLIES | EF_AXIS)
 #define EF_DEAD       0x00000200 // don't draw a foe marker over players with EF_DEAD
+#define EF_NO_LERP    0x00001000 // don't lerp animations
+
 //
 // Team assault flags
 //
@@ -431,33 +424,11 @@ movement on the server game.
 #define EF_AWARD_ASSIST          0x00020000 // draw a assist sprite
 #define EF_AWARD_DENIED          0x00040000 // denied
 #define EF_TEAMVOTED             0x00080000 // already cast a team vote
-#define EF_EVERYFRAME            0x00100000 // def commands will be run every client frame
 #define EF_ANTISBJUICE           0x00200000 // anti sucknblow juice
 #define EF_DONT_PROCESS_COMMANDS 0x00400000 // don't process client commands for this entity
 
-// these defines could be deleted sometime when code/game/ is cleared of Q3A stuff
-#define TEAM_FREE      0
-#define TEAM_RED       4
-#define TEAM_BLUE      3
-#define TEAM_NUM_TEAMS 5
-
 //===================================================================================
 
-// flip the togglebit every time an animation
-// changes so a restart of the same anim can be detected
-#define ANIM_TOGGLEBIT (1 << 9)
-#define ANIM_BLEND     (1 << 10)
-#define ANIM_NUMBITS   11
-
-// server side anim bits
-#define ANIM_SERVER_EXITCOMMANDS_PROCESSED (1 << 12)
-
-#define ANIM_MASK                          (~(ANIM_TOGGLEBIT | ANIM_BLEND | ANIM_SERVER_EXITCOMMANDS_PROCESSED))
-
-// if FRAME_EXPLICIT is set, don't auto animate
-#define FRAME_EXPLICIT 512
-#define FRAME_MASK     (~FRAME_EXPLICIT)
-
 //
 // Tag specific flags
 //
@@ -558,8 +529,8 @@ movement on the server game.
         STAT_MAXCLIPAMMO,
         STAT_INZOOM,
         STAT_CROSSHAIR,
-		STAT_LAST_PAIN,
-		STAT_NEXTHEALTH, // was unused until 2.0
+        STAT_LAST_PAIN,
+        STAT_NEXTHEALTH, // was unused until 2.0
         STAT_BOSSHEALTH,
         STAT_CINEMATIC,
         STAT_ADDFADE,
@@ -570,9 +541,9 @@ movement on the server game.
         STAT_OBJECTIVECENTER,
         STAT_TEAM,
         STAT_KILLS,
-		STAT_DEATHS,
-		STAT_VEHICLE_HEALTH, // was unused until 2.0
-		STAT_VEHICLE_MAX_HEALTH, // was unused until 2.0
+        STAT_DEATHS,
+        STAT_VEHICLE_HEALTH,     // was unused until 2.0
+        STAT_VEHICLE_MAX_HEALTH, // was unused until 2.0
         STAT_HIGHEST_SCORE,
         STAT_ATTACKERCLIENT,
         STAT_INFOCLIENT,
@@ -589,7 +560,8 @@ movement on the server game.
         TEAM_SPECTATOR,
         TEAM_FREEFORALL,
         TEAM_ALLIES,
-        TEAM_AXIS
+        TEAM_AXIS,
+        TEAM_MAX
     } teamtype_t;
 
     typedef enum {
@@ -598,9 +570,6 @@ movement on the server game.
         SWT_FUSE_WET
     } stopWatchType_t;
 
-// How many players on the overlay
-#define TEAM_MAXOVERLAY 32
-
 //---------------------------------------------------------
 
 // g_dmflags->integer flags
@@ -635,28 +604,41 @@ movement on the server game.
 #define DF_WEAPON_NO_SHOTGUN      (1 << 27)
 #define DF_WEAPON_NO_LANDMINE     (1 << 28)
 
-#define DM_FLAG(flag)             (g_gametype->integer && ((int)dmflags->integer & (flag)))
+#define DM_FLAG(flag)             (g_gametype->integer != GT_SINGLE_PLAYER && ((int)dmflags->integer & (flag)))
 
-// content masks
-#define MASK_ALL       (-1)
-#define MASK_SOLID     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
+    //
+    // Content masks
+    //
+
+#define MASK_ALL (-1)
+#define MASK_SOLID \
+    (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX | CONTENTS_FENCE)
 #define MASK_SAFESOLID (CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_USABLE    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
-#define MASK_PLAYERSOLID                                                                                          \
-    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_UNKNOWN2 \
-     | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
-#define MASK_PLAYERSTART (CONTENTS_SOLID|CONTENTS_BBOX|CONTENTS_NOBOTCLIP|CONTENTS_UNKNOWN2|CONTENTS_BODY)
-#define MASK_VIEWSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_TRIGGER)
-#define MASK_DEADSOLID    (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_CORPSE | CONTENTS_NOTTEAM2 | CONTENTS_FENCE)
-#define MASK_MONSTERSOLID (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY)
-#define MASK_WATER        (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
-#define MASK_OPAQUE       (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
-#define MASK_SHOT                                                                                              \
-    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE \
-     | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
-#define MASK_SHOT_TRIG                                                                                         \
-    (CONTENTS_SOLID | CONTENTS_CLAYPIDGEON | CONTENTS_WATER  | CONTENTS_BBOX | CONTENTS_NOBOTCLIP \
-    | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_PLAYERSOLID                                                                                              \
+    (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP \
+     | CONTENTS_BBOX | CONTENTS_SOLID)
+#define MASK_GUNTARGET                                                                                               \
+    (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX        \
+     | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_UNKNOWN3 | CONTENTS_FENCE | CONTENTS_BODY | CONTENTS_CORPSE \
+     | CONTENTS_TRIGGER)
+#define MASK_FOOTSHADOW  (CONTENTS_FENCE | CONTENTS_SLIME | CONTENTS_LAVA | CONTENTS_SOLID)
+#define MASK_PLAYERSTART (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_BODY)
+#define MASK_VIEWSOLID   (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_TRIGGER)
+#define MASK_DEADSOLID   (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_CORPSE | CONTENTS_NOTTEAM2 | CONTENTS_FENCE)
+#define MASK_MONSTERSOLID \
+    (CONTENTS_SOLID | CONTENTS_MONSTERCLIP | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
+#define MASK_WATER  (CONTENTS_WATER | CONTENTS_LAVA | CONTENTS_SLIME)
+#define MASK_OPAQUE (CONTENTS_SOLID | CONTENTS_SLIME | CONTENTS_LAVA)
+#define MASK_SHOT                                                                                                   \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP \
+     | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_SHOT_TRIG                                                                                               \
+    (CONTENTS_SOLID | CONTENTS_CLAYPIDGEON | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_SHOT_FLUID                                                                                        \
+    (CONTENTS_SOLID | CONTENTS_WATER | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE \
+     | CONTENTS_WEAPONCLIP | CONTENTS_SHOOTONLY | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_PROJECTILE                                                                                           \
     (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 \
      | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
@@ -666,24 +648,38 @@ movement on the server game.
 #define MASK_PATHSOLID                                                                                      \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_BBOX \
      | CONTENTS_MONSTERCLIP)
+#define MASK_LOOK        (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE)
 #define MASK_CAMERASOLID (CONTENTS_SOLID | CONTENTS_PLAYERCLIP | CONTENTS_BODY | MASK_WATER)
 #define MASK_BEAM        (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE)
 #define MASK_LADDER \
-    (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE)
+    (CONTENTS_SOLID | CONTENTS_LADDER | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_BODY | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_AUTOCALCLIFE (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_FENCE)
 #define MASK_EXPLOSION    (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_WEAPONCLIP)
 #define MASK_SOUND        (CONTENTS_SOLID | CONTENTS_TRANSLUCENT)
-#define MASK_VEHICLE      (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_VEHICLECLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_VEHICLE                                                                                                 \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_VEHICLECLIP \
+     | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_VEHICLE_TIRES (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_FENCE | CONTENTS_VEHICLECLIP | CONTENTS_TRIGGER)
 #define MASK_CLICK \
-    (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
-#define MASK_CANSEE                                                                                                 \
-    (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_SLIME \
-     | CONTENTS_LAVA | CONTENTS_BBOX)
-#define MASK_ITEM (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
-#define MASK_TRANSITION \
-    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_NOTTEAM1 | CONTENTS_WEAPONCLIP)
+    (CONTENTS_VEHICLECLIP | CONTENTS_WEAPONCLIP | CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP | CONTENTS_SOLID)
+#define MASK_CANSEE                                                                                           \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+#define MASK_CANSEE_NOENTS (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP)
+#define MASK_USE                                                                                                    \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP \
+     | CONTENTS_BODY | CONTENTS_TRIGGER)
+#define MASK_CLICKITEM (MASK_SOLID | CONTENTS_UNKNOWN3)
+#define MASK_ITEM      (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_PLAYERCLIP | CONTENTS_FENCE)
+#define MASK_TRANSITION                                                                                         \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_BBOX)
 #define MASK_TARGETPATH \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_MONSTERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_BBOX)
+#define MASK_ACTORPATH (CONTENTS_SOLID | CONTENTS_FENCE | CONTENTS_MONSTERCLIP | CONTENTS_TRIGGER)
+#define MASK_GRENADEPATH                                                                                            \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_WEAPONCLIP \
+     | CONTENTS_BODY | CONTENTS_TRIGGER)
 #define MASK_LINE (CONTENTS_SOLID | CONTENTS_BODY | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX)
 #define MASK_VEHICLETURRET                                                                            \
     (CONTENTS_SOLID | CONTENTS_TRIGGER | CONTENTS_FENCE | CONTENTS_VEHICLECLIP | CONTENTS_MONSTERCLIP \
@@ -700,52 +696,41 @@ movement on the server game.
 #define MASK_BATTLELANGUAGE                                                                        \
     (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_PLAYERCLIP \
      | CONTENTS_WEAPONCLIP | CONTENTS_BODY | CONTENTS_TRIGGER)
-#define MASK_SCRIPT_SLAVE (CONTENTS_LADDER|CONTENTS_CLAYPIDGEON|CONTENTS_BBOX|CONTENTS_NOBOTCLIP|CONTENTS_UNKNOWN2|CONTENTS_UNKNOWN3|CONTENTS_BODY|CONTENTS_CORPSE)
+#define MASK_SCRIPT_SLAVE                                                                            \
+    (CONTENTS_LADDER | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_UNKNOWN3 | CONTENTS_BODY | CONTENTS_CORPSE)
+#define MASK_CARRYABLETURRET \
+    (CONTENTS_SOLID | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 | CONTENTS_FENCE | CONTENTS_BODY)
+#define MASK_AITURRET                                                                                         \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN2 \
+     | CONTENTS_FENCE | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+#define MASK_TRANSPARENT (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_FENCE)
+#define MASK_MOVEVEHICLE                                                                                             \
+    (CONTENTS_LADDER | CONTENTS_CLAYPIDGEON | CONTENTS_BBOX | CONTENTS_NOBOTCLIP | CONTENTS_UNKNOWN3 | CONTENTS_BODY \
+     | CONTENTS_CORPSE)
+#define MASK_MOVEINFO (CONTENTS_SOLID | CONTENTS_FENCE)
+#define MASK_AI_CANSEE                                                                                    \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_BBOX | CONTENTS_UNKNOWN2 | CONTENTS_FENCE \
+     | CONTENTS_WEAPONCLIP)
+#define MASK_CORNER_NODE \
+    (CONTENTS_SOLID | CONTENTS_LAVA | CONTENTS_SLIME | CONTENTS_UNKNOWN2 | CONTENTS_WEAPONCLIP | CONTENTS_BODY)
+#define MASK_IGNORE_ENTS                                                                                          \
+    (CONTENTS_CORPSE | CONTENTS_BODY | CONTENTS_UNKNOWN3 | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP | CONTENTS_BBOX \
+     | CONTENTS_CLAYPIDGEON | CONTENTS_LADDER)
 
-    // mohaa mask
-    /*
-#define MASK_ALL							-1
-#define MASK_SOLID							1
-
-#define MASK_COLLISION						0x26000B21
-#define MASK_PERMANENTMARK					0x40000001
-#define MASK_AUTOCALCLIFE					0x40002021
-#define MASK_EXPLOSION						0x40040001
-#define MASK_TREADMARK						0x42012B01
-#define MASK_THIRDPERSON					0x42012B39
-#define MASK_FOOTSTEP						0x42022901
-#define MASK_BEAM							0x42042B01
-#define MASK_VISIBLE						0x42042B01
-#define MASK_VEHICLE						0x42042B01
-#define MASK_BULLET							0x42042B21
-#define MASK_SHOT							0x42042BA1
-#define MASK_CROSSHAIRSHADER				0x42092B01
-#define MASK_TRACER							0x42142B21
-*/
+//
+// Marks
+//
+#define MASK_MARK (CONTENTS_TRIGGER | CONTENTS_SOLID)
+#define MASK_TREADMARK                                                                                                \
+    (CONTENTS_TRIGGER | CONTENTS_BODY | CONTENTS_PLAYERCLIP | CONTENTS_FENCE | CONTENTS_UNKNOWN2 | CONTENTS_NOBOTCLIP \
+     | CONTENTS_BBOX | CONTENTS_SOLID)
 
     void BG_EvaluateTrajectoryDelta(const trajectory_t *tr, int atTime, vec3_t result);
 
     void BG_PlayerStateToEntityState(playerState_t *ps, entityState_t *s, qboolean snap);
     void BG_PlayerStateToEntityStateExtraPolate(playerState_t *ps, entityState_t *s, int time, qboolean snap);
 
-    enum vmAnim_e {
-        VM_ANIM_DISABLED,
-        VM_ANIM_IDLE,
-        VM_ANIM_CHARGE,
-        VM_ANIM_FIRE,
-        VM_ANIM_FIRE_SECONDARY,
-        VM_ANIM_RECHAMBER,
-        VM_ANIM_RELOAD,
-        VM_ANIM_RELOAD_SINGLE,
-        VM_ANIM_RELOAD_END,
-        VM_ANIM_PULLOUT,
-        VM_ANIM_PUTAWAY,
-        VM_ANIM_LADDERSTEP,
-        VM_ANIM_IDLE_0,
-        VM_ANIM_IDLE_1,
-        VM_ANIM_IDLE_2,
-    };
-
     enum cg_message_ver_15_e {
         CGM_NONE,
         CGM_BULLET_1,
@@ -785,10 +770,10 @@ movement on the server game.
         CGM_HUDDRAW_ALPHA,
         CGM_HUDDRAW_STRING,
         CGM_HUDDRAW_FONT,
-        CGM_NOTIFY_KILL,
         CGM_NOTIFY_HIT,
+        CGM_NOTIFY_KILL,
         CGM_VOICE_CHAT,
-        CGM_UNKNOWN_1,
+        CGM_FENCEPOST,
     };
 
     enum cg_message_ver_6_e {
@@ -827,8 +812,8 @@ movement on the server game.
         CGM6_HUDDRAW_ALPHA,
         CGM6_HUDDRAW_STRING,
         CGM6_HUDDRAW_FONT,
-        CGM6_NOTIFY_KILL,
         CGM6_NOTIFY_HIT,
+        CGM6_NOTIFY_KILL,
         CGM6_VOICE_CHAT,
     };
 
@@ -839,10 +824,10 @@ movement on the server game.
 #endif
 
 typedef enum {
-	OBJ_FLAG_NONE,
-	OBJ_FLAG_HIDDEN = 1,
-	OBJ_FLAG_CURRENT = 2,
-	OBJ_FLAG_COMPLETED = 4
+    OBJ_FLAG_NONE,
+    OBJ_FLAG_HIDDEN    = 1,
+    OBJ_FLAG_CURRENT   = 2,
+    OBJ_FLAG_COMPLETED = 4
 } objective_flags_t;
 
 typedef enum {
@@ -851,5 +836,3 @@ typedef enum {
     OBJ_STATUS_CURRENT,
     OBJ_STATUS_COMPLETED
 } objective_status_t;
-
-#endif /* bg_public.h */
diff --git a/code/fgame/bg_slidemove.cpp b/code/fgame/bg_slidemove.cpp
index 59e79211..60d07da8 100644
--- a/code/fgame/bg_slidemove.cpp
+++ b/code/fgame/bg_slidemove.cpp
@@ -41,191 +41,186 @@ PM_SlideMove
 Returns qtrue if the velocity was clipped in some way
 ==================
 */
-#define	MAX_CLIP_PLANES	5
-qboolean	PM_SlideMove( qboolean gravity )
+#define MAX_CLIP_PLANES 5
+
+qboolean PM_SlideMove(qboolean gravity)
 {
-	int			bumpcount, numbumps;
-	vec3_t		dir;
-	float		d;
-	int			numplanes;
-	vec3_t		planes[ MAX_CLIP_PLANES ];
-	vec3_t		primal_velocity;
-	vec3_t		clipVelocity;
-	int			i, j, k;
-	trace_t	trace;
-	vec3_t		end;
-	float		time_left;
-	float		into;
-	vec3_t		endVelocity;
-	vec3_t		endClipVelocity;
+    int     bumpcount, numbumps;
+    vec3_t  dir;
+    float   d;
+    int     numplanes;
+    vec3_t  planes[MAX_CLIP_PLANES];
+    vec3_t  clipVelocity;
+    int     i, j, k;
+    trace_t trace;
+    vec3_t  end;
+    float   time_left;
+    float   into;
+    vec3_t  endVelocity;
+    vec3_t  endClipVelocity;
 
-	numbumps = 4;
+    numbumps = 4;
 
-	VectorCopy( pm->ps->velocity, primal_velocity );
+    VectorCopy(pm->ps->velocity, endVelocity);
 
-	if( gravity ) {
-		VectorCopy( pm->ps->velocity, endVelocity );
-		endVelocity[ 2 ] -= pm->ps->gravity * pml.frametime;
-		pm->ps->velocity[ 2 ] = ( pm->ps->velocity[ 2 ] + endVelocity[ 2 ] ) * 0.5;
-		primal_velocity[ 2 ] = endVelocity[ 2 ];
-		if( pml.groundPlane ) {
-			// slide along the ground plane
-			PM_ClipVelocity( pm->ps->velocity, pml.groundTrace.plane.normal,
-				pm->ps->velocity, OVERCLIP );
-		}
-	}
+    if (gravity) {
+        endVelocity[2] -= pm->ps->gravity * pml.frametime;
+        pm->ps->velocity[2] = (pm->ps->velocity[2] + endVelocity[2]) * 0.5;
+        if (pml.groundPlane) {
+            // slide along the ground plane
+            PM_ClipVelocity(pm->ps->velocity, pml.groundTrace.plane.normal, pm->ps->velocity, OVERCLIP);
+        }
+    }
 
-	time_left = pml.frametime;
+    time_left = pml.frametime;
 
-	// never turn against the ground plane
-	if( pml.groundPlane ) {
-		numplanes = 1;
-		VectorCopy( pml.groundTrace.plane.normal, planes[ 0 ] );
-	}
-	else {
-		numplanes = 0;
-	}
+    // never turn against the ground plane
+    if (pml.groundPlane) {
+        numplanes = 1;
+        VectorCopy(pml.groundTrace.plane.normal, planes[0]);
+    } else {
+        numplanes = 0;
+    }
 
-	// never turn against original velocity
-	VectorNormalize2( pm->ps->velocity, planes[ numplanes ] );
-	numplanes++;
+    // never turn against original velocity
+    VectorNormalize2(pm->ps->velocity, planes[numplanes]);
+    numplanes++;
 
-	for( bumpcount = 0; bumpcount < numbumps; bumpcount++ ) {
+    for (bumpcount = 0; bumpcount < numbumps; bumpcount++) {
+        // calculate position we are trying to move to
+        VectorMA(pm->ps->origin, time_left, pm->ps->velocity, end);
 
-		// calculate position we are trying to move to
-		VectorMA( pm->ps->origin, time_left, pm->ps->velocity, end );
+        // see if we can make it there
+        pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
 
-		// see if we can make it there
-		pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, end, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
+        if (trace.allsolid) {
+            // entity is completely trapped in another solid
+            pm->ps->velocity[2] = 0; // don't build up falling damage, but allow sideways acceleration
+            return qtrue;
+        }
 
-		if( trace.allsolid ) {
-			// entity is completely trapped in another solid
-			pm->ps->velocity[ 2 ] = 0;	// don't build up falling damage, but allow sideways acceleration
-			return qtrue;
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            VectorCopy(trace.endpos, pm->ps->origin);
+        }
 
-		if( trace.fraction > 0 ) {
-			// actually covered some distance
-			VectorCopy( trace.endpos, pm->ps->origin );
-		}
+        if (trace.fraction == 1) {
+            break; // moved the entire distance
+        }
 
-		if( trace.fraction == 1 ) {
-			break;		// moved the entire distance
-		}
+        if ((trace.plane.normal[2] < MIN_WALK_NORMAL) && (trace.plane.normal[2] > 0)
+            && DotProduct(trace.plane.normal, pm->ps->velocity) <= 0) {
+            // treat steep walls as vertical
+            trace.plane.normal[2] = 0;
+            VectorNormalizeFast(trace.plane.normal);
+        }
 
-		if( ( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL ) && ( trace.plane.normal[ 2 ] > 0 ) )
-		{
-			// treat steep walls as vertical
-			trace.plane.normal[ 2 ] = 0;
-			VectorNormalizeFast( trace.plane.normal );
-		}
+        // save entity for contact
+        PM_AddTouchEnt(trace.entityNum);
 
-		// save entity for contact
-		PM_AddTouchEnt( trace.entityNum );
+        time_left -= time_left * trace.fraction;
 
-		time_left -= time_left * trace.fraction;
+        if (numplanes >= MAX_CLIP_PLANES) {
+            // this shouldn't really happen
+            VectorClear(pm->ps->velocity);
+            return qtrue;
+        }
 
-		if( numplanes >= MAX_CLIP_PLANES ) {
-			// this shouldn't really happen
-			VectorClear( pm->ps->velocity );
-			return qtrue;
-		}
+        //
+        // if this is the same plane we hit before, nudge velocity
+        // out along it, which fixes some epsilon issues with
+        // non-axial planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            if (DotProduct(trace.plane.normal, planes[i]) > 0.99) {
+                VectorAdd(trace.plane.normal, pm->ps->velocity, pm->ps->velocity);
+                break;
+            }
+        }
+        if (i < numplanes) {
+            continue;
+        }
+        VectorCopy(trace.plane.normal, planes[numplanes]);
+        numplanes++;
 
-		//
-		// if this is the same plane we hit before, nudge velocity
-		// out along it, which fixes some epsilon issues with
-		// non-axial planes
-		//
-		for( i = 0; i < numplanes; i++ ) {
-			if( DotProduct( trace.plane.normal, planes[ i ] ) > 0.99 ) {
-				VectorAdd( trace.plane.normal, pm->ps->velocity, pm->ps->velocity );
-				break;
-			}
-		}
-		if( i < numplanes ) {
-			continue;
-		}
-		VectorCopy( trace.plane.normal, planes[ numplanes ] );
-		numplanes++;
+        //
+        // modify velocity so it parallels all of the clip planes
+        //
 
-		//
-		// modify velocity so it parallels all of the clip planes
-		//
+        // find a plane that it enters
+        for (i = 0; i < numplanes; i++) {
+            into = DotProduct(pm->ps->velocity, planes[i]);
+            if (into >= 0.1) {
+                continue; // move doesn't interact with the plane
+            }
 
-		// find a plane that it enters
-		for( i = 0; i < numplanes; i++ ) {
-			into = DotProduct( pm->ps->velocity, planes[ i ] );
-			if( into >= 0.1 ) {
-				continue;		// move doesn't interact with the plane
-			}
+            // see how hard we are hitting things
+            if (-into > pml.impactSpeed) {
+                pml.impactSpeed = -into;
+            }
 
-			// see how hard we are hitting things
-			if( -into > pml.impactSpeed ) {
-				pml.impactSpeed = -into;
-			}
+            // slide along the plane
+            PM_ClipVelocity(pm->ps->velocity, planes[i], clipVelocity, OVERCLIP);
 
-			// slide along the plane
-			PM_ClipVelocity( pm->ps->velocity, planes[ i ], clipVelocity, OVERCLIP );
+            // slide along the plane
+            PM_ClipVelocity(endVelocity, planes[i], endClipVelocity, OVERCLIP);
 
-			// slide along the plane
-			PM_ClipVelocity( endVelocity, planes[ i ], endClipVelocity, OVERCLIP );
+            // see if there is a second plane that the new move enters
+            for (j = 0; j < numplanes; j++) {
+                if (j == i) {
+                    continue;
+                }
+                if (DotProduct(clipVelocity, planes[j]) >= 0.1) {
+                    continue; // move doesn't interact with the plane
+                }
 
-			// see if there is a second plane that the new move enters
-			for( j = 0; j < numplanes; j++ ) {
-				if( j == i ) {
-					continue;
-				}
-				if( DotProduct( clipVelocity, planes[ j ] ) >= 0.1 ) {
-					continue;		// move doesn't interact with the plane
-				}
+                // try clipping the move to the plane
+                PM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+                PM_ClipVelocity(endClipVelocity, planes[j], endClipVelocity, OVERCLIP);
 
-				// try clipping the move to the plane
-				PM_ClipVelocity( clipVelocity, planes[ j ], clipVelocity, OVERCLIP );
-				PM_ClipVelocity( endClipVelocity, planes[ j ], endClipVelocity, OVERCLIP );
+                // see if it goes back into the first clip plane
+                if (DotProduct(clipVelocity, planes[i]) >= 0) {
+                    continue;
+                }
 
-				// see if it goes back into the first clip plane
-				if( DotProduct( clipVelocity, planes[ i ] ) >= 0 ) {
-					continue;
-				}
+                // slide the original velocity along the crease
+                CrossProduct(planes[i], planes[j], dir);
+                VectorNormalize(dir);
+                d = DotProduct(dir, pm->ps->velocity);
+                VectorScale(dir, d, clipVelocity);
 
-				// slide the original velocity along the crease
-				CrossProduct( planes[ i ], planes[ j ], dir );
-				VectorNormalize( dir );
-				d = DotProduct( dir, pm->ps->velocity );
-				VectorScale( dir, d, clipVelocity );
+                CrossProduct(planes[i], planes[j], dir);
+                VectorNormalize(dir);
+                d = DotProduct(dir, endVelocity);
+                VectorScale(dir, d, endClipVelocity);
 
-				CrossProduct( planes[ i ], planes[ j ], dir );
-				VectorNormalize( dir );
-				d = DotProduct( dir, endVelocity );
-				VectorScale( dir, d, endClipVelocity );
+                // see if there is a third plane the the new move enters
+                for (k = 0; k < numplanes; k++) {
+                    if (k == i || k == j) {
+                        continue;
+                    }
+                    if (DotProduct(clipVelocity, planes[k]) >= 0.1) {
+                        continue; // move doesn't interact with the plane
+                    }
 
-				// see if there is a third plane the the new move enters
-				for( k = 0; k < numplanes; k++ ) {
-					if( k == i || k == j ) {
-						continue;
-					}
-					if( DotProduct( clipVelocity, planes[ k ] ) >= 0.1 ) {
-						continue;		// move doesn't interact with the plane
-					}
+                    // stop dead at a tripple plane interaction
+                    VectorClear(pm->ps->velocity);
+                    return qtrue;
+                }
+            }
 
-					// stop dead at a tripple plane interaction
-					VectorClear( pm->ps->velocity );
-					return qtrue;
-				}
-			}
+            // if we have fixed all interactions, try another move
+            VectorCopy(clipVelocity, pm->ps->velocity);
+            VectorCopy(endClipVelocity, endVelocity);
+            break;
+        }
+    }
 
-			// if we have fixed all interactions, try another move
-			VectorCopy( clipVelocity, pm->ps->velocity );
-			VectorCopy( endClipVelocity, endVelocity );
-			break;
-		}
-	}
+    if (gravity) {
+        VectorCopy(endVelocity, pm->ps->velocity);
+    }
 
-	if( gravity ) {
-		VectorCopy( endVelocity, pm->ps->velocity );
-	}
-
-	return ( bumpcount != 0 );
+    return (bumpcount != 0);
 }
 
 /*
@@ -234,89 +229,80 @@ PM_StepSlideMove
 
 ==================
 */
-void PM_StepSlideMove( qboolean gravity )
+void PM_StepSlideMove(qboolean gravity)
 {
-	vec3_t start_o;
-	vec3_t start_v;
-	vec3_t nostep_o;
-	vec3_t nostep_v;
-	trace_t trace;
-	qboolean bWasOnGoodGround;
-	vec3_t up;
-	vec3_t down;
+    vec3_t   start_o;
+    vec3_t   start_v;
+    vec3_t   nostep_o;
+    vec3_t   nostep_v;
+    trace_t  trace;
+    qboolean bWasOnGoodGround;
+    vec3_t   up;
+    vec3_t   down;
 
-	VectorCopy( pm->ps->origin, start_o );
-	VectorCopy( pm->ps->velocity, start_v );
+    VectorCopy(pm->ps->origin, start_o);
+    VectorCopy(pm->ps->velocity, start_v);
 
-	if ( PM_SlideMove( gravity ) == 0 ) {
-		return;		// we got exactly where we wanted to go first try	
-	}
+    if (PM_SlideMove(gravity) == 0) {
+        return; // we got exactly where we wanted to go first try
+    }
 
-	VectorCopy( start_o, down );
-	down[ 2 ] -= STEPSIZE;
-	pm->trace( &trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	VectorSet( up, 0, 0, 1 );
+    VectorCopy(start_o, down);
+    down[2] -= STEPSIZE;
+    pm->trace(&trace, start_o, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    VectorSet(up, 0, 0, 1);
 
-	// never step up when you still have up velocity
-	if( pm->ps->velocity[ 2 ] > 0 && ( trace.fraction == 1.0f || 
-		DotProduct( trace.plane.normal, up ) < MIN_WALK_NORMAL ) ) {
-		return;
-	}
+    // never step up when you still have up velocity
+    if (pm->ps->velocity[2] > 0 && (trace.fraction == 1.0f || DotProduct(trace.plane.normal, up) < MIN_WALK_NORMAL)) {
+        return;
+    }
 
-	if( pml.groundPlane && pml.groundTrace.plane.normal[ 2 ] >= MIN_WALK_NORMAL )
-	{
-		bWasOnGoodGround = true;
-	}
-	else
-	{
-		bWasOnGoodGround = false;
-	}
+    if (pml.groundPlane && pml.groundTrace.plane.normal[2] >= MIN_WALK_NORMAL) {
+        bWasOnGoodGround = true;
+    } else {
+        bWasOnGoodGround = false;
+    }
 
-	VectorCopy( start_o, up );
-	up[ 2 ] += STEPSIZE;
+    VectorCopy(start_o, up);
+    up[2] += STEPSIZE;
 
-	// test the player position if they were a stepheight higher
-	pm->trace( &trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( trace.allsolid )
-	{
-		up[ 2 ] -= 9.0f;
-		pm->trace( &trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-		if( trace.allsolid )
-		{
-			return;
-		}
-	}
+    // test the player position if they were a stepheight higher
+    pm->trace(&trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (trace.allsolid) {
+        up[2] -= 9.0f;
+        pm->trace(&trace, up, pm->mins, pm->maxs, up, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+        if (trace.allsolid) {
+            return;
+        }
+    }
 
-	VectorCopy( pm->ps->origin, nostep_o );
-	VectorCopy( pm->ps->velocity, nostep_v );
+    VectorCopy(pm->ps->origin, nostep_o);
+    VectorCopy(pm->ps->velocity, nostep_v);
 
-	// try slidemove from this position
-	VectorCopy( up, pm->ps->origin );
-	VectorCopy( start_v, pm->ps->velocity );
+    // try slidemove from this position
+    VectorCopy(up, pm->ps->origin);
+    VectorCopy(start_v, pm->ps->velocity);
 
-	PM_SlideMove( gravity );
+    PM_SlideMove(gravity);
 
-	// push down the final amount
-	VectorCopy( pm->ps->origin, down );
-	down[ 2 ] -= STEPSIZE;
+    // push down the final amount
+    VectorCopy(pm->ps->origin, down);
+    down[2] -= STEPSIZE;
 
-	pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse );
-	if( !trace.allsolid )
-	{
-		if( bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-		{
-			VectorCopy( nostep_o, pm->ps->origin );
-			VectorCopy( nostep_v, pm->ps->velocity );
-			return;
-		}
+    pm->trace(&trace, pm->ps->origin, pm->mins, pm->maxs, down, pm->ps->clientNum, pm->tracemask, qtrue, qfalse);
+    if (!trace.allsolid) {
+        if (bWasOnGoodGround && trace.fraction < 1.0 && trace.plane.normal[2] < MIN_WALK_NORMAL) {
+            VectorCopy(nostep_o, pm->ps->origin);
+            VectorCopy(nostep_v, pm->ps->velocity);
+            return;
+        }
 
-		VectorCopy( trace.endpos, pm->ps->origin );
-	}
+        VectorCopy(trace.endpos, pm->ps->origin);
+    }
 
-	if ( trace.fraction < 1.0f ) {
-		PM_ClipVelocity( pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP );
-	}
+    if (trace.fraction < 1.0f) {
+        PM_ClipVelocity(pm->ps->velocity, trace.plane.normal, pm->ps->velocity, OVERCLIP);
+    }
 
-	pm->stepped = qtrue;
+    pm->stepped = qtrue;
 }
-
diff --git a/code/fgame/bg_voteoptions.cpp b/code/fgame/bg_voteoptions.cpp
index ce1b49e8..8c9e20bb 100644
--- a/code/fgame/bg_voteoptions.cpp
+++ b/code/fgame/bg_voteoptions.cpp
@@ -21,5 +21,721 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "bg_voteoptions.h"
+#include "../qcommon/script.h"
 
-// FIXME: unimplemented
+#if defined(GAME_DLL)
+#    define VO_FS_FreeFile                  gi.FS_FreeFile
+#    define VO_FS_ReadFile(a, b)            gi.FS_ReadFile(a, b, true)
+#    define VO_SendRemoteCommand(s)         // ?
+#    define VO_ExecuteCommand(s)            gi.Cmd_Execute(EXEC_NOW, s)
+#    define VO_Cvar_Set(name, value)        gi.cvar_set(name, value)
+#    define VO_Cvar_Get(name, value, flags) gi.Cvar_Get(name, value, flags)
+#    define VO_LV_ConvertString(s)          gi.LV_ConvertString(s)
+#elif defined(CGAME_DLL)
+#    define VO_FS_FreeFile                  cgi.FS_FreeFile
+#    define VO_FS_ReadFile(a, b)            cgi.FS_ReadFile(a, b, qtrue)
+#    define VO_SendRemoteCommand(s)         cgi.SendClientCommand(s)
+#    define VO_ExecuteCommand(s)            cgi.Cmd_Execute(EXEC_NOW, s)
+#    define VO_Cvar_Set(name, value)        cgi.Cvar_Set(name, value)
+#    define VO_Cvar_Get(name, value, flags) cgi.Cvar_Get(name, value, flags)
+#    define VO_LV_ConvertString(s)          cgi.LV_ConvertString(s)
+#else
+#    pragma error("VoteOptions can must be used with fgame or cgame")
+#endif
+
+CLASS_DECLARATION(Class, VoteOptions, NULL) {
+    {NULL, NULL}
+};
+
+VoteOptionListItem::VoteOptionListItem()
+    : m_pNext(NULL)
+{}
+
+SingleVoteOption::SingleVoteOption()
+    : m_optionType(VOTE_NO_CHOICES)
+    , m_pListItem(NULL)
+    , m_pNext(NULL)
+{}
+
+SingleVoteOption::~SingleVoteOption()
+{
+    VoteOptionListItem *item;
+    VoteOptionListItem *next;
+
+    for (item = m_pListItem; item; item = next) {
+        next = item->m_pNext;
+        delete item;
+    }
+}
+
+VoteOptions::VoteOptions()
+{
+    m_pHeadOption = NULL;
+}
+
+VoteOptions::~VoteOptions()
+{
+    ClearOptions();
+}
+
+void VoteOptions::ClearOptions()
+{
+    SingleVoteOption *option;
+    SingleVoteOption *next;
+
+    for (option = m_pHeadOption; option; option = next) {
+        next = option->m_pNext;
+        delete option;
+    }
+
+    m_pHeadOption = NULL;
+}
+
+void VoteOptions::SetupVoteOptions(const char *configFileName)
+{
+    char *buffer;
+    int   compressedLength;
+    long  length;
+
+    length = VO_FS_ReadFile(configFileName, (void **)&buffer);
+    if (length == -1 || !length) {
+        Com_Printf("WARNING: Couldn't find voting options file: %s\n", configFileName);
+        return;
+    }
+
+    // compress the buffer before setting up
+    compressedLength = COM_Compress(buffer);
+    SetupVoteOptions(configFileName, compressedLength, buffer);
+    VO_FS_FreeFile(buffer);
+}
+
+void VoteOptions::SetupVoteOptions(const char *configFileName, int length, const char *buffer)
+{
+    if (length >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
+        Com_Error(
+            ERR_DROP,
+            "VoteOptions: Options file '%s' is too big. Max size is %lu bytes\n",
+            configFileName,
+            MAX_VOTEOPTIONS_BUFFER_LENGTH
+        );
+        return;
+    }
+
+    m_sFileName = configFileName;
+    m_sBuffer   = buffer;
+
+    ParseVoteOptions();
+}
+
+void VoteOptions::ParseVoteOptions()
+{
+    SingleVoteOption   *option;
+    SingleVoteOption   *newOption;
+    VoteOptionListItem *listItem;
+    VoteOptionListItem *newListItem;
+    str                 token;
+    Script              script;
+
+    ClearOptions();
+    script.LoadFile(m_sFileName.c_str(), m_sBuffer.length(), m_sBuffer.c_str());
+
+    option = m_pHeadOption;
+
+    while (script.TokenAvailable(true)) {
+        token = script.GetToken(true);
+
+        if (!str::icmp(token, "{")) {
+            Com_Error(
+                ERR_DROP,
+                "Vote Options %s: Found choices list without option header on line %d.\n",
+                m_sFileName.c_str(),
+                script.GetLineNumber()
+            );
+            return;
+        }
+
+        if (!str::icmp(token, "}")) {
+            Com_Error(
+                ERR_DROP,
+                "Vote Options %s: Illegal end of choices list without list being started on line %d.\n",
+                m_sFileName.c_str(),
+                script.GetLineNumber()
+            );
+            return;
+        }
+
+        if (!token.length()) {
+            Com_Error(
+                ERR_DROP,
+                "Vote Options %s: Empty option name on line %d.\n",
+                m_sFileName.c_str(),
+                script.GetLineNumber()
+            );
+            return;
+        }
+
+        newOption = new SingleVoteOption();
+
+        if (option) {
+            option->m_pNext = newOption;
+        } else {
+            m_pHeadOption = newOption;
+        }
+        option = newOption;
+
+        newOption->m_sOptionName = token;
+
+        if (!script.TokenAvailable(false)) {
+            Com_Error(
+                ERR_DROP,
+                "Vote Options %s: Option without a command specified on line %d.\n",
+                m_sFileName.c_str(),
+                script.GetLineNumber()
+            );
+            return;
+        }
+
+        newOption->m_sCommand = script.GetToken(false);
+
+        if (script.TokenAvailable(false)) {
+            token = script.GetToken(false);
+
+            if (!str::icmp(token, "nochoices")) {
+                newOption->m_optionType = VOTE_NO_CHOICES;
+            } else if (!str::icmp(token, "list")) {
+                newOption->m_optionType = VOTE_OPTION_LIST;
+            } else if (!str::icmp(token, "text")) {
+                newOption->m_optionType = VOTE_OPTION_TEXT;
+            } else if (!str::icmp(token, "integer")) {
+                newOption->m_optionType = VOTE_OPTION_INTEGER;
+            } else if (!str::icmp(token, "float")) {
+                newOption->m_optionType = VOTE_OPTION_FLOAT;
+            } else if (!str::icmp(token, "client")) {
+                newOption->m_optionType = VOTE_OPTION_CLIENT;
+            } else if (!str::icmp(token, "clientnotself")) {
+                newOption->m_optionType = VOTE_OPTION_CLIENT_NOT_SELF;
+            } else {
+                Com_Error(
+                    ERR_DROP,
+                    "Vote Options %s: Illegal option type '%s' specified on line %d.\n"
+                    " Valid types are nochoices, list, text, & number.\n",
+                    m_sFileName.c_str(),
+                    token.c_str(),
+                    script.GetLineNumber()
+                );
+                return;
+            }
+        }
+
+        if (newOption->m_optionType == VOTE_OPTION_LIST) {
+            if (!script.TokenAvailable(true) || Q_stricmp(script.GetToken(true), "{")) {
+                Com_Error(
+                    ERR_DROP,
+                    "Vote Options %s: Missing '{'. No choices list specified for list option on line %d.\n",
+                    m_sFileName.c_str(),
+                    script.GetLineNumber()
+                );
+                return;
+            }
+
+            listItem = NULL;
+
+            while (script.TokenAvailable(true)) {
+                token = script.GetToken(true);
+
+                if (!str::icmp(token, "}")) {
+                    break;
+                }
+
+                newListItem = new VoteOptionListItem();
+
+                if (listItem) {
+                    listItem->m_pNext = newListItem;
+                } else {
+                    newOption->m_pListItem = newListItem;
+                }
+                listItem                 = newListItem;
+                newListItem->m_sItemName = token;
+
+                if (!script.TokenAvailable(false)) {
+                    Com_Error(
+                        ERR_DROP,
+                        "Vote Options %s: List choice without vote string specified on line %d.\n",
+                        m_sFileName.c_str(),
+                        script.GetLineNumber()
+                    );
+                    return;
+                }
+
+                newListItem->m_sCommand = script.GetToken(false);
+            }
+        } else if (script.TokenAvailable(true)) {
+            token = script.GetToken(true);
+
+            if (!str::icmp(token, "{")) {
+                Com_Error(
+                    ERR_DROP,
+                    "Vote Options %s: Choices list specified for non-list option on line %d.\n",
+                    m_sFileName.c_str(),
+                    script.GetLineNumber()
+                );
+                return;
+            }
+
+            script.UnGetToken();
+        }
+    }
+}
+
+const char *VoteOptions::GetVoteOptionsFile(int *outLen) const
+{
+    if (outLen) {
+        *outLen = m_sBuffer.length();
+    }
+
+    return m_sBuffer.c_str();
+}
+
+bool VoteOptions::GetVoteOptionsMain(int index, str *outOptionCommand, voteoptiontype_t *outOptionType) const
+{
+    SingleVoteOption *option;
+    int               optionIndex;
+
+    if (index < 1) {
+        return false;
+    }
+
+    optionIndex = 1;
+    for (option = m_pHeadOption; optionIndex < index && option != NULL; option = option->m_pNext) {
+        optionIndex++;
+    }
+
+    if (!option) {
+        return false;
+    }
+
+    *outOptionCommand = option->m_sCommand;
+    *outOptionType    = option->m_optionType;
+
+    return true;
+}
+
+bool VoteOptions::GetVoteOptionSub(int index, int listIndex, str *outCommand) const
+{
+    SingleVoteOption   *option;
+    VoteOptionListItem *item;
+    int                 optionIndex;
+    int                 itemIndex;
+
+    if (index < 1 || listIndex < 1) {
+        return false;
+    }
+
+    optionIndex = 1;
+    for (option = m_pHeadOption; optionIndex < index && option != NULL; option = option->m_pNext) {
+        optionIndex++;
+    }
+
+    if (!option) {
+        return false;
+    }
+
+    if (option->m_optionType != VOTE_OPTION_LIST) {
+        return false;
+    }
+
+    itemIndex = 1;
+    for (item = option->m_pListItem; itemIndex < listIndex && option != NULL; item = item->m_pNext) {
+        itemIndex++;
+    }
+
+    if (!item) {
+        return false;
+    }
+
+    *outCommand = item->m_sCommand;
+
+    return true;
+}
+
+bool VoteOptions::GetVoteOptionMainName(int index, str *outVoteName) const
+{
+    SingleVoteOption *option;
+    int               optionIndex;
+
+    if (index < 1) {
+        return false;
+    }
+
+    optionIndex = 1;
+    for (option = m_pHeadOption; optionIndex < index && option != NULL; option = option->m_pNext) {
+        optionIndex++;
+    }
+
+    if (!option) {
+        return false;
+    }
+
+    *outVoteName = option->m_sOptionName;
+
+    return true;
+}
+
+bool VoteOptions::GetVoteOptionSubName(int index, int listIndex, str *outName) const
+{
+    SingleVoteOption   *option;
+    VoteOptionListItem *item;
+    int                 optionIndex;
+    int                 itemIndex;
+
+    if (index < 1 || listIndex < 1) {
+        return false;
+    }
+
+    optionIndex = 1;
+    for (option = m_pHeadOption; optionIndex < index && option != NULL; option = option->m_pNext) {
+        optionIndex++;
+    }
+
+    if (!option) {
+        return false;
+    }
+
+    if (option->m_optionType != VOTE_OPTION_LIST) {
+        return false;
+    }
+
+    itemIndex = 1;
+    for (item = option->m_pListItem; itemIndex < listIndex && option != NULL; item = item->m_pNext) {
+        itemIndex++;
+    }
+
+    if (!item) {
+        return false;
+    }
+
+    *outName = item->m_sItemName;
+
+    return true;
+}
+
+#if defined(CGAME_DLL)
+
+static str         g_sVoteString;
+static VoteOptions g_voteOptions;
+
+void CG_VoteOptions_StartReadFromServer(const char *string)
+{
+    g_sVoteString = string;
+}
+
+void CG_VoteOptions_ContinueReadFromServer(const char *string)
+{
+    if (g_sVoteString.length() >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
+        return;
+    }
+
+    g_sVoteString += string;
+}
+
+void CG_VoteOptions_FinishReadFromServer(const char *string)
+{
+    int i;
+
+    if (g_sVoteString.length() >= MAX_VOTEOPTIONS_BUFFER_LENGTH) {
+        return;
+    }
+
+    g_sVoteString += va("%s\n", string);
+    if (!str::cmp(g_sVoteString, "\n")) {
+        VO_SendRemoteCommand("wait 250;gvo\n");
+        return;
+    }
+
+    for (i = 0; i < g_sVoteString.length(); i++) {
+        if (g_sVoteString[i] == 1) {
+            g_sVoteString[i] = '"';
+        }
+    }
+
+    g_voteOptions.SetupVoteOptions("ServerVoteOptions", g_sVoteString.length(), g_sVoteString.c_str());
+    g_sVoteString = "";
+    g_voteOptions.SetupMainOptionsList();
+}
+
+void CG_PushCallVote_f(void)
+{
+    g_voteOptions.SetupMainOptionsList();
+}
+
+void CG_PushCallVoteSubList_f(void)
+{
+    g_voteOptions.SetupSubOptionsList(atoi(cgi.Argv(1)));
+}
+
+void CG_PushCallVoteSubText_f(void)
+{
+    str              command;
+    str              name;
+    voteoptiontype_t type;
+
+    if (!g_voteOptions.GetVoteOptionsMain(atoi(cgi.Argv(1)), &command, &type)) {
+        return;
+    }
+
+    if (type != voteoptiontype_t::VOTE_OPTION_TEXT) {
+        return;
+    }
+
+    g_voteOptions.GetVoteOptionMainName(atoi(cgi.Argv(1)), &name);
+    VO_ExecuteCommand("forcemenu votesubtext\n");
+    VO_Cvar_Set("ui_votesubtitle", name.c_str());
+    VO_Cvar_Set("ui_votestringentry", "");
+}
+
+void CG_PushCallVoteSubInteger_f(void)
+{
+    str              command;
+    str              name;
+    voteoptiontype_t type;
+
+    if (!g_voteOptions.GetVoteOptionsMain(atoi(cgi.Argv(1)), &command, &type)) {
+        return;
+    }
+
+    if (type != voteoptiontype_t::VOTE_OPTION_INTEGER) {
+        return;
+    }
+
+    g_voteOptions.GetVoteOptionMainName(atoi(cgi.Argv(1)), &name);
+    VO_ExecuteCommand("forcemenu votesubinteger\n");
+    VO_Cvar_Set("ui_votesubtitle", name.c_str());
+    VO_Cvar_Set("ui_votestringentry", "");
+}
+
+void CG_PushCallVoteSubFloat_f(void)
+{
+    str              command;
+    str              name;
+    voteoptiontype_t type;
+
+    if (!g_voteOptions.GetVoteOptionsMain(atoi(cgi.Argv(1)), &command, &type)) {
+        return;
+    }
+
+    if (type != voteoptiontype_t::VOTE_OPTION_FLOAT) {
+        return;
+    }
+
+    g_voteOptions.GetVoteOptionMainName(atoi(cgi.Argv(1)), &name);
+    VO_ExecuteCommand("forcemenu votesubfloat\n");
+    VO_Cvar_Set("ui_votesubtitle", name.c_str());
+    VO_Cvar_Set("ui_votestringentry", "");
+}
+
+void CG_PushCallVoteSubClient_f(void)
+{
+    str              command;
+    str              name;
+    int              index;
+    int              i;
+    voteoptiontype_t type;
+
+    index = atoi(cgi.Argv(1));
+
+    if (!g_voteOptions.GetVoteOptionsMain(index, &command, &type)) {
+        return;
+    }
+
+    if (type != voteoptiontype_t::VOTE_OPTION_CLIENT && type != voteoptiontype_t::VOTE_OPTION_CLIENT_NOT_SELF) {
+        return;
+    }
+
+    g_voteOptions.GetVoteOptionMainName(index, &name);
+    VO_ExecuteCommand("forcemenu votesubclient\n");
+    VO_Cvar_Set("ui_votesubtitle", name.c_str());
+    VO_ExecuteCommand("globalwidgetcommand voteclientlist deleteallitems\n");
+
+    for (i = 0; i < cgs.maxclients; i++) {
+        if (type == VOTE_OPTION_CLIENT_NOT_SELF && cg.snap && i == cg.snap->ps.clientNum) {
+            continue;
+        }
+
+        if (!strlen(cg.clientinfo[i].name)) {
+            continue;
+        }
+
+        VO_ExecuteCommand(
+            va("globalwidgetcommand voteclientlist additem \"%i: %s\" \"callvote %i %i;popmenu 0\"\n",
+               i,
+               cg.clientinfo[i].name,
+               index,
+               i)
+        );
+    }
+
+    VO_ExecuteCommand(
+        va("globalwidgetcommand voteclientlist additem \"%s\" \"popmenu 0\"\n", VO_LV_ConvertString("[Cancel Vote]"))
+    );
+}
+
+void CG_PushVote_f(void)
+{
+    VO_Cvar_Set("ui_votesubtitle", cgs.voteString);
+    VO_ExecuteCommand("forcemenu votecast\n");
+}
+
+void CG_CallEntryVote_f(void)
+{
+    str              command;
+    str              name;
+    const char      *entry;
+    int              index;
+    voteoptiontype_t type;
+
+    index = VO_Cvar_Get("ui_votetype", "0", 0)->integer;
+
+    if (!g_voteOptions.GetVoteOptionsMain(index, &command, &type)) {
+        return;
+    }
+
+    if (type != voteoptiontype_t::VOTE_OPTION_TEXT && type != voteoptiontype_t::VOTE_OPTION_INTEGER
+        && type != voteoptiontype_t::VOTE_OPTION_FLOAT) {
+        return;
+    }
+
+    entry = VO_Cvar_Get("ui_votestringentry", "", 0)->string;
+    VO_ExecuteCommand(va("callvote %i \"%s\"\n", index, entry));
+}
+
+void VoteOptions::SetupMainOptionsList(void)
+{
+    SingleVoteOption *option;
+    int               count;
+
+    VO_ExecuteCommand("forcemenu votemain\n");
+    VO_ExecuteCommand("globalwidgetcommand votelistmain deleteallitems\n");
+
+    if (!IsSetup()) {
+        VO_ExecuteCommand(
+            va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0\"\n",
+               VO_LV_ConvertString("Retrieving voting options from server..."))
+        );
+        VO_SendRemoteCommand("gvo\n");
+        return;
+    }
+
+    count = 1;
+
+    for (option = m_pHeadOption; option; option = option->m_pNext, count++) {
+        switch (option->m_optionType) {
+        case VOTE_NO_CHOICES:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"callvote %i;popmenu 0\"\n",
+                   option->m_sOptionName.c_str(),
+                   count)
+            );
+            break;
+        case VOTE_OPTION_LIST:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0;wait 100;pushcallvotesublist %i\"\n",
+                   option->m_sOptionName.c_str(),
+                   count)
+            );
+            break;
+        case VOTE_OPTION_TEXT:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0;wait 100;set ui_votetype "
+                   "%i;pushcallvotesubtext %i\"\n",
+                   option->m_sOptionName.c_str(),
+                   count,
+                   count)
+            );
+            break;
+        case VOTE_OPTION_INTEGER:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0;wait 100;set ui_votetype "
+                   "%i;pushcallvotesubinteger %i\"\n",
+                   option->m_sOptionName.c_str(),
+                   count,
+                   count)
+            );
+            break;
+        case VOTE_OPTION_FLOAT:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0;wait 100;set ui_votetype "
+                   "%i;pushcallvotesubfloat %i\"\n",
+                   option->m_sOptionName.c_str(),
+                   count,
+                   count)
+            );
+            break;
+        case VOTE_OPTION_CLIENT:
+        case VOTE_OPTION_CLIENT_NOT_SELF:
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0;wait 100;set ui_votetype "
+                   "%i;pushcallvotesubclient %i\"\n",
+                   option->m_sOptionName.c_str(),
+                   count,
+                   count)
+            );
+            break;
+        }
+    }
+
+    VO_ExecuteCommand(
+        va("globalwidgetcommand votelistmain additem \"%s\" \"popmenu 0\"\n", VO_LV_ConvertString("[Cancel Vote]"))
+    );
+}
+
+void VoteOptions::SetupSubOptionsList(int index)
+{
+    SingleVoteOption   *option;
+    VoteOptionListItem *item;
+    int                 count;
+    int                 numItems;
+
+    if (index < 1) {
+        return;
+    }
+
+    count = 1;
+    for (option = m_pHeadOption; count < index && option; option = option->m_pNext) {
+        count++;
+    }
+
+    if (!option) {
+        return;
+    }
+
+    if (option->m_optionType != VOTE_OPTION_LIST || !option->m_pListItem) {
+        return;
+    }
+
+    VO_ExecuteCommand("forcemenu votesublist\n");
+    VO_Cvar_Set("ui_votesubtitle", option->m_sOptionName.c_str());
+    VO_ExecuteCommand("globalwidgetcommand votelistsub deleteallitems\n");
+
+    if (IsSetup()) {
+        numItems = 1;
+
+        for (item = option->m_pListItem; item; item = item->m_pNext, numItems++) {
+            VO_ExecuteCommand(
+                va("globalwidgetcommand votelistsub additem \"%s\" \"callvote %i %i;popmenu 0\"\n",
+                   item->m_sItemName.c_str(),
+                   index,
+                   numItems)
+            );
+        }
+
+        VO_ExecuteCommand(
+            va("globalwidgetcommand votelistsub additem \"%s\" \"popmenu 0\"\n", VO_LV_ConvertString("[Cancel Vote]"))
+        );
+    } else {
+        VO_ExecuteCommand(
+            "globalwidgetcommand votelistsub additem \"Retrieving voting options from server...\" \"popmenu 0\"\n"
+        );
+        VO_SendRemoteCommand("gvo\n");
+    }
+}
+#endif
diff --git a/code/fgame/bg_voteoptions.h b/code/fgame/bg_voteoptions.h
index 665203b6..8c69377e 100644
--- a/code/fgame/bg_voteoptions.h
+++ b/code/fgame/bg_voteoptions.h
@@ -22,9 +22,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
-#include "listener.h"
+#ifdef __cplusplus
+#    include "listener.h"
+#endif
+
 #include "g_public.h"
 
+#ifdef __cplusplus
+
+static const unsigned long MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH = 2024;
+static const unsigned long MAX_VOTEOPTIONS_BUFFER_LENGTH        = 0x100000;
+
 typedef enum voteoptiontype_e {
     /** No input. */
     VOTE_NO_CHOICES,
@@ -44,18 +52,27 @@ typedef enum voteoptiontype_e {
 
 class VoteOptionListItem
 {
+public:
     str                       m_sItemName;
     str                       m_sCommand;
     class VoteOptionListItem *m_pNext;
+
+public:
+    VoteOptionListItem();
 };
 
 class SingleVoteOption
 {
-    str                     m_sVoteName;
-    str                     m_sCommand;
-    voteoptiontype_t        m_optionType;
-    VoteOptionListItem     *m_pListItem;
-    class SingleVoteOption *m_pNext;
+public:
+    str                 m_sOptionName;
+    str                 m_sCommand;
+    voteoptiontype_t    m_optionType;
+    VoteOptionListItem *m_pListItem;
+    SingleVoteOption   *m_pNext;
+
+public:
+    SingleVoteOption();
+    ~SingleVoteOption();
 };
 
 class VoteOptions : public Class
@@ -63,14 +80,56 @@ class VoteOptions : public Class
 public:
     CLASS_PROTOTYPE(VoteOptions);
 
-public:
+private:
     str               m_sFileName;
     str               m_sBuffer;
     SingleVoteOption *m_pHeadOption;
-    int               field_5;
-    float             field_6;
-    float             field_7;
-    float             field_8;
-    float             field_9;
-    float             field_10;
+
+public:
+    VoteOptions();
+    ~VoteOptions();
+
+    bool IsSetup() const;
+
+    void        ClearOptions();
+    void        SetupVoteOptions(const char *configFileName);
+    void        SetupVoteOptions(const char *configFileName, int length, const char *buffer);
+    void        ParseVoteOptions();
+    const char *GetVoteOptionsFile(int *outLen) const;
+    bool        GetVoteOptionsMain(int index, str *outOptionCommand, voteoptiontype_t *outOptionType) const;
+    bool        GetVoteOptionSub(int index, int listIndex, str *outCommand) const;
+    bool        GetVoteOptionMainName(int index, str *outVoteName) const;
+    bool        GetVoteOptionSubName(int index, int listIndex, str *outName) const;
+
+    void SetupMainOptionsList();
+    void SetupSubOptionsList(int index);
 };
+
+inline bool VoteOptions::IsSetup() const
+{
+    return m_pHeadOption != NULL;
+}
+
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(CGAME_DLL)
+    void CG_VoteOptions_StartReadFromServer(const char *string);
+    void CG_VoteOptions_ContinueReadFromServer(const char *string);
+    void CG_VoteOptions_FinishReadFromServer(const char *string);
+    void CG_PushCallVote_f(void);
+    void CG_PushCallVoteSubList_f(void);
+    void CG_PushCallVoteSubText_f(void);
+    void CG_PushCallVoteSubInteger_f(void);
+    void CG_PushCallVoteSubFloat_f(void);
+    void CG_PushCallVoteSubClient_f(void);
+    void CG_PushVote_f(void);
+    void CG_CallEntryVote_f(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/fgame/body.h b/code/fgame/body.h
index 0abcb57a..b086ae89 100644
--- a/code/fgame/body.h
+++ b/code/fgame/body.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // body.h: Dead bodies
 
-#ifndef __BODY_H__
-#define __BODY_H__
+#pragma once
 
 #include "animate.h"
 
@@ -39,5 +38,3 @@ public:
 	CLASS_PROTOTYPE( Body );
 	Body();
 };
-
-#endif //__BODY_H__
diff --git a/code/fgame/botlib.h b/code/fgame/botlib.h
index c49455ab..d96340a4 100644
--- a/code/fgame/botlib.h
+++ b/code/fgame/botlib.h
@@ -13,8 +13,7 @@
  *
  *****************************************************************************/
 
-#ifndef __BOTLIB_H__
-#define __BOTLIB_H__
+#pragma once
 
 #define	BOTLIB_API_VERSION		2
 
@@ -503,4 +502,3 @@ name:						default:			module(s):			description:
 "max_levelitems"			"256"				be_ai_goal.c		maximum number of level items
 
 */
-#endif
diff --git a/code/fgame/bspline.cpp b/code/fgame/bspline.cpp
index 61baf80c..11e41355 100644
--- a/code/fgame/bspline.cpp
+++ b/code/fgame/bspline.cpp
@@ -30,934 +30,712 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_phys.h"
 #include "scriptexception.h"
 
-void BSpline::Set
-	(
-	Vector *control_points_,
-	int num_control_points_,
-	splinetype_t type
-	)
-
-	{
-	int i;
-
-	SetType( type );
-
-   has_orientation = false;
-
-	if ( control_points )
-		{
-		delete [] control_points;
-		control_points = NULL;
-		}
-
-	num_control_points = num_control_points_;
-	if ( num_control_points )
-		{
-		control_points = new BSplineControlPoint[ num_control_points ];
-		assert( control_points );
-
-		for( i = 0; i < num_control_points; i++ )
-			{
-			control_points[ i ].Set( control_points_[ i ] );
-			}
-		}
-	}
-
-void BSpline::Set
-	(
-	Vector *control_points_,
-	Vector *control_orients_,
-   float  *control_speeds_,
-	int num_control_points_,
-	splinetype_t type
-	)
-
-	{
-	int i;
-
-	SetType( type );
-
-   has_orientation = true;
-
-	if ( control_points )
-		{
-		delete [] control_points;
-		control_points = NULL;
-		}
-
-	num_control_points = num_control_points_;
-	if ( num_control_points )
-		{
-		control_points = new BSplineControlPoint[ num_control_points ];
-		assert( control_points );
-
-		for( i = 0; i < num_control_points; i++ )
-			{
-			control_points[ i ].Set( control_points_[ i ], control_orients_[ i ], control_speeds_[ i ] );
-			}
-		}
-	}
-
-void BSpline::Clear
-	(
-	void
-	)
-
-	{
-	if( control_points )
-		{
-		delete [] control_points;
-		control_points = NULL;
-		}
-	num_control_points = 0;
-   has_orientation = false;
-	}
-
-inline float BSpline::EvalNormal
-	(
-	float u,
-   Vector& pos,
-   Vector& orient
-	)
-
-	{
-	int		segment_id;
-	float		B[ 4 ];
-	float		tmp;
-	float		u_2;
-	float		u_3;
-   Vector   ang;
-   float    roll;
-   float    speed;
-
-	segment_id = ( int )u;
-	if ( segment_id < 0 )
-		{
-		segment_id = 0;
-		}
-	if ( segment_id > num_control_points - 4 )
-		{
-		segment_id = num_control_points - 4;
-		}
-	u -= ( float )segment_id;
-
-	u_2 = u * u;
-	u_3 = u * u_2;
-
-	tmp = 1 - u;
-	B[ 0 ] = ( tmp * tmp * tmp ) * ( 1.0f / 6.0f );
-	B[ 1 ] = ( 3.0f * u_3 - 6.0f * u_2 + 4.0f ) * ( 1.0f / 6.0f );
-	B[ 2 ] = ( -3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1 ) * ( 1.0f / 6.0f );
-	B[ 3 ] = u_3 * ( 1.0f / 6.0f );
-
-	pos = 
-		*control_points[ 0 + segment_id ].GetPosition() * B[ 0 ] +
-		*control_points[ 1 + segment_id ].GetPosition() * B[ 1 ] +
-		*control_points[ 2 + segment_id ].GetPosition() * B[ 2 ] +
-		*control_points[ 3 + segment_id ].GetPosition() * B[ 3 ];
-
-	ang = 
-		*control_points[ 0 + segment_id ].GetOrientation() * B[ 0 ] +
-		*control_points[ 1 + segment_id ].GetOrientation() * B[ 1 ] +
-		*control_points[ 2 + segment_id ].GetOrientation() * B[ 2 ] +
-		*control_points[ 3 + segment_id ].GetOrientation() * B[ 3 ];
-
-	roll = 
-		*control_points[ 0 + segment_id ].GetRoll() * B[ 0 ] +
-		*control_points[ 1 + segment_id ].GetRoll() * B[ 1 ] +
-		*control_points[ 2 + segment_id ].GetRoll() * B[ 2 ] +
-		*control_points[ 3 + segment_id ].GetRoll() * B[ 3 ];
-
-	speed = 
-		*control_points[ 0 + segment_id ].GetSpeed() * B[ 0 ] +
-		*control_points[ 1 + segment_id ].GetSpeed() * B[ 1 ] +
-		*control_points[ 2 + segment_id ].GetSpeed() * B[ 2 ] +
-		*control_points[ 3 + segment_id ].GetSpeed() * B[ 3 ];
-
-   orient = ang.toAngles();
-   orient[ ROLL ] = roll;
-
-   return speed;
-	}
-
-inline float BSpline::EvalLoop
-	(
-	float t,
-   Vector& pos,
-   Vector& orient
-	)
-
-	{
-	Vector	retval;
-   Vector   ang;
-   float    speed;
-   float    roll;
-	int		segment_id;
-   int      next_id;
-	float		B[ 4 ];
-	float		tmp;
-	float		u;
-	float		u_2;
-	float		u_3;
-	int		i;
-	int		j;
-
-	segment_id = ( int )floor( t );
-	u = t - floor( t );
-
-	segment_id %= num_control_points;
-	if ( segment_id < 0 )
-		{
-		segment_id += num_control_points;
-		}
-
-	u_2 = u * u;
-	u_3 = u * u_2;
-
-	tmp = 1 - u;
-	B[ 0 ] = ( tmp * tmp * tmp ) * ( 1.0f / 6.0f );
-	B[ 1 ] = ( 3.0f * u_3 - 6.0f * u_2 + 4.0f ) * ( 1.0f / 6.0f );
-	B[ 2 ] = ( -3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1 ) * ( 1.0f / 6.0f );
-	B[ 3 ] = u_3 * ( 1.0f / 6.0f );
-
-   speed = 0;
-   roll = 0;
-
-	for( i = 0, j = segment_id; i < 4; i++, j++ )
-		{
-		if ( j >= num_control_points )
-			{
-			j -= ( num_control_points - loop_control_point );
-			}
-
-		retval += *control_points[ j ].GetPosition() * B[ i ];
-		ang += *control_points[ j ].GetOrientation() * B[ i ];
-	   speed += *control_points[ j ].GetSpeed() * B[ i ];
-	   roll += *control_points[ j ].GetRoll() * B[ i ];
-		}
-
-   pos = retval;
-
-   next_id = segment_id + 1;
-	if ( next_id >= num_control_points )
-		{
-		next_id -= ( num_control_points - loop_control_point );
-		}
-   orient = ang.toAngles();
-   orient[ ROLL ] = roll;
-
-   return speed;
-	}
-
-inline float BSpline::EvalClamp
-	(
-	float t,
-   Vector& pos,
-   Vector& orient
-	)
-
-	{
-	Vector	retval;
-   Vector   ang;
-	int		segment_id;
-	int		next_id;
-	float		B[ 4 ];
-	float		tmp;
-	float		u;
-	float		u_2;
-	float		u_3;
-	int		i;
-	int		j;
-   float    speed;
-   float    roll;
-
-	segment_id = ( int )floor( t );
-	u = t - floor( t );
-
-	u_2 = u * u;
-	u_3 = u * u_2;
-
-	tmp = 1 - u;
-	B[ 0 ] = ( tmp * tmp * tmp ) * ( 1.0f / 6.0f );
-	B[ 1 ] = ( 3.0f * u_3 - 6.0f * u_2 + 4.0f ) * ( 1.0f / 6.0f );
-	B[ 2 ] = ( -3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1 ) * ( 1.0f / 6.0f );
-	B[ 3 ] = u_3 * ( 1.0f / 6.0f );
-
-   speed = 0;
-   roll = 0;
-	for( i = 0; i < 4; i++, segment_id++ )
-		{
-		j = segment_id;
-		if ( j < 0 )
-			{
-			j = 0;
-			}
-		else if ( j >= num_control_points )
-			{
-			j = num_control_points - 1;
-			}
-
-		retval += *control_points[ j ].GetPosition() * B[ i ];
-		ang += *control_points[ j ].GetOrientation() * B[ i ];
-	   speed += *control_points[ j ].GetSpeed() * B[ i ];
-	   roll += *control_points[ j ].GetRoll() * B[ i ];
-		}
-
-   pos = retval;
-
-   next_id = segment_id + 1;
-   if ( segment_id < 0 )
-      {
-      segment_id = 0;
-      }
-	if ( segment_id >= num_control_points )
-		{
-	   segment_id = num_control_points - 1;
-		}
-   if ( next_id < 0 )
-      {
-      next_id = 0;
-      }
-	if ( next_id >= num_control_points )
-		{
-	   next_id = num_control_points - 1;
-		}
-   orient = ang.toAngles();
-   orient[ ROLL ] = roll;
-
-   return speed;
-	}
-
-
-Vector BSpline::Eval
-	(
-	float u
-	)
-
-	{
-   Vector pos;
-   Vector orient;
-
-	switch( curvetype )
-		{
-		default:
-		case SPLINE_NORMAL :
-         EvalNormal( u, pos, orient );
-			break;
-
-		case SPLINE_CLAMP:
-         EvalClamp( u, pos, orient );
-			break;
-
-		case SPLINE_LOOP:
-         if ( u < 0 )
-            {
-            EvalClamp( u, pos, orient );
-            }
-         else
-            {
-            EvalLoop( u, pos, orient );
-            }
-			break;
-		}
-   return pos;
-	}
-
-float BSpline::Eval
-	(
-	float u,
-   Vector &pos,
-   Vector &orient
-	)
-
-	{
-	switch( curvetype )
-		{
-		default:
-		case SPLINE_NORMAL :
-         return EvalNormal( u, pos, orient );
-			break;
-
-		case SPLINE_CLAMP:
-         return EvalClamp( u, pos, orient );
-			break;
-
-		case SPLINE_LOOP:
-         if ( u < 0 )
-            {
-            return EvalClamp( u, pos, orient );
-            }
-         else
-            {
-            return EvalLoop( u, pos, orient );
-            }
-			break;
-		}
-	}
-
-void BSpline::DrawControlSegments
-	(
-	void
-	)
-
-	{
-	int i;
-
-	G_BeginLine();
-	for( i = 0; i < num_control_points; i++ )
-		{
-		G_Vertex( *control_points[ i ].GetPosition() );
-		}
-	G_EndLine();
-	}
-
-void BSpline::DrawCurve
-	(
-	int num_subdivisions
-	)
-
-	{
-	float u;
-	float du;
-
-   if ( !num_control_points )
-      {
-      return;
-      }
-
-	du = 1.0f / ( float )num_subdivisions; 
-
-	G_BeginLine();
-	for( u = -2.0f; u <= ( float )num_control_points; u += du )
-		{
-		G_Vertex( ( Vector )Eval( u ) );
-		}
-	G_EndLine();
-	}
-
-void BSpline::DrawCurve
-	(
-	Vector offset,
-	int num_subdivisions
-	)
-
-	{
-	float u;
-	float du;
-
-	du = 1.0f / ( float )num_subdivisions; 
-
-	G_BeginLine();
-	for( u = -2.0f; u <= ( float )num_control_points; u += du )
-		{
-		G_Vertex( offset + ( Vector )Eval( u ) );
-		}
-	G_EndLine();
-	}
-
-void BSpline::AppendControlPoint
-	(
-	const Vector& new_control_point
-	)
-
-	{
-	BSplineControlPoint *old_control_points;
-	int i;
-
-	old_control_points = control_points;
-	num_control_points++;
-
-	control_points = new BSplineControlPoint[num_control_points];
-	assert( control_points );
-
-	if ( old_control_points )
-		{
-		for( i = 0; i < num_control_points - 1; i++ )
-			{
-			control_points[ i ] = old_control_points[ i ];
-			}
-		delete [] old_control_points;
-		}
-
-	control_points[ num_control_points - 1 ].Set( new_control_point );
-	}
-
-void BSpline::AppendControlPoint
-	(
-	const Vector& new_control_point,
-   const float& speed
-	)
-
-	{
-	BSplineControlPoint *old_control_points;
-	int i;
-
-	old_control_points = control_points;
-	num_control_points++;
-
-	control_points = new BSplineControlPoint[num_control_points];
-	assert( control_points );
-
-	if ( old_control_points )
-		{
-		for( i = 0; i < num_control_points - 1; i++ )
-			{
-			control_points[ i ] = old_control_points[ i ];
-			}
-		delete [] old_control_points;
-		}
-
-	control_points[ num_control_points - 1 ].Set( new_control_point, speed );
-	}
-
-void BSpline::AppendControlPoint
-	(
-	const Vector& new_control_point,
-   const Vector& new_control_orient,
-   const float& new_control_speed
-	)
-
-	{
-	BSplineControlPoint *old_control_points;
-	int i;
-
-   has_orientation = true;
-
-	old_control_points = control_points;
-	num_control_points++;
-
-	control_points = new BSplineControlPoint[num_control_points];
-	assert( control_points );
-
-	if ( old_control_points )
-		{
-		for( i = 0; i < num_control_points - 1; i++ )
-			{
-			control_points[ i ] = old_control_points[ i ];
-			}
-		delete [] old_control_points;
-		}
-
-	control_points[ num_control_points - 1 ].Set( new_control_point, new_control_orient, new_control_speed );
-	}
-
-void BSpline::SetLoopPoint
-	(
-   const Vector& pos
-   )
-   {
-   int i;
-
-	for( i = 0; i < num_control_points; i++ )
-		{
-		if ( pos == *control_points[ i ].GetPosition() )
-         {
-         loop_control_point = i;
-         break;
-         }
-      }
-   }
-
-int BSpline::PickControlPoint
-	(
-	const Vector& window_point, 
-	float pick_size
-	)
-
-	{
-	int	i;
-	float closest_dist_2;
-	int	closest_index;
-	float dist_2;
-	Vector delta;
-
-	closest_index = -1;
-	closest_dist_2 = 1000000.0f;
-	for( i = 0; i < num_control_points; i++ )
-		{
-		delta = window_point - *control_points[ i ].GetPosition();
-      dist_2 = delta * delta;
-      if ( dist_2 < closest_dist_2 )
-			{
-			closest_dist_2 = dist_2;
-			closest_index = i;
-			}
-		}
-
-	if ( pick_size * pick_size >= closest_dist_2 )
-		{
-		return closest_index;
-		}
-	else
-		{
-		return -1;
-		}
-	}
+void BSpline::Set(Vector *control_points_, int num_control_points_, splinetype_t type)
+{
+    int i;
+
+    SetType(type);
+
+    has_orientation = false;
+
+    if (control_points) {
+        delete[] control_points;
+        control_points = NULL;
+    }
+
+    num_control_points = num_control_points_;
+    if (num_control_points) {
+        control_points = new BSplineControlPoint[num_control_points];
+        assert(control_points);
+
+        for (i = 0; i < num_control_points; i++) {
+            control_points[i].Set(control_points_[i]);
+        }
+    }
+}
+
+void BSpline::Set(
+    Vector      *control_points_,
+    Vector      *control_orients_,
+    float       *control_speeds_,
+    int          num_control_points_,
+    splinetype_t type
+)
+{
+    int i;
+
+    SetType(type);
+
+    has_orientation = true;
+
+    if (control_points) {
+        delete[] control_points;
+        control_points = NULL;
+    }
+
+    num_control_points = num_control_points_;
+    if (num_control_points) {
+        control_points = new BSplineControlPoint[num_control_points];
+        assert(control_points);
+
+        for (i = 0; i < num_control_points; i++) {
+            control_points[i].Set(control_points_[i], control_orients_[i], control_speeds_[i]);
+        }
+    }
+}
+
+void BSpline::Clear(void)
+{
+    if (control_points) {
+        delete[] control_points;
+        control_points = NULL;
+    }
+    num_control_points = 0;
+    has_orientation    = false;
+}
+
+inline float BSpline::EvalNormal(float u, Vector& pos, Vector& orient)
+{
+    int    segment_id;
+    float  B[4];
+    float  tmp;
+    float  u_2;
+    float  u_3;
+    Vector ang;
+    float  roll;
+    float  speed;
+
+    segment_id = (int)u;
+    if (segment_id < 0) {
+        segment_id = 0;
+    }
+    if (segment_id > num_control_points - 4) {
+        segment_id = num_control_points - 4;
+    }
+    u -= (float)segment_id;
+
+    u_2 = u * u;
+    u_3 = u * u_2;
+
+    tmp  = 1 - u;
+    B[0] = (tmp * tmp * tmp) * (1.0f / 6.0f);
+    B[1] = (3.0f * u_3 - 6.0f * u_2 + 4.0f) * (1.0f / 6.0f);
+    B[2] = (-3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1) * (1.0f / 6.0f);
+    B[3] = u_3 * (1.0f / 6.0f);
+
+    pos = *control_points[0 + segment_id].GetPosition() * B[0] + *control_points[1 + segment_id].GetPosition() * B[1]
+        + *control_points[2 + segment_id].GetPosition() * B[2] + *control_points[3 + segment_id].GetPosition() * B[3];
+
+    ang = *control_points[0 + segment_id].GetOrientation() * B[0]
+        + *control_points[1 + segment_id].GetOrientation() * B[1]
+        + *control_points[2 + segment_id].GetOrientation() * B[2]
+        + *control_points[3 + segment_id].GetOrientation() * B[3];
+
+    roll = *control_points[0 + segment_id].GetRoll() * B[0] + *control_points[1 + segment_id].GetRoll() * B[1]
+         + *control_points[2 + segment_id].GetRoll() * B[2] + *control_points[3 + segment_id].GetRoll() * B[3];
+
+    speed = *control_points[0 + segment_id].GetSpeed() * B[0] + *control_points[1 + segment_id].GetSpeed() * B[1]
+          + *control_points[2 + segment_id].GetSpeed() * B[2] + *control_points[3 + segment_id].GetSpeed() * B[3];
+
+    orient       = ang.toAngles();
+    orient[ROLL] = roll;
+
+    return speed;
+}
+
+inline float BSpline::EvalLoop(float t, Vector& pos, Vector& orient)
+{
+    Vector retval;
+    Vector ang;
+    float  speed;
+    float  roll;
+    int    segment_id;
+    int    next_id;
+    float  B[4];
+    float  tmp;
+    float  u;
+    float  u_2;
+    float  u_3;
+    int    i;
+    int    j;
+
+    segment_id = (int)floor(t);
+    u          = t - floor(t);
+
+    segment_id %= num_control_points;
+    if (segment_id < 0) {
+        segment_id += num_control_points;
+    }
+
+    u_2 = u * u;
+    u_3 = u * u_2;
+
+    tmp  = 1 - u;
+    B[0] = (tmp * tmp * tmp) * (1.0f / 6.0f);
+    B[1] = (3.0f * u_3 - 6.0f * u_2 + 4.0f) * (1.0f / 6.0f);
+    B[2] = (-3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1) * (1.0f / 6.0f);
+    B[3] = u_3 * (1.0f / 6.0f);
+
+    speed = 0;
+    roll  = 0;
+
+    for (i = 0, j = segment_id; i < 4; i++, j++) {
+        if (j >= num_control_points) {
+            j -= (num_control_points - loop_control_point);
+        }
+
+        retval += *control_points[j].GetPosition() * B[i];
+        ang += *control_points[j].GetOrientation() * B[i];
+        speed += *control_points[j].GetSpeed() * B[i];
+        roll += *control_points[j].GetRoll() * B[i];
+    }
+
+    pos = retval;
+
+    next_id = segment_id + 1;
+    if (next_id >= num_control_points) {
+        next_id -= (num_control_points - loop_control_point);
+    }
+    orient       = ang.toAngles();
+    orient[ROLL] = roll;
+
+    return speed;
+}
+
+inline float BSpline::EvalClamp(float t, Vector& pos, Vector& orient)
+{
+    Vector retval;
+    Vector ang;
+    int    segment_id;
+    int    next_id;
+    float  B[4];
+    float  tmp;
+    float  u;
+    float  u_2;
+    float  u_3;
+    int    i;
+    int    j;
+    float  speed;
+    float  roll;
+
+    segment_id = (int)floor(t);
+    u          = t - floor(t);
+
+    u_2 = u * u;
+    u_3 = u * u_2;
+
+    tmp  = 1 - u;
+    B[0] = (tmp * tmp * tmp) * (1.0f / 6.0f);
+    B[1] = (3.0f * u_3 - 6.0f * u_2 + 4.0f) * (1.0f / 6.0f);
+    B[2] = (-3.0f * u_3 + 3.0f * u_2 + 3.0f * u + 1) * (1.0f / 6.0f);
+    B[3] = u_3 * (1.0f / 6.0f);
+
+    speed = 0;
+    roll  = 0;
+    for (i = 0; i < 4; i++, segment_id++) {
+        j = segment_id;
+        if (j < 0) {
+            j = 0;
+        } else if (j >= num_control_points) {
+            j = num_control_points - 1;
+        }
+
+        retval += *control_points[j].GetPosition() * B[i];
+        ang += *control_points[j].GetOrientation() * B[i];
+        speed += *control_points[j].GetSpeed() * B[i];
+        roll += *control_points[j].GetRoll() * B[i];
+    }
+
+    pos = retval;
+
+    next_id = segment_id + 1;
+    if (segment_id < 0) {
+        segment_id = 0;
+    }
+    if (segment_id >= num_control_points) {
+        segment_id = num_control_points - 1;
+    }
+    if (next_id < 0) {
+        next_id = 0;
+    }
+    if (next_id >= num_control_points) {
+        next_id = num_control_points - 1;
+    }
+    orient       = ang.toAngles();
+    orient[ROLL] = roll;
+
+    return speed;
+}
+
+Vector BSpline::Eval(float u)
+{
+    Vector pos;
+    Vector orient;
+
+    switch (curvetype) {
+    default:
+    case SPLINE_NORMAL:
+        EvalNormal(u, pos, orient);
+        break;
+
+    case SPLINE_CLAMP:
+        EvalClamp(u, pos, orient);
+        break;
+
+    case SPLINE_LOOP:
+        if (u < 0) {
+            EvalClamp(u, pos, orient);
+        } else {
+            EvalLoop(u, pos, orient);
+        }
+        break;
+    }
+    return pos;
+}
+
+float BSpline::Eval(float u, Vector& pos, Vector& orient)
+{
+    switch (curvetype) {
+    default:
+    case SPLINE_NORMAL:
+        return EvalNormal(u, pos, orient);
+        break;
+
+    case SPLINE_CLAMP:
+        return EvalClamp(u, pos, orient);
+        break;
+
+    case SPLINE_LOOP:
+        if (u < 0) {
+            return EvalClamp(u, pos, orient);
+        } else {
+            return EvalLoop(u, pos, orient);
+        }
+        break;
+    }
+}
+
+void BSpline::DrawControlSegments(void)
+{
+    int i;
+
+    G_BeginLine();
+    for (i = 0; i < num_control_points; i++) {
+        G_Vertex(*control_points[i].GetPosition());
+    }
+    G_EndLine();
+}
+
+void BSpline::DrawCurve(int num_subdivisions)
+{
+    float u;
+    float du;
+
+    if (!num_control_points) {
+        return;
+    }
+
+    du = 1.0f / (float)num_subdivisions;
+
+    G_BeginLine();
+    for (u = -2.0f; u <= (float)num_control_points; u += du) {
+        G_Vertex((Vector)Eval(u));
+    }
+    G_EndLine();
+}
+
+void BSpline::DrawCurve(Vector offset, int num_subdivisions)
+{
+    float u;
+    float du;
+
+    du = 1.0f / (float)num_subdivisions;
+
+    G_BeginLine();
+    for (u = -2.0f; u <= (float)num_control_points; u += du) {
+        G_Vertex(offset + (Vector)Eval(u));
+    }
+    G_EndLine();
+}
+
+void BSpline::AppendControlPoint(const Vector& new_control_point)
+{
+    BSplineControlPoint *old_control_points;
+    int                  i;
+
+    old_control_points = control_points;
+    num_control_points++;
+
+    control_points = new BSplineControlPoint[num_control_points];
+    assert(control_points);
+
+    if (old_control_points) {
+        for (i = 0; i < num_control_points - 1; i++) {
+            control_points[i] = old_control_points[i];
+        }
+        delete[] old_control_points;
+    }
+
+    control_points[num_control_points - 1].Set(new_control_point);
+}
+
+void BSpline::AppendControlPoint(const Vector& new_control_point, const float& speed)
+{
+    BSplineControlPoint *old_control_points;
+    int                  i;
+
+    old_control_points = control_points;
+    num_control_points++;
+
+    control_points = new BSplineControlPoint[num_control_points];
+    assert(control_points);
+
+    if (old_control_points) {
+        for (i = 0; i < num_control_points - 1; i++) {
+            control_points[i] = old_control_points[i];
+        }
+        delete[] old_control_points;
+    }
+
+    control_points[num_control_points - 1].Set(new_control_point, speed);
+}
+
+void BSpline::AppendControlPoint(
+    const Vector& new_control_point, const Vector& new_control_orient, const float& new_control_speed
+)
+{
+    BSplineControlPoint *old_control_points;
+    int                  i;
+
+    has_orientation = true;
+
+    old_control_points = control_points;
+    num_control_points++;
+
+    control_points = new BSplineControlPoint[num_control_points];
+    assert(control_points);
+
+    if (old_control_points) {
+        for (i = 0; i < num_control_points - 1; i++) {
+            control_points[i] = old_control_points[i];
+        }
+        delete[] old_control_points;
+    }
+
+    control_points[num_control_points - 1].Set(new_control_point, new_control_orient, new_control_speed);
+}
+
+void BSpline::SetLoopPoint(const Vector& pos)
+{
+    int i;
+
+    for (i = 0; i < num_control_points; i++) {
+        if (pos == *control_points[i].GetPosition()) {
+            loop_control_point = i;
+            break;
+        }
+    }
+}
+
+int BSpline::PickControlPoint(const Vector& window_point, float pick_size)
+{
+    int    i;
+    float  closest_dist_2;
+    int    closest_index;
+    float  dist_2;
+    Vector delta;
+
+    closest_index  = -1;
+    closest_dist_2 = 1000000.0f;
+    for (i = 0; i < num_control_points; i++) {
+        delta  = window_point - *control_points[i].GetPosition();
+        dist_2 = delta * delta;
+        if (dist_2 < closest_dist_2) {
+            closest_dist_2 = dist_2;
+            closest_index  = i;
+        }
+    }
+
+    if (pick_size * pick_size >= closest_dist_2) {
+        return closest_index;
+    } else {
+        return -1;
+    }
+}
 
 Event EV_SplinePath_Create
-	( 
-	"SplinePath_create",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Creates the spline path from the target list.",
-   EV_NORMAL
-	);
+(
+    "SplinePath_create",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Creates the spline path from the target list.",
+    EV_NORMAL
+);
 Event EV_SplinePath_Loop
-	( 
-	"loop", 
-	EV_CONSOLE,
-	"s",
-   "loop_name",
-   "Sets the loop name.",
-   EV_NORMAL
-	);
+(
+    "loop",
+    EV_CONSOLE,
+    "s",
+    "loop_name",
+    "Sets the loop name.",
+    EV_NORMAL
+);
 Event EV_SplinePath_Speed
-	( 
-	"speed",
-	EV_DEFAULT,
-   "f",
-   "speed",
-   "Sets the path speed.",
-   EV_NORMAL
-	);
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the path speed.",
+    EV_NORMAL
+);
 Event EV_SplinePath_SetTriggerTarget
-	( 
-	"triggertarget",
-	EV_DEFAULT,
-   "s",
-   "target",
-   "Sets the trigger target.",
-   EV_NORMAL
-	);
+(
+    "triggertarget",
+    EV_DEFAULT,
+    "s",
+    "target",
+    "Sets the trigger target.",
+    EV_NORMAL
+);
 Event EV_SplinePath_SetWatch
-	( 
-	"watch",
-	EV_CONSOLE,
-   "s",
-   "watchEntity",
-   "Sets the entity to watch at this node.",
-   EV_NORMAL
-	);
+(
+    "watch",
+    EV_CONSOLE,
+    "s",
+    "watchEntity",
+    "Sets the entity to watch at this node.",
+    EV_NORMAL
+);
 
 Event EV_SplinePath_SetFov
-	( 
-	"fov",
-	EV_CONSOLE,
-   "f",
-   "cameraFOV",
-   "Sets the fov at this node.",
-   EV_NORMAL
-	);
+(
+    "fov",
+    EV_CONSOLE,
+    "f",
+    "cameraFOV",
+    "Sets the fov at this node.",
+    EV_NORMAL
+);
 
 Event EV_SplinePath_SetFadeTime
-	( 
-	"fadetime",
-	EV_DEFAULT,
-   "f",
-   "fadeTime",
-   "Sets the fadetime at this node.",
-   EV_NORMAL
-	);
+(
+    "fadetime",
+    EV_DEFAULT,
+    "f",
+    "fadeTime",
+    "Sets the fadetime at this node.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Entity, SplinePath, "info_splinepath" )
-	{
-      { &EV_SplinePath_Create,				&SplinePath::CreatePath },
-      { &EV_SplinePath_Loop,				&SplinePath::SetLoop },
-      { &EV_SplinePath_Speed,				&SplinePath::SetSpeed },
-      { &EV_SplinePath_SetTriggerTarget,	&SplinePath::SetTriggerTarget },
-      { &EV_SplinePath_SetWatch,			&SplinePath::SetWatch },
-      { &EV_SplinePath_SetFov,				&SplinePath::SetFov },
-      { &EV_SplinePath_SetFadeTime,			&SplinePath::SetFadeTime },
-      { NULL, NULL }
-   };
+CLASS_DECLARATION(Entity, SplinePath, "info_splinepath") {
+    {&EV_SplinePath_Create,           &SplinePath::CreatePath      },
+    {&EV_SplinePath_Loop,             &SplinePath::SetLoop         },
+    {&EV_SplinePath_Speed,            &SplinePath::SetSpeed        },
+    {&EV_SplinePath_SetTriggerTarget, &SplinePath::SetTriggerTarget},
+    {&EV_SplinePath_SetWatch,         &SplinePath::SetWatch        },
+    {&EV_SplinePath_SetFov,           &SplinePath::SetFov          },
+    {&EV_SplinePath_SetFadeTime,      &SplinePath::SetFadeTime     },
+    {NULL,                            NULL                         }
+};
 
 SplinePath::SplinePath()
 {
-	entflags |= EF_SPLINEPATH;
+    entflags |= ECF_SPLINEPATH;
 
-	AddWaitTill(STRING_REACH);
+    AddWaitTill(STRING_REACH);
 
+    owner    = this;
+    next     = NULL;
+    loop     = NULL;
+    speed    = 1;
+    doWatch  = false;
+    watchEnt = "";
+    fov      = 0;
+    fadeTime = -1;
 
-	owner = this;
-	next = NULL;
-	loop = NULL;
-	speed = 1;
-	doWatch = false;
-	watchEnt = "";
-	fov = 0;
-	fadeTime = -1;
+    setMoveType(MOVETYPE_NONE);
+    setSolidType(SOLID_NOT);
+    hideModel();
 
-	setMoveType( MOVETYPE_NONE );
-	setSolidType( SOLID_NOT );
-	hideModel();
-
-	if( !LoadingSavegame )
-	{
-		PostEvent( EV_SplinePath_Create, FRAMETIME );
-	}
+    if (!LoadingSavegame) {
+        PostEvent(EV_SplinePath_Create, FRAMETIME);
+    }
 }
 
 SplinePath::~SplinePath()
-   {
-   // disconnect from the chain
-   if ( owner != this )
-      {
-      owner->SetNext( next );
-      }
-   else if ( next )
-      {
-      next->SetPrev( NULL );
-      next = NULL;
-      }
+{
+    // disconnect from the chain
+    if (owner != this) {
+        owner->SetNext(next);
+    } else if (next) {
+        next->SetPrev(NULL);
+        next = NULL;
+    }
 
-   assert( owner == this );
-   assert( next == NULL );
-   }
+    assert(owner == this);
+    assert(next == NULL);
 
-void SplinePath::SetLoop 
-   (
-   Event *ev
-   )
+    entflags &= ~ECF_SPLINEPATH;
+}
 
-   {
-   loop_name = ev->GetString( 1 );
-   }
+void SplinePath::SetLoop(Event *ev)
+{
+    loop_name = ev->GetString(1);
+}
 
-void SplinePath::SetSpeed
-   (
-   Event *ev
-   )
+void SplinePath::SetSpeed(Event *ev)
+{
+    speed = ev->GetFloat(1);
+}
 
-   {
-   speed = ev->GetFloat( 1 );
-   }
+void SplinePath::SetTriggerTarget(Event *ev)
+{
+    SetTriggerTarget(ev->GetString(1));
+}
 
-void SplinePath::SetTriggerTarget
-   (
-   Event *ev
-   )
+void SplinePath::CreatePath(Event *ev)
+{
+    const char *target;
+    Entity     *ent;
 
-   {
-   SetTriggerTarget( ev->GetString( 1 ) );
-   }
+    // Make the path from the targetlist.
+    target = Target();
+    if (target[0]) {
+        ent = (Entity *)G_FindTarget(NULL, target);
+        if (ent && ent->IsSubclassOfSplinePath()) {
+            next = (SplinePath *)ent;
 
-void SplinePath::CreatePath
-	(
-	Event *ev
-	)
+            if (next->owner != next) {
+                // Fixed in OPM
+                //  If the target already has an owner, make sure to properly remove the owner
+                next->owner->SetNext(NULL);
+            }
 
-   {
-   const char  *target;
-   Entity      *ent;
+            next->owner = this;
+        } else if (ent) {
+            ScriptError("SplinePath::CreatePath: target '%s' for '%s' not found (cannot connect to class '%s')\n", target, targetname.c_str(), ent->getClassname());
+        } else {
+            ScriptError("SplinePath::CreatePath: target %s not found\n", target);
+        }
+    }
+    if (loop_name.length()) {
+        ent = (Entity *)G_FindTarget(NULL, loop_name.c_str());
+        if (ent) {
+            loop = (SplinePath *)ent;
+        }
+    }
+}
 
-   // Make the path from the targetlist.
-   target = Target();
-   if ( target[ 0 ] )
-      {
-      ent = ( Entity * )G_FindTarget( NULL, target );
-      if ( ent )
-         {
-         next = ( SplinePath * )ent;
-			next->owner = this;
-         }
-      else
-         {
-         ScriptError( "SplinePath::CreatePath: target %s not found\n", target );
-         }
-      }
-   if ( loop_name.length() )
-      {
-      ent = ( Entity * )G_FindTarget( NULL, loop_name.c_str() );
-      if ( ent )
-         {
-         loop = ( SplinePath * )ent;
-         }
-      }
-   } 
+SplinePath *SplinePath::GetNext(void)
+{
+    return next;
+}
 
-SplinePath *SplinePath::GetNext
-	(
-	void
-	)
-	
-	{
-	return next;
-	}
+SplinePath *SplinePath::GetPrev(void)
+{
+    if (owner == this) {
+        return NULL;
+    }
 
-SplinePath *SplinePath::GetPrev
-	(
-	void
-	)
-	
-	{
-   if ( owner == this )
-      {
-      return NULL;
-      }
+    return owner;
+}
 
-	return owner;
-	}
+void SplinePath::SetNext(SplinePath *node)
+{
+    if (next) {
+        // remove ourselves from the chain
+        next->owner = next;
+    }
 
-void SplinePath::SetNext
-	(
-	SplinePath *node
-	)
-	
-	{
-   if ( next )
-      {
-      // remove ourselves from the chain
-      next->owner = next;
-      }
+    next = node;
+    if (next) {
+        // disconnect next from it's previous node
+        if (next->owner != next) {
+            next->owner->next = NULL;
+        }
+        next->owner = this;
+    }
+}
 
-	next = node;
-   if ( next )
-      {
-      // disconnect next from it's previous node
-      if ( next->owner != next )
-         {
-         next->owner->next = NULL;
-         }
-      next->owner = this;
-      }
-	}
+void SplinePath::SetPrev(SplinePath *node)
+{
+    if (owner != this) {
+        owner->next = NULL;
+    }
 
-void SplinePath::SetPrev
-	(
-	SplinePath *node
-	)
-	
-	{
-   if ( owner != this )
-      {
-      owner->next = NULL;
-      }
+    if (node && (node != this)) {
+        // safely remove the node from its chain
+        if (node->next) {
+            node->next->owner = node->next;
+        }
+        node->next = this;
+        owner      = node;
+    } else {
+        owner = this;
+    }
+}
 
-   if ( node && ( node != this ) )
-      {
-      // safely remove the node from its chain
-      if ( node->next )
-         {
-         node->next->owner = node->next;
-         }
-      node->next = this;
-      owner = node;
-      }
-   else
-      {
-      owner = this;
-      }
-	}
+SplinePath *SplinePath::GetLoop(void)
+{
+    return loop;
+}
 
-SplinePath *SplinePath::GetLoop
-	(
-	void
-	)
-	
-	{
-	return loop;
-	}
+void SplinePath::SetWatch(const char *name)
+{
+    if (watchEnt != name) {
+        watchEnt = name;
+        if (watchEnt.length()) {
+            doWatch = true;
+        } else {
+            doWatch = false;
+        }
+    }
+}
 
-void SplinePath::SetWatch
-   (
-   const char *name
-   )
+void SplinePath::SetWatch(Event *ev)
+{
+    SetWatch(ev->GetString(1));
+}
 
-   {
-   if ( watchEnt != name )
-      {
-      watchEnt = name;
-      if ( watchEnt.length() )
-         {
-         doWatch = true;
-         }
-      else
-         {
-         doWatch = false;
-         }
-      }
-   }
+void SplinePath::NoWatch(void)
+{
+    doWatch  = true;
+    watchEnt = "none";
+}
 
-void SplinePath::SetWatch
-   (
-   Event *ev
-   )
+str SplinePath::GetWatch(void)
+{
+    return watchEnt;
+}
 
-   {
-   SetWatch( ev->GetString( 1 ) );
-   }
+void SplinePath::SetFov(float newFov)
+{
+    fov = newFov;
+}
 
+void SplinePath::SetFov(Event *ev)
+{
+    fov = ev->GetFloat(1);
+}
 
-void SplinePath::NoWatch
-   (
-   void
-   )
+float SplinePath::GetFov(void)
+{
+    return fov;
+}
 
-   {
-   doWatch = true;
-   watchEnt = "none";
-   }
+void SplinePath::SetFadeTime(float newFadeTime)
+{
+    fadeTime = newFadeTime;
+}
 
-str SplinePath::GetWatch
-   ( 
-   void
-   )
+void SplinePath::SetFadeTime(Event *ev)
+{
+    fadeTime = ev->GetFloat(1);
+}
 
-   {
-   return watchEnt;
-   }
-
-void SplinePath::SetFov
-   (
-   float newFov
-   )
-
-   {
-   fov = newFov;
-   }
-
-void SplinePath::SetFov
-   (
-   Event *ev
-   )
-
-   {
-   fov = ev->GetFloat( 1 );
-   }
-
-float SplinePath::GetFov
-   (
-   void
-   )
-
-   {
-   return fov;
-   }
-
-void SplinePath::SetFadeTime
-   (
-   float newFadeTime
-   )
-
-   {
-   fadeTime = newFadeTime;
-   }
-
-void SplinePath::SetFadeTime
-   (
-   Event *ev
-   )
-
-   {
-   fadeTime = ev->GetFloat( 1 );
-   }
-
-float SplinePath::GetFadeTime
-   (
-   void
-   )
-
-   {
-   return fadeTime;
-   }
+float SplinePath::GetFadeTime(void)
+{
+    return fadeTime;
+}
diff --git a/code/fgame/bspline.h b/code/fgame/bspline.h
index e0cf70eb..50a69d82 100644
--- a/code/fgame/bspline.h
+++ b/code/fgame/bspline.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // bspline.h: Uniform non-rational bspline class.
 // 
 
-#ifndef __BSPLINE_H__
-#define __BSPLINE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -580,5 +579,3 @@ inline void SplinePath::SetTriggerTarget
    {
    triggertarget = name;
    }
-
-#endif /* __BSPLINE_H__ */
diff --git a/code/fgame/camera.cpp b/code/fgame/camera.cpp
index a0397a41..83ac8b20 100644
--- a/code/fgame/camera.cpp
+++ b/code/fgame/camera.cpp
@@ -38,617 +38,585 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 CameraManager CameraMan;
 
-void CameraMoveState::Initialize( Camera * camera )
-	{
-   assert( camera );
-   pos = camera->origin;
-   angles = camera->angles;
-   movedir = vec_zero;
-	followEnt = NULL;
-	orbitEnt = NULL;
-
-   followingpath = false;
-   cameraTime = 0;
-   lastTime = 0;
-   newTime = 0;
-   cameraPath.Clear();
-   splinePath = NULL;
-   currentNode = NULL;
-   loopNode = NULL;
-   }
-
-void CameraWatchState::Initialize( Camera * camera )
-	{
-   assert( camera );
-   watchAngles = camera->angles;
-	watchEnt = NULL;
-   watchNodes = true;
-   watchPath = false;
-   }
-
-void CameraState::Initialize( Camera * camera )
-	{
-   assert( camera );
-   move.Initialize( camera );
-   watch.Initialize( camera );
-   fov = camera->Fov();
-   }
-
-void CameraMoveState::DoNodeEvents
-	(
-	Camera * camera
-	)
+void CameraMoveState::Initialize(Camera *camera)
 {
-	SplinePath  *node;
-	Entity      *ent;
-	Event       *event;
+    assert(camera);
+    pos       = camera->origin;
+    angles    = camera->angles;
+    movedir   = vec_zero;
+    followEnt = NULL;
+    orbitEnt  = NULL;
 
-	assert( camera );
-
-	node = currentNode;
-	if( node )
-	{
-		float fadeTime;
-		float newFov;
-
-		fadeTime = node->GetFadeTime();
-		if( fadeTime == -1 )
-		{
-			fadeTime = camera->fadeTime;
-		}
-
-		if( node->doWatch )
-		{
-			camera->Watch( node->GetWatch(), fadeTime );
-		}
-
-		newFov = node->GetFov();
-		if( newFov )
-		{
-			camera->SetFOV( newFov, fadeTime );
-		}
-
-		camera->Unregister( STRING_REACH );
-
-		if( node->triggertarget != "" )
-		{
-			ent = NULL;
-			do
-			{
-				ent = G_FindTarget( ent, node->triggertarget.c_str() );
-				if( !ent )
-				{
-					break;
-				}
-				event = new Event( EV_Activate );
-				event->AddEntity( camera );
-				ent->PostEvent( event, 0 );
-			} while( 1 );
-		}
-	}
+    followingpath = false;
+    cameraTime    = 0;
+    lastTime      = 0;
+    newTime       = 0;
+    cameraPath.Clear();
+    splinePath  = NULL;
+    currentNode = NULL;
+    loopNode    = NULL;
 }
 
-void CameraMoveState::Evaluate
-	(
-   Camera * camera
-	)
-   {
-   Vector oldpos;
-   float speed_multiplier;
+void CameraWatchState::Initialize(Camera *camera)
+{
+    assert(camera);
+    watchAngles = camera->angles;
+    watchEnt    = NULL;
+    watchNodes  = true;
+    watchPath   = false;
+}
 
-   assert( camera );
+void CameraState::Initialize(Camera *camera)
+{
+    assert(camera);
+    move.Initialize(camera);
+    watch.Initialize(camera);
+    fov = camera->Fov();
+}
 
-   oldpos = pos;
-   // 
-   // check for node events
-   // we explicitly skip the first node because we process that
-   // when we begin the follow path command
-   //
-   if ( ( lastTime != newTime ) && currentNode )
-      {
-      if ( newTime > 1 )
-         {
-         DoNodeEvents( camera );
-         }
-      currentNode = currentNode->GetNext();
-      if ( !currentNode )
-         {
-         currentNode = loopNode;
-         }
-      }
-   lastTime = newTime;
+void CameraMoveState::DoNodeEvents(Camera *camera)
+{
+    SplinePath *node;
+    Entity     *ent;
+    Event      *event;
 
-   //
-   // evaluate position
-   //
-   if ( followingpath )
-      {
-   	speed_multiplier = cameraPath.Eval( cameraTime, pos, angles );
+    assert(camera);
 
-	   cameraTime += level.frametime * camera->camera_speed * speed_multiplier;
+    node = currentNode;
+    if (node) {
+        float fadeTime;
+        float newFov;
 
-   	if ( orbitEnt )
-	   	{
-         pos += orbitEnt->origin;
-         if ( camera->orbit_dotrace )
-            {
-            trace_t trace;
-            Vector start, back;
+        fadeTime = node->GetFadeTime();
+        if (fadeTime == -1) {
+            fadeTime = camera->fadeTime;
+        }
 
-            start = orbitEnt->origin;
-	         start[ 2 ] += orbitEnt->maxs[ 2 ];
+        if (node->doWatch) {
+            camera->Watch(node->GetWatch(), fadeTime);
+        }
 
-            back = start - pos;
-            back.normalize();
+        newFov = node->GetFov();
+        if (newFov) {
+            camera->SetFOV(newFov, fadeTime);
+        }
 
-	         trace = G_Trace( start, vec_zero, vec_zero, pos, orbitEnt, camera->follow_mask, false, "Camera::EvaluatePosition" );
+        camera->Unregister(STRING_REACH);
 
-            if ( trace.fraction < 1.0f )
-               {
-               pos = trace.endpos;
-               // step in a bit towards the followEng
-               pos += back * 16;
-               }
+        if (node->triggertarget != "") {
+            ent = NULL;
+            do {
+                ent = G_FindTarget(ent, node->triggertarget.c_str());
+                if (!ent) {
+                    break;
+                }
+                event = new Event(EV_Activate);
+                event->AddEntity(camera);
+                ent->PostEvent(event, 0);
+            } while (1);
+        }
+    }
+}
+
+void CameraMoveState::Evaluate(Camera *camera)
+{
+    Vector oldpos;
+    float  speed_multiplier;
+
+    assert(camera);
+
+    oldpos = pos;
+    //
+    // check for node events
+    // we explicitly skip the first node because we process that
+    // when we begin the follow path command
+    //
+    if ((lastTime != newTime) && currentNode) {
+        if (newTime > 1) {
+            DoNodeEvents(camera);
+        }
+        currentNode = currentNode->GetNext();
+        if (!currentNode) {
+            currentNode = loopNode;
+        }
+    }
+    lastTime = newTime;
+
+    //
+    // evaluate position
+    //
+    if (followingpath) {
+        speed_multiplier = cameraPath.Eval(cameraTime, pos, angles);
+
+        cameraTime += level.frametime * camera->camera_speed * speed_multiplier;
+
+        if (orbitEnt) {
+            pos += orbitEnt->origin;
+            if (camera->orbit_dotrace) {
+                trace_t trace;
+                Vector  start, back;
+
+                start = orbitEnt->origin;
+                start[2] += orbitEnt->maxs[2];
+
+                back = start - pos;
+                back.normalize();
+
+                trace = G_Trace(
+                    start, vec_zero, vec_zero, pos, orbitEnt, camera->follow_mask, false, "Camera::EvaluatePosition"
+                );
+
+                if (trace.fraction < 1.0f) {
+                    pos = trace.endpos;
+                    // step in a bit towards the followEng
+                    pos += back * 16;
+                }
             }
-		   }
-      }
-   else
-      {
-	   if ( followEnt )
-         {
-         trace_t trace;
-         Vector start, end, ang, back;
+        }
+    } else {
+        if (followEnt) {
+            trace_t trace;
+            Vector  start, end, ang, back;
 
-         start = followEnt->origin;
-	      start[ 2 ] += followEnt->maxs[ 2 ];
+            start = followEnt->origin;
+            start[2] += followEnt->maxs[2];
 
-	      if ( camera->follow_yaw_fixed )
-		      {
-		      ang = vec_zero;
-		      }
-	      else
-		      {
-		      if ( followEnt->isSubclassOf( Player ) )
-			      {
-               Entity * ent;
-               ent = followEnt;
-               ( ( Player * )ent )->GetPlayerView( NULL, &ang );
-			      }
-		      else
-			      {
-               ang = followEnt->angles;
-			      }
-		      }
-	      ang.y += camera->follow_yaw;
-	      ang.AngleVectors( &back, NULL, NULL );
+            if (camera->follow_yaw_fixed) {
+                ang = vec_zero;
+            } else {
+                if (followEnt->isSubclassOf(Player)) {
+                    Entity *ent;
+                    ent = followEnt;
+                    ((Player *)ent)->GetPlayerView(NULL, &ang);
+                } else {
+                    ang = followEnt->angles;
+                }
+            }
+            ang.y += camera->follow_yaw;
+            ang.AngleVectors(&back, NULL, NULL);
 
-	      end = start - back * camera->follow_dist;
-	      end[ 2 ] += 24;
+            end = start - back * camera->follow_dist;
+            end[2] += 24;
 
-	      trace = G_Trace( start, vec_zero, vec_zero, end, followEnt, camera->follow_mask, false, "Camera::EvaluatePosition - Orbit" );
+            trace = G_Trace(
+                start,
+                vec_zero,
+                vec_zero,
+                end,
+                followEnt,
+                camera->follow_mask,
+                false,
+                "Camera::EvaluatePosition - Orbit"
+            );
 
-         pos = trace.endpos;
-         // step in a bit towards the followEnt
-         pos += back * 16;
-         }
-      }
+            pos = trace.endpos;
+            // step in a bit towards the followEnt
+            pos += back * 16;
+        }
+    }
 
-   // 
-   // update times for node events
-   //
-   newTime = cameraTime + 2.0f;
+    //
+    // update times for node events
+    //
+    newTime = cameraTime + 2.0f;
 
-   if ( newTime < 0 )
-      {
-      newTime = 0;
-      }
-   //
-   // set movedir
-   //
-   movedir = pos - oldpos;
-   }
+    if (newTime < 0) {
+        newTime = 0;
+    }
+    //
+    // set movedir
+    //
+    movedir = pos - oldpos;
+}
 
-void CameraWatchState::Evaluate
-	(
-   Camera * camera,
-   CameraMoveState * move
-	)
-   {
-   assert( camera );
-   assert( move );
-   //
-   // evaluate orientation
-   //
-   if ( watchEnt )
-	   {
-      Vector watchPos;
+void CameraWatchState::Evaluate(Camera *camera, CameraMoveState *move)
+{
+    assert(camera);
+    assert(move);
+    //
+    // evaluate orientation
+    //
+    if (watchEnt) {
+        Vector watchPos;
 
+        watchPos.x = watchEnt->origin.x;
+        watchPos.y = watchEnt->origin.y;
+        watchPos.z = watchEnt->absmax.z;
+        watchPos -= camera->origin;
+        watchPos.normalize();
+        watchAngles = watchPos.toAngles();
+    } else if (watchNodes) {
+        watchAngles = move->angles;
+    } else if (watchPath) {
+        float  length;
+        Vector delta;
 
-      watchPos.x = watchEnt->origin.x;
-      watchPos.y = watchEnt->origin.y;
-	   watchPos.z = watchEnt->absmax.z;
-      watchPos -= camera->origin;
-		watchPos.normalize();
-		watchAngles = watchPos.toAngles();
-	   }
-   else if ( watchNodes )
-      {
-      watchAngles = move->angles;
-      }
-   else if ( watchPath )
-      {
-      float  length;
-      Vector delta;
-
-      delta = move->movedir;
-      length = delta.length();
-      if ( length > 0.05f )
-         {
-         delta *= 1.0f / length;
-		   watchAngles = delta.toAngles();
-         }
-      }
-   watchAngles[ 0 ] = AngleMod( watchAngles[ 0 ] );
-   watchAngles[ 1 ] = AngleMod( watchAngles[ 1 ] );
-   watchAngles[ 2 ] = AngleMod( watchAngles[ 2 ] );
-   }
-
-void CameraState::Evaluate
-	(
-   Camera * camera
-	)
-   {
-   move.Evaluate( camera );
-   watch.Evaluate( camera, &move );
-   }
+        delta  = move->movedir;
+        length = delta.length();
+        if (length > 0.05f) {
+            delta *= 1.0f / length;
+            watchAngles = delta.toAngles();
+        }
+    }
+    watchAngles[0] = AngleMod(watchAngles[0]);
+    watchAngles[1] = AngleMod(watchAngles[1]);
+    watchAngles[2] = AngleMod(watchAngles[2]);
+}
 
+void CameraState::Evaluate(Camera *camera)
+{
+    move.Evaluate(camera);
+    watch.Evaluate(camera, &move);
+}
 
 Event EV_Camera_CameraThink
-	( 
-	"camera_think",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Called each frame to allow the camera to adjust its position.",
-	EV_NORMAL
-	);
+(
+    "camera_think",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called each frame to allow the camera to adjust its position.",
+    EV_NORMAL
+);
 Event EV_Camera_StartMoving
-	( 
-	"start",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Start camera moving.",
-	EV_NORMAL
-	);
+(
+    "start",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Start camera moving.",
+    EV_NORMAL
+);
 Event EV_Camera_Pause
-	( 
-	"pause",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Pause the camera.",
-	EV_NORMAL
-	);
+(
+    "pause",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Pause the camera.",
+    EV_NORMAL
+);
 Event EV_Camera_Continue
-	( 
-	"continue",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Continue the camera movement.",
-	EV_NORMAL
-	);
+(
+    "continue",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Continue the camera movement.",
+    EV_NORMAL
+);
 Event EV_Camera_StopMoving
-	( "stop", 
-	EV_CONSOLE,
-	NULL,
-   NULL,
-   "Stop the camera movement.",
-	EV_NORMAL
-	);
+(
+    "stop",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Stop the camera movement.",
+    EV_NORMAL
+);
 Event EV_Camera_SetSpeed
-	( 
-	"speed",
-	EV_DEFAULT,
-   "f",
-   "speed",
-   "Sets the camera speed.",
-	EV_NORMAL
-	);
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the camera speed.",
+    EV_NORMAL
+);
 Event EV_Camera_SetFOV
-	( 
-	"fov",
-	EV_CONSOLE,
-   "fF",
-   "fov fadeTime",
-   "Sets the camera's field of view (fov).\n"
-   "if fadeTime is specified, camera will fade over that time\n"
-   "if fov is less than 3, than an auto_fov will be assumed\n"
-   "the value of fov will be the ratio used for keeping a watch\n"
-   "entity in the view at the right scale",
-	EV_NORMAL
-	);
+(
+    "fov",
+    EV_CONSOLE,
+    "fF",
+    "fov fadeTime",
+    "Sets the camera's field of view (fov).\n"
+    "if fadeTime is specified, camera will fade over that time\n"
+    "if fov is less than 3, than an auto_fov will be assumed\n"
+    "the value of fov will be the ratio used for keeping a watch\n"
+    "entity in the view at the right scale",
+    EV_NORMAL
+);
 
 //
 // FOLLOW EVENTS
 //
 Event EV_Camera_Follow
-	( 
-	"follow",
-	EV_DEFAULT,
-   "eE",
-   "targetEnt targetWatchEnt",
-   "Makes the camera follow an entity and optionally watch an entity.",
-	EV_NORMAL
-	);
+(
+    "follow",
+    EV_DEFAULT,
+    "eE",
+    "targetEnt targetWatchEnt",
+    "Makes the camera follow an entity and optionally watch an entity.",
+    EV_NORMAL
+);
 Event EV_Camera_SetFollowDistance
-	( 
-	"follow_distance",
-	EV_DEFAULT,
-   "f",
-   "distance",
-   "Sets the camera follow distance.",
-	EV_NORMAL
-	);
+(
+    "follow_distance",
+    EV_DEFAULT,
+    "f",
+    "distance",
+    "Sets the camera follow distance.",
+    EV_NORMAL
+);
 Event EV_Camera_SetFollowYaw
-	( 
-	"follow_yaw",
-	EV_DEFAULT,
-   "f",
-   "yaw",
-   "Sets the yaw offset of the camera following an entity.",
-	EV_NORMAL
-	);
+(
+    "follow_yaw",
+    EV_DEFAULT,
+    "f",
+    "yaw",
+    "Sets the yaw offset of the camera following an entity.",
+    EV_NORMAL
+);
 Event EV_Camera_AbsoluteYaw
-	( 
-	"follow_yaw_absolute",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Makes the follow camera yaw absolute.",
-	EV_NORMAL
-	);
+(
+    "follow_yaw_absolute",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the follow camera yaw absolute.",
+    EV_NORMAL
+);
 Event EV_Camera_RelativeYaw
-	( 
-	"follow_yaw_relative",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Makes the follow camera yaw relative (not absolute).",
-	EV_NORMAL
-	);
+(
+    "follow_yaw_relative",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the follow camera yaw relative (not absolute).",
+    EV_NORMAL
+);
 
 //
 // ORBIT Events
 //
 Event EV_Camera_Orbit
-	( 
-	"orbit",
-	EV_DEFAULT,
-   "eE",
-   "targetEnt targetWatchEnt",
-   "Makes the camera orbit around an entity and optionally watch an entity.",
-	EV_NORMAL
-	);
+(
+    "orbit",
+    EV_DEFAULT,
+    "eE",
+    "targetEnt targetWatchEnt",
+    "Makes the camera orbit around an entity and optionally watch an entity.",
+    EV_NORMAL
+);
 Event EV_Camera_SetOrbitHeight
-	( 
-	"orbit_height",
-	EV_DEFAULT,
-   "f",
-   "height",
-   "Sets the orbit camera's height.",
-	EV_NORMAL
-	);
+(
+    "orbit_height",
+    EV_DEFAULT,
+    "f",
+    "height",
+    "Sets the orbit camera's height.",
+    EV_NORMAL
+);
 
 //
 // Watch Events
 //
 Event EV_Camera_Watch
-	( 
-	"watch", 
-	EV_CONSOLE,
-	"eF",
-   "watchEnt fadeTime",
-   "Makes the camera watch an entity.\n"
-   "if fadeTime is specified, camera will fade over that time",
-	EV_NORMAL
-	);
+(
+    "watch",
+    EV_CONSOLE,
+    "eF",
+    "watchEnt fadeTime",
+    "Makes the camera watch an entity.\n"
+    "if fadeTime is specified, camera will fade over that time",
+    EV_NORMAL
+);
 Event EV_Camera_WatchPath
-	( 
-	"watchpath", 
-	EV_CONSOLE,
-	"F",
-	"fadeTime",
-   "Makes the camera look along the path of travel.\n"
-   "if fadeTime is specified, camera will fade over that time",
-	EV_NORMAL
-	);
+(
+    "watchpath",
+    EV_CONSOLE,
+    "F",
+    "fadeTime",
+    "Makes the camera look along the path of travel.\n"
+    "if fadeTime is specified, camera will fade over that time",
+    EV_NORMAL
+);
 Event EV_Camera_WatchNodes
-	( 
-	"watchnode", 
-	EV_CONSOLE,
-	"F",
-	"fadeTime",
-   "Makes the camera watch based on what is stored\n"
-   "in the camera nodes.\n"
-   "if fadeTime is specified, camera will fade over that time",
-	EV_NORMAL
-	);
+(
+    "watchnode",
+    EV_CONSOLE,
+    "F",
+    "fadeTime",
+    "Makes the camera watch based on what is stored\n"
+    "in the camera nodes.\n"
+    "if fadeTime is specified, camera will fade over that time",
+    EV_NORMAL
+);
 Event EV_Camera_NoWatch
-	( 
-	"nowatch", 
-	EV_CONSOLE,
-	"F",
-   "fadeTime",
-   "Stop watching an entity or looking along a path.\n"
-   "Camera is now static as far as orientation.\n"
-   "if fadeTime is specified, camera will fade over that time",
-	EV_NORMAL
-	);
+(
+    "nowatch",
+    EV_CONSOLE,
+    "F",
+    "fadeTime",
+    "Stop watching an entity or looking along a path.\n"
+    "Camera is now static as far as orientation.\n"
+    "if fadeTime is specified, camera will fade over that time",
+    EV_NORMAL
+);
 Event EV_Camera_WatchString
-    ( 
-    "watchstring", 
+(
+    "watchstring",
     EV_CONSOLE,
     "sF",
     "string fadeTime",
     "Makes the camera watch based on a string.\n"
     "if fadeTime is specified, camera will fade over that time",
-	EV_NORMAL
-    );
+    EV_NORMAL
+);
 
 //
 // Camera positioning events
 //
 Event EV_Camera_LookAt
-	( 
-	"lookat",
-	EV_DEFAULT,
-   "e",
-   "ent",
-   "Makes the camera look at an entity.",
-	EV_NORMAL
-	);
+(
+    "lookat",
+    EV_DEFAULT,
+    "e",
+    "ent",
+    "Makes the camera look at an entity.",
+    EV_NORMAL
+);
 Event EV_Camera_TurnTo
-	( 
-	"turnto",
-	EV_DEFAULT,
-   "v",
-   "angle",
-   "Makes the camera look in the specified direction.",
-	EV_NORMAL
-	);
+(
+    "turnto",
+    EV_DEFAULT,
+    "v",
+    "angle",
+    "Makes the camera look in the specified direction.",
+    EV_NORMAL
+);
 Event EV_Camera_MoveToEntity
-	( 
-	"moveto",
-	EV_DEFAULT,
-   "e",
-   "ent",
-   "Move the camera's position to that of the specified entities.",
-	EV_NORMAL
-	);
+(
+    "moveto",
+    EV_DEFAULT,
+    "e",
+    "ent",
+    "Move the camera's position to that of the specified entities.",
+    EV_NORMAL
+);
 Event EV_Camera_MoveToPos
-	( 
-	"movetopos",
-	EV_DEFAULT,
-   "v",
-   "position",
-   "Move the camera's position to the specified position.",
-	EV_NORMAL
-	);
+(
+    "movetopos",
+    EV_DEFAULT,
+    "v",
+    "position",
+    "Move the camera's position to the specified position.",
+    EV_NORMAL
+);
 
 //
 // Camera Transitioning events
 //
 Event EV_Camera_FadeTime
-	( 
-	"fadetime",
-	EV_DEFAULT,
-   "f",
-   "fadetime",
-   "Sets the fade time for camera transitioning.",
-	EV_NORMAL
-	);
+(
+    "fadetime",
+    EV_DEFAULT,
+    "f",
+    "fadetime",
+    "Sets the fade time for camera transitioning.",
+    EV_NORMAL
+);
 Event EV_Camera_Cut
-	( 
-	"cut",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "switch camera states immediately, do not transition",
-	EV_NORMAL
-	);
+(
+    "cut",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "switch camera states immediately, do not transition",
+    EV_NORMAL
+);
 Event EV_Camera_SetNextCamera
-	( 
-	"nextcamera",
-	EV_DEFAULT,
-   "s",
-   "nextCamera",
-   "Sets the next camera to use.",
-	EV_NORMAL
-	);
+(
+    "nextcamera",
+    EV_DEFAULT,
+    "s",
+    "nextCamera",
+    "Sets the next camera to use.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetAutoState
-	( 
-	"auto_state",
-	EV_DEFAULT,
-   "sSSSSS",
-   "state1 state2 state3 state4 state5 state6",
-   "Sets the states the player needs to be in for this camera to activate.",
-	EV_NORMAL
-	);
+(
+    "auto_state",
+    EV_DEFAULT,
+    "sSSSSS",
+    "state1 state2 state3 state4 state5 state6",
+    "Sets the states the player needs to be in for this camera to activate.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetAutoRadius
-	( 
-	"auto_radius",
-	EV_DEFAULT,
-   "f",
-   "newRadius",
-   "Sets the radius of the automatic camera.",
-	EV_NORMAL
-	);
+(
+    "auto_radius",
+    EV_DEFAULT,
+    "f",
+    "newRadius",
+    "Sets the radius of the automatic camera.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetAutoActive
-	( 
-	"auto_active",
-	EV_DEFAULT,
-   "b",
-   "newActiveState",
-   "Whether or not the auto camera is active.",
-	EV_NORMAL
-	);
+(
+    "auto_active",
+    EV_DEFAULT,
+    "b",
+    "newActiveState",
+    "Whether or not the auto camera is active.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetAutoStartTime
-	( 
-	"auto_starttime",
-	EV_DEFAULT,
-   "f",
-   "newTime",
-   "Sets how long it takes for the camera to be switched to.",
-	EV_NORMAL
-	);
+(
+    "auto_starttime",
+    EV_DEFAULT,
+    "f",
+    "newTime",
+    "Sets how long it takes for the camera to be switched to.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetAutoStopTime
-	( 
-	"auto_stoptime",
-	EV_DEFAULT,
-   "f",
-   "newTime",
-   "Sets how long it takes for the camera switch back to the player.",
-	EV_NORMAL
-	);
+(
+    "auto_stoptime",
+    EV_DEFAULT,
+    "f",
+    "newTime",
+    "Sets how long it takes for the camera switch back to the player.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetMaximumAutoFOV
-	( 
-	"auto_maxfov",
-	EV_DEFAULT,
-   "f",
-   "maxFOV",
-   "Sets the maximum FOV that should be used when automatically calculating FOV.",
-	EV_NORMAL
-	);
+(
+    "auto_maxfov",
+    EV_DEFAULT,
+    "f",
+    "maxFOV",
+    "Sets the maximum FOV that should be used when automatically calculating FOV.",
+    EV_NORMAL
+);
 
 Event EV_Camera_SetShowQuakes
 (
-	"showquakes",
-	EV_DEFAULT,
-	"b",
-	"showquakes",
-	"Sets the camera to show or not show earthquake effects from the player triggered either from the earthquake command, or a viewjitter."
+    "showquakes",
+    EV_DEFAULT,
+    "b",
+    "showquakes",
+    "Sets the camera to show or not show earthquake effects from the player triggered either from the earthquake "
+    "command, or a viewjitter."
 );
 
-// 
+//
 // general setup functions
 //
 Event EV_Camera_SetupCamera
-	( 
-	"_setupcamera",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "setup the camera, post spawn.",
-	EV_NORMAL
-	);
+(
+    "_setupcamera",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "setup the camera, post spawn.",
+    EV_NORMAL
+);
 
 /*****************************************************************************/
 /*       func_camera (0 0.25 0.5) (-8 -8 0) (8 8 16) ORBIT START_ON AUTOMATIC NO_TRACE NO_WATCH LEVEL_EXIT
@@ -689,1612 +657,1206 @@ LEVEL_EXIT if the camera is being used, the level exit state will be set
 
 ******************************************************************************/
 
-CLASS_DECLARATION(Entity, Camera, "func_camera")
-{
-    { &EV_Camera_CameraThink,			&Camera::CameraThink },
-    { &EV_Activate,						&Camera::StartMoving },
-    { &EV_Camera_StartMoving,			&Camera::StartMoving },
-    { &EV_Camera_StopMoving,			&Camera::StopMoving },
-    { &EV_Camera_Pause,					&Camera::Pause },
-    { &EV_Camera_Continue,				&Camera::Continue },
-    { &EV_Camera_SetSpeed,				&Camera::SetSpeed },
-    { &EV_Camera_SetFollowDistance,		&Camera::SetFollowDistance },
-    { &EV_Camera_SetFollowYaw,			&Camera::SetFollowYaw },
-    { &EV_Camera_AbsoluteYaw,			&Camera::AbsoluteYaw },
-    { &EV_Camera_RelativeYaw,			&Camera::RelativeYaw },
-    { &EV_Camera_SetOrbitHeight,		&Camera::SetOrbitHeight },
-    { &EV_Camera_SetFOV,				&Camera::SetFOV },
-    { &EV_Camera_Orbit,					&Camera::OrbitEvent },
-    { &EV_Camera_Follow,				&Camera::FollowEvent },
-    { &EV_Camera_Watch,					&Camera::WatchEvent },
-    { &EV_Camera_WatchPath,				&Camera::WatchPathEvent },
-    { &EV_Camera_WatchNodes,			&Camera::WatchNodesEvent },
-    { &EV_Camera_NoWatch,				&Camera::NoWatchEvent },
-    { &EV_Camera_LookAt,				&Camera::LookAt },
-    { &EV_Camera_TurnTo,				&Camera::TurnTo },
-    { &EV_Camera_MoveToEntity,  		&Camera::MoveToEntity },
-    { &EV_Camera_MoveToPos,				&Camera::MoveToPos },
-    { &EV_Camera_Cut,					&Camera::Cut },
-    { &EV_Camera_FadeTime,				&Camera::FadeTime },
-    { &EV_Camera_SetNextCamera,			&Camera::SetNextCamera },
-    { &EV_Camera_SetupCamera,			&Camera::SetupCamera },
-    { &EV_SetAngles,					&Camera::SetAnglesEvent },
-    { &EV_Camera_SetAutoState,			&Camera::SetAutoStateEvent },
-    { &EV_Camera_SetAutoRadius,			&Camera::SetAutoRadiusEvent },
-    { &EV_Camera_SetAutoStartTime,		&Camera::SetAutoStartTimeEvent },
-    { &EV_Camera_SetAutoStopTime,		&Camera::SetAutoStopTimeEvent },
-    { &EV_Camera_SetMaximumAutoFOV,		&Camera::SetMaximumAutoFOVEvent },
-    { &EV_Camera_SetAutoActive,			&Camera::SetAutoActiveEvent },
-    { &EV_Camera_WatchString,			&Camera::WatchStringEvent },
-    { &EV_Camera_SetShowQuakes,			&Camera::EventShowQuakes },
+CLASS_DECLARATION(Entity, Camera, "func_camera") {
+    {&EV_Camera_CameraThink,       &Camera::CameraThink           },
+    {&EV_Activate,                 &Camera::StartMoving           },
+    {&EV_Camera_StartMoving,       &Camera::StartMoving           },
+    {&EV_Camera_StopMoving,        &Camera::StopMoving            },
+    {&EV_Camera_Pause,             &Camera::Pause                 },
+    {&EV_Camera_Continue,          &Camera::Continue              },
+    {&EV_Camera_SetSpeed,          &Camera::SetSpeed              },
+    {&EV_Camera_SetFollowDistance, &Camera::SetFollowDistance     },
+    {&EV_Camera_SetFollowYaw,      &Camera::SetFollowYaw          },
+    {&EV_Camera_AbsoluteYaw,       &Camera::AbsoluteYaw           },
+    {&EV_Camera_RelativeYaw,       &Camera::RelativeYaw           },
+    {&EV_Camera_SetOrbitHeight,    &Camera::SetOrbitHeight        },
+    {&EV_Camera_SetFOV,            &Camera::SetFOV                },
+    {&EV_Camera_Orbit,             &Camera::OrbitEvent            },
+    {&EV_Camera_Follow,            &Camera::FollowEvent           },
+    {&EV_Camera_Watch,             &Camera::WatchEvent            },
+    {&EV_Camera_WatchPath,         &Camera::WatchPathEvent        },
+    {&EV_Camera_WatchNodes,        &Camera::WatchNodesEvent       },
+    {&EV_Camera_NoWatch,           &Camera::NoWatchEvent          },
+    {&EV_Camera_LookAt,            &Camera::LookAt                },
+    {&EV_Camera_TurnTo,            &Camera::TurnTo                },
+    {&EV_Camera_MoveToEntity,      &Camera::MoveToEntity          },
+    {&EV_Camera_MoveToPos,         &Camera::MoveToPos             },
+    {&EV_Camera_Cut,               &Camera::Cut                   },
+    {&EV_Camera_FadeTime,          &Camera::FadeTime              },
+    {&EV_Camera_SetNextCamera,     &Camera::SetNextCamera         },
+    {&EV_Camera_SetupCamera,       &Camera::SetupCamera           },
+    {&EV_SetAngles,                &Camera::SetAnglesEvent        },
+    {&EV_Camera_SetAutoState,      &Camera::SetAutoStateEvent     },
+    {&EV_Camera_SetAutoRadius,     &Camera::SetAutoRadiusEvent    },
+    {&EV_Camera_SetAutoStartTime,  &Camera::SetAutoStartTimeEvent },
+    {&EV_Camera_SetAutoStopTime,   &Camera::SetAutoStopTimeEvent  },
+    {&EV_Camera_SetMaximumAutoFOV, &Camera::SetMaximumAutoFOVEvent},
+    {&EV_Camera_SetAutoActive,     &Camera::SetAutoActiveEvent    },
+    {&EV_Camera_WatchString,       &Camera::WatchStringEvent      },
+    {&EV_Camera_SetShowQuakes,     &Camera::EventShowQuakes       },
 
-    { NULL, NULL }
+    {NULL,                         NULL                           }
 };
 
 Camera::Camera()
 {
-	Vector ang;
+    Vector ang;
 
-	entflags |= EF_CAMERA;
+    entflags |= ECF_CAMERA;
 
-	AddWaitTill(STRING_START);
-	AddWaitTill(STRING_TRIGGER);
+    AddWaitTill(STRING_START);
+    AddWaitTill(STRING_TRIGGER);
 
-	camera_fov = 90;
-	camera_speed = 1;
-	orbit_height = 128;
-	orbit_dotrace = qtrue;
-	follow_yaw = 0;
-	follow_yaw_fixed = false;
-	follow_dist = 128;
-	follow_mask = MASK_SOLID;
-	auto_fov = 0;
-	automatic_maxFOV = 90;
+    camera_fov       = 80;
+    camera_speed     = 1;
+    orbit_height     = 128;
+    orbit_dotrace    = qtrue;
+    follow_yaw       = 0;
+    follow_yaw_fixed = false;
+    follow_dist      = 128;
+    follow_mask      = MASK_SOLID;
+    auto_fov         = 0;
+    automatic_maxFOV = 80;
 
-	watchTime = 0;
-	followTime = 0;
-	fovTime = 0;
+    watchTime  = 0;
+    followTime = 0;
+    fovTime    = 0;
 
-	fadeTime = 2.0f;
+    fadeTime       = 2.0f;
+    fovFadeTime    = 1.0f;
+    followFadeTime = 1.0f;
+    watchFadeTime  = 1.0f;
+    m_bShowquakes  = false;
 
-	setSolidType( SOLID_NOT );
-	setMoveType( MOVETYPE_NONE );
+    setSolidType(SOLID_NOT);
+    setMoveType(MOVETYPE_NONE);
 
-	showcamera = sv_showcameras->integer;
-	if( showcamera )
-	{
-		setModel( "func_camera.tik" );
-		showModel();
-	}
-	else
-	{
-		hideModel();
-	}
+    showcamera = sv_showcameras->integer;
+    if (showcamera) {
+        setModel("func_camera.tik");
+        showModel();
+    } else {
+        hideModel();
+    }
 
-	automatic_active = qtrue;
-	automatic_radius = 512;
-	automatic_states.ClearObjectList();
-	automatic_startTime = 0.7f;
-	automatic_stopTime = 0.7f;
+    automatic_active = qtrue;
+    automatic_radius = 512;
+    automatic_states.ClearObjectList();
+    automatic_startTime = 0.7f;
+    automatic_stopTime  = 0.7f;
 
-	if( !LoadingSavegame )
-	{
-		PostEvent( EV_Camera_SetupCamera, EV_POSTSPAWN );
-	}
+    if (!LoadingSavegame) {
+        PostEvent(EV_Camera_SetupCamera, EV_POSTSPAWN);
+    }
 }
 
-void Camera::SetupCamera
-	(
-	Event *ev
-	)
-
-	{
-   currentstate.Initialize( this );
-   newstate.Initialize( this );
-
-	if ( spawnflags & START_ON )
-		{
-		PostEvent( EV_Camera_StartMoving, 0 );
-		}
-   if ( spawnflags & AUTOMATIC )
-      {
-      level.AddAutomaticCamera( this );
-      }
-   }
-
-qboolean Camera::IsAutomatic
-	(
-   void
-	)
-   {
-   return ( spawnflags & AUTOMATIC );
-   }
-
-qboolean Camera::IsLevelExit
-	(
-   void
-	)
-   {
-   return ( spawnflags & LEVEL_EXIT );
-   }
-
-float Camera::CalculateScore
-	(
-   Entity * player,
-   str state
-	)
-   {
-   int i;
-   float range;
-   float score;
-   qboolean found;
-
-   if ( !automatic_active )
-      {
-      return 10;
-      }
-
-   range = Vector( player->origin - origin ).length() / automatic_radius;
-   // bias the range so that we don't immediately jump out of the camera if we are out of range
-   range -= 0.1f;
-
-   score = range;
-
-   //
-   // early exit if our score exceeds 1
-   //
-   if ( score > 1.0f )
-      return score;
-
-   // find out if we match a state
-   found = qfalse;
-   for( i = 1; i <= automatic_states.NumObjects(); i++ )
-      {
-      str *auto_state;
-
-      auto_state = &automatic_states.ObjectAt( i );
-      if ( !state.icmpn( state, auto_state->c_str(), auto_state->length() ) )
-         {
-         found = qtrue;
-         break;
-         }
-      }
-
-   // if we are comparing states and we haven't found a valid one...
-   if ( automatic_states.NumObjects() && !found )
-      {
-      // if we aren't in the right state, push our score out significantly
-      score += 2.0f;
-      return score;
-      }
-
-   // perform a trace to the player if necessary
-   if ( !( spawnflags & NO_TRACE ) && !( spawnflags & NO_WATCH ) )
-      {
-      trace_t trace;
-
-      trace = G_Trace( origin, vec_zero, vec_zero, player->centroid, player, follow_mask, false, "Camera::CalculateScore" );
-      if ( trace.startsolid || trace.allsolid || trace.fraction < 1.0f )
-         {
-         // if we are blocked, push our score out, but not too much since this may be a temporary thing
-         if ( trace.startsolid || trace.allsolid )
-            {
-            score += 2.0f;
-            return score;
-            }
-         else
-            {
-            score += 1.0f - trace.fraction;
-            }
-         }
-      }
-
-   // perform a dot product test for no watch cameras
-   if ( spawnflags & NO_WATCH )
-      {
-      trace_t trace;
-      float  limit;
-      float  threshold;
-      float  dot;
-      Vector dir;
-
-      dir = player->centroid - origin;
-      dir.normalize();
-      dot = dir * orientation[ 0 ];
-
-      threshold = cos( DEG2RAD( ( camera_fov * 0.25f ) ) );
-      if ( dot <= threshold )
-         {
-         limit = cos( DEG2RAD( ( camera_fov * 0.45f ) ) );
-         if ( dot <= limit )
-            {
-            // we are outside the viewing cone
-            score += 2.0f;
-            return score;
-            }
-         else
-            {
-            // our score is a scale between the two values
-            score += ( threshold - dot ) / ( limit );
-            }
-         }
-
-      trace = G_Trace( origin, vec_zero, vec_zero, player->origin, player, follow_mask, false, "Camera::CalculateScore" );
-      if ( trace.startsolid || trace.allsolid || trace.fraction < 1.0f )
-         {
-         // if we are blocked, push our score out, but not too much since this may be a temporary thing
-         if ( trace.startsolid || trace.allsolid )
-            {
-            score += 2.0f;
-            return score;
-            }
-         else
-            {
-            score += 1.0f - trace.fraction;
-            }
-         }
-      }
-
-   return score;
-   }
-
-float Camera::AutomaticStart
-	(
-	Entity * player
-	)
+void Camera::SetupCamera(Event *ev)
 {
-	if( !( spawnflags & NO_WATCH ) && player )
-	{
-		Watch( player, 0 );
-		Cut( NULL );
-	}
+    currentstate.Initialize(this);
+    newstate.Initialize(this);
 
-	Unregister( STRING_START );
-	return automatic_startTime;
+    if (spawnflags & START_ON) {
+        PostEvent(EV_Camera_StartMoving, 0);
+    }
+    if (spawnflags & AUTOMATIC) {
+        level.AddAutomaticCamera(this);
+    }
 }
 
-float Camera::AutomaticStop
-	(
-   Entity * player
-	)
-   {
-   Stop();
-   return automatic_stopTime;
-   }
-
-void Camera::UpdateStates
-	(
-   void
-	)
-
-	{
-   if ( followTime && watchTime )
-      {
-      newstate.Evaluate( this );
-      }
-   else if ( watchTime )
-      {
-      newstate.watch.Evaluate( this, &currentstate.move );
-      }
-   else if ( followTime )
-      {
-      newstate.move.Evaluate( this );
-      }
-   currentstate.Evaluate( this );
-   }
-
-
-Vector Camera::CalculatePosition
-	(
-   void
-	)
-
-	{
-   int      i;
-   float    t;
-   Vector   pos;
-
-   //
-   // calcualte position
-   //
-   if ( followTime )
-      {
-		t = followTime - level.time;
-      //
-      // are we still fading?
-      //
-		if ( t <= 0 )
-			{
-         //
-         // if not zero out the fade
-         //
-			t = 0;
-         currentstate.move = newstate.move;
-         newstate.move.Initialize( this );
-			followTime = 0;
-         pos = currentstate.move.pos;
-			}
-      else
-         {
-         //
-         // if we are lerp over followFadeTime
-         //
-		   t = ( followFadeTime - t ) / followFadeTime;
-
-         for ( i = 0; i < 3; i++ )
-            {
-            pos[ i ] = currentstate.move.pos[ i ] + ( t * ( newstate.move.pos[ i ] - currentstate.move.pos[ i ] ) );
-            }
-         }
-      }
-   else
-      {
-      pos = currentstate.move.pos;
-      }
-
-   return pos;
-   }
-
-
-Vector Camera::CalculateOrientation
-	(
-	void
-	)
+qboolean Camera::IsAutomatic(void)
 {
-	int      i;
-	float    t;
-	Vector   ang;
-
-	// 
-	// calculate orientation
-	//
-	if( watchTime )
-	{
-		t = watchTime - level.time;
-		//
-		// are we still fading?
-		//
-		if( t <= 0 )
-		{
-			//
-			// if not zero out the fade
-			//
-			t = 0;
-			currentstate.watch = newstate.watch;
-			newstate.watch.Initialize( this );
-			watchTime = 0;
-			ang = currentstate.watch.watchAngles;
-		}
-		else
-		{
-			t = ( watchFadeTime - t ) / watchFadeTime;
-
-			for( i = 0; i<3; i++ )
-			{
-				ang[ i ] = LerpAngleFromCurrent
-					(
-					currentstate.watch.watchAngles[ i ],
-					newstate.watch.watchAngles[ i ],
-					this->angles[ i ],
-					t
-					);
-			}
-			/*
-			warning("", "%.2f a x%.0f y%.0f z%.0f c x%.0f y%.0f z%.0f n x%.0f y%.0f z%.0f\n",
-			t,
-			ang[ 0 ],
-			ang[ 1 ],
-			ang[ 2 ],
-			currentstate.watch.watchAngles[ 0 ],
-			currentstate.watch.watchAngles[ 1 ],
-			currentstate.watch.watchAngles[ 2 ],
-			newstate.watch.watchAngles[ 0 ],
-			newstate.watch.watchAngles[ 1 ],
-			newstate.watch.watchAngles[ 2 ]
-			);
-			*/
-		}
-	}
-	else
-	{
-		ang = currentstate.watch.watchAngles;
-	}
-
-	return ang;
+    return (spawnflags & AUTOMATIC);
 }
 
-float Camera::CalculateFov
-	(
-   void
-	)
-
-	{
-   float    fov;
-   float    t;
-
-   //
-   // calculate fov
-   //
-   // check if we have an auto_fov
-   if ( auto_fov > 0 )
-      {
-      if ( currentstate.watch.watchEnt )
-         {
-         float distance;
-         float size;
-         float new_fov;
-         Entity * ent;
-
-         ent = currentstate.watch.watchEnt;
-         size = ent->maxs[ 2 ] - ent->mins[ 2 ];
-         size = ent->edict->r.radius / 2;
-         // cap the size
-         if ( size < 16 )
-            size = 16;
-         distance = Vector( ent->centroid - origin ).length();
-         new_fov = RAD2DEG( 2.0f * atan2( size, distance * auto_fov ) );
-         if ( new_fov > automatic_maxFOV )
-            new_fov = automatic_maxFOV;
-         else if ( new_fov < 5 )
-            new_fov = 5;
-         return new_fov;
-         }
-      else
-         {
-         return 90;
-         }
-      }
-   // if we get here, we don't have an auto_fov, or we have an invalid watch target
-   if ( fovTime )
-      {
-		t = fovTime - level.time;
-      //
-      // are we still fading?
-      //
-		if ( t <= 0 )
-			{
-         //
-         // if not zero out the fade
-         //
-			t = 0;
-         currentstate.fov = newstate.fov;
-			fovTime = 0;
-         fov = currentstate.fov;
-			}
-      else
-         {
-         //
-         // if we are lerp over fovFadeTime
-         //
-		   t = ( fovFadeTime - t ) / fovFadeTime;
-         fov = currentstate.fov + ( t * ( newstate.fov - currentstate.fov ) );
-         }
-      }
-   else
-      {
-      fov = currentstate.fov;
-      }
-
-   return fov;
-   }
-
-void Camera::CameraThink
-	(
-	Event *ev
-	)
+qboolean Camera::IsLevelExit(void)
 {
-	UpdateStates();
-
-	if( edict->s.parent == ENTITYNUM_NONE )
-	{
-		setOrigin( CalculatePosition() );
-		setAngles( CalculateOrientation() );
-	}
-	else
-	{
-		setOrigin();
-
-		if( edict->s.attach_use_angles )
-		{
-			orientation_t orient;
-			Vector ang;
-			Entity *ent = G_GetEntity( edict->s.parent );
-
-			ent->GetTag( edict->s.tag_num & TAG_MASK, &orient );
-			MatrixToEulerAngles( orient.axis, ang );
-
-			setAngles( ang );
-		}
-		else
-		{
-			setAngles( CalculateOrientation() );
-		}
-	}
-
-	camera_fov = CalculateFov();
-
-	if( m_bShowquakes && level.earthquake_magnitude )
-	{
-		Vector randomness;
-
-		// smooth earthquake
-		randomness[ 0 ] = G_CRandom( 1.0f );
-		randomness[ 1 ] = G_CRandom( 1.0f );
-		randomness[ 2 ] = G_CRandom( 1.0f );
-
-		angles += randomness * level.earthquake_magnitude;
-	}
-
-	//
-	// debug info
-	//
-	if( sv_showcameras->integer != showcamera )
-	{
-		showcamera = sv_showcameras->integer;
-		if( showcamera )
-		{
-			showModel();
-		}
-		else
-		{
-			hideModel();
-		}
-	}
-
-	if( sv_showcameras->integer != showcamera )
-	{
-		showcamera = sv_showcameras->integer;
-		if( showcamera )
-		{
-			showModel();
-		}
-		else
-		{
-			hideModel();
-		}
-	}
-	if( showcamera && currentstate.move.followingpath )
-	{
-		G_Color3f( 1, 1, 0 );
-		if( currentstate.move.orbitEnt )
-		{
-			currentstate.move.cameraPath.DrawCurve( currentstate.move.orbitEnt->origin, 10 );
-		}
-		else
-		{
-			currentstate.move.cameraPath.DrawCurve( 10 );
-		}
-	}
-
-	CancelEventsOfType( EV_Camera_CameraThink );
-	PostEvent( EV_Camera_CameraThink, 0.05f );
+    return (spawnflags & LEVEL_EXIT);
 }
 
-void Camera::LookAt
-	(
-	Event *ev
-	)
+float Camera::CalculateScore(Entity *player, str state)
+{
+    int      i;
+    float    range;
+    float    score;
+    qboolean found;
 
-	{
-   Vector pos, delta;
-   Entity * ent;
+    if (!automatic_active) {
+        return 10;
+    }
 
-	ent = ev->GetEntity( 1 );
+    range = Vector(player->origin - origin).length() / automatic_radius;
+    // bias the range so that we don't immediately jump out of the camera if we are out of range
+    range -= 0.1f;
 
-   if ( !ent )
-      return;
+    score = range;
 
-   pos.x = ent->origin.x;
-   pos.y = ent->origin.y;
-	pos.z = ent->absmax.z;
-   delta = pos - origin;
-   delta.normalize();
+    //
+    // early exit if our score exceeds 1
+    //
+    if (score > 1.0f) {
+        return score;
+    }
 
-   currentstate.watch.watchAngles = delta.toAngles();
-   setAngles( currentstate.watch.watchAngles );
-	}
+    // find out if we match a state
+    found = qfalse;
+    for (i = 1; i <= automatic_states.NumObjects(); i++) {
+        str *auto_state;
 
-void Camera::TurnTo
-	(
-	Event *ev
-	)
-
-	{
-   currentstate.watch.watchAngles = ev->GetVector( 1 );
-   setAngles( currentstate.watch.watchAngles );
-	}
-
-void Camera::MoveToEntity
-	(
-	Event *ev
-	)
-
-	{
-   Entity * ent;
-
-	ent = ev->GetEntity( 1 );
-   if ( ent )
-      currentstate.move.pos = ent->origin;
-   setOrigin( currentstate.move.pos );
-	}
-
-void Camera::MoveToPos
-	(
-	Event *ev
-	)
-
-	{
-   currentstate.move.pos = ev->GetVector( 1 );
-   setOrigin( currentstate.move.pos );
-	}
-
-void Camera::Stop
-	(
-	void
-	)
-
-	{
-   if ( followTime )
-      {
-      currentstate.move = newstate.move;
-      newstate.move.Initialize( this );
-      }
-   if ( watchTime )
-      {
-      currentstate.watch = newstate.watch;
-      newstate.watch.Initialize( this );
-      }
-	CancelEventsOfType( EV_Camera_CameraThink );
-
-   watchTime = 0;
-   followTime = 0;
-	}
-
-void Camera::CreateOrbit
-	(
-	Vector pos,
-	float radius,
-   Vector &forward,
-   Vector &left
-	)
-
-	{
-	newstate.move.cameraPath.Clear();
-	newstate.move.cameraPath.SetType( SPLINE_LOOP );
-
-	newstate.move.cameraPath.AppendControlPoint( pos + radius * forward );
-	newstate.move.cameraPath.AppendControlPoint( pos + radius * left );
-	newstate.move.cameraPath.AppendControlPoint( pos - radius * forward );
-	newstate.move.cameraPath.AppendControlPoint( pos - radius * left );
-	}
-
-void Camera::CreatePath
-	(
-	SplinePath *path,
-	splinetype_t type
-	)
-
-	{
-	SplinePath	*node;
-	SplinePath	*loop;
-
-	newstate.move.cameraPath.Clear();
-	newstate.move.cameraPath.SetType( type );
-
-   newstate.move.splinePath = path;
-   newstate.move.currentNode = path;
-   newstate.move.loopNode = NULL;
-
-	node = path;
-	while( node != NULL )
-		{
-      newstate.move.cameraPath.AppendControlPoint( node->origin, node->angles, node->speed );
-		loop = node->GetLoop();
-      if ( loop && ( type == SPLINE_LOOP ) )
-         {
-         newstate.move.loopNode = loop;
-         newstate.move.cameraPath.SetLoopPoint( loop->origin );
-         }
-		node = node->GetNext();
-
-		if ( node == path )
-			{
-			break;
-			}
-		}
-
-   if ( ( type == SPLINE_LOOP ) && ( !newstate.move.loopNode ) )
-      {
-      newstate.move.loopNode = path;
-      }
-	}
-
-void Camera::FollowPath
-	(
-	SplinePath *path,
-	qboolean loop,
-   Entity * watch
-	)
-
-	{
-   // make sure we process any setup events before continuing
-   ProcessPendingEvents();
-
-	Stop();
-	if ( loop )
-		{
-		CreatePath( path, SPLINE_LOOP );
-		}
-	else
-		{
-		CreatePath( path, SPLINE_CLAMP );
-		}
-
-   newstate.move.cameraTime = -2;
-   newstate.move.lastTime = 0;
-   newstate.move.newTime = 0;
-   newstate.move.currentNode = path;
-   // evaluate the first node events
-   newstate.move.DoNodeEvents( this );
-
-   if ( watch )
-      {
-      newstate.watch.watchEnt = watch;
-      }
-   else
-      {
-      Watch( newstate.move.currentNode->GetWatch(), newstate.move.currentNode->GetFadeTime() );
-      }
-
-   followFadeTime = fadeTime;
-   watchFadeTime = fadeTime;
-
-   newstate.move.followingpath = true;
-   followTime = level.time + followFadeTime;
-   watchTime = level.time + watchFadeTime;
-
-	PostEvent( EV_Camera_CameraThink, FRAMETIME );
-	}
-
-void Camera::Orbit
-	(
-	Entity *ent,
-	float dist,
-   Entity *watch,
-   float yaw_offset,
-   qboolean dotrace
-	)
-
-	{
-   Vector ang, forward, left;
-
-   // make sure we process any setup events before continuing
-   ProcessPendingEvents();
-
-	Stop();
-
-   if ( watch )
-      {
-      ang = watch->angles;
-      ang.y += yaw_offset;
-      }
-   else
-      {
-      ang = vec_zero;
-      ang.y += yaw_offset;
-      }
-   ang.AngleVectors( &forward, &left, NULL );
-
-   orbit_dotrace = dotrace;
-
-	CreateOrbit( Vector( 0, 0, orbit_height ), dist, forward, left );
-   newstate.move.cameraTime = -2;
-   newstate.move.lastTime = 0;
-   newstate.move.newTime = 0;
-
-	newstate.move.orbitEnt = ent;
-
-   followFadeTime = fadeTime;
-   watchFadeTime = fadeTime;
-
-   newstate.move.followingpath = true;
-   followTime = level.time + followFadeTime;
-   watchTime = level.time + watchFadeTime;
-   newstate.move.currentNode = NULL;
-
-   if ( watch )
-      {
-      newstate.watch.watchEnt = watch;
-      }
-   else
-      {
-	   newstate.watch.watchEnt = ent;
-      }
-
-	PostEvent( EV_Camera_CameraThink, FRAMETIME );
-	}
-
-void Camera::FollowEntity
-	(
-	Entity *ent,
-	float dist,
-	int mask,
-   Entity *watch
-	)
-
-	{
-   // make sure we process any setup events before continuing
-   ProcessPendingEvents();
-
-	assert( ent );
-
-	Stop();
-
-	if ( ent )
-		{
-	   newstate.move.followEnt = ent;
-      newstate.move.followingpath = false;
-
-      followFadeTime = fadeTime;
-      watchFadeTime = fadeTime;
-
-      newstate.move.cameraTime = -2;
-      newstate.move.lastTime = 0;
-      newstate.move.newTime = 0;
-      newstate.move.currentNode = NULL;
-
-      followTime = level.time + followFadeTime;
-      watchTime = level.time + watchFadeTime;
-      if ( watch )
-         {
-         newstate.watch.watchEnt = watch;
-         }
-      else
-         {
-	      newstate.watch.watchEnt = ent;
-         }
-		follow_dist = dist;
-		follow_mask = mask;
-		PostEvent( EV_Camera_CameraThink, 0 );
-		}
-	}
-
-void Camera::StartMoving
-	(
-	Event *ev
-	)
-
-	{
-   Entity *targetEnt;
-   Entity *targetWatchEnt;
-	Entity *ent;
-	SplinePath *path;
-
-   if ( ev->NumArgs() > 0 )
-      {
-      targetEnt = ev->GetEntity( 1 );
-      }
-   else
-      {
-      targetEnt = NULL;
-      }
-
-   if ( ev->NumArgs() > 1 )
-      {
-      targetWatchEnt = ev->GetEntity( 2 );
-      }
-   else
-      {
-      targetWatchEnt = NULL;
-      }
-
-	if ( ( spawnflags & START_ON ) && ( !Q_stricmp( Target(), "" ) ) )
-      {
-      gi.Error( ERR_DROP, "Camera '%s' with START_ON selected, but no target specified.", TargetName().c_str() );
-      }
-
-   if ( !targetEnt )
-		{
-		ent = ( Entity * )G_FindTarget( NULL, Target() );
-		if ( !ent )
-			{
-         //
-         // we took this out just because of too many warnings, oh well
-			//warning("StartMoving", "Can't find target for camera\n" );
-         //
-         // I put it back in as an error.  Fuck em!  Yeeeeeha!
-         //
-         gi.Error( ERR_DROP, "Can't find target '%s' for camera\n", Target().c_str() );
-			return;
-			}
-		}
-	else
-		{
-		ent = targetEnt;
-		}
-
-	if ( ent->isSubclassOf( SplinePath ) )
-		{
-		path = ( SplinePath * )ent;
-		FollowPath( path, spawnflags & ORBIT, targetWatchEnt );
-		}
-	else
-		{
-		if ( spawnflags & ORBIT )
-			{
-			Orbit( ent, follow_dist, targetWatchEnt );
-			}
-		else
-			{
-			FollowEntity( ent, follow_dist, follow_mask, targetWatchEnt );
-			}
-		}
-	}
-
-void Camera::SetAutoStateEvent
-	(
-	Event *ev
-	)
-
-	{
-   int i;
-
-   for( i = 1; i <= ev->NumArgs(); i++ )
-      {
-      char  *buffer;
-      char	com_token[ MAX_QPATH ];
-      char  com_buffer[MAX_STRING_CHARS]; 
-
-      strcpy( com_buffer, ev->GetString( i ) );
-      buffer = com_buffer;
-      // get the rest of the line
-      while( 1 )
-         {
-         strcpy( com_token, COM_ParseExt( &buffer, qfalse ) );
-         if (!com_token[0])
+        auto_state = &automatic_states.ObjectAt(i);
+        if (!state.icmpn(state, auto_state->c_str(), auto_state->length())) {
+            found = qtrue;
             break;
+        }
+    }
 
-         automatic_states.AddUniqueObject( str( com_token ) );
-         }
-      }
-	}
+    // if we are comparing states and we haven't found a valid one...
+    if (automatic_states.NumObjects() && !found) {
+        // if we aren't in the right state, push our score out significantly
+        score += 2.0f;
+        return score;
+    }
 
-void Camera::SetMaximumAutoFOVEvent
-	(
-	Event *ev
-	)
+    // perform a trace to the player if necessary
+    if (!(spawnflags & NO_TRACE) && !(spawnflags & NO_WATCH)) {
+        trace_t trace;
 
-	{
-   automatic_maxFOV = ev->GetFloat( 1 );
-	}
+        trace =
+            G_Trace(origin, vec_zero, vec_zero, player->centroid, player, follow_mask, false, "Camera::CalculateScore");
+        if (trace.startsolid || trace.allsolid || trace.fraction < 1.0f) {
+            // if we are blocked, push our score out, but not too much since this may be a temporary thing
+            if (trace.startsolid || trace.allsolid) {
+                score += 2.0f;
+                return score;
+            } else {
+                score += 1.0f - trace.fraction;
+            }
+        }
+    }
 
-void Camera::SetAutoRadiusEvent
-	(
-	Event *ev
-	)
+    // perform a dot product test for no watch cameras
+    if (spawnflags & NO_WATCH) {
+        trace_t trace;
+        float   limit;
+        float   threshold;
+        float   dot;
+        Vector  dir;
 
-	{
-   automatic_radius = ev->GetFloat( 1 );
-	}
+        dir = player->centroid - origin;
+        dir.normalize();
+        dot = dir * orientation[0];
 
-void Camera::SetAutoActiveEvent
-	(
-	Event *ev
-	)
+        threshold = cos(DEG2RAD((camera_fov * 0.25f)));
+        if (dot <= threshold) {
+            limit = cos(DEG2RAD((camera_fov * 0.45f)));
+            if (dot <= limit) {
+                // we are outside the viewing cone
+                score += 2.0f;
+                return score;
+            } else {
+                // our score is a scale between the two values
+                score += (threshold - dot) / (limit);
+            }
+        }
 
-	{
-   automatic_active = ev->GetBoolean( 1 );
-	}
+        trace =
+            G_Trace(origin, vec_zero, vec_zero, player->origin, player, follow_mask, false, "Camera::CalculateScore");
+        if (trace.startsolid || trace.allsolid || trace.fraction < 1.0f) {
+            // if we are blocked, push our score out, but not too much since this may be a temporary thing
+            if (trace.startsolid || trace.allsolid) {
+                score += 2.0f;
+                return score;
+            } else {
+                score += 1.0f - trace.fraction;
+            }
+        }
+    }
 
-void Camera::SetAutoStartTimeEvent
-	(
-	Event *ev
-	)
+    return score;
+}
 
-	{
-   automatic_startTime = ev->GetFloat( 1 );
-	}
+float Camera::AutomaticStart(Entity *player)
+{
+    if (!(spawnflags & NO_WATCH) && player) {
+        Watch(player, 0);
+        Cut(NULL);
+    }
 
-void Camera::SetAutoStopTimeEvent
-	(
-	Event *ev
-	)
+    Unregister(STRING_START);
+    return automatic_startTime;
+}
 
-	{
-   automatic_stopTime = ev->GetFloat( 1 );
-	}
+float Camera::AutomaticStop(Entity *player)
+{
+    Stop();
+    return automatic_stopTime;
+}
 
+void Camera::UpdateStates(void)
+{
+    if (followTime && watchTime) {
+        newstate.Evaluate(this);
+    } else if (watchTime) {
+        newstate.watch.Evaluate(this, &currentstate.move);
+    } else if (followTime) {
+        newstate.move.Evaluate(this);
+    }
+    currentstate.Evaluate(this);
+}
 
-void Camera::StopMoving
-	(
-	Event *ev
-	)
+Vector Camera::CalculatePosition(void)
+{
+    int    i;
+    float  t;
+    Vector pos;
 
-	{
-	Stop();
-	}
+    //
+    // calcualte position
+    //
+    if (followTime) {
+        t = followTime - level.time;
+        //
+        // are we still fading?
+        //
+        if (t <= 0) {
+            //
+            // if not zero out the fade
+            //
+            t                 = 0;
+            currentstate.move = newstate.move;
+            newstate.move.Initialize(this);
+            followTime = 0;
+            pos        = currentstate.move.pos;
+        } else {
+            //
+            // if we are lerp over followFadeTime
+            //
+            t = (followFadeTime - t) / followFadeTime;
 
-void Camera::Pause
-	(
-	Event *ev
-	)
+            for (i = 0; i < 3; i++) {
+                pos[i] = currentstate.move.pos[i] + (t * (newstate.move.pos[i] - currentstate.move.pos[i]));
+            }
+        }
+    } else {
+        pos = currentstate.move.pos;
+    }
 
-	{
-	CancelEventsOfType( EV_Camera_CameraThink );
-	}
+    return pos;
+}
 
-void Camera::Continue
-	(
-	Event *ev
-	)
+Vector Camera::CalculateOrientation(void)
+{
+    int    i;
+    float  t;
+    Vector ang;
 
-	{
-	CancelEventsOfType( EV_Camera_CameraThink );
-	PostEvent( EV_Camera_CameraThink, 0 );
-	}
+    //
+    // calculate orientation
+    //
+    if (watchTime) {
+        t = watchTime - level.time;
+        //
+        // are we still fading?
+        //
+        if (t <= 0) {
+            //
+            // if not zero out the fade
+            //
+            t                  = 0;
+            currentstate.watch = newstate.watch;
+            newstate.watch.Initialize(this);
+            watchTime = 0;
+            ang       = currentstate.watch.watchAngles;
+        } else {
+            t = (watchFadeTime - t) / watchFadeTime;
 
-void Camera::SetAnglesEvent
-   (
-   Event *ev
-   )
+            for (i = 0; i < 3; i++) {
+                ang[i] = LerpAngleFromCurrent(
+                    currentstate.watch.watchAngles[i], newstate.watch.watchAngles[i], this->angles[i], t
+                );
+            }
+            /*
+            warning("", "%.2f a x%.0f y%.0f z%.0f c x%.0f y%.0f z%.0f n x%.0f y%.0f z%.0f\n",
+            t,
+            ang[ 0 ],
+            ang[ 1 ],
+            ang[ 2 ],
+            currentstate.watch.watchAngles[ 0 ],
+            currentstate.watch.watchAngles[ 1 ],
+            currentstate.watch.watchAngles[ 2 ],
+            newstate.watch.watchAngles[ 0 ],
+            newstate.watch.watchAngles[ 1 ],
+            newstate.watch.watchAngles[ 2 ]
+            );
+            */
+        }
+    } else {
+        ang = currentstate.watch.watchAngles;
+    }
 
-   {
-   Vector ang;
+    return ang;
+}
 
-	ang = ev->GetVector( 1 );
-   setAngles( ang );
-   }
+float Camera::CalculateFov(void)
+{
+    float fov;
+    float t;
 
-void Camera::SetSpeed
-	(
-	Event *ev
-	)
+    //
+    // calculate fov
+    //
+    // check if we have an auto_fov
+    if (auto_fov > 0) {
+        if (currentstate.watch.watchEnt) {
+            float   distance;
+            float   size;
+            float   new_fov;
+            Entity *ent;
 
-	{
-   camera_speed = ev->GetFloat( 1 );
-	}
+            ent  = currentstate.watch.watchEnt;
+            size = ent->maxs[2] - ent->mins[2];
+            size = ent->edict->r.radius / 2;
+            // cap the size
+            if (size < 16) {
+                size = 16;
+            }
+            distance = Vector(ent->centroid - origin).length();
+            new_fov  = RAD2DEG(2.0f * atan2(size, distance * auto_fov));
+            if (new_fov > automatic_maxFOV) {
+                new_fov = automatic_maxFOV;
+            } else if (new_fov < 5) {
+                new_fov = 5;
+            }
+            return new_fov;
+        } else {
+            return 90;
+        }
+    }
+    // if we get here, we don't have an auto_fov, or we have an invalid watch target
+    if (fovTime) {
+        t = fovTime - level.time;
+        //
+        // are we still fading?
+        //
+        if (t <= 0) {
+            //
+            // if not zero out the fade
+            //
+            t                = 0;
+            currentstate.fov = newstate.fov;
+            fovTime          = 0;
+            fov              = currentstate.fov;
+        } else {
+            //
+            // if we are lerp over fovFadeTime
+            //
+            t   = (fovFadeTime - t) / fovFadeTime;
+            fov = currentstate.fov + (t * (newstate.fov - currentstate.fov));
+        }
+    } else {
+        fov = currentstate.fov;
+    }
 
-void Camera::SetFollowDistance
-	(
-	Event *ev
-	)
+    return fov;
+}
 
-	{
-   follow_dist = ev->GetFloat( 1 );
-	}
+void Camera::CameraThink(Event *ev)
+{
+    UpdateStates();
 
-void Camera::SetOrbitHeight
-	(
-   float height
-	)
+    if (edict->s.parent == ENTITYNUM_NONE) {
+        setOrigin(CalculatePosition());
+        setAngles(CalculateOrientation());
+    } else {
+        setOrigin();
 
-	{
-   orbit_height = height;
-	}
+        if (edict->s.attach_use_angles) {
+            orientation_t orient;
+            Vector        ang;
+            Entity       *ent = G_GetEntity(edict->s.parent);
 
-void Camera::SetOrbitHeight
-	(
-	Event *ev
-	)
+            ent->GetTag(edict->s.tag_num & TAG_MASK, &orient);
+            MatrixToEulerAngles(orient.axis, ang);
 
-	{
-   orbit_height = ev->GetFloat( 1 );
-	}
+            setAngles(ang);
+        } else {
+            setAngles(CalculateOrientation());
+        }
+    }
 
-void Camera::SetFollowYaw
-	(
-	Event *ev
-	)
+    camera_fov = CalculateFov();
 
-	{
-	follow_yaw = ev->GetFloat( 1 );
-	}
+    if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+        //
+        // client protocol below version 15 doesn't handle
+        // damage angles properly
+        //
+        if (m_bShowquakes && level.earthquake_magnitude) {
+            Vector randomness;
 
-void Camera::AbsoluteYaw
-	(
-	Event *ev
-	)
+            // smooth earthquake
+            randomness[0] = G_CRandom(1.0f);
+            randomness[1] = G_CRandom(1.0f);
+            randomness[2] = G_CRandom(1.0f);
 
-	{
-	follow_yaw_fixed = true;
-	}
+            angles += randomness * level.earthquake_magnitude;
+        }
+    }
 
-void Camera::RelativeYaw
-	(
-	Event *ev
-	)
+    //
+    // debug info
+    //
+    if (sv_showcameras->integer != showcamera) {
+        showcamera = sv_showcameras->integer;
+        if (showcamera) {
+            showModel();
+        } else {
+            hideModel();
+        }
+    }
 
-	{
-	follow_yaw_fixed = false;
-	}
+    if (sv_showcameras->integer != showcamera) {
+        showcamera = sv_showcameras->integer;
+        if (showcamera) {
+            showModel();
+        } else {
+            hideModel();
+        }
+    }
+    if (showcamera && currentstate.move.followingpath) {
+        G_Color3f(1, 1, 0);
+        if (currentstate.move.orbitEnt) {
+            currentstate.move.cameraPath.DrawCurve(currentstate.move.orbitEnt->origin, 10);
+        } else {
+            currentstate.move.cameraPath.DrawCurve(10);
+        }
+    }
 
-void Camera::SetNextCamera
-	(
-	Event *ev
-	)
+    CancelEventsOfType(EV_Camera_CameraThink);
+    PostEvent(EV_Camera_CameraThink, 0.05f);
+}
 
-	{
-   nextCamera = ev->GetString( 1 );
-	}
+void Camera::LookAt(Event *ev)
+{
+    Vector  pos, delta;
+    Entity *ent;
 
-void Camera::Cut
-	(
-	Event *ev
-	)
-	{
-   int         j;
+    ent = ev->GetEntity(1);
 
-   if ( followTime )
-      {
-      currentstate.move = newstate.move;
-      newstate.move.Initialize( this );
-      followTime = 0;
-      }
-   if ( watchTime )
-      {
-      currentstate.watch = newstate.watch;
-      newstate.watch.Initialize( this );
-      watchTime = 0;
-      }
-   if ( fovTime )
-      {
-      currentstate.fov = newstate.fov;
-      newstate.fov = camera_fov;
-      fovTime = 0;
-      }
-	CancelEventsOfType( EV_Camera_CameraThink );
-	ProcessEvent( EV_Camera_CameraThink );
+    if (!ent) {
+        return;
+    }
 
-   //
-   // let any clients know that this camera has just cut
-   //
-	for( j = 0; j < game.maxclients; j++ )
-		{
-      gentity_t   *other;
-      Player      *client;
+    pos.x = ent->origin.x;
+    pos.y = ent->origin.y;
+    pos.z = ent->absmax.z;
+    delta = pos - origin;
+    delta.normalize();
 
-      other = &g_entities[ j ];
-		if ( other->inuse && other->client )
-			{
-         client = ( Player * )other->entity;
-         client->CameraCut( this );
-			}
-      }
-	}
+    currentstate.watch.watchAngles = delta.toAngles();
+    setAngles(currentstate.watch.watchAngles);
+}
 
-void Camera::FadeTime
-	(
-	Event *ev
-	)
+void Camera::TurnTo(Event *ev)
+{
+    currentstate.watch.watchAngles = ev->GetVector(1);
+    setAngles(currentstate.watch.watchAngles);
+}
 
-	{
-   fadeTime = ev->GetFloat( 1 );
-	}
+void Camera::MoveToEntity(Event *ev)
+{
+    Entity *ent;
 
-void Camera::OrbitEvent
-	(
-	Event *ev
-	)
+    ent = ev->GetEntity(1);
+    if (ent) {
+        currentstate.move.pos = ent->origin;
+    }
+    setOrigin(currentstate.move.pos);
+}
 
-	{
-	Entity *ent;
+void Camera::MoveToPos(Event *ev)
+{
+    currentstate.move.pos = ev->GetVector(1);
+    setOrigin(currentstate.move.pos);
+}
 
-	spawnflags |= ORBIT;
-	ent = ev->GetEntity( 1 );
-	if ( ent )
-		{
-      Event * event;
+void Camera::Stop(void)
+{
+    if (followTime) {
+        currentstate.move = newstate.move;
+        newstate.move.Initialize(this);
+    }
+    if (watchTime) {
+        currentstate.watch = newstate.watch;
+        newstate.watch.Initialize(this);
+    }
+    CancelEventsOfType(EV_Camera_CameraThink);
 
-      event = new Event( EV_Camera_StartMoving );
-      event->AddEntity( ent );
-      if ( ev->NumArgs() > 1 )
-         {
-         event->AddEntity( ev->GetEntity( 2 ) );
-         }
-		Stop();
-		ProcessEvent( event );
-		}
-	}
+    watchTime  = 0;
+    followTime = 0;
+}
 
-void Camera::FollowEvent
-	(
-	Event *ev
-	)
+void Camera::CreateOrbit(Vector pos, float radius, Vector& forward, Vector& left)
+{
+    newstate.move.cameraPath.Clear();
+    newstate.move.cameraPath.SetType(SPLINE_LOOP);
 
-	{
-	Entity *ent;
+    newstate.move.cameraPath.AppendControlPoint(pos + radius * forward);
+    newstate.move.cameraPath.AppendControlPoint(pos + radius * left);
+    newstate.move.cameraPath.AppendControlPoint(pos - radius * forward);
+    newstate.move.cameraPath.AppendControlPoint(pos - radius * left);
+}
 
-	spawnflags &= ~ORBIT;
-	ent = ev->GetEntity( 1 );
-	if ( ent )
-		{
-      Event * event;
+void Camera::CreatePath(SplinePath *path, splinetype_t type)
+{
+    SplinePath *node;
+    SplinePath *loop;
 
-      event = new Event( EV_Camera_StartMoving );
-      event->AddEntity( ent );
-      if ( ev->NumArgs() > 1 )
-         {
-         event->AddEntity( ev->GetEntity( 2 ) );
-         }
-		Stop();
-		ProcessEvent( event );
-		}
-	}
+    newstate.move.cameraPath.Clear();
+    newstate.move.cameraPath.SetType(type);
 
-void Camera::SetFOV
-	(
-	Event *ev
-	)
+    newstate.move.splinePath  = path;
+    newstate.move.currentNode = path;
+    newstate.move.loopNode    = NULL;
 
-	{
-   float time;
+    node = path;
+    while (node != NULL) {
+        newstate.move.cameraPath.AppendControlPoint(node->origin, node->angles, node->speed);
+        loop = node->GetLoop();
+        if (loop && (type == SPLINE_LOOP)) {
+            newstate.move.loopNode = loop;
+            newstate.move.cameraPath.SetLoopPoint(loop->origin);
+        }
+        node = node->GetNext();
 
-   if ( ev->NumArgs() > 1 )
-      {
-      time = ev->GetFloat( 2 );
-      }
-   else
-      {
-      time = fadeTime;
-      }
+        if (node == path) {
+            break;
+        }
+    }
 
-   SetFOV( ev->GetFloat( 1 ), time );
-	}
+    if ((type == SPLINE_LOOP) && (!newstate.move.loopNode)) {
+        newstate.move.loopNode = path;
+    }
+}
 
-void Camera::WatchEvent
-	(
-	Event *ev
-	)
+void Camera::FollowPath(SplinePath *path, qboolean loop, Entity *watch)
+{
+    // make sure we process any setup events before continuing
+    ProcessPendingEvents();
 
+    Stop();
+    if (loop) {
+        CreatePath(path, SPLINE_LOOP);
+    } else {
+        CreatePath(path, SPLINE_CLAMP);
+    }
+
+    newstate.move.cameraTime  = -2;
+    newstate.move.lastTime    = 0;
+    newstate.move.newTime     = 0;
+    newstate.move.currentNode = path;
+    // evaluate the first node events
+    newstate.move.DoNodeEvents(this);
+
+    if (watch) {
+        newstate.watch.watchEnt = watch;
+    } else {
+        Watch(newstate.move.currentNode->GetWatch(), newstate.move.currentNode->GetFadeTime());
+    }
+
+    followFadeTime = fadeTime;
+    watchFadeTime  = fadeTime;
+
+    newstate.move.followingpath = true;
+    followTime                  = level.time + followFadeTime;
+    watchTime                   = level.time + watchFadeTime;
+
+    PostEvent(EV_Camera_CameraThink, FRAMETIME);
+}
+
+void Camera::Orbit(Entity *ent, float dist, Entity *watch, float yaw_offset, qboolean dotrace)
+{
+    Vector ang, forward, left;
+
+    // make sure we process any setup events before continuing
+    ProcessPendingEvents();
+
+    Stop();
+
+    if (watch) {
+        ang = watch->angles;
+        ang.y += yaw_offset;
+    } else {
+        ang = vec_zero;
+        ang.y += yaw_offset;
+    }
+    ang.AngleVectors(&forward, &left, NULL);
+
+    orbit_dotrace = dotrace;
+
+    CreateOrbit(Vector(0, 0, orbit_height), dist, forward, left);
+    newstate.move.cameraTime = -2;
+    newstate.move.lastTime   = 0;
+    newstate.move.newTime    = 0;
+
+    newstate.move.orbitEnt = ent;
+
+    followFadeTime = fadeTime;
+    watchFadeTime  = fadeTime;
+
+    newstate.move.followingpath = true;
+    followTime                  = level.time + followFadeTime;
+    watchTime                   = level.time + watchFadeTime;
+    newstate.move.currentNode   = NULL;
+
+    if (watch) {
+        newstate.watch.watchEnt = watch;
+    } else {
+        newstate.watch.watchEnt = ent;
+    }
+
+    PostEvent(EV_Camera_CameraThink, FRAMETIME);
+}
+
+void Camera::FollowEntity(Entity *ent, float dist, int mask, Entity *watch)
+{
+    // make sure we process any setup events before continuing
+    ProcessPendingEvents();
+
+    assert(ent);
+
+    Stop();
+
+    if (ent) {
+        newstate.move.followEnt     = ent;
+        newstate.move.followingpath = false;
+
+        followFadeTime = fadeTime;
+        watchFadeTime  = fadeTime;
+
+        newstate.move.cameraTime  = -2;
+        newstate.move.lastTime    = 0;
+        newstate.move.newTime     = 0;
+        newstate.move.currentNode = NULL;
+
+        followTime = level.time + followFadeTime;
+        watchTime  = level.time + watchFadeTime;
+        if (watch) {
+            newstate.watch.watchEnt = watch;
+        } else {
+            newstate.watch.watchEnt = ent;
+        }
+        follow_dist = dist;
+        follow_mask = mask;
+        PostEvent(EV_Camera_CameraThink, 0);
+    }
+}
+
+void Camera::StartMoving(Event *ev)
+{
+    Entity     *targetEnt;
+    Entity     *targetWatchEnt;
+    Entity     *ent;
+    SplinePath *path;
+
+    if (ev->NumArgs() > 0) {
+        targetEnt = ev->GetEntity(1);
+    } else {
+        targetEnt = NULL;
+    }
+
+    if (ev->NumArgs() > 1) {
+        targetWatchEnt = ev->GetEntity(2);
+    } else {
+        targetWatchEnt = NULL;
+    }
+
+    if ((spawnflags & START_ON) && (!Q_stricmp(Target(), ""))) {
+        gi.Error(ERR_DROP, "Camera '%s' with START_ON selected, but no target specified.", TargetName().c_str());
+    }
+
+    if (!targetEnt) {
+        ent = (Entity *)G_FindTarget(NULL, Target());
+        if (!ent) {
+            //
+            // we took this out just because of too many warnings, oh well
+            //warning("StartMoving", "Can't find target for camera\n" );
+            //
+            // I put it back in as an error.  Fuck em!  Yeeeeeha!
+            //
+            gi.Error(ERR_DROP, "Can't find target '%s' for camera\n", Target().c_str());
+            return;
+        }
+    } else {
+        ent = targetEnt;
+    }
+
+    if (ent->isSubclassOf(SplinePath)) {
+        path = (SplinePath *)ent;
+        FollowPath(path, spawnflags & ORBIT, targetWatchEnt);
+    } else {
+        if (spawnflags & ORBIT) {
+            Orbit(ent, follow_dist, targetWatchEnt);
+        } else {
+            FollowEntity(ent, follow_dist, follow_mask, targetWatchEnt);
+        }
+    }
+}
+
+void Camera::SetAutoStateEvent(Event *ev)
+{
+    int i;
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        char *buffer;
+        char  com_token[MAX_QPATH];
+        char  com_buffer[MAX_STRING_CHARS];
+
+        Q_strncpyz(com_buffer, ev->GetString(i), sizeof(com_buffer));
+        buffer = com_buffer;
+        // get the rest of the line
+        while (1) {
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
+            if (!com_token[0]) {
+                break;
+            }
+
+            automatic_states.AddUniqueObject(str(com_token));
+        }
+    }
+}
+
+void Camera::SetMaximumAutoFOVEvent(Event *ev)
+{
+    automatic_maxFOV = ev->GetFloat(1);
+}
+
+void Camera::SetAutoRadiusEvent(Event *ev)
+{
+    automatic_radius = ev->GetFloat(1);
+}
+
+void Camera::SetAutoActiveEvent(Event *ev)
+{
+    automatic_active = ev->GetBoolean(1);
+}
+
+void Camera::SetAutoStartTimeEvent(Event *ev)
+{
+    automatic_startTime = ev->GetFloat(1);
+}
+
+void Camera::SetAutoStopTimeEvent(Event *ev)
+{
+    automatic_stopTime = ev->GetFloat(1);
+}
+
+void Camera::StopMoving(Event *ev)
+{
+    Stop();
+}
+
+void Camera::Pause(Event *ev)
+{
+    CancelEventsOfType(EV_Camera_CameraThink);
+}
+
+void Camera::Continue(Event *ev)
+{
+    CancelEventsOfType(EV_Camera_CameraThink);
+    PostEvent(EV_Camera_CameraThink, 0);
+}
+
+void Camera::SetAnglesEvent(Event *ev)
+{
+    Vector ang;
+
+    ang = ev->GetVector(1);
+    setAngles(ang);
+}
+
+void Camera::SetSpeed(Event *ev)
+{
+    camera_speed = ev->GetFloat(1);
+}
+
+void Camera::SetFollowDistance(Event *ev)
+{
+    follow_dist = ev->GetFloat(1);
+}
+
+void Camera::SetOrbitHeight(float height)
+{
+    orbit_height = height;
+}
+
+void Camera::SetOrbitHeight(Event *ev)
+{
+    orbit_height = ev->GetFloat(1);
+}
+
+void Camera::SetFollowYaw(Event *ev)
+{
+    follow_yaw = ev->GetFloat(1);
+}
+
+void Camera::AbsoluteYaw(Event *ev)
+{
+    follow_yaw_fixed = true;
+}
+
+void Camera::RelativeYaw(Event *ev)
+{
+    follow_yaw_fixed = false;
+}
+
+void Camera::SetNextCamera(Event *ev)
+{
+    nextCamera = ev->GetString(1);
+}
+
+void Camera::Cut(Event *ev)
+{
+    int j;
+
+    if (followTime) {
+        currentstate.move = newstate.move;
+        newstate.move.Initialize(this);
+        followTime = 0;
+    }
+    if (watchTime) {
+        currentstate.watch = newstate.watch;
+        newstate.watch.Initialize(this);
+        watchTime = 0;
+    }
+    if (fovTime) {
+        currentstate.fov = newstate.fov;
+        newstate.fov     = camera_fov;
+        fovTime          = 0;
+    }
+    CancelEventsOfType(EV_Camera_CameraThink);
+    ProcessEvent(EV_Camera_CameraThink);
+
+    //
+    // let any clients know that this camera has just cut
+    //
+    for (j = 0; j < game.maxclients; j++) {
+        gentity_t *other;
+        Player    *client;
+
+        other = &g_entities[j];
+        if (other->inuse && other->client) {
+            client = (Player *)other->entity;
+            client->CameraCut(this);
+        }
+    }
+}
+
+void Camera::FadeTime(Event *ev)
+{
+    fadeTime = ev->GetFloat(1);
+}
+
+void Camera::OrbitEvent(Event *ev)
+{
+    Entity *ent;
+
+    spawnflags |= ORBIT;
+    ent = ev->GetEntity(1);
+    if (ent) {
+        Event *event;
+
+        event = new Event(EV_Camera_StartMoving);
+        event->AddEntity(ent);
+        if (ev->NumArgs() > 1) {
+            event->AddEntity(ev->GetEntity(2));
+        }
+        Stop();
+        ProcessEvent(event);
+    }
+}
+
+void Camera::FollowEvent(Event *ev)
+{
+    Entity *ent;
+
+    spawnflags &= ~ORBIT;
+    ent = ev->GetEntity(1);
+    if (ent) {
+        Event *event;
+
+        event = new Event(EV_Camera_StartMoving);
+        event->AddEntity(ent);
+        if (ev->NumArgs() > 1) {
+            event->AddEntity(ev->GetEntity(2));
+        }
+        Stop();
+        ProcessEvent(event);
+    }
+}
+
+void Camera::SetFOV(Event *ev)
 {
     float time;
 
-    if (ev->NumArgs() > 1)
-    {
+    if (ev->NumArgs() > 1) {
         time = ev->GetFloat(2);
-    }
-    else
-    {
+    } else {
         time = fadeTime;
     }
 
-	// fixed since mohaab v2.30
-	// use the entity instead
+    SetFOV(ev->GetFloat(1), time);
+}
+
+void Camera::WatchEvent(Event *ev)
+{
+    float time;
+
+    if (ev->NumArgs() > 1) {
+        time = ev->GetFloat(2);
+    } else {
+        time = fadeTime;
+    }
+
+    // fixed since mohaab v2.30
+    // use the entity instead
     Watch(ev->GetEntity(1), time);
 }
 
-void Camera::WatchStringEvent(Event* ev) {
+void Camera::WatchStringEvent(Event *ev)
+{
     float time;
 
-    if (ev->NumArgs() > 1)
-    {
+    if (ev->NumArgs() > 1) {
         time = ev->GetFloat(2);
-    }
-    else
-    {
+    } else {
         time = fadeTime;
     }
 
     Watch(ev->GetString(1), time);
 }
 
-void Camera::EventShowQuakes(Event* ev)
+void Camera::EventShowQuakes(Event *ev)
 {
-    if (ev->NumArgs() > 0)
-    {
+    if (ev->NumArgs() > 0) {
         m_bShowquakes = ev->GetBoolean(1);
     } else {
         m_bShowquakes = qtrue;
     }
 }
 
-Entity * GetWatchEntity
-	(
-   str watch
-	)
+Entity *GetWatchEntity(str watch)
+{
+    const char *name;
+    Entity     *ent;
 
-	{
-   const char *name;
-   Entity * ent;
+    //
+    // if empty just return
+    //
+    if (watch == "") {
+        return NULL;
+    }
 
-   // 
-   // if empty just return
-   //
-   if ( watch == "" )
-      {
-      return NULL;
-      }
+    //
+    // ignore all the reserved words
+    //
+    if ((watch == "path") || (watch == "none") || (watch == "node")) {
+        return NULL;
+    }
 
-   //
-   // ignore all the reserved words
-   //
-   if ( 
-         ( watch == "path" ) ||
-         ( watch == "none" ) ||
-         ( watch == "node" )
-      )
-      {
-      return NULL;
-      }
+    name = watch.c_str();
 
-   name = watch.c_str();
+    if (name[0] == '*') {
+        if (!IsNumeric(&name[1])) {
+            gi.DPrintf("GetWatchEntity :: Expecting a numeric value but found '%s'.", &name[1]);
+            return NULL;
+        } else {
+            ent = G_GetEntity(atoi(&name[1]));
+            if (!ent) {
+                gi.DPrintf("GetWatchEntity :: Entity with targetname of '%s' not found", &name[1]);
+                return NULL;
+            }
+        }
+    } else if (name[0] == '$') {
+        ent = (Entity *)G_FindTarget(NULL, &name[1]);
+        if (!ent) {
+            gi.DPrintf("GetWatchEntity :: Entity with targetname of '%s' not found", &name[1]);
+            return NULL;
+        }
+    } else {
+        gi.DPrintf("GetWatchEntity :: Entity with targetname of '%s' not found", name);
+        return NULL;
+    }
 
-   if ( name[ 0 ] == '*' )
-      {
-		if ( !IsNumeric( &name[ 1 ] ) )
-			{
-			gi.DPrintf( "GetWatchEntity :: Expecting a numeric value but found '%s'.", &name[ 1 ] );
-			return NULL;
-			}
-		else
-			{
-         ent = G_GetEntity( atoi( &name[ 1 ] ) );
-		   if ( !ent )
-			   {
-			   gi.DPrintf( "GetWatchEntity :: Entity with targetname of '%s' not found", &name[ 1 ] );
-			   return NULL;
-			   }
-			}
-      }
-   else if ( name[ 0 ] == '$' )
-		{
-		ent = ( Entity * )G_FindTarget( NULL, &name[ 1 ] );
-		if ( !ent )
-			{
-			gi.DPrintf( "GetWatchEntity :: Entity with targetname of '%s' not found", &name[ 1 ] );
-			return NULL;
-			}
-		}
-   else
-      {
-		gi.DPrintf( "GetWatchEntity :: Entity with targetname of '%s' not found", name );
-		return NULL;
-      }
+    return ent;
+}
 
-   return ent;
-	}
+void Camera::Watch(str watch, float time)
+{
+    // make sure we process any setup events before continuing
+    ProcessPendingEvents();
 
-void Camera::Watch
-	(
-   str watch,
-   float time
-	)
+    //
+    // if empty just return
+    //
+    if (watch == "") {
+        return;
+    }
 
-	{
-   // make sure we process any setup events before continuing
-   ProcessPendingEvents();
+    //
+    // clear out the watch variables
+    //
+    watchFadeTime             = time;
+    newstate.watch.watchPath  = false;
+    newstate.watch.watchNodes = false;
+    newstate.watch.watchEnt   = NULL;
+    watchTime                 = level.time + watchFadeTime;
+    //
+    // really a watchpath command
+    //
+    if (watch == "path") {
+        newstate.watch.watchPath = true;
+    }
+    //
+    // really a watchnodes command
+    //
+    else if (watch == "node") {
+        newstate.watch.watchNodes = true;
+    }
+    //
+    // really a watchnodes command
+    //
+    else if (watch == "none") {
+        // intentionally blank
+    }
+    //
+    // just a normal watch command
+    //
+    else {
+        Entity *ent             = GetWatchEntity(watch);
+        newstate.watch.watchEnt = ent;
+    }
+}
 
-   // 
-   // if empty just return
-   //
-   if ( watch == "" )
-      return;
+void Camera::Watch(Entity *ent, float time)
+{
+    //
+    // clear out the watch variables
+    //
+    watchFadeTime             = time;
+    newstate.watch.watchPath  = false;
+    newstate.watch.watchNodes = false;
+    watchTime                 = level.time + watchFadeTime;
+    newstate.watch.watchEnt   = ent;
+}
 
-   //
-   // clear out the watch variables
-   //
-   watchFadeTime = time;
-   newstate.watch.watchPath = false;
-   newstate.watch.watchNodes = false;
-   newstate.watch.watchEnt = NULL;
-   watchTime = level.time + watchFadeTime;
-   //
-   // really a watchpath command
-   //
-   if ( watch == "path" )
-      {
-	   newstate.watch.watchPath = true;
-      }
-   //
-   // really a watchnodes command
-   //
-   else if ( watch == "node" )
-      {
-      newstate.watch.watchNodes = true;
-      }
-   //
-   // really a watchnodes command
-   //
-   else if ( watch == "none" )
-      {
-      // intentionally blank
-      }
-   //
-   // just a normal watch command
-   //
-   else
-      {
-      Entity * ent = GetWatchEntity( watch );
-      newstate.watch.watchEnt = ent;
-      }
-	}
+void Camera::SetFOV(float fov, float time)
+{
+    // if it is less than 3, then we are setting an auto_fov state
+    if (fov < 3) {
+        auto_fov = fov;
+    } else {
+        // if we are explicitly setting the fov, turn the auto_fov off
+        auto_fov = 0;
 
-void Camera::Watch
-	(
-   Entity * ent,
-   float time
-	)
+        fovFadeTime      = time;
+        fovTime          = level.time + fovFadeTime;
+        currentstate.fov = newstate.fov;
+        newstate.fov     = fov;
+    }
+}
 
-	{
-   //
-   // clear out the watch variables
-   //
-   watchFadeTime = time;
-   newstate.watch.watchPath = false;
-   newstate.watch.watchNodes = false;
-   watchTime = level.time + watchFadeTime;
-   newstate.watch.watchEnt = ent;
-	}
+void Camera::WatchPathEvent(Event *ev)
+{
+    if (ev->NumArgs() > 1) {
+        watchFadeTime = ev->GetFloat(2);
+    } else {
+        watchFadeTime = fadeTime;
+    }
 
+    watchTime                 = level.time + watchFadeTime;
+    newstate.watch.watchEnt   = NULL;
+    newstate.watch.watchNodes = false;
+    newstate.watch.watchPath  = true;
+}
 
-void Camera::SetFOV
-	(
-   float fov,
-   float time
-	)
+void Camera::WatchNodesEvent(Event *ev)
+{
+    if (ev->NumArgs() > 1) {
+        watchFadeTime = ev->GetFloat(2);
+    } else {
+        watchFadeTime = fadeTime;
+    }
+    watchTime                 = level.time + watchFadeTime;
+    newstate.watch.watchEnt   = NULL;
+    newstate.watch.watchPath  = false;
+    newstate.watch.watchNodes = true;
+}
 
-	{
-   // if it is less than 3, then we are setting an auto_fov state
-   if ( fov < 3 )
-      {
-      auto_fov = fov;
-      }
-   else
-      {
-      // if we are explicitly setting the fov, turn the auto_fov off
-      auto_fov = 0;
+void Camera::NoWatchEvent(Event *ev)
+{
+    if (ev->NumArgs() > 1) {
+        watchFadeTime = ev->GetFloat(2);
+    } else {
+        watchFadeTime = fadeTime;
+    }
+    watchTime                 = level.time + watchFadeTime;
+    newstate.watch.watchEnt   = NULL;
+    newstate.watch.watchPath  = false;
+    newstate.watch.watchNodes = false;
+}
 
-      fovFadeTime = time;
-   	fovTime = level.time + fovFadeTime;
-      currentstate.fov = newstate.fov;
-      newstate.fov = fov;
-      }
-	}
+void SetCamera(Entity *ent, float switchTime)
+{
+    int        j;
+    gentity_t *other;
+    Camera    *cam;
+    Player    *client;
 
-void Camera::WatchPathEvent
-	(
-	Event *ev
-	)
+    if (ent && !ent->isSubclassOf(Camera)) {
+        return;
+    }
 
-	{
-   if ( ev->NumArgs() > 1 )
-      {
-      watchFadeTime = ev->GetFloat( 2 );
-      }
-   else
-      {
-      watchFadeTime = fadeTime;
-      }
+    cam = (Camera *)ent;
+    for (j = 0; j < game.maxclients; j++) {
+        other = &g_entities[j];
+        if (other->inuse && other->client) {
+            client = (Player *)other->entity;
+            client->SetCamera(cam, switchTime);
+        }
+    }
+}
 
-	watchTime = level.time + watchFadeTime;
-   newstate.watch.watchEnt = NULL;
-	newstate.watch.watchNodes = false;
-	newstate.watch.watchPath = true;
-	}
+str& Camera::NextCamera(void)
+{
+    return nextCamera;
+}
 
-void Camera::WatchNodesEvent
-	(
-	Event *ev
-	)
+float Camera::Fov(void)
+{
+    return camera_fov;
+}
 
-	{
-   if ( ev->NumArgs() > 1 )
-      {
-      watchFadeTime = ev->GetFloat( 2 );
-      }
-   else
-      {
-      watchFadeTime = fadeTime;
-      }
-	watchTime = level.time + watchFadeTime;
-   newstate.watch.watchEnt = NULL;
-	newstate.watch.watchPath = false;
-	newstate.watch.watchNodes = true;
-	}
+void Camera::Reset(Vector org, Vector ang)
+{
+    setOrigin(org);
+    setAngles(ang);
+    currentstate.Initialize(this);
+    newstate.Initialize(this);
+}
 
-void Camera::NoWatchEvent
-	(
-	Event *ev
-	)
+void Camera::bind(Entity *master, qboolean use_my_angles)
+{
+    Entity::bind(master, use_my_angles);
 
-	{
-   if ( ev->NumArgs() > 1 )
-      {
-      watchFadeTime = ev->GetFloat( 2 );
-      }
-   else
-      {
-      watchFadeTime = fadeTime;
-      }
-	watchTime = level.time + watchFadeTime;
-   newstate.watch.watchEnt = NULL;
-	newstate.watch.watchPath = false;
-	newstate.watch.watchNodes = false;
-	}
+    currentstate.move.pos = localorigin;
+}
 
-void SetCamera
-	(
-	Entity   *ent,
-   float    switchTime
-	)
-
-	{
-   int         j;
-   gentity_t   *other;
-   Camera      *cam;
-   Player      *client;
-
-   if ( ent && !ent->isSubclassOf( Camera ) )
-      {
-      return;
-      }
-
-   cam = ( Camera * )ent;
-	for( j = 0; j < game.maxclients; j++ )
-		{
-      other = &g_entities[ j ];
-		if ( other->inuse && other->client )
-			{
-         client = ( Player * )other->entity;
-         client->SetCamera( cam, switchTime );
-			}
-      }
-	}
-
-str &Camera::NextCamera
-	(
-   void
-	)
-
-	{
-   return nextCamera;
-	}
-
-float Camera::Fov
-	(
-   void
-	)
-
-	{
-   return camera_fov;
-	}
-
-void Camera::Reset
-   (
-   Vector org,
-   Vector ang
-   )
-
-   {
-   setOrigin( org );
-   setAngles( ang );
-   currentstate.Initialize( this );
-   newstate.Initialize( this );
-   }
-
-void Camera::bind
-	(
-	Entity *master,
-	qboolean use_my_angles
-	)
-
-	{
-   Entity::bind( master, use_my_angles );
-
-   currentstate.move.pos = localorigin;
-   }
-
-void Camera::unbind
-	(
-	void
-	)
-
-	{
-   Entity::unbind();
-
-   currentstate.move.pos = origin;
-	}
+void Camera::unbind(void)
+{
+    Entity::unbind();
 
+    currentstate.move.pos = origin;
+}
 
 /******************************************************************************
 
@@ -2303,1368 +1865,1131 @@ void Camera::unbind
 ******************************************************************************/
 
 Event EV_CameraManager_NewPath
-	( 
-	"new", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Starts a new path.",
-	EV_NORMAL
-	);
+(
+    "new",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Starts a new path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_SetPath
-	( 
-	"setpath", 
-	EV_CONSOLE,
-   "e",
-   "path",
-   "Sets the new path.",
-	EV_NORMAL
-	);
+(
+    "setpath",
+    EV_CONSOLE,
+    "e",
+    "path",
+    "Sets the new path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_SetTargetName
-	( 
-	"settargetname", 
-	EV_CONSOLE,
-   "s",
-   "targetname",
-   "Set the targetname.",
-	EV_NORMAL
-	);
+(
+    "settargetname",
+    EV_CONSOLE,
+    "s",
+    "targetname",
+    "Set the targetname.",
+    EV_NORMAL
+);
 Event EV_CameraManager_SetTarget
-	( 
-	"settarget", 
-	EV_CONSOLE,
-   "s",
-   "target",
-   "Set the trigger target.",
-	EV_NORMAL
-	);
+(
+    "settarget",
+    EV_CONSOLE,
+    "s",
+    "target",
+    "Set the trigger target.",
+    EV_NORMAL
+);
 Event EV_CameraManager_AddPoint
-	(
-	"add", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Add a new point to the camera path where the player is standing.",
-	EV_NORMAL
-	);
+(
+    "add",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Add a new point to the camera path where the player is standing.",
+    EV_NORMAL
+);
 Event EV_CameraManager_DeletePoint
-	( 
-	"delete", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Delete the current path node.",
-	EV_NORMAL
-	);
+(
+    "delete",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Delete the current path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_MovePlayer
-	( 
-	"moveplayer", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Move the player to the current path node position.",
-	EV_NORMAL
-	);
+(
+    "moveplayer",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Move the player to the current path node position.",
+    EV_NORMAL
+);
 Event EV_CameraManager_ReplacePoint
-	( 
-	"replace", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Replace the current path node position/angle with the player's.",
-	EV_NORMAL
-	);
+(
+    "replace",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Replace the current path node position/angle with the player's.",
+    EV_NORMAL
+);
 Event EV_CameraManager_NextPoint
-	( 
-	"next", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Go to the next path node.",
-	EV_NORMAL
-	);
+(
+    "next",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Go to the next path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_PreviousPoint
-	( 
-	"prev", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Go to the previous path node.",
-	EV_NORMAL
-	);
+(
+    "prev",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Go to the previous path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_ShowPath
-	( 
-	"show", 
-	EV_CONSOLE,
-   "E",
-   "path",
-   "Shows the specified path.",
-	EV_NORMAL
-	);
+(
+    "show",
+    EV_CONSOLE,
+    "E",
+    "path",
+    "Shows the specified path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_ShowingPath
-	( 
-	"_showing_path", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Internal event for showing the path.",
-	EV_NORMAL
-	);
+(
+    "_showing_path",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Internal event for showing the path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_HidePath
-	( 
-	"hide", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Hides the paths.",
-	EV_NORMAL
-	);
+(
+    "hide",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Hides the paths.",
+    EV_NORMAL
+);
 Event EV_CameraManager_PlayPath
-	( 
-	"play", 
-	EV_CONSOLE,
-   "E",
-   "path",
-   "Play the current path or the specified one once.",
-	EV_NORMAL
-	);
+(
+    "play",
+    EV_CONSOLE,
+    "E",
+    "path",
+    "Play the current path or the specified one once.",
+    EV_NORMAL
+);
 Event EV_CameraManager_LoopPath
-	( 
-	"loop", 
-	EV_CONSOLE,
-   "E",
-   "path",
-   "Loop the current path or the specified one.",
-	EV_NORMAL
-	);
+(
+    "loop",
+    EV_CONSOLE,
+    "E",
+    "path",
+    "Loop the current path or the specified one.",
+    EV_NORMAL
+);
 Event EV_CameraManager_StopPlayback
-	( 
-	"stop", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Stop the camera playing path.",
-	EV_NORMAL
-	);
+(
+    "stop",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Stop the camera playing path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_Watch
-	( 
-	"watch", 
-	EV_CONSOLE,
-   "s",
-   "watch",
-   "Set the current path node to watch something.",
-	EV_NORMAL
-	);
+(
+    "watch",
+    EV_CONSOLE,
+    "s",
+    "watch",
+    "Set the current path node to watch something.",
+    EV_NORMAL
+);
 Event EV_CameraManager_NoWatch
-	( 
-	"nowatch", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Set the current path node to watch nothing.",
-	EV_NORMAL
-	);
+(
+    "nowatch",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Set the current path node to watch nothing.",
+    EV_NORMAL
+);
 Event EV_CameraManager_Fov
-	( 
-	"setfov", 
-	EV_CONSOLE,
-   "s",
-   "newFOV",
-   "Set the fov at the current path node.",
-	EV_NORMAL
-	);
+(
+    "setfov",
+    EV_CONSOLE,
+    "s",
+    "newFOV",
+    "Set the fov at the current path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_FadeTime
-	( 
-	"setfadetime", 
-	EV_CONSOLE,
-   "f",
-   "newFadeTime",
-   "Set the fadetime of the current path node.",
-	EV_NORMAL
-	);
+(
+    "setfadetime",
+    EV_CONSOLE,
+    "f",
+    "newFadeTime",
+    "Set the fadetime of the current path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_Speed
-	( 
-	"setspeed", 
-	EV_CONSOLE,
-   "f",
-   "speed",
-   "Set the speed of the camera at the current path node.",
-	EV_NORMAL
-	);
+(
+    "setspeed",
+    EV_CONSOLE,
+    "f",
+    "speed",
+    "Set the speed of the camera at the current path node.",
+    EV_NORMAL
+);
 Event EV_CameraManager_Save
-	( 
-	"save", 
-	EV_CONSOLE,
-   "s",
-   "filename",
-   "Saves the camera path.",
-	EV_NORMAL
-	);
+(
+    "save",
+    EV_CONSOLE,
+    "s",
+    "filename",
+    "Saves the camera path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_Load
-	( 
-	"load", 
-	EV_CONSOLE,
-   "s",
-   "filename",
-   "Loads a camera path.",
-	EV_NORMAL
-	);
+(
+    "load",
+    EV_CONSOLE,
+    "s",
+    "filename",
+    "Loads a camera path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_SaveMap
-	( 
-	"savemap", 
-	EV_CONSOLE,
-   "s",
-   "filename",
-   "Saves the camera path to a map file.",
-	EV_NORMAL
-	);
+(
+    "savemap",
+    EV_CONSOLE,
+    "s",
+    "filename",
+    "Saves the camera path to a map file.",
+    EV_NORMAL
+);
 Event EV_CameraManager_UpdateInput
-	( 
-	"updateinput", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Updates the current node with user interface values.",
-	EV_NORMAL
-	);
+(
+    "updateinput",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Updates the current node with user interface values.",
+    EV_NORMAL
+);
 
 Event EV_CameraManager_NextPath
-	( 
-	"nextpath", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Go to the next path.",
-	EV_NORMAL
-	);
+(
+    "nextpath",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Go to the next path.",
+    EV_NORMAL
+);
 Event EV_CameraManager_PreviousPath
-	( 
-	"prevpath", 
-	EV_CONSOLE,
-   NULL,
-   NULL,
-   "Go to the previous path.",
-	EV_NORMAL
-	);
+(
+    "prevpath",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Go to the previous path.",
+    EV_NORMAL
+);
 
 Event EV_CameraManager_RenamePath
-	( 
-	"renamepath", 
-	EV_CONSOLE,
-   "s",
-   "newName",
-   "Rename the path to the new name.",
-	EV_NORMAL
-	);
+(
+    "renamepath",
+    EV_CONSOLE,
+    "s",
+    "newName",
+    "Rename the path to the new name.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Listener, CameraManager, NULL )
-	{
-      { &EV_CameraManager_NewPath,			&CameraManager::NewPath },
-      { &EV_CameraManager_SetPath,			&CameraManager::SetPath },
-      { &EV_CameraManager_SetTargetName,	&CameraManager::SetTargetName },
-      { &EV_CameraManager_SetTarget,		&CameraManager::SetTarget },
-      { &EV_CameraManager_SetPath,			&CameraManager::SetPath },
-      { &EV_CameraManager_AddPoint,			&CameraManager::AddPoint },
-      { &EV_CameraManager_ReplacePoint,		&CameraManager::ReplacePoint },
-      { &EV_CameraManager_DeletePoint,		&CameraManager::DeletePoint },
-      { &EV_CameraManager_MovePlayer,		&CameraManager::MovePlayer },
-      { &EV_CameraManager_NextPoint,		&CameraManager::NextPoint },
-      { &EV_CameraManager_PreviousPoint,	&CameraManager::PreviousPoint },
-      { &EV_CameraManager_ShowPath,			&CameraManager::ShowPath },
-      { &EV_CameraManager_ShowingPath,		&CameraManager::ShowingPath },
-      { &EV_CameraManager_HidePath,			&CameraManager::HidePath },
-      { &EV_CameraManager_PlayPath,			&CameraManager::PlayPath },
-      { &EV_CameraManager_LoopPath,			&CameraManager::LoopPath },
-      { &EV_CameraManager_StopPlayback,		&CameraManager::StopPlayback },
-      { &EV_CameraManager_Watch,			&CameraManager::Watch },
-      { &EV_CameraManager_NoWatch,			&CameraManager::NoWatch },
-      { &EV_CameraManager_Fov,				&CameraManager::Fov },
-      { &EV_CameraManager_FadeTime,			&CameraManager::FadeTime },
-      { &EV_CameraManager_Speed,			&CameraManager::Speed },
-      { &EV_CameraManager_Save,				&CameraManager::Save },
-      { &EV_CameraManager_Load,				&CameraManager::Load },
-      { &EV_CameraManager_SaveMap,			&CameraManager::SaveMap },
-      { &EV_CameraManager_UpdateInput,		&CameraManager::UpdateEvent },
-      { &EV_CameraManager_NextPath,			&CameraManager::NextPath },
-      { &EV_CameraManager_PreviousPath,		&CameraManager::PreviousPath },
-      { &EV_CameraManager_RenamePath,		&CameraManager::RenamePath },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Listener, CameraManager, NULL) {
+    {&EV_CameraManager_NewPath,       &CameraManager::NewPath      },
+    {&EV_CameraManager_SetPath,       &CameraManager::SetPath      },
+    {&EV_CameraManager_SetTargetName, &CameraManager::SetTargetName},
+    {&EV_CameraManager_SetTarget,     &CameraManager::SetTarget    },
+    {&EV_CameraManager_SetPath,       &CameraManager::SetPath      },
+    {&EV_CameraManager_AddPoint,      &CameraManager::AddPoint     },
+    {&EV_CameraManager_ReplacePoint,  &CameraManager::ReplacePoint },
+    {&EV_CameraManager_DeletePoint,   &CameraManager::DeletePoint  },
+    {&EV_CameraManager_MovePlayer,    &CameraManager::MovePlayer   },
+    {&EV_CameraManager_NextPoint,     &CameraManager::NextPoint    },
+    {&EV_CameraManager_PreviousPoint, &CameraManager::PreviousPoint},
+    {&EV_CameraManager_ShowPath,      &CameraManager::ShowPath     },
+    {&EV_CameraManager_ShowingPath,   &CameraManager::ShowingPath  },
+    {&EV_CameraManager_HidePath,      &CameraManager::HidePath     },
+    {&EV_CameraManager_PlayPath,      &CameraManager::PlayPath     },
+    {&EV_CameraManager_LoopPath,      &CameraManager::LoopPath     },
+    {&EV_CameraManager_StopPlayback,  &CameraManager::StopPlayback },
+    {&EV_CameraManager_Watch,         &CameraManager::Watch        },
+    {&EV_CameraManager_NoWatch,       &CameraManager::NoWatch      },
+    {&EV_CameraManager_Fov,           &CameraManager::Fov          },
+    {&EV_CameraManager_FadeTime,      &CameraManager::FadeTime     },
+    {&EV_CameraManager_Speed,         &CameraManager::Speed        },
+    {&EV_CameraManager_Save,          &CameraManager::Save         },
+    {&EV_CameraManager_Load,          &CameraManager::Load         },
+    {&EV_CameraManager_SaveMap,       &CameraManager::SaveMap      },
+    {&EV_CameraManager_UpdateInput,   &CameraManager::UpdateEvent  },
+    {&EV_CameraManager_NextPath,      &CameraManager::NextPath     },
+    {&EV_CameraManager_PreviousPath,  &CameraManager::PreviousPath },
+    {&EV_CameraManager_RenamePath,    &CameraManager::RenamePath   },
+    {NULL,                            NULL                         }
+};
 
-Player *CameraManager_GetPlayer
-   (
-   void
-   )
+Player *CameraManager_GetPlayer(void)
+{
+    assert(g_entities[0].entity && g_entities[0].entity->isSubclassOf(Player));
+    if (!g_entities[0].entity || !(g_entities[0].entity->isSubclassOf(Player))) {
+        gi.Printf("No player found.\n");
+        return NULL;
+    }
 
-   {
-   assert( g_entities[ 0 ].entity && g_entities[ 0 ].entity->isSubclassOf( Player ) );
-   if ( !g_entities[ 0 ].entity || !( g_entities[ 0 ].entity->isSubclassOf( Player ) ) )
-      {
-      gi.Printf( "No player found.\n" );
-      return NULL;
-      }
-
-   return ( Player * )g_entities[ 0 ].entity;
-   }
+    return (Player *)g_entities[0].entity;
+}
 
 CameraManager::CameraManager()
-   {
-   pathList.ClearObjectList();
-   path = NULL;
-   current = NULL;
-   cameraPath_dirty = qtrue;
-   speed = 1;
-   watch = 0;
-   cam = NULL;
-   }
-
-void CameraManager::UpdateUI
-   (
-   void
-   )
-   {
-   int   num;
-   SplinePath *next;
-   float temp;
-
-   //
-   // set path name
-   //
-   gi.cvar_set( "cam_filename", pathName );
-   if ( current )
-      {
-
-      gi.cvar_set( "cam_origin", va( "%.2f %.2f %.2f", current->origin[ 0 ], current->origin[ 1 ], current->origin[ 2 ] ) );
-      gi.cvar_set( "cam_angles_yaw", va( "%.1f", current->angles[ YAW ] ) );
-      gi.cvar_set( "cam_angles_pitch", va( "%.1f", current->angles[ PITCH ] ) );
-      gi.cvar_set( "cam_angles_roll", va( "%.1f", current->angles[ ROLL ] ) );
-      gi.cvar_set( "cam_thread", current->thread.c_str() );
-      gi.cvar_set( "cam_target", current->triggertarget.c_str() );
-      gi.cvar_set( "cam_watch", current->watchEnt.c_str() );
-      temp = current->GetFov();
-      if ( temp )
-         {
-         gi.cvar_set( "cam_fov", va( "%.1f", temp ) );
-         }
-      else
-         {
-         gi.cvar_set( "cam_fov", "Default" );
-         }
-      temp = current->GetFadeTime();
-      if ( temp != -1 )
-         {
-         gi.cvar_set( "cam_fadetime", va( "%.2f", temp ) );
-         }
-      else
-         {
-         gi.cvar_set( "cam_fadetime", "Default" );
-         }
-      gi.cvar_set( "cam_speed", va( "%.1f", current->speed ) );
-
-      //
-      // set node num
-      //
-      num = 0;
-      next = path;
-      while ( next && ( next != current ) )
-         {
-         next = next->GetNext();
-         num++;
-         }
-      gi.cvar_set( "cam_nodenum", va( "%d", num ) );
-      }
-   }
-
-void CameraManager::UpdateEvent
-   (
-   Event *ev
-   )
-   {
-   Vector tempvec;
-   cvar_t * cvar;
-
-   if ( !current )
-      {
-      return;
-      }
-
-   // get origin
-   cvar = gi.Cvar_Get( "cam_origin", "", 0 );
-   sscanf( cvar->string, "%f %f %f", &tempvec[ 0 ], &tempvec[ 1 ], &tempvec[ 2 ] );
-   current->setOrigin( tempvec );
-
-   // get angles yaw
-   cvar = gi.Cvar_Get( "cam_angles_yaw", "", 0 );
-   current->angles[ YAW ] = cvar->value;
-
-   // get angles pitch
-   cvar = gi.Cvar_Get( "cam_angles_pitch", "", 0 );
-   current->angles[ PITCH ] = cvar->value;
-
-   // get angles roll
-   cvar = gi.Cvar_Get( "cam_angles_roll", "", 0 );
-   current->angles[ ROLL ] = cvar->value;
-
-   current->setAngles( current->angles );
-
-   // get target
-   cvar = gi.Cvar_Get( "cam_target", "", 0 );
-   current->SetTriggerTarget( cvar->string );
-
-   // get watch
-   cvar = gi.Cvar_Get( "cam_watch", "", 0 );
-   current->SetWatch( cvar->string );
-
-   // get fov
-   cvar = gi.Cvar_Get( "cam_fov", "", 0 );
-   current->SetFov( cvar->value );
-
-   // get fadetime
-   cvar = gi.Cvar_Get( "cam_fadetime", "", 0 );
-   current->SetFadeTime( cvar->value );
-
-   // get speed
-   cvar = gi.Cvar_Get( "cam_speed", "", 0 );
-   current->speed = cvar->value;
-   }
-
-void CameraManager::SetPathName
-   (
-   str name
-   )
-
-   {
-   pathName = name;
-   UpdateUI();
-   }
-
-void CameraManager::NewPath
-   (
-   Event *ev
-   )
-
-   {
-   if ( path )
-      {
-      cameraPath_dirty = qtrue;
-      path = NULL;
-      current = NULL;
-      }
-   SetPathName( "untitled" );
-   ShowPath();
-   }
-
-void CameraManager::RenamePath
-   (
-   Event *ev
-   )
-
-   {
-   str name;
-
-   if ( !ev->NumArgs() )
-      {
-      cvar_t * cvar;
-
-      //
-      // get the path name from the cvar
-      //
-      cvar = gi.Cvar_Get( "cam_filename", "", 0 );
-      if ( cvar->string[ 0 ] )
-         {
-         name = cvar->string;
-         }
-      else
-         {
-         ScriptError( "Usage: cam renamepath [pathname]" );
-	   	return;
-         }
-      }
-   else
-      {
-      name = ev->GetString( 1 );
-      }
-
-   if ( pathList.ObjectInList( name ) )
-      {
-      // remove the old name
-      pathList.RemoveObject( name );
-      }
-   SetPathName( name );
-   pathList.AddUniqueObject( name );
-   }
-
-void CameraManager::SetPath
-   (
-   str      pathName
-   )
-
-   {
-   Entity * ent;
-   SplinePath *node;
-
-   ent = ( Entity * )G_FindTarget( NULL, pathName );
-
-   if ( !ent )
-      {
-      warning( "SetPath", "Could not find path named '%s'.", pathName.c_str() );
-      return;
-      }
-
-   if ( !ent->isSubclassOf( SplinePath ) )
-      {
-      warning( "SetPath", "'%s' is not a camera path.", pathName.c_str() );
-      return;
-      }
-   node = ( SplinePath * )ent;
-
-   SetPathName( pathName );
-   cameraPath_dirty = qtrue;
-   path = node;
-   current = node;
-   UpdateUI();
-   }
-
-void CameraManager::SetPath
-   (
-   Event *ev
-   )
-
-   {
-   if ( !ev->NumArgs() )
-      {
-      ScriptError( "Usage: cam setpath [pathname]" );
-      return;
-      }
-
-   SetPath( ev->GetString( 1 ) );
-   }
-
-void CameraManager::SetTargetName
-   (
-   Event *ev
-   )
-
-   {
-	if ( ev->NumArgs() != 1 )
-		{
-      ScriptError( "Usage: cam targetname [name]" );
-		return;
-		}
-
-   if ( !path )
-      {
-      ScriptError( "Camera path not set." );
-      return;
-      }
-
-   path->SetTargetName( ev->GetString( 1 ) );
-   UpdateUI();
-   }
-
-void CameraManager::SetTarget
-   (
-   Event *ev
-   )
-
-   {
-	if ( ev->NumArgs() != 1 )
-		{
-      ScriptError( "Usage: cam target [name]" );
-		return;
-		}
-
-   if ( !current )
-      {
-      ScriptError( "Camera path not set." );
-      return;
-      }
-
-   current->SetTriggerTarget( ev->GetString( 1 ) );
-   UpdateUI();
-   }
-
-void CameraManager::AddPoint
-   (
-   Event *ev
-   )
-
-   {
-   Player *player;
-   SplinePath *prev;
-   SplinePath *next;
-   Vector ang;
-   Vector pos;
-
-   player = CameraManager_GetPlayer();
-   if ( player )
-      {
-      prev = current;
-      if ( current )
-         {
-         next = current->GetNext();
-         }
-      else
-         {
-         next = NULL;
-         }
-
-      player->GetPlayerView( &pos, &ang );
-
-      current = new SplinePath;
-      current->setOrigin( pos );
-      current->setAngles( ang );
-      current->speed = speed;
-      current->SetPrev( prev );
-      current->SetNext( next );
-
-      if ( !path )
-         {
-         path = current;
-         }
-
-      ShowPath();
-      }
-   cameraPath_dirty = qtrue;
-   UpdateUI();
-   }
-
-void CameraManager::ReplacePoint
-   (
-   Event *ev
-   )
-
-   {
-   Player *player;
-   Vector ang;
-   Vector pos;
-
-   player = CameraManager_GetPlayer();
-   if ( current && player )
-      {
-      player->GetPlayerView( &pos, &ang );
-
-      current->setOrigin( pos );
-      current->setAngles( ang );
-      current->speed = speed;
-      }
-   cameraPath_dirty = qtrue;
-   UpdateUI();
-   }
-
-void CameraManager::DeletePoint
-   (
-   Event *ev
-   )
-
-   {
-   SplinePath *node;
-
-   if ( current )
-      {
-      node = current->GetNext();
-      if ( !node )
-         {
-         node = current->GetPrev();
-         }
-
-      if ( ( SplinePath * )path == ( SplinePath * )current )
-         {
-         path = current->GetNext();
-         }
-
-      delete current;
-      current = node;
-      }
-   cameraPath_dirty = qtrue;
-   UpdateUI();
-   }
-
-void CameraManager::MovePlayer
-   (
-   Event *ev
-   )
-
-   {
-   Player *player;
-   Vector pos;
-
-   player = CameraManager_GetPlayer();
-   if ( current && player )
-      {
-      player->GetPlayerView( &pos, NULL );
-
-      player->setOrigin( current->origin - pos + player->origin );
-      player->SetViewAngles( current->angles );
-      player->SetFov( current->fov );
-      }
-   }
-
-void CameraManager::NextPoint
-   (
-   Event *ev
-   )
-
-   {
-   SplinePath *next;
-
-   if ( current )
-      {
-      next = current->GetNext();
-      if ( next )
-         {
-         current = next;
-         }
-      }
-   UpdateUI();
-   }
-
-void CameraManager::PreviousPoint
-   (
-   Event *ev
-   )
-
-   {
-   SplinePath *prev;
-
-   if ( current )
-      {
-      prev = current->GetPrev();
-      if ( prev )
-         {
-         current = prev;
-         }
-      }
-   UpdateUI();
-   }
-
-void CameraManager::NextPath
-   (
-   Event *ev
-   )
-
-   {
-   int index;
-
-   //
-   // find current path in container of paths
-   //
-   index = pathList.IndexOfObject( pathName );
-   if ( index < pathList.NumObjects() )
-      index++;
-
-   if ( index > 0 )
-      {
-      SetPath( pathList.ObjectAt( index ) );
-      UpdateUI();
-      }
-   }
-
-void CameraManager::PreviousPath
-   (
-   Event *ev
-   )
-
-   {
-   int index;
-
-   //
-   // find current path in container of paths
-   //
-   index = pathList.IndexOfObject( pathName );
-   if ( index > 1 )
-      index--;
-
-   if ( index > 0 )
-      {
-      SetPath( pathList.ObjectAt( index ) );
-      UpdateUI();
-      }
-   }
-
-void CameraManager::ShowingPath
-   (
-   Event *ev
-   )
-
-   {
-   int        count;
-   SplinePath *node;
-   SplinePath *prev;
-   Vector mins( -8, -8, -8 );
-   Vector maxs( 8, 8, 8 );
-
-   prev = NULL;
-   for( node = path; node != NULL; node = node->GetNext() )
-      {
-      if ( prev )
-         {
-         G_LineStipple( 4, ( unsigned short )( 0xF0F0F0F0 >> ( 7 - ( level.framenum & 7 ) ) ) );
-         G_DebugLine( prev->origin, node->origin, 0.4f, 0.4f, 0.4f, 0.1f );
-         G_LineStipple( 1, 0xffff );
-         }
-
-      if ( current == node )
-         {
-         G_DrawDebugNumber( node->origin + Vector( 0, 0, 20 ), node->speed, 0.5, 0, 1, 0, 1 );
-         if ( current->GetFov() )
-            G_DrawDebugNumber( node->origin + Vector( 0, 0, 30 ), node->GetFov(), 0.5, 0, 0, 1, 0 );
-         G_DebugBBox( node->origin, mins, maxs, 1, 1, 0, 1 );
-         }
-      else
-         {
-         G_DebugBBox( node->origin, mins, maxs, 1, 0, 0, 1 );
-         }
-
-      // 
-      // draw watch
-      //
-      if ( node->doWatch )
-         {
-         Entity *watchEnt;
-         Vector ang;
-         Vector delta;
-         Vector left;
-         Vector up;
-         Vector endpoint;
-
-         watchEnt = GetWatchEntity( node->GetWatch() );
-         if ( watchEnt )
-            {
-            delta.x = watchEnt->origin.x;
-            delta.y = watchEnt->origin.y;
-	         delta.z = watchEnt->absmax.z;
-            delta -= node->origin;
-            delta.normalize();
-		      ang = delta.toAngles();
-            ang.AngleVectors( NULL, &left, &up );
-
-            G_LineWidth( 1 );
-            endpoint = node->origin + delta * 48;
-            G_DebugLine( node->origin, endpoint, 0.5, 1, 1, 1 );
-            G_DebugLine( endpoint, endpoint + (left * 8) - (delta * 8), 0.5, 1, 1, 1 );
-            G_DebugLine( endpoint, endpoint - (left * 8) - (delta * 8), 0.5, 1, 1, 1 );
-            G_DebugLine( endpoint, endpoint - (up * 8) - (delta * 8), 0.5, 1, 1, 1 );
-            G_DebugLine( endpoint, endpoint + (up * 8) - (delta * 8), 0.5, 1, 1, 1 );
+{
+    pathList.ClearObjectList();
+    path             = NULL;
+    current          = NULL;
+    cameraPath_dirty = qtrue;
+    speed            = 1;
+    watch            = 0;
+    cam              = NULL;
+}
+
+void CameraManager::UpdateUI(void)
+{
+    int         num;
+    SplinePath *next;
+    float       temp;
+
+    //
+    // set path name
+    //
+    gi.cvar_set("cam_filename", pathName);
+    if (current) {
+        gi.cvar_set("cam_origin", va("%.2f %.2f %.2f", current->origin[0], current->origin[1], current->origin[2]));
+        gi.cvar_set("cam_angles_yaw", va("%.1f", current->angles[YAW]));
+        gi.cvar_set("cam_angles_pitch", va("%.1f", current->angles[PITCH]));
+        gi.cvar_set("cam_angles_roll", va("%.1f", current->angles[ROLL]));
+        gi.cvar_set("cam_thread", current->thread.c_str());
+        gi.cvar_set("cam_target", current->triggertarget.c_str());
+        gi.cvar_set("cam_watch", current->watchEnt.c_str());
+        temp = current->GetFov();
+        if (temp) {
+            gi.cvar_set("cam_fov", va("%.1f", temp));
+        } else {
+            gi.cvar_set("cam_fov", "Default");
+        }
+        temp = current->GetFadeTime();
+        if (temp != -1) {
+            gi.cvar_set("cam_fadetime", va("%.2f", temp));
+        } else {
+            gi.cvar_set("cam_fadetime", "Default");
+        }
+        gi.cvar_set("cam_speed", va("%.1f", current->speed));
+
+        //
+        // set node num
+        //
+        num  = 0;
+        next = path;
+        while (next && (next != current)) {
+            next = next->GetNext();
+            num++;
+        }
+        gi.cvar_set("cam_nodenum", va("%d", num));
+    }
+}
+
+void CameraManager::UpdateEvent(Event *ev)
+{
+    Vector  tempvec;
+    cvar_t *cvar;
+
+    if (!current) {
+        return;
+    }
+
+    // get origin
+    cvar = gi.Cvar_Get("cam_origin", "", 0);
+    sscanf(cvar->string, "%f %f %f", &tempvec[0], &tempvec[1], &tempvec[2]);
+    current->setOrigin(tempvec);
+
+    // get angles yaw
+    cvar                 = gi.Cvar_Get("cam_angles_yaw", "", 0);
+    current->angles[YAW] = cvar->value;
+
+    // get angles pitch
+    cvar                   = gi.Cvar_Get("cam_angles_pitch", "", 0);
+    current->angles[PITCH] = cvar->value;
+
+    // get angles roll
+    cvar                  = gi.Cvar_Get("cam_angles_roll", "", 0);
+    current->angles[ROLL] = cvar->value;
+
+    current->setAngles(current->angles);
+
+    // get target
+    cvar = gi.Cvar_Get("cam_target", "", 0);
+    current->SetTriggerTarget(cvar->string);
+
+    // get watch
+    cvar = gi.Cvar_Get("cam_watch", "", 0);
+    current->SetWatch(cvar->string);
+
+    // get fov
+    cvar = gi.Cvar_Get("cam_fov", "", 0);
+    current->SetFov(cvar->value);
+
+    // get fadetime
+    cvar = gi.Cvar_Get("cam_fadetime", "", 0);
+    current->SetFadeTime(cvar->value);
+
+    // get speed
+    cvar           = gi.Cvar_Get("cam_speed", "", 0);
+    current->speed = cvar->value;
+}
+
+void CameraManager::SetPathName(str name)
+{
+    pathName = name;
+    UpdateUI();
+}
+
+void CameraManager::NewPath(Event *ev)
+{
+    if (path) {
+        cameraPath_dirty = qtrue;
+        path             = NULL;
+        current          = NULL;
+    }
+    SetPathName("untitled");
+    ShowPath();
+}
+
+void CameraManager::RenamePath(Event *ev)
+{
+    str name;
+
+    if (!ev->NumArgs()) {
+        cvar_t *cvar;
+
+        //
+        // get the path name from the cvar
+        //
+        cvar = gi.Cvar_Get("cam_filename", "", 0);
+        if (cvar->string[0]) {
+            name = cvar->string;
+        } else {
+            ScriptError("Usage: cam renamepath [pathname]");
+            return;
+        }
+    } else {
+        name = ev->GetString(1);
+    }
+
+    if (pathList.ObjectInList(name)) {
+        // remove the old name
+        pathList.RemoveObject(name);
+    }
+    SetPathName(name);
+    pathList.AddUniqueObject(name);
+}
+
+void CameraManager::SetPath(str pathName)
+{
+    Entity     *ent;
+    SplinePath *node;
+
+    ent = (Entity *)G_FindTarget(NULL, pathName);
+
+    if (!ent) {
+        warning("SetPath", "Could not find path named '%s'.", pathName.c_str());
+        return;
+    }
+
+    if (!ent->isSubclassOf(SplinePath)) {
+        warning("SetPath", "'%s' is not a camera path.", pathName.c_str());
+        return;
+    }
+    node = (SplinePath *)ent;
+
+    SetPathName(pathName);
+    cameraPath_dirty = qtrue;
+    path             = node;
+    current          = node;
+    UpdateUI();
+}
+
+void CameraManager::SetPath(Event *ev)
+{
+    if (!ev->NumArgs()) {
+        ScriptError("Usage: cam setpath [pathname]");
+        return;
+    }
+
+    SetPath(ev->GetString(1));
+}
+
+void CameraManager::SetTargetName(Event *ev)
+{
+    if (ev->NumArgs() != 1) {
+        ScriptError("Usage: cam targetname [name]");
+        return;
+    }
+
+    if (!path) {
+        ScriptError("Camera path not set.");
+        return;
+    }
+
+    path->SetTargetName(ev->GetString(1));
+    UpdateUI();
+}
+
+void CameraManager::SetTarget(Event *ev)
+{
+    if (ev->NumArgs() != 1) {
+        ScriptError("Usage: cam target [name]");
+        return;
+    }
+
+    if (!current) {
+        ScriptError("Camera path not set.");
+        return;
+    }
+
+    current->SetTriggerTarget(ev->GetString(1));
+    UpdateUI();
+}
+
+void CameraManager::AddPoint(Event *ev)
+{
+    Player     *player;
+    SplinePath *prev;
+    SplinePath *next;
+    Vector      ang;
+    Vector      pos;
+
+    player = CameraManager_GetPlayer();
+    if (player) {
+        prev = current;
+        if (current) {
+            next = current->GetNext();
+        } else {
+            next = NULL;
+        }
+
+        player->GetPlayerView(&pos, &ang);
+
+        current = new SplinePath;
+        current->setOrigin(pos);
+        current->setAngles(ang);
+        current->speed = speed;
+        current->SetPrev(prev);
+        current->SetNext(next);
+
+        if (!path) {
+            path = current;
+        }
+
+        ShowPath();
+    }
+    cameraPath_dirty = qtrue;
+    UpdateUI();
+}
+
+void CameraManager::ReplacePoint(Event *ev)
+{
+    Player *player;
+    Vector  ang;
+    Vector  pos;
+
+    player = CameraManager_GetPlayer();
+    if (current && player) {
+        player->GetPlayerView(&pos, &ang);
+
+        current->setOrigin(pos);
+        current->setAngles(ang);
+        current->speed = speed;
+    }
+    cameraPath_dirty = qtrue;
+    UpdateUI();
+}
+
+void CameraManager::DeletePoint(Event *ev)
+{
+    SplinePath *node;
+
+    if (current) {
+        node = current->GetNext();
+        if (!node) {
+            node = current->GetPrev();
+        }
+
+        if ((SplinePath *)path == (SplinePath *)current) {
+            path = current->GetNext();
+        }
+
+        delete current;
+        current = node;
+    }
+    cameraPath_dirty = qtrue;
+    UpdateUI();
+}
+
+void CameraManager::MovePlayer(Event *ev)
+{
+    Player *player;
+    Vector  pos;
+
+    player = CameraManager_GetPlayer();
+    if (current && player) {
+        player->GetPlayerView(&pos, NULL);
+
+        player->setOrigin(current->origin - pos + player->origin);
+        player->SetViewAngles(current->angles);
+        player->SetFov(current->fov);
+    }
+}
+
+void CameraManager::NextPoint(Event *ev)
+{
+    SplinePath *next;
+
+    if (current) {
+        next = current->GetNext();
+        if (next) {
+            current = next;
+        }
+    }
+    UpdateUI();
+}
+
+void CameraManager::PreviousPoint(Event *ev)
+{
+    SplinePath *prev;
+
+    if (current) {
+        prev = current->GetPrev();
+        if (prev) {
+            current = prev;
+        }
+    }
+    UpdateUI();
+}
+
+void CameraManager::NextPath(Event *ev)
+{
+    int index;
+
+    //
+    // find current path in container of paths
+    //
+    index = pathList.IndexOfObject(pathName);
+    if (index < pathList.NumObjects()) {
+        index++;
+    }
+
+    if (index > 0) {
+        SetPath(pathList.ObjectAt(index));
+        UpdateUI();
+    }
+}
+
+void CameraManager::PreviousPath(Event *ev)
+{
+    int index;
+
+    //
+    // find current path in container of paths
+    //
+    index = pathList.IndexOfObject(pathName);
+    if (index > 1) {
+        index--;
+    }
+
+    if (index > 0) {
+        SetPath(pathList.ObjectAt(index));
+        UpdateUI();
+    }
+}
+
+void CameraManager::ShowingPath(Event *ev)
+{
+    int         count;
+    SplinePath *node;
+    SplinePath *prev;
+    Vector      mins(-8, -8, -8);
+    Vector      maxs(8, 8, 8);
+
+    prev = NULL;
+    for (node = path; node != NULL; node = node->GetNext()) {
+        if (prev) {
+            G_LineStipple(4, (unsigned short)(0xF0F0F0F0 >> (7 - (level.framenum & 7))));
+            G_DebugLine(prev->origin, node->origin, 0.4f, 0.4f, 0.4f, 0.1f);
+            G_LineStipple(1, 0xffff);
+        }
+
+        if (current == node) {
+            G_DrawDebugNumber(node->origin + Vector(0, 0, 20), node->speed, 0.5, 0, 1, 0, 1);
+            if (current->GetFov()) {
+                G_DrawDebugNumber(node->origin + Vector(0, 0, 30), node->GetFov(), 0.5, 0, 0, 1, 0);
             }
-         }
-
-      G_LineWidth( 3 );
-      G_DebugLine( node->origin, node->origin + Vector( node->orientation[ 0 ] ) * 16, 1, 0, 0, 1 );
-      G_DebugLine( node->origin, node->origin + Vector( node->orientation[ 1 ] ) * 16, 0, 1, 0, 1 );
-      G_DebugLine( node->origin, node->origin + Vector( node->orientation[ 2 ] ) * 16, 0, 0, 1, 1 );
-      G_LineWidth( 1 );
-
-      prev = node;
-      }
-
-   if ( cameraPath_dirty )
-      {
-      cameraPath_dirty = qfalse;
-	   cameraPath.Clear();
-	   cameraPath.SetType( SPLINE_CLAMP );
-
-	   node = path;
-	   while( node != NULL )
-		   {
-         cameraPath.AppendControlPoint( node->origin, node->angles, node->speed );
-		   node = node->GetNext();
-
-		   if ( node == path )
-			   {
-			   break;
-			   }
-		   }
-	   }
-
-   // draw the curve itself
-	G_Color3f( 1, 1, 0 );
-   cameraPath.DrawCurve( 10 );
-
-   // draw all the nodes
-   for( node = path, count = -1; node != NULL; node = node->GetNext(), count++ )
-      {
-      Vector dir, angles;
-
-      dir = cameraPath.Eval( ( float )count - 0.9f ) - cameraPath.Eval( count - 1 );
-      angles = dir.toAngles();
-      if ( node->doWatch || node->GetFov() || ( node->thread != "" ) || ( node->triggertarget != "" ) )
-         {
-         G_DebugOrientedCircle( cameraPath.Eval( count - 1 ), 5, 0, 1, 1, 1, angles );
-         }
-      else
-         {
-         G_DebugOrientedCircle( cameraPath.Eval( count - 1 ), 2, 0, 0, 1, 0.2f, angles );
-         }
-      // if we are the first node, we need to skip the count so that we properly go to the next node
-      if ( count == -1 )
-         {
-         count = 0;
-         }
-      }
-
-
-   PostEvent( EV_CameraManager_ShowingPath, FRAMETIME );
-   }
-
-void CameraManager::ShowPath
-   (
-   void
-   )
-
-   {
-   CancelEventsOfType( EV_CameraManager_ShowingPath );
-   PostEvent( EV_CameraManager_ShowingPath, FRAMETIME );
-   UpdateUI();
-   }
-
-void CameraManager::ShowPath
-   (
-   Event *ev
-   )
-
-   {
-   if ( ev->NumArgs() )
-      {
-      SetPath( ev->GetString( 1 ) );
-      }
-   ShowPath();
-   }
-
-void CameraManager::HidePath
-   (
-   Event *ev
-   )
-
-   {
-   CancelEventsOfType( EV_CameraManager_ShowingPath );
-   UpdateUI();
-   }
-
-void CameraManager::StopPlayback
-   (
-   Event *ev
-   )
-
-   {
-   if ( cam )
-      {
-      cam->Stop();
-      SetCamera( NULL, 0 );
-      }
-   }
-
-void CameraManager::PlayPath
-   (
-   Event *ev
-   )
-
-   {
-   if ( cam )
-      {
-      SetCamera( NULL, 0 );
-      }
-
-   if ( ev->NumArgs() )
-      {
-      SetPath( ev->GetString( 1 ) );
-      }
-
-   if ( path )
-      {
-      if ( !cam )
-         {
-         cam = new Camera;
-         cam->SetTargetName( "_loadedcamera" );
-         cam->ProcessPendingEvents();
-         }
-      
-      cam->Reset( path->origin, path->angles );
-      cam->FollowPath( path, false, NULL );
-      cam->Cut( NULL );
-      SetCamera( cam, 0 );
-      }
-   }
-
-void CameraManager::LoopPath
-   (
-   Event *ev
-   )
-
-   {
-   if ( cam )
-      {
-      SetCamera( NULL, 0 );
-      }
-
-   if ( ev->NumArgs() )
-      {
-      SetPath( ev->GetString( 1 ) );
-      }
-
-   if ( path )
-      {
-      if ( !cam )
-         {
-         cam = new Camera;
-         cam->SetTargetName( "_loadedcamera" );
-         cam->ProcessPendingEvents();
-         }
-
-      cam->Reset( path->origin, path->angles );
-      cam->FollowPath( path, true, NULL );
-      cam->Cut( NULL );
-      SetCamera( cam, 0 );
-      }
-   }
-
-void CameraManager::Watch
-   (
-   Event *ev
-   )
-
-   {
-   if ( current )
-      {
-      current->SetWatch( ev->GetString( 1 ) );
-      }
-   UpdateUI();
-   }
-
-void CameraManager::NoWatch
-   (
-   Event *ev
-   )
-
-   {
-   if ( current )
-      {
-      current->NoWatch();
-      }
-   UpdateUI();
-   }
-
-void CameraManager::Fov
-   (
-   Event *ev
-   )
-
-   {
-   if ( current )
-      {
-      current->SetFov( ev->GetFloat( 1 ) );
-      }
-   UpdateUI();
-   }
-
-void CameraManager::FadeTime
-   (
-   Event *ev
-   )
-
-   {
-   if ( current )
-      {
-      current->SetFadeTime( ev->GetFloat( 1 ) );
-      }
-   UpdateUI();
-   }
-
-
-void CameraManager::Speed
-   (
-   Event *ev
-   )
-
-   {
-   speed = ev->GetFloat( 1 );
-   if ( current )
-      {
-      current->speed = speed;
-      }
-   cameraPath_dirty = qtrue;
-   UpdateUI();
-   }
-
-void CameraManager::SavePath
-   (
-   str pathName
-   )
-   {
-   SplinePath  *node;
-   str         buf;
-	str         filename;
-   int         num;
-   int         index;
-
-   num = 0;
-   for( node = path; node != NULL; node = node->GetNext() )
-      {
-      num++;
-      }
-
-   if ( num == 0 )
-      {
-      warning( "CameraManager::SavePath", "Can't save.  No points in path." );
-		return;
-      }
-
-	filename = "cams/";
-	filename += pathName;
-	filename += ".cam";
-
-   path->SetTargetName( pathName );
-
-   gi.Printf( "Saving camera path to '%s'...\n", filename.c_str() );
-
-   buf = "";
-   buf += va( "//\n" );
-   buf += va( "// Camera Path \"%s\", %d Nodes.\n", pathName.c_str(), num );
-   buf += va( "//\n" );
-
-   index = 0;
-   for( node = path; node != NULL; node = node->GetNext() )
-      {
-      //
-      // start off the spawn command
-      //
-      buf += "spawn SplinePath";
-      //
-      // set the targetname
-      //
-      if ( !index )
-         {
-         buf += va( " targetname %s", pathName.c_str() );
-         }
-      else
-         {
-         buf += va( " targetname camnode_%s_%d", pathName.c_str(), index );
-         }
-      // 
-      // set the target
-      //
-      if ( index < ( num - 1 ) )
-         {
-         buf += va( " target camnode_%s_%d", pathName.c_str(), index + 1 );
-         }
-      //
-      // set the trigger target
-      //
-      if ( node->triggertarget != "" )
-         {
-         buf += va( " triggertarget %s", node->triggertarget.c_str() );
-         }
-      //
-      // set the thread
-      //
-      if ( node->thread != "" )
-         {
-         buf += va( " thread %s", node->thread.c_str() );
-         }
-      //
-      // set the origin
-      //
-      buf += va( " origin \"%.2f %.2f %.2f\"", node->origin.x, node->origin.y, node->origin.z );
-      //
-      // set the angles
-      //
-      buf += va( " angles \"%.1f %.1f %.1f\"", AngleMod( node->angles.x ), AngleMod( node->angles.y ), AngleMod( node->angles.z ) );
-      //
-      // set the speed
-      //
-      buf += va( " speed %.1f", node->speed );
-      //
-      // set the watch
-      //
-      if ( node->doWatch && node->watchEnt != "" )
-         {
-         buf += va( " watch %s", node->watchEnt.c_str() );
-         }
-      //
-      // set the fov
-      //
-      if ( node->GetFov() )
-         {
-         buf += va( " fov %.1f", node->GetFov() );
-         }
-      //
-      // set the fadetime
-      //
-      if ( node->GetFadeTime() )
-         {
-         buf += va( " fadetime %.1f", node->GetFadeTime() );
-         }
-
-      buf += "\n";
-      index++;
-      }
-   buf += "end\n";
-
-   gi.FS_WriteFile( filename.c_str(), ( void *)buf.c_str(), buf.length() + 1 );
-   gi.Printf( "done.\n" );
-   }
-
-void CameraManager::Save
-   (
-   Event *ev
-   )
-
-   {
-	str filename;
-   str name;
-
-	if ( ev->NumArgs() != 1 )
-		{
-      cvar_t * cvar;
-
-      //
-      // get the path name from the cvar
-      //
-      cvar = gi.Cvar_Get( "cam_filename", "", 0 );
-      if ( cvar->string[ 0 ] )
-         {
-         name = cvar->string;
-         }
-      else
-         {
-         ScriptError( "Usage: cam save [filename]" );
-	   	return;
-         }
-		}
-   else
-      {
-	   name = ev->GetString( 1 );
-      }
-   SavePath( name );
-   pathList.AddUniqueObject( name );
-   }
-
-void CameraManager::Load
-   (
-   Event *ev
-   )
-
-   {
-   qboolean show;
-	str		filename;
-   str      name;
-
-	if ( ev->NumArgs() != 1 )
-		{
-      cvar_t * cvar;
-
-      //
-      // get the path name from the cvar
-      //
-      cvar = gi.Cvar_Get( "cam_filename", "", 0 );
-      if ( cvar->string[ 0 ] )
-         {
-         show = true;
-         name = cvar->string;
-         }
-      else
-         {
-         ScriptError( "Usage: cam load [filename]" );
-	   	return;
-         }
-		}
-   else
-      {
-      show = false;
-      name = ev->GetString( 1 );
-      }
-
-   if ( pathList.ObjectInList( name ) && show )
-      {
-      gi.Printf( "Camera path '%s' already loaded...\n", name.c_str() );
-      return;
-      }
-
-	filename = "cams/";
-	filename += name;
-	filename += ".cam";
-
-   gi.Printf( "Loading camera path from '%s'...", filename.c_str() );
-   }
-
-
-void CameraManager::SaveMap
-   (
-   Event *ev
-   )
-
-   {
-   SplinePath  *node;
-   str         buf;
-	str         filename;
-   int         num;
-   int         index;
-
-	if ( ev->NumArgs() != 1 )
-		{
-      ScriptError( "Usage: cam savemap [filename]" );
-		return;
-		}
-
-   num = 0;
-   for( node = path; node != NULL; node = node->GetNext() )
-      {
-      num++;
-      }
-
-   if ( num == 0 )
-      {
-      ScriptError( "Can't save.  No points in path." );
-		return;
-      }
-
-	filename = "cams/";
-	filename += ev->GetString( 1 );
-	filename += ".map";
-
-   if ( !path->targetname.length() )
-      {
-      path->SetTargetName( ev->GetString( 1 ) );
-      gi.Printf( "Targetname set to '%s'\n", path->targetname.c_str() );
-      }
-
-   gi.Printf( "Saving camera path to map '%s'...\n", filename.c_str() );
-
-   buf = "";
-   index = 0;
-   for( node = path; node != NULL; node = node->GetNext() )
-      {
-      buf += va( "// pathnode %d\n", index );
-      buf += "{\n";
-      buf += va( "\"classname\" \"info_splinepath\"\n" );
-      if ( index < ( num - 1 ) )
-         {
-         buf += va( "\"target\" \"camnode_%s_%d\"\n", ev->GetString( 1 ).c_str(), index + 1 );
-         }
-      if ( !index )
-         {
-         buf += va( "\"targetname\" \"%s\"\n", ev->GetString( 1 ).c_str() );
-         }
-      else
-         {
-         buf += va( "\"targetname\" \"camnode_%s_%d\"\n", ev->GetString( 1 ).c_str(), index );
-         }
-      if ( node->triggertarget != "" )
-         {
-         buf += va( "\"triggertarget\" \"%s\"\n", node->triggertarget.c_str() );
-         }
-      if ( node->thread != "" )
-         {
-         buf += va( "\"thread\" \"%s\"\n", node->thread.c_str() );
-         }
-      buf += va( "\"origin\" \"%d %d %d\"\n", ( int )node->origin.x, ( int )node->origin.y, ( int )node->origin.z );
-      buf += va( "\"angles\" \"%d %d %d\"\n", ( int )AngleMod( node->angles.x ), ( int )AngleMod( node->angles.y ), ( int )AngleMod( node->angles.z ) );
-      buf += va( "\"speed\" \"%.3f\"\n", node->speed );
-      buf += "}\n";
-      index++;
-      }
-
-   gi.FS_WriteFile( filename.c_str(), ( void * )buf.c_str(), buf.length() + 1 );
-   gi.Printf( "done.\n" );
-   }
-
+            G_DebugBBox(node->origin, mins, maxs, 1, 1, 0, 1);
+        } else {
+            G_DebugBBox(node->origin, mins, maxs, 1, 0, 0, 1);
+        }
+
+        //
+        // draw watch
+        //
+        if (node->doWatch) {
+            Entity *watchEnt;
+            Vector  ang;
+            Vector  delta;
+            Vector  left;
+            Vector  up;
+            Vector  endpoint;
+
+            watchEnt = GetWatchEntity(node->GetWatch());
+            if (watchEnt) {
+                delta.x = watchEnt->origin.x;
+                delta.y = watchEnt->origin.y;
+                delta.z = watchEnt->absmax.z;
+                delta -= node->origin;
+                delta.normalize();
+                ang = delta.toAngles();
+                ang.AngleVectors(NULL, &left, &up);
+
+                G_LineWidth(1);
+                endpoint = node->origin + delta * 48;
+                G_DebugLine(node->origin, endpoint, 0.5, 1, 1, 1);
+                G_DebugLine(endpoint, endpoint + (left * 8) - (delta * 8), 0.5, 1, 1, 1);
+                G_DebugLine(endpoint, endpoint - (left * 8) - (delta * 8), 0.5, 1, 1, 1);
+                G_DebugLine(endpoint, endpoint - (up * 8) - (delta * 8), 0.5, 1, 1, 1);
+                G_DebugLine(endpoint, endpoint + (up * 8) - (delta * 8), 0.5, 1, 1, 1);
+            }
+        }
+
+        G_LineWidth(3);
+        G_DebugLine(node->origin, node->origin + Vector(node->orientation[0]) * 16, 1, 0, 0, 1);
+        G_DebugLine(node->origin, node->origin + Vector(node->orientation[1]) * 16, 0, 1, 0, 1);
+        G_DebugLine(node->origin, node->origin + Vector(node->orientation[2]) * 16, 0, 0, 1, 1);
+        G_LineWidth(1);
+
+        prev = node;
+    }
+
+    if (cameraPath_dirty) {
+        cameraPath_dirty = qfalse;
+        cameraPath.Clear();
+        cameraPath.SetType(SPLINE_CLAMP);
+
+        node = path;
+        while (node != NULL) {
+            cameraPath.AppendControlPoint(node->origin, node->angles, node->speed);
+            node = node->GetNext();
+
+            if (node == path) {
+                break;
+            }
+        }
+    }
+
+    // draw the curve itself
+    G_Color3f(1, 1, 0);
+    cameraPath.DrawCurve(10);
+
+    // draw all the nodes
+    for (node = path, count = -1; node != NULL; node = node->GetNext(), count++) {
+        Vector dir, angles;
+
+        dir    = cameraPath.Eval((float)count - 0.9f) - cameraPath.Eval(count - 1);
+        angles = dir.toAngles();
+        if (node->doWatch || node->GetFov() || (node->thread != "") || (node->triggertarget != "")) {
+            G_DebugOrientedCircle(cameraPath.Eval(count - 1), 5, 0, 1, 1, 1, angles);
+        } else {
+            G_DebugOrientedCircle(cameraPath.Eval(count - 1), 2, 0, 0, 1, 0.2f, angles);
+        }
+        // if we are the first node, we need to skip the count so that we properly go to the next node
+        if (count == -1) {
+            count = 0;
+        }
+    }
+
+    PostEvent(EV_CameraManager_ShowingPath, FRAMETIME);
+}
+
+void CameraManager::ShowPath(void)
+{
+    CancelEventsOfType(EV_CameraManager_ShowingPath);
+    PostEvent(EV_CameraManager_ShowingPath, FRAMETIME);
+    UpdateUI();
+}
+
+void CameraManager::ShowPath(Event *ev)
+{
+    if (ev->NumArgs()) {
+        SetPath(ev->GetString(1));
+    }
+    ShowPath();
+}
+
+void CameraManager::HidePath(Event *ev)
+{
+    CancelEventsOfType(EV_CameraManager_ShowingPath);
+    UpdateUI();
+}
+
+void CameraManager::StopPlayback(Event *ev)
+{
+    if (cam) {
+        cam->Stop();
+        SetCamera(NULL, 0);
+    }
+}
+
+void CameraManager::PlayPath(Event *ev)
+{
+    if (cam) {
+        SetCamera(NULL, 0);
+    }
+
+    if (ev->NumArgs()) {
+        SetPath(ev->GetString(1));
+    }
+
+    if (path) {
+        if (!cam) {
+            cam = new Camera;
+            cam->SetTargetName("_loadedcamera");
+            cam->ProcessPendingEvents();
+        }
+
+        cam->Reset(path->origin, path->angles);
+        cam->FollowPath(path, false, NULL);
+        cam->Cut(NULL);
+        SetCamera(cam, 0);
+    }
+}
+
+void CameraManager::LoopPath(Event *ev)
+{
+    if (cam) {
+        SetCamera(NULL, 0);
+    }
+
+    if (ev->NumArgs()) {
+        SetPath(ev->GetString(1));
+    }
+
+    if (path) {
+        if (!cam) {
+            cam = new Camera;
+            cam->SetTargetName("_loadedcamera");
+            cam->ProcessPendingEvents();
+        }
+
+        cam->Reset(path->origin, path->angles);
+        cam->FollowPath(path, true, NULL);
+        cam->Cut(NULL);
+        SetCamera(cam, 0);
+    }
+}
+
+void CameraManager::Watch(Event *ev)
+{
+    if (current) {
+        current->SetWatch(ev->GetString(1));
+    }
+    UpdateUI();
+}
+
+void CameraManager::NoWatch(Event *ev)
+{
+    if (current) {
+        current->NoWatch();
+    }
+    UpdateUI();
+}
+
+void CameraManager::Fov(Event *ev)
+{
+    if (current) {
+        current->SetFov(ev->GetFloat(1));
+    }
+    UpdateUI();
+}
+
+void CameraManager::FadeTime(Event *ev)
+{
+    if (current) {
+        current->SetFadeTime(ev->GetFloat(1));
+    }
+    UpdateUI();
+}
+
+void CameraManager::Speed(Event *ev)
+{
+    speed = ev->GetFloat(1);
+    if (current) {
+        current->speed = speed;
+    }
+    cameraPath_dirty = qtrue;
+    UpdateUI();
+}
+
+void CameraManager::SavePath(str pathName)
+{
+    SplinePath *node;
+    str         buf;
+    str         filename;
+    int         num;
+    int         index;
+
+    num = 0;
+    for (node = path; node != NULL; node = node->GetNext()) {
+        num++;
+    }
+
+    if (num == 0) {
+        warning("CameraManager::SavePath", "Can't save.  No points in path.");
+        return;
+    }
+
+    filename = "cams/";
+    filename += pathName;
+    filename += ".cam";
+
+    path->SetTargetName(pathName);
+
+    gi.Printf("Saving camera path to '%s'...\n", filename.c_str());
+
+    buf = "";
+    buf += va("//\n");
+    buf += va("// Camera Path \"%s\", %d Nodes.\n", pathName.c_str(), num);
+    buf += va("//\n");
+
+    index = 0;
+    for (node = path; node != NULL; node = node->GetNext()) {
+        //
+        // start off the spawn command
+        //
+        buf += "spawn SplinePath";
+        //
+        // set the targetname
+        //
+        if (!index) {
+            buf += va(" targetname %s", pathName.c_str());
+        } else {
+            buf += va(" targetname camnode_%s_%d", pathName.c_str(), index);
+        }
+        //
+        // set the target
+        //
+        if (index < (num - 1)) {
+            buf += va(" target camnode_%s_%d", pathName.c_str(), index + 1);
+        }
+        //
+        // set the trigger target
+        //
+        if (node->triggertarget != "") {
+            buf += va(" triggertarget %s", node->triggertarget.c_str());
+        }
+        //
+        // set the thread
+        //
+        if (node->thread != "") {
+            buf += va(" thread %s", node->thread.c_str());
+        }
+        //
+        // set the origin
+        //
+        buf += va(" origin \"%.2f %.2f %.2f\"", node->origin.x, node->origin.y, node->origin.z);
+        //
+        // set the angles
+        //
+        buf += va(
+            " angles \"%.1f %.1f %.1f\"", AngleMod(node->angles.x), AngleMod(node->angles.y), AngleMod(node->angles.z)
+        );
+        //
+        // set the speed
+        //
+        buf += va(" speed %.1f", node->speed);
+        //
+        // set the watch
+        //
+        if (node->doWatch && node->watchEnt != "") {
+            buf += va(" watch %s", node->watchEnt.c_str());
+        }
+        //
+        // set the fov
+        //
+        if (node->GetFov()) {
+            buf += va(" fov %.1f", node->GetFov());
+        }
+        //
+        // set the fadetime
+        //
+        if (node->GetFadeTime()) {
+            buf += va(" fadetime %.1f", node->GetFadeTime());
+        }
+
+        buf += "\n";
+        index++;
+    }
+    buf += "end\n";
+
+    gi.FS_WriteFile(filename.c_str(), (void *)buf.c_str(), buf.length() + 1);
+    gi.Printf("done.\n");
+}
+
+void CameraManager::Save(Event *ev)
+{
+    str filename;
+    str name;
+
+    if (ev->NumArgs() != 1) {
+        cvar_t *cvar;
+
+        //
+        // get the path name from the cvar
+        //
+        cvar = gi.Cvar_Get("cam_filename", "", 0);
+        if (cvar->string[0]) {
+            name = cvar->string;
+        } else {
+            ScriptError("Usage: cam save [filename]");
+            return;
+        }
+    } else {
+        name = ev->GetString(1);
+    }
+    SavePath(name);
+    pathList.AddUniqueObject(name);
+}
+
+void CameraManager::Load(Event *ev)
+{
+    qboolean show;
+    str      filename;
+    str      name;
+
+    if (ev->NumArgs() != 1) {
+        cvar_t *cvar;
+
+        //
+        // get the path name from the cvar
+        //
+        cvar = gi.Cvar_Get("cam_filename", "", 0);
+        if (cvar->string[0]) {
+            show = true;
+            name = cvar->string;
+        } else {
+            ScriptError("Usage: cam load [filename]");
+            return;
+        }
+    } else {
+        show = false;
+        name = ev->GetString(1);
+    }
+
+    if (pathList.ObjectInList(name) && show) {
+        gi.Printf("Camera path '%s' already loaded...\n", name.c_str());
+        return;
+    }
+
+    filename = "cams/";
+    filename += name;
+    filename += ".cam";
+
+    gi.Printf("Loading camera path from '%s'...", filename.c_str());
+}
+
+void CameraManager::SaveMap(Event *ev)
+{
+    SplinePath *node;
+    str         buf;
+    str         filename;
+    int         num;
+    int         index;
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("Usage: cam savemap [filename]");
+        return;
+    }
+
+    num = 0;
+    for (node = path; node != NULL; node = node->GetNext()) {
+        num++;
+    }
+
+    if (num == 0) {
+        ScriptError("Can't save.  No points in path.");
+        return;
+    }
+
+    filename = "cams/";
+    filename += ev->GetString(1);
+    filename += ".map";
+
+    if (!path->targetname.length()) {
+        path->SetTargetName(ev->GetString(1));
+        gi.Printf("Targetname set to '%s'\n", path->targetname.c_str());
+    }
+
+    gi.Printf("Saving camera path to map '%s'...\n", filename.c_str());
+
+    buf   = "";
+    index = 0;
+    for (node = path; node != NULL; node = node->GetNext()) {
+        buf += va("// pathnode %d\n", index);
+        buf += "{\n";
+        buf += va("\"classname\" \"info_splinepath\"\n");
+        if (index < (num - 1)) {
+            buf += va("\"target\" \"camnode_%s_%d\"\n", ev->GetString(1).c_str(), index + 1);
+        }
+        if (!index) {
+            buf += va("\"targetname\" \"%s\"\n", ev->GetString(1).c_str());
+        } else {
+            buf += va("\"targetname\" \"camnode_%s_%d\"\n", ev->GetString(1).c_str(), index);
+        }
+        if (node->triggertarget != "") {
+            buf += va("\"triggertarget\" \"%s\"\n", node->triggertarget.c_str());
+        }
+        if (node->thread != "") {
+            buf += va("\"thread\" \"%s\"\n", node->thread.c_str());
+        }
+        buf += va("\"origin\" \"%d %d %d\"\n", (int)node->origin.x, (int)node->origin.y, (int)node->origin.z);
+        buf +=
+            va("\"angles\" \"%d %d %d\"\n",
+               (int)AngleMod(node->angles.x),
+               (int)AngleMod(node->angles.y),
+               (int)AngleMod(node->angles.z));
+        buf += va("\"speed\" \"%.3f\"\n", node->speed);
+        buf += "}\n";
+        index++;
+    }
+
+    gi.FS_WriteFile(filename.c_str(), (void *)buf.c_str(), buf.length() + 1);
+    gi.Printf("done.\n");
+}
diff --git a/code/fgame/camera.h b/code/fgame/camera.h
index e26277b4..fafde254 100644
--- a/code/fgame/camera.h
+++ b/code/fgame/camera.h
@@ -21,10 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // camera.h: Camera.  Duh.
-// 
+//
 
-#ifndef __CAMERA_H__
-#define __CAMERA_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -34,13 +33,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define CAMERA_SWITCHTIME 0.5f
 
-#define ORBIT		( 1 << 0 )
-#define START_ON	( 1 << 1 )
-#define AUTOMATIC ( 1 << 2 )
-#define NO_TRACE  ( 1 << 3 )
-#define NO_WATCH  ( 1 << 4 )
-#define LEVEL_EXIT ( 1 << 5 )
-
+#define ORBIT             (1 << 0)
+#define START_ON          (1 << 1)
+#define AUTOMATIC         (1 << 2)
+#define NO_TRACE          (1 << 3)
+#define NO_WATCH          (1 << 4)
+#define LEVEL_EXIT        (1 << 5)
 
 extern Event EV_Camera_CameraThink;
 extern Event EV_Camera_StartMoving;
@@ -69,408 +67,386 @@ extern Event EV_Camera_Cut;
 class Camera;
 
 class CameraMoveState : public Class
-   {
-   public:
-      Vector            pos;
-      Vector            movedir;    // direction of travel
-      Vector            angles;     // angles from spline camera
+{
+public:
+    Vector pos;
+    Vector movedir; // direction of travel
+    Vector angles;  // angles from spline camera
 
-	   BSpline				cameraPath;
-      SplinePathPtr     splinePath;
-      SplinePathPtr     currentNode;
-      SplinePathPtr     loopNode;
+    BSpline       cameraPath;
+    SplinePathPtr splinePath;
+    SplinePathPtr currentNode;
+    SplinePathPtr loopNode;
 
-	   float					cameraTime;
-      int               lastTime;
-      int               newTime;
+    float cameraTime;
+    int   lastTime;
+    int   newTime;
 
-      qboolean          followingpath;
-	   EntityPtr			followEnt;
-      EntityPtr         orbitEnt;
+    qboolean  followingpath;
+    EntityPtr followEnt;
+    EntityPtr orbitEnt;
 
-		void		      operator=( CameraMoveState &newstate );
-      void           Evaluate( Camera * camera );
-      void           Initialize( Camera * camera );
-      void           DoNodeEvents( Camera * camera );
-	   void Archive( Archiver &arc ) override;
-   };
+    void operator=(CameraMoveState& newstate);
+    void Evaluate(Camera *camera);
+    void Initialize(Camera *camera);
+    void DoNodeEvents(Camera *camera);
+    void Archive(Archiver& arc) override;
+};
 
-inline void CameraMoveState::operator=
-	(
-	CameraMoveState &newstate
-	)
+inline void CameraMoveState::operator=(CameraMoveState& newstate)
 
-	{
-   movedir = newstate.movedir;
-   pos = newstate.pos;
-   angles = newstate.angles;
+{
+    movedir = newstate.movedir;
+    pos     = newstate.pos;
+    angles  = newstate.angles;
 
-   cameraPath = newstate.cameraPath;
-   splinePath = newstate.splinePath;
-   currentNode = newstate.currentNode;
-   loopNode = newstate.loopNode;
+    cameraPath  = newstate.cameraPath;
+    splinePath  = newstate.splinePath;
+    currentNode = newstate.currentNode;
+    loopNode    = newstate.loopNode;
 
-   cameraTime = newstate.cameraTime;
-   lastTime = newstate.lastTime;
-   newTime = newstate.newTime;
+    cameraTime = newstate.cameraTime;
+    lastTime   = newstate.lastTime;
+    newTime    = newstate.newTime;
 
-   followEnt = newstate.followEnt;
-   orbitEnt = newstate.orbitEnt;
+    followEnt = newstate.followEnt;
+    orbitEnt  = newstate.orbitEnt;
 
-   followingpath = newstate.followingpath;
-	}
+    followingpath = newstate.followingpath;
+}
 
-inline void CameraMoveState::Archive
-	(
-	Archiver &arc
-	)
-   {
-   arc.ArchiveVector( &movedir );
-   arc.ArchiveVector( &pos );
-   arc.ArchiveVector( &angles );
+inline void CameraMoveState::Archive(Archiver& arc)
+{
+    arc.ArchiveVector(&movedir);
+    arc.ArchiveVector(&pos);
+    arc.ArchiveVector(&angles);
 
-   cameraPath.Archive( arc );
+    cameraPath.Archive(arc);
 
-   arc.ArchiveSafePointer( &splinePath );
-   arc.ArchiveSafePointer( &currentNode );
-   arc.ArchiveSafePointer( &loopNode );
+    arc.ArchiveSafePointer(&splinePath);
+    arc.ArchiveSafePointer(&currentNode);
+    arc.ArchiveSafePointer(&loopNode);
 
-   arc.ArchiveFloat( &cameraTime );
-   arc.ArchiveInteger( &lastTime );
-   arc.ArchiveInteger( &newTime );
+    arc.ArchiveFloat(&cameraTime);
+    arc.ArchiveInteger(&lastTime);
+    arc.ArchiveInteger(&newTime);
 
-   arc.ArchiveSafePointer( &followEnt );
-   arc.ArchiveSafePointer( &orbitEnt );
+    arc.ArchiveSafePointer(&followEnt);
+    arc.ArchiveSafePointer(&orbitEnt);
 
-   arc.ArchiveBoolean( &followingpath );
-   }
+    arc.ArchiveBoolean(&followingpath);
+}
 
-class CameraWatchState : public Class 
-   {
-   public:
-      Vector            watchAngles;
+class CameraWatchState : public Class
+{
+public:
+    Vector watchAngles;
 
-	   EntityPtr			watchEnt;
-      qboolean          watchNodes;
-      qboolean          watchPath;
+    EntityPtr watchEnt;
+    qboolean  watchNodes;
+    qboolean  watchPath;
 
-      void              Evaluate( Camera * camera, CameraMoveState * move );
-      void              Initialize( Camera * camera );
-	   void Archive( Archiver &arc ) override;
-   };
+    void Evaluate(Camera *camera, CameraMoveState *move);
+    void Initialize(Camera *camera);
+    void Archive(Archiver& arc) override;
+};
 
-inline void CameraWatchState::Archive
-	(
-	Archiver &arc
-	)
-   {
-   arc.ArchiveVector( &watchAngles );
-   arc.ArchiveSafePointer( &watchEnt );
-   arc.ArchiveBoolean( &watchNodes );
-   arc.ArchiveBoolean( &watchPath );
-   }
+inline void CameraWatchState::Archive(Archiver& arc)
+{
+    arc.ArchiveVector(&watchAngles);
+    arc.ArchiveSafePointer(&watchEnt);
+    arc.ArchiveBoolean(&watchNodes);
+    arc.ArchiveBoolean(&watchPath);
+}
 
-class CameraState : public Class 
-   {
-   public:
-      CameraMoveState   move;
-      CameraWatchState  watch;
-      float             fov;
+class CameraState : public Class
+{
+public:
+    CameraMoveState  move;
+    CameraWatchState watch;
+    float            fov;
 
-      void              Evaluate( Camera * camera );
-      void              Initialize( Camera * camera );
-	   void Archive( Archiver &arc ) override;
-   };
+    void Evaluate(Camera *camera);
+    void Initialize(Camera *camera);
+    void Archive(Archiver& arc) override;
+};
 
-inline void CameraState::Archive
-	(
-	Archiver &arc
-	)
-   {
-   move.Archive( arc );
-   watch.Archive( arc );
-   arc.ArchiveFloat( &fov );
-   }
+inline void CameraState::Archive(Archiver& arc)
+{
+    move.Archive(arc);
+    watch.Archive(arc);
+    arc.ArchiveFloat(&fov);
+}
 
 class Camera : public Entity
-	{
-   private:
-      friend class	      CameraState;
-      friend class	      CameraWatchState;
-      friend class	      CameraMoveState;
-      //
-      // follow parameters
-      //
-	   float					follow_yaw;
-	   qboolean				follow_yaw_fixed;
-		float					follow_dist;
-		int					follow_mask;
-
-      // camera speed
-	   float					camera_speed;
-      // current camera fov
-	   float					camera_fov;
-      // orbit height
-		float					orbit_height;
-      // orbit_dotrace
-      qboolean          orbit_dotrace;
-      // whether or not auto calculate fov, a non-zero value means yes
-      float             auto_fov;
-
-      // automatic variables
-      float             automatic_startTime;
-      float             automatic_stopTime;
-      float             automatic_radius;
-      float             automatic_maxFOV;
-      qboolean          automatic_active;
-      Container<str>	automatic_states;
-
-	  // Miscellaneous
-	  Vector			m_vPosOffset;
-
-	protected:
-      CameraState       currentstate;
-      CameraState       newstate;
-
-      float             watchTime;  // if non-zero, camera view is transitioning
-      float             followTime; // if non-zero, camera position is tranisitioning
-      float             fovTime;    // if non-zero, fov is being lerped
-
-      float             fadeTime; // time to transition over
-      float             fovFadeTime; // time for fov transition
-      float             followFadeTime; // time for fov transition
-      float             watchFadeTime; // time for fov transition
-
-      bool				m_bShowquakes;
-
-      str               nextCamera;
-
-		qboolean				showcamera;
-
-		void					SetupCamera( Event *ev );
-		void					CameraThink( Event *ev );
-		void					CreateOrbit( Vector pos, float radius, Vector &forward, Vector &left );
-		void					CreatePath( SplinePath *path, splinetype_t type );
-      void              UpdateStates( void );
-      Vector            CalculatePosition( void );
-      Vector            CalculateOrientation( void	);
-      float             CalculateFov( void );
-      virtual void bind( Entity *master, qboolean use_my_angles = false );
-      void unbind( void ) override;
-
-	public:
-      CLASS_PROTOTYPE( Camera );
-
-								Camera();
-		void					Stop( void );
-		void					FollowPath( SplinePath *path, qboolean loop, Entity *watch );
-		void					Orbit( Entity *ent, float dist, Entity *watch, float yaw_offset = 0, qboolean dotrace = qtrue );
-		void					FollowEntity( Entity *ent, float dist, int mask, Entity *watch = NULL );
-      void              Watch( str watch, float time );
-      void              Watch( Entity *ent, float time );
-      void              SetFOV( float fov, float time	);
-
-		void					StartMoving( Event *ev );
-		void					StopMoving( Event *ev );
-		void					Pause( Event *ev );
-		void					Continue( Event *ev );
-      void              SetAnglesEvent( Event *ev );
-		void					SetSpeed( Event *ev );
-		void					SetFollowDistance( Event *ev );
-		void					SetOrbitHeight( float height );
-		void					SetOrbitHeight( Event *ev );
-		void					SetFollowYaw( Event *ev );
-		void					AbsoluteYaw( Event *ev );
-		void					RelativeYaw( Event *ev );
-		void					SetFOV( Event *ev );
-		void					OrbitEvent( Event *ev );
-		void					FollowEvent( Event *ev );
-		void					WatchEvent( Event *ev );
-		void					WatchStringEvent( Event *ev );
-		void					WatchPathEvent( Event *ev );
-		void					WatchNodesEvent( Event *ev );
-        void					NoWatchEvent(Event* ev);
-        void				    EventShowQuakes(Event* ev);
-		void					LookAt( Event *ev );
-		void					MoveToEntity( Event *ev );
-		void					MoveToPos( Event *ev );
-		void					Cut( Event *ev );
-		void					FadeTime( Event *ev );
-		void					TurnTo( Event *ev );
-      void              SetNextCamera( Event *ev );
-      float             CalculateScore( Entity * player, str state );
-      float             AutomaticStart( Entity * player );
-      float             AutomaticStop( Entity * player );
-      qboolean          IsAutomatic( void );
-      qboolean          IsLevelExit( void );
-      void              SetAutoStateEvent( Event * ev );
-      void              SetAutoRadiusEvent( Event * ev );
-      void              SetAutoStartTimeEvent( Event * ev );
-      void              SetAutoStopTimeEvent( Event * ev );
-      void              SetMaximumAutoFOVEvent( Event * ev );
-      void              SetAutoActiveEvent( Event * ev );
-
-      str&					NextCamera( void );
-      float             Fov( void );
-
-      void              Reset( Vector org, Vector ang );
-
-	  Vector			GetPositionOffset( void );
-	  void				SetPositionOffset( Vector vNewOfs );
-
-	   void Archive( Archiver &arc ) override;
-	};
-
-inline Vector Camera::GetPositionOffset
-	(
-	void
-	)
 {
-	return m_vPosOffset;
+private:
+    friend class CameraState;
+    friend class CameraWatchState;
+    friend class CameraMoveState;
+    //
+    // follow parameters
+    //
+    float    follow_yaw;
+    qboolean follow_yaw_fixed;
+    float    follow_dist;
+    int      follow_mask;
+
+    // camera speed
+    float camera_speed;
+    // current camera fov
+    float camera_fov;
+    // orbit height
+    float orbit_height;
+    // orbit_dotrace
+    qboolean orbit_dotrace;
+    // whether or not auto calculate fov, a non-zero value means yes
+    float auto_fov;
+
+    // automatic variables
+    float          automatic_startTime;
+    float          automatic_stopTime;
+    float          automatic_radius;
+    float          automatic_maxFOV;
+    qboolean       automatic_active;
+    Container<str> automatic_states;
+
+    // Miscellaneous
+    Vector m_vPosOffset;
+
+protected:
+    CameraState currentstate;
+    CameraState newstate;
+
+    float watchTime;  // if non-zero, camera view is transitioning
+    float followTime; // if non-zero, camera position is tranisitioning
+    float fovTime;    // if non-zero, fov is being lerped
+
+    float fadeTime;       // time to transition over
+    float fovFadeTime;    // time for fov transition
+    float followFadeTime; // time for fov transition
+    float watchFadeTime;  // time for fov transition
+
+    bool m_bShowquakes;
+
+    str nextCamera;
+
+    qboolean showcamera;
+
+    void         SetupCamera(Event *ev);
+    void         CameraThink(Event *ev);
+    void         CreateOrbit(Vector pos, float radius, Vector        &forward, Vector        &left);
+    void         CreatePath(SplinePath *path, splinetype_t type);
+    void         UpdateStates(void);
+    Vector       CalculatePosition(void);
+    Vector       CalculateOrientation(void);
+    float        CalculateFov(void);
+    virtual void bind(Entity *master, qboolean use_my_angles = false) override;
+    void         unbind(void) override;
+
+public:
+    CLASS_PROTOTYPE(Camera);
+
+    Camera();
+    void Stop(void);
+    void FollowPath(SplinePath *path, qboolean loop, Entity *watch);
+    void Orbit(Entity *ent, float dist, Entity *watch, float yaw_offset = 0, qboolean dotrace = qtrue);
+    void FollowEntity(Entity *ent, float dist, int mask, Entity *watch = NULL);
+    void Watch(str watch, float time);
+    void Watch(Entity *ent, float time);
+    void SetFOV(float fov, float time);
+
+    void     StartMoving(Event *ev);
+    void     StopMoving(Event *ev);
+    void     Pause(Event *ev);
+    void     Continue(Event *ev);
+    void     SetAnglesEvent(Event *ev);
+    void     SetSpeed(Event *ev);
+    void     SetFollowDistance(Event *ev);
+    void     SetOrbitHeight(float height);
+    void     SetOrbitHeight(Event *ev);
+    void     SetFollowYaw(Event *ev);
+    void     AbsoluteYaw(Event *ev);
+    void     RelativeYaw(Event *ev);
+    void     SetFOV(Event *ev);
+    void     OrbitEvent(Event *ev);
+    void     FollowEvent(Event *ev);
+    void     WatchEvent(Event *ev);
+    void     WatchStringEvent(Event *ev);
+    void     WatchPathEvent(Event *ev);
+    void     WatchNodesEvent(Event *ev);
+    void     NoWatchEvent(Event *ev);
+    void     EventShowQuakes(Event *ev);
+    void     LookAt(Event *ev);
+    void     MoveToEntity(Event *ev);
+    void     MoveToPos(Event *ev);
+    void     Cut(Event *ev);
+    void     FadeTime(Event *ev);
+    void     TurnTo(Event *ev);
+    void     SetNextCamera(Event *ev);
+    float    CalculateScore(Entity *player, str state);
+    float    AutomaticStart(Entity *player);
+    float    AutomaticStop(Entity *player);
+    qboolean IsAutomatic(void);
+    qboolean IsLevelExit(void);
+    void     SetAutoStateEvent(Event *ev);
+    void     SetAutoRadiusEvent(Event *ev);
+    void     SetAutoStartTimeEvent(Event *ev);
+    void     SetAutoStopTimeEvent(Event *ev);
+    void     SetMaximumAutoFOVEvent(Event *ev);
+    void     SetAutoActiveEvent(Event *ev);
+
+    str & NextCamera(void);
+    float Fov(void);
+
+    void Reset(Vector org, Vector ang);
+
+    bool ShowQuakes(void) const;
+    Vector GetPositionOffset(void);
+    void   SetPositionOffset(Vector vNewOfs);
+
+    void Archive(Archiver& arc) override;
+};
+
+inline bool Camera::ShowQuakes(void) const
+{
+    return m_bShowquakes;
 }
 
-inline void Camera::SetPositionOffset
-	(
-	Vector vNewOfs
-	)
+inline Vector Camera::GetPositionOffset(void)
 {
-	m_vPosOffset = vNewOfs;
+    return m_vPosOffset;
 }
 
-inline void Camera::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Entity::Archive( arc );
+inline void Camera::SetPositionOffset(Vector vNewOfs)
+{
+    m_vPosOffset = vNewOfs;
+}
 
-   arc.ArchiveFloat( &follow_yaw );
-   arc.ArchiveBoolean( &follow_yaw_fixed );
-   arc.ArchiveFloat( &follow_dist );
-   arc.ArchiveInteger( &follow_mask );
+inline void Camera::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
 
-   arc.ArchiveFloat( &camera_speed );
-   arc.ArchiveFloat( &camera_fov );
-   arc.ArchiveFloat( &orbit_height );
-   arc.ArchiveBoolean( &orbit_dotrace );
-   arc.ArchiveFloat( &auto_fov );
+    arc.ArchiveFloat(&follow_yaw);
+    arc.ArchiveBoolean(&follow_yaw_fixed);
+    arc.ArchiveFloat(&follow_dist);
+    arc.ArchiveInteger(&follow_mask);
 
-   arc.ArchiveFloat( &automatic_startTime );
-   arc.ArchiveFloat( &automatic_stopTime );
-   arc.ArchiveFloat( &automatic_radius );
-   arc.ArchiveFloat( &automatic_maxFOV );
-   arc.ArchiveBoolean( &automatic_active );
+    arc.ArchiveFloat(&camera_speed);
+    arc.ArchiveFloat(&camera_fov);
+    arc.ArchiveFloat(&orbit_height);
+    arc.ArchiveBoolean(&orbit_dotrace);
+    arc.ArchiveFloat(&auto_fov);
 
-   automatic_states.Archive( arc );
+    arc.ArchiveFloat(&automatic_startTime);
+    arc.ArchiveFloat(&automatic_stopTime);
+    arc.ArchiveFloat(&automatic_radius);
+    arc.ArchiveFloat(&automatic_maxFOV);
+    arc.ArchiveBoolean(&automatic_active);
 
-   // currentstate
-   currentstate.Archive( arc );
-   // newstate
-   newstate.Archive( arc );
+    automatic_states.Archive(arc);
 
-   arc.ArchiveFloat( &watchTime );
-   arc.ArchiveFloat( &followTime );
-   arc.ArchiveFloat( &fovTime );
-   arc.ArchiveFloat( &fadeTime );
-   arc.ArchiveFloat( &fovFadeTime );
-   arc.ArchiveFloat( &followFadeTime );
-   arc.ArchiveFloat( &watchFadeTime );
+    // currentstate
+    currentstate.Archive(arc);
+    // newstate
+    newstate.Archive(arc);
 
-   arc.ArchiveString( &nextCamera );
+    arc.ArchiveFloat(&watchTime);
+    arc.ArchiveFloat(&followTime);
+    arc.ArchiveFloat(&fovTime);
+    arc.ArchiveFloat(&fadeTime);
+    arc.ArchiveFloat(&fovFadeTime);
+    arc.ArchiveFloat(&followFadeTime);
+    arc.ArchiveFloat(&watchFadeTime);
 
-   arc.ArchiveBoolean( &showcamera );
+    arc.ArchiveString(&nextCamera);
 
-   if ( arc.Loading() )
-      {
-      if ( spawnflags & AUTOMATIC )
-         {
-         level.AddAutomaticCamera( this );
-         }
-      }
-   }
+    arc.ArchiveBoolean(&showcamera);
 
-void SetCamera( Entity *ent, float switchTime );
-Entity * GetWatchEntity( str watch );
+    if (arc.Loading()) {
+        if (spawnflags & AUTOMATIC) {
+            level.AddAutomaticCamera(this);
+        }
+    }
+}
+
+void    SetCamera(Entity *ent, float switchTime);
+Entity *GetWatchEntity(str watch);
 
 typedef SafePtr<Camera> CameraPtr;
 
 class CameraManager : public Listener
-   {
-   protected:
-      Container<str>    pathList;
-	   BSpline				cameraPath;
-      SplinePathPtr     path;
-      SplinePathPtr     current;
-      float             speed;
-      int               watch;
-      str               pathName;
-      CameraPtr         cam;
-      qboolean          cameraPath_dirty;
+{
+protected:
+    Container<str> pathList;
+    BSpline        cameraPath;
+    SplinePathPtr  path;
+    SplinePathPtr  current;
+    float          speed;
+    int            watch;
+    str            pathName;
+    CameraPtr      cam;
+    qboolean       cameraPath_dirty;
 
-      void              NewPath( Event *ev );
-      void              SetPath( Event *ev );
-      void              SetTargetName( Event *ev );
-      void              SetTarget( Event *ev );
-      void              AddPoint( Event *ev );
-      void              ReplacePoint( Event *ev );
-      void              DeletePoint( Event *ev );
-      void              MovePlayer( Event *ev );
-      void              NextPoint( Event *ev );
-      void              PreviousPoint( Event *ev );
-      void              ShowingPath( Event *ev );
-      void              ShowPath( Event *ev );
-      void              HidePath( Event *ev );
-      void              StopPlayback( Event *ev );
-      void              PlayPath( Event *ev );
-      void              LoopPath( Event *ev );
-      void              Watch( Event *ev );
-      void              NoWatch( Event *ev );
-      void              Fov( Event *ev );
-      void              FadeTime( Event *ev );
-      void              Speed( Event *ev );
-      void              Save( Event *ev );
-      void              Load( Event *ev );
-      void              SaveMap( Event *ev );
-      void              UpdateEvent( Event *ev );
-      void              NextPath( Event *ev );
-      void              PreviousPath( Event *ev );
-      void              RenamePath( Event *ev );
+    void NewPath(Event *ev);
+    void SetPath(Event *ev);
+    void SetTargetName(Event *ev);
+    void SetTarget(Event *ev);
+    void AddPoint(Event *ev);
+    void ReplacePoint(Event *ev);
+    void DeletePoint(Event *ev);
+    void MovePlayer(Event *ev);
+    void NextPoint(Event *ev);
+    void PreviousPoint(Event *ev);
+    void ShowingPath(Event *ev);
+    void ShowPath(Event *ev);
+    void HidePath(Event *ev);
+    void StopPlayback(Event *ev);
+    void PlayPath(Event *ev);
+    void LoopPath(Event *ev);
+    void Watch(Event *ev);
+    void NoWatch(Event *ev);
+    void Fov(Event *ev);
+    void FadeTime(Event *ev);
+    void Speed(Event *ev);
+    void Save(Event *ev);
+    void Load(Event *ev);
+    void SaveMap(Event *ev);
+    void UpdateEvent(Event *ev);
+    void NextPath(Event *ev);
+    void PreviousPath(Event *ev);
+    void RenamePath(Event *ev);
 
-      void              ShowPath( void );
-      void              UpdateUI( void );
-      void              SetPathName( str name );
-      void              SavePath( str pathName );
+    void ShowPath(void);
+    void UpdateUI(void);
+    void SetPathName(str name);
+    void SavePath(str pathName);
 
-   public:
-      CLASS_PROTOTYPE( CameraManager );
+public:
+    CLASS_PROTOTYPE(CameraManager);
 
-                        CameraManager();
-      void              SetPath( str pathName );
-	   void Archive( Archiver &arc ) override;
-   };
+    CameraManager();
+    void SetPath(str pathName);
+    void Archive(Archiver& arc) override;
+};
 
-inline void CameraManager::Archive
-	(
-	Archiver &arc
-	)
+inline void CameraManager::Archive(Archiver& arc)
 
-   {
-   Listener::Archive( arc );
+{
+    Listener::Archive(arc);
 
-   pathList.Archive( arc );
+    pathList.Archive(arc);
 
-   // no need to archive the cameraPath
-   arc.ArchiveSafePointer( &path );
-   arc.ArchiveSafePointer( &current );
-   arc.ArchiveFloat( &speed );
-   arc.ArchiveInteger( &watch );
-   arc.ArchiveString( &pathName );
-   arc.ArchiveSafePointer( &cam );
+    // no need to archive the cameraPath
+    arc.ArchiveSafePointer(&path);
+    arc.ArchiveSafePointer(&current);
+    arc.ArchiveFloat(&speed);
+    arc.ArchiveInteger(&watch);
+    arc.ArchiveString(&pathName);
+    arc.ArchiveSafePointer(&cam);
 
-   // make sure the cameraPath gets rebuilt
-   cameraPath_dirty = qtrue;
-   }
+    // make sure the cameraPath gets rebuilt
+    cameraPath_dirty = qtrue;
+}
 
 extern CameraManager CameraMan;
-
-#endif /* camera.h */
diff --git a/code/fgame/characterstate.cpp b/code/fgame/characterstate.cpp
index 50f558d8..e0c672ff 100644
--- a/code/fgame/characterstate.cpp
+++ b/code/fgame/characterstate.cpp
@@ -77,7 +77,7 @@ Conditional::Conditional()
 
 Expression::Expression() {}
 
-Expression::Expression(Expression& exp)
+Expression::Expression(const Expression& exp)
 
 {
     int i;
@@ -373,7 +373,7 @@ void State::ParseAndProcessCommand(str command, Entity *target)
             script.SkipToEOL();
             break;
         }
-        strcpy(args[argc], script.GetToken(false));
+        Q_strncpyz(args[argc], script.GetToken(false), sizeof(args[argc]));
         argv[argc] = args[argc];
         argc++;
     }
diff --git a/code/fgame/characterstate.h b/code/fgame/characterstate.h
index 884136e2..afc4d604 100644
--- a/code/fgame/characterstate.h
+++ b/code/fgame/characterstate.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // characterstate.h: Character state
 
-#ifndef __CHARACTERSTATE_H__
-#define __CHARACTERSTATE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -185,7 +184,7 @@ private:
 
 public:
     Expression();
-    Expression(Expression& exp);
+    Expression(const Expression& exp);
     Expression(Script& script, State& state);
 
     void operator=(const Expression& exp);
@@ -359,5 +358,3 @@ StateMap *GetStatemap(
     qboolean                  cache_only = false
 );
 void CacheStatemap(str filename, Condition<Class> *conditions);
-
-#endif /* !__CHARACTERSTATE_H__ */
diff --git a/code/fgame/crateobject.cpp b/code/fgame/crateobject.cpp
index e651f996..2b161b2e 100644
--- a/code/fgame/crateobject.cpp
+++ b/code/fgame/crateobject.cpp
@@ -45,491 +45,405 @@ NOTSTACKED prevents the crate from causing crates above it to fall. Great for cr
 
 Event EV_Crate_Think
 (
-	"_crate_think",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"think function for a crate."
+    "_crate_think",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "think function for a crate."
 );
 
 Event EV_Crate_Falling
 (
-	"_crate_falling",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"crate's falling."
+    "_crate_falling",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "crate's falling."
 );
 
 Event EV_Crate_Setup
 (
-	"_cratesetup",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Does the post spawn setup of the crate"
+    "_cratesetup",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Does the post spawn setup of the crate"
 );
 
 Event EV_Crate_Start_Falling
 (
-	"_cratestartfalling",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Makes a crate start falling"
+    "_cratestartfalling",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes a crate start falling"
 );
 
 Event EV_Crate_SetDebris
 (
-	"debristype",
-	EV_DEFAULT,
-	"i",
-	"type",
-	"Sets the debris type of the crate"
+    "debristype",
+    EV_DEFAULT,
+    "i",
+    "type",
+    "Sets the debris type of the crate"
 );
 
-CLASS_DECLARATION( Entity, CrateObject, "func_crate" )
-{
-	{ &EV_Crate_Setup,				&CrateObject::CrateSetup },
-	{ &EV_Crate_Falling,			&CrateObject::CrateFalling },
-	{ &EV_Damage,					&CrateObject::CrateDamaged },
-	{ &EV_Killed,					&CrateObject::CrateKilled },
-	{ &EV_Crate_Start_Falling,		&CrateObject::StartFalling },
-	{ &EV_Crate_Think,				&CrateObject::CrateThink },
-	{ &EV_Crate_SetDebris,			&CrateObject::CrateDebrisType },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, CrateObject, "func_crate") {
+    {&EV_Crate_Setup,         &CrateObject::CrateSetup     },
+    {&EV_Crate_Falling,       &CrateObject::CrateFalling   },
+    {&EV_Damage,              &CrateObject::CrateDamaged   },
+    {&EV_Killed,              &CrateObject::CrateKilled    },
+    {&EV_Crate_Start_Falling, &CrateObject::StartFalling   },
+    {&EV_Crate_Think,         &CrateObject::CrateThink     },
+    {&EV_Crate_SetDebris,     &CrateObject::CrateDebrisType},
+    {NULL,                    NULL                         }
 };
 
 CrateObject::CrateObject()
 {
-	entflags |= EF_CRATEOBJECT;
+    entflags |= ECF_CRATEOBJECT;
 
-	AddWaitTill(STRING_DEATH);
+    AddWaitTill(STRING_DEATH);
 
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	edict->s.eType = ET_GENERAL;
+    edict->s.eType = ET_GENERAL;
 
-	m_fMoveTime = 0.0f;
+    m_fMoveTime = 0.0f;
 
-	health = 100.0f;
-	max_health = 100.0f;
-	deadflag = 0;
-	takedamage = DAMAGE_YES;
+    health     = 100.0f;
+    max_health = 100.0f;
+    deadflag   = 0;
+    takedamage = DAMAGE_YES;
 
-	mass = 1200;
+    mass = 1200;
 
-	m_iDebrisType = 0;
+    m_iDebrisType = 0;
 
-	PostEvent( EV_Crate_Setup, EV_POSTSPAWN );
+    PostEvent(EV_Crate_Setup, EV_POSTSPAWN);
 }
 
-
-void CrateObject::TellNeighborsToFall
-	(
-	void
-	)
+void CrateObject::TellNeighborsToFall(void)
 {
-	Entity *pEnt;
-	Entity *pNext;
-	Vector vMins;
-	Vector vMaxs;
+    Entity *pEnt;
+    Entity *pNext;
+    Vector  vMins;
+    Vector  vMaxs;
 
-	vMins[ 0 ] = mins[ 0 ] + origin[ 0 ] + 6.0f;
-	vMins[ 1 ] = mins[ 1 ] + origin[ 1 ] + 6.0f;
-	vMins[ 2 ] = mins[ 2 ] + origin[ 2 ] + 6.0f;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
-	vMaxs[ 0 ] = maxs[ 0 ] + origin[ 0 ] - 6.0f;
-	vMaxs[ 1 ] = maxs[ 1 ] + origin[ 1 ] - 6.0f;
-	vMaxs[ 2 ] = maxs[ 2 ] + origin[ 2 ] + 12.0f;
+    for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
+        pNext = G_NextEntity(pEnt);
+        if (pEnt == this) {
+            continue;
+        }
+        if (!pEnt->IsSubclassOfCrateObject()) {
+            continue;
+        }
 
-	for( pEnt = G_NextEntity( NULL ); pEnt != NULL; pEnt = pNext )
-	{
-		pNext = G_NextEntity( pEnt );
+        if (vMins[0] > pEnt->absmax[0] || vMins[1] > pEnt->absmax[1] || vMins[2] > pEnt->absmax[2]
+            || pEnt->absmin[0] > vMaxs[0] || pEnt->absmin[1] > vMaxs[1] || pEnt->absmin[2] > vMaxs[2]) {
+            continue;
+        }
 
-		for( pEnt = G_NextEntity( NULL ); pEnt != NULL; pEnt = pNext )
-		{
-			pNext = G_NextEntity( pEnt );
-
-			if( pEnt != this && pEnt->IsSubclassOfCrateObject() )
-			{
-				if( vMins[ 0 ] <= absmax[ 0 ] &&
-					vMins[ 1 ] <= absmax[ 1 ] &&
-					vMins[ 2 ] <= absmax[ 2 ] &&
-					absmin[ 0 ] <= vMaxs[ 0 ] &&
-					absmin[ 1 ] <= vMaxs[ 1 ] &&
-					absmin[ 2 ] <= vMaxs[ 2 ] )
-				{
-					if( !pEnt->EventPending( EV_Crate_Start_Falling ) )
-					{
-						float time = level.frametime + level.frametime;
-						pEnt->PostEvent( EV_Crate_Start_Falling, time );
-					}
-				}
-			}
-		}
-	}
+        if (!pEnt->EventPending(EV_Crate_Start_Falling)) {
+            pEnt->PostEvent(EV_Crate_Start_Falling, level.frametime * 2);
+        }
+    }
 }
 
-void CrateObject::TellNeighborsToJitter
-	(
-	Vector vJitterAdd
-	)
+void CrateObject::TellNeighborsToJitter(Vector vJitterAdd)
 {
+    Entity *pEnt;
+    Entity *pNext;
+    Vector  vMins;
+    Vector  vMaxs;
 
-	Entity *pEnt;
-	Entity *pNext;
-	Vector vMins;
-	Vector vMaxs;
+    vMins = origin + mins + Vector(6, 6, 6);
+    vMaxs = origin + maxs + Vector(-6, -6, 12);
 
-	vMins[ 0 ] = mins[ 0 ] + origin[ 0 ] + 6.0f;
-	vMins[ 1 ] = mins[ 1 ] + origin[ 1 ] + 6.0f;
-	vMins[ 2 ] = mins[ 2 ] + origin[ 2 ] + 6.0f;
+    for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
+        CrateObject *crate = (CrateObject *)pEnt;
 
-	vMaxs[ 0 ] = maxs[ 0 ] + origin[ 0 ] - 6.0f;
-	vMaxs[ 1 ] = maxs[ 1 ] + origin[ 1 ] - 6.0f;
-	vMaxs[ 2 ] = maxs[ 2 ] + origin[ 2 ] + 12.0f;
+        pNext = G_NextEntity(pEnt);
 
-	for( pEnt = G_NextEntity( NULL ); pEnt != NULL; pEnt = pNext )
-	{
-		CrateObject *crate = ( CrateObject * )pEnt;
+        if (pEnt == this) {
+            continue;
+        }
+        if (!pEnt->IsSubclassOfCrateObject()) {
+            continue;
+        }
 
-		pNext = G_NextEntity( pEnt );
+        if (vMins[0] > pEnt->absmax[0] || vMins[1] > pEnt->absmax[1] || vMins[2] > pEnt->absmax[2]
+            || pEnt->absmin[0] > vMaxs[0] || pEnt->absmin[1] > vMaxs[1] || pEnt->absmin[2] > vMaxs[2]) {
+            continue;
+        }
 
-		if( pEnt == this )
-		{
-			continue;
-		}
+        crate->m_vJitterAngles[0] += vJitterAdd[0];
 
-		if( !pEnt->IsSubclassOfCrateObject() )
-		{
-			continue;
-		}
+        if (crate->m_vJitterAngles[0] > m_fJitterScale * 1.25f
+            || -(m_fJitterScale * 1.25f) <= crate->m_vJitterAngles[0]) {
+            crate->m_vJitterAngles[0] = m_fJitterScale * 1.25f;
+        }
 
-		if( vMins[ 0 ] > absmax[ 0 ] ||
-			vMins[ 1 ] > absmax[ 1 ] ||
-			vMins[ 2 ] > absmax[ 2 ] ||
-			absmin[ 0 ] > vMaxs[ 0 ] ||
-			absmin[ 1 ] > vMaxs[ 1 ] ||
-			absmin[ 2 ] > vMaxs[ 2 ] )
-		{
-			continue;
-		}
+        crate->m_vJitterAngles[2] += vJitterAdd[2];
 
-		crate->m_vJitterAngles[ 0 ] = m_vJitterAngles[ 0 ] + vJitterAdd[ 0 ];
+        if (crate->m_vJitterAngles[2] > m_fJitterScale * 1.25f) {
+            break;
+        }
 
-		if( crate->m_vJitterAngles[ 0 ] > m_fJitterScale * 1.25f ||
-			-( m_fJitterScale * 1.25f ) <= crate->m_vJitterAngles[ 0 ] )
-		{
-			crate->m_vJitterAngles[ 0 ] = m_fJitterScale * 1.25f;
-		}
+        if (-(m_fJitterScale * 1.25f) <= crate->m_vJitterAngles[2]) {
+            m_vJitterAngles[2] = -(m_fJitterScale * 1.25f);
+        }
 
-		crate->m_vJitterAngles[ 2 ] += vJitterAdd[ 2 ];
-
-		if( crate->m_vJitterAngles[ 2 ] > m_fJitterScale * 1.25f ) {
-			break;
-		}
-
-		if( -( m_fJitterScale * 1.25f ) <= crate->m_vJitterAngles[ 2 ] )
-		{
-			m_vJitterAngles[ 2 ] = -( m_fJitterScale * 1.25f );
-		}
-
-		if( !crate->EventPending( EV_Crate_Think ) )
-		{
-			crate->ProcessEvent( EV_Crate_Think );
-		}
-	}
+        if (!crate->EventPending(EV_Crate_Think)) {
+            crate->ProcessEvent(EV_Crate_Think);
+        }
+    }
 }
 
-void CrateObject::CrateSetup
-	(
-	Event *ev
-	)
+void CrateObject::CrateSetup(Event *ev)
 {
-	Vector vMins;
-	Vector vMaxs;
-	Entity *pEnt;
-	Entity *pNext;
+    Vector  vMins;
+    Vector  vMaxs;
+    Entity *pEnt;
+    Entity *pNext;
 
-	mass = 20 * ( size[ 0 ] * 0.625f * size[ 1 ] * 0.625f * size[ 2 ] * 0.625f );
+    mass = 20 * ((size[0] / 16) * (size[1] / 16) * (size[2] / 16));
 
-	m_vStartAngles = angles;
-	m_fJitterScale = 64.0f / size[ 2 ];
+    m_vStartAngles = angles;
+    m_fJitterScale = 64.0f / size[2];
 
-	setMoveType( MOVETYPE_PUSH );
-	setSolidType( SOLID_BSP );
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 
-	vMins[ 0 ] = mins[ 0 ] + origin[ 0 ] + 12.0f;
-	vMins[ 1 ] = mins[ 1 ] + origin[ 1 ] + 12.0f;
-	vMins[ 2 ] = mins[ 2 ] + origin[ 2 ] + 18.0f;
+    vMins = origin + mins + Vector(12, 12, 18);
+    vMaxs = origin + maxs - Vector(12, 12, 18);
 
-	vMaxs[ 0 ] = maxs[ 0 ] + origin[ 0 ] - 12.0f;
-	vMaxs[ 1 ] = maxs[ 1 ] + origin[ 1 ] - 12.0f;
-	vMaxs[ 2 ] = maxs[ 2 ] + origin[ 2 ] - 18.0f;
+    for (pEnt = G_NextEntity(NULL); pEnt != NULL; pEnt = pNext) {
+        pNext = G_NextEntity(pEnt);
 
-	for( pEnt = G_NextEntity( NULL ); pEnt != NULL; pEnt = pNext )
-	{
-		pNext = G_NextEntity( pEnt );
+        if (pEnt->entnum <= entnum) {
+            continue;
+        }
 
-		if( pEnt->entnum > entnum && pEnt->IsSubclassOfCrateObject() )
-		{
-			if( vMins[ 0 ] <= absmax[ 0 ] &&
-				vMins[ 1 ] <= absmax[ 1 ] && 
-				vMins[ 2 ] <= absmax[ 2 ] &&
-				absmin[ 0 ] <= vMaxs[ 0 ] &&
-				absmin[ 1 ] <= vMaxs[ 1 ] && 
-				absmin[ 2 ] <= vMaxs[ 2 ] )
-			{
-				Com_Printf( "^~^~^ WARNING: func_crate entities %i and %i have overlapping volumes near (%g %g %g) to (%g %g %g)\n",
-					entnum, pEnt->entnum, vMins[ 0 ], vMins[ 1 ], vMins[ 2 ], vMaxs[ 0 ], vMaxs[ 1 ], vMaxs[ 2 ] );
-			}
-		}
-	}
+        if (!pEnt->IsSubclassOfCrateObject()) {
+            continue;
+        }
+
+        if (vMins[0] <= pEnt->absmax[0] && vMins[1] <= pEnt->absmax[1] && vMins[2] <= pEnt->absmax[2]
+            && vMaxs[0] >= pEnt->absmin[0] && vMaxs[1] >= pEnt->absmin[1] && vMaxs[2] >= pEnt->absmin[2]) {
+            Com_Printf(
+                "^~^~^ WARNING: func_crate entities %i and %i have overlapping volumes near (%g %g %g) to (%g %g %g)\n",
+                entnum,
+                pEnt->entnum,
+                vMins[0],
+                vMins[1],
+                vMins[2],
+                vMaxs[0],
+                vMaxs[1],
+                vMaxs[2]
+            );
+        }
+    }
 }
 
-void CrateObject::CrateDebrisType
-	(
-	Event *ev
-	)
+void CrateObject::CrateDebrisType(Event *ev)
 {
-	m_iDebrisType = ev->GetInteger( 1 );
+    m_iDebrisType = ev->GetInteger(1);
 
-	if( m_iDebrisType >= 0 )
-	{
-		CacheResource( va( "models/fx/crates/debris_%i.tik", m_iDebrisType ) );
-	}
+    if (m_iDebrisType >= 0) {
+        CacheResource(va("models/fx/crates/debris_%i.tik", m_iDebrisType));
+    }
 }
 
-void CrateObject::StartFalling
-	(
-	Event *ev
-	)
+void CrateObject::StartFalling(Event *ev)
 {
-	setMoveType( MOVETYPE_FLY );
-	m_fMoveTime = 0;
+    m_fMoveTime = 0;
 
-	PostEvent( EV_Crate_Think, level.frametime );
+    setMoveType(MOVETYPE_TOSS);
+    setSolidType(SOLID_BBOX);
 
-	if( !( spawnflags & CRATE_NOTSTACKEDON ) )
-	{
-		TellNeighborsToFall();
-	}
+    PostEvent(EV_Crate_Think, level.frametime);
+
+    if (!(spawnflags & CRATE_NOTSTACKEDON)) {
+        TellNeighborsToFall();
+    }
 }
 
-void CrateObject::CrateFalling
-	(
-	Event *ev
-	)
+void CrateObject::CrateFalling(Event *ev)
 {
-	if( velocity != vec_zero || !groundentity || edict->solid != SOLID_BSP )
-	{
-		m_fMoveTime = level.time + 2.0f;
-	}
+    if (velocity != vec_zero || !groundentity || edict->solid != SOLID_BSP) {
+        m_fMoveTime = level.time + 2.0f;
+    }
 
-	if( level.time <= m_fMoveTime )
-	{
-		PostEvent( EV_Crate_Think, level.frametime );
-	}
-	else
-	{
-		setMoveType( MOVETYPE_PUSH );
-		setSolidType( SOLID_BSP );
-	}
+    if (m_fMoveTime >= level.time) {
+        PostEvent(EV_Crate_Think, level.frametime);
+        return;
+    }
+
+    setMoveType(MOVETYPE_PUSH);
+    setSolidType(SOLID_BSP);
 }
 
-void CrateObject::CrateDamaged
-	(
-	Event *ev
-	)
+void CrateObject::CrateDamaged(Event *ev)
 {
-	Vector vDir;
-	Vector vForward;
-	Vector vRight;
-	Vector vJitterAdd;
-	int iDamage;
-	int iMeansOfDeath;
-	Vector vHitPos;
-	Vector vHitDirection;
-	Vector vHitNormal;
+    Vector vDir;
+    Vector vForward;
+    Vector vRight;
+    Vector vJitterAdd;
+    int    iDamage;
+    int    iMeansOfDeath;
+    Vector vHitPos;
+    Vector vHitDirection;
+    Vector vHitNormal;
 
-	if( !takedamage )
-	{
-		return;
-	}
+    if (!takedamage) {
+        return;
+    }
 
-	iDamage = ev->GetInteger( 2 );
-	iMeansOfDeath = ev->GetInteger( 9 );
-	vHitPos = ev->GetVector( 4 );
-	vHitDirection = ev->GetVector( 5 );
-	vHitNormal = ev->GetVector( 6 );
+    iDamage       = ev->GetInteger(2);
+    iMeansOfDeath = ev->GetInteger(9);
+    vHitPos       = ev->GetVector(4);
+    vHitDirection = ev->GetVector(5);
+    vHitNormal    = ev->GetVector(6);
 
-	vDir = ( vHitDirection - vHitNormal ) * 0.5f;
-	AngleVectors( angles, vForward, vRight, NULL );
+    vDir = (vHitDirection - vHitNormal) * 0.5f;
+    AngleVectors(angles, vForward, vRight, NULL);
 
-	vJitterAdd[ 0 ] = DotProduct( vDir, vForward ) * m_fJitterScale * 0.025f * ( float )iDamage;
-	vJitterAdd[ 2 ] = DotProduct( vDir, vRight ) * m_fJitterScale * 0.025f * ( float )iDamage;
+    vJitterAdd[0] = DotProduct(vDir, vForward) * m_fJitterScale * 0.025f * (float)iDamage;
+    vJitterAdd[2] = DotProduct(vDir, vRight) * m_fJitterScale * 0.025f * (float)iDamage;
 
-	m_vJitterAngles += Vector( vJitterAdd[ 0 ], 0, vJitterAdd[ 2 ] );
+    m_vJitterAngles += Vector(vJitterAdd[0], 0, vJitterAdd[2]);
 
-	if( m_vJitterAngles[ 0 ] > m_fJitterScale * 1.25f ||
-		-( m_fJitterScale * 1.25f ) > m_vJitterAngles[ 0 ] )
-	{
-		m_vJitterAngles[ 0 ] = m_fJitterScale * 1.25f;
-	}
+    if (m_vJitterAngles[0] > m_fJitterScale * 1.25f || -(m_fJitterScale * 1.25f) > m_vJitterAngles[0]) {
+        m_vJitterAngles[0] = m_fJitterScale * 1.25f;
+    }
 
-	if( m_vJitterAngles[ 2 ] > m_fJitterScale * 1.25f )
-	{
-		m_vJitterAngles[ 2 ] = m_fJitterScale * 1.25f;
-	}
-	else if( m_vJitterAngles[ 2 ] >= -( m_fJitterScale * 1.25f ) )
-	{
-		m_vJitterAngles[ 2 ] = -( m_fJitterScale * 1.25f );
-	}
+    if (m_vJitterAngles[2] > m_fJitterScale * 1.25f) {
+        m_vJitterAngles[2] = m_fJitterScale * 1.25f;
+    } else if (m_vJitterAngles[2] >= -(m_fJitterScale * 1.25f)) {
+        m_vJitterAngles[2] = -(m_fJitterScale * 1.25f);
+    }
 
-	vJitterAdd[ 1 ] = 0.0f;
-	vJitterAdd *= -0.5f;
-	
-	TellNeighborsToJitter( vJitterAdd );
-	
-	if( !EventPending( EV_Crate_Think ) )
-	{
-		ProcessEvent( EV_Crate_Think );
-	}
-	
-	if( spawnflags & CRATE_INDESTRUCTABLE ) {
-		return;
-	}
-	
-	if( iMeansOfDeath >= MOD_VEHICLE )
-	{
-		if( iMeansOfDeath == MOD_BASH )
-		{
-			iDamage *= 2;
-		}
-	}
-	else
-	{
-		iDamage /= 2;
-	}
-	
-	health -= iDamage;
-	
-	if( health <= 0.0f )
-	{
-		Event *event = new Event( EV_Killed );
-		event->AddEntity( ev->GetEntity( 1 ) );
-		event->AddInteger( iDamage );
-		ev->AddEntity( ev->GetEntity( 3 ) );
-	
-		ProcessEvent( event );
-	}
+    vJitterAdd[1] = 0.0f;
+    vJitterAdd *= -0.5f;
+
+    TellNeighborsToJitter(vJitterAdd);
+
+    if (!EventPending(EV_Crate_Think)) {
+        ProcessEvent(EV_Crate_Think);
+    }
+
+    if (spawnflags & CRATE_INDESTRUCTABLE) {
+        return;
+    }
+
+    if (iMeansOfDeath >= MOD_VEHICLE) {
+        if (iMeansOfDeath == MOD_BASH) {
+            iDamage *= 2;
+        }
+    } else {
+        iDamage /= 2;
+    }
+
+    health -= iDamage;
+
+    if (health <= 0.0f) {
+        Event *event = new Event(EV_Killed);
+        event->AddEntity(ev->GetEntity(1));
+        event->AddInteger(iDamage);
+        ev->AddEntity(ev->GetEntity(3));
+
+        ProcessEvent(event);
+    }
 }
 
-void CrateObject::CrateKilled
-	(
-	Event *ev
-	)
+void CrateObject::CrateKilled(Event *ev)
 {
-	Vector vCenter;
-	Entity *attacker = ev->GetEntity( 1 );
+    Vector  vCenter;
+    Entity *attacker = ev->GetEntity(1);
 
-	if( attacker->IsSubclassOfPlayer() )
-	{
-		Player *p = ( Player * )attacker;
-		p->m_iNumObjectsDestroyed++;
-	}
+    if (attacker->IsSubclassOfPlayer()) {
+        Player *p = (Player *)attacker;
+        p->m_iNumObjectsDestroyed++;
+    }
 
-	setSolidType( SOLID_NOT );
-	hideModel();
+    setSolidType(SOLID_NOT);
+    hideModel();
 
-	takedamage = DAMAGE_NO;
+    takedamage = DAMAGE_NO;
 
-	if( !( spawnflags & CRATE_NOTSTACKEDON ) )
-	{
-		TellNeighborsToFall();
-	}
+    if (!(spawnflags & CRATE_NOTSTACKEDON)) {
+        TellNeighborsToFall();
+    }
 
-	vCenter = origin + ( maxs + mins ) * 0.5f;
+    vCenter = origin + (maxs + mins) * 0.5f;
 
-	// Tell clients around that a crate is destroyed
-	gi.SetBroadcastVisible( origin, origin );
-	gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_CRATE_DEBRIS));
-		gi.MSG_WriteCoord( vCenter[ 0 ] );
-		gi.MSG_WriteCoord( vCenter[ 1 ] );
-		gi.MSG_WriteCoord( vCenter[ 2 ] );
-		gi.MSG_WriteByte( m_iDebrisType );
-	gi.MSG_EndCGM();
+    // Tell clients around that a crate is destroyed
+    gi.SetBroadcastVisible(origin, origin);
+    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_CRATE_DEBRIS));
+    gi.MSG_WriteCoord(vCenter[0]);
+    gi.MSG_WriteCoord(vCenter[1]);
+    gi.MSG_WriteCoord(vCenter[2]);
+    gi.MSG_WriteByte(m_iDebrisType);
+    gi.MSG_EndCGM();
 
-	health = 0;
-	deadflag = DEAD_DEAD;
+    health   = 0;
+    deadflag = DEAD_DEAD;
 
-	PostEvent( EV_Remove, 0 );
+    PostEvent(EV_Remove, 0);
 
-	// Notify scripts
-	Unregister( STRING_DEATH );
+    // Notify scripts
+    Unregister(STRING_DEATH);
 }
 
-void CrateObject::CrateThink
-	(
-	Event *ev
-	)
+void CrateObject::CrateThink(Event *ev)
 {
-	// Shake the create if it's on fire
+    // Shake the create if it's on fire
 
-	if( m_vJitterAngles[ 0 ] || m_vJitterAngles[ 2 ] )
-	{
-		setAngles( Vector( m_vStartAngles[ 0 ] * 2.0f, m_vStartAngles[ 1 ], m_vStartAngles[ 2 ] * 2.0f ) );
+    if (m_vJitterAngles[0] || m_vJitterAngles[2]) {
+        setAngles(Vector(m_vStartAngles[0] * 2.0f, m_vStartAngles[1], m_vStartAngles[2] * 2.0f));
 
-		if( m_vJitterAngles[ 0 ] > 0.0f )
-		{
-			m_vJitterAngles[ 0 ] -= 1 / 3 * m_fJitterScale;
+        if (m_vJitterAngles[0] > 0) {
+            m_vJitterAngles[0] -= 1.0 / 3.0 * m_fJitterScale;
 
-			if( m_vJitterAngles[ 0 ] > 0.0f )
-			{
-				m_vJitterAngles[ 0 ] = 0.0f;
-			}
-		}
-		else if( m_vJitterAngles[ 0 ] < 0.0f )
-		{
-			m_vJitterAngles[ 0 ] += 1 / 3 * m_fJitterScale;
+            if (m_vJitterAngles[0] < 0) {
+                m_vJitterAngles[0] = 0;
+            }
+        } else if (m_vJitterAngles[0] < 0) {
+            m_vJitterAngles[0] += 1.0 / 3.0 * m_fJitterScale;
 
-			if( m_vJitterAngles[ 0 ] < 0.0f )
-			{
-				m_vJitterAngles[ 0 ] = 0.0f;
-			}
-		}
+            if (m_vJitterAngles[0] > 0) {
+                m_vJitterAngles[0] = 0;
+            }
+        }
 
-		m_vJitterAngles[ 0 ] = -m_vJitterAngles[ 0 ];
+        m_vJitterAngles[0] = -m_vJitterAngles[0];
 
-		if( m_vJitterAngles[ 2 ] > 0.0f )
-		{
-			m_vJitterAngles[ 2 ] -= 1 / 3 * m_fJitterScale;
+        if (m_vJitterAngles[2] > 0) {
+            m_vJitterAngles[2] -= 1 / 3 * m_fJitterScale;
 
-			if( m_vJitterAngles[ 2 ] > 0.0f )
-			{
-				m_vJitterAngles[ 2 ] = 0.0f;
-			}
-		}
-		else if( m_vJitterAngles[ 2 ] < 0.0f )
-		{
-			m_vJitterAngles[ 2 ] += 1 / 3 * m_fJitterScale;
+            if (m_vJitterAngles[2] < 0) {
+                m_vJitterAngles[2] = 0;
+            }
+        } else if (m_vJitterAngles[2] < 0) {
+            m_vJitterAngles[2] += 1.0 / 3.0 * m_fJitterScale;
 
-			if( m_vJitterAngles[ 2 ] < 0.0f )
-			{
-				m_vJitterAngles[ 2 ] = 0.0f;
-			}
-		}
+            if (m_vJitterAngles[2] > 0) {
+                m_vJitterAngles[2] = 0;
+            }
+        }
 
-		m_vJitterAngles[ 2 ] = -m_vJitterAngles[ 2 ];
+        m_vJitterAngles[2] = -m_vJitterAngles[2];
+    } else if (!VectorCompare(angles, m_vStartAngles)) {
+        setAngles(m_vStartAngles);
+    }
 
-		PostEvent( EV_Crate_Think, 0.05f );
-	}
-	else if( !VectorCompare( angles, m_vStartAngles ) )
-	{
-		setAngles( m_vStartAngles );
-	}
+    if (m_vJitterAngles[0] || m_vJitterAngles[2]) {
+        PostEvent(EV_Crate_Think, 0.05f);
+    }
 }
diff --git a/code/fgame/crateobject.h b/code/fgame/crateobject.h
index 7d33708d..0fe5e737 100644
--- a/code/fgame/crateobject.h
+++ b/code/fgame/crateobject.h
@@ -22,53 +22,49 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // crateobject.h : Crates
 
-#ifndef __CRATEOBJECT_H__
-#define __CRATEOBJECT_H__
+#pragma once
 
 #include "entity.h"
 
-#define CRATE_INDESTRUCTABLE		1
-#define CRATE_NOTSTACKEDON			2
+#define CRATE_INDESTRUCTABLE 1
+#define CRATE_NOTSTACKEDON   2
 
-class CrateObject : public Entity {
-	float m_fMoveTime;
-	int m_iDebrisType;
-	Vector m_vJitterAngles;
-	Vector m_vStartAngles;
-	float m_fJitterScale;
+class CrateObject : public Entity
+{
+    float  m_fMoveTime;
+    int    m_iDebrisType;
+    Vector m_vJitterAngles;
+    Vector m_vStartAngles;
+    float  m_fJitterScale;
 
 private:
-	void TellNeighborsToFall( void );
-	void TellNeighborsToJitter( Vector vJitterAdd );
+    void TellNeighborsToFall(void);
+    void TellNeighborsToJitter(Vector vJitterAdd);
 
 public:
-	CLASS_PROTOTYPE( CrateObject );
+    CLASS_PROTOTYPE(CrateObject);
 
-	CrateObject();
+    CrateObject();
 
-	void			CrateSetup( Event *ev );
-	void			CrateDebrisType( Event *ev );
-	void			StartFalling( Event *ev );
-	void			CrateFalling( Event *ev );
-	void			CrateDamaged( Event *ev );
-	void			CrateKilled( Event *ev );
-	void			CrateThink( Event *ev );
-	void Archive( Archiver& arc ) override;
+    void CrateSetup(Event *ev);
+    void CrateDebrisType(Event *ev);
+    void StartFalling(Event *ev);
+    void CrateFalling(Event *ev);
+    void CrateDamaged(Event *ev);
+    void CrateKilled(Event *ev);
+    void CrateThink(Event *ev);
+    void Archive(Archiver& arc) override;
 };
 
-inline void CrateObject::Archive
-	(
-	Archiver& arc
-	)
+inline void CrateObject::Archive(Archiver& arc)
 {
-	Entity::Archive( arc );
+    Entity::Archive(arc);
 
-	arc.ArchiveFloat( &m_fMoveTime );
-	arc.ArchiveInteger( &m_iDebrisType );
+    arc.ArchiveFloat(&m_fMoveTime);
+    arc.ArchiveInteger(&m_iDebrisType);
 
-	arc.ArchiveVector( &m_vJitterAngles );
-	arc.ArchiveVector( &m_vStartAngles );
-	arc.ArchiveFloat( &m_fJitterScale );
+    arc.ArchiveVector(&m_vJitterAngles);
+    arc.ArchiveVector(&m_vStartAngles);
+    arc.ArchiveFloat(&m_fJitterScale);
 }
 
-#endif // __CRATEOBJECT_H__
diff --git a/code/fgame/crc32.h b/code/fgame/crc32.h
index 703aca60..0b0547e5 100644
--- a/code/fgame/crc32.h
+++ b/code/fgame/crc32.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // crc32.h: CRC32 Encryption (used by the Archiver)
 
-#ifndef __CRC32_H__
-#define __CRC32_H8_
+#pragma once
 
 static unsigned int crc32_tab[] = {
 	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@@ -84,5 +83,3 @@ unsigned int crc32( unsigned int crc, const void *buf, size_t size )
 
 	return crc ^ ~0U;
 }
-
-#endif // __CRC32_H__
diff --git a/code/fgame/damagemodel.cpp b/code/fgame/damagemodel.cpp
index fd66bb37..029ace6c 100644
--- a/code/fgame/damagemodel.cpp
+++ b/code/fgame/damagemodel.cpp
@@ -22,5 +22,296 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "damagemodel.h"
 
-// FIXME: unimplemented
+static const unsigned int DAMAGEMODEL_NOTSOLID = 1;
 
+Event EV_DamageModel_Setup
+(
+    "_setup",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up an object.",
+    EV_NORMAL
+);
+Event EV_DamageModel_KillTrace
+(
+    "killtrace",
+    EV_DEFAULT,
+    "vvff",
+    "offset direction radius distance",
+    "kills all objects along the trace\n"
+    "offset - initial offset from origin\n"
+    "direction - angular offset orientation for trace\n"
+    "radius - thickness of trace\n"
+    "distance - how far to trace",
+    EV_NORMAL
+);
+Event EV_DamageModel_SpawnOrientedBoundingBox
+(
+    "orientedbbox",
+    EV_DEFAULT,
+    "vvf",
+    "mins maxs yawoffset",
+    "spawn an oriented bounding box with the given dimensions and an angular offset\n"
+    "mins - min dimensions of box\n"
+    "maxs - max dimensions of box\n"
+    "yawoffset - angular offset orientation of box",
+    EV_NORMAL
+);
+Event EV_DamageModel_KillThread
+(
+    "killthread",
+    EV_DEFAULT,
+    "s",
+    "thread",
+    "Set the thread to execute when this model is killed",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(Animate, DamageModel, "DamageModel") {
+    {&EV_Damage,                               &DamageModel::Damaged                 },
+    {&EV_Killed,                               &DamageModel::Killed                  },
+    {&EV_DamageModel_Setup,                    &DamageModel::Setup                   },
+    {&EV_DamageModel_KillTrace,                &DamageModel::KillTrace               },
+    {&EV_DamageModel_SpawnOrientedBoundingBox, &DamageModel::SpawnOrientedBoundingBox},
+    {&EV_DamageModel_KillThread,               &DamageModel::EventSetKillThread      },
+    {NULL,                                     NULL                                  }
+};
+
+DamageModel::DamageModel()
+{
+    if (LoadingSavegame) {
+        return;
+    }
+
+    setSolidType(SOLID_BBOX);
+    takedamage     = DAMAGE_YES;
+    boundingBoxEnt = NULL;
+
+    health = 50;
+    flags |= FL_ROTATEDBOUNDS;
+
+    PostEvent(EV_DamageModel_Setup, EV_POSTSPAWN);
+}
+
+DamageModel::~DamageModel()
+{
+    if (boundingBoxEnt) {
+        boundingBoxEnt->PostEvent(EV_Remove, 0);
+        boundingBoxEnt = NULL;
+    }
+}
+
+void DamageModel::Setup(Event *ev)
+{
+    max_health = health;
+    deadflag   = DEAD_NO;
+
+    // set the animation
+    NewAnim("idle");
+
+    link();
+}
+
+void DamageModel::Damaged(Event *ev)
+{
+    Event *newev;
+    int    damage;
+    str    animname;
+
+    newev = new Event(EV_SetAnim);
+    newev->AddString("idle");
+
+    damage = ev->GetInteger(2);
+    if (damage < health * 0.25) {
+        animname = "pain_small";
+    } else if (damage < health * 0.66) {
+        animname = "pain_medium";
+    } else {
+        animname = "pain_large";
+    }
+
+    switch (ev->GetInteger(9)) {
+    case MOD_CRUSH:
+    case MOD_CRUSH_EVERY_FRAME:
+    case MOD_EXPLOSION:
+    case MOD_EXPLODEWALL:
+    case MOD_GRENADE:
+    case MOD_ROCKET:
+    case MOD_VEHICLE:
+    case MOD_AAGUN:
+        DamageEvent(ev);
+        if (damage >= health) {
+            return;
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (!HasAnim(animname)) {
+        animname = "pain";
+    }
+
+    NewAnim("pain", newev);
+}
+
+void DamageModel::Killed(Event *ev)
+{
+    Entity *inflictor;
+    Vector  delta;
+    float   yaw;
+    int     num;
+    str     anim;
+
+    takedamage = DAMAGE_NO;
+    deadflag   = DEAD_DEAD;
+    setSolidType(SOLID_NOT);
+
+    inflictor = ev->GetEntity(3);
+    delta     = origin - inflictor->origin;
+    yaw       = AngleSubtract(delta.toYaw(), angles.y);
+
+    num  = (fmod(yaw + 360, 360) + 22.f) / 45.f;
+    anim = "death_" + str(num);
+    // execute the kill thread
+    label.Execute(this);
+
+    if (!HasAnim(anim)) {
+        anim = "death";
+    }
+
+    if (spawnflags & DAMAGEMODEL_NOTSOLID) {
+        NewAnim(anim, EV_BecomeNonSolid);
+    } else {
+        NewAnim(anim);
+    }
+
+    if (killtarget.c_str() && strcmp(killtarget, "")) {
+        Entity *ent = NULL;
+
+        // remove all entities with the kill target name
+        for (ent = G_FindTarget(NULL, killtarget); ent; ent = G_FindTarget(ent, killtarget)) {
+            ent->PostEvent(EV_Remove, 0);
+        }
+    }
+}
+
+void DamageModel::KillTrace(Event *ev)
+{
+    Vector  offset;
+    Vector  direction;
+    float   radius;
+    float   distance;
+    Vector  transformed;
+    Vector  forward;
+    Vector  localFwd;
+    Vector  mins, maxs;
+    Vector  end;
+    trace_t trace;
+    Entity *ent;
+    int     i;
+
+    if (spawnflags & DAMAGEMODEL_NOTSOLID) {
+        return;
+    }
+
+    offset    = ev->GetVector(1);
+    direction = ev->GetVector(2);
+    radius    = ev->GetFloat(3);
+    distance  = ev->GetFloat(4);
+
+    MatrixTransformVector(offset, orientation, transformed);
+    transformed += origin;
+
+    direction.AngleVectorsLeft(&forward, NULL, NULL);
+    MatrixTransformVector(forward, orientation, localFwd);
+
+    end  = transformed + localFwd * distance;
+    mins = Vector(-radius, -radius, -radius);
+    maxs = Vector(radius, radius, radius);
+    ent  = this;
+
+    for (i = 0; i < 11; i++) {
+        float damage;
+
+        if (transformed == end) {
+            break;
+        }
+
+        trace = G_Trace(transformed, mins, maxs, end, ent, MASK_SOLID, qfalse, "KillTrace");
+
+        if (trace.fraction >= 1 || trace.entityNum == ENTITYNUM_WORLD) {
+            break;
+        }
+
+        transformed = trace.endpos;
+        if (!trace.ent) {
+            continue;
+        }
+
+        ent = trace.ent->entity;
+        if (!ent) {
+            continue;
+        }
+
+        if (ent->takedamage == DAMAGE_NO) {
+            continue;
+        }
+
+        if (ent->isSubclassOf(DamageModel)) {
+            damage = health * 0.5;
+            if (damage < 20) {
+                damage = 20;
+            }
+        } else {
+            damage = health + 1;
+        }
+
+        ent->Damage(this, this, damage, trace.endpos, localFwd, trace.plane.normal, 0, 0, MOD_CRUSH, HITLOC_GENERAL);
+    }
+}
+
+void DamageModel::SpawnOrientedBoundingBox(Event *ev)
+{
+    Vector mins, maxs;
+    float  yawoffset;
+
+    if (spawnflags & DAMAGEMODEL_NOTSOLID) {
+        return;
+    }
+
+    mins      = ev->GetVector(1) * edict->s.scale;
+    maxs      = ev->GetVector(2) * edict->s.scale;
+    yawoffset = ev->GetFloat(3);
+
+    boundingBoxEnt = new Entity();
+    boundingBoxEnt->edict->r.svFlags |= SVF_SENDPVS;
+    boundingBoxEnt->edict->s.eFlags |= EF_LINKANGLES;
+    boundingBoxEnt->edict->r.contents = CONTENTS_SOLID;
+    boundingBoxEnt->setSolidType(SOLID_BBOX);
+
+    boundingBoxEnt->angles   = angles;
+    boundingBoxEnt->angles.y = fmod(angles.y + yawoffset, 360);
+    boundingBoxEnt->setAngles(boundingBoxEnt->angles);
+    boundingBoxEnt->setSize(mins, maxs);
+    boundingBoxEnt->setOrigin(origin);
+    boundingBoxEnt->DisconnectPaths();
+}
+
+void DamageModel::EventSetKillThread(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        label.SetThread(ev->GetValue(1));
+    } else {
+        label.Set(ev->GetString(1));
+    }
+}
+
+void DamageModel::Archive(Archiver& arc)
+{
+    Animate::Archive(arc);
+
+    label.Archive(arc);
+    arc.ArchiveSafePointer(&boundingBoxEnt);
+}
diff --git a/code/fgame/damagemodel.h b/code/fgame/damagemodel.h
index 64b139d4..2190568d 100644
--- a/code/fgame/damagemodel.h
+++ b/code/fgame/damagemodel.h
@@ -21,3 +21,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #pragma once
+
+#include "animate.h"
+
+class DamageModel : public Animate
+{
+private:
+    ScriptThreadLabel label;
+    EntityPtr         boundingBoxEnt;
+
+private:
+    CLASS_PROTOTYPE(DamageModel);
+
+public:
+    DamageModel();
+    ~DamageModel();
+
+    void Setup(Event *ev);
+    void Damaged(Event *ev);
+    void Killed(Event *ev) override;
+    void KillTrace(Event *ev);
+    void SpawnOrientedBoundingBox(Event *ev);
+    void EventSetKillThread(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
diff --git a/code/fgame/debuglines.cpp b/code/fgame/debuglines.cpp
index 7aa7dfa2..e75c6e09 100644
--- a/code/fgame/debuglines.cpp
+++ b/code/fgame/debuglines.cpp
@@ -21,371 +21,345 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // debuglines.cpp:
-// 
+//
 
 #include "debuglines.h"
 #include "game.h"
 
 #define NUM_CIRCLE_SEGMENTS 24
 
-debugline_t		*DebugLines = NULL;
-debugstring_t	*DebugStrings = NULL;
-Vector		   currentVertex( 0, 0, 0 );
-Vector		   vertColor( 1, 1, 1 );
-float			   vertAlpha = 1;
-float			   vertexIndex = 0;
-float          linewidth = 1;
+debugline_t   *DebugLines   = NULL;
+debugstring_t *DebugStrings = NULL;
+Vector         currentVertex(0, 0, 0);
+Vector         vertColor(1, 1, 1);
+float          vertAlpha         = 1;
+float          vertexIndex       = 0;
+float          linewidth         = 1;
 unsigned short lineStippleFactor = 1;
-unsigned short linePattern = 0xffff;
-int g_iFirstLine;
-int g_iCurrFrameLineCounter;
-int g_iFrameLineCount[ 100 ];
+unsigned short linePattern       = 0xffff;
+int            g_iFirstLine;
+int            g_iCurrFrameLineCounter;
+int            g_iFrameLineCount[100];
 
-void G_InitDebugLines
-	(
-	void
-	)
+void G_InitDebugLines(void)
 {
-	if( g_numdebuglinedelays->integer <= 0 )
-	{
-		*gi.DebugLines = DebugLines;
-		*gi.numDebugLines = 0;
-		g_iFirstLine = 0;
+    if (g_numdebuglinedelays->integer <= 0) {
+        *gi.DebugLines    = DebugLines;
+        *gi.numDebugLines = 0;
+        g_iFirstLine      = 0;
 
-		for( int i = 0; i < 100; i++ )
-		{
-			g_iFrameLineCount[ i ] = 0;
-		}
+        for (int i = 0; i < 100; i++) {
+            g_iFrameLineCount[i] = 0;
+        }
 
-		g_iCurrFrameLineCounter = 0;
-	}
-	else
-	{
-		int iNumDelays = g_numdebuglinedelays->integer;
-		int iCount;
+        g_iCurrFrameLineCounter = 0;
+    } else {
+        int iNumDelays = g_numdebuglinedelays->integer;
+        int iCount;
 
-		if( iNumDelays > 99 )
-			iNumDelays = 99;
+        if (iNumDelays > 99) {
+            iNumDelays = 99;
+        }
 
-		iCount = g_iFrameLineCount[ ( g_iCurrFrameLineCounter - iNumDelays + 100 ) % 100 ];
-		if( iCount )
-		{
-			g_iFirstLine += iCount;
-			*gi.numDebugLines -= iCount;
-			g_iFrameLineCount[ ( g_iCurrFrameLineCounter - iNumDelays + 100 ) % 100 ] = 0;
-		}
+        iCount = g_iFrameLineCount[(g_iCurrFrameLineCounter - (iNumDelays - 100)) % 100];
+        if (iCount) {
+            g_iFirstLine += iCount;
+            *gi.numDebugLines -= iCount;
+            g_iFrameLineCount[(g_iCurrFrameLineCounter - (iNumDelays - 100)) % 100] = 0;
+        }
 
-		g_iCurrFrameLineCounter = ( g_iCurrFrameLineCounter + 1 ) % 100;
-		*gi.DebugLines = &DebugLines[ g_iFirstLine ];
-	}
+        g_iCurrFrameLineCounter = (g_iCurrFrameLineCounter + 1) % 100;
+        *gi.DebugLines          = &DebugLines[g_iFirstLine];
+    }
 
-	currentVertex = vec_zero;
-	vertColor = Vector( 1, 1, 1 );
-	vertAlpha = 1;
-	vertexIndex = 0;
+    currentVertex = vec_zero;
+    vertColor     = Vector(1, 1, 1);
+    vertAlpha     = 1;
+    vertexIndex   = 0;
 
-	linewidth = 1;
-	lineStippleFactor = 1;
-	linePattern = 0xffff;
+    linewidth         = 1;
+    lineStippleFactor = 1;
+    linePattern       = 0xffff;
 }
 
-void G_InitDebugStrings
-	(
-	void
-	)
+void G_InitDebugStrings(void)
 {
-	*gi.DebugStrings = DebugStrings;
-	*gi.numDebugStrings = 0;
+    *gi.DebugStrings    = DebugStrings;
+    *gi.numDebugStrings = 0;
 }
 
-void G_AllocDebugLines
-	(
-	void
-	)
+void G_AllocDebugLines(void)
 {
-	// we do a malloc here so that we don't interfere with the game's memory footprint
-	DebugLines = ( debugline_t * )malloc( ( int )g_numdebuglines->integer * sizeof( debugline_t ) );
+    // we do a malloc here so that we don't interfere with the game's memory footprint
+    DebugLines = (debugline_t *)malloc((int)g_numdebuglines->integer * sizeof(debugline_t));
 
-	G_InitDebugLines();
+    G_InitDebugLines();
 
-	for( int i = 0; i < 100; i++ )
-	{
-		g_iFrameLineCount[ i ] = 0;
-	}
+    for (int i = 0; i < 100; i++) {
+        g_iFrameLineCount[i] = 0;
+    }
 
-	g_iCurrFrameLineCounter = 0;
+    g_iCurrFrameLineCounter = 0;
 }
 
-void G_AllocDebugStrings
-	(
-	void
-	)
+void G_AllocDebugStrings(void)
 {
-	DebugStrings = ( debugstring_t * )malloc( ( int )g_numdebugstrings->integer * sizeof( debugstring_t ) );
+    DebugStrings = (debugstring_t *)malloc((int)g_numdebugstrings->integer * sizeof(debugstring_t));
 
-	G_InitDebugStrings();
+    G_InitDebugStrings();
 }
 
-void G_DeAllocDebugLines
-	(
-	void
-	)
+void G_DeAllocDebugLines(void)
 {
-	if( DebugLines )
-	{
-		// we do a free here, because we used malloc above
-		free( DebugLines );
-		DebugLines = NULL;
-		*gi.DebugLines = DebugLines;
-		*gi.numDebugLines = 0;
-	}
+    if (DebugLines) {
+        // we do a free here, because we used malloc above
+        free(DebugLines);
+        DebugLines        = NULL;
+        *gi.DebugLines    = DebugLines;
+        *gi.numDebugLines = 0;
+    }
 }
 
-void G_ShiftDebugLines
-	(
-	void
-	)
+void G_ShiftDebugLines(void)
 {
-	int iNewPos;
-	int iOldPos;
+    int iNewPos;
+    int iOldPos;
 
-	for( iNewPos = 0; iNewPos < *gi.numDebugLines && iNewPos < g_numdebuglines->integer; iNewPos++ )
-	{
-		iOldPos = g_iFirstLine + iNewPos;
+    for (iNewPos = 0; iNewPos < *gi.numDebugLines && iNewPos < g_numdebuglines->integer; iNewPos++) {
+        iOldPos = g_iFirstLine + iNewPos;
 
-		DebugLines[ iNewPos ] = DebugLines[ iOldPos ];
-	}
+        DebugLines[iNewPos] = DebugLines[iOldPos];
+    }
 
-	g_iFirstLine = 0;
-	*gi.DebugLines = DebugLines;
+    g_iFirstLine   = 0;
+    *gi.DebugLines = DebugLines;
 }
 
-void G_DeAllocDebugStrings
-	(
-	void
-	)
+void G_DeAllocDebugStrings(void)
 {
-	if( DebugStrings )
-	{
-		// we do a free here, because we used malloc above
-		free( DebugStrings );
-		DebugStrings = NULL;
-		*gi.DebugStrings = DebugStrings;
-		*gi.numDebugStrings = 0;
-	}
+    if (DebugStrings) {
+        // we do a free here, because we used malloc above
+        free(DebugStrings);
+        DebugStrings        = NULL;
+        *gi.DebugStrings    = DebugStrings;
+        *gi.numDebugStrings = 0;
+    }
 }
 
-void G_DebugLine
-	(
-	Vector start,
-	Vector end,
-	float r,
-	float g,
-	float b,
-	float alpha
-	)
+void G_DebugLine(Vector start, Vector end, float r, float g, float b, float alpha)
 {
-	debugline_t *line;
-	static int printTime = 0;
+    debugline_t *line;
+    static int   printTime = 0;
 
-	if( !g_numdebuglines->integer )
-	{
-		return;
-	}
+    if (!g_numdebuglines->integer) {
+        return;
+    }
 
-	if( *gi.numDebugLines >= g_numdebuglines->integer )
-	{
-		if( level.svsTime >= printTime )
-		{
-			printTime = level.svsTime + 5000;
-			gi.DPrintf( "G_DebugLine: Exceeded MAX_DEBUG_LINES\n" );
-		}
+    if (*gi.numDebugLines >= g_numdebuglines->integer) {
+        if (level.svsTime >= printTime) {
+            printTime = level.svsTime + 5000;
+            gi.DPrintf("G_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+        }
 
-		return;
-	}
+        return;
+    }
 
-	if( g_numdebuglinedelays->integer > 0 && g_iFirstLine > 0 && g_iFirstLine + *gi.numDebugLines + 1 >= g_numdebuglines->integer )
-	{
-		G_ShiftDebugLines();
-	}
+    if (g_numdebuglinedelays->integer > 0 && g_iFirstLine > 0
+        && g_iFirstLine + *gi.numDebugLines + 1 >= g_numdebuglines->integer) {
+        G_ShiftDebugLines();
+    }
 
-	line = &DebugLines[ *gi.numDebugLines ];
-	( *gi.numDebugLines )++;
-	g_iFrameLineCount[ g_iCurrFrameLineCounter ]++;
+    line = &DebugLines[g_iFirstLine  + *gi.numDebugLines];
+    (*gi.numDebugLines)++;
+    g_iFrameLineCount[g_iCurrFrameLineCounter]++;
 
-	VectorCopy( start, line->start );
-	VectorCopy( end, line->end );
-	VectorSet( line->color, r, g, b );
-	line->alpha = alpha;
+    VectorCopy(start, line->start);
+    VectorCopy(end, line->end);
+    VectorSet(line->color, r, g, b);
+    line->alpha = alpha;
 
-	line->width = linewidth;
-	line->factor = lineStippleFactor;
-	line->pattern = linePattern;
+    line->width   = linewidth;
+    line->factor  = lineStippleFactor;
+    line->pattern = linePattern;
 }
 
-void G_LineStipple
-   (
-   int factor,
-   unsigned short pattern
-   )
+void G_LineStipple(int factor, unsigned short pattern)
+{
+    lineStippleFactor = factor;
+    linePattern       = pattern;
+}
 
-   {
-   lineStippleFactor = factor;
-   linePattern = pattern;
-   }
+void G_LineWidth(float width)
+{
+    linewidth = width;
+}
 
-void G_LineWidth
-   (
-   float width
-   )
-   
-   {
-   linewidth = width;
-   }
+void G_Color3f(float r, float g, float b)
+{
+    vertColor = Vector(r, g, b);
+}
 
-void G_Color3f
-	(
-	float r,
-	float g,
-	float b
-	)
+void G_Color3v(Vector color)
+{
+    vertColor = color;
+}
 
-	{
-	vertColor = Vector( r, g, b );
-	}
+void G_Color4f(float r, float g, float b, float alpha)
+{
+    vertColor = Vector(r, g, b);
+    vertAlpha = alpha;
+}
 
-void G_Color3v
-	(
-	Vector color
-	)
+void G_Color3vf(Vector color, float alpha)
+{
+    vertColor = color;
+    vertAlpha = alpha;
+}
 
-	{
-	vertColor = color;
-	}
+void G_BeginLine(void)
+{
+    currentVertex = vec_zero;
+    vertexIndex   = 0;
+}
 
-void G_Color4f
-	(
-	float r,
-	float g,
-	float b,
-	float alpha
-	)
+void G_Vertex(Vector v)
+{
+    vertexIndex++;
+    if (vertexIndex > 1) {
+        G_DebugLine(currentVertex, v, vertColor[0], vertColor[1], vertColor[2], vertAlpha);
+    }
+    currentVertex = v;
+}
 
-	{
-	vertColor = Vector( r, g, b );
-	vertAlpha = alpha;
-	}
+void G_EndLine(void)
+{
+    currentVertex = vec_zero;
+    vertexIndex   = 0;
+}
 
-void G_Color3vf
-	(
-	Vector color,
-	float alpha
-	)
+void G_DebugBBox(Vector org, Vector mins, Vector maxs, float r, float g, float b, float alpha)
+{
+    int    i;
+    Vector points[8];
 
-	{
-	vertColor = color;
-	vertAlpha = alpha;
-	}
-
-void G_BeginLine
-	(
-	void
-	)
-
-	{
-	currentVertex = vec_zero;
-	vertexIndex = 0;
-	}
-
-void G_Vertex
-	(
-	Vector v
-	)
-
-	{
-	vertexIndex++;
-	if ( vertexIndex > 1 )
-		{
-		G_DebugLine( currentVertex, v, vertColor[ 0 ], vertColor[ 1 ], vertColor[ 2 ], vertAlpha );
-		}
-	currentVertex = v;
-	}
-
-void G_EndLine
-	(
-	void
-	)
-
-	{
-	currentVertex = vec_zero;
-	vertexIndex = 0;
-	}
-
-void G_DebugBBox
-   (
-   Vector org,
-   Vector mins,
-   Vector maxs,
-   float r,
-   float g,
-   float b,
-   float alpha
-   )
-   {
-   int i;
-   Vector points[8];
-
-	/*
+    /*
 	** compute a full bounding box
 	*/
-	for ( i = 0; i < 8; i++ )
-	   {
-		Vector   tmp;
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
 
-		if ( i & 1 )
-			tmp[0] = org[0] +  mins[0];
-		else
-			tmp[0] = org[0] + maxs[0];
+        if (i & 1) {
+            tmp[0] = org[0] + mins[0];
+        } else {
+            tmp[0] = org[0] + maxs[0];
+        }
 
-		if ( i & 2 )
-			tmp[1] = org[1] + mins[1];
-		else
-			tmp[1] = org[1] + maxs[1];
+        if (i & 2) {
+            tmp[1] = org[1] + mins[1];
+        } else {
+            tmp[1] = org[1] + maxs[1];
+        }
 
-		if ( i & 4 )
-			tmp[2] = org[2] + mins[2];
-		else
-			tmp[2] = org[2] + maxs[2];
+        if (i & 4) {
+            tmp[2] = org[2] + mins[2];
+        } else {
+            tmp[2] = org[2] + maxs[2];
+        }
 
-		points[i] = tmp;
-	   }
+        points[i] = tmp;
+    }
 
-   G_Color4f( r, g, b, alpha );
+    G_Color4f(r, g, b, alpha);
 
-   G_BeginLine();
-   G_Vertex( points[0] );
-   G_Vertex( points[1] );
-   G_Vertex( points[3] );
-   G_Vertex( points[2] );
-   G_Vertex( points[0] );
-   G_EndLine();
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[3]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
 
-   G_BeginLine();
-   G_Vertex( points[4] );
-   G_Vertex( points[5] );
-   G_Vertex( points[7] );
-   G_Vertex( points[6] );
-   G_Vertex( points[4] );
-   G_EndLine();
+    G_BeginLine();
+    G_Vertex(points[4]);
+    G_Vertex(points[5]);
+    G_Vertex(points[7]);
+    G_Vertex(points[6]);
+    G_Vertex(points[4]);
+    G_EndLine();
 
-	for ( i = 0; i < 4; i++ )
-      {
-      G_BeginLine();
-      G_Vertex( points[i] );
-      G_Vertex( points[4 + i] );
-      G_EndLine();
-      }
-   }
+    G_Color4f(0, 0, 1, alpha);
+
+    for (i = 0; i < 4; i++) {
+        G_BeginLine();
+        G_Vertex(points[i]);
+        G_Vertex(points[4 + i]);
+        G_EndLine();
+    }
+}
+
+void G_DebugRotatedBBox(Vector org, Vector ang, Vector mins, Vector maxs, float r, float g, float b, float alpha) {
+    int i;
+    Vector tmp;
+    Vector points[8];
+    vec3_t axis[3];
+
+    AnglesToAxis(ang, axis);
+
+    /*
+	** compute a full bounding box
+	*/
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
+
+        if (i & 1) {
+            tmp[0] = mins[0];
+        } else {
+            tmp[0] = maxs[0];
+        }
+
+        if (i & 2) {
+            tmp[1] = mins[1];
+        } else {
+            tmp[1] = maxs[1];
+        }
+
+        if (i & 4) {
+            tmp[2] = mins[2];
+        } else {
+            tmp[2] = maxs[2];
+        }
+
+        MatrixTransformVector(tmp, axis, points[i]);
+        points[i] += org;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[3]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[4]);
+    G_Vertex(points[5]);
+    G_Vertex(points[7]);
+    G_Vertex(points[6]);
+    G_Vertex(points[4]);
+    G_EndLine();
+
+    G_Color4f(0, 0, 1, alpha);
+
+    for (i = 0; i < 4; i++) {
+        G_BeginLine();
+        G_Vertex(points[i]);
+        G_Vertex(points[4 + i]);
+        G_EndLine();
+    }
+}
 
 //
 // LED style digits
@@ -401,500 +375,408 @@ void G_DebugBBox
 // ****3***  12**
 //             11
 
-static int Numbers[ 12 ][ 8 ] =
-	{
-		{ 1, 3, 4, 5, 6, 7, 0, 0 }, // 0
-		{ 4, 5, 0, 0, 0, 0, 0, 0 }, // 1
-		{ 1, 4, 2, 7, 3, 0, 0, 0 }, // 2
-		{ 1, 4, 2, 5, 3, 0, 0, 0 }, // 3
-		{ 6, 4, 2, 5, 0, 0, 0, 0 }, // 4
-		{ 1, 6, 2, 5, 3, 0, 0, 0 }, // 5
-		{ 1, 6, 2, 5, 7, 3, 0, 0 }, // 6
-		{ 1, 8, 0, 0, 0, 0, 0, 0 }, // 7
-		{ 1, 2, 3, 4, 5, 6, 7, 0 }, // 8
-		{ 1, 6, 4, 2, 5, 3, 0, 0 }, // 9
-		{ 9, 10, 11, 12, 0, 0, 0, 0 }, // .
-		{ 2, 0, 0, 0, 0, 0, 0, 0 }, // -
-	};
+static int Numbers[12][8] = {
+    {1, 3,  4,  5,  6, 7, 0, 0}, // 0
+    {4, 5,  0,  0,  0, 0, 0, 0}, // 1
+    {1, 4,  2,  7,  3, 0, 0, 0}, // 2
+    {1, 4,  2,  5,  3, 0, 0, 0}, // 3
+    {6, 4,  2,  5,  0, 0, 0, 0}, // 4
+    {1, 6,  2,  5,  3, 0, 0, 0}, // 5
+    {1, 6,  2,  5,  7, 3, 0, 0}, // 6
+    {1, 8,  0,  0,  0, 0, 0, 0}, // 7
+    {1, 2,  3,  4,  5, 6, 7, 0}, // 8
+    {1, 6,  4,  2,  5, 3, 0, 0}, // 9
+    {9, 10, 11, 12, 0, 0, 0, 0}, // .
+    {2, 0,  0,  0,  0, 0, 0, 0}, // -
+};
 
-static float Lines[ 13 ][ 4 ] =
-	{
-		{ 0, 0, 0, 0 },		// Unused
-		{ -4, 8, 4, 8 },		// 1
-		{ -4, 4, 4, 4 },		// 2
-		{ -4, 0, 4, 0 },		// 3
-		{ 4, 8, 4, 4 },		// 4
-		{ 4, 4, 4, 0 },		// 5
-		{ -4, 8, -4, 4 },		// 6
-		{ -4, 4, -4, 0 },		// 7
-		{ 4, 8, -4, 0 },		// 8
+static float Lines[13][4] = {
+    {0,  0, 0,  0}, // Unused
+    {-4, 8, 4,  8}, // 1
+    {-4, 4, 4,  4}, // 2
+    {-4, 0, 4,  0}, // 3
+    {4,  8, 4,  4}, // 4
+    {4,  4, 4,  0}, // 5
+    {-4, 8, -4, 4}, // 6
+    {-4, 4, -4, 0}, // 7
+    {4,  8, -4, 0}, // 8
 
-      { -1, 2, 1, 2 },		// 9
-      { 1, 2, 1, 0 },		// 10
-      { -1, 0, 1, 0 },		// 11
-      { -1, 0, -1, 2 },		// 12
-	};
+    {-1, 2, 1,  2}, // 9
+    {1,  2, 1,  0}, // 10
+    {-1, 0, 1,  0}, // 11
+    {-1, 0, -1, 2}, // 12
+};
 
-void G_DrawDebugNumber
-	(
-	Vector org,
-	float number,
-	float scale,
-	float r,
-	float g,
-	float b,
-	int precision
-	)
+void G_DrawDebugNumber(Vector org, float number, float scale, float r, float g, float b, int precision)
 {
-	int i;
-	int j;
-	int l;
-	int num;
-	Vector up;
-	Vector left;
-	Vector pos;
-	Vector start;
-	Vector ang;
-	str text;
-	Vector delta;
-	char format[ 20 ];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
+    Vector up;
+    Vector left;
+    Vector pos;
+    Vector start;
+    Vector ang;
+    str    text;
+    Vector delta;
+    char   format[20];
 
-	// only draw entity numbers within a certain radius
-	delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if( ( delta * delta ) > ( 1000 * 1000 ) )
-	{
-		return;
-	}
+    // only draw entity numbers within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > (1000 * 1000)) {
+        return;
+    }
 
-	G_Color4f( r, g, b, 1.0 );
+    G_Color4f(r, g, b, 1.0);
 
-	ang = game.clients[ 0 ].ps.viewangles;
-	ang.AngleVectorsLeft( NULL, &left, &up );
+    ang = game.clients[0].ps.viewangles;
+    ang.AngleVectorsLeft(NULL, &left, &up);
 
-	up *= scale;
-	left *= scale;
+    up *= scale;
+    left *= scale;
 
-	if( precision > 0 )
-	{
-		sprintf( format, "%%.%df", precision );
-		text = va( format, number );
-	}
-	else
-	{
-		text = va( "%d", ( int )number );
-	}
+    if (precision > 0) {
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
+        text = va(format, number);
+    } else {
+        text = va("%d", (int)number);
+    }
 
-	start = org + ( text.length() - 1 ) * 5 * left;
+    start = org + (text.length() - 1) * 5 * left;
 
-	for( i = 0; i < text.length(); i++ )
-	{
-		if( text[ i ] == '.' )
-		{
-			num = 10;
-		}
-		else if( text[ i ] == '-' )
-		{
-			num = 11;
-		}
-		else
-		{
-			num = text[ i ] - '0';
-		}
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
 
-		for( j = 0; j < 8; j++ )
-		{
-			l = Numbers[ num ][ j ];
-			if( l == 0 )
-			{
-				break;
-			}
+        for (j = 0; j < 8; j++) {
+            l = Numbers[num][j];
+            if (l == 0) {
+                break;
+            }
 
-			G_BeginLine();
+            G_BeginLine();
 
-			pos = start - Lines[ l ][ 0 ] * left + Lines[ l ][ 1 ] * up;
-			G_Vertex( pos );
+            pos = start - Lines[l][0] * left + Lines[l][1] * up;
+            G_Vertex(pos);
 
-			pos = start - Lines[ l ][ 2 ] * left + Lines[ l ][ 3 ] * up;
-			G_Vertex( pos );
+            pos = start - Lines[l][2] * left + Lines[l][3] * up;
+            G_Vertex(pos);
 
-			G_EndLine();
-		}
+            G_EndLine();
+        }
 
-		start -= 10 * left;
-	}
+        start -= 10 * left;
+    }
 }
 
-void G_DebugCircle
-   ( 
-   float *org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha,
-   qboolean horizontal
-   )
-   {
-   int i;
-   float ang;
-   Vector angles;
-	Vector forward;
-	Vector left;
-	Vector pos;
-   Vector delta;
-
-	// only draw circles within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   if ( horizontal )
-      {
-      forward = "1 0 0";
-      left = "0 -1 0";
-      }
-   else
-      {
-	   angles = game.clients[ 0 ].ps.viewangles;
-	   angles.AngleVectors( NULL, &left, &forward );
-      }
-
-   G_BeginLine();
-   for( i = 0; i <= NUM_CIRCLE_SEGMENTS; i++ )
-      {
-      ang = DEG2RAD( i * 360 / NUM_CIRCLE_SEGMENTS );
-      pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-      G_Vertex( pos );
-      }
-   G_EndLine();
-   }
-
-void G_DebugOrientedCircle
-   ( 
-   Vector org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha,
-   Vector angles
-   )
-   {
-   int i;
-   float ang;
-	Vector forward;
-	Vector left;
-	Vector pos;
-   Vector delta;
-
-	// only draw circles within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   angles.AngleVectors( NULL, &left, &forward );
-
-   G_BeginLine();
-   for( i = 0; i <= NUM_CIRCLE_SEGMENTS; i++ )
-      {
-      ang = DEG2RAD( i * 360 / NUM_CIRCLE_SEGMENTS );
-      pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-      G_Vertex( pos );
-      }
-   G_EndLine();
-
-   //
-   // Draw the cross sign
-   //
-   G_BeginLine();
-   ang = DEG2RAD( 45 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   ang = DEG2RAD( 225 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-
-   G_BeginLine();
-   ang = DEG2RAD( 315 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   ang = DEG2RAD( 135 * 360 / NUM_CIRCLE_SEGMENTS );
-   pos = org + ( sin( ang ) * radius * forward ) - ( cos( ang ) * radius * left );
-   G_Vertex( pos );
-   }
-
-void G_DebugPyramid
-   ( 
-   Vector org, 
-   float radius, 
-   float r, 
-   float g, 
-   float b, 
-   float alpha 
-   )
-   {
-   Vector delta;
-   Vector points[ 4 ];
-
-	// only draw pyramids within a certain radius
-   delta = Vector( g_entities[ 0 ].s.origin ) - org;
-	if ( ( delta * delta ) > ( ( 1000 + radius ) * ( 1000 + radius ) ) )
-		{
-		return;
-		}
-
-   G_Color4f( r, g, b, alpha );
-
-   points[ 0 ] = org;
-   points[ 0 ].z += radius;
-
-   points[ 1 ] = org;
-   points[ 1 ].z -= radius;
-   points[ 2 ] = points[ 1 ];
-   points[ 3 ] = points[ 1 ];
-
-   points[ 1 ].x += cos( DEG2RAD( 0 ) ) * radius;
-   points[ 1 ].y += sin( DEG2RAD( 0 ) ) * radius;
-   points[ 2 ].x += cos( DEG2RAD( 120 ) ) * radius;
-   points[ 2 ].y += sin( DEG2RAD( 120 ) ) * radius;
-   points[ 3 ].x += cos( DEG2RAD( 240 ) ) * radius;
-   points[ 3 ].y += sin( DEG2RAD( 240 ) ) * radius;
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 0 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 0 ] );
-   G_EndLine();
-
-   G_BeginLine();
-   G_Vertex( points[ 1 ] );
-   G_Vertex( points[ 2 ] );
-   G_Vertex( points[ 3 ] );
-   G_Vertex( points[ 1 ] );
-   G_EndLine();
-   }
-
-void G_DrawCoordSystem
-   (
-   Vector pos,
-   Vector forward,
-   Vector right,
-   Vector up,
-   int length
-   )
-
-   {
-   if ( g_showaxis->integer )
-      {
-      G_DebugLine( pos, pos + forward * length, 1,0,0,1 );
-      G_DebugLine( pos, pos + right * length, 0,1,0,1 );
-      G_DebugLine( pos, pos + up * length, 0,0,1,1 );
-      }
-   }
-
-void G_DrawCSystem
-	(
-	Vector pos,
-	Vector forward,
-	Vector right,
-	Vector up,
-	int length
-	)
+void G_DebugCircle(float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal)
 {
-	G_DebugLine( pos, pos + forward * length, 1.0, 0, 0, 1 );
-	G_DebugLine( pos, pos + right * length, 0, 1.0, 0, 1 );
-	G_DebugLine( pos, pos + up * length, 0, 0, 1.0, 1 );
+    int    i;
+    float  ang;
+    Vector angles;
+    Vector forward;
+    Vector left;
+    Vector pos;
+    Vector delta;
+
+    // only draw circles within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    if (horizontal) {
+        forward = "1 0 0";
+        left    = "0 -1 0";
+    } else {
+        angles = game.clients[0].ps.viewangles;
+        angles.AngleVectors(NULL, &left, &forward);
+    }
+
+    G_BeginLine();
+    for (i = 0; i <= NUM_CIRCLE_SEGMENTS; i++) {
+        ang = DEG2RAD(i * 360 / NUM_CIRCLE_SEGMENTS);
+        pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+        G_Vertex(pos);
+    }
+    G_EndLine();
 }
 
-void G_DebugArrow
-   ( 
-   Vector   org, 
-   Vector   dir,
-   float    length,
-   float    r, 
-   float    g, 
-   float    b, 
-   float    alpha 
-   )
-   {
-   Vector right;
-   Vector up;
-   Vector startpoint;
-   Vector endpoint;
+void G_DebugOrientedCircle(Vector org, float radius, float r, float g, float b, float alpha, Vector angles)
+{
+    int    i;
+    float  ang;
+    Vector forward;
+    Vector left;
+    Vector pos;
+    Vector delta;
 
-   PerpendicularVector( right, dir );
-	up.CrossProduct( right, dir );
+    // only draw circles within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
 
-   startpoint = org;
+    G_Color4f(r, g, b, alpha);
 
-   endpoint = startpoint + dir * length;
-   length /= 6;
-   G_DebugLine( startpoint, endpoint, r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint - (right * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint + (right * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint - (up * length) - (dir * length), r, g, b, alpha );
-   G_DebugLine( endpoint, endpoint + (up * length) - (dir * length), r, g, b, alpha );
-   }
+    angles.AngleVectors(NULL, &left, &forward);
 
-void G_DebugHighlightFacet
-   (
-   Vector org,
-   Vector mins,
-   Vector maxs,
-   facet_t facet,
-   float r,
-   float g,
-   float b,
-   float alpha
-   )
-   {
-   int i;
-   Vector points[8];
+    G_BeginLine();
+    for (i = 0; i <= NUM_CIRCLE_SEGMENTS; i++) {
+        ang = DEG2RAD(i * 360 / NUM_CIRCLE_SEGMENTS);
+        pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+        G_Vertex(pos);
+    }
+    G_EndLine();
 
-	/*
+    //
+    // Draw the cross sign
+    //
+    G_BeginLine();
+    ang = DEG2RAD(45 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+    ang = DEG2RAD(225 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+
+    G_BeginLine();
+    ang = DEG2RAD(315 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+    ang = DEG2RAD(135 * 360 / NUM_CIRCLE_SEGMENTS);
+    pos = org + (sin(ang) * radius * forward) - (cos(ang) * radius * left);
+    G_Vertex(pos);
+}
+
+void G_DebugPyramid(Vector org, float radius, float r, float g, float b, float alpha)
+{
+    Vector delta;
+    Vector points[4];
+
+    // only draw pyramids within a certain radius
+    delta = Vector(g_entities[0].s.origin) - org;
+    if ((delta * delta) > ((1000 + radius) * (1000 + radius))) {
+        return;
+    }
+
+    G_Color4f(r, g, b, alpha);
+
+    points[0] = org;
+    points[0].z += radius;
+
+    points[1] = org;
+    points[1].z -= radius;
+    points[2] = points[1];
+    points[3] = points[1];
+
+    points[1].x += cos(DEG2RAD(0)) * radius;
+    points[1].y += sin(DEG2RAD(0)) * radius;
+    points[2].x += cos(DEG2RAD(120)) * radius;
+    points[2].y += sin(DEG2RAD(120)) * radius;
+    points[3].x += cos(DEG2RAD(240)) * radius;
+    points[3].y += sin(DEG2RAD(240)) * radius;
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[1]);
+    G_Vertex(points[2]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[2]);
+    G_Vertex(points[3]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[0]);
+    G_Vertex(points[3]);
+    G_Vertex(points[1]);
+    G_Vertex(points[0]);
+    G_EndLine();
+
+    G_BeginLine();
+    G_Vertex(points[1]);
+    G_Vertex(points[2]);
+    G_Vertex(points[3]);
+    G_Vertex(points[1]);
+    G_EndLine();
+}
+
+void G_DrawCoordSystem(Vector pos, Vector forward, Vector right, Vector up, int length)
+{
+    if (g_showaxis->integer) {
+        G_DebugLine(pos, pos + forward * length, 1, 0, 0, 1);
+        G_DebugLine(pos, pos + right * length, 0, 1, 0, 1);
+        G_DebugLine(pos, pos + up * length, 0, 0, 1, 1);
+    }
+}
+
+void G_DrawCSystem(Vector pos, Vector forward, Vector right, Vector up, int length)
+{
+    G_DebugLine(pos, pos + forward * length, 1.0, 0, 0, 1);
+    G_DebugLine(pos, pos + right * length, 0, 1.0, 0, 1);
+    G_DebugLine(pos, pos + up * length, 0, 0, 1.0, 1);
+}
+
+void G_DebugArrow(Vector org, Vector dir, float length, float r, float g, float b, float alpha)
+{
+    Vector right;
+    Vector up;
+    Vector startpoint;
+    Vector endpoint;
+
+    PerpendicularVector(right, dir);
+    up.CrossProduct(right, dir);
+
+    startpoint = org;
+
+    endpoint = startpoint + dir * length;
+    length /= 6;
+    G_DebugLine(startpoint, endpoint, r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint - (right * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint + (right * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint - (up * length) - (dir * length), r, g, b, alpha);
+    G_DebugLine(endpoint, endpoint + (up * length) - (dir * length), r, g, b, alpha);
+}
+
+void G_DebugHighlightFacet(Vector org, Vector mins, Vector maxs, facet_t facet, float r, float g, float b, float alpha)
+{
+    int    i;
+    Vector points[8];
+
+    /*
 	** compute a full bounding box
 	*/
-	for ( i = 0; i < 8; i++ )
-	   {
-		Vector   tmp;
+    for (i = 0; i < 8; i++) {
+        Vector tmp;
 
-		if ( i & 1 )
-			tmp[0] = org[0] +  mins[0];
-		else
-			tmp[0] = org[0] + maxs[0];
+        if (i & 1) {
+            tmp[0] = org[0] + mins[0];
+        } else {
+            tmp[0] = org[0] + maxs[0];
+        }
 
-		if ( i & 2 )
-			tmp[1] = org[1] + mins[1];
-		else
-			tmp[1] = org[1] + maxs[1];
+        if (i & 2) {
+            tmp[1] = org[1] + mins[1];
+        } else {
+            tmp[1] = org[1] + maxs[1];
+        }
 
-		if ( i & 4 )
-			tmp[2] = org[2] + mins[2];
-		else
-			tmp[2] = org[2] + maxs[2];
+        if (i & 4) {
+            tmp[2] = org[2] + mins[2];
+        } else {
+            tmp[2] = org[2] + maxs[2];
+        }
 
-		points[i] = tmp;
-	   }
+        points[i] = tmp;
+    }
 
-   G_Color4f( r, g, b, alpha );
+    G_Color4f(r, g, b, alpha);
 
-   switch( facet )
-      {
-      case north:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[5] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[4] );
-         G_EndLine();
-         break;
-      case south:
-         G_BeginLine();
-         G_Vertex( points[2] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[3] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         break;
-      case east:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[4] );
-         G_Vertex( points[2] );
-         G_EndLine();
-         break;
-      case west:
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[5] );
-         G_Vertex( points[3] );
-         G_EndLine();
-         break;
-      case up:
-         G_BeginLine();
-         G_Vertex( points[0] );
-         G_Vertex( points[3] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[1] );
-         G_Vertex( points[2] );
-         G_EndLine();
-         break;
-      case down:
-         G_BeginLine();
-         G_Vertex( points[4] );
-         G_Vertex( points[7] );
-         G_EndLine();
-         G_BeginLine();
-         G_Vertex( points[5] );
-         G_Vertex( points[6] );
-         G_EndLine();
-         break;
-      }
-   }
+    switch (facet) {
+    case north:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[5]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[4]);
+        G_EndLine();
+        break;
+    case south:
+        G_BeginLine();
+        G_Vertex(points[2]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[3]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        break;
+    case east:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[4]);
+        G_Vertex(points[2]);
+        G_EndLine();
+        break;
+    case west:
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[5]);
+        G_Vertex(points[3]);
+        G_EndLine();
+        break;
+    case up:
+        G_BeginLine();
+        G_Vertex(points[0]);
+        G_Vertex(points[3]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[1]);
+        G_Vertex(points[2]);
+        G_EndLine();
+        break;
+    case down:
+        G_BeginLine();
+        G_Vertex(points[4]);
+        G_Vertex(points[7]);
+        G_EndLine();
+        G_BeginLine();
+        G_Vertex(points[5]);
+        G_Vertex(points[6]);
+        G_EndLine();
+        break;
+    }
+}
 
-   void G_DebugString(Vector pos, float scale, float r, float g, float b, const char* pszText, ...)
-   {
-	   debugstring_t* string;
-	   va_list        va;
-	   char           szTemp[32768];
+void G_DebugString(Vector pos, float scale, float r, float g, float b, const char *pszText, ...)
+{
+    debugstring_t *string;
+    va_list        va;
+    char           szTemp[32768];
 
-	   if (!g_numdebugstrings) {
-		   return;
-	   }
+    if (!g_numdebugstrings) {
+        return;
+    }
 
-	   if (*gi.numDebugStrings < g_numdebugstrings->integer) {
-		   string = (debugstring_t*)&DebugStrings[*gi.numDebugStrings];
+    if (*gi.numDebugStrings < g_numdebugstrings->integer) {
+        string = (debugstring_t *)&DebugStrings[*gi.numDebugStrings];
 
-		   (*gi.numDebugStrings)++;
+        (*gi.numDebugStrings)++;
 
-		   va_start(va, pszText);
-		   vsprintf(szTemp, pszText, va);
-		   va_end(va);
+        va_start(va, pszText);
+        Q_vsnprintf(szTemp, sizeof(szTemp), pszText, va);
+        va_end(va);
 
-		   VectorCopy(pos, string->pos);
-		   string->scale = scale;
-		   string->color[0] = r;
-		   string->color[1] = g;
-		   string->color[2] = b;
-		   string->color[3] = 1.0f;
-		   strncpy(string->szText, szTemp, sizeof(string->szText));
-		   string->szText[sizeof(string->szText) - 1] = 0;
-	   }
-	   else {
-		   gi.DPrintf("G_DebugString: Exceeded g_numdebugstrings\n");
-	   }
-   }
+        VectorCopy(pos, string->pos);
+        string->scale    = scale;
+        string->color[0] = r;
+        string->color[1] = g;
+        string->color[2] = b;
+        string->color[3] = 1.0f;
+        strncpy(string->szText, szTemp, sizeof(string->szText));
+        string->szText[sizeof(string->szText) - 1] = 0;
+    } else {
+        gi.DPrintf("G_DebugString: Exceeded g_numdebugstrings\n");
+    }
+}
diff --git a/code/fgame/debuglines.h b/code/fgame/debuglines.h
index 9d497460..e0656332 100644
--- a/code/fgame/debuglines.h
+++ b/code/fgame/debuglines.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // debuglines.h:
 
-#ifndef __DEBUGLINES_H__
-#define __DEBUGLINES_H__
+#pragma once
 
 #include "g_local.h"
 
@@ -40,6 +39,7 @@ void G_BeginLine( void );
 void G_Vertex( Vector v );
 void G_EndLine( void );
 void G_DebugBBox( Vector org, Vector mins, Vector maxs, float r, float g, float b, float alpha );
+void G_DebugRotatedBBox(Vector org, Vector ang, Vector mins, Vector maxs, float r, float g, float b, float alpha);
 void G_DrawDebugNumber( Vector org, float number, float scale, float r, float g, float b, int precision = 0 );
 void G_DebugCircle( float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal = qfalse );
 void G_DebugOrientedCircle( Vector org, float radius, float r, float g, float b, float alpha, Vector angles );
@@ -67,5 +67,3 @@ void G_DebugHighlightFacet( Vector org, Vector mins, Vector maxs, facet_t facet,
 
 extern debugline_t *DebugLines;
 extern debugstring_t *DebugStrings;
-
-#endif /* !__DEBUGLINES_H__ */
diff --git a/code/fgame/decals.h b/code/fgame/decals.h
index 7786cf06..1ca2997a 100644
--- a/code/fgame/decals.h
+++ b/code/fgame/decals.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // decals.h: Decal entities
 
-#ifndef __DECAL_H__
-#define __DECAL_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -57,5 +56,3 @@ inline void Decal::Archive
       setShader( shader );
       }
    }
-
-#endif // __DECAL_H__
diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index af479dec..dcd87a6d 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -33,7 +33,7 @@ cvar_t *g_tempallieswinsinrow;
 
 DM_Manager dmManager;
 
-static int g_teamSpawnClock;
+static CTeamSpawnClock g_teamSpawnClock;
 
 typedef struct spawnsort_s {
     PlayerStart *spawnpoint;
@@ -42,8 +42,8 @@ typedef struct spawnsort_s {
 
 static qboolean SpotWouldTelefrag(float *origin)
 {
-    static Vector mins = Vector(-16, -16, 1);
-    static Vector maxs = Vector(16, 16, 97);
+    static Vector mins = Vector(-15, -15, 1);
+    static Vector maxs = Vector(15, 15, 96);
     trace_t       trace;
 
     trace = G_Trace(Vector(origin), mins, maxs, Vector(origin), NULL, MASK_PLAYERSTART, qfalse, "SpotWouldTelefrag");
@@ -58,15 +58,12 @@ static qboolean SpotWouldTelefrag(float *origin)
 static int compare_spawnsort(const void *pe1, const void *pe2)
 {
     float fDelta = ((spawnsort_t *)pe1)->fMetric - ((spawnsort_t *)pe2)->fMetric;
-
-    if (fDelta >= -0.001f) {
-        if (fDelta <= 0.001f) {
-            return 0;
-        } else {
-            return -1;
-        }
-    } else {
+    if (fDelta < -0.001) {
         return 1;
+    } else if (fDelta > 0.001) {
+        return -1;
+    } else {
+        return 0;
     }
 }
 
@@ -83,61 +80,61 @@ static PlayerStart *GetRandomSpawnpointFromList(spawnsort_t *pSpots, int nSpots)
 
     qsort(pSpots, nSpots, sizeof(spawnsort_t), compare_spawnsort);
 
-    if (pSpots[0].fMetric > 0.0f) {
-        if (nSpots > 5) {
-            nSpots = 5;
-        }
-
-        fMinPosMetric = pSpots[0].fMetric * nSpots;
-        fTotalMetric  = fMinPosMetric;
-
-        if (nSpots <= 1) {
-            fChosen = fMinPosMetric;
-        } else {
-            i            = 0;
-            fTotalMetric = 0.0f;
-
-            for (i = 0; i < nSpots; i++) {
-                if (pSpots[i].fMetric <= 0.0f) {
-                    break;
-                }
-
-                fChosen = pSpots[i].fMetric * (nSpots - i);
-                fTotalMetric += fChosen;
-
-                i++;
-            }
-
-            if (i < nSpots) {
-                fChosen = fMinPosMetric;
-            }
-
-            fMinPosMetric = fTotalMetric;
-        }
-
-        fTotalMetric = (fMinPosMetric - i * fChosen * 0.90f) * G_Random();
-        for (i = 0; i < nSpots - 1; i++) {
-            fTotalMetric -= (nSpots - i) * pSpots[i].fMetric - (fChosen * 0.90f);
-            if (fTotalMetric <= 0.0f) {
-                break;
-            }
-        }
-
-        return pSpots[i].spawnpoint;
-    } else {
+    if (pSpots[0].fMetric <= 0) {
         // return the spot anyway
         return pSpots[0].spawnpoint;
     }
+
+    if (nSpots > 5) {
+        nSpots = 5;
+    }
+
+    fMinPosMetric = pSpots[0].fMetric * nSpots;
+    fTotalMetric  = fMinPosMetric;
+
+    if (nSpots > 1) {
+        i            = 0;
+        fTotalMetric = 0.0f;
+
+        for (i = 0; i < nSpots; i++) {
+            if (pSpots[i].fMetric <= 0.0f) {
+                break;
+            }
+
+            fChosen = pSpots[i].fMetric * (nSpots - i);
+            fTotalMetric += fChosen;
+
+            i++;
+        }
+
+        if (i < nSpots) {
+            fChosen = fMinPosMetric;
+        }
+        
+        fMinPosMetric = fTotalMetric;
+    } else {
+        fChosen = fMinPosMetric;
+    }
+
+    fTotalMetric = (fMinPosMetric - i * fChosen * 0.9) * G_Random();
+    for (i = 0; i < nSpots - 1; i++) {
+        fTotalMetric -= (nSpots - i) * pSpots[i].fMetric - (fChosen * 0.9);
+        if (fTotalMetric <= 0) {
+            break;
+        }
+    }
+
+    return pSpots[i].spawnpoint;
 }
 
-float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Ffa(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared = 23170.0f * 23170.0f;
+    float fMinEnemyDistSquared = Square(23170.f);
     int   i;
     int   nPlayers = dmManager.PlayerCount();
     float fDist;
 
-    for (i = 1; i < nPlayers; i++) {
+    for (i = 1; i <= nPlayers; i++) {
         Player *teammate = dmManager.GetPlayer(i);
         if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
             continue;
@@ -150,12 +147,12 @@ float SpawnpointMetric_Ffa(const float *origin, DM_Team *dmTeam, const Player *p
         }
     }
 
-    return fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
+    return fMinEnemyDistSquared - Square(1024) * (G_Random(0.25) + 1.0);
 }
 
-float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Team(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    float fMinEnemyDistSquared  = 23170.0f * 23170.0f;
+    float fMinEnemyDistSquared  = Square(23170.f);
     float fSumFriendDistSquared = 0.0f;
     float fDistSquared;
     float fMetric;
@@ -163,7 +160,7 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
     int   nPlayers = dmManager.PlayerCount();
     int   nFriends = 0;
 
-    for (i = 1; i < nPlayers; i++) {
+    for (i = 1; i <= nPlayers; i++) {
         Player *teammate = dmManager.GetPlayer(i);
         if (teammate == player || teammate->IsDead() || teammate->IsSpectator()) {
             continue;
@@ -174,25 +171,23 @@ float SpawnpointMetric_Team(const float *origin, DM_Team *dmTeam, const Player *
         if (teammate->GetDM_Team() == dmTeam) {
             nFriends++;
             fSumFriendDistSquared += fDistSquared;
-        } else {
-            if (fMinEnemyDistSquared > fDistSquared) {
-                fMinEnemyDistSquared = fDistSquared;
-            }
+        } else if (fMinEnemyDistSquared > fDistSquared) {
+            fMinEnemyDistSquared = fDistSquared;
         }
     }
 
-    fMetric = fMinEnemyDistSquared - (G_Random(0.25f) + 1.0f) * (1024.0f * 1024.0f);
+    fMetric = fMinEnemyDistSquared - Square(1024) * (G_Random(0.25) + 1.0);
 
     if (nFriends) {
-        fMetric += 0.25f * ((23170.0f * 23170.0f) - fSumFriendDistSquared / nFriends);
+        fMetric += Square(23170) * 0.25 - fSumFriendDistSquared / nFriends;
     }
 
     return fMetric;
 }
 
-float SpawnpointMetric_Objective(const float *origin, DM_Team *dmTeam, const Player *player)
+float SpawnpointMetric_Objective(const vec3_t origin, DM_Team *dmTeam, const Player *player)
 {
-    return rand() * 0.0000000005f;
+    return rand() / (float)RAND_MAX;
 }
 
 CLASS_DECLARATION(Listener, DM_Team, NULL) {
@@ -201,7 +196,6 @@ CLASS_DECLARATION(Listener, DM_Team, NULL) {
 
 DM_Team::DM_Team()
 {
-    m_countdown          = 0;
     m_teamwins           = 0;
     m_wins_in_a_row      = 0;
     m_teamnumber         = -1;
@@ -216,11 +210,15 @@ void DM_Team::Reset(void)
 {
     m_spawnpoints.ClearObjectList();
     m_players.ClearObjectList();
+
+    if (g_gametype->integer == GT_TEAM) {
+        m_teamwins = 0;
+    }
 }
 
 void DM_Team::AddPlayer(Player *player)
 {
-    m_players.AddObject(player);
+    m_players.AddUniqueObject(player);
 }
 
 void DM_Team::RemovePlayer(Player *player)
@@ -268,7 +266,8 @@ void DM_Team::AddKills(Player *player, int numKills)
     if (m_teamnumber > TEAM_FREEFORALL) {
         m_iKills += numKills;
 
-        if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
+        if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW)
+            || g_gametype->integer == GT_LIBERATION) {
             player->AddDeaths(numKills);
         } else {
             m_teamwins += numKills;
@@ -282,7 +281,8 @@ void DM_Team::AddDeaths(Player *player, int numDeaths)
         return;
     }
 
-    if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW) || g_gametype->integer == GT_LIBERATION) {
+    if ((g_gametype->integer >= GT_TEAM_ROUNDS && g_gametype->integer <= GT_TOW)
+        || g_gametype->integer == GT_LIBERATION) {
         return;
     }
 
@@ -454,12 +454,12 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
                     vNewSpawn, player->mins, player->maxs, vEnd, player, MASK_PLAYERSOLID, qfalse, "TempSpawnPoint"
                 );
 
-                if (!trace.allsolid && !trace.startsolid && trace.fraction != 1.0f && trace.fraction != 1.0f
-                    && trace.plane.dist >= 0.8f) {
+                if (!trace.allsolid && !trace.startsolid && trace.fraction != 1.0f && trace.plane.dist >= 0.8f) {
                     points[numSpots].spawnpoint = new PlayerStart;
                     points[numSpots].spawnpoint->setOrigin(trace.endpos);
                     points[numSpots].spawnpoint->setAngles(spot->angles);
                     points[numSpots].fMetric = MetricFunction(vNewSpawn, this, player);
+                    numSpots++;
 
                     if (numSpots >= (sizeof(points) / sizeof(points[0]))) {
                         break;
@@ -472,8 +472,8 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
     spot = GetRandomSpawnpointFromList(points, numSpots);
     for (int i = 0; i < numSpots; i++) {
         // delete all created spawnpoint
-        if (points[numSpots].spawnpoint != spot) {
-            delete points[numSpots].spawnpoint;
+        if (points[i].spawnpoint != spot) {
+            delete points[i].spawnpoint;
         }
     }
 
@@ -492,6 +492,7 @@ PlayerStart *DM_Team::GetRandomSpawnpointWithMetric(
         if (!SpotWouldTelefrag(spot->origin)) {
             points[numSpots].spawnpoint = spot;
             points[numSpots].fMetric    = MetricFunction(spot->origin, this, player);
+            numSpots++;
 
             if (numSpots >= (sizeof(points) / sizeof(points[0]))) {
                 break;
@@ -521,30 +522,30 @@ bool DM_Team::IsDead(void) const
 {
     Player *player;
 
-    if (IsEmpty()) {
-        if (dmManager.IsGameActive()) {
-            return true;
-        }
-
-        return false;
+    if (m_players.NumObjects() == 0) {
+        return dmManager.IsGameActive();
     }
 
     if (!m_bHasSpawnedPlayers) {
         return false;
     }
 
-    if (dmManager.AllowRespawn()) {
+    if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
+        if (dmManager.AllowTeamRespawn(m_teamnumber)) {
+            return false;
+        }
+    } else if (dmManager.AllowRespawn()) {
         return false;
     }
 
     for (int i = m_players.NumObjects(); i > 0; i--) {
         player = m_players.ObjectAt(i);
 
-        if (player->IsSpectator()) {
+        if (player->IsDead()) {
             continue;
         }
 
-        if (!player->IsDead()) {
+        if (!player->IsSpectator()) {
             return false;
         }
     }
@@ -575,10 +576,7 @@ int DM_Team::TotalPlayersKills(void) const
 
     for (int i = 1; i <= m_players.NumObjects(); i++) {
         player = m_players.ObjectAt(i);
-
-        if (!player->IsDead() && !player->IsSpectator()) {
-            iKills += player->GetNumKills();
-        }
+        iKills += player->GetNumKills();
     }
 
     return iKills;
@@ -586,7 +584,7 @@ int DM_Team::TotalPlayersKills(void) const
 
 bool DM_Team::IsEmpty(void) const
 {
-    return m_players.NumObjects() <= 0;
+    return !m_players.NumObjects() || !m_bHasSpawnedPlayers;
 }
 
 int DM_Team::NumNotReady(void) const
@@ -597,7 +595,7 @@ int DM_Team::NumNotReady(void) const
     for (int i = 1; i <= m_players.NumObjects(); i++) {
         player = m_players.ObjectAt(i);
 
-        if (player->IsReady() && !player->IsDead()) {
+        if (player->IsReady()) {
             i++;
         }
     }
@@ -605,76 +603,6 @@ int DM_Team::NumNotReady(void) const
     return num;
 }
 
-void DM_Team::InitSpawnPoints(void)
-{
-    int i;
-
-    if (m_teamnumber == TEAM_SPECTATOR) {
-        for (i = level.m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
-            PlayerStart *spawnpoint = (PlayerStart *)level.m_SimpleArchivedEntities.ObjectAt(i);
-            const char  *classname  = spawnpoint->getClassID();
-
-            if (!Q_stricmp(classname, "info_player_deathmatch")) {
-                m_spawnpoints.AddObject(spawnpoint);
-            } else if (!Q_stricmp(classname, "info_player_intermission")) {
-                m_spawnpoints.AddObject(spawnpoint);
-            }
-        }
-
-        return;
-    }
-
-    if (g_gametype->integer <= GT_FFA) {
-        for (i = level.m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
-            PlayerStart *spawnpoint = (PlayerStart *)level.m_SimpleArchivedEntities.ObjectAt(i);
-            const char  *classname  = spawnpoint->getClassID();
-
-            if (!Q_stricmp(classname, "info_player_deathmatch")) {
-                m_spawnpoints.AddObject(spawnpoint);
-            }
-        }
-
-        if (m_spawnpoints.NumObjects() <= 1) {
-            // Try with team spawnpoints
-            for (i = level.m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
-                PlayerStart *spawnpoint = (PlayerStart *)level.m_SimpleArchivedEntities.ObjectAt(i);
-                const char  *classname  = spawnpoint->getClassID();
-
-                if (!Q_stricmp(classname, "info_player_allied")) {
-                    m_spawnpoints.AddObject(spawnpoint);
-                } else if (!Q_stricmp(classname, "info_player_axis")) {
-                    m_spawnpoints.AddObject(spawnpoint);
-                }
-            }
-        }
-    } else if (g_gametype->integer >= GT_TEAM) {
-        if (m_teamnumber >= TEAM_ALLIES) {
-            for (i = level.m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
-                PlayerStart *spawnpoint = (PlayerStart *)level.m_SimpleArchivedEntities.ObjectAt(i);
-                const char  *classname  = spawnpoint->getClassID();
-
-                if (m_teamnumber == TEAM_ALLIES && !Q_stricmp(classname, "info_player_allied")) {
-                    m_spawnpoints.AddObject(spawnpoint);
-                } else if (m_teamnumber == TEAM_AXIS && !Q_stricmp(classname, "info_player_axis")) {
-                    m_spawnpoints.AddObject(spawnpoint);
-                }
-            }
-        }
-
-        if (!m_spawnpoints.NumObjects()) {
-            // Try with info_player_deathmatch
-            for (int i = level.m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
-                PlayerStart *spawnpoint = (PlayerStart *)level.m_SimpleArchivedEntities.ObjectAt(i);
-                const char  *classname  = spawnpoint->getClassID();
-
-                if (!Q_stricmp(classname, "info_player_deathmatch")) {
-                    m_spawnpoints.AddObject(spawnpoint);
-                }
-            }
-        }
-    }
-}
-
 void DM_Team::UpdateTeamStatus(void)
 {
     for (int i = 1; i <= m_players.NumObjects(); i++) {
@@ -696,7 +624,11 @@ Event EV_DM_Manager_DoRoundTransition
 );
 Event EV_DM_Manager_FinishRoundTransition
 (
-    "finishroundtransition", EV_DEFAULT, NULL, NULL, "delayed function call to do the actual restart for the next round"
+    "finishroundtransition",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "delayed function call to do the actual restart for the next round"
 );
 
 CLASS_DECLARATION(Listener, DM_Manager, NULL) {
@@ -727,16 +659,21 @@ DM_Manager::DM_Manager()
     m_team_axis.setNumber(TEAM_AXIS);
     m_team_axis.setIndex(TEAM_AXIS);
 
+    m_fRoundTime           = 0;
+    m_fRoundEndTime        = 0;
+    m_bAllowRespawns       = true;
+    m_bRoundBasedGame      = false;
     m_iTeamWin             = 0;
+    m_iDefaultRoundLimit   = 0;
     m_csTeamClockSide      = STRING_AXIS;
     m_csTeamBombPlantSide  = STRING_DRAW;
-    m_fRoundEndTime        = 0.0f;
-    m_bAllowRespawns       = qtrue;
-    m_bRoundBasedGame      = qfalse;
-    m_iDefaultRoundLimit   = 0;
-    m_iNumTargetsToDestroy = 0;
+    m_iNumTargetsToDestroy = 1;
     m_iNumTargetsDestroyed = 0;
     m_iNumBombsPlanted     = 0;
+    m_bAllowAxisRespawn    = true;
+    m_bAllowAlliedRespawn  = true;
+    m_bRoundActive         = false;
+    m_iTotalMapTime        = 0;
 }
 
 DM_Manager::~DM_Manager() {}
@@ -758,8 +695,10 @@ void DM_Manager::Reset(void)
     //
     m_bAllowAxisRespawn   = true;
     m_bAllowAlliedRespawn = true;
-    g_teamSpawnClock      = sv_team_spawn_interval->validate;
-    level.m_bIgnoreClock  = false;
+
+    // Reset the team spawn clock
+    g_teamSpawnClock.Reset();
+    level.m_bIgnoreClock = false;
 
     if (g_gametype->integer == GT_TOW) {
         g_TOWObjectiveMan.Reset();
@@ -1088,30 +1027,74 @@ void DM_Manager::PrintAllClients(str s)
 
 void DM_Manager::InitGame(void)
 {
-    m_teams.ClearObjectList();
+    int i;
 
-    m_teams.AddObject(&m_team_spectator);
-
-    if (g_gametype->integer >= GT_TEAM) {
-        m_teams.AddObject(&m_team_allies);
-        m_teams.AddObject(&m_team_axis);
-    } else {
-        m_teams.AddObject(&m_team_freeforall);
+    if (fraglimit) {
+        if (fraglimit->integer < 0) {
+            gi.cvar_set("fraglimit", "0");
+        }
+        if (fraglimit->integer > 10000) {
+            gi.cvar_set("fraglimit", "10000");
+        }
+        fraglimit = gi.Cvar_Get("fraglimit", "0", CVAR_SERVERINFO);
     }
 
-    m_team_spectator.InitSpawnPoints();
-    m_team_allies.InitSpawnPoints();
-    m_team_axis.InitSpawnPoints();
-    m_team_freeforall.InitSpawnPoints();
-
-    if (g_gametype->integer < 0 || g_gametype->integer >= GT_MAX_GAME_TYPE) {
-        Com_Printf("Unknown game mode");
+    if (timelimit) {
+        if (timelimit->integer < 0) {
+            gi.cvar_set("timelimit", "0");
+        }
+        // 180 minutes maximum
+        if (timelimit->integer > 10800) {
+            gi.cvar_set("timelimit", "10800");
+        }
+        timelimit = gi.Cvar_Get("timelimit", "0", CVAR_SERVERINFO);
+    }
+
+    for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
+        SimpleArchivedEntity *const ent       = level.m_SimpleArchivedEntities.ObjectAt(i);
+        const char *const           classname = ent->getClassID();
+
+        if (!Q_stricmp(classname, "info_player_deathmatch")) {
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
+            m_team_spectator.m_spawnpoints.AddObject(spawnpoint);
+            m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
+
+            if (g_gametype->integer == GT_FFA) {
+                m_team_allies.m_spawnpoints.AddObject(spawnpoint);
+                m_team_axis.m_spawnpoints.AddObject(spawnpoint);
+            }
+        } else if (!Q_stricmp(classname, "info_player_allied")) {
+            if (g_gametype->integer >= GT_TEAM) {
+                PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
+                m_team_allies.m_spawnpoints.AddObject(spawnpoint);
+            }
+        } else if (!Q_stricmp(classname, "info_player_axis")) {
+            if (g_gametype->integer >= GT_TEAM) {
+                PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
+                m_team_axis.m_spawnpoints.AddObject(spawnpoint);
+            }
+        } else if (!Q_stricmp(classname, "info_player_intermission")) {
+            PlayerStart *const spawnpoint = static_cast<PlayerStart *>(ent);
+            m_team_freeforall.m_spawnpoints.AddObject(spawnpoint);
+        }
+    }
+
+    if (g_gametype->integer > GT_SINGLE_PLAYER) {
+        if (g_gametype->integer < GT_MAX_GAME_TYPE) {
+            m_teams.ClearObjectList();
+            m_teams.AddObject(&m_team_spectator);
+            m_teams.AddObject(&m_team_allies);
+            m_teams.AddObject(&m_team_axis);
+        } else {
+            Com_Printf("Unknown game mode");
+        }
     }
 
-    m_bIgnoringClockForBomb = false;
     m_fRoundTime            = 0;
     m_fRoundEndTime         = 0;
     m_iTeamWin              = 0;
+    m_bIgnoringClockForBomb = false;
+    m_iNumTargetsDestroyed  = 0;
     m_iNumBombsPlanted      = 0;
 
     if (g_gametype->integer >= 0 && g_gametype->integer < GT_MAX_GAME_TYPE) {
@@ -1120,10 +1103,10 @@ void DM_Manager::InitGame(void)
             m_bRoundBasedGame = false;
         } else {
             if (g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
-                m_bAllowRespawns = true;
+                m_bAllowRespawns  = true;
                 m_bRoundBasedGame = true;
             } else {
-                m_bAllowRespawns = false;
+                m_bAllowRespawns  = false;
                 m_bRoundBasedGame = true;
             }
 
@@ -1233,7 +1216,9 @@ bool DM_Manager::CheckEndMatch()
                 G_BeginIntermission2();
                 return true;
             }
-        } else if (timelimit->integer && level.inttime >= 60000 * timelimit->integer) {
+        }
+
+        if (timelimit->integer && level.inttime >= timelimit->integer * 60000) {
             G_BeginIntermission2();
             return true;
         } else {
@@ -1257,7 +1242,7 @@ bool DM_Manager::CheckEndMatch()
     if (AllowRespawn() || (!m_team_axis.IsDead() && !m_team_allies.IsDead())) {
         int roundLimit = GetRoundLimit();
 
-        if (roundLimit > 0 && level.time >= m_iDefaultRoundLimit * 60 + m_fRoundTime) {
+        if (roundLimit > 0 && level.time >= roundLimit * 60 + m_fRoundTime) {
             if (m_csTeamBombPlantSide != STRING_DRAW) {
                 if (m_bIgnoringClockForBomb) {
                     if (m_iNumBombsPlanted > 0) {
@@ -1266,7 +1251,7 @@ bool DM_Manager::CheckEndMatch()
 
                     m_bIgnoringClockForBomb = false;
                 } else if (m_iNumBombsPlanted > 0) {
-                    G_PrintToAllClients("A bomb is still set!");
+                    G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("A Bomb is Still Set!")));
                     m_bIgnoringClockForBomb = true;
                     return false;
                 }
@@ -1340,7 +1325,7 @@ bool DM_Manager::CheckEndMatch()
             return true;
         } else if (m_iNumBombsPlanted >= m_iNumTargetsToDestroy - m_iNumTargetsDestroyed) {
             if (!m_bIgnoringClockForBomb) {
-                G_PrintToAllClients("A bomb is still set!");
+                G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("A Bomb is Still Set!")));
                 m_bIgnoringClockForBomb = true;
             }
         } else {
@@ -1424,26 +1409,26 @@ void DM_Manager::EventDoRoundTransition(Event *ev)
     }
 
     if (m_iTeamWin == TEAM_AXIS) {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Axis win!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Axis win!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Axis win!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Axis win!")));
 
         // Play the axis victory sound
         world->Sound("den_victory_v");
 
-        Unregister(STRING_AXISWIN);
+        level.Unregister(STRING_AXISWIN);
     } else if (m_iTeamWin == TEAM_ALLIES) {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("Allies win!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("Allies win!")));
 
         // Play the allies victory sound
         world->Sound("dfr_victory_v");
 
-        Unregister(STRING_ALLIESWIN);
+        level.Unregister(STRING_ALLIESWIN);
     } else {
-        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("It's a draw!\n")));
-        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("It's a draw!\n")));
+        G_CenterPrintToAllClients(va("\n\n\n%s\n", gi.LV_ConvertString("It's a draw!")));
+        G_PrintToAllClients(va("%s\n", gi.LV_ConvertString("It's a draw!")));
 
-        Unregister(STRING_DRAW);
+        level.Unregister(STRING_DRAW);
     }
 
     G_DisplayScoresToAllClients();
@@ -1483,7 +1468,7 @@ void DM_Manager::EventFinishRoundTransition(Event *ev)
 
     gi.SendConsoleCommand("restart\n");
 
-    g_teamSpawnClock = sv_team_spawn_interval->value;
+    g_teamSpawnClock.Reset();
 }
 
 int DM_Manager::PlayerCount(void) const
@@ -1554,6 +1539,7 @@ void DM_Manager::StartRound(void)
     }
 
     m_fRoundEndTime = 0.0f;
+    m_bRoundActive  = true;
 
     // respawn all players
     for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
@@ -1576,18 +1562,33 @@ void DM_Manager::StartRound(void)
 
 void DM_Manager::EndRound()
 {
-    if (m_fRoundEndTime <= 0.0f) {
+    m_bRoundActive = false;
+
+    if (m_fRoundEndTime <= 0) {
         m_fRoundEndTime = level.time;
-        PostEvent(EV_DM_Manager_DoRoundTransition, 2.0f);
+        PostEvent(EV_DM_Manager_DoRoundTransition, 2);
     }
 }
 
 bool DM_Manager::AllowRespawn() const
 {
-    return m_bAllowRespawns
-        || (g_gametype->integer > GT_TEAM
-            && ((!m_team_axis.m_players.NumObjects() && !m_team_axis.m_bHasSpawnedPlayers)
-                || (!m_team_allies.m_players.NumObjects() && !m_team_allies.m_bHasSpawnedPlayers)));
+    if (GameAllowsRespawns()) {
+        return true;
+    }
+
+    if (g_gametype->integer <= GT_TEAM) {
+        return false;
+    }
+
+    if (!m_team_axis.m_players.NumObjects() && !m_team_axis.m_bHasSpawnedPlayers) {
+        return true;
+    }
+
+    if (!m_team_allies.m_players.NumObjects() && !m_team_allies.m_bHasSpawnedPlayers) {
+        return true;
+    }
+
+    return false;
 }
 
 bool DM_Manager::WaitingForPlayers(void) const
@@ -1596,15 +1597,15 @@ bool DM_Manager::WaitingForPlayers(void) const
         return false;
     }
 
-    if (!m_team_axis.m_players.NumObjects() || !m_team_axis.m_bHasSpawnedPlayers) {
+    if (m_team_axis.IsEmpty() || m_team_allies.IsEmpty()) {
         return true;
-    } else if (!m_team_allies.m_players.NumObjects() || !m_team_allies.m_bHasSpawnedPlayers) {
+    }
+
+    if (!m_team_axis.IsReady() || !m_team_allies.IsReady()) {
         return true;
-    } else if (!g_forceready->integer && m_team_axis.NumNotReady()) {
-        return true;
-    } else if (!g_forceready->integer && m_team_allies.NumNotReady()) {
-        return true;
-    } else if (m_team_axis.IsDead() || m_team_allies.IsDead()) {
+    }
+
+    if (m_team_axis.IsDead() || m_team_allies.IsDead()) {
         return true;
     }
 
@@ -1613,31 +1614,39 @@ bool DM_Manager::WaitingForPlayers(void) const
 
 bool DM_Manager::IsGameActive(void) const
 {
-    return !m_bRoundBasedGame || m_fRoundTime > 0.0f;
+    return !GameHasRounds() || m_fRoundTime > 0;
 }
 
 float DM_Manager::GetMatchStartTime(void)
 {
+    int totalnotready;
+
     if (g_gametype->integer <= GT_TEAM) {
         return m_fRoundTime;
     }
 
-    if (m_fRoundTime <= 0.0f) {
-        if (!m_team_allies.m_players.NumObjects() || !m_team_allies.m_bHasSpawnedPlayers) {
-            return -1.0f;
-        }
-
-        if (!m_team_axis.m_players.NumObjects() || !m_team_axis.m_bHasSpawnedPlayers) {
-            return -1.0f;
-        }
-
-        int num = m_team_allies.NumNotReady() + m_team_axis.NumNotReady();
-        if (num > 0) {
-            return (float)~num;
+    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE
+        || g_gametype->integer == GT_LIBERATION) {
+        if (m_fRoundTime > 0 && (m_team_allies.IsEmpty() || m_team_allies.IsEmpty())) {
+            m_fRoundTime = 0;
+            return -1;
         }
     }
 
-    return m_fRoundTime;
+    if (m_fRoundTime > 0) {
+        return m_fRoundTime;
+    }
+
+    if (m_team_allies.IsEmpty() || m_team_axis.IsEmpty()) {
+        return -1;
+    }
+
+    totalnotready = m_team_allies.NumNotReady() + m_team_axis.NumNotReady();
+    if (totalnotready > 0) {
+        return -1 - totalnotready;
+    } else {
+        return m_fRoundTime;
+    }
 }
 
 int DM_Manager::GetRoundLimit() const
@@ -1708,10 +1717,10 @@ void DM_Manager::SetBombsPlanted(int num)
 
 void DM_Manager::StopTeamRespawn(eController controller)
 {
-    if (controller == CONTROLLER_AXIS) {
-        m_bAllowAxisRespawn = false;
-    } else if (controller == CONTROLLER_ALLIES) {
+    if (controller == CONTROLLER_ALLIES) {
         m_bAllowAlliedRespawn = false;
+    } else if (controller == CONTROLLER_AXIS) {
+        m_bAllowAxisRespawn = false;
     }
 }
 
@@ -1728,8 +1737,6 @@ bool DM_Manager::AllowTeamRespawn(int teamnum) const
 
 int DM_Manager::GetTeamSpawnTimeLeft() const
 {
-    int timeLeft;
-
     if (sv_team_spawn_interval->integer <= 0) {
         return -1;
     }
@@ -1738,16 +1745,11 @@ int DM_Manager::GetTeamSpawnTimeLeft() const
         return 0;
     }
 
-    timeLeft = ceil(g_teamSpawnClock - level.time);
-    if (timeLeft <= -1) {
-        g_teamSpawnClock = level.time + sv_team_spawn_interval->value;
+    if (g_gametype->integer == GT_TEAM || g_gametype->integer == GT_TOW || g_gametype->integer == GT_LIBERATION) {
+        return g_teamSpawnClock.GetSecondsLeft();
     }
 
-    if (timeLeft < 0) {
-        timeLeft = 0;
-    }
-
-    return timeLeft;
+    return 0;
 }
 
 DM_Team *DM_Manager::GetTeam(str name)
@@ -1793,22 +1795,22 @@ void DM_Manager::InsertEntry(const char *entry)
     size_t len = strlen(entry);
 
     if (scoreLength + len < MAX_STRING_CHARS) {
-        strcpy(scoreString + scoreLength, entry);
+        Q_strncpyz(scoreString + scoreLength, entry, sizeof(scoreString) - scoreLength);
 
         scoreLength += len;
         scoreEntries++;
     }
 }
 
-void DM_Manager::InsertEntryNoCount(const char* entry)
+void DM_Manager::InsertEntryNoCount(const char *entry)
 {
-	size_t len = strlen(entry);
+    size_t len = strlen(entry);
 
-	if (scoreLength + len < MAX_STRING_CHARS) {
-		strcpy(scoreString + scoreLength, entry);
+    if (scoreLength + len < MAX_STRING_CHARS) {
+        Q_strncpyz(scoreString + scoreLength, entry, sizeof(scoreString) - scoreLength);
 
-		scoreLength += len;
-	}
+        scoreLength += len;
+    }
 }
 
 void DM_Manager::InsertEmpty(void)
@@ -1841,7 +1843,7 @@ void DM_Manager::BuildTeamInfo_ver6(DM_Team *dmTeam)
     for (int i = iNumPlayers; i > 0; i--) {
         pTeamPlayer = dmTeam->m_players.ObjectAt(i);
 
-        if (pTeamPlayer->IsSubclassOfBot()) {
+        if (pTeamPlayer->edict->r.svFlags & SVF_BOT) {
             continue;
         }
 
@@ -1868,7 +1870,7 @@ void DM_Manager::BuildTeamInfo_ver6(DM_Team *dmTeam)
             Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
         }
     } else {
-        Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
+        Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
     }
 
     InsertEntry(entry);
@@ -1886,7 +1888,7 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
     for (int i = iNumPlayers; i > 0; i--) {
         pTeamPlayer = dmTeam->m_players.ObjectAt(i);
 
-        if (pTeamPlayer->IsSubclassOfBot()) {
+        if (pTeamPlayer->edict->r.svFlags & SVF_BOT) {
             continue;
         }
 
@@ -1898,11 +1900,11 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
         iPing /= iNumPlayers;
     }
 
-    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
-        iKills  = dmTeam->m_wins_in_a_row;
-        iDeaths = dmTeam->m_teamwins;
+    if (g_gametype->integer == GT_TEAM_ROUNDS || g_gametype->integer == GT_OBJECTIVE || g_gametype->integer == GT_TOW) {
+        iKills  = dmTeam->m_teamwins;
+        iDeaths = dmTeam->m_wins_in_a_row;
     } else {
-        iKills  = dmTeam->m_iKills;
+        iKills  = dmTeam->m_teamwins;
         iDeaths = dmTeam->m_iDeaths;
     }
 
@@ -1920,7 +1922,7 @@ void DM_Manager::BuildTeamInfo_ver15(DM_Team *dmTeam)
                 iPing
             );
         } else {
-            Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
+            Com_sprintf(entry, sizeof(entry), "%i %i \"\" \"\" \"\" \"\" ", -1, dmTeam->m_teamnumber);
         }
     } else {
         Com_sprintf(entry, sizeof(entry), "%i \"\" \"\" \"\" \"\" ", -1 - dmTeam->m_teamnumber);
@@ -1960,7 +1962,7 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
                 pTeamPlayer->GetNumKills(),
                 pTeamPlayer->GetNumDeaths(),
                 G_TimeString(level.svsFloatTime - pTeamPlayer->edict->client->pers.enterTime),
-                pTeamPlayer->IsSubclassOfBot() ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
+                (pTeamPlayer->edict->r.svFlags & SVF_BOT) ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
             );
         } else {
             Com_sprintf(
@@ -1971,7 +1973,7 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
                 pTeamPlayer->GetNumKills(),
                 pTeamPlayer->GetNumDeaths(),
                 G_TimeString(level.svsFloatTime - pTeamPlayer->edict->client->pers.enterTime),
-                pTeamPlayer->IsSubclassOfBot() ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
+                (pTeamPlayer->edict->r.svFlags & SVF_BOT) ? "bot" : va("%d", pTeamPlayer->client->ps.ping)
             );
         }
 
@@ -1981,5 +1983,37 @@ void DM_Manager::BuildPlayerTeamInfo(DM_Team *dmTeam, int *iPlayerList, DM_Team
 
 bool DM_Manager::IsAlivePlayer(Player *player) const
 {
-    return !player->IsDead() && !player->IsSpectator() && !player->IsInJail() || player->GetDM_Team() == &m_team_spectator;
+    return !player->IsDead() && !player->IsSpectator() && !player->IsInJail()
+        || player->GetDM_Team() == &m_team_spectator;
+}
+
+CTeamSpawnClock::CTeamSpawnClock()
+{
+    nextSpawnTime = 0;
+}
+
+void CTeamSpawnClock::Reset()
+{
+    nextSpawnTime = sv_team_spawn_interval->value;
+}
+
+void CTeamSpawnClock::Restart()
+{
+    nextSpawnTime = level.time + sv_team_spawn_interval->value;
+}
+
+int CTeamSpawnClock::GetSecondsLeft()
+{
+    int timeLeft;
+
+    timeLeft = ceil(nextSpawnTime - level.time);
+    if (timeLeft <= -1) {
+        Restart();
+    }
+
+    if (timeLeft < 0) {
+        return 0;
+    }
+
+    return timeLeft;
 }
diff --git a/code/fgame/dm_manager.h b/code/fgame/dm_manager.h
index 88d6d658..087ea5b0 100644
--- a/code/fgame/dm_manager.h
+++ b/code/fgame/dm_manager.h
@@ -45,7 +45,6 @@ public:
     int m_teamnumber;
     int m_index;
 
-    int m_countdown;
     int m_teamwins;
     int m_wins_in_a_row;
 
@@ -95,8 +94,6 @@ public:
     PlayerStart *GetRandomTeamSpawnpoint(Player *player);
     PlayerStart *GetRandomObjectiveSpawnpoint(Player *player);
 
-    void InitSpawnPoints(void);
-
 protected:
     PlayerStart *FarthestSpawnPoint(void);
     PlayerStart *GetRandomSpawnpoint(void);
@@ -139,7 +136,7 @@ inline int DM_Team::getIndex(void)
 
 inline bool DM_Team::IsReady(void) const
 {
-    return !NumNotReady();
+    return g_forceready->integer || NumNotReady() == 0;
 }
 
 class SimpleAmmoType : public Class
@@ -182,8 +179,9 @@ private:
     int m_iNumBombsPlanted;
     int m_iTotalMapTime;
 
-    bool m_bAllowAxisRespawn;
     bool m_bAllowAlliedRespawn;
+    bool m_bAllowAxisRespawn;
+    bool m_bRoundActive;
 
     // scoreboard data
     char   scoreString[MAX_STRING_CHARS];
@@ -227,6 +225,7 @@ public:
     void       TeamWin(int teamnum);
     void       StartRound(void);
     void       EndRound(void);
+    bool       RoundActive(void) const;
     bool       GameHasRounds(void) const;
     bool       GameAllowsRespawns(void) const;
     void       SetGameAllowsRespawns(bool bAllow);
@@ -280,6 +279,11 @@ inline DM_Team *DM_Manager::GetTeamAxis(void)
     return &m_team_axis;
 }
 
+inline bool DM_Manager::RoundActive(void) const
+{
+    return m_bRoundActive;
+}
+
 inline bool DM_Manager::GameHasRounds(void) const
 {
     return m_bRoundBasedGame;
@@ -296,3 +300,15 @@ inline void DM_Manager::SetGameAllowsRespawns(bool bAllow)
 }
 
 extern DM_Manager dmManager;
+
+class CTeamSpawnClock {
+private:
+    float nextSpawnTime;
+
+public:
+    CTeamSpawnClock();
+    void Reset();
+    void Restart();
+
+    int GetSecondsLeft();
+};
diff --git a/code/fgame/doors.cpp b/code/fgame/doors.cpp
index 0f4c756c..fe95e0a5 100644
--- a/code/fgame/doors.cpp
+++ b/code/fgame/doors.cpp
@@ -39,229 +39,237 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Event EV_Door_OpenStartSound
 (
-	"sound_open_start",
-	EV_DEFAULT,
-	"s",
-	"sound_open_start",
-	"Sets the sound to use when the door starts to opens."
+    "sound_open_start",
+    EV_DEFAULT,
+    "s",
+    "sound_open_start",
+    "Sets the sound to use when the door starts to opens."
 );
 Event EV_Door_OpenEndSound
 (
-	"sound_open_end",
-	EV_DEFAULT,
-	"s",
-	"sound_open_end",
-	"Sets the sound to use when the door stops to opens."
+    "sound_open_end",
+    EV_DEFAULT,
+    "s",
+    "sound_open_end",
+    "Sets the sound to use when the door stops to opens."
 );
 Event EV_Door_CloseStartSound
 (
-	"sound_close_start",
-	EV_DEFAULT,
-	"s",
-	"sound_close",
-	"Sets the sound to use when the door closes."
+    "sound_close_start",
+    EV_DEFAULT,
+    "s",
+    "sound_close",
+    "Sets the sound to use when the door closes."
 );
 Event EV_Door_CloseEndSound
 (
-	"sound_close_end",
-	EV_DEFAULT,
-	"s",
-	"sound_close",
-	"Sets the sound to use when the door closes."
+    "sound_close_end",
+    EV_DEFAULT,
+    "s",
+    "sound_close",
+    "Sets the sound to use when the door closes."
 );
 Event EV_Door_MessageSound
-	( 
-	"sound_message",
-	EV_DEFAULT,
-   "s",
-   "sound_message",
-   "Sets the sound to use when the door displays a message.",
-	EV_NORMAL
-	);
+(
+    "sound_message",
+    EV_DEFAULT,
+    "s",
+    "sound_message",
+    "Sets the sound to use when the door displays a message.",
+    EV_NORMAL
+);
 Event EV_Door_LockedSound
-	( 
-	"sound_locked",
-	EV_DEFAULT,
-   "s",
-   "sound_locked",
-   "Sets the sound to use when the door is locked.",
-	EV_NORMAL
-	);
+(
+    "sound_locked",
+    EV_DEFAULT,
+    "s",
+    "sound_locked",
+    "Sets the sound to use when the door is locked.",
+    EV_NORMAL
+);
 Event EV_Door_SetWait
-	( 
-	"wait",
-	EV_DEFAULT,
-   "f",
-   "wait",
-   "Sets the amount of time to wait before automatically shutting.",
-	EV_NORMAL
-	);
+(
+    "wait",
+    EV_DEFAULT,
+    "f",
+    "wait",
+    "Sets the amount of time to wait before automatically shutting.",
+    EV_NORMAL
+);
 Event EV_Door_SetDmg
-	( 
-	"dmg",
-	EV_DEFAULT,
-   "i",
-   "damage",
-   "Sets the amount of damage the door will do to entities that get stuck in it.",
-	EV_NORMAL
-	);
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "damage",
+    "Sets the amount of damage the door will do to entities that get stuck in it.",
+    EV_NORMAL
+);
 Event EV_Door_TriggerFieldTouched
-	( 
-	"door_triggerfield",
-	EV_DEFAULT,
-   "e",
-   "other",
-   "Is called when a doors trigger field is touched.",
-	EV_NORMAL
-	);
+(
+    "door_triggerfield",
+    EV_DEFAULT,
+    "e",
+    "other",
+    "Is called when a doors trigger field is touched.",
+    EV_NORMAL
+);
 Event EV_Door_TryOpen
-	( 
-	"tryToOpen",
-	EV_DEFAULT,
-   "e",
-   "other",
-   "Tries to open the door.",
-	EV_NORMAL
-	);
+(
+    "tryToOpen",
+    EV_DEFAULT,
+    "e",
+    "other",
+    "Tries to open the door.",
+    EV_NORMAL
+);
 Event EV_Door_Close
-	( 
-	"close",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Closes the door.",
-	EV_NORMAL
-	);
+(
+    "close",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Closes the door.",
+    EV_NORMAL
+);
 Event EV_Door_Open
-	( 
-	"open",
-	EV_DEFAULT,
-   "e",
-   "other",
-   "Opens the door.",
-	EV_NORMAL
-	);
+(
+    "open",
+    EV_DEFAULT,
+    "e",
+    "other",
+    "Opens the door.",
+    EV_NORMAL
+);
 Event EV_Door_DoClose
-	( 
-	"doclose",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Closes the door (special doors).",
-	EV_NORMAL
-	);
+(
+    "doclose",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Closes the door (special doors).",
+    EV_NORMAL
+);
 Event EV_Door_DoOpen
-	( 
-	"doopen",
-	EV_DEFAULT,
-   "e",
-   "other",
-   "Opens the door (special doors).",
-	EV_NORMAL
-	);
+(
+    "doopen",
+    EV_DEFAULT,
+    "e",
+    "other",
+    "Opens the door (special doors).",
+    EV_NORMAL
+);
 Event EV_Door_CloseEnd
-	( 
-	"doorclosed",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Called when the door finishes closing.",
-	EV_NORMAL
-	);
+(
+    "doorclosed",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called when the door finishes closing.",
+    EV_NORMAL
+);
 Event EV_Door_OpenEnd
-	( 
-	"dooropened",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Called when the door finishes opening.",
-	EV_NORMAL
-	);
+(
+    "dooropened",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called when the door finishes opening.",
+    EV_NORMAL
+);
+Event EV_Door_IsOpen // Added in 2.30
+(
+    "isOpen",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Check to see if door is open (non-zero return value)",
+    EV_GETTER
+);
 Event EV_Door_Fire
-	( 
-	"toggledoor",
-	EV_DEFAULT,
-   "e",
-   "other",
-   "Toggles the state of the door (open/close).",
-	EV_NORMAL
-	);
+(
+    "toggledoor",
+    EV_DEFAULT,
+    "e",
+    "other",
+    "Toggles the state of the door (open/close).",
+    EV_NORMAL
+);
 Event EV_Door_Link
-	( 
-	"linkdoor",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Link doors together.",
-	EV_NORMAL
-	);
+(
+    "linkdoor",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Link doors together.",
+    EV_NORMAL
+);
 Event EV_Door_SetTime
-	( 
-	"time",
-	EV_DEFAULT,
-   "f",
-   "traveltime",
-   "Sets the time it takes for the door to open an close.",
-	EV_NORMAL
-	);
+(
+    "time",
+    EV_DEFAULT,
+    "f",
+    "traveltime",
+    "Sets the time it takes for the door to open an close.",
+    EV_NORMAL
+);
 Event EV_Door_Lock
-	(
-	"lock",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Lock the door.",
-	EV_NORMAL
-	);
+(
+    "lock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Lock the door.",
+    EV_NORMAL
+);
 Event EV_Door_Unlock
-	(
-	"unlock",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Unlock the door.",
-	EV_NORMAL
-	);
+(
+    "unlock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Unlock the door.",
+    EV_NORMAL
+);
 Event EV_Door_TrySolid
-	(
-	"trysolid",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Trys to make the door solid.",
-	EV_NORMAL
-	);
+(
+    "trysolid",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Trys to make the door solid.",
+    EV_NORMAL
+);
 Event EV_Door_AlwaysAway
-	(
-	"alwaysaway",
-	EV_DEFAULT,
-	"B",
-	"bAlwaysAway",
-	"Makes the door always open away from the person opening it.",
-	EV_NORMAL
-	);
-Event EV_Door_DoorType
-	(
-	"doortype",
-	EV_DEFAULT,
-	"s",
-	"door_type",
-	"Sets the defaults for this door\n"
-	"Door Defaults: wood(default)\n"
-	"metal"
-	);
+(
+    "alwaysaway",
+    EV_DEFAULT,
+    "B",
+    "bAlwaysAway",
+    "Makes the door always open away from the person opening it.",
+    EV_NORMAL
+);
+Event EV_Door_DoorType(
+    "doortype",
+    EV_DEFAULT,
+    "s",
+    "door_type",
+    "Sets the defaults for this door\n"
+    "Door Defaults: wood(default)\n"
+    "metal"
+);
 
-#define DOOR_START_OPEN			1
-#define DOOR_OPEN_DIRECTION		2
-#define DOOR_DONT_LINK			4
-#define DOOR_TOGGLE				32
-#define DOOR_AUTO_OPEN			64
-#define DOOR_TARGETED 			128
+#define DOOR_START_OPEN     1
+#define DOOR_OPEN_DIRECTION 2
+#define DOOR_DONT_LINK      4
+#define DOOR_TOGGLE         32
+#define DOOR_AUTO_OPEN      64
+#define DOOR_TARGETED       128
 
-#define STATE_OPEN		1
-#define STATE_OPENING	2
-#define STATE_CLOSING   3
-#define STATE_CLOSED	4
+#define STATE_OPEN          1
+#define STATE_OPENING       2
+#define STATE_CLOSING       3
+#define STATE_CLOSED        4
 
 /*
 
@@ -276,1068 +284,972 @@ Door.enemy chains from the master door through all doors linked in the chain.
 
 */
 
-CLASS_DECLARATION( ScriptSlave, Door, "func_door" )
-{
-	{ &EV_Door_OpenStartSound,				&Door::SetOpenStartSound },
-	{ &EV_Door_OpenEndSound,				&Door::SetOpenEndSound },
-	{ &EV_Door_CloseStartSound,				&Door::SetCloseStartSound },
-	{ &EV_Door_CloseEndSound,				&Door::SetCloseEndSound },
-	{ &EV_Door_MessageSound,				&Door::SetMessageSound },
-	{ &EV_Door_LockedSound,					&Door::SetLockedSound },
-	{ &EV_Door_SetWait,						&Door::SetWait },
-	{ &EV_Door_SetDmg,						&Door::SetDmg },
-	{ &EV_Door_TriggerFieldTouched,			&Door::FieldTouched },
-	{ &EV_Trigger_Effect,					&Door::TryOpen },
-	{ &EV_Activate,							&Door::TryOpen },
-	{ &EV_Door_TryOpen,						&Door::TryOpen },
-	{ &EV_Door_Close,						&Door::Close },
-	{ &EV_Door_Open,						&Door::Open },
-	{ &EV_Door_CloseEnd,					&Door::CloseEnd },
-	{ &EV_Door_OpenEnd,						&Door::OpenEnd },
-	{ &EV_Door_Fire,						&Door::DoorFire },
-	{ &EV_Door_Link,						&Door::LinkDoors },
-	{ &EV_Door_SetTime,						&Door::SetTime },
-	{ &EV_Use,								&Door::DoorUse },
-	{ &EV_Killed,							&Door::DoorFire },
-	{ &EV_Blocked,							&Door::DoorBlocked },
-	{ &EV_Door_Lock,						&Door::LockDoor },
-	{ &EV_Door_Unlock,						&Door::UnlockDoor },
-	{ &EV_SetAngle,							&Door::SetDir },
-	{ &EV_Door_TrySolid,					&Door::EventTrySolid },
-	{ &EV_Door_AlwaysAway,					&Door::EventAlwaysAway },
-	{ &EV_Door_DoorType,					&Door::EventDoorType },
-	{ &EV_Touch,							NULL },
-	{ NULL, NULL }
+CLASS_DECLARATION(ScriptSlave, Door, "NormalDoor") {
+    {&EV_Door_OpenStartSound,      &Door::SetOpenStartSound },
+    {&EV_Door_OpenEndSound,        &Door::SetOpenEndSound   },
+    {&EV_Door_CloseStartSound,     &Door::SetCloseStartSound},
+    {&EV_Door_CloseEndSound,       &Door::SetCloseEndSound  },
+    {&EV_Door_MessageSound,        &Door::SetMessageSound   },
+    {&EV_Door_LockedSound,         &Door::SetLockedSound    },
+    {&EV_Door_SetWait,             &Door::SetWait           },
+    {&EV_Door_SetDmg,              &Door::SetDmg            },
+    {&EV_Door_TriggerFieldTouched, &Door::FieldTouched      },
+    {&EV_Trigger_Effect,           &Door::TryOpen           },
+    {&EV_Activate,                 &Door::TryOpen           },
+    {&EV_Door_TryOpen,             &Door::TryOpen           },
+    {&EV_Door_Close,               &Door::Close             },
+    {&EV_Door_Open,                &Door::Open              },
+    {&EV_Door_CloseEnd,            &Door::CloseEnd          },
+    {&EV_Door_OpenEnd,             &Door::OpenEnd           },
+    {&EV_Door_IsOpen,              &Door::GetIsOpen         }, // Added in 2.30
+    {&EV_Door_Fire,                &Door::DoorFire          },
+    {&EV_Door_Link,                &Door::LinkDoors         },
+    {&EV_Door_SetTime,             &Door::SetTime           },
+    {&EV_Use,                      &Door::DoorUse           },
+    {&EV_Killed,                   &Door::DoorFire          },
+    {&EV_Blocked,                  &Door::DoorBlocked       },
+    {&EV_Door_Lock,                &Door::LockDoor          },
+    {&EV_Door_Unlock,              &Door::UnlockDoor        },
+    {&EV_SetAngle,                 &Door::SetDir            },
+    {&EV_Door_TrySolid,            &Door::EventTrySolid     },
+    {&EV_Door_AlwaysAway,          &Door::EventAlwaysAway   },
+    {&EV_Door_DoorType,            &Door::EventDoorType     },
+    {&EV_Touch,                    NULL                     },
+    {NULL,                         NULL                     }
 };
 
 Door::Door()
-	{
-	float t;
-
-   entflags |= EF_DOOR;
-   if ( LoadingSavegame )
-      {
-      return;
-      }
-
-	nextdoor = 0;
-	trigger = 0;
-   locked = false;
-   master = this;
-   lastblocktime = 0;
-   diropened = 0;
-   m_bAlwaysAway = true;
-
-   dir = G_GetMovedir( 0 );
-	t = dir[ 0 ];
-	dir[ 0 ] = -dir[ 1 ];
-	dir[ 1 ] = t;
-
-	showModel();
-
-	SetOpenStartSound( "door_wood_open_move" );
-	SetOpenEndSound( "door_wood_open_stop" );
-
-	SetCloseStartSound( "door_wood_close_move" );
-	SetCloseEndSound( "door_wood_close_stop" );
-
-	SetLockedSound( "door_wood_locked" );
-
-	traveltime = 1.0f;
-	speed = 1.0f / traveltime;
-
-   wait = ( spawnflags & DOOR_TOGGLE ) ? 0 : 3;
-	dmg = 0;
-
-	setSize( mins, maxs );
-
-	setOrigin( localorigin );
-
-	// DOOR_START_OPEN is to allow an entity to be lighted in the closed position
-	// but spawn in the open position
-	if ( spawnflags & DOOR_START_OPEN )
-		{
-		state = STATE_OPEN;
-   	PostEvent( EV_Door_Open, EV_POSTSPAWN );
-		}
-	else
-		{
-		state = STATE_CLOSED;
-		}
-   previous_state = state;
-
-	if ( health )
-		{
-		takedamage = DAMAGE_YES;
-		}
-
-	// LinkDoors can't be done until all of the doors have been spawned, so
-	// the sizes can be detected properly.
-	nextdoor = 0;
-	PostEvent( EV_Door_Link, EV_LINKDOORS );
-
-	// Default to work with monsters and players
-	respondto = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
-	if ( spawnflags & 8 )
-		{
-		respondto &= ~TRIGGER_PLAYERS;
-		}
-	if ( spawnflags & 16 )
-		{
-		respondto &= ~TRIGGER_MONSTERS;
-		}
-
-	next_locked_time = 0;
-	}
-
-void Door::SetDir( Event *ev )
 {
-	float t;
-	float angle;
+    float t;
 
-	angle = ev->GetFloat( 1 );
-	dir = G_GetMovedir( angle );
-	t = dir[ 0 ];
-	dir[ 0 ] = -dir[ 1 ];
-	dir[ 1 ] = t;
+    entflags |= ECF_DOOR;
+    if (LoadingSavegame) {
+        return;
+    }
+
+    nextdoor      = 0;
+    trigger       = 0;
+    locked        = false;
+    master        = this;
+    lastblocktime = 0;
+    diropened     = 0;
+    m_bAlwaysAway = true;
+
+    dir    = G_GetMovedir(0);
+    t      = dir[0];
+    dir[0] = -dir[1];
+    dir[1] = t;
+
+    showModel();
+
+    SetDoorType("wood");
+
+    wait = (spawnflags & DOOR_TOGGLE) ? 0 : 3;
+    dmg  = 0;
+
+    setSize(mins, maxs);
+
+    setLocalOrigin(localorigin);
+
+    // DOOR_START_OPEN is to allow an entity to be lighted in the closed position
+    // but spawn in the open position
+    if (spawnflags & DOOR_START_OPEN) {
+        state = STATE_OPEN;
+        PostEvent(EV_Door_Open, EV_POSTSPAWN);
+    } else {
+        state = STATE_CLOSED;
+    }
+    previous_state = state;
+
+    if (health) {
+        takedamage = DAMAGE_YES;
+    }
+
+    // LinkDoors can't be done until all of the doors have been spawned, so
+    // the sizes can be detected properly.
+    nextdoor = 0;
+    PostEvent(EV_Door_Link, EV_LINKDOORS);
+
+    // Default to work with monsters and players
+    respondto = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
+    if (spawnflags & 8) {
+        respondto &= ~TRIGGER_PLAYERS;
+    }
+    if (spawnflags & 16) {
+        respondto &= ~TRIGGER_MONSTERS;
+    }
+
+    next_locked_time = 0;
 }
 
-void Door::SetOpenStartSound( str sound )
+void Door::SetDoorType(str s)
 {
-	sound_open_start = sound;
-	if( sound_open_start.length() > 1 )
-	{
-		CacheResource( sound_open_start.c_str() );
-	}
+    SetOpenStartSound("door_" + s + "_open_move");
+    SetOpenEndSound("door_" + s + "_open_stop");
+
+    SetCloseStartSound("door_" + s + "_close_move");
+    SetCloseEndSound("door_" + s + "_close_stop");
+
+    SetLockedSound("door_" + s + "_locked");
+
+    if (s == "wood") {
+        traveltime = 1.0;
+    } else if (s == "metal") {
+        traveltime = 1.5;
+    }
+
+    speed = 1.0 / traveltime;
 }
 
-void Door::SetOpenEndSound( str sound )
+void Door::EventDoorType(Event *ev)
 {
-	sound_open_end = sound;
-	if( sound_open_end.length() > 1 )
-	{
-		CacheResource( sound_open_end.c_str() );
-	}
+    str s = ev->GetString(1);
+
+    if (s != "wood" && s != "metal") {
+        ScriptError("Invalid Door Type.");
+    }
+
+    SetDoorType(s);
 }
 
-void Door::SetCloseStartSound( str sound )
+void Door::SetDir(Event *ev)
 {
-	sound_close_start = sound;
-	if( sound_close_start.length() > 1 )
-	{
-		CacheResource( sound_close_start.c_str() );
-	}
+    float t;
+    float angle;
+
+    angle  = ev->GetFloat(1);
+    dir    = G_GetMovedir(angle);
+    t      = dir[0];
+    dir[0] = -dir[1];
+    dir[1] = t;
 }
 
-void Door::SetCloseEndSound( str sound )
+void Door::SetOpenStartSound(str sound)
 {
-	sound_close_end = sound;
-	if( sound_close_end.length() > 1 )
-	{
-		CacheResource( sound_close_end.c_str() );
-	}
+    sound_open_start = sound;
+    if (sound_open_start.length() > 1) {
+        CacheResource(sound_open_start.c_str());
+    }
 }
 
-void Door::SetMessageSound
-   (
-   str sound
-   )
-
-   {
-	sound_message = sound;
-   if ( sound_message.length() > 1 )
-      {
-      CacheResource( sound_message.c_str() );
-      }
-   }
-
-void Door::SetLockedSound
-   (
-   str sound
-   )
-
-   {
-	sound_locked = sound;
-   if ( sound_locked.length() > 1 )
-      {
-      CacheResource( sound_locked.c_str() );
-      }
-   }
-
-void Door::SetOpenStartSound( Event *ev )
+void Door::SetOpenEndSound(str sound)
 {
-	SetOpenStartSound( ev->GetString( 1 ) );
+    sound_open_end = sound;
+    if (sound_open_end.length() > 1) {
+        CacheResource(sound_open_end.c_str());
+    }
 }
 
-void Door::SetOpenEndSound( Event *ev )
+void Door::SetCloseStartSound(str sound)
 {
-	SetOpenEndSound( ev->GetString( 1 ) );
+    sound_close_start = sound;
+    if (sound_close_start.length() > 1) {
+        CacheResource(sound_close_start.c_str());
+    }
 }
 
-void Door::SetCloseStartSound( Event *ev )
+void Door::SetCloseEndSound(str sound)
 {
-	SetCloseStartSound( ev->GetString( 1 ) );
+    sound_close_end = sound;
+    if (sound_close_end.length() > 1) {
+        CacheResource(sound_close_end.c_str());
+    }
 }
 
-void Door::SetCloseEndSound( Event *ev )
+void Door::SetMessageSound(str sound)
+
 {
-	SetCloseEndSound( ev->GetString( 1 ) );
+    sound_message = sound;
+    if (sound_message.length() > 1) {
+        CacheResource(sound_message.c_str());
+    }
 }
 
-void Door::SetMessageSound
-	(
-	Event *ev
-	)
+void Door::SetLockedSound(str sound)
 {
-	SetMessageSound( ev->GetString( 1 ) );
+    sound_locked = sound;
+    if (sound_locked.length() > 1) {
+        CacheResource(sound_locked.c_str());
+    }
 }
 
-void Door::SetLockedSound
-	(
-	Event *ev
-	)
+void Door::SetOpenStartSound(Event *ev)
 {
-	SetLockedSound( ev->GetString( 1 ) );
+    SetOpenStartSound(ev->GetString(1));
 }
 
-void Door::SetWait
-	(
-	Event *ev
-	)
+void Door::SetOpenEndSound(Event *ev)
 {
-	wait = ev->GetFloat( 1 );
+    SetOpenEndSound(ev->GetString(1));
 }
 
-void Door::SetDmg
-	(
-	Event *ev
-	)
+void Door::SetCloseStartSound(Event *ev)
 {
-	dmg = ev->GetInteger( 1 );
+    SetCloseStartSound(ev->GetString(1));
 }
 
-void Door::EventAlwaysAway
-	(
-	Event *ev
-	)
+void Door::SetCloseEndSound(Event *ev)
 {
-	qboolean bAlwaysAway = true;
-
-	if( ev->NumArgs() > 0 )
-		bAlwaysAway = ev->GetInteger( 1 );
-
-	m_bAlwaysAway = bAlwaysAway != 0;
+    SetCloseEndSound(ev->GetString(1));
 }
 
-void Door::EventTrySolid
-	(
-	Event *ev
-	)
+void Door::SetMessageSound(Event *ev)
 {
-	Entity *check;
-	gentity_t *ent;
-	int touch[ MAX_GENTITIES ];
-	int num;
-
-	if( edict->r.contents == 1 )
-		return;
-
-	num = gi.AreaEntities( absmin, absmax, touch, MAX_GENTITIES );
-	if( num > 0 )
-	{
-		for( int i = 0; i < num; i++ )
-		{
-			ent = &g_entities[ touch[ i ] ];
-			check = ent->entity;
-
-			if( check->getMoveType() > MOVETYPE_STOP )
-			{
-				if( edict->r.contents != CONTENTS_SHOOTONLY &&
-					edict->solid &&
-					IsTouching( check ) )
-				{
-					PostEvent( EV_Door_TrySolid, 1.0f );
-					return;
-				}
-			}
-		}
-	}
-
-	edict->r.contents = CONTENTS_SOLID;
-	setSolidType( SOLID_BSP );
+    SetMessageSound(ev->GetString(1));
 }
 
-void Door::EventDoorType
-	(
-	Event *ev
-	)
+void Door::SetLockedSound(Event *ev)
 {
-	str s = ev->GetString( 1 );
-
-	if( s != "wood" && s != "metal" )
-	{
-		ScriptError( "Invalid Door Type." );
-	}
-
-	SetOpenStartSound( "door_" + s + "_open_move" );
-	SetOpenEndSound( "door_" + s + "_open_stop" );
-
-	SetCloseStartSound( "door_" + s + "_close_move" );
-	SetCloseEndSound( "door_" + s + "_close_stop" );
-
-	SetLockedSound( "door_" + s + "_locked" );
+    SetLockedSound(ev->GetString(1));
 }
 
-qboolean Door::isOpen
-	(
-	void
-	)
+void Door::SetWait(Event *ev)
 {
-	return ( state == STATE_OPEN );
+    wait = ev->GetFloat(1);
 }
 
-qboolean Door::isCompletelyClosed
-	(
-	void
-	)
+void Door::SetDmg(Event *ev)
 {
-	return ( state == STATE_CLOSED );
+    dmg = ev->GetInteger(1);
 }
 
-void Door::OpenEnd
-	(
-	Event *ev
-	)
+void Door::EventAlwaysAway(Event *ev)
 {
-	if( edict->r.contents != CONTENTS_SOLID )
-	{
-		PostEvent( EV_Door_TrySolid, 1.0f );
-	}
+    qboolean bAlwaysAway = true;
 
-	if( sound_open_end.length() > 1 )
-	{
-		BroadcastAIEvent();
-		Sound( sound_open_end, CHAN_VOICE );
-	}
-	else
-	{
-		StopSound( CHAN_VOICE );
-	}
+    if (ev->NumArgs() > 0) {
+        bAlwaysAway = ev->GetInteger(1);
+    }
 
-	previous_state = state;
-	SetState( STATE_OPEN );
-	if( spawnflags & DOOR_TOGGLE )
-	{
-		// don't close automatically
-		return;
-	}
-
-	if( ( wait > 0 ) && ( master == this ) )
-	{
-		PostEvent( EV_Door_Close, wait );
-	}
+    m_bAlwaysAway = bAlwaysAway != 0;
 }
 
-void Door::CloseEnd
-	(
-	Event *ev
-	)
+void Door::EventTrySolid(Event *ev)
 {
-	if( sound_close_end.length() > 1 )
-	{
-		BroadcastAIEvent();
-		Sound( sound_close_end, CHAN_VOICE );
-	}
-	else
-	{
-		StopSound( CHAN_VOICE );
-	}
+    Entity    *check;
+    gentity_t *ent;
+    int        touch[MAX_GENTITIES];
+    int        num;
 
-	if( master == this )
-	{
-		gi.AdjustAreaPortalState( this->edict, false );
-	}
+    if (getContents() == 1) {
+        return;
+    }
 
-	edict->r.contents = CONTENTS_SOLID;
-	setSolidType( SOLID_BSP );
+    num = gi.AreaEntities(absmin, absmax, touch, MAX_GENTITIES);
+    if (num > 0) {
+        for (int i = 0; i < num; i++) {
+            ent   = &g_entities[touch[i]];
+            check = ent->entity;
 
-	previous_state = state;
-	SetState( STATE_CLOSED );
-}
-
-void Door::Close
-	(
-	Event *ev
-	)
-{
-	Door *door;
-
-	CancelEventsOfType( EV_Door_Close );
-
-	previous_state = state;
-	SetState( STATE_CLOSING );
-
-	ProcessEvent( EV_Door_DoClose );
-
-	if( sound_close_start.length() > 1 )
-	{
-		BroadcastAIEvent();
-		Sound( sound_close_start, CHAN_VOICE );
-	}
-	if( master == this )
-	{
-		if( max_health )
-		{
-			takedamage = DAMAGE_YES;
-			health = max_health;
-		}
-
-		// trigger all paired doors
-		door = ( Door * )G_GetEntity( nextdoor );
-		assert( door->isSubclassOf( Door ) );
-		while( door && ( door != this ) )
-		{
-			door->ProcessEvent( EV_Door_Close );
-			door = ( Door * )G_GetEntity( door->nextdoor );
-			assert( door->isSubclassOf( Door ) );
-		}
-	}
-}
-
-void Door::Open
-	(
-	Event *ev
-	)
-{
-	Door *door;
-	Event *e;
-	Entity *other;
-
-	if( ev->NumArgs() < 1 )
-	{
-		ScriptError( "No entity specified to open door.  Door may open the wrong way." );
-		other = world;
-	}
-	else
-	{
-		other = ev->GetEntity( 1 );
-	}
-
-	if( state == STATE_OPENING )
-	{
-		// already going up
-		return;
-	}
-
-	if( state == STATE_OPEN )
-	{
-		// reset top wait time
-		if( wait > 0 )
-		{
-			CancelEventsOfType( EV_Door_Close );
-			PostEvent( EV_Door_Close, wait );
-		}
-		return;
-	}
-
-	previous_state = state;
-	SetState( STATE_OPENING );
-
-	e = new Event( EV_Door_DoOpen );
-	e->AddEntity( other );
-	ProcessEvent( e );
-
-	if( sound_open_start.length() > 1 )
-	{
-		BroadcastAIEvent();
-		Sound( sound_open_start, CHAN_VOICE );
-	}
-	if( master == this )
-	{
-		// trigger all paired doors
-		door = ( Door * )G_GetEntity( nextdoor );
-		assert( door->isSubclassOf( Door ) );
-		while( door && ( door != this ) )
-		{
-			e = new Event( EV_Door_Open );
-			e->AddEntity( other );
-			door->ProcessEvent( e );
-			door = ( Door * )G_GetEntity( door->nextdoor );
-			assert( door->isSubclassOf( Door ) );
-		}
-
-		if( previous_state == STATE_CLOSED )
-		{
-			gi.AdjustAreaPortalState( this->edict, true );
-		}
-	}
-}
-
-void Door::DoorUse
-	(
-	Event *ev
-	)
-
-	{
-	Entity *other;
-   qboolean respond;
-	Event *e;
-
-	other = ev->GetEntity( 1 );
-
-	respond = ( ( ( respondto & TRIGGER_PLAYERS ) && other->isClient() ) ||
-		( ( respondto & TRIGGER_MONSTERS ) && other->isSubclassOf( Actor ) ) );
-
-   if ( !respond )
-      {
-      return;
-      }
-
-	// only allow use when not triggerd by other events
-	if ( health || ( spawnflags & ( DOOR_AUTO_OPEN | DOOR_TARGETED ) ) )
-		{
-      if ( other->isSubclassOf( Sentient ) && ( state == STATE_CLOSED ) )
-         {
-         if ( health )
-            {
-            gi.SendServerCommand( 0, "print \"This door is jammed.\"" );
+            if (check->getMoveType() != MOVETYPE_NONE
+                && check->getMoveType() != MOVETYPE_NOCLIP
+                && check->getMoveType() != MOVETYPE_PUSH
+                && check->getMoveType() != MOVETYPE_STOP) {
+                if (edict->r.contents != CONTENTS_SHOOTONLY && edict->solid && IsTouching(check)) {
+                    PostEvent(EV_Door_TrySolid, 1.0f);
+                    return;
+                }
             }
-         else if ( spawnflags & DOOR_TARGETED )
-            {
-				Sound( "door_triggered", CHAN_VOICE );
-            }
-         }
+        }
+    }
 
-		if ( spawnflags & DOOR_AUTO_OPEN && locked && other->isSubclassOf( Player ) && sound_locked.length() )
-			{
-			other->Sound( sound_locked, CHAN_VOICE );
-			}
-
-		return;
-		}
-
-   assert( master );
-   if ( !master )
-      {
-      // bulletproofing
-      master = this;
-      }
-
-	if ( master->state == STATE_CLOSED )
-		{
-		e = new Event( EV_Door_TryOpen );
-		e->AddEntity( other );
-		master->ProcessEvent( e );
-		}
-	else if ( master->state == STATE_OPEN )
-		{
-		e = new Event( EV_Door_Close );
-		e->AddEntity( other );
-		master->ProcessEvent( e );
-		}
-	}
-
-void Door::DoorFire
-	(
-	Event *ev
-	)
-
-	{
-	Event *e;
-	Entity *other;
-
-	other = ev->GetEntity( 1 );
-
-	assert( master == this );
-	if ( master != this )
-		{
-		gi.Error( ERR_DROP, "DoorFire: master != self" );
-		}
-
-	// no more messages
-	SetMessage( NULL );
-
-	// reset health in case we were damage triggered
-	health = max_health;
-
-	// will be reset upon return
-	takedamage = DAMAGE_NO;
-
-	if ( ( spawnflags & ( DOOR_TOGGLE | DOOR_START_OPEN ) ) && ( state == STATE_OPENING || state == STATE_OPEN ) )
-		{
-		spawnflags &= ~DOOR_START_OPEN;
-		ProcessEvent( EV_Door_Close );
-		}
-	else
-		{
-		e = new Event( EV_Door_Open );
-		e->AddEntity( other );
-		ProcessEvent( e );
-		}
-	}
-
-void Door::DoorBlocked
-	(
-	Event *ev
-	)
-{
-	Event *e;
-	Entity *other;
-
-	assert( master );
-	if( ( master ) && ( master != this ) )
-	{
-		master->ProcessEvent( new Event( ev ) );
-		return;
-	}
-
-	if( lastblocktime > level.time )
-	{
-		return;
-	}
-
-	lastblocktime = level.time + 0.3;
-
-	other = ev->GetEntity( 1 );
-
-	if( other->IsSubclassOfActor() )
-	{
-		edict->r.contents = CONTENTS_WEAPONCLIP;
-		setSolidType( SOLID_BSP );
-	}
-	else
-	{
-		if( dmg )
-		{
-			other->Damage( this, this, ( int )dmg, origin, vec_zero, vec_zero, 0, 0, MOD_CRUSH );
-		}
-
-		//
-		// if we killed him, lets keep on going
-		//
-		if( other->deadflag )
-		{
-			return;
-		}
-
-		if( state == STATE_OPENING || state == STATE_OPEN )
-		{
-			spawnflags &= ~DOOR_START_OPEN;
-			ProcessEvent( EV_Door_Close );
-		}
-		else
-		{
-			e = new Event( EV_Door_Open );
-			e->AddEntity( other );
-			ProcessEvent( e );
-		}
-	}
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
 }
 
-void Door::FieldTouched
-	(
-	Event *ev
-	)
-
-	{
-	Entity *other;
-
-	other = ev->GetEntity( 1 );
-
-	if ( !other )
-		return;
-
-	if ( ( state != STATE_OPEN ) && !( spawnflags & DOOR_AUTO_OPEN ) && !other->isSubclassOf( Actor ) )
-		return;
-
-	TryOpen( ev );
-	}
-
-qboolean	Door::CanBeOpenedBy
-	(
-	Entity *ent
-	)
-
-	{
-   assert( master );
-	if ( ( master ) && ( master != this ) )
-		{
-		return master->CanBeOpenedBy( ent );
-		}
-
-	if ( !locked )
-		{
-		return true;
-		}
-
-	return false;
-	}
-
-void Door::TryOpen
-	(
-	Event *ev
-	)
-
-	{
-	Entity *other;
-	Event *event;
-
-	//FIXME
-	// hack so that doors aren't triggered by guys when game starts.
-	// have to fix delay that guys go through before setting up their threads
-	if ( level.time < 0.4 )
-		{
-		return;
-		}
-
-	other = ev->GetEntity( 1 );
-
-   assert( master );
-	if ( master && ( this != master ) )
-		{
-		event = new Event( EV_Door_TryOpen );
-		event->AddEntity( other );
-		master->ProcessEvent( event );
-		return;
-		}
-
-	if ( !other || other->deadflag )
-		{
-		return;
-		}
-
-   if ( locked )
-      {
-		if ( next_locked_time <= level.time )
-			{
-			if ( sound_locked.length() > 1 && !other->isSubclassOf( Actor ) )
-				{
-				other->Sound( sound_locked, CHAN_VOICE );
-				}
-			else if ( other->isSubclassOf( Player ) )
-				{
-				other->Sound( "snd_locked", CHAN_VOICE );
-	//         gi.centerprintf ( other->edict, "This door is locked." );
-				}
-			}
-
-		// Always increment next locked time
-		
-		next_locked_time = level.time + 0.5;
-
-		// locked doors don't open for anyone
-      return;
-      }
-
-   if ( !CanBeOpenedBy( other ) )
-		{
-      return;
-      }
-
-	if ( Message().length() )
-		{
-      gi.centerprintf( other->edict, Message().c_str() );
-		Sound( sound_message, CHAN_VOICE );
-		}
-
-	event = new Event( EV_Door_Fire );
-	event->AddEntity( other );
-	ProcessEvent( event );
-	}
-
-void Door::SpawnTriggerField
-	(
-	Vector fmins,
-	Vector fmaxs
-	)
-
-	{
-	TouchField *trig;
-	Vector min;
-	Vector max;
-
-	min = fmins - Vector( "60 60 8" );
-	max = fmaxs + Vector( "60 60 8" );
-
-	trig = new TouchField;
-	trig->Setup( this, EV_Door_TriggerFieldTouched, min, max, respondto );
-
-	trigger = trig->entnum;
-	}
-
-
-
-void Door::LinkDoors
-	(
-	Event *ev
-	)
+qboolean Door::isOpen(void)
 {
-	Entity       *entptr;
-	Door	        *ent;
-	Door		   *next;
-	Vector	       cmins;
-	Vector		   cmaxs;
-	int		iNumTouching;
-	int				   i;
+    return (state == STATE_OPEN);
+}
 
-	setSolidType( SOLID_BSP );
-	setMoveType( MOVETYPE_PUSH );
+qboolean Door::isCompletelyClosed(void)
+{
+    return (state == STATE_CLOSED);
+}
 
-	if( nextdoor )
-	{
-		// already linked by another door
-		return;
-	}
+void Door::GetIsOpen(Event *ev)
+{
+    ev->AddInteger(!isCompletelyClosed());
+}
 
-	// master doors own themselves
-	master = this;
+void Door::OpenEnd(Event *ev)
+{
+    if (getContents() != CONTENTS_SOLID) {
+        PostEvent(EV_Door_TrySolid, 1.0f);
+    }
 
-	if( spawnflags & DOOR_DONT_LINK )
-	{
-		// don't want to link this door
-		nextdoor = entnum;
-		return;
-	}
-	iNumTouching = 0;
+    if (sound_open_end.length() > 1) {
+        BroadcastAIEvent();
+        Sound(sound_open_end, CHAN_VOICE);
+    } else {
+        StopSound(CHAN_VOICE);
+    }
+    
+    // Added in 2.30
+    //  Notify scripts that the door has finished opening
+    Unregister(STRING_DONE);
 
-	for (ent = this; ent; ent = (Door *)G_FindClass(ent, getClassID()))
-	{
-		if (DoorTouches(ent) && ent != this)
-		{
-			iNumTouching++;
-		}
-	}
+    previous_state = state;
+    SetState(STATE_OPEN);
+    if (spawnflags & DOOR_TOGGLE) {
+        // don't close automatically
+        return;
+    }
 
-	if (!iNumTouching)
-	{
-		for (ent = (Door *)G_FindClass(NULL, getClassID()); ent; ent = (Door *)G_FindClass(ent, getClassID()))
-		{
-			if (DoorTouches(ent) && ent != this)
-			{
-				iNumTouching++;
-			}
+    if ((wait > 0) && (master == this)) {
+        PostEvent(EV_Door_Close, wait);
+    }
+}
+
+void Door::CloseEnd(Event *ev)
+{
+    // Fixed in 2.0
+    //  Since this version, the area portal state is changed before sound
+    if (master == this) {
+        gi.AdjustAreaPortalState(this->edict, false);
+    }
+
+    if (sound_close_end.length() > 1) {
+        BroadcastAIEvent();
+        Sound(sound_close_end, CHAN_VOICE);
+    } else {
+        StopSound(CHAN_VOICE);
+    }
+
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
+
+    previous_state = state;
+    SetState(STATE_CLOSED);
+
+    // Added in 2.30
+    //  Notify scripts that the door has finished closing
+    Unregister(STRING_DONE);
+}
+
+void Door::Close(Event *ev)
+{
+    Door *door;
+
+    if (!(getContents() & CONTENTS_SOLID)) {
+        CancelEventsOfType(EV_Door_TrySolid);
+        PostEvent(EV_Door_TrySolid, 0);
+        // try again
+        PostEvent(new Event(*ev), 0.1f);
+        return;
+    }
+
+    CancelEventsOfType(EV_Door_Close);
+
+    previous_state = state;
+    SetState(STATE_CLOSING);
+
+    ProcessEvent(EV_Door_DoClose);
+
+    if (sound_close_start.length() > 1) {
+        BroadcastAIEvent();
+        Sound(sound_close_start, CHAN_VOICE);
+    } else {
+        StopSound(CHAN_VOICE);
+    }
+
+    if (master == this) {
+        if (max_health) {
+            takedamage = DAMAGE_YES;
+            health     = max_health;
         }
 
-        if (iNumTouching != 0)
-        {
+        // trigger all paired doors
+        door = (Door *)G_GetEntity(nextdoor);
+        assert(door->isSubclassOf(Door));
+        while (door && (door != this)) {
+            door->ProcessEvent(EV_Door_Close);
+            door = (Door *)G_GetEntity(door->nextdoor);
+            assert(door->isSubclassOf(Door));
+        }
+    }
+}
+
+void Door::Open(Event *ev)
+{
+    Door   *door;
+    Event  *e;
+    Entity *other;
+
+    if (ev->NumArgs() < 1) {
+        ScriptError("No entity specified to open door.  Door may open the wrong way.");
+        other = world;
+    } else {
+        other = ev->GetEntity(1);
+    }
+
+    if (state == STATE_OPENING) {
+        // already going up
+        return;
+    }
+
+    if (state == STATE_OPEN) {
+        // reset top wait time
+        if (wait > 0) {
+            CancelEventsOfType(EV_Door_Close);
+            PostEvent(EV_Door_Close, wait);
+        }
+        return;
+    }
+
+    previous_state = state;
+    SetState(STATE_OPENING);
+
+    e = new Event(EV_Door_DoOpen);
+    e->AddEntity(other);
+    ProcessEvent(e);
+
+    if (sound_open_start.length() > 1) {
+        BroadcastAIEvent();
+        Sound(sound_open_start, CHAN_VOICE);
+    } else {
+        StopSound(CHAN_VOICE);
+    }
+
+    if (master == this) {
+        // trigger all paired doors
+        door = (Door *)G_GetEntity(nextdoor);
+        assert(door->isSubclassOf(Door));
+        while (door && (door != this)) {
+            e = new Event(EV_Door_Open);
+            e->AddEntity(other);
+            door->ProcessEvent(e);
+            door = (Door *)G_GetEntity(door->nextdoor);
+            assert(door->isSubclassOf(Door));
+        }
+
+        if (previous_state == STATE_CLOSED) {
+            gi.AdjustAreaPortalState(this->edict, true);
+        }
+    }
+}
+
+void Door::DoorUse(Event *ev)
+
+{
+    Entity  *other;
+    qboolean respond;
+    Event   *e;
+
+    other = ev->GetEntity(1);
+
+    respond =
+        (((respondto & TRIGGER_PLAYERS) && other->isClient())
+         || ((respondto & TRIGGER_MONSTERS) && other->IsSubclassOfActor()));
+
+    if (!respond) {
+        return;
+    }
+
+    // only allow use when not triggerd by other events
+    if (health || (spawnflags & (DOOR_AUTO_OPEN | DOOR_TARGETED)) || other->IsSubclassOfActor()) {
+        if (other->IsSubclassOfSentient() && (state == STATE_CLOSED)) {
+            if (health) {
+                gi.SendServerCommand(other->edict - g_entities, "print \"%s.\"", gi.LV_ConvertString("This door is jammed"));
+            } else if (spawnflags & DOOR_TARGETED) {
+                Sound("door_triggered", CHAN_VOICE);
+            }
+        }
+
+        if (spawnflags & DOOR_AUTO_OPEN && locked && other->IsSubclassOfPlayer() && sound_locked.length()) {
+            other->Sound(sound_locked, CHAN_VOICE);
+        }
+
+        return;
+    }
+
+    assert(master);
+    if (!master) {
+        // bulletproofing
+        master = this;
+    }
+
+    if (master->state == STATE_CLOSED) {
+        e = new Event(EV_Door_TryOpen);
+        e->AddEntity(other);
+        master->ProcessEvent(e);
+    } else if (master->state == STATE_OPEN) {
+        e = new Event(EV_Door_Close);
+        e->AddEntity(other);
+        master->ProcessEvent(e);
+    }
+}
+
+void Door::DoorFire(Event *ev)
+{
+    Event  *e;
+    Entity *other;
+
+    other = ev->GetEntity(1);
+
+    assert(master == this);
+    if (master != this) {
+        gi.Error(ERR_DROP, "DoorFire: master != self");
+    }
+
+    // no more messages
+    SetMessage(NULL);
+
+    // reset health in case we were damage triggered
+    health = max_health;
+
+    // will be reset upon return
+    takedamage = DAMAGE_NO;
+
+    if ((spawnflags & (DOOR_TOGGLE | DOOR_START_OPEN)) && (state == STATE_OPENING || state == STATE_OPEN)) {
+        spawnflags &= ~DOOR_START_OPEN;
+        ProcessEvent(EV_Door_Close);
+    } else {
+        e = new Event(EV_Door_Open);
+        e->AddEntity(other);
+        ProcessEvent(e);
+    }
+}
+
+void Door::DoorBlocked(Event *ev)
+{
+    Event  *e;
+    Entity *other;
+
+    assert(master);
+    if ((master) && (master != this)) {
+        master->ProcessEvent(*ev);
+        return;
+    }
+
+    if (lastblocktime > level.time) {
+        return;
+    }
+
+    lastblocktime = level.time + 0.3;
+
+    other = ev->GetEntity(1);
+
+    if (other->IsSubclassOfActor()) {
+        setContents(CONTENTS_WEAPONCLIP);
+        setSolidType(SOLID_BSP);
+    } else {
+        if (dmg) {
+            other->Damage(this, this, (int)dmg, origin, vec_zero, vec_zero, 0, 0, MOD_CRUSH);
+        }
+
+        //
+        // if we killed him, lets keep on going
+        //
+        if (other->deadflag) {
             return;
         }
-	}
 
-	cmins = absmin;
-	cmaxs = absmax;
+        if (state == STATE_OPENING || state == STATE_OPEN) {
+            spawnflags &= ~DOOR_START_OPEN;
 
-	ent = this;
-	for( entptr = this; entptr; entptr = ( Entity * )G_FindClass( entptr, getClassID() ) )
-	{
-		next = ( Door * )entptr;
-		if( !ent->DoorTouches( next ) )
-		{
-			continue;
-		}
+            const bool bIsMoving = EventPending(EV_MoveDone);
+            ProcessEvent(EV_Door_Close);
 
-		if( next->nextdoor )
-		{
-			error( "Door::LinkDoors", "cross connected doors.  Targetname = %s entity %d\n", TargetName().c_str(), entnum );
-		}
-
-		ent->nextdoor = next->entnum;
-		ent = next;
-
-		for( i = 0; i < 3; i++ )
-		{
-			if( ent->absmin[ i ] < cmins[ i ] )
-			{
-				cmins[ i ] = ent->absmin[ i ];
-			}
-			if( ent->absmax[ i ] > cmaxs[ i ] )
-			{
-				cmaxs[ i ] = ent->absmax[ i ];
-			}
-		}
-
-		// set master door
-		ent->master = this;
-
-		if( ent->health )
-		{
-			health = ent->health;
-		}
-
-		if( ent->Targeted() )
-		{
-			if( !Targeted() )
-			{
-				SetTargetName( ent->TargetName() );
-			}
-			else if( strcmp( TargetName(), ent->TargetName() ) )
-			{
-				// not a critical error, but let them know about it.
-				gi.DPrintf( "cross connected doors\n" );
-
-				ent->SetTargetName( TargetName() );
-			}
-		}
-
-		if( ent->Message().length() )
-		{
-			if( Message().length() && !strcmp( Message().c_str(), ent->Message().c_str() ) )
-			{
-				// not a critical error, but let them know about it.
-				gi.DPrintf( "Different messages on linked doors.  Targetname = %s", TargetName().c_str() );
-			}
-
-			// only master should have a message
-			SetMessage( ent->Message().c_str() );
-			ent->SetMessage( NULL );
-		}
-	}
-
-	// make the chain a loop
-	ent->nextdoor = entnum;
-
-	// open up any portals we control
-	if( spawnflags & DOOR_START_OPEN )
-	{
-		gi.AdjustAreaPortalState( this->edict, true );
-	}
-
-	// shootable or targeted doors don't need a trigger
-	if( health || ( spawnflags & DOOR_TARGETED ) )
-	{
-		// Don't let the player trigger the door
-		return;
-	}
-
-	// Don't spawn trigger field when set to toggle
-	if( !( spawnflags & DOOR_TOGGLE ) )
-	{
-		SpawnTriggerField( cmins, cmaxs );
-	}
+            if (bIsMoving) {
+                // Added in OPM
+                //  Reopen to the other side so sentients can still pass.
+                //  This avoid entities like players trying to prevent the door
+                //  from opening in multiplayer
+                diropened = -diropened;
+                e = new Event(EV_Door_Open);
+                e->AddEntity(other);
+                ProcessEvent(e);
+            }
+        } else {
+            e = new Event(EV_Door_Open);
+            e->AddEntity(other);
+            ProcessEvent(e);
+        }
+    }
 }
 
-void Door::SetTime
-	(
-	Event *ev
-	)
-
-	{
-	traveltime = ev->GetFloat( 1 );
-	if ( traveltime < FRAMETIME )
-		{
-		traveltime = FRAMETIME;
-		}
-
-	speed = 1.0f / traveltime;
-	}
-
-void Door::LockDoor
-	(
-	Event *ev
-	)
+void Door::FieldTouched(Event *ev)
 {
-	if( !level.PreSpawned() )
-		ScriptError( "Cannot lock door before level prespawn" );
+    Entity *other;
+    Actor* otherActor;
+    float dist;
 
-	SetLocked( true );
+    other = ev->GetEntity(1);
+
+    if (!other) {
+        return;
+    }
+
+    if (!other->IsSubclassOfActor()) {
+        if ((spawnflags & DOOR_TOGGLE) || (state != STATE_OPEN && !(spawnflags & DOOR_AUTO_OPEN))) {
+            return;
+        }
+
+        TryOpen(ev);
+        return;
+    }
+
+    otherActor = static_cast<Actor*>(other);
+
+    otherActor->m_Path.ForceShortLookahead();
+
+    if (state == STATE_OPENING) {
+        otherActor->m_maxspeed = speed * 64;
+    }
+
+    if (((spawnflags & DOOR_TOGGLE) || (state != STATE_OPEN && !(spawnflags & DOOR_AUTO_OPEN))) && (state == STATE_OPEN || state == STATE_OPENING)) {
+        return;
+    }
+
+    dist = VectorLength2D(other->velocity) * 0.25f;
+    if (other->absmin[0] > absmax[0] + dist) {
+        return;
+    }
+    if (other->absmin[1] > absmax[1] + dist) {
+        return;
+    }
+    if (other->absmin[2] > absmax[2]) {
+        return;
+    }
+
+    if (other->absmax[0] < absmin[0] - dist) {
+        return;
+    }
+    if (other->absmax[1] < absmin[1] - dist) {
+        return;
+    }
+    if (other->absmax[2] < absmin[2]) {
+        return;
+    }
+
+    TryOpen(ev);
 }
 
-void Door::UnlockDoor
-	(
-	Event *ev
-	)
+qboolean Door::CanBeOpenedBy(Entity *ent)
 {
-	SetLocked( false );
+    assert(master);
+    if ((master) && (master != this)) {
+        return master->CanBeOpenedBy(ent);
+    }
+
+    if (!locked) {
+        return true;
+    }
+
+    return false;
 }
 
-qboolean Door::DoorTouches
-	(
-	Door *e1
-	)
+void Door::TryOpen(Event *ev)
 {
-	if( e1->absmin.x > absmax.x )
-	{
-		return false;
-	}
-	if( e1->absmin.y > absmax.y )
-	{
-		return false;
-	}
-	if( e1->absmin.z > absmax.z )
-	{
-		return false;
-	}
-	if( e1->absmax.x < absmin.x )
-	{
-		return false;
-	}
-	if( e1->absmax.y < absmin.y )
-	{
-		return false;
-	}
-	if( e1->absmax.z < absmin.z )
-	{
-		return false;
-	}
+    Entity *other;
+    Event  *event;
 
-	return true;
+    // hack so that doors aren't triggered by guys when game starts.
+    // have to fix delay that guys go through before setting up their threads
+    if (level.time < 0.4) {
+        return;
+    }
+
+    other = ev->GetEntity(1);
+
+    assert(master);
+    if (master && (this != master)) {
+        event = new Event(EV_Door_TryOpen);
+        event->AddEntity(other);
+        master->ProcessEvent(event);
+        return;
+    }
+
+    if (!other || other->deadflag) {
+        return;
+    }
+
+    if (locked) {
+        if (next_locked_time <= level.time) {
+            if (sound_locked.length() > 1 && !other->IsSubclassOfActor()) {
+                other->Sound(sound_locked, CHAN_VOICE);
+            } else if (other->IsSubclassOfPlayer()) {
+                other->Sound("snd_locked", CHAN_VOICE);
+                //         gi.centerprintf ( other->edict, "This door is locked." );
+            }
+        }
+
+        // Always increment next locked time
+
+        next_locked_time = level.time + 0.5;
+
+        // locked doors don't open for anyone
+        return;
+    }
+
+    if (!CanBeOpenedBy(other)) {
+        return;
+    }
+
+    if (Message().length()) {
+        gi.centerprintf(other->edict, Message().c_str());
+        Sound(sound_message, CHAN_VOICE);
+    }
+
+    event = new Event(EV_Door_Fire);
+    event->AddEntity(other);
+    ProcessEvent(event);
 }
 
-void Door::UpdatePathConnection
-	(
-	void
-	)
+void Door::SpawnTriggerField(Vector fmins, Vector fmaxs)
 {
-	if( BlocksAIMovement() )
-	{
-		DisconnectPaths();
-	}
-	else
-	{
-		ConnectPaths();
-	}
+    TouchField *trig;
+    Vector      min;
+    Vector      max;
+
+    min = fmins - Vector("60 60 8");
+    max = fmaxs + Vector("60 60 8");
+
+    trig = new TouchField;
+    trig->Setup(this, EV_Door_TriggerFieldTouched, min, max, respondto);
+
+    trigger = trig->entnum;
 }
 
-void Door::SetLocked
-	(
-	qboolean newLocked
-	)
+void Door::LinkDoors(Event *ev)
 {
-	if( locked == newLocked )
-		return;
+    Entity *entptr;
+    Door   *ent;
+    Door   *next;
+    Vector  cmins;
+    Vector  cmaxs;
+    int     iNumTouching;
+    int     i;
 
-	locked = newLocked;
+    setSolidType(SOLID_BSP);
+    setMoveType(MOVETYPE_PUSH);
 
-	UpdatePathConnection();
+    if (nextdoor) {
+        // already linked by another door
+        return;
+    }
+
+    // master doors own themselves
+    master = this;
+
+    if (spawnflags & DOOR_DONT_LINK) {
+        // don't want to link this door
+        nextdoor = entnum;
+        return;
+    }
+    iNumTouching = 0;
+
+    for (ent = this; ent; ent = (Door *)G_FindClass(ent, getClassID())) {
+        if (DoorTouches(ent) && ent != this) {
+            iNumTouching++;
+        }
+    }
+
+    if (!iNumTouching) {
+        for (ent = (Door *)G_FindClass(NULL, getClassID()); ent; ent = (Door *)G_FindClass(ent, getClassID())) {
+            if (DoorTouches(ent) && ent != this) {
+                iNumTouching++;
+            }
+        }
+
+        if (iNumTouching != 0) {
+            return;
+        }
+    }
+
+    cmins = absmin;
+    cmaxs = absmax;
+
+    ent = this;
+    for (entptr = this; entptr; entptr = (Entity *)G_FindClass(entptr, getClassID())) {
+        next = (Door *)entptr;
+        if (!ent->DoorTouches(next)) {
+            continue;
+        }
+
+        if (next->nextdoor) {
+            error(
+                "Door::LinkDoors", "cross connected doors.  Targetname = %s entity %d\n", TargetName().c_str(), entnum
+            );
+        }
+
+        ent->nextdoor = next->entnum;
+        ent           = next;
+
+        for (i = 0; i < 3; i++) {
+            if (ent->absmin[i] < cmins[i]) {
+                cmins[i] = ent->absmin[i];
+            }
+            if (ent->absmax[i] > cmaxs[i]) {
+                cmaxs[i] = ent->absmax[i];
+            }
+        }
+
+        // set master door
+        ent->master = this;
+
+        if (ent->health) {
+            health = ent->health;
+        }
+
+        if (ent->Targeted()) {
+            if (!Targeted()) {
+                SetTargetName(ent->TargetName());
+            } else if (strcmp(TargetName(), ent->TargetName())) {
+                // not a critical error, but let them know about it.
+                gi.DPrintf("cross connected doors\n");
+
+                ent->SetTargetName(TargetName());
+            }
+        }
+
+        if (ent->Message().length()) {
+            if (Message().length() && !strcmp(Message().c_str(), ent->Message().c_str())) {
+                // not a critical error, but let them know about it.
+                gi.DPrintf("Different messages on linked doors.  Targetname = %s", TargetName().c_str());
+            }
+
+            // only master should have a message
+            SetMessage(ent->Message().c_str());
+            ent->SetMessage(NULL);
+        }
+    }
+
+    // make the chain a loop
+    ent->nextdoor = entnum;
+
+    // open up any portals we control
+    if (spawnflags & DOOR_START_OPEN) {
+        gi.AdjustAreaPortalState(this->edict, true);
+    }
+
+    // shootable or targeted doors don't need a trigger
+    if (health || (spawnflags & DOOR_TARGETED)) {
+        // Don't let the player trigger the door
+        return;
+    }
+
+    SpawnTriggerField(cmins, cmaxs);
 }
 
-void Door::SetState
-	(
-	int newState
-	)
+void Door::SetTime(Event *ev)
 {
-	if( state == newState )
-		return;
+    traveltime = ev->GetFloat(1);
+    if (traveltime < FRAMETIME) {
+        traveltime = FRAMETIME;
+    }
 
-	state = newState;
-
-	UpdatePathConnection();
+    speed = 1.0f / traveltime;
 }
 
-qboolean Door::BlocksAIMovement
-	(
-	void
-	) const
+void Door::LockDoor(Event *ev)
 {
-	return ( locked || state == STATE_OPEN );
+    if (!level.PreSpawned()) {
+        ScriptError("Cannot lock door before level prespawn");
+    }
+
+    SetLocked(true);
 }
 
-qboolean Door::AIDontFace
-	(
-	void
-	) const
+void Door::UnlockDoor(Event *ev)
 {
-	return ( locked || state == STATE_OPEN );
+    SetLocked(false);
+}
+
+qboolean Door::DoorTouches(Door *e1)
+{
+    if (e1->absmin.x > absmax.x) {
+        return false;
+    }
+    if (e1->absmin.y > absmax.y) {
+        return false;
+    }
+    if (e1->absmin.z > absmax.z) {
+        return false;
+    }
+    if (e1->absmax.x < absmin.x) {
+        return false;
+    }
+    if (e1->absmax.y < absmin.y) {
+        return false;
+    }
+    if (e1->absmax.z < absmin.z) {
+        return false;
+    }
+
+    return true;
+}
+
+void Door::UpdatePathConnection(void)
+{
+    if (BlocksAIMovement()) {
+        DisconnectPaths();
+    } else {
+        ConnectPaths();
+    }
+}
+
+void Door::SetLocked(qboolean newLocked)
+{
+    if (locked == newLocked) {
+        return;
+    }
+
+    locked = newLocked;
+
+    UpdatePathConnection();
+}
+
+void Door::SetState(int newState)
+{
+    if (state == newState) {
+        return;
+    }
+
+    state = newState;
+
+    UpdatePathConnection();
+}
+
+qboolean Door::BlocksAIMovement(void) const
+{
+    return (locked || state == STATE_OPEN);
+}
+
+qboolean Door::AIDontFace(void) const
+{
+    return (locked || state == STATE_OPEN);
+}
+
+static const char* stateString[4] =
+{
+    "open",
+    "opening",
+    "closing",
+    "closed"
+};
+
+void Door::ShowInfo(float fDot, float fDist)
+{
+    int i;
+    char szText[512];
+
+    if (fDot <= 0.95f || fDist >= 1024 || fDist <= 64) {
+        return;
+    }
+
+    i = Com_sprintf(szText, sizeof(szText), "%i:%i", entnum, radnum);
+    if (TargetName().c_str() && TargetName()[0]) {
+        i = Com_sprintf(szText + i, sizeof(szText) - i, ":%s", TargetName().c_str());
+    }
+
+    if (health != 0) {
+        i = Com_sprintf(szText + i, sizeof(szText) - i, ":%.1f", health);
+    }
+
+    G_DebugString(origin + Vector(0, 0, (mins.z + maxs.z) * 0.5f), 1, 1, 1, 1, szText);
+    G_DebugString(origin + Vector(0, 0, (mins.z + maxs.z) * 0.5f + 18), 1, 1, 1, 1, stateString[state - 1]);
 }
 
 /*****************************************************************************/
@@ -1370,125 +1282,108 @@ TARGETED door is only operational from triggers or script
 ******************************************************************************/
 
 Event EV_RotatingDoor_OpenAngle
-	( 
-	"openangle",
-	EV_DEFAULT,
-   "f",
-   "open_angle",
-   "Sets the open angle of the door.",
-	EV_NORMAL
-	);
+(
+    "openangle",
+    EV_DEFAULT,
+    "f",
+    "open_angle",
+    "Sets the open angle of the door.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Door, RotatingDoor, "func_rotatingdoor" )
-{
-	{ &EV_Door_DoClose,					&RotatingDoor::DoClose },
-	{ &EV_Door_DoOpen,					&RotatingDoor::DoOpen },
-	{ &EV_RotatingDoor_OpenAngle,		&RotatingDoor::OpenAngle },
-	{ NULL, NULL }
+CLASS_DECLARATION(Door, RotatingDoor, "func_rotatingdoor") {
+    {&EV_Door_DoClose,           &RotatingDoor::DoClose  },
+    {&EV_Door_DoOpen,            &RotatingDoor::DoOpen   },
+    {&EV_RotatingDoor_OpenAngle, &RotatingDoor::OpenAngle},
+    {NULL,                       NULL                    }
 };
 
-void RotatingDoor::DoOpen( Event *ev )
+void RotatingDoor::DoOpen(Event *ev)
 {
-	Vector ang;
+    Vector ang;
 
-	if( previous_state == STATE_CLOSED )
-	{
-		if( ev->NumArgs() > 0 )
-		{
-			Entity *other;
-			Vector p;
+    if (previous_state == STATE_CLOSED) {
+        if (ev->NumArgs() > 0) {
+            Entity *other;
+            Vector  p;
 
-			other = ev->GetEntity( 1 );
+            other = ev->GetEntity(1);
 
-			if( other )
-			{
-				Vector vMMOrigin ( mins + maxs );
-				Vector vMMCenter = vMMOrigin * 0.5f;
-				Vector vDoorDir;
-				Vector vPerpDir;
+            if (other) {
+                Vector vMMOrigin(mins + maxs);
+                Vector vMMCenter = vMMOrigin * 0.5f;
+                Vector vDoorDir;
+                Vector vPerpDir;
 
-				vMMOrigin = vMMOrigin - vMMCenter;
-				vMMOrigin.normalize();
+                vMMOrigin = vMMOrigin - vMMCenter;
+                vMMOrigin.normalize();
 
-				vDoorDir[ 0 ] = dir[ 1 ];
-				vDoorDir[ 1 ] = -dir[ 0 ];
-				vDoorDir[ 2 ] = dir[ 2 ];
+                vDoorDir[0] = dir[1];
+                vDoorDir[1] = -dir[0];
+                vDoorDir[2] = dir[2];
 
-				p = other->origin - origin;
+                p = other->origin - origin;
 
-				vPerpDir = p;
-				vPerpDir[ 2 ] = 0.f;
-				vPerpDir.normalize();
+                vPerpDir    = p;
+                vPerpDir[2] = 0.f;
+                vPerpDir.normalize();
 
-				if( m_bAlwaysAway )
-				{
-					diropened = DotProduct( vPerpDir, vDoorDir );
+                if (m_bAlwaysAway) {
+                    diropened = DotProduct(vPerpDir, vDoorDir);
 
-					if( DotProduct( dir, vMMOrigin ) > 0.0f ) {
-						diropened = -diropened;
-					}
-				}
-				else
-				{
-					diropened = DotProduct( dir, vMMOrigin );
-				}
-			}
-			else
-			{
-				ScriptError( "Door trying to be opened with a NULL entity." );
-			}
-		}
-		else
-		{
-			diropened = 0 - init_door_direction;
-		}
-	}
-	else
-	{
-		diropened = -init_door_direction;
-	}
+                    if (DotProduct(dir, vMMOrigin) > 0.0f) {
+                        diropened = -diropened;
+                    }
+                } else {
+                    diropened = DotProduct(dir, vMMOrigin);
+                }
+            } else {
+                ScriptError("Door trying to be opened with a NULL entity.");
+            }
+        } else {
+            diropened = 0 - init_door_direction;
+        }
+    }
 
-	if( diropened < 0.0f )
-	{
-		ang = startangle + Vector( 0.0f, angle, 0.0f );
-	}
-	else
-	{
-		ang = startangle - Vector( 0.0f, angle, 0.0f );
-	}
+    if (diropened < 0.0f) {
+        ang = startangle + Vector(0.0f, angle, 0.0f);
+    } else {
+        ang = startangle - Vector(0.0f, angle, 0.0f);
+    }
 
-   MoveTo( origin, ang, fabs( speed*angle ), EV_Door_OpenEnd );
+    if (localangles.yaw() + 360 <= ang.yaw()) {
+        localangles.setYaw(localangles.yaw() + 360);
+    } else if (localangles.yaw() - 360 >= ang.yaw()) {
+        localangles.setYaw(localangles.yaw() - 360);
+    }
+
+    MoveTo(origin, ang, fabs(speed * angle), EV_Door_OpenEnd);
+
+    setContents(CONTENTS_SOLID);
+    setSolidType(SOLID_BSP);
 }
 
-void RotatingDoor::DoClose
-	(
-	Event *ev
-	)
+void RotatingDoor::DoClose(Event *ev)
 {
-	MoveTo( origin, startangle, fabs( speed*angle ), EV_Door_CloseEnd );
+    MoveTo(origin, startangle, fabs(speed * angle), EV_Door_CloseEnd);
 }
 
-void RotatingDoor::OpenAngle
-   (
-   Event *ev
-   )
-
-   {
-   angle = ev->GetFloat( 1 );
-   }
+void RotatingDoor::OpenAngle(Event *ev)
+{
+    angle = ev->GetFloat(1);
+}
 
 RotatingDoor::RotatingDoor()
-	{
-   if ( LoadingSavegame )
-      {
-      return;
-      }
-	startangle = angles;
+{
+    if (LoadingSavegame) {
+        return;
+    }
+    startangle = angles;
 
-	angle = 90;
+    angle = 90;
 
-   init_door_direction = (spawnflags & DOOR_OPEN_DIRECTION);
-	}
+    init_door_direction = (spawnflags & DOOR_OPEN_DIRECTION);
+}
 
 /*****************************************************************************/
 /*QUAKED func_door (0 0.25 0.5) ? START_OPEN x DOOR_DONT_LINK NOT_PLAYERS NOT_MONSTERS TOGGLE AUTO_OPEN TARGETED
@@ -1521,129 +1416,107 @@ TARGETED door is only operational from triggers or script
 ******************************************************************************/
 
 Event EV_SlidingDoor_Setup
-	( 
-	"setup",
-	EV_CODEONLY,
-   NULL,
-   NULL,
-   "Sets up the sliding door.",
-	EV_NORMAL
-	);
+(
+    "setup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Sets up the sliding door.",
+    EV_NORMAL
+);
 Event EV_SlidingDoor_SetLip
-	( 
-	"lip",
-	EV_DEFAULT,
-   "f",
-   "lip",
-   "Sets the lip of the sliding door.",
-	EV_NORMAL
-	);
+(
+    "lip",
+    EV_DEFAULT,
+    "f",
+    "lip",
+    "Sets the lip of the sliding door.",
+    EV_NORMAL
+);
 Event EV_SlidingDoor_SetSpeed
-	( 
-	"speed",
-	EV_DEFAULT,
-   "f",
-   "speed",
-   "Sets the speed of the sliding door.",
-	EV_NORMAL
-	);
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the speed of the sliding door.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Door, SlidingDoor, "func_door" )
-	{
-	   { &EV_Door_DoClose,					&SlidingDoor::DoClose },
-	   { &EV_Door_DoOpen,					&SlidingDoor::DoOpen },
-      { &EV_SlidingDoor_Setup,				&SlidingDoor::Setup },
-      { &EV_SlidingDoor_SetLip,				&SlidingDoor::SetLip },
-      { &EV_SlidingDoor_SetSpeed,			&SlidingDoor::SetSpeed },
-      { &EV_SetAngle,						&SlidingDoor::SetMoveDir },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Door, SlidingDoor, "func_door") {
+    {&EV_Door_DoClose,         &SlidingDoor::DoClose   },
+    {&EV_Door_DoOpen,          &SlidingDoor::DoOpen    },
+    {&EV_SlidingDoor_Setup,    &SlidingDoor::Setup     },
+    {&EV_SlidingDoor_SetLip,   &SlidingDoor::SetLip    },
+    {&EV_SlidingDoor_SetSpeed, &SlidingDoor::SetSpeed  },
+    {&EV_SetAngle,             &SlidingDoor::SetMoveDir},
+    {NULL,                     NULL                    }
+};
 
-void SlidingDoor::SetMoveDir
-   (
-   Event *ev
-   )
+void SlidingDoor::SetMoveDir(Event *ev)
 
-   {
-   float t;
-   float angle;
+{
+    float t;
+    float angle;
 
-   angle = ev->GetFloat( 1 );
-	movedir = G_GetMovedir( angle );
-   dir = movedir;
-	t = dir[ 0 ];
-	dir[ 0 ] = -dir[ 1 ];
-	dir[ 1 ] = t;
-   }
+    angle   = ev->GetFloat(1);
+    movedir = G_GetMovedir(angle);
+    dir     = movedir;
+    t       = dir[0];
+    dir[0]  = -dir[1];
+    dir[1]  = t;
+}
 
-void SlidingDoor::DoOpen
-   (
- 	Event *ev
-   )
+void SlidingDoor::DoOpen(Event *ev)
+{
+    MoveTo(pos2, angles, speed * totalmove, EV_Door_OpenEnd);
+}
 
-	{
-	MoveTo( pos2, angles, speed*totalmove, EV_Door_OpenEnd );
-   }
+void SlidingDoor::DoClose(Event *ev)
 
-void SlidingDoor::DoClose
-   (
- 	Event *ev
-   )
+{
+    MoveTo(pos1, angles, speed * totalmove, EV_Door_CloseEnd);
+}
 
-	{
-	MoveTo( pos1, angles, speed*totalmove, EV_Door_CloseEnd );
-   }
+void SlidingDoor::SetLip(Event *ev)
 
-void SlidingDoor::SetLip
-   (
-   Event *ev
-   )
+{
+    lip = ev->GetFloat(1);
+    CancelEventsOfType(EV_SlidingDoor_Setup);
+    PostEvent(EV_SlidingDoor_Setup, EV_POSTSPAWN);
+}
 
-   {
-   lip = ev->GetFloat( 1 );
-   CancelEventsOfType( EV_SlidingDoor_Setup );
-   PostEvent( EV_SlidingDoor_Setup, EV_POSTSPAWN );
-   }
+void SlidingDoor::SetSpeed(Event *ev)
 
-void SlidingDoor::SetSpeed
-   (
-   Event *ev
-   )
+{
+    basespeed = ev->GetFloat(1);
+    CancelEventsOfType(EV_SlidingDoor_Setup);
+    PostEvent(EV_SlidingDoor_Setup, EV_POSTSPAWN);
+}
 
-   {
-   basespeed = ev->GetFloat( 1 );
-   CancelEventsOfType( EV_SlidingDoor_Setup );
-   PostEvent( EV_SlidingDoor_Setup, EV_POSTSPAWN );
-   }
+void SlidingDoor::Setup(Event *ev)
 
-void SlidingDoor::Setup
-   (
-   Event *ev
-   )
+{
+    totalmove = fabs(movedir * size) - lip;
+    pos1      = origin;
+    pos2      = pos1 + movedir * totalmove;
 
-   {
-	totalmove = fabs( movedir * size ) - lip;
-   pos1 = origin;
-	pos2 = pos1 + movedir * totalmove;
-
-	if ( basespeed )
-      {
-      speed = basespeed / totalmove;
-      }
-   }
+    if (basespeed) {
+        speed = basespeed / totalmove;
+    }
+}
 
 SlidingDoor::SlidingDoor()
-	{
-   if ( LoadingSavegame )
-      {
-      return;
-      }
-	lip = 8;
-	basespeed = 0;
-	movedir = G_GetMovedir( 0 );
+{
+    if (LoadingSavegame) {
+        return;
+    }
+    lip       = 8;
+    basespeed = 0;
+    movedir   = G_GetMovedir(0);
 
-   PostEvent( EV_SlidingDoor_Setup, EV_POSTSPAWN );
-	}
+    PostEvent(EV_SlidingDoor_Setup, EV_POSTSPAWN);
+}
 
 /*****************************************************************************/
 /*QUAKED script_door (0 0.5 1) ? START_OPEN x DOOR_DONT_LINK NOT_PLAYERS NOT_MONSTERS TOGGLE AUTO_OPEN TARGETED
@@ -1680,169 +1553,140 @@ TARGETED door is only operational from triggers or script
 ******************************************************************************/
 
 Event EV_ScriptDoor_DoInit
-	( 
-	"doinit",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Sets up the script door.",
-	EV_NORMAL
-	);
+(
+    "doinit",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up the script door.",
+    EV_NORMAL
+);
 Event EV_ScriptDoor_SetOpenThread
-	( 
-	"openthread",
-	EV_DEFAULT,
-   "s",
-   "openthread",
-   "Set the thread to run when the door is opened (required).",
-	EV_NORMAL
-	);
+(
+    "openthread",
+    EV_DEFAULT,
+    "s",
+    "openthread",
+    "Set the thread to run when the door is opened (required).",
+    EV_NORMAL
+);
 Event EV_ScriptDoor_SetCloseThread
-	( 
-	"closethread",
-	EV_DEFAULT,
-   "s",
-   "closethread",
-   "Set the thread to run when the door is closed (required).",
-	EV_NORMAL
-	);
+(
+    "closethread",
+    EV_DEFAULT,
+    "s",
+    "closethread",
+    "Set the thread to run when the door is closed (required).",
+    EV_NORMAL
+);
 Event EV_ScriptDoor_SetInitThread
-	( 
-	"initthread",
-	EV_DEFAULT,
-   "s",
-   "initthread",
-   "Set the thread to run when the door is initialized (optional).",
-	EV_NORMAL
-	);
+(
+    "initthread",
+    EV_DEFAULT,
+    "s",
+    "initthread",
+    "Set the thread to run when the door is initialized (optional).",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Door, ScriptDoor, "script_door" )
-	{
-	   { &EV_ScriptDoor_DoInit,					&ScriptDoor::DoInit },
-	   { &EV_Door_DoClose,						&ScriptDoor::DoClose },
-	   { &EV_Door_DoOpen,						&ScriptDoor::DoOpen },
-	   { &EV_ScriptDoor_SetInitThread,			&ScriptDoor::SetInitThread },
-	   { &EV_ScriptDoor_SetOpenThread,			&ScriptDoor::SetOpenThread },
-	   { &EV_ScriptDoor_SetCloseThread,			&ScriptDoor::SetCloseThread },
-      { &EV_SetAngle,							&ScriptDoor::SetMoveDir },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Door, ScriptDoor, "script_door") {
+    {&EV_ScriptDoor_DoInit,         &ScriptDoor::DoInit        },
+    {&EV_Door_DoClose,              &ScriptDoor::DoClose       },
+    {&EV_Door_DoOpen,               &ScriptDoor::DoOpen        },
+    {&EV_ScriptDoor_SetInitThread,  &ScriptDoor::SetInitThread },
+    {&EV_ScriptDoor_SetOpenThread,  &ScriptDoor::SetOpenThread },
+    {&EV_ScriptDoor_SetCloseThread, &ScriptDoor::SetCloseThread},
+    {&EV_SetAngle,                  &ScriptDoor::SetMoveDir    },
+    {NULL,                          NULL                       }
+};
 
-void ScriptDoor::SetMoveDir
-   (
-   Event *ev
-   )
+void ScriptDoor::SetMoveDir(Event *ev)
 
-   {
-   float t;
-   float angle;
+{
+    float t;
+    float angle;
 
-   angle = ev->GetFloat( 1 );
-	movedir = G_GetMovedir( angle );
-   dir = movedir;
-	t = dir[ 0 ];
-	dir[ 0 ] = -dir[ 1 ];
-	dir[ 1 ] = t;
-   }
+    angle   = ev->GetFloat(1);
+    movedir = G_GetMovedir(angle);
+    dir     = movedir;
+    t       = dir[0];
+    dir[0]  = -dir[1];
+    dir[1]  = t;
+}
 
-void ScriptDoor::SetOpenThread
-   (
- 	Event *ev
-   )
-	{
-	openlabel.SetThread( ev->GetValue( 1 ) );
-   }
+void ScriptDoor::SetOpenThread(Event *ev)
+{
+    openlabel.SetThread(ev->GetValue(1));
+}
 
-void ScriptDoor::SetCloseThread
-   (
- 	Event *ev
-   )
-	{
-	closelabel.SetThread( ev->GetValue( 1 ) );
-   }
+void ScriptDoor::SetCloseThread(Event *ev)
+{
+    closelabel.SetThread(ev->GetValue(1));
+}
 
-void ScriptDoor::DoInit
-   (
- 	Event *ev
-   )
-	{
-   startorigin = origin;
-	doorsize = fabs( movedir * size );
+void ScriptDoor::DoInit(Event *ev)
+{
+    startorigin = origin;
+    doorsize    = fabs(movedir * size);
 
-	if( initlabel.IsSet() )
-	{
-		initlabel.Execute( this );
-	}
-   }
+    if (initlabel.IsSet()) {
+        initlabel.Execute(this);
+    }
+}
 
-void ScriptDoor::DoOpen
-   (
- 	Event *ev
-   )
+void ScriptDoor::DoOpen(Event *ev)
+{
+    if (openlabel.IsSet()) {
+        openlabel.Execute(this);
+    }
 
-	{
-	if( openlabel.IsSet() )
-	{
-		openlabel.Execute( this );
-	}
+    if (previous_state == STATE_CLOSED) {
+        diropened = 0;
+        if (ev->NumArgs() > 0) {
+            Entity *other;
+            Vector  p;
 
-   if ( previous_state == STATE_CLOSED )
-      {
-      diropened = 0;
-      if ( ev->NumArgs() > 0 )
-         {
-   	   Entity *other;
-	      Vector p;
+            other     = ev->GetEntity(1);
+            p         = other->origin - origin;
+            p.z       = 0;
+            diropened = dir * p;
+        }
+    }
+}
 
-	      other = ev->GetEntity( 1 );
-         p = other->origin - origin;
-         p.z = 0;
-         diropened = dir * p;
-         }
-      }
-   }
+void ScriptDoor::DoClose(Event *ev)
+{
+    if (closelabel.IsSet()) {
+        closelabel.Execute(this);
+    }
+}
 
-void ScriptDoor::DoClose
-   (
- 	Event *ev
-   )
-	{
-	if( closelabel.IsSet() )
-	{
-		closelabel.Execute( this );
-	}
-   }
+void ScriptDoor::SetInitThread(Event *ev)
 
-void ScriptDoor::SetInitThread
-   (
-   Event *ev
-   )
-
-   {
-	initlabel.SetThread( ev->GetValue( 1 ) );
-   }
+{
+    initlabel.SetThread(ev->GetValue(1));
+}
 
 ScriptDoor::ScriptDoor()
 {
-	AddWaitTill(STRING_OPEN);
-	AddWaitTill(STRING_CLOSE);
+    AddWaitTill(STRING_OPEN);
+    AddWaitTill(STRING_CLOSE);
 
-	if ( LoadingSavegame )
-	{
-		return;
-	}
-	startangle = angles;
+    if (LoadingSavegame) {
+        return;
+    }
+    startangle = angles;
 
-	//
-	// clear out the sounds if necessary
-	// scripted doors typically have their own sounds
-	//
-	sound_open_start = "";
-	sound_open_end = "";
-	sound_close_start = "";
-	sound_close_end = "";
+    //
+    // clear out the sounds if necessary
+    // scripted doors typically have their own sounds
+    //
+    sound_open_start  = "";
+    sound_open_end    = "";
+    sound_close_start = "";
+    sound_close_end   = "";
 
-	movedir = G_GetMovedir( 0 );
+    movedir = G_GetMovedir(0);
 
-	PostEvent( EV_ScriptDoor_DoInit, EV_POSTSPAWN );
+    PostEvent(EV_ScriptDoor_DoInit, EV_POSTSPAWN);
 }
diff --git a/code/fgame/doors.h b/code/fgame/doors.h
index 076df7e1..588028d5 100644
--- a/code/fgame/doors.h
+++ b/code/fgame/doors.h
@@ -22,10 +22,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // doors.h: Doors are environment objects that slide open when activated by triggers
 // or when used by the player.
-// 
+//
 
-#ifndef __DOORS_H__
-#define __DOORS_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -48,219 +47,208 @@ class Door;
 typedef SafePtr<Door> DoorPtr;
 
 class Door : public ScriptSlave
-	{
-	protected:
-		str			sound_open_start;
-		str			sound_open_end;
-		str			sound_close_start;
-		str			sound_close_end;
-		str			sound_message;
-		str			sound_locked;
-      float       lastblocktime;
-		float			angle;
-		Vector		dir;
-      float       diropened;
-		int			state;
-      int         previous_state;
-		int			trigger;
-		int			nextdoor;
-		DoorPtr		master;
-		float			next_locked_time;
-		bool			m_bAlwaysAway;
+{
+protected:
+    str     sound_open_start;
+    str     sound_open_end;
+    str     sound_close_start;
+    str     sound_close_end;
+    str     sound_message;
+    str     sound_locked;
+    float   lastblocktime;
+    float   angle;
+    Vector  dir;
+    float   diropened;
+    int     state;
+    int     previous_state;
+    int     trigger;
+    int     nextdoor;
+    DoorPtr master;
+    float   next_locked_time;
+    bool    m_bAlwaysAway;
 
-		void			SetDir( Event *ev );
-		void			OpenEnd( Event *ev );
-		void			CloseEnd( Event *ev );
-		void			Close( Event *ev );
-		void			Open( Event *ev );
-		void			DoorUse( Event *ev );
-		void			DoorFire( Event *ev );
-		void			DoorBlocked( Event *ev );
-		void			FieldTouched( Event *ev );
-		void			TryOpen( Event *ev );
-		void			SpawnTriggerField( Vector fmins, Vector fmaxs );
-		qboolean		DoorTouches( Door *e1 );
-		void			LinkDoors( Event *ev );	
-		void			SetTime( Event *ev );
-		void			LockDoor( Event *ev );
-		void			UnlockDoor( Event *ev );
-		void			SetOpenStartSound( str sound );
-		void			SetOpenStartSound( Event *ev );
-		void			SetOpenEndSound( str sound );
-		void			SetOpenEndSound( Event *ev );
-		void			SetCloseStartSound( Event *ev );
-		void			SetCloseStartSound( str sound );
-		void			SetCloseEndSound( Event *ev );
-		void			SetCloseEndSound( str sound );
-		void			SetMessageSound( str sound );
-		void			SetMessageSound( Event *ev );
-		void			SetLockedSound( str sound );
-		void			SetLockedSound( Event *ev );
-		void			SetWait( Event *ev );
-		void			SetDmg( Event *ev );
-		void			EventTrySolid( Event *ev );
-		void			EventAlwaysAway( Event *ev );
-		void			EventDoorType( Event *ev );
+    void     SetDir(Event *ev);
+    void     OpenEnd(Event *ev);
+    void     CloseEnd(Event *ev);
+    void     Close(Event *ev);
+    void     Open(Event *ev);
+    void     DoorUse(Event *ev);
+    void     DoorFire(Event *ev);
+    void     DoorBlocked(Event *ev);
+    void     FieldTouched(Event *ev);
+    void     TryOpen(Event *ev);
+    void     SpawnTriggerField(Vector fmins, Vector fmaxs);
+    qboolean DoorTouches(Door *e1);
+    void     LinkDoors(Event *ev);
+    void     SetTime(Event *ev);
+    void     LockDoor(Event *ev);
+    void     UnlockDoor(Event *ev);
+    void     SetOpenStartSound(str sound);
+    void     SetOpenStartSound(Event *ev);
+    void     SetOpenEndSound(str sound);
+    void     SetOpenEndSound(Event *ev);
+    void     SetCloseStartSound(Event *ev);
+    void     SetCloseStartSound(str sound);
+    void     SetCloseEndSound(Event *ev);
+    void     SetCloseEndSound(str sound);
+    void     SetMessageSound(str sound);
+    void     SetMessageSound(Event *ev);
+    void     SetLockedSound(str sound);
+    void     SetLockedSound(Event *ev);
+    void     SetWait(Event *ev);
+    void     SetDmg(Event *ev);
+    void     EventTrySolid(Event *ev);
+    void     EventAlwaysAway(Event *ev);
+    void     EventDoorType(Event *ev);
 
-		qboolean		BlocksAIMovement( void ) const override;
-		qboolean		AIDontFace( void ) const override;
+    void     SetDoorType(str s);
+    qboolean BlocksAIMovement(void) const override;
+    qboolean AIDontFace(void) const override;
+    void     ShowInfo(float fDot, float fDist) override;
 
-		void			UpdatePathConnection( void );
-		void			SetLocked( qboolean newLocked );
-		void			SetState( int newState );
+    void UpdatePathConnection(void);
+    void SetLocked(qboolean newLocked);
+    void SetState(int newState);
 
-	public:
-      CLASS_PROTOTYPE( Door );
+public:
+    CLASS_PROTOTYPE(Door);
 
-      qboolean		locked;
+    qboolean locked;
 
-						Door();
-		qboolean		isOpen( void );
-		qboolean		isCompletelyClosed( void );
-		qboolean		CanBeOpenedBy( Entity *ent );
-	   void Archive( Archiver &arc ) override;
-	};
+    Door();
+    qboolean isOpen(void);
+    qboolean isCompletelyClosed(void);
+    void     GetIsOpen(Event *ev); // Added in 2.30
+    qboolean CanBeOpenedBy(Entity *ent);
+    void     Archive(Archiver    &arc) override;
+};
 
-inline void Door::Archive
-	(
-	Archiver &arc
-	)
-   {
-   ScriptSlave::Archive( arc );
+inline void Door::Archive(Archiver& arc)
+{
+    ScriptSlave::Archive(arc);
 
-   arc.ArchiveString( &sound_open_start );
-   arc.ArchiveString( &sound_open_end );
-   arc.ArchiveString( &sound_close_start );
-   arc.ArchiveString( &sound_close_end );
-   arc.ArchiveString( &sound_message );
-   arc.ArchiveString( &sound_locked );
-	if ( arc.Loading() )
-	{
-		SetOpenStartSound( sound_open_start );
-		SetOpenEndSound( sound_open_end );
-		SetCloseStartSound( sound_close_start );
-		SetCloseEndSound( sound_close_end );
-		SetMessageSound( sound_message );
-		SetLockedSound( sound_locked );
-	}
-   arc.ArchiveFloat( &lastblocktime );
-   arc.ArchiveFloat( &angle );
-   arc.ArchiveVector( &dir );
-   arc.ArchiveFloat( &diropened );
-   arc.ArchiveInteger( &state );
-   arc.ArchiveInteger( &previous_state );
-   arc.ArchiveInteger( &trigger );
-   arc.ArchiveInteger( &nextdoor );
-   arc.ArchiveSafePointer( &master );
-   arc.ArchiveBoolean( &locked );
-	arc.ArchiveFloat( &next_locked_time );
-   }
+    arc.ArchiveString(&sound_open_start);
+    arc.ArchiveString(&sound_open_end);
+    arc.ArchiveString(&sound_close_start);
+    arc.ArchiveString(&sound_close_end);
+    arc.ArchiveString(&sound_message);
+    arc.ArchiveString(&sound_locked);
+    if (arc.Loading()) {
+        SetOpenStartSound(sound_open_start);
+        SetOpenEndSound(sound_open_end);
+        SetCloseStartSound(sound_close_start);
+        SetCloseEndSound(sound_close_end);
+        SetMessageSound(sound_message);
+        SetLockedSound(sound_locked);
+    }
+    arc.ArchiveFloat(&lastblocktime);
+    arc.ArchiveFloat(&angle);
+    arc.ArchiveVector(&dir);
+    arc.ArchiveFloat(&diropened);
+    arc.ArchiveInteger(&state);
+    arc.ArchiveInteger(&previous_state);
+    arc.ArchiveInteger(&trigger);
+    arc.ArchiveInteger(&nextdoor);
+    arc.ArchiveSafePointer(&master);
+    arc.ArchiveFloat(&next_locked_time);
+    arc.ArchiveBoolean(&locked);
+    arc.ArchiveBool(&m_bAlwaysAway);
+}
 
 class RotatingDoor : public Door
-	{
-	protected:
-		float		angle;
-      Vector   startangle;
-      int      init_door_direction;
+{
+protected:
+    float  angle;
+    Vector startangle;
+    int    init_door_direction;
 
-	public:
-      CLASS_PROTOTYPE( RotatingDoor );
+public:
+    CLASS_PROTOTYPE(RotatingDoor);
 
-      void           DoOpen( Event *ev );
-      void           DoClose( Event *ev );
-      void           OpenAngle( Event *ev );
-	   void Archive( Archiver &arc ) override;
+    void DoOpen(Event *ev);
+    void DoClose(Event *ev);
+    void OpenAngle(Event *ev);
+    void Archive(Archiver& arc) override;
 
-					RotatingDoor();
-	};
+    RotatingDoor();
+};
 
-inline void RotatingDoor::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Door::Archive( arc );
+inline void RotatingDoor::Archive(Archiver& arc)
+{
+    Door::Archive(arc);
 
-   arc.ArchiveFloat( &angle );
-   arc.ArchiveVector( &startangle );
-   arc.ArchiveInteger( &init_door_direction );
-   }
+    arc.ArchiveFloat(&angle);
+    arc.ArchiveVector(&startangle);
+    arc.ArchiveInteger(&init_door_direction);
+}
 
 class SlidingDoor : public Door
-	{
-	protected:
-      float    totalmove;
-      float    lip;
-      Vector   pos1;
-      Vector   pos2;
-      float    basespeed;
-      Vector   movedir;
+{
+protected:
+    float  totalmove;
+    float  lip;
+    Vector pos1;
+    Vector pos2;
+    float  basespeed;
+    Vector movedir;
 
-	public:
-      CLASS_PROTOTYPE( SlidingDoor );
+public:
+    CLASS_PROTOTYPE(SlidingDoor);
 
-      void     SetMoveDir( Event *ev );
-      void     Setup( Event *ev );
-      void     SetLip( Event *ev );
-      void     SetSpeed( Event *ev );
-      void     DoOpen( Event *ev );
-      void     DoClose( Event *ev );
-	   void Archive( Archiver &arc ) override;
+    void SetMoveDir(Event *ev);
+    void Setup(Event *ev);
+    void SetLip(Event *ev);
+    void SetSpeed(Event *ev);
+    void DoOpen(Event *ev);
+    void DoClose(Event *ev);
+    void Archive(Archiver& arc) override;
 
-					SlidingDoor();
-	};
+    SlidingDoor();
+};
 
-inline void SlidingDoor::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Door::Archive( arc );
+inline void SlidingDoor::Archive(Archiver& arc)
+{
+    Door::Archive(arc);
 
-   arc.ArchiveFloat( &totalmove );
-   arc.ArchiveFloat( &lip );
-   arc.ArchiveVector( &pos1 );
-   arc.ArchiveVector( &pos2 );
-   arc.ArchiveVector( &movedir );
-   arc.ArchiveFloat( &basespeed );
-   }
+    arc.ArchiveFloat(&totalmove);
+    arc.ArchiveFloat(&lip);
+    arc.ArchiveVector(&pos1);
+    arc.ArchiveVector(&pos2);
+    arc.ArchiveVector(&movedir);
+    arc.ArchiveFloat(&basespeed);
+}
 
 class ScriptDoor : public Door
-	{
-	protected:
-      ScriptThreadLabel		initlabel;
-      ScriptThreadLabel		openlabel;
-      ScriptThreadLabel		closelabel;
-      float    doorsize;
-		Vector	startangle;
-      Vector   startorigin;
-      Vector   movedir;
+{
+protected:
+    ScriptThreadLabel initlabel;
+    ScriptThreadLabel openlabel;
+    ScriptThreadLabel closelabel;
+    float             doorsize;
+    Vector            startangle;
+    Vector            startorigin;
+    Vector            movedir;
 
-	public:
-      CLASS_PROTOTYPE( ScriptDoor );
+public:
+    CLASS_PROTOTYPE(ScriptDoor);
 
-      void           SetMoveDir( Event *ev );
-      void           DoInit( Event *ev );
-      void           DoOpen( Event *ev );
-      void           DoClose( Event *ev );
-      void           SetOpenThread( Event *ev );
-      void           SetCloseThread( Event *ev );
-      void           SetInitThread( Event *ev );
-	   void Archive( Archiver &arc ) override;
-					      ScriptDoor();
-	};
+    void SetMoveDir(Event *ev);
+    void DoInit(Event *ev);
+    void DoOpen(Event *ev);
+    void DoClose(Event *ev);
+    void SetOpenThread(Event *ev);
+    void SetCloseThread(Event *ev);
+    void SetInitThread(Event *ev);
+    void Archive(Archiver& arc) override;
+    ScriptDoor();
+};
 
-inline void ScriptDoor::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Door::Archive( arc );
+inline void ScriptDoor::Archive(Archiver& arc)
+{
+    Door::Archive(arc);
 
-   arc.ArchiveFloat( &doorsize );
-   arc.ArchiveVector( &startangle );
-   arc.ArchiveVector( &startorigin );
-   arc.ArchiveVector( &movedir );
-   }
-
-#endif /* doors.h */
+    arc.ArchiveFloat(&doorsize);
+    arc.ArchiveVector(&startangle);
+    arc.ArchiveVector(&startorigin);
+    arc.ArchiveVector(&movedir);
+}
diff --git a/code/fgame/earthquake.cpp b/code/fgame/earthquake.cpp
index 4d008b6a..835e5603 100644
--- a/code/fgame/earthquake.cpp
+++ b/code/fgame/earthquake.cpp
@@ -133,7 +133,7 @@ ViewJitter::ViewJitter()
 
 	m_fDuration = 0;
 
-	m_bDoneDeath = qfalse;
+	m_bDoneDeath = false;
 }
 
 ViewJitter::ViewJitter( Vector vOrigin, float fRadius, float fEdgeEffect, Vector vStrength, float fDuration, Vector vTimeDecay, float fStartDecay )
@@ -154,7 +154,7 @@ ViewJitter::ViewJitter( Vector vOrigin, float fRadius, float fEdgeEffect, Vector
 
 	m_fDuration = fDuration;
 
-	m_bDoneDeath = false;
+	m_bDoneDeath = true;
 	m_fTimeRunning = 0;
 
 	PostEvent( EV_ViewJitter_Think, fStartDecay );
diff --git a/code/fgame/earthquake.h b/code/fgame/earthquake.h
index 98157027..0a6b1721 100644
--- a/code/fgame/earthquake.h
+++ b/code/fgame/earthquake.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // The earthquake effect is visible to the user as the shaking of his screen.
 // 
 
-#ifndef __EARTHQUAKE_H__
-#define __EARTHQUAKE_H__
+#pragma once
 
 #include "g_local.h"
 #include "trigger.h"
@@ -75,5 +74,3 @@ inline void ViewJitter::Archive
 	arc.ArchiveBoolean( &m_bDoneDeath );
 	arc.ArchiveFloat( &m_fTimeRunning );
 }
-
-#endif
diff --git a/code/fgame/effectentity.h b/code/fgame/effectentity.h
index 63c0c984..2379abee 100644
--- a/code/fgame/effectentity.h
+++ b/code/fgame/effectentity.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // actor.cpp: Base class for character AI.
 
-#ifndef __EFFECTENTITY_H__
-#define __EFFECTENTITY_H__
+#pragma once
 
 #include "animate.h"
 
@@ -34,5 +33,3 @@ public:
 
 	EffectEntity();
 };
-
-#endif // __EFFECTENTITY_H__
diff --git a/code/fgame/entity.cpp b/code/fgame/entity.cpp
index 482d9a9a..6dfecf6b 100644
--- a/code/fgame/entity.cpp
+++ b/code/fgame/entity.cpp
@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_phys.h"
 #include "debuglines.h"
 #include <tiki.h>
+#include <utility>
 
 // Generic entity events
 Event EV_SoundDone(
@@ -676,7 +677,7 @@ Event EV_GetMins
     NULL,
     NULL,
     "Get the mins of the bounding box of the entity to mins.",
-    EV_RETURN
+    EV_GETTER
 );
 Event EV_GetMaxs
 (
@@ -685,7 +686,7 @@ Event EV_GetMaxs
     NULL,
     NULL,
     "Get the maxs of the bounding box of the entity to maxs.",
-    EV_RETURN
+    EV_GETTER
 );
 Event EV_SetAlpha
 (
@@ -767,7 +768,7 @@ Event EV_SetLight
     EV_DEFAULT,
     "ffff",
     "red green blue radius",
-    "Create a dynmaic light on this entity.",
+    "Create a dynamic light on this entity.",
     EV_NORMAL
 );
 
@@ -777,7 +778,7 @@ Event EV_LightOn
     EV_DEFAULT,
     NULL,
     NULL,
-    "Turn the configured dynmaic light on this entity on.",
+    "Turn the configured dynamic light on this entity on.",
     EV_NORMAL
 );
 Event EV_LightOff
@@ -804,7 +805,7 @@ Event EV_LightRed
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightGreen
@@ -813,7 +814,7 @@ Event EV_LightGreen
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightBlue
@@ -822,7 +823,7 @@ Event EV_LightBlue
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 Event EV_LightRadius
@@ -831,7 +832,7 @@ Event EV_LightRadius
     EV_DEFAULT,
     "f",
     "red",
-    "Set the red component of the dynmaic light on this entity.",
+    "Set the red component of the dynamic light on this entity.",
     EV_NORMAL
 );
 
@@ -1216,6 +1217,8 @@ Event EV_CanSee
     "returns 1 if the entities can see eachother, 0 if not",
     EV_RETURN
 );
+
+// Added in 2.0
 Event EV_CanSeeNoEnts
 (
     "canseenoents",
@@ -1225,6 +1228,7 @@ Event EV_CanSeeNoEnts
     "returns 1 if the entities can see eachother, 0 if not; ignores any entities between them",
     EV_RETURN
 );
+
 Event EV_Entity_InPVS
 (
     "inpvs",
@@ -1384,7 +1388,7 @@ Event EV_Entity_SinglePlayerCommand
     "sp",
     EV_DEFAULT,
     "sSSS",
-    "command parms",
+    "command parm1 parm2 ...",
     "Makes a command be executed only in single player",
     EV_NORMAL
 );
@@ -1393,7 +1397,7 @@ Event EV_Entity_MultiPlayerCommand
     "dm",
     EV_DEFAULT,
     "sSSS",
-    "command parms",
+    "command parm1 parm2 ...",
     "Makes a command be executed only in multiplayer",
     EV_NORMAL
 );
@@ -1402,7 +1406,7 @@ Event EV_Entity_RealismModeCommand
     "realism",
     EV_DEFAULT,
     "sSSS",
-    "command parms",
+    "command parm1 parm2 ...",
     "Makes a command be executed only in realism mode",
     EV_NORMAL
 );
@@ -1411,7 +1415,7 @@ Event EV_Entity_SPRealismModeCommand
     "sprealism",
     EV_DEFAULT,
     "sSSS",
-    "command parms",
+    "command parm1 parm2 ...",
     "Makes a command be executed only in single player realism mode",
     EV_NORMAL
 );
@@ -1420,7 +1424,7 @@ Event EV_Entity_DMRealismModeCommand
     "dmrealism",
     EV_DEFAULT,
     "sSSS",
-    "command parms",
+    "command parm1 parm2 ...",
     "Makes a command be executed only in multiplayer realism mode",
     EV_NORMAL
 );
@@ -1431,7 +1435,7 @@ Event EV_Entity_GetLocalYawFromVector
     NULL,
     NULL,
     "Turn a worldspace vector into a local space yaw",
-    EV_GETTER
+    EV_RETURN
 );
 Event EV_ShootableOnly
 (
@@ -1470,6 +1474,7 @@ Event EV_Entity_SetDHack
     "Enable or disable depth hack.",
     EV_NORMAL
 );
+/*
 Event EV_Entity_GetZone
 (
     "getzone",
@@ -1497,6 +1502,8 @@ Event EV_Entity_IsInZone
     "Returns 1 if the entity is in the specified zone. 0 otherwise",
     EV_RETURN
 );
+*/
+#ifdef OPM_FEATURES
 Event EV_Entity_SetHintRequireLookAt
 (
     "setuselookat",
@@ -1525,6 +1532,7 @@ Event EV_Entity_SetShader
     "Sets a shader for the entity. An empty string will revert to the normal entity shader.",
     EV_NORMAL
 );
+#endif
 
 CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_Damage,                       &Entity::DamageEvent              },
@@ -1623,6 +1631,7 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_IsTouching,                   &Entity::IsTouching               },
     {&EV_IsInside,                     &Entity::IsInside                 },
     {&EV_CanSee,                       &Entity::CanSee                   },
+    {&EV_CanSeeNoEnts,                 &Entity::CanSeeNoEnts             }, // Added in 2.0
     {&EV_Entity_InPVS,                 &Entity::EventInPVS               },
     {&EV_SetShaderData,                &Entity::SetShaderData            },
     {&EV_GetVelocity,                  &Entity::GetVelocity              },
@@ -1644,8 +1653,8 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_ConnectPaths,                 &Entity::EventConnectPaths        },
     {&EV_DisconnectPaths,              &Entity::EventDisconnectPaths     },
     {&EV_Remove,                       &Entity::Remove                   },
-    {&EV_Delete,                       &Entity::Remove                   },
-    {&EV_ScriptRemove,                 &Entity::Remove                   },
+    {&EV_Delete,                       &Listener::ScriptRemove           },
+    {&EV_ScriptRemove,                 &Listener::ScriptRemove           },
     {&EV_VolumeDamage,                 &Entity::EventVolumeDamage        },
     {&EV_GetNormalHealth,              &Entity::EventGetNormalHealth     },
     {&EV_NormalDamage,                 &Entity::EventNormalDamage        },
@@ -1666,13 +1675,17 @@ CLASS_DECLARATION(SimpleEntity, Entity, NULL) {
     {&EV_ShootableOnly,                &Entity::EventShootableOnly       },
     {&EV_SetShaderTime,                &Entity::SetShaderTime            },
     {&EV_NoTarget,                     &Entity::NoTarget                 },
+    /*
     {&EV_Entity_GetZone,               &Entity::GetZone                  },
     {&EV_Entity_Zone,                  &Entity::GetZone                  },
     {&EV_Entity_IsInZone,              &Entity::IsInZone                 },
+    */
     {&EV_Entity_SetDHack,              &Entity::SetDepthHack             },
+#ifdef OPM_FEATURES
     {&EV_Entity_SetHintRequireLookAt,  &Entity::SetHintRequireLookAt     },
     {&EV_Entity_SetHintString,         &Entity::SetHintString            },
     {&EV_Entity_SetShader,             &Entity::SetShader                },
+#endif
     {NULL,                             NULL                              }
 };
 
@@ -1685,7 +1698,7 @@ Entity::Entity()
     entnum = edict->s.number;
     radnum = -1;
 
-    entflags |= EF_ENTITY;
+    entflags |= ECF_ENTITY;
 
     AddWaitTill(STRING_DAMAGE);
     AddWaitTill(STRING_SPAWN);
@@ -1712,7 +1725,7 @@ Entity::Entity()
     groundcontents  = 0;
     velocity        = vec_zero;
     avelocity       = vec_zero;
-    edict->clipmask = MASK_USABLE;
+    edict->clipmask = MASK_SOLID;
 
     m_iNumGlues   = 0;
     m_bGlueAngles = true;
@@ -1778,10 +1791,9 @@ Entity::Entity()
     m_iNumBlockedPaths   = 0;
     m_BlockedPaths       = NULL;
 
+#ifdef OPM_FEATURES
     m_bHintRequiresLookAt = true;
-
-    // Misc
-    m_bBindChilds = false;
+#endif
 }
 
 Entity::~Entity()
@@ -1845,23 +1857,21 @@ Entity::~Entity()
     }
 
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
-        m_BlockedPaths = 0;
+        delete[] m_BlockedPaths;
+        m_BlockedPaths = NULL;
     }
 
     level.FreeEdict(edict);
 
-    entflags &= ~EF_ENTITY;
+    entflags &= ~ECF_ENTITY;
 }
 
 void Entity::ClassnameEvent(Event *ev)
-
 {
     strncpy(edict->entname, ev->GetString(1), sizeof(edict->entname) - 1);
 }
 
 void Entity::SpawnFlagsEvent(Event *ev)
-
 {
     // spawning variables
     spawnflags = ev->GetInteger(1);
@@ -1987,27 +1997,28 @@ const char *Entity::getModel() const
 
 void Entity::setModel(const str& mdl)
 {
-    if (strcmp(mdl, "")) {
-        if (*mdl == '*') {
-            model = mdl;
+    int animnum;
+    int i;
 
-            gi.SetBrushModel(edict, mdl);
-            if ((edict->solid == SOLID_BSP) && !edict->s.modelindex) {
-                const char *name;
+    if (mdl != "" && mdl[0] == '*') {
+        model = mdl;
 
-                name = getClassID();
-                if (!name) {
-                    name = getClassname();
-                }
-                gi.DPrintf("%s with SOLID_BSP and no model - '%s'(%d)\n", name, targetname.c_str(), entnum);
+        gi.SetBrushModel(edict, mdl);
+        if ((edict->solid == SOLID_BSP) && !edict->s.modelindex) {
+            const char* name;
 
-                // Make it non-solid so that the collision code doesn't kick us out.
-                setSolidType(SOLID_NOT);
+            name = getClassID();
+            if (!name) {
+                name = getClassname();
             }
+            gi.DPrintf("%s with SOLID_BSP and no model - '%s'(%d)\n", name, targetname.c_str(), entnum);
 
-            SetSize();
-            return;
+            // Make it non-solid so that the collision code doesn't kick us out.
+            setSolidType(SOLID_NOT);
         }
+
+        SetSize();
+        return;
     }
 
     model = CanonicalTikiName(mdl);
@@ -2020,42 +2031,32 @@ void Entity::setModel(const str& mdl)
     mins = vec_zero;
     maxs = vec_zero;
 
-    for (int i = 0; i < MAX_FRAMEINFOS; i++) {
-        edict->s.frameInfo[i].index  = 0;
-        edict->s.frameInfo[i].time   = 0;
-        edict->s.frameInfo[i].weight = 0;
+    // make sure to clear all frame infos when switching models
+    // so the entity doesn't end up with 'broken' animations
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
+        ClearAnimSlot(i);
     }
 
-    if (!strcmp(mdl, "")) {
-        mins = edict->r.mins;
-        maxs = edict->r.maxs;
-
-        size            = maxs - mins;
-        edict->r.radius = size.length() * 0.5f;
-        edict->radius2  = edict->r.radius * edict->r.radius;
+    if (mdl == "") {
+        SetSize();
         return;
     }
 
-    edict->s.frameInfo[0].index = gi.Anim_NumForName(edict->tiki, "idle");
-    if (edict->s.frameInfo[0].index < 0) {
-        edict->s.frameInfo[0].index = 0;
+    // search for the default idle animation
+    animnum = gi.Anim_NumForName(edict->tiki, "idle");
+    if (animnum < 0) {
+        animnum = 0;
     }
 
-    edict->s.frameInfo[0].weight = 1.0f;
-    edict->s.frameInfo[0].time   = 0;
-
+    // play the default idle animation
+    StartAnimSlot(0, animnum, 1);
+    // process all TIKI init commands
     ProcessInitCommands();
-
-    mins = edict->r.mins;
-    maxs = edict->r.maxs;
-
-    size            = maxs - mins;
-    edict->r.radius = size.length() * 0.5f;
-    edict->radius2  = edict->r.radius * edict->r.radius;
+    SetSize();
 
     if (edict->tiki && !mins.length() && !maxs.length()) {
         vec3_t tempmins, tempmaxs;
-        gi.CalculateBounds(edict->tiki, edict->s.scale, tempmins, tempmaxs);
+        gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, tempmins, tempmaxs);
         setSize(tempmins, tempmaxs);
     }
 }
@@ -2097,7 +2098,7 @@ void Entity::ProcessInitCommands(void)
         int    i, j;
         Event *event;
         for (i = 0; i < a->num_server_initcmds; i++) {
-            event = new Event(a->server_initcmds[i].args[0]);
+            event = new Event(a->server_initcmds[i].args[0], a->server_initcmds[i].num_args);
 
             for (j = 1; j < a->server_initcmds[i].num_args; j++) {
                 event->AddToken(a->server_initcmds[i].args[j]);
@@ -2134,49 +2135,21 @@ void Entity::SetTeamEvent(Event *ev)
 
 void Entity::TriggerEvent(Event *ev)
 {
-    const char *name;
-    Event      *event;
-    Entity     *ent;
-    ConSimple  *tlist;
-    int         i;
-    int         num;
+    SimpleEntity *ent;
+    ScriptVariable arrayVar;
+    int i;
 
-    name = ev->GetString(1);
-
-    // Check for object commands
-    if (name && name[0] == '$') {
-        str sName = str(name + 1);
-
-        tlist = world->GetTargetList(sName);
-        num   = tlist->NumObjects();
-        for (i = 1; i <= num; i++) {
-            ent = (Entity *)tlist->ObjectAt(i).Pointer();
-
-            assert(ent);
-
-            event = new Event(EV_Activate);
+    arrayVar = ev->GetValue(1);
+    arrayVar.CastConstArrayValue();
 
+    for (i = arrayVar.arraysize(); i > 0; i--) {
+        const ScriptVariable *variable = arrayVar[i];
+        ent = variable->simpleEntityValue();
+        if (ent) {
+            Event* event = new Event(EV_Activate);
             event->AddEntity(this);
             ent->ProcessEvent(event);
         }
-    } else if (name[0] == '*') // Check for entnum commands
-    {
-        if (!IsNumeric(&name[1])) {
-            gi.Printf("Expecting numeric value for * command, but found '%s'\n", &name[1]);
-        } else {
-            ent = G_GetEntity(atoi(&name[1]));
-            if (ent) {
-                event = new Event(EV_Activate);
-
-                event->AddEntity(this);
-                ent->ProcessEvent(event);
-            } else {
-                gi.Printf("Entity not found for * command\n");
-            }
-        }
-        return;
-    } else {
-        gi.Printf("Invalid entity reference '%s'.\n", name);
     }
 }
 
@@ -2269,7 +2242,7 @@ void Entity::setSize(Vector min, Vector max)
             vec3_t fullmins, fullmaxs;
             Vector delta;
 
-            gi.CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
+            gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
 
             delta           = Vector(fullmaxs) - Vector(fullmins);
             edict->r.radius = delta.length() * 0.5;
@@ -2298,7 +2271,7 @@ void Entity::link(void)
     absmin   = edict->r.absmin;
     absmax   = edict->r.absmax;
     centroid = (absmin + absmax) * 0.5;
-    centroid.copyTo(edict->r.currentOrigin);
+    centroid.copyTo(edict->r.centroid);
 
     // If this has a parent, then set the areanum the same
     // as the parent's
@@ -2630,14 +2603,11 @@ qboolean Entity::droptofloor(float maxfall)
 
     trace = G_Trace(start, mins, maxs, end, this, edict->clipmask, false, "Entity::droptofloor");
     if (trace.fraction == 1 || trace.startsolid || trace.allsolid || !trace.ent) {
-        groundentity = world->edict;
         return false;
     }
 
     setOrigin(trace.endpos);
 
-    groundentity = trace.ent;
-
     return true;
 }
 
@@ -2703,16 +2673,35 @@ void Entity::DamageEvent(Event *ev)
     Vector  momentum;
     Vector  position, direction, normal;
     int     knockback, damageflags, meansofdeath, location;
-    Event  *event;
+    Event   event;
     float   m;
+    EntityPtr This;
 
-    if ((takedamage == DAMAGE_NO) || (movetype == MOVETYPE_NOCLIP)) {
+    // Use a safe pointer because it might be deleted in Unregister
+    This = this;
+
+    if ((takedamage == DAMAGE_NO) || (movetype == MOVETYPE_NOCLIP) || health <= 0) {
         return;
     }
 
     attacker  = ev->GetEntity(1);
     damage    = ev->GetInteger(2);
     inflictor = ev->GetEntity(3);
+    meansofdeath = ev->GetInteger(9);
+
+    if (Immune(meansofdeath)) {
+        return;
+    }
+
+    if (!attacker) {
+        ScriptError("attacker is NULL");
+        return;
+    }
+
+    if (!inflictor) {
+        ScriptError("inflictor is NULL");
+        return;
+    }
 
     position  = ev->GetVector(4);
     direction = ev->GetVector(5);
@@ -2720,40 +2709,36 @@ void Entity::DamageEvent(Event *ev)
 
     knockback    = ev->GetInteger(7);
     damageflags  = ev->GetInteger(8);
-    meansofdeath = ev->GetInteger(9);
     location     = ev->GetInteger(10);
 
     // figure momentum add
     if ((inflictor != world) && (movetype != MOVETYPE_NONE) && (movetype != MOVETYPE_STATIONARY)
-        && (movetype != MOVETYPE_BOUNCE) && (movetype != MOVETYPE_PUSH) && (movetype != MOVETYPE_STOP)) {
+        && (movetype != MOVETYPE_BOUNCE) && (movetype != MOVETYPE_PUSH) && (movetype != MOVETYPE_STOP)
+        && (movetype != MOVETYPE_VEHICLE)) {
         dir = origin - (inflictor->origin + (inflictor->mins + inflictor->maxs) * 0.5);
         dir.normalize();
 
-        if (mass < 50) {
-            m = 50;
+        if (mass < 20) {
+            m = 20;
         } else {
             m = mass;
         }
 
-        momentum = dir * damage * (1700.0 / m);
+        momentum = dir * damage * (1000.0 / m);
         velocity += momentum;
     }
 
-    // check for godmode or invincibility
-    if (flags & FL_GODMODE) {
-        return;
-    }
-
-    // team play damage avoidance
-    //if ( ( global->teamplay == 1 ) && ( edict->team > 0 ) && ( edict->team == attacker->edict->team ) )
-    //	{
-    //	return;
-    //	}
-
-    if (!g_gametype->integer && IsSubclassOfPlayer()) {
+    if (!deathmatch->integer && IsSubclassOfPlayer()) {
         damage *= 0.15;
     }
 
+    // check for godmode or invincibility
+    if (!(flags & FL_GODMODE)) {
+        // do the damage
+        health -= damage;
+    }
+
+    /*
     if (deadflag) {
         // Check for gib.
         if (inflictor->IsSubclassOfProjectile()) {
@@ -2770,54 +2755,83 @@ void Entity::DamageEvent(Event *ev)
 
         return;
     }
+    */
 
-    // do the damage
-    health -= damage;
     if (health <= 0) {
         if (attacker) {
-            event = new Event(EV_GotKill);
-            event->AddEntity(this);
-            event->AddInteger(damage);
-            event->AddEntity(inflictor);
-            event->AddInteger(meansofdeath);
-            event->AddInteger(0);
+            const EntityPtr attackerPtr = attacker;
 
-            attacker->ProcessEvent(event);
+            event = Event(EV_GotKill, 5);
+            event.AddEntity(this);
+            event.AddInteger(damage);
+            event.AddEntity(inflictor);
+            event.AddInteger(meansofdeath);
+            event.AddInteger(0);
+
+            attackerPtr->ProcessEvent(event);
+            if (attackerPtr) {
+                attackerPtr->delegate_gotKill.Execute(event);
+            }
         }
 
-        event = new Event(EV_Killed);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(damageflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
+        if (!This) {
+            return;
+        }
+
+        event = Event(EV_Killed, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(damageflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
 
         ProcessEvent(event);
+        if (!This) {
+            return;
+        }
+
+        // Notify scripts
+        Unregister(STRING_DAMAGE);
+        if (!This) {
+            return;
+        }
+
+        delegate_killed.Execute(event);
         return;
     }
 
-    event = new Event(EV_Pain);
-    event->AddEntity(attacker);
-    event->AddFloat(damage);
-    event->AddEntity(inflictor);
-    event->AddVector(position);
-    event->AddVector(direction);
-    event->AddVector(normal);
-    event->AddInteger(knockback);
-    event->AddInteger(damageflags);
-    event->AddInteger(meansofdeath);
-    event->AddInteger(location);
+    event = Event(EV_Pain, 10);
+    event.AddEntity(attacker);
+    event.AddFloat(damage);
+    event.AddEntity(inflictor);
+    event.AddVector(position);
+    event.AddVector(direction);
+    event.AddVector(normal);
+    event.AddInteger(knockback);
+    event.AddInteger(damageflags);
+    event.AddInteger(meansofdeath);
+    event.AddInteger(location);
 
     ProcessEvent(event);
+    if (!This) {
+        return;
+    }
+
+    // Notify scripts
+    Unregister(STRING_DAMAGE);
+    if (!This) {
+        return;
+    }
+
+    delegate_damage.Execute(event);
 }
 
 qboolean Entity::IsTouching(Entity *e1)
-
 {
     if (e1->absmin.x > absmax.x) {
         return false;
@@ -2848,58 +2862,73 @@ qboolean Entity::IsInside(Entity *e1)
 
 qboolean Entity::FovCheck(float *delta, float fovdot)
 {
-    float deltadot = delta[0] * orientation[0][0] + delta[1] * orientation[0][1];
+    float deltadot = DotProduct2D(delta, orientation[0]);
 
     if (fovdot < 0.0f) {
         if (deltadot >= 0.0f) {
             return true;
         }
 
-        return (delta[0] * delta[0] + delta[1] * delta[1]) * fovdot * fovdot > (deltadot * deltadot);
+        return VectorLength2DSquared(delta) * Square(fovdot) > Square(deltadot);
     } else {
         if (deltadot < 0.0f) {
             return false;
         }
 
-        return (deltadot * deltadot) > (delta[0] * delta[0] + delta[1] * delta[1]) * fovdot * fovdot;
+        return VectorLength2DSquared(delta) * Square(fovdot) < Square(deltadot);
     }
 }
 
 bool Entity::CanSee(Entity *ent, float fov, float vision_distance, bool bNoEnts)
 {
-    float delta[2];
+    vec2_t delta;
+    int mask;
 
-    delta[0] = ent->centroid[0] - centroid[0];
-    delta[1] = ent->centroid[1] - centroid[1];
+    VectorSub2D(ent->centroid, centroid, delta);
 
-    if ((vision_distance <= 0.0f)
-        || (delta[0] * delta[0] + delta[1] * delta[1]) <= (vision_distance * vision_distance)) {
-        if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)
-            && ((fov <= 0.0f || fov >= 360.0f) || (FovCheck(delta, cos(fov * (0.5 * M_PI / 180.0)))))) {
-            return G_SightTrace(
-                centroid, vec_zero, vec_zero, ent->centroid, this, ent, MASK_CANSEE, 0, "Entity::CanSee"
-            );
-        }
+    if (vision_distance > 0 && Square(vision_distance) < VectorLength2DSquared(delta)) {
+        return false;
     }
 
-    return false;
+    if (!AreasConnected(ent)) {
+        return false;
+    }
+
+    if (fov > 0 && fov < 360 && !FovCheck(delta, cos(DEG2RAD(fov / 2.f)))) {
+        return false;
+    }
+
+    if (bNoEnts) {
+        mask = MASK_CANSEE_NOENTS;
+    } else {
+        mask = MASK_CANSEE;
+    }
+
+    return G_SightTrace(centroid, vec_zero, vec_zero, ent->centroid, this, ent, mask, qfalse, "Sentient::CanSee");
 }
 
 bool Entity::CanSee(const Vector& org, float fov, float vision_distance, bool bNoEnts)
 {
-    float delta[2];
+    vec2_t delta;
+    int mask;
 
-    delta[0] = org[0] - centroid[0];
-    delta[1] = org[1] - centroid[1];
+    VectorSub2D(org, centroid, delta);
 
-    if ((vision_distance <= 0.0f)
-        || (delta[0] * delta[0] + delta[1] * delta[1]) <= (vision_distance * vision_distance)) {
-        if ((fov <= 0.0f || fov >= 360.0f) || (FovCheck(delta, cos(fov * (0.5 * M_PI / 180.0))))) {
-            return G_SightTrace(centroid, vec_zero, vec_zero, org, this, NULL, MASK_CANSEE, 0, "Entity::CanSee");
-        }
+    if (vision_distance > 0 && Square(vision_distance) < VectorLength2DSquared(delta)) {
+        return false;
     }
 
-    return false;
+    if (fov > 0 && fov < 360 && !FovCheck(delta, cos(DEG2RAD(fov / 2.f)))) {
+        return false;
+    }
+
+    if (bNoEnts) {
+        mask = MASK_CANSEE_NOENTS;
+    } else {
+        mask = MASK_CANSEE;
+    }
+
+    return G_SightTrace(centroid, vec_zero, vec_zero, org, this, NULL, mask, qfalse, "Sentient::CanSee");
 }
 
 void Entity::FadeNoRemove(Event *ev)
@@ -2983,7 +3012,6 @@ void Entity::FadeIn(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }
@@ -3019,7 +3047,6 @@ void Entity::Fade(Event *ev)
 
     if (ev->NumArgs() > 0) {
         rate = ev->GetFloat(1);
-        assert(rate);
         if (rate > 0) {
             rate = FRAMETIME / rate;
         }
@@ -3076,7 +3103,7 @@ void Entity::Sink(Event *ev)
         }
 
         if (target < myalpha) {
-            Event *event = new Event(ev);
+            Event *event = new Event(std::move(*ev));
             PostEvent(event, FRAMETIME);
         }
 
@@ -3184,6 +3211,15 @@ void Entity::LoopSound(Event *ev)
         return;
     }
 
+    if (level.spawning) {
+        // If the server is currently spawning
+        // repost the event as loopsound wouldn't work properly
+        // on the client
+        Event* newev = new Event(*ev);
+        PostEvent(newev, level.frametime);
+        return;
+    }
+
     // Get parameters
 
     sound_name = ev->GetString(1);
@@ -3234,10 +3270,10 @@ void Entity::LoopSound(str sound_name, float volume, float min_dist, float max_d
             // Add the looping sound to the entity
 
             edict->s.loopSound        = gi.soundindex(name, aliasstreamed);
-            edict->s.loopSoundVolume  = aliasvolume;
-            edict->s.loopSoundMinDist = aliasmin_dist;
-            edict->s.loopSoundMaxDist = aliasmax_dist;
-            edict->s.loopSoundPitch   = aliaspitch;
+            edict->s.loopSoundVolume  = volume < 0 ? (aliasvolume) : (aliasvolume * volume);
+            edict->s.loopSoundMinDist = min_dist < 0 ? (aliasmin_dist) : (min_dist);
+            edict->s.loopSoundMaxDist = max_dist < 0 ? (aliasmax_dist) : (max_dist);
+            edict->s.loopSoundPitch   = pitch < 0 ? (aliaspitch) : (aliaspitch * pitch);
 
             // Local sound will always be heard
             edict->s.loopSoundFlags = aliaschannel == CHAN_LOCAL;
@@ -3264,7 +3300,7 @@ void Entity::ProcessSoundEvent(Event *ev, qboolean checkSubtitle)
 {
     str   sound_name;
     str   wait;
-    int   waitTillDone = 0;
+    bool  waitTillDone = false;
     float volume;
     int   channel = 0;
 
@@ -3284,30 +3320,24 @@ void Entity::ProcessSoundEvent(Event *ev, qboolean checkSubtitle)
         wait = ev->GetString(2);
     }
 
-    if (Q_stricmp(wait.c_str(), "wait")) {
-        if (!Q_stricmp(wait.c_str(), "volume")) {
-            if (ev->NumArgs() != 3) {
-                ScriptError("Entity::Sound: volume not followed by a float");
-            }
-
-            volume = ev->GetFloat(3);
-        }
-    } else {
-        waitTillDone = 1;
+    if (!Q_stricmp(wait.c_str(), "wait")) {
+        waitTillDone = true;
 
         if (ev->NumArgs() == 3) {
             volume = ev->GetFloat(3);
         }
+    } else if (!Q_stricmp(wait.c_str(), "volume")) {
+        if (ev->NumArgs() != 3) {
+            ScriptError("Entity::Sound: volume not followed by a float");
+        }
+
+        volume = ev->GetFloat(3);
     }
 
     if (volume == DEFAULT_VOL) {
-        if (wait.length()) {
-            channel = atoi(wait.c_str());
-        }
-
-        Sound(sound_name, channel, volume, 0, NULL, 0, 0, waitTillDone, checkSubtitle, -1.0f);
+        Sound(sound_name, CHAN_AUTO, volume, 0, NULL, 0, 0, waitTillDone, checkSubtitle, -1.0f);
     } else {
-        Sound(sound_name, -1.0f, volume, -1.0f, NULL, -1.0f, 1, waitTillDone, checkSubtitle, -1.0f);
+        Sound(sound_name, -1, volume, -1.0f, NULL, -1.0f, 1, waitTillDone, checkSubtitle, -1.0f);
     }
 }
 
@@ -3317,7 +3347,7 @@ void Entity::Sound(Event *ev)
         Event *event = new Event(EV_Sound);
 
         for (int i = 1; i <= ev->NumArgs(); i++) {
-            event->AddValue(ev->GetValue(1));
+            event->AddValue(ev->GetValue(i));
         }
 
         PostEvent(event, level.frametime);
@@ -3569,13 +3599,18 @@ void Entity::Sound(
     static cvar_t   *g_subtitle = NULL;
     static bool      _tmp       = false;
     int              num;
+    int              aliaschannel;
+    float            aliasvolume;
+    float            aliasmin_dist;
+    float            aliasmax_dist;
+    float            aliaspitch;
 
     if (!_tmp) {
         g_subtitle = gi.Cvar_Get("g_subtitle", "0", CVAR_ARCHIVE);
         _tmp       = true;
     }
 
-    if (doCallback && g_gametype->integer) {
+    if (doCallback && g_gametype->integer != GT_SINGLE_PLAYER) {
         Com_Printf("^~^~^ Callback of sound '%s' ignored.\n", sound_name.c_str());
         doCallback = 0;
     }
@@ -3590,79 +3625,104 @@ void Entity::Sound(
         }
 
         if (!name) {
-            name = sound_name.c_str();
+            name = gi.GlobalAlias_FindRandom(sound_name.c_str(), &ret);
         }
 
         // Play the sound
 
-        if (name != NULL) {
-            if (ret) {
-                if (channel < 0) {
-                    channel = ret->channel;
-                }
+        if (name && ret) {
+            aliaschannel = ret->channel;
+            aliasvolume = G_Random() * ret->volumeMod + ret->volume;
+            aliaspitch = G_Random() * ret->pitchMod + ret->pitch;
+            aliasmin_dist = ret->dist;
+            aliasmax_dist = ret->maxDist;
 
-                num = entnum;
-                if (sound_origin) {
-                    VectorCopy(*sound_origin, org);
-                    num = ENTITYNUM_NONE;
-                } else {
-                    VectorCopy(edict->s.origin, org);
-
-                    if (doCallback) {
-                        num |= S_FLAG_DO_CALLBACK;
-                    }
-                }
-
-                if (argstype == 0) {
-                    volume   = G_Random() * ret->volumeMod + ret->volume;
-                    pitch    = G_Random() * ret->pitchMod + ret->pitch;
-                    min_dist = ret->dist;
-                    max_dist = ret->maxDist;
-                } else if (argstype == 1) {
-                    if (volume >= 0.0f) {
-                        volume = G_Random() * ret->volumeMod + volume;
-                    } else {
-                        pitch = G_Random() * ret->pitchMod + ret->pitch;
-                    }
-
-                    if (pitch >= 0.0f) {
-                        pitch = G_Random() * ret->pitchMod + pitch;
-                    } else {
-                        pitch = G_Random() * ret->pitchMod + ret->pitch;
-                    }
-                } else {
-                    if (volume <= 0.0f) {
-                        volume = G_Random() * ret->volumeMod + ret->volume;
-                    }
-
-                    if (pitch >= 0.0f) {
-                        pitch = G_Random() * ret->pitchMod + pitch;
-                    } else {
-                        pitch = G_Random() * ret->pitchMod + ret->pitch;
-                    }
-
-                    if (min_dist < 0.0f) {
-                        min_dist = ret->dist;
-                    }
-
-                    if (max_dist < 0.0f) {
-                        max_dist = ret->maxDist;
-                    }
-                }
-
-                if ((!checkSubtitle || g_subtitle->integer) && ret->subtitle) {
-                    Entity *p = G_GetEntity(0);
-
-                    if (g_subtitle->integer == 2 || max_dist * max_dist > DistanceSquared(org, p->edict->s.origin)) {
-                        cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
-
-                        gi.cvar_set(va("subtitle%d", curSubtitle->integer), va("%s", ret->subtitle));
-                        gi.cvar_set("curSubtitle", va("%d", curSubtitle->integer + 1));
-                    }
-                }
-
-                gi.Sound(&org, num, channel, name, volume, min_dist, pitch, max_dist, ret->streamed);
+            if (channel < 0) {
+                channel = ret->channel;
             }
+
+            num = entnum;
+            if (sound_origin) {
+                VectorCopy(*sound_origin, org);
+                num = ENTITYNUM_NONE;
+            } else {
+                VectorCopy(edict->s.origin, org);
+
+                if (doCallback) {
+                    num |= S_FLAG_DO_CALLBACK;
+                }
+            }
+
+            switch (argstype) {
+            case 0:
+                volume = aliasvolume;
+                pitch = aliaspitch;
+                min_dist = aliasmin_dist;
+                max_dist = aliasmax_dist;
+                channel = aliaschannel;
+                break;
+            case 1:
+                if (volume >= 0.0f) {
+                    volume = volume * aliasvolume;
+                } else {
+                    volume = aliasvolume;
+                }
+
+                if (pitch >= 0.0f) {
+                    pitch = pitch * aliaspitch;
+                } else {
+                    pitch = aliaspitch;
+                }
+
+                if (min_dist < 0.0f) {
+                    min_dist = aliasmin_dist;
+                }
+
+                if (max_dist < 0.0f) {
+                    max_dist = aliasmax_dist;
+                }
+
+                if (channel < 0) {
+                    channel = aliaschannel;
+                }
+                break;
+            default:
+                if (volume < 0.0) {
+                    volume = aliasvolume;
+                }
+                if (pitch < 0.0) {
+                    pitch = aliaspitch;
+                }
+                if (min_dist < 0.0) {
+                    min_dist = aliasmin_dist;
+                }
+                if (max_dist < 0.0) {
+                    max_dist = aliasmax_dist;
+                }
+                if (channel < 0) {
+                    channel = aliaschannel;
+                }
+                break;
+            }
+
+            if (g_gametype->integer == GT_SINGLE_PLAYER && (ret->forcesubtitle || !checkSubtitle || g_subtitle->integer) && ret->subtitle) {
+                Entity *p = G_GetEntity(0);
+
+                if (p && (g_subtitle->integer == 2 || Square(max_dist) > DistanceSquared(org, p->edict->s.origin))) {
+                    cvar_t *curSubtitle = gi.Cvar_Get("curSubtitle", "0", 0);
+                    int curSub;
+
+                    gi.cvar_set(va("subtitle%d", curSubtitle->integer), va("%s", ret->subtitle));
+                    curSub = curSubtitle->integer + 1;
+                    if (curSubtitle->integer + 1 < 0) {
+                        curSub = curSubtitle->integer + MAX_SUBTITLES;
+                    }
+                    
+                    gi.cvar_set("curSubtitle", va("%d", (curSubtitle->integer + 1) - MAX_SUBTITLES * (curSub >> 2)));
+                }
+            }
+
+            gi.Sound(&org, num, channel, name, volume, min_dist, pitch, max_dist, ret->streamed);
         } else {
             gi.DPrintf(
                 "ERROR: Entity::Sound: %s needs an alias in ubersound.scr or uberdialog.scr - Please fix.\n",
@@ -4059,7 +4119,11 @@ void Entity::SVFlags(Event *ev)
 
 void Entity::BroadcastAIEvent(int iType, float rad)
 {
-    G_BroadcastAIEvent(this, origin, iType, rad);
+    if (flags & FL_NOTARGET) {
+        return;
+    }
+
+    G_BroadcastAIEvent(this, centroid, iType, rad);
 }
 
 void Entity::BroadcastAIEvent(Event *ev)
@@ -4187,7 +4251,7 @@ void Entity::SurfaceCommand(const char *surf_name, const char *token)
 
     int numsurfaces;
     if (edict->tiki) {
-        numsurfaces = gi.NumSurfaces(edict->tiki);
+        numsurfaces = gi.TIKI_NumSurfaces(edict->tiki);
     } else {
         numsurfaces = 0;
     }
@@ -4220,9 +4284,9 @@ void Entity::SurfaceCommand(const char *surf_name, const char *token)
 
 void Entity::SurfaceModelEvent(Event *ev)
 {
-    const char *surf_name;
-    const char *token;
-    int         i;
+    str surf_name;
+    str token;
+    int i;
 
     surf_name = ev->GetString(1);
 
@@ -4235,7 +4299,7 @@ void Entity::SurfaceModelEvent(Event *ev)
 void Entity::AttachEvent(Event *ev)
 {
     Entity     *parent;
-    const char *bone;
+    str         bone;
     int         tagnum;
     qboolean    use_angles = qtrue;
     Vector      offset;
@@ -4259,14 +4323,14 @@ void Entity::AttachEvent(Event *ev)
     if (tagnum >= 0) {
         attach(parent->entnum, tagnum, use_angles, offset);
     } else {
-        warning("AttachEvent", "Tag %s not found", bone);
+        warning("AttachEvent", "Tag %s not found", bone.c_str());
     }
 }
 
 void Entity::AttachModelEvent(Event *ev)
 {
     Animate    *obj;
-    const char *bone;
+    str         bone;
     str         modelname;
     int         tagnum;
     float       remove_time, fade_time, fade_delay;
@@ -4343,24 +4407,30 @@ void Entity::AttachModelEvent(Event *ev)
         if (obj->attach(this->entnum, tagnum, true, offset)) {
             obj->NewAnim("idle");
         } else {
-            delete obj;
+            warning("AttachModelEvent", "Could not attach model %s to tag \"%s\" on entnum #%d (targetname = %s)", modelname.c_str(), bone.c_str(), entnum, targetname.c_str());
+            if (g_iInThinks) {
+                PostEvent(EV_Remove, 0);
+            } else {
+                delete obj;
+            }
             return;
         }
     } else {
-        warning("AttachModelEvent", "Tag %s not found", bone);
+        warning("AttachModelEvent", "Tag %s not found", bone.c_str());
+        obj->NewAnim("idle");
     }
 }
 
 void Entity::RemoveAttachedModelEvent(Event *ev)
 {
-    const char *tag_name;
-    int         tag_num;
-    int         num;
-    int         i;
-    Entity     *ent;
-    float       fade_rate = 0;
-    Event      *fade_event;
-    str         model_name;
+    str     tag_name;
+    int     tag_num;
+    int     num;
+    int     i;
+    Entity *ent;
+    float   fade_rate = 0;
+    Event  *fade_event;
+    str     model_name;
 
     tag_name = ev->GetString(1);
     tag_num  = gi.Tag_NumForName(edict->tiki, tag_name);
@@ -4530,7 +4600,7 @@ void Entity::Censor(Event *ev)
     oldsize = size.length();
     setSolidType(SOLID_NOT);
     setModel("censored.tik");
-    gi.CalculateBounds(edict->tiki, 1, mins, maxs);
+    gi.TIKI_CalculateBounds(edict->tiki, 1, mins, maxs);
     delta          = maxs - mins;
     newsize        = delta.length();
     edict->s.scale = oldsize / newsize;
@@ -4577,7 +4647,7 @@ void Entity::Explosion(Event *ev)
 void Entity::Shader(Event *ev)
 
 {
-    const char *token;
+    str token;
 
     if (gi.modeltiki(model)) {
         gi.Printf("shader event being called on TIKI model\n");
@@ -4661,7 +4731,7 @@ qboolean Entity::isBoundTo(Entity *master)
     return false;
 }
 
-void Entity::bind(Entity *master, qboolean use_my_angles, qboolean bBindChilds)
+void Entity::bind(Entity *master, qboolean use_my_angles)
 {
     float  mat[3][3];
     float  local[3][3];
@@ -4678,8 +4748,6 @@ void Entity::bind(Entity *master, qboolean use_my_angles, qboolean bBindChilds)
         return;
     }
 
-    m_bBindChilds = bBindChilds;
-
     // unbind myself from my master
     unbind();
 
@@ -4842,17 +4910,10 @@ void Entity::EventUnbind(Event *ev)
 void Entity::BindEvent(Event *ev)
 {
     Entity *ent;
-    bool    bBindChilds;
 
     ent = ev->GetEntity(1);
     if (ent) {
-        if (ev->NumArgs() > 1) {
-            bBindChilds = ev->GetBoolean(2);
-        } else {
-            bBindChilds = false;
-        }
-
-        bind(ent, false, bBindChilds);
+        bind(ent, false);
     }
 }
 
@@ -5029,7 +5090,7 @@ void Entity::TouchTriggersEvent(Event *ev)
 
 void Entity::DeathSinkStart(Event *ev)
 {
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         PostEvent(EV_Remove, 5.0f);
     } else {
         // Start the sinking
@@ -5041,7 +5102,7 @@ void Entity::DeathSink(Event *ev)
 {
     // Sink just a little
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         origin[2] -= 0.2f;
         setOrigin(origin);
 
@@ -5092,7 +5153,7 @@ qboolean Entity::CheckEventFlags(Event *event)
 
             ent = (Entity *)this;
             gi.SendServerCommand(
-                ent->edict - g_entities, "print \"Command '%s' not available from console\n\"", event->getName().c_str()
+                ent->edict - g_entities, "print \"Command '%s' not available from console\n\"", event->getName()
             );
         }
 
@@ -5240,9 +5301,6 @@ void Entity::glue(Entity *master, qboolean use_my_angles, qboolean can_duck)
     m_pGlueMaster   = master;
     m_bGlueDuckable = can_duck == qtrue;
     master->m_iNumGlues++;
-
-    setAngles(master->angles);
-    setOrigin(master->origin);
 }
 
 void Entity::unglue(void)
@@ -5289,7 +5347,7 @@ void Entity::GetTagPositionAndOrientation(int tagnum, orientation_t *new_or)
     VectorCopy(origin, new_or->origin);
 
     for (i = 0; i < 3; i++) {
-        VectorMA(new_or->origin, tag_or.origin[i], tag_or.axis[i], new_or->origin);
+        VectorMA(new_or->origin, tag_or.origin[i], axis[i], new_or->origin);
     }
 
     MatrixMultiply(tag_or.axis, axis, new_or->axis);
@@ -5433,7 +5491,7 @@ void Entity::MPrintf(const char *fmt, ...)
     va_list argptr;
     char    msg[MAXPRINTMSG];
 
-    if (g_monitorNum->integer == entnum && g_monitor->string == targetname) {
+    if (g_monitorNum->integer == entnum || g_monitor->string[0] && g_monitor->string == targetname) {
         va_start(argptr, fmt);
         Q_vsnprintf(msg, sizeof(msg), fmt, argptr);
         va_end(argptr);
@@ -5551,13 +5609,13 @@ void Entity::ShowInfo(float fDot, float fDist)
     int  i;
     char szText[512];
     if (fDot > 0.94999999 && fDist < 1024.0 && fDist > 64.0) {
-        i = sprintf(szText, "%i:%i", entnum, radnum);
+        i = Com_sprintf(szText, sizeof(szText), "%i:%i", entnum, radnum);
         if (targetname.length()) {
-            i = sprintf(&szText[i], ":%s", targetname.c_str());
+            i = Com_sprintf(szText + i, sizeof(szText) - i, ":%s", targetname.c_str());
         }
 
         if (health != 0) {
-            sprintf(&szText[i], ":%.1f", health);
+            Com_sprintf(szText + i, sizeof(szText) - i, ":%.1f", health);
         }
 
         G_DebugString(Vector(origin.x + 0, origin.y + 0, origin.z + maxs.z + 65), 1.0, 1.0, 1.0, 1.0, szText);
@@ -5596,7 +5654,7 @@ void Entity::ConnectPaths(void)
 
     m_iNumBlockedPaths = 0;
     if (m_BlockedPaths) {
-        delete m_BlockedPaths;
+        delete[] m_BlockedPaths;
         m_BlockedPaths = NULL;
     }
 }
@@ -5675,6 +5733,14 @@ void Entity::Delete(void)
     // Delete the entity the next frame
 
     if (g_iInThinks) {
+        if (ProcessingEvents) {
+            // Fixed in OPM
+            //  Add a slight delay because otherwise this would cause an infinite loop
+            //  when processing pending events
+            PostEvent(EV_Remove, 0.001);
+            return;
+        }
+
         PostEvent(EV_Remove, 0);
     } else {
         delete this;
@@ -5740,8 +5806,13 @@ void Entity::Archive(Archiver& arc)
     arc.ArchiveInteger(&spawnflags);
 
     arc.ArchiveString(&model);
-    if (arc.Loading() && model.length()) {
-        setModel(model);
+    if (arc.Loading() && AutoArchiveModel()) {
+        if (model.length() && model[0] == '*') {
+            // set the brush model
+            edict->s.modelindex = atoi(model.c_str() + 1);
+        } else {
+            setModel();
+        }
     }
 
     arc.ArchiveVector(&mins);
@@ -5806,6 +5877,11 @@ void Entity::Archive(Archiver& arc)
 
     ArchiveEnum(takedamage, damage_t);
 
+    arc.ArchiveSafePointer(&enemy);
+    arc.ArchiveFloat(&pain_finished);
+    arc.ArchiveFloat(&damage_debounce_time);
+    arc.ArchiveInteger(&damage_type);
+
     arc.ArchiveInteger(&m_iNumGlues);
 
     for (i = 0; i < MAX_GLUE_CHILDREN; i++) {
@@ -5815,6 +5891,7 @@ void Entity::Archive(Archiver& arc)
 
     arc.ArchiveObjectPointer((Class **)&m_pGlueMaster);
     arc.ArchiveBool(&m_bGlueAngles);
+    arc.ArchiveBool(&m_bGlueDuckable);
     arc.ArchiveBoolean(&detach_at_death);
 
     arc.ArchiveFloat(&stealthMovementScale);
@@ -5888,7 +5965,7 @@ void Entity::DrawBoundingBox(int showbboxes)
     switch (showbboxes) {
     case 1:
         if (edict->s.solid) {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
         }
         break;
     case 2:
@@ -5898,29 +5975,165 @@ void Entity::DrawBoundingBox(int showbboxes)
         break;
     case 3:
         if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
         }
         break;
     case 4:
-        G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+        G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
         break;
-    case 5:
-    default:
-        if (IsSubclassOfAnimate() && edict->tiki) {
-            Animate *anim;
-            vec3_t   mins, maxs;
+    case 7:
+        if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
+            Vector vMins, vMaxs;
 
-            anim = (Animate *)this;
-            // FIXME
-            G_DebugBBox(origin, mins, maxs, 0, 1, 0, 1);
-        } else {
-            G_DebugBBox(origin, mins, maxs, 1, 1, 0, 1);
+            gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, vMins, vMaxs);
+            if (!VectorCompare(vMins, vec_zero) || !VectorCompare(vMaxs, vec_zero)) {
+                if (edict->s.parent != ENTITYNUM_NONE && edict->s.tag_num >= 0) {
+                    int i;
+                    Vector vAng;
+                    orientation_t oTag, oBox;
+                    Entity* pParent;
+
+                    pParent = G_GetEntity(edict->s.parent);
+                    AnglesToAxis(pParent->angles, pParent->orientation);
+                    oTag = G_TIKI_Orientation(pParent->edict, edict->s.tag_num & TAG_MASK);
+
+                    VectorCopy(pParent->origin, oBox.origin);
+                    for (i = 0; i < 3; i++) {
+                        VectorMA(oBox.origin, oTag.origin[i], pParent->orientation[i], oBox.origin);
+                    }
+
+                    MatrixMultiply(oTag.axis, pParent->orientation, oBox.axis);
+                    MatrixToEulerAngles(oBox.axis, vAng);
+                    G_DebugRotatedBBox(oBox.origin, vAng, vMins, vMaxs, 0, 1, 1, 1);
+                } else {
+                    G_DebugRotatedBBox(origin, angles, vMins, vMaxs, 0, 1, 1, 1);
+                }
+            }
         }
         break;
+    case 8:
+        if (edict->tiki && !(edict->s.renderfx & RF_DONTDRAW)) {
+            G_DebugRotatedBBox(origin, angles, mins, maxs, 1, 1, 0, 1);
+            G_DebugBBox(origin, Vector(-4, -4, -4), Vector(4, 4, 4), 0, 1, 1, 1);
+        }
+        break;
+    default:
+        break;
+    }
+
+    if ((showbboxes >= 9 && showbboxes <= 28) || (showbboxes >= -28 && showbboxes <= -9)) {
+        qboolean bDoPlayer = qfalse;
+        
+        if (showbboxes >= 0) {
+            bDoPlayer = qfalse;
+        } else {
+            showbboxes = -showbboxes;
+            bDoPlayer = qtrue;
+        }
+
+        if (edict->s.solid == SOLID_NOT) {
+            return;
+        }
+
+        if ((edict != g_entities && !bDoPlayer) || (edict == g_entities && bDoPlayer)) {
+            int i, j;
+            int iTagNum;
+            int iCap;
+            float fRadius;
+            const char *pszTagName;
+            vec3_t vOffset;
+            vec3_t vPos;
+            vec3_t vColor;
+            orientation_t orTag;
+            orientation_t orPosition;
+
+            if (!IsSubclassOfSentient() || !edict->tiki) {
+                G_DebugBBox(origin, mins, maxs, 1.0, 1.0, 0.0, 1.0);
+                return;
+            }
+
+            AnglesToAxis(angles, orientation);
+
+            if (showbboxes <= 9 && showbboxes >= -9) {
+                i = 0;
+                iCap = 19;
+            } else {
+                i = showbboxes - 10;
+                if (i >= 18) {
+                    return;
+                }
+
+                iCap = i + 1;
+            }
+
+            for (; i < iCap; i++) {
+                pszTagName = gi.CM_GetHitLocationInfo(i, &fRadius, vOffset);
+
+                if (sv_testloc_num->integer - 1 == i || (sv_testloc_num->integer && (showbboxes > 9 || showbboxes < -9))) {
+                    fRadius = sv_testloc_radius->value;
+                    vOffset[0] = sv_testloc_offset_x->value;
+                    vOffset[1] = sv_testloc_offset_y->value;
+                    vOffset[2] = sv_testloc_offset_z->value;
+                    vColor[0] = 1.0;
+                    vColor[1] = 0.5;
+                    vColor[2] = 0.0;
+                } else {
+                    vColor[0] = 0.0;
+                    vColor[1] = 0.5;
+                    vColor[2] = 1.0;
+                }
+
+                iTagNum = gi.Tag_NumForName(edict->tiki, pszTagName);
+                if (iTagNum < 0) {
+                    return;
+                }
+
+                orTag = G_TIKI_Orientation(edict, iTagNum & TAG_MASK);
+                VectorCopy(origin, orPosition.origin);
+
+                for (j = 0; j < 3; j++) {
+                    VectorMA(orPosition.origin, orTag.origin[j], orientation[j], orPosition.origin);
+                }
+
+                MatrixMultiply(orTag.axis, orientation, orPosition.axis);
+                MatrixTransformVector(vOffset, orPosition.axis, vPos);
+                VectorAdd(orPosition.origin, vPos, vPos);
+
+                G_DebugCircle(vPos, fRadius, vColor[0], vColor[1], vColor[2], 1.0);
+
+                pszTagName = gi.CM_GetHitLocationInfoSecondary(i, &fRadius, vOffset);
+                vColor[0] = 0.5;
+                vColor[1] = 0.0;
+                vColor[2] = 1.0;
+
+                if (!pszTagName || sv_testloc_num->integer - 1 == i || (sv_testloc_num->integer && (showbboxes > 9 || showbboxes < -9))) {
+                    if (!sv_testloc_secondary->integer) {
+                        continue;
+                    }
+
+                    if (sv_testloc_num->integer - 1 != i && (!sv_testloc_num->integer || (showbboxes <= 9 && showbboxes >= -9))) {
+                        continue;
+                    }
+
+                    fRadius = sv_testloc_radius2->value;
+                    vOffset[0] = sv_testloc_offset2_x->value;
+                    vOffset[1] = sv_testloc_offset2_y->value;
+                    vOffset[2] = sv_testloc_offset2_z->value;
+                    vColor[0] = 1.0;
+                    vColor[1] = 0.0;
+                    vColor[2] = 0.5;
+                }
+
+                MatrixTransformVector(vOffset, orPosition.axis, vPos);
+                VectorAdd(orPosition.origin, vPos, vPos);
+
+                G_DebugCircle(vPos, fRadius, vColor[0], vColor[1], vColor[2], 1.0);
+            }
+        }
     }
 }
 
-qboolean Entity::IsDead(void)
+qboolean Entity::IsDead(void) const
 {
     return deadflag != DEAD_NO;
 }
@@ -6039,7 +6252,7 @@ void Entity::EventGetRotatedBbox(Event *ev)
 void Entity::EventSinglePlayerCommand(Event *ev)
 {
     if (g_gametype->integer == GT_SINGLE_PLAYER && !g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6052,7 +6265,7 @@ void Entity::EventSinglePlayerCommand(Event *ev)
 void Entity::EventMultiPlayerCommand(Event *ev)
 {
     if (g_gametype->integer != GT_SINGLE_PLAYER && !g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6065,7 +6278,7 @@ void Entity::EventMultiPlayerCommand(Event *ev)
 void Entity::EventRealismModeCommand(Event *ev)
 {
     if (g_realismmode->integer) {
-        Event *newev = new Event(ev->GetToken(1));
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6077,8 +6290,8 @@ void Entity::EventRealismModeCommand(Event *ev)
 
 void Entity::EventSPRealismModeCommand(Event *ev)
 {
-    if (g_realismmode->integer && g_gametype->integer == GT_SINGLE_PLAYER) {
-        Event *newev = new Event(ev->GetToken(1));
+    if (g_gametype->integer == GT_SINGLE_PLAYER && g_realismmode->integer) {
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6090,8 +6303,8 @@ void Entity::EventSPRealismModeCommand(Event *ev)
 
 void Entity::EventDMRealismModeCommand(Event *ev)
 {
-    if (g_realismmode->integer && g_gametype->integer != GT_SINGLE_PLAYER) {
-        Event *newev = new Event(ev->GetToken(1));
+    if (g_gametype->integer != GT_SINGLE_PLAYER && g_realismmode->integer) {
+        Event *newev = new Event(ev->GetToken(1), ev->NumArgs() - 1);
 
         for (int i = 2; i <= ev->NumArgs(); i++) {
             newev->AddToken(ev->GetToken(i));
@@ -6154,7 +6367,9 @@ void Entity::NoTarget(Event *ev)
 
 void Entity::GetZone(Event *ev)
 {
-    // FIXME: stub
+    ev->AddInteger(edict->r.areanum);
+
+    // FIXME: Implement OPM feature
     STUB();
 
 #if 0
@@ -6170,7 +6385,13 @@ void Entity::GetZone(Event *ev)
 
 void Entity::IsInZone(Event *ev)
 {
-    // FIXME: stub
+    if (edict->r.areanum == ev->GetInteger(1)) {
+        ev->AddInteger(1);
+    } else {
+        ev->AddInteger(0);
+    }
+
+    // FIXME: Implement OPM feature
     STUB();
 
 #if 0
@@ -6207,6 +6428,7 @@ void Entity::SetDepthHack(Event *ev)
     }
 }
 
+#ifdef OPM_FEATURES
 void Entity::ProcessHint(gentity_t *client, bool bShow)
 {
     Player *player = (Player *)client->entity;
@@ -6245,15 +6467,48 @@ void Entity::SetHintString(Event *ev)
     m_HintString = ev->GetString(1);
 }
 
-void Entity::SetShader(Event *ev)
+void Entity::SetShader(Event* ev)
 {
     str      shadername = ev->GetString(1);
-    qboolean fReset     = false;
+    qboolean fReset = false;
 
     if (!shadername.length()) {
         shadername = "default";
-        fReset     = true;
+        fReset = true;
     }
 
     gi.SendServerCommand(-1, "setshader %d %s %d", entnum, shadername.c_str(), fReset);
 }
+#endif
+
+void Entity::PlayNonPvsSound(const str& soundName, float volume)
+{
+    AliasListNode_t* ret;
+    str name;
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        // Ignore in single-player
+        return;
+    }
+
+    if (!sv_netoptimize->integer) {
+        // don't use sound indexes for nothing
+        return;
+    }
+
+    if (edict->r.num_nonpvs_sounds >= MAX_NONPVS_SOUNDS) {
+        return;
+    }
+
+    name = GetRandomAlias(soundName, &ret);
+    if (name.length() && ret) {
+        nonpvs_sound_t* npvs = &edict->r.nonpvs_sounds[edict->r.num_nonpvs_sounds];
+
+        npvs->index = gi.pvssoundindex(name.c_str(), ret->streamed);
+        npvs->volume = G_Random() * ret->volumeMod + ret->volume * volume;
+        npvs->minDist = ret->dist;
+        npvs->maxDist = ret->maxDist;
+        npvs->pitch = G_Random() * ret->pitchMod + ret->pitch;
+        edict->r.num_nonpvs_sounds++;
+    }
+}
diff --git a/code/fgame/entity.h b/code/fgame/entity.h
index d0b87e56..3291a791 100644
--- a/code/fgame/entity.h
+++ b/code/fgame/entity.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -43,8 +43,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // not be ignored at any cost).
 //
 
-#ifndef __ENTITY_H__
-#define __ENTITY_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -52,6 +51,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "script.h"
 #include "listener.h"
 #include "simpleentity.h"
+#include "../qcommon/delegate.h"
 
 // modification flags
 #define FLAG_IGNORE 0
@@ -69,6 +69,23 @@ typedef enum {
     torso,
 } bodypart_t;
 
+enum eAIEvent {
+    AI_EVENT_NONE,
+    AI_EVENT_WEAPON_FIRE,
+    AI_EVENT_WEAPON_IMPACT,
+    AI_EVENT_EXPLOSION,
+    AI_EVENT_AMERICAN_VOICE,
+    AI_EVENT_GERMAN_VOICE,
+    AI_EVENT_AMERICAN_URGENT,
+    AI_EVENT_GERMAN_URGENT,
+    AI_EVENT_MISC,
+    AI_EVENT_MISC_LOUD,
+    AI_EVENT_FOOTSTEP,
+    AI_EVENT_GRENADE,
+    AI_EVENT_BADPLACE, // Added in 2.0
+    AI_EVENT_MAX
+};
+
 //deadflag
 #define DEAD_NO          0
 #define DEAD_DYING       1
@@ -270,10 +287,21 @@ public:
     // immune list
     Container<int> immunities;
 
+#ifdef OPM_FEATURES
+    //
+    // Added in OPM
+    //====
     // miscellaneous
-    qboolean m_bBindChilds;
     bool     m_bHintRequiresLookAt;
     str      m_HintString;
+    //====
+#endif
+
+    MulticastDelegate<void (const Event& ev)> delegate_damage;
+    MulticastDelegate<void (const Event& ev)> delegate_killed;
+    MulticastDelegate<void (const Event& ev)> delegate_gotKill;
+
+public:
 
     Entity();
     virtual ~Entity();
@@ -286,10 +314,10 @@ public:
 
     virtual void ShowInfo(float fDot, float fDist);
 
-    qboolean DistanceTo(Vector pos);
-    qboolean DistanceTo(Entity *ent);
-    qboolean WithinDistance(Vector pos, float dist);
-    qboolean WithinDistance(Entity *ent, float dist);
+    qboolean DistanceTo(Vector pos) const;
+    qboolean DistanceTo(Entity *ent) const;
+    qboolean WithinDistance(Vector pos, float dist) const;
+    qboolean WithinDistance(Entity *ent, float dist) const;
 
     Vector   GetControllerAngles(int num);
     void     SetControllerAngles(int num, vec3_t angles);
@@ -481,10 +509,10 @@ public:
     void RenderEffects(Event *ev);
     void SVFlags(Event *ev);
 
-    void         BroadcastAIEvent(int iType = 8, float rad = SOUND_RADIUS);
+    void         BroadcastAIEvent(int iType = AI_EVENT_MISC, float rad = SOUND_RADIUS);
     void         BroadcastAIEvent(Event *ev);
     void         Kill(Event *ev);
-    void         Killed(Event *ev);
+    virtual void Killed(Event *ev);
     void         SurfaceModelEvent(Event *ev);
     void         SurfaceCommand(const char *surf_name, const char *token);
     virtual void Postthink(void);
@@ -523,7 +551,7 @@ public:
     void         joinTeam(Entity *teammember);
     void         quitTeam(void);
     qboolean     isBoundTo(Entity *master);
-    virtual void bind(Entity *master, qboolean use_my_angles = qfalse, qboolean bBindChilds = qfalse);
+    virtual void bind(Entity *master, qboolean use_my_angles = qfalse);
     virtual void unbind(void);
     virtual void glue(Entity *master, qboolean use_my_angles = qtrue, qboolean can_duck = qfalse);
     virtual void unglue(void);
@@ -572,7 +600,7 @@ public:
     void VolumeDamage(float damage);
     void EventVolumeDamage(Event *ev);
 
-    virtual qboolean IsDead();
+    virtual qboolean IsDead() const;
     virtual void     AddImmunity(Event *ev);
     virtual void     RemoveImmunity(Event *ev);
     qboolean         Immune(int meansofdeath);
@@ -593,8 +621,9 @@ public:
     void             EventSetHealthOnly(Event *ev);
     void             GetYaw(Event *ev);
 
-    virtual void PreAnimate(void) {};
-    virtual void PostAnimate(void) {};
+    virtual void PreAnimate(void);
+    virtual void PostAnimate(void);
+    virtual bool HasVehicle(void) const;
     void         EventGetEntnum(Event *ev);
     void         EventGetClassname(Event *ev);
     void         EventSetRadnum(Event *ev);
@@ -621,18 +650,30 @@ public:
     void GetZone(Event *ev);
     void IsInZone(Event *ev);
     void SetDepthHack(Event *ev);
+#ifdef OPM_FEATURES
     void SetHintRequireLookAt(Event *ev);
     void SetHintString(Event *ev);
-    void SetShader(Event *ev);
+    void SetShader(Event* ev);
+#endif
+    void PlayNonPvsSound(const str& soundName, float volume = 1);
 };
 
+inline void Entity::PreAnimate(void) {}
+
+inline void Entity::PostAnimate(void) {}
+
+inline bool Entity::HasVehicle(void) const
+{
+    return false;
+}
+
 inline int Entity::getSolidType(void)
 
 {
     return edict->solid;
 }
 
-inline qboolean Entity::DistanceTo(Vector pos)
+inline qboolean Entity::DistanceTo(Vector pos) const
 
 {
     Vector delta;
@@ -641,7 +682,7 @@ inline qboolean Entity::DistanceTo(Vector pos)
     return delta.length() != 0 ? qtrue : qfalse;
 }
 
-inline qboolean Entity::DistanceTo(Entity *ent)
+inline qboolean Entity::DistanceTo(Entity *ent) const
 {
     Vector delta;
 
@@ -656,7 +697,7 @@ inline qboolean Entity::DistanceTo(Entity *ent)
     return delta.length() != 0 ? qtrue : qfalse;
 }
 
-inline qboolean Entity::WithinDistance(Vector pos, float dist)
+inline qboolean Entity::WithinDistance(Vector pos, float dist) const
 {
     Vector delta;
 
@@ -666,7 +707,7 @@ inline qboolean Entity::WithinDistance(Vector pos, float dist)
     return ((delta * delta) < (dist * dist)) ? qtrue : qfalse;
 }
 
-inline qboolean Entity::WithinDistance(Entity *ent, float dist)
+inline qboolean Entity::WithinDistance(Entity *ent, float dist) const
 
 {
     Vector delta;
@@ -815,6 +856,9 @@ inline str Entity::GetRandomAlias(str name, AliasListNode_t **ret)
     return realname;
 }
 
-#include "world.h"
+inline bool Entity::AreasConnected(const Entity *other)
+{
+    return gi.AreasConnected(edict->r.areanum, other->edict->r.areanum) != 0;
+}
 
-#endif
+#include "worldspawn.h"
diff --git a/code/fgame/explosion.cpp b/code/fgame/explosion.cpp
index 3f42d199..72a7b620 100644
--- a/code/fgame/explosion.cpp
+++ b/code/fgame/explosion.cpp
@@ -487,7 +487,7 @@ void ExplodeObject::SetDebrisModel
    const char *ptr;
 
    // there could be multiple space delimited models, so we need to search for the spaces.
-   strcpy( string,  ev->GetString( 1 ) );
+   Q_strncpyz( string,  ev->GetString( 1 ), sizeof( string ) );
    ptr = strtok( string, " " );
    while ( ptr )
       {
diff --git a/code/fgame/explosion.h b/code/fgame/explosion.h
index 19618004..4d123c49 100644
--- a/code/fgame/explosion.h
+++ b/code/fgame/explosion.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,8 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // explosions each time they are activated.
 // 
 
-#ifndef __EXPLOSION_H__
-#define __EXPLOSION_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -136,5 +135,3 @@ inline void ExplodeObject::Archive
    arc.ArchiveInteger( &debrisamount );
    debrismodels.Archive( arc );
    }
-
-#endif /* explosion.h */
diff --git a/code/fgame/fixedturret.cpp b/code/fgame/fixedturret.cpp
index 6395d260..20d4f21e 100644
--- a/code/fgame/fixedturret.cpp
+++ b/code/fgame/fixedturret.cpp
@@ -21,6 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "fixedturret.h"
+#include "g_phys.h"
+#include "weapturret.h"
+#include "dm_manager.h"
+#include "player.h"
 
 CLASS_DECLARATION(VehicleTank, FixedTurret, NULL) {
     {NULL, NULL}
@@ -28,41 +32,105 @@ CLASS_DECLARATION(VehicleTank, FixedTurret, NULL) {
 
 FixedTurret::FixedTurret()
 {
-    // FIXME: unimplemented
+    locked = false;
+    driver.flags |= SLOT_UNUSED;
 }
 
 void FixedTurret::Archive(Archiver& arc)
 {
-    // FIXME: unimplemented
+    VehicleTank::Archive(arc);
+
+    arc.ArchiveVector(&lastEntOrigin);
+    arc.ArchiveVector(&lastEntAngles);
 }
 
 qboolean FixedTurret::Drive(usercmd_t *ucmd)
 {
-    // FIXME: unimplemented
-    return qfalse;
+    qboolean result;
+    setMoveType(MOVETYPE_NONE);
+
+    result = VehicleTank::Drive(ucmd);
+
+    moveimpulse = 0;
+    turnimpulse = 0;
+    jumpimpulse = 0;
+
+    return result;
 }
 
 void FixedTurret::DetachRemoteOwner()
 {
-    // FIXME: unimplemented
+    TurretGun* turret;
+
+    Vehicle::DetachRemoteOwner();
+
+    turret = static_cast<TurretGun*>(Turrets[0].ent.Pointer());
+    turret->RemoveUserCamera();
 }
 
 void FixedTurret::EventDamage(Event *ev)
 {
-    // FIXME: unimplemented
+    meansOfDeath_t mod = static_cast<meansOfDeath_t>(ev->GetInteger(9));
+
+    // ignore damage when the round isn't active in TOW
+    if (g_gametype->integer == GT_TOW && !dmManager.RoundActive()) {
+        return;
+    }
+
+    // ignore bullets
+    switch (mod) {
+    case MOD_BULLET:
+    case MOD_BASH:
+    case MOD_FAST_BULLET:
+    case MOD_VEHICLE:
+    case MOD_SHOTGUN:
+        return;
+    default:
+        break;
+    }
+
+    // ignore grenades in single player mode
+    if (g_gametype->integer == GT_SINGLE_PLAYER && mod == MOD_GRENADE) {
+        return;
+    }
+
+    Vehicle::EventDamage(ev);
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        if (driver.ent && driver.ent->IsSubclassOfPlayer()) {
+            Player* player = static_cast<Player*>(driver.ent.Pointer());
+            player->m_iNumHitsTaken++;
+        }
+    }
+
+    if (health <= 0 && driver.ent && driver.ent->IsSubclassOfPlayer()) {
+        Player* player = static_cast<Player*>(driver.ent.Pointer());
+
+        DetachDriverSlot(0, vec_zero, NULL);
+        DetachRemoteOwner();
+
+        player->takedamage = DAMAGE_YES;
+        player->PostEvent(EV_Kill, 0.1f);
+    }
 }
 
 void FixedTurret::AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition)
 {
-    // FIXME: unimplemented
+    lastEntOrigin = ent->origin;
+    lastEntAngles = ent->angles;
+    Vehicle::AttachDriverSlot(slot, ent, vExitPosition);
 }
 
 void FixedTurret::DetachDriverSlot(int slot, Vector vExitPosition, Vector *vExitAngles)
 {
-    // FIXME: unimplemented
+    Vehicle::DetachDriverSlot(slot, lastEntOrigin, &lastEntAngles);
 }
 
 void FixedTurret::EventSetCollisionModel(Event *ev)
 {
-    // FIXME: unimplemented
+    Vehicle::EventSetCollisionModel(ev);
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->DisconnectPaths();
+    }
 }
diff --git a/code/fgame/fixedturret.h b/code/fgame/fixedturret.h
index 2e96c107..c3e9ae67 100644
--- a/code/fgame/fixedturret.h
+++ b/code/fgame/fixedturret.h
@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class FixedTurret : public VehicleTank
 {
+private:
+    Vector lastEntOrigin;
+    Vector lastEntAngles;
+
 public:
     CLASS_PROTOTYPE(FixedTurret);
 
diff --git a/code/fgame/g_bot.cpp b/code/fgame/g_bot.cpp
index 0942f0ce..5ee6d165 100644
--- a/code/fgame/g_bot.cpp
+++ b/code/fgame/g_bot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,224 +26,772 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "g_bot.h"
 
-static gentity_t* firstBot = NULL;
-static saved_bot_t* saved_bots = NULL;
-static unsigned int current_bot_count = 0;
+static saved_bot_t *saved_bots     = NULL;
+static unsigned int num_saved_bots = 0;
+static unsigned int botId          = 0;
 
-void G_BotBegin
-	(
-	gentity_t *ent
-	)
+Container<str> alliedModelList;
+Container<str> germanModelList;
+
+/*
+===========
+IsAlliedPlayerModel
+
+Return whether or not the specified filename is for allies
+============
+*/
+bool IsAlliedPlayerModel(const char *filename)
 {
-	level.m_bSpawnBot = true;
-	G_ClientBegin( ent, NULL );
+    return !Q_stricmpn(filename, "allied_", 7) || !Q_stricmpn(filename, "american_", 9);
 }
 
-void G_BotThink
-	(
-	gentity_t *ent,
-	int msec
-	)
+/*
+===========
+IsGermanPlayerModel
+
+Return whether or not the specified filename is for axis
+============
+*/
+bool IsGermanPlayerModel(const char *filename)
 {
-	usercmd_t ucmd;
-	usereyes_t eyeinfo;
-	PlayerBot *bot;
-
-	assert( ent );
-	assert( ent->entity );
-	assert( ent->entity->IsSubclassOfBot() );
-
-	bot = ( PlayerBot * )ent->entity;
-
-	bot->UpdateBotStates();
-	bot->GetUsercmd( &ucmd );
-	bot->GetEyeInfo( &eyeinfo );
-
-	G_ClientThink( ent, &ucmd, &eyeinfo );
+    return !Q_stricmpn(filename, "german_", 7) || !Q_stricmpn(filename, "IT_", 3) || !Q_stricmpn(filename, "SC_", 3);
 }
 
-gentity_t* G_GetFirstBot()
+/*
+===========
+IsPlayerModel
+
+Return whether or not the specified filename
+is a player model that can be chosen
+============
+*/
+bool IsPlayerModel(const char *filename)
 {
-	return firstBot;
+    size_t len = strlen(filename);
+
+    if (len >= 8 && !Q_stricmp(&filename[len - 8], "_fps.tik")) {
+        return false;
+    }
+
+    if (!IsAlliedPlayerModel(filename) && !IsGermanPlayerModel(filename)) {
+        return false;
+    }
+
+    return true;
 }
 
-void G_AddBot(unsigned int num, saved_bot_t* saved)
+/*
+===========
+ClearModelList
+
+Clear the allied and axis model list
+============
+*/
+void ClearModelList()
 {
-	int n;
-	int i;
-	int clientNum = -1;
-	gentity_t *e;
-	char botName[ MAX_NETNAME ];
-	char challenge[ MAX_STRING_TOKENS ];
-	char userinfo[MAX_INFO_STRING]{ 0 };
-	Event* teamEv;
+    alliedModelList.FreeObjectList();
+    germanModelList.FreeObjectList();
+}
 
-	num = Q_min(num, sv_maxbots->integer);
-	for( n = 0; n < num; n++ )
-	{
-		for( i = maxclients->integer; i < game.maxclients; i++ )
-		{
-			e = &g_entities[ i ];
+/*
+===========
+InitModelList
 
-			if( !e->inuse && e->client )
-			{
-				clientNum = i;
-				break;
-			}
-		}
+Initialize the list of allied and axis player models
+that bots can use
+============
+*/
+void InitModelList()
+{
+    char **fileList;
+    int    numFiles;
+    int    i;
+    size_t numAlliedModels = 0, numGermanModels = 0;
+    byte  *p;
 
-		if( clientNum == -1 )
-		{
-			gi.Printf( "No free slot for a bot\n" );
-			return;
-		}
+    ClearModelList();
 
-		if( gi.Argc() > 2 )
-		{
-			Q_strncpyz( botName, gi.Argv( 2 ), sizeof( botName ) );
-		}
-		else
-		{
-			sprintf( botName, "bot%d", clientNum - maxclients->integer + 1 );
-		}
+    fileList = gi.FS_ListFiles("models/player", ".tik", qfalse, &numFiles);
 
-		sprintf( challenge, "%d", clientNum - maxclients->integer + 1 );
+    for (i = 0; i < numFiles; i++) {
+        const char *filename = fileList[i];
 
-		e->s.clientNum = clientNum;
-		e->s.number = clientNum;
-
-        if (saved) {
-			strncpy(userinfo, saved->pers.userinfo, ARRAY_LEN(userinfo));
-		} else {
-            Info_SetValueForKey(userinfo, "name", botName);
-            Info_SetValueForKey(userinfo, "dm_playermodel", "allied_pilot");
-            Info_SetValueForKey(userinfo, "dm_playergermanmodel", "german_afrika_officer");
-            Info_SetValueForKey(userinfo, "fov", "80");
-            Info_SetValueForKey(userinfo, "protocol", "8");
-            Info_SetValueForKey(userinfo, "ip", "0.0.0.0");
-            Info_SetValueForKey(userinfo, "qport", "0");
-            Info_SetValueForKey(userinfo, "challenge", challenge);
-            Info_SetValueForKey(userinfo, "snaps", "1");
-            Info_SetValueForKey(userinfo, "rate", "1");
-            Info_SetValueForKey(userinfo, "dmprimary", "smg");
-		}
-
-		current_bot_count++;
-
-		G_BotConnect( clientNum, userinfo );
-
-		if (saved) {
-			e->client->pers = saved->pers;
-		}
-
-		if( !firstBot )
-			firstBot = e;
-
-		G_BotBegin( e );
-
-		if (saved) {
-			/*
-			switch (saved->team)
-			{
-            case TEAM_ALLIES:
-                teamEv = new Event(EV_Player_JoinDMTeam);
-				teamEv->AddString("allies");
-				break;
-            case TEAM_AXIS:
-                teamEv = new Event(EV_Player_JoinDMTeam);
-                teamEv->AddString("axis");
-				break;
-            default:
-				teamEv = new Event(EV_Player_AutoJoinDMTeam);
-				break;
-			}
-			*/
-		} else {
-            teamEv = new Event(EV_Player_AutoJoinDMTeam);
-            e->entity->PostEvent(teamEv, level.frametime);
-
-            Event* ev = new Event(EV_Player_PrimaryDMWeapon);
-            ev->AddString("smg");
-
-            e->entity->PostEvent(ev, level.frametime);
+        if (!IsPlayerModel(filename)) {
+            continue;
         }
-	}
+
+        if (IsAlliedPlayerModel(filename)) {
+            numAlliedModels++;
+        } else {
+            numGermanModels++;
+        }
+    }
+
+    alliedModelList.Resize(numAlliedModels);
+    germanModelList.Resize(numGermanModels);
+
+    for (i = 0; i < numFiles; i++) {
+        const char *filename = fileList[i];
+        size_t      len      = strlen(filename);
+
+        if (!IsPlayerModel(filename)) {
+            continue;
+        }
+
+        if (IsAlliedPlayerModel(filename)) {
+            alliedModelList.AddObject(str(filename, 0, len - 4));
+        } else {
+            germanModelList.AddObject(str(filename, 0, len - 4));
+        }
+    }
+
+    gi.FS_FreeFileList(fileList);
 }
 
-void G_RemoveBot(unsigned int num)
+/*
+===========
+G_BotBegin
+
+Begin spawning a new bot entity
+============
+*/
+void G_BotBegin(gentity_t *ent)
 {
-	num = Q_min(atoi(gi.Argv(1)), sv_maxbots->integer);
+    Player        *player;
+    BotController *controller;
 
-	for( int n = 0; n < num; n++ )
-	{
-		gentity_t *e = &g_entities[ game.maxclients - 1 - n ];
-		if( e->inuse && e->client )
-		{
-			G_ClientDisconnect( e );
-			current_bot_count--;
-		}
-	}
+    level.spawn_entnum = ent->s.number;
+    player             = new Player;
+
+    G_ClientBegin(ent, NULL);
+
+    controller = botManager.getControllerManager().createController(player);
+    //player->setController(controller);
 }
 
-void G_SaveBots() {
-	unsigned int n;
+/*
+===========
+G_BotThink
+
+Called each server frame to make bots think
+============
+*/
+void G_BotThink(gentity_t *ent, int msec)
+{
+    /*
+    usercmd_t  ucmd;
+    usereyes_t eyeinfo;
+    PlayerBot *bot;
+
+    assert(ent);
+    assert(ent->entity);
+    assert(ent->entity->IsSubclassOfBot());
+
+    bot = (PlayerBot *)ent->entity;
+
+    bot->UpdateBotStates();
+    bot->GetUsercmd(&ucmd);
+    bot->GetEyeInfo(&eyeinfo);
+
+    G_ClientThink(ent, &ucmd, &eyeinfo);
+    */
+}
+
+/*
+===========
+G_FindFreeEntityForBot
+
+Find a free client slot
+============
+*/
+gentity_t *G_FindFreeEntityForBot()
+{
+    gentity_t *ent;
+    int        minNum = 0;
+    int        i;
+
+    if (sv_sharedbots->integer) {
+        minNum = 0;
+    } else {
+        minNum = maxclients->integer;
+    }
+
+    for (i = minNum; i < game.maxclients; i++) {
+        ent = &g_entities[i];
+        if (!ent->inuse && ent->client && !ent->client->pers.userinfo[0]) {
+            return ent;
+        }
+    }
+
+    return NULL;
+}
+
+/*
+===========
+G_ChangeParent
+
+Fix parenting for entities that use the old number
+============
+*/
+void G_ChangeParent(int oldNum, int newNum)
+{
+    gentity_t *ent;
+    int        i;
+
+    for (i = 0; i < game.maxentities; i++) {
+        ent = &g_entities[i];
+        if (!ent->inuse || !ent->entity) {
+            continue;
+        }
+
+        if (ent->s.parent == oldNum) {
+            ent->s.parent = newNum;
+        }
+        if (ent->r.ownerNum == oldNum) {
+            ent->r.ownerNum = newNum;
+        }
+    }
+}
+
+/*
+===========
+G_BotShift
+
+If the specified slot is used, the bot will be relocated
+to the next free entity slot
+============
+*/
+void G_BotShift(int clientNum)
+{
+    gentity_t *ent;
+    gentity_t *newEnt;
+
+    ent = &g_entities[clientNum];
+    if (!ent->inuse || !ent->client || !ent->entity) {
+        return;
+    }
+
+    if (!botManager.getControllerManager().findController(ent->entity)) {
+        return;
+    }
+
+    newEnt = G_FindFreeEntityForBot();
+    if (!newEnt) {
+        G_RemoveBot(ent);
+        return;
+    }
+
+    //
+    // Allocate the new entity
+    //
+    level.spawn_entnum = newEnt - g_entities;
+    level.AllocEdict(ent->entity);
+
+    //
+    // Copy all fields
+    //
+    newEnt->s        = ent->s;
+    newEnt->s.number = newEnt - g_entities;
+    memcpy(newEnt->client, ent->client, sizeof(*newEnt->client));
+    newEnt->r     = ent->r;
+    newEnt->solid = ent->solid;
+    newEnt->tiki  = ent->tiki;
+    AxisCopy(ent->mat, newEnt->mat);
+
+    newEnt->freetime  = ent->freetime;
+    newEnt->spawntime = ent->spawntime;
+    newEnt->radius2   = ent->radius2;
+    memcpy(newEnt->entname, ent->entname, sizeof(newEnt->entname));
+    newEnt->clipmask             = ent->clipmask;
+    newEnt->entity               = ent->entity;
+    newEnt->entity->edict        = newEnt;
+    newEnt->entity->client       = newEnt->client;
+    newEnt->entity->entnum       = newEnt->s.number;
+    newEnt->client->ps.clientNum = newEnt->s.number;
+
+    G_ChangeParent(ent->s.number, newEnt->s.number);
+
+    //
+    // Free the old entity so the real client will use it
+    //
+    level.FreeEdict(ent);
+    memset(ent->client, 0, sizeof(*ent->client));
+
+    G_SetClientConfigString(newEnt);
+}
+
+/*
+===========
+G_GetFirstBot
+
+Return the first bot
+============
+*/
+gentity_t *G_GetFirstBot()
+{
+    gentity_t   *ent;
+    unsigned int n;
+
+    for (n = 0; n < game.maxclients; n++) {
+        ent = &g_entities[n];
+        if (G_IsBot(ent)) {
+            return ent;
+        }
+    }
+
+    return NULL;
+}
+
+/*
+===========
+G_IsBot
+
+Return whether or not the gentity is a bot
+============
+*/
+bool G_IsBot(gentity_t *ent)
+{
+    if (!ent->inuse || !ent->client) {
+        return false;
+    }
+
+    if (!ent->entity || !botManager.getControllerManager().findController(ent->entity)) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===========
+G_IsPlayer
+
+Return whether or not the gentity is a player
+============
+*/
+bool G_IsPlayer(gentity_t *ent)
+{
+    if (!ent->inuse || !ent->client) {
+        return false;
+    }
+
+    if (!ent->entity || botManager.getControllerManager().findController(ent->entity)) {
+        return false;
+    }
+
+    return true;
+}
+
+/*
+===========
+G_GetRandomAlliedPlayerModel
+============
+*/
+const char *G_GetRandomAlliedPlayerModel()
+{
+    if (!alliedModelList.NumObjects()) {
+        return "";
+    }
+
+    const unsigned int index = rand() % alliedModelList.NumObjects();
+    return alliedModelList[index];
+}
+
+/*
+===========
+G_GetRandomGermanPlayerModel
+============
+*/
+const char *G_GetRandomGermanPlayerModel()
+{
+    if (!germanModelList.NumObjects()) {
+        return "";
+    }
+
+    const unsigned int index = rand() % germanModelList.NumObjects();
+    return germanModelList[index];
+}
+
+/*
+===========
+G_AddBot
+
+Add the specified bot, optionally its saved state
+============
+*/
+void G_AddBot(const saved_bot_t *saved)
+{
+    int        i;
+    int        clientNum;
+    gentity_t *e;
+    char       botName[MAX_NETNAME];
+    char       challenge[MAX_STRING_TOKENS];
+    Event     *teamEv;
+    char       userinfo[MAX_INFO_STRING] {0};
+
+    e = G_FindFreeEntityForBot();
+    if (!e) {
+        gi.Printf("No free slot for a bot\n");
+        return;
+    }
+
+    clientNum = e - g_entities;
+
+    // increase the unique ID
+    botId++;
+
+    if (saved) {
+        G_BotConnect(clientNum, qfalse, saved->userinfo);
+        G_BotBegin(e);
+        return;
+    }
+
+    if (gi.Argc() > 2) {
+        Q_strncpyz(botName, gi.Argv(2), sizeof(botName));
+    } else {
+        Com_sprintf(botName, sizeof(botName), "bot%d", botId);
+    }
+
+    Info_SetValueForKey(userinfo, "name", botName);
+
+    //
+    // Choose a random model
+    //
+    Info_SetValueForKey(userinfo, "dm_playermodel", G_GetRandomAlliedPlayerModel());
+    Info_SetValueForKey(userinfo, "dm_playergermanmodel", G_GetRandomGermanPlayerModel());
+
+    Info_SetValueForKey(userinfo, "fov", "80");
+    Info_SetValueForKey(userinfo, "ip", "localhost");
+
+    // Connect the bot for the first time
+    // setup user info and stuff
+    G_BotConnect(clientNum, qtrue, userinfo);
+
+    G_BotBegin(e);
+}
+
+/*
+===========
+G_AddBots
+
+Add the specified number of bots
+============
+*/
+void G_AddBots(unsigned int num)
+{
+    int n;
+
+    for (n = 0; n < num; n++) {
+        G_AddBot(NULL);
+    }
+}
+
+/*
+===========
+G_RemoveBot
+
+Remove the specified bot
+============
+*/
+void G_RemoveBot(gentity_t *ent)
+{
+    if (ent->entity) {
+        BotController *controller = botManager.getControllerManager().findController(ent->entity);
+
+        botManager.getControllerManager().removeController(controller);
+    }
+
+    G_ClientDisconnect(ent);
+}
+
+/*
+===========
+G_RemoveBots
+
+Remove the specified number of bots
+============
+*/
+void G_RemoveBots(unsigned int num)
+{
+    unsigned int removed = 0;
+    unsigned int n;
+    unsigned int teamCount[2] {0};
+    bool         bNoMoreToRemove = false;
+
+    teamCount[0] = dmManager.GetTeamAllies()->m_players.NumObjects();
+    teamCount[1] = dmManager.GetTeamAxis()->m_players.NumObjects();
+
+    while (!bNoMoreToRemove) {
+        bNoMoreToRemove = true;
+
+        // First remove bots that are in the team
+        // with the higest player count
+        for (n = 0; n < game.maxclients && removed < num; n++) {
+            gentity_t *e = &g_entities[n];
+            if (!G_IsBot(e)) {
+                continue;
+            }
+
+            Player *player = static_cast<Player *>(e->entity);
+            if (player->GetTeam() == TEAM_ALLIES || player->GetTeam() == TEAM_AXIS) {
+                unsigned int teamIndex = (player->GetTeam() - TEAM_ALLIES);
+                if (teamCount[teamIndex] < teamCount[1 - teamIndex]) {
+                    // Not enough players in that team, don't remove the bot
+                    continue;
+                }
+
+                teamCount[teamIndex]--;
+                bNoMoreToRemove = false;
+            }
+
+            G_RemoveBot(e);
+            removed++;
+        }
+    }
+
+    //
+    // Remove all bots that haven't been removed earlier
+    //
+    for (n = 0; n < game.maxclients && removed < num; n++) {
+        gentity_t *e = &g_entities[n];
+        if (!G_IsBot(e)) {
+            continue;
+        }
+
+        G_RemoveBot(e);
+        removed++;
+    }
+}
+
+/*
+===========
+G_SaveBots
+
+Save bot persistent data
+============
+*/
+void G_SaveBots()
+{
+    unsigned int count;
+    unsigned int n;
 
     if (saved_bots) {
         delete[] saved_bots;
-		saved_bots = NULL;
+        saved_bots = NULL;
     }
 
-	if (!current_bot_count) {
-		return;
-	}
+    const BotControllerManager& manager        = botManager.getControllerManager();
+    unsigned int                numSpawnedBots = manager.getControllers().NumObjects();
 
-	saved_bots = new saved_bot_t[current_bot_count];
-    for (n = 0; n < current_bot_count; n++) {
-        gentity_t* e = &g_entities[game.maxclients - sv_maxbots->integer + n];
-		saved_bot_t& saved = saved_bots[n];
+    if (!numSpawnedBots) {
+        return;
+    }
 
-		if (e->inuse && e->client)
-		{
-			Player* player = static_cast<Player*>(e->entity);
+    saved_bots     = new saved_bot_t[numSpawnedBots];
+    num_saved_bots = 0;
 
-			saved.bValid = true;
-			//saved.team = player->GetTeam();
-			saved.pers = player->client->pers;
-		}
-	}
+    count = manager.getControllers().NumObjects();
+    assert(count <= numSpawnedBots);
+
+    for (n = 1; n <= count; n++) {
+        const BotController *controller = manager.getControllers().ObjectAt(n);
+        Player              *player     = controller->getControlledEntity();
+        if (!player) {
+            // this shouldn't happen
+            continue;
+        }
+
+        saved_bot_t& saved = saved_bots[num_saved_bots++];
+        memcpy(saved.userinfo, player->client->pers.userinfo, sizeof(saved.userinfo));
+    }
 }
 
-void G_RestoreBots() {
-	unsigned int n;
+/*
+===========
+G_RestoreBots
+
+Restore bot persistent data, such as their team
+============
+*/
+void G_RestoreBots()
+{
+    unsigned int n;
 
     if (!saved_bots) {
-		return;
+        return;
     }
 
-    for (n = 0; n < sv_numbots->integer; n++) {
-        saved_bot_t& saved = saved_bots[n];
+    for (n = 0; n < num_saved_bots; n++) {
+        const saved_bot_t& saved = saved_bots[n];
 
-		G_AddBot(1, &saved);
-	}
+        G_AddBot(&saved);
+    }
 
-	delete[] saved_bots;
-	saved_bots = NULL;
+    delete[] saved_bots;
+    saved_bots = NULL;
 }
 
-void G_ResetBots() {
-	G_SaveBots();
+/*
+===========
+G_CountPlayingClients
 
-	current_bot_count = 0;
+Count the number of real clients that are playing
+============
+*/
+int G_CountPlayingClients()
+{
+    gentity_t   *other;
+    unsigned int n;
+    unsigned int count = 0;
+
+    for (n = 0; n < game.maxclients; n++) {
+        other = &g_entities[n];
+        if (G_IsPlayer(other)) {
+            Player *p = static_cast<Player *>(other->entity);
+            // Ignore spectators
+            if (p->GetTeam() != teamtype_t::TEAM_NONE && p->GetTeam() != teamtype_t::TEAM_SPECTATOR) {
+                count++;
+            }
+        }
+    }
+
+    return count;
 }
 
-void G_SpawnBots() {
-	if (saved_bots) {
-		G_RestoreBots();
-	}
+/*
+===========
+G_CountClients
 
-	if (sv_numbots->integer > current_bot_count) {
-		G_AddBot(sv_numbots->integer - current_bot_count);
-	} else if (sv_numbots->integer < current_bot_count) {
-		G_RemoveBot(current_bot_count - sv_numbots->integer);
-	}
+Count the number of real clients
+============
+*/
+int G_CountClients()
+{
+    gentity_t   *other;
+    unsigned int n;
+    unsigned int count = 0;
+
+    for (n = 0; n < game.maxclients; n++) {
+        other = &g_entities[n];
+        if (G_IsBot(other)) {
+            continue;
+        }
+
+        if (other->client && other->client->pers.userinfo[0]) {
+            count++;
+        }
+    }
+
+    return count;
+}
+
+/*
+===========
+G_RestartBots
+
+Save bots
+============
+*/
+void G_RestartBots()
+{
+    G_SaveBots();
+}
+
+/*
+===========
+G_ResetBots
+
+Save and reset the bot count
+============
+*/
+void G_ResetBots()
+{
+    botManager.Cleanup();
+
+    botId = 0;
+}
+
+/*
+===========
+G_BotInit
+
+Called to initialize bots
+============
+*/
+void G_BotInit()
+{
+    InitModelList();
+    botManager.Init();
+}
+
+/*
+===========
+G_BotFrame
+
+Called each frame to manage bots
+============
+*/
+void G_BotFrame()
+{
+    botManager.Frame();
+}
+
+/*
+===========
+G_BotPostInit
+
+Called after the server has spawned
+============
+*/
+void G_BotPostInit()
+{
+    G_RestoreBots();
+
+    G_SpawnBots();
+}
+
+/*
+===========
+G_SpawnBots
+
+Called each frame to manage bot spawning
+============
+*/
+void G_SpawnBots()
+{
+    unsigned int numClients;
+    unsigned int numBotsToSpawn;
+    unsigned int numSpawnedBots;
+
+    //
+    // Check the minimum bot count
+    //
+    numClients = G_CountPlayingClients();
+    if (numClients < sv_minPlayers->integer) {
+        numBotsToSpawn = sv_minPlayers->integer - numClients + sv_numbots->integer;
+    } else {
+        numBotsToSpawn = sv_numbots->integer;
+    }
+
+    if (sv_sharedbots->integer) {
+        unsigned int numClients = G_CountClients();
+
+        //
+        // Cap to the maximum number of possible clients
+        //
+        numBotsToSpawn = Q_min(numBotsToSpawn, maxclients->integer - numClients + sv_maxbots->integer);
+    } else {
+        numBotsToSpawn = Q_min(numBotsToSpawn, sv_maxbots->integer);
+    }
+
+    numSpawnedBots = botManager.getControllerManager().getControllers().NumObjects();
+
+    //
+    // Spawn bots
+    //
+    if (numBotsToSpawn > numSpawnedBots) {
+        G_AddBots(numBotsToSpawn - numSpawnedBots);
+    } else if (numBotsToSpawn < numSpawnedBots) {
+        G_RemoveBots(numSpawnedBots - numBotsToSpawn);
+    }
 }
diff --git a/code/fgame/g_bot.h b/code/fgame/g_bot.h
index f81addb1..5db1b88a 100644
--- a/code/fgame/g_bot.h
+++ b/code/fgame/g_bot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,18 +23,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 struct saved_bot_t {
-    client_persistant_t pers;
-    bool bValid;
-
-    saved_bot_t()
-        : bValid(false)
-    {}
+    char userinfo[MAX_INFO_STRING];
 };
 
-void G_BotBegin(gentity_t* ent);
-void G_BotThink(gentity_t* ent, int msec);
-gentity_t* G_GetFirstBot();
-void G_AddBot(unsigned int num, saved_bot_t* saved = NULL);
-void G_RemoveBot(unsigned int num);
-void G_ResetBots();
-void G_SpawnBots();
\ No newline at end of file
+void        G_BotBegin(gentity_t *ent);
+void        G_BotThink(gentity_t *ent, int msec);
+void        G_BotShift(int clientNum);
+gentity_t  *G_GetFirstBot();
+void        G_AddBot(const saved_bot_t *saved = NULL);
+void        G_AddBots(unsigned int num);
+void        G_RemoveBot(gentity_t *ent);
+void        G_RemoveBots(unsigned int num);
+bool        G_IsBot(gentity_t *ent);
+bool        G_IsPlayer(gentity_t *ent);
+void        G_ResetBots();
+void        G_RestartBots();
+void        G_BotInit();
+void        G_BotFrame();
+void        G_BotPostInit();
+void        G_SpawnBots();
+const char *G_GetRandomAlliedPlayerModel();
+const char *G_GetRandomGermanPlayerModel();
\ No newline at end of file
diff --git a/code/fgame/g_client.cpp b/code/fgame/g_client.cpp
index c11b7f24..3a69d78d 100644
--- a/code/fgame/g_client.cpp
+++ b/code/fgame/g_client.cpp
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "playerbot.h"
 #include "playerstart.h"
 #include "scriptmaster.h"
+#include "g_spawn.h"
+#include "g_bot.h"
 
 // g_client.c -- client functions that don't happen every frame
 
@@ -578,6 +580,10 @@ Chooses a player start, deathmatch start, etc
 PlayerStart *SelectSpawnPoint(Player *player)
 {
     PlayerStart *spot = NULL;
+    PlayerStart *spawnpoint;
+    const char  *classID;
+    int          i;
+    int          nFound;
 
     switch (g_gametype->integer) {
     case GT_SINGLE_PLAYER:
@@ -602,15 +608,41 @@ PlayerStart *SelectSpawnPoint(Player *player)
 
     // find a single player start spot
     if (!spot) {
-        while ((spot = (PlayerStart *)G_FindArchivedClass(spot, "info_player_start")) != NULL) {
-            if (level.spawnpoint.icmp(spot->TargetName()) == 0) {
-                break;
+        for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
+            SimpleArchivedEntity *arc = level.m_SimpleArchivedEntities.ObjectAt(i);
+
+            classID = arc->classinfo()->classID;
+            if (!Q_stricmp(classID, "info_player_start")) {
+                spawnpoint = static_cast<PlayerStart *>(arc);
+                if (!str::icmp(level.spawnpoint, spawnpoint->TargetName())) {
+                    spot = spawnpoint;
+                    break;
+                }
             }
         }
 
         if (!spot && !level.spawnpoint.length()) {
-            // there wasn't a spawnpoint without a target, so use any
-            spot = (PlayerStart *)G_FindArchivedClass(NULL, "info_player_start");
+            nFound = 0;
+
+            for (i = 1; i <= level.m_SimpleArchivedEntities.NumObjects(); i++) {
+                SimpleArchivedEntity *arc = level.m_SimpleArchivedEntities.ObjectAt(i);
+
+                classID = arc->classinfo()->classID;
+                // Fixed in OPM
+                //  If there is no free spot, just use any random player start
+                //  OG wants info_player_start directly
+                if (arc->isSubclassOf(PlayerStart)) {
+                    int randVal;
+
+                    spawnpoint = static_cast<PlayerStart *>(arc);
+                    nFound++;
+
+                    randVal = rand();
+                    if (randVal == randVal / nFound * nFound) {
+                        spot = spawnpoint;
+                    }
+                }
+            }
         }
 
         if (!spot) {
@@ -725,6 +757,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
     char      *s;
     gclient_t *client;
     int        clientnum;
+    char       oldname[MAX_NAME_LENGTH];
 
     if (!ent) {
         return;
@@ -740,10 +773,19 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
 
     clientnum = ent - g_entities;
 
-    if (gi.SanitizeName(s, client->pers.netname)) {
+    Q_strncpyz(oldname, client->pers.netname, sizeof(oldname));
+    if (gi.SanitizeName(s, client->pers.netname, sizeof(client->pers.netname))) {
         gi.Printf("WARNING: had to sanitize the name for client %i\n", clientnum);
     }
 
+    if (strcmp(oldname, client->pers.netname)) {
+        //
+        // Added in OPM
+        //  Print name changes
+        //
+        gi.Printf("Client %i changed name from '%s' to '%s'\n", clientnum, oldname, client->pers.netname);
+    }
+
     s = Info_ValueForKey(u, "dm_playermodel");
 
     if (!s) {
@@ -762,7 +804,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
 
     Q_strncpyz(client->pers.dm_playergermanmodel, s, sizeof(client->pers.dm_playergermanmodel));
 
-    gi.setConfigstring(CS_PLAYERS + clientnum, va("name\\%s", client->pers.netname));
+    G_SetClientConfigString(ent);
 
     if (ent->entity) {
         float fov;
@@ -786,7 +828,7 @@ void G_ClientUserinfoChanged(gentity_t *ent, const char *u)
     Q_strncpyz(client->pers.userinfo, u, sizeof(client->pers.userinfo));
 }
 
-void G_BotConnect(int clientNum, const char* userinfo)
+void G_BotConnect(int clientNum, qboolean firstTime, const char *userinfo)
 {
     gclient_t *client;
     gentity_t *ent;
@@ -795,13 +837,24 @@ void G_BotConnect(int clientNum, const char* userinfo)
 
     ent->client   = game.clients + clientNum;
     ent->s.number = clientNum;
+    ent->r.svFlags |= SVF_BOT;
 
     client = ent->client;
 
     // read the session data
     memset(client, 0, sizeof(*client));
-    G_InitSessionData(client, userinfo);
+    if (firstTime) {
+        memset(client, 0, sizeof(*client));
+        if (!game.autosaved) {
+            G_InitClientPersistant(client, userinfo);
+        }
+    } else {
+        G_ReadClientSessionData(client);
+    }
 
+    //
+    // Use "localhost" as some code relies on it to check whether or not it should be kicked
+    //
     Q_strncpyz(client->pers.ip, "localhost", sizeof(client->pers.ip));
     client->pers.port = 0;
 
@@ -828,17 +881,15 @@ to the server machine, but qfalse on map changes and tournement
 restarts.
 ============
 */
-const char *G_ClientConnect(int clientNum, qboolean firstTime)
+const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differentMap)
 {
     char      *ip, *port, *value;
     gclient_t *client;
     gentity_t *ent;
     char       userinfo[MAX_INFO_STRING];
 
-    gi.DPrintf("TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\n");
-    if (!g_gametype->integer) {
-        return NULL;
-    }
+    // Added in OPM
+    G_BotShift(clientNum);
 
     ent = &g_entities[clientNum];
 
@@ -852,6 +903,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
     port = Info_ValueForKey(userinfo, "port");
 
     // FIXME: what is fucking wrong with G_FilterPacket...
+    // NOTE: IP banning is directly handled by the server
     //if ( G_FilterPacket( value ) ) {
     //	return "Banned IP";
     //}
@@ -862,7 +914,8 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
     if ((strcmp(ip, "localhost") != 0)) {
         // check for a password
         value = Info_ValueForKey(userinfo, "password");
-        if (password->string[0] && Q_stricmp(password->string, "none") && strcmp(password->string, value) != 0) {
+        if (strcmp(sv_privatePassword->string, value) != 0 && *password->string
+            && strcmp(password->string, value) != 0) {
             return "Invalid password";
         }
     }
@@ -872,10 +925,23 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
 
     // read or initialize the session data
     if (firstTime) {
-        memset(client, 0, sizeof(*client));
-        G_InitSessionData(client, userinfo);
+        if (g_gametype->integer != GT_SINGLE_PLAYER || !cl_running->integer || clientNum != 0) {
+            // Added in OPM
+            //  Accept remote clients but ignore the listen server
+            //  so the client flags that were put during prespawn stay
+            memset(client, 0, sizeof(*client));
+        }
+        if (!game.autosaved) {
+            G_InitClientPersistant(client, userinfo);
+        }
     } else {
-        G_ReadSessionData(client);
+        G_ReadClientSessionData(client);
+        // Added in 2.1
+        //  Let clients choose their primary weapon
+        //  on map change
+        if (differentMap) {
+            client->pers.dm_primary[0] = 0;
+        }
     }
 
     Q_strncpyz(client->pers.ip, ip, sizeof(client->pers.ip));
@@ -895,7 +961,7 @@ const char *G_ClientConnect(int clientNum, qboolean firstTime)
 #endif
 
     // don't do the "xxx connected" messages if they were caried over from previous level
-    if (firstTime && g_gametype->integer) {
+    if (firstTime && g_gametype->integer != GT_SINGLE_PLAYER) {
         if (dedicated->integer) {
             gi.Printf("%s is preparing for deployment\n", client->pers.netname);
         }
@@ -931,12 +997,7 @@ void G_ClientBegin(gentity_t *ent, usercmd_t *cmd)
             // a spawn point will completely reinitialize the entity
             level.spawn_entnum = ent->s.number;
 
-            if (level.m_bSpawnBot) {
-                level.m_bSpawnBot = false;
-                PlayerBot *player = new PlayerBot;
-            } else {
-                Player *player = new Player;
-            }
+            Player *player = new Player;
         }
 
         if (level.intermissiontime && ent->entity) {
@@ -944,7 +1005,7 @@ void G_ClientBegin(gentity_t *ent, usercmd_t *cmd)
         } else {
             ent->client->pers.enterTime = level.svsFloatTime;
 
-            if (g_gametype->integer) {
+            if (g_gametype->integer != GT_SINGLE_PLAYER) {
                 // send effect if in a multiplayer game
                 if (dedicated->integer) {
                     gi.Printf("%s has entered the battle\n", ent->client->pers.netname);
@@ -1011,10 +1072,17 @@ void G_ClientDisconnect(gentity_t *ent)
 
         G_PrintToAllClients(va("%s has left the battle\n", ent->client->pers.netname), 2);
 
+        assert(ent->entity->IsSubclassOfPlayer());
         ((Player *)ent->entity)->Disconnect();
 
-        delete ent->entity;
+        if (g_iInThinks) {
+            ent->entity->PostEvent(EV_Remove, 0);
+        } else {
+            delete ent->entity;
+        }
         ent->entity = NULL;
+
+        G_InitClientPersistant(ent->client);
     }
 
     catch (const char *error) {
diff --git a/code/fgame/g_local.h b/code/fgame/g_local.h
index fcf18650..ab4644ee 100644
--- a/code/fgame/g_local.h
+++ b/code/fgame/g_local.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // g_local.h -- local definitions for game module
 
-#ifndef __G_LOCAL_H__
-#define __G_LOCAL_H__
+#pragma once
 
 #include "q_shared.h"
 #include "bg_public.h"
@@ -133,15 +132,6 @@ typedef struct {
 #define MAX_NETNAME    32
 #define MAX_VOTE_COUNT 3
 
-typedef enum {
-    CS_FREE,
-    CS_ZOMBIE,
-    CS_CONNECTED,
-    CS_PRIMED,
-    CS_ACTIVE
-
-} clientState_t;
-
 //
 // g_spawn.c
 //
@@ -212,6 +202,7 @@ void G_PrintDeathMessage(
 );
 void G_PrintDeathMessage_Old(const char *pszString);
 void G_WarnPlayer(class Player *player, const char *format, ...);
+int G_NumClients(void);
 
 int G_WeaponIndex(const char *name);
 
@@ -417,14 +408,14 @@ void       G_RunThink(gentity_t *ent);
 void QDECL G_LogPrintf(const char *fmt, ...);
 void       SendScoreboardMessageToAllClients(void);
 void QDECL G_Printf(const char *fmt, ...);
-void QDECL G_Error(const char *fmt, ...);
-void QDECL G_Error(errorParm_t type, const char *fmt, ...);
+void QDECL G_Error(const char *fmt, ...) __attribute__ ((noreturn, format(printf, 1, 2)));
+void QDECL G_Error(errorParm_t type, const char *fmt, ...) __attribute__((noreturn, format(printf, 2, 3)));
 
 //
 // g_client.c
 //
-void        G_BotConnect(int clientNum, const char* userinfo);
-const char *G_ClientConnect(int clientNum, qboolean firstTime);
+void        G_BotConnect(int clientNum, qboolean firstTime, const char* userinfo);
+const char *G_ClientConnect(int clientNum, qboolean firstTime, qboolean differentMap);
 void        G_ClientUserinfoChanged(gentity_t *ent, const char *userinfo);
 void        G_ClientDisconnect(gentity_t *ent);
 void        G_ClientBegin(gentity_t *ent, usercmd_t *cmd);
@@ -437,6 +428,8 @@ void        G_ClientCommand(gentity_t *ent);
 void G_ClientThink(gentity_t *ent, usercmd_t *cmd, usereyes_t *eyeinfo);
 void ClientEndFrame(gentity_t *ent);
 void G_ClientEndServerFrames(void);
+void G_ClientDoBlends(void);
+void FindIntermissionPoint(void);
 void G_RunClient(gentity_t *ent);
 
 //
@@ -456,8 +449,8 @@ void  Svcmd_GameMem_f(void);
 //
 // g_session.c
 //
-void G_ReadSessionData(gclient_t *client);
-void G_InitSessionData(gclient_t *client, const char *userinfo);
+void G_ReadClientSessionData(gclient_t *client);
+void G_InitClientPersistant(gclient_t *client, const char *userinfo);
 
 void G_InitWorldSession(void);
 void G_WriteSessionData(void);
@@ -530,5 +523,3 @@ extern gentity_t *g_entities;
 #define FOFS(x) ((size_t) & (((gentity_t *)0)->x))
 
 #include "g_utils.h"
-
-#endif /* g_local.h */
diff --git a/code/fgame/g_main.cpp b/code/fgame/g_main.cpp
index 67b30501..ccb0e3f7 100644
--- a/code/fgame/g_main.cpp
+++ b/code/fgame/g_main.cpp
@@ -1,24 +1,25 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
+
 //
 
 #include "g_local.h"
@@ -34,6 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "lightstyleclass.h"
 #include "lodthing.h"
 #include "viewthing.h"
+#include "smokesprite.h"
 #include "playerbot.h"
 #include "g_bot.h"
 #include <tiki.h>
@@ -61,11 +63,12 @@ gentity_t free_edicts;
 int sv_numtraces   = 0;
 int sv_numpmtraces = 0;
 
-int          g_protocol = 0;
-gentity_t   *g_entities;
-qboolean     g_iInThinks     = 0;
-qboolean     g_bBeforeThinks = qfalse;
-static float g_fMsecPerClock = 0;
+int           g_protocol    = 0;
+target_game_e g_target_game = target_game_e::TG_INVALID;
+gentity_t    *g_entities;
+qboolean      g_iInThinks     = 0;
+qboolean      g_bBeforeThinks = qfalse;
+static float  g_fMsecPerClock = 0;
 
 usercmd_t  *current_ucmd;
 usereyes_t *current_eyeinfo;
@@ -80,37 +83,52 @@ void (*SV_Free)(void *ptr);
 qboolean LevelArchiveValid(Archiver& arc);
 void     ClosePlayerLogFile(void);
 
+/*
+===============
+G_Printf
+===============
+*/
 void QDECL G_Printf(const char *fmt, ...)
 {
     va_list argptr;
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     gi.Printf(text);
 }
 
+/*
+===============
+G_Error
+===============
+*/
 void QDECL G_Error(const char *fmt, ...)
 {
     va_list argptr;
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     gi.Error(ERR_DROP, text);
 }
 
+/*
+===============
+G_Error
+===============
+*/
 void QDECL G_Error(int type, const char *fmt, ...)
 {
     va_list argptr;
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     // need to manually crash otherwise visual studio fuck up with the stack pointer...
@@ -209,9 +227,13 @@ void G_AllocGameData(void)
 
 void G_DeAllocGameData(void)
 {
-    // Initialize debug lines
+    // Free up debug lines
     G_DeAllocDebugLines();
 
+    // Added in OPM
+    //  Free up debug strings
+    G_DeAllocDebugStrings();
+
     // free up the entities
     if (g_entities) {
         gi.Free(g_entities);
@@ -237,7 +259,8 @@ void G_InitGame(int levelTime, int randomSeed)
     G_Printf("gamename: %s\n", GAMEVERSION);
     G_Printf("gamedate: %s\n", __DATE__);
 
-    g_protocol = gi.Cvar_Get("com_protocol", "", 0)->integer;
+    g_protocol    = gi.Cvar_Get("com_protocol", "", 0)->integer;
+    g_target_game = (target_game_e)gi.Cvar_Get("com_target_game", "0", 0)->integer;
 
     srand(randomSeed);
 
@@ -247,21 +270,17 @@ void G_InitGame(int levelTime, int randomSeed)
 
     // set some level globals
     level.svsStartTime = levelTime;
-    level.specialgame  = sv_specialgame->integer ? true : false;
-    if (level.specialgame) {
-        gi.cvar_set("protocol", "9");
-    }
 
     G_InitConsoleCommands();
 
     Director.Reset();
     Actor::Init();
-    PlayerBot::Init();
+    G_BotInit();
 
     sv_numtraces   = 0;
     sv_numpmtraces = 0;
 
-    if (developer->integer && !g_gametype->integer) {
+    if (developer->integer && g_gametype->integer == GT_SINGLE_PLAYER) {
         Viewmodel.Init();
         LODModel.Init();
     }
@@ -276,6 +295,12 @@ void G_InitGame(int levelTime, int randomSeed)
     L_InitEvents();
 
     G_AllocGameData();
+
+    if (g_target_game < TG_MOHTA) {
+        // Added in OPM
+        //  This frees alias list to avoid filling up memory
+        gi.GlobalAlias_Clear();
+    }
 }
 
 /*
@@ -287,8 +312,6 @@ G_SpawnEntities
 void G_SpawnEntities(char *entities, int svsTime)
 {
     level.SpawnEntities(entities, svsTime);
-
-    G_SpawnBots();
 }
 
 /*
@@ -320,7 +343,7 @@ void QDECL Com_Error(int level, const char *error, ...)
     char    text[1024];
 
     va_start(argptr, error);
-    vsprintf(text, error, argptr);
+    Q_vsnprintf(text, sizeof(text), error, argptr);
     va_end(argptr);
 
     G_Error("%s", text);
@@ -332,7 +355,7 @@ void QDECL Com_Printf(const char *msg, ...)
     char    text[1024];
 
     va_start(argptr, msg);
-    vsprintf(text, msg, argptr);
+    Q_vsnprintf(text, sizeof(text), msg, argptr);
     va_end(argptr);
 
     gi.DPrintf("%s", text);
@@ -359,7 +382,13 @@ Called when server finished initializating
 */
 void G_ServerSpawned(void)
 {
-    level.ServerSpawned();
+    try {
+        level.ServerSpawned();
+
+        G_BotPostInit();
+    } catch (const ScriptException& e) {
+        G_ExitWithError(e.string.c_str());
+    }
 }
 
 /*
@@ -392,7 +421,7 @@ void G_AddGEntity(gentity_t *edict, qboolean showentnums)
     }
 
     // remove the entity in case of invalid server flags
-    if ((edict->r.svFlags & SVF_NOTSINGLECLIENT) && (edict->r.svFlags & SVF_CAPSULE)) {
+    if ((edict->r.svFlags & SVF_SENDONCE) && (edict->r.svFlags & SVF_SENT)) {
         ent->PostEvent(EV_Remove, 0);
     }
 
@@ -425,7 +454,6 @@ void G_RunFrame(int levelTime, int frameTime)
     qboolean           showentnums;
     unsigned long long start;
     unsigned long long end;
-    int                i;
     static int         processed[MAX_GENTITIES] = {0};
     static int         processedFrameID         = 0;
 
@@ -455,16 +483,9 @@ void G_RunFrame(int levelTime, int frameTime)
 
         if (level.intermissiontime || level.died_already) {
             L_ProcessPendingEvents();
+            G_ClientDoBlends();
 
-            for (i = 0, edict = g_entities; i < game.maxclients; i++, edict++) {
-                if (!edict->inuse || !edict->client || !edict->entity) {
-                    continue;
-                }
-
-                edict->entity->CalcBlend();
-            }
-
-            if (g_gametype->integer && g_maxintermission->value != 0.0f) {
+            if (g_gametype->integer != GT_SINGLE_PLAYER && g_maxintermission->value != 0.0f) {
                 if (level.time - level.intermissiontime > g_maxintermission->value) {
                     level.exitintermission = true;
                 }
@@ -477,27 +498,28 @@ void G_RunFrame(int levelTime, int frameTime)
             gi.DPrintf2("====SERVER FRAME==========================================================================\n");
         }
 
-        g_bBeforeThinks  = true;
-        Director.iPaused = -1;
+        g_bBeforeThinks = true;
+        Director.AllowPause(false);
 
         // Process most of the events before the physics are run
         // so that we can affect the physics immediately
         L_ProcessPendingEvents();
 
-        Director.iPaused = 1;
+        Director.AllowPause(true);
+        Director.Pause();
         Director.SetTime(level.inttime);
 
         //
         // treat each object in turn
         //
-        for (edict = active_edicts.next, num = 0; edict != &active_edicts; edict = edict->next, num++) {
+        for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
             assert(edict);
             assert(edict->inuse);
             assert(edict->entity);
 
-            Actor *actor = (Actor *)edict->entity;
+            Actor *actor = static_cast<Actor *>(edict->entity);
             if (actor->IsSubclassOfActor()) {
-                actor->m_bUpdateAnimDoneFlags = 0;
+                actor->m_bUpdateAnimDoneFlags = false;
                 if (actor->m_bAnimating) {
                     actor->PreAnimate();
                 }
@@ -519,9 +541,13 @@ void G_RunFrame(int levelTime, int frameTime)
 
         PathManager.ShowNodes();
 
-        showentnums = (sv_showentnums->integer && (!g_gametype->integer || sv_cheats->integer));
+        showentnums = (sv_showentnums->integer && (g_gametype->integer == GT_SINGLE_PLAYER || sv_cheats->integer));
 
         g_iInThinks++;
+
+        G_UpdateSmokeSprites();
+        level.UpdateBadPlaces();
+
         processedFrameID++;
 
         if (g_entinfo->integer) {
@@ -540,28 +566,16 @@ void G_RunFrame(int levelTime, int frameTime)
             start           = clock();
         }
 
-        for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
-            if (edict->entity->IsSubclassOfBot()) {
-                G_BotThink(edict, frameTime);
-            }
-        }
+        G_BotFrame();
 
         for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
-            num = edict->s.parent;
-
-            if (num != ENTITYNUM_NONE) {
-                while (1) {
-                    if (processed[num] == processedFrameID) {
-                        break;
-                    }
-
-                    processed[num] = processedFrameID;
-                    G_AddGEntity(edict, showentnums);
-
-                    if (edict->s.parent == ENTITYNUM_NONE) {
-                        break;
-                    }
+            for (num = edict->s.parent; num != ENTITYNUM_NONE; num = g_entities[num].s.parent) {
+                if (processed[num] == processedFrameID) {
+                    break;
                 }
+
+                processed[num] = processedFrameID;
+                G_AddGEntity(&g_entities[num], showentnums);
             }
 
             if (processed[edict - g_entities] != processedFrameID) {
@@ -618,13 +632,16 @@ void G_RunFrame(int levelTime, int frameTime)
             }
         }
 
-        level.framenum++;
-
         // reset out count of the number of game traces
         sv_numtraces   = 0;
         sv_numpmtraces = 0;
 
-        G_ClientDrawBoundingBoxes();
+        level.framenum++;
+
+        if (developer->integer) {
+            G_ClientDrawBoundingBoxes();
+            G_ClientDrawTags();
+        }
 
         G_UpdateMatchEndTime();
         G_CheckExitRules();
@@ -632,7 +649,7 @@ void G_RunFrame(int levelTime, int frameTime)
 
         gi.setConfigstring(CS_WARMUP, va("%.0f", dmManager.GetMatchStartTime()));
 
-        if (g_gametype->integer) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER) {
             level.CheckVote();
         }
 
@@ -646,8 +663,54 @@ void G_RunFrame(int levelTime, int frameTime)
             }
         }
 
-        // Add or delete bots that were added using addbot/removebot
-        G_SpawnBots();
+        if (g_shownpc->integer) {
+            if (g_shownpc->integer > 1) {
+                g_shownpc->integer--;
+            } else {
+                int numActiveAllies = 0;
+                int numActiveAxis   = 0;
+                int numAllies       = 0;
+                int numAxis         = 0;
+
+                for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
+                    Actor *actor;
+
+                    if (edict->entity->IsSubclassOfActor()) {
+                        actor = static_cast<Actor *>(edict->entity);
+
+                        if (actor->health > 0) {
+                            if (actor->m_Team == TEAM_AMERICAN) {
+                                numAllies++;
+                                if (actor->m_bDoAI) {
+                                    numActiveAllies++;
+                                }
+                            } else {
+                                numAxis++;
+                                if (actor->m_bDoAI) {
+                                    numActiveAxis++;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                gi.locationprintf(
+                    &g_entities[0],
+                    94,
+                    28,
+                    va("NPCS: Allies %d(%d) Axis %d(%d)", numActiveAllies, numAllies, numActiveAxis, numAxis)
+                );
+                g_shownpc->integer = 60;
+            }
+        }
+
+        if (level.Spawned()) {
+            //
+            // Added in OPM
+            //
+            // Add or delete bots that were added using addbot/removebot
+            G_SpawnBots();
+        }
     }
 
     catch (const char *error) {
@@ -667,7 +730,7 @@ void G_ClientDrawBoundingBoxes(void)
     Vector     eye;
 
     // don't show bboxes during deathmatch
-    if ((!sv_showbboxes->integer) || (g_gametype->integer && !sv_cheats->integer)) {
+    if ((!sv_showbboxes->integer) || (g_gametype->integer != GT_SINGLE_PLAYER && !sv_cheats->integer)) {
         return;
     }
 
@@ -685,20 +748,92 @@ void G_ClientDrawBoundingBoxes(void)
     }
 }
 
+/*
+=================
+G_ClientDrawTags
+
+Added in 2.0.
+
+This draws tag position and orientation
+for entities in a radius of 1000 units.
+=================
+*/
+void G_ClientDrawTags(void)
+{
+    Entity       *player;
+    Entity       *ent;
+    const char   *tagName;
+    Vector        origin;
+    orientation_t ori;
+    int           numTags;
+    int           i;
+
+    if (!sv_showtags->string || !sv_showtags->string[0]) {
+        return;
+    }
+
+    if (sv_showtags->string[0] != '*' && !sv_showtags->string[1] && sv_showtags->integer == 0) {
+        // The variable is defined but set to 0
+        return;
+    }
+
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !sv_cheats->integer) {
+        return;
+    }
+
+    player = G_GetEntity(0);
+    origin = player->origin;
+
+    for (ent = findradius(NULL, origin, 1000); ent; ent = findradius(ent, origin, 1000)) {
+        if (!ent->edict->tiki) {
+            continue;
+        }
+
+        if (ent == player) {
+            continue;
+        }
+
+        numTags = gi.TIKI_NumTags(ent->edict->tiki);
+        for (i = 0; i < numTags; i++) {
+            tagName = gi.Tag_NameForNum(ent->edict->tiki, i);
+
+            if (Q_stricmp(sv_showtags->string, "*")) {
+                //
+                // If it's not a wildcard, check to see if
+                // the tag name partially matches
+                //
+                if (Q_stricmpn(tagName, sv_showtags->string, strlen(sv_showtags->string))) {
+                    continue;
+                }
+            }
+
+            ent->GetTagPositionAndOrientation(i, &ori);
+
+            G_DebugString(ori.origin + Vector(0, 0, 8), 1, 1, 1, 0, "%s", tagName);
+            G_DebugCircle(ori.origin, 10, 1, 1, 1, 1, true);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[0]) * 32, 1, 0, 0, 1);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[1]) * 32, 0, 1, 0, 1);
+            G_DebugLine(ori.origin, ori.origin + Vector(ori.axis[2]) * 32, 0, 0, 1, 1);
+        }
+    }
+}
+
 // Used to tell the server about the edict pose, such as the player pose
 // so that G_Trace with tracedeep will set the location
 void G_UpdatePoseInternal(gentity_t *edict)
 {
-    if (edict->s.number == ENTITYNUM_NONE || level.frame_skel_index != level.skel_index[edict->s.number]) {
-        gi.TIKI_SetPoseInternal(
-            edict->tiki,
-            edict->s.number,
-            edict->s.frameInfo,
-            edict->s.bone_tag,
-            edict->s.bone_quat,
-            edict->s.actionWeight
-        );
+    if (edict->s.number != ENTITYNUM_NONE) {
+        if (level.skel_index[edict->s.number] == level.frame_skel_index) {
+            // no need to update
+            return;
+        }
+
+        level.skel_index[edict->s.number] = level.frame_skel_index;
     }
+
+    gi.TIKI_SetPoseInternal(
+        edict->tiki, edict->s.number, edict->s.frameInfo, edict->s.bone_tag, edict->s.bone_quat, edict->s.actionWeight
+    );
 }
 
 orientation_t G_TIKI_Orientation(gentity_t *edict, int num)
@@ -726,40 +861,66 @@ qboolean G_TIKI_IsOnGround(gentity_t *edict, int num, float threshold)
 
 void G_PrepFrame(void) {}
 
-void G_RegisterSounds(void)
+void G_RegisterSoundsForFile(const char *name)
 {
     int startTime;
     int endTime;
 
-    Com_Printf("\n\n-----------PARSING UBERSOUND (SERVER)------------\n");
+    Com_Printf("\n\n-----------PARSING '%s' (SERVER)------------\n", name);
     Com_Printf(
         "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
         "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
     );
 
     startTime = gi.Milliseconds();
-    G_Command_ProcessFile("ubersound/ubersound.scr", qfalse);
+    G_Command_ProcessFile(name, qfalse);
     endTime = gi.Milliseconds();
 
     Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
-    Com_Printf("-------------UBERSOUND DONE (SERVER)---------------\n\n");
-    Com_Printf("\n\n-----------PARSING UBERDIALOG (SERVER)------------\n");
-    Com_Printf(
-        "Any SetCurrentTiki errors means that tiki wasn't prefetched and tiki-specific sounds for it won't work. To "
-        "fix prefetch the tiki. Ignore if you don't use that tiki on this level.\n"
-    );
+    Com_Printf("-------------PARSING '%s' DONE (SERVER)---------------\n\n", name);
+}
 
-    startTime = gi.Milliseconds();
-    G_Command_ProcessFile("ubersound/uberdialog.scr", qfalse);
-    endTime = gi.Milliseconds();
+int qsort_compare_strings(const void *s1, const void *s2)
+{
+    return Q_stricmp(*(const char **)s1, *(const char **)s2);
+}
 
-    Com_Printf("Parse/Load time: %f seconds.\n", (float)(endTime - startTime) / 1000.0);
-    Com_Printf("-------------UBERDIALOG DONE (SERVER)---------------\n\n");
+void G_RegisterSounds(void)
+{
+    char **fileList;
+    int    numFiles;
+    int    i;
+
+    if (g_target_game >= TG_MOHTA) {
+        gi.GlobalAlias_Clear();
+    } else if (!dedicated->integer) {
+        // In 1.11 and below, the entire ubersound folder is parsed
+        // only in dedicated mode
+        return;
+    }
+
+    fileList = gi.FS_ListFiles("ubersound/", "scr", qfalse, &numFiles);
+    qsort(fileList, numFiles, sizeof(char *), &qsort_compare_strings);
+
+    for (i = 0; i < numFiles; i++) {
+        // Added in 2.0
+        //  Since 2.0, all files in the ubersound folder
+        //  are parsed
+        G_RegisterSoundsForFile(va("ubersound/%s", fileList[i]));
+    }
+
+    gi.FS_FreeFileList(fileList);
 }
 
 void G_Restart(void)
 {
     G_InitWorldSession();
+
+    // Added in 2.0
+    G_ResetSmokeSprites();
+
+    // Added in OPM
+    G_RestartBots();
 }
 
 void G_SetFrameNumber(int framenum)
@@ -835,6 +996,7 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
     const char *bufstart;
     const char *token;
     int         numTokens = 0;
+    char        tempName[65];
 
     if (gi.FS_ReadFile(filename, (void **)&buffer, quiet) == -1) {
         return qfalse;
@@ -846,6 +1008,9 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
 
     bufstart = buffer;
 
+    Com_sprintf(tempName, sizeof(tempName), "m%s", filename);
+    gi.LoadResource(tempName);
+
     while (1) {
         // grab each line as we go
         token = COM_ParseExt(&buffer, qtrue);
@@ -882,14 +1047,14 @@ qboolean G_Command_ProcessFile(const char *filename, qboolean quiet)
 
     gi.FS_FreeFile((void *)bufstart);
 
+    Com_sprintf(tempName, sizeof(tempName), "o%s", filename);
+    gi.LoadResource(tempName);
+
     return qtrue;
 }
 
 qboolean G_AllowPaused(void)
 {
-#ifdef _DEBUG
-    return false;
-#endif
     return (!level.exitintermission) && (level.intermissiontime == 0.0f) && (!level.died_already);
 }
 
@@ -969,11 +1134,11 @@ void G_ArchivePersistant(const char *name, qboolean loading)
 
         arc.ArchiveInteger(&version);
         if (version < PERSISTANT_VERSION) {
-            gi.Printf("Persistant data from an older version (%d) of MOHAA.\n", version);
+            gi.Printf("Persistent data from an older version (%d) of MOHAA.\n", version);
             arc.Close();
             return;
         } else if (version > PERSISTANT_VERSION) {
-            gi.DPrintf("Persistant data from newer version %d of MOHAA.\n", version);
+            gi.DPrintf("Persistent data from newer version %d of MOHAA.\n", version);
             arc.Close();
             return;
         }
@@ -1156,7 +1321,9 @@ G_ArchiveLevel
 
 =================
 */
-qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loading)
+qboolean G_ArchiveLevel(
+    const char *filename, byte **savedCgameState, size_t *savedCgameStateSize, qboolean autosave, qboolean loading
+)
 {
     try {
         int         i;
@@ -1200,19 +1367,34 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             L_ArchiveEvents(arc);
         }
 
+        if (!arc.Saving()) {
+            arc.ArchiveInteger(&num);
+            *savedCgameStateSize = num;
+
+            if (*savedCgameStateSize) {
+                *savedCgameState = (byte *)gi.Malloc(*savedCgameStateSize);
+            } else {
+                *savedCgameState = NULL;
+            }
+        } else {
+            num = (int)*savedCgameStateSize;
+            arc.ArchiveInteger(&num);
+        }
+        arc.ArchiveRaw(*savedCgameState, *savedCgameStateSize);
+
         if (arc.Saving()) {
             str s;
 
             num = 0;
             for (cvar = gi.NextCvar(NULL); cvar != NULL; cvar = gi.NextCvar(cvar)) {
-                if (cvar->flags & CVAR_ROM) {
+                if (cvar->flags & CVAR_SAVEGAME) {
                     num++;
                 }
             }
 
             arc.ArchiveInteger(&num);
             for (cvar = gi.NextCvar(NULL); cvar != NULL; cvar = gi.NextCvar(cvar)) {
-                if (cvar->flags & CVAR_ROM) {
+                if (cvar->flags & CVAR_SAVEGAME) {
                     s = cvar->name;
                     arc.ArchiveString(&s);
 
@@ -1263,11 +1445,12 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
         if (arc.Saving()) {
             // count the entities
             num = 0;
-            for (i = 0; i < globals.num_entities; i++) {
-                edict = &g_entities[i];
-                if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) {
-                    num++;
+            for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
+                if (edict == world->edict || !edict->entity || (edict->entity->flags & FL_DONTSAVE)) {
+                    continue;
                 }
+
+                num++;
             }
         }
 
@@ -1279,11 +1462,12 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             // write out the world
             arc.ArchiveObject(world);
 
-            for (i = 0; i < globals.num_entities; i++) {
-				edict = &g_entities[i];
-                if (edict->inuse && edict->entity && !(edict->entity->flags & FL_DONTSAVE)) {
-                    arc.ArchiveObject(edict->entity);
+            for (edict = active_edicts.next; edict != &active_edicts; edict = edict->next) {
+                if (edict == world->edict || !edict->entity || (edict->entity->flags & FL_DONTSAVE)) {
+                    continue;
                 }
+
+                arc.ArchiveObject(edict->entity);
             }
         } else {
             // Tell the server about our data
@@ -1302,23 +1486,35 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             }
         }
 
+        //
+        // simple archived entities
+        //
+        if (!arc.Loading()) {
+            num = level.m_SimpleArchivedEntities.NumObjects();
+        }
+        arc.ArchiveInteger(&num);
+
+        if (arc.Saving()) {
+            for (i = 1; i <= num; i++) {
+                arc.ArchiveObject(level.m_SimpleArchivedEntities.ObjectAt(i));
+            }
+        } else {
+            for (i = 1; i <= num; i++) {
+                arc.ReadObject();
+            }
+        }
+
         ArchiveAliases(arc);
 
+        // Added in 2.0
+        G_ArchiveSmokeSprites(arc);
+
         currentArc = &arc;
         gi.ArchiveLevel(arc.Loading());
         currentArc = NULL;
 
         PathSearch::ArchiveDynamic(arc);
 
-        arc.Close();
-
-        if (arc.Loading()) {
-            LoadingSavegame = false;
-            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Loaded"));
-        } else {
-            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Saved"));
-        }
-
         if (arc.Loading()) {
             // Make sure all code that needs to setup the player after they have been loaded is run
 
@@ -1332,6 +1528,15 @@ qboolean G_ArchiveLevel(const char *filename, qboolean autosave, qboolean loadin
             }
         }
 
+        if (arc.Loading()) {
+            arc.Close();
+            LoadingSavegame = false;
+            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Loaded"));
+        } else {
+            arc.Close();
+            gi.Printf(HUD_MESSAGE_YELLOW "%s\n", gi.LV_ConvertString("Game Saved"));
+        }
+
         return qtrue;
     }
 
@@ -1347,10 +1552,10 @@ G_WriteLevel
 
 =================
 */
-void G_WriteLevel(const char *filename, qboolean autosave)
+void G_WriteLevel(const char *filename, qboolean autosave, byte **savedCgameState, size_t *savedCgameStateSize)
 {
     game.autosaved = autosave;
-    G_ArchiveLevel(filename, autosave, qfalse);
+    G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, autosave, qfalse);
     game.autosaved = false;
 }
 
@@ -1369,11 +1574,11 @@ calling ReadLevel.
 No clients are connected yet.
 =================
 */
-qboolean G_ReadLevel(const char *filename)
+qboolean G_ReadLevel(const char *filename, byte **savedCgameState, size_t *savedCgameStateSize)
 {
     qboolean status;
 
-    status = G_ArchiveLevel(filename, qfalse, qtrue);
+    status = G_ArchiveLevel(filename, savedCgameState, savedCgameStateSize, qfalse, qtrue);
     // if the level load failed make sure that these variables are not set
     if (!status) {
         LoadingSavegame = false;
@@ -1480,32 +1685,95 @@ void G_ClientEndServerFrames(void)
     }
 }
 
-void G_ClientDoBlends()
+/*
+===============
+G_ClientDoBlends
+===============
+*/
+void G_ClientDoBlends(void)
 {
-    // FIXME: unimplemented
+    gentity_t *edict;
+    int        i;
+
+    for (i = 0, edict = g_entities; i < game.maxclients; i++, edict++) {
+        if (!edict->inuse || !edict->client || !edict->entity) {
+            continue;
+        }
+
+        edict->entity->CalcBlend();
+    }
 }
 
-void FindIntermissionPoint()
+/*
+===============
+FindIntermissionPoint
+===============
+*/
+void FindIntermissionPoint(void)
 {
-    // FIXME: unimplemented
+    SimpleEntity *sent;
+    SimpleEntity *starget;
+    vec3_t        dir;
+
+    sent = static_cast<SimpleEntity *>(G_FindClass(NULL, "info_player_intermission"));
+    if (!sent) {
+        level.m_intermission_origin = vec_zero;
+        level.m_intermission_angle  = vec_zero;
+        return;
+    }
+
+    level.m_intermission_origin = sent->origin;
+    level.m_intermission_angle  = sent->angles;
+
+    if (!sent->target.length()) {
+        return;
+    }
+
+    starget = static_cast<SimpleEntity *>(G_FindTarget(NULL, sent->Target()));
+    if (!starget) {
+        return;
+    }
+
+    VectorSubtract(starget->origin, level.m_intermission_origin, dir);
+    vectoangles(dir, level.m_intermission_angle);
 }
 
+/*
+===============
+G_MoveClientToIntermission
+===============
+*/
 void G_MoveClientToIntermission(Entity *ent)
 {
     G_DisplayScores(ent);
     ent->flags |= FL_IMMOBILE;
 }
 
+/*
+===============
+G_DisplayScores
+===============
+*/
 void G_DisplayScores(Entity *ent)
 {
     ent->client->ps.pm_flags |= PMF_INTERMISSION;
 }
 
+/*
+===============
+G_HideScores
+===============
+*/
 void G_HideScores(Entity *ent)
 {
     ent->client->ps.pm_flags &= ~PMF_INTERMISSION;
 }
 
+/*
+===============
+G_BeginIntermission2
+===============
+*/
 void G_BeginIntermission2(void)
 {
     gentity_t *client;
@@ -1534,13 +1802,15 @@ void G_BeginIntermission2(void)
             continue;
         }
 
-        ent = client->entity;
-
-        G_DisplayScores(ent);
-        ent->flags |= FL_IMMOBILE;
+        G_MoveClientToIntermission(client->entity);
     }
 }
 
+/*
+===============
+G_BeginIntermission
+===============
+*/
 void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade)
 {
     Entity    *camera;
@@ -1549,7 +1819,7 @@ void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade
     gentity_t *client;
     int        i;
 
-    if (level.intermissiontime || g_gametype->integer) {
+    if (level.intermissiontime || g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1588,6 +1858,11 @@ void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade
     }
 }
 
+/*
+===============
+G_ExitLevel
+===============
+*/
 void G_ExitLevel(void)
 {
     static const char *seps = " ,\n\r";
@@ -1608,13 +1883,13 @@ void G_ExitLevel(void)
     Com_sprintf(command, sizeof(command), "stopsound\n");
     gi.SendConsoleCommand(command);
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         if (strlen(sv_nextmap->string)) {
             // The nextmap cvar was set (possibly by a vote - so go ahead and use it)
             level.nextmap = sv_nextmap->string;
             gi.cvar_set("nextmap", "");
-        } else // Use the next map in the maplist
-        {
+        } else {
+            // Use the next map in the maplist
             char *s, *f, *t;
 
             f = NULL;
@@ -1624,19 +1899,17 @@ void G_ExitLevel(void)
                 if (!Q_stricmp(t, level.mapname.c_str())) {
                     // it's in the list, go to the next one
                     t = strtok(NULL, seps);
-                    if (t == NULL) // end of list, go to first one
-                    {
-                        if (f == NULL) // there isn't a first one, same level
-                        {
-                            level.nextmap = level.mapname;
-                        } else {
-                            level.nextmap = f;
-                        }
-                    } else {
+                    if (t) {
                         level.nextmap = t;
+                    } else if (f) {
+                        // end of list, go to first one
+                        level.nextmap = f;
+                    } else {
+                        // there isn't a first one, same level
+                        level.nextmap = level.mapname;
                     }
-                    free(s);
-                    goto out;
+
+                    break;
                 }
 
                 // set the first map
@@ -1647,23 +1920,22 @@ void G_ExitLevel(void)
             }
             free(s);
         }
-    out:
+
         // level.nextmap should be set now, but if it isn't use the same map
         if (level.nextmap.length() == 0) {
             // Stay on the same map since no nextmap was set
             Com_sprintf(command, sizeof(command), "restart\n");
             gi.SendConsoleCommand(command);
-        }
-        else if (level.nextmap == level.mapname) {
+        } else if (level.nextmap == level.mapname) {
             // Stay on the same map if it's the same as the current map
             Com_sprintf(command, sizeof(command), "restart\n");
             gi.SendConsoleCommand(command);
-        } else if (!Q_stricmpn(level.nextmap, "vstr", 4) ) {
+        } else if (!Q_stricmpn(level.nextmap, "vstr", 4)) {
             // alias on another map
-            strcpy(command, level.nextmap);
+            Q_strncpyz(command, level.nextmap, sizeof(command));
             gi.SendConsoleCommand(command);
-        } else // use the level.nextmap variable
-        {
+        } else {
+            // use the level.nextmap variable
             Com_sprintf(command, sizeof(command), "gamemap \"%s\"\n", level.nextmap.c_str());
             gi.SendConsoleCommand(command);
         }
@@ -1690,6 +1962,11 @@ void G_ExitLevel(void)
     G_ClientEndServerFrames();
 }
 
+/*
+===============
+G_CheckIntermissionExit
+===============
+*/
 void G_CheckIntermissionExit(void)
 {
     if (!level.exitintermission && g_maxintermission->value > level.time - level.intermissiontime) {
@@ -1707,11 +1984,21 @@ void G_CheckIntermissionExit(void)
     }
 }
 
+/*
+===============
+G_ExitIntermission
+===============
+*/
 void G_ExitIntermission(void)
 {
     level.exitintermission = qtrue;
 }
 
+/*
+===============
+G_CheckStartRules
+===============
+*/
 void G_CheckStartRules(void)
 {
     if ((!dmManager.IsGameActive()) && (!dmManager.WaitingForPlayers())) {
@@ -1719,9 +2006,14 @@ void G_CheckStartRules(void)
     }
 }
 
+/*
+===============
+G_CheckExitRules
+===============
+*/
 void G_CheckExitRules(void)
 {
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         if (level.intermissiontime == 0.0f) {
             dmManager.CheckEndMatch();
         } else {
@@ -1730,6 +2022,11 @@ void G_CheckExitRules(void)
     }
 }
 
+/*
+===============
+G_DisplayScoresToAllClients
+===============
+*/
 void G_DisplayScoresToAllClients(void)
 {
     gentity_t *ent;
@@ -1744,6 +2041,11 @@ void G_DisplayScoresToAllClients(void)
     }
 }
 
+/*
+===============
+G_HideScoresToAllClients
+===============
+*/
 void G_HideScoresToAllClients(void)
 {
     gentity_t *ent;
@@ -1757,107 +2059,3 @@ void G_HideScoresToAllClients(void)
         G_HideScores(ent->entity);
     }
 }
-
-#ifndef WIN32
-
-#    include <signal.h>
-#    include <sys/mman.h>
-
-struct sigaction origSignalActions[NSIG];
-
-int backtrace(void **buffer, int size)
-{
-    return 0;
-}
-
-char **backtrace_symbols(void *const *buffer, int size)
-{
-    return nullptr;
-}
-
-void backtrace_symbols_fd(void *const *buffer, int size, int fd) {}
-
-void resetsighandlers(void)
-{
-    sigaction(SIGSEGV, &origSignalActions[SIGSEGV], NULL);
-    sigaction(SIGFPE, &origSignalActions[SIGFPE], NULL);
-    sigaction(SIGILL, &origSignalActions[SIGILL], NULL);
-    sigaction(SIGBUS, &origSignalActions[SIGBUS], NULL);
-    sigaction(SIGABRT, &origSignalActions[SIGABRT], NULL);
-    sigaction(SIGSYS, &origSignalActions[SIGSYS], NULL);
-}
-
-void sighandler(int sig, siginfo_t *info, void *secret)
-{
-    void  *trace[100];
-    char **messages = (char **)NULL;
-    int    i, trace_size = 0;
-    //ucontext_t *uc = (ucontext_t *)secret;
-
-    char *signame = strsignal(sig);
-
-    /* Do something useful with siginfo_t */
-    if (sig == SIGSEGV) {
-        printf("Got signal %d - %s, faulty address is %p\n", sig, signame, info->si_addr);
-
-        if (gi.Printf != NULL) {
-            gi.Printf("Got signal %d - %s, faulty address is %p\n", sig, signame, info->si_addr);
-        }
-    } else {
-        if (gi.Printf != NULL) {
-            gi.Printf("Got signal %d - %s\n", sig, signame);
-        } else {
-            printf("Got signal %d - %s\n", sig, signame);
-        }
-    }
-
-    trace_size = backtrace(trace, 100);
-
-    /* overwrite sigaction with caller's address */
-    //trace[1] = (void *) uc->uc_mcontext.gregs[REG_EIP];
-
-    messages = (char **)(long)backtrace_symbols(trace, trace_size);
-
-    printf("Execution path:\n");
-
-    if (gi.Printf != NULL) {
-        gi.Printf("Execution path:\n");
-    }
-
-    for (i = 1; i < trace_size; ++i) { /* skip first stack frame (points here) */
-        printf(" --> %s\n", messages[i]);
-
-        if (gi.Printf != NULL) {
-            gi.Printf(" --> %s\n", messages[i]);
-        }
-    }
-
-    resetsighandlers(
-    ); // reset original MOHAA or default signal handlers, so no more signals are handled by this handler (a signal is considered to be a fatal program error, the original implementations should exit)
-
-    raise(sig);
-}
-
-void initsighandlers(void)
-{
-    /* Install our signal handlers */
-    struct sigaction sa;
-
-    sa.sa_sigaction = sighandler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_RESTART | SA_SIGINFO;
-
-    sigaction(SIGSEGV, &sa, &origSignalActions[SIGSEGV]);
-    sigaction(SIGFPE, &sa, &origSignalActions[SIGFPE]);
-    sigaction(SIGILL, &sa, &origSignalActions[SIGILL]);
-    sigaction(SIGBUS, &sa, &origSignalActions[SIGBUS]);
-    sigaction(SIGABRT, &sa, &origSignalActions[SIGABRT]);
-    sigaction(SIGSYS, &sa, &origSignalActions[SIGSYS]);
-}
-
-void __attribute__((constructor)) load(void)
-{
-    initsighandlers();
-}
-
-#endif
diff --git a/code/fgame/g_main.h b/code/fgame/g_main.h
index 98f40509..7f57e781 100644
--- a/code/fgame/g_main.h
+++ b/code/fgame/g_main.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 // g_main.h -- Global header file for g_main.cpp
 
-#ifndef __G_MAIN_H__
-#define __G_MAIN_H__
+#pragma once
 
 #include "g_local.h"
 #include "gamecvars.h"
@@ -35,6 +34,7 @@ extern qboolean      LoadingServer;
 extern game_import_t gi;
 extern game_export_t globals;
 extern int           g_protocol;
+extern target_game_e g_target_game;
 
 extern qboolean g_iInThinks;
 extern qboolean g_bBeforeThinks;
@@ -53,5 +53,4 @@ void G_ExitWithError(const char *error);
 void G_AllocGameData(void);
 void G_DeAllocGameData(void);
 void G_ClientDrawBoundingBoxes(void);
-
-#endif /* g_main.h */
+void G_ClientDrawTags(void);
diff --git a/code/fgame/g_mmove.cpp b/code/fgame/g_mmove.cpp
index 7d7ecbaa..785324c4 100644
--- a/code/fgame/g_mmove.cpp
+++ b/code/fgame/g_mmove.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,591 +28,548 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "game.h"
 
 typedef struct {
-	qboolean		validGroundTrace;
-	trace_t			groundTrace;
-	float			previous_origin[ 3 ];
-	float			previous_velocity[ 3 ];
+    qboolean validGroundTrace;
+    trace_t  groundTrace;
+    float    previous_origin[3];
+    float    previous_velocity[3];
 } mml_t;
 
 mmove_t *mm;
-mml_t mml;
+mml_t    mml;
 
-void MM_ClipVelocity
-	(
-	float *in,
-	float *normal,
-	float *out,
-	float overbounce
-	)
+void MM_ClipVelocity(float *in, float *normal, float *out, float overbounce)
 {
-	float backoff;
-	float dir_z;
-	float normal2[ 3 ];
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	if( normal[ 2 ] >= 0.70f )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    if (normal[2] >= MIN_WALK_NORMAL) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-		normal2[ 0 ] = in[ 0 ] + DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] + DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-		VectorNormalize( normal2 );
+        VectorNormalize(normal2);
 
-		dir_z = -normal2[ 2 ];
+        dir_z = -normal2[2];
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / dir_z;
-	}
-	else
-	{
-		backoff = DotProduct( in, normal );
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / dir_z;
+    } else {
+        backoff = DotProduct(in, normal);
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = in[ 2 ] - normal[ 2 ] * backoff;
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = in[2] - normal[2] * backoff;
+    }
 }
 
-qboolean MM_AddTouchEnt
-	(
-	int entityNum
-	)
+qboolean MM_AddTouchEnt(int entityNum)
 {
-	int			i;
-	qboolean	blockEnt;
-	Entity		*ent;
+    int      i;
+    qboolean blockEnt;
+    Entity  *ent;
 
-	if( entityNum == ENTITYNUM_NONE || entityNum == ENTITYNUM_WORLD ) {
-		return qtrue;
-	}
+    if (entityNum == ENTITYNUM_NONE || entityNum == ENTITYNUM_WORLD) {
+        return qtrue;
+    }
 
-	ent = G_GetEntity( entityNum );
+    ent = G_GetEntity(entityNum);
 
-	blockEnt = ent->BlocksAIMovement();
+    blockEnt = ent->BlocksAIMovement();
 
-	if( !blockEnt )
-	{
-		if( ent->IsSubclassOfPlayer() )
-		{
-			mm->hit_temp_obstacle |= 1;
-		}
-		else if( ent->IsSubclassOfDoor() )
-		{
-			mm->hit_temp_obstacle |= 2;
-		}
-	}
+    if (!blockEnt) {
+        if (ent->IsSubclassOfPlayer()) {
+            mm->hit_temp_obstacle |= 1;
+        } else if (ent->IsSubclassOfDoor()) {
+            mm->hit_temp_obstacle |= 2;
+        }
+    }
 
-	// see if it is already added
-	for( i = 0; i < mm->numtouch; i++ )
-	{
-		if( mm->touchents[ i ] == entityNum )
-			return blockEnt;
-	}
+    if (mm->numtouch == MAXTOUCH) {
+        return blockEnt;
+    }
 
-	// add it
-	mm->touchents[ mm->numtouch ] = entityNum;
-	mm->numtouch++;
+    // see if it is already added
+    for (i = 0; i < mm->numtouch; i++) {
+        if (mm->touchents[i] == entityNum) {
+            return blockEnt;
+        }
+    }
 
-	return blockEnt;
+    // add it
+    mm->touchents[mm->numtouch] = entityNum;
+    mm->numtouch++;
+
+    return blockEnt;
 }
 
-qboolean MM_SlideMove
-	(
-	qboolean gravity
-	)
+qboolean MM_SlideMove(qboolean gravity)
 {
-	int bumpcount;
-	vec3_t dir;
-	float d;
-	int numplanes;
-	vec3_t planes[ 5 ];
-	vec3_t clipVelocity;
-	int i;
-	int j;
-	int k;
-	trace_t trace;
-	vec3_t end;
-	float time_left;
-	qboolean bBlockEnt;
+    int      bumpcount;
+    vec3_t   dir;
+    float    d;
+    int      numplanes;
+    vec3_t   planes[5];
+    vec3_t   clipVelocity;
+    int      i;
+    int      j;
+    int      k;
+    trace_t  trace;
+    vec3_t   end;
+    float    time_left;
+    qboolean bBlockEnt;
 
-	if( gravity )
-	{
-		mm->velocity[ 2 ] = mm->velocity[ 2 ] - mm->frametime * sv_gravity->integer;
-		if( mm->groundPlane )
-			MM_ClipVelocity( mm->velocity, mm->groundPlaneNormal, mm->velocity, OVERCLIP );
-	}
+    if (gravity) {
+        mm->velocity[2] = mm->velocity[2] - mm->frametime * sv_gravity->integer;
+        if (mm->groundPlane) {
+            MM_ClipVelocity(mm->velocity, mm->groundPlaneNormal, mm->velocity, OVERCLIP);
+        }
+    }
 
-	time_left = mm->frametime;
+    time_left = mm->frametime;
 
-	if( mm->groundPlane ) {
-		numplanes = 1;
-		VectorCopy( mm->groundPlaneNormal, planes[ 0 ] );
-	} else {
-		numplanes = 0;
-	}
+    if (mm->groundPlane) {
+        numplanes = 1;
+        VectorCopy(mm->groundPlaneNormal, planes[0]);
+    } else {
+        numplanes = 0;
+    }
 
-	// never turn against original velocity
-	VectorNormalize2( mm->velocity, planes[ numplanes ] );
-	numplanes++;
+    // never turn against original velocity
+    VectorNormalize2(mm->velocity, planes[numplanes]);
+    numplanes++;
 
-	for( bumpcount = 0; bumpcount < 4; bumpcount++ )
-	{
-		// calculate position we are trying to move to
-		VectorMA( mm->origin, time_left, mm->velocity, end );
+    for (bumpcount = 0; bumpcount < 4; bumpcount++) {
+        // calculate position we are trying to move to
+        VectorMA(mm->origin, time_left, mm->velocity, end);
 
-		// see if we can make it there
-		gi.trace( &trace, mm->origin, mm->mins, mm->maxs, end, mm->entityNum, mm->tracemask, qtrue, qfalse );
+        // see if we can make it there
+        gi.trace(&trace, mm->origin, mm->mins, mm->maxs, end, mm->entityNum, mm->tracemask, qtrue, qfalse);
 
-		if( trace.allsolid )
-			break;
+        if (trace.allsolid) {
+            break;
+        }
 
-		if( trace.fraction > 0 ) {
-			// actually covered some distance
-			VectorCopy( trace.endpos, mm->origin );
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            VectorCopy(trace.endpos, mm->origin);
+        }
 
-		if( trace.fraction == 1 )
-			return bumpcount != 0;
+        if (trace.fraction == 1) {
+            return bumpcount != 0;
+        }
 
-		// save entity for contact
-		bBlockEnt = MM_AddTouchEnt( trace.entityNum );
+        // save entity for contact
+        bBlockEnt = MM_AddTouchEnt(trace.entityNum);
 
-		if( trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-		{
-			if( trace.plane.normal[ 2 ] > -0.999f && bBlockEnt && mm->groundPlane )
-			{
-				if( !mm->hit_obstacle )
-				{
-					mm->hit_obstacle = true;
-					VectorCopy( mm->origin, mm->hit_origin );
-				}
+        if (trace.plane.normal[2] < MIN_WALK_NORMAL) {
+            if (trace.plane.normal[2] > -0.999f && bBlockEnt && mm->groundPlane) {
+                if (!mm->hit_obstacle) {
+                    mm->hit_obstacle = true;
+                    VectorCopy(mm->origin, mm->hit_origin);
+                }
 
-				VectorAdd( mm->obstacle_normal, trace.plane.normal, mm->obstacle_normal );
-			}
-		}
-		else
-		{
-			memcpy( &mml.groundTrace, &trace, sizeof( mml.groundTrace ) );
-			mml.validGroundTrace = true;
-		}
+                VectorAdd(mm->obstacle_normal, trace.plane.normal, mm->obstacle_normal);
+            }
+        } else {
+            memcpy(&mml.groundTrace, &trace, sizeof(mml.groundTrace));
+            mml.validGroundTrace = true;
+        }
 
-		time_left -= time_left * trace.fraction;
+        time_left -= time_left * trace.fraction;
 
-		if( numplanes >= MAX_CLIP_PLANES )
-		{
-			VectorClear( mm->velocity );
-			return qtrue;
-		}
+        if (numplanes >= MAX_CLIP_PLANES) {
+            VectorClear(mm->velocity);
+            return qtrue;
+        }
 
-		//
-		// if this is the same plane we hit before, nudge velocity
-		// out along it, which fixes some epsilon issues with
-		// non-axial planes
-		//
-		for( i = 0; i < numplanes; i++ )
-		{
-			if( DotProduct( trace.plane.normal, planes[ i ] ) > 0.99 )
-			{
-				VectorAdd( trace.plane.normal, mm->velocity, mm->velocity );
-				break;
-			}
-		}
+        //
+        // if this is the same plane we hit before, nudge velocity
+        // out along it, which fixes some epsilon issues with
+        // non-axial planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            if (DotProduct(trace.plane.normal, planes[i]) > 0.99) {
+                VectorAdd(trace.plane.normal, mm->velocity, mm->velocity);
+                break;
+            }
+        }
 
-		if( i >= numplanes )
-		{
-			//
-			// modify velocity so it parallels all of the clip planes
-			//
+        if (i >= numplanes) {
+            //
+            // modify velocity so it parallels all of the clip planes
+            //
+            VectorCopy(trace.plane.normal, planes[numplanes]);
+            numplanes++;
 
-			// find a plane that it enters
-			for( i = 0; i < numplanes; i++ )
-			{
-				if( DotProduct( mm->velocity, planes[ i ] ) >= 0.1 ) {
-					continue;		// move doesn't interact with the plane
-				}
+            // find a plane that it enters
+            for (i = 0; i < numplanes; i++) {
+                if (DotProduct(mm->velocity, planes[i]) >= 0.1) {
+                    continue; // move doesn't interact with the plane
+                }
 
-				// slide along the plane
-				MM_ClipVelocity( mm->velocity, planes[ i ], clipVelocity, OVERCLIP );
+                // slide along the plane
+                MM_ClipVelocity(mm->velocity, planes[i], clipVelocity, OVERCLIP);
 
-				// see if there is a second plane that the new move enters
-				for( j = 0; j < numplanes; j++ )
-				{
-					if( j == i ) {
-						continue;
-					}
+                // see if there is a second plane that the new move enters
+                for (j = 0; j < numplanes; j++) {
+                    if (j == i) {
+                        continue;
+                    }
 
-					// slide along the plane
-					MM_ClipVelocity( mm->velocity, planes[ j ], clipVelocity, OVERCLIP );
+                    if (DotProduct(clipVelocity, planes[j]) >= 0.1) { 
+                        continue; // move doesn't interact with the plane
+                    }
 
-					if( DotProduct( clipVelocity, planes[ j ] ) >= 0.0f ) {
-						continue;		// move doesn't interact with the plane
-					}
+                    // slide along the plane
+                    MM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
 
-					// slide the original velocity along the crease
-					CrossProduct( planes[ i ], planes[ j ], dir );
-					VectorNormalize( dir );
-					d = DotProduct( dir, mm->velocity );
-					VectorScale( dir, d, clipVelocity );
+                    if (DotProduct(clipVelocity, planes[i]) >= 0) {
+                        continue; // move doesn't interact with the plane
+                    }
 
-					// see if there is a third plane the the new move enters
-					for( k = 0; k < numplanes; k++ )
-					{
-						if( k == i || k == j ) {
-							continue;
-						}
+                    // slide the original velocity along the crease
+                    CrossProduct(planes[i], planes[j], dir);
+                    VectorNormalize(dir);
+                    d = DotProduct(dir, mm->velocity);
+                    VectorScale(dir, d, clipVelocity);
 
-						if( DotProduct( clipVelocity, planes[ k ] ) >= 0.1f ) {
-							continue;		// move doesn't interact with the plane
-						}
+                    // see if there is a third plane the the new move enters
+                    for (k = 0; k < numplanes; k++) {
+                        if (k == i || k == j) {
+                            continue;
+                        }
 
-						// stop dead at a tripple plane interaction
-						VectorClear( mm->velocity );
-						return qtrue;
-					}
-				}
+                        if (DotProduct(clipVelocity, planes[k]) >= 0.1) {
+                            continue; // move doesn't interact with the plane
+                        }
 
-				// if we have fixed all interactions, try another move
-				VectorCopy( clipVelocity, mm->velocity );
-				break;
-			}
-		}
-	}
+                        // stop dead at a tripple plane interaction
+                        VectorClear(mm->velocity);
+                        return qtrue;
+                    }
+                }
 
-	if( mm->velocity[ 0 ] || mm->velocity[ 1 ] )
-	{
-		if( mm->groundPlane )
-		{
-			VectorCopy( mm->velocity, dir );
-			VectorNegate( dir, dir );
-			VectorNormalize( dir );
+                // if we have fixed all interactions, try another move
+                VectorCopy(clipVelocity, mm->velocity);
+                break;
+            }
+        }
+    }
 
-			if( MM_AddTouchEnt( trace.entityNum ) )
-			{
-				if( !mm->hit_obstacle )
-				{
-					mm->hit_obstacle = true;
-					VectorCopy( mm->origin, mm->hit_origin );
-				}
+    if (mm->velocity[0] || mm->velocity[1]) {
+        if (mm->groundPlane) {
+            VectorCopy(mm->velocity, dir);
+            VectorNegate(dir, dir);
+            VectorNormalize(dir);
 
-				VectorAdd( mm->obstacle_normal, dir, mm->obstacle_normal );
-			}
-		}
+            if (MM_AddTouchEnt(trace.entityNum)) {
+                if (!mm->hit_obstacle) {
+                    mm->hit_obstacle = true;
+                    VectorCopy(mm->origin, mm->hit_origin);
+                }
 
-		VectorClear( mm->velocity );
-		return true;
-	}
+                VectorAdd(mm->obstacle_normal, dir, mm->obstacle_normal);
+            }
+        }
 
-	mm->velocity[ 2 ] = 0;
-	return false;
+        VectorClear(mm->velocity);
+        return true;
+    }
+
+    mm->velocity[2] = 0;
+    return false;
 }
 
-void MM_GroundTraceInternal
-	(
-	void
-	)
+void MM_GroundTraceInternal(void)
 {
-	if( mml.groundTrace.fraction == 1.0f )
-	{
-		mm->groundPlane = qfalse;
-		mm->walking = qfalse;
-		return;
-	}
+    if (mml.groundTrace.fraction == 1.0f) {
+        mm->groundPlane = qfalse;
+        mm->walking     = qfalse;
+        return;
+    }
 
-	if( mm->velocity[ 2 ] > 0.0f )
-	{
-		if( DotProduct( mm->velocity, mml.groundTrace.plane.normal ) > 10.0f )
-		{
-			mm->groundPlane = qfalse;
-			mm->walking = qfalse;
-			return;
-		}
-	}
+    if (mm->velocity[2] > 0.0f) {
+        if (DotProduct(mm->velocity, mml.groundTrace.plane.normal) > 10.0f) {
+            mm->groundPlane = qfalse;
+            mm->walking     = qfalse;
+            return;
+        }
+    }
 
-	// slopes that are too steep will not be considered onground
-	if( mml.groundTrace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-	{
-		vec3_t oldvel;
-		float d;
+    // slopes that are too steep will not be considered onground
+    if (mml.groundTrace.plane.normal[2] < MIN_WALK_NORMAL) {
+        vec3_t oldvel;
+        float  d;
 
-		VectorCopy( mm->velocity, oldvel );
-		VectorSet( mm->velocity, 0, 0, -1.0f / mm->frametime );
-		MM_SlideMove( qfalse );
+        VectorCopy(mm->velocity, oldvel);
+        VectorSet(mm->velocity, 0, 0, -1.0f / mm->frametime);
+        MM_SlideMove(qfalse);
 
-		d = VectorLength( mm->velocity );
-		VectorCopy( oldvel, mm->velocity );
+        d = VectorLength(mm->velocity);
+        VectorCopy(oldvel, mm->velocity);
 
-		if( d > ( 0.1f / mm->frametime ) )
-		{
-			mm->groundPlane = qtrue;
-			mm->walking = qfalse;
-			VectorCopy( mml.groundTrace.plane.normal, mm->groundPlaneNormal );
-			return;
-		}
-	}
+        if (d > (0.1f / mm->frametime)) {
+            mm->groundPlane = qtrue;
+            mm->walking     = qfalse;
+            VectorCopy(mml.groundTrace.plane.normal, mm->groundPlaneNormal);
+            return;
+        }
+    }
 
-	mm->groundPlane = qtrue;
-	mm->walking = qtrue;
-	VectorCopy( mml.groundTrace.plane.normal, mm->groundPlaneNormal );
+    mm->groundPlane = qtrue;
+    mm->walking     = qtrue;
+    VectorCopy(mml.groundTrace.plane.normal, mm->groundPlaneNormal);
 
-	MM_AddTouchEnt( mml.groundTrace.entityNum );
+    MM_AddTouchEnt(mml.groundTrace.entityNum);
 }
 
-void MM_GroundTrace
-	(
-	void
-	)
+void MM_GroundTrace(void)
 {
-	float point[ 3 ];
+    float point[3];
 
-	point[ 0 ] = mm->origin[ 0 ];
-	point[ 1 ] = mm->origin[ 1 ];
-	point[ 2 ] = mm->origin[ 2 ] - 0.25f;
+    point[0] = mm->origin[0];
+    point[1] = mm->origin[1];
+    point[2] = mm->origin[2] - 0.25f;
 
-	gi.trace( &mml.groundTrace, mm->origin, mm->mins, mm->maxs, point, mm->entityNum, mm->tracemask, qtrue, qfalse );
-	MM_GroundTraceInternal();
+    gi.trace(&mml.groundTrace, mm->origin, mm->mins, mm->maxs, point, mm->entityNum, mm->tracemask, qtrue, qfalse);
+    MM_GroundTraceInternal();
 }
 
-void MM_StepSlideMove
-	(
-	void
-	)
+void MM_StepSlideMove(void)
 {
-	vec3_t start_o;
-	vec3_t start_v;
-	vec3_t nostep_o;
-	vec3_t nostep_v;
-	trace_t trace;
-	qboolean bWasOnGoodGround;
-	vec3_t up;
-	vec3_t down;
-	qboolean start_hit_wall;
-	vec3_t start_wall_normal;
-	qboolean first_hit_wall;
-	vec3_t first_wall_normal;
-	vec3_t start_hit_origin;
-	vec3_t first_hit_origin;
-	trace_t nostep_groundTrace;
+    vec3_t   start_o;
+    vec3_t   start_v;
+    vec3_t   nostep_o;
+    vec3_t   nostep_v;
+    trace_t  trace;
+    qboolean bWasOnGoodGround;
+    vec3_t   up;
+    vec3_t   down;
+    qboolean start_hit_wall;
+    vec3_t   start_wall_normal;
+    qboolean first_hit_wall;
+    vec3_t   first_wall_normal;
+    vec3_t   start_hit_origin;
+    vec3_t   first_hit_origin;
+    trace_t  nostep_groundTrace;
+    qboolean nostep_validGroundTrace;
 
-	VectorCopy( mm->origin, start_o );
-	VectorCopy( mm->velocity, start_v );
-	start_hit_wall = mm->hit_obstacle;
-	VectorCopy( mm->hit_origin, start_hit_origin );
-	VectorCopy( mm->obstacle_normal, start_wall_normal );
+    VectorCopy(mm->origin, start_o);
+    VectorCopy(mm->velocity, start_v);
+    start_hit_wall = mm->hit_obstacle;
+    VectorCopy(mm->hit_origin, start_hit_origin);
+    VectorCopy(mm->obstacle_normal, start_wall_normal);
 
-	if( MM_SlideMove( qtrue ) == 0 )
-	{
-		if( !mml.validGroundTrace )
-			MM_GroundTrace();
+    if (MM_SlideMove(qtrue) == 0) {
+        if (mml.validGroundTrace) {
+            MM_GroundTraceInternal();
+        } else {
+            MM_GroundTrace();
+        }
 
-		return;
-	}
+        return;
+    }
 
-	VectorCopy( start_o, down );
-	down[ 2 ] -= STEPSIZE;
-	gi.trace( &trace, start_o, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse );
-	VectorSet( up, 0, 0, 1 );
+    VectorCopy(start_o, down);
+    down[2] -= STEPSIZE;
+    gi.trace(&trace, start_o, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse);
+    VectorSet(up, 0, 0, 1);
 
-	// never step up when you still have up velocity
-	if( mm->velocity[ 2 ] > 0 && ( trace.fraction == 1.0f ||
-		DotProduct( trace.plane.normal, up ) < MIN_WALK_NORMAL ) )
-	{
-		if( !mml.validGroundTrace )
-			MM_GroundTrace();
-		else
-			MM_GroundTraceInternal();
+    // never step up when you still have up velocity
+    if (mm->velocity[2] > 0 && (trace.fraction == 1.0f || DotProduct(trace.plane.normal, up) < MIN_WALK_NORMAL)) {
+        if (mml.validGroundTrace) {
+            MM_GroundTraceInternal();
+        } else {
+            MM_GroundTrace();
+        }
 
-		return;
-	}
+        return;
+    }
 
-	if( mm->groundPlane && mm->groundPlaneNormal[ 2 ] >= MIN_WALK_NORMAL )
-		bWasOnGoodGround = qtrue;
-	else
-		bWasOnGoodGround = qfalse;
+    if (mm->groundPlane && mm->groundPlaneNormal[2] >= MIN_WALK_NORMAL) {
+        bWasOnGoodGround = qtrue;
+    } else {
+        bWasOnGoodGround = qfalse;
+    }
 
-	VectorCopy( mm->origin, nostep_o );
-	VectorCopy( mm->velocity, nostep_v );
-	memcpy( &nostep_groundTrace, &mml.groundTrace, sizeof( trace_t ) );
+    VectorCopy(start_o, up);
+    up[2] += 18;
 
-	VectorCopy( start_o, mm->origin );
-	VectorCopy( start_v, mm->velocity );
+    VectorCopy(mm->origin, nostep_o);
+    VectorCopy(mm->velocity, nostep_v);
+    memcpy(&nostep_groundTrace, &mml.groundTrace, sizeof(trace_t));
+    // Fixed in OPM
+    //  Save the valid ground trace
+    nostep_validGroundTrace = mml.validGroundTrace;
 
-	first_hit_wall = mm->hit_obstacle;
-	VectorCopy( mm->hit_origin, first_hit_origin );
-	VectorCopy( mm->obstacle_normal, first_wall_normal );
+    VectorCopy(up, mm->origin);
+    VectorCopy(start_v, mm->velocity);
 
-	mm->hit_obstacle = start_hit_wall;
-	VectorCopy( start_hit_origin, mm->hit_origin );
-	VectorCopy( start_wall_normal, mm->obstacle_normal );
-	MM_SlideMove( qtrue );
+    first_hit_wall = mm->hit_obstacle;
+    VectorCopy(mm->hit_origin, first_hit_origin);
+    VectorCopy(mm->obstacle_normal, first_wall_normal);
 
-	VectorCopy( mm->origin, down );
-	down[ 2 ] -= STEPSIZE * 2;
+    mm->hit_obstacle = start_hit_wall;
+    VectorCopy(start_hit_origin, mm->hit_origin);
+    VectorCopy(start_wall_normal, mm->obstacle_normal);
+    MM_SlideMove(qtrue);
 
-	// test the player position if they were a stepheight higher
-	gi.trace( &trace, up, mm->mins, mm->maxs, up, mm->entityNum, mm->tracemask, qtrue, qfalse );
-	if( trace.entityNum > ENTITYNUM_NONE )
-	{
-		VectorCopy( nostep_o, mm->origin );
-		VectorCopy( nostep_v, mm->velocity );
-		memcpy( &mml.groundTrace, &nostep_groundTrace, sizeof( mml.groundTrace ) );
-		mm->hit_obstacle = first_hit_wall;
-		VectorCopy( first_hit_origin, mm->hit_origin );
-		VectorCopy( first_wall_normal, mm->obstacle_normal );
+    VectorCopy(mm->origin, down);
+    down[2] -= STEPSIZE * 2;
 
-		if( !mml.validGroundTrace )
-			MM_GroundTrace();
-		else
-			MM_GroundTraceInternal();
+    // test the player position if they were a stepheight higher
+    gi.trace(&trace, mm->origin, mm->mins, mm->maxs, down, mm->entityNum, mm->tracemask, qtrue, qfalse);
+    if (trace.entityNum != ENTITYNUM_WORLD && trace.entityNum != ENTITYNUM_NONE) {
+        VectorCopy(nostep_o, mm->origin);
+        VectorCopy(nostep_v, mm->velocity);
+        memcpy(&mml.groundTrace, &nostep_groundTrace, sizeof(mml.groundTrace));
+        // Fixed in OPM
+        //  Do not use the ground trace as it's invalid and would have an invalid entity number
+        mml.validGroundTrace = nostep_validGroundTrace;
 
-		return;
-	}
-	
-	if( !trace.allsolid )
-	{
-		memcpy( &mml.groundTrace, &trace, sizeof( mml.groundTrace ) );
-		mml.validGroundTrace = qtrue;
+        mm->hit_obstacle = first_hit_wall;
+        VectorCopy(first_hit_origin, mm->hit_origin);
+        VectorCopy(first_wall_normal, mm->obstacle_normal);
 
-		if( bWasOnGoodGround && trace.fraction && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-		{
-			VectorCopy( nostep_o, mm->origin );
-			VectorCopy( nostep_v, mm->velocity );
+        if (mml.validGroundTrace) {
+            MM_GroundTraceInternal();
+        } else {
+            MM_GroundTrace();
+        }
 
-			if( first_hit_wall )
-			{
-				mm->hit_obstacle = first_hit_wall;
-				VectorCopy( first_hit_origin, mm->hit_origin );
-				VectorCopy( first_wall_normal, mm->obstacle_normal );
-			}
+        return;
+    }
 
-			MM_GroundTraceInternal();
-			return;
-		}
+    if (!trace.allsolid) {
+        memcpy(&mml.groundTrace, &trace, sizeof(mml.groundTrace));
+        mml.validGroundTrace = qtrue;
 
-		VectorCopy( trace.endpos, mm->origin );
-	}
+        if (bWasOnGoodGround && trace.fraction < 1 && trace.plane.normal[2] < MIN_WALK_NORMAL) {
+            VectorCopy(nostep_o, mm->origin);
+            VectorCopy(nostep_v, mm->velocity);
 
-	if( trace.fraction < 1.0f )
-		MM_ClipVelocity( mm->velocity, trace.plane.normal, mm->velocity, OVERCLIP );
+            if (first_hit_wall) {
+                mm->hit_obstacle = first_hit_wall;
+                VectorCopy(first_hit_origin, mm->hit_origin);
+                VectorCopy(first_wall_normal, mm->obstacle_normal);
+            }
 
-	if( !mml.validGroundTrace )
-		MM_GroundTrace();
-	else
-		MM_GroundTraceInternal();
+            MM_GroundTraceInternal();
+            return;
+        }
+
+        VectorCopy(trace.endpos, mm->origin);
+    }
+
+    if (trace.fraction < 1) {
+        MM_ClipVelocity(mm->velocity, trace.plane.normal, mm->velocity, OVERCLIP);
+    }
+
+    if (mml.validGroundTrace) {
+        MM_GroundTraceInternal();
+    } else {
+        MM_GroundTrace();
+    }
 }
 
-void MM_ClipVelocity2D
-	(
-	float *in,
-	float *normal,
-	float *out,
-	float overbounce
-	)
+void MM_ClipVelocity2D(float *in, float *normal, float *out, float overbounce)
 {
-	float backoff;
-	float dir_z;
-	float normal2[ 3 ];
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	if( normal[ 2 ] >= 0.70f )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    if (normal[2] >= MIN_WALK_NORMAL) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-		normal2[ 0 ] = in[ 0 ] + DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] + DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+        normal2[0] = in[0] * DotProduct2D(in, normal);
+        normal2[1] = in[1] * DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-		VectorNormalize( normal2 );
+        VectorNormalize(normal2);
 
-		dir_z = -normal2[ 2 ];
+        dir_z = -normal2[2];
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / -normal2[ 2 ];
-	}
-	else
-	{
-		backoff = DotProduct2D( in, normal );
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / dir_z;
+    } else {
+        backoff = DotProduct2D(in, normal);
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = -( backoff * normal[ 2 ] );
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = -(backoff * normal[2]);
+    }
 }
 
-void MmoveSingle
-	(
-	mmove_t *mmove
-	)
+void MmoveSingle(mmove_t *mmove)
 {
-	float point[ 3 ];
-	trace_t trace;
+    float   point[3];
+    trace_t trace;
 
-	mm = mmove;
+    mm = mmove;
 
-	mmove->hit_obstacle = false;
-	mmove->numtouch = false;
-	VectorCopy( vec_origin, mmove->obstacle_normal );
-	mmove->hit_temp_obstacle = false;
+    mmove->numtouch  = 0;
+    mm->hit_obstacle = false;
+    VectorCopy(vec3_origin, mm->obstacle_normal);
+    mm->hit_temp_obstacle = false;
 
-	memset( &mml, 0, sizeof( mml_t ) );
+    memset(&mml, 0, sizeof(mml_t));
 
-	VectorCopy( mmove->origin, mml.previous_origin );
-	VectorCopy( mmove->velocity, mml.previous_velocity );
+    VectorCopy(mm->origin, mml.previous_origin);
+    VectorCopy(mm->velocity, mml.previous_velocity);
 
-	if( mmove->walking )
-	{
-		if( mmove->desired_speed < 1.0f )
-		{
-			MM_GroundTrace();
-			return;
-		}
+    if (mm->walking) {
+        if (mm->desired_speed < 1.0f) {
+            VectorClear2D(mm->velocity);
+            MM_GroundTrace();
+            return;
+        }
 
-		float wishdir[ 3 ];
+        vec3_t wishdir;
 
-		MM_ClipVelocity2D( mm->desired_dir, mm->groundPlaneNormal, wishdir, OVERCLIP );
-		VectorNormalize( wishdir );
+        MM_ClipVelocity2D(mm->desired_dir, mm->groundPlaneNormal, wishdir, OVERCLIP);
+        VectorNormalize(wishdir);
 
-		mm->velocity[ 0 ] = mm->desired_speed * wishdir[ 0 ];
-		mm->velocity[ 1 ] = mm->desired_speed * wishdir[ 1 ];
-	}
-	else if( mmove->groundPlane )
-	{
-		MM_ClipVelocity( mmove->velocity, mmove->groundPlaneNormal, mmove->velocity, OVERCLIP );
-	}
+        mm->velocity[0] = mm->desired_speed * wishdir[0];
+        mm->velocity[1] = mm->desired_speed * wishdir[1];
+    } else if (mm->groundPlane) {
+        MM_ClipVelocity(mm->velocity, mm->groundPlaneNormal, mm->velocity, OVERCLIP);
+    }
 
-	MM_StepSlideMove();
+    MM_StepSlideMove();
 
-	if( !mm->walking && mml.previous_velocity[ 2 ] >= 0.0f && mm->velocity[ 2 ] <= 0.0f )
-	{
-		point[ 0 ] = mmove->origin[ 0 ];
-		point[ 1 ] = mmove->origin[ 1 ];
-		point[ 2 ] = mmove->origin[ 2 ] - 18.0f;
+    if (!mm->walking && mml.previous_velocity[2] >= 0.0f && mm->velocity[2] <= 0.0f) {
+        point[0] = mm->origin[0];
+        point[1] = mm->origin[1];
+        point[2] = mm->origin[2] - 18.0f;
 
-		gi.trace( &trace, mm->origin, mm->mins, mm->maxs, point, mm->entityNum, mm->tracemask, qtrue, qfalse );
+        gi.trace(&trace, mm->origin, mm->mins, mm->maxs, point, mm->entityNum, mm->tracemask, qtrue, qfalse);
 
-		if( trace.fraction < 1.0f && !trace.allsolid )
-		{
-			MM_GroundTrace();
-			return;
-		}
-	}
+        if (trace.fraction < 1.0f && !trace.allsolid) {
+            VectorCopy(trace.endpos, mm->origin);
+            MM_GroundTrace();
+        }
+    }
 }
diff --git a/code/fgame/g_phys.cpp b/code/fgame/g_phys.cpp
index 8bf95644..3ca3115c 100644
--- a/code/fgame/g_phys.cpp
+++ b/code/fgame/g_phys.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "sentient.h"
 #include "actor.h"
 #include "player.h"
+#include "debuglines.h"
 
 /*
 
@@ -47,7 +48,7 @@ solid_edge items only clip against bsp models.
 
 */
 
-pushed_t pushed[ MAX_GENTITIES ];
+pushed_t  pushed[MAX_GENTITIES];
 pushed_t *pushed_p;
 
 Entity *obstacle;
@@ -58,123 +59,101 @@ G_FixEntityPosition
 
 ============
 */
-Entity *G_FixEntityPosition
-	(
-	Entity *ent
-	)
+Entity *G_FixEntityPosition(Entity *ent)
 {
-	int mask;
-	trace_t trace;
-	Vector start;
-	float radius;
+    int     mask;
+    trace_t trace;
+    Vector  start;
+    float   radius;
 
-	if( ent->size.x > ent->size.z )
-	{
-		radius = ent->size.z * 0.5f;
-	}
-	else
-	{
-		radius = ent->size.x * 0.5f;
-	}
+    if (ent->size.x > ent->size.z) {
+        radius = ent->size.z * 0.5f;
+    } else {
+        radius = ent->size.x * 0.5f;
+    }
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-	{
-		mask = MASK_SOLID;
-	}
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	start = ent->origin;
-	start.z += radius;
-	if( ent->IsSubclassOfPlayer() )
-	{
-		trace = G_Trace( start, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_FixEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( start, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_FixEntityPosition2" );
-	}
+    start = ent->origin;
+    start.z += radius;
+    if (ent->IsSubclassOfSentient()) {
+        trace = G_Trace(start, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_FixEntityPosition1");
+    } else {
+        trace = G_Trace(start, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_FixEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		//return g_entities->entity;
-		assert( trace.ent );
-		assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        if (!trace.ent) {
+            // Fixed in OPM
+            //  I don't understand why they just prefer the game crashing
+            //  rather than ignoring the entity
+            return NULL;
+        }
+        //assert( trace.ent );
+        //assert( trace.ent->entity );
+        return trace.ent->entity;
+    }
 
-	ent->setOrigin( trace.endpos );
+    ent->setOrigin(trace.endpos);
 
-	return NULL;
+    return NULL;
 }
 
-
 /*
 ============
 G_TestEntityPosition
 
 ============
 */
-Entity *G_TestEntityPosition
-	(
-	Entity *ent
-	)
+Entity *G_TestEntityPosition(Entity *ent)
 {
-	int mask;
-	trace_t trace;
+    int     mask;
+    trace_t trace;
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-		mask = MASK_SOLID;
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	if( ent->IsSubclassOfPlayer() )
-	{
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_TestEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_TestEntityPosition2" );
-	}
+    if (ent->IsSubclassOfPlayer()) {
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, true, "G_TestEntityPosition1");
+    } else {
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, ent->origin, ent, mask, false, "G_TestEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		//return g_entities->entity;
-		assert( trace.ent );
-		assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        //return g_entities->entity;
+        assert(trace.ent);
+        assert(trace.ent->entity);
+        return trace.ent->entity;
+    }
 
-	return NULL;
+    return NULL;
 }
 
-
 /*
 ================
 G_CheckVelocity
 ================
 */
-void G_CheckVelocity
-	(
-	Entity *ent
-	)
+void G_CheckVelocity(Entity *ent)
+{
+    int i;
 
-	{
-	int i;
-
-	//
-	// bound velocity
-	//
-	for( i = 0; i < 3; i++ )
-		{
-		if ( ent->velocity[ i ] > sv_maxvelocity->value )
-			{
-			ent->velocity[ i ] = sv_maxvelocity->value;
-			}
-		else if ( ent->velocity[ i ] < -sv_maxvelocity->value )
-			{
-			ent->velocity[ i ] = -sv_maxvelocity->value;
-			}
-		}
-	}
+    //
+    // bound velocity
+    //
+    for (i = 0; i < 3; i++) {
+        if (ent->velocity[i] > sv_maxvelocity->value) {
+            ent->velocity[i] = sv_maxvelocity->value;
+        } else if (ent->velocity[i] < -sv_maxvelocity->value) {
+            ent->velocity[i] = -sv_maxvelocity->value;
+        }
+    }
+}
 
 /*
 ==================
@@ -183,54 +162,30 @@ G_Impact
 Two entities have touched, so run their touch functions
 ==================
 */
-void G_Impact
-	(
-	Entity *e1,
-	trace_t *trace
-	)
+void G_Impact(Entity *e1, trace_t *trace)
 {
-	gentity_t   *e2;
-	Event		   *ev;
-	SafePtr< Entity > safe1;
-	SafePtr< Entity > safe2;
+    gentity_t *e2;
+    Event     *ev;
 
-	e2 = trace->ent;
+    e2 = trace->ent;
 
-	safe1 = e1;
-	safe2 = e2->entity;
+    level.impact_trace = *trace;
 
-	level.impact_trace = *trace;
+    // touch anything, including the world
+    if (e1->edict->solid != SOLID_NOT) {
+        ev = new Event(EV_Touch);
+        ev->AddEntity(e2->entity);
+        e1->ProcessEvent(ev);
+    }
 
-	// touch anything, including the world
-	if( e1->edict->solid != SOLID_NOT )
-	{
-		ev = new Event( EV_Touch );
-		ev->AddEntity( e2->entity );
-		e1->ProcessEvent( ev );
+    // entity could have been removed, so check if he's in use before sending the event
+    if (e2->entity && (e2->solid != SOLID_NOT) && (!(e2->r.contents & CONTENTS_SHOOTONLY)) && (e2->entity != world)) {
+        ev = new Event(EV_Touch);
+        ev->AddEntity(e1);
+        e2->entity->ProcessEvent(ev);
+    }
 
-		if( safe1 ) {
-			safe1->Unregister( "touch" );
-		}
-	}
-
-	// entity could have been removed, so check if he's in use before sending the event
-	if(
-		e2->entity &&
-		( e2->solid != SOLID_NOT ) &&
-		( !( e2->r.contents & CONTENTS_SHOOTONLY ) ) &&
-		( e2->entity != world )
-		)
-	{
-		ev = new Event( EV_Touch );
-		ev->AddEntity( e1 );
-		e2->entity->ProcessEvent( ev );
-
-		if( safe2 ) {
-			safe2->Unregister( "touch" );
-		}
-	}
-
-	memset( &level.impact_trace, 0, sizeof( level.impact_trace ) );
+    memset(&level.impact_trace, 0, sizeof(level.impact_trace));
 }
 
 /*
@@ -239,36 +194,29 @@ G_TestEntityPosition
 
 ============
 */
-Entity *G_TestEntityPosition
-	(
-	Entity *ent,
-	Vector vOrg
-	)
+Entity *G_TestEntityPosition(Entity *ent, Vector vOrg)
 {
-	int mask;
-	trace_t trace;
+    int     mask;
+    trace_t trace;
 
-	mask = ent->edict->clipmask;
-	if( !mask )
-		mask = MASK_SOLID;
+    mask = ent->edict->clipmask;
+    if (!mask) {
+        mask = MASK_SOLID;
+    }
 
-	if( ent->IsSubclassOfPlayer() )
-	{
-		trace = G_Trace( vOrg, ent->mins, ent->maxs, vOrg, ent, mask, true, "G_TestEntityPosition1" );
-	}
-	else
-	{
-		trace = G_Trace( vOrg, ent->mins, ent->maxs, vOrg, ent, mask, false, "G_TestEntityPosition2" );
-	}
+    if (ent->IsSubclassOfSentient()) {
+        trace = G_Trace(vOrg, ent->mins, ent->maxs, vOrg, ent, mask, true, "G_TestEntityPosition1");
+    } else {
+        trace = G_Trace(vOrg, ent->mins, ent->maxs, vOrg, ent, mask, false, "G_TestEntityPosition2");
+    }
 
-	if( trace.startsolid )
-	{
-		assert( trace.ent );
-		assert( trace.ent->entity );
-		return trace.ent->entity;
-	}
+    if (trace.startsolid) {
+        assert(trace.ent);
+        assert(trace.ent->entity);
+        return trace.ent->entity;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -281,46 +229,34 @@ returns the blocked flags (1 = floor, 2 = step / wall)
 */
 #define STOP_EPSILON 0.1
 
-int G_ClipVelocity
-	(
-	Vector& in,
-	Vector& normal,
-	Vector& out,
-	float overbounce
-	)
+int G_ClipVelocity(Vector& in, Vector& normal, Vector& out, float overbounce)
+{
+    int   i;
+    int   blocked;
+    float backoff;
 
-	{
-	int	i;
-	int	blocked;
-	float	backoff;
+    blocked = 0;
 
-	blocked = 0;
+    if (normal[2] > 0) {
+        // floor
+        blocked |= 1;
+    }
+    if (!normal[2]) {
+        // step
+        blocked |= 2;
+    }
 
-   if ( normal[ 2 ] > 0 )
-		{
-		// floor
-		blocked |= 1;
-		}
-	if ( !normal[ 2 ] )
-		{
-		// step
-		blocked |= 2;
-		}
+    backoff = (in * normal) * overbounce;
 
-	backoff = ( in * normal ) * overbounce;
-
-	out = in - normal * backoff;
-	for( i = 0; i < 3; i++ )
-		{
-		if ( out[ i ] > -STOP_EPSILON && out[ i ] < STOP_EPSILON )
-			{
-			out[ i ] = 0;
-			}
-		}
-
-	return blocked;
-	}
+    out = in - normal * backoff;
+    for (i = 0; i < 3; i++) {
+        if (out[i] > -STOP_EPSILON && out[i] < STOP_EPSILON) {
+            out[i] = 0;
+        }
+    }
 
+    return blocked;
+}
 
 /*
 ============
@@ -335,218 +271,179 @@ Returns the clipflags if the velocity was modified (hit something solid)
 */
 #define MAX_CLIP_PLANES 5
 
-int G_FlyMove
-	(
-	Entity *ent,
-	Vector basevel,
-	float time,
-	int mask
-	)
+int G_FlyMove(Entity *ent, Vector basevel, float time, int mask)
 {
-	Entity	*hit;
-	gentity_t  *edict;
-	int		bumpcount, numbumps;
-	Vector	dir;
-	float		d;
-	int		numplanes;
-	vec3_t	planes[ MAX_CLIP_PLANES ];
-	Vector	primal_velocity, original_velocity, new_velocity;
-	int		i, j;
-	trace_t	trace;
-	Vector	end;
-	float		time_left;
-	int		blocked;
+    Entity    *hit;
+    gentity_t *edict;
+    int        bumpcount, numbumps;
+    Vector     dir;
+    float      d;
+    int        numplanes;
+    vec3_t     planes[MAX_CLIP_PLANES];
+    Vector     primal_velocity, original_velocity, new_velocity;
+    int        i, j;
+    trace_t    trace;
+    Vector     end;
+    float      time_left;
+    int        blocked;
 #if 0
 	Vector   move;
 	Vector	v;
 #endif
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	numbumps = 4;
+    numbumps = 4;
 
-	blocked = 0;
-	original_velocity = ent->velocity;
-	primal_velocity = ent->velocity;
-	numplanes = 0;
+    blocked           = 0;
+    original_velocity = ent->velocity;
+    primal_velocity   = ent->velocity;
+    numplanes         = 0;
 
 #if 1
-	time_left = time;
+    time_left = time;
 #else
-	time_left = 1.0;//time;
+    time_left = 1.0; //time;
 
-	v = ent->total_delta;
-	v[ 1 ] = -v[ 1 ];  // sigh...
-	MatrixTransformVector( v, ent->orientation, move );
-	move += ent->velocity * time;
-	ent->total_delta = vec_zero;
+    v    = ent->total_delta;
+    v[1] = -v[1]; // sigh...
+    MatrixTransformVector(v, ent->orientation, move);
+    move += ent->velocity * time;
+    ent->total_delta = vec_zero;
 #endif
 
-	ent->groundentity = NULL;
-	for( bumpcount = 0; bumpcount < numbumps; bumpcount++ )
-	{
+    ent->groundentity = NULL;
+    for (bumpcount = 0; bumpcount < numbumps; bumpcount++) {
 #if 1
-		end = ent->origin + time_left * ( ent->velocity + basevel );
+        end = ent->origin + time_left * (ent->velocity + basevel);
 #else
-		end = ent->origin + time_left * move;
+        end = ent->origin + time_left * move;
 #endif
 
-		trace = G_Trace( ent->origin, ent->mins, ent->maxs, end, ent, mask, false, "G_FlyMove" );
+        trace = G_Trace(ent->origin, ent->mins, ent->maxs, end, ent, mask, false, "G_FlyMove");
 
-		if(
-			( trace.allsolid ) ||
-			(
-			( trace.startsolid ) &&
-			( ent->movetype == MOVETYPE_VEHICLE )
-			)
-			)
-		{
-			// entity is trapped in another solid
-			ent->velocity = vec_zero;
-			return 3;
-		}
+        if ((trace.allsolid) || ((trace.startsolid) && (ent->movetype == MOVETYPE_VEHICLE))) {
+            // entity is trapped in another solid
+            ent->velocity = vec_zero;
+            return 3;
+        }
 
-		if( trace.fraction > 0 )
-		{
-			// actually covered some distance
-			ent->setOrigin( trace.endpos );
-			original_velocity = ent->velocity;
-			numplanes = 0;
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            ent->setOrigin(trace.endpos);
+            original_velocity = ent->velocity;
+            numplanes         = 0;
+        }
 
-		if( trace.fraction == 1 )
-		{
-			// moved the entire distance
-			break;
-		}
+        if (trace.fraction == 1) {
+            // moved the entire distance
+            break;
+        }
 
-		assert( trace.ent );
-		hit = trace.ent->entity;
+        assert(trace.ent);
+        hit = trace.ent->entity;
 
-		if( trace.plane.normal[ 2 ] > 0.7 )
-		{
-			// floor
-			blocked |= 1;
-			if( hit->getSolidType() == SOLID_BSP )
-			{
-				ent->groundentity = hit->edict;
-				ent->groundplane = trace.plane;
-				ent->groundcontents = trace.contents;
-			}
-		}
+        if (trace.plane.normal[2] > 0.7) {
+            // floor
+            blocked |= 1;
+            if (hit->getSolidType() == SOLID_BSP) {
+                ent->groundentity   = hit->edict;
+                ent->groundplane    = trace.plane;
+                ent->groundcontents = trace.contents;
+            }
+        }
 
-		if( !trace.plane.normal[ 2 ] )
-		{
-			// step
-			blocked |= 2;
-		}
+        if (!trace.plane.normal[2]) {
+            // step
+            blocked |= 2;
+        }
 
-		//
-		// run the impact function
-		//
-		G_Impact( ent, &trace );
-		if( !edict->inuse )
-		{
-			break;		// removed by the impact function
-		}
+        //
+        // run the impact function
+        //
+        G_Impact(ent, &trace);
+        if (!edict->inuse) {
+            break; // removed by the impact function
+        }
 
-		time_left -= time_left * trace.fraction;
+        time_left -= time_left * trace.fraction;
 
-		// cliped to another plane
-		if( numplanes >= MAX_CLIP_PLANES )
-		{
-			// this shouldn't really happen
-			ent->velocity = vec_zero;
-			return 3;
-		}
+        // cliped to another plane
+        if (numplanes >= MAX_CLIP_PLANES) {
+            // this shouldn't really happen
+            ent->velocity = vec_zero;
+            return 3;
+        }
 
-		VectorCopy( trace.plane.normal, planes[ numplanes ] );
-		numplanes++;
+        VectorCopy(trace.plane.normal, planes[numplanes]);
+        numplanes++;
 
-		//
-		// modify original_velocity so it parallels all of the clip planes
-		//
-		for( i = 0; i < numplanes; i++ )
-		{
-			Vector normal = planes[ i ];
+        //
+        // modify original_velocity so it parallels all of the clip planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            Vector normal = planes[i];
 
-			G_ClipVelocity( original_velocity, normal, new_velocity, 1.01f );
-			for( j = 0; j < numplanes; j++ )
-			{
-				if( j != i )
-				{
-					if( ( new_velocity * planes[ j ] ) < 0 )
-					{
-						// not ok
-						break;
-					}
-				}
-			}
+            G_ClipVelocity(original_velocity, normal, new_velocity, 1.01f);
+            for (j = 0; j < numplanes; j++) {
+                if (j != i) {
+                    if ((new_velocity * planes[j]) < 0) {
+                        // not ok
+                        break;
+                    }
+                }
+            }
 
-			if( j == numplanes )
-			{
-				break;
-			}
-		}
+            if (j == numplanes) {
+                break;
+            }
+        }
 
-		if( i != numplanes )
-		{
-			// go along this plane
-			ent->velocity = new_velocity;
-		}
-		else
-		{
-			// go along the crease
-			if( numplanes != 2 )
-			{
-				ent->velocity = vec_zero;
-				return 7;
-			}
-			CrossProduct( planes[ 0 ], planes[ 1 ], dir );
-			d = dir * ent->velocity;
-			ent->velocity = dir * d;
-		}
+        if (i != numplanes) {
+            // go along this plane
+            ent->velocity = new_velocity;
+        } else {
+            // go along the crease
+            if (numplanes != 2) {
+                ent->velocity = vec_zero;
+                return 7;
+            }
+            CrossProduct(planes[0], planes[1], dir);
+            d             = dir * ent->velocity;
+            ent->velocity = dir * d;
+        }
 
-		//
-		// if original velocity is against the original velocity, stop dead
-		// to avoid tiny occilations in sloping corners
-		//
-		if( ( ent->velocity * primal_velocity ) <= 0 )
-		{
-			ent->velocity = vec_zero;
-			return blocked;
-		}
-	}
+        //
+        // if original velocity is against the original velocity, stop dead
+        // to avoid tiny occilations in sloping corners
+        //
+        if ((ent->velocity * primal_velocity) <= 0) {
+            ent->velocity = vec_zero;
+            return blocked;
+        }
+    }
 
-	return blocked;
+    return blocked;
 }
 
-
 /*
 ============
 G_AddGravity
 
 ============
 */
-void G_AddGravity
-	(
-	Entity *ent
-	)
+void G_AddGravity(Entity *ent)
+{
+    float grav;
 
-	{
-   float grav;
+    if (ent->waterlevel > 2) {
+        grav = ent->gravity * 60 * level.frametime;
+    } else {
+        grav = ent->gravity * sv_gravity->value * level.frametime;
+    }
 
-   if ( ent->waterlevel > 2 )
-      {
-	   grav = ent->gravity * 60 * level.frametime;
-      }
-   else
-      {
-	   grav = ent->gravity * sv_gravity->value * level.frametime;
-      }
-
-	ent->velocity[ 2 ] -= grav;
-	}
+    ent->velocity[2] -= grav;
+}
 
 /*
 ===============================================================================
@@ -563,59 +460,48 @@ G_PushEntity
 Does not change the entities velocity at all
 ============
 */
-trace_t G_PushEntity
-	(
-	Entity *ent,
-	Vector push
-	)
+trace_t G_PushEntity(Entity *ent, Vector push)
 {
-	trace_t	trace;
-	Vector	start;
-	Vector	end;
-	int		mask;
-	gentity_t  *edict;
+    trace_t    trace;
+    Vector     start;
+    Vector     end;
+    int        mask;
+    gentity_t *edict;
 
-	start = ent->origin;
-	end = start + push;
+    start = ent->origin;
+    end   = start + push;
 
 retry:
-	if( ent->edict->clipmask )
-	{
-		mask = ent->edict->clipmask;
-	}
-	else
-	{
-		mask = MASK_SOLID;
-	}
+    if (ent->edict->clipmask) {
+        mask = ent->edict->clipmask;
+    } else {
+        mask = MASK_SOLID;
+    }
 
-	trace = G_Trace( start, ent->mins, ent->maxs, end, ent, mask, true, "G_PushEntity" );
+    trace = G_Trace(start, ent->mins, ent->maxs, end, ent, mask, true, "G_PushEntity");
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	ent->setOrigin( trace.endpos );
+    ent->setOrigin(trace.endpos);
 
-	if( trace.fraction != 1.0 )
-	{
-		G_Impact( ent, &trace );
+    if (trace.fraction != 1.0) {
+        G_Impact(ent, &trace);
 
-		// if the pushed entity went away and the pusher is still there
-		if( ( !trace.ent || !trace.ent->inuse ) && edict->inuse )
-		{
-			// move the pusher back and try again
-			ent->setOrigin( start );
-			goto retry;
-		}
-	}
+        // if the pushed entity went away and the pusher is still there
+        if ((!trace.ent || !trace.ent->inuse) && edict->inuse) {
+            // move the pusher back and try again
+            ent->setOrigin(start);
+            goto retry;
+        }
+    }
 
-	if( edict && ( edict != ent->edict ) )
-	{
-		if( ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( ent );
-		}
-	}
+    if (edict && (edict != ent->edict)) {
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
+    }
 
-	return trace;
+    return trace;
 }
 
 /*
@@ -623,37 +509,28 @@ retry:
 G_SlideEntity
 ============
 */
-trace_t G_SlideEntity
-	(
-	Entity *ent,
-	Vector push
-	)
+trace_t G_SlideEntity(Entity *ent, Vector push)
+{
+    trace_t trace;
+    Vector  start;
+    Vector  end;
+    int     mask;
 
-	{
-	trace_t	trace;
-	Vector	start;
-	Vector	end;
-	int		mask;
+    start = ent->origin;
+    end   = start + push;
 
-   start = ent->origin;
-	end = start + push;
+    if (ent->edict->clipmask) {
+        mask = ent->edict->clipmask;
+    } else {
+        mask = MASK_SOLID;
+    }
 
-	if ( ent->edict->clipmask )
-		{
-		mask = ent->edict->clipmask;
-		}
-	else
-		{
-		mask = MASK_SOLID;
-		}
+    trace = G_Trace(start, ent->mins, ent->maxs, end, ent, mask, false, "G_SlideEntity");
 
-	trace = G_Trace( start, ent->mins, ent->maxs, end, ent, mask, false, "G_SlideEntity" );
-
-	ent->setOrigin( trace.endpos );
-
-	return trace;
-	}
+    ent->setOrigin(trace.endpos);
 
+    return trace;
+}
 
 /*
 ================
@@ -709,185 +586,157 @@ Objects need to be moved back on a failed push,
 otherwise riders would continue to slide.
 ============
 */
-qboolean G_Push
-	(
-	Entity  *pusher,
-	Vector pushermove,
-	Vector pusheramove
-	)
+qboolean G_Push(Entity *pusher, Vector pushermove, Vector pusheramove)
+{
+    Entity    *check, *block;
+    gentity_t *edict;
+    Vector     move, amove;
+    Vector     mins, maxs;
+    Vector     save;
+    pushed_t  *p;
+    Vector     org, org2, move2, neworg;
+    Vector     norm;
+    float      mat[3][3];
+    pushed_t  *pusher_p;
+    float      radius;
+    int        i, num;
+    int        j;
+    int        touch[MAX_GENTITIES];
+    Event     *ev;
 
-	{
-	Entity		*check, *block;
-	gentity_t   *edict;
-	Vector		move, amove;
-	Vector		mins, maxs;
-	Vector		save;
-	pushed_t	*p;
-	Vector		org, org2, move2, neworg;
-	Vector		norm;
-	float		mat[ 3 ][ 3 ];
-	pushed_t	*pusher_p;
-	float       radius;
-	int         i, num;
-	int         touch[ MAX_GENTITIES ];
-	Event		*ev;
+    // save the pusher's original position
+    pusher_p              = pushed_p;
+    pushed_p->ent         = pusher;
+    pushed_p->localorigin = pusher->localorigin;
+    pushed_p->origin      = pusher->origin;
+    pushed_p->localangles = pusher->localangles;
+    pushed_p->angles      = pusher->angles;
 
-	// save the pusher's original position
-	pusher_p = pushed_p;
-	pushed_p->ent = pusher;
-	pushed_p->localorigin = pusher->localorigin;
-	pushed_p->origin = pusher->origin;
-	pushed_p->localangles = pusher->localangles;
-	pushed_p->angles = pusher->angles;
+    if (pusher->client) {
+        pushed_p->deltayaw = pusher->client->ps.delta_angles[YAW];
+    }
 
-	if( pusher->client )
-	{
-		pushed_p->deltayaw = pusher->client->ps.delta_angles[ YAW ];
-	}
+    pushed_p++;
 
-	pushed_p++;
+    if (pushed_p >= &pushed[MAX_GENTITIES]) {
+        gi.Error(ERR_FATAL, "Pushed too many entities.");
+    }
 
-	if( pushed_p >= &pushed[ MAX_GENTITIES ] )
-	{
-		gi.Error( ERR_FATAL, "Pushed too many entities." );
-	}
+    if (pusher->IsSubclassOfPlayer()) {
+        pusher->setAngles();
+        pusher->setOrigin();
+    } else {
+        // move the pusher to it's final position
+        pusher->addAngles(pusheramove);
+        pusher->addOrigin(pushermove);
+    }
 
-	if( pusher->IsSubclassOfPlayer() )
-	{
-		pusher->setAngles();
-		pusher->setOrigin();
-	}
-	else
-	{
-		// move the pusher to it's final position
-		pusher->addAngles( pusheramove );
-		pusher->addOrigin( pushermove );
-	}
+    if (pusher->edict->solid == SOLID_NOT) {
+        // Doesn't push anything
+        return true;
+    }
 
+    // change the move to worldspace
+    move  = pusher->origin - pusher_p->origin;
+    amove = pusher->angles - pusher_p->angles;
 
-	if( pusher->edict->solid == SOLID_NOT )
-	{
-		// Doesn't push anything
-		return true;
-	}
+    // we need this for pushing things later
+    AnglesToAxis(amove, mat);
 
-	// change the move to worldspace
-	move = pusher->origin - pusher_p->origin;
-	amove = pusher->angles - pusher_p->angles;
+    // find the bounding box
+    mins = pusher->absmin;
+    maxs = pusher->absmax;
 
-	// we need this for pushing things later
-	AnglesToAxis( amove, mat );
+    // Add in entities that are within the pusher
 
-	// find the bounding box
-	mins = pusher->absmin;
-	maxs = pusher->absmax;
+    num = gi.AreaEntities(mins, maxs, touch, MAX_GENTITIES);
 
-	// Add in entities that are within the pusher
+    for (i = 0; i < num; i++) {
+        edict = &g_entities[touch[i]];
+        assert(edict);
+        assert(edict->inuse);
+        assert(edict->entity);
+        check = edict->entity;
 
-	num = gi.AreaEntities( mins, maxs, touch, MAX_GENTITIES );
+        if ((check->movetype == MOVETYPE_PUSH) || (check->movetype == MOVETYPE_STOP)
+            || (check->movetype == MOVETYPE_NONE) || (check->movetype == MOVETYPE_NOCLIP)) {
+            continue;
+        }
 
-	for( i = 0; i < num; i++ )
-	{
-		edict = &g_entities[ touch[ i ] ];
-		assert( edict );
-		assert( edict->inuse );
-		assert( edict->entity );
-		check = edict->entity;
+        if (check->edict->r.contents == CONTENTS_SHOOTONLY) {
+            continue;
+        }
 
-		if( ( check->movetype == MOVETYPE_PUSH ) ||
-			( check->movetype == MOVETYPE_STOP ) ||
-			( check->movetype == MOVETYPE_NONE ) ||
-			( check->movetype == MOVETYPE_NOCLIP ) )
-		{
-			continue;
-		}
+        // if the entity is standing on the pusher, it will definitely be moved
+        if (check->groundentity != pusher->edict) {
+            // Only move triggers and non-solid objects if they're sitting on a moving object
+            if ((check->edict->solid == SOLID_TRIGGER) || (check->edict->solid == SOLID_NOT)) {
+                continue;
+            }
 
-		if( check->edict->r.contents == CONTENTS_SHOOTONLY )
-			continue;
+            // see if the ent needs to be tested
+            if ((check->absmin[0] >= maxs[0]) || (check->absmin[1] >= maxs[1]) || (check->absmin[2] >= maxs[2])
+                || (check->absmax[0] <= mins[0]) || (check->absmax[1] <= mins[1]) || (check->absmax[2] <= mins[2])) {
+                continue;
+            }
 
-		// if the entity is standing on the pusher, it will definitely be moved
-		if( check->groundentity != pusher->edict )
-		{
-			// Only move triggers and non-solid objects if they're sitting on a moving object
-			if( ( check->edict->solid == SOLID_TRIGGER ) || ( check->edict->solid == SOLID_NOT ) )
-			{
-				continue;
-			}
+            // see if the ent's bbox is inside the pusher's final position
+            if (!G_TestEntityPosition(check, check->origin)) {
+                continue;
+            }
 
-			// see if the ent needs to be tested
-			if( ( check->absmin[ 0 ] >= maxs[ 0 ] ) ||
-				( check->absmin[ 1 ] >= maxs[ 1 ] ) ||
-				( check->absmin[ 2 ] >= maxs[ 2 ] ) ||
-				( check->absmax[ 0 ] <= mins[ 0 ] ) ||
-				( check->absmax[ 1 ] <= mins[ 1 ] ) ||
-				( check->absmax[ 2 ] <= mins[ 2 ] ) )
-			{
-				continue;
-			}
+            ev = new Event(EV_Touch);
+            ev->AddEntity(pusher);
+            check->ProcessEvent(ev);
 
-			// see if the ent's bbox is inside the pusher's final position
-			if( !G_TestEntityPosition( check, check->origin ) )
-			{
-				continue;
-			}
+            ev = new Event(EV_Touch);
+            ev->AddEntity(check);
+            pusher->ProcessEvent(ev);
+        }
 
-			ev = new Event( EV_Touch );
-			ev->AddEntity( pusher );
-			check->ProcessEvent( ev );
+        pushed_p->localorigin = check->localorigin;
+        pushed_p->localangles = check->localangles;
+        // move this entity
+        pushed_p->ent    = check;
+        pushed_p->origin = check->origin;
+        pushed_p->angles = check->angles;
+        pushed_p++;
 
-			ev = new Event( EV_Touch );
-			ev->AddEntity( check );
-			pusher->ProcessEvent( ev );
-		}
+        if (pushed_p >= &pushed[MAX_GENTITIES]) {
+            gi.Error(ERR_FATAL, "Pushed too many entities.");
+        }
 
-		pushed_p->localorigin = check->localorigin;
-		pushed_p->localangles = check->localangles;
-		// move this entity
-		pushed_p->ent = check;
-		pushed_p->origin = check->origin;
-		pushed_p->angles = check->angles;
-		pushed_p++;
+        // save off the origin
+        save = check->localorigin;
 
-		if( pushed_p >= &pushed[ MAX_GENTITIES ] )
-		{
-			gi.Error( ERR_FATAL, "Pushed too many entities." );
-		}
+        // try moving the contacted entity
+        move2 = move;
 
-		// save off the origin
-		save = check->localorigin;
+        // FIXME: doesn't rotate monsters?
+        if (check->client && amove[YAW]) {
+            Sentient *sent = (Sentient *)check;
+            Vector    a    = sent->GetViewAngles() + Vector(0, amove[YAW], 0);
+            sent->SetViewAngles(a);
+        }
 
-		// try moving the contacted entity
-		move2 = move;
+        // get the radius of the entity
+        if (check->size.x > check->size.z) {
+            radius = check->size.z * 0.5f;
+        } else {
+            radius = check->size.x * 0.5f;
+        }
 
-		// FIXME: doesn't rotate monsters?
-		/*if( check->client && amove[ YAW ] )
-		{
-			Sentient *sent = ( Sentient * )check;
-			Vector a = sent->GetViewAngles() + Vector( 0, amove[ YAW ], 0 );
-			sent->SetViewAngles( a );
-		}*/
+        // figure movement due to the pusher's amove
+        org = check->origin - pusher->origin;
+        org.z += radius;
 
-		// get the radius of the entity
-		if( check->size.x > check->size.z )
-		{
-			radius = check->size.z * 0.5f;
-		}
-		else
-		{
-			radius = check->size.x * 0.5f;
-		}
+        MatrixTransformVector(org, mat, org2);
 
-		// figure movement due to the pusher's amove
-		org = check->origin - pusher->origin;
-		org.z += radius;
+        move2 += org2 - org;
 
-		MatrixTransformVector( org, mat, org2 );
+        neworg = move2 + check->origin;
 
-		move2 += org2 - org;
-
-		neworg = move2 + check->origin;
-
-		/*
+        /*
 		// This one seems to be better for the bind command
 		if( G_TestEntityPosition( check, check->origin ) )
 		{
@@ -906,66 +755,96 @@ qboolean G_Push
 		}
 		*/
 
-		if( G_TestEntityPosition( check, neworg ) )
-		{
-			trace_t trace;
-			Vector end;
-			Vector fwd;
-			float length;
+        if (G_TestEntityPosition(check, neworg)) {
+            trace_t trace;
+            Vector  end;
+            Vector  fwd;
+            float   length;
 
-			length = VectorNormalize2( move2, fwd );
+            length = VectorNormalize2(move2, fwd);
 
-			end = check->origin + fwd * ( length + 64.0f );
+            end = check->origin + fwd * (length + 64.0f);
 
-			if( check->IsSubclassOfPlayer() )
-			{
-				trace = G_Trace( check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, true, "G_Push" );
-			}
-			else
-			{
-				trace = G_Trace( check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, false, "G_Push" );
-			}
+            if (check->IsSubclassOfSentient()) {
+                trace = G_Trace(
+                    check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, true, "G_Push"
+                );
+            } else {
+                trace = G_Trace(
+                    check->origin, check->mins, check->maxs, end, check, check->edict->clipmask, false, "G_Push"
+                );
+            }
 
-			if( !trace.allsolid )
-			{
-				if( check->IsSubclassOfPlayer() )
-				{
-					trace = G_Trace( Vector( trace.endpos ), check->mins, check->maxs, neworg, check, check->edict->clipmask, true, "G_Push" );
-				}
-				else
-				{
-					trace = G_Trace( Vector( trace.endpos ), check->mins, check->maxs, neworg, check, check->edict->clipmask, false, "G_Push" );
-				}
+            if (!trace.allsolid) {
+                if (check->IsSubclassOfSentient()) {
+                    trace = G_Trace(
+                        Vector(trace.endpos),
+                        check->mins,
+                        check->maxs,
+                        neworg,
+                        check,
+                        check->edict->clipmask,
+                        true,
+                        "G_Push"
+                    );
+                } else {
+                    trace = G_Trace(
+                        Vector(trace.endpos),
+                        check->mins,
+                        check->maxs,
+                        neworg,
+                        check,
+                        check->edict->clipmask,
+                        false,
+                        "G_Push"
+                    );
+                }
 
-				move2 = trace.endpos - check->origin;
-			}
-		}
+                move2 = trace.endpos - check->origin;
+            }
+        }
 
-		check->addOrigin( check->getParentVector( move2 ) );
+        check->addOrigin(check->getParentVector(move2));
 
-		// may have pushed them off an edge
-		if( check->groundentity )
-		{
-			if( check->groundentity != pusher->edict )
-				check->groundentity = NULL;
-		}
+        // may have pushed them off an edge
+        if (check->groundentity) {
+            if (check->groundentity != pusher->edict) {
+                check->groundentity = NULL;
+            }
+        } else {
+            move2 *= 1.f / level.frametime;
 
-		block = G_TestEntityPosition( check, check->origin );
-		if( block )
-		{
-			block = G_FixEntityPosition( check );
-		}
-		if( !block )
-		{
-			// pushed ok
-			check->link();
+            for (j = 0; j < 3; j++) {
+                if (!move2[j]) {
+                    continue;
+                }
 
-			// impact?
-			continue;
-		}
+                if (move2[j] < 0) {
+                    if (check->velocity[j] > move2[j]) {
+                        check->velocity[j] = move2[j];
+                    }
+                } else {
+                    if (check->velocity[j] < move2[j]) {
+                        check->velocity[j] = move2[j];
+                    }
+                }
+            }
+        }
 
-		// try to snap it to a good position
-		/*
+        block = G_TestEntityPosition(check, check->origin);
+        if (block) {
+            block = G_FixEntityPosition(check);
+        }
+        if (!block) {
+            // pushed ok
+            check->link();
+
+            // impact?
+            continue;
+        }
+
+        // try to snap it to a good position
+        /*
 		if ( G_SnapPosition( check ) )
 		{
 		// snapped ok.  we don't have to link since G_SnapPosition does it for us.
@@ -973,67 +852,55 @@ qboolean G_Push
 		}
 		*/
 
-		// if it is ok to leave in the old position, do it
-		// this is only relevent for riding entities, not pushed
-		check->setLocalOrigin( save );
-		block = G_TestEntityPosition( check, check->origin );
-		if( !block )
-		{
-			pushed_p--;
-			continue;
-		}
+        // if it is ok to leave in the old position, do it
+        // this is only relevent for riding entities, not pushed
+        check->setLocalOrigin(save);
+        block = G_TestEntityPosition(check, check->origin);
+        if (!block) {
+            pushed_p--;
+            continue;
+        }
 
-		if( check->edict->solid == SOLID_NOT )
-			continue;
+        if (check->edict->solid == SOLID_NOT) {
+            continue;
+        }
 
-		// L: don't make the pusher teleport through anything that block
-		if( block != pusher )
-		{
-			pusher_p->ent->setOrigin( pusher_p->origin );
-			continue;
-		}
+        // save off the obstacle so we can call the block function
+        obstacle = check;
 
-		// save off the obstacle so we can call the block function
-		obstacle = check;
+        // move back any entities we already moved
+        // go backwards, so if the same entity was pushed
+        // twice, it goes back to the original position
+        for (p = pushed_p - 1; p >= pushed; p--) {
+            p->ent->angles = p->angles;
+            p->ent->origin = p->origin;
 
-		// move back any entities we already moved
-		// go backwards, so if the same entity was pushed
-		// twice, it goes back to the original position
-		for( p = pushed_p - 1; p >= pushed; p-- )
-		{
-			p->ent->angles = p->angles;
-			p->ent->origin = p->origin;
+            p->ent->localangles = p->localangles;
+            p->ent->localorigin = p->localorigin;
 
-			p->ent->localangles = p->localangles;
-			p->ent->localorigin = p->localorigin;
+            if (p->ent->client) {
+                p->ent->client->ps.delta_angles[YAW] = (int)p->deltayaw;
+            }
+        }
 
-			if( p->ent->client )
-			{
-				p->ent->client->ps.delta_angles[ YAW ] = ( int )p->deltayaw;
-			}
-		}
+        // Only "really" move it in order so that the bound coordinate system is correct
+        for (p = pushed; p < pushed_p; p++) {
+            p->ent->setAngles();
+            p->ent->setOrigin();
+        }
 
-		// Only "really" move it in order so that the bound coordinate system is correct
-		for( p = pushed; p < pushed_p; p++ )
-		{
-			p->ent->setAngles();
-			p->ent->setOrigin();
-		}
+        return false;
+    }
 
-		return false;
-	}
+    //FIXME: is there a better way to handle this?
+    // see if anything we moved has touched a trigger
+    for (p = pushed_p - 1; p >= pushed; p--) {
+        if (p->ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(p->ent);
+        }
+    }
 
-	//FIXME: is there a better way to handle this?
-	// see if anything we moved has touched a trigger
-	for( p = pushed_p - 1; p >= pushed; p-- )
-	{
-		if( p->ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( p->ent );
-		}
-	}
-
-	return true;
+    return true;
 }
 
 /*
@@ -1041,39 +908,37 @@ qboolean G_Push
 G_PushMove
 ================
 */
-qboolean G_PushMove( Entity  *ent, Vector move, Vector amove )
+qboolean G_PushMove(Entity *ent, Vector move, Vector amove)
 {
-	Entity *part;
-	Vector m, a;
-	Event	 *ev;
+    Entity *part;
+    Vector  m, a;
+    Event  *ev;
 
-	m = move;
-	a = amove;
+    m = move;
+    a = amove;
 
-	pushed_p = pushed;
+    pushed_p = pushed;
 
-	part = ent;
+    part = ent;
 
-	while( part )
-	{
-		if( !G_Push( part, m, a ) )
-		{
-			// move was blocked
-			// call the pusher's "blocked" function
-			// otherwise, just stay in place until the obstacle is gone
-			ev = new Event( EV_Blocked );
-			ev->AddEntity( obstacle );
-			part->ProcessEvent( ev );
-			return false;
-		}
+    while (part) {
+        if (!G_Push(part, m, a)) {
+            // move was blocked
+            // call the pusher's "blocked" function
+            // otherwise, just stay in place until the obstacle is gone
+            ev = new Event(EV_Blocked);
+            ev->AddEntity(obstacle);
+            part->ProcessEvent(ev);
+            return false;
+        }
 
-		m = vec_zero;
-		a = vec_zero;
+        m = vec_zero;
+        a = vec_zero;
 
-		part = part->teamchain;
-	}
+        part = part->teamchain;
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -1084,65 +949,55 @@ Bmodel objects don't interact with each other, but
 push all box objects
 ================
 */
-void G_Physics_Pusher
-	(
-	Entity *ent
-	)
+void G_Physics_Pusher(Entity *ent)
 {
-	Vector	move, amove;
-	Entity   *part, *mv;
-	Event		*ev;
+    Vector  move, amove;
+    Entity *part, *mv;
+    Event  *ev;
 
-	// team slaves are only moved by their captains
-	if( ent->flags & FL_TEAMSLAVE )
-	{
-		return;
-	}
+    // team slaves are only moved by their captains
+    if (ent->flags & FL_TEAMSLAVE) {
+        return;
+    }
 
-	// Check if anyone on the team is moving
-	for( part = ent; part; part = part->teamchain )
-	{
-		if( part->velocity != vec_zero || part->avelocity != vec_zero )
-		{
-			break;
-		}
-	}
+    // Check if anyone on the team is moving
+    for (part = ent; part; part = part->teamchain) {
+        if (part->velocity != vec_zero || part->avelocity != vec_zero) {
+            break;
+        }
+    }
 
-	// make sure all team slaves can move before commiting
-	// any moves or calling any think functions
-	// if the move is blocked, all moved objects will be backed out
-	pushed_p = pushed;
-	while( part )
-	{
-		move = part->velocity	* level.frametime;
-		amove = part->avelocity	* level.frametime;
+    // make sure all team slaves can move before commiting
+    // any moves or calling any think functions
+    // if the move is blocked, all moved objects will be backed out
+    pushed_p = pushed;
+    while (part) {
+        move  = part->velocity * level.frametime;
+        amove = part->avelocity * level.frametime;
 
-		if( !G_Push( part, move, amove ) )
-		{
-			// move was blocked
-			break;
-		}
+        if (!G_Push(part, move, amove)) {
+            // move was blocked
+            break;
+        }
 
-		part = part->teamchain;
-	}
+        part = part->teamchain;
+    }
 
-	if( part )
-	{
-		// the move failed, bump all movedone times
-		for( mv = ent; mv; mv = mv->teamchain )
-		{
-			mv->PostponeEvent( EV_MoveDone, FRAMETIME );
-		}
+    if (part) {
+        // the move failed, bump all movedone times
+        for (mv = ent; mv; mv = mv->teamchain) {
+            mv->PostponeEvent(EV_MoveDone, FRAMETIME);
+        }
 
-		// if the pusher has a "blocked" function, call it
-		// otherwise, just stay in place until the obstacle is gone
-		ev = new Event( EV_Blocked );
-		ev->AddEntity( obstacle );
-		part->ProcessEvent( ev );
-	}
+        // if the pusher has a "blocked" function, call it
+        // otherwise, just stay in place until the obstacle is gone
+        ev = new Event(EV_Blocked);
+        ev->AddEntity(obstacle);
+        part->ProcessEvent(ev);
+    }
 
-	ent->velocity += ent->accel;
-	ent->avelocity += ent->aaccel;
+    ent->velocity += ent->accel;
+    ent->avelocity += ent->aaccel;
 }
 
 //==================================================================
@@ -1154,16 +1009,12 @@ G_Physics_Noclip
 A moving object that doesn't obey physics
 =============
 */
-void G_Physics_Noclip
-	(
-	Entity *ent
-	)
-
-	{
-	ent->angles += ent->avelocity * level.frametime;
-   ent->origin += ent->velocity * level.frametime;
-	ent->link();
-	}
+void G_Physics_Noclip(Entity *ent)
+{
+    ent->angles += ent->avelocity * level.frametime;
+    ent->origin += ent->velocity * level.frametime;
+    ent->link();
+}
 
 /*
 ==============================================================================
@@ -1180,190 +1031,172 @@ G_Physics_Toss
 Toss, bounce, and fly movement.  When onground, do nothing.
 =============
 */
-void G_Physics_Toss
-	(
-	Entity *ent
-	)
+void G_Physics_Toss(Entity *ent)
 {
-	trace_t	trace;
-	Vector	move;
-	float		backoff;
-	Entity	*slave;
-	qboolean	wasinwater;
-	qboolean	isinwater;
-	Vector   origin2;
-	Vector	basevel;
-	gentity_t  *edict;
-	qboolean onconveyor;
+    trace_t    trace;
+    Vector     move;
+    float      backoff;
+    Entity    *slave;
+    qboolean   wasinwater;
+    qboolean   isinwater;
+    Vector     origin2;
+    Vector     basevel;
+    gentity_t *edict;
+    qboolean   onconveyor;
 
-	// if not a team captain, so movement will be handled elsewhere
-	if( ent->flags & FL_TEAMSLAVE )
-	{
-		return;
-	}
+    // if not a team captain, so movement will be handled elsewhere
+    if (ent->flags & FL_TEAMSLAVE) {
+        return;
+    }
 
-	if( ent->velocity[ 2 ] > 0 )
-	{
-		ent->groundentity = NULL;
-	}
+    if (ent->velocity[2] > 0) {
+        ent->groundentity = NULL;
+    }
 
-	// check for the groundentity going away
-	if( ent->groundentity && !ent->groundentity->inuse )
-	{
-		ent->groundentity = NULL;
-	}
+    // check for the groundentity going away
+    if (ent->groundentity && !ent->groundentity->inuse) {
+        ent->groundentity = NULL;
+    }
 
-	onconveyor = ( basevel != vec_zero );
+    onconveyor = (basevel != vec_zero);
 
-	// if onground, return without moving
-	if( ent->groundentity && ent->groundentity->entity->movetype == MOVETYPE_NONE && !onconveyor && ( ent->movetype != MOVETYPE_VEHICLE ) )
-	{
-		if( ent->avelocity.length() )
-		{
-			// move angles
-			ent->setAngles( ent->angles + ent->avelocity * level.frametime );
-		}
-		ent->velocity = vec_zero;
-		return;
-	}
+    // if onground, return without moving
+    if (ent->groundentity && ent->groundentity->entity->movetype == MOVETYPE_NONE && !onconveyor
+        && (ent->movetype != MOVETYPE_VEHICLE)) {
+        if (ent->avelocity.length()) {
+            // move angles
+            ent->setAngles(ent->angles + ent->avelocity * level.frametime);
+        }
+        ent->velocity = vec_zero;
+        return;
+    }
 
-	origin2 = ent->origin;
+    origin2 = ent->origin;
 
-	G_CheckVelocity( ent );
+    G_CheckVelocity(ent);
 
-	// add gravity
-	if( !onconveyor && ent->movetype != MOVETYPE_FLY && ent->movetype != MOVETYPE_FLYMISSILE )
-	{
-		G_AddGravity( ent );
-	}
+    // add gravity
+    if (!onconveyor && ent->movetype != MOVETYPE_FLY && ent->movetype != MOVETYPE_FLYMISSILE) {
+        G_AddGravity(ent);
+    }
 
-	// move angles
-	ent->setAngles( ent->angles + ent->avelocity * level.frametime );
+    if (ent->avelocity.lengthSquared()) {
+        // move angles
+        ent->setAngles(ent->angles + ent->avelocity * level.frametime);
+    }
 
-	// move origin
-	move = ( ent->velocity + basevel ) * level.frametime;
+    // move origin
+    move = (ent->velocity + basevel) * level.frametime;
 
-	edict = ent->edict;
-	if( ent->movetype == MOVETYPE_VEHICLE )
-	{
-		int mask;
+    edict = ent->edict;
+    if (ent->movetype == MOVETYPE_VEHICLE) {
+        int mask;
 
-		if( ent->edict->clipmask )
-		{
-			mask = ent->edict->clipmask;
-		}
-		else
-		{
-			mask = MASK_MONSTERSOLID;
-		}
-		G_FlyMove( ent, basevel, FRAMETIME, mask );
-		if( ent->flags & FL_TOUCH_TRIGGERS )
-		{
-			G_TouchTriggers( ent );
-		}
-		return;
-	}
-	else
-	{
-		trace = G_PushEntity( ent, move );
-	}
+        if (ent->edict->clipmask) {
+            mask = ent->edict->clipmask;
+        } else {
+            mask = MASK_MONSTERSOLID;
+        }
+        G_FlyMove(ent, basevel, FRAMETIME, mask);
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
+        return;
+    } else {
+        trace = G_PushEntity(ent, move);
+    }
 
-	if( ( trace.fraction == 0 ) && ( ent->movetype == MOVETYPE_SLIDE ) )
-	{
-		// Check for slide by removing the downward velocity
-		Vector slide;
+    if ((trace.fraction == 0) && (ent->movetype == MOVETYPE_SLIDE || ent->movetype == MOVETYPE_BOUNCE)) {
+        // Check for slide by removing the downward velocity
+        Vector slide;
 
-		slide[ 0 ] = move[ 0 ] * 0.7f;
-		slide[ 1 ] = move[ 1 ] * 0.7f;
-		slide[ 2 ] = 0;
-		G_PushEntity( ent, slide );
-	}
+        slide[0] = move[0] * level.frametime * 15;
+        slide[1] = move[1] * level.frametime * 15;
+        slide[2] = 0;
+        G_PushEntity(ent, slide);
+    }
 
-	if( !edict->inuse )
-	{
-		return;
-	}
+    if (!edict->inuse) {
+        return;
+    }
 
-	if( trace.fraction < 1 )
-	{
-		if( ent->movetype == MOVETYPE_BOUNCE || ent->movetype == MOVETYPE_GIB )
-		{
-			backoff = 1.5;
-		}
-		else
-		{
-			backoff = 1;
-		}
+    if (trace.fraction < 1) {
+        if (ent->movetype == MOVETYPE_BOUNCE) {
+            backoff = 1.4f;
+        } else if (ent->movetype == MOVETYPE_GIB) {
+            backoff = 1.6f;
+        } else {
+            backoff = 1;
+        }
 
-		Vector normal = trace.plane.normal;
+        Vector normal = trace.plane.normal;
 
-		G_ClipVelocity( ent->velocity, normal, ent->velocity, backoff );
+        G_ClipVelocity(ent->velocity, normal, ent->velocity, backoff);
 
-		// stop if on ground
-		if( trace.plane.normal[ 2 ] > 0.7 )
-		{
-			if( ( ent->velocity[ 2 ] < 60 || ( ent->movetype != MOVETYPE_BOUNCE && ent->movetype != MOVETYPE_GIB ) ) &&
-				( ent->movetype != MOVETYPE_SLIDE ) )
-			{
-				ent->groundentity = trace.ent;
-				ent->groundplane = trace.plane;
-				ent->groundcontents = trace.contents;
-				ent->velocity = vec_zero;
-				ent->avelocity = vec_zero;
-				ent->ProcessEvent( EV_Stop );
-			}
-			else if( ent->movetype == MOVETYPE_GIB )
-			{
-				// Stop spinning after we bounce on the ground
-				ent->avelocity = vec_zero;
-			}
-		}
-	}
+        if (ent->movetype == MOVETYPE_BOUNCE) {
+            // Reduce the velocity when bouncing
+            ent->velocity[0] -= ent->velocity[0] * level.frametime * 1.75f;
+            ent->velocity[1] -= ent->velocity[1] * level.frametime * 1.75f;
+        }
 
-	if( ( move[ 2 ] == 0 ) && onconveyor )
-	{
-		// Check if we still have a ground
-		ent->CheckGround();
-	}
+        // stop if on ground
+        if (trace.plane.normal[2] > 0.7) {
+            ent->groundentity   = trace.ent;
+            ent->groundplane    = trace.plane;
+            ent->groundcontents = trace.contents;
 
-	// check for water transition
-	wasinwater = ( ent->watertype & MASK_WATER );
-	ent->watertype = gi.pointcontents( ent->origin, 0 );
-	isinwater = ent->watertype & MASK_WATER;
+            if (((ent->movetype == MOVETYPE_GIB && ent->velocity[2] < 60)
+                 || (ent->movetype == MOVETYPE_BOUNCE && ent->velocity.length() < 40))
+                && (ent->movetype != MOVETYPE_SLIDE)) {
+                ent->velocity  = vec_zero;
+                ent->avelocity = vec_zero;
+                ent->ProcessEvent(EV_Stop);
+            } else if (ent->movetype == MOVETYPE_TOSS || ent->movetype == MOVETYPE_GIB) {
+                // Stop spinning after we bounce on the ground
+                ent->avelocity = vec_zero;
+                ent->ProcessEvent(EV_Stop);
+            }
+        }
+    }
 
-	if( isinwater )
-	{
-		ent->waterlevel = 1;
-	}
-	else
-	{
-		ent->waterlevel = 0;
-	}
+    if ((move[2] == 0) && onconveyor) {
+        // Check if we still have a ground
+        ent->CheckGround();
+    }
 
-	if( ( edict->spawntime < ( level.time - FRAMETIME ) ) && ( ent->mass > 0 ) )
-	{
-		if( !wasinwater && isinwater )
-		{
-			ent->Sound( "impact_watersplash", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2 );
-		}
-		else if( wasinwater && !isinwater )
-		{
-			ent->Sound( "impact_leavewater", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2 );
-		}
-	}
+    // check for water transition
+    wasinwater     = (ent->watertype & MASK_WATER);
+    ent->watertype = gi.pointcontents(ent->origin, 0);
+    isinwater      = ent->watertype & MASK_WATER;
 
-	// GAMEFIX - Is this necessary?
-	// move teamslaves
-	for( slave = ent->teamchain; slave; slave = slave->teamchain )
-	{
-		slave->setLocalOrigin( slave->localorigin );
-		slave->setAngles( slave->localangles );
-	}
+    if (isinwater) {
+        ent->waterlevel = 1;
+    } else {
+        ent->waterlevel = 0;
+    }
 
-	if( ent->flags & FL_TOUCH_TRIGGERS )
-	{
-		G_TouchTriggers( ent );
-	}
+    if ((edict->spawntime < (level.time - FRAMETIME)) && (ent->mass > 0)) {
+        if (!wasinwater && isinwater) {
+            ent->Sound("impact_watersplash", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2);
+        } else if (wasinwater && !isinwater) {
+            ent->Sound("impact_leavewater", CHAN_BODY, DEFAULT_VOL, DEFAULT_MIN_DIST, &origin2);
+        }
+    }
+
+    // GAMEFIX - Is this necessary?
+    // move teamslaves
+    for (slave = ent->teamchain; slave; slave = slave->teamchain) {
+        slave->setLocalOrigin(slave->localorigin);
+        slave->setAngles(slave->localangles);
+    }
+
+    if (ent->flags & FL_TOUCH_TRIGGERS) {
+        G_TouchTriggers(ent);
+    }
+
+    if (ai_debug_grenades->integer && ent->movetype == MOVETYPE_BOUNCE) {
+        G_DebugLine(origin2, ent->origin, 1, 1, 0, 1);
+    }
 }
 
 /*
@@ -1374,37 +1207,27 @@ STEPPING MOVEMENT
 ===============================================================================
 */
 
-void G_AddRotationalFriction
-	(
-	Entity *ent
-	)
+void G_AddRotationalFriction(Entity *ent)
+{
+    int   n;
+    float adjustment;
 
-	{
-	int	n;
-	float	adjustment;
-
-	ent->angles += level.frametime * ent->avelocity;
-	adjustment = level.frametime * sv_stopspeed->value * sv_friction->value;
-	for( n = 0; n < 3; n++ )
-		{
-		if ( ent->avelocity[ n ] > 0)
-			{
-			ent->avelocity[ n ] -= adjustment;
-			if ( ent->avelocity[ n ] < 0 )
-				{
-				ent->avelocity[ n ] = 0;
-				}
-			}
-		else
-			{
-			ent->avelocity[ n ] += adjustment;
-			if ( ent->avelocity[ n ] > 0 )
-				{
-				ent->avelocity[ n ] = 0;
-				}
-			}
-		}
-	}
+    ent->angles += level.frametime * ent->avelocity;
+    adjustment = level.frametime * sv_stopspeed->value * sv_friction->value;
+    for (n = 0; n < 3; n++) {
+        if (ent->avelocity[n] > 0) {
+            ent->avelocity[n] -= adjustment;
+            if (ent->avelocity[n] < 0) {
+                ent->avelocity[n] = 0;
+            }
+        } else {
+            ent->avelocity[n] += adjustment;
+            if (ent->avelocity[n] > 0) {
+                ent->avelocity[n] = 0;
+            }
+        }
+    }
+}
 
 /*
 =============
@@ -1413,21 +1236,14 @@ G_CheckWater
 =============
 */
 
-void G_CheckWater
-	(
-	Entity *ent
-	)
+void G_CheckWater(Entity *ent)
 {
-	ent->watertype = gi.pointcontents( ent->origin, 0 );
-	if( ent->watertype & MASK_WATER )
-	{
-		ent->waterlevel = 1;
-	}
-	else
-	{
-		ent->waterlevel = 0;
-	}
-	
+    ent->watertype = gi.pointcontents(ent->origin, 0);
+    if (ent->watertype & MASK_WATER) {
+        ent->waterlevel = 1;
+    } else {
+        ent->waterlevel = 0;
+    }
 }
 
 /*
@@ -1443,146 +1259,121 @@ FIXME: is this true?
 =============
 */
 
-void G_Physics_Step
-	(
-	Entity *ent
-	)
+void G_Physics_Step(Entity *ent)
+{
+    qboolean wasonground;
+    qboolean hitsound = false;
+    Vector   vel;
+    float    speed, newspeed, control;
+    float    friction;
+    int      mask;
+    Vector   basevel;
 
-	{
-	qboolean	wasonground;
-	qboolean	hitsound = false;
-	Vector	vel;
-	float		speed, newspeed, control;
-	float		friction;
-	int		mask;
-	Vector	basevel;
+    // airborn monsters should always check for ground
+    if (!ent->groundentity) {
+        ent->CheckGround();
+    }
 
-	// airborn monsters should always check for ground
-	if ( !ent->groundentity )
-		{
-		ent->CheckGround();
-		}
+    if (ent->groundentity) {
+        wasonground = true;
+    } else {
+        wasonground = false;
+    }
 
-	if ( ent->groundentity )
-		{
-		wasonground = true;
-		}
-	else
-		{
-		wasonground = false;
-		}
+    G_CheckVelocity(ent);
 
-	G_CheckVelocity( ent );
+    if (ent->avelocity != vec_zero) {
+        G_AddRotationalFriction(ent);
+    }
 
-	if ( ent->avelocity != vec_zero )
-		{
-		G_AddRotationalFriction( ent );
-		}
+    // add gravity except:
+    //   flying monsters
+    //   swimming monsters who are in the water
+    if (!wasonground) {
+        if (!(ent->flags & FL_FLY)) {
+            if (!((ent->flags & FL_SWIM) && (ent->waterlevel > 2))) {
+                if (ent->velocity[2] < sv_gravity->value * ent->gravity * -0.1f) {
+                    hitsound = true;
+                }
 
-	// add gravity except:
-	//   flying monsters
-	//   swimming monsters who are in the water
-	if ( !wasonground )
-		{
-		if( !( ent->flags & FL_FLY ) )
-			{
-			if( !( ( ent->flags & FL_SWIM ) && ( ent->waterlevel > 2 ) ) )
-				{
-				if ( ent->velocity[ 2 ] < sv_gravity->value * ent->gravity * -0.1f )
-					{
-					hitsound = true;
-					}
+                // Testing water gravity.  If this doesn't work, just restore the uncommented lines
+                //if ( ent->waterlevel == 0 )
+                //{
+                G_AddGravity(ent);
+                //}
+            }
+        }
+    }
 
-            // Testing water gravity.  If this doesn't work, just restore the uncommented lines
-				//if ( ent->waterlevel == 0 )
-					//{
-					G_AddGravity( ent );
-					//}
-				}
-			}
-		}
+    // friction for flying monsters that have been given vertical velocity
+    if ((ent->flags & FL_FLY) && (ent->velocity.z != 0)) {
+        speed    = fabs(ent->velocity.z);
+        control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+        friction = sv_friction->value / 3;
+        newspeed = speed - (level.frametime * control * friction);
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
+        ent->velocity.z *= newspeed;
+    }
 
-	// friction for flying monsters that have been given vertical velocity
-	if( ( ent->flags & FL_FLY ) && ( ent->velocity.z != 0 ) )
-		{
-		speed = fabs( ent->velocity.z );
-		control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-		friction = sv_friction->value / 3;
-		newspeed = speed - ( level.frametime * control * friction );
-		if ( newspeed < 0 )
-			{
-			newspeed = 0;
-			}
-		newspeed /= speed;
-		ent->velocity.z *= newspeed;
-		}
+    // friction for flying monsters that have been given vertical velocity
+    if ((ent->flags & FL_SWIM) && (ent->velocity.z != 0)) {
+        speed    = fabs(ent->velocity.z);
+        control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+        newspeed = speed - (level.frametime * control * sv_waterfriction->value * ent->waterlevel);
+        if (newspeed < 0) {
+            newspeed = 0;
+        }
+        newspeed /= speed;
+        ent->velocity.z *= newspeed;
+    }
 
-	// friction for flying monsters that have been given vertical velocity
-	if( ( ent->flags & FL_SWIM ) && ( ent->velocity.z != 0 ) )
-		{
-		speed = fabs( ent->velocity.z );
-		control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-		newspeed = speed - ( level.frametime * control * sv_waterfriction->value * ent->waterlevel );
-		if ( newspeed < 0 )
-			{
-			newspeed = 0;
-			}
-		newspeed /= speed;
-		ent->velocity.z *= newspeed;
-		}
+    if (ent->velocity != vec_zero) {
+        // apply friction
+        // let dead monsters who aren't completely onground slide
+        if ((wasonground) || (ent->flags & (FL_SWIM | FL_FLY))) {
+            if (!(ent->health <= 0.0 && !M_CheckBottom(ent))) {
+                vel   = ent->velocity;
+                vel.z = 0;
+                speed = vel.length();
+                if (speed) {
+                    friction = sv_friction->value;
 
-	if ( ent->velocity != vec_zero )
-		{
-		// apply friction
-		// let dead monsters who aren't completely onground slide
-		if( ( wasonground ) || ( ent->flags & ( FL_SWIM | FL_FLY ) ) )
-			{
-			if ( !( ent->health <= 0.0 && !M_CheckBottom( ent ) ) )
-				{
-				vel = ent->velocity;
-				vel.z = 0;
-				speed = vel.length();
-				if ( speed )
-					{
-					friction = sv_friction->value;
+                    control  = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
+                    newspeed = speed - level.frametime * control * friction;
 
-					control = speed < sv_stopspeed->value ? sv_stopspeed->value : speed;
-					newspeed = speed - level.frametime * control * friction;
+                    if (newspeed < 0) {
+                        newspeed = 0;
+                    }
 
-					if ( newspeed < 0 )
-						{
-						newspeed = 0;
-						}
+                    newspeed /= speed;
 
-					newspeed /= speed;
+                    ent->velocity.x *= newspeed;
+                    ent->velocity.y *= newspeed;
+                }
+            }
+        }
+    }
 
-					ent->velocity.x *= newspeed;
-					ent->velocity.y *= newspeed;
-					}
-				}
-			}
-		}
+    if ((basevel != vec_zero) || (ent->velocity != vec_zero)) {
+        mask = MASK_SOLID;
 
-	if ( ( basevel != vec_zero ) || ( ent->velocity != vec_zero ) )
-		{
-			mask = MASK_SOLID;
+        G_FlyMove(ent, basevel, level.frametime, mask);
 
-			G_FlyMove( ent, basevel, level.frametime, mask );
+        ent->link();
 
-		ent->link();
+        G_CheckWater(ent);
+        if (ent->flags & FL_TOUCH_TRIGGERS) {
+            G_TouchTriggers(ent);
+        }
 
-      G_CheckWater( ent );
-	  if( ent->flags & FL_TOUCH_TRIGGERS )
-         {
-   		G_TouchTriggers( ent );
-         }
-
-		if ( ent->groundentity && !wasonground && hitsound )
-			{
-			ent->Sound( "impact_softland", CHAN_BODY, 0.5f );
-			}
-		}
-	}
+        if (ent->groundentity && !wasonground && hitsound) {
+            ent->Sound("impact_softland", CHAN_BODY, 0.5f);
+        }
+    }
+}
 
 //============================================================================
 
@@ -1592,68 +1383,60 @@ G_RunEntity
 
 ================
 */
-void G_RunEntity( Entity *ent )
+void G_RunEntity(Entity *ent)
 {
-	gentity_t *edict;
+    gentity_t *edict;
 
-	edict = ent->edict;
+    edict = ent->edict;
 
-	if( !edict->inuse )
-	{
-		return;
-	}
+    if (!edict->inuse) {
+        return;
+    }
 
-	if( ent->flags & FL_ANIMATE )
-	{
-		ent->PreAnimate();
-	}
+    if (ent->flags & FL_ANIMATE) {
+        ent->PreAnimate();
+    }
 
-	if( ent->flags & FL_THINK )
-	{
-		ent->Think();
-	}
+    if (ent->flags & FL_THINK) {
+        ent->Think();
+    }
 
-	if( ent->flags & FL_ANIMATE )
-	{
-		ent->PostAnimate();
-	}
+    if (ent->flags & FL_ANIMATE) {
+        ent->PostAnimate();
+    }
 
-	// only run physics if in use and not bound and not immobilized
-	if( ( edict->s.parent == ENTITYNUM_NONE ) && !( ent->flags & FL_IMMOBILE ) && !( ent->flags & FL_PARTIAL_IMMOBILE ) )
-	{
-		switch( ent->movetype )
-		{
-		case MOVETYPE_NONE:
-		case MOVETYPE_STATIONARY:
-		case MOVETYPE_WALK:
-		case MOVETYPE_FLYMISSILE:
-		case MOVETYPE_SLIDE:
-		case MOVETYPE_GIB:
-		case MOVETYPE_VEHICLE:
-		case MOVETYPE_TURRET:
-			break;
-		case MOVETYPE_PUSH:
-		case MOVETYPE_STOP:
-			G_Physics_Pusher( ent );
-			break;
-		case MOVETYPE_NOCLIP:
-			G_Physics_Noclip( ent );
-			break;
-		case MOVETYPE_FLY:
-			G_FlyMove( ent, ent->velocity, level.frametime, MASK_LINE );
-			break;
-		case MOVETYPE_TOSS:
-		case MOVETYPE_BOUNCE:
-			G_Physics_Toss( ent );
-			break;
-		default:
-			gi.Error( ERR_DROP, "G_Physics: bad movetype %i", ent->movetype );
-		}
-	}
+    // only run physics if in use and not bound and not immobilized
+    if ((edict->s.parent == ENTITYNUM_NONE) && !(ent->flags & FL_IMMOBILE) && !(ent->flags & FL_PARTIAL_IMMOBILE)) {
+        switch (ent->movetype) {
+        case MOVETYPE_NONE:
+        case MOVETYPE_STATIONARY:
+        case MOVETYPE_WALK:
+        case MOVETYPE_FLYMISSILE:
+        case MOVETYPE_SLIDE:
+        case MOVETYPE_GIB:
+        case MOVETYPE_VEHICLE:
+        case MOVETYPE_TURRET:
+            break;
+        case MOVETYPE_PUSH:
+        case MOVETYPE_STOP:
+            G_Physics_Pusher(ent);
+            break;
+        case MOVETYPE_NOCLIP:
+            G_Physics_Noclip(ent);
+            break;
+        case MOVETYPE_FLY:
+            G_FlyMove(ent, ent->velocity, level.frametime, MASK_LINE);
+            break;
+        case MOVETYPE_TOSS:
+        case MOVETYPE_BOUNCE:
+            G_Physics_Toss(ent);
+            break;
+        default:
+            gi.Error(ERR_DROP, "G_Physics: bad movetype %i", ent->movetype);
+        }
+    }
 
-	if( ent->flags & FL_POSTTHINK )
-	{
-		ent->Postthink();
-	}
+    if (ent->flags & FL_POSTTHINK) {
+        ent->Postthink();
+    }
 }
-
diff --git a/code/fgame/g_phys.h b/code/fgame/g_phys.h
index 6690ff68..64dc5f2f 100644
--- a/code/fgame/g_phys.h
+++ b/code/fgame/g_phys.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,62 +22,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // g_phys.h: Header for g_phys.cpp
 
-#ifndef __G_PHYS_H__
-#define __G_PHYS_H__
+#pragma once
 
 #include "g_local.h"
 #include "vector.h"
 
 class Entity;
 
-typedef enum
-{
-	STEPMOVE_OK,
-	STEPMOVE_BLOCKED_BY_ENTITY,
-	STEPMOVE_BLOCKED_BY_WORLD,
-	STEPMOVE_BLOCKED_BY_WATER,
-	STEPMOVE_BLOCKED_BY_FALL,
-	STEPMOVE_BLOCKED_BY_DOOR,
-	STEPMOVE_STUCK
+typedef enum {
+    STEPMOVE_OK,
+    STEPMOVE_BLOCKED_BY_ENTITY,
+    STEPMOVE_BLOCKED_BY_WORLD,
+    STEPMOVE_BLOCKED_BY_WATER,
+    STEPMOVE_BLOCKED_BY_FALL,
+    STEPMOVE_BLOCKED_BY_DOOR,
+    STEPMOVE_STUCK
 } stepmoveresult_t;
 
 // movetype values
-typedef enum
-{
-	MOVETYPE_NONE,			// never moves
-	MOVETYPE_STATIONARY, // never moves but does collide agains push objects
-	MOVETYPE_NOCLIP,		// origin and angles change with no interaction
-	MOVETYPE_PUSH,			// no clip to world, push on box contact
-	MOVETYPE_STOP,			// no clip to world, stops on box contact
-	MOVETYPE_WALK,			// gravity
-	MOVETYPE_FLY,
-	MOVETYPE_TOSS,			// gravity
-	MOVETYPE_FLYMISSILE,	// extra size to monsters
-	MOVETYPE_BOUNCE,
-	MOVETYPE_SLIDE,
-	MOVETYPE_GIB,
-	MOVETYPE_VEHICLE,
-	MOVETYPE_TURRET,
-	MOVETYPE_PORTABLE_TURRET
+typedef enum {
+    MOVETYPE_NONE,       // never moves
+    MOVETYPE_STATIONARY, // never moves but does collide agains push objects
+    MOVETYPE_NOCLIP,     // origin and angles change with no interaction
+    MOVETYPE_PUSH,       // no clip to world, push on box contact
+    MOVETYPE_STOP,       // no clip to world, stops on box contact
+    MOVETYPE_WALK,       // gravity
+    MOVETYPE_FLY,
+    MOVETYPE_TOSS,       // gravity
+    MOVETYPE_FLYMISSILE, // extra size to monsters
+    MOVETYPE_BOUNCE,
+    MOVETYPE_SLIDE,
+    MOVETYPE_GIB,
+    MOVETYPE_VEHICLE,
+    MOVETYPE_TURRET,
+    MOVETYPE_PORTABLE_TURRET
 } movetype_t;
 
-typedef struct
-{
-	Entity  	*ent;
-	Vector   localorigin;
-	Vector   origin;
-	Vector   localangles;
-	Vector	angles;
-	float		deltayaw;
+typedef struct {
+    Entity *ent;
+    Vector  localorigin;
+    Vector  origin;
+    Vector  localangles;
+    Vector  angles;
+    float   deltayaw;
 } pushed_t;
 
-extern pushed_t pushed[];
+extern pushed_t  pushed[];
 extern pushed_t *pushed_p;
 
-void		G_RunEntity( Entity *ent );
-void		G_Impact( Entity *e1, trace_t *trace );
-qboolean	G_PushMove( Entity *pusher, Vector move, Vector amove );
-void		G_CheckWater( Entity *ent );
-Entity		*G_TestEntityPosition( Entity *ent, Vector vOrg );
-
-#endif /* g_phys.h */
+void     G_RunEntity(Entity *ent);
+void     G_Impact(Entity *e1, trace_t *trace);
+qboolean G_PushMove(Entity *pusher, Vector move, Vector amove);
+void     G_CheckWater(Entity *ent);
+Entity  *G_TestEntityPosition(Entity *ent, Vector vOrg);
diff --git a/code/fgame/g_public.h b/code/fgame/g_public.h
index 52fbe33a..e4f235d3 100644
--- a/code/fgame/g_public.h
+++ b/code/fgame/g_public.h
@@ -30,465 +30,553 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // Version 11 is >= 0.05 and <= 1.00
 // Version 12 is >= 1.10
 // Version 15 is >= 2.0
-#define	GAME_API_VERSION	15
+#define GAME_API_VERSION 15
 
 // entity->svFlags
 // the server does not know how to interpret most of the values
 // in entityStates (level eType), so the game must explicitly flag
 // special server behaviors
-#define	SVF_NOCLIENT			0x00000001	// don't send entity to clients, even if it has effects
+#define SVF_NOCLIENT                    (1<<0)	// don't send entity to clients, even if it has effects
+#define SVF_BOT                         (1<<1)
+#define SVF_BROADCAST                   (1<<2)	// send to all connected clients
+#define SVF_PORTAL                      (1<<3)	// merge a second pvs at origin2 into snapshots
+#define SVF_SENDPVS                     (1<<4)	// even though it doesn't have a sound or modelindex, still run it through the pvs
+#define SVF_USE_CURRENT_ORIGIN          (1<<5)	// entity->currentOrigin instead of entity->s.origin
+  									            // for link position (missiles and movers)
+#define SVF_NOTSINGLECLIENT             (1<<6)  // send entity to everyone but one client
+                                                // (entityShared_t->singleClient)
+#define SVF_MONSTER                     (1<<7)	// treat as CONTENTS_MONSTER for collision
+#define SVF_SINGLECLIENT                (1<<8)  // only send to a single client (entityShared_t->singleClient)
+#define SVF_USEBBOX                     (1<<9)	// do not perform perfect collision use the bbox instead
+#define SVF_NOFARPLANE                  (1<<10)	// only send this entity to its parent
+#define SVF_HIDEOWNER                   (1<<11)	// hide the owner of the client
+#define SVF_MONSTERCLIP                 (1<<12)	// treat as CONTENTS_MONSTERCLIP for collision
+#define SVF_PLAYERCLIP                  (1<<13)	// treat as CONTENTS_PLAYERCLIP for collision
+#define SVF_SENDONCE                    (1<<14) // Send this entity over the network at least one time
+#define SVF_SENT                        (1<<15) // This flag is set when the entity has been sent over at least one time
 
-// TTimo
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
-#define SVF_CLIENTMASK 0x00000002
+#define SVF_NOSERVERINFO                (1<<16) // don't send CS_SERVERINFO updates to this client
+                                                // so that it can be updated for ping tools without
+                                                // lagging clients
 
-#define	SVF_BROADCAST			0x00000004	// send to all connected clients
-#define SVF_MONSTER					0x00000008	// set if the entity is a bot
-#define	SVF_PORTAL				0x00000040	// merge a second pvs at origin2 into snapshots
-#define	SVF_USE_CURRENT_ORIGIN	0x00000080	// entity->r.currentOrigin instead of entity->s.origin
-											// for link position (missiles and movers)
-#define SVF_SINGLECLIENT		0x00000100	// only send to a single client (entityShared_t->singleClient)
-#define SVF_NOSERVERINFO		0x00000200	// don't send CS_SERVERINFO updates to this client
-											// so that it can be updated for ping tools without
-											// lagging clients
-#define SVF_CAPSULE				0x00000400	// use capsule for collision detection instead of bbox
-#define SVF_NOTSINGLECLIENT		0x00000800	// send entity to everyone but one client
-											// (entityShared_t->singleClient)
-
-#define SVF_USEBBOX				0x00001000
-#define SVF_SENDONCE			0x00004000
-
-#define SVF_HIDEOWNER			0x00008000
-#define SVF_SENDPVS				0x00010000
-
-typedef struct gclient_s gclient_t;
-typedef struct dtiki_s dtiki_t;
-typedef struct tiki_cmd_s tiki_cmd_t;
+typedef struct gclient_s   gclient_t;
+typedef struct dtiki_s     dtiki_t;
+typedef struct tiki_cmd_s  tiki_cmd_t;
 typedef struct dtikianim_s dtikianim_t;
-typedef struct tiki_s tiki_t;
+typedef struct tiki_s      tiki_t;
 
-typedef struct tikiAnim_s tikiAnim_t;
-typedef struct baseshader_s baseshader_t;
+typedef struct tikiAnim_s      tikiAnim_t;
+typedef struct baseshader_s    baseshader_t;
 typedef struct AliasListNode_s AliasListNode_t;
-typedef void( *xcommand_t ) ( void );
+typedef void (*xcommand_t)(void);
+
+#define MAX_NONPVS_SOUNDS 4
 
 typedef struct {
-	// su44: sharedEntity_t::s is used instead of it
-	//entityState_t	s;				// communicated by server to clients
+    int   index;
+    float volume;
+    float minDist;
+    float maxDist;
+    float pitch;
+} nonpvs_sound_t;
 
-	qboolean	linked;				// qfalse if not in any good cluster
-	int			linkcount;
+typedef struct {
+    // su44: sharedEntity_t::s is used instead of it
+    //entityState_t	s;				// communicated by server to clients
 
-	int			svFlags;			// SVF_NOCLIENT, SVF_BROADCAST, etc
+    qboolean linked; // qfalse if not in any good cluster
+    int      linkcount;
 
-	// only send to this client when SVF_SINGLECLIENT is set	
-	// if SVF_CLIENTMASK is set, use bitmask for clients to send to (maxclients must be <= 32, up to the mod to enforce this)
-	int			singleClient;
+    int svFlags; // SVF_NOCLIENT, SVF_BROADCAST, etc
 
-	int			lastNetTime;
+    // only send to this client when SVF_SINGLECLIENT is set
+    // if SVF_CLIENTMASK is set, use bitmask for clients to send to (maxclients must be <= 32, up to the mod to enforce this)
+    int singleClient;
 
-	qboolean	bmodel;				// if false, assume an explicit mins / maxs bounding box
-	// only set by gi.SetBrushModel
-	vec3_t		mins, maxs;
-	int			contents;			// CONTENTS_TRIGGER, CONTENTS_SOLID, CONTENTS_BODY, etc
-	// a non-solid entity should set to 0
+    int lastNetTime;
 
-	vec3_t		absmin, absmax;		// derived from mins/maxs and origin + rotation
+    qboolean bmodel; // if false, assume an explicit mins / maxs bounding box
+    // only set by gi.SetBrushModel
+    vec3_t mins, maxs;
+    int    contents; // CONTENTS_TRIGGER, CONTENTS_SOLID, CONTENTS_BODY, etc
+    // a non-solid entity should set to 0
 
-	float		radius;
+    vec3_t absmin, absmax; // derived from mins/maxs and origin + rotation
+    float  radius;
+    // centroid will be used for all collision detection and world linking.
+    // it will not necessarily be the same as the trajectory evaluation for the current
+    // time, because each entity must be moved one at a time after time is advanced
+    // to avoid simultanious collision issues
+    vec3_t centroid; // centroid, to be used with radius
 
-	// currentOrigin will be used for all collision detection and world linking.
-	// it will not necessarily be the same as the trajectory evaluation for the current
-	// time, because each entity must be moved one at a time after time is advanced
-	// to avoid simultanious collision issues
-	vec3_t		currentOrigin;
+    int areanum;
 
-	int			areanum;
+    vec3_t currentAngles;
 
-	vec3_t		currentAngles;
+    // when a trace call is made and passEntityNum != ENTITYNUM_NONE,
+    // an ent will be excluded from testing if:
+    // ent->s.number == passEntityNum	(don't interact with self)
+    // ent->s.ownerNum = passEntityNum	(don't interact with your own missiles)
+    // entity[ent->s.ownerNum].ownerNum = passEntityNum	(don't interact with other missiles from owner)
+    int ownerNum;
 
-	// when a trace call is made and passEntityNum != ENTITYNUM_NONE,
-	// an ent will be excluded from testing if:
-	// ent->s.number == passEntityNum	(don't interact with self)
-	// ent->s.ownerNum = passEntityNum	(don't interact with your own missiles)
-	// entity[ent->s.ownerNum].ownerNum = passEntityNum	(don't interact with other missiles from owner)
-	int			ownerNum;
+    // whether or not this entity emitted a sound this frame
+    // (used for when the entity shouldn't be sent to clients)
+    nonpvs_sound_t nonpvs_sounds[MAX_NONPVS_SOUNDS];
+    int            num_nonpvs_sounds;
 } entityShared_t;
 
 // client data that stays across multiple respawns, but is cleared
 // on each level change or team change at ClientBegin()
 typedef struct {
-	char			userinfo[ MAX_INFO_STRING ];
-	char			netname[ MAX_NAME_LENGTH ];
-	char			dm_playermodel[ MAX_QPATH ];
-	char			dm_playergermanmodel[ MAX_QPATH ];
-	char			dm_primary[ MAX_QPATH ];
+    char userinfo[MAX_INFO_STRING];
+    char netname[MAX_NAME_LENGTH];
+    char dm_playermodel[MAX_QPATH];
+    char dm_playergermanmodel[MAX_QPATH];
+    char dm_primary[MAX_QPATH];
 
-	float			enterTime;
+    float enterTime;
 
-	teamtype_t		teamnum;
-	int				round_kills;
+    teamtype_t teamnum;
+    int        round_kills;
 
-	char			ip[ 17 ];
-	int				port;
+    char ip[17];
+    int  port;
 } client_persistant_t;
 
-
 // this structure is cleared on each ClientSpawn(),
 // except for 'client->pers' and 'client->sess'
 struct gclient_s {
-	// ps MUST be the first element, because the server expects it
-	playerState_t			ps;				// communicated by server to clients
+    // ps MUST be the first element, because the server expects it
+    playerState_t ps; // communicated by server to clients
 
 #ifdef GAME_DLL
-	// the rest of the structure is private to game
-	int						ping;
-	client_persistant_t		pers;
-	float					cmd_angles[ 3 ];
+    // the rest of the structure is private to game
+    int                 ping;
+    client_persistant_t pers;
+    float               cmd_angles[3];
 
-	int						lastActiveTime;
-	int						activeWarning;
+    int lastActiveTime;
+    int activeWarning;
 
-	struct gentity_s		*ent;
-	struct gclient_s		*next;
-	struct gclient_s		*prev;
+    struct gentity_s *ent;
+    struct gclient_s *next;
+    struct gclient_s *prev;
 #endif
 };
 
 typedef struct gentity_s {
-	entityState_t		s;				// communicated by server to clients
+    entityState_t s; // communicated by server to clients
 
-	struct gclient_s	*client;			// NULL if not a client
-	qboolean			inuse;
+    struct gclient_s *client; // NULL if not a client
+    qboolean          inuse;
 
-	entityShared_t		r;				// shared by both the server system and game
+    entityShared_t r; // shared by both the server system and game
 
-	solid_t				solid;
-	dtiki_t				*tiki;
-	float				mat[ 3 ][ 3 ];
+    solid_t  solid;
+    dtiki_t *tiki;
+    float    mat[3][3];
 
-	// Leave reminder to the game dll
-#if defined( GAME_DLL )
-	class Entity		*entity;
-	float				freetime;
-	float				spawntime;
-	float				radius2;
-	char				entname[ 64 ];
-	int					clipmask;
+    // Leave reminder to the game dll
+#if defined(GAME_DLL)
+    class Entity *entity;
+    float         freetime;
+    float         spawntime;
+    float         radius2;
+    char          entname[64];
+    int           clipmask;
 
-	struct gentity_s	*next;
-	struct gentity_s	*prev;
+    struct gentity_s *next;
+    struct gentity_s *prev;
 #endif
 } gentity_t;
 
 // movers are things like doors, plats, buttons, etc
 typedef enum {
-	MOVER_POS1,
-	MOVER_POS2,
-	MOVER_1TO2,
-	MOVER_2TO1
+    MOVER_POS1,
+    MOVER_POS2,
+    MOVER_1TO2,
+    MOVER_2TO1
 } moverState_t;
 
-typedef struct profVar_s
-{
-	int start;
-	int clockCycles;
-	int calls;
-	float time;
-	float totTime;
-	float avgTime;
-	float low;
-	float high;
+typedef struct profVar_s {
+    int   start;
+    int   clockCycles;
+    int   calls;
+    float time;
+    float totTime;
+    float avgTime;
+    float low;
+    float high;
 
 } profVar_t;
 
-typedef struct profGame_s
-{
-	profVar_t AI;
-	profVar_t MmoveSingle;
-	profVar_t thread_timingList;
-	profVar_t gamescripts;
-	profVar_t GProbe1;
-	profVar_t GProbe2;
-	profVar_t GProbe3;
-	profVar_t FindPath;
-	profVar_t vector_length;
-	profVar_t script_trace;
-	profVar_t internal_trace;
-	profVar_t PreAnimate;
-	profVar_t PostAnimate;
+typedef struct profGame_s {
+    profVar_t AI;
+    profVar_t MmoveSingle;
+    profVar_t thread_timingList;
+    profVar_t gamescripts;
+    profVar_t GProbe1;
+    profVar_t GProbe2;
+    profVar_t GProbe3;
+    profVar_t FindPath;
+    profVar_t vector_length;
+    profVar_t script_trace;
+    profVar_t internal_trace;
+    profVar_t PreAnimate;
+    profVar_t PostAnimate;
 
 } profGame_t;
 
 //===============================================================
 
-typedef struct gameImport_s
-{
-	void ( *Printf )( const char *format, ... );
-	void ( *DPrintf )( const char *format, ... );
-	void ( *DPrintf2 )( const char *format, ... );
-	void ( *DebugPrintf )( const char *format, ... );
-	void ( *Error )( int level, const char *format, ... );
-	int ( *Milliseconds )( );
-	const char * ( *LV_ConvertString )( const char *string );
-	const char * ( *CL_LV_ConvertString )( const char *string );
-	void * ( *Malloc )( size_t size );
-	void ( *Free )( void *ptr );
-	cvar_t * ( *Cvar_Get )( const char *varName, const char *varValue, int varFlags );
-	void ( *cvar_set )( const char *varName, const char *varValue );
-	cvar_t *( *cvar_set2 )( const char *varName, const char *varValue, qboolean force );
-	cvar_t *( *NextCvar )( cvar_t *var );
-	int ( *Argc )( );
-	char * ( *Argv )( int arg );
-	char * ( *Args )( );
-	void ( *AddCommand )( const char *cmdName, xcommand_t cmdFunction );
-	int ( *FS_ReadFile )( const char *qpath, void **buffer, qboolean quiet );
-	void ( *FS_FreeFile )( void *buffer );
-	int ( *FS_WriteFile )( const char *qpath, const void *buffer, int size );
-	fileHandle_t ( *FS_FOpenFileWrite )( const char *fileName );
-	fileHandle_t ( *FS_FOpenFileAppend )( const char *fileName );
-	const char *( *FS_PrepFileWrite )( const char *fileName );
-	size_t( *FS_Write )( const void *buffer, size_t size, fileHandle_t fileHandle );
-	size_t( *FS_Read )( void *buffer, size_t len, fileHandle_t fileHandle );
-	void ( *FS_FCloseFile )( fileHandle_t fileHandle );
-	int ( *FS_Tell )( fileHandle_t fileHandle );
-	int ( *FS_Seek )( fileHandle_t fileHandle, long int offset, fsOrigin_t origin );
-	void ( *FS_Flush )( fileHandle_t fileHandle );
-	int ( *FS_FileNewer )( const char *source, const char *destination );
-	void ( *FS_CanonicalFilename )( char *fileName );
-	char **( *FS_ListFiles )( const char *qpath, const char *extension, qboolean wantSubs, int *numFiles );
-	void ( *FS_FreeFileList )( char **list );
-	const char *( *GetArchiveFileName )(const char *fileName, const char *extension );
-	void ( *SendConsoleCommand )( const char *text );
-	void ( *DebugGraph )( float value );
-	void ( *SendServerCommand )( int client, const char *format, ... );
-	void ( *DropClient )( int client, const char *reason );
-	void ( *MSG_WriteBits )( int value, int bits );
-	void ( *MSG_WriteChar )( int c );
-	void ( *MSG_WriteByte )( int c );
-	void ( *MSG_WriteSVC )( int c );
-	void ( *MSG_WriteShort )( int c );
-	void ( *MSG_WriteLong )( int c );
-	void ( *MSG_WriteFloat )( float f );
-	void ( *MSG_WriteString )( const char *s );
-	void ( *MSG_WriteAngle8 )( float f );
-	void ( *MSG_WriteAngle16 )(float f );
-	void ( *MSG_WriteCoord )( float f );
-	void ( *MSG_WriteDir )( vec3_t dir );
-	void ( *MSG_StartCGM )( int type );
-	void ( *MSG_EndCGM )( );
-	void ( *MSG_SetClient )( int client );
-	void ( *SetBroadcastVisible )( const vec3_t pos, const vec3_t posB );
-	void ( *SetBroadcastHearable )(const vec3_t pos, const vec3_t posB );
-	void ( *SetBroadcastAll )( );
-	void ( *setConfigstring )( int index, const char *val );
-	char *( *getConfigstring )( int index );
-	void ( *SetUserinfo )( int index, const char *val );
-	void ( *GetUserinfo )( int index, char *buffer, int bufferSize );
-	void ( *SetBrushModel )( gentity_t *ent, const char *name );
-	void ( *ModelBoundsFromName )(const char *name, vec3_t mins, vec3_t maxs );
-	qboolean ( *SightTraceEntity )( gentity_t *touch, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int contentMask, qboolean cylinder );
-	qboolean ( *SightTrace )( const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int passEntityNum2, int contentMask, qboolean cylinder );
-	void ( *trace )( trace_t *results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int contentMask, qboolean cylinder, qboolean traceDeep );
-	baseshader_t * ( *GetShader )( int shaderNum );
-	int ( *pointcontents )( const vec3_t p, int passEntityNum );
-	int ( *PointBrushnum )(const vec3_t p, clipHandle_t model );
-	void ( *AdjustAreaPortalState )( gentity_t *ent, qboolean open );
-	int ( *AreaForPoint )( vec3_t pos );
-	qboolean ( *AreasConnected )( int area1, int area2);
-	qboolean ( *InPVS )( float *p1, float *p2 );
-	void ( *linkentity )( gentity_t *gEnt );
-	void ( *unlinkentity )( gentity_t *gEnt );
-	int ( *AreaEntities )( const vec3_t mins, const vec3_t maxs, int *list, int maxcount );
-	void ( *ClipToEntity )( trace_t *tr, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int entityNum, int contentMask );
-	qboolean (*HitEntity)(gentity_t* pEnt, gentity_t* pOther);
-	int ( *imageindex )( const char *name );
-	int ( *itemindex )( const char *name );
-	int ( *soundindex )( const char *name, int streamed );
-	dtiki_t *( *TIKI_RegisterModel )( const char *path );
-	dtiki_t *( *modeltiki )( const char *name );
-	dtikianim_t *( *modeltikianim )( const char *name );
-	void ( *SetLightStyle )( int index, const char *data );
-	const char *( *GameDir )( );
-	qboolean ( *setmodel )( gentity_t *ent, const char *name );
-	void ( *clearmodel )( gentity_t *ent );
-	int ( *TIKI_NumAnims )( dtiki_t *tiki );
-	int ( *NumSurfaces )( dtiki_t *tiki );
-	int ( *NumTags )( dtiki_t *tiki );
-	void( *CalculateBounds )( dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs );
-	void *( *TIKI_GetSkeletor )( dtiki_t *tiki, int entNum );
-	const char *( *Anim_NameForNum )( dtiki_t *tiki, int animNum );
-	int ( *Anim_NumForName )( dtiki_t *tiki, const char *name );
-	int ( *Anim_Random )( dtiki_t *tiki, const char *name );
-	int ( *Anim_NumFrames )( dtiki_t *tiki, int animNum );
-	float ( *Anim_Time )( dtiki_t *tiki, int animNum );
-	float ( *Anim_Frametime )( dtiki_t *tiki, int animNum );
-	float ( *Anim_CrossTime )( dtiki_t *tiki, int animNum );
-	void ( *Anim_Delta )( dtiki_t *tiki, int animNum, float *delta );
-	qboolean ( *Anim_HasDelta )( dtiki_t *tiki, int animNum );
-	void ( *Anim_DeltaOverTime )( dtiki_t *tiki, int animNum, float time1, float time2, float *delta );
-	void ( *Anim_AngularDeltaOverTime )( dtiki_t *tiki, int animNum, float time1, float time2, float *delta );
-	int ( *Anim_Flags )( dtiki_t *tiki, int animNum );
-	int ( *Anim_FlagsSkel )( dtiki_t *tiki, int animNum );
-	qboolean ( *Anim_HasCommands )( dtiki_t *tiki, int animNum );
-	int ( *NumHeadModels )( const char *model );
-	void ( *GetHeadModel )( const char *model, int num, char *name );
-	int ( *NumHeadSkins )( const char *model );
-	void ( *GetHeadSkin )( const char *model, int num, char *name );
-	qboolean ( *Frame_Commands )( dtiki_t *tiki, int animNum, int frameNum, tiki_cmd_t *tikiCmds );
-	int ( *Surface_NameToNum )( dtiki_t *tiki, const char *name );
-	const char * ( *Surface_NumToName )( dtiki_t *tiki, int surfacenum );
-	int ( *Tag_NumForName )( dtiki_t *pmdl, const char *name );
-	const char * ( *Tag_NameForNum )(  dtiki_t *pmdl, int tagNum);
-	orientation_t ( *TIKI_OrientationInternal )( dtiki_t *tiki, int entNum, int tagNum, float scale );
-	void *( *TIKI_TransformInternal )( dtiki_t *tiki, int entNum, int tagNum );
-	qboolean ( *TIKI_IsOnGroundInternal )( dtiki_t *tiki, int entNum, int num, float threshold );
-	void ( *TIKI_SetPoseInternal )( dtiki_t *tiki, int entNum, const frameInfo_t *frameInfo, int *boneTag, vec4_t *boneQuat, float actionWeight );
-	const char *( *CM_GetHitLocationInfo )( int location, float *radius, float *offset );
-	const char *( *CM_GetHitLocationInfoSecondary )( int location, float *radius, float *offset );
+typedef struct gameImport_s {
+    void (*Printf)(const char *format, ...);
+    void (*DPrintf)(const char *format, ...);
+    void (*DPrintf2)(const char *format, ...);
+    void (*DebugPrintf)(const char *format, ...);
+    void (*Error)(int level, const char *format, ...);
+    int (*Milliseconds)();
+    const char *(*LV_ConvertString)(const char *string);
 
-	qboolean	( *Alias_Add )( dtiki_t *pmdl, const char *alias, const char *name, const char *parameters );
-	const char	*( *Alias_FindRandom )( dtiki_t *tiki, const char *alias, AliasListNode_t **ret );
-	void		( *Alias_Dump )( dtiki_t *tiki );
-	void		( *Alias_Clear )( dtiki_t *tiki );
-	void		( *Alias_UpdateDialog )( dtikianim_t *tiki, const char *alias );
+    // Added in 2.0
+    const char *(*CL_LV_ConvertString)(const char *string);
 
-	const char	*( *TIKI_NameForNum )( dtiki_t *tiki );
+    void *(*Malloc)(size_t size);
+    void (*Free)(void *ptr);
+    cvar_t *(*Cvar_Get)(const char *varName, const char *varValue, int varFlags);
+    void (*cvar_set)(const char *varName, const char *varValue);
+    cvar_t *(*cvar_set2)(const char *varName, const char *varValue, qboolean force);
+    cvar_t *(*NextCvar)(cvar_t *var);
+    void (*Cvar_CheckRange)(cvar_t* var, float min, float max, qboolean integral);
 
-	qboolean	( *GlobalAlias_Add )( const char *alias, const char *name, const char *parameters );
-	const char	*( *GlobalAlias_FindRandom )( const char *alias, AliasListNode_t **ret );
-	void		( *GlobalAlias_Dump )( );
-	void		( *GlobalAlias_Clear )( );
+    int (*Argc)();
+    char *(*Argv)(int arg);
+    char *(*Args)();
+    void (*AddCommand)(const char *cmdName, xcommand_t cmdFunction);
+    long (*FS_ReadFile)(const char *qpath, void **buffer, qboolean quiet);
+    void (*FS_FreeFile)(void *buffer);
+    int (*FS_WriteFile)(const char *qpath, const void *buffer, int size);
+    fileHandle_t (*FS_FOpenFileWrite)(const char *fileName);
+    fileHandle_t (*FS_FOpenFileAppend)(const char *fileName);
+    long (*FS_FOpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
+    const char *(*FS_PrepFileWrite)(const char *fileName);
+    size_t (*FS_Write)(const void *buffer, size_t size, fileHandle_t fileHandle);
+    size_t (*FS_Read)(void *buffer, size_t len, fileHandle_t fileHandle);
+    void (*FS_FCloseFile)(fileHandle_t fileHandle);
+    int (*FS_Tell)(fileHandle_t fileHandle);
+    int (*FS_Seek)(fileHandle_t fileHandle, long int offset, int origin);
+    void (*FS_Flush)(fileHandle_t fileHandle);
+    int (*FS_FileNewer)(const char *source, const char *destination);
+    void (*FS_CanonicalFilename)(char *fileName);
+    char **(*FS_ListFiles)(const char *qpath, const char *extension, qboolean wantSubs, int *numFiles);
+    void (*FS_FreeFileList)(char **list);
+    const char *(*GetArchiveFileName)(const char *fileName, const char *extension);
+    void (*SendConsoleCommand)(const char *text);
 
-	void ( *centerprintf )( gentity_t *ent, const char *format, ... );
-	void ( *locationprintf )( gentity_t *ent, int x, int y, const char *format, ... );
-	void ( *Sound )( vec3_t *org, int entNum, int channel, const char *soundName, float volume, float minDist, float pitch, float maxDist, int streamed );
-	void ( *StopSound )( int entNum, int channel );
-	float ( *SoundLength )( int channel, const char *name );
-	unsigned char * ( *SoundAmplitudes )( int channel, const char *name );
-	int( *S_IsSoundPlaying )( int channel, const char *name );
-	short unsigned int ( *CalcCRC )( unsigned char *start, int count );
+    // Added in 2.0
+    void (*ExecuteConsoleCommand)(int exec_when, const char *text);
 
-	debugline_t **DebugLines;
-	int *numDebugLines;
-	debugstring_t **DebugStrings;
-	int *numDebugStrings;
+    void (*DebugGraph)(float value);
+    void (*SendServerCommand)(int client, const char *format, ...);
+    void (*DropClient)(int client, const char *reason);
+    void (*MSG_WriteBits)(int value, int bits);
+    void (*MSG_WriteChar)(int c);
+    void (*MSG_WriteByte)(int c);
+    void (*MSG_WriteSVC)(int c);
+    void (*MSG_WriteShort)(int c);
+    void (*MSG_WriteLong)(int c);
+    void (*MSG_WriteFloat)(float f);
+    void (*MSG_WriteString)(const char *s);
+    void (*MSG_WriteAngle8)(float f);
+    void (*MSG_WriteAngle16)(float f);
+    void (*MSG_WriteCoord)(float f);
+    void (*MSG_WriteDir)(vec3_t dir);
+    void (*MSG_StartCGM)(int type);
+    void (*MSG_EndCGM)();
+    void (*MSG_SetClient)(int client);
+    void (*SetBroadcastVisible)(const vec3_t pos, const vec3_t posB);
+    void (*SetBroadcastHearable)(const vec3_t pos, const vec3_t posB);
+    void (*SetBroadcastAll)();
+    void (*setConfigstring)(int index, const char *val);
+    char *(*getConfigstring)(int index);
+    void (*SetUserinfo)(int index, const char *val);
+    void (*GetUserinfo)(int index, char *buffer, int bufferSize);
+    void (*SetBrushModel)(gentity_t *ent, const char *name);
+    void (*ModelBoundsFromName)(const char *name, vec3_t mins, vec3_t maxs);
+    qboolean (*SightTraceEntity)(
+        gentity_t   *touch,
+        const vec3_t start,
+        const vec3_t mins,
+        const vec3_t maxs,
+        const vec3_t end,
+        int          contentMask,
+        qboolean     cylinder
+    );
+    qboolean (*SightTrace)(
+        const vec3_t start,
+        const vec3_t mins,
+        const vec3_t maxs,
+        const vec3_t end,
+        int          passEntityNum,
+        int          passEntityNum2,
+        int          contentMask,
+        qboolean     cylinder
+    );
+    void (*trace)(
+        trace_t     *results,
+        const vec3_t start,
+        const vec3_t mins,
+        const vec3_t maxs,
+        const vec3_t end,
+        int          passEntityNum,
+        int          contentMask,
+        qboolean     cylinder,
+        qboolean     traceDeep
+    );
 
-	void ( *LocateGameData )( gentity_t *gEnts, int numGEntities, int sizeofGEntity, playerState_t *clients, int sizeofGameClient );
-	void ( *SetFarPlane )(int farPlane );
-	void ( *SetSkyPortal )( qboolean skyPortal );
-	void ( *Popmenu )( int client , int i );
-	void ( *Showmenu )( int client, const char *name, qboolean force );
-	void ( *Hidemenu )( int client, const char *name, qboolean force );
-	void ( *Pushmenu )( int client, const char *name );
-	void ( *HideMouseCursor )( int client );
-	void ( *ShowMouseCursor )( int client );
-	const char * ( *MapTime )( );
-	void ( *LoadResource )( const char *name );
-	void ( *ClearResource )( );
-	int ( *Key_StringToKeynum )( const char *str );
-	const char *( *Key_KeynumToBindString )( int keyNum );
-	void ( *Key_GetKeysForCommand )( const char *command, int *key1, int *key2 );
-	void ( *ArchiveLevel )( qboolean loading );
-	void ( *AddSvsTimeFixup )( int *piTime );
-	void ( *HudDrawShader )( int info, char *name );
-	void ( *HudDrawAlign )( int info, int horizontalAlign, int verticalAlign );
-	void ( *HudDrawRect )( int info, int x, int y, int width, int height );
-	void ( *HudDrawVirtualSize )( int info, qboolean virtualScreen);
-	void ( *HudDrawColor )( int info, float *color );
-	void ( *HudDrawAlpha )( int info, float alpha );
-	void ( *HudDrawString )( int info, const char *string );
-	void ( *HudDrawFont )( int info, const char *fontName );
-	qboolean ( *SanitizeName )(const char *oldName, char *newName);
+    // Added in 2.0
+    float (*CM_VisualObfuscation)(const vec3_t start, const vec3_t end);
 
-	cvar_t *fsDebug;
+    baseshader_t *(*GetShader)(int shaderNum);
+    int (*pointcontents)(const vec3_t p, int passEntityNum);
+    int (*PointBrushnum)(const vec3_t p, clipHandle_t model);
+    void (*AdjustAreaPortalState)(gentity_t *ent, qboolean open);
+    int (*AreaForPoint)(vec3_t pos);
+    qboolean (*AreasConnected)(int area1, int area2);
+    qboolean (*InPVS)(float *p1, float *p2);
+    void (*linkentity)(gentity_t *gEnt);
+    void (*unlinkentity)(gentity_t *gEnt);
+    int (*AreaEntities)(const vec3_t mins, const vec3_t maxs, int *list, int maxcount);
+    void (*ClipToEntity)(
+        trace_t     *tr,
+        const vec3_t start,
+        const vec3_t mins,
+        const vec3_t maxs,
+        const vec3_t end,
+        int          entityNum,
+        int          contentMask
+    );
 
-	//
-	// New functions will start from here
-	//
+    // Added in 2.0
+    qboolean (*HitEntity)(gentity_t *pEnt, gentity_t *pOther);
+
+    int (*imageindex)(const char *name);
+    int (*itemindex)(const char *name);
+    int (*soundindex)(const char *name, int streamed);
+    dtiki_t *(*TIKI_RegisterModel)(const char *path);
+    dtiki_t *(*modeltiki)(const char *name);
+    dtikianim_t *(*modeltikianim)(const char *name);
+    void (*SetLightStyle)(int index, const char *data);
+    const char *(*GameDir)();
+    qboolean (*setmodel)(gentity_t *ent, const char *name);
+    void (*clearmodel)(gentity_t *ent);
+    int (*TIKI_NumAnims)(dtiki_t *tiki);
+    int (*TIKI_NumSurfaces)(dtiki_t *tiki);
+    int (*TIKI_NumTags)(dtiki_t *tiki);
+    void (*TIKI_CalculateBounds)(dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs);
+    void *(*TIKI_GetSkeletor)(dtiki_t *tiki, int entNum);
+    const char *(*Anim_NameForNum)(dtiki_t *tiki, int animNum);
+    int (*Anim_NumForName)(dtiki_t *tiki, const char *name);
+    int (*Anim_Random)(dtiki_t *tiki, const char *name);
+    int (*Anim_NumFrames)(dtiki_t *tiki, int animNum);
+    float (*Anim_Time)(dtiki_t *tiki, int animNum);
+    float (*Anim_Frametime)(dtiki_t *tiki, int animNum);
+    float (*Anim_CrossTime)(dtiki_t *tiki, int animNum);
+    void (*Anim_Delta)(dtiki_t *tiki, int animNum, float *delta);
+
+    // Added in 2.0
+    void (*Anim_AngularDelta)(dtiki_t *tiki, int animNum, float *delta);
+
+    qboolean (*Anim_HasDelta)(dtiki_t *tiki, int animNum);
+    void (*Anim_DeltaOverTime)(dtiki_t *tiki, int animNum, float time1, float time2, float *delta);
+
+    // Added in 2.0
+    void (*Anim_AngularDeltaOverTime)(dtiki_t *tiki, int animNum, float time1, float time2, float *delta);
+
+    int (*Anim_Flags)(dtiki_t *tiki, int animNum);
+    int (*Anim_FlagsSkel)(dtiki_t *tiki, int animNum);
+    qboolean (*Anim_HasCommands)(dtiki_t *tiki, int animNum);
+    qboolean (*Anim_HasCommands_Client)(dtiki_t *tiki, int animNum);
+    int (*NumHeadModels)(const char *model);
+    void (*GetHeadModel)(const char *model, int num, char *name);
+    int (*NumHeadSkins)(const char *model);
+    void (*GetHeadSkin)(const char *model, int num, char *name);
+    qboolean (*Frame_Commands)(dtiki_t *tiki, int animNum, int frameNum, tiki_cmd_t *tikiCmds);
+    qboolean (*Frame_Commands_Client)(dtiki_t *tiki, int animNum, int frameNum, tiki_cmd_t *tikiCmds);
+    int (*Surface_NameToNum)(dtiki_t *tiki, const char *name);
+    const char *(*Surface_NumToName)(dtiki_t *tiki, int surfacenum);
+    int (*Tag_NumForName)(dtiki_t *pmdl, const char *name);
+    const char *(*Tag_NameForNum)(dtiki_t *pmdl, int tagNum);
+    orientation_t (*TIKI_OrientationInternal)(dtiki_t *tiki, int entNum, int tagNum, float scale);
+    void *(*TIKI_TransformInternal)(dtiki_t *tiki, int entNum, int tagNum);
+    qboolean (*TIKI_IsOnGroundInternal)(dtiki_t *tiki, int entNum, int num, float threshold);
+    void (*TIKI_SetPoseInternal)(
+        dtiki_t *tiki, int entNum, const frameInfo_t *frameInfo, int *boneTag, vec4_t *boneQuat, float actionWeight
+    );
+    const char *(*CM_GetHitLocationInfo)(int location, float *radius, float *offset);
+    const char *(*CM_GetHitLocationInfoSecondary)(int location, float *radius, float *offset);
+
+    qboolean (*Alias_Add)(dtiki_t *pmdl, const char *alias, const char *name, const char *parameters);
+    const char *(*Alias_FindRandom)(dtiki_t *tiki, const char *alias, AliasListNode_t **ret);
+    void (*Alias_Dump)(dtiki_t *tiki);
+    void (*Alias_Clear)(dtiki_t *tiki);
+    void (*Alias_UpdateDialog)(dtikianim_t *tiki, const char *alias);
+
+    const char *(*TIKI_NameForNum)(dtiki_t *tiki);
+
+    qboolean (*GlobalAlias_Add)(const char *alias, const char *name, const char *parameters);
+    const char *(*GlobalAlias_FindRandom)(const char *alias, AliasListNode_t **ret);
+    void (*GlobalAlias_Dump)();
+    void (*GlobalAlias_Clear)();
+
+    void (*centerprintf)(gentity_t *ent, const char *format, ...);
+    void (*locationprintf)(gentity_t *ent, int x, int y, const char *format, ...);
+    void (*Sound)(
+        vec3_t     *org,
+        int         entNum,
+        int         channel,
+        const char *soundName,
+        float       volume,
+        float       minDist,
+        float       pitch,
+        float       maxDist,
+        int         streamed
+    );
+    void (*StopSound)(int entNum, int channel);
+    float (*SoundLength)(int channel, const char *name);
+    unsigned char *(*SoundAmplitudes)(int channel, const char *name);
+    int (*S_IsSoundPlaying)(int channel, const char *name);
+    short unsigned int (*CalcCRC)(unsigned char *start, int count);
+
+    debugline_t   **DebugLines;
+    int            *numDebugLines;
+    debugstring_t **DebugStrings;
+    int            *numDebugStrings;
+
+    void (*LocateGameData)(
+        gentity_t *gEnts, int numGEntities, int sizeofGEntity, playerState_t *clients, int sizeofGameClient
+    );
+    void (*SetFarPlane)(int farPlane);
+    void (*SetSkyPortal)(qboolean skyPortal);
+    void (*Popmenu)(int client, int i);
+    void (*Showmenu)(int client, const char *name, qboolean force);
+    void (*Hidemenu)(int client, const char *name, qboolean force);
+    void (*Pushmenu)(int client, const char *name);
+    void (*HideMouseCursor)(int client);
+    void (*ShowMouseCursor)(int client);
+    const char *(*MapTime)();
+    void (*LoadResource)(const char *name);
+    void (*ClearResource)();
+    int (*Key_StringToKeynum)(const char *str);
+    const char *(*Key_KeynumToBindString)(int keyNum);
+    void (*Key_GetKeysForCommand)(const char *command, int *key1, int *key2);
+    void (*ArchiveLevel)(qboolean loading);
+    void (*AddSvsTimeFixup)(int *piTime);
+    void (*HudDrawShader)(int info, const char *name);
+    void (*HudDrawAlign)(int info, int horizontalAlign, int verticalAlign);
+    void (*HudDrawRect)(int info, int x, int y, int width, int height);
+    void (*HudDrawVirtualSize)(int info, qboolean virtualScreen);
+    void (*HudDrawColor)(int info, float *color);
+    void (*HudDrawAlpha)(int info, float alpha);
+    void (*HudDrawString)(int info, const char *string);
+    void (*HudDrawFont)(int info, const char *fontName);
+    qboolean (*SanitizeName)(const char *oldName, char *newName, size_t bufferSize);
+
+    //
+    // Added in OPM
+    //
+
+    int (*pvssoundindex)(const char* name, int streamed);
+
+    cvar_t *fsDebug;
+
+    //
+    // New functions will start from here
+    //
 
 } game_import_t;
 
 typedef struct gameExport_s {
-	int			apiversion;
+    int apiversion;
 
-	// the init function will only be called when a game starts,
-	// not each time a level is loaded.  Persistant data for clients
-	// and the server can be allocated in init
-	void			( *Init )( int startTime, int randomSeed );
-	void			( *Shutdown ) ( void );
-	void			( *Cleanup ) ( qboolean samemap );
-	void			( *Precache )( void );
+    // the init function will only be called when a game starts,
+    // not each time a level is loaded.  Persistant data for clients
+    // and the server can be allocated in init
+    void (*Init)(int startTime, int randomSeed);
+    void (*Shutdown)(void);
+    void (*Cleanup)(qboolean samemap);
+    void (*Precache)(void);
 
-	void			( *SetMap )( const char *mapName );
-	void			( *Restart )( );
-	void			( *SetTime )( int svsStartTime, int svsTime );
+    void (*SetMap)(const char *mapName);
+    void (*Restart)();
+    void (*SetTime)(int svsStartTime, int svsTime);
 
-	// each new level entered will cause a call to SpawnEntities
-	void			( *SpawnEntities ) ( char *entstring, int levelTime );
+    // each new level entered will cause a call to SpawnEntities
+    void (*SpawnEntities)(char *entstring, int levelTime);
 
-	// return NULL if the client is allowed to connect, otherwise return
-	// a text string with the reason for denial
-	const char *	( *ClientConnect )( int clientNum, qboolean firstTime );
+    // return NULL if the client is allowed to connect, otherwise return
+    // a text string with the reason for denial
+    const char *(*ClientConnect)(int clientNum, qboolean firstTime, qboolean differentMap);
 
-	void			( *ClientBegin )( gentity_t *ent, usercmd_t *cmd );
-	void			( *ClientUserinfoChanged )( gentity_t *ent, const char *userinfo );
-	void			( *ClientDisconnect )( gentity_t *ent );
-	void			( *ClientCommand )( gentity_t *ent );
-	void			( *ClientThink )( gentity_t *ent, usercmd_t *cmd, usereyes_t *eyeinfo );
+    void (*ClientBegin)(gentity_t *ent, usercmd_t *cmd);
+    void (*ClientUserinfoChanged)(gentity_t *ent, const char *userinfo);
+    void (*ClientDisconnect)(gentity_t *ent);
+    void (*ClientCommand)(gentity_t *ent);
+    void (*ClientThink)(gentity_t *ent, usercmd_t *cmd, usereyes_t *eyeinfo);
 
-	void			( *BotBegin )( gentity_t *ent);
-	void			( *BotThink )( gentity_t *ent, int msec );
+    void (*BotBegin)(gentity_t *ent);
+    void (*BotThink)(gentity_t *ent, int msec);
 
-	void			( *PrepFrame )( void );
-	void			( *RunFrame )( int levelTime, int frameTime );
+    void (*PrepFrame)(void);
+    void (*RunFrame)(int levelTime, int frameTime);
 
-	void			( *ServerSpawned )( void );
+    void (*ServerSpawned)(void);
 
-	void			( *RegisterSounds )( );
-	qboolean		( *AllowPaused )( );
+    void (*RegisterSounds)();
+    qboolean (*AllowPaused)();
 
-	// ConsoleCommand will be called when a command has been issued
-	// that is not recognized as a builtin function.
-	// The game can issue gi.argc() / gi.argv() commands to get the command
-	// and parameters.  Return qfalse if the game doesn't recognize it as a command.
-	qboolean		( *ConsoleCommand )( void );
+    // ConsoleCommand will be called when a command has been issued
+    // that is not recognized as a builtin function.
+    // The game can issue gi.argc() / gi.argv() commands to get the command
+    // and parameters.  Return qfalse if the game doesn't recognize it as a command.
+    qboolean (*ConsoleCommand)(void);
 
-	void			( *ArchivePersistant )( const char *name, qboolean loading );
+    void (*ArchivePersistant)(const char *name, qboolean loading);
 
-	// ReadLevel is called after the default map information has been
-	// loaded with SpawnEntities, so any stored client spawn spots will
-	// be used when the clients reconnect.
-	void			( *WriteLevel )( const char *filename, qboolean autosave );
-	qboolean		( *ReadLevel )( const char *filename );
-	qboolean		( *LevelArchiveValid )( const char *filename );
+    // ReadLevel is called after the default map information has been
+    // loaded with SpawnEntities, so any stored client spawn spots will
+    // be used when the clients reconnect.
+    void (*WriteLevel)(const char *filename, qboolean autosave, byte** savedCgameState, size_t* savedCgameStateSize);
+    qboolean (*ReadLevel)(const char *filename, byte** savedCgameState, size_t* savedCgameStateSize);
+    qboolean (*LevelArchiveValid)(const char *filename);
 
-	void			( *ArchiveInteger )( int *i );
-	void			( *ArchiveFloat )( float *fl );
-	void			( *ArchiveString )( char *s );
-	void			( *ArchiveSvsTime )( int *pi );
-	orientation_t	( *TIKI_Orientation )( gentity_t *edict, int num );
-	void			( *DebugCircle )( float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal );
-	void			( *SetFrameNumber )( int frameNumber );
-	void			( *SoundCallback )( int entNum, soundChannel_t channelNumber, const char *name );
+    void (*ArchiveInteger)(int *i);
+    void (*ArchiveFloat)(float *fl);
+    void (*ArchiveString)(char *s);
+    void (*ArchiveSvsTime)(int *pi);
+    orientation_t (*TIKI_Orientation)(gentity_t *edict, int num);
+    void (*DebugCircle)(float *org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+    void (*SetFrameNumber)(int frameNumber);
+    void (*SoundCallback)(int entNum, soundChannel_t channelNumber, const char *name);
 
-	//
-	// global variables shared between game and server
-	//
+    //
+    // global variables shared between game and server
+    //
 
-	// The gentities array is allocated in the game dll so it
-	// can vary in size from one game to another.
-	// 
-	// The size will be fixed when ge->Init() is called
-	// the server can't just use pointer arithmetic on gentities, because the
-	// server's sizeof(struct gentity_s) doesn't equal gentitySize
-	profGame_t			*profStruct;
-	struct gentity_s	*gentities;
-	int					gentitySize;
-	int					num_entities;		// current number, <= max_entities
-	int					max_entities;
+    // The gentities array is allocated in the game dll so it
+    // can vary in size from one game to another.
+    //
+    // The size will be fixed when ge->Init() is called
+    // the server can't just use pointer arithmetic on gentities, because the
+    // server's sizeof(struct gentity_s) doesn't equal gentitySize
+    profGame_t       *profStruct;
+    struct gentity_s *gentities;
+    int               gentitySize;
+    int               num_entities; // current number, <= max_entities
+    int               max_entities;
 
-	const char        *errorMessage;
+    const char *errorMessage;
 } game_export_t;
 
 #ifdef __cplusplus
@@ -496,13 +584,13 @@ extern "C"
 #endif
 
 #ifdef GAME_DLL
-#ifdef WIN32
-__declspec(dllexport)
-#else
+#    ifdef WIN32
+    __declspec(dllexport)
+#    else
 __attribute__((visibility("default")))
+#    endif
 #endif
-#endif
-game_export_t* GetGameAPI( game_import_t *import );
+        game_export_t *GetGameAPI(game_import_t *import);
 
 #if 0
 //
diff --git a/code/fgame/g_session.cpp b/code/fgame/g_session.cpp
index 7056c800..f133c2e5 100644
--- a/code/fgame/g_session.cpp
+++ b/code/fgame/g_session.cpp
@@ -58,9 +58,10 @@ G_ReadSessionData
 Called on a reconnect
 ================
 */
-void G_ReadSessionData( gclient_t *client )
+void G_ReadClientSessionData( gclient_t *client )
 {
 	cvar_t *session;
+    int teamnum;
 
 	if( g_bNewSession ) {
 		return;
@@ -68,11 +69,12 @@ void G_ReadSessionData( gclient_t *client )
 
 	session = gi.Cvar_Get(va("session%zi", client - game.clients), "", 0);
 	
-	sscanf( session->string, "%s %i %i", client->pers.dm_primary, &client->pers.teamnum, &client->pers.round_kills);
+	sscanf( session->string, "%s %i %i", client->pers.dm_primary, &teamnum, &client->pers.round_kills);
 	if( client->pers.dm_primary[ 0 ] == '-' )
 	{
 		client->pers.dm_primary[ 0 ] = 0;
 	}
+    client->pers.teamnum = (teamtype_t)teamnum;
 }
 
 
@@ -83,8 +85,15 @@ G_InitSessionData
 Called on a first-time connect
 ================
 */
-void G_InitSessionData( gclient_t *client, const char *userinfo )
+void G_InitClientPersistant( gclient_t *client, const char *userinfo )
 {
+	// Clear the persistent data
+	client->pers = {};
+
+	// Added in OPM
+	//  Reset the persistent session data.
+	//  This fixes some bugs like the player getting score
+	//  from previous maps
 	G_WriteClientSessionData( client );
 }
 
@@ -96,16 +105,13 @@ G_InitWorldSession
 ==================
 */
 void G_InitWorldSession( void ) {
-	char	s[MAX_STRING_CHARS];
-	int			gt;
+	int gt;
 
-	cvar_t *v = gi.Cvar_Get( "session", "", 0 );
-
-	gt = atoi( s );
+	cvar_t *v = gi.Cvar_Get( "session", "-1", 0 );
 	
 	// if the gametype changed since the last session, don't use any
 	// client sessions
-	if ( g_gametype->integer != gt ) {
+	if ( g_gametype->integer != v->integer ) {
 		G_Printf( "Gametype changed, clearing session data.\n" );
 	}
 }
diff --git a/code/fgame/g_spawn.cpp b/code/fgame/g_spawn.cpp
index 58a438d4..6875eb29 100644
--- a/code/fgame/g_spawn.cpp
+++ b/code/fgame/g_spawn.cpp
@@ -22,56 +22,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // g_spawn.cpp : spawner for scripts.
 
-#include "glb_local.h"
+#include "g_local.h"
 #include "g_spawn.h"
 #include "../script/scriptvariable.h"
 #include "object.h"
 #include "../qcommon/tiki.h"
 
-#ifdef GAME_DLL
 #include "../fgame/entity.h"
 #include "../fgame/actor.h"
-#endif
-
-#if defined ( GAME_DLL )
-#define scriptcheck g_scriptcheck
-#elif defined( CGAME_DLL )
-#define scriptcheck cg_scriptcheck
-#else
-#define scriptcheck g_scriptcheck
-#endif
 
 extern Event EV_Entity_Start;
-CLASS_DECLARATION( Class, SpawnArgs, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(Class, SpawnArgs, NULL) {
+    {NULL, NULL}
 };
 
-Container< SafePtr< Listener > > g_spawnlist;
+Container<SafePtr<Listener>> g_spawnlist;
 
-SpawnArgs::SpawnArgs()
+SpawnArgs::SpawnArgs() {}
+
+SpawnArgs::SpawnArgs(SpawnArgs& otherlist)
 {
+    int num;
+    int i;
+
+    num = otherlist.NumArgs();
+    keyList.Resize(num);
+    valueList.Resize(num);
+    for (i = 1; i <= num; i++) {
+        keyList.AddObject(otherlist.keyList.ObjectAt(i));
+        valueList.AddObject(otherlist.valueList.ObjectAt(i));
+    }
 }
 
-SpawnArgs::SpawnArgs( SpawnArgs &otherlist )
+void SpawnArgs::Clear(void)
 {
-	int num;
-	int i;
-	
-	num = otherlist.NumArgs();
-	keyList.Resize( num );
-	valueList.Resize( num );
-	for( i = 1; i <= num; i++ )
-	{
-		keyList.AddObject( otherlist.keyList.ObjectAt( i ) );
-		valueList.AddObject( otherlist.valueList.ObjectAt( i ) );
-	}
-}
-
-void SpawnArgs::Clear( void )
-{
-	keyList.FreeObjectList();
-	valueList.FreeObjectList();
+    keyList.FreeObjectList();
+    valueList.FreeObjectList();
 }
 
 /*
@@ -82,142 +68,129 @@ Parses spawnflags out of the given string, returning the new position.
 Clears out any previous args.
 ====================
 */
-char *SpawnArgs::Parse( char *data, bool bAllowUtils )
+char *SpawnArgs::Parse(char *data, bool bAllowUtils)
 {
-	str         keyname;
-	const char	*com_token;
-	
-	Clear();
-	
-	// parse the opening brace
-	com_token = COM_Parse( &data );
-	if ( !data )
-	{
-		return NULL;
-	}
-	
-	if ( com_token[ 0 ] != '{' )
-	{
-		glbs.Error( ERR_DROP, "SpawnArgs::Parse : found %s when expecting {", com_token );
-	}
-	
-	// go through all the dictionary pairs
-	while( 1 )
-	{
-		// parse key
-		com_token = COM_Parse( &data );
-		if ( com_token[ 0 ] == '}' )
-		{
-			break;
-		}
-		
-		if ( !data )
-		{
-			glbs.Error( ERR_DROP, "SpawnArgs::Parse : EOF without closing brace" );
-		}
-		
-		keyname = com_token;
-		
-		// parse value
-		com_token = COM_Parse( &data );
-		if ( !data )
-		{
-			glbs.Error( ERR_DROP, "SpawnArgs::Parse : EOF without closing brace" );
-		}
-		
-		if ( com_token[ 0 ] == '}' )
-		{
-			glbs.Error( ERR_DROP, "SpawnArgs::Parse : closing brace without data" );
-		}
-		
-		// keynames with a leading underscore are used for utility comments,
-		// and are immediately discarded by the game
-		if ( !bAllowUtils && keyname[ 0 ] == '_' )
-		{
-			continue;
-		}
-		
-		setArg( keyname.c_str(), com_token );
-	}
-	
-	return data;
+    str         keyname;
+    const char *com_token;
+
+    Clear();
+
+    // parse the opening brace
+    com_token = COM_Parse(&data);
+    if (!data) {
+        return NULL;
+    }
+
+    if (com_token[0] != '{') {
+        gi.Error(ERR_DROP, "SpawnArgs::Parse : found %s when expecting {", com_token);
+    }
+
+    // go through all the dictionary pairs
+    while (1) {
+        // parse key
+        com_token = COM_Parse(&data);
+        if (com_token[0] == '}') {
+            break;
+        }
+
+        if (!data) {
+            gi.Error(ERR_DROP, "SpawnArgs::Parse : EOF without closing brace");
+        }
+
+        keyname = com_token;
+
+        // parse value
+        com_token = COM_Parse(&data);
+        if (!data) {
+            gi.Error(ERR_DROP, "SpawnArgs::Parse : EOF without closing brace");
+        }
+
+        if (com_token[0] == '}') {
+            gi.Error(ERR_DROP, "SpawnArgs::Parse : closing brace without data");
+        }
+
+        // keynames with a leading underscore are used for utility comments,
+        // and are immediately discarded by the game
+        if (!bAllowUtils && keyname[0] == '_') {
+            continue;
+        }
+
+        setArg(keyname.c_str(), com_token);
+    }
+
+    return data;
 }
 
-const char *SpawnArgs::getArg( const char *key, const char *defaultValue )
+const char *SpawnArgs::getArg(const char *key, const char *defaultValue)
 {
-	int i;
-	int num;
-	
-	num = keyList.NumObjects();
-	for( i = 1; i <= num; i++ )
-	{
-		if ( keyList.ObjectAt( i ) == key )
-		{
-			return valueList.ObjectAt( i );
-		}
-	}
-	
-	return defaultValue;
+    int i;
+    int num;
+
+    num = keyList.NumObjects();
+    for (i = 1; i <= num; i++) {
+        if (keyList.ObjectAt(i) == key) {
+            return valueList.ObjectAt(i);
+        }
+    }
+
+    return defaultValue;
 }
 
-void SpawnArgs::setArg( const char *key, const char *value )
+void SpawnArgs::setArg(const char *key, const char *value)
 {
-	int i;
-	int num;
-	
-	num = keyList.NumObjects();
-	for( i = 1; i <= num; i++ )
-	{
-		if ( keyList.ObjectAt( i ) == key )
-		{
-			valueList.ObjectAt( i ) = value;
-			return;
-		}
-	}
-	
-	keyList.AddObject( str( key ) );
-	valueList.AddObject( str( value ) );
+    int i;
+    int num;
+
+    num = keyList.NumObjects();
+    for (i = 1; i <= num; i++) {
+        if (keyList.ObjectAt(i) == key) {
+            valueList.ObjectAt(i) = value;
+            return;
+        }
+    }
+
+    keyList.AddObject(str(key));
+    valueList.AddObject(str(value));
 }
 
-void SpawnArgs::operator=( SpawnArgs &otherlist )
+void SpawnArgs::operator=(SpawnArgs& otherlist)
 {
-	int num;
-	int i;
-	
-	Clear();
-	
-	num = otherlist.NumArgs();
-	keyList.Resize( num );
-	valueList.Resize( num );
-	
-	for( i = 1; i <= num; i++ )
-	{
-		keyList.AddObject( otherlist.keyList.ObjectAt( i ) );
-		valueList.AddObject( otherlist.valueList.ObjectAt( i ) );
-	}
+    int num;
+    int i;
+
+    Clear();
+
+    num = otherlist.NumArgs();
+    keyList.Resize(num);
+    valueList.Resize(num);
+
+    for (i = 1; i <= num; i++) {
+        keyList.AddObject(otherlist.keyList.ObjectAt(i));
+        valueList.AddObject(otherlist.valueList.ObjectAt(i));
+    }
 }
 
-int SpawnArgs::NumArgs( void )
+int SpawnArgs::NumArgs(void)
 {
-	return keyList.NumObjects();
+    return keyList.NumObjects();
 }
 
-const char *SpawnArgs::getKey( int index )
+const char *SpawnArgs::getKey(int index)
 {
-	return keyList.ObjectAt( index + 1 );
+    return keyList.ObjectAt(index + 1);
 }
 
-const char *SpawnArgs::getValue( int index )
+const char *SpawnArgs::getValue(int index)
 {
-	return valueList.ObjectAt( index + 1 );
+    return valueList.ObjectAt(index + 1);
 }
 
-void SpawnArgs::Archive( Archiver &arc )
+void SpawnArgs::Archive(Archiver& arc)
 {
-	Class::Archive( arc );
-	
-	//keyList.Archive( arc );
-	//valueList.Archive( arc );
+    Class::Archive(arc);
+
+    //keyList.Archive( arc );
+    //valueList.Archive( arc );
 }
 
 /*
@@ -228,145 +201,108 @@ Finds the spawn function for the entity and returns ClassDef *
 ===============
 */
 
-ClassDef *SpawnArgs::getClassDef( qboolean *tikiWasStatic )
+ClassDef *SpawnArgs::getClassDef(qboolean *tikiWasStatic)
 {
-#if defined ( GAME_DLL )
-	const char	*classname;
-	ClassDef	*cls = NULL;
-	dtiki_t		*tiki = NULL;
-	dtikianim_t	*a = NULL;
-	
-	classname = getArg( "classname" );
-	
-	if ( tikiWasStatic )
-	{
-		*tikiWasStatic = false;
-	}
-	
-	//
-	// check normal spawn functions
-	// see if the class name is stored within the model
-	//
-	if ( classname )
-	{
-		//
-		// explicitly inhibit lights
-		//
-		if ( !Q_stricmp( classname, "light" ) )
-		{
-			//
-			// HACK HACK HACK
-			// hack to suppress a warning message
-			//
-			if ( tikiWasStatic )
-            {
-				*tikiWasStatic = true;
+    const char  *classname;
+    ClassDef    *cls  = NULL;
+    dtiki_t     *tiki = NULL;
+    dtikianim_t *a    = NULL;
+
+    classname = getArg("classname");
+
+    if (tikiWasStatic) {
+        *tikiWasStatic = false;
+    }
+
+    //
+    // check normal spawn functions
+    // see if the class name is stored within the model
+    //
+    if (classname) {
+        //
+        // explicitly inhibit lights
+        //
+        if (!Q_stricmp(classname, "light")) {
+            //
+            // HACK HACK HACK
+            // hack to suppress a warning message
+            //
+            if (tikiWasStatic) {
+                *tikiWasStatic = true;
             }
-			return NULL;
-		}
-		
-		cls = getClassForID( classname );
-		if ( !cls )
-		{
-			cls = getClass( classname );
-		}
-	}
-	
-	if ( !cls )
-	{
-		const char *model;
-		
-		//
-		// get Object in case we cannot find an alternative
-		//
-		cls = &Object::ClassInfo;
-		model = getArg( "model" );
-		if ( model )
-		{
-			int i;
+            return NULL;
+        }
 
-			model = CanonicalTikiName( model );
-			tiki = gi.modeltiki( model );
+        cls = getClassForID(classname);
+        if (!cls) {
+            cls = getClass(classname);
+        }
+    }
 
-			//
-			// get handle to def file
-			//
-			if ( tiki )
-            {
-				const char * s;
-				
-				s = getArg( "make_static" );
+    if (!cls) {
+        const char *model;
 
-				if ( s && atoi( s ) )
-				{
-					//
-					// if make_static then we don't want to spawn
-					//
-					if ( tikiWasStatic )
-					{
-						*tikiWasStatic = true;
-					}
-					
-					return NULL;
-				}
+        //
+        // get Object in case we cannot find an alternative
+        //
+        cls   = &Object::ClassInfo;
+        model = getArg("model");
+        if (model) {
+            int i;
 
-				a = tiki->a;
-				
-				if( a->num_server_initcmds )
-				{
-					for( i = 0; i < a->num_server_initcmds; i++ )
-					{
-						if( !Q_stricmp( a->server_initcmds[ i ].args[ 0 ], "classname" ) )
-						{
-							cls = getClass( a->server_initcmds[ i ].args[ 1 ] );
-							break;
-						}
-					}
+            model = CanonicalTikiName(model);
+            tiki  = gi.modeltiki(model);
 
-					if( i == a->num_server_initcmds )
-					{
-						glbs.DPrintf( "Classname %s used, but 'classname' was not found in Initialization commands, using Object.\n", classname );
-					}
-				}
-				else
-					glbs.DPrintf( "Classname %s used, but TIKI had no Initialization commands, using Object.\n", classname );
+            //
+            // get handle to def file
+            //
+            if (tiki) {
+                const char *s;
+
+                s = getArg("make_static");
+
+                if (s && atoi(s)) {
+                    //
+                    // if make_static then we don't want to spawn
+                    //
+                    if (tikiWasStatic) {
+                        *tikiWasStatic = true;
+                    }
+
+                    return NULL;
+                }
+
+                a = tiki->a;
+
+                if (a->num_server_initcmds) {
+                    for (i = 0; i < a->num_server_initcmds; i++) {
+                        if (!Q_stricmp(a->server_initcmds[i].args[0], "classname")) {
+                            cls = getClass(a->server_initcmds[i].args[1]);
+                            break;
+                        }
+                    }
+
+                    if (i == a->num_server_initcmds) {
+                        gi.DPrintf(
+                            "Classname %s used, but 'classname' was not found in Initialization commands, using "
+                            "Object.\n",
+                            classname
+                        );
+                    }
+                } else {
+                    gi.DPrintf(
+                        "Classname %s used, but TIKI had no Initialization commands, using Object.\n", classname
+                    );
+                }
+            } else {
+                gi.DPrintf("Classname %s used, but model was not a TIKI, using Object.\n", classname);
             }
-			else
-				glbs.DPrintf( "Classname %s used, but model was not a TIKI, using Object.\n", classname );
-		}
-		else
-		{
-			glbs.DPrintf( "Classname %s' used, but no model was set, using Object.\n", classname );
-		}
-	}
-	
-	return cls;
-#else
-	const char	*classname;
-	ClassDef	*cls = NULL;
-	
-	classname = getArg( "classname" );
-	
-	if ( tikiWasStatic )
-	{
-		*tikiWasStatic = false;
-	}
-	
-	//
-	// check normal spawn functions
-	// see if the class name is stored within the model
-	//
-	if ( classname )
-	{
-		cls = getClassForID( classname );
-		if ( !cls )
-		{
-			cls = getClass( classname );
-		}
-	}
+        } else {
+            gi.DPrintf("Classname %s' used, but no model was set, using Object.\n", classname);
+        }
+    }
 
-	return cls;
-#endif
+    return cls;
 }
 
 /*
@@ -378,314 +314,282 @@ Returns pointer to Entity
 ===============
 */
 
-Listener *SpawnArgs::Spawn( void )
+Listener *SpawnArgs::Spawn(void)
 {
-	Listener *ent = ( Listener * )SpawnInternal();
-
-	if( ent )
-	{
-		ent->ProcessPendingEvents();
-		ent->ProcessEvent(EV_Entity_Start);
-	}
-
-	return ent;
-}
-
-Listener *SpawnArgs::SpawnInternal( void )
-{
-	str				classname;
-	ClassDef		*cls;
-	Listener		*obj;
-	Event			*ev;
-	int				i;
-	qboolean		tikiWasStatic; // used to determine if entity was intentionally suppressed
-	const char		*key, *value;
-	str				keyname;
-#ifdef WITH_SCRIPT_ENGINE
-	unsigned int	eventnum;
-	EventDef		*def;
-	ScriptVariable	*var;
-	ScriptVariableList *varList;
-#endif
-
-#if defined ( GAME_DLL )
-
-	if( !g_spawnentities->integer )
-	{
-		value = getArg( "classname", NULL );
-
-		// only spawn a playerstart or the world
-		if( value )
-		{
-			if( ( Q_stricmp( value, "info_player_start" ) && Q_stricmp( value, "worldspawn" ) ) )
-			{
-				Com_Printf( "%s\n", value );
-				return NULL;
-			}
-		}
-	}
-
-	if( !g_spawnai->integer )
-	{
-		value = getArg( "classname", NULL );
-
-		//dont spawn ai_* if g_spawnai is 0
-		if( value )
-		{
-			if( !Q_stricmpn( value, "ai_", 3 ) )
-			{
-				Com_Printf( "%s\n", value );
-				return NULL;
-			}
-		}
-	}
-
-#endif
-	
-	classname = getArg( "classname", "Unspecified" );
-	cls = getClassDef( &tikiWasStatic );
-
-	if ( !cls )
-	{
-		if ( !tikiWasStatic )
-		{
-			glbs.DPrintf( "%s doesn't have a spawn function\n", classname.c_str() );
-
-			if( scriptcheck->integer ) {
-				glbs.Error( ERR_DROP, "Script check failed" );
-			}
-		}
-		
+    SafePtr<Listener> ent = (Listener *)SpawnInternal();
+	if (!ent) {
 		return NULL;
 	}
-	
-	obj = ( Listener * )cls->newInstance();
 
-	for( int i = g_spawnlist.NumObjects(); i > 0; i-- )
-	{
-		if( g_spawnlist.ObjectAt( i ) == NULL )
-		{
-			g_spawnlist.RemoveObjectAt( i );
-		}
+	ent->ProcessPendingEvents();
+	if (!ent) {
+		// Fixed in OPM
+		//  Make sure to check the entity after processing events,
+		//  the ent could be deleted due to a posted remove event
+		return NULL;
 	}
 
-	g_spawnlist.AddObject( obj );
+	ent->ProcessEvent(EV_Entity_Start);
 
-	// post spawnarg events
-	for( i = 0; i < NumArgs(); i++ )
-	{
-		key = getKey( i );
-		value = getValue( i );
-
-		if( *key == '#' )
-		{
-			// don't count the prefix
-			keyname = ( key + 1 );
+    return ent;
+}
 
+Listener *SpawnArgs::SpawnInternal(void)
+{
+    str         classname;
+    ClassDef   *cls;
+    Listener   *obj;
+    Event      *ev;
+    int         i;
+    qboolean    tikiWasStatic; // used to determine if entity was intentionally suppressed
+    const char *key, *value;
+    str         keyname;
+    int         t1, t2;
 #ifdef WITH_SCRIPT_ENGINE
-			// initialize the object vars
-			varList = obj->Vars();
-
-			var = varList->GetVariable( keyname );
-			if( var )
-			{
-				Com_Printf(
-					"^~^~^ variable '%s' already set with string value '%s' - failed to attempt to set with numeric value '%s'\n",
-					keyname.c_str(),
-					var->stringValue().c_str(),
-					value );
-
-				continue;
-			}
-
-			eventnum = Event::FindSetterEventNum( keyname );
-
-			if( !eventnum || !( def = cls->GetDef( eventnum ) ) )
-			{
-				if( strchr( keyname.c_str(), '.' ) )
-				{
-					// it's a float
-					varList->SetVariable( keyname, ( float )atof( value ) );
-				}
-				else
-				{
-					varList->SetVariable( keyname, atoi( value ) );
-				}
-			}
-			else if( def->type != EV_SETTER )
-			{
-				Com_Printf( "^~^~^ Cannot set a read-only variable '%s'\n", keyname.c_str() );
-			}
-			else
-			{
-				ev = new Event( keyname, EV_SETTER );
-
-				if( strchr( keyname.c_str(), '.' ) )
-				{
-					ev->AddFloat( atof( value ) );
-				}
-				else
-				{
-					ev->AddInteger( atoi( value ) );
-				}
-
-				obj->PostEvent( ev, EV_SPAWNARG );
-			}
+    unsigned int        eventnum;
+    EventDef           *def;
+    ScriptVariable     *var;
+    ScriptVariableList *varList;
 #endif
-		}
-		else if( *key == '$' )
-		{
-			keyname = ( key + 1 );
 
-#ifdef WITH_SCRIPT_ENGINE
-			varList = obj->Vars();
+    if (!g_spawnentities->integer) {
+        value = getArg("classname", NULL);
 
-			var = varList->GetVariable( keyname );
-			if( var )
-			{
-				Com_Printf(
-					"^~^~^ variable '%s' already set with string value '%s' - failed to attempt to set with string value '%s'\n",
-					keyname.c_str(),
-					var->stringValue().c_str(),
-					value );
-
-				continue;
-			}
-
-			eventnum = Event::FindSetterEventNum( keyname );
-
-			if( !eventnum || !( def = cls->GetDef( eventnum ) ) )
-			{
-				varList->SetVariable( keyname, value );
-			}
-			else if( def->type != EV_SETTER )
-			{
-				Com_Printf( "^~^~^ Cannot set a read-only variable '%s'\n", keyname.c_str() );
-			}
-			else
-			{
-				ev = new Event(eventnum);
-				ev->AddString( value );
-
-				obj->PostEvent( ev, EV_SPAWNARG );
-			}
-#endif
-		}
-		// if it is the "script" key, execute the script commands individually
-		else if( !Q_stricmp( key, "script" ) )
-		{
-			char *ptr;
-			char * token;
-			
-			ptr = const_cast< char * >( getValue( i ) );
-			while ( 1 )
-            {
-				token = COM_ParseExt( &ptr, true );
-				if ( !token[ 0 ] )
-					break;
-				if ( strchr( token, ':' ) )
-				{
-					glbs.DPrintf( "Label %s imbedded inside editor script for %s.\n", token, classname.c_str() );
-				}
-				else
-				{
-					ev = new Event( token );
-					while ( 1 )
-					{
-						token = COM_ParseExt( &ptr, false );
-						if ( !token[ 0 ] )
-							break;
-						ev->AddToken( token );
-					}
-					
-					obj->PostEvent( ev, EV_SPAWNARG );
-				}
+        // only spawn a playerstart or the world
+        if (value) {
+            if ((Q_stricmp(value, "info_player_start") && Q_stricmp(value, "worldspawn"))) {
+                Com_Printf("%s\n", value);
+                return NULL;
             }
-		}
-		else
-		{
-			ev = new Event( key );
-			ev->AddToken( value );
-			
-			if( Q_stricmp( key, "model" ) == 0 )
-			{
-#if defined ( GAME_DLL )
-				if( obj->isSubclassOf( SimpleActor ) )
-				{
-					if( Q_stricmpn( value, "human", 5 ) &&
-						Q_stricmpn( value, "models/human", 12 ) &&
-						Q_stricmpn( value, "models//human", 13 ) &&
-						Q_stricmpn( value, "animal", 6 ) &&
-						Q_stricmpn( value, "models/animal", 13 ) )
-					{
-						Com_Printf( "^~^~^ model '%s' cannot be an actor - please fix the .tik file\n", value );
+        }
+    }
 
-						delete obj;
-						return NULL;
-					}
+    if (!g_spawnai->integer) {
+        value = getArg("classname", NULL);
 
-					obj->PostEvent( ev, EV_PRIORITY_SPAWNACTOR );
-				}
-				else
-				{
-					obj->PostEvent( ev, EV_PRIORITY_SPAWNARG );
-				}
-#else
-				obj->PostEvent( ev, EV_PRIORITY_SPAWNARG );
+        //dont spawn ai_* if g_spawnai is 0
+        if (value) {
+            if (!Q_stricmpn(value, "ai_", 3)) {
+                Com_Printf("%s\n", value);
+                return NULL;
+            }
+        }
+    }
+
+    t1 = gi.Milliseconds();
+
+    classname = getArg("classname", "Unspecified");
+    cls       = getClassDef(&tikiWasStatic);
+
+    if (!cls) {
+        if (!tikiWasStatic) {
+            gi.DPrintf("%s doesn't have a spawn function\n", classname.c_str());
+
+            if (g_scriptcheck->integer) {
+                gi.Error(ERR_DROP, "Script check failed");
+            }
+        }
+
+        return NULL;
+    }
+
+    if (checkInheritance(PathNode::classinfostatic(), cls)) {
+        // use the existing node that was loaded
+        obj = PathManager.GetSpawnNode(cls);
+    } else {
+        obj = (Listener *)cls->newInstance();
+    }
+
+    for (int i = g_spawnlist.NumObjects(); i > 0; i--) {
+        if (g_spawnlist.ObjectAt(i) == NULL) {
+            g_spawnlist.RemoveObjectAt(i);
+        }
+    }
+
+    g_spawnlist.AddObject(obj);
+
+    // post spawnarg events
+    for (i = 0; i < NumArgs(); i++) {
+        key   = getKey(i);
+        value = getValue(i);
+
+        if (*key == '#') {
+            // don't count the prefix
+            keyname = (key + 1);
+
+#ifdef WITH_SCRIPT_ENGINE
+            // initialize the object vars
+            varList = obj->Vars();
+
+            var = varList->GetVariable(keyname);
+            if (var) {
+                Com_Printf(
+                    "^~^~^ variable '%s' already set with string value '%s' - failed to attempt to set with numeric "
+                    "value '%s'\n",
+                    keyname.c_str(),
+                    var->stringValue().c_str(),
+                    value
+                );
+
+                continue;
+            }
+
+            eventnum = Event::FindSetterEventNum(keyname);
+
+            if (!eventnum || !(def = cls->GetDef(eventnum))) {
+                if (strchr(keyname.c_str(), '.')) {
+                    // it's a float
+                    varList->SetVariable(keyname, (float)atof(value));
+                } else {
+                    varList->SetVariable(keyname, atoi(value));
+                }
+            } else if (def->type != EV_SETTER) {
+                Com_Printf("^~^~^ Cannot set a read-only variable '%s'\n", keyname.c_str());
+            } else {
+                ev = new Event(keyname, EV_SETTER);
+
+                if (strchr(keyname.c_str(), '.')) {
+                    ev->AddFloat(atof(value));
+                } else {
+                    ev->AddInteger(atoi(value));
+                }
+
+                obj->PostEvent(ev, EV_SPAWNARG);
+            }
 #endif
-			}
-			else
-			{
-#if defined ( GAME_DLL )
-				if( obj->isSubclassOf( SimpleActor ) )
-				{
-					obj->PostEvent( ev, EV_SPAWNACTOR );
-				}
-				else
-				{
-					obj->PostEvent( ev, EV_SPAWNARG );
-				}
-#else
-				obj->PostEvent( ev, EV_SPAWNARG );
+        } else if (*key == '$') {
+            keyname = (key + 1);
+
+#ifdef WITH_SCRIPT_ENGINE
+            varList = obj->Vars();
+
+            var = varList->GetVariable(keyname);
+            if (var) {
+                Com_Printf(
+                    "^~^~^ variable '%s' already set with string value '%s' - failed to attempt to set with string "
+                    "value '%s'\n",
+                    keyname.c_str(),
+                    var->stringValue().c_str(),
+                    value
+                );
+
+                continue;
+            }
+
+            eventnum = Event::FindSetterEventNum(keyname);
+
+            if (!eventnum || !(def = cls->GetDef(eventnum))) {
+                varList->SetVariable(keyname, value);
+            } else if (def->type != EV_SETTER) {
+                Com_Printf("^~^~^ Cannot set a read-only variable '%s'\n", keyname.c_str());
+            } else {
+                ev = new Event(eventnum);
+                ev->AddString(value);
+
+                obj->PostEvent(ev, EV_SPAWNARG);
+            }
 #endif
-			}
-		}
-	}
-	
-	if ( !obj )
-	{
-		glbs.DPrintf( "%s failed on newInstance\n", classname.c_str() );
-		return NULL;
-	}
-	
-	return obj;
+        }
+        // if it is the "script" key, execute the script commands individually
+        else if (!Q_stricmp(key, "script")) {
+            char *ptr;
+            char *token;
+
+            ptr = const_cast<char *>(getValue(i));
+            while (1) {
+                token = COM_ParseExt(&ptr, true);
+                if (!token[0]) {
+                    break;
+                }
+                if (strchr(token, ':')) {
+                    gi.DPrintf("Label %s imbedded inside editor script for %s.\n", token, classname.c_str());
+                } else {
+                    ev = new Event(token);
+                    while (1) {
+                        token = COM_ParseExt(&ptr, false);
+                        if (!token[0]) {
+                            break;
+                        }
+                        ev->AddToken(token);
+                    }
+
+                    obj->PostEvent(ev, EV_SPAWNARG);
+                }
+            }
+        } else {
+            ev = new Event(key);
+            ev->AddToken(value);
+
+            if (Q_stricmp(key, "model") == 0) {
+                if (obj->isSubclassOf(SimpleActor)) {
+                    if (Q_stricmpn(value, "human", 5) && Q_stricmpn(value, "models/human", 12)
+                        && Q_stricmpn(value, "models//human", 13) && Q_stricmpn(value, "animal", 6)
+                        && Q_stricmpn(value, "models/animal", 13)) {
+                        Com_Printf("^~^~^ model '%s' cannot be an actor - please fix the .tik file\n", value);
+
+                        delete obj;
+                        return NULL;
+                    }
+
+                    obj->PostEvent(ev, EV_PRIORITY_SPAWNACTOR);
+                } else {
+                    obj->PostEvent(ev, EV_PRIORITY_SPAWNARG);
+                }
+            } else {
+                if (obj->isSubclassOf(SimpleActor)) {
+                    obj->PostEvent(ev, EV_SPAWNACTOR);
+                } else {
+                    obj->PostEvent(ev, EV_SPAWNARG);
+                }
+            }
+        }
+    }
+
+    if (!obj) {
+        gi.DPrintf("%s failed on newInstance\n", classname.c_str());
+        return NULL;
+    }
+
+    t2 = gi.Milliseconds();
+    if (t2 - t1 >= 100) {
+        //
+        // above 100 ms send a message to console
+        //
+        for (i = 0; i < NumArgs(); i++) {
+            key   = getKey(i);
+            value = getValue(i);
+
+            if (!Q_stricmp(key, "classname")) {
+                Com_Printf("spawn '%s': %5.2f seconds\n", value, (t2 - t1) / 1000.f);
+                break;
+            }
+        }
+    }
+
+    return obj;
 }
 
-ClassDef *FindClass( const char *name, qboolean *isModel )
+ClassDef *FindClass(const char *name, qboolean *isModel)
 {
-	ClassDef *cls;
-	
-	*isModel = false;
-	
-	// first lets see if it is a registered class name
-	cls = getClass( name );
-	if ( !cls )
-	{
-		SpawnArgs args;
-		
-		// if that didn't work lets try to resolve it as a model
-		args.setArg( "model", name );
-		
-		cls = args.getClassDef();
-		if ( cls )
-		{
-			*isModel = true;
-		}
-	}
-	return cls;
-}
+    ClassDef *cls;
 
-#if defined ( GAME_DLL )
+    *isModel = false;
+
+    // first lets see if it is a registered class name
+    cls = getClass(name);
+    if (!cls) {
+        SpawnArgs args;
+
+        // if that didn't work lets try to resolve it as a model
+        args.setArg("model", name);
+
+        cls = args.getClassDef();
+        if (cls) {
+            *isModel = true;
+        }
+    }
+    return cls;
+}
 
 /*
 ==============
@@ -695,16 +599,14 @@ This is only called when the game first initializes in single player,
 but is called after each death and level change in deathmatch
 ==============
 */
-void G_InitClientPersistant( gclient_t *client )
+void G_InitClientPersistant(gclient_t *client)
 {
-	memset( &client->pers, 0, sizeof( client->pers ) );
+    memset(&client->pers, 0, sizeof(client->pers));
 }
 
-#endif
-
 #if 0
 
-#include "../qcommon/tiki_local.h" // fixme!
+#    include "../qcommon/tiki_local.h" // fixme!
 
 qboolean	G_SpawnString( const char *key, const char *defaultString, char **out ) {
 	int		i;
@@ -868,11 +770,11 @@ void SP_team_CTF_blueplayer( gentity_t *ent );
 void SP_team_CTF_redspawn( gentity_t *ent );
 void SP_team_CTF_bluespawn( gentity_t *ent );
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 void SP_team_blueobelisk( gentity_t *ent );
 void SP_team_redobelisk( gentity_t *ent );
 void SP_team_neutralobelisk( gentity_t *ent );
-#endif
+#    endif
 void SP_item_botroam( gentity_t *ent ) { }
 
 spawn_t	spawns[] = {
@@ -940,11 +842,11 @@ spawn_t	spawns[] = {
 	{"info_player_axis", SP_team_CTF_redspawn},
 	{"info_player_allied", SP_team_CTF_bluespawn},
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	{"team_redobelisk", SP_team_redobelisk},
 	{"team_blueobelisk", SP_team_blueobelisk},
 	{"team_neutralobelisk", SP_team_neutralobelisk},
-#endif
+#    endif
 	{"item_botroam", SP_item_botroam},
 
 	{NULL, 0}
@@ -959,8 +861,8 @@ const char *G_FixTIKIPath(const char *in) {
 	if(gi.FS_ReadFile( in, &buffer ) > 0) {
 		return in;
 	}
-	strcpy(path,"models/");
-	strcat(path,in);
+	Q_strncpyz(path,"models/", sizeof(path));
+	Q_strcat(path,sizeof(path),in);
 	if( gi.FS_ReadFile( in, &buffer ) > 0 ) {
 		return path;
 	}
@@ -1011,7 +913,7 @@ qboolean G_CallSpawn( gentity_t *ent ) {
 			}
 			*ptr2 = 0;
 		}
-#if 0
+#    if 0
 		tiki = gi.TIKI_RegisterModel(ent->model);
 		if(!tiki) {
 			tiki = gi.TIKI_RegisterModel(va("models/%s",ent->model));
@@ -1027,7 +929,7 @@ qboolean G_CallSpawn( gentity_t *ent ) {
 			gi.LinkEntity (ent);
 			return qtrue;
 		}
-#else
+#    else
 		ent->s.modelindex = G_ModelIndex( ( char * )G_FixTIKIPath( ent->model ) );
 		ent->s.eType = ET_MODELANIM;
 		//if(ent->model[0]=='*') {
@@ -1041,7 +943,7 @@ qboolean G_CallSpawn( gentity_t *ent ) {
 		G_SetOrigin( ent, ent->s.origin );
 		gi.linkentity (ent);
 		return qtrue;
-#endif
+#    endif
 	}
 
 	G_Printf ("%s doesn't have a spawn function\n", ent->classname);
@@ -1183,19 +1085,19 @@ void G_SpawnGEntityFromSpawnVars( void ) {
 		}
 	}
 
-#ifdef MISSIONPACK
+#    ifdef MISSIONPACK
 	G_SpawnInt( "notta", "0", &i );
 	if ( i ) {
 		G_FreeEntity( ent );
 		return;
 	}
-#else
+#    else
 	G_SpawnInt( "notq3a", "0", &i );
 	if ( i ) {
 		G_FreeEntity( ent );
 		return;
 	}
-#endif
+#    endif
 
 	if( G_SpawnString( "gametype", NULL, &value ) ) {
 		if( g_gametype->integer >= GT_FFA && g_gametype->integer < GT_MAX_GAME_TYPE ) {
@@ -1259,7 +1161,7 @@ qboolean G_ParseSpawnVars( void ) {
 	level.numSpawnVars = 0;
 	level.numSpawnVarChars = 0;
 
-#if 0
+#    if 0
 	// parse the opening brace
 	if ( !gi.GetEntityToken( com_token, sizeof( com_token ) ) ) {
 		// end of spawn string
@@ -1295,7 +1197,7 @@ qboolean G_ParseSpawnVars( void ) {
 		level.spawnVars[ level.numSpawnVars ][1] = G_AddSpawnVarToken( com_token );
 		level.numSpawnVars++;
 	}
-#endif
+#    endif
 
 	return qtrue;
 }
diff --git a/code/fgame/g_spawn.h b/code/fgame/g_spawn.h
index f598b9fb..1016fb8c 100644
--- a/code/fgame/g_spawn.h
+++ b/code/fgame/g_spawn.h
@@ -29,51 +29,51 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // spawnflags
 // these are set with checkboxes on each entity in the map editor
-#define	SPAWNFLAG_NOT_EASY			0x00000100
-#define	SPAWNFLAG_NOT_MEDIUM		0x00000200
-#define	SPAWNFLAG_NOT_HARD			0x00000400
-#define	SPAWNFLAG_NOT_DEATHMATCH	0x00000800
-#define	SPAWNFLAG_DEVELOPMENT		0x00002000
-#define	SPAWNFLAG_DETAIL			0x00004000
-#define	SPAWNFLAG_NOCONSOLE			0x00008000
-#define	SPAWNFLAG_NOPC				0x00010000
+#define SPAWNFLAG_NOT_EASY       0x00000100
+#define SPAWNFLAG_NOT_MEDIUM     0x00000200
+#define SPAWNFLAG_NOT_HARD       0x00000400
+#define SPAWNFLAG_NOT_DEATHMATCH 0x00000800
+#define SPAWNFLAG_DETAIL         0x00001000
+#define SPAWNFLAG_DEVELOPMENT    0x00002000
+#define SPAWNFLAG_NOCONSOLE      0x00008000
+#define SPAWNFLAG_NOPC           0x00010000
 
 class Listener;
 
 class SpawnArgs : public Class
 {
 private:
-	Container<str> keyList;
-	Container<str> valueList;
+    Container<str> keyList;
+    Container<str> valueList;
 
 public:
-	CLASS_PROTOTYPE( SpawnArgs );
+    CLASS_PROTOTYPE(SpawnArgs);
 
-	SpawnArgs();
-	SpawnArgs( SpawnArgs &arglist );
+    SpawnArgs();
+    SpawnArgs(SpawnArgs& arglist);
 
-	void           Clear( void );
+    void Clear(void);
 
-	char			*Parse( char *data, bool bAllowUtils = false );
-	const char     *getArg( const char *key, const char *defaultValue = NULL );
-	void           setArg( const char *key, const char *value );
+    char       *Parse(char *data, bool bAllowUtils = false);
+    const char *getArg(const char *key, const char *defaultValue = NULL);
+    void        setArg(const char *key, const char *value);
 
-	int            NumArgs( void );
-	const char     *getKey( int index );
-	const char     *getValue( int index );
-	void           operator=( SpawnArgs &a );
+    int         NumArgs(void);
+    const char *getKey(int index);
+    const char *getValue(int index);
+    void        operator=(SpawnArgs       &a);
 
-	ClassDef       *getClassDef( qboolean *tikiWasStatic = NULL );
-	Listener	   *Spawn( void );
-	Listener	   *SpawnInternal( void );
+    ClassDef *getClassDef(qboolean *tikiWasStatic = NULL);
+    Listener *Spawn(void);
+    Listener *SpawnInternal(void);
 
-	void Archive( Archiver &arc ) override;
+    void Archive(Archiver& arc) override;
 };
 
-extern Container< SafePtr< Listener > > g_spawnlist;
+extern Container<SafePtr<Listener>> g_spawnlist;
 
-ClassDef			*FindClass( const char *name, qboolean *isModel );
+ClassDef *FindClass(const char *name, qboolean *isModel);
 
 #ifdef GAME_DLL
-void				G_InitClientPersistant( gclient_t *client );
+void G_InitClientPersistant(gclient_t *client);
 #endif
diff --git a/code/fgame/g_utils.cpp b/code/fgame/g_utils.cpp
index 607d2324..c7ed568e 100644
--- a/code/fgame/g_utils.cpp
+++ b/code/fgame/g_utils.cpp
@@ -23,13 +23,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_local.h"
 #include "g_utils.h"
 #include "ctype.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "player.h"
 #include "playerbot.h"
 #include "playerstart.h"
 #include "debuglines.h"
+#include "smokesprite.h"
 #include "../qcommon/tiki.h"
 
 const char *means_of_death_strings[MOD_TOTAL_NUMBER] = {
@@ -45,8 +46,8 @@ const char *means_of_death_strings[MOD_TOTAL_NUMBER] = {
     "explosion",
     "explodewall",
     "electric",
-    "electric_water",
-    "thrown_object",
+    "electricwater",
+    "thrownobject",
     "grenade",
     "beam",
     "rocket",
@@ -62,7 +63,8 @@ const char *means_of_death_strings[MOD_TOTAL_NUMBER] = {
     "bash",
     "shotgun",
     "aagun",
-    "landmine"};
+    "landmine"
+};
 
 int MOD_string_to_int(const str& immune_string)
 {
@@ -94,7 +96,6 @@ G_TouchTriggers
 ============
 */
 void G_TouchTriggers(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -119,7 +120,7 @@ void G_TouchTriggers(Entity *ent)
 
         // Added in 2.0
         // check if the ent is inside edict
-        if (hit->r.bmodel && gi.HitEntity(ent->edict, hit)) {
+        if (hit->r.bmodel && !gi.HitEntity(ent->edict, hit)) {
             continue;
         }
 
@@ -140,7 +141,6 @@ to force all entities it covers to immediately touch it
 ============
 */
 void G_TouchSolids(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -169,7 +169,6 @@ void G_TouchSolids(Entity *ent)
 }
 
 void G_ShowTrace(trace_t *trace, const gentity_t *passent, const char *reason)
-
 {
     str text;
     str pass;
@@ -235,7 +234,6 @@ void G_ShowSightTrace(gentity_t *passent1, gentity_t *passent2, const char *reas
 }
 
 void G_CalcBoundsOfMove(Vector& start, Vector& end, Vector& mins, Vector& maxs, Vector *minbounds, Vector *maxbounds)
-
 {
     Vector bmin;
     Vector bmax;
@@ -333,7 +331,7 @@ bool G_SightTrace(
         entnum2 = ent2->s.number;
     }
 
-    result = gi.SightTrace(start, mins, maxs, end, entnum, entnum2, contentmask, cylinder) ? true : false;
+    result = gi.SightTrace(start, mins, maxs, end, entnum, entnum2, contentmask, cylinder);
 
     if (sv_traceinfo->integer > 1) {
         G_ShowSightTrace(ent, ent2, reason);
@@ -345,7 +343,7 @@ bool G_SightTrace(
         G_DebugLine(start, end, 1, 1, 0, 1);
     }
 
-    return result;
+    return result == true;
 }
 
 void G_PMDrawTrace(
@@ -376,7 +374,6 @@ trace_t G_Trace(
     const char      *reason,
     qboolean         tracedeep
 )
-
 {
     int     entnum;
     trace_t trace;
@@ -418,7 +415,6 @@ trace_t G_Trace(
     const char   *reason,
     qboolean      tracedeep
 )
-
 {
     gentity_t *ent;
     int        entnum;
@@ -464,7 +460,6 @@ void G_TraceEntities(
     int                  contentmask,
     qboolean             bIncludeTriggers
 )
-
 {
     trace_t    trace;
     vec3_t     boxmins;
@@ -509,6 +504,23 @@ void G_TraceEntities(
     }
 }
 
+float G_VisualObfuscation(const Vector& start, const Vector& end)
+{
+    float alpha;
+
+    if (start == end) {
+        // no obfuscation
+        return 0;
+    }
+
+    alpha = gi.CM_VisualObfuscation(start, end);
+    if (alpha >= 1.f) {
+        return alpha;
+    }
+
+    return G_ObfuscationForSmokeSprites(alpha, start, end);
+}
+
 /*
 =======================================================================
 
@@ -525,7 +537,6 @@ Returns the distance to the nearest player from the given spot
 ================
 */
 float PlayersRangeFromSpot(Entity *spot)
-
 {
     Entity *player;
     float   bestplayerdistance;
@@ -564,7 +575,6 @@ to other players
 ================
 */
 Entity *SelectRandomDeathmatchSpawnPoint(void)
-
 {
     Entity *spot, *spot1, *spot2;
     int     count = 0;
@@ -623,7 +633,6 @@ SelectFarthestDeathmatchSpawnPoint
 ================
 */
 Entity *SelectFarthestDeathmatchSpawnPoint(void)
-
 {
     Entity *bestspot;
     float   bestdistance;
@@ -653,7 +662,6 @@ Entity *SelectFarthestDeathmatchSpawnPoint(void)
 }
 
 Entity *SelectDeathmatchSpawnPoint(void)
-
 {
     if (DM_FLAG(DF_SPAWN_FARTHEST)) {
         return SelectFarthestDeathmatchSpawnPoint();
@@ -674,7 +682,6 @@ is not a staircase.
 int c_yes, c_no;
 
 qboolean M_CheckBottom(Entity *ent)
-
 {
     Vector  mins, maxs, start, stop;
     trace_t trace;
@@ -747,7 +754,6 @@ realcheck:
 }
 
 Entity *G_FindClass(Entity *ent, const char *classname)
-
 {
     int        entnum;
     gentity_t *from;
@@ -771,7 +777,6 @@ Entity *G_FindClass(Entity *ent, const char *classname)
 }
 
 Entity *G_FindTarget(Entity *ent, const char *name)
-
 {
     SimpleEntity *next;
 
@@ -826,7 +831,6 @@ Entity *G_FindRandomTarget(const char *name)
 }
 
 Entity *G_NextEntity(Entity *ent)
-
 {
     gentity_t *from;
 
@@ -860,7 +864,6 @@ Entity *G_NextEntity(Entity *ent)
 // just constant angles.
 //
 Vector G_GetMovedir(float angle)
-
 {
     if (angle == -1) {
         return Vector(0, 0, 1);
@@ -899,6 +902,34 @@ void G_SetMovedir(vec3_t angles, vec3_t movedir)
     VectorClear(angles);
 }
 
+/*
+=================
+G_GetAngle
+
+Return the yaw angle
+=================
+*/
+float G_GetAngle(Vector movedir)
+{
+    float angle;
+
+    if (movedir == Vector(0, 0, 1)) {
+        return -1;
+    }
+
+    if (movedir == Vector(0, 0, -1)) {
+        return -2;
+    }
+
+    angle = RAD2DEG(atan(1.0) * 2 + atan(-movedir[0] / sqrt(-movedir[0] * movedir[0] + 1.0)));
+
+    if (movedir[1] < 0) {
+        return (int)((360 - angle) * 10000) / 10000.0;
+    }
+
+    return (int)(angle * 10000) / 10000.0;
+}
+
 /*
 =================
 KillBox
@@ -908,7 +939,6 @@ of ent.  Ent should be unlinked before calling this!
 =================
 */
 qboolean KillBox(Entity *ent)
-
 {
     int        i;
     int        num;
@@ -960,9 +990,8 @@ qboolean KillBox(Entity *ent)
 }
 
 qboolean IsNumeric(const char *str)
-
 {
-    int      len;
+    size_t   len;
     int      i;
     qboolean dot;
 
@@ -995,7 +1024,6 @@ findradius (org, radius)
 =================
 */
 Entity *findradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *from;
@@ -1050,7 +1078,6 @@ findclientinradius (org, radius)
 =================
 */
 Entity *findclientsinradius(Entity *startent, Vector org, float rad)
-
 {
     Vector     eorg;
     gentity_t *ed;
@@ -1085,7 +1112,6 @@ Entity *findclientsinradius(Entity *startent, Vector org, float rad)
 }
 
 Vector G_CalculateImpulse(Vector start, Vector end, float speed, float gravity)
-
 {
     float  traveltime, vertical_speed;
     Vector dir, xydir, velocity;
@@ -1103,7 +1129,6 @@ Vector G_CalculateImpulse(Vector start, Vector end, float speed, float gravity)
 }
 
 Vector G_PredictPosition(Vector start, Vector target, Vector targetvelocity, float speed)
-
 {
     Vector projected;
     float  traveltime;
@@ -1118,13 +1143,128 @@ Vector G_PredictPosition(Vector start, Vector target, Vector targetvelocity, flo
     return projected;
 }
 
+/*
+==============
+G_ArchiveTrace
+==============
+*/
+void G_ArchivePlayerState(Archiver& arc, playerState_t *ps)
+{
+    int i;
+
+    // Movement
+    arc.ArchiveInteger(&ps->commandTime);
+    arc.ArchiveInteger(&ps->pm_type);
+    arc.ArchiveInteger(&ps->pm_flags);
+    arc.ArchiveInteger(&ps->pm_time);
+    arc.ArchiveVec3(ps->origin);
+    arc.ArchiveVec3(ps->velocity);
+    arc.ArchiveInteger(&ps->gravity);
+    arc.ArchiveInteger(&ps->speed);
+    arc.ArchiveInteger(&ps->delta_angles[0]);
+    arc.ArchiveInteger(&ps->delta_angles[1]);
+    arc.ArchiveInteger(&ps->delta_angles[2]);
+
+    // Trace
+    arc.ArchiveInteger(&ps->groundEntityNum);
+    arc.ArchiveBoolean(&ps->walking);
+    arc.ArchiveBoolean(&ps->groundPlane);
+    arc.ArchiveInteger(&ps->feetfalling);
+    arc.ArchiveVec3(ps->falldir);
+    G_ArchiveTrace(arc, &ps->groundTrace);
+    arc.ArchiveVec3(ps->viewangles);
+    arc.ArchiveInteger(&ps->viewheight);
+
+    // View
+    arc.ArchiveFloat(&ps->fLeanAngle);
+    arc.ArchiveInteger(&ps->iViewModelAnim);
+    arc.ArchiveInteger(&ps->iViewModelAnimChanged);
+
+    // Stats
+    for (i = 0; i < ARRAY_LEN(ps->stats); i++) {
+        arc.ArchiveInteger(&ps->stats[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->activeItems); i++) {
+        arc.ArchiveInteger(&ps->activeItems[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->ammo_name_index); i++) {
+        arc.ArchiveInteger(&ps->ammo_name_index[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->ammo_amount); i++) {
+        arc.ArchiveInteger(&ps->ammo_amount[i]);
+    }
+    for (i = 0; i < ARRAY_LEN(ps->max_ammo_amount); i++) {
+        arc.ArchiveInteger(&ps->max_ammo_amount[i]);
+    }
+
+    // Music
+    arc.ArchiveInteger(&ps->current_music_mood);
+    arc.ArchiveInteger(&ps->fallback_music_mood);
+    arc.ArchiveFloat(&ps->music_volume);
+    arc.ArchiveFloat(&ps->music_volume_fade_time);
+    arc.ArchiveInteger(&ps->reverb_type);
+    arc.ArchiveFloat(&ps->reverb_level);
+
+    // View
+    arc.ArchiveVec4(ps->blend);
+    arc.ArchiveFloat(&ps->fov);
+
+    // Camera
+    arc.ArchiveVec3(ps->camera_origin);
+    arc.ArchiveFloat(&ps->camera_time);
+    arc.ArchiveVec3(ps->camera_angles);
+    arc.ArchiveVec3(ps->camera_offset);
+    arc.ArchiveVec3(ps->camera_posofs);
+    arc.ArchiveInteger(&ps->camera_flags);
+    arc.ArchiveVec3(ps->damage_angles);
+
+    if (arc.Loading()) {
+        VectorCopy(ps->origin, ps->vEyePos);
+        ps->vEyePos[2] += ps->viewheight;
+    }
+}
+
+/*
+==============
+G_ArchiveTrace
+==============
+*/
+void G_ArchiveTrace(Archiver& arc, trace_t *trace)
+{
+    arc.ArchiveBoolean(&trace->allsolid);
+    arc.ArchiveBoolean(&trace->startsolid);
+    arc.ArchiveFloat(&trace->fraction);
+    arc.ArchiveVec3(trace->endpos);
+    arc.ArchiveVec3(trace->plane.normal);
+    arc.ArchiveFloat(&trace->plane.dist);
+    arc.ArchiveByte(&trace->plane.type);
+    arc.ArchiveByte(&trace->plane.signbits);
+    arc.ArchiveInteger(&trace->surfaceFlags);
+    arc.ArchiveInteger(&trace->shaderNum);
+    arc.ArchiveInteger(&trace->contents);
+    arc.ArchiveInteger(&trace->entityNum);
+    arc.ArchiveInteger(&trace->location);
+}
+
+/*
+==============
+G_ArchiveClient
+==============
+*/
+void G_ArchiveClient(Archiver& arc, gclient_t *client)
+{
+    G_ArchivePlayerState(arc, &client->ps);
+    arc.ArchiveVec3(client->cmd_angles);
+    arc.ArchiveInteger(&client->lastActiveTime);
+    arc.ArchiveInteger(&client->activeWarning);
+}
+
 /*
 ==============
 G_ArchiveEdict
 ==============
 */
 void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
-
 {
     int i;
     str tempStr;
@@ -1136,7 +1276,10 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
     //
 
     if (edict->client) {
-        arc.ArchiveRaw(edict->client, sizeof(*edict->client));
+        // Removed in OPM
+        //  Commented out because clients are already archived
+        //  by Game::Archive()
+        //G_ArchiveClient(arc, edict->client);
     }
 
     arc.ArchiveInteger(&edict->s.beam_entnum);
@@ -1178,7 +1321,9 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
         arc.ArchiveString(&tempStr);
 
         if (tempStr.length()) {
-            edict->s.loopSound = gi.soundindex(tempStr.c_str(), true);
+            qboolean streamed = tempStr[tempStr.length() - 1] != '0';
+            tempStr[tempStr.length() - 1] = 0;
+            edict->s.loopSound = gi.soundindex(tempStr.c_str(), streamed);
         } else {
             edict->s.loopSound = 0;
         }
@@ -1228,7 +1373,7 @@ void G_ArchiveEdict(Archiver& arc, gentity_t *edict)
         edict->radius2 = edict->r.radius * edict->r.radius;
     }
 
-    arc.ArchiveVec3(edict->r.currentOrigin);
+    arc.ArchiveVec3(edict->r.centroid);
     arc.ArchiveVec3(edict->r.currentAngles);
 
     arc.ArchiveInteger(&edict->r.ownerNum);
@@ -1312,7 +1457,6 @@ Sets the pos trajectory for a fixed position
 ===============
 */
 void G_SetTrajectory(gentity_t *ent, vec3_t org)
-
 {
     ent->s.pos.trTime = 0;
     VectorClear(ent->s.pos.trDelta);
@@ -1328,7 +1472,6 @@ Sets the encoded constant light parameter for entities
 ===============
 */
 void G_SetConstantLight(int *constantlight, float *red, float *green, float *blue, float *radius, int *lightStyle)
-
 {
     int ir, ig, ib, iradius;
 
@@ -1383,9 +1526,9 @@ char *CanonicalTikiName(const char *szInName)
     static char filename[1024];
 
     if (*szInName && Q_stricmpn("models/", szInName, 7)) {
-        sprintf(filename, "models/%s", szInName);
+        Com_sprintf(filename, sizeof(filename), "models/%s", szInName);
     } else {
-        strcpy(filename, szInName);
+        Q_strncpyz(filename, szInName, sizeof(filename));
     }
 
     gi.FS_CanonicalFilename(filename);
@@ -1424,46 +1567,45 @@ void G_ProcessCacheInitCommands(dtiki_t *tiki)
 }
 
 void CacheResource(const char *stuff)
-
 {
     AliasListNode_t *ret;
     qboolean         streamed = qfalse;
     char             filename[MAX_STRING_TOKENS];
 
+    assert(stuff);
     if (!stuff) {
         return;
     }
 
+    if (gi.fsDebug->integer == 2) {
+        Com_Printf("server cache: %s\n", stuff);
+    }
+
     if (!strchr(stuff, '.')) {
         // must be a global alias
         stuff = gi.GlobalAlias_FindRandom(stuff, &ret);
         if (!stuff) {
-            if (gi.fsDebug->integer) {
+            if (gi.fsDebug->integer == 2) {
                 Com_Printf("alias not found\n");
             }
 
             return;
         }
         streamed = ret->streamed;
+        if (gi.fsDebug->integer == 2) {
+            Com_Printf("=> %s\n", stuff);
+        }
     }
 
-    strcpy(filename, stuff);
+    Q_strncpyz(filename, stuff, sizeof(filename));
     gi.FS_CanonicalFilename(filename);
 
-    if (strstr(filename, ".wav")) {
-        gi.soundindex(filename, streamed);
-    } else if (strstr(filename, ".mp3")) {
+    if (strstr(filename, ".wav") || strstr(filename, ".mp3")) {
         gi.soundindex(filename, streamed);
     } else if (strstr(filename, ".tik")) {
         dtiki_t *tiki;
 
-        if (*stuff && strncmp("models/", stuff, 7)) {
-            sprintf(filename, "models/%s", stuff);
-        } else {
-            strcpy(filename, stuff);
-        }
-
-        gi.FS_CanonicalFilename(filename);
+        Q_strncpyz(filename, CanonicalTikiName(stuff), sizeof(filename));
 
         tiki = gi.TIKI_RegisterModel(filename);
 
@@ -1530,22 +1672,25 @@ void RestoreMusicVolume(float fade_time)
 }
 
 void ChangeSoundtrack(const char *soundtrack)
-
 {
     level.saved_soundtrack   = level.current_soundtrack;
     level.current_soundtrack = soundtrack;
 
-    gi.setConfigstring(CS_SOUNDTRACK, soundtrack);
+    // Force the soundtrack to be sent again by setting it to empty first
+    // so it gets sent to clients again especially when loading
+    // from a saved game
+    gi.setConfigstring(CS_MUSIC, "");
+    gi.setConfigstring(CS_MUSIC, soundtrack);
+
     gi.DPrintf("soundtrack switched to %s.\n", soundtrack);
 }
 
 void RestoreSoundtrack(void)
-
 {
     if (level.saved_soundtrack.length()) {
         level.current_soundtrack = level.saved_soundtrack;
         level.saved_soundtrack   = "";
-        gi.setConfigstring(CS_SOUNDTRACK, level.current_soundtrack.c_str());
+        gi.setConfigstring(CS_MUSIC, level.current_soundtrack.c_str());
         gi.DPrintf("soundtrack restored %s.\n", level.current_soundtrack.c_str());
     }
 }
@@ -1624,14 +1769,30 @@ int G_AIEventTypeFromString(const char *pszType)
 float G_AIEventRadius(int iType)
 {
     static float fRadius[] = {
-        2048.0f, 384.0f, 4096.0f, 1024.0f, 1024.0f, 1536.0f, 1536.0f, 1500.0f, 2250.0f, 512.0f, 384.0f, 0, 0, 0, 0};
+        0,
+        2048,
+        384,
+        4096,
+        1024,
+        1024,
+        1536,
+        1536,
+        1500,
+        2250,
+        512,
+        384,
+        32768,
+        0,
+        0,
+        0
+    };
 
-    if (iType <= AI_EVENT_GRENADE) {
-        return fRadius[iType];
-    } else {
+    if (iType >= AI_EVENT_MAX) {
         Com_Printf("G_AIEventRadius: invalid event type\n");
         return 1500.0f;
     }
+
+    return fRadius[iType];
 }
 
 void G_BroadcastAIEvent(Entity *originator, Vector origin, char *pszType)
@@ -1642,6 +1803,7 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, char *pszType)
 void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radius)
 {
     Sentient *ent;
+    Actor    *act;
     Vector    delta;
     str       name;
     float     r2;
@@ -1650,8 +1812,8 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
     int       iNumSentients;
     int       iAreaNum;
 
-    if (iType < AI_EVENT_FOOTSTEP) {
-        ent = (Sentient *)G_GetEntity(0);
+    if (iType == AI_EVENT_MISC || iType == AI_EVENT_MISC_LOUD) {
+        ent = static_cast<Sentient *>(G_GetEntity(0));
 
         if (ent && ent->m_bIsDisguised) {
             return;
@@ -1663,48 +1825,50 @@ void G_BroadcastAIEvent(Entity *originator, Vector origin, int iType, float radi
     }
 
     assert(originator);
-    if (originator && !(originator->flags & FL_NOTARGET)) {
-        r2            = Square(radius);
-        iNumSentients = SentientList.NumObjects();
-        for (i = 1; i <= iNumSentients; i++) {
-            ent = SentientList.ObjectAt(i);
-            if ((ent == originator) || ent->deadflag) {
-                continue;
-            }
 
-            delta = origin - ent->centroid;
-
-            // dot product returns length squared
-            dist2 = Square(delta);
-
-            if (originator) {
-                iAreaNum = originator->edict->r.areanum;
-            } else {
-                iAreaNum = gi.AreaForPoint(origin);
-            }
-
-            if ((dist2 <= r2)
-                && ((iAreaNum == ent->edict->r.areanum) || (gi.AreasConnected(iAreaNum, ent->edict->r.areanum))))
-
-            {
-                if (ent->IsSubclassOfActor()) {
-                    Actor *act = (Actor *)ent;
-
-                    if (!act->IgnoreSound(iType)) {
-                        act->ReceiveAIEvent(origin, iType, originator, dist2, r2);
-                    }
-                } else if (ent->IsSubclassOfBot()) {
-                    PlayerBot *bot = (PlayerBot *)ent;
-
-                    bot->NoticeEvent(origin, iType, originator, dist2, r2);
-                }
-            }
+    r2            = Square(radius);
+    iNumSentients = SentientList.NumObjects();
+    for (i = 1; i <= iNumSentients; i++) {
+        ent = SentientList.ObjectAt(i);
+        if ((ent == originator) || ent->deadflag) {
+            continue;
         }
 
-#if 0
-		gi.DPrintf( "Broadcast event %s to %d entities\n", ev->getName(), count );
-#endif
+        if (!ent->IsSubclassOfActor()) {
+            continue;
+        }
+
+        act = static_cast<Actor*>(ent);
+        if (act->IgnoreSound(iType)) {
+            continue;
+        }
+
+        delta = origin - ent->centroid;
+
+        // dot product returns length squared
+        dist2 = Square(delta);
+
+        if (originator) {
+            iAreaNum = originator->edict->r.areanum;
+        } else {
+            iAreaNum = gi.AreaForPoint(origin);
+        }
+
+        if (dist2 > r2) {
+            continue;
+        }
+
+        if (iAreaNum != ent->edict->r.areanum && !gi.AreasConnected(iAreaNum, ent->edict->r.areanum)) {
+            continue;
+        }
+
+        act->ReceiveAIEvent(origin, iType, originator, dist2, r2);
     }
+
+    botManager.BroadcastEvent(originator, origin, iType, radius);
+#if 0
+    gi.DPrintf("Broadcast event %s to %d entities\n", ev->getName(), count);
+#endif
 }
 
 void CloneEntity(Entity *dest, Entity *src)
@@ -1747,7 +1911,6 @@ void CloneEntity(Entity *dest, Entity *src)
 }
 
 weaponhand_t WeaponHandNameToNum(str side)
-
 {
     if (!side.length()) {
         gi.DPrintf("WeaponHandNameToNum : Weapon hand not specified\n");
@@ -1764,7 +1927,6 @@ weaponhand_t WeaponHandNameToNum(str side)
 }
 
 const char *WeaponHandNumToName(weaponhand_t hand)
-
 {
     switch (hand) {
     case WEAPON_MAIN:
@@ -1777,7 +1939,6 @@ const char *WeaponHandNumToName(weaponhand_t hand)
 }
 
 firemode_t WeaponModeNameToNum(str mode)
-
 {
     if (!mode.length()) {
         gi.DPrintf("WeaponModeNameToNum : Weapon mode not specified\n");
@@ -1869,7 +2030,6 @@ str G_WeaponClassNumToName(int num)
 }
 
 void G_DebugTargets(Entity *e, str from)
-
 {
     gi.DPrintf("DEBUGTARGETS:%s ", from.c_str());
 
@@ -1887,7 +2047,6 @@ void G_DebugTargets(Entity *e, str from)
 }
 
 void G_DebugDamage(float damage, Entity *victim, Entity *attacker, Entity *inflictor)
-
 {
     gi.DPrintf(
         "Victim:%s Attacker:%s Inflictor:%s Damage:%f\n",
@@ -1910,7 +2069,6 @@ void G_FadeOut(float delaytime)
 }
 
 void G_AutoFadeIn(void)
-
 {
     level.m_fade_time_start = 1;
     level.m_fade_time       = 1;
@@ -1923,7 +2081,6 @@ void G_AutoFadeIn(void)
 }
 
 void G_ClearFade(void)
-
 {
     level.m_fade_time = -1;
     level.m_fade_type = fadein;
@@ -1942,29 +2099,10 @@ void G_RestartLevelWithDelay(float delaytime)
 {
     int i;
 
-    if (level.died_already) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
-    level.died_already = true;
-
-    // Restart the level soon
-    for (i = 0; i < game.maxclients; i++) {
-        if (g_entities[i].inuse) {
-            if (g_entities[i].entity) {
-                g_entities[i].entity->PostEvent(EV_Player_Respawn, delaytime);
-            }
-        }
-    }
-}
-
-//
-// restarts the game after delaytime
-//
-void G_PlayerDied(float delaytime)
-{
-    int i;
-
     if (level.died_already) {
         return;
     }
@@ -1972,7 +2110,6 @@ void G_PlayerDied(float delaytime)
     level.died_already = true;
 
     // Restart the level soon
-
     for (i = 0; i < game.maxclients; i++) {
         if (g_entities[i].inuse) {
             if (g_entities[i].entity) {
@@ -1986,34 +2123,42 @@ void G_PlayerDied(float delaytime)
 }
 
 void G_MissionFailed(void)
-
 {
-    // Make the music system play the failure music for this level
-    ChangeMusic("failure", "normal", true);
-
-    G_PlayerDied(3);
-
-    // tell the player they f'd up
-    gi.centerprintf(&g_entities[0], "@textures/menu/mission.tga");
+    G_RestartLevelWithDelay(0);
 
     level.mission_failed = true;
 }
 
 void G_StartCinematic(void)
-
 {
     level.cinematic = true;
     gi.cvar_set("sv_cinematic", "1");
 }
 
 void G_StopCinematic(void)
-
 {
     // clear out the skip thread
     level.cinematic = false;
     gi.cvar_set("sv_cinematic", "0");
 }
 
+int G_NumClients(void)
+{
+    gentity_t *ent;
+    int        i;
+    int        count = 0;
+
+    for (i = 0, ent = g_entities; i < game.maxclients; ent++, i++) {
+        if (!ent->inuse || !ent->entity) {
+            continue;
+        }
+
+        count++;
+    }
+
+    return count;
+}
+
 void G_PrintToAllClients(const char *pszString, int iType)
 {
     if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
@@ -2026,9 +2171,9 @@ void G_PrintToAllClients(const char *pszString, int iType)
         }
     } else {
         if (iType == 0) {
-            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", pszString);
+            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\"", pszString);
         } else {
-            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", pszString);
+            gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\"", pszString);
         }
     }
 }
@@ -2087,9 +2232,12 @@ G_PrintDeathMessageEmulated(const char *s1, const char *s2, char *attackerName,
     result2 = NULL;
 
     if (type == tolower(type)) {
+        // Enemy
         hudColor = 4;
     } else {
-        hudColor = 5;
+        // Friend
+        //hudColor = 5;
+        hudColor = 4;
     }
 
     if (*s1 != 'x') {
@@ -2102,7 +2250,11 @@ G_PrintDeathMessageEmulated(const char *s1, const char *s2, char *attackerName,
         return va("%c%s %s\n", hudColor, victimName, result1);
     } else if (tolower(type) == 'p') {
         if (*s2 == 'x') {
-            return va("%c%s %s %s\n", hudColor, victimName, result1, attackerName);
+            if (s2[1] && s2[2]) {
+                return va("%c%s %s %s %s\n", hudColor, victimName, result1, attackerName, s2 + 2);
+            } else {
+                return va("%c%s %s %s\n", hudColor, victimName, result1, attackerName);
+            }
         } else {
             return va("%c%s %s %s%s\n", hudColor, victimName, result1, attackerName, result2);
         }
@@ -2135,9 +2287,9 @@ void G_PrintDeathMessage(
             pPlayer = static_cast<Player *>(ent->entity);
 
             if ((pPlayer->GetTeam() == TEAM_ALLIES || pPlayer->GetTeam() == TEAM_AXIS)
-                && pPlayer->GetTeam() == victim->GetTeam()
+                    && pPlayer->GetTeam() == victim->GetTeam()
                 || pPlayer->GetTeam() != TEAM_ALLIES && pPlayer->GetTeam() != TEAM_AXIS
-                && victim->GetTeam() == TEAM_ALLIES) {
+                       && victim->GetTeam() == TEAM_ALLIES) {
                 gi.SendServerCommand(
                     ent - g_entities,
                     "printdeathmsg \"%s\"\"%s\"\"%s\"\"%s\" %c",
@@ -2178,7 +2330,7 @@ void G_PrintDeathMessage_Old(const char *pszString)
             continue;
         }
 
-        gi.SendServerCommand(ent - g_entities, "print \"" HUD_MESSAGE_CHAT_RED "%s\"", pszString);
+        gi.SendServerCommand(ent - g_entities, "print \"%s\"", pszString);
     }
 }
 
@@ -2211,7 +2363,7 @@ void G_WarnPlayer(Player *player, const char *format, ...)
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     gi.SendServerCommand(player->client->ps.clientNum, "print \"%s\"\n", buffer);
@@ -2300,3 +2452,7 @@ gentity_t *G_GetGEntity(int ent_num)
 
     return ent;
 }
+
+unsigned int G_GetWeaponCommand(unsigned int buttons) {
+    return GetWeaponCommand(buttons, g_protocol >= PROTOCOL_MOHTA_MIN ? WEAPON_COMMAND_MAX_VER17 : WEAPON_COMMAND_MAX_VER6);
+}
diff --git a/code/fgame/g_utils.h b/code/fgame/g_utils.h
index 8f897721..7d5fb4be 100644
--- a/code/fgame/g_utils.h
+++ b/code/fgame/g_utils.h
@@ -30,6 +30,9 @@ class SimpleEntity;
 class SimpleArchivedEntity;
 class ScriptThread;
 
+void G_ArchivePlayerState(Archiver& arc, playerState_t* ps);
+void G_ArchiveTrace(Archiver& arc, trace_t* trace);
+void G_ArchiveClient(Archiver& arc, gclient_t* client);
 void G_ArchiveEdict(Archiver& arc, gentity_t *edict);
 
 void G_AllocDebugLines(void);
@@ -112,6 +115,7 @@ void G_TraceEntities(
     int                  contentmask,
     qboolean             bIncludeTriggers = qfalse
 );
+float G_VisualObfuscation(const Vector& start, const Vector& end);
 
 void SelectSpawnPoint(Vector& org, Vector& angles, str& thread);
 
@@ -123,6 +127,7 @@ Entity       *G_NextEntity(Entity *ent);
 qboolean M_CheckBottom(Entity *ent);
 
 Vector   G_GetMovedir(float angle);
+float    G_GetAngle(Vector movedir);
 qboolean KillBox(Entity *ent);
 qboolean IsNumeric(const char *str);
 
@@ -142,7 +147,6 @@ void G_MissionFailed(void);
 void G_FadeOut(float delaytime);
 void G_FadeSound(float delaytime);
 void G_RestartLevelWithDelay(float delaytime);
-void G_PlayerDied(float delaytime);
 void G_AutoFadeIn(void);
 void G_ClearFade(void);
 void G_StartCinematic(void);
@@ -323,3 +327,4 @@ const char  *WeaponHandNumToName(weaponhand_t hand);
 weaponhand_t WeaponHandNameToNum(str side);
 void         G_DebugTargets(Entity *e, str from);
 void         G_DebugDamage(float damage, Entity *victim, Entity *attacker, Entity *inflictor);
+unsigned int G_GetWeaponCommand(unsigned int buttons);
diff --git a/code/fgame/g_vmove.cpp b/code/fgame/g_vmove.cpp
index 153658e1..1cdbb4a8 100644
--- a/code/fgame/g_vmove.cpp
+++ b/code/fgame/g_vmove.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,609 +28,621 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "movegrid.h"
 
 typedef struct {
-	qboolean		validGroundTrace;
-	float			previous_origin[ 3 ];
-	float			previous_velocity[ 3 ];
+    qboolean validGroundTrace;
+    float    previous_origin[3];
+    float    previous_velocity[3];
 } vml_t;
 
 vmove_t *vm;
-vml_t vml;
+vml_t    vml;
 
-void VM_ClipVelocity
-	(
-	float *in,
-	float *normal,
-	float *out,
-	float overbounce
-	)
+void VM_ClipVelocity(float *in, float *normal, float *out, float overbounce)
 {
-	float backoff;
-	float dir_z;
-	float normal2[ 3 ];
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	if( normal[ 2 ] >= 0.70f )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    if (normal[2] >= 0.70f) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-		normal2[ 0 ] = in[ 0 ] + DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] + DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+        normal2[0] = in[0] + DotProduct2D(in, normal);
+        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-		VectorNormalize( normal2 );
+        VectorNormalize(normal2);
 
-		dir_z = -normal2[ 2 ];
+        dir_z = -normal2[2];
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / dir_z;
-	}
-	else
-	{
-		backoff = DotProduct( in, normal );
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / dir_z;
+    } else {
+        backoff = DotProduct(in, normal);
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = in[ 2 ] - normal[ 2 ] * backoff;
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = in[2] - normal[2] * backoff;
+    }
 }
 
-void VM_AddTouchEnt
-	(
-	int entityNum
-	)
+void VM_AddTouchEnt(int entityNum)
 {
-	int			i;
+    int i;
 
-	if( entityNum == ENTITYNUM_NONE || entityNum == ENTITYNUM_WORLD )
-	{
-		return;
-	}
+    if (entityNum == ENTITYNUM_NONE || entityNum == ENTITYNUM_WORLD) {
+        return;
+    }
 
-	if( vm->numtouch > 32 )
-	{
-		return;
-	}
+    if (vm->numtouch > 32) {
+        return;
+    }
 
-	// see if it is already added
-	for( i = 0; i < vm->numtouch; i++ )
-	{
-		if( vm->touchents[ i ] == entityNum )
-			return;
-	}
+    // see if it is already added
+    for (i = 0; i < vm->numtouch; i++) {
+        if (vm->touchents[i] == entityNum) {
+            return;
+        }
+    }
 
-	// add it
-	vm->touchents[ vm->numtouch ] = entityNum;
-	vm->numtouch++;
+    // add it
+    vm->touchents[vm->numtouch] = entityNum;
+    vm->numtouch++;
 }
 
-qboolean VM_SlideMove
-	(
-	qboolean gravity
-	)
+qboolean VM_SlideMove(qboolean gravity)
 {
-	int bumpcount;
-	vec3_t dir;
-	float d;
-	int numplanes;
-	vec3_t planes[ 5 ];
-	vec3_t clipVelocity;
-	int i;
-	int j;
-	int k;
-	trace_t trace;
-	vec3_t end;
-	float time_left;
+    int     bumpcount;
+    vec3_t  dir;
+    float   d;
+    int     numplanes;
+    vec3_t  planes[5];
+    vec3_t  clipVelocity;
+    int     i;
+    int     j;
+    int     k;
+    trace_t trace;
+    vec3_t  end;
+    float   time_left;
+    vec3_t  endVelocity;
+    vec3_t  endClipVelocity;
 
-	if( gravity )
-	{
-		vm->vs->velocity[ 2 ] = vm->vs->velocity[ 2 ] - vm->frametime * sv_gravity->integer;
-		if( vm->vs->groundPlane )
-			VM_ClipVelocity( vm->vs->velocity, vm->vs->groundTrace.plane.normal, vm->vs->velocity, OVERCLIP );
-	}
+    VectorCopy(vm->vs->velocity, endVelocity);
 
-	time_left = vm->frametime;
+    if (gravity) {
+        endVelocity[2]      = vm->vs->velocity[2] - vm->frametime * sv_gravity->integer;
+        vm->vs->velocity[2] = (vm->vs->velocity[2] + endVelocity[2]) * 0.5;
+        if (vm->vs->groundPlane) {
+            VM_ClipVelocity(vm->vs->velocity, vm->vs->groundTrace.plane.normal, vm->vs->velocity, OVERCLIP);
+        }
+    }
 
-	if( vm->vs->groundPlane ) {
-		numplanes = 1;
-		VectorCopy( vm->vs->groundTrace.plane.normal, planes[ 0 ] );
-	}
-	else {
-		numplanes = 0;
-	}
+    time_left = vm->frametime;
 
-	// never turn against original velocity
-	VectorNormalize2( vm->vs->velocity, planes[ numplanes ] );
-	numplanes++;
+    if (vm->vs->groundPlane) {
+        numplanes = 1;
+        VectorCopy(vm->vs->groundTrace.plane.normal, planes[0]);
+    } else {
+        numplanes = 0;
+    }
 
-	for( bumpcount = 0; bumpcount < 4; bumpcount++ )
-	{
-		// calculate position we are trying to move to
-		VectorMA( vm->vs->origin, time_left, vm->vs->velocity, end );
+    // never turn against original velocity
+    VectorNormalize2(vm->vs->velocity, planes[numplanes]);
+    numplanes++;
 
-		// see if we can make it there
-		gi.trace( &trace, vm->vs->origin, vm->mins, vm->maxs, end, vm->vs->entityNum, vm->tracemask, qtrue, qfalse );
+    for (bumpcount = 0; bumpcount < 4; bumpcount++) {
+        // calculate position we are trying to move to
+        VectorMA(vm->vs->origin, time_left, vm->vs->velocity, end);
 
-		if( trace.allsolid )
-			break;
+        // see if we can make it there
+        gi.trace(&trace, vm->vs->origin, vm->mins, vm->maxs, end, vm->vs->entityNum, vm->tracemask, qtrue, qfalse);
 
-		if( trace.fraction > 0 ) {
-			// actually covered some distance
-			VectorCopy( trace.endpos, vm->vs->origin );
-		}
+        if (trace.allsolid) {
+            if (vm->vs->velocity[0] || vm->vs->velocity[1]) {
+                if (vm->vs->groundPlane) {
+                    VectorCopy(vm->vs->velocity, dir);
+                    VectorNegate(dir, dir);
+                    VectorNormalize(dir);
 
-		if( trace.fraction == 1 )
-			return bumpcount != 0;
+                    if (!vm->vs->hit_obstacle) {
+                        vm->vs->hit_obstacle = qtrue;
+                        VectorCopy(vm->vs->origin, vm->vs->hit_origin);
+                    }
 
-		memcpy( &vm->vs->groundTrace, &trace, sizeof( vm->vs->groundTrace ) );
-		vml.validGroundTrace = true;
+                    VectorAdd(vm->vs->obstacle_normal, dir, vm->vs->obstacle_normal);
+                }
 
-		// save entity for contact
-		VM_AddTouchEnt( trace.entityNum );
+                VectorClear(vm->vs->velocity);
+                VM_AddTouchEnt(trace.entityNum);
+                return qtrue;
+            }
 
-		time_left -= time_left * trace.fraction;
+            vm->vs->velocity[2] = 0;
+            bumpcount           = 0;
+            break;
+        }
 
-		if( numplanes >= MAX_CLIP_PLANES )
-		{
-			VectorClear( vm->vs->velocity );
-			return qtrue;
-		}
+        if (trace.fraction > 0) {
+            // actually covered some distance
+            VectorCopy(trace.endpos, vm->vs->origin);
+        }
 
-		//
-		// if this is the same plane we hit before, nudge velocity
-		// out along it, which fixes some epsilon issues with
-		// non-axial planes
-		//
-		for( i = 0; i < numplanes; i++ )
-		{
-			if( DotProduct( trace.plane.normal, planes[ i ] ) > 0.99 )
-			{
-				VectorAdd( trace.plane.normal, vm->vs->velocity, vm->vs->velocity );
-				break;
-			}
-		}
+        if (trace.fraction == 1) {
+            break;
+        }
 
-		if( i >= numplanes )
-		{
-			//
-			// modify velocity so it parallels all of the clip planes
-			//
+        if (trace.plane.normal[2] >= MIN_WALK_NORMAL) {
+            memcpy(&vm->vs->groundTrace, &trace, sizeof(vm->vs->groundTrace));
+            vml.validGroundTrace = qtrue;
+        } else if (trace.plane.normal[2] > -0.999f && vm->vs->groundPlane) {
+            if (!vm->vs->hit_obstacle) {
+                vm->vs->hit_obstacle = qtrue;
+                VectorCopy(vm->vs->origin, vm->vs->hit_origin);
+            }
 
-			// find a plane that it enters
-			for( i = 0; i < numplanes; i++ )
-			{
-				if( DotProduct( vm->vs->velocity, planes[ i ] ) >= 0.1 ) {
-					continue;		// move doesn't interact with the plane
-				}
+            VectorAdd(vm->vs->obstacle_normal, trace.plane.normal, vm->vs->obstacle_normal);
+        }
 
-				// slide along the plane
-				VM_ClipVelocity( vm->vs->velocity, planes[ i ], clipVelocity, OVERCLIP );
+        // save entity for contact
+        VM_AddTouchEnt(trace.entityNum);
 
-				// see if there is a second plane that the new move enters
-				for( j = 0; j < numplanes; j++ )
-				{
-					if( j == i ) {
-						continue;
-					}
+        time_left -= time_left * trace.fraction;
 
-					// slide along the plane
-					VM_ClipVelocity( vm->vs->velocity, planes[ j ], clipVelocity, OVERCLIP );
+        if (numplanes >= MAX_CLIP_PLANES) {
+            VectorClear(vm->vs->velocity);
+            return qtrue;
+        }
 
-					if( DotProduct( clipVelocity, planes[ j ] ) >= 0.0f ) {
-						continue;		// move doesn't interact with the plane
-					}
+        //
+        // if this is the same plane we hit before, nudge velocity
+        // out along it, which fixes some epsilon issues with
+        // non-axial planes
+        //
+        for (i = 0; i < numplanes; i++) {
+            if (DotProduct(trace.plane.normal, planes[i]) > 0.99) {
+                VectorAdd(trace.plane.normal, vm->vs->velocity, vm->vs->velocity);
+                break;
+            }
+        }
 
-					// slide the original velocity along the crease
-					CrossProduct( planes[ i ], planes[ j ], dir );
-					VectorNormalize( dir );
-					d = DotProduct( dir, vm->vs->velocity );
-					VectorScale( dir, d, clipVelocity );
+        if (i >= numplanes) {
+            //
+            // modify velocity so it parallels all of the clip planes
+            //
+            VectorCopy(trace.plane.normal, planes[numplanes]);
+            numplanes++;
 
-					// see if there is a third plane the the new move enters
-					for( k = 0; k < numplanes; k++ )
-					{
-						if( k == i || k == j ) {
-							continue;
-						}
+            // find a plane that it enters
+            for (i = 0; i < numplanes; i++) {
+                if (DotProduct(vm->vs->velocity, planes[i]) >= 0.1) {
+                    continue; // move doesn't interact with the plane
+                }
 
-						if( DotProduct( clipVelocity, planes[ k ] ) >= 0.1f ) {
-							continue;		// move doesn't interact with the plane
-						}
+                // slide along the plane
+                VM_ClipVelocity(vm->vs->velocity, planes[i], clipVelocity, OVERCLIP);
+                VM_ClipVelocity(endVelocity, planes[i], endClipVelocity, OVERCLIP);
 
-						// stop dead at a tripple plane interaction
-						VectorClear( vm->vs->velocity );
-						return qtrue;
-					}
-				}
+                // see if there is a second plane that the new move enters
+                for (j = 0; j < numplanes; j++) {
+                    if (j == i) {
+                        continue;
+                    }
 
-				// if we have fixed all interactions, try another move
-				VectorCopy( clipVelocity, vm->vs->velocity );
-				break;
-			}
-		}
-	}
+                    // slide along the plane
+                    VM_ClipVelocity(clipVelocity, planes[j], clipVelocity, OVERCLIP);
+                    VM_ClipVelocity(endClipVelocity, planes[j], endClipVelocity, OVERCLIP);
 
-	if( vm->vs->velocity[ 0 ] || vm->vs->velocity[ 1 ] )
-	{
-		if( vm->vs->groundPlane )
-		{
-			VectorCopy( vm->vs->velocity, dir );
-			VectorNegate( dir, dir );
-			VectorNormalize( dir );
+                    if (DotProduct(clipVelocity, planes[j]) >= 0.0f) {
+                        continue; // move doesn't interact with the plane
+                    }
 
-			VM_AddTouchEnt( trace.entityNum );
-			VectorAdd( vm->vs->obstacle_normal, dir, vm->vs->obstacle_normal );
-		}
+                    // slide the original velocity along the crease
+                    CrossProduct(planes[i], planes[j], dir);
+                    VectorNormalize(dir);
+                    d = DotProduct(dir, vm->vs->velocity);
+                    VectorScale(dir, d, clipVelocity);
+                    d = DotProduct(dir, endVelocity);
+                    VectorScale(dir, d, endClipVelocity);
 
-		VectorClear( vm->vs->velocity );
-		return true;
-	}
+                    // see if there is a third plane the the new move enters
+                    for (k = 0; k < numplanes; k++) {
+                        if (k == i || k == j) {
+                            continue;
+                        }
 
-	vm->vs->velocity[ 2 ] = 0;
-	return false;
+                        if (DotProduct(clipVelocity, planes[k]) >= 0.1f) {
+                            continue; // move doesn't interact with the plane
+                        }
+
+                        // stop dead at a tripple plane interaction
+                        VectorClear(vm->vs->velocity);
+                        return qtrue;
+                    }
+                }
+
+                // if we have fixed all interactions, try another move
+                VectorCopy(clipVelocity, vm->vs->velocity);
+                VectorCopy(endClipVelocity, endVelocity);
+                break;
+            }
+        }
+    }
+
+    if (gravity) {
+        VectorCopy(endVelocity, vm->vs->velocity);
+    }
+
+    return bumpcount != 0;
 }
 
-static void VM_GroundTraceInternal2( void );
+static void VM_GroundTraceInternal2(void);
 
-void VM_GroundTraceInternal
-	(
-	void
-	)
+void VM_GroundTraceInternal(void)
 {
-	VM_GroundTraceInternal2();
-	VM_AddTouchEnt( vm->vs->groundTrace.entityNum );
+    if (vm->vs->groundTrace.fraction == 1) {
+        vm->vs->groundEntityNum = ENTITYNUM_NONE;
+        vm->vs->groundPlane     = qfalse;
+        vm->vs->walking         = qfalse;
+        return;
+    }
+
+    if (vm->vs->velocity[2] > 0.0f && DotProduct(vm->vs->velocity, vm->vs->groundTrace.plane.normal) > 10.0f) {
+        vm->vs->groundEntityNum = ENTITYNUM_NONE;
+        vm->vs->groundPlane     = qfalse;
+        vm->vs->walking         = qfalse;
+        return;
+    }
+
+    // slopes that are too steep will not be considered onground
+    if (vm->vs->groundTrace.plane.normal[2] < MIN_WALK_NORMAL) {
+        vec3_t oldvel;
+        float  d;
+
+        VectorCopy(vm->vs->velocity, oldvel);
+        VectorSet(vm->vs->velocity, 0, 0, -1.0f / vm->frametime);
+        VM_SlideMove(qfalse);
+
+        d = VectorLength(vm->vs->velocity);
+        VectorCopy(oldvel, vm->vs->velocity);
+
+        if (d > (0.1f / vm->frametime)) {
+            vm->vs->groundEntityNum = ENTITYNUM_NONE;
+            vm->vs->groundPlane     = qtrue;
+            vm->vs->walking         = qfalse;
+            return;
+        }
+    }
+
+    vm->vs->groundPlane     = qtrue;
+    vm->vs->walking         = qtrue;
+    vm->vs->groundEntityNum = vm->vs->groundTrace.entityNum;
+
+    VM_AddTouchEnt(vm->vs->groundTrace.entityNum);
 }
 
-void VM_GroundTraceInternal2
-	(
-	void
-	)
+void VM_GroundTraceInternal2(void)
 {
-	if( vm->vs->groundTrace.fraction == 1.0f )
-	{
-		vm->vs->groundEntityNum = ENTITYNUM_NONE;
-		vm->vs->groundPlane = qfalse;
-		vm->vs->walking = qfalse;
-		return;
-	}
+    if (vm->vs->groundTrace.fraction == 1.0f) {
+        vm->vs->groundEntityNum = ENTITYNUM_NONE;
+        vm->vs->groundPlane     = qfalse;
+        vm->vs->walking         = qfalse;
+        return;
+    }
 
-	if( vm->vs->velocity[ 2 ] > 0.0f )
-	{
-		if( DotProduct( vm->vs->velocity, vm->vs->groundTrace.plane.normal ) > 10.0f )
-		{
-			vm->vs->groundEntityNum = ENTITYNUM_NONE;
-			vm->vs->groundPlane = qfalse;
-			vm->vs->walking = qfalse;
-			return;
-		}
-	}
+    if (vm->vs->velocity[2] > 0.0f && DotProduct(vm->vs->velocity, vm->vs->groundTrace.plane.normal) > 10.0f) {
+        vm->vs->groundEntityNum = ENTITYNUM_NONE;
+        vm->vs->groundPlane     = qfalse;
+        vm->vs->walking         = qfalse;
+        return;
+    }
 
-	// slopes that are too steep will not be considered onground
-	if( vm->vs->groundTrace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-	{
-		vec3_t oldvel;
-		float d;
+    // slopes that are too steep will not be considered onground
+    if (vm->vs->groundTrace.plane.normal[2] < MIN_WALK_NORMAL) {
+        vec3_t oldvel;
+        float  d;
 
-		VectorCopy( vm->vs->velocity, oldvel );
-		VectorSet( vm->vs->velocity, 0, 0, -1.0f / vm->frametime );
-		VM_SlideMove( qfalse );
+        VectorCopy(vm->vs->velocity, oldvel);
+        VectorSet(vm->vs->velocity, 0, 0, -1.0f / vm->frametime);
+        VM_SlideMove(qfalse);
 
-		d = VectorLength( vm->vs->velocity );
-		VectorCopy( oldvel, vm->vs->velocity );
+        d = VectorLength(vm->vs->velocity);
+        VectorCopy(oldvel, vm->vs->velocity);
 
-		if( d > ( 0.1f / vm->frametime ) )
-		{
-			vm->vs->groundEntityNum = ENTITYNUM_NONE;
-			vm->vs->groundPlane = qtrue;
-			vm->vs->walking = qfalse;
-			return;
-		}
-	}
+        if (d > (0.1f / vm->frametime)) {
+            vm->vs->groundEntityNum = ENTITYNUM_NONE;
+            vm->vs->groundPlane     = qtrue;
+            vm->vs->walking         = qfalse;
+            return;
+        }
+    }
 
-	vm->vs->groundPlane = qtrue;
-	vm->vs->walking = qtrue;
-	vm->vs->groundEntityNum = vm->vs->groundTrace.entityNum;
+    vm->vs->groundPlane     = qtrue;
+    vm->vs->walking         = qtrue;
+    vm->vs->groundEntityNum = vm->vs->groundTrace.entityNum;
 }
 
-void VM_GroundTrace
-	(
-	void
-	)
+void VM_GroundTrace(void)
 {
-	float point[ 3 ];
+    float point[3];
 
-	point[ 0 ] = vm->vs->origin[ 0 ];
-	point[ 1 ] = vm->vs->origin[ 1 ];
-	point[ 2 ] = vm->vs->origin[ 2 ] - 0.25f;
+    point[0] = vm->vs->origin[0];
+    point[1] = vm->vs->origin[1];
+    point[2] = vm->vs->origin[2] - 0.25f;
 
-	gi.trace( &vm->vs->groundTrace, vm->vs->origin, vm->mins, vm->maxs, point, vm->vs->entityNum, vm->tracemask, qtrue, qfalse );
-	VM_GroundTraceInternal();
+    gi.trace(
+        &vm->vs->groundTrace, vm->vs->origin, vm->mins, vm->maxs, point, vm->vs->entityNum, vm->tracemask, qtrue, qfalse
+    );
+    VM_GroundTraceInternal();
 }
 
-void VM_StepSlideMove
-	(
-	void
-	)
+void VM_StepSlideMove(void)
 {
-	vec3_t start_o;
-	vec3_t start_v;
-	vec3_t nostep_o;
-	vec3_t nostep_v;
-	trace_t trace;
-	qboolean bWasOnGoodGround;
-	vec3_t up;
-	vec3_t down;
-	qboolean start_hit_wall;
-	vec3_t start_wall_normal;
-	qboolean first_hit_wall;
-	vec3_t first_wall_normal;
-	vec3_t start_hit_origin;
-	vec3_t first_hit_origin;
-	trace_t nostep_groundTrace;
+    vec3_t   start_o;
+    vec3_t   start_v;
+    vec3_t   nostep_o;
+    vec3_t   nostep_v;
+    trace_t  trace;
+    qboolean bWasOnGoodGround;
+    vec3_t   up;
+    vec3_t   down;
+    qboolean start_hit_wall;
+    vec3_t   start_wall_normal;
+    qboolean first_hit_wall;
+    vec3_t   first_wall_normal;
+    vec3_t   start_hit_origin;
+    vec3_t   first_hit_origin;
+    trace_t  nostep_groundTrace;
 
-	VectorCopy( vm->vs->origin, start_o );
-	VectorCopy( vm->vs->velocity, start_v );
-	start_hit_wall = vm->vs->hit_obstacle;
-	VectorCopy( vm->vs->hit_origin, start_hit_origin );
-	VectorCopy( vm->vs->obstacle_normal, start_wall_normal );
+    VectorCopy(vm->vs->origin, start_o);
+    VectorCopy(vm->vs->velocity, start_v);
+    start_hit_wall = vm->vs->hit_obstacle;
+    VectorCopy(vm->vs->hit_origin, start_hit_origin);
+    VectorCopy(vm->vs->obstacle_normal, start_wall_normal);
 
-	if( VM_SlideMove( qtrue ) == 0 )
-	{
-		if( !vml.validGroundTrace )
-			VM_GroundTrace();
+    if (VM_SlideMove(vm->vs->useGravity) == 0) {
+        if (vml.validGroundTrace) {
+            VM_GroundTraceInternal();
+        } else {
+            VM_GroundTrace();
+        }
+        return;
+    }
 
-		return;
-	}
+    VectorCopy(start_o, down);
+    down[2] -= STEPSIZE;
+    gi.trace(&trace, start_o, vm->mins, vm->maxs, down, vm->vs->entityNum, vm->tracemask, qtrue, qfalse);
+    VectorSet(up, 0, 0, 1);
 
-	VectorCopy( start_o, down );
-	down[ 2 ] -= STEPSIZE;
-	gi.trace( &trace, start_o, vm->mins, vm->maxs, down, vm->vs->entityNum, vm->tracemask, qtrue, qfalse );
-	VectorSet( up, 0, 0, 1 );
+    // never step up when you still have up velocity
+    if (vm->vs->velocity[2] > 0 && (trace.fraction == 1.0f || DotProduct(trace.plane.normal, up) < MIN_WALK_NORMAL)) {
+        if (vml.validGroundTrace) {
+            VM_GroundTraceInternal();
+        } else {
+            VM_GroundTrace();
+        }
+        return;
+    }
 
-	// never step up when you still have up velocity
-	if( vm->vs->velocity[ 2 ] > 0 && ( trace.fraction == 1.0f ||
-		DotProduct( trace.plane.normal, up ) < MIN_WALK_NORMAL ) )
-	{
-		if( !vml.validGroundTrace )
-			VM_GroundTrace();
-		else
-			VM_GroundTraceInternal();
+    if (vm->vs->groundPlane && vm->vs->groundTrace.plane.normal[2] >= MIN_WALK_NORMAL) {
+        bWasOnGoodGround = qtrue;
+    } else {
+        bWasOnGoodGround = qfalse;
+    }
 
-		return;
-	}
+    VectorCopy(start_o, up);
+    up[2] += STEPSIZE;
 
-	if( vm->vs->groundPlane && vm->vs->groundTrace.plane.normal[ 2 ] >= MIN_WALK_NORMAL )
-		bWasOnGoodGround = qtrue;
-	else
-		bWasOnGoodGround = qfalse;
+    VectorCopy(vm->vs->origin, nostep_o);
+    VectorCopy(vm->vs->velocity, nostep_v);
+    memcpy(&nostep_groundTrace, &vm->vs->groundTrace, sizeof(trace_t));
 
-	VectorCopy( vm->vs->origin, nostep_o );
-	VectorCopy( vm->vs->velocity, nostep_v );
-	memcpy( &nostep_groundTrace, &vm->vs->groundTrace, sizeof( trace_t ) );
+    VectorCopy(up, vm->vs->origin);
+    VectorCopy(start_v, vm->vs->velocity);
 
-	VectorCopy( start_o, vm->vs->origin );
-	VectorCopy( start_v, vm->vs->velocity );
+    first_hit_wall = vm->vs->hit_obstacle;
+    VectorCopy(vm->vs->hit_origin, first_hit_origin);
+    VectorCopy(vm->vs->obstacle_normal, first_wall_normal);
 
-	first_hit_wall = vm->vs->hit_obstacle;
-	VectorCopy( vm->vs->hit_origin, first_hit_origin );
-	VectorCopy( vm->vs->obstacle_normal, first_wall_normal );
+    vm->vs->hit_obstacle = start_hit_wall;
+    VectorCopy(start_hit_origin, vm->vs->hit_origin);
+    VectorCopy(start_wall_normal, vm->vs->obstacle_normal);
+    VM_SlideMove(vm->vs->useGravity);
 
-	vm->vs->hit_obstacle = start_hit_wall;
-	VectorCopy( start_hit_origin, vm->vs->hit_origin );
-	VectorCopy( start_wall_normal, vm->vs->obstacle_normal );
-	VM_SlideMove( qtrue );
+    VectorCopy(vm->vs->origin, down);
+    down[2] -= STEPSIZE * 2;
 
-	VectorCopy( vm->vs->origin, down );
-	down[ 2 ] -= STEPSIZE * 2;
+    // test the player position if they were a stepheight higher
+    gi.trace(&trace, vm->vs->origin, vm->mins, vm->maxs, down, vm->vs->entityNum, vm->tracemask, qtrue, qfalse);
+    if (trace.entityNum != ENTITYNUM_WORLD && trace.entityNum != ENTITYNUM_WORLD) {
+        VectorCopy(nostep_o, vm->vs->origin);
+        VectorCopy(nostep_v, vm->vs->velocity);
+        memcpy(&vm->vs->groundTrace, &nostep_groundTrace, sizeof(vm->vs->groundTrace));
+        vm->vs->hit_obstacle = first_hit_wall;
+        VectorCopy(first_hit_origin, vm->vs->hit_origin);
+        VectorCopy(first_wall_normal, vm->vs->obstacle_normal);
 
-	// test the player position if they were a stepheight higher
-	gi.trace( &trace, vm->vs->origin, vm->mins, vm->maxs, down, vm->vs->entityNum, vm->tracemask, qtrue, qfalse );
-	if( trace.entityNum > ENTITYNUM_NONE )
-	{
-		VectorCopy( nostep_o, vm->vs->origin );
-		VectorCopy( nostep_v, vm->vs->velocity );
-		memcpy( &vm->vs->groundTrace, &nostep_groundTrace, sizeof( vm->vs->groundTrace ) );
-		vm->vs->hit_obstacle = first_hit_wall;
-		VectorCopy( first_hit_origin, vm->vs->hit_origin );
-		VectorCopy( first_wall_normal, vm->vs->obstacle_normal );
+        if (vml.validGroundTrace) {
+            VM_GroundTraceInternal();
+        } else {
+            VM_GroundTrace();
+        }
+        return;
+    }
 
-		if( !vml.validGroundTrace )
-			VM_GroundTrace();
-		else
-			VM_GroundTraceInternal();
+    if (!trace.allsolid) {
+        memcpy(&vm->vs->groundTrace, &trace, sizeof(vm->vs->groundTrace));
+        vml.validGroundTrace = qtrue;
 
-		return;
-	}
+        if (bWasOnGoodGround && trace.fraction < 1 && trace.plane.normal[2] < MIN_WALK_NORMAL) {
+            VectorCopy(nostep_o, vm->vs->origin);
+            VectorCopy(nostep_v, vm->vs->velocity);
 
-	if( !trace.allsolid )
-	{
-		memcpy( &vm->vs->groundTrace, &trace, sizeof( vm->vs->groundTrace ) );
-		vml.validGroundTrace = qtrue;
+            if (first_hit_wall) {
+                vm->vs->hit_obstacle = first_hit_wall;
+                VectorCopy(first_hit_origin, vm->vs->hit_origin);
+                VectorCopy(first_wall_normal, vm->vs->obstacle_normal);
+            }
 
-		if( bWasOnGoodGround && trace.fraction && trace.plane.normal[ 2 ] < MIN_WALK_NORMAL )
-		{
-			VectorCopy( nostep_o, vm->vs->origin );
-			VectorCopy( nostep_v, vm->vs->velocity );
+            VM_GroundTraceInternal();
+            return;
+        }
 
-			if( first_hit_wall )
-			{
-				vm->vs->hit_obstacle = first_hit_wall;
-				VectorCopy( first_hit_origin, vm->vs->hit_origin );
-				VectorCopy( first_wall_normal, vm->vs->obstacle_normal );
-			}
+        VectorCopy(trace.endpos, vm->vs->origin);
+    }
 
-			VM_GroundTraceInternal();
-			return;
-		}
+    if (trace.fraction < 1) {
+        VM_ClipVelocity(vm->vs->velocity, trace.plane.normal, vm->vs->velocity, OVERCLIP);
+    }
 
-		VectorCopy( trace.endpos, vm->vs->origin );
-	}
-
-	if( trace.fraction < 1.0f )
-		VM_ClipVelocity( vm->vs->velocity, trace.plane.normal, vm->vs->velocity, OVERCLIP );
-
-	if( !vml.validGroundTrace )
-		VM_GroundTrace();
-	else
-		VM_GroundTraceInternal();
+    if (vml.validGroundTrace) {
+        VM_GroundTraceInternal();
+    } else {
+        VM_GroundTrace();
+    }
 }
 
-void VM_Friction( void ) {
-	vec3_t	vec;
-	float	*vel;
-	float	speed, newspeed, control;
-	float	drop;
-
-	vel = vm->vs->velocity;
-
-	VectorCopy( vel, vec );
-	if( vm->vs->walking )
-	{
-		// ignore slope movement
-		vec[ 2 ] = 0;
-	}
-
-	speed = VectorLength( vec );
-	if( speed < 1 )
-	{
-		// allow sinking underwater
-		vel[ 0 ] = 0;
-		vel[ 1 ] = 0;
-
-		return;
-	}
-
-	drop = 0;
-
-	if( vm->vs->walking )
-	{
-		control = ( speed < 50.0f ) ? 50.0f : speed;
-
-		// if getting knocked back, no friction
-		drop += control * 6.0f * vm->frametime;
-	}
-
-	// scale the velocity
-	newspeed = speed - drop;
-	if( newspeed < 0 )
-	{
-		newspeed = 0;
-	}
-
-	newspeed /= speed;
-
-	vel[ 0 ] = vel[ 0 ] * newspeed;
-	vel[ 1 ] = vel[ 1 ] * newspeed;
-	vel[ 2 ] = vel[ 2 ] * newspeed;
-}
-
-void VM_ClipVelocity2D
-	(
-	float *in,
-	float *normal,
-	float *out,
-	float overbounce
-	)
+void VM_Friction(void)
 {
-	float backoff;
-	float dir_z;
-	float normal2[ 3 ];
+    vec3_t vec;
+    float *vel;
+    float  speed, newspeed, control;
+    float  drop;
 
-	if( normal[ 2 ] >= 0.70f )
-	{
-		if( in[ 0 ] == 0.0f && in[ 1 ] == 0.0f )
-		{
-			VectorClear( out );
-			return;
-		}
+    vel = vm->vs->velocity;
 
-		normal2[ 0 ] = in[ 0 ] + DotProduct2D( in, normal );
-		normal2[ 1 ] = in[ 1 ] + DotProduct2D( in, normal );
-		normal2[ 2 ] = normal[ 2 ] * DotProduct2D( in, in );
+    VectorCopy(vel, vec);
+    if (vm->vs->walking) {
+        // ignore slope movement
+        vec[2] = 0;
+    }
 
-		VectorNormalize( normal2 );
+    speed = VectorLength(vec);
+    if (speed < 1) {
+        // allow sinking underwater
+        vel[0] = 0;
+        vel[1] = 0;
 
-		dir_z = -normal2[ 2 ];
+        return;
+    }
 
-		out[ 0 ] = in[ 0 ];
-		out[ 1 ] = in[ 1 ];
-		out[ 2 ] = DotProduct2D( in, normal2 ) / -normal2[ 2 ];
-	}
-	else
-	{
-		backoff = DotProduct2D( in, normal );
+    drop = 0;
 
-		if( backoff < 0 )
-			backoff *= overbounce;
-		else
-			backoff /= overbounce;
+    if (vm->vs->walking) {
+        control = (speed < 50.0f) ? 50.0f : speed;
 
-		out[ 0 ] = in[ 0 ] - normal[ 0 ] * backoff;
-		out[ 1 ] = in[ 1 ] - normal[ 1 ] * backoff;
-		out[ 2 ] = -( backoff * normal[ 2 ] );
-	}
+        // if getting knocked back, no friction
+        drop += control * 6.0f * vm->frametime;
+    }
+
+    // scale the velocity
+    newspeed = speed - drop;
+    if (newspeed < 0) {
+        newspeed = 0;
+    }
+
+    newspeed /= speed;
+
+    vel[0] = vel[0] * newspeed;
+    vel[1] = vel[1] * newspeed;
+    vel[2] = vel[2] * newspeed;
 }
 
-void VmoveSingle
-	(
-	vmove_t *vmove
-	)
+void VM_ClipVelocity2D(float *in, float *normal, float *out, float overbounce)
 {
-	float point[ 3 ];
-	trace_t trace;
+    float backoff;
+    float dir_z;
+    float normal2[3];
 
-	vm = vmove;
+    if (normal[2] >= 0.70f) {
+        if (in[0] == 0.0f && in[1] == 0.0f) {
+            VectorClear(out);
+            return;
+        }
 
-	vmove->numtouch = 0;
-	vmove->vs->hit_obstacle = false;
-	VectorCopy( vec_origin, vmove->vs->obstacle_normal );
+        normal2[0] = in[0] + DotProduct2D(in, normal);
+        normal2[1] = in[1] + DotProduct2D(in, normal);
+        normal2[2] = normal[2] * DotProduct2D(in, in);
 
-	memset( &vml, 0, sizeof( vml_t ) );
+        VectorNormalize(normal2);
 
-	VectorCopy( vmove->vs->origin, vml.previous_origin );
-	VectorCopy( vmove->vs->velocity, vml.previous_velocity );
+        dir_z = -normal2[2];
 
-	VM_GroundTraceInternal2();
+        out[0] = in[0];
+        out[1] = in[1];
+        out[2] = DotProduct2D(in, normal2) / -normal2[2];
+    } else {
+        backoff = DotProduct2D(in, normal);
 
-	if( vmove->vs->walking )
-	{
-		float wishdir[ 3 ];
+        if (backoff < 0) {
+            backoff *= overbounce;
+        } else {
+            backoff /= overbounce;
+        }
 
-		VM_Friction();
-		VM_ClipVelocity2D( vm->vs->desired_dir, vm->vs->groundTrace.plane.normal, wishdir, OVERCLIP );
-		VectorNormalize( wishdir );
-
-		vm->vs->velocity[ 0 ] = vm->desired_speed * wishdir[ 0 ];
-		vm->vs->velocity[ 1 ] = vm->desired_speed * wishdir[ 1 ];
-	}
-	else if( vmove->vs->groundPlane )
-	{
-		VM_ClipVelocity( vm->vs->velocity, vm->vs->groundTrace.plane.normal, vm->vs->velocity, OVERCLIP );
-	}
-
-	VM_StepSlideMove();
-
-	if( !vm->vs->walking && vml.previous_velocity[ 2 ] >= 0.0f && vm->vs->velocity[ 2 ] <= 0.0f )
-	{
-		point[ 0 ] = vm->vs->origin[ 0 ];
-		point[ 1 ] = vm->vs->origin[ 1 ];
-		point[ 2 ] = vm->vs->origin[ 2 ] - 18.0f;
-
-		gi.trace( &trace, vm->vs->origin, vm->mins, vm->maxs, point, vm->vs->entityNum, vm->tracemask, qtrue, qfalse );
-
-		if( trace.fraction < 1.0f && !trace.allsolid )
-		{
-			VM_GroundTrace();
-			return;
-		}
-	}
+        out[0] = in[0] - normal[0] * backoff;
+        out[1] = in[1] - normal[1] * backoff;
+        out[2] = -(backoff * normal[2]);
+    }
 }
 
+void VmoveSingle(vmove_t *vmove)
+{
+    float   point[3];
+    trace_t trace;
+    bool    walking;
+
+    vm = vmove;
+
+    vmove->numtouch         = 0;
+    vmove->vs->hit_obstacle = false;
+    VectorCopy(vec_origin, vmove->vs->obstacle_normal);
+
+    memset(&vml, 0, sizeof(vml_t));
+
+    VectorCopy(vmove->vs->origin, vml.previous_origin);
+    VectorCopy(vmove->vs->velocity, vml.previous_velocity);
+
+    VM_GroundTraceInternal2();
+
+    walking = vm->vs->walking;
+    if (walking) {
+        float wishdir[3];
+
+        VM_Friction();
+        VM_ClipVelocity2D(vm->vs->desired_dir, vm->vs->groundTrace.plane.normal, wishdir, OVERCLIP);
+        VectorNormalize(wishdir);
+
+        vm->vs->velocity[0] = vm->desired_speed * wishdir[0];
+        vm->vs->velocity[1] = vm->desired_speed * wishdir[1];
+
+        if (!vm->vs->velocity[0] && !vm->vs->velocity[1]) {
+            VM_GroundTrace();
+            return;
+        }
+    } else if (vm->vs->groundPlane) {
+        VM_ClipVelocity(vm->vs->velocity, vm->vs->groundTrace.plane.normal, vm->vs->velocity, OVERCLIP);
+    }
+
+    VM_StepSlideMove();
+
+    if (!vm->vs->walking && (walking || (vml.previous_velocity[2] >= 0.0f && vm->vs->velocity[2] <= 0.0f))) {
+        point[0] = vm->vs->origin[0];
+        point[1] = vm->vs->origin[1];
+        point[2] = vm->vs->origin[2] - 18;
+
+        gi.trace(&trace, vm->vs->origin, vm->mins, vm->maxs, point, vm->vs->entityNum, vm->tracemask, qtrue, qfalse);
+
+        if (trace.fraction < 1 && !trace.allsolid) {
+            VectorCopy(trace.endpos, vm->vs->origin);
+            VM_GroundTrace();
+        }
+    }
+}
diff --git a/code/fgame/game.cpp b/code/fgame/game.cpp
index 6eaa288a..29d5c47b 100644
--- a/code/fgame/game.cpp
+++ b/code/fgame/game.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,25 +24,116 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "game.h"
 #include "scriptmaster.h"
-#include "world.h"
+#include "worldspawn.h"
 
 #include "camera.h"
 #include "entity.h"
 #include "player.h"
 #include "dm_manager.h"
 
+Event EV_Game_Detail
+(
+    "skill",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "game.skill",   
+    EV_GETTER   
+);
+
+Event EV_Game_Skill
+(
+    "detail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "game.detail",
+    EV_GETTER
+);
+
 Game game;
 
+void Game::GetSkill(Event *ev)
+{
+    switch (skill->integer) {
+    case 0:
+    case 1:
+        ev->AddString("easy");
+        break;
+    case 2:
+        ev->AddString("hard");
+        break;
+    default:
+        ev->AddString("unknown");
+        break;
+    }
+}
+
+void Game::GetDetail(Event *ev)
+{
+    ev->AddFloat(detail->value);
+}
+
+void Game::Init()
+{
+    clients     = NULL;
+    autosaved   = qfalse;
+    maxentities = 0;
+    maxclients  = 0;
+}
+
+void Game::Archive(Archiver& arc)
+{
+    static cvar_t *g_maxplayerhealth = gi.Cvar_Get("g_maxplayerhealth", "250", 0);
+    int            i;
+
+    if (arc.Saving()) {
+        Vars()->MakePrimitive();
+    }
+
+    Listener::Archive(arc);
+
+    if (arc.Saving()) {
+        float fTmp;
+        int   iTmp;
+
+        fTmp = skill->value;
+        arc.ArchiveFloat(&fTmp);
+
+        iTmp = g_maxplayerhealth->integer;
+        arc.ArchiveInteger(&iTmp);
+    } else {
+        float fTmp;
+        int   iTmp;
+
+        arc.ArchiveFloat(&fTmp);
+        gi.cvar_set("skill", va("%f", fTmp));
+        arc.ArchiveInteger(&iTmp);
+        gi.cvar_set("g_maxplayerhealth", va("%d", iTmp));
+    }
+
+    arc.ArchiveBoolean(&autosaved);
+    arc.ArchiveInteger(&maxentities);
+    arc.ArchiveInteger(&maxclients);
+
+    if (arc.Loading()) {
+        G_AllocGameData();
+    }
+
+    for (i = 0; i < maxclients; i++) {
+        G_ArchiveClient(arc, &clients[i]);
+    }
+}
+
 Game::Game()
 {
-    clients    = NULL;
-    maxclients = 0;
+    Init();
 }
 
 Game::~Game() {}
 
-void Game::Archive(Archiver& arc) {}
-
 CLASS_DECLARATION(Listener, Game, NULL) {
-    {NULL, NULL}
+    {&EV_Game_Skill,  &Game::GetSkill },
+    {&EV_Game_Detail, &Game::GetDetail},
+    {NULL,            NULL            }
 };
diff --git a/code/fgame/game.h b/code/fgame/game.h
index b97c59d0..61f7821a 100644
--- a/code/fgame/game.h
+++ b/code/fgame/game.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -39,10 +39,16 @@ public:
 public:
     CLASS_PROTOTYPE(Game);
 
-    void Archive(Archiver& arc) override;
+protected:
+    void GetSkill(Event *ev);
+    void GetDetail(Event *ev);
 
+public:
     Game();
     ~Game();
+
+    void Init();
+    void Archive(Archiver& arc) override;
 };
 
 class SimpleArchivedEntity;
diff --git a/code/fgame/gamecmds.cpp b/code/fgame/gamecmds.cpp
index 74e5f8ce..69f94876 100644
--- a/code/fgame/gamecmds.cpp
+++ b/code/fgame/gamecmds.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // gamecmds.cpp: Game commands
-// 
+//
 
 #include "gamecmds.h"
 #include "glb_local.h"
@@ -36,179 +36,264 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "consoleevent.h"
 #include "g_bot.h"
 
-typedef struct
-   {
-   const char  *command;
-   qboolean    ( *func )( gentity_t *ent );
-   qboolean    allclients;
-   } consolecmd_t;
+typedef struct {
+    const char *command;
+    qboolean (*func)(gentity_t *ent);
+    qboolean allclients;
+} consolecmd_t;
 
-consolecmd_t G_ConsoleCmds[] =
-   {
-   //   command name       function             available in multiplayer?
-      { "say",				G_SayCmd,				qtrue },
-      { "eventlist",		G_EventListCmd,			qfalse },
-      { "pendingevents",	G_PendingEventsCmd,		qfalse },
-      { "eventhelp",		G_EventHelpCmd,			qfalse },
-      { "dumpevents",		G_DumpEventsCmd,		qfalse },
-      { "classevents",		G_ClassEventsCmd,		qfalse },
-      { "dumpclassevents",	G_DumpClassEventsCmd,	qfalse },
-      { "dumpallclasses",	G_DumpAllClassesCmd,	qtrue },
-      { "classlist",		G_ClassListCmd,			qfalse },
-      { "classtree",		G_ClassTreeCmd,			qfalse },
-      { "cam",				G_CameraCmd,			qfalse },
-      { "snd",				G_SoundCmd,				qfalse },
-      { "showvar",			G_ShowVarCmd,			qfalse },
-      { "script",			G_ScriptCmd,			qfalse },
-      { "levelvars",		G_LevelVarsCmd,			qfalse },
-      { "gamevars",			G_GameVarsCmd,			qfalse },
-	  { "compilescript",	G_CompileScript,		qfalse },
-	  { "addbot",			G_AddBotCommand,		qfalse },
-	  { "removebot",		G_RemoveBotCommand,		qfalse },
+typedef struct {
+    const char* prefix;
+    SafePtr<Listener> master;
+} commandmaster_t;
+
+consolecmd_t G_ConsoleCmds[] = {
+  //   command name       function             available in multiplayer?
+    {"say",             G_SayCmd,             qtrue },
+    {"eventlist",       G_EventListCmd,       qfalse},
+    {"pendingevents",   G_PendingEventsCmd,   qfalse},
+    {"eventhelp",       G_EventHelpCmd,       qfalse},
+    {"dumpevents",      G_DumpEventsCmd,      qfalse},
+    {"classevents",     G_ClassEventsCmd,     qfalse},
+    {"dumpclassevents", G_DumpClassEventsCmd, qfalse},
+    {"dumpallclasses",  G_DumpAllClassesCmd,  qtrue },
+    {"classlist",       G_ClassListCmd,       qfalse},
+    {"classtree",       G_ClassTreeCmd,       qfalse},
+    {"cam",             G_CameraCmd,          qfalse},
+    {"snd",             G_SoundCmd,           qfalse},
+    {"showvar",         G_ShowVarCmd,         qfalse},
+    {"levelvars",       G_LevelVarsCmd,       qfalse},
+    {"gamevars",        G_GameVarsCmd,        qfalse},
+    {"script",          G_ScriptCmd,          qfalse},
+    // Added in 2.0
+    {"reloadmap",       G_ReloadMap,          qfalse},
+    // Added in OPM
+    //====
+    {"compilescript",   G_CompileScript,      qfalse},
+    {"addbot",          G_AddBotCommand,      qfalse},
+    {"removebot",       G_RemoveBotCommand,   qfalse},
 #ifdef _DEBUG
-	  { "bot",				G_BotCommand,			qfalse },
+    {"bot",             G_BotCommand,         qfalse},
 #endif
-      { NULL,				NULL,					qfalse }
-   };
+    //====
+    {NULL,              NULL,                 qfalse}
+};
 
+Container<commandmaster_t> commandMasters;
 
-void G_InitConsoleCommands
-	(
-	void
-	)
+void G_InitConsoleCommands(void)
 {
-	consolecmd_t *cmds;
+    consolecmd_t *cmds;
 
-	//
-	// the game server will interpret these commands, which will be automatically
-	// forwarded to the server after they are not recognized locally
-	//
-	gi.AddCommand( "give", NULL );
-	gi.AddCommand( "god", NULL );
-	gi.AddCommand( "notarget", NULL );
-	gi.AddCommand( "noclip", NULL );
-	gi.AddCommand( "kill", NULL );
-	gi.AddCommand( "script", NULL );
+    //
+    // the game server will interpret these commands, which will be automatically
+    // forwarded to the server after they are not recognized locally
+    //
+    gi.AddCommand("give", NULL);
+    gi.AddCommand("god", NULL);
+    gi.AddCommand("notarget", NULL);
+    gi.AddCommand("noclip", NULL);
+    gi.AddCommand("kill", NULL);
+    gi.AddCommand("script", NULL);
+    gi.AddCommand("ready", NULL);
+    gi.AddCommand("notready", NULL);
+    gi.AddCommand("invprev", NULL);
+    gi.AddCommand("invnext", NULL);
+    gi.AddCommand("weapprev", NULL);
+    gi.AddCommand("weapnext", NULL);
+    gi.AddCommand("reload", NULL);
+    gi.AddCommand("gameversion", NULL);
+    gi.AddCommand("fov", NULL);
+    gi.AddCommand("holster", NULL);
+    gi.AddCommand("safeholster", NULL);
+    gi.AddCommand("safezoom", NULL);
+    gi.AddCommand("zoomoff", NULL);
+    gi.AddCommand("join_team", NULL);
+    gi.AddCommand("spectator", NULL);
+    gi.AddCommand("primarydmweapon", NULL);
+    gi.AddCommand("secondarydmweapon", NULL);
+    gi.AddCommand("dmmessage", NULL);
 
-	for( cmds = G_ConsoleCmds; cmds->command != NULL; cmds++ )
-	{
-		gi.AddCommand( cmds->command, NULL );
-	}
+    for (cmds = G_ConsoleCmds; cmds->command != NULL; cmds++) {
+        gi.AddCommand(cmds->command, NULL);
+    }
 }
 
-qboolean G_ConsoleCommand ( void )
+qboolean G_ConsoleCommand(void)
 {
-	gentity_t *ent;
-	qboolean result;
-	consolecmd_t *cmds;
-	const char *cmd;
+    gentity_t    *ent;
+    qboolean      result;
+    consolecmd_t *cmds;
+    const char   *cmd;
 
-	result = qfalse;
-	try
-	{
-		ent = &g_entities[ 0 ];
+    result = qfalse;
+    try {
+        ent = &g_entities[0];
 
-		cmd = gi.Argv( 0 );
+        cmd = gi.Argv(0);
 
-		for( cmds = G_ConsoleCmds; cmds->command != NULL; cmds++ )
-		{
-			if( !Q_stricmp( cmd, cmds->command ) )
-			{
-				return cmds->func( ent );
-			}
-		}
+        for (cmds = G_ConsoleCmds; cmds->command != NULL; cmds++) {
+            if (!Q_stricmp(cmd, cmds->command)) {
+                return cmds->func(ent);
+            }
+        }
 
-		result = G_ProcessClientCommand( ent );
-	}
-	catch( const char *error )
-	{
-		G_ExitWithError( error );
-	}
+        if (cl_running->integer) {
+            // Don't execute the command in multiplayer
+            // otherwise, the command will be executed "by" the first client
+            result = G_ProcessClientCommand(ent);
+        }
+    } catch (const char *error) {
+        G_ExitWithError(error);
+    }
 
-	return result;
+    return result;
 }
 
-void G_ClientCommand( gentity_t *ent )
+void G_ClientCommand(gentity_t *ent)
 {
-	try
-	{
-		if ( ent && !G_ProcessClientCommand( ent ) )
-		{
-			// anything that doesn't match a command will be a chat
-			//G_Say( ent, false, true );
-		}
-	}
+    try {
+        if (ent && !G_ProcessClientCommand(ent)) {
+            // anything that doesn't match a command will be a chat
+            //G_Say( ent, false, true );
+        }
+    }
 
-	catch( const char *error )
-	{
-		G_ExitWithError( error );
-	}
+    catch (const char *error) {
+        G_ExitWithError(error);
+    }
 }
 
-qboolean G_ProcessClientCommand
-	(
-	gentity_t *ent
-	)
+qboolean G_ProcessClientCommand(gentity_t *ent)
 {
-	const char		*cmd;
-	consolecmd_t	*cmds;
-	int				i;
-	int				n;
-	ConsoleEvent	*ev;
-	Player			*player;
+    const char   *cmd;
+    consolecmd_t *cmds;
+    int           i;
+    int           n;
+    Player       *player;
+    qboolean      allowDev;
 
-	if( !ent || !ent->client || !ent->entity )
-	{
-		// not fully in game yet
-		return qfalse;
-	}
+    if (!ent || !ent->client || !ent->entity) {
+        // not fully in game yet
+        return qfalse;
+    }
 
-	cmd = gi.Argv( 0 );
+    // Added in 2.1
+    //  Prevent players from messing with the server with developer commands
+    allowDev = g_gametype->integer == GT_SINGLE_PLAYER;
 
-	player = ( Player * )ent->entity;
-	player->m_lastcommand = cmd;
+    cmd = gi.Argv(0);
 
-	for( cmds = G_ConsoleCmds; cmds->command != NULL; cmds++ )
-	{
-		// if we have multiple clients and this command isn't allowed by multiple clients, skip it
-		if( ( game.maxclients > 1 ) && ( !cmds->allclients ) )
-		{
-			continue;
-		}
+    player                = (Player *)ent->entity;
+    player->m_lastcommand = cmd;
 
-		if( !Q_stricmp( cmd, cmds->command ) )
-		{
-			return cmds->func( ent );
-		}
-	}
+    for (cmds = G_ConsoleCmds; cmds->command != NULL; cmds++) {
+        // if we have multiple clients and this command isn't allowed by multiple clients, skip it
+        if ((game.maxclients > 1) && (!cmds->allclients)) {
+            continue;
+        }
 
-	if( Event::FindEventNum( cmd ) )
-	{
-		ev = new ConsoleEvent( cmd );
-		ev->SetConsoleEdict( ent );
+        if (!Q_stricmp(cmd, cmds->command)) {
+            return cmds->func(ent);
+        }
+    }
 
-		n = gi.Argc();
+    if (Event::Exists(cmd)) {
+        ConsoleEvent ev(cmd);
+        ev.SetConsoleEdict(ent);
 
-		for( i = 1; i < n; i++ )
-		{
-			ev->AddToken( gi.Argv( i ) );
-		}
+        n = gi.Argc();
 
-		if( !Q_stricmpn( cmd, "lod_", 4 ) )
-		{
-			return LODModel.ProcessEvent( ev );
-		}
-		else if( !Q_stricmpn( cmd, "view", 4 ) )
-		{
-			return Viewmodel.ProcessEvent( ev );
-		}
-		else if( ent->entity->CheckEventFlags( ev ) )
-		{
-			return ent->entity->ProcessEvent( ev );
-		}
-	}
+        for (i = 1; i < n; i++) {
+            ev.AddToken(gi.Argv(i));
+        }
 
-	return qfalse;
+        if (!Q_stricmpn(cmd, "lod_", 4)) {
+            if (!allowDev) {
+                return false;
+            }
+            return LODModel.ProcessEvent(ev);
+        } else if (!Q_stricmpn(cmd, "view", 4)) {
+            if (!allowDev) {
+                return false;
+            }
+            return Viewmodel.ProcessEvent(ev);
+        } else {
+            //
+            // Added in OPM
+            //
+            Listener* master = G_FindMaster(cmd);
+            if (master) {
+                return master->ProcessEvent(ev);
+            }
+        }
+
+        if (ent->entity->CheckEventFlags(&ev)) {
+            return ent->entity->ProcessEvent(ev);
+        }
+    }
+
+    return qfalse;
+}
+
+/*
+==================
+G_CreateMaster
+==================
+*/
+void G_CreateMaster(const char* prefix, Listener* master)
+{
+    commandmaster_t commandMaster;
+
+    int i;
+
+    for (i = 1; i <= commandMasters.NumObjects(); i++) {
+        const commandmaster_t& commandMaster = commandMasters.ObjectAt(i);
+        if (!str::icmp(commandMaster.prefix, prefix)) {
+            return;
+        }
+    }
+
+    commandMaster.prefix = prefix;
+    commandMaster.master = master;
+    commandMasters.AddObject(commandMaster);
+}
+
+/*
+==================
+G_MasterMatches
+==================
+*/
+bool G_MasterMatches(const commandmaster_t& commandMaster, const char* command) {
+    const char* s1, *s2;
+
+    s2 = commandMaster.prefix;
+    for (s1 = command; *s1 && *s2; s1++, s2++) {
+        if (tolower(*s1) != tolower(*s2)) {
+            return false;
+        }
+    }
+
+    return *s1 == '_';
+}
+
+/*
+==================
+G_FindMaster
+==================
+*/
+Listener* G_FindMaster(const char* command)
+{
+    int i;
+
+    for (i = 1; i <= commandMasters.NumObjects(); i++) {
+        const commandmaster_t& commandMaster = commandMasters.ObjectAt(i);
+        if (G_MasterMatches(commandMaster, command)) {
+            return commandMaster.master;
+        }
+    }
+
+    return NULL;
 }
 
 /*
@@ -216,522 +301,422 @@ qboolean G_ProcessClientCommand
 Cmd_Say_f
 ==================
 */
-void G_Say
-	(
-   gentity_t *ent,
-	qboolean team,
-	qboolean arg0
-	)
-
-	{
-	int			j;
-   gentity_t   *other;
-	const char	*p;
-	char			text[ 2048 ];
-
-	if ( gi.Argc() < 2 && !arg0 )
-		{
-		return;
-		}
-
-   if ( !ent->entity )
-      {
-      // just in case we're not joined yet.
-      team = false;
-      }
-
-	if ( !DM_FLAG( DF_MODELTEAMS | DF_SKINTEAMS ) )
-		{
-		team = false;
-		}
-
-	if ( team )
-		{
-		Com_sprintf( text, sizeof( text ), "(%s): ", ent->client->pers.netname );
-		}
-	else
-		{
-		Com_sprintf( text, sizeof( text ), "%s: ", ent->client->pers.netname );
-		}
-
-	if ( arg0 )
-		{
-		strcat( text, gi.Argv( 0 ) );
-		strcat( text, " " );
-		strcat( text, gi.Args() );
-		}
-	else
-		{
-		p = gi.Args();
-
-		if ( *p == '"' )
-			{
-			p++;
-			strcat( text, p );
-			text[ strlen( text ) - 1 ] = 0;
-			}
-		else
-			{
-			strcat( text, p );
-			}
-		}
-
-	// don't let text be too long for malicious reasons
-	if ( strlen( text ) > 150 )
-		{
-		text[ 150 ] = 0;
-		}
-
-	strcat( text, "\n" );
-
-   if ( dedicated->integer )
-		{
-      gi.SendServerCommand( 0, "print \"%s\"", text );
-		}
-
-	for( j = 0; j < game.maxclients; j++ )
-		{
-      other = &g_entities[ j ];
-		if ( !other->inuse || !other->client || !other->entity )
-			{
-			continue;
-			}
-
-      gi.SendServerCommand( 0, "print \"%s\"", text );
-		}
-	}
-
-qboolean G_CameraCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   Event *ev;
-	const char *cmd;
-   int   i;
-   int   n;
-
-   n = gi.Argc();
-   if ( !n )
-      {
-      gi.Printf( "Usage: cam [command] [arg 1]...[arg n]\n" );
-      return qtrue;
-      }
-
-	cmd = gi.Argv( 1 );
-  	if ( Event::GetEvent( cmd ) )
-		{
-		ev = new Event( cmd );
-
-		for( i = 2; i < n; i++ )
-			{
-			ev->AddToken( gi.Argv( i ) );
-			}
-
-      CameraMan.ProcessEvent( ev );
-      }
-   else
-      {
-      gi.Printf( "Unknown camera command '%s'.\n", cmd );
-      }
-
-   return qtrue;
-   }
-
-qboolean G_SoundCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   Event *ev;
-	const char *cmd;
-   int   i;
-   int   n;
-
-   n = gi.Argc();
-   if ( !n )
-      {
-      gi.Printf( "Usage: snd [command] [arg 1]...[arg n]\n" );
-      return qtrue;
-      }
-
-	cmd = gi.Argv( 1 );
-  	if ( Event::GetEvent( cmd ) )
-		{
-		ev = new Event( cmd );
-
-		for( i = 2; i < n; i++ )
-			{
-			ev->AddToken( gi.Argv( i ) );
-			}
-
-      SoundMan.ProcessEvent( ev );
-      }
-   else
-      {
-      gi.Printf( "Unknown sound command '%s'.\n", cmd );
-      }
-
-   return qtrue;
-   }
-
-qboolean G_SayCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-	G_Say( ent, false, false );
-
-   return qtrue;
-   }
-
-qboolean G_EventListCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *mask;
-
-   mask = NULL;
-   if ( gi.Argc() > 1 )
-      {
-      mask = gi.Argv( 1 );
-      }
-
-	//Event::ListCommands( mask );
-
-   return qtrue;
-   }
-
-qboolean G_PendingEventsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *mask;
-
-   mask = NULL;
-   if ( gi.Argc() > 1 )
-      {
-      mask = gi.Argv( 1 );
-      }
-
-	//Event::PendingEvents( mask );
-
-   return qtrue;
-   }
-
-qboolean G_EventHelpCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *mask;
-
-   mask = NULL;
-   if ( gi.Argc() > 1 )
-      {
-      mask = gi.Argv( 1 );
-      }
-
-	//Event::ListDocumentation( mask, false );
-
-   return qtrue;
-   }
-
-qboolean G_DumpEventsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *mask;
-
-   mask = NULL;
-   if ( gi.Argc() > 1 )
-      {
-      mask = gi.Argv( 1 );
-      }
-
-	//Event::ListDocumentation( mask, true );
-
-   return qtrue;
-   }
-
-qboolean G_ClassEventsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *className;
-
-   className = NULL;
-   if ( gi.Argc() < 2 )
-      {
-      gi.Printf( "Usage: classevents [className]\n" );
-      className = gi.Argv( 1 );
-      }
-   else
-      {
-      className = gi.Argv( 1 );
-	//ClassEvents( className );
-      }
-   return qtrue;
-   }
-
-qboolean G_DumpClassEventsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   const char *className;
-
-   className = NULL;
-   if ( gi.Argc() < 2 )
-      {
-      gi.Printf( "Usage: dumpclassevents [className]\n" );
-      className = gi.Argv( 1 );
-      }
-   else
-      {
-      className = gi.Argv( 1 );
-	//ClassEvents( className, qtrue );
-      }
-   return qtrue;
-   }
-
-qboolean G_DumpAllClassesCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-	DumpAllClasses();
-   return qtrue;
-   }
-
-qboolean G_ClassListCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-	//listAllClasses();
-
-   return qtrue;
-   }
-
-qboolean G_ClassTreeCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   if ( gi.Argc() > 1 )
-      {
-	//listInheritanceOrder( gi.Argv( 1 ) );
-      }
-   else
-      {
-      gi.SendServerCommand( ent - g_entities, "print \"Syntax: classtree [classname].\n\"" );
-      }
-
-   return qtrue;
-   }
-
-qboolean G_ShowVarCmd
-	(
-	gentity_t *ent
-	)
+void G_Say(gentity_t *ent, qboolean team, qboolean arg0)
 {
-	return qtrue;
+    int         j;
+    gentity_t  *other;
+    const char *p;
+    char        text[2048];
+
+    if (gi.Argc() < 2 && !arg0) {
+        return;
+    }
+
+    if (!ent->entity) {
+        // just in case we're not joined yet.
+        team = false;
+    }
+
+    if (!DM_FLAG(DF_MODELTEAMS | DF_SKINTEAMS)) {
+        team = false;
+    }
+
+    if (team) {
+        Com_sprintf(text, sizeof(text), "(%s): ", ent->client->pers.netname);
+    } else {
+        Com_sprintf(text, sizeof(text), "%s: ", ent->client->pers.netname);
+    }
+
+    if (arg0) {
+        strcat(text, gi.Argv(0));
+        strcat(text, " ");
+        strcat(text, gi.Args());
+    } else {
+        p = gi.Args();
+
+        if (*p == '"') {
+            p++;
+            strcat(text, p);
+            text[strlen(text) - 1] = 0;
+        } else {
+            strcat(text, p);
+        }
+    }
+
+    // don't let text be too long for malicious reasons
+    if (strlen(text) > 150) {
+        text[150] = 0;
+    }
+
+    strcat(text, "\n");
+
+    if (dedicated->integer) {
+        gi.SendServerCommand(0, "print \"%s\"", text);
+    }
+
+    for (j = 0; j < game.maxclients; j++) {
+        other = &g_entities[j];
+        if (!other->inuse || !other->client || !other->entity) {
+            continue;
+        }
+
+        gi.SendServerCommand(0, "print \"%s\"", text);
+    }
 }
 
-qboolean G_ScriptCmd( gentity_t *ent )
+qboolean G_CameraCmd(gentity_t *ent)
 {
-	if( gi.Argc() > 1 )
-	{
-		const char *script = gi.Argv( 1 );
-		int recompile = false;
+    Event      *ev;
+    const char *cmd;
+    int         i;
+    int         n;
 
-		if( gi.Argc() > 2 )
-		{
-			sscanf( gi.Argv( 2 ), "%d", &recompile );
-		}
+    n = gi.Argc();
+    if (!n) {
+        gi.Printf("Usage: cam [command] [arg 1]...[arg n]\n");
+        return qtrue;
+    }
 
-		Director.GetScript( script, recompile );
-		Director.ExecuteThread( script );
+    cmd = gi.Argv(1);
+    if (Event::Exists(cmd)) {
+        ev = new Event(cmd);
 
-		return qtrue;
-	}
-	else
-	{
-		gi.Printf( "Usage: script [filename] ([recompile])\n" );
-		return qfalse;
-	}
+        for (i = 2; i < n; i++) {
+            ev->AddToken(gi.Argv(i));
+        }
+
+        CameraMan.ProcessEvent(ev);
+    } else {
+        gi.Printf("Unknown camera command '%s'.\n", cmd);
+    }
+
+    return qtrue;
 }
 
-void PrintVariableList
-	(
-	ScriptVariableList * list
-	)
+qboolean G_SoundCmd(gentity_t *ent)
 {
+    Event      *ev;
+    const char *cmd;
+    int         i;
+    int         n;
+
+    n = gi.Argc();
+    if (!n) {
+        gi.Printf("Usage: snd [command] [arg 1]...[arg n]\n");
+        return qtrue;
+    }
+
+    cmd = gi.Argv(1);
+    if (Event::Exists(cmd)) {
+        ev = new Event(cmd);
+
+        for (i = 2; i < n; i++) {
+            ev->AddToken(gi.Argv(i));
+        }
+
+        SoundMan.ProcessEvent(ev);
+    } else {
+        gi.Printf("Unknown sound command '%s'.\n", cmd);
+    }
+
+    return qtrue;
 }
 
-qboolean G_LevelVarsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   gi.Printf( "Level Variables\n" );
-   PrintVariableList( level.vars );
-
-   return qtrue;
-   }
-
-qboolean G_GameVarsCmd
-   (
-   gentity_t *ent
-   )
-
-   {
-   gi.Printf( "Game Variables\n" );
-   PrintVariableList( game.vars );
-
-   return qtrue;
-   }
-
-qboolean G_CompileScript
-	(
-	gentity_t *ent
-	)
+qboolean G_SayCmd(gentity_t *ent)
 {
-	if( gi.Argc() <= 2 )
-	{
-		gi.Printf( "Usage: compilescript [filename] [output file]\n" );
-		return qfalse;
-	}
+    G_Say(ent, false, false);
 
-	CompileAssemble( gi.Argv( 1 ), gi.Argv( 2 ) );
-	return qtrue;
+    return qtrue;
 }
 
-qboolean G_AddBotCommand
-	(
-	gentity_t *ent
-	)
+qboolean G_EventListCmd(gentity_t *ent)
 {
-	unsigned int numbots;
-	unsigned int totalnumbots;
-	int clientNum = -1;
+    const char *mask;
 
-	if( gi.Argc() <= 1 )
-	{
-		gi.Printf( "Usage: addbot [numbots] [optional botname]\n" );
-		return qfalse;
-	}
+    mask = NULL;
+    if (gi.Argc() > 1) {
+        mask = gi.Argv(1);
+    }
 
-	numbots = atoi( gi.Argv( 1 ) );
-	if(numbots > sv_maxbots->integer)
-	{
-		gi.Printf( "addbot must be between 1-%d\n", sv_maxbots->integer );
-		return qfalse;
-	}
+    Event::ListCommands( mask );
 
-	totalnumbots = Q_min(numbots + sv_numbots->integer, sv_maxbots->integer);
-
-	gi.cvar_set("sv_numbots", va("%d", totalnumbots));
-	return qtrue;
+    return qtrue;
 }
 
-qboolean G_RemoveBotCommand
-	(
-	gentity_t *ent
-	)
+qboolean G_PendingEventsCmd(gentity_t *ent)
+{
+    const char *mask;
+
+    mask = NULL;
+    if (gi.Argc() > 1) {
+        mask = gi.Argv(1);
+    }
+
+    Event::PendingEvents( mask );
+
+    return qtrue;
+}
+
+qboolean G_EventHelpCmd(gentity_t *ent)
+{
+    const char *mask;
+
+    mask = NULL;
+    if (gi.Argc() > 1) {
+        mask = gi.Argv(1);
+    }
+
+    Event::ListDocumentation( mask, false );
+
+    return qtrue;
+}
+
+qboolean G_DumpEventsCmd(gentity_t *ent)
+{
+    const char *mask;
+
+    mask = NULL;
+    if (gi.Argc() > 1) {
+        mask = gi.Argv(1);
+    }
+
+    Event::ListDocumentation( mask, true );
+
+    return qtrue;
+}
+
+qboolean G_ClassEventsCmd(gentity_t *ent)
+{
+    const char *className;
+
+    className = NULL;
+    if (gi.Argc() < 2) {
+        gi.Printf("Usage: classevents [className]\n");
+        className = gi.Argv(1);
+    } else {
+        className = gi.Argv(1);
+        ClassEvents( className, qfalse );
+    }
+    return qtrue;
+}
+
+qboolean G_DumpClassEventsCmd(gentity_t *ent)
+{
+    const char *className;
+
+    className = NULL;
+    if (gi.Argc() < 2) {
+        gi.Printf("Usage: dumpclassevents [className]\n");
+        className = gi.Argv(1);
+    } else {
+        className = gi.Argv(1);
+        ClassEvents( className, qtrue );
+    }
+    return qtrue;
+}
+
+qboolean G_DumpAllClassesCmd(gentity_t *ent)
+{
+    DumpAllClasses();
+    return qtrue;
+}
+
+qboolean G_ClassListCmd(gentity_t *ent)
+{
+    listAllClasses();
+
+    return qtrue;
+}
+
+qboolean G_ClassTreeCmd(gentity_t *ent)
+{
+    if (gi.Argc() > 1) {
+        listInheritanceOrder( gi.Argv( 1 ) );
+    } else {
+        gi.SendServerCommand(ent - g_entities, "print \"Syntax: classtree [classname].\n\"");
+    }
+
+    return qtrue;
+}
+
+qboolean G_ShowVarCmd(gentity_t *ent)
+{
+    return qtrue;
+}
+
+void PrintVariableList(ScriptVariableList *list) {}
+
+qboolean G_LevelVarsCmd(gentity_t *ent)
+{
+    gi.Printf("Level Variables\n");
+    PrintVariableList(level.vars);
+
+    return qtrue;
+}
+
+qboolean G_GameVarsCmd(gentity_t *ent)
+{
+    gi.Printf("Game Variables\n");
+    PrintVariableList(game.vars);
+
+    return qtrue;
+}
+
+qboolean G_ScriptCmd(gentity_t *ent)
+{
+    const char   *script;
+    const char   *name;
+    Entity       *scriptEnt;
+    ConsoleEvent *event;
+    int           numArgs;
+    int           i;
+
+    numArgs = gi.Argc();
+
+    if (numArgs <= 1) {
+        gi.Printf("Usage: script [filename]\n");
+        return qtrue;
+    }
+
+    if (!sv_cheats->integer) {
+        gi.Printf("command not available\n");
+        return qtrue;
+    }
+
+    script = gi.Argv(1);
+    if (*script == '*') {
+        scriptEnt = static_cast<Entity *>(G_GetEntity(atoi(script + 1)));
+    } else {
+        scriptEnt = static_cast<Entity *>(G_FindTarget(0, script));
+    }
+
+    if (!scriptEnt) {
+        gi.Printf("Could not find entity %s\n", script);
+        return qtrue;
+    }
+
+    name = gi.Argv(2);
+    if (!Event::Exists(name)) {
+        gi.Printf("Unknown command '%s'.\n", name);
+        return qtrue;
+    }
+
+    event = new ConsoleEvent(name);
+    event->SetConsoleEdict(ent);
+
+    for (i = 3; i < numArgs; i++) {
+        event->AddToken(gi.Argv(i));
+    }
+
+    return scriptEnt->ProcessEvent(event);
+}
+
+qboolean G_ReloadMap(gentity_t* ent)
+{
+    char name[256];
+
+    Com_sprintf(name, sizeof(name), "gamemap \"%s\"\n", level.mapname.c_str());
+    gi.SendConsoleCommand(name);
+
+    return qtrue;
+}
+
+qboolean G_CompileScript(gentity_t *ent)
+{
+    if (gi.Argc() <= 2) {
+        gi.Printf("Usage: compilescript [filename] [output file]\n");
+        return qfalse;
+    }
+
+    CompileAssemble(gi.Argv(1), gi.Argv(2));
+    return qtrue;
+}
+
+qboolean G_AddBotCommand(gentity_t *ent)
+{
+    unsigned int numbots;
+    unsigned int totalnumbots;
+    int          clientNum = -1;
+
+    if (gi.Argc() <= 1) {
+        gi.Printf("Usage: addbot [numbots] [optional botname]\n");
+        return qfalse;
+    }
+
+    numbots = atoi(gi.Argv(1));
+
+    if (numbots > game.maxclients) {
+        gi.Printf("addbot must be between 1-%d\n", game.maxclients);
+        return qfalse;
+    }
+
+    totalnumbots = Q_min(numbots + sv_numbots->integer, game.maxclients);
+
+    gi.cvar_set("sv_numbots", va("%d", totalnumbots));
+    return qtrue;
+}
+
+qboolean G_RemoveBotCommand(gentity_t *ent)
 {
     unsigned int numbots;
     unsigned int totalnumbots;
 
-	if( gi.Argc() <= 1 )
-	{
-		gi.Printf( "Usage: removebot [numbots]\n" );
-		return qfalse;
+    if (gi.Argc() <= 1) {
+        gi.Printf("Usage: removebot [numbots]\n");
+        return qfalse;
     }
 
-	numbots = atoi(gi.Argv(1));
-	totalnumbots = sv_numbots->integer - Q_min(numbots, sv_numbots->integer);
+    numbots      = atoi(gi.Argv(1));
+    totalnumbots = sv_numbots->integer - Q_min(numbots, sv_numbots->integer);
 
     gi.cvar_set("sv_numbots", va("%d", totalnumbots));
-	return qtrue;
+    return qtrue;
 }
 
 #ifdef _DEBUG
 
-qboolean G_BotCommand
-	(
-	gentity_t *ent
-	)
+qboolean G_BotCommand(gentity_t *ent)
 {
-	const char *command;
-	PlayerBot *bot;
+    const char *command;
+    BotController *bot;
 
-	if( !G_GetFirstBot() || !G_GetFirstBot()->entity )
-	{
-		gi.Printf( "No bot spawned.\n" );
-		return qfalse;
-	}
+    if (botManager.getControllerManager().getControllers().NumObjects() < 1) {
+        gi.Printf("No bot spawned.\n");
+        return qfalse;
+    }
 
-	if( gi.Argc() <= 1 )
-	{
-		gi.Printf( "Usage: bot [cmd] (arg1) (arg2) (arg3) ...\n" );
-		return qfalse;
-	}
+    if (gi.Argc() <= 1) {
+        gi.Printf("Usage: bot [cmd] (arg1) (arg2) (arg3) ...\n");
+        return qfalse;
+    }
 
-	bot = ( PlayerBot * )G_GetFirstBot()->entity;
+    bot = botManager.getControllerManager().getControllers().ObjectAt(1);
 
-	command = gi.Argv( 1 );
+    command = gi.Argv(1);
 
-	if( !Q_stricmp( command, "movehere" ) )
-	{
-		bot->MoveTo( ent->entity->origin );
-	}
-	else if( !Q_stricmp( command, "moveherenear" ) )
-	{
-		float rad = 256.0f;
+    if (!Q_stricmp(command, "movehere")) {
+        bot->GetMovement().MoveTo(ent->entity->origin);
+    } else if (!Q_stricmp(command, "moveherenear")) {
+        float rad = 256.0f;
 
-		if( gi.Argc() > 2 )
-		{
-			rad = atof( gi.Argv( 2 ) );
-		}
+        if (gi.Argc() > 2) {
+            rad = atof(gi.Argv(2));
+        }
 
-		bot->MoveNear( ent->entity->origin, rad );
-	}
-	else if( !Q_stricmp( command, "avoidhere" ) )
-	{
-		float rad = 256.0f;
+        bot->GetMovement().MoveNear(ent->entity->origin, rad);
+    } else if (!Q_stricmp(command, "avoidhere")) {
+        float rad = 256.0f;
 
-		if( gi.Argc() > 2 )
-		{
-			rad = atof( gi.Argv( 2 ) );
-		}
+        if (gi.Argc() > 2) {
+            rad = atof(gi.Argv(2));
+        }
 
-		bot->AvoidPath( ent->entity->origin, rad );
-	}
-	else if( !Q_stricmp( command, "telehere" ) )
-	{
-		bot->setOrigin( ent->s.origin );
-	}
+        bot->GetMovement().AvoidPath(ent->entity->origin, rad);
+    } else if (!Q_stricmp(command, "telehere")) {
+        bot->getControlledEntity()->setOrigin(ent->s.origin);
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 #endif
diff --git a/code/fgame/gamecmds.h b/code/fgame/gamecmds.h
index dd5bffbb..a45ebc73 100644
--- a/code/fgame/gamecmds.h
+++ b/code/fgame/gamecmds.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,38 +22,42 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gamecmds.h: Game Commands.
 
-#ifndef __GAMECMDS_H__
-#define __GAMECMDS_H__
+#pragma once
 
 #include "g_local.h"
 
-void     G_InitConsoleCommands( void );
+void G_InitConsoleCommands(void);
 
-qboolean G_ProcessClientCommand( gentity_t *ent );
+qboolean G_ProcessClientCommand(gentity_t *ent);
 
-void     G_Say( gentity_t *ent, qboolean team, qboolean arg0 );
-qboolean G_CameraCmd( gentity_t *ent );
-qboolean G_SoundCmd( gentity_t *ent );
-qboolean G_SayCmd( gentity_t *ent );
-qboolean G_EventListCmd( gentity_t *ent );
-qboolean G_PendingEventsCmd( gentity_t *ent );
-qboolean G_EventHelpCmd( gentity_t *ent );
-qboolean G_DumpEventsCmd( gentity_t *ent );
-qboolean G_ClassEventsCmd( gentity_t *ent );
-qboolean G_DumpClassEventsCmd( gentity_t *ent );
-qboolean G_DumpAllClassesCmd( gentity_t *ent );
-qboolean G_ClassListCmd( gentity_t *ent );
-qboolean G_ClassTreeCmd( gentity_t *ent );
-qboolean G_ShowVarCmd( gentity_t *ent );
-qboolean G_RestartCmd( gentity_t *ent );
-qboolean G_ScriptCmd( gentity_t *ent );
-qboolean G_LevelVarsCmd( gentity_t *ent );
-qboolean G_GameVarsCmd( gentity_t *ent );
-qboolean G_CompileScript( gentity_t *ent );
-qboolean G_AddBotCommand( gentity_t *ent );
-qboolean G_RemoveBotCommand( gentity_t *ent );
+//===============
+// Added in OPM
+void G_CreateMaster(const char* prefix, class Listener* master);
+Listener* G_FindMaster(const char* command);
+//===============
+
+void     G_Say(gentity_t *ent, qboolean team, qboolean arg0);
+qboolean G_CameraCmd(gentity_t *ent);
+qboolean G_SoundCmd(gentity_t *ent);
+qboolean G_SayCmd(gentity_t *ent);
+qboolean G_EventListCmd(gentity_t *ent);
+qboolean G_PendingEventsCmd(gentity_t *ent);
+qboolean G_EventHelpCmd(gentity_t *ent);
+qboolean G_DumpEventsCmd(gentity_t *ent);
+qboolean G_ClassEventsCmd(gentity_t *ent);
+qboolean G_DumpClassEventsCmd(gentity_t *ent);
+qboolean G_DumpAllClassesCmd(gentity_t *ent);
+qboolean G_ClassListCmd(gentity_t *ent);
+qboolean G_ClassTreeCmd(gentity_t *ent);
+qboolean G_ShowVarCmd(gentity_t *ent);
+qboolean G_RestartCmd(gentity_t *ent);
+qboolean G_LevelVarsCmd(gentity_t *ent);
+qboolean G_GameVarsCmd(gentity_t* ent);
+qboolean G_ScriptCmd(gentity_t* ent);
+qboolean G_ReloadMap(gentity_t* ent);
+qboolean G_CompileScript(gentity_t *ent);
+qboolean G_AddBotCommand(gentity_t *ent);
+qboolean G_RemoveBotCommand(gentity_t *ent);
 #ifdef _DEBUG
-qboolean G_BotCommand( gentity_t *ent );
+qboolean G_BotCommand(gentity_t *ent);
 #endif
-
-#endif /* !__GAMECMDS_H__ */
\ No newline at end of file
diff --git a/code/fgame/gamecvars.cpp b/code/fgame/gamecvars.cpp
index 19e5ab49..2ce8fe5c 100644
--- a/code/fgame/gamecvars.cpp
+++ b/code/fgame/gamecvars.cpp
@@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gamecvars.h"
 
 cvar_t *developer;
-cvar_t *sv_specialgame;
 
 cvar_t *deathmatch;
 cvar_t *dmflags;
@@ -59,7 +58,7 @@ cvar_t *sv_rollspeed;
 cvar_t *sv_rollangle;
 cvar_t *sv_cheats;
 cvar_t *sv_showbboxes;
-cvar_t *sv_showbtags;
+cvar_t *sv_showtags;
 
 cvar_t *sv_testloc_num;
 cvar_t *sv_testloc_secondary;
@@ -258,19 +257,52 @@ cvar_t *g_no_seasick;
 
 cvar_t *g_aistats;
 
-cvar_t* g_obituarylocation;
+//
+// Added in OPM
+//
+
+cvar_t *sv_netoptimize;
+
+cvar_t *g_obituarylocation;
 
 cvar_t *sv_scriptfiles;
 
+// The maximum number of allocated bot clients
 cvar_t *sv_maxbots;
+// The number of bots that should be spawned
 cvar_t *sv_numbots;
+// The minimum number of players that should be present in-game.
+//  If the number of real players is below this number,
+//  the game will automatically add bots to fill the gap
+cvar_t *sv_minPlayers;
+// Whether or not the bots use a shared player slots
+//  NOTE: Setting this cvar is not recommended
+//  because when a client connects and the slot is used by a bot
+//  the bot will be relocated to a free entity slot
+cvar_t *sv_sharedbots;
+
 cvar_t *g_rankedserver;
 cvar_t *g_spectatefollow_firstperson;
 
+cvar_t *cl_running;
+
+// Whether or instant messages are allowed
+cvar_t *g_instamsg_allowed;
+// Minimum delay, in milliseconds, between instant messages
+cvar_t *g_instamsg_minDelay;
+// Whether or not text messages are allowed
+cvar_t *g_textmsg_allowed;
+// Minimum delay, in milliseconds, between messages
+cvar_t *g_textmsg_minDelay;
+
+// Whether or not to prevent teams from being unbalanced
+cvar_t *g_teambalance;
+
 void CVAR_Init(void)
 {
+    int i;
+
     developer      = gi.Cvar_Get("developer", "0", 0);
-    sv_specialgame = gi.Cvar_Get("sv_specialgame", "0", CVAR_LATCH | CVAR_SERVERINFO);
 
     precache = gi.Cvar_Get("sv_precache", "1", 0);
 
@@ -309,7 +341,7 @@ void CVAR_Init(void)
     sv_traceinfo  = gi.Cvar_Get("sv_traceinfo", "0", 0);
     sv_drawtrace  = gi.Cvar_Get("sv_drawtrace", "0", 0);
     sv_showbboxes = gi.Cvar_Get("sv_showbboxes", "0", 0);
-    sv_showbtags  = gi.Cvar_Get("sv_showtags", "0", 0);
+    sv_showtags   = gi.Cvar_Get("sv_showtags", "0", 0);
 
     sv_testloc_num       = gi.Cvar_Get("sv_testloc_num", "0", 0);
     sv_testloc_secondary = gi.Cvar_Get("sv_testloc_secondary", "0", 0);
@@ -331,7 +363,7 @@ void CVAR_Init(void)
     sv_waterspeed    = gi.Cvar_Get("sv_waterspeed", "400", 0);
 
     sv_cheats    = gi.Cvar_Get("cheats", "0", CVAR_USERINFO | CVAR_SERVERINFO | CVAR_LATCH);
-    sv_fps       = gi.Cvar_Get("sv_fps", "20",  CVAR_SAVEGAME);
+    sv_fps       = gi.Cvar_Get("sv_fps", "20", CVAR_SAVEGAME);
     sv_cinematic = gi.Cvar_Get("sv_cinematic", "0", CVAR_ROM);
 
     sv_maplist = gi.Cvar_Get("sv_maplist", "", CVAR_ARCHIVE | CVAR_SERVERINFO);
@@ -347,8 +379,8 @@ void CVAR_Init(void)
     sv_sprinttime_dm = gi.Cvar_Get("sv_sprinttime_dm", "5.0", 0);
     sv_sprintmult_dm = gi.Cvar_Get("sv_sprintmult_dm", "1.20", 0);
 
-	if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		sv_sprinton = gi.Cvar_Get("sv_sprinton", "1", 0);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        sv_sprinton = gi.Cvar_Get("sv_sprinton", "1", 0);
     } else {
         // mohaa doesn't have sprint support
         sv_sprinton = gi.Cvar_Get("sv_sprinton", "0", 0);
@@ -358,11 +390,17 @@ void CVAR_Init(void)
         gi.cvar_set("sv_runspeed", "250");
     }
 
-    sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "3.0", CVAR_ARCHIVE | CVAR_SERVERINFO);
-    sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "15", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "3.0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+        sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "15", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    } else {
+        sv_invulnerabletime    = gi.Cvar_Get("sv_invulnerabletime", "0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+        sv_team_spawn_interval = gi.Cvar_Get("sv_team_spawn_interval", "0", CVAR_ARCHIVE | CVAR_SERVERINFO);
+    }
 
     g_showmem         = gi.Cvar_Get("g_showmem", "0", 0);
     g_timeents        = gi.Cvar_Get("g_timeents", "0", 0);
+    g_timescripts     = gi.Cvar_Get("g_timescripts", "0", 0);
     g_showaxis        = gi.Cvar_Get("g_showaxis", "0", 0);
     g_showplayerstate = gi.Cvar_Get("g_showplayerstate", "0", 0);
     g_showplayeranim  = gi.Cvar_Get("g_showplayeranim", "0", 0);
@@ -426,8 +464,15 @@ void CVAR_Init(void)
 
     g_teamdamage         = gi.Cvar_Get("g_teamdamage", "0", 0);
     g_healthdrop         = gi.Cvar_Get("g_healthdrop", "1", 0);
-    g_healrate           = gi.Cvar_Get("g_healrate", "10", 0);
-    g_allowvote          = gi.Cvar_Get("g_allowvote", "1", 0);
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        g_healrate = gi.Cvar_Get("g_healrate", "10", 0);
+    } else {
+        //
+        // By default, no healrate on 1.11 and below
+        //
+        g_healrate = gi.Cvar_Get("g_healrate", "0", 0);
+    }
+    g_allowvote          = gi.Cvar_Get("g_allowvote", "1", CVAR_SERVERINFO);
     g_maprotation_filter = gi.Cvar_Get("g_maprotation_filter", "ffa", 0);
     g_warmup             = gi.Cvar_Get("g_warmup", "20", CVAR_ARCHIVE);
     g_doWarmup           = gi.Cvar_Get("g_doWarmup", "1", 0);
@@ -445,11 +490,14 @@ void CVAR_Init(void)
     g_teamkillwarn     = gi.Cvar_Get("g_teamkillwarn", "3", CVAR_ARCHIVE);
     g_teamkillkick     = gi.Cvar_Get("g_teamkillkick", "5", CVAR_ARCHIVE);
     g_teamswitchdelay  = gi.Cvar_Get("g_teamswitchdelay", "15", CVAR_ARCHIVE);
-    if (developer->integer) {
-        g_shownpc = gi.Cvar_Get("g_shownpc", "1", 0);
-    } else {
-        g_shownpc = gi.Cvar_Get("g_shownpc", "0", 0);
-    }
+    g_shownpc          = gi.Cvar_Get("g_shownpc", "0", 0);
+
+    // Removed in OPM
+    //if (developer->integer) {
+    //    g_shownpc = gi.Cvar_Get("g_shownpc", "1", 0);
+    //} else {
+    //    g_shownpc = gi.Cvar_Get("g_shownpc", "0", 0);
+    //}
 
     s_debugmusic = gi.Cvar_Get("s_debugmusic", "0", 0);
 
@@ -459,7 +507,7 @@ void CVAR_Init(void)
         gi.cvar_set("deathmatch", "1");
     }
 
-    if (g_protocol >= PROTOCOL_MOHTA_MIN) {
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         if (gi.Cvar_Get("com_target_game", "", 0)->integer == target_game_e::TG_MOHTT) {
             // Set the server type to mohaab
             gi.cvar_set("g_servertype", va("%d", target_game_e::TG_MOHTT));
@@ -555,16 +603,12 @@ void CVAR_Init(void)
     g_voiceChatTime = gi.Cvar_Get("g_voiceChatTime", "2.5", 0);
     g_textChatTime  = gi.Cvar_Get("g_textChatTime", "1", 0);
     g_debugsmoke    = gi.Cvar_Get("g_debugsmoke", "0", CVAR_CHEAT);
-    gi.Cvar_Get("g_obj_alliedtext1", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext2", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext3", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext4", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_alliedtext5", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext1", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext2", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext3", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext4", "", CVAR_SERVERINFO);
-    gi.Cvar_Get("g_obj_axistext5", "", CVAR_SERVERINFO);
+
+    for (i = 1; i <= 5; i++) {
+        gi.Cvar_Get(va("g_obj_alliedtext%d", i), "", CVAR_SERVERINFO);
+        gi.Cvar_Get(va("g_obj_axistext%d", i), "", CVAR_SERVERINFO);
+    }
+
     gi.Cvar_Get("g_scoreboardpic", "", CVAR_SERVERINFO);
     gi.Cvar_Get("g_scoreboardpicover", "", CVAR_SERVERINFO);
 
@@ -589,16 +633,30 @@ void CVAR_Init(void)
     g_rifles_for_sweepers     = gi.Cvar_Get("g_rifles_for_sweepers", "0", 0);
     g_no_seasick              = gi.Cvar_Get("g_no_seasick", "0", 0);
 
-	if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
+    //
+    // Added in OPM
+    //  Clear the text objectives and the scoreboard pic
+    //
+    for (i = 1; i <= 5; i++) {
+        gi.cvar_set(va("g_obj_alliedtext%d", i), "");
+        gi.cvar_set(va("g_obj_axistext%d", i), "");
+    }
+    gi.cvar_set("g_scoreboardpic", "");
+
+    sv_netoptimize = gi.Cvar_Get("sv_netoptimize", "0", 0);
+
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "0", 0);
     } else {
         // Defaults to 1 on vanilla mohaa
-		g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "1", 0);
+        g_obituarylocation = gi.Cvar_Get("g_obituarylocation", "1", 0);
     }
 
     sv_scriptfiles               = gi.Cvar_Get("sv_scriptfiles", "0", 0);
     sv_maxbots                   = gi.Cvar_Get("sv_maxbots", "0", CVAR_LATCH);
-    sv_numbots                   = gi.Cvar_Get("sv_numbots", "0", CVAR_LATCH);
+    sv_sharedbots                = gi.Cvar_Get("sv_sharedbots", "0", CVAR_LATCH);
+    sv_numbots                   = gi.Cvar_Get("sv_numbots", "0", 0);
+    sv_minPlayers                = gi.Cvar_Get("sv_minPlayers", "0", 0);
     g_rankedserver               = gi.Cvar_Get("g_rankedserver", "0", 0);
     g_spectatefollow_firstperson = gi.Cvar_Get("g_spectatefollow_firstperson", "0", 0);
 
@@ -611,8 +669,12 @@ void CVAR_Init(void)
         gi.Printf("sv_maxbots reached max clients, lowering the value to %u\n", lowered);
     }
 
-    if (sv_numbots->integer > sv_maxbots->integer) {
-        gi.Printf("numbots overflow, setting to %d\n", sv_maxbots->integer);
-        gi.cvar_set("sv_numbots", sv_maxbots->string);
-    }
+    g_instamsg_allowed = gi.Cvar_Get("g_instamsg_allowed", "1", 0);
+    g_instamsg_minDelay = gi.Cvar_Get("g_instamsg_minDelay", "1000", 0);
+    g_textmsg_allowed = gi.Cvar_Get("g_textmsg_allowed", "1", 0);
+    g_textmsg_minDelay = gi.Cvar_Get("g_textmsg_minDelay", "1000", 0);
+
+    g_teambalance = gi.Cvar_Get("g_teambalance", "0", 0);
+
+    cl_running = gi.Cvar_Get("cl_running", "", 0);
 }
diff --git a/code/fgame/gamecvars.h b/code/fgame/gamecvars.h
index f77be121..1f03a1dd 100644
--- a/code/fgame/gamecvars.h
+++ b/code/fgame/gamecvars.h
@@ -31,7 +31,6 @@ extern "C" {
 #endif
 
 extern cvar_t *developer;
-extern cvar_t *sv_specialgame;
 
 extern cvar_t *deathmatch;
 extern cvar_t *dmflags;
@@ -64,7 +63,7 @@ extern cvar_t *sv_rollspeed;
 extern cvar_t *sv_rollangle;
 extern cvar_t *sv_cheats;
 extern cvar_t *sv_showbboxes;
-extern cvar_t *sv_showbtags;
+extern cvar_t *sv_showtags;
 
 extern cvar_t *sv_testloc_num;
 extern cvar_t *sv_testloc_secondary;
@@ -263,15 +262,28 @@ extern cvar_t *g_no_seasick;
 
 extern cvar_t *g_aistats;
 
-extern cvar_t* g_obituarylocation;
+extern cvar_t *sv_netoptimize;
+
+extern cvar_t *g_obituarylocation;
 
 extern cvar_t *sv_scriptfiles;
 
 extern cvar_t *sv_maxbots;
-extern cvar_t * sv_numbots;
+extern cvar_t *sv_numbots;
+extern cvar_t *sv_minPlayers;
+extern cvar_t *sv_sharedbots;
 extern cvar_t *g_rankedserver;
 extern cvar_t *g_spectatefollow_firstperson;
 
+extern cvar_t *cl_running;
+
+extern cvar_t *g_instamsg_allowed;
+extern cvar_t *g_instamsg_minDelay;
+extern cvar_t *g_textmsg_allowed;
+extern cvar_t *g_textmsg_minDelay;
+
+extern cvar_t *g_teambalance;
+
 void CVAR_Init(void);
 
 #ifdef __cplusplus
diff --git a/code/fgame/gamescript.cpp b/code/fgame/gamescript.cpp
index e915e8ba..fe5999c0 100644
--- a/code/fgame/gamescript.cpp
+++ b/code/fgame/gamescript.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,436 +33,457 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static unsigned char *current_progBuffer = NULL;
 
-str& AbstractScript::Filename( void )
+str& AbstractScript::Filename(void)
 {
-	return Director.GetString( m_Filename );
+    return Director.GetString(m_Filename);
 }
 
-const_str AbstractScript::ConstFilename( void )
+const_str AbstractScript::ConstFilename(void)
 {
-	return m_Filename;
+    return m_Filename;
 }
 
-bool AbstractScript::GetSourceAt( size_t sourcePos, str *sourceLine, int &column, int &line )
+bool AbstractScript::GetSourceAt(size_t sourcePos, str *sourceLine, int& column, int& line)
 {
-	if( !m_SourceBuffer || sourcePos >= m_SourceLength ) {
-		return false;
-	}
+    size_t        posLine;
+    size_t        i;
+    size_t        start;
+    char         *p;
+    char          old_token;
+    sourceinfo_t *minCachedInfo = NULL;
 
-	line = 1;
-	column = 0;
-	int posLine = 0;
+    if (!m_SourceBuffer || sourcePos >= m_SourceLength) {
+        return false;
+    }
 
-	char *p = m_SourceBuffer;
-	char old_token;
+    line    = 1;
+    column  = 0;
+    posLine = 0;
+    start   = 0;
 
-	for( int i = 0; i < sourcePos; i++, p++ )
-	{
-		column++;
+    p = m_SourceBuffer;
 
-		if( *p == '\n' )
-		{
-			line++;
-			column = 0;
-			posLine = i + 1;
-		}
-		else if( *p == '\0' )
-		{
-			break;
-		}
-	}
+    if (sourcePos > 128) {
+        // Start caching above certain values
 
-	while( *p != '\0' && *p != '\n' )
-	{
-		p++;
-	}
+        for (i = 0; i < ARRAY_LEN(cachedInfo); i++) {
+            sourceinfo_t *info = &cachedInfo[i];
 
-	old_token = *p;
-	*p = '\0';
+            if (info->line && sourcePos > info->sourcePos
+                && (!minCachedInfo || info->sourcePos > minCachedInfo->sourcePos)) {
+                minCachedInfo = info;
+            }
+        }
 
-	if (sourceLine) {
-		*sourceLine = (m_SourceBuffer + posLine);
-	}
+        if (minCachedInfo) {
+            start   = minCachedInfo->sourcePos;
+            line    = minCachedInfo->line;
+            column  = minCachedInfo->column;
+            posLine = minCachedInfo->startLinePos;
+        }
+    }
 
-	*p = old_token;
+    for (i = start; i < sourcePos; i++) {
+        p = m_SourceBuffer + i;
+        column++;
 
-	return true;
+        if (*p == '\n') {
+            line++;
+            column = 0;
+            if (i + 1 != sourcePos) {
+                posLine = i + 1;
+            }
+        } else if (*p == '\0') {
+            break;
+        }
+    }
+
+    while (*p != '\0' && (*p != '\r' && *p != '\n')) {
+        p++;
+    }
+
+    old_token = *p;
+    *p        = '\0';
+
+    if (sourceLine) {
+        *sourceLine = (m_SourceBuffer + posLine);
+    }
+
+    *p = old_token;
+
+    cachedInfo[cachedInfoIndex].sourcePos    = sourcePos;
+    cachedInfo[cachedInfoIndex].line         = line;
+    cachedInfo[cachedInfoIndex].column       = column;
+    cachedInfo[cachedInfoIndex].startLinePos = posLine;
+    cachedInfoIndex                          = (cachedInfoIndex + 1) % ARRAY_LEN(cachedInfo);
+
+    return true;
 }
 
-void AbstractScript::PrintSourcePos( sourceinfo_t *sourcePos, bool dev )
+bool AbstractScript::GetSourceAt(const unsigned char *sourcePos, str *sourceLine, int& column, int& line)
 {
-	int line;
-	int column;
-	str sourceLine;
+    const sourceinfo_t *codePos = m_ProgToSource->findKeyValue(sourcePos);
 
-	if( GetSourceAt( sourcePos->sourcePos, &sourceLine, column, line ) )
-	{
-		PrintSourcePos( sourceLine, column, line, dev );
-	}
-	else
-	{
-		glbs.DPrintf( "file '%s', source pos %d line %d column %d:\n", Filename().c_str(), sourcePos->sourcePos, sourcePos->line, sourcePos->column );
-	}
+    if (!codePos) {
+        return false;
+    }
+
+    return GetSourceAt(codePos->sourcePos, sourceLine, column, line);
 }
 
-void AbstractScript::PrintSourcePos( size_t sourcePos, bool dev )
+void AbstractScript::PrintSourcePos(sourceinfo_t *sourcePos, bool dev)
 {
-	int line;
-	int column;
-	str sourceLine;
+    int line;
+    int column;
+    str sourceLine;
 
-	if( GetSourceAt( sourcePos, &sourceLine, column, line ) )
-	{
-		PrintSourcePos( sourceLine, column, line, dev );
-	}
-	else
-	{
-		glbs.DPrintf( "file '%s', source pos %d:\n", Filename().c_str(), sourcePos );
-	}
+    if (GetSourceAt(sourcePos->sourcePos, &sourceLine, column, line)) {
+        PrintSourcePos(sourceLine, column, line, dev);
+    } else {
+        gi.DPrintf(
+            "file '%s', source pos %d line %d column %d:\n",
+            Filename().c_str(),
+            sourcePos->sourcePos,
+            sourcePos->line,
+            sourcePos->column
+        );
+    }
 }
 
-void AbstractScript::PrintSourcePos( unsigned char *m_pCodePos, bool dev )
+void AbstractScript::PrintSourcePos(size_t sourcePos, bool dev)
 {
-	if( !m_ProgToSource )
-	{
-		return;
-	}
+    int line;
+    int column;
+    str sourceLine;
 
-	sourceinfo_t *codePos = m_ProgToSource->findKeyValue( m_pCodePos );
-
-	if( !codePos ) {
-		return;
-	}
-
-	PrintSourcePos( codePos, dev );
+    if (GetSourceAt(sourcePos, &sourceLine, column, line)) {
+        PrintSourcePos(sourceLine, column, line, dev);
+    } else {
+        gi.DPrintf("file '%s', source pos %d:\n", Filename().c_str(), sourcePos);
+    }
 }
 
-void AbstractScript::PrintSourcePos( str sourceLine, int column, int line, bool dev )
+void AbstractScript::PrintSourcePos(unsigned char *m_pCodePos, bool dev)
 {
-	int i;
-	str markerLine = "";
+    if (!m_ProgToSource) {
+        return;
+    }
 
-	for( i = 0; i < column; i++ )
-	{
-		markerLine.append( sourceLine[ i ] );
-	}
+    sourceinfo_t *codePos = m_ProgToSource->findKeyValue(m_pCodePos);
 
-	markerLine.append( "^" );
+    if (!codePos) {
+        return;
+    }
 
-	glbs.DPrintf( "(%s, %d):\n%s\n%s\n", Filename().c_str(), line, sourceLine.c_str(), markerLine.c_str() );
+    PrintSourcePos(codePos, dev);
+}
+
+void AbstractScript::PrintSourcePos(str sourceLine, int column, int line, bool dev)
+{
+    int i;
+    str markerLine = "";
+
+    for (i = 0; i < column; i++) {
+        markerLine.append(sourceLine[i]);
+    }
+
+    markerLine.append("^");
+
+    gi.DPrintf("(%s, %d):\n%s\n%s\n", Filename().c_str(), line, sourceLine.c_str(), markerLine.c_str());
 }
 
 AbstractScript::AbstractScript()
 {
-	m_ProgToSource = NULL;
-	m_SourceBuffer = NULL;
-	m_SourceLength = 0;
+    m_ProgToSource  = NULL;
+    m_SourceBuffer  = NULL;
+    m_SourceLength  = 0;
+    cachedInfoIndex = 0;
 }
 
 StateScript::StateScript()
 {
-	m_Parent = NULL;
+    m_Parent = NULL;
 }
 
 template<>
-void con_set< const_str, script_label_t >::Entry::Archive( Archiver& arc )
+void con_set<const_str, script_label_t>::Entry::Archive(Archiver& arc)
 {
-	unsigned int offset;
+    unsigned int offset;
 
-	Director.ArchiveString( arc, key );
+    Director.ArchiveString(arc, key);
 
-	if( arc.Saving() )
-	{
-		offset = value.codepos - current_progBuffer;
-		arc.ArchiveUnsigned( &offset );
-	}
-	else
-	{
-		arc.ArchiveUnsigned( &offset );
-		value.codepos = current_progBuffer + offset;
-		value.key = key;
-	}
+    if (arc.Saving()) {
+        offset = value.codepos - current_progBuffer;
+        arc.ArchiveUnsigned(&offset);
+    } else {
+        arc.ArchiveUnsigned(&offset);
+        value.codepos = current_progBuffer + offset;
+        value.key     = key;
+    }
 
-	arc.ArchiveBool( &value.isprivate );
+    arc.ArchiveBool(&value.isprivate);
 }
 
-void StateScript::Archive( Archiver& arc )
+void StateScript::Archive(Archiver& arc)
 {
-	label_list.Archive( arc );
+    label_list.Archive(arc);
 }
 
-bool StateScript::AddLabel( const_str label, unsigned char *pos, bool private_section )
+bool StateScript::AddLabel(const_str label, unsigned char *pos, bool private_section)
 {
-	if( label_list.findKeyValue( label ) )
-	{
-		return false;
-	}
+    if (label_list.findKeyValue(label)) {
+        return false;
+    }
 
-	script_label_t &s = label_list.addKeyValue( label );
+    script_label_t& s = label_list.addKeyValue(label);
 
-	s.codepos = pos;
-	s.key = label;
-	s.isprivate = private_section;
+    s.codepos   = pos;
+    s.key       = label;
+    s.isprivate = private_section;
 
-	if( !label_list.findKeyValue(STRING_NULL) )
-	{
-		label_list.addKeyValue(STRING_NULL) = s;
-	}
+    if (!label_list.findKeyValue(STRING_NULL)) {
+        label_list.addKeyValue(STRING_NULL) = s;
+    }
 
-	return true;
+    return true;
 }
 
-bool StateScript::AddLabel( str label, unsigned char *pos, bool private_section )
+bool StateScript::AddLabel(str label, unsigned char *pos, bool private_section)
 {
-	return AddLabel( Director.AddString( label ), pos, private_section );
+    return AddLabel(Director.AddString(label), pos, private_section);
 }
 
-unsigned char *StateScript::FindLabel( const_str label )
+unsigned char *StateScript::FindLabel(const_str label)
 {
-	script_label_t *s;
-	ScriptClass *scriptClass;
-	GameScript *script;
+    script_label_t *s;
+    ScriptClass    *scriptClass;
+    GameScript     *script;
 
-	s = label_list.findKeyValue( label );
+    s = label_list.findKeyValue(label);
 
-	if( s )
-	{
-		// check if the label is a private function
-		if( s->isprivate )
-		{
-			scriptClass = Director.CurrentScriptClass();
+    if (s) {
+        // check if the label is a private function
+        if (s->isprivate) {
+            scriptClass = Director.CurrentScriptClass();
 
-			if( scriptClass )
-			{
-				script = scriptClass->GetScript();
+            if (scriptClass) {
+                script = scriptClass->GetScript();
 
-				// now check if the label's statescript matches this statescript
-				if( ( &script->m_State ) != this )
-				{
-					ScriptError( "Cannot call a private function." );
-					return NULL;
-				}
-			}
-		}
+                // now check if the label's statescript matches this statescript
+                if ((&script->m_State) != this) {
+                    ScriptError("Cannot call a private function.");
+                    return NULL;
+                }
+            }
+        }
 
-		return s->codepos;
-	}
-	else
-	{
-		return NULL;
-	}
+        return s->codepos;
+    } else {
+        return NULL;
+    }
 }
 
-unsigned char *StateScript::FindLabel( str label )
+unsigned char *StateScript::FindLabel(str label)
 {
-	return FindLabel( Director.AddString( label ) );
+    return FindLabel(Director.AddString(label));
 }
 
-const_str StateScript::NearestLabel( unsigned char *pos )
+const_str StateScript::NearestLabel(unsigned char *pos)
 {
-	unsigned int offset = pos - m_Parent->m_ProgBuffer;
-	unsigned int bestOfs = 0;
-	const_str label = STRING_NULL;
-	con_set_enum< const_str, script_label_t > en = label_list;
-	con_set_enum< const_str, script_label_t >::Entry* entry;
+    unsigned int                                    offset  = pos - m_Parent->m_ProgBuffer;
+    unsigned int                                    bestOfs = 0;
+    const_str                                       label   = STRING_NULL;
+    con_set_enum<const_str, script_label_t>         en      = label_list;
+    con_set_enum<const_str, script_label_t>::Entry *entry;
 
     for (entry = en.NextElement(); entry; entry = en.NextElement()) {
         const script_label_t& l = entry->value;
 
-        if ((l.codepos - m_Parent->m_ProgBuffer) >= bestOfs)
-        {
+        if ((l.codepos - m_Parent->m_ProgBuffer) >= bestOfs) {
             bestOfs = l.codepos - m_Parent->m_ProgBuffer;
 
-            if (bestOfs > offset)
-            {
+            if (bestOfs > offset) {
                 break;
             }
 
             label = l.key;
         }
-	}
+    }
 
-	return label;
+    return label;
 }
 
 GameScript::GameScript()
 {
-	m_Filename = STRING_NULL;
-	successCompile = false;
+    m_Filename     = STRING_NULL;
+    successCompile = false;
 
-	m_ProgBuffer = NULL;
-	m_ProgLength = 0;
-	m_bPrecompiled = false;
+    m_ProgBuffer   = NULL;
+    m_ProgLength   = 0;
+    m_bPrecompiled = false;
 
-	requiredStackSize = 0;
+    requiredStackSize = 0;
 
-	m_State.m_Parent = this;
+    m_State.m_Parent = this;
 }
 
-GameScript::GameScript( const char *filename )
+GameScript::GameScript(const char *filename)
 {
-	m_Filename = Director.AddString( filename );
-	successCompile = false;
+    m_Filename     = Director.AddString(filename);
+    successCompile = false;
 
-	m_ProgBuffer = NULL;
-	m_ProgLength = 0;
-	m_ProgToSource = NULL;
-	m_bPrecompiled = false;
+    m_ProgBuffer   = NULL;
+    m_ProgLength   = 0;
+    m_ProgToSource = NULL;
+    m_bPrecompiled = false;
 
-	m_SourceBuffer = NULL;
-	m_SourceLength = 0;
+    m_SourceBuffer = NULL;
+    m_SourceLength = 0;
 
-	requiredStackSize = 0;
+    requiredStackSize = 0;
 
-	m_State.m_Parent = this;
+    m_State.m_Parent = this;
 }
 
 GameScript::~GameScript()
 {
-	Close();
+    Close();
 }
 
 struct pfixup_t {
-	bool			isString;
-	unsigned int	*ptr;
+    bool          isString;
+    unsigned int *ptr;
 };
 
-static Container< const_str > archivedEvents;
-static Container< const_str > archivedStrings;
-static Container< pfixup_t * > archivedPointerFixup;
+static Container<const_str>  archivedEvents;
+static Container<const_str>  archivedStrings;
+static Container<pfixup_t *> archivedPointerFixup;
 
-void ArchiveOpcode( Archiver& arc, unsigned char *code )
+void ArchiveOpcode(Archiver& arc, unsigned char *code)
 {
-	unsigned int index;
+    unsigned int index;
 
-	arc.ArchiveByte( code );
+    arc.ArchiveByte(code);
 
-	switch( *code )
-	{
-	case OP_STORE_NIL:
-	case OP_STORE_NULL:
-	case OP_DONE:
-		break;
+    switch (*code) {
+    case OP_STORE_NIL:
+    case OP_STORE_NULL:
+    case OP_DONE:
+        break;
 
-	case OP_EXEC_CMD_COUNT1:
-	case OP_EXEC_CMD_METHOD_COUNT1:
-	case OP_EXEC_METHOD_COUNT1:
-		arc.ArchiveByte( code + 1 );
-		goto __exec;
+    case OP_EXEC_CMD_COUNT1:
+    case OP_EXEC_CMD_METHOD_COUNT1:
+    case OP_EXEC_METHOD_COUNT1:
+        arc.ArchiveByte(code + 1);
+        goto __exec;
 
-	case OP_EXEC_CMD0:
-	case OP_EXEC_CMD1:
-	case OP_EXEC_CMD2:
-	case OP_EXEC_CMD3:
-	case OP_EXEC_CMD4:
-	case OP_EXEC_CMD5:
-	case OP_EXEC_CMD_METHOD0:
-	case OP_EXEC_CMD_METHOD1:
-	case OP_EXEC_CMD_METHOD2:
-	case OP_EXEC_CMD_METHOD3:
-	case OP_EXEC_CMD_METHOD4:
-	case OP_EXEC_CMD_METHOD5:
-	case OP_EXEC_METHOD0:
-	case OP_EXEC_METHOD1:
-	case OP_EXEC_METHOD2:
-	case OP_EXEC_METHOD3:
-	case OP_EXEC_METHOD4:
-	case OP_EXEC_METHOD5:
-		code--;
-__exec:
-		if( !arc.Loading() )
-		{
-			index = archivedEvents.AddUniqueObject( *reinterpret_cast< const_str * >( code + 2 ) );
-		}
+    case OP_EXEC_CMD0:
+    case OP_EXEC_CMD1:
+    case OP_EXEC_CMD2:
+    case OP_EXEC_CMD3:
+    case OP_EXEC_CMD4:
+    case OP_EXEC_CMD5:
+    case OP_EXEC_CMD_METHOD0:
+    case OP_EXEC_CMD_METHOD1:
+    case OP_EXEC_CMD_METHOD2:
+    case OP_EXEC_CMD_METHOD3:
+    case OP_EXEC_CMD_METHOD4:
+    case OP_EXEC_CMD_METHOD5:
+    case OP_EXEC_METHOD0:
+    case OP_EXEC_METHOD1:
+    case OP_EXEC_METHOD2:
+    case OP_EXEC_METHOD3:
+    case OP_EXEC_METHOD4:
+    case OP_EXEC_METHOD5:
+        code--;
+    __exec:
+        if (!arc.Loading()) {
+            index = archivedEvents.AddUniqueObject(*reinterpret_cast<const_str *>(code + 2));
+        }
 
-		arc.ArchiveUnsigned( &index );
+        arc.ArchiveUnsigned(&index);
 
-		if( arc.Loading() )
-		{
-			pfixup_t *p = new pfixup_t;
+        if (arc.Loading()) {
+            pfixup_t *p = new pfixup_t;
 
-			p->isString = false;
-			p->ptr = reinterpret_cast< unsigned int * >( code + 2 );
+            p->isString = false;
+            p->ptr      = reinterpret_cast<unsigned int *>(code + 2);
 
-			*reinterpret_cast< unsigned int * >( code + 2 ) = index;
-			archivedPointerFixup.AddObject( p );
-		}
-		break;
+            *reinterpret_cast<unsigned int *>(code + 2) = index;
+            archivedPointerFixup.AddObject(p);
+        }
+        break;
 
-	case OP_LOAD_FIELD_VAR:
-	case OP_LOAD_GAME_VAR:
-	case OP_LOAD_GROUP_VAR:
-	case OP_LOAD_LEVEL_VAR:
-	case OP_LOAD_LOCAL_VAR:
-	case OP_LOAD_OWNER_VAR:
-	case OP_LOAD_PARM_VAR:
-	case OP_LOAD_SELF_VAR:
-	case OP_LOAD_STORE_GAME_VAR:
-	case OP_LOAD_STORE_GROUP_VAR:
-	case OP_LOAD_STORE_LEVEL_VAR:
-	case OP_LOAD_STORE_LOCAL_VAR:
-	case OP_LOAD_STORE_OWNER_VAR:
-	case OP_LOAD_STORE_PARM_VAR:
-	case OP_LOAD_STORE_SELF_VAR:
-	case OP_STORE_FIELD:
-	case OP_STORE_FIELD_REF:
-	case OP_STORE_GAME_VAR:
-	case OP_STORE_GROUP_VAR:
-	case OP_STORE_LEVEL_VAR:
-	case OP_STORE_LOCAL_VAR:
-	case OP_STORE_OWNER_VAR:
-	case OP_STORE_PARM_VAR:
-	case OP_STORE_SELF_VAR:
-	case OP_STORE_STRING:
-		if( !arc.Loading() )
-		{
-			index = archivedStrings.AddUniqueObject( *reinterpret_cast< const_str * >( code + 1 ) );
-		}
+    case OP_LOAD_FIELD_VAR:
+    case OP_LOAD_GAME_VAR:
+    case OP_LOAD_GROUP_VAR:
+    case OP_LOAD_LEVEL_VAR:
+    case OP_LOAD_LOCAL_VAR:
+    case OP_LOAD_OWNER_VAR:
+    case OP_LOAD_PARM_VAR:
+    case OP_LOAD_SELF_VAR:
+    case OP_LOAD_STORE_GAME_VAR:
+    case OP_LOAD_STORE_GROUP_VAR:
+    case OP_LOAD_STORE_LEVEL_VAR:
+    case OP_LOAD_STORE_LOCAL_VAR:
+    case OP_LOAD_STORE_OWNER_VAR:
+    case OP_LOAD_STORE_PARM_VAR:
+    case OP_LOAD_STORE_SELF_VAR:
+    case OP_STORE_FIELD:
+    case OP_STORE_FIELD_REF:
+    case OP_STORE_GAME_VAR:
+    case OP_STORE_GROUP_VAR:
+    case OP_STORE_LEVEL_VAR:
+    case OP_STORE_LOCAL_VAR:
+    case OP_STORE_OWNER_VAR:
+    case OP_STORE_PARM_VAR:
+    case OP_STORE_SELF_VAR:
+    case OP_STORE_STRING:
+        if (!arc.Loading()) {
+            index = archivedStrings.AddUniqueObject(*reinterpret_cast<const_str *>(code + 1));
+        }
 
-		arc.ArchiveUnsigned( &index );
+        arc.ArchiveUnsigned(&index);
 
-		if( arc.Loading() )
-		{
-			pfixup_t *p = new pfixup_t;
+        if (arc.Loading()) {
+            pfixup_t *p = new pfixup_t;
 
-			p->isString = true;
-			p->ptr = reinterpret_cast< unsigned int * >( code + 1 );
+            p->isString = true;
+            p->ptr      = reinterpret_cast<unsigned int *>(code + 1);
 
-			*reinterpret_cast< unsigned int * >( code + 1 ) = index;
-			archivedPointerFixup.AddObject( p );
-		}
-		break;
+            *reinterpret_cast<unsigned int *>(code + 1) = index;
+            archivedPointerFixup.AddObject(p);
+        }
+        break;
 
-	default:
-		if( OpcodeLength( *code ) > 1 )
-			arc.ArchiveRaw( code + 1, OpcodeLength( *code ) - 1 );
-	}
+    default:
+        if (OpcodeLength(*code) > 1) {
+            arc.ArchiveRaw(code + 1, OpcodeLength(*code) - 1);
+        }
+    }
 }
 
 template<>
-void con_set< unsigned char *, sourceinfo_t >::Entry::Archive( Archiver& arc )
+void con_set<unsigned char *, sourceinfo_t>::Entry::Archive(Archiver& arc)
 {
-	unsigned int offset;
+    unsigned int offset;
 
-	if( arc.Loading() )
-	{
-		arc.ArchiveUnsigned( &offset );
-		key = current_progBuffer + offset;
-	}
-	else
-	{
-		offset = key - current_progBuffer;
-		arc.ArchiveUnsigned( &offset );
-	}
+    if (arc.Loading()) {
+        arc.ArchiveUnsigned(&offset);
+        key = current_progBuffer + offset;
+    } else {
+        offset = key - current_progBuffer;
+        arc.ArchiveUnsigned(&offset);
+    }
 
-	arc.ArchiveUnsigned( &value.sourcePos );
-	arc.ArchiveInteger( &value.column );
-	arc.ArchiveInteger( &value.line );
+    arc.ArchiveUnsigned(&value.sourcePos);
+    arc.ArchiveInteger(&value.column);
+    arc.ArchiveInteger(&value.line);
 }
 
-void GameScript::Archive( Archiver& arc )
+void GameScript::Archive(Archiver& arc)
 {
-	/*
+    /*
 	int count = 0, i;
 	unsigned char *p, *code_pos, *code_end;
 	const_str s;
@@ -509,7 +530,7 @@ void GameScript::Archive( Archiver& arc )
 	}
 	else
 	{
-		m_ProgBuffer = ( unsigned char * )glbs.Malloc( m_ProgLength );
+		m_ProgBuffer = ( unsigned char * )gi.Malloc( m_ProgLength );
 		code_pos = m_ProgBuffer;
 		code_end = m_ProgBuffer + m_ProgLength;
 
@@ -607,14 +628,14 @@ void GameScript::Archive( Archiver& arc )
 	{
 		fileHandle_t filehandle = NULL;
 
-		m_SourceLength = glbs.FS_ReadFile( Filename().c_str(), ( void ** )&m_SourceBuffer, true );
+		m_SourceLength = gi.FS_ReadFile( Filename().c_str(), ( void ** )&m_SourceBuffer, true );
 
 		if( m_SourceLength > 0 )
 		{
-			m_SourceBuffer = ( char * )glbs.Malloc( m_SourceLength );
+			m_SourceBuffer = ( char * )gi.Malloc( m_SourceLength );
 
-			glbs.FS_Read( m_SourceBuffer, m_SourceLength, filehandle );
-			glbs.FS_FCloseFile( filehandle );
+			gi.FS_Read( m_SourceBuffer, m_SourceLength, filehandle );
+			gi.FS_FCloseFile( filehandle );
 		}
 	}
 
@@ -623,580 +644,545 @@ void GameScript::Archive( Archiver& arc )
 	current_progBuffer = NULL;*/
 }
 
-void GameScript::Archive( Archiver& arc, GameScript *& scr )
+void GameScript::Archive(Archiver& arc, GameScript *& scr)
 {
-	str filename;
+    str filename;
 
-	if( arc.Saving() )
-	{
-		if (scr)
-		{
-			filename = scr->Filename();
-		}
-		else
-		{
-			filename = "";
-		}
+    if (arc.Saving()) {
+        if (scr) {
+            filename = scr->Filename();
+        } else {
+            filename = "";
+        }
 
-		arc.ArchiveString(&filename);
-	}
-	else
-	{
-		arc.ArchiveString(&filename);
+        arc.ArchiveString(&filename);
+    } else {
+        arc.ArchiveString(&filename);
 
-		if (filename != "")
-		{
-			scr = Director.GetScript(filename);
-		}
-		else
-		{
-			scr = NULL;
-		}
-	}
+        if (filename != "") {
+            scr = Director.GetScript(filename);
+        } else {
+            scr = NULL;
+        }
+    }
 }
 
-void GameScript::ArchiveCodePos( Archiver& arc, unsigned char **codePos )
+void GameScript::ArchiveCodePos(Archiver& arc, unsigned char **codePos)
 {
-	int pos = 0;
-	str filename;
+    int pos = 0;
+    str filename;
 
-	if( arc.Saving() ) {
-		GetCodePos(*codePos, filename, pos);
-	}
+    if (arc.Saving()) {
+        GetCodePos(*codePos, filename, pos);
+    }
 
-	arc.ArchiveInteger( &pos );
-	arc.ArchiveString( &filename );
+    arc.ArchiveInteger(&pos);
+    arc.ArchiveString(&filename);
 
-	if( arc.Loading() )
-	{
-		SetCodePos(*codePos, filename, pos);
-	}
+    if (arc.Loading()) {
+        SetCodePos(*codePos, filename, pos);
+    }
 }
 
-void GameScript::Close( void )
+void GameScript::Close(void)
 {
-	for( int i = m_CatchBlocks.NumObjects(); i > 0; i-- )
-	{
-		delete m_CatchBlocks.ObjectAt( i );
-	}
+    // Free up catch blocks
+    for (int i = m_CatchBlocks.NumObjects(); i > 0; i--) {
+        delete m_CatchBlocks.ObjectAt(i);
+    }
 
-	m_CatchBlocks.FreeObjectList();
+    // Added in OPM
+    //  Free up allocated state scripts
+    for (int i = m_StateScripts.NumObjects(); i > 0; i--) {
+        delete m_StateScripts.ObjectAt(i);
+    }
 
-	if( m_ProgToSource )
-	{
-		delete m_ProgToSource;
-		m_ProgToSource = NULL;
-	}
+    m_CatchBlocks.FreeObjectList();
 
-	if( m_ProgBuffer )
-	{
-		glbs.Free( m_ProgBuffer );
-		m_ProgBuffer = NULL;
-	}
+    if (m_ProgToSource) {
+        delete m_ProgToSource;
+        m_ProgToSource = NULL;
+    }
 
-	if( m_SourceBuffer )
-	{
-		glbs.Free( m_SourceBuffer );
-		m_SourceBuffer = NULL;
-	}
+    if (m_ProgBuffer) {
+        gi.Free(m_ProgBuffer);
+        m_ProgBuffer = NULL;
+    }
 
-	m_ProgLength = 0;
-	m_SourceLength = 0;
-	m_bPrecompiled = false;
+    if (m_SourceBuffer) {
+        gi.Free(m_SourceBuffer);
+        m_SourceBuffer = NULL;
+    }
+
+    m_ProgLength   = 0;
+    m_SourceLength = 0;
+    m_bPrecompiled = false;
 }
 
-void GameScript::Load( const void *sourceBuffer, size_t sourceLength )
+void GameScript::Load(const void *sourceBuffer, size_t sourceLength)
 {
-	size_t nodeLength;
-	char *m_PreprocessedBuffer;
+    size_t nodeLength;
+    char  *m_PreprocessedBuffer;
 
-	m_SourceBuffer = ( char * )glbs.Malloc( sourceLength + 2 );
-	m_SourceLength = sourceLength;
+    m_SourceBuffer = (char *)gi.Malloc(sourceLength + 2);
+    m_SourceLength = sourceLength;
 
-	// Original mohaa doesn't reallocate the input string to append a newline
-	// This is a temporary workaround to handle the absolute disaster of newlines
-	// Both the lexer and grammar are extremely abhorrent at handling newlines followed by an EOF
-	m_SourceBuffer[ sourceLength ] = '\n';
-	m_SourceBuffer[ sourceLength + 1] = 0;
+    // Original mohaa doesn't reallocate the input string to append a newline
+    // This is a temporary workaround to handle the absolute disaster of newlines
+    // Both the lexer and grammar are extremely abhorrent at handling newlines followed by an EOF
+    m_SourceBuffer[sourceLength]     = '\n';
+    m_SourceBuffer[sourceLength + 1] = 0;
 
-	memcpy( m_SourceBuffer, sourceBuffer, sourceLength );
+    memcpy(m_SourceBuffer, sourceBuffer, sourceLength);
 
-	Compiler.Reset();
+    Compiler.Reset();
 
-	m_PreprocessedBuffer = Compiler.Preprocess( m_SourceBuffer );
-	nodeLength = Compiler.Parse( this, m_PreprocessedBuffer, "script" );
-	Compiler.Preclean( m_PreprocessedBuffer );
+    m_PreprocessedBuffer = Compiler.Preprocess(m_SourceBuffer);
+    if (!Compiler.Parse(this, m_PreprocessedBuffer, "script", nodeLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str());
+        return Close();
+    }
 
-	if( !nodeLength )
-	{
-		glbs.DPrintf2( "^~^~^ Script file compile error:  Couldn't parse '%s'\n", Filename().c_str() );
-		return Close();
-	}
+    if (nodeLength == 0) {
+        // No code, assume success
+        requiredStackSize = 0;
+        successCompile    = true;
+        return;
+    }
 
-	m_ProgBuffer = ( unsigned char * )glbs.Malloc( nodeLength );
-	m_ProgLength = Compiler.Compile( this, m_ProgBuffer );
+    Compiler.Preclean(m_PreprocessedBuffer);
 
-	if( !m_ProgLength )
-	{
-		glbs.DPrintf2( "^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str() );
-		return Close();
-	}
+    m_ProgBuffer = (unsigned char *)gi.Malloc(nodeLength);
 
-	requiredStackSize = Compiler.m_iInternalMaxVarStackOffset + 9 * Compiler.m_iMaxExternalVarStackOffset + 1;
+    if (!Compiler.Compile(this, m_ProgBuffer, m_ProgLength)) {
+        gi.DPrintf2("^~^~^ Script file compile error:  Couldn't compile '%s'\n", Filename().c_str());
+        return Close();
+    }
 
-	successCompile = true;
+    requiredStackSize = Compiler.m_iInternalMaxVarStackOffset + 9 * Compiler.m_iMaxExternalVarStackOffset + 1;
+
+    successCompile = true;
 }
 
-bool GameScript::GetCodePos( unsigned char *codePos, str& filename, int& pos )
+bool GameScript::GetCodePos(unsigned char *codePos, str& filename, int& pos)
 {
-	pos = codePos - m_ProgBuffer;
+    pos = codePos - m_ProgBuffer;
 
-	if( pos >= 0 && pos < m_ProgLength )
-	{
-		filename = Filename();
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+    if (pos >= 0 && pos < m_ProgLength) {
+        filename = Filename();
+        return true;
+    } else {
+        return false;
+    }
 }
 
-bool GameScript::SetCodePos( unsigned char *&codePos, str& filename, int pos )
+bool GameScript::SetCodePos(unsigned char *& codePos, str& filename, int pos)
 {
-	if( Filename() == filename )
-	{
-		codePos = m_ProgBuffer + pos;
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+    if (Filename() == filename) {
+        codePos = m_ProgBuffer + pos;
+        return true;
+    } else {
+        return false;
+    }
 }
 
-unsigned int GameScript::GetRequiredStackSize( void )
+unsigned int GameScript::GetRequiredStackSize(void)
 {
-	return requiredStackSize;
+    return requiredStackSize;
 }
 
-qboolean GameScript::labelExists( const char *name )
+qboolean GameScript::labelExists(const char *name)
 {
-	str				labelname;
-	
-	// if we got passed a NULL than that means just run the script so of course it exists
-	if ( !name )
-	{
-		return true;
-	}
+    str labelname;
 
-	if( m_State.FindLabel( name ) )
-	{
-		return true;
-	}
+    // if we got passed a NULL than that means just run the script so of course it exists
+    if (!name) {
+        return true;
+    }
 
-	return false;
+    if (m_State.FindLabel(name)) {
+        return true;
+    }
+
+    return false;
 }
 
-StateScript *GameScript::CreateCatchStateScript( unsigned char *try_begin_code_pos, unsigned char *try_end_code_pos )
+StateScript *GameScript::CreateCatchStateScript(unsigned char *try_begin_code_pos, unsigned char *try_end_code_pos)
 {
-	CatchBlock *catchBlock = new CatchBlock;
+    CatchBlock *catchBlock = new CatchBlock;
 
-	catchBlock->m_TryStartCodePos = try_begin_code_pos;
-	catchBlock->m_TryEndCodePos = try_end_code_pos;
+    catchBlock->m_TryStartCodePos = try_begin_code_pos;
+    catchBlock->m_TryEndCodePos   = try_end_code_pos;
 
-	m_CatchBlocks.AddObject( catchBlock );
+    m_CatchBlocks.AddObject(catchBlock);
 
-	return &catchBlock->m_StateScript;
+    return &catchBlock->m_StateScript;
 }
 
-StateScript *GameScript::CreateSwitchStateScript( void )
+StateScript *GameScript::CreateSwitchStateScript(void)
 {
-	return new StateScript;
+    StateScript *stateScript = new StateScript;
+
+    m_StateScripts.AddObject(stateScript);
+
+    return stateScript;
 }
 
-StateScript *GameScript::GetCatchStateScript( unsigned char *in, unsigned char *&out )
+StateScript *GameScript::GetCatchStateScript(unsigned char *in, unsigned char *& out)
 {
-	CatchBlock *catchBlock;
-	CatchBlock *bestCatchBlock = NULL;
+    CatchBlock *catchBlock;
+    CatchBlock *bestCatchBlock = NULL;
 
-	for( int i = m_CatchBlocks.NumObjects(); i > 0; i-- )
-	{
-		catchBlock = m_CatchBlocks.ObjectAt( i );
+    for (int i = m_CatchBlocks.NumObjects(); i > 0; i--) {
+        catchBlock = m_CatchBlocks.ObjectAt(i);
 
-		if( in >= catchBlock->m_TryStartCodePos && in < catchBlock->m_TryEndCodePos )
-		{
-			if( !bestCatchBlock || catchBlock->m_TryEndCodePos < bestCatchBlock->m_TryEndCodePos )
-			{
-				bestCatchBlock = catchBlock;
-			}
-		}
-	}
+        if (in >= catchBlock->m_TryStartCodePos && in < catchBlock->m_TryEndCodePos) {
+            if (!bestCatchBlock || catchBlock->m_TryEndCodePos < bestCatchBlock->m_TryEndCodePos) {
+                bestCatchBlock = catchBlock;
+            }
+        }
+    }
 
-	if( bestCatchBlock )
-	{
-		out = bestCatchBlock->m_TryEndCodePos;
+    if (bestCatchBlock) {
+        out = bestCatchBlock->m_TryEndCodePos;
 
-		return &bestCatchBlock->m_StateScript;
-	}
-	else
-	{
-		return NULL;
-	}
+        return &bestCatchBlock->m_StateScript;
+    } else {
+        return NULL;
+    }
 }
 
 bool GameScript::ScriptCheck(void)
 {
-	if (g_scriptcheck->integer == 1)
-	{
-		return true;
-	}
+    if (g_scriptcheck->integer == 1) {
+        return true;
+    }
 
-	if (g_scriptcheck->integer == 2 || g_scriptcheck->integer == 3)
-	{
-		if (strstr(Filename().c_str(), "anim/") != Filename().c_str())
-		{
-			return true;
-		}
-	}
-	if (g_scriptcheck->integer == 3)
-	{
-		if (strstr(Filename().c_str(), "global/") != Filename().c_str())
-		{
-			return true;
-		}
-	}
-	return false;
+    if (g_scriptcheck->integer == 2 || g_scriptcheck->integer == 3) {
+        if (strstr(Filename().c_str(), "anim/") != Filename().c_str()) {
+            return true;
+        }
+    }
+    if (g_scriptcheck->integer == 3) {
+        if (strstr(Filename().c_str(), "global/") != Filename().c_str()) {
+            return true;
+        }
+    }
+    return false;
 }
 
 ScriptThreadLabel::ScriptThreadLabel()
 {
-	m_Script = NULL;
-	m_Label = STRING_EMPTY;
+    m_Script = NULL;
+    m_Label  = STRING_EMPTY;
 }
 
-ScriptThread *ScriptThreadLabel::Create( Listener *listener )
+ScriptThread *ScriptThreadLabel::Create(Listener *listener) const
 {
-	if( !m_Script ) {
-		return NULL;
-	}
+    ScriptClass  *scriptClass;
+    ScriptThread *thread;
 
-	ScriptClass *scriptClass = new ScriptClass( m_Script, listener );
-	ScriptThread *thread = Director.CreateScriptThread( scriptClass, m_Label );
+    if (!m_Script) {
+        return NULL;
+    }
 
-	return thread;
+    scriptClass = NULL;
+    thread      = NULL;
+
+    try {
+        scriptClass = new ScriptClass(m_Script, listener);
+        thread      = new ScriptThread(scriptClass, m_Script->m_State.FindLabel(m_Label));
+    } catch (...) {
+        if (scriptClass) {
+            delete scriptClass;
+        }
+
+        if (thread) {
+            delete thread;
+        }
+
+        throw;
+    }
+
+    return thread;
 }
 
-void ScriptThreadLabel::Execute( Listener *listener )
-{
-	if( !m_Script ) {
-		return;
-	}
-
-	ScriptThread *thread = Create( listener );
-
-	if( thread )
-	{
-		thread->Execute();
-	}
-}
-
-void ScriptThreadLabel::Execute( Listener *listener, Event &ev )
-{
-	Execute( listener, &ev );
-}
-
-void ScriptThreadLabel::Execute( Listener *listener, Event *ev )
-{
-	if( !m_Script ) {
-		return;
-	}
-
-	ScriptThread *thread = Create( listener );
-
-	if( thread )
-	{
-		thread->Execute( ev );
-	}
-}
-
-void ScriptThreadLabel::Execute(const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+void ScriptThreadLabel::Execute(Listener *listener) const
 {
     if (!m_Script) {
         return;
     }
 
-	ScriptVariable params[2];
+    ScriptThread *thread = Create(listener);
 
-	params[0].setListenerValue(listener);
-	params[1].setListenerValue(param);
+    if (thread) {
+        thread->Execute();
+    }
+}
 
-    ScriptClass* scriptClass = new ScriptClass(m_Script, listener);
-    ScriptThread* thread = Director.CreateScriptThread(scriptClass, m_Label);
+void ScriptThreadLabel::Execute(Listener *listener, Event& ev) const
+{
+    if (!m_Script) {
+        return;
+    }
 
-	if (thread)
-	{
-		thread->Execute(params, 2);
-	}
+    ScriptThread *thread = Create(listener);
+
+    if (thread) {
+        thread->Execute(ev);
+    }
+}
+
+void ScriptThreadLabel::Execute(Listener *listener, Event *ev) const
+{
+    Execute(listener, *ev);
+}
+
+void ScriptThreadLabel::Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param)
+    const
+{
+    if (!m_Script) {
+        return;
+    }
+
+    ScriptVariable params[2];
+
+    params[0].setListenerValue(listener);
+    params[1].setListenerValue(param);
+
+    ScriptClass  *scriptClass = new ScriptClass(m_Script, pSelf);
+    ScriptThread *thread      = Director.CreateScriptThread(scriptClass, m_Label);
+
+    if (thread) {
+        thread->Execute(params, 2);
+    }
+}
+
+void ScriptThreadLabel::Clear()
+{
+    m_Script = NULL;
+    m_Label  = STRING_EMPTY;
 }
 
 void ScriptThreadLabel::Set(const char *label)
 {
-	str script;
-	char buffer[ 1023 ];
-	char *p = buffer;
-	int i = 0;
-	bool foundLabel = false;
+    str   script;
+    char  buffer[1023];
+    char *p          = buffer;
+    int   i          = 0;
+    bool  foundLabel = false;
 
-	if( !label || !*label )
-	{
-		m_Script = NULL;
-		m_Label = STRING_EMPTY;
-		return;
-	}
+    if (!label || !*label) {
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+        return;
+    }
 
-	strcpy( buffer, label );
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
-	while( true )
-	{
-		if( p[ 0 ] == ':' && p[ 1 ] == ':' )
-		{
-			*p = '\0';
+    while (true) {
+        if (p[0] == ':' && p[1] == ':') {
+            *p = '\0';
 
-			script = buffer;
-			m_Label = Director.AddString( &p[ 2 ] );
-			foundLabel = true;
+            script     = buffer;
+            m_Label    = Director.AddString(&p[2]);
+            foundLabel = true;
 
-			break;
-		}
+            break;
+        }
 
-		p++;
-		i++;
+        p++;
+        i++;
 
-		if (*p == '\0')
-		{
-			break;
-		}
+        if (*p == '\0') {
+            break;
+        }
 
-		if (i >= 1023)
-		{
-			//we didn't find label but this is how it works.
-			//the whole string is the label
-			m_Label = Director.AddString(buffer);
-			script = buffer;
-			foundLabel = true;
-			break;
-		}
-		
-	}
+        if (i >= 1023) {
+            //we didn't find label but this is how it works.
+            //the whole string is the label
+            m_Label    = Director.AddString(buffer);
+            script     = buffer;
+            foundLabel = true;
+            break;
+        }
+    }
 
-	if( !foundLabel )
-	{
-		script = level.m_mapscript;
-		m_Label = Director.AddString(buffer);
-	}
+    if (!foundLabel) {
+        script  = level.m_mapscript;
+        m_Label = Director.AddString(buffer);
+    }
 
+    m_Script = Director.GetGameScript(script);
 
-	m_Script = Director.GetGameScript( script );
+    if (!m_Script->m_State.FindLabel(m_Label)) {
+        str l = Director.GetString(m_Label);
 
-	if( !m_Script->m_State.FindLabel( m_Label ) )
-	{
-		str l = Director.GetString( m_Label );
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
 
-		m_Script = NULL;
-		m_Label = STRING_EMPTY;
-
-		ScriptError( "^~^~^ Could not find label '%s' in '%s'", l.c_str(), script.c_str() );
-	}
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", l.c_str(), script.c_str());
+    }
 }
 
 void ScriptThreadLabel::Set(const_str label)
 {
-	return Set(Director.GetString(label));
+    return Set(Director.GetString(label));
 }
 
-void ScriptThreadLabel::SetScript( const ScriptVariable& label )
+void ScriptThreadLabel::SetScript(const ScriptVariable& label)
 {
-	if( label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING )
-	{
-		m_Script = Director.GetGameScript( label.stringValue() );
-		m_Label = STRING_EMPTY;
-	}
-	else if( label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1 )
-	{
-		ScriptVariable *script = label[ 1 ];
-		ScriptVariable *labelname = label[ 2 ];
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
+        m_Script = Director.GetGameScript(label.stringValue());
+        m_Label  = STRING_EMPTY;
+        break;
+    case VARIABLE_CONSTSTRING:
+        m_Script = Director.GetGameScript(label.constStringValue());
+        m_Label  = STRING_EMPTY;
+        break;
+    case VARIABLE_NONE:
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+        break;
+    case VARIABLE_CONSTARRAY:
+        if (label.arraysize() > 1) {
+            ScriptVariable *script    = label[1];
+            ScriptVariable *labelname = label[2];
 
-		m_Script = Director.GetGameScript( script->stringValue() );
-		m_Label = labelname->constStringValue();
+            if (script->GetType() == VARIABLE_CONSTSTRING) {
+                m_Script = Director.GetGameScript(script->constStringValue());
+            } else {
+                m_Script = Director.GetGameScript(script->stringValue());
+            }
 
-		if( !m_Script->m_State.FindLabel( m_Label ) )
-		{
-			m_Script = NULL;
-			m_Label = STRING_EMPTY;
+            m_Label = labelname->constStringValue();
+            break;
+        }
+    default:
+        ScriptError("ScriptThreadLabel::SetScript: bad label type '%s'", label.GetTypeName());
+        break;
+    }
 
-			ScriptError( "^~^~^ Could not find label '%s' in '%s'", labelname->stringValue().c_str(), script->stringValue().c_str() );
-		}
-	}
-	else
-	{
-		ScriptError( "ScriptThreadLabel::SetScript: bad label type '%s'", label.GetTypeName() );
-	}
+    if (m_Script && !m_Script->m_State.FindLabel(m_Label)) {
+        const str& scriptName = m_Script->Filename();
+        const str& labelName  = Director.GetString(m_Label);
+
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", scriptName.c_str(), labelName.c_str());
+    }
 }
 
-void ScriptThreadLabel::SetScript( const char *label )
+void ScriptThreadLabel::SetScript(const char *label)
 {
-	str script;
-	char buffer[1023];
-	char *p = buffer;
-	int i = 0;
-	bool foundLabel = false;
+    str   script;
+    char  buffer[1023];
+    char *p          = buffer;
+    int   i          = 0;
+    bool  foundLabel = false;
 
-	if (!label || !*label)
-	{
-		m_Script = NULL;
-		m_Label = STRING_EMPTY;
-		return;
-	}
+    if (!label || !*label) {
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+        return;
+    }
 
-	strcpy(buffer, label);
+    Q_strncpyz(buffer, label, sizeof(buffer));
 
-	script = buffer;
-	while (true)
-	{
-		if (p[0] == ':' && p[1] == ':')
-		{
-			*p = '\0';
+    script = buffer;
+    while (true) {
+        if (p[0] == ':' && p[1] == ':') {
+            *p = '\0';
 
-			m_Label = Director.AddString(&p[2]);
-			foundLabel = true;
+            m_Label    = Director.AddString(&p[2]);
+            foundLabel = true;
 
-			break;
-		}
+            break;
+        }
 
-		p++;
-		i++;
+        p++;
+        i++;
 
-		if (*p == '\0')
-		{
-			m_Label = STRING_EMPTY;
-			foundLabel = true;
-			break;
-		}
+        if (*p == '\0') {
+            m_Label    = STRING_EMPTY;
+            foundLabel = true;
+            break;
+        }
 
-		if (i >= 1023)
-		{
-			//we didn't find label so empty label
-			m_Label = STRING_EMPTY;
-			foundLabel = false;
-			break;
-		}
+        if (i >= 1023) {
+            //we didn't find label so empty label
+            m_Label    = STRING_EMPTY;
+            foundLabel = false;
+            break;
+        }
+    }
 
-	}
+    m_Script = Director.GetGameScript(script);
 
+    if (!m_Script->m_State.FindLabel(m_Label)) {
+        str l = Director.GetString(m_Label);
 
-	m_Script = Director.GetGameScript(script);
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
 
-	if (!m_Script->m_State.FindLabel(m_Label))
-	{
-		str l = Director.GetString(m_Label);
-
-		m_Script = NULL;
-		m_Label = STRING_EMPTY;
-
-		ScriptError("^~^~^ Could not find label '%s' in '%s'", l.c_str(), script.c_str());
-	}
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", l.c_str(), script.c_str());
+    }
 }
 
 void ScriptThreadLabel::SetScript(const_str label)
 {
-	SetScript(Director.GetString(label));
+    SetScript(Director.GetString(label));
 }
 
-void ScriptThreadLabel::SetThread( const ScriptVariable& label )
+void ScriptThreadLabel::SetThread(const ScriptVariable& label)
 {
-	ScriptThread *thread = NULL;
+    switch (label.GetType()) {
+    case VARIABLE_STRING:
+    case VARIABLE_CONSTSTRING:
+        m_Script = Director.CurrentScriptClass()->GetScript();
+        m_Label  = label.constStringValue();
+        break;
+    case VARIABLE_NONE:
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+        break;
+    case VARIABLE_CONSTARRAY:
+        if (label.arraysize() > 1) {
+            ScriptVariable *script    = label[1];
+            ScriptVariable *labelname = label[2];
 
-	if( label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING )
-	{
-		m_Script = Director.CurrentScriptClass()->GetScript();
-		m_Label = label.constStringValue();
-	}
-	else if( label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1 )
-	{
-		ScriptVariable *script = label[ 1 ];
-		ScriptVariable *labelname = label[ 2 ];
+            if (script->GetType() == VARIABLE_CONSTSTRING) {
+                m_Script = Director.GetGameScript(script->constStringValue());
+            } else {
+                m_Script = Director.GetGameScript(script->stringValue());
+            }
 
-		m_Script = Director.GetGameScript( script->stringValue() );
-		m_Label = labelname->constStringValue();
-
-		if( !m_Script->m_State.FindLabel( m_Label ) )
-		{
-			m_Script = NULL;
-			m_Label = STRING_EMPTY;
-
-			ScriptError( "^~^~^ Could not find label '%s' in '%s'", labelname->stringValue().c_str(), script->stringValue().c_str() );
-		}
-	}
-	else
-	{
-		ScriptError( "ScriptThreadLabel::SetThread bad label type '%s'", label.GetTypeName() );
-	}
-}
-
-bool ScriptThreadLabel::TrySet( const char *label )
-{
-	try
-	{
-		Set( label );
-	}
-	catch(const ScriptException& exc)
-	{
-		Com_Printf( "%s\n", exc.string.c_str() );
-		return false;
-	}
-
-	return true;
-}
-
-bool ScriptThreadLabel::TrySet( const_str label )
-{
-	try
-	{
-		Set( label );
-	}
-	catch(const ScriptException& exc)
-	{
-		Com_Printf( "%s\n", exc.string.c_str() );
-		return false;
-	}
-
-	return true;
-}
-
-bool ScriptThreadLabel::TrySetScript( const char *label )
-{
-	try
-	{
-		SetScript( label );
-	}
-	catch(const ScriptException &exc)
-	{
-		Com_Printf( "%s\n", exc.string.c_str() );
-		return false;
-	}
-
-	return true;
-}
-
-bool ScriptThreadLabel::TrySetScript( const_str label )
-{
-    try
-    {
-        SetScript(label);
+            m_Label = labelname->constStringValue();
+            break;
+        }
+    default:
+        ScriptError("ScriptThreadLabel::SetThread: bad label type '%s'", label.GetTypeName());
+        break;
     }
-    catch (const ScriptException& exc)
-    {
+
+    if (m_Script && !m_Script->m_State.FindLabel(m_Label)) {
+        const str& scriptName = m_Script->Filename();
+        const str& labelName  = Director.GetString(m_Label);
+
+        m_Script = NULL;
+        m_Label  = STRING_EMPTY;
+
+        ScriptError("^~^~^ Could not find label '%s' in '%s'", scriptName.c_str(), labelName.c_str());
+    }
+}
+
+bool ScriptThreadLabel::TrySet(const char *label)
+{
+    try {
+        Set(label);
+    } catch (const ScriptException& exc) {
         Com_Printf("%s\n", exc.string.c_str());
         return false;
     }
@@ -1204,40 +1190,69 @@ bool ScriptThreadLabel::TrySetScript( const_str label )
     return true;
 }
 
-void ScriptThreadLabel::GetScriptValue(ScriptVariable *var)
+bool ScriptThreadLabel::TrySet(const_str label)
 {
-	//FIXME: macro: 2 ?
-	ScriptVariable var_array[2];
+    try {
+        Set(label);
+    } catch (const ScriptException& exc) {
+        Com_Printf("%s\n", exc.string.c_str());
+        return false;
+    }
 
-	if (m_Script)
-	{
-		var_array[0].setConstStringValue(m_Script->ConstFilename());
-		var_array[1].setConstStringValue(m_Label);
-		var->setConstArrayValue(var_array, 2);
-		for (int i = 0; i < 2; i++)
-		{
-			var_array[i].Clear();
-		}
-	}
-	else
-	{
-		var->Clear();
-	}
+    return true;
 }
 
-bool ScriptThreadLabel::IsSet( void )
+bool ScriptThreadLabel::TrySetScript(const char *label)
 {
-	return m_Script != NULL;
+    try {
+        SetScript(label);
+    } catch (const ScriptException& exc) {
+        Com_Printf("%s\n", exc.string.c_str());
+        return false;
+    }
+
+    return true;
 }
 
-bool ScriptThreadLabel::IsFile(const_str filename)
+bool ScriptThreadLabel::TrySetScript(const_str label)
 {
-	return m_Script && m_Script->ConstFilename() == filename && m_Label == STRING_EMPTY;
+    try {
+        SetScript(label);
+    } catch (const ScriptException& exc) {
+        Com_Printf("%s\n", exc.string.c_str());
+        return false;
+    }
+
+    return true;
 }
 
-void ScriptThreadLabel::Archive( Archiver& arc )
+void ScriptThreadLabel::GetScriptValue(ScriptVariable *var) const
 {
-	GameScript::Archive(arc, m_Script);
+    if (!m_Script) {
+        var->Clear();
+        return;
+    }
 
-	Director.ArchiveString( arc, m_Label );
+    ScriptVariable var_array[2];
+
+    var_array[0].setConstStringValue(m_Script->ConstFilename());
+    var_array[1].setConstStringValue(m_Label);
+    var->setConstArrayValue(var_array, 2);
+}
+
+bool ScriptThreadLabel::IsSet(void) const
+{
+    return m_Script != NULL;
+}
+
+bool ScriptThreadLabel::IsFile(const_str filename) const
+{
+    return m_Script && m_Script->ConstFilename() == filename && m_Label == STRING_EMPTY;
+}
+
+void ScriptThreadLabel::Archive(Archiver& arc)
+{
+    GameScript::Archive(arc, m_Script);
+
+    Director.ArchiveString(arc, m_Label);
 }
diff --git a/code/fgame/gamescript.h b/code/fgame/gamescript.h
index 527acfea..80af333b 100644
--- a/code/fgame/gamescript.h
+++ b/code/fgame/gamescript.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gamescript.h: Subclass of script that preprocesses labels
 
-#ifndef __GAMESCRIPT_H__
-#define __GAMESCRIPT_H__
+#pragma once
 
 #include "class.h"
 #include "script.h"
@@ -35,166 +34,172 @@ class ScriptVariable;
 class GameScript;
 
 typedef struct {
-	byte			*codepos;		// code position pointer
-	const_str		key;			// label name
-	bool			isprivate;		// new script engine implementation
+    byte     *codepos;   // code position pointer
+    const_str key;       // label name
+    bool      isprivate; // new script engine implementation
 } script_label_t;
 
-typedef struct {
-	unsigned int		sourcePos;
-	int					column;
-	int					line;
-} sourceinfo_t;
+struct sourceinfo_t {
+    unsigned int sourcePos;
+    unsigned int startLinePos;
+    int          column;
+    int          line;
 
-class AbstractScript {
+    sourceinfo_t()
+        : sourcePos(0)
+        , column(0)
+        , line(0)
+    {}
+};
+
+class AbstractScript
+{
 public:
-	// File variables
-	const_str		m_Filename;
-	char			*m_SourceBuffer;
-	size_t			m_SourceLength;
+    // File variables
+    const_str m_Filename;
+    char     *m_SourceBuffer;
+    size_t    m_SourceLength;
 
-	// Developper variable
-	con_set< uchar *, sourceinfo_t > *m_ProgToSource;
+    // Developper variable
+    con_set<const uchar *, sourceinfo_t> *m_ProgToSource;
+
+    sourceinfo_t cachedInfo[16];
+    size_t       cachedInfoIndex;
 
 public:
+    AbstractScript();
 
-	AbstractScript();
-
-	str&					Filename( void );
-	const_str				ConstFilename( void );
-	bool					GetSourceAt( size_t sourcePos, str *sourceLine, int &column, int &line );
-	void					PrintSourcePos( sourceinfo_t *sourcePos, bool dev );
-	void					PrintSourcePos( size_t sourcePos, bool dev );
-	void					PrintSourcePos( unsigned char *m_pCodePos, bool dev );
-	void					PrintSourcePos( str sourceLine, int column, int line, bool dev );
+    str&      Filename(void);
+    const_str ConstFilename(void);
+    bool      GetSourceAt(size_t sourcePos, str *sourceLine, int& column, int& line);
+    bool      GetSourceAt(const unsigned char *sourcePos, str *sourceLine, int& column, int& line);
+    void      PrintSourcePos(sourceinfo_t *sourcePos, bool dev);
+    void      PrintSourcePos(size_t sourcePos, bool dev);
+    void      PrintSourcePos(unsigned char *m_pCodePos, bool dev);
+    void      PrintSourcePos(str sourceLine, int column, int line, bool dev);
 };
 
 class StateScript : public Class
 {
-	friend class GameScript;
+    friend class GameScript;
 
 private:
-	// Label list
-	con_set< const_str, script_label_t > label_list;
+    // Label list
+    con_set<const_str, script_label_t> label_list;
 
 public:
-	// Parent gamescript
-	GameScript *m_Parent;
+    // Parent gamescript
+    GameScript *m_Parent;
 
 public:
-	StateScript();
+    StateScript();
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 
-	bool				AddLabel( str label, unsigned char *pos, bool private_section = false );
-	bool				AddLabel( const_str label, unsigned char *pos, bool private_section = false );
-	unsigned char		*FindLabel( str label );
-	unsigned char		*FindLabel( const_str label );
-	const_str			NearestLabel( unsigned char *pos );
+    bool           AddLabel(str label, unsigned char *pos, bool private_section = false);
+    bool           AddLabel(const_str label, unsigned char *pos, bool private_section = false);
+    unsigned char *FindLabel(str label);
+    unsigned char *FindLabel(const_str label);
+    const_str      NearestLabel(unsigned char *pos);
 };
 
-class CatchBlock {
-public:
-	// program variable
-	StateScript m_StateScript;
-
-	// code position variables
-	unsigned char *m_TryStartCodePos;
-	unsigned char *m_TryEndCodePos;
-};
-
-class GameScript : public AbstractScript {
-protected:
-	// try/throw variable
-	Container<CatchBlock *> m_CatchBlocks;
-
-public:
-		// program variables
-		StateScript		m_State;
-		unsigned char	*m_ProgBuffer;
-		size_t			m_ProgLength;
-
-		// compile variables
-		bool			successCompile;
-		bool			m_bPrecompiled;
-
-		// stack variables
-		unsigned int	requiredStackSize;
-
-public:
-
-	GameScript();
-	GameScript( const char *filename );
-	~GameScript();
-
-	void Archive( Archiver& arc );
-	static void				Archive( Archiver& arc, GameScript *&scr );
-	void					ArchiveCodePos( Archiver& arc, unsigned char **codePos );
-
-	void					Close( void );
-	void					Load( const void *sourceBuffer, size_t sourceLength );
-
-
-	bool					GetCodePos( unsigned char *codePos, str& filename, int& pos );
-	bool					SetCodePos( unsigned char *&codePos, str& filename, int pos );
-
-	unsigned int			GetRequiredStackSize( void );
-
-	qboolean				labelExists( const char *name );
-
-	StateScript				*CreateCatchStateScript( unsigned char *try_begin_code_pos, unsigned char *try_end_code_pos );
-	StateScript				*CreateSwitchStateScript( void );
-
-	StateScript				*GetCatchStateScript( unsigned char *in, unsigned char *&out );
-
-	bool					ScriptCheck( void );
-};
-
-class ScriptThreadLabel {
-private:
-	GameScript		*m_Script;
-	const_str		m_Label;
-
-public:
-	ScriptThreadLabel();
-
-	ScriptThread		*Create( Listener *listener );
-	void				Execute( Listener *listener = NULL );
-	void				Execute( Listener *listener, Event &ev );
-	void				Execute( Listener *listener, Event *ev );
-	void				Execute(const SafePtr<Listener>& listener, const SafePtr<Listener>& param);
-
-	void				Set( const char *label );
-	void				Set( const_str label );
-	void				SetScript( const ScriptVariable& label );
-	void				SetScript( const char *label );
-	void				SetScript( const_str label );
-	void				SetThread( const ScriptVariable& label );
-
-	bool				TrySet( const_str label );
-	bool				TrySet( const char *label );
-	bool				TrySetScript( const_str label );
-	bool				TrySetScript( const char *label );
-
-	bool				IsSet(void);
-	bool				IsFile(const_str filename);
-
-	void				GetScriptValue(ScriptVariable *var);
-
-
-	void				Archive( Archiver& arc );
-
-	friend	bool		operator==(const ScriptThreadLabel& a, const ScriptThreadLabel& b);
-};
-
-
-inline bool operator==
-(
-	const ScriptThreadLabel& a,
-	const ScriptThreadLabel& b
-	)
+class CatchBlock
 {
-	return a.m_Label == b.m_Label && a.m_Script == b.m_Script;
-}
+public:
+    // program variable
+    StateScript m_StateScript;
 
-#endif
+    // code position variables
+    unsigned char *m_TryStartCodePos;
+    unsigned char *m_TryEndCodePos;
+};
+
+class GameScript : public AbstractScript
+{
+protected:
+    // try/throw variable
+    Container<CatchBlock *>  m_CatchBlocks;
+    Container<StateScript *> m_StateScripts;
+
+public:
+    // program variables
+    StateScript    m_State;
+    unsigned char *m_ProgBuffer;
+    size_t         m_ProgLength;
+
+    // compile variables
+    bool successCompile;
+    bool m_bPrecompiled;
+
+    // stack variables
+    unsigned int requiredStackSize;
+
+public:
+    GameScript();
+    GameScript(const char *filename);
+    ~GameScript();
+
+    void        Archive(Archiver& arc);
+    static void Archive(Archiver& arc, GameScript *& scr);
+    void        ArchiveCodePos(Archiver& arc, unsigned char **codePos);
+
+    void Close(void);
+    void Load(const void *sourceBuffer, size_t sourceLength);
+
+    bool GetCodePos(unsigned char *codePos, str& filename, int& pos);
+    bool SetCodePos(unsigned char *& codePos, str& filename, int pos);
+
+    unsigned int GetRequiredStackSize(void);
+
+    qboolean labelExists(const char *name);
+
+    StateScript *CreateCatchStateScript(unsigned char *try_begin_code_pos, unsigned char *try_end_code_pos);
+    StateScript *CreateSwitchStateScript(void);
+
+    StateScript *GetCatchStateScript(unsigned char *in, unsigned char *& out);
+
+    bool ScriptCheck(void);
+};
+
+class ScriptThreadLabel
+{
+private:
+    GameScript *m_Script;
+    const_str   m_Label;
+
+public:
+    ScriptThreadLabel();
+
+    ScriptThread *Create(Listener *listener) const;
+    void          Execute(Listener *listener = NULL) const;
+    void          Execute(Listener *listener, Event& ev) const;
+    void          Execute(Listener *listener, Event *ev) const;
+    void          Execute(Listener *pSelf, const SafePtr<Listener>& listener, const SafePtr<Listener>& param) const;
+
+    void Clear();
+    void Set(const char *label);
+    void Set(const_str label);
+    void SetScript(const ScriptVariable& label);
+    void SetScript(const char *label);
+    void SetScript(const_str label);
+    void SetThread(const ScriptVariable& label);
+
+    bool TrySet(const_str label);
+    bool TrySet(const char *label);
+    bool TrySetScript(const_str label);
+    bool TrySetScript(const char *label);
+
+    bool IsSet(void) const;
+    bool IsFile(const_str filename) const;
+
+    void GetScriptValue(ScriptVariable *var) const;
+
+    void Archive(Archiver& arc);
+
+    friend bool operator==(const ScriptThreadLabel& a, const ScriptThreadLabel& b);
+};
+
+inline bool operator==(const ScriptThreadLabel& a, const ScriptThreadLabel& b)
+{
+    return a.m_Label == b.m_Label && a.m_Script == b.m_Script;
+}
diff --git a/code/fgame/gibs.cpp b/code/fgame/gibs.cpp
index e53b3546..6ee01738 100644
--- a/code/fgame/gibs.cpp
+++ b/code/fgame/gibs.cpp
@@ -147,7 +147,7 @@ void Gib::Splat
 	)
 
    {
-   if ( g_gametype->integer )
+   if ( g_gametype->integer != GT_SINGLE_PLAYER )
       return;
 
    if ( sprayed > 3 )
diff --git a/code/fgame/gibs.h b/code/fgame/gibs.h
index 382d201d..364ee54e 100644
--- a/code/fgame/gibs.h
+++ b/code/fgame/gibs.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gibs.h: Gibs - nuff said
 
-#ifndef __GIBS_H__
-#define __GIBS_H__
+#pragma once
 
 #include "g_local.h"
 #include "mover.h"
@@ -88,5 +87,3 @@ void CreateGibs
    );
 
 extern Event EV_ThrowGib;
-
-#endif // gibs.h
diff --git a/code/fgame/glb_local.h b/code/fgame/glb_local.h
index 673a55f3..588f975d 100644
--- a/code/fgame/glb_local.h
+++ b/code/fgame/glb_local.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __GLB_LOCAL_H__
-#define __GLB_LOCAL_H__
+#pragma once
 
 #if defined( GAME_DLL )
 
@@ -79,5 +78,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #endif
-
-#endif /* glb_local.h */
diff --git a/code/fgame/gravpath.h b/code/fgame/gravpath.h
index efa56b6f..d3a6380e 100644
--- a/code/fgame/gravpath.h
+++ b/code/fgame/gravpath.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // gravpath.h: Gravity path - Used for underwater currents and wells.
 
-#ifndef __GRAVPATH_H__
-#define __GRAVPATH_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -202,5 +201,3 @@ inline void GravPathManager::Archive
    }
 
 extern GravPathManager gravPathManager;
-
-#endif /* gravpath.h */
diff --git a/code/fgame/grenadehint.h b/code/fgame/grenadehint.h
index 48bc9803..0661f769 100644
--- a/code/fgame/grenadehint.h
+++ b/code/fgame/grenadehint.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // grenadehint.h: Grenade hint for actors.
 
-#ifndef __GRENADEHINT_H__
-#define __GRENADEHINT_H__
+#pragma once
 
 #include "g_local.h"
 #include "archive.h"
@@ -53,5 +52,3 @@ inline void GrenadeHint::Archive
 
 	arc.ArchiveObjectPointer( ( Class ** )&m_pNext );
 }
-
-#endif
diff --git a/code/fgame/health.cpp b/code/fgame/health.cpp
index 9a7b33ab..a7d19f33 100644
--- a/code/fgame/health.cpp
+++ b/code/fgame/health.cpp
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// health.cpp: Health powerup 
+// health.cpp: Health powerup
 //
 
 #include "g_local.h"
@@ -30,54 +30,158 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "health.h"
 #include "weaputils.h"
 #include "player.h"
+#include "g_phys.h"
 
-CLASS_DECLARATION( Item, Health, "health_020" )
-{
-	{ &EV_Item_Pickup,				&Health::PickupHealth },
-	{ NULL, NULL }
+Event EV_Health_PostSpawn("health_postspawn", EV_DEFAULT, NULL, NULL, "Health Post Spawn");
+
+CLASS_DECLARATION(Item, Health, "health_020") {
+    {&EV_Item_Pickup,      &Health::PickupHealth  },
+    {&EV_Health_PostSpawn, &Health::EventPostSpawn},
+    {NULL,                 NULL                   }
 };
 
+SafePtr<Health> Health::mHealthQueue[MAX_HEALTH_QUEUE];
+
 Health::Health()
 {
-	if( DM_FLAG( DF_NO_HEALTH ) )
-	{
-		PostEvent( EV_Remove, EV_REMOVE );
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	setAmount( 20 );
+    if (DM_FLAG(DF_NO_HEALTH)) {
+        PostEvent(EV_Remove, EV_REMOVE);
+        return;
+    }
+
+    setAmount(20);
+
+    // Added in 2.0
+    //  Set the targetname to health by default
+    SetTargetName("health");
+
+    PostEvent(EV_Health_PostSpawn, EV_POSTSPAWN);
 }
 
-void Health::PickupHealth
-	(
-	Event *ev
-	)
+void Health::PickupHealth(Event *ev)
 {
-	Sentient *sen;
-	Entity *other;
+    Player *player;
+    Entity *other;
 
-	other = ev->GetEntity( 1 );
-	if( !other || !other->IsSubclassOfSentient() )
-	{
-		return;
-	}
+    other = ev->GetEntity(1);
+    if (!other || !other->IsSubclassOfPlayer()) {
+        return;
+    }
 
-	sen = ( Sentient * )other;
+    player = (Player *)other;
 
-	if( sen->health >= sen->max_health )
-		return;
+    if (g_healrate->value && other->IsSubclassOfPlayer()) {
+        // Added in OPM
+        //  OG doesn't check if the future health will be full
+        //  which is problematic as other can pickup the item
+        //  will healing
+        if (player->m_fHealRate + player->health >= player->max_health) {
+            // will be healing to 100%
+            return;
+        }
+    } else {
+        if (player->health >= player->max_health) {
+            return;
+        }
+    }
 
-	if( !ItemPickup( other, qfalse ) )
-	{
-		return;
-	}
+    if (!ItemPickup(other, qfalse)) {
+        return;
+    }
 
-	sen->health += amount / 100.0 * sen->max_health;
+    if (g_healrate->value && other->IsSubclassOfPlayer()) {
+        if (player->m_fHealRate + player->health >= player->max_health) {
+            // will be healing to 100%
+            return;
+        }
 
-	if( sen->health > sen->max_health )
-	{
-		sen->health = sen->max_health;
-	}
+        player->m_fHealRate += amount / 100.0 * player->max_health;
+        if (player->m_fHealRate + player->health > player->max_health) {
+            // make sure to not overflow
+            player->m_fHealRate = player->max_health - player->health + 0.1f;
+        }
+    } else {
+        player->health += amount / 100.0 * player->max_health;
 
-	gi.SendServerCommand( sen->edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s \"", gi.LV_ConvertString( va( "Recovered %d", amount ) ) );
+        if (player->health > player->max_health) {
+            player->health = player->max_health;
+        }
+    }
+
+    gi.SendServerCommand(
+        player->edict - g_entities,
+        "print \"" HUD_MESSAGE_YELLOW "%s\n\"",
+        gi.LV_ConvertString(va("Recovered %d Health", amount))
+    );
+}
+
+void Health::EventPostSpawn(Event *ev)
+{
+    setMoveType(MOVETYPE_TOSS);
+
+    if (edict->tiki) {
+        vec3_t mins, maxs;
+
+        gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, mins, maxs);
+
+        setSize(mins, maxs);
+        link();
+    }
+
+    droptofloor(256);
+}
+
+void Health::CompressHealthQueue()
+{
+    int i, j;
+
+    for (i = 0; i < MAX_HEALTH_QUEUE; i++) {
+        if (!mHealthQueue[i]) {
+            for (j = i + 1; j < MAX_HEALTH_QUEUE; j++) {
+                if (mHealthQueue[j]) {
+                    mHealthQueue[i] = mHealthQueue[j];
+                    break;
+                }
+            }
+        }
+    }
+}
+
+void Health::AddToHealthQueue()
+{
+    CompressHealthQueue();
+
+    if (mHealthQueue[MAX_HEALTH_QUEUE - 1]) {
+        mHealthQueue[MAX_HEALTH_QUEUE - 1]->Delete();
+        mHealthQueue[0] = NULL;
+        CompressHealthQueue();
+    }
+
+    mHealthQueue[MAX_HEALTH_QUEUE - 1] = this;
+
+    CompressHealthQueue();
+}
+
+void Health::ResetHealthQueue() {}
+
+void Health::ArchiveStatic(Archiver& arc)
+{
+    int i;
+
+    for (i = 0; i < MAX_HEALTH_QUEUE; i++) {
+        arc.ArchiveSafePointer(&mHealthQueue[i]);
+    }
+}
+
+void Health::DoRemoveProcess()
+{
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        DoRemoveProcess();
+    } else {
+        AddToHealthQueue();
+    }
 }
diff --git a/code/fgame/health.h b/code/fgame/health.h
index cb0011f0..a9064b62 100644
--- a/code/fgame/health.h
+++ b/code/fgame/health.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,23 +21,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // health.h: Health powerup
-// 
+//
 
-#ifndef __HEALTH_H__
-#define __HEALTH_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
 #include "sentient.h"
 #include "item.h"
 
+#define MAX_HEALTH_QUEUE 5
+
 class Health : public Item
 {
 public:
-	CLASS_PROTOTYPE( Health );
+    CLASS_PROTOTYPE(Health);
 
-	Health();
-	virtual void PickupHealth( Event *ev );
+    Health();
+    virtual void PickupHealth(Event *ev);
+
+    void        EventPostSpawn(Event *ev);
+    static void CompressHealthQueue();
+    void        AddToHealthQueue();
+    static void ResetHealthQueue();
+
+    static void ArchiveStatic(Archiver& arc);
+    void        DoRemoveProcess();
+
+private:
+    static SafePtr<Health> mHealthQueue[MAX_HEALTH_QUEUE];
 };
-
-#endif /* health.h */
diff --git a/code/fgame/hud.cpp b/code/fgame/hud.cpp
index 1417d75d..46a93c37 100644
--- a/code/fgame/hud.cpp
+++ b/code/fgame/hud.cpp
@@ -779,7 +779,7 @@ void Hud::TimerThink()
 #else
 	if( !*shader ) {
 #endif
-		sprintf( buffer, string, minutes, seconds );
+		Com_sprintf( buffer, sizeof( buffer ), string, minutes, seconds );
 
 		SetText( buffer );
 	} else {
@@ -1001,7 +1001,6 @@ void Hud::MoveOverTime( float time )
 
 void Hud::Refresh( int clientNumber )
 {
-#ifdef GAME_DLL
 	SetBroadcast( clientNumber );
 
 	gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_ALIGN ));
@@ -1093,13 +1092,13 @@ void Hud::Refresh( int clientNumber )
 		gi.MSG_WriteBits( virtualSize, 1 );
 	gi.MSG_EndCGM();
 
+#ifdef OPM_FEATURES
 	if( sv_specialgame->integer )
 	{
 		if( isDimensional )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_3D ));
 				WriteNumber();
 				gi.MSG_WriteCoord( org[ 0 ] );
@@ -1111,19 +1110,16 @@ void Hud::Refresh( int clientNumber )
 				gi.MSG_WriteBits( !!always_show, 1 );
 				gi.MSG_WriteBits( !!depth, 1 );
 			gi.MSG_EndCGM();
-			*/
 		}
 
 		if( fade_alpha )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_FADE ));
 				WriteNumber();
 				gi.MSG_WriteFloat( fade_alpha_current );
 			gi.MSG_EndCGM();
-			*/
 
 			SetBroadcast();
 
@@ -1137,7 +1133,6 @@ void Hud::Refresh( int clientNumber )
 		{
 			SetBroadcast();
 
-			/*
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_MOVE ));
 				WriteNumber();
 				gi.MSG_WriteFloat( fade_move_current );
@@ -1150,12 +1145,10 @@ void Hud::Refresh( int clientNumber )
 				gi.MSG_WriteShort( ( short )fade_move_x_target );
 				gi.MSG_WriteShort( ( short )fade_move_y_target );
 			gi.MSG_EndCGM();
-			*/
 		}
 
 		if( fade_timer_flags & TIMER_ACTIVE )
 		{
-			/*
 			SetBroadcast();
 
 			gi.MSG_StartCGM( BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_TIMER ));
@@ -1170,7 +1163,6 @@ void Hud::Refresh( int clientNumber )
 				}
 
 			gi.MSG_EndCGM();
-			*/
 		}
 	}
 #endif
@@ -1232,11 +1224,15 @@ void Hud::SetBroadcast( int clientNumber )
 
 void Hud::WriteNumber()
 {
+#ifdef OPM_FEATURES
 	if(sv_specialgame->integer ) {
 		gi.MSG_WriteShort( number );
 	} else {
 		gi.MSG_WriteByte( number );
 	}
+#else
+	gi.MSG_WriteByte(number);
+#endif
 }
 
 #endif
diff --git a/code/fgame/hud.h b/code/fgame/hud.h
index 155915cc..61b53a54 100644
--- a/code/fgame/hud.h
+++ b/code/fgame/hud.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // hud.h: New HUD handler for MoHAA
 //
 
-#ifndef __HUD_H__
-#define __HUD_H__
+#pragma once
 
 #include "listener.h"
 #include "container.h"
@@ -208,5 +207,3 @@ public:
 };
 
 extern Container< Hud * > hudElements;
-
-#endif /* __HUD_H__  */
diff --git a/code/fgame/huddraw.cpp b/code/fgame/huddraw.cpp
index 89bb209f..79784439 100644
--- a/code/fgame/huddraw.cpp
+++ b/code/fgame/huddraw.cpp
@@ -28,11 +28,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void HudWriteNumber( int num )
 {
+#ifdef OPM_FEATURES
 	if(sv_specialgame->integer ) {
 		gi.MSG_WriteShort( num );
 	} else {
 		gi.MSG_WriteByte( num );
 	}
+#else
+	gi.MSG_WriteByte(num);
+#endif
 }
 
 void HudDrawShader( int info, const char *name )
@@ -41,7 +45,11 @@ void HudDrawShader( int info, const char *name )
 	gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_SHADER));
 	HudWriteNumber( info );		// c = info
 	gi.MSG_WriteString(name);		// s = name (shader_name)
-	gi.MSG_EndCGM();
+    gi.MSG_EndCGM();
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawShader(info, name);
+    }
 }
 
 void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
@@ -61,6 +69,10 @@ void HudDrawAlign( int info, int horizontalAlign, int verticalAlign )
 	
 	gi.MSG_EndCGM();
 	
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		gi.HudDrawAlign(info, horizontalAlign, verticalAlign);
+	}
+	
 }
 
 void HudDrawRect(int info, int x, int y, int width, int height)
@@ -73,7 +85,10 @@ void HudDrawRect(int info, int x, int y, int width, int height)
 	gi.MSG_WriteShort(width);		// c = probably "width"
 	gi.MSG_WriteShort(height);		// c = probably "height"
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawRect(info, x, y, width, height);
+    }
 }
 
 void HudDrawVirtualSize(int info, int virtualScreen)
@@ -81,20 +96,7 @@ void HudDrawVirtualSize(int info, int virtualScreen)
 	gi.SetBroadcastAll();
 	gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_HUDDRAW_VIRTUALSIZE));
 	HudWriteNumber( info );					// c = info
-	
-	/*__asm
-	{
-		pushad
-		pushfd
-		mov eax, virtualScreen
-		NEG eax
-		SBB eax, eax
-		NEG eax
-		mov virtualScreen, eax
-		popfd
-		popad
-	}*/
-	
+
 	gi.MSG_WriteBits(!!virtualScreen, 1);	// value = ?	bits = 1
 											// value = esi
 											// esi = virtualScreen
@@ -104,7 +106,10 @@ void HudDrawVirtualSize(int info, int virtualScreen)
 											// call
 	
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawVirtualSize(info, virtualScreen);
+    }
 }
 
 void HudDrawColor(int info, float *color)
@@ -121,7 +126,11 @@ void HudDrawColor(int info, float *color)
 	gi.MSG_WriteByte(temp[0]);		// c = color[2]		
 	gi.MSG_WriteByte(temp[1]);		// c = color[1]		 - Values can be messed up. To be tested.
 	gi.MSG_WriteByte(temp[2]);		// c = color[3]		/
-	gi.MSG_EndCGM();
+    gi.MSG_EndCGM();
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawColor(info, color);
+    }
 
 	// Note: Each float value is multiplied by 255.0 and converted to long using ftol function, thats why it's using WriteByte
 }
@@ -137,6 +146,10 @@ void HudDrawAlpha(int info, float alpha)
 	gi.MSG_WriteByte(temp);		// c = alpha
 	gi.MSG_EndCGM();
 	
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		gi.HudDrawAlpha(info, alpha);
+	}
+
 	// Note: alpha is multiplied by 255.0 and converted to long using ftol function
 	
 }
@@ -149,6 +162,9 @@ void HudDrawString(int info, const char *string)
 	gi.MSG_WriteString(string);	// s = string (to show)
 	gi.MSG_EndCGM();
 
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawString(info, string);
+    }
 }
 
 void HudDrawFont(int info, const char *fontName)
@@ -158,7 +174,10 @@ void HudDrawFont(int info, const char *fontName)
 	HudWriteNumber( info );			// c = info
 	gi.MSG_WriteString(fontName);	// s = fontName (to use)
 	gi.MSG_EndCGM();
-	
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        gi.HudDrawFont(info, fontName);
+    }
 }
 
 void HudDraw3d( int index, vec3_t vector, int ent_num, qboolean bAlwaysShow, qboolean depth )
diff --git a/code/fgame/huddraw.h b/code/fgame/huddraw.h
index d924394d..3d15bb82 100644
--- a/code/fgame/huddraw.h
+++ b/code/fgame/huddraw.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // huddraw.cpp :	This is a HudDraw Functions Code section with huddraw functions reversed for 
 //					altering clients HUD
 
-#ifndef __HUDDRAW_H__
-#define __HUDDRAW_H__
+#pragma once
 
 #include "g_local.h"
 
@@ -49,5 +48,3 @@ void iHudDrawAlpha( int cl_num, int info, float alpha );
 void iHudDrawString( int cl_num, int info, const char *string );
 void iHudDrawFont( int cl_num, int info, const char *fontName );
 void iHudDrawTimer( int cl_num, int index, float duration, float fade_out_time );
-
-#endif // __HUDDRAW_H__
diff --git a/code/fgame/inventoryitem.cpp b/code/fgame/inventoryitem.cpp
index 08a47cfd..6bec826f 100644
--- a/code/fgame/inventoryitem.cpp
+++ b/code/fgame/inventoryitem.cpp
@@ -53,7 +53,7 @@ CLASS_DECLARATION( Weapon, InventoryItem, NULL )
 
 InventoryItem::InventoryItem()
 {
-	entflags |= EF_INVENTORYITEM;
+	entflags |= ECF_INVENTORYITEM;
 
 	if ( LoadingSavegame )
 	{
@@ -65,7 +65,7 @@ InventoryItem::InventoryItem()
 
 InventoryItem::~InventoryItem()
 {
-	entflags &= ~EF_INVENTORYITEM;
+	entflags &= ~ECF_INVENTORYITEM;
 }
 
 void InventoryItem::ActivateItem
@@ -77,7 +77,7 @@ void InventoryItem::ActivateItem
 	{
 		Vector pos, forward, right, up, vBarrel;
 
-		GetMuzzlePosition( &pos, &forward, &right, &up, &vBarrel );
+		GetMuzzlePosition( pos, vBarrel, forward, right, up );
 		ClickItemAttack(
 			pos,
 			forward,
diff --git a/code/fgame/inventoryitem.h b/code/fgame/inventoryitem.h
index f9cbd738..b14129ce 100644
--- a/code/fgame/inventoryitem.h
+++ b/code/fgame/inventoryitem.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // inventoryitem.h: Items that are visible in the player's inventory
 
 
-#ifndef __INVITEM_H__
-#define __INVITEM_H__
+#pragma once
 
 #include "weapon.h"
 
@@ -52,5 +51,3 @@ class AntiSBJuice : public InventoryItem
 		void			UseEvent( Event *ev );
    };
 
-
-#endif /* inventoryitem.h */
diff --git a/code/fgame/ipfilter.cpp b/code/fgame/ipfilter.cpp
index 1e73af6e..c823702e 100644
--- a/code/fgame/ipfilter.cpp
+++ b/code/fgame/ipfilter.cpp
@@ -298,7 +298,7 @@ void SVCmd_WriteIP_f
 	byte	 b[ 4 ];
 	int	 i;
 
-	sprintf( name, "%s/listip.cfg", GAMEVERSION );
+	Com_sprintf( name, sizeof( name ), "%s/listip.cfg", GAMEVERSION );
    gi.SendServerCommand( 0, "print \"Writing %s.\n\"", name );
 
 	f = fopen( name, "wb" );
diff --git a/code/fgame/ipfilter.h b/code/fgame/ipfilter.h
index a09c9216..28fb7a69 100644
--- a/code/fgame/ipfilter.h
+++ b/code/fgame/ipfilter.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,11 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // ipfilter.h: DESCRIPTION:
 // 
 
-#ifndef __IPFILTER_H__
-#define __IPFILTER_H__
+#pragma once
 
 #include "g_local.h"
 
 qboolean SV_FilterPacket( const char *from );
-
-#endif /* !__IPFILTER_H__ */
diff --git a/code/fgame/item.cpp b/code/fgame/item.cpp
index 09fb1b5e..5c4a3bfc 100644
--- a/code/fgame/item.cpp
+++ b/code/fgame/item.cpp
@@ -123,7 +123,7 @@ const char *GetItemName(const char *prefix, qboolean *mohprefix)
         *mohprefix = false;
     }
 
-    return NULL;
+    return "Unarmed";
 }
 
 const char *GetItemPrefix(const char *name, qboolean *mohprefix)
@@ -142,7 +142,7 @@ const char *GetItemPrefix(const char *name, qboolean *mohprefix)
         *mohprefix = false;
     }
 
-    return NULL;
+    return "unarmed";
 }
 
 Event EV_Item_Pickup
@@ -291,6 +291,7 @@ Event EV_Item_SetPickupSound
     EV_NORMAL
 );
 
+#ifdef OPM_FEATURES
 Event EV_Item_ViewModelPrefix
 (
     "viewmodelprefix",
@@ -310,6 +311,7 @@ Event EV_Item_UpdatePrefix
     "internal event - update the custom viewmodel prefix",
     EV_NORMAL
 );
+#endif
 
 CLASS_DECLARATION(Trigger, Item, NULL) {
     {&EV_Trigger_Effect,       &Item::ItemTouch            },
@@ -332,8 +334,10 @@ CLASS_DECLARATION(Trigger, Item, NULL) {
     {&EV_Item_SetDMAmount,     &Item::SetDMAmountEvent     },
     {&EV_Item_SetDMMaxAmount,  &Item::SetDMMaxAmount       },
     {&EV_Item_SetPickupSound,  &Item::SetPickupSound       },
+#ifdef OPM_FEATURES
     {&EV_Item_ViewModelPrefix, &Item::EventViewModelPrefix },
     {&EV_Item_UpdatePrefix,    &Item::updatePrefix         },
+#endif
     {NULL,                     NULL                        }
 };
 
@@ -341,7 +345,7 @@ Item::Item()
 {
     str fullname;
 
-    entflags |= EF_ITEM;
+    entflags |= ECF_ITEM;
 
     AddWaitTill(STRING_PICKUP);
 
@@ -403,7 +407,7 @@ Item::~Item()
         owner = NULL;
     }
 
-    entflags &= ~EF_ITEM;
+    entflags &= ~ECF_ITEM;
 }
 
 void Item::RemoveFromOwner(void)
@@ -414,15 +418,11 @@ void Item::RemoveFromOwner(void)
 
 void Item::Delete(void)
 {
-    if (g_iInThinks) {
-        if (owner) {
-            RemoveFromOwner();
-        }
-
-        PostEvent(EV_Remove, 0);
-    } else {
-        delete this;
+    if (g_iInThinks && owner) {
+        RemoveFromOwner();
     }
+
+    Animate::Delete();
 }
 
 void Item::SetNoRemove(Event *ev)
@@ -555,10 +555,12 @@ void Item::SetOwner(Sentient *ent)
     CancelEventsOfType(EV_Item_DropToFloor);
     CancelEventsOfType(EV_Remove);
 
+#ifdef OPM_FEATURES
     Event *ev = new Event(EV_Item_UpdatePrefix);
     ev->AddEntity(ent);
 
     PostEvent(ev, EV_POSTSPAWN);
+#endif
 }
 
 Sentient *Item::GetOwner(void)
@@ -619,14 +621,6 @@ Item *Item::ItemPickup(Entity *other, qboolean add_to_inventory)
         }
     }
 
-    if (!no_remove) {
-        hideModel();
-
-        if (!Respawnable()) {
-            PostEvent(EV_Remove, FRAMETIME);
-        }
-    }
-
     if (Respawnable()) {
         PostEvent(EV_Item_Respawn, RespawnTime());
     }
@@ -759,7 +753,7 @@ void Item::setName(const char *i)
 
     item_name  = i;
     item_index = gi.itemindex(i);
-    strcpy(edict->entname, i);
+    Q_strncpyz(edict->entname, i, sizeof(edict->entname));
 
     prefix = GetItemPrefix(item_name);
     if (prefix) {
@@ -814,7 +808,7 @@ void Item::SetMaxAmount(Event *ev)
 
 void Item::SetDMAmountEvent(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
     setAmount(ev->GetInteger(1));
@@ -822,7 +816,7 @@ void Item::SetDMAmountEvent(Event *ev)
 
 void Item::SetDMMaxAmount(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
     setAmount(ev->GetInteger(1));
@@ -905,6 +899,22 @@ void Item::Landed(Event *ev)
     setMoveType(MOVETYPE_NONE);
 }
 
+Listener *Item::GetScriptOwner()
+{
+    return owner;
+}
+
+void Item::SetScriptOwner(Listener *newOwner)
+{
+    if (!newOwner || !newOwner->isSubclassOf(Sentient)) {
+        owner = NULL;
+        return;
+    }
+
+    owner = static_cast<Sentient*>(newOwner);
+}
+
+#ifdef OPM_FEATURES
 void Item::EventViewModelPrefix(Event *ev)
 {
     int        i;
@@ -930,7 +940,7 @@ void Item::EventViewModelPrefix(Event *ev)
 
 void Item::updatePrefix(Event *ev)
 {
-    if (!level.specialgame) {
+    if (!sv_specialgame->integer) {
         return;
     }
 
@@ -938,8 +948,6 @@ void Item::updatePrefix(Event *ev)
         return;
     }
 
-    // FIXME: delete
-    /*
 	Entity *ent = ev->GetEntity( 1 );
 
 	gi.MSG_SetClient( ent->edict - g_entities );
@@ -948,8 +956,8 @@ void Item::updatePrefix(Event *ev)
 		gi.MSG_WriteString( item_name.c_str() );
 		gi.MSG_WriteString( m_sVMprefix.c_str() );
 	gi.MSG_EndCGM();
-	*/
 }
+#endif
 
 CLASS_DECLARATION(Item, DynItem, NULL) {
     {&EV_Kill,   &DynItem::UnlinkItem},
diff --git a/code/fgame/item.h b/code/fgame/item.h
index 647f69f6..69516ca5 100644
--- a/code/fgame/item.h
+++ b/code/fgame/item.h
@@ -121,11 +121,21 @@ public:
 
     void Archive(Archiver& arc) override;
 
+public:
+    //
+    // Added in OPM
+    //
+
+    Listener *GetScriptOwner() override;
+    void SetScriptOwner(Listener *newOwner) override;
+
+#ifdef OPM_FEATURES
     //
     // Custom openmohaa stuff
     //
     void EventViewModelPrefix(Event *ev);
     void updatePrefix(Event *ev);
+#endif
 };
 
 inline void Item::Archive(Archiver& arc)
diff --git a/code/fgame/level.cpp b/code/fgame/level.cpp
index 9eccba5b..05ee31ac 100644
--- a/code/fgame/level.cpp
+++ b/code/fgame/level.cpp
@@ -33,12 +33,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "dm_manager.h"
 #include "player.h"
 #include "Entities.h"
+#include "health.h"
 
 #include "scriptmaster.h"
 #include "scriptthread.h"
 #include "scriptvariable.h"
 #include "scriptexception.h"
 
+#include <cfloat>
+
 Level level;
 
 gclient_t *spawn_client = NULL;
@@ -96,7 +99,8 @@ Event EV_Level_GetAlarm
 
 Event EV_Level_SetAlarm
 (
-    "alarm", EV_DEFAULT,
+    "alarm",
+    EV_DEFAULT,
     "i",
     "alarm_status",
     "zero = global level alarm off,"
@@ -116,7 +120,7 @@ Event EV_Level_SetNoDropHealth
 
 Event EV_Level_SetNoDropWeapons
 (
-    "nodropweapon",
+    "nodropweapons",
     EV_DEFAULT,
     "i",
     "alarm_status",
@@ -194,8 +198,7 @@ Event EV_Level_SetDMRespawning
     EV_SETTER
 );
 
-Event EV_Level_SetDMRespawning2
-(
+Event EV_Level_SetDMRespawning2(
     "dmrespawning",
     EV_DEFAULT,
     "i",
@@ -204,8 +207,7 @@ Event EV_Level_SetDMRespawning2
     "to 0 to disable respawns within a round"
 );
 
-Event EV_Level_GetDMRoundLimit
-(
+Event EV_Level_GetDMRoundLimit(
     "dmroundlimit",
     EV_DEFAULT,
     NULL,
@@ -214,8 +216,7 @@ Event EV_Level_GetDMRoundLimit
     EV_GETTER
 );
 
-Event EV_Level_SetDMRoundLimit
-(
+Event EV_Level_SetDMRoundLimit(
     "dmroundlimit",
     EV_DEFAULT,
     "i",
@@ -224,8 +225,7 @@ Event EV_Level_SetDMRoundLimit
     EV_SETTER
 );
 
-Event EV_Level_SetDMRoundLimit2
-(
+Event EV_Level_SetDMRoundLimit2(
     "dmroundlimit",
     EV_DEFAULT,
     "i",
@@ -254,8 +254,7 @@ Event EV_Level_SetClockSide
     EV_SETTER
 );
 
-Event EV_Level_SetClockSide2
-(
+Event EV_Level_SetClockSide2(
     "clockside",
     EV_DEFAULT,
     "s",
@@ -267,7 +266,8 @@ Event EV_Level_SetClockSide2
 
 Event EV_Level_GetBombPlantTeam
 (
-    "planting_team", EV_DEFAULT,
+    "planting_team",
+    EV_DEFAULT,
     NULL,
     NULL,
     "Gets which is planting the bomb,"
@@ -286,8 +286,7 @@ Event EV_Level_SetBombPlantTeam
     EV_SETTER
 );
 
-Event EV_Level_SetBombPlantTeam2
-(
+Event EV_Level_SetBombPlantTeam2(
     "planting_team",
     EV_DEFAULT,
     "s",
@@ -392,7 +391,7 @@ Event EV_Level_GetRoundBased
     EV_DEFAULT,
     NULL,
     NULL,
-    "Gets wether or not the game is currently round based or not",
+    "Gets whether or not the game is currently round based or not",
     EV_GETTER
 );
 
@@ -402,7 +401,7 @@ Event EV_Level_GetObjectiveBased
     EV_DEFAULT,
     NULL,
     NULL,
-    "Gets wether or not the game is currently objective based or not",
+    "Gets whether or not the game is currently objective based or not",
     EV_GETTER
 );
 
@@ -592,7 +591,8 @@ Event EV_Level_AddBadPlace
     EV_DEFAULT,
     "svfSF",
     "name origin radius [team] [duration]",
-    "Enables a 'bad place' for AI of team 'american', 'german', or (default) 'both' to avoid, and optionally gives it a duration",
+    "Enables a 'bad place' for AI of team 'american', 'german', or (default) 'both' to avoid, and optionally gives it "
+    "a duration",
     EV_NORMAL
 );
 
@@ -616,80 +616,106 @@ Event EV_Level_IgnoreClock
     EV_NORMAL
 );
 
+//
+// Added in OPM
+//
+Event EV_Level_SetForceTeamObjectiveLocation
+(
+    "force_team_objective",
+    EV_DEFAULT,
+    "i",
+    "force",
+    "Whether or not to force using a separate objective location for each team.\n"
+    "1 (forced on TOW/Liberation match): different location for each team\n"
+    "0 (default): teams use same location on non-TOW/non-Liberation match\n",
+    EV_SETTER
+);
+Event EV_Level_GetForceTeamObjectiveLocation
+(
+    "force_team_objective",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Return 1 if each team has a separate objective location",
+    EV_GETTER
+);
+
 extern Event EV_Entity_Start;
 
 CLASS_DECLARATION(Listener, Level, NULL) {
-    {&EV_Level_GetTime,              &Level::GetTime                 },
-    {&EV_Level_GetTotalSecrets,      &Level::GetTotalSecrets         },
-    {&EV_Level_GetFoundSecrets,      &Level::GetFoundSecrets         },
-    {&EV_Level_PreSpawnSentient,     &Level::PreSpawnSentient        },
-    {&EV_Level_GetAlarm,             &Level::GetAlarm                },
-    {&EV_Level_SetAlarm,             &Level::SetAlarm                },
-    {&EV_Level_SetNoDropHealth,      &Level::SetNoDropHealth         },
-    {&EV_Level_SetNoDropWeapons,     &Level::SetNoDropWeapons        },
-    {&EV_Level_GetRoundStarted,      &Level::EventGetRoundStarted    },
-    {&EV_Level_GetLoopProtection,    &Level::GetLoopProtection       },
-    {&EV_Level_SetLoopProtection,    &Level::SetLoopProtection       },
-    {&EV_Level_GetPapersLevel,       &Level::GetPapersLevel          },
-    {&EV_Level_SetPapersLevel,       &Level::SetPapersLevel          },
-    {&EV_Level_GetDMRespawning,      &Level::EventGetDMRespawning    },
-    {&EV_Level_SetDMRespawning,      &Level::EventSetDMRespawning    },
-    {&EV_Level_SetDMRespawning2,     &Level::EventSetDMRespawning    },
-    {&EV_Level_GetDMRoundLimit,      &Level::EventGetDMRoundLimit    },
-    {&EV_Level_SetDMRoundLimit,      &Level::EventSetDMRoundLimit    },
-    {&EV_Level_SetDMRoundLimit2,     &Level::EventSetDMRoundLimit    },
-    {&EV_Level_GetClockSide,         &Level::EventGetClockSide       },
-    {&EV_Level_SetClockSide,         &Level::EventSetClockSide       },
-    {&EV_Level_SetClockSide2,        &Level::EventSetClockSide       },
-    {&EV_Level_GetBombPlantTeam,     &Level::EventGetBombPlantTeam   },
-    {&EV_Level_SetBombPlantTeam,     &Level::EventSetBombPlantTeam   },
-    {&EV_Level_SetBombPlantTeam2,    &Level::EventSetBombPlantTeam   },
-    {&EV_Level_GetTargetsToDestroy,  &Level::EventGetTargetsToDestroy},
-    {&EV_Level_SetTargetsToDestroy,  &Level::EventSetTargetsToDestroy},
-    {&EV_Level_SetTargetsToDestroy2, &Level::EventSetTargetsToDestroy},
-    {&EV_Level_GetTargetsDestroyed,  &Level::EventGetTargetsDestroyed},
-    {&EV_Level_SetTargetsDestroyed,  &Level::EventSetTargetsDestroyed},
-    {&EV_Level_SetTargetsDestroyed2, &Level::EventSetTargetsDestroyed},
-    {&EV_Level_GetBombsPlanted,      &Level::EventGetBombsPlanted    },
-    {&EV_Level_SetBombsPlanted,      &Level::EventSetBombsPlanted    },
-    {&EV_Level_SetBombsPlanted2,     &Level::EventSetBombsPlanted    },
-    {&EV_Level_GetRoundBased,        &Level::EventGetRoundBased      },
-    {&EV_Level_GetObjectiveBased,    &Level::EventGetObjectiveBased  },
-    {&EV_Level_Rain_Density_Set,     &Level::EventRainDensitySet     },
-    {&EV_Level_Rain_Density_Get,     &Level::EventRainDensityGet     },
-    {&EV_Level_Rain_Speed_Set,       &Level::EventRainSpeedSet       },
-    {&EV_Level_Rain_Speed_Get,       &Level::EventRainSpeedGet       },
-    {&EV_Level_Rain_Speed_Vary_Set,  &Level::EventRainSpeedVarySet   },
-    {&EV_Level_Rain_Speed_Vary_Get,  &Level::EventRainSpeedVaryGet   },
-    {&EV_Level_Rain_Slant_Set,       &Level::EventRainSlantSet       },
-    {&EV_Level_Rain_Slant_Get,       &Level::EventRainSlantGet       },
-    {&EV_Level_Rain_Length_Set,      &Level::EventRainLengthSet      },
-    {&EV_Level_Rain_Length_Get,      &Level::EventRainLengthGet      },
-    {&EV_Level_Rain_Min_Dist_Set,    &Level::EventRainMin_DistSet    },
-    {&EV_Level_Rain_Min_Dist_Get,    &Level::EventRainMin_DistGet    },
-    {&EV_Level_Rain_Width_Set,       &Level::EventRainWidthSet       },
-    {&EV_Level_Rain_Width_Get,       &Level::EventRainWidthGet       },
-    {&EV_Level_Rain_Shader_Set,      &Level::EventRainShaderSet      },
-    {&EV_Level_Rain_Shader_Get,      &Level::EventRainShaderGet      },
-    {&EV_Level_Rain_NumShaders_Set,  &Level::EventRainShaderSet      },
-    {&EV_Level_Rain_NumShaders_Get,  &Level::EventRainShaderGet      },
-    {&EV_Level_AddBadPlace,          &Level::EventAddBadPlace        },
-    {&EV_Level_RemoveBadPlace,       &Level::EventRemoveBadPlace     },
-    {&EV_Level_IgnoreClock,          &Level::EventIgnoreClock        },
-    {NULL,                           NULL                            }
+    {&EV_Level_GetTime,                       &Level::GetTime                      },
+    {&EV_Level_GetTotalSecrets,               &Level::GetTotalSecrets              },
+    {&EV_Level_GetFoundSecrets,               &Level::GetFoundSecrets              },
+    {&EV_Level_PreSpawnSentient,              &Level::PreSpawnSentient             },
+    {&EV_Level_GetAlarm,                      &Level::GetAlarm                     },
+    {&EV_Level_SetAlarm,                      &Level::SetAlarm                     },
+    {&EV_Level_SetNoDropHealth,               &Level::SetNoDropHealth              },
+    {&EV_Level_SetNoDropWeapons,              &Level::SetNoDropWeapons             },
+    {&EV_Level_GetRoundStarted,               &Level::EventGetRoundStarted         },
+    {&EV_Level_GetLoopProtection,             &Level::GetLoopProtection            },
+    {&EV_Level_SetLoopProtection,             &Level::SetLoopProtection            },
+    {&EV_Level_GetPapersLevel,                &Level::GetPapersLevel               },
+    {&EV_Level_SetPapersLevel,                &Level::SetPapersLevel               },
+    {&EV_Level_GetDMRespawning,               &Level::EventGetDMRespawning         },
+    {&EV_Level_SetDMRespawning,               &Level::EventSetDMRespawning         },
+    {&EV_Level_SetDMRespawning2,              &Level::EventSetDMRespawning         },
+    {&EV_Level_GetDMRoundLimit,               &Level::EventGetDMRoundLimit         },
+    {&EV_Level_SetDMRoundLimit,               &Level::EventSetDMRoundLimit         },
+    {&EV_Level_SetDMRoundLimit2,              &Level::EventSetDMRoundLimit         },
+    {&EV_Level_GetClockSide,                  &Level::EventGetClockSide            },
+    {&EV_Level_SetClockSide,                  &Level::EventSetClockSide            },
+    {&EV_Level_SetClockSide2,                 &Level::EventSetClockSide            },
+    {&EV_Level_GetBombPlantTeam,              &Level::EventGetBombPlantTeam        },
+    {&EV_Level_SetBombPlantTeam,              &Level::EventSetBombPlantTeam        },
+    {&EV_Level_SetBombPlantTeam2,             &Level::EventSetBombPlantTeam        },
+    {&EV_Level_GetTargetsToDestroy,           &Level::EventGetTargetsToDestroy     },
+    {&EV_Level_SetTargetsToDestroy,           &Level::EventSetTargetsToDestroy     },
+    {&EV_Level_SetTargetsToDestroy2,          &Level::EventSetTargetsToDestroy     },
+    {&EV_Level_GetTargetsDestroyed,           &Level::EventGetTargetsDestroyed     },
+    {&EV_Level_SetTargetsDestroyed,           &Level::EventSetTargetsDestroyed     },
+    {&EV_Level_SetTargetsDestroyed2,          &Level::EventSetTargetsDestroyed     },
+    {&EV_Level_GetBombsPlanted,               &Level::EventGetBombsPlanted         },
+    {&EV_Level_SetBombsPlanted,               &Level::EventSetBombsPlanted         },
+    {&EV_Level_SetBombsPlanted2,              &Level::EventSetBombsPlanted         },
+    {&EV_Level_GetRoundBased,                 &Level::EventGetRoundBased           },
+    {&EV_Level_GetObjectiveBased,             &Level::EventGetObjectiveBased       },
+    {&EV_Level_Rain_Density_Set,              &Level::EventRainDensitySet          },
+    {&EV_Level_Rain_Density_Get,              &Level::EventRainDensityGet          },
+    {&EV_Level_Rain_Speed_Set,                &Level::EventRainSpeedSet            },
+    {&EV_Level_Rain_Speed_Get,                &Level::EventRainSpeedGet            },
+    {&EV_Level_Rain_Speed_Vary_Set,           &Level::EventRainSpeedVarySet        },
+    {&EV_Level_Rain_Speed_Vary_Get,           &Level::EventRainSpeedVaryGet        },
+    {&EV_Level_Rain_Slant_Set,                &Level::EventRainSlantSet            },
+    {&EV_Level_Rain_Slant_Get,                &Level::EventRainSlantGet            },
+    {&EV_Level_Rain_Length_Set,               &Level::EventRainLengthSet           },
+    {&EV_Level_Rain_Length_Get,               &Level::EventRainLengthGet           },
+    {&EV_Level_Rain_Min_Dist_Set,             &Level::EventRainMin_DistSet         },
+    {&EV_Level_Rain_Min_Dist_Get,             &Level::EventRainMin_DistGet         },
+    {&EV_Level_Rain_Width_Set,                &Level::EventRainWidthSet            },
+    {&EV_Level_Rain_Width_Get,                &Level::EventRainWidthGet            },
+    {&EV_Level_Rain_Shader_Set,               &Level::EventRainShaderSet           },
+    {&EV_Level_Rain_Shader_Get,               &Level::EventRainShaderGet           },
+    {&EV_Level_Rain_NumShaders_Set,           &Level::EventRainNumShadersSet       },
+    {&EV_Level_Rain_NumShaders_Get,           &Level::EventRainNumShadersGet       },
+    {&EV_Level_AddBadPlace,                   &Level::EventAddBadPlace             },
+    {&EV_Level_RemoveBadPlace,                &Level::EventRemoveBadPlace          },
+    {&EV_Level_IgnoreClock,                   &Level::EventIgnoreClock             },
+    {&EV_Level_SetForceTeamObjectiveLocation, &Level::SetForceTeamObjectiveLocation},
+    {&EV_Level_GetForceTeamObjectiveLocation, &Level::GetForceTeamObjectiveLocation},
+    {NULL,                                    NULL                                 }
 };
 
-void Level::GetTime(Event* ev)
+void Level::GetTime(Event *ev)
 {
     ev->AddFloat(level.time);
 }
 
-void Level::GetTotalSecrets(Event* ev)
+void Level::GetTotalSecrets(Event *ev)
 {
     ev->AddInteger(total_secrets);
 }
 
-void Level::GetFoundSecrets(Event* ev)
+void Level::GetFoundSecrets(Event *ev)
 {
     ev->AddInteger(found_secrets);
 }
@@ -759,26 +785,30 @@ void Level::Init(void)
     m_fade_color      = vec_zero;
     m_fade_style      = additive;
 
-    m_letterbox_dir = letterbox_out;
-    m_numArenas     = 1;
-
     m_fade_alpha = 0;
 
     m_letterbox_fraction   = 0;
+    m_letterbox_time       = -1;
     m_letterbox_time_start = 0;
+    m_letterbox_dir        = letterbox_out;
 
-    m_voteTime  = 0;
-    m_numVoters = 0;
+    m_numArenas = 1;
+
+    m_voteTime     = 0;
+    m_nextVoteTime = 0;
+    m_voteYes      = 0;
+    m_voteNo       = 0;
+    m_numVoters    = 0;
 
     m_LoopProtection = true;
     m_LoopDrop       = true;
 
     m_letterbox_time = -1.0f;
 
-    m_voteYes = 0;
-    m_voteNo  = 0;
-
-    m_vObjectiveLocation = vec_zero;
+    m_vObjectiveLocation          = vec_zero;
+    m_vAlliedObjectiveLocation    = vec_zero;
+    m_vAxisObjectiveLocation      = vec_zero;
+    m_bForceTeamObjectiveLocation = false;
 
     svsEndTime = 0;
 
@@ -786,16 +816,32 @@ void Level::Init(void)
 
     mHealthPopCount = 0;
     mbNoDropHealth  = false;
+    mbNoDropWeapons = false;
 
-    spawning = false;
+    spawning          = false;
+    m_bIgnoreClock    = false;
+    svsStartFloatTime = 0;
+
+    m_fLandmarkXDistMin = 0;
+    m_fLandmarkXDistMax = 0;
+    m_fLandmarkYDistMin = 0;
+    m_fLandmarkYDistMax = 0;
+    m_pLandmarks        = NULL;
+    m_iMaxLandmarks     = 0;
+    m_iLandmarksCount   = 0;
+
+    m_badPlaces.ClearObjectList();
+
+    m_pAIStats = NULL;
 
-    m_bSpawnBot    = false;
     m_bScriptSpawn = false;
     m_bRejectSpawn = false;
 }
 
 void Level::CleanUp(qboolean samemap, qboolean resetConfigStrings)
 {
+    int i;
+
     DisableListenerNotify++;
 
     if (g_gametype->integer != GT_SINGLE_PLAYER) {
@@ -833,18 +879,24 @@ void Level::CleanUp(qboolean samemap, qboolean resetConfigStrings)
 
         if (active_edicts.next->entity) {
             delete active_edicts.next->entity;
-        }
-        else {
+        } else {
             FreeEdict(active_edicts.next);
         }
     }
 
+    //
+    // Remove all archived entities
+    //
+    for (i = m_SimpleArchivedEntities.NumObjects(); i > 0; i--) {
+        delete m_SimpleArchivedEntities.ObjectAt(i);
+    }
+
     cinematic = false;
-    ai_on = true;
+    ai_on     = true;
     near_exit = false;
 
     mission_failed = false;
-    died_already = false;
+    died_already   = false;
 
     globals.num_entities = game.maxclients + 1;
     gi.LocateGameData(g_entities, game.maxclients + 1, sizeof(gentity_t), &game.clients[0].ps, sizeof(gclient_t));
@@ -881,6 +933,7 @@ void Level::CleanUp(qboolean samemap, qboolean resetConfigStrings)
     gi.cvar_set("bosshealth", "0");
 
     Actor::ResetBodyQueue();
+    Health::ResetHealthQueue();
 
     if (world) {
         world->FreeTargetList();
@@ -916,12 +969,22 @@ void Level::CleanUp(qboolean samemap, qboolean resetConfigStrings)
         gi.setConfigstring(CS_RAIN_NUMSHADERS, "0");
         gi.setConfigstring(CS_CURRENT_OBJECTIVE, "");
 
-        for (int i = CS_OBJECTIVES; i < CS_OBJECTIVES + MAX_OBJECTIVES; i++) {
-            gi.setConfigstring(i, "");
+        for (i = 0; i < MAX_OBJECTIVES; i++) {
+            gi.setConfigstring(CS_OBJECTIVES + i, "");
         }
+
+        gi.setConfigstring(CS_VOTE_TIME, "");
+        gi.setConfigstring(CS_VOTE_STRING, "");
+        gi.setConfigstring(CS_VOTE_YES, "");
+        gi.setConfigstring(CS_VOTE_NO, "");
+        gi.setConfigstring(CS_VOTE_UNDECIDED, "");
     }
 
     DisableListenerNotify--;
+
+    svsStartFloatTime = svsFloatTime;
+
+    FreeLandmarks();
 }
 
 /*
@@ -954,14 +1017,38 @@ void Level::ResetEdicts(void)
 
 qboolean Level::inhibitEntity(int spawnflags)
 {
-    if (!developer->integer && (spawnflags & SPAWNFLAG_DEVELOPMENT)) {
-        return qtrue;
-    }
-
     if (!detail->integer && (spawnflags & SPAWNFLAG_DETAIL)) {
         return qtrue;
     }
 
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        return (spawnflags & SPAWNFLAG_NOT_DEATHMATCH) ? qtrue : qfalse;
+    }
+
+    if (!developer->integer && (spawnflags & SPAWNFLAG_DEVELOPMENT)) {
+        return qtrue;
+    }
+
+    if (!Q_stricmp(mapname, "t3l2")) {
+        // Added in 2.0.
+        //   FIXME: there should be a better way to handle
+        //   specific maps
+        return (spawnflags & SPAWNFLAG_NOT_EASY) ? qtrue : qfalse;
+    }
+
+    switch (skill->integer) {
+    case 0:
+        return (spawnflags & SPAWNFLAG_NOT_EASY) != 0;
+
+    case 1:
+        return (spawnflags & SPAWNFLAG_NOT_MEDIUM) != 0;
+
+    case 2:
+    case 3:
+        return (spawnflags & SPAWNFLAG_NOT_HARD);
+    }
+
+    /*
 #ifdef _CONSOLE
     if (spawnflags & SPAWNFLAG_NOCONSOLE)
 #else
@@ -970,29 +1057,7 @@ qboolean Level::inhibitEntity(int spawnflags)
     {
         return qtrue;
     }
-
-    if (g_gametype->integer) {
-        if (spawnflags & SPAWNFLAG_NOT_DEATHMATCH) {
-            return qtrue;
-        }
-
-        return qfalse;
-    }
-
-    switch (skill->integer) {
-    case 0:
-        return (spawnflags & SPAWNFLAG_NOT_EASY) != 0;
-        break;
-
-    case 1:
-        return (spawnflags & SPAWNFLAG_NOT_MEDIUM) != 0;
-        break;
-
-    case 2:
-    case 3:
-        return (spawnflags & SPAWNFLAG_NOT_HARD);
-        break;
-    }
+    */
 
     return qfalse;
 }
@@ -1009,28 +1074,34 @@ void Level::setSkill(int value)
 
 void Level::setTime(int levelTime)
 {
-    svsTime = levelTime;
-    inttime = levelTime - svsStartTime;
+    svsTime      = levelTime;
+    inttime      = levelTime - svsStartTime;
     svsFloatTime = levelTime / 1000.0f;
-    time = inttime / 1000.0f;
+    time         = inttime / 1000.0f;
 }
 
 void Level::setFrametime(int frametime)
 {
-    intframetime = frametime;
+    intframetime    = frametime;
     this->frametime = frametime / 1000.0f;
 }
 
-void Level::SpawnEntities(char* entities, int svsTime)
+void Level::SpawnEntities(char *entities, int svsTime)
 {
-    int inhibit, radnum = 0, count = 0;
-    const char* value;
-    SpawnArgs args;
-    Listener* listener;
-	Entity* ent;
-    int t1, t2;
-    int start, end;
-	char name[128];
+    int         inhibit, radnum = 0, count = 0;
+    const char *value;
+    SpawnArgs   args;
+    Listener   *listener;
+    Entity     *ent;
+    int         t1, t2;
+    int         start, end;
+    char        name[128];
+
+    if (gi.Cvar_Get("g_invulnoverride", "0", 0)->integer == 1) {
+        // Added in 2.30
+        //  Clear the invulnerable override when loading
+        gi.cvar_set("g_invulnoverride", "0");
+    }
 
     Com_Printf("-------------------- Spawning Entities -----------------------\n");
 
@@ -1039,9 +1110,9 @@ void Level::SpawnEntities(char* entities, int svsTime)
 
     // set up time so functions still have valid times
     setTime(svsTime);
-	setFrametime(50);
+    setFrametime(50);
 
-	gi.LoadResource("*144");
+    gi.LoadResource("*144");
 
     setSkill(skill->integer);
 
@@ -1049,35 +1120,38 @@ void Level::SpawnEntities(char* entities, int svsTime)
     sv_numtraces = 0;
 
     // parse world
-    entities = args.Parse(entities);
+    entities     = args.Parse(entities);
     spawn_entnum = ENTITYNUM_WORLD;
     args.SpawnInternal();
 
-	gi.LoadResource("*147");
+    gi.LoadResource("*147");
 
     // Set up for a new map
-	PathManager.LoadNodes();
+    PathManager.LoadNodes();
 
-	gi.LoadResource("*147a");
+    gi.LoadResource("*147a");
 
     Com_Printf("-------------------- Actual Spawning Entities -----------------------\n");
 
-	start = gi.Milliseconds();
+    start = gi.Milliseconds();
 
-	// parse ents
-	inhibit = 0;
+    // parse ents
+    inhibit = 0;
 
     for (entities = args.Parse(entities); entities != NULL; entities = args.Parse(entities)) {
         // remove things (except the world) from different skill levels or deathmatch
         spawnflags = 0;
-        value = args.getArg("spawnflags");
+        value      = args.getArg("spawnflags");
 
         if (value) {
             spawnflags = atoi(value);
 
-            if (inhibitEntity(spawnflags)) {
-                inhibit++;
-                continue;
+            value = args.getArg("classname");
+            if (!value || (Q_stricmp(value, "info_pathnode") && Q_stricmp(value, "info_patharea"))) {
+                if (inhibitEntity(spawnflags)) {
+                    inhibit++;
+                    continue;
+                }
             }
         }
 
@@ -1089,13 +1163,13 @@ void Level::SpawnEntities(char* entities, int svsTime)
             if (listener->isSubclassOf(Entity)) {
                 count++;
 
-                ent = (Entity*)listener;
+                ent         = (Entity *)listener;
                 ent->radnum = radnum;
 
                 Q_strncpyz(ent->edict->entname, ent->getClassID(), sizeof(ent->edict->entname));
 
                 ent->PostEvent(EV_Entity_Start, -1.0, 0);
-                sprintf(name, "i%d", radnum);
+                Com_sprintf(name, sizeof(name), "i%d", radnum);
                 gi.LoadResource(name);
             }
         }
@@ -1103,33 +1177,33 @@ void Level::SpawnEntities(char* entities, int svsTime)
 
     end = gi.Milliseconds();
 
-    Com_Printf(
-        "-------------------- Actual Spawning Entities Done ------------------ %i ms\n", end - start
-    );
+    Com_Printf("-------------------- Actual Spawning Entities Done ------------------ %i ms\n", end - start);
 
-	gi.LoadResource("*147b");
+    gi.LoadResource("*147b");
 
     world->UpdateConfigStrings();
 
-    Event* ev = new Event(EV_Level_PreSpawnSentient);
+    Event *ev = new Event(EV_Level_PreSpawnSentient);
     PostEvent(ev, EV_SPAWNENTITIES);
 
-	L_ProcessPendingEvents();
+    L_ProcessPendingEvents();
 
-	gi.LoadResource("*148");
+    gi.LoadResource("*148");
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         dmManager.InitGame();
-	}
+    }
 
-	gi.LoadResource("*148a");
+    gi.LoadResource("*148a");
 
-    if (game.maxclients == 1) {
+    // Added in OPM
+    //  Check for single-player before pre-creating a player instance
+    if (game.maxclients == 1 && g_gametype->integer == GT_SINGLE_PLAYER) {
         spawn_entnum = 0;
         new Player;
-	}
+    }
 
-	gi.LoadResource("*148b");
+    gi.LoadResource("*148b");
 
     m_LoopProtection = false;
     RemoveWaitTill(STRING_PRESPAWN);
@@ -1145,43 +1219,236 @@ void Level::SpawnEntities(char* entities, int svsTime)
     Com_Printf("%i entities inhibited\n", inhibit);
 
     Com_Printf("-------------------- Spawning Entities Done ------------------ %i ms\n", t2 - t1);
+
+    //
+    // create landmarks
+    //
+    ComputeDMWaypoints();
 }
 
 void Level::ComputeDMWaypoints()
 {
-    // FIXME: unimplemented
+    qboolean shouldSetDefaultLandmark;
+    float    startXDistMin, startXDistMax;
+    float    startYDistMin, startYDistMax;
+    int      i;
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        m_fLandmarkXDistMax = 1;
+        m_fLandmarkYDistMax = 1;
+        m_fLandmarkXDistMin = 0;
+        m_fLandmarkYDistMin = 0.0;
+        return;
+    }
+
+    shouldSetDefaultLandmark = qfalse;
+
+    //
+    // calculate the world bounds from entities
+    //
+    if (m_fLandmarkXDistMin == m_fLandmarkXDistMax && m_fLandmarkYDistMin == m_fLandmarkYDistMax
+        && m_fLandmarkXDistMax == m_fLandmarkYDistMax) {
+        shouldSetDefaultLandmark = qtrue;
+
+        for (i = 0; i < game.maxentities; i++) {
+            gentity_t *ent = &g_entities[i];
+
+            if (ent->entity) {
+                AddLandmarkOrigin(ent->entity->origin);
+                shouldSetDefaultLandmark = qfalse;
+            }
+        }
+    }
+
+    if (shouldSetDefaultLandmark) {
+        startXDistMax = 1;
+        startYDistMax = 1;
+        startXDistMin = 0;
+        startYDistMin = 0;
+    } else {
+        startYDistMax = m_fLandmarkYDistMax;
+        startYDistMin = m_fLandmarkYDistMin;
+        startXDistMax = m_fLandmarkXDistMax;
+        startXDistMin = m_fLandmarkXDistMin;
+    }
+
+    m_fLandmarkXDistMin = startXDistMin + (startXDistMax - startXDistMin) / 3.f;
+    m_fLandmarkXDistMax = startXDistMin + (startXDistMax - startXDistMin) * 2.f / 3.f;
+    m_fLandmarkYDistMin = startYDistMin + (startYDistMax - startYDistMin) / 3.f;
+    m_fLandmarkYDistMax = startYDistMin + (startYDistMax - startYDistMin) * 2.f / 3.f;
 }
 
 void Level::AddLandmarkOrigin(const Vector& origin)
 {
-    // FIXME: unimplemented
+    float  yaw;
+    vec3_t angles;
+    vec3_t dir;
+    float  dist;
+
+    yaw = origin.toYaw();
+
+    angles[0] = angles[2] = 0;
+    angles[1]             = yaw + 90 - world->m_fNorth;
+    AngleVectors(angles, dir, NULL, NULL);
+
+    dist = origin.lengthXY();
+    VectorScale(dir, dist, dir);
+
+    if (m_fLandmarkYDistMax == m_fLandmarkYDistMin && m_fLandmarkXDistMin == m_fLandmarkXDistMax
+        && m_fLandmarkYDistMax == m_fLandmarkXDistMin) {
+        m_fLandmarkYDistMin = dir[1];
+        m_fLandmarkXDistMax = dir[0];
+        m_fLandmarkYDistMax = dir[1] + 1.0;
+        m_fLandmarkXDistMin = dir[0] - 1.0;
+    } else {
+        if (m_fLandmarkYDistMin > dir[1]) {
+            m_fLandmarkYDistMin = dir[1];
+        }
+        if (m_fLandmarkYDistMax < dir[1]) {
+            m_fLandmarkYDistMax = dir[1];
+        }
+        if (m_fLandmarkXDistMax < dir[0]) {
+            m_fLandmarkXDistMax = dir[0];
+        }
+        if (m_fLandmarkXDistMin > dir[0]) {
+            m_fLandmarkXDistMin = dir[0];
+        }
+    }
 }
 
 void Level::AddLandmarkName(const str& name, const Vector& origin)
 {
-    // FIXME: unimplemented
+    landmark_t *landmark;
+    int         i;
+
+    if (m_pLandmarks) {
+        if (m_iLandmarksCount == m_iMaxLandmarks) {
+            // reallocate the landmark list with twice the size
+            landmark_t **oldLandmarks = m_pLandmarks;
+
+            m_iMaxLandmarks *= 2;
+            m_pLandmarks = new landmark_t *[m_iMaxLandmarks];
+
+            for (i = 0; i < m_iLandmarksCount; i++) {
+                m_pLandmarks[i] = oldLandmarks[i];
+            }
+
+            delete[] oldLandmarks;
+        }
+    } else {
+        // create the landmark list for the first time
+        m_iMaxLandmarks   = 8;
+        m_iLandmarksCount = 0;
+        m_pLandmarks      = new landmark_t *[8];
+    }
+
+    //
+    // create a new landmark
+    //
+    landmark = m_pLandmarks[m_iLandmarksCount] = new landmark_t();
+    landmark->m_sName                          = name;
+    landmark->m_vOrigin                        = origin;
 }
 
 void Level::FreeLandmarks()
 {
-    // FIXME: unimplemented
+    landmark_t *landmark;
+
+    if (m_pLandmarks) {
+        int i;
+
+        for (i = 0; i < m_iLandmarksCount; i++) {
+            landmark = m_pLandmarks[i];
+
+            if (landmark) {
+                delete landmark;
+            }
+        }
+
+        delete[] m_pLandmarks;
+        m_pLandmarks      = NULL;
+        m_iLandmarksCount = 0;
+        m_iMaxLandmarks   = 0;
+    }
 }
 
 str Level::GetDynamicDMLocations(const Vector& origin)
 {
-    // FIXME: unimplemented
-    return "";
+    str   name = "nothing";
+    int   i;
+    float shortestDistSqr = 0;
+
+    for (i = 0; i < m_iLandmarksCount; i++) {
+        landmark_t *landmark = m_pLandmarks[i];
+        Vector      delta    = origin - landmark->m_vOrigin;
+        float       distSqr  = delta.lengthSquared();
+
+        if (i == 0 || distSqr < shortestDistSqr) {
+            shortestDistSqr = distSqr;
+            name            = landmark->m_sName;
+        }
+    }
+
+    return name;
 }
 
 str Level::GetDMLocation(const Vector& origin)
 {
-    // FIXME: unimplemented
-    return "";
+    float  yaw;
+    vec3_t angles;
+    vec3_t dir;
+    float  dist;
+
+    if (m_pLandmarks) {
+        //
+        // use the dynamic dm locations
+        //
+        return GetDynamicDMLocations(origin);
+    }
+
+    yaw = origin.toYaw();
+
+    angles[0] = angles[2] = 0;
+    angles[1]             = yaw + 90 - world->m_fNorth;
+    AngleVectors(angles, dir, NULL, NULL);
+
+    dist = origin.lengthXY();
+    VectorScale(dir, dist, dir);
+
+    if (dir[0] >= m_fLandmarkXDistMin) {
+        if (dir[0] > m_fLandmarkXDistMax) {
+            if (dir[1] >= m_fLandmarkYDistMin) {
+                if (dir[1] > m_fLandmarkYDistMax) {
+                    return "North East corner";
+                } else {
+                    return "East side";
+                }
+            } else {
+                return "South East corner";
+            }
+        } else if (dir[1] >= m_fLandmarkYDistMin) {
+            if (dir[1] > m_fLandmarkYDistMax) {
+                return "North side";
+            } else {
+                return "center";
+            }
+        } else {
+            return "South side";
+        }
+    } else if (dir[1] >= m_fLandmarkYDistMin) {
+        if (dir[1] > m_fLandmarkYDistMax) {
+            return "North West corner";
+        } else {
+            return "West side";
+        }
+    } else {
+        return "South West corner";
+    }
 }
 
-void Level::PreSpawnSentient(Event* ev)
+void Level::PreSpawnSentient(Event *ev)
 {
-    GameScript* script;
+    GameScript *script;
 
     // general initialization
     FindTeams();
@@ -1216,8 +1483,8 @@ bool Level::Spawned(void)
 void Level::ServerSpawned(void)
 {
     int        i;
-    gclient_t* client;
-    gentity_t* ent;
+    gclient_t *client;
+    gentity_t *ent;
 
     for (i = 0, client = game.clients; i < game.maxclients; i++, client++) {
         client->ps.commandTime = svsTime;
@@ -1235,36 +1502,34 @@ void Level::ServerSpawned(void)
         Director.Unpause();
 
         Unregister(STRING_SPAWN);
-    }
-    else {
+    } else {
         Director.LoadMenus();
     }
 
     spawning = false;
 }
 
-void Level::SetMap(const char* themapname)
+void Level::SetMap(const char *themapname)
 {
-    char* spawnpos;
-    int   i;
-    str   text;
+    const char *spawnpos;
+    int         i;
+    str         text;
 
     Init();
 
     spawning = true;
 
     // set a specific spawnpoint if the map was started with a $
-    spawnpos = strchr((char*)themapname, '$');
+    spawnpos = strchr((char *)themapname, '$');
     if (spawnpos) {
-        mapname = (const char*)(spawnpos - themapname);
-        spawnpoint = mapname;
-    }
-    else {
-        mapname = themapname;
+        mapname    = str(themapname, 0, spawnpos - themapname);
+        spawnpoint = spawnpos + 1;
+    } else {
+        mapname    = themapname;
         spawnpoint = "";
     }
 
-    current_map = (char*)themapname;
+    current_map = (char *)themapname;
 
     level_name = mapname;
     for (i = 0; i < level_name.length(); i++) {
@@ -1274,15 +1539,15 @@ void Level::SetMap(const char* themapname)
         }
     }
 
-    m_mapscript = "maps/" + level_name + ".scr";
+    m_mapscript      = "maps/" + level_name + ".scr";
     m_precachescript = "maps/" + level_name + "_precache.scr";
-    m_pathfile = "maps/" + level_name + ".pth";
-    m_mapfile = "maps/" + level_name + ".bsp";
+    m_pathfile       = "maps/" + level_name + ".pth";
+    m_mapfile        = "maps/" + level_name + ".bsp";
 }
 
-void Level::LoadAllScripts(const char* name, const char* extension)
+void Level::LoadAllScripts(const char *name, const char *extension)
 {
-    char** scriptFiles;
+    char **scriptFiles;
     char   filename[MAX_QPATH];
     int    numScripts;
 
@@ -1317,11 +1582,36 @@ void Level::Precache(void)
         m_LoopProtection = true;
     }
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         LoadAllScripts("anim", ".scr");
     }
 
     LoadAllScripts("global", ".scr");
+    InitVoteOptions();
+
+    // Added in OPM
+    //  Cache all player models in multi-player
+    //  This avoids using precache scripts
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        char **fileList;
+        int    numFiles;
+        int    i;
+
+        fileList = gi.FS_ListFiles("models/player", ".tik", qfalse, &numFiles);
+
+        for (i = 0; i < numFiles; i++) {
+            const char *filename = fileList[i];
+            const size_t filelen = strlen(filename);
+
+            if (!Q_stricmpn(filename, "allied_", 7) || !Q_stricmpn(filename, "american_", 9)
+                || !Q_stricmpn(filename, "german_", 7) || !Q_stricmpn(filename, "IT_", 3)
+                || !Q_stricmpn(filename, "SC_", 3)) {
+                CacheResource(va("models/player/%s", filename));
+            }
+        }
+
+        gi.FS_FreeFileList(fileList);
+    }
 }
 
 /*
@@ -1337,12 +1627,12 @@ All but the last will have the teamchain field set to the next one
 */
 void Level::FindTeams()
 {
-    gentity_t* ent, * ent2;
-    Entity* e, * e2;
+    gentity_t *ent, *ent2;
+    Entity    *e, *e2;
     int        i, j;
     int        c, c2;
 
-    c = 0;
+    c  = 0;
     c2 = 0;
     for (i = 1, ent = g_entities + i; i < globals.num_entities; i++, ent++) {
         if (!ent->inuse) {
@@ -1380,14 +1670,14 @@ void Level::FindTeams()
 
             if (!strcmp(e->moveteam, e2->moveteam)) {
                 c2++;
-                e2->teamchain = e->teamchain;
-                e->teamchain = e2;
+                e2->teamchain  = e->teamchain;
+                e->teamchain   = e2;
                 e2->teammaster = e;
                 e2->flags |= FL_TEAMSLAVE;
 
                 // make sure that targets only point at the master
                 if (e2->targetname) {
-                    e->targetname = e2->targetname;
+                    e->targetname  = e2->targetname;
                     e2->targetname = NULL;
                 }
             }
@@ -1464,6 +1754,10 @@ void Level::FreeEdict(gentity_t *ed)
 {
     gclient_t *client;
 
+    // clear the model so it decreases the user count
+    // and free memory if the model is not used anywhere
+    gi.clearmodel(ed);
+
     // unlink from world
     gi.unlinkentity(ed);
 
@@ -1512,71 +1806,230 @@ void Level::AddAutomaticCamera(Camera *cam)
 
 void Level::InitVoteOptions()
 {
-    // FIXME: unimplemented
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        return;
+    }
+
+    m_voteOptions.SetupVoteOptions("callvote.cfg");
+    // clear the vote time
+    gi.setConfigstring(CS_VOTE_TIME, "");
 }
 
-void Level::SendVoteOptionsFile(gentity_t* ent)
+void Level::SendVoteOptionsFile(gentity_t *ent)
 {
-    // FIXME: unimplemented
+    const char *voteBuffer;
+    int         voteLength;
+    int         clientNum;
+    int         i, j;
+    char        buffer[2068];
+
+    clientNum = ent - g_entities;
+
+    if (clientNum < 0 || clientNum >= game.maxclients) {
+        return;
+    }
+
+    voteBuffer = m_voteOptions.GetVoteOptionsFile(&voteLength);
+    if (voteLength < MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH) {
+        Q_strncpyz(buffer, voteBuffer, voteLength + 1);
+
+        for (i = 0; i < voteLength; i++) {
+            if (buffer[i] == '"') {
+                buffer[i] = 1;
+            }
+        }
+
+        gi.SendServerCommand(clientNum, "vo0 \"\"\n");
+        gi.SendServerCommand(clientNum, "vo2 \"%s\"\n", buffer);
+    } else {
+        const char *cmd;
+        int         destLength;
+        int         offset;
+
+        offset = 0;
+        for (i = voteLength; i > 0; i -= MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH - 1) {
+            if (offset == 0) {
+                cmd        = "vo0";
+                destLength = MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH;
+            } else if (i >= MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH) {
+                cmd        = "vo1";
+                destLength = MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH;
+            } else {
+                cmd        = "vo2";
+                destLength = i;
+            }
+
+            Q_strncpyz(buffer, &voteBuffer[offset], MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH);
+
+            for (j = 0; j < destLength; j++) {
+                if (buffer[j] == '"') {
+                    buffer[j] = 1;
+                }
+            }
+
+            gi.SendServerCommand(clientNum, "%s \"%s\"\n", cmd, buffer);
+            offset += MAX_VOTEOPTIONS_UPLOAD_BUFFER_LENGTH - 1;
+        }
+    }
 }
 
-bool Level::GetVoteOptionMain(int index, str* outOptionCommand, voteoptiontype_t* outOptionType)
+bool Level::GetVoteOptionMain(int index, str *outOptionCommand, voteoptiontype_t *outOptionType)
 {
-    // FIXME: unimplemented
-    return false;
+    return m_voteOptions.GetVoteOptionsMain(index, outOptionCommand, outOptionType);
 }
 
-bool Level::GetVoteOptionSub(int index, int listIndex, str* outCommand)
+bool Level::GetVoteOptionSub(int index, int listIndex, str *outCommand)
 {
-    // FIXME: unimplemented
-    return false;
+    return m_voteOptions.GetVoteOptionSub(index, listIndex, outCommand);
 }
 
-bool Level::GetVoteOptionMainName(int index, str* outVoteName)
+bool Level::GetVoteOptionMainName(int index, str *outVoteName)
 {
-    // FIXME: unimplemented
-    return false;
+    return m_voteOptions.GetVoteOptionMainName(index, outVoteName);
 }
 
-bool Level::GetVoteOptionSubName(int index, int listIndex, str* outName)
+bool Level::GetVoteOptionSubName(int index, int listIndex, str *outName)
 {
-    // FIXME: unimplemented
-    return false;
+    return m_voteOptions.GetVoteOptionSubName(index, listIndex, outName);
 }
 
 void Level::CheckVote(void)
 {
-    // FIXME: show the vote HUD like in SH and BT
+    gentity_t *ent;
+    int        i;
+    int        numVoters;
+    int        oldVoteYes, oldVoteNo, oldNumVoters;
+
+    if (m_nextVoteTime && m_nextVoteTime < inttime) {
+        m_nextVoteTime = 0;
+
+        gi.SendConsoleCommand(va("%s\n", m_voteString.c_str()));
+
+        if (sv_sprinton->integer == 1) {
+            if (sv_runspeed->integer == 250) {
+                gi.cvar_set("sv_runspeed", "287");
+            }
+        } else if (sv_runspeed->integer == 287) {
+            gi.cvar_set("sv_runspeed", "250");
+        }
+
+        SetupMaplist();
+    }
 
     if (!m_voteTime) {
         return;
     }
 
-    if (time - m_voteTime >= 30000.0f) {
-        dmManager.PrintAllClients("Vote failed.\n");
-        m_voteTime = 0;
-        return;
+    oldVoteYes   = level.m_voteYes;
+    oldVoteNo    = level.m_voteNo;
+    oldNumVoters = level.m_numVoters;
+
+    level.m_voteYes = 0;
+    level.m_voteNo  = 0;
+    numVoters       = 0;
+
+    for (i = 0; i < game.maxclients; i++) {
+        Player *p;
+
+        ent = &g_entities[i];
+        if (!ent->inuse || !ent->client || !ent->entity) {
+            continue;
+        }
+
+        p = static_cast<Player *>(ent->entity);
+        if (p->client->ps.voted) {
+            if (p->HasVotedYes()) {
+                level.m_voteYes++;
+            } else {
+                level.m_voteNo++;
+            }
+        }
+
+        numVoters++;
     }
 
-    if (m_voteYes > m_numVoters / 2) {
-        dmManager.PrintAllClients("Vote passed.\n");
+    level.m_numVoters = numVoters;
 
+    if ((svsFloatTime - svsStartFloatTime) * 1000 - m_voteTime >= 30000) {
+        G_PrintToAllClients(va("%s: %s\n", gi.CL_LV_ConvertString("Vote Failed"), m_voteName.c_str()));
+        m_voteTime = 0;
+        gi.setConfigstring(CS_VOTE_TIME, "");
+    } else if (m_voteYes > m_numVoters / 2) {
         // Pass arguments to console
-        gi.SendConsoleCommand(va("%s", level.m_voteString.c_str()));
+        G_PrintToAllClients(va("%s: %s\n", gi.CL_LV_ConvertString("Vote Passed"), m_voteName.c_str()));
+        m_nextVoteTime = level.inttime + 3000;
+        m_voteTime     = 0;
+        gi.setConfigstring(CS_VOTE_TIME, "");
+    } else if (m_voteNo >= m_numVoters / 2) {
+        G_PrintToAllClients(va("%s: %s\n", gi.CL_LV_ConvertString("Vote Failed"), m_voteName.c_str()));
         m_voteTime = 0;
-        return;
-    }
+        gi.setConfigstring(CS_VOTE_TIME, "");
+    } else {
+        if (oldVoteYes != level.m_voteYes) {
+            gi.setConfigstring(CS_VOTE_YES, va("%i", level.m_voteYes));
+        }
 
-    if (m_voteNo >= m_numVoters / 2) {
-        dmManager.PrintAllClients("Vote failed.\n");
-        m_voteTime = 0;
-        return;
+        if (oldVoteNo != level.m_voteNo) {
+            gi.setConfigstring(CS_VOTE_NO, va("%i", level.m_voteNo));
+        }
+
+        if (oldNumVoters != level.m_numVoters || oldVoteYes != level.m_voteYes || oldVoteNo != level.m_voteNo) {
+            gi.setConfigstring(CS_VOTE_UNDECIDED, va("%i", level.m_numVoters - (level.m_voteYes + level.m_voteNo)));
+        }
     }
 }
 
 void Level::SetupMaplist()
 {
-    // FIXME: unimplemented
+    const char *p;
+    const char  delim[2] = {';', 0};
+    cvar_t     *maplistVar;
+    int         gameTypeNum;
+    char        buffer[1024];
+    char        gameTypeBuffer[12];
+
+    if (!strstr(m_voteString.c_str(), "g_gametype")) {
+        return;
+    }
+
+    Q_strncpyz(buffer, m_voteString.c_str(), sizeof(buffer));
+
+    for (p = strtok(buffer, delim); p; p = strtok(NULL, delim)) {
+        if (strstr(p, "g_gametype")) {
+            gameTypeBuffer[0] = p[strlen(p) - 1];
+            gameTypeBuffer[1] = 0;
+            gameTypeNum       = atoi(gameTypeBuffer);
+        }
+    }
+
+    switch (gameTypeNum) {
+    case GT_FFA:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_ffa.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_ffa", "", 0);
+        break;
+    case GT_TEAM:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_team.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_team", "", 0);
+        break;
+    case GT_TEAM_ROUNDS:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_round.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_round", "", 0);
+        break;
+    case GT_OBJECTIVE:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_obj.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_obj", "", 0);
+        break;
+    case GT_TOW:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_tow.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_tow", "", 0);
+        break;
+    case GT_LIBERATION:
+        gi.ExecuteConsoleCommand(EXEC_NOW, "exec maplist_lib.cfg");
+        maplistVar = gi.Cvar_Get("ui_maplist_lib", "", 0);
+        break;
+    }
+
+    gi.cvar_set("sv_maplist", maplistVar->string);
 }
 
 void Level::GetAlarm(Event *ev)
@@ -1594,7 +2047,7 @@ void Level::SetNoDropHealth(Event *ev)
     mbNoDropHealth = ev->GetInteger(1);
 }
 
-void Level::SetNoDropWeapons(Event* ev)
+void Level::SetNoDropWeapons(Event *ev)
 {
     mbNoDropWeapons = ev->GetInteger(1);
 }
@@ -1619,7 +2072,7 @@ void Level::SetPapersLevel(Event *ev)
     m_iPapersLevel = ev->GetInteger(1);
 }
 
-void Level::EventGetRoundStarted(Event* ev)
+void Level::EventGetRoundStarted(Event *ev)
 {
     ev->AddInteger(RoundStarted());
 }
@@ -1717,26 +2170,24 @@ void Level::EventGetRoundBased(Event *ev)
     ev->AddInteger(g_gametype->integer >= GT_TEAM_ROUNDS);
 }
 
-void Level::EventGetObjectiveBased(Event* ev)
+void Level::EventGetObjectiveBased(Event *ev)
 {
     ev->AddInteger(g_gametype->integer >= GT_OBJECTIVE);
 }
 
 str Level::GetRandomHeadModel(const char *model)
 {
-    //FIXME: macros
-    char s[1024];
-    int  num = random2() * gi.NumHeadModels(model);
-    gi.GetHeadModel(model, num, s);
+    char s[MAX_STRING_TOKENS];
+
+    gi.GetHeadModel(model, G_Random(gi.NumHeadModels(model)), s);
     return s;
 }
 
 str Level::GetRandomHeadSkin(const char *model)
 {
-    //FIXME: macros
-    char s[1024];
-    int  num = random2() * gi.NumHeadSkins(model);
-    gi.GetHeadSkin(model, num, s);
+    char s[MAX_STRING_TOKENS];
+
+    gi.GetHeadSkin(model, G_Random(gi.NumHeadSkins(model)), s);
     return s;
 }
 
@@ -1744,7 +2195,7 @@ void Level::AddEarthquake(earthquake_t *e)
 {
     if (num_earthquakes == MAX_EARTHQUAKES) {
         if (earthquakes[0].m_Thread) {
-            earthquakes[0].m_Thread->Wait((float)(e->endtime - inttime) / 1000.0f - 0.5f);
+            earthquakes[0].m_Thread->Wait(e->endtime - inttime);
         }
 
         num_earthquakes--;
@@ -1896,6 +2347,12 @@ void Level::EventRainShaderGet(Event *ev)
 
 void Level::EventRainNumShadersSet(Event *ev)
 {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH) {
+        // There is a mistake in 1.11 and below where the NumShader event doesn't work
+        // Because the response points to EventRainShaderSet
+        return;
+    }
+
     gi.setConfigstring(CS_RAIN_NUMSHADERS, ev->GetString(1));
 }
 
@@ -1904,30 +2361,159 @@ void Level::EventRainNumShadersGet(Event *ev)
     ev->AddString(gi.getConfigstring(CS_RAIN_NUMSHADERS));
 }
 
-void Level::EventAddBadPlace(Event* ev)
+void Level::EventAddBadPlace(Event *ev)
 {
-    // FIXME: unimplemented
+    badplace_t bp;
+    int        nArgs;
+
+    nArgs = ev->NumArgs();
+    if (nArgs != 3 && nArgs != 4 && nArgs != 5) {
+        throw ScriptException("badplace requires 3, 4, or 5 arguments");
+    }
+
+    if (ev->NumArgs() >= 5) {
+        bp.m_fLifespan = ev->GetFloat(5);
+        if (bp.m_fLifespan <= 0) {
+            throw ScriptException("life span must be greater than 0");
+        }
+    }
+
+    if (ev->NumArgs() >= 4) {
+        switch (ev->GetConstString(4)) {
+        case STRING_ALLIES:
+        case STRING_AMERICAN:
+            bp.m_iTeamSide = TEAM_ALLIES;
+            break;
+        case STRING_AXIS:
+        case STRING_GERMAN:
+            bp.m_iTeamSide = TEAM_AXIS;
+            break;
+        default:
+            throw ScriptException("badplace must belong to 'american' or 'german' or 'both'");
+        }
+    }
+
+    bp.m_fRadius = ev->GetFloat(3);
+    bp.m_vOrigin = ev->GetVector(2);
+    bp.m_name    = ev->GetConstString(1);
+
+    if (bp.m_name == STRING_EMPTY && bp.m_fLifespan == FLT_MAX) {
+        throw ScriptException("unnamed badplaces must have a specified duration");
+    }
+
+    if (bp.m_name != STRING_EMPTY) {
+        int i;
+
+        // replace badplaces with the same name
+        for (i = 1; i <= m_badPlaces.NumObjects(); i++) {
+            const badplace_t& existing = m_badPlaces.ObjectAt(i);
+
+            if (existing.m_name == bp.m_name) {
+                // remove the existing bad place at the pathway
+                PathSearch::UpdatePathwaysForBadPlace(existing.m_vOrigin, existing.m_fRadius, -1, existing.m_iTeamSide);
+                m_badPlaces.SetObjectAt(i, bp);
+                // add the new bad place
+                PathSearch::UpdatePathwaysForBadPlace(bp.m_vOrigin, bp.m_fRadius, 1, bp.m_iTeamSide);
+                G_BroadcastAIEvent(NULL, vec_zero, 12, -1);
+                return;
+            }
+        }
+    }
+
+    // add the new bad place
+    m_badPlaces.AddObject(bp);
+    PathSearch::UpdatePathwaysForBadPlace(bp.m_vOrigin, bp.m_fRadius, 1, bp.m_iTeamSide);
+    // notify AI
+    G_BroadcastAIEvent(NULL, vec_zero, 12, -1);
 }
 
-void Level::EventRemoveBadPlace(Event* ev)
+void Level::EventRemoveBadPlace(Event *ev)
 {
-    // FIXME: unimplemented
+    const_str name;
+    int       i;
+
+    if (ev->NumArgs() != 1) {
+        throw ScriptException("removebadplace requires exactly 1 argument");
+    }
+
+    name = ev->GetConstString(1);
+    for (i = 1; i <= m_badPlaces.NumObjects(); i++) {
+        badplace_t& bp = m_badPlaces.ObjectAt(i);
+
+        if (bp.m_name == name) {
+            PathSearch::UpdatePathwaysForBadPlace(bp.m_vOrigin, bp.m_fRadius, -1, bp.m_iTeamSide);
+            m_badPlaces.RemoveObjectAt(i);
+            G_BroadcastAIEvent(NULL, vec_zero, 12, -1);
+            return;
+        }
+    }
+
+    Com_Printf("removebadplace: name '%s' not found", ev->GetString(1).c_str());
 }
 
-void Level::EventIgnoreClock(Event* ev)
+void Level::EventIgnoreClock(Event *ev)
 {
     m_bIgnoreClock = ev->GetBoolean(1);
 }
 
 void Level::UpdateBadPlaces()
 {
-    // FIXME: unimplemented
+    qboolean removed;
+    int      i;
+
+    removed = qfalse;
+
+    for (i = 1; i <= m_badPlaces.NumObjects(); i++) {
+        badplace_t& bp = m_badPlaces.ObjectAt(i);
+        if (level.time < bp.m_fLifespan) {
+            continue;
+        } else {
+            PathSearch::UpdatePathwaysForBadPlace(bp.m_vOrigin, bp.m_fRadius, -1, bp.m_iTeamSide);
+            m_badPlaces.RemoveObjectAt(i);
+            removed = qtrue;
+            i       = 0;
+        }
+    }
+
+    if (removed) {
+        // tell AI that a bad place was removed
+        G_BroadcastAIEvent(NULL, vec_zero, 12, -1);
+    }
 }
 
-badplace_t* Level::GetNearestBadPlace(const Vector& org, float radius) const
+int Level::GetNearestBadPlace(const Vector& org, float radius, int team) const
 {
-    // FIXME: unimplemented
-    return NULL;
+    float bestDistSqr;
+    int   bestBpIndex;
+    int   i;
+
+    bestDistSqr = FLT_MAX;
+    bestBpIndex = 0;
+
+    for (i = 1; i <= m_badPlaces.NumObjects(); i++) {
+        badplace_t& bp = m_badPlaces.ObjectAt(i);
+
+        if (team & bp.m_iTeamSide) {
+            const Vector delta   = bp.m_vOrigin - org;
+            float        distSqr = delta.lengthSquared();
+            float        rad     = bp.m_fRadius + radius;
+
+            if (distSqr < bestDistSqr && distSqr < rad * rad) {
+                bestDistSqr = distSqr;
+                bestBpIndex = i;
+            }
+        }
+    }
+
+    return bestBpIndex;
+}
+
+static void ArchiveBadPlace(Archiver& arc, badplace_t *bp)
+{
+    Director.ArchiveString(arc, bp->m_name);
+    arc.ArchiveVector(&bp->m_vOrigin);
+    arc.ArchiveFloat(&bp->m_fRadius);
+    arc.ArchiveFloat(&bp->m_fLifespan);
 }
 
 void Level::Archive(Archiver& arc)
@@ -1938,19 +2524,19 @@ void Level::Archive(Archiver& arc)
     Listener::Archive(arc);
 
     if (arc.Saving()) {
-        prespawn = classinfo()->WaitTillDefined("prespawn");
-        spawn    = classinfo()->WaitTillDefined("spawn");
+        prespawn = WaitTillDefined(STRING_PRESPAWN);
+        spawn    = WaitTillDefined(STRING_SPAWN);
     }
 
     arc.ArchiveBool(&prespawn);
     arc.ArchiveBool(&spawn);
 
     if (arc.Loading()) {
-        if (prespawn) {
+        if (!prespawn) {
             RemoveWaitTill(STRING_PRESPAWN);
         }
 
-        if (spawn) {
+        if (!spawn) {
             RemoveWaitTill(STRING_SPAWN);
         }
     }
@@ -2012,16 +2598,19 @@ void Level::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_letterbox_time_start);
 
     ArchiveEnum(m_letterbox_dir, letterboxdir_t);
+    m_badPlaces.Archive(arc, &ArchiveBadPlace);
     arc.ArchiveInteger(&m_iCuriousVoiceTime);
     arc.ArchiveInteger(&m_iAttackEntryAnimTime);
     arc.ArchiveInteger(&mHealthPopCount);
 
     arc.ArchiveBoolean(&m_bAlarm);
     arc.ArchiveBoolean(&mbNoDropHealth);
+    arc.ArchiveBoolean(&mbNoDropWeapons);
     arc.ArchiveInteger(&m_iPapersLevel);
     arc.ArchiveInteger(&m_LoopProtection);
 
-    memset(skel_index, 255, sizeof(skel_index));
+    // clear skel indexes
+    memset(skel_index, 0xff, sizeof(skel_index));
 
     if (arc.Loading()) {
         str saved = saved_soundtrack;
@@ -2035,8 +2624,16 @@ void Level::Archive(Archiver& arc)
         arc.ArchiveObjectPointer((Class **)&m_HeadSentient[i]);
     }
 
-    // FIXME: Archive Actor::mBodyQueue
-    // FIXME: Archive Actor::mCurBody
+    arc.ArchiveVector(&m_vObjectiveLocation);
+    arc.ArchiveVector(&m_vAlliedObjectiveLocation);
+    arc.ArchiveVector(&m_vAxisObjectiveLocation);
+
+    for (int i = 0; i < MAX_BODYQUEUE; i++) {
+        arc.ArchiveSafePointer(&Actor::mBodyQueue[i]);
+    }
+
+    arc.ArchiveInteger(&Actor::mCurBody);
+    Health::ArchiveStatic(arc);
 
     arc.ArchiveConfigString(CS_CURRENT_OBJECTIVE);
 
@@ -2053,4 +2650,117 @@ void Level::Archive(Archiver& arc)
     arc.ArchiveConfigString(CS_RAIN_WIDTH);
     arc.ArchiveConfigString(CS_RAIN_SHADER);
     arc.ArchiveConfigString(CS_RAIN_NUMSHADERS);
+
+    arc.ArchiveFloat(&svsStartFloatTime);
+    arc.ArchiveFloat(&m_fLandmarkYDistMax);
+    arc.ArchiveFloat(&m_fLandmarkYDistMin);
+    arc.ArchiveFloat(&m_fLandmarkXDistMin);
+    arc.ArchiveFloat(&m_fLandmarkXDistMax);
 }
+
+void WriteStatS(FILE *pFile, const char *value)
+{
+    fprintf(pFile, "%s", value);
+}
+
+void WriteStatI(FILE *pFile, int value)
+{
+    fprintf(pFile, "%d", value);
+}
+
+void WriteStatF(FILE *pFile, float value)
+{
+    fprintf(pFile, "%.2f", value);
+}
+
+void Level::OpenActorStats()
+{
+    str filename;
+
+    if (!g_aistats->integer) {
+        return;
+    }
+
+    filename   = "aistats_" + mapname + ".csv";
+    m_pAIStats = fopen(filename, "wt");
+
+    if (m_pAIStats) {
+        fprintf(
+            (FILE *)m_pAIStats,
+            "targetname,weapon,grenade ammo,health,accuracy,hearing,sight,fov,mindist,maxdist,leash,sound "
+            "awareness,noticescale,enemyshare,grenade aware,model\n"
+        );
+    }
+}
+
+void Level::WriteActorStats(Actor *actor)
+{
+    const char *name;
+    str         itemName;
+    Weapon     *weapon;
+    Ammo       *ammo;
+    int         ammoAmount;
+    FILE       *pFile;
+
+    if (!g_aistats->integer) {
+        return;
+    }
+
+    if (!m_pAIStats) {
+        OpenActorStats();
+    }
+
+    pFile = (FILE *)m_pAIStats;
+    if (!pFile) {
+        return;
+    }
+
+    name     = actor->TargetName().c_str();
+    itemName = "none";
+
+    weapon = actor->GetActiveWeapon(WEAPON_MAIN);
+    if (weapon) {
+        itemName = weapon->GetItemName();
+    }
+
+    ammoAmount = 0;
+    ammo       = actor->FindAmmoByName("grenade");
+    if (ammo) {
+        ammoAmount = ammo->getAmount();
+    }
+
+    WriteStatS(pFile, name);
+    WriteStatS(pFile, itemName);
+    WriteStatI(pFile, ammoAmount);
+    WriteStatF(pFile, actor->health);
+    WriteStatF(pFile, actor->mAccuracy * 100);
+    WriteStatF(pFile, actor->m_fHearing);
+    WriteStatF(pFile, actor->m_fSight);
+    WriteStatF(pFile, actor->m_fFov);
+    WriteStatF(pFile, actor->m_fMinDistance);
+    WriteStatF(pFile, actor->m_fMaxDistance);
+    WriteStatF(pFile, actor->m_fLeash);
+    WriteStatF(pFile, actor->m_fSoundAwareness);
+    WriteStatF(pFile, actor->m_fMaxNoticeTimeScale * 100);
+
+    WriteStatI(pFile, sqrt(actor->m_fMaxShareDistSquared));
+    WriteStatF(pFile, actor->m_fGrenadeAwareness);
+    WriteStatS(pFile, actor->model);
+
+    fprintf(pFile, "\n");
+}
+
+void Level::SetForceTeamObjectiveLocation(Event *ev)
+{
+    m_bForceTeamObjectiveLocation = ev->GetBoolean(1);
+}
+
+void Level::GetForceTeamObjectiveLocation(Event *ev)
+{
+    ev->AddInteger(g_gametype->integer >= GT_TOW || m_bForceTeamObjectiveLocation);
+}
+
+badplace_t::badplace_t()
+    : m_fLifespan(FLT_MAX)
+    , m_iTeamSide(TEAM_ALLIES)
+{}
diff --git a/code/fgame/level.h b/code/fgame/level.h
index 8b4128f0..5748b1e6 100644
--- a/code/fgame/level.h
+++ b/code/fgame/level.h
@@ -65,22 +65,26 @@ typedef struct earthquake_s {
 } earthquake_t;
 
 struct badplace_t {
-	const_str m_name;
-	int m_iTeamSide;
-	Vector m_vOrigin;
-	float m_fRadius;
-	float m_fNotBadPlaceTime;
+    const_str m_name;
+    int       m_iTeamSide;
+    Vector    m_vOrigin;
+    float     m_fRadius;
+    float     m_fLifespan;
+
+public:
+    badplace_t();
 };
 
 typedef struct {
-	str m_sName;
-	Vector m_vOrigin;
+    str    m_sName;
+    Vector m_vOrigin;
 } landmark_t;
 
 extern gclient_t *spawn_client;
 
 class Camera;
 class SimpleArchivedEntity;
+class Actor;
 
 class Level : public Listener
 {
@@ -111,8 +115,8 @@ public:
     int   svsTime;
     float svsFloatTime;
     int   svsStartTime;
-	int   svsEndTime;
-	float svsStartFloatTime; // Added in 2.0
+    int   svsEndTime;
+    float svsStartFloatTime; // Added in 2.0
 
     // Level name variables
     str level_name;
@@ -191,14 +195,15 @@ public:
     int m_numArenas;
 
     // Voting variables
-    float m_voteTime;
-    int   m_voteYes;
-    int   m_voteNo;
-    int   m_numVoters;
-	str   m_voteString;
+    int m_voteTime;
+    int m_nextVoteTime;
+    int m_voteYes;
+    int m_voteNo;
+    int m_numVoters;
     // Added in 2.0
-	str   m_voteCommand;
-	str   m_voteName;
+    str         m_voteString;
+    str         m_voteName;
+    VoteOptions m_voteOptions;
 
     // Intermission locations
     Vector m_intermission_origin;
@@ -220,33 +225,32 @@ public:
     int          num_earthquakes;
 
     // Objective stuff
-	Vector m_vObjectiveLocation;
-	Vector m_vAlliedObjectiveLocation; // Added in 2.0
-	Vector m_vAxisObjectiveLocation; // Added in 2.0
+    Vector m_vObjectiveLocation;
+    Vector m_vAlliedObjectiveLocation; // Added in 2.0
+    Vector m_vAxisObjectiveLocation;   // Added in 2.0
+    // Added in OPM
+    //  Forces axis/allied objectives location to be used
+    //  even if the gametype is not TOW
+    bool m_bForceTeamObjectiveLocation;
 
     // Current level state
     bool spawning;
-	bool m_bIgnoreClock;
+    bool m_bIgnoreClock;
     //====
     // Added in 2.30
     // Landmarks
-	float m_fLandmarkYDistMax;
-	float m_fLandmarkYDistMin;
-	float m_fLandmarkXDistMax;
-	float m_fLandmarkXDistMin;
-	landmark_t** m_pLandmarks;
-	int m_iMaxLandmarks;
-	int m_iLandmarksCount;
+    float        m_fLandmarkYDistMax;
+    float        m_fLandmarkYDistMin;
+    float        m_fLandmarkXDistMin;
+    float        m_fLandmarkXDistMax;
+    landmark_t **m_pLandmarks;
+    int          m_iMaxLandmarks;
+    int          m_iLandmarksCount;
     //====
-	void* m_pAIStats;
+    void *m_pAIStats;
 
     // New Stuff
 
-    // don't put in the game class because it can be changed in another level
-    qboolean specialgame;
-
-    bool m_bSpawnBot;
-
     // Script stuff
     bool m_bScriptSpawn;
     bool m_bRejectSpawn;
@@ -268,95 +272,95 @@ public:
     void       SetMap(const char *themapname);
     void       FindTeams();
 
-    void       SpawnEntities(char *entities, int _svsTime_);
+    void SpawnEntities(char *entities, int _svsTime_);
     //====
     // Added in 2.30
-    void       ComputeDMWaypoints();
-    void       AddLandmarkOrigin(const Vector& origin);
-    void       AddLandmarkName(const str& name, const Vector& origin);
-    void       FreeLandmarks();
-    str        GetDynamicDMLocations(const Vector& origin);
-    str        GetDMLocation(const Vector& origin);
+    void ComputeDMWaypoints();
+    void AddLandmarkOrigin(const Vector& origin);
+    void AddLandmarkName(const str& name, const Vector& origin);
+    void FreeLandmarks();
+    str  GetDynamicDMLocations(const Vector& origin);
+    str  GetDMLocation(const Vector& origin);
     //====
-    void       PreSpawnSentient(Event *ev);
-    void       ServerSpawned();
-    qboolean   inhibitEntity(int spawnflags);
+    void     PreSpawnSentient(Event *ev);
+    void     ServerSpawned();
+    qboolean inhibitEntity(int spawnflags);
 
-    void       setSkill(int value);
-    void       setTime(int _svsTime_);
-    void       setFrametime(int frameTime);
+    void setSkill(int value);
+    void setTime(int _svsTime_);
+    void setFrametime(int frameTime);
 
-    void       AddAutomaticCamera(Camera *cam);
+    void AddAutomaticCamera(Camera *cam);
 
-    void       GetTime(Event *ev);
-    void       GetTotalSecrets(Event *ev);
-    void       GetFoundSecrets(Event *ev);
+    void GetTime(Event *ev);
+    void GetTotalSecrets(Event *ev);
+    void GetFoundSecrets(Event *ev);
 
     //====
     // Added in 2.0
-    void       InitVoteOptions();
-    void       SendVoteOptionsFile(gentity_t* ent);
-    bool       GetVoteOptionMain(int index, str* outOptionCommand, voteoptiontype_t* outOptionType);
-    bool       GetVoteOptionSub(int index, int listIndex, str* outCommand);
-    bool       GetVoteOptionMainName(int index, str* outVoteName);
-	bool       GetVoteOptionSubName(int index, int listIndex, str* outName);
-	//====
-    void       CheckVote();
-    void       SetupMaplist(); // Added in 2.0
+    void InitVoteOptions();
+    void SendVoteOptionsFile(gentity_t *ent);
+    bool GetVoteOptionMain(int index, str *outOptionCommand, voteoptiontype_t *outOptionType);
+    bool GetVoteOptionSub(int index, int listIndex, str *outCommand);
+    bool GetVoteOptionMainName(int index, str *outVoteName);
+    bool GetVoteOptionSubName(int index, int listIndex, str *outName);
+    //====
+    void CheckVote();
+    void SetupMaplist(); // Added in 2.0
 
-    void       GetAlarm(Event *ev);
-    void       SetAlarm(Event *ev);
-    void       SetNoDropHealth(Event *ev);
-    void       SetNoDropWeapons(Event *ev); // Added in 2.0
-    void       GetLoopProtection(Event *ev);
-    void       SetLoopProtection(Event *ev);
-    void       GetPapersLevel(Event *ev);
-    void       SetPapersLevel(Event *ev);
-    void       EventGetRoundStarted(Event *ev);
-    void       EventGetDMRespawning(Event *ev);
-    void       EventSetDMRespawning(Event *ev);
-    void       EventGetDMRoundLimit(Event *ev);
-    void       EventSetDMRoundLimit(Event *ev);
-    void       EventGetClockSide(Event *ev);
-    void       EventSetClockSide(Event *ev);
-    void       EventGetBombPlantTeam(Event *ev);
-    void       EventSetBombPlantTeam(Event *ev);
-    void       EventGetTargetsToDestroy(Event *ev);
-    void       EventSetTargetsToDestroy(Event *ev);
-    void       EventGetTargetsDestroyed(Event *ev);
-    void       EventSetTargetsDestroyed(Event *ev);
-    void       EventGetBombsPlanted(Event *ev);
-    void       EventSetBombsPlanted(Event *ev);
-    void       EventGetRoundBased(Event *ev);
-    void       EventGetObjectiveBased(Event *ev);
-    void       EventRainDensitySet(Event *ev);
-    void       EventRainDensityGet(Event *ev);
-    void       EventRainSpeedSet(Event *ev);
-    void       EventRainSpeedGet(Event *ev);
-    void       EventRainSpeedVarySet(Event *ev);
-    void       EventRainSpeedVaryGet(Event *ev);
-    void       EventRainSlantSet(Event *ev);
-    void       EventRainSlantGet(Event *ev);
-    void       EventRainLengthSet(Event *ev);
-    void       EventRainLengthGet(Event *ev);
-    void       EventRainMin_DistSet(Event *ev);
-    void       EventRainMin_DistGet(Event *ev);
-    void       EventRainWidthSet(Event *ev);
-    void       EventRainWidthGet(Event *ev);
-    void       EventRainShaderSet(Event *ev);
-    void       EventRainShaderGet(Event *ev);
-    void       EventRainNumShadersSet(Event *ev);
-    void       EventRainNumShadersGet(Event *ev);
+    void GetAlarm(Event *ev);
+    void SetAlarm(Event *ev);
+    void SetNoDropHealth(Event *ev);
+    void SetNoDropWeapons(Event *ev); // Added in 2.0
+    void GetLoopProtection(Event *ev);
+    void SetLoopProtection(Event *ev);
+    void GetPapersLevel(Event *ev);
+    void SetPapersLevel(Event *ev);
+    void EventGetRoundStarted(Event *ev);
+    void EventGetDMRespawning(Event *ev);
+    void EventSetDMRespawning(Event *ev);
+    void EventGetDMRoundLimit(Event *ev);
+    void EventSetDMRoundLimit(Event *ev);
+    void EventGetClockSide(Event *ev);
+    void EventSetClockSide(Event *ev);
+    void EventGetBombPlantTeam(Event *ev);
+    void EventSetBombPlantTeam(Event *ev);
+    void EventGetTargetsToDestroy(Event *ev);
+    void EventSetTargetsToDestroy(Event *ev);
+    void EventGetTargetsDestroyed(Event *ev);
+    void EventSetTargetsDestroyed(Event *ev);
+    void EventGetBombsPlanted(Event *ev);
+    void EventSetBombsPlanted(Event *ev);
+    void EventGetRoundBased(Event *ev);
+    void EventGetObjectiveBased(Event *ev);
+    void EventRainDensitySet(Event *ev);
+    void EventRainDensityGet(Event *ev);
+    void EventRainSpeedSet(Event *ev);
+    void EventRainSpeedGet(Event *ev);
+    void EventRainSpeedVarySet(Event *ev);
+    void EventRainSpeedVaryGet(Event *ev);
+    void EventRainSlantSet(Event *ev);
+    void EventRainSlantGet(Event *ev);
+    void EventRainLengthSet(Event *ev);
+    void EventRainLengthGet(Event *ev);
+    void EventRainMin_DistSet(Event *ev);
+    void EventRainMin_DistGet(Event *ev);
+    void EventRainWidthSet(Event *ev);
+    void EventRainWidthGet(Event *ev);
+    void EventRainShaderSet(Event *ev);
+    void EventRainShaderGet(Event *ev);
+    void EventRainNumShadersSet(Event *ev);
+    void EventRainNumShadersGet(Event *ev);
     //====
     // Added in 2.0
-    void       EventAddBadPlace(Event *ev);
-    void       EventRemoveBadPlace(Event *ev);
-    void       EventIgnoreClock(Event *ev);
-    void       UpdateBadPlaces();
-    badplace_t *GetNearestBadPlace(const Vector& org, float radius) const;
+    void EventAddBadPlace(Event *ev);
+    void EventRemoveBadPlace(Event *ev);
+    void EventIgnoreClock(Event *ev);
+    void UpdateBadPlaces();
+    int  GetNearestBadPlace(const Vector& org, float radius, int team) const;
     //====
-    str        GetRandomHeadModel(const char *model);
-    str        GetRandomHeadSkin(const char *model);
+    str GetRandomHeadModel(const char *model);
+    str GetRandomHeadSkin(const char *model);
 
     bool RoundStarted();
     bool PreSpawned(void);
@@ -365,6 +369,15 @@ public:
     void AddEarthquake(earthquake_t *);
     void DoEarthquakes(void);
 
+    void OpenActorStats();
+    void WriteActorStats(Actor *actor);
+
+    //====
+    // Added in OPM
+    void SetForceTeamObjectiveLocation(Event *ev);
+    void GetForceTeamObjectiveLocation(Event *ev);
+    //====
+
     void Archive(Archiver& arc) override;
 };
 
@@ -372,7 +385,7 @@ public:
 void G_BeginIntermission2(void);
 
 // Change the current map to the specified map with the possibility to fade the screen with fadetime.
-void G_BeginIntermission(const char* map_name, INTTYPE_e transtype, bool no_fade = false);
+void G_BeginIntermission(const char *map_name, INTTYPE_e transtype, bool no_fade = false);
 
 //Exit the intermission screen.
 void G_ExitIntermission(void);
diff --git a/code/fgame/light.h b/code/fgame/light.h
index 9bbcaa66..08d5ac87 100644
--- a/code/fgame/light.h
+++ b/code/fgame/light.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // light.h: Classes for creating and controlling lights.
 // 
 
-#ifndef __LIGHT_H__
-#define __LIGHT_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -36,5 +35,3 @@ class Light : public Entity
 		
 								Light();
 	};
-
-#endif /* light.h */
diff --git a/code/fgame/lodthing.cpp b/code/fgame/lodthing.cpp
index cb56c2cd..b9a68ff8 100644
--- a/code/fgame/lodthing.cpp
+++ b/code/fgame/lodthing.cpp
@@ -129,6 +129,9 @@ void LODMaster::Spawn
 	gi.cvar_set( "lod_tool", "1" );
 
 	ent = g_entities->entity;
+    if (!ent) {
+        return;
+    }
 
 	if( ent->IsSubclassOfPlayer() )
 	{
@@ -190,8 +193,7 @@ void LODMaster::PassEvent
 		ScriptError( "No LOD Model" );
 	}
 
-	Event *event = new Event( ev );
-	m_current->ProcessEvent( event );
+	m_current->ProcessEvent(*ev);
 }
 
 CLASS_DECLARATION( Animate, LODSlave, "lodslave" )
diff --git a/code/fgame/misc.cpp b/code/fgame/misc.cpp
index f5e6b907..14eb47ac 100644
--- a/code/fgame/misc.cpp
+++ b/code/fgame/misc.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // own file to my mother's pot roast recipes.
 //
 
-#include "glb_local.h"
+#include "g_local.h"
 #include "entity.h"
 #include "trigger.h"
 #include "explosion.h"
@@ -38,6 +38,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "weaputils.h"
 #include "g_spawn.h"
 #include "g_phys.h"
+#include "../script/scriptexception.h"
 
 /*****************************************************************************/
 /*QUAKED detail (0.5 0 1.0) ?
@@ -60,31 +61,28 @@ Used for lighting and such
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, FuncRemove, "func_remove" )
-	{
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, FuncRemove, "func_remove") {
+    {NULL, NULL}
+};
 
 FuncRemove::FuncRemove()
-	{
-	PostEvent( EV_Remove, EV_REMOVE );
-	}
+{
+    PostEvent(EV_Remove, EV_REMOVE);
+}
 
 /*****************************************************************************/
 /*QUAKED misc_model (1 0.5 1) (0 0 0) (0 0 0)
 "model"     arbitrary .tik file to display
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, MiscModel, "misc_model" )
-	{
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, MiscModel, "misc_model") {
+    {NULL, NULL}
+};
 
 MiscModel::MiscModel()
-	{
-	PostEvent( EV_Remove, EV_REMOVE );
-	}
-
+{
+    PostEvent(EV_Remove, EV_REMOVE);
+}
 
 /*****************************************************************************/
 /*QUAKED info_null (0 0.5 0) (-4 -4 -4) (4 4 4)
@@ -93,15 +91,14 @@ Used as a positional target for spotlights, etc.
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, InfoNull, "info_null" )
-	{
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Listener, InfoNull, "info_null") {
+    {NULL, NULL}
+};
 
 InfoNull::InfoNull()
-	{
-	PostEvent( EV_Remove, EV_REMOVE );
-	}
+{
+    PostEvent(EV_Remove, EV_REMOVE);
+}
 
 /*****************************************************************************/
 /*QUAKED info_notnull (0 0.5 0) (-4 -4 -4) (4 4 4)
@@ -110,12 +107,9 @@ Used as a positional target for lightning.
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, InfoNotNull, "info_notnull" )
-	{
-		{ NULL, NULL }
-	};
-
-
+CLASS_DECLARATION(Entity, InfoNotNull, "info_notnull") {
+    {NULL, NULL}
+};
 
 /*****************************************************************************/
 /*QUAKED func_explodingwall (0 0.25 0.5) ? RANDOMANGLES LANDSHATTER NOT_PLAYERS MONSTERS PROJECTILES INVISIBLE ACCUMALATIVE TWOSTAGE
@@ -144,539 +138,459 @@ If MONSTERS is set, the trigger will respond to monsters
 If PROJECTILES is set, the trigger will respond to projectiles (rockets, grenades, etc.)
 
 ******************************************************************************/
-#define RANDOMANGLES ( 1 << 0 )
-#define LANDSHATTER  ( 1 << 1 )
-#define INVISIBLE    ( 1 << 5 )
-#define ACCUMULATIVE ( 1 << 6 )
-#define TWOSTAGE     ( 1 << 7 )
+#define RANDOMANGLES (1 << 0)
+#define LANDSHATTER  (1 << 1)
+#define INVISIBLE    (1 << 5)
+#define ACCUMULATIVE (1 << 6)
+#define TWOSTAGE     (1 << 7)
 
 Event EV_ExplodingWall_StopRotating
-	( 
-	"stoprotating",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Stop rotating the wall.",
-	EV_NORMAL
-	);
+(
+    "stoprotating", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop rotating the wall.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_OnGround
-	( 
-	"checkonground",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Check if exploding wall is on ground.",
-	EV_NORMAL
-	);
+(
+    "checkonground", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Check if exploding wall is on ground.",
+    EV_NORMAL
+
+);
 Event EV_ExplodingWall_AngleSpeed
-	( 
-	"anglespeed",
-	EV_DEFAULT,
-   "f",
-   "speed",
-   "Set the angle speed.",
-	EV_NORMAL
-	);
+(
+    "anglespeed", EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the angle speed.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_LandRadius
-	( 
-	"land_radius",
-	EV_DEFAULT,
-   "f",
-   "radius",
-   "Set the land radius.",
-	EV_NORMAL
-	);
+(
+    "land_radius", EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the land radius.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_LandAngles
-	( 
-	"land_angles",
-	EV_DEFAULT,
-   "v",
-   "angles",
-   "Set the land angles.",
-	EV_NORMAL
-	);
+(
+    "land_angles", EV_DEFAULT,
+    "v",
+    "angles",
+    "Set the land angles.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_BaseVelocity
-	( 
-	"base_velocity",
-	EV_DEFAULT,
-   "v",
-   "velocity",
-   "Set the base velocity.",
-	EV_NORMAL
-	);
-Event EV_ExplodingWall_RandomVelocity
-	( 
-	"random_velocity",
-	EV_DEFAULT,
-   "v",
-   "velocity",
-   "Set the amount of random variation of the base velocity.",
-	EV_NORMAL
-	);
+(
+    "base_velocity", EV_DEFAULT,
+    "v",
+    "velocity",
+    "Set the base velocity.",
+    EV_NORMAL
+);
+Event EV_ExplodingWall_RandomVelocity(
+    "random_velocity",
+    EV_DEFAULT,
+    "v",
+    "velocity",
+    "Set the amount of random variation of the base velocity.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_SetDmg
-	( 
-	"dmg",
-	EV_DEFAULT,
-   "i",
-   "dmg",
-   "Set the damage from the exploding wall.",
-	EV_NORMAL
-	);
+(
+    "dmg", EV_DEFAULT,
+    "i",
+    "dmg",
+    "Set the damage from the exploding wall.",
+    EV_NORMAL
+);
 Event EV_ExplodingWall_SetExplosions
-	( 
-	"explosions",
-	EV_DEFAULT,
-   "i",
-   "explosions",
-   "Set the number of explosions.",
-	EV_NORMAL
-	);
+(
+    "explosions", EV_DEFAULT,
+    "i",
+    "explosions",
+    "Set the number of explosions.",
+    EV_NORMAL
+
+);
 Event EV_ExplodingWall_Setup
-	( 
-	"setup",
-   EV_CODEONLY,
-   NULL,
-   NULL,
-   "Initializes the exploding wall.",
-	EV_NORMAL
-	);
+(
+    "setup", EV_CODEONLY,
+    NULL,
+    NULL,
+    "Initializes the exploding wall.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Trigger, ExplodingWall, "func_explodingwall" )
-	{
-		{ &EV_ExplodingWall_Setup,				&ExplodingWall::Setup },
-		{ &EV_Trigger_Effect,					&ExplodingWall::Explode },
-		{ &EV_Damage,							&ExplodingWall::DamageEvent },
-		{ &EV_Touch,							&ExplodingWall::TouchFunc },
-		{ &EV_ExplodingWall_StopRotating,		&ExplodingWall::StopRotating },
-		{ &EV_ExplodingWall_OnGround,			&ExplodingWall::CheckOnGround },
-      { &EV_ExplodingWall_AngleSpeed,			&ExplodingWall::AngleSpeed },
-      { &EV_ExplodingWall_LandRadius,			&ExplodingWall::LandRadius },
-      { &EV_ExplodingWall_LandAngles,			&ExplodingWall::LandAngles },
-      { &EV_ExplodingWall_BaseVelocity,			&ExplodingWall::BaseVelocity },
-      { &EV_ExplodingWall_RandomVelocity,		&ExplodingWall::RandomVelocity },
-      { &EV_ExplodingWall_SetDmg,				&ExplodingWall::SetDmg },
-      { &EV_ExplodingWall_SetExplosions,		&ExplodingWall::SetExplosions },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Trigger, ExplodingWall, "func_explodingwall") {
+    {&EV_ExplodingWall_Setup,          &ExplodingWall::Setup         },
+    {&EV_Trigger_Effect,               &ExplodingWall::Explode       },
+    {&EV_Damage,                       &ExplodingWall::DamageEvent   },
+    {&EV_Touch,                        &ExplodingWall::TouchFunc     },
+    {&EV_ExplodingWall_StopRotating,   &ExplodingWall::StopRotating  },
+    {&EV_ExplodingWall_OnGround,       &ExplodingWall::CheckOnGround },
+    {&EV_ExplodingWall_AngleSpeed,     &ExplodingWall::AngleSpeed    },
+    {&EV_ExplodingWall_LandRadius,     &ExplodingWall::LandRadius    },
+    {&EV_ExplodingWall_LandAngles,     &ExplodingWall::LandAngles    },
+    {&EV_ExplodingWall_BaseVelocity,   &ExplodingWall::BaseVelocity  },
+    {&EV_ExplodingWall_RandomVelocity, &ExplodingWall::RandomVelocity},
+    {&EV_ExplodingWall_SetDmg,         &ExplodingWall::SetDmg        },
+    {&EV_ExplodingWall_SetExplosions,  &ExplodingWall::SetExplosions },
+    {NULL,                             NULL                          }
+};
 
-void ExplodingWall::AngleSpeed
-   (
-   Event *ev
-   )
+void ExplodingWall::AngleSpeed(Event *ev)
+{
+    angle_speed = ev->GetFloat(1);
+}
 
-   {
-   angle_speed = ev->GetFloat( 1 );
-   }
+void ExplodingWall::LandRadius(Event *ev)
+{
+    land_radius = ev->GetFloat(1);
+}
 
-void ExplodingWall::LandRadius
-   (
-   Event *ev
-   )
+void ExplodingWall::LandAngles(Event *ev)
+{
+    land_angles = ev->GetVector(1);
+}
 
-   {
-   land_radius = ev->GetFloat( 1 );
-   }
+void ExplodingWall::BaseVelocity(Event *ev)
+{
+    base_velocity = ev->GetVector(1);
+}
 
-void ExplodingWall::LandAngles
-   (
-   Event *ev
-   )
+void ExplodingWall::RandomVelocity(Event *ev)
+{
+    random_velocity = ev->GetVector(1);
+}
 
-   {
-   land_angles = ev->GetVector( 1 );
-   }
+void ExplodingWall::SetDmg(Event *ev)
+{
+    dmg = ev->GetInteger(1);
+}
 
-void ExplodingWall::BaseVelocity
-   (
-   Event *ev
-   )
+void ExplodingWall::SetExplosions(Event *ev)
+{
+    explosions = ev->GetInteger(1);
+}
 
-   {
-   base_velocity = ev->GetVector( 1 );
-   }
+void ExplodingWall::Explode(Event *ev)
+{
+    Entity *other;
+    Vector  pos;
+    Vector  mins, maxs;
+    int     i;
 
-void ExplodingWall::RandomVelocity
-   (
-   Event *ev
-   )
+    if (spawnflags & INVISIBLE) {
+        showModel();
+        setSolidType(SOLID_BSP);
+        takedamage = DAMAGE_YES;
+    }
 
-   {
-   random_velocity = ev->GetVector( 1 );
-   }
+    if (takedamage == DAMAGE_NO) {
+        return;
+    }
 
-void ExplodingWall::SetDmg
-   (
-   Event *ev
-   )
+    other = ev->GetEntity(1);
 
-   {
-   dmg = ev->GetInteger( 1 );
-   }
+    health     = 0;
+    takedamage = DAMAGE_NO;
 
-void ExplodingWall::SetExplosions
-   (
-   Event *ev
-   )
+    // Create explosions
+    for (i = 0; i < explosions; i++) {
+        pos[0] = absmin[0] + G_Random(size[0]);
+        pos[1] = absmin[1] + G_Random(size[1]);
+        pos[2] = absmin[2] + G_Random(size[2]);
 
-   {
-   explosions = ev->GetInteger( 1 );
-   }
+        CreateExplosion(pos, dmg, this, other, this);
+    }
 
-void ExplodingWall::Explode
-	(
-	Event *ev
-	)
+    // throw itself
+    state     = 1;
+    on_ground = false;
+    PostEvent(EV_ExplodingWall_OnGround, FRAMETIME);
 
-	{
-	Entity		*other;
-	Vector		pos;
-   Vector      mins, maxs;
-	int			i;
+    velocity.x = base_velocity.x + G_CRandom(random_velocity.x);
+    velocity.y = base_velocity.y + G_CRandom(random_velocity.y);
+    velocity.z = base_velocity.z + G_Random(random_velocity.z);
 
-   if ( spawnflags & INVISIBLE )
-      {
-	   showModel();
-	   setSolidType( SOLID_BSP );
-   	takedamage = DAMAGE_YES;
-      }
+    setMoveType(MOVETYPE_BOUNCE);
+    setSolidType(SOLID_BBOX);
+    if (spawnflags & RANDOMANGLES) {
+        avelocity[0] = G_Random(angle_speed);
+        avelocity[1] = G_Random(angle_speed);
+        avelocity[2] = G_Random(angle_speed);
+    } else {
+        Vector delta;
+        float  most;
+        float  time;
+        int    t;
 
-	if ( takedamage == DAMAGE_NO )
-		{
-		return;
-		}
+        delta = land_angles - angles;
+        if (delta[0] > 180) {
+            delta[0] -= 360;
+        }
+        if (delta[0] < -180) {
+            delta[0] += 360;
+        }
+        if (delta[1] > 180) {
+            delta[1] -= 360;
+        }
+        if (delta[1] < -180) {
+            delta[1] += 360;
+        }
+        if (delta[2] > 180) {
+            delta[2] -= 360;
+        }
+        if (delta[2] < -180) {
+            delta[2] += 360;
+        }
+        most = MaxValue(delta);
+        if (!angle_speed) {
+            angle_speed = 1;
+        }
+        t         = 10 * most / angle_speed;
+        time      = (float)t / 10;
+        delta     = delta * (1.0 / time);
+        avelocity = delta;
+        PostEvent(EV_ExplodingWall_StopRotating, time);
+        state = 2;
+    }
 
-	other = ev->GetEntity( 1 );
+    ActivateTargets(ev);
 
-	health = 0;
-	takedamage = DAMAGE_NO;
+    if (land_radius > 0) {
+        mins[0] = mins[1] = mins[2] = -land_radius;
+        maxs[0] = maxs[1] = maxs[2] = land_radius;
+        setSize(mins, maxs);
+    }
 
-	// Create explosions
-	for( i = 0; i < explosions; i++ )
-		{
-		pos[ 0 ] = absmin[ 0 ] + G_Random( size[ 0 ] );
-		pos[ 1 ] = absmin[ 1 ] + G_Random( size[ 1 ] );
-		pos[ 2 ] = absmin[ 2 ] + G_Random( size[ 2 ] );
+    attack_finished = 0;
+}
 
-		CreateExplosion( pos, dmg, this, other, this );
-		}
+void ExplodingWall::DamageEvent(Event *ev)
+{
+    Event  *event;
+    Entity *inflictor;
+    Entity *attacker;
+    int     damage;
 
-	// throw itself
-   state = 1;
-   on_ground = false;
-   PostEvent( EV_ExplodingWall_OnGround, FRAMETIME );
+    if (takedamage == DAMAGE_NO) {
+        return;
+    }
 
-   velocity.x = base_velocity.x + G_CRandom( random_velocity.x );
-   velocity.y = base_velocity.y + G_CRandom( random_velocity.y );
-   velocity.z = base_velocity.z + G_Random( random_velocity.z );
+    if (on_ground) {
+        GroundDamage(ev);
+        return;
+    }
 
-	setMoveType( MOVETYPE_BOUNCE );
-	setSolidType( SOLID_BBOX );
-   if ( spawnflags & RANDOMANGLES )
-      {
-	   avelocity[ 0 ] = G_Random( angle_speed );
-	   avelocity[ 1 ] = G_Random( angle_speed );
-	   avelocity[ 2 ] = G_Random( angle_speed );
-      }
-   else
-      {
-      Vector delta;
-      float most;
-      float time;
-      int   t;
+    attacker  = ev->GetEntity(1);
+    damage    = ev->GetInteger(2);
+    inflictor = ev->GetEntity(3);
 
-      delta = land_angles - angles;
-      if ( delta[ 0 ] > 180 )
-         delta[ 0 ] -= 360;
-      if ( delta[ 0 ] < -180 )
-         delta[ 0 ] += 360;
-      if ( delta[ 1 ] > 180 )
-         delta[ 1 ] -= 360;
-      if ( delta[ 1 ] < -180 )
-         delta[ 1 ] += 360;
-      if ( delta[ 2 ] > 180 )
-         delta[ 2 ] -= 360;
-      if ( delta[ 2 ] < -180 )
-         delta[ 2 ] += 360;
-      most = MaxValue( delta );
-      if ( !angle_speed )
-         angle_speed = 1;
-      t = 10 * most / angle_speed;
-      time = (float)t / 10;
-      delta = delta * (1.0/time);
-      avelocity = delta;
-      PostEvent( EV_ExplodingWall_StopRotating, time );
-      state = 2;
-      }
+    if (spawnflags & ACCUMULATIVE) {
+        health -= damage;
+        if (health > 0) {
+            return;
+        }
+    } else {
+        if (damage < health) {
+            return;
+        }
+    }
 
-	ActivateTargets( ev );
+    event = new Event(EV_Activate);
+    event->AddEntity(attacker);
+    ProcessEvent(event);
+}
 
-   if ( land_radius > 0 )
-      {
-      mins[0] = mins[1] = mins[2] = -land_radius;
-      maxs[0] = maxs[1] = maxs[2] = land_radius;
-	   setSize( mins, maxs );
-      }
+void ExplodingWall::GroundDamage(Event *ev)
+{
+    Entity *inflictor;
+    Entity *attacker;
+    Vector  pos;
+    int     damage;
 
-	attack_finished = 0;
-	}
+    if (takedamage == DAMAGE_NO) {
+        return;
+    }
 
-void ExplodingWall::DamageEvent
-	(
-	Event *ev
-	)
+    damage    = ev->GetInteger(1);
+    inflictor = ev->GetEntity(2);
+    attacker  = ev->GetEntity(3);
 
-	{
-	Event			*event;
-	Entity		*inflictor;
-	Entity		*attacker;
-	int			damage;
+    if (spawnflags & ACCUMULATIVE) {
+        health -= damage;
+        if (health > 0) {
+            return;
+        }
+    } else {
+        if (damage < health) {
+            return;
+        }
+    }
 
-	if ( takedamage == DAMAGE_NO )
-		{
-		return;
-		}
+    if (explosions) {
+        pos[0] = absmin[0] + G_Random(size[0]);
+        pos[1] = absmin[1] + G_Random(size[1]);
+        pos[2] = absmin[2] + G_Random(size[2]);
 
-   if ( on_ground )
-      {
-      GroundDamage( ev );
-      return;
-      }
+        CreateExplosion(pos, damage, this, attacker, this);
+    }
+    takedamage = DAMAGE_NO;
+    hideModel();
+    BroadcastAIEvent();
+    PostEvent(EV_Remove, 0);
+}
 
-   attacker		= ev->GetEntity( 1 );
-	damage		= ev->GetInteger( 2 );
-	inflictor	= ev->GetEntity( 3 );
+void ExplodingWall::SetupSecondStage(void)
+{
+    health     = max_health;
+    takedamage = DAMAGE_YES;
+}
 
-   if ( spawnflags & ACCUMULATIVE )
-      {
-      health -= damage;
-      if ( health > 0 )
-         return;
-      }
-   else
-      {
-	   if ( damage < health )
-		   {
-		   return;
-		   }
-      }
+void ExplodingWall::StopRotating(Event *ev)
+{
+    avelocity = vec_zero;
+    setAngles(land_angles);
+    if (spawnflags & TWOSTAGE) {
+        SetupSecondStage();
+    }
+}
 
-	event = new Event( EV_Activate );
-	event->AddEntity( attacker );
-	ProcessEvent( event );
-	}
+void ExplodingWall::CheckOnGround(Event *ev)
+{
+    if ((velocity == vec_zero) && groundentity) {
+        Vector delta;
+        float  most;
+        float  time;
+        int    t;
 
-void ExplodingWall::GroundDamage
-	(
-	Event *ev
-	)
+        delta = land_angles - angles;
+        if (delta.length() > 1) {
+            if (delta[0] > 180) {
+                delta[0] -= 360;
+            }
+            if (delta[0] < -180) {
+                delta[0] += 360;
+            }
+            if (delta[1] > 180) {
+                delta[1] -= 360;
+            }
+            if (delta[1] < -180) {
+                delta[1] += 360;
+            }
+            if (delta[2] > 180) {
+                delta[2] -= 360;
+            }
+            if (delta[2] < -180) {
+                delta[2] += 360;
+            }
+            most = MaxValue(delta);
+            if (angle_speed > 3) {
+                t = 10.0f * most / (angle_speed / 3);
+            } else {
+                t = 10.0f * most;
+            }
+            time      = (float)t / 10;
+            delta     = delta * (1.0 / time);
+            avelocity = delta;
+            PostEvent(EV_ExplodingWall_StopRotating, time);
+        }
+        state = 2;
+        setSize(orig_mins, orig_maxs);
+        on_ground = true;
+    } else {
+        PostEvent(ev, FRAMETIME);
+    }
+}
 
-	{
-	Entity		*inflictor;
-	Entity		*attacker;
-	Vector		pos;
-	int			damage;
+void ExplodingWall::TouchFunc(Event *ev)
+{
+    Entity *other;
 
-	if ( takedamage == DAMAGE_NO )
-		{
-		return;
-		}
+    if ((velocity == vec_zero) || (level.time < attack_finished)) {
+        return;
+    }
 
-	damage		= ev->GetInteger( 1 );
-	inflictor	= ev->GetEntity( 2 );
-	attacker		= ev->GetEntity( 3 );
+    other = ev->GetEntity(1);
 
-   if ( spawnflags & ACCUMULATIVE )
-      {
-      health -= damage;
-      if ( health > 0 )
-         return;
-      }
-   else
-      {
-	   if ( damage < health )
-		   {
-		   return;
-		   }
-      }
+    if ((spawnflags & LANDSHATTER) && (other == world)) {
+        Vector pos;
 
-   if ( explosions )
-      {
-		pos[ 0 ] = absmin[ 0 ] + G_Random( size[ 0 ] );
-		pos[ 1 ] = absmin[ 1 ] + G_Random( size[ 1 ] );
-		pos[ 2 ] = absmin[ 2 ] + G_Random( size[ 2 ] );
+        takedamage = DAMAGE_NO;
 
-		CreateExplosion( pos, damage, this, attacker, this );
-      }
-   takedamage = DAMAGE_NO;
-   hideModel();
-   BroadcastAIEvent();
-   PostEvent( EV_Remove, 0 );
-	}
+        if (explosions) {
+            pos[0] = absmin[0] + G_Random(size[0]);
+            pos[1] = absmin[1] + G_Random(size[1]);
+            pos[2] = absmin[2] + G_Random(size[2]);
 
-void ExplodingWall::SetupSecondStage
-	(
-   void
-	)
+            CreateExplosion(pos, dmg, this, other, this);
+        }
+        hideModel();
+        BroadcastAIEvent();
+        PostEvent(EV_Remove, 0);
+        return;
+    }
 
-	{
-   health = max_health;
-	takedamage = DAMAGE_YES;
-	}
+    if (other->takedamage) {
+        other->Damage(this, activator, dmg, origin, vec_zero, vec_zero, 20, 0, MOD_EXPLODEWALL);
+        Sound("debris_generic", CHAN_WEAPON);
+        attack_finished = level.time + FRAMETIME;
+    }
+}
 
-void ExplodingWall::StopRotating
-	(
-	Event *ev
-	)
+void ExplodingWall::Setup(Event *ev)
+{
+    if (spawnflags & INVISIBLE) {
+        if (Targeted()) {
+            takedamage = DAMAGE_YES;
+        } else {
+            takedamage = DAMAGE_NO;
+        }
+        hideModel();
+        setSolidType(SOLID_NOT);
+    } else {
+        showModel();
+        setSolidType(SOLID_BSP);
+        takedamage = DAMAGE_YES;
+    }
 
-	{
-   avelocity = vec_zero;
-   setAngles( land_angles );
-   if ( spawnflags & TWOSTAGE )
-      SetupSecondStage();
-	}
-
-void ExplodingWall::CheckOnGround
-	(
-	Event *ev
-	)
-
-	{
-   if ( ( velocity == vec_zero ) && groundentity )
-      {
-      Vector delta;
-      float most;
-      float time;
-      int   t;
-
-      delta = land_angles - angles;
-      if ( delta.length() > 1 )
-         {
-         if ( delta[ 0 ] > 180 )
-            delta[ 0 ] -= 360;
-         if ( delta[ 0 ] < -180 )
-            delta[ 0 ] += 360;
-         if ( delta[ 1 ] > 180 )
-            delta[ 1 ] -= 360;
-         if ( delta[ 1 ] < -180 )
-            delta[ 1 ] += 360;
-         if ( delta[ 2 ] > 180 )
-            delta[ 2 ] -= 360;
-         if ( delta[ 2 ] < -180 )
-            delta[ 2 ] += 360;
-         most = MaxValue( delta );
-         if ( angle_speed > 3 )
-            t = 10.0f * most / ( angle_speed / 3 );
-         else
-            t = 10.0f * most;
-         time = (float)t / 10;
-         delta = delta * (1.0/time);
-         avelocity = delta;
-         PostEvent( EV_ExplodingWall_StopRotating, time );
-         }
-      state = 2;
-	   setSize( orig_mins, orig_maxs );
-      on_ground = true;
-      }
-   else
-      PostEvent( ev, FRAMETIME );
-	}
-
-void ExplodingWall::TouchFunc
-	(
-	Event *ev
-	)
-
-	{
-	Entity *other;
-
-	if ( ( velocity == vec_zero ) || ( level.time < attack_finished ) )
-		{
-		return;
-		}
-
-   other = ev->GetEntity( 1 );
-
-   if ( ( spawnflags & LANDSHATTER ) && ( other == world ) )
-      {
-      Vector pos;
-
-   	takedamage = DAMAGE_NO;
-
-      if ( explosions )
-         {
-		   pos[ 0 ] = absmin[ 0 ] + G_Random( size[ 0 ] );
-		   pos[ 1 ] = absmin[ 1 ] + G_Random( size[ 1 ] );
-		   pos[ 2 ] = absmin[ 2 ] + G_Random( size[ 2 ] );
-
-		   CreateExplosion( pos, dmg, this, other, this );
-         }
-      hideModel();
-	  BroadcastAIEvent();
-      PostEvent( EV_Remove, 0 );
-      return;
-      }
-
-	if ( other->takedamage )
-		{
-      other->Damage( this, activator, dmg, origin, vec_zero, vec_zero, 20, 0, MOD_EXPLODEWALL );
-		Sound( "debris_generic", CHAN_WEAPON );
-		attack_finished = level.time + FRAMETIME;
-		}
-	}
-
-void ExplodingWall::Setup
-   (
-   Event *ev
-   )
-
-	{
-   if ( spawnflags & INVISIBLE )
-      {
-	   if ( Targeted() )
-   	  	takedamage = DAMAGE_YES;
-      else
-         takedamage = DAMAGE_NO;
-      hideModel();
-	   setSolidType( SOLID_NOT );
-      }
-   else
-      {
-	   showModel();
-	   setSolidType( SOLID_BSP );
-     	takedamage = DAMAGE_YES;
-      }
-
-	setMoveType( MOVETYPE_PUSH );
-	setOrigin();
-	}
+    setMoveType(MOVETYPE_PUSH);
+    setOrigin();
+}
 
 ExplodingWall::ExplodingWall()
-   {
-   if ( LoadingSavegame )
-      {
-      return;
-      }
+{
+    if (LoadingSavegame) {
+        return;
+    }
 
-	health = 60;
-	max_health = health;
-   on_ground = false;
+    health     = 60;
+    max_health = health;
+    on_ground  = false;
 
-   state = 0;
-   angle_speed = ( spawnflags & RANDOMANGLES ) ? 600 : 100;
-	land_radius = 16;
-	dmg = 10;
-	explosions = 1;
+    state       = 0;
+    angle_speed = (spawnflags & RANDOMANGLES) ? 600 : 100;
+    land_radius = 16;
+    dmg         = 10;
+    explosions  = 1;
 
-   base_velocity     = Vector( 0, 0, 280 );
-   random_velocity   = Vector( 140, 140, 140 );
+    base_velocity   = Vector(0, 0, 280);
+    random_velocity = Vector(140, 140, 140);
 
-   orig_mins = mins;
-   orig_maxs = maxs;
+    orig_mins = mins;
+    orig_maxs = maxs;
 
-	respondto = spawnflags ^ TRIGGER_PLAYERS;
+    respondto = spawnflags ^ TRIGGER_PLAYERS;
 
-   PostEvent( EV_ExplodingWall_Setup, EV_POSTSPAWN );
-   }
+    PostEvent(EV_ExplodingWall_Setup, EV_POSTSPAWN);
+}
 
 /*****************************************************************************/
 /*QUAKED trigger_teleport (0.5 0.5 0.5) ? VISIBLE x NOT_PLAYERS NOT_MONSTERS NOT_PROJECTILES NO_EFFECTS
@@ -694,323 +608,290 @@ If NO_EFFECTS is set, the special effect will not happen and the teleport will b
 
 ******************************************************************************/
 
-#define NO_EFFECTS ( 1 << 5 )
+#define NO_EFFECTS (1 << 5)
 
 Event EV_Teleporter_Teleport
-	( 
-	"teleport",
-   EV_CODEONLY,
-   "e",
-   "entity",
-   "Teleports the entity to destination.",
-	EV_NORMAL
-	);
-
+(
+    "teleport",
+    EV_CODEONLY,
+    "e",
+    "entity",
+    "Teleports the entity to destination.",
+    EV_NORMAL
+);
 Event EV_Teleporter_StopTeleport
-	( 
-	"stopteleport",
-   EV_CODEONLY,
-   "e",
-   "entity",
-   "Releases the entity at the end of the teleport.",
-	EV_NORMAL
-	);
+(
+    "stopteleport",
+    EV_CODEONLY,
+    "e",
+    "entity",
+    "Releases the entity at the end of the teleport.",
+    EV_NORMAL
 
+);
 Event EV_Teleporter_SetThread
-	( 
-	"teleportthread",
-   EV_CODEONLY,
-   "s",
-   "thread_name",
-   "Sets the thread to run when the player is teleported.",
-	EV_NORMAL
-	);
+(
+    "teleportthread",
+    EV_CODEONLY,
+    "s",
+    "thread_name",
+    "Sets the thread to run when the player is teleported.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Trigger, Teleporter, "trigger_teleport" )
-	{
-	   { &EV_Trigger_Effect,					&Teleporter::StartTeleport },
-		{ &EV_Teleporter_Teleport,				&Teleporter::Teleport },
-		{ &EV_Teleporter_StopTeleport,			&Teleporter::StopTeleport },
-		{ &EV_Teleporter_SetThread,				&Teleporter::SetThread },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Trigger, Teleporter, "trigger_teleport") {
+    {&EV_Trigger_Effect,          &Teleporter::StartTeleport},
+    {&EV_Teleporter_Teleport,     &Teleporter::Teleport     },
+    {&EV_Teleporter_StopTeleport, &Teleporter::StopTeleport },
+    {&EV_Teleporter_SetThread,    &Teleporter::SetThread    },
+    {NULL,                        NULL                      }
+};
 
-void Teleporter::SetThread
-	(
-	Event *ev
-	)
-	{
-	teleport_label.SetThread( ev->GetValue( 1 ) );
-	}
+void Teleporter::SetThread(Event *ev)
+{
+    teleport_label.SetThread(ev->GetValue(1));
+}
 
-void Teleporter::StartTeleport
-	(
-	Event *ev
-	)
-	{
-	Animate	*fx;
-	Entity	*other;
-	Event		*event;
-	qboolean is_sentient;
-	Vector	new_position;
+void Teleporter::StartTeleport(Event *ev)
+{
+    Animate *fx;
+    Entity  *other;
+    Event   *event;
+    qboolean is_sentient;
+    Vector   new_position;
 
+    if (in_use) {
+        return;
+    }
 
-	if ( in_use )
-		return;
+    in_use = true;
 
-	in_use = true;
+    other = ev->GetEntity(1);
 
-	other = ev->GetEntity( 1 );
+    if (!other) {
+        return;
+    }
 
-	if ( !other )
-		return;
+    if (spawnflags & NO_EFFECTS) {
+        event = new Event(EV_Teleporter_Teleport);
+        event->AddEntity(other);
+        ProcessEvent(event);
+        return;
+    }
 
-	if ( spawnflags & NO_EFFECTS )
-		{
-		event = new Event( EV_Teleporter_Teleport );
-		event->AddEntity( other );
-		ProcessEvent( event );
-		return;
-		}
+    if (other->isSubclassOf(Sentient)) {
+        is_sentient = true;
+    } else {
+        is_sentient = false;
+    }
 
-	if ( other->isSubclassOf( Sentient ) )
-		is_sentient = true;
-	else
-		is_sentient = false;
+    if (is_sentient) {
+        new_position = origin;
+        new_position.z += mins.z;
+        other->setOrigin(new_position);
+        other->NoLerpThisFrame();
+    }
 
-	if ( is_sentient )
-		{
-		new_position = origin;
-		new_position.z += mins.z;
-		other->setOrigin( new_position );
-		other->NoLerpThisFrame();
-		}
+    // Create the teleport special effect
 
-	// Create the teleport special effect
+    fx = new Animate;
+    fx->setOrigin(other->origin);
 
-	fx = new Animate;
-	fx->setOrigin( other->origin );
+    fx->NewAnim("idle", EV_Remove);
 
-	fx->NewAnim( "idle", EV_Remove );
+    if (is_sentient) {
+        fx->setModel("fx_bigteleport.tik");
+        //fx->Sound( "sound/environment/electric/singles/dimming.wav" );
+    } else {
+        fx->setModel("fx_teleport2.tik");
+    }
 
-	if ( is_sentient )
-		{
-		fx->setModel( "fx_bigteleport.tik" );
-		//fx->Sound( "sound/environment/electric/singles/dimming.wav" );
-		}
-	else
-		{
-		fx->setModel( "fx_teleport2.tik" );
-		}
+    if (is_sentient) {
+        // Freeze the entity that went into the teleporter
 
-	if ( is_sentient )
-		{
-		// Freeze the entity that went into the teleporter
+        other->flags |= FL_IMMOBILE;
+        other->takedamage = DAMAGE_NO;
+    }
 
-		other->flags |= FL_IMMOBILE;
-		other->takedamage = DAMAGE_NO;
-		}
+    // Make the entity teleport
 
-	// Make the entity teleport
+    event = new Event(EV_Teleporter_Teleport);
+    event->AddEntity(other);
 
-	event = new Event( EV_Teleporter_Teleport );
-	event->AddEntity( other );
+    if (is_sentient) {
+        PostEvent(event, 4);
+    } else {
+        PostEvent(event, 0);
+    }
 
-	if ( is_sentient )
-		PostEvent( event, 4 );
-	else
-		PostEvent( event, 0 );
+    if (is_sentient) {
+        other->PostEvent(EV_CODEONLY, 2);
 
-	if ( is_sentient )
-		{
-		other->PostEvent( EV_CODEONLY, 2 );
-
-		/* if ( !( spawnflags & NO_EFFECTS ) )
+        /* if ( !( spawnflags & NO_EFFECTS ) )
 			{
 			event = new Event( EV_Sound );
 			event->AddString( "snd_teleport" );
 			other->PostEvent( event, 2 );
 			} */
-		}
-	}
+    }
+}
 
-void Teleporter::Teleport
-	(
-	Event *ev
-	)
+void Teleporter::Teleport(Event *ev)
+{
+    Entity  *dest;
+    int      i;
+    Entity  *other;
+    Vector   mid;
+    Animate *fx;
+    Event   *event;
 
-	{
-	Entity		*dest;
-	int			i;
-	Entity		*other;
-	Vector		mid;
-	Animate		*fx;
-	Event			*event;
+    other = ev->GetEntity(1);
 
-	other = ev->GetEntity( 1 );
+    if (!other || (other == world)) {
+        return;
+    }
 
-   if ( !other || ( other == world ) )
-      return;
+    dest = (Entity *)G_FindTarget(NULL, Target());
+    if (!dest) {
+        warning("Teleport", "Couldn't find destination\n");
+        return;
+    }
 
-	dest = ( Entity * )G_FindTarget( NULL, Target() );
-	if ( !dest )
-		{
-		warning( "Teleport", "Couldn't find destination\n" );
-		return;
-		}
+    assert(dest);
 
-	assert( dest );
+    // unlink to make sure it can't possibly interfere with KillBox
+    other->unlink();
 
-	// unlink to make sure it can't possibly interfere with KillBox
-	other->unlink();
+    if (other->isSubclassOf(Sentient)) {
+        other->origin   = dest->origin + Vector(0, 0, 1);
+        other->velocity = vec_zero;
+    } else {
+        mid           = (absmax - absmin) * 0.5;
+        other->origin = dest->origin + Vector(0, 0, 1);
+        other->origin += mid;
+    }
 
-	if ( other->isSubclassOf( Sentient ) )
-		{
-      other->origin = dest->origin + Vector( 0, 0, 1 );
-		other->velocity = vec_zero;
-		}
-	else
-		{
-		mid = ( absmax - absmin ) * 0.5;
-      other->origin = dest->origin + Vector( 0, 0, 1 );
-      other->origin += mid;
-		}
+    // set angles
+    other->setAngles(dest->angles);
 
-   // set angles
-	other->setAngles( dest->angles );
+    if (other->client) {
+        client = other->client;
 
-   if ( other->client )
-		{
-		client = other->client;
+        // clear the velocity and hold them in place briefly
+        client->ps.pm_time = 100;
+        client->ps.pm_flags |= PMF_RESPAWNED;
 
-		// clear the velocity and hold them in place briefly
-		client->ps.pm_time = 100;
-      client->ps.pm_flags |= PMF_RESPAWNED;
+        // cut the camera on the client
+        ((Player *)other)->CameraCut();
 
-      // cut the camera on the client
-      ( ( Player * )other )->CameraCut();
+        for (i = 0; i < 3; i++) {
+            client->ps.delta_angles[i] = ANGLE2SHORT(dest->angles[i] - client->cmd_angles[i]);
+        }
 
-      for( i = 0; i < 3; i++ )
-			{
-			client->ps.delta_angles[ i ] = ANGLE2SHORT( dest->angles[ i ] - client->cmd_angles[ i ] );
-			}
+        VectorCopy(angles, client->ps.viewangles);
+    }
 
-		VectorCopy( angles, client->ps.viewangles );
-		}
+    if (dest->isSubclassOf(TeleporterDestination)) {
+        float len;
 
-	if ( dest->isSubclassOf( TeleporterDestination ) )
-		{
-		float len;
+        len = other->velocity.length();
+        //
+        // give them a bit of a push
+        //
+        if (len < 400) {
+            len = 400;
+        }
+        other->velocity = ((TeleporterDestination *)dest)->movedir * len;
+    }
 
-		len = other->velocity.length();
-      //
-      // give them a bit of a push
-      //
-      if ( len < 400 )
-         len = 400;
-		other->velocity = ( ( TeleporterDestination * )dest )->movedir * len;
-		}
+    // kill anything at the destination
+    KillBox(other);
 
-	// kill anything at the destination
-	KillBox( other );
+    other->setOrigin(other->origin);
+    other->origin.copyTo(other->edict->s.origin2);
 
-   other->setOrigin( other->origin );
-   other->origin.copyTo( other->edict->s.origin2 );
+    // Run the teleport thread if set
 
-	// Run the teleport thread if set
+    if (teleport_label.IsSet() && other->isSubclassOf(Player)) {
+        teleport_label.Execute(this);
+    }
 
-	if ( teleport_label.IsSet() && other->isSubclassOf( Player ) )
-		{
-		teleport_label.Execute( this );
-		}
+    // Skip effects if no_effects set
 
-	// Skip effects if no_effects set
+    if (spawnflags & NO_EFFECTS) {
+        Event *event = new Event(EV_Teleporter_StopTeleport);
+        event->AddEntity(other);
+        ProcessEvent(event);
+        return;
+    }
 
-	if ( spawnflags & NO_EFFECTS )
-		{
-		Event *event = new Event( EV_Teleporter_StopTeleport );
-		event->AddEntity( other );
-		ProcessEvent( event );
-		return;
-		}
+    // Spawn in effect
 
-	// Spawn in effect
+    fx = new Animate;
 
-	fx = new Animate;
+    fx->setOrigin(other->origin);
 
-	fx->setOrigin( other->origin );
+    fx->NewAnim("idle", EV_Remove);
 
-	fx->NewAnim( "idle", EV_Remove );
+    if (other->isSubclassOf(Sentient)) {
+        fx->setModel("fx_bigteleport.tik");
+    } else {
+        fx->setModel("fx_teleport2.tik");
+    }
 
-	if ( other->isSubclassOf( Sentient ) )
-		{
-		fx->setModel( "fx_bigteleport.tik" );
-		}
-	else
-		{
-		fx->setModel( "fx_teleport2.tik" );
-		}
+    event = new Event(EV_Teleporter_StopTeleport);
+    event->AddEntity(other);
 
-	event = new Event( EV_Teleporter_StopTeleport );
-	event->AddEntity( other );
+    if (other->isSubclassOf(Sentient)) {
+        PostEvent(event, 1.75);
+    } else {
+        PostEvent(event, FRAMETIME);
+    }
+}
 
-	if ( other->isSubclassOf( Sentient ) )
-		PostEvent( event, 1.75 );
-	else
-		PostEvent( event, FRAMETIME );
-	}
+void Teleporter::StopTeleport(Event *ev)
+{
+    Entity *other;
 
-void Teleporter::StopTeleport
-	(
-	Event *ev
-	)
+    other = ev->GetEntity(1);
 
-	{
-	Entity *other;
+    if (other->isSubclassOf(Sentient)) {
+        other->flags &= ~FL_IMMOBILE;
+        other->takedamage = DAMAGE_AIM;
+        other->showModel();
+    }
 
-	other = ev->GetEntity( 1 );
+    //if ( !( spawnflags & NO_EFFECTS ) )
+    //	other->Sound( "snd_teleport" );
 
-	if ( other->isSubclassOf( Sentient ) )
-		{
-		other->flags &= ~FL_IMMOBILE;
-		other->takedamage = DAMAGE_AIM;
-		other->showModel();
-		}
-
-	//if ( !( spawnflags & NO_EFFECTS ) )
-	//	other->Sound( "snd_teleport" );
-
-	in_use = false;
-	}
+    in_use = false;
+}
 
 Teleporter::Teleporter()
 {
-	AddWaitTill(STRING_TELEPORT);
+    AddWaitTill(STRING_TELEPORT);
 
-	if ( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	if ( spawnflags & 1 )
-	{
-		PostEvent( EV_Show, EV_POSTSPAWN );
-	}
+    if (spawnflags & 1) {
+        PostEvent(EV_Show, EV_POSTSPAWN);
+    }
 
-	//respondto = spawnflags ^ ( TRIGGER_PLAYERS | TRIGGER_MONSTERS | TRIGGER_PROJECTILES );
-	respondto = spawnflags ^ ( TRIGGER_PLAYERS );
+    //respondto = spawnflags ^ ( TRIGGER_PLAYERS | TRIGGER_MONSTERS | TRIGGER_PROJECTILES );
+    respondto = spawnflags ^ (TRIGGER_PLAYERS);
 
-	in_use = false;
+    in_use = false;
 
-	// Cache all needed stuff
+    // Cache all needed stuff
 
-	if ( !( spawnflags & NO_EFFECTS ) )
-	{
-		CacheResource( "models/fx_bigteleport.tik" );
-		//CacheResource( "sound/environment/electric/singles/dimming.wav", this );
-		CacheResource( "fx_teleport2.tik" );
-		//CacheResource( "snd_teleport", this );
-	}
+    if (!(spawnflags & NO_EFFECTS)) {
+        CacheResource("models/fx_bigteleport.tik");
+        //CacheResource( "sound/environment/electric/singles/dimming.wav", this );
+        CacheResource("fx_teleport2.tik");
+        //CacheResource( "snd_teleport", this );
+    }
 }
 
 /*****************************************************************************/
@@ -1020,28 +901,24 @@ Point trigger_teleport at these.
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, TeleporterDestination, "func_teleportdest" )
-{
-	{ &EV_SetAngle,		&TeleporterDestination::SetMoveDir },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, TeleporterDestination, "func_teleportdest") {
+    {&EV_SetAngle, &TeleporterDestination::SetMoveDir},
+    {NULL,         NULL                              }
 };
 
 TeleporterDestination::TeleporterDestination()
-	{
-	movedir = G_GetMovedir( 0 );
-	}
+{
+    movedir = G_GetMovedir(0);
+}
 
-void TeleporterDestination::SetMoveDir
-	(
-	Event *ev
-	)
-	{
-   float angle;
+void TeleporterDestination::SetMoveDir(Event *ev)
+{
+    float angle;
 
-   angle = ev->GetFloat( 1 );
-   movedir = G_GetMovedir( angle );
-	setAngles( movedir.toAngles() );
-   }
+    angle   = ev->GetFloat(1);
+    movedir = G_GetMovedir(angle);
+    setAngles(movedir.toAngles());
+}
 
 /*****************************************************************************/
 /*QUAKED func_useanim (0 0.5 0) ? VISIBLE TOUCHABLE CONTINUOUS
@@ -1066,584 +943,464 @@ it waits until the player has left the trigger field.
 ******************************************************************************/
 
 Event EV_UseAnim_Reset
-	( 
-	"_reset",
-   EV_CODEONLY,
-   NULL,
-   NULL,
-   "Reset's the Use Anim after it has no longer been touched.",
-	EV_NORMAL
-	);
+(
+    "_reset",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Reset's the Use Anim after it has no longer been touched.",
+    EV_NORMAL
 
+);
 Event EV_UseAnim_Thread
-	( 
-	"setthread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Sets which thread to use when this UseAnim is triggered.",
-	EV_NORMAL
-	);
+(
+    "setthread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which thread to use when this UseAnim is triggered.",
+    EV_NORMAL
 
+);
 Event EV_UseAnim_Count
-	( 
-	"count",
-	EV_DEFAULT,
-	"i",
-	"newCount",
-	"Sets how many times the UseAnim can be triggered.",
-	EV_NORMAL
-	);
+(
+    "count", EV_DEFAULT,
+    "i",
+    "newCount",
+    "Sets how many times the UseAnim can be triggered.",
+    EV_NORMAL
 
+);
 Event EV_UseAnim_TriggerTarget
-	( 
-	"triggertarget",
-	EV_DEFAULT,
-	"s",
-	"targetname",
-	"Sets what should be triggered, when this UseAnim is triggered.",
-	EV_NORMAL
-	);
-
+(
+    "triggertarget",
+    EV_DEFAULT,
+    "s",
+    "targetname",
+    "Sets what should be triggered, when this UseAnim is triggered.",
+    EV_NORMAL
+);
 Event EV_UseAnim_SetAnim
-   ( 
-   "anim",
-   EV_DEFAULT,
-   "s",
-   "animName",
-   "set the animation to use for player.",
-	EV_NORMAL
-   );
-
+(
+    "anim",
+    EV_DEFAULT,
+    "s",
+    "animName",
+    "set the animation to use for player.",
+    EV_NORMAL
+);
 Event EV_UseAnim_SetKey
-   ( 
-   "key",
-   EV_DEFAULT,
-   "s",
-   "keyName",
-   "set the key needed to make this UseAnim function.",
-	EV_NORMAL
-   );
-
+(
+    "key",
+    EV_DEFAULT,
+    "s",
+    "keyName",
+    "set the key needed to make this UseAnim function.",
+    EV_NORMAL
 
+);
 Event EV_UseAnim_SetState
-   ( 
-   "state",
-   EV_CHEAT,
-   "s",
-   "stateName",
-   "set the state to use for the player.",
-	EV_NORMAL
-   );
-
-Event EV_UseAnim_SetCamera
-   ( 
-   "camera",
-   EV_DEFAULT,
-   "s",
-   "cameraPosition",
-   "set the camera to use when in this animation.\n"
-   "topdown, behind, front, side, behind_fixed, side_left, side_right",
-	EV_NORMAL
-   );
-
+(
+    "state",
+    EV_CHEAT,
+    "s",
+    "stateName",
+    "set the state to use for the player.",
+    EV_NORMAL
+);
+Event EV_UseAnim_SetCamera(
+    "camera",
+    EV_DEFAULT,
+    "s",
+    "cameraPosition",
+    "set the camera to use when in this animation.\n"
+    "topdown, behind, front, side, behind_fixed, side_left, side_right",
+    EV_NORMAL
+);
 Event EV_UseAnim_SetNumLoops
-   ( 
-   "num_loops",
-   EV_DEFAULT,
-   "i",
-   "loopCount",
-   "set the number of times to loop an animation per use.",
-	EV_NORMAL
-   );
+(
+    "num_loops",
+    EV_DEFAULT,
+    "i",
+    "loopCount",
+    "set the number of times to loop an animation per use.",
+    EV_NORMAL
 
-Event EV_UseAnim_SetDelay
-   ( 
-   "delay",
-   EV_DEFAULT,
-   "f",
-   "delayTime",
-   "how long it takes for the UseAnim to be retriggered once you leave it.",
-	EV_NORMAL
-   );
+);
+Event EV_UseAnim_SetDelay(
+    "delay",
+    EV_DEFAULT,
+    "f",
+    "delayTime",
+    "how long it takes for the UseAnim to be retriggered once you leave it.",
+    EV_NORMAL
+);
 
-
-CLASS_DECLARATION( Entity, UseAnim, "func_useanim" )
-	{
-      { &EV_Use,					NULL },
-	   { &EV_Touch,					&UseAnim::Touched },
-	   { &EV_UseAnim_Reset,			&UseAnim::Reset },
-	   { &EV_UseAnim_Thread,		&UseAnim::SetThread },
-	   { &EV_UseAnim_TriggerTarget,	&UseAnim::SetTriggerTarget },
-	   { &EV_UseAnim_Count,			&UseAnim::SetCount },
-      { &EV_UseAnim_SetAnim,		&UseAnim::SetAnim },
-      { &EV_UseAnim_SetState,		&UseAnim::SetState },
-      { &EV_UseAnim_SetKey,			&UseAnim::SetKey },
-      { &EV_UseAnim_SetNumLoops,	&UseAnim::SetNumLoops },
-      { &EV_UseAnim_SetCamera,		&UseAnim::SetCamera },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, UseAnim, "func_useanim") {
+    {&EV_Use,                   NULL                      },
+    {&EV_Touch,                 &UseAnim::Touched         },
+    {&EV_UseAnim_Reset,         &UseAnim::Reset           },
+    {&EV_UseAnim_Thread,        &UseAnim::SetThread       },
+    {&EV_UseAnim_TriggerTarget, &UseAnim::SetTriggerTarget},
+    {&EV_UseAnim_Count,         &UseAnim::SetCount        },
+    {&EV_UseAnim_SetAnim,       &UseAnim::SetAnim         },
+    {&EV_UseAnim_SetState,      &UseAnim::SetState        },
+    {&EV_UseAnim_SetKey,        &UseAnim::SetKey          },
+    {&EV_UseAnim_SetNumLoops,   &UseAnim::SetNumLoops     },
+    {&EV_UseAnim_SetCamera,     &UseAnim::SetCamera       },
+    {NULL,                      NULL                      }
+};
 
 UseAnim::UseAnim()
-	{
-   AddWaitTill(STRING_TRIGGER);
-   if ( LoadingSavegame )
-      {
-      return;
-      }
+{
+    AddWaitTill(STRING_TRIGGER);
+    if (LoadingSavegame) {
+        return;
+    }
 
-	setMoveType( MOVETYPE_NONE );
+    setMoveType(MOVETYPE_NONE);
 
-   anim = "stand_use";
-   num_loops = 1;
-   hideModel();
+    anim      = "stand_use";
+    num_loops = 1;
+    hideModel();
 
-   //
-   // make it not solid unless we want it touchable
-   //
-   if ( !( spawnflags & 2 ) )
-      {
-	   setSolidType( SOLID_BBOX );
-      setContents( CONTENTS_BODY );
-      }
-   else
-      {
-   	setSolidType( SOLID_TRIGGER );
-      edict->r.svFlags |= SVF_NOCLIENT;
-      }
+    //
+    // make it not solid unless we want it touchable
+    //
+    if (!(spawnflags & 2)) {
+        setSolidType(SOLID_BBOX);
+        setContents(CONTENTS_BODY);
+    } else {
+        setSolidType(SOLID_TRIGGER);
+        edict->r.svFlags |= SVF_NOCLIENT;
+    }
 
-	// by default this can activated infinitely
-   count = -1;
-   // clear out the triggertarget
-   triggertarget = "";
-   // clear out the thread
-   thread.Set( "" );
-   // set the default delay
-   delay = 3;
-   // initialize the last time the door was triggered
-   last_active_time = -delay;
-   // initially its not active
-   active = 0;
-   // set the default camera to be side view
-   camera = "behind";
-   //
-   // only make it visible if so desired
-   //
-	if ( spawnflags & 1 )
-		{
-      PostEvent( EV_Show, EV_POSTSPAWN );
-		}
-	}
+    // by default this can activated infinitely
+    count = -1;
+    // clear out the triggertarget
+    triggertarget = "";
+    // clear out the thread
+    thread.Set("");
+    // set the default delay
+    delay = 3;
+    // initialize the last time the door was triggered
+    last_active_time = -delay;
+    // initially its not active
+    active = 0;
+    // set the default camera to be side view
+    camera = "behind";
+    //
+    // only make it visible if so desired
+    //
+    if (spawnflags & 1) {
+        PostEvent(EV_Show, EV_POSTSPAWN);
+    }
+}
 
-void UseAnim::Touched
-   (
-   Event *ev
-   )
+void UseAnim::Touched(Event *ev)
+{
+    Entity *other;
 
-	{
-   Entity               *other;
-   
-   if ( active && ( !( spawnflags & 4 ) ) )
-      {
-   	CancelEventsOfType( EV_UseAnim_Reset );
-      PostEvent( EV_UseAnim_Reset, 0.25f );
-      return;
-      }
+    if (active && (!(spawnflags & 4))) {
+        CancelEventsOfType(EV_UseAnim_Reset);
+        PostEvent(EV_UseAnim_Reset, 0.25f);
+        return;
+    }
 
-   // don't retrigger to soon
-   if ( level.time < last_active_time )
-      return;
+    // don't retrigger to soon
+    if (level.time < last_active_time) {
+        return;
+    }
 
-   other = ev->GetEntity( 1 );
-   if ( other->isSubclassOf( Player ) )
-      {
-      ( ( Player * ) other )->TouchedUseAnim( this );
-      }
-   }
+    other = ev->GetEntity(1);
+    if (other->isSubclassOf(Player)) {
+        ((Player *)other)->TouchedUseAnim(this);
+    }
+}
 
-bool UseAnim::canBeUsed
-   (
-   Entity * activator
-   )
-   
-	{
-	Entity *dest;
+bool UseAnim::canBeUsed(Entity *activator)
+{
+    Entity *dest;
 
-   // if this is no longer usable, return false
-   if ( !count )
-      {
-      return false;
-      }
+    // if this is no longer usable, return false
+    if (!count) {
+        return false;
+    }
 
-   // don't retrigger to soon
-   if ( level.time < last_active_time )
-      {
-      return false;
-      }
+    // don't retrigger to soon
+    if (level.time < last_active_time) {
+        return false;
+    }
 
-   if ( key.length() )
-      {
-      if ( !activator->isSubclassOf( Sentient ) )
-         {
-         return false;
-         }
-      if ( !( ( (Sentient *)activator )->HasItem( key.c_str() ) ) )
-         {
-         qboolean    setModel;
-         Item        *item;
-         ClassDef		*cls;
-         str         dialog;
+    if (key.length()) {
+        if (!activator->isSubclassOf(Sentient)) {
+            return false;
+        }
+        if (!(((Sentient *)activator)->HasItem(key.c_str()))) {
+            qboolean  setModel;
+            Item     *item;
+            ClassDef *cls;
+            str       dialog;
 
-         cls = FindClass( key.c_str(), &setModel );
-		   if ( !cls || !checkInheritance( "Item", cls->classname ) )
-			   {
-            gi.DPrintf( "No item named '%s'\n", key.c_str() );
-			   return true;
-			   }
-		   item = ( Item * )cls->newInstance();
-         if ( setModel )
-            {
-            item->setModel( key.c_str() );
+            cls = FindClass(key.c_str(), &setModel);
+            if (!cls || !checkInheritance("Item", cls->classname)) {
+                gi.DPrintf("No item named '%s'\n", key.c_str());
+                return true;
             }
-         item->CancelEventsOfType( EV_Item_DropToFloor );
-	      item->CancelEventsOfType( EV_Remove );
-         item->ProcessPendingEvents();
-         dialog = item->GetDialogNeeded();
-         if ( dialog.length() > 0 )
-            {
-            activator->Sound( dialog );
+            item = (Item *)cls->newInstance();
+            if (setModel) {
+                item->setModel(key.c_str());
             }
-         else
-            {
-            gi.centerprintf ( activator->edict, "You need the %s", item->getName().c_str() );
+            item->CancelEventsOfType(EV_Item_DropToFloor);
+            item->CancelEventsOfType(EV_Remove);
+            item->ProcessPendingEvents();
+            dialog = item->GetDialogNeeded();
+            if (dialog.length() > 0) {
+                activator->Sound(dialog);
+            } else {
+                gi.centerprintf(activator->edict, "You need the %s", item->getName().c_str());
             }
-         delete item;
+            delete item;
 
-         // don't retrigger for 5 seconds
-         last_active_time = level.time + 5;
-         return false;
-         }
-      else
-         {
-         return qtrue;
-         }
-      }
+            // don't retrigger for 5 seconds
+            last_active_time = level.time + 5;
+            return false;
+        } else {
+            return qtrue;
+        }
+    }
 
-   if ( isSubclassOf( TouchAnim ) )
-      {
-      return true;
-      }
+    if (isSubclassOf(TouchAnim)) {
+        return true;
+    }
 
-	dest = ( Entity * )G_FindTarget( NULL, Target() );
-	if ( !dest || !dest->isSubclassOf( UseAnimDestination ) )
-		{
-		warning( "UseAnim", "Couldn't find destination\n" );
-		return false;
-		}
+    dest = (Entity *)G_FindTarget(NULL, Target());
+    if (!dest || !dest->isSubclassOf(UseAnimDestination)) {
+        warning("UseAnim", "Couldn't find destination\n");
+        return false;
+    }
 
-   return true;
-   }
+    return true;
+}
 
-bool UseAnim::GetInformation
-   (
-   Entity *activator,
-   Vector *org, 
-   Vector *angles, 
-   str *animation, 
-   int *loopcount,
-   str *state,
-   str *camera
-   )
+bool UseAnim::GetInformation(
+    Entity *activator, Vector *org, Vector *angles, str *animation, int *loopcount, str *state, str *camera
+)
+{
+    Entity             *dest;
+    UseAnimDestination *uadest;
 
-	{
-	Entity		         *dest;
-   UseAnimDestination   *uadest;
+    // if this is no longer usable, return false
+    if (!count) {
+        return false;
+    }
 
-   // if this is no longer usable, return false
-   if ( !count )
-      {
-      return false;
-      }
+    dest = (Entity *)G_FindTarget(NULL, Target());
 
-   dest = ( Entity * )G_FindTarget( NULL, Target() );
+    if (!dest || !dest->isSubclassOf(UseAnimDestination)) {
+        // grab the information from this entity instead
+        // set the destination origin
+        *org = origin;
+        // set the destination angles
+        *angles = this->angles;
+        // set the desination animation
+        *animation = anim;
+        // set the number of loops
+        *loopcount = num_loops;
+        // get the state if necessary
+        *state = this->state;
+        // set the camera
+        *camera = this->camera;
+    } else {
+        uadest = (UseAnimDestination *)dest;
 
-	if ( !dest || !dest->isSubclassOf( UseAnimDestination ) )
-		{
-      // grab the information from this entity instead
-      // set the destination origin
-      *org = origin;
-      // set the destination angles
-      *angles = this->angles;
-      // set the desination animation
-      *animation = anim;
-      // set the number of loops
-      *loopcount = num_loops;
-      // get the state if necessary
-      *state = this->state;
-      // set the camera
-      *camera = this->camera;
-		}
-   else
-      {
-      uadest = ( UseAnimDestination * )dest;
+        // set the destination origin
+        *org = uadest->origin;
+        // set the destination angles
+        *angles = uadest->angles;
+        // set the desination animation
+        *animation = uadest->GetAnim();
+        // set the number of loops
+        *loopcount = uadest->GetNumLoops();
+        // get the state if necessary
+        *state = uadest->GetState();
+        // set the camera
+        *camera = this->camera;
+    }
 
-      // set the destination origin
-      *org = uadest->origin;
-      // set the destination angles
-      *angles = uadest->angles;
-      // set the desination animation
-      *animation = uadest->GetAnim();
-      // set the number of loops
-      *loopcount = uadest->GetNumLoops();
-      // get the state if necessary
-      *state = uadest->GetState();
-      // set the camera
-      *camera = this->camera;
-      }
+    // make this guy active
+    active = qtrue;
 
-
-   // make this guy active
-   active = qtrue;
-
-   // if this is a TouchAnim see if it is linked to another TouchAnim
-   if ( isSubclassOf( TouchAnim ) )
-      {
-      dest = NULL;
-      do {
-		  dest = ( Entity * )G_FindTarget( dest, Target() );
-	      if ( dest )
-            {
-            if ( dest->isSubclassOf( UseAnim ) )
-               {
-               // make our linked UseAnim's active as well
-               ( ( UseAnim * )dest )->active = qtrue;
-               }
+    // if this is a TouchAnim see if it is linked to another TouchAnim
+    if (isSubclassOf(TouchAnim)) {
+        dest = NULL;
+        do {
+            dest = (Entity *)G_FindTarget(dest, Target());
+            if (dest) {
+                if (dest->isSubclassOf(UseAnim)) {
+                    // make our linked UseAnim's active as well
+                    ((UseAnim *)dest)->active = qtrue;
+                }
+            } else {
+                break;
             }
-         else
-            {
-            break;
+        } while (1);
+    }
+    //
+    // decrement the use
+    //
+    if (count > 0) {
+        count--;
+    }
+
+    return true;
+}
+
+void UseAnim::TriggerTargets(Entity *activator)
+{
+    //
+    // fire off our trigger target if appropriate
+    //
+    if (triggertarget.length()) {
+        Event  *event;
+        Entity *ent;
+
+        ent = NULL;
+        do {
+            ent = (Entity *)G_FindTarget(ent, triggertarget.c_str());
+            if (!ent) {
+                break;
             }
-         } 
-      while( 1 );
-      }
-   // 
-   // decrement the use
-   //
-   if ( count > 0 )
-      {
-      count--;
-      }
+            event = new Event(EV_Activate);
+            event->AddEntity(activator);
+            ent->PostEvent(event, 0);
+        } while (1);
+    }
 
-   return true;
-   }
+    //
+    // fire off a thread if necessary
+    //
+    if (thread.IsSet()) {
+        thread.Execute(this);
+    }
+}
 
-void UseAnim::TriggerTargets
-   (
-   Entity *activator
-   )
+void UseAnim::Reset(Event *ev)
+{
+    //
+    // find out if our triggertarget is of type door and only reset if the door is closed
+    //
+    if (triggertarget.length()) {
+        Entity *ent;
 
-	{
-   //
-   // fire off our trigger target if appropriate
-   //
-	if ( triggertarget.length() )
-		{
-      Event  *event;
-      Entity *ent;
-    
-      ent = NULL;
-		do
-			{
-			ent = ( Entity * )G_FindTarget( ent, triggertarget.c_str() );
-			if ( !ent )
-				{
-				break;
-				}
-		   event = new Event( EV_Activate );
-         event->AddEntity( activator );
-			ent->PostEvent( event, 0 );
-         }
-      while ( 1 );
-      }
-
-   //
-   // fire off a thread if necessary
-   //
-   if ( thread.IsSet() )
-      {
-	   thread.Execute( this );
-      }
-   }
-
-void UseAnim::Reset
-   (
-   Event *ev
-   )
-
-	{
-   //
-   // find out if our triggertarget is of type door and only reset if the door is closed
-   //
-	if ( triggertarget.length() )
-		{
-      Entity *ent;
-    
-      ent = NULL;
-		do
-			{
-			ent = ( Entity * )G_FindTarget( ent, triggertarget.c_str() );
-			if ( !ent )
-				{
-				break;
-				}
-         if ( ent->isSubclassOf( Door ) )
-            {
-            if ( !( ( Door * )ent )->isCompletelyClosed() )
-               {
-   	         CancelEventsOfType( EV_UseAnim_Reset );
-               PostEvent( EV_UseAnim_Reset, 0.25f );
-               //
-               // wait for a little bit
-               //
-               return;
-               }
+        ent = NULL;
+        do {
+            ent = (Entity *)G_FindTarget(ent, triggertarget.c_str());
+            if (!ent) {
+                break;
             }
-         }
-      while ( 1 );
-      }
-
-   active = qfalse;
-   last_active_time = level.time + delay;
-
-   // if this is a TouchAnim see if it is linked to another TouchAnim
-   if ( isSubclassOf( TouchAnim ) )
-      {
-      Entity *dest;
-
-      dest = NULL;
-      do {
-		  dest = ( Entity * )G_FindTarget( dest, Target() );
-	      if ( dest )
-            {
-            if ( dest->isSubclassOf( UseAnim ) )
-               {
-               // make our linked UseAnim's reset as well
-               ( ( UseAnim * )dest )->active = qfalse;
-               ( ( UseAnim * )dest )->last_active_time = level.time + delay;
-               }
+            if (ent->isSubclassOf(Door)) {
+                if (!((Door *)ent)->isCompletelyClosed()) {
+                    CancelEventsOfType(EV_UseAnim_Reset);
+                    PostEvent(EV_UseAnim_Reset, 0.25f);
+                    //
+                    // wait for a little bit
+                    //
+                    return;
+                }
             }
-         else
-            {
-            break;
+        } while (1);
+    }
+
+    active           = qfalse;
+    last_active_time = level.time + delay;
+
+    // if this is a TouchAnim see if it is linked to another TouchAnim
+    if (isSubclassOf(TouchAnim)) {
+        Entity *dest;
+
+        dest = NULL;
+        do {
+            dest = (Entity *)G_FindTarget(dest, Target());
+            if (dest) {
+                if (dest->isSubclassOf(UseAnim)) {
+                    // make our linked UseAnim's reset as well
+                    ((UseAnim *)dest)->active           = qfalse;
+                    ((UseAnim *)dest)->last_active_time = level.time + delay;
+                }
+            } else {
+                break;
             }
-         } 
-      while( 1 );
-      }
-   }
+        } while (1);
+    }
+}
 
-void UseAnim::SetThread
-   (
-   Event *ev
-   )
+void UseAnim::SetThread(Event *ev)
+{
+    thread.SetThread(ev->GetValue(1));
+}
 
-	{
-	thread.SetThread( ev->GetValue( 1 ) );
-   }
+void UseAnim::SetDelay(Event *ev)
+{
+    delay = ev->GetFloat(1);
+}
 
-void UseAnim::SetDelay
-   (
-   Event *ev
-   )
+void UseAnim::SetTriggerTarget(Event *ev)
+{
+    triggertarget = ev->GetString(1);
+}
 
-	{
-   delay = ev->GetFloat( 1 );
-   }
+void UseAnim::SetCount(Event *ev)
+{
+    count = ev->GetInteger(1);
+}
 
-void UseAnim::SetTriggerTarget
-   (
-   Event *ev
-   )
+void UseAnim::SetAnim(Event *ev)
+{
+    anim = ev->GetString(1);
+}
 
-	{
-   triggertarget = ev->GetString( 1 );
-   }
+void UseAnim::SetState(Event *ev)
+{
+    state = ev->GetString(1);
+}
 
-void UseAnim::SetCount
-   (
-   Event *ev
-   )
+void UseAnim::SetKey(Event *ev)
+{
+    key = ev->GetString(1);
+}
 
-	{
-   count = ev->GetInteger( 1 );
-   }
+void UseAnim::SetCamera(Event *ev)
+{
+    camera = ev->GetString(1);
+}
 
-void UseAnim::SetAnim
-	(
-	Event *ev
-	)
-	{
-   anim = ev->GetString( 1 );
-   }
+void UseAnim::SetNumLoops(Event *ev)
+{
+    num_loops = ev->GetInteger(1);
+}
 
-void UseAnim::SetState
-	(
-	Event *ev
-	)
-	{
-   state = ev->GetString( 1 );
-   }
-
-void UseAnim::SetKey
-	(
-	Event *ev
-	)
-	{
-   key = ev->GetString( 1 );
-   }
-
-void UseAnim::SetCamera
-	(
-	Event *ev
-	)
-	{
-   camera = ev->GetString( 1 );
-   }
-
-void UseAnim::SetNumLoops
-	(
-	Event *ev
-	)
-	{
-   num_loops = ev->GetInteger( 1 );
-   }
-
-
-CLASS_DECLARATION( UseAnim, TouchAnim, "func_touchanim" )
-	{
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(UseAnim, TouchAnim, "func_touchanim") {
+    {NULL, NULL}
+};
 
 TouchAnim::TouchAnim()
-	{
-   if ( LoadingSavegame )
-      {
-      return;
-      }
+{
+    if (LoadingSavegame) {
+        return;
+    }
 
-   spawnflags |= 2;
+    spawnflags |= 2;
 
-   if ( spawnflags & 8 )
-      {
-      setSize( Vector( "-32 -32 0" ), Vector( "32 32 96" ) );
-      }
-   else
-      {
-      setSize( Vector( "-16 -16 0" ), Vector( "16 16 96" ) );
-      }
+    if (spawnflags & 8) {
+        setSize(Vector("-32 -32 0"), Vector("32 32 96"));
+    } else {
+        setSize(Vector("-16 -16 0"), Vector("16 16 96"));
+    }
 
-  	setSolidType( SOLID_TRIGGER );
-   edict->r.svFlags |= SVF_NOCLIENT;
-	}
+    setSolidType(SOLID_TRIGGER);
+    edict->r.svFlags |= SVF_NOCLIENT;
+}
 
 /*****************************************************************************/
 /*       func_useanimdest (0 0.25 0.5) (0 0 0) (0 0 0)
@@ -1661,271 +1418,241 @@ and placed into the specified animation
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, UseAnimDestination, "func_useanimdest" )
-	{
-      { &EV_UseAnim_SetAnim,		&UseAnimDestination::SetAnim },
-      { &EV_UseAnim_SetState,		&UseAnimDestination::SetState },
-      { &EV_UseAnim_SetNumLoops,	&UseAnimDestination::SetNumLoops },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, UseAnimDestination, "func_useanimdest") {
+    {&EV_UseAnim_SetAnim,     &UseAnimDestination::SetAnim    },
+    {&EV_UseAnim_SetState,    &UseAnimDestination::SetState   },
+    {&EV_UseAnim_SetNumLoops, &UseAnimDestination::SetNumLoops},
+    {NULL,                    NULL                            }
+};
 
 UseAnimDestination::UseAnimDestination()
-	{
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-   //
-   // default animation to use
-   //
-   anim = "stand_use";
-   num_loops = 1;
-   setSolidType( SOLID_NOT );
-   hideModel();
-	}
+{
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    //
+    // default animation to use
+    //
+    anim      = "stand_use";
+    num_loops = 1;
+    setSolidType(SOLID_NOT);
+    hideModel();
+}
 
-void UseAnimDestination::SetAnim
-	(
-	Event *ev
-	)
-	{
-   anim = ev->GetString( 1 );
-   }
+void UseAnimDestination::SetAnim(Event *ev)
+{
+    anim = ev->GetString(1);
+}
 
-void UseAnimDestination::SetState
-	(
-	Event *ev
-	)
-	{
-   state = ev->GetString( 1 );
-   }
+void UseAnimDestination::SetState(Event *ev)
+{
+    state = ev->GetString(1);
+}
 
-str UseAnimDestination::GetAnim
-	(
-   void
-	)
-	{
-   return anim;
-   }
+str UseAnimDestination::GetAnim(void)
+{
+    return anim;
+}
 
-str UseAnimDestination::GetState
-	(
-   void
-	)
-	{
-   return state;
-   }
+str UseAnimDestination::GetState(void)
+{
+    return state;
+}
 
-void UseAnimDestination::SetNumLoops
-	(
-	Event *ev
-	)
-	{
-   num_loops = ev->GetInteger( 1 );
-   }
+void UseAnimDestination::SetNumLoops(Event *ev)
+{
+    num_loops = ev->GetInteger(1);
+}
 
-int UseAnimDestination::GetNumLoops
-	(
-   void
-	)
-	{
-   return num_loops;
-   }
+int UseAnimDestination::GetNumLoops(void)
+{
+    return num_loops;
+}
 
 Event EV_UseObject_MoveThread
-	( 
-	"move_thread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Sets which move thread to use when this UseObject has finshed looping.",
-	EV_NORMAL
-	);
-
+(
+    "move_thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which move thread to use when this UseObject has finshed looping.",
+    EV_NORMAL
+);
 Event EV_UseObject_StopThread
-	( 
-	"stop_thread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Sets which stop thread to use when this UseObject is finished.",
-	EV_NORMAL
-	);
+(
+    "stop_thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which stop thread to use when this UseObject is finished.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_ResetThread
-	( 
-	"reset_thread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Sets which thread to call when resetting.",
-	EV_NORMAL
-	);
+(
+    "reset_thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Sets which thread to call when resetting.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_Count
-	( 
-	"count",
-	EV_DEFAULT,
-	"i",
-	"newCount",
-	"Sets how many times the UseObject can be triggered.",
-	EV_NORMAL
-	);
+(
+    "count",
+    EV_DEFAULT,
+    "i",
+    "newCount",
+    "Sets how many times the UseObject can be triggered.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_Cone
-	( 
-	"cone",
-	EV_DEFAULT,
-	"f",
-	"newCone",
-	"Sets the cone in angles of where the Useobject can be used.",
-	EV_NORMAL
-	);
+(
+    "cone",
+    EV_DEFAULT,
+    "f",
+    "newCone",
+    "Sets the cone in angles of where the Useobject can be used.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_Offset
-	( 
-	"offset",
-	EV_DEFAULT,
-	"v",
-	"newOffset",
-	"Sets the offset to use for this UseObject.",
-	EV_NORMAL
-	);
+(
+    "offset",
+    EV_DEFAULT,
+    "v",
+    "newOffset",
+    "Sets the offset to use for this UseObject.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_YawOffset
-	( 
-	"yaw_offset",
-	EV_DEFAULT,
-	"f",
-	"newYawOffset",
-	"Sets the yaw offset to use for this UseObject.",
-	EV_NORMAL
-	);
+(
+    "yaw_offset",
+    EV_DEFAULT,
+    "f",
+    "newYawOffset",
+    "Sets the yaw offset to use for this UseObject.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_State
-	( 
-	"state",
-	EV_DEFAULT,
-	"s",
-	"newState",
-	"Sets the state to use for this UseObject.",
-	EV_NORMAL
-	);
-
+(
+    "state",
+    EV_DEFAULT,
+    "s",
+    "newState",
+    "Sets the state to use for this UseObject.",
+    EV_NORMAL
+);
 Event EV_UseObject_StateBackwards
-	( 
-	"state_backwards",
-	EV_DEFAULT,
-	"s",
-	"newState",
-	"Sets the backward state to use for this UseObject.",
-	EV_NORMAL
-	);
+(
+    "state_backwards",
+    EV_DEFAULT,
+    "s",
+    "newState",
+    "Sets the backward state to use for this UseObject.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_TriggerTarget
-	( 
-	"triggertarget",
-	EV_DEFAULT,
-	"s",
-	"targetname",
-	"Sets what should be triggered, when this UseObject is triggered.",
-	EV_NORMAL
-	);
-
+(
+    "triggertarget",
+    EV_DEFAULT,
+    "s",
+    "targetname",
+    "Sets what should be triggered, when this UseObject is triggered.",
+    EV_NORMAL
+);
 Event EV_UseObject_ResetTime
-	( 
-	"reset_time",
-	EV_DEFAULT,
-	"f",
-	"newResetTime",
-	"Sets the time it takes for the UseObject to reset itself.",
-	EV_NORMAL
-	);
-
+(
+    "reset_time",
+    EV_DEFAULT,
+    "f",
+    "newResetTime",
+    "Sets the time it takes for the UseObject to reset itself.",
+    EV_NORMAL
+);
 Event EV_UseObject_DamageType
-	( 
-	"damage_type",
-	EV_DEFAULT,
-	"s",
-	"newDamageType",
-	"Sets what kind of damage is needed to activate the trigger.",
-	EV_NORMAL
-	);
-
+(
+    "damage_type",
+    EV_DEFAULT,
+    "s",
+    "newDamageType",
+    "Sets what kind of damage is needed to activate the trigger.",
+    EV_NORMAL
+);
 Event EV_UseObject_Reset
-	( 
-	"_useobject_reset",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Resets the useobject to the start state after a certain amount of time.",
-	EV_NORMAL
-	);
-
+(
+    "_useobject_reset",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Resets the useobject to the start state after a certain amount of time.",
+    EV_NORMAL
+);
 Event EV_UseObject_Resetting
-	( 
-	"_useobject_resetting",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Intermediate function for useobject reset.",
-	EV_NORMAL
-	);
+(
+    "_useobject_resetting",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Intermediate function for useobject reset.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_DamageTriggered
-	( 
-	"_useobject_damagetriggered",
-	EV_DEFAULT,
-   "e",
-   "activator",
-	"Intermediate function for when the useobject was triggered by damage.",
-	EV_NORMAL
-	);
-
+(
+    "_useobject_damagetriggered",
+    EV_DEFAULT,
+    "e",
+    "activator",
+    "Intermediate function for when the useobject was triggered by damage.",
+    EV_NORMAL
+);
 Event EV_UseObject_Activate
-	( 
-	"activate",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Allow the useobject to be used.",
-	EV_NORMAL
-	);
-
+(
+    "activate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Allow the useobject to be used.",
+    EV_NORMAL
+);
 Event EV_UseObject_Deactivate
-	( 
-	"deactivate",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "Do not allow the useobject to be used.",
-	EV_NORMAL
-	);
-
+(
+    "deactivate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Do not allow the useobject to be used.",
+    EV_NORMAL
+);
 Event EV_UseObject_UseMaterial
-	( 
-	"usematerial",
-	EV_DEFAULT,
-   "s",
-   "nameOfUseMaterial",
-   "the name of the material that glows when active.",
-	EV_NORMAL
-	);
+(
+    "usematerial",
+    EV_DEFAULT,
+    "s",
+    "nameOfUseMaterial",
+    "the name of the material that glows when active.",
+    EV_NORMAL
 
+);
 Event EV_UseObject_SetActiveState
-	( 
-	"_setactivestate",
-	EV_DEFAULT,
-   NULL,
-   NULL,
-   "event that sets up the proper skin for the useobject.",
-	EV_NORMAL
-	);
+(
+    "_setactivestate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "event that sets up the proper skin for the useobject.",
+    EV_NORMAL
 
+);
 
-
-#define MULTI_STATE     ( 1 << 0 )
+#define MULTI_STATE (1 << 0)
 
 /*****************************************************************************/
 /*QUAKED func_useobject (0 0.5 0) ? MULTI-STATE
@@ -1970,333 +1697,247 @@ off state after a preset amount of time.  When multi-state is set this must be d
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Animate, UseObject, "func_useobject" )
-	{
-      { &EV_Use,						NULL },
-	   { &EV_UseObject_MoveThread,		&UseObject::SetMoveThread },
-	   { &EV_UseObject_StopThread,		&UseObject::SetStopThread },
-	   { &EV_UseObject_ResetThread,		&UseObject::SetResetThread },
-	   { &EV_UseObject_TriggerTarget,	&UseObject::SetTriggerTarget },
-	   { &EV_UseObject_Offset,			&UseObject::SetOffset },
-	   { &EV_UseObject_YawOffset,		&UseObject::SetYawOffset },
-	   { &EV_UseObject_Count,			&UseObject::SetCount },
-	   { &EV_UseObject_Cone,			&UseObject::SetCone },
-	   { &EV_UseObject_State,			&UseObject::SetState },
-	   { &EV_UseObject_StateBackwards,	&UseObject::SetBackwardsState },
-	   { &EV_UseObject_ResetTime,		&UseObject::SetResetTime },
-	   { &EV_UseObject_Reset,			&UseObject::Reset },
-	   { &EV_UseObject_DamageType,		&UseObject::DamageType },
-	   { &EV_UseObject_Resetting,		&UseObject::Resetting },
-      { &EV_UseObject_DamageTriggered,	&UseObject::DamageTriggered },
-		{ &EV_Damage,					&UseObject::DamageFunc },
-      { &EV_UseObject_Activate,			&UseObject::ActivateEvent },
-      { &EV_UseObject_Deactivate,		&UseObject::DeactivateEvent },
-      { &EV_UseObject_UseMaterial,		&UseObject::UseMaterialEvent },
-      { &EV_UseObject_SetActiveState,	&UseObject::SetActiveState },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Animate, UseObject, "func_useobject") {
+    {&EV_Use,                       NULL                         },
+    {&EV_UseObject_MoveThread,      &UseObject::SetMoveThread    },
+    {&EV_UseObject_StopThread,      &UseObject::SetStopThread    },
+    {&EV_UseObject_ResetThread,     &UseObject::SetResetThread   },
+    {&EV_UseObject_TriggerTarget,   &UseObject::SetTriggerTarget },
+    {&EV_UseObject_Offset,          &UseObject::SetOffset        },
+    {&EV_UseObject_YawOffset,       &UseObject::SetYawOffset     },
+    {&EV_UseObject_Count,           &UseObject::SetCount         },
+    {&EV_UseObject_Cone,            &UseObject::SetCone          },
+    {&EV_UseObject_State,           &UseObject::SetState         },
+    {&EV_UseObject_StateBackwards,  &UseObject::SetBackwardsState},
+    {&EV_UseObject_ResetTime,       &UseObject::SetResetTime     },
+    {&EV_UseObject_Reset,           &UseObject::Reset            },
+    {&EV_UseObject_DamageType,      &UseObject::DamageType       },
+    {&EV_UseObject_Resetting,       &UseObject::Resetting        },
+    {&EV_UseObject_DamageTriggered, &UseObject::DamageTriggered  },
+    {&EV_Damage,                    &UseObject::DamageFunc       },
+    {&EV_UseObject_Activate,        &UseObject::ActivateEvent    },
+    {&EV_UseObject_Deactivate,      &UseObject::DeactivateEvent  },
+    {&EV_UseObject_UseMaterial,     &UseObject::UseMaterialEvent },
+    {&EV_UseObject_SetActiveState,  &UseObject::SetActiveState   },
+    {NULL,                          NULL                         }
+};
 
 UseObject::UseObject()
-	{
-   Event * e;
-
-   AddWaitTill(STRING_RESET);
-   AddWaitTill(STRING_MOVE);
-   AddWaitTill(STRING_STOP);
-
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-
-	setMoveType( MOVETYPE_NONE );
-   setSolidType( SOLID_BBOX );
-   setContents( CONTENTS_BODY );
-
-   // make sure the bounds get rotated with the object
-   flags |= FL_ROTATEDBOUNDS;
-	// by default this can activated infinitely
-   count = -1;
-   // clear out the triggertarget
-   triggertarget = "";
-   // clear out the move thread
-   move_thread.Set( "" );
-   // clear out the stop thread
-   stop_thread.Set( "" );
-   // clear out the reset thread
-   reset_thread.Set( "" );
-   // clear out the damage type, by default useobjects do not respond to damage
-   damage_type = MOD_NONE;
-   // turn on damage taking ability
-   takedamage = DAMAGE_YES;
-   // give it some health
-   health = 100;
-   // set the default yaw offset
-   yaw_offset = 0;
-   // set the cone
-   cone = cos( DEG2RAD( 90 ) );
-   // set the state
-   state = "";
-   // set the backwards state
-   state_backwards = "";
-   // clear out the reset_time
-   reset_time = 0;
-   // clear out the object state
-   objectState = 0;
-   // the useobject is active by default
-   active = qtrue;
-
-   // start off in the start animation
-   e = new Event( EV_SetAnim );
-   e->AddString( "start" );
-   PostEvent( e, 0 );
-   PostEvent( EV_Show, 0 );
-   // setup our skins once we are spawned
-   PostEvent( EV_UseObject_SetActiveState, 0 );
-
-	}
-
-void UseObject::SetActiveState
-   (
-   Event *ev
-   )
-   {
-   if ( !useMaterial.length() )
-      {
-      return;
-      }
-
-   if ( active && count )
-      {
-      SurfaceCommand( useMaterial.c_str(), "+skin1" );
-      }
-   else
-      {
-      SurfaceCommand( useMaterial.c_str(), "-skin1" );
-      }
-   if ( objectState )
-      {
-      SurfaceCommand( useMaterial.c_str(), "+skin2" );
-      }
-   else
-      {
-      SurfaceCommand( useMaterial.c_str(), "-skin2" );
-      }
-   }
-
-void UseObject::SetMoveThread
-   (
-   Event *ev
-   )
-
-	{
-	move_thread.SetThread( ev->GetValue( 1 ) );
-   }
-
-void UseObject::SetStopThread
-   (
-   Event *ev
-   )
-
-	{
-	stop_thread.SetThread( ev->GetValue( 1 ) );
-   }
-
-void UseObject::SetResetThread
-   (
-   Event *ev
-   )
-
-	{
-	reset_thread.SetThread( ev->GetValue( 1 ) );
-   }
-
-void UseObject::ActivateEvent
-   (
-   Event *ev
-   )
-
-	{
-   active = qtrue;
-   PostEvent( EV_UseObject_SetActiveState, 0 );
-   }
-
-void UseObject::DeactivateEvent
-   (
-   Event *ev
-   )
-
-	{
-   active = qfalse;
-   PostEvent( EV_UseObject_SetActiveState, 0 );
-   }
-
-void UseObject::SetTriggerTarget
-   (
-   Event *ev
-   )
-
-	{
-   triggertarget = ev->GetString( 1 );
-   }
-
-void UseObject::SetOffset
-   (
-   Event *ev
-   )
-
-	{
-   offset = ev->GetVector( 1 );
-   }
-
-void UseObject::SetYawOffset
-   (
-   Event *ev
-   )
-
-	{
-   yaw_offset = ev->GetFloat( 1 );
-   }
-
-void UseObject::SetCount
-   (
-   Event *ev
-   )
-
-	{
-   count = ev->GetInteger( 1 );
-   }
-
-void UseObject::SetCone
-   (
-   Event *ev
-   )
-
-	{
-   cone = cos( DEG2RAD( ev->GetFloat( 1 ) ) );
-   }
-
-void UseObject::SetState
-   (
-   Event *ev
-   )
-
-	{
-   state = ev->GetString( 1 );
-   }
-
-void UseObject::SetBackwardsState
-   (
-   Event *ev
-   )
-
-	{
-   state_backwards = ev->GetString( 1 );
-   }
-
-void UseObject::UseMaterialEvent
-   (
-   Event *ev
-   )
-
-	{
-   useMaterial = ev->GetString( 1 );
-   }
-
-void UseObject::SetResetTime
-   (
-   Event *ev
-   )
-
-	{
-   reset_time = ev->GetFloat( 1 );
-   }
-
-void UseObject::Reset( Event *ev )
 {
-	NewAnim( "move_backward", EV_UseObject_Resetting );
+    Event *e;
+
+    AddWaitTill(STRING_RESET);
+    AddWaitTill(STRING_MOVE);
+    AddWaitTill(STRING_STOP);
+
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+
+    setMoveType(MOVETYPE_NONE);
+    setSolidType(SOLID_BBOX);
+    setContents(CONTENTS_BODY);
+
+    // make sure the bounds get rotated with the object
+    flags |= FL_ROTATEDBOUNDS;
+    // by default this can activated infinitely
+    count = -1;
+    // clear out the triggertarget
+    triggertarget = "";
+    // clear out the move thread
+    move_thread.Set("");
+    // clear out the stop thread
+    stop_thread.Set("");
+    // clear out the reset thread
+    reset_thread.Set("");
+    // clear out the damage type, by default useobjects do not respond to damage
+    damage_type = MOD_NONE;
+    // turn on damage taking ability
+    takedamage = DAMAGE_YES;
+    // give it some health
+    health = 100;
+    // set the default yaw offset
+    yaw_offset = 0;
+    // set the cone
+    cone = cos(DEG2RAD(90));
+    // set the state
+    state = "";
+    // set the backwards state
+    state_backwards = "";
+    // clear out the reset_time
+    reset_time = 0;
+    // clear out the object state
+    objectState = 0;
+    // the useobject is active by default
+    active = qtrue;
+
+    // start off in the start animation
+    e = new Event(EV_SetAnim);
+    e->AddString("start");
+    PostEvent(e, 0);
+    PostEvent(EV_Show, 0);
+    // setup our skins once we are spawned
+    PostEvent(EV_UseObject_SetActiveState, 0);
 }
 
-void UseObject::Resetting
-   (
-   Event *ev
-   )
+void UseObject::SetActiveState(Event *ev)
+{
+    if (!useMaterial.length()) {
+        return;
+    }
 
-	{
-   SetActiveState( NULL );
-   NewAnim( "start" );
+    if (active && count) {
+        SurfaceCommand(useMaterial.c_str(), "+skin1");
+    } else {
+        SurfaceCommand(useMaterial.c_str(), "-skin1");
+    }
+    if (objectState) {
+        SurfaceCommand(useMaterial.c_str(), "+skin2");
+    } else {
+        SurfaceCommand(useMaterial.c_str(), "-skin2");
+    }
+}
 
-   // reset the count
-   count = 1;
+void UseObject::SetMoveThread(Event *ev)
+{
+    move_thread.SetThread(ev->GetValue(1));
+}
 
-   //
-   // fire off our trigger target if appropriate
-   //
-	if ( triggertarget.length() )
-		{
-      Event  *event;
-      Entity *ent;
-    
-      ent = NULL;
-		do
-			{
-			ent = ( Entity * )G_FindTarget( ent, triggertarget.c_str() );
-			if ( !ent )
-				{
-				break;
-				}
-		   event = new Event( EV_Activate );
-         event->AddEntity( this );
-			ent->PostEvent( event, 0 );
-         }
-      while ( 1 );
-      }
+void UseObject::SetStopThread(Event *ev)
+{
+    stop_thread.SetThread(ev->GetValue(1));
+}
 
-   //
-   // fire off a thread if necessary
-   //
-	if( reset_thread.IsSet() )
-	{
-		reset_thread.Execute( this );
-	}
-   }
+void UseObject::SetResetThread(Event *ev)
+{
+    reset_thread.SetThread(ev->GetValue(1));
+}
 
-bool UseObject::canBeUsed
-   (
-   Vector org,
-   Vector dir
-   )
+void UseObject::ActivateEvent(Event *ev)
+{
+    active = qtrue;
+    PostEvent(EV_UseObject_SetActiveState, 0);
+}
 
-	{
-   float    dot;
-   Vector   forward;
-   Vector   diff;
-   Vector   ang;
+void UseObject::DeactivateEvent(Event *ev)
+{
+    active = qfalse;
+    PostEvent(EV_UseObject_SetActiveState, 0);
+}
 
-   // see if it is active
-   if ( !active )
-      {
-      return false;
-      }
+void UseObject::SetTriggerTarget(Event *ev)
+{
+    triggertarget = ev->GetString(1);
+}
 
-   // if this is no longer usable, return false
-   if ( !count )
-      {
-      return false;
-      }
+void UseObject::SetOffset(Event *ev)
+{
+    offset = ev->GetVector(1);
+}
 
-   // convert our yawoffset to a vector
-   ang = vec_zero;
-   ang[ YAW ] = angles[ YAW ] + yaw_offset;
-   ang.AngleVectors( &forward );
-   dot = forward * dir;
-   if ( dot < cone )
-      {
-      return false;
-      }
+void UseObject::SetYawOffset(Event *ev)
+{
+    yaw_offset = ev->GetFloat(1);
+}
 
-/*
+void UseObject::SetCount(Event *ev)
+{
+    count = ev->GetInteger(1);
+}
+
+void UseObject::SetCone(Event *ev)
+{
+    cone = cos(DEG2RAD(ev->GetFloat(1)));
+}
+
+void UseObject::SetState(Event *ev)
+{
+    state = ev->GetString(1);
+}
+
+void UseObject::SetBackwardsState(Event *ev)
+{
+    state_backwards = ev->GetString(1);
+}
+
+void UseObject::UseMaterialEvent(Event *ev)
+{
+    useMaterial = ev->GetString(1);
+}
+
+void UseObject::SetResetTime(Event *ev)
+{
+    reset_time = ev->GetFloat(1);
+}
+
+void UseObject::Reset(Event *ev)
+{
+    NewAnim("move_backward", EV_UseObject_Resetting);
+}
+
+void UseObject::Resetting(Event *ev)
+{
+    SetActiveState(NULL);
+    NewAnim("start");
+
+    // reset the count
+    count = 1;
+
+    //
+    // fire off our trigger target if appropriate
+    //
+    if (triggertarget.length()) {
+        Event  *event;
+        Entity *ent;
+
+        ent = NULL;
+        do {
+            ent = (Entity *)G_FindTarget(ent, triggertarget.c_str());
+            if (!ent) {
+                break;
+            }
+            event = new Event(EV_Activate);
+            event->AddEntity(this);
+            ent->PostEvent(event, 0);
+        } while (1);
+    }
+
+    //
+    // fire off a thread if necessary
+    //
+    if (reset_thread.IsSet()) {
+        reset_thread.Execute(this);
+    }
+}
+
+bool UseObject::canBeUsed(Vector org, Vector dir)
+{
+    float  dot;
+    Vector forward;
+    Vector diff;
+    Vector ang;
+
+    // see if it is active
+    if (!active) {
+        return false;
+    }
+
+    // if this is no longer usable, return false
+    if (!count) {
+        return false;
+    }
+
+    // convert our yawoffset to a vector
+    ang      = vec_zero;
+    ang[YAW] = angles[YAW] + yaw_offset;
+    ang.AngleVectors(&forward);
+    dot = forward * dir;
+    if (dot < cone) {
+        return false;
+    }
+
+    /*
    // convert our offset to a vector in worldspace
    forward = getLocalVector( offset );
    forward.normalize();
@@ -2310,201 +1951,151 @@ bool UseObject::canBeUsed
       }
 */
 
-   return true;
-   }
+    return true;
+}
 
-void UseObject::DamageFunc
-	(
-	Event *ev
-	)
+void UseObject::DamageFunc(Event *ev)
+{
+    Event  *e;
+    Entity *attacker;
+    int     mod;
 
-	{
-	Event			*e;
-   Entity		*attacker;
-   int         mod;
+    // if this is no longer usable, return false
+    if (!count) {
+        return;
+    }
 
-   // if this is no longer usable, return false
-   if ( !count )
-      {
-      return;
-      }
+    // what kind of damage hit us
+    mod = ev->GetInteger(9);
 
-   // what kind of damage hit us
-   mod = ev->GetInteger( 9 );
-   
-   // if we don't respond to any kind of damage, and our damage types do not match, return
-   if ( !MOD_matches( mod, damage_type ) )
-      {
-      return;
-      }
+    // if we don't respond to any kind of damage, and our damage types do not match, return
+    if (!MOD_matches(mod, damage_type)) {
+        return;
+    }
 
-   // get the attacker
-   attacker = ev->GetEntity( 1 );
+    // get the attacker
+    attacker = ev->GetEntity(1);
 
-   // 
-   // decrement the use
-   //
-   if ( count > 0 )
-      {
-      count--;
-      }
-   // setup our damage triggered event
-   e = new Event( EV_UseObject_DamageTriggered );
-   // add our attacker
-   e->AddEntity( attacker );
-   // start up the object with our special event
-   Start( e );
-   }
+    //
+    // decrement the use
+    //
+    if (count > 0) {
+        count--;
+    }
+    // setup our damage triggered event
+    e = new Event(EV_UseObject_DamageTriggered);
+    // add our attacker
+    e->AddEntity(attacker);
+    // start up the object with our special event
+    Start(e);
+}
 
-void UseObject::DamageTriggered
-   (
-   Event * ev
-   )
+void UseObject::DamageTriggered(Event *ev)
+{
+    // grab the attacker from our event
+    Stop(ev->GetEntity(1));
+}
 
-	{
-   // grab the attacker from our event
-   Stop( ev->GetEntity( 1 ) );
-   }
+void UseObject::Setup(Entity *activator, Vector *org, Vector *ang, str *newstate)
+{
+    if ((spawnflags & MULTI_STATE) && objectState) {
+        *newstate = state_backwards;
+    } else {
+        *newstate = state;
+    }
 
-void UseObject::Setup
-   (
-   Entity *activator,
-   Vector *org,
-   Vector *ang,
-   str    *newstate
-   )
+    // convert our offset to a vector in worldspace
+    MatrixTransformVector(offset, orientation, *org);
+    *org += origin;
 
-	{
-   if ( ( spawnflags & MULTI_STATE ) && objectState )
-      {
-      *newstate = state_backwards;
-      }
-   else
-      {
-      *newstate = state;
-      }
+    *ang = angles;
+    ang->y += yaw_offset;
 
-   // convert our offset to a vector in worldspace
-   MatrixTransformVector( offset, orientation, *org );
-   *org += origin;
+    //
+    // decrement the use
+    //
+    if (count > 0) {
+        count--;
+    }
+}
 
-   *ang = angles;
-   ang->y += yaw_offset;
+void UseObject::Start(Event *ev)
+{
+    //
+    // fire off the move_thread
+    //
+    if (move_thread.IsSet()) {
+        move_thread.Execute(this);
+    }
 
-   // 
-   // decrement the use
-   //
-   if ( count > 0 )
-      {
-      count--;
-      }
-   }
+    if ((spawnflags & MULTI_STATE) && objectState) {
+        NewAnim("move_backward", ev);
+    } else {
+        NewAnim("move", ev);
+    }
 
-void UseObject::Start
-   (
-   Event * ev
-   )
+    SetActiveState(NULL);
+}
 
-	{
-   //
-   // fire off the move_thread
-   //
-   if ( move_thread.IsSet() )
-      {
-	   move_thread.Execute( this );
-      }
+bool UseObject::Loop(void)
+{
+    if (!count) {
+        return qfalse;
+    }
 
-   if ( ( spawnflags & MULTI_STATE ) && objectState )
-	{
-		NewAnim( "move_backward", ev );
-	}
-	else
-	{
-		NewAnim( "move", ev );
-	}
+    return qtrue;
+}
 
-   SetActiveState( NULL );
-   }
+void UseObject::Stop(Entity *activator)
+{
+    if ((spawnflags & MULTI_STATE) && objectState) {
+        NewAnim("start");
+    } else {
+        NewAnim("stop");
+    }
 
-bool UseObject::Loop
-   (
-   void
-   )
+    //
+    // fire off our trigger target if appropriate
+    //
+    if (triggertarget.length()) {
+        Event  *event;
+        Entity *ent;
 
-	{
-   if ( !count )
-      return qfalse;
+        ent = NULL;
+        do {
+            ent = (Entity *)G_FindTarget(ent, triggertarget.c_str());
+            if (!ent) {
+                break;
+            }
+            event = new Event(EV_Activate);
+            event->AddEntity(activator);
+            ent->PostEvent(event, 0);
+        } while (1);
+    }
 
-   return qtrue;
-   }
+    //
+    // fire off a thread if necessary
+    //
+    if ((spawnflags & MULTI_STATE) && objectState) {
+        if (reset_thread.IsSet()) {
+            reset_thread.Execute(this);
+        }
+    } else {
+        if (stop_thread.IsSet()) {
+            stop_thread.Execute(this);
+        }
+    }
 
-void UseObject::Stop
-   (
-   Entity *activator
-   )
+    // toggle the state
+    objectState ^= 1;
 
-	{
-	if( ( spawnflags & MULTI_STATE ) && objectState )
-	{
-		NewAnim( "start" );
-	}
-	else
-	{
-		NewAnim( "stop" );
-	}
+    if (reset_time) {
+        count = 0;
+        PostEvent(EV_UseObject_Reset, reset_time);
+    }
 
-   //
-   // fire off our trigger target if appropriate
-   //
-	if ( triggertarget.length() )
-		{
-      Event  *event;
-      Entity *ent;
-    
-      ent = NULL;
-		do
-			{
-			ent = ( Entity * )G_FindTarget( ent, triggertarget.c_str() );
-			if ( !ent )
-				{
-				break;
-				}
-		   event = new Event( EV_Activate );
-         event->AddEntity( activator );
-			ent->PostEvent( event, 0 );
-         }
-      while ( 1 );
-      }
-
-   //
-   // fire off a thread if necessary
-   //
-   if ( ( spawnflags & MULTI_STATE ) && objectState )
-      {
-      if ( reset_thread.IsSet() )
-         {
-		  reset_thread.Execute( this );
-         }
-      }
-   else
-      {
-      if ( stop_thread.IsSet() )
-         {
-		  stop_thread.Execute( this );
-         }
-      }
-
-   // toggle the state
-   objectState ^= 1;
-
-   if ( reset_time )
-      {
-      count = 0;
-      PostEvent( EV_UseObject_Reset, reset_time );
-      }
-
-   SetActiveState( NULL );
-   }
+    SetActiveState(NULL);
+}
 
 /*****************************************************************************/
 /*QUAKED info_waypoint (0 0.5 0) (-8 -8 -8) (8 8 8)
@@ -2513,16 +2104,24 @@ Used as a positioning device for objects
 
 ******************************************************************************/
 
-CLASS_DECLARATION( SimpleArchivedEntity, Waypoint, "info_waypoint" )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(SimpleArchivedEntity, Waypoint, "info_waypoint") {
+    {NULL, NULL}
 };
 
-CLASS_DECLARATION( SimpleArchivedEntity, TempWaypoint, NULL )
+Waypoint::Waypoint()
 {
-	{ NULL, NULL }
+    entflags |= ECF_WAYPOINT;
+}
+
+CLASS_DECLARATION(SimpleArchivedEntity, TempWaypoint, NULL) {
+    {NULL, NULL}
 };
 
+TempWaypoint::TempWaypoint()
+{
+    entflags |= ECF_TEMPWAYPOINT;
+}
+
 /*****************************************************************************/
 /*QUAKED info_vehiclepoint (0.15 0.5 0.25) (-8 -8 -8) (8 8 8) START_STOPPING START_SKIDDING STOP_SKIDDING
 
@@ -2531,26 +2130,28 @@ Like info_waypoints, but with spawnflags for vehicles.
 ******************************************************************************/
 
 Event EV_VehiclePoint_SetSpawnFlags
-	(
-	"spawnflags",
-	EV_DEFAULT,
-	"i",
-	"spawn_flags",
-	"Sets the spawn flags."
-	);
+(
+    "spawnflags",
+    EV_DEFAULT,
+    "i",
+    "spawn_flags",
+    "Sets the spawn flags."
+);
 
-CLASS_DECLARATION( Waypoint, VehiclePoint, NULL )
-{
-	{ &EV_VehiclePoint_SetSpawnFlags,				&VehiclePoint::SetSpawnFlags },
-	{ NULL, NULL }
+CLASS_DECLARATION(Waypoint, VehiclePoint, "info_vehiclepoint") {
+    {&EV_VehiclePoint_SetSpawnFlags, &VehiclePoint::SetSpawnFlags},
+    {NULL,                           NULL                        }
 };
 
-void VehiclePoint::SetSpawnFlags
-	(
-	Event *ev
-	)
+VehiclePoint::VehiclePoint()
 {
-	spawnflags = ev->GetInteger( 1 );
+    entflags |= ECF_VEHICLEPOINT;
+    spawnflags = 0;
+}
+
+void VehiclePoint::SetSpawnFlags(Event *ev)
+{
+    spawnflags = ev->GetInteger(1);
 }
 
 /*****************************************************************************/
@@ -2560,33 +2161,27 @@ Monkey bars
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, MonkeyBars, "func_monkeybars" )
-{
-	{ &EV_SetAngle,			 &MonkeyBars::SetAngleEvent },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, MonkeyBars, "func_monkeybars") {
+    {&EV_SetAngle, &MonkeyBars::SetAngleEvent},
+    {NULL,         NULL                      }
 };
 
 MonkeyBars::MonkeyBars()
-	{
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-	setMoveType( MOVETYPE_NONE );
-   setContents( CONTENTS_SHOOTONLY | MASK_SOLID );
-   PostEvent( EV_BecomeSolid, 0 );
-   dir = 0;
-	}
+{
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    setMoveType(MOVETYPE_NONE);
+    setContents(CONTENTS_SHOOTONLY | MASK_SOLID);
+    PostEvent(EV_BecomeSolid, 0);
+    dir = 0;
+}
 
-void MonkeyBars::SetAngleEvent
-	(
-	Event *ev
-	)
-
-	{
-   dir = ev->GetFloat( 1 );
-   }
+void MonkeyBars::SetAngleEvent(Event *ev)
+{
+    dir = ev->GetFloat(1);
+}
 
 /*****************************************************************************/
 /*QUAKED func_horizontalpipe (0.75 0.75 0.75) ?
@@ -2595,202 +2190,165 @@ Horizontal pipe that play can crawl upside down on.
 
 ******************************************************************************/
 
-CLASS_DECLARATION( Entity, HorizontalPipe, "func_horizontalpipe" )
-	{
-      { &EV_SetAngle,			         &HorizontalPipe::SetAngleEvent },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, HorizontalPipe, "func_horizontalpipe") {
+    {&EV_SetAngle, &HorizontalPipe::SetAngleEvent},
+    {NULL,         NULL                          }
+};
 
 HorizontalPipe::HorizontalPipe()
-	{
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-	setMoveType( MOVETYPE_NONE );
-   setContents( CONTENTS_SHOOTONLY | MASK_SOLID );
-   PostEvent( EV_BecomeSolid, 0 );
-   dir = 0;
-	}
+{
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    setMoveType(MOVETYPE_NONE);
+    setContents(CONTENTS_SHOOTONLY | MASK_SOLID);
+    PostEvent(EV_BecomeSolid, 0);
+    dir = 0;
+}
 
-void HorizontalPipe::SetAngleEvent
-	(
-	Event *ev
-	)
-
-	{
-   dir = ev->GetFloat( 1 );
-   }
+void HorizontalPipe::SetAngleEvent(Event *ev)
+{
+    dir = ev->GetFloat(1);
+}
 
 /*****************************************************************************/
 // TossObject
 /*****************************************************************************/
 
 Event EV_TossObject_SetBounceSound
-   (
-   "bouncesound",
-   EV_DEFAULT,
-   "s",
-   "sound",
-   "When bouncing, what sound to play on impact",
-	EV_NORMAL
-   );
+(
+    "bouncesound",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "When bouncing, what sound to play on impact",
+    EV_NORMAL
 
-Event EV_TossObject_SetBounceSoundChance
-   (
-   "bouncesoundchance",
-   EV_DEFAULT,
-   "f[0,1]",
-   "chance",
-   "When bouncing, the chance that the bounce sound will be played",
-	EV_NORMAL
-   );
+);
+Event EV_TossObject_SetBounceSoundChance(
+    "bouncesoundchance",
+    EV_DEFAULT,
+    "f[0,1]",
+    "chance",
+    "When bouncing, the chance that the bounce sound will be played",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Animate, TossObject, "TossObject" )
-	{
-      { &EV_Touch,								&TossObject::Touch },
-      { &EV_Stop,								&TossObject::Stop },
-      { &EV_TossObject_SetBounceSound,			&TossObject::SetBounceSound },
-      { &EV_TossObject_SetBounceSoundChance,	&TossObject::SetBounceSoundChance },
-      { NULL, NULL }
-	};
+CLASS_DECLARATION(Animate, TossObject, "TossObject") {
+    {&EV_Touch,                           &TossObject::Touch               },
+    {&EV_Stop,                            &TossObject::Stop                },
+    {&EV_TossObject_SetBounceSound,       &TossObject::SetBounceSound      },
+    {&EV_TossObject_SetBounceSoundChance, &TossObject::SetBounceSoundChance},
+    {NULL,                                NULL                             }
+};
 
 TossObject::TossObject()
-   {
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-	setMoveType( MOVETYPE_GIB );
-	setSolidType( SOLID_NOT );
-   bouncesound        = "";
-   bouncesoundchance  = 1.0f; 
-   }
+{
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    setMoveType(MOVETYPE_GIB);
+    setSolidType(SOLID_NOT);
+    bouncesound       = "";
+    bouncesoundchance = 1.0f;
+}
 
-TossObject::TossObject( str model )
-   {
-	setMoveType( MOVETYPE_GIB );
-	setSolidType( SOLID_NOT );
-   bouncesound        = "";
-   bouncesoundchance  = 1.0f; 
-   setModel( model );
-   }
+TossObject::TossObject(str model)
+{
+    setMoveType(MOVETYPE_GIB);
+    setSolidType(SOLID_NOT);
+    bouncesound       = "";
+    bouncesoundchance = 1.0f;
+    setModel(model);
+}
 
-void TossObject::SetBounceSound
-   (
-   str bounce
-   )
+void TossObject::SetBounceSound(str bounce)
+{
+    bouncesound = bounce;
+}
 
-   {
-   bouncesound = bounce;
-   }
+void TossObject::SetBounceSound(Event *ev)
+{
+    bouncesound = ev->GetString(1);
+}
 
-void TossObject::SetBounceSound
-   (
-   Event *ev
-   )
+void TossObject::SetBounceSoundChance(float chance)
+{
+    bouncesoundchance = chance;
+}
 
-   {
-   bouncesound = ev->GetString( 1 );
-   }
+void TossObject::SetBounceSoundChance(Event *ev)
+{
+    bouncesoundchance = ev->GetFloat(1);
+}
 
-void TossObject::SetBounceSoundChance
-   (
-   float chance
-   )
+void TossObject::Stop(Event *ev)
+{
+    setMoveType(MOVETYPE_NONE);
+    setSolidType(SOLID_NOT);
+    // cancel the previous fade out command
+    CancelEventsOfType(EV_FadeOut);
+    PostEvent(EV_FadeOut, 7 + G_Random(5));
+    setAngles(Vector("0 0 0"));
+    NewAnim("landed");
+}
 
-   {
-   bouncesoundchance = chance;
-   }
+void TossObject::Touch(Event *ev)
+{
+    Entity *ent;
 
-void TossObject::SetBounceSoundChance
-   (
-   Event *ev
-   )
+    ent = ev->GetEntity(1);
 
-   {
-   bouncesoundchance = ev->GetFloat( 1 );
-   }
+    // only touch the world
+    if (!ent || (ent != world)) {
+        return;
+    }
+    //
+    // every time we bounce try to go back to our nominal angles
+    //
+    setAngles(angles * 0.5f);
 
-void TossObject::Stop 
-   (
-   Event *ev 
-   )
+    if (bouncesound.length()) {
+        if (G_Random(1) < bouncesoundchance) {
+            Sound(bouncesound);
+        }
+    }
+}
 
-   {
-   setMoveType( MOVETYPE_NONE );
-   setSolidType( SOLID_NOT );
-   // cancel the previous fade out command
-   CancelEventsOfType( EV_FadeOut );
-   PostEvent( EV_FadeOut, 7 + G_Random( 5 ) );
-   setAngles( Vector( "0 0 0" ) );
-   NewAnim( "landed" );
-   }
+void TossObject::SetVelocity(float severity)
+{
+    setSolidType(SOLID_BBOX);
+    velocity[0] = 100.0 * crandom();
+    velocity[1] = 100.0 * crandom();
+    velocity[2] = 200.0 + 100.0 * random();
 
-void TossObject::Touch
-	(
-	Event *ev
-	)
+    avelocity = Vector(G_Random(600), G_Random(600), G_Random(600));
 
-   {
-   Entity * ent;
+    velocity *= severity;
 
-   ent = ev->GetEntity( 1 );
+    if (velocity[0] < -400) {
+        velocity[0] = -400;
+    } else if (velocity[0] > 400) {
+        velocity[0] = 400;
+    }
+    if (velocity[1] < -400) {
+        velocity[1] = -400;
+    } else if (velocity[1] > 400) {
+        velocity[1] = 400;
+    }
+    if (velocity[2] < 200) {
+        velocity[2] = 200; // always some upwards
+    } else if (velocity[2] > 600) {
+        velocity[2] = 600;
+    }
 
-   // only touch the world
-   if ( !ent || ( ent != world ) )
-      {
-      return;
-      }
-   //
-   // every time we bounce try to go back to our nominal angles
-   //
-   setAngles( angles * 0.5f ); 
+    NewAnim("idle");
 
-   if ( bouncesound.length() )
-      {
-      if ( G_Random( 1 ) < bouncesoundchance )
-         {
-         Sound( bouncesound );
-         }
-      }
-   }
-
-void TossObject::SetVelocity
-	(
-   float severity
-	)
-
-   {
-   setSolidType( SOLID_BBOX );
-   velocity[0] = 100.0 * crandom();
-	velocity[1] = 100.0 * crandom();
-	velocity[2] = 200.0 + 100.0 * random();
-
-   avelocity = Vector( G_Random( 600 ), G_Random( 600 ), G_Random( 600 ) );
-
-   velocity *= severity;
-
-	if (velocity[0] < -400)
-		velocity[0] = -400;
-	else if (velocity[0] > 400)
-		velocity[0] = 400;
-	if (velocity[1] < -400)
-		velocity[1] = -400;
-	else if (velocity[1] > 400)
-		velocity[1] = 400;
-	if (velocity[2] < 200)
-		velocity[2] = 200;	// always some upwards
-	else if (velocity[2] > 600)
-		velocity[ 2 ] = 600;
-
-	NewAnim( "idle" );
-
-   // we give it 8 seconds to fall, if not it will get faded out
-   PostEvent( EV_FadeOut, 8 );
-   }
+    // we give it 8 seconds to fall, if not it will get faded out
+    PostEvent(EV_FadeOut, 8);
+}
 
 /*****************************************************************************/
 /*QUAKED func_pushobject (0.75 0.75 0.75) ?
@@ -2803,174 +2361,136 @@ Pushable object
 ******************************************************************************/
 
 Event EV_PushObject_Start
-	( 
-	"start",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets up the pushobject.",
-	EV_NORMAL
-	);
+(
+    "start", EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up the pushobject.",
+    EV_NORMAL
+);
 
 Event EV_PushObject_SetDamage
-	( 
-	"dmg",
-	EV_DEFAULT,
-	"i",
-	"damage",
-	"Set the damage.",
-	EV_NORMAL
-	);
+(
+    "dmg", EV_DEFAULT,
+    "i",
+    "damage",
+    "Set the damage.",
+    EV_NORMAL
+);
 
 Event EV_PushObject_SetPushSound
-	( 
-	"pushsound",
-	EV_DEFAULT,
-	"s",
-	"sound",
-	"Set the pushing sound",
-	EV_NORMAL
-	);
+(
+    "pushsound", EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the pushing sound",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Entity, PushObject, "func_pushobject" )
-	{
-      { &EV_PushObject_Start,			&PushObject::Start },
-	   { &EV_Blocked,					&PushObject::BlockFunc },
-      { &EV_PushObject_SetDamage,		&PushObject::SetDamage },
-      { &EV_PushObject_SetPushSound,	&PushObject::SetPushSound },
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(Entity, PushObject, "func_pushobject") {
+    {&EV_PushObject_Start,        &PushObject::Start       },
+    {&EV_Blocked,                 &PushObject::BlockFunc   },
+    {&EV_PushObject_SetDamage,    &PushObject::SetDamage   },
+    {&EV_PushObject_SetPushSound, &PushObject::SetPushSound},
+    {NULL,                        NULL                     }
+};
 
 PushObject::PushObject()
-	{
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-	dmg					= 2;
-	attack_finished   = 0;
+{
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    dmg             = 2;
+    attack_finished = 0;
 
-	pushsound = "object_slide";
+    pushsound = "object_slide";
 
-   PostEvent( EV_PushObject_Start, EV_POSTSPAWN );
-	}
+    PostEvent(EV_PushObject_Start, EV_POSTSPAWN);
+}
 
-void PushObject::SetPushSound
-   (
-   Event *ev
-   )
+void PushObject::SetPushSound(Event *ev)
+{
+    pushsound = ev->GetString(1);
+}
 
-   {
-   pushsound = ev->GetString( 1 );
-   }
+void PushObject::Start(Event *ev)
+{
+    // make sure that this touches triggers
+    flags |= FL_TOUCH_TRIGGERS;
+    edict->clipmask = MASK_SOLID;
+    setSolidType(SOLID_BSP);
+    setMoveType(MOVETYPE_PUSH);
 
-void PushObject::Start
-   (
-   Event *ev
-   )
+    // fix the bounding box so that the object isn't stuck in the ground
+    setSize(mins + Vector(1, 1, 2), maxs - Vector(1, 1, 1));
+}
 
-   {
-   // make sure that this touches triggers
-	flags |= FL_TOUCH_TRIGGERS;
-   edict->clipmask = MASK_SOLID;
-   setSolidType( SOLID_BSP );
-   setMoveType( MOVETYPE_PUSH );
+qboolean PushObject::canPush(Vector dir)
+{
+    trace_t trace;
 
-   // fix the bounding box so that the object isn't stuck in the ground
-   setSize( mins + Vector( 1, 1, 2 ), maxs - Vector( 1, 1, 1 ) );
-   }
+    Vector end(origin.x + dir.x, origin.y + dir.y, origin.z);
 
-qboolean PushObject::canPush
-   (
-   Vector dir
-   )
+    trace = G_Trace(origin, mins, maxs, end, this, MASK_DEADSOLID, false, "PushObject::Push");
+    return (!trace.startsolid && (trace.fraction == 1.0f));
+}
 
-   {
-   trace_t trace;
+qboolean PushObject::Push(Entity *pusher, Vector move)
+{
+    trace_t trace;
 
-   Vector end( origin.x + dir.x, origin.y + dir.y, origin.z );
+    if (pushsound.length()) {
+        if (!edict->s.loopSound) {
+            LoopSound(pushsound);
+            PostEvent(EV_StopLoopSound, level.frametime * 5);
+        }
+    }
 
-   trace = G_Trace( origin, mins, maxs, end, this, MASK_DEADSOLID, false, "PushObject::Push" );
-   return ( !trace.startsolid && ( trace.fraction == 1.0f ) );
-   }
+    Vector end(origin.x + move.x, origin.y + move.y, origin.z);
 
-qboolean PushObject::Push
-   (
-   Entity *pusher,
-   Vector move
-   )
+    trace = G_Trace(origin, mins, maxs, end, this, MASK_DEADSOLID, false, "PushObject::Push");
+    if (!trace.startsolid && (trace.fraction > 0)) {
+        owner = pusher;
 
-   {
-   trace_t trace;
+        G_PushMove(this, trace.endpos - origin, vec_zero);
 
-   if ( pushsound.length() )
-      {
-      if ( !edict->s.loopSound )
-         {
-         LoopSound( pushsound );
-         PostEvent( EV_StopLoopSound, level.frametime * 5 );
-         }
-      }
+        if (edict->s.loopSound) {
+            PostEvent(EV_StopLoopSound, 0.f);
+        }
 
-   Vector end( origin.x + move.x, origin.y + move.y, origin.z );
+        return qtrue;
+    }
 
-   trace = G_Trace( origin, mins, maxs, end, this, MASK_DEADSOLID, false, "PushObject::Push" );
-   if ( !trace.startsolid && ( trace.fraction > 0 ) )
-      {
-      owner = pusher;
+    return qfalse;
+}
 
-      G_PushMove( this, trace.endpos - origin, vec_zero );
+Entity *PushObject::getOwner(void)
+{
+    return (Entity *)owner;
+}
 
-      if ( edict->s.loopSound )
-         PostEvent( EV_StopLoopSound, 0.f );
+void PushObject::BlockFunc(Event *ev)
+{
+    Entity *other;
 
-      return qtrue;
-      }
+    if ((dmg != 0) && (level.time >= attack_finished)) {
+        attack_finished = level.time + 0.5f;
+        other           = ev->GetEntity(1);
+        if (other != owner) {
+            other->Damage(this, this, dmg, origin, vec_zero, vec_zero, 0, 0, MOD_CRUSH);
+        }
+    }
+}
 
-   return qfalse;
-   }
+void PushObject::SetDamage(Event *ev)
+{
+    dmg = ev->GetInteger(1);
+}
 
-Entity *PushObject::getOwner
-   (
-   void
-   )
-
-   {
-   return ( Entity * )owner;
-   }
-
-void PushObject::BlockFunc
-	(
-	Event *ev
-	)
-
-	{
-	Entity *other;
-
-	if ( ( dmg != 0 ) && ( level.time >= attack_finished ) )
-		{
-		attack_finished = level.time + 0.5f;
-	   other = ev->GetEntity( 1 );
-      if ( other != owner )
-         {
-         other->Damage( this, this, dmg, origin, vec_zero, vec_zero, 0, 0, MOD_CRUSH );
-         }
-		}
-	}
-
-void PushObject::SetDamage
-	(
-	Event *ev
-	)
-
-	{
-	dmg = ev->GetInteger( 1 );
-	}
-
-#define SPAWN_AUTO_RESET   ( 1 << 0 )
-#define NO_RANDOMNESS      ( 1 << 1 )
-#define REMOVE_ON_GROUND   ( 1 << 2 )
+#define SPAWN_AUTO_RESET (1 << 0)
+#define NO_RANDOMNESS    (1 << 1)
+#define REMOVE_ON_GROUND (1 << 2)
 /*****************************************************************************/
 /*QUAKED func_fallingrock (0.75 0.75 0.75) ? AUTO_RESET NO_RANDOMNESS REMOVE_ON_GROUND
 
@@ -2990,399 +2510,315 @@ REMOVE_ON_GROUND - remove the rocks when done
 ******************************************************************************/
 
 Event EV_FallingRock_Bounce
-	( 
-	"bounce",
-	EV_DEFAULT,
-   NULL,
-	NULL,
-	"sent to entity when touched.",
-	EV_NORMAL
-	);
-
+(
+    "bounce",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sent to entity when touched.",
+    EV_NORMAL
+);
 Event EV_FallingRock_Rotate
-	( 
-	"rotate",
-	EV_DEFAULT,
-   NULL,
-	NULL,
-	"rotates the falling rock.",
-	EV_NORMAL
-	);
-
+(
+    "rotate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "rotates the falling rock.",
+    EV_NORMAL
+);
 Event EV_FallingRock_SetWait
-	( 
-	"wait",
-	EV_DEFAULT,
-   "f",
-	"wait",
-	"How long to wait before rock starts falling.",
-	EV_NORMAL
-	);
-
+(
+    "wait",
+    EV_DEFAULT,
+    "f",
+    "wait",
+    "How long to wait before rock starts falling.",
+    EV_NORMAL
+);
 Event EV_FallingRock_Start
-	( 
-	"start",
-	EV_DEFAULT,
-   NULL,
-	NULL,
-	"Starts rock falling.",
-	EV_NORMAL
-	);
-
+(
+    "start",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Starts rock falling.",
+    EV_NORMAL
+);
 Event EV_FallingRock_SetDmg
-	( 
-	"dmg",
-	EV_DEFAULT,
-   "i",
-   "dmg",
-   "Set the damage from the rock.",
-	EV_NORMAL
-	);
-
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "dmg",
+    "Set the damage from the rock.",
+    EV_NORMAL
+);
 Event EV_FallingRock_SetSpeed
-	( 
-	"speed",
-	EV_DEFAULT,
-   "f",
-   "speed",
-   "Set the speed that the rock moves at.",
-	EV_NORMAL
-	);
-
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the speed that the rock moves at.",
+    EV_NORMAL
+);
 Event EV_FallingRock_SetBounceSound
-   (
-   "noise",
-   EV_DEFAULT,
-   "s",
-   "sound",
-   "Set the sound to play when the rock bounces",
-	EV_NORMAL
-   );
+(
+    "noise",
+    EV_DEFAULT,
+    "s",
+    "sound",
+    "Set the sound to play when the rock bounces",
+    EV_NORMAL
 
-CLASS_DECLARATION( Entity, FallingRock, "func_fallingrock" )
-	{
-      { &EV_Activate,							&FallingRock::Activate },
-      { &EV_Touch,								&FallingRock::Touch },
-      { &EV_FallingRock_Bounce,					&FallingRock::Bounce },
-      { &EV_FallingRock_Rotate,					&FallingRock::Rotate },
-      { &EV_FallingRock_Start,					&FallingRock::StartFalling },
-      { &EV_FallingRock_SetWait,				&FallingRock::SetWait },
-      { &EV_FallingRock_SetSpeed,				&FallingRock::SetSpeed },
-      { &EV_FallingRock_SetDmg,					&FallingRock::SetDmg },
-      { &EV_FallingRock_SetBounceSound,			&FallingRock::SetBounceSound },
-      { NULL, NULL }
-	};
+);
+
+CLASS_DECLARATION(Entity, FallingRock, "func_fallingrock") {
+    {&EV_Activate,                   &FallingRock::Activate      },
+    {&EV_Touch,                      &FallingRock::Touch         },
+    {&EV_FallingRock_Bounce,         &FallingRock::Bounce        },
+    {&EV_FallingRock_Rotate,         &FallingRock::Rotate        },
+    {&EV_FallingRock_Start,          &FallingRock::StartFalling  },
+    {&EV_FallingRock_SetWait,        &FallingRock::SetWait       },
+    {&EV_FallingRock_SetSpeed,       &FallingRock::SetSpeed      },
+    {&EV_FallingRock_SetDmg,         &FallingRock::SetDmg        },
+    {&EV_FallingRock_SetBounceSound, &FallingRock::SetBounceSound},
+    {NULL,                           NULL                        }
+};
 
 FallingRock::FallingRock()
-   {
-   if ( LoadingSavegame )
-      {
-      // Archive function will setup all necessary data
-      return;
-      }
-   active = 0;
-   current = NULL;
-	setMoveType( MOVETYPE_NONE );
-   wait = 0;
-   dmg = 20;
-   speed = 200;
-   activator = NULL;
-   attack_finished = 0;
-
-   SetBounceSound( "impact_rock" );
-   }
-
-Entity *FallingRock::SetNextBounceDir
-   (
-   void
-   )
-
-   {
-   Entity *ent;
-
-   if ( !current->target.length() )
-      {
-      return NULL;
-      }
-
-   ent = ( Entity * )G_FindTarget( NULL, current->target.c_str() );
-	if ( !ent )
-		{
-		gi.Error( ERR_DROP, "FallingRock :: Entity with targetname of '%s' not found", current->target.c_str() );
-		}
-
-   bounce_dir = ent->origin - current->origin;
-   bounce_dir.normalize();
-
-   return ent;
-   }
-
-
-void FallingRock::NextBounce
-   (
-   void
-   )
-
-   {
-   float time;
-   float distance;
-   Vector delta, xydelta;
-   float xy_speed;
-   float vertical_speed;
-
-   delta = current->origin - origin;
-   xydelta = delta;
-   xydelta.z = 0;
-   xy_speed = speed;
-
-   distance = xydelta.normalize();
-
-   time = distance / xy_speed;
-
-   if ( !( spawnflags & NO_RANDOMNESS ) )
-      {
-      if ( time > 1.0f )
-         {
-         time = 0.75f + G_Random( 1 );
-         }
-
-      if ( time < 0.4f )
-         {
-         time = 0.4f;
-         }
-      }
-
-   vertical_speed = ( delta.z / time ) + ( 0.5f * gravity * sv_gravity->value * time );
-   if ( vertical_speed < 0 )
-      {
-      vertical_speed = 0;
-      }
-
-   velocity = xydelta * xy_speed;
-   velocity.z = vertical_speed;
-
-   Vector ang( 0, vectoyaw( delta ), 0 );
-   ang.AngleVectors( NULL, &rotateaxis );
-
-   // make sure it leaves the ground
-	groundentity = NULL;
-   }
-
-void FallingRock::Rotate
-   (
-   Event *ev
-   )
-
-   {
-   float mat[ 3 ][ 3 ];
-   float ang;
-
-   ang = 360.0f * FRAMETIME;
-   RotatePointAroundVector( mat[ 0 ], rotateaxis, orientation[ 0 ], ang );
-   RotatePointAroundVector( mat[ 1 ], rotateaxis, orientation[ 1 ], ang );
-   RotatePointAroundVector( mat[ 2 ], rotateaxis, orientation[ 2 ], ang );
-   MatrixToEulerAngles( mat, angles );
-   setAngles( angles );
-
-   if ( velocity != vec_zero )
-      {
-      PostEvent( EV_FallingRock_Rotate, FRAMETIME );
-      }
-   }
-
-void FallingRock::SetWait
-   (
-   Event *ev
-   )
-
-   {
-   wait = ev->GetFloat( 1 );
-   }
-
-void FallingRock::SetSpeed
-   (
-   Event *ev
-   )
-
-   {
-   speed = ev->GetFloat( 1 );
-   }
-
-void FallingRock::SetDmg
-   (
-   Event *ev
-   )
-
-   {
-   dmg = ev->GetInteger( 1 );
-   }
-
-void FallingRock::SetBounceSound
-	(
-	str sound
-	)
 {
-	bouncesound = sound;
-	// cache the sound in
-	CacheResource( bouncesound.c_str() );
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
+    active  = 0;
+    current = NULL;
+    setMoveType(MOVETYPE_NONE);
+    wait            = 0;
+    dmg             = 20;
+    speed           = 200;
+    activator       = NULL;
+    attack_finished = 0;
+
+    SetBounceSound("impact_rock");
 }
 
-void FallingRock::SetBounceSound
-   (
-   Event *ev
-   )
+Entity *FallingRock::SetNextBounceDir(void)
+{
+    Entity *ent;
 
-   {
-   SetBounceSound( ev->GetString( 1 ) );
-   }
+    if (!current->target.length()) {
+        return NULL;
+    }
 
-void FallingRock::Activate
-   (
-   Event *ev
-   )
+    ent = (Entity *)G_FindTarget(NULL, current->target.c_str());
+    if (!ent) {
+        gi.Error(ERR_DROP, "FallingRock :: Entity with targetname of '%s' not found", current->target.c_str());
+    }
 
-   {
-   if ( active == 1 )
-      return;
+    bounce_dir = ent->origin - current->origin;
+    bounce_dir.normalize();
 
-   if ( ( active == 2 ) && ( spawnflags & SPAWN_AUTO_RESET ) )
-      {
-      current = NULL;
-      activator = NULL;
-	   setMoveType( MOVETYPE_NONE );
-      NoLerpThisFrame();
-      setOrigin( start_origin );
-      }
+    return ent;
+}
 
-   activator = ev->GetEntity( 1 );
+void FallingRock::NextBounce(void)
+{
+    float  time;
+    float  distance;
+    Vector delta, xydelta;
+    float  xy_speed;
+    float  vertical_speed;
 
-   if ( wait )
-      {
-      PostEvent( EV_FallingRock_Start, wait );
-      }
-   else
-      {
-      ProcessEvent( EV_FallingRock_Start );
-      }
-   }
+    delta     = current->origin - origin;
+    xydelta   = delta;
+    xydelta.z = 0;
+    xy_speed  = speed;
 
-void FallingRock::StartFalling
-   (
-   Event *ev
-   )
-   
-   {
-   if ( current )
-      {
-      return;
-      }
+    distance = xydelta.normalize();
 
-   if ( !active )
-      {
-      start_origin = origin;
-      }
+    time = distance / xy_speed;
 
-   active = 1;
-   setMoveType( MOVETYPE_BOUNCE );
-   setSolidType( SOLID_BBOX );
-   PostEvent( EV_FallingRock_Rotate, FRAMETIME );
-   edict->clipmask = MASK_SOLID|CONTENTS_BODY;
+    if (!(spawnflags & NO_RANDOMNESS)) {
+        if (time > 1.0f) {
+            time = 0.75f + G_Random(1);
+        }
 
-   last_bounce_origin = origin;
-   current = this;
-   current = SetNextBounceDir();
-   if ( current )
-      {
-      NextBounce();
-      }
-   }
+        if (time < 0.4f) {
+            time = 0.4f;
+        }
+    }
 
-void FallingRock::Touch
-	(
-	Event *ev
-	)
+    vertical_speed = (delta.z / time) + (0.5f * gravity * sv_gravity->value * time);
+    if (vertical_speed < 0) {
+        vertical_speed = 0;
+    }
 
-   {
-   Entity *other;
+    velocity   = xydelta * xy_speed;
+    velocity.z = vertical_speed;
 
-   other = ev->GetEntity( 1 );
+    Vector ang(0, vectoyaw(delta), 0);
+    ang.AngleVectors(NULL, &rotateaxis);
 
-   if ( other != world )
-      {
-   	if ( ( velocity != vec_zero ) && ( other->takedamage ) && ( level.time >= attack_finished ) )
-	   	{
-         other->Damage( this, activator, dmg, origin, vec_zero, vec_zero, 20, 0, MOD_THROWNOBJECT );
-	   	attack_finished = level.time + FRAMETIME;
-		   }
-      }
+    // make sure it leaves the ground
+    groundentity = NULL;
+}
 
-   if ( !current || ( other != world ) )
-      {
-      return;
-      }
-   if ( bouncesound.length() )
-      {
-      Vector delta( origin - last_bounce_origin );
+void FallingRock::Rotate(Event *ev)
+{
+    float mat[3][3];
+    float ang;
 
-      if ( delta.length() > 8 )
-         {
-         last_bounce_origin = origin;
-		   Sound( bouncesound.c_str(), CHAN_VOICE );
-         }
-      }
+    ang = 360.0f * FRAMETIME;
+    RotatePointAroundVector(mat[0], rotateaxis, orientation[0], ang);
+    RotatePointAroundVector(mat[1], rotateaxis, orientation[1], ang);
+    RotatePointAroundVector(mat[2], rotateaxis, orientation[2], ang);
+    MatrixToEulerAngles(mat, angles);
+    setAngles(angles);
 
-   // we have to wait to set the velocity since the physics code
-   // will modify it when we return.
-   PostEvent( EV_FallingRock_Bounce, 0 );
-   }
+    if (velocity != vec_zero) {
+        PostEvent(EV_FallingRock_Rotate, FRAMETIME);
+    }
+}
 
-void FallingRock::Bounce
-	(
-	Event *ev
-	)
+void FallingRock::SetWait(Event *ev)
+{
+    wait = ev->GetFloat(1);
+}
 
-   {
-   Vector delta;
+void FallingRock::SetSpeed(Event *ev)
+{
+    speed = ev->GetFloat(1);
+}
 
-   if ( !current )
-      {
-      return;
-      }
+void FallingRock::SetDmg(Event *ev)
+{
+    dmg = ev->GetInteger(1);
+}
 
-   do
-      {
-      // check if we've passed the waypoint
-      delta = origin - current->origin;
-      if ( ( delta * bounce_dir ) >= ( -2 * edict->r.radius ) )       
-         {
-         // call any threads on the current waypoint
-         if ( current->isSubclassOf( Trigger ) )
-            {
-            current->ProcessEvent( EV_Trigger_StartThread );
+void FallingRock::SetBounceSound(str sound)
+{
+    bouncesound = sound;
+    // cache the sound in
+    CacheResource(bouncesound.c_str());
+}
+
+void FallingRock::SetBounceSound(Event *ev)
+{
+    SetBounceSound(ev->GetString(1));
+}
+
+void FallingRock::Activate(Event *ev)
+{
+    if (active == 1) {
+        return;
+    }
+
+    if ((active == 2) && (spawnflags & SPAWN_AUTO_RESET)) {
+        current   = NULL;
+        activator = NULL;
+        setMoveType(MOVETYPE_NONE);
+        NoLerpThisFrame();
+        setOrigin(start_origin);
+    }
+
+    activator = ev->GetEntity(1);
+
+    if (wait) {
+        PostEvent(EV_FallingRock_Start, wait);
+    } else {
+        ProcessEvent(EV_FallingRock_Start);
+    }
+}
+
+void FallingRock::StartFalling(Event *ev)
+{
+    if (current) {
+        return;
+    }
+
+    if (!active) {
+        start_origin = origin;
+    }
+
+    active = 1;
+    setMoveType(MOVETYPE_BOUNCE);
+    setSolidType(SOLID_BBOX);
+    PostEvent(EV_FallingRock_Rotate, FRAMETIME);
+    edict->clipmask = MASK_SOLID | CONTENTS_BODY;
+
+    last_bounce_origin = origin;
+    current            = this;
+    current            = SetNextBounceDir();
+    if (current) {
+        NextBounce();
+    }
+}
+
+void FallingRock::Touch(Event *ev)
+{
+    Entity *other;
+
+    other = ev->GetEntity(1);
+
+    if (other != world) {
+        if ((velocity != vec_zero) && (other->takedamage) && (level.time >= attack_finished)) {
+            other->Damage(this, activator, dmg, origin, vec_zero, vec_zero, 20, 0, MOD_THROWNOBJECT);
+            attack_finished = level.time + FRAMETIME;
+        }
+    }
+
+    if (!current || (other != world)) {
+        return;
+    }
+    if (bouncesound.length()) {
+        Vector delta(origin - last_bounce_origin);
+
+        if (delta.length() > 8) {
+            last_bounce_origin = origin;
+            Sound(bouncesound.c_str(), CHAN_VOICE);
+        }
+    }
+
+    // we have to wait to set the velocity since the physics code
+    // will modify it when we return.
+    PostEvent(EV_FallingRock_Bounce, 0);
+}
+
+void FallingRock::Bounce(Event *ev)
+{
+    Vector delta;
+
+    if (!current) {
+        return;
+    }
+
+    do {
+        // check if we've passed the waypoint
+        delta = origin - current->origin;
+        if ((delta * bounce_dir) >= (-2 * edict->r.radius)) {
+            // call any threads on the current waypoint
+            if (current->isSubclassOf(Trigger)) {
+                current->ProcessEvent(EV_Trigger_StartThread);
             }
-         current = SetNextBounceDir();
-         if ( !current )
-            {
-            velocity = vec_zero;
-            if ( spawnflags & SPAWN_AUTO_RESET )
-               {
-               active = 2;
-               }
-            else if ( spawnflags & REMOVE_ON_GROUND )
-               {
-               PostEvent( EV_Remove, 0 );
-               }
+            current = SetNextBounceDir();
+            if (!current) {
+                velocity = vec_zero;
+                if (spawnflags & SPAWN_AUTO_RESET) {
+                    active = 2;
+                } else if (spawnflags & REMOVE_ON_GROUND) {
+                    PostEvent(EV_Remove, 0);
+                }
+                break;
+            }
+        } else {
+            NextBounce();
             break;
-            }
-         }
-      else
-         {
-         NextBounce();
-         break;
-         }
-      }
-      while( 1 );
-   }
+        }
+    } while (1);
+}
 
 /*****************************************************************************/
 /*QUAKED func_ladder (0.75 0.75 0.75) ?
@@ -3393,340 +2829,329 @@ Ladder trigger volume
 
 Event EV_LadderSetup
 (
-	"_ladder_setup",
-	EV_CODEONLY,
-	NULL,
-	NULL,
-	"Does the post spawn setup of the ladder"
+    "_ladder_setup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Does the post spawn setup of the ladder"
 );
 
-CLASS_DECLARATION( Entity, FuncLadder, "func_ladder" )
-{
-	{ &EV_Use,					NULL },
-	{ &EV_Touch,				NULL },
-	{ &EV_SetAngle,				&FuncLadder::SetLadderFacing },
-	{ &EV_LadderSetup,			&FuncLadder::LadderSetup },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, FuncLadder, "func_ladder") {
+    {&EV_Use,         NULL                        },
+    {&EV_Touch,       NULL                        },
+    {&EV_SetAngle,    &FuncLadder::SetLadderFacing},
+    {&EV_LadderSetup, &FuncLadder::LadderSetup    },
+    {NULL,            NULL                        }
 };
 
 FuncLadder::FuncLadder()
 {
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	PostEvent( EV_LadderSetup, EV_POSTSPAWN );
+    PostEvent(EV_LadderSetup, EV_POSTSPAWN);
 }
 
-void FuncLadder::LadderSetup( Event *ev )
+void FuncLadder::LadderSetup(Event *ev)
 {
-	setMoveType( MOVETYPE_PUSH );
+    setMoveType(MOVETYPE_PUSH);
 
-	setContents( CONTENTS_LADDER );
-	setSolidType( SOLID_BSP );
+    setContents(CONTENTS_LADDER);
+    setSolidType(SOLID_BSP);
 
-	// never send to clients
-	edict->r.svFlags |= SVF_NOCLIENT;
+    // never send to clients
+    edict->r.svFlags |= SVF_NOCLIENT;
 }
 
-qboolean FuncLadder::CanUseLadder( Entity *pUser )
+void FuncLadder::SetLadderFacing(Event *ev)
 {
-	int iMask;
-	Vector vDelta;
-	Vector vUserFacing;
-	Vector start, end;
-	trace_t trace;
+    m_vFacingAngles    = vec_zero;
+    m_vFacingAngles[1] = AngleMod(ev->GetFloat(1));
 
-	vDelta = origin - pUser->origin;
-	vDelta[ 2 ] = 0;
-
-	if( vDelta.length() > 52.0f ) {
-		return qfalse;
-	}
-
-	AngleVectorsLeft( pUser->angles, vUserFacing, NULL, NULL );
-
-	iMask = pUser->client ? MASK_PLAYERSOLID : MASK_MONSTERSOLID;
-
-	if( pUser->origin[ 2 ] + pUser->maxs[ 2 ] > absmax[ 2 ] )
-	{
-		if( DotProduct( vUserFacing, m_vFacingDir ) <= 0.15f )
-		{
-			vDelta = pUser->origin - origin;
-			vDelta[ 2 ] = 0.0f;
-
-			if( DotProduct( m_vFacingDir, vDelta ) >= 0.0f )
-			{
-				start = origin + m_vFacingDir * 26.0f;
-				start[ 2 ] = absmax[ 2 ] + 16.0f;
-
-				end = start - Vector( 0, 0, 16 );
-
-				trace = G_Trace(
-					start,
-					pUser->mins,
-					pUser->maxs,
-					end,
-					pUser,
-					MASK_PLAYERSOLID,
-					qfalse,
-					"FuncLadder::CanUseLadder"
-					);
-
-				start = trace.endpos;
-				trace = G_Trace(
-					start,
-					pUser->mins,
-					pUser->maxs,
-					start,
-					pUser,
-					MASK_PLAYERSOLID,
-					qfalse,
-					"FuncLadder::CanUseLadder"
-					);
-
-				if( !trace.startsolid )
-				{
-					// client can use ladder
-					return qtrue;
-				}
-			}
-		}
-
-		return qfalse;
-	}
-
-	vDelta = ( pUser->origin - origin );
-	vDelta[ 2 ] = 0.0f;
-
-	if( DotProduct( vUserFacing, m_vFacingDir ) < -0.15f ||
-		DotProduct( vDelta, m_vFacingDir ) > 0.0f )
-	{
-		return qfalse;
-	}
-
-	start = origin - m_vFacingDir * 29.0f;
-	start[ 2 ] = absmin[ 2 ] + 16.0f;
-
-	end = start;
-	end[ 2 ] = start[ 2 ] - 16.0f;
-
-	trace = G_Trace(
-		start,
-		pUser->mins,
-		pUser->maxs,
-		end,
-		pUser,
-		MASK_PLAYERSOLID,
-		qfalse,
-		"FuncLadder::CanUseLadder"
-		);
-
-	if( !trace.allsolid )
-	{
-		// client can use ladder
-		return qtrue;
-	}
-
-	gi.DPrintf( "ladder start position is blocked by a solid object\n" );
-	return qfalse;
+    AngleVectorsLeft(m_vFacingAngles, m_vFacingDir, NULL, NULL);
 }
 
-void FuncLadder::PositionOnLadder( Entity *pUser )
+qboolean FuncLadder::CanUseLadder(Entity *pUser)
 {
-	Vector vPos;
-	Vector vStart;
-	Vector vEnd;
-	trace_t trace;
+    int     iMask;
+    Vector  vDelta;
+    Vector  vUserFacing;
+    Vector  start, end;
+    trace_t trace;
 
-	if( pUser->origin[ 2 ] + pUser->maxs[ 2 ] > absmax[ 2 ] )
-	{
-		vEnd = origin + m_vFacingDir * 26.0f;
-		vEnd[ 2 ] = absmax[ 2 ] + 2.0f;
-	}
-	else if( absmin[ 2 ] + 32.0f > pUser->origin[ 2 ] )
-	{
-		vEnd = origin - m_vFacingDir * 29.0f;
-		vEnd[ 2 ] = absmin[ 2 ] + 2.0f;
-	}
-	else
-	{
-		vEnd = origin - m_vFacingDir * 16.0f;
-		vEnd[ 2 ] = pUser->origin[ 2 ] + 8.0f;
-	}
+    vDelta    = origin - pUser->origin;
+    vDelta[2] = 0;
 
-	vStart = vEnd;
+    if (vDelta.length() > 52.0f) {
+        return qfalse;
+    }
 
-	trace = G_Trace(
-		vStart,
-		pUser->mins,
-		pUser->maxs,
-		vEnd,
-		pUser,
-		MASK_PLAYERSOLID,
-		qtrue,
-		"FuncLadder::PositionOnLadder" );
+    AngleVectorsLeft(pUser->angles, vUserFacing, NULL, NULL);
 
-	if( trace.allsolid )
-	{
-		vStart = pUser->origin;
-		vStart[ 2 ] = pUser->origin[ 2 ] + 4.0f;
+    iMask = pUser->client ? MASK_PLAYERSOLID : MASK_MONSTERSOLID;
 
-		vEnd = origin - m_vFacingDir * 16.0f;
-		vEnd[ 2 ] = pUser->origin[ 2 ] + 4.0f;
+    if (pUser->origin[2] + pUser->maxs[2] > absmax[2]) {
+        if (DotProduct(vUserFacing, m_vFacingDir) <= 0.15f) {
+            vDelta    = pUser->origin - origin;
+            vDelta[2] = 0.0f;
 
-		trace = G_Trace(
-			vStart,
-			pUser->mins,
-			pUser->maxs,
-			vEnd,
-			pUser,
-			MASK_PLAYERSOLID,
-			qtrue,
-			"FuncLadder::PositionOnLadder2" );
-	}
+            if (DotProduct(m_vFacingDir, vDelta) >= 0.0f) {
+                start    = origin + m_vFacingDir * 26.0f;
+                start[2] = absmax[2] + 16.0f;
 
-	pUser->setOrigin( trace.endpos );
-	pUser->setAngles( m_vFacingAngles );
+                end = start - Vector(0, 0, 16);
+
+                trace = G_Trace(
+                    start, pUser->mins, pUser->maxs, end, pUser, MASK_PLAYERSOLID, qfalse, "FuncLadder::CanUseLadder"
+                );
+
+                start = trace.endpos;
+                trace = G_Trace(
+                    start, pUser->mins, pUser->maxs, start, pUser, MASK_PLAYERSOLID, qfalse, "FuncLadder::CanUseLadder"
+                );
+
+                if (!trace.startsolid) {
+                    // client can use ladder
+                    return qtrue;
+                }
+            }
+        }
+
+        return qfalse;
+    }
+
+    vDelta    = (pUser->origin - origin);
+    vDelta[2] = 0.0f;
+
+    if (DotProduct(vUserFacing, m_vFacingDir) < -0.15f || DotProduct(vDelta, m_vFacingDir) > 0.0f) {
+        return qfalse;
+    }
+
+    start    = origin - m_vFacingDir * 29.0f;
+    start[2] = absmin[2] + 16.0f;
+
+    end    = start;
+    end[2] = start[2] - 16.0f;
+
+    trace = G_Trace(start, pUser->mins, pUser->maxs, end, pUser, MASK_PLAYERSOLID, qfalse, "FuncLadder::CanUseLadder");
+
+    if (!trace.allsolid) {
+        // client can use ladder
+        return qtrue;
+    }
+
+    gi.DPrintf("ladder start position is blocked by a solid object\n");
+    return qfalse;
 }
 
-void FuncLadder::SetLadderFacing( Event *ev )
+void FuncLadder::PositionOnLadder(Entity *pUser)
 {
-	m_vFacingAngles = vec_zero;
-	m_vFacingAngles[ 1 ] = AngleMod( ev->GetFloat( 1 ) );
+    Vector  vPos;
+    Vector  vStart;
+    Vector  vEnd;
+    trace_t trace;
 
-	AngleVectorsLeft( m_vFacingAngles, m_vFacingDir, NULL, NULL );
+    if (pUser->origin[2] + pUser->maxs[2] > absmax[2]) {
+        vEnd    = origin + m_vFacingDir * 26.0f;
+        vEnd[2] = absmax[2] + 2.0f;
+    } else if (absmin[2] + 32.0f > pUser->origin[2]) {
+        vEnd    = origin - m_vFacingDir * 29.0f;
+        vEnd[2] = absmin[2] + 2.0f;
+    } else {
+        vEnd    = origin - m_vFacingDir * 16.0f;
+        vEnd[2] = pUser->origin[2] + 8.0f;
+    }
+
+    vStart = vEnd;
+
+    trace =
+        G_Trace(vStart, pUser->mins, pUser->maxs, vEnd, pUser, MASK_PLAYERSOLID, qtrue, "FuncLadder::PositionOnLadder");
+
+    if (trace.allsolid) {
+        vStart    = pUser->origin;
+        vStart[2] = pUser->origin[2] + 4.0f;
+
+        vEnd    = origin - m_vFacingDir * 16.0f;
+        vEnd[2] = pUser->origin[2] + 4.0f;
+
+        trace = G_Trace(
+            vStart, pUser->mins, pUser->maxs, vEnd, pUser, MASK_PLAYERSOLID, qtrue, "FuncLadder::PositionOnLadder2"
+        );
+    }
+
+    pUser->setOrigin(trace.endpos);
+    pUser->setAngles(m_vFacingAngles);
 }
 
-void FuncLadder::AdjustPositionOnLadder( Entity *pUser )
+void FuncLadder::AdjustPositionOnLadder(Entity *pUser)
 {
-	float fHeight;
-	Vector vDelta;
-	Vector vPos;
-	Vector vStart;
-	trace_t trace;
+    float   fHeight;
+    Vector  vDelta;
+    Vector  vPos;
+    Vector  vStart;
+    trace_t trace;
 
-	vDelta = pUser->origin - origin;
-	vDelta[ 2 ] = 0;
+    vDelta    = pUser->origin - origin;
+    vDelta[2] = 0;
 
-	fHeight = ( ( int )( pUser->origin[ 2 ] + 8.0f ) & ~15 );
+    fHeight = ((int)(pUser->origin[2] + 8.0f) & ~15);
 
-	if( vDelta.length() > 16.0f && pUser->origin[ 2 ] == fHeight )
-	{
-		return;
-	}
+    if (vDelta.length() == 16.0f && pUser->origin[2] == fHeight) {
+        return;
+    }
 
-	vPos = origin - m_vFacingDir * 16.0f;
-	vPos[ 2 ] = fHeight;
+    vPos    = origin - m_vFacingDir * 16.0f;
+    vPos[2] = fHeight;
 
-	vStart = vPos + m_vFacingDir * -16.0f;
+    vStart = vPos + m_vFacingDir * -16.0f;
 
-	trace = G_Trace( vStart,
-		pUser->mins,
-		pUser->maxs,
-		vPos,
-		pUser,
-		MASK_PLAYERSOLID,
-		qtrue,
-		"FuncLadder::AdjustPositionOnLadder" );
+    trace = G_Trace(
+        vStart, pUser->mins, pUser->maxs, vPos, pUser, MASK_PLAYERSOLID, qtrue, "FuncLadder::AdjustPositionOnLadder"
+    );
 
-	if( trace.allsolid || trace.startsolid )
-	{
-		trace = G_Trace( pUser->origin,
-			pUser->mins,
-			pUser->maxs,
-			vPos,
-			pUser,
-			MASK_PLAYERSOLID,
-			qtrue,
-			"FuncLadder::AdjustPositionOnLadder" );
-	}
+    if (trace.allsolid || trace.startsolid) {
+        trace = G_Trace(
+            pUser->origin,
+            pUser->mins,
+            pUser->maxs,
+            vPos,
+            pUser,
+            MASK_PLAYERSOLID,
+            qtrue,
+            "FuncLadder::AdjustPositionOnLadder"
+        );
+    }
 
-	pUser->setOrigin( trace.endpos );
+    pUser->setOrigin(trace.endpos);
 }
 
-void FuncLadder::EnsureOverLadder( Entity *pUser )
+void FuncLadder::EnsureOverLadder(Entity *pUser)
 {
-	float fHeight = absmax[ 2 ];
-	Vector vStart;
-	Vector vPos;
-	trace_t trace;
+    float   fHeight = absmax[2];
+    Vector  vStart;
+    Vector  vPos;
+    trace_t trace;
 
-	if( pUser->origin[ 2 ] - fHeight >= 8.0f ) {
-		return;
-	}
+    if (pUser->origin[2] - fHeight >= 8.0f) {
+        return;
+    }
 
-	vPos = pUser->origin;
-	vPos[ 2 ] = fHeight + 16.0f;
+    vPos    = pUser->origin;
+    vPos[2] = fHeight + 16.0f;
 
-	vStart = pUser->origin + m_vFacingDir * -16.0f;
+    vStart = pUser->origin + m_vFacingDir * -16.0f;
 
-	trace = G_Trace( vStart,
-		pUser->mins,
-		pUser->maxs,
-		vPos,
-		pUser->edict,
-		MASK_PLAYERSOLID,
-		true,
-		"FuncLadder::EnsureOverLadder" );
+    trace = G_Trace(
+        vStart, pUser->mins, pUser->maxs, vPos, pUser->edict, MASK_PLAYERSOLID, true, "FuncLadder::EnsureOverLadder"
+    );
 
-	if( trace.startsolid || trace.allsolid )
-	{
-		trace = G_Trace( origin,
-			pUser->mins,
-			pUser->maxs,
-			vPos,
-			pUser->edict,
-			MASK_PLAYERSOLID,
-			true,
-			"FuncLadder::EnsureOverLadder" );
-	}
+    if (trace.startsolid || trace.allsolid) {
+        trace = G_Trace(
+            origin, pUser->mins, pUser->maxs, vPos, pUser->edict, MASK_PLAYERSOLID, true, "FuncLadder::EnsureOverLadder"
+        );
+    }
 
-	pUser->setOrigin( trace.endpos );
+    pUser->setOrigin(trace.endpos);
 }
 
-void FuncLadder::EnsureForwardOffLadder( Entity *pUser )
+void FuncLadder::EnsureForwardOffLadder(Entity *pUser)
 {
-	int iMask;
-	Vector vStart;
-	Vector vPos;
-	Vector vDelta;
-	trace_t trace;
+    int     iMask;
+    Vector  vStart;
+    Vector  vPos;
+    Vector  vDelta;
+    trace_t trace;
 
-	if( pUser->origin[ 2 ] - absmax[ 2 ] >= 8.0f ) {
-		return;
-	}
+    if (pUser->origin[2] - absmax[2] >= 8.0f) {
+        return;
+    }
 
-	iMask = pUser->client ? MASK_PLAYERSOLID : MASK_MONSTERSOLID;
+    iMask = pUser->client ? MASK_PLAYERSOLID : MASK_MONSTERSOLID;
 
-	vPos = pUser->origin;
-	vPos[ 2 ] = absmax[ 2 ] + 16.0f;
+    vPos    = pUser->origin;
+    vPos[2] = absmax[2] + 16.0f;
 
-	vStart = vPos + m_vFacingDir * -16.0f;
+    vStart = vPos + m_vFacingDir * -16.0f;
 
-	trace = G_Trace(
-		vStart,
-		pUser->mins,
-		pUser->maxs,
-		vPos,
-		pUser,
-		iMask,
-		qtrue,
-		"FuncLadder::EnsureOverLadder" );
+    trace = G_Trace(vStart, pUser->mins, pUser->maxs, vPos, pUser, iMask, qtrue, "FuncLadder::EnsureOverLadder");
 
-	if( trace.allsolid || trace.startsolid )
-	{
-		trace = G_Trace(
-			pUser->origin,
-			pUser->mins,
-			pUser->maxs,
-			vPos,
-			pUser,
-			iMask,
-			qtrue,
-			"FuncLadder::EnsureOverLadder" );
-	}
+    if (trace.allsolid || trace.startsolid) {
+        trace =
+            G_Trace(pUser->origin, pUser->mins, pUser->maxs, vPos, pUser, iMask, qtrue, "FuncLadder::EnsureOverLadder");
+    }
 
-	pUser->setOrigin( trace.endpos );
+    pUser->setOrigin(trace.endpos);
+}
+
+const Vector& FuncLadder::getFacingAngles() const
+{
+    return m_vFacingAngles;
+}
+
+const Vector& FuncLadder::getFacingDir() const
+{
+    return m_vFacingDir;
+}
+
+Event EV_InfoLandmark_Name
+(
+    "landmark_name", EV_DEFAULT,
+    "s",
+    "name",
+    "Set the name of this landmark",
+    EV_NORMAL
+);
+Event EV_InfoLandmark_SetOrigin
+(
+    "origin", EV_DEFAULT,
+    "v",
+    "origin",
+    "Set the origin of the landmark.",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(Listener, InfoLandmark, "info_landmark") {
+    {&EV_InfoLandmark_Name,      &InfoLandmark::SetLandmarkName},
+    {&EV_InfoLandmark_SetOrigin, &InfoLandmark::SetOrigin      },
+    {NULL,                       NULL                          }
+};
+
+InfoLandmark::InfoLandmark()
+{
+    m_bNameSet   = false;
+    m_bOriginSet = false;
+}
+
+void InfoLandmark::SetLandmarkName(Event *ev)
+{
+    m_sName    = ev->GetString(1);
+    m_bNameSet = true;
+
+    if (m_bOriginSet) {
+        level.AddLandmarkName(m_sName, m_vOrigin);
+        PostEvent(EV_Remove, EV_REMOVE);
+    }
+}
+
+void InfoLandmark::SetOrigin(Event *ev)
+{
+    m_vOrigin = ev->GetVector(1);
+
+    if (m_vOrigin == Vector(99999, 99999, 99999)) {
+        ScriptError(
+            "Illegal location (%f, %f, %f) for Landmark. Please place in valid XYZ coordinates\n",
+            m_vOrigin[0],
+            m_vOrigin[1],
+            m_vOrigin[2]
+        );
+    }
+
+    level.AddLandmarkOrigin(m_vOrigin);
+    m_bOriginSet = true;
+
+    if (m_bNameSet) {
+        level.AddLandmarkName(m_sName, m_vOrigin);
+        PostEvent(EV_Remove, EV_REMOVE);
+    }
 }
diff --git a/code/fgame/misc.h b/code/fgame/misc.h
index aa3762f7..95f4d2c2 100644
--- a/code/fgame/misc.h
+++ b/code/fgame/misc.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,578 +26,571 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // should contain utility functions that could be used by any entity.
 // Right now it contains everything from entities that could be in their
 // own file to my mother pot roast recipes.
-// 
+//
 
-#ifndef __MISC_H__
-#define __MISC_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
 #include "mover.h"
 #include "animate.h"
 
-class InfoNull : public Entity
-	{
-	public:
-      CLASS_PROTOTYPE( InfoNull );
-		
-		InfoNull();
-	};
+class InfoNull : public Listener
+{
+public:
+    CLASS_PROTOTYPE(InfoNull);
+
+    InfoNull();
+};
 
 class FuncRemove : public Entity
-	{
-	public:
-      CLASS_PROTOTYPE( FuncRemove );
-		
-		FuncRemove();
-	};
+{
+public:
+    CLASS_PROTOTYPE(FuncRemove);
+
+    FuncRemove();
+};
 
 class MiscModel : public Entity
-	{
-	public:
-      CLASS_PROTOTYPE( MiscModel );
-		
-		MiscModel();
-	};
+{
+public:
+    CLASS_PROTOTYPE(MiscModel);
+
+    MiscModel();
+};
 
 class InfoNotNull : public Entity
-	{
-	public:
-      CLASS_PROTOTYPE( InfoNotNull );
-	};
+{
+public:
+    CLASS_PROTOTYPE(InfoNotNull);
+};
 
 class ExplodingWall : public Trigger
-	{
-	protected:
-		int      dmg;
-		int      explosions;
-		float    attack_finished;
-      Vector   land_angles;
-      float    land_radius;
-      float    angle_speed;
-      int      state;
-      Vector   base_velocity;
-      Vector   random_velocity;
-      Vector   orig_mins, orig_maxs;
-      qboolean on_ground;
+{
+protected:
+    int      dmg;
+    int      explosions;
+    float    attack_finished;
+    Vector   land_angles;
+    float    land_radius;
+    float    angle_speed;
+    int      state;
+    Vector   base_velocity;
+    Vector   random_velocity;
+    Vector   orig_mins, orig_maxs;
+    qboolean on_ground;
 
-	public:
-      CLASS_PROTOTYPE( ExplodingWall );
+public:
+    CLASS_PROTOTYPE(ExplodingWall);
 
-							ExplodingWall();
-      void           Setup( Event *ev );
-      void           AngleSpeed( Event *ev );
-      void           LandRadius( Event *ev );
-      void           LandAngles( Event *ev );
-      void           BaseVelocity( Event *ev );
-      void           RandomVelocity( Event *ev );
-      void           SetDmg( Event *ev );
-      void           SetExplosions( Event *ev );
-      void           SetupSecondStage( void );
-		void	         Explode( Event *ev );
-		void	         DamageEvent( Event *ev ) override;
-		void	         GroundDamage( Event *ev );
-		void	         TouchFunc( Event *ev );
-		void	         StopRotating( Event *ev );
-		void	         CheckOnGround( Event *ev );
-	   void           Archive( Archiver &arc ) override;
-	};
+    ExplodingWall();
+    void Setup(Event *ev);
+    void AngleSpeed(Event *ev);
+    void LandRadius(Event *ev);
+    void LandAngles(Event *ev);
+    void BaseVelocity(Event *ev);
+    void RandomVelocity(Event *ev);
+    void SetDmg(Event *ev);
+    void SetExplosions(Event *ev);
+    void SetupSecondStage(void);
+    void Explode(Event *ev);
+    void DamageEvent(Event *ev) override;
+    void GroundDamage(Event *ev);
+    void TouchFunc(Event *ev);
+    void StopRotating(Event *ev);
+    void CheckOnGround(Event *ev);
+    void Archive(Archiver& arc) override;
+};
 
-inline void ExplodingWall::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Trigger::Archive( arc );
-
-   arc.ArchiveInteger( &dmg );
-   arc.ArchiveInteger( &explosions );
-   arc.ArchiveFloat( &attack_finished );
-   arc.ArchiveVector( &land_angles );
-   arc.ArchiveFloat( &land_radius );
-   arc.ArchiveFloat( &angle_speed );
-   arc.ArchiveInteger( &state );
-   arc.ArchiveVector( &base_velocity );
-   arc.ArchiveVector( &random_velocity );
-   arc.ArchiveVector( &orig_mins );
-   arc.ArchiveVector( &orig_maxs );
-   arc.ArchiveBoolean( &on_ground );
-   }
+inline void ExplodingWall::Archive(Archiver& arc)
+{
+    Trigger::Archive(arc);
 
+    arc.ArchiveInteger(&dmg);
+    arc.ArchiveInteger(&explosions);
+    arc.ArchiveFloat(&attack_finished);
+    arc.ArchiveVector(&land_angles);
+    arc.ArchiveFloat(&land_radius);
+    arc.ArchiveFloat(&angle_speed);
+    arc.ArchiveInteger(&state);
+    arc.ArchiveVector(&base_velocity);
+    arc.ArchiveVector(&random_velocity);
+    arc.ArchiveVector(&orig_mins);
+    arc.ArchiveVector(&orig_maxs);
+    arc.ArchiveBoolean(&on_ground);
+}
 
 class Teleporter : public Trigger
-	{
-	public:
-		ScriptThreadLabel		teleport_label;
-		qboolean				in_use;
+{
+public:
+    ScriptThreadLabel teleport_label;
+    qboolean          in_use;
 
-      CLASS_PROTOTYPE( Teleporter );
-		
-								Teleporter();
-		virtual void StartTeleport( Event *ev );
-		virtual void Teleport( Event *ev );
-		virtual void StopTeleport( Event *ev );
-		void SetThread( Event *ev );
-		void Archive( Archiver &arc ) override;
-	};
+    CLASS_PROTOTYPE(Teleporter);
 
-inline void Teleporter::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Trigger::Archive( arc );
+    Teleporter();
+    virtual void StartTeleport(Event *ev);
+    virtual void Teleport(Event *ev);
+    virtual void StopTeleport(Event *ev);
+    void         SetThread(Event *ev);
+    void         Archive(Archiver& arc) override;
+};
 
-	arc.ArchiveBoolean( &in_use );
-   }
+inline void Teleporter::Archive(Archiver& arc)
+{
+    Trigger::Archive(arc);
+
+    arc.ArchiveBoolean(&in_use);
+}
 
 class TeleporterDestination : public Entity
-	{
-	public:
-		Vector				movedir;
+{
+public:
+    Vector movedir;
 
-      CLASS_PROTOTYPE( TeleporterDestination );
+    CLASS_PROTOTYPE(TeleporterDestination);
 
-						TeleporterDestination();
-		void	            SetMoveDir( Event *ev );
-	   void Archive( Archiver &arc ) override;
-	};
+    TeleporterDestination();
+    void SetMoveDir(Event *ev);
+    void Archive(Archiver& arc) override;
+};
 
-inline void TeleporterDestination::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Entity::Archive( arc );
+inline void TeleporterDestination::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
 
-   arc.ArchiveVector( &movedir );
-   }
+    arc.ArchiveVector(&movedir);
+}
 
 class UseAnim : public Entity
-	{
-	public:
-      int               count;
-      qboolean          active;
-      ScriptThreadLabel	thread;
-      str               triggertarget;
-      int               num_loops;
-      str               state;
-      str               camera;
-      str               anim;
-      str               key;
-      float             delay;
-      float             last_active_time;
+{
+public:
+    int               count;
+    qboolean          active;
+    ScriptThreadLabel thread;
+    str               triggertarget;
+    int               num_loops;
+    str               state;
+    str               camera;
+    str               anim;
+    str               key;
+    float             delay;
+    float             last_active_time;
 
-      CLASS_PROTOTYPE( UseAnim );
-		
-								UseAnim();
-		virtual void Touched( Event *ev );
-      void              Reset( Event *ev );
-      void              SetThread( Event * ev );
-      void              SetTriggerTarget( Event * ev );
-      void              SetCount( Event * ev );
-		void	            SetAnim( Event *ev );
-		void	            SetState( Event *ev );
-		void	            SetKey( Event *ev );
-		void	            SetCamera( Event *ev );
-		void	            SetNumLoops( Event *ev );
-		void	            SetDelay( Event *ev );
-      bool              canBeUsed( Entity *activator );
-      bool              GetInformation( Entity *activator, Vector * org, Vector * angles, str * animatoin, int * loopcount, str * state, str * camera );
-      void              TriggerTargets( Entity *activator );
-	   void Archive( Archiver &arc ) override;
-	};
+    CLASS_PROTOTYPE(UseAnim);
 
-inline void UseAnim::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Entity::Archive( arc );
+    UseAnim();
+    virtual void Touched(Event *ev);
+    void         Reset(Event *ev);
+    void         SetThread(Event *ev);
+    void         SetTriggerTarget(Event *ev);
+    void         SetCount(Event *ev);
+    void         SetAnim(Event *ev);
+    void         SetState(Event *ev);
+    void         SetKey(Event *ev);
+    void         SetCamera(Event *ev);
+    void         SetNumLoops(Event *ev);
+    void         SetDelay(Event *ev);
+    bool         canBeUsed(Entity *activator);
+    bool         GetInformation(
+                Entity *activator, Vector *org, Vector *angles, str *animatoin, int *loopcount, str *state, str *camera
+            );
+    void TriggerTargets(Entity *activator);
+    void Archive(Archiver& arc) override;
+};
 
-   arc.ArchiveInteger( &count );
-   arc.ArchiveBoolean( &active );
-   arc.ArchiveString( &triggertarget );
-   arc.ArchiveInteger( &num_loops );
-   arc.ArchiveString( &state );
-   arc.ArchiveString( &camera );
-   arc.ArchiveString( &anim );
-   arc.ArchiveString( &key );
-   arc.ArchiveFloat( &delay );
-   arc.ArchiveFloat( &last_active_time );
-   }
+inline void UseAnim::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveInteger(&count);
+    arc.ArchiveBoolean(&active);
+    arc.ArchiveString(&triggertarget);
+    arc.ArchiveInteger(&num_loops);
+    arc.ArchiveString(&state);
+    arc.ArchiveString(&camera);
+    arc.ArchiveString(&anim);
+    arc.ArchiveString(&key);
+    arc.ArchiveFloat(&delay);
+    arc.ArchiveFloat(&last_active_time);
+}
 
 class TouchAnim : public UseAnim
-	{
-	public:
-
-      CLASS_PROTOTYPE( TouchAnim );
-		
-								TouchAnim();
-	};
+{
+public:
+    CLASS_PROTOTYPE(TouchAnim);
 
+    TouchAnim();
+};
 
 class UseAnimDestination : public Entity
-	{
-	public:
-      int               num_loops;
-      str               state;
-      str               anim;
+{
+public:
+    int num_loops;
+    str state;
+    str anim;
 
-      CLASS_PROTOTYPE( UseAnimDestination );
+    CLASS_PROTOTYPE(UseAnimDestination);
 
-						      UseAnimDestination();
-		void	            SetAnim( Event *ev );
-		void	            SetState( Event *ev );
-		void	            SetNumLoops( Event *ev );
-		int	            GetNumLoops( void );
-		str               GetAnim( void );
-		str               GetState( void );
-	   void Archive( Archiver &arc ) override;
-	};
+    UseAnimDestination();
+    void SetAnim(Event *ev);
+    void SetState(Event *ev);
+    void SetNumLoops(Event *ev);
+    int  GetNumLoops(void);
+    str  GetAnim(void);
+    str  GetState(void);
+    void Archive(Archiver& arc) override;
+};
 
-inline void UseAnimDestination::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Entity::Archive( arc );
+inline void UseAnimDestination::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
 
-   arc.ArchiveInteger( &num_loops );
-   arc.ArchiveString( &state );
-   arc.ArchiveString( &anim );
-   }
+    arc.ArchiveInteger(&num_loops);
+    arc.ArchiveString(&state);
+    arc.ArchiveString(&anim);
+}
 
 class UseObject : public Animate
-	{
-	public:
-      ScriptThreadLabel	move_thread;
-      ScriptThreadLabel	stop_thread;
-      ScriptThreadLabel	reset_thread;
-      str               triggertarget;
-      Vector            offset;
-      float             yaw_offset;
-      int               count;
-      float             cone;
-      str               state;
-      str               state_backwards;
-      str               useMaterial;
-      int               objectState;
-      float             reset_time;
-      qboolean          active;
+{
+public:
+    ScriptThreadLabel move_thread;
+    ScriptThreadLabel stop_thread;
+    ScriptThreadLabel reset_thread;
+    str               triggertarget;
+    Vector            offset;
+    float             yaw_offset;
+    int               count;
+    float             cone;
+    str               state;
+    str               state_backwards;
+    str               useMaterial;
+    int               objectState;
+    float             reset_time;
+    qboolean          active;
 
-      CLASS_PROTOTYPE( UseObject );
-		
-								UseObject();
-      void              SetMoveThread( Event * ev );
-      void              SetStopThread( Event * ev );
-      void              SetResetThread( Event * ev );
-      void              SetTriggerTarget( Event * ev );
-      void              SetOffset( Event * ev );
-      void              SetYawOffset( Event * ev );
-      void              SetCount( Event * ev );
-      void              SetCone( Event * ev );
-      void              SetState( Event * ev );
-      void              SetBackwardsState( Event * ev );
-      void              SetResetTime( Event * ev );
-      void              Reset( Event * ev );
-      void              Resetting( Event * ev );
-      void              DamageTriggered( Event * ev );
-      void              DamageFunc( Event * ev );
-      bool              canBeUsed( Vector org, Vector dir );
-      void              Setup( Entity *activator, Vector *org, Vector *ang, str *newstate );
-      void              Start( Event * ev = NULL );
-      bool              Loop( void );
-      void              SetActiveState( Event *ev );
-      void              Stop( Entity *activator );
-      void              ActivateEvent( Event *ev );
-      void              DeactivateEvent( Event *ev );
-      void              UseMaterialEvent( Event *ev );
-	   void Archive( Archiver &arc ) override;
-	};
+    CLASS_PROTOTYPE(UseObject);
 
-inline void UseObject::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Animate::Archive( arc );
+    UseObject();
+    void SetMoveThread(Event *ev);
+    void SetStopThread(Event *ev);
+    void SetResetThread(Event *ev);
+    void SetTriggerTarget(Event *ev);
+    void SetOffset(Event *ev);
+    void SetYawOffset(Event *ev);
+    void SetCount(Event *ev);
+    void SetCone(Event *ev);
+    void SetState(Event *ev);
+    void SetBackwardsState(Event *ev);
+    void SetResetTime(Event *ev);
+    void Reset(Event *ev);
+    void Resetting(Event *ev);
+    void DamageTriggered(Event *ev);
+    void DamageFunc(Event *ev);
+    bool canBeUsed(Vector org, Vector dir);
+    void Setup(Entity *activator, Vector *org, Vector *ang, str *newstate);
+    void Start(Event *ev = NULL);
+    bool Loop(void);
+    void SetActiveState(Event *ev);
+    void Stop(Entity *activator);
+    void ActivateEvent(Event *ev);
+    void DeactivateEvent(Event *ev);
+    void UseMaterialEvent(Event *ev);
+    void Archive(Archiver& arc) override;
+};
 
-   arc.ArchiveString( &triggertarget );
-   arc.ArchiveVector( &offset );
-   arc.ArchiveFloat( &yaw_offset );
-   arc.ArchiveInteger( &count );
-   arc.ArchiveFloat( &cone );
-   arc.ArchiveString( &state );
-   arc.ArchiveString( &state_backwards );
-   arc.ArchiveString( &useMaterial );
-   arc.ArchiveInteger( &objectState );
-   arc.ArchiveFloat( &reset_time );
-   arc.ArchiveBoolean( &active );
-   }
+inline void UseObject::Archive(Archiver& arc)
+{
+    Animate::Archive(arc);
 
+    arc.ArchiveString(&triggertarget);
+    arc.ArchiveVector(&offset);
+    arc.ArchiveFloat(&yaw_offset);
+    arc.ArchiveInteger(&count);
+    arc.ArchiveFloat(&cone);
+    arc.ArchiveString(&state);
+    arc.ArchiveString(&state_backwards);
+    arc.ArchiveString(&useMaterial);
+    arc.ArchiveInteger(&objectState);
+    arc.ArchiveFloat(&reset_time);
+    arc.ArchiveBoolean(&active);
+}
 
 class Waypoint : public SimpleArchivedEntity
 {
 public:
-	CLASS_PROTOTYPE( Waypoint );
+    CLASS_PROTOTYPE(Waypoint);
+
+public:
+    Waypoint();
 };
 
 class TempWaypoint : public SimpleArchivedEntity
 {
 public:
-	CLASS_PROTOTYPE( TempWaypoint );
+    CLASS_PROTOTYPE(TempWaypoint);
+
+public:
+    TempWaypoint();
 };
 
 class VehiclePoint : public Waypoint
 {
 public:
-	unsigned int	spawnflags;
+    unsigned int spawnflags;
 
-	CLASS_PROTOTYPE( VehiclePoint );
+    CLASS_PROTOTYPE(VehiclePoint);
 
-	void			SetSpawnFlags( Event *ev );
-	void Archive( Archiver& arc ) override;
+    VehiclePoint();
+
+    void SetSpawnFlags(Event *ev);
+    void Archive(Archiver& arc) override;
 };
 
-inline void VehiclePoint::Archive
-	(
-	Archiver &arc
-	)
+inline void VehiclePoint::Archive(Archiver& arc)
 {
-	SimpleArchivedEntity::Archive( arc );
+    SimpleArchivedEntity::Archive(arc);
 
-	arc.ArchiveUnsigned( &spawnflags );
+    arc.ArchiveUnsigned(&spawnflags);
 }
 
 class MonkeyBars : public Entity
-	{
- 	public:
-      float          dir;
-
-      CLASS_PROTOTYPE( MonkeyBars );
-
-                     MonkeyBars();
-      void           SetAngleEvent( Event *ev );
-
-      void Archive( Archiver &arc ) override;
-	};
-
-inline void MonkeyBars::Archive
-	(
-	Archiver &arc
-	)
-
-   {
-   Entity::Archive( arc );
-
-   arc.ArchiveFloat( &dir );
-   }
-
-class HorizontalPipe : public Entity
-	{
- 	public:
-      float          dir;
-
-      CLASS_PROTOTYPE( HorizontalPipe );
-
-                     HorizontalPipe();
-      void           SetAngleEvent( Event *ev );
-
-      void Archive( Archiver &arc ) override;
-	};
-
-inline void HorizontalPipe::Archive
-	(
-	Archiver &arc
-	)
-
-   {
-   Entity::Archive( arc );
-
-   arc.ArchiveFloat( &dir );
-   }
-
-class TossObject : public Animate
-	{
-   private:
-      str            bouncesound;
-      float          bouncesoundchance;
-      void           Stop( Event *ev );
-      void           Touch( Event *ev );
-      void           SetBounceSound( Event *ev );
-      void           SetBounceSoundChance( Event *ev );
-   public:
-      CLASS_PROTOTYPE( TossObject );
-
-                     TossObject();
-                     TossObject( str modelname );
-      void           SetBounceSound( str bounce );
-      void           SetBounceSoundChance( float chance );
-      void           SetVelocity( float severity );
-      void Archive( Archiver &arc ) override;
-   };
-
-inline void TossObject::Archive
-	(
-	Archiver &arc
-	)
-
-   {
-   Animate::Archive( arc );
-
-   arc.ArchiveString( &bouncesound );
-   arc.ArchiveFloat( &bouncesoundchance );
-   }
-
-
-class PushObject : public Entity
-	{
-   private:
-      EntityPtr      owner;
-		float			   attack_finished;
-		int				dmg;
-      str            pushsound;
-
- 	public:
-      CLASS_PROTOTYPE( PushObject );
-
-                     PushObject();
-      void           Start( Event *ev );
-      void           SetDamage( Event *ev );
-      void           BlockFunc( Event *ev );
-      void           SetPushSound( Event *ev );
-      qboolean       Push( Entity *pusher, Vector move );
-      qboolean       canPush( Vector dir );
-
-      Entity         *getOwner( void );
-
-      void Archive( Archiver &arc ) override;
-	};
-
-inline void PushObject::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Entity::Archive( arc );
-
-   arc.ArchiveSafePointer( &owner );
-   arc.ArchiveFloat( &attack_finished );
-   arc.ArchiveInteger( &dmg );
-   arc.ArchiveString( &pushsound );
-   }
-
-class FallingRock : public Entity
-	{
-   private:
-      int            active;
-      Vector         start_origin;
-      Vector         last_bounce_origin;
-      Entity         *current;
-      Entity         *activator;
-      Vector         bounce_dir;
-      Vector         rotateaxis;
-      float          attack_finished;
-      float          wait;
-      float          speed;
-      int            dmg;
-      str            bouncesound;
-
-      void           Touch( Event *ev );
-      void           Bounce( Event *ev );
-      void           Rotate( Event *ev );
-      void           Activate( Event *ev );
-      void           NextBounce( void );
-      void           StartFalling( Event *ev );
-      void           SetWait( Event *ev );
-      void           SetSpeed( Event *ev );
-      void           SetDmg( Event *ev );
-      Entity         *SetNextBounceDir( void );
-      void           SetBounceSound( str sound );
-      void           SetBounceSound( Event *ev );
-      void Archive( Archiver &arc ) override;
-
-   public:
-      CLASS_PROTOTYPE( FallingRock );
-
-                     FallingRock();
-   };
-
-inline void FallingRock::Archive
-	(
-	Archiver &arc
-	)
-
-   {
-   Entity::Archive( arc );
-
-   arc.ArchiveInteger( &active );
-   arc.ArchiveVector( &start_origin );
-   arc.ArchiveVector( &last_bounce_origin );
-   arc.ArchiveObjectPointer( ( Class ** )&current );
-   arc.ArchiveObjectPointer( ( Class ** )&activator );
-   arc.ArchiveVector( &bounce_dir );
-   arc.ArchiveVector( &rotateaxis );
-   arc.ArchiveFloat( &attack_finished );
-   arc.ArchiveFloat( &wait );
-   arc.ArchiveFloat( &speed );
-   arc.ArchiveInteger( &dmg );
-   arc.ArchiveString( &bouncesound );
-   if ( arc.Loading() )
-      {
-      SetBounceSound( bouncesound );
-      }
-   }
-
-
-class SupplyWater : public Trigger
-   {
-   private:
-      int   maxwater;
-      int   amount;
-   public:
-      CLASS_PROTOTYPE( SupplyWater );
-   
-                        SupplyWater();
-      void              Activate( Event *ev );
-      void              MaxWater( Event *ev );
-      void              ChargeOff( Event *ev );
-      void Archive( Archiver &arc ) override;
-   };
-
-inline void SupplyWater::Archive
-	(
-	Archiver &arc
-	)
-
-   {
-   Trigger::Archive( arc );
-
-   arc.ArchiveInteger( &amount );
-   arc.ArchiveInteger( &maxwater );
-   }
-
-class FuncLadder : public Entity {
-private:
-	Vector m_vFacingAngles;
-	Vector m_vFacingDir;
-
+{
 public:
-	CLASS_PROTOTYPE( FuncLadder );
+    float dir;
 
-	FuncLadder();
+    CLASS_PROTOTYPE(MonkeyBars);
 
-	void		LadderSetup( Event *ev );
+    MonkeyBars();
+    void SetAngleEvent(Event *ev);
 
-	qboolean	CanUseLadder( Entity *pUser );
-	void		PositionOnLadder( Entity *pUser );
-
-	void		SetLadderFacing( Event *ev );
-	void		AdjustPositionOnLadder( Entity *pUser );
-
-	void		EnsureOverLadder( Entity *pUser );
-	void		EnsureForwardOffLadder( Entity *pUser );
+    void Archive(Archiver& arc) override;
 };
 
-#endif /* misc.h */
+inline void MonkeyBars::Archive(Archiver& arc)
+
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveFloat(&dir);
+}
+
+class HorizontalPipe : public Entity
+{
+public:
+    float dir;
+
+    CLASS_PROTOTYPE(HorizontalPipe);
+
+    HorizontalPipe();
+    void SetAngleEvent(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
+
+inline void HorizontalPipe::Archive(Archiver& arc)
+
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveFloat(&dir);
+}
+
+class TossObject : public Animate
+{
+private:
+    str   bouncesound;
+    float bouncesoundchance;
+    void  Stop(Event *ev);
+    void  Touch(Event *ev);
+    void  SetBounceSound(Event *ev);
+    void  SetBounceSoundChance(Event *ev);
+
+public:
+    CLASS_PROTOTYPE(TossObject);
+
+    TossObject();
+    TossObject(str modelname);
+    void SetBounceSound(str bounce);
+    void SetBounceSoundChance(float chance);
+    void SetVelocity(float severity);
+    void Archive(Archiver& arc) override;
+};
+
+inline void TossObject::Archive(Archiver& arc)
+
+{
+    Animate::Archive(arc);
+
+    arc.ArchiveString(&bouncesound);
+    arc.ArchiveFloat(&bouncesoundchance);
+}
+
+class PushObject : public Entity
+{
+private:
+    EntityPtr owner;
+    float     attack_finished;
+    int       dmg;
+    str       pushsound;
+
+public:
+    CLASS_PROTOTYPE(PushObject);
+
+    PushObject();
+    void     Start(Event *ev);
+    void     SetDamage(Event *ev);
+    void     BlockFunc(Event *ev);
+    void     SetPushSound(Event *ev);
+    qboolean Push(Entity *pusher, Vector move);
+    qboolean canPush(Vector dir);
+
+    Entity *getOwner(void);
+
+    void Archive(Archiver& arc) override;
+};
+
+inline void PushObject::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveSafePointer(&owner);
+    arc.ArchiveFloat(&attack_finished);
+    arc.ArchiveInteger(&dmg);
+    arc.ArchiveString(&pushsound);
+}
+
+class FallingRock : public Entity
+{
+private:
+    int     active;
+    Vector  start_origin;
+    Vector  last_bounce_origin;
+    Entity *current;
+    Entity *activator;
+    Vector  bounce_dir;
+    Vector  rotateaxis;
+    float   attack_finished;
+    float   wait;
+    float   speed;
+    int     dmg;
+    str     bouncesound;
+
+    void    Touch(Event *ev);
+    void    Bounce(Event *ev);
+    void    Rotate(Event *ev);
+    void    Activate(Event *ev);
+    void    NextBounce(void);
+    void    StartFalling(Event *ev);
+    void    SetWait(Event *ev);
+    void    SetSpeed(Event *ev);
+    void    SetDmg(Event *ev);
+    Entity *SetNextBounceDir(void);
+    void    SetBounceSound(str sound);
+    void    SetBounceSound(Event *ev);
+    void    Archive(Archiver& arc) override;
+
+public:
+    CLASS_PROTOTYPE(FallingRock);
+
+    FallingRock();
+};
+
+inline void FallingRock::Archive(Archiver& arc)
+
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveInteger(&active);
+    arc.ArchiveVector(&start_origin);
+    arc.ArchiveVector(&last_bounce_origin);
+    arc.ArchiveObjectPointer((Class **)&current);
+    arc.ArchiveObjectPointer((Class **)&activator);
+    arc.ArchiveVector(&bounce_dir);
+    arc.ArchiveVector(&rotateaxis);
+    arc.ArchiveFloat(&attack_finished);
+    arc.ArchiveFloat(&wait);
+    arc.ArchiveFloat(&speed);
+    arc.ArchiveInteger(&dmg);
+    arc.ArchiveString(&bouncesound);
+    if (arc.Loading()) {
+        SetBounceSound(bouncesound);
+    }
+}
+
+class SupplyWater : public Trigger
+{
+private:
+    int maxwater;
+    int amount;
+
+public:
+    CLASS_PROTOTYPE(SupplyWater);
+
+    SupplyWater();
+    void Activate(Event *ev);
+    void MaxWater(Event *ev);
+    void ChargeOff(Event *ev);
+    void Archive(Archiver& arc) override;
+};
+
+inline void SupplyWater::Archive(Archiver& arc)
+
+{
+    Trigger::Archive(arc);
+
+    arc.ArchiveInteger(&amount);
+    arc.ArchiveInteger(&maxwater);
+}
+
+class FuncLadder : public Entity
+{
+private:
+    Vector m_vFacingAngles;
+    Vector m_vFacingDir;
+
+public:
+    CLASS_PROTOTYPE(FuncLadder);
+
+    FuncLadder();
+
+    void LadderSetup(Event *ev);
+
+    qboolean CanUseLadder(Entity *pUser);
+    void     PositionOnLadder(Entity *pUser);
+
+    void SetLadderFacing(Event *ev);
+    void AdjustPositionOnLadder(Entity *pUser);
+
+    void EnsureOverLadder(Entity *pUser);
+    void EnsureForwardOffLadder(Entity *pUser);
+
+    const Vector& getFacingAngles() const;
+    const Vector& getFacingDir() const;
+
+    void Archive(Archiver& arc) override;
+};
+
+inline void FuncLadder::Archive(Archiver& arc)
+{
+    Entity::Archive(arc);
+
+    arc.ArchiveVector(&m_vFacingAngles);
+    arc.ArchiveVector(&m_vFacingDir);
+}
+
+class InfoLandmark : public Listener
+{
+private:
+    str    m_sName;
+    Vector m_vOrigin;
+    bool   m_bNameSet;
+    bool   m_bOriginSet;
+
+public:
+    CLASS_PROTOTYPE(InfoLandmark);
+
+    InfoLandmark();
+    void SetLandmarkName(Event *ev);
+    void SetOrigin(Event *ev);
+};
diff --git a/code/fgame/movegrid.cpp b/code/fgame/movegrid.cpp
index f982a5f4..feb60248 100644
--- a/code/fgame/movegrid.cpp
+++ b/code/fgame/movegrid.cpp
@@ -24,200 +24,227 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include "movegrid.h"
+#include "debuglines.h"
 
-// FIXME: undone class
-
-cMoveGrid::cMoveGrid( int x, int y, int z )
+cMoveGrid::cMoveGrid(int x, int y, int z)
 {
-	m_iXRes = x;
-	m_iYRes = y;
-	m_iZRes = z;
+    m_iXRes = x;
+    m_iYRes = y;
+    m_iZRes = z;
 
-	GridPoints = ( gridpoint_t * )gi.Malloc( sizeof( gridpoint_t ) * x * y * z );
+    GridPoints = (gridpoint_t *)gi.Malloc(sizeof(gridpoint_t) * x * y * z);
 }
 
 cMoveGrid::~cMoveGrid()
 {
-	gi.Free( GridPoints );
+    gi.Free(GridPoints);
 }
 
-void cMoveGrid::SetOrientation
-	(
-	float( *v )[ 3 ]
-	)
+void cMoveGrid::SetMoveInfo(vmove_t *vm)
 {
-	for( int i = 0; i < 3; i++ )
-	{
-		VectorCopy( v[ i ], orientation[ i ] );
-	}
+    v = *vm;
 }
 
-void cMoveGrid::SetMoveInfo
-	(
-	vmove_t *vm
-	)
+void cMoveGrid::GetMoveInfo(vmove_t *vm)
 {
-	memcpy( &v, vm, sizeof( vmove_t ) );
+    *vm = v;
 }
 
-void cMoveGrid::CalculateBoxPoints
-	(
-	void
-	)
+gridpoint_t *cMoveGrid::GetGridPoint(int x, int y, int z)
 {
-	int x, y, z;
-	int rx, ry, rz;
-	int xdelta, ydelta, zdelta;
-
-	Vector vBoxSize = Vector(v.maxs) - Vector(v.mins);
-
-	rx = (int)(vBoxSize[0] / (float)m_iXRes);
-	ry = (int)(vBoxSize[1] / (float)m_iYRes);
-	rz = (int)(vBoxSize[2] / (float)m_iZRes);
-
-	xdelta = ydelta = zdelta = 0;
-
-	for (x = 0; x < m_iXRes; x++)
-	{
-		for (y = 0; y < m_iYRes; y++)
-		{
-			for (z = 0; z < m_iZRes; z++)
-			{
-				gridpoint_t* gridPoint = GetGridPoint(x, y, z);
-
-				gridPoint->origin = Vector(
-					(float)(xdelta - rx),
-					(float)(ydelta - ry),
-					(float)rz * 0.5f
-				);
-			}
-		}
-	}
-
-	for (x = 0; x < m_iXRes; x++)
-	{
-		for (y = 0; y < m_iYRes; y++)
-		{
-			for (z = 0; z < m_iZRes; z++)
-			{
-				gridpoint_t* gridPoint = GetGridPoint(x, y, z);
-
-				Vector vTmp;
-				MatrixTransformVector(gridPoint->origin, orientation, vTmp);
-
-				gridPoint->origin = vTmp;
-				memcpy(&gridPoint->vm, &v, sizeof(gridPoint->vm));
-				gridPoint->vm.vs = &gridPoint->vs;
-
-				if (rx >= ry)
-				{
-					VectorSet(
-						gridPoint->vm.mins,
-						(float)-ry * 0.5f,
-						(float)-ry * 0.5f,
-						(float)-rz * 0.5f
-					);
-
-					VectorSet(
-						gridPoint->vm.maxs,
-						(float)ry * 0.5f,
-						(float)ry * 0.5f,
-						(float)rz * 0.5f
-					);
-				}
-				else
-				{
-					VectorSet(
-						gridPoint->vm.mins,
-						(float)-rx * 0.5f,
-						(float)-rx * 0.5f,
-						(float)-rz * 0.5f
-					);
-
-					VectorSet(
-						gridPoint->vm.maxs,
-						(float)rx * 0.5f,
-						(float)rx * 0.5f,
-						(float)rz * 0.5f
-					);
-				}
-			}
-		}
-	}
+    return &GridPoints[x * m_iZRes + y * m_iXRes + z];
 }
 
-gridpoint_t *cMoveGrid::GetGridPoint
-	(
-	int x,
-	int y,
-	int z
-	)
+void cMoveGrid::SetOrientation(const vec3_t *v)
 {
-	return &GridPoints[ x * m_iZRes + y * m_iXRes + z ];
+    for (int i = 0; i < 3; i++) {
+        VectorCopy(v[i], orientation[i]);
+    }
 }
 
-void cMoveGrid::Move
-	(
-	void
-	)
+void cMoveGrid::CalculateBoxPoints(void)
 {
-	int x;
-	int y;
-	int z;
-	Vector vBoxSize;
-	Vector old_origin;
+    int    x, y, z;
+    int    rx, ry, rz;
+    int    xdelta, ydelta, zdelta;
+    Vector vBoxSize;
 
-	CalculateBoxPoints();
+    vBoxSize = Vector(v.maxs) - Vector(v.mins);
 
-	for( x = 0; x < m_iXRes; x++ )
-	{
-		for( y = 0; y < m_iYRes; y++ )
-		{
-			for( z = 0; z < m_iZRes; z++ )
-			{
-			}
-		}
-	}
+    rx = (int)(vBoxSize.x / (float)m_iXRes);
+    ry = (int)(vBoxSize.y / (float)m_iYRes);
+    rz = (int)(vBoxSize.z / (float)m_iZRes);
 
-	// this is not called anyways
-	// FIXME: stub
-	STUB();
+    xdelta = ydelta = zdelta = 0;
+
+    for (x = 0; x < m_iXRes; x++) {
+        for (y = 0; y < m_iYRes; y++) {
+            for (z = 0; z < m_iZRes; z++) {
+                gridpoint_t *gridPoint = GetGridPoint(x, y, z);
+
+                gridPoint->origin = Vector(xdelta - rx, ydelta - ry, zdelta + rz / 2.f);
+                zdelta += rz;
+            }
+            zdelta = 0;
+            ydelta += ry;
+        }
+        ydelta = 0;
+        xdelta += rx;
+    }
+
+    for (x = 0; x < m_iXRes; x++) {
+        for (y = 0; y < m_iYRes; y++) {
+            for (z = 0; z < m_iZRes; z++) {
+                Vector       vTmp;
+                gridpoint_t *gridPoint = GetGridPoint(x, y, z);
+
+                MatrixTransformVector(gridPoint->origin, orientation, vTmp);
+
+                gridPoint->origin = vTmp;
+                gridPoint->vm     = v;
+                gridPoint->vm.vs  = &gridPoint->vs;
+
+                if (rx >= ry) {
+                    Vector vec;
+
+                    vec = Vector(-ry / 2.f, -ry / 2.f, -rz / 2.f);
+                    vec.copyTo(gridPoint->vm.mins);
+
+                    vec = Vector(ry / 2.f, ry / 2.f, rz / 2.f);
+                    vec.copyTo(gridPoint->vm.maxs);
+                } else {
+                    Vector vec;
+
+                    vec = Vector(-rx / 2.f, -rx / 2.f, -rz / 2.f);
+                    vec.copyTo(gridPoint->vm.mins);
+
+                    vec = Vector(rx / 2.f, rx / 2.f, rz / 2.f);
+                    vec.copyTo(gridPoint->vm.maxs);
+                }
+            }
+        }
+    }
 }
 
-qboolean cMoveGrid::CheckStuck
-	(
-	void
-	)
+void cMoveGrid::Move(void)
 {
-	int x;
-	int y;
-	int z;
-	trace_t trace;
+    gridpoint_t *gridPoint;
+    int          x, y, z;
+    Vector       vBoxSize;
+    Vector       old_origin;
+    float        best;
+    float        bx, by, bz;
+    Vector       bestdelta;
 
-	for( x = 0; x < m_iXRes; x++ )
-	{
-		for( y = 0; y < m_iYRes; y++ )
-		{
-			for( z = 0; z < m_iZRes; z++ )
-			{
-				gi.trace( &trace, v.vs->origin, v.mins, v.maxs, v.vs->origin, v.vs->entityNum, v.tracemask, false, false );
+    old_origin = v.vs->origin;
+    vBoxSize   = Vector(v.maxs) - Vector(v.mins);
 
-				if( trace.allsolid || trace.startsolid || trace.fraction == 0.0f )
-				{
-					return true;
-				}
-			}
-		}
-	}
+    CalculateBoxPoints();
 
-	return false;
+    for (x = 0; x < m_iXRes; x++) {
+        for (y = 0; y < m_iYRes; y++) {
+            for (z = 0; z < m_iZRes; z++) {
+                gridPoint = GetGridPoint(x, y, z);
+
+                gridPoint->origindelta = gridPoint->origin;
+                gridPoint->origin += old_origin;
+                gridPoint->origin.copyTo(gridPoint->vm.vs->origin);
+
+                G_DebugBBox(gridPoint->origin, gridPoint->vm.mins, gridPoint->vm.maxs, 1, 1, 0, 1);
+
+                VmoveSingle(&gridPoint->vm);
+
+                gridPoint->neworigin = gridPoint->vm.vs->origin;
+                gridPoint->changed   = gridPoint->neworigin - gridPoint->origin;
+                gridPoint->newvel    = gridPoint->vm.vs->velocity;
+                // set the ground entity
+                gridPoint->groundentity = NULL;
+                if (gridPoint->vm.vs->groundEntityNum != ENTITYNUM_NONE) {
+                    gridPoint->groundentity = &g_entities[gridPoint->vm.vs->groundEntityNum];
+                }
+            }
+        }
+    }
+
+    best = 99999;
+    bx = by = bz = 0;
+
+    for (x = 0; x < m_iXRes; x++) {
+        for (y = 0; y < m_iYRes; y++) {
+            for (z = 0; z < m_iZRes; z++) {
+                gridPoint = GetGridPoint(x, y, z);
+                float speed;
+
+                speed = (gridPoint->changed - gridPoint->origindelta).length();
+                if (speed < best) {
+                    best = gridPoint->changed.length();
+                    bx   = x;
+                    by   = y;
+                    bz   = z;
+                }
+            }
+        }
+    }
+
+    gridPoint = GetGridPoint(bx, by, bz);
+    bestdelta = gridPoint->neworigin - gridPoint->origindelta;
+    bestdelta.copyTo(v.vs->origin);
+    gridPoint->newvel.copyTo(v.vs->velocity);
 }
 
-void cMoveGrid::GetMoveInfo
-	(
-	vmove_t *vm
-	)
+qboolean cMoveGrid::CheckStuck(void)
 {
-	memcpy( vm, &v, sizeof( vmove_t ) );
+    int     x;
+    int     y;
+    int     z;
+    trace_t trace;
+
+    for (x = 0; x < m_iXRes; x++) {
+        for (y = 0; y < m_iYRes; y++) {
+            for (z = 0; z < m_iZRes; z++) {
+                gi.trace(
+                    &trace, v.vs->origin, v.mins, v.maxs, v.vs->origin, v.vs->entityNum, v.tracemask, false, false
+                );
+
+                if (trace.allsolid || trace.startsolid || trace.fraction == 0.0f) {
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
 }
 
+void cMoveGrid::Archive(Archiver& arc)
+{
+    int i;
+
+    arc.ArchiveInteger(&m_iXRes);
+    arc.ArchiveInteger(&m_iYRes);
+    arc.ArchiveInteger(&m_iZRes);
+
+    arc.ArchiveFloat(&v.frametime);
+    arc.ArchiveFloat(&v.desired_speed);
+    arc.ArchiveInteger(&v.tracemask);
+    arc.ArchiveInteger(&v.numtouch);
+
+    for (i = 0; i < ARRAY_LEN(v.touchents); i++) {
+        arc.ArchiveInteger(&v.touchents[i]);
+    }
+    arc.ArchiveVec3(v.mins);
+    arc.ArchiveVec3(v.maxs);
+
+    arc.ArchiveVec3(orientation[0]);
+    arc.ArchiveVec3(orientation[1]);
+    arc.ArchiveVec3(orientation[2]);
+
+    if (arc.Loading()) {
+        if (GridPoints) {
+            if (m_iXRes != 3 && m_iYRes != 3 && m_iZRes != 1) {
+                gi.Free(GridPoints);
+                GridPoints = (gridpoint_t *)gi.Malloc(sizeof(gridpoint_t) * m_iXRes * m_iYRes * m_iZRes);
+            }
+        }
+    }
+}
diff --git a/code/fgame/movegrid.h b/code/fgame/movegrid.h
index 2b8583e9..6847d1b2 100644
--- a/code/fgame/movegrid.h
+++ b/code/fgame/movegrid.h
@@ -23,100 +23,71 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // movegrid.h: Move grid
 //
 
-#ifndef __MOVEGRID_H__
-#define __MOVEGRID_H__
+#pragma once
 
 #include "g_local.h"
 #include "../qcommon/class.h"
 #include "../fgame/archive.h"
 
 typedef struct vehicleState_s {
-	float origin[ 3 ];
-	float velocity[ 3 ];
-	int groundEntityNum;
-	qboolean walking;
-	qboolean groundPlane;
-	trace_t groundTrace;
-	int entityNum;
-	float desired_dir[ 2 ];
-	qboolean hit_obstacle;
-	float hit_origin[ 3 ];
-	float obstacle_normal[ 3 ];
-	qboolean useGravity;
+    vec3_t   origin;
+    vec3_t   velocity;
+    int      groundEntityNum;
+    qboolean walking;
+    qboolean groundPlane;
+    trace_t  groundTrace;
+    int      entityNum;
+    vec2_t   desired_dir;
+    qboolean hit_obstacle;
+    vec3_t   hit_origin;
+    vec3_t   obstacle_normal;
+    qboolean useGravity;
 } vehicleState_t;
 
 typedef struct vmove_s {
-	vehicleState_t *vs;
-	float frametime;
-	float desired_speed;
-	int tracemask;
-	int numtouch;
-	int touchents[ 32 ];
-	float mins[ 3 ];
-	float maxs[ 3 ];
+    vehicleState_t *vs;
+    float           frametime;
+    float           desired_speed;
+    int             tracemask;
+    int             numtouch;
+    int             touchents[32];
+    vec3_t          mins;
+    vec3_t          maxs;
 } vmove_t;
 
 typedef struct gridpoint_s {
-	Vector origin;
-	Vector neworigin;
-	Vector origindelta;
-	Vector changed;
-	Vector newvel;
-	gentity_t *groundentity;
-	vmove_t vm;
-	vehicleState_t vs;
+    Vector         origin;
+    Vector         neworigin;
+    Vector         origindelta;
+    Vector         changed;
+    Vector         newvel;
+    gentity_t     *groundentity;
+    vmove_t        vm;
+    vehicleState_t vs;
 } gridpoint_t;
 
 class cMoveGrid : public Class
 {
 public:
-	gridpoint_t *GridPoints;
+    gridpoint_t *GridPoints;
 
 private:
-	vmove_t v;
-	float orientation[ 3 ][ 3 ];
-	int m_iXRes;
-	int m_iYRes;
-	int m_iZRes;
+    vmove_t v;
+    vec3_t  orientation[3];
+    int     m_iXRes;
+    int     m_iYRes;
+    int     m_iZRes;
 
 public:
-	cMoveGrid( int x, int y, int z );
-	virtual ~cMoveGrid();
+    cMoveGrid(int x, int y, int z);
+    virtual ~cMoveGrid();
 
-	void			SetOrientation( float( *v)[ 3 ] );
-	void			SetMoveInfo( vmove_t *vm );
-	void			CalculateBoxPoints( void );
-	gridpoint_t		*GetGridPoint( int x, int y, int z );
-	void			Move( void );
-	qboolean		CheckStuck( void );
-	void			GetMoveInfo( vmove_t *vm );
-	void			Archive( Archiver& arc );
+    void         SetOrientation(const vec3_t *v);
+    void         SetMoveInfo(vmove_t *vm);
+    void         CalculateBoxPoints(void);
+    gridpoint_t *GetGridPoint(int x, int y, int z);
+    void         Move(void);
+    qboolean     CheckStuck(void);
+    void         GetMoveInfo(vmove_t *vm);
+    void         Archive(Archiver        &arc);
 };
-
-inline void cMoveGrid::Archive
-	(
-	Archiver& arc
-	)
-{
-	arc.ArchiveInteger( &m_iXRes );
-	arc.ArchiveInteger( &m_iYRes );
-	arc.ArchiveInteger( &m_iZRes );
-	arc.ArchiveRaw( &v, sizeof( vmove_t ) );
-	arc.ArchiveVec3( orientation[ 0 ] );
-	arc.ArchiveVec3( orientation[ 1 ] );
-	arc.ArchiveVec3( orientation[ 2 ] );
-
-	if( arc.Loading() )
-	{
-		if( GridPoints )
-		{
-			if( m_iXRes != 3 && m_iYRes != 3 && m_iZRes != 1 )
-			{
-				gi.Free( GridPoints );
-				GridPoints = ( gridpoint_t * )gi.Malloc( sizeof( gridpoint_t ) * m_iXRes * m_iYRes * m_iZRes );
-			}
-		}
-	}
-}
-
-#endif
diff --git a/code/fgame/mover.cpp b/code/fgame/mover.cpp
index 47e31d40..3b99e3df 100644
--- a/code/fgame/mover.cpp
+++ b/code/fgame/mover.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -35,90 +35,81 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MOVE_ANGLES 1
 #define MOVE_ORIGIN 2
 
-CLASS_DECLARATION( Trigger, Mover, "mover" )
-	{
-	   { &EV_MoveDone,         &Mover::MoveDone },
-		{ NULL, NULL }
-	};
-
+CLASS_DECLARATION(Trigger, Mover, "mover") {
+    {&EV_MoveDone, &Mover::MoveDone},
+    {NULL,         NULL            }
+};
 
 Mover::Mover()
-   {
-   endevent = NULL;
-   }
-
-Mover::~Mover()
-	{
-	}
-
-void Mover::MoveDone
-	(
-	Event *ev
-	)
 {
-	Event * event;
-	Vector move;
-	Vector amove;
+    endevent = NULL;
+}
 
-	// zero out the movement
-	if( moveflags & MOVE_ANGLES )
-	{
-		avelocity = vec_zero;
-		amove = angledest - localangles;
-	}
-	else
-	{
-		amove = vec_zero;
-	}
+Mover::~Mover() {}
 
-	if( moveflags & MOVE_ORIGIN )
-	{
-		velocity = vec_zero;
-		move = finaldest - localorigin;
-	}
-	else
-	{
-		move = vec_zero;
-	}
+void Mover::MoveDone(Event *ev)
+{
+    Event *event;
+    Vector move;
+    Vector amove;
 
-	if( !G_PushMove( this, move, amove ) )
-	{
-		// Delay finish till we can move into the final position
-		PostEvent( EV_MoveDone, FRAMETIME );
-		return;
-	}
+    // zero out the movement
+    avelocity = vec_zero;
+    if (moveflags & MOVE_ANGLES) {
+        amove = angledest - localangles;
+    } else {
+        amove = vec_zero;
+    }
 
-	//
-	// After moving, set origin to exact final destination
-	//
-	if( moveflags & MOVE_ORIGIN )
-	{
-		setLocalOrigin( finaldest );
-	}
+    velocity = vec_zero;
+    if (moveflags & MOVE_ORIGIN) {
+        move = finaldest - localorigin;
+    } else {
+        move = vec_zero;
+    }
 
-	if( moveflags & MOVE_ANGLES )
-	{
-		localangles = angledest;
+    accel  = vec_zero;
+    aaccel = vec_zero;
 
-		if( ( localangles.x >= 360 ) || ( localangles.x < 0 ) )
-		{
-			localangles.x -= ( ( int )localangles.x / 360 ) * 360;
-		}
-		if( ( localangles.y >= 360 ) || ( localangles.y < 0 ) )
-		{
-			localangles.y -= ( ( int )localangles.y / 360 ) * 360;
-		}
-		if( ( localangles.z >= 360 ) || ( localangles.z < 0 ) )
-		{
-			localangles.z -= ( ( int )localangles.z / 360 ) * 360;
-		}
-	}
+    if (!G_PushMove(this, move, amove)) {
+        // Added in OPM
+        //  Check to make sure the event isn't pending
+        //  blocked events called by G_PushMove() might alter
+        //  the mover
+        if (!EventPending(EV_MoveDone)) {
+            // Delay finish till we can move into the final position
+            PostEvent(EV_MoveDone, FRAMETIME);
+        }
+        return;
+    }
 
-	event = endevent;
-	endevent = NULL;
+    //
+    // After moving, set origin to exact final destination
+    //
+    if (moveflags & MOVE_ORIGIN) {
+        setLocalOrigin(finaldest);
+    }
 
-	if( event )
-		ProcessEvent( event );
+    if (moveflags & MOVE_ANGLES) {
+        localangles = angledest;
+
+        if ((localangles.x >= 360) || (localangles.x < 0)) {
+            localangles.x -= ((int)localangles.x / 360) * 360;
+        }
+        if ((localangles.y >= 360) || (localangles.y < 0)) {
+            localangles.y -= ((int)localangles.y / 360) * 360;
+        }
+        if ((localangles.z >= 360) || (localangles.z < 0)) {
+            localangles.z -= ((int)localangles.z / 360) * 360;
+        }
+    }
+
+    event    = endevent;
+    endevent = NULL;
+
+    if (event) {
+        ProcessEvent(event);
+    }
 }
 
 /*
@@ -129,99 +120,87 @@ calculate self.velocity and self.nextthink to reach dest from
 self.origin traveling at speed
 ===============
 */
-void Mover::MoveTo( Vector tdest, Vector angdest, float tspeed, Event& event )
+void Mover::MoveTo(Vector tdest, Vector angdest, float tspeed, Event& event)
 {
-	Vector vdestdelta;
-	Vector angdestdelta;
-	float  len;
-	float  traveltime;
+    Vector vdestdelta;
+    Vector angdestdelta;
+    float  len;
+    float  traveltime;
 
-	assert( tspeed >= 0.0f );
+    assert(tspeed >= 0.0f);
 
-	if( !tspeed )
-	{
-		error( "MoveTo", "No speed is defined!" );
-	}
+    if (!tspeed) {
+        error("MoveTo", "No speed is defined!");
+    }
 
-	if( tspeed < 0.0f )
-	{
-		error( "MoveTo", "Speed is negative!" );
-	}
+    if (tspeed < 0.0f) {
+        error("MoveTo", "Speed is negative!");
+    }
 
-	// Cancel previous moves
-	CancelEventsOfType( EV_MoveDone );
+    // Cancel previous moves
+    CancelEventsOfType(EV_MoveDone);
 
-	moveflags = 0;
+    moveflags = 0;
 
-	if( endevent )
-	{
-		delete endevent;
-	}
+    if (endevent) {
+        delete endevent;
+    }
 
-	endevent = new Event( event );
+    endevent = new Event(event);
 
-	finaldest = tdest;
-	angledest = angdest;
+    finaldest = tdest;
+    angledest = angdest;
 
-	if( finaldest != localorigin )
-	{
-		moveflags |= MOVE_ORIGIN;
-	}
-	if( angledest != localangles )
-	{
-		moveflags |= MOVE_ANGLES;
-	}
+    if (finaldest != localorigin) {
+        moveflags |= MOVE_ORIGIN;
+    }
+    if (angledest != localangles) {
+        moveflags |= MOVE_ANGLES;
+    }
 
-	if( !moveflags )
-	{
-		// stop the object from moving
-		velocity = vec_zero;
-		avelocity = vec_zero;
+    if (!moveflags) {
+        // stop the object from moving
+        velocity  = vec_zero;
+        avelocity = vec_zero;
 
-		// post the event so we don't wait forever
-		PostEvent( EV_MoveDone, FRAMETIME );
-		return;
-	}
+        // post the event so we don't wait forever
+        PostEvent(EV_MoveDone, FRAMETIME);
+        return;
+    }
 
-	// set destdelta to the vector needed to move
-	vdestdelta = tdest - localorigin;
-	angdestdelta[ 0 ] = angledist( angdest[ 0 ] - localangles[ 0 ] );
-	angdestdelta[ 1 ] = angledist( angdest[ 1 ] - localangles[ 1 ] );
-	angdestdelta[ 2 ] = angledist( angdest[ 2 ] - localangles[ 2 ] );
+    // set destdelta to the vector needed to move
+    vdestdelta      = tdest - localorigin;
+    angdestdelta[0] = angledist(angdest[0] - localangles[0]);
+    angdestdelta[1] = angledist(angdest[1] - localangles[1]);
+    angdestdelta[2] = angledist(angdest[2] - localangles[2]);
 
-	if( tdest == localorigin )
-	{
-		// calculate length of vector based on angles
-		len = angdestdelta.length();
-	}
-	else
-	{
-		// calculate length of vector based on distance
-		len = vdestdelta.length();
-	}
+    if (tdest == localorigin) {
+        // calculate length of vector based on angles
+        len = angdestdelta.length();
+    } else {
+        // calculate length of vector based on distance
+        len = vdestdelta.length();
+    }
 
-	// divide by speed to get time to reach dest
-	traveltime = len / tspeed;
+    // divide by speed to get time to reach dest
+    traveltime = len / tspeed;
 
-	if( traveltime < level.frametime )
-	{
-		traveltime = level.frametime;
-		vdestdelta = vec_zero;
-		angdestdelta = vec_zero;
-	}
+    if (traveltime < level.frametime) {
+        traveltime   = level.frametime;
+        vdestdelta   = vec_zero;
+        angdestdelta = vec_zero;
+    }
 
-	// scale the destdelta vector by the time spent traveling to get velocity
-	if( moveflags & MOVE_ORIGIN )
-	{
-		velocity = vdestdelta * ( 1.0f / traveltime );
-	}
+    // scale the destdelta vector by the time spent traveling to get velocity
+    if (moveflags & MOVE_ORIGIN) {
+        velocity = vdestdelta * (1.0f / traveltime);
+    }
 
-	if( moveflags & MOVE_ANGLES )
-	{
-		avelocity = angdestdelta * ( 1.0f / traveltime );
-	}
+    if (moveflags & MOVE_ANGLES) {
+        avelocity = angdestdelta * (1.0f / traveltime);
+    }
 
-	PostEvent( EV_MoveDone, traveltime );
+    PostEvent(EV_MoveDone, traveltime);
 }
 
 /*
@@ -229,55 +208,66 @@ void Mover::MoveTo( Vector tdest, Vector angdest, float tspeed, Event& event )
 LinearInterpolate
 ===============
 */
-void Mover::LinearInterpolate
-	(
-	Vector tdest,
-	Vector angdest,
-	float time,
-	Event &event
-	)
+void Mover::LinearInterpolate(Vector tdest, Vector angdest, float time, Event& event)
 {
-	Vector vdestdelta;
-	Vector angdestdelta;
-	float t;
+    Vector vdestdelta;
+    Vector angdestdelta;
+    float  t;
 
-	if( endevent )
-	{
-		delete endevent;
-	}
-	endevent = new Event( event );
-	finaldest = tdest;
-	angledest = angdest;
+    if (endevent) {
+        delete endevent;
+    }
+    endevent  = new Event(event);
+    finaldest = tdest;
+    angledest = angdest;
 
-	// Cancel previous moves
-	CancelEventsOfType( EV_MoveDone );
+    // Cancel previous moves
+    CancelEventsOfType(EV_MoveDone);
 
-	// Quantize to FRAMETIME
-	if( time < FRAMETIME )
-	{
-		time = FRAMETIME;
-	}
+    // Quantize to FRAMETIME
+    if (time < FRAMETIME) {
+        time = FRAMETIME;
+    }
 
-	moveflags = 0;
-	t = 1 / time;
-	// scale the destdelta vector by the time spent traveling to get velocity
-	if( finaldest != localorigin )
-	{
-		vdestdelta = tdest - localorigin;
-		velocity = vdestdelta * t;
-		moveflags |= MOVE_ORIGIN;
-	}
+    moveflags = 0;
+    t         = 1 / time;
+    // scale the destdelta vector by the time spent traveling to get velocity
+    if (finaldest != localorigin) {
+        vdestdelta = tdest - localorigin;
+        velocity   = vdestdelta * t;
+        moveflags |= MOVE_ORIGIN;
+    }
 
-	if( angledest != localangles )
-	{
-		angdestdelta = angdest - localangles;
-		avelocity = angdestdelta * t;
-		moveflags |= MOVE_ANGLES;
-	}
+    if (angledest != localangles) {
+        angdestdelta = angdest - localangles;
+        avelocity    = angdestdelta * t;
+        moveflags |= MOVE_ANGLES;
+    }
 
-	if( g_bBeforeThinks )
-		time -= FRAMETIME;
+    if (g_bBeforeThinks) {
+        time -= FRAMETIME;
+    }
 
-	PostEvent( EV_MoveDone, time );
+    PostEvent(EV_MoveDone, time);
 }
 
+/*
+=============
+Stop
+===============
+*/
+void Mover::Stop()
+{
+    if (endevent) {
+        delete endevent;
+        endevent = NULL;
+    }
+
+    CancelEventsOfType(EV_MoveDone);
+
+    moveflags = 0;
+    avelocity = vec_zero;
+    velocity  = vec_zero;
+    accel     = vec_zero;
+    aaccel    = vec_zero;
+}
diff --git a/code/fgame/mover.h b/code/fgame/mover.h
index d39eed77..f128a334 100644
--- a/code/fgame/mover.h
+++ b/code/fgame/mover.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,45 +24,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // Base class for any object that needs to move to specific locations over a
 // period of time.  This class is kept separate from most entities to keep
 // class size down for objects that don't need such behavior.
-// 
+//
 
-#ifndef __MOVER_H__
-#define __MOVER_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
 #include "trigger.h"
 
 class Mover : public Trigger
-	{		
-	private:
-      Vector				finaldest;
-		Vector				angledest;
-		Event					*endevent;
-		int					moveflags;
+{
+private:
+    Vector finaldest;
+    Vector angledest;
+    Event *endevent;
+    int    moveflags;
 
-	public:
-		CLASS_PROTOTYPE( Mover );
+public:
+    CLASS_PROTOTYPE(Mover);
 
-								Mover();
-		virtual				~Mover();
-		void					MoveDone( Event *ev );
-		void					MoveTo( Vector tdest, Vector angdest, float tspeed, Event &event );
-		void					LinearInterpolate( Vector tdest, Vector angdest, float time, Event &event );
-	   void Archive( Archiver &arc ) override;
-   };
+    Mover();
+    virtual ~Mover();
+    void MoveDone(Event *ev);
+    void MoveTo(Vector tdest, Vector angdest, float tspeed, Event& event);
+    void LinearInterpolate(Vector tdest, Vector angdest, float time, Event& event);
+    void Stop();
+    void Archive(Archiver& arc) override;
+};
 
-inline void Mover::Archive
-	(
-	Archiver &arc
-	)
-   {
-   Trigger::Archive( arc );
+inline void Mover::Archive(Archiver& arc)
+{
+    Trigger::Archive(arc);
 
-   arc.ArchiveVector( &finaldest );
-   arc.ArchiveVector( &angledest );
-   arc.ArchiveEventPointer( &endevent );
-   arc.ArchiveInteger( &moveflags );
-   }
-
-#endif
+    arc.ArchiveVector(&finaldest);
+    arc.ArchiveVector(&angledest);
+    arc.ArchiveEventPointer(&endevent);
+    arc.ArchiveInteger(&moveflags);
+}
diff --git a/code/fgame/navigate.cpp b/code/fgame/navigate.cpp
index 86288c12..e8a8f24d 100644
--- a/code/fgame/navigate.cpp
+++ b/code/fgame/navigate.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,243 +31,1222 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "player.h"
 #include "debuglines.h"
 #include "scriptexception.h"
+#include "gamecmds.h"
 
 #define PATHFILE_VERSION 103
 
-int path_checkthisframe;
-cvar_t	*ai_showroutes;
-cvar_t	*ai_showroutes_distance;
-cvar_t	*ai_shownodenums;
-cvar_t	*ai_shownode;
-cvar_t	*ai_showallnode;
-cvar_t	*ai_showpath;
-cvar_t	*ai_fallheight;
-cvar_t	*ai_debugpath;
-cvar_t	*ai_pathchecktime;
-cvar_t	*ai_pathcheckdist;
+int     path_checkthisframe;
+cvar_t *ai_showroutes;
+cvar_t *ai_showroutes_distance;
+cvar_t *ai_shownodenums;
+cvar_t *ai_shownode;
+cvar_t *ai_showallnode;
+cvar_t *ai_showpath;
+cvar_t *ai_fallheight;
+cvar_t *ai_debugpath;
+cvar_t *ai_pathchecktime;
+cvar_t *ai_pathcheckdist;
+cvar_t *ai_editmode; // Added in OPM
 
-static float *path_start;
-static float *path_end;
-static PathNode *Node;
-static float path_totaldir[ 2 ];
-static float path_p[ 3 ];
-static float path_startdir[ 2 ];
+static const vec_t *path_start;
+static const vec_t *path_end;
+static PathNode    *Node;
+static vec2_t       path_totaldir;
+static vec3_t       path_p;
+static vec2_t       path_startdir;
 
-static Entity  *IgnoreObjects[ MAX_GENTITIES ];
-static int		NumIgnoreObjects;
+static Entity *IgnoreObjects[MAX_GENTITIES];
+static int     NumIgnoreObjects;
 
 static qboolean pathnodesinitialized = false;
-static qboolean loadingarchive = false;
-static qboolean pathnodescalculated = false;
-int ai_maxnode;
+static qboolean loadingarchive       = false;
+static qboolean pathnodescalculated  = false;
+int             ai_maxnode;
 
-MapCell PathSearch::PathMap[ PATHMAP_GRIDSIZE ][ PATHMAP_GRIDSIZE ];
+MapCell   PathSearch::PathMap[PATHMAP_GRIDSIZE][PATHMAP_GRIDSIZE];
 PathNode *PathSearch::open;
-int PathSearch::findFrame;
-qboolean PathSearch::m_bNodesloaded;
-qboolean PathSearch::m_NodeCheckFailed;
-int PathSearch::m_LoadIndex;
+int       PathSearch::findFrame;
+qboolean  PathSearch::m_bNodesloaded;
+qboolean  PathSearch::m_NodeCheckFailed;
+int       PathSearch::m_LoadIndex;
 
-PathNode *PathSearch::pathnodes[ MAX_PATHNODES ];
-int PathSearch::nodecount;
-float PathSearch::total_dist;
+PathNode   *PathSearch::pathnodes[MAX_PATHNODES];
+int         PathSearch::nodecount;
+float       PathSearch::total_dist;
 const char *PathSearch::last_error;
 
-byte *bulkNavMemory = NULL;
+byte *bulkNavMemory      = NULL;
 byte *startBulkNavMemory = NULL;
 
-Vector PLAYER_BASE_MIN( -15.5f, -15.5f, 0 );
-Vector PLAYER_BASE_MAX( 15.5f, 15.5f, 0 );
-Vector testpos[ 200 ];
+Vector PLAYER_BASE_MIN(-15.5f, -15.5f, 0);
+Vector PLAYER_BASE_MAX(15.5f, 15.5f, 0);
+Vector testpos[200];
 Vector ai_startpath;
 Vector ai_endpath;
 
-float NODE_MINS[ 3 ] = { -15, -15, 0 };
-float NODE_MAXS[ 3 ] = { 15, 15, 94 };
-float COLOR_PATHNODE_ERROR[ 3 ] = { 0, 0, 0 };
-float COLOR_PATHNODE_COVER[ 3 ] = { 0, 1, 0 };
-float COLOR_PATHNODE_CORNER_LEFT[ 3 ] = { 1, 1, 0 };
-float COLOR_PATHNODE_CORNER_RIGHT[ 3 ] = { 0.7f, 1, 0 };
-float COLOR_PATHNODE_SNIPER[ 3 ] = { 1, 0, 0 };
-float COLOR_PATHNODE_CRATE[ 3 ] = { 3, 0, 0 };
-float COLOR_PATHNODE_CONCEALMENT[ 3 ] = { 0, 0, 1 };
-float COLOR_PATHNODE_DUCK[ 3 ] = { 0, 1, 1 };
-float COLOR_PATHNODE_DEFAULT[ 3 ] = { 1, 0, 1 };
+float NODE_MINS[3]                   = {-15, -15, 0};
+float NODE_MAXS[3]                   = {15, 15, 94};
+float COLOR_PATHNODE_ERROR[3]        = {0, 0, 0};
+float COLOR_PATHNODE_COVER[3]        = {0, 1, 0};
+float COLOR_PATHNODE_CORNER_LEFT[3]  = {1, 1, 0};
+float COLOR_PATHNODE_CORNER_RIGHT[3] = {0.7f, 1, 0};
+float COLOR_PATHNODE_SNIPER[3]       = {1, 0, 0};
+float COLOR_PATHNODE_CRATE[3]        = {3, 0, 0};
+float COLOR_PATHNODE_CONCEALMENT[3]  = {0, 0, 1};
+float COLOR_PATHNODE_DUCK[3]         = {0, 1, 1};
+float COLOR_PATHNODE_DEFAULT[3]      = {1, 0, 1};
 
-int testcount = 0;
+int               testcount = 0;
 static ActorPath *test_path = NULL;
 
 struct {
-	float fMinRangeSquared;
-	float fMaxRangeSquared;
-	float fMinAngle;
-	float fMaxAngle;
-}
-
-g_AttackParms[] =
-{
-	{ 64 * 64, 2048 * 2048, 150.0f, 210.0f },
-	{ 64 * 64, 2048 * 2048, 150.0f, 210.0f },
-	{ 96 * 96, 2048 * 2048, 320.0f, 40.0f },
+    float fMinRangeSquared;
+    float fMaxRangeSquared;
+    float fMinAngle;
+    float fMaxAngle;
+} g_AttackParms[] = {
+    {Square(64), Square(2048), 150.0f, 210.0f},
+    {Square(64), Square(2048), 150.0f, 210.0f},
+    {Square(96), Square(2048), 320.0f, 40.0f },
+    {Square(96), Square(4096), 0.0f,   0.0f  },
 };
 
 PathSearch PathManager;
 
 int path_checksthisframe;
 
-void AI_AddNode
-	(
-	PathNode *node
-	)
+PathInfo *PathSearch::GeneratePath(PathInfo *path)
 {
-	int i = PathSearch::nodecount;
+    PathNode  *ParentNode;
+    pathway_t *pathway;
+    float      dist;
+    float      dir[2];
+    PathInfo  *current_path;
 
-	assert( node );
+    current_path = path;
 
-	if( i < MAX_PATHNODES )
-	{
-		if( i > ai_maxnode )
-		{
-			ai_maxnode = i;
-		}
-		PathSearch::pathnodes[ i ] = node;
-		node->nodenum = i;
-		PathSearch::nodecount++;
-		return;
-	}
+    dir[0] = path_end[0] - Node->m_PathPos[0];
+    dir[1] = path_end[1] - Node->m_PathPos[1];
 
-	gi.Error( ERR_DROP, "Exceeded MAX_PATHNODES!\n" );
+    dist = VectorNormalize2D(dir);
+
+    total_dist = dist + Node->g;
+
+    VectorCopy(path_end, current_path->point);
+
+    ParentNode = Node->Parent;
+    if (ParentNode) {
+        pathway = &ParentNode->Child[Node->pathway];
+        VectorSub2D(path_end, pathway->pos2, current_path->dir);
+        current_path->dist = VectorNormalize2D(current_path->dir);
+
+        if (path->dist) {
+            path->bAccurate = false;
+            current_path++;
+        }
+
+        if (pathway->dist) {
+            VectorCopy(pathway->pos2, current_path->point);
+            VectorCopy2D(pathway->dir, current_path->dir);
+            current_path->dist      = pathway->dist;
+            current_path->bAccurate = true;
+            assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+            current_path++;
+        }
+
+        for (Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL;
+             Node = ParentNode, ParentNode = ParentNode->Parent) {
+            pathway = &ParentNode->Child[Node->pathway];
+            if (pathway->dist) {
+                VectorCopy(pathway->pos2, current_path->point);
+                VectorCopy2D(pathway->dir, current_path->dir);
+                current_path->dist = pathway->dist;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+                current_path->bAccurate = true;
+                current_path++;
+            }
+        }
+
+        VectorCopy(pathway->pos1, current_path->point);
+        VectorCopy2D(path_startdir, current_path->dir);
+        current_path->dist = Node->g;
+        assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+    } else {
+        VectorCopy2D(path_totaldir, current_path->dir);
+        path->dist = Node->h;
+    }
+
+    if (current_path->dist) {
+        current_path->bAccurate = false;
+        current_path++;
+
+        VectorCopy(path_start, current_path->point);
+        current_path->dist = 0;
+        VectorClear2D(current_path->dir);
+    }
+
+    current_path->bAccurate = false;
+    return current_path;
 }
 
-qboolean CheckMove
-	(
-	Vector &origin,
-	Vector &pos,
-	short int *path_fallheight,
-	float size
-	)
+PathInfo *PathSearch::GeneratePathNear(PathInfo *path)
 {
-	mmove_t mm;
-	int i;
-	float air_z;
-	float fallheight;
-	float test_fallheight;
-	float error;
-	trace_t trace;
-	vec3_t dir;
-	vec3_t end;
+    PathInfo  *current_path = path;
+    pathway_t *pathway;
+    PathNode  *ParentNode;
 
-	memset( &mm, 0, sizeof( mmove_t ) );
+    total_dist = Node->g;
+    VectorCopy(Node->m_PathPos, path->point);
 
-	VectorClear( mm.velocity );
-	VectorCopy( origin, mm.origin );
-	mm.desired_speed = 150.0f;
-	mm.entityNum = ENTITYNUM_NONE;
-	mm.tracemask = MASK_PATHSOLID;
-	mm.frametime = 0.1f;
-	mm.desired_dir[ 0 ] = pos[ 0 ] - origin[ 0 ];
-	mm.desired_dir[ 1 ] = pos[ 1 ] - origin[ 1 ];
-	VectorNormalize2D( mm.desired_dir );
+    ParentNode = Node->Parent;
+    if (ParentNode) {
+        pathway = &ParentNode->Child[Node->pathway];
 
-	mm.groundPlane = qfalse;
-	mm.walking = qfalse;
+        if (pathway->dist) {
+            VectorCopy(pathway->pos2, path->point);
+            VectorCopy2D(pathway->dir, path->dir);
+            path->dist = pathway->dist;
 
-	mm.mins[ 0 ] = -size;
-	mm.mins[ 1 ] = -size;
-	mm.mins[ 2 ] = 0;
-	mm.maxs[ 0 ] = size;
-	mm.maxs[ 1 ] = size;
-	mm.maxs[ 2 ] = 94.0f;
+            current_path->bAccurate = true;
+            current_path++;
+        }
 
-	testcount = 0;
-	fallheight = 0.0f;
-	air_z = mm.origin[ 2 ];
+        for (Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL;
+             Node = ParentNode, ParentNode = ParentNode->Parent) {
+            pathway = &ParentNode->Child[Node->pathway];
+            if (pathway->dist) {
+                VectorCopy(pathway->pos2, current_path->point);
+                VectorCopy2D(pathway->dir, current_path->dir);
+                current_path->dist      = pathway->dist;
+                current_path->bAccurate = true;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+                current_path++;
+            }
+        }
 
-	for( i = 200; i != 1; i-- )
-	{
-		testpos[ i - 1 ] = mm.origin;
-		testcount++;
+        VectorCopy(pathway->pos1, current_path->point);
+        VectorCopy2D(path_startdir, current_path->dir);
+        current_path->dist = Node->g;
+    } else {
+        VectorCopy2D(path_totaldir, current_path->dir);
+        path->dist = Node->h;
+    }
 
-		MmoveSingle( &mm );
+    if (current_path->dist) {
+        current_path->bAccurate = false;
+        current_path++;
 
-		if( mm.groundPlane )
-		{
-			test_fallheight = air_z - mm.origin[ 2 ];
+        VectorCopy(path_start, current_path->point);
+        VectorClear2D(current_path->dir);
+        current_path->dist = 0;
+    }
 
-			if( test_fallheight > fallheight )
-			{
-				if( test_fallheight > 1024.0f )
-					return false;
+    current_path->bAccurate = false;
+    return current_path;
+}
 
-				fallheight = test_fallheight;
-			}
+PathInfo *PathSearch::GeneratePathAway(PathInfo *path)
+{
+    PathInfo  *current_path = path;
+    pathway_t *pathway;
+    PathNode  *ParentNode;
 
-			air_z = mm.origin[ 2 ];
-		}
-		
-		dir[ 0 ] = pos[ 0 ] - mm.origin[ 0 ];
-		dir[ 1 ] = pos[ 1 ] - mm.origin[ 1 ];
-		
-		if( DotProduct2D( dir, mm.desired_dir ) <= 0.1f )
-		{
-			error = mm.origin[ 2 ] - pos[ 2 ];
+    VectorCopy(Node->m_PathPos, path->point);
 
-			gi.Printf( "error = %f\n", error );
+    ParentNode = Node->Parent;
+    if (ParentNode) {
+        pathway = &ParentNode->Child[Node->pathway];
 
-			*path_fallheight = ( short )fallheight;
-			if( fabs( error ) > 94.0f )
-			{
-				if( mm.groundPlane )
-					return false;
+        if (pathway->dist) {
+            VectorCopy(pathway->pos2, current_path->point);
+            VectorCopy2D(pathway->dir, current_path->dir);
+            current_path->dist = pathway->dist;
 
-				mm.desired_dir[ 0 ] = dir[ 0 ];
-				mm.desired_dir[ 1 ] = dir[ 1 ];
-				VectorNormalize2D( mm.desired_dir );
-			}
-			else if( error > 0.0f && !mm.groundPlane )
-			{
-				end[ 0 ] = mm.origin[ 0 ];
-				end[ 1 ] = mm.origin[ 1 ];
-				end[ 2 ] = pos[ 2 ];
+            current_path->bAccurate = true;
+            assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+            current_path++;
+        }
 
-				trace = G_Trace( mm.origin,
-					mm.mins,
-					mm.maxs,
-					end,
-					NULL,
-					MASK_PATHSOLID,
-					true,
-					"CheckMove" );
+        for (Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL;
+             Node = ParentNode, ParentNode = ParentNode->Parent) {
+            pathway = &ParentNode->Child[Node->pathway];
+            if (pathway->dist) {
+                VectorCopy(pathway->pos2, current_path->point);
+                VectorCopy2D(pathway->dir, current_path->dir);
+                current_path->dist      = pathway->dist;
+                current_path->bAccurate = true;
+                assert(current_path->dist > -1e+07 && current_path->dist < 1e+07);
+                current_path++;
+            }
+        }
 
-				test_fallheight = mm.origin[ 2 ] - trace.endpos[ 2 ];
+        VectorCopy(pathway->pos1, current_path->point);
+        VectorCopy2D(pathway->pos1, current_path->point);
 
-				if( test_fallheight <= 18.0f )
-				{
-					*path_fallheight = ( short )test_fallheight + fallheight;
-					return test_fallheight + fallheight <= 1024.0f;
-				}
+        current_path->dist = Node->g;
 
-				if( mm.groundPlane )
-					return false;
+        if (Node->g) {
+            current_path->bAccurate = false;
+            current_path++;
+            VectorCopy(path_start, current_path->point);
+            VectorClear2D(current_path->dir);
+            current_path->dist = 0;
+        }
+    } else {
+        VectorClear2D(path->dir);
+        path->dist = 0;
+    }
 
-				mm.desired_dir[ 0 ] = dir[ 0 ];
-				mm.desired_dir[ 1 ] = dir[ 1 ];
-				VectorNormalize2D( mm.desired_dir );
-			}
-			else
-			{
-				return true;
-			}
-		}
-		
-		if( mm.hit_obstacle )
-		{
-			gi.DPrintf( "obstacle hit\n" );
-			return false;
-		}
-	}
+    current_path->bAccurate = false;
+    return current_path;
+}
 
-	return false;
+int PathSearch::FindPath(
+    const vec3_t start,
+    const vec3_t end,
+    Entity      *ent,
+    float        maxPath,
+    const vec3_t vLeashHome,
+    float        fLeashDistSquared,
+    int          fallheight
+)
+{
+    int        i;
+    int        g;
+    PathNode  *NewNode;
+    pathway_t *pathway;
+    PathNode  *prev;
+    PathNode  *next;
+    int        f;
+    vec2_t     delta;
+    PathNode  *to;
+
+    if (ent) {
+        // Added in OPM
+        //  Check for simple actor
+        if (ent->IsSubclassOfActor()) {
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
+        } else {
+            Node = DebugNearestStartNode(start, ent);
+        }
+    } else {
+        Node = DebugNearestStartNode(start);
+    }
+
+    if (!Node) {
+        last_error = "couldn't find start node";
+        return 0;
+    }
+
+    to = NearestEndNode(end);
+    if (!to) {
+        last_error = "couldn't find end node";
+        return 0;
+    }
+
+    total_dist = 1e+12f;
+
+    if (!maxPath) {
+        maxPath = 1e+12f;
+    }
+
+    findFrame++;
+    open = NULL;
+
+    VectorSub2D(Node->origin, start, path_startdir);
+    Node->g = VectorNormalize2D(path_startdir);
+
+    VectorSub2D(end, start, path_totaldir);
+    Node->h = VectorNormalize2D(path_totaldir);
+
+    Node->Parent    = NULL;
+    Node->m_Depth   = 3;
+    Node->findCount = findFrame;
+    Node->inopen    = true;
+    Node->PrevNode  = NULL;
+    Node->NextNode  = NULL;
+    Node->m_PathPos = start;
+
+    open = Node;
+
+    while (open) {
+        Node         = open;
+        open->inopen = false;
+        open         = Node->NextNode;
+
+        if (open) {
+            open->PrevNode = NULL;
+        }
+
+        if (Node == to) {
+            path_start = start;
+            path_end   = end;
+            return Node->m_Depth;
+        }
+
+        for (i = Node->numChildren - 1; i >= 0; i--) {
+            vec2_t vDist;
+
+            pathway = &Node->Child[i];
+
+            NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
+
+            if (vLeashHome) {
+                VectorSub2D(pathway->pos2, vLeashHome, vDist);
+                if (VectorLength2DSquared(vDist) > fLeashDistSquared) {
+                    continue;
+                }
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
+
+            if (NewNode->findCount == findFrame) {
+                if (NewNode->g <= g) {
+                    continue;
+                }
+
+                if (NewNode->inopen) {
+                    NewNode->inopen = false;
+                    next            = NewNode->NextNode;
+                    prev            = NewNode->PrevNode;
+
+                    if (next) {
+                        next->PrevNode = prev;
+                    }
+
+                    if (prev) {
+                        prev->NextNode = next;
+                    } else {
+                        open = next;
+                    }
+                }
+            }
+
+            VectorSub2D(end, pathway->pos2, delta);
+            NewNode->h = VectorLength2D(delta);
+
+            f = (int)((float)g + NewNode->h);
+
+            if (f >= maxPath) {
+                last_error = "specified path distance exceeded";
+                return 0;
+            }
+
+            if (pathway->fallheight <= fallheight
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
+                NewNode->m_Depth   = Node->m_Depth + 1;
+                NewNode->Parent    = Node;
+                NewNode->pathway   = i;
+                NewNode->g         = (float)g;
+                NewNode->f         = (float)f;
+                NewNode->m_PathPos = pathway->pos2;
+                NewNode->findCount = findFrame;
+                NewNode->inopen    = true;
+
+                if (!open) {
+                    NewNode->NextNode = NULL;
+                    NewNode->PrevNode = NULL;
+                    open              = NewNode;
+                    continue;
+                }
+
+                if (open->f >= f) {
+                    NewNode->NextNode = open;
+                    NewNode->PrevNode = NULL;
+
+                    open->PrevNode = NewNode;
+                    open           = NewNode;
+                    continue;
+                }
+
+                prev = open;
+                for (next = open->NextNode; next; next = next->NextNode) {
+                    if (next->f >= f) {
+                        break;
+                    }
+                    prev = next;
+                }
+
+                NewNode->NextNode = next;
+                if (next) {
+                    next->PrevNode = NewNode;
+                }
+                prev->NextNode    = NewNode;
+                NewNode->PrevNode = prev;
+            }
+        }
+    }
+
+    last_error = "unreachable path";
+    return 0;
+}
+
+int PathSearch::FindPathNear(
+    const vec3_t start,
+    const vec3_t end,
+    Entity      *ent,
+    float        maxPath,
+    float        fRadiusSquared,
+    const vec3_t vLeashHome,
+    float        fLeashDistSquared,
+    int          fallheight
+)
+{
+    int        i;
+    int        g;
+    PathNode  *NewNode;
+    pathway_t *pathway;
+    PathNode  *prev;
+    PathNode  *next;
+    int        f;
+    vec2_t     dir;
+    vec2_t     delta;
+
+    if (ent) {
+        // Added in OPM
+        //  Check for simple actor
+        if (ent->IsSubclassOfActor()) {
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
+        } else {
+            Node = DebugNearestStartNode(start, ent);
+        }
+    } else {
+        Node = DebugNearestStartNode(start);
+    }
+
+    if (!Node) {
+        last_error = "no start node";
+        return 0;
+    }
+
+    total_dist = 1e12f;
+
+    if (!maxPath) {
+        maxPath = 1e12f;
+    }
+
+    findFrame++;
+    open = NULL;
+
+    VectorSub2D(Node->origin, start, path_startdir);
+    VectorSub2D(end, start, delta);
+    VectorCopy2D(delta, dir);
+
+    Node->inopen    = true;
+    Node->g         = VectorNormalize2D(path_startdir);
+    Node->h         = VectorNormalize2D(dir);
+    Node->Parent    = NULL;
+    Node->m_Depth   = 3;
+    Node->findCount = findFrame;
+    Node->PrevNode  = NULL;
+    Node->NextNode  = NULL;
+    Node->m_PathPos = start;
+
+    open = Node;
+
+    while (open) {
+        Node         = open;
+        open->inopen = false;
+        open         = Node->NextNode;
+
+        if (open) {
+            open->PrevNode = NULL;
+        }
+
+        VectorSub2D(end, Node->m_PathPos, delta);
+
+        if (fRadiusSquared >= VectorLength2DSquared(delta)) {
+            path_start = start;
+            path_end   = end;
+            return Node->m_Depth;
+        }
+
+        for (i = Node->numChildren - 1; i >= 0; i--) {
+            pathway = &Node->Child[i];
+
+            NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
+
+            if (NewNode->findCount == findFrame) {
+                if (NewNode->g <= g) {
+                    continue;
+                }
+
+                if (NewNode->inopen) {
+                    NewNode->inopen = false;
+                    next            = NewNode->NextNode;
+                    prev            = NewNode->PrevNode;
+
+                    if (next) {
+                        next->PrevNode = prev;
+                    }
+
+                    if (prev) {
+                        prev->NextNode = next;
+                    } else {
+                        open = next;
+                    }
+                }
+            }
+
+            VectorSub2D(end, pathway->pos2, delta);
+            NewNode->h = VectorLength2D(delta);
+
+            f = (int)((float)g + NewNode->h);
+
+            if (f >= maxPath) {
+                last_error = "specified path distance exceeded";
+                return 0;
+            }
+
+            if (pathway->fallheight <= fallheight
+                && (!ent || !ent->IsSubclassOfSentient() || !pathway->badPlaceTeam[static_cast<Sentient *>(ent)->m_Team]
+                )) {
+                NewNode->m_Depth   = Node->m_Depth + 1;
+                NewNode->Parent    = Node;
+                NewNode->pathway   = i;
+                NewNode->g         = (float)g;
+                NewNode->f         = (float)f;
+                NewNode->m_PathPos = pathway->pos2;
+                NewNode->findCount = findFrame;
+                NewNode->inopen    = true;
+
+                if (!open) {
+                    NewNode->NextNode = NULL;
+                    NewNode->PrevNode = NULL;
+                    open              = NewNode;
+                    continue;
+                }
+
+                if (open->f >= f) {
+                    NewNode->NextNode = open;
+                    NewNode->PrevNode = NULL;
+
+                    open->PrevNode = NewNode;
+                    open           = NewNode;
+                    continue;
+                }
+
+                prev = open;
+                for (next = open->NextNode; next; next = next->NextNode) {
+                    if (next->f >= f) {
+                        break;
+                    }
+                    prev = next;
+                }
+
+                NewNode->NextNode = next;
+                if (next) {
+                    next->PrevNode = NewNode;
+                }
+                prev->NextNode    = NewNode;
+                NewNode->PrevNode = prev;
+            }
+        }
+    }
+
+    last_error = "unreachable path";
+    return 0;
+}
+
+int PathSearch::FindPathAway(
+    const vec3_t start,
+    const vec3_t avoid,
+    const vec3_t vPreferredDir,
+    Entity      *ent,
+    float        fMinSafeDist,
+    const vec3_t vLeashHome,
+    float        fLeashDistSquared,
+    int          fallheight
+)
+{
+    int        i;
+    int        g;
+    PathNode  *NewNode;
+    pathway_t *pathway;
+    PathNode  *prev;
+    PathNode  *next;
+    int        f;
+    float      fBias;
+    vec2_t     delta;
+    float      fMinSafeDistSquared;
+
+    fMinSafeDistSquared = fMinSafeDist * fMinSafeDist;
+
+    if (ent) {
+        // Added in OPM
+        //  Check for simple actor
+        if (ent->IsSubclassOfActor()) {
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
+        } else {
+            Node = DebugNearestStartNode(start, ent);
+        }
+    } else {
+        Node = DebugNearestStartNode(start);
+    }
+
+    if (!Node) {
+        last_error = "couldn't find start node";
+        return 0;
+    }
+
+    findFrame++;
+    open = NULL;
+
+    VectorSub2D(Node->origin, start, path_startdir);
+    VectorSub2D(start, avoid, delta);
+
+    fBias = VectorLength2D(vPreferredDir);
+
+    Node->inopen = true;
+    Node->g      = VectorNormalize2D(path_startdir);
+    Node->h      = fMinSafeDist - VectorNormalize2D(delta);
+    Node->h += fBias - DotProduct2D(vPreferredDir, delta);
+    Node->Parent    = NULL;
+    Node->m_Depth   = 2;
+    Node->findCount = findFrame;
+    Node->PrevNode  = NULL;
+    Node->NextNode  = NULL;
+    Node->m_PathPos = start;
+
+    open = Node;
+
+    while (open) {
+        Node         = open;
+        open->inopen = false;
+        open         = Node->NextNode;
+
+        if (open) {
+            open->PrevNode = NULL;
+        }
+
+        VectorSub2D(Node->m_PathPos, avoid, delta);
+
+        if (VectorLength2DSquared(delta) >= fMinSafeDistSquared) {
+            path_start = start;
+            return Node->m_Depth;
+        }
+
+        for (i = Node->numChildren - 1; i >= 0; i--) {
+            vec2_t vDist;
+
+            pathway = &Node->Child[i];
+
+            NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
+
+            if (vLeashHome) {
+                VectorSub2D(pathway->pos2, vLeashHome, vDist);
+                if (VectorLength2DSquared(vDist) > fLeashDistSquared) {
+                    continue;
+                }
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
+
+            if (NewNode->findCount == findFrame) {
+                if (NewNode->g <= g) {
+                    continue;
+                }
+
+                if (NewNode->inopen) {
+                    NewNode->inopen = false;
+                    next            = NewNode->NextNode;
+                    prev            = NewNode->PrevNode;
+
+                    if (next) {
+                        next->PrevNode = prev;
+                    }
+
+                    if (prev) {
+                        prev->NextNode = next;
+                    } else {
+                        open = next;
+                    }
+                }
+            }
+
+            VectorSub2D(pathway->pos2, avoid, delta);
+            NewNode->h = VectorNormalize2D(delta);
+            NewNode->h += fBias - DotProduct2D(delta, vPreferredDir);
+
+            f = (int)((float)g + NewNode->h);
+
+            if (pathway->fallheight <= fallheight) {
+                NewNode->m_Depth   = Node->m_Depth + 1;
+                NewNode->Parent    = Node;
+                NewNode->pathway   = i;
+                NewNode->g         = (float)g;
+                NewNode->f         = (float)f;
+                NewNode->m_PathPos = pathway->pos2;
+                NewNode->findCount = findFrame;
+                NewNode->inopen    = true;
+
+                if (!open) {
+                    NewNode->NextNode = NULL;
+                    NewNode->PrevNode = NULL;
+                    open              = NewNode;
+                    continue;
+                }
+
+                if (open->f >= f) {
+                    NewNode->NextNode = open;
+                    NewNode->PrevNode = NULL;
+
+                    open->PrevNode = NewNode;
+                    open           = NewNode;
+                    continue;
+                }
+
+                prev = open;
+                for (next = open->NextNode; next; next = next->NextNode) {
+                    if (next->f >= f) {
+                        break;
+                    }
+                    prev = next;
+                }
+
+                NewNode->NextNode = next;
+                if (next) {
+                    next->PrevNode = NewNode;
+                }
+                prev->NextNode    = NewNode;
+                NewNode->PrevNode = prev;
+            }
+        }
+    }
+
+    last_error = "unreachable path";
+    return 0;
+}
+
+PathNode *PathSearch::FindCornerNodeForWall(
+    const vec3_t start, const vec3_t end, Entity *ent, float maxPath, const vec4_t plane
+)
+{
+    int        i, g;
+    PathNode  *NewNode;
+    pathway_t *pathway;
+    PathNode  *prev, *next;
+    int        f;
+    vec2_t     delta;
+    vec2_t     dir;
+
+    if (ent) {
+        // Added in OPM
+        //  Check for simple actor
+        if (ent->IsSubclassOfActor()) {
+            Node = NearestStartNode(start, static_cast<SimpleActor*>(ent));
+        } else {
+            Node = DebugNearestStartNode(start, ent);
+        }
+    } else {
+        Node = DebugNearestStartNode(start);
+    }
+
+    if (!Node) {
+        last_error = "couldn't find start node";
+        return NULL;
+    }
+
+    if (DotProduct(start, plane) - plane[3] < 0.0) {
+        last_error = "starting point is already behind the wall";
+        return NULL;
+    }
+
+    if (DotProduct(plane, end) - plane[3] > 0.0) {
+        last_error = "end point is in front of the wall";
+        return NULL;
+    }
+
+    total_dist = 1e12f;
+
+    if (maxPath == 0.0) {
+        maxPath = 1e12f;
+    }
+
+    findFrame++;
+    open = NULL;
+
+    VectorSub2D(Node->origin, start, path_startdir);
+    Node->g = VectorNormalize2D(path_startdir);
+
+    VectorSub2D(end, start, path_totaldir);
+    Node->h         = VectorNormalize2D(path_totaldir);
+    Node->inopen    = true;
+    Node->Parent    = NULL;
+    Node->m_Depth   = 3;
+    Node->findCount = findFrame;
+    Node->PrevNode  = 0;
+    Node->NextNode  = 0;
+    Node->m_PathPos = start;
+
+    open = Node;
+
+    while (open) {
+        Node         = open;
+        open->inopen = false;
+        open         = Node->NextNode;
+
+        if (open) {
+            open->PrevNode = NULL;
+        }
+
+        if (Node->Parent && DotProduct(Node->m_PathPos, plane) - plane[3] < 0) {
+            VectorSub2D(Node->m_PathPos, start, delta);
+
+            if (VectorLength2DSquared(delta) >= 256) {
+                return Node->Parent;
+            }
+            return Node;
+        }
+
+        for (i = Node->numChildren - 1; i >= 0; i--) {
+            pathway = &Node->Child[i];
+
+            NewNode = pathnodes[pathway->node];
+            if (!NewNode) {
+                continue;
+            }
+
+            g = (int)(pathway->dist + Node->g + 1.0f);
+
+            if (NewNode->findCount == findFrame) {
+                if (NewNode->g <= g) {
+                    continue;
+                }
+
+                if (NewNode->inopen) {
+                    NewNode->inopen = false;
+                    next            = NewNode->NextNode;
+                    prev            = NewNode->PrevNode;
+
+                    if (next) {
+                        next->PrevNode = prev;
+                    }
+
+                    if (prev) {
+                        prev->NextNode = next;
+                    } else {
+                        open = next;
+                    }
+                }
+            }
+
+            VectorSub2D(end, pathway->pos2, dir);
+            NewNode->h = VectorNormalize2D(dir);
+
+            f = (int)((float)g + NewNode->h);
+
+            if (f >= maxPath) {
+                last_error = "specified path distance exceeded";
+                return 0;
+            }
+
+            NewNode->m_Depth   = Node->m_Depth + 1;
+            NewNode->Parent    = Node;
+            NewNode->pathway   = i;
+            NewNode->g         = (float)g;
+            NewNode->f         = (float)f;
+            NewNode->m_PathPos = pathway->pos2;
+            NewNode->findCount = findFrame;
+            NewNode->inopen    = true;
+
+            if (!open) {
+                NewNode->NextNode = NULL;
+                NewNode->PrevNode = NULL;
+                open              = NewNode;
+                continue;
+            }
+
+            if (open->f >= f) {
+                NewNode->NextNode = open;
+                NewNode->PrevNode = NULL;
+
+                open->PrevNode = NewNode;
+                open           = NewNode;
+                continue;
+            }
+
+            prev = open;
+            for (next = open->NextNode; next; next = next->NextNode) {
+                if (next->f >= f) {
+                    break;
+                }
+                prev = next;
+            }
+
+            NewNode->NextNode = next;
+            if (next) {
+                next->PrevNode = NewNode;
+            }
+            prev->NextNode    = NewNode;
+            NewNode->PrevNode = prev;
+        }
+    }
+
+    last_error = "unreachable path";
+    return NULL;
+}
+
+PathNode *PathSearch::FindCornerNodeForExactPath(Entity *pSelf, Sentient *enemy, float fMaxPath)
+{
+    PathNode *pPathNode[MAX_PATHNODES];
+    PathNode *pParentNode;
+    size_t    i, iDepth;
+    Vector    vEnd;
+    Vector    vEyeDelta;
+    Vector    vEyePos;
+
+    iDepth = PathSearch::FindPath(enemy->origin, pSelf->origin, pSelf, fMaxPath, 0, 0.0, 100);
+    if (!iDepth) {
+        return NULL;
+    }
+
+    if (pSelf->IsSubclassOfActor()) {
+        vEyePos = static_cast<SimpleActor*>(pSelf)->EyePosition();
+    } else {
+        vEyePos = pSelf->origin + Vector(0, 0, pSelf->maxs.z);
+    }
+
+    vEyeDelta = vEyePos - pSelf->origin;
+
+    for (pParentNode = Node->Parent, i = 0; pParentNode; pParentNode = pParentNode->Parent, i++) {
+        Node         = pParentNode;
+        pPathNode[i] = pParentNode;
+    }
+
+    iDepth = i;
+    if (!iDepth) {
+        return NULL;
+    }
+
+    for (i = 1; i < iDepth; i += 2) {
+        vEnd = vEyeDelta + pPathNode[i]->m_PathPos;
+
+        if (!G_SightTrace(
+                vEyePos, vec_zero, vec_zero, vEnd, pSelf, enemy, MASK_CORNER_NODE, qfalse, "FindCornerNodeFoExactPath 1"
+            )) {
+            break;
+        }
+    }
+
+    i--;
+    if (i >= iDepth) {
+        i = iDepth - 1;
+        return pPathNode[i];
+    }
+
+    if (i) {
+        vEnd = vEyeDelta + pPathNode[i]->m_PathPos;
+
+        if (!G_SightTrace(
+                vEyePos, vec_zero, vec_zero, vEnd, pSelf, enemy, MASK_CORNER_NODE, qfalse, "FindCornerNodeFoExactPath 2"
+            )) {
+            i--;
+        }
+    }
+
+    return pPathNode[i];
+}
+
+void PathSearch::ResetNodes(void)
+{
+    int i;
+    int x;
+    int y;
+
+    m_bNodesloaded = false;
+    m_LoadIndex    = -1;
+
+    if (!startBulkNavMemory && nodecount) {
+        for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+            for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+                if (PathMap[x][y].nodes) {
+                    gi.Free(PathMap[x][y].nodes);
+                }
+            }
+        }
+
+        for (i = 0; i < nodecount; i++) {
+            if (pathnodes[i] && pathnodes[i]->Child) {
+                gi.Free(pathnodes[i]->Child);
+            }
+        }
+    }
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            PathMap[x][y] = MapCell();
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        if (pathnodes[i]) {
+            delete pathnodes[i];
+            pathnodes[i] = NULL;
+        }
+    }
+
+    nodecount = 0;
+
+    // Free the bulk nav' memory
+    if (startBulkNavMemory) {
+        gi.Free(startBulkNavMemory);
+        bulkNavMemory      = NULL;
+        startBulkNavMemory = NULL;
+    }
+}
+
+void PathSearch::ClearNodes(void)
+{
+    int i, j;
+    int x;
+    int y;
+
+    m_bNodesloaded = false;
+    m_LoadIndex    = -1;
+
+    if (!startBulkNavMemory && nodecount) {
+        for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+            for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+                if (PathMap[x][y].nodes) {
+                    gi.Free(PathMap[x][y].nodes);
+                }
+            }
+        }
+
+        for (i = 0; i < nodecount; i++) {
+            if (pathnodes[i] && pathnodes[i]->Child) {
+                gi.Free(pathnodes[i]->Child);
+            }
+        }
+    }
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            PathMap[x][y] = MapCell();
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        if (pathnodes[i]) {
+            pathnodes[i]->Child              = NULL;
+            pathnodes[i]->virtualNumChildren = 0;
+            pathnodes[i]->numChildren        = 0;
+            pathnodes[i]->findCount          = 0;
+        }
+    }
+
+    // Rebuild node list
+    for (i = 0; i < nodecount; i++) {
+        PathNode *node1 = pathnodes[i];
+        if (node1) {
+            continue;
+        }
+
+        for (j = i + 1; j < nodecount; j++) {
+            PathNode *node2 = pathnodes[j];
+            if (node2) {
+                pathnodes[i]   = node2;
+                pathnodes[j]   = NULL;
+                node2->nodenum = i;
+                break;
+            }
+        }
+    }
+
+    while (nodecount > 0 && !pathnodes[nodecount - 1]) {
+        nodecount--;
+    }
+
+    // Free the bulk nav' memory
+    if (startBulkNavMemory) {
+        gi.Free(startBulkNavMemory);
+        bulkNavMemory      = NULL;
+        startBulkNavMemory = NULL;
+    }
+}
+
+void PathSearch::UpdatePathwaysForBadPlace(const Vector& origin, float radius, int dir, int team)
+{
+    float radiusSqr;
+    int   i, j, k;
+
+    radiusSqr = radius * radius;
+
+    for (i = 0; i < nodecount; i++) {
+        PathNode *node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
+
+        for (j = node->virtualNumChildren; j > 0; j--) {
+            pathway_t& pathway = node->Child[j - 1];
+            if (PointToSegmentDistanceSquared(origin, pathway.pos1, pathway.pos2) < radiusSqr) {
+                for (k = 0; k < 2; k++) {
+                    if ((1 << k) & team) {
+                        pathway.badPlaceTeam[k] += dir;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void AI_AddNode(PathNode *node)
+{
+    int i;
+
+    assert(node);
+
+    //
+    // Find a free slot
+    //
+    for (i = 0; i < PathSearch::nodecount; i++) {
+        if (!PathSearch::pathnodes[i]) {
+            PathSearch::pathnodes[i] = node;
+            node->nodenum            = i;
+            return;
+        }
+    }
+
+    if (i > ai_maxnode) {
+        ai_maxnode = i;
+    }
+
+    if (i >= MAX_PATHNODES) {
+        gi.Error(ERR_DROP, "Exceeded MAX_PATHNODES!\n");
+        return;
+    }
+
+    PathSearch::pathnodes[i] = node;
+    node->nodenum            = i;
+
+    PathSearch::nodecount++;
+}
+
+void AI_RemoveNode(PathNode *node)
+{
+    int num;
+
+    num = node->nodenum;
+    delete node;
+
+    PathSearch::pathnodes[num] = NULL;
+    if (num == PathSearch::nodecount) {
+        PathSearch::nodecount--;
+    }
 }
 
 /*****************************************************************************/
@@ -287,795 +1266,497 @@ JUMP marks the node as one to jump from when going to the node specified by targ
 ******************************************************************************/
 
 Event EV_Path_SetNodeFlags
-	(
-	"spawnflags",
-	EV_DEFAULT,
-	"i",
-	"node_flags",
-	"Sets the path nodes flags.",
-	EV_NORMAL
-	);
+(
+    "spawnflags",
+    EV_DEFAULT,
+    "i",
+    "node_flags",
+    "Sets the path nodes flags.",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( SimpleEntity, PathNode, "info_pathnode" )
-{
-	{ &EV_Path_SetNodeFlags,		&PathNode::SetNodeFlags },
-	{ &EV_IsTouching,				&PathNode::IsTouching },
-	{ &EV_Delete,					&PathNode::Remove },
-	{ &EV_Remove,					&PathNode::Remove },
-	{ NULL, NULL }
+// Added in 2.0
+Event EV_Path_SetLowWallArc
+(
+    "low_wall_arc",
+    EV_DEFAULT,
+    "f",
+    "arc_half_angle",
+    "Marks this node as good for low-wall behavior"
+    "and gives the arc"
+);
+
+CLASS_DECLARATION(SimpleEntity, PathNode, "info_pathnode") {
+    {&EV_Path_SetNodeFlags,  &PathNode::SetNodeFlags },
+    {&EV_IsTouching,         &PathNode::IsTouching   },
+    {&EV_Delete,             &PathNode::Remove       },
+    {&EV_Remove,             &PathNode::Remove       },
+    {&EV_Path_SetLowWallArc, &PathNode::SetLowWallArc},
+    {NULL,                   NULL                    }
 };
 
-static Vector     pathNodesChecksum;
-static int        numLoadNodes = 0;
-static int			numNodes = 0;
+static Vector pathNodesChecksum;
+static int    numLoadNodes = 0;
+static int    numNodes     = 0;
 
-void *PathNode::operator new( size_t size )
+void *PathNode::operator new(size_t size)
 {
-	return PathManager.AllocPathNode();
+    return PathManager.AllocPathNode();
 }
 
-void PathNode::operator delete( void *ptr )
+void PathNode::operator delete(void *ptr)
 {
-	return PathManager.FreePathNode( ptr );
+    return PathManager.FreePathNode(ptr);
 }
 
 PathNode::PathNode()
 {
-	entflags |= EF_PATHNODE;
-	findCount = 0;
-	numChildren = 0;
-	iAvailableTime = -1;
+    entflags |= ECF_PATHNODE;
+    findCount      = 0;
+    pLastClaimer   = NULL;
+    numChildren    = 0;
+    iAvailableTime = -1;
 
-	if( !loadingarchive )
-	{
-		// our archive function will take care of this stuff
-		AI_AddNode( this );
-		nodeflags = 0;
-		virtualNumChildren = 0;
-		iAvailableTime = -1;
-		Child = NULL;
-	}
+    if (!loadingarchive) {
+        // our archive function will take care of this stuff
+        AI_AddNode(this);
+        nodeflags          = 0;
+        m_fLowWallArc      = 0;
+        pLastClaimer       = NULL;
+        iAvailableTime     = -1;
+        virtualNumChildren = 0;
+        Child              = NULL;
+    }
 }
 
 PathNode::~PathNode()
 {
-	entflags &= ~EF_PATHNODE;
+    entflags &= ~ECF_PATHNODE;
 }
 
-void PathNode::Claim
-	(
-	Entity *pClaimer
-	)
+void PathNode::Remove(Event *ev)
 {
-	pLastClaimer = pClaimer;
-	iAvailableTime = 0;
+    // Pathnodes mustn't be removed
+    ScriptError("Not allowed to delete a path node");
 }
 
-const_str PathNode::GetSpecialAttack
-	(
-	Actor *pActor
-	)
+void PathNode::SetNodeFlags(Event *ev)
 {
-	int iSpecialAttack;
-	const_str csAnimation;
-	float fRangeSquared;
-	float vDelta[ 2 ];
-	float fMinAngle;
-	float fMaxAngle;
-
-	if( nodeflags & AI_CORNER_LEFT )
-	{
-		iSpecialAttack = 0;
-		csAnimation = STRING_ANIM_CORNERLEFT_SCR;
-	}
-	else if( nodeflags & AI_CORNER_RIGHT )
-	{
-		iSpecialAttack = 1;
-		csAnimation = STRING_ANIM_CORNERRIGHT_SCR;
-	}
-	else
-	{
-		if( nodeflags >= 0 )
-			return STRING_NULL;
-
-		iSpecialAttack = 2;
-		csAnimation = STRING_ANIM_OVERATTACK_SCR;
-	}
-
-	if( pActor->m_Enemy )
-	{
-		vDelta[ 0 ] = pActor->m_Enemy->origin[ 0 ] - origin[ 0 ];
-		vDelta[ 1 ] = pActor->m_Enemy->origin[ 1 ] - origin[ 1 ];
-	}
-	else
-	{
-		vDelta[ 0 ] = pActor->m_vLastEnemyPos[ 0 ] - origin[ 0 ];
-		vDelta[ 1 ] = pActor->m_vLastEnemyPos[ 1 ] - origin[ 1 ];
-	}
-
-	fRangeSquared = vDelta[ 0 ] * vDelta[ 0 ] + vDelta[ 1 ] * vDelta[ 1 ];
-
-	if( fRangeSquared < g_AttackParms[ iSpecialAttack ].fMinRangeSquared || fRangeSquared > g_AttackParms[ iSpecialAttack ].fMaxRangeSquared )
-		return STRING_NULL;
-
-	fMinAngle = atan2( vDelta[ 0 ], vDelta[ 1 ] ) * ( 180.0f / M_PI ) - angles[ 1 ];
-
-	if( fMinAngle > -360.0f )
-	{
-		if( fMinAngle >= 0.0f )
-		{
-			if( fMinAngle >= 720.0f )
-				fMaxAngle = fMinAngle - 720.0f;
-			else if( fMinAngle >= 360.0f )
-				fMaxAngle = fMinAngle - 360.0f;
-			else
-				fMaxAngle = fMinAngle;
-		}
-		else
-		{
-			fMaxAngle = fMinAngle + 360.0f;
-		}
-	}
-	else
-	{
-		fMaxAngle = fMinAngle + 720.0f;
-	}
-
-	if( g_AttackParms[ iSpecialAttack ].fMinAngle <= g_AttackParms[ iSpecialAttack ].fMaxAngle )
-	{
-		if( g_AttackParms[ iSpecialAttack ].fMinAngle > fMaxAngle )
-			return STRING_NULL;
-	}
-	else
-	{
-		if( g_AttackParms[ iSpecialAttack ].fMinAngle <= fMaxAngle )
-			return STRING_NULL;
-	}
-
-	if( fMaxAngle > g_AttackParms[ iSpecialAttack ].fMaxAngle )
-		return STRING_NULL;
-
-	return csAnimation;
+    nodeflags = ev->GetInteger(1);
 }
 
-Entity *PathNode::GetClaimHolder
-	(
-	void
-	) const
+void PathNode::SetLowWallArc(Event *ev)
 {
-	if( iAvailableTime )
-		return NULL;
-	else
-		return pLastClaimer;
+    float value = ev->GetFloat(1);
+    if (value < 0 || value >= 180) {
+        ScriptError("low_wall_arc must be >= 0 and < 180");
+    }
+
+    m_fLowWallArc = value;
+
+    if (!value) {
+        nodeflags &= ~AI_LOW_WALL_ARC;
+    } else {
+        nodeflags |= AI_LOW_WALL_ARC;
+    }
 }
 
-bool PathNode::IsClaimedByOther
-	(
-	Entity *pPossibleClaimer
-	) const
+void PathNode::ConnectTo(PathNode *node)
 {
-	if( pLastClaimer == pPossibleClaimer )
-		return false;
-
-	if( iAvailableTime )
-	{
-		return ( level.inttime < iAvailableTime );
-	}
-	else
-	{
-		return ( pLastClaimer != NULL );
-	}
+    Child[virtualNumChildren].node            = node->nodenum;
+    Child[virtualNumChildren].numBlockers     = 0;
+    Child[virtualNumChildren].badPlaceTeam[0] = 0;
+    Child[virtualNumChildren].badPlaceTeam[1] = 0;
+    virtualNumChildren++;
+    numChildren++;
 }
 
-qboolean PathNode::IsTouching
-	(
-	Entity *e1
-	)
+void PathNode::ConnectChild(int i)
 {
-	return e1->absmin[ 0 ] <= origin[ 0 ] + 15.5f &&
-		e1->absmin[ 1 ] <= origin[ 1 ] + 15.5f &&
-		e1->absmin[ 0 ] <= origin[ 2 ] + 94.0f &&
-		origin[ 0 ] - 15.5f <= e1->absmax[ 0 ] &&
-		origin[ 1 ] - 15.5f <= e1->absmax[ 1 ] &&
-		origin[ 2 ] + 0.0f <= e1->absmax[ 2 ];
+    int       j;
+    pathway_t child = Child[i];
+
+    for (j = i - 1; j >= numChildren; j--) {
+        Child[j + 1] = Child[j];
+    }
+
+    Child[numChildren] = child;
+    numChildren++;
 }
 
-void PathNode::SetNodeFlags
-	(
-	Event *ev
-	)
+void PathNode::DisconnectChild(int i)
 {
-	nodeflags = ev->GetInteger( 1 );
+    int       j;
+    pathway_t child = Child[i];
+
+    for (j = i + 1; j < numChildren; j++) {
+        Child[j - 1] = Child[j];
+    }
+
+    numChildren--;
+    Child[numChildren] = child;
 }
 
-void PathNode::IsTouching
-	(
-	Event *ev
-	)
+qboolean PathNode::IsTouching(Entity *e1)
 {
-	Entity *ent = ev->GetEntity( 1 );
-
-	if( !ent )
-	{
-		ScriptError( "IsTouching used with a NULL entity.\n" );
-	}
-
-	ev->AddInteger( IsTouching( ev->GetEntity( 1 ) ) );
+    return e1->absmin[0] <= origin[0] + 15.5f && e1->absmin[1] <= origin[1] + 15.5f
+        && e1->absmin[0] <= origin[2] + 94.0f && origin[0] - 15.5f <= e1->absmax[0]
+        && origin[1] - 15.5f <= e1->absmax[1] && origin[2] + 0.0f <= e1->absmax[2];
 }
 
-void PathNode::Remove
-	(
-	Event *ev
-	)
+void PathNode::IsTouching(Event *ev)
 {
-	// Pathnodes mustn't be removed
-	ScriptError( "Not allowed to delete a path node" );
+    Entity *ent = ev->GetEntity(1);
+
+    if (!ent) {
+        ScriptError("IsTouching used with a NULL entity.\n");
+    }
+
+    ev->AddInteger(IsTouching(ev->GetEntity(1)));
 }
 
-void PathNode::setOriginEvent
-	(
-	Vector org
-	)
+void PathNode::setOriginEvent(Vector org)
 {
-	if( !PathManager.m_bNodesloaded )
-	{
-		origin = org;
-		centroid = org;
-	}
+    if (!PathManager.m_bNodesloaded) {
+        origin   = org;
+        centroid = org;
+    }
 }
 
-void PathNode::Archive
-	(
-	Archiver &arc
-	)
+void PathNode::DrawConnections(void)
 {
+    int        i;
+    pathway_t *path;
+    PathNode  *node;
+
+    for (i = 0; i < numChildren; i++) {
+        path = &Child[i];
+        node = PathSearch::pathnodes[path->node];
+        if (!node) {
+            continue;
+        }
+
+        G_DebugLine(origin + Vector("0 0 24"), node->origin + Vector("0 0 24"), 0.7f, 0.7f, 0, 1);
+    }
 }
 
-void PathNode::ArchiveDynamic
-	(
-	Archiver &arc
-	)
+static void droptofloor(Vector& vec, PathNode *node)
 {
-	SimpleEntity::SimpleArchive( arc );
+    Vector  start, end;
+    trace_t trace;
 
-	arc.ArchiveObjectPosition( this );
-	arc.ArchiveSafePointer( &pLastClaimer );
-	arc.ArchiveInteger( &iAvailableTime );
-	arc.ArchiveInteger( &numChildren );
+    start = vec;
+    start[2] += 36;
+    end = start;
+    end[2] -= 2048;
 
-	if( numChildren != virtualNumChildren )
-	{
-		for( int i = 0; i < virtualNumChildren; i++ )
-		{
-			arc.ArchiveByte( &Child[ i ].numBlockers );
-			arc.ArchiveShort( &Child[ i ].node );
-			arc.ArchiveShort( &Child[ i ].fallheight );
-			arc.ArchiveFloat( &Child[ i ].dist );
-			arc.ArchiveVec2( Child[ i ].dir );
-			arc.ArchiveVec3( Child[ i ].pos1 );
-			arc.ArchiveVec3( Child[ i ].pos2 );
-		}
-	}
+    trace = G_Trace(start, PLAYER_BASE_MIN, PLAYER_BASE_MAX, end, NULL, MASK_PATHSOLID, qfalse, "droptofloor");
+    vec.z = trace.endpos[2];
 }
 
-void PathNode::ArchiveStatic
-	(
-	Archiver &arc
-	)
+static bool IsValidPathnode(int spawnflags)
 {
-	arc.ArchiveVector( &origin );
-	arc.ArchiveVector( &centroid );
-	arc.ArchiveInteger( &nodeflags );
-	arc.ArchiveInteger( &virtualNumChildren );
+    if ((spawnflags & AI_DUCK)
+        && (spawnflags & (AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
+        return false;
+    }
 
-	numChildren = virtualNumChildren;
+    if ((spawnflags & AI_CONCEALMENT) && (spawnflags & (AI_COVER | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
+        return false;
+    }
 
-	if( arc.Loading() )
-	{
-		bulkNavMemory -= virtualNumChildren * sizeof( pathway_t ) * sizeof( pathway_t * );
-		Child = virtualNumChildren ? ( pathway_t * )bulkNavMemory : NULL;
-	}
+    if ((spawnflags & AI_CORNER_LEFT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE))) {
+        return false;
+    }
 
-	for( int i = 0; i < virtualNumChildren; i++ )
-	{
-		arc.ArchiveShort( &Child[ i ].node );
-		arc.ArchiveShort( &Child[ i ].fallheight );
-		arc.ArchiveFloat( &Child[ i ].dist );
-		arc.ArchiveVec2( Child[ i ].dir );
-		arc.ArchiveVec3( Child[ i ].pos1 );
-		arc.ArchiveVec3( Child[ i ].pos2 );
+    if ((spawnflags & AI_CORNER_RIGHT)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_SNIPER | AI_CRATE))) {
+        return false;
+    }
 
-		if( arc.Loading() )
-			Child[ i ].numBlockers = 0;
-	}
+    if ((spawnflags & AI_SNIPER)
+        && (spawnflags & (AI_DUCK | AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE))) {
+        return false;
+    }
+
+    if ((spawnflags & AI_CRATE)
+        && (spawnflags & (AI_DUCK | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER))) {
+        return false;
+    }
+
+    return true;
 }
 
-void PathNode::ConnectChild
-	(
-	int i
-	)
+static void GetPathnodeColor(int spawnflags, vec3_t color)
 {
-	int j;
-	pathway_t child = Child[ i ];
+    if (!IsValidPathnode(spawnflags)) {
+        VectorCopy(COLOR_PATHNODE_ERROR, color);
+        return;
+    }
 
-	for( j = i - 1; j >= numChildren; j-- )
-	{
-		Child[ j + 1 ] = Child[ j ];
-	}
-
-	Child[ numChildren ] = child;
-	numChildren++;
+    if (spawnflags & AI_CORNER_LEFT) {
+        VectorCopy(COLOR_PATHNODE_CORNER_LEFT, color);
+    } else if (spawnflags & AI_CORNER_RIGHT) {
+        VectorCopy(COLOR_PATHNODE_CORNER_RIGHT, color);
+    } else if (spawnflags & AI_DUCK) {
+        VectorCopy(COLOR_PATHNODE_DUCK, color);
+    } else if (spawnflags & AI_SNIPER) {
+        VectorCopy(COLOR_PATHNODE_SNIPER, color);
+    } else if (spawnflags & AI_CONCEALMENT) {
+        VectorCopy(COLOR_PATHNODE_CONCEALMENT, color);
+    } else if (spawnflags & AI_COVER) {
+        VectorCopy(COLOR_PATHNODE_COVER, color);
+    } else if (spawnflags & AI_CRATE) {
+        VectorCopy(COLOR_PATHNODE_CRATE, color);
+    } else {
+        VectorCopy(COLOR_PATHNODE_DEFAULT, color);
+    }
 }
 
-void PathNode::DisconnectChild
-	(
-	int i
-	)
+static int GetNodeTypeFromName(const char *name)
 {
-	int j;
-	pathway_t child = Child[ i ];
+    if (!str::icmp(name, "corner_left")) {
+        return AI_CORNER_LEFT;
+    } else if (!str::icmp(name, "corner_right")) {
+        return AI_CORNER_RIGHT;
+    } else if (!str::icmp(name, "duck")) {
+        return AI_DUCK;
+    } else if (!str::icmp(name, "sniper")) {
+        return AI_SNIPER;
+    } else if (!str::icmp(name, "concealment")) {
+        return AI_CONCEALMENT;
+    } else if (!str::icmp(name, "cover")) {
+        return AI_COVER;
+    } else if (!str::icmp(name, "crate")) {
+        return AI_CRATE;
+    } else if (!str::icmp(name, "none")) {
+        return 0;
+    }
 
-	for( j = i + 1; j < numChildren; j++ )
-	{
-		Child[ j - 1 ] = Child[ j ];
-	}
-
-	numChildren--;
-	Child[ numChildren ] = child;
+    return -1;
 }
 
-void PathNode::ConnectTo
-	(
-	PathNode *node
-	)
+void DrawNode(int iNodeCount)
 {
-	Child[ virtualNumChildren ].node = nodenum;
-	Child[ virtualNumChildren ].numBlockers = 0;
-	virtualNumChildren++;
-	numChildren++;
+    Vector    down;
+    Vector    up;
+    Vector    dir;
+    Vector    p1;
+    Vector    p2;
+    Vector    p3;
+    Vector    p4;
+    Vector    q1;
+    Vector    q2;
+    Vector    q3;
+    Vector    q4;
+    Vector    playerorigin;
+    Vector    aStart;
+    Vector    aEnd;
+    PathNode *node;
+    PathNode *nodelist[MAX_PATHNODES];
+    Vector    end;
+    Vector    start;
+    Vector    p;
+    vec3_t    color;
+
+    playerorigin = g_entities[0].client->ps.origin;
+
+    if (iNodeCount > MAX_PATHNODES) {
+        iNodeCount = MAX_PATHNODES;
+    }
+
+    if (ai_showallnode->integer) {
+        iNodeCount = PathSearch::DebugNearestNodeList2(playerorigin, nodelist, iNodeCount);
+    } else {
+        iNodeCount = PathSearch::DebugNearestNodeList(playerorigin, nodelist, iNodeCount);
+    }
+
+    if (iNodeCount) {
+        for (int i = 0; i < iNodeCount; i++) {
+            node = nodelist[i];
+            GetPathnodeColor(node->nodeflags, color);
+
+            p1.x = PLAYER_BASE_MAX.x + node->origin.x;
+            p1.y = PLAYER_BASE_MAX.y + node->origin.y;
+
+            p2.x = PLAYER_BASE_MAX.x + node->origin.x;
+            p2.y = PLAYER_BASE_MIN.y + node->origin.y;
+
+            p3.x = PLAYER_BASE_MIN.x + node->origin.x;
+            p3.y = PLAYER_BASE_MIN.y + node->origin.y;
+
+            p4.x = PLAYER_BASE_MIN.x + node->origin.x;
+            p4.y = PLAYER_BASE_MAX.y + node->origin.y;
+
+            start = node->origin + Vector(0, 0, 18);
+            end   = node->origin + Vector(0, 0, 18);
+
+            aStart  = start;
+            aEnd[0] = node->origin[0] + cos(M_PI / 180.0f * node->angles[1]) * 16.0f;
+            aEnd[1] = node->origin[1] + sin(M_PI / 180.0f * node->angles[1]) * 16.0f;
+            aEnd[2] = end[2];
+
+            G_DebugLine(aStart, aEnd, 1, 1, 1, 1);
+
+            p1.z = node->origin.z + 36.0f;
+            p2.z = node->origin.z + 36.0f;
+            p3.z = node->origin.z + 36.0f;
+            p4.z = node->origin.z + 36.0f;
+
+            G_DebugLine(p1, p2, color[0], color[1], color[2], 1);
+            G_DebugLine(p2, p3, color[0], color[1], color[2], 1);
+            G_DebugLine(p3, p4, color[0], color[1], color[2], 1);
+            G_DebugLine(p4, p1, color[0], color[1], color[2], 1);
+
+            q1 = p1;
+            q2 = p2;
+            q3 = p3;
+            q4 = p4;
+
+            q1.z = node->origin.z;
+            q2.z = node->origin.z;
+            q3.z = node->origin.z;
+            q4.z = node->origin.z;
+
+            G_DebugLine(q1, q2, color[0], color[1], color[2], 1);
+            G_DebugLine(q2, q3, color[0], color[1], color[2], 1);
+            G_DebugLine(q3, q4, color[0], color[1], color[2], 1);
+            G_DebugLine(q4, q1, color[0], color[1], color[2], 1);
+
+            G_DebugLine(p1, q1, color[0], color[1], color[2], 1);
+            G_DebugLine(p2, q2, color[0], color[1], color[2], 1);
+            G_DebugLine(p3, q3, color[0], color[1], color[2], 1);
+            G_DebugLine(p4, q4, color[0], color[1], color[2], 1);
+        }
+    } else {
+        G_DebugCircle(playerorigin + Vector(0, 0, 48), 128, 1, 0, 0, 1, true);
+    }
 }
 
-bool PathNode::CheckPathTo
-	(
-	PathNode *node
-	)
+void DrawAllConnections(void)
 {
-
-	if( virtualNumChildren < NUM_PATHSPERNODE )
-	{
-		CheckPathToDefault( node, &Child[ virtualNumChildren ] );
-		return true;
-	}
-	else
-	{
-		Com_Printf( "^~^~^ %d paths per node at (%.2f %.2f %.2f) exceeded\n - use DONT_LINK on some nodes to conserve cpu and memory usage\n", NUM_PATHSPERNODE, node->origin[ 0 ], node->origin[ 1 ], node->origin[ 2 ] );
-		PathSearch::m_NodeCheckFailed = true;
-		return false;
-	}
-}
-
-void PathNode::CheckPathToDefault
-	(
-	PathNode *node,
-	pathway_t *pathway
-	)
-{
-	float dist;
-	float delta[ 2 ];
-	Vector start;
-	Vector end;
-
-	delta[ 0 ] = node->origin[ 0 ] - origin[ 0 ];
-	delta[ 1 ] = node->origin[ 1 ] - origin[ 1 ];
-
-	dist = VectorNormalize2D( delta );
-
-	if( dist >= 384.0f )
-		return;
-
-	start = origin + Vector( 0, 0, 36.0f );
-	end = start - Vector( 0, 0, 2048.0f );
-
-	trace_t trace = G_Trace(
-		start,
-		PLAYER_BASE_MIN,
-		PLAYER_BASE_MAX,
-		end,
-		NULL,
-		MASK_PATHSOLID,
-		qfalse,
-		"droptofloor" );
-
-	start = node->origin + Vector( 0, 0, 36.0f );
-	end = start - Vector( 0, 0, 2048.0f );
-
-	trace_t trace2 = G_Trace(
-		start,
-		PLAYER_BASE_MIN,
-		PLAYER_BASE_MAX,
-		end,
-		NULL,
-		MASK_PATHSOLID,
-		qfalse,
-		"droptofloor" );
-
-	start = trace.endpos;
-	end = trace2.endpos;
-
-	if( CheckMove( start, end, &pathway->fallheight, 15.5f ) )
-	{
-		pathway->dist = dist;
-		pathway->dir[ 0 ] = delta[ 0 ];
-		pathway->dir[ 1 ] = delta[ 1 ];
-		VectorCopy( start, pathway->pos1 );
-		VectorCopy( end, pathway->pos2 );
-		Child[ virtualNumChildren ].node = node->nodenum;
-		Child[ virtualNumChildren ].numBlockers = 0;
-
-		virtualNumChildren++;
-		numChildren++;
-	}
-}
-
-void PathNode::MarkTemporarilyBad
-	(
-	void
-	)
-{
-	iAvailableTime = level.inttime + 5000;
-	pLastClaimer = NULL;
-}
-
-void PathNode::Relinquish
-	(
-	void
-	)
-{
-	iAvailableTime = level.inttime + 4000;
-}
-
-void PathNode::DrawConnections
-	(
-	void
-	)
-{
-	int i;
-	pathway_t *path;
-	PathNode *node;
-
-	for( i = 0; i < numChildren; i++ )
-	{
-		path = &Child[ i ];
-		node = PathSearch::pathnodes[ path->node ];
-
-		G_DebugLine( origin + Vector( "0 0 24" ), node->origin + Vector( "0 0 24" ), 0.7f, 0.7f, 0, 1 );
-	}
-}
-
-static bool IsValidPathnode
-	(
-	int spawnflags
-	)
-{
-	if( ( spawnflags & AI_DUCK ) && ( spawnflags & AI_COVERFLAGS2 ) )
-		return false;
-
-	if( ( spawnflags & AI_CONCEALMENT ) && ( spawnflags & AI_SNIPERFLAGS ) )
-		return false;
-
-	if( ( spawnflags & AI_CORNER_LEFT ) && ( spawnflags & AI_COVER_LEFT_FLAGS ) )
-		return false;
-
-	if( ( spawnflags & AI_CORNER_RIGHT ) && ( spawnflags & AI_COVER_RIGHT_FLAGS ) )
-		return false;
-
-	if( ( spawnflags & AI_SNIPER ) && ( spawnflags & AI_CRATEFLAGS ) )
-		return false;
-
-	if( ( spawnflags & AI_ALL ) && ( spawnflags & AI_COVERFLAGS3 ) )
-		return false;
-
-	return true;
-}
-
-static void GetPathnodeColor
-	(
-	int spawnflags,
-	vec3_t color
-	)
-{
-	if( IsValidPathnode( spawnflags ) )
-	{
-		if( spawnflags & AI_CORNER_LEFT )
-		{
-			VectorCopy( COLOR_PATHNODE_CORNER_LEFT, color );
-		}
-		else if( spawnflags & AI_CORNER_RIGHT )
-		{
-			VectorCopy( COLOR_PATHNODE_CORNER_RIGHT, color );
-		}
-		else if( spawnflags & AI_DUCK )
-		{
-			VectorCopy( COLOR_PATHNODE_DUCK, color );
-		}
-		else if( spawnflags & AI_SNIPER )
-		{
-			VectorCopy( COLOR_PATHNODE_SNIPER, color );
-		}
-		else if( spawnflags & AI_CONCEALMENT )
-		{
-			VectorCopy( COLOR_PATHNODE_CONCEALMENT, color );
-		}
-		else if( spawnflags & AI_COVER )
-		{
-			VectorCopy( COLOR_PATHNODE_COVER, color );
-		}
-		else if( spawnflags & AI_CRATE )
-		{
-			VectorCopy( COLOR_PATHNODE_CRATE, color );
-		}
-		else
-		{
-			VectorCopy( COLOR_PATHNODE_DEFAULT, color );
-		}
-	}
-	else
-	{
-		VectorCopy( COLOR_PATHNODE_ERROR, color );
-	}
-}
-
-void DrawNode
-	(
-	int iNodeCount
-	)
-{
-	Vector down;
-	Vector up;
-	Vector dir;
-	Vector p1;
-	Vector p2;
-	Vector p3;
-	Vector p4;
-	Vector q1;
-	Vector q2;
-	Vector q3;
-	Vector q4;
-	Vector playerorigin;
-	Vector aStart;
-	Vector aEnd;
-	PathNode *node;
-	PathNode *nodelist[ 4096 ];
-	Vector end;
-	Vector start;
-	Vector p;
-	vec3_t color;
-
-	playerorigin = g_entities[ 0 ].client->ps.origin;
-
-	if( iNodeCount > 4096 )
-		iNodeCount = 4096;
-
-	if( ai_showallnode->integer )
-		iNodeCount = PathSearch::DebugNearestNodeList2( playerorigin, nodelist, iNodeCount );
-	else
-		iNodeCount = PathSearch::DebugNearestNodeList( playerorigin, nodelist, iNodeCount );
-
-	if( iNodeCount )
-	{
-		for( int i = 0; i < iNodeCount; i++ )
-		{
-			node = nodelist[ i ];
-			GetPathnodeColor( node->nodeflags, color );
-
-			p1.x = PLAYER_BASE_MAX.x + node->origin.x;
-			p1.y = PLAYER_BASE_MAX.y + node->origin.y;
-
-			p2.x = PLAYER_BASE_MAX.x + node->origin.x;
-			p2.y = PLAYER_BASE_MIN.y + node->origin.y;
-
-			p3.x = PLAYER_BASE_MIN.x + node->origin.x;
-			p3.y = PLAYER_BASE_MIN.y + node->origin.y;
-
-			p4.x = PLAYER_BASE_MIN.x + node->origin.x;
-			p4.y = PLAYER_BASE_MAX.y + node->origin.y;
-
-			start = node->origin + Vector( 0, 0, 18 );
-			end = node->origin + Vector( 0, 0, 18 );
-
-			aStart = start;
-			aEnd[ 0 ] = node->origin[ 0 ] + cos( M_PI / 180.0f * node->angles[ 1 ] ) * 16.0f;
-			aEnd[ 1 ] = node->origin[ 1 ] + sin( M_PI / 180.0f * node->angles[ 1 ] ) * 16.0f;
-			aEnd[ 2 ] = end[ 2 ];
-
-			G_DebugLine( aStart, aEnd, 1, 1, 1, 1 );
-
-			p1.z = node->origin.z + 36.0f;
-			p2.z = node->origin.z + 36.0f;
-			p3.z = node->origin.z + 36.0f;
-			p4.z = node->origin.z + 36.0f;
-
-			G_DebugLine( p1, p2, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p2, p3, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p3, p4, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p4, p1, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-
-			q1 = p1;
-			q2 = p2;
-			q3 = p3;
-			q4 = p4;
-
-			q1.z = node->origin.z;
-			q2.z = node->origin.z;
-			q3.z = node->origin.z;
-			q4.z = node->origin.z;
-
-			G_DebugLine( q1, q2, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( q2, q3, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( q3, q4, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( q4, q1, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-
-			G_DebugLine( p1, q1, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p2, q2, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p3, q3, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-			G_DebugLine( p4, q4, color[ 0 ], color[ 1 ], color[ 2 ], 1 );
-		}
-	}
-	else
-	{
-		G_DebugCircle( playerorigin + Vector( 0, 0, 48 ), 128, 1, 0, 0, 1, true );
-	}
-}
-
-void DrawAllConnections
-	(
-	void
-	)
-{
-	pathway_t   *path;
-	pathway_t   *path2;
-	PathNode    *node;
-	PathNode    *to;
-	Vector      down;
-	Vector      up;
-	Vector      dir;
-	Vector      p1;
-	Vector      p2;
-	Vector      p3;
-	Vector      p4;
-	Vector      playerorigin;
-	qboolean    showroutes;
-	qboolean    shownums;
-	bool reverse;
-
-	showroutes = ( ai_showroutes->integer != 0 );
-	shownums = ( ai_shownodenums->integer != 0 );
-
-	// Figure out where the camera is
-
-	if( !g_entities[ 0 ].client )
-		return;
-
-	playerorigin.x = g_entities[ 0 ].client->ps.origin[ 0 ];
-	playerorigin.y = g_entities[ 0 ].client->ps.origin[ 1 ];
-	playerorigin.z = g_entities[ 0 ].client->ps.origin[ 2 ];
-
-	playerorigin[ 2 ] += g_entities[ 0 ].client->ps.viewheight;
-
-	for( int i = 0; i < PathSearch::nodecount; i++ )
-	{
-		node = PathSearch::pathnodes[ i ];
-
-		if( Vector( node->origin - playerorigin ).length() > ai_showroutes_distance->integer )
-		{
-			continue;
-		}
-
-		if( shownums )
-		{
-			G_DrawDebugNumber( node->origin + Vector( 0, 0, 14 ), node->nodenum, 1.5, 1, 1, 0 );
-		}
-
-		for( int j = 0; j < node->numChildren; j++ )
-		{
-			path = &node->Child[ j ];
-
-			if( path->fallheight > ai_fallheight->integer )
-				continue;
-
-			reverse = false;
-			to = PathSearch::pathnodes[ path->node ];
-
-			for( int k = to->numChildren - 1; k >= 0; k-- )
-			{
-				path2 = &to->Child[ k ];
-
-				if( path2->fallheight < ai_fallheight->integer && PathSearch::pathnodes[ path2->node ] == node )
-				{
-					reverse = true;
-					break;
-				}
-			}
-
-			p1 = path->pos1 + Vector( 0, 0, 36 );
-			p2 = path->pos2 + Vector( 0, 0, 36 );
-
-			if( node->nodenum < to->nodenum || !reverse )
-			{
-				// draw connected lines in green
-				G_DebugLine( p1, p2, 0, 1, 0, 1 );
-
-				if( !reverse )
-				{
-					dir = Vector( path->pos2 ) - Vector( path->pos1 );
-					dir.z = 0;
-					VectorNormalize( dir );
-
-					p3 = dir * 8.0f + dir * 8.0f;
-					p4 = dir * 8.0f;
-					p4.z += 8.0f;
-
-					G_DebugLine( p1 + p3 + up , p1 + p3 + up - p4, 1, 0, 0, 1 );
-
-					p4.z -= 16.0f;
-
-					G_DebugLine( p1 + p3 + down, p1 + p3 + down - p4, 1, 0, 0, 1 );
-				}
-			}
-		}
-
-		if( !node->numChildren )
-		{
-			// Put a little X where the node is to show that it had no connections
-			p1 = node->origin;
-			p1.z += 2;
-
-			if( node->nodeflags & PATH_DONT_LINK )
-			{
-				G_DebugCircle( p1, 12, 0, 0, 1, 1, true );
-			}
-			else
-			{
-				p2 = Vector( 12, 12, 0 );
-				G_DebugLine( p1 - p2, p1 + p2, 1, 0, 0, 1 );
-
-				p2.x = -12;
-				G_DebugLine( p1 - p2, p1 + p2, 1, 0, 0, 1 );
-			}
-		}
-	}
+    pathway_t *path;
+    pathway_t *path2;
+    PathNode  *node;
+    PathNode  *to;
+    Vector     down;
+    Vector     up;
+    Vector     dir;
+    Vector     p1;
+    Vector     p2;
+    Vector     p3;
+    Vector     p4;
+    Vector     playerorigin;
+    qboolean   showroutes;
+    qboolean   shownums;
+    bool       reverse;
+
+    showroutes = (ai_showroutes->integer != 0);
+    shownums   = (ai_shownodenums->integer != 0);
+
+    // Figure out where the camera is
+
+    if (!g_entities[0].client) {
+        return;
+    }
+
+    playerorigin.x = g_entities[0].client->ps.origin[0];
+    playerorigin.y = g_entities[0].client->ps.origin[1];
+    playerorigin.z = g_entities[0].client->ps.origin[2];
+
+    playerorigin[2] += g_entities[0].client->ps.viewheight;
+
+    for (int i = 0; i < PathSearch::nodecount; i++) {
+        node = PathSearch::pathnodes[i];
+        if (!node) {
+            continue;
+        }
+
+        if (Vector(node->origin - playerorigin).length() > ai_showroutes_distance->integer) {
+            continue;
+        }
+
+        if (shownums) {
+            G_DrawDebugNumber(node->origin + Vector(0, 0, 14), node->nodenum, 1.5, 1, 1, 0);
+        }
+
+        for (int j = 0; j < node->numChildren; j++) {
+            path = &node->Child[j];
+
+            if (path->fallheight > ai_fallheight->integer) {
+                continue;
+            }
+
+            reverse = false;
+
+            to = PathSearch::pathnodes[path->node];
+            if (!to) {
+                continue;
+            }
+
+            for (int k = to->numChildren - 1; k >= 0; k--) {
+                path2 = &to->Child[k];
+
+                if (path2->fallheight < ai_fallheight->integer && PathSearch::pathnodes[path2->node] == node) {
+                    reverse = true;
+                    break;
+                }
+            }
+
+            p1 = path->pos1 + Vector(0, 0, 36);
+            p2 = path->pos2 + Vector(0, 0, 36);
+
+            if (node->nodenum < to->nodenum || !reverse) {
+                // draw connected lines in green
+                G_DebugLine(p1, p2, 0, 1, 0, 1);
+
+                if (!reverse) {
+                    dir   = Vector(path->pos2) - Vector(path->pos1);
+                    dir.z = 0;
+                    VectorNormalize(dir);
+
+                    p3 = dir * 8.0f + dir * 8.0f;
+                    p4 = dir * 8.0f;
+                    p4.z += 8.0f;
+
+                    G_DebugLine(p1 + p3 + up, p1 + p3 + up - p4, 1, 0, 0, 1);
+
+                    p4.z -= 16.0f;
+
+                    G_DebugLine(p1 + p3 + down, p1 + p3 + down - p4, 1, 0, 0, 1);
+                }
+            }
+        }
+
+        if (!node->numChildren) {
+            // Put a little X where the node is to show that it had no connections
+            p1 = node->origin;
+            p1.z += 2;
+
+            if (node->nodeflags & PATH_DONT_LINK) {
+                G_DebugCircle(p1, 12, 0, 0, 1, 1, true);
+            } else {
+                p2 = Vector(12, 12, 0);
+                G_DebugLine(p1 - p2, p1 + p2, 1, 0, 0, 1);
+
+                p2.x = -12;
+                G_DebugLine(p1 - p2, p1 + p2, 1, 0, 0, 1);
+            }
+        }
+    }
 }
 
 MapCell::MapCell()
 {
-	numnodes = 0;
-	nodes = NULL;
+    numnodes = 0;
+    nodes    = NULL;
 }
 
-MapCell::~MapCell()
+int MapCell::NumNodes(void)
 {
-	numnodes = 0;
-	nodes = NULL;
+    return numnodes;
 }
-qboolean MapCell::AddNode
-	(
-	PathNode *node
-	)
-{
-	nodes[ numnodes ] = ( short )node->nodenum;
-	numnodes++;
-
-	return true;
-}
-
-int MapCell::NumNodes
-	(
-	void
-	)
-{
-	return numnodes;
-}
-
 
 /*                         All
                      work and no play
@@ -1122,2724 +1803,2084 @@ int MapCell::NumNodes
                           Jim  a
 */
 
-CLASS_DECLARATION( Class, PathSearch, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(Class, PathSearch, NULL) {
+    {NULL, NULL}
 };
 
-
 PathSearch::PathSearch()
 {
-	memset( pathnodes, 0, sizeof( pathnodes ) );
-	open = 0;
-	findFrame = 0;
+    memset(pathnodes, 0, sizeof(pathnodes));
+    open      = 0;
+    findFrame = 0;
 }
 
 PathSearch::~PathSearch()
 {
-	ResetNodes();
+    ResetNodes();
 }
 
-void PathSearch::AddToGrid
-	(
-	PathNode *node,
-	int x,
-	int y
-	)
+void PathSearch::LoadAddToGrid(int x, int y)
 {
-	MapCell *cell;
+    MapCell *cell;
 
-	if( x > PATHMAP_GRIDSIZE || y > PATHMAP_GRIDSIZE )
-		cell = NULL;
-	else
-		cell = &PathMap[ x ][ y ];
-
-	if( !cell )
-		return;
-
-	if( cell->NumNodes() >= PATHMAP_NODES )
-		Com_Printf( "^~^~^ PathSearch::AddToGrid: Node overflow at ( %d, %d )\n", x, y );
-	else
-		cell->AddNode( node );
+    cell = GetNodesInCell(x, y);
+    if (cell) {
+        cell->numnodes++;
+    }
 }
 
-int PathSearch::NodeCoordinate
-	(
-	float coord
-	)
+int PathSearch::NodeCoordinate(float coord)
 {
-	float c;
+    float c;
 
-	//return ( ( int )coord + MAX_MAP_BOUNDS - ( PATHMAP_CELLSIZE / 2 ) ) / PATHMAP_CELLSIZE;
+    //return ( ( int )coord + MAX_MAP_BOUNDS - ( PATHMAP_CELLSIZE / 2 ) ) / PATHMAP_CELLSIZE;
 
-	c = coord + MAX_MAP_BOUNDS - ( PATHMAP_CELLSIZE / 2 );
+    c = coord + MAX_MAP_BOUNDS - (PATHMAP_CELLSIZE / 2);
 
-	if( c < 0 )
-		c = coord + MAX_MAP_BOUNDS + ( PATHMAP_CELLSIZE / 2 ) - 1;
+    if (c < 0) {
+        c = coord + MAX_MAP_BOUNDS + (PATHMAP_CELLSIZE / 2) - 1;
+    }
 
-	return ( int )c >> 8;
+    return (int)c >> 8;
 }
 
-int PathSearch::GridCoordinate
-	(
-	float coord
-	)
+int PathSearch::GridCoordinate(float coord)
 {
-	float c;
+    float c;
 
-	//return ( ( int )coord + MAX_MAP_BOUNDS ) / PATHMAP_CELLSIZE;
+    //return ( ( int )coord + MAX_MAP_BOUNDS ) / PATHMAP_CELLSIZE;
 
-	c = coord + MAX_MAP_BOUNDS;
+    c = coord + MAX_MAP_BOUNDS;
 
-	if( c < 0 )
-		c = coord + MAX_MAP_BOUNDS + PATHMAP_CELLSIZE - 1;
+    if (c < 0) {
+        c = coord + MAX_MAP_BOUNDS + PATHMAP_CELLSIZE - 1;
+    }
 
-	return ( int )c >> 8;
+    return (int)c >> 8;
 }
 
-void PathSearch::AddNode
-	(
-	PathNode *node
-	)
+MapCell *PathSearch::GetNodesInCell(int x, int y)
 {
-	int x;
-	int y;
+    if ((x < 0) || (x >= PATHMAP_GRIDSIZE) || (y < 0) || (y >= PATHMAP_GRIDSIZE)) {
+        return NULL;
+    }
 
-	assert( node );
-
-	x = NodeCoordinate( node->origin[ 0 ] );
-	y = NodeCoordinate( node->origin[ 1 ] );
-
-	AddToGrid( node, x, y );
-	AddToGrid( node, x + 1, y );
-	AddToGrid( node, x, y + 1 );
-	AddToGrid( node, x + 1, y + 1 );
+    return &PathMap[x][y];
 }
 
-void PathSearch::LoadAddToGrid
-	(
-	int x,
-	int y
-	)
+MapCell *PathSearch::GetNodesInCell(const vec3_t pos)
 {
-	MapCell *cell;
+    int x;
+    int y;
 
-	if( x > PATHMAP_GRIDSIZE || y > PATHMAP_GRIDSIZE )
-		cell = NULL;
-	else
-		cell = &PathMap[ x ][ y ];
+    x = GridCoordinate(pos[0]);
+    y = GridCoordinate(pos[1]);
 
-	if( cell )
-		cell->numnodes++;
+    return GetNodesInCell(x, y);
 }
 
-void PathSearch::LoadAddToGrid2
-	(
-	PathNode *node,
-	int x,
-	int y
-	)
+int PathSearch::DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int iMaxNodes)
 {
-	MapCell *cell;
+    PathNode *node;
+    int       i;
+    MapCell  *cell;
+    int       nodes[128];
+    vec3_t    deltas[128];
+    vec3_t    start;
+    vec3_t    end;
 
-	if( x > PATHMAP_GRIDSIZE || y > PATHMAP_GRIDSIZE )
-		cell = NULL;
-	else
-		cell = &PathMap[ x ][ y ];
+    cell = GetNodesInCell(pos);
 
-	if( cell )
-		cell->AddNode( node );
+    if (!cell) {
+        return 0;
+    }
+
+    int node_count = NearestNodeSetup(pos, cell, nodes, deltas);
+    int n          = 0;
+
+    for (i = 0; i < node_count && n < iMaxNodes; i++) {
+        node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
+
+        VectorCopy(pos, start);
+        VectorCopy(pos, end);
+
+        VectorAdd(end, deltas[i], end);
+
+        Vector vStart = start;
+        Vector vMins  = Vector(-15, -15, 0);
+        Vector vMaxs  = Vector(15, 15, 62);
+        Vector vEnd   = end;
+
+        if (G_SightTrace(
+                vStart,
+                vMins,
+                vMaxs,
+                vEnd,
+                (gentity_t *)NULL,
+                (gentity_t *)NULL,
+                MASK_PATHSOLID,
+                qtrue,
+                "PathSearch::DebugNearestNodeList"
+            )) {
+            nodelist[n] = node;
+            n++;
+        }
+    }
+
+    if (!n && node_count) {
+        nodelist[0] = pathnodes[cell->nodes[nodes[0]]];
+        return 1;
+    } else {
+        return n;
+    }
+
+    return 0;
 }
 
-MapCell *PathSearch::GetNodesInCell
-	(
-	int x,
-	int y
-	)
+int PathSearch::DebugNearestNodeList2(const vec3_t pos, PathNode **nodelist, int iMaxNodes)
 {
-	if( ( x < 0 ) || ( x >= PATHMAP_GRIDSIZE ) || ( y < 0 ) || ( y >= PATHMAP_GRIDSIZE ) )
-	{
-		return NULL;
-	}
+    vec3_t       delta;
+    PathNode    *node;
+    float        dist;
+    int          n = 0;
+    int          i;
+    int          j;
+    static float node_dist[MAX_PATHNODES];
+    int          node_count;
 
-	return &PathMap[ x ][ y ];
+    node_count = nodecount;
+
+    for (i = 0; i < node_count; i++) {
+        node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
+
+        if (pos[2] > node->origin[2] + 94.0f) {
+            continue;
+        }
+
+        if (node->origin[2] > pos[2] + 94.0f) {
+            continue;
+        }
+
+        delta[0] = node->origin[0] - pos[0];
+        delta[1] = node->origin[1] - pos[1];
+        delta[2] = node->origin[2] - pos[2];
+
+        dist = VectorLengthSquared(delta);
+
+        for (j = n; j > 0; j--) {
+            if (dist >= node_dist[j - 1]) {
+                break;
+            }
+
+            node_dist[j] = node_dist[j - 1];
+            nodelist[j]  = nodelist[j - 1];
+        }
+
+        n++;
+        nodelist[j]  = node;
+        node_dist[j] = dist;
+    }
+
+    return n;
 }
 
-MapCell *PathSearch::GetNodesInCell
-	(
-	float *pos
-	)
+PathNode *PathSearch::DebugNearestStartNode(const vec3_t pos, Entity *ent)
 {
-	int x;
-	int y;
+    PathNode *node = NULL;
+    int       i;
+    MapCell  *cell;
+    int       nodes[128];
+    vec3_t    deltas[128];
+    vec3_t    start;
+    vec3_t    end;
+    int       node_count;
 
-	x = GridCoordinate( pos[ 0 ] );
-	y = GridCoordinate( pos[ 1 ] );
+    cell = GetNodesInCell(pos);
 
-	return GetNodesInCell( x, y );
+    if (!cell) {
+        return NULL;
+    }
+
+    node_count = NearestNodeSetup(pos, cell, nodes, deltas);
+
+    VectorCopy(pos, start);
+    start[2] += 32.0f;
+
+    for (i = 0; i < node_count; i++) {
+        node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
+
+        VectorCopy(start, end);
+        VectorAdd(end, deltas[nodes[i]], end);
+
+        if (G_SightTrace(
+                start,
+                Vector(-15, -15, 0),
+                Vector(15, 15, 62),
+                end,
+                ent,
+                NULL,
+                MASK_TARGETPATH,
+                qtrue,
+                "PathSearch::DebugNearestStartNode"
+            )) {
+            return node;
+        }
+    }
+
+    if (node_count > 0) {
+        return pathnodes[cell->nodes[nodes[0]]];
+    }
+
+    return NULL;
 }
 
-
-PathNode *PathSearch::DebugNearestStartNode
-	(
-	float *pos,
-	Entity *ent
-	)
+PathNode *PathSearch::NearestStartNode(const vec3_t pos, SimpleActor *ent)
 {
-	PathNode *node = NULL;
-	int i;
-	MapCell *cell;
-	int nodes[ 128 ];
-	vec3_t deltas[ 128 ];
-	vec3_t start;
-	vec3_t end;
+    PathNode *node = NULL;
+    int       i;
+    MapCell  *cell;
+    int       nodes[128];
+    vec3_t    deltas[128];
+    vec3_t    start;
+    vec3_t    end;
+    int       node_count;
 
-	cell = GetNodesInCell( pos );
+    cell = GetNodesInCell(pos);
 
-	if( !cell )
-		return NULL;
+    if (!cell) {
+        return NULL;
+    }
 
-	int node_count = NearestNodeSetup( pos, cell, nodes, deltas );
+    node_count = NearestNodeSetup(pos, cell, nodes, deltas);
 
-	if( !node_count )
-		return NULL;
+    VectorCopy(pos, start);
+    start[2] += 32.0f;
 
-	VectorCopy( pos, start );
-	start[ 2 ] += 32.0f;
+    for (i = 0; i < node_count; i++) {
+        node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
-	for( i = 0; i < node_count; i++ )
-	{
-		node = pathnodes[ cell->nodes[ nodes[ i ] ] ];
+        VectorAdd(start, deltas[nodes[i]], end);
 
-		VectorCopy( start, end );
-		VectorAdd( end, deltas[ nodes[ i ] ], end );
+        if (G_SightTrace(
+                start,
+                Vector(-15, -15, 0),
+                Vector(15, 15, 62),
+                end,
+                ent,
+                NULL,
+                MASK_PATHSOLID,
+                qtrue,
+                "PathSearch::NearestStartNode 1"
+            )) {
+            ent->m_NearestNode = node;
+            VectorCopy(end, ent->m_vNearestNodePos);
+            return node;
+        }
+    }
 
-		Vector vStart = start;
-		Vector vMins = Vector( -15, -15, 0 );
-		Vector vMaxs = Vector( 15, 15, 62 );
-		Vector vEnd = end;
+    if (ent->m_NearestNode) {
+        if (G_SightTrace(
+                start,
+                Vector(-15, -15, 0),
+                Vector(15, 15, 62),
+                ent->m_vNearestNodePos,
+                ent,
+                NULL,
+                MASK_TARGETPATH,
+                qtrue,
+                "PathSearch::NearestStartNode 2"
+            )) {
+            return ent->m_NearestNode;
+        }
+    }
 
-		if( G_SightTrace(
-			vStart,
-			vMins,
-			vMaxs,
-			vEnd,
-			ent,
-			NULL,
-			MASK_TARGETPATH,
-			qtrue,
-			"PathSearch::DebugNearestStartNode" ) )
-		{
-			return node;
-		}
-	}
+    if (node_count > 0) {
+        return pathnodes[cell->nodes[nodes[0]]];
+    }
 
-	return pathnodes[ cell->nodes[ nodes[ 0 ] ] ];
+    return ent->m_NearestNode;
 }
 
-PathNode *PathSearch::NearestStartNode
-	(
-	float *pos,
-	SimpleActor *ent
-	)
+PathNode *PathSearch::NearestEndNode(const vec3_t pos)
 {
-	PathNode *node = NULL;
-	int i;
-	MapCell *cell;
-	int nodes[128];
-	vec3_t deltas[128];
-	vec3_t start;
-	vec3_t end;
+    PathNode *node = NULL;
+    int       i;
+    MapCell  *cell;
+    int       nodes[128];
+    vec3_t    deltas[128];
+    vec3_t    start;
+    vec3_t    end;
+    int       node_count;
 
-	cell = GetNodesInCell(pos);
+    cell = GetNodesInCell(pos);
 
-	if (!cell)
-		return NULL;
+    if (!cell) {
+        return NULL;
+    }
 
-	int node_count = NearestNodeSetup(pos, cell, nodes, deltas);
-	int n = 0;
-	int j = 0;
+    node_count = NearestNodeSetup(pos, cell, nodes, deltas);
 
-	VectorCopy(pos, start);
-	start[2] += 32.0f;
+    VectorCopy(pos, start);
+    start[2] += 32.0f;
 
-	Vector vMins = Vector(-15, -15, 0);
-	Vector vMaxs = Vector(15, 15, 62);
+    for (i = 0; i < node_count; i++) {
+        node = pathnodes[cell->nodes[nodes[i]]];
+        if (!node) {
+            continue;
+        }
 
-	for (i = 0; i < node_count; i++)
-	{
-		node = pathnodes[cell->nodes[nodes[i]]];
+        VectorAdd(start, deltas[nodes[i]], end);
 
-		VectorAdd(start, deltas[nodes[i]], end);
+        if (G_SightTrace(
+                start,
+                Vector(-15, -15, 0),
+                Vector(15, 15, 62),
+                end,
+                (Entity *)nullptr,
+                (Entity *)nullptr,
+                MASK_TARGETPATH,
+                qtrue,
+                "PathSearch::NearestEndNode"
+            )) {
+            return node;
+        }
+    }
 
-		Vector vStart = start;
-		Vector vEnd = end;
-
-		if (G_SightTrace(
-			vStart,
-			vMins,
-			vMaxs,
-			vEnd,
-			(gentity_t *)NULL,
-			(gentity_t *)NULL,
-			1107437825, //FIXME: macro
-			qtrue,
-			"PathSearch::NearestStartNode 1"))
-		{
-			ent->m_NearestNode = node;
-			ent->m_vNearestNodePos = end;
-			return node;
-		}
-	}
-
-	if ((ent->m_NearestNode &&
-		(G_SightTrace(
-			Vector(start),
-			vMins,
-			vMaxs,
-			ent->m_vNearestNodePos,
-			(gentity_t*)ent,
-			(gentity_t*)NULL,
-			1073883393, //FIXME: macro
-			qtrue,
-			"PathSearch::NearestStartNode 2")))
-		|| node_count <= 0
-		)
-	{
-		node = ent->m_NearestNode;
-	}
-	else
-	{
-		node = pathnodes[cell->nodes[nodes[0]]];
-	}
-
-	return node;
+    return NULL;
 }
 
-PathNode *PathSearch::NearestEndNode
-	(
-	float *pos
-	)
+void PathSearch::ShowNodes(void)
 {
-	PathNode *node = NULL;
-	int i;
-	MapCell *cell;
-	int nodes[ 128 ];
-	vec3_t deltas[ 128 ];
-	vec3_t start;
-	vec3_t end;
+    if (g_entities->client) {
+        if (ai_shownode->integer) {
+            DrawNode(ai_shownode->integer);
+        }
+        if (ai_showroutes->integer || ai_shownodenums->integer) {
+            DrawAllConnections();
+        }
+    }
 
-	cell = GetNodesInCell( pos );
+    if (ai_showpath->integer) {
+        if (!test_path) {
+            test_path = new ActorPath;
+        }
 
-	if( !cell )
-		return NULL;
+        if (ai_showpath->integer == 1) {
+            ai_startpath = g_entities[0].entity->origin;
+        }
+        if (ai_showpath->integer == 2) {
+            ai_endpath = g_entities[0].entity->origin;
+        }
+        if (ai_showpath->integer <= 2) {
+            test_path->SetFallHeight(ai_fallheight->integer);
+            test_path->FindPath(ai_startpath, ai_endpath, NULL, 0, NULL, 0);
+        }
+        if (ai_showpath->integer == 3) {
+            if (test_path->CurrentNode()) {
+                test_path->UpdatePos(g_entities[0].entity->origin);
 
-	int node_count = NearestNodeSetup( pos, cell, nodes, deltas );
-	int n = 0;
-	int j = 0;
+                Vector vStart = g_entities[0].entity->origin + Vector(0, 0, 32);
+                Vector vEnd   = g_entities[0].entity->origin + test_path->CurrentDelta() + Vector(0, 0, 32);
 
-	if( !node_count )
-		return NULL;
+                G_DebugLine(vStart, vEnd, 1, 1, 0, 1);
+            }
+        }
 
-	VectorCopy( pos, start );
-	start[ 2 ] += 32.0f;
+        G_DebugLine(ai_startpath, ai_endpath, 0, 0, 1, 1);
 
-	for( i = 0; i < node_count; i++ )
-	{
-		node = pathnodes[ cell->nodes[ nodes[ i ] ] ];
+        if (test_path->CurrentNode()) {
+            PathInfo *pos = test_path->CurrentNode();
 
-		VectorAdd(start, deltas[nodes[i]], end);
+            while (pos != test_path->LastNode()) {
+                Vector vStart = pos->point + Vector(0, 0, 32);
 
-		Vector vStart = start;
-		Vector vMins = Vector( -15, -15, 0 );
-		Vector vMaxs = Vector( 15, 15, 62 );
-		Vector vEnd = end;
+                pos--;
 
-		if( G_SightTrace(
-			vStart,
-			vMins,
-			vMaxs,
-			vEnd,
-			( gentity_t * )NULL,
-			( gentity_t * )NULL,
-			MASK_TARGETPATH,
-			qtrue,
-			"PathSearch::NearestEndNode" ) )
-		{
-			return node;
-		}
-	}
+                Vector vEnd = pos->point + Vector(0, 0, 32);
 
-	return pathnodes[ cell->nodes[ nodes[ 0 ] ] ];
+                G_DebugLine(vStart, vEnd, 1, 0, 0, 1);
+            }
+        }
+    }
+
+    navMaster.Frame();
 }
 
-int PathSearch::DebugNearestNodeList
-	(
-	float *pos,
-	PathNode **nodelist,
-	int iMaxNodes
-	)
+qboolean PathSearch::ArchiveSaveNodes(void)
 {
-	PathNode *node;
-	int i;
-	MapCell *cell;
-	int nodes[ 128 ];
-	vec3_t deltas[ 128 ];
-	vec3_t start;
-	vec3_t end;
+    Archiver arc;
+    str      maptime;
+    int      tempInt;
 
-	cell = GetNodesInCell( pos );
+    if (!arc.Create(level.m_pathfile)) {
+        return qfalse;
+    }
 
-	if( !cell )
-		return 0;
+    tempInt = PATHFILE_VERSION;
+    arc.ArchiveInteger(&tempInt);
 
-	int node_count = NearestNodeSetup( pos, cell, nodes, deltas );
-	int n = 0;
-	int j = 0;
+    maptime = gi.MapTime();
+    arc.ArchiveString(&maptime);
 
-	for( i = 0; i < node_count && j < iMaxNodes; i++ )
-	{
-		node = pathnodes[ cell->nodes[ nodes[ i ] ] ];
+    arc.ArchiveInteger(&m_NodeCheckFailed);
+    ArchiveStaticSave(arc);
+    arc.Close();
 
-		VectorCopy( pos, start );
-		VectorCopy( pos, end );
-
-		VectorAdd( end, deltas[ i ], end );
-
-		Vector vStart = start;
-		Vector vMins = Vector( -15, -15, 0 );
-		Vector vMaxs = Vector( 15, 15, 62 );
-		Vector vEnd = end;
-
-		if( G_SightTrace(
-			vStart,
-			vMins,
-			vMaxs,
-			vEnd,
-			( gentity_t *)NULL,
-			( gentity_t * )NULL,
-			MASK_PATHSOLID,
-			qtrue,
-			"PathSearch::DebugNearestNodeList" ) )
-		{
-			nodelist[ n ] = node;
-			n++;
-		}
-	}
-
-	if( !n && node_count )
-	{
-		nodelist[ 0 ] = pathnodes[ cell->nodes[ nodes[ 0 ] ] ];
-		return 1;
-	}
-	else
-	{
-		return n;
-	}
-
-	return 0;
+    return true;
 }
 
-int PathSearch::DebugNearestNodeList2
-	(
-	float *pos,
-	PathNode **nodelist,
-	int iMaxNodes
-	)
+void PathSearch::ArchiveLoadNodes(void)
 {
-	vec3_t delta;
-	PathNode *node;
-	float dist;
-	int n = 0;
-	int i;
-	int j;
-	static float node_dist[ MAX_PATHNODES ];
-	int node_count;
+    Archiver arc;
 
-	node_count = nodecount;
+    m_LoadIndex = 0;
+    if (arc.Read(level.m_pathfile, false)) {
+        int file_version;
+        str maptime;
 
-	for( i = 0; i < node_count; i++ )
-	{
-		node = pathnodes[ i ];
+        // get file values
+        arc.ArchiveInteger(&file_version);
+        if (file_version != PATHFILE_VERSION) {
+            Com_Printf("Expecting version %d path file.  Path file is version %d.\n", PATHFILE_VERSION, file_version);
+            arc.Close();
+            return;
+        }
 
-		if( pos[ 2 ] > node->origin[ 2 ] + 94.0f )
-			continue;
+        arc.ArchiveString(&maptime);
+        if (gi.MapTime() == maptime && gi.FS_FileNewer(level.m_mapfile.c_str(), level.m_pathfile.c_str()) <= 0) {
+            arc.ArchiveInteger(&m_NodeCheckFailed);
 
-		if( node->origin[ 2 ] > pos[ 2 ] + 94.0f )
-			continue;
+            if (!g_nodecheck->integer || !m_NodeCheckFailed) {
+                ArchiveStaticLoad(arc);
+                m_bNodesloaded = arc.NoErrors();
+            } else {
+                gi.Printf("Rebuilding pathnodes to view node errors.\n");
+            }
+        } else {
+            gi.Printf("Pathnodes have changed, rebuilding.\n");
+        }
+    }
 
-		delta[ 0 ] = node->origin[ 0 ] - pos[ 0 ];
-		delta[ 1 ] = node->origin[ 1 ] - pos[ 1 ];
-		delta[ 2 ] = node->origin[ 2 ] - pos[ 2 ];
-
-		dist = VectorLengthSquared( delta );
-
-		for( j = n; j > 0; j-- )
-		{
-			if( dist >= node_dist[ j - 1 ] )
-				break;
-
-			node_dist[ j ] = node_dist[ j - 1 ];
-			nodelist[ j ] = nodelist[ j - 1 ];
-		}
-
-		n++;
-		nodelist[ j ] = node;
-		node_dist[ j ] = dist;
-	}
-
-	return n;
+    arc.Close();
 }
 
-void PathSearch::ArchiveStaticLoad
-	(
-	Archiver& arc
-	)
+void PathSearch::Init(void)
 {
-	int i;
-	PathNode *node;
-	int total_nodes;
-	int total_children;
-	int x;
-	int y;
-	int size;
+    ai_showroutes          = gi.Cvar_Get("ai_showroutes", "0", 0);
+    ai_showroutes_distance = gi.Cvar_Get("ai_showroutes_distance", "1000", 0);
+    ai_shownodenums        = gi.Cvar_Get("ai_shownodenums", "0", 0);
+    ai_shownode            = gi.Cvar_Get("ai_shownode", "0", 0);
+    ai_showallnode         = gi.Cvar_Get("ai_showallnode", "0", 0);
+    ai_showpath            = gi.Cvar_Get("ai_showpath", "0", 0);
+    ai_fallheight          = gi.Cvar_Get("ai_fallheight", "96", 0);
+    ai_debugpath           = gi.Cvar_Get("ai_debugpath", "0", 0);
+    ai_pathchecktime       = gi.Cvar_Get("ai_pathchecktime", "1.5", CVAR_CHEAT);
+    ai_pathcheckdist       = gi.Cvar_Get("ai_pathcheckdist", "4096", CVAR_CHEAT);
 
-	loadingarchive = true;
+    //
+    // Added in OPM
+    //
+    ai_editmode = gi.Cvar_Get("ai_editmode", "0", CVAR_LATCH);
 
-	arc.ArchiveInteger( &nodecount );
-	arc.ArchiveInteger( &total_nodes );
-	arc.ArchiveInteger( &total_children );
-
-	size = total_nodes + total_children * ( sizeof( pathway_t ) * 2 ) + nodecount * ( sizeof( PathNode ) / 2 );
-	size *= sizeof(void*) / 2;
-
-	gi.DPrintf( "%d memory allocated for navigation.\n", size );
-
-	if( size )
-		startBulkNavMemory = ( byte * )gi.Malloc( size );
-	else
-		startBulkNavMemory = NULL;
-
-	bulkNavMemory = startBulkNavMemory + size;
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = new PathNode;
-
-		arc.ArchiveObjectPosition( node );
-		node->ArchiveStatic( arc );
-		node->nodenum = i;
-
-		pathnodes[ i ] = node;
-
-		if( !( node->nodeflags & PATH_DONT_LINK ) )
-		{
-			x = NodeCoordinate( node->origin[ 0 ] );
-			y = NodeCoordinate( node->origin[ 1 ] );
-
-			LoadAddToGrid( x, y );
-			LoadAddToGrid( x + 1, y );
-			LoadAddToGrid( x, y + 1 );
-			LoadAddToGrid( x + 1, y + 1 );
-		}
-	}
-
-	for( x = 0; x < PATHMAP_GRIDSIZE; x++ )
-	{
-		for( y = 0; y < PATHMAP_GRIDSIZE; y++ )
-		{
-			bulkNavMemory -= PathMap[ x ][ y ].numnodes * sizeof( short );
-
-			PathMap[ x ][ y ].nodes = PathMap[ x ][ y ].numnodes ? ( short * )bulkNavMemory : NULL;
-			PathMap[ x ][ y ].numnodes = 0;
-		}
-	}
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-
-		if( !( node->nodeflags & PATH_DONT_LINK ) )
-		{
-			x = NodeCoordinate( node->origin[ 0 ] );
-			y = NodeCoordinate( node->origin[ 1 ] );
-
-			LoadAddToGrid2( node, x, y );
-			LoadAddToGrid2( node, x + 1, y );
-			LoadAddToGrid2( node, x, y + 1 );
-			LoadAddToGrid2( node, x + 1, y + 1 );
-		}
-	}
-
-	loadingarchive = false;
+    navMaster.Init();
 }
 
-void PathSearch::ArchiveStaticSave
-	(
-	Archiver& arc
-	)
+void *PathSearch::AllocPathNode(void)
 {
-	int i;
-	PathNode *node;
-	int total_nodes = 0;
-	int total_children = 0;
-	int x = 0;
-	int y = 0;
+    if (!bulkNavMemory) {
+        return gi.Malloc(sizeof(PathNode));
+    } else {
+        bulkNavMemory -= sizeof(PathNode);
+        if (ai_editmode->integer) {
+            return gi.Malloc(sizeof(PathNode));
+        }
+    }
 
-	for( x = 0; x < PATHMAP_GRIDSIZE; x++ )
-	{
-		for( y = 0; y < PATHMAP_GRIDSIZE; y++ )
-		{
-			total_nodes += PathMap[ x ][ y ].NumNodes();
-		}
-	}
+    return bulkNavMemory;
+}
 
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-		total_children += node->virtualNumChildren;
-	}
+void PathSearch::FreePathNode(void *ptr)
+{
+    if (!bulkNavMemory || ai_editmode->integer) {
+        gi.Free(ptr);
+    }
+}
 
-	arc.ArchiveInteger( &nodecount );
-	arc.ArchiveInteger( &total_nodes );
-	arc.ArchiveInteger( &total_children );
+void PathSearch::PlayerCover(Player *pPlayer)
+{
+    int       i;
+    PathNode *node;
+    Vector    delta;
+    Entity   *pOwner;
 
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-		arc.ArchiveObjectPosition( node );
-		node->ArchiveStatic( arc );
-	}
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+
+        if (!node || !(node->nodeflags & AI_MOVE_MASK)) {
+            continue;
+        }
+
+        pOwner = node->GetClaimHolder();
+
+        delta = node->origin - pPlayer->origin;
+
+        // Check if we need to cover
+        if (VectorLengthSquared(delta) > Square(48)) {
+            if (pOwner == pPlayer) {
+                node->Relinquish();
+            }
+            continue;
+        }
+
+        if (pOwner != pPlayer) {
+            if (pOwner) {
+                pOwner->PathnodeClaimRevoked(node);
+            }
+            // Player claim the node
+            node->Claim(pPlayer);
+        }
+    }
+}
+
+class nodeinfo
+{
+public:
+    PathNode *pNode;
+    float     fDistSquared;
+};
+
+int node_compare(const void *pe1, const void *pe2)
+{
+    nodeinfo *Pe1 = (nodeinfo *)pe1;
+    nodeinfo *Pe2 = (nodeinfo *)pe2;
+    int       iConcealment;
+
+    iConcealment = (Pe1->pNode->nodeflags & AI_CONCEALMENT_MASK) ? 1 : 0;
+    if (Pe2->pNode->nodeflags & AI_CONCEALMENT_MASK) {
+        iConcealment--;
+    }
+
+    return (
+        *(unsigned int*)&Pe1->fDistSquared + (iConcealment << 23)
+        + (((Pe1->pNode->nodeflags & AI_CONCEALMENT) - (Pe2->pNode->nodeflags & AI_CONCEALMENT)) << 21)
+        - *(unsigned int*)&Pe2->fDistSquared
+    );
+}
+
+int PathSearch::FindPotentialCover(
+    Entity *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind
+)
+{
+    nodeinfo  nodes[MAX_PATHNODES];
+    int       nNodes = 0;
+    int       i;
+    Vector    delta;
+    PathNode *node;
+
+    Actor *pActor = static_cast<Actor *>(pEnt);
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
+
+        if (!(node->nodeflags & AI_COVER_MASK)) {
+            continue;
+        }
+
+        if (node->IsClaimedByOther(static_cast<Entity *>(pEnt))) {
+            continue;
+        }
+
+        delta = node->origin - pActor->m_vHome;
+        if (delta.lengthSquared() > pActor->m_fLeashSquared) {
+            continue;
+        }
+
+        delta = node->origin - pEnemy->origin;
+        if (delta.lengthSquared() < pActor->m_fMinDistanceSquared
+            || delta.lengthSquared() > pActor->m_fMaxDistanceSquared) {
+            continue;
+        }
+
+        delta                      = node->origin - pEnt->origin;
+        nodes[nNodes].pNode        = node;
+        nodes[nNodes].fDistSquared = delta.lengthSquared();
+        nNodes++;
+    }
+
+    if (nNodes) {
+        qsort(nodes, nNodes, sizeof(nodeinfo), node_compare);
+
+        if (nNodes > iMaxFind) {
+            nNodes = iMaxFind;
+        }
+
+        for (i = 0; i < nNodes; i++) {
+            ppFoundNodes[nNodes - i - 1] = nodes[i].pNode;
+        }
+    }
+    return nNodes;
+}
+
+PathNode *PathSearch::FindNearestSniperNode(Entity*pEnt, Vector& vPos, Entity *pEnemy)
+{
+    Actor    *pSelf = (Actor *)pEnt;
+    PathNode *pNode;
+    Vector    delta;
+    int       nNodes = 0;
+    int       i;
+    nodeinfo  nodes[MAX_PATHNODES];
+
+    for (i = 0; i < nodecount; i++) {
+        pNode = pathnodes[i];
+        if (!pNode) {
+            continue;
+        }
+
+        if (!(pNode->nodeflags & AI_SNIPER)) {
+            continue;
+        }
+        if (pNode->IsClaimedByOther(pEnt)) {
+            continue;
+        }
+
+        delta = pNode->origin - pSelf->m_vHome;
+
+        if (delta.lengthSquared() > pSelf->m_fLeashSquared) {
+            continue;
+        }
+
+        delta = pNode->origin - pEnemy->origin;
+        if (delta.lengthSquared() < pSelf->m_fMinDistanceSquared
+            || delta.lengthSquared() > pSelf->m_fMaxDistanceSquared) {
+            continue;
+        }
+
+        delta                      = pNode->origin - pSelf->origin;
+        nodes[nNodes].fDistSquared = delta.lengthSquared();
+        nodes[nNodes].pNode        = pNode;
+        nNodes++;
+    }
+
+    if (nNodes == 0) {
+        return NULL;
+    }
+
+    qsort(nodes, nNodes, sizeof(nodeinfo), node_compare);
+
+    if (nNodes <= 0) {
+        return NULL;
+    }
+
+    for (i = 0; i < nNodes; i++) {
+        pNode = nodes[i].pNode;
+        if (pSelf->CanSeeFrom(pSelf->eyeposition + pNode->origin, pEnemy)) {
+            return pNode;
+        }
+
+        pNode->MarkTemporarilyBad();
+    }
+
+    return NULL;
+}
+
+PathNode *PathSearch::GetSpawnNode(ClassDef *cls)
+{
+    if (m_bNodesloaded
+        // Fixed in OPM
+        && m_LoadIndex < nodecount
+        ) {
+        return pathnodes[m_LoadIndex++];
+    } else {
+        // Otherwise create a new node
+        return static_cast<PathNode *>(cls->newInstance());
+    }
+}
+
+void PathSearch::LoadNodes(void)
+{
+    Init();
+
+    ArchiveLoadNodes();
+}
+
+void PathSearch::CreatePaths(void)
+{
+    int        i;
+    int        j;
+    int        x;
+    int        y;
+    PathNode  *node;
+    Vector     start;
+    Vector     end;
+    gentity_t *ent;
+    int        t1;
+    int        t2;
+
+    if (m_bNodesloaded) {
+        return;
+    }
+
+    if (!nodecount) {
+        m_bNodesloaded = true;
+        return;
+    }
+
+    m_NodeCheckFailed = false;
+
+    gi.DPrintf(
+        "***********************************\n"
+        "***********************************\n"
+        "\n"
+        "Creating paths...\n"
+        "\n"
+        "***********************************\n"
+        "***********************************\n"
+    );
+
+    gi.ClearResource();
+
+    t1 = gi.Milliseconds();
+
+    for (i = 0, ent = g_entities; i < game.maxentities; i++, ent++) {
+        if (ent->entity && ent->entity->IsSubclassOfDoor()) {
+            ent->entity->unlink();
+        }
+    }
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            MapCell *cell = &PathMap[x][y];
+
+            cell->nodes    = (short *)gi.Malloc(PATHMAP_CELLSIZE);
+            cell->numnodes = 0;
+            memset(cell->nodes, 0, PATHMAP_CELLSIZE);
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+        if (!node) {
+            continue;
+        }
+
+        droptofloor(node->origin, node);
+        node->centroid = node->origin;
+
+        if (node->nodeflags & PATH_DONT_LINK) {
+            continue;
+        }
+
+        for (j = i - 1; j >= 0; j--) {
+            PathNode *node2 = pathnodes[j];
+            if (!node2) {
+                continue;
+            }
+
+            if (node->origin == node2->origin) {
+                Com_Printf(
+                    "^~^~^ Duplicate node at (%.2f %.2f %.2f) not linked\n",
+                    node->origin[0],
+                    node->origin[1],
+                    node->origin[2]
+                );
+                node->nodeflags |= PATH_DONT_LINK;
+                break;
+            }
+        }
+
+        if (!(node->nodeflags & PATH_DONT_LINK)) {
+            node->Child = (pathway_t *)gi.Malloc(sizeof(pathway_t) * PATHMAP_NODES);
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
+            continue;
+        }
+
+        AddNode(node);
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+
+        if (!node || (node->nodeflags & PATH_DONT_LINK)) {
+            continue;
+        }
+
+        Connect(node);
+    }
+
+    for (i = 0, ent = g_entities; i < game.maxentities; i++, ent++) {
+        if (ent->entity && ent->entity->IsSubclassOfDoor()) {
+            ent->entity->link();
+        }
+    }
+
+    gi.DPrintf("\nSaving path nodes to '%s'\n", level.m_pathfile.c_str());
+    Com_Printf("Archiving\n");
+    ArchiveSaveNodes();
+    m_bNodesloaded = true;
+    Com_Printf("done.\n");
+
+    t2 = gi.Milliseconds();
+    Com_Printf("Path connection: %5.2f seconds\n", (t2 - t1) / 1000.0f);
+    Com_Printf("Number of nodes: %d\n", nodecount);
+    gi.ClearResource();
+
+    if (g_nodecheck->integer && m_NodeCheckFailed) {
+        gi.Error(ERR_DROP, "Node check failed");
+    }
+}
+
+void PathSearch::LoadAddToGrid2(PathNode *node, int x, int y)
+{
+    MapCell *cell;
+
+    cell = GetNodesInCell(x, y);
+
+    if (cell) {
+        cell->AddNode(node);
+    }
+}
+
+void PathSearch::ArchiveStaticLoad(Archiver& arc)
+{
+    int       i;
+    PathNode *node;
+    int       total_nodes;
+    int       total_children;
+    int       x;
+    int       y;
+    int       size;
+
+    loadingarchive = true;
+
+    arc.ArchiveInteger(&nodecount);
+    arc.ArchiveInteger(&total_nodes);
+    arc.ArchiveInteger(&total_children);
+
+    size = total_nodes + total_children * (sizeof(pathway_t) * 2) + nodecount * (sizeof(PathNode) / 2);
+    size *= sizeof(void *) / 2;
+
+    gi.DPrintf("%d memory allocated for navigation.\n", size);
+
+    if (size) {
+        startBulkNavMemory = (byte *)gi.Malloc(size);
+    } else {
+        startBulkNavMemory = NULL;
+    }
+
+    bulkNavMemory = startBulkNavMemory + size;
+
+    for (i = 0; i < nodecount; i++) {
+        node = new PathNode;
+
+        arc.ArchiveObjectPosition(node);
+        node->ArchiveStatic(arc);
+        node->nodenum = i;
+
+        pathnodes[i] = node;
+
+        if (!(node->nodeflags & PATH_DONT_LINK)) {
+            x = NodeCoordinate(node->origin[0]);
+            y = NodeCoordinate(node->origin[1]);
+
+            LoadAddToGrid(x, y);
+            LoadAddToGrid(x + 1, y);
+            LoadAddToGrid(x, y + 1);
+            LoadAddToGrid(x + 1, y + 1);
+        }
+    }
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            bulkNavMemory -= PathMap[x][y].numnodes * sizeof(short);
+
+            PathMap[x][y].nodes    = PathMap[x][y].numnodes ? (short *)bulkNavMemory : NULL;
+            PathMap[x][y].numnodes = 0;
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+
+        if (!(node->nodeflags & PATH_DONT_LINK)) {
+            x = NodeCoordinate(node->origin[0]);
+            y = NodeCoordinate(node->origin[1]);
+
+            LoadAddToGrid2(node, x, y);
+            LoadAddToGrid2(node, x + 1, y);
+            LoadAddToGrid2(node, x, y + 1);
+            LoadAddToGrid2(node, x + 1, y + 1);
+        }
+    }
+
+    loadingarchive = false;
+}
+
+void PathSearch::ArchiveStaticSave(Archiver& arc)
+{
+    int       i;
+    PathNode *node;
+    int       total_nodes    = 0;
+    int       total_children = 0;
+    int       x              = 0;
+    int       y              = 0;
+
+    for (x = 0; x < PATHMAP_GRIDSIZE; x++) {
+        for (y = 0; y < PATHMAP_GRIDSIZE; y++) {
+            total_nodes += PathMap[x][y].NumNodes();
+        }
+    }
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+        total_children += node->virtualNumChildren;
+    }
+
+    arc.ArchiveInteger(&nodecount);
+    arc.ArchiveInteger(&total_nodes);
+    arc.ArchiveInteger(&total_children);
+
+    for (i = 0; i < nodecount; i++) {
+        node = pathnodes[i];
+        arc.ArchiveObjectPosition(node);
+        node->ArchiveStatic(arc);
+    }
 }
 
 bool PathSearch::ArchiveDynamic(Archiver& arc)
 {
-	PathNode* node;
-	int i;
-	int count;
+    PathNode *node;
+    int       i;
+    int       count;
 
-	if (arc.Loading())
-	{
-		arc.ArchiveInteger(&count);
-		if (count != nodecount) {
-			Com_Printf("Path file invalid - cannot load save game\n");
-			return false;
-		}
-	}
-	else
-	{
-		arc.ArchiveInteger(&nodecount);
-	}
+    if (arc.Saving()) {
+        arc.ArchiveInteger(&nodecount);
+    } else {
+        arc.ArchiveInteger(&count);
+        if (count != nodecount) {
+            Com_Printf("Path file invalid - cannot load save game\n");
+            return false;
+        }
+    }
 
-	for (i = 0; i < nodecount; i++) {
-		node = PathSearch::pathnodes[i];
-		node->ArchiveDynamic(arc);
-	}
+    for (i = 0; i < nodecount; i++) {
+        node = PathSearch::pathnodes[i];
+        node->ArchiveDynamic(arc);
+    }
 
-	return true;
+    return true;
 }
 
-void PathSearch::ArchiveLoadNodes
-	(
-	void
-	)
+void PathSearch::AddToGrid(PathNode *node, int x, int y)
 {
-	Archiver arc;
-	qboolean success;
+    MapCell *cell;
 
-	success = qfalse;
-	if( arc.Read( level.m_pathfile, false ) )
-	{
-		int file_version;
-		str maptime;
+    cell = GetNodesInCell(x, y);
 
-		// get file values
-		arc.ArchiveInteger( &file_version );
-		if( file_version != PATHFILE_VERSION )
-		{
-			Com_Printf( "Expecting version %d path file.  Path file is version %d.\n", PATHFILE_VERSION, file_version );
-			arc.Close();
-			return;
-		}
+    if (!cell) {
+        return;
+    }
 
-		arc.ArchiveString( &maptime );
-		if( gi.MapTime() == maptime && gi.FS_FileNewer( level.m_mapfile.c_str(), level.m_pathfile.c_str() ) <= 0 )
-		{
-			arc.ArchiveInteger( &m_NodeCheckFailed );
+    if (cell->NumNodes() >= PATHMAP_NODES) {
+        Com_Printf("^~^~^ PathSearch::AddToGrid: Node overflow at ( %d, %d )\n", x, y);
+        return;
+    }
 
-			if( !g_nodecheck->integer || !m_NodeCheckFailed )
-			{
-				ArchiveStaticLoad( arc );
-				m_bNodesloaded = arc.NoErrors();
-			}
-			else
-			{
-				gi.Printf( "Rebuilding pathnodes to view node errors.\n" );
-			}
-		}
-		else
-		{
-			gi.Printf( "Pathnodes have changed, rebuilding.\n" );
-		}
-	}
-
-	arc.Close();
+    cell->AddNode(node);
 }
 
-qboolean PathSearch::ArchiveSaveNodes
-	(
-	void
-	)
+bool PathSearch::Connect(PathNode *node, int x, int y)
 {
-	Archiver arc;
-	str		maptime;
-	int		tempInt;
+    MapCell  *cell;
+    int       i;
+    PathNode *node2;
 
-	arc.Create( level.m_pathfile );
-	tempInt = PATHFILE_VERSION;
-	arc.ArchiveInteger( &tempInt );
-	maptime = gi.MapTime();
-	arc.ArchiveString( &maptime );
-	arc.ArchiveInteger( &m_NodeCheckFailed );
-	ArchiveStaticSave( arc );
-	arc.Close();
+    cell = GetNodesInCell(x, y);
 
-	return true;
+    if (!cell) {
+        return true;
+    }
+
+    for (i = 0; i < cell->numnodes; i++) {
+        node2 = pathnodes[cell->nodes[i]];
+        if (!node2) {
+            continue;
+        }
+
+        if (node2->findCount != findFrame) {
+            node2->findCount = findFrame;
+
+            if (!node->CheckPathTo(node2)) {
+                return false;
+            }
+        }
+    }
+
+    return true;
 }
 
-void PathSearch::Connect
-	(
-	PathNode *node
-	)
+bool PathNode::CheckPathTo(PathNode *node)
 {
-	int x;
-	int y;
+    if (virtualNumChildren >= NUM_PATHSPERNODE) {
+        Com_Printf(
+            "^~^~^ %d paths per node at (%.2f %.2f %.2f) exceeded\n - use DONT_LINK on some nodes to conserve cpu and "
+            "memory usage\n",
+            NUM_PATHSPERNODE,
+            node->origin[0],
+            node->origin[1],
+            node->origin[2]
+        );
+        PathSearch::m_NodeCheckFailed = true;
+        return false;
+    }
 
-	findFrame++;
-	node->findCount = findFrame;
-
-	x = NodeCoordinate( node->origin[ 0 ] );
-	y = NodeCoordinate( node->origin[ 1 ] );
-
-	if( Connect( node, x - 1, y - 1 ) )
-	{
-		if( Connect( node, x - 1, y ) )
-		{
-			if( Connect( node, x - 1, y + 1 ) )
-			{
-				if( Connect( node, x, y - 1 ) )
-				{
-					if( Connect( node, x, y ) )
-					{
-						if( Connect( node, x, y + 1 ) )
-						{
-							if( Connect( node, x + 1, y - 1 ) )
-							{
-								if( Connect( node, x + 1, y ) )
-								{
-									Connect( node, x + 1, y + 1 );
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+    CheckPathToDefault(node, &Child[virtualNumChildren]);
+    return true;
 }
 
-bool PathSearch::Connect
-	(
-	PathNode *node,
-	int x,
-	int y
-	)
+qboolean CheckMove(Vector& origin, Vector& pos, short int *path_fallheight, float size)
 {
-	MapCell *cell;
-	int i;
-	PathNode *node2;
+    mmove_t mm;
+    int     i;
+    float   air_z;
+    float   fallheight;
+    float   test_fallheight;
+    float   error;
+    trace_t trace;
+    vec3_t  dir;
+    vec3_t  end;
 
-	if( x > PATHMAP_GRIDSIZE || y > PATHMAP_GRIDSIZE )
-		cell = NULL;
-	else
-		cell = &PathMap[ x ][ y ];
+    memset(&mm, 0, sizeof(mmove_t));
 
-	if( !cell )
-		return true;
+    VectorClear(mm.velocity);
+    VectorCopy(origin, mm.origin);
+    mm.desired_speed  = 150.0f;
+    mm.entityNum      = ENTITYNUM_NONE;
+    mm.tracemask      = MASK_PATHSOLID;
+    mm.frametime      = 0.1f;
+    mm.desired_dir[0] = pos[0] - origin[0];
+    mm.desired_dir[1] = pos[1] - origin[1];
+    VectorNormalize2D(mm.desired_dir);
 
-	if( cell->numnodes <= 0 )
-		return true;
+    mm.groundPlane = qfalse;
+    mm.walking     = qfalse;
 
-	for( i = 0; i < cell->numnodes; i++ )
-	{
-		node2 = pathnodes[ cell->nodes[ i ] ];
+    mm.mins[0] = -size;
+    mm.mins[1] = -size;
+    mm.mins[2] = 0;
+    mm.maxs[0] = size;
+    mm.maxs[1] = size;
+    mm.maxs[2] = MAXS_Z;
 
-		if( node2->findCount != findFrame )
-		{
-			node2->findCount = findFrame;
+    testcount  = 0;
+    fallheight = 0.0f;
+    air_z      = mm.origin[2];
 
-			if( !node->CheckPathTo( node2 ) )
-				return false;
-		}
-	}
+    for (i = 0; i < 200; i++) {
+        testpos[testcount++] = mm.origin;
 
-	return true;
+        MmoveSingle(&mm);
+
+        if (mm.groundPlane) {
+            test_fallheight = air_z - mm.origin[2];
+
+            if (test_fallheight > fallheight) {
+                if (test_fallheight > MAXS_Z) {
+                    Vector start;
+
+                    //
+                    // Added in OPM
+                    //  Check to make sure that the target is reachable enough
+                    //  so that AIs don't block trying to move to the target position
+
+                    start = origin;
+                    start.z += MAXS_Z;
+
+                    if (!G_SightTrace(
+                            start,
+                            vec_zero,
+                            vec_zero,
+                            pos,
+                            (gentity_t *)NULL,
+                            (gentity_t *)NULL,
+                            MASK_PATHSOLID,
+                            qfalse,
+                            "CheckMove"
+                        )) {
+                        return false;
+                    }
+                }
+
+                if (test_fallheight > 1024.0f) {
+                    return false;
+                }
+
+                fallheight = test_fallheight;
+            }
+
+            air_z = mm.origin[2];
+        }
+
+        VectorSub2D(pos, mm.origin, dir);
+
+        if (DotProduct2D(dir, mm.desired_dir) <= 0.1f) {
+            error = mm.origin[2] - pos[2];
+
+            *path_fallheight = (short)fallheight;
+            if (fabs(error) <= MAXS_Z) {
+                if (error <= 0.0f || mm.groundPlane) {
+                    return true;
+                }
+
+                end[0] = mm.origin[0];
+                end[1] = mm.origin[1];
+                end[2] = pos[2];
+
+                trace = G_Trace(mm.origin, mm.mins, mm.maxs, end, NULL, MASK_PATHSOLID, true, "CheckMove");
+
+                test_fallheight = mm.origin[2] - trace.endpos[2];
+
+                if (test_fallheight <= 18.0f) {
+                    *path_fallheight = (short)test_fallheight + fallheight;
+                    return test_fallheight + fallheight <= 1024.0f;
+                }
+            }
+
+            if (mm.groundPlane) {
+                return false;
+            }
+
+            VectorCopy2D(dir, mm.desired_dir);
+            VectorNormalize2D(mm.desired_dir);
+        }
+
+        if (mm.hit_obstacle) {
+            break;
+        }
+    }
+
+    return false;
 }
 
-void PathSearch::ShowNodes
-	(
-	void
-	)
+void PathNode::CheckPathToDefault(PathNode *node, pathway_t *pathway)
 {
-	if( g_entities->client )
-	{
-		if( ai_shownode->integer )
-		{
-			DrawNode( ai_shownode->integer );
-		}
-		if( ai_showroutes->integer || ai_shownodenums->integer )
-		{
-			DrawAllConnections();
-		}
-	}
+    float  dist;
+    vec2_t delta;
+    Vector start;
+    Vector end;
 
-	if( ai_showpath->integer )
-	{
-		if( !test_path )
-			test_path = new ActorPath;
+    VectorSub2D(node->origin, origin, delta);
+    dist = VectorNormalize2D(delta);
 
-		if( ai_showpath->integer == 1 )
-		{
-			ai_startpath = g_entities[ 0 ].entity->origin;
-		}
-		if( ai_showpath->integer == 2 )
-		{
-			ai_endpath = g_entities[ 0 ].entity->origin;
-		}
-		if( ai_showpath->integer <= 2 )
-		{
-			test_path->SetFallHeight( ai_fallheight->integer );
-			test_path->FindPath( ai_startpath, ai_endpath, NULL, 0, NULL, 0 );
-		}
-		if( ai_showpath->integer == 3 )
-		{
-			if( test_path->CurrentNode() )
-			{
-				test_path->UpdatePos( g_entities[ 0 ].entity->origin );
+    if (dist >= 384.0f) {
+        return;
+    }
 
-				Vector vStart = g_entities[ 0 ].entity->origin + Vector( 0, 0, 32 );
-				Vector vEnd = g_entities[ 0 ].entity->origin + test_path->CurrentDelta() + Vector( 0, 0, 32 );
+    start = origin;
+    end   = node->origin;
 
-				G_DebugLine( vStart, vEnd, 1, 1, 0, 1 );
-			}
-		}
+    droptofloor(start, this);
+    droptofloor(end, node);
 
-		G_DebugLine( ai_startpath, ai_endpath, 0, 0, 1, 1 );
-
-		if( test_path->CurrentNode() )
-		{
-			PathInfo *pos = test_path->CurrentNode();
-
-			while( pos != test_path->LastNode() )
-			{
-				Vector vStart = pos->point + Vector( 0, 0, 32 );
-
-				pos--;
-
-				Vector vEnd = pos->point + Vector( 0, 0, 32 );
-
-				G_DebugLine( vStart, vEnd, 1, 0, 0, 1 );
-			}
-		}
-	}
+    if (CheckMove(start, end, &pathway->fallheight, 15.5f)) {
+        pathway->dist = dist;
+        VectorCopy2D(delta, pathway->dir);
+        start.copyTo(pathway->pos1);
+        end.copyTo(pathway->pos2);
+        ConnectTo(node);
+    }
 }
 
-void PathSearch::LoadNodes
-	(
-	void
-	)
+void MapCell::AddNode(PathNode *node)
 {
-	Init();
-
-	ArchiveLoadNodes();
+    nodes[numnodes] = node->nodenum;
+    numnodes++;
 }
 
-void PathSearch::CreatePaths
-	(
-	void
-	)
+void PathSearch::AddNode(PathNode *node)
 {
-	int i;
-	int j;
-	int x;
-	int y;
-	PathNode *node;
-	Vector start;
-	Vector end;
-	gentity_t *ent;
-	int t1;
-	int t2;
+    int x;
+    int y;
 
-	if( m_bNodesloaded )
-		return;
+    assert(node);
 
-	if( !nodecount )
-	{
-		m_bNodesloaded = true;
-		return;
-	}
+    x = NodeCoordinate(node->origin[0]);
+    y = NodeCoordinate(node->origin[1]);
 
-	m_NodeCheckFailed = false;
-
-	gi.DPrintf( "***********************************\n"
-		"***********************************\n"
-		"\n"
-		"Creating paths...\n"
-		"\n"
-		"***********************************\n"
-		"***********************************\n" );
-
-	t1 = gi.Milliseconds();
-
-	for( i = 0, ent = g_entities; i < game.maxentities; i++, ent++ )
-	{
-		if( ent->entity && ent->entity->IsSubclassOfDoor() )
-			gi.unlinkentity( ent );
-	}
-
-	for( x = 0; x < PATHMAP_GRIDSIZE; x++ )
-	{
-		for( y = 0; y < PATHMAP_GRIDSIZE; y++ )
-		{
-			MapCell *cell = &PathMap[ x ][ y ];
-
-			cell->nodes = ( short * )gi.Malloc( PATHMAP_CELLSIZE );
-			cell->numnodes = 0;
-			memset( cell->nodes, 0, PATHMAP_CELLSIZE );
-		}
-	}
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-
-		start = node->origin + Vector( 0, 0, 36.0f );
-		end = node->origin - Vector( 0, 0, 2048.0f );
-
-		trace_t trace = G_Trace( start,
-			PLAYER_BASE_MIN,
-			PLAYER_BASE_MAX,
-			end,
-			NULL,
-			MASK_PATHSOLID,
-			qfalse,
-			"droptofloor" );
-
-		node->origin = trace.endpos;
-		node->centroid = trace.endpos;
-
-		if( !( node->nodeflags & PATH_DONT_LINK ) )
-		{
-			for( j = i - 1; j >= 0; j-- )
-			{
-				PathNode *node2 = pathnodes[ j ];
-
-				if( node2->origin == node->origin )
-				{
-					Com_Printf( "^~^~^ Duplicate node at (%.2f %.2f %.2f) not linked\n", node->origin[ 0 ], node->origin[ 1 ], node->origin[ 2 ] );
-					node->nodeflags |= PATH_DONT_LINK;
-					break;
-				}
-			}
-
-			if( !( node->nodeflags & PATH_DONT_LINK ) )
-				node->Child = ( pathway_t * )gi.Malloc( sizeof( pathway_t ) * PATHMAP_NODES );
-		}
-	}
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-
-		if( node->nodeflags & PATH_DONT_LINK )
-			continue;
-
-		AddNode( node );
-	}
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
-
-		if( node->nodeflags & PATH_DONT_LINK )
-			continue;
-
-		Connect( node );
-	}
-
-	for( i = 0, ent = g_entities; i < game.maxentities; i++, ent++ )
-	{
-		if( ent->entity && ent->entity->IsSubclassOfDoor() )
-			ent->entity->link();
-	}
-
-	gi.DPrintf( "\nSaving path nodes to '%s'\n", level.m_pathfile.c_str() );
-	Com_Printf( "Archiving\n" );
-	ArchiveSaveNodes();
-	m_bNodesloaded = true;
-	Com_Printf( "done.\n" );
-	
-	t2 = gi.Milliseconds();
-	Com_Printf( "Path connection: %5.2f seconds\n", ( t2 - t1 ) / 1000.0f );
-	Com_Printf( "Number of nodes: %d\n", nodecount );
-	gi.ClearResource();
-
-	if( g_nodecheck->integer && m_NodeCheckFailed )
-	{
-		gi.Error( ERR_DROP, "Node check failed" );
-	}
+    AddToGrid(node, x, y);
+    AddToGrid(node, x + 1, y);
+    AddToGrid(node, x, y + 1);
+    AddToGrid(node, x + 1, y + 1);
 }
 
-void *PathSearch::AllocPathNode
-	(
-	void
-	)
+void PathSearch::Connect(PathNode *node)
 {
-	if( bulkNavMemory && !m_bNodesloaded )
-	{
-		bulkNavMemory -= sizeof( PathNode );
-		return bulkNavMemory;
-	}
-	else
-	{
-		return gi.Malloc( sizeof( PathNode ) );
-	}
+    int x;
+    int y;
+
+    findFrame++;
+    node->findCount = findFrame;
+
+    x = GridCoordinate(node->origin[0]);
+    y = GridCoordinate(node->origin[1]);
+
+    if (!Connect(node, x - 1, y - 1)) {
+        return;
+    }
+
+    if (!Connect(node, x - 1, y)) {
+        return;
+    }
+
+    if (!Connect(node, x - 1, y + 1)) {
+        return;
+    }
+
+    if (!Connect(node, x, y - 1)) {
+        return;
+    }
+
+    if (!Connect(node, x, y)) {
+        return;
+    }
+
+    if (!Connect(node, x, y + 1)) {
+        return;
+    }
+
+    if (!Connect(node, x + 1, y - 1)) {
+        return;
+    }
+
+    if (!Connect(node, x + 1, y)) {
+        return;
+    }
+
+    Connect(node, x + 1, y + 1);
 }
 
-void PathSearch::FreePathNode
-	(
-	void *ptr
-	)
+const_str PathNode::GetSpecialAttack(Actor *pActor)
 {
-	if( !bulkNavMemory || m_bNodesloaded )
-	{
-		gi.Free( ptr );
-	}
+    int       iSpecialAttack;
+    const_str csAnimation;
+    float     fRangeSquared;
+    vec2_t    vDelta;
+    float     fAngle;
+    float     fMinRangeSquared;
+    float     fMaxRangeSquared;
+    float     fMinAngle;
+    float     fMaxAngle;
+
+    if (nodeflags & AI_CORNER_LEFT) {
+        iSpecialAttack   = 0;
+        csAnimation      = STRING_ANIM_CORNERLEFT_SCR;
+        fMinRangeSquared = g_AttackParms[iSpecialAttack].fMinRangeSquared;
+        fMaxRangeSquared = g_AttackParms[iSpecialAttack].fMaxRangeSquared;
+        fMinAngle        = g_AttackParms[iSpecialAttack].fMinAngle;
+        fMaxAngle        = g_AttackParms[iSpecialAttack].fMaxAngle;
+    } else if (nodeflags & AI_CORNER_RIGHT) {
+        iSpecialAttack   = 1;
+        csAnimation      = STRING_ANIM_CORNERRIGHT_SCR;
+        fMinRangeSquared = g_AttackParms[iSpecialAttack].fMinRangeSquared;
+        fMaxRangeSquared = g_AttackParms[iSpecialAttack].fMaxRangeSquared;
+        fMinAngle        = g_AttackParms[iSpecialAttack].fMinAngle;
+        fMaxAngle        = g_AttackParms[iSpecialAttack].fMaxAngle;
+    } else if (nodeflags & AI_CRATE) {
+        iSpecialAttack   = 2;
+        csAnimation      = STRING_ANIM_OVERATTACK_SCR;
+        fMinRangeSquared = g_AttackParms[iSpecialAttack].fMinRangeSquared;
+        fMaxRangeSquared = g_AttackParms[iSpecialAttack].fMaxRangeSquared;
+        fMinAngle        = g_AttackParms[iSpecialAttack].fMinAngle;
+        fMaxAngle        = g_AttackParms[iSpecialAttack].fMaxAngle;
+    } else if (nodeflags & AI_LOW_WALL_ARC) {
+        if (nodeflags & AI_DUCK) {
+            csAnimation = STRING_ANIM_LOWWALL_SCR;
+        } else {
+            csAnimation = STRING_ANIM_HIGHWALL_SCR;
+        }
+
+        iSpecialAttack   = 3;
+        fMinRangeSquared = g_AttackParms[iSpecialAttack].fMinRangeSquared;
+        fMaxRangeSquared = g_AttackParms[iSpecialAttack].fMaxRangeSquared;
+        fMinAngle        = 360 - m_fLowWallArc;
+        fMaxAngle        = m_fLowWallArc;
+    } else {
+        return STRING_NULL;
+    }
+
+    if (pActor->m_Enemy) {
+        VectorSub2D(pActor->m_Enemy->centroid, origin, vDelta);
+    } else {
+        VectorSub2D(pActor->m_vLastEnemyPos, origin, vDelta);
+    }
+
+    fRangeSquared = VectorLength2DSquared(vDelta);
+
+    if (fRangeSquared < fMinRangeSquared || fRangeSquared > fMaxRangeSquared) {
+        return STRING_NULL;
+    }
+
+    fAngle = RAD2DEG(atan2(vDelta[1], vDelta[0])) - angles[1];
+
+    if (fAngle <= -360) {
+        fAngle = fAngle + 720.0f;
+    } else if (fAngle < 0) {
+        fAngle = fAngle + 360.0f;
+    } else if (fAngle >= 720) {
+        fAngle = fAngle - 720.0f;
+    } else if (fAngle >= 360) {
+        fAngle = fAngle - 360.0f;
+    } else {
+        fAngle = fAngle;
+    }
+
+    if (fMinAngle > fMaxAngle) {
+        if (fAngle < fMinAngle && fAngle > fMaxAngle) {
+            return STRING_NULL;
+        }
+    } else {
+        if (fAngle < fMinAngle || fAngle > fMaxAngle) {
+            return STRING_NULL;
+        }
+    }
+
+    return csAnimation;
 }
 
-void PathSearch::ResetNodes
-	(
-	void
-	)
+void PathNode::Claim(Entity *pClaimer)
 {
-	int i;
-	int x;
-	int y;
-
-	m_LoadIndex = -1;
-	m_bNodesloaded = false;
-
-	if( !startBulkNavMemory )
-	{
-		for( x = PATHMAP_GRIDSIZE - 1; x >= 0; x-- )
-		{
-			for( y = PATHMAP_GRIDSIZE - 1; y >= 0; y-- )
-			{
-				if( PathMap[ x ][ y ].nodes )
-					gi.Free( PathMap[ x ][ y ].nodes );
-			}
-		}
-
-		for( i = 0; i < nodecount; i++ )
-		{
-			if( pathnodes[ i ]->Child )
-				gi.Free( pathnodes[ i ]->Child );
-		}
-	}
-
-	for( x = PATHMAP_GRIDSIZE - 1; x >= 0; x-- )
-	{
-		for( y = PATHMAP_GRIDSIZE - 1; y >= 0; y-- )
-		{
-			PathMap[ x ][ y ].numnodes = 0;
-			PathMap[ x ][ y ].nodes = NULL;
-		}
-	}
-
-	for( i = 0; i < nodecount; i++ )
-	{
-		delete pathnodes[ i ];
-		pathnodes[ i ] = NULL;
-	}
-
-	nodecount = 0;
-
-	// Free the bulk nav' memory
-	if( startBulkNavMemory )
-	{
-		gi.Free( startBulkNavMemory );
-		bulkNavMemory = NULL;
-		startBulkNavMemory = NULL;
-	}
+    pLastClaimer   = pClaimer;
+    iAvailableTime = 0;
 }
 
-PathInfo *PathSearch::GeneratePath
-	(
-	PathInfo *path
-	)
+Entity *PathNode::GetClaimHolder(void) const
 {
-	PathNode *ParentNode;
-	pathway_t *pathway;
-	float dist;
-	float dir[ 2 ];
-	PathInfo *current_path;
-
-	current_path = path;
-
-	dir[ 0 ] = path_end[ 0 ] - Node->m_PathPos[ 0 ];
-	dir[ 1 ] = path_end[ 1 ] - Node->m_PathPos[ 1 ];
-
-	dist = VectorNormalize2D( dir );
-
-	total_dist = dist + Node->g;
-
-	path->point[ 0 ] = path_end[ 0 ];
-	path->point[ 1 ] = path_end[ 1 ];
-	path->point[ 2 ] = path_end[ 2 ];
-
-	ParentNode = Node->Parent;
-	if( ParentNode )
-	{
-		pathway = &ParentNode->Child[ Node->pathway ];
-
-		path->dir[ 0 ] = path_end[ 0 ] - pathway->pos2[ 0 ];
-		path->dir[ 1 ] = path_end[ 1 ] - pathway->pos2[ 1 ];
-		path->dist = VectorNormalize2D( path->dir );
-
-		if( path->dist )
-		{
-			path->bAccurate = false;
-			current_path = path + 1;
-		}
-
-		if( pathway->dist )
-		{
-			VectorCopy( pathway->pos2, current_path->point );
-			current_path->dir[ 0 ] = pathway->dir[ 0 ];
-			current_path->dir[ 1 ] = pathway->dir[ 1 ];
-			current_path->dist = pathway->dist;
-			current_path->bAccurate = true;
-			current_path++;
-		}
-
-		for( Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL; Node = ParentNode, ParentNode = ParentNode->Parent )
-		{
-			pathway = &ParentNode->Child[ Node->pathway ];
-			if( pathway->dist )
-			{
-				VectorCopy( pathway->pos2, current_path->point );
-				current_path->dir[ 0 ] = pathway->dir[ 0 ];
-				current_path->dir[ 1 ] = pathway->dir[ 1 ];
-				current_path->dist = pathway->dist;
-				current_path->bAccurate = true;
-				current_path++;
-			}
-		}
-
-		VectorCopy( pathway->pos1, current_path->point );
-		current_path->dir[ 0 ] = path_startdir[ 0 ];
-		current_path->dir[ 1 ] = path_startdir[ 1 ];
-		current_path->dist = Node->g;
-	}
-	else
-	{
-		path->dir[ 0 ] = path_totaldir[ 0 ];
-		path->dir[ 1 ] = path_totaldir[ 1 ];
-		path->dist = Node->h;
-	}
-
-	if( current_path->dist )
-	{
-		current_path->bAccurate = false;
-		current_path++;
-
-		VectorCopy( path_start, current_path->point );
-		current_path->dist = 0;
-		VectorClear2D( current_path->dir );
-	}
-
-	current_path->bAccurate = false;
-	return current_path;
+    if (iAvailableTime) {
+        return NULL;
+    } else {
+        return pLastClaimer;
+    }
 }
 
-PathInfo *PathSearch::GeneratePathNear
-	(
-	PathInfo *path
-	)
+void PathNode::Relinquish(void)
 {
-	PathInfo *current_path = path;
-	pathway_t *pathway;
-	PathNode *ParentNode;
-
-	total_dist = Node->g;
-	VectorCopy( Node->m_PathPos, path->point );
-
-	ParentNode = Node->Parent;
-	if( ParentNode )
-	{
-		pathway = &ParentNode->Child[ Node->pathway ];
-
-		if( pathway->dist )
-		{
-			VectorCopy( pathway->pos2, path->point );
-			path->dir[ 0 ] = pathway->dir[ 0 ];
-			path->dir[ 1 ] = pathway->dir[ 1 ];
-			path->dist = pathway->dist;
-
-			current_path->bAccurate = true;
-			current_path++;
-		}
-
-		for( Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL; Node = ParentNode, ParentNode = ParentNode->Parent )
-		{
-			pathway = &ParentNode->Child[ Node->pathway ];
-			if( pathway->dist )
-			{
-				VectorCopy( pathway->pos2, current_path->point );
-				current_path->dir[ 0 ] = pathway->dir[ 0 ];
-				current_path->dir[ 1 ] = pathway->dir[ 1 ];
-				current_path->dist = pathway->dist;
-				current_path->bAccurate = true;
-				current_path++;
-			}
-		}
-
-		VectorCopy( pathway->pos1, current_path->point );
-		current_path->dir[ 0 ] = path_startdir[ 0 ];
-		current_path->dir[ 1 ] = path_startdir[ 1 ];
-
-		current_path->dist = Node->g;
-	}
-	else
-	{
-		path->dir[ 0 ] = path_totaldir[ 0 ];
-		path->dir[ 1 ] = path_totaldir[ 1 ];
-		path->dist = Node->h;
-	}
-
-	if( current_path->dist )
-	{
-		current_path->bAccurate = false;
-		current_path++;
-
-		VectorCopy( path_start, current_path->point );
-		current_path->dist = 0;
-		VectorClear2D( current_path->dir );
-	}
-
-	current_path->bAccurate = false;
-	return current_path;
+    iAvailableTime = level.inttime + 4000;
 }
 
-PathInfo *PathSearch::GeneratePathAway
-	(
-	PathInfo *path
-	)
+bool PathNode::IsClaimedByOther(Entity *pPossibleClaimer) const
 {
-	PathInfo *current_path = path;
-	pathway_t *pathway;
-	PathNode *ParentNode;
+    if (pLastClaimer == pPossibleClaimer) {
+        return false;
+    }
 
-	VectorCopy( Node->m_PathPos, path->point );
-
-	ParentNode = Node->Parent;
-	if( ParentNode )
-	{
-		pathway = &ParentNode->Child[ Node->pathway ];
-
-		if( pathway->dist )
-		{
-			VectorCopy( pathway->pos2, path->point );
-			path->dir[ 0 ] = pathway->dir[ 0 ];
-			path->dir[ 1 ] = pathway->dir[ 1 ];
-			path->dist = pathway->dist;
-
-			current_path->bAccurate = true;
-			current_path++;
-		}
-
-		for( Node = ParentNode, ParentNode = ParentNode->Parent; ParentNode != NULL; Node = ParentNode, ParentNode = ParentNode->Parent )
-		{
-			pathway = &ParentNode->Child[ Node->pathway ];
-			if( pathway->dist )
-			{
-				VectorCopy( pathway->pos2, current_path->point );
-				current_path->dir[ 0 ] = pathway->dir[ 0 ];
-				current_path->dir[ 1 ] = pathway->dir[ 1 ];
-				current_path->dist = pathway->dist;
-				current_path->bAccurate = true;
-				current_path++;
-			}
-		}
-
-		VectorCopy( pathway->pos1, current_path->point );
-		current_path->dir[ 0 ] = path_startdir[ 0 ];
-		current_path->dir[ 1 ] = path_startdir[ 1 ];
-
-		current_path->dist = Node->g;
-
-		if( Node->g )
-		{
-			current_path->bAccurate = false;
-			current_path++;
-			VectorCopy( path_start, current_path->point );
-			current_path->dist = 0;
-			VectorClear2D( current_path->dir );
-		}
-	}
-	else
-	{
-		VectorClear2D( path->dir );
-		path->dist = 0;
-	}
-
-	current_path->bAccurate = false;
-	return current_path;
+    if (iAvailableTime) {
+        return (level.inttime < iAvailableTime);
+    } else {
+        return (pLastClaimer != NULL);
+    }
 }
 
-PathNode *PathSearch::GetSpawnNode
-	(
-	ClassDef *cls
-	)
+void PathNode::MarkTemporarilyBad(void)
 {
-	if( m_bNodesloaded )
-	{
-		return pathnodes[ m_LoadIndex++ ];
-	}
-	else
-	{
-		// Otherwise create a new node
-		return ( PathNode * )cls->newInstance();
-	}
+    iAvailableTime = level.inttime + 5000;
+    pLastClaimer   = NULL;
 }
 
-int PathSearch::FindPath
-	(
-	float *start,
-	float *end,
-	Entity *ent,
-	float maxPath,
-	float *vLeashHome,
-	float fLeashDistSquared,
-	int fallheight
-	)
+void PathNode::Archive(Archiver& arc) {}
+
+void PathNode::ArchiveStatic(Archiver& arc)
 {
-	int i;
-	int g;
-	PathNode *NewNode;
-	pathway_t *pathway;
-	PathNode *prev;
-	PathNode *next;
-	int f;
-	vec2_t delta;
-	PathNode *to;
+    arc.ArchiveVector(&origin);
+    arc.ArchiveVector(&centroid);
+    arc.ArchiveInteger(&nodeflags);
+    arc.ArchiveInteger(&virtualNumChildren);
 
-	if( ent )
-	{
-		if( ent->IsSubclassOfActor() )
-		{
-			Node = NearestStartNode( start, ( SimpleActor * )ent );
-		}
-		else
-		{
-			Node = DebugNearestStartNode( start, ent );
-		}
-	}
-	else
-	{
-		Node = DebugNearestStartNode( start );
-	}
+    numChildren = virtualNumChildren;
 
-	if( !Node )
-	{
-		last_error = "couldn't find start node";
-		return 0;
-	}
+    if (arc.Loading()) {
+        bulkNavMemory -= virtualNumChildren * sizeof(pathway_t) * sizeof(pathway_t *);
+        Child = virtualNumChildren ? (pathway_t *)bulkNavMemory : NULL;
+    }
 
-	to = NearestEndNode( end );
-	if( !to )
-	{
-		last_error = "couldn't find end node";
-		return 0;
-	}
+    for (int i = 0; i < virtualNumChildren; i++) {
+        arc.ArchiveShort(&Child[i].node);
+        arc.ArchiveShort(&Child[i].fallheight);
+        arc.ArchiveFloat(&Child[i].dist);
+        arc.ArchiveVec2(Child[i].dir);
+        arc.ArchiveVec3(Child[i].pos1);
+        arc.ArchiveVec3(Child[i].pos2);
 
-	total_dist = 9e+11f;
+        if (arc.Loading()) {
+            Child[i].numBlockers = 0;
 
-	if( !maxPath )
-		maxPath = 9e+11f;
-
-	findFrame++;
-	open = NULL;
-
-	path_startdir[ 0 ] = Node->origin[ 0 ] - start[ 0 ];
-	path_startdir[ 1 ] = Node->origin[ 1 ] - start[ 1 ];
-
-	Node->g = VectorNormalize2D( path_startdir );
-
-	path_totaldir[ 0 ] = end[ 0 ] - start[ 0 ];
-	path_totaldir[ 1 ] = end[ 1 ] - start[ 1 ];
-
-	Node->h = VectorNormalize2D( path_totaldir );
-	Node->inopen = true;
-	Node->Parent = NULL;
-	Node->m_Depth = 3;
-	Node->m_PathPos = start;
-	Node->findCount = findFrame;
-	Node->PrevNode = NULL;
-	Node->NextNode = NULL;
-
-	open = Node;
-
-	while( 1 )
-	{
-		Node = open;
-		Node->inopen = false;
-
-		open = Node->NextNode;
-		if( open )
-			open->PrevNode = NULL;
-
-		if( Node == to )
-			break;
-
-		for( i = Node->numChildren - 1; i >= 0; i-- )
-		{
-			vec2_t vDist;
-
-			pathway = &Node->Child[ i ];
-
-			NewNode = pathnodes[ pathway->node ];
-
-			if( vLeashHome )
-			{
-				vDist[ 0 ] = pathway->pos2[ 0 ] - vLeashHome[ 0 ];
-				vDist[ 1 ] = pathway->pos2[ 1 ] - vLeashHome[ 1 ];
-			}
-
-			if( !vLeashHome || VectorLength2DSquared( vDist ) <= fLeashDistSquared )
-			{
-				g = ( int )( pathway->dist + Node->g + 1.0f );
-
-				if( NewNode->findCount == findFrame )
-				{
-					if( g >= NewNode->g )
-						continue;
-
-					if( NewNode->inopen )
-					{
-						NewNode->inopen = false;
-						next = NewNode->NextNode;
-						prev = NewNode->PrevNode;
-
-						if( next )
-							next->PrevNode = prev;
-
-						if( prev )
-							prev->NextNode = next;
-						else
-							open = next;
-					}
-				}
-
-				delta[ 0 ] = end[ 0 ] - pathway->pos2[ 0 ];
-				delta[ 1 ] = end[ 1 ] - pathway->pos2[ 1 ];
-
-				NewNode->h = VectorLength2D( delta );
-
-				f = ( int )( ( float )g + NewNode->h );
-
-				if( f >= maxPath )
-				{
-					last_error = "specified path distance exceeded";
-					return 0;
-				}
-
-				if( pathway->fallheight <= fallheight )
-				{
-					NewNode->f = f;
-					NewNode->pathway = i;
-					NewNode->g = g;
-					NewNode->Parent = Node;
-					NewNode->m_Depth = Node->m_Depth + 1;
-					NewNode->inopen = true; 
-					NewNode->m_PathPos = pathway->pos2;
-					NewNode->findCount = findFrame;
-
-					if( !open )
-					{
-						NewNode->NextNode = NULL;
-						NewNode->PrevNode = NULL;
-						open = NewNode;
-						continue;
-					}
-
-					if( open->f >= f )
-					{
-						NewNode->PrevNode = NULL;
-						NewNode->NextNode = open;
-
-						open->PrevNode = NewNode;
-						open = NewNode;
-						continue;
-					}
-
-					prev = open;
-					next = open->NextNode;
-					while( next && next->f < f )
-					{
-						prev = next;
-						next = next->NextNode;
-					}
-
-					NewNode->NextNode = next;
-					if( next )
-						next->PrevNode = NewNode;
-					prev->NextNode = NewNode;
-					NewNode->PrevNode = prev;
-				}
-			}
-		}
-
-		if( !open )
-		{
-			last_error = "unreachable path";
-			return 0;
-		}
-	}
-
-	path_start = start;
-	path_end = end;
-
-	return Node->m_Depth;
+            for (int j = 0; j < ARRAY_LEN(Child[i].badPlaceTeam); j++) {
+                Child[i].badPlaceTeam[j] = 0;
+            }
+        }
+    }
 }
 
-int PathSearch::FindPathAway
-	(
-	float *start,
-	float *avoid,
-	float *vPreferredDir,
-	Entity *ent,
-	float fMinSafeDist,
-	float *vLeashHome,
-	float fLeashDistSquared,
-	int fallheight
-	)
+void PathNode::ArchiveDynamic(Archiver& arc)
 {
-	int i;
-	int g;
-	PathNode *NewNode;
-	pathway_t *pathway;
-	PathNode *prev;
-	PathNode *next;
-	int f;
-	float fBias;
-	vec2_t delta;
-	float fMinSafeDistSquared = fMinSafeDist * fMinSafeDist;
+    SimpleEntity::SimpleArchive(arc);
 
-	if( ent )
-	{
-		if( ent->IsSubclassOfActor() )
-		{
-			Node = NearestStartNode( start, ( SimpleActor * )ent );
-		}
-		else
-		{
-			Node = DebugNearestStartNode( start, ent );
-		}
-	}
-	else
-	{
-		Node = DebugNearestStartNode( start );
-	}
+    arc.ArchiveObjectPosition(this);
+    arc.ArchiveSafePointer(&pLastClaimer);
+    arc.ArchiveInteger(&iAvailableTime);
+    arc.ArchiveInteger(&numChildren);
 
-	if( !Node )
-	{
-		last_error = "couldn't find start node";
-		return 0;
-	}
-
-	findFrame++;
-	open = NULL;
-
-	path_startdir[ 0 ] = Node->origin[ 0 ] - start[ 0 ];
-	path_startdir[ 1 ] = Node->origin[ 1 ] - start[ 1 ];
-
-	delta[ 0 ] = start[ 0 ] - avoid[ 0 ];
-	delta[ 1 ] = start[ 1 ] - avoid[ 1 ];
-
-	fBias = VectorLength2D( vPreferredDir );
-
-	Node->inopen = true;
-	Node->g = VectorNormalize2D( path_startdir );
-	Node->h = fMinSafeDist - VectorNormalize2D( delta );
-	Node->h += fBias - DotProduct2D( vPreferredDir, delta );
-	Node->Parent = NULL;
-	Node->m_Depth = 2;
-	Node->findCount = findFrame;
-	Node->PrevNode = NULL;
-	Node->NextNode = NULL;
-	Node->m_PathPos = start;
-
-	open = Node;
-
-	while( 1 )
-	{
-		Node = open;
-		Node->inopen = false;
-
-		open = Node->NextNode;
-
-		if( open )
-			open->PrevNode = NULL;
-
-		delta[ 0 ] = Node->m_PathPos[ 0 ] - avoid[ 0 ];
-		delta[ 1 ] = Node->m_PathPos[ 1 ] - avoid[ 1 ];
-
-		if( VectorLength2DSquared( delta ) >= fMinSafeDistSquared )
-			break;
-
-		for( i = Node->numChildren - 1; i >= 0; i-- )
-		{
-			vec2_t vDist;
-
-			pathway = &Node->Child[ i ];
-			NewNode = pathnodes[ pathway->node ];
-
-			if( vLeashHome )
-			{
-				vDist[ 0 ] = pathway->pos2[ 0 ] - vLeashHome[ 0 ];
-				vDist[ 1 ] = pathway->pos2[ 1 ] - vLeashHome[ 1 ];
-			}
-
-			if( !vLeashHome || VectorLength2DSquared( vDist ) <= fLeashDistSquared )
-			{
-				g = ( int )( pathway->dist + Node->g + 1.0f );
-
-				if( NewNode->findCount == findFrame )
-				{
-					if( g >= NewNode->g )
-						continue;
-
-					if( NewNode->inopen )
-					{
-						NewNode->inopen = false;
-						next = NewNode->NextNode;
-						prev = NewNode->PrevNode;
-
-						if( next )
-							next->PrevNode = prev;
-
-						if( prev )
-							prev->NextNode = next;
-						else
-							open = next;
-					}
-				}
-
-				delta[ 0 ] = pathway->pos2[ 0 ] - avoid[ 0 ];
-				delta[ 1 ] = pathway->pos2[ 1 ] - avoid[ 1 ];
-
-				NewNode->h = fMinSafeDist - VectorNormalize2D( delta );
-				f = NewNode->h + fBias - DotProduct2D( vPreferredDir, delta );
-				NewNode->h += f;
-
-				if( pathway->fallheight <= fallheight )
-				{
-					NewNode->Parent = Node;
-					NewNode->m_Depth = Node->m_Depth + 1;
-					NewNode->g = g;
-					NewNode->pathway = i;
-					NewNode->inopen = true;
-					NewNode->m_PathPos = pathway->pos2;
-					NewNode->findCount = findFrame;
-					NewNode->f = f;
-
-					if( !open )
-					{
-						NewNode->NextNode = NULL;
-						NewNode->PrevNode = NULL;
-						open = NewNode;
-						continue;
-					}
-
-					if( open->f >= f )
-					{
-						NewNode->PrevNode = NULL;
-						NewNode->NextNode = open;
-
-						open->PrevNode = NewNode;
-						open = NewNode;
-						continue;
-					}
-
-					prev = open;
-					next = open->NextNode;
-					while( next && next->f < f )
-					{
-						prev = next;
-						next = next->NextNode;
-					}
-
-					NewNode->NextNode = next;
-					if( next )
-						next->PrevNode = NewNode;
-					prev->NextNode = NewNode;
-					NewNode->PrevNode = prev;
-				}
-			}
-		}
-
-		if( !open )
-		{
-			last_error = "unreachable path";
-			return 0;
-		}
-	}
-
-	path_start = start;
-	return Node->m_Depth;
+    if (numChildren != virtualNumChildren) {
+        for (int i = 0; i < virtualNumChildren; i++) {
+            arc.ArchiveByte(&Child[i].numBlockers);
+            arc.ArchiveShort(&Child[i].node);
+            arc.ArchiveShort(&Child[i].fallheight);
+            arc.ArchiveFloat(&Child[i].dist);
+            arc.ArchiveVec2(Child[i].dir);
+            arc.ArchiveVec3(Child[i].pos1);
+            arc.ArchiveVec3(Child[i].pos2);
+        }
+    }
 }
 
-int PathSearch::FindPathNear
-	(
-	float *start,
-	float *end,
-	Entity *ent,
-	float maxPath,
-	float fRadiusSquared,
-	float *vLeashHome,
-	float fLeashDistSquared,
-	int fallheight
-	)
+int PathSearch::NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, vec3_t *deltas)
 {
-	int i;
-	int g;
-	PathNode *NewNode;
-	pathway_t *pathway;
-	PathNode *prev;
-	PathNode *next;
-	int f;
-	vec2_t dir;
-	vec2_t delta;
+    vec3_t    delta;
+    PathNode *node;
+    float     dist;
+    int       n = 0;
+    int       i;
+    int       j;
+    float     node_dist[128];
+    int       node_count;
 
-	if( ent )
-	{
-		if( ent->IsSubclassOfActor() )
-		{
-			Node = NearestStartNode( start, ( SimpleActor * )ent );
-		}
-		else
-		{
-			Node = DebugNearestStartNode( start, ent );
-		}
-	}
-	else
-	{
-		Node = DebugNearestStartNode( start );
-	}
+    node_count = cell->numnodes;
 
-	if( !Node )
-	{
-		last_error = "no start node";
-		return 0;
-	}
+    for (i = 0; i < node_count; i++) {
+        node = pathnodes[cell->nodes[i]];
+        if (!node) {
+            continue;
+        }
 
-	total_dist = 9e11f;
+        if (pos[2] > node->origin[2] + 94.0f) {
+            continue;
+        }
 
-	if( !maxPath )
-		maxPath = 9e11f;
+        if (pos[2] + 94.0f < node->origin[2]) {
+            continue;
+        }
 
-	findFrame++;
-	open = NULL;
+        VectorSubtract(node->origin, pos, delta);
+        VectorCopy(delta, deltas[i]);
 
-	path_startdir[ 0 ] = Node->origin[ 0 ] - start[ 0 ];
-	path_startdir[ 1 ] = Node->origin[ 1 ] - start[ 1 ];
+        dist = VectorLengthSquared(delta);
 
-	dir[ 0 ] = end[ 0 ] - start[ 0 ];
-	dir[ 1 ] = end[ 1 ] - start[ 1 ];
+        for (j = n; j > 0; j--) {
+            if (dist >= node_dist[j - 1]) {
+                break;
+            }
 
-	Node->inopen = true;
-	Node->g = VectorNormalize2D( path_startdir );
-	Node->h = VectorNormalize2D( delta );
-	Node->Parent = NULL;
-	Node->m_Depth = 3;
-	Node->findCount = findFrame;
-	Node->PrevNode = NULL;
-	Node->NextNode = NULL;
-	Node->m_PathPos = start;
+            node_dist[j] = node_dist[j - 1];
+            nodes[j]     = nodes[j - 1];
+        }
 
-	open = Node;
+        n++;
+        nodes[j]     = i;
+        node_dist[j] = dist;
+    }
 
-	while( 1 )
-	{
-		Node = open;
-		Node->inopen = false;
-
-		open = Node->NextNode;
-
-		if( open )
-			open->PrevNode = NULL;
-
-		delta[ 0 ] = end[ 0 ] - Node->m_PathPos[ 0 ];
-		delta[ 1 ] = end[ 1 ] - Node->m_PathPos[ 1 ];
-
-		if( fRadiusSquared >= VectorLength2DSquared( delta ) )
-			break;
-
-		for( i = Node->numChildren - 1; i >= 0; i-- )
-		{
-			pathway = &Node->Child[ i ];
-			NewNode = pathnodes[ pathway->node ];
-
-			g = ( int )( pathway->dist + Node->g + 1.0f );
-
-			if( NewNode->findCount == findFrame )
-			{
-				if( g >= NewNode->g )
-					continue;
-
-				if( NewNode->inopen )
-				{
-					NewNode->inopen = false;
-					next = NewNode->NextNode;
-					prev = NewNode->PrevNode;
-
-					if( next )
-						next->PrevNode = prev;
-
-					if( prev )
-						prev->NextNode = next;
-					else
-						open = next;
-				}
-			}
-
-			delta[ 0 ] = end[ 0 ] - pathway->pos2[ 0 ];
-			delta[ 1 ] = end[ 1 ] - pathway->pos2[ 1 ];
-
-			NewNode->h = VectorLength2D( delta );
-			f = ( int )( ( float )g + NewNode->h );
-
-			if( f >= maxPath )
-			{
-				last_error = "specified path distance exceeded";
-				return 0;
-			}
-
-			if( pathway->fallheight <= fallheight )
-			{
-				NewNode->f = f;
-				NewNode->pathway = i;
-				NewNode->g = g;
-				NewNode->Parent = Node;
-				NewNode->m_Depth = Node->m_Depth + 1;
-				NewNode->inopen = true;
-				NewNode->m_PathPos = pathway->pos2;
-				NewNode->findCount = findFrame;
-
-				if( !open )
-				{
-					NewNode->NextNode = NULL;
-					NewNode->PrevNode = NULL;
-					open = NewNode;
-					continue;
-				}
-
-				if( open->f >= f )
-				{
-					NewNode->PrevNode = NULL;
-					NewNode->NextNode = open;
-
-					open->PrevNode = NewNode;
-					open = NewNode;
-					continue;
-				}
-
-				prev = open;
-				next = open->NextNode;
-				while( next && next->f < f )
-				{
-					prev = next;
-					next = next->NextNode;
-				}
-
-				NewNode->NextNode = next;
-				if( next )
-					next->PrevNode = NewNode;
-				prev->NextNode = NewNode;
-				NewNode->PrevNode = prev;
-			}
-		}
-
-		if( !open )
-		{
-			last_error = "unreachable path";
-			return 0;
-		}
-	}
-
-	path_start = start;
-	path_end = end;
-	return Node->m_Depth;
+    return n;
 }
 
-int	node_compare(const void *pe1, const void *pe2)
+PathNode *PathSearch::FindNearestCover(Entity *pEnt, Vector& vPos, Entity *pEnemy)
 {
-	nodeinfo *Pe1 = (nodeinfo *) pe1;
-	nodeinfo *Pe2 = (nodeinfo *) pe2;
-	int iConcealment;
-
-	iConcealment = (Pe1->pNode->nodeflags & 0xB0) != 0;
-	if (Pe2->pNode->nodeflags & 0xB0)
-		--iConcealment;
-	return ((Pe1->fDistSquared)
-		+ (iConcealment << 23)
-		+ (((Pe1->pNode->nodeflags & 8) - (Pe2->pNode->nodeflags & 8)) << 21)
-		- (Pe2->fDistSquared));
-
-}
-PathNode *PathSearch::FindCornerNodeForWall
-	(
-	float *start,
-	float *end,
-	SimpleActor *ent,
-	float maxPath,
-	float *plane
-	)
-{
-	PathNode *ParentNode;
-	PathNode *OpenNode;
-	int i;
-
-	Node = NearestStartNode(start, ent);
-	if (!Node)
-	{
-		last_error = "couldn't find start node";
-		return NULL;
-	}
-
-	if (DotProduct(start, plane) - plane[3] < 0.0)
-	{
-		last_error = "starting point is already behind the wall";
-		return NULL;
-	}
-
-	if (DotProduct(plane, end) - plane[3] > 0.0)
-	{
-		last_error = "end point is in front of the wall";
-		return NULL;
-	}
-
-	total_dist = 1.0e12f;
-
-	if (maxPath == 0.0)
-		maxPath = 1.0e12f;
-
-	findFrame++;
-	open = NULL;
-
-	VectorSub2D(Node->origin, start, path_startdir);
-	Node->g = VectorNormalize2D(path_startdir);
-
-	VectorSub2D(end, start, path_totaldir);
-	Node->h = VectorNormalize2D(path_totaldir);
-
-	Node->inopen = true;
-
-	Node->Parent = NULL;
-
-	Node->m_Depth = 3;
-	Node->m_PathPos = start;
-	Node->findCount = findFrame;
-	Node->PrevNode = 0;
-	Node->NextNode = 0;
-
-	OpenNode = Node;
-	open = Node;
-
-	if (!open)
-	{
-		last_error = "unreachable path";
-		return NULL;
-	}
-
-	while (true)
-	{
-		Node = OpenNode;
-
-		Node->inopen = false;
-
-		open = Node->NextNode;
-		if (open)
-		{
-			open->PrevNode = NULL;
-		}
-
-		ParentNode = Node->Parent;
-
-		if (ParentNode
-			&& DotProduct(plane, Node->m_PathPos) - plane[3] < 0.0)
-		{
-			vec2_t delta;
-			VectorSub2D(ParentNode->m_PathPos, start, delta);
-			if (VectorLength2DSquared(delta) < Square(16))
-				ParentNode = Node;
-			return ParentNode;
-		}
-
-		i = Node->numChildren;
-		if (i)
-			break;
-weird_lbl:
-		OpenNode = open;
-		if (!OpenNode)
-		{
-			last_error = "unreachable path";
-			return NULL;
-		}
-	}
-
-	int f, g, h;
-	while (true)
-	{
-		pathway_t *pathway = &Node->Child[--i];
-		PathNode *pSomeNode = PathSearch::pathnodes[pathway->node];
-		g = (pathway->dist + Node->g + 1.0);
-		if (pSomeNode->findCount == PathSearch::findFrame)
-		{
-			if (g >= pSomeNode->g)
-			{
-				if (i == 0)
-					goto weird_lbl;
-
-				continue;
-			}
-			if (pSomeNode->inopen)
-			{
-				pSomeNode->inopen = false;
-
-				if (pSomeNode->NextNode)
-					pSomeNode->NextNode->PrevNode = pSomeNode->PrevNode;
-				if (pSomeNode->PrevNode)
-					pSomeNode->PrevNode->NextNode = pSomeNode->NextNode;
-				else
-					PathSearch::open = pSomeNode->NextNode;
-			}
-		}
-
-		vec2_t vDelta2;
-		VectorSub2D(end, pathway->pos1, vDelta2);
-		pSomeNode->h = h = VectorLength2D(vDelta2);
-
-		f = (h + g);
-
-		if (f >= maxPath)
-			break;
-
-		pSomeNode->f = f;
-		pSomeNode->pathway = i;
-		pSomeNode->g = g;
-		pSomeNode->Parent = Node;
-		pSomeNode->inopen = true;
-		pSomeNode->m_PathPos = pathway->pos2;
-		pSomeNode->findCount = PathSearch::findFrame;
-		pSomeNode->m_Depth = Node->m_Depth + 1;
-
-		if (!PathSearch::open)
-		{
-			pSomeNode->NextNode = NULL;
-			pSomeNode->PrevNode = NULL;
-			PathSearch::open = pSomeNode;
-			if (i == 0)
-				goto weird_lbl;
-
-			continue;
-		}
-
-		if (PathSearch::open->f == f)
-		{
-			pSomeNode->PrevNode = NULL;
-			pSomeNode->NextNode = PathSearch::open;
-			PathSearch::open->PrevNode = pSomeNode;
-			PathSearch::open = pSomeNode;
-			if (i == 0)
-				goto weird_lbl;
-
-			continue;
-		}
-		PathNode * pNextOpenNode = PathSearch::open->NextNode;
-		if (pNextOpenNode)
-		{
-			if (f > pNextOpenNode->f)
-			{
-				do 
-				{
-					pNextOpenNode = pNextOpenNode->NextNode;
-					if (!pNextOpenNode)
-						break;
-
-				} while (f > pNextOpenNode->f);
-			}
-		}
-
-		pSomeNode->NextNode = pNextOpenNode;
-
-		if (pNextOpenNode)
-			pNextOpenNode->PrevNode = pSomeNode;
-
-		pNextOpenNode->NextNode = pSomeNode;
-		pSomeNode->PrevNode = pNextOpenNode;
-
-		if (i == 0)
-			goto weird_lbl;
-	}
-	PathSearch::last_error = "specified path distance exceeded";
-	return NULL;
+    // not found in ida
+    return NULL;
 }
 
-PathNode *PathSearch::FindCornerNodeForExactPath
-	(
-	SimpleActor *pSelf,
-	Sentient *enemy,
-	float fMaxPath
-	)
+//===============
+// Added in OPM
+//===============
+
+Event EV_NavMaster_CreatePaths
+(
+    "nav_build",
+    EV_CHEAT,
+    NULL,
+    NULL,
+    "Build navigation path"
+);
+Event EV_NavMaster_SpawnNode
+(
+    "nav_create",
+    EV_CHEAT,
+    "S",
+    "type",
+    "Create a new node at the player's origin"
+);
+Event EV_NavMaster_SetNodeFlags
+(
+    "nav_node_set_type",
+    EV_CHEAT,
+    "sSS",
+    "type1 type2 ...",
+    "Set the selected node type. Type can be one of the following values:\n"
+    "- corner_left\n"
+    "- corner_right\n"
+    "- duck\n"
+    "- sniper\n"
+    "- concealment\n"
+    "- cover\n"
+    "- crate\n"
+    "- none\n"
+);
+Event EV_NavMaster_SetNodeTargetName
+(
+    "nav_node_set_targetname",
+    EV_CHEAT,
+    "S",
+    "targetname",
+    "Set the selected node target name"
+);
+Event EV_NavMaster_SetNodeTarget
+(
+    "nav_node_set_target",
+    EV_CHEAT,
+    "S",
+    "target",
+    "Set the selected node target"
+);
+Event EV_NavMaster_RemoveNode
+(
+    "nav_node_remove",
+    EV_CHEAT,
+    NULL,
+    NULL,
+    "Delete the selected node"
+);
+
+CLASS_DECLARATION(Listener, NavMaster, NULL) {
+    {&EV_NavMaster_CreatePaths,       &NavMaster::CreatePaths      },
+    {&EV_NavMaster_SpawnNode,         &NavMaster::CreateNode       },
+    {&EV_NavMaster_SetNodeFlags,      &NavMaster::SetNodeFlags     },
+    {&EV_NavMaster_SetNodeTargetName, &NavMaster::SetNodeTargetName},
+    {&EV_NavMaster_SetNodeTarget,     &NavMaster::SetNodeTarget    },
+    {&EV_NavMaster_RemoveNode,        &NavMaster::RemoveNode       },
+    {NULL,                            NULL                         }
+};
+
+NavMaster navMaster;
+
+NavMaster::NavMaster() {}
+
+void NavMaster::Init()
 {
-	PathNode *pPathNode[4096];
+    G_CreateMaster("nav", this);
 
-	if (!PathSearch::FindPath(enemy->origin, pSelf->origin,	pSelf, fMaxPath, 0, 0.0, 100))
-		return NULL;
-
-	size_t iDepth = 0;
-	for (PathNode* pParentNode = Node->Parent; pParentNode; pParentNode = pParentNode->Parent, iDepth++)
-	{
-		pPathNode[iDepth] = pParentNode;
-	}
-
-	Node = pPathNode[iDepth -1];
-
-
-	if (iDepth == 0)
-	{
-		return NULL;
-	}
-	size_t i;
-	for (i = 0; i < iDepth; i += 2)
-	{
-		if (!G_SightTrace(
-			pSelf->EyePosition(),
-			vec_zero,
-			vec_zero,
-			pSelf->EyePosition() - pSelf->origin + pPathNode[i]->m_PathPos,
-			pSelf,
-			enemy,
-			0x2040B19, 
-			0,
-			"FindCornerNodeFoExactPath 1"))
-		{
-			break;
-		}
-	}
-
-	size_t index = i - 1;
-	if (index < iDepth)
-	{
-		if (index)
-		{
-			if (!G_SightTrace(
-				pSelf->EyePosition(),
-				vec_zero,
-				vec_zero,
-				pSelf->EyePosition() - pSelf->origin + pPathNode[i]->m_PathPos,
-				pSelf,
-				enemy,
-				0x2040B19,
-				0,
-				"FindCornerNodeFoExactPath 2"))
-			{
-				index--;
-			}
-		}
-	}
-	else
-	{
-		index = iDepth - 1;
-	}
-
-	return pPathNode[index];
+    if (ai_editmode->integer) {
+        // show routes by default
+        gi.cvar_set("ai_showroutes", "1");
+        gi.cvar_set("ai_shownode", "30");
+    }
 }
 
-int PathSearch::FindPotentialCover
-	(
-	SimpleActor *pEnt,
-	Vector& vPos,
-	Entity *pEnemy,
-	PathNode **ppFoundNodes,
-	int iMaxFind
-	)
+void NavMaster::CreatePaths(Event *ev)
 {
-	Actor *pSelf = (Actor *)pEnt;
-	PathNode *pNode;
-	Vector delta;
-	int nNodes = 0;
-	nodeinfo nodes[MAX_PATHNODES];
-
-	for (int i = 0; i < nodecount; i++)
-	{
-		pNode = pathnodes[i];
-		if (pNode && pNode->nodeflags & AI_SNIPER)
-		{
-			if (pNode->pLastClaimer == pSelf || (pNode->iAvailableTime && level.inttime >= pNode->iAvailableTime) || (pNode->pLastClaimer == NULL))
-			{
-				delta = pNode->origin - pSelf->m_vHome;
-				if (delta.lengthSquared() <= pSelf->m_fLeashSquared)
-				{
-					delta = pNode->origin - pEnemy->origin;
-					if (delta.lengthSquared() >= pSelf->m_fMinDistanceSquared && delta.lengthSquared() <= pSelf->m_fMaxDistanceSquared)
-					{
-						delta = pNode->origin - pSelf->origin;
-						nodes[nNodes].pNode = pNode;
-						nodes[nNodes].fDistSquared = delta.lengthSquared();
-						nNodes++;
-					}
-				}
-			}
-		}
-	}
-
-	if (nNodes)
-	{
-		qsort(nodes, nNodes, sizeof(nodeinfo), node_compare);
-
-		if (nNodes > iMaxFind)
-			nNodes = iMaxFind;
-
-		if (nNodes > 0)
-		{
-			pNode = ppFoundNodes[nNodes - 1];
-
-			for (int i = 0; i < nNodes; i++)
-			{
-				pNode = nodes[i].pNode;
-				pNode--;
-			}
-		}
-
-	}
-	return nNodes;
+    if (!ai_editmode->integer) {
+        return;
+    }
+    PathSearch::ClearNodes();
+    PathSearch::CreatePaths();
 }
 
-void PathSearch::PlayerCover
-	(
-	Player *pPlayer
-	)
+void NavMaster::CreateNode(Event *ev)
 {
-	int i;
-	PathNode *node;
-	Vector delta;
-	Entity *pOwner;
+    str       type;
+    int       spawnflags = 0;
+    PathNode *node;
+    Entity   *ent;
 
-	for( i = 0; i < nodecount; i++ )
-	{
-		node = pathnodes[ i ];
+    if (ev->NumArgs() > 0) {
+        type       = ev->GetString(1);
+        spawnflags = GetNodeTypeFromName(type);
+        if (spawnflags == -1) {
+            ScriptError("Unrecognized node type '%s'", type.c_str());
+        }
+    }
 
-		if( !node || !( node->nodeflags & AI_COVERFLAGS ) )
-			continue;
+    ent = g_entities->entity;
+    if (!ent) {
+        return;
+    }
 
-		pOwner = node->GetClaimHolder();
+    node = new PathNode;
 
-		delta = node->origin - pPlayer->origin;
-
-		// Check if we need to cover
-		if( VectorLengthSquared( delta ) > 2304.0f )
-		{
-			if( pOwner == pPlayer )
-				node->Relinquish();
-
-			continue;
-		}
-
-		if( pOwner != pPlayer )
-		{
-			if( pOwner )
-				pOwner->PathnodeClaimRevoked( node );
-
-			// Player claim the node
-			node->Claim( pPlayer );
-		}
-	}
+    node->nodeflags = spawnflags;
+    node->setOrigin(ent->origin);
 }
 
-PathNode *PathSearch::FindNearestCover
-	(
-	SimpleActor *pEnt,
-	Vector& vPos,
-	Entity *pEnemy
-	)
+void NavMaster::SetNodeFlags(Event *ev)
 {
-	// not found in ida
-	return NULL;
+    str type;
+    str typelist;
+    int spawnflags;
+    int i;
+
+    CheckNodeSelected();
+
+    if (ev->NumArgs() < 1) {
+        ScriptError("A type is required");
+        return;
+    }
+
+    spawnflags = 0;
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        int flags;
+
+        type = ev->GetString(i);
+
+        flags = GetNodeTypeFromName(type);
+        if (flags == -1) {
+            ScriptError("Unrecognized node type '%s'", type.c_str());
+        }
+
+        spawnflags |= flags;
+
+        if (i != 1) {
+            typelist += ", ";
+        }
+        typelist += "'" + type + "'";
+    }
+
+    selectedNode->nodeflags = spawnflags;
+
+    gi.Printf("Node %d set type %s\n", selectedNode->nodenum, typelist.c_str());
 }
 
-PathNode *PathSearch::FindNearestSniperNode
-	(
-	SimpleActor *pEnt,
-	Vector& vPos,
-	Entity *pEnemy
-	)
+void NavMaster::SetNodeTargetName(Event *ev)
 {
-	Actor *pSelf = (Actor *)pEnt;
-	PathNode *pNode;
-	Vector delta;
-	int nNodes = 0;
-	nodeinfo nodes[MAX_PATHNODES];
-	
-	for (int i = 0; i < nodecount; i++)
-	{
-		pNode = pathnodes[i];
-		if (pNode && pNode->nodeflags & AI_SNIPER)
-		{
-			if (pNode->pLastClaimer == pSelf || (pNode->iAvailableTime && level.inttime >= pNode->iAvailableTime) || (pNode->pLastClaimer == NULL))
-			{
-				delta = pNode->origin - pSelf->m_vHome;
-				if (delta.lengthSquared() <= pSelf->m_fLeashSquared)
-				{
-					delta = pNode->origin - pEnemy->origin;
-					if (delta.lengthSquared() >= pSelf->m_fMinDistanceSquared && delta.lengthSquared() <= pSelf->m_fMaxDistanceSquared)
-					{
-						delta = pNode->origin - pSelf->origin;
-						nodes[nNodes].pNode = pNode;
-						nodes[nNodes].fDistSquared = delta.lengthSquared();
-						nNodes++;
-					}
-				}
-			}
-		}
-	}
+    CheckNodeSelected();
 
-	if (nNodes == 0)
-	{
-		return NULL;
-	}
+    selectedNode->targetname = ev->GetString(1);
 
-	qsort(nodes, nNodes, sizeof(nodeinfo), node_compare);
-
-	if (nNodes <= 0)
-		return NULL;
-
-	for (int i = 0; i < nNodes; i++)
-	{
-		pNode = nodes[i].pNode;
-		if (pSelf->CanSeeFrom(pSelf->EyePosition() + pNode->origin, pEnemy))
-		{
-			return pNode;
-		}
-		
-		pNode->iAvailableTime = level.inttime + 5000;
-		pNode->pLastClaimer = NULL;
-	}
-
-	return NULL;
+    gi.Printf("Node %d got new targetname '%s'\n", selectedNode->nodenum, selectedNode->targetname.c_str());
 }
 
-int PathSearch::NearestNodeSetup
-	(
-	vec3_t pos,
-	MapCell *cell,
-	int *nodes,
-	vec3_t *deltas
-	)
+void NavMaster::SetNodeTarget(Event *ev)
 {
-	vec3_t delta;
-	PathNode *node;
-	float dist;
-	int n = 0;
-	int i;
-	int j;
-	float node_dist[ 128 ];
-	int node_count;
+    CheckNodeSelected();
 
-	node_count = cell->numnodes;
+    selectedNode->target = ev->GetString(1);
 
-	for( i = 0; i < node_count; i++ )
-	{
-		node = pathnodes[ cell->nodes[ i ] ];
-
-		if( pos[ 2 ] > node->origin[ 2 ] + 94.0f )
-			continue;
-
-		if( node->origin[ 2 ] > pos[ 2 ] + 94.0f )
-			continue;
-
-		delta[ 0 ] = node->origin[ 0 ] - pos[ 0 ];
-		delta[ 1 ] = node->origin[ 1 ] - pos[ 1 ];
-		delta[ 2 ] = node->origin[ 2 ] - pos[ 2 ];
-
-		VectorCopy( delta, deltas[ i ] );
-
-		dist = VectorLengthSquared( delta );
-
-		for( j = n; j > 0; j-- )
-		{
-			if( dist >= node_dist[ j - 1 ] )
-				break;
-
-			node_dist[ j ] = node_dist[ j - 1 ];
-			nodes[ j ] = nodes[ j - 1 ];
-		}
-
-		n++;
-		nodes[ j ] = i;
-		node_dist[ j ] = dist;
-	}
-
-	return n;
+    gi.Printf("Node %d got new target '%s'\n", selectedNode->nodenum, selectedNode->target.c_str());
 }
 
-void PathSearch::Init
-	(
-	void
-	)
+void NavMaster::RemoveNode(Event *ev)
 {
-	ai_showroutes				= gi.Cvar_Get( "ai_showroutes", "0", 0 );
-	ai_showroutes_distance		= gi.Cvar_Get( "ai_showroutes_distance", "1000", 0 );
-	ai_shownodenums				= gi.Cvar_Get( "ai_shownodenums", "0", 0 );
-	ai_shownode					= gi.Cvar_Get( "ai_shownode", "0", 0 );
-	ai_showallnode				= gi.Cvar_Get( "ai_showallnode", "0", 0 );
-	ai_showpath					= gi.Cvar_Get( "ai_showpath", "0", 0 );
-	ai_fallheight				= gi.Cvar_Get( "ai_fallheight", "96", 0 );
-	ai_debugpath				= gi.Cvar_Get( "ai_debugpath", "0", 0 );
-	ai_pathchecktime			= gi.Cvar_Get( "ai_pathchecktime", "1.5", CVAR_CHEAT );
-	ai_pathcheckdist			= gi.Cvar_Get( "ai_pathcheckdist", "4096", CVAR_CHEAT );
+    str targetname;
+    int num;
+
+    CheckNodeSelected();
+
+    num = selectedNode->nodenum;
+    targetname = selectedNode->targetname;
+    AI_RemoveNode(selectedNode);
+
+    gi.Printf("Node %d removed\n", num, targetname.c_str());
+}
+
+void NavMaster::CheckNodeSelected()
+{
+    if (!selectedNode) {
+        ScriptError("No node selected");
+    }
+}
+
+void NavMaster::Frame()
+{
+    float  phase;
+    vec3_t color;
+
+    if (!ai_editmode->integer) {
+        return;
+    }
+
+    phase = fmod(level.time * 2, 2.0);
+    if (phase > 1.0) {
+        phase = 2.0 - phase;
+    }
+    //phase = (sin(level.time * 5) + 1) / 2.0;
+
+    selectedNode = DetermineCurrentNode();
+    if (selectedNode) {
+        Vector mins, maxs;
+        Vector org;
+        vec3_t colorPhase;
+
+        GetPathnodeColor(selectedNode->nodeflags, color);
+
+        colorPhase[0] = 0;
+        colorPhase[1] = (1.0 - phase) * 0.5;
+        colorPhase[2] = phase;
+        color[1]      = Q_max(color[1], colorPhase[1]) - Q_min(color[1], colorPhase[1]);
+        color[2]      = Q_max(color[2], colorPhase[2]) - Q_min(color[2], colorPhase[2]);
+
+        mins = Vector(-24, -24, -24);
+        maxs = Vector(24, 24, 24);
+        org  = selectedNode->centroid;
+        org.z += 24;
+
+        G_DebugBBox(org, mins, maxs, color[0], color[1], color[2], 1.0);
+    }
+}
+
+PathNode *NavMaster::DetermineCurrentNode() const
+{
+    Entity   *ent;
+    PathNode *bestnode;
+    float     bestdist;
+    Vector    delta;
+    Vector    dir;
+    int       i;
+
+    ent = g_entities->entity;
+    if (!ent) {
+        return NULL;
+    }
+
+    if (ent->IsSubclassOfSentient()) {
+        Sentient    *sent       = static_cast<Sentient *>(ent);
+        const Vector viewAngles = sent->GetViewAngles();
+
+        Vector forward;
+        viewAngles.AngleVectorsLeft(&dir);
+    } else {
+        dir = ent->orientation[0];
+    }
+
+    bestdist = 1e+12f;
+    bestnode = NULL;
+
+    for (i = 0; i < PathSearch::nodecount; i++) {
+        PathNode *node = PathSearch::pathnodes[i];
+        float     dist;
+
+        if (!node) {
+            continue;
+        }
+
+        delta = node->centroid - ent->centroid;
+        if (abs(delta.z) > (MAXS_Z * 2)) {
+            continue;
+        }
+
+        if (!FovCheck(dir, delta, 45)) {
+            continue;
+        }
+
+        dist = delta.lengthSquared();
+        if (dist < bestdist) {
+            bestdist = dist;
+            bestnode = node;
+        }
+    }
+
+    return bestnode;
+}
+
+bool NavMaster::FovCheck(const Vector& dir, const Vector& delta, float fov) const
+{
+    float fovdot   = cos(DEG2RAD(fov / 2.f));
+    float deltadot = DotProduct(delta, dir);
+
+    if (fovdot < 0.0f) {
+        if (deltadot >= 0.0f) {
+            return true;
+        }
+
+        return VectorLengthSquared(delta) * Square(fovdot) > Square(deltadot);
+    } else {
+        if (deltadot < 0.0f) {
+            return false;
+        }
+
+        return VectorLengthSquared(delta) * Square(fovdot) < Square(deltadot);
+    }
 }
 
 Event EV_AttractiveNode_GetPriority
-	(
-	"priority",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the node priority",
-	EV_GETTER
-	);
-
+(
+    "priority",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the node priority",
+    EV_GETTER
+);
 Event EV_AttractiveNode_SetPriority
-	(
-	"priority",
-	EV_DEFAULT,
-	"i",
-	"priority",
-	"Set the node priority",
-	EV_SETTER
-	);
-
+(
+    "priority",
+    EV_DEFAULT,
+    "i",
+    "priority",
+    "Set the node priority",
+    EV_SETTER
+);
 Event EV_AttractiveNode_GetDistance
-	(
-	"max_dist",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the max distance for this node",
-	EV_GETTER
-	);
-
+(
+    "max_dist",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the max distance for this node",
+    EV_GETTER
+);
 Event EV_AttractiveNode_SetDistance
-	(
-	"max_dist",
-	EV_DEFAULT,
-	"f",
-	"max_dist",
-	"Set the max distance for this node to be attracted, -1 for unlimited distance.",
-	EV_SETTER
-	);
-
+(
+    "max_dist",
+    EV_DEFAULT,
+    "f",
+    "max_dist",
+    "Set the max distance for this node to be attracted, -1 for unlimited distance.",
+    EV_SETTER
+);
 Event EV_AttractiveNode_GetStayTime
-	(
-	"stay_time",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the max stay time for this node",
-	EV_GETTER
-	);
-
+(
+    "stay_time",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the max stay time for this node",
+    EV_GETTER
+);
 Event EV_AttractiveNode_SetStayTime
-	(
-	"stay_time",
-	EV_DEFAULT,
-	"f",
-	"stay_time",
-	"Set the maximum stay time AI will stay on this node",
-	EV_SETTER
-	);
-
+(
+    "stay_time",
+    EV_DEFAULT,
+    "f",
+    "stay_time",
+    "Set the maximum stay time AI will stay on this node",
+    EV_SETTER
+);
 Event EV_AttractiveNode_GetRespawnTime
-	(
-	"respawn_time",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the how much time will this node re-attract already attracted AIs",
-	EV_GETTER
-	);
-
+(
+    "respawn_time",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the how much time will this node re-attract already attracted AIs",
+    EV_GETTER
+);
 Event EV_AttractiveNode_SetRespawnTime
-	(
-	"respawn_time",
-	EV_DEFAULT,
-	"f",
-	"respawn_time",
-	"Set the how much time will this node re-attract already attracted AIs. The minimum required value is 1, otherwise AI will get stuck.",
-	EV_SETTER
-	);
-
+(
+    "respawn_time",
+    EV_DEFAULT,
+    "f",
+    "respawn_time",
+    "Set the how much time will this node re-attract already attracted AIs. The minimum required value is 1, otherwise "
+    "AI will get stuck.",
+    EV_SETTER
+);
 Event EV_AttractiveNode_GetTeam
-	(
-	"team",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the attractive node team. 'none' for no team.",
-	EV_GETTER
-	);
-
+(
+    "team",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the attractive node team. 'none' for no team.",
+    EV_GETTER
+);
 Event EV_AttractiveNode_SetTeam
-	(
-	"team",
-	EV_DEFAULT,
-	"s",
-	"team",
-	"Set the attractive node team. 'none' for no team.",
-	EV_SETTER
-	);
-
+(
+    "team",
+    EV_DEFAULT,
+    "s",
+    "team",
+    "Set the attractive node team. 'none' for no team.",
+    EV_SETTER
+);
 Event EV_AttractiveNode_SetUse
-	(
-	"setuse",
-	EV_DEFAULT,
-	"b",
-	"use",
-	"Set if AI should use or not"
-	);
+(
+    "setuse",
+    EV_DEFAULT,
+    "b",
+    "use",
+    "Set if AI should use or not"
+);
 
-CLASS_DECLARATION( SimpleArchivedEntity, AttractiveNode, NULL )
-{
-	{ &EV_AttractiveNode_GetPriority,				&AttractiveNode::GetPriority },
-	{ &EV_AttractiveNode_SetPriority,				&AttractiveNode::SetPriority },
-	{ &EV_AttractiveNode_GetDistance,				&AttractiveNode::GetDistance },
-	{ &EV_AttractiveNode_SetDistance,				&AttractiveNode::SetDistance },
-	{ &EV_AttractiveNode_GetStayTime,				&AttractiveNode::GetStayTime },
-	{ &EV_AttractiveNode_SetStayTime,				&AttractiveNode::SetStayTime },
-	{ &EV_AttractiveNode_GetRespawnTime,			&AttractiveNode::GetRespawnTime },
-	{ &EV_AttractiveNode_SetRespawnTime,			&AttractiveNode::SetRespawnTime },
-	{ &EV_AttractiveNode_GetTeam,					&AttractiveNode::GetTeam },
-	{ &EV_AttractiveNode_SetTeam,					&AttractiveNode::SetTeam },
-	{ &EV_AttractiveNode_SetUse,					&AttractiveNode::SetUse },
-	{ NULL, NULL }
+CLASS_DECLARATION(SimpleArchivedEntity, AttractiveNode, NULL) {
+    {&EV_AttractiveNode_GetPriority,    &AttractiveNode::GetPriority   },
+    {&EV_AttractiveNode_SetPriority,    &AttractiveNode::SetPriority   },
+    {&EV_AttractiveNode_GetDistance,    &AttractiveNode::GetDistance   },
+    {&EV_AttractiveNode_SetDistance,    &AttractiveNode::SetDistance   },
+    {&EV_AttractiveNode_GetStayTime,    &AttractiveNode::GetStayTime   },
+    {&EV_AttractiveNode_SetStayTime,    &AttractiveNode::SetStayTime   },
+    {&EV_AttractiveNode_GetRespawnTime, &AttractiveNode::GetRespawnTime},
+    {&EV_AttractiveNode_SetRespawnTime, &AttractiveNode::SetRespawnTime},
+    {&EV_AttractiveNode_GetTeam,        &AttractiveNode::GetTeam       },
+    {&EV_AttractiveNode_SetTeam,        &AttractiveNode::SetTeam       },
+    {&EV_AttractiveNode_SetUse,         &AttractiveNode::SetUse        },
+    {NULL,                              NULL                           }
 };
 
-Container< AttractiveNode * > attractiveNodes;
+Container<AttractiveNode *> attractiveNodes;
 
 AttractiveNode::AttractiveNode()
 {
+    m_iPriority           = 0; // set to default 0
+    m_fMaxStayTime        = 0; // set to default 0, could be just a pickup
+    m_fMaxDistance        = 1024;
+    m_fMaxDistanceSquared = m_fMaxDistance * m_fMaxDistance;
+    m_fRespawnTime        = 15.0f; // set to default 15 seconds
+    m_bUse                = false;
+    m_csTeam              = STRING_EMPTY;
+    m_iTeam               = TEAM_NONE;
 
-	m_iPriority				= 0;		// set to default 0
-	m_fMaxStayTime			= 0;		// set to default 0, could be just a pickup
-	m_fMaxDistance			= 1024;
-	m_fMaxDistanceSquared	= m_fMaxDistance * m_fMaxDistance;
-	m_fRespawnTime			= 15.0f;	// set to default 15 seconds
-	m_bUse					= false;
-	m_csTeam				= STRING_EMPTY;
-	m_iTeam					= TEAM_NONE;
-
-	attractiveNodes.AddObject( this );
+    attractiveNodes.AddObject(this);
 }
 
 AttractiveNode::~AttractiveNode()
 {
-	attractiveNodes.RemoveObject( this );
+    attractiveNodes.RemoveObject(this);
 }
 
-bool AttractiveNode::CheckTeam
-	(
-	Sentient *sent
-	)
+bool AttractiveNode::CheckTeam(Sentient *sent)
 {
-	if( !m_iTeam )
-	{
-		return true;
-	}
+    if (!m_iTeam) {
+        return true;
+    }
 
-	if( sent->IsSubclassOfPlayer() )
-	{
-		Player *p = ( Player * )sent;
+    if (sent->IsSubclassOfPlayer()) {
+        Player *p = (Player *)sent;
 
-		if( ( m_iTeam == TEAM_FREEFORALL && g_gametype->integer >= GT_TEAM ) ||
-			p->GetTeam() != m_iTeam )
-		{
-			return false;
-		}
-	}
-	else
-	{
-		if( m_iTeam == TEAM_ALLIES && sent->m_Team != TEAM_AMERICAN )
-		{
-			return false;
-		}
-		else if( m_iTeam == TEAM_AXIS && sent->m_Team != TEAM_GERMAN )
-		{
-			return false;
-		}
-	}
+        if ((m_iTeam == TEAM_FREEFORALL && g_gametype->integer >= GT_TEAM) || p->GetTeam() != m_iTeam) {
+            return false;
+        }
+    } else {
+        if (m_iTeam == TEAM_ALLIES && sent->m_Team != TEAM_AMERICAN) {
+            return false;
+        } else if (m_iTeam == TEAM_AXIS && sent->m_Team != TEAM_GERMAN) {
+            return false;
+        }
+    }
 
-	return true;
+    return true;
 }
 
-void AttractiveNode::setMaxDist
-	(
-	float dist
-	)
+void AttractiveNode::setMaxDist(float dist)
 {
-	m_fMaxDistance = dist;
+    m_fMaxDistance = dist;
 
-	if( dist < 0 )
-	{
-		m_fMaxDistanceSquared = -1;
-	}
-	else
-	{
-		m_fMaxDistanceSquared = dist * dist;
-	}
+    if (dist < 0) {
+        m_fMaxDistanceSquared = -1;
+    } else {
+        m_fMaxDistanceSquared = dist * dist;
+    }
 }
 
-void AttractiveNode::GetPriority
-	(
-	Event *ev
-	)
+void AttractiveNode::GetPriority(Event *ev)
 {
-	ev->AddInteger( m_iPriority );
+    ev->AddInteger(m_iPriority);
 }
 
-void AttractiveNode::SetPriority
-	(
-	Event *ev
-	)
+void AttractiveNode::SetPriority(Event *ev)
 {
-	m_iPriority = ev->GetInteger( 1 );
+    m_iPriority = ev->GetInteger(1);
 }
 
-void AttractiveNode::GetDistance
-	(
-	Event *ev
-	)
+void AttractiveNode::GetDistance(Event *ev)
 {
-	ev->AddFloat( m_fMaxDistance );
+    ev->AddFloat(m_fMaxDistance);
 }
 
-void AttractiveNode::SetDistance
-	(
-	Event *ev
-	)
+void AttractiveNode::SetDistance(Event *ev)
 {
-	setMaxDist( ev->GetFloat( 1 ) );
+    setMaxDist(ev->GetFloat(1));
 }
 
-void AttractiveNode::GetStayTime
-	(
-	Event *ev
-	)
+void AttractiveNode::GetStayTime(Event *ev)
 {
-	ev->AddFloat( m_fMaxStayTime );
+    ev->AddFloat(m_fMaxStayTime);
 }
 
-void AttractiveNode::SetStayTime
-	(
-	Event *ev
-	)
+void AttractiveNode::SetStayTime(Event *ev)
 {
-	m_fMaxStayTime = ev->GetFloat( 1 );
+    m_fMaxStayTime = ev->GetFloat(1);
 }
 
-void AttractiveNode::GetRespawnTime
-	(
-	Event *ev
-	)
+void AttractiveNode::GetRespawnTime(Event *ev)
 {
-	ev->AddFloat( m_fRespawnTime );
+    ev->AddFloat(m_fRespawnTime);
 }
 
-void AttractiveNode::SetRespawnTime
-	(
-	Event *ev
-	)
+void AttractiveNode::SetRespawnTime(Event *ev)
 {
-	m_fRespawnTime = ev->GetFloat( 1 );
-	if( m_fRespawnTime < 1.0f )
-	{
-		m_fRespawnTime = 1.0f;
-	}
+    m_fRespawnTime = ev->GetFloat(1);
+    if (m_fRespawnTime < 1.0f) {
+        m_fRespawnTime = 1.0f;
+    }
 }
 
-void AttractiveNode::GetTeam
-	(
-	Event *ev
-	)
+void AttractiveNode::GetTeam(Event *ev)
 {
-	ev->AddConstString( m_csTeam );
+    ev->AddConstString(m_csTeam);
 }
 
-void AttractiveNode::SetTeam
-	(
-	Event *ev
-	)
+void AttractiveNode::SetTeam(Event *ev)
 {
-	if( ev->IsNilAt( 1 ) )
-	{
-		m_csTeam = STRING_EMPTY;
-		m_iTeam = TEAM_NONE;
-		return;
-	}
+    if (ev->IsNilAt(1)) {
+        m_csTeam = STRING_EMPTY;
+        m_iTeam  = TEAM_NONE;
+        return;
+    }
 
-	m_csTeam = ev->GetConstString( 1 );
+    m_csTeam = ev->GetConstString(1);
 
-	switch( m_csTeam )
-	{
-	case STRING_EMPTY:
-		m_iTeam = TEAM_NONE;
-		break;
-	case STRING_SPECTATOR:
-		m_iTeam = TEAM_SPECTATOR;
-		break;
-	case STRING_FREEFORALL:
-		m_iTeam = TEAM_FREEFORALL;
-		break;
-	case STRING_ALLIES:
-	case STRING_AMERICAN:
-		m_iTeam = TEAM_ALLIES;
-		break;
-	case STRING_AXIS:
-	case STRING_GERMAN:
-		m_iTeam = TEAM_AXIS;
-		break;
-	default:
-		m_iTeam = TEAM_NONE;
-		ScriptError( "Invalid team %s\n", ev->GetString( 1 ).c_str() );
-	}
+    switch (m_csTeam) {
+    case STRING_EMPTY:
+        m_iTeam = TEAM_NONE;
+        break;
+    case STRING_SPECTATOR:
+        m_iTeam = TEAM_SPECTATOR;
+        break;
+    case STRING_FREEFORALL:
+        m_iTeam = TEAM_FREEFORALL;
+        break;
+    case STRING_ALLIES:
+    case STRING_AMERICAN:
+        m_iTeam = TEAM_ALLIES;
+        break;
+    case STRING_AXIS:
+    case STRING_GERMAN:
+        m_iTeam = TEAM_AXIS;
+        break;
+    default:
+        m_iTeam = TEAM_NONE;
+        ScriptError("Invalid team %s\n", ev->GetString(1).c_str());
+    }
 }
 
-void AttractiveNode::SetUse
-	(
-	Event *ev
-	)
+void AttractiveNode::SetUse(Event *ev)
 {
-	m_bUse = ev->GetBoolean( 1 );
+    m_bUse = ev->GetBoolean(1);
 }
diff --git a/code/fgame/navigate.h b/code/fgame/navigate.h
index e6b255b3..3404aebc 100644
--- a/code/fgame/navigate.h
+++ b/code/fgame/navigate.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,8 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // is currently unfinished.
 //
 
-#ifndef __NAVIGATE_H__
-#define __NAVIGATE_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -37,7 +36,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "sentient.h"
 #include "../qcommon/qfiles.h"
 
-
 extern Event EV_AI_SavePaths;
 extern Event EV_AI_SaveNodes;
 extern Event EV_AI_LoadNodes;
@@ -46,326 +44,402 @@ extern Event EV_AI_RecalcPaths;
 extern Event EV_AI_CalcPath;
 extern Event EV_AI_DisconnectPath;
 
-extern cvar_t	*ai_showroutes;
-extern cvar_t	*ai_showroutes_distance;
-extern cvar_t	*ai_shownodenums;
-extern cvar_t	*ai_shownode;
-extern cvar_t	*ai_showallnode;
-extern cvar_t	*ai_showpath;
-extern cvar_t	*ai_fallheight;
-extern cvar_t	*ai_debugpath;
-extern cvar_t	*ai_pathchecktime;
-extern cvar_t	*ai_pathcheckdist;
+extern cvar_t *ai_showroutes;
+extern cvar_t *ai_showroutes_distance;
+extern cvar_t *ai_shownodenums;
+extern cvar_t *ai_shownode;
+extern cvar_t *ai_showallnode;
+extern cvar_t *ai_showpath;
+extern cvar_t *ai_fallheight;
+extern cvar_t *ai_debugpath;
+extern cvar_t *ai_pathchecktime;
+extern cvar_t *ai_pathcheckdist;
 
-extern int		ai_maxnode;
+extern int ai_maxnode;
 
 #define MAX_PATHCHECKSPERFRAME 4
 
 extern int path_checksthisframe;
 
-#define MAX_PATH_LENGTH		128		// should be more than plenty
-#define NUM_PATHSPERNODE	48
+#define MAX_PATH_LENGTH  128 // should be more than plenty
+#define NUM_PATHSPERNODE 48
 
 class Path;
 class PathNode;
+class SimpleActor;
 
-#define NUM_WIDTH_VALUES	16
-#define WIDTH_STEP			8
-#define MAX_WIDTH				( WIDTH_STEP * NUM_WIDTH_VALUES )
-#define MAX_HEIGHT			128
+#define NUM_WIDTH_VALUES 16
+#define WIDTH_STEP       8
+#define MAX_WIDTH        (WIDTH_STEP * NUM_WIDTH_VALUES)
+#define MAX_HEIGHT       128
 
-#define CHECK_PATH( path, width, height ) \
-	( ( ( ( width ) >= MAX_WIDTH ) || ( ( width ) < 0 ) ) ? false : \
-	( ( int )( path )->maxheight[ ( ( width ) / WIDTH_STEP ) - 1 ] < ( int )( height ) ) )
+#define CHECK_PATH(path, width, height)                \
+    ((((width) >= MAX_WIDTH) || ((width) < 0)) ? false \
+                                               : ((int)(path)->maxheight[((width) / WIDTH_STEP) - 1] < (int)(height)))
 
-class pathway_ref {
+class pathway_ref
+{
 public:
-	short int from;
-	short int to;
+    short int from;
+    short int to;
 };
 
 typedef struct {
-	byte		numBlockers;
-	short int	node;
-	short int	fallheight;
-	float		dist;
-	float		dir[ 2 ];
-	float		pos1[ 3 ];
-	float		pos2[ 3 ];
+    byte      numBlockers;
+    byte      badPlaceTeam[2];
+    short int node;
+    short int fallheight;
+    float     dist;
+    vec2_t    dir;
+    vec3_t    pos1;
+    vec3_t    pos2;
 } pathway_t;
 
-class PathInfo {
+class PathInfo
+{
 public:
-	bool bAccurate;
-	float point[ 3 ];
-	float dist;
-	float dir[ 2 ];
+    bool   bAccurate;
+    vec3_t point;
+    float  dist;
+    vec2_t dir;
 
 public:
-	void			Archive( Archiver& arc );
+    PathInfo();
+
+    void Archive(Archiver& arc);
 };
 
-inline void PathInfo::Archive
-	(
-	Archiver& arc
-	)
+inline PathInfo::PathInfo()
+    : bAccurate(false)
+    , point {0, 0, 0}
+    , dist(0)
+    , dir {0, 0}
+{}
+
+inline void PathInfo::Archive(Archiver& arc)
 {
-	arc.ArchiveBool( &bAccurate );
-	arc.ArchiveVec3( point );
-	arc.ArchiveFloat( &dist );
-	arc.ArchiveVec2( dir );
+    arc.ArchiveBool(&bAccurate);
+    arc.ArchiveVec3(point);
+    arc.ArchiveFloat(&dist);
+    arc.ArchiveVec2(dir);
 }
 
-typedef enum { NOT_IN_LIST, IN_OPEN, IN_CLOSED } pathlist_t;
+typedef enum {
+    NOT_IN_LIST,
+    IN_OPEN,
+    IN_CLOSED
+} pathlist_t;
 
-#define PATH_DONT_LINK	1
-#define AI_DUCK			2
-#define AI_COVER		4
-#define AI_CONCEALMENT	8
-#define AI_CORNER_LEFT	16
-#define AI_CORNER_RIGHT	32
-#define AI_SNIPER		64
-#define AI_CRATE		128
+#define PATH_DONT_LINK  1
+#define AI_DUCK         2
+#define AI_COVER        4
+#define AI_CONCEALMENT  8
+#define AI_CORNER_LEFT  16
+#define AI_CORNER_RIGHT 32
+#define AI_SNIPER       64
+#define AI_CRATE        128
+// Added in 2.0
+#define AI_LOW_WALL_ARC 256
 
-#define AI_COVERFLAGS	(AI_CRATE|AI_SNIPER|AI_CORNER_RIGHT|AI_CORNER_LEFT|AI_CONCEALMENT|AI_COVER)
-#define AI_COVERFLAGS2	(AI_SNIPER|AI_CORNER_RIGHT|AI_CORNER_LEFT|AI_CONCEALMENT)
-#define AI_COVERFLAGS3	(AI_SNIPER|AI_CORNER_RIGHT|AI_CORNER_LEFT|AI_CONCEALMENT|AI_DUCK|AI_CONCEALMENT)
-#define AI_SNIPERFLAGS	(AI_SNIPER|AI_CORNER_RIGHT|AI_CORNER_LEFT|AI_COVER)
-#define AI_CRATEFLAGS	(AI_CRATE|AI_CORNER_LEFT|AI_CORNER_RIGHT|AI_CONCEALMENT|AI_COVER|AI_DUCK)
-#define AI_COVER_LEFT_FLAGS		(AI_CRATE|AI_SNIPER|AI_CORNER_LEFT|AI_CONCEALMENT|AI_DUCK)
-#define AI_COVER_RIGHT_FLAGS	(AI_CRATE|AI_SNIPER|AI_CORNER_RIGHT|AI_CONCEALMENT|AI_DUCK)
-#define AI_ALL			(AI_DUCK|AI_COVER|AI_CONCEALMENT|AI_CORNER_LEFT|AI_CORNER_RIGHT|AI_SNIPER|AI_CRATE)
+#define AI_MOVE_MASK \
+    (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_SNIPER | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_COVER_MASK       (AI_COVER | AI_CONCEALMENT | AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
+#define AI_CONCEALMENT_MASK (AI_CORNER_LEFT | AI_CORNER_RIGHT | AI_CRATE | AI_LOW_WALL_ARC)
 
-void DrawNode( int iNodeCount );
-void DrawAllConnections( void );
+void DrawNode(int iNodeCount);
+void DrawAllConnections(void);
 
 class PathNode : public SimpleEntity
-	{
-	public:
-		int findCount;
-		pathway_t *Child;
-		int numChildren;
-		int virtualNumChildren;
-		float f;
-		float h;
-		float g;
-		class PathNode *Parent;
-		bool inopen;
-		PathNode *PrevNode;
-		PathNode *NextNode;
-		short int pathway;
-		vec_t *m_PathPos;
-		float dist;
-		float dir[ 2 ];
-		int nodeflags;
-		SafePtr<Entity> pLastClaimer;
-		int iAvailableTime;
-		int nodenum;
-		short int m_Depth;
+{
+public:
+    int             findCount;
+    pathway_t      *Child;
+    int             numChildren;
+    int             virtualNumChildren;
+    float           f;
+    float           h;
+    float           g;
+    class PathNode *Parent;
+    bool            inopen;
+    PathNode       *PrevNode;
+    PathNode       *NextNode;
+    short int       pathway;
+    const vec_t    *m_PathPos;
+    float           dist;
+    vec2_t          dir;
+    int             nodeflags;
+    SafePtr<Entity> pLastClaimer;
+    int             iAvailableTime;
+    int             nodenum;
+    short int       m_Depth;
+    float           m_fLowWallArc;
 
-		friend class   PathSearch;
-		friend void		DrawAllConnections( void );
+    friend class PathSearch;
+    friend void DrawAllConnections(void);
 
-	private:
-		void ConnectTo( PathNode *node );
-		void SetNodeFlags( Event *ev );
-		void Remove( Event *ev );
+private:
+    void ConnectTo(PathNode *node);
+    void SetNodeFlags(Event *ev);
+    void SetLowWallArc(Event *ev); // Added in 2.0
+    void Remove(Event *ev);
 
-	public:
-		CLASS_PROTOTYPE( PathNode );
+public:
+    CLASS_PROTOTYPE(PathNode);
 
-		void *operator new( size_t size );
-		void operator delete( void *ptr );
+    PathNode();
+    virtual ~PathNode();
 
-		PathNode();
-		virtual ~PathNode();
+    void *operator new(size_t size);
+    void  operator delete(void *ptr);
 
-		void Archive( Archiver& arc ) override;
-		void ArchiveDynamic( Archiver& arc );
-		void ArchiveStatic( Archiver& arc );
+    void Archive(Archiver& arc) override;
+    void ArchiveDynamic(Archiver& arc);
+    void ArchiveStatic(Archiver& arc);
 
-		bool CheckPathTo( PathNode *node );
-		void CheckPathToDefault( PathNode *node, pathway_t *pathway );
-		qboolean LadderTo( PathNode *node, pathway_t *pathway );
+    bool     CheckPathTo(PathNode *node);
+    void     CheckPathToDefault(PathNode *node, pathway_t *pathway);
+    qboolean LadderTo(PathNode *node, pathway_t *pathway);
 
-		void DrawConnections( void );
-		void Claim( Entity *pClaimer );
-		void Relinquish( void );
-		Entity *GetClaimHolder( void ) const;
-		bool IsClaimedByOther( Entity *pPossibleClaimer ) const;
-		void MarkTemporarilyBad( void );
-		void ConnectChild( int i );
-		void DisconnectChild( int i );
-		const_str GetSpecialAttack( class Actor *pActor );
-		void IsTouching( Event *ev );
-		qboolean IsTouching( Entity *e1 );
-		void setOriginEvent( Vector org ) override;
-
-	};
+    void      DrawConnections(void);
+    void      Claim(Entity *pClaimer);
+    void      Relinquish(void);
+    Entity   *GetClaimHolder(void) const;
+    bool      IsClaimedByOther(Entity *pPossibleClaimer) const;
+    void      MarkTemporarilyBad(void);
+    void      ConnectChild(int i);
+    void      DisconnectChild(int i);
+    const_str GetSpecialAttack(class Actor *pActor);
+    void      IsTouching(Event *ev);
+    qboolean  IsTouching(Entity *e1);
+    void      setOriginEvent(Vector org) override;
+};
 
 typedef SafePtr<PathNode> PathNodePtr;
 
-class nodeinfo {
-public:
-	PathNode *pNode;
-	float fDistSquared;
-};
+#define PATHMAP_CELLSIZE 256
+#define PATHMAP_GRIDSIZE (MAX_MAP_BOUNDS * 2 / PATHMAP_CELLSIZE)
 
-#define PATHMAP_CELLSIZE	256
-#define PATHMAP_GRIDSIZE	( MAX_MAP_BOUNDS * 2 / PATHMAP_CELLSIZE )
+#define PATHMAP_NODES    128 // 128 - sizeof( int ) / sizeof( short )
 
-#define PATHMAP_NODES		128			// 128 - sizeof( int ) / sizeof( short )
-
-#define MAX_PATHNODES 4096
+#define MAX_PATHNODES    4096
 
 class MapCell : public Class
 {
 private:
-	int		numnodes;
-	short	*nodes;
+    int    numnodes;
+    short *nodes;
 
-	friend class PathSearch;
+    friend class PathSearch;
 
 public:
-	MapCell();
-	~MapCell();
+    MapCell();
+    ~MapCell();
 
-	qboolean				AddNode( PathNode *node );
-	int						NumNodes( void );
+    void AddNode(PathNode *node);
+    int  NumNodes(void);
 };
 
 class PathSearch : public Listener
 {
-	friend class PathNode;
+    friend class PathNode;
 
 private:
-	static MapCell PathMap[ PATHMAP_GRIDSIZE ][ PATHMAP_GRIDSIZE ];
-	static PathNode *open;
-	static int findFrame;
-	static qboolean m_bNodesloaded;
-	static qboolean m_NodeCheckFailed;
-	static int m_LoadIndex;
+    static MapCell   PathMap[PATHMAP_GRIDSIZE][PATHMAP_GRIDSIZE];
+    static PathNode *open;
+    static int       findFrame;
+    static qboolean  m_bNodesloaded;
+    static qboolean  m_NodeCheckFailed;
+    static int       m_LoadIndex;
 
 public:
-	static PathNode *pathnodes[ 4096 ];
-	static int nodecount;
-	static float total_dist;
-	static const char *last_error;
+    static PathNode   *pathnodes[MAX_PATHNODES];
+    static int         nodecount;
+    static float       total_dist;
+    static const char *last_error;
 
 private:
-	static void LoadAddToGrid( int x, int y );
-	static void LoadAddToGrid2( PathNode *node, int x, int y );
-	static void AddToGrid( PathNode *node, int x, int y );
-	static bool Connect( PathNode *node, int x, int y );
-	static int NodeCoordinate( float coord );
-	static int GridCoordinate( float coord );
-	static qboolean ArchiveSaveNodes( void );
-	static void ArchiveLoadNodes( void );
-	static void Init( void );
+    static void     LoadAddToGrid(int x, int y);
+    static void     LoadAddToGrid2(PathNode *node, int x, int y);
+    static void     AddToGrid(PathNode *node, int x, int y);
+    static bool     Connect(PathNode *node, int x, int y);
+    static int      NodeCoordinate(float coord);
+    static int      GridCoordinate(float coord);
+    static qboolean ArchiveSaveNodes(void);
+    static void     ArchiveLoadNodes(void);
+    static void     Init(void);
 
 public:
-	CLASS_PROTOTYPE( PathSearch );
+    CLASS_PROTOTYPE(PathSearch);
 
-	PathSearch();
-	virtual ~PathSearch();
+    PathSearch();
+    virtual ~PathSearch();
 
-	static void ArchiveStaticLoad( Archiver& arc );
-	static void ArchiveStaticSave( Archiver& arc );
-	static bool ArchiveDynamic( Archiver& arc );
-	static void AddNode( PathNode *node );
-	static void Connect( PathNode *node );
-	static void UpdateNode( PathNode *node );
-	static MapCell *GetNodesInCell( int x, int y );
-	static MapCell *GetNodesInCell( float *pos );
-	static class PathNode *DebugNearestStartNode( float *pos, Entity *ent = NULL );
-	static class PathNode *NearestStartNode( float *pos, class SimpleActor *ent );
-	static class PathNode *NearestEndNode( float *pos );
-	static int DebugNearestNodeList( float *pos, PathNode **nodelist, int iMaxNodes );
-	static int DebugNearestNodeList2( float *pos, PathNode **nodelist, int iMaxNodes );
-	static void ShowNodes( void );
-	static void LoadNodes( void );
-	static void CreatePaths( void );
-	static void *AllocPathNode( void );
-	static void FreePathNode( void * );
-	static void ResetNodes( void );
-	static PathInfo *GeneratePath( PathInfo *path );
-	static PathInfo *GeneratePathNear( PathInfo *path );
-	static PathInfo *GeneratePathAway( PathInfo *path );
-	static class PathNode *GetSpawnNode( ClassDef *cls );
-	static int FindPath( float *start, float *end, Entity *ent, float maxPath, float *vLeashHome, float fLeashDistSquared, int fallheight );
-	static int FindPathAway( float *start, float *avoid, float *vPreferredDir, Entity *ent, float fMinSafeDist, float *vLeashHome, float fLeashDistSquared, int fallheight );
-	static int FindPathNear( float *start, float *end, Entity *ent, float maxPath, float fRadiusSquared, float *vLeashHome, float fLeashDistSquared, int fallheight );
-	static class PathNode *FindCornerNodeForWall( float *start, float *end, class SimpleActor *ent, float maxPath, float *plane );
-	static class PathNode *FindCornerNodeForExactPath( class SimpleActor *self, Sentient *enemy, float fMaxPath );
-	static int FindPotentialCover( class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind );
-	static void PlayerCover( class Player *pPlayer );
-	static class PathNode *FindNearestCover( class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy );
-	static class PathNode *FindNearestSniperNode( class SimpleActor *pEnt, Vector& vPos, Entity *pEnemy );
+    static void ArchiveStaticLoad(Archiver& arc);
+    static void ArchiveStaticSave(Archiver& arc);
+    static bool ArchiveDynamic(Archiver& arc);
+
+    static void AddNode(PathNode *node);
+    static void Connect(PathNode *node);
+    static void UpdateNode(PathNode *node);
+
+    static MapCell *GetNodesInCell(int x, int y);
+    static MapCell *GetNodesInCell(const vec3_t pos);
+
+    static class PathNode *DebugNearestStartNode(const vec3_t pos, Entity *ent = NULL);
+    static class PathNode *NearestStartNode(const vec3_t pos, SimpleActor *ent);
+    static class PathNode *NearestEndNode(const vec3_t pos);
+    static int             DebugNearestNodeList(const vec3_t pos, PathNode **nodelist, int iMaxNodes);
+    static int             DebugNearestNodeList2(const vec3_t pos, PathNode **nodelist, int iMaxNodes);
+
+    static void  ShowNodes(void);
+    static void  LoadNodes(void);
+    static void  CreatePaths(void);
+    static void *AllocPathNode(void);
+    static void  FreePathNode(void *);
+    static void  ResetNodes(void);
+    static void  ClearNodes(void); // Added in OPM
+
+    static void      UpdatePathwaysForBadPlace(const Vector& origin, float radius, int dir, int team);
+    static PathInfo *GeneratePath(PathInfo *path);
+    static PathInfo *GeneratePathNear(PathInfo *path);
+    static PathInfo *GeneratePathAway(PathInfo *path);
+
+    static class PathNode *GetSpawnNode(ClassDef *cls);
+
+    static int FindPath(
+        const vec3_t start,
+        const vec3_t end,
+        Entity      *ent,
+        float        maxPath,
+        const vec3_t vLeashHome,
+        float        fLeashDistSquared,
+        int          fallheight
+    );
+    static int FindPathAway(
+        const vec3_t start,
+        const vec3_t avoid,
+        const vec3_t vPreferredDir,
+        Entity      *ent,
+        float        fMinSafeDist,
+        const vec3_t vLeashHome,
+        float        fLeashDistSquared,
+        int          fallheight
+    );
+    static int FindPathNear(
+        const vec3_t start,
+        const vec3_t end,
+        Entity      *ent,
+        float        maxPath,
+        float        fRadiusSquared,
+        const vec3_t vLeashHome,
+        float        fLeashDistSquared,
+        int          fallheight
+    );
+
+    static class PathNode *
+    FindCornerNodeForWall(const vec3_t start, const vec3_t end, Entity *ent, float maxPath, const vec4_t plane);
+    static class PathNode *FindCornerNodeForExactPath(Entity *self, Sentient *enemy, float fMaxPath);
+    static int  FindPotentialCover(Entity *pEnt, Vector& vPos, Entity *pEnemy, PathNode **ppFoundNodes, int iMaxFind);
+    static void PlayerCover(class Player *pPlayer);
+    static class PathNode *FindNearestCover(Entity *pEnt, Vector& vPos, Entity *pEnemy);
+    static class PathNode *FindNearestSniperNode(Entity *pEnt, Vector& vPos, Entity *pEnemy);
 
 private:
-	static int NearestNodeSetup( vec3_t pos, MapCell *cell, int *nodes, vec3_t *deltas );
-
+    static int NearestNodeSetup(const vec3_t pos, MapCell *cell, int *nodes, vec3_t *deltas);
 };
 
+inline MapCell::~MapCell()
+{
+    numnodes = 0;
+    nodes    = NULL;
+}
+
 extern PathSearch PathManager;
 
-PathNode *AI_FindNode( const char *name );
-void AI_AddNode( PathNode *node );
-void AI_RemoveNode( PathNode *node );
-void AI_ResetNodes( void );
+//===============
+// Added in OPM
+//===============
+
+class NavMaster : public Listener
+{
+public:
+    CLASS_PROTOTYPE(NavMaster);
+
+    NavMaster();
+
+    void Init(void);
+
+    void CreatePaths(Event *ev);
+    void CreateNode(Event *ev);
+    void SetNodeFlags(Event *ev);
+    void SetNodeTargetName(Event *ev);
+    void SetNodeTarget(Event *ev);
+    void RemoveNode(Event *ev);
+    void Frame();
+
+private:
+    void      CheckNodeSelected();
+    PathNode *DetermineCurrentNode() const;
+    bool      FovCheck(const Vector& dir, const Vector& delta, float fov) const;
+
+private:
+    SafePtr<PathNode> selectedNode;
+};
+
+extern NavMaster navMaster;
+
+PathNode *AI_FindNode(const char *name);
+void      AI_AddNode(PathNode *node);
+void      AI_RemoveNode(PathNode *node);
+void      AI_ResetNodes(void);
 
 class AttractiveNode : public SimpleArchivedEntity
 {
 public:
-	int			m_iPriority;
-	bool		m_bUse;
-	float		m_fMaxStayTime;
-	float		m_fMaxDistance;
-	float		m_fMaxDistanceSquared;
-	float		m_fRespawnTime;
-	const_str	m_csTeam;
-	int			m_iTeam;
+    int       m_iPriority;
+    bool      m_bUse;
+    float     m_fMaxStayTime;
+    float     m_fMaxDistance;
+    float     m_fMaxDistanceSquared;
+    float     m_fRespawnTime;
+    const_str m_csTeam;
+    int       m_iTeam;
 
 private:
-//	Container< SafePtr< Sentient > >	m_pSentList;
+    //	Container< SafePtr< Sentient > >	m_pSentList;
 
 public:
-	CLASS_PROTOTYPE( AttractiveNode );
+    CLASS_PROTOTYPE(AttractiveNode);
 
-	AttractiveNode();
-	~AttractiveNode();
+    AttractiveNode();
+    ~AttractiveNode();
 
-	bool		CheckTeam( Sentient *sent );
-	void		setMaxDist( float dist );
+    bool CheckTeam(Sentient *sent);
+    void setMaxDist(float dist);
 
-	void		GetPriority( Event *ev );
-	void		SetPriority( Event *ev );
-	void		GetDistance( Event *ev );
-	void		SetDistance( Event *ev );
-	void		GetStayTime( Event *ev );
-	void		SetStayTime( Event *ev );
-	void		GetRespawnTime( Event *ev );
-	void		SetRespawnTime( Event *ev );
-	void		GetTeam( Event *ev );
-	void		SetTeam( Event *ev );
-	void		SetUse( Event *ev );
+    void GetPriority(Event *ev);
+    void SetPriority(Event *ev);
+    void GetDistance(Event *ev);
+    void SetDistance(Event *ev);
+    void GetStayTime(Event *ev);
+    void SetStayTime(Event *ev);
+    void GetRespawnTime(Event *ev);
+    void SetRespawnTime(Event *ev);
+    void GetTeam(Event *ev);
+    void SetTeam(Event *ev);
+    void SetUse(Event *ev);
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 };
 
-typedef SafePtr< AttractiveNode > AttractiveNodePtr;
+typedef SafePtr<AttractiveNode> AttractiveNodePtr;
 
-inline void AttractiveNode::Archive
-	(
-	Archiver& arc
-	)
+inline void AttractiveNode::Archive(Archiver& arc)
 {
-	arc.ArchiveInteger( &m_iPriority );
-	arc.ArchiveBool( &m_bUse );
-	arc.ArchiveFloat( &m_fMaxStayTime );
-	arc.ArchiveFloat( &m_fMaxDistanceSquared );
+    arc.ArchiveInteger(&m_iPriority);
+    arc.ArchiveBool(&m_bUse);
+    arc.ArchiveFloat(&m_fMaxStayTime);
+    arc.ArchiveFloat(&m_fMaxDistanceSquared);
 }
 
-extern Container< AttractiveNode * > attractiveNodes;
-
-#endif
+extern Container<AttractiveNode *> attractiveNodes;
diff --git a/code/fgame/object.cpp b/code/fgame/object.cpp
index fdf81e4a..0cd08c65 100644
--- a/code/fgame/object.cpp
+++ b/code/fgame/object.cpp
@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "specialfx.h"
 #include "g_phys.h"
 #include "game.h"
+#include "../script/scriptexception.h"
 
 Event EV_Object_HandleSetModel
 (
@@ -46,7 +47,14 @@ CLASS_DECLARATION(Animate, Object, NULL) {
     {NULL, NULL}
 };
 
-Event EV_InteractObject_Setup("_setup", EV_DEFAULT, NULL, NULL, "Sets up an object.");
+Event EV_InteractObject_Setup
+(
+    "_setup",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets up an object."
+);
 
 Event EV_InteractObject_KilledEffect
 (
@@ -118,10 +126,10 @@ void InteractObject::Damaged(Event *ev)
 
 void InteractObject::Killed(Event *ev)
 {
-    Entity       *ent;
-    Entity       *attacker;
-    Vector        dir;
-    const char   *name;
+    Entity     *ent;
+    Entity     *attacker;
+    Vector      dir;
+    const char *name;
 
     takedamage = DAMAGE_NO;
     deadflag   = DEAD_NO;
@@ -213,7 +221,7 @@ Event EV_ThrowObject_ThrowSound
     EV_NORMAL
 );
 
-CLASS_DECLARATION(Object, ThrowObject, "func_throwobject") {
+CLASS_DECLARATION(Animate, ThrowObject, "func_throwobject") {
     {&EV_Touch,                    &ThrowObject::Touch       },
     {&EV_ThrowObject_Pickup,       &ThrowObject::Pickup      },
     {&EV_ThrowObject_Throw,        &ThrowObject::Throw       },
@@ -242,7 +250,6 @@ void ThrowObject::ThrowSound(Event *ev)
 }
 
 void ThrowObject::Touch(Event *ev)
-
 {
     Entity *other;
 
@@ -283,7 +290,6 @@ void ThrowObject::Touch(Event *ev)
 }
 
 void ThrowObject::Throw(Event *ev)
-
 {
     Entity   *owner;
     Sentient *targetent;
@@ -300,6 +306,7 @@ void ThrowObject::Throw(Event *ev)
     assert(owner);
 
     if (!owner) {
+        ScriptError("owner == NULL");
         return;
     }
 
@@ -311,6 +318,7 @@ void ThrowObject::Throw(Event *ev)
     targetent = (Sentient *)ev->GetEntity(3);
     assert(targetent);
     if (!targetent) {
+        ScriptError("targetent == NULL");
         return;
     }
 
@@ -328,8 +336,12 @@ void ThrowObject::Throw(Event *ev)
 
     gravity = grav;
 
-    target = targetent->origin;
-    target.z += targetent->viewheight;
+    if (targetent->IsSubclassOfSentient()) {
+        target = targetent->origin;
+        target.z += targetent->viewheight;
+    } else {
+        target = targetent->centroid;
+    }
 
     setMoveType(MOVETYPE_BOUNCE);
     setSolidType(SOLID_BBOX);
@@ -359,7 +371,6 @@ void ThrowObject::Throw(Event *ev)
 }
 
 void ThrowObject::Pickup(Event *ev)
-
 {
     Entity *ent;
     Event  *e;
@@ -385,7 +396,7 @@ void ThrowObject::Pickup(Event *ev)
 
 void ThrowObject::Archive(Archiver& arc)
 {
-    Object::Archive(arc);
+    Animate::Archive(arc);
 
     arc.ArchiveInteger(&owner);
     arc.ArchiveVector(&pickup_offset);
diff --git a/code/fgame/object.h b/code/fgame/object.h
index 310edf76..fe3fedfe 100644
--- a/code/fgame/object.h
+++ b/code/fgame/object.h
@@ -46,7 +46,7 @@ public:
 
     InteractObject();
     void Damaged(Event *ev);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void Setup(Event *ev);
     void EventHitEffect(Event *ev);
     void EventKilledEffect(Event *ev);
@@ -56,7 +56,10 @@ public:
 extern Event EV_ThrowObject_Pickup;
 extern Event EV_ThrowObject_Throw;
 
-class ThrowObject : public Object
+// Fixed in 2.0
+//  Before 2.0, ThrowObject was inheriting from Object.
+//  This caused issue when spawning the ThrowObject from script.
+class ThrowObject : public Animate
 {
 private:
     int    owner;
diff --git a/code/fgame/parm.cpp b/code/fgame/parm.cpp
index 9b90a719..76fd8513 100644
--- a/code/fgame/parm.cpp
+++ b/code/fgame/parm.cpp
@@ -30,63 +30,135 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Parm parm;
 
-Event EV_Parm_GetOther
-(
-	"other",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"other",
-	EV_GETTER
-);
-
-Event EV_Parm_GetOwner
-(
-	"owner",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"owner",
-	EV_GETTER
-);
-
 Event EV_Parm_GetPreviousThread
 (
-	"previousthread",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"previousthread",
-	EV_GETTER
+    "previousthread",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "previousthread",
+    EV_GETTER
+);
+Event EV_Parm_GetOther
+(
+    "other",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "other",
+    EV_GETTER
+);
+Event EV_Parm_GetOwner
+(
+    "owner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "owner",
+    EV_GETTER
+);
+Event EV_Parm_Movedone
+(
+    "movedone",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "movedone",
+    EV_GETTER
+);
+Event EV_Parm_Movefail
+(
+    "movefail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "movefail",
+    EV_GETTER
+);
+Event EV_Parm_Motionfail
+(
+    "motionfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "motionfail",
+    EV_GETTER
+);
+Event EV_Parm_Upperfail
+(
+    "upperfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "upperfail",
+    EV_GETTER
+);
+Event EV_Parm_Sayfail
+(
+    "sayfail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "sayfail",
+    EV_GETTER
 );
 
-void Parm::Archive( Archiver& arc )
+void Parm::Archive(Archiver& arc)
 {
-	Listener::Archive( arc );
+    Listener::Archive(arc);
 
-	arc.ArchiveSafePointer( &other );
-	arc.ArchiveSafePointer( &owner );
+    arc.ArchiveSafePointer(&other);
+    arc.ArchiveSafePointer(&owner);
 }
 
-void Parm::GetOther( Event *ev )
+void Parm::GetMotionFail(Event *ev)
 {
-	ev->AddListener( other );
+    ev->AddInteger(motionfail);
 }
 
-void Parm::GetOwner( Event *ev )
+void Parm::GetMovedone(Event *ev)
 {
-	ev->AddListener( owner );
+    ev->AddInteger(movedone);
 }
 
-void Parm::GetPreviousThread( Event *ev )
+void Parm::GetMovefail(Event *ev)
 {
-	ev->AddListener( Director.PreviousThread() );
+    ev->AddInteger(movefail);
 }
 
-CLASS_DECLARATION( Listener, Parm, NULL )
+void Parm::GetOther(Event *ev)
 {
-	{ &EV_Parm_GetOther,				&Parm::GetOther },
-	{ &EV_Parm_GetOwner,				&Parm::GetOwner },
-	{ &EV_Parm_GetPreviousThread,		&Parm::GetPreviousThread },
-	{ NULL, NULL }
+    ev->AddListener(other);
+}
+
+void Parm::GetOwner(Event *ev)
+{
+    ev->AddListener(owner);
+}
+
+void Parm::GetPreviousThread(Event *ev)
+{
+    ev->AddListener(Director.PreviousThread());
+}
+
+void Parm::GetSayFail(Event *ev)
+{
+    ev->AddInteger(sayfail);
+}
+
+void Parm::GetUpperFail(Event *ev)
+{
+    ev->AddInteger(upperfail);
+}
+
+CLASS_DECLARATION(Listener, Parm, NULL) {
+    {&EV_Parm_GetPreviousThread, &Parm::GetPreviousThread},
+    {&EV_Parm_GetOther,          &Parm::GetOther         },
+    {&EV_Parm_GetOwner,          &Parm::GetOwner         },
+    {&EV_Parm_Movedone,          &Parm::GetMovedone      },
+    {&EV_Parm_Movefail,          &Parm::GetMovefail      },
+    {&EV_Parm_Motionfail,        &Parm::GetMotionFail    },
+    {&EV_Parm_Upperfail,         &Parm::GetUpperFail     },
+    {&EV_Parm_Sayfail,           &Parm::GetSayFail       },
+    {NULL,                       NULL                    }
 };
diff --git a/code/fgame/parm.h b/code/fgame/parm.h
index b942324d..aa8ae00b 100644
--- a/code/fgame/parm.h
+++ b/code/fgame/parm.h
@@ -22,34 +22,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // parm.h: Event parameters
 
-#ifndef __PARM_H__
-#define __PARM_H__
+#pragma once
 
 #include "listener.h"
 
-class Parm : public Listener {
+class Parm : public Listener
+{
 public:
-	// General trigger variables
-	SafePtr< Listener > other;
-	SafePtr< Listener > owner;
+    // General trigger variables
+    SafePtr<Listener> other;
+    SafePtr<Listener> owner;
 
-	// Failure variables
-	qboolean	movedone;
-	qboolean	movefail;
-	qboolean	motionfail;
-	qboolean	upperfail;
-	qboolean	sayfail;
+    // Failure variables
+    qboolean movedone;
+    qboolean movefail;
+    qboolean motionfail;
+    qboolean upperfail;
+    qboolean sayfail;
 
 public:
-	CLASS_PROTOTYPE( Parm );
+    CLASS_PROTOTYPE(Parm);
 
-	void Archive( Archiver& arc ) override;
+    void GetPreviousThread(Event *ev);
+    void GetOther(Event *ev);
+    void GetOwner(Event *ev);
+    void GetPath(Event *ev);
+    void GetMovedone(Event *ev);
+    void GetMovefail(Event *ev);
+    void GetMotionFail(Event *ev);
+    void GetUpperFail(Event *ev);
+    void GetSayFail(Event *ev);
 
-	void				GetOther( Event *ev );
-	void				GetOwner( Event *ev );
-	void				GetPreviousThread( Event *ev );
+    void Archive(Archiver& arc) override;
 };
 
 extern Parm parm;
-
-#endif /* __PARM_H__ */
diff --git a/code/fgame/player.cpp b/code/fgame/player.cpp
index ef77689b..7b10c5bb 100644
--- a/code/fgame/player.cpp
+++ b/code/fgame/player.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "entity.h"
 #include "consoleevent.h"
 #include "player.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "weapon.h"
 #include "trigger.h"
 #include "scriptmaster.h"
@@ -48,6 +48,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "parm.h"
 #include "body.h"
 #include "playerstart.h"
+#include "camera.h"
 #include "weapturret.h"
 #include "vehicleturret.h"
 #include "portableturret.h"
@@ -57,7 +58,82 @@ const Vector power_color(0.0, 1.0, 0.0);
 const Vector acolor(1.0, 1.0, 1.0);
 const Vector bcolor(1.0, 0.0, 0.0);
 
-qboolean TryPush(int entnum, vec3_t move_origin, vec3_t move_end);
+ScriptDelegate Player::scriptDelegate_connected("player_connected", "Sent once when the player connected");
+ScriptDelegate Player::scriptDelegate_disconnecting("player_disconnecting", "The player is disconnecting");
+ScriptDelegate Player::scriptDelegate_spawned("player_spawned", "The player has spawned");
+ScriptDelegate Player::scriptDelegate_damage("player_damaged", "The player got hit");
+ScriptDelegate Player::scriptDelegate_kill("player_killed", "The player got killed");
+ScriptDelegate Player::scriptDelegate_textMessage("player_textMessage", "The player just sent a text message");
+
+//
+// mohaas 2.0 and above
+//
+const char *pInstantMsgEng[6][9] = {
+    {"Good job team!",
+     "Alright!", "We've done it!",
+     "Wooohoo!", "Objective achieved.",
+     "We've completed an objective.", "We've lost an objective!",
+     "The enemy has overrun our objective!", NULL},
+    {"Squad, move in!",
+     "Squad, fall back!", "Squad, attack right flank!",
+     "Squad, attack left flank!", "Squad, hold this position!",
+     "Squad, covering fire!", "Squad, regroup!",
+     "Squad, split up!", NULL},
+    {"Cover me!",
+     "I'll cover you!", "Follow me!",
+     "You take point.", "Taking Fire!  Need some help!",
+     "Get ready to move in on my signal.", "Attack!",
+     "Open fire!", NULL},
+    {"Yes sir!",
+     "No sir!", "Enemy Spotted.",
+     "Sniper!", "Grenade! Take Cover!",
+     "Area Clear.", "Thanks.",
+     "I owe you one.", NULL},
+    {"Who wants more?!",
+     "Never send boys to do a man's job.", "This is too easy!",
+     "You mess with the best, you die like the rest.", "Watch that friendly fire!",
+     "Hey!  I'm on your team!", "Come on out you cowards!",
+     "Where are you hiding?", NULL},
+    // Added in 2.30
+    {"Guard our jail!",
+     "Capture the enemy jail!", "I'm defending our jail!",
+     "I'm attacking the enemy jail!", "Rescue the Prisoners!",
+     "The enemy is attacking our jail!"}
+};
+
+//
+// for mohaa version 1.11 and below
+//
+const char *pInstantMsgEng_ver6[5][9] = {
+    {"Squad, move in!",
+     "Squad, fall back!", "Squad, attack right flank!",
+     "Squad, attack left flank!", "Squad, hold this position!",
+     "Squad, covering fire!", "Squad, regroup!",
+     "", ""},
+    {
+     "Cover me!", "I'll cover you!",
+     "Follow me!", "You take point.",
+     "You take the lead.", "Taking Fire!  Need some help!",
+     "Charge!", "Attack!",
+     "Open fire!", },
+    {
+     "Yes sir!", "No sir!",
+     "Enemy Spotted.", "Sniper!",
+     "Grenade! Take Cover!", "Area Clear.",
+     "Great Shot!", "Thanks.",
+     "I owe you one.", },
+    {
+     "Is that all you've got?", "I think they are all out of real men!",
+     "Go on and run, you yellow-bellies!", "They're a bunch of cowards!",
+     "Come back when you've had some target practice!", "Come prepared next time!",
+     "Try again!", "I've seen French school girls shoot better!",
+     "That made a mess.", },
+    {"He's going to get us killed!",
+     "A lot of good men are going to die because of his poor leadership", "Good riddance!",
+     "That guy is going to get us all killed!", "Hey buddy, get down!",
+     "Stay out of my foxhole, pal!", "Find your own hiding place!",
+     "Get out of my way!", ""}
+};
 
 Event EV_Player_DumpState
 (
@@ -209,7 +285,7 @@ Event EV_Player_CorrectWeaponAttachments
     EV_CONSOLE,
     NULL,
     NULL,
-    "makes sure the weapons is properly attached when interupting a reload",
+    "makes sure the weapons is properly attached when interrupting a reload",
     EV_NORMAL
 );
 Event EV_Player_GiveCheat
@@ -402,7 +478,14 @@ Event EV_Player_AnimLoop_Legs
     EV_NORMAL
 );
 Event EV_Player_AnimLoop_Pain // Added in 2.0
-    ("animloop_pain", EV_DEFAULT, NULL, NULL, "Called when the pain animation has finished.", EV_NORMAL);
+(
+    "animloop_pain",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called when the pain animation has finished.",
+    EV_NORMAL
+);
 Event EV_Player_DoUse
 (
     "usestuff",
@@ -503,7 +586,8 @@ Event EV_Player_SafeHolster
     "preserves state, so it will not holster or unholster unless necessary",
     EV_NORMAL
 );
-Event EV_Player_SafeZoom(
+Event EV_Player_SafeZoom
+(
     "safezoom",
     EV_DEFAULT,
     "b",
@@ -621,12 +705,14 @@ Event EV_Player_ModifyHeight
     EV_NORMAL
 );
 Event EV_Player_ModifyHeightFloat // Added in 2.40
-    ("modheightfloat",
+(
+    "modheightfloat",
      EV_DEFAULT,
      "ff",
      "height max_z",
      "Specify the view height of the player and the height of his bounding box.",
-     EV_NORMAL);
+     EV_NORMAL
+);
 Event EV_Player_SetMovePosFlags
 (
     "moveposflags",
@@ -691,30 +777,43 @@ Event EV_Player_PickWeapon
     EV_NORMAL
 );
 Event EV_Player_SetInJail // Added in 2.30
-    ("injail",
-     EV_DEFAULT,
-     "i",
-     "boolean",
-     "set to 1 to indicate when player is in jail,"
-     "0 when they are free",
-     EV_SETTER);
+(
+    "injail",
+    EV_DEFAULT,
+    "i",
+    "boolean",
+    "set to 1 to indicate when player is in jail,"
+    "0 when they are free",
+    EV_SETTER
+);
 Event EV_Player_GetInJail // Added in 2.30
-    ("injail",
-     EV_DEFAULT,
-     NULL,
-     NULL,
-     "returns 1 if player is in jail,"
-     "0 if out",
-     EV_GETTER);
+(
+    "injail",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "returns 1 if player is in jail,"
+    "0 if out",
+    EV_GETTER
+);
 Event EV_Player_GetNationalityPrefix // Added in 2.30
-    ("nationalityprefix",
-     EV_DEFAULT,
-     NULL,
-     NULL,
-     "get the three or five letter prefix that denotes the player's nationality",
-     EV_GETTER);
+(
+    "nationalityprefix",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "get the three or five letter prefix that denotes the player's nationality",
+    EV_GETTER
+);
 Event EV_Player_IsSpectator // Added in 2.30
-    ("isSpectator", EV_DEFAULT, NULL, NULL, "Check to see if player is a spectator (non-zero return value)", EV_GETTER);
+(
+    "isSpectator",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Check to see if player is a spectator (non-zero return value)",
+    EV_GETTER
+);
 Event EV_Player_Spectator
 (
     "spectator",
@@ -788,7 +887,14 @@ Event EV_Player_Vote
     EV_NORMAL
 );
 Event EV_Player_RetrieveVoteOptions // Added in 2.0
-    ("gvo", EV_CONSOLE, NULL, NULL, "Retrieves the server's vote options file", EV_NORMAL);
+(
+    "gvo",
+    EV_CONSOLE,
+    NULL,
+    NULL,
+    "Retrieves the server's vote options file",
+    EV_NORMAL
+);
 Event EV_Player_PrimaryDMWeapon
 (
     "primarydmweapon",
@@ -826,9 +932,23 @@ Event EV_Player_Physics_Off
     EV_NORMAL
 );
 Event EV_Player_ArmWithWeapons // Added in 2.30
-    ("armwithweapons", EV_DEFAULT, NULL, NULL, "give player their primary and secondary weapons.", EV_NORMAL);
+(
+    "armwithweapons",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "give player their primary and secondary weapons.",
+    EV_NORMAL
+);
 Event EV_Player_GetCurrentDMWeaponType // Added in 2.30
-    ("getcurrentdmweapontype", EV_DEFAULT, NULL, NULL, "get the player's current DM weapon type.", EV_GETTER);
+(
+    "getcurrentdmweapontype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "get the player's current DM weapon type.",
+    EV_GETTER
+);
 Event EV_Player_AttachToLadder
 (
     "attachtoladder",
@@ -875,13 +995,41 @@ Event EV_Player_EnsureForwardOffLadder
     EV_NORMAL
 );
 Event EV_Player_JailIsEscaping // Added in 2.30
-    ("isEscaping", EV_DEFAULT, NULL, NULL, "Return non-zero if escaping or assisting escape", EV_GETTER);
+(
+    "isEscaping",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Return non-zero if escaping or assisting escape",
+    EV_GETTER
+);
 Event EV_Player_JailEscape // Added in 2.30
-    ("jailescape", EV_DEFAULT, NULL, NULL, "Start the escape from jail animation", EV_NORMAL);
+(
+    "jailescape",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Start the escape from jail animation",
+    EV_NORMAL
+);
 Event EV_Player_JailAssistEscape // Added in 2.30
-    ("jailassistescape", EV_DEFAULT, NULL, NULL, "Start the assist jail escape animation", EV_NORMAL);
+(
+    "jailassistescape",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Start the assist jail escape animation",
+    EV_NORMAL
+);
 Event EV_Player_JailEscapeStop // Added in 2.30
-    ("jailescapestop", EV_DEFAULT, NULL, NULL, "Stop either the escape from jail or assist animation", EV_NORMAL);
+(
+    "jailescapestop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop either the escape from jail or assist animation",
+    EV_NORMAL
+);
 Event EV_Player_GetIsDisguised
 (
     "is_disguised",
@@ -902,7 +1050,6 @@ Event EV_Player_GetHasDisguise
     "non - zero = has a disguise",
     EV_GETTER
 );
-
 Event EV_Player_SetHasDisguise
 (
     "has_disguise",
@@ -1034,19 +1181,22 @@ Event EV_GetFireHeld
     EV_GETTER
 );
 Event EV_GetPrimaryFireHeld // Added in 2.30
-    ("primaryfireheld",
+(
+    "primaryfireheld",
      EV_DEFAULT,
      NULL,
      NULL,
      "returns 1 if this player is holding the primary fire, or 0 if not",
      EV_GETTER);
 Event EV_GetSecondaryFireHeld // Added in 2.30
-    ("secondaryfireheld",
+(
+    "secondaryfireheld",
      EV_DEFAULT,
      NULL,
      NULL,
      "returns 1 if this player is holding the secondary fire, or 0 if not",
-     EV_GETTER);
+     EV_GETTER
+);
 Event EV_Player_GetReady
 (
     "ready",
@@ -1138,7 +1288,7 @@ Event EV_Player_SetPerferredWeapon
     EV_DEFAULT,
     "s",
     "weapon_name",
-    "Overrides your perferred weapon that is displayed in the stats screen.",
+    "Overrides your preferred weapon that is displayed in the stats screen.",
     EV_NORMAL
 );
 Event EV_Player_SetVoiceType
@@ -1152,33 +1302,46 @@ Event EV_Player_SetVoiceType
 );
 
 Event EV_Player_AddKills // Added in 2.0
-    ("addkills", EV_DEFAULT, "i", "kills", "Give or take kills from the player", EV_NORMAL);
+(
+    "addkills",
+    EV_DEFAULT,
+    "i",
+    "kills",
+    "Give or take kills from the player",
+    EV_NORMAL
+);
 
 Event EV_Player_KillAxis // Added in 2.30
-    ("killaxis",
-     EV_CHEAT,
-     "f",
-     "radius",
-     "Kills all of the axis that are in the passed radius, or all of them if radius is 0.",
-     EV_NORMAL);
+(
+    "killaxis",
+    EV_CHEAT,
+    "f",
+    "radius",
+    "Kills all of the axis that are in the passed radius, or all of them if radius is 0.",
+    EV_NORMAL
+);
 Event EV_Player_GetTurret // Added in 2.30
-    ("turret",
-     EV_DEFAULT,
-     NULL,
-     NULL,
-     "Returns the turret the player is using. NULL if player isn't using a turret.",
-     EV_GETTER);
+(
+    "turret",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns the turret the player is using. NULL if player isn't using a turret.",
+    EV_GETTER
+);
 Event EV_Player_GetVehicle // Added in 2.30
-    ("vehicle",
-     EV_DEFAULT,
-     NULL,
-     NULL,
-     "Returns the vehicle the player is using. NULL if player isn't using a vehicle.",
-     EV_GETTER);
+(
+    "vehicle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns the vehicle the player is using. NULL if player isn't using a vehicle.",
+    EV_GETTER
+);
 
 ////////////////////////////
 //
-// Openmohaa additions
+// Added in OPM
 //
 ////////////////////////////
 Event EV_Player_AddDeaths
@@ -1190,7 +1353,6 @@ Event EV_Player_AddDeaths
     "adds deaths number to player",
     EV_NORMAL
 );
-
 Event EV_Player_AdminRights
 (
     "adminrights",
@@ -1200,177 +1362,6 @@ Event EV_Player_AdminRights
     "returns client admin rights",
     EV_GETTER
 );
-
-Event EV_Player_BindWeap
-(
-    "bindweap",
-    EV_DEFAULT,
-    "ei",
-    "weapon handnum",
-    "binds weapon to player and sets him as weapon owner",
-    EV_NORMAL
-);
-
-Event EV_Player_CanSwitchTeams
-(
-    "canswitchteams",
-    EV_DEFAULT,
-    "bB",
-    "allow_team_change allow_spectate",
-    "Specify if this player is allowed to switch teams and spectate. Doesn't override global canswitchteams.",
-    EV_NORMAL
-);
-
-Event EV_Player_ClearCommand
-(
-    "clearcommand",
-    EV_DEFAULT,
-    "S",
-    "command",
-    "Clears any or a specific client command",
-    EV_NORMAL
-);
-
-Event EV_Player_Dive
-(
-    "dive",
-    EV_DEFAULT,
-    "fF",
-    "height airborne_duration",
-    "Makes the player dive into prone position.",
-    EV_NORMAL
-);
-
-Event EV_Player_Earthquake
-(
-    "earthquake2",
-    EV_DEFAULT,
-    "ffbbVF",
-    "duration magnitude no_rampup no_rampdown location radius",
-    "Create a smooth realistic earthquake for a player. Requires sv_reborn to be set.",
-    EV_NORMAL
-);
-
-Event EV_Player_FreezeControls
-(
-    "freezecontrols",
-    EV_DEFAULT,
-    "b",
-    "freeze_state",
-    "Blocks or unblocks control input from this player.",
-    EV_NORMAL
-);
-
-Event EV_Player_GetConnState
-(
-    "getconnstate",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "gets connection state. [DEPRECATED]",
-    EV_RETURN
-);
-
-Event EV_Player_GetDamageMultiplier
-(
-    "damage_multiplier",
-    EV_DEFAULT,
-    "Gets the current damage multiplier",
-    NULL,
-    NULL,
-    EV_GETTER
-);
-
-Event EV_Player_GetKillHandler
-(
-    "killhandler",
-    EV_DEFAULT,
-    "s",
-    "label",
-    "Gets the player's current killed event handler. Returns NIL if no custom killhandler was set.",
-    EV_GETTER
-);
-
-Event EV_Player_GetKills
-(
-    "getkills",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "gets kills number of player",
-    EV_RETURN
-);
-
-Event EV_Player_GetDeaths
-(
-    "getdeaths",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "gets deaths number of player",
-    EV_RETURN
-);
-
-Event EV_Player_GetLegsState
-(
-    "getlegsstate",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "Gets the player's current legs state name",
-    EV_RETURN
-);
-
-Event EV_Player_GetStateFile
-(
-    "statefile",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "Gets the player's current state file.",
-    EV_GETTER
-);
-
-Event EV_Player_GetTorsoState
-(
-    "gettorsostate",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "Gets the player's current torso state name",
-    EV_RETURN
-);
-
-Event EV_Player_HideEnt
-(
-    "hideent",
-    EV_DEFAULT,
-    "e",
-    "entity",
-    "Hides the specified entity to the player.",
-    EV_NORMAL
-);
-
-Event EV_Player_Inventory
-(
-    "inventory",
-    EV_DEFAULT,
-    NULL,
-    NULL,
-    "returns player's inventory",
-    EV_GETTER
-);
-
-Event EV_Player_InventorySet
-(
-    "inventory",
-    EV_DEFAULT,
-    "e",
-    "array",
-    "Set up the player's inventory",
-    EV_SETTER
-);
-
 Event EV_Player_IsAdmin
 (
     "isadmin",
@@ -1380,7 +1371,123 @@ Event EV_Player_IsAdmin
     "checks if player is logged as admin",
     EV_RETURN
 );
-
+Event EV_Player_BindWeap
+(
+    "bindweap",
+    EV_DEFAULT,
+    "ei",
+    "weapon handnum",
+    "binds weapon to player and sets him as weapon owner",
+    EV_NORMAL
+);
+Event EV_Player_Dive
+(
+    "dive",
+    EV_DEFAULT,
+    "fF",
+    "height airborne_duration",
+    "Makes the player dive into prone position.",
+    EV_NORMAL
+);
+Event EV_Player_FreezeControls
+(
+    "freezecontrols",
+    EV_DEFAULT,
+    "b",
+    "freeze_state",
+    "Blocks or unblocks control input from this player.",
+    EV_NORMAL
+);
+Event EV_Player_GetConnState
+(
+    "getconnstate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets connection state. [DEPRECATED]",
+    EV_RETURN
+);
+Event EV_Player_GetDamageMultiplier
+(
+    "damage_multiplier",
+    EV_DEFAULT,
+    "Gets the current damage multiplier",
+    NULL,
+    NULL,
+    EV_GETTER
+);
+Event EV_Player_GetKillHandler
+(
+    "killhandler",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Gets the player's current killed event handler. Returns NIL if no custom killhandler was set.",
+    EV_GETTER
+);
+Event EV_Player_GetKills
+(
+    "getkills",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets kills number of player",
+    EV_RETURN
+);
+Event EV_Player_GetDeaths
+(
+    "getdeaths",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets deaths number of player",
+    EV_RETURN
+);
+Event EV_Player_GetLegsState
+(
+    "getlegsstate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the player's current legs state name",
+    EV_RETURN
+);
+Event EV_Player_GetStateFile
+(
+    "statefile",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the player's current state file.",
+    EV_GETTER
+);
+Event EV_Player_GetTorsoState
+(
+    "gettorsostate",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the player's current torso state name",
+    EV_RETURN
+);
+Event EV_Player_Inventory
+(
+    "inventory",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "returns player's inventory",
+    EV_GETTER
+);
+Event EV_Player_InventorySet
+(
+    "inventory",
+    EV_DEFAULT,
+    "e",
+    "array",
+    "Set up the player's inventory",
+    EV_SETTER
+);
 Event EV_Player_LeanLeftHeld
 (
     "leanleftheld",
@@ -1390,7 +1497,6 @@ Event EV_Player_LeanLeftHeld
     "Returns 1 if this player is holding lean left key, or 0 if he is not",
     EV_GETTER
 );
-
 Event EV_Player_LeanRightHeld
 (
     "leanrightheld",
@@ -1400,7 +1506,6 @@ Event EV_Player_LeanRightHeld
     "returns EV_RETURN if this player is holding lean right key, or 0 if he is not",
     EV_GETTER
 );
-
 Event EV_Player_MoveSpeedScale
 (
     "moveSpeedScale",
@@ -1410,7 +1515,6 @@ Event EV_Player_MoveSpeedScale
     "Sets the player's speed multiplier (default 1.0).",
     EV_SETTER
 );
-
 Event EV_Player_MoveSpeedScaleGet
 (
     "moveSpeedScale",
@@ -1420,7 +1524,6 @@ Event EV_Player_MoveSpeedScaleGet
     "Gets the player's speed multiplier.",
     EV_GETTER
 );
-
 Event EV_Player_PlayLocalSound
 (
     "playlocalsound",
@@ -1431,17 +1534,6 @@ Event EV_Player_PlayLocalSound
     "sounds.",
     EV_NORMAL
 );
-
-Event EV_Player_Replicate
-(
-    "replicate",
-    EV_DEFAULT,
-    "s",
-    "variable",
-    "Replicate a variable to the client (needs patch 1.12).",
-    EV_NORMAL
-);
-
 Event EV_Player_RunHeld
 (
     "runheld",
@@ -1452,17 +1544,15 @@ Event EV_Player_RunHeld
     "or 0 if he is not",
     EV_GETTER
 );
-
 Event EV_Player_SecFireHeld
 (
     "secfireheld",
     EV_DEFAULT,
     NULL,
     NULL,
-    "returns EV_RETURN if this player is holding secondary fire, or 0 if he is not",
+    "returns 1 if this player is holding secondary fire, or 0 if he is not",
     EV_GETTER
 );
-
 Event EV_Player_SetAnimSpeed
 (
     "setanimspeed",
@@ -1472,7 +1562,6 @@ Event EV_Player_SetAnimSpeed
     "set the player's animation speed multiplier (default 1.0).",
     EV_NORMAL
 );
-
 Event EV_Player_SetFov
 (
     "setfov",
@@ -1482,7 +1571,6 @@ Event EV_Player_SetFov
     "set the player's fov (default 80).",
     EV_NORMAL
 );
-
 Event EV_Player_SetKillHandler
 (
     "killhandler",
@@ -1493,37 +1581,6 @@ Event EV_Player_SetKillHandler
     "killed event handler.",
     EV_SETTER
 );
-
-Event EV_Player_SetClientFlag
-(
-    "setclientflag",
-    EV_DEFAULT,
-    "s",
-    "name",
-    "Calls a flag to the script client.",
-    EV_NORMAL
-);
-
-Event EV_Player_SetEntityShader
-(
-    "setentshader",
-    EV_DEFAULT,
-    "es",
-    "entity shadername",
-    "Sets an entity shader for this player. An empty string will revert to the normal entity shader.",
-    EV_NORMAL
-);
-
-Event EV_Player_SetLocalSoundRate
-(
-    "setlocalsoundrate",
-    EV_DEFAULT,
-    "sfF",
-    "name rate time",
-    "Sets the local sound rate.",
-    EV_NORMAL
-);
-
 Event EV_Player_SetSpeed
 (
     "setspeed",
@@ -1533,7 +1590,6 @@ Event EV_Player_SetSpeed
     "Sets the player's speed multiplier (default 1.0). Index specify which array value will be used (maximum 4).",
     EV_NORMAL
 );
-
 Event EV_Player_SetStateFile
 (
     "statefile",
@@ -1543,7 +1599,6 @@ Event EV_Player_SetStateFile
     "Sets the player's current state file (setting NIL, NULL or an empty string will revert to the global statefile).",
     EV_SETTER
 );
-
 Event EV_Player_SetTeam
 (
     "setteam",
@@ -1554,17 +1609,15 @@ Event EV_Player_SetTeam
     "Available team names are 'none', 'spectator', 'freeforall', 'axis' and 'allies'.",
     EV_NORMAL
 );
-
-Event EV_Player_SetViewModelAnimSpeed
+Event EV_Player_HideEnt
 (
-    "setvmaspeed",
+    "hideent",
     EV_DEFAULT,
-    "sf",
-    "name speed",
-    "Sets the player's animation speed when playing it.",
+    "e",
+    "entity",
+    "Hides the specified entity to the player.",
     EV_NORMAL
 );
-
 Event EV_Player_ShowEnt
 (
     "showent",
@@ -1574,7 +1627,6 @@ Event EV_Player_ShowEnt
     "Shows the specified entity to the player.",
     EV_NORMAL
 );
-
 Event EV_Player_StopLocalSound
 (
     "stoplocalsound",
@@ -1584,7 +1636,6 @@ Event EV_Player_StopLocalSound
     "Stops the specified sound.",
     EV_NORMAL
 );
-
 Event EV_Player_Userinfo
 (
     "userinfo",
@@ -1594,7 +1645,6 @@ Event EV_Player_Userinfo
     "returns userinfo string",
     EV_GETTER
 );
-
 Event EV_Player_ViewModelGetAnim
 (
     "viewmodelgetanim",
@@ -1604,7 +1654,6 @@ Event EV_Player_ViewModelGetAnim
     "Gets the player's current view model animation.",
     EV_RETURN
 );
-
 Event EV_Player_ViewModelAnimFinished
 (
     "viewmodelanimfinished",
@@ -1614,7 +1663,6 @@ Event EV_Player_ViewModelAnimFinished
     "True if the player's current view model finished its animation.",
     EV_RETURN
 );
-
 Event EV_Player_ViewModelAnimValid
 (
     "viewmodelanimvalid",
@@ -1625,6 +1673,61 @@ Event EV_Player_ViewModelAnimValid
     EV_RETURN
 );
 
+#ifdef OPM_FEATURES
+Event EV_Player_Earthquake
+(
+    "earthquake2",
+    EV_DEFAULT,
+    "ffbbVF",
+    "duration magnitude no_rampup no_rampdown location radius",
+    "Create a smooth realistic earthquake for a player. Requires sv_reborn to be set.",
+    EV_NORMAL
+);
+Event EV_Player_Replicate
+(
+    "replicate",
+    EV_DEFAULT,
+    "s",
+    "variable",
+    "Replicate a variable to the client (needs patch 1.12).",
+    EV_NORMAL
+);
+Event EV_Player_SetClientFlag
+(
+    "setclientflag",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Calls a flag to the script client.",
+    EV_NORMAL
+);
+Event EV_Player_SetEntityShader
+(
+    "setentshader",
+    EV_DEFAULT,
+    "es",
+    "entity shadername",
+    "Sets an entity shader for this player. An empty string will revert to the normal entity shader.",
+    EV_NORMAL
+);
+Event EV_Player_SetLocalSoundRate
+(
+    "setlocalsoundrate",
+    EV_DEFAULT,
+    "sfF",
+    "name rate time",
+    "Sets the local sound rate.",
+    EV_NORMAL
+);
+Event EV_Player_SetViewModelAnimSpeed
+(
+    "setvmaspeed",
+    EV_DEFAULT,
+    "sf",
+    "name speed",
+    "Sets the player's animation speed when playing it.",
+    EV_NORMAL
+);
 Event EV_Player_VisionSetBlur
 (
     "visionsetblur",
@@ -1634,7 +1737,6 @@ Event EV_Player_VisionSetBlur
     "Sets the player's blur level. Level is a fraction from 0-1",
     EV_NORMAL
 );
-
 Event EV_Player_VisionGetNaked
 (
     "visiongetnaked",
@@ -1644,7 +1746,6 @@ Event EV_Player_VisionGetNaked
     "Gets the player's current naked-eye vision.",
     EV_RETURN
 );
-
 Event EV_Player_VisionSetNaked
 (
     "visionsetnaked",
@@ -1655,6 +1756,9 @@ Event EV_Player_VisionSetNaked
     "an empty string, it will revert to the current global vision.",
     EV_NORMAL
 );
+#endif
+
+qboolean TryPush(int entnum, vec3_t move_origin, vec3_t move_end);
 
 /*
 ==============================================================================
@@ -1806,11 +1910,7 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_AddDeaths,                &Player::AddDeaths                    },
     {&EV_Player_AdminRights,              &Player::AdminRights                  },
     {&EV_Player_BindWeap,                 &Player::BindWeap                     },
-    {&EV_Player_CanSwitchTeams,           &Player::CanSwitchTeams               },
-    {&EV_Player_ClearCommand,             &Player::ClearCommand                 },
     {&EV_Player_Dive,                     &Player::Dive                         },
-    {&EV_Player_DMMessage,                &Player::EventDMMessage               },
-    {&EV_Player_Earthquake,               &Player::EventEarthquake              },
     {&EV_Player_FreezeControls,           &Player::FreezeControls               },
     {&EV_Player_SetTeam,                  &Player::EventSetTeam                 },
     {&EV_Player_GetConnState,             &Player::GetConnState                 },
@@ -1834,13 +1934,9 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_RunHeld,                  &Player::RunHeld                      },
     {&EV_Player_SecFireHeld,              &Player::SecFireHeld                  },
     {&EV_Player_SetAnimSpeed,             &Player::SetAnimSpeed                 },
-    {&EV_Player_SetClientFlag,            &Player::SetClientFlag                },
-    {&EV_Player_SetEntityShader,          &Player::SetEntityShader              },
     {&EV_Player_SetKillHandler,           &Player::SetKillHandler               },
-    {&EV_Player_SetLocalSoundRate,        &Player::SetLocalSoundRate            },
     {&EV_Player_SetSpeed,                 &Player::SetSpeed                     },
     {&EV_Player_SetStateFile,             &Player::SetStateFile                 },
-    {&EV_Player_SetViewModelAnimSpeed,    &Player::SetVMASpeed                  },
     {&EV_Player_ShowEnt,                  &Player::ShowEntity                   },
     {&EV_Player_Spectator,                &Player::Spectator                    },
     {&EV_Player_StopLocalSound,           &Player::StopLocalSound               },
@@ -1848,9 +1944,16 @@ CLASS_DECLARATION(Sentient, Player, "player") {
     {&EV_Player_ViewModelAnimFinished,    &Player::EventGetViewModelAnimFinished},
     {&EV_Player_ViewModelGetAnim,         &Player::EventGetViewModelAnim        },
     {&EV_Player_ViewModelAnimValid,       &Player::EventGetViewModelAnimValid   },
+#ifdef OPM_FEATURES
+    {&EV_Player_Earthquake,               &Player::EventEarthquake              },
+    {&EV_Player_SetClientFlag,            &Player::SetClientFlag                },
+    {&EV_Player_SetEntityShader,          &Player::SetEntityShader              },
+    {&EV_Player_SetLocalSoundRate,        &Player::SetLocalSoundRate            },
+    {&EV_Player_SetViewModelAnimSpeed,    &Player::SetVMASpeed                  },
     {&EV_Player_VisionGetNaked,           &Player::VisionGetNaked               },
     {&EV_Player_VisionSetBlur,            &Player::VisionSetBlur                },
     {&EV_Player_VisionSetNaked,           &Player::VisionSetNaked               },
+#endif
     {NULL,                                NULL                                  }
 };
 
@@ -1879,7 +1982,7 @@ Player::Player()
     //
     // set the entity type
     //
-    entflags |= EF_PLAYER;
+    entflags |= ECF_PLAYER;
 
     mCurTrailOrigin   = 0;
     mLastTrailTime    = 0;
@@ -1921,6 +2024,19 @@ Player::Player()
     m_iInvulnerableTimeRemaining = 0;
     m_fLastVoteTime              = 0;
 
+    //
+    // Added in OPM
+    //====
+#ifdef OPM_FEATURES
+    m_bShowingHint = false;
+#endif
+    m_fpsTiki    = NULL;
+    m_bConnected = false;
+
+    m_iInstantMessageTime = 0;
+    m_iTextChatTime       = 0;
+    //====
+
     if (LoadingSavegame) {
         return;
     }
@@ -2062,22 +2178,16 @@ Player::Player()
     m_vViewPos = vec_zero;
 
     //
-    // Openmohaa additions
-    //
-    m_bShowingHint      = false;
-    disable_spectate    = false;
-    disable_team_change = false;
-    m_bFrozen           = false;
-    animDoneVM          = true;
-    m_fVMAtime          = 0;
-    m_fpsTiki           = NULL;
+    // Added in OPM
+    //====
+    m_bFrozen  = false;
+    animDoneVM = true;
+    m_fVMAtime = 0;
+    //====
 
     for (int i = 0; i < MAX_SPEED_MULTIPLIERS; i++) {
         speed_multiplier[i] = 1.0f;
     }
-
-    m_pKilledEvent = NULL;
-    m_bConnected   = false;
 }
 
 Player::~Player()
@@ -2085,8 +2195,6 @@ Player::~Player()
     int          i, num;
     Conditional *cond;
 
-    gi.DPrintf("Player::~Player()\n");
-    //assert(0);
     num = legs_conditionals.NumObjects();
     for (i = num; i > 0; i--) {
         cond = legs_conditionals.ObjectAt(i);
@@ -2101,6 +2209,19 @@ Player::~Player()
 
     legs_conditionals.FreeObjectList();
     torso_conditionals.FreeObjectList();
+
+    // Added in 2.11
+    //  Make sure to clean turret stuff up
+    //  when the player is deleted
+    RemoveFromVehiclesAndTurrets();
+
+    // Added in OPM
+    //  Remove the player at destructor
+    if (g_gametype->integer != GT_SINGLE_PLAYER && dmManager.PlayerCount()) {
+        dmManager.RemovePlayer(this);
+    }
+
+    entflags &= ~ECF_PLAYER;
 }
 
 static qboolean logfile_started = qfalse;
@@ -2142,13 +2263,15 @@ void Player::Init(void)
     level.Unregister(STRING_PLAYERSPAWN);
 
     //
-    // Added for openmohaa
+    // Added in OPM
     //
     if (!m_bConnected) {
         m_bConnected = true;
 
         Event *ev = new Event;
         ev->AddEntity(this);
+
+        scriptDelegate_connected.Trigger(this, *ev);
         scriptedEvents[SE_CONNECTED].Trigger(ev);
     }
 
@@ -2191,7 +2314,6 @@ void Player::InitEdict(void)
 }
 
 void Player::InitSound(void)
-
 {
     //
     // reset the music
@@ -2218,7 +2340,7 @@ void Player::InitClient(void)
     client_persistant_t saved;
 
     // deathmatch wipes most client data every spawn
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         char       userinfo[MAX_INFO_STRING];
         char       dm_primary[MAX_QPATH];
         float      enterTime   = client->pers.enterTime;
@@ -2248,7 +2370,9 @@ void Player::InitClient(void)
 
     SetStopwatch(0);
 
+#ifdef OPM_FEATURES
     m_bShowingHint = false;
+#endif
 }
 
 void Player::InitState(void)
@@ -2277,7 +2401,6 @@ void Player::InitState(void)
 }
 
 void Player::InitHealth(void)
-
 {
     static cvar_t *pMaxHealth = gi.Cvar_Get("g_maxplayerhealth", "250", 0);
     static cvar_t *pDMHealth  = gi.Cvar_Get("g_playerdmhealth", "100", 0);
@@ -2288,28 +2411,28 @@ void Player::InitHealth(void)
         return;
     }
 
-    if (g_gametype->integer != GT_SINGLE_PLAYER) {
-        if (pDMHealth->integer > 0) {
-            max_health = pDMHealth->integer;
-        } else {
-            max_health = 100.f;
-        }
-
-        health = max_health;
-    } else if (!g_realismmode->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER && !g_realismmode->integer) {
         max_health = pMaxHealth->integer;
-        health     = max_health;
+    } else if (g_gametype->integer != GT_SINGLE_PLAYER && pDMHealth->integer > 0) {
+        max_health = pDMHealth->integer;
     } else {
         // reset the health values
-        health     = 100;
-        max_health = health;
+        max_health = 100;
     }
 
+    health = max_health;
+
     // 2.0:
     //  Make sure to clear the heal rate and the dead flag when respawning
     //
     m_fHealRate = 0;
     edict->s.eFlags &= ~EF_DEAD;
+
+    // Fixed in OPM
+    //  This avoid losing weapons when dying and then immediately respawning
+    CancelEventsOfType(EV_Player_DMDeathDrop);
+    //  And this prevents the player from dying when respawning immediately after getting killed
+    CancelEventsOfType(EV_Player_Dead);
 }
 
 void Player::InitModel(void)
@@ -2325,8 +2448,8 @@ void Player::InitModel(void)
     if (g_gametype->integer == GT_SINGLE_PLAYER) {
         setModel("models/player/" + str(g_playermodel->string) + ".tik");
     } else if (dm_team == TEAM_AXIS) {
-        if (Q_stricmpn(client->pers.dm_playermodel, "german", 6)
-            && Q_stricmpn(client->pers.dm_playermodel, "axis", 4)
+        if (Q_stricmpn(client->pers.dm_playergermanmodel, "german", 6)
+            && Q_stricmpn(client->pers.dm_playergermanmodel, "axis", 4)
             //
             // 2.30 models
             //
@@ -2409,15 +2532,20 @@ void Player::InitModel(void)
         }
     }
 
+    InitModelFps();
+}
+
+void Player::InitModelFps(void)
+{
     char  model_name[MAX_STRING_TOKENS];
     char *model_replace;
 
-    strcpy(model_name, model.c_str());
+    Q_strncpyz(model_name, model.c_str(), sizeof(model_name));
     size_t len = strlen(model_name);
 
     model_replace = model_name + len - 4;
 
-    strcpy(model_replace, "_fps.tik");
+    Q_strncpyz(model_replace, "_fps.tik", sizeof(model_name) - (model_replace - model_name));
 
     m_fpsTiki = gi.modeltiki(model_name);
 }
@@ -2437,10 +2565,13 @@ void Player::InitPhysics(void)
     memset(&last_ucmd, 0, sizeof(last_ucmd));
 
     client->ps.groundTrace.fraction = 1.0f;
+
+    // Added in OPM
+    //  Prevent the player from being stuck
+    flags &= ~FL_PARTIAL_IMMOBILE;
 }
 
 void Player::InitPowerups(void)
-
 {
     // powerups
     poweruptimer = 0;
@@ -2464,27 +2595,35 @@ void Player::InitMaxAmmo(void)
     GiveAmmo("heavy", 0, 5);
     GiveAmmo("shotgun", 0, 50);
 
-    //
-    // Team tactics ammunition
-    //
-    GiveAmmo("landmine", 0, 5);
+    if (g_target_game >= target_game_e::TG_MOHTT) {
+        //
+        // Team tactics ammunition
+        //
+        GiveAmmo("landmine", 0, 5);
+    }
 
-    //
-    // Team assault ammunition
-    //
-    GiveAmmo("smokegrenade", 0, 5);
-    GiveAmmo("asmokegrenade", 0, 5);
-    GiveAmmo("riflegrenade", 0, 3);
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        //
+        // Team assault ammunition
+        //
+        GiveAmmo("smokegrenade", 0, 5);
+        GiveAmmo("asmokegrenade", 0, 5);
+        GiveAmmo("riflegrenade", 0, 3);
+    }
 }
 
 void Player::InitWeapons(void)
-
 {
     // Don't do anything if we're loading a server game.
     // This is either a loadgame or a restart
     if (LoadingSavegame) {
         return;
     }
+
+    // Added in OPM
+    //  This fixes a bug where player can charge then go to spectator or respawn.
+    //  The grenade would immediately explode when firing
+    charge_start_time = 0;
 }
 
 void Player::InitInventory(void) {}
@@ -2509,7 +2648,7 @@ void Player::ChooseSpawnPoint(void)
     origin.copyTo(edict->s.origin2);
     edict->s.renderfx |= RF_FRAMELERP;
 
-    if (g_gametype->integer && !IsSpectator()) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !IsSpectator()) {
         KillBox(this);
     }
 
@@ -2520,7 +2659,7 @@ void Player::ChooseSpawnPoint(void)
     VectorCopy(origin, client->ps.vEyePos);
     client->ps.vEyePos[2] += client->ps.viewheight;
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         for (int i = 1; i <= 4; i++) {
             Event *ev = new Event(EV_SetViewangles);
             ev->AddVector(p->angles);
@@ -2537,8 +2676,12 @@ void Player::ChooseSpawnPoint(void)
 }
 
 void Player::EndLevel(Event *ev)
-
 {
+    if (IsDead()) {
+        ScriptError("cannot do player.endlevel if the player is dead");
+        return;
+    }
+
     InitPowerups();
     if (health > max_health) {
         health = max_health;
@@ -2551,7 +2694,7 @@ void Player::EndLevel(Event *ev)
 
 void Player::Respawn(Event *ev)
 {
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         bool bOldVoted;
 
         if (health <= 0.0f) {
@@ -2589,13 +2732,12 @@ void Player::Respawn(Event *ev)
     }
 
     //
-    // Added in openmohaa
+    // Added in OPM
     //
     Unregister(STRING_RESPAWN);
 }
 
 void Player::SetDeltaAngles(void)
-
 {
     int i;
 
@@ -2674,13 +2816,13 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
             if (dedicated->integer) {
-                gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(szConv1.c_str()));
+                gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(szConv2.c_str()));
             }
 
-            G_PrintDeathMessage(szConv1, s2.c_str(), "x", client->pers.netname, this, "s");
+            G_PrintDeathMessage(s1, szConv2.c_str(), "x", client->pers.netname, this, "s");
         } else {
             if (dedicated->integer) {
                 gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(s1.c_str()));
@@ -2795,20 +2937,20 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
             G_PrintDeathMessage(
-                szConv1.c_str(), s2.c_str(), attacker->client->pers.netname, client->pers.netname, this, "p"
+                s1.c_str(), szConv2.c_str(), attacker->client->pers.netname, client->pers.netname, this, "p"
             );
 
             if (dedicated->integer) {
                 str szLoc1, szLoc2;
 
-                szLoc1 = gi.LV_ConvertString(szConv1.c_str());
+                szLoc1 = gi.LV_ConvertString(s1.c_str());
                 if (s2 == 'x') {
                     gi.Printf("%s %s %s\n", client->pers.netname, szLoc1.c_str(), attacker->client->pers.netname);
                 } else {
-                    szLoc2 = gi.LV_ConvertString(s2.c_str());
+                    szLoc2 = gi.LV_ConvertString(szConv2.c_str());
                     gi.Printf(
                         "%s %s %s%s\n",
                         client->pers.netname,
@@ -2882,9 +3024,9 @@ void Player::Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int
         }
 
         if (bDispLocation && g_obituarylocation->integer) {
-            str szConv1 = s1 + str(" ") + G_LocationNumToDispString(iLocation);
+            str szConv2 = s2 + " in the " + G_LocationNumToDispString(iLocation);
 
-            G_PrintDeathMessage(szConv1.c_str(), s2.c_str(), "x", client->pers.netname, this, "w");
+            G_PrintDeathMessage(s1.c_str(), szConv2.c_str(), "x", client->pers.netname, this, "w");
 
             if (dedicated->integer) {
                 gi.Printf("%s %s\n", client->pers.netname, gi.LV_ConvertString(s1.c_str()));
@@ -2960,15 +3102,17 @@ void Player::Killed(Event *ev)
     Event  *event;
 
     //
+    // Added in OPM
     // This one is openmohaa-specific
     //  Custom killed event will do the job
     //
-    if (m_pKilledEvent) {
-        event = new Event(m_pKilledEvent);
+    if (m_killedLabel.IsSet()) {
+        event = new Event(0, ev->NumArgs());
         for (int i = 1; i <= ev->NumArgs(); i++) {
             event->AddValue(ev->GetValue(i));
         }
-        ProcessEvent(event);
+        m_killedLabel.Execute(this, event);
+        delete event;
 
         Unregister(STRING_DEATH);
         return;
@@ -2991,14 +3135,14 @@ void Player::Killed(Event *ev)
 
     RemoveFromVehiclesAndTurrets();
 
-    if (g_gametype->integer && attacker && attacker->IsSubclassOfPlayer()) {
-        ((Player *)attacker)->KilledPlayerInDeathmatch(this);
+    if (g_gametype->integer != GT_SINGLE_PLAYER && attacker && attacker->IsSubclassOfPlayer()) {
+        static_cast<Player *>(attacker)->KilledPlayerInDeathmatch(this, (meansOfDeath_t)meansofdeath);
     }
 
     deadflag = DEAD_DYING;
     health   = 0;
 
-    event = new Event(EV_Pain);
+    event = new Event(EV_Pain, 10);
 
     event->AddEntity(attacker);
     event->AddFloat(ev->GetFloat(2));
@@ -3013,7 +3157,7 @@ void Player::Killed(Event *ev)
 
     ProcessEvent(event);
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         if (HasItem("Binoculars")) {
             takeItem("Binoculars");
         }
@@ -3064,9 +3208,10 @@ void Player::Killed(Event *ev)
     }
 
     //
-    // Openmohaa scripted events
+    // Added in OPM
+    //  Scripted events
     //
-    event = new Event;
+    event = new Event(0, 11);
 
     event->AddEntity(ev->GetEntity(1));
     event->AddFloat(ev->GetFloat(2));
@@ -3080,6 +3225,7 @@ void Player::Killed(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
+    scriptDelegate_kill.Trigger(this, *event);
     scriptedEvents[SE_KILL].Trigger(event);
 
     Unregister(STRING_DEATH);
@@ -3150,49 +3296,59 @@ void Player::SetStopwatch(int iDuration, stopWatchType_t type)
             }
         }
 
-        sprintf(szCmd, "stopwatch %i %i %i", iStartTime, iDuration, type);
+        Com_sprintf(szCmd, sizeof(szCmd), "stopwatch %i %i %i", iStartTime, iDuration, type);
     } else {
         iStartTime = 0;
         if (iDuration) {
             iStartTime = (int)level.svsFloatTime;
         }
 
-        sprintf(szCmd, "stopwatch %i %i", iStartTime, iDuration);
+        Com_sprintf(szCmd, sizeof(szCmd), "stopwatch %i %i", iStartTime, iDuration);
     }
 
     gi.SendServerCommand(edict - g_entities, szCmd);
 }
 
-void Player::KilledPlayerInDeathmatch(Player *killed)
+void Player::KilledPlayerInDeathmatch(Player *killed, meansOfDeath_t meansofdeath)
 {
-	DM_Team* pDMTeam;
+    DM_Team *pDMTeam;
 
-	pDMTeam = killed->GetDM_Team();
+    pDMTeam = killed->GetDM_Team();
+
+    if (meansofdeath == MOD_TELEFRAG) {
+        //
+        // Added in OPM
+        //  Telefrag isn't the fault of anyone
+        //  so don't count any kill
+        //
+        return;
+    }
 
     if (killed == this) {
         pDMTeam->AddKills(this, -1);
         gi.SendServerCommand(
             edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString("You killed yourself")
         );
-    } else {
-        if (pDMTeam != GetDM_Team() || g_gametype->integer <= GT_FFA || g_gametype->integer >= GT_MAX_GAME_TYPE) {
-            current_team->AddKills(this, 1);
-        } else {
-            //
-            // A teammate was killed
-            //
-            current_team->AddKills(this, -1);
 
-            num_team_kills++;
-        }
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "print \"" HUD_MESSAGE_WHITE "%s %s\n\"",
-            gi.LV_ConvertString("You killed"),
-            killed->client->pers.netname
-        );
+        return;
     }
+
+    if (pDMTeam == GetDM_Team() && g_gametype->integer >= GT_TEAM) {
+        //
+        // A teammate was killed
+        //
+        current_team->AddKills(this, -1);
+        num_team_kills++;
+    } else {
+        current_team->AddKills(this, 1);
+    }
+
+    gi.SendServerCommand(
+        edict - g_entities,
+        "print \"" HUD_MESSAGE_WHITE "%s %s\n\"",
+        gi.LV_ConvertString("You killed"),
+        killed->client->pers.netname
+    );
 }
 
 void Player::Pain(Event *ev)
@@ -3235,7 +3391,7 @@ void Player::Pain(Event *ev)
     pain_location = iLocation;
 
     // Only set the regular pain level if enough time since last pain has passed
-    if ((level.time > nextpaintime) && take_pain) {
+    if (((level.time > nextpaintime) && take_pain) || IsDead()) {
         pain = damage;
     }
 
@@ -3254,7 +3410,7 @@ void Player::Pain(Event *ev)
         }
     }
 
-    if (g_gametype->integer && attacker && attacker->client && attacker != this) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && attacker && attacker->client && attacker != this) {
         gi.MSG_SetClient(attacker->edict - g_entities);
         if (IsDead()) {
             gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_NOTIFY_KILL));
@@ -3288,23 +3444,52 @@ void Player::DoUse(Event *ev)
     int        touch[MAX_GENTITIES];
     int        num;
     int        i;
+    bool       bWasInTurretOrVehicle;
 
     if (g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator()) {
+        // Prevent using stuff while spectating
         return;
     }
 
     if (IsDead()) {
+        // Dead players mustn't use
         return;
     }
 
-    if (m_pVehicle || m_pTurret) {
-        RemoveFromVehiclesAndTurretsInternal();
-    } else if (!(buttons & BUTTON_ATTACKLEFT) && !(buttons & BUTTON_ATTACKRIGHT)) {
-        //
-        // Allow use if the player isn't holding attack buttons
-        //
-        num = getUseableEntities(touch, MAX_GENTITIES, true);
+    if (edict->r.svFlags & SVF_NOCLIENT) {
+        // Fixed in OPM
+        //  Clients that are not sent to other clients cannot use objects.
+        //  Some mods make players non-solid, hide them and turn physics off
+        //  as a way to spectate other players or for cinematics.
+        //  This prevent players to use objects such as doors
+        return;
+    }
 
+    bWasInTurretOrVehicle = m_pVehicle || m_pTurret;
+
+    if (bWasInTurretOrVehicle) {
+        RemoveFromVehiclesAndTurretsInternal();
+        return;
+    }
+
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if ((buttons & BUTTON_ATTACKLEFT) || (buttons & BUTTON_ATTACKRIGHT)) {
+            //
+            // Added in 2.0
+            //  Only allow use if the player isn't holding attack buttons
+            //
+            return;
+        }
+    }
+
+    num = getUseableEntities(touch, MAX_GENTITIES, true);
+
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        // Fixed in 2.0
+        //  Since 2.0, the loop stops when the player
+        //  uses a turret, this prevents the turret from being deleted
+        //  after being attached to the player
+        //
         for (i = 0; i < num; i++) {
             hit = &g_entities[touch[i]];
 
@@ -3317,45 +3502,40 @@ void Player::DoUse(Event *ev)
 
             hit->entity->ProcessEvent(event);
 
-            if (m_pVehicle || m_pTurret)
-            {
-                if (m_pVehicle)
-                {
-                    //
-                    // transmit the godmode to the vehicle
-                    //
-                    if (flags & FL_GODMODE) {
-                        m_pVehicle->flags |= FL_GODMODE;
-                    } else {
-                        m_pVehicle->flags &= ~FL_GODMODE;
-                    }
-                }
-
-                return;
+            if (m_pVehicle || m_pTurret) {
+                break;
             }
         }
-    }
+    } else {
+        //
+        // Backward compatibility
+        // It still allows 1.11 SP to work properly
+        // Such as in m1l1 when the player must man the mounted machine gun
+        for (i = 0; i < num; i++) {
+            hit = &g_entities[touch[i]];
 
-    // FIXME: special game feature
-#if 0
+            if (!hit->inuse) {
+                continue;
+            }
 
-    // Now retrieve entities that doesn't require to look at
-    num = getUseableEntities( touch, MAX_GENTITIES, false );
+            Event *event = new Event(EV_Use);
+            event->AddListener(this);
 
-    for( i = 0; i < num; i++ )
-    {
-        hit = &g_entities[ touch[ i ] ];
-
-        if( !hit->inuse || hit->entity == NULL || hit->entity == this ) {
-            continue;
+            hit->entity->ProcessEvent(event);
+        }
+    }
+
+    if (!bWasInTurretOrVehicle && m_pVehicle) {
+        //
+        // Added in 2.30
+        //  Make the vehicle also invincible if the player is invincible
+        //
+        if (flags & FL_GODMODE) {
+            m_pVehicle->flags |= FL_GODMODE;
+        } else {
+            m_pVehicle->flags &= ~FL_GODMODE;
         }
-
-        Event *event = new Event( EV_Use );
-        event->AddListener( this );
-
-        hit->entity->ProcessEvent( event );
     }
-#endif
 }
 
 void Player::TouchStuff(pmove_t *pm)
@@ -3410,7 +3590,7 @@ void Player::GetMoveInfo(pmove_t *pm)
 {
     moveresult = pm->moveresult;
 
-    if (!deadflag || (g_gametype->integer && IsSpectator())) {
+    if (!deadflag || (g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator())) {
         v_angle[0] = pm->ps->viewangles[0];
         v_angle[1] = pm->ps->viewangles[1];
         v_angle[2] = pm->ps->viewangles[2];
@@ -3448,11 +3628,15 @@ void Player::GetMoveInfo(pmove_t *pm)
         }
 
         //
-        // Openmohaa fix
+        // Fixed in OPM
         //  Disable predictions when the groundentity is moving up/down, looks like shaky otherwise
         if (groundentity->entity && groundentity->entity != this && groundentity->entity->velocity[2] != 0) {
             pm->ps->pm_flags |= PMF_NO_PREDICTION;
         }
+    } else if (m_pGlueMaster) {
+        // Added in OPM
+        //  Use the glue master for the ground entity to make the viewmodel will stay still
+        pm->ps->groundEntityNum = m_pGlueMaster->entnum;
     }
 
     velocity = Vector(pm->ps->velocity[0], pm->ps->velocity[1], pm->ps->velocity[2]);
@@ -3535,20 +3719,29 @@ void Player::SetMoveInfo(pmove_t *pm, usercmd_t *ucmd)
             pm->alwaysAllowLean = qfalse;
         }
 
-        pm->leanMax = 45.f;
-        pm->leanAdd = 6.f;
+        pm->leanMax          = 45.f;
+        pm->leanAdd          = 6.f;
         pm->leanRecoverSpeed = 8.5f;
-        pm->leanSpeed = 2.f;
+        pm->leanSpeed        = 2.f;
     } else {
         pm->alwaysAllowLean = qtrue;
+        if (g_gametype->integer != GT_SINGLE_PLAYER) {
+            pm->leanMax = 40.f;
+        } else {
+            // Don't allow lean in single-player, like in the original game
+            pm->leanMax = 0;
+        }
 
-        pm->leanMax = 40.f;
-        pm->leanAdd = 10.f;
+        pm->leanAdd          = 10.f;
         pm->leanRecoverSpeed = 15.f;
-        pm->leanSpeed = 4.f;
+        pm->leanSpeed        = 4.f;
     }
 
-	pm->protocol = g_protocol;
+    pm->protocol = g_protocol;
+
+    // Added in OPM
+    //  Initialize the ground entity
+    pm->ps->groundEntityNum = ENTITYNUM_NONE;
 }
 
 pmtype_t Player::GetMovePlayerMoveType(void)
@@ -3622,7 +3815,6 @@ qboolean Player::AnimMove(Vector& move, Vector *endpos)
 }
 
 qboolean Player::TestMove(Vector& move, Vector *endpos)
-
 {
     trace_t trace;
     Vector  pos(origin + move);
@@ -3675,7 +3867,6 @@ qboolean Player::TestMove(Vector& move, Vector *endpos)
 }
 
 float Player::TestMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -3761,7 +3952,6 @@ qboolean Player::CheckMove(Vector& move, Vector *endpos)
 }
 
 float Player::CheckMoveDist(Vector& move)
-
 {
     Vector endpos;
 
@@ -3776,7 +3966,7 @@ void Player::ClientMove(usercmd_t *ucmd)
     pmove_t pm;
     Vector  move;
 
-#if 0
+#ifdef OPM_FEATURES
     int  touch[MAX_GENTITIES];
     int  num        = getUseableEntities(touch, MAX_GENTITIES, true);
     bool bHintShown = false;
@@ -3795,13 +3985,12 @@ void Player::ClientMove(usercmd_t *ucmd)
         m_bShowingHint = false;
 
         // FIXME: delete
-        if (sv_specialgame->integer)
-        {
+        if (sv_specialgame->integer) {
             gi.MSG_SetClient(edict - g_entities);
 
             // Send the hint string once
             gi.MSG_StartCGM(CGM_HINTSTRING);
-                gi.MSG_WriteString("");
+            gi.MSG_WriteString("");
             gi.MSG_EndCGM();
         }
     }
@@ -3812,8 +4001,8 @@ void Player::ClientMove(usercmd_t *ucmd)
     client->ps.pm_type = GetMovePlayerMoveType();
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     if (level.playerfrozen || m_bFrozen) {
         client->ps.pm_flags |= PMF_FROZEN;
@@ -3833,23 +4022,24 @@ void Player::ClientMove(usercmd_t *ucmd)
         client->ps.pm_flags |= PMF_NO_MOVE;
     }
 
-    /*
-    if (maxs.z == 60.0f) {
-        client->ps.pm_flags |= PMF_DUCKED;
-    } else if (maxs.z == 54.0f) {
-        client->ps.pm_flags |= PMF_DUCKED | PMF_VIEW_PRONE;
-    } else if (maxs.z == 20.0f) {
-        client->ps.pm_flags |= PMF_VIEW_PRONE;
-    } else if (maxs.z == 53.0f) {
-        client->ps.pm_flags |= PMF_VIEW_DUCK_RUN;
-    } else if (viewheight == 52) {
-        client->ps.pm_flags |= PMF_VIEW_JUMP_START;
-    }
-    */
-    if (maxs.z == 54.0f ||maxs.z == 60.0f) {
-        client->ps.pm_flags |= PMF_DUCKED;
-    } else if (viewheight == 52) {
-        client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (maxs.z == 54.0f || maxs.z == 60.0f) {
+            client->ps.pm_flags |= PMF_DUCKED;
+        } else if (viewheight == JUMP_START_VIEWHEIGHT) {
+            client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+        }
+    } else {
+        if (maxs.z == 60.0f) {
+            client->ps.pm_flags |= PMF_DUCKED;
+        } else if (maxs.z == 54.0f) {
+            client->ps.pm_flags |= PMF_DUCKED | PMF_VIEW_PRONE;
+        } else if (maxs.z == 20.0f) {
+            client->ps.pm_flags |= PMF_VIEW_PRONE;
+        } else if (maxs.z == 53.0f) {
+            client->ps.pm_flags |= PMF_VIEW_DUCK_RUN;
+        } else if (viewheight == JUMP_START_VIEWHEIGHT) {
+            client->ps.pm_flags |= PMF_VIEW_JUMP_START;
+        }
     }
 
     switch (movecontrol) {
@@ -3893,19 +4083,19 @@ void Player::ClientMove(usercmd_t *ucmd)
             // Also use the weapon movement speed
             //
             if (!IsZoomed()) {
-                client->ps.speed = (float)client->ps.speed * pWeap->m_fMovementSpeed;
+                client->ps.speed = (float)client->ps.speed * pWeap->GetMovementSpeed();
             } else {
-                client->ps.speed = (float)client->ps.speed * pWeap->m_fZoomMovement * pWeap->m_fMovementSpeed;
+                client->ps.speed = (float)client->ps.speed * pWeap->GetZoomMovement();
             }
         }
     }
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         client->ps.speed = (int)((float)client->ps.speed * sv_dmspeedmult->value);
     }
 
     //====
-    // Openmohaa addition
+    // Added in OPM
     for (int i = 0; i < MAX_SPEED_MULTIPLIERS; i++) {
         client->ps.speed = (int)((float)client->ps.speed * speed_multiplier[i]);
     }
@@ -4000,11 +4190,11 @@ void Player::VehicleMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     // disable prediction
-    client->ps.pm_flags |= PMF_NO_GRAVITY | PMF_NO_PREDICTION;
+    client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
 
     if (level.playerfrozen || m_bFrozen) {
         client->ps.pm_flags |= PMF_FROZEN;
@@ -4014,6 +4204,10 @@ void Player::VehicleMove(usercmd_t *ucmd)
 
     if (m_pVehicle->Drive(current_ucmd)) {
         client->ps.commandTime = ucmd->serverTime;
+        // Added in OPM
+        //  The player can't walk while attached to a vehicle
+        client->ps.groundEntityNum = ENTITYNUM_NONE;
+        client->ps.walking         = false;
     } else {
         ClientMove(ucmd);
     }
@@ -4031,13 +4225,13 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     // set move flags
     client->ps.pm_flags &=
-        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_NO_GRAVITY | PMF_VIEW_PRONE
-          | PMF_VIEW_DUCK_RUN | PMF_VIEW_JUMP_START);
+        ~(PMF_FROZEN | PMF_NO_PREDICTION | PMF_NO_MOVE | PMF_DUCKED | PMF_TURRET | PMF_VIEW_PRONE | PMF_VIEW_DUCK_RUN
+          | PMF_VIEW_JUMP_START);
 
     // disable prediction
-    client->ps.pm_flags |= PMF_NO_GRAVITY | PMF_NO_PREDICTION;
+    client->ps.pm_flags |= PMF_TURRET | PMF_NO_PREDICTION;
     if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
-        client->ps.pm_flags |= PMF_NO_GRAVITY;
+        client->ps.pm_flags |= PMF_TURRET;
     }
 
     if (level.playerfrozen || m_bFrozen) {
@@ -4046,17 +4240,25 @@ void Player::TurretMove(usercmd_t *ucmd)
 
     client->ps.gravity = gravity * sv_gravity->value;
 
-    if (!m_pTurret->IsSubclassOfTurretGun()
-        || (m_pTurret->IsSubclassOfTurretGun() && m_pTurret->UserAim(current_ucmd))) {
-        ClientMove(ucmd);
-    } else {
+    if (m_pVehicle) {
+        // Added in 2.30
+        m_pVehicle->PathDrive(current_ucmd);
+    }
+
+    if (m_pTurret->IsSubclassOfTurretGun() && m_pTurret->UserAim(current_ucmd)) {
         client->ps.commandTime = ucmd->serverTime;
+        // Added in OPM
+        //  The player can't walk while attached to a turret
+        client->ps.groundEntityNum = ENTITYNUM_NONE;
+        client->ps.walking         = false;
+    } else {
+        ClientMove(ucmd);
     }
 }
 
 void Player::ClientInactivityTimer(void)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4074,7 +4276,7 @@ void Player::ClientInactivityTimer(void)
         //
         // The player reached maximum team kills
         //
-        G_PrintToAllClients(va("%s %s", client->pers.netname, message.c_str()), qfalse);
+        G_PrintToAllClients(va("%s %s\n", client->pers.netname, message.c_str()), 2);
 
         if (Q_stricmp(Info_ValueForKey(client->pers.userinfo, "ip"), "localhost")) {
             //
@@ -4103,7 +4305,7 @@ void Player::ClientInactivityTimer(void)
         );
     }
 
-    if (current_ucmd->buttons & BUTTON_MOUSE || (!g_inactivespectate->integer && !g_inactivekick->integer)
+    if (current_ucmd->buttons & BUTTON_ANY || (!g_inactivespectate->integer && !g_inactivekick->integer)
         || current_ucmd->forwardmove || current_ucmd->rightmove || current_ucmd->upmove
         || (m_bTempSpectator && client->lastActiveTime >= level.inttime - 5000)) {
         client->lastActiveTime = level.inttime;
@@ -4193,7 +4395,7 @@ void Player::UpdateEnemies(void)
     float  fMaxCosSquared;
     Vector vLookDir;
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4266,7 +4468,7 @@ void Player::ClientThink(void)
 
     TickSprint();
 
-    if (g_gametype->integer && dm_team == TEAM_SPECTATOR && !IsSpectator()) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && dm_team == TEAM_SPECTATOR && !IsSpectator()) {
         Spectator();
     }
 
@@ -4318,7 +4520,7 @@ void Player::ClientThink(void)
         client->cmd_angles[1] = SHORT2ANGLE(current_ucmd->angles[1]);
         client->cmd_angles[2] = SHORT2ANGLE(current_ucmd->angles[2]);
 
-        if (g_gametype->integer && g_smoothClients->integer && !IsSubclassOfBot()) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer) {
             VectorCopy(client->ps.velocity, edict->s.pos.trDelta);
             edict->s.pos.trTime = client->ps.commandTime;
         } else {
@@ -4331,6 +4533,7 @@ void Player::ClientThink(void)
         if (g_gametype->integer != GT_SINGLE_PLAYER) {
             client->ps.pm_flags |= PMF_FROZEN;
             client->ps.pm_flags |= PMF_INTERMISSION;
+            VectorClear(client->ps.velocity);
 
             if (level.time - level.intermissiontime > 5.0f
                 && (new_buttons & (BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT))) {
@@ -4352,12 +4555,13 @@ void Player::ClientThink(void)
                 || g_medalbt3->modificationCount > 1 || g_medalbt4->modificationCount > 1
                 || g_medalbt5->modificationCount > 1 || g_eogmedal0->modificationCount > 1
                 || g_eogmedal1->modificationCount > 1 || g_eogmedal2->modificationCount > 1) {
-                gi.cvar_set("g_gotmedal", "0");
-            } else {
                 gi.cvar_set("g_gotmedal", "1");
+            } else {
+                gi.cvar_set("g_gotmedal", "0");
             }
 
             client->ps.pm_flags |= PMF_FROZEN;
+            VectorClear(client->ps.velocity);
 
             if (level.time - level.intermissiontime > 4.0f) {
                 if (level.intermissiontype) {
@@ -4529,10 +4733,16 @@ void Player::Think(void)
                     gi.SendServerCommand(edict - g_entities, "stufftext \"pushmenu_teamselect\"");
                 }
             }
+            // Removed in 2.0
+            //else if (level.time > m_fWeapSelectTime + 10.0) {
+            //    m_fWeapSelectTime = level.time;
+            //    gi.centerprintf(edict, "\n\n\n%s", gi.LV_ConvertString("Press fire to join the battle!"));
+            //}
         } else if (!client->pers.dm_primary[0]) {
             Spectator();
             if (m_fWeapSelectTime < level.time) {
-                gi.SendServerCommand(edict - g_entities, "stufftext \"pushmenu_weaponselect\"");
+                m_fWeapSelectTime = level.time + 1.0;
+                UserSelectWeapon(false);
             }
         }
 
@@ -4558,7 +4768,7 @@ void Player::Think(void)
                 }
             } else {
                 if ((server_new_buttons & BUTTON_USE)) {
-                    SetPlayerSpectateRandom();
+                    SetPlayerSpectate(true);
                 }
             }
 
@@ -4567,14 +4777,12 @@ void Player::Think(void)
                     SetPlayerSpectateRandom();
                 } else {
                     gentity_t *ent = g_entities + m_iPlayerSpectating - 1;
-                    Player    *player;
 
                     if (!ent->inuse || !ent->entity) {
+                        // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    }
-
-                    player = static_cast<Player *>(ent->entity);
-                    if (player->deadflag >= DEAD_DEAD || player->IsSpectator() || !IsValidSpectatePlayer(player)) {
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4593,22 +4801,15 @@ void Player::Think(void)
 
                 if (m_iPlayerSpectating) {
                     gentity_t *ent = g_entities + m_iPlayerSpectating - 1;
-                    Player    *player;
 
                     if (!ent->inuse || !ent->entity) {
                         // Invalid spectate entity
                         SetPlayerSpectateRandom();
-                    }
-
-                    player = static_cast<Player *>(ent->entity);
-                    if (player->deadflag >= DEAD_DEAD || player->IsSpectator()) {
-                        // Dead player, spectate another player
+                    } else if (ent->entity->deadflag >= DEAD_DEAD || static_cast<Player *>(ent->entity)->IsSpectator()
+                               || !IsValidSpectatePlayer(static_cast<Player *>(ent->entity))) {
                         SetPlayerSpectateRandom();
-                    }
-
-                    if (g_gametype->integer >= GT_TEAM && g_forceteamspectate->integer && GetTeam() > TEAM_FREEFORALL
-                        && GetTeam() != player->GetTeam()) {
-                        // Spectate another player if the target player switched teams
+                    } else if (g_gametype->integer >= GT_TEAM && GetTeam() > TEAM_FREEFORALL
+                               && static_cast<Player *>(ent->entity)->GetTeam() != GetTeam()) {
                         SetPlayerSpectateRandom();
                     }
                 }
@@ -4626,7 +4827,7 @@ void Player::Think(void)
     }
 
     if (!IsDead()) {
-        m_iClientWeaponCommand = (server_new_buttons & WEAPON_COMMAND_MASK) >> 7;
+        m_iClientWeaponCommand = G_GetWeaponCommand(server_new_buttons);
 
         switch (m_iClientWeaponCommand) {
         case 0:
@@ -4707,9 +4908,8 @@ void Player::Think(void)
             mvTrailEyes[0]    = centroid;
             mvTrailEyes[0][0] = EyePosition()[0];
         }
-
-        UpdateFootsteps();
     }
+    UpdateFootsteps();
 
     //
     // Added in 2.0
@@ -4727,7 +4927,7 @@ void Player::Think(void)
                 m_fHealRate -= newrate;
             }
         } else {
-            newrate     = 0;
+            newrate     = m_fHealRate;
             m_fHealRate = 0;
         }
 
@@ -4743,9 +4943,9 @@ void Player::Think(void)
     // Added in 2.0: talk icon
     //
     if (buttons & BUTTON_TALK) {
-        edict->s.eFlags |= EF_PLAYER_TALKING;
+        edict->s.eFlags |= EF_PLAYER_IN_MENU;
     } else {
-        edict->s.eFlags &= ~EF_PLAYER_TALKING;
+        edict->s.eFlags &= ~EF_PLAYER_IN_MENU;
     }
 
     if (m_fTalkTime > level.time) {
@@ -4755,7 +4955,7 @@ void Player::Think(void)
     }
 
     //
-    // Openmohaa additions
+    // Added in OPM
     //
     if (!animDoneVM) {
         int    index;
@@ -4788,6 +4988,8 @@ void Player::Think(void)
     }
 
     server_new_buttons = 0;
+
+    edict->r.svFlags &= ~(SVF_SINGLECLIENT | SVF_NOTSINGLECLIENT);
 }
 
 void Player::InitLegsStateTable(void)
@@ -4819,16 +5021,32 @@ void Player::InitTorsoStateTable(void)
 
 void Player::LoadStateTable(void)
 {
+    int          i;
+    Conditional *cond;
+
     statemap_Legs  = NULL;
     statemap_Torso = NULL;
 
+    //
+    // Free existing conditionals
+    //
+    for (i = legs_conditionals.NumObjects(); i > 0; i--) {
+        cond = legs_conditionals.ObjectAt(i);
+        delete cond;
+    }
     legs_conditionals.FreeObjectList();
+
+    for (i = torso_conditionals.NumObjects(); i > 0; i--) {
+        cond = torso_conditionals.ObjectAt(i);
+        delete cond;
+    }
     torso_conditionals.FreeObjectList();
 
     statemap_Legs =
-        GetStatemap(str(g_statefile->string) + "_Legs.st", (Condition<Class> *)Conditions, &legs_conditionals, false);
-    statemap_Torso =
-        GetStatemap(str(g_statefile->string) + "_Torso.st", (Condition<Class> *)Conditions, &torso_conditionals, false);
+        GetStatemap(str(g_statefile->string) + "_Legs.st", (Condition<Class> *)m_conditions, &legs_conditionals, false);
+    statemap_Torso = GetStatemap(
+        str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false
+    );
 
     movecontrol = MOVECONTROL_LEGS;
 
@@ -4872,7 +5090,6 @@ void Player::ResetState(Event *ev)
 }
 
 void Player::StartPush(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 64.0f);
@@ -4888,7 +5105,6 @@ void Player::StartPush(void)
 }
 
 void Player::StartClimbLadder(void)
-
 {
     trace_t trace;
     Vector  end(origin + yaw_forward * 20.0f);
@@ -4965,13 +5181,11 @@ void Player::StartUseAnim(void)
 }
 
 void Player::StartLoopUseAnim(void)
-
 {
     useanim_numloops--;
 }
 
 void Player::FinishUseAnim(Event *ev)
-
 {
     UseAnim *ua;
 
@@ -4985,7 +5199,6 @@ void Player::FinishUseAnim(Event *ev)
 }
 
 void Player::SetupUseObject(void)
-
 {
     UseObject *uo;
     Vector     neworg;
@@ -5035,7 +5248,6 @@ void Player::SetupUseObject(void)
 }
 
 void Player::StartUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5048,7 +5260,6 @@ void Player::StartUseObject(Event *ev)
 }
 
 void Player::FinishUseObject(Event *ev)
-
 {
     UseObject *uo;
 
@@ -5062,7 +5273,6 @@ void Player::FinishUseObject(Event *ev)
 }
 
 void Player::Turn(Event *ev)
-
 {
     float  yaw;
     Vector oldang(v_angle);
@@ -5086,7 +5296,6 @@ void Player::Turn(Event *ev)
 }
 
 void Player::TurnUpdate(Event *ev)
-
 {
     float  yaw;
     float  timeleft;
@@ -5115,7 +5324,6 @@ void Player::TurnUpdate(Event *ev)
 }
 
 void Player::TurnLegs(Event *ev)
-
 {
     float yaw;
 
@@ -5138,6 +5346,19 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
         return;
     }
 
+    if (flags & FL_IMMOBILE) {
+        // Don't evaluate state when immobile
+        return;
+    }
+
+    if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
+        // Added in 2.0
+        //  Animations are handled hardcodedly
+        currentState_Torso = NULL;
+        currentState_Legs  = NULL;
+        return;
+    }
+
     // Evaluate the current state.
     // When the state changes, we reevaluate the state so that if the
     // conditions aren't met in the new state, we don't play one frame of
@@ -5159,15 +5380,31 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
 
         laststate_Torso = currentState_Torso;
 
-        if (forceTorso) {
-            currentState_Torso = forceTorso;
+        if (currentState_Torso) {
+            laststate_Torso = currentState_Torso;
+
+            if (forceTorso) {
+                currentState_Torso = forceTorso;
+            } else {
+                currentState_Torso = currentState_Torso->Evaluate(*this, &torso_conditionals);
+            }
         } else {
-            currentState_Torso = currentState_Torso->Evaluate(*this, &torso_conditionals);
+            // Added in 2.0
+            //  Switch to the default torso state if it's NULL
+            if (forceTorso) {
+                currentState_Torso = forceTorso;
+            } else {
+                currentState_Torso = statemap_Torso->FindState("STAND");
+            }
+
+            laststate_Torso = NULL;
         }
 
         if (currentState_Torso) {
-            // Process exit commands of the last state
-            laststate_Torso->ProcessExitCommands(this);
+            if (laststate_Torso) {
+                // Process exit commands of the last state
+                laststate_Torso->ProcessExitCommands(this);
+            }
 
             // Process entry commands of the new state
             currentState_Torso->ProcessEntryCommands(this);
@@ -5203,6 +5440,13 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(torso);
                     animdone_Torso = true;
                 } else if (torsoAnim != "") {
+                    if (torsoAnim == partAnim[torso]) {
+                        // Fixed in OPM
+                        //  Stop the part if it's the same animation
+                        //  so the new animation can play and make some action
+                        //  like activate the new weapon.
+                        StopPartAnimating(torso);
+                    }
                     SetPartAnim(torsoAnim.c_str(), torso);
                 }
             } else {
@@ -5210,6 +5454,11 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(torso);
                     animdone_Torso = true;
                 } else if (torsoAnim != "") {
+                    if (torsoAnim == partAnim[torso]) {
+                        // Fixed in OPM
+                        //  See above
+                        StopPartAnimating(torso);
+                    }
                     SetPartAnim(torsoAnim.c_str(), torso);
                 }
 
@@ -5220,6 +5469,16 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                 } else {
                     SetPartAnim(legsAnim.c_str(), legs);
                 }
+
+                // Fixed in OPM
+                //  Clear the legs state, so the torso state can reset it to STAND
+                //  in subsequent iterations.
+                //  As the legs animation is stopped, there would be no anim to wait on.
+                //
+                //  This prevents the current legs state to be stuck
+                //  when the move control is set to non-legs and then to legs
+                //  in the same iteration before the legs state is being processed.
+                currentState_Legs = NULL;
             }
 
             if (movecontrol != move) {
@@ -5261,26 +5520,33 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                 }
             }
 
-            if (!laststate_Legs) {
-                if ((m_iMovePosFlags & MPF_POSITION_CROUCHING)) {
+            if (currentState_Legs) {
+                laststate_Legs = currentState_Legs;
+
+                if (forceLegs) {
+                    currentState_Legs = forceLegs;
+                } else {
+                    currentState_Legs = currentState_Legs->Evaluate(*this, &legs_conditionals);
+                }
+            } else {
+                // Added in 2.0
+                //  Switch to the default legs state if it's NULL
+                if (forceLegs) {
+                    currentState_Legs = forceLegs;
+                } else if ((m_iMovePosFlags & MPF_POSITION_CROUCHING)) {
                     currentState_Legs = statemap_Legs->FindState("CROUCH_IDLE");
                 } else {
                     currentState_Legs = statemap_Legs->FindState("STAND");
                 }
+
+                laststate_Legs = NULL;
             }
 
-            laststate_Legs = currentState_Legs;
-
-            if (forceLegs) {
-                currentState_Legs = forceLegs;
-            } else {
-                currentState_Legs = currentState_Legs->Evaluate(*this, &legs_conditionals);
-            }
-
-            animdone_Legs = false;
             if (currentState_Legs) {
-                // Process exit commands of the last state
-                laststate_Legs->ProcessExitCommands(this);
+                if (laststate_Legs) {
+                    // Process exit commands of the last state
+                    laststate_Legs->ProcessExitCommands(this);
+                }
 
                 // Process entry commands of the new state
                 currentState_Legs->ProcessEntryCommands(this);
@@ -5296,7 +5562,26 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
                     StopPartAnimating(legs);
                     animdone_Legs = true;
                 } else if (legsAnim != "") {
-                    SetPartAnim(legsAnim, legs);
+                    float oldTime;
+
+                    if (currentState_Legs == laststate_Legs) {
+                        //
+                        // Added in OPM
+                        //  This allows different animations in the same state
+                        //  to be continued at the same moment.
+                        //  This is used to avoid "ghost walking" where the player
+                        //  would switch weapons indefinitely to avoid footstep sounds
+                        //
+
+                        oldTime = GetTime(m_iPartSlot[legs]);
+                        SetPartAnim(legsAnim, legs);
+
+                        if (animtimes[m_iPartSlot[legs]] > 0) {
+                            SetTime(m_iPartSlot[legs], fmod(oldTime, animtimes[m_iPartSlot[legs]]));
+                        }
+                    } else {
+                        SetPartAnim(legsAnim, legs);
+                    }
                 }
             } else {
                 currentState_Legs = laststate_Legs;
@@ -5307,21 +5592,25 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
     }
 
     if (g_showplayeranim->integer) {
-        if (last_leg_anim_name != AnimName(legs)) {
-            gi.DPrintf("Legs change from %s to %s\n", last_leg_anim_name.c_str(), AnimName(legs));
-            last_leg_anim_name = AnimName(legs);
+        str sNewAnim;
+
+        sNewAnim = AnimName(m_iPartSlot[legs]);
+        if (last_leg_anim_name != sNewAnim) {
+            gi.DPrintf("Legs anim change from %s to %s\n", last_leg_anim_name.c_str(), sNewAnim.c_str());
+            last_leg_anim_name = sNewAnim;
         }
 
-        if (last_torso_anim_name != AnimName(torso)) {
-            gi.DPrintf("Torso change from %s to %s\n", last_torso_anim_name.c_str(), AnimName(torso));
-            last_torso_anim_name = AnimName(torso);
+        sNewAnim = AnimName(m_iPartSlot[torso]);
+        if (last_torso_anim_name != sNewAnim) {
+            gi.DPrintf("Torso anim change from %s to %s\n", last_torso_anim_name.c_str(), sNewAnim.c_str());
+            last_torso_anim_name = sNewAnim;
         }
     }
 
     if (g_showplayerstate->integer) {
         if (startstate_Legs != currentState_Legs) {
             gi.DPrintf(
-                "Legs change from %s to %s\n",
+                "Legs state change from %s to %s\n",
                 startstate_Legs ? startstate_Legs->getName() : "NULL",
                 currentState_Legs ? currentState_Legs->getName() : "NULL"
             );
@@ -5329,7 +5618,7 @@ void Player::EvaluateState(State *forceTorso, State *forceLegs)
 
         if (startstate_Torso != currentState_Torso) {
             gi.DPrintf(
-                "Torso change from %s to %s\n",
+                "Torso state change from %s to %s\n",
                 startstate_Torso ? startstate_Torso->getName() : "NULL",
                 currentState_Torso ? currentState_Torso->getName() : "NULL"
             );
@@ -5372,19 +5661,38 @@ void Player::SelectNextItem(Event *ev)
 
 void Player::SelectPreviousWeapon(Event *ev)
 {
+    Weapon *weapon;
+    Weapon *initialWeapon;
+    Weapon *activeWeapon;
+
     if (deadflag) {
         return;
     }
 
-    Weapon *weapon       = GetActiveWeapon(WEAPON_MAIN);
-    Weapon *activeWeapon = weapon;
+    activeWeapon = GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+        activeWeapon = NULL;
+    }
 
-    if (weapon) {
-        weapon = PreviousWeapon(weapon);
+    if (!activeWeapon) {
+        activeWeapon = newActiveWeapon.weapon;
+        if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+            activeWeapon = NULL;
+        }
+    }
 
-        if (g_gametype->integer) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                weapon = PreviousWeapon(weapon);
+    if (activeWeapon) {
+        // Fixed in OPM
+        //  Fixes the bug that cause infinite loop when the last weapon has no ammo
+        //  and the only weapon is an inventory item
+        for (weapon = initialWeapon = PreviousWeapon(activeWeapon); weapon && weapon != activeWeapon;) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
+                break;
+            }
+
+            weapon = PreviousWeapon(weapon);
+            if (weapon == initialWeapon) {
+                break;
             }
         }
     } else {
@@ -5394,23 +5702,46 @@ void Player::SelectPreviousWeapon(Event *ev)
     if (weapon && weapon != activeWeapon) {
         useWeapon(weapon);
     }
+
+    if (deadflag) {
+        return;
+    }
 }
 
 void Player::SelectNextWeapon(Event *ev)
 {
+    Weapon *weapon;
+    Weapon *initialWeapon;
+    Weapon *activeWeapon;
+
     if (deadflag) {
         return;
     }
 
-    Weapon *weapon       = GetActiveWeapon(WEAPON_MAIN);
-    Weapon *activeWeapon = weapon;
+    activeWeapon = GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+        activeWeapon = NULL;
+    }
 
-    if (weapon) {
-        weapon = NextWeapon(weapon);
+    if (!activeWeapon) {
+        activeWeapon = newActiveWeapon.weapon;
+        if (activeWeapon && activeWeapon->IsSubclassOfInventoryItem()) {
+            activeWeapon = NULL;
+        }
+    }
 
-        if (g_gametype->integer) {
-            while (weapon && weapon != activeWeapon && weapon->IsSubclassOfInventoryItem()) {
-                weapon = NextWeapon(weapon);
+    if (activeWeapon) {
+        // Fixed in OPM
+        //  Fixes the bug that cause infinite loop when the last weapon has no ammo
+        //  and the only weapon is an inventory item
+        for (weapon = initialWeapon = NextWeapon(activeWeapon); weapon && weapon != activeWeapon;) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER || !weapon->IsSubclassOfInventoryItem()) {
+                break;
+            }
+
+            weapon = NextWeapon(weapon);
+            if (weapon == initialWeapon) {
+                break;
             }
         }
     } else {
@@ -5427,7 +5758,7 @@ void Player::DropCurrentWeapon(Event *ev)
     Weapon *weapon;
     Vector  forward;
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -5476,13 +5807,11 @@ void Player::DropCurrentWeapon(Event *ev)
 }
 
 void Player::GiveWeaponCheat(Event *ev)
-
 {
     giveItem(ev->GetString(1));
 }
 
 void Player::GiveCheat(Event *ev)
-
 {
     str name;
 
@@ -5512,7 +5841,7 @@ void Player::GiveAllCheat(Event *ev)
     if (gi.FS_ReadFile("global/giveall.scr", (void **)&buf, true) != -1) {
         buffer = buf;
         while (1) {
-            strcpy(com_token, COM_ParseExt(&buffer, qtrue));
+            Q_strncpyz(com_token, COM_ParseExt(&buffer, qtrue), sizeof(com_token));
 
             if (!com_token[0]) {
                 break;
@@ -5523,7 +5852,7 @@ void Player::GiveAllCheat(Event *ev)
 
             // get the rest of the line
             while (1) {
-                strcpy(com_token, COM_ParseExt(&buffer, qfalse));
+                Q_strncpyz(com_token, COM_ParseExt(&buffer, qfalse), sizeof(com_token));
                 if (!com_token[0]) {
                     break;
                 }
@@ -5578,7 +5907,6 @@ void Player::GiveNewWeaponsCheat(Event *ev)
 }
 
 void Player::GodCheat(Event *ev)
-
 {
     const char *msg;
 
@@ -5660,6 +5988,7 @@ void Player::NoclipCheat(Event *ev)
 
         // reset the state machine so that his animations are correct
         ResetState(NULL);
+        charge_start_time = 0;
     } else {
         client->ps.feetfalling = false;
         movecontrol            = MOVECONTROL_LEGS;
@@ -5672,7 +6001,6 @@ void Player::NoclipCheat(Event *ev)
 }
 
 void Player::GameVersion(Event *ev)
-
 {
     gi.SendServerCommand(edict - g_entities, "print \"%s : %s\n\"", GAMEVERSION, __DATE__);
 }
@@ -5690,13 +6018,18 @@ void Player::SetFov(float newFov)
 
 void Player::EventSetSelectedFov(Event *ev)
 {
+    float fOldSelectedFov;
+
     if (ev->NumArgs() < 1) {
         gi.SendServerCommand(edict - g_entities, "print \"Fov = %d\n\"", (unsigned int)fov);
         return;
     }
 
+    fOldSelectedFov = selectedfov;
     SetSelectedFov(ev->GetFloat(1));
-    SetFov(selectedfov);
+    if (fov == fOldSelectedFov) {
+        SetFov(selectedfov);
+    }
 }
 
 void Player::SetSelectedFov(float newFov)
@@ -5710,7 +6043,7 @@ void Player::SetSelectedFov(float newFov)
     }
 
     /*
-    if( g_gametype->integer && !developer->integer )
+    if( g_gametype->integer != GT_SINGLE_PLAYER && !developer->integer )
     {
         if( selectedfov < 80 )
         {
@@ -5731,7 +6064,6 @@ CalcRoll
 ===============
 */
 float Player::CalcRoll(void)
-
 {
     float  sign;
     float  side;
@@ -5789,8 +6121,13 @@ void Player::ProcessPmoveEvents(int event)
         } else {
             damage = 5;
         }
-        if (!DM_FLAG(DF_NO_FALLING)) {
-            Damage(world, world, (int)damage, origin, vec_zero, vec_zero, 0, DAMAGE_NO_ARMOR, MOD_FALLING);
+
+        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+            // since 2.0, remove a percentage of the health
+            damage = damage * (max_health / 100.0);
+        }
+        if (g_gametype->integer == GT_SINGLE_PLAYER || !DM_FLAG(DF_NO_FALLING)) {
+            Damage(this, this, (int)damage, origin, vec_zero, vec_zero, 0, DAMAGE_NO_ARMOR, MOD_FALLING);
         }
         break;
     case EV_TERMINAL_VELOCITY:
@@ -5837,7 +6174,6 @@ AddBlend
 =============
 */
 void Player::AddBlend(float r, float g, float b, float a)
-
 {
     float a2;
     float a3;
@@ -5864,7 +6200,6 @@ CalcBlend
 =============
 */
 void Player::CalcBlend(void)
-
 {
     int    contents;
     Vector vieworg;
@@ -6035,151 +6370,157 @@ void Player::DamageFeedback(void)
         damage_blend += (damage_blood / realcount) * bcolor;
     }
 
-    //
-    // Since 2.0: Try to find and play pain animation
-    //
-    if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
-        // use mg42 pain animation
-        painAnim = "mg42_tripod_";
-    } else {
-        Weapon     *pWeap;
-        const char *itemName;
-        // try to find an animation
+    if (g_target_game >= target_game_e::TG_MOHTA) {
+        //
+        // Since 2.0: Try to find and play pain animation
+        //
+        if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
+            // use mg42 pain animation
+            painAnim = "mg42_tripod_";
+        } else {
+            Weapon     *pWeap;
+            const char *itemName;
+            // try to find an animation
 
-        pWeap = GetActiveWeapon(WEAPON_MAIN);
-        if (pWeap) {
-            int weapon_class;
+            pWeap = GetActiveWeapon(WEAPON_MAIN);
+            if (pWeap) {
+                int weapon_class;
 
-            weapon_class = pWeap->GetWeaponClass();
-            if (weapon_class & WEAPON_CLASS_PISTOL) {
-                painAnim = "pistol_";
-            } else if (weapon_class & WEAPON_CLASS_RIFLE) {
-                painAnim = "rifle_";
-            } else if (weapon_class & WEAPON_CLASS_SMG) {
-                // get the animation name from the item name
-                itemName = pWeap->GetItemName();
+                weapon_class = pWeap->GetWeaponClass();
+                if (weapon_class & WEAPON_CLASS_PISTOL) {
+                    painAnim = "pistol_";
+                } else if (weapon_class & WEAPON_CLASS_RIFLE) {
+                    painAnim = "rifle_";
+                } else if (weapon_class & WEAPON_CLASS_SMG) {
+                    // get the animation name from the item name
+                    itemName = pWeap->GetItemName();
 
-                if (!Q_stricmp(itemName, "MP40")) {
-                    painAnim = "mp40_";
-                } else if (!Q_stricmp(itemName, "Sten Mark II")) {
-                    painAnim = "sten_";
+                    if (!Q_stricmp(itemName, "MP40")) {
+                        painAnim = "mp40_";
+                    } else if (!Q_stricmp(itemName, "Sten Mark II")) {
+                        painAnim = "sten_";
+                    } else {
+                        painAnim = "smg_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_MG) {
+                    itemName = pWeap->GetItemName();
+
+                    if (!Q_stricmp(itemName, "StG 44")) {
+                        painAnim = "mp44_";
+                    } else {
+                        painAnim = "mg_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_GRENADE) {
+                    itemName = pWeap->GetItemName();
+
+                    // 2.30: use landmine animations
+                    if (!Q_stricmp(itemName, "Minedetector")) {
+                        painAnim = "minedetector_";
+                    } else if (!Q_stricmp(itemName, "Minensuchgerat")) {
+                        painAnim = "minedetectoraxis_";
+                    } else if (!Q_stricmp(itemName, "LandmineAllies")) {
+                        painAnim = "mine_";
+                    } else if (!Q_stricmp(itemName, "LandmineAxis")) {
+                        painAnim = "mine_";
+                    } else if (!Q_stricmp(itemName, "LandmineAxis")) {
+                        painAnim = "grenade_";
+                    }
+                } else if (weapon_class & WEAPON_CLASS_HEAVY) {
+                    itemName = pWeap->GetItemName();
+
+                    if (!Q_stricmp(itemName, "Shotgun")) {
+                        painAnim = "shotgun_";
+                    } else {
+                        // Defaults to bazooka
+                        painAnim = "bazooka_";
+                    }
                 } else {
-                    painAnim = "smg_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_MG) {
-                itemName = pWeap->GetItemName();
+                    itemName = pWeap->GetItemName();
 
-                if (!Q_stricmp(itemName, "StG 44")) {
-                    painAnim = "mp44_";
-                } else {
-                    painAnim = "mg_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_GRENADE) {
-                itemName = pWeap->GetItemName();
-
-                // 2.30: use landmine animations
-                if (!Q_stricmp(itemName, "Minedetector")) {
-                    painAnim = "minedetector_";
-                } else if (!Q_stricmp(itemName, "Minensuchgerat")) {
-                    painAnim = "minedetectoraxis_";
-                } else if (!Q_stricmp(itemName, "LandmineAllies")) {
-                    painAnim = "mine_";
-                } else if (!Q_stricmp(itemName, "LandmineAxis")) {
-                    painAnim = "mine_";
-                } else if (!Q_stricmp(itemName, "LandmineAxis")) {
-                    painAnim = "grenade_";
-                }
-            } else if (weapon_class & WEAPON_CLASS_HEAVY) {
-                itemName = pWeap->GetItemName();
-
-                if (!Q_stricmp(itemName, "Shotgun")) {
-                    painAnim = "shotgun_";
-                } else {
-                    // Defaults to bazooka
-                    painAnim = "bazooka_";
+                    if (!Q_stricmp(itemName, "Packed MG42 Turret")) {
+                        painAnim = "mg42_";
+                    } else {
+                        // Default animation if not found
+                        painAnim = "unarmed_";
+                    }
                 }
             } else {
-                itemName = pWeap->GetItemName();
-
-                if (!Q_stricmp(itemName, "Packed MG42 Turret")) {
-                    painAnim = "mg42_";
-                } else {
-                    // Default animation if not found
-                    painAnim = "unarmed_";
-                }
+                painAnim = "unarmed_";
             }
+
+            // use the animation based on the movement
+            if (m_iMovePosFlags & MPF_POSITION_CROUCHING) {
+                painAnim += "crouch_";
+            } else {
+                painAnim += "stand_";
+            }
+        }
+
+        painAnim += "hit_";
+
+        if (pain_dir == PAIN_REAR || pain_location == HITLOC_TORSO_MID || HITLOC_TORSO_LOWER) {
+            painAnim += "back";
         } else {
-            painAnim = "unarmed_";
+            switch (pain_location) {
+            case HITLOC_HEAD:
+            case HITLOC_HELMET:
+            case HITLOC_NECK:
+                painAnim += "head";
+                break;
+            case HITLOC_TORSO_UPPER:
+            case HITLOC_TORSO_MID:
+                painAnim += "uppertorso";
+                break;
+            case HITLOC_TORSO_LOWER:
+            case HITLOC_PELVIS:
+                painAnim += "lowertorso";
+                break;
+            case HITLOC_R_ARM_UPPER:
+            case HITLOC_R_ARM_LOWER:
+            case HITLOC_R_HAND:
+                painAnim += "rarm";
+                break;
+            case HITLOC_L_ARM_UPPER:
+            case HITLOC_L_ARM_LOWER:
+            case HITLOC_L_HAND:
+                painAnim += "larm";
+                break;
+            case HITLOC_R_LEG_UPPER:
+            case HITLOC_L_LEG_UPPER:
+            case HITLOC_R_LEG_LOWER:
+            case HITLOC_L_LEG_LOWER:
+            case HITLOC_R_FOOT:
+            case HITLOC_L_FOOT:
+                painAnim += "leg";
+                break;
+            default:
+                painAnim += "uppertorso";
+                break;
+            }
         }
 
-        // use the animation based on the movement
-        if (m_iMovePosFlags & MPF_POSITION_CROUCHING) {
-            painAnim += "crouch_";
+        animnum = gi.Anim_NumForName(edict->tiki, painAnim.c_str());
+        if (animnum == -1) {
+            gi.DPrintf("WARNING: Could not find player pain animation '%s'\n", painAnim.c_str());
         } else {
-            painAnim += "stand_";
+            NewAnim(animnum, EV_Player_AnimLoop_Pain, ANIMSLOT_PAIN);
+            RestartAnimSlot(ANIMSLOT_PAIN);
+            m_sPainAnim   = painAnim;
+            m_fPainBlend  = 1.f;
+            animdone_Pain = false;
         }
     }
 
-    painAnim += "hit_";
-
-    if (pain_dir == PAIN_REAR || pain_location == HITLOC_TORSO_MID || HITLOC_TORSO_LOWER) {
-        painAnim += "back";
-    } else {
-        switch (pain_location) {
-        case HITLOC_HEAD:
-        case HITLOC_HELMET:
-        case HITLOC_NECK:
-            painAnim += "head";
-            break;
-        case HITLOC_TORSO_UPPER:
-        case HITLOC_TORSO_MID:
-            painAnim += "uppertorso";
-            break;
-        case HITLOC_TORSO_LOWER:
-        case HITLOC_PELVIS:
-            painAnim += "lowertorso";
-            break;
-        case HITLOC_R_ARM_UPPER:
-        case HITLOC_R_ARM_LOWER:
-        case HITLOC_R_HAND:
-            painAnim += "rarm";
-            break;
-        case HITLOC_L_ARM_UPPER:
-        case HITLOC_L_ARM_LOWER:
-        case HITLOC_L_HAND:
-            painAnim += "larm";
-            break;
-        case HITLOC_R_LEG_UPPER:
-        case HITLOC_L_LEG_UPPER:
-        case HITLOC_R_LEG_LOWER:
-        case HITLOC_L_LEG_LOWER:
-        case HITLOC_R_FOOT:
-        case HITLOC_L_FOOT:
-            painAnim += "leg";
-            break;
-        default:
-            painAnim += "uppertorso";
-            break;
-        }
-    }
-
-    animnum = gi.Anim_NumForName(edict->tiki, painAnim.c_str());
-    if (animnum == -1) {
-        gi.DPrintf("WARNING: Could not find player pain animation '%s'\n", painAnim.c_str());
-    } else {
-        NewAnim(animnum, EV_Player_AnimLoop_Pain, ANIMSLOT_PAIN);
-        RestartAnimSlot(ANIMSLOT_PAIN);
-        m_sPainAnim   = painAnim;
-        m_fPainBlend  = 1.f;
-        animdone_Pain = false;
-    }
-
     //
     // clear totals
     //
     damage_blood = 0;
 
-    if (IsSubclassOfPlayer()) {
+    //
+    // Added in 2.0
+    //  Don't show damage when in god mode
+    //
+    if (flags & FL_GODMODE) {
         damage_count  = 0;
         damage_blood  = 0;
         damage_alpha  = 0;
@@ -6203,18 +6544,11 @@ void Player::SetPlayerView(
     Camera *camera, Vector position, float cameraoffset, Vector ang, Vector vel, float camerablend[4], float camerafov
 )
 {
-    client->ps.viewangles[0] = ang[0];
-    client->ps.viewangles[1] = ang[1];
-    client->ps.viewangles[2] = ang[2];
-    client->ps.viewheight    = cameraoffset;
+    VectorCopy(ang, client->ps.viewangles);
+    client->ps.viewheight = cameraoffset;
 
-    client->ps.origin[0] = position[0];
-    client->ps.origin[1] = position[1];
-    client->ps.origin[2] = position[2];
-
-    client->ps.velocity[0] = vel[0];
-    client->ps.velocity[1] = vel[1];
-    client->ps.velocity[2] = vel[2];
+    VectorCopy(position, client->ps.origin);
+    VectorCopy(vel, client->ps.velocity);
 
     /*
     client->ps.blend[ 0 ] = camerablend[ 0 ];
@@ -6227,36 +6561,50 @@ void Player::SetPlayerView(
 
     if (camera) {
         if (camera->IsSubclassOfCamera()) {
-            client->ps.camera_angles[0] = camera->angles[0];
-            client->ps.camera_angles[1] = camera->angles[1];
-            client->ps.camera_angles[2] = camera->angles[2];
-
-            client->ps.camera_origin[0] = camera->origin[0];
-            client->ps.camera_origin[1] = camera->origin[1];
-            client->ps.camera_origin[2] = camera->origin[2];
+            VectorCopy(camera->angles, client->ps.camera_angles);
+            VectorCopy(camera->origin, client->ps.camera_origin);
 
             Vector vOfs = camera->GetPositionOffset();
             VectorCopy(vOfs, client->ps.camera_posofs);
 
             client->ps.pm_flags |= PMF_CAMERA_VIEW;
 
+            if (camera->ShowQuakes()) {
+                client->ps.pm_flags |= PMF_DAMAGE_ANGLES;
+            } else {
+                client->ps.pm_flags &= ~PMF_DAMAGE_ANGLES;
+            }
+
             //
             // clear out the flags, but preserve the CF_CAMERA_CUT_BIT
             //
             client->ps.camera_flags = client->ps.camera_flags & CF_CAMERA_CUT_BIT;
-        } else if (camera->IsSubclassOfPlayer()) {
-            Vector  vPos, vAng;
-            Player *pPlayer = (Player *)camera;
+        } else {
+            Vector vVec;
 
-            GetSpectateFollowOrientation(pPlayer, vPos, vAng);
+            if (camera->IsSubclassOfPlayer()) {
+                Vector  vPos;
+                Player *pPlayer = (Player *)camera;
 
-            VectorCopy(vPos, client->ps.camera_origin);
-            VectorCopy(vAng, client->ps.camera_angles);
+                GetSpectateFollowOrientation(pPlayer, vPos, vVec);
 
-            SetViewAngles(pPlayer->GetViewAngles());
-            setOrigin(pPlayer->origin);
+                VectorCopy(vVec, client->ps.camera_angles);
+                VectorCopy(vPos, client->ps.camera_origin);
 
-            VectorClear(client->ps.camera_posofs);
+                SetViewAngles(vVec);
+
+                vPos[2] -= viewheight;
+                setOrigin(vPos);
+
+                vVec.setXYZ(0, 0, 0);
+            } else {
+                VectorCopy(ang, client->ps.camera_angles);
+                VectorCopy(position, client->ps.camera_angles);
+
+                vVec.setXYZ(0, 0, 0);
+            }
+
+            VectorCopy(vVec, client->ps.camera_posofs);
             client->ps.pm_flags |= PMF_CAMERA_VIEW;
             client->ps.camera_flags = client->ps.camera_flags & CF_CAMERA_CUT_BIT;
         }
@@ -6270,7 +6618,11 @@ void Player::SetPlayerView(
             qboolean do_cut;
             int      camera_type;
 
-            camera_type = currentState_Torso->getCameraType();
+            if (currentState_Torso) {
+                camera_type = currentState_Torso->getCameraType();
+            } else {
+                camera_type = CAMERA_BEHIND;
+            }
             if (last_camera_type != camera_type) {
                 //
                 // clear out the flags, but preserve the CF_CAMERA_CUT_BIT
@@ -6341,6 +6693,8 @@ void Player::SetPlayerView(
                     CameraCut();
                 }
             }
+        } else {
+            client->ps.camera_flags = client->ps.camera_flags & CF_CAMERA_CUT_BIT;
         }
 
         //
@@ -6609,7 +6963,6 @@ void Player::SetupView(void)
 }
 
 Vector Player::GetAngleToTarget(Entity *ent, str tag, float yawclamp, float pitchclamp, Vector baseangles)
-
 {
     assert(ent);
 
@@ -6654,7 +7007,6 @@ Vector Player::GetAngleToTarget(Entity *ent, str tag, float yawclamp, float pitc
 }
 
 void Player::DebugWeaponTags(int controller_tag, Weapon *weapon, str weapon_tagname)
-
 {
     int           i;
     orientation_t bone_or, tag_weapon_or, barrel_or, final_barrel_or;
@@ -6730,8 +7082,9 @@ PlayerAngles
 void Player::PlayerAngles(void)
 {
     if (getMoveType() == MOVETYPE_PORTABLE_TURRET) {
-        // Addition in 2.0
-        //  FIXME: Set viewangles from m_pTurret
+        PortableTurret *portableTurret = static_cast<PortableTurret *>(m_pTurret.Pointer());
+        angles[0]                      = portableTurret->GetGroundPitch();
+        angles[1]                      = portableTurret->GetStartYaw();
     }
 
     PmoveAdjustAngleSettings(v_angle, angles, &client->ps, &edict->s);
@@ -6768,7 +7121,7 @@ void Player::FinishMove(void)
     DamageFeedback();
     CalcBlend();
 
-    if (g_gametype->integer && g_smoothClients->integer && !IsSubclassOfBot()) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && g_smoothClients->integer) {
         VectorCopy(client->ps.velocity, edict->s.pos.trDelta);
         edict->s.pos.trTime = client->ps.commandTime;
     } else {
@@ -6799,11 +7152,8 @@ void Player::CopyStats(Player *player)
     VectorCopy(player->client->ps.origin, client->ps.origin);
     VectorCopy(player->client->ps.velocity, client->ps.velocity);
 
-    if (client->ps.iViewModelAnim != player->client->ps.iViewModelAnim) {
-        ViewModelAnim(player->m_sVMcurrent, qfalse, 0);
-    } else if (client->ps.iViewModelAnimChanged != player->client->ps.iViewModelAnimChanged) {
-        ViewModelAnim(player->m_sVMcurrent, qtrue, 0);
-    }
+    client->ps.iViewModelAnim        = player->client->ps.iViewModelAnim;
+    client->ps.iViewModelAnimChanged = player->client->ps.iViewModelAnimChanged;
 
     client->ps.gravity = player->client->ps.gravity;
     client->ps.speed   = player->client->ps.speed;
@@ -6836,7 +7186,7 @@ void Player::CopyStats(Player *player)
     edict->r.svFlags &= ~SVF_NOCLIENT;
     edict->s.renderfx &= ~RF_DONTDRAW;
 
-    player->edict->r.svFlags |= SVF_PORTAL;
+    player->edict->r.svFlags |= SVF_NOTSINGLECLIENT;
     player->edict->r.singleClient = client->ps.clientNum;
 
     edict->r.svFlags |= SVF_SINGLECLIENT;
@@ -6865,9 +7215,6 @@ void Player::CopyStats(Player *player)
 
         CloneEntity(dest, ent->entity);
 
-        dest->edict->r.svFlags |= SVF_SINGLECLIENT;
-        dest->edict->r.singleClient = client->ps.clientNum;
-
         dest->edict->s.modelindex   = ent->entity->edict->s.modelindex;
         dest->edict->tiki           = ent->entity->edict->tiki;
         dest->edict->s.actionWeight = ent->entity->edict->s.actionWeight;
@@ -6892,8 +7239,8 @@ void Player::UpdateStats(void)
 
     if (g_spectatefollow_firstperson->integer && IsSpectator() && m_iPlayerSpectating != 0) {
         //
-        // Openmohaa addition
-        // First-person spectate
+        // Added in OPM
+        //  First-person spectate
         //
         gentity_t *ent = g_entities + (m_iPlayerSpectating - 1);
 
@@ -6989,7 +7336,7 @@ void Player::UpdateStats(void)
 
                 trace = G_Trace(m_vViewPos, vec_zero, vec_zero, vEnd, this, MASK_BEAM, qfalse, "infoclientcheck");
 
-                if (trace.ent && trace.ent->entity->IsSubclassOfPlayer()) {
+                if (trace.ent && trace.ent->entity->IsSubclassOfPlayer() && !(trace.ent->r.svFlags & SVF_NOCLIENT)) {
                     Player *p = static_cast<Player *>(trace.ent->entity);
 
                     if (IsSpectator() || p->GetTeam() == GetTeam()) {
@@ -7018,14 +7365,14 @@ void Player::UpdateStats(void)
             }
         }
 
-        if (g_gametype->integer < GT_TOW) {
-            vObjectiveLocation = level.m_vObjectiveLocation;
-        } else {
+        if (g_gametype->integer >= GT_TOW || level.m_bForceTeamObjectiveLocation) {
             if (GetTeam() == TEAM_AXIS) {
                 vObjectiveLocation = level.m_vAxisObjectiveLocation;
             } else if (GetTeam() == TEAM_ALLIES) {
                 vObjectiveLocation = level.m_vAlliedObjectiveLocation;
             }
+        } else {
+            vObjectiveLocation = level.m_vObjectiveLocation;
         }
 
         if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN && vObjectiveLocation == vec_zero) {
@@ -7074,7 +7421,7 @@ void Player::UpdateStats(void)
     healthfrac = (health / max_health * 100.0f);
 
     if (m_pVehicle && !m_pTurret) {
-        if (m_pVehicle->isSubclassOf(FixedTurret)) {
+        if (!m_pVehicle->isSubclassOf(FixedTurret)) {
             healthfrac = (m_pVehicle->health / m_pVehicle->max_health * 100.f);
         }
     }
@@ -7190,13 +7537,6 @@ void Player::UpdateStats(void)
 
     count = inventory.NumObjects();
 
-    if (count > MAX_WEAPONS) {
-        count = MAX_WEAPONS;
-        warning("Player::UpdateStats", "Max inventory exceeded\n");
-    }
-
-    count = inventory.NumObjects();
-
     int iItem = 0;
 
     for (i = 1; i <= count; i++) {
@@ -7206,18 +7546,17 @@ void Player::UpdateStats(void)
 
         if (weapon->IsSubclassOfWeapon()) {
             if (weapon->IsSubclassOfInventoryItem()) {
-                if (iItem <= 3) {
+                if (iItem > 3) {
+                    weapon->SetItemSlot(0);
+                } else {
                     client->ps.activeItems[iItem + 2] = weapon->getIndex();
-                    weapon->weapon_class              = (256 << iItem) & WEAPON_CLASS_ITEMINDEX;
-                    weapon->weapon_class |= weapon->weapon_class & ~WEAPON_CLASS_ITEMINDEX;
+                    weapon->SetItemSlot(WEAPON_CLASS_ITEM1 << iItem);
 
                     if (activeweap && weapon == activeweap) {
-                        client->ps.stats[STAT_EQUIPPED_WEAPON] = 256 << iItem;
+                        client->ps.stats[STAT_EQUIPPED_WEAPON] = WEAPON_CLASS_ITEM1 << iItem;
                     }
 
                     iItem++;
-                } else {
-                    weapon->weapon_class &= ~WEAPON_CLASS_ITEMINDEX;
                 }
             } else {
                 weapon_class = weapon->GetWeaponClass();
@@ -7328,7 +7667,7 @@ void Player::UpdateStats(void)
 
     float frac;
 
-    level.m_letterbox_time -= level.intframetime;
+    level.m_letterbox_time -= level.frametime;
 
     frac = level.m_letterbox_time / level.m_letterbox_time_start;
 
@@ -7359,14 +7698,12 @@ void Player::UpdateMusic(void)
 }
 
 void Player::SetReverb(int type, float level)
-
 {
     reverb_type  = type;
     reverb_level = level;
 }
 
 void Player::SetReverb(str type, float level)
-
 {
     reverb_type  = EAXMode_NameToNum(type);
     reverb_level = level;
@@ -7444,7 +7781,6 @@ void Player::EndFrame(void)
 }
 
 void Player::GotKill(Event *ev)
-
 {
     /*
     Entity *victim;
@@ -7467,7 +7803,6 @@ void Player::GotKill(Event *ev)
 }
 
 void Player::SetPowerupTimer(Event *ev)
-
 {
     Event *event;
 
@@ -7478,7 +7813,6 @@ void Player::SetPowerupTimer(Event *ev)
 }
 
 void Player::UpdatePowerupTimer(Event *ev)
-
 {
     poweruptimer -= 1;
     if (poweruptimer > 0) {
@@ -7516,7 +7850,6 @@ void Player::ChangeMusic(const char *current, const char *fallback, qboolean for
 }
 
 void Player::ChangeMusicVolume(float volume, float fade_time)
-
 {
     music_volume_fade_time = fade_time;
     music_saved_volume     = music_current_volume;
@@ -7524,7 +7857,6 @@ void Player::ChangeMusicVolume(float volume, float fade_time)
 }
 
 void Player::RestoreMusicVolume(float fade_time)
-
 {
     music_volume_fade_time = fade_time;
     music_current_volume   = music_saved_volume;
@@ -7541,18 +7873,37 @@ void Player::addOrigin(Vector org)
 }
 
 void Player::Jump(Event *ev)
-
 {
     float maxheight;
 
+    if (m_pTurret || m_pVehicle) {
+        // Don't jump when inside a vehicle or turret
+        return;
+    }
+
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        // Added in 2.0
+        //  Don't jump when on top of another sentient
+        if (groundentity && groundentity->entity && groundentity->entity->IsSubclassOfSentient()) {
+            return;
+        }
+    }
+
     maxheight = ev->GetFloat(1);
 
     if (maxheight > 16) {
         // v^2 = 2ad
         velocity[2] += sqrt(2 * sv_gravity->integer * maxheight);
 
+        if (client->ps.groundEntityNum != ENTITYNUM_NONE) {
+            velocity += m_vPushVelocity;
+        }
+
         // make sure the player leaves the ground
         client->ps.walking = qfalse;
+
+        // Added in 2.0
+        m_bHasJumped = true;
     }
 }
 
@@ -7564,6 +7915,11 @@ void Player::JumpXY(Event *ev)
     float time;
     float speed;
 
+    if (m_pTurret || m_pVehicle) {
+        // Don't jump when inside a vehicle or turret
+        return;
+    }
+
     forwardmove = ev->GetFloat(1);
     sidemove    = ev->GetFloat(2);
     speed       = ev->GetFloat(3);
@@ -7574,6 +7930,10 @@ void Player::JumpXY(Event *ev)
     time        = distance / speed;
     velocity[2] = sv_gravity->integer * time * 0.5f;
 
+    if (client->ps.groundEntityNum != ENTITYNUM_NONE) {
+        velocity += G_GetEntity(client->ps.groundEntityNum)->velocity;
+    }
+
     airspeed = distance;
 
     // make sure the player leaves the ground
@@ -7588,6 +7948,10 @@ void Player::SetViewAngles(Vector newViewangles)
     client->ps.delta_angles[2] = ANGLE2SHORT(newViewangles.z - client->cmd_angles[2]);
 
     v_angle = newViewangles;
+    // Fixed in OPM
+    //  Normalize angles to the range (-180, +180)
+    //  so interpolation is done properly client-side
+    v_angle.EulerNormalize();
 
     // get the pitch and roll from our leg angles
     newViewangles.x = angles.x;
@@ -7603,7 +7967,6 @@ void Player::SetTargetViewAngles(Vector angles)
 }
 
 void Player::DumpState(Event *ev)
-
 {
     gi.DPrintf(
         "Legs: %s Torso: %s\n", currentState_Legs ? currentState_Legs->getName() : "NULL", currentState_Torso->getName()
@@ -7668,17 +8031,33 @@ void Player::ExitVehicle(Event *ev)
     flags &= ~FL_PARTIAL_IMMOBILE;
     setMoveType(MOVETYPE_WALK);
     m_pVehicle = NULL;
+
+    if (camera) {
+        SetCamera(NULL, 0.5f);
+        ZoomOff();
+    }
+
+    SafeHolster(false);
+    takedamage = DAMAGE_YES;
+    setSolidType(SOLID_BBOX);
 }
 
 void Player::EnterTurret(TurretGun *ent)
 {
     flags |= FL_PARTIAL_IMMOBILE;
     viewheight = DEFAULT_VIEWHEIGHT;
+    velocity   = vec_zero;
+    m_pTurret  = ent;
 
-    velocity = vec_zero;
-
-    m_pTurret = ent;
-    setMoveType(MOVETYPE_TURRET);
+    if (ent->inheritsFrom(PortableTurret::classinfostatic())) {
+        // carryable turret
+        setMoveType(MOVETYPE_PORTABLE_TURRET);
+        StopPartAnimating(torso);
+        SetPartAnim("mg42tripod_aim_straight_straight");
+    } else {
+        // standard turret
+        setMoveType(MOVETYPE_TURRET);
+    }
 
     SafeHolster(true);
 }
@@ -7691,7 +8070,7 @@ void Player::EnterTurret(Event *ev)
         return;
     }
 
-    if (ent->IsSubclassOfTurretGun()) {
+    if (!ent->inheritsFrom(TurretGun::classinfostatic())) {
         return;
     }
 
@@ -7700,12 +8079,19 @@ void Player::EnterTurret(Event *ev)
 
 void Player::ExitTurret(void)
 {
+    if (m_pTurret->inheritsFrom(PortableTurret::classinfostatic())) {
+        StopPartAnimating(torso);
+        SetPartAnim("mg42tripod_aim_straight_straight");
+    }
+
     flags &= ~FL_PARTIAL_IMMOBILE;
     setMoveType(MOVETYPE_WALK);
-
     m_pTurret = NULL;
 
     SafeHolster(qfalse);
+
+    new_buttons        = 0;
+    server_new_buttons = 0;
 }
 
 void Player::ExitTurret(Event *ev)
@@ -7734,7 +8120,6 @@ void Player::Holster(Event *ev)
 }
 
 void Player::WatchActor(Event *ev)
-
 {
     if (camera || currentState_Torso->getCameraType() != CAMERA_BEHIND) {
         return;
@@ -7744,7 +8129,6 @@ void Player::WatchActor(Event *ev)
 }
 
 void Player::StopWatchingActor(Event *ev)
-
 {
     Actor *old_actor;
 
@@ -7767,7 +8151,6 @@ void Player::setAngles(Vector ang)
 }
 
 painDirection_t Player::Pain_string_to_int(str pain)
-
 {
     if (!pain.icmp(pain, "Front")) {
         return PAIN_FRONT;
@@ -7785,6 +8168,7 @@ painDirection_t Player::Pain_string_to_int(str pain)
 void Player::ArchivePersistantData(Archiver& arc)
 {
     str model_name;
+    str name;
 
     Sentient::ArchivePersistantData(arc);
 
@@ -7796,11 +8180,9 @@ void Player::ArchivePersistantData(Archiver& arc)
         // set the cvar
         gi.cvar_set("g_playermodel", model_name.c_str());
 
-        model_name += ".tik";
-        setModel(model_name.c_str());
+        setModel("models/player/" + model_name + ".tik");
     }
 
-    str name;
     if (arc.Saving()) {
         if (holsteredWeapon) {
             name = holsteredWeapon->getName();
@@ -7808,11 +8190,10 @@ void Player::ArchivePersistantData(Archiver& arc)
             name = "none";
         }
     }
+
     arc.ArchiveString(&name);
-    if (arc.Loading()) {
-        if (name != "none") {
-            holsteredWeapon = (Weapon *)FindItem(name);
-        }
+    if (arc.Loading() && name != "none") {
+        holsteredWeapon = (Weapon *)FindItem(name);
     }
 
     UpdateWeapons();
@@ -7937,8 +8318,10 @@ void Player::ModifyHeight(Event *ev)
         maxs.z       = 94.0f;
         m_bHasJumped = false;
     } else if (!height.icmp("jumpstart")) {
-        //viewheight = JUMP_START_VIEWHEIGHT;
-        maxs.z     = 94.0f;
+        if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+            viewheight = JUMP_START_VIEWHEIGHT;
+        }
+        maxs.z = 94.0f;
     } else if (!height.icmp("duck")) {
         viewheight = CROUCH_VIEWHEIGHT;
         maxs.z     = 54.0f;
@@ -7947,8 +8330,8 @@ void Player::ModifyHeight(Event *ev)
         maxs.z     = 60.0f;
     } else if (!height.icmp("prone")) {
         //
-        // Prone was added in openmohaa
-        //
+        // Added in OPM
+        //  (prone)
         viewheight = PRONE_VIEWHEIGHT;
         maxs.z     = 20.0f;
     } else {
@@ -8197,6 +8580,8 @@ nationality_t GetAlliedType(const char* name)
 }
 */
 
+// Commented out in OPM. See the other comment below.
+/*
 nationality_t GetPlayerTeamType(const char *name)
 {
     if (!Q_stricmpn(name, "american", 8)) {
@@ -8219,6 +8604,59 @@ nationality_t GetPlayerTeamType(const char *name)
         return NA_NONE;
     }
 }
+*/
+
+// Fixed in OPM.
+//  This fixes the issue where the player can equip weapons
+//  from the other team
+nationality_t GetPlayerAxisTeamType(const char *name)
+{
+    if (g_target_game < target_game_e::TG_MOHTA) {
+        // Only american and german are supported on older versions of the game
+        return NA_GERMAN;
+    }
+
+    if (!Q_stricmpn(name, "german", 6)) {
+        return NA_GERMAN;
+    }
+
+    if (g_target_game < target_game_e::TG_MOHTT) {
+        // Italian skins are supported only in mohaab
+        return NA_GERMAN;
+    }
+
+    if (!Q_stricmpn(name, "it", 2)) {
+        return NA_ITALIAN;
+    } else if (!Q_stricmpn(name, "sc", 2)) {
+        return NA_ITALIAN;
+    }
+
+    // fallback to german
+    return NA_GERMAN;
+}
+
+nationality_t GetPlayerAlliedTeamType(const char *name)
+{
+    if (g_target_game < target_game_e::TG_MOHTA) {
+        // Only american and german are supported on older versions of the game
+        return NA_AMERICAN;
+    }
+
+    if (!Q_stricmpn(name, "american", 8)) {
+        return NA_AMERICAN;
+    } else if (!Q_stricmpn(name, "allied_russian", 14)) {
+        return NA_RUSSIAN;
+    } else if (!Q_stricmpn(name, "allied_british", 14)) {
+        return NA_BRITISH;
+    } else if (!Q_stricmpn(name, "allied_sas", 10)) {
+        return NA_BRITISH;
+    } else if (!Q_stricmpn(name, "allied", 6)) {
+        return NA_AMERICAN;
+    }
+
+    // fallback to american
+    return NA_AMERICAN;
+}
 
 void Player::InitDeathmatch(void)
 {
@@ -8311,66 +8749,70 @@ bool Player::QueryLandminesAllowed() const
 {
     const char *mapname;
 
+    if (g_target_game < target_game_e::TG_MOHTT) {
+        return false;
+    }
+
     if (dmflags->integer & DF_WEAPON_NO_LANDMINE) {
-        return qfalse;
+        return false;
     }
 
     if (dmflags->integer & DF_WEAPON_LANDMINE_ALWAYS) {
-        return qtrue;
+        return true;
     }
 
     mapname = level.mapname.c_str();
 
     if (!Q_stricmpn(mapname, "obj/obj_", 8u)) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmpn(mapname, "dm/mohdm", 8u)) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Bahnhof_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "obj/MP_Ardennes_TOW")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Bazaar_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "obj/MP_Berlin_TOW")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Brest_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "obj/MP_Druckkammern_TOW")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Gewitter_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "obj/MP_Flughafen_TOW")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Holland_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Malta_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Stadt_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Unterseite_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "DM/MP_Verschneit_DM")) {
-        return qfalse;
+        return false;
     }
     if (!Q_stricmp(mapname, "lib/mp_ship_lib")) {
-        return qfalse;
+        return false;
     }
 
-    return qtrue;
+    return true;
 }
 
 void Player::EnsurePlayerHasAllowedWeapons()
@@ -8392,49 +8834,49 @@ void Player::EnsurePlayerHasAllowedWeapons()
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "rifle");
+            Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "rifle")) {
             if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "smg");
+            Q_strncpyz(client->pers.dm_primary, "smg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "smg")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_SMG)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "mg");
+            Q_strncpyz(client->pers.dm_primary, "mg", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "mg")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_MG)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "shotgun");
+            Q_strncpyz(client->pers.dm_primary, "shotgun", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "shotgun")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "heavy");
+            Q_strncpyz(client->pers.dm_primary, "heavy", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "heavy")) {
-            if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "landmine");
+            Q_strncpyz(client->pers.dm_primary, "landmine", sizeof(client->pers.dm_primary));
         } else if (!Q_stricmp(client->pers.dm_primary, "landmine")) {
             if (QueryLandminesAllowed()) {
                 return;
             }
 
-            strcpy(client->pers.dm_primary, "sniper");
+            Q_strncpyz(client->pers.dm_primary, "sniper", sizeof(client->pers.dm_primary));
         }
     }
 
     gi.cvar_set("dmflags", va("%i", dmflags->integer & ~DF_WEAPON_NO_RIFLE));
     Com_Printf("No valid weapons -- re-allowing the rifle\n");
-    strcpy(client->pers.dm_primary, "rifle");
+    Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
 }
 
 void Player::EquipWeapons()
@@ -8448,10 +8890,12 @@ void Player::EquipWeapons()
         return;
     }
 
+    // Fixed in OPM
+    //  Old behavior was calling GetPlayerTeamType() regardless of the team
     if (GetTeam() == TEAM_AXIS) {
-        nationality = GetPlayerTeamType(client->pers.dm_playergermanmodel);
+        nationality = GetPlayerAxisTeamType(client->pers.dm_playergermanmodel);
     } else {
-        nationality = GetPlayerTeamType(client->pers.dm_playermodel);
+        nationality = GetPlayerAlliedTeamType(client->pers.dm_playermodel);
     }
 
     event = new Event(EV_Sentient_UseItem);
@@ -8466,11 +8910,17 @@ void Player::EquipWeapons()
     if (!Q_stricmp(client->pers.dm_primary, "sniper") && !(dmflags->integer & DF_WEAPON_NO_SNIPER)) {
         switch (nationality) {
         case NA_BRITISH:
-            giveItem("weapons/Uk_W_L42A1.tik");
-            event->AddString("Enfield L42A1");
+            if (g_target_game < target_game_e::TG_MOHTT) {
+                giveItem("weapons/springfield.tik");
+                event->AddString("Springfield '03 Sniper");
+            } else {
+                giveItem("weapons/Uk_W_L42A1.tik");
+                event->AddString("Enfield L42A1");
+            }
             break;
         case NA_RUSSIAN:
-            if (dmflags->integer & DF_OLD_SNIPER) {
+            if (g_target_game < target_game_e::TG_MOHTA || dmflags->integer & DF_OLD_SNIPER) {
+                // Old snipers are forced older versions of the game
                 giveItem("weapons/springfield.tik");
                 event->AddString("Springfield '03 Sniper");
             } else {
@@ -8479,7 +8929,13 @@ void Player::EquipWeapons()
             }
             break;
         case NA_GERMAN:
-            if (dmflags->integer & DF_OLD_SNIPER) {
+            if (g_target_game < target_game_e::TG_MOHTA
+                || dmflags->integer & DF_OLD_SNIPER
+                // Added in OPM
+                //  This was also a feature of Daven's fixes
+                //  Use KAR98 for panzer skins
+                || !Q_stricmpn(client->pers.dm_playergermanmodel, "german_panzer", 13)) {
+                // Old snipers are forced older versions of the game
                 giveItem("weapons/kar98sniper.tik");
                 event->AddString("KAR98 - Sniper");
             } else {
@@ -8491,9 +8947,10 @@ void Player::EquipWeapons()
             giveItem("weapons/kar98sniper.tik");
             event->AddString("KAR98 - Sniper");
             break;
+        case NA_AMERICAN:
         default:
-            giveItem("weapons/kar98sniper.tik");
-            event->AddString("KAR98 - Sniper");
+            giveItem("weapons/springfield.tik");
+            event->AddString("Springfield '03 Sniper");
             break;
         }
     } else if (!Q_stricmp(client->pers.dm_primary, "smg") && !(dmflags->integer & DF_WEAPON_NO_SMG)) {
@@ -8514,6 +8971,7 @@ void Player::EquipWeapons()
             giveItem("weapons/it_w_moschetto.tik");
             event->AddString("Moschetto");
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/thompsonsmg.tik");
             event->AddString("Thompson");
@@ -8522,8 +8980,14 @@ void Player::EquipWeapons()
     } else if (!Q_stricmp(client->pers.dm_primary, "mg") && !(dmflags->integer & DF_WEAPON_NO_MG)) {
         switch (nationality) {
         case NA_BRITISH:
-            giveItem("weapons/Uk_W_Vickers.tik");
-            event->AddString("Vickers-Berthier");
+            if (g_target_game < target_game_e::TG_MOHTT) {
+                giveItem("weapons/bar.tik");
+                event->AddString("BAR");
+                break;
+            } else {
+                giveItem("weapons/Uk_W_Vickers.tik");
+                event->AddString("Vickers-Berthier");
+            }
             break;
         case NA_GERMAN:
             giveItem("weapons/mp44.tik");
@@ -8531,8 +8995,9 @@ void Player::EquipWeapons()
             break;
         case NA_ITALIAN:
             giveItem("weapons/It_W_Breda.tik");
-            event->AddString("MP40");
+            event->AddString("Breda");
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/bar.tik");
             event->AddString("BAR");
@@ -8546,9 +9011,15 @@ void Player::EquipWeapons()
             event->AddString("Panzerschreck");
             break;
         case NA_BRITISH:
-            giveItem("weapons/Uk_W_Piat.tik");
-            event->AddString("PIAT");
+            if (g_target_game < target_game_e::TG_MOHTT) {
+                giveItem("weapons/bazooka.tik");
+                event->AddString("Bazooka");
+            } else {
+                giveItem("weapons/Uk_W_Piat.tik");
+                event->AddString("PIAT");
+            }
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/bazooka.tik");
             event->AddString("Bazooka");
@@ -8557,12 +9028,18 @@ void Player::EquipWeapons()
     } else if (!Q_stricmp(client->pers.dm_primary, "shotgun") && !(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) {
         switch (nationality) {
         case NA_BRITISH:
-            giveItem("weapons/DeLisle.tik");
-            event->AddString("DeLisle");
+            if (g_target_game < target_game_e::TG_MOHTT) {
+                giveItem("weapons/shotgun.tik");
+                event->AddString("Shotgun");
+            } else {
+                giveItem("weapons/DeLisle.tik");
+                event->AddString("DeLisle");
+            }
             break;
         case NA_GERMAN:
-            if (dmflags->integer & DF_DISALLOW_KAR98_MORTAR) {
+            if (g_target_game < target_game_e::TG_MOHTA || dmflags->integer & DF_DISALLOW_KAR98_MORTAR) {
                 // Fallback to shotgun
+                // The shotgun is forced on older versions of the game
                 giveItem("weapons/shotgun.tik");
                 event->AddString("Shotgun");
             } else {
@@ -8570,6 +9047,7 @@ void Player::EquipWeapons()
                 event->AddString("Gewehrgranate");
             }
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/shotgun.tik");
             event->AddString("Shotgun");
@@ -8615,6 +9093,7 @@ void Player::EquipWeapons()
                 GiveAmmo("pistol", 16);
             }
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/US_W_Minedetector.tik");
             event->AddString("Minedetector");
@@ -8646,6 +9125,7 @@ void Player::EquipWeapons()
             giveItem("weapons/it_w_carcano.tik");
             event->AddString("Carcano");
             break;
+        case NA_AMERICAN:
         default:
             giveItem("weapons/m1_garand.tik");
             event->AddString("M1 Garand");
@@ -8662,27 +9142,37 @@ void Player::EquipWeapons()
     switch (nationality) {
     case NA_BRITISH:
         giveItem("weapons/mills_grenade.tik");
-        giveItem("weapons/M18_smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/M18_smoke_grenade.tik");
+        }
         giveItem("weapons/Webley_Revolver.tik");
         break;
     case NA_RUSSIAN:
         giveItem("weapons/Russian_F1_grenade.tik");
-        giveItem("weapons/RDG-1_Smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/RDG-1_Smoke_grenade.tik");
+        }
         giveItem("weapons/Nagant_revolver.tik");
         break;
     case NA_GERMAN:
         giveItem("weapons/steilhandgranate.tik");
-        giveItem("weapons/nebelhandgranate.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/nebelhandgranate.tik");
+        }
         giveItem("weapons/p38.tik");
         break;
     case NA_ITALIAN:
         giveItem("weapons/it_w_bomba.tik");
-        giveItem("weapons/it_w_bombabreda.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/it_w_bombabreda.tik");
+        }
         giveItem("weapons/it_w_beretta.tik");
         break;
     default:
         giveItem("weapons/m2frag_grenade.tik");
-        giveItem("weapons/M18_smoke_grenade.tik");
+        if (g_target_game >= target_game_e::TG_MOHTA) {
+            giveItem("weapons/M18_smoke_grenade.tik");
+        }
         giveItem("weapons/colt45.tik");
         break;
     }
@@ -8793,12 +9283,23 @@ bool Player::IsValidSpectatePlayer(Player *pPlayer)
         return true;
     }
 
-    if (GetTeam() <= TEAM_FREEFORALL || !g_forceteamspectate->integer || !GetDM_Team()->NumLivePlayers()
-        || pPlayer->GetTeam() == GetTeam()) {
+    if (GetTeam() <= TEAM_FREEFORALL) {
         return true;
-    } else {
+    }
+
+    if (g_forceteamspectate->integer) {
+        if (!GetDM_Team()->NumLivePlayers()) {
+            return true;
+        }
+
+        if (pPlayer->GetTeam() == GetTeam()) {
+            return true;
+        }
+
         return false;
     }
+
+    return true;
 }
 
 void Player::SetPlayerSpectate(bool bNext)
@@ -8821,12 +9322,7 @@ void Player::SetPlayerSpectate(bool bNext)
         }
     }
 
-    if (m_iPlayerSpectating >= game.maxclients) {
-        m_iPlayerSpectating = 0;
-    }
-
-    i = num;
-    while (i < game.maxclients && i >= 0) {
+    for (i = num; i < game.maxclients && i >= 0; i += dir) {
         ent = &g_entities[i];
         if (!ent->inuse || !ent->entity) {
             continue;
@@ -8840,13 +9336,6 @@ void Player::SetPlayerSpectate(bool bNext)
             client->ps.camera_flags |= (client->ps.camera_flags & CF_CAMERA_CUT_BIT) ^ CF_CAMERA_CUT_BIT;
             return;
         }
-
-        if (!m_iPlayerSpectating) {
-            return;
-        }
-
-        m_iPlayerSpectating = 0;
-        i += dir;
     }
 
     if (m_iPlayerSpectating) {
@@ -8878,6 +9367,10 @@ void Player::SetPlayerSpectateRandom(void)
 
     if (!numvalid) {
         // There is no valid player to spectate
+
+        // Added in OPM.
+        //  Clear the player spectating value
+        m_iPlayerSpectating = 0;
         return;
     }
 
@@ -8925,7 +9418,7 @@ void Player::GetSpectateFollowOrientation(Player *pPlayer, Vector& vPos, Vector&
         vCamOfs += up * g_spectatefollow_up->value;
 
         if (pPlayer->client->ps.fLeanAngle != 0.0f) {
-            vCamOfs += client->ps.fLeanAngle * 0.65f * right;
+            vCamOfs += pPlayer->client->ps.fLeanAngle * 0.65f * right;
         }
 
         start = pPlayer->origin;
@@ -8953,7 +9446,8 @@ void Player::Spectator(Event *ev)
 
 void Player::Leave_DM_Team(Event *ev)
 {
-    // FIXME: should it stays disabled ?
+    // Fixed in OPM
+    //  FIXME: should it be permanently disabled ?
 #if 0
     if (current_team)
     {
@@ -8971,9 +9465,13 @@ void Player::Join_DM_Team(Event *ev)
     teamtype_t  team;
     str         teamname;
     const char *join_message;
-    float       startTime;
     Entity     *ent;
 
+    if (ev->isSubclassOf(ConsoleEvent) && disable_team_change) {
+        // Added in OPM
+        return;
+    }
+
     teamname = ev->GetString(1);
 
     if (!teamname.icmp("allies")) {
@@ -8996,19 +9494,7 @@ void Player::Join_DM_Team(Event *ev)
         return;
     }
 
-    startTime = dmManager.GetMatchStartTime();
-
-    if (startTime >= 0.0f && (level.time - startTime) > 30.0
-        && (level.time - m_fTeamSelectTime) < g_teamswitchdelay->integer) {
-        int seconds = g_teamswitchdelay->integer - (level.time - m_fTeamSelectTime);
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "print \"" HUD_MESSAGE_WHITE "%s %i %s\n\"",
-            gi.LV_ConvertString("Can not change teams again for another"),
-            seconds + 1,
-            gi.LV_ConvertString("seconds")
-        );
+    if (ev->isSubclassOf(ConsoleEvent) && !CheckCanSwitchTeam(team)) {
         return;
     }
 
@@ -9184,7 +9670,7 @@ void Player::ArmorDamage(Event *ev)
 {
     int mod = ev->GetInteger(9);
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         // players that are not allowed fighting mustn't take damage
         if (!m_bAllowFighting && mod != MOD_TELEFRAG) {
             return;
@@ -9194,7 +9680,7 @@ void Player::ArmorDamage(Event *ev)
 
         if (attacker && attacker->IsSubclassOfPlayer()) {
             if (attacker != this) {
-                if (g_gametype->integer > 1 && !g_teamdamage->integer) {
+                if (g_gametype->integer >= GT_TEAM && !g_teamdamage->integer) {
                     // check for team damage
                     if (attacker->GetDM_Team() == GetDM_Team() && mod != MOD_TELEFRAG) {
                         return;
@@ -9225,107 +9711,303 @@ void Player::ArmorDamage(Event *ev)
     event->AddInteger(ev->GetInteger(10));
     event->AddEntity(this);
 
+    scriptDelegate_damage.Trigger(this, *event);
     scriptedEvents[SE_DAMAGE].Trigger(event);
 }
 
 void Player::Disconnect(void)
 {
     Event *ev = new Event;
-
     ev->AddListener(this);
+
+    scriptDelegate_disconnecting.Trigger(this, *ev);
     scriptedEvents[SE_DISCONNECTED].Trigger(ev);
 
-    if (g_gametype->integer) {
-        dmManager.RemovePlayer(this);
-    }
+    //     if (g_gametype->integer != GT_SINGLE_PLAYER) {
+    //         dmManager.RemovePlayer(this);
+    //     }
 }
 
 void Player::CallVote(Event *ev)
 {
     str arg1;
     str arg2;
+    int numVoters;
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
     if (!g_allowvote->integer) {
-        HUDPrint(gi.LV_ConvertString("Voting not allowed here."));
+        HUDPrint(va("%s\n", gi.LV_ConvertString("Voting not allowed here.")));
         return;
     }
 
     if (level.m_voteTime != 0.0f) {
-        HUDPrint(gi.LV_ConvertString("A vote is already in progress."));
+        HUDPrint(va("%s\n", gi.LV_ConvertString("A vote is already in progress.")));
         return;
     }
 
     if (votecount >= MAX_VOTE_COUNT) {
-        HUDPrint(va("%s (%d).\n", gi.LV_ConvertString("You have called the maximum number of votes"), MAX_VOTE_COUNT));
+        if (m_fLastVoteTime) {
+            while (m_fLastVoteTime < level.time && votecount > 0) {
+                m_fLastVoteTime += 60;
+                votecount--;
+            }
+        }
+
+        if (votecount >= MAX_VOTE_COUNT) {
+            HUDPrint(
+                va("%s %d %s.\n",
+                   gi.LV_ConvertString("You cannot call another vote for"),
+                   (unsigned int)(m_fLastVoteTime - level.time + 1),
+                   gi.LV_ConvertString("seconds"))
+            );
+            return;
+        }
+    }
+
+    if (IsSpectator() || IsDead()) {
+        HUDPrint(va("%s\n", gi.LV_ConvertString("You are not allowed to call a vote as a spectator.")));
         return;
     }
 
     arg1 = ev->GetString(1);
-    arg2 = ev->GetString(2);
-
-    if (strchr(arg1.c_str(), ';') || strchr(arg2.c_str(), ';')) {
-        HUDPrint(gi.LV_ConvertString("Invalid vote string."));
-        return;
+    if (ev->NumArgs() > 1) {
+        arg2 = ev->GetString(2);
     }
 
-    if (Q_stricmp(arg1.c_str(), "restart") && Q_stricmp(arg1.c_str(), "nextmap") && Q_stricmp(arg1.c_str(), "map")
-        && Q_stricmp(arg1.c_str(), "g_gametype") && Q_stricmp(arg1.c_str(), "kick")
-        && Q_stricmp(arg1.c_str(), "clientkick") && Q_stricmp(arg1.c_str(), "fraglimit")) {
-        HUDPrint(gi.LV_ConvertString("Invalid vote string."));
-        HUDPrint(
-            va("%s restart, nextmap, map <mapname>, g_gametype <n>, fraglimit <n>, timelimit <n>, kick <player>, and "
-               "clientkick <player #>.",
-               gi.LV_ConvertString("Vote commands are:"))
-        );
+    if (!atoi(arg1.c_str())) {
+        if (strchr(arg1.c_str(), ';') || strchr(arg2.c_str(), ';')) {
+            HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote string.")));
+            return;
+        }
 
-        return;
-    }
+        if (Q_stricmp(arg1.c_str(), "restart") && Q_stricmp(arg1.c_str(), "nextmap") && Q_stricmp(arg1.c_str(), "map")
+            && Q_stricmp(arg1.c_str(), "g_gametype") && Q_stricmp(arg1.c_str(), "kick")
+            && Q_stricmp(arg1.c_str(), "clientkick") && Q_stricmp(arg1.c_str(), "fraglimit")) {
+            HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote string.")));
+            HUDPrint(va(
+                "%s restart, nextmap, map <mapname>, g_gametype <n>, fraglimit <n>, timelimit <n>, kick <player>, and "
+                "clientkick <player #>.\n",
+                gi.LV_ConvertString("Vote commands are:")
+            ));
 
-    if (!Q_stricmp(arg1.c_str(), "kick")) {
-        gentity_t *ent;
-        int        i;
+            return;
+        }
 
-        for (i = 0; i < game.maxclients; i++) {
-            ent = &g_entities[i];
+        if (!Q_stricmp(arg1.c_str(), "kick")) {
+            //
+            // check for a valid player
+            //
+            gentity_t *ent;
+            int        i;
 
-            if (!ent->inuse || !ent->client || !ent->entity) {
-                continue;
-            }
+            for (i = 0; i < game.maxclients; i++) {
+                ent = &g_entities[i];
 
-            if (!Q_stricmp(ent->client->pers.netname, arg2.c_str())) {
-                // Prevent the player from kicking himself out
-                if (ent->entity == this) {
-                    HUDPrint(gi.LV_ConvertString("You are not allowed to kick yourself."));
-                    return;
+                if (!ent->inuse || !ent->client || !ent->entity) {
+                    continue;
                 }
 
-                break;
+                if (!Q_stricmp(ent->client->pers.netname, arg2.c_str())) {
+                    // Prevent the player from kicking himself out
+                    if (ent->entity == this) {
+                        HUDPrint(va("%s\n", gi.LV_ConvertString("You are not allowed to kick yourself.")));
+                        return;
+                    }
+
+                    break;
+                }
             }
+
+            if (i == game.maxclients) {
+                HUDPrint(va("%s %s\n", arg2.c_str(), gi.LV_ConvertString("is not a valid player name to kick.")));
+                return;
+            }
+        } else if (!Q_stricmp(arg1.c_str(), "map") && *sv_nextmap->string) {
+            level.m_voteString = va("%s %s; set next map \"%s\"", arg1.c_str(), arg2.c_str(), arg2.c_str());
+        } else {
+            level.m_voteString = va("%s %s", arg1.c_str(), arg2.c_str());
         }
 
-        if (i == game.maxclients) {
-            HUDPrint(va("%s %s", ent->client->pers.netname, gi.LV_ConvertString("is not a valid player name to kick."))
-            );
+        if (level.m_nextVoteTime) {
+            level.m_nextVoteTime = 0;
+            gi.SendConsoleCommand(va("%s", level.m_voteString.c_str()));
+        }
+
+        if (!Q_stricmp(arg1.c_str(), "g_gametype")) {
+            int gametypeNum;
+
+            // get the gametype number
+            gametypeNum = atoi(arg2.c_str());
+            if (gametypeNum <= GT_SINGLE_PLAYER || gametypeNum >= GT_MAX_GAME_TYPE) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid gametype for a vote.")));
+                return;
+            }
+
+            level.m_voteString = va("%s %i", arg1.c_str(), gametypeNum);
+
+            switch (gametypeNum) {
+            case GT_FFA:
+                level.m_voteName = "Game Type Free-For-All";
+                break;
+            case GT_TEAM:
+                level.m_voteName = "Game Type Match";
+                break;
+            case GT_TEAM_ROUNDS:
+                level.m_voteName = "Game Type Round-Based-Match";
+                break;
+            case GT_OBJECTIVE:
+                level.m_voteName = "Game Type Objective-Match";
+                break;
+            case GT_TOW:
+                level.m_voteName = "Game Type Tug of War";
+                break;
+            case GT_LIBERATION:
+                level.m_voteName = "Game Type Liberation";
+                break;
+            default:
+                HUDPrint(va("%s %s %d\n", gi.LV_ConvertString("Game Type"), arg1.c_str(), gametypeNum));
+                return;
+            }
+        } else if (!Q_stricmp(arg1.c_str(), "map")) {
+            if (*sv_nextmap->string) {
+                level.m_voteString = va("%s %s; set nextmap \"%s\"", arg1.c_str(), arg2.c_str(), sv_nextmap->string);
+            } else {
+                level.m_voteString = va("%s %s", arg1.c_str(), arg2.c_str());
+            }
+
+            level.m_voteName = va("Map %s", arg2.c_str());
+        } else {
+            level.m_voteString = va("%s %s", arg1.c_str(), arg2.c_str());
+            level.m_voteName   = level.m_voteString;
         }
-    } else if (!Q_stricmp(arg1.c_str(), "map") && *sv_nextmap->string) {
-        level.m_voteString = va("%s %s; set next map \"%s\"", arg1.c_str(), arg2.c_str(), arg2.c_str());
     } else {
-        level.m_voteString = va("%s %s", arg1.c_str(), arg2.c_str());
+        int              voteIndex;
+        int              subListIndex;
+        str              voteOptionCommand;
+        str              voteOptionSubCommand;
+        str              voteOptionName;
+        str              voteOptionSubName;
+        voteoptiontype_t optionType;
+
+        union {
+            int   optionInteger;
+            float optionFloat;
+            int   optionClientNum;
+        };
+
+        gentity_t *ent;
+
+        char buffer[64];
+
+        voteIndex = atoi(arg1.c_str());
+        if (!level.GetVoteOptionMain(voteIndex, &voteOptionCommand, &optionType)) {
+            HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote option.")));
+            return;
+        }
+
+        level.GetVoteOptionMainName(voteIndex, &voteOptionName);
+
+        switch (optionType) {
+        case VOTE_NO_CHOICES:
+            level.m_voteString = voteOptionCommand;
+            level.m_voteName   = voteOptionName;
+            break;
+        case VOTE_OPTION_LIST:
+            subListIndex = atoi(arg2.c_str());
+
+            if (!level.GetVoteOptionSub(voteIndex, subListIndex, &voteOptionSubCommand)) {
+                HUDPrint(
+                    va("%s %i %s \"%s\".\n",
+                       gi.LV_ConvertString("Invalid vote choice"),
+                       subListIndex,
+                       gi.LV_ConvertString("for vote option"),
+                       voteOptionName.c_str())
+                );
+                return;
+            }
+
+            level.m_voteString = va("%s %s", voteOptionCommand.c_str(), voteOptionSubCommand.c_str());
+            // get the sub-option name
+            level.GetVoteOptionSubName(voteIndex, subListIndex, &voteOptionSubName);
+            level.m_voteName =
+                va("%s %s", gi.LV_ConvertString(voteOptionName.c_str()), gi.LV_ConvertString(voteOptionSubName.c_str())
+                );
+            break;
+        case VOTE_OPTION_TEXT:
+            if (strchr(arg2.c_str(), ';')) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote text entered.")));
+                return;
+            }
+
+            level.m_voteString = va("%s %s", voteOptionCommand.c_str(), arg2.c_str());
+            level.m_voteName   = va("%s %s", gi.LV_ConvertString(voteOptionName.c_str()), arg2.c_str());
+            break;
+        case VOTE_OPTION_INTEGER:
+            optionInteger = atoi(arg2.c_str());
+            Com_sprintf(buffer, sizeof(buffer), "%d", optionInteger);
+
+            if (Q_stricmp(buffer, arg2.c_str())) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote integer entered.")));
+                return;
+            }
+
+            level.m_voteString = va("%s %i", voteOptionCommand.c_str(), optionInteger);
+            level.m_voteName   = va("%s %i", gi.LV_ConvertString(voteOptionName.c_str()), optionInteger);
+            break;
+        case VOTE_OPTION_FLOAT:
+            optionFloat = atof(arg2.c_str());
+            Com_sprintf(buffer, sizeof(buffer), "%f", optionFloat);
+
+            if (Q_stricmp(buffer, arg2.c_str())) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid vote float entered.")));
+                return;
+            }
+
+            level.m_voteString = va("%s %g", voteOptionCommand.c_str(), optionFloat);
+            level.m_voteName   = va("%s %g", gi.LV_ConvertString(voteOptionName.c_str()), optionFloat);
+            break;
+        case VOTE_OPTION_CLIENT:
+        case VOTE_OPTION_CLIENT_NOT_SELF:
+            optionClientNum = atoi(arg2.c_str());
+            if (optionClientNum < 0 || optionClientNum >= game.maxclients) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Invalid client number for a vote.")));
+                return;
+            }
+
+            ent = &g_entities[optionClientNum];
+            if (!ent->inuse || !ent->client || !ent->entity) {
+                HUDPrint(va("%s\n", gi.LV_ConvertString("Client selected for the vote is not connected.")));
+                return;
+            }
+
+            level.m_voteString = va("%s %i", voteOptionCommand.c_str(), optionClientNum);
+            level.m_voteName =
+                va("%s #%i: %s", gi.LV_ConvertString(voteOptionName.c_str()), optionClientNum, ent->client->pers.netname
+                );
+            break;
+        default:
+            level.GetVoteOptionMainName(voteIndex, &voteOptionName);
+            gi.Printf(
+                "ERROR: Vote option (\"%s\" \"%s\") with unknown vote option type\n",
+                voteOptionName.c_str(),
+                voteOptionCommand.c_str()
+            );
+            return;
+        }
     }
 
-    dmManager.PrintAllClients(
-        va("%s %s: %s\n", client->pers.netname, gi.LV_ConvertString("called a vote"), level.m_voteString.c_str())
-    );
+    G_PrintToAllClients(va("%s %s.\n", client->pers.netname, gi.LV_ConvertString("called a vote")));
 
+    level.m_voteTime = (level.svsFloatTime - level.svsStartFloatTime) * 1000;
     level.m_voteYes  = 1;
     level.m_voteNo   = 0;
-    level.m_voteTime = level.time;
 
     // Reset all player's vote
+    numVoters = 0;
+
     for (int i = 0; i < game.maxclients; i++) {
         gentity_t *ent = &g_entities[i];
 
@@ -9334,24 +10016,40 @@ void Player::CallVote(Event *ev)
         }
 
         Player *p = (Player *)ent->entity;
+        p->voted  = false;
 
-        p->voted = false;
+        numVoters++;
     }
 
-    voted = true;
+    level.m_numVoters = numVoters;
+    client->ps.voted  = true;
+    voted             = true;
     votecount++;
 
-    level.m_numVoters = 0;
+    m_fLastVoteTime = level.time + 60;
+
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        //
+        // clients below version 2.0 don't support vote cs
+        //
+        gi.setConfigstring(CS_VOTE_TIME, va("%i", level.m_voteTime));
+        gi.setConfigstring(CS_VOTE_STRING, level.m_voteName.c_str());
+        gi.setConfigstring(CS_VOTE_YES, va("%i", level.m_voteYes));
+        gi.setConfigstring(CS_VOTE_NO, va("%i", level.m_voteNo));
+        gi.setConfigstring(CS_VOTE_UNDECIDED, va("%i", level.m_numVoters - (level.m_voteYes + level.m_voteNo)));
+    }
 }
 
 void Player::Vote(Event *ev)
 {
+    str arg1;
+
     if (level.m_voteTime == 0.0f) {
         HUDPrint(gi.LV_ConvertString("No vote in progress."));
         return;
     }
 
-    if (voted) {
+    if (client->ps.voted) {
         HUDPrint(gi.LV_ConvertString("Vote already cast."));
         return;
     }
@@ -9362,15 +10060,10 @@ void Player::Vote(Event *ev)
     }
 
     HUDPrint(gi.LV_ConvertString("Vote cast."));
-    voted = true;
+    client->ps.voted = true;
 
-    str arg1 = ev->GetString(1);
-
-    if (*arg1 == 'y' || *arg1 == 'Y' || *arg1 == '1') {
-        level.m_voteYes++;
-    } else {
-        level.m_voteNo++;
-    }
+    arg1  = ev->GetString(1);
+    voted = (arg1[0] == 'y') || (arg1[0] == 'Y') || (arg1[0] == '1');
 }
 
 void Player::RetrieveVoteOptions(Event *ev)
@@ -9387,7 +10080,13 @@ void Player::RetrieveVoteOptions(Event *ev)
 void Player::EventPrimaryDMWeapon(Event *ev)
 {
     str  dm_weapon = ev->GetString(1);
-    bool bIsBanned;
+    bool bIsBanned = false;
+
+    if (!dm_weapon.length()) {
+        // Added in OPM.
+        //  Prevent the player from cheating by going into spectator
+        return;
+    }
 
     if (!str::icmp(dm_weapon, "shotgun")) {
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_SHOTGUN);
@@ -9403,6 +10102,41 @@ void Player::EventPrimaryDMWeapon(Event *ev)
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_ROCKET);
     } else if (!str::icmp(dm_weapon, "landmine")) {
         bIsBanned = (dmflags->integer & DF_WEAPON_NO_LANDMINE) || !QueryLandminesAllowed();
+    } else if (!str::icmp(dm_weapon, "auto")) {
+        const char *primaryList[7];
+        size_t      numPrimaries = 0;
+
+        //
+        // Added in OPM
+        //  Choose a random allowed weapon
+        //
+        if (!(dmflags->integer & DF_WEAPON_NO_SHOTGUN)) {
+            primaryList[numPrimaries++] = "shotgun";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_RIFLE)) {
+            primaryList[numPrimaries++] = "rifle";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_SNIPER)) {
+            primaryList[numPrimaries++] = "sniper";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_SMG)) {
+            primaryList[numPrimaries++] = "smg";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_MG)) {
+            primaryList[numPrimaries++] = "mg";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_ROCKET)) {
+            primaryList[numPrimaries++] = "heavy";
+        }
+        if (!(dmflags->integer & DF_WEAPON_NO_LANDMINE) && QueryLandminesAllowed()) {
+            primaryList[numPrimaries++] = "landmine";
+        }
+
+        if (numPrimaries) {
+            dm_weapon = primaryList[rand() % numPrimaries];
+        } else {
+            bIsBanned = qtrue;
+        }
     }
 
     if (bIsBanned) {
@@ -9493,6 +10227,12 @@ void Player::EventGetCurrentDMWeaponType(Event *ev)
 
 void Player::PhysicsOff(Event *ev)
 {
+    if (g_target_game > TG_MOH || g_gametype->integer != GT_SINGLE_PLAYER) {
+        // Added in 2.0
+        //  Reset the state to STAND before disabling physics
+        EvaluateState(statemap_Torso->FindState("STAND"), statemap_Legs->FindState("STAND"));
+    }
+
     flags |= FL_IMMOBILE;
 }
 
@@ -9526,9 +10266,9 @@ void Player::GetNationalityPrefix(Event *ev)
     nationality_t nationality;
 
     if (GetTeam() == TEAM_AXIS) {
-        nationality = GetPlayerTeamType(client->pers.dm_playergermanmodel);
+        nationality = GetPlayerAxisTeamType(client->pers.dm_playergermanmodel);
     } else {
-        nationality = GetPlayerTeamType(client->pers.dm_playermodel);
+        nationality = GetPlayerAlliedTeamType(client->pers.dm_playermodel);
     }
 
     switch (nationality) {
@@ -9630,7 +10370,9 @@ void Player::Stats(Event *ev)
         }
     }
 
-    szPreferredWeapon = m_sPerferredWeaponOverride;
+    if (m_sPerferredWeaponOverride.length()) {
+        szPreferredWeapon = m_sPerferredWeaponOverride;
+    }
 
     if (iNumHits) {
         Com_sprintf(
@@ -9642,7 +10384,7 @@ void Player::Stats(Event *ev)
             m_iObjectivesCompleted,
             iNumShotsFired,
             iNumHits,
-            (iNumHits / iNumShotsFired * 100.f),
+            ((float)iNumHits / (float)iNumShotsFired * 100.f),
             szPreferredWeapon.c_str(),
             m_iNumHitsTaken,
             m_iNumObjectsDestroyed,
@@ -9696,39 +10438,58 @@ void Player::EventStuffText(Event *ev)
         Event *event = new Event(EV_Player_StuffText);
         event->AddValue(ev->GetValue(1));
         PostEvent(event, level.frametime, 0);
-    } else {
-        gi.SendServerCommand(edict - g_entities, "stufftext \"%s\"", ev->GetString(1).c_str());
+        return;
     }
+
+    gi.SendServerCommand(edict - g_entities, "stufftext \"%s\"", ev->GetString(1).c_str());
+
+    delegate_stufftext.Execute(ev->GetString(1));
 }
 
 void Player::EventSetVoiceType(Event *ev)
 {
     str sVoiceName = ev->GetString(1);
 
-    if (!sVoiceName.icmp("airborne")) {
-        m_voiceType = PVT_ALLIED_AIRBORNE;
-    } else if (!sVoiceName.icmp("manon")) {
-        m_voiceType = PVT_ALLIED_MANON;
-    } else if (!sVoiceName.icmp("SAS")) {
-        m_voiceType = PVT_ALLIED_SAS;
-    } else if (!sVoiceName.icmp("pilot")) {
-        m_voiceType = PVT_ALLIED_PILOT;
-    } else if (!sVoiceName.icmp("army")) {
-        m_voiceType = PVT_ALLIED_ARMY;
-    } else if (!sVoiceName.icmp("ranger")) {
-        m_voiceType = PVT_ALLIED_RANGER;
-    } else if (!sVoiceName.icmp("axis1")) {
-        m_voiceType = PVT_AXIS_AXIS1;
-    } else if (!sVoiceName.icmp("axis2")) {
-        m_voiceType = PVT_AXIS_AXIS2;
-    } else if (!sVoiceName.icmp("axis3")) {
-        m_voiceType = PVT_AXIS_AXIS3;
-    } else if (!sVoiceName.icmp("axis4")) {
-        m_voiceType = PVT_AXIS_AXIS4;
-    } else if (!sVoiceName.icmp("axis5")) {
-        m_voiceType = PVT_AXIS_AXIS5;
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (!sVoiceName.icmp("american")) {
+            m_voiceType = PVT_ALLIED_AMERICAN;
+        } else if (!sVoiceName.icmp("british")) {
+            m_voiceType = PVT_ALLIED_BRITISH;
+        } else if (!sVoiceName.icmp("russian")) {
+            m_voiceType = PVT_ALLIED_RUSSIAN;
+        } else if (!sVoiceName.icmp("german")) {
+            m_voiceType = PVT_AXIS_GERMAN;
+        } else if (!sVoiceName.icmp("italian")) {
+            m_voiceType = PVT_AXIS_ITALIAN;
+        } else {
+            m_voiceType = PVT_NONE_SET;
+        }
     } else {
-        m_voiceType = PVT_NONE_SET;
+        if (!sVoiceName.icmp("airborne")) {
+            m_voiceType = PVT_ALLIED_AIRBORNE;
+        } else if (!sVoiceName.icmp("manon")) {
+            m_voiceType = PVT_ALLIED_MANON;
+        } else if (!sVoiceName.icmp("SAS")) {
+            m_voiceType = PVT_ALLIED_SAS;
+        } else if (!sVoiceName.icmp("pilot")) {
+            m_voiceType = PVT_ALLIED_PILOT;
+        } else if (!sVoiceName.icmp("army")) {
+            m_voiceType = PVT_ALLIED_ARMY;
+        } else if (!sVoiceName.icmp("ranger")) {
+            m_voiceType = PVT_ALLIED_RANGER;
+        } else if (!sVoiceName.icmp("axis1")) {
+            m_voiceType = PVT_AXIS_AXIS1;
+        } else if (!sVoiceName.icmp("axis2")) {
+            m_voiceType = PVT_AXIS_AXIS2;
+        } else if (!sVoiceName.icmp("axis3")) {
+            m_voiceType = PVT_AXIS_AXIS3;
+        } else if (!sVoiceName.icmp("axis4")) {
+            m_voiceType = PVT_AXIS_AXIS4;
+        } else if (!sVoiceName.icmp("axis5")) {
+            m_voiceType = PVT_AXIS_AXIS5;
+        } else {
+            m_voiceType = PVT_NONE_SET;
+        }
     }
 }
 
@@ -9740,29 +10501,84 @@ void Player::GetTeamDialogPrefix(str& outPrefix)
         outPrefix = "allied_";
     }
 
-    switch (m_voiceType) {
-    case PVT_ALLIED_AMERICAN:
-        outPrefix += "american_";
-        break;
-    case PVT_ALLIED_BRITISH:
-        outPrefix += "british_";
-        break;
-    case PVT_ALLIED_RUSSIAN:
-        outPrefix += "russian_";
-        break;
-    case PVT_AXIS_START:
-        outPrefix += "german_";
-        break;
-    case PVT_AXIS_ITALIAN:
-        outPrefix += "italian_";
-        break;
-    default:
-        if (GetTeam() == TEAM_AXIS) {
-            outPrefix += "german_";
-        } else {
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        switch (m_voiceType) {
+        case PVT_ALLIED_AMERICAN:
             outPrefix += "american_";
+            break;
+        case PVT_ALLIED_BRITISH:
+            outPrefix += "british_";
+            break;
+        case PVT_ALLIED_RUSSIAN:
+            outPrefix += "russian_";
+            break;
+        case PVT_AXIS_START:
+            outPrefix += "german_";
+            break;
+        case PVT_AXIS_ITALIAN:
+            outPrefix += "italian_";
+            break;
+        default:
+            if (GetTeam() == TEAM_AXIS) {
+                outPrefix += "german_";
+            } else {
+                outPrefix += "american_";
+            }
+            break;
+        }
+    } else {
+        switch (m_voiceType) {
+        case PVT_ALLIED_AIRBORNE:
+            outPrefix += "airborne_";
+            break;
+
+        case PVT_ALLIED_MANON:
+            outPrefix += "manon_";
+            break;
+
+        case PVT_ALLIED_SAS:
+            outPrefix += "sas_";
+            break;
+
+        case PVT_ALLIED_PILOT:
+            outPrefix += "pilot_";
+            break;
+
+        case PVT_ALLIED_ARMY:
+            outPrefix += "army_";
+            break;
+
+        case PVT_ALLIED_RANGER:
+            outPrefix += "ranger_";
+            break;
+
+        case PVT_AXIS_AXIS1:
+            outPrefix += "axis1_";
+            break;
+
+        case PVT_AXIS_AXIS2:
+            outPrefix += "axis2_";
+            break;
+
+        case PVT_AXIS_AXIS3:
+            outPrefix += "axis3_";
+            break;
+
+        case PVT_AXIS_AXIS4:
+            outPrefix += "axis4_";
+            break;
+
+        case PVT_AXIS_AXIS5:
+            outPrefix += "axis5_";
+            break;
+
+        default:
+            if (dm_team != TEAM_AXIS) {
+                outPrefix += "army_";
+            } else {
+                outPrefix += "axis4_";
+            }
         }
-        break;
     }
 }
 
@@ -9792,193 +10608,296 @@ void Player::PlayInstantMessageSound(const char *name)
 
 void Player::EventDMMessage(Event *ev)
 {
-    int              mode;
-    str              stuffstrings;
-    str              convertedstuff;
-    str              string;
-    str              voiceName;
-    str              soundName;
-    AliasListNode_t *list          = NULL;
-    const char      *prefix        = NULL;
-    qboolean         bInstaMessage = qfalse;
-    qboolean         met_comment   = false;
+    int i;
+    //int              iStringLength;
+    int              iMode = 0;
+    str              sToken;
+    char             szPrintString[MAX_SAY_TEXT]; // it's MAX_STRING_CHARS in mohaa
+    size_t           iStringLength;
+    const char      *pTmpInstantMsg = "";
+    qboolean         bInstaMessage  = qfalse;
+    AliasListNode_t *pSoundAlias    = NULL;
+    const char      *pszAliasname   = NULL;
+    str              sAliasName;
+    str              sRandomAlias;
+    gentity_t       *ent;
 
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
-    mode = ev->GetInteger(1);
-
     if (ev->NumArgs() <= 1) {
         return;
     }
 
-    string = ev->GetString(2);
+    if (!Q_stricmp(client->pers.netname, "console")) {
+        // Added in OPM
+        //  Reserved name
+        gi.Printf(
+            "Client %d trying to send a message using a reserved name ('%s')\n",
+            edict - g_entities,
+            client->pers.netname
+        );
+        return;
+    }
+
+    sToken = ev->GetString(2);
 
     // Check for taunts
-    if (string.length() == 3 && *string == '*') {
-        char num1 = string[1];
-        char num2 = string[2];
+    if (sToken.length() == 3 && *sToken == '*' && sToken[1] > '0' && sToken[1] <= '9' && sToken[2] > '0'
+        && sToken[2] <= '9') {
+        unsigned int n1, n2;
 
-        if (num1 > '0' && num1 <= '9' && num2 > '0' && num2 <= '9') {
-            if (IsSpectator() || IsDead()) {
-                return;
-            }
-
-            if (dm_team == TEAM_AXIS) {
-                voiceName = "axis_";
-            } else {
-                voiceName = "allied_";
-            }
-        }
-
-        switch (m_voiceType) {
-        case PVT_ALLIED_AIRBORNE:
-            voiceName += "airborne_";
-            break;
-
-        case PVT_ALLIED_MANON:
-            voiceName += "manon_";
-            break;
-
-        case PVT_ALLIED_SAS:
-            voiceName += "sas_";
-            break;
-
-        case PVT_ALLIED_PILOT:
-            voiceName += "pilot_";
-            break;
-
-        case PVT_ALLIED_ARMY:
-            voiceName += "army_";
-            break;
-
-        case PVT_ALLIED_RANGER:
-            voiceName += "ranger_";
-            break;
-
-        case PVT_AXIS_AXIS1:
-            voiceName += "axis1_";
-            break;
-
-        case PVT_AXIS_AXIS2:
-            voiceName += "axis2_";
-            break;
-
-        case PVT_AXIS_AXIS3:
-            voiceName += "axis3_";
-            break;
-
-        case PVT_AXIS_AXIS4:
-            voiceName += "axis4_";
-            break;
-
-        case PVT_AXIS_AXIS5:
-            voiceName += "axis5_";
-            break;
-
-        default:
-            if (dm_team != TEAM_AXIS) {
-                voiceName += "army_";
-            } else {
-                voiceName += "axis4_";
-            }
-        }
-
-        voiceName += va("%c%c", num1 + '0', num2 + '0');
-
-        FindAlias(soundName, voiceName, &list);
-
-        if (list) {
-            bInstaMessage = qtrue;
-        }
-    }
-
-    if (!bInstaMessage) {
-        for (int i = 2; i <= ev->NumArgs(); i++) {
-            string = ev->GetString(i);
-
-            if (strstr(string, "/*")) {
-                met_comment = true;
-            }
-
-            if (strstr(string, "*/") && met_comment) {
-                G_WarnPlayer(this, "Line comments ('/*' and '*/') are not allowed in messages.\n");
-                return;
-            }
-
-            stuffstrings += " " + string;
-            convertedstuff += gi.LV_ConvertString(string);
-        }
-    } else {
-        stuffstrings = " " + str(list->subtitle);
-    }
-
-    stuffstrings += "\n";
-
-    // Protect again buffer overflow exploit
-    if (stuffstrings.length() >= MAX_STRING_CHARS) {
-        HUDPrint("The message you entered is too long.\n");
-        return;
-    }
-
-    if (convertedstuff.length() >= MAX_STRING_CHARS) {
-        HUDPrint("The message you entered is too long.\n");
-        return;
-    }
-
-    // Prevent the comment glitch
-    // ley: The problem seems to be an issue with COM_Parse, which skips all C comments
-    if (strstr(client->pers.netname, "/*")) {
-        met_comment = true;
-    }
-
-    if (strstr(client->pers.netname, "//") || strstr(client->pers.netname, "*/")) {
-        HUDPrint("C comments ('//', '/*' and '*/') are not allowed in names.\n");
-        return;
-    }
-
-    if (IsSpectator()) {
-        if (mode > 0 && mode <= game.maxclients) {
-            const char *error =
-                "Message Error: Spectators are not allowed to send private messages to non-spectators.\n";
-
-            gi.SendServerCommand(client->ps.clientNum, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", error);
+        if (IsSpectator() || IsDead()) {
+            // spectators or death players can't talk
             return;
         }
 
-        prefix = gi.LV_ConvertString("(spectator) ");
-        string = prefix + str(client->pers.netname) + ":" + str(stuffstrings);
-    } else if (IsDead()) {
-        if (mode > 0 && mode <= game.maxclients) {
-            const char *error =
-                "Message Error: Dead players are not allowed to send private messages to active players.\n";
-
-            gi.SendServerCommand(client->ps.clientNum, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", error);
+        if (edict->r.svFlags & SVF_NOCLIENT) {
+            // Changed in OPM
+            //  Don't send a voice chat message if the entity is not sent to client
             return;
         }
 
-        prefix = gi.LV_ConvertString("(dead) ");
-        string = prefix + str(client->pers.netname) + ":" + str(stuffstrings);
-    } else {
-        if (mode == -1) {
-            string = "(team) " + str(client->pers.netname) + ":" + str(stuffstrings);
+        if (!g_instamsg_allowed->integer) {
+            // Added in OPM
+            return;
+        }
+
+        if (g_instamsg_minDelay->integer > 0 && level.inttime < m_iInstantMessageTime + g_instamsg_minDelay->integer) {
+            // Added in OPM
+            return;
+        }
+
+        GetTeamDialogPrefix(sAliasName);
+        if (g_target_game >= target_game_e::TG_MOHTT && sToken[1] == '6') {
+            // Added in 2.30
+            //  Liberation messages
+            sAliasName += va("lib%c", (sToken[2] + '0'));
         } else {
-            string = str(client->pers.netname) + ":" + str(stuffstrings);
+            sAliasName += va("%c%c", (sToken[1] + '0'), (sToken[2] + '0'));
+        }
+
+        sRandomAlias = GetRandomAlias(sAliasName, &pSoundAlias);
+
+        // find a random alias
+        if (sRandomAlias.length() > 0) {
+            pszAliasname = sRandomAlias.c_str();
+        }
+
+        if (!pszAliasname) {
+            pszAliasname = gi.GlobalAlias_FindRandom(sAliasName, &pSoundAlias);
+        }
+
+        if (!pszAliasname || !pSoundAlias) {
+            return;
+        }
+
+        n1 = sToken[1] - '1';
+        n2 = sToken[2] - '1';
+
+        if (g_protocol >= PROTOCOL_MOHTA_MIN) {
+            if (n1 >= ARRAY_LEN(pInstantMsgEng) || n2 >= ARRAY_LEN(pInstantMsgEng[0])) {
+                return;
+            }
+
+            pTmpInstantMsg = pInstantMsgEng[n1][n2];
+        } else {
+            if (n1 >= ARRAY_LEN(pInstantMsgEng_ver6) || n2 >= ARRAY_LEN(pInstantMsgEng_ver6[0])) {
+                return;
+            }
+
+            // fallback to old version
+            pTmpInstantMsg = pInstantMsgEng_ver6[n1][n2];
+        }
+
+        bInstaMessage = qtrue;
+
+        if (g_gametype->integer == GT_FFA) {
+            iMode = 0;
+        } else {
+            if (n1 == 4) {
+                iMode = 0;
+            } else {
+                iMode = -1;
+            }
+        }
+    } else {
+        if (!g_textmsg_allowed->integer) {
+            // Added in OPM
+
+            str errorString  = gi.LV_ConvertString("Message Error");
+            str reasonString = gi.LV_ConvertString("Text chat is disabled on this server");
+
+            gi.SendServerCommand(
+                edict - g_entities,
+                "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %s.\n\"",
+                errorString.c_str(),
+                reasonString.c_str()
+            );
+            return;
+        }
+
+        if (g_textmsg_minDelay->integer > 0 && level.inttime < m_iTextChatTime + g_textmsg_minDelay->integer) {
+            // Added in OPM
+            return;
         }
     }
 
-    if (voiceName.length()) {
-        if (!IsDead() && (!IsSpectator() || g_spectate_allow_full_chat->integer)) {
-            gentity_t *ent;
-            int        i;
+    if (bInstaMessage) {
+        if (g_voiceChatTime->value > 0) {
+            m_fTalkTime = g_voiceChatTime->value + level.time;
+        }
+        m_iInstantMessageTime = level.inttime;
+    } else {
+        iMode = ev->GetInteger(1);
+        if (g_textChatTime->value > 0) {
+            m_fTalkTime = g_textChatTime->value + level.time;
+        }
+        m_iTextChatTime = level.inttime;
+    }
+
+    Q_strncpyz(szPrintString, "print \"" HUD_MESSAGE_CHAT_WHITE, sizeof(szPrintString));
+
+    if (m_bSpectator) {
+        if (iMode <= 0) {
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(spectator)"));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
+        } else if (iMode <= game.maxclients) {
+            ent = &g_entities[iMode - 1];
+
+            if (ent->inuse && ent->entity && !static_cast<Player *>(ent->entity)->IsSpectator()) {
+                str errorString = gi.LV_ConvertString("Message Error");
+                str reasonString =
+                    gi.LV_ConvertString("Spectators are not allowed to send private messages to non-spectators");
+
+                gi.SendServerCommand(
+                    edict - g_entities,
+                    "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %s.\n\"",
+                    errorString.c_str(),
+                    reasonString.c_str()
+                );
+                return;
+            }
+        }
+    } else if (IsDead() || m_bTempSpectator) {
+        if (iMode <= 0) {
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(dead)"));
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
+        } else if (iMode <= game.maxclients) {
+            ent = &g_entities[iMode - 1];
+
+            if (ent->inuse && ent->entity && !static_cast<Player *>(ent->entity)->IsSpectator()) {
+                str errorString = gi.LV_ConvertString("Message Error");
+                str reasonString =
+                    gi.LV_ConvertString("Dead players are not allowed to send private messages to active players");
+
+                gi.SendServerCommand(
+                    edict - g_entities,
+                    "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %s.\n\"",
+                    errorString.c_str(),
+                    reasonString.c_str()
+                );
+                return;
+            }
+        }
+    } else if (iMode < 0) {
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(team)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
+    } else if (iMode > 0) {
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.CL_LV_ConvertString("(private)"));
+        Q_strcat(szPrintString, sizeof(szPrintString), " ");
+    }
+
+    Q_strcat(szPrintString, sizeof(szPrintString), client->pers.netname);
+
+    if (bInstaMessage) {
+        Q_strcat(szPrintString, sizeof(szPrintString), ": ");
+        Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(pTmpInstantMsg));
+    } else {
+        bool met_comment = false;
+
+        Q_strcat(szPrintString, sizeof(szPrintString), ":");
+        iStringLength = strlen(szPrintString);
+
+        // Added in OPM.
+        //  Checks for comments in string (as COM_Parse will parse them)
+        //  This was fixed in 2.0 but make the fix compatible with older versions
+        if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN && strstr(client->pers.netname, "/*")) {
+            met_comment = true;
+        }
+
+        for (i = 2; i <= ev->NumArgs(); i++) {
+            sToken = ev->GetString(i);
+            // Added in 2.40
+            //  Special battle language tokens
+            //  So players can easily tell their position, health, etc.
+            sToken = TranslateBattleLanguageTokens(sToken);
+
+            if (iStringLength + sToken.length() > (ARRAY_LEN(szPrintString) - 1)) {
+                break;
+            }
+
+            if (met_comment && strstr(sToken, "*/")) {
+                // ignore messages containing comments
+                return;
+            }
+
+            Q_strcat(szPrintString, sizeof(szPrintString), " ");
+            Q_strcat(szPrintString, sizeof(szPrintString), gi.LV_ConvertString(sToken));
+        }
+    }
+
+    Q_strcat(szPrintString, sizeof(szPrintString), "\n");
+
+    // ignore names containing comments
+    if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+        if (strstr(client->pers.netname, "//")
+            || (strstr(client->pers.netname, "/*") && strstr(client->pers.netname, "*/"))) {
+            return;
+        }
+    }
+
+    //
+    // Added in OPM
+    //=============
+    // Print the dm message to console
+    sToken = "";
+
+    for (i = 2; i <= ev->NumArgs(); i++) {
+        if (i != 2) {
+            sToken += " ";
+        }
+
+        sToken += ev->GetString(i);
+    }
+    //=============
+
+    if (iMode == 0) {
+        //
+        // everyone
+        //
+
+        // Added in OPM
+        if (bInstaMessage) {
+            gi.Printf(
+                "%s (%zu) says (voice) to everyone: %s\n", client->pers.netname, edict - g_entities, pTmpInstantMsg
+            );
+        } else {
+            gi.Printf(
+                "%s (%zu) says (text) to everyone: %s\n", client->pers.netname, edict - g_entities, sToken.c_str()
+            );
+        }
+
+        if (!IsSpectator() || g_spectate_allow_full_chat->integer) {
+            for (i = 0; i < game.maxclients; i++) {
+                ent = &g_entities[i];
 
-            for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
                 if (!ent->inuse || !ent->entity) {
                     continue;
                 }
 
-                gi.SendServerCommand(i, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", string.c_str());
+                gi.SendServerCommand(i, "%s", szPrintString);
 
                 if (bInstaMessage) {
                     gi.MSG_SetClient(i);
@@ -9986,53 +10905,165 @@ void Player::EventDMMessage(Event *ev)
                     gi.MSG_WriteCoord(m_vViewPos[0]);
                     gi.MSG_WriteCoord(m_vViewPos[1]);
                     gi.MSG_WriteCoord(m_vViewPos[2]);
-                    gi.MSG_WriteBits(1, 1);
+                    gi.MSG_WriteBits(qtrue, 1);
                     gi.MSG_WriteBits(edict - g_entities, 6);
-                    gi.MSG_WriteString(voiceName.c_str());
+                    gi.MSG_WriteString(sAliasName.c_str());
                     gi.MSG_EndCGM();
                 }
             }
+        } else {
+            //
+            // send a message to spectators
+            //
+            for (i = 0; i < game.maxclients; i++) {
+                ent = &g_entities[i];
 
-            return;
+                if (!ent->inuse || !ent->entity) {
+                    continue;
+                }
+
+                if (!static_cast<Player *>(ent->entity)->IsSpectator()) {
+                    continue;
+                }
+
+                gi.SendServerCommand(i, "%s", szPrintString);
+            }
         }
-    }
 
-    if (mode == -1) {
-        int        i;
-        gentity_t *ent;
-        Player    *p;
+        if (!bInstaMessage) {
+            Event event;
+            // sent to everyone (not a team)
+            event.AddString(sToken);
+            event.AddInteger(false);
 
+            scriptDelegate_textMessage.Trigger(this, event);
+        }
+    } else if (iMode < 0) {
+        //
         // team message
-        for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
-            if (!ent->inuse || !ent->entity) {
-                continue;
+        //
+
+        // Added in OPM
+        if (bInstaMessage) {
+            gi.Printf("%s (%zu) says (voice) to team: %s\n", client->pers.netname, edict - g_entities, pTmpInstantMsg);
+        } else {
+            gi.Printf("%s (%zu) says (text) to team: %s\n", client->pers.netname, edict - g_entities, sToken.c_str());
+        }
+
+        if (IsSpectator()) {
+            for (i = 0; i < game.maxclients; i++) {
+                ent = &g_entities[i];
+
+                if (!ent->inuse || !ent->entity) {
+                    continue;
+                }
+
+                if (!static_cast<Player *>(ent->entity)->IsSpectator()) {
+                    continue;
+                }
+
+                gi.SendServerCommand(i, "%s", szPrintString);
             }
+        } else {
+            for (i = 0; i < game.maxclients; i++) {
+                bool bSameTeam;
 
-            p = (Player *)ent->entity;
+                ent = &g_entities[i];
 
-            if (p->GetTeam() == GetTeam()) {
-                gi.SendServerCommand(i, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", string.c_str());
+                if (!ent->inuse || !ent->entity) {
+                    continue;
+                }
+
+                bSameTeam = static_cast<Player *>(ent->entity)->GetTeam() == GetTeam();
+                if (bSameTeam) {
+                    gi.SendServerCommand(i, "%s", szPrintString);
+                }
+
+                if (bInstaMessage) {
+                    gi.MSG_SetClient(i);
+                    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_VOICE_CHAT));
+                    gi.MSG_WriteCoord(m_vViewPos[0]);
+                    gi.MSG_WriteCoord(m_vViewPos[1]);
+                    gi.MSG_WriteCoord(m_vViewPos[2]);
+                    gi.MSG_WriteBits(!bSameTeam, 1);
+                    gi.MSG_WriteBits(edict - g_entities, 6);
+                    gi.MSG_WriteString(sAliasName.c_str());
+                    gi.MSG_EndCGM();
+                }
             }
         }
-    } else if (mode > 0) {
-        gentity_t *ent = g_entities + mode;
 
-        if (mode > game.maxclients || !ent->inuse || !ent->entity) {
+        if (!bInstaMessage) {
+            Event event;
+            // sent to team
+            event.AddString(sToken);
+            event.AddInteger(true);
+
+            scriptDelegate_textMessage.Trigger(this, event);
+        }
+    } else if (iMode <= game.maxclients) {
+        ent = &g_entities[iMode - 1];
+
+        if (!ent->inuse || !ent->entity) {
+            str errorString  = gi.LV_ConvertString("Message Error");
+            str reasonString = gi.LV_ConvertString("is not a connected client");
+
             gi.SendServerCommand(
-                client->ps.clientNum,
-                "print \"" HUD_MESSAGE_CHAT_WHITE "Message Error: %d is a bad client number\n\"",
-                mode
+                edict - g_entities,
+                "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %i %s.\n\"",
+                errorString.c_str(),
+                iMode,
+                reasonString.c_str()
             );
             return;
         }
 
-        gi.SendServerCommand(client->ps.clientNum, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", string.c_str());
-    }
+        // Added in OPM
+        if (bInstaMessage) {
+            gi.Printf(
+                "%s (%zu) says (voice) to client #%d: %s\n",
+                client->pers.netname,
+                edict - g_entities,
+                iMode - 1,
+                pTmpInstantMsg
+            );
+        } else {
+            gi.Printf(
+                "%s (%zu) says (text) to client #%d: %s\n",
+                client->pers.netname,
+                edict - g_entities,
+                iMode - 1,
+                sToken.c_str()
+            );
+        }
 
-    gi.SendServerCommand(mode - 1, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\"", string.c_str());
+        gi.SendServerCommand(iMode - 1, "%s", szPrintString);
+
+        if (ent->entity != this) {
+            gi.SendServerCommand(
+                edict - g_entities,
+                "print \"" HUD_MESSAGE_CHAT_WHITE "%s %i:\n\"",
+                gi.LV_ConvertString("Message to player"),
+                iMode
+            );
+            gi.SendServerCommand(edict - g_entities, "%s", szPrintString);
+        }
+    } else {
+        str errorString  = gi.LV_ConvertString("Message Error");
+        str reasonString = gi.LV_ConvertString("is a bad client number");
+
+        gi.SendServerCommand(
+            edict - g_entities,
+            "print \"" HUD_MESSAGE_CHAT_WHITE "%s: %i %s.\n\"",
+            errorString.c_str(),
+            iMode,
+            reasonString.c_str()
+        );
+        return;
+    }
 }
 
-const char *Player::GetBattleLanguageCondition() const
+str Player::GetBattleLanguageCondition() const
 {
     int healthRatio;
 
@@ -10049,7 +11080,7 @@ const char *Player::GetBattleLanguageCondition() const
     case 0:
         return "almost dead";
     case 1:
-        return "severly wounded";
+        return "severely wounded";
     case 2:
         return "wounded";
     case 3:
@@ -10060,7 +11091,7 @@ const char *Player::GetBattleLanguageCondition() const
     }
 }
 
-const char *Player::GetBattleLanguageDirection() const
+str Player::GetBattleLanguageDirection() const
 {
     int dir = ((m_vViewAng.y - world->m_fNorth) + 22.5f + 360.f) / 45.f;
     switch (dir % 8) {
@@ -10085,12 +11116,12 @@ const char *Player::GetBattleLanguageDirection() const
     }
 }
 
-const char *Player::GetBattleLanguageLocation() const
+str Player::GetBattleLanguageLocation() const
 {
-    return level.GetDMLocation(m_vViewPos).c_str();
+    return gi.CL_LV_ConvertString(level.GetDMLocation(m_vViewPos).c_str());
 }
 
-const char *Player::GetBattleLanguageLocalFolks()
+str Player::GetBattleLanguageLocalFolks()
 {
     static char buf[256];
     char       *p;
@@ -10121,7 +11152,7 @@ const char *Player::GetBattleLanguageLocalFolks()
                     break;
                 }
 
-                strcpy(p, ", ");
+                Q_strncpyz(p, ", ", sizeof(buf) - (p - buf));
                 p += 2;
                 curP = p;
                 remaining -= 2;
@@ -10132,7 +11163,7 @@ const char *Player::GetBattleLanguageLocalFolks()
                 break;
             }
 
-            strcpy(p, client->pers.netname);
+            Q_strncpyz(p, client->pers.netname, sizeof(buf) - (p - buf));
             p += length;
             remaining -= length;
             pFolk = pPlayer;
@@ -10140,8 +11171,8 @@ const char *Player::GetBattleLanguageLocalFolks()
     }
 
     if (curP && remaining >= 2) {
-        strcpy(curP, "and ");
-        strcpy(curP + strlen(curP), pFolk->client->pers.netname);
+        Q_strncpyz(curP, "and ", sizeof(buf) - (curP - buf));
+        Q_strncpyz(curP + strlen(curP), pFolk->client->pers.netname, sizeof(buf) - (curP + strlen(curP) - buf));
     } else if (!pFolk) {
         return "nobody";
     }
@@ -10149,12 +11180,12 @@ const char *Player::GetBattleLanguageLocalFolks()
     return buf;
 }
 
-const char *Player::GetBattleLanguageWeapon() const
+str Player::GetBattleLanguageWeapon() const
 {
     return GetCurrentDMWeaponType().c_str();
 }
 
-const char *Player::GetBattleLanguageDistance() const
+str Player::GetBattleLanguageDistance() const
 {
     Vector  vStart, vEnd;
     Vector  vForward;
@@ -10186,7 +11217,7 @@ const char *Player::GetBattleLanguageDistance() const
     }
 }
 
-const char *Player::GetBattleLanguageDistanceMeters(float dist) const
+str Player::GetBattleLanguageDistanceMeters(float dist) const
 {
     int meters;
 
@@ -10204,7 +11235,7 @@ const char *Player::GetBattleLanguageDistanceMeters(float dist) const
     return va("%d meters", meters);
 }
 
-const char *Player::GetBattleLanguageDistanceFeet(float dist) const
+str Player::GetBattleLanguageDistanceFeet(float dist) const
 {
     int ft;
 
@@ -10222,7 +11253,7 @@ const char *Player::GetBattleLanguageDistanceFeet(float dist) const
     return va("%d feet", ft);
 }
 
-const char *Player::GetBattleLanguageTarget() const
+str Player::GetBattleLanguageTarget() const
 {
     Vector  vStart, vEnd;
     Vector  vForward;
@@ -10264,17 +11295,17 @@ const char *Player::GetBattleLanguageTarget() const
     return "something";
 }
 
-const char *Player::TranslateBattleLanguageTokens(const char *string)
+str Player::TranslateBattleLanguageTokens(const char *string)
 {
-    const char *token;
-    int         type;
+    str token;
+    int type;
 
     if (!g_chat_expansions->integer) {
         return string;
     }
 
     if (!string) {
-        return NULL;
+        return str();
     }
 
     if (string[0] != '$') {
@@ -10325,9 +11356,13 @@ void Player::EventIPrint(Event *ev)
     }
 
     if (iBold) {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", sString.c_str());
+        gi.SendServerCommand(
+            edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str())
+        );
     } else {
-        gi.SendServerCommand(edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sString.c_str());
+        gi.SendServerCommand(
+            edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str())
+        );
     }
 }
 
@@ -10338,7 +11373,7 @@ void Player::SetViewangles(Event *ev)
 
 void Player::GetViewangles(Event *ev)
 {
-    ev->AddVector(v_angle);
+    ev->AddVector(GetVAngles());
 }
 
 void Player::EventGetUseHeld(Event *ev)
@@ -10498,14 +11533,21 @@ void Player::RemoveFromVehiclesAndTurrets(void)
             RemoveFromVehiclesAndTurretsInternal();
         }
 
-        m_pVehicle->Lock();
+        // the vehicle might have been modified
+        if (m_pVehicle) {
+            m_pVehicle->Lock();
+        }
     } else if (m_pTurret && m_pTurret->IsSubclassOfVehicleTurretGun()) {
         VehicleTurretGun *turret = (VehicleTurretGun *)m_pTurret.Pointer();
 
         if (turret->isLocked()) {
             turret->UnLock();
             RemoveFromVehiclesAndTurretsInternal();
-            turret->Lock();
+
+            // the turret might have been modified
+            if (m_pTurret) {
+                turret->Lock();
+            }
         } else {
             RemoveFromVehiclesAndTurretsInternal();
         }
@@ -10546,7 +11588,6 @@ void Player::EventSetPerferredWeapon(Event *ev)
 }
 
 void Player::SetMouthAngle(Event *ev)
-
 {
     int    tag_num;
     float  angle_percent;
@@ -10579,6 +11620,59 @@ int Player::GetMoveResult(void)
     return moveresult;
 }
 
+qboolean Player::CheckCanSwitchTeam(teamtype_t team)
+{
+    float startTime;
+
+    startTime = dmManager.GetMatchStartTime();
+
+    if (startTime >= 0.0f && (level.time - startTime) > 30.0
+        && (level.time - m_fTeamSelectTime) < g_teamswitchdelay->integer) {
+        int seconds = g_teamswitchdelay->integer - (level.time - m_fTeamSelectTime);
+
+        gi.SendServerCommand(
+            edict - g_entities,
+            "print \"" HUD_MESSAGE_WHITE "%s %i %s\n\"",
+            gi.LV_ConvertString("Can not change teams again for another"),
+            seconds + 1,
+            gi.LV_ConvertString("seconds")
+        );
+        return qfalse;
+    }
+
+    // Added in OPM
+    //  Check and prevent joining the team with the highest number of players
+    if (g_teambalance->integer && g_gametype->integer >= GT_TEAM && !dmManager.WaitingForPlayers()) {
+        DM_Team *pNewTeam = dmManager.GetTeam(team);
+        int      i;
+
+        for (i = 0; i < 2; i++) {
+            DM_Team *pTeam          = dmManager.GetTeam((teamtype_t)(TEAM_ALLIES + i));
+            int      numTeamPlayers = pTeam->m_players.NumObjects();
+
+            if (pTeam->m_players.IndexOfObject(this)) {
+                // Don't count the current player
+                numTeamPlayers--;
+            }
+
+            if (pNewTeam->m_players.NumObjects() > numTeamPlayers) {
+                const char *message = gi.LV_ConvertString(
+                    "That team has enough players. Choose the team that has the lowest number of players."
+                );
+
+                gi.SendServerCommand(
+                    edict - g_entities, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(message)
+                );
+
+                gi.centerprintf(edict, message);
+                return qfalse;
+            }
+        }
+    }
+
+    return qtrue;
+}
+
 qboolean Player::ViewModelAnim(str anim, qboolean force_restart, qboolean bFullAnim)
 {
     Unregister(STRING_VIEWMODELANIM_DONE);
@@ -10593,10 +11687,10 @@ qboolean Player::ViewModelAnim(str anim, qboolean force_restart, qboolean bFullA
 
     if (!anim.length()) {
         anim = "";
-	}
+    }
 
-	// Copy the item prefix and the anim name
-	weapon = GetActiveWeapon(WEAPON_MAIN);
+    // Copy the item prefix and the anim name
+    weapon = GetActiveWeapon(WEAPON_MAIN);
 
     if (!Q_stricmp(anim, "charge")) {
         viewModelAnim = VM_ANIM_CHARGE;
@@ -10665,7 +11759,7 @@ qboolean Player::ViewModelAnim(str anim, qboolean force_restart, qboolean bFullA
     playerState->iViewModelAnim = viewModelAnim;
 
     if (m_fpsTiki && gi.Anim_NumForName(m_fpsTiki, m_sVMAcurrent) < 0) {
-        gi.DPrintf("WARNING: Invalid view model anim \"%s\"\n", m_sVMAcurrent.c_str());
+        //gi.DPrintf("WARNING: Invalid view model anim \"%s\"\n", m_sVMAcurrent.c_str());
     }
 
     animDoneVM = false;
@@ -10688,6 +11782,16 @@ void Player::FindAlias(str& output, str name, AliasListNode_t **node)
     }
 }
 
+bool Player::HasVotedYes() const
+{
+    return voted;
+}
+
+bool Player::HasVotedNo() const
+{
+    return !voted;
+}
+
 void Player::TickSprint()
 {
     float timeHeld;
@@ -10736,6 +11840,13 @@ void Player::FireWeapon(int number, firemode_t mode)
         return;
     }
 
+    if (G_GetWeaponCommand(last_ucmd.buttons)) {
+        // Added in OPM
+        //  If there is a weapon command (like DROP), then just don't fire
+        //  this prevent tricky behaviors, like silent firing
+        return;
+    }
+
     Sentient::FireWeapon(number, mode);
 
     if (g_gametype->integer != GT_SINGLE_PLAYER) {
@@ -10876,7 +11987,7 @@ bool Player::ShouldForceSpectatorOnDeath() const
     return dmManager.GetTeamSpawnTimeLeft() > 0;
 }
 
-bool Player::HasVehicle()
+bool Player::HasVehicle() const
 {
     return m_pVehicle != NULL;
 }
@@ -10904,15 +12015,15 @@ void Player::UserSelectWeapon(bool bWait)
     }
 
     if (GetTeam() == TEAM_AXIS) {
-        nationality = GetPlayerTeamType(client->pers.dm_playergermanmodel);
+        nationality = GetPlayerAxisTeamType(client->pers.dm_playergermanmodel);
     } else {
-        nationality = GetPlayerTeamType(client->pers.dm_playermodel);
+        nationality = GetPlayerAlliedTeamType(client->pers.dm_playermodel);
     }
 
     if (bWait) {
-        strcpy(buf, "stufftext \"wait 250;pushmenu ");
+        Q_strncpyz(buf, "stufftext \"wait 250;pushmenu ", sizeof(buf));
     } else {
-        strcpy(buf, "stufftext \"pushmenu ");
+        Q_strncpyz(buf, "stufftext \"pushmenu ", sizeof(buf));
     }
 
     if (dmflags->integer & DF_WEAPON_NO_RIFLE && dmflags->integer & DF_WEAPON_NO_SNIPER
@@ -10921,24 +12032,24 @@ void Player::UserSelectWeapon(bool bWait)
         && dmflags->integer & DF_WEAPON_NO_LANDMINE && !QueryLandminesAllowed()) {
         gi.cvar_set("dmflags", va("%i", dmflags->integer & ~DF_WEAPON_NO_RIFLE));
         Com_Printf("No valid weapons -- re-allowing the rifle\n");
-        strcpy(client->pers.dm_primary, "rifle");
+        Q_strncpyz(client->pers.dm_primary, "rifle", sizeof(client->pers.dm_primary));
     }
 
     switch (nationality) {
     case NA_BRITISH:
-        strcat(buf, "SelectPrimaryWeapon_british\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_british\"");
         break;
     case NA_RUSSIAN:
-        strcat(buf, "SelectPrimaryWeapon_russian\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_russian\"");
         break;
     case NA_GERMAN:
-        strcat(buf, "SelectPrimaryWeapon_german\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_german\"");
         break;
     case NA_ITALIAN:
-        strcat(buf, "SelectPrimaryWeapon_italian\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon_italian\"");
         break;
     default:
-        strcat(buf, "SelectPrimaryWeapon\"");
+        Q_strcat(buf, sizeof(buf), "SelectPrimaryWeapon\"");
         break;
     }
 
@@ -11027,57 +12138,166 @@ void Player::EventGetVehicle(Event *ev)
 
 bool Player::IsReady(void) const
 {
-    return m_bReady;
+    return m_bReady && !IsDead();
 }
 
 void Player::Spawned(void)
 {
     Event *ev = new Event;
-
     ev->AddEntity(this);
+
+    scriptDelegate_spawned.Trigger(this, *ev);
     scriptedEvents[SE_SPAWN].Trigger(ev);
 }
 
-// reborn stuff
-
-void Player::AddDeaths(Event *ev)
+void Player::AddKills(int num)
 {
-    AddDeaths(ev->GetInteger(1));
+    num_kills += num;
+}
+
+void Player::AddDeaths(int num)
+{
+    num_deaths += num;
+}
+
+////////////////////////////
+//
+// Added in OPM
+//
+////////////////////////////
+
+qboolean Player::canUse()
+{
+    int touch[MAX_GENTITIES];
+    int num = getUseableEntities(touch, MAX_GENTITIES);
+
+    return num ? true : false;
+}
+
+qboolean Player::canUse(Entity *entity, bool requiresLookAt)
+{
+    gentity_t *hit;
+    int        touch[MAX_GENTITIES];
+    int        num;
+    int        i;
+
+    num = getUseableEntities(touch, MAX_GENTITIES, requiresLookAt);
+
+    for (i = 0; i < num; i++) {
+        hit = &g_entities[touch[i]];
+
+        if (!hit->inuse || hit->entity == NULL) {
+            continue;
+        }
+
+        if (hit->entity == entity) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+int Player::getUseableEntities(int *touch, int maxcount, bool requiresLookAt)
+{
+    Vector  end;
+    Vector  start;
+    trace_t trace;
+    Vector  offset;
+    Vector  max;
+    Vector  min;
+
+    if ((g_gametype->integer != GT_SINGLE_PLAYER && IsSpectator()) || IsDead()) {
+        return 0;
+    }
+
+    if (m_pTurret) {
+        *touch = m_pTurret->entnum;
+        return 1;
+    }
+
+    if (m_pTurret) {
+        return 0;
+    }
+
+    AngleVectors(client->ps.viewangles, offset, NULL, NULL);
+
+    start = origin;
+    start.z += client->ps.viewheight;
+
+    if (requiresLookAt) {
+        min = Vector(-4.f, -4.f, -4.f);
+        max = Vector(4.f, 4.f, 4.f);
+
+        end[0] = start[0] + (offset[0] * 64.f);
+        end[1] = start[1] + (offset[1] * 64.f);
+
+        if (v_angle[0] <= 0.0f) {
+            end[2] = start[2] + (offset[2] * 40.f);
+        } else {
+            end[2] = start[2] + (offset[2] * 88.f);
+        }
+
+        trace = G_Trace(start, min, max, end, this, MASK_USE, false, "Player::getUseableEntity");
+
+        offset = trace.endpos;
+
+        min = offset - Vector(16.f, 16.f, 16.f);
+        max = offset + Vector(16.f, 16.f, 16.f);
+    } else {
+        min = start - Vector(31.f, 31.f, 31.f);
+        max = start + Vector(31.f, 31.f, 31.f);
+    }
+
+    return gi.AreaEntities(min, max, touch, maxcount);
+}
+
+void Player::Postthink(void)
+{
+    if (bindmaster) {
+        SetViewAngles(GetViewAngles() + Vector(0, bindmaster->avelocity[YAW] * level.frametime, 0));
+    }
 }
 
 void Player::AdminRights(Event *ev)
 {
     // FIXME: Admin manager ?
     ev->AddInteger(0);
+    UNIMPLEMENTED();
+}
+
+void Player::IsAdmin(Event *ev)
+{
+    // FIXME: Admin manager ?
+    ev->AddInteger(0);
+    UNIMPLEMENTED();
 }
 
 void Player::BindWeap(Event *ev)
 {
-    // FIXME: TODO
-}
+    Entity   *ent = ev->GetEntity(1);
+    Listener *scriptOwner;
 
-void Player::CanSwitchTeams(Event *ev)
-{
-    qboolean bAllow = ev->GetBoolean(1);
+    //
+    // FIXME: deprecate and use something else instead
+    //  like implement this in the Item class directly
+    //  this is dangerous to use especially if the weapon
+    //  is a VehicleTurretGun, could easily mess up the camera
 
-    disable_team_change = !bAllow;
-    if (ev->NumArgs() > 1) {
-        qboolean bAllow2 = ev->GetBoolean(2);
+    if (ent) {
+        scriptOwner = ent->GetScriptOwner();
 
-        disable_spectate = !bAllow2;
+        if (scriptOwner != this) {
+            ent->SetScriptOwner(this);
+        } else {
+            ent->SetScriptOwner(NULL);
+        }
     }
 }
 
-void Player::ClearCommand(Event *ev)
+void Player::AddDeaths(Event *ev)
 {
-    str command;
-    int clientNum = G_GetClientNumber(this);
-
-    if (ev->NumArgs() > 0) {
-        command = ev->GetString(1);
-    }
-
-    m_lastcommand = "";
+    AddDeaths(ev->GetInteger(1));
 }
 
 void Player::Dive(Event *ev)
@@ -11101,39 +12321,6 @@ void Player::Dive(Event *ev)
     velocity[2] += height * speed / 6.80f;
 }
 
-void Player::EventEarthquake(Event *ev)
-{
-    float    duration    = ev->GetFloat(1);
-    float    magnitude   = ev->GetFloat(2);
-    qboolean no_rampup   = ev->GetBoolean(3);
-    qboolean no_rampdown = ev->GetBoolean(4);
-
-    // full realistic, smooth earthquake
-    if (ev->NumArgs() > 4) {
-        Vector location = ev->GetVector(5);
-        float  radius   = 1.0f;
-
-        if (ev->NumArgs() > 5) {
-            radius = ev->GetFloat(6);
-        }
-
-        gi.SendServerCommand(
-            edict - g_entities,
-            "eq %f %f %d %d %f %f %f %f",
-            duration,
-            magnitude,
-            no_rampup,
-            no_rampdown,
-            location[0],
-            location[1],
-            location[2],
-            radius
-        );
-    } else {
-        gi.SendServerCommand(edict - g_entities, "eq %f %f %d %d", duration, magnitude, no_rampup, no_rampdown);
-    }
-}
-
 void Player::EventSetTeam(Event *ev)
 {
     str        team_name;
@@ -11162,7 +12349,7 @@ void Player::EventSetTeam(Event *ev)
 
     SetTeam(teamType);
 
-    gi.Printf("Player::SetTeam : Player is now on team \"%s\"\n", team_name.c_str());
+    gi.DPrintf("Player::SetTeam : Player is now on team \"%s\"\n", team_name.c_str());
 }
 
 void Player::EventGetViewModelAnim(Event *ev)
@@ -11216,7 +12403,13 @@ void Player::FreezeControls(Event *ev)
 
 void Player::GetConnState(Event *ev)
 {
-    ScriptDeprecated("Player::GetConnState");
+    // Assume CS_ACTIVE
+    ev->AddInteger(4);
+
+    gi.DPrintf(
+        "getconnstate is deprecated and will always return 4 (CS_ACTIVE).\nThe player is created only when the client "
+        "begins (CS_ACTIVE state).\n"
+    );
 }
 
 void Player::GetDamageMultiplier(Event *ev)
@@ -11231,8 +12424,8 @@ void Player::GetDeaths(Event *ev)
 
 void Player::GetKillHandler(Event *ev)
 {
-    if (m_pKilledEvent) {
-        ev->AddValue(m_pKilledEvent->GetValue(1));
+    if (m_killedLabel.IsSet()) {
+        m_killedLabel.GetScriptValue(&ev->GetValue());
     } else {
         ev->AddNil();
     }
@@ -11288,11 +12481,13 @@ void Player::GetTorsoState(Event *ev)
 void Player::HideEntity(Event *ev)
 {
     // FIXME: todo
+    UNIMPLEMENTED();
 }
 
 void Player::ShowEntity(Event *ev)
 {
     // FIXME: REDO
+    UNIMPLEMENTED();
 }
 
 void Player::Inventory(Event *ev)
@@ -11371,12 +12566,6 @@ void Player::InventorySet(Event *ev)
     array.Clear();
 }
 
-void Player::IsAdmin(Event *ev)
-{
-    // FIXME: Admin manager ?
-    ev->AddInteger(0);
-}
-
 void Player::LeanLeftHeld(Event *ev)
 {
     Player *player     = NULL;
@@ -11426,19 +12615,18 @@ void Player::PlayLocalSound(Event *ev)
         return;
     }
 
-    // FIXME...
-    /*
-        gi.MSG_SetClient( client->ps.clientNum );
+#ifdef OPM_FEATURES
+    gi.MSG_SetClient(client->ps.clientNum);
 
-        gi.MSG_StartCGM( CGM_PLAYLOCALSOUND );
-        gi.MSG_WriteString( found );
-        gi.MSG_WriteBits( !!loop, 1 );
-        gi.MSG_WriteFloat( time );
-        gi.MSG_WriteFloat( alias->volume );
-        gi.MSG_EndCGM();
+    gi.MSG_StartCGM(CGM_PLAYLOCALSOUND);
+    gi.MSG_WriteString(found);
+    gi.MSG_WriteBits(!!loop, 1);
+    gi.MSG_WriteFloat(time);
+    gi.MSG_WriteFloat(alias->volume);
+    gi.MSG_EndCGM();
 
-        return;
-    */
+    return;
+#endif
 
     if (loop) {
         edict->s.loopSound        = gi.soundindex(found, alias->streamed);
@@ -11487,79 +12675,18 @@ void Player::SetAnimSpeed(Event *ev)
         speed = 0.0f;
     }
 
-    //player->baseSentient.baseAnimate.baseEntity.client->customanimspeed = speed;
-}
-
-void Player::SetClientFlag(Event *ev)
-{
-    str name = ev->GetString(1);
-
-    gi.SendServerCommand(client->ps.clientNum, "cf %s", name.c_str());
-}
-
-void Player::SetEntityShader(Event *ev)
-{
-    Entity  *entity     = ev->GetEntity(1);
-    str      shadername = ev->GetString(2);
-    qboolean fReset     = false;
-
-    if (entity == NULL) {
-        ScriptError("Invalid entity !");
-    }
-
-    if (!shadername.length()) {
-        shadername = "default";
-        fReset     = true;
-    }
-
-    gi.SendServerCommand(edict - g_entities, "setshader %d %s %d", entity->entnum, shadername.c_str(), fReset);
+    UNIMPLEMENTED();
 }
 
 void Player::SetKillHandler(Event *ev)
 {
     if (ev->IsNilAt(1) || (ev->IsStringAt(1) && !ev->GetString(1).icmp("none"))) {
-        if (m_pKilledEvent != NULL) {
-            delete m_pKilledEvent;
-            m_pKilledEvent = NULL;
-        }
+        m_killedLabel.Clear();
     } else {
-        m_pKilledEvent = new Event(EV_Listener_ExecuteScript);
-        m_pKilledEvent->AddValue(ev->GetValue(1));
+        m_killedLabel.SetScript(ev->GetValue(1));
     }
 }
 
-void Player::SetLocalSoundRate(Event *ev)
-{
-    str   name = ev->GetString(1);
-    float rate = ev->GetFloat(2);
-    float time;
-
-    if (ev->NumArgs() > 2) {
-        time = ev->GetFloat(3);
-    } else {
-        time = 0.0f;
-    }
-
-    AliasListNode_t *alias = NULL;
-    const char      *found = gi.GlobalAlias_FindRandom(name, &alias);
-
-    if (found == NULL) {
-        gi.DPrintf("ERROR: Player::SetLocalSoundRate: %s needs to be aliased - Please fix.\n", name.c_str());
-        return;
-    }
-
-    gi.MSG_SetClient(client->ps.clientNum);
-
-    // FIXME...
-    /*
-    gi.MSG_StartCGM( CGM_SETLOCALSOUNDRATE );
-        gi.MSG_WriteString( found );
-        gi.MSG_WriteFloat( rate );
-        gi.MSG_WriteFloat( time );
-    gi.MSG_EndCGM();
-    */
-}
-
 void Player::SetSpeed(Event *ev)
 {
     float   speed;
@@ -11610,35 +12737,6 @@ void Player::SetStateFile(Event *ev)
     }
 }
 
-void Player::SetVMASpeed(Event *ev)
-{
-    str   name  = ev->GetString(1);
-    float speed = ev->GetFloat(2);
-
-    if (!client || !level.specialgame) {
-        return;
-    }
-
-    vma_t *vma = &vmalist[name];
-
-    if (speed < 0.0f) {
-        speed = 0.0f;
-    }
-
-    vma->name  = name;
-    vma->speed = speed;
-
-    // FIXME...
-    /*
-    gi.MSG_SetClient( edict - g_entities );
-
-    gi.MSG_StartCGM( CGM_SETVMASPEED );
-        gi.MSG_WriteString( name );
-        gi.MSG_WriteFloat( speed );
-    gi.MSG_EndCGM();
-    */
-}
-
 void Player::StopLocalSound(Event *ev)
 {
     str   soundName = ev->GetString(1);
@@ -11672,6 +12770,137 @@ void Player::Userinfo(Event *ev)
     ev->AddString(client->pers.userinfo);
 }
 
+int Player::GetNumKills(void) const
+{
+    return num_kills;
+}
+
+int Player::GetNumDeaths(void) const
+{
+    return num_deaths;
+}
+
+#ifdef OPM_FEATURES
+
+void Player::EventEarthquake(Event *ev)
+{
+    float    duration    = ev->GetFloat(1);
+    float    magnitude   = ev->GetFloat(2);
+    qboolean no_rampup   = ev->GetBoolean(3);
+    qboolean no_rampdown = ev->GetBoolean(4);
+
+    // full realistic, smooth earthquake
+    if (ev->NumArgs() > 4) {
+        Vector location = ev->GetVector(5);
+        float  radius   = 1.0f;
+
+        if (ev->NumArgs() > 5) {
+            radius = ev->GetFloat(6);
+        }
+
+        gi.SendServerCommand(
+            edict - g_entities,
+            "eq %f %f %d %d %f %f %f %f",
+            duration,
+            magnitude,
+            no_rampup,
+            no_rampdown,
+            location[0],
+            location[1],
+            location[2],
+            radius
+        );
+    } else {
+        gi.SendServerCommand(edict - g_entities, "eq %f %f %d %d", duration, magnitude, no_rampup, no_rampdown);
+    }
+}
+
+void Player::SetClientFlag(Event *ev)
+{
+    str name = ev->GetString(1);
+
+    gi.SendServerCommand(client->ps.clientNum, "cf %s", name.c_str());
+}
+
+void Player::SetEntityShader(Event *ev)
+{
+    Entity  *entity     = ev->GetEntity(1);
+    str      shadername = ev->GetString(2);
+    qboolean fReset     = false;
+
+    if (entity == NULL) {
+        ScriptError("Invalid entity !");
+    }
+
+    if (!shadername.length()) {
+        shadername = "default";
+        fReset     = true;
+    }
+
+    gi.SendServerCommand(edict - g_entities, "setshader %d %s %d", entity->entnum, shadername.c_str(), fReset);
+}
+
+void Player::SetLocalSoundRate(Event *ev)
+{
+    str   name = ev->GetString(1);
+    float rate = ev->GetFloat(2);
+    float time;
+
+    if (ev->NumArgs() > 2) {
+        time = ev->GetFloat(3);
+    } else {
+        time = 0.0f;
+    }
+
+    AliasListNode_t *alias = NULL;
+    const char      *found = gi.GlobalAlias_FindRandom(name, &alias);
+
+    if (found == NULL) {
+        gi.DPrintf("ERROR: Player::SetLocalSoundRate: %s needs to be aliased - Please fix.\n", name.c_str());
+        return;
+    }
+
+    gi.MSG_SetClient(client->ps.clientNum);
+
+    // FIXME...
+    /*
+    gi.MSG_StartCGM( CGM_SETLOCALSOUNDRATE );
+        gi.MSG_WriteString( found );
+        gi.MSG_WriteFloat( rate );
+        gi.MSG_WriteFloat( time );
+    gi.MSG_EndCGM();
+    */
+}
+
+void Player::SetVMASpeed(Event *ev)
+{
+    str   name  = ev->GetString(1);
+    float speed = ev->GetFloat(2);
+
+    if (!client || !sv_specialgame->integer) {
+        return;
+    }
+
+    vma_t *vma = &vmalist[name];
+
+    if (speed < 0.0f) {
+        speed = 0.0f;
+    }
+
+    vma->name  = name;
+    vma->speed = speed;
+
+    // FIXME...
+    /*
+    gi.MSG_SetClient( edict - g_entities );
+
+    gi.MSG_StartCGM( CGM_SETVMASPEED );
+        gi.MSG_WriteString( name );
+        gi.MSG_WriteFloat( speed );
+    gi.MSG_EndCGM();
+    */
+}
+
 void Player::VisionGetNaked(Event *ev)
 {
     // return the global vision
@@ -11726,120 +12955,4 @@ void Player::VisionSetNaked(Event *ev)
 
     gi.SendServerCommand(edict - g_entities, "vsn %s %f %f", vision.c_str(), fade_time, phase);
 }
-
-int Player::GetNumKills(void) const
-{
-    return num_kills;
-}
-
-int Player::GetNumDeaths(void) const
-{
-    return num_deaths;
-}
-
-void Player::AddKills(int num)
-{
-    num_kills += num;
-
-    if (g_gametype->integer >= GT_TEAM_ROUNDS) {
-        num_deaths += num;
-    }
-}
-
-void Player::AddDeaths(int num)
-{
-    num_deaths += num;
-}
-
-qboolean Player::canUse()
-{
-    int touch[MAX_GENTITIES];
-    int num = getUseableEntities(touch, MAX_GENTITIES);
-
-    return num ? true : false;
-}
-
-qboolean Player::canUse(Entity *entity, bool requiresLookAt)
-{
-    gentity_t *hit;
-    int        touch[MAX_GENTITIES];
-    int        num;
-    int        i;
-
-    num = getUseableEntities(touch, MAX_GENTITIES, requiresLookAt);
-
-    for (i = 0; i < num; i++) {
-        hit = &g_entities[touch[i]];
-
-        if (!hit->inuse || hit->entity == NULL) {
-            continue;
-        }
-
-        if (hit->entity == entity) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-int Player::getUseableEntities(int *touch, int maxcount, bool requiresLookAt)
-{
-    Vector  end;
-    Vector  start;
-    trace_t trace;
-    Vector  offset;
-    Vector  max;
-    Vector  min;
-
-    if ((g_gametype->integer && IsSpectator()) || IsDead()) {
-        return 0;
-    }
-
-    if (m_pTurret) {
-        *touch = m_pTurret->entnum;
-        return 1;
-    }
-
-    if (m_pTurret) {
-        return 0;
-    }
-
-    AngleVectors(client->ps.viewangles, offset, NULL, NULL);
-
-    start = origin;
-    start.z += client->ps.viewheight;
-
-    if (requiresLookAt) {
-        min = Vector(-4.f, -4.f, -4.f);
-        max = Vector(4.f, 4.f, 4.f);
-
-        end[0] = start[0] + (offset[0] * 64.f);
-        end[1] = start[1] + (offset[1] * 64.f);
-
-        if (v_angle[0] <= 0.0f) {
-            end[2] = start[2] + (offset[2] * 40.f);
-        } else {
-            end[2] = start[2] + (offset[2] * 88.f);
-        }
-
-        trace = G_Trace(start, min, max, end, this, MASK_SOLID, false, "Player::getUseableEntity");
-
-        offset = trace.endpos;
-
-        min = offset - Vector(16.f, 16.f, 16.f);
-        max = offset + Vector(16.f, 16.f, 16.f);
-    } else {
-        min = start - Vector(31.f, 31.f, 31.f);
-        max = start + Vector(31.f, 31.f, 31.f);
-    }
-
-    return gi.AreaEntities(min, max, touch, maxcount);
-}
-
-void Player::Postthink(void)
-{
-    if (bindmaster) {
-        SetViewAngles(GetViewAngles() + Vector(0, bindmaster->avelocity[YAW] * level.frametime, 0));
-    }
-}
\ No newline at end of file
+#endif
diff --git a/code/fgame/player.h b/code/fgame/player.h
index 2168b2c3..93a7986b 100644
--- a/code/fgame/player.h
+++ b/code/fgame/player.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "vehicle.h"
 #include "dm_manager.h"
+#include "scriptdelegate.h"
 
 extern Event EV_Player_EndLevel;
 extern Event EV_Player_GiveCheat;
@@ -68,7 +69,8 @@ enum painDirection_t {
 };
 
 typedef enum {
-    ANIMSLOT_PAIN = 4
+    ANIMSLOT_PAIN     = 4,
+    ANIMSLOT_TESTANIM = 7
 } playerAnimSlot_t;
 
 typedef enum {
@@ -129,7 +131,7 @@ class Player : public Sentient
     friend class VehicleTurretGun;
 
 private:
-    static Condition<Player> Conditions[];
+    static Condition<Player> m_conditions[];
     static movecontrolfunc_t MoveStartFuncs[];
 
     StateMap *statemap_Legs;
@@ -305,7 +307,19 @@ private:
     bool        m_bDeathSpectator;
     jailstate_t m_jailstate;
 
+#ifdef OPM_FEATURES
     bool m_bShowingHint;
+#endif
+
+public:
+    MulticastDelegate<void(const str& text)> delegate_stufftext;
+
+    static ScriptDelegate scriptDelegate_connected;
+    static ScriptDelegate scriptDelegate_disconnecting;
+    static ScriptDelegate scriptDelegate_spawned;
+    static ScriptDelegate scriptDelegate_damage;
+    static ScriptDelegate scriptDelegate_kill;
+    static ScriptDelegate scriptDelegate_textMessage;
 
 public:
     int m_iNumObjectives;
@@ -342,15 +356,15 @@ public:
     bool  m_bWaitingForRespawn;
     bool  m_bShouldRespawn;
 
-    // new variables
+    //
+    // Added in OPM
+    //
     str                 m_sVision;    // current vision
     str                 m_sStateFile; // custom statefile
-    bool                disable_spectate;
-    bool                disable_team_change;
-    bool                m_bFrozen; // if player is frozen
+    bool                m_bFrozen;    // if player is frozen
     bool                animDoneVM;
     float               speed_multiplier[MAX_SPEED_MULTIPLIERS];
-    Event              *m_pKilledEvent;
+    ScriptThreadLabel   m_killedLabel;
     con_map<str, vma_t> vmalist;
     str                 m_sVMAcurrent;
     str                 m_sVMcurrent;
@@ -359,6 +373,10 @@ public:
     bool                m_bConnected;
     str                 m_lastcommand;
 
+private:
+    int m_iInstantMessageTime;
+    int m_iTextChatTime;
+
 public:
     qboolean CondTrue(Conditional& condition);
     qboolean CondChance(Conditional& condition);
@@ -514,6 +532,7 @@ public:
     void InitWeapons(void);
     void InitView(void);
     void InitModel(void);
+    void InitModelFps(void); // Added in openmohaa
     void InitState(void);
     void InitHealth(void);
     void InitInventory(void);
@@ -538,7 +557,7 @@ public:
 
     void DoUse(Event *ev);
     void Obituary(Entity *attacker, Entity *inflictor, int meansofdeath, int iLocation);
-    void Killed(Event *ev);
+    void Killed(Event *ev) override;
     void Dead(Event *ev);
     void Pain(Event *ev);
 
@@ -668,7 +687,7 @@ public:
 
     void   TestThread(Event *ev);
     Vector EyePosition(void) override;
-    Vector GunTarget(bool bNoCollision = false) override;
+    Vector GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward) override;
 
     void GotKill(Event *ev);
     void SetPowerupTimer(Event *ev);
@@ -769,16 +788,16 @@ public:
     void EventDMMessage(Event *ev);
     //====
     // Added in 2.30
-    const char *GetBattleLanguageCondition() const;
-    const char *GetBattleLanguageDirection() const;
-    const char *GetBattleLanguageLocation() const;
-    const char *GetBattleLanguageLocalFolks();
-    const char *GetBattleLanguageWeapon() const;
-    const char *GetBattleLanguageDistance() const;
-    const char *GetBattleLanguageDistanceMeters(float dist) const;
-    const char *GetBattleLanguageDistanceFeet(float dist) const;
-    const char *GetBattleLanguageTarget() const;
-    const char *TranslateBattleLanguageTokens(const char *string);
+    str GetBattleLanguageCondition() const;
+    str GetBattleLanguageDirection() const;
+    str GetBattleLanguageLocation() const;
+    str GetBattleLanguageLocalFolks();
+    str GetBattleLanguageWeapon() const;
+    str GetBattleLanguageDistance() const;
+    str GetBattleLanguageDistanceMeters(float dist) const;
+    str GetBattleLanguageDistanceFeet(float dist) const;
+    str GetBattleLanguageTarget() const;
+    str TranslateBattleLanguageTokens(const char *string);
     //====
     void       EventIPrint(Event *ev);
     void       EventGetUseHeld(Event *ev);
@@ -799,7 +818,7 @@ public:
     void       SetPlayerSpectate(bool bNext);
     void       SetPlayerSpectateRandom(void); // Added in 2.0
     bool       IsValidSpectatePlayer(Player *pPlayer);
-    void       GetSpectateFollowOrientation(Player *pPlayer, Vector      &vPos, Vector      &vAng);
+    void       GetSpectateFollowOrientation(Player *pPlayer, Vector& vPos, Vector& vAng);
     void       UpdateStatus(const char *s);
     void       SetDM_Team(DM_Team *team);
     DM_Team   *GetDM_Team();
@@ -842,7 +861,7 @@ public:
 
     void EventDMDeathDrop(Event *ev);
     void EventStopwatch(Event *ev);
-    void KilledPlayerInDeathmatch(Player *killed);
+    void KilledPlayerInDeathmatch(Player *killed, meansOfDeath_t meansofdeath);
     void SetStopwatch(int iDuration, stopWatchType_t type = SWT_NORMAL);
     void BeginTempSpectator(void);
     void EndSpectator(void);
@@ -882,7 +901,7 @@ public:
     void  InitInvulnerable();
     void  TickTeamSpawn();
     bool  ShouldForceSpectatorOnDeath() const;
-    bool  HasVehicle();
+    bool  HasVehicle() const override;
     void  setContentsSolid() override;
     void  UserSelectWeapon(bool bWait);
     void  PickWeaponEvent(Event *ev);
@@ -901,20 +920,22 @@ public:
 
     void FindAlias(str& output, str name, AliasListNode_t **node);
 
+    bool HasVotedYes() const;
+    bool HasVotedNo() const;
+
     //=============================
-    // Custom openmohaa stuff
+    // Added in OPM
     //=============================
 
+    qboolean CheckCanSwitchTeam(teamtype_t team);
+
     qboolean     ViewModelAnim(str anim, qboolean force_restart, qboolean bFullAnim);
     virtual void Spawned(void);
 
     void AddDeaths(Event *ev);
     void AdminRights(Event *ev);
     void BindWeap(Event *ev);
-    void CanSwitchTeams(Event *ev);
-    void ClearCommand(Event *ev);
     void Dive(Event *ev);
-    void EventEarthquake(Event *ev);
     void EventSetTeam(Event *ev);
     void EventGetViewModelAnim(Event *ev);
     void EventGetViewModelAnimFinished(Event *ev);
@@ -929,7 +950,6 @@ public:
     void GetLegsState(Event *ev);
     void GetStateFile(Event *ev);
     void GetTorsoState(Event *ev);
-    void HideEntity(Event *ev);
     void Inventory(Event *ev);
     void InventorySet(Event *ev);
     void IsAdmin(Event *ev);
@@ -941,19 +961,23 @@ public:
     void RunHeld(Event *ev);
     void SecFireHeld(Event *ev);
     void SetAnimSpeed(Event *ev);
-    void SetClientFlag(Event *ev);
-    void SetEntityShader(Event *ev);
     void SetKillHandler(Event *ev);
-    void SetLocalSoundRate(Event *ev);
     void SetSpeed(Event *ev);
     void SetStateFile(Event *ev);
-    void SetVMASpeed(Event *ev);
+    void HideEntity(Event *ev);
     void ShowEntity(Event *ev);
     void StopLocalSound(Event *ev);
     void Userinfo(Event *ev);
+#ifdef OPM_FEATURES
+    void EventEarthquake(Event *ev);
+    void SetClientFlag(Event *ev);
+    void SetEntityShader(Event *ev);
+    void SetLocalSoundRate(Event *ev);
+    void SetVMASpeed(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetBlur(Event *ev);
     void VisionSetNaked(Event *ev);
+#endif
 
     void     Postthink() override;
     void     GibEvent(Event *ev);
@@ -974,7 +998,7 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveFloat(&m_fPartBlends[0]);
     arc.ArchiveFloat(&m_fPartBlends[1]);
     arc.ArchiveFloat(&partBlendMult[0]);
-    arc.ArchiveFloat(&partBlendMult[0]);
+    arc.ArchiveFloat(&partBlendMult[1]);
 
     arc.ArchiveString(&last_torso_anim_name);
     arc.ArchiveString(&last_leg_anim_name);
@@ -1011,6 +1035,7 @@ inline void Player::Archive(Archiver& arc)
 
     arc.ArchiveInteger(&buttons);
     arc.ArchiveInteger(&new_buttons);
+    arc.ArchiveInteger(&server_new_buttons);
     arc.ArchiveFloat(&respawn_time);
 
     arc.ArchiveInteger(&last_attack_button);
@@ -1050,6 +1075,8 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveBool(&take_pain);
     arc.ArchiveInteger(&nextpaintime);
 
+    arc.ArchiveFloat(&m_fHealRate);
+
     arc.ArchiveBool(&knockdown);
     arc.ArchiveBool(&canfall);
     arc.ArchiveBool(&falling);
@@ -1116,12 +1143,20 @@ inline void Player::Archive(Archiver& arc)
     arc.ArchiveInteger(&m_iNumLeftArmShots);
     arc.ArchiveInteger(&m_iNumRightArmShots);
 
+    // Added in 2.30
+    //====
+    ArchiveEnum(m_jailstate, jailstate_t);
+    arc.ArchiveString(&m_sDmPrimary);
+    arc.ArchiveBool(&m_bIsInJail);
+    //====
+
     arc.ArchiveFloat(&m_fLastDeltaTime);
 
-    // make sure we have the state machine loaded up
-    if (arc.Loading()) {
-        LoadStateTable();
-    }
+    // Added in 2.0
+    //====
+    arc.ArchiveFloat(&m_fLastSprintTime);
+    arc.ArchiveBool(&m_bHasJumped);
+    //====
 
     if (arc.Saving()) {
         if (currentState_Legs) {
@@ -1138,6 +1173,13 @@ inline void Player::Archive(Archiver& arc)
         }
         arc.ArchiveString(&tempStr);
     } else {
+        statemap_Legs = GetStatemap(
+            str(g_statefile->string) + "_Legs.st", (Condition<Class> *)m_conditions, &legs_conditionals, false
+        );
+        statemap_Torso = GetStatemap(
+            str(g_statefile->string) + "_Torso.st", (Condition<Class> *)m_conditions, &torso_conditionals, false
+        );
+
         arc.ArchiveString(&tempStr);
         if (tempStr != "NULL") {
             currentState_Legs = statemap_Legs->FindState(tempStr);
@@ -1150,21 +1192,52 @@ inline void Player::Archive(Archiver& arc)
         } else {
             currentState_Torso = NULL;
         }
+
+        for (int i = 1; i <= legs_conditionals.NumObjects(); i++) {
+            Conditional *c = legs_conditionals.ObjectAt(i);
+
+            if (Q_stricmp(c->getName(), "PAIN") && !c->parmList.NumObjects()) {
+                m_pLegsPainCond = c;
+                break;
+            }
+        }
+
+        for (int i = 1; i <= torso_conditionals.NumObjects(); i++) {
+            Conditional *c = torso_conditionals.ObjectAt(i);
+
+            if (Q_stricmp(c->getName(), "PAIN") && !c->parmList.NumObjects()) {
+                m_pTorsoPainCond = c;
+                break;
+            }
+        }
     }
 
     if (arc.Loading()) {
         UpdateWeapons();
+        SetViewAngles(v_angle);
+
+        // Added in OPM
+        InitModelFps();
+    }
+
+    //
+    // Added in OPM
+    //
+    arc.ArchiveBool(&m_bFrozen);
+    arc.ArchiveBool(&animDoneVM);
+    arc.ArchiveFloat(&m_fVMAtime);
+
+    for (int i = 0; i < MAX_SPEED_MULTIPLIERS; i++) {
+        arc.ArchiveFloat(&speed_multiplier[i]);
     }
 }
 
 inline Camera *Player::CurrentCamera(void)
-
 {
     return camera;
 }
 
 inline void Player::CameraCut(void)
-
 {
     //
     // toggle the camera cut bit
@@ -1174,7 +1247,6 @@ inline void Player::CameraCut(void)
 }
 
 inline void Player::CameraCut(Camera *ent)
-
 {
     if (ent == camera) {
         // if the camera we are currently looking through cut, than toggle the cut bits
diff --git a/code/fgame/player_animation.cpp b/code/fgame/player_animation.cpp
index 7b593d9a..2f46c15e 100644
--- a/code/fgame/player_animation.cpp
+++ b/code/fgame/player_animation.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "player.h"
 #include "g_phys.h"
+#include "portableturret.h"
 
 extern Event EV_Player_AnimLoop_Torso;
 extern Event EV_Player_AnimLoop_Legs;
@@ -33,7 +34,7 @@ void Player::EndAnim_Legs(Event *ev)
 {
     animdone_Legs = true;
 
-    if ((animFlags[m_iPartSlot[legs]] & ANIM_LOOP)) {
+    if (IsRepeatType(m_iPartSlot[legs])) {
         SetAnimDoneEvent(EV_Player_AnimLoop_Legs, m_iPartSlot[legs]);
     }
 
@@ -44,14 +45,14 @@ void Player::EndAnim_Torso(Event *ev)
 {
     animdone_Torso = true;
 
-    if ((animFlags[m_iPartSlot[torso]] & ANIM_LOOP)) {
+    if (IsRepeatType(m_iPartSlot[torso])) {
         SetAnimDoneEvent(EV_Player_AnimLoop_Torso, m_iPartSlot[torso]);
     }
 
     EvaluateState();
 }
 
-void Player::EndAnim_Pain(Event* ev)
+void Player::EndAnim_Pain(Event *ev)
 {
     animdone_Pain = true;
 }
@@ -60,13 +61,17 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
 {
     int animnum;
 
-    if (getMoveType() == MOVETYPE_NOCLIP && slot) {
-        StopPartAnimating(torso);
-        return;
+    if (getMoveType() == MOVETYPE_NOCLIP) {
+        if (slot) {
+            StopPartAnimating(torso);
+            return;
+        }
+
+        anim = "idle";
     }
 
     animnum = gi.Anim_NumForName(edict->tiki, anim);
-    if (animnum == CurrentAnim() && partAnim[slot] == anim) {
+    if (animnum == CurrentAnim(m_iPartSlot[slot]) && partAnim[slot] == anim) {
         return;
     }
 
@@ -88,21 +93,19 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
     if (m_fPartBlends[slot] < 0.5f) {
         SetAnimDoneEvent(NULL, m_iPartSlot[slot]);
 
-        float m_fCrossTime = gi.Anim_CrossTime(edict->tiki, animnum);
-
-        partBlendMult[slot] = m_fCrossTime;
-        if (m_fCrossTime <= 0.0f) {
-            partOldAnim[slot]   = "";
-            m_fPartBlends[slot] = 0.0f;
-        } else {
+        partBlendMult[slot] = gi.Anim_CrossTime(edict->tiki, animnum);
+        if (partBlendMult[slot] > 0.0f) {
             m_iPartSlot[slot] ^= 1;
-            partBlendMult[slot] = 1.0f / m_fCrossTime;
+            partBlendMult[slot] = 1.0f / partBlendMult[slot];
             partOldAnim[slot]   = partAnim[slot];
             m_fPartBlends[slot] = 1.0f;
+        } else {
+            partOldAnim[slot]   = "";
+            m_fPartBlends[slot] = 0.0f;
         }
     }
 
-    if (slot) {
+    if (slot != legs) {
         animdone_Torso = false;
     } else {
         animdone_Legs = false;
@@ -112,16 +115,16 @@ void Player::SetPartAnim(const char *anim, bodypart_t slot)
 
     partAnim[slot] = anim;
 
-    if (slot) {
+    if (slot != legs) {
         NewAnim(animnum, EV_Player_AnimLoop_Torso, m_iPartSlot[slot]);
     } else {
         NewAnim(animnum, EV_Player_AnimLoop_Legs, m_iPartSlot[legs]);
     }
 
-    SetTime(m_iPartSlot[slot]);
+    RestartAnimSlot(m_iPartSlot[slot]);
 }
 
-static float m_fPartMult[2] = {0.2f, 0.2f};
+static float g_fPartBlendTime[2] = {0.2f, 0.2f};
 
 void Player::StopPartAnimating(bodypart_t part)
 {
@@ -138,11 +141,11 @@ void Player::StopPartAnimating(bodypart_t part)
     }
 
     partAnim[part]      = "";
-    partBlendMult[part] = 1.0f / m_fPartMult[part];
+    partBlendMult[part] = 1.0f / g_fPartBlendTime[part];
 
     StopAnimating(m_iPartSlot[part]);
 
-    if (part) {
+    if (part != legs) {
         animdone_Torso = false;
     } else {
         animdone_Legs = false;
@@ -157,7 +160,7 @@ void Player::PausePartAnim(bodypart_t part)
 
 int Player::CurrentPartAnim(bodypart_t part) const
 {
-    if (!*partAnim[part]) {
+    if (partAnim[part] == "") {
         return -1;
     }
 
@@ -166,44 +169,213 @@ int Player::CurrentPartAnim(bodypart_t part) const
 
 void Player::AdjustAnimBlends(void)
 {
-    int   iPartSlot;
-    int   iOldPartSlot;
-    float fWeightTotal;
+    int      iPartSlot;
+    int      iOldPartSlot;
+    float    fWeightTotal;
+    qboolean playTurretAnim = false;
+
+    if (movetype == MOVETYPE_PORTABLE_TURRET) {
+        PortableTurret *turret = static_cast<PortableTurret *>(m_pTurret.Pointer());
+
+        if (turret->IsReloading()) {
+            if (partAnim[legs] != "mg42tripod_reload") {
+                SetPartAnim("mg42tripod_reload", legs);
+                StopAnimating(m_iPartSlot[torso]);
+                StopAnimating(m_iPartSlot[torso] ^ 1);
+                partAnim[torso] = "";
+            }
+        } else if (turret->IsSettingUp()) {
+            if (partAnim[legs] != "mg42tripod_setup") {
+                SetPartAnim("mg42tripod_setup", legs);
+                StopAnimating(m_iPartSlot[torso]);
+                StopAnimating(m_iPartSlot[torso] ^ 1);
+                partAnim[torso] = "";
+            }
+        } else if (turret->IsPackingUp()) {
+            if (partAnim[legs] != "mg42tripod_packup") {
+                SetPartAnim("mg42tripod_packup", legs);
+                StopAnimating(m_iPartSlot[torso]);
+                StopAnimating(m_iPartSlot[torso] ^ 1);
+                partAnim[torso] = "";
+            }
+        } else {
+            playTurretAnim = true;
+        }
+    }
+
+    if (playTurretAnim) {
+        PortableTurret *turret = static_cast<PortableTurret *>(m_pTurret.Pointer());
+
+        if (partAnim[legs] != "mg42tripod_aim") {
+            StopPartAnimating(legs);
+        }
+
+        if (partAnim[torso] != "mg42tripod_aim") {
+            StopPartAnimating(torso);
+        }
+
+        partAnim[legs]  = "mg42tripod_aim";
+        partAnim[torso] = "mg42tripod_aim";
+
+        float pitch, yaw;
+        float legsPitchAngle, torsoPitchAngle;
+        float pitchAlpha, yawAlpha;
+        float legsYawAngle, torsoYawAngle;
+        float weight;
+        int   animNum;
+        str   vertLegsStr, vertTorsoStr;
+        str   horzLegsStr, horzTorsoStr;
+        str   anim;
+
+        pitch = AngleSubtract(turret->GetGroundPitch(), turret->angles[0]);
+        yaw   = AngleSubtract(turret->GetStartYaw(), turret->angles[1]);
+
+        if (pitch >= 0) {
+            legsPitchAngle  = 0.0;
+            torsoPitchAngle = 15.0;
+            vertLegsStr     = "_straight";
+            vertTorsoStr    = "_up15";
+        } else {
+            legsPitchAngle  = -15.0;
+            torsoPitchAngle = 0.0;
+            vertLegsStr     = "_down15";
+            vertTorsoStr    = "_straight";
+        }
+
+        pitchAlpha = (pitch - legsPitchAngle) / (torsoPitchAngle - legsPitchAngle);
+        pitchAlpha = Q_clamp_float(pitchAlpha, 0, 1);
+
+        if (yaw < -20) {
+            legsYawAngle  = -40.0;
+            torsoYawAngle = -20.0;
+            horzLegsStr   = "_left40";
+            horzTorsoStr  = "_left20";
+        } else if (yaw < 0) {
+            legsYawAngle  = -20.0;
+            torsoYawAngle = 0.0;
+            horzLegsStr   = "_left20";
+            horzTorsoStr  = "_straight";
+        } else if (yaw <= 20) {
+            legsYawAngle  = 0.0;
+            torsoYawAngle = 20.0;
+            horzLegsStr   = "_straight";
+            horzTorsoStr  = "_right20";
+        } else {
+            legsYawAngle  = 20.0;
+            torsoYawAngle = 40.0;
+            horzLegsStr   = "_right20";
+            horzTorsoStr  = "_right40";
+        }
+
+        yawAlpha = (yaw - legsYawAngle) / (torsoYawAngle - legsYawAngle);
+        yawAlpha = Q_clamp_float(yawAlpha, 0, 1);
+
+        anim    = "mg42tripod_aim" + horzLegsStr + vertLegsStr;
+        weight  = (1 - pitchAlpha) * (1 - yawAlpha);
+        animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        if (animNum == -1) {
+            gi.DPrintf("^~^~^ Warning: Can't find player animation '%s'.\n", anim.c_str());
+            anim    = "mg42tripod_aim_straight_straight";
+            animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        }
+
+        if (animNum == CurrentAnim(0)) {
+            SetWeight(0, weight);
+        } else {
+            NewAnim(animNum, 0, weight);
+        }
+
+        anim    = "mg42tripod_aim" + horzLegsStr + vertTorsoStr;
+        weight  = (1.0 - yawAlpha) * pitchAlpha;
+        animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        if (animNum == -1) {
+            gi.DPrintf("^~^~^ Warning: Can't find player animation '%s'.\n", anim.c_str());
+            anim    = "mg42tripod_aim_straight_straight";
+            animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        }
+
+        if (animNum == CurrentAnim(1)) {
+            SetWeight(1, weight);
+        } else {
+            NewAnim(animNum, 1, weight);
+        }
+
+        anim    = "mg42tripod_aim" + horzTorsoStr + vertTorsoStr;
+        weight  = pitchAlpha * yawAlpha;
+        animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        if (animNum == -1) {
+            gi.DPrintf("^~^~^ Warning: Can't find player animation '%s'.\n", anim.c_str());
+            anim    = "mg42tripod_aim_straight_straight";
+            animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        }
+
+        if (animNum == CurrentAnim(2)) {
+            SetWeight(2, weight);
+        } else {
+            NewAnim(animNum, 2, weight);
+        }
+
+        anim    = "mg42tripod_aim" + horzTorsoStr + vertTorsoStr;
+        weight  = (1.0 - pitchAlpha) * yawAlpha;
+        animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        if (animNum == -1) {
+            gi.DPrintf("^~^~^ Warning: Can't find player animation '%s'.\n", anim.c_str());
+            anim    = "mg42tripod_aim_straight_straight";
+            animNum = gi.Anim_NumForName(edict->tiki, anim.c_str());
+        }
+
+        if (animNum == CurrentAnim(3)) {
+            SetWeight(3, weight);
+        } else {
+            NewAnim(animNum, 3, weight);
+        }
+    }
+
+    if (deadflag == DEAD_DEAD) {
+        if (m_fPainBlend) {
+            StopAnimating(ANIMSLOT_PAIN);
+            SetWeight(ANIMSLOT_PAIN, 0);
+            m_fPainBlend  = 0;
+            animdone_Pain = false;
+        }
+        return;
+    }
 
     iPartSlot    = m_iPartSlot[legs];
     iOldPartSlot = m_iPartSlot[legs] ^ 1;
 
     if (m_fPartBlends[legs] <= 0.0f) {
-        if (partOldAnim[legs] == "") {
-            goto __blend_torso;
+        if (partOldAnim[legs] != "") {
+            StopAnimating(iOldPartSlot);
         }
 
-        StopAnimating(iOldPartSlot);
+        if (partAnim[legs] == "") {
+            SetWeight(iPartSlot, 0.0);
+        } else {
+            SetWeight(iPartSlot, 1.0);
+        }
     } else {
-        m_fPartBlends[legs] = m_fPartBlends[legs] - level.frametime * partBlendMult[legs];
+        m_fPartBlends[legs] -= level.frametime * partBlendMult[legs];
         if (m_fPartBlends[legs] >= 0.01f) {
             if (partOldAnim[legs] != "") {
-                edict->s.frameInfo[iOldPartSlot].weight = m_fPartBlends[legs];
+                SetWeight(iOldPartSlot, m_fPartBlends[legs]);
             }
             if (partAnim[legs] != "") {
-                edict->s.frameInfo[iPartSlot].weight = 1.0f - m_fPartBlends[legs];
+                SetWeight(iPartSlot, 1.0f - m_fPartBlends[legs]);
             }
+        } else {
+            m_fPartBlends[legs] = 0.0f;
+            StopAnimating(iOldPartSlot);
+            partOldAnim[legs] = "";
 
-            goto __blend_torso;
+            if (partAnim[legs] == "") {
+                SetWeight(iPartSlot, 0.0);
+            } else {
+                SetWeight(iPartSlot, 1.0);
+            }
         }
-
-        m_fPartBlends[legs] = 0.0f;
-        StopAnimating(iOldPartSlot);
-        partOldAnim[legs] = "";
     }
 
-    if (partAnim[legs] != "") {
-        edict->s.frameInfo[iPartSlot].weight = 1.0f;
-    } else {
-        edict->s.frameInfo[iPartSlot].weight = 0.0f;
-    }
-
-__blend_torso:
     iPartSlot    = m_iPartSlot[torso];
     iOldPartSlot = m_iPartSlot[torso] ^ 1;
 
@@ -212,27 +384,74 @@ __blend_torso:
             StopAnimating(iOldPartSlot);
             partOldAnim[torso] = "";
         }
+
+        if (partAnim[torso] == "") {
+            SetWeight(iPartSlot, 0.0);
+            edict->s.actionWeight = 0.0;
+        } else {
+            SetWeight(iPartSlot, 1.0);
+            edict->s.actionWeight = 1.0;
+        }
     } else {
         m_fPartBlends[torso] = m_fPartBlends[torso] - level.frametime * partBlendMult[torso];
         if (m_fPartBlends[torso] >= 0.01f) {
             fWeightTotal = 0.0f;
 
             if (partOldAnim[torso] != "") {
-                edict->s.frameInfo[iOldPartSlot].weight = m_fPartBlends[torso];
+                SetWeight(iOldPartSlot, m_fPartBlends[torso]);
                 fWeightTotal += m_fPartBlends[torso];
             }
             if (partAnim[torso] != "") {
-                edict->s.frameInfo[iPartSlot].weight = 1.0f - m_fPartBlends[torso];
-                fWeightTotal += 1.0f - m_fPartBlends[torso];
+                SetWeight(iPartSlot, 1.0 - m_fPartBlends[torso]);
+                fWeightTotal += 1.0 - m_fPartBlends[torso];
             }
 
             edict->s.actionWeight = fWeightTotal;
         } else {
             m_fPartBlends[torso] = 0.0f;
             StopAnimating(iOldPartSlot);
-            partOldAnim[torso]                   = "";
-            edict->s.frameInfo[iPartSlot].weight = partAnim[torso] != "" ? 1.0f : 0.0f;
-            edict->s.actionWeight                = partAnim[torso] != "" ? 1.0f : 0.0f;
+            partOldAnim[torso] = "";
+
+            if (partAnim[torso] == "") {
+                SetWeight(iPartSlot, 0.0);
+                edict->s.actionWeight = 0.0;
+            } else {
+                SetWeight(iPartSlot, 1.0);
+                edict->s.actionWeight = 1.0;
+            }
+        }
+    }
+
+    if (m_fPainBlend) {
+        if (m_sPainAnim == "") {
+            StopAnimating(ANIMSLOT_PAIN);
+            SetWeight(ANIMSLOT_PAIN, 0);
+            m_fPainBlend  = 0;
+            animdone_Pain = false;
+        } else if (animdone_Pain) {
+            m_fPainBlend -= level.frametime * (10.0 / 3.0);
+            if (m_fPainBlend < 0.01f) {
+                StopAnimating(ANIMSLOT_PAIN);
+                SetWeight(ANIMSLOT_PAIN, 0);
+                m_fPainBlend  = 0;
+                animdone_Pain = false;
+            }
+        }
+
+        if (m_fPainBlend) {
+            int   i;
+            float w;
+
+            SetWeight(ANIMSLOT_PAIN, m_fPainBlend);
+            w = 1.0 - m_fPainBlend * 0.5;
+
+            for (i = 0; i < ANIMSLOT_PAIN; i++) {
+                if (GetWeight(i)) {
+                    SetWeight(i, GetWeight(i) * w);
+                }
+            }
+
+            edict->s.actionWeight *= w;
         }
     }
 }
@@ -269,7 +488,7 @@ void Player::PlayerAnimDelta(float *vDelta)
         // get the anim delta
         gi.Anim_DeltaOverTime(edict->tiki, animnum, fBackTime, fTime, vNewDelta);
 
-        VectorMA(vDelta, edict->s.frameInfo[m_iPartSlot[legs]].weight, vNewDelta, vDelta);
+        VectorMA(vDelta, GetWeight(m_iPartSlot[legs]), vNewDelta, vDelta);
     }
 
     animnum = -1;
@@ -288,11 +507,34 @@ void Player::PlayerAnimDelta(float *vDelta)
 
         gi.Anim_DeltaOverTime(edict->tiki, animnum, fBackTime, fTime, vNewDelta);
 
-        VectorMA(vDelta, edict->s.frameInfo[m_iPartSlot[torso]].weight, vNewDelta, vDelta);
+        VectorMA(vDelta, GetWeight(m_iPartSlot[torso]), vNewDelta, vDelta);
     }
 }
 
-void Player::EventTestAnim(Event* ev)
+void Player::EventTestAnim(Event *ev)
 {
-    // FIXME: unimplemented
+    str   name;
+    float weight;
+    int   animNum;
+
+    weight = ev->GetFloat(1);
+    if (weight <= 0) {
+        SetWeight(ANIMSLOT_TESTANIM, 0);
+        StopAnimating(ANIMSLOT_TESTANIM);
+        return;
+    }
+
+    if (ev->NumArgs() > 1) {
+        name    = ev->GetString(1);
+        animNum = gi.Anim_NumForName(edict->tiki, name.c_str());
+        if (animNum == -1) {
+            gi.Printf("Couldn't find anim '%s'\n", name.c_str());
+            return;
+        }
+
+        NewAnim(animNum, ANIMSLOT_TESTANIM, weight);
+        RestartAnimSlot(ANIMSLOT_TESTANIM);
+    }
+
+    SetWeight(ANIMSLOT_TESTANIM, weight);
 }
diff --git a/code/fgame/player_combat.cpp b/code/fgame/player_combat.cpp
index 5fa28e67..fecd7fda 100644
--- a/code/fgame/player_combat.cpp
+++ b/code/fgame/player_combat.cpp
@@ -21,81 +21,63 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // player_combat.cpp: Player combat system and combat utility functions
-// 
+//
 
 #include "player.h"
 #include "weaputils.h"
 
-static Entity *FindClosestEntityInRadius
-   (
-   Vector origin,
-   Vector forward,
-   float  fov,
-   float  maxdist
-   )
+static Entity *FindClosestEntityInRadius(Vector origin, Vector forward, float fov, float maxdist)
+{
+    float    dist, dot;
+    float    fovdot = cos(fov * 0.5 * M_PI / 180.0);
+    Entity  *ent;
+    Entity  *bestent  = NULL;
+    int      bestdist = 999999;
+    qboolean valid_entity;
 
-   {
-   float    dist,dot;
-   float    fovdot = cos( fov * 0.5 * M_PI / 180.0 );
-   Entity   *ent;
-   Entity   *bestent=NULL;
-   int      bestdist = 999999;
-	qboolean valid_entity;
+    // Find closest enemy in radius
+    ent = findradius(NULL, origin, maxdist);
 
-   // Find closest enemy in radius
-   ent = findradius( NULL, origin, maxdist ); 
+    while (ent) {
+        valid_entity = false;
 
-   while( ent )
-      {      
-		valid_entity = false;
+        if (ent->flags & FL_AUTOAIM) {
+            valid_entity = true;
+        }
 
-		if( ent->flags & FL_AUTOAIM )
-         {
-         valid_entity = true;
-         }
+        if (valid_entity) {
+            // Check to see if the enemy is closest to us
+            Vector delta = (ent->centroid) - origin;
 
-		if ( valid_entity )
-         {
-         // Check to see if the enemy is closest to us
-      	Vector delta = ( ent->centroid ) - origin;
+            dist = delta.length();
 
-      	dist = delta.length();
+            if (dist < bestdist) {
+                delta.normalize();
 
-         if ( dist < bestdist )
-            {
-            delta.normalize();
+                // It's close, now check to see if it's in our FOV.
+                dot = DotProduct(forward, delta);
 
-            // It's close, now check to see if it's in our FOV.
-	         dot = DotProduct( forward, delta );
-      
-            if ( dot > fovdot )
-               {
-               trace_t trace;
-               // Do a trace to see if we can get to it
-               trace = G_Trace( origin,
-                                 vec_zero,
-                                 vec_zero,
-                                 ent->centroid,
-                                 NULL,
-                                 MASK_OPAQUE,
-                                 false, 
-                                 "FindClosestEntityInRadius" );
-               
-               if ( ( trace.ent && trace.entityNum == ent->entnum ) || ( trace.fraction == 1 ) )
-                  {
-                  // dir = delta;
-                  bestent  = ent;
-                  bestdist = dist;
-                  }
-               }
+                if (dot > fovdot) {
+                    trace_t trace;
+                    // Do a trace to see if we can get to it
+                    trace = G_Trace(
+                        origin, vec_zero, vec_zero, ent->centroid, NULL, MASK_OPAQUE, false, "FindClosestEntityInRadius"
+                    );
+
+                    if ((trace.ent && trace.entityNum == ent->entnum) || (trace.fraction == 1)) {
+                        // dir = delta;
+                        bestent  = ent;
+                        bestdist = dist;
+                    }
+                }
             }
-         }
-      ent = findradius( ent, origin, maxdist );
-      }
-   return bestent;
-   }
+        }
+        ent = findradius(ent, origin, maxdist);
+    }
+    return bestent;
+}
 
-Vector Player::GunTarget(bool bNoCollision)
+Vector Player::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward)
 {
     Vector  vForward;
     Vector  vOut;
@@ -127,12 +109,13 @@ Vector Player::GunTarget(bool bNoCollision)
         AngleVectors(m_vViewAng, vForward, NULL, NULL);
         vDest = m_vViewPos + vForward * 1024.0f;
 
-        trace = G_Trace(m_vViewPos, vec_zero, vec_zero, vDest, this, MASK_PLAYERSOLID, qfalse, "Player::GunTarget");
+        trace = G_Trace(m_vViewPos, vec_zero, vec_zero, vDest, this, MASK_GUNTARGET, qfalse, "Player::GunTarget");
 
-        if (!m_pTurret || (Vector(trace.endpos) - m_vViewPos).lengthSquared() >= 16384.0f) {
-            vOut = trace.endpos;
-        } else {
-            vOut = vDest;
+        vOut = trace.endpos;
+        if (m_pTurret) {
+            if ((Vector(trace.endpos) - m_vViewPos).lengthSquared() < 16384) {
+                vOut = vDest;
+            }
         }
     }
 
@@ -180,7 +163,7 @@ void Player::EventCorrectWeaponAttachments(Event *ev)
     iTagLeft     = gi.Tag_NumForName(edict->tiki, "tag_weapon_left");
     iNumChildren = numchildren;
 
-    for (int i = 0; i < iNumChildren; i++) {
+    for (int i = 0; i < MAX_MODEL_CHILDREN && iNumChildren; i++) {
         iChild = children[i];
 
         if (iChild == ENTITYNUM_NONE) {
@@ -193,18 +176,17 @@ void Player::EventCorrectWeaponAttachments(Event *ev)
         }
 
         if (pChild->edict->s.tag_num == iTagLeft || pChild->edict->s.tag_num == iTagRight) {
-            if (pChild->IsSubclassOfWeapon()) {
-                if (pChild->edict->s.tag_num == iTagLeft) {
-                    iUseAngles = edict->s.attach_use_angles;
-                    vOffset    = edict->s.attach_offset;
-
-                    // reattach to the right tag
-                    detach();
-                    attach(entnum, iTagRight, iUseAngles, vOffset);
-                }
-            } else {
+            if (!pChild->IsSubclassOfWeapon()) {
                 // Remove entities like ammoclip
                 pChild->PostEvent(EV_Remove, 0);
+                iNumChildren--;
+            } else if (pChild->edict->s.tag_num == iTagLeft) {
+                iUseAngles = pChild->edict->s.attach_use_angles;
+                vOffset    = pChild->edict->s.attach_offset;
+
+                // reattach to the right tag
+                pChild->detach();
+                pChild->attach(entnum, iTagRight, iUseAngles, vOffset);
             }
         }
     }
diff --git a/code/fgame/player_conditionals.cpp b/code/fgame/player_conditionals.cpp
index b9b4cde8..ef2af238 100644
--- a/code/fgame/player_conditionals.cpp
+++ b/code/fgame/player_conditionals.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -59,94 +59,86 @@ static Vector max4x4x8(4, 4, 8);
 
 qboolean Player::CondTrue(Conditional& condition)
 {
-	return true;
+    return true;
 }
 
 qboolean Player::CondChance(Conditional& condition)
-
 {
-	float percent_chance;
+    float percent_chance;
 
-	percent_chance = atof(condition.getParm(1));
+    percent_chance = atof(condition.getParm(1));
 
-	return (G_Random() < percent_chance);
+    return (G_Random() < percent_chance);
 }
 
 qboolean Player::CondHealth(Conditional& condition)
-
 {
-	return health < atoi(condition.getParm(1));
+    return health < atoi(condition.getParm(1));
 }
 
 qboolean Player::CondBlocked(Conditional& condition)
 {
-	int test_moveresult;
+    int test_moveresult;
 
-	test_moveresult = moveresult;
+    test_moveresult = moveresult;
 
-	if (flags & FL_IMMOBILE) {
-		test_moveresult = MOVERESULT_BLOCKED;
-	}
+    if (flags & FL_IMMOBILE) {
+        test_moveresult = MOVERESULT_BLOCKED;
+    }
 
-	if (condition.numParms()) {
-		return test_moveresult >= atoi(condition.getParm(1));
-	}
+    if (condition.numParms()) {
+        return test_moveresult >= atoi(condition.getParm(1));
+    }
 
-	return test_moveresult >= MOVERESULT_BLOCKED;
+    return test_moveresult >= MOVERESULT_BLOCKED;
 }
 
 qboolean Player::CondPain(Conditional& condition)
-
 {
-    return (pain != 0 || knockdown != 0);
+    return pain != 0 && level.time > nextpaintime;
 }
 
 qboolean Player::CondOnGround(Conditional& condition)
 {
-	if (groundentity || client->ps.walking) {
-		falling = 0;
-		return qtrue;
-	}
-	else {
-		return qfalse;
-	}
+    if (groundentity || client->ps.walking) {
+        falling = 0;
+        return qtrue;
+    } else {
+        return qfalse;
+    }
 }
 
 qboolean Player::CondHasWeapon(Conditional& condition)
-
 {
-	return WeaponsOut();
+    return WeaponsOut();
 }
 
 qboolean Player::CondNewWeapon(Conditional& condition)
-
 {
-	Weapon* weapon;
+    Weapon *weapon;
 
-	weapon = GetNewActiveWeapon();
+    weapon = GetNewActiveWeapon();
 
-	if (weapon) {
-		return true;
-	}
-	else {
-		return false;
-	}
+    if (weapon) {
+        return true;
+    } else {
+        return false;
+    }
 }
 
 qboolean Player::CondImmediateSwitch(Conditional& condition)
 {
-	static cvar_t* g_immediateswitch = NULL;
+    static cvar_t *g_immediateswitch = NULL;
 
-	if (!g_immediateswitch) {
-		g_immediateswitch = gi.Cvar_Get("g_immediateswitch", "0", 0);
-	}
+    if (!g_immediateswitch) {
+        g_immediateswitch = gi.Cvar_Get("g_immediateswitch", "0", 0);
+    }
 
-	return (g_gametype->integer && g_immediateswitch->integer);
+    return (g_gametype->integer && g_immediateswitch->integer);
 }
 
 // Check to see if a weapon has been raised
 qboolean Player::CondUseWeapon(Conditional& condition)
-
 {
     const char *weaponName;
     const char *parm;
@@ -321,6 +313,7 @@ qboolean Player::CondWeaponClassReadyToFire(Conditional& condition)
     str          weaponClass = "None";
     weaponhand_t hand;
     qboolean     ready;
+    Weapon      *weapon;
 
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
@@ -336,7 +329,7 @@ qboolean Player::CondWeaponClassReadyToFire(Conditional& condition)
         return false;
     }
 
-    Weapon *weapon = GetActiveWeapon(hand);
+    weapon = GetActiveWeapon(hand);
 
     // Weapon there check
     if (!weapon) {
@@ -348,6 +341,10 @@ qboolean Player::CondWeaponClassReadyToFire(Conditional& condition)
         if (!(G_WeaponClassNameToNum(weaponClass) & weapon->GetWeaponClass())) {
             return qfalse;
         }
+
+        if (condition.numParms() > 2) {
+            mode = WeaponModeNameToNum(condition.getParm(3));
+        }
     }
 
     // Ammo check
@@ -357,38 +354,37 @@ qboolean Player::CondWeaponClassReadyToFire(Conditional& condition)
 
 qboolean Player::CondUsingVehicle(Conditional& condition)
 {
-	return (m_pVehicle != NULL);
+    return (m_pVehicle != NULL);
 }
 
 qboolean Player::CondVehicleType(Conditional& condition)
 {
-	str sType = condition.getParm(1);
-	if (m_pVehicle && m_pVehicle->IsSubclassOfVehicle()) {
-		return !str::cmp(sType, "vehicle");
-	}
-	else {
-		return !str::cmp(sType, "none");
-	}
+    str sType = condition.getParm(1);
+    if (m_pVehicle && m_pVehicle->IsSubclassOfVehicle()) {
+        return !str::cmp(sType, m_pVehicle->getName());
+    } else {
+        return !str::cmp(sType, "none");
+    }
 }
 
 qboolean Player::CondIsPassenger(Conditional& condition)
 {
-	return m_pVehicle && m_pVehicle->IsSubclassOfVehicle() && m_pVehicle->FindPassengerSlotByEntity(this);
+    return m_pVehicle && m_pVehicle->IsSubclassOfVehicle() && m_pVehicle->FindPassengerSlotByEntity(this);
 }
 
 qboolean Player::CondIsDriver(Conditional& condition)
 {
-	return m_pVehicle && m_pVehicle->IsSubclassOfVehicle() && m_pVehicle->FindDriverSlotByEntity(this);
+    return m_pVehicle && m_pVehicle->IsSubclassOfVehicle() && m_pVehicle->FindDriverSlotByEntity(this);
 }
 
 qboolean Player::CondUsingTurret(Conditional& condition)
 {
-	return (m_pTurret != NULL);
+    return (m_pTurret != NULL);
 }
 
 qboolean Player::CondIsEscaping(Conditional& condition)
 {
-	return m_jailstate == JAILSTATE_ESCAPE;
+    return m_jailstate == JAILSTATE_ESCAPE;
 }
 
 qboolean Player::CondAbleToDefuse(Conditional& condition)
@@ -401,7 +397,7 @@ qboolean Player::CondAbleToDefuse(Conditional& condition)
     }
 
     Vector vForward, vRight, vUp;
-    AngleVectors(m_vViewPos, vForward, vRight, vUp);
+    AngleVectors(m_vViewAng, vForward, vRight, vUp);
 
     maxrange = weapon->GetMaxRange();
 
@@ -416,7 +412,7 @@ qboolean Player::CondCanPlaceLandmine(Conditional& condition)
     }
 
     Vector vPos, vForward, vRight, vUp, vBarrel;
-    weapon->GetMuzzlePosition(&vPos, &vForward, &vRight, &vUp, &vBarrel);
+    weapon->GetMuzzlePosition(vPos, vBarrel, vForward, vRight, vUp);
 
     return CanPlaceLandmine(vPos, this);
 }
@@ -437,7 +433,90 @@ qboolean Player::CondNearLandmine(Conditional& condition)
 
 void Player::MeasureLandmineDistances()
 {
-    // FIXME: unimplemented
+    Weapon* weapon;
+    float previousMineDist;
+    float maxrange;
+    int i;
+
+    if (m_fMineCheckTime == level.time) {
+        return;
+    }
+    m_fMineCheckTime = level.time;
+    previousMineDist = m_fMineDist;
+    m_fMineDist = 1000;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (!weapon) {
+        weapon = GetActiveWeapon(WEAPON_OFFHAND);
+    }
+
+    maxrange = 40;
+    if (weapon) {
+        maxrange = weapon->GetMaxRange();
+    }
+
+    for (i = 0; i < globals.max_entities; i++) {
+        TriggerLandmine* landmine;
+        Entity* ent;
+        vec3_t forward;
+        Vector delta;
+        float radius;
+
+        ent = G_GetEntity(i);
+        if (!ent) {
+            continue;
+        }
+
+        if (!ent->isSubclassOf(TriggerLandmine)) {
+            continue;
+        }
+
+        landmine = static_cast<TriggerLandmine*>(ent);
+        // This could be from an allied player
+        if (landmine->IsImmune(this)) {
+            continue;
+        }
+
+        AngleVectorsLeft(angles, forward, NULL, NULL);
+        delta = landmine->origin - origin;
+        radius = delta.length();
+
+        if (radius < maxrange) {
+            ent->PostEvent(EV_Show, level.frametime);
+        }
+
+        if (radius > m_fMineDist) {
+            continue;
+        }
+
+        if (radius >= 40) {
+            float dot;
+
+            delta.normalize();
+
+            dot = DotProduct(delta, forward);
+            if (dot > 0 && radius / Square(dot) < m_fMineDist) {
+                m_fMineDist = radius / Square(dot);
+            }
+        } else if (radius < m_fMineDist) {
+            m_fMineDist = radius;
+        }
+    }
+
+    m_fMineDist /= maxrange;
+
+    if (m_fMineDist > 3) {
+        StopLoopSound();
+        return;
+    }
+
+    if (floorf(previousMineDist * 20) != floorf(m_fMineDist * 20)) {
+        float pitch;
+
+        pitch = 2.f - log(m_fMineDist + 1.0);
+
+        LoopSound("minedetector_on", -1, -1, -1, pitch);
+    }
 }
 
 qboolean Player::CondIsAssistingEscape(Conditional& condition)
@@ -447,14 +526,13 @@ qboolean Player::CondIsAssistingEscape(Conditional& condition)
 
 qboolean Player::CondTurretType(Conditional& condition)
 {
-	str name = condition.getParm(1);
+    str name = condition.getParm(1);
 
-	if (m_pTurret) {
-		return m_pTurret->getName() == name;
-	}
-	else {
-		return name == "none";
-	}
+    if (m_pTurret) {
+        return m_pTurret->getName() == name;
+    } else {
+        return name == "none";
+    }
 }
 
 qboolean Player::CondWeaponReadyToFireNoSound(Conditional& condition)
@@ -499,136 +577,127 @@ qboolean Player::CondWeaponReadyToFireNoSound(Conditional& condition)
 
 qboolean Player::CondPutAwayMain(Conditional& condition)
 {
-	Weapon* weapon = GetActiveWeapon(WEAPON_MAIN);
+    Weapon *weapon = GetActiveWeapon(WEAPON_MAIN);
 
-	return weapon && weapon->GetPutaway();
+    return weapon && weapon->GetPutaway();
 }
 
 // Check to see if any of the active weapons need to be put away
 qboolean Player::CondPutAwayOffHand(Conditional& condition)
-
 {
-	Weapon* weapon = GetActiveWeapon(WEAPON_OFFHAND);
+    Weapon *weapon = GetActiveWeapon(WEAPON_OFFHAND);
 
-	return weapon && weapon->GetPutaway();
+    return weapon && weapon->GetPutaway();
 }
 
 // Checks to see if any weapon is active in the specified hand
 qboolean Player::CondAnyWeaponActive(Conditional& condition)
-
 {
-	weaponhand_t hand;
-	Weapon* weap;
+    weaponhand_t hand;
+    Weapon      *weap;
 
-	hand = WeaponHandNameToNum(condition.getParm(1));
+    hand = WeaponHandNameToNum(condition.getParm(1));
 
-	if (hand == WEAPON_ERROR) {
-		return false;
-	}
+    if (hand == WEAPON_ERROR) {
+        return false;
+    }
 
-	weap = GetActiveWeapon(hand);
-	return (weap != NULL);
+    weap = GetActiveWeapon(hand);
+    return (weap != NULL);
 }
 
 qboolean Player::CondAttackBlocked(Conditional& condition)
-
 {
-	if (attack_blocked) {
-		attack_blocked = qfalse;
-		return true;
-	}
-	else {
-		return false;
-	}
+    if (attack_blocked) {
+        attack_blocked = qfalse;
+        return true;
+    } else {
+        return false;
+    }
 }
 
 qboolean Player::CondSemiAuto(Conditional& condition)
 {
-	firemode_t   mode = FIRE_PRIMARY;
-	str          handname;
-	weaponhand_t hand;
+    firemode_t   mode = FIRE_PRIMARY;
+    str          handname;
+    weaponhand_t hand;
 
-	handname = condition.getParm(1);
+    handname = condition.getParm(1);
 
-	hand = WeaponHandNameToNum(handname);
+    hand = WeaponHandNameToNum(handname);
 
-	if (hand != WEAPON_ERROR) {
-		return GetActiveWeapon(hand)->m_bSemiAuto;
-	}
-	else {
-		return qfalse;
-	}
+    if (hand != WEAPON_ERROR) {
+        return GetActiveWeapon(hand)->m_bSemiAuto;
+    } else {
+        return qfalse;
+    }
 }
 
 qboolean Player::CondMinChargeTime(Conditional& condition)
 {
-	const char* handname;
-	weaponhand_t hand;
-	Weapon* weap;
+    const char  *handname;
+    weaponhand_t hand;
+    Weapon      *weap;
 
-	handname = condition.getParm(1);
-	hand = WeaponHandNameToNum(handname);
+    handname = condition.getParm(1);
+    hand     = WeaponHandNameToNum(handname);
 
-	if (hand != WEAPON_ERROR) {
-		weap = GetActiveWeapon(hand);
-		if (weap) {
-			float charge_time = weap->GetMinChargeTime(FIRE_PRIMARY);
-			if (charge_time) {
-				if (charge_start_time) {
-					return level.time - charge_start_time >= charge_time;
-				}
-				else {
-					return qfalse;
-				}
-			}
-			else {
-				return qtrue;
-			}
-		}
-	}
+    if (hand != WEAPON_ERROR) {
+        weap = GetActiveWeapon(hand);
+        // Fixed in 2.0.
+        //  Make sure the active weapon is valid
+        if (weap) {
+            float charge_time = weap->GetMinChargeTime(FIRE_PRIMARY);
+            if (charge_time) {
+                if (charge_start_time) {
+                    return level.time - charge_start_time >= charge_time;
+                } else {
+                    return qfalse;
+                }
+            } else {
+                return qtrue;
+            }
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 qboolean Player::CondMaxChargeTime(Conditional& condition)
 {
-	const char* handname;
-	weaponhand_t hand;
-	Weapon* weap;
+    const char  *handname;
+    weaponhand_t hand;
+    Weapon      *weap;
 
-	handname = condition.getParm(1);
-	hand = WeaponHandNameToNum(handname);
+    handname = condition.getParm(1);
+    hand     = WeaponHandNameToNum(handname);
 
-	if (hand != WEAPON_ERROR) {
-		weap = GetActiveWeapon(hand);
-		if (weap) {
-			float charge_time = weap->GetMaxChargeTime(FIRE_PRIMARY);
-			if (charge_time) {
-				if (charge_start_time) {
-					return level.time - charge_start_time >= charge_time;
-				}
-				else {
-					return qfalse;
-				}
-			}
-			else {
-				return qtrue;
-			}
-		}
-	}
+    if (hand != WEAPON_ERROR) {
+        weap = GetActiveWeapon(hand);
+        if (weap) {
+            float charge_time = weap->GetMaxChargeTime(FIRE_PRIMARY);
+            if (charge_time) {
+                if (charge_start_time) {
+                    return level.time - charge_start_time >= charge_time;
+                } else {
+                    return qfalse;
+                }
+            } else {
+                return qtrue;
+            }
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 qboolean Player::CondBlockDelay(Conditional& condition)
-
 {
     float t = atof(condition.getParm(1));
     return (level.time > (attack_blocked_time + t));
 }
 
 qboolean Player::CondMuzzleClear(Conditional& condition)
-
 {
     weaponhand_t hand;
 
@@ -644,91 +713,87 @@ qboolean Player::CondMuzzleClear(Conditional& condition)
 
 // Checks to see if any weapon is active in the specified hand
 qboolean Player::CondWeaponHasAmmo(Conditional& condition)
-
 {
-	weaponhand_t hand;
-	Weapon* weap;
-	firemode_t   mode = FIRE_PRIMARY;
+    weaponhand_t hand;
+    Weapon      *weap;
+    firemode_t   mode = FIRE_PRIMARY;
 
-	hand = WeaponHandNameToNum(condition.getParm(1));
+    hand = WeaponHandNameToNum(condition.getParm(1));
 
-	if (condition.numParms() > 1) {
-		mode = WeaponModeNameToNum(condition.getParm(2));
-	}
+    if (condition.numParms() > 1) {
+        mode = WeaponModeNameToNum(condition.getParm(2));
+    }
 
-	if (hand == WEAPON_ERROR) {
-		return false;
-	}
+    if (hand == WEAPON_ERROR) {
+        return false;
+    }
 
-	weap = GetActiveWeapon(hand);
+    weap = GetActiveWeapon(hand);
 
-	if (!weap) {
-		return false;
-	}
-	else {
-		return (weap->HasAmmo(mode));
-	}
+    if (!weap) {
+        return false;
+    } else {
+        return (weap->HasAmmo(mode));
+    }
 }
 
 qboolean Player::CondWeaponHasAmmoInClip(Conditional& condition)
 {
-	weaponhand_t hand;
-	Weapon* weap;
-	firemode_t   mode = FIRE_PRIMARY;
+    weaponhand_t hand;
+    Weapon      *weap;
+    firemode_t   mode = FIRE_PRIMARY;
 
-	hand = WeaponHandNameToNum(condition.getParm(1));
+    hand = WeaponHandNameToNum(condition.getParm(1));
 
-	if (condition.numParms() > 1) {
-		mode = WeaponModeNameToNum(condition.getParm(2));
-	}
+    if (condition.numParms() > 1) {
+        mode = WeaponModeNameToNum(condition.getParm(2));
+    }
 
-	if (hand == WEAPON_ERROR) {
-		return false;
-	}
+    if (hand == WEAPON_ERROR) {
+        return false;
+    }
 
-	weap = GetActiveWeapon(hand);
+    weap = GetActiveWeapon(hand);
 
-	if (!weap) {
-		return false;
-	}
-	else {
-		return (weap->HasAmmoInClip(mode));
-	}
+    if (!weap) {
+        return false;
+    } else {
+        return (weap->HasAmmoInClip(mode));
+    }
 }
 
 qboolean Player::CondReload(Conditional& condition)
 {
-	Weapon* weapon;
-	weaponhand_t hand = WEAPON_MAIN;
+    Weapon      *weapon;
+    weaponhand_t hand = WEAPON_MAIN;
 
-	if (condition.numParms() > 0) {
-		hand = WeaponHandNameToNum(condition.getParm(1));
-		if (hand == WEAPON_ERROR) {
-			return qfalse;
-		}
-	}
+    if (condition.numParms() > 0) {
+        hand = WeaponHandNameToNum(condition.getParm(1));
+        if (hand == WEAPON_ERROR) {
+            return qfalse;
+        }
+    }
 
-	weapon = GetActiveWeapon(WEAPON_MAIN);
+    weapon = GetActiveWeapon(WEAPON_MAIN);
 
-	if (!weapon) {
-		return qfalse;
-	}
+    if (!weapon) {
+        return qfalse;
+    }
 
-	if (weapon->ShouldReload() && weapon->HasAmmo(FIRE_PRIMARY)) {
-		return qtrue;
-	}
+    if (weapon->ShouldReload() && weapon->HasAmmo(FIRE_PRIMARY)) {
+        return qtrue;
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 qboolean Player::CondWeaponsHolstered(Conditional& condition)
 {
-	if (holsteredWeapon) {
-		return qtrue;
-	}
-	else {
-		return qfalse;
-	}
+    if (holsteredWeapon) {
+        return qtrue;
+    } else {
+        return qfalse;
+    }
 }
 
 qboolean Player::CondWeaponIsItem(Conditional& condition)
@@ -785,24 +850,36 @@ qboolean Player::CondStrafeLeft(Conditional& condition)
 }
 
 qboolean Player::CondStrafeRight(Conditional& condition)
-
 {
     return last_ucmd.rightmove > 0;
 }
 
 qboolean Player::CondJump(Conditional& condition)
-
 {
+    if (client->ps.pm_flags & PMF_NO_MOVE) {
+        return false;
+    }
+
     return last_ucmd.upmove > 0;
 }
 
 qboolean Player::CondCrouch(Conditional& condition)
 {
-	return (last_ucmd.upmove) < 0;
+    // Added in 2.0
+    //  Don't crouch if the player is not moving
+    if (client->ps.pm_flags & PMF_NO_MOVE
+        && (g_target_game > target_game_e::TG_MOH || g_gametype->integer != GT_SINGLE_PLAYER)) {
+        // Added in 2.30
+        //  Allow ducking if specified
+        if (!m_pGlueMaster || !m_bGlueDuckable) {
+            return viewheight != DEFAULT_VIEWHEIGHT;
+        }
+    }
+
+    return (last_ucmd.upmove) < 0;
 }
 
 qboolean Player::CondJumpFlip(Conditional& condition)
-
 {
     return velocity.z < (sv_gravity->value * 0.5f);
 }
@@ -819,45 +896,32 @@ qboolean Player::CondAnimDoneTorso(Conditional& condition)
 
 qboolean Player::CondAttackPrimary(Conditional& condition)
 {
+    Weapon *weapon;
+
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
-	}
+    }
 
-	if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
-		return false;
-	}
-
-    if (last_ucmd.buttons & BUTTON_ATTACKLEFT) {
-        Weapon *weapon;
-
-        last_attack_button = BUTTON_ATTACKLEFT;
-
-        weapon = GetActiveWeapon(WEAPON_MAIN);
-        if (weapon) {
-            return true;
-        }
-
-        // No ammo
-        return false;
-    } else {
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
         return false;
     }
+
+    if (!(last_ucmd.buttons & BUTTON_ATTACKLEFT)) {
+        return false;
+    }
+
+    last_attack_button = BUTTON_ATTACKLEFT;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (weapon) {
+        return true;
+    }
+
+    // No ammo
+    return false;
 }
 
 qboolean Player::CondAttackButtonPrimary(Conditional& condition)
-{
-    if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
-        return false;
-	}
-
-	if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
-		return false;
-	}
-
-    return (last_ucmd.buttons & BUTTON_ATTACKLEFT);
-}
-
-qboolean Player::CondAttackSecondary(Conditional& condition)
 {
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
@@ -867,32 +931,45 @@ qboolean Player::CondAttackSecondary(Conditional& condition)
         return false;
     }
 
-    if (last_ucmd.buttons & BUTTON_ATTACKRIGHT) {
-        Weapon *weapon;
+    return (last_ucmd.buttons & BUTTON_ATTACKLEFT);
+}
 
-        last_attack_button = BUTTON_ATTACKRIGHT;
+qboolean Player::CondAttackSecondary(Conditional& condition)
+{
+    Weapon *weapon;
 
-        weapon = GetActiveWeapon(WEAPON_MAIN);
-        if (weapon) {
-            return true;
-        }
-
-        // No ammo
-        return false;
-    } else {
+    if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
     }
+
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
+        return false;
+    }
+
+    if (!(last_ucmd.buttons & BUTTON_ATTACKRIGHT)) {
+        return false;
+    }
+
+    last_attack_button = BUTTON_ATTACKRIGHT;
+
+    weapon = GetActiveWeapon(WEAPON_MAIN);
+    if (weapon) {
+        return true;
+    }
+
+    // No ammo
+    return false;
 }
 
 qboolean Player::CondAttackButtonSecondary(Conditional& condition)
 {
     if (level.playerfrozen || m_bFrozen || (flags & FL_IMMOBILE)) {
         return false;
-	}
+    }
 
-	if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
-		return false;
-	}
+    if (g_gametype->integer != GT_SINGLE_PLAYER && !m_bAllowFighting) {
+        return false;
+    }
 
     return (last_ucmd.buttons & BUTTON_ATTACKRIGHT);
 }
@@ -941,13 +1018,11 @@ qboolean Player::CondRun(Conditional& condition)
 }
 
 qboolean Player::CondUse(Conditional& condition)
-
 {
     return (last_ucmd.buttons & BUTTON_USE) != 0;
 }
 
 qboolean Player::CondCanTurn(Conditional& condition)
-
 {
     float    yaw;
     Vector   oldang(v_angle);
@@ -1048,7 +1123,6 @@ qboolean Player::CondHasVelocity(Conditional& condition)
 }
 
 qboolean Player::Cond22DegreeSlope(Conditional& condition)
-
 {
     if (client->ps.walking && client->ps.groundPlane && (client->ps.groundTrace.plane.normal[2] < SLOPE_22_MAX)
         && (client->ps.groundTrace.plane.normal[2] >= SLOPE_22_MIN)) {
@@ -1059,7 +1133,6 @@ qboolean Player::Cond22DegreeSlope(Conditional& condition)
 }
 
 qboolean Player::Cond45DegreeSlope(Conditional& condition)
-
 {
     if (client->ps.walking && client->ps.groundPlane && (client->ps.groundTrace.plane.normal[2] < SLOPE_45_MAX)
         && (client->ps.groundTrace.plane.normal[2] >= SLOPE_45_MIN)) {
@@ -1070,7 +1143,6 @@ qboolean Player::Cond45DegreeSlope(Conditional& condition)
 }
 
 qboolean Player::CondRightLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1084,7 +1156,6 @@ qboolean Player::CondRightLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondLeftLegHigh(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1098,7 +1169,6 @@ qboolean Player::CondLeftLegHigh(Conditional& condition)
 }
 
 qboolean Player::CondFacingUpSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1112,7 +1182,6 @@ qboolean Player::CondFacingUpSlope(Conditional& condition)
 }
 
 qboolean Player::CondFacingDownSlope(Conditional& condition)
-
 {
     float groundyaw;
     float yawdelta;
@@ -1126,20 +1195,18 @@ qboolean Player::CondFacingDownSlope(Conditional& condition)
 }
 
 qboolean Player::CondFalling(Conditional& condition)
-
 {
     return falling;
 }
 
 qboolean Player::CondGroundEntity(Conditional& condition)
-
 {
     return (groundentity != NULL);
 }
 
 qboolean Player::CondMediumImpact(Conditional& condition)
 {
-	return mediumimpact;
+    return mediumimpact;
 }
 
 qboolean Player::CondHardImpact(Conditional& condition)
@@ -1149,18 +1216,16 @@ qboolean Player::CondHardImpact(Conditional& condition)
 
 qboolean Player::CondCanFall(Conditional& condition)
 {
-	return canfall;
+    return canfall;
 }
 
 qboolean Player::CondAtDoor(Conditional& condition)
-
 {
     // Check if the player is at a door
     return (atobject && atobject->isSubclassOf(Door));
 }
 
 qboolean Player::CondAtUseAnim(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (atobject && atobject->isSubclassOf(UseAnim)) {
@@ -1171,7 +1236,6 @@ qboolean Player::CondAtUseAnim(Conditional& condition)
 }
 
 qboolean Player::CondTouchUseAnim(Conditional& condition)
-
 {
     if (toucheduseanim) {
         return ((UseAnim *)(Entity *)toucheduseanim)->canBeUsed(this);
@@ -1181,13 +1245,11 @@ qboolean Player::CondTouchUseAnim(Conditional& condition)
 }
 
 qboolean Player::CondUseAnimFinished(Conditional& condition)
-
 {
     return (useanim_numloops <= 0);
 }
 
 qboolean Player::CondAtUseObject(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (atobject && atobject->isSubclassOf(UseObject)) {
@@ -1198,7 +1260,6 @@ qboolean Player::CondAtUseObject(Conditional& condition)
 }
 
 qboolean Player::CondLoopUseObject(Conditional& condition)
-
 {
     // Check if the player is at a useanim
     if (useitem_in_use && useitem_in_use->isSubclassOf(UseObject)) {
@@ -1209,13 +1270,11 @@ qboolean Player::CondLoopUseObject(Conditional& condition)
 }
 
 qboolean Player::CondDead(Conditional& condition)
-
 {
     return (deadflag);
 }
 
 qboolean Player::CondKnockDown(Conditional& condition)
-
 {
     if (knockdown) {
         knockdown = false;
@@ -1300,7 +1359,6 @@ qboolean Player::CondPainLocation(Conditional& condition)
 }
 
 qboolean Player::CondPainThreshold(Conditional& condition)
-
 {
     float threshold = atof(condition.getParm(1));
 
@@ -1313,7 +1371,6 @@ qboolean Player::CondPainThreshold(Conditional& condition)
 }
 
 qboolean Player::CondLegsState(Conditional& condition)
-
 {
     if (currentState_Legs) {
         str current = currentState_Legs->getName();
@@ -1328,7 +1385,6 @@ qboolean Player::CondLegsState(Conditional& condition)
 }
 
 qboolean Player::CondTorsoState(Conditional& condition)
-
 {
     if (currentState_Torso) {
         str current = currentState_Torso->getName();
@@ -1343,7 +1399,6 @@ qboolean Player::CondTorsoState(Conditional& condition)
 }
 
 qboolean Player::CondStateName(Conditional& condition)
-
 {
     str part      = condition.getParm(1);
     str statename = condition.getParm(2);
@@ -1358,7 +1413,6 @@ qboolean Player::CondStateName(Conditional& condition)
 }
 
 qboolean Player::CondPush(Conditional& condition)
-
 {
     // Check if the player is at a pushobject
     if (atobject && atobject->isSubclassOf(PushObject) && (atobject_dist < (PUSH_OBJECT_DISTANCE + 15.0f))) {
@@ -1372,7 +1426,6 @@ qboolean Player::CondPush(Conditional& condition)
 }
 
 qboolean Player::CondPull(Conditional& condition)
-
 {
     // Check if the player is at a pushobject
     if (atobject && atobject->isSubclassOf(PushObject) && (atobject_dist < (PUSH_OBJECT_DISTANCE + 15.0f))) {
@@ -1385,8 +1438,6 @@ qboolean Player::CondPull(Conditional& condition)
     return qfalse;
 }
 
-#define LADDER_HAND_HEIGHT (MAXS_X - MINS_X)
-
 qboolean Player::CondLadder(Conditional& condition)
 {
     trace_t trace;
@@ -1421,7 +1472,7 @@ qboolean Player::CondTopOfLadder(Conditional& condition)
 
 qboolean Player::CondOnLadder(Conditional& condition)
 {
-	return m_pLadder != NULL;
+    return m_pLadder != NULL;
 }
 
 qboolean Player::CondCanClimbUpLadder(Conditional& condition)
@@ -1464,7 +1515,7 @@ qboolean Player::CondCanGetOffLadderTop(Conditional& condition)
 
     angles.AngleVectorsLeft(&vForward);
 
-    vStart = origin - vForward * 12.0f;
+    vStart = origin - vForward * 12.0f * 1.005f;
     vStart[2] += maxs[2] - 8.0f;
 
     vEnd = vStart + vForward * 40.0f;
@@ -1517,7 +1568,6 @@ qboolean Player::CondLookingUp(Conditional& condition)
 }
 
 qboolean Player::CondCanStand(Conditional& condition)
-
 {
     Vector  newmins(mins);
     Vector  newmaxs(maxs);
@@ -1536,15 +1586,15 @@ qboolean Player::CondCanStand(Conditional& condition)
 
 qboolean Player::CondSolidForward(Conditional& condition)
 {
-	// Trace out forward to see if there is a solid ahead
-	float  dist = atof(condition.getParm(1));
-	Vector end(centroid + yaw_forward * dist);
-	Vector vMins(mins.x, mins.y, -8);
-	Vector vMaxs(maxs.x, maxs.y, 8);
+    // Trace out forward to see if there is a solid ahead
+    float  dist = atof(condition.getParm(1));
+    Vector end(centroid + yaw_forward * dist);
+    Vector vMins(mins.x, mins.y, -8);
+    Vector vMaxs(maxs.x, maxs.y, 8);
 
-	trace_t trace = G_Trace(centroid, vMins, vMaxs, end, this, MASK_SOLID, true, "Player::CondSolidforward");
+    trace_t trace = G_Trace(centroid, vMins, vMaxs, end, this, MASK_SOLID, true, "Player::CondSolidforward");
 
-	return (trace.fraction < 0.7f);
+    return (trace.fraction < 0.7f);
 }
 
 qboolean Player::CondCheckHeight(Conditional& condition)
@@ -1593,16 +1643,16 @@ qboolean Player::CondViewInWater(Conditional& condition)
 
 qboolean Player::CondDuckedViewInWater(Conditional& condition)
 {
-	Vector vPos = origin;
-	vPos[2] += 48.0f;
+    Vector vPos = origin;
+    vPos[2] += 48.0f;
 
-	return (gi.pointcontents(vPos, 0) & MASK_WATER) != 0;
+    return (gi.pointcontents(vPos, 0) & MASK_WATER) != 0;
 }
 
 qboolean Player::CondCheckMovementSpeed(Conditional& condition)
 {
     weaponhand_t hand;
-    Weapon* weapon;
+    Weapon      *weapon;
 
     hand = WeaponHandNameToNum(condition.getParm(1));
     if (hand == WEAPON_ERROR) {
@@ -1863,7 +1913,7 @@ CLASS_DECLARATION(Class, Conditional, NULL) {
     {NULL, NULL}
 };
 
-Condition<Player> Player::Conditions[] = {
+Condition<Player> Player::m_conditions[] = {
     {"default",                         &Player::CondTrue                    },
     {"CHANCE",                          &Player::CondChance                  },
     {"HEALTH",                          &Player::CondHealth                  },
@@ -1973,15 +2023,15 @@ Condition<Player> Player::Conditions[] = {
     {"ABLE_TO_DEFUSE",                  &Player::CondAbleToDefuse            },
     {"CAN_PLACE_LANDMINE",              &Player::CondCanPlaceLandmine        },
     {"IS_USING_TURRET",                 &Player::CondUsingTurret             },
-    {"ATTACK_PRIMARY",
-     &Player::CondAttackPrimary                                              }, // Checks to see if there is an active weapon as well as the button being pressed
-    {"ATTACK_SECONDARY",
-     &Player::CondAttackSecondary                                            }, // Checks to see if there is an active weapon as well as the button being pressed
+    {"ATTACK_PRIMARY",                  &Player::CondAttackPrimary
+    }, // Checks to see if there is an active weapon as well as the button being pressed
+    {"ATTACK_SECONDARY",                &Player::CondAttackSecondary
+    }, // Checks to see if there is an active weapon as well as the button being pressed
     {"ATTACK_PRIMARY_BUTTON",           &Player::CondAttackButtonPrimary     }, // Checks to see if the left attack button is pressed
     {"ATTACK_SECONDARY_BUTTON",         &Player::CondAttackButtonSecondary   },
     {"CHECK_MOVEMENT_SPEED",            &Player::CondCheckMovementSpeed      },
 
- // Weapon conditions
+    // Weapon conditions
     {"ANIMDONE_VM",                     &Player::CondAnimDoneVM              },
     {"CLIENT_COMMAND",                  &Player::CondClientCommand           },
     {"IS_VM_ANIM",                      &Player::CondVMAnim                  },
diff --git a/code/fgame/player_util.cpp b/code/fgame/player_util.cpp
index 2505b5d1..eda69045 100644
--- a/code/fgame/player_util.cpp
+++ b/code/fgame/player_util.cpp
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "object.h"
 #include "g_spawn.h"
 #include "scriptexception.h"
+#include <utility>
 
 extern Event EV_Entity_Start;
 
@@ -93,8 +94,8 @@ void Player::WhatIs(Event *ev)
         const char *animname;
 
         animname = NULL;
-        if (gi.modeltiki(ent->model)) {
-            animname = gi.Anim_NameForNum(ent->edict->tiki, ent->edict->s.frameInfo[0].index & ANIM_MASK);
+        if (ent->edict->tiki) {
+            animname = AnimName(0);
         }
 
         if (!animname) {
@@ -325,17 +326,18 @@ void Player::TestThread(Event *ev)
 void Player::SpawnEntity(Event *ev)
 
 {
-    Entity   *ent;
-    str       name;
-    ClassDef *cls;
-    str       text;
-    Vector    forward;
-    Vector    up;
-    Vector    delta;
-    Vector    v;
-    int       n;
-    int       i;
-    Event    *e;
+    SimpleEntity *ent;
+    str           name;
+    ClassDef     *cls;
+    str           text;
+    Vector        forward;
+    Vector        up;
+    Vector        delta;
+    Vector        v;
+    int           n;
+    int           i;
+    Event        *e;
+    bool          bModelSet;
 
     if (ev->NumArgs() < 1) {
         ScriptError("Usage: spawn entityname [keyname] [value]...");
@@ -359,16 +361,12 @@ void Player::SpawnEntity(Event *ev)
         cls = &Entity::ClassInfo;
     }
 
-    if (!checkInheritance(&Entity::ClassInfo, cls)) {
-        ScriptError("%s is not a valid Entity", name.c_str());
+    if (!checkInheritance(&SimpleEntity::ClassInfo, cls)) {
+        ScriptError("%s is not a valid SimpleEntity", name.c_str());
         return;
     }
 
-    ent = (Entity *)cls->newInstance();
-
-    e = new Event(EV_Model);
-    e->AddString(name.c_str());
-    ent->PostEvent(e, EV_PRIORITY_SPAWNARG);
+    ent = (SimpleEntity *)cls->newInstance();
 
     angles.AngleVectors(&forward, NULL, &up);
     v = origin + (forward + up) * 40;
@@ -386,21 +384,36 @@ void Player::SpawnEntity(Event *ev)
     e->AddVector(v);
     ent->PostEvent(e, EV_SPAWNARG);
 
+    bModelSet = false;
+
     if (ev->NumArgs() > 2) {
         n = ev->NumArgs();
         for (i = 2; i <= n; i += 2) {
-            e = new Event(ev->GetString(i));
+            str name = ev->GetString(i);
+            float priority = EV_SPAWNARG;
+
+            if (!str::icmp(name, "model")) {
+                bModelSet = true;
+                priority = EV_PRIORITY_SPAWNARG;
+            }
+
+            e = new Event(name);
             e->AddToken(ev->GetString(i + 1));
-            ent->PostEvent(e, EV_SPAWNARG);
+            ent->PostEvent(e, priority);
         }
     }
 
-    e = new Event(EV_SetAnim);
-    e->AddString("idle");
-    ent->PostEvent(e, EV_SPAWNARG);
+    if (ent->IsSubclassOfEntity() && !bModelSet) {
+        e = new Event(EV_Model);
+        e->AddString(name.c_str());
+        ent->PostEvent(e, EV_PRIORITY_SPAWNARG);
+    }
 
     ent->ProcessPendingEvents();
-    ent->ProcessEvent(EV_Entity_Start);
+
+    if (ent->IsSubclassOfEntity()) {
+        ent->ProcessEvent(EV_Entity_Start);
+    }
 }
 
 //====================
@@ -538,7 +551,7 @@ void Player::LogStats(Event *ev)
     // FIXME: FS
     gi.FS_Flush(logfile);
 
-    Event *ev1 = new Event(ev);
+    Event *ev1 = new Event(std::move(*ev));
     PostEvent(ev1, 1);
 }
 
@@ -595,20 +608,14 @@ void Player::EventJailEscape(Event* ev)
 
 void Player::EventFace(Event *ev)
 {
-    SetViewAngles(Vector(ev->GetFloat(1), ev->GetFloat(2), ev->GetFloat(3)));
+    if (ev->NumArgs() == 1) {
+        SetViewAngles(ev->GetVector(1));
+    } else {
+        SetViewAngles(Vector(ev->GetFloat(1), ev->GetFloat(2), ev->GetFloat(3)));
+    }
 }
 
 void Player::EventCoord(Event *ev)
 {
-    const char *s =
-        va("location: %.2f %.2f %.2f\nangles: %.2f %.2f %.2f\n(use 'tele' or 'face' to set)\n",
-           origin[0],
-           origin[1],
-           origin[2],
-           v_angle[0],
-           v_angle[1],
-           v_angle[2]);
-
-    HUDPrint(s);
-    gi.Printf(s);
+    gi.Printf("location: %.2f %.2f %.2f\nangles: %.2f %.2f %.2f\n(use 'tele' or 'face' to set)\n", origin[0], origin[1], origin[2], v_angle[0], v_angle[1], v_angle[2]);
 }
diff --git a/code/fgame/playerbot.cpp b/code/fgame/playerbot.cpp
index 8363a099..958e4ce4 100644
--- a/code/fgame/playerbot.cpp
+++ b/code/fgame/playerbot.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,618 +27,250 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "consoleevent.h"
 #include "debuglines.h"
 #include "scriptexception.h"
+#include "vehicleturret.h"
+#include "weaputils.h"
+#include "g_bot.h"
 
 // We assume that we have limited access to the server-side
 // and that most logic come from the playerstate_s structure
 
 cvar_t *bot_manualmove;
 
-CLASS_DECLARATION( Player, PlayerBot, NULL )
-{
-	{ &EV_Killed,				&PlayerBot::Killed },
-	{ &EV_GotKill,				&PlayerBot::GotKill },
-	{ &EV_Player_StuffText,		&PlayerBot::EventStuffText },
-	{ NULL, NULL }
+CLASS_DECLARATION(Listener, BotController, NULL) {
+    {NULL, NULL}
 };
 
-PlayerBot::botfunc_t PlayerBot::botfuncs[ MAX_BOT_FUNCTIONS ];
+BotController::botfunc_t BotController::botfuncs[MAX_BOT_FUNCTIONS];
 
-PlayerBot::PlayerBot()
+BotController::BotController()
 {
-	entflags |= EF_BOT;
+    if (LoadingSavegame) {
+        return;
+    }
 
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    m_botCmd.serverTime = 0;
+    m_botCmd.msec       = 0;
+    m_botCmd.buttons    = 0;
+    m_botCmd.angles[0]  = ANGLE2SHORT(0);
+    m_botCmd.angles[1]  = ANGLE2SHORT(0);
+    m_botCmd.angles[2]  = ANGLE2SHORT(0);
 
-	m_Path.SetFallHeight( 96 );
-	m_bPathing = false;
-	m_bTempAway = false;
-	m_bDeltaMove = true;
+    m_botCmd.forwardmove = 0;
+    m_botCmd.rightmove   = 0;
+    m_botCmd.upmove      = 0;
 
-	m_botCmd.serverTime = 0;
-	m_botCmd.msec = 0;
-	m_botCmd.buttons = 0;
-	m_botCmd.angles[ 0 ] = ANGLE2SHORT( 0 );
-	m_botCmd.angles[ 1 ] = ANGLE2SHORT( 0 );
-	m_botCmd.angles[ 2 ] = ANGLE2SHORT( 0 );
+    m_botEyes.angles[0] = 0;
+    m_botEyes.angles[1] = 0;
+    m_botEyes.ofs[0]    = 0;
+    m_botEyes.ofs[1]    = 0;
+    m_botEyes.ofs[2]    = DEFAULT_VIEWHEIGHT;
 
-	m_botCmd.forwardmove = 0;
-	m_botCmd.rightmove = 0;
-	m_botCmd.upmove = 0;
+    m_iCuriousTime  = 0;
+    m_iAttackTime   = 0;
+    m_iConfirmTime  = 0;
+    m_iEnemyEyesTag = -1;
 
-	m_botEyes.angles[ 0 ] = 0;
-	m_botEyes.angles[ 1 ] = 0;
-	m_botEyes.ofs[ 0 ] = 0;
-	m_botEyes.ofs[ 1 ] = 0;
-	m_botEyes.ofs[ 2 ] = viewheight;
+    m_iNextTauntTime = 0;
 
-	m_vAngSpeed = vec_zero;
-	m_vTargetAng = vec_zero;
-	m_vCurrentAng = vec_zero;
-	m_iCheckPathTime = 0;
-	m_iTempAwayTime = 0;
-	m_fYawSpeedMult = 1.0f;
-
-	m_iCuriousTime = 0;
-	m_iAttackTime = 0;
-
-	m_StateFlags = 0;
-	m_RunLabel.TrySetScript("global/bot_run.scr");
+    m_StateFlags = 0;
+    m_RunLabel.TrySetScript("global/bot_run.scr");
 }
 
-void PlayerBot::Init
-	(
-	void
-	)
+BotController::~BotController()
 {
-	bot_manualmove			= gi.Cvar_Get( "bot_manualmove",			"0",			0 );
-
-	for( int i = 0; i < MAX_BOT_FUNCTIONS; i++ )
-	{
-		botfuncs[ i ].BeginState	= &PlayerBot::State_DefaultBegin;
-		botfuncs[ i ].EndState		= &PlayerBot::State_DefaultEnd;
-	}
-
-	InitState_Attack( &botfuncs[ 0 ] );
-	InitState_Curious( &botfuncs[ 1 ] );
-	InitState_Grenade( &botfuncs[ 2 ] );
-	InitState_Idle( &botfuncs[ 3 ] );
-	InitState_Weapon( &botfuncs[ 4 ] );
+    if (controlledEnt) {
+        controlledEnt->delegate_gotKill.Remove(delegateHandle_gotKill);
+        controlledEnt->delegate_killed.Remove(delegateHandle_killed);
+        controlledEnt->delegate_stufftext.Remove(delegateHandle_stufftext);
+    }
 }
 
-float AngleDifference( float ang1, float ang2 ) {
-	float diff;
-
-	diff = ang1 - ang2;
-	if( ang1 > ang2 ) {
-		if( diff > 180.0 ) diff -= 360.0;
-	}
-	else {
-		if( diff < -180.0 ) diff += 360.0;
-	}
-	return diff;
+BotMovement& BotController::GetMovement()
+{
+    return movement;
 }
 
-void PlayerBot::TurnThink
-	(
-	void
-	)
+void BotController::Init(void)
 {
-	float diff, factor, maxchange, anglespeed, desired_speed;
-	int i;
+    bot_manualmove = gi.Cvar_Get("bot_manualmove", "0", 0);
 
-	if( m_vTargetAng[ PITCH ] > 180 )
-		m_vTargetAng[ PITCH ] -= 360;
+    for (int i = 0; i < MAX_BOT_FUNCTIONS; i++) {
+        botfuncs[i].BeginState = &BotController::State_DefaultBegin;
+        botfuncs[i].EndState   = &BotController::State_DefaultEnd;
+    }
 
-	factor = 0.25f;
-	maxchange = 360;
-
-	if( maxchange < 240 )
-		maxchange = 240;
-
-	maxchange *= level.frametime;
-
-	for( i = 0; i < 2; i++ )
-	{
-		//over reaction view model
-		m_vCurrentAng[ i ] = AngleMod( m_vCurrentAng[ i ] );
-		m_vTargetAng[ i ] = AngleMod( m_vTargetAng[ i ] );
-		diff = AngleDifference( m_vCurrentAng[ i ], m_vTargetAng[ i ] );
-		desired_speed = diff * factor;
-		m_vAngSpeed[ i ] += ( m_vAngSpeed[ i ] - desired_speed );
-
-		if( m_vAngSpeed[ i ] > 180 )
-			m_vAngSpeed[ i ] = maxchange;
-
-		if( m_vAngSpeed[ i ] < -180 )
-			m_vAngSpeed[ i ] = -maxchange;
-
-		anglespeed = m_vAngSpeed[ i ];
-
-		if( anglespeed > maxchange )
-			anglespeed = maxchange;
-
-		if( anglespeed < -maxchange )
-			anglespeed = -maxchange;
-
-		m_vCurrentAng[ i ] += anglespeed;
-		m_vCurrentAng[ i ] = AngleMod( m_vCurrentAng[ i ] );
-
-		//demping
-		m_vAngSpeed[ i ] *= 0.45 * ( 1 - factor );
-	}
-
-	if( m_vCurrentAng[ PITCH ] > 180 )
-		m_vCurrentAng[ PITCH ] -= 360;
-
-	m_botEyes.angles[ 0 ] = m_vCurrentAng[ 0 ];
-	m_botEyes.angles[ 1 ] = m_vCurrentAng[ 1 ];
-	m_botCmd.angles[ 0 ] = ANGLE2SHORT( m_vCurrentAng[ 0 ] ) - client->ps.delta_angles[ 0 ];
-	m_botCmd.angles[ 1 ] = ANGLE2SHORT( m_vCurrentAng[ 1 ] ) - client->ps.delta_angles[ 1 ];
-	m_botCmd.angles[ 2 ] = ANGLE2SHORT( m_vCurrentAng[ 2 ] ) - client->ps.delta_angles[ 2 ];
+    InitState_Attack(&botfuncs[0]);
+    InitState_Curious(&botfuncs[1]);
+    InitState_Grenade(&botfuncs[2]);
+    InitState_Idle(&botfuncs[3]);
+    //InitState_Weapon(&botfuncs[4]);
 }
 
-void PlayerBot::CheckAttractiveNodes
-	(
-	void
-	)
+void BotController::GetUsercmd(usercmd_t *ucmd)
 {
-	for( int i = m_attractList.NumObjects(); i > 0; i-- )
-	{
-		nodeAttract_t *a = m_attractList.ObjectAt( i );
-
-		if( a->m_pNode == NULL || !a->m_pNode->CheckTeam( this ) || level.time > a->m_fRespawnTime )
-		{
-			delete a;
-			m_attractList.RemoveObjectAt( i );
-		}
-	}
+    *ucmd = m_botCmd;
 }
 
-void PlayerBot::MoveThink
-	(
-	void
-	)
+void BotController::GetEyeInfo(usereyes_t *eyeinfo)
 {
-	Vector vDir;
-	Vector vAngles;
-	Vector vWishDir;
-
-	m_botCmd.forwardmove = 0;
-	m_botCmd.rightmove = 0;
-
-	CheckAttractiveNodes();
-
-	if( !IsMoving() )
-	{
-		return;
-	}
-
-	if( m_bTempAway && level.inttime >= m_iTempAwayTime )
-	{
-		m_bTempAway = false;
-		m_Path.FindPath( origin, m_vTargetPos, this, 0, NULL, 0 );
-	}
-
-	if( m_Path.CurrentNode() )
-	{
-		m_Path.UpdatePos( origin, 8 );
-
-		if( m_bDeltaMove )
-			m_vCurrentGoal = origin + m_Path.CurrentDelta();
-		else
-			m_vCurrentGoal = m_Path.CurrentNode()->point;
-
-		if( m_Path.Complete( origin ) )
-		{
-			// Clear the path
-			m_Path.Clear();
-		}
-	}
-	else if( !m_bTempAway )
-	{
-		m_vCurrentGoal = origin;
-	}
-
-	if( ai_debugpath->integer )
-	{
-		G_DebugLine( centroid, m_vCurrentGoal + Vector( 0, 0, 36 ), 1, 1, 0, 1 );
-	}
-
-	// Check if we're blocked
-	if( level.inttime >= m_iCheckPathTime )
-	{
-		Vector end;
-
-		m_bDeltaMove = false;
-
-		m_iCheckPathTime = level.inttime + 2000;
-
-		if( m_Path.CurrentNode() && m_Path.CurrentNode() != m_Path.LastNode() )
-		{
-			end = m_Path.NextNode()->point;
-		}
-		else
-		{
-			end = m_vCurrentGoal;
-		}
-
-		if( GetMoveResult() >= MOVERESULT_BLOCKED || velocity.lengthSquared() <= 8 * 8 )
-		{
-			gi.DPrintf( "Updating path for bot client %i\n", edict - g_entities );
-
-			m_bTempAway = true;
-			m_bDeltaMove = false;
-			m_iTempAwayTime = level.inttime + 750;
-
-			// Try to backward a little
-			//vDir = end - origin;
-			//VectorNormalizeFast( vDir );
-			//m_Path.FindPathAway( origin, origin + vDir * 16, vDir, this, 256, NULL, 0 );
-			//m_Path.FindPathAway( origin, origin + m_vLastValidDir * 16, -m_vLastValidDir, this, 256, NULL, 0 );
-			m_Path.Clear();
-			m_vCurrentGoal = m_vLastValidGoal - m_vLastValidDir * 256;
-			return;
-		}
-	}
-
-	if( ai_debugpath->integer )
-	{
-		PathInfo *pos = m_Path.CurrentNode();
-
-		if( pos != NULL )
-		{
-			while( pos != m_Path.LastNode() )
-			{
-				Vector vStart = pos->point + Vector( 0, 0, 32 );
-
-				pos--;
-
-				Vector vEnd = pos->point + Vector( 0, 0, 32 );
-
-				G_DebugLine( vStart, vEnd, 1, 0, 0, 1 );
-			}
-		}
-	}
-
-	if( ( m_vTargetPos - origin ).lengthSquared() <= 16 * 16 )
-	{
-		ClearMove();
-	}
-
-	vDir = m_vCurrentGoal - centroid;
-
-	// Rotate the dir
-	//vDir = m_Path.CurrentDelta();
-	VectorNormalize( vDir );
-	vAngles = vDir.toAngles() - angles;
-	vAngles.AngleVectorsLeft( &vWishDir );
-
-	m_vLastValidDir = vWishDir;
-	m_vLastValidGoal = m_vCurrentGoal;
-
-	// Forward to the specified direction
-	float x = vWishDir.x * 255.0f;
-	float y = -vWishDir.y * 255.0f;
-
-	m_botCmd.forwardmove = ( signed char )( x > 127 ? 127 : x < -127 ? -127 : x );
-	m_botCmd.rightmove = ( signed char )( y > 127 ? 127 : y < -127 ? -127 : y );
-	CheckJump();
-
-	Weapon *pWeap = GetActiveWeapon( WEAPON_MAIN );
-
-	if( pWeap && !pWeap->ShouldReload() )
-	{
-		m_RunLabel.Execute(this);
-	}
+    *eyeinfo = m_botEyes;
 }
 
-void PlayerBot::CheckJump
-	(
-	void
-	)
+void BotController::UpdateBotStates(void)
 {
-	Vector start;
-	Vector end;
-	Vector dir;
-	trace_t trace;
+    if (bot_manualmove->integer) {
+        memset(&m_botCmd, 0, sizeof(usercmd_t));
+        return;
+    }
 
-	if( !m_Path.CurrentNode() )
-		return;
+    if (!controlledEnt->client->pers.dm_primary[0]) {
+        Event *event;
 
-	dir = m_Path.CurrentDelta();
-	VectorNormalizeFast( dir );
+        //
+        // Primary weapon
+        //
+        event = new Event(EV_Player_PrimaryDMWeapon);
+        event->AddString("auto");
 
-	G_DebugLine( origin + Vector( 0, 0, STEPSIZE ), origin + Vector( 0, 0, STEPSIZE ) + dir * 32, 1, 0, 1, 1 );
-	G_DebugLine( origin + Vector( 0, 0, 56 ), origin + Vector( 0, 0, 56 ) + dir * 32, 1, 0, 1, 1 );
+        controlledEnt->ProcessEvent(event);
+    }
 
-	Vector vStart = origin + Vector( 0, 0, STEPSIZE );
-	Vector vEnd = origin + Vector( 0, 0, STEPSIZE ) + dir * 4;
+    if (controlledEnt->GetTeam() == TEAM_NONE || controlledEnt->GetTeam() == TEAM_SPECTATOR) {
+        float time;
 
-	// Check if the bot needs to jump
-	trace = G_Trace( vStart,
-		mins,
-		maxs,
-		vEnd,
-		this,
-		MASK_PLAYERSOLID,
-		false,
-		"PlayerBot::CheckJump" );
+        // Add some delay to avoid telefragging
+        time = controlledEnt->entnum / 20.0;
 
-	// No need to jump
-	if( trace.fraction >= 0.95f )
-	{
-		m_botCmd.upmove = 0;
-		return;
-	}
+        if (controlledEnt->EventPending(EV_Player_AutoJoinDMTeam)) {
+            return;
+        }
 
-	start = origin + Vector( 0, 0, 56 );
-	end = origin + Vector( 0, 0, 56 ) + dir * 4;
+        //
+        // Team
+        //
+        controlledEnt->PostEvent(EV_Player_AutoJoinDMTeam, time);
+        return;
+    }
 
-	// Check if the bot can jump
-	trace = G_Trace(
-		start,
-		mins,
-		maxs,
-		end,
-		this,
-		MASK_PLAYERSOLID,
-		true,
-		"PlayerBot::CheckJump" );
+    if (controlledEnt->IsDead() || controlledEnt->IsSpectator()) {
+        // The bot should respawn
+        m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
+        return;
+    }
 
-	// Make the bot climb walls
-	if( trace.fraction >= 0.95f )
-	{
-		if( !m_botCmd.upmove )
-			m_botCmd.upmove = 127;
-		else
-			m_botCmd.upmove = 0;
-	}
-	else
-	{
-		m_botCmd.upmove = 0;
-	}
+    m_botCmd.buttons |= BUTTON_RUN;
+    m_botCmd.serverTime = level.svsTime;
+
+    m_botEyes.ofs[0]    = 0;
+    m_botEyes.ofs[1]    = 0;
+    m_botEyes.ofs[2]    = controlledEnt->viewheight;
+    m_botEyes.angles[0] = 0;
+    m_botEyes.angles[1] = 0;
+
+    CheckStates();
+
+    movement.MoveThink(m_botCmd);
+    rotation.TurnThink(m_botCmd, m_botEyes);
+    CheckUse();
+
+    CheckValidWeapon();
 }
 
-void PlayerBot::CheckEndPos
-	(
-	void
-	)
+void BotController::CheckUse(void)
 {
-	Vector start;
-	Vector end;
-	trace_t trace;
+    Vector  dir;
+    Vector  start;
+    Vector  end;
+    trace_t trace;
 
-	if( !m_Path.LastNode() )
-		return;
+    controlledEnt->angles.AngleVectorsLeft(&dir);
 
-	start = m_Path.LastNode()->point;
-	end = m_vTargetPos;
+    start = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight);
+    end   = controlledEnt->origin + Vector(0, 0, controlledEnt->viewheight) + dir * 32;
 
-	trace = G_Trace( start,
-		mins,
-		maxs,
-		end,
-		this,
-		MASK_TARGETPATH,
-		true,
-		"PlayerBot::CheckEndPos" );
+    trace = G_Trace(start, vec_zero, vec_zero, end, controlledEnt, MASK_USABLE, false, "BotController::CheckUse");
 
-	if( trace.fraction < 0.95f )
-		m_vTargetPos = trace.endpos;
+    // It may be a door
+    if ((trace.allsolid || trace.startsolid || trace.fraction != 1.0f) && trace.ent) {
+        if (trace.ent->entity->IsSubclassOfDoor()) {
+            Door *door = static_cast<Door *>(trace.ent->entity);
+            if (door->isOpen()) {
+                m_botCmd.buttons &= ~BUTTON_USE;
+                return;
+            }
+        }
+
+        //
+        // Toggle the use button
+        //
+        m_botCmd.buttons ^= BUTTON_USE;
+    } else {
+        m_botCmd.buttons &= ~BUTTON_USE;
+    }
 }
 
-void PlayerBot::CheckUse
-	(
-	void
-	)
-{
-	Vector dir;
-	Vector start;
-	Vector end;
-	trace_t trace;
-
-	m_botCmd.buttons &= ~BUTTON_USE;
-
-	angles.AngleVectorsLeft( &dir );
-
-	start = origin + Vector( 0, 0, viewheight );
-	end = origin + Vector( 0, 0, viewheight ) + dir * 32;
-
-	trace = G_Trace(
-		start,
-		vec_zero,
-		vec_zero,
-		end,
-		this,
-		MASK_USABLE,
-		false,
-		"PlayerBot::CheckUse" );
-
-	// It may be a door
-	if( ( trace.allsolid || trace.startsolid || trace.fraction != 1.0f ) && trace.entityNum )
-		m_botCmd.buttons |= BUTTON_USE;
+void BotController::CheckValidWeapon() {
+    Weapon* weapon = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    if (!weapon) {
+        // If holstered, use the best weapon available
+        UseWeaponWithAmmo();
+    } else if (!weapon->HasAmmo(FIRE_PRIMARY) && !controlledEnt->GetNewActiveWeapon()) {
+        // In case the current weapon has no ammo, use the best available weapon
+        UseWeaponWithAmmo();
+    }
 }
 
-void PlayerBot::GetUsercmd
-	(
-	usercmd_t *ucmd
-	)
+void BotController::SendCommand(const char *text)
 {
-	*ucmd = m_botCmd;
-}
+    char        *buffer;
+    char        *data;
+    size_t       len;
+    ConsoleEvent ev;
 
-void PlayerBot::GetEyeInfo
-	(
-	usereyes_t *eyeinfo
-	)
-{
-	*eyeinfo = m_botEyes;
-}
+    len = strlen(text) + 1;
 
-void PlayerBot::UpdateBotStates
-	(
-	void
-	)
-{
-	if( bot_manualmove->integer )
-	{
-		memset( &m_botCmd, 0, sizeof( usercmd_t ) );
-		return;
-	}
+    buffer = (char *)gi.Malloc(len);
+    data   = buffer;
+    Q_strncpyz(data, text, len);
 
-	if( IsDead() )
-	{
-		// The bot should respawn
-		m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
-		return;
-	}
+    const char *com_token = COM_Parse(&data);
 
-	m_botCmd.buttons |= BUTTON_RUN;
+    if (!com_token) {
+        return;
+    }
 
-	m_botEyes.ofs[ 0 ] = 0;
-	m_botEyes.ofs[ 1 ] = 0;
-	m_botEyes.ofs[ 2 ] = viewheight;
-	m_botEyes.angles[ 0 ] = 0;
-	m_botEyes.angles[ 1 ] = 0;
+    controlledEnt->m_lastcommand = com_token;
 
-	SetTargetAngles( Vector( 0, 90, 0 ) );
+    if (!Event::GetEvent(com_token)) {
+        return;
+    }
 
-	CheckStates();
+    ev = ConsoleEvent(com_token);
 
-	MoveThink();
-	TurnThink();
-	CheckUse();
-}
+    if (!(ev.GetEventFlags(ev.eventnum) & EV_CONSOLE)) {
+        gi.Free(buffer);
+        return;
+    }
 
-void PlayerBot::SendCommand
-	(
-	const char *text
-	)
-{
-	char *buffer;
-	char *data;
-	size_t len;
-	ConsoleEvent ev;
+    ev.SetConsoleEdict(controlledEnt->edict);
 
-	len = strlen( text ) + 1;
+    while (1) {
+        com_token = COM_Parse(&data);
 
-	buffer = ( char * )gi.Malloc( len );
-	data = buffer;
-	Q_strncpyz( data, text, len );
+        if (!com_token || !*com_token) {
+            break;
+        }
 
-	const char *com_token = COM_Parse( &data );
+        ev.AddString(com_token);
+    }
 
-	if( !com_token )
-	{
-		return;
-	}
+    gi.Free(buffer);
 
-	m_lastcommand = com_token;
-
-	if( !Event::GetEvent( com_token ) )
-	{
-		return;
-	}
-
-	ev = ConsoleEvent( com_token );
-
-	if( !( ev.GetEventFlags( ev.eventnum ) & EV_CONSOLE ) )
-	{
-		gi.Free( buffer );
-		return;
-	}
-
-	ev.SetConsoleEdict( edict );
-
-	while( 1 )
-	{
-		com_token = COM_Parse( &data );
-
-		if( !com_token || !*com_token )
-		{
-			break;
-		}
-
-		ev.AddString( com_token );
-	}
-
-	gi.Free( buffer );
-
-	try
-	{
-		ProcessEvent( ev );
-	}
-	catch( ScriptException& exc )
-	{
-		gi.DPrintf( "*** Bot Command Exception *** %s\n", exc.string.c_str() );
-	}
-}
-
-void PlayerBot::setAngles
-	(
-	Vector ang
-	)
-{
-	Entity::setAngles( ang );
-	SetTargetAngles( angles );
-}
-
-void PlayerBot::updateOrigin
-	(
-	void
-	)
-{
-	Entity::updateOrigin();
-
-	if( origin == client->ps.origin )
-	{
-		// no change because of Pmove
-		return;
-	}
-
-	m_pPrimaryAttract = NULL;
-
-	if( m_Path.CurrentNode() )
-	{
-		// recalculate paths because of a new origin
-		m_Path.ReFindPath( origin, this );
-	}
-}
-
-/*
-====================
-SetTargetAngles
-
-Set the bot's angle
-====================
-*/
-void PlayerBot::SetTargetAngles
-	(
-	Vector vAngles
-	)
-{
-	m_vTargetAng = vAngles;
-}
-
-/*
-====================
-AimAt
-
-Make the bot face to the specified direction
-====================
-*/
-void PlayerBot::AimAt
-	(
-	Vector vPos
-	)
-{
-	Vector vDelta = vPos - centroid;
-
-	VectorNormalize( vDelta );
-	vectoangles( vDelta, m_vTargetAng );
+    try {
+        controlledEnt->ProcessEvent(ev);
+    } catch (ScriptException& exc) {
+        gi.DPrintf("*** Bot Command Exception *** %s\n", exc.string.c_str());
+    }
 }
 
 /*
@@ -648,21 +280,22 @@ AimAtAimNode
 Make the bot face toward the current path
 ====================
 */
-void PlayerBot::AimAtAimNode
-(
-void
-)
+void BotController::AimAtAimNode(void)
 {
-	if( m_Path.CurrentDelta() )
-	{
-		AimAt( origin + m_Path.CurrentDelta() );
-	}
-	else
-	{
-		AimAt( m_vCurrentGoal );
-	}
+    Vector goal;
 
-	m_vTargetAng[ PITCH ] = 0;
+    if (!movement.IsMoving()) {
+        return;
+    }
+
+    goal = movement.GetCurrentGoal();
+    if (goal != controlledEnt->origin) {
+        rotation.AimAt(goal);
+    }
+
+    Vector targetAngles = rotation.GetTargetAngles();
+    targetAngles.x      = 0;
+    rotation.SetTargetAngles(targetAngles);
 }
 
 /*
@@ -672,295 +305,13 @@ CheckReload
 Make the bot reload if necessary
 ====================
 */
-void PlayerBot::CheckReload
-(
-void
-)
+void BotController::CheckReload(void)
 {
-	Weapon *weap = GetActiveWeapon( WEAPON_MAIN );
+    Weapon *weap = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
 
-	if( weap && weap->CheckReload( FIRE_PRIMARY ) )
-	{
-		SendCommand( "reload" );
-	}
-}
-
-/*
-====================
-MoveTo
-
-Move to the specified position
-====================
-*/
-void PlayerBot::MoveTo
-(
-Vector vPos,
-float *vLeashHome,
-float fLeashRadius
-)
-{
-	m_bPathing = true;
-	m_vTargetPos = vPos;
-	m_Path.FindPath( origin, vPos, this, 0, vLeashHome, fLeashRadius * fLeashRadius );
-
-	if( !m_Path.CurrentNode() )
-	{
-		m_bPathing = false;
-		return;
-	}
-
-	CheckEndPos();
-}
-
-/*
-====================
-MoveTo
-
-Move to the nearest attractive point with a minimum priority
-Returns true if no attractive point was found
-====================
-*/
-bool PlayerBot::MoveToBestAttractivePoint
-	(
-	int iMinPriority
-	)
-{
-	Container< AttractiveNode * > list;
-	AttractiveNode *bestNode;
-	float bestDistanceSquared;
-	int bestPriority;
-
-	if( m_pPrimaryAttract )
-	{
-		MoveTo( m_pPrimaryAttract->origin );
-
-		if( !IsMoving() )
-		{
-			m_pPrimaryAttract = NULL;
-		}
-		else
-		{
-			if( MoveDone() )
-			{
-				if( !m_fAttractTime )
-				{
-					m_fAttractTime = level.time + m_pPrimaryAttract->m_fMaxStayTime;
-				}
-				if( level.time > m_fAttractTime )
-				{
-					nodeAttract_t *a = new nodeAttract_t;
-					a->m_fRespawnTime = level.time + m_pPrimaryAttract->m_fRespawnTime;
-					a->m_pNode = m_pPrimaryAttract;
-
-					m_pPrimaryAttract = NULL;
-				}
-			}
-
-			return true;
-		}
-	}
-
-	if( !attractiveNodes.NumObjects() )
-	{
-		return false;
-	}
-
-	bestNode = NULL;
-	bestDistanceSquared = 99999999.0f;
-	bestPriority = iMinPriority;
-
-	for( int i = attractiveNodes.NumObjects(); i > 0; i-- )
-	{
-		AttractiveNode *node = attractiveNodes.ObjectAt( i );
-		float distSquared;
-		bool m_bRespawning = false;
-
-		for( int j = m_attractList.NumObjects(); j > 0; j-- )
-		{
-			AttractiveNode *node2 = m_attractList.ObjectAt( j )->m_pNode;
-
-			if( node2 == node )
-			{
-				m_bRespawning = true;
-				break;
-			}
-		}
-
-		if( m_bRespawning )
-		{
-			continue;
-		}
-
-		if( node->m_iPriority < bestPriority )
-		{
-			continue;
-		}
-
-		if( !node->CheckTeam( this ) )
-		{
-			continue;
-		}
-
-		distSquared = VectorLengthSquared( origin - node->origin );
-
-		if( node->m_fMaxDistanceSquared >= 0 && distSquared > node->m_fMaxDistanceSquared )
-		{
-			continue;
-		}
-
-		if( !CanMoveTo( node->origin ) )
-		{
-			continue;
-		}
-
-		if( distSquared < bestDistanceSquared )
-		{
-			bestDistanceSquared = distSquared;
-			bestNode = node;
-			bestPriority = node->m_iPriority;
-		}
-	}
-
-	if( bestNode )
-	{
-		m_pPrimaryAttract = bestNode;
-		m_fAttractTime = 0;
-		MoveTo( bestNode->origin );
-		return true;
-	}
-	else
-	{
-		// No attractive point found
-		return false;
-	}
-}
-
-/*
-====================
-CanMoveTo
-
-Returns true if the bot has done moving
-====================
-*/
-bool PlayerBot::CanMoveTo
-	(
-	Vector vPos
-	)
-{
-	return m_Path.DoesTheoreticPathExist( origin, vPos, NULL, 0, NULL, 0 );
-}
-
-/*
-====================
-MoveDone
-
-Returns true if the bot has done moving
-====================
-*/
-bool PlayerBot::MoveDone
-	(
-	void
-	)
-{
-	return m_Path.Complete( origin );
-}
-
-/*
-====================
-IsMoving
-
-Returns true if the bot has a current path
-====================
-*/
-bool PlayerBot::IsMoving
-	(
-	void
-	)
-{
-	return m_bPathing;
-}
-
-/*
-====================
-ClearMove
-
-Stop the bot from moving
-====================
-*/
-void PlayerBot::ClearMove
-	(
-	void
-	)
-{
-	m_Path.Clear();
-	m_bPathing = false;
-}
-
-/*
-====================
-MoveNear
-
-Move near the specified position within the radius
-====================
-*/
-void PlayerBot::MoveNear
-	(
-	Vector vNear,
-	float fRadius,
-	float *vLeashHome,
-	float fLeashRadius
-	)
-{
-	m_bPathing = true;
-	m_Path.FindPathNear( origin, vNear, this, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius );
-
-	if( !m_Path.CurrentNode() )
-	{
-		m_bPathing = false;
-		return;
-	}
-
-	m_vTargetPos = m_Path.LastNode()->point;
-}
-
-/*
-====================
-AvoidPath
-
-Avoid the specified position within the radius and start from a direction
-====================
-*/
-void PlayerBot::AvoidPath
-	(
-	Vector vAvoid,
-	float fAvoidRadius,
-	Vector vPreferredDir,
-	float *vLeashHome,
-	float fLeashRadius
-	)
-{
-	Vector vDir;
-
-	if( vPreferredDir == vec_zero )
-	{
-		vDir = origin - vAvoid;
-		VectorNormalizeFast( vDir );
-	}
-	else
-	{
-		vDir = vPreferredDir;
-	}
-
-	m_bPathing = true;
-	m_Path.FindPathAway( origin, vAvoid, vDir, this, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius );
-
-	if( !m_Path.CurrentNode() )
-	{
-		m_bPathing = false;
-		return;
-	}
-
-	m_vTargetPos = m_Path.LastNode()->point;
+    if (weap && weap->CheckReload(FIRE_PRIMARY)) {
+        SendCommand("reload");
+    }
 }
 
 /*
@@ -970,59 +321,70 @@ NoticeEvent
 Warn the bot of an event
 ====================
 */
-void PlayerBot::NoticeEvent
-	(
-	Vector vPos,
-	int iType,
-	Entity *pEnt,
-	float fDistanceSquared,
-	float fRadiusSquared
-	)
+void BotController::NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared)
 {
-	// Ignore teammates
-	if( pEnt->IsSubclassOfPlayer() )
-	{
-		Player *p = ( Player * )pEnt;
+    Sentient *pSentOwner;
+    float     fRangeFactor;
 
-		if( p->GetTeam() == GetTeam() )
-		{
-			return;
-		}
-	}
-	else if( pEnt->IsSubclassOfWeapon() )
-	{
-		Weapon *pWeap = ( Weapon * )pEnt;
+    fRangeFactor = 1.0 - (fDistanceSquared / fRadiusSquared);
 
-		if( pWeap->GetOwner() )
-		{
-			Player *p = ( Player * )pWeap->GetOwner();
+    if (fRangeFactor < random()) {
+        return;
+    }
 
-			if( p->IsSubclassOfPlayer() && p->GetTeam() == GetTeam() )
-			{
-				return;
-			}
-		}
-	}
+    if (pEnt->IsSubclassOfSentient()) {
+        pSentOwner = static_cast<Sentient *>(pEnt);
+    } else if (pEnt->IsSubclassOfVehicleTurretGun()) {
+        VehicleTurretGun *pVTG = static_cast<VehicleTurretGun *>(pEnt);
+        pSentOwner             = pVTG->GetSentientOwner();
+    } else if (pEnt->IsSubclassOfItem()) {
+        Item *pItem = static_cast<Item *>(pEnt);
+        pSentOwner  = pItem->GetOwner();
+    } else if (pEnt->IsSubclassOfProjectile()) {
+        Projectile *pProj = static_cast<Projectile *>(pEnt);
+        pSentOwner        = pProj->GetOwner();
+    } else {
+        pSentOwner = NULL;
+    }
 
-	switch( iType )
-	{
-	case AI_EVENT_MISC:
-	case AI_EVENT_MISC_LOUD:
-		break;
-	case AI_EVENT_WEAPON_FIRE:
-	case AI_EVENT_WEAPON_IMPACT:
-	case AI_EVENT_EXPLOSION:
-	case AI_EVENT_AMERICAN_VOICE:
-	case AI_EVENT_GERMAN_VOICE:
-	case AI_EVENT_AMERICAN_URGENT:
-	case AI_EVENT_GERMAN_URGENT:
-	case AI_EVENT_FOOTSTEP:
-	case AI_EVENT_GRENADE:
-	default:
-		m_iCuriousTime = level.inttime + 20000;
-		m_vLastCuriousPos = vPos;
-		break;
-	}
+    if (pSentOwner) {
+        if (pSentOwner == controlledEnt) {
+            // Ignore self
+            return;
+        }
+
+        if ((pSentOwner->flags & FL_NOTARGET) || pSentOwner->getSolidType() == SOLID_NOT) {
+            return;
+        }
+
+        // Ignore teammates
+        if (pSentOwner->IsSubclassOfPlayer()) {
+            Player *p = static_cast<Player *>(pSentOwner);
+
+            if (g_gametype->integer >= GT_TEAM && p->GetTeam() == controlledEnt->GetTeam()) {
+                return;
+            }
+        }
+    }
+
+    switch (iType) {
+    case AI_EVENT_MISC:
+    case AI_EVENT_MISC_LOUD:
+        break;
+    case AI_EVENT_WEAPON_FIRE:
+    case AI_EVENT_WEAPON_IMPACT:
+    case AI_EVENT_EXPLOSION:
+    case AI_EVENT_AMERICAN_VOICE:
+    case AI_EVENT_GERMAN_VOICE:
+    case AI_EVENT_AMERICAN_URGENT:
+    case AI_EVENT_GERMAN_URGENT:
+    case AI_EVENT_FOOTSTEP:
+    case AI_EVENT_GRENADE:
+    default:
+        m_iCuriousTime   = level.inttime + 20000;
+        m_vNewCuriousPos = vPos;
+        break;
+    }
 }
 
 /*
@@ -1032,15 +394,14 @@ ClearEnemy
 Clear the bot's enemy
 ====================
 */
-void PlayerBot::ClearEnemy
-	(
-	void
-	)
+void BotController::ClearEnemy(void)
 {
-	m_iAttackTime = 0;
-	m_pEnemy = NULL;
-	m_vOldEnemyPos = vec_zero;
-	m_vLastEnemyPos = vec_zero;
+    m_iAttackTime   = 0;
+    m_iConfirmTime  = 0;
+    m_pEnemy        = NULL;
+    m_iEnemyEyesTag = -1;
+    m_vOldEnemyPos  = vec_zero;
+    m_vLastEnemyPos = vec_zero;
 }
 
 /*
@@ -1057,66 +418,49 @@ ____________________
 ====================
 */
 
-void PlayerBot::CheckStates
-	(
-	void
-	)
+void BotController::CheckStates(void)
 {
-	m_StateCount = 0;
+    m_StateCount = 0;
 
-	for( int i = 0; i < MAX_BOT_FUNCTIONS; i++ )
-	{
-		botfunc_t *func = &botfuncs[ i ];
+    for (int i = 0; i < MAX_BOT_FUNCTIONS; i++) {
+        botfunc_t *func = &botfuncs[i];
 
-		if( func->CheckCondition )
-		{
-			if( ( this->*func->CheckCondition )() )
-			{
-				if( !( m_StateFlags & ( 1 << i ) ) )
-				{
-					m_StateFlags |= 1 << i;
+        if (func->CheckCondition) {
+            if ((this->*func->CheckCondition)()) {
+                if (!(m_StateFlags & (1 << i))) {
+                    m_StateFlags |= 1 << i;
 
-					if( func->BeginState )
-					{
-						( this->*func->BeginState )( );
-					}
-				}
+                    if (func->BeginState) {
+                        (this->*func->BeginState)();
+                    }
+                }
 
-				if( func->ThinkState )
-				{
-					m_StateCount++;
-					( this->*func->ThinkState )( );
-				}
-			}
-			else
-			{
-				if( ( m_StateFlags & ( 1 << i ) ) )
-				{
-					m_StateFlags &= ~( 1 << i );
+                if (func->ThinkState) {
+                    m_StateCount++;
+                    (this->*func->ThinkState)();
+                }
+            } else {
+                if ((m_StateFlags & (1 << i))) {
+                    m_StateFlags &= ~(1 << i);
 
-					if( func->EndState )
-					{
-						( this->*func->EndState )( );
-					}
-				}
-			}
-		}
-		else
-		{
-			if( func->ThinkState )
-			{
-				m_StateCount++;
-				( this->*func->ThinkState )( );
-			}
-		}
-	}
+                    if (func->EndState) {
+                        (this->*func->EndState)();
+                    }
+                }
+            }
+        } else {
+            if (func->ThinkState) {
+                m_StateCount++;
+                (this->*func->ThinkState)();
+            }
+        }
+    }
 
-	assert( m_StateCount );
-	if( !m_StateCount )
-	{
-		gi.DPrintf( "*** WARNING *** %s was stuck with no states !!!", client->pers.netname );
-		State_Reset();
-	}
+    assert(m_StateCount);
+    if (!m_StateCount) {
+        gi.DPrintf("*** WARNING *** %s was stuck with no states !!!", controlledEnt->client->pers.netname);
+        State_Reset();
+    }
 }
 
 /*
@@ -1126,34 +470,23 @@ Default state
 
 ====================
 */
-void PlayerBot::State_DefaultBegin
-	(
-	void
-	)
+void BotController::State_DefaultBegin(void)
 {
-	ClearMove();
+    movement.ClearMove();
 }
 
-void PlayerBot::State_DefaultEnd
-	(
-	void
-	)
-{
+void BotController::State_DefaultEnd(void) {}
 
-}
-
-void PlayerBot::State_Reset
-	(
-	void
-	)
+void BotController::State_Reset(void)
 {
-	m_iCuriousTime = 0;
-	m_iAttackTime = 0;
-	m_vLastCuriousPos = vec_zero;
-	m_vOldEnemyPos = vec_zero;
-	m_vLastEnemyPos = vec_zero;
-	m_vLastDeathPos = vec_zero;
-	m_pEnemy = NULL;
+    m_iCuriousTime    = 0;
+    m_iAttackTime     = 0;
+    m_vLastCuriousPos = vec_zero;
+    m_vOldEnemyPos    = vec_zero;
+    m_vLastEnemyPos   = vec_zero;
+    m_vLastDeathPos   = vec_zero;
+    m_pEnemy          = NULL;
+    m_iEnemyEyesTag   = -1;
 }
 
 /*
@@ -1163,53 +496,45 @@ Idle state
 Make the bot move to random directions
 ====================
 */
-void PlayerBot::InitState_Idle
-	(
-	botfunc_t *func
-	)
+void BotController::InitState_Idle(botfunc_t *func)
 {
-	func->CheckCondition	= &PlayerBot::CheckCondition_Idle;
-	func->ThinkState		= &PlayerBot::State_Idle;
+    func->CheckCondition = &BotController::CheckCondition_Idle;
+    func->ThinkState     = &BotController::State_Idle;
 }
 
-bool PlayerBot::CheckCondition_Idle
-	(
-	void
-	)
+bool BotController::CheckCondition_Idle(void)
 {
-	if( m_iCuriousTime )
-		return false;
+    if (m_iCuriousTime) {
+        return false;
+    }
 
-	if( m_iAttackTime )
-		return false;
+    if (m_iAttackTime) {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
-void PlayerBot::State_Idle
-	(
-	void
-	)
+void BotController::State_Idle(void)
 {
-	AimAtAimNode();
-	CheckReload();
+    AimAtAimNode();
+    CheckReload();
 
-	if( !MoveToBestAttractivePoint() && !IsMoving() )
-	{
-		if( m_vLastDeathPos != vec_zero )
-		{
-			MoveTo( m_vLastDeathPos );
+    if (!movement.MoveToBestAttractivePoint() && !movement.IsMoving()) {
+        if (m_vLastDeathPos != vec_zero) {
+            movement.MoveTo(m_vLastDeathPos);
 
-			if( MoveDone() )
-			{
-				m_vLastDeathPos = vec_zero;
-			}
-		}
-		else
-		{
-			AvoidPath( origin - Vector( orientation[ 0 ] ) * 128.0f, 1024 );
-		}
-	}
+            if (movement.MoveDone()) {
+                m_vLastDeathPos = vec_zero;
+            }
+        } else {
+            Vector randomDir(G_CRandom(16), G_CRandom(16), G_CRandom(16));
+            Vector preferredDir = Vector(controlledEnt->orientation[0]) * (rand() % 5 ? 1024 : -1024);
+            float  radius       = 512 + G_Random(2048);
+
+            movement.AvoidPath(controlledEnt->origin + randomDir, radius, preferredDir);
+        }
+    }
 }
 
 /*
@@ -1219,57 +544,43 @@ Curious state
 Forward to the last event position
 ====================
 */
-void PlayerBot::InitState_Curious
-	(
-	botfunc_t *func
-	)
+void BotController::InitState_Curious(botfunc_t *func)
 {
-	func->CheckCondition	= &PlayerBot::CheckCondition_Curious;
-	func->ThinkState		= &PlayerBot::State_Curious;
+    func->CheckCondition = &BotController::CheckCondition_Curious;
+    func->ThinkState     = &BotController::State_Curious;
 }
 
-bool PlayerBot::CheckCondition_Curious
-	(
-	void
-	)
+bool BotController::CheckCondition_Curious(void)
 {
-	if( m_iAttackTime )
-	{
-		m_iCuriousTime = 0;
-		return false;
-	}
+    if (m_iAttackTime) {
+        m_iCuriousTime = 0;
+        return false;
+    }
 
-	if( level.inttime > m_iCuriousTime )
-	{
-		if( m_iCuriousTime )
-		{
-			ClearMove();
-			m_iCuriousTime = 0;
-		}
+    if (level.inttime > m_iCuriousTime) {
+        if (m_iCuriousTime) {
+            movement.ClearMove();
+            m_iCuriousTime = 0;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
-void PlayerBot::State_Curious
-	(
-	void
-	)
+void BotController::State_Curious(void)
 {
-	//AimAt( m_vLastCuriousPos );
-	AimAtAimNode();
+    AimAtAimNode();
 
-	if( !MoveToBestAttractivePoint( 3 ) && !IsMoving() )
-	{
-		MoveTo( m_vLastCuriousPos );
-	}
+    if (!movement.MoveToBestAttractivePoint(3) && (!movement.IsMoving() || m_vLastCuriousPos != m_vNewCuriousPos)) {
+        movement.MoveTo(m_vNewCuriousPos);
+        m_vLastCuriousPos = m_vNewCuriousPos;
+    }
 
-	if( MoveDone() )
-	{
-		m_iCuriousTime = 0;
-	}
+    if (movement.MoveDone()) {
+        m_iCuriousTime = 0;
+    }
 }
 
 /*
@@ -1279,217 +590,304 @@ Attack state
 Attack the enemy
 ====================
 */
-void PlayerBot::InitState_Attack
-	(
-	botfunc_t *func
-	)
+void BotController::InitState_Attack(botfunc_t *func)
 {
-	func->CheckCondition	= &PlayerBot::CheckCondition_Attack;
-	func->EndState			= &PlayerBot::State_EndAttack;
-	func->ThinkState		= &PlayerBot::State_Attack;
+    func->CheckCondition = &BotController::CheckCondition_Attack;
+    func->EndState       = &BotController::State_EndAttack;
+    func->ThinkState     = &BotController::State_Attack;
 }
 
 static Vector bot_origin;
 
-static int sentients_compare( const void *elem1, const void *elem2 )
+static int sentients_compare(const void *elem1, const void *elem2)
 {
-	Entity *e1, *e2;
-	float delta[ 3 ];
-	float d1, d2;
+    Entity *e1, *e2;
+    float   delta[3];
+    float   d1, d2;
 
-	e1 = *( Entity ** )elem1;
-	e2 = *( Entity ** )elem2;
+    e1 = *(Entity **)elem1;
+    e2 = *(Entity **)elem2;
 
-	VectorSubtract( bot_origin, e1->origin, delta );
-	d1 = VectorLengthSquared( delta );
+    VectorSubtract(bot_origin, e1->origin, delta);
+    d1 = VectorLengthSquared(delta);
 
-	VectorSubtract( bot_origin, e2->origin, delta );
-	d2 = VectorLengthSquared( delta );
+    VectorSubtract(bot_origin, e2->origin, delta);
+    d2 = VectorLengthSquared(delta);
 
-	if( d2 <= d1 )
-	{
-		return d1 > d2;
-	}
-	else
-	{
-		return -1;
-	}
+    if (d2 <= d1) {
+        return d1 > d2;
+    } else {
+        return -1;
+    }
 }
 
-bool PlayerBot::CheckCondition_Attack
-	(
-	void
-	)
+bool BotController::IsValidEnemy(Sentient *sent) const
 {
-	Container< Sentient * > sents = SentientList;
+    if (sent == controlledEnt) {
+        return false;
+    }
 
-	bot_origin = origin;
-	sents.Sort( sentients_compare );
+    if (sent->hidden() || (sent->flags & FL_NOTARGET)) {
+        // Ignore hidden / non-target enemies
+        return false;
+    }
 
-	for( int i = 1; i <= sents.NumObjects(); i++ )
-	{
-		Sentient *sent = sents.ObjectAt( i );
-		Player *player = ( Player * )sent;
+    if (sent->IsDead()) {
+        // Ignore dead enemies
+        return false;
+    }
 
-		if( sent == this )
-			continue;
+    if (sent->getSolidType() == SOLID_NOT) {
+        // Ignore non-solid, like spectators
+        return false;
+    }
 
-		if( sent->hidden() )
-			continue;
+    if (sent->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(sent);
 
-		if( sent->IsDead() )
-			continue;
+        if (g_gametype->integer >= GT_TEAM && player->GetTeam() == controlledEnt->GetTeam()) {
+            return false;
+        }
+    } else {
+        if (sent->m_Team == controlledEnt->m_Team) {
+            return false;
+        }
+    }
 
-		if( sent->IsSubclassOfPlayer() )
-		{
-			if( g_gametype->integer >= GT_TEAM && player->GetTeam() == GetTeam() )
-				continue;
-		}
-		else
-		{
-			if( sent->m_Team == m_Team )
-				continue;
-		}
-
-		if( CanSee( sent, 80, world->m_fAIVisionDistance, false ) )
-		{
-			m_pEnemy = sent;
-			m_iAttackTime = level.inttime + 10000;
-			return true;
-		}
-	}
-
-	if( level.inttime > m_iAttackTime )
-	{
-		if( m_iAttackTime )
-		{
-			ClearMove();
-			m_iAttackTime = 0;
-		}
-
-		return false;
-	}
-
-	return true;
+    return true;
 }
 
-void PlayerBot::State_EndAttack
-	(
-	void
-	)
+bool BotController::CheckCondition_Attack(void)
 {
-	m_botCmd.buttons &= ~( BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT );
+    Container<Sentient *> sents       = SentientList;
+    float                 maxDistance = 0;
+
+    bot_origin = controlledEnt->origin;
+    sents.Sort(sentients_compare);
+
+    for (int i = 1; i <= sents.NumObjects(); i++) {
+        Sentient *sent = sents.ObjectAt(i);
+
+        if (!IsValidEnemy(sent)) {
+            continue;
+        }
+
+        maxDistance = Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828);
+
+        if (controlledEnt->CanSee(sent, 80, maxDistance, false)) {
+            if (m_pEnemy != sent) {
+                m_iEnemyEyesTag = -1;
+            }
+
+            if (!m_pEnemy) {
+                // Slight reaction time
+                m_iConfirmTime = level.inttime + (200 + G_Random(200));
+                m_iAttackTime = 0;
+            }
+
+            m_pEnemy        = sent;
+            m_vLastEnemyPos = m_pEnemy->origin;
+            if (level.inttime < m_iConfirmTime) {
+                return false;
+            }
+        }
+
+        if (m_pEnemy && level.inttime >= m_iConfirmTime) {
+            m_iAttackTime = level.inttime + 1000;
+            return true;
+        }
+    }
+
+    if (level.inttime > m_iAttackTime) {
+        if (m_iAttackTime) {
+            movement.ClearMove();
+            m_iAttackTime = 0;
+        }
+
+        return false;
+    }
+
+    return true;
 }
 
-void PlayerBot::State_Attack
-	(
-	void
-	)
+void BotController::State_EndAttack(void)
 {
-	Player *p = ( Player * )m_pEnemy.Pointer();
-	bool bMelee = false;
-	float fMinDistance = 128;
-	float fMinDistanceSquared = fMinDistance * fMinDistance;
+    m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+    controlledEnt->ZoomOff();
+}
 
-	if( !m_pEnemy || m_pEnemy->IsDead() || ( !p->IsSubclassOfPlayer() && m_pEnemy->m_Team == m_Team ) || ( g_gametype->integer >= GT_TEAM && p->GetTeam() == GetTeam() ) )
-	{
-		m_iAttackTime = 0;
-		return;
-	}
+void BotController::State_Attack(void)
+{
+    bool    bMelee              = false;
+    bool    bCanSee             = false;
+    float   fMinDistance        = 128;
+    float   fMinDistanceSquared = fMinDistance * fMinDistance;
+    float   fEnemyDistanceSquared;
+    Weapon *pWeap   = controlledEnt->GetActiveWeapon(WEAPON_MAIN);
+    bool    bNoMove = false;
 
-	float fDistanceSquared = ( m_pEnemy->origin - origin ).lengthSquared();
+    if (!m_pEnemy || !IsValidEnemy(m_pEnemy)) {
+        // Ignore dead enemies
+        m_iAttackTime = 0;
+        return;
+    }
+    float fDistanceSquared = (m_pEnemy->origin - controlledEnt->origin).lengthSquared();
 
-	if( CanSee( m_pEnemy, 20, world->m_fAIVisionDistance, false ) )
-	{
-		Weapon *pWeap = GetActiveWeapon( WEAPON_MAIN );
+    m_vOldEnemyPos = m_vLastEnemyPos;
 
-		if( !pWeap )
-		{
-			return;
-		}
+    bCanSee =
+        controlledEnt->CanSee(m_pEnemy, 20, Q_min(world->m_fAIVisionDistance, world->farplane_distance * 0.828), false);
+    if (bCanSee) {
+        if (!pWeap) {
+            return;
+        }
 
-		float fPrimaryBulletRange = pWeap->GetBulletRange( FIRE_PRIMARY ) / 1.25f;
-		float fPrimaryBulletRangeSquared = fPrimaryBulletRange * fPrimaryBulletRange;
-		float fSecondaryBulletRange = pWeap->GetBulletRange( FIRE_SECONDARY );
-		float fSecondaryBulletRangeSquared = fSecondaryBulletRange * fSecondaryBulletRange;
+        float fPrimaryBulletRange          = pWeap->GetBulletRange(FIRE_PRIMARY) / 1.25f;
+        float fPrimaryBulletRangeSquared   = fPrimaryBulletRange * fPrimaryBulletRange;
+        float fSecondaryBulletRange        = pWeap->GetBulletRange(FIRE_SECONDARY);
+        float fSecondaryBulletRangeSquared = fSecondaryBulletRange * fSecondaryBulletRange;
+        float fSpreadFactor                = pWeap->GetSpreadFactor(FIRE_PRIMARY);
 
-		fMinDistance = fPrimaryBulletRange;
+        //
+        // check the fire movement speed if the weapon has a max fire movement
+        //
+        if (pWeap->GetMaxFireMovement() < 1 && pWeap->HasAmmoInClip(FIRE_PRIMARY)) {
+            float length;
 
-		if( fMinDistance > 256 )
-		{
-			fMinDistance = 256;
-		}
+            length = controlledEnt->velocity.length();
+            if ((length / sv_runspeed->value) > (pWeap->GetMaxFireMovementMult())) {
+                bNoMove = true;
+                movement.ClearMove();
+            }
+        }
 
-		fMinDistanceSquared = fMinDistance * fMinDistance;
+        fMinDistance = fPrimaryBulletRange;
 
-		if( client->ps.stats[ STAT_AMMO ] > 0 || client->ps.stats[ STAT_CLIPAMMO ] > 0 )
-		{
-			if( fDistanceSquared <= fPrimaryBulletRangeSquared )
-			{
-				if( pWeap->IsSemiAuto() )
-				{
-					m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
-				}
-				else
-				{
-					m_botCmd.buttons |= BUTTON_ATTACKLEFT;
-				}
-			}
-			else
-			{
-				m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
-			}
-		}
-		else if( pWeap->GetFireType( FIRE_SECONDARY ) == FT_MELEE )
-		{
-			bMelee = true;
+        if (fMinDistance > 256) {
+            fMinDistance = 256;
+        }
 
-			if( fDistanceSquared <= fSecondaryBulletRangeSquared )
-			{
-				m_botCmd.buttons ^= BUTTON_ATTACKRIGHT;
-			}
-			else
-			{
-				m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
-			}
-		}
-		else
-		{
-			m_botCmd.buttons &= ~( BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT );
-		}
-	}
-	else
-	{
-		m_botCmd.buttons &= ~( BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT );
-		fMinDistanceSquared = 0;
-	}
+        fMinDistanceSquared = fMinDistance * fMinDistance;
 
-	AimAt( m_vLastEnemyPos );
+        if (controlledEnt->client->ps.stats[STAT_AMMO] > 0 || controlledEnt->client->ps.stats[STAT_CLIPAMMO] > 0) {
+            if (fDistanceSquared <= fPrimaryBulletRangeSquared) {
+                if (pWeap->IsSemiAuto()) {
+                    if (controlledEnt->client->ps.iViewModelAnim == VM_ANIM_IDLE
+                        || controlledEnt->client->ps.iViewModelAnim >= VM_ANIM_IDLE_0
+                               && controlledEnt->client->ps.iViewModelAnim <= VM_ANIM_IDLE_2) {
+                        if (fSpreadFactor < 0.25) {
+                            m_botCmd.buttons ^= BUTTON_ATTACKLEFT;
+                            if (pWeap->GetZoom()) {
+                                if (!controlledEnt->IsZoomed()) {
+                                    m_botCmd.buttons |= BUTTON_ATTACKRIGHT;
+                                } else {
+                                    m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
+                                }
+                            }
+                        } else {
+                            bNoMove = true;
+                            movement.ClearMove();
+                        }
+                    } else {
+                        m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+                        controlledEnt->ZoomOff();
+                    }
+                } else {
+                    m_botCmd.buttons |= BUTTON_ATTACKLEFT;
+                }
+            } else {
+                m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+                controlledEnt->ZoomOff();
+            }
+        } else {
+            m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+            controlledEnt->ZoomOff();
+        }
 
-	m_vOldEnemyPos = m_vLastEnemyPos;
-	m_vLastEnemyPos = m_pEnemy->centroid;
+        if (pWeap->GetFireType(FIRE_SECONDARY) == FT_MELEE) {
+            if (controlledEnt->client->ps.stats[STAT_AMMO] <= 0 && controlledEnt->client->ps.stats[STAT_CLIPAMMO] <= 0) {
+                bMelee = true;
+            } else if (fDistanceSquared <= fSecondaryBulletRangeSquared) {
+                bMelee = true;
+            }
+        }
 
-	if( ( !MoveToBestAttractivePoint( 5 ) && !IsMoving() ) || ( m_vOldEnemyPos != m_vLastEnemyPos && !MoveDone() ) )
-	{
-		if( !bMelee )
-		{
-			if( ( origin - m_vLastEnemyPos ).lengthSquared() < fMinDistanceSquared )
-			{
-				Vector vDir = origin - m_vLastEnemyPos;
-				VectorNormalizeFast( vDir );
+        if (bMelee) {
+            m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
 
-				AvoidPath( m_vLastEnemyPos, fMinDistance, vDir );
-			}
-			else
-			{
-				MoveNear( m_vLastEnemyPos, fMinDistance );
-			}
-		}
-		else
-		{
-			MoveTo( m_vLastEnemyPos );
-		}
-	}
+            if (fDistanceSquared <= fSecondaryBulletRangeSquared) {
+                m_botCmd.buttons ^= BUTTON_ATTACKRIGHT;
+            } else {
+                m_botCmd.buttons &= ~BUTTON_ATTACKRIGHT;
+            }
+        }
+
+        m_iAttackTime        = level.inttime + 1000;
+        m_iAttackStopAimTime = level.inttime + 3000;
+        m_vLastEnemyPos      = m_pEnemy->centroid;
+    } else {
+        m_botCmd.buttons &= ~(BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT);
+        fMinDistanceSquared = 0;
+    }
+
+    if (bCanSee || level.inttime < m_iAttackStopAimTime) {
+        Vector        vRandomOffset;
+        Vector        vTarget;
+        orientation_t eyes_or;
+
+        if (m_iEnemyEyesTag == -1) {
+            // Cache the tag
+            m_iEnemyEyesTag = gi.Tag_NumForName(m_pEnemy->edict->tiki, "eyes bone");
+        }
+
+        if (m_iEnemyEyesTag != -1) {
+            // Use the enemy's eyes bone
+            m_pEnemy->GetTag(m_iEnemyEyesTag, &eyes_or);
+
+            vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), -G_Random(32));
+            vTarget       = eyes_or.origin + vRandomOffset;
+            rotation.AimAt(eyes_or.origin + vRandomOffset);
+        } else {
+            vRandomOffset = Vector(G_CRandom(8), G_CRandom(8), 16 + G_Random(m_pEnemy->viewheight - 16));
+            vTarget       = m_pEnemy->origin + vRandomOffset;
+        }
+
+        rotation.AimAt(vTarget);
+    } else {
+        AimAtAimNode();
+    }
+
+    if (bNoMove) {
+        return;
+    }
+
+    fEnemyDistanceSquared = (controlledEnt->origin - m_vLastEnemyPos).lengthSquared();
+
+    if ((!movement.MoveToBestAttractivePoint(5) && !movement.IsMoving())
+        || (m_vOldEnemyPos != m_vLastEnemyPos && !movement.MoveDone()) || fEnemyDistanceSquared < fMinDistanceSquared) {
+        if (!bMelee || !bCanSee) {
+            if (fEnemyDistanceSquared < fMinDistanceSquared) {
+                Vector vDir = controlledEnt->origin - m_vLastEnemyPos;
+                VectorNormalizeFast(vDir);
+
+                movement.AvoidPath(m_vLastEnemyPos, fMinDistance, Vector(controlledEnt->orientation[1]) * 512);
+            } else {
+                movement.MoveTo(m_vLastEnemyPos);
+            }
+
+            if (!bCanSee && movement.MoveDone()) {
+                // Lost track of the enemy
+                ClearEnemy();
+                return;
+            }
+        } else {
+            movement.MoveTo(m_vLastEnemyPos);
+        }
+    }
+
+    if (movement.IsMoving()) {
+        m_iAttackTime = level.inttime + 1000;
+    }
 }
 
 /*
@@ -1499,30 +897,21 @@ Grenade state
 Avoid any grenades
 ====================
 */
-void PlayerBot::InitState_Grenade
-	(
-	botfunc_t *func
-	)
+void BotController::InitState_Grenade(botfunc_t *func)
 {
-	func->CheckCondition	= &PlayerBot::CheckCondition_Grenade;
-	func->ThinkState		= &PlayerBot::State_Grenade;
+    func->CheckCondition = &BotController::CheckCondition_Grenade;
+    func->ThinkState     = &BotController::State_Grenade;
 }
 
-bool PlayerBot::CheckCondition_Grenade
-	(
-	void
-	)
+bool BotController::CheckCondition_Grenade(void)
 {
-	// FIXME: TODO
-	return false;
+    // FIXME: TODO
+    return false;
 }
 
-void PlayerBot::State_Grenade
-	(
-	void
-	)
+void BotController::State_Grenade(void)
 {
-	// FIXME: TODO
+    // FIXME: TODO
 }
 
 /*
@@ -1532,87 +921,311 @@ Weapon state
 Change weapon when necessary
 ====================
 */
-void PlayerBot::InitState_Weapon
-	(
-	botfunc_t *func
-	)
+void BotController::InitState_Weapon(botfunc_t *func)
 {
-	func->CheckCondition	= &PlayerBot::CheckCondition_Weapon;
-	func->BeginState		= &PlayerBot::State_BeginWeapon;
+    func->CheckCondition = &BotController::CheckCondition_Weapon;
+    func->BeginState     = &BotController::State_BeginWeapon;
 }
 
-bool PlayerBot::CheckCondition_Weapon
-	(
-	void
-	)
+bool BotController::CheckCondition_Weapon(void)
 {
-	return GetActiveWeapon( WEAPON_MAIN ) != BestWeapon( NULL, false, WEAPON_CLASS_THROWABLE );
+    return controlledEnt->GetActiveWeapon(WEAPON_MAIN)
+        != controlledEnt->BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
 }
 
-void PlayerBot::State_BeginWeapon
-	(
-	void
-	)
+void BotController::State_BeginWeapon(void)
 {
-	Weapon *weap = BestWeapon( NULL, false, WEAPON_CLASS_THROWABLE );
+    Weapon *weap = controlledEnt->BestWeapon(NULL, false, WEAPON_CLASS_THROWABLE);
 
-	if( weap == NULL )
-	{
-		SendCommand( "safeholster 1" );
-		return;
-	}
+    if (weap == NULL) {
+        SendCommand("safeholster 1");
+        return;
+    }
 
-	SendCommand( va( "use \"%s\"", weap->model.c_str() ) );
+    SendCommand(va("use \"%s\"", weap->model.c_str()));
 }
 
-void PlayerBot::Spawned
-	(
-	void
-	)
-{
-	ClearEnemy();
-	m_iCuriousTime = 0;
+Weapon* BotController::FindWeaponWithAmmo() {
+  
+    Weapon *next;
+    int     n;
+    int     j;
+    int     bestrank;
+    Weapon *bestweapon;
+    const Container<int>& inventory = controlledEnt->getInventory();
 
-	Player::Spawned();
+    n = inventory.NumObjects();
+
+    // Search until we find the best weapon with ammo
+    bestweapon = NULL;
+    bestrank   = -999999;
+
+    for (j = 1; j <= n; j++) {
+        next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
+
+        assert(next);
+        if (!next->IsSubclassOfWeapon() || next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & WEAPON_CLASS_THROWABLE) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY)) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
+    }
+
+    return bestweapon;
 }
 
-void PlayerBot::Killed
-	(
-	Event *ev
-	)
-{
-	Player::Killed( ev );
+Weapon* BotController::FindMeleeWeapon() {
+  
+    Weapon *next;
+    int     n;
+    int     j;
+    int     bestrank;
+    Weapon *bestweapon;
+    const Container<int>& inventory = controlledEnt->getInventory();
 
-	// send the respawn buttons
-	if( !( m_botCmd.buttons & BUTTON_ATTACKLEFT ) )
-		m_botCmd.buttons |= BUTTON_ATTACKLEFT;
-	else
-		m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
+    n = inventory.NumObjects();
 
-	m_botEyes.ofs[ 0 ] = 0;
-	m_botEyes.ofs[ 1 ] = 0;
-	m_botEyes.ofs[ 2 ] = 0;
-	m_botEyes.angles[ 0 ] = 0;
-	m_botEyes.angles[ 1 ] = 0;
+    // Search until we find the best weapon with ammo
+    bestweapon = NULL;
+    bestrank   = -999999;
 
-	m_vLastDeathPos = origin;
+    for (j = 1; j <= n; j++) {
+        next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
+
+        assert(next);
+        if (!next->IsSubclassOfWeapon() || next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (next->GetFireType(FIRE_SECONDARY) != FT_MELEE) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
+    }
+
+    return bestweapon;
 }
 
-void PlayerBot::GotKill
-	(
-	Event *ev
-	)
-{
-	Player::GotKill( ev );
+void BotController::UseWeaponWithAmmo() {
+    Weapon* bestWeapon = FindWeaponWithAmmo();
+    if (!bestWeapon) {
+        //
+        // If there is no weapon with ammo, fallback to a weapon that can melee
+        //
+        bestWeapon = FindMeleeWeapon();
+    }
 
-	ClearEnemy();
-	m_iCuriousTime = 0;
+    if (!bestWeapon || bestWeapon == controlledEnt->GetActiveWeapon(WEAPON_MAIN)) {
+        return;
+    }
+
+    controlledEnt->useWeapon(bestWeapon, WEAPON_MAIN);
 }
 
-void PlayerBot::EventStuffText
-	(
-	Event *ev
-	)
+void BotController::Spawned(void)
 {
-	SendCommand( ev->GetString( 1 ) );
+    ClearEnemy();
+    m_iCuriousTime   = 0;
+    m_botCmd.buttons = 0;
+}
+
+void BotController::Think()
+{
+    usercmd_t  ucmd;
+    usereyes_t eyeinfo;
+
+    UpdateBotStates();
+    GetUsercmd(&ucmd);
+    GetEyeInfo(&eyeinfo);
+
+    G_ClientThink(controlledEnt->edict, &ucmd, &eyeinfo);
+}
+
+void BotController::Killed(const Event& ev)
+{
+    Entity *attacker;
+
+    // send the respawn buttons
+    if (!(m_botCmd.buttons & BUTTON_ATTACKLEFT)) {
+        m_botCmd.buttons |= BUTTON_ATTACKLEFT;
+    } else {
+        m_botCmd.buttons &= ~BUTTON_ATTACKLEFT;
+    }
+
+    m_botEyes.ofs[0]    = 0;
+    m_botEyes.ofs[1]    = 0;
+    m_botEyes.ofs[2]    = 0;
+    m_botEyes.angles[0] = 0;
+    m_botEyes.angles[1] = 0;
+
+    attacker = ev.GetEntity(1);
+
+    if (attacker && rand() % 5 == 0) {
+        // 1/5 chance to go back to the attacker position
+        m_vLastDeathPos = attacker->origin;
+    } else {
+        m_vLastDeathPos = vec_zero;
+    }
+
+    // Choose a new random primary weapon
+    Event event(EV_Player_PrimaryDMWeapon);
+    event.AddString("auto");
+
+    controlledEnt->ProcessEvent(event);
+
+    //
+    // This is useful to change nationality in Spearhead and Breakthrough
+    // this allows the AI to use more weapons
+    //
+    Info_SetValueForKey(controlledEnt->client->pers.userinfo, "dm_playermodel", G_GetRandomAlliedPlayerModel());
+    Info_SetValueForKey(controlledEnt->client->pers.userinfo, "dm_playergermanmodel", G_GetRandomGermanPlayerModel());
+
+    G_ClientUserinfoChanged(controlledEnt->edict, controlledEnt->client->pers.userinfo);
+}
+
+void BotController::GotKill(const Event& ev)
+{
+    ClearEnemy();
+    m_iCuriousTime = 0;
+
+    if (level.inttime >= m_iNextTauntTime && (rand() % 5) == 0) {
+        //
+        // Randomly play a taunt
+        //
+        Event event("dmmessage");
+
+        event.AddInteger(0);
+
+        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+            event.AddString("*5" + str(1 + (rand() % 8)));
+        } else {
+            event.AddString("*4" + str(1 + (rand() % 9)));
+        }
+
+        controlledEnt->ProcessEvent(event);
+
+        m_iNextTauntTime = level.inttime + 5000;
+    }
+}
+
+void BotController::EventStuffText(const str& text)
+{
+    SendCommand(text);
+}
+
+void BotController::setControlledEntity(Player *player)
+{
+    controlledEnt = player;
+    movement.SetControlledEntity(player);
+    rotation.SetControlledEntity(player);
+
+    delegateHandle_gotKill = player->delegate_gotKill.Add(std::bind(&BotController::GotKill, this, std::placeholders::_1));
+    delegateHandle_killed = player->delegate_killed.Add(std::bind(&BotController::Killed, this, std::placeholders::_1));
+    delegateHandle_stufftext = player->delegate_stufftext.Add(std::bind(&BotController::EventStuffText, this, std::placeholders::_1));
+}
+
+Player *BotController::getControlledEntity() const
+{
+    return controlledEnt;
+}
+
+BotController *BotControllerManager::createController(Player *player)
+{
+    BotController *controller = new BotController();
+    controller->setControlledEntity(player);
+
+    controllers.AddObject(controller);
+
+    return controller;
+}
+
+void BotControllerManager::removeController(BotController *controller)
+{
+    controllers.RemoveObject(controller);
+    delete controller;
+}
+
+BotController *BotControllerManager::findController(Entity *ent)
+{
+    int i;
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        if (controller->getControlledEntity() == ent) {
+            return controller;
+        }
+    }
+
+    return nullptr;
+}
+
+const Container<BotController *>& BotControllerManager::getControllers() const
+{
+    return controllers;
+}
+
+BotControllerManager::~BotControllerManager()
+{
+    Cleanup();
+}
+
+void BotControllerManager::Init()
+{
+    BotController::Init();
+}
+
+void BotControllerManager::Cleanup()
+{
+    int i;
+
+    BotController::Init();
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        delete controller;
+    }
+
+    controllers.FreeObjectList();
+}
+
+void BotControllerManager::ThinkControllers()
+{
+    int i;
+
+    // Delete controllers that don't have associated player entity
+    // This cannot happen unless some mods remove them
+    for (i = controllers.NumObjects(); i > 0; i--) {
+        BotController* controller = controllers.ObjectAt(i);
+        if (!controller->getControlledEntity()) {
+            gi.DPrintf("Bot %d has no associated player entity. This shouldn't happen unless the entity has been removed by a script. The controller will be removed, please fix.\n", i);
+
+            // Remove the controller, it will be recreated later to match `sv_numbots`
+            delete controller;
+            controllers.RemoveObjectAt(i);
+        }
+    }
+
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        BotController *controller = controllers.ObjectAt(i);
+        controller->Think();
+    }
 }
diff --git a/code/fgame/playerbot.h b/code/fgame/playerbot.h
index 7664c3ab..6d67fab3 100644
--- a/code/fgame/playerbot.h
+++ b/code/fgame/playerbot.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,156 +21,270 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // playerbot.h: Multiplayer bot system.
 
-#ifndef __PLAYERBOT_H__
-#define __PLAYERBOT_H__
+#pragma once
 
 #include "player.h"
 #include "navigate.h"
 #include "actorpath.h"
 
-#define MAX_BOT_FUNCTIONS			5
+#define MAX_BOT_FUNCTIONS 5
 
 typedef struct nodeAttract_s {
-	float				m_fRespawnTime;
-	AttractiveNodePtr	m_pNode;
+    float             m_fRespawnTime;
+    AttractiveNodePtr m_pNode;
 } nodeAttract_t;
 
-class PlayerBot : public Player
+class BotController;
+
+class BotMovement
 {
-	struct botfunc_t {
-		bool		( PlayerBot::*CheckCondition )( void );
-		void		( PlayerBot::*BeginState )( void );
-		void		( PlayerBot::*EndState )( void );
-		void		( PlayerBot::*ThinkState )( void );
-	};
-
-private:
-	static botfunc_t botfuncs[];
-
-	// Paths
-	ActorPath			m_Path;
-	Vector				m_vTargetPos;
-	Vector				m_vCurrentGoal;
-	Vector				m_vLastValidDir;
-	Vector				m_vLastValidGoal;
-	bool				m_bPathing;
-	bool				m_bTempAway;
-	bool				m_bAimPath;
-	bool				m_bDeltaMove;
-	int					m_iTempAwayTime;
-	int					m_iCheckPathTime;
-	AttractiveNodePtr	m_pPrimaryAttract;
-	float				m_fAttractTime;
-	Container< nodeAttract_t * > m_attractList;
-
-	// States
-	int					m_iCuriousTime;
-	int					m_iAttackTime;
-	Vector				m_vLastCuriousPos;
-	Vector				m_vOldEnemyPos;
-	Vector				m_vLastEnemyPos;
-	Vector				m_vLastDeathPos;
-	SafePtr< Sentient >	m_pEnemy;
-
-	// Input
-	usercmd_t	m_botCmd;
-	usereyes_t	m_botEyes;
-
-	// Direction
-	Vector	m_vTargetAng;
-	Vector	m_vCurrentAng;
-	Vector	m_vAngSpeed;
-	float	m_fYawSpeedMult;
-
-	// States
-	int					m_StateCount;
-	unsigned int		m_StateFlags;
-	ScriptThreadLabel	m_RunLabel;
-
-private:
-	void			CheckAttractiveNodes( void );
-	void			MoveThink( void );
-	void			TurnThink( void );
-	void			CheckEndPos( void );
-	void			CheckJump( void );
-	void			CheckUse( void );
-
-	void			State_DefaultBegin( void );
-	void			State_DefaultEnd( void );
-	void			State_Reset( void );
-
-	static void		InitState_Idle( botfunc_t *func );
-	bool			CheckCondition_Idle( void );
-	void			State_BeginIdle( void );
-	void			State_EndIdle( void );
-	void			State_Idle( void );
-
-	static void		InitState_Curious( botfunc_t *func );
-	bool			CheckCondition_Curious( void );
-	void			State_BeginCurious( void );
-	void			State_EndCurious( void );
-	void			State_Curious( void );
-
-	static void		InitState_Attack( botfunc_t *func );
-	bool			CheckCondition_Attack( void );
-	void			State_BeginAttack( void );
-	void			State_EndAttack( void );
-	void			State_Attack( void );
-
-	static void		InitState_Grenade( botfunc_t *func );
-	bool			CheckCondition_Grenade( void );
-	void			State_BeginGrenade( void );
-	void			State_EndGrenade( void );
-	void			State_Grenade( void );
-
-	static void		InitState_Weapon( botfunc_t *func );
-	bool			CheckCondition_Weapon( void );
-	void			State_BeginWeapon( void );
-	void			State_EndWeapon( void );
-	void			State_Weapon( void );
-
-	void			CheckStates( void );
-
 public:
-	CLASS_PROTOTYPE( PlayerBot );
+    BotMovement();
 
-	PlayerBot();
+    void SetControlledEntity(Player *newEntity);
 
-	static void		Init( void );
+    void MoveThink(usercmd_t& botcmd);
 
-	void			GetEyeInfo( usereyes_t *eyeinfo );
-	void			GetUsercmd( usercmd_t *ucmd );
-	void			SetTargetAngles( Vector vAngles );
+    void AvoidPath(
+        Vector vPos,
+        float  fAvoidRadius,
+        Vector vPreferredDir = vec_zero,
+        float *vLeashHome    = NULL,
+        float  fLeashRadius  = 0.0f
+    );
+    void MoveNear(Vector vNear, float fRadius, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
+    void MoveTo(Vector vPos, float *vLeashHome = NULL, float fLeashRadius = 0.0f);
+    bool MoveToBestAttractivePoint(int iMinPriority = 0);
 
-	void			UpdateBotStates( void );
-	void			CheckReload( void );
+    bool CanMoveTo(Vector vPos);
+    bool MoveDone();
+    bool IsMoving(void);
+    void ClearMove(void);
 
-	void			AimAt( Vector vPos );
-	void			AimAtAimNode( void );
+    Vector GetCurrentGoal() const;
 
-	void			AvoidPath( Vector vPos, float fAvoidRadius, Vector vPreferredDir = vec_zero, float *vLeashHome = NULL, float fLeashRadius = 0.0f );
-	void			MoveNear( Vector vNear, float fRadius, float *vLeashHome = NULL, float fLeashRadius = 0.0f );
-	void			MoveTo( Vector vPos, float *vLeashHome = NULL, float fLeashRadius = 0.0f );
-	bool			MoveToBestAttractivePoint( int iMinPriority = 0 );
+private:
+    void CheckAttractiveNodes();
+    void CheckEndPos(Entity *entity);
+    void CheckJump(usercmd_t& botcmd);
+    void NewMove();
 
-	bool			CanMoveTo( Vector vPos );
-	bool			MoveDone( void );
-	bool			IsMoving( void );
-	void			ClearMove( void );
+private:
+    SafePtr<Player>            controlledEntity;
+    AttractiveNodePtr          m_pPrimaryAttract;
+    Container<nodeAttract_t *> m_attractList;
+    ActorPath                  m_Path;
 
-	void			NoticeEvent( Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared );
-	void			ClearEnemy( void );
-
-	void			SendCommand( const char *text );
-
-	void			setAngles( Vector angles ) override;
-	void			updateOrigin( void ) override;
-
-	void			Spawned( void ) override;
-
-	void			Killed( Event *ev );
-	void			GotKill( Event *ev );
-	void			EventStuffText( Event *ev );
+    Vector m_vCurrentOrigin;
+    Vector m_vTargetPos;
+    Vector m_vCurrentGoal;
+    Vector m_vLastValidDir;
+    Vector m_vLastValidGoal;
+    Vector m_vLastCheckPos[2];
+    float  m_fAttractTime;
+    int    m_iTempAwayTime;
+    int    m_iNumBlocks;
+    int    m_iCheckPathTime;
+    bool   m_bPathing;
+    bool   m_bTempAway;
 };
 
-#endif /* playerbot.h */
+class BotRotation
+{
+public:
+    BotRotation();
+
+    void SetControlledEntity(Player *newEntity);
+
+    void          TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo);
+    const Vector& GetTargetAngles() const;
+    void          SetTargetAngles(Vector vAngles);
+    void          AimAt(Vector vPos);
+
+private:
+    SafePtr<Player> controlledEntity;
+
+    Vector m_vTargetAng;
+    Vector m_vCurrentAng;
+    Vector m_vAngSpeed;
+    float  m_fYawSpeedMult;
+};
+
+class BotState
+{
+public:
+    virtual bool CheckCondition() const = 0;
+    virtual void Begin()                = 0;
+    virtual void End()                  = 0;
+    virtual void Think()                = 0;
+};
+
+class BotController : public Listener
+{
+public:
+    struct botfunc_t {
+        bool (BotController::*CheckCondition)(void);
+        void (BotController::*BeginState)(void);
+        void (BotController::*EndState)(void);
+        void (BotController::*ThinkState)(void);
+    };
+
+private:
+    static botfunc_t botfuncs[];
+
+    BotMovement movement;
+    BotRotation rotation;
+
+    // States
+    int               m_iCuriousTime;
+    int               m_iAttackTime;
+    int               m_iConfirmTime;
+    int               m_iAttackStopAimTime;
+    Vector            m_vLastCuriousPos;
+    Vector            m_vNewCuriousPos;
+    Vector            m_vOldEnemyPos;
+    Vector            m_vLastEnemyPos;
+    Vector            m_vLastDeathPos;
+    SafePtr<Sentient> m_pEnemy;
+    int               m_iEnemyEyesTag;
+
+    // Input
+    usercmd_t  m_botCmd;
+    usereyes_t m_botEyes;
+
+    // States
+    int               m_StateCount;
+    unsigned int      m_StateFlags;
+    ScriptThreadLabel m_RunLabel;
+
+    // Taunts
+    int m_iNextTauntTime;
+
+private:
+    DelegateHandle delegateHandle_gotKill;
+    DelegateHandle delegateHandle_killed;
+    DelegateHandle delegateHandle_stufftext;
+
+private:
+    Weapon* FindWeaponWithAmmo(void);
+    Weapon* FindMeleeWeapon(void);
+    void UseWeaponWithAmmo(void);
+
+    void CheckUse(void);
+    void CheckValidWeapon(void);
+
+    void State_DefaultBegin(void);
+    void State_DefaultEnd(void);
+    void State_Reset(void);
+
+    static void InitState_Idle(botfunc_t *func);
+    bool        CheckCondition_Idle(void);
+    void        State_BeginIdle(void);
+    void        State_EndIdle(void);
+    void        State_Idle(void);
+
+    static void InitState_Curious(botfunc_t *func);
+    bool        CheckCondition_Curious(void);
+    void        State_BeginCurious(void);
+    void        State_EndCurious(void);
+    void        State_Curious(void);
+
+    static void InitState_Attack(botfunc_t *func);
+    bool        CheckCondition_Attack(void);
+    void        State_BeginAttack(void);
+    void        State_EndAttack(void);
+    void        State_Attack(void);
+    bool        IsValidEnemy(Sentient *sent) const;
+
+    static void InitState_Grenade(botfunc_t *func);
+    bool        CheckCondition_Grenade(void);
+    void        State_BeginGrenade(void);
+    void        State_EndGrenade(void);
+    void        State_Grenade(void);
+
+    static void InitState_Weapon(botfunc_t *func);
+    bool        CheckCondition_Weapon(void);
+    void        State_BeginWeapon(void);
+    void        State_EndWeapon(void);
+    void        State_Weapon(void);
+
+    void CheckStates(void);
+
+public:
+    CLASS_PROTOTYPE(BotController);
+
+    BotController();
+    ~BotController();
+
+    static void Init(void);
+
+    void GetEyeInfo(usereyes_t *eyeinfo);
+    void GetUsercmd(usercmd_t *ucmd);
+
+    void UpdateBotStates(void);
+    void CheckReload(void);
+
+    void AimAtAimNode(void);
+
+    void NoticeEvent(Vector vPos, int iType, Entity *pEnt, float fDistanceSquared, float fRadiusSquared);
+    void ClearEnemy(void);
+
+    void SendCommand(const char *text);
+
+    void Think();
+
+    void Spawned(void);
+
+    void Killed(const Event& ev);
+    void GotKill(const Event& ev);
+    void EventStuffText(const str& text);
+
+    BotMovement& GetMovement();
+
+public:
+    void    setControlledEntity(Player *player);
+    Player *getControlledEntity() const;
+
+private:
+    SafePtr<Player> controlledEnt;
+};
+
+class BotControllerManager : public Listener
+{
+public:
+    CLASS_PROTOTYPE(BotControllerManager);
+
+public:
+    ~BotControllerManager();
+
+    BotController                    *createController(Player *player);
+    void                              removeController(BotController *controller);
+    BotController                    *findController(Entity *ent);
+    const Container<BotController *>& getControllers() const;
+
+    void Init();
+    void Cleanup();
+    void ThinkControllers();
+
+private:
+    Container<BotController *> controllers;
+};
+
+class BotManager : public Listener
+{
+public:
+    CLASS_PROTOTYPE(BotManager);
+
+public:
+    BotControllerManager& getControllerManager();
+
+    void Init();
+    void Cleanup();
+    void Frame();
+    void BroadcastEvent(Entity *originator, Vector origin, int iType, float radius);
+
+private:
+    BotControllerManager botControllerManager;
+};
+
+extern BotManager botManager;
diff --git a/code/fgame/playerbot_master.cpp b/code/fgame/playerbot_master.cpp
new file mode 100644
index 00000000..d4cdcd4e
--- /dev/null
+++ b/code/fgame/playerbot_master.cpp
@@ -0,0 +1,114 @@
+#include "playerbot.h"
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_master.cpp: Multiplayer bot system.
+
+#include "g_local.h"
+#include "actor.h"
+#include "playerbot.h"
+#include "consoleevent.h"
+#include "debuglines.h"
+#include "scriptexception.h"
+#include "vehicleturret.h"
+#include "weaputils.h"
+
+BotManager botManager;
+
+CLASS_DECLARATION(Listener, BotControllerManager, NULL) {
+    {NULL, NULL}
+};
+
+CLASS_DECLARATION(Listener, BotManager, NULL) {
+    {NULL, NULL}
+};
+
+void BotManager::Init()
+{
+    botControllerManager.Init();
+}
+
+void BotManager::Cleanup()
+{
+    botControllerManager.Cleanup();
+}
+
+void BotManager::Frame()
+{
+    botControllerManager.ThinkControllers();
+}
+
+void BotManager::BroadcastEvent(Entity *originator, Vector origin, int iType, float radius)
+{
+    Sentient      *ent;
+    Actor         *act;
+    Vector         delta;
+    str            name;
+    float          r2;
+    float          dist2;
+    int            i;
+    int            iNumSentients;
+    int            iAreaNum;
+    BotController *controller;
+
+    if (radius <= 0.0f) {
+        radius = G_AIEventRadius(iType);
+    }
+
+    assert(originator);
+
+    r2 = Square(radius);
+
+    const Container<BotController *>& controllers = getControllerManager().getControllers();
+    for (i = 1; i <= controllers.NumObjects(); i++) {
+        controller = controllers.ObjectAt(i);
+        ent        = controller->getControlledEntity();
+        if (!ent || ent == originator || ent->deadflag) {
+            continue;
+        }
+
+        delta = origin - ent->centroid;
+
+        // dot product returns length squared
+        dist2 = Square(delta);
+
+        if (originator) {
+            iAreaNum = originator->edict->r.areanum;
+        } else {
+            iAreaNum = gi.AreaForPoint(origin);
+        }
+
+        if (dist2 > r2) {
+            continue;
+        }
+
+        if (iAreaNum != ent->edict->r.areanum && !gi.AreasConnected(iAreaNum, ent->edict->r.areanum)) {
+            continue;
+        }
+
+        controller->NoticeEvent(origin, iType, originator, dist2, r2);
+    }
+}
+
+BotControllerManager& BotManager::getControllerManager()
+{
+    return botControllerManager;
+}
diff --git a/code/fgame/playerbot_movement.cpp b/code/fgame/playerbot_movement.cpp
new file mode 100644
index 00000000..03e402f0
--- /dev/null
+++ b/code/fgame/playerbot_movement.cpp
@@ -0,0 +1,635 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_movement.cpp: Manages bot movements
+
+#include "playerbot.h"
+#include "debuglines.h"
+
+BotMovement::BotMovement()
+{
+    controlledEntity = NULL;
+
+    m_Path.SetFallHeight(400);
+    m_bPathing     = false;
+    m_bTempAway    = false;
+    m_fAttractTime = 0;
+
+    m_iCheckPathTime = 0;
+    m_iTempAwayTime  = 0;
+    m_iNumBlocks     = 0;
+}
+
+void BotMovement::SetControlledEntity(Player *newEntity)
+{
+    controlledEntity = newEntity;
+}
+
+void BotMovement::MoveThink(usercmd_t& botcmd)
+{
+    Vector vDir;
+    Vector vAngles;
+    Vector vWishDir;
+
+    botcmd.forwardmove = 0;
+    botcmd.rightmove   = 0;
+
+    CheckAttractiveNodes();
+
+    if (!IsMoving()) {
+        return;
+    }
+
+    if (level.inttime >= m_Path.Time() + 1000 && m_vCurrentOrigin != controlledEntity->origin) {
+        m_vCurrentOrigin = controlledEntity->origin;
+
+        if (m_Path.CurrentNode()) {
+            // recalculate paths because of a new origin
+            m_Path.ReFindPath(controlledEntity->origin, controlledEntity);
+        }
+    }
+
+    if (m_bTempAway && level.inttime >= m_iTempAwayTime) {
+        m_bTempAway = false;
+        m_Path.FindPath(controlledEntity->origin, m_vTargetPos, controlledEntity, 0, NULL, 0);
+    }
+
+    if (!m_bTempAway) {
+        if (m_Path.CurrentNode()) {
+            m_Path.UpdatePos(controlledEntity->origin, 8);
+
+            m_vCurrentGoal = controlledEntity->origin;
+            VectorAdd2D(m_vCurrentGoal, m_Path.CurrentDelta(), m_vCurrentGoal);
+
+            if (MoveDone()) {
+                // Clear the path
+                m_Path.Clear();
+            }
+        }
+    }
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(controlledEntity->centroid, m_vCurrentGoal + Vector(0, 0, 36), 1, 1, 0, 1);
+    }
+
+    // Check if we're blocked
+    if (level.inttime >= m_iCheckPathTime) {
+        m_iCheckPathTime = level.inttime + 1000;
+
+        if (m_iNumBlocks >= 5) {
+            // Give up
+            ClearMove();
+        }
+
+        m_bTempAway = false;
+
+        if (controlledEntity->groundentity || controlledEntity->client->ps.walking) {
+            if (controlledEntity->GetMoveResult() >= MOVERESULT_BLOCKED
+                || controlledEntity->velocity.lengthSquared() <= Square(8)) {
+                m_bTempAway = true;
+            } else if ((controlledEntity->origin - m_vLastCheckPos[0]).lengthSquared() <= Square(32)
+                       && (controlledEntity->origin - m_vLastCheckPos[1]).lengthSquared() <= Square(32)) {
+                m_bTempAway = true;
+            }
+        } else {
+            // falling
+            if (controlledEntity->GetMoveResult() >= MOVERESULT_BLOCKED) {
+                // stuck while falling
+                m_bTempAway = true;
+            }
+        }
+
+        if (m_bTempAway) {
+            Vector nextPos;
+            Vector dir;
+
+            m_bTempAway     = true;
+            m_iTempAwayTime = level.inttime + 750;
+            m_iNumBlocks++;
+
+            // Try to backward a little
+            if (m_Path.CurrentNode()) {
+                nextPos = m_Path.CurrentNode()->point;
+            } else {
+                nextPos = m_vTargetPos;
+            }
+
+            m_Path.Clear();
+            m_Path.ForceShortLookahead();
+
+            if (rand() % 10 != 0) {
+                dir = nextPos - controlledEntity->origin;
+                dir.z = 0;
+                dir.normalize();
+
+                if (dir.x < -0.5 || dir.x > 0.5) {
+                    dir.x *= 4;
+                    dir.y /= 4;
+                } else if (dir.y < -0.5 || dir.y > 0.5) {
+                    dir.x /= 4;
+                    dir.y *= 4;
+                } else {
+                    dir.x = G_CRandom(2);
+                    dir.y = G_CRandom(2);
+                }
+
+                m_vCurrentGoal = nextPos + dir * 128;
+            } else {
+                m_vCurrentGoal = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+            }
+
+        } else {
+            m_iNumBlocks = 0;
+
+            if (!m_Path.CurrentNode()) {
+                m_vTargetPos   = controlledEntity->origin + Vector(G_CRandom(512), G_CRandom(512), G_CRandom(512));
+                m_vCurrentGoal = m_vTargetPos;
+            }
+        }
+
+        m_vLastCheckPos[1] = m_vLastCheckPos[0];
+        m_vLastCheckPos[0] = controlledEntity->origin;
+    }
+
+    if (ai_debugpath->integer) {
+        PathInfo *pos = m_Path.CurrentNode();
+
+        if (pos != NULL) {
+            while (pos != m_Path.LastNode()) {
+                Vector vStart = pos->point + Vector(0, 0, 32);
+
+                pos--;
+
+                Vector vEnd = pos->point + Vector(0, 0, 32);
+
+                G_DebugLine(vStart, vEnd, 1, 0, 0, 1);
+            }
+        }
+    }
+
+    if (m_Path.CurrentNode()) {
+        if ((m_vTargetPos - controlledEntity->origin).lengthSquared() <= Square(16)) {
+            ClearMove();
+        }
+    } else {
+        if ((m_vTargetPos - controlledEntity->origin).lengthXYSquared() <= Square(16)) {
+            ClearMove();
+        }
+    }
+
+    // Rotate the dir
+    if (m_Path.CurrentNode()) {
+        vDir[0] = m_Path.CurrentDelta()[0];
+        vDir[1] = m_Path.CurrentDelta()[1];
+    } else {
+        vDir = m_vCurrentGoal - controlledEntity->origin;
+    }
+    vDir[2] = 0;
+
+    VectorNormalize2D(vDir);
+    vAngles = vDir.toAngles() - controlledEntity->angles;
+    vAngles.AngleVectorsLeft(&vWishDir);
+
+    m_vLastValidDir  = vDir;
+    m_vLastValidGoal = m_vCurrentGoal;
+
+    // Forward to the specified direction
+    float x = vWishDir.x * 127;
+    float y = -vWishDir.y * 127;
+
+    botcmd.forwardmove = (signed char)Q_clamp(x, -127, 127);
+    botcmd.rightmove   = (signed char)Q_clamp(y, -127, 127);
+
+    CheckJump(botcmd);
+}
+
+void BotMovement::CheckAttractiveNodes()
+{
+    for (int i = m_attractList.NumObjects(); i > 0; i--) {
+        nodeAttract_t *a = m_attractList.ObjectAt(i);
+
+        if (a->m_pNode == NULL || !a->m_pNode->CheckTeam(controlledEntity) || level.time > a->m_fRespawnTime) {
+            delete a;
+            m_attractList.RemoveObjectAt(i);
+        }
+    }
+}
+
+void BotMovement::CheckEndPos(Entity *entity)
+{
+    Vector  start;
+    Vector  end;
+    trace_t trace;
+
+    if (!m_Path.LastNode()) {
+        return;
+    }
+
+    start = m_Path.LastNode()->point;
+    end   = m_vTargetPos;
+
+    trace =
+        G_Trace(start, entity->mins, entity->maxs, end, entity, MASK_TARGETPATH, true, "BotController::CheckEndPos");
+
+    if (trace.fraction < 0.95f) {
+        m_vTargetPos = trace.endpos;
+    }
+}
+
+void BotMovement::CheckJump(usercmd_t& botcmd)
+{
+    Vector  start;
+    Vector  end;
+    Vector  dir;
+    trace_t trace;
+
+    if (controlledEntity->GetLadder()) {
+        if (!botcmd.upmove) {
+            botcmd.upmove = 127;
+        } else {
+            botcmd.upmove = 0;
+        }
+        return;
+    }
+
+    dir = m_vLastValidDir;
+
+    start = controlledEntity->origin + Vector(0, 0, STEPSIZE);
+    end =
+        controlledEntity->origin + Vector(0, 0, STEPSIZE) + dir * (controlledEntity->maxs.y - controlledEntity->mins.y);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    // Check if the bot needs to jump
+    trace = G_Trace(
+        start,
+        controlledEntity->mins,
+        controlledEntity->maxs,
+        end,
+        controlledEntity,
+        MASK_PLAYERSOLID,
+        false,
+        "BotController::CheckJump"
+    );
+
+    // No need to jump
+    if (trace.fraction > 0.5f) {
+        botcmd.upmove = 0;
+        return;
+    }
+
+    start = controlledEntity->origin;
+    end   = controlledEntity->origin + Vector(0, 0, STEPSIZE * 3);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    // Check if the bot can jump up
+    trace = G_Trace(
+        start,
+        controlledEntity->mins,
+        controlledEntity->maxs,
+        end,
+        controlledEntity,
+        MASK_PLAYERSOLID,
+        true,
+        "BotController::CheckJump"
+    );
+
+    start = trace.endpos;
+    end   = trace.endpos + dir * (controlledEntity->maxs.y - controlledEntity->mins.y);
+
+    if (ai_debugpath->integer) {
+        G_DebugLine(start, end, 1, 0, 1, 1);
+    }
+
+    Vector bounds[2];
+    bounds[0] = Vector(controlledEntity->mins[0], controlledEntity->mins[1], 0);
+    bounds[1] = Vector(
+        controlledEntity->maxs[0],
+        controlledEntity->maxs[1],
+        (controlledEntity->maxs[0] + controlledEntity->maxs[1]) * 0.5
+    );
+
+    // Check if the bot can jump at the location
+    trace = G_Trace(
+        start, bounds[0], bounds[1], end, controlledEntity, MASK_PLAYERSOLID, false, "BotController::CheckJump"
+    );
+
+    if (trace.fraction < 1) {
+        botcmd.upmove = 0;
+        return;
+    }
+
+    // Make the bot climb walls
+    if (!botcmd.upmove) {
+        botcmd.upmove = 127;
+    } else {
+        botcmd.upmove = 0;
+    }
+}
+
+/*
+====================
+AvoidPath
+
+Avoid the specified position within the radius and start from a direction
+====================
+*/
+void BotMovement::AvoidPath(
+    Vector vAvoid, float fAvoidRadius, Vector vPreferredDir, float *vLeashHome, float fLeashRadius
+)
+{
+    Vector vDir;
+
+    if (vPreferredDir == vec_zero) {
+        vDir = controlledEntity->origin - vAvoid;
+        VectorNormalizeFast(vDir);
+    } else {
+        vDir = vPreferredDir;
+    }
+
+    m_Path.FindPathAway(
+        controlledEntity->origin, vAvoid, vDir, controlledEntity, fAvoidRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        // Random movements
+        m_vTargetPos = controlledEntity->origin + Vector(G_Random(256) - 128, G_Random(256) - 128, G_Random(256) - 128);
+        m_vCurrentGoal = m_vTargetPos;
+        return;
+    }
+
+    m_vTargetPos = m_Path.LastNode()->point;
+}
+
+/*
+====================
+MoveNear
+
+Move near the specified position within the radius
+====================
+*/
+void BotMovement::MoveNear(Vector vNear, float fRadius, float *vLeashHome, float fLeashRadius)
+{
+    m_Path.FindPathNear(
+        controlledEntity->origin, vNear, controlledEntity, 0, fRadius * fRadius, vLeashHome, fLeashRadius * fLeashRadius
+    );
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        m_bPathing = false;
+        return;
+    }
+
+    m_vTargetPos = m_Path.LastNode()->point;
+}
+
+/*
+====================
+MoveTo
+
+Move to the specified position
+====================
+*/
+void BotMovement::MoveTo(Vector vPos, float *vLeashHome, float fLeashRadius)
+{
+    m_vTargetPos = vPos;
+    m_Path.FindPath(
+        controlledEntity->origin, m_vTargetPos, controlledEntity, 0, vLeashHome, fLeashRadius * fLeashRadius
+    );
+
+    NewMove();
+
+    if (!m_Path.CurrentNode()) {
+        m_bPathing = false;
+        return;
+    }
+
+    CheckEndPos(controlledEntity);
+}
+
+/*
+====================
+MoveToBestAttractivePoint
+
+Move to the nearest attractive point with a minimum priority
+Returns true if no attractive point was found
+====================
+*/
+bool BotMovement::MoveToBestAttractivePoint(int iMinPriority)
+{
+    Container<AttractiveNode *> list;
+    AttractiveNode             *bestNode;
+    float                       bestDistanceSquared;
+    int                         bestPriority;
+
+    if (m_pPrimaryAttract) {
+        MoveTo(m_pPrimaryAttract->origin);
+
+        if (!IsMoving()) {
+            m_pPrimaryAttract = NULL;
+        } else {
+            if (MoveDone()) {
+                if (!m_fAttractTime) {
+                    m_fAttractTime = level.time + m_pPrimaryAttract->m_fMaxStayTime;
+                }
+                if (level.time > m_fAttractTime) {
+                    nodeAttract_t *a  = new nodeAttract_t;
+                    a->m_fRespawnTime = level.time + m_pPrimaryAttract->m_fRespawnTime;
+                    a->m_pNode        = m_pPrimaryAttract;
+
+                    m_pPrimaryAttract = NULL;
+                }
+            }
+
+            return true;
+        }
+    }
+
+    if (!attractiveNodes.NumObjects()) {
+        return false;
+    }
+
+    bestNode            = NULL;
+    bestDistanceSquared = 99999999.0f;
+    bestPriority        = iMinPriority;
+
+    for (int i = attractiveNodes.NumObjects(); i > 0; i--) {
+        AttractiveNode *node = attractiveNodes.ObjectAt(i);
+        float           distSquared;
+        bool            m_bRespawning = false;
+
+        for (int j = m_attractList.NumObjects(); j > 0; j--) {
+            AttractiveNode *node2 = m_attractList.ObjectAt(j)->m_pNode;
+
+            if (node2 == node) {
+                m_bRespawning = true;
+                break;
+            }
+        }
+
+        if (m_bRespawning) {
+            continue;
+        }
+
+        if (node->m_iPriority < bestPriority) {
+            continue;
+        }
+
+        if (!node->CheckTeam(controlledEntity)) {
+            continue;
+        }
+
+        distSquared = VectorLengthSquared(controlledEntity->origin - node->origin);
+
+        if (node->m_fMaxDistanceSquared >= 0 && distSquared > node->m_fMaxDistanceSquared) {
+            continue;
+        }
+
+        if (!CanMoveTo(node->origin)) {
+            continue;
+        }
+
+        if (distSquared < bestDistanceSquared) {
+            bestDistanceSquared = distSquared;
+            bestNode            = node;
+            bestPriority        = node->m_iPriority;
+        }
+    }
+
+    if (bestNode) {
+        m_pPrimaryAttract = bestNode;
+        m_fAttractTime    = 0;
+        MoveTo(bestNode->origin);
+        return true;
+    } else {
+        // No attractive point found
+        return false;
+    }
+}
+
+/*
+====================
+NewMove
+
+Called when there is a new move
+====================
+*/
+void BotMovement::NewMove()
+{
+    m_bPathing         = true;
+    m_vLastCheckPos[0] = controlledEntity->origin;
+    m_vLastCheckPos[1] = controlledEntity->origin;
+}
+
+/*
+====================
+CanMoveTo
+
+Returns true if the bot has done moving
+====================
+*/
+bool BotMovement::CanMoveTo(Vector vPos)
+{
+    return m_Path.DoesTheoreticPathExist(controlledEntity->origin, vPos, NULL, 0, NULL, 0);
+}
+
+/*
+====================
+MoveDone
+
+Returns true if the bot has done moving
+====================
+*/
+bool BotMovement::MoveDone()
+{
+    PathInfo *next;
+
+    if (!m_bPathing) {
+        return true;
+    }
+
+    if (m_bTempAway) {
+        return false;
+    }
+
+    if (!m_Path.CurrentNode()) {
+        return true;
+    }
+
+    Vector delta = Vector(m_Path.CurrentPathGoal()) - controlledEntity->origin;
+    if (delta.lengthXYSquared() < Square(16) && delta.z < controlledEntity->maxs.z) {
+        return true;
+    }
+
+    return false;
+}
+
+/*
+====================
+IsMoving
+
+Returns true if the bot has a current path
+====================
+*/
+bool BotMovement::IsMoving(void)
+{
+    return m_bPathing;
+}
+
+/*
+====================
+ClearMove
+
+Stop the bot from moving
+====================
+*/
+void BotMovement::ClearMove(void)
+{
+    m_Path.Clear();
+    m_bPathing   = false;
+    m_iNumBlocks = 0;
+}
+
+/*
+====================
+GetCurrentGoal
+
+Return the current goal, usually the nearest node the player should look at
+====================
+*/
+Vector BotMovement::GetCurrentGoal() const
+{
+    if (!m_Path.CurrentNode()) {
+        return m_vCurrentGoal;
+    }
+
+    if (!m_Path.Complete(controlledEntity->origin)) {
+        return controlledEntity->origin + Vector(m_Path.CurrentDelta()[0], m_Path.CurrentDelta()[1], 0);
+    }
+
+    return controlledEntity->origin;
+}
diff --git a/code/fgame/playerbot_rotation.cpp b/code/fgame/playerbot_rotation.cpp
new file mode 100644
index 00000000..0228be21
--- /dev/null
+++ b/code/fgame/playerbot_rotation.cpp
@@ -0,0 +1,139 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// playerbot_rotation.cpp: Manages bot rotation
+
+#include "playerbot.h"
+
+BotRotation::BotRotation()
+{
+    m_vAngSpeed     = vec_zero;
+    m_vTargetAng    = vec_zero;
+    m_vCurrentAng   = vec_zero;
+    m_fYawSpeedMult = 1.0f;
+}
+
+void BotRotation::SetControlledEntity(Player *newEntity)
+{
+    controlledEntity = newEntity;
+}
+
+float AngleDifference(float ang1, float ang2)
+{
+    float diff;
+
+    diff = ang1 - ang2;
+    if (ang1 > ang2) {
+        if (diff > 180.0) {
+            diff -= 360.0;
+        }
+    } else {
+        if (diff < -180.0) {
+            diff += 360.0;
+        }
+    }
+    return diff;
+}
+
+void BotRotation::TurnThink(usercmd_t& botcmd, usereyes_t& eyeinfo)
+{
+    float diff, factor, maxchange, anglespeed, desired_speed;
+    int   i;
+
+    if (m_vTargetAng[PITCH] > 180) {
+        m_vTargetAng[PITCH] -= 360;
+    }
+
+    factor    = 0.5f;
+    maxchange = 360;
+
+    if (maxchange < 240) {
+        maxchange = 240;
+    }
+
+    maxchange *= level.frametime;
+
+    for (i = 0; i < 2; i++) {
+        //over reaction view model
+        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
+        m_vTargetAng[i]  = AngleMod(m_vTargetAng[i]);
+        diff             = AngleDifference(m_vCurrentAng[i], m_vTargetAng[i]);
+        desired_speed    = diff * factor;
+
+        m_vAngSpeed[i] = Q_clamp_float(m_vAngSpeed[i] + (m_vAngSpeed[i] - desired_speed), -180, 180);
+        anglespeed     = Q_clamp_float(m_vAngSpeed[i], -maxchange, maxchange);
+
+        m_vCurrentAng[i] += anglespeed;
+        m_vCurrentAng[i] = AngleMod(m_vCurrentAng[i]);
+
+        //damping
+        m_vAngSpeed[i] *= 0.2 * (1 - factor);
+    }
+
+    if (m_vCurrentAng[PITCH] > 180) {
+        m_vCurrentAng[PITCH] -= 360;
+    }
+
+    eyeinfo.angles[0] = m_vCurrentAng[0];
+    eyeinfo.angles[1] = m_vCurrentAng[1];
+    botcmd.angles[0]  = ANGLE2SHORT(m_vCurrentAng[0]) - controlledEntity->client->ps.delta_angles[0];
+    botcmd.angles[1]  = ANGLE2SHORT(m_vCurrentAng[1]) - controlledEntity->client->ps.delta_angles[1];
+    botcmd.angles[2]  = ANGLE2SHORT(m_vCurrentAng[2]) - controlledEntity->client->ps.delta_angles[2];
+}
+
+/*
+====================
+GetTargetAngles
+
+Return the target angle
+====================
+*/
+const Vector& BotRotation::GetTargetAngles() const
+{
+    return m_vTargetAng;
+}
+
+/*
+====================
+SetTargetAngles
+
+Set the bot's angle
+====================
+*/
+void BotRotation::SetTargetAngles(Vector vAngles)
+{
+    m_vTargetAng = vAngles;
+}
+
+/*
+====================
+AimAt
+
+Make the bot face to the specified direction
+====================
+*/
+void BotRotation::AimAt(Vector vPos)
+{
+    Vector vDelta = vPos - controlledEntity->EyePosition();
+
+    VectorNormalize(vDelta);
+    vectoangles(vDelta, m_vTargetAng);
+}
diff --git a/code/renderergl2/new/tr_world.c b/code/fgame/playerbot_strategy.cpp
similarity index 84%
rename from code/renderergl2/new/tr_world.c
rename to code/fgame/playerbot_strategy.cpp
index 2f55db4f..db8e8b83 100644
--- a/code/renderergl2/new/tr_world.c
+++ b/code/fgame/playerbot_strategy.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../tr_local.h"
+#include "g_local.h"
+#include "playerbot_strategy.h"
 
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
-{
-    // FIXME: unimplemented
-}
\ No newline at end of file
+CLASS_DECLARATION(SimpleEntity, NavigationPoint, NULL) {
+    {NULL, NULL}
+};
diff --git a/code/renderergl2/new/tr_bsp.c b/code/fgame/playerbot_strategy.h
similarity index 76%
rename from code/renderergl2/new/tr_bsp.c
rename to code/fgame/playerbot_strategy.h
index dacb52d7..8352e1f9 100644
--- a/code/renderergl2/new/tr_bsp.c
+++ b/code/fgame/playerbot_strategy.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -19,16 +19,19 @@ along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
+// playerbot_strategy.h: Bot strategy & navigation points
 
-#include "../tr_local.h"
+#pragma once
 
-int RE_MapVersion(void)
+#include "simpleentity.h"
+
+//
+// Abstract class for navigation points
+//
+class NavigationPoint : public SimpleEntity
 {
-    // FIXME: unimplemented
-    return 0;
-}
+public:
+    CLASS_PROTOTYPE(NavigationPoint);
 
-void RE_PrintBSPFileSizes(void)
-{
-    // FIXME: unimplemented
-}
+    // TODO
+};
diff --git a/code/fgame/playerstart.h b/code/fgame/playerstart.h
index 37beee68..e856a2df 100644
--- a/code/fgame/playerstart.h
+++ b/code/fgame/playerstart.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // PlayerStart.h: Player start location entity declarations
 // 
 
-#ifndef __PLAYERSTART_H__
-#define __PLAYERSTART_H__
+#pragma once
 
 #include "g_local.h"
 #include "simpleentity.h"
@@ -89,5 +88,3 @@ class PlayerIntermission : public Camera
 		CLASS_PROTOTYPE( PlayerIntermission );
       PlayerIntermission();
 	};
-
-#endif /* PlayerStart.h */
diff --git a/code/fgame/portableturret.cpp b/code/fgame/portableturret.cpp
index e57f33ff..718d0bd0 100644
--- a/code/fgame/portableturret.cpp
+++ b/code/fgame/portableturret.cpp
@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "portableturret.h"
 #include "g_spawn.h"
+#include "g_phys.h"
+#include "player.h"
 
 Event EV_CarryableTurret_Drop
 (
@@ -61,23 +63,72 @@ Event EV_CarryableTurret_EnablePickup
 );
 
 CLASS_DECLARATION(InventoryItem, CarryableTurret, NULL) {
-    {&EV_Touch,                        NULL                              },
-    {&EV_Item_Pickup,                  &CarryableTurret::EventPickup     },
-    {&EV_CarryableTurret_Drop,         &CarryableTurret::DropTurret      },
-    {&EV_CarryableTurret_TurretTik,    &CarryableTurret::EventTurretTik  },
-    {&EV_CarryableTurret_Place,        &CarryableTurret::EventPlaceTurret},
-    {&EV_CarryableTurret_EnablePickup, &CarryableTurret::EventPickup     },
-    {NULL,                             NULL                              }
+    {&EV_Touch,                        NULL                               },
+    {&EV_Item_Pickup,                  &CarryableTurret::EventPickup      },
+    {&EV_CarryableTurret_Drop,         &CarryableTurret::DropTurret       },
+    {&EV_CarryableTurret_TurretTik,    &CarryableTurret::EventTurretTik   },
+    {&EV_CarryableTurret_Place,        &CarryableTurret::EventPlaceTurret },
+    {&EV_CarryableTurret_EnablePickup, &CarryableTurret::EventEnablePickup},
+    {NULL,                             NULL                               }
 };
 
 CarryableTurret::CarryableTurret()
 {
-    // FIXME: unimplemented
+    if (LoadingSavegame) {
+        return;
+    }
+
+    if (spawnflags & 1) {
+        Event *ev = new Event(EV_CarryableTurret_Place);
+        ev->AddInteger(1);
+
+        PostEvent(ev, EV_POSTSPAWN);
+    }
+
+    isPickable = true;
 }
 
 void CarryableTurret::EventPickup(Event *ev)
 {
-    // FIXME: unimplemented
+    Entity   *ent;
+    Sentient *sent;
+    Item     *item;
+    Weapon   *activeWeap;
+
+    if (!isPickable) {
+        return;
+    }
+
+    ent = ev->GetEntity(1);
+    if (!Pickupable(ent)) {
+        // can't be picked up by the entity
+        return;
+    }
+
+    sent = static_cast<Sentient *>(ent);
+    if (sent->HasItem(item_name)) {
+        // already in possession of the carryable turret
+        return;
+    }
+
+    item = ItemPickup(sent);
+    if (!item) {
+        // couldn't pick it up
+        return;
+    }
+
+    if (!item->GetOwner()) {
+        // invalid owner?!
+        return;
+    }
+
+    activeWeap = item->GetOwner()->GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeap && activeWeap != item) {
+        activeWeap->DetachFromOwner();
+    }
+
+    // make the sentient use the carryable turret
+    item->GetOwner()->ChangeWeapon(static_cast<Weapon *>(item), WEAPON_MAIN);
 }
 
 qboolean CarryableTurret::Removable(void)
@@ -87,17 +138,37 @@ qboolean CarryableTurret::Removable(void)
 
 void CarryableTurret::DetachFromOwner(void)
 {
-    // FIXME: unimplemented
+    Weapon::DetachFromOwner();
+
+    PostEvent(EV_CarryableTurret_Drop, 0);
 }
 
 void CarryableTurret::AttachToHolster(weaponhand_t hand)
 {
-    // FIXME: unimplemented
+    Weapon::AttachToHolster(hand);
+
+    PostEvent(EV_CarryableTurret_Drop, 0);
 }
 
 void CarryableTurret::DropTurret(Event *ev)
 {
-    // FIXME: unimplemented
+    Weapon   *activeWeap;
+    Sentient *currentOwner;
+
+    if (!owner) {
+        return;
+    }
+
+    currentOwner = owner;
+    activeWeap   = currentOwner->GetActiveWeapon(WEAPON_MAIN);
+    Drop();
+    isPickable = false;
+
+    PostEvent(EV_CarryableTurret_EnablePickup, 1.5f);
+
+    if (activeWeap == this) {
+        currentOwner->edict->s.eFlags |= EF_UNARMED;
+    }
 }
 
 qboolean CarryableTurret::Drop(void)
@@ -113,17 +184,293 @@ qboolean CarryableTurret::Drop(void)
 
 void CarryableTurret::EventTurretTik(Event *ev)
 {
-    // FIXME: unimplemented
+    turretModel = ev->GetString(1);
 }
 
 void CarryableTurret::EventPlaceTurret(Event *ev)
 {
-    // FIXME: unimplemented
+    Event  *newev;
+    Player *ownerP;
+    Entity *placer;
+    Vector  turretAngles, targetPos;
+    Vector  forward, right, up;
+    Vector  endpos, endpos2;
+    Vector  start, end;
+    Vector  mins, maxs;
+    trace_t trace;
+    float   groundAngle;
+    bool    autoPlace = false;
+
+    if (ev->NumArgs() && ev->GetInteger(1)) {
+        autoPlace = true;
+
+        AngleVectors(angles, forward, NULL, NULL);
+        mins  = Vector(-32, -32, 0);
+        maxs  = Vector(32, 32, 32);
+        start = origin;
+        end   = origin - forward * 55;
+
+        trace =
+            G_Trace(start, mins, maxs, end, this, MASK_CARRYABLETURRET, qtrue, "CarryableTurret::EventPlaceTurret1");
+
+        if (trace.startsolid || trace.fraction < 1 || trace.ent) {
+            gi.DPrintf(
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
+                (int)origin[0],
+                (int)origin[1],
+                (int)origin[2]
+            );
+            angles = Vector(-90, 0, 0);
+            setAngles(angles);
+            return;
+        }
+
+        mins  = Vector(-16, -16, 0);
+        maxs  = Vector(16, 16, 8);
+        start = origin - forward * 55;
+        end   = start;
+        end[2] -= 128;
+
+        trace =
+            G_Trace(start, mins, maxs, end, this, MASK_CARRYABLETURRET, qtrue, "CarryableTurret::EventPlaceTurret1");
+
+        mins  = Vector(-16, -16, 0);
+        maxs  = Vector(16, 16, 95);
+        start = trace.endpos;
+
+        trace =
+            G_Trace(start, mins, maxs, end, this, MASK_CARRYABLETURRET, qtrue, "CarryableTurret::EventPlaceTurret1");
+
+        if (trace.startsolid || trace.fraction < 1) {
+            gi.DPrintf(
+                "~*~*~ Not enough room to auto place portable turret at (%i %i %i)\n",
+                (int)origin[0],
+                (int)origin[1],
+                (int)origin[2]
+            );
+            angles = Vector(-90, 0, 0);
+            setAngles(angles);
+            return;
+        }
+
+        setOrigin(start);
+        angles[0] = 0;
+        angles[2] = 0;
+        setAngles(angles);
+        placer = this;
+    } else {
+        if (!owner) {
+            return;
+        }
+
+        placer = owner;
+
+        if (!placer->groundentity) {
+            return;
+        }
+
+        if (placer->IsSubclassOfPlayer()) {
+            ownerP = static_cast<Player *>(placer);
+            if (ownerP->client->ps.pm_flags & (PMF_NO_GRAVITY | PMF_VIEW_JUMP_START | PMF_VIEW_DUCK_RUN)) {
+                if (level.time > next_noammo_time) {
+                    Sound(m_NoAmmoSound);
+                }
+
+                next_noammo_time = FireDelay(FIRE_PRIMARY) + level.time + level.frametime;
+                ownerP->HUDPrint(va("%s\n", gi.LV_ConvertString("You cannot place a turret right now.")));
+                return;
+            } else if (ownerP->client->ps.pm_flags & PMF_DUCKED) {
+                mins  = Vector(-16, -16, 0);
+                maxs  = Vector(16, 16, 95);
+                start = placer->origin;
+
+                trace = G_Trace(
+                    start, mins, maxs, end, owner, MASK_PLAYERSOLID, qtrue, "CarryableTurret::EventPlaceTurret1"
+                );
+
+                if (trace.startsolid || trace.fraction < 1) {
+                    if (level.time > next_noammo_time) {
+                        Sound(m_NoAmmoSound);
+                    }
+
+                    next_noammo_time = FireDelay(FIRE_PRIMARY) + level.time + level.frametime;
+                    ownerP->HUDPrint(va("%s\n", gi.LV_ConvertString("Not enough room to place the turret.")));
+                    return;
+                }
+            }
+        }
+    }
+
+    turretAngles[0] = 0;
+    turretAngles[1] = placer->angles[1];
+    turretAngles[2] = 0;
+    AngleVectors(turretAngles, forward, right, NULL);
+
+    targetPos = placer->origin + forward * 55 + Vector(0, 0, 65.43f);
+    mins      = Vector(-32, -32, -16);
+    maxs      = Vector(32, 32, 8);
+
+    trace = G_Trace(
+        targetPos, mins, maxs, targetPos, placer, MASK_CARRYABLETURRET, qtrue, "CarryableTurret::EventPlaceTurret1"
+    );
+    if (trace.startsolid || trace.fraction < 1 || trace.ent) {
+        if (level.time > next_noammo_time) {
+            Sound(m_NoAmmoSound);
+        }
+
+        next_noammo_time = FireDelay(FIRE_PRIMARY) + level.time + level.frametime;
+        if (autoPlace) {
+            gi.DPrintf("Not enough room to place the turret.\n");
+        } else if (placer->IsSubclassOfPlayer()) {
+            ownerP->HUDPrint(va("%s\n", gi.LV_ConvertString("Not enough room to place the turret.")));
+        }
+        return;
+    }
+
+    mins  = Vector(-4, -4, 0);
+    maxs  = Vector(4, 4, 4);
+    start = placer->origin + Vector(0, 0, 16) + right * 12;
+    end   = start + Vector(0, 0, -128);
+
+    trace = G_Trace(
+        start, mins, maxs, end, placer, CONTENTS_FENCE | CONTENTS_SOLID, qtrue, "CarryableTurret::EventPlaceTurret2"
+    );
+    endpos = trace.endpos;
+
+    start = placer->origin + Vector(0, 0, 16) - right * 12;
+    end   = start + Vector(0, 0, -128);
+
+    trace = G_Trace(
+        start, mins, maxs, end, placer, CONTENTS_FENCE | CONTENTS_SOLID, qtrue, "CarryableTurret::EventPlaceTurret2"
+    );
+    endpos2 = trace.endpos;
+
+    groundAngle = RAD2DEG(atan2(endpos[2] - endpos2[2], 12));
+    if (fabs(groundAngle) > 40) {
+        if (level.time > next_noammo_time) {
+            Sound(m_NoAmmoSound);
+        }
+
+        next_noammo_time = FireDelay(FIRE_PRIMARY) + level.time + level.frametime;
+        if (autoPlace) {
+            gi.DPrintf(
+                "Ground is too uneven to place the turret. (Too much ground roll to the side. Ground is at %g, limit "
+                "is %g)\n",
+                fabs(groundAngle),
+                40.f
+            );
+        } else if (placer->IsSubclassOfPlayer()) {
+            ownerP = static_cast<Player *>(placer);
+            ownerP->HUDPrint(va("%s", gi.LV_ConvertString("Ground is too uneven to place the turret.")));
+        }
+        return;
+    }
+    mins  = Vector(-2, -2, 0);
+    maxs  = Vector(2, 2, 4);
+    start = targetPos + forward * 13;
+    end   = start + Vector(0, 0, -129.43f);
+
+    trace = G_Trace(
+        start, mins, maxs, end, placer, CONTENTS_FENCE | CONTENTS_SOLID, qtrue, "CarryableTurret::EventPlaceTurret2"
+    );
+
+    groundAngle = RAD2DEG(atan2(placer->origin[2] - trace.endpos[2], 55));
+    if (fabs(groundAngle) > 30) {
+        if (level.time > next_noammo_time) {
+            Sound(m_NoAmmoSound);
+        }
+
+        next_noammo_time = FireDelay(FIRE_PRIMARY) + level.time + level.frametime;
+        if (autoPlace) {
+            gi.DPrintf(
+                "Ground is too uneven to place the turret. (Too much ground pitch. Ground is at %g, limit is %g)\n",
+                fabs(groundAngle),
+                30.f
+            );
+        } else if (placer->IsSubclassOfPlayer()) {
+            Player *ownerP = static_cast<Player *>(placer);
+
+            ownerP->HUDPrint(va("%s", gi.LV_ConvertString("Ground is too uneven to place the turret.")));
+        }
+        return;
+    }
+
+    turretAngles[0] = groundAngle;
+    AngleVectors(turretAngles, forward, NULL, up);
+
+    targetPos = placer->origin + forward * 55 + up * 65.43f;
+    if (!turretModel.length()) {
+        gi.DPrintf("WARNING: Carryable turret item '%s' doesn't have a turrettik specified\n", model.c_str());
+        return;
+    }
+
+    ClassDef       *c;
+    PortableTurret *ent;
+    SpawnArgs       spawnArgs;
+
+    spawnArgs.setArg("model", turretModel);
+    c = spawnArgs.getClassDef();
+    if (!c || !checkInheritance(Entity::classinfostatic(), c)) {
+        gi.DPrintf(
+            "WARNING: Carryable turret item '%s' can't find turrettik '%s'\n", model.c_str(), turretModel.c_str()
+        );
+        return;
+    }
+
+    if (c != PortableTurret::classinfostatic()) {
+        gi.DPrintf(
+            "WARNING: Carryable turret item '%s' set to invalid turrettik '%s'\n", model.c_str(), turretModel.c_str()
+        );
+        return;
+    }
+
+    ent = static_cast<PortableTurret *>(c->newInstance());
+    ent->setModel(turretModel);
+    ent->setOrigin(placer->origin + forward * 32 + up * 65.43f);
+    ent->setAngles(turretAngles);
+    ent->ProcessInitCommands();
+    ent->SetGroundPitch(turretAngles[0]);
+    ent->SetOwnerPosition(placer->origin);
+    ent->CancelEventsOfType(EV_Item_DropToFloor);
+
+    if (autoPlace) {
+        newev = new Event(EV_Item_DropToFloor, 1);
+        newev->AddInteger(1);
+        ent->ProcessEvent(newev);
+
+        ent->setOrigin(vec_zero);
+        PostEvent(EV_Remove, level.frametime);
+    } else {
+        ent->ProcessEvent(EV_Item_DropToFloor);
+
+        DetachGun();
+        RemoveFromOwner();
+        setOrigin(vec_zero);
+        PostEvent(EV_Remove, level.frametime);
+        placer->velocity = vec_zero;
+
+        newev = new Event(EV_Use, 1);
+        newev->AddEntity(placer);
+        ent->ProcessEvent(newev);
+    }
 }
 
 void CarryableTurret::EventEnablePickup(Event *ev)
 {
-    // FIXME: unimplemented
+    isPickable = true;
+}
+
+bool CarryableTurret::IsCarryableTurret() const
+{
+    return true;
+}
+
+void CarryableTurret::Archive(Archiver& arc)
+{
+    Weapon::Archive(arc);
+
+    arc.ArchiveString(&turretModel);
+    arc.ArchiveBoolean(&isPickable);
 }
 
 CLASS_DECLARATION(TurretGun, PortableTurret, NULL) {
@@ -134,60 +481,533 @@ CLASS_DECLARATION(TurretGun, PortableTurret, NULL) {
 
 PortableTurret::PortableTurret()
 {
-    // FIXME: unimplemented
+    groundPitch       = 0.0;
+    nextUsableTime    = 0.0;
+    packingUp         = 0;
+    mustDetach        = 0;
+    ammo_in_clip[0]   = 0;
+    ammo_clip_size[0] = 0;
+    endReloadTime     = 0.0;
+}
+
+PortableTurret::~PortableTurret()
+{
+    if (baseEntity) {
+        baseEntity->ProcessEvent(EV_Remove);
+        baseEntity = NULL;
+    }
+
+    TurretGun::RemoveUserCamera();
 }
 
 void PortableTurret::SetGroundPitch(float pitch)
 {
-    // FIXME: unimplemented
+    groundPitch = pitch;
 }
 
 void PortableTurret::SetOwnerPosition(const Vector& pos)
 {
-    // FIXME: unimplemented
+    ownerPosition = pos + Vector(0, 0, 16);
 }
 
 void PortableTurret::PortablePlaceTurret(Event *ev)
 {
-    // FIXME: unimplemented
+    Vector turretAngles;
+    Vector forward, up;
+    bool   attachPlayer = false;
+    char   baseModel[1024];
+
+    PlaceTurret(ev);
+    if (ev->NumArgs() && ev->GetInteger(1)) {
+        attachPlayer = true;
+    }
+
+    m_fPitchUpCap += groundPitch;
+    m_fPitchDownCap += groundPitch;
+    m_fMaxIdlePitch += groundPitch;
+
+    m_pUserCamera = new Camera();
+    currentModel  = model;
+
+    COM_StripExtension(model.c_str(), baseModel, sizeof(baseModel));
+    strcat(baseModel, "_setup.tik");
+    setupModel = CanonicalTikiName(baseModel);
+
+    turretAngles[0] = groundPitch;
+    turretAngles[1] = m_fStartYaw;
+    turretAngles[2] = 0;
+    AngleVectors(turretAngles, forward, NULL, up);
+
+    cameraOrigin = origin + (forward * m_vViewOffset[0]) + (up * m_vViewOffset[2]);
+
+    if (attachPlayer) {
+        nextUsableTime = 0;
+        packingUp      = false;
+        mustDetach     = false;
+
+        m_pUserCamera->setOrigin(origin);
+        m_pUserCamera->setAngles(angles);
+
+        m_pUserCamera->SetPositionOffset(m_vViewOffset);
+        MakeBaseEntity();
+
+        endReloadTime     = 0;
+        owner             = NULL;
+        edict->r.ownerNum = ENTITYNUM_NONE;
+
+        m_fIdlePitchSpeed = 0;
+        m_iIdleHitCount   = 0;
+        m_iFiring         = 0;
+
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+
+        ForceIdle();
+    } else {
+        nextUsableTime = level.time + 2;
+        packingUp      = false;
+
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+
+        model = setupModel;
+        if (setModel()) {
+            ForceIdle();
+            P_DeleteViewModel();
+            mustDetach = true;
+
+            m_pUserCamera->setOrigin(cameraOrigin);
+            m_pUserCamera->setAngles(turretAngles);
+            m_pUserCamera->SetPositionOffset(vec_zero);
+        } else {
+            Com_Printf("^~^~^PortableTurret::PortablePlaceTurret: Bad model name '%s'\n", setupModel.c_str());
+        }
+    }
 }
 
 void PortableTurret::MakeBaseEntity()
 {
-    // FIXME: unimplemented
+    char   baseModel[1024];
+    Vector turretAngles;
+
+    if (!baseEntity) {
+        COM_StripExtension(model, baseModel, sizeof(baseModel));
+        strcat(baseModel, "_base.tik");
+        baseEntity = new Entity();
+    }
+
+    baseEntity->takedamage = DAMAGE_NO;
+    baseEntity->setModel(baseModel);
+    baseEntity->setMoveType(MOVETYPE_NONE);
+    baseEntity->setSolidType(SOLID_NOT);
+
+    baseEntity->setSize(Vector(4, 4, 4), Vector(-4, -4, -50));
+    baseEntity->setOrigin(origin);
+
+    turretAngles[0] = groundPitch;
+    turretAngles[1] = angles[1];
+    turretAngles[2] = 0;
+    baseEntity->setAngles(turretAngles);
 }
 
 void PortableTurret::EventSetClipSize(Event *ev)
 {
-    // FIXME: unimplemented
+    ammo_clip_size[FIRE_PRIMARY] = ev->GetFloat(1);
+    ammo_in_clip[FIRE_PRIMARY]   = ammo_clip_size[FIRE_PRIMARY];
 }
 
 void PortableTurret::AbortTurretSetup()
 {
-    // FIXME: unimplemented
+    Sentient *currentOwner;
+    bool      isPackingUp = packingUp;
+
+    currentOwner   = owner;
+    nextUsableTime = 0;
+    packingUp      = false;
+    P_TurretEndUsed();
+
+    m_iFiring = 0;
+
+    if (isPackingUp) {
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+
+        model = currentModel;
+        if (setModel()) {
+            ForceIdle();
+            MakeBaseEntity();
+        } else {
+            Com_Printf("^~^~^PortableTurret::P_ThinkActive: Bad model name '%s'\n", currentModel.c_str());
+        }
+    } else {
+        Item *item;
+
+        item = currentOwner->giveItem("weapons/mg42carryable.tik");
+        if (item) {
+            item->Drop();
+        } else {
+            gi.DPrintf("couldn't spawn carryable turret for player\n");
+        }
+
+        RemoveUserCamera();
+        hideModel();
+        setOrigin(vec_zero);
+
+        PostEvent(EV_Remove, level.frametime);
+
+        if (baseEntity) {
+            baseEntity->hideModel();
+            baseEntity->setOrigin(vec_zero);
+            baseEntity->PostEvent(EV_Remove, level.frametime);
+            baseEntity = NULL;
+        }
+    }
 }
 
 void PortableTurret::P_UserAim(usercmd_t *cmd)
 {
-    // FIXME: unimplemented
+    bool doDetach = false;
+
+    if (cmd->buttons & BUTTON_ATTACKRIGHT) {
+        if (!mustDetach) {
+            doDetach = true;
+        }
+
+        mustDetach = true;
+    } else {
+        mustDetach = false;
+    }
+
+    if (nextUsableTime > level.time) {
+        angles[0] = groundPitch;
+        angles[1] = m_fStartYaw;
+
+        setAngles(angles);
+
+        TurretGun::P_UserAim(cmd);
+        m_iFiring = 0;
+        flags |= FL_THINK;
+    } else if (doDetach) {
+        nextUsableTime = level.time + 2;
+        packingUp      = true;
+
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+
+        model = setupModel;
+
+        if (setModel()) {
+            SetWeaponAnim("packup");
+
+            P_DeleteViewModel();
+
+            if (baseEntity) {
+                baseEntity->ProcessEvent(EV_Remove);
+                baseEntity = NULL;
+            }
+        } else {
+            Com_Printf("^~^~^PortableTurret::PortablePlaceTurret: Bad model name '%s'\n", model.c_str());
+        }
+    } else {
+        TurretGun::P_UserAim(cmd);
+    }
 }
 
 void PortableTurret::P_TurretEndUsed()
 {
-    // FIXME: unimplemented
+    if (nextUsableTime > level.time) {
+        AbortTurretSetup();
+        return;
+    }
+
+    endReloadTime = 0;
+    TurretGun::P_TurretEndUsed();
+
+    RemoveUserCamera();
+    ForceIdle();
 }
 
 void PortableTurret::P_TurretBeginUsed(Player *pEnt)
 {
-    // FIXME: unimplemented
+    Event  *ev;
+    Weapon *activeWeap;
+
+    TurretGun::P_TurretBeginUsed(pEnt);
+
+    activeWeap = pEnt->GetActiveWeapon(WEAPON_MAIN);
+    if (activeWeap && activeWeap->GetPutaway()) {
+        ev = new Event("deactivateweapon", 1);
+        ev->AddString("righthand");
+        pEnt->PostEvent(ev, 0);
+    }
+
+    ev = new Event("modheight", 1);
+    ev->AddString("stand");
+    pEnt->ProcessEvent(ev);
+
+    ev = new Event("moveposflags", 1);
+    ev->AddString("standing");
+    pEnt->ProcessEvent(ev);
 }
 
 void PortableTurret::P_ThinkActive()
 {
-    // FIXME: unimplemented
+    Event  *ev;
+    Weapon *activeWeap;
+    Entity *ent;
+    Player *ownerP = static_cast<Player *>(owner.Pointer());
+
+    if (!ownerP->IsZoomed()) {
+        ownerP->ToggleZoom(80);
+    }
+
+    owner->setOrigin(ownerPosition);
+
+    if (nextUsableTime != 0) {
+        if (nextUsableTime > level.time) {
+            float yawCap;
+
+            // cap the pitch
+            if (m_vUserViewAng[0] < m_fPitchUpCap) {
+                m_vUserViewAng[0] = m_fPitchUpCap;
+            } else if (m_vUserViewAng[0] > m_fPitchDownCap) {
+                m_vUserViewAng[0] = m_fPitchDownCap;
+            }
+
+            yawCap = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+            if (yawCap > m_fMaxYawOffset) {
+                yawCap = m_fMaxYawOffset;
+            } else if (yawCap < -m_fMaxYawOffset) {
+                yawCap = -m_fMaxYawOffset;
+            }
+
+            m_vUserViewAng[1] = m_fStartYaw + yawCap;
+            // set the view angles
+            owner->SetViewAngles(m_vUserViewAng);
+            m_pUserCamera->setAngles(m_vUserViewAng);
+
+            return;
+        }
+
+        nextUsableTime = 0;
+
+        if (packingUp) {
+            SpawnArgs spawnArgs;
+            ClassDef *c;
+
+            ownerP->SetHolsteredByCode(false);
+            P_TurretEndUsed();
+
+            m_iFiring = 0;
+
+            spawnArgs.setArg("model", "weapons/mg42carryable.tik");
+            c = spawnArgs.getClassDef();
+            if (c && checkInheritance(Entity::classinfostatic(), c)) {
+                ent = static_cast<Entity *>(c->newInstance());
+                if (ent) {
+                    activeWeap = ownerP->GetActiveWeapon(WEAPON_MAIN);
+                    if (activeWeap) {
+                        activeWeap->DetachFromOwner();
+                    }
+
+                    ent->setModel("weapons/mg42carryable.tik");
+                    ent->setOrigin(vec_zero);
+                    ent->ProcessInitCommands();
+
+                    ev = new Event(EV_Item_Pickup, 1);
+                    ev->AddEntity(ownerP);
+                    ent->ProcessEvent(ev);
+                    ent->PostEvent(EV_Remove, 0);
+                } else {
+                    gi.DPrintf("couldn't spawn carryable turret for player\n");
+                }
+
+                // remove the carryable turret entity and the base
+                hideModel();
+                setOrigin(vec_zero);
+                PostEvent(EV_Remove, level.frametime);
+
+                if (baseEntity) {
+                    baseEntity->hideModel();
+                    baseEntity->setOrigin(vec_zero);
+                    baseEntity->PostEvent(EV_Remove, level.frametime);
+                    baseEntity = NULL;
+                }
+            } else {
+                gi.DPrintf("WARNING: couldn't spawn tiki '%s'\n", "weapons/mg42carryable.tik");
+            }
+
+            return;
+        }
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+        StopWeaponAnim();
+
+        model = currentModel;
+        if (setModel()) {
+            ForceIdle();
+            MakeBaseEntity();
+            P_CreateViewModel();
+            ForceIdle();
+        } else {
+            Com_Printf("^~^~^PortableTurret::P_ThinkActive: Bad model name '%s'\n", currentModel.c_str());
+            return;
+        }
+    }
+
+    if (endReloadTime != 0) {
+        float  yawCap;
+        Vector jittering;
+
+        m_iFiring = 0;
+        if (endReloadTime < level.time) {
+            ammo_in_clip[FIRE_PRIMARY] = ammo_clip_size[FIRE_PRIMARY];
+            endReloadTime              = 0;
+        }
+
+        // cap the pitch
+        if (m_vUserViewAng[0] < m_fPitchUpCap) {
+            m_vUserViewAng[0] = m_fPitchUpCap;
+        } else if (m_vUserViewAng[0] > m_fPitchDownCap) {
+            m_vUserViewAng[0] = m_fPitchDownCap;
+        }
+
+        yawCap = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+        if (yawCap > m_fMaxYawOffset) {
+            yawCap = m_fMaxYawOffset;
+        } else if (yawCap < -m_fMaxYawOffset) {
+            yawCap = -m_fMaxYawOffset;
+        }
+
+        m_vUserViewAng[1] = m_fStartYaw + yawCap;
+        // set the view angles
+        owner->SetViewAngles(m_vUserViewAng);
+        m_pUserCamera->setAngles(m_vUserViewAng);
+    } else {
+        if (ammo_clip_size[FIRE_PRIMARY] && ammo_in_clip[FIRE_PRIMARY] > 0) {
+            float  yawCap;
+            Vector delta;
+            Vector targetAngles;
+            Vector jittering;
+
+            // cap the pitch
+            if (m_vUserViewAng[0] < m_fPitchUpCap) {
+                m_vUserViewAng[0] = m_fPitchUpCap;
+            } else if (m_vUserViewAng[0] > m_fPitchDownCap) {
+                m_vUserViewAng[0] = m_fPitchDownCap;
+            }
+
+            yawCap = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+            if (yawCap > m_fMaxYawOffset) {
+                yawCap = m_fMaxYawOffset;
+            } else if (yawCap < -m_fMaxYawOffset) {
+                yawCap = -m_fMaxYawOffset;
+            }
+
+            m_vUserViewAng[1] = m_fStartYaw + yawCap;
+            // set the view angles
+            owner->SetViewAngles(m_vUserViewAng);
+
+            delta        = owner->GunTarget() - origin;
+            targetAngles = delta.toAngles();
+            P_SetTargetAngles(targetAngles);
+            if (m_iFiring) {
+                m_iFiring = 4;
+
+                if (ReadyToFire(FIRE_PRIMARY)) {
+                    Fire(FIRE_PRIMARY);
+                    m_fCurrViewJitter = m_fViewJitter;
+                    if (ammo_clip_size[FIRE_PRIMARY]) {
+                        // decrease the ammo count
+                        ammo_in_clip[FIRE_PRIMARY]--;
+                    }
+                }
+            }
+
+            // apply some jitter
+            jittering = m_vUserViewAng;
+            P_ApplyFiringViewJitter(jittering);
+            m_pUserCamera->setOrigin(origin);
+            m_pUserCamera->setAngles(jittering);
+            m_pUserCamera->SetPositionOffset(m_vViewOffset);
+            ownerP->client->ps.camera_flags |= CF_CAMERA_ANGLES_TURRETMODE;
+        } else {
+            m_iFiring     = 0;
+            endReloadTime = level.time + 1.5;
+
+            angles[0] = GetGroundPitch();
+            angles[1] = GetStartYaw();
+            setAngles(angles);
+
+            SetWeaponAnim("reload");
+        }
+    }
 }
 
 void PortableTurret::P_TurretUsed(Player *player)
 {
-    // FIXME: unimplemented
+    if (player != owner) {
+        for (Player *p = static_cast<Player *>(findradius(NULL, centroid, 50)); p;
+             p         = static_cast<Player *>(findradius(p, centroid, 50))) {
+            if (!p->IsSubclassOfPlayer()) {
+                continue;
+            }
+
+            if (p != player && !p->IsSpectator() && !p->IsDead()) {
+                return;
+            }
+        }
+    }
+
+    TurretGun::P_TurretUsed(player);
+}
+
+float PortableTurret::GetGroundPitch() const
+{
+    return groundPitch;
+}
+
+float PortableTurret::GetStartYaw() const
+{
+    return m_fStartYaw;
+}
+
+bool PortableTurret::IsReloading() const
+{
+    return endReloadTime > level.time;
+}
+
+bool PortableTurret::IsSettingUp() const
+{
+    return nextUsableTime > level.time && !packingUp;
+}
+
+bool PortableTurret::IsPackingUp() const
+{
+    return nextUsableTime > level.time && packingUp;
+}
+
+void PortableTurret::Archive(Archiver& arc)
+{
+    TurretGun::Archive(arc);
+
+    arc.ArchiveSafePointer(&baseEntity);
+    arc.ArchiveFloat(&groundPitch);
+    arc.ArchiveVector(&ownerPosition);
+    arc.ArchiveFloat(&nextUsableTime);
+    arc.ArchiveBoolean(&packingUp);
+    arc.ArchiveBoolean(&mustDetach);
+    arc.ArchiveString(&currentModel);
+    arc.ArchiveString(&setupModel);
+    arc.ArchiveVector(&cameraOrigin);
+    arc.ArchiveFloat(&endReloadTime);
 }
diff --git a/code/fgame/portableturret.h b/code/fgame/portableturret.h
index ee91f60b..d24131cf 100644
--- a/code/fgame/portableturret.h
+++ b/code/fgame/portableturret.h
@@ -27,6 +27,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class CarryableTurret : public InventoryItem
 {
+private:
+    str      turretModel;
+    qboolean isPickable;
+
 public:
     CLASS_PROTOTYPE(CarryableTurret);
 
@@ -35,22 +39,39 @@ public:
     void EventPickup(Event *ev);
 
     qboolean Removable(void) override;
-    void     DetachFromOwner(void);
-    void     AttachToHolster(weaponhand_t hand);
+    void     DetachFromOwner(void) override;
+    void     AttachToHolster(weaponhand_t hand) override;
     void     DropTurret(Event *ev);
     qboolean Drop(void) override;
     void     EventTurretTik(Event *ev);
     void     EventPlaceTurret(Event *ev);
     void     EventEnablePickup(Event *ev);
+
+    bool IsCarryableTurret() const override;
+
+    void Archive(Archiver& arc) override;
 };
 
 class PortableTurret : public TurretGun
 {
+private:
+    EntityPtr baseEntity;
+    float     groundPitch;
+    Vector    ownerPosition;
+    float     nextUsableTime;
+    qboolean  packingUp;
+    qboolean  mustDetach;
+    str       currentModel;
+    str       setupModel;
+    Vector    cameraOrigin;
+    float     endReloadTime;
+
 public:
     CLASS_PROTOTYPE(PortableTurret);
 
 public:
     PortableTurret();
+    ~PortableTurret();
 
     void SetGroundPitch(float pitch);
     void SetOwnerPosition(const Vector& pos);
@@ -64,4 +85,12 @@ public:
     void P_TurretBeginUsed(Player *pEnt) override;
     void P_ThinkActive() override;
     void P_TurretUsed(Player *player) override;
+
+    float GetGroundPitch() const;
+    float GetStartYaw() const;
+    bool  IsReloading() const;
+    bool  IsSettingUp() const;
+    bool  IsPackingUp() const;
+
+    void Archive(Archiver& arc) override;
 };
diff --git a/code/fgame/portal.h b/code/fgame/portal.h
index 1679378c..a7200819 100644
--- a/code/fgame/portal.h
+++ b/code/fgame/portal.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // portal.h:
 // 
 
-#ifndef __PORTAL_H__
-#define __PORTAL_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -45,6 +44,3 @@ class PortalCamera : public Entity
       PortalCamera();
       void Roll( Event *ev );
    };
-
-#endif // __PORTAL_H__
-
diff --git a/code/fgame/scriptdelegate.cpp b/code/fgame/scriptdelegate.cpp
new file mode 100644
index 00000000..636aa88c
--- /dev/null
+++ b/code/fgame/scriptdelegate.cpp
@@ -0,0 +1,190 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "scriptdelegate.h"
+#include "../script/scriptexception.h"
+
+ScriptDelegate *ScriptDelegate::root = NULL;
+
+ScriptRegisteredDelegate_Script::ScriptRegisteredDelegate_Script(const ScriptThreadLabel& inLabel)
+    : label(inLabel)
+{}
+
+void ScriptRegisteredDelegate_Script::Execute(Listener *object, const Event& ev)
+{
+    Event newev = ev;
+
+    label.Execute(object, newev);
+}
+
+bool ScriptRegisteredDelegate_Script::operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const
+{
+    return label == registeredDelegate.label;
+}
+
+ScriptRegisteredDelegate_CodeMember::ScriptRegisteredDelegate_CodeMember(
+    Class *inObject, DelegateClassResponse inResponse
+)
+    : object(inObject)
+    , response(inResponse)
+{}
+
+void ScriptRegisteredDelegate_CodeMember::Execute(Listener *object, const Event& ev)
+{
+    if (!object) {
+        return;
+    }
+
+    (object->*response)(object, ev);
+}
+
+bool ScriptRegisteredDelegate_CodeMember::operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate
+) const
+{
+    return object == registeredDelegate.object && response == registeredDelegate.response;
+}
+
+ScriptRegisteredDelegate_Code::ScriptRegisteredDelegate_Code(DelegateResponse inResponse)
+    : response(inResponse)
+{}
+
+void ScriptRegisteredDelegate_Code::Execute(Listener *object, const Event& ev)
+{
+    (*response)(object, ev);
+}
+
+bool ScriptRegisteredDelegate_Code::operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const
+{
+    return response == registeredDelegate.response;
+}
+
+ScriptDelegate::ScriptDelegate(const char *inName, const char *inDescription)
+    : name(inName)
+    , description(inDescription)
+{
+    LL_SafeAddFirst(root, this, next, prev);
+}
+
+ScriptDelegate::~ScriptDelegate()
+{
+    LL_SafeRemoveRoot(root, this, next, prev);
+}
+
+const ScriptDelegate *ScriptDelegate::GetRoot()
+{
+    return root;
+}
+
+const ScriptDelegate *ScriptDelegate::GetNext() const
+{
+    return next;
+}
+
+void ScriptDelegate::Register(const ScriptThreadLabel& label)
+{
+    if (!label.IsSet()) {
+        ScriptError("Invalid label specified for the script delegate");
+    }
+
+    list_script.AddUniqueObject(label);
+}
+
+void ScriptDelegate::Unregister(const ScriptThreadLabel& label)
+{
+    list_script.RemoveObject(label);
+}
+
+void ScriptDelegate::Register(ScriptRegisteredDelegate_Code::DelegateResponse response)
+{
+    list_code.AddUniqueObject(ScriptRegisteredDelegate_Code(response));
+}
+
+void ScriptDelegate::Unregister(ScriptRegisteredDelegate_Code::DelegateResponse response)
+{
+    list_code.RemoveObject(response);
+}
+
+void ScriptDelegate::Register(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response)
+{
+    list_codeMember.AddUniqueObject(ScriptRegisteredDelegate_CodeMember(object, response));
+}
+
+void ScriptDelegate::Unregister(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response)
+{
+    list_codeMember.RemoveObject(ScriptRegisteredDelegate_CodeMember(object, response));
+}
+
+void ScriptDelegate::Trigger(const Event& ev) const
+{
+    Trigger(NULL, ev);
+}
+
+void ScriptDelegate::Trigger(Listener *object, const Event& ev) const
+{
+    size_t i;
+
+    {
+        const Container<ScriptRegisteredDelegate_Script> tmpList = list_script;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(object, ev);
+        }
+    }
+
+    {
+        const Container<ScriptRegisteredDelegate_Code> tmpList = list_code;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(object, ev);
+        }
+    }
+
+    {
+        const Container<ScriptRegisteredDelegate_CodeMember> tmpList = list_codeMember;
+        for (i = 1; i <= tmpList.NumObjects(); i++) {
+            tmpList.ObjectAt(i).Execute(object, ev);
+        }
+    }
+}
+
+ScriptDelegate *ScriptDelegate::GetScriptDelegate(const char *name)
+{
+    for (ScriptDelegate *delegate = root; delegate; delegate = delegate->next) {
+        if (!Q_stricmp(delegate->name, name)) {
+            return delegate;
+        }
+    }
+
+    return NULL;
+}
+
+void ScriptDelegate::Reset()
+{
+    list_script.FreeObjectList();
+    list_code.FreeObjectList();
+    list_codeMember.FreeObjectList();
+}
+
+void ScriptDelegate::ResetAllDelegates()
+{
+    for (ScriptDelegate *delegate = root; delegate; delegate = delegate->next) {
+        delegate->Reset();
+    }
+}
diff --git a/code/fgame/scriptdelegate.h b/code/fgame/scriptdelegate.h
new file mode 100644
index 00000000..0ff04923
--- /dev/null
+++ b/code/fgame/scriptdelegate.h
@@ -0,0 +1,196 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// scriptdelegate -- manages function delegate
+
+#include "../qcommon/listener.h"
+#include "../qcommon/delegate.h"
+#include "gamescript.h"
+
+class ScriptRegisteredDelegate
+{
+public:
+    void Execute(Listener *object, const Event& ev);
+};
+
+/**
+ * Registered delegate, for scripts.
+ * It contains a ScriptThreadLabel with the game script and the label to execute.
+ */
+class ScriptRegisteredDelegate_Script : public ScriptRegisteredDelegate
+{
+public:
+    ScriptRegisteredDelegate_Script(const ScriptThreadLabel& inLabel);
+
+    void Execute(Listener *object, const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_Script& registeredDelegate) const;
+
+private:
+    ScriptThreadLabel label;
+};
+
+/**
+ * Registered delegate, for code use.
+ * It contains the function to execute.
+ */
+class ScriptRegisteredDelegate_Code : public ScriptRegisteredDelegate
+{
+public:
+    using DelegateResponse = void (*)(Listener *object, const Event& ev);
+
+public:
+    ScriptRegisteredDelegate_Code(DelegateResponse inResponse);
+
+    void Execute(Listener *object, const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_Code& registeredDelegate) const;
+
+private:
+    DelegateResponse response;
+};
+
+/**
+ * Registered delegate, for code use.
+ * It contains the object along the member function to execute.
+ * The function will not be executed if the object is NULL.
+ */
+class ScriptRegisteredDelegate_CodeMember : public ScriptRegisteredDelegate
+{
+public:
+    using DelegateClassResponse = void (Class::*)(Listener *object, const Event& ev);
+
+public:
+    ScriptRegisteredDelegate_CodeMember(Class *inObject, DelegateClassResponse inResponse);
+
+    void Execute(Listener *object, const Event& ev);
+
+    bool operator==(const ScriptRegisteredDelegate_CodeMember& registeredDelegate) const;
+
+private:
+    SafePtr<Class>        object;
+    DelegateClassResponse response;
+};
+
+/**
+ * A script delegate provides a way for code to subscribe for events.
+ * Scripts and code can register for a delegate and have their function executed
+ * when the delegate gets triggered.
+ */
+class ScriptDelegate
+{
+public:
+    ScriptDelegate(const char *name, const char *description);
+    ~ScriptDelegate();
+
+    static const ScriptDelegate *GetRoot();
+    const ScriptDelegate        *GetNext() const;
+
+    /**
+     * Register a script label.
+     *
+     * @param label The label to be executed
+     */
+    void Register(const ScriptThreadLabel& label);
+
+    /**
+     * Unregistered the label.
+     *
+     * @param label The label to unregister
+     */
+    void Unregister(const ScriptThreadLabel& label);
+
+    /**
+     * Register a function.
+     *
+     * @param response The function to be executed
+     */
+    void Register(ScriptRegisteredDelegate_Code::DelegateResponse response);
+
+    /**
+     * Unregistered the function.
+     *
+     * @param response the function to unregister
+     */
+    void Unregister(ScriptRegisteredDelegate_Code::DelegateResponse response);
+
+    /**
+     * Register with an object and a member function.
+     *
+     * @param object The object to notify
+     * @param response The member function of the object to be executed
+     */
+    void Register(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response);
+
+    /**
+     * Unregistered the member function.
+     *
+     * @param object The object where the member function is
+     * @param response The member function to unregister
+     */
+    void Unregister(Class *object, ScriptRegisteredDelegate_CodeMember::DelegateClassResponse response);
+
+    /**
+     * Executes all registered delegates with the specified event.
+     *
+     * @param ev Parameter list
+     */
+    void Trigger(const Event& ev = Event()) const;
+
+    /**
+     * Executes all registered delegates with the specified event.
+     *
+     * @param ev Parameter list
+     */
+    void Trigger(Listener *object, const Event& ev = Event()) const;
+
+    /**
+     * Reset the delegate, unregister callbacks.
+     */
+    void Reset();
+
+    /**
+     * Search and return the specified script delegate by name.
+     *
+     * @param name The name to search for
+     */
+    static ScriptDelegate *GetScriptDelegate(const char *name);
+    static void            ResetAllDelegates();
+
+    // non-movable and non-copyable
+    ScriptDelegate(ScriptDelegate&& other)                 = delete;
+    ScriptDelegate& operator=(ScriptDelegate&& other)      = delete;
+    ScriptDelegate(const ScriptDelegate& other)            = delete;
+    ScriptDelegate& operator=(const ScriptDelegate& other) = delete;
+
+private:
+    // Linked-list
+    ScriptDelegate        *next;
+    ScriptDelegate        *prev;
+    static ScriptDelegate *root;
+    const char            *name;
+    const char            *description;
+
+    Container<ScriptRegisteredDelegate_Script>     list_script;
+    Container<ScriptRegisteredDelegate_Code>       list_code;
+    Container<ScriptRegisteredDelegate_CodeMember> list_codeMember;
+};
diff --git a/code/fgame/scriptmaster.cpp b/code/fgame/scriptmaster.cpp
index 1544fd3b..6900dc42 100644
--- a/code/fgame/scriptmaster.cpp
+++ b/code/fgame/scriptmaster.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "game.h"
 #include "g_spawn.h"
 #include "object.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "scriptcompiler.h"
 #include "scriptexception.h"
 
@@ -82,7 +82,8 @@ CLASS_DECLARATION(Class, ScriptEvent, NULL) {
 //
 // world stuff
 //
-Event EV_SetTiki(
+Event EV_SetTiki
+(
     "settiki",
     EV_DEFAULT,
     NULL,
@@ -229,13 +230,14 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/shoot.scr",
     "anim/mg42_shoot.scr",
     "anim/mg42_idle.scr",
-    "anim_mg42_reload.scr",
+    "anim/mg42_reload.scr",
     "drive",
     "global/weapon.scr",
     "global/moveto.scr",
     "global/anim.scr",
     "global/anim_scripted.scr",
     "global/anim_noclip.scr",
+    "global/anim_attached.scr",
     "global/walkto.scr",
     "global/runto.scr",
     "aimat",
@@ -252,7 +254,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/idle.scr",
     "anim/surprise.scr",
     "anim/standshock.scr",
-    "anim/standidentify",
+    "anim/standidentify.scr",
     "anim/standflinch.scr",
     "anim/dog_idle.scr",
     "anim/dog_attack.scr",
@@ -260,6 +262,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/dog_chase.scr",
     "cannon",
     "grenade",
+    "badplace",
     "heavy",
     "item",
     "items",
@@ -305,6 +308,7 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/killed.scr",
     "anim/attack.scr",
     "anim/sniper.scr",
+    "anim/suppress.scr",
     "knees",
     "crawl",
     "floor",
@@ -335,13 +339,14 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/cornerleft.scr",
     "anim/cornerright.scr",
     "anim/overattack.scr",
+    "anim/lowwall.scr",
+    "anim/highwall.scr",
     "anim/continue_last_anim.scr",
     "flagged",
     "anim/fullbody.scr",
-    "internal",
     "salute",
     "sentry",
-    "officier",
+    "officer",
     "rover",
     "none",
     "machinegunner",
@@ -394,12 +399,12 @@ const char *ScriptMaster::ConstStrings[] = {
     "anim/no_anim_killed.scr",
     "mg42",
     "mp40",
+    // Added in 2.0
     "auto",
     "both",
+    // Added in 2.30
     "runandshoot",
-    //
-    // Openmohaa additions
-    //
+    // Added in OPM
     "respawn",
     "viewmodelanim_done"
 };
@@ -435,24 +440,27 @@ static int bLoadForMap(char *psMapsBuffer, const char *name)
     return false;
 }
 
-void ScriptMaster::RegisterAliasInternal(Event *ev, bool bCache)
+void ScriptMaster::RegisterAliasAndCache(Event *ev)
 {
-    int   i;
-    char  parameters[MAX_STRING_CHARS];
-    char *psMapsBuffer;
-    int   subtitle;
-    bool  bAlwaysLoaded = false;
+    int      i;
+    char     parameters[MAX_STRING_CHARS];
+    char    *psMapsBuffer;
+    bool     bAlwaysLoaded = false;
+
+    if (ev->NumArgs() < 2) {
+        return;
+    }
 
     // Get the parameters for this alias command
 
     parameters[0] = 0;
-    subtitle      = 0;
     psMapsBuffer  = NULL;
 
     for (i = 3; i <= ev->NumArgs(); i++) {
         str s;
 
-        // MOHAA doesn't check that
+        // Added in OPM
+        //  MOHAA doesn't check that
         if (ev->IsListenerAt(i)) {
             Listener *l = ev->GetListener(i);
 
@@ -465,44 +473,97 @@ void ScriptMaster::RegisterAliasInternal(Event *ev, bool bCache)
             s = ev->GetString(i);
         }
 
-        if (subtitle) {
+        if (!s.icmp("maps")) {
+            i++;
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+            continue;
+        }
+
+        strcat(parameters, s);
+        strcat(parameters, " ");
+    }
+
+    if (bAlwaysLoaded) {
+        gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
+    }
+
+    if (bLoadForMap(psMapsBuffer, ev->GetString(1))) {
+        if (!bAlwaysLoaded) {
+            gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
+        }
+
+        CacheResource(ev->GetString(2));
+    }
+}
+
+void ScriptMaster::RegisterAlias(Event *ev)
+{
+    int      i;
+    char     parameters[MAX_STRING_CHARS];
+    char    *psMapsBuffer;
+    qboolean subtitle;
+    bool     bAlwaysLoaded = false;
+
+    if (ev->NumArgs() < 2) {
+        return;
+    }
+
+    // Get the parameters for this alias command
+
+    parameters[0] = 0;
+    subtitle      = 0;
+    psMapsBuffer  = NULL;
+
+    for (i = 3; i <= ev->NumArgs(); i++) {
+        str s;
+
+        // Added in OPM
+        //  MOHAA doesn't check that
+        if (ev->IsListenerAt(i)) {
+            Listener *l = ev->GetListener(i);
+
+            if (l && l == Director.CurrentThread()) {
+                s = "local";
+            } else {
+                s = ev->GetString(i);
+            }
+        } else {
+            s = ev->GetString(i);
+        }
+
+        if (!s.icmp("maps")) {
+            i++;
+            psMapsBuffer = (char *)ev->GetToken(i).c_str();
+            continue;
+        }
+
+        if (!s.icmp("always")) {
+            bAlwaysLoaded = true;
+        } else if (subtitle) {
             strcat(parameters, "\"");
             strcat(parameters, s);
             strcat(parameters, "\" ");
 
             subtitle = 0;
-        } else if (!s.icmp("maps")) {
-            i++;
-            psMapsBuffer = (char *)ev->GetToken(i).c_str();
-        } else if (!s.icmp("always")) {
-            bAlwaysLoaded = true;
         } else {
             subtitle = s.icmp("subtitle") == 0;
 
             strcat(parameters, s);
-            strcat(parameters, " ");
         }
+
+        strcat(parameters, " ");
     }
 
     if (bAlwaysLoaded || bLoadForMap(psMapsBuffer, ev->GetString(1))) {
         gi.GlobalAlias_Add(ev->GetString(1), ev->GetString(2), parameters);
-
-        if (bCache) {
-            CacheResource(ev->GetString(2));
-        }
     }
 }
 
-void ScriptMaster::RegisterAliasAndCache(Event *ev)
-{
-    RegisterAliasInternal(ev, true);
-}
-
-void ScriptMaster::RegisterAlias(Event *ev)
-{
-    RegisterAliasInternal(ev);
-}
-
 void ScriptMaster::Cache(Event *ev)
 {
 #ifdef GAME_DLL
@@ -520,11 +581,21 @@ void ScriptMaster::InitConstStrings(void)
     const_str                       name;
     unsigned int                    eventnum;
     con_map_enum<Event *, EventDef> en;
+    int                             i;
 
-    for (int i = 0; i < sizeof(ConstStrings) / sizeof(ConstStrings[0]); i++) {
+    static_assert(ARRAY_LEN(ConstStrings) == (STRING_LENGTH_ - 1), "Constant strings don't match. Make sure the 'const_str' enum match with the 'ConstStrings' string array");
+
+    for (i = 0; i < ARRAY_LEN(ConstStrings); i++) {
         AddString(ConstStrings[i]);
     }
 
+    if (!Listener::EventSystemStarted) {
+        // Added in OPM
+        //  This usually means the game module is getting destroyed
+        //  most often, the event command list has been destroyed earlier
+        return;
+    }
+
     Event::normalCommandList.clear();
     Event::returnCommandList.clear();
     Event::getterCommandList.clear();
@@ -536,7 +607,10 @@ void ScriptMaster::InitConstStrings(void)
         eventDef    = en.CurrentValue();
         eventnum    = (*en.CurrentKey())->eventnum;
         str command = eventDef->command.c_str();
-        command.tolower();
+
+        if (eventDef->type == EV_NORMAL || eventDef->type == EV_RETURN) {
+            command.tolower();
+        }
 
         name = AddString(command);
 
@@ -660,6 +734,10 @@ ScriptThread *ScriptMaster::CreateScriptThread(ScriptClass *scriptClass, str lab
     }
 }
 
+ScriptMaster::ScriptMaster()
+{
+}
+
 void ScriptMaster::Reset(qboolean samemap)
 {
     ScriptClass_allocator.FreeAll();
@@ -688,45 +766,72 @@ void ScriptMaster::Reset(qboolean samemap)
         StringDict.clear();
         InitConstStrings();
     }
+
+    ScriptDelegate::ResetAllDelegates();
 }
 
 void ScriptMaster::ExecuteRunning(void)
 {
     int i;
     int startTime;
+    int startMs;
+    str fileName;
+    str sourcePosString;
 
     if (stackCount) {
         return;
     }
 
-    if (timerList.IsDirty()) {
-        cmdTime   = 0;
-        cmdCount  = 0;
-        startTime = level.svsTime;
+    if (!timerList.IsDirty()) {
+        return;
+    }
 
+    cmdTime   = 0;
+    cmdCount  = 0;
+    startTime = level.svsTime;
+
+    try {
         while ((m_CurrentThread = (ScriptThread *)timerList.GetNextElement(i))) {
+            if (g_timescripts->integer) {
+                fileName        = m_CurrentThread->FileName();
+                sourcePosString = m_CurrentThread->m_ScriptVM->GetSourcePos();
+                startMs         = gi.Milliseconds();
+            }
+
             level.setTime(level.svsStartTime + i);
 
             m_CurrentThread->m_ScriptVM->m_ThreadState = THREAD_RUNNING;
             m_CurrentThread->m_ScriptVM->Execute();
-        }
 
-        level.setTime(startTime);
-        level.m_LoopProtection = true;
+            if (g_timescripts->integer) {
+                str string;
+
+                string = "Execute Running: ";
+                string += str(gi.Milliseconds() - startMs / 1000.f);
+                string += " file: ";
+                string += fileName;
+                string += " codepos: ";
+                string += sourcePosString;
+
+                gi.DebugPrintf("%s\n", string.c_str());
+            }
+        }
+    } catch (const ScriptException& e) {
+        gi.Error(ERR_DROP, "%s", e.string.c_str());
     }
 
-    startTime = gi.Milliseconds();
+    level.setTime(startTime);
+    level.m_LoopProtection = true;
 }
 
 void ScriptMaster::SetTime(int time)
 {
     timerList.SetTime(time);
-    timerList.SetDirty();
 }
 
-void ScriptMaster::AddTiming(ScriptThread *thread, float time)
+void ScriptMaster::AddTiming(ScriptThread *thread, int time)
 {
-    timerList.AddElement(thread, level.inttime + (int)(time * 1000.0f + 0.5f));
+    timerList.AddElement(thread, time);
 }
 
 void ScriptMaster::RemoveTiming(ScriptThread *thread)
@@ -736,7 +841,7 @@ void ScriptMaster::RemoveTiming(ScriptThread *thread)
 
 ScriptClass *ScriptMaster::CurrentScriptClass(void)
 {
-    return CurrentThread()->GetScriptClass();
+    return CurrentScriptThread()->GetScriptClass();
 }
 
 void ScriptMaster::CloseGameScript(void)
@@ -767,16 +872,16 @@ GameScript *ScriptMaster::GetGameScriptInternal(str& filename)
         gi.Error(ERR_DROP, "Script filename '%s' exceeds maximum length of %d\n", filename.c_str(), MAX_QPATH);
     }
 
+    Q_strncpyz(filepath, filename.c_str(), sizeof(filepath));
+    gi.FS_CanonicalFilename(filepath);
+    filename = filepath;
+
     scr = m_GameScripts[StringDict.findKeyIndex(filename)];
 
     if (scr != NULL) {
         return scr;
     }
 
-    strcpy(filepath, filename.c_str());
-    gi.FS_CanonicalFilename(filepath);
-    filename = filepath;
-
     scr = new GameScript(filename);
 
     m_GameScripts[StringDict.addKeyIndex(filename)] = scr;
@@ -895,44 +1000,59 @@ void ScriptMaster::ArchiveString(Archiver& arc, const_str& s)
 
 void ScriptMaster::Archive(Archiver& arc)
 {
-    ScriptClass  *scr;
-    ScriptVM     *m_current;
-    ScriptThread *m_thread;
-    int           numClasses;
-    int           numThreads;
-    int           i, j;
+    int          count;
+    int          i, j;
+    ScriptClass *c;
+    int          num;
+    ScriptVM    *scriptVM;
+    ScriptVM    *prevScriptVM;
 
     if (arc.Saving()) {
-        numClasses = (int)ScriptClass_allocator.Count();
-        arc.ArchiveInteger(&numClasses);
+        count = (int)ScriptClass_allocator.Count();
+        arc.ArchiveInteger(&count);
 
         MEM_BlockAlloc_enum<ScriptClass> en = ScriptClass_allocator;
-        for (scr = en.NextElement(); scr != NULL; scr = en.NextElement()) {
-            scr->ArchiveInternal(arc);
+        for (c = en.NextElement(); c != NULL; c = en.NextElement()) {
+            c->ArchiveInternal(arc);
 
-            numThreads = 0;
-            for (m_current = scr->m_Threads; m_current != NULL; m_current = m_current->next) {
-                numThreads++;
+            num = 0;
+            for (scriptVM = c->m_Threads; scriptVM != NULL; scriptVM = scriptVM->next) {
+                num++;
             }
 
-            arc.ArchiveInteger(&numThreads);
+            arc.ArchiveInteger(&num);
 
-            for (m_current = scr->m_Threads; m_current != NULL; m_current = m_current->next) {
-                m_current->m_Thread->ArchiveInternal(arc);
+            for (scriptVM = c->m_Threads; scriptVM != NULL; scriptVM = scriptVM->next) {
+                scriptVM->m_Thread->ArchiveInternal(arc);
             }
         }
     } else {
-        arc.ArchiveInteger(&numClasses);
+        arc.ArchiveInteger(&count);
 
-        for (i = 0; i < numClasses; i++) {
-            scr = new ScriptClass();
-            scr->ArchiveInternal(arc);
+        for (i = 0; i < count; i++) {
+            c = new ScriptClass();
+            c->ArchiveInternal(arc);
 
-            arc.ArchiveInteger(&numThreads);
+            arc.ArchiveInteger(&num);
 
-            for (j = 0; j < numThreads; j++) {
-                m_thread = new ScriptThread(scr, NULL);
-                m_thread->ArchiveInternal(arc);
+            c->m_Threads = NULL;
+            prevScriptVM = NULL;
+
+            for (j = 0; j < num; j++) {
+                scriptVM                       = new ScriptVM;
+                scriptVM->m_Thread             = new ScriptThread;
+                scriptVM->m_Thread->m_ScriptVM = scriptVM;
+                scriptVM->m_ScriptClass        = c;
+                scriptVM->next                 = NULL;
+
+                if (prevScriptVM) {
+                    prevScriptVM->next = scriptVM;
+                } else {
+                    c->m_Threads = scriptVM;
+                }
+
+                prevScriptVM = scriptVM;
+                scriptVM->m_Thread->ArchiveInternal(arc);
             }
         }
     }
@@ -985,7 +1105,6 @@ ScriptThread *ScriptMaster::CurrentThread(void)
 
 ScriptThread *ScriptMaster::CurrentScriptThread(void)
 {
-    assert(m_CurrentThread);
     if (!m_CurrentThread) {
         ScriptError("current thread is NULL");
     }
@@ -1027,7 +1146,8 @@ void ScriptMaster::Pause()
 
 void ScriptMaster::Unpause()
 {
-    if (iPaused-- == 1) {
+    iPaused--;
+    if (iPaused == 0) {
         ExecuteRunning();
     }
 }
@@ -1059,30 +1179,30 @@ void ScriptMaster::PrintStatus(void)
         ScriptVM *vm;
 
         for (vm = scriptClass->m_Threads; vm != NULL; vm = vm->next) {
-            sprintf(szBuffer, "%.7d", iThreadNum);
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%.7d", iThreadNum);
             status += szBuffer + str(" ");
 
             switch (vm->ThreadState()) {
             case THREAD_RUNNING:
-                sprintf(szBuffer, "%8s", "running");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "running");
                 iThreadRunning++;
                 break;
             case THREAD_WAITING:
-                sprintf(szBuffer, "%8s", "waiting");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "waiting");
                 iThreadWaiting++;
                 break;
             case THREAD_SUSPENDED:
-                sprintf(szBuffer, "%8s", "suspended");
+                Com_sprintf(szBuffer, sizeof(szBuffer), "%8s", "suspended");
                 iThreadSuspended++;
                 break;
             }
 
             status += szBuffer;
 
-            sprintf(szBuffer, "%15s", vm->Label().c_str());
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%15s", vm->Label().c_str());
             status += szBuffer + str(" ");
 
-            sprintf(szBuffer, "%15s", vm->Filename().c_str());
+            Com_sprintf(szBuffer, sizeof(szBuffer), "%15s", vm->Filename().c_str());
             status += szBuffer;
 
             status += "\n";
@@ -1148,12 +1268,12 @@ void ScriptMaster::PrintThread(int iThreadNum)
     if (!vm->m_Thread->m_WaitForList) {
         status += "(none)\n";
     } else {
-        con_set_enum<const_str, ConList> en = *vm->m_Thread->m_WaitForList;
+        con_set_enum<const_str, ConList>    en = *vm->m_Thread->m_WaitForList;
         con_set<const_str, ConList>::Entry *entry;
-        int                              i = 0;
+        int                                 i = 0;
 
         for (entry = en.NextElement(); entry != NULL; entry = en.NextElement()) {
-            str& name = Director.GetString(entry->key);
+            str& name = Director.GetString(entry->GetKey());
 
             if (i > 0) {
                 status += ", ";
diff --git a/code/fgame/scriptmaster.h b/code/fgame/scriptmaster.h
index 414f7fde..28faef7f 100644
--- a/code/fgame/scriptmaster.h
+++ b/code/fgame/scriptmaster.h
@@ -82,11 +82,11 @@ protected:
     void        Cache(Event *ev);
     void        RegisterAliasAndCache(Event *ev);
     void        RegisterAlias(Event *ev);
-    void        RegisterAliasInternal(Event *ev, bool bCache = false);
 
 public:
     CLASS_PROTOTYPE(ScriptMaster);
 
+    ScriptMaster();
     virtual ~ScriptMaster();
 
     //
@@ -116,7 +116,7 @@ public:
 
     void SetTime(int time);
 
-    void      AddTiming(ScriptThread *thread, float time);
+    void      AddTiming(ScriptThread *thread, int time);
     void      RemoveTiming(ScriptThread *thread);
     const_str AddString(const char *s);
     const_str AddString(str& s);
diff --git a/code/fgame/scriptslave.cpp b/code/fgame/scriptslave.cpp
index 6a4f7f31..b357820f 100644
--- a/code/fgame/scriptslave.cpp
+++ b/code/fgame/scriptslave.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -43,6 +43,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "explosion.h"
 #include "game.h"
 #include "debuglines.h"
+#include "weaputils.h"
+#include "parm.h"
 
 /*****************************************************************************/
 /*QUAKED script_object (0 0.5 1) ? NOT_SOLID
@@ -50,2052 +52,1907 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ******************************************************************************/
 
 Event EV_ScriptSlave_DoMove
-	( 
-	"move",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Move the script slave.",
-	EV_NORMAL
-	);
+(
+    "move",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Move the script slave.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_WaitMove
-	( 
-	"waitmove",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Move the script slave and wait until finished.",
-	EV_NORMAL
-	);
+(
+    "waitmove",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Move the script slave and wait until finished.",
+    EV_NORMAL
+);
+Event EV_ScriptSlave_Stop
+(
+    "stop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop the script slave."
+);
+Event EV_ScriptSlave_ThreadMove
+(
+    "threadmove",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Move the script slave and create thread which waits until finished."
+);
 Event EV_ScriptSlave_Angles
-	( 
-	"angles",
-	EV_DEFAULT,
-	"v",
-	"angles",
-	"Sets the angles.",
-	EV_NORMAL
-	);
+(
+    "angles",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "Sets the angles.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_Trigger
-	( 
-	"trigger",
-	EV_DEFAULT,
-	"e",
-	"ent",
-	"Trigger entities target.",
-	EV_NORMAL
-	);
+(
+    "trigger",
+    EV_DEFAULT,
+    "e",
+    "ent",
+    "Trigger entities target.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_Next
-	( 
-	"next",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Goto the next waypoint.",
-	EV_NORMAL
-	);
+(
+    "next",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Goto the next waypoint.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_JumpTo
-	( 
-	"jumpto",
-	EV_DEFAULT,
-	"s",
-	"vector_or_entity",
-	"Jump to specified vector or entity.",
-	EV_NORMAL
-	);
+(
+    "jumpto",
+    EV_DEFAULT,
+    "s",
+    "vector_or_entity",
+    "Jump to specified vector or entity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveTo
-	( 
-	"moveto",
-	EV_DEFAULT,
-	"s",
-	"vector_or_entity",
-	"Move to the specified vector or entity.",
-	EV_NORMAL
-	);
+(
+    "moveto",
+    EV_DEFAULT,
+    "s",
+    "vector_or_entity",
+    "Move to the specified vector or entity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_Speed
-	( 
-	"speed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"Sets the speed.",
-	EV_NORMAL
-	);
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the speed.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_Time
-	( 
-	"time",
-	EV_DEFAULT,
-	"f",
-	"travel_time",
-	"Sets the travel time.",
-	EV_NORMAL
-	);
+(
+    "time",
+    EV_DEFAULT,
+    "f",
+    "travel_time",
+    "Sets the travel time.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveUp
-	(
-	"moveUp",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position up.",
-	EV_NORMAL
-	);
+(
+    "moveUp",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position up.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveDown
-	( 
-	"moveDown",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position down.",
-	EV_NORMAL
-	);
+(
+    "moveDown",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position down.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveNorth
-	( 
-	"moveNorth",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position north.",
-	EV_NORMAL
-	);
+(
+    "moveNorth",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position north.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveSouth
-	( 
-	"moveSouth",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position south.",
-	EV_NORMAL
-	);
+(
+    "moveSouth",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position south.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveEast
-	( 
-	"moveEast",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position east.",
-	EV_NORMAL
-	);
+(
+    "moveEast",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position east.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveWest
-	( 
-	"moveWest",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position west.",
-	EV_NORMAL
-	);
+(
+    "moveWest",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position west.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveForward
-	( 
-	"moveForward",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position forward.",
-	EV_NORMAL
-	);
+(
+    "moveForward",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position forward.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveBackward
-	( 
-	"moveBackward",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position backward.",
-	EV_NORMAL
-	);
+(
+    "moveBackward",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position backward.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveLeft
-	( 
-	"moveLeft",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position left.",
-	EV_NORMAL
-	);
+(
+    "moveLeft",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position left.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveRight
-	( 
-	"moveRight",
-	EV_DEFAULT,
-	"f",
-	"dist",
-	"Move the position right.",
-	EV_NORMAL
-	);
+(
+    "moveRight",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Move the position right.",
+    EV_NORMAL
+);
+Event EV_ScriptSlave_MoveOffset
+(
+    "moveOffset",
+    EV_DEFAULT,
+    "v",
+    "dist",
+    "Move the position by the offset vector.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateXDownTo
-	( 
-	"rotateXdownto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the x down to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateXdownto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the x down to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateYDownTo
-	( 
-	"rotateYdownto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the y down to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateYdownto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the y down to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateZDownTo
-	( 
-	"rotateZdownto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the z down to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateZdownto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the z down to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateAxisDownTo
-	( 
-	"rotateaxisdownto",
-	EV_DEFAULT,
-	"if",
-	"axis angle",
-	"Rotate the specified axis down to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateaxisdownto",
+    EV_DEFAULT,
+    "if",
+    "axis angle",
+    "Rotate the specified axis down to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateXUpTo
-	( 
-	"rotateXupto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the x up to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateXupto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the x up to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateYUpTo
-	( 
-	"rotateYupto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the y up to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateYupto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the y up to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateZUpTo
-	( 
-	"rotateZupto",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the z up to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateZupto",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the z up to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateAxisUpTo
-	( 
-	"rotateaxisupto",
-	EV_DEFAULT,
-	"if",
-	"axis angle",
-	"Rotate the specified axis up to angle.",
-	EV_NORMAL
-	);
+(
+    "rotateaxisupto",
+    EV_DEFAULT,
+    "if",
+    "axis angle",
+    "Rotate the specified axis up to angle.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateXDown
-	( 
-	"rotateXdown",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the x down by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateXdown",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the x down by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateYDown
-	( 
-	"rotateYdown",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the y down by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateYdown",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the y down by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateZDown
-	( 
-	"rotateZdown",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the z down by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateZdown",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the z down by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateAxisDown
-	( 
-	"rotateaxisdown",
-	EV_DEFAULT,
-	"if",
-	"axis angle",
-	"Rotate the specified axis down by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateaxisdown",
+    EV_DEFAULT,
+    "if",
+    "axis angle",
+    "Rotate the specified axis down by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateXUp
-	( 
-	"rotateXup",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the x up by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateXup",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the x up by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateYUp
-	( 
-	"rotateYup",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the y up by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateYup",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the y up by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateZUp
-	( 
-	"rotateZup",
-	EV_DEFAULT,
-	"f",
-	"angle",
-	"Rotate the z up by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateZup",
+    EV_DEFAULT,
+    "f",
+    "angle",
+    "Rotate the z up by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateAxisUp
-	( 
-	"rotateaxisup",
-	EV_DEFAULT,
-	"if",
-	"axis angle",
-	"Rotate the specified axis up by the specified amount.",
-	EV_NORMAL
-	);
+(
+    "rotateaxisup",
+    EV_DEFAULT,
+    "if",
+    "axis angle",
+    "Rotate the specified axis up by the specified amount.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateX
-	( 
-	"rotateX",
-	EV_DEFAULT,
-	"f",
-	"avelocity",
-	"Rotate about the x axis at the specified angular velocity.",
-	EV_NORMAL
-	);
+(
+    "rotateX",
+    EV_DEFAULT,
+    "f",
+    "avelocity",
+    "Rotate about the x axis at the specified angular velocity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateY
-	( 
-	"rotateY",
-	EV_DEFAULT,
-	"f",
-	"avelocity",
-	"Rotate about the y axis at the specified angular velocity.",
-	EV_NORMAL
-	);
+(
+    "rotateY",
+    EV_DEFAULT,
+    "f",
+    "avelocity",
+    "Rotate about the y axis at the specified angular velocity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateZ
-	( 
-	"rotateZ",
-	EV_DEFAULT,
-	"f",
-	"avelocity",
-	"Rotate about the z axis at the specified angular velocity.",
-	EV_NORMAL
-	);
+(
+    "rotateZ",
+    EV_DEFAULT,
+    "f",
+    "avelocity",
+    "Rotate about the z axis at the specified angular velocity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateAxis
-	( 
-	"rotateaxis",
-	EV_DEFAULT,
-	"if",
-	"axis avelocity",
-	"Rotate about the specified axis at the specified angular velocity.",
-	EV_NORMAL
-	);
+(
+    "rotateaxis",
+    EV_DEFAULT,
+    "if",
+    "axis avelocity",
+    "Rotate about the specified axis at the specified angular velocity.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateDownTo
-	( 
-	"rotatedownto",
-	EV_DEFAULT,
-	"v",
-	"direction",
-	"Rotate down to the specified direction.",
-	EV_NORMAL
-	);
+(
+    "rotatedownto",
+    EV_DEFAULT,
+    "v",
+    "direction",
+    "Rotate down to the specified direction.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateUpTo
-	( 
-	"rotateupto",
-	EV_DEFAULT,
-	"v",
-	"direction",
-	"Rotate up to the specified direction.",
-	EV_NORMAL
-	);
+(
+    "rotateupto",
+    EV_DEFAULT,
+    "v",
+    "direction",
+    "Rotate up to the specified direction.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_RotateTo
-	( 
-	"rotateto",
-	EV_DEFAULT,
-	"v",
-	"direction",
-	"Rotate to the specified direction.",
-	EV_NORMAL
-	);
+(
+    "rotateto",
+    EV_DEFAULT,
+    "v",
+    "direction",
+    "Rotate to the specified direction.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_SetDamage
-	( 
-	"setdamage",
-	EV_DEFAULT,
-	"i",
-	"damage",
-	"Set the damage.",
-	EV_NORMAL
-	);
+(
+    "setdamage",
+    EV_DEFAULT,
+    "i",
+    "damage",
+    "Set the damage.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_SetMeansOfDeath
-	( 
-	"setmeansofdeath",
-	EV_DEFAULT,
-	"s",
-	"means_of_death",
-	"Set the damage means of death.",
-	EV_NORMAL
-	);
+(
+    "setmeansofdeath",
+    EV_DEFAULT,
+    "s",
+    "means_of_death",
+    "Set the damage means of death.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_SetDamageSpawn
-	( 
-	"dmg",
-	EV_DEFAULT,
-	"i",
-	"damage",
-	"Set the damage.",
-	EV_NORMAL
-	);
+(
+    "dmg",
+    EV_DEFAULT,
+    "i",
+    "damage",
+    "Set the damage.",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_FollowPath
-	( 
-	"followpath",
-	EV_DEFAULT,
-	"eSSSSSS",
-	"path arg1 arg2 arg3 arg4 arg5 arg6",
-	"Makes the script slave follow the specified path.  The allowable arguments are ignoreangles,\n"
-	"normalangles, loop, and a number specifying the start time.",
-	EV_NORMAL
-	);
+(
+    "followpath",
+    EV_DEFAULT,
+    "eSSSSSS",
+    "path arg1 arg2 arg3 arg4 arg5 arg6",
+    "Makes the script slave follow the specified path.  The allowable arguments are ignoreangles,\n"
+    "ignorevelocity, normalangles, loop, and a number specifying the start time.",
+    EV_NORMAL
+);
+Event EV_ScriptSlave_FollowPath_RelativeYaw
+(
+    "path_relativeyaw",
+    EV_DEFAULT,
+    "f",
+    "relativeYaw",
+    "Makes the script slave follow the specified path with a yaw offset,",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_EndPath
-	( 
-	"endpath",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Stop following the path",
-	EV_NORMAL
-	);
+(
+    "endpath",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stop following the path",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_MoveDone
-	( 
-	"scriptslave_movedone",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Called when the script slave is doen moving",
-	EV_NORMAL
-	);
+(
+    "scriptslave_movedone",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called when the script slave is doen moving",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_FollowingPath
-	( 
-	"scriptslave_followingpath",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Called every frame to actually follow the path",
-	EV_NORMAL
-	);
+(
+    "scriptslave_followingpath",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Called every frame to actually follow the path",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_Explode
-	( 
-	"explode",
-	EV_DEFAULT,
-	"f",
-	"damage",
-	"Creates an explosion at the script slave's position",
-	EV_NORMAL
-	);
+(
+    "explode",
+    EV_DEFAULT,
+    "f",
+    "damage",
+    "Creates an explosion at the script slave's position",
+    EV_NORMAL
+);
 Event EV_ScriptSlave_NotShootable
-	( 
-	"notshootable",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Makes the script slave not shootable",
-	EV_NORMAL
-	);
+(
+    "notshootable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the script slave not shootable",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_OpenAreaPortal
-	( 
-	"openportal",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Open the area portal enclosed in this object",
-	EV_NORMAL
-	);
+(
+    "openportal",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Open the area portal enclosed in this object",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_CloseAreaPortal
-	( 
-	"closeportal",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Close the area portal enclosed in this object",
-	EV_NORMAL
-	);
+(
+    "closeportal",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Close the area portal enclosed in this object",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_PhysicsOn
-	( 
-	"physics_on",
-	EV_DEFAULT,
-	"I",
-	"no_collide_entity",
-	"Turn physics on this script object on\n"
-	"If no_collide_entity is set to 1 then the script slave will not collide with other entities",
-	EV_NORMAL
-	);
+(
+    "physics_on",
+    EV_DEFAULT,
+    "I",
+    "no_collide_entity",
+    "Turn physics on this script object on\n"
+    "If no_collide_entity is set to 1 then the script slave will not collide with other entities",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_PhysicsOff
-	( 
-	"physics_off",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Turn physics off this script object on",
-	EV_NORMAL
-	);
+(
+    "physics_off",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn physics off this script object on",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_PhysicsVelocity
-	( 
-	"physics_velocity",
-	EV_DEFAULT,
-	"v",
-	"impulseVector",
-	"Add a physical impulse to an object when it is being physically simulated",
-	EV_NORMAL
-	);
+(
+    "physics_velocity",
+    EV_DEFAULT,
+    "v",
+    "impulseVector",
+    "Add a physical impulse to an object when it is being physically simulated",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_FlyPath
-	( 
-	"flypath",
-	EV_DEFAULT,
-	"efff",
-	"array speed acceleration look_ahead",
-	"Makes the script slave fly the specified path with speed and acceleration until reached_distance close to position",
-	EV_NORMAL
-	);
+(
+    "flypath",
+    EV_DEFAULT,
+    "efff",
+    "array speed acceleration look_ahead",
+    "Makes the script slave fly the specified path with speed and acceleration until reached_distance close to "
+    "position",
+    EV_NORMAL
+);
 
 Event EV_ScriptSlave_ModifyFlyPath
-	( 
-	"modifyflypath",
-	EV_DEFAULT,
-	"efff",
-	"array speed acceleration look_ahead",
-	"Makes the script slave fly the specified path with speed and acceleration until reached_distance close to position",
-	EV_NORMAL
-	);
+(
+    "modifyflypath",
+    EV_DEFAULT,
+    "efff",
+    "array speed acceleration look_ahead",
+    "Makes the script slave fly the specified path with speed and acceleration until reached_distance close to "
+    "position",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( Mover, ScriptSlave, "script_object" )
-{
-	{ &EV_Bind,								&ScriptSlave::BindEvent },
-	{ &EV_Unbind,							&ScriptSlave::EventUnbind },
-	{ &EV_ScriptSlave_DoMove,				&ScriptSlave::DoMove },
-	{ &EV_ScriptSlave_WaitMove,				&ScriptSlave::WaitMove },
-	{ &EV_ScriptSlave_Angles,				&ScriptSlave::SetAnglesEvent },
-	{ &EV_SetAngle,							&ScriptSlave::SetAngleEvent },
-	{ &EV_Model,							&ScriptSlave::SetModelEvent },
-	{ &EV_ScriptSlave_Trigger,				&ScriptSlave::TriggerEvent },
-	{ &EV_ScriptSlave_Next,					&ScriptSlave::GotoNextWaypoint },
-	{ &EV_ScriptSlave_JumpTo,				&ScriptSlave::JumpTo },
-	{ &EV_ScriptSlave_MoveTo,				&ScriptSlave::MoveToEvent },
-	{ &EV_ScriptSlave_Speed,				&ScriptSlave::SetSpeed },
-	{ &EV_ScriptSlave_Time,					&ScriptSlave::SetTime },
-	{ &EV_ScriptSlave_MoveUp,				&ScriptSlave::MoveUp },
-	{ &EV_ScriptSlave_MoveDown,				&ScriptSlave::MoveDown },
-	{ &EV_ScriptSlave_MoveNorth,			&ScriptSlave::MoveNorth },
-	{ &EV_ScriptSlave_MoveSouth,			&ScriptSlave::MoveSouth },
-	{ &EV_ScriptSlave_MoveEast,				&ScriptSlave::MoveEast },
-	{ &EV_ScriptSlave_MoveWest,				&ScriptSlave::MoveWest },
-	{ &EV_ScriptSlave_MoveForward,			&ScriptSlave::MoveForward },
-	{ &EV_ScriptSlave_MoveBackward,			&ScriptSlave::MoveBackward },
-	{ &EV_ScriptSlave_MoveLeft,				&ScriptSlave::MoveLeft },
-	{ &EV_ScriptSlave_MoveRight,			&ScriptSlave::MoveRight },
-	{ &EV_ScriptSlave_RotateXDownTo,		&ScriptSlave::RotateXdownto },
-	{ &EV_ScriptSlave_RotateYDownTo,		&ScriptSlave::RotateYdownto },
-	{ &EV_ScriptSlave_RotateZDownTo,		&ScriptSlave::RotateZdownto },
-	{ &EV_ScriptSlave_RotateXUpTo,			&ScriptSlave::RotateXupto },
-	{ &EV_ScriptSlave_RotateYUpTo,			&ScriptSlave::RotateYupto },
-	{ &EV_ScriptSlave_RotateZUpTo,			&ScriptSlave::RotateZupto },
-	{ &EV_ScriptSlave_RotateXDown,			&ScriptSlave::RotateXdown },
-	{ &EV_ScriptSlave_RotateYDown,			&ScriptSlave::RotateYdown },
-	{ &EV_ScriptSlave_RotateZDown,			&ScriptSlave::RotateZdown },
-	{ &EV_ScriptSlave_RotateXUp,			&ScriptSlave::RotateXup },
-	{ &EV_ScriptSlave_RotateYUp,			&ScriptSlave::RotateYup },
-	{ &EV_ScriptSlave_RotateZUp,			&ScriptSlave::RotateZup },
-	{ &EV_ScriptSlave_RotateX,				&ScriptSlave::RotateX },
-	{ &EV_ScriptSlave_RotateY,				&ScriptSlave::RotateY },
-	{ &EV_ScriptSlave_RotateZ,				&ScriptSlave::RotateZ },
-	{ &EV_ScriptSlave_RotateAxisDownTo,		&ScriptSlave::RotateAxisdownto },
-	{ &EV_ScriptSlave_RotateAxisUpTo,		&ScriptSlave::RotateAxisupto },
-	{ &EV_ScriptSlave_RotateAxisDown,		&ScriptSlave::RotateAxisdown },
-	{ &EV_ScriptSlave_RotateAxisUp,			&ScriptSlave::RotateAxisup },
-	{ &EV_ScriptSlave_RotateAxis,			&ScriptSlave::RotateZ },
-	{ &EV_ScriptSlave_SetDamage,			&ScriptSlave::SetDamage },
-	{ &EV_ScriptSlave_SetMeansOfDeath,		&ScriptSlave::SetMeansOfDeath },
-	{ &EV_ScriptSlave_SetDamageSpawn,		&ScriptSlave::SetDamage },
-	{ &EV_ScriptSlave_FollowPath,			&ScriptSlave::FollowPath },
-	{ &EV_ScriptSlave_EndPath,				&ScriptSlave::EndPath },
-	{ &EV_ScriptSlave_FollowingPath,		&ScriptSlave::FollowingPath },
-	{ &EV_ScriptSlave_MoveDone,				&ScriptSlave::MoveEnd },
-	{ &EV_Damage,							&ScriptSlave::DamageFunc },
-	{ &EV_ScriptSlave_RotateDownTo,			&ScriptSlave::Rotatedownto },
-	{ &EV_ScriptSlave_RotateUpTo,			&ScriptSlave::Rotateupto },
-	{ &EV_ScriptSlave_RotateTo,				&ScriptSlave::Rotateto },
-	{ &EV_ScriptSlave_Explode,				&ScriptSlave::Explode },
-	{ &EV_ScriptSlave_NotShootable,			&ScriptSlave::NotShootable },
-	{ &EV_ScriptSlave_OpenAreaPortal,		&ScriptSlave::OpenPortal },
-	{ &EV_ScriptSlave_CloseAreaPortal,		&ScriptSlave::ClosePortal },
-	{ &EV_ScriptSlave_PhysicsOn,			&ScriptSlave::PhysicsOn },
-	{ &EV_ScriptSlave_PhysicsOff,			&ScriptSlave::PhysicsOff },
-	{ &EV_ScriptSlave_PhysicsVelocity,		&ScriptSlave::PhysicsVelocity },
-	{ &EV_ScriptSlave_FlyPath,				&ScriptSlave::EventFlyPath },
-	{ &EV_ScriptSlave_ModifyFlyPath,		&ScriptSlave::EventModifyFlyPath },
+Event EV_ScriptSlave_NormalAngles
+(
+    "normalangles",
+    EV_DEFAULT,
+    "b",
+    "bUseNormalAngles",
+    "Sets the object to use normal angles when travelling on a spline path",
+    EV_NORMAL
+);
 
-	{ NULL, NULL }
+CLASS_DECLARATION(Mover, ScriptSlave, "script_object") {
+    {&EV_Bind,                               &ScriptSlave::BindEvent            },
+    {&EV_Unbind,                             &ScriptSlave::EventUnbind          },
+    {&EV_ScriptSlave_DoMove,                 &ScriptSlave::DoMove               },
+    {&EV_ScriptSlave_WaitMove,               &ScriptSlave::WaitMove             },
+    {&EV_ScriptSlave_Stop,                   &ScriptSlave::Stop                 },
+    {&EV_ScriptSlave_ThreadMove,             &ScriptSlave::ThreadMove           },
+    {&EV_ScriptSlave_Angles,                 &ScriptSlave::SetAnglesEvent       },
+    {&EV_SetAngle,                           &ScriptSlave::SetAngleEvent        },
+    {&EV_Model,                              &ScriptSlave::SetModelEvent        },
+    {&EV_ScriptSlave_Trigger,                &ScriptSlave::TriggerEvent         },
+    {&EV_ScriptSlave_Next,                   &ScriptSlave::GotoNextWaypoint     },
+    {&EV_ScriptSlave_JumpTo,                 &ScriptSlave::JumpTo               },
+    {&EV_ScriptSlave_MoveTo,                 &ScriptSlave::MoveToEvent          },
+    {&EV_ScriptSlave_Speed,                  &ScriptSlave::SetSpeed             },
+    {&EV_ScriptSlave_Time,                   &ScriptSlave::SetTime              },
+    {&EV_ScriptSlave_MoveUp,                 &ScriptSlave::MoveUp               },
+    {&EV_ScriptSlave_MoveDown,               &ScriptSlave::MoveDown             },
+    {&EV_ScriptSlave_MoveNorth,              &ScriptSlave::MoveNorth            },
+    {&EV_ScriptSlave_MoveSouth,              &ScriptSlave::MoveSouth            },
+    {&EV_ScriptSlave_MoveEast,               &ScriptSlave::MoveEast             },
+    {&EV_ScriptSlave_MoveWest,               &ScriptSlave::MoveWest             },
+    {&EV_ScriptSlave_MoveForward,            &ScriptSlave::MoveForward          },
+    {&EV_ScriptSlave_MoveBackward,           &ScriptSlave::MoveBackward         },
+    {&EV_ScriptSlave_MoveLeft,               &ScriptSlave::MoveLeft             },
+    {&EV_ScriptSlave_MoveRight,              &ScriptSlave::MoveRight            },
+    {&EV_ScriptSlave_MoveOffset,             &ScriptSlave::MoveOffset           },
+    {&EV_ScriptSlave_RotateXDownTo,          &ScriptSlave::RotateXdownto        },
+    {&EV_ScriptSlave_RotateYDownTo,          &ScriptSlave::RotateYdownto        },
+    {&EV_ScriptSlave_RotateZDownTo,          &ScriptSlave::RotateZdownto        },
+    {&EV_ScriptSlave_RotateXUpTo,            &ScriptSlave::RotateXupto          },
+    {&EV_ScriptSlave_RotateYUpTo,            &ScriptSlave::RotateYupto          },
+    {&EV_ScriptSlave_RotateZUpTo,            &ScriptSlave::RotateZupto          },
+    {&EV_ScriptSlave_RotateXDown,            &ScriptSlave::RotateXdown          },
+    {&EV_ScriptSlave_RotateYDown,            &ScriptSlave::RotateYdown          },
+    {&EV_ScriptSlave_RotateZDown,            &ScriptSlave::RotateZdown          },
+    {&EV_ScriptSlave_RotateXUp,              &ScriptSlave::RotateXup            },
+    {&EV_ScriptSlave_RotateYUp,              &ScriptSlave::RotateYup            },
+    {&EV_ScriptSlave_RotateZUp,              &ScriptSlave::RotateZup            },
+    {&EV_ScriptSlave_RotateX,                &ScriptSlave::RotateX              },
+    {&EV_ScriptSlave_RotateY,                &ScriptSlave::RotateY              },
+    {&EV_ScriptSlave_RotateZ,                &ScriptSlave::RotateZ              },
+    {&EV_ScriptSlave_RotateAxisDownTo,       &ScriptSlave::RotateAxisdownto     },
+    {&EV_ScriptSlave_RotateAxisUpTo,         &ScriptSlave::RotateAxisupto       },
+    {&EV_ScriptSlave_RotateAxisDown,         &ScriptSlave::RotateAxisdown       },
+    {&EV_ScriptSlave_RotateAxisUp,           &ScriptSlave::RotateAxisup         },
+    {&EV_ScriptSlave_RotateAxis,             &ScriptSlave::RotateZ              },
+    {&EV_ScriptSlave_SetDamage,              &ScriptSlave::SetDamage            },
+    {&EV_ScriptSlave_SetMeansOfDeath,        &ScriptSlave::SetMeansOfDeath      },
+    {&EV_ScriptSlave_SetDamageSpawn,         &ScriptSlave::SetDamage            },
+    {&EV_ScriptSlave_FollowPath,             &ScriptSlave::FollowPath           },
+    {&EV_ScriptSlave_FollowPath_RelativeYaw, &ScriptSlave::FollowPathRelativeYaw},
+    {&EV_ScriptSlave_EndPath,                &ScriptSlave::EndPath              },
+    {&EV_ScriptSlave_FollowingPath,          &ScriptSlave::FollowingPath        },
+    {&EV_Touch,                              &ScriptSlave::TouchFunc            },
+    {&EV_Blocked,                            &ScriptSlave::BlockFunc            },
+    {&EV_Activate,                           &ScriptSlave::TriggerFunc          },
+    {&EV_Use,                                &ScriptSlave::UseFunc              },
+    {&EV_ScriptSlave_MoveDone,               &ScriptSlave::MoveEnd              },
+    {&EV_Damage,                             &ScriptSlave::DamageFunc           },
+    {&EV_ScriptSlave_RotateDownTo,           &ScriptSlave::Rotatedownto         },
+    {&EV_ScriptSlave_RotateUpTo,             &ScriptSlave::Rotateupto           },
+    {&EV_ScriptSlave_RotateTo,               &ScriptSlave::Rotateto             },
+    {&EV_ScriptSlave_Explode,                &ScriptSlave::Explode              },
+    {&EV_ScriptSlave_NotShootable,           &ScriptSlave::NotShootable         },
+    {&EV_ScriptSlave_OpenAreaPortal,         &ScriptSlave::OpenPortal           },
+    {&EV_ScriptSlave_CloseAreaPortal,        &ScriptSlave::ClosePortal          },
+    {&EV_ScriptSlave_PhysicsOn,              &ScriptSlave::PhysicsOn            },
+    {&EV_ScriptSlave_PhysicsOff,             &ScriptSlave::PhysicsOff           },
+    {&EV_ScriptSlave_PhysicsVelocity,        &ScriptSlave::PhysicsVelocity      },
+    {&EV_ScriptSlave_FlyPath,                &ScriptSlave::EventFlyPath         },
+    {&EV_ScriptSlave_ModifyFlyPath,          &ScriptSlave::EventModifyFlyPath   },
+    {&EV_ScriptSlave_NormalAngles,           &ScriptSlave::EventNormalAngles    },
+    {NULL,                                   NULL                               }
 };
 
 cvar_t *g_showflypath;
 
 ScriptSlave::ScriptSlave()
 {
-	g_showflypath = gi.Cvar_Get( "g_showflypath", "0", 0 );
+    g_showflypath = gi.Cvar_Get("g_showflypath", "0", 0);
 
-	AddWaitTill(STRING_TOUCH);
-	AddWaitTill(STRING_BLOCK);
-	AddWaitTill(STRING_TRIGGER);
-	AddWaitTill(STRING_USE);
-	AddWaitTill(STRING_DAMAGE);
+    AddWaitTill(STRING_TOUCH);
+    AddWaitTill(STRING_BLOCK);
+    AddWaitTill(STRING_TRIGGER);
+    AddWaitTill(STRING_USE);
+    AddWaitTill(STRING_DAMAGE);
 
-	if( LoadingSavegame )
-	{
-		// Archive function will setup all necessary data
-		return;
-	}
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
 
-	// this is a normal entity
-	edict->s.eType = ET_GENERAL;
+    // this is a normal entity
+    edict->s.eType = ET_GENERAL;
 
-	speed = 100;
-	takedamage = DAMAGE_YES;
-	waypoint = NULL;
-	NewAngles = localangles;
-	NewPos = localorigin;
-	traveltime = 0;
-	commandswaiting = false;
+    splineTime = 0;
 
-	dmg = 2;
-	dmg_means_of_death = MOD_CRUSH;
+    ignoreangles   = false;
+    ignorevelocity = false;
+    moving         = false;
 
-	setMoveType( MOVETYPE_PUSH );
+    speed           = 100;
+    takedamage      = DAMAGE_YES;
+    waypoint        = NULL;
+    traveltime      = 0;
+    commandswaiting = false;
 
-	if( spawnflags & 2 )
-		edict->s.renderfx = RF_ALWAYSDRAW;
+    splinePath           = NULL;
+    splineangles         = false;
+    m_fFollowRelativeYaw = 0;
 
-	splinePath = NULL;
-	m_pCurPath = NULL;
-	m_iCurNode = 0;
-	m_fLookAhead = 0;
-	m_fCurSpeed = 0;
-	m_fIdealSpeed = 0;
-	m_fIdealAccel = 0;
-	m_fIdealDistance = 100;
-	splineangles = false;
-	attack_finished = 0;
+    attack_finished    = 0;
+    dmg                = 2;
+    dmg_means_of_death = MOD_CRUSH;
 
-	setSolidType( SOLID_NOT );
+    setMoveType(MOVETYPE_PUSH);
 
-	if( spawnflags & 1 )
-	{
-		PostEvent( EV_BecomeNonSolid, EV_POSTSPAWN );
-	}
+    if (spawnflags & 2) {
+        edict->s.renderfx = RF_ALWAYSDRAW;
+    }
 
-	edict->s.eFlags |= EF_LINKANGLES;
+    setSolidType(SOLID_NOT);
+
+    m_pCurPath       = NULL;
+    m_iCurNode       = 0;
+    m_fCurSpeed      = 0;
+    m_fLookAhead     = 0;
+    m_fIdealSpeed    = 0;
+    m_fIdealAccel    = 0;
+    m_fIdealDistance = 100;
+
+    if (spawnflags & 1) {
+        PostEvent(EV_BecomeNonSolid, EV_POSTSPAWN);
+    }
+
+    edict->s.eFlags |= EF_LINKANGLES;
 }
 
 ScriptSlave::~ScriptSlave()
-	{
-   if ( splinePath )
-      {
-      delete splinePath;
-      splinePath = NULL;
-      }
-   }
-
-void ScriptSlave::CheckNewOrders
-	(
-	void
-	)
 {
-	// make sure position and angles are current
-	if( !commandswaiting )
-	{
-		commandswaiting = true;
-		NewAngles = localangles;
-		NewPos = localorigin;
-	}
+    if (splinePath) {
+        delete splinePath;
+        splinePath = NULL;
+    }
 }
 
-void ScriptSlave::NewMove
-	(
-	void
-	)
+void ScriptSlave::CheckNewOrders(void)
 {
-	float dist;
-
-	CheckNewOrders();
-
-	commandswaiting = false;
-
-	if( RegisterSize( 0 ) )
-	{
-		Event ev = Event( EV_DelayThrow );
-		ev.AddConstString( STRING_FAIL );
-		BroadcastEvent( 0, ev );
-	}
-
-	if( m_pCurPath )
-	{
-		PostEvent( EV_ScriptSlave_FollowingPath, 0 );
-	}
-	else if( splinePath )
-	{
-		moving = true;
-		PostEvent( EV_ScriptSlave_FollowingPath, 0 );
-	}
-	else
-	{
-		float t = traveltime;
-		if( t == 0 )
-		{
-			dist = Vector( NewPos - localorigin ).length();
-			t = dist / speed;
-		}
-		moving = true;
-		LinearInterpolate( NewPos, NewAngles, t, EV_ScriptSlave_MoveDone );
-	}
+    // make sure position and angles are current
+    if (!commandswaiting) {
+        commandswaiting = true;
+        NewAngles       = localangles;
+        NewPos          = localorigin;
+    }
 }
 
-void ScriptSlave::BindEvent
-	(
-	Event *ev
-	)
-
-	{
-	Entity *ent;
-
-	ent = ev->GetEntity( 1 );
-	if ( ent )
-		{
-		bind( ent );
-		}
-
-	// make sure position and angles are current
-	NewAngles = localangles;
-	NewPos = localorigin;
-	}
-
-void ScriptSlave::EventUnbind
-	(
-	Event *ev
-	)
-
-	{
-	unbind();
-
-   // make sure position and angles are current
-	NewAngles = localangles;
-	NewPos = localorigin;
-	}
-
-void ScriptSlave::DoMove
-	(
-	Event *ev
-	)
+void ScriptSlave::NewMove(void)
 {
-	NewMove();
+    float dist;
+
+    CheckNewOrders();
+
+    commandswaiting = false;
+
+    if (RegisterSize(0)) {
+        Event ev = Event(EV_DelayThrow);
+        ev.AddConstString(STRING_FAIL);
+        BroadcastEvent(0, ev);
+    }
+
+    if (m_pCurPath || splinePath) {
+        PostEvent(EV_ScriptSlave_FollowingPath, 0);
+    } else {
+        float t = traveltime;
+        if (t == 0) {
+            dist = Vector(NewPos - localorigin).length();
+            t    = dist / speed;
+        }
+        LinearInterpolate(NewPos, NewAngles, t, EV_ScriptSlave_MoveDone);
+    }
 }
 
-void ScriptSlave::WaitMove( Event *ev )
+void ScriptSlave::BindEvent(Event *ev)
 {
-	NewMove();
-	Register( 0, Director.CurrentThread() );
+    Entity *ent;
+
+    ent = ev->GetEntity(1);
+    if (ent) {
+        bind(ent);
+    }
+
+    // make sure position and angles are current
+    NewAngles = localangles;
+    NewPos    = localorigin;
 }
 
-void ScriptSlave::MoveEnd( Event *ev )
+void ScriptSlave::EventUnbind(Event *ev)
 {
-	Unregister( 0 );
+    unbind();
+
+    // make sure position and angles are current
+    NewAngles = localangles;
+    NewPos    = localorigin;
 }
 
-void ScriptSlave::SetAnglesEvent
-	(
-	Event *ev
-	)
-
-	{
-	commandswaiting = true;
-	SetAngles(ev);
-	NewAngles = localangles;
-	}
-
-void ScriptSlave::SetAngleEvent
-	(
-	Event *ev
-	)
-
-	{
-   float angle;
-
-	angle = ev->GetFloat( 1 );
-	if ( angle == -1 )
-		{
-		ForwardDir = Vector( 0, 0, 90 );
-		}
-	else if ( angle == -2 )
-		{
-		ForwardDir = Vector( 0, 0, -90 );
-		}
-	else
-		{
-		ForwardDir = Vector( 0, angle, 0 );
-		}
-   }
-
-void ScriptSlave::SetModelEvent
-	(
-	Event *ev
-	)
+void ScriptSlave::DoMove(Event *ev)
 {
-	const char *m;
-
-	m = ev->GetString( 1 );
-
-	edict->r.svFlags &= ~SVF_NOCLIENT;
-
-	if( !m || strstr( m, ".tik" ) )
-	{
-		setSolidType( SOLID_BBOX );
-		setModel( m );
-	}
-	else if( strstr( m, ".spr" ) )
-	{
-		setModel( m );
-		setSolidType( SOLID_NOT );
-	}
-	else
-	{
-		setModel( m );
-	}
-
-	if( !edict->s.modelindex )
-	{
-		hideModel();
-		setSolidType( SOLID_NOT );
-	}
+    NewMove();
 }
 
-void ScriptSlave::TriggerEvent
-	(
-	Event *ev
-	)
-
-	{
-	Entity *ent;
-	Event	 *e;
-
-	ent = ev->GetEntity( 1 );
-	if ( ent )
-		{
-		target = ent->TargetName();
-
-		e = new Event( EV_Trigger_ActivateTargets );
-		//fixme
-		//get "other"
-		e->AddEntity( world );
-		ProcessEvent( e );
-		}
-	}
-
-void ScriptSlave::GotoNextWaypoint
-	(
-	Event *ev
-	)
-
-	{
-	commandswaiting = true;
-
-	if ( !waypoint )
-		{
-		ScriptError( "%s is currently not at a waypoint", TargetName().c_str() );
-		return;
-		}
-
-	waypoint = ( Waypoint * )G_FindTarget( NULL, waypoint->Target() );
-	if ( !waypoint )
-		{
-		ScriptError( "%s could not find waypoint %s", TargetName().c_str(), waypoint->Target().c_str() );
-		return;
-		}
-   else
-		{
-      NewPos = waypoint->origin;
-		}
-	}
-
-void ScriptSlave::JumpTo
-	(
-	Event *ev
-	)
+void ScriptSlave::WaitMove(Event *ev)
 {
-	Entity *part;
-
-	//
-	// see if it is a vector
-	//
-	if( ev->IsVectorAt( 1 ) )
-	{
-		NewPos = ev->GetVector( 1 );
-		if( bindmaster )
-		{
-			localorigin = bindmaster->getLocalVector( NewPos - bindmaster->origin );
-		}
-		else
-		{
-			localorigin = NewPos;
-		}
-
-		for( part = this; part; part = part->teamchain )
-		{
-			part->setOrigin();
-			part->origin.copyTo( part->edict->s.origin2 );
-			part->edict->s.renderfx |= RF_FRAMELERP;
-		}
-	}
-	else
-	{
-		waypoint = ev->GetWaypoint( 1 );
-		if( waypoint )
-		{
-			NewPos = waypoint->origin;
-			if( bindmaster )
-			{
-				localorigin = bindmaster->getLocalVector( NewPos - bindmaster->origin );
-			}
-			else
-			{
-				localorigin = NewPos;
-			}
-
-			for( part = this; part; part = part->teamchain )
-			{
-				part->setOrigin();
-				part->origin.copyTo( part->edict->s.origin2 );
-				part->edict->s.renderfx |= RF_FRAMELERP;
-			}
-		}
-	}
+    NewMove();
+    Register(0, Director.CurrentScriptThread());
 }
 
-void ScriptSlave::MoveToEvent
-	(
-	Event *ev
-	)
+void ScriptSlave::Stop(Event *ev)
+{
+    commandswaiting = false;
+    if (RegisterSize(0)) {
+        Event newev(EV_DelayThrow);
+        newev.AddConstString(STRING_FAIL);
+        BroadcastEvent(0, newev);
+    }
 
-	{
-	commandswaiting = true;
+    Mover::Stop();
+}
 
-   //
-   // see if it is a vector
-   //
-   if ( ev->IsVectorAt( 1 ) )
-      {
-      NewPos = ev->GetVector( 1 );
-      }
-   else
-      {
-	   waypoint = ( Waypoint * )ev->GetEntity( 1 );
-	   if ( waypoint )
-		   {
-         NewPos = waypoint->origin;
-		   }
-      }
-	}
+void ScriptSlave::ThreadMove(Event *ev)
+{
+    NewMove();
+    Register(0, CreateThreadInternal(ev->GetValue(1)));
+}
 
-void ScriptSlave::SetSpeed
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveEnd(Event *ev)
+{
+    Unregister(0);
+}
 
-	{
-	speed = ev->GetFloat( 1 );
-	traveltime = 0;
-	}
+void ScriptSlave::SetAnglesEvent(Event *ev)
+{
+    CheckNewOrders();
+    SetAngles(ev);
+    NewAngles = localangles;
+}
 
-void ScriptSlave::SetTime
-	(
-	Event *ev
-	)
+void ScriptSlave::SetAngleEvent(Event *ev)
+{
+    float angle;
 
-	{
-	traveltime = ev->GetFloat( 1 );
-	}
+    angle = ev->GetFloat(1);
+    if (angle == -1) {
+        ForwardDir = Vector(0, 0, 90);
+    } else if (angle == -2) {
+        ForwardDir = Vector(0, 0, -90);
+    } else {
+        ForwardDir = Vector(0, angle, 0);
+    }
+}
+
+void ScriptSlave::SetModelEvent(Event *ev)
+{
+    str m;
+
+    m = ev->GetString(1);
+
+    edict->r.svFlags &= ~SVF_NOCLIENT;
+
+    if (!m || strstr(m, ".tik")) {
+        setSolidType(SOLID_BBOX);
+        setModel(m);
+        if (!edict->s.modelindex) {
+            hideModel();
+            setSolidType(SOLID_NOT);
+        }
+    } else if (strstr(m, ".spr")) {
+        setModel(m);
+        if (!edict->s.modelindex) {
+            hideModel();
+        }
+        setSolidType(SOLID_NOT);
+    } else {
+        setModel(m);
+        if (edict->s.modelindex) {
+            setSolidType(SOLID_BSP);
+        } else {
+            hideModel();
+            setSolidType(SOLID_NOT);
+        }
+    }
+
+    if (!edict->s.modelindex) {
+        hideModel();
+        setSolidType(SOLID_NOT);
+    }
+}
+
+void ScriptSlave::TriggerEvent(Event *ev)
+{
+    Entity *ent;
+    Event  *e;
+
+    ent = ev->GetEntity(1);
+    if (ent) {
+        target = ent->TargetName();
+
+        e = new Event(EV_Trigger_ActivateTargets);
+        //fixme
+        //get "other"
+        e->AddEntity(world);
+        ProcessEvent(e);
+    }
+}
+
+void ScriptSlave::GotoNextWaypoint(Event *ev)
+{
+    CheckNewOrders();
+
+    if (!waypoint) {
+        ScriptError("%s is currently not at a waypoint", TargetName().c_str());
+        return;
+    }
+
+    waypoint = (Waypoint *)G_FindTarget(NULL, waypoint->Target());
+    if (!waypoint) {
+        ScriptError("%s could not find waypoint %s", TargetName().c_str(), waypoint->Target().c_str());
+        return;
+    } else {
+        NewPos = waypoint->origin;
+    }
+}
+
+void ScriptSlave::JumpTo(Event *ev)
+{
+    Entity *part;
+
+    //
+    // see if it is a vector
+    //
+    if (ev->IsVectorAt(1)) {
+        NewPos = ev->GetVector(1);
+        if (bindmaster) {
+            localorigin = bindmaster->getLocalVector(NewPos - bindmaster->origin);
+        } else {
+            localorigin = NewPos;
+        }
+
+        for (part = this; part; part = part->teamchain) {
+            part->setOrigin();
+            part->origin.copyTo(part->edict->s.origin2);
+            part->edict->s.renderfx |= RF_FRAMELERP;
+        }
+    } else {
+        waypoint = ev->GetWaypoint(1);
+        if (waypoint) {
+            NewPos = waypoint->origin;
+            if (bindmaster) {
+                localorigin = bindmaster->getLocalVector(NewPos - bindmaster->origin);
+            } else {
+                localorigin = NewPos;
+            }
+
+            for (part = this; part; part = part->teamchain) {
+                part->setOrigin();
+                part->origin.copyTo(part->edict->s.origin2);
+                part->edict->s.renderfx |= RF_FRAMELERP;
+            }
+        }
+    }
+}
+
+void ScriptSlave::MoveToEvent(Event *ev)
+{
+    CheckNewOrders();
+
+    //
+    // see if it is a vector
+    //
+    if (ev->IsVectorAt(1)) {
+        NewPos = ev->GetVector(1);
+    } else {
+        SimpleEntity* ent;
+
+        ent = ev->GetSimpleEntity(1);
+        if (ent) {
+            //
+            // see if it is a waypoint
+            //
+            if (ent->IsSubclassOfWaypoint()) {
+                waypoint = static_cast<Waypoint*>(ent);
+            }
+            // use the entity's origin
+            NewPos = ent->origin;
+        }
+    }
+}
+
+void ScriptSlave::SetSpeed(Event *ev)
+{
+    speed      = ev->GetFloat(1);
+    traveltime = 0;
+}
+
+void ScriptSlave::SetTime(Event *ev)
+{
+    traveltime = ev->GetFloat(1);
+}
 
 // Relative move commands
 
-void ScriptSlave::MoveUp
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveUp(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 2 ] += ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[2] += ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveDown
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveDown(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 2 ] -= ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[2] -= ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveNorth
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveNorth(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 1 ] += ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[1] += ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveSouth
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveSouth(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 1 ] -= ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[1] -= ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveEast
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveEast(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 0 ] += ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[0] += ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveWest
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveWest(Event *ev)
 {
-	CheckNewOrders();
-	NewPos[ 0 ] -= ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewPos[0] -= ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveForward
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveForward(Event *ev)
 {
-	Vector v;
-	Vector t;
+    Vector v;
+    Vector t;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	t = NewAngles + ForwardDir;
-	t.AngleVectorsLeft( &v, NULL, NULL );
+    t = NewAngles + ForwardDir;
+    t.AngleVectorsLeft(&v, NULL, NULL);
 
-	NewPos += v * ev->GetFloat( 1 );
+    NewPos += v * ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveBackward
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveBackward(Event *ev)
 {
-	Vector v;
-	Vector t;
+    Vector v;
+    Vector t;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	t = NewAngles + ForwardDir;
-	t.AngleVectorsLeft( &v, NULL, NULL );
+    t = NewAngles + ForwardDir;
+    t.AngleVectorsLeft(&v, NULL, NULL);
 
-	NewPos -= v * ev->GetFloat( 1 );
+    NewPos -= v * ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveLeft
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveLeft(Event *ev)
 {
-	Vector v;
-	Vector t;
+    Vector v;
+    Vector t;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	t = NewAngles + ForwardDir;
-	t.AngleVectorsLeft( NULL, &v, NULL );
+    t = NewAngles + ForwardDir;
+    t.AngleVectorsLeft(NULL, &v, NULL);
 
-	NewPos += v * ev->GetFloat( 1 );
+    NewPos += v * ev->GetFloat(1);
 }
 
-void ScriptSlave::MoveRight
-	(
-	Event *ev
-	)
+void ScriptSlave::MoveRight(Event *ev)
 {
-	Vector t;
-	Vector v;
+    Vector t;
+    Vector v;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	t = NewAngles + ForwardDir;
-	t.AngleVectorsLeft( NULL, &v, NULL );
+    t = NewAngles + ForwardDir;
+    t.AngleVectorsLeft(NULL, &v, NULL);
 
-	NewPos -= v * ev->GetFloat( 1 );
+    NewPos -= v * ev->GetFloat(1);
+}
+
+void ScriptSlave::MoveOffset(Event *ev)
+{
+    CheckNewOrders();
+    NewPos += ev->GetVector(1);
 }
 
 // exact rotate commands
 
-void ScriptSlave::RotateXdownto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateXdownto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 0 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 0 ] > localangles[ 0 ] )
-	{
-		NewAngles[ 0 ] -= 360;
-	}
+    NewAngles[0] = ev->GetFloat(1);
+    if (NewAngles[0] > localangles[0]) {
+        NewAngles[0] -= 360;
+    }
 }
 
-void ScriptSlave::RotateYdownto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateYdownto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 1 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 1 ] > localangles[ 1 ] )
-	{
-		NewAngles[ 1 ] -= 360;
-	}
+    NewAngles[1] = ev->GetFloat(1);
+    if (NewAngles[1] > localangles[1]) {
+        NewAngles[1] -= 360;
+    }
 }
 
-void ScriptSlave::RotateZdownto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateZdownto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 2 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 2 ] > localangles[ 2 ] )
-	{
-		NewAngles[ 2 ] -= 360;
-	}
+    NewAngles[2] = ev->GetFloat(1);
+    if (NewAngles[2] > localangles[2]) {
+        NewAngles[2] -= 360;
+    }
 }
 
-void ScriptSlave::RotateAxisdownto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateAxisdownto(Event *ev)
 {
-	int axis;
-	CheckNewOrders();
+    int axis;
+    CheckNewOrders();
 
-	axis = ev->GetInteger( 1 );
-	NewAngles[ axis ] = ev->GetFloat( 2 );
-	if ( NewAngles[ axis ] > localangles[ axis ] )
-	{
-		NewAngles[ axis ] -= 360;
-	}
+    axis            = ev->GetInteger(1);
+    NewAngles[axis] = ev->GetFloat(2);
+    if (NewAngles[axis] > localangles[axis]) {
+        NewAngles[axis] -= 360;
+    }
 }
 
-void ScriptSlave::RotateXupto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateXupto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 0 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 0 ] < localangles[ 0 ] )
-	{
-		NewAngles[ 0 ] += 360;
-	}
+    NewAngles[0] = ev->GetFloat(1);
+    if (NewAngles[0] < localangles[0]) {
+        NewAngles[0] += 360;
+    }
 }
 
-void ScriptSlave::RotateYupto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateYupto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 1 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 1 ] < localangles[ 1 ] )
-	{
-		NewAngles[ 1 ] += 360;
-	}
+    NewAngles[1] = ev->GetFloat(1);
+    if (NewAngles[1] < localangles[1]) {
+        NewAngles[1] += 360;
+    }
 }
 
-void ScriptSlave::RotateZupto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateZupto(Event *ev)
 {
-	CheckNewOrders();
+    CheckNewOrders();
 
-	NewAngles[ 2 ] = ev->GetFloat( 1 );
-	if ( NewAngles[ 2 ] < localangles[ 2 ] )
-	{
-		NewAngles[ 2 ] += 360;
-	}
+    NewAngles[2] = ev->GetFloat(1);
+    if (NewAngles[2] < localangles[2]) {
+        NewAngles[2] += 360;
+    }
 }
 
-void ScriptSlave::RotateAxisupto
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateAxisupto(Event *ev)
 {
-	int axis;
-	CheckNewOrders();
+    int axis;
+    CheckNewOrders();
 
-	axis = ev->GetInteger( 1 );
-	NewAngles[ axis ] = ev->GetFloat( 2 );
-	if ( NewAngles[ axis ] < localangles[ axis ] )
-	{
-		NewAngles[ axis ] += 360;
-	}
+    axis            = ev->GetInteger(1);
+    NewAngles[axis] = ev->GetFloat(2);
+    if (NewAngles[axis] < localangles[axis]) {
+        NewAngles[axis] += 360;
+    }
 }
 
 // full vector rotation
 
-void ScriptSlave::Rotatedownto
-	(
-	Event *ev
-	)
+void ScriptSlave::Rotatedownto(Event *ev)
 {
-	Vector ang;
+    Vector ang;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	ang = ev->GetVector( 1 );
+    ang = ev->GetVector(1);
 
-	NewAngles[ 0 ] = ang[ 0 ];
-	if ( NewAngles[ 0 ] > localangles[ 0 ] )
-	{
-		NewAngles[ 0 ] -= 360;
-	}
-	NewAngles[ 1 ] = ang[ 1 ];
-	if ( NewAngles[ 1 ] > localangles[ 1 ] )
-	{
-		NewAngles[ 1 ] -= 360;
-	}
-	NewAngles[ 2 ] = ang[ 2 ];
-	if ( NewAngles[ 2 ] > localangles[ 2 ] )
-	{
-		NewAngles[ 2 ] -= 360;
-	}
+    NewAngles[0] = ang[0];
+    if (NewAngles[0] > localangles[0]) {
+        NewAngles[0] -= 360;
+    }
+    NewAngles[1] = ang[1];
+    if (NewAngles[1] > localangles[1]) {
+        NewAngles[1] -= 360;
+    }
+    NewAngles[2] = ang[2];
+    if (NewAngles[2] > localangles[2]) {
+        NewAngles[2] -= 360;
+    }
 }
 
-void ScriptSlave::Rotateupto
-	(
-	Event *ev
-	)
+void ScriptSlave::Rotateupto(Event *ev)
 {
-	Vector ang;
+    Vector ang;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	ang = ev->GetVector( 1 );
+    ang = ev->GetVector(1);
 
-	NewAngles[ 0 ] = ang[ 0 ];
-	if ( NewAngles[ 0 ] < localangles[ 0 ] )
-	{
-		NewAngles[ 0 ] += 360;
-	}
-	NewAngles[ 1 ] = ang[ 1 ];
-	if ( NewAngles[ 1 ] < localangles[ 1 ] )
-	{
-		NewAngles[ 1 ] += 360;
-	}
-	NewAngles[ 2 ] = ang[ 2 ];
-	if ( NewAngles[ 2 ] < localangles[ 2 ] )
-	{
-		NewAngles[ 2 ] += 360;
-	}
+    NewAngles[0] = ang[0];
+    if (NewAngles[0] < localangles[0]) {
+        NewAngles[0] += 360;
+    }
+    NewAngles[1] = ang[1];
+    if (NewAngles[1] < localangles[1]) {
+        NewAngles[1] += 360;
+    }
+    NewAngles[2] = ang[2];
+    if (NewAngles[2] < localangles[2]) {
+        NewAngles[2] += 360;
+    }
 }
 
-void ScriptSlave::Rotateto
-	(
-	Event *ev
-	)
+void ScriptSlave::Rotateto(Event *ev)
 {
-	Vector ang;
+    Vector ang;
 
-	CheckNewOrders();
+    CheckNewOrders();
 
-	ang = ev->GetVector( 1 );
+    ang = ev->GetVector(1);
 
-	NewAngles = ang;
+    NewAngles = ang;
 }
 
 // Relative rotate commands
 
-void ScriptSlave::RotateXdown
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateXdown(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 0 ] = localangles[ 0 ] - ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[0] = localangles[0] - ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateYdown
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateYdown(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 1 ] = localangles[ 1 ] - ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[1] = localangles[1] - ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateZdown
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateZdown(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 2 ] = localangles[ 2 ] - ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[2] = localangles[2] - ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateAxisdown
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateAxisdown(Event *ev)
 {
-	int axis;
-	CheckNewOrders();
+    int axis;
+    CheckNewOrders();
 
-	axis = ev->GetInteger( 1 );
-	NewAngles[ axis ] = localangles[ axis ] - ev->GetFloat( 2 );
+    axis            = ev->GetInteger(1);
+    NewAngles[axis] = localangles[axis] - ev->GetFloat(2);
 }
 
-void ScriptSlave::RotateXup
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateXup(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 0 ] = localangles[ 0 ] + ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[0] = localangles[0] + ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateYup
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateYup(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 1 ] = localangles[ 1 ] + ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[1] = localangles[1] + ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateZup
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateZup(Event *ev)
 {
-	CheckNewOrders();
-	NewAngles[ 2 ] = localangles[ 2 ] + ev->GetFloat( 1 );
+    CheckNewOrders();
+    NewAngles[2] = localangles[2] + ev->GetFloat(1);
 }
 
-void ScriptSlave::RotateAxisup
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateAxisup(Event *ev)
 {
-	int axis;
-	CheckNewOrders();
+    int axis;
+    CheckNewOrders();
 
-	axis = ev->GetInteger( 1 );
-	NewAngles[ axis ] = localangles[ axis ] + ev->GetFloat( 2 );
+    axis            = ev->GetInteger(1);
+    NewAngles[axis] = localangles[axis] + ev->GetFloat(2);
 }
 
-void ScriptSlave::RotateX
-	(
-	Event *ev
-	)
-
-	{
-	avelocity[ 0 ] = ev->GetFloat( 1 );
-	}
-
-void ScriptSlave::RotateY
-	(
-	Event *ev
-	)
-
-	{
-	avelocity[ 1 ] = ev->GetFloat( 1 );
-	}
-
-void ScriptSlave::RotateZ
-	(
-	Event *ev
-	)
-
-	{
-	avelocity[ 2 ] = ev->GetFloat( 1 );
-	}
-
-void ScriptSlave::RotateAxis
-	(
-	Event *ev
-	)
-
-	{
-   int axis;
-
-   axis = ev->GetInteger( 1 );
-   avelocity[ axis ] = ev->GetFloat( 2 );
-	}
-
-void ScriptSlave::DamageFunc
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateX(Event *ev)
 {
-	Unregister( STRING_DAMAGE );
+    avelocity[0] = ev->GetFloat(1);
 }
 
-void ScriptSlave::SetDamage
-	(
-	Event *ev
-	)
-
-	{
-	dmg = ev->GetInteger( 1 );
-	}
-
-void ScriptSlave::SetMeansOfDeath
-	(
-	Event *ev
-	)
-
-	{
-	dmg_means_of_death = MOD_string_to_int( ev->GetString( 1 ) );
-	}
-
-void ScriptSlave::CreatePath
-	(
-	SplinePath *path,
-	splinetype_t type
-	)
-
-	{
-	SplinePath	*node;
-
-   if ( !splinePath )
-      {
-      splinePath = new BSpline;
-      }
-
-	splinePath->Clear();
-	splinePath->SetType( type );
-
-	node = path;
-	while( node != NULL )
-		{
-      splinePath->AppendControlPoint( node->origin, node->angles, node->speed );
-		node = node->GetNext();
-
-		if ( node == path )
-			{
-			break;
-			}
-		}
-	}
-
-void ScriptSlave::FollowPath
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateY(Event *ev)
 {
-	int i, argnum;
-	Entity * ent;
-	const char * token;
-	SplinePath *path;
-	qboolean clamp;
-	float starttime;
-
-
-	ent = ev->GetEntity( 1 );
-	argnum = 2;
-	starttime = -2;
-	clamp = true;
-	ignoreangles = false;
-	splineangles = true;
-	for( i = argnum; i <= ev->NumArgs(); i++ )
-	{
-		token = ev->GetString( i );
-		if( !Q_stricmp( token, "ignoreangles" ) )
-		{
-			ignoreangles = true;
-		}
-		else if( !Q_stricmp( token, "normalangles" ) )
-		{
-			splineangles = false;
-		}
-		else if( !Q_stricmp( token, "loop" ) )
-		{
-			clamp = false;
-		}
-		else if( IsNumeric( token ) )
-		{
-			starttime = atof( token );
-		}
-		else
-		{
-			ScriptError( "Unknown followpath command %s.", token );
-		}
-	}
-	if( ent && ent->IsSubclassOfSplinePath() )
-	{
-		commandswaiting = true;
-		path = ( SplinePath * )ent;
-		if( clamp )
-			CreatePath( path, SPLINE_CLAMP );
-		else
-			CreatePath( path, SPLINE_LOOP );
-		splineTime = starttime;
-		CancelEventsOfType( EV_ScriptSlave_FollowingPath );
-		if( !ignoreangles )
-		{
-			avelocity = vec_zero;
-		}
-		velocity = vec_zero;
-	}
+    avelocity[1] = ev->GetFloat(1);
 }
 
-void ScriptSlave::EndPath
-	(
-	Event *ev
-	)
-	{
-   if ( !splinePath )
-      return;
-
-   delete splinePath;
-   splinePath = NULL;
-   velocity = vec_zero;
-   if ( !ignoreangles )
-      {
-      avelocity = vec_zero;
-      }
-   }
-
-void ScriptSlave::FollowingPath
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateZ(Event *ev)
 {
-	Vector	pos;
-	Vector	orient;
-	float	speed_multiplier;
-
-	if( m_pCurPath && m_pCurPath->m_iPoints )
-	{
-		Vector vAngles;
-		Vector vDeltaAngles;
-		Vector vDelta;
-		float *vTmp;
-		Vector vPrev;
-		Vector vCur;
-		Vector vTotal;
-		float fCoef;
-		Vector vWishPosition;
-		Vector vWishAngles;
-		Vector vNextWishAngles;
-		Vector primal_angles;
-		Vector n_angles;
-
-		if( g_showflypath && g_showflypath->integer )
-		{
-			for( int i = 0; i < m_pCurPath->m_iPoints; i++ )
-			{
-				vTmp = m_pCurPath->GetByNode( i, NULL );
-				G_DebugBBox( ( vTmp + 1 ), Vector( -32, -32, -32 ), Vector( 32, 32, 32 ), 0.0f, 1.0f, 1.0f, 1.0f );
-
-				for( int ii = 0; ii <= 8; ii++ )
-				{
-					G_DebugLine( ( m_pCurPath->GetByNode( ( ii / 10.0f + ( i + 1 ) ), NULL ) + 1 ), ( m_pCurPath->GetByNode( m_fLookAhead + ( ii / 10.0f + ( i + 1 ) ), NULL ) + 1 ), 0.0f, 1.0f, 1.0f, 1.0f );
-				}
-			}
-		}
-
-		if( m_iCurNode <= 0 )
-		{
-			vTmp = m_pCurPath->GetByNode( m_iCurNode, NULL );
-			vWishPosition = ( vTmp + 1 );
-			vDelta = vWishPosition - origin;
-
-			if( vDelta.length() <= 32.0f )
-			{
-				m_iCurNode++;
-
-				if( m_iCurNode >= m_pCurPath->m_iPoints )
-				{
-					velocity = vec_zero;
-					avelocity = vec_zero;
-
-					delete m_pCurPath;
-					m_pCurPath = NULL;
-					m_iCurNode = 0;
-					moving = false;
-					ProcessEvent( EV_ScriptSlave_MoveDone );
-					return;
-				}
-			}
-		}
-		else
-		{
-			vTmp = m_pCurPath->GetByNode( m_iCurNode - 1, NULL );
-			vPrev = ( vTmp + 1 );
-			vTmp = m_pCurPath->GetByNode( m_iCurNode, NULL );
-			vCur = ( vTmp + 1 );
-
-			m_vIdealDir = vCur - vPrev;
-			VectorNormalize( m_vIdealDir );
-			angles.AngleVectorsLeft( &vWishAngles );
-
-			fCoef = ProjectLineOnPlane( vWishAngles, DotProduct( origin, vWishAngles ), vPrev, vCur, NULL );
-
-			vTmp = m_pCurPath->GetByNode( ( m_iCurNode - ( 1.0f - fCoef ) ), NULL );
-			vTmp = m_pCurPath->Get( vTmp[ 0 ] + m_fLookAhead, NULL );
-			vWishPosition = ( vTmp + 1 );
-
-			if( fCoef > 1.0f )
-			{
-				m_iCurNode++;
-
-				if( m_iCurNode >= m_pCurPath->m_iPoints )
-				{
-					velocity = vec_zero;
-					avelocity = vec_zero;
-
-					delete m_pCurPath;
-					m_pCurPath = NULL;
-					m_iCurNode = 0;
-					moving = false;
-					ProcessEvent( EV_ScriptSlave_MoveDone );
-					return;
-				}
-			}
-		}
-
-		vWishAngles = vWishPosition - origin;
-
-		if( vWishAngles.length() > 0.0f )
-		{
-			VectorNormalize( vWishAngles );
-			VectorToAngles( vWishAngles, vNextWishAngles );
-		}
-		else
-		{
-			AngleVectorsLeft( angles, vWishAngles, NULL, NULL );
-			vNextWishAngles = angles;
-		}
-
-		vAngles = angles;
-
-		for( int i = 0; i < 3; i++ )
-		{
-			n_angles[ i ] = vNextWishAngles[ i ] - angles[ i ];
-
-			if( n_angles[ i ] <= 180.0f )
-			{
-				if( n_angles[ i ] < -180.0f )
-				{
-					n_angles[ i ] += 360.0f;
-				}
-			}
-			else
-			{
-				n_angles[ i ] -= 360.0f;
-			}
-
-			float change = level.frametime * 360.0f;
-			float error = 0.33f * n_angles[ i ];
-
-			if( -change > error )
-			{
-				error = -change;
-			}
-			else if( error <= change )
-			{
-				change = error;
-			}
-
-			primal_angles[ i ] = change + angles[ i ];
-		}
-
-		setAngles( primal_angles );
-
-		vDeltaAngles = ( angles - vAngles ) * level.frametime;
-
-		if( vDeltaAngles[ 0 ] > 180.0f || vDeltaAngles[ 0 ] <= -180.0f )
-		{
-			vDeltaAngles[ 0 ] = 0.0f;
-		}
-
-		if( vDeltaAngles[ 1 ] > 180.0f || vDeltaAngles[ 1 ] <= -180.0f )
-		{
-			vDeltaAngles[ 1 ] = 0.0f;
-		}
-
-		if( vDeltaAngles[ 2 ] > 180.0f || vDeltaAngles[ 2 ] <= -180.0f )
-		{
-			vDeltaAngles[ 2 ] = 0.0f;
-		}
-
-		if( vDeltaAngles[ 0 ] > -1.0f || vDeltaAngles[ 0 ] < 1.0f )
-		{
-			vDeltaAngles[ 0 ] = 0.0f;
-		}
-
-		if( vDeltaAngles[ 1 ] > -1.0f || vDeltaAngles[ 1 ] < 1.0f )
-		{
-			vDeltaAngles[ 1 ] = 0.0f;
-		}
-
-		if( vDeltaAngles[ 2 ] > -1.0f || vDeltaAngles[ 2 ] < 1.0f )
-		{
-			vDeltaAngles[ 2 ] = 0.0f;
-		}
-
-		avelocity = vDeltaAngles;
-		velocity = vWishAngles * m_fCurSpeed;
-
-		if( m_fCurSpeed < m_fIdealSpeed )
-		{
-			m_fCurSpeed += m_fIdealAccel * level.frametime;
-
-			if( m_fCurSpeed > m_fIdealSpeed )
-			{
-				m_fCurSpeed = m_fIdealSpeed;
-			}
-		}
-		else if( m_fCurSpeed > m_fIdealSpeed )
-		{
-			m_fCurSpeed -= m_fIdealAccel * level.frametime;
-
-			if( m_fCurSpeed < m_fIdealSpeed )
-			{
-				m_fCurSpeed = m_fIdealSpeed;
-			}
-		}
-	}
-	else
-	{
-		if( !splinePath )
-		{
-			return;
-		}
-
-		if( ( splinePath->GetType() == SPLINE_CLAMP ) && ( splineTime > ( splinePath->EndPoint() - 2 ) ) )
-		{
-			delete splinePath;
-			splinePath = NULL;
-			velocity = vec_zero;
-			if( !ignoreangles )
-			{
-				avelocity = vec_zero;
-			}
-			moving = false;
-			ProcessEvent( EV_ScriptSlave_MoveDone );
-			return;
-		}
-
-		speed_multiplier = splinePath->Eval( splineTime, pos, orient );
-
-		splineTime += level.frametime * speed_multiplier;
-
-		velocity = ( pos - origin ) * ( 1 / level.frametime );
-		if( !ignoreangles )
-		{
-			if( splineangles )
-			{
-				avelocity = ( orient - angles ) * ( 1 / level.frametime );
-			}
-			else
-			{
-				float len;
-
-				len = velocity.length();
-				if( len > 0.05 )
-				{
-					Vector ang;
-					Vector dir;
-					float  aroll;
-
-					aroll = avelocity[ ROLL ];
-					dir = velocity * ( 1 / len );
-					ang = dir.toAngles();
-					avelocity = ( ang - angles ) * ( 1 / level.frametime );
-					avelocity[ ROLL ] = aroll;
-				}
-				else
-					avelocity = vec_zero;
-			}
-		}
-	}
-
-	PostEvent( EV_ScriptSlave_FollowingPath, level.frametime );
+    avelocity[2] = ev->GetFloat(1);
 }
 
-void ScriptSlave::Explode
-	(
-	Event *ev
-	)
-
-	{
-   float damage;
-
-   if ( ev->NumArgs() )
-      {
-      damage = ev->GetFloat( 1 );
-      }
-   else
-      {
-      damage = 120.0f;
-      }
-
-   CreateExplosion( origin, damage, this, this, this );
-   }
-
-void ScriptSlave::NotShootable
-	(
-	Event *ev
-	)
-	{
-  	setContents( 0 );
-   }
-
-void ScriptSlave::OpenPortal
-	(
-	Event *ev
-	)
-	{
-   gi.AdjustAreaPortalState( this->edict, true );
-   }
-
-void ScriptSlave::ClosePortal
-	(
-	Event *ev
-	)
-	{
-   gi.AdjustAreaPortalState( this->edict, false );
-   }
-
-void ScriptSlave::PhysicsOn
-	(
-	Event *ev
-	)
+void ScriptSlave::RotateAxis(Event *ev)
 {
-	commandswaiting = false;
-	setMoveType(MOVETYPE_BOUNCE);
-	setSolidType(SOLID_BBOX);
-	velocity = Vector(0, 0, 1);
-	edict->clipmask = MASK_SOLID | CONTENTS_BODY;
-	if (ev->NumArgs() == 1 && ev->GetInteger(1))
-	{
-		edict->clipmask &= ~MASK_SCRIPT_SLAVE;
-	}
+    int axis;
+
+    axis            = ev->GetInteger(1);
+    avelocity[axis] = ev->GetFloat(2);
 }
 
-void ScriptSlave::PhysicsOff
-	(
-	Event *ev
-	)
-	{
-   Event * event;
-
-	commandswaiting = false;
-   setMoveType( MOVETYPE_PUSH );
-   edict->clipmask = 0;
-   // become solid again
-   event = new Event( EV_Model );
-   event->AddString( model );
-   PostEvent( event, 0 );
-   }
-
-void ScriptSlave::PhysicsVelocity
-	(
-	Event *ev
-	)
-	{
-   velocity += ev->GetVector( 1 );
-   }
-
-
-void ScriptSlave::EventFlyPath
-	(
-	Event *ev
-	)
+void ScriptSlave::TouchFunc(Event* ev)
 {
-	SimpleEntity *path;
-
-	m_fIdealDistance = 100.0f;
-	m_fLookAhead = 256.0f;
-	m_fIdealAccel = 35.0f;
-	m_fIdealSpeed = 250.0f;
-
-	if( ev->NumArgs() != 1 && ev->NumArgs() != 2 && ev->NumArgs() != 3 && ev->NumArgs() != 4 )
-		ScriptError( "wrong number of arguments" );
-
-	if( ev->NumArgs() > 1 )
-		m_fIdealSpeed = ev->GetFloat( 2 );
-
-	if( ev->NumArgs() > 2 )
-		m_fIdealAccel = ev->GetFloat( 3 );
-
-	if( ev->NumArgs() > 3 )
-		m_fLookAhead = ev->GetFloat( 4 );
-
-	path = ev->GetSimpleEntity( 1 );
-
-	if( !path )
-		ScriptError( "ScriptSlave Given FlyPath Command with NULL path." );
-
-	if( m_pCurPath )
-		delete m_pCurPath;
-
-	m_pCurPath = new cSpline < 4, 512 > ;
-
-	SetupPath( m_pCurPath, path );
-	m_iCurNode = 0;
-	CancelEventsOfType( EV_ScriptSlave_FollowingPath );
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_TOUCH);
 }
 
-void ScriptSlave::EventModifyFlyPath
-	(
-	Event *ev
-	)
+void ScriptSlave::BlockFunc(Event* ev)
 {
-	m_fIdealDistance = 100.0f;
+    Entity* other;
 
-	if( ev->NumArgs() != 1 && ev->NumArgs() != 2 && ev->NumArgs() != 3 )
-		ScriptError( "wrong number of arguments" );
+    other = ev->GetEntity(1);
+    if (level.time >= attack_finished) {
+        attack_finished = level.time + 0.5;
+        if (dmg) {
+            other->Damage(this, this, dmg, origin, vec_zero, vec_zero, 0, 0, dmg_means_of_death);
+        }
+    }
 
-	if( ev->NumArgs() > 0 )
-		m_fIdealSpeed = ev->GetFloat( 1 );
-
-	if( ev->NumArgs() > 1 )
-		m_fIdealAccel = ev->GetFloat( 2 );
-
-	if( ev->NumArgs() > 2 )
-		m_fLookAhead = ev->GetFloat( 3 );
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_BLOCK);
 }
 
-void ScriptSlave::SetupPath
-	(
-	cSpline< 4, 512 > *pPath,
-	SimpleEntity *se
-	)
+void ScriptSlave::TriggerFunc(Event* ev)
 {
-	str name;
-	//int iObjNum;
-	Vector vLastOrigin;
-	SimpleEntity *ent;
-	int i;
-	static cSpline< 4, 512 > *pTmpPath = NULL;
-
-	if( !pTmpPath )
-	{
-		pTmpPath = new cSpline < 4, 512 >;
-	}
-
-	if( !pPath )
-	{
-		return;
-	}
-
-	pPath->Reset();
-	pTmpPath->Reset();
-
-	vLastOrigin = se->origin;
-
-	name = se->Target();
-
-	if( name.c_str() )
-	{
-		Vector vDelta;
-		vec4_t origin;
-		float fCurLength;
-
-		i = 0;
-		fCurLength = 0;
-		ent = se;
-		while( ent )
-		{
-			if( vLastOrigin.length() == 0.0f && i > 1 )
-			{
-				Com_Printf( "^~^~^Warning: ScriptSlave Flying with a Path that contains 2 equal points\n" );
-			}
-			else
-			{
-				origin[ 0 ] = fCurLength;
-				origin[ 1 ] = ent->origin[ 0 ];
-				origin[ 2 ] = ent->origin[ 1 ];
-				origin[ 3 ] = ent->origin[ 2 ];
-				pTmpPath->Add( origin, 0 );
-				vLastOrigin = ent->origin;
-				fCurLength++;
-			}
-
-			if( ent == se && i > 1 )
-				break;
-
-			i++;
-			ent = ent->Next();
-		}
-
-		if( pTmpPath->m_iPoints > 2 )
-		{
-			float *vTmp;
-
-			pPath->Reset();
-			vTmp = pTmpPath->GetByNode( 0.0f, 0 );
-
-			vLastOrigin[ 0 ] = vTmp[ 1 ];
-			vLastOrigin[ 1 ] = vTmp[ 2 ];
-			vLastOrigin[ 2 ] = vTmp[ 3 ];
-
-			fCurLength = 0;
-
-			for( i = 0; i < pTmpPath->m_iPoints; i++ )
-			{
-				vTmp = pTmpPath->GetByNode( i, 0 );
-
-				vDelta = ( vTmp + 1 ) - vLastOrigin;
-
-				fCurLength += vDelta.length();
-				origin[ 0 ] = fCurLength;
-				origin[ 1 ] = vTmp[ 1 ];
-				origin[ 2 ] = vTmp[ 2 ];
-				origin[ 3 ] = vTmp[ 3 ];
-
-				pPath->Add( origin, 0 );
-				vLastOrigin = ( vTmp + 1 );
-			}
-		}
-	}
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_TRIGGER);
 }
 
+void ScriptSlave::UseFunc(Event* ev)
+{
+    parm.other = ev->GetEntity(1);
+    parm.owner = parm.other;
+    Unregister(STRING_USE);
+}
+
+void ScriptSlave::DamageFunc(Event *ev)
+{
+    Unregister(STRING_DAMAGE);
+}
+
+void ScriptSlave::SetDamage(Event *ev)
+{
+    dmg = ev->GetInteger(1);
+}
+
+void ScriptSlave::SetMeansOfDeath(Event *ev)
+{
+    dmg_means_of_death = MOD_string_to_int(ev->GetString(1));
+}
+
+void ScriptSlave::CreatePath(SplinePath *path, splinetype_t type)
+{
+    SplinePath *node;
+
+    if (!splinePath) {
+        splinePath = new BSpline;
+    }
+
+    splinePath->Clear();
+    splinePath->SetType(type);
+
+    node = path;
+    while (node != NULL) {
+        splinePath->AppendControlPoint(node->origin, node->angles, node->speed);
+        node = node->GetNext();
+
+        if (node == path) {
+            break;
+        }
+    }
+}
+
+void ScriptSlave::FollowPath(Event *ev)
+{
+    int               i, argnum;
+    SimpleEntity     *ent;
+    str               token;
+    SplinePath       *path;
+    qboolean          clamp;
+    float             starttime;
+
+    ent             = ev->GetSimpleEntity(1);
+    argnum          = 2;
+    starttime       = -2;
+    clamp           = true;
+    ignoreangles    = false;
+    ignorevelocity  = false;
+    splineangles    = true;
+    for (i = argnum; i <= ev->NumArgs(); i++) {
+        token = ev->GetString(i);
+        if (!Q_stricmp(token, "ignoreangles")) {
+            ignoreangles = true;
+        } else if (!Q_stricmp(token, "ignorevelocity")) {
+            ignorevelocity = true;
+        } else if (!Q_stricmp(token, "normalangles")) {
+            splineangles = false;
+        } else if (!Q_stricmp(token, "loop")) {
+            clamp = false;
+        } else if (IsNumeric(token)) {
+            starttime = atof(token);
+            // Fixed in OPM
+            // HACKHACK
+            //
+            // There is a bug in mohaa where the token's raw pointer is directly used
+            // but then the token can be freed before comparison, which cause
+            // starttime to be always 0.
+            // OPM is correct here but for compatibility purpose the bug have to be reproduced.
+            // Otherwise, for example the final bomber plane in t3l2 will not fly.
+            if (!ev->IsStringAt(i)) {
+                starttime = 0;
+            }
+        } else {
+            ScriptError("Unknown followpath command %s.", token.c_str());
+        }
+    }
+
+    if (ent && ent->IsSubclassOfSplinePath()) {
+        path = (SplinePath *)ent;
+        if (clamp) {
+            CreatePath(path, SPLINE_CLAMP);
+        } else {
+            CreatePath(path, SPLINE_LOOP);
+        }
+        splineTime = starttime;
+        CancelEventsOfType(EV_ScriptSlave_FollowingPath);
+        if (!ignoreangles) {
+            avelocity = vec_zero;
+        }
+        if (!ignorevelocity) {
+            velocity = vec_zero;
+        }
+    }
+}
+
+void ScriptSlave::FollowPathRelativeYaw(Event *ev)
+{
+    m_fFollowRelativeYaw = ev->GetFloat(1);
+}
+
+void ScriptSlave::EndPath(Event *ev)
+{
+    if (!splinePath) {
+        return;
+    }
+
+    delete splinePath;
+    splinePath = NULL;
+    if (!ignorevelocity) {
+        velocity = vec_zero;
+    }
+    if (!ignoreangles) {
+        avelocity = vec_zero;
+    }
+}
+
+void ScriptSlave::FollowingPath(Event *ev)
+{
+    Vector pos;
+    Vector orient;
+    float  speed_multiplier;
+
+    if (m_pCurPath && m_pCurPath->m_iPoints) {
+        Vector vAngles;
+        Vector vDeltaAngles;
+        Vector vDelta;
+        float *vTmp;
+        Vector vPrev;
+        Vector vCur;
+        Vector vTotal;
+        float  fCoef;
+        Vector vWishPosition;
+        Vector vWishAngles;
+        Vector vNextWishAngles;
+        Vector primal_angles;
+        Vector n_angles;
+
+        if (g_showflypath && g_showflypath->integer) {
+            for (int i = 0; i < m_pCurPath->m_iPoints; i++) {
+                vTmp = m_pCurPath->GetByNode(i, NULL);
+                VectorCopy((vTmp + 1), vCur);
+
+                G_DebugBBox(vCur, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
+
+                for (int ii = 0; ii <= 8; ii++) {
+                    vTmp = m_pCurPath->GetByNode(i + ii / 10.0, NULL);
+                    VectorCopy((vTmp + 1), vPrev);
+                    vTmp = m_pCurPath->GetByNode(i + ii / 10.0 + m_fLookAhead, NULL);
+                    VectorCopy((vTmp + 1), vCur);
+
+                    G_DebugLine(vPrev, vCur, 0, 1, 0, 1);
+                }
+            }
+        }
+
+        if (m_iCurNode > 0) {
+            // Get previous node
+            vTmp  = m_pCurPath->GetByNode(m_iCurNode - 1, NULL);
+            vPrev = (vTmp + 1);
+            // Get current node
+            vTmp = m_pCurPath->GetByNode(m_iCurNode, NULL);
+            vCur = (vTmp + 1);
+
+            vDelta = vCur - vPrev;
+            m_vIdealDir = vDelta;
+            VectorNormalize(m_vIdealDir);
+            angles.AngleVectorsLeft(&vWishAngles);
+
+            fCoef = ProjectLineOnPlane(vWishAngles, DotProduct(origin, vWishAngles), vPrev, vCur, NULL);
+            
+            vTmp = m_pCurPath->GetByNode(m_iCurNode - (1.0 - fCoef), NULL);
+            vTmp = m_pCurPath->Get(vTmp[0] + m_fLookAhead, NULL);
+            vWishPosition = (vTmp + 1);
+
+            if (fCoef > 1.0f) {
+                m_iCurNode++;
+
+                if (m_iCurNode >= m_pCurPath->m_iPoints) {
+                    velocity  = vec_zero;
+                    avelocity = vec_zero;
+
+                    delete m_pCurPath;
+                    m_pCurPath = NULL;
+                    m_iCurNode = 0;
+                    moving     = false;
+
+                    ProcessEvent(EV_ScriptSlave_MoveDone);
+                    return;
+                }
+            }
+        } else {
+            vTmp          = m_pCurPath->GetByNode(m_iCurNode, NULL);
+            vWishPosition = (vTmp + 1);
+            vDelta        = vWishPosition - origin;
+
+            if (vDelta.length() <= 32.0f) {
+                m_iCurNode++;
+
+                if (m_iCurNode >= m_pCurPath->m_iPoints) {
+                    velocity  = vec_zero;
+                    avelocity = vec_zero;
+
+                    delete m_pCurPath;
+                    m_pCurPath = NULL;
+                    m_iCurNode = 0;
+                    moving     = false;
+                    ProcessEvent(EV_ScriptSlave_MoveDone);
+                    return;
+                }
+            }
+        }
+
+        vDelta = vWishPosition - origin;
+
+        if (vDelta.length() > 0.0f) {
+            vDelta.normalize();
+            VectorToAngles(vDelta, vNextWishAngles);
+
+            //
+            // Added in 2.0
+            //  Relative yaw
+            vNextWishAngles[1] += m_fFollowRelativeYaw;
+            if (m_fFollowRelativeYaw == 180) {
+                vNextWishAngles[0] *= -1;
+            }
+        } else {
+            vNextWishAngles = angles;
+            AngleVectorsLeft(angles, vDelta, NULL, NULL);
+        }
+
+        vAngles = angles;
+
+        for (int i = 0; i < 3; i++) {
+            float change, error;
+
+            n_angles[i] = vNextWishAngles[i] - angles[i];
+
+            if (n_angles[i] > 180) {
+                n_angles[i] -= 360;
+            } else if (n_angles[i] < -180) {
+                n_angles[i] += 360;
+            }
+
+            change = level.frametime * 360.0f;
+            error  = 0.33f * n_angles[i];
+
+            if (error < -change) {
+                error = -change;
+            } else if (error > change) {
+                error = change;
+            }
+
+            primal_angles[i] = angles[i] + error;
+        }
+
+        setAngles(primal_angles);
+
+        vDeltaAngles = (angles - vAngles) * level.frametime;
+
+        if (vDeltaAngles[0] > 180.0f || vDeltaAngles[0] <= -180.0f) {
+            vDeltaAngles[0] = 0.0f;
+        }
+
+        if (vDeltaAngles[1] > 180.0f || vDeltaAngles[1] <= -180.0f) {
+            vDeltaAngles[1] = 0.0f;
+        }
+
+        if (vDeltaAngles[2] > 180.0f || vDeltaAngles[2] <= -180.0f) {
+            vDeltaAngles[2] = 0.0f;
+        }
+
+        if (vDeltaAngles[0] > -1.0f || vDeltaAngles[0] < 1.0f) {
+            vDeltaAngles[0] = 0.0f;
+        }
+
+        if (vDeltaAngles[1] > -1.0f || vDeltaAngles[1] < 1.0f) {
+            vDeltaAngles[1] = 0.0f;
+        }
+
+        if (vDeltaAngles[2] > -1.0f || vDeltaAngles[2] < 1.0f) {
+            vDeltaAngles[2] = 0.0f;
+        }
+
+        avelocity = vDeltaAngles;
+        velocity  = vDelta * m_fCurSpeed;
+
+        if (m_fIdealSpeed > m_fCurSpeed) {
+            m_fCurSpeed += m_fIdealAccel * level.frametime;
+
+            if (m_fCurSpeed > m_fIdealSpeed) {
+                m_fCurSpeed = m_fIdealSpeed;
+            }
+        } else if (m_fIdealSpeed < m_fCurSpeed) {
+            m_fCurSpeed -= m_fIdealAccel * level.frametime;
+
+            if (m_fCurSpeed < m_fIdealSpeed) {
+                m_fCurSpeed = m_fIdealSpeed;
+            }
+        }
+    } else {
+        if (!splinePath) {
+            return;
+        }
+
+        if ((splinePath->GetType() == SPLINE_CLAMP) && (splineTime > (splinePath->EndPoint() - 2))) {
+            delete splinePath;
+            splinePath = NULL;
+            if (!ignorevelocity) {
+                velocity = vec_zero;
+            }
+            if (!ignoreangles) {
+                avelocity = vec_zero;
+            }
+            moving = false;
+            ProcessEvent(EV_ScriptSlave_MoveDone);
+            return;
+        }
+
+        speed_multiplier = splinePath->Eval(splineTime, pos, orient);
+
+        splineTime += level.frametime * speed_multiplier;
+
+        velocity = (pos - origin) * (1 / level.frametime);
+        if (!ignoreangles) {
+            if (splineangles) {
+                avelocity = (orient - angles) * (1 / level.frametime);
+            } else {
+                float len;
+
+                len = velocity.length();
+                if (len > 0.05) {
+                    Vector ang;
+                    Vector dir;
+                    float  aroll;
+
+                    aroll           = avelocity[ROLL];
+                    dir             = velocity * (1 / len);
+                    ang             = dir.toAngles();
+                    avelocity       = (ang - angles) * (1 / level.frametime);
+                    avelocity[ROLL] = aroll;
+                } else {
+                    avelocity = vec_zero;
+                }
+            }
+        }
+    }
+
+    PostEvent(EV_ScriptSlave_FollowingPath, level.frametime);
+}
+
+void ScriptSlave::Explode(Event *ev)
+{
+    float damage;
+
+    if (ev->NumArgs()) {
+        damage = ev->GetFloat(1);
+    } else {
+        damage = 120.0f;
+    }
+
+    CreateExplosion(origin, damage, this, this, this);
+}
+
+void ScriptSlave::NotShootable(Event *ev)
+{
+    setContents(0);
+}
+
+void ScriptSlave::OpenPortal(Event *ev)
+{
+    gi.AdjustAreaPortalState(this->edict, true);
+}
+
+void ScriptSlave::ClosePortal(Event *ev)
+{
+    gi.AdjustAreaPortalState(this->edict, false);
+}
+
+void ScriptSlave::PhysicsOn(Event *ev)
+{
+    commandswaiting = false;
+    setMoveType(MOVETYPE_BOUNCE);
+    setSolidType(SOLID_BBOX);
+    velocity        = Vector(0, 0, 1);
+    edict->clipmask = MASK_SOLID | CONTENTS_BODY;
+    if (ev->NumArgs() == 1 && ev->GetInteger(1)) {
+        edict->clipmask &= ~MASK_SCRIPT_SLAVE;
+    }
+}
+
+void ScriptSlave::PhysicsOff(Event *ev)
+{
+    Event *event;
+
+    commandswaiting = false;
+    setMoveType(MOVETYPE_PUSH);
+    edict->clipmask = 0;
+    // become solid again
+    event = new Event(EV_Model);
+    event->AddString(model);
+    PostEvent(event, 0);
+}
+
+void ScriptSlave::PhysicsVelocity(Event *ev)
+{
+    velocity += ev->GetVector(1);
+}
+
+void ScriptSlave::EventFlyPath(Event *ev)
+{
+    SimpleEntity *path;
+
+    m_fIdealDistance = 100.0f;
+    m_fLookAhead     = 256.0f;
+    m_fIdealAccel    = 35.0f;
+    m_fIdealSpeed    = 250.0f;
+
+    if (ev->NumArgs() != 1 && ev->NumArgs() != 2 && ev->NumArgs() != 3 && ev->NumArgs() != 4) {
+        ScriptError("wrong number of arguments");
+    }
+
+    if (ev->NumArgs() > 1) {
+        m_fIdealSpeed = ev->GetFloat(2);
+    }
+
+    if (ev->NumArgs() > 2) {
+        m_fIdealAccel = ev->GetFloat(3);
+    }
+
+    if (ev->NumArgs() > 3) {
+        m_fLookAhead = ev->GetFloat(4);
+    }
+
+    path = ev->GetSimpleEntity(1);
+
+    if (!path) {
+        ScriptError("ScriptSlave Given FlyPath Command with NULL path.");
+    }
+
+    if (m_pCurPath) {
+        delete m_pCurPath;
+    }
+
+    m_pCurPath = new cSpline<4, 512>;
+
+    SetupPath(m_pCurPath, path);
+    m_iCurNode = 0;
+    CancelEventsOfType(EV_ScriptSlave_FollowingPath);
+}
+
+void ScriptSlave::EventModifyFlyPath(Event *ev)
+{
+    m_fIdealDistance = 100.0f;
+
+    if (ev->NumArgs() != 1 && ev->NumArgs() != 2 && ev->NumArgs() != 3) {
+        ScriptError("wrong number of arguments");
+    }
+
+    if (ev->NumArgs() > 0) {
+        m_fIdealSpeed = ev->GetFloat(1);
+    }
+
+    if (ev->NumArgs() > 1) {
+        m_fIdealAccel = ev->GetFloat(2);
+    }
+
+    if (ev->NumArgs() > 2) {
+        m_fLookAhead = ev->GetFloat(3);
+    }
+}
+
+void ScriptSlave::EventNormalAngles(Event *ev)
+{
+    splineangles = !ev->GetBoolean(1);
+    ignoreangles = false;
+}
+
+void ScriptSlave::SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se)
+{
+    str name;
+    int                     iObjNum = 0;
+    Vector                  vLastOrigin;
+    SimpleEntity           *ent;
+    int                     i = 1;
+    static cSpline<4, 512> *pTmpPath = new cSpline<4, 512>;
+
+    if (!pPath) {
+        return;
+    }
+
+    pPath->Reset();
+    pTmpPath->Reset();
+
+    vLastOrigin = se->origin;
+
+    name = se->Target();
+
+    if (name.length()) {
+        for(ent = se; ent; ent = ent->Next()) {
+            Vector vDelta;
+            vec4_t vTmp;
+
+            vDelta = vLastOrigin - ent->origin;
+
+            if (vDelta.length() == 0 && i > 1) {
+                Com_Printf("^~^~^Warning: ScriptSlave Flying with a Path that contains 2 equal points\n");
+            } else {
+                vTmp[0] = iObjNum++;
+                vTmp[1] = ent->origin[0];
+                vTmp[2] = ent->origin[1];
+                vTmp[3] = ent->origin[2];
+                pTmpPath->Add(vTmp, 0);
+                vLastOrigin = ent->origin;
+            }
+
+            if (ent == se && i > 1) {
+                break;
+            }
+
+            i++;
+        }
+    }
+
+    if (pTmpPath->m_iPoints > 2) {
+        float* vTmp;
+        float fCurLength = 0;
+        vec3_t vLastOrigin;
+        vec3_t origin;
+        vec3_t vDelta;
+
+        pPath->Reset();
+
+        vTmp = pTmpPath->GetByNode(0, NULL);
+        VectorCopy((vTmp + 1), vLastOrigin);
+        VectorCopy((vTmp + 1), origin);
+
+        for (i = 0; i < pTmpPath->m_iPoints; i++) {
+            vec4_t vTmp2;
+
+            vTmp = pTmpPath->GetByNode(i, NULL);
+
+            VectorCopy((vTmp + 1), vLastOrigin);
+            VectorSubtract(vLastOrigin, origin, vDelta);
+
+            fCurLength += VectorLength(vDelta);
+            vTmp2[0] = fCurLength;
+            vTmp2[1] = vLastOrigin[0];
+            vTmp2[2] = vLastOrigin[1];
+            vTmp2[3] = vLastOrigin[2];
+
+            pPath->Add(vTmp2, 0);
+            VectorCopy(vLastOrigin, origin);
+        }
+    }
+}
 
 /*****************************************************************************/
 /*QUAKED script_model (0 0.5 1) (0 0 0) (0 0 0) NOT_SOLID
@@ -2103,153 +1960,195 @@ void ScriptSlave::SetupPath
 ******************************************************************************/
 
 Event EV_ScriptModel_SetAnim
-	( 
-	"anim",
-	EV_DEFAULT,
-	"s",
-	"anim_name",
-	"Sets the script model's animation",
-	EV_NORMAL
-	);
-Event EV_ScriptModel_AnimOnce
-	( 
-	"animonce",
-	EV_DEFAULT,
-	"s",
-	"anim_name",
-	"Sets the script model's animation but only plays it once",
-	EV_NORMAL
-	);
+(
+    "anim",
+    EV_DEFAULT,
+    "s",
+    "anim_name",
+    "Sets the script model's animation",
+    EV_NORMAL
+);
+Event EV_ScriptModel_AnimDone
+(
+    "animdone",
+    EV_ZERO,
+    NULL,
+    NULL,
+    "Script model animation has finished.",
+    EV_NORMAL
+);
+Event EV_ScriptModel_MoveAnim
+(
+    "moveanim",
+    EV_DEFAULT,
+    "s",
+    "animName",
+    "Makes the script model play an animation and move with the deltas contained in the animation",
+    EV_NORMAL
+);
+Event EV_ScriptModel_MovingAnim
+(
+    "moving_from_anim",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The script model is moving based on an animation",
+    EV_NORMAL
+);
 
-CLASS_DECLARATION( ScriptSlave, ScriptModel, "script_model" )
-	{
-	   { &EV_Gib,							&ScriptModel::GibEvent },
-		{ &EV_SetAngle,						&ScriptModel::SetAngleEvent },
-      { &EV_ScriptModel_SetAnim,			&ScriptModel::SetAnimEvent },
-      { &EV_ScriptModel_AnimOnce,			&ScriptModel::AnimOnceEvent },
-      { &EV_Model,							&ScriptModel::SetModelEvent },
-  		{ NULL, NULL },
-	};
+CLASS_DECLARATION(ScriptSlave, ScriptModel, "script_model") {
+    {&EV_SetAngle,               &ScriptModel::SetAngleEvent      },
+    {&EV_ScriptModel_SetAnim,    &ScriptModel::SetAnimEvent       },
+    {&EV_Model,                  &ScriptModel::SetModelEvent      },
+    {&EV_ScriptModel_AnimDone,   &ScriptModel::AnimDoneEvent      },
+    {&EV_ScriptModel_MoveAnim,   &ScriptModel::MoveAnimEvent      },
+    {&EV_ScriptModel_MovingAnim, &ScriptModel::MovingFromAnimEvent},
+    {NULL,                       NULL                             },
+};
 
 ScriptModel::ScriptModel()
 {
-	// this is a tiki model
-	edict->s.eType = ET_MODELANIM;
+    // this is a tiki model
+    edict->s.eType = ET_MODELANIM;
+
+    AddWaitTill(STRING_ANIMDONE);
 }
 
-void ScriptModel::SetModelEvent
-   (
-   Event *ev
-   )
+void ScriptModel::SetModelEvent(Event *ev)
+{
+    ScriptSlave::SetModelEvent(ev);
 
-   {
-   ScriptSlave::SetModelEvent( ev );
+    if (edict->tiki && !mins.length() && !maxs.length()) {
+        gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, mins, maxs);
+    }
+}
 
-   if( ( gi.modeltiki( model ) ) && !mins.length() && !maxs.length() )
-      {
-      gi.CalculateBounds( edict->tiki, edict->s.scale, mins, maxs );
-      }
-   }
+void ScriptModel::SetAnimEvent(Event *ev)
+{
+    str animname;
 
-void ScriptModel::SetAnimEvent
-   (
-   Event *ev
-   )
+    animname = ev->GetString(1);
+    if (animname.length() && edict->tiki) {
+        int animnum;
 
-   {
-   const char * animname;
+        animnum = gi.Anim_NumForName(edict->tiki, animname);
+        if (animnum >= 0) {
+            NewAnim(animnum, EV_ScriptModel_AnimDone);
+            RestartAnimSlot(0);
+        }
+    }
+}
 
-   animname = ev->GetString( 1 );
-   if( animname && strlen( animname ) && gi.modeltiki( model ) )
-      {
-      int animnum;
+void ScriptModel::AnimDoneEvent(Event *ev)
+{
+    CancelEventsOfType(EV_ScriptModel_MovingAnim);
+    Unregister(STRING_ANIMDONE);
+}
 
-	  animnum = gi.Anim_NumForName( edict->tiki, animname );
-      if ( animnum >= 0 )
-         {
-         NewAnim( animnum );
-         }
-      }
-   }
+void ScriptModel::MoveAnimEvent(Event *ev)
+{
+    str animName;
+    int animNum;
 
-void ScriptModel::AnimOnceEvent
-   (
-   Event *ev
-   )
+    animName = ev->GetString(1);
 
-   {
-   const char * animname;
+    if (!animName.length()) {
+        return;
+    }
 
-   animname = ev->GetString( 1 );
-   if( animname && strlen( animname ) && gi.modeltiki( model ) )
-      {
-	   NewAnim( animname );
-      }
-   }
+    animNum = gi.Anim_NumForName(edict->tiki, animName.c_str());
+    if (animNum < 0) {
+        ScriptError("ScriptModel could not find animation %s.", animName.c_str());
+    }
 
-void ScriptModel::SetAngleEvent
-	(
-	Event *ev
-	)
+    NewAnim(animNum, EV_ScriptModel_AnimDone);
+    RestartAnimSlot(0);
+    PostEvent(EV_ScriptModel_MovingAnim, 0);
+}
 
-	{
-   float angle;
+void ScriptModel::MovingFromAnimEvent(Event *ev)
+{
+    Vector newOrigin;
+    Vector newAngles;
 
-	angle = ev->GetFloat( 1 );
-	if ( angle == -1 )
-		{
-		ForwardDir = Vector( 0, 0, 90 );
-      localangles = Vector( -90, 0, 0 );
-		}
-	else if ( angle == -2 )
-		{
-		ForwardDir = Vector( 0, 0, -90 );
-      localangles = Vector( 90, 0, 0 );
-		}
-	else
-		{
-		ForwardDir = Vector( 0, angle, 0 );
-      localangles = Vector( 0, angle, 0 );
-		}
+    // calculate velocity
+    newOrigin = origin + frame_delta;
+    velocity  = (newOrigin - origin) / level.frametime;
 
-	setAngles( localangles );
-   }
+    // calculate angular velocity
+    newAngles = angles + Vector(0, angular_delta, 0);
+    avelocity = (newAngles - angles) / level.frametime;
 
-void ScriptModel::GibEvent
-   (
-   Event *ev
-   )
+    PostEvent(EV_ScriptModel_MovingAnim, level.frametime);
+}
 
-   {
-   int      num,power;
-   float    scale;
+void ScriptModel::SetAngleEvent(Event *ev)
+{
+    float angle;
 
-   setSolidType( SOLID_NOT );
-   hideModel();
+    angle = ev->GetFloat(1);
+    if (angle == -1) {
+        ForwardDir  = Vector(0, 0, 90);
+        localangles = Vector(-90, 0, 0);
+    } else if (angle == -2) {
+        ForwardDir  = Vector(0, 0, -90);
+        localangles = Vector(90, 0, 0);
+    } else {
+        ForwardDir  = Vector(0, angle, 0);
+        localangles = Vector(0, angle, 0);
+    }
 
-   if ( !com_blood->integer )
-      {
-      PostEvent( EV_Remove, 0 );
-      return;
-      }
+    setAngles(localangles);
+}
 
-   num = ev->GetInteger( 1 );
-   power = ev->GetInteger( 2 );
-   scale = ev->GetFloat( 3 );
+void ScriptModel::GibEvent(Event *ev)
+{
+    int   num, power;
+    float scale;
 
-   power = -power;
+    setSolidType(SOLID_NOT);
+    hideModel();
 
-   if ( ev->NumArgs() > 3 )
-      {
-      CreateGibs( this, power, scale, num, ev->GetString( 4 ) );
-      }
-   else
-      {
-      CreateGibs( this, power, scale, num );
-      }
+    if (!com_blood->integer) {
+        PostEvent(EV_Remove, 0);
+        return;
+    }
 
-   PostEvent( EV_Remove, 0 );
-   }
+    num   = ev->GetInteger(1);
+    power = ev->GetInteger(2);
+    scale = ev->GetFloat(3);
+
+    power = -power;
+
+    if (ev->NumArgs() > 3) {
+        CreateGibs(this, power, scale, num, ev->GetString(4));
+    } else {
+        CreateGibs(this, power, scale, num);
+    }
+
+    PostEvent(EV_Remove, 0);
+}
+
+/*****************************************************************************/
+/*QUAKED script_model_realdamage (0 0.5 1) (0 0 0) (0 0 0) NOT_SOLID ALWAYS_DRAW
+
+******************************************************************************/
+/*****************************************************************************/
+
+CLASS_DECLARATION(ScriptModel, ScriptModelRealDamage, "script_model_realdamage") {
+    {&EV_Damage, &ScriptModelRealDamage::EventDamage},
+    {NULL,       NULL                               }
+};
+
+ScriptModelRealDamage::ScriptModelRealDamage()
+{
+    RemoveWaitTill(STRING_DAMAGE);
+}
+
+void ScriptModelRealDamage::EventDamage(Event *ev)
+{
+    Entity::DamageEvent(ev);
+}
 
 /*****************************************************************************/
 /*QUAKED script_origin (1.0 0 0) (-8 -8 -8) (8 8 8)
@@ -2258,17 +2157,80 @@ Used as an alternate origin for objects.  Bind the object to the script_origin
 in order to simulate changing that object's origin.
 ******************************************************************************/
 
-CLASS_DECLARATION( ScriptSlave, ScriptOrigin, "script_origin" )
-	{
-		{ &EV_Model,					&ScriptOrigin::SetModelEvent },
-		{ NULL, NULL }
-	};
+// Added in 2.30
+Event EV_ScriptOrigin_SetAngle
+(
+    "angle",
+    EV_DEFAULT,
+    "f",
+    "newAngle",
+    "set the angles of the entity using just one value.\n"
+    "Sets the yaw of the entity or an up and down\n"
+    "direction if newAngle is [0-359] or -1 or -2"
+);
+
+// Added in 2.30
+Event EV_ScriptOrigin_GetAngle
+(
+    "angle",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "get the angles of the entity using just one value.\n"
+    "Gets the yaw of the entity or an up and down\n"
+    "direction if newAngle is [0-359] or -1 or -2",
+    EV_GETTER
+);
+
+CLASS_DECLARATION(ScriptSlave, ScriptOrigin, "script_origin") {
+    {&EV_Model, &ScriptOrigin::SetModelEvent},
+
+    //
+    // Added in 2.30
+    //
+    {&EV_ScriptOrigin_SetAngle, &ScriptOrigin::SetAngleEvent},
+    {&EV_ScriptOrigin_GetAngle, &ScriptOrigin::GetAngleEvent},
+    {NULL,                      NULL                        }
+};
 
 ScriptOrigin::ScriptOrigin()
-	{
-  	setContents( 0 );
-	setSolidType( SOLID_NOT );
-	}
+{
+    setContents(0);
+    setSolidType(SOLID_NOT);
+}
+
+void ScriptOrigin::SetAngleEvent(Event* ev)
+{
+    float angle;
+
+    if (g_target_game < target_game_e::TG_MOHTT) {
+        // Restore the old behavior on previous versions (below 2.30).
+        // For example, higgins rangers in m3l1a would not face forward
+        return ScriptSlave::SetAngleEvent(ev);
+    }
+
+    angle = ev->GetFloat(1);
+    if (angle == -1) {
+        ForwardDir = Vector(0, 0, 90);
+        localangles = Vector(-90, 0, 0);
+    } else if (angle == -2) {
+        ForwardDir = Vector(0, 0, -90);
+        localangles = Vector(90, 0, 0);
+    } else {
+        ForwardDir = Vector(0, angle, 0);
+        localangles = Vector(0, angle, 0);
+    }
+
+    setAngles(localangles);
+}
+
+void ScriptOrigin::GetAngleEvent(Event* ev)
+{
+    Vector forward;
+
+    angles.AngleVectorsLeft(&forward);
+    ev->AddFloat(G_GetAngle(forward));
+}
 
 /*****************************************************************************/
 /*QUAKED script_skyorigin (1.0 0 0) ?
@@ -2276,14 +2238,199 @@ ScriptOrigin::ScriptOrigin()
 Used to specify the origin of a portal sky
 ******************************************************************************/
 
-CLASS_DECLARATION( ScriptSlave, ScriptSkyOrigin, "script_skyorigin" )
-	{
-		{ NULL, NULL }
-	};
+CLASS_DECLARATION(ScriptSlave, ScriptSkyOrigin, "script_skyorigin") {
+    {NULL, NULL}
+};
 
 ScriptSkyOrigin::ScriptSkyOrigin()
-	{
-   edict->s.renderfx |= RF_SKYORIGIN;
-  	setContents( 0 );
-	setSolidType( SOLID_NOT );
-	}
+{
+    edict->s.renderfx |= RF_SKYORIGIN;
+    edict->r.svFlags &= ~SVF_NOCLIENT;
+    setContents(0);
+    setSolidType(SOLID_NOT);
+}
+
+Event EV_ScriptSimpleStrafingGunfire_On
+(
+    "on",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn the gunfire on.",
+    EV_NORMAL
+);
+Event EV_ScriptSimpleStrafingGunfire_Off
+(
+    "off",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Turn the gunfire off.",
+    EV_NORMAL
+);
+Event EV_ScriptSimpleStrafingGunfire_Fire
+(
+    "fire",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Fire.",
+    EV_NORMAL
+);
+Event EV_ScriptSimpleStrafingGunfire_TracerFreq
+(
+    "tracerfreq",
+    EV_DEFAULT,
+    "f",
+    NULL,
+    "Set the frequency of the tracers",
+    EV_NORMAL
+);
+Event EV_ScriptSimpleStrafingGunfire_ProjectileModel
+(
+    "projectile",
+    EV_DEFAULT,
+    "s",
+    NULL,
+    "Set the projectile model",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(ScriptSlave, ScriptSimpleStrafingGunfire, "script_simplestrafinggunfire") {
+    {&EV_ScriptSimpleStrafingGunfire_On,              &ScriptSimpleStrafingGunfire::GunOn             },
+    {&EV_ScriptSimpleStrafingGunfire_Off,             &ScriptSimpleStrafingGunfire::GunOff            },
+    {&EV_ScriptSimpleStrafingGunfire_Fire,            &ScriptSimpleStrafingGunfire::GunFire           },
+    {&EV_Weapon_FireDelay,                            &ScriptSimpleStrafingGunfire::SetFireDelay      },
+    {&EV_Weapon_SetBulletRange,                       &ScriptSimpleStrafingGunfire::SetRange          },
+    {&EV_Weapon_SetBulletSpread,                      &ScriptSimpleStrafingGunfire::SetSpread         },
+    {&EV_Weapon_SetBulletDamage,                      &ScriptSimpleStrafingGunfire::SetDamage         },
+    {&EV_Weapon_SetBulletKnockback,                   &ScriptSimpleStrafingGunfire::SetKnockback      },
+    {&EV_Weapon_SetBulletThroughWood,                 &ScriptSimpleStrafingGunfire::SetThroughWood    },
+    {&EV_Weapon_SetBulletThroughMetal,                &ScriptSimpleStrafingGunfire::SetThroughMetal   },
+    {&EV_Weapon_SetBulletCount,                       &ScriptSimpleStrafingGunfire::SetBulletCount    },
+    {&EV_ScriptSimpleStrafingGunfire_TracerFreq,      &ScriptSimpleStrafingGunfire::SetTracerFreq     },
+    {&EV_ScriptSimpleStrafingGunfire_ProjectileModel, &ScriptSimpleStrafingGunfire::SetProjectileModel},
+    {NULL,                                            NULL                                            }
+};
+
+ScriptSimpleStrafingGunfire::ScriptSimpleStrafingGunfire()
+{
+    isOn            = false;
+    fireDelay       = 0.05f;
+    range           = 4000;
+    spread          = Vector(100, 100, 0);
+    damage          = 100;
+    knockback       = 0;
+    throughWood     = 0;
+    throughMetal    = 0;
+    bulletCount     = 1;
+    tracerCount     = 0;
+    tracerFrequency = 0;
+    projectileModel = "models/projectiles/stukaround.tik";
+}
+
+void ScriptSimpleStrafingGunfire::GunOn(Event *ev)
+{
+    isOn = true;
+
+    CancelEventsOfType(&EV_ScriptSimpleStrafingGunfire_Fire);
+    PostEvent(EV_ScriptSimpleStrafingGunfire_Fire, 0.05f);
+}
+
+void ScriptSimpleStrafingGunfire::GunOff(Event *ev)
+{
+    isOn = false;
+
+    CancelEventsOfType(&EV_ScriptSimpleStrafingGunfire_Fire);
+}
+
+void ScriptSimpleStrafingGunfire::GunFire(Event *ev)
+{
+    Vector dir, right, up;
+    Vector horzAngles;
+
+    AngleVectors(angles, NULL, NULL, up);
+    dir = -1 * up;
+
+    VectorToAngles(dir, horzAngles);
+    AngleVectors(horzAngles, NULL, right, up);
+
+    dir = dir * range + right * grandom() * spread.x;
+    dir += up * grandom() * spread.y;
+    dir.normalize();
+
+    ProjectileAttack(origin, dir, this, projectileModel, 1, 0, NULL);
+    // continue firing
+    PostEvent(EV_ScriptSimpleStrafingGunfire_Fire, fireDelay);
+}
+
+void ScriptSimpleStrafingGunfire::Archive(Archiver& arc)
+{
+    ScriptSlave::Archive(arc);
+
+    arc.ArchiveBoolean(&isOn);
+    arc.ArchiveFloat(&fireDelay);
+    arc.ArchiveFloat(&range);
+    arc.ArchiveVector(&spread);
+    arc.ArchiveFloat(&damage);
+    arc.ArchiveFloat(&knockback);
+    arc.ArchiveFloat(&throughWood);
+    arc.ArchiveFloat(&throughMetal);
+    arc.ArchiveInteger(&bulletCount);
+    arc.ArchiveInteger(&tracerCount);
+    arc.ArchiveInteger(&tracerFrequency);
+    arc.ArchiveString(&projectileModel);
+}
+
+Event EV_ScriptAimedStrafingGunfire_AimTarget
+(
+    "aimtarget",
+    EV_DEFAULT,
+    "e",
+    NULL,
+    "Set the aim target.",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(ScriptSimpleStrafingGunfire, ScriptAimedStrafingGunfire, "script_aimedstrafinggunfire") {
+    {&EV_ScriptAimedStrafingGunfire_AimTarget, &ScriptAimedStrafingGunfire::SetAimTarget},
+    {&EV_ScriptSimpleStrafingGunfire_Fire,     &ScriptAimedStrafingGunfire::GunFire     },
+    {NULL,                                 NULL                                         }
+};
+
+ScriptAimedStrafingGunfire::ScriptAimedStrafingGunfire()
+{
+    aimTarget = NULL;
+}
+
+void ScriptAimedStrafingGunfire::GunFire(Event *ev)
+{
+    if (!aimTarget) {
+        ScriptSimpleStrafingGunfire::GunFire(ev);
+        return;
+    }
+
+    Vector dir, right, up;
+    Vector horzAngles;
+
+    dir = aimTarget->origin - origin;
+    dir.normalize();
+
+    VectorToAngles(dir, horzAngles);
+    AngleVectors(horzAngles, NULL, right, up);
+
+    dir = dir * range + right * grandom() * spread.x;
+    dir += up * grandom() * spread.y;
+    dir.normalize();
+
+    ProjectileAttack(origin, dir, this, projectileModel, 1, 0, NULL);
+    // continue firing
+    PostEvent(EV_ScriptSimpleStrafingGunfire_Fire, fireDelay);
+}
+
+void ScriptAimedStrafingGunfire::Archive(Archiver& arc)
+{
+    ScriptSimpleStrafingGunfire::Archive(arc);
+
+    arc.ArchiveObjectPointer((Class **)&aimTarget);
+}
diff --git a/code/fgame/scriptslave.h b/code/fgame/scriptslave.h
index be35d25a..b3bbae74 100644
--- a/code/fgame/scriptslave.h
+++ b/code/fgame/scriptslave.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,10 +27,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // perform several different relative and specific rotations and translations
 // and can cause other parts of the script to be executed when touched, damaged,
 // touched, or used.
-// 
+//
 
-#ifndef __SCRIPTSLAVE_H__
-#define __SCRIPTSLAVE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -44,236 +43,373 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ScriptSlave : public Mover
 {
-	protected:
-		float attack_finished;
+protected:
+    float attack_finished;
 
-		int dmg;
-		int dmg_means_of_death;
+    int dmg;
+    int dmg_means_of_death;
 
-	public:
-		qboolean commandswaiting;
+public:
+    qboolean commandswaiting;
 
-		Vector	TotalRotation;
-		Vector	NewAngles;
-		Vector	NewPos;
-		Vector	ForwardDir;
-		float	speed;
+    Vector TotalRotation;
+    Vector NewAngles;
+    Vector NewPos;
+    Vector ForwardDir;
+    float  speed;
 
-		Waypoint	*waypoint;
-		float		traveltime;
-		BSpline		*splinePath;
-		float		splineTime;
+    Waypoint *waypoint;
+    float     traveltime;
+    BSpline  *splinePath;
+    float     splineTime;
 
-		cSpline<4, 512>	*m_pCurPath;
-		int				m_iCurNode;
+    cSpline<4, 512> *m_pCurPath;
+    int              m_iCurNode;
 
-		float	m_fCurSpeed;
-		float	m_fIdealSpeed;
-		Vector	m_vIdealPosition;
-		Vector	m_vIdealDir;
-		float	m_fIdealAccel;
-		float	m_fIdealDistance;
-		float	m_fLookAhead;
+    float  m_fCurSpeed;
+    float  m_fIdealSpeed;
+    Vector m_vIdealPosition;
+    Vector m_vIdealDir;
+    float  m_fIdealAccel;
+    float  m_fIdealDistance;
+    float  m_fLookAhead;
 
-		qboolean	splineangles;
-		qboolean	ignoreangles;
-		qboolean	ignorevelocity;
-		qboolean	moving;  // is the script object currently moving?
+    qboolean splineangles;
+    qboolean ignoreangles;
+    qboolean ignorevelocity;
+    float    m_fFollowRelativeYaw;
+    qboolean moving; // is the script object currently moving?
 
-	protected:
-		void				CheckNewOrders( void );
-		void				NewMove( void );
+protected:
+    void CheckNewOrders(void);
+    void NewMove(void);
 
+    CLASS_PROTOTYPE(ScriptSlave);
 
-      CLASS_PROTOTYPE( ScriptSlave );
+    ScriptSlave();
+    ~ScriptSlave();
 
-								ScriptSlave();
-								~ScriptSlave();
+    void BindEvent(Event *ev);
+    void EventUnbind(Event *ev);
+    void DoMove(Event *ev);
+    void WaitMove(Event *ev);
+    void Stop(Event *ev);
+    void ThreadMove(Event *ev);
+    void MoveEnd(Event *ev);
+    void SetAnglesEvent(Event *ev);
+    void SetAngleEvent(Event *ev);
+    void SetModelEvent(Event *ev);
+    void TriggerEvent(Event *ev) override;
+    void GotoNextWaypoint(Event *ev);
+    void JumpTo(Event *ev);
+    void MoveToEvent(Event *ev);
+    void SetSpeed(Event *ev);
+    void SetTime(Event *ev);
+    void MoveUp(Event *ev);
+    void MoveDown(Event *ev);
+    void MoveNorth(Event *ev);
+    void MoveSouth(Event *ev);
+    void MoveEast(Event *ev);
+    void MoveWest(Event *ev);
+    void MoveForward(Event *ev);
+    void MoveBackward(Event *ev);
+    void MoveLeft(Event *ev);
+    void MoveRight(Event *ev);
+    void MoveOffset(Event *ev);
+    void RotateXdownto(Event *ev);
+    void RotateYdownto(Event *ev);
+    void RotateZdownto(Event *ev);
+    void RotateAxisdownto(Event *ev);
+    void RotateXupto(Event *ev);
+    void RotateYupto(Event *ev);
+    void RotateZupto(Event *ev);
+    void RotateAxisupto(Event *ev);
+    void Rotateupto(Event *ev);
+    void Rotatedownto(Event *ev);
+    void Rotateto(Event *ev);
+    void RotateXdown(Event *ev);
+    void RotateYdown(Event *ev);
+    void RotateZdown(Event *ev);
+    void RotateAxisdown(Event *ev);
+    void RotateXup(Event *ev);
+    void RotateYup(Event *ev);
+    void RotateZup(Event *ev);
+    void RotateAxisup(Event *ev);
+    void RotateX(Event *ev);
+    void RotateY(Event *ev);
+    void RotateZ(Event *ev);
+    void RotateAxis(Event *ev);
+    void TouchFunc(Event *ev);
+    void BlockFunc(Event *ev);
+    void TriggerFunc(Event *ev);
+    void UseFunc(Event *ev);
+    void DamageFunc(Event *ev);
+    void SetDamage(Event *ev);
+    void SetMeansOfDeath(Event *ev);
+    void FollowPath(Event *ev);
+    void FollowPathRelativeYaw(Event *ev); // Added in 2.0
+    void EndPath(Event *ev);
+    void FollowingPath(Event *ev);
+    void CreatePath(SplinePath *path, splinetype_t type);
+    void Explode(Event *ev);
+    void NotShootable(Event *ev);
+    void OpenPortal(Event *ev);
+    void ClosePortal(Event *ev);
+    void PhysicsOn(Event *ev);
+    void PhysicsOff(Event *ev);
+    void PhysicsVelocity(Event *ev);
+    void EventFlyPath(Event *ev);
+    void EventModifyFlyPath(Event *ev);
+    void EventNormalAngles(Event *ev); // Added in 2.0
+    void SetupPath(cSpline<4, 512> *pPath, SimpleEntity *se);
 
-		void					BindEvent( Event *ev );
-		void					EventUnbind( Event *ev );
-		void					DoMove( Event *ev );
-		void					WaitMove( Event *ev );
-		void					MoveEnd( Event *ev );
-		void					SetAnglesEvent( Event *ev );
-		void					SetAngleEvent( Event *ev );
-      void              SetModelEvent( Event *ev );
-		void					TriggerEvent( Event *ev ) override;
-		void					GotoNextWaypoint( Event *ev );
-		void					JumpTo( Event *ev );
-		void					MoveToEvent( Event *ev );
-		void					SetSpeed( Event *ev );
-		void					SetTime( Event *ev );
-		void					MoveUp( Event *ev );
-		void					MoveDown( Event *ev );
-		void					MoveNorth( Event *ev );
-		void					MoveSouth( Event *ev );
-		void					MoveEast( Event *ev );
-		void					MoveWest( Event *ev );
-		void					MoveForward( Event *ev );
-		void					MoveBackward( Event *ev );
-		void					MoveLeft( Event *ev );
-		void					MoveRight( Event *ev );
-		void					RotateXdownto( Event *ev );
-		void					RotateYdownto( Event *ev );
-		void					RotateZdownto( Event *ev );
-		void					RotateAxisdownto( Event *ev );
-		void					RotateXupto( Event *ev );
-		void					RotateYupto( Event *ev );
-		void					RotateZupto( Event *ev );
-		void					RotateAxisupto( Event *ev );
-		void					Rotateupto( Event *ev );
-		void					Rotatedownto( Event *ev );
-		void					Rotateto( Event *ev );
-		void					RotateXdown( Event *ev );
-		void					RotateYdown( Event *ev );
-		void					RotateZdown( Event *ev );
-		void					RotateAxisdown( Event *ev );
-		void					RotateXup( Event *ev );
-		void					RotateYup( Event *ev );
-		void					RotateZup( Event *ev );
-		void					RotateAxisup( Event *ev );
-		void					RotateX( Event *ev );
-		void					RotateY( Event *ev );
-		void					RotateZ( Event *ev );
-		void					RotateAxis( Event *ev );
-      void					SetDamage( Event *ev );
-		void					SetMeansOfDeath( Event *ev );
-		void					FollowPath( Event *ev );
-		void					EndPath( Event *ev );
-		void					FollowingPath( Event *ev );
-      void              CreatePath( SplinePath *path,	splinetype_t type );
-      void              Explode( Event *ev );
-      void              NotShootable( Event *ev );
-      void              OpenPortal( Event *ev );
-      void              ClosePortal( Event *ev );
-      void              PhysicsOn( Event *ev );
-      void              PhysicsOff( Event *ev );
-      void              PhysicsVelocity( Event *ev );
-	  void				DamageFunc( Event *ev );
-	  void				EventFlyPath( Event *ev );
-	  void				EventModifyFlyPath( Event *ev );
-	  void				SetupPath( cSpline< 4, 512 > *pPath, SimpleEntity *se );
+    void Archive(Archiver& arc) override;
+};
 
-      void Archive( Archiver &arc ) override;
-	};
-
-inline void ScriptSlave::Archive
-	(
-	Archiver &arc
-	)
+inline void ScriptSlave::Archive(Archiver& arc)
 {
-	int tempInt;
+    int tempInt;
 
-	Mover::Archive( arc );
+    Mover::Archive(arc);
 
-	arc.ArchiveFloat( &attack_finished );
-	arc.ArchiveInteger( &dmg );
-	arc.ArchiveInteger( &dmg_means_of_death );
+    arc.ArchiveFloat(&attack_finished);
+    arc.ArchiveInteger(&dmg);
+    arc.ArchiveInteger(&dmg_means_of_death);
 
-	arc.ArchiveBoolean( &commandswaiting );
-	arc.ArchiveVector( &TotalRotation );
-	arc.ArchiveVector( &NewAngles );
-	arc.ArchiveVector( &NewPos );
-	arc.ArchiveVector( &ForwardDir );
-	arc.ArchiveFloat( &speed );
-	arc.ArchiveObjectPointer( ( Class ** )&waypoint );
-	arc.ArchiveFloat( &traveltime );
+    arc.ArchiveBoolean(&commandswaiting);
+    arc.ArchiveVector(&TotalRotation);
+    arc.ArchiveVector(&NewAngles);
+    arc.ArchiveVector(&NewPos);
+    arc.ArchiveVector(&ForwardDir);
+    arc.ArchiveFloat(&speed);
+    arc.ArchiveObjectPointer((Class **)&waypoint);
+    arc.ArchiveFloat(&traveltime);
 
-	if( arc.Saving() )
-	{
-		// if it exists, archive it, otherwise place a special NULL ptr tag
-		if( splinePath )
-		{
-			tempInt = ARCHIVE_POINTER_VALID;
-		}
-		else
-		{
-			tempInt = ARCHIVE_POINTER_NULL;
-		}
-		arc.ArchiveInteger( &tempInt );
-		if( tempInt == ARCHIVE_POINTER_VALID )
-		{
-			splinePath->Archive( arc );
-		}
-	}
-	else
-	{
-		arc.ArchiveInteger( &tempInt );
-		if( tempInt == ARCHIVE_POINTER_VALID )
-		{
-			splinePath = new BSpline;
-			splinePath->Archive( arc );
-		}
-		else
-		{
-			splinePath = NULL;
-		}
-	}
-	arc.ArchiveFloat( &splineTime );
-	arc.ArchiveBoolean( &splineangles );
-	arc.ArchiveBoolean( &ignoreangles );
-	arc.ArchiveBoolean( &moving );
+    if (arc.Saving()) {
+        // if it exists, archive it, otherwise place a special NULL ptr tag
+        if (splinePath) {
+            tempInt = ARCHIVE_POINTER_VALID;
+        } else {
+            tempInt = ARCHIVE_POINTER_NULL;
+        }
+        arc.ArchiveInteger(&tempInt);
+        if (tempInt == ARCHIVE_POINTER_VALID) {
+            splinePath->Archive(arc);
+        }
+    } else {
+        arc.ArchiveInteger(&tempInt);
+        if (tempInt == ARCHIVE_POINTER_VALID) {
+            splinePath = new BSpline;
+            splinePath->Archive(arc);
+        } else {
+            splinePath = NULL;
+        }
+    }
+    arc.ArchiveFloat(&splineTime);
+    arc.ArchiveBoolean(&splineangles);
+    arc.ArchiveBoolean(&ignoreangles);
+    arc.ArchiveBoolean(&ignorevelocity);
+    arc.ArchiveBoolean(&moving);
 
-	if( arc.Saving() )
-	{
-		// if it exists, archive it, otherwise place a special NULL ptr tag
-		if( m_pCurPath )
-		{
-			tempInt = ARCHIVE_POINTER_VALID;
-		}
-		else
-		{
-			tempInt = ARCHIVE_POINTER_NULL;
-		}
-		arc.ArchiveInteger( &tempInt );
-		if( tempInt == ARCHIVE_POINTER_VALID )
-		{
-			m_pCurPath->Archive( arc );
-		}
-	}
-	else
-	{
-		arc.ArchiveInteger( &tempInt );
-		if( tempInt == ARCHIVE_POINTER_VALID )
-		{
-			m_pCurPath = new cSpline< 4, 512 >;
-			m_pCurPath->Archive( arc );
-		}
-		else
-		{
-			m_pCurPath = NULL;
-		}
-	}
+    if (arc.Saving()) {
+        // if it exists, archive it, otherwise place a special NULL ptr tag
+        if (m_pCurPath) {
+            tempInt = ARCHIVE_POINTER_VALID;
+        } else {
+            tempInt = ARCHIVE_POINTER_NULL;
+        }
+        arc.ArchiveInteger(&tempInt);
+        if (tempInt == ARCHIVE_POINTER_VALID) {
+            m_pCurPath->Archive(arc);
+        }
+    } else {
+        arc.ArchiveInteger(&tempInt);
+        if (tempInt == ARCHIVE_POINTER_VALID) {
+            m_pCurPath = new cSpline<4, 512>;
+            m_pCurPath->Archive(arc);
+        } else {
+            m_pCurPath = NULL;
+        }
+    }
+
+    arc.ArchiveInteger(&m_iCurNode);
+    arc.ArchiveFloat(&m_fCurSpeed);
+    arc.ArchiveFloat(&m_fIdealSpeed);
+    arc.ArchiveVector(&m_vIdealPosition);
+    arc.ArchiveVector(&m_vIdealDir);
+    arc.ArchiveFloat(&m_fIdealAccel);
+    arc.ArchiveFloat(&m_fIdealDistance);
+    arc.ArchiveFloat(&m_fLookAhead);
+    arc.ArchiveFloat(&m_fFollowRelativeYaw);
 }
 
 class ScriptModel : public ScriptSlave
-	{
-   private:
-      void              GibEvent(Event *ev);
+{
+private:
+    void GibEvent(Event *ev);
 
-   public:
-      CLASS_PROTOTYPE( ScriptModel );
+public:
+    CLASS_PROTOTYPE(ScriptModel);
 
-								ScriptModel();
-		void					SetAngleEvent( Event *ev );
-		void					SetModelEvent( Event *ev );
-		void					SetAnimEvent( Event *ev );
-		void					AnimOnceEvent( Event *ev );
-	};
+    ScriptModel();
+    void SetAngleEvent(Event *ev);
+    void SetModelEvent(Event *ev);
+    void SetAnimEvent(Event *ev);
+    void AnimDoneEvent(Event *ev);
+    void MoveAnimEvent(Event *ev);
+    void MovingFromAnimEvent(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
+
+inline void ScriptModel::Archive(Archiver& arc)
+{
+    ScriptSlave::Archive(arc);
+}
+
+class ScriptModelRealDamage : public ScriptModel
+{
+public:
+    CLASS_PROTOTYPE(ScriptModelRealDamage);
+
+    ScriptModelRealDamage();
+    void EventDamage(Event *ev);
+
+    void Archive(Archiver& arc) override;
+};
+
+inline void ScriptModelRealDamage::Archive(Archiver& arc)
+{
+    ScriptModel::Archive(arc);
+}
 
 class ScriptOrigin : public ScriptSlave
-	{
-	public:
-      CLASS_PROTOTYPE( ScriptOrigin );
-								ScriptOrigin();
-	};
+{
+public:
+    CLASS_PROTOTYPE(ScriptOrigin);
+    ScriptOrigin();
+
+    void SetAngleEvent(Event *ev); // Added in 2.30
+    void GetAngleEvent(Event *ev); // Added in 2.30
+};
 
 class ScriptSkyOrigin : public ScriptSlave
-	{
-	public:
-      CLASS_PROTOTYPE( ScriptSkyOrigin );
-								ScriptSkyOrigin();
-	};
+{
+public:
+    CLASS_PROTOTYPE(ScriptSkyOrigin);
+    ScriptSkyOrigin();
+};
 
-#endif /* scriptslave.h */
+class ScriptSimpleStrafingGunfire : public ScriptSlave
+{
+protected:
+    qboolean isOn;
+    float    fireDelay;
+    float    range;
+    Vector   spread;
+    float    damage;
+    float    knockback;
+    float    throughWood;
+    float    throughMetal;
+    int      bulletCount;
+    int      tracerCount;
+    int      tracerFrequency;
+    str      projectileModel;
+
+public:
+    CLASS_PROTOTYPE(ScriptSimpleStrafingGunfire);
+
+    ScriptSimpleStrafingGunfire();
+
+    void Archive(Archiver& arc) override;
+
+protected:
+    void GunFire(Event *ev);
+
+private:
+    void GunOn(Event *ev);
+    void GunOff(Event *ev);
+    void SetFireDelay(Event *ev);
+    void SetRange(Event *ev);
+    void SetSpread(Event *ev);
+    void SetDamage(Event *ev);
+    void SetKnockback(Event *ev);
+    void SetThroughWood(Event *ev);
+    void SetThroughMetal(Event *ev);
+    void SetBulletCount(Event *ev);
+    void SetTracerFreq(Event *ev);
+    void SetProjectileModel(Event *ev);
+};
+
+inline void ScriptSimpleStrafingGunfire::SetFireDelay(Event *ev)
+{
+    fireDelay = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetRange(Event *ev)
+{
+    range = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetSpread(Event *ev)
+{
+    spread.x = ev->GetFloat(1);
+    spread.y = ev->GetFloat(2);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetDamage(Event *ev)
+{
+    damage = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetKnockback(Event *ev)
+{
+    knockback = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetThroughWood(Event *ev)
+{
+    throughWood = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetThroughMetal(Event *ev)
+{
+    throughMetal = ev->GetFloat(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetBulletCount(Event *ev)
+{
+    bulletCount = ev->GetInteger(1);
+}
+
+inline void ScriptSimpleStrafingGunfire::SetTracerFreq(Event *ev)
+{
+    tracerFrequency = ev->GetInteger(1);
+    tracerCount     = 0;
+}
+
+inline void ScriptSimpleStrafingGunfire::SetProjectileModel(Event *ev)
+{
+    projectileModel = ev->GetString(1);
+}
+
+class ScriptAimedStrafingGunfire : public ScriptSimpleStrafingGunfire
+{
+private:
+    Entity *aimTarget;
+
+public:
+    CLASS_PROTOTYPE(ScriptAimedStrafingGunfire);
+
+    ScriptAimedStrafingGunfire();
+
+    void Archive(Archiver& arc) override;
+
+    void GunFire(Event *ev);
+    void SetAimTarget(Event *ev);
+};
+
+inline void ScriptAimedStrafingGunfire::SetAimTarget(Event *ev)
+{
+    aimTarget = ev->GetEntity(1);
+}
diff --git a/code/fgame/scriptthread.cpp b/code/fgame/scriptthread.cpp
index 2743ee35..f5a91873 100644
--- a/code/fgame/scriptthread.cpp
+++ b/code/fgame/scriptthread.cpp
@@ -430,7 +430,8 @@ Event EV_ScriptThread_KillEnt
 );
 Event EV_ScriptThread_IsAlive
 (
-    "IsAlive", EV_DEFAULT,
+    "IsAlive",
+    EV_DEFAULT,
     "e",
     "ent",
     "Returns true if the specified entity exists and has health > 0.",
@@ -707,7 +708,8 @@ Event EV_ScriptThread_Vector_Normalize
 );
 Event EV_ScriptThread_Vector_Add
 (
-    "vector_add", EV_DEFAULT,
+    "vector_add",
+    EV_DEFAULT,
     "vv",
     "vector1 vector2",
     "Returns vector1 + vector2.",
@@ -724,7 +726,8 @@ Event EV_ScriptThread_Vector_Subtract
 );
 Event EV_ScriptThread_Vector_Scale
 (
-    "vector_scale", EV_DEFAULT,
+    "vector_scale",
+    EV_DEFAULT,
     "vf",
     "vector1 scale_factor",
     "Returns vector1 * scale_factor.",
@@ -732,7 +735,8 @@ Event EV_ScriptThread_Vector_Scale
 );
 Event EV_ScriptThread_Vector_DotProduct
 (
-    "vector_dot", EV_DEFAULT,
+    "vector_dot",
+    EV_DEFAULT,
     "vv",
     "vector1 vector2",
     "Returns vector1 * vector2.",
@@ -841,7 +845,7 @@ Event EV_ScriptThread_PlayMovie // Added in 2.0
 (
     "PlayMovie",
     EV_DEFAULT,
-    "sI",
+    "s",
     "name",
     "Play a Movie..."
 );
@@ -953,7 +957,7 @@ Event EV_ScriptThread_HudDraw_VirtualSize
     EV_DEFAULT,
     "ii",
     "index virtual",
-    "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size",
+    "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size",
     EV_NORMAL
 );
 Event EV_ScriptThread_HudDraw_Color
@@ -1039,10 +1043,9 @@ Event EV_ScriptThread_BspTransition
 (
     "bsptransition",
     EV_DEFAULT,
-    "s",
-    "next_map",
-    "Transitions to the next BSP. Keeps player data,"
-    "and game data."
+    "sB",
+    "next_map skipFade", // Added in 2.30: skipFade
+    "Transitions to the next BSP. Keeps player data, and game data."
 );
 Event EV_ScriptThread_LevelTransition
 (
@@ -1173,7 +1176,7 @@ Event EV_ScriptThread_RegisterCommand
 );
 
 //
-// Openmohaa additions
+// Added in OPM
 //
 Event EV_ScriptThread_CancelWaiting
 (
@@ -1365,7 +1368,7 @@ Event EV_ScriptThread_iHudDrawVirtualSize
     EV_DEFAULT,
     "eii",
     "player index virtual",
-    "Sets if the huddraw element for given player should use virutal screen resolution for positioning and size",
+    "Sets if the huddraw element for given player should use virtual screen resolution for positioning and size",
     EV_NORMAL
 );
 Event EV_ScriptThread_IsArray
@@ -1432,6 +1435,15 @@ Event EV_ScriptThread_FileRead
     EV_NORMAL
 );
 Event EV_ScriptThread_FileClose
+(
+    "fclose",
+    EV_DEFAULT,
+    "i",
+    "filehandle",
+    "Closes file of given file handle",
+    EV_NORMAL
+);
+Event EV_ScriptThread_FileClose2
 (
     "fclose",
     EV_DEFAULT,
@@ -1664,6 +1676,24 @@ Event EV_ScriptThread_UnregisterEv
     "Unregisters script callback handler for specified event",
     EV_RETURN
 );
+Event EV_ScriptThread_Event_Subscribe
+(
+    "event_subscribe",
+    EV_DEFAULT,
+    "ss",
+    "eventname script",
+    "Subscribe to the specified event. The specified script will be executed when the event gets triggered.",
+    EV_NORMAL
+);
+Event EV_ScriptThread_Event_Unsubscribe
+(
+    "event_unsubscribe",
+    EV_DEFAULT,
+    "ss",
+    "eventname script",
+    "Unsubscribe the script from the specified event.",
+    EV_NORMAL
+);
 Event EV_ScriptThread_Conprintf
 (
     "conprintf",
@@ -1969,6 +1999,15 @@ Event EV_ScriptThread_Md5String
     "generates MD5 hash of given text",
     EV_RETURN
 );
+Event EV_ScriptThread_GetEntity
+(
+    "getentity",
+    EV_CHEAT,
+    "i",
+    "ent_num",
+    "Gets the specified entity",
+    EV_RETURN
+);
 Event EV_ScriptThread_SetTimer
 (
     "settimer",
@@ -2015,6 +2054,15 @@ Event EV_ScriptThread_VisionSetNaked
     "empty string, it will be set to the current map's name.",
     EV_NORMAL
 );
+Event EV_ScriptThread_IsBot
+(
+    "isBot",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Returns 1 if the client is a bot, 0 otherwise. Will return 0 if the entity is not a client.",
+    EV_RETURN
+);
 
 CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_GetCvar,                 &ScriptThread::Getcvar                 },
@@ -2109,7 +2157,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_MissionFailed,           &ScriptThread::MissionFailed           },
     {&EV_ScriptThread_IsAlive,                 &ScriptThread::EventIsAlive            },
     {&EV_ScriptThread_Popmenu,                 &ScriptThread::EventPopmenu            },
-    {&EV_ScriptThread_Showmenu,                &ScriptThread::EventPopmenu            },
+    {&EV_ScriptThread_Showmenu,                &ScriptThread::EventShowmenu           },
     {&EV_ScriptThread_Hidemenu,                &ScriptThread::EventHidemenu           },
     {&EV_ScriptThread_PlayMovie,               &ScriptThread::EventPlayMovie          },
     {&EV_ScriptThread_Pushmenu,                &ScriptThread::EventPushmenu           },
@@ -2168,9 +2216,12 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_GetTanH,                 &ScriptThread::EventTanH               },
     {&EV_ScriptThread_strncpy,                 &ScriptThread::StringBytesCopy         },
     {&EV_ScriptThread_Md5String,               &ScriptThread::Md5String               },
+    {&EV_ScriptThread_GetEntity,               &ScriptThread::GetEntByEntnum          },
     {&EV_ScriptThread_TypeOf,                  &ScriptThread::TypeOfVariable          },
     {&EV_ScriptThread_RegisterEv,              &ScriptThread::RegisterEvent           },
     {&EV_ScriptThread_UnregisterEv,            &ScriptThread::UnregisterEvent         },
+    {&EV_ScriptThread_Event_Subscribe,         &ScriptThread::SubscribeEvent          },
+    {&EV_ScriptThread_Event_Unsubscribe,       &ScriptThread::UnsubscribeEvent        },
     {&EV_ScriptThread_CancelWaiting,           &ScriptThread::CancelWaiting           },
     {&EV_ScriptThread_GetTime,                 &ScriptThread::GetTime                 },
     {&EV_ScriptThread_GetTimeZone,             &ScriptThread::GetTimeZone             },
@@ -2188,6 +2239,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_Earthquake2,             &ScriptThread::Earthquake              },
     {&EV_ScriptThread_FadeSound,               &ScriptThread::FadeSound               },
     {&EV_ScriptThread_FileClose,               &ScriptThread::FileClose               },
+    {&EV_ScriptThread_FileClose2,              &ScriptThread::FileClose               },
     {&EV_ScriptThread_FileCopy,                &ScriptThread::FileCopy                },
     {&EV_ScriptThread_FileEof,                 &ScriptThread::FileEof                 },
     {&EV_ScriptThread_FileError,               &ScriptThread::FileError               },
@@ -2240,6 +2292,7 @@ CLASS_DECLARATION(Listener, ScriptThread, NULL) {
     {&EV_ScriptThread_TraceDetails,            &ScriptThread::TraceDetails            },
     {&EV_ScriptThread_VisionGetNaked,          &ScriptThread::VisionGetNaked          },
     {&EV_ScriptThread_VisionSetNaked,          &ScriptThread::VisionSetNaked          },
+    {&EV_ScriptThread_IsBot,                   &ScriptThread::IsPlayerBot             },
     {NULL,                                     NULL                                   }
 };
 
@@ -2265,17 +2318,28 @@ ScriptThread::ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos)
     m_ScriptVM = new ScriptVM(scriptClass, pCodePos, this);
 
     m_ScriptVM->m_ThreadState = THREAD_RUNNING;
+
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2("+++Constructor THREAD: %p %p\n", this, scriptClass);
+    }
 }
 
 ScriptThread::~ScriptThread()
 {
-    ScriptVM *vm = m_ScriptVM;
-    assert(vm);
-    if (!vm) {
-        // should never happen
-        throw ScriptException("Attempting to delete a dead thread.");
+    ScriptVM *vm;
+
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2("---Destructor THREAD: %p\n", this);
     }
 
+    assert(m_ScriptVM);
+    if (!m_ScriptVM) {
+        // should never happen
+        //throw ScriptException("Attempting to delete a dead thread.");
+        gi.Error(ERR_DROP, "Attempting to delete a dead thread.");
+    }
+
+    vm         = m_ScriptVM;
     m_ScriptVM = NULL;
     if (vm->ThreadState() == THREAD_WAITING) {
         vm->m_ThreadState = THREAD_RUNNING;
@@ -2290,7 +2354,7 @@ ScriptThread::~ScriptThread()
 
 ScriptClass *ScriptThread::GetScriptClass(void)
 {
-    return m_ScriptVM->m_ScriptClass;
+    return m_ScriptVM->GetScriptClass();
 }
 
 str ScriptThread::FileName(void)
@@ -2301,8 +2365,7 @@ str ScriptThread::FileName(void)
 void ScriptThread::StartedWaitFor(void)
 {
     Stop();
-
-    m_ScriptVM->m_ThreadState = THREAD_SUSPENDED;
+    StartWaiting();
     m_ScriptVM->Suspend();
 }
 
@@ -2326,17 +2389,13 @@ void ScriptThread::StoppedWaitFor(const_str name, bool bDeleting)
 
     if (m_ScriptVM->m_ThreadState == THREAD_SUSPENDED) {
         if (name != 0) {
-            if (m_ScriptVM->state == STATE_EXECUTION) {
+            if (m_ScriptVM->IsSuspended()) {
                 Execute();
             } else {
                 m_ScriptVM->Resume();
             }
         } else {
-            m_ScriptVM->m_ThreadState = THREAD_RUNNING;
-            CancelWaitingAll();
-            m_ScriptVM->m_ThreadState = THREAD_WAITING;
-
-            Director.AddTiming(this, 0.0f);
+            StartTiming();
         }
     }
 }
@@ -2358,10 +2417,13 @@ void ScriptThread::ScriptExecute(ScriptVariable *data, int dataSize, ScriptVaria
 
 void ScriptThread::ScriptExecuteInternal(ScriptVariable *data, int dataSize)
 {
-    SafePtr<ScriptThread> currentThread  = Director.m_CurrentThread;
-    SafePtr<ScriptThread> previousThread = Director.m_PreviousThread;
+    SafePtr<ScriptThread> currentThread;
+    SafePtr<ScriptThread> previousThread;
 
-    Director.m_PreviousThread = currentThread;
+    currentThread  = Director.CurrentThread();
+    previousThread = this;
+
+    Director.m_PreviousThread = Director.CurrentThread();
     Director.m_CurrentThread  = this;
 
     Stop();
@@ -2409,29 +2471,42 @@ void ScriptThread::Execute(ScriptVariable *data, int dataSize)
     ScriptExecuteInternal(data, dataSize);
 }
 
+void ScriptThread::Execute()
+{
+    if (Director.iPaused > 0) {
+        StartTiming();
+    } else {
+        ScriptExecuteInternal(NULL, 0);
+    }
+}
+
 ScriptThread *ScriptThread::CreateThreadInternal(const ScriptVariable& label)
 {
-    return m_ScriptVM->GetScriptClass()->CreateThreadInternal(label);
+    return GetScriptClass()->CreateThreadInternal(label);
 }
 
 ScriptThread *ScriptThread::CreateScriptInternal(const ScriptVariable& label)
 {
-    return m_ScriptVM->GetScriptClass()->CreateScriptInternal(label);
+    return GetScriptClass()->CreateScriptInternal(label);
 }
 
 void ScriptThread::StartTiming(void)
-{
-    StartTiming(0);
-}
-
-void ScriptThread::StartTiming(float time)
 {
     Stop();
 
     m_ScriptVM->m_ThreadState = THREAD_WAITING;
 
-    if (time < 0) {
-        time = 0;
+    Director.AddTiming(this, level.inttime);
+}
+
+void ScriptThread::StartTiming(int time)
+{
+    Stop();
+
+    m_ScriptVM->m_ThreadState = THREAD_WAITING;
+
+    if (time < level.inttime) {
+        time = level.inttime;
     }
 
     Director.AddTiming(this, time);
@@ -2453,9 +2528,9 @@ void ScriptThread::Stop(void)
     }
 }
 
-void ScriptThread::Wait(float time)
+void ScriptThread::Wait(int time)
 {
-    StartTiming(time);
+    StartTiming(level.inttime + time);
     m_ScriptVM->Suspend();
 }
 
@@ -2468,10 +2543,10 @@ void ScriptThread::Pause()
 void ScriptThread::Getcvar(Event *ev)
 {
     str varName = ev->GetString(1);
-    str s = gi.Cvar_Get(varName.c_str(), "", 0)->string;
+    str s       = gi.Cvar_Get(varName.c_str(), "", 0)->string;
 
     if (strstr(s.c_str(), ".")) {
-        for (int i = s.length() - 1; i >= 0; i--) {
+        for (size_t i = s.length() - 1; i >= 0; i--) {
             if (s[i] == '0') {
                 s[i] = 0;
             } else {
@@ -2617,7 +2692,7 @@ void ScriptThread::EventGoto(Event *ev)
 {
     m_ScriptVM->EventGoto(ev);
 
-    if (m_ScriptVM->State() == STATE_EXECUTION) {
+    if (m_ScriptVM->IsSuspended()) {
         ScriptExecuteInternal();
     } else {
         Stop();
@@ -2632,11 +2707,10 @@ void ScriptThread::EventThrow(Event *ev)
     }
 
     if (m_ScriptVM->EventThrow(ev)) {
-        if (m_ScriptVM->State() == STATE_EXECUTION) {
+        if (m_ScriptVM->IsSuspended()) {
             ScriptExecuteInternal();
         } else {
             Stop();
-
             m_ScriptVM->Resume();
         }
     } else {
@@ -2645,7 +2719,7 @@ void ScriptThread::EventThrow(Event *ev)
 
         Stop();
 
-        if (!BroadcastEvent("", *ev)) {
+        if (!BroadcastEvent(0, *ev)) {
             m_ScriptVM->GetScriptClass()->EventThrow(ev);
         }
 
@@ -2663,11 +2737,10 @@ void ScriptThread::EventDelayThrow(Event *ev)
     }
 
     if (m_ScriptVM->EventThrow(ev)) {
-        if (m_ScriptVM->State() == STATE_EXECUTION) {
-            Wait(0);
+        if (m_ScriptVM->IsSuspended()) {
+            StartTiming();
         } else {
             Stop();
-
             m_ScriptVM->Resume();
         }
     } else {
@@ -2688,12 +2761,17 @@ void ScriptThread::EventDelayThrow(Event *ev)
 
 void ScriptThread::EventWait(Event *ev)
 {
-    Wait(ev->GetFloat(1));
+    float timeSeconds;
+
+    // Fixed in OPM
+    //  Clamp to make sure to not overflow when converting to integer
+    timeSeconds = Q_clamp_float(ev->GetFloat(1), 0, 2000000);
+    Wait((int)roundf(timeSeconds * 1000));
 }
 
 void ScriptThread::EventWaitFrame(Event *ev)
 {
-    Wait(level.frametime);
+    Wait((int)roundf(level.frametime * 1000));
 }
 
 void ScriptThread::EventResume(Event *ev)
@@ -2769,7 +2847,7 @@ void ScriptThread::IPrintln(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(gi.LV_ConvertString(sString), false);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", gi.LV_ConvertString(sString.c_str()));
 }
 
 void ScriptThread::IPrintlnBold(Event *ev)
@@ -2782,7 +2860,7 @@ void ScriptThread::IPrintlnBold(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(gi.LV_ConvertString(sString), true);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", gi.LV_ConvertString(sString.c_str()));
 }
 
 void ScriptThread::IPrintln_NoLoc(Event *ev)
@@ -2795,7 +2873,7 @@ void ScriptThread::IPrintln_NoLoc(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(sString, false);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sString.c_str());
 }
 
 void ScriptThread::IPrintlnBold_NoLoc(Event *ev)
@@ -2808,7 +2886,7 @@ void ScriptThread::IPrintlnBold_NoLoc(Event *ev)
         sString += ev->GetString(i);
     }
 
-    G_PrintToAllClients(sString, true);
+    gi.SendServerCommand(-1, "print \"" HUD_MESSAGE_WHITE "%s\n\"", sString.c_str());
 }
 
 void ScriptThread::MPrint(Event *ev)
@@ -2887,7 +2965,8 @@ void ScriptThread::TriggerEvent(Event *ev)
 void ScriptThread::RegisterAliasAndCache(Event *ev)
 {
     //assert(!"ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache");
-    gi.DPrintf("ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache\n");
+    gi.DPrintf("ScriptThread::RegisterAliasAndCache needs to be implemented like ClientGameCommandManager::AliasCache\n"
+    );
 }
 
 void ScriptThread::CacheResourceEvent(Event *ev)
@@ -3003,6 +3082,16 @@ Listener *ScriptThread::SpawnInternal(Event *ev)
         throw ScriptException("Usage: spawn entityname [keyname] [value]...");
     }
 
+    // Fixed in OPM
+    //  The original game uses a raw char* pointer to get the classname rather than storing it in an str.
+    //  This causes an issue when the argument is none (NIL), stringValue() will allocate and return a new str() with "NIL".
+    //  As the returned str() is not stored anywhere, it gets destroyed immediately, meaning that the char* pointer gets empty.
+    //  This has the effect of using empty class ID, which is "Explosion" in original game.
+    //
+    //  For example, t2l2 has an incorrect "mg42_spawner_gunner" of class PathNode, but PathNode has no model variable.
+    //  global/spawner.scr::spawner_activate:
+    //  - In OG, it will successfully spawn an instance of "Explosion" due to the NIL argument behavior stated above.
+    //  - In OPM, it will not spawn anything and will cause script errors, it's the expected behavior by design
     classname = ev->GetString(1);
 
     if (getClassForID(classname) || getClass(classname)) {
@@ -3418,17 +3507,17 @@ void ScriptThread::RemoveClass(Event *ev)
 
 void ScriptThread::CameraCommand(Event *ev)
 {
-    Event      *e;
-    const char *cmd;
-    int         i;
-    int         n;
+    Event *e;
+    str    cmd;
+    int    i;
+    int    n;
 
     if (!ev->NumArgs()) {
         throw ScriptException("Usage: cam [command] [arg 1]...[arg n]");
     }
 
     cmd = ev->GetString(1);
-    if (Event::FindEventNum(cmd)) {
+    if (Event::Exists(cmd)) {
         e = new ConsoleEvent(cmd);
 
         n = ev->NumArgs();
@@ -3438,13 +3527,21 @@ void ScriptThread::CameraCommand(Event *ev)
 
         CameraMan.ProcessEvent(e);
     } else {
-        throw ScriptException("Unknown camera command '%s'.\n", cmd);
+        throw ScriptException("Unknown camera command '%s'.\n", cmd.c_str());
     }
 }
 
 void ScriptThread::MissionFailed(Event *ev)
 {
-    G_MissionFailed();
+    bool bNoFade;
+
+    if (level.intermissiontime) {
+        return;
+    }
+
+    bNoFade = ev->NumArgs() && ev->GetInteger(1);
+
+    G_BeginIntermission(level.current_map, TRANS_MISSION_FAILED, bNoFade);
 }
 
 void ScriptThread::Archive(Archiver& arc) {}
@@ -3504,31 +3601,46 @@ void ScriptThread::Vector_CrossProduct(Event *ev)
 
 void ScriptThread::Vector_ToAngles(Event *ev)
 {
-    ev->AddVector(ev->GetVector(1).toAngles());
+    Vector v1;
+    Vector v3;
+
+    v1 = ev->GetVector(1);
+    vectoangles(v1, v3);
+
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToForward(Event *ev)
 {
-    Vector fwd;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(&fwd);
-    ev->AddVector(fwd);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, v3, NULL, NULL);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToLeft(Event *ev)
 {
-    Vector left;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(NULL, &left);
-    ev->AddVector(left);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, NULL, v3, NULL);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_ToUp(Event *ev)
 {
-    Vector up;
+    Vector v1;
+    Vector v3;
 
-    ev->GetVector(1).AngleVectors(NULL, NULL, &up);
-    ev->AddVector(up);
+    v1 = ev->GetVector(1);
+
+    AngleVectors(v1, NULL, NULL, v3);
+    ev->AddVector(v3);
 }
 
 void ScriptThread::Angles_PointAt(Event *ev)
@@ -3557,13 +3669,20 @@ void ScriptThread::Angles_PointAt(Event *ev)
 
 void ScriptThread::EventIsAlive(Event *ev)
 {
-    Entity *ent = ev->GetEntity(1);
+    Entity *ent;
 
-    if (ent) {
-        ev->AddInteger(!ent->IsDead());
-    } else {
-        ev->AddInteger(0);
+    if (!ev->IsEntityAt(1)) {
+        ev->AddInteger(false);
+        return;
     }
+
+    ent = ev->GetEntity(1);
+    if (!ent) {
+        ev->AddInteger(false);
+        return;
+    }
+
+    ev->AddInteger(ent->health > 0);
 }
 
 void ScriptThread::EventPopmenu(Event *ev)
@@ -3679,13 +3798,6 @@ void ScriptThread::EventHideMouse(Event *ev)
 {
     gentity_t *ent;
     int        i;
-    str        name;
-
-    if (game.maxclients <= 0) {
-        return;
-    }
-
-    name = ev->GetString(1);
 
     for (i = 0, ent = g_entities; i < game.maxclients; i++, ent++) {
         if (!ent->inuse || !ent->client) {
@@ -3720,7 +3832,7 @@ void ScriptThread::EventTrace(Event *ev)
         mins = ev->GetVector(4);
     case 3:
         if (ev->GetInteger(3)) {
-            content_mask = MASK_SOLID;
+            content_mask &= ~MASK_SCRIPT_SLAVE;
         }
     case 2:
         end = ev->GetVector(2);
@@ -3739,7 +3851,7 @@ void ScriptThread::EventTrace(Event *ev)
 
 void ScriptThread::EventSightTrace(Event *ev)
 {
-    int    content_mask = MASK_LINE;
+    int    content_mask = MASK_SOLID;
     Vector start;
     Vector mins;
     Vector maxs;
@@ -3755,7 +3867,7 @@ void ScriptThread::EventSightTrace(Event *ev)
         mins = ev->GetVector(4);
     case 3:
         if (ev->GetInteger(3)) {
-            content_mask = MASK_SOLID;
+            content_mask &= ~MASK_IGNORE_ENTS;
         }
     case 2:
         end = ev->GetVector(2);
@@ -3842,7 +3954,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev)
     } else if (h_align == "right") {
         h_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement h_align string for huddraw_align!\n");
+        throw ScriptException("Wrong alignment h_align string for huddraw_align!\n");
     }
 
     if (v_align == "top") {
@@ -3852,7 +3964,7 @@ void ScriptThread::EventHudDrawAlign(Event *ev)
     } else if (v_align == "bottom") {
         v_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement v_align string for huddraw_align!\n");
+        throw ScriptException("Wrong alignment v_align string for huddraw_align!\n");
     }
 
     HudDrawAlign(index, h_alignement, v_alignement);
@@ -3996,7 +4108,7 @@ void ScriptThread::EventDebugInt3(Event *ev)
 
 void ScriptThread::EventTimeout(Event *ev)
 {
-    Director.maxTime = ev->GetFloat(1) * 1000.0f + 0.5f;
+    Director.maxTime = roundf(ev->GetFloat(1) * 1000.0f);
 }
 
 void ScriptThread::EventLandmineDamage(Event *ev)
@@ -4041,10 +4153,16 @@ void ScriptThread::EventRadiusDamage(Event *ev)
 
 void ScriptThread::EventBspTransition(Event *ev)
 {
-    str map = ev->GetString(1);
+    str  map      = ev->GetString(1);
+    bool skipFade = false;
+
+    if (ev->NumArgs() >= 2) {
+        // Added in 2.30
+        skipFade = ev->GetBoolean(2);
+    }
 
     if (level.intermissiontime == 0.0f) {
-        G_BeginIntermission(map, TRANS_BSP);
+        G_BeginIntermission(map, TRANS_BSP, skipFade);
     }
 }
 
@@ -4091,7 +4209,7 @@ void ScriptThread::EventTeamWin(Event *ev)
     const_str team;
     int       teamnum;
 
-    if (g_gametype->integer != GT_OBJECTIVE) {
+    if (g_gametype->integer < GT_OBJECTIVE) {
         throw ScriptException("'teamwin' only valid for objective-based DM games");
     }
 
@@ -4100,8 +4218,10 @@ void ScriptThread::EventTeamWin(Event *ev)
         teamnum = TEAM_ALLIES;
     } else if (team == STRING_AXIS) {
         teamnum = TEAM_AXIS;
+    } else if (team == STRING_DISGUISE_NONE) {
+        teamnum = TEAM_NONE;
     } else {
-        throw ScriptException("'teamwin' must be called with 'axis' or 'allies' as its argument");
+        throw ScriptException("'teamwin' must be called with 'axis', 'allies' or 'none' as its argument");
     }
 
     dmManager.TeamWin(teamnum);
@@ -4111,7 +4231,7 @@ void ScriptThread::EventEarthquake(Event *ev)
 {
     earthquake_t e;
 
-    e.duration = (int)(ev->GetFloat(1) * 1000.0f + 0.5f);
+    e.duration = (int)roundf(ev->GetFloat(1) * 1000.0f);
     if (e.duration <= 0) {
         return;
     }
@@ -4142,12 +4262,16 @@ void ScriptThread::EventAIsCloserThanBToC(Event *ev)
 void ScriptThread::EventPointsWithinDist(Event *ev)
 {
     Vector delta;
-    float  dist = ev->GetFloat(3);
+    Vector v1, v2;
+    float  fDistance;
 
-    delta = ev->GetVector(1) - ev->GetVector(2);
+    v1        = ev->GetVector(1);
+    v2        = ev->GetVector(2);
+    fDistance = ev->GetFloat(3);
+    delta     = v1 - v2;
 
     // check squared distance
-    ev->AddInteger(((delta * delta) < (dist * dist)));
+    ev->AddInteger(delta.lengthSquared() < Square(fDistance));
 }
 
 bool ScriptThread::CanScriptTracePrint(void)
@@ -4246,27 +4370,20 @@ void ScriptThread::SetCurrentObjective(int iObjective, int iTeam)
     gi.setConfigstring(CS_CURRENT_OBJECTIVE, va("%i", iObjective));
 
     if (iObjective == -1) {
-        level.m_vObjectiveLocation = vec_zero;
+        level.m_vObjectiveLocation       = vec_zero;
         level.m_vAlliedObjectiveLocation = vec_zero;
-        level.m_vAxisObjectiveLocation = vec_zero;
+        level.m_vAxisObjectiveLocation   = vec_zero;
     } else {
         const char *s   = gi.getConfigstring(CS_OBJECTIVES + iObjective);
         const char *loc = Info_ValueForKey(s, "loc");
-        Vector v;
+        Vector      v;
 
-        sscanf(
-            loc,
-            "%f %f %f",
-            &v[0],
-            &v[1],
-            &v[2]
-        );
+        sscanf(loc, "%f %f %f", &v[0], &v[1], &v[2]);
 
         //
         // Since 2.0, allow objective location per team
         //
-        switch (iTeam)
-        {
+        switch (iTeam) {
         case TEAM_NONE:
         default:
             level.m_vObjectiveLocation = v;
@@ -4285,7 +4402,7 @@ void ScriptThread::EventAddObjective(Event *ev)
 {
     int    index;
     int    status;
-    str    text = "";
+    str    text;
     Vector location;
 
     index  = ev->GetInteger(1) - 1;
@@ -4347,14 +4464,13 @@ void ScriptThread::EventSetScoreboardToggle(Event *ev)
 void ScriptThread::EventSetCurrentObjective(Event *ev)
 {
     int iObjective = ev->GetInteger(1);
-    int iTeam = 0;
+    int iTeam      = 0;
 
     if (iObjective > MAX_OBJECTIVES) {
         ScriptError("Index Out Of Range");
     }
 
-    if (ev->NumArgs() >= 2)
-    {
+    if (ev->NumArgs() >= 2) {
         const_str teamStr = ev->GetConstString(2);
         if (teamStr == STRING_ALLIES) {
             iTeam = TEAM_ALLIES;
@@ -4594,7 +4710,7 @@ void ScriptThread::RestoreSound(Event *ev)
 
     time = delaytime * 1000.0f;
 
-    gi.SendServerCommand(player != NULL ? player->edict - g_entities : NULL, "restoresound %0.2f %f", time, max_vol);
+    gi.SendServerCommand(player != NULL ? player->edict - g_entities : 0, "restoresound %0.2f %f", time, max_vol);
 }
 
 void ScriptThread::EventHudDraw3d(Event *ev)
@@ -4688,7 +4804,7 @@ void ScriptThread::GetPlayerIP(Event *ev)
 
     ip = ent->client->pers.ip;
 
-    sprintf(ip_buff, "%s:%i", ip, ent->client->pers.port);
+    Com_sprintf(ip_buff, sizeof(ip_buff), "%s:%i", ip, ent->client->pers.port);
 
     ev->AddString(ip_buff);
 }
@@ -4994,7 +5110,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev)
     } else if (h_align == "right") {
         h_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement h_align string for ihuddraw_align!\n");
+        throw ScriptException("Wrong alignment h_align string for ihuddraw_align!\n");
     }
 
     if (v_align == "top") {
@@ -5004,7 +5120,7 @@ void ScriptThread::EventIHudDrawAlign(Event *ev)
     } else if (v_align == "bottom") {
         v_alignement = 2;
     } else {
-        throw ScriptException("Wrong alignement v_align string for ihuddraw_align!\n");
+        throw ScriptException("Wrong alignment v_align string for ihuddraw_align!\n");
     }
 
     iHudDrawAlign(player->edict - g_entities, index, h_alignement, v_alignement);
@@ -5255,13 +5371,13 @@ void ScriptThread::TeamSetScore(Event *ev)
     if (bAdd) {
         team->m_iKills += score;
 
-        if (g_gametype->integer < 3) {
+        if (g_gametype->integer < GT_TEAM_ROUNDS) {
             team->m_teamwins += score;
         }
     } else {
         team->m_iKills = score;
 
-        if (g_gametype->integer < 3) {
+        if (g_gametype->integer < GT_TEAM_ROUNDS) {
             team->m_teamwins = score;
         }
     }
@@ -5305,15 +5421,15 @@ void ScriptThread::FileOpen(Event *ev)
 
     f = fopen(filename, accesstype);
 
-    if (f == NULL) {
-        ev->AddInteger(0);
-        return;
-    } else {
-        ev->AddInteger((int)(size_t)f);
-        sprintf(buf, "%i", scriptfiles->integer + 1);
-        gi.cvar_set("sv_scriptfiles", buf);
+    if (!f) {
+        ev->AddNil();
         return;
     }
+
+    ev->AddListener(new OSFile(f));
+
+    Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer + 1);
+    gi.cvar_set("sv_scriptfiles", buf);
 }
 
 void ScriptThread::FileWrite(Event *ev) {}
@@ -5322,11 +5438,10 @@ void ScriptThread::FileRead(Event *ev) {}
 
 void ScriptThread::FileClose(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    char  buf[16] = {0};
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    FILE   *f       = NULL;
+    char    buf[16] = {0};
 
     numArgs = ev->NumArgs();
 
@@ -5334,57 +5449,30 @@ void ScriptThread::FileClose(Event *ev)
         throw ScriptException("Wrong arguments count for fclose!\n");
     }
 
-    id = ev->GetInteger(1);
-
-    /*if( (int)scriptFiles[0].f != id && (int)scriptFiles[1].f != id )
-    {
-    gi.Printf("Wrong file handle for fclose!\n");
-    return;
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
     }
 
-    if( (int)scriptFiles[0].f == id )
-    {
-    scriptFiles[0].inUse = 0;
-    fclose( scriptFiles[0].f );
-    return;
-    }
-    else if( (int)scriptFiles[1].f == id )
-    {
-    scriptFiles[1].inUse = 0;
-    fclose( scriptFiles[1].f );
-    return;
-    }
-    else
-    {
-    gi.Printf("Unknown error while closing file - fclose!\n");
-    return;
-    }*/
-
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     if (f == NULL) {
         throw ScriptException("File handle is NULL for fclose!\n");
     }
 
-    ret = fclose(f);
+    // delete the file object
+    delete osFile;
 
-    if (ret == 0) {
-        ev->AddInteger(0);
-        sprintf(buf, "%i", scriptfiles->integer - 1);
-        gi.cvar_set("sv_scriptfiles", buf);
-        return;
-    } else {
-        ev->AddInteger(ret);
-        return;
-    }
+    Com_sprintf(buf, sizeof(buf), "%i", scriptfiles->integer - 1);
+    gi.cvar_set("sv_scriptfiles", buf);
 }
 
 void ScriptThread::FileEof(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5392,9 +5480,12 @@ void ScriptThread::FileEof(Event *ev)
         throw ScriptException("Wrong arguments count for feof!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = feof(f);
 
@@ -5403,7 +5494,7 @@ void ScriptThread::FileEof(Event *ev)
 
 void ScriptThread::FileSeek(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     int      pos     = 0;
     long int offset  = 0;
@@ -5416,9 +5507,12 @@ void ScriptThread::FileSeek(Event *ev)
         throw ScriptException("Wrong arguments count for fseek!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     offset = ev->GetInteger(2);
 
@@ -5439,7 +5533,7 @@ void ScriptThread::FileSeek(Event *ev)
 
 void ScriptThread::FileTell(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     long int ret     = 0;
     FILE    *f       = NULL;
@@ -5450,9 +5544,12 @@ void ScriptThread::FileTell(Event *ev)
         throw ScriptException("Wrong arguments count for ftell!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = ftell(f);
 
@@ -5461,7 +5558,7 @@ void ScriptThread::FileTell(Event *ev)
 
 void ScriptThread::FileRewind(Event *ev)
 {
-    int      id      = 0;
+    OSFile  *osFile  = NULL;
     int      numArgs = 0;
     long int ret     = 0;
     FILE    *f       = NULL;
@@ -5472,20 +5569,23 @@ void ScriptThread::FileRewind(Event *ev)
         throw ScriptException("Wrong arguments count for frewind!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     rewind(f);
 }
 
 void ScriptThread::FilePutc(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    int   c       = 0;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
+    int     c       = 0;
 
     numArgs = ev->NumArgs();
 
@@ -5493,9 +5593,12 @@ void ScriptThread::FilePutc(Event *ev)
         throw ScriptException("Wrong arguments count for fputc!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     c = ev->GetInteger(2);
 
@@ -5506,11 +5609,11 @@ void ScriptThread::FilePutc(Event *ev)
 
 void ScriptThread::FilePuts(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
-    str   c;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
+    str     c;
 
     numArgs = ev->NumArgs();
 
@@ -5518,9 +5621,12 @@ void ScriptThread::FilePuts(Event *ev)
         throw ScriptException("Wrong arguments count for fputs!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     c = ev->GetString(2);
     //gi.Printf("Putting line into a file\n");
@@ -5531,10 +5637,10 @@ void ScriptThread::FilePuts(Event *ev)
 
 void ScriptThread::FileGetc(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5542,9 +5648,12 @@ void ScriptThread::FileGetc(Event *ev)
         throw ScriptException("Wrong arguments count for fgetc!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = fgetc(f);
 
@@ -5553,12 +5662,12 @@ void ScriptThread::FileGetc(Event *ev)
 
 void ScriptThread::FileGets(Event *ev)
 {
-    int   id       = 0;
-    int   numArgs  = 0;
-    int   maxCount = 0;
-    FILE *f        = NULL;
-    char *c        = NULL;
-    char *buff     = NULL;
+    OSFile *osFile   = NULL;
+    int     numArgs  = 0;
+    int     maxCount = 0;
+    FILE   *f        = NULL;
+    char   *c        = NULL;
+    char   *buff     = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5566,9 +5675,12 @@ void ScriptThread::FileGets(Event *ev)
         throw ScriptException("Wrong arguments count for fgets!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     maxCount = ev->GetInteger(2);
 
@@ -5601,10 +5713,10 @@ void ScriptThread::FileGets(Event *ev)
 
 void ScriptThread::FileError(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5612,9 +5724,12 @@ void ScriptThread::FileError(Event *ev)
         throw ScriptException("Wrong arguments count for ferror!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = ferror(f);
 
@@ -5623,10 +5738,10 @@ void ScriptThread::FileError(Event *ev)
 
 void ScriptThread::FileFlush(Event *ev)
 {
-    int   id      = 0;
-    int   numArgs = 0;
-    int   ret     = 0;
-    FILE *f       = NULL;
+    OSFile *osFile  = NULL;
+    int     numArgs = 0;
+    int     ret     = 0;
+    FILE   *f       = NULL;
 
     numArgs = ev->NumArgs();
 
@@ -5634,9 +5749,12 @@ void ScriptThread::FileFlush(Event *ev)
         throw ScriptException("Wrong arguments count for fflush!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     ret = fflush(f);
 
@@ -5645,7 +5763,6 @@ void ScriptThread::FileFlush(Event *ev)
 
 void ScriptThread::FileExists(Event *ev)
 {
-    int   id      = 0;
     int   numArgs = 0;
     FILE *f       = 0;
     str   filename;
@@ -5658,7 +5775,7 @@ void ScriptThread::FileExists(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Empty file name passed to fexists!\n");
     }
 
@@ -5673,13 +5790,13 @@ void ScriptThread::FileExists(Event *ev)
 
 void ScriptThread::FileReadAll(Event *ev)
 {
-    int    id         = 0;
-    int    numArgs    = 0;
-    FILE  *f          = NULL;
-    char  *ret        = NULL;
-    long   currentPos = 0;
-    size_t size       = 0;
-    size_t sizeRead   = 0;
+    OSFile *osFile     = NULL;
+    int     numArgs    = 0;
+    FILE   *f          = NULL;
+    char   *ret        = NULL;
+    long    currentPos = 0;
+    size_t  size       = 0;
+    size_t  sizeRead   = 0;
 
     numArgs = ev->NumArgs();
 
@@ -5687,9 +5804,12 @@ void ScriptThread::FileReadAll(Event *ev)
         throw ScriptException("Wrong arguments count for freadall!\n");
     }
 
-    id = ev->GetInteger(1);
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
 
-    f = (FILE *)id;
+    f = (FILE *)osFile->getOSFile();
 
     currentPos = ftell(f);
     fseek(f, 0, SEEK_END);
@@ -5713,11 +5833,11 @@ void ScriptThread::FileReadAll(Event *ev)
 
 void ScriptThread::FileSaveAll(Event *ev)
 {
-    int    id        = 0;
-    int    numArgs   = 0;
-    FILE  *f         = NULL;
-    size_t sizeWrite = 0;
-    str    text;
+    OSFile *osFile    = NULL;
+    int     numArgs   = 0;
+    FILE   *f         = NULL;
+    size_t  sizeWrite = 0;
+    str     text;
 
     numArgs = ev->NumArgs();
 
@@ -5725,12 +5845,16 @@ void ScriptThread::FileSaveAll(Event *ev)
         throw ScriptException("Wrong arguments count for fsaveall!\n");
     }
 
-    id = ev->GetInteger(1);
-    f  = (FILE *)id;
+    osFile = (OSFile *)ev->GetListener(1);
+    if (!osFile || !osFile->isSubclassOf(OSFile)) {
+        throw ScriptException("Not a file!\n");
+    }
+
+    f = (FILE *)osFile->getOSFile();
 
     text = ev->GetString(2);
 
-    if (text == NULL) {
+    if (text.length()) {
         ev->AddInteger(-1);
         throw ScriptException("Text to be written is NULL - fsaveall!\n");
     }
@@ -5742,7 +5866,6 @@ void ScriptThread::FileSaveAll(Event *ev)
 
 void ScriptThread::FileRemove(Event *ev)
 {
-    int id      = 0;
     int numArgs = 0;
     int ret     = 0;
     str filename;
@@ -5755,7 +5878,7 @@ void ScriptThread::FileRemove(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Empty file name passed to fremove!\n");
     }
 
@@ -5766,7 +5889,6 @@ void ScriptThread::FileRemove(Event *ev)
 
 void ScriptThread::FileRename(Event *ev)
 {
-    int id      = 0;
     int numArgs = 0;
     int ret     = 0;
     str oldfilename, newfilename;
@@ -5866,7 +5988,7 @@ void ScriptThread::FileReadPak(Event *ev)
 
     filename = ev->GetString(1);
 
-    if (filename == NULL) {
+    if (!filename.length()) {
         throw ScriptException("Filename is NULL - freadpak!\n");
     }
 
@@ -5941,7 +6063,7 @@ void ScriptThread::FileNewDirectory(Event *ev)
 
     path = ev->GetString(1);
 
-    if (path == NULL) {
+    if (!path.length()) {
         throw ScriptException("Path is NULL - fnewdir!\n");
     }
 
@@ -5969,7 +6091,7 @@ void ScriptThread::FileRemoveDirectory(Event *ev)
 
     path = ev->GetString(1);
 
-    if (path == NULL) {
+    if (!path.length()) {
         throw ScriptException("Path is NULL - fremovedir!\n");
     }
 
@@ -6214,7 +6336,7 @@ void ScriptThread::FlagInit(Event *ev)
 
     flag            = new Flag;
     flag->bSignaled = false;
-    strcpy(flag->flagName, name);
+    Q_strncpyz(flag->flagName, name, sizeof(flag->flagName));
 }
 
 void ScriptThread::FlagSet(Event *ev)
@@ -6565,7 +6687,7 @@ void ScriptThread::EventFmod(Event *ev)
     ev->AddFloat((float)res);
 }
 
-int checkMD5(const char *filepath, char *md5Hash)
+int checkMD5(const char *filepath, char *md5Hash, size_t destSize)
 {
     md5_state_t state;
     md5_byte_t  digest[16];
@@ -6614,7 +6736,7 @@ int checkMD5(const char *filepath, char *md5Hash)
     md5_finish(&state, digest);
 
     for (di = 0; di < 16; ++di) {
-        sprintf(md5Hash + di * 2, "%02x", digest[di]);
+        Com_sprintf(md5Hash + di * 2, destSize - di * 2, "%02x", digest[di]);
     }
 
     gi.Free(buff);
@@ -6622,7 +6744,7 @@ int checkMD5(const char *filepath, char *md5Hash)
     return 0;
 }
 
-int checkMD5String(const char *string, char *md5Hash)
+int checkMD5String(const char *string, char *md5Hash, size_t destSize)
 {
     md5_state_t state;
     md5_byte_t  digest[16];
@@ -6647,7 +6769,7 @@ int checkMD5String(const char *string, char *md5Hash)
     md5_finish(&state, digest);
 
     for (di = 0; di < 16; ++di) {
-        sprintf(md5Hash + di * 2, "%02x", digest[di]);
+        Com_sprintf(md5Hash + di * 2, destSize - di * 2, "%02x", digest[di]);
     }
 
     gi.Free(buff);
@@ -6667,7 +6789,7 @@ void ScriptThread::Md5File(Event *ev)
 
     filename = ev->GetString(1);
 
-    ret = checkMD5(filename, hash);
+    ret = checkMD5(filename, hash, sizeof(hash));
     if (ret != 0) {
         ev->AddInteger(-1);
         throw ScriptException("Error while generating MD5 checksum for file - md5file!\n");
@@ -6704,7 +6826,7 @@ void ScriptThread::Md5String(Event *ev)
 
     text = ev->GetString(1);
 
-    ret = checkMD5String(text, hash);
+    ret = checkMD5String(text, hash, sizeof(hash));
     if (ret != 0) {
         ev->AddInteger(-1);
         throw ScriptException("Error while generating MD5 checksum for strin!\n");
@@ -6763,6 +6885,8 @@ void ScriptThread::RegisterEvent(Event *ev)
     char             eventname_full[64];
     scriptedEvType_t evType;
 
+    ScriptDeprecatedAltMethod("event_subscribe");
+
     eventname = ev->GetString(1);
 
     evType = EventNameToType(eventname, eventname_full);
@@ -6794,6 +6918,8 @@ void ScriptThread::UnregisterEvent(Event *ev)
     int              numArgs = 0;
     scriptedEvType_t evType;
 
+    ScriptDeprecatedAltMethod("event_unsubscribe");
+
     eventname = ev->GetString(1);
 
     evType = EventNameToType(eventname, NULL);
@@ -6827,6 +6953,42 @@ void ScriptThread::UnregisterEvent(Event *ev)
     ev->AddInteger(0);
 }
 
+void ScriptThread::SubscribeEvent(Event *ev)
+{
+    str               eventName;
+    ScriptDelegate   *delegate;
+    ScriptThreadLabel label;
+
+    eventName = ev->GetString(1);
+
+    delegate = ScriptDelegate::GetScriptDelegate(eventName);
+    if (!delegate) {
+        throw ScriptException("Invalid event '%s'", eventName.c_str());
+    }
+
+    label.SetThread(ev->GetValue(2));
+
+    delegate->Register(label);
+}
+
+void ScriptThread::UnsubscribeEvent(Event *ev)
+{
+    str               eventName;
+    ScriptDelegate   *delegate;
+    ScriptThreadLabel label;
+
+    eventName = ev->GetString(1);
+
+    delegate = ScriptDelegate::GetScriptDelegate(eventName);
+    if (!delegate) {
+        throw ScriptException("Invalid event '%s'", eventName.c_str());
+    }
+
+    label.SetThread(ev->GetValue(2));
+
+    delegate->Unregister(label);
+}
+
 void ScriptThread::TypeOfVariable(Event *ev)
 {
     int             numArgs = 0;
@@ -6899,7 +7061,7 @@ void ScriptThread::GetTime(Event *ev)
 
     timediff = timearray[0] - gmttime;
 
-    sprintf(buff, "%02i:%02i:%02i", (int)timearray[0], (int)timearray[1], (int)timearray[2]);
+    Com_sprintf(buff, sizeof(buff), "%02i:%02i:%02i", (int)timearray[0], (int)timearray[1], (int)timearray[2]);
 
     ev->AddString(buff);
 }
@@ -6993,4 +7155,47 @@ void ScriptThread::TraceDetails(Event *ev)
     array.setArrayAtRef(entityIndex, entityValue);
 
     ev->AddValue(array);
-}
\ No newline at end of file
+}
+
+void ScriptThread::IsPlayerBot(Event *ev)
+{
+    Entity *e = ev->GetEntity(1);
+
+    if (!e || !e->client) {
+        // Invalid entity or not a client
+        ev->AddInteger(0);
+        return;
+    }
+
+    if (!(e->edict->r.svFlags & SVF_BOT)) {
+        ev->AddInteger(0);
+        return;
+    }
+
+    // has SVF_BOT server flag
+    ev->AddInteger(1);
+}
+
+CLASS_DECLARATION(Listener, OSFile, NULL) {
+    {NULL, NULL}
+};
+
+OSFile::OSFile()
+    : file(NULL)
+{}
+
+OSFile::OSFile(void *inFile)
+    : file(inFile)
+{}
+
+OSFile::~OSFile()
+{
+    if (file) {
+        fclose((FILE *)file);
+    }
+}
+
+void *OSFile::getOSFile() const
+{
+    return file;
+}
diff --git a/code/fgame/scriptthread.h b/code/fgame/scriptthread.h
index e35ab541..89536853 100644
--- a/code/fgame/scriptthread.h
+++ b/code/fgame/scriptthread.h
@@ -131,14 +131,14 @@ protected:
     void GetRandomFloat(Event *ev);
     void GetRandomInt(Event *ev);
 
-	void GetAbs(Event* ev);
+    void GetAbs(Event *ev);
     //////////
     // Added in 2.30
-	void EventCos(Event* ev);
-	void EventSin(Event* ev);
-	void EventTan(Event* ev);
-	void EventATan(Event* ev);
-	void EventSqrt(Event* ev);
+    void EventCos(Event *ev);
+    void EventSin(Event *ev);
+    void EventTan(Event *ev);
+    void EventATan(Event *ev);
+    void EventSqrt(Event *ev);
     //////////
     void GetSelf(Event *ev);
     void Vector_Length(Event *ev);
@@ -192,16 +192,17 @@ public:
     ScriptThread(ScriptClass *scriptClass, unsigned char *pCodePos);
     virtual ~ScriptThread();
 
-    void                  Execute(Event                 &ev);
-    void                  Execute(Event *ev = NULL);
+    void                  Execute(Event& ev);
+    void                  Execute(Event *ev);
+    void                  Execute();
     void                  Execute(ScriptVariable *data, int dataSize);
-    void                  Wait(float time);
+    void                  Wait(int time);
     void                  Pause(void);
-    void                  ScriptExecute(ScriptVariable *data, int dataSize, ScriptVariable                 &returnValue);
+    void                  ScriptExecute(ScriptVariable *data, int dataSize, ScriptVariable& returnValue);
     void                  ScriptExecuteInternal(ScriptVariable *data = NULL, int dataSize = 0);
     void                  EventThrow(Event *ev);
     void                  StartWaiting();
-    void                  StartTiming(float time);
+    void                  StartTiming(int time);
     void                  StartTiming(void);
     void                  Stop(void);
     virtual void          StartedWaitFor(void) override;
@@ -224,22 +225,22 @@ public:
     //
     static void AddObjective(int index, int status, str text, Vector location);
     static void SetCurrentObjective(int iObjective, int iTeam);
-    void SendObjective();
-    void SendObjectives();
-    void ClearObjectives();
-    void EventAddObjective(Event *ev);
-    void EventSetScoreboardToggle(Event *ev); // Added in 2.30
-    void EventSetCurrentObjective(Event *ev);
-    void EventClearObjectives(Event *ev);
-    void SetObjectiveLocation(Vector vLocation);
-    void SetObjectiveLocation(Event *ev);
-    void ClearObjectiveLocation(void);
-    void ClearObjectiveLocation(Event *ev);
+    void        SendObjective();
+    void        SendObjectives();
+    void        ClearObjectives();
+    void        EventAddObjective(Event *ev);
+    void        EventSetScoreboardToggle(Event *ev); // Added in 2.30
+    void        EventSetCurrentObjective(Event *ev);
+    void        EventClearObjectives(Event *ev);
+    void        SetObjectiveLocation(Vector vLocation);
+    void        SetObjectiveLocation(Event *ev);
+    void        ClearObjectiveLocation(void);
+    void        ClearObjectiveLocation(Event *ev);
 
     void EventDrawHud(Event *ev);
 
     virtual void Archive(Archiver& arc) override;
-    void         ArchiveInternal(Archiver        &arc);
+    void         ArchiveInternal(Archiver& arc);
 
     //
     // Openmohaa addition
@@ -344,4 +345,23 @@ public:
     void UnregisterEvent(Event *ev);
     void VisionGetNaked(Event *ev);
     void VisionSetNaked(Event *ev);
-};
\ No newline at end of file
+    void IsPlayerBot(Event *ev);
+
+    void SubscribeEvent(Event *ev);
+    void UnsubscribeEvent(Event *ev);
+};
+
+class OSFile : public Listener
+{
+    CLASS_PROTOTYPE(OSFile);
+
+public:
+    OSFile();
+    OSFile(void *inFile);
+    ~OSFile();
+
+    void *getOSFile() const;
+
+private:
+    void *file;
+};
diff --git a/code/fgame/scripttimer.cpp b/code/fgame/scripttimer.cpp
index 243e9c0b..95acbdb2 100644
--- a/code/fgame/scripttimer.cpp
+++ b/code/fgame/scripttimer.cpp
@@ -175,12 +175,10 @@ void ScriptTimer::Disable()
 
 void ScriptTimer::Enable()
 {
-	bEnabled = true;
+    bEnabled = true;
 
-	CancelEventsOfType( &EV_ScriptTimer_Think );
-
-	Event *ev = new Event( &EV_ScriptTimer_Think );
-	ProcessEvent( ev );
+    CancelEventsOfType(EV_ScriptTimer_Think);
+    ProcessEvent(EV_ScriptTimer_Think);
 }
 
 qboolean ScriptTimer::Done()
diff --git a/code/fgame/scripttimer.h b/code/fgame/scripttimer.h
index 96fff34a..9fcfd46d 100644
--- a/code/fgame/scripttimer.h
+++ b/code/fgame/scripttimer.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // ScriptTimer.cpp: Scripted Timer & Fader
 //
 
-#ifndef __SCRIPTTIMER_H__
-#define __SCRIPTTIMER_H__
+#pragma once
 
 #include "listener.h"
 
@@ -81,5 +80,3 @@ public:
 	bool		isEnabled();
 	void		setType( timertype_e type );
 };
-
-#endif /* __SCRIPTTIMER_H__ */
diff --git a/code/fgame/sentient.cpp b/code/fgame/sentient.cpp
index 967f1de0..1551a715 100644
--- a/code/fgame/sentient.cpp
+++ b/code/fgame/sentient.cpp
@@ -41,6 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "g_spawn.h"
 #include "object.h"
 #include "../qcommon/tiki.h"
+#include "weapturret.h"
 
 Event EV_Sentient_ReloadWeapon
 (
@@ -145,8 +146,8 @@ Event EV_Sentient_GiveAmmo
 (
     "ammo",
     EV_DEFAULT,
-    "si",
-    "type amount",
+    "siI",
+    "type amount max_amount",
     "Gives the sentient some ammo.",
     EV_NORMAL
 );
@@ -192,7 +193,7 @@ Event EV_Sentient_UseItem
     EV_CONSOLE,
     "si",
     "name weapon_hand",
-    "Use the specified weapon or item in the hand choosen (optional).",
+    "Use the specified weapon or item in the hand chosen (optional).",
     EV_NORMAL
 );
 Event EV_Sentient_SetBloodModel
@@ -390,7 +391,7 @@ Event EV_Sentient_UseWeaponClass
     EV_CONSOLE,
     "sI",
     "name weapon_hand",
-    "Use the weapon of the specified class in the hand choosen (optional).",
+    "Use the weapon of the specified class in the hand chosen (optional).",
     EV_NORMAL
 );
 Event EV_Sentient_German
@@ -530,7 +531,7 @@ Event EV_Sentient_ForceDropWeapon2
 );
 Event EV_Sentient_ForceDropHealth
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -539,7 +540,7 @@ Event EV_Sentient_ForceDropHealth
 );
 Event EV_Sentient_ForceDropHealth2
 (
-    "forcedropweapon",
+    "forcedrophealth",
     EV_DEFAULT,
     NULL,
     NULL,
@@ -564,6 +565,10 @@ Event EV_Sentient_GetForceDropWeapon
     "Get if the sentient is forced to drop health no matter what level.nodrophealth is.",
     EV_GETTER
 );
+
+//
+// Added in OPM
+//
 Event EV_Sentient_GetNewActiveWeap
 (
     "getnewactiveweap",
@@ -573,6 +578,24 @@ Event EV_Sentient_GetNewActiveWeap
     "gets new active weapon",
     EV_RETURN
 );
+Event EV_Sentient_GetNewActiveWeapon
+(
+    "newActiveWeapon",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets new active weapon",
+    EV_GETTER
+);
+Event EV_Sentient_GetNewActiveWeaponHand
+(
+    "newActiveWeaponHand",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "gets the hand of the new active weapon",
+    EV_GETTER
+);
 Event EV_Sentient_GetActiveWeap
 (
     "getactiveweap",
@@ -582,6 +605,14 @@ Event EV_Sentient_GetActiveWeap
     "gets currently active weapon in a given hand",
     EV_RETURN
 );
+Event EV_Sentient_Client_Landing
+(
+    "_client_landing",
+    EV_DEFAULT,
+    "FI",
+    "fVolume iEquipment",
+    "Play a landing sound that is appropriate to the surface we are landing on\n"
+);
 
 CLASS_DECLARATION(Animate, Sentient, NULL) {
     {&EV_Sentient_ReloadWeapon,         &Sentient::ReloadWeapon                 },
@@ -643,9 +674,12 @@ CLASS_DECLARATION(Animate, Sentient, NULL) {
     {&EV_Sentient_ForceDropWeapon2,     &Sentient::EventForceDropWeapon         },
     {&EV_Sentient_GetForceDropWeapon,   &Sentient::EventGetForceDropWeapon      },
 
-    {&EV_Sentient_GetActiveWeap,        &Sentient::GetActiveWeap                },
-    {&EV_Sentient_GetNewActiveWeap,     &Sentient::GetNewActiveWeapon           },
-    {NULL,                              NULL                                    }
+    {&EV_Sentient_GetActiveWeap,            &Sentient::GetActiveWeap                },
+    {&EV_Sentient_GetNewActiveWeap,         &Sentient::GetNewActiveWeaponOld        },
+    {&EV_Sentient_GetNewActiveWeapon,       &Sentient::GetNewActiveWeapon           },
+    {&EV_Sentient_GetNewActiveWeaponHand,   &Sentient::GetNewActiveWeaponHand       },
+    {&EV_Sentient_Client_Landing,           &Sentient::EventClientLanding           },
+    {NULL,                                  NULL                                    }
 };
 
 Container<Sentient *> SentientList;
@@ -676,10 +710,11 @@ void Sentient::EventGiveDynItem(Event *ev)
 }
 
 Sentient::Sentient()
-    : m_bIsAnimal(false)
+    : mAccuracy(0.2f)
+    , m_bIsAnimal(false)
 {
     SentientList.AddObject((Sentient *)this);
-    entflags |= EF_SENTIENT;
+    entflags |= ECF_SENTIENT;
 
     m_bOvercookDied = false;
 
@@ -761,6 +796,7 @@ Sentient::Sentient()
     m_iThreatBias         = 0;
     m_bFootOnGround_Right = true;
     m_bFootOnGround_Left  = true;
+    iNextLandTime         = 0;
     m_bDontDropWeapons    = false;
 
     if (g_realismmode->integer) {
@@ -809,7 +845,7 @@ Sentient::~Sentient()
     SentientList.RemoveObject((Sentient *)this);
     FreeInventory();
 
-    entflags &= ~EF_SENTIENT;
+    entflags &= ~ECF_SENTIENT;
 }
 
 void Sentient::Link()
@@ -1016,7 +1052,7 @@ void Sentient::FreeInventory(void)
     num = inventory.NumObjects();
     for (i = num; i > 0; i--) {
         item = (Item *)G_GetEntity(inventory.ObjectAt(i));
-        delete item;
+        item->Delete();
     }
     inventory.ClearObjectList();
 
@@ -1105,30 +1141,19 @@ qboolean Sentient::HasSecondaryWeapon(void)
 
 void Sentient::EventGiveTargetname(Event *ev)
 {
-    int         i;
-    ConSimple  *tlist;
-    str         name;
-    const char *ptr;
-    qboolean    found;
+    int i;
+    str name;
+    qboolean found;
+    ScriptVariable var;
+    SimpleEntity *ent;
 
-    name = ev->GetString(1);
+    var = ev->GetValue(1);
+    var.CastConstArrayValue();
 
-    ptr = name.c_str();
-
-    // skip over the $
-    ptr++;
-
-    found = qfalse;
-
-    str sName = ptr;
-    tlist     = world->GetTargetList(sName);
-    for (i = 1; i <= tlist->NumObjects(); i++) {
-        Entity *ent;
-
-        ent = (Entity *)tlist->ObjectAt(i).Pointer();
-        assert(ent);
-
-        if (ent->isSubclassOf(Item)) {
+    for (i = var.arraysize(); i > 0; i--) {
+        const ScriptVariable *variable = var[i];
+        ent = variable->simpleEntityValue();
+        if (ent && ent->IsSubclassOfItem()) {
             Item *item;
 
             item = (Item *)ent;
@@ -1197,13 +1222,13 @@ Item *Sentient::giveItem(str itemname, int amount)
 
         AddItem(item);
 
-        if (item->isSubclassOf(Weapon)) {
+        if (item->IsSubclassOfWeapon()) {
             // Post an event to give the ammo to the sentient
             Event *ev1;
 
             ev1 = new Event(EV_Weapon_GiveStartingAmmo);
             ev1->AddEntity(this);
-            item->PostEvent(ev1, 0);
+            item->PostEvent(ev1, level.frametime);
         }
 
         return item;
@@ -1269,8 +1294,8 @@ void Sentient::EventTake(Event *ev)
 
 void Sentient::EventGiveItem(Event *ev)
 {
-    const char *type;
-    float       amount;
+    str   type;
+    float amount;
 
     type = ev->GetString(1);
     if (ev->NumArgs() > 1) {
@@ -1338,24 +1363,22 @@ void Sentient::ArmorDamage(Event *ev)
 {
     Entity   *inflictor;
     Sentient *attacker;
-    float     damage;
-    Vector    momentum;
-    Vector    position;
-    Vector    normal;
-    Vector    direction;
-    Event    *event;
-    int       dflags;
-    int       meansofdeath;
-    int       knockback;
-    int       location;
+    float    damage;
+    Vector   momentum;
+    Vector   position;
+    Vector   normal;
+    Vector   direction;
+    Event    event;
+    int      dflags;
+    int      meansofdeath;
+    int      knockback;
+    int      location;
 
-    /*
-    qboolean	blocked;
+    //qboolean	blocked;
     float		damage_red;
     float		damage_green;
     float		damage_time;
-    qboolean	set_means_of_death;
-*/
+    //qboolean	set_means_of_death;
 
     static bool    tmp          = false;
     static cvar_t *AIDamageMult = NULL;
@@ -1380,7 +1403,7 @@ void Sentient::ArmorDamage(Event *ev)
     meansofdeath = ev->GetInteger(9);
     location     = CheckHitLocation(ev->GetInteger(10));
 
-    if (location == -2) {
+    if (location == HITLOC_MISS) {
         return;
     }
 
@@ -1388,12 +1411,10 @@ void Sentient::ArmorDamage(Event *ev)
         return;
     }
 
-    if ((client && !g_gametype->integer) || (location < 0 || location > 18)) {
-        if (attacker && attacker->IsSubclassOfActor()) {
-            damage *= AIDamageMult->value;
-        }
-    } else {
+    if ((!isClient() || g_gametype->integer != GT_SINGLE_PLAYER) && (location > HITLOC_GENERAL && location < NUMBODYLOCATIONS)) {
         damage *= m_fDamageMultipliers[location];
+    } else if (isClient() && attacker && attacker->IsSubclassOfActor() && g_gametype->integer == GT_SINGLE_PLAYER) {
+        damage *= AIDamageMult->value;
     }
 
     // See if sentient is immune to this type of damage
@@ -1455,34 +1476,6 @@ void Sentient::ArmorDamage(Event *ev)
     }
 */
 
-    /*
-if( meansofdeath == MOD_SLIME )
-{
-    damage_green = damage / 50;
-    if( damage_green > 1.0f )
-        damage_green = 1.0f;
-    if( ( damage_green < 0.2 ) && ( damage_green > 0 ) )
-        damage_green = 0.2f;
-    damage_red = 0;
-}
-else
-{
-    damage_red = damage / 50;
-    if( damage_red > 1.0f )
-        damage_red = 1.0f;
-    if( ( damage_red < 0.2 ) && ( damage_red > 0 ) )
-        damage_red = 0.2f;
-    damage_green = 0;
-}
-
-damage_time = damage / 50;
-
-if( damage_time > 2 )
-    damage_time = 2;
-
-SetOffsetColor( damage_red, damage_green, 0, damage_time );
-*/
-
     // Do the kick
     if (!(dflags & DAMAGE_NO_KNOCKBACK)) {
         if ((knockback) && (movetype != MOVETYPE_NONE) && (movetype != MOVETYPE_STATIONARY)
@@ -1490,14 +1483,14 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
             float  m;
             Event *immunity_event;
 
-            if (mass < 50) {
-                m = 50;
+            if (mass < 20) {
+                m = 20;
             } else {
                 m = mass;
             }
 
             direction.normalize();
-            if (isClient() && (attacker == this) && g_gametype->integer) {
+            if (isClient() && (attacker == this) && deathmatch->integer) {
                 momentum = direction * (1700.0f * (float)knockback / m); // the rocket jump hack...
             } else {
                 momentum = direction * (500.0f * (float)knockback / m);
@@ -1526,8 +1519,8 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
     }
 
     if (!(flags & FL_GODMODE)
-        && ((g_gametype->integer) || !(attacker) || (attacker) == this || !(attacker->IsSubclassOfPlayer())
-            || !(attacker->IsTeamMate(this)))) {
+        && ((g_gametype->integer != GT_SINGLE_PLAYER) || !(attacker) || (attacker) == this || !(attacker->IsSubclassOfSentient())
+            || (attacker->m_Team != m_Team))) {
         health -= damage;
     }
 
@@ -1557,44 +1550,88 @@ SetOffsetColor( damage_red, damage_green, 0, damage_time );
         }
     }
 
-    if (health > 0) {
-        // Send pain event
-        event = new Event(EV_Pain);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(dflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
-
-        ProcessEvent(event);
+    if (meansofdeath == MOD_SLIME)
+    {
+        damage_green = damage / 50;
+        if (damage_green > 1.0f)
+            damage_green = 1.0f;
+        if ((damage_green < 0.2) && (damage_green > 0))
+            damage_green = 0.2f;
+        damage_red = 0;
     }
+    else
+    {
+        damage_red = damage / 50;
+        if (damage_red > 1.0f)
+            damage_red = 1.0f;
+        if ((damage_red < 0.2) && (damage_red > 0))
+            damage_red = 0.2f;
+        damage_green = 0;
+    }
+
+    damage_time = damage / 50;
+
+    if (damage_time > 2)
+        damage_time = 2;
+
+    //SetOffsetColor(damage_red, damage_green, 0, damage_time);
 
     if (health < 0.1) {
         // Make sure health is now 0
 
         health = 0;
 
-        event = new Event(EV_Killed);
-        event->AddEntity(attacker);
-        event->AddFloat(damage);
-        event->AddEntity(inflictor);
-        event->AddVector(position);
-        event->AddVector(direction);
-        event->AddVector(normal);
-        event->AddInteger(knockback);
-        event->AddInteger(dflags);
-        event->AddInteger(meansofdeath);
-        event->AddInteger(location);
+        if (attacker) {
+            const EntityPtr attackerPtr = attacker;
+
+            // Added in OPM
+            event = Event(EV_GotKill);
+            event.AddEntity(this);
+            event.AddInteger(damage);
+            event.AddEntity(inflictor);
+            event.AddInteger(meansofdeath);
+            event.AddInteger(0);
+
+            attackerPtr->ProcessEvent(event);
+            if (attackerPtr) {
+                attackerPtr->delegate_gotKill.Execute(event);
+            }
+        }
+
+        event = Event(EV_Killed, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(dflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
+
+        ProcessEvent(event);
+        delegate_killed.Execute(event);
+    }
+
+    if (health > 0) {
+        // Send pain event
+        event = Event(EV_Pain, 10);
+        event.AddEntity(attacker);
+        event.AddFloat(damage);
+        event.AddEntity(inflictor);
+        event.AddVector(position);
+        event.AddVector(direction);
+        event.AddVector(normal);
+        event.AddInteger(knockback);
+        event.AddInteger(dflags);
+        event.AddInteger(meansofdeath);
+        event.AddInteger(location);
 
         ProcessEvent(event);
     }
 
-    return;
+    delegate_damage.Execute(*ev);
 }
 
 qboolean Sentient::CanBlock(int meansofdeath, qboolean full_block)
@@ -1947,17 +1984,49 @@ void Sentient::DropInventoryItems(void)
     int   i;
     Item *item;
 
+    if (m_bForceDropHealth) {
+        giveItem("ITEMS/item_25_healthbox.tik", 25);
+    } else if (skill->integer != 2 && !level.mbNoDropHealth) {
+        static cvar_t *ai_health_kar  = gi.Cvar_Get("ai_health_kar", "6", CVAR_CHEAT);
+        static cvar_t *ai_health_mp40 = gi.Cvar_Get("ai_health_mp40points", "2", CVAR_CHEAT);
+
+        Weapon *weapon = GetActiveWeapon(WEAPON_MAIN);
+        if (weapon) {
+            if (!Q_stricmp("rifle", Director.GetString(weapon->GetWeaponGroup()))) {
+                level.mHealthPopCount++;
+            } else {
+                level.mHealthPopCount += ai_health_mp40->integer;
+            }
+
+            if (level.mHealthPopCount >= ai_health_kar->integer) {
+                giveItem("ITEMS/item_25_healthbox.tik", 25);
+                level.mHealthPopCount -= ai_health_kar->integer;
+            }
+        }
+    }
+
     // Drop any inventory items
     num = inventory.NumObjects();
     for (i = num; i >= 1; i--) {
         item = (Item *)G_GetEntity(inventory.ObjectAt(i));
-        if (item->isSubclassOf(InventoryItem)) {
-            if (m_bDontDropWeapons && item->IsSubclassOfWeapon()) {
-                item->Delete();
-            } else {
-                item->Drop();
-            }
+        // Added in 2.30
+        //  Force drop the item when specified
+        if (m_bForceDropWeapon && item->IsSubclassOfWeapon()) {
+            item->Drop();
+            continue;
         }
+
+        if (!m_bDontDropWeapons && !level.mbNoDropWeapons) {
+            item->Drop();
+            continue;
+        }
+
+        if (!item->IsSubclassOfWeapon()) {
+            item->Drop();
+            continue;
+        }
+
+        item->Delete();
     }
 }
 
@@ -2113,6 +2182,11 @@ void Sentient::Archive(Archiver& arc)
             Holster(true);
         }
     }
+
+    //
+    // Added in OPM
+    //
+    arc.ArchiveInteger(&iNextLandTime);
 }
 
 static bool IsItemName(const char *name)
@@ -2132,11 +2206,27 @@ static bool IsItemName(const char *name)
 
 void Sentient::ArchivePersistantData(Archiver& arc)
 {
-    int i;
-    int num;
+    int     i;
+    int     num;
+    str     name;
+    int     amount;
+    Item   *item;
+    Entity *ent;
 
     // archive the inventory
     if (arc.Saving()) {
+        // remove all special items before persistence
+        for (i = inventory.NumObjects(); i > 0; i--) {
+            int index;
+
+            index = inventory.ObjectAt(i);
+            ent   = G_GetEntity(index);
+            name  = ent->model;
+
+            if (IsItemName(name)) {
+                ent->Delete();
+            }
+        }
         // count up the total number
         num = inventory.NumObjects();
     } else {
@@ -2146,10 +2236,6 @@ void Sentient::ArchivePersistantData(Archiver& arc)
     arc.ArchiveInteger(&num);
     // archive each item
     for (i = 1; i <= num; i++) {
-        str   name;
-        int   amount;
-        Item *item;
-
         if (arc.Saving()) {
             Entity *ent;
 
@@ -2162,11 +2248,26 @@ void Sentient::ArchivePersistantData(Archiver& arc)
                 error("ArchivePersistantData", "Non Item in inventory\n");
             }
         }
+
         arc.ArchiveString(&name);
         arc.ArchiveInteger(&amount);
+
         if (arc.Loading()) {
             item = giveItem(name, amount);
+        }
+
+        if (item && item->IsSubclassOfWeapon()) {
+            Weapon *pWeap = static_cast<Weapon *>(item);
+
             item->CancelEventsOfType(EV_Weapon_GiveStartingAmmo);
+            if (arc.Saving()) {
+                amount = pWeap->ClipAmmo(FIRE_PRIMARY);
+            }
+            arc.ArchiveInteger(&amount);
+
+            if (arc.Loading()) {
+                pWeap->SetAmmoAmount(amount, FIRE_PRIMARY);
+            }
         }
     }
 
@@ -2192,16 +2293,17 @@ void Sentient::ArchivePersistantData(Archiver& arc)
             amount    = ptr->getAmount();
             maxamount = ptr->getMaxAmount();
         }
+
         arc.ArchiveString(&name);
         arc.ArchiveInteger(&amount);
         arc.ArchiveInteger(&maxamount);
+
         if (arc.Loading()) {
             GiveAmmo(name, amount, maxamount);
         }
     }
 
     for (i = 0; i < MAX_ACTIVE_WEAPONS; i++) {
-        str name;
         if (arc.Saving()) {
             if (activeWeaponList[i]) {
                 name = activeWeaponList[i]->getName();
@@ -2209,18 +2311,25 @@ void Sentient::ArchivePersistantData(Archiver& arc)
                 name = "none";
             }
         }
+
         arc.ArchiveString(&name);
-        if (arc.Loading()) {
-            if (name != "none") {
-                Weapon *weapon;
-                weapon = (Weapon *)FindItem(name);
-                if (weapon) {
-                    ChangeWeapon(weapon, (weaponhand_t)i);
-                }
+
+        if (arc.Loading() && name != "none") {
+            Weapon *weapon;
+
+            weapon = (Weapon *)FindItem(name);
+            if (weapon) {
+                ChangeWeapon(weapon, (weaponhand_t)i);
             }
         }
     }
 
+    if (GetActiveWeapon(WEAPON_MAIN)) {
+        edict->s.eFlags &= ~EF_UNARMED;
+    } else {
+        edict->s.eFlags |= EF_UNARMED;
+    }
+
     arc.ArchiveFloat(&health);
     arc.ArchiveFloat(&max_health);
 }
@@ -2495,6 +2604,11 @@ void Sentient::EventGerman(Event *ev)
     if (bRejoinSquads) {
         JoinNearbySquads(1024.0f);
     }
+
+    // Added in 2.0
+    //  Tell clients about sentient team
+    edict->s.eFlags &= ~EF_ALLIES;
+    edict->s.eFlags |= EF_AXIS;
 }
 
 void Sentient::EventAmerican(Event *ev)
@@ -2512,7 +2626,6 @@ void Sentient::EventAmerican(Event *ev)
         DisbandSquadMate(this);
     }
 
-
     Unlink();
     m_Team = TEAM_AMERICAN;
     Link();
@@ -2526,6 +2639,11 @@ void Sentient::EventAmerican(Event *ev)
         pActor->m_csMood     = STRING_NERVOUS;
         pActor->m_csIdleMood = STRING_NERVOUS;
     }
+
+    // Added in 2.0
+    //  Tell clients about sentient team
+    edict->s.eFlags &= ~EF_AXIS;
+    edict->s.eFlags |= EF_ALLIES;
 }
 
 void Sentient::EventGetTeam(Event *ev)
@@ -2701,7 +2819,10 @@ void Sentient::RemovedItem(Item *item) {}
 
 void Sentient::AssertValidSquad()
 {
-    for (Sentient *pSquadMate = this; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {}
+    for (Sentient *pSquadMate = this; pSquadMate != this; pSquadMate = pSquadMate->m_pNextSquadMate) {
+        assert(pSquadMate->m_pNextSquadMate);
+        assert(pSquadMate->m_pPrevSquadMate);
+    }
 }
 
 bool Sentient::IsTeamMate(Sentient *pOther)
@@ -2748,6 +2869,8 @@ void Sentient::DisbandSquadMate(Sentient *pExFriendly)
     Sentient *pPrev;
     Sentient *pNext;
 
+    AssertValidSquad();
+
     pPrev = pExFriendly->m_pPrevSquadMate;
     pNext = pExFriendly->m_pNextSquadMate;
 
@@ -2756,6 +2879,9 @@ void Sentient::DisbandSquadMate(Sentient *pExFriendly)
 
     pExFriendly->m_pPrevSquadMate = pExFriendly;
     pExFriendly->m_pNextSquadMate = pExFriendly;
+
+    AssertValidSquad();
+    pNext->AssertValidSquad();
 }
 
 bool Sentient::IsSquadMate(Sentient *pFriendly)
@@ -2774,6 +2900,11 @@ bool Sentient::IsSquadMate(Sentient *pFriendly)
     }
 }
 
+bool Sentient::IsDisabled() const
+{
+    return false;
+}
+
 VehicleTank *Sentient::GetVehicleTank(void)
 {
     if (m_pVehicle && m_pVehicle->IsSubclassOfVehicleTank()) {
@@ -2797,7 +2928,8 @@ void Sentient::UpdateFootsteps(void)
         }
     }
 
-    if ((iAnimFlags & (TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING)) != (TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING)) {
+    if (!(iAnimFlags & TAF_AUTOSTEPS_RUNNING) || !(iAnimFlags & TAF_AUTOSTEPS)) {
+        // if walking, or if the animation doesn't step
         m_bFootOnGround_Right = true;
         m_bFootOnGround_Left  = true;
         return;
@@ -2814,10 +2946,14 @@ void Sentient::UpdateFootsteps(void)
         iTagNum = gi.Tag_NumForName(edict->tiki, "Bip01 R Foot");
         if (iTagNum >= 0) {
             if (G_TIKI_IsOnGround(edict, iTagNum, 13.461539f)) {
-                BroadcastAIEvent(10, G_AIEventRadius(10));
+                BroadcastAIEvent(AI_EVENT_FOOTSTEP, G_AIEventRadius(AI_EVENT_FOOTSTEP));
+                // simulate footstep sounds
+                Footstep("Bip01 L Foot", (iAnimFlags & TAF_AUTOSTEPS_RUNNING), (iAnimFlags & TAF_AUTOSTEPS_EQUIPMENT));
+                m_bFootOnGround_Right = true;
             }
+        } else {
+            m_bFootOnGround_Right = true;
         }
-        m_bFootOnGround_Right = true;
     }
 
     if (m_bFootOnGround_Left) {
@@ -2828,13 +2964,17 @@ void Sentient::UpdateFootsteps(void)
             m_bFootOnGround_Left = true;
         }
     } else {
-        iTagNum = gi.Tag_NumForName(edict->tiki, "Bip01 R Foot");
+        iTagNum = gi.Tag_NumForName(edict->tiki, "Bip01 L Foot");
         if (iTagNum >= 0) {
             if (G_TIKI_IsOnGround(edict, iTagNum, 13.461539f)) {
-                BroadcastAIEvent(10, G_AIEventRadius(10));
+                BroadcastAIEvent(AI_EVENT_FOOTSTEP, G_AIEventRadius(AI_EVENT_FOOTSTEP));
+                // simulate footstep sounds
+                Footstep("Bip01 R Foot", (iAnimFlags & TAF_AUTOSTEPS_RUNNING), (iAnimFlags & TAF_AUTOSTEPS_EQUIPMENT));
+                m_bFootOnGround_Left = true;
             }
+        } else {
+            m_bFootOnGround_Left = true;
         }
-        m_bFootOnGround_Left = true;
     }
 }
 
@@ -2905,3 +3045,308 @@ void Sentient::SetMinViewVariation(const Vector& vVariation)
     m_vViewVariation.y = Q_min(m_vViewVariation.y, vVariation.y);
     m_vViewVariation.z = Q_min(m_vViewVariation.z, vVariation.z);
 }
+
+void Sentient::SetHolsteredByCode(bool holstered)
+{
+    weapons_holstered_by_code = holstered;
+}
+
+Vehicle *Sentient::GetVehicle() const
+{
+    return m_pVehicle;
+}
+
+void Sentient::SetVehicle(Vehicle *pVehicle)
+{
+    m_pVehicle = NULL;
+}
+
+TurretGun *Sentient::GetTurret() const
+{
+    return m_pTurret;
+}
+
+void Sentient::SetTurret(TurretGun *pTurret)
+{
+    m_pTurret = pTurret;
+}
+
+Entity* Sentient::GetLadder() const {
+    return m_pLadder;
+}
+
+#define GROUND_DISTANCE        8
+#define WATER_NO_SPLASH_HEIGHT 16
+
+void Sentient::EventClientLanding(Event *ev)
+{
+    float fVolume    = ev->NumArgs() >= 1 ? ev->GetFloat(1) : 1;
+    int   iEquipment = ev->NumArgs() >= 2 ? ev->GetInteger(2) : 1;
+
+    LandingSound(fVolume, iEquipment);
+}
+
+void Sentient::FootstepMain(trace_t *trace, int iRunning, int iEquipment)
+{
+    int    contents;
+    int    surftype;
+    float  fVolume;
+    vec3_t vPos;
+    vec3_t midlegs;
+    str    sSoundName;
+
+    VectorCopy(trace->endpos, vPos);
+    sSoundName = "snd_step_";
+
+    contents = gi.pointcontents(trace->endpos, -1);
+    if (contents & MASK_WATER) {
+        // take our ground position and trace upwards
+        VectorCopy(trace->endpos, midlegs);
+        midlegs[2] += WATER_NO_SPLASH_HEIGHT;
+        contents = gi.pointcontents(midlegs, -1);
+        if (contents & MASK_WATER) {
+            sSoundName += "wade";
+        } else {
+            sSoundName += "puddle";
+        }
+    } else {
+        surftype = trace->surfaceFlags & MASK_SURF_TYPE;
+        switch (surftype) {
+        case SURF_FOLIAGE:
+            sSoundName += "foliage";
+            break;
+        case SURF_SNOW:
+            sSoundName += "snow";
+            break;
+        case SURF_CARPET:
+            sSoundName += "carpet";
+            break;
+        case SURF_SAND:
+            sSoundName += "sand";
+            break;
+        case SURF_PUDDLE:
+            sSoundName += "puddle";
+            break;
+        case SURF_GLASS:
+            sSoundName += "glass";
+            break;
+        case SURF_GRAVEL:
+            sSoundName += "gravel";
+            break;
+        case SURF_MUD:
+            sSoundName += "mud";
+            break;
+        case SURF_DIRT:
+            sSoundName += "dirt";
+            break;
+        case SURF_GRILL:
+            sSoundName += "grill";
+            break;
+        case SURF_GRASS:
+            sSoundName += "grass";
+            break;
+        case SURF_ROCK:
+            sSoundName += "stone";
+            break;
+        case SURF_PAPER:
+            sSoundName += "paper";
+            break;
+        case SURF_WOOD:
+            sSoundName += "wood";
+            break;
+        case SURF_METAL:
+            sSoundName += "metal";
+            break;
+        default:
+            sSoundName += "stone";
+            break;
+        }
+    }
+
+    if (iRunning) {
+        if (iRunning == -1) {
+            fVolume = 0.5;
+        } else {
+            fVolume = 1.0;
+        }
+    } else {
+        fVolume = 0.25;
+    }
+
+    if (!iRunning && g_gametype->integer == GT_SINGLE_PLAYER) {
+        return;
+    }
+
+    PlayNonPvsSound(sSoundName, fVolume);
+
+    if (iEquipment && random() < 0.3) {
+        // also play equipment sound
+        PlayNonPvsSound("snd_step_equipment", fVolume);
+    }
+}
+
+void Sentient::Footstep(const char *szTagName, int iRunning, int iEquipment)
+{
+    int           i;
+    int           iTagNum;
+    vec3_t        vStart, vEnd;
+    vec3_t        midlegs;
+    vec3_t        vMins, vMaxs;
+    str           sSoundName;
+    trace_t       trace;
+    orientation_t oTag;
+
+    // send a trace down from the player to the ground
+    VectorCopy(this->origin, vStart);
+    vStart[2] += GROUND_DISTANCE;
+
+    if (szTagName) {
+        iTagNum = gi.Tag_NumForName(this->edict->tiki, szTagName);
+        if (iTagNum != -1) {
+            oTag = G_TIKI_Orientation(this->edict, iTagNum);
+
+            for (i = 0; i < 2; i++) {
+                VectorMA(vStart, oTag.origin[i], this->orientation[i], vStart);
+            }
+        }
+    }
+
+    if (iRunning == -1) {
+        AngleVectors(this->angles, midlegs, NULL, NULL);
+        VectorMA(vStart, -16, midlegs, vStart);
+        VectorMA(vStart, 64, midlegs, vEnd);
+
+        VectorSet(vMins, -2, -2, -8);
+        VectorSet(vMaxs, 2, 2, 8);
+    } else {
+        VectorSet(vMins, -4, -4, 0);
+        VectorSet(vMaxs, 4, 4, 2);
+
+        // add 16 units above feets
+        vStart[2] += 16.0;
+        VectorCopy(vStart, vEnd);
+        vEnd[2] -= 64.0;
+    }
+
+    if (IsSubclassOfPlayer()) {
+        trace = G_Trace(vStart, vMins, vMaxs, vEnd, edict, MASK_PLAYERSOLID, qtrue, "Player Footsteps");
+    } else {
+        trace = G_Trace(vStart, vMins, vMaxs, vEnd, edict, MASK_MONSTERSOLID, qfalse, "Monster Footsteps");
+    }
+
+    if (trace.fraction == 1.0f) {
+        return;
+    }
+
+    FootstepMain(&trace, iRunning, iEquipment);
+}
+
+void Sentient::LandingSound(float volume, int iEquipment)
+{
+    int           contents;
+    int           surftype;
+    vec3_t        vStart, vEnd;
+    vec3_t        midlegs;
+    str           sSoundName;
+    trace_t       trace;
+    static vec3_t g_vFootstepMins = {-4, -4, 0};
+    static vec3_t g_vFootstepMaxs = {4, 4, 2};
+
+    if (this->iNextLandTime > level.inttime) {
+        this->iNextLandTime = level.inttime + 200;
+        return;
+    }
+
+    this->iNextLandTime = level.time + 200;
+    VectorCopy(this->origin, vStart);
+    vStart[2] += GROUND_DISTANCE;
+
+    VectorCopy(vStart, vEnd);
+    vEnd[2] -= 64.0;
+
+    if (IsSubclassOfPlayer()) {
+        trace =
+            G_Trace(vStart, g_vFootstepMins, g_vFootstepMaxs, vEnd, edict, MASK_PLAYERSOLID, qtrue, "Player Footsteps");
+    } else {
+        trace = G_Trace(
+            vStart, g_vFootstepMins, g_vFootstepMaxs, vEnd, edict, MASK_MONSTERSOLID, qfalse, "Monster Footsteps"
+        );
+    }
+
+    if (trace.fraction == 1.0) {
+        return;
+    }
+
+    sSoundName += "snd_landing_";
+
+    contents = gi.pointcontents(trace.endpos, -1);
+    if (contents & MASK_WATER) {
+        // take our ground position and trace upwards
+        VectorCopy(trace.endpos, midlegs);
+        midlegs[2] += WATER_NO_SPLASH_HEIGHT;
+        contents = gi.pointcontents(midlegs, -1);
+        if (contents & MASK_WATER) {
+            sSoundName += "wade";
+        } else {
+            sSoundName += "puddle";
+        }
+    } else {
+        surftype = trace.surfaceFlags & MASK_SURF_TYPE;
+        switch (surftype) {
+        case SURF_FOLIAGE:
+            sSoundName += "foliage";
+            break;
+        case SURF_SNOW:
+            sSoundName += "snow";
+            break;
+        case SURF_CARPET:
+            sSoundName += "carpet";
+            break;
+        case SURF_SAND:
+            sSoundName += "sand";
+            break;
+        case SURF_PUDDLE:
+            sSoundName += "puddle";
+            break;
+        case SURF_GLASS:
+            sSoundName += "glass";
+            break;
+        case SURF_GRAVEL:
+            sSoundName += "gravel";
+            break;
+        case SURF_MUD:
+            sSoundName += "mud";
+            break;
+        case SURF_DIRT:
+            sSoundName += "dirt";
+            break;
+        case SURF_GRILL:
+            sSoundName += "grill";
+            break;
+        case SURF_GRASS:
+            sSoundName += "grass";
+            break;
+        case SURF_ROCK:
+            sSoundName += "stone";
+            break;
+        case SURF_PAPER:
+            sSoundName += "paper";
+            break;
+        case SURF_WOOD:
+            sSoundName += "wood";
+            break;
+        case SURF_METAL:
+            sSoundName += "metal";
+            break;
+        default:
+            sSoundName += "stone";
+            break;
+        }
+    }
+
+    PlayNonPvsSound(sSoundName, volume);
+
+    if (iEquipment && random() < 0.5) {
+        PlayNonPvsSound("snd_step_equipment", volume);
+    }
+}
diff --git a/code/fgame/sentient.h b/code/fgame/sentient.h
index 0f515cd1..c148db26 100644
--- a/code/fgame/sentient.h
+++ b/code/fgame/sentient.h
@@ -110,7 +110,7 @@ protected:
     bool                   weapons_holstered_by_code;
     ActiveWeapon           lastActiveWeapon;
     float                  m_fDamageMultipliers[MAX_DAMAGE_MULTIPLIERS];
-    class SafePtr<Vehicle> m_pVehicle;
+    SafePtr<Vehicle>       m_pVehicle;
     SafePtr<TurretGun>     m_pTurret;
     SafePtr<Entity>        m_pLadder;
     str                    m_sHelmetSurface1;
@@ -216,8 +216,13 @@ public:
     float             next_bleed_time;
     bool              m_bForceDropHealth;
     bool              m_bForceDropWeapon;
-    bool              m_bFootOnGround_Right;
-    bool              m_bFootOnGround_Left;
+
+    bool m_bFootOnGround_Right;
+    bool m_bFootOnGround_Left;
+    //
+    // Added in OPM
+    //
+    int  iNextLandTime;
 
     CLASS_PROTOTYPE(Sentient);
 
@@ -230,9 +235,11 @@ public:
     virtual Vector GetViewAngles(void);
     void           AddViewVariation(const Vector          &vVariation);
     void           SetMinViewVariation(const Vector          &vVariation);
+    void           SetHolsteredByCode(bool holstered);
     bool           CanSee(Entity *ent, float fov, float vision_distance, bool bNoEnts) override;
+    bool           CanSee(const Vector& org, float fov, float vision_distance, bool bNoEnts) override;
     virtual Vector GunPosition(void);
-    virtual Vector GunTarget(bool bNoCollision = false);
+    virtual Vector GunTarget(bool bNoCollision = false, const vec3_t position = NULL, const vec3_t forward = NULL);
     void           ReloadWeapon(Event *ev);
     void           FireWeapon(Event *ev);
     void           StopFireWeapon(Event *ev);
@@ -314,6 +321,7 @@ public:
     Weapon      *GetNewActiveWeapon(void);
     weaponhand_t GetNewActiveWeaponHand(void);
     void         ClearNewActiveWeapon(void);
+    void         SetNewActiveWeapon(Weapon* weapon, weaponhand_t hand);
     void         Holster(qboolean putaway);
     void         SafeHolster(qboolean putaway);
     void         ActivateNewWeapon(void);
@@ -334,11 +342,31 @@ public:
     void DisbandSquadMate(Sentient *pExFriendly);
     bool IsSquadMate(Sentient *pFriendly);
 
+    virtual bool IsDisabled() const; // Added in 2.30
+
+    Vehicle* GetVehicle() const;
+    void SetVehicle(Vehicle* pVehicle);
+
+    TurretGun* GetTurret() const;
+    void SetTurret(TurretGun* pTurret);
+
+    Entity* GetLadder() const; // Added in OPM
+
     //
     // Custom openmohaa stuff
     //
     void GetActiveWeap(Event *ev);
+    void GetNewActiveWeaponOld(Event *ev);
     void GetNewActiveWeapon(Event *ev);
+    void GetNewActiveWeaponHand(Event *ev);
+    void EventClientLanding(Event *ev);
+
+    void FootstepMain(trace_t *trace, int iRunning, int iEquipment);
+    void Footstep(const char *szTagName, int iRunning, int iEquipment);
+    void LandingSound(float volume, int iEquipment);
+
+    const Container<int>& getInventory() const;
+    const Container<Ammo*>& getAmmoInventory() const;
 };
 
 typedef SafePtr<Sentient> SentientPtr;
diff --git a/code/fgame/sentient_combat.cpp b/code/fgame/sentient_combat.cpp
index 38395dbe..e095d49d 100644
--- a/code/fgame/sentient_combat.cpp
+++ b/code/fgame/sentient_combat.cpp
@@ -33,7 +33,7 @@ ActiveWeapon::ActiveWeapon()
 
 void ActiveWeapon::Archive(Archiver& arc)
 {
-    arc.ArchiveObjectPointer((Class **)&weapon);
+    arc.ArchiveSafePointer(&weapon);
     ArchiveEnum(hand, weaponhand_t);
 }
 
@@ -54,14 +54,19 @@ Weapon *Sentient::GetNewActiveWeapon(void)
 
 void Sentient::ClearNewActiveWeapon(void)
 {
-    newActiveWeapon.weapon.Clear();
-    newActiveWeapon.hand = WEAPON_ERROR;
+    SetNewActiveWeapon(NULL, WEAPON_ERROR);
+}
+
+void Sentient::SetNewActiveWeapon(Weapon* weapon, weaponhand_t hand)
+{
+    newActiveWeapon.weapon = weapon;
+    newActiveWeapon.hand   = hand;
 }
 
 void Sentient::EventGiveAmmo(Event *ev)
 {
-    int         amount, maxamount = -1;
-    const char *type;
+    int amount, maxamount = -1;
+    str type;
 
     type   = ev->GetString(1);
     amount = ev->GetInteger(2);
@@ -74,7 +79,6 @@ void Sentient::EventGiveAmmo(Event *ev)
 }
 
 int Sentient::AmmoIndex(str type)
-
 {
     Ammo *ammo;
 
@@ -146,7 +150,6 @@ void Sentient::GiveAmmo(str type, int amount, int maxamount)
 }
 
 int Sentient::UseAmmo(str type, int amount)
-
 {
     int count, i;
 
@@ -154,7 +157,7 @@ int Sentient::UseAmmo(str type, int amount)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (type == ammo->getName()) {
+        if (!str::icmp(type, ammo->getName())) {
             int ammo_amount = ammo->getAmount();
 
             // Less ammo than what we specified to use
@@ -180,7 +183,9 @@ void Sentient::AmmoAmountInClipChanged(str type, int amount_in_clip)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (type == ammo->getName()) {
+        // Fixed in OPM
+        //  Original uses strcmp
+        if (!str::icmp(type, ammo->getName())) {
             AmmoAmountChanged(ammo, amount_in_clip);
         }
     }
@@ -213,34 +218,70 @@ void Sentient::WeaponKnockedFromHands(void)
 
 bool Sentient::CanSee(Entity *ent, float fov, float vision_distance, bool bNoEnts)
 {
-    float delta[2];
+    vec2_t delta;
+    int    mask;
 
-    delta[0] = ent->centroid[0] - centroid[0];
-    delta[1] = ent->centroid[1] - centroid[1];
+    VectorSub2D(ent->centroid, centroid, delta);
 
-    if ((vision_distance <= 0.0f) || VectorLength2DSquared(delta) <= (vision_distance * vision_distance)) {
-        if (gi.AreasConnected(edict->r.areanum, ent->edict->r.areanum)
-            && ((fov <= 0.0f || fov >= 360.0f) || (FovCheck(delta, cos(fov * (0.5 * M_PI / 180.0)))))) {
-            //
-            // Parent checking for subclass is absolute non-sense...
-            //
-            if (ent->IsSubclassOfPlayer()) {
-                Player *p = (Player *)ent;
-
-                Vector vStart = EyePosition();
-                Vector vEnd   = p->EyePosition();
-
-                return G_SightTrace(vStart, vec_zero, vec_zero, vEnd, this, ent, MASK_CANSEE, 0, "Sentient::CanSee 1");
-            } else {
-                Vector vStart = EyePosition();
-                Vector vEnd   = ent->centroid;
-
-                return G_SightTrace(vStart, vec_zero, vec_zero, vEnd, this, ent, MASK_CANSEE, 0, "Sentient::CanSee 2");
-            }
-        }
+    if (vision_distance > 0 && Square(vision_distance) < VectorLength2DSquared(delta)) {
+        return false;
     }
 
-    return false;
+    if (!AreasConnected(ent)) {
+        return false;
+    }
+
+    if (fov > 0 && fov < 360 && !FovCheck(delta, cos(DEG2RAD(fov / 2.f)))) {
+        return false;
+    }
+
+    if (bNoEnts) {
+        mask = MASK_CANSEE_NOENTS;
+    } else {
+        mask = MASK_CANSEE;
+    }
+
+    if (ent->IsSubclassOfSentient()) {
+        return G_SightTrace(
+            EyePosition(),
+            vec_zero,
+            vec_zero,
+            static_cast<Sentient *>(ent)->EyePosition(),
+            this,
+            ent,
+            mask,
+            qfalse,
+            "Sentient::CanSee 1"
+        );
+    } else {
+        return G_SightTrace(
+            EyePosition(), vec_zero, vec_zero, ent->centroid, this, ent, mask, qfalse, "Sentient::CanSee 2"
+        );
+    }
+}
+
+bool Sentient::CanSee(const Vector& org, float fov, float vision_distance, bool bNoEnts)
+{
+    vec2_t delta;
+    int    mask;
+
+    VectorSub2D(org, centroid, delta);
+
+    if (vision_distance > 0 && Square(vision_distance) < VectorLength2DSquared(delta)) {
+        return false;
+    }
+
+    if (fov > 0 && fov < 360 && !FovCheck(delta, cos(DEG2RAD(fov / 2.f)))) {
+        return false;
+    }
+
+    if (bNoEnts) {
+        mask = MASK_CANSEE_NOENTS;
+    } else {
+        mask = MASK_CANSEE;
+    }
+
+    return G_SightTrace(EyePosition(), vec_zero, vec_zero, org, this, NULL, mask, qfalse, "Sentient::CanSee");
 }
 
 Vector Sentient::GunPosition(void)
@@ -248,7 +289,7 @@ Vector Sentient::GunPosition(void)
     Vector vPos;
 
     if (activeWeaponList[WEAPON_MAIN]) {
-        activeWeaponList[WEAPON_MAIN]->GetMuzzlePosition(&vPos);
+        activeWeaponList[WEAPON_MAIN]->GetMuzzlePosition(vPos);
     } else {
         vPos = origin;
     }
@@ -256,7 +297,7 @@ Vector Sentient::GunPosition(void)
     return vPos;
 }
 
-Vector Sentient::GunTarget(bool bNoCollision)
+Vector Sentient::GunTarget(bool bNoCollision, const vec3_t position, const vec3_t forward)
 {
     Vector vPos;
 
@@ -299,7 +340,7 @@ void Sentient::ChargeWeapon(weaponhand_t hand, firemode_t mode)
         return;
     }
 
-    if (hand > MAX_ACTIVE_WEAPONS) {
+    if (hand >= MAX_ACTIVE_WEAPONS) {
         warning(
             "Sentient::ChargeWeapon",
             "Weapon hand number \"%d\" is out of bounds of 0 to MAX_ACTIVE_WEAPONS:%d\n",
@@ -410,7 +451,7 @@ void Sentient::FireWeapon(int number, firemode_t mode)
 {
     Weapon *activeWeapon = activeWeaponList[number];
 
-    if (activeWeapon) {
+    if (activeWeapon && activeWeapon->ReadyToFire(mode)) {
         if (mode == FIRE_SECONDARY && activeWeapon->GetZoom() && !activeWeapon->GetAutoZoom() && IsSubclassOfPlayer()) {
             Player *p = (Player *)this;
             p->ToggleZoom(activeWeapon->GetZoom());
@@ -470,7 +511,7 @@ void Sentient::StopFireWeapon(Event *ev)
         number = WeaponHandNameToNum(side);
     }
 
-    if ((number > MAX_ACTIVE_WEAPONS) || (number < 0)) {
+    if ((number >= MAX_ACTIVE_WEAPONS) || (number < 0)) {
         warning(
             "Sentient::StopFireWeapon",
             "Weapon number \"%d\" is out of bounds of 0 to MAX_ACTIVE_WEAPONS:%d\n",
@@ -497,7 +538,7 @@ void Sentient::ReleaseFireWeapon(int number, firemode_t mode)
 
     charge_start_time = 0;
 
-    if ((number > MAX_ACTIVE_WEAPONS) || (number < 0)) {
+    if ((number >= MAX_ACTIVE_WEAPONS) || (number < 0)) {
         warning(
             "Sentient::FireWeapon",
             "Weapon number \"%d\" is out of bounds of 0 to MAX_ACTIVE_WEAPONS:%d\n",
@@ -599,7 +640,7 @@ void Sentient::AttachAllActiveWeapons(void)
         }
     }
 
-    if (this->isSubclassOf(Player)) {
+    if (this->IsSubclassOfPlayer()) {
         Player *player = (Player *)this;
         player->UpdateWeapons();
     }
@@ -640,7 +681,7 @@ int Sentient::NumWeapons(void)
 
 void Sentient::ChangeWeapon(Weapon *weapon, weaponhand_t hand)
 {
-    if ((hand > MAX_ACTIVE_WEAPONS) || (hand < 0)) {
+    if ((hand >= MAX_ACTIVE_WEAPONS) || (hand < 0)) {
         warning(
             "Sentient::ChangeWeapon",
             "Weapon hand number \"%d\" is out of bounds of 0 to MAX_ACTIVE_WEAPONS:%d\n",
@@ -667,27 +708,33 @@ void Sentient::DeactivateWeapon(weaponhand_t hand)
         return;
     }
 
+    if (!(activeWeaponList[hand]->GetWeaponClass() & WEAPON_CLASS_ANY_ITEM)) {
+        // Set the last active weapon only if the weapon is not an item
+        lastActiveWeapon.weapon = activeWeaponList[hand];
+        lastActiveWeapon.hand   = hand;
+    }
+
     activeWeaponList[hand]->AttachToHolster(hand);
     activeWeaponList[hand]->SetPutAway(false);
-    activeWeaponList[hand]->NewAnim("putaway");
+    activeWeaponList[hand]->SetWeaponAnim("putaway");
 
     // Check the player's inventory and detach any weapons that are already attached to that spot
-    for (i = 1; i <= inventory.NumObjects(); i++) {
-        Item *item = (Item *)G_GetEntity(inventory.ObjectAt(i));
+    if (activeWeaponList[hand]->GetCurrentAttachToTag().length() > 0) {
+        for (i = 1; i <= inventory.NumObjects(); i++) {
+            Item *item = (Item *)G_GetEntity(inventory.ObjectAt(i));
 
-        if (item->IsSubclassOfWeapon()) {
-            Weapon *weap = (Weapon *)item;
+            if (item->IsSubclassOfWeapon()) {
+                Weapon *weap = (Weapon *)item;
 
-            if ((weap != activeWeaponList[hand])
-                && (!str::cmp(weap->GetCurrentAttachToTag(), activeWeaponList[hand]->GetCurrentAttachToTag()))) {
-                weap->DetachFromOwner();
+                if ((weap != activeWeaponList[hand])
+                    && (!str::icmp(weap->GetCurrentAttachToTag(), activeWeaponList[hand]->GetCurrentAttachToTag()))) {
+                    weap->DetachFromOwner();
+                }
             }
         }
     }
 
-    lastActiveWeapon.weapon = activeWeaponList[hand];
-    lastActiveWeapon.hand   = hand;
-    activeWeaponList[hand]  = NULL;
+    activeWeaponList[hand] = NULL;
 }
 
 void Sentient::DeactivateWeapon(Weapon *weapon)
@@ -696,6 +743,12 @@ void Sentient::DeactivateWeapon(Weapon *weapon)
 
     for (i = 0; i < MAX_ACTIVE_WEAPONS; i++) {
         if (activeWeaponList[i] == weapon) {
+            if (activeWeaponList[i] && !(activeWeaponList[i]->GetWeaponClass() & WEAPON_CLASS_ANY_ITEM)) {
+                // Set the last active weapon only if the weapon is not an item
+                lastActiveWeapon.weapon = activeWeaponList[i];
+                lastActiveWeapon.hand   = (weaponhand_t)i;
+            }
+
             activeWeaponList[i]->DetachFromOwner();
             activeWeaponList[i]->SetPutAway(false);
             activeWeaponList[i] = NULL;
@@ -723,6 +776,7 @@ void Sentient::EventDeactivateWeapon(Event *ev)
 
 void Sentient::ActivateWeapon(Weapon *weapon, weaponhand_t hand)
 {
+    str holsterTag;
     int i;
 
     if (hand == WEAPON_ERROR) {
@@ -731,22 +785,31 @@ void Sentient::ActivateWeapon(Weapon *weapon, weaponhand_t hand)
     }
 
     activeWeaponList[hand] = weapon;
-    str holsterTag         = weapon->GetHolsterTag();
 
-    // Check the player's inventory and detach any weapons that are currently attached to that tag.
-    for (i = 1; i <= inventory.NumObjects(); i++) {
-        Item *item = (Item *)G_GetEntity(inventory.ObjectAt(i));
+    if (hand == WEAPON_MAIN) {
+        holsterTag = weapon->GetHolsterTag();
+    }
 
-        if (item->isSubclassOf(Weapon)) {
-            Weapon *weap = (Weapon *)item;
+    if (holsterTag.length() > 0) {
+        // Check the player's inventory and detach any weapons that are currently attached to that tag.
+        for (i = 1; i <= inventory.NumObjects(); i++) {
+            Item *item = (Item *)G_GetEntity(inventory.ObjectAt(i));
 
-            if ((!str::cmp(holsterTag, weap->GetCurrentAttachToTag()))) {
-                weap->DetachFromOwner();
+            if (item->IsSubclassOfWeapon()) {
+                Weapon *weap = (Weapon *)item;
+
+                if ((!str::cmp(holsterTag, weap->GetCurrentAttachToTag()))) {
+                    weap->DetachFromOwner();
+                }
             }
         }
     }
     weapon->AttachToOwner(hand);
-    weapon->NewAnim("raise");
+    weapon->SetWeaponAnim("raise");
+
+    if (weapon == holsteredWeapon) {
+        holsteredWeapon = NULL;
+    }
 }
 
 void Sentient::ActivateLastActiveWeapon(void)
@@ -805,15 +868,32 @@ Weapon *Sentient::BestWeapon(Weapon *ignore, qboolean bGetItem, int iIgnoreClass
         next = (Weapon *)G_GetEntity(inventory.ObjectAt(j));
 
         assert(next);
-
-        if ((next != ignore)
-            && ((next->IsSubclassOfWeapon() && !(next->GetWeaponClass() & iIgnoreClass))
-                || (next->IsSubclassOfItem() && bGetItem))
-            && (next->GetRank() > bestrank)
-            && (next->HasAmmo(FIRE_PRIMARY) || next->GetFireType(FIRE_SECONDARY) == FT_MELEE)) {
-            bestweapon = (Weapon *)next;
-            bestrank   = bestweapon->GetRank();
+        if (next == ignore) {
+            continue;
         }
+
+        if (!next->IsSubclassOfWeapon() && (!bGetItem || !next->IsSubclassOfInventoryItem())) {
+            continue;
+        }
+
+        if (!bGetItem && next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & iIgnoreClass) {
+            continue;
+        }
+
+        if (next->GetRank() < bestrank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY) && !next->GetUseNoAmmo()) {
+            continue;
+        }
+
+        bestweapon = (Weapon*)next;
+        bestrank = bestweapon->GetRank();
     }
 
     return bestweapon;
@@ -837,14 +917,32 @@ Weapon *Sentient::WorstWeapon(Weapon *ignore, qboolean bGetItem, int iIgnoreClas
 
         assert(next);
 
-        if ((next != ignore)
-            && ((next->IsSubclassOfWeapon() && !(next->GetWeaponClass() & iIgnoreClass))
-                || (next->IsSubclassOfWeapon() && bGetItem))
-            && (next->GetRank() < iWorstRank)
-            && (next->HasAmmo(FIRE_PRIMARY) || next->GetFireType(FIRE_SECONDARY) == FT_MELEE)) {
-            worstweapon = (Weapon *)next;
-            iWorstRank  = worstweapon->GetRank();
+        if (next == ignore) {
+            continue;
         }
+
+        if (!next->IsSubclassOfWeapon()) {
+            continue;
+        }
+
+        if (!bGetItem && next->IsSubclassOfInventoryItem()) {
+            continue;
+        }
+
+        if (next->GetWeaponClass() & iIgnoreClass) {
+            continue;
+        }
+
+        if (next->GetRank() >= iWorstRank) {
+            continue;
+        }
+
+        if (!next->HasAmmo(FIRE_PRIMARY) && !next->GetUseNoAmmo()) {
+            continue;
+        }
+
+        worstweapon = (Weapon*)next;
+        iWorstRank = worstweapon->GetRank();
     }
 
     return worstweapon;
@@ -879,7 +977,7 @@ Weapon *Sentient::NextWeapon(Weapon *weapon)
 
         assert(item);
 
-        if (item->isSubclassOf(Weapon)) {
+        if (item->IsSubclassOfWeapon()) {
             choice = (Weapon *)item;
             if ((!choice->HasAmmo(FIRE_PRIMARY) && !choice->GetUseNoAmmo()) || !choice->AutoChange()) {
                 continue;
@@ -934,7 +1032,7 @@ Weapon *Sentient::PreviousWeapon(Weapon *weapon)
 
         assert(item);
 
-        if (item->isSubclassOf(Weapon)) {
+        if (item->IsSubclassOfWeapon()) {
             choice = (Weapon *)item;
             if ((!choice->HasAmmo(FIRE_PRIMARY) && !choice->GetUseNoAmmo()) || !choice->AutoChange()) {
                 continue;
@@ -963,7 +1061,7 @@ Weapon *Sentient::PreviousWeapon(Weapon *weapon)
 Weapon *Sentient::GetActiveWeapon(weaponhand_t hand) const
 
 {
-    if ((hand > MAX_ACTIVE_WEAPONS) || (hand < 0)) {
+    if ((hand >= MAX_ACTIVE_WEAPONS) || (hand < 0)) {
         warning(
             "Sentient::GetActiveWeapon",
             "Weapon hand number \"%d\" is out of bounds of 0 to MAX_ACTIVE_WEAPONS:%d\n",
@@ -977,7 +1075,6 @@ Weapon *Sentient::GetActiveWeapon(weaponhand_t hand) const
 }
 
 qboolean Sentient::IsActiveWeapon(Weapon *weapon)
-
 {
     int i;
 
@@ -1005,6 +1102,9 @@ void Sentient::useWeapon(const char *weaponname, weaponhand_t hand)
 
     // Find the item in the sentient's inventory
     weapon = (Weapon *)FindItem(weaponname);
+    if (!weapon) {
+        weapon = (Weapon *)FindItemByExternalName(weaponname);
+    }
 
     // If it exists, then make the change to the slot number specified
     if (weapon) {
@@ -1022,8 +1122,7 @@ void Sentient::useWeapon(Weapon *weapon, weaponhand_t hand)
     }
 
     if (newActiveWeapon.weapon) {
-        newActiveWeapon.weapon = weapon;
-        newActiveWeapon.hand   = hand;
+        SetNewActiveWeapon(weapon, hand);
         return;
     }
 
@@ -1035,20 +1134,21 @@ void Sentient::useWeapon(Weapon *weapon, weaponhand_t hand)
         activeWeaponList[WEAPON_OFFHAND]->PutAway();
     }
 
-    if (activeWeaponList[WEAPON_MAIN] && activeWeaponList[WEAPON_MAIN] != weapon) {
+    if (activeWeaponList[WEAPON_MAIN] == weapon) {
+        return;
+    }
+
+    if (activeWeaponList[WEAPON_MAIN]) {
         activeWeaponList[WEAPON_MAIN]->PutAway();
     }
 
-    newActiveWeapon.weapon = weapon;
-    newActiveWeapon.hand   = hand;
-
-    //ChangeWeapon( weapon, hand );
+    SetNewActiveWeapon(weapon, hand);
 }
 
 void Sentient::EventUseWeaponClass(Event *ev)
 {
-    const char *name;
-    int         weapon_class;
+    str name;
+    int weapon_class;
 
     if (deadflag) {
         return;
@@ -1138,8 +1238,8 @@ void Sentient::PutawayWeapon(Event *ev)
 
     weapon = GetActiveWeapon(hand);
 
-    if (weapon->isSubclassOf(Weapon)) {
-        weapon->NewAnim("putaway");
+    if (weapon->IsSubclassOfWeapon()) {
+        weapon->SetWeaponAnim("putaway");
     }
 }
 
@@ -1188,18 +1288,30 @@ Ammo *Sentient::FindAmmoByName(str name)
 
     for (i = 1; i <= count; i++) {
         Ammo *ammo = ammo_inventory.ObjectAt(i);
-        if (name == ammo->getName()) {
+        if (!str::icmp(name, ammo->getName())) {
             return ammo;
         }
     }
     return NULL;
 }
 
-void Sentient::GetNewActiveWeapon(Event *ev)
+void Sentient::GetNewActiveWeaponOld(Event *ev)
+{
+    ScriptDeprecatedAltVariable("newActiveWeapon");
+
+    ev->AddEntity(GetNewActiveWeapon());
+}
+
+void Sentient::GetNewActiveWeapon(Event* ev)
 {
     ev->AddEntity(GetNewActiveWeapon());
 }
 
+void Sentient::GetNewActiveWeaponHand(Event* ev)
+{
+    ev->AddInteger(GetNewActiveWeaponHand());
+}
+
 void Sentient::GetActiveWeap(Event *ev)
 {
     weaponhand_t weaponhand;
@@ -1216,3 +1328,11 @@ void Sentient::GetActiveWeap(Event *ev)
 
     ev->AddEntity(weapon);
 }
+
+const Container<int>& Sentient::getInventory() const {
+    return inventory;
+}
+
+const Container<Ammo*>& Sentient::getAmmoInventory() const {
+    return ammo_inventory;
+}
diff --git a/code/fgame/simpleactor.cpp b/code/fgame/simpleactor.cpp
index 3d1ce293..d4d407db 100644
--- a/code/fgame/simpleactor.cpp
+++ b/code/fgame/simpleactor.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,1883 +25,1318 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actor.h"
 #include "bg_local.h"
 #include "scriptexception.h"
+#include "scriptthread.h"
+#include "../script/scriptclass.h"
+#include "weapturret.h"
 #include <tiki.h>
 
-CLASS_DECLARATION( Sentient, SimpleActor, NULL )
-{
-	{ NULL, NULL }
+Event EV_NoAnimLerp
+(
+    "noanimlerp",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Do not LERP to the next animation",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(Sentient, SimpleActor, NULL) {
+    {&EV_NoAnimLerp, &SimpleActor::EventNoAnimLerp},
+    {NULL,           NULL                         }
 };
 
-#define OVERLOADED_ERROR() assert( !"overloaded version should always get called" )
+#define OVERLOADED_ERROR() assert(!"overloaded version should always get called")
 
 SimpleActor::SimpleActor()
 {
-	if( LoadingSavegame )
-		return;
+    m_ChangeMotionAnimIndex = -1;
+    m_ChangeActionAnimIndex = -1;
+    m_ChangeSayAnimIndex    = -1;
 
-	m_AnimMotionHigh			= true;
-	m_DesiredGunDir				= vec_zero;
-	m_eEmotionMode				= EMOTION_NEUTRAL;
-	m_eNextAnimMode				= -1;
-	m_fPathGoalTime				= 0.0f;
-	m_csPathGoalEndAnimScript	= STRING_EMPTY;
+    if (LoadingSavegame) {
+        return;
+    }
 
-	m_AnimActionHigh			= true;
-	m_AnimDialogHigh			= true;
-	m_fAimLimit_up				= 60.0f;
-	m_fAimLimit_down			= -60.0f;
+    m_AnimMotionHigh = true;
+    m_AnimActionHigh = true;
+    m_AnimDialogHigh = true;
 
-	m_csNextAnimString			= STRING_NULL;
-	m_bNextForceStart			= false;
-	m_fCrossblendTime			= 0.5f;
-	m_csCurrentPosition			= STRING_STAND;
-	m_bStartPathGoalEndAnim		= false;
+    m_fAimLimit_up   = 60.0f;
+    m_fAimLimit_down = -60.0f;
 
-	for( int i = 0; i < MAX_FRAMEINFOS; i++ )
-	{
-		m_weightType[ i ] = 0.0f;
-	}
+    VectorClear(m_DesiredGunDir);
+    VectorClear(m_DesiredLookAngles);
+    VectorClear(m_Dest);
+    VectorClear(m_NoClipDest);
 
-	m_bMotionAnimSet			= false;
-	m_ChangeActionAnimIndex		= -1;
-	m_ChangeActionAnimIndex		= -1;
-	m_ChangeSayAnimIndex		= -1;
-	m_iMotionSlot				= -1;
-	m_iActionSlot				= -1;
-	m_bActionAnimSet			= false;
-	m_bSayAnimSet				= false;
-	m_iVoiceTime				= 0;
-	m_bAimAnimSet				= false;
-	m_iSaySlot					= -1;
-	m_bLevelMotionAnim			= false;
-	m_bLevelActionAnim			= false;
-	m_bLevelSayAnim				= 0;
-	m_bNextLevelSayAnim			= 0;
-	m_DesiredYaw				= 0.0f;
-	m_YawAchieved				= true;
-	m_bPathErrorTime			= -10000000.0f;
+    for (int i = 0; i < MAX_FRAMEINFOS; i++) {
+        m_weightBase[i]       = 0.0f;
+        m_weightCrossBlend[i] = 0.0f;
+    }
 
-	m_PainHandler.TrySetScript( STRING_ANIM_PAIN_SCR );
-	m_DeathHandler.TrySetScript( STRING_ANIM_KILLED_SCR );
-	m_AttackHandler.TrySetScript( STRING_ANIM_ATTACK_SCR );
-	m_SniperHandler.TrySetScript( STRING_ANIM_SNIPER_SCR );
+    m_eEmotionMode            = EMOTION_NEUTRAL;
+    m_eNextAnimMode           = -1;
+    m_csPathGoalEndAnimScript = STRING_EMPTY;
+    m_bNextForceStart         = false;
+    m_fCrossblendTime         = 0.5f;
+    m_csCurrentPosition       = STRING_STAND;
+    m_fPathGoalTime           = 0.0f;
+    m_bStartPathGoalEndAnim   = false;
+    m_csNextAnimString        = STRING_NULL;
 
-	m_bHasDesiredLookDest	= false;
-	m_bUpdateAnimDoneFlags	= false;
+    for (int i = 0; i < MAX_FRAMEINFOS; i++) {
+        m_weightType[i] = ANIM_WEIGHT_NONE;
+    }
 
-	m_NearestNode			= NULL;
-	m_fCrouchWeight			= 0.0f;
+    m_ChangeActionAnimIndex = -1;
+    m_ChangeActionAnimIndex = -1;
+    m_ChangeSayAnimIndex    = -1;
 
-	m_csMood				= STRING_BORED;
-	m_csIdleMood			= STRING_BORED;
+    m_bMotionAnimSet = false;
+    m_bActionAnimSet = false;
+    m_bSayAnimSet    = false;
+    m_iVoiceTime     = 0;
+    m_bAimAnimSet    = false;
 
-	m_groundPlane			= qfalse;
-	m_walking				= qfalse;
-	m_groundPlaneNormal		= vec_zero;
-	m_maxspeed				= 1000000.0f;
+    m_iMotionSlot       = -1;
+    m_iActionSlot       = -1;
+    m_iSaySlot          = -1;
+    m_bLevelMotionAnim  = false;
+    m_bLevelActionAnim  = false;
+    m_bLevelSayAnim     = false;
+    m_bNextLevelSayAnim = false;
+    m_DesiredYaw        = 0.0f;
+    m_YawAchieved       = true;
+    m_bPathErrorTime    = -10000000;
+
+    m_PainHandler.TrySetScript(STRING_ANIM_PAIN_SCR);
+    m_DeathHandler.TrySetScript(STRING_ANIM_KILLED_SCR);
+    m_AttackHandler.TrySetScript(STRING_ANIM_ATTACK_SCR);
+    m_SniperHandler.TrySetScript(STRING_ANIM_SNIPER_SCR);
+
+    m_bHasDesiredLookDest  = false;
+    m_bUpdateAnimDoneFlags = false;
+
+    m_NearestNode   = NULL;
+    m_fCrouchWeight = 0.0f;
+
+    m_csMood     = STRING_BORED;
+    m_csIdleMood = STRING_BORED;
+
+    m_groundPlane = qfalse;
+    m_walking     = qfalse;
+    VectorClear(m_groundPlaneNormal);
+    m_maxspeed = 1000000.0f;
 }
 
-void SimpleActor::Archive
-	(
-	Archiver& arc
-	)
+SimpleActor::~SimpleActor()
 {
-	Sentient::Archive( arc );
-
-	arc.ArchiveInteger( &m_eAnimMode );
-	m_Anim.Archive( arc );
-
-	arc.ArchiveBool( &m_bHasDesiredLookDest );
-	arc.ArchiveBool( &m_bHasDesiredLookAngles );
-	arc.ArchiveVector( &m_vDesiredLookDest );
-	arc.ArchiveVec3( m_DesiredLookAngles );
-	arc.ArchiveVec3( m_DesiredGunDir );
-
-	m_Path.Archive( arc );
-	arc.ArchiveVec3( m_Dest );
-	arc.ArchiveVec3( m_NoClipDest );
-
-	arc.ArchiveFloat( &path_failed_time );
-	arc.ArchiveFloat( &m_fPathGoalTime );
-	arc.ArchiveBool( &m_bStartPathGoalEndAnim );
-	Director.ArchiveString( arc, m_csPathGoalEndAnimScript );
-
-	arc.ArchiveInteger( &m_eNextAnimMode );
-	Director.ArchiveString( arc, m_csNextAnimString );
-	m_NextAnimLabel.Archive( arc );
-	arc.ArchiveBool( &m_bNextForceStart );
-
-	arc.ArchiveBoolean( &m_walking );
-	arc.ArchiveBoolean( &m_groundPlane );
-	arc.ArchiveVec3( m_groundPlaneNormal );
-
-	arc.ArchiveVector( &watch_offset );
-	arc.ArchiveBool( &m_bThink );
-	arc.ArchiveInteger( &m_PainTime );
-
-	arc.ArchiveBool( &m_bAimAnimSet );
-	arc.ArchiveBool( &m_bActionAnimSet );
-
-	Director.ArchiveString( arc, m_csMood );
-	Director.ArchiveString( arc, m_csIdleMood );
-
-	ArchiveEnum(m_eEmotionMode, eEmotionMode);
-
-	arc.ArchiveFloat( &m_fAimLimit_up );
-	arc.ArchiveFloat( &m_fAimLimit_down );
-
-	for( int i = MAX_FRAMEINFOS - 1; i >= 0; i-- )
-	{
-		arc.ArchiveUnsigned( &m_weightType[ i ] );
-	}
-
-	for( int i = MAX_FRAMEINFOS - 1; i >= 0; i-- )
-	{
-		arc.ArchiveFloat( &m_weightBase[ i ] );
-	}
-
-	for( int i = MAX_FRAMEINFOS - 1; i >= 0; i-- )
-	{
-		arc.ArchiveFloat( &m_weightCrossBlend[ i ] );
-	}
-
-	arc.ArchiveBool( &m_AnimMotionHigh );
-	arc.ArchiveBool( &m_AnimActionHigh );
-	arc.ArchiveBool( &m_AnimDialogHigh );
-
-	arc.ArchiveVec2( obstacle_vel );
-
-	Director.ArchiveString( arc, m_csCurrentPosition );
-
-	arc.ArchiveBool( &m_bMotionAnimSet );
-	arc.ArchiveBool( &m_bDoAI );
-
-	arc.ArchiveFloat( &m_fCrossblendTime );
-
-	arc.ArchiveSafePointer( &m_pAnimThread );
-
-	arc.ArchiveBool( &m_YawAchieved );
-	arc.ArchiveFloat( &m_DesiredYaw );
-
-	arc.ArchiveInteger( &m_iVoiceTime );
-	arc.ArchiveBool( &m_bSayAnimSet );
-
-	arc.ArchiveInteger( &hit_obstacle_time );
-
-	Director.ArchiveString( arc, m_csAnimName );
-
-	arc.ArchiveInteger( &m_bPathErrorTime );
-	arc.ArchiveInteger( &m_iMotionSlot );
-	arc.ArchiveInteger( &m_iActionSlot );
-	arc.ArchiveInteger( &m_iSaySlot );
-
-	arc.ArchiveBool( &m_bLevelMotionAnim );
-	arc.ArchiveBool( &m_bLevelActionAnim );
-	arc.ArchiveByte( &m_bLevelSayAnim );
-	arc.ArchiveByte( &m_bNextLevelSayAnim );
-
-	Director.ArchiveString( arc, m_csSayAnim );
-	Director.ArchiveString( arc, m_csUpperAnim );
-
-	m_PainHandler.Archive( arc );
-	m_DeathHandler.Archive( arc );
-	m_AttackHandler.Archive( arc );
-	m_SniperHandler.Archive( arc );
-
-	arc.ArchiveObjectPointer( ( Class ** )&m_NearestNode );
-	arc.ArchiveVector( &m_vNearestNodePos );
-
-	arc.ArchiveFloat( &m_fCrouchWeight );
-	arc.ArchiveFloat( &m_maxspeed );
+    if (m_pAnimThread) {
+        delete m_pAnimThread->GetScriptClass();
+    }
 }
 
-void SimpleActor::SetMoveInfo
-	(
-	mmove_t *
-	)
+void SimpleActor::SetMoveInfo(mmove_t *)
 {
-	OVERLOADED_ERROR();
+    OVERLOADED_ERROR();
 }
 
-void SimpleActor::GetMoveInfo
-(
-mmove_t *
+void SimpleActor::GetMoveInfo(mmove_t *)
+{
+    OVERLOADED_ERROR();
+}
+
+bool SimpleActor::CanSeeFrom(vec3_t pos, Entity *ent)
+{
+    return false;
+}
+
+bool SimpleActor::CanTarget(void)
+{
+    OVERLOADED_ERROR();
+    return false;
+}
+
+bool SimpleActor::IsImmortal(void)
+{
+    OVERLOADED_ERROR();
+    return false;
+}
+
+bool SimpleActor::DoesTheoreticPathExist(Vector vDestPos, float fMaxPath)
+{
+    return m_Path.DoesTheoreticPathExist(origin, vDestPos, this, fMaxPath, NULL, 0);
+}
+
+void SimpleActor::SetPath(
+    Vector vDestPos, const char *description, int iMaxDirtyTime, float *vLeashHome, float fLeashDistSquared
 )
 {
-	OVERLOADED_ERROR();
-}
-
-void SimpleActor::StopAnimating
-	(
-	int slot
-	)
-{
-	int index = 0;
-
-	m_weightType[ slot ] = 0;
-	DoExitCommands( slot );
-
-	if( edict->s.frameInfo[ slot ].index || gi.TIKI_NumAnims( edict->tiki ) <= 1 )
-	{
-		edict->s.frameInfo[ slot ].index = 0;
-	}
-	else
-	{
-		edict->s.frameInfo[ slot ].index = 1;
-	}
-
-	animFlags[ slot ] = ANIM_LOOP | ANIM_NODELTA | ANIM_NOEXIT | ANIM_PAUSED;
-	edict->s.frameInfo[ slot ].weight = 0;
-	animtimes[ slot ] = 0;
-	animFlags[ slot ] = ( animFlags[ slot ] | ANIM_NODELTA ) & ~ANIM_FINISHED;
-}
-
-void SimpleActor::AnimFinished
-	(
-	int slot
-	)
-{
-	assert( !DumpCallTrace("") );
-}
-
-bool SimpleActor::CanTarget
-	(
-	void
-	)
-{
-	OVERLOADED_ERROR();
-	return false;
-}
-
-bool SimpleActor::IsImmortal
-	(
-	void
-	)
-{
-	OVERLOADED_ERROR();
-	return false;
-}
-
-bool SimpleActor::DoesTheoreticPathExist
-	(
-	Vector vDestPos,
-	float fMaxPath
-	)
-{
-	return m_Path.DoesTheoreticPathExist( origin, vDestPos, this, fMaxPath, NULL, 0 );
-}
-
-void SimpleActor::SetPath
-	(
-	Vector vDestPos,
-	const char *description,
-	int iMaxDirtyTime,
-	float *vLeashHome,
-	float fLeashDistSquared
-	)
-{
-	if (!PathExists()
-		|| ( ( level.inttime >= m_Path.Time() + iMaxDirtyTime
-			 || m_Path.Complete(origin) )
-				&& PathGoal() != vDestPos)
-		)
-	{
-		m_Path.FindPath(origin,
-			vDestPos,
-			this,
-			0.0,
-			vLeashHome,
-			fLeashDistSquared);
-
-		if (!PathExists())
-		{
-			if (g_patherror->integer)
-			{
-				if (description)
-				{
-					int thinkState = ((Actor*)this)->m_ThinkState;
-					if (g_patherror->integer == 1 || (g_patherror->integer == 2 && (thinkState == THINKSTATE_IDLE || thinkState == THINKSTATE_CURIOUS)))
-					{
-						if (m_bPathErrorTime + 5000 < level.inttime)
-						{
-							m_bPathErrorTime = level.inttime;
-							Com_Printf(
-								"^~^~^ Path not found in '%s' for (entnum %d, radnum %d, targetname '%s') from (%f %f %f) to (%f %f %f)\n",
-								description,
-								entnum,
-								radnum,
-								targetname.c_str(),
-								origin.x,
-								origin.y,
-								origin.z,
-								vDestPos.x,
-								vDestPos.y,
-								vDestPos.z
-								);
-							Com_Printf("Reason: %s\n", PathSearch::last_error);
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-void SimpleActor::SetPath
-	(
-	SimpleEntity *pDestNode,
-	const char *description,
-	int iMaxDirtyTime
-	)
-{
-	if (pDestNode)
-	{
-		SetPath(
-			pDestNode->origin,
-			description,
-			iMaxDirtyTime,
-			NULL,
-			0.0);
-	}
-	else
-	{
-		if (m_bPathErrorTime + 5000 < level.inttime)
-		{
-			m_bPathErrorTime = level.inttime;
-			Com_Printf(
-				"^~^~^ No destination node specified for '%s' at (%f %f %f)\n",
-				targetname.c_str(),
-				origin.x,
-				origin.y,
-				origin.z);
-		}
-		ClearPath();
-	}
-}
-
-void SimpleActor::SetPathWithinDistance
-	(
-	Vector vDestPos,
-	char *description,
-	float fMaxPath,
-	int iMaxDirtyTime
-	)
-{
-	SetPath(vDestPos, description, iMaxDirtyTime, NULL, 0);
-}
-
-void SimpleActor::FindPathAway
-	(
-	vec_t *vAwayFrom,
-	vec_t *vDirPreferred,
-	float fMinSafeDist
-	)
-{
-	m_Path.FindPathAway(origin, vAwayFrom, vDirPreferred, this, fMinSafeDist, NULL, 0);
-	
-	ShortenPathToAvoidSquadMates();
-}
-
-void SimpleActor::ClearPath
-	(
-	void
-	)
-{
-	m_Path.Clear();
-}
-
-bool SimpleActor::PathComplete
-	(
-	void
-	) const
-{
-	if( level.time >= m_fPathGoalTime )
-	{
-		if( m_Path.Complete( origin ) )
-			return true;
-	}
-
-	return false;
-}
-
-bool SimpleActor::PathExists
-	(
-	void
-	) const
-{
-	return m_Path.CurrentNode() != NULL;
-}
-
-bool SimpleActor::PathIsValid
-	(
-	void
-	) const
-{
-	//Called by SetPath...
-	return true;
-}
-
-bool SimpleActor::PathAvoidsSquadMates
-	(
-	void
-	) const
-{
-	Entity* player;
-	float fDelta;
-	float fDistSoFar;
-	float fDistCap;
-	float vDelta2[2];
-	float vMins[3];
-	float vMaxs[3];
-	float vPos[3];
-	//Sentient *pOther;
-	Sentient *pBuddy[256];
-	int iNumBuddies;
-	int i;
-	//float fRatio;
-
-	if (ai_pathchecktime->value <= 0.0)
-		return true;
-	player = G_GetEntity(0);
-	if (!player)
-	{
-		return true;
-	}
-
-	//player = G_GetEntity(0);
-	//player = G_GetEntity(0);
-	VectorSub2D(player->origin, origin, vDelta2);
-	if (VectorLength2D(vDelta2) > Square(ai_pathcheckdist->value))
-	{
-		return true;
-	}
-
-	fDistCap = (ai_pathchecktime->value * 250.0);
-	fDistSoFar = 0;
-
-	VectorCopy(vMins, CurrentPathNode()->point);
-	VectorCopy(vMaxs, CurrentPathNode()->point);
-	PathInfo *pNode = CurrentPathNode() - 1;
-	
-	while (1)
-	{
-		if (pNode < LastPathNode())
-			break;
-
-		if (fDistSoFar <= fDistCap)
-			break;
-
-		fDelta = fDistCap + 0.001 - fDistSoFar;
-
-		if (pNode->dist < fDelta)
-		{
-			VectorCopy(pNode->point, vPos);
-		}
-		else
-		{
-			VectorSubtract(pNode[1].point, pNode[0].point, vPos);
-			VectorMA(pNode[1].point, fDelta / pNode->dist, vPos, vPos);
-		}
-		
-		if (vPos[0] > vMaxs[0])
-		{
-			vMaxs[0] = vPos[0];
-		}
-		else
-		{
-			if (vPos[0] < vMins[0] )
-			{
-				vMins[0] = vPos[0];
-			}
-		}
-
-		if (vPos[1] > vMaxs[1])
-		{
-			vMaxs[1] = vPos[1];
-		}
-		else
-		{
-			if (vPos[1] < vMins[1])
-			{
-				vMins[1] = vPos[1];
-			}
-		}
-
-		if (vPos[2] > vMaxs[2])
-		{
-			vMaxs[2] = vPos[2];
-		}
-		else
-		{
-			if (vPos[2] < vMins[2])
-			{
-				vMins[2] = vPos[2];
-			}
-		}
-
-		fDistSoFar += fDelta;
-		pNode--;
-	}
-
-	vMins[0] -= 30;
-	vMins[1] -= 30;
-	vMins[2] -= 94;
-
-	vMaxs[0] += 30;
-	vMaxs[1] += 30;
-	vMaxs[2] += 94;
-
-	iNumBuddies = 0;
-	if ((Sentient *)m_pNextSquadMate != this)
-	{
-		do
-		{
-			if (m_pNextSquadMate->origin[0] > vMins[0] && m_pNextSquadMate->origin[0] < vMaxs[0]
-				&& m_pNextSquadMate->origin[1] > vMins[1] && m_pNextSquadMate->origin[1] < vMaxs[1]
-				&& m_pNextSquadMate->origin[2] > vMins[2] && m_pNextSquadMate->origin[2] < vMaxs[2]
-				)
-			{
-				VectorSub2D(m_pNextSquadMate->origin, origin, vDelta2);
-				if (vDelta2[0] <= -32 || vDelta2[0] >= 32 || vDelta2[1] <= -32 || vDelta2[1] >= 32)
-				{
-					if (DotProduct2D(vDelta2, m_pNextSquadMate->velocity) <= 0)
-					{
-						pBuddy[iNumBuddies++] = m_pNextSquadMate;
-					}
-				}
-			}
-		} while ((Sentient *)m_pNextSquadMate != this && iNumBuddies <= 255);
-	}
-
-	if (iNumBuddies == 0)
-	{
-		return true;
-	}
-	float fDist;
-	while (1)
-	{
-		i = 0;
-
-		if (iNumBuddies > 0)
-			break;
-weird_lbl:
-		pNode++;
-
-		VectorCopy2D(pNode->point, vPos);
-		fDist = pNode->dist;
-
-		if (pNode >= CurrentPathNode())
-			return true;
-	}
-	float fDot;
-	while (1)
-	{
-		VectorSub2D(pBuddy[i]->origin, vPos, vDelta2);
-		if (VectorLength2D(vDelta2) <= 900)
-		{
-			return false;
-		}
-		fDot = DotProduct2D(vDelta2, pNode->dir);
-		if (fDot < 0.0 && -fDist <= fDot)
-		{
-			if (Square(CrossProduct2D(vDelta2, pNode->dir)) <= 900)
-			{
-				return false;
-			}
-		}
-		if (++i >= iNumBuddies)
-		{
-			goto weird_lbl;
-		}
-	}
-}
-
-void SimpleActor::ShortenPathToAvoidSquadMates
-	(
-	void
-	)
-{
-	if (PathExists() && !PathComplete())
-	{
-		Vector vBuddyPos;
-		Vector vDelta;
-		Vector vGoal;
-		do 
-		{
-			vGoal = PathGoal();
-			Actor *pSquadMate = (Actor *)m_pNextSquadMate.Pointer();
-			if (pSquadMate == this)
-			{
-				break;
-			}
-
-			while (true)
-			{
-				vGoal = PathGoal();
-				vBuddyPos = pSquadMate->origin;
-				if (pSquadMate->IsSubclassOfActor() && pSquadMate->PathExists())
-				{
-					vBuddyPos = pSquadMate->PathGoal();
-				}
-				vDelta.x = vGoal[0] - vBuddyPos.x;
-				if (vDelta.x >= -15.0 && vDelta.x <= 15.0)
-				{
-					vDelta.y = vGoal[1] - vBuddyPos.y;
-					vDelta.z = vGoal[2] - vBuddyPos.z;
-					
-					if (vDelta.y >= -15.0 && vDelta.y <= 15.0 && vDelta.z >= 0.0 && vDelta.z <= 94.0)
-						break;
-				}
-				pSquadMate = (Actor *)pSquadMate->m_pNextSquadMate.Pointer();
-				if (pSquadMate == this)
-				{
-					return;
-				}
-			}
-			m_Path.Shorten(45.0);
-
-		} while (PathExists());
-	}
-}
-
-PathInfo *SimpleActor::CurrentPathNode
-	(
-	void
-	) const
-{
-	return m_Path.CurrentNode();
-}
-
-PathInfo *SimpleActor::LastPathNode
-	(
-	void
-	) const
-{
-	return m_Path.LastNode();
-}
-
-float SimpleActor::PathDist
-	(
-	void
-	) const
-{
-	return m_Path.TotalDist();
-}
-
-bool SimpleActor::PathHasCompleteLookahead
-	(
-	void
-	) const
-{
-	return m_Path.HasCompleteLookahead();
-}
-
-Vector SimpleActor::PathGoal
-	(
-	void
-	) const
-{
-	return LastPathNode()->point;
-}
+    if (PathExists()) {
+        if (level.inttime < iMaxDirtyTime + m_Path.Time() && !m_Path.Complete(origin)) {
+            // Too soon
+            return;
+        }
+
+        if (PathGoal() == vDestPos && PathIsValid()) {
+            // Still a valid path
+            return;
+        }
+    }
+
+    m_Path.FindPath(origin, vDestPos, this, 0.0, vLeashHome, fLeashDistSquared);
+
+    if (!PathExists()) {
+        if (!g_patherror->integer || !description) {
+            return;
+        }
+
+        if (g_patherror->integer != 1 && g_patherror->integer != 2) {
+            return;
+        }
+
+        if (g_patherror->integer == 2) {
+            int thinkState = static_cast<Actor*>(this)->m_ThinkState;
+            if (thinkState != THINKSTATE_IDLE && thinkState != THINKSTATE_CURIOUS) {
+                return;
+            }
+        }
+
+        if (m_bPathErrorTime + 5000 >= level.inttime) {
+            return;
+        }
+
+        m_bPathErrorTime = level.inttime;
+
+        Com_Printf(
+            "^~^~^ Path not found in '%s' for (entnum %d, radnum %d, targetname '%s') from (%f %f "
+            "%f) to (%f %f %f)\n",
+            description,
+            entnum,
+            radnum,
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z,
+            vDestPos.x,
+            vDestPos.y,
+            vDestPos.z
+        );
+        Com_Printf("Reason: %s\n", PathSearch::last_error);
+    }
+}
 
-float *SimpleActor::PathDelta
-	(
-	void
-	) const
+void SimpleActor::SetPath(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime)
 {
-	return m_Path.CurrentDelta();
+    if (pDestNode) {
+        SetPath(pDestNode->origin, description, iMaxDirtyTime, NULL, 0.0);
+        return;
+    }
+
+    if (m_bPathErrorTime + 5000 < level.inttime) {
+        m_bPathErrorTime = level.inttime;
+        Com_Printf(
+            "^~^~^ No destination node specified for '%s' at (%f %f %f)\n",
+            targetname.c_str(),
+            origin.x,
+            origin.y,
+            origin.z
+        );
+    }
+
+    ClearPath();
 }
 
-bool SimpleActor::PathGoalSlowdownStarted
-	(
-	void
-	) const
-{
-	return m_fPathGoalTime >= level.time;
-}
-
-void SimpleActor::SetDest
-	(
-	vec3_t dest
-	)
-{
-	VectorCopy(dest, m_Dest);
-}
-
-void SimpleActor::StopTurning
-	(
-	void
-	)
-{
-	m_YawAchieved = true;
-}
-
-void SimpleActor::SetDesiredYaw
-	(
-	float yaw
-	)
-{
-	m_YawAchieved = false;
-	m_DesiredYaw = yaw;
-}
-
-void SimpleActor::SetDesiredYawDir
-	(
-	vec3_t vec
-	)
-{
-	m_YawAchieved = false;
-	m_DesiredYaw = vectoyaw(vec);
-}
-
-void SimpleActor::SetDesiredYawDest
-	(
-	vec3_t vec
-	)
-{
-	float facedir[2];
-	VectorSub2D(vec, origin, facedir);
-	if (facedir[0] == 0 || facedir[1] == 0)
-	{
-		m_YawAchieved = false;
-		m_DesiredYaw = vectoyaw(vec);
-	}
-}
-
-void SimpleActor::UpdateEmotion
-	(
-	void
-	)
-{
-	int anim;
-	if (IsDead())
-	{
-		Anim_Emotion(EMOTION_DEAD);
-	}
-
-	anim = GetEmotionAnim();
-
-	if (anim == -1)
-	{
-		Com_Printf(
-			"Failed to set emotion for (entnum %d, radnum %d, targetname '%s'\n",
-			entnum,
-			radnum,
-			targetname.c_str());
-	}
-	else
-	{
-		m_bSayAnimSet = true;
-		StartSayAnimSlot(anim);
-	}
-}
-
-int SimpleActor::GetEmotionAnim
-	(
-	void
-	)
-{
-	const char *emotionanim = NULL;
-	int anim;
-
-	if (m_eEmotionMode)
-	{
-		switch (m_eEmotionMode)
-		{
-		case EMOTION_NEUTRAL:
-		case EMOTION_AIMING:
-			emotionanim = "facial_idle_neutral";
-			break;
-		case EMOTION_WORRY:
-			emotionanim = "facial_idle_worry";
-			break;
-		case EMOTION_PANIC:
-			emotionanim = "facial_idle_panic";
-			break;
-		case EMOTION_FEAR:
-			emotionanim = "facial_idle_fear";
-			break;
-		case EMOTION_DISGUST:
-			emotionanim = "facial_idle_disgust";
-			break;
-		case EMOTION_ANGER:
-			emotionanim = "facial_idle_anger";
-			break;
-		case EMOTION_DETERMINED:
-		case EMOTION_CURIOUS:
-			emotionanim = "facial_idle_determined";
-			break;
-		case EMOTION_DEAD:
-			emotionanim = "facial_idle_dead";
-			break;
-		default:
-
-			char assertStr[16317] = { 0 };
-			strcpy(assertStr, "\"Unknown value for m_EmotionMode in SimpleActor::GetEmotionAnim\"\n\tMessage: ");
-			Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
-			assert(!assertStr);
-			return -1;
-			break;
-		}
-	}
-	else
-	{
-		if (m_csMood == STRING_NERVOUS)
-		{
-			emotionanim = "facial_idle_determined";
-		}
-		else if (m_csMood <= STRING_NERVOUS)
-		{
-			if (m_csMood != STRING_BORED)
-			{
-				assert(!"Unknown value for m_csMood");
-				return -1;
-			}
-			else
-			{
-				emotionanim = "facial_idle_neutral";
-			}
-
-		}
-		else if (m_csMood == STRING_CURIOUS)
-		{
-			emotionanim = "facial_idle_determined";
-		}
-		else if (m_csMood != STRING_ALERT)
-		{
-			assert(!"Unknown value for m_csMood");
-			return -1;
-		}
-		else
-		{
-
-		}
-	}
-
-	if (emotionanim == NULL)
-	{
-		emotionanim = "facial_idle_anger";
-		//assert(!"Unexpected behaviour in SimpleActor::GetEmotionAnim");
-	}
-
-	anim = gi.Anim_NumForName(edict->tiki, emotionanim);
-	if (anim == -1)
-		Com_Printf(
-			"^~^~^ SimpleActor::GetEmotionAnim: unknown animation '%s' in '%s'\n",
-			emotionanim,
-			edict->tiki->a->name);
-	return anim;
-}
-
-int SimpleActor::GetMotionSlot
-	(
-	int slot
-	)
-{
-	if( m_AnimMotionHigh )
-		return slot + 3;
-	else
-		return slot;
-}
-
-int SimpleActor::GetActionSlot
-	(
-	int slot
-	)
-{
-	if( m_AnimActionHigh )
-		return slot + 9;
-	else
-		return slot + 6;
-}
-
-int SimpleActor::GetSaySlot
-	(
-	void
-	)
-{
-	return m_AnimDialogHigh ? 13 : 12;
-}
-
-void SimpleActor::StartCrossBlendAnimSlot
-	(
-	int slot
-	)
-{
-	if (m_weightType[slot] == 1)
-	{
-		m_weightType[slot] = 4;
-	}
-	else
-	{
-		if (m_weightType[slot] < 1)
-			return;
-		if (m_weightType[slot] == 6)
-			m_weightType[slot] = 5;
-		else
-			m_weightType[slot] = 3;
-	}
-	m_weightCrossBlend[slot] = 1.0;
-	m_weightBase[slot] = edict->s.frameInfo[slot].weight;
+void SimpleActor::SetPathWithinDistance(Vector vDestPos, char *description, float fMaxPath, int iMaxDirtyTime)
+{
+    if (PathExists()) {
+        if (level.inttime < iMaxDirtyTime + m_Path.Time()) {
+            // Too soon
+            return;
+        }
+
+        if (!m_Path.Complete(origin)) {
+            // The current path has not complete yet
+            return;
+        }
+
+        if (PathGoal() == vDestPos && PathIsValid()) {
+            // Still a valid path
+            return;
+        }
+    }
+
+    m_Path.FindPath(origin, vDestPos, this, fMaxPath, 0, 0);
+
+    if (!PathExists()) {
+        if (g_patherror->integer && description
+            && (g_patherror->integer
+                || g_patherror->integer == 2
+                       && (static_cast<Actor *>(this)->m_ThinkState == THINKSTATE_IDLE
+                           || static_cast<Actor *>(this)->m_ThinkState == THINKSTATE_CURIOUS)
+                       && m_bPathErrorTime + 5000 < level.inttime)) {
+            m_bPathErrorTime = level.inttime;
+
+            Com_Printf(
+                "^~^~^ Path not found in '%s' for '%s' from (%f %f %f) to (%f %f %f)\n",
+                description,
+                targetname.c_str(),
+                origin.x,
+                origin.y,
+                origin.z,
+                vDestPos.x,
+                vDestPos.y,
+                vDestPos.z
+            );
+            Com_Printf("Reason: %s\n", PathSearch::last_error);
+        }
+    }
+}
+
+void SimpleActor::FindPathAway(vec3_t vAwayFrom, vec2_t vDirPreferred, float fMinSafeDist)
+{
+    m_Path.FindPathAway(origin, vAwayFrom, vDirPreferred, this, fMinSafeDist, NULL, 0);
+
+    ShortenPathToAvoidSquadMates();
+}
+
+void SimpleActor::ClearPath(void)
+{
+    m_Path.Clear();
+}
+
+bool SimpleActor::PathComplete(void) const
+{
+    if (level.time < m_fPathGoalTime) {
+        return false;
+    }
+
+    return m_Path.Complete(origin);
+}
+
+bool SimpleActor::PathExists(void) const
+{
+    return m_Path.CurrentNode() != NULL;
+}
+
+bool SimpleActor::PathIsValid(void) const
+{
+    //Called by SetPath...
+    return true;
+}
+
+bool SimpleActor::PathAvoidsSquadMates(void) const
+{
+    Entity   *player;
+    float     fDelta;
+    float     fDistSoFar;
+    float     fDistCap;
+    vec2_t    vDelta2;
+    vec3_t    vMins, vMaxs;
+    vec3_t    vPos;
+    PathInfo *pNode;
+    Sentient *pOther;
+    Sentient *pBuddy[256];
+    int       iNumBuddies;
+    int       i;
+    float     fRatio;
+
+    if (ai_pathchecktime->value <= 0.0) {
+        return true;
+    }
+
+    player = static_cast<Sentient *>(G_GetEntity(0));
+    if (!player) {
+        return true;
+    }
+
+    VectorSub2D(player->origin, origin, vDelta2);
+    if (VectorLength2D(vDelta2) > Square(ai_pathcheckdist->value)) {
+        return true;
+    }
+
+    pNode = CurrentPathNode();
+    VectorCopy(pNode->point, vMins);
+    VectorCopy(pNode->point, vMaxs);
+
+    fDistCap   = (ai_pathchecktime->value * 250.0);
+    fDistSoFar = 0;
+
+    for (pNode = CurrentPathNode() - 1; pNode >= LastPathNode(); pNode--) {
+        if (fDistSoFar >= fDistCap) {
+            break;
+        }
+
+        fDelta = fDistCap + 0.001 - fDistSoFar;
+
+        if (fDelta > pNode->dist) {
+            VectorCopy(pNode->point, vPos);
+        } else {
+            VectorSubtract(pNode[1].point, pNode[0].point, vPos);
+            VectorMA(pNode[1].point, fDelta / pNode->dist, vPos, vPos);
+        }
+
+        fDistSoFar += fDelta;
+
+        for (i = 0; i < 3; i++) {
+            if (vMaxs[i] < vPos[i]) {
+                vMaxs[i] = vPos[i];
+            } else if (vMins[i] > vPos[i]) {
+                vMins[i] = vPos[i];
+            }
+        }
+    }
+
+    vMins[0] -= 30;
+    vMins[1] -= 30;
+    vMins[2] -= 94;
+
+    vMaxs[0] += 30;
+    vMaxs[1] += 30;
+    vMaxs[2] += 94;
+
+    iNumBuddies = 0;
+    for (pOther = m_pNextSquadMate; pOther != this && iNumBuddies < ARRAY_LEN(pBuddy);
+         pOther = pOther->m_pNextSquadMate) {
+        if (vMins[0] >= pOther->origin[0] || pOther->origin[0] >= vMaxs[0]) {
+            continue;
+        }
+        if (vMins[1] >= pOther->origin[1] || pOther->origin[1] >= vMaxs[1]) {
+            continue;
+        }
+        if (vMins[2] >= pOther->origin[2] || pOther->origin[2] >= vMaxs[2]) {
+            continue;
+        }
+
+        VectorSub2D(pOther->origin, origin, vDelta2);
+        if (vDelta2[0] <= -32 || vDelta2[0] >= 32 || vDelta2[1] <= -32 || vDelta2[1] >= 32) {
+            if (DotProduct2D(vDelta2, pOther->velocity) <= 0) {
+                pBuddy[iNumBuddies++] = pOther;
+            }
+        }
+    }
+
+    if (!iNumBuddies) {
+        // No buddy, can safely avoid
+        return true;
+    }
+
+    do {
+        for (i = 0; i < iNumBuddies; i++) {
+            VectorSub2D(pOther->origin, vPos, vDelta2);
+
+            if (VectorLength2DSquared(vDelta2) <= 900) {
+                return false;
+            }
+
+            fRatio = DotProduct2D(vDelta2, pNode->dir);
+            if (fRatio < 0 && fRatio >= -fDelta) {
+                vec2_t vInvDelta2 = {vDelta2[1], vDelta2[0]};
+
+                if (Square(DotProduct2D(vInvDelta2, pNode->dir)) <= 900) {
+                    return false;
+                }
+            }
+        }
+
+        pNode++;
+
+        VectorCopy2D(pNode->point, vPos);
+        fDelta = pNode->dist;
+    } while (pNode < CurrentPathNode());
+
+    return true;
 }
 
-void SimpleActor::StartMotionAnimSlot
-	(
-	int slot,
-	int anim,
-	float weight
-	)
+void SimpleActor::ShortenPathToAvoidSquadMates(void)
 {
-	int iSlot = GetMotionSlot(slot);
+    if (!PathExists() || PathComplete()) {
+        return;
+    }
 
-	m_weightCrossBlend[iSlot] = 0.0;
-	m_weightType[iSlot] = 1;
-	m_weightBase[iSlot] = weight;
+    Vector    vGoal;
+    Sentient *pBuddy;
 
-	NewAnim(anim, iSlot, 1.0);
-	animFlags[iSlot] |= ANIM_NOACTION;
+retry:
+    vGoal = PathGoal();
 
-	SetTime(iSlot, 0.0);
+    for (pBuddy = m_pNextSquadMate; pBuddy != this; pBuddy = pBuddy->m_pNextSquadMate) {
+        Vector vBuddyPos;
+        Vector vDelta;
 
-	UpdateNormalAnimSlot(iSlot);
+        vBuddyPos = pBuddy->origin;
+        if (pBuddy->IsSubclassOfActor()) {
+            Actor *pBuddyActor = static_cast<Actor *>(pBuddy);
+            if (pBuddyActor->PathExists()) {
+                vBuddyPos = pBuddyActor->PathGoal();
+            }
+        }
+
+        vDelta = vGoal - vBuddyPos;
+
+        if (vDelta.x >= -15 && vDelta.x <= 15 && vDelta.y >= -15 && vDelta.y <= 15 && vDelta.z >= 0 && vDelta.z <= 94) {
+            m_Path.Shorten(45.0);
+
+            if (!PathExists()) {
+                return;
+            }
+
+            goto retry;
+        }
+    }
 }
 
-void SimpleActor::StartAimMotionAnimSlot
-	(
-	int slot,
-	int anim
-	)
+Vector SimpleActor::PathGoal(void) const
 {
-	int iSlot = GetMotionSlot(slot);
+    return m_Path.CurrentPathGoal();
+}
 
-	m_weightCrossBlend[iSlot] = 0.0;
-	m_weightType[iSlot] = 1;
+bool SimpleActor::PathGoalSlowdownStarted(void) const
+{
+    return m_fPathGoalTime >= level.time;
+}
 
-	NewAnim(anim, iSlot, 1.0);
-	animFlags[iSlot] |= ANIM_NOACTION;
+const float *SimpleActor::PathDelta(void) const
+{
+    return m_Path.CurrentDelta();
+}
 
-	SetTime(iSlot, 0.0);
+PathInfo *SimpleActor::CurrentPathNode(void) const
+{
+    return m_Path.CurrentNode();
+}
 
-	UpdateNormalAnimSlot(iSlot);
+PathInfo *SimpleActor::LastPathNode(void) const
+{
+    return m_Path.LastNode();
 }
 
-void SimpleActor::StartActionAnimSlot
-	(
-	int anim
-	)
+float SimpleActor::PathDist(void) const
 {
-	int iSlot = GetActionSlot(0);
+    return m_Path.TotalDist();
+}
 
-	m_weightCrossBlend[iSlot] = 0.0;
-	m_weightType[iSlot] = 2;
-	m_weightBase[iSlot] = 1.0;
+bool SimpleActor::PathHasCompleteLookahead(void) const
+{
+    return m_Path.HasCompleteLookahead();
+}
 
-	NewAnim(anim, iSlot, 1.0);
+void SimpleActor::UpdateEmotion(void)
+{
+    int anim;
 
-	SetTime(iSlot, 0.0);
+    if (deadflag != DEAD_NO) {
+        m_eEmotionMode = EMOTION_DEAD;
+    }
 
-	UpdateNormalAnimSlot(iSlot);
+    anim = GetEmotionAnim();
+
+    if (anim == -1) {
+        Com_Printf(
+            "Failed to set emotion for (entnum %d, radnum %d, targetname '%s'\n", entnum, radnum, TargetName().c_str()
+        );
+        return;
+    }
+
+    m_bSayAnimSet = true;
+    StartSayAnimSlot(anim);
+}
+
+int SimpleActor::GetMotionSlot(int slot)
+{
+    if (m_AnimMotionHigh) {
+        return slot + 3;
+    } else {
+        return slot;
+    }
 }
 
-void SimpleActor::StartSayAnimSlot
-	(
-	int anim
-	)
+void SimpleActor::ChangeMotionAnim(void)
 {
-	int iSlot = GetSaySlot();
+    int slot;
+    int lastMotionSlot;
+    int firstMotionSlot;
+
+    m_bMotionAnimSet   = false;
+    m_iMotionSlot      = -1;
+    m_bLevelMotionAnim = false;
+
+    if (m_ChangeMotionAnimIndex != level.frame_skel_index) {
+        m_ChangeMotionAnimIndex = level.frame_skel_index;
+
+        firstMotionSlot = GetMotionSlot(0);
+        lastMotionSlot  = firstMotionSlot + 3;
+
+        MPrintf("Swapping motion channels....\n");
+        for (slot = firstMotionSlot; slot < lastMotionSlot; slot++) {
+            StartCrossBlendAnimSlot(slot);
+
+            // Added in 2.0
+            //  Don't lerp animations
+            if (edict->s.eFlags & EF_NO_LERP) {
+                m_weightCrossBlend[slot] = 0;
+                m_weightBase[slot]       = 0;
+                // Next animation should lerp
+                edict->s.eFlags &= ~EF_NO_LERP;
+            }
+        }
+
+        m_AnimMotionHigh = !m_AnimMotionHigh;
+    }
 
-	m_weightCrossBlend[iSlot] = 0.0;
-	m_weightType[iSlot] = 6;
-	m_weightBase[iSlot] = 1.0;
+    firstMotionSlot = GetMotionSlot(0);
+    lastMotionSlot  = firstMotionSlot + 3;
 
-	NewAnim(anim, iSlot, 1.0);
-	animFlags[iSlot] |= ANIM_NOACTION;
+    for (slot = firstMotionSlot; slot < lastMotionSlot; slot++) {
+        StopAnimating(slot);
+    }
+}
 
-	SetTime(iSlot, 0.0);
-	UpdateSayAnimSlot(iSlot);
+int SimpleActor::GetActionSlot(int slot)
+{
+    if (m_AnimActionHigh) {
+        return slot + 9;
+    } else {
+        return slot + 6;
+    }
 }
 
-void SimpleActor::StartAimAnimSlot
-	(
-	int slot,
-	int anim
-	)
+void SimpleActor::ChangeActionAnim(void)
 {
-	int iSlot = GetActionSlot(slot);
+    int slot;
+    int firstActionSlot;
+    int lastActionSlot;
+
+    m_bAimAnimSet      = false;
+    m_bActionAnimSet   = false;
+    m_iActionSlot      = -1;
+    m_bLevelActionAnim = false;
+
+    if (m_ChangeActionAnimIndex != level.frame_skel_index) {
+        m_ChangeActionAnimIndex = level.frame_skel_index;
+
+        firstActionSlot = GetActionSlot(0);
+        lastActionSlot  = firstActionSlot + 3;
+
+        MPrintf("Swapping action channels....\n");
 
-	m_weightCrossBlend[iSlot] = 0.0;
-	m_weightType[iSlot] = 7;
+        for (slot = firstActionSlot; slot < lastActionSlot; slot++) {
+            animFlags[slot] |= ANIM_NOACTION;
+            StartCrossBlendAnimSlot(slot);
+        }
 
-	NewAnim(anim, iSlot, 1.0);
+        m_AnimActionHigh = !m_AnimActionHigh; // toggle
+    }
 
-	SetTime(iSlot, 0.0);
+    firstActionSlot = GetActionSlot(0);
+    lastActionSlot  = firstActionSlot + 3;
 
-	UpdateNormalAnimSlot(iSlot);
+    for (slot = firstActionSlot; slot < lastActionSlot; slot++) {
+        StopAnimating(slot);
+    }
 }
 
-void SimpleActor::SetBlendedWeight
-	(
-	int slot
-	)
+int SimpleActor::GetSaySlot(void)
 {
-	m_bUpdateAnimDoneFlags |= 1 << slot;
-	if (m_weightCrossBlend[slot] < 1.0)
-	{
-		edict->s.frameInfo[slot].weight = (3.0 - m_weightCrossBlend[slot] - m_weightCrossBlend[slot])
-			* Square(m_weightCrossBlend[slot])
-			* m_weightBase[slot];
-	}
-	else
-	{
-		m_weightCrossBlend[slot] = 1.0;
-		edict->s.frameInfo[slot].weight = m_weightBase[slot];
-	}
+    return m_AnimDialogHigh ? 13 : 12;
 }
 
-void SimpleActor::EventSetAnimLength
-	(
-	Event *ev
-	)
+void SimpleActor::ChangeSayAnim(void)
 {
-	int slot;
-	float length;
-	
-	if (ev->NumArgs() != 1)
-	{
-		ScriptError("bad number of arguments");
-	}
+    m_bSayAnimSet   = false;
+    m_iVoiceTime    = level.inttime;
+    m_iSaySlot      = -1;
+    m_bLevelSayAnim = false;
 
-	length = ev->GetFloat(1);
+    if (m_ChangeSayAnimIndex != level.frame_skel_index) {
+        m_ChangeSayAnimIndex = level.frame_skel_index;
 
-	if (length <= 0)
-	{
-		ScriptError("Positive lengths only allowed");
-	}
+        MPrintf("Swapping dialog channel....\n");
 
-	if (m_bMotionAnimSet)
-	{
-		ScriptError("Must set anim before length");
-	}
+        StartCrossBlendAnimSlot(GetSaySlot());
 
-	slot = GetMotionSlot(0);
+        m_AnimDialogHigh = !m_AnimDialogHigh; // toggle
+    }
 
-	if (animFlags[slot] & ANIM_LOOP)
-	{
-		gi.Anim_Frametime(edict->tiki, edict->s.frameInfo[slot].index);
+    StopAnimating(GetSaySlot());
+}
 
-		animFlags[slot] = (animFlags[slot] | ANIM_NODELTA) & ~ANIM_FINISHED;
+void SimpleActor::StopAnimating(int slot)
+{
+    int index = 0;
 
-		animtimes[slot] = Square(gi.Anim_NumFrames(edict->tiki, edict->s.frameInfo[slot].index) - 1);
+    m_weightType[slot] = ANIM_WEIGHT_NONE;
+    DoExitCommands(slot);
 
-		SetOnceType(slot);
-	}
+    if (edict->s.frameInfo[slot].index || gi.TIKI_NumAnims(edict->tiki) <= 1) {
+        edict->s.frameInfo[slot].index = 0;
+    } else {
+        edict->s.frameInfo[slot].index = 1;
+    }
 
-	SetSyncTime(0);
+    animFlags[slot] = ANIM_LOOP | ANIM_NODELTA | ANIM_NOEXIT | ANIM_PAUSED;
+    SetWeight(slot, 0);
 
-	if (length > animtimes[slot])
-	{
-		ScriptError("cannot lengthen animation which has length %f", animtimes[slot]);
-	}
-	
-	animtimes[slot] = length;
-	animFlags[slot] = (animFlags[slot] | ANIM_NODELTA) & ~ANIM_FINISHED;
+    animtimes[slot] = 0;
+    SlotChanged(slot);
 }
 
-void SimpleActor::UpdateNormalAnimSlot
-	(
-	int slot
-	)
+void SimpleActor::EventSetAnimLength(Event *ev)
 {
-	m_weightCrossBlend[slot] += m_fCrossblendTime == 0.0 ? 1.0 : level.frametime / m_fCrossblendTime;
+    int   slot;
+    float length;
+
+    if (ev->NumArgs() != 1) {
+        ScriptError("bad number of arguments");
+    }
+
+    length = ev->GetFloat(1);
+
+    if (length <= 0) {
+        ScriptError("Positive lengths only allowed");
+    }
 
-	SetBlendedWeight(slot);
+    if (!m_bMotionAnimSet) {
+        ScriptError("Must set anim before length");
+    }
+
+    slot = GetMotionSlot(0);
+
+    if (IsRepeatType(slot) && edict->tiki) {
+        int numframes;
+
+        numframes       = gi.Anim_NumFrames(edict->tiki, edict->s.frameInfo[slot].index);
+        animtimes[slot] = gi.Anim_Frametime(edict->tiki, edict->s.frameInfo[slot].index) * numframes;
+
+        SlotChanged(slot);
+        SetOnceType(slot);
+    }
+
+    SetSyncTime(0);
+
+    if (length > animtimes[slot]) {
+        ScriptError("cannot lengthen animation which has length %f", animtimes[slot]);
+    }
+
+    animtimes[slot] = length;
+    SlotChanged(slot);
 }
 
-void SimpleActor::UpdateCrossBlendAnimSlot
-	(
-	int slot
-	)
-{
-	m_weightCrossBlend[slot] -= m_fCrossblendTime == 0.0 ? 1.0 : level.frametime / m_fCrossblendTime;
+void SimpleActor::EventSetCrossblendTime(Event *ev)
+{
+    m_fCrossblendTime = ev->GetFloat(1);
+}
 
-	if (m_weightCrossBlend[slot] > 0.0)
-	{
-		SetBlendedWeight(slot);
-	}
-	else
-	{
-		m_weightType[slot] = 8;
-		edict->s.frameInfo[slot].weight = 0.0;
-	}
-}
-
-void SimpleActor::UpdateCrossBlendDialogAnimSlot
-	(
-	int slot
-	)
-{
-	m_weightCrossBlend[slot] -= m_iSaySlot < 0 ? level.frametime + level.frametime : level.frametime / 0.1;
-
-	if (m_weightCrossBlend[slot] > 0.0)
-	{
-		SetBlendedWeight(slot);
-	}
-	else
-	{
-		m_weightType[slot] = 8;
-		edict->s.frameInfo[slot].weight = 0.0;
-	}
-}
-
-void SimpleActor::UpdateSayAnimSlot
-	(
-	int slot
-	)
-{
-	m_weightCrossBlend[slot] += m_iSaySlot < 0 ? level.frametime + level.frametime : level.frametime / 0.1;
-
-	SetBlendedWeight(slot);
-}
-
-void SimpleActor::UpdateLastFrameSlot
-	(
-	int slot
-	)
-{
-	StopAnimating(slot);
+void SimpleActor::EventGetCrossblendTime(Event *ev)
+{
+    ev->AddFloat(m_fCrossblendTime);
 }
 
-void SimpleActor::UpdateAnimSlot
-	(
-	int slot
-	)
-{
-	int weightType = m_weightType[slot];
-	switch (weightType)
-	{
-	case 0:
-		break;
-	case 1:
-	case 2:
-	case 7:
-		UpdateNormalAnimSlot(slot);
-		break;
-	case 3:
-	case 4:
-		UpdateCrossBlendAnimSlot(slot);
-		break;
-	case 5:
-		UpdateCrossBlendDialogAnimSlot(slot);
-		break;
-	case 6:
-		UpdateSayAnimSlot(slot);
-		break;
-	case 8:
-		UpdateLastFrameSlot(slot);
-		break;
-	default:
-		assert(weightType && !"impleActor::UpdateAnimSlot: Bad weight type.");
-		break;
-	}
-}
-
-void SimpleActor::StopAllAnimating
-	(
-	void
-	)
-{
-	SetSyncTime(0);
-
-	for (int slot = 0; slot < MAX_FRAMEINFOS; slot++)
-	{
-		StopAnimating(slot);
-	}
-}
-
-void SimpleActor::ChangeMotionAnim
-	(
-	void
-	)
-{
-	//int lastMotionSlot;
-	//int firstMotionSlot;
-	int iSlot;
-	int i;
-
-	m_bMotionAnimSet = false;
-	m_iMotionSlot = -1;
-	m_bLevelMotionAnim = false;
-
-	if (m_ChangeMotionAnimIndex != level.frame_skel_index)
-	{
-		m_ChangeMotionAnimIndex = level.frame_skel_index;
-
-		MPrintf("Swapping motion channels....\n");
-		for (iSlot = GetMotionSlot(0), i = 0; i < 3; i++, iSlot++)
-		{
-			StartCrossBlendAnimSlot(iSlot);
-		}
-		m_AnimDialogHigh = !m_AnimDialogHigh;
-
-	}
-	
-	for (iSlot = GetMotionSlot(0), i = 0; i < 3; i++, iSlot++)
-	{
-		StopAnimating(iSlot);
-	}
-}
-
-void SimpleActor::ChangeActionAnim
-	(
-	void
-	)
-{
-	int iSlot;
-	int i;
-
-	m_bAimAnimSet = false;
-	m_bActionAnimSet = false;
-	m_iActionSlot = -1;
-	m_bLevelActionAnim = false;
-
-
-	if (m_ChangeActionAnimIndex != level.frame_skel_index)
-	{
-		m_ChangeActionAnimIndex = level.frame_skel_index;
-
-		MPrintf("Swapping action channels....\n");
-
-		iSlot = GetActionSlot(0);
-		for (i = iSlot; i < iSlot + 3; i++)
-		{
-			animFlags[i] |= ANIM_NOACTION;
-			StartCrossBlendAnimSlot(i);
-		}
-		m_AnimDialogHigh = !m_AnimDialogHigh; // toggle
-	}
-
-	iSlot = GetActionSlot(0);
-	for (i = iSlot; i < iSlot + 3; i++)
-	{
-		StopAnimating(iSlot);
-	}
-}
-
-void SimpleActor::ChangeSayAnim
-	(
-	void
-	)
-{
-	int iSlot; 
-
-	m_bSayAnimSet = false;
-	m_bLevelSayAnim = 0;
-	m_iVoiceTime = level.inttime;
-	m_iSaySlot = -1;
+void SimpleActor::StartCrossBlendAnimSlot(int slot)
+{
+    if (m_weightType[slot] == ANIM_WEIGHT_NONE) {
+        return;
+    }
 
-	if (m_ChangeSayAnimIndex != level.frame_skel_index)
-	{
-		m_ChangeSayAnimIndex = level.frame_skel_index;
-		
-		MPrintf("Swapping dialog channel....\n");
-		
-		iSlot = GetSaySlot();
-		StartCrossBlendAnimSlot(iSlot);
+    switch (m_weightType[slot]) {
+    case ANIM_WEIGHT_MOTION:
+        m_weightType[slot] = ANIM_WEIGHT_CROSSBLEND_2;
+        break;
+    case ANIM_WEIGHT_SAY:
+        m_weightType[slot] = ANIM_WEIGHT_CROSSBLEND_DIALOG;
+        break;
+    default:
+        m_weightType[slot] = ANIM_WEIGHT_CROSSBLEND_1;
+        break;
+    }
 
-		m_AnimDialogHigh = !m_AnimDialogHigh; // toggle
-	}
+    m_weightCrossBlend[slot] = 1.0;
+    m_weightBase[slot]       = GetWeight(slot);
+}
+
+void SimpleActor::StartMotionAnimSlot(int slot, int anim, float weight)
+{
+    slot = GetMotionSlot(slot);
 
-	iSlot = GetSaySlot();
-	StopAnimating(iSlot);
-}
-
-void SimpleActor::UpdateAim
-	(
-	void
-	)
-{
-	float dir;
-
-	int aimForwardSlot;
-	int aimUpSlot;
-	int aimDownSlot;
-
-	if (m_bAimAnimSet)
-	{
-		dir = AngleNormalize180(-m_DesiredGunDir[0]);
-
-		aimForwardSlot = GetActionSlot(0);
-		aimUpSlot = aimForwardSlot + 1;
-		aimDownSlot = aimForwardSlot + 2;
-
-
-		float factor;
-		if (dir < 0)
-		{
-			if (dir < m_fAimLimit_down)
-				dir = m_fAimLimit_down;
-
-			factor = dir / m_fAimLimit_down;
-
-			m_weightBase[aimForwardSlot] = 0;
-			m_weightBase[aimUpSlot] = 1 - factor;
-			m_weightBase[aimDownSlot] = factor;
-		}
-		else
-		{
-			if (dir > m_fAimLimit_up)
-				dir = m_fAimLimit_up;
-
-			factor = dir / m_fAimLimit_up;
-
-			m_weightBase[aimForwardSlot] = factor;
-			m_weightBase[aimUpSlot] = 1 - factor;
-			m_weightBase[aimDownSlot] = 0;
-
-		}
-		SetControllerAngles(TORSO_TAG, vec_origin);
-	}
-}
-
-void SimpleActor::UpdateAimMotion
-	(
-	void
-	)
-{
-	int slot = GetMotionSlot(0);
-
-	if (m_fCrouchWeight < 0.0)
-	{
-		m_weightBase[slot] = 0.0;
-		m_weightBase[slot + 1] = m_fCrouchWeight + 1.0;
-		m_weightBase[slot + 2] = -m_fCrouchWeight;
-	}
-	else
-	{
-		m_weightBase[slot] = m_fCrouchWeight;
-		m_weightBase[slot + 1] = 1.0 - m_fCrouchWeight;
-		m_weightBase[slot + 2] = 0.0;
-	}
-}
-
-void SimpleActor::EventAIOn
-	(
-	Event *ev
-	)
-{
-	m_bDoAI = true;
-}
-
-void SimpleActor::EventAIOff
-	(
-	Event *ev
-	)
-{
-	m_bDoAI = false;
-}
-
-void SimpleActor::EventGetWeaponGroup
-	(
-	Event *ev
-	)
-{
-	const_str csWeaponGroup;
-	Weapon *weapon = GetActiveWeapon(WEAPON_MAIN);
-	if (!weapon)
-	{
-		csWeaponGroup = STRING_UNARMED;
-	}
-	else 
-	{
-		csWeaponGroup = weapon->GetWeaponGroup();
-		if (csWeaponGroup == STRING_EMPTY)
-		{
-			csWeaponGroup = STRING_UNARMED;
-		}
-	}
-	ev->AddConstString(csWeaponGroup);
-}
-
-void SimpleActor::EventGetWeaponType
-	(
-	Event *ev
-	)
-{
-	Weapon *weapon;
-	const_str csWeaponType;
-
-	if (!m_pTurret)
-	{
-		weapon = GetActiveWeapon(WEAPON_MAIN);
-	}
-
-	if (!weapon)
-	{
-		csWeaponType = STRING_RIFLE;
-	}
-	else
-	{
-		int iWeaponClass = weapon->GetWeaponClass();
-
-		switch (iWeaponClass)
-		{
-		case WEAPON_CLASS_PISTOL:
-			csWeaponType = STRING_PISTOL;
-			break;
-		case WEAPON_CLASS_RIFLE:
-			csWeaponType = STRING_RIFLE;
-			break;
-		case WEAPON_CLASS_SMG:
-			csWeaponType = STRING_SMG;
-			break;
-		case WEAPON_CLASS_MG:
-			csWeaponType = STRING_MG;
-			break;
-		case WEAPON_CLASS_GRENADE:
-			csWeaponType = STRING_GRENADE;
-			break;
-		case WEAPON_CLASS_HEAVY:
-			csWeaponType = STRING_HEAVY;
-			break;
-		case WEAPON_CLASS_CANNON:
-			csWeaponType = STRING_CANNON;
-			break;
-		case WEAPON_CLASS_ITEM:
-			csWeaponType = STRING_ITEM;
-			break;
-		case WEAPON_CLASS_ITEM2:
-			csWeaponType = STRING_ITEM2;
-			break;
-		case WEAPON_CLASS_ITEM3:
-			csWeaponType = STRING_ITEM3;
-			break;
-		case WEAPON_CLASS_ITEM4:
-			csWeaponType = STRING_ITEM4;
-			break;
-		default:
-			csWeaponType = STRING_EMPTY;
-			break;
-		}
-
-	}
-
-	ev->AddConstString(csWeaponType);
-}
-
-void SimpleActor::EventGetPainHandler
-	(
-	Event *ev
-	)
-{
-	ScriptVariable var;
-	
-	m_PainHandler.GetScriptValue(&var);
-
-	ev->AddValue(var);
-}
-
-void SimpleActor::EventSetPainHandler
-	(
-	Event *ev
-	)
-{
-	if (ev->IsFromScript())
-	{
-		ScriptVariable var = ev->GetValue(1);
-		
-		m_PainHandler.SetScript(var);
-	}
-	else
-	{
-		str varString = ev->GetString(1);
-		m_PainHandler.SetScript(varString);
-	}
-}
-
-void SimpleActor::EventGetDeathHandler
-	(
-	Event *ev
-	)
-{
-	ScriptVariable var;
-
-	m_DeathHandler.GetScriptValue(&var);
-
-	ev->AddValue(var);
-}
-
-void SimpleActor::EventSetDeathHandler
-	(
-	Event *ev
-	)
-{
-	if (ev->IsFromScript())
-	{
-		ScriptVariable var = ev->GetValue(1);
-
-		m_DeathHandler.SetScript(var);
-	}
-	else
-	{
-		str varString = ev->GetString(1);
-		m_DeathHandler.SetScript(varString);
-	}
-}
-
-void SimpleActor::EventGetAttackHandler
-	(
-	Event *ev
-	)
-{
-	ScriptVariable var;
-
-	m_AttackHandler.GetScriptValue(&var);
-
-	ev->AddValue(var);
-}
-
-void SimpleActor::EventSetAttackHandler
-	(
-	Event *ev
-	)
-{
-	if (ev->IsFromScript())
-	{
-		ScriptVariable var = ev->GetValue(1);
-
-		m_AttackHandler.SetScript(var);
-	}
-	else
-	{
-		str varString = ev->GetString(1);
-		m_AttackHandler.SetScript(varString);
-	}
-}
+    m_weightType[slot]       = ANIM_WEIGHT_MOTION;
+    m_weightCrossBlend[slot] = 0.0;
+    m_weightBase[slot]       = weight;
+    NewAnim(anim, slot, 1.0);
+
+    animFlags[slot] |= ANIM_NOACTION;
+    RestartAnimSlot(slot);
+    UpdateNormalAnimSlot(slot);
+}
 
-void SimpleActor::EventGetSniperHandler
-	(
-	Event *ev
-	)
+void SimpleActor::StartAimMotionAnimSlot(int slot, int anim)
 {
-	ScriptVariable var;
+    slot = GetMotionSlot(slot);
 
-	m_SniperHandler.GetScriptValue(&var);
+    m_weightType[slot]       = ANIM_WEIGHT_MOTION;
+    m_weightCrossBlend[slot] = 0.0;
+    NewAnim(anim, slot, 1.0);
 
-	ev->AddValue(var);
-}
-
-void SimpleActor::EventSetSniperHandler
-	(
-	Event *ev
-	)
+    animFlags[slot] |= ANIM_NOACTION;
+    RestartAnimSlot(slot);
+    UpdateNormalAnimSlot(slot);
+}
+
+void SimpleActor::StartActionAnimSlot(int anim)
 {
-	if (ev->IsFromScript())
-	{
-		ScriptVariable var = ev->GetValue(1);
+    int slot = GetActionSlot(0);
+
+    m_weightType[slot]       = ANIM_WEIGHT_ACTION;
+    m_weightCrossBlend[slot] = 0.0;
+    m_weightBase[slot]       = 1.0;
+    NewAnim(anim, slot, 1.0);
 
-		m_SniperHandler.SetScript(var);
-	}
-	else
-	{
-		str varString = ev->GetString(1);
-		m_SniperHandler.SetScript(varString);
-	}
+    RestartAnimSlot(slot);
+    UpdateNormalAnimSlot(slot);
 }
 
-void SimpleActor::EventSetCrossblendTime
-	(
-	Event *ev
-	)
+void SimpleActor::StartSayAnimSlot(int anim)
 {
-	m_fCrossblendTime = ev->GetFloat(1);
+    int slot = GetSaySlot();
+
+    m_weightType[slot]       = ANIM_WEIGHT_SAY;
+    m_weightCrossBlend[slot] = 0.0;
+    m_weightBase[slot]       = 1.0;
+    NewAnim(anim, slot, 1.0);
+
+    animFlags[slot] |= ANIM_NOACTION;
+    RestartAnimSlot(slot);
+    UpdateNormalAnimSlot(slot);
 }
 
-void SimpleActor::EventGetCrossblendTime
-	(
-	Event *ev
-	)
+void SimpleActor::StartAimAnimSlot(int slot, int anim)
 {
-	ev->AddFloat(m_fCrossblendTime);
+    slot = GetActionSlot(slot);
+
+    m_weightType[slot]       = ANIM_WEIGHT_AIM;
+    m_weightCrossBlend[slot] = 0.0;
+    NewAnim(anim, slot, 1.0);
+
+    RestartAnimSlot(slot);
+    UpdateNormalAnimSlot(slot);
+}
+
+void SimpleActor::SetBlendedWeight(int slot)
+{
+    m_bUpdateAnimDoneFlags |= 1 << slot;
+
+    if (m_weightCrossBlend[slot] < 1.0) {
+        float w;
+
+        w = (3.0 - m_weightCrossBlend[slot] - m_weightCrossBlend[slot]) * Square(m_weightCrossBlend[slot]);
+        SetWeight(slot, m_weightBase[slot] * w);
+    } else {
+        m_weightCrossBlend[slot] = 1.0;
+        SetWeight(slot, m_weightBase[slot]);
+    }
+}
+
+void SimpleActor::UpdateNormalAnimSlot(int slot)
+{
+    if (m_fCrossblendTime) {
+        m_weightCrossBlend[slot] += level.frametime / m_fCrossblendTime;
+    } else {
+        m_weightCrossBlend[slot] += 1.f;
+    }
+    SetBlendedWeight(slot);
+}
+
+void SimpleActor::UpdateCrossBlendAnimSlot(int slot)
+{
+    if (m_fCrossblendTime) {
+        m_weightCrossBlend[slot] -= level.frametime / m_fCrossblendTime;
+    } else {
+        m_weightCrossBlend[slot] -= 1.f;
+    }
+
+    if (m_weightCrossBlend[slot] > 0) {
+        SetBlendedWeight(slot);
+    } else {
+        m_weightType[slot] = ANIM_WEIGHT_LASTFRAME;
+        SetWeight(slot, 0);
+    }
+}
+
+void SimpleActor::UpdateCrossBlendDialogAnimSlot(int slot)
+{
+    if (m_iSaySlot >= 0) {
+        m_weightCrossBlend[slot] -= level.frametime / 0.1f;
+    } else {
+        m_weightCrossBlend[slot] -= level.frametime / 0.5f;
+    }
+
+    if (m_weightCrossBlend[slot] > 0.0) {
+        SetBlendedWeight(slot);
+    } else {
+        m_weightType[slot] = ANIM_WEIGHT_LASTFRAME;
+        SetWeight(slot, 0);
+    }
+}
+
+void SimpleActor::UpdateSayAnimSlot(int slot)
+{
+    if (m_iSaySlot >= 0) {
+        m_weightCrossBlend[slot] += level.frametime / 0.1f;
+    } else {
+        m_weightCrossBlend[slot] += level.frametime / 0.5f;
+    }
+
+    SetBlendedWeight(slot);
+}
+
+void SimpleActor::UpdateLastFrameSlot(int slot)
+{
+    StopAnimating(slot);
+}
+
+void SimpleActor::UpdateAnimSlot(int slot)
+{
+    switch (m_weightType[slot]) {
+    case ANIM_WEIGHT_NONE:
+        break;
+    case ANIM_WEIGHT_MOTION:
+    case ANIM_WEIGHT_ACTION:
+    case ANIM_WEIGHT_AIM:
+        UpdateNormalAnimSlot(slot);
+        break;
+    case ANIM_WEIGHT_CROSSBLEND_1:
+    case ANIM_WEIGHT_CROSSBLEND_2:
+        UpdateCrossBlendAnimSlot(slot);
+        break;
+    case ANIM_WEIGHT_CROSSBLEND_DIALOG:
+        UpdateCrossBlendDialogAnimSlot(slot);
+        break;
+    case ANIM_WEIGHT_SAY:
+        UpdateSayAnimSlot(slot);
+        break;
+    case ANIM_WEIGHT_LASTFRAME:
+        UpdateLastFrameSlot(slot);
+        break;
+    default:
+        assert(!"SimpleActor::UpdateAnimSlot: Bad weight type.");
+        break;
+    }
+}
+
+void SimpleActor::StopAllAnimating(void)
+{
+    SetSyncTime(0);
+
+    for (int slot = 0; slot < MAX_FRAMEINFOS; slot++) {
+        StopAnimating(slot);
+    }
+}
+
+void SimpleActor::UpdateAim(void)
+{
+    int   aimUpSlot;
+    int   aimForwardSlot;
+    int   aimDownSlot;
+    float dir;
+
+    if (m_bAimAnimSet) {
+        aimForwardSlot = GetActionSlot(0);
+        aimUpSlot      = aimForwardSlot + 1;
+        aimDownSlot    = aimForwardSlot + 2;
+        dir            = -m_DesiredGunDir[0];
+
+        if (dir > 180) {
+            dir -= 360;
+        } else if (dir < -180) {
+            dir += 360;
+        }
+
+        if (dir < 0) {
+            if (dir < m_fAimLimit_down) {
+                dir = m_fAimLimit_down;
+            }
+
+            m_weightBase[aimForwardSlot] = 0;
+            m_weightBase[aimUpSlot]      = 1 - dir / m_fAimLimit_down;
+            m_weightBase[aimDownSlot]    = dir / m_fAimLimit_down;
+        } else {
+            if (dir > m_fAimLimit_up) {
+                dir = m_fAimLimit_up;
+            }
+
+            m_weightBase[aimForwardSlot] = dir / m_fAimLimit_up;
+            m_weightBase[aimUpSlot]      = 1 - dir / m_fAimLimit_up;
+            m_weightBase[aimDownSlot]    = 0;
+        }
+
+        SetControllerAngles(TORSO_TAG, vec_origin);
+    }
+}
+
+void SimpleActor::UpdateAimMotion(void)
+{
+    if (m_fCrouchWeight < 0.0) {
+        m_weightBase[GetMotionSlot(0)] = 0.0;
+        m_weightBase[GetMotionSlot(1)] = m_fCrouchWeight + 1.0;
+        m_weightBase[GetMotionSlot(2)] = -m_fCrouchWeight;
+    } else {
+        m_weightBase[GetMotionSlot(0)] = m_fCrouchWeight;
+        m_weightBase[GetMotionSlot(1)] = 1.0 - m_fCrouchWeight;
+        m_weightBase[GetMotionSlot(2)] = 0.0;
+    }
+}
+
+void SimpleActor::EventGetPosition(Event *ev)
+{
+    ev->AddConstString(m_csCurrentPosition);
+}
+
+void SimpleActor::EventSetPosition(Event *ev)
+{
+    m_csCurrentPosition = ev->GetConstString(1);
+}
+
+void SimpleActor::EventSetEmotion(Event *ev)
+{
+    switch (ev->GetConstString(1)) {
+    case STRING_EMOTION_NONE:
+        Anim_Emotion(EMOTION_NONE);
+        break;
+    case STRING_EMOTION_NEUTRAL:
+        Anim_Emotion(EMOTION_NEUTRAL);
+        break;
+    case STRING_EMOTION_WORRY:
+        Anim_Emotion(EMOTION_WORRY);
+        break;
+    case STRING_EMOTION_PANIC:
+        Anim_Emotion(EMOTION_PANIC);
+        break;
+    case STRING_EMOTION_FEAR:
+        Anim_Emotion(EMOTION_FEAR);
+        break;
+    case STRING_EMOTION_DISGUST:
+        Anim_Emotion(EMOTION_DISGUST);
+        break;
+    case STRING_EMOTION_ANGER:
+        Anim_Emotion(EMOTION_ANGER);
+        break;
+    case STRING_EMOTION_AIMING:
+        Anim_Emotion(EMOTION_AIMING);
+        break;
+    case STRING_EMOTION_DETERMINED:
+        Anim_Emotion(EMOTION_DETERMINED);
+        break;
+    case STRING_EMOTION_DEAD:
+        Anim_Emotion(EMOTION_DEAD);
+        break;
+    case STRING_EMOTION_CURIOUS:
+        Anim_Emotion(EMOTION_CURIOUS);
+        break;
+    default:
+        assert(!"Unknown emotion mode specified in script.");
+        break;
+    }
+}
+
+int SimpleActor::GetEmotionAnim(void)
+{
+    const char *emotionanim = NULL;
+    int         anim;
+
+    if (m_eEmotionMode) {
+        switch (m_eEmotionMode) {
+        case EMOTION_NEUTRAL:
+            emotionanim = "facial_idle_neutral";
+            break;
+        case EMOTION_WORRY:
+            emotionanim = "facial_idle_worry";
+            break;
+        case EMOTION_PANIC:
+            emotionanim = "facial_idle_panic";
+            break;
+        case EMOTION_FEAR:
+            emotionanim = "facial_idle_fear";
+            break;
+        case EMOTION_DISGUST:
+            emotionanim = "facial_idle_disgust";
+            break;
+        case EMOTION_ANGER:
+            emotionanim = "facial_idle_anger";
+            break;
+        case EMOTION_AIMING:
+            emotionanim = "facial_idle_neutral";
+            break;
+        case EMOTION_DETERMINED:
+            emotionanim = "facial_idle_determined";
+            break;
+        case EMOTION_DEAD:
+            emotionanim = "facial_idle_dead";
+            break;
+        case EMOTION_CURIOUS:
+            emotionanim = "facial_idle_determined";
+            break;
+        default:
+
+            char assertStr[16317] = {0};
+            Q_strncpyz(assertStr, "\"Unknown value for m_EmotionMode in SimpleActor::GetEmotionAnim\"\n\tMessage: ", sizeof(assertStr));
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
+            assert(!assertStr);
+            return -1;
+            break;
+        }
+    } else {
+        switch (m_csMood) {
+        case STRING_NERVOUS:
+            emotionanim = "facial_idle_determined";
+            break;
+        case STRING_CURIOUS:
+            emotionanim = "facial_idle_determined";
+            break;
+        case STRING_ALERT:
+            emotionanim = "facial_idle_anger";
+            break;
+        case STRING_BORED:
+            emotionanim = "facial_idle_neutral";
+            break;
+        default:
+
+            char assertStr[16317] = {0};
+            Q_strncpyz(assertStr, "\"Unknown value for m_csMood in SimpleActor::GetEmotionAnim\"\n\tMessage: ", sizeof(assertStr));
+            Q_strcat(assertStr, sizeof(assertStr), DumpCallTrace(""));
+            assert(!assertStr);
+            return -1;
+            break;
+        }
+    }
+
+    assert(emotionanim);
+
+    anim = gi.Anim_NumForName(edict->tiki, emotionanim);
+    if (anim == -1) {
+        Com_Printf(
+            "^~^~^ SimpleActor::GetEmotionAnim: unknown animation '%s' in '%s'\n", emotionanim, edict->tiki->a->name
+        );
+    }
+    return anim;
+}
+
+void SimpleActor::EventSetAnimFinal(Event *ev)
+{
+    ScriptError("animfinal is obsolete");
+}
+
+void SimpleActor::EventGetWeaponType(Event *ev)
+{
+    Weapon   *weapon;
+    const_str csWeaponType;
+
+    if (m_pTurret) {
+        weapon = m_pTurret;
+    } else {
+        weapon = GetActiveWeapon(WEAPON_MAIN);
+    }
+
+    if (weapon) {
+        switch (weapon->GetWeaponClass()) {
+        case WEAPON_CLASS_PISTOL:
+            csWeaponType = STRING_PISTOL;
+            break;
+        case WEAPON_CLASS_RIFLE:
+            csWeaponType = STRING_RIFLE;
+            break;
+        case WEAPON_CLASS_SMG:
+            csWeaponType = STRING_SMG;
+            break;
+        case WEAPON_CLASS_MG:
+            csWeaponType = STRING_MG;
+            break;
+        case WEAPON_CLASS_GRENADE:
+            csWeaponType = STRING_GRENADE;
+            break;
+        case WEAPON_CLASS_HEAVY:
+            csWeaponType = STRING_HEAVY;
+            break;
+        case WEAPON_CLASS_CANNON:
+            csWeaponType = STRING_CANNON;
+            break;
+        case WEAPON_CLASS_ITEM:
+            csWeaponType = STRING_ITEM;
+            break;
+        case WEAPON_CLASS_ITEM2:
+            csWeaponType = STRING_ITEM2;
+            break;
+        case WEAPON_CLASS_ITEM3:
+            csWeaponType = STRING_ITEM3;
+            break;
+        case WEAPON_CLASS_ITEM4:
+            csWeaponType = STRING_ITEM4;
+            break;
+        default:
+            csWeaponType = STRING_EMPTY;
+            break;
+        }
+    } else {
+        csWeaponType = STRING_RIFLE;
+    }
+
+    ev->AddConstString(csWeaponType);
+}
+
+void SimpleActor::EventGetWeaponGroup(Event *ev)
+{
+    const_str csWeaponGroup;
+    Weapon   *weapon = GetActiveWeapon(WEAPON_MAIN);
+
+    if (weapon) {
+        csWeaponGroup = weapon->GetWeaponGroup();
+        if (csWeaponGroup == STRING_EMPTY) {
+            csWeaponGroup = STRING_UNARMED;
+        }
+    } else {
+        csWeaponGroup = STRING_UNARMED;
+    }
+
+    ev->AddConstString(csWeaponGroup);
+}
+
+void SimpleActor::EventAIOn(Event *ev)
+{
+    m_bDoAI = true;
+}
+
+void SimpleActor::EventAIOff(Event *ev)
+{
+    m_bDoAI = false;
+}
+
+void SimpleActor::AnimFinished(int slot)
+{
+    assert(!DumpCallTrace("\"never should be called\"\n\tMessage: "));
 }
 
-void SimpleActor::EventSetEmotion
-	(
-	Event *ev
-	)
+void SimpleActor::EventGetPainHandler(Event *ev)
 {
-	switch (ev->GetConstString(1))
-	{
-	case STRING_EMOTION_NONE:
-		Anim_Emotion(EMOTION_NONE);
-		break;
-	case STRING_EMOTION_NEUTRAL:
-		Anim_Emotion(EMOTION_NEUTRAL);
-		break;
-	case STRING_EMOTION_WORRY:
-		Anim_Emotion(EMOTION_WORRY);
-		break;
-	case STRING_EMOTION_PANIC:
-		Anim_Emotion(EMOTION_PANIC);
-		break;
-	case STRING_EMOTION_FEAR:
-		Anim_Emotion(EMOTION_FEAR);
-		break;
-	case STRING_EMOTION_DISGUST:
-		Anim_Emotion(EMOTION_DISGUST);
-		break;
-	case STRING_EMOTION_ANGER:
-		Anim_Emotion(EMOTION_ANGER);
-		break;
-	case STRING_EMOTION_AIMING:
-		Anim_Emotion(EMOTION_AIMING);
-		break;
-	case STRING_EMOTION_DETERMINED:
-		Anim_Emotion(EMOTION_DETERMINED);
-		break;
-	case STRING_EMOTION_DEAD:
-		Anim_Emotion(EMOTION_DEAD);
-		break;
-	case STRING_EMOTION_CURIOUS:
-		Anim_Emotion(EMOTION_CURIOUS);
-		break;
-	default:
-		assert(!"Unknown emotion mode specified in script.");
-		break;
-	}
-}
-
-void SimpleActor::EventGetPosition
-	(
-	Event *ev
-	)
+    ScriptVariable var;
+
+    m_PainHandler.GetScriptValue(&var);
+    ev->AddValue(var);
+}
+
+void SimpleActor::EventSetPainHandler(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_PainHandler.SetScript(ev->GetValue(1));
+    } else {
+        m_PainHandler.SetScript(ev->GetString(1));
+    }
+}
+
+void SimpleActor::EventGetDeathHandler(Event *ev)
+{
+    ScriptVariable var;
+
+    m_DeathHandler.GetScriptValue(&var);
+    ev->AddValue(var);
+}
+
+void SimpleActor::EventSetDeathHandler(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_DeathHandler.SetScript(ev->GetValue(1));
+    } else {
+        m_DeathHandler.SetScript(ev->GetString(1));
+    }
+}
+
+void SimpleActor::EventGetAttackHandler(Event *ev)
 {
-	ev->AddConstString(m_csCurrentPosition);
+    ScriptVariable var;
+
+    m_AttackHandler.GetScriptValue(&var);
+    ev->AddValue(var);
 }
-
-void SimpleActor::EventSetPosition
-	(
-	Event *ev
-	)
-{
-	m_csCurrentPosition = ev->GetConstString(1);
-}
-
-void SimpleActor::EventGetAnimMode
-	(
-	Event *ev
-	)
-{
-	// not found in ida
-}
-
-void SimpleActor::EventSetAnimMode
-	(
-	Event *ev
-	)
-{
-	// not found in ida
-}
-
-void SimpleActor::EventSetAnimFinal
-	(
-	Event *ev
-	)
-{
-	ScriptError("animfinal is obsolete");
-}
-
-void SimpleActor::DesiredAnimation
-	(
-	int eAnimMode,
-	const_str csAnimString
-	)
-{
-	//fixme: this is an inline function.
-	m_eNextAnimMode = eAnimMode;
-	m_csNextAnimString = csAnimString;
-	m_bNextForceStart = false;
-}
-
-void SimpleActor::StartAnimation
-	(
-	int eAnimMode,
-	const_str csAnimString
-	)
-{
-	//fixme: this is an inline function.
-	m_eNextAnimMode = eAnimMode;
-	m_csNextAnimString = csAnimString;
-	m_bNextForceStart = true;
-}
-
-void SimpleActor::DesiredAnimation
-	(
-	int eAnimMode,
-	ScriptThreadLabel AnimLabel
-	)
-{
-	//fixme: this is an inline function.
-	m_eNextAnimMode = eAnimMode;
-	m_csNextAnimString = STRING_NULL;
-	m_NextAnimLabel = AnimLabel;
-	m_bNextForceStart = false;
-}
-
-void SimpleActor::StartAnimation
-	(
-	int eAnimMode,
-	ScriptThreadLabel AnimLabel
-	)
-{
-	//fixme: this is an inline function.
-	m_eNextAnimMode = eAnimMode;
-	m_csNextAnimString = STRING_NULL;
-	m_NextAnimLabel = AnimLabel;
-	m_bNextForceStart = true;
-}
-
-void SimpleActor::ContinueAnimationAllowNoPath
-	(
-	void
-	)
-{
-	if (m_eNextAnimMode < 0)
-	{
-		m_bNextForceStart = false;
-		m_csNextAnimString = STRING_NULL;
-		m_eNextAnimMode = m_eAnimMode;
-		m_NextAnimLabel = m_Anim;
-	}
-}
-
-void SimpleActor::ContinueAnimation
-	(
-	void
-	)
-{
-	int eAnimMode = m_eNextAnimMode;
-	if (eAnimMode < 0)
-	{
-		m_bNextForceStart = false;
-		m_csNextAnimString = STRING_NULL;
-		m_eNextAnimMode = m_eAnimMode;
-		m_NextAnimLabel = m_Anim;
-		eAnimMode = m_eAnimMode;
-	}
-
-	if (eAnimMode <= 3 && !PathExists())
-	{
-		//assert(!DumpCallTrace("ContinueAnimation() called on a pathed animation, but no path exists"));
-		Anim_Stand();
-	}
-}
-
-void SimpleActor::SetPathGoalEndAnim
-	(
-	const_str csEndAnim
-	)
-{
-	//fixme: this is an inline function
-	m_csPathGoalEndAnimScript = csEndAnim;
-}
-
-bool SimpleActor::UpdateSelectedAnimation
-	(
-	void
-	)
-{
-	if (m_csNextAnimString ==  STRING_NULL)
-	{
-		if (m_bNextForceStart)
-		{
-			m_Anim = m_NextAnimLabel;
-			m_eAnimMode = m_eNextAnimMode;
-			if (m_eNextAnimMode != 3)
-				SetPathGoalEndAnim(STRING_EMPTY);
-			m_bStartPathGoalEndAnim = false;
-			m_eNextAnimMode = -1;
-			return true;
-		}
-
-		if (m_pAnimThread)
-		{
-			if (m_eAnimMode == m_eNextAnimMode)
-			{
-				if (m_Anim == m_NextAnimLabel)
-				{
-					m_bStartPathGoalEndAnim = false;
-					m_eNextAnimMode = -1;
-					return false;
-				}
-			}
-		}
-		m_Anim = m_NextAnimLabel;
-		m_eAnimMode = m_eNextAnimMode;
-		if (m_eNextAnimMode != 3)
-			SetPathGoalEndAnim(STRING_EMPTY);
-		m_bStartPathGoalEndAnim = false;
-		m_eNextAnimMode = -1;
-		return true;
-	}
-
-	if (m_bNextForceStart)
-	{
-
-		Com_Printf("UpdateSelectedAnimation\n");
-		m_Anim.TrySetScript(m_csNextAnimString);
-		m_eAnimMode = m_eNextAnimMode;
-		if (m_eNextAnimMode != 3)
-			SetPathGoalEndAnim(STRING_EMPTY);
-		m_bStartPathGoalEndAnim = false;
-		m_eNextAnimMode = -1;
-		return true;
-	}
-
-	if (!m_pAnimThread || m_eAnimMode != m_eNextAnimMode)
-	{
-		m_Anim.TrySetScript(m_csNextAnimString);
-		m_eAnimMode = m_eNextAnimMode;
-		if (m_eNextAnimMode != 3)
-			SetPathGoalEndAnim(STRING_EMPTY);
-		m_bStartPathGoalEndAnim = false;
-		m_eNextAnimMode = -1;
-		return true;
-	}
-
-	if (m_fPathGoalTime <= level.time)
-	{
-		if (!m_Anim.IsFile(m_csNextAnimString))
-		{
-			m_Anim.TrySetScript(m_csNextAnimString);
-			m_eAnimMode = m_eNextAnimMode;
-			if (m_eNextAnimMode != 3)
-				SetPathGoalEndAnim(STRING_EMPTY);
-			m_bStartPathGoalEndAnim = false;
-			m_eNextAnimMode = -1;
-			return true;
-		}
-	}
-
-	m_eNextAnimMode = -1;
-	if (m_bStartPathGoalEndAnim)
-	{
-		m_bStartPathGoalEndAnim = false;
-
-		if (!m_Anim.IsFile(m_csPathGoalEndAnimScript))
-		{
-			m_Anim.TrySetScript(m_csPathGoalEndAnimScript);
-			return true;
-		}
-	}
-	return false;
-}
-
-const char *SimpleActor::DumpCallTrace
-	(
-	const char *pszFmt,
-	...
-	) const
-{
-	OVERLOADED_ERROR();
-	return "overloaded version should always get called";
+
+void SimpleActor::EventSetAttackHandler(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_AttackHandler.SetScript(ev->GetValue(1));
+    } else {
+        m_AttackHandler.SetScript(ev->GetString(1));
+    }
 }
+
+void SimpleActor::EventGetSniperHandler(Event *ev)
+{
+    ScriptVariable var;
+
+    m_SniperHandler.GetScriptValue(&var);
+    ev->AddValue(var);
+}
+
+void SimpleActor::EventSetSniperHandler(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_SniperHandler.SetScript(ev->GetValue(1));
+    } else {
+        m_SniperHandler.SetScript(ev->GetString(1));
+    }
+}
+
+bool SimpleActor::UpdateSelectedAnimation(void)
+{
+    if (m_csNextAnimString != STRING_NULL) {
+        if (!m_bNextForceStart && m_pAnimThread && m_eAnimMode == m_eNextAnimMode
+            && (m_fPathGoalTime > level.time || m_Anim.IsFile(m_csNextAnimString))) {
+            // Clear the next animation
+            m_eNextAnimMode = -1;
+
+            if (!m_bStartPathGoalEndAnim) {
+                return false;
+            }
+            m_bStartPathGoalEndAnim = false;
+
+            if (m_Anim.IsFile(m_csPathGoalEndAnimScript)) {
+                return false;
+            }
+
+            m_Anim.TrySetScript(m_csPathGoalEndAnimScript);
+            return true;
+        }
+
+        m_Anim.TrySetScript(m_csNextAnimString);
+    } else {
+        if (!m_bNextForceStart && m_pAnimThread && m_eAnimMode == m_eNextAnimMode && m_Anim == m_NextAnimLabel) {
+            m_bStartPathGoalEndAnim = false;
+            m_eNextAnimMode         = -1;
+            return false;
+        }
+
+        m_Anim = m_NextAnimLabel;
+    }
+
+    m_eAnimMode = m_eNextAnimMode;
+
+    if (m_eAnimMode != ANIM_MODE_PATH_GOAL) {
+        m_csPathGoalEndAnimScript = STRING_EMPTY;
+    }
+
+    m_bStartPathGoalEndAnim = false;
+    m_eNextAnimMode         = -1;
+
+    return true;
+}
+
+void SimpleActor::EventNoAnimLerp(Event *ev)
+{
+    edict->s.eFlags |= EF_NO_LERP;
+    NoLerpThisFrame();
+}
+
+const char *SimpleActor::DumpCallTrace(const char *pszFmt, ...) const
+{
+    OVERLOADED_ERROR();
+    return "overloaded version should always get called";
+}
+
+void SimpleActor::EventGetAnimMode(Event *ev) {}
+
+void SimpleActor::EventSetAnimMode(Event *ev) {}
diff --git a/code/fgame/simpleactor.h b/code/fgame/simpleactor.h
index aa1e6464..4aea2112 100644
--- a/code/fgame/simpleactor.h
+++ b/code/fgame/simpleactor.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // simpleactor.h: Base class for character AI.
 
-#ifndef __SIMPLEACTOR_H__
-#define __SIMPLEACTOR_H__
+#pragma once
 
 #include "weapon.h"
 #include "sentient.h"
@@ -35,18 +34,44 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "actorpath.h"
 
 enum eEmotionMode {
-	EMOTION_NONE,
-	EMOTION_NEUTRAL,
-	EMOTION_WORRY,
-	EMOTION_PANIC,
-	EMOTION_FEAR,
-	EMOTION_DISGUST,
-	EMOTION_ANGER,
-	EMOTION_AIMING,
-	EMOTION_DETERMINED,
-	EMOTION_DEAD,
-	EMOTION_CURIOUS
+    EMOTION_NONE,
+    EMOTION_NEUTRAL,
+    EMOTION_WORRY,
+    EMOTION_PANIC,
+    EMOTION_FEAR,
+    EMOTION_DISGUST,
+    EMOTION_ANGER,
+    EMOTION_AIMING,
+    EMOTION_DETERMINED,
+    EMOTION_DEAD,
+    EMOTION_CURIOUS
 };
+
+enum eAnimMode {
+    ANIM_MODE_NONE,
+    ANIM_MODE_NORMAL,
+    ANIM_MODE_PATH,
+    ANIM_MODE_PATH_GOAL,
+    ANIM_MODE_DEST,
+    ANIM_MODE_SCRIPTED,
+    ANIM_MODE_NOCLIP,
+    ANIM_MODE_FALLING_PATH,
+    ANIM_MODE_FROZEN,
+    ANIM_MODE_ATTACHED,
+};
+
+enum eAnimWeightType {
+    ANIM_WEIGHT_NONE,
+    ANIM_WEIGHT_MOTION,
+    ANIM_WEIGHT_ACTION,
+    ANIM_WEIGHT_CROSSBLEND_1,
+    ANIM_WEIGHT_CROSSBLEND_2,
+    ANIM_WEIGHT_CROSSBLEND_DIALOG,
+    ANIM_WEIGHT_SAY,
+    ANIM_WEIGHT_AIM,
+    ANIM_WEIGHT_LASTFRAME,
+};
+
 class SimpleActor;
 
 typedef SafePtr<SimpleActor> SimpleActorPtr;
@@ -54,204 +79,402 @@ typedef SafePtr<SimpleActor> SimpleActorPtr;
 class SimpleActor : public Sentient
 {
 public:
-	int m_eAnimMode;
-	ScriptThreadLabel m_Anim;
-	SafePtr<ScriptThread> m_pAnimThread;
-	int m_eNextAnimMode;
-	const_str m_csNextAnimString;
-	ScriptThreadLabel m_NextAnimLabel;
-	bool m_bNextForceStart;
-	float m_fCrouchWeight;
-	bool m_YawAchieved;
-	float m_DesiredYaw;
-	bool m_bHasDesiredLookDest;
-	bool m_bHasDesiredLookAngles;
-	Vector m_vDesiredLookDest;
-	Vector m_DesiredLookAngles;
-	Vector m_DesiredGunDir;
-	ActorPath m_Path;
-	float m_Dest[ 3 ];
-	float m_NoClipDest[ 3 ];
-	float path_failed_time;
-	float m_fPathGoalTime;
-	bool m_bStartPathGoalEndAnim;
-	const_str m_csPathGoalEndAnimScript;
-	qboolean m_walking;
-	qboolean m_groundPlane;
-	Vector m_groundPlaneNormal;
-	Vector watch_offset;
-	bool m_bThink;
-	int m_PainTime;
-	eEmotionMode m_eEmotionMode;
-	float m_fAimLimit_up;
-	float m_fAimLimit_down;
-	int m_ChangeMotionAnimIndex;
-	int m_ChangeActionAnimIndex;
-	int m_ChangeSayAnimIndex;
+    int                   m_eAnimMode;
+    ScriptThreadLabel     m_Anim;
+    SafePtr<ScriptThread> m_pAnimThread;
+    int                   m_eNextAnimMode;
+    const_str             m_csNextAnimString;
+    ScriptThreadLabel     m_NextAnimLabel;
+    bool                  m_bNextForceStart;
+    float                 m_fCrouchWeight;
+    bool                  m_YawAchieved;
+    float                 m_DesiredYaw;
+    bool                  m_bHasDesiredLookDest;
+    bool                  m_bHasDesiredLookAngles;
+    Vector                m_vDesiredLookDest;
+    Vector                m_DesiredLookAngles;
+    Vector                m_DesiredGunDir;
+    ActorPath             m_Path;
+    float                 m_Dest[3];
+    float                 m_NoClipDest[3];
+    float                 path_failed_time;
+    float                 m_fPathGoalTime;
+    bool                  m_bStartPathGoalEndAnim;
+    const_str             m_csPathGoalEndAnimScript;
+    qboolean              m_walking;
+    qboolean              m_groundPlane;
+    vec3_t                m_groundPlaneNormal;
+    Vector                watch_offset;
+    bool                  m_bThink;
+    int                   m_PainTime;
+    eEmotionMode          m_eEmotionMode;
+    float                 m_fAimLimit_up;
+    float                 m_fAimLimit_down;
+    int                   m_ChangeMotionAnimIndex;
+    int                   m_ChangeActionAnimIndex;
+    int                   m_ChangeSayAnimIndex;
 
 protected:
-	unsigned int m_weightType[ MAX_FRAMEINFOS ];
-	float m_weightBase[ MAX_FRAMEINFOS ];
-	float m_weightCrossBlend[ MAX_FRAMEINFOS ];
-	bool m_AnimMotionHigh;
-	bool m_AnimActionHigh;
-	bool m_AnimDialogHigh;
+    unsigned int m_weightType[MAX_FRAMEINFOS];
+    float        m_weightBase[MAX_FRAMEINFOS];
+    float        m_weightCrossBlend[MAX_FRAMEINFOS];
+    bool         m_AnimMotionHigh;
+    bool         m_AnimActionHigh;
+    bool         m_AnimDialogHigh;
 
 public:
-	int hit_obstacle_time;
-	float obstacle_vel[ 2 ];
-	const_str m_csAnimName;
-	const_str m_csSayAnim;
-	const_str m_csUpperAnim;
-	const_str m_csCurrentPosition;
-	int m_bPathErrorTime;
-	class PathNode *m_NearestNode;
-	Vector m_vNearestNodePos;
-	short int m_bUpdateAnimDoneFlags;
-	float m_maxspeed;
-	const_str m_csMood;
-	const_str m_csIdleMood;
-	int m_iMotionSlot;
-	int m_iActionSlot;
-	int m_iSaySlot;
-	bool m_bLevelMotionAnim;
-	bool m_bLevelActionAnim;
-	byte m_bLevelSayAnim;
-	byte m_bNextLevelSayAnim;
-	bool m_bMotionAnimSet;
-	bool m_bActionAnimSet;
-	bool m_bSayAnimSet;
-	bool m_bAimAnimSet;
-	int m_iVoiceTime;
-	bool m_bDoAI;
-	ScriptThreadLabel m_PainHandler;
-	ScriptThreadLabel m_DeathHandler;
-	ScriptThreadLabel m_AttackHandler;
-	ScriptThreadLabel m_SniperHandler;
-	float m_fCrossblendTime;
+    int               hit_obstacle_time;
+    float             obstacle_vel[2];
+    const_str         m_csAnimName;
+    const_str         m_csSayAnim;
+    const_str         m_csUpperAnim;
+    const_str         m_csCurrentPosition;
+    int               m_bPathErrorTime;
+    class PathNode   *m_NearestNode;
+    Vector            m_vNearestNodePos;
+    short             m_bUpdateAnimDoneFlags;
+    float             m_maxspeed;
+    const_str         m_csMood;
+    const_str         m_csIdleMood;
+    int               m_iMotionSlot;
+    int               m_iActionSlot;
+    int               m_iSaySlot;
+    bool              m_bLevelMotionAnim;
+    bool              m_bLevelActionAnim;
+    byte              m_bLevelSayAnim;
+    byte              m_bNextLevelSayAnim;
+    bool              m_bMotionAnimSet;
+    bool              m_bActionAnimSet;
+    bool              m_bSayAnimSet;
+    bool              m_bAimAnimSet;
+    int               m_iVoiceTime;
+    bool              m_bDoAI;
+    ScriptThreadLabel m_PainHandler;
+    ScriptThreadLabel m_DeathHandler;
+    ScriptThreadLabel m_AttackHandler;
+    ScriptThreadLabel m_SniperHandler;
+    float             m_fCrossblendTime;
 
 public:
-	CLASS_PROTOTYPE( SimpleActor );
+    CLASS_PROTOTYPE(SimpleActor);
 
-	SimpleActor();
+    SimpleActor();
+    ~SimpleActor();
 
-	void Archive( Archiver & arc ) override;
-	virtual void SetMoveInfo(mmove_t* mm);
-	virtual void GetMoveInfo(mmove_t* mm);
-	bool CanSeeFrom(vec3_t pos, Entity* ent);
-	virtual bool CanTarget(void);
-	virtual bool IsImmortal(void);
-	bool DoesTheoreticPathExist( Vector vDestPos, float fMaxPath );
-	void SetPath( Vector vDestPos, const char *description, int iMaxDirtyTime, float *vLeashHome, float fLeashDistSquared );
-	void SetPath( SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime );
-	void SetPathWithinDistance( Vector vDestPos, char *description, float fMaxPath, int iMaxDirtyTime );
-	void FindPathAway( vec_t *vAwayFrom, vec_t *vDirPreferred, float fMinSafeDist );
-	void ClearPath( void );
-	bool PathComplete( void ) const;
-	bool PathExists( void ) const;
-	bool PathIsValid( void ) const;
-	bool PathAvoidsSquadMates( void ) const;
-	void ShortenPathToAvoidSquadMates( void );
-	PathInfo *CurrentPathNode( void ) const;
-	PathInfo *LastPathNode( void ) const;
-	float PathDist( void ) const;
-	bool PathHasCompleteLookahead( void ) const;
-	Vector PathGoal( void ) const;
-	float *PathDelta( void ) const;
-	bool PathGoalSlowdownStarted( void ) const;
-	void SetDest( vec3_t dest );
-	void StopTurning( void );
-	void SetDesiredYaw( float yaw );
-	void SetDesiredYawDir( vec3_t vec );
-	void SetDesiredYawDest( vec3_t vec );
-	void UpdateEmotion( void );
-	int GetEmotionAnim( void );
-	int GetMotionSlot( int slot );
-	int GetActionSlot( int slot );
-	int GetSaySlot( void );
-	void StartCrossBlendAnimSlot( int slot );
-	void StartMotionAnimSlot( int slot, int anim, float weight );
-	void StartAimMotionAnimSlot( int slot, int anim );
-	void StartActionAnimSlot( int anim );
-	void StartSayAnimSlot( int anim );
-	void StartAimAnimSlot( int slot, int anim );
-	void SetBlendedWeight( int slot );
-	void EventSetAnimLength( Event *ev );
-	void UpdateNormalAnimSlot( int slot );
-	void UpdateCrossBlendAnimSlot( int slot );
-	void UpdateCrossBlendDialogAnimSlot( int slot );
-	void UpdateSayAnimSlot( int slot );
-	void UpdateLastFrameSlot( int slot );
-	void UpdateAnimSlot( int slot );
-	void StopAllAnimating( void );
-	void ChangeMotionAnim( void );
-	void ChangeActionAnim( void );
-	void ChangeSayAnim( void );
-	void StopAnimating( int slot );
-	void AnimFinished( int slot ) override;
-	void UpdateAim( void );
-	void UpdateAimMotion( void );
-	void EventAIOn( Event *ev );
-	void EventAIOff( Event *ev );
-	void EventGetWeaponGroup( Event *ev );
-	void EventGetWeaponType( Event *ev );
-	void EventGetPainHandler( Event *ev );
-	void EventSetPainHandler( Event *ev );
-	void EventGetDeathHandler( Event *ev );
-	void EventSetDeathHandler( Event *ev );
-	void EventGetAttackHandler( Event *ev );
-	void EventSetAttackHandler( Event *ev );
-	void EventGetSniperHandler( Event *ev );
-	void EventSetSniperHandler( Event *ev );
-	void EventSetCrossblendTime( Event *ev );
-	void EventGetCrossblendTime( Event *ev );
-	void EventSetEmotion( Event *ev );
-	void EventGetPosition( Event *ev );
-	void EventSetPosition( Event *ev );
-	void EventGetAnimMode( Event *ev );
-	void EventSetAnimMode( Event *ev );
-	void EventSetAnimFinal( Event *ev );
-	const_str GetRunAnim( void );
-	const_str GetWalkAnim( void );
-	void DesiredAnimation( int eAnimMode, const_str csAnimString );
-	void StartAnimation( int eAnimMode, const_str csAnimString );
-	void DesiredAnimation( int eAnimMode, ScriptThreadLabel AnimLabel );
-	void StartAnimation( int eAnimMode, ScriptThreadLabel AnimLabel );
-	void ContinueAnimationAllowNoPath( void );
-	void ContinueAnimation( void );
-	void SetPathGoalEndAnim( const_str csEndAnim );
-	bool UpdateSelectedAnimation( void );
-	void Anim_Attack( void );
-	void Anim_Sniper( void );
-	void Anim_Aim( void );
-	void Anim_Shoot( void );
-	void Anim_Idle( void );
-	void Anim_Crouch( void );
-	void Anim_Prone( void );
-	void Anim_Stand( void );
-	void Anim_Cower( void );
-	void Anim_Killed( void );
-	void Anim_StartPain( void );
-	void Anim_Pain( void );
-	void Anim_CrouchRunTo( int eAnimMode );
-	void Anim_CrouchWalkTo( int eAnimMode );
-	void Anim_StandRunTo( int eAnimMode );
-	void Anim_StandWalkTo( int eAnimMode );
-	void Anim_RunTo( int eAnimMode );
-	void Anim_WalkTo( int eAnimMode );
-	void Anim_RunAwayFiring( int eAnimMode );
-	void Anim_RunToShooting( int eAnimMode );
-	void Anim_RunToAlarm( int eAnimMode );
-	void Anim_RunToCasual( int eAnimMode );
-	void Anim_RunToCover( int eAnimMode );
-	void Anim_RunToDanger( int eAnimMode );
-	void Anim_RunToDive( int eAnimMode );
-	void Anim_RunToFlee( int eAnimMode );
-	void Anim_RunToInOpen( int eAnimMode );
-	void Anim_Emotion( eEmotionMode eEmotMode );
-	void Anim_Say( const_str csSayAnimScript, int iMinTimeSinceLastSay, bool bCanInterrupt );
-	void Anim_FullBody( const_str csFullBodyAnim, int eAnimMode );
-	virtual const char *DumpCallTrace( const char *pszFmt, ... ) const;
+    void         Archive(Archiver        &arc) override;
+    virtual void SetMoveInfo(mmove_t *mm);
+    virtual void GetMoveInfo(mmove_t *mm);
+    bool         CanSeeFrom(vec3_t pos, Entity *ent);
+    virtual bool CanTarget(void);
+    virtual bool IsImmortal(void);
+    bool         DoesTheoreticPathExist(Vector vDestPos, float fMaxPath);
+    void
+    SetPath(Vector vDestPos, const char *description, int iMaxDirtyTime, float *vLeashHome, float fLeashDistSquared);
+    void                SetPath(SimpleEntity *pDestNode, const char *description, int iMaxDirtyTime);
+    void                SetPathWithinDistance(Vector vDestPos, char *description, float fMaxPath, int iMaxDirtyTime);
+    void                FindPathAway(vec3_t vAwayFrom, vec2_t vDirPreferred, float fMinSafeDist);
+    void                ClearPath(void);
+    bool                PathComplete(void) const;
+    bool                PathExists(void) const;
+    bool                PathIsValid(void) const;
+    bool                PathAvoidsSquadMates(void) const;
+    void                ShortenPathToAvoidSquadMates(void);
+    PathInfo           *CurrentPathNode(void) const;
+    PathInfo           *LastPathNode(void) const;
+    float               PathDist(void) const;
+    bool                PathHasCompleteLookahead(void) const;
+    Vector              PathGoal(void) const;
+    const float        *PathDelta(void) const;
+    bool                PathGoalSlowdownStarted(void) const;
+    void                SetDest(vec3_t dest);
+    void                StopTurning(void);
+    void                SetDesiredYaw(float yaw);
+    void                SetDesiredYawDir(const vec2_t vec);
+    void                SetDesiredYawDest(const vec3_t vec);
+    void                UpdateEmotion(void);
+    int                 GetEmotionAnim(void);
+    int                 GetMotionSlot(int slot);
+    int                 GetActionSlot(int slot);
+    int                 GetSaySlot(void);
+    void                StartCrossBlendAnimSlot(int slot);
+    void                StartMotionAnimSlot(int slot, int anim, float weight);
+    void                StartAimMotionAnimSlot(int slot, int anim);
+    void                StartActionAnimSlot(int anim);
+    void                StartSayAnimSlot(int anim);
+    void                StartAimAnimSlot(int slot, int anim);
+    void                SetBlendedWeight(int slot);
+    void                EventSetAnimLength(Event *ev);
+    void                UpdateNormalAnimSlot(int slot);
+    void                UpdateCrossBlendAnimSlot(int slot);
+    void                UpdateCrossBlendDialogAnimSlot(int slot);
+    void                UpdateSayAnimSlot(int slot);
+    void                UpdateLastFrameSlot(int slot);
+    void                UpdateAnimSlot(int slot);
+    void                StopAllAnimating(void);
+    void                ChangeMotionAnim(void);
+    void                ChangeActionAnim(void);
+    void                ChangeSayAnim(void);
+    void                StopAnimating(int slot);
+    void                AnimFinished(int slot) override;
+    void                UpdateAim(void);
+    void                UpdateAimMotion(void);
+    void                EventAIOn(Event *ev);
+    void                EventAIOff(Event *ev);
+    void                EventGetWeaponGroup(Event *ev);
+    void                EventGetWeaponType(Event *ev);
+    void                EventGetPainHandler(Event *ev);
+    void                EventSetPainHandler(Event *ev);
+    void                EventGetDeathHandler(Event *ev);
+    void                EventSetDeathHandler(Event *ev);
+    void                EventGetAttackHandler(Event *ev);
+    void                EventSetAttackHandler(Event *ev);
+    void                EventGetSniperHandler(Event *ev);
+    void                EventSetSniperHandler(Event *ev);
+    void                EventSetCrossblendTime(Event *ev);
+    void                EventGetCrossblendTime(Event *ev);
+    void                EventSetEmotion(Event *ev);
+    void                EventGetPosition(Event *ev);
+    void                EventSetPosition(Event *ev);
+    void                EventGetAnimMode(Event *ev);
+    void                EventSetAnimMode(Event *ev);
+    void                EventSetAnimFinal(Event *ev);
+    void                EventNoAnimLerp(Event *ev); // Added in 2.0
+    const_str           GetRunAnim(void);
+    const_str           GetWalkAnim(void);
+    void                DesiredAnimation(int eAnimMode, const_str csAnimString);
+    void                StartAnimation(int eAnimMode, const_str csAnimString);
+    void                DesiredAnimation(int eAnimMode, ScriptThreadLabel AnimLabel);
+    void                StartAnimation(int eAnimMode, ScriptThreadLabel AnimLabel);
+    void                ContinueAnimationAllowNoPath(void);
+    void                ContinueAnimation(void);
+    void                SetPathGoalEndAnim(const_str csEndAnim);
+    bool                UpdateSelectedAnimation(void);
+    void                Anim_Attack(void);
+    void                Anim_Suppress(void); // Added in 2.0
+    void                Anim_Sniper(void);
+    void                Anim_Aim(void);
+    void                Anim_Shoot(void);
+    void                Anim_Idle(void);
+    void                Anim_Crouch(void);
+    void                Anim_Prone(void);
+    void                Anim_Stand(void);
+    void                Anim_Cower(void);
+    void                Anim_Killed(void);
+    void                Anim_StartPain(void);
+    void                Anim_Pain(void);
+    void                Anim_CrouchRunTo(int eAnimMode);
+    void                Anim_CrouchWalkTo(int eAnimMode);
+    void                Anim_StandRunTo(int eAnimMode);
+    void                Anim_StandWalkTo(int eAnimMode);
+    void                Anim_RunTo(int eAnimMode);
+    void                Anim_WalkTo(int eAnimMode);
+    void                Anim_RunAwayFiring(int eAnimMode);
+    void                Anim_RunToShooting(int eAnimMode);
+    void                Anim_RunToAlarm(int eAnimMode);
+    void                Anim_RunToCasual(int eAnimMode);
+    void                Anim_RunToCover(int eAnimMode);
+    void                Anim_RunToDanger(int eAnimMode);
+    void                Anim_RunToDive(int eAnimMode);
+    void                Anim_RunToFlee(int eAnimMode);
+    void                Anim_RunToInOpen(int eAnimMode);
+    void                Anim_Emotion(eEmotionMode eEmotMode);
+    void                Anim_Say(const_str csSayAnimScript, int iMinTimeSinceLastSay, bool bCanInterrupt);
+    void                Anim_FullBody(const_str csFullBodyAnim, int eAnimMode);
+    virtual const char *DumpCallTrace(const char *pszFmt, ...) const;
 };
 
-#endif /* simpleactor.h */
\ No newline at end of file
+inline void SimpleActor::StartAnimation(int eAnimMode, const_str csAnimString)
+{
+    m_eNextAnimMode    = eAnimMode;
+    m_csNextAnimString = csAnimString;
+    m_bNextForceStart  = true;
+}
+
+inline void SimpleActor::DesiredAnimation(int eAnimMode, const_str csAnimString)
+{
+    m_eNextAnimMode    = eAnimMode;
+    m_csNextAnimString = csAnimString;
+    m_bNextForceStart  = false;
+}
+
+inline void SimpleActor::StartAnimation(int eAnimMode, ScriptThreadLabel AnimLabel)
+{
+    m_eNextAnimMode    = eAnimMode;
+    m_csNextAnimString = STRING_NULL;
+    m_NextAnimLabel    = AnimLabel;
+    m_bNextForceStart  = true;
+}
+
+inline void SimpleActor::DesiredAnimation(int eAnimMode, ScriptThreadLabel AnimLabel)
+{
+    m_eNextAnimMode    = eAnimMode;
+    m_csNextAnimString = STRING_NULL;
+    m_NextAnimLabel    = AnimLabel;
+    m_bNextForceStart  = false;
+}
+
+inline void SimpleActor::ContinueAnimationAllowNoPath(void)
+{
+    if (m_eNextAnimMode < ANIM_MODE_NONE) {
+        m_eNextAnimMode    = m_eAnimMode;
+        m_csNextAnimString = STRING_NULL;
+        m_NextAnimLabel    = m_Anim;
+        m_bNextForceStart  = false;
+    }
+}
+
+inline void SimpleActor::ContinueAnimation(void)
+{
+    ContinueAnimationAllowNoPath();
+
+    if ((m_eNextAnimMode == ANIM_MODE_PATH || m_eNextAnimMode == ANIM_MODE_PATH_GOAL) && !PathExists()) {
+        assert(!"ContinueAnimation() called on a pathed animation, but no path exists");
+        Anim_Stand();
+    }
+}
+
+inline void SimpleActor::SetPathGoalEndAnim(const_str csEndAnim)
+{
+    m_csPathGoalEndAnimScript = csEndAnim;
+}
+
+inline void SimpleActor::Archive(Archiver& arc)
+{
+    int i;
+
+    Sentient::Archive(arc);
+
+    arc.ArchiveInteger(&m_eAnimMode);
+    m_Anim.Archive(arc);
+
+    arc.ArchiveBool(&m_bHasDesiredLookDest);
+    arc.ArchiveBool(&m_bHasDesiredLookAngles);
+    arc.ArchiveVector(&m_vDesiredLookDest);
+    arc.ArchiveVec3(m_DesiredLookAngles);
+    arc.ArchiveVec3(m_DesiredGunDir);
+
+    m_Path.Archive(arc);
+    arc.ArchiveVec3(m_Dest);
+    arc.ArchiveVec3(m_NoClipDest);
+
+    arc.ArchiveFloat(&path_failed_time);
+    arc.ArchiveFloat(&m_fPathGoalTime);
+    arc.ArchiveBool(&m_bStartPathGoalEndAnim);
+    Director.ArchiveString(arc, m_csPathGoalEndAnimScript);
+
+    arc.ArchiveInteger(&m_eNextAnimMode);
+    Director.ArchiveString(arc, m_csNextAnimString);
+    m_NextAnimLabel.Archive(arc);
+    arc.ArchiveBool(&m_bNextForceStart);
+
+    arc.ArchiveBoolean(&m_walking);
+    arc.ArchiveBoolean(&m_groundPlane);
+    arc.ArchiveVec3(m_groundPlaneNormal);
+
+    arc.ArchiveVector(&watch_offset);
+    arc.ArchiveBool(&m_bThink);
+    arc.ArchiveInteger(&m_PainTime);
+
+    arc.ArchiveBool(&m_bAimAnimSet);
+    arc.ArchiveBool(&m_bActionAnimSet);
+
+    Director.ArchiveString(arc, m_csMood);
+    Director.ArchiveString(arc, m_csIdleMood);
+
+    ArchiveEnum(m_eEmotionMode, eEmotionMode);
+
+    arc.ArchiveFloat(&m_fAimLimit_up);
+    arc.ArchiveFloat(&m_fAimLimit_down);
+
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
+        arc.ArchiveUnsigned(&m_weightType[i]);
+    }
+
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
+        arc.ArchiveFloat(&m_weightBase[i]);
+    }
+
+    for (i = 0; i < MAX_FRAMEINFOS; i++) {
+        arc.ArchiveFloat(&m_weightCrossBlend[i]);
+    }
+
+    arc.ArchiveBool(&m_AnimMotionHigh);
+    arc.ArchiveBool(&m_AnimActionHigh);
+    arc.ArchiveBool(&m_AnimDialogHigh);
+
+    arc.ArchiveVec2(obstacle_vel);
+
+    Director.ArchiveString(arc, m_csCurrentPosition);
+
+    arc.ArchiveBool(&m_bMotionAnimSet);
+    arc.ArchiveBool(&m_bDoAI);
+
+    arc.ArchiveFloat(&m_fCrossblendTime);
+
+    arc.ArchiveSafePointer(&m_pAnimThread);
+
+    arc.ArchiveBool(&m_YawAchieved);
+    arc.ArchiveFloat(&m_DesiredYaw);
+
+    arc.ArchiveInteger(&m_iVoiceTime);
+    arc.ArchiveBool(&m_bSayAnimSet);
+
+    arc.ArchiveInteger(&hit_obstacle_time);
+
+    Director.ArchiveString(arc, m_csAnimName);
+
+    arc.ArchiveInteger(&m_bPathErrorTime);
+    arc.ArchiveInteger(&m_iMotionSlot);
+    arc.ArchiveInteger(&m_iActionSlot);
+    arc.ArchiveInteger(&m_iSaySlot);
+
+    arc.ArchiveBool(&m_bLevelMotionAnim);
+    arc.ArchiveBool(&m_bLevelActionAnim);
+    arc.ArchiveByte(&m_bLevelSayAnim);
+    arc.ArchiveByte(&m_bNextLevelSayAnim);
+
+    Director.ArchiveString(arc, m_csSayAnim);
+    Director.ArchiveString(arc, m_csUpperAnim);
+
+    m_PainHandler.Archive(arc);
+    m_DeathHandler.Archive(arc);
+    m_AttackHandler.Archive(arc);
+    m_SniperHandler.Archive(arc);
+
+    arc.ArchiveObjectPointer((Class **)&m_NearestNode);
+    arc.ArchiveVector(&m_vNearestNodePos);
+
+    arc.ArchiveFloat(&m_fCrouchWeight);
+    arc.ArchiveFloat(&m_maxspeed);
+}
+
+inline void SimpleActor::StopTurning(void)
+{
+    m_YawAchieved = true;
+}
+
+inline void SimpleActor::SetDesiredYaw(float yaw)
+{
+    m_YawAchieved = false;
+    m_DesiredYaw  = yaw;
+}
+
+inline void SimpleActor::SetDesiredYawDir(const vec2_t vec)
+{
+    SetDesiredYaw(vectoyaw(vec));
+}
+
+inline void SimpleActor::SetDesiredYawDest(const vec3_t vec)
+{
+    vec2_t facedir;
+    VectorSub2D(vec, origin, facedir);
+
+    if (facedir[0] || facedir[1]) {
+        SetDesiredYawDir(facedir);
+    }
+}
+
+inline void SimpleActor::SetDest(vec3_t dest)
+{
+    VectorCopy(dest, m_Dest);
+}
diff --git a/code/fgame/simpleentity.cpp b/code/fgame/simpleentity.cpp
index 854a8024..6b582500 100644
--- a/code/fgame/simpleentity.cpp
+++ b/code/fgame/simpleentity.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "glb_local.h"
 #include "simpleentity.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "level.h"
 #include "../script/scriptexception.h"
 
@@ -253,112 +253,107 @@ SimpleEntity::~SimpleEntity()
 
 int SimpleEntity::IsSubclassOfEntity(void) const
 {
-    return (entflags & EF_ENTITY);
+    return (entflags & ECF_ENTITY);
 }
 
 int SimpleEntity::IsSubclassOfAnimate(void) const
 {
-    return (entflags & EF_ANIMATE);
+    return (entflags & ECF_ANIMATE);
 }
 
 int SimpleEntity::IsSubclassOfSentient(void) const
 {
-    return (entflags & EF_SENTIENT);
+    return (entflags & ECF_SENTIENT);
 }
 
 int SimpleEntity::IsSubclassOfPlayer(void) const
 {
-    return (entflags & EF_PLAYER);
+    return (entflags & ECF_PLAYER);
 }
 
 int SimpleEntity::IsSubclassOfActor(void) const
 {
-    return (entflags & EF_ACTOR);
+    return (entflags & ECF_ACTOR);
 }
 
 int SimpleEntity::IsSubclassOfItem(void) const
 {
-    return (entflags & EF_ITEM);
+    return (entflags & ECF_ITEM);
 }
 
 int SimpleEntity::IsSubclassOfInventoryItem(void) const
 {
-    return (entflags & EF_INVENTORYITEM);
+    return (entflags & ECF_INVENTORYITEM);
 }
 
 int SimpleEntity::IsSubclassOfWeapon(void) const
 {
-    return (entflags & EF_WEAPON);
+    return (entflags & ECF_WEAPON);
 }
 
 int SimpleEntity::IsSubclassOfProjectile(void) const
 {
-    return (entflags & EF_PROJECTILE);
+    return (entflags & ECF_PROJECTILE);
 }
 
 int SimpleEntity::IsSubclassOfDoor(void) const
 {
-    return (entflags & EF_DOOR);
+    return (entflags & ECF_DOOR);
 }
 
 int SimpleEntity::IsSubclassOfCamera(void) const
 {
-    return (entflags & EF_CAMERA);
+    return (entflags & ECF_CAMERA);
 }
 
 int SimpleEntity::IsSubclassOfVehicle(void) const
 {
-    return (entflags & EF_VEHICLE);
+    return (entflags & ECF_VEHICLE);
 }
 
 int SimpleEntity::IsSubclassOfVehicleTank(void) const
 {
-    return (entflags & EF_VEHICLETANK);
+    return (entflags & ECF_VEHICLETANK);
 }
 
 int SimpleEntity::IsSubclassOfVehicleTurretGun(void) const
 {
-    return (entflags & EF_VEHICLETURRET);
+    return (entflags & ECF_VEHICLETURRET);
 }
 
 int SimpleEntity::IsSubclassOfTurretGun(void) const
 {
-    return (entflags & EF_TURRET);
+    return (entflags & ECF_TURRET);
 }
 
 int SimpleEntity::IsSubclassOfPathNode(void) const
 {
-    return (entflags & EF_PATHNODE);
+    return (entflags & ECF_PATHNODE);
 }
 
 int SimpleEntity::IsSubclassOfWaypoint(void) const
 {
-    return (entflags & EF_WAYPOINT);
+    return (entflags & ECF_WAYPOINT);
 }
 
 int SimpleEntity::IsSubclassOfTempWaypoint(void) const
 {
-    return (entflags & EF_TEMPWAYPOINT);
+    return (entflags & ECF_TEMPWAYPOINT);
 }
 
 int SimpleEntity::IsSubclassOfVehiclePoint(void) const
 {
-    return (entflags & EF_VEHICLEPOINT);
+    return (entflags & ECF_VEHICLEPOINT);
 }
 
 int SimpleEntity::IsSubclassOfSplinePath(void) const
 {
-    return (entflags & EF_SPLINEPATH);
+    return (entflags & ECF_SPLINEPATH);
 }
 
 int SimpleEntity::IsSubclassOfCrateObject(void) const
 {
-    return (entflags & EF_CRATEOBJECT);
-}
-
-int SimpleEntity::IsSubclassOfBot(void) const
-{
-    return (entflags & EF_BOT);
+    return (entflags & ECF_CRATEOBJECT);
 }
 
 void SimpleEntity::SetTargetName(str targetname)
@@ -411,7 +406,7 @@ void SimpleEntity::GetCentroid(Event *ev)
     ev->AddVector(centroid);
 }
 
-str& SimpleEntity::Target()
+const str& SimpleEntity::Target()
 {
     return target;
 }
@@ -491,7 +486,10 @@ void SimpleEntity::SetAngleEvent(Event *ev)
 
 void SimpleEntity::GetAngleEvent(Event *ev)
 {
-    ev->AddFloat(angles[1]);
+    Vector forward;
+
+    angles.AngleVectorsLeft(&forward);
+    ev->AddFloat(G_GetAngle(forward));
 }
 
 void SimpleEntity::setAngles(Vector angles)
@@ -533,12 +531,18 @@ void SimpleEntity::GetUpVector(Event *ev)
 
 SimpleEntity *SimpleEntity::Next(void)
 {
-    SimpleEntity *ent = world->GetTarget(target, true);
+    Listener* ent;
+    
+    if (!target.length()) {
+        return NULL;
+    }
+
+    ent = world->GetTarget(target, true);
 
     if (!ent || !ent->isSubclassOf(SimpleEntity)) {
         return NULL;
     } else {
-        return ent;
+        return static_cast<SimpleEntity*>(ent);
     }
 }
 
diff --git a/code/fgame/simpleentity.h b/code/fgame/simpleentity.h
index 235a4b6c..d9f2aa18 100644
--- a/code/fgame/simpleentity.h
+++ b/code/fgame/simpleentity.h
@@ -64,7 +64,7 @@ public:
     virtual void setOrigin(Vector origin);
     virtual void setOriginEvent(Vector origin);
     virtual void setAngles(Vector angles);
-    str        & Target();
+    const str  & Target();
     qboolean     Targeted(void);
     str        & TargetName();
     virtual void SetTargetName(str targetname);
@@ -91,7 +91,6 @@ public:
     int IsSubclassOfVehiclePoint(void) const;
     int IsSubclassOfSplinePath(void) const;
     int IsSubclassOfCrateObject(void) const;
-    int IsSubclassOfBot(void) const;
 
     void GetOrigin(Event *ev);
     void SetOrigin(Event *ev);
diff --git a/code/fgame/smokegrenade.cpp b/code/fgame/smokegrenade.cpp
index 05543a6f..0ec353c8 100644
--- a/code/fgame/smokegrenade.cpp
+++ b/code/fgame/smokegrenade.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "smokegrenade.h"
 #include "smokesprite.h"
 #include "level.h"
+#include "sentient.h"
 
 Event EV_SmokeGrenade_SetSpawnRate
 (
@@ -32,7 +33,6 @@ Event EV_SmokeGrenade_SetSpawnRate
     "rate",
     "sets how many smoke volumes are spawned per second"
 );
-
 Event EV_SmokeGrenade_SetBouncefactor
 (
     "bouncefactor",
@@ -41,7 +41,6 @@ Event EV_SmokeGrenade_SetBouncefactor
     "factor",
     "sets how far smoke volumes bounce when they collide with something"
 );
-
 Event EV_SmokeGrenade_SetLife
 (
     "life",
@@ -50,7 +49,6 @@ Event EV_SmokeGrenade_SetLife
     "life",
     "sets how long the smoke emitter lives"
 );
-
 Event EV_SmokeGrenade_SetSpawnLife
 (
     "spawnlife",
@@ -59,7 +57,6 @@ Event EV_SmokeGrenade_SetSpawnLife
     "life",
     "sets how long each smoke volume lives"
 );
-
 Event EV_SmokeGrenade_SetScalerate
 (
     "scalerate",
@@ -68,7 +65,6 @@ Event EV_SmokeGrenade_SetScalerate
     "rate",
     "sets how fast the smoke volume grows"
 );
-
 Event EV_SmokeGrenade_SetVelocity
 (
     "velocity",
@@ -77,16 +73,14 @@ Event EV_SmokeGrenade_SetVelocity
     "vel_x vel_y vel_z",
     "sets how fast the smoke volume moves away, with x forward and z up"
 );
-
 Event EV_SmokeGrenade_SetSpin
 (
-    "spawnrate",
+    "spin",
     EV_DEFAULT,
     "f",
     "avel",
     "sets the number of rotations per second for this entity around its z axis"
 );
-
 Event EV_SmokeGrenade_SetOffset
 (
     "offset",
@@ -95,7 +89,6 @@ Event EV_SmokeGrenade_SetOffset
     "offset_x offset_y offset_z",
     "sets offset of the smoke volume from the entity"
 );
-
 Event EV_SmokeGrenade_SetScale
 (
     "scale",
@@ -104,7 +97,6 @@ Event EV_SmokeGrenade_SetScale
     "scale",
     "sets initial scale of each smoke volume"
 );
-
 Event EV_SmokeGrenade_SetFadein
 (
     "fadein",
@@ -113,7 +105,6 @@ Event EV_SmokeGrenade_SetFadein
     "time",
     "sets fadein time from 0 alpha to 1 alpha, in seconds"
 );
-
 Event EV_SmokeGrenade_SetFadedelay
 (
     "fadedelay",
@@ -122,7 +113,6 @@ Event EV_SmokeGrenade_SetFadedelay
     "time",
     "sets how long the entity waits until fading out from 1 alpha to 0 alpha, in seconds"
 );
-
 Event EV_SmokeGrenade_SetMaxAlpha
 (
     "maxalpha",
@@ -132,106 +122,107 @@ Event EV_SmokeGrenade_SetMaxAlpha
     "sets maximum opacity of an individual smoke particle, in 0-1 range"
 );
 
-CLASS_DECLARATION(EffectEntity, SmokeGrenade, "smokegrenade")
-{
-    { &EV_SmokeGrenade_SetSpawnRate,        &SmokeGrenade::EventSetSpawnrate },
-    { &EV_SmokeGrenade_SetBouncefactor,     &SmokeGrenade::EventSetBouncefactor },
-    { &EV_SmokeGrenade_SetLife,             &SmokeGrenade::EventSetLife },
-    { &EV_SmokeGrenade_SetSpawnLife,        &SmokeGrenade::EventSetSpawnLife },
-    { &EV_SmokeGrenade_SetScalerate,        &SmokeGrenade::EventSetScalerate },
-    { &EV_SmokeGrenade_SetVelocity,         &SmokeGrenade::EventSetVelocity },
-    { &EV_SmokeGrenade_SetSpin,             &SmokeGrenade::EventSetSpin },
-    { &EV_SmokeGrenade_SetOffset,           &SmokeGrenade::EventSetOffset },
-    { &EV_SmokeGrenade_SetScale,            &SmokeGrenade::EventSetScale },
-    { &EV_SmokeGrenade_SetFadein,           &SmokeGrenade::EventSetFadein },
-    { &EV_SmokeGrenade_SetFadedelay,        &SmokeGrenade::EventSetFadedelay },
-    { &EV_SmokeGrenade_SetMaxAlpha,         &SmokeGrenade::EventSetMaxAlpha },
-    { NULL, NULL }
+CLASS_DECLARATION(EffectEntity, SmokeGrenade, "smokegrenade") {
+    {&EV_SmokeGrenade_SetSpawnRate,    &SmokeGrenade::EventSetSpawnrate   },
+    {&EV_SmokeGrenade_SetBouncefactor, &SmokeGrenade::EventSetBouncefactor},
+    {&EV_SmokeGrenade_SetLife,         &SmokeGrenade::EventSetLife        },
+    {&EV_SmokeGrenade_SetSpawnLife,    &SmokeGrenade::EventSetSpawnLife   },
+    {&EV_SmokeGrenade_SetScalerate,    &SmokeGrenade::EventSetScalerate   },
+    {&EV_SmokeGrenade_SetVelocity,     &SmokeGrenade::EventSetVelocity    },
+    {&EV_SmokeGrenade_SetSpin,         &SmokeGrenade::EventSetSpin        },
+    {&EV_SmokeGrenade_SetOffset,       &SmokeGrenade::EventSetOffset      },
+    {&EV_SmokeGrenade_SetScale,        &SmokeGrenade::EventSetScale       },
+    {&EV_SmokeGrenade_SetFadein,       &SmokeGrenade::EventSetFadein      },
+    {&EV_SmokeGrenade_SetFadedelay,    &SmokeGrenade::EventSetFadedelay   },
+    {&EV_SmokeGrenade_SetMaxAlpha,     &SmokeGrenade::EventSetMaxAlpha    },
+    {NULL,                             NULL                               }
 };
 
-void SmokeGrenade::EventSetSpawnrate(Event* ev)
+void SmokeGrenade::EventSetSpawnrate(Event *ev)
 {
     float rate = ev->GetFloat(1);
-    if (rate < 0.001f) rate = 0.001f;
+    if (rate < 0.001f) {
+        rate = 0.001f;
+    }
 
     spawnRate = 1000.0f / rate;
 }
 
-void SmokeGrenade::EventSetBouncefactor(Event* ev)
+void SmokeGrenade::EventSetBouncefactor(Event *ev)
 {
     bounceFactor = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetLife(Event* ev)
+void SmokeGrenade::EventSetLife(Event *ev)
 {
     nextRemoveTime = level.time + ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetSpawnLife(Event* ev)
+void SmokeGrenade::EventSetSpawnLife(Event *ev)
 {
     spawnLife = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetScalerate(Event* ev)
+void SmokeGrenade::EventSetScalerate(Event *ev)
 {
     scaleRate = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetVelocity(Event* ev)
+void SmokeGrenade::EventSetVelocity(Event *ev)
 {
     velocity[0] = ev->GetFloat(1);
     velocity[1] = ev->GetFloat(2);
     velocity[2] = ev->GetFloat(3);
 }
 
-void SmokeGrenade::EventSetSpin(Event* ev)
+void SmokeGrenade::EventSetSpin(Event *ev)
 {
     spinRate = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetOffset(Event* ev)
+void SmokeGrenade::EventSetOffset(Event *ev)
 {
     offset[0] = ev->GetFloat(1);
     offset[1] = ev->GetFloat(2);
     offset[2] = ev->GetFloat(3);
 }
 
-void SmokeGrenade::EventSetScale(Event* ev)
+void SmokeGrenade::EventSetScale(Event *ev)
 {
     scale = ev->GetFloat(1) * 0.5;
 }
 
-void SmokeGrenade::EventSetFadein(Event* ev)
+void SmokeGrenade::EventSetFadein(Event *ev)
 {
     fadeIn = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetFadedelay(Event* ev)
+void SmokeGrenade::EventSetFadedelay(Event *ev)
 {
     fadeDelay = ev->GetFloat(1);
 }
 
-void SmokeGrenade::EventSetMaxAlpha(Event* ev)
+void SmokeGrenade::EventSetMaxAlpha(Event *ev)
 {
     maxAlpha = ev->GetFloat(1);
 }
 
 SmokeGrenade::SmokeGrenade()
 {
-    flags           |= FL_THINK;
-    nextRemoveTime  = level.time + 1.0;
-    spawnRate       = 1000;
-    bounceFactor    = 0.0;
-    spawnLife       = 1.0;
-    scaleRate       = 1.0;
-    velocity        = vec_zero;
-    offset          = vec_zero;
-    spinRate        = 0.0;
-    scale           = 1.0;
-    fadeIn          = 0.0;
-    fadeDelay       = spawnLife;
-    maxAlpha        = 1.0;
-    lastSpawnTime   = level.inttime + 150;
+    flags |= FL_THINK;
+    nextRemoveTime = level.time + 1.0;
+    spawnRate      = 1000;
+    bounceFactor   = 0.0;
+    spawnLife      = 1.0;
+    scaleRate      = 1.0;
+    velocity       = vec_zero;
+    offset         = vec_zero;
+    spinRate       = 0.0;
+    scale          = 1.0;
+    fadeIn         = 0.0;
+    fadeDelay      = spawnLife;
+    maxAlpha       = 1.0;
+    lastSpawnTime  = level.inttime + 150;
 }
 
 void SmokeGrenade::Think()
@@ -243,32 +234,57 @@ void SmokeGrenade::Think()
 
     if (level.inttime >= lastSpawnTime + spawnRate) {
         SmokeSprite sp;
-        float degrees;
+        float       degrees;
 
         lastSpawnTime += spawnRate;
 
-        sp.origin = origin;
+        sp.origin    = origin;
         sp.spawnTime = level.time;
-        sp.scale = scale;
+        sp.scale     = scale;
 
         degrees = angles.y + (((level.inttime / 1000.0 - 176.0) * spinRate) * -0.36);
-        
-        RotatePointAroundAxis(
-            sp.velocity,
-            2,
-            velocity,
-            degrees
-        );
 
-        sp.spawnLife = spawnLife;
+        RotatePointAroundAxis(sp.velocity, 2, velocity, degrees);
+
+        sp.spawnLife    = spawnLife;
         sp.bounceFactor = bounceFactor;
-        sp.scaleStart = scale;
-        sp.scaleRate = scaleRate;
-        sp.fadeIn = fadeIn;
-        sp.fadeDelay = fadeDelay;
-        sp.maxAlpha = maxAlpha;
-        sp.owner = owner;
+        sp.scaleStart   = scale;
+        sp.scaleRate    = scaleRate;
+        sp.fadeIn       = fadeIn;
+        sp.fadeDelay    = fadeDelay;
+        sp.maxAlpha     = maxAlpha;
+        sp.owner        = owner;
 
         G_AddSmokeSprite(&sp);
     }
 }
+
+void SmokeGrenade::Archive(Archiver& arc)
+{
+    EffectEntity::Archive(arc);
+
+    arc.ArchiveFloat(&nextRemoveTime);
+    arc.ArchiveInteger(&spawnRate);
+    arc.ArchiveFloat(&bounceFactor);
+    arc.ArchiveFloat(&spawnLife);
+    arc.ArchiveFloat(&scaleRate);
+    arc.ArchiveVector(&velocity);
+    arc.ArchiveFloat(&spinRate);
+    arc.ArchiveVector(&offset);
+    arc.ArchiveFloat(&scale);
+    arc.ArchiveFloat(&fadeIn);
+    arc.ArchiveFloat(&fadeDelay);
+    arc.ArchiveFloat(&maxAlpha);
+    arc.ArchiveInteger(&lastSpawnTime);
+    arc.ArchiveSafePointer(&owner);
+}
+
+void SmokeGrenade::setOwner(Sentient *other)
+{
+    owner = other;
+}
+
+Sentient *SmokeGrenade::getOwner() const
+{
+    return owner;
+}
diff --git a/code/fgame/smokegrenade.h b/code/fgame/smokegrenade.h
index e5d0456a..15b6f710 100644
--- a/code/fgame/smokegrenade.h
+++ b/code/fgame/smokegrenade.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,40 +24,48 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "effectentity.h"
 
-class SmokeGrenade : public EffectEntity {
+class Sentient;
+
+class SmokeGrenade : public EffectEntity
+{
     CLASS_PROTOTYPE(SmokeGrenade);
 
 public:
     SmokeGrenade();
 
-    void EventSetSpawnrate(Event* ev);
-    void EventSetBouncefactor(Event* ev);
-    void EventSetLife(Event* ev);
-    void EventSetSpawnLife(Event* ev);
-    void EventSetScalerate(Event* ev);
-    void EventSetVelocity(Event* ev);
-    void EventSetSpin(Event* ev);
-    void EventSetOffset(Event* ev);
-    void EventSetScale(Event* ev);
-    void EventSetFadein(Event* ev);
-    void EventSetFadedelay(Event* ev);
-    void EventSetMaxAlpha(Event* ev);
+    void EventSetSpawnrate(Event *ev);
+    void EventSetBouncefactor(Event *ev);
+    void EventSetLife(Event *ev);
+    void EventSetSpawnLife(Event *ev);
+    void EventSetScalerate(Event *ev);
+    void EventSetVelocity(Event *ev);
+    void EventSetSpin(Event *ev);
+    void EventSetOffset(Event *ev);
+    void EventSetScale(Event *ev);
+    void EventSetFadein(Event *ev);
+    void EventSetFadedelay(Event *ev);
+    void EventSetMaxAlpha(Event *ev);
 
     void Think() override;
 
+    void Archive(Archiver& arc) override;
+
+    void      setOwner(Sentient *other);
+    Sentient *getOwner() const;
+
 private:
-    float nextRemoveTime;
-    int spawnRate;
-    float bounceFactor;
-    float spawnLife;
-    float scaleRate;
-    Vector velocity;
-    float spinRate;
-    Vector offset;
-    float scale;
-    float fadeIn;
-    float fadeDelay;
-    float maxAlpha;
-    int lastSpawnTime;
-    SafePtr<class Sentient> owner;
+    float             nextRemoveTime;
+    int               spawnRate;
+    float             bounceFactor;
+    float             spawnLife;
+    float             scaleRate;
+    Vector            velocity;
+    float             spinRate;
+    Vector            offset;
+    float             scale;
+    float             fadeIn;
+    float             fadeDelay;
+    float             maxAlpha;
+    int               lastSpawnTime;
+    SafePtr<Sentient> owner;
 };
diff --git a/code/fgame/smokesprite.cpp b/code/fgame/smokesprite.cpp
index 84b916ff..f848a8cb 100644
--- a/code/fgame/smokesprite.cpp
+++ b/code/fgame/smokesprite.cpp
@@ -112,21 +112,64 @@ void G_AddSmokeSprite(const SmokeSprite* sprite)
     g_Sprites.AddObject(*sprite);
 }
 
-float G_ObfuscationForSmokeSprites(float, const Vector& end, const Vector& start) {
-    // FIXME: unimplemented
-    return 0;
+float G_ObfuscationForSmokeSprites(float visibilityAlpha, const Vector& start, const Vector& end) {
+    Vector vDelta = end - start;
+    float fLength = vDelta.length();
+    Vector vDir = vDelta * (1.0 / fLength);
+    float fObfuscation = visibilityAlpha;
+    int i;
+
+    for (i = 1; i <= g_Sprites.NumObjects(); i++) {
+        const SmokeSprite& sprite = g_Sprites.ObjectAt(i);
+        Vector vSpriteDelta = sprite.origin - start;
+        float fDot = vSpriteDelta * vDir;
+        float fTimeAlive;
+
+        if (fDot < -sprite.scale || fDot > fLength + sprite.scale) {
+            continue;
+        }
+
+        if (fDot <= 0) {
+            if (Square(sprite.scale) <= vSpriteDelta.lengthSquared()) {
+                continue;
+            }
+        } else if (fDot >= fLength) {
+            Vector vSpriteEndDelta = sprite.origin - end;
+
+            if (Square(sprite.scale) <= vSpriteEndDelta.lengthSquared()) {
+                continue;
+            }
+        } else {
+            Vector vSpriteEndDelta = vSpriteDelta - (vDir * fDot);
+
+            if (Square(sprite.scale) <= vSpriteEndDelta.lengthSquared()) {
+                continue;
+            }
+        }
+
+        fTimeAlive = level.time - sprite.spawnTime;
+        if (fTimeAlive < sprite.fadeIn) {
+            fObfuscation += sprite.maxAlpha * fTimeAlive / sprite.fadeIn;
+        } else if (sprite.spawnTime + sprite.fadeDelay >= level.svsTime) {
+            fObfuscation += sprite.maxAlpha;
+        } else if (sprite.spawnLife - fTimeAlive > 0) {
+            fObfuscation = (sprite.spawnLife - fTimeAlive) * sprite.maxAlpha / (sprite.spawnLife - sprite.fadeDelay);
+        }
+
+        if(fObfuscation >= 1.0) {
+            // Completely obfuscated
+            return 1.0;
+        }
+    }
+   
+    return fObfuscation;
 }
 
 SmokeSprite* G_GetRandomSmokeSprite() {
-    int randVal;
-    int numObjects;
 
-    if (g_Sprites.NumObjects()) {
+    if (!g_Sprites.NumObjects()) {
         return NULL;
     }
 
-    numObjects = g_Sprites.NumObjects();
-    randVal = rand();
-
-    return &g_Sprites.ObjectAt(randVal - randVal / numObjects * numObjects + 1);
+    return &g_Sprites.ObjectAt((rand() % g_Sprites.NumObjects()) + 1);
 }
diff --git a/code/fgame/smokesprite.h b/code/fgame/smokesprite.h
index fc835685..37be9d4e 100644
--- a/code/fgame/smokesprite.h
+++ b/code/fgame/smokesprite.h
@@ -45,6 +45,6 @@ public:
 void G_ResetSmokeSprites();
 void G_ArchiveSmokeSprites(Archiver& arc);
 void G_UpdateSmokeSprites();
-float G_ObfuscationForSmokeSprites(float, const Vector& end, const Vector& start);
+float G_ObfuscationForSmokeSprites(float visibilityAlpha, const Vector& start, const Vector& end);
 SmokeSprite* G_GetRandomSmokeSprite();
 void G_AddSmokeSprite(const SmokeSprite* sprite);
diff --git a/code/fgame/soundman.h b/code/fgame/soundman.h
index 3ac6e758..2f0943ad 100644
--- a/code/fgame/soundman.h
+++ b/code/fgame/soundman.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // soundman.h: Sound Manager
 // 
 
-#ifndef __SOUND_MANAGER_H__
-#define __SOUND_MANAGER_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -110,5 +109,3 @@ inline void SoundManager::Archive
    }
 
 extern SoundManager SoundMan;
-
-#endif /* camera.h */
diff --git a/code/fgame/specialfx.h b/code/fgame/specialfx.h
index 2e52e41a..fc2138a0 100644
--- a/code/fgame/specialfx.h
+++ b/code/fgame/specialfx.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // specialfx.h: special effects
 // 
 
-#ifndef __SPECIAL_FX_H__
-#define __SPECIAL_FX_H__
+#pragma once
 
 #include "g_local.h"
 #include "scriptslave.h"
@@ -174,5 +173,3 @@ inline void SinkObject::Archive
    arc.ArchiveBoolean( &active );
    arc.ArchiveVector( &startpos );
    }
-
-#endif /* specialfx.h */
diff --git a/code/fgame/spline.h b/code/fgame/spline.h
index 77f11968..a32dc460 100644
--- a/code/fgame/spline.h
+++ b/code/fgame/spline.h
@@ -23,320 +23,258 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // spline.h: Spline paths.
 //
 
-#ifndef __SPLINE_H__
-#define __SPLINE_H__
+#pragma once
 
 #include "g_local.h"
 #include <class.h>
 
-template< unsigned int cGrids, unsigned int cPoints >
+template<unsigned int cGrids, unsigned int cPoints>
 class cSpline : public Class
 {
 public:
-	int m_iPoints;
-	float m_vPoints[ cPoints ][ cGrids ];
-	int m_iPointFlags[ cPoints ];
+    int   m_iPoints;
+    float m_vPoints[cPoints][cGrids];
+    int   m_iPointFlags[cPoints];
 
-	void			Reset( void );
-	int				Add( float *fAdd, int flags );
-	void			Modify( int, float *, int );
-	void			UniformAdd( float *pos );
-	void			Remove( class cSpline<cGrids, cPoints> *, int );
-	void			RemoveRange( int, int );
-	int				Right( float x );
-	float			*Get( float x, int *flags );
-	float			*GetByNode( float x, int *flags );
-	int				Append( cSpline<cGrids, cPoints> *pNew );
+    cSpline();
 
-	void			Archive( Archiver& arc );
+    void   Reset(void);
+    int    Add(float *fAdd, int flags);
+    void   Modify(int, float *, int);
+    void   UniformAdd(float *pos);
+    void   Remove(class cSpline<cGrids, cPoints> *, int);
+    void   RemoveRange(int, int);
+    int    Right(float x);
+    float *Get(float x, int *flags);
+    float *GetByNode(float x, int *flags);
+    int    Append(cSpline<cGrids, cPoints> *pNew);
+
+    void Archive(Archiver& arc);
 };
 
-template< unsigned int cGrids, unsigned int cPoints >
-void cSpline< cGrids, cPoints >::Archive
-	(
-	Archiver& arc
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+cSpline<cGrids, cPoints>::cSpline()
 {
-	arc.ArchiveInteger( &m_iPoints );
-
-	for( int i = 0; i < cPoints; i++ )
-	{
-		for( int j = 0; i < cGrids; i++ )
-		{
-			arc.ArchiveFloat( &m_vPoints[ i ][ j ] );
-		}
-
-		arc.ArchiveInteger( &m_iPointFlags[ i ] );
-	}
+    m_iPoints = 0;
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-void cSpline< cGrids, cPoints >::Reset
-	(
-	void
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+void cSpline<cGrids, cPoints>::Archive(Archiver& arc)
 {
-	m_iPoints = 0;
+    arc.ArchiveInteger(&m_iPoints);
+
+    for (int i = 0; i < cPoints; i++) {
+        for (int j = 0; j < cGrids; j++) {
+            arc.ArchiveFloat(&m_vPoints[i][j]);
+        }
+
+        arc.ArchiveInteger(&m_iPointFlags[i]);
+    }
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-int cSpline< cGrids, cPoints >::Add
-	(
-	float *fAdd,
-	int flags
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+void cSpline<cGrids, cPoints>::Reset(void)
 {
-	int i;
-	int ii;
-	int insertIndex;
-
-	if( m_iPoints + 1 > 512 ) {
-		return -1;
-	}
-
-	insertIndex = Right( *fAdd );
-
-	for( i = m_iPoints; i > insertIndex; i-- )
-	{
-		for( ii = 0; ii < cGrids; ii++ )
-		{
-			m_vPoints[ i ][ ii ] = m_vPoints[ i - 1 ][ ii ];
-		}
-
-		m_iPointFlags[ i ] = m_iPointFlags[ i - 1 ];
-	}
-
-	for( i = 0; i < cGrids; i++ )
-	{
-		m_vPoints[ insertIndex ][ i ] = fAdd[ i ];
-	}
-
-	m_iPointFlags[ insertIndex ] = flags;
-	m_iPoints++;
-
-	return insertIndex;
+    m_iPoints = 0;
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-void cSpline< cGrids, cPoints >::UniformAdd
-	(
-	float *pos
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+int cSpline<cGrids, cPoints>::Add(float *fAdd, int flags)
 {
-	int i;
-	int ii;
+    int i;
+    int ii;
+    int insertIndex;
 
-	for( i = m_iPoints; i > 0; i-- )
-	{
-		for( ii = 0; ii <= cGrids; ii++ )
-		{
-			m_vPoints[ i ][ ii ] += pos[ ii ];
-		}
-	}
+    if (m_iPoints + 1 > cPoints) {
+        return -1;
+    }
+
+    insertIndex = Right(*fAdd);
+
+    for (i = m_iPoints; i > insertIndex; i--) {
+        for (ii = 0; ii < cGrids; ii++) {
+            m_vPoints[i][ii] = m_vPoints[i - 1][ii];
+        }
+
+        m_iPointFlags[i] = m_iPointFlags[i - 1];
+    }
+
+    for (i = 0; i < cGrids; i++) {
+        m_vPoints[insertIndex][i] = fAdd[i];
+    }
+
+    m_iPointFlags[insertIndex] = flags;
+    m_iPoints++;
+
+    return insertIndex;
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-int cSpline< cGrids, cPoints >::Right
-	(
-	float x
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+void cSpline<cGrids, cPoints>::UniformAdd(float *pos)
 {
-	int i;
+    int i;
+    int ii;
 
-	for( i = 0; i < m_iPoints; i++ )
-	{
-		if( m_vPoints[ i ][ 0 ] > x ) {
-			break;
-		}
-	}
-
-	return i;
+    for (i = 0; i < m_iPoints; i++) {
+        for (ii = 0; ii < cGrids; ii++) {
+            m_vPoints[i][ii] += pos[ii];
+        }
+    }
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-float *cSpline< cGrids, cPoints >::Get
-	(
-	float x,
-	int *flags
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+int cSpline<cGrids, cPoints>::Right(float x)
 {
-	if( !m_iPoints )
-	{
-		return NULL;
-	}
+    int i;
 
-	int rp;
-	int i;
-	static float r[ cGrids ];
-	double delta[ cGrids ];
+    for (i = 0; i < m_iPoints; i++) {
+        if (m_vPoints[i][0] > x) {
+            break;
+        }
+    }
 
-	rp = Right( x );
-
-	if( rp )
-	{
-		if( rp == m_iPoints )
-		{
-			if( flags )
-			{
-				*flags = m_iPointFlags[ rp - 1 ];
-			}
-
-			for( i = 0; i < cGrids; i++ )
-			{
-				r[ i ] = m_vPoints[ rp - 1 ][ i ];
-			}
-		}
-		else
-		{
-			if( flags )
-			{
-				*flags = m_iPointFlags[ rp - 1 ];
-			}
-
-			for( i = 0; i < cGrids; i++ )
-			{
-				delta[ i ] = m_vPoints[ rp ][ i ] - m_vPoints[ rp - 1 ][ i ];
-			}
-
-			for( i = 0; i < cGrids; i++ )
-			{
-				r[ i ] = ( x - m_vPoints[ rp - 1 ][ 0 ] ) / delta[ 0 ] * delta[ i ] + m_vPoints[ rp - 1 ][ i ];
-			}
-		}
-	}
-	else
-	{
-		if( flags )
-		{
-			*flags = m_iPointFlags[ 0 ];
-		}
-
-		for( i = 0; i < 4; i++ )
-		{
-			r[ i ] = m_vPoints[ 0 ][ i ];
-		}
-	}
-
-	return r;
+    return i;
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-float *cSpline< cGrids, cPoints >::GetByNode
-	(
-	float x,
-	int *flags
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+float *cSpline<cGrids, cPoints>::Get(float x, int *flags)
 {
-	if( !m_iPoints )
-	{
-		return NULL;
-	}
+    if (!m_iPoints) {
+        return NULL;
+    }
 
-	int rp;
-	int i;
-	static float r[ cGrids ];
-	double delta[ cGrids ];
+    int          rp;
+    int          i;
+    static float r[cGrids];
+    double       delta[cGrids];
 
-	rp = ( int )( floor( x ) + 1.0f );
+    rp = Right(x);
 
-	if( rp <= 0 )
-	{
-		if( flags )
-		{
-			*flags = m_iPointFlags[ 0 ];
-		}
+    if (rp) {
+        if (rp == m_iPoints) {
+            if (flags) {
+                *flags = m_iPointFlags[rp - 1];
+            }
 
-		for( i = 0; i < cGrids; i++ )
-		{
-			r[ i ] = m_vPoints[ 0 ][ i ];
-		}
-	}
-	else if( rp < m_iPoints )
-	{
-		if( flags )
-		{
-			*flags = m_iPointFlags[ rp - 1 ];
-		}
+            for (i = 0; i < cGrids; i++) {
+                r[i] = m_vPoints[rp - 1][i];
+            }
+        } else {
+            if (flags) {
+                *flags = m_iPointFlags[rp - 1];
+            }
 
-		for( i = 0; i < cGrids; i++ )
-		{
-			delta[ i ] = m_vPoints[ rp ][ i ] - m_vPoints[ rp - 1 ][ i ];
-		}
+            for (i = 0; i < cGrids; i++) {
+                delta[i] = m_vPoints[rp][i] - m_vPoints[rp - 1][i];
+            }
 
-		for( i = 0; i < cGrids; i++ )
-		{
-			r[ i ] = ( x - ( rp - 1 ) ) * delta[ i ] + m_vPoints[ rp - 1 ][ i ];
-		}
-	}
-	else
-	{
-		if( flags )
-		{
-			*flags = m_iPointFlags[ rp - 1 ];
-		}
+            for (i = 0; i < cGrids; i++) {
+                r[i] = (x - m_vPoints[rp - 1][0]) / delta[0] * delta[i] + m_vPoints[rp - 1][i];
+            }
+        }
+    } else {
+        if (flags) {
+            *flags = m_iPointFlags[0];
+        }
 
-		for( i = 0; i < cGrids; i++ )
-		{
-			r[ i ] = m_vPoints[ rp - 1 ][ i ];
-		}
-	}
+        for (i = 0; i < cGrids; i++) {
+            r[i] = m_vPoints[0][i];
+        }
+    }
 
-	return r;
+    return r;
 }
 
-template< unsigned int cGrids, unsigned int cPoints >
-int	cSpline< cGrids, cPoints >::Append
-	(
-	cSpline< cGrids, cPoints > *pNew
-	)
+template<unsigned int cGrids, unsigned int cPoints>
+float *cSpline<cGrids, cPoints>::GetByNode(float x, int *flags)
 {
-	float *i_fTmp;
-	float o_fTmp[ 4 ];
-	float fIndexAdd;
-	int i;
-	int ii;
-	int iFlags;
+    if (!m_iPoints) {
+        return NULL;
+    }
 
-	if( !pNew || pNew->m_iPoints == 0 )
-	{
-		return -1;
-	}
+    int          rp;
+    int          i;
+    static float r[cGrids];
+    double       delta[cGrids];
 
-	if( m_iPoints )
-	{
-		fIndexAdd = *GetByNode( m_iPoints, NULL );
+    rp = (int)(floor(x) + 1.0);
 
-		for( i = 0; i < pNew->m_iPoints; i++ )
-		{
-			i_fTmp = pNew->GetByNode( i, &iFlags );
+    if (rp <= 0) {
+        if (flags) {
+            *flags = m_iPointFlags[0];
+        }
 
-			for( ii = 0; ii < cGrids; ii++ )
-			{
-				o_fTmp[ ii ] = i_fTmp[ ii ];
-			}
+        for (i = 0; i < cGrids; i++) {
+            r[i] = m_vPoints[0][i];
+        }
+    } else if (rp < m_iPoints) {
+        if (flags) {
+            *flags = m_iPointFlags[rp - 1];
+        }
 
-			o_fTmp[ 0 ] += fIndexAdd;
-			Add( o_fTmp, iFlags );
-		}
+        for (i = 0; i < cGrids; i++) {
+            delta[i] = m_vPoints[rp][i] - m_vPoints[rp - 1][i];
+        }
 
-		return m_iPoints;
-	}
-	else
-	{
-		for( i = 0; i < pNew->m_iPoints; i++ )
-		{
-			i_fTmp = pNew->GetByNode( i, &iFlags );
+        for (i = 0; i < cGrids; i++) {
+            r[i] = (x - (rp - 1)) * delta[i] + m_vPoints[rp - 1][i];
+        }
+    } else {
+        if (flags) {
+            *flags = m_iPointFlags[m_iPoints - 1];
+        }
 
-			for( ii = 0; ii < cGrids; ii++ )
-			{
-				o_fTmp[ ii ] = i_fTmp[ ii ];
-			}
+        for (i = 0; i < cGrids; i++) {
+            r[i] = m_vPoints[m_iPoints - 1][i];
+        }
+    }
 
-			Add( o_fTmp, iFlags );
-		}
-
-		return 0;
-	}
+    return r;
 }
 
-#endif // __SPLINE_H__
+template<unsigned int cGrids, unsigned int cPoints>
+int cSpline<cGrids, cPoints>::Append(cSpline<cGrids, cPoints> *pNew)
+{
+    float *i_fTmp;
+    float  o_fTmp[4];
+    float  fIndexAdd;
+    int    i;
+    int    ii;
+    int    iFlags = 0;
+
+    if (!pNew || pNew->m_iPoints == 0) {
+        return -1;
+    }
+
+    if (m_iPoints) {
+        int points;
+
+        points = m_iPoints;
+        fIndexAdd = *GetByNode(m_iPoints, NULL);
+
+        for (i = 0; i < pNew->m_iPoints; i++) {
+            i_fTmp = pNew->GetByNode(i, &iFlags);
+
+            for (ii = 0; ii < cGrids; ii++) {
+                o_fTmp[ii] = i_fTmp[ii];
+            }
+
+            o_fTmp[0] += fIndexAdd;
+            Add(o_fTmp, iFlags);
+        }
+
+        return points;
+    } else {
+        for (i = 0; i < pNew->m_iPoints; i++) {
+            i_fTmp = pNew->GetByNode(i, &iFlags);
+
+            for (ii = 0; ii < cGrids; ii++) {
+                o_fTmp[ii] = i_fTmp[ii];
+            }
+
+            Add(o_fTmp, iFlags);
+        }
+
+        return 0;
+    }
+}
diff --git a/code/fgame/stack.h b/code/fgame/stack.h
index 86d4807b..e67df81e 100644
--- a/code/fgame/stack.h
+++ b/code/fgame/stack.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // stack.h: Generic Stack object.
 // 
 
-#ifndef __STACK_H__
-#define __STACK_H__
+#pragma once
 
 #include "g_local.h"
 #include "class.h"
@@ -142,5 +141,3 @@ inline Type Stack<Type>::Pop
 
 	return ret;
 	}
-
-#endif /* stack.h */
diff --git a/code/fgame/trigger.cpp b/code/fgame/trigger.cpp
index 21de2093..0cc77ade 100644
--- a/code/fgame/trigger.cpp
+++ b/code/fgame/trigger.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "trigger.h"
 #include "scriptmaster.h"
 #include "parm.h"
-#include "world.h"
+#include "worldspawn.h"
 #include "barrels.h"
 
 Event EV_Trigger_ActivateTargets
@@ -77,7 +77,7 @@ Event EV_Trigger_SetCount
     EV_DEFAULT,
     "i",
     "count",
-    "Set the amount of times this trigger can be triggered",
+    "Set the number of times this trigger can be triggered",
     EV_NORMAL
 );
 Event EV_Trigger_SetMessage
@@ -110,7 +110,7 @@ Event EV_Trigger_SetSound
 Event EV_Trigger_SetThread
 (
     "setthread",
-    EV_DEFAULT, 
+    EV_DEFAULT,
     "s",
     "thread",
     "Set the thread to execute when this trigger is activated",
@@ -190,6 +190,15 @@ Event EV_Trigger_SetTriggerCone
     "Sets the cone in which directed triggers will trigger.",
     EV_NORMAL
 );
+Event EV_Trigger_GetActivator
+(
+    "activator",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get's entity who last activated this trigger.",
+    EV_GETTER
+);
 
 #define MULTI_ACTIVATE      1
 #define INVISIBLE           2
@@ -251,6 +260,7 @@ CLASS_DECLARATION(Animate, Trigger, "trigger_multiple") {
     {&EV_Trigger_SetMultiFaceted,   &Trigger::SetMultiFaceted  },
     {&EV_Trigger_SetEdgeTriggered,  &Trigger::SetEdgeTriggered },
     {&EV_Trigger_SetTriggerCone,    &Trigger::SetTriggerCone   },
+    {&EV_Trigger_GetActivator,      &Trigger::EventGetActivator},
     {NULL,                          NULL                       }
 };
 
@@ -312,7 +322,6 @@ Trigger::Trigger()
 Trigger::~Trigger() {}
 
 void Trigger::SetTriggerDir(float angle)
-
 {
     triggerDirYaw = angle;
     triggerDir    = G_GetMovedir(angle);
@@ -320,13 +329,11 @@ void Trigger::SetTriggerDir(float angle)
 }
 
 Vector Trigger::GetTriggerDir(void)
-
 {
     return triggerDir;
 }
 
 void Trigger::SetTriggerCone(Event *ev)
-
 {
     triggerCone = cos(DEG2RAD(ev->GetFloat(1)));
 }
@@ -337,7 +344,6 @@ qboolean Trigger::UsingTriggerDir(void)
 }
 
 void Trigger::SetTriggerDir(Event *ev)
-
 {
     SetTriggerDir(ev->GetFloat(1));
 }
@@ -346,7 +352,7 @@ void Trigger::SetModelEvent(Event *ev)
 {
     Animate::SetModelEvent(ev);
     if (spawnflags & TRIGGER_DAMAGE) {
-        setContents(CONTENTS_TRIGGER);
+        setContents(CONTENTS_CLAYPIDGEON);
     } else {
         setContents(0);
     }
@@ -358,31 +364,36 @@ void Trigger::StartThread(Event *ev)
 {
     SafePtr<Trigger> This = this;
 
-    parm.other = ev->GetEntity(1);
+    parm.other = NULL;
 
-    if (ev->NumArgs() > 1) {
-        parm.owner = ev->GetEntity(2);
+    if (ev->NumArgs() > 0) {
+        parm.other = ev->GetEntity(1);
     }
 
+    parm.other = ev->NumArgs() > 0 ? ev->GetEntity(1) : NULL;
+    parm.owner = ev->NumArgs() > 1 ? ev->GetEntity(2) : NULL;
+
     Unregister(STRING_TRIGGER);
 
     if (This) {
-        m_Thread.Execute(this);
+        //m_Thread.Execute(this);
+        // Changed in 2.30
+        //  First parameter of the thread label is parm.other
+        //  Second parameter of the thread label is parm.owner
+        m_Thread.Execute(This, parm.other, parm.owner);
     }
 }
 
 qboolean Trigger::respondTo(Entity *other)
-
 {
     return (
         ((respondto & TRIGGER_PLAYERS) && other->isClient())
-        || ((respondto & TRIGGER_MONSTERS) && other->isSubclassOf(Actor))
-        || ((respondto & TRIGGER_PROJECTILES) && other->isSubclassOf(Projectile))
+        || ((respondto & TRIGGER_MONSTERS) && other->IsSubclassOfActor())
+        || ((respondto & TRIGGER_PROJECTILES) && other->IsSubclassOfProjectile())
     );
 }
 
 Entity *Trigger::getActivator(Entity *other)
-
 {
     return other;
 }
@@ -399,6 +410,11 @@ void Trigger::TriggerStuff(Event *ev)
         return;
     }
 
+    if (isSubclassOf(TriggerUse) && *ev != EV_Use) {
+        Com_Printf("^~^~^  Attempting to trigger TriggerUse with non-use trigger\n");
+        return;
+    }
+
     // Don't bother with testing anything if we can't trigger yet
     if ((level.time < trigger_time) || (trigger_time == -1)) {
         // if we are edgeTriggered, we reset our time until we leave the trigger
@@ -408,19 +424,32 @@ void Trigger::TriggerStuff(Event *ev)
         return;
     }
 
+    /*
     health = max_health;
     if (health && (*ev != EV_Killed) && (*ev != EV_Activate)) {
         // if health is set, we only respond to killed and activate messages
         return;
     }
+    */
 
     other = ev->GetEntity(1);
 
     assert(other != this);
 
+    if (other == this) {
+        ScriptError("trigger '%s' triggered by self", TargetName().c_str());
+    }
+
+    // Fixed in OPM
+    //  Safety check
+    if (other == NULL) {
+        ScriptError("trigger '%s' triggered by NULL entity", TargetName().c_str());
+    }
+
     // Always respond to activate messages from the world since they're probably from
     // the "trigger" command
-    if (!respondTo(other) && !((other == world) && (*ev == EV_Activate)) && (!other || !other->isSubclassOf(Camera))) {
+    if (!respondTo(other) && (other != world || *ev != EV_Activate)
+        && (!other || (!other->isSubclassOf(Camera) && !other->isSubclassOf(BarrelObject)))) {
         return;
     }
 
@@ -428,7 +457,7 @@ void Trigger::TriggerStuff(Event *ev)
     // if we setup an angle for this trigger, only trigger if other is within ~60 degrees of the triggers origin
     // only test for this case if we were touched, activating or killed should never go through this code
     //
-    if (useTriggerDir && (*ev == EV_Touch)) {
+    if (useTriggerDir && (*ev == EV_Touch || (*ev == EV_Use && isSubclassOf(TriggerSidedUse)))) {
         Vector norm;
         float  dot;
 
@@ -476,7 +505,9 @@ void Trigger::TriggerStuff(Event *ev)
         whatToTrigger = 0;
     }
 
-    trigger_time = level.time + wait;
+    if (takedamage == DAMAGE_NO) {
+        trigger_time = level.time + wait;
+    }
 
     if (!whatToTrigger) {
         event = new Event(EV_Trigger_Effect);
@@ -493,10 +524,14 @@ void Trigger::TriggerStuff(Event *ev)
     PostEvent(event, delay);
 
     // don't trigger the thread if we were triggered by the world touching us
-    if ((activator != world) || (ev->eventnum != EV_Touch.eventnum)) {
+    if ((activator != world) || (*ev != EV_Touch)) {
         event = new Event(EV_Trigger_StartThread);
         if (activator) {
             event->AddEntity(activator);
+            if (activator->IsSubclassOfProjectile()) {
+                Projectile* proj = static_cast<Projectile*>(activator);
+                event->AddEntity(G_GetEntity(proj->owner));
+            }
         }
         PostEvent(event, delay);
     }
@@ -535,7 +570,6 @@ void Trigger::TriggerStuff(Event *ev)
 //==============================
 //
 void Trigger::ActivateTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -612,13 +646,11 @@ void Trigger::ActivateTargets(Event *ev)
 }
 
 void Trigger::EventSetWait(Event *ev)
-
 {
     wait = ev->GetFloat(1);
 }
 
 void Trigger::EventSetDelay(Event *ev)
-
 {
     delay = ev->GetFloat(1);
 }
@@ -631,20 +663,18 @@ void Trigger::EventSetThread(Event *ev)
         m_Thread.Set(ev->GetString(1));
     }
 }
-void Trigger::EventSetCount(Event *ev)
 
+void Trigger::EventSetCount(Event *ev)
 {
     count = ev->GetInteger(1);
 }
 
 void Trigger::EventSetMessage(Event *ev)
-
 {
     SetMessage(ev->GetString(1));
 }
 
 void Trigger::SetMessage(const char *text)
-
 {
     if (text) {
         message = Director.AddString(text);
@@ -654,19 +684,16 @@ void Trigger::SetMessage(const char *text)
 }
 
 str& Trigger::Message(void)
-
 {
     return Director.GetString(message);
 }
 
 void Trigger::EventSetNoise(Event *ev)
-
 {
     SetNoise(ev->GetString(1));
 }
 
 void Trigger::SetNoise(const char *text)
-
 {
     if (text) {
         noise = Director.AddString(text);
@@ -678,7 +705,6 @@ void Trigger::SetNoise(const char *text)
 }
 
 str& Trigger::Noise(void)
-
 {
     return Director.GetString(noise);
 }
@@ -723,6 +749,57 @@ void Trigger::SetNotTriggerable(Event *ev)
     triggerable = qfalse;
 }
 
+void Trigger::DamageEvent(Event *ev)
+{
+    Entity *attacker;
+    int     damage;
+    Vector  dir;
+    Vector  momentum;
+
+    if (!takedamage) {
+        return;
+    }
+
+    if (Immune(ev->GetInteger(9))) {
+        // trigger is immune
+        return;
+    }
+
+    attacker = ev->GetEntity(1);
+    if (!attacker) {
+        ScriptError("attacker is NULL");
+    }
+
+    if (max_health) {
+        if (health <= 0) {
+            return;
+        }
+
+        damage = ev->GetInteger(2);
+        health -= damage;
+    }
+
+    if (health <= 0) {
+        Event *event;
+
+        if (max_health) {
+            deadflag = DEAD_DEAD;
+        }
+
+        event = new Event(EV_Activate, 1);
+        event->AddEntity(attacker);
+        ProcessEvent(event);
+    }
+
+    // notify scripts about the damage
+    Unregister(STRING_DAMAGE);
+}
+
+void Trigger::EventGetActivator(Event *ev)
+{
+    ev->AddEntity(activator);
+}
+
 void Trigger::Archive(Archiver& arc)
 {
     Animate::Archive(arc);
@@ -737,6 +814,7 @@ void Trigger::Archive(Archiver& arc)
         SetNoise(Director.GetString(noise).c_str());
     }
     Director.ArchiveString(arc, message);
+    m_Thread.Archive(arc);
     arc.ArchiveSafePointer(&activator);
     arc.ArchiveInteger(&respondto);
     arc.ArchiveBoolean(&useTriggerDir);
@@ -759,7 +837,7 @@ CLASS_DECLARATION(Trigger, TriggerVehicle, "trigger_vehicle") {
 
 qboolean TriggerVehicle::respondTo(Entity *other)
 {
-    if ((other->IsSubclassOfVehicle()) || isSubclassOf(VehicleCollisionEntity)) {
+    if ((other->IsSubclassOfVehicle()) || other->isSubclassOf(VehicleCollisionEntity)) {
         return qtrue;
     } else {
         return qfalse;
@@ -793,6 +871,7 @@ If DAMAGE is set, the trigger will only respond to bullets
 set "message" to text string
 
 ******************************************************************************/
+
 CLASS_DECLARATION(Trigger, TriggerAll, "trigger_multipleall") {
     {&EV_Touch,    &TriggerAll::TriggerStuff},
     {&EV_Activate, &TriggerAll::TriggerStuff},
@@ -821,6 +900,12 @@ void TriggerAll::TriggerStuff(Event *ev)
         ScriptError("trigger '%s' triggered by self", TargetName().c_str());
     }
 
+    // Fixed in OPM
+    //  Safety check
+    if (other == NULL) {
+        ScriptError("trigger '%s' triggered by NULL entity", TargetName().c_str());
+    }
+
     // Always respond to activate messages from the world since they're probably from
     // the "trigger" command
     if (!respondTo(other) && !((other == world) && (*ev == EV_Activate))
@@ -907,10 +992,14 @@ void TriggerAll::TriggerStuff(Event *ev)
     PostEvent(event, delay);
 
     // don't trigger the thread if we were triggered by the world touching us
-    if ((activator != world) || (ev->eventnum != EV_Touch.eventnum)) {
+    if ((activator != world) || (*ev != EV_Touch)) {
         event = new Event(EV_Trigger_StartThread);
         if (activator) {
             event->AddEntity(activator);
+            if (activator->IsSubclassOfProjectile()) {
+                Projectile* proj = static_cast<Projectile*>(activator);
+                event->AddEntity(G_GetEntity(proj->owner));
+            }
         }
         PostEvent(event, delay);
     }
@@ -987,7 +1076,6 @@ TouchField::TouchField()
 }
 
 void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vector max, int respondto)
-
 {
     assert(ownerentity);
     if (!ownerentity) {
@@ -1010,13 +1098,12 @@ void TouchField::Setup(Entity *ownerentity, Event& touchevent, Vector min, Vecto
 }
 
 void TouchField::SendEvent(Event *ev)
-
 {
     Event *event;
 
     // Check if our owner is still around
     if (owner) {
-        event = new Event(ontouch);
+        event = new Event(*ontouch);
         event->AddEntity(ev->GetEntity(1));
         owner->PostEvent(event, delay);
     } else {
@@ -1119,7 +1206,8 @@ set "message" to text string
 
 ******************************************************************************/
 
-Event EV_TriggerSave_SaveName(
+Event EV_TriggerSave_SaveName
+(
     "savename",
     EV_DEFAULT,
     "s",
@@ -1127,6 +1215,16 @@ Event EV_TriggerSave_SaveName(
     "Sets the name which is appended to the world.message for this specific autosave"
 );
 
+TriggerSave::TriggerSave()
+{
+    if (LoadingSavegame) {
+        return;
+    }
+
+    m_sSaveName = "";
+    SetTargetName("autosave");
+}
+
 void TriggerSave::SaveGame(Event *ev)
 {
     gi.setConfigstring(CS_SAVENAME, m_sSaveName);
@@ -1135,13 +1233,13 @@ void TriggerSave::SaveGame(Event *ev)
 
 void TriggerSave::EventSaveName(Event *ev)
 {
-    m_sSaveName = ev->GetConstString(1);
+    m_sSaveName = ev->GetString(1);
 }
 
 void TriggerSave::Archive(Archiver& arc)
 {
-	Trigger::Archive(arc);
-	arc.ArchiveString(&m_sSaveName);
+    Trigger::Archive(arc);
+    arc.ArchiveString(&m_sSaveName);
 }
 
 CLASS_DECLARATION(Trigger, TriggerSave, "trigger_save") {
@@ -1211,7 +1309,6 @@ TriggerSecret::TriggerSecret()
 }
 
 void TriggerSecret::FoundSecret(Event *ev)
-
 {
     //
     // anything that causes the trigger to fire increments the number
@@ -1219,7 +1316,7 @@ void TriggerSecret::FoundSecret(Event *ev)
     // secret from the script, the player still gets credit for finding
     // it.  This is to prevent a secret from becoming undiscoverable.
     //
-    level.found_secrets++;  
+    level.found_secrets++;
 }
 
 /*****************************************************************************/
@@ -1297,7 +1394,6 @@ void TriggerPush::SetPushDir(Event *ev)
 }
 
 void TriggerPush::SetPushSpeed(Event *ev)
-
 {
     speed = ev->GetFloat(1);
 }
@@ -1308,7 +1404,7 @@ TriggerPush::TriggerPush()
         // Archive function will setup all necessary data
         return;
     }
-    speed     = 1000;
+    speed = 1000;
 }
 
 /*****************************************************************************/
@@ -1351,7 +1447,7 @@ TriggerPushAny::TriggerPushAny()
         // Archive function will setup all necessary data
         return;
     }
-    speed     = 1000;
+    speed = 1000;
 }
 
 void TriggerPushAny::Push(Event *ev)
@@ -1432,7 +1528,6 @@ CLASS_DECLARATION(Trigger, TriggerPlaySound, "play_sound_triggered") {
 };
 
 void TriggerPlaySound::ToggleSound(Event *ev)
-
 {
     if (!state) {
         // noise should already be initialized
@@ -1458,7 +1553,6 @@ void TriggerPlaySound::ToggleSound(Event *ev)
 }
 
 void TriggerPlaySound::StartSound(void)
-
 {
     // turn the current one off
     state = 1;
@@ -1470,31 +1564,26 @@ void TriggerPlaySound::StartSound(void)
 }
 
 void TriggerPlaySound::SetVolume(float vol)
-
 {
     volume = vol;
 }
 
 void TriggerPlaySound::SetVolume(Event *ev)
-
 {
     volume = ev->GetFloat(1);
 }
 
 void TriggerPlaySound::SetMinDist(float dist)
-
 {
     min_dist = dist;
 }
 
 void TriggerPlaySound::SetMinDist(Event *ev)
-
 {
     min_dist = ev->GetFloat(1);
 }
 
 void TriggerPlaySound::SetChannel(Event *ev)
-
 {
     channel = ev->GetInteger(1);
 }
@@ -1628,7 +1717,6 @@ CLASS_DECLARATION(TriggerSpeaker, RandomSpeaker, "sound_randomspeaker") {
 };
 
 void RandomSpeaker::TriggerSound(Event *ev)
-
 {
     ScheduleSound();
     if (G_Random(1) <= chance) {
@@ -1637,44 +1725,37 @@ void RandomSpeaker::TriggerSound(Event *ev)
 }
 
 void RandomSpeaker::ScheduleSound(void)
-
 {
     CancelEventsOfType(EV_Trigger_Effect);
     PostEvent(EV_Trigger_Effect, mindelay + G_Random(maxdelay - mindelay));
 }
 
 void RandomSpeaker::SetMinDelay(Event *ev)
-
 {
     mindelay = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetMaxDelay(Event *ev)
-
 {
     maxdelay = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetChance(Event *ev)
-
 {
     chance = ev->GetFloat(1);
 }
 
 void RandomSpeaker::SetMinDelay(float newMinDelay)
-
 {
     mindelay = newMinDelay;
 }
 
 void RandomSpeaker::SetMaxDelay(float newMaxDelay)
-
 {
     maxdelay = newMaxDelay;
 }
 
 void RandomSpeaker::SetChance(float newChance)
-
 {
     chance = newChance;
 }
@@ -1752,7 +1833,6 @@ TriggerChangeLevel::TriggerChangeLevel()
 }
 
 void TriggerChangeLevel::SetMap(Event *ev)
-
 {
     map = ev->GetConstString(1);
 }
@@ -1796,7 +1876,7 @@ void TriggerChangeLevel::ChangeLevel(Event *ev)
     //
     m_Thread.Execute();
 
-    if (g_gametype->integer) {
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
         G_BeginIntermission2();
         return;
     }
@@ -1855,9 +1935,28 @@ CLASS_DECLARATION(Trigger, TriggerUse, "trigger_use") {
     {NULL,      NULL                     }
 };
 
-TriggerUse::TriggerUse()
-{
-}
+TriggerUse::TriggerUse() {}
+
+/*****************************************************************************/
+/*QUAKED trigger_sideduse (1 0 0) ? x x NOT_PLAYERS MONSTERS
+
+Activates targets when 'used' by an entity. It is usable only within specific degrees.
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+If NOT_PLAYERS is set, the trigger does not respond to players
+If MONSTERS is set, the trigger will respond to monsters
+
+******************************************************************************/
+
+CLASS_DECLARATION(TriggerUse, TriggerSidedUse, "trigger_sideduse") {
+    {NULL, NULL}
+};
+
+TriggerSidedUse::TriggerSidedUse() {}
 
 /*****************************************************************************/
 /*QUAKED trigger_useonce (1 0 0) ? x x NOT_PLAYERS MONSTERS
@@ -2005,12 +2104,12 @@ TriggerDamageTargets::TriggerDamageTargets()
         return;
     }
 
-    damage    = 0;
+    damage = 0;
 
     if (spawnflags & 1) {
         health     = 60;
         max_health = health;
-        deadflag = DEAD_NO;
+        deadflag   = DEAD_NO;
         takedamage = DAMAGE_YES;
         setSolidType(SOLID_BBOX);
     } else {
@@ -2020,13 +2119,11 @@ TriggerDamageTargets::TriggerDamageTargets()
 }
 
 void TriggerDamageTargets::SetDamage(Event *ev)
-
 {
     damage = ev->GetInteger(1);
 }
 
 void TriggerDamageTargets::PassDamage(Event *ev)
-
 {
     Entity     *attacker;
     int         dmg;
@@ -2062,7 +2159,6 @@ void TriggerDamageTargets::PassDamage(Event *ev)
 //
 
 void TriggerDamageTargets::DamageTargets(Event *ev)
-
 {
     Entity     *other;
     Entity     *ent;
@@ -2212,17 +2308,15 @@ CLASS_DECLARATION(Trigger, TriggerExit, "trigger_exit") {
 
 TriggerExit::TriggerExit()
 {
-    wait      = 1;
+    wait = 1;
 }
 
 void TriggerExit::TurnExitSignOff(Event *ev)
-
 {
     level.near_exit = false;
 }
 
 void TriggerExit::DisplayExitSign(Event *ev)
-
 {
     level.near_exit = qtrue;
 
@@ -2262,7 +2356,8 @@ Event EV_TriggerBox_SetMins
     EV_DEFAULT,
     "v",
     "mins",
-    "Sets the minimum bounds of the trigger box.", EV_NORMAL
+    "Sets the minimum bounds of the trigger box.",
+    EV_NORMAL
 );
 Event EV_TriggerBox_SetMaxs
 (
@@ -2417,7 +2512,7 @@ TriggerMusic::TriggerMusic()
 
     SetOneShot(false);
 
-    noise    = STRING_EMPTY;
+    noise = STRING_EMPTY;
 
     current  = STRING_NORMAL;
     fallback = STRING_NORMAL;
@@ -2499,13 +2594,13 @@ void TriggerMusic::SetOneShot(Event *ev)
 
 void TriggerMusic::Archive(Archiver& arc)
 {
-	Trigger::Archive(arc);
+    Trigger::Archive(arc);
 
-	arc.ArchiveBoolean(&oneshot);
-	Director.ArchiveString(arc, current);
-	Director.ArchiveString(arc, fallback);
-	Director.ArchiveString(arc, altcurrent);
-	Director.ArchiveString(arc, altfallback);
+    arc.ArchiveBoolean(&oneshot);
+    Director.ArchiveString(arc, current);
+    Director.ArchiveString(arc, fallback);
+    Director.ArchiveString(arc, altcurrent);
+    Director.ArchiveString(arc, altfallback);
 }
 
 /*****************************************************************************/
@@ -2625,7 +2720,7 @@ TriggerReverb::TriggerReverb()
 
     SetOneShot(false);
 
-    noise     = STRING_EMPTY;
+    noise = STRING_EMPTY;
 
     reverbtype     = 0;
     altreverbtype  = 0;
@@ -2738,7 +2833,6 @@ void TriggerByPushObject::setTriggerName(Event *event)
 }
 
 qboolean TriggerByPushObject::respondTo(Entity *other)
-
 {
     if (other->isSubclassOf(PushObject)) {
         if (triggername != STRING_EMPTY) {
@@ -2752,7 +2846,6 @@ qboolean TriggerByPushObject::respondTo(Entity *other)
 }
 
 Entity *TriggerByPushObject::getActivator(Entity *other)
-
 {
     Entity *owner;
 
@@ -2769,11 +2862,19 @@ Entity *TriggerByPushObject::getActivator(Entity *other)
 
 void TriggerByPushObject::Archive(Archiver& arc)
 {
-	TriggerOnce::Archive(arc);
+    TriggerOnce::Archive(arc);
 
-	Director.ArchiveString(arc, triggername);
+    Director.ArchiveString(arc, triggername);
 }
 
+/*****************************************************************************/
+/*QUAKED trigger_givepowerup (1 0 0) ? x x NOT_PLAYERS MONSTERS x x x DAMAGE
+Special trigger that can be triggered to give special items to sentients.
+
+"cnt" how many times it can be triggered (default 1, use -1 for infinite)
+"powerupname" the name of the powerup to give to sentients
+******************************************************************************/
+
 Event EV_TriggerGivePowerup_OneShot
 (
     "oneshot",
@@ -2793,10 +2894,10 @@ Event EV_TriggerGivePowerup_PowerupName
 );
 
 CLASS_DECLARATION(Trigger, TriggerGivePowerup, "trigger_givepowerup") {
-    {&EV_TriggerGivePowerup_OneShot,      &TriggerGivePowerup::SetOneShot    },
-    {&EV_TriggerGivePowerup_PowerupName,  &TriggerGivePowerup::SetPowerupName},
-    {&EV_Trigger_Effect,                  &TriggerGivePowerup::GivePowerup   },
-    {NULL,                                NULL                               }
+    {&EV_TriggerGivePowerup_OneShot,     &TriggerGivePowerup::SetOneShot    },
+    {&EV_TriggerGivePowerup_PowerupName, &TriggerGivePowerup::SetPowerupName},
+    {&EV_Trigger_Effect,                 &TriggerGivePowerup::GivePowerup   },
+    {NULL,                               NULL                               }
 };
 
 TriggerGivePowerup::TriggerGivePowerup()
@@ -2824,37 +2925,37 @@ TriggerGivePowerup::TriggerGivePowerup()
 
     trigger_time = (float)0;
 
-    oneshot      = false;
+    oneshot = false;
 
     count        = -1;
     noise        = STRING_EMPTY;
     powerup_name = STRING_EMPTY;
 }
 
-void TriggerGivePowerup::SetOneShot(Event* ev)
+void TriggerGivePowerup::SetOneShot(Event *ev)
 {
     trigger_time = 0.f;
     oneshot      = true;
     count        = 1;
 }
 
-void TriggerGivePowerup::SetPowerupName(Event* ev)
+void TriggerGivePowerup::SetPowerupName(Event *ev)
 {
     powerup_name = ev->GetConstString(1);
 }
 
-void TriggerGivePowerup::GivePowerup(Event* ev)
+void TriggerGivePowerup::GivePowerup(Event *ev)
 {
-    Entity* other = ev->GetEntity(1);
-    Sentient* sen;
-    str powerup_name_str;
+    Entity   *other = ev->GetEntity(1);
+    Sentient *sen;
+    str       powerup_name_str;
 
     if (!other->IsSubclassOfSentient()) {
         // ignore non-sentient entities
         return;
     }
 
-    sen = static_cast<Sentient*>(other);
+    sen              = static_cast<Sentient *>(other);
     powerup_name_str = Director.GetString(powerup_name);
     if (sen->FindItem(powerup_name_str)) {
         // sentient already has that item, so ignore
@@ -2874,10 +2975,10 @@ void TriggerGivePowerup::GivePowerup(Event* ev)
 
 void TriggerGivePowerup::Archive(Archiver& arc)
 {
-	Trigger::Archive(arc);
+    Trigger::Archive(arc);
 
-	arc.ArchiveBoolean(&oneshot);
-	Director.ArchiveString(arc, powerup_name);
+    arc.ArchiveBoolean(&oneshot);
+    Director.ArchiveString(arc, powerup_name);
 }
 
 /*****************************************************************************
@@ -2931,6 +3032,27 @@ void TriggerClickItem::SetClickItemModelEvent(Event *ev)
     link();
 }
 
+//===============
+//
+// Added in 2.0
+//
+//===============
+
+/*****************************************************************************/
+/*QUAKED trigger_nodamage (1 0 0) ? x x NOT_PLAYERS MONSTERS
+
+Activates targets when 'used' by an entity. It cannot take damage.
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+If NOT_PLAYERS is set, the trigger does not respond to players
+If MONSTERS is set, the trigger will respond to monsters
+
+******************************************************************************/
+
 CLASS_DECLARATION(TriggerUse, TriggerNoDamage, "trigger_nodamage") {
     {&EV_Touch,          &TriggerNoDamage::TakeNoDamage},
     {&EV_Trigger_Effect, &TriggerNoDamage::TakeNoDamage},
@@ -2951,10 +3073,59 @@ void TriggerNoDamage::TakeNoDamage(Event *ev)
     ent->PostEvent(newev, level.frametime * 3);
 }
 
+//===============
+//
+// Added in 2.30
+//
+//===============
+
+/*****************************************************************************/
+/*QUAKED trigger_entity (1 0 0) ?
+
+Variable sized repeatable trigger that respond to entities.  Must be targeted at one or more entities.
+
+If "health" is set, the trigger must be killed to activate each time.
+If "delay" is set, the trigger waits some time after activating before firing.
+
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+if "angle" is set, the trigger will only fire when someone is facing the
+direction of the angle.
+"cone" the cone in which a directed trigger can be triggered (default 60 degrees)
+
+"wait" : Seconds between triggerings. (.2 default)
+"cnt" how many times it can be triggered (infinite default)
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+set "message" to text string
+
+******************************************************************************/
+
 CLASS_DECLARATION(Trigger, TriggerEntity, "trigger_entity") {
     {NULL, NULL}
 };
 
+qboolean TriggerEntity::respondTo(Entity* other)
+{
+    return other != NULL && other->IsSubclassOfEntity() != false;
+}
+
+/*****************************************************************************/
+/*QUAKED trigger_landmine (1 0 0) ?
+
+Variable sized repeatable trigger for landmine. Must be handled by scripts.
+
+"setthread" name of thread to trigger.  This can be in a different script file as well\
+by using the '::' notation.
+
+"triggerable" turn trigger on
+"nottriggerable" turn trigger off
+
+******************************************************************************/
+
 Event EV_Trigger_IsAbandoned
 (
     "isabandoned",
@@ -3031,9 +3202,9 @@ void TriggerLandmine::EventIsAbandoned(Event *ev)
     weapontype = p->GetCurrentDMWeaponType();
 
     if (!str::icmp(weapontype, "landmine")) {
-        ev->AddInteger(1);
-    } else {
         ev->AddInteger(0);
+    } else {
+        ev->AddInteger(1);
     }
 }
 
diff --git a/code/fgame/trigger.h b/code/fgame/trigger.h
index 469fea92..1a4e56e9 100644
--- a/code/fgame/trigger.h
+++ b/code/fgame/trigger.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // trigger.h: Environment based triggers.
 //
 
-#ifndef __TRIGGER_H__
-#define __TRIGGER_H__
+#pragma once
 
 #include "glb_local.h"
 #include "animate.h"
@@ -56,8 +55,8 @@ protected:
     float             trigger_time;
     qboolean          triggerActivated;
     int               count;
-	const_str         noise;
-	const_str         message;
+    const_str         noise;
+    const_str         message;
     ScriptThreadLabel m_Thread;
     EntityPtr         activator;
     int               respondto;
@@ -116,6 +115,8 @@ public:
     void StartThread(Event *ev);
     void TriggerStuff(Event *ev);
     void ActivateTargets(Event *ev);
+    void DamageEvent(Event *ev) override;
+    void EventGetActivator(Event *ev); // Added in 2.30
     void Archive(Archiver& arc) override;
 };
 
@@ -171,7 +172,7 @@ public:
     TouchField();
     virtual void Setup(Entity *ownerentity, Event& ontouch, Vector min, Vector max, int respondto);
     void         SendEvent(Event *ev);
-    void         Archive(Archiver        &arc) override;
+    void         Archive(Archiver& arc) override;
 };
 
 inline void TouchField::Archive(Archiver& arc)
@@ -191,7 +192,7 @@ public:
     TriggerOnce();
 };
 
-class TriggerSave : public Trigger
+class TriggerSave : public TriggerOnce
 {
 private:
     str m_sSaveName;
@@ -199,6 +200,8 @@ private:
 public:
     CLASS_PROTOTYPE(TriggerSave);
 
+    TriggerSave();
+
     void SaveGame(Event *ev);
     void EventSaveName(Event *ev);
     void Archive(Archiver& arc) override;
@@ -377,7 +380,7 @@ public:
     void        ChangeLevel(Event *ev);
     const char *Map(void);
     const char *SpawnSpot(void);
-    void        Archive(Archiver       &arc) override;
+    void        Archive(Archiver& arc) override;
 };
 
 class TriggerExit : public Trigger
@@ -398,6 +401,17 @@ public:
     TriggerUse();
 };
 
+//
+// Added in 2.30
+//  Can only be triggered if within specific degrees
+class TriggerSidedUse : public TriggerUse
+{
+public:
+    CLASS_PROTOTYPE(TriggerSidedUse);
+
+    TriggerSidedUse();
+};
+
 class TriggerUseOnce : public TriggerUse
 {
 public:
@@ -590,6 +604,10 @@ inline void TriggerClickItem::Archive(Archiver& arc)
     Trigger::Archive(arc);
 }
 
+//
+// Added in 2.0
+//
+
 class TriggerNoDamage : public TriggerUse
 {
 public:
@@ -599,10 +617,17 @@ public:
     void TakeNoDamage(Event *ev);
 };
 
+//
+// Added in 2.30
+//
+
 class TriggerEntity : public Trigger
 {
 public:
     CLASS_PROTOTYPE(TriggerEntity);
+
+public:
+    qboolean respondTo(Entity *other) override;
 };
 
 class TriggerLandmine : public TriggerEntity
@@ -631,5 +656,3 @@ inline void TriggerLandmine::Archive(Archiver& arc)
 
     arc.ArchiveInteger(&team);
 }
-
-#endif /* trigger.h */
diff --git a/code/fgame/umap.h b/code/fgame/umap.h
index e3cdfdae..2a44a341 100644
--- a/code/fgame/umap.h
+++ b/code/fgame/umap.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,8 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // stored data.
 // 
 
-#ifndef __UMAP_H__
-#define __UMAP_H__
+#pragma once
 
 #include "str.h"
 #include <stdlib.h>
@@ -335,5 +334,3 @@ inline unsigned UMap<Type>::getNumEntries
 	{
 	return m_numentries;
 	}
-
-#endif /* !__UMAP_H__ */
diff --git a/code/fgame/vehicle.cpp b/code/fgame/vehicle.cpp
index a97359f8..6f8ca73b 100644
--- a/code/fgame/vehicle.cpp
+++ b/code/fgame/vehicle.cpp
@@ -37,784 +37,918 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "debuglines.h"
 
 Event EV_Vehicle_Start
-	(
-	"start",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Initialize the vehicle."
-	);
-
+(
+    "start",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Initialize the vehicle.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Enter
-	(
-	"enter",
-	EV_DEFAULT,
-	"eS",
-	"vehicle driver_anim",
-	"Called when someone gets into a vehicle."
-	);
-
+(
+    "enter",
+    EV_DEFAULT,
+    "eS",
+    "vehicle driver_anim",
+    "Called when someone gets into a vehicle.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Exit
-	(
-	"exit",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"Called when driver gets out of the vehicle."
-	);
-
+(
+    "exit",
+    EV_DEFAULT,
+    "e",
+    "vehicle",
+    "Called when driver gets out of the vehicle.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Drivable
-	(
-	"drivable",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Make the vehicle drivable"
-	);
-
+(
+    "drivable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the vehicle drivable",
+    EV_NORMAL
+);
 Event EV_Vehicle_UnDrivable
-	(
-	"undrivable",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Make the vehicle undrivable"
-	);
-
+(
+    "undrivable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the vehicle undrivable",
+    EV_NORMAL
+);
+Event EV_Vehicle_PathDrivable
+(
+    "pathDrivable",
+    EV_DEFAULT,
+    "b",
+    "pathDrivable",
+    "Make the vehicle drivable along a path",
+    EV_NORMAL
+);
 Event EV_Vehicle_Jumpable
-	(
-	"canjump",
-	EV_DEFAULT,
-	"b",
-	"jumpable",
-	"Sets whether or not the vehicle can jump"
-	);
-
+(
+    "canjump",
+    EV_DEFAULT,
+    "b",
+    "jumpable",
+    "Sets whether or not the vehicle can jump",
+    EV_NORMAL
+);
 Event EV_Vehicle_Lock
-	(
-	"lock",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the vehicle to be locked"
-	);
-
+(
+    "lock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the vehicle to be locked",
+    EV_NORMAL
+);
 Event EV_Vehicle_UnLock
-	(
-	"unlock",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Sets the vehicle to be unlocked"
-	);
-
+(
+    "unlock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Sets the vehicle to be unlocked",
+    EV_NORMAL
+);
 Event EV_Vehicle_SeatAnglesOffset
-	(
-	"seatangles",
-	EV_DEFAULT,
-	"v",
-	"angles",
-	"Set the angles offset of the seat"
-	);
-
+(
+    "seatanglesoffset",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "Set the angles offset of the seat",
+    EV_NORMAL
+);
 Event EV_Vehicle_SeatOffset
-	(
-	"seatoffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Set the offset of the seat"
-	);
-
-
+(
+    "seatoffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Set the offset of the seat",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetWeapon
-	(
-	"setweapon",
-	EV_DEFAULT,
-	"s",
-	"weaponname",
-	"Set the weapon for the vehicle"
-	);
-	
+(
+    "setweapon",
+    EV_DEFAULT,
+    "s",
+    "weaponname",
+    "Set the weapon for the vehicle",
+    EV_NORMAL
+);
+Event EV_Vehicle_SetName
+(
+    "name",
+    EV_DEFAULT,
+    "s",
+    "vehicleName",
+    "Set the name for the vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_ShowWeapon
-	(
-	"showweapon",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set the weapon to be show in the view"
-	);
-	
+(
+    "showweapon",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the weapon to be show in the view",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetSpeed
-	(
-	"vehiclespeed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"Set the speed of the vehicle"
-	);
-	
+(
+    "vehiclespeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the speed of the vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetTurnRate
-	(
-	"turnrate",
-	EV_DEFAULT,
-	"f",
-	"rate",
-	"Set the turning rate of the vehicle"
-	);
-	
+(
+    "turnrate",
+    EV_DEFAULT,
+    "f",
+    "rate",
+    "Set the turning rate of the vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_SteerInPlace
-	(
-	"steerinplace",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Set the vehicle to turn in place"
-	);
-	
+(
+    "steerinplace",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the vehicle to turn in place",
+    EV_NORMAL
+);
 Event EV_Vehicle_Destroyed
-	(
-	"vehicledestroyed",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Driver is dead"
-	);
-	
+(
+    "vehicledestroyed",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Driver is dead",
+    EV_NORMAL
+);
 Event EV_Vehicle_Mass
-	(
-	"vehiclemass",
-	EV_DEFAULT,
-	"f",
-	"weight",
-	"Sets the mass of the vehicle (backmass = frontmass = mass/2)"
-	);
-	
+(
+    "vehiclemass",
+    EV_DEFAULT,
+    "f",
+    "weight",
+    "Sets the mass of the vehicle (backmass = frontmass = mass/2)",
+    EV_NORMAL
+);
 Event EV_Vehicle_Front_Mass
-	(
-	"front_mass",
-	EV_DEFAULT,
-	"f",
-	"weight",
-	"Sets the mass of the front of the vehicle"
-	);
-	
+(
+    "front_mass",
+    EV_DEFAULT,
+    "f",
+    "weight",
+    "Sets the mass of the front of the vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_Back_Mass
-	(
-	"back_mass",
-	EV_DEFAULT,
-	"f",
-	"weight",
-	"Sets the mass of the back of the vehicle"
-	);
-	
+(
+    "back_mass",
+    EV_DEFAULT,
+    "f",
+    "weight",
+    "Sets the mass of the back of the vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_Tread
-	(
-	"vehicletread",
-	EV_DEFAULT,
-	"f",
-	"size",
-	"Sets the size of the wheels"
-	);
-
+(
+    "vehicletread",
+    EV_DEFAULT,
+    "f",
+    "size",
+    "Sets the size of the wheels",
+    EV_NORMAL
+);
 Event EV_Vehicle_Radius
-	(
-	"vehicleradius",
-	EV_DEFAULT,
-	"f",
-	"size",
-	"Sets the radius of the wheels"
-	);
-	
+(
+    "vehicleradius",
+    EV_DEFAULT,
+    "f",
+    "size",
+    "Sets the radius of the wheels",
+    EV_NORMAL
+);
 Event EV_Vehicle_RollingResistance
-	(
-	"vehiclerollingresistance",
-	EV_DEFAULT,
-	"f",
-	"size",
-	"Sets the radius of the wheels"
-	);
-	
+(
+    "vehiclerollingresistance",
+    EV_DEFAULT,
+    "f",
+    "size",
+    "Sets the radius of the wheels",
+    EV_NORMAL
+);
 Event EV_Vehicle_Drag
-	(
-	"vehicledrag",
-	EV_DEFAULT,
-	"f",
-	"size",
-	"Sets the Drag Factor"
-	);
-	
+(
+    "vehicledrag",
+    EV_DEFAULT,
+    "f",
+    "size",
+    "Sets the Drag Factor",
+    EV_NORMAL
+);
 Event EV_Vehicle_Drive
-	(
-	"drive",
-	EV_DEFAULT,
-	"vffffV",
-	"position speed acceleration reach_distance look_ahead alternate_position",
-	"Makes the vehicle drive to position with speed and acceleration until reached_distance close to position"
-	);
-	
+(
+    "drive",
+    EV_DEFAULT,
+    "vffffV",
+    "position speed acceleration reach_distance look_ahead alternate_position",
+    "Makes the vehicle drive to position with speed and acceleration until reached_distance close to position",
+    EV_NORMAL
+);
 Event EV_Vehicle_DriveNoWait
-	(
-	"driveNo",
-	EV_DEFAULT,
-	"vfff",
-	"position speed acceleration reach_distance",
-	"Makes the vehicle drive to position with speed and acceleration until reached_distance close to position, thread doesn't wait"
-	);
-	
+(
+    "driveNoWait",
+    EV_DEFAULT,
+    "vfff",
+    "position speed acceleration reach_distance",
+    "Makes the vehicle drive to position with speed and acceleration until reached_distance close to position, thread "
+    "doesn't wait",
+    EV_NORMAL
+);
 Event EV_Vehicle_Stop
-	(
-	"stop",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Make the Vehicle Stop Moving... FULL BREAKS!"
-	);
-	
+(
+    "stop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the Vehicle Stop Moving... FULL BREAKS!",
+    EV_NORMAL
+);
 Event EV_Vehicle_FullStop
-	(
-	"fullstop",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Make the Vehicle Stop Moving... Completely!"
-	);
-	
+(
+    "fullstop",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the Vehicle Stop Moving... Completely!",
+    EV_NORMAL
+);
 Event EV_Vehicle_Init
-	(
-	"vehicleinit",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Initialized the Vehicle as the specified file"
-	);
-	
+(
+    "vehicleinit",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Initialized the Vehicle as the specified file",
+    EV_NORMAL
+);
 Event EV_Vehicle_BouncyCoef
-	(
-	"vehiclebouncy",
-	EV_DEFAULT,
-	"f",
-	"bouncycoef",
-	"Sets the Bouncy Coefficient for the shocks."
-	);
-	
+(
+    "vehiclebouncy",
+    EV_DEFAULT,
+    "f",
+    "bouncycoef",
+    "Sets the Bouncy Coefficient for the shocks.",
+    EV_NORMAL
+);
 Event EV_Vehicle_SpringyCoef
-	(
-	"vehiclespringy",
-	EV_DEFAULT,
-	"f",
-	"springycoef",
-	"Sets the Springy Coefficient for the shocks."
-	);
-	
+(
+    "vehiclespringy",
+    EV_DEFAULT,
+    "f",
+    "springycoef",
+    "Sets the Springy Coefficient for the shocks.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Yaw
-	(
-	"vehicleYaw",
-	EV_DEFAULT,
-	"fff",
-	"min max coef",
-	"Sets the Yaw min and max and the acceleration coefficient for the shocks."
-	);
-	
+(
+    "vehicleYaw",
+    EV_DEFAULT,
+    "fff",
+    "min max coef",
+    "Sets the Yaw min and max and the acceleration coefficient for the shocks.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Roll
-	(
-	"vehicleRoll",
-	EV_DEFAULT,
-	"fff",
-	"min max coef",
-	"Sets the Roll min and max and the acceleration coefficient for the shocks."
-	);
-	
+(
+    "vehicleRoll",
+    EV_DEFAULT,
+    "fff",
+    "min max coef",
+    "Sets the Roll min and max and the acceleration coefficient for the shocks.",
+    EV_NORMAL
+);
 Event EV_Vehicle_Z
-	(
-	"vehicleZ",
-	EV_DEFAULT,
-	"fff",
-	"min max coef",
-	"Sets the Z min and max and the acceleration coefficient for the shocks."
-	);
-	
+(
+    "vehicleZ",
+    EV_DEFAULT,
+    "fff",
+    "min max coef",
+    "Sets the Z min and max and the acceleration coefficient for the shocks.",
+    EV_NORMAL
+);
+Event EV_Vehicle_QuerySpeed
+(
+    "QuerySpeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Returns the current speed of the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryFreePassengerSlot
-	(
-	"QueryFreePassengerSlot",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns a number that represents the first free passenger slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryFreePassengerSlot",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns a number that represents the first free passenger slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryPassengerSlotPosition
-	(
-	"QueryPassengerSlotPosition",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the position of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryPassengerSlotPosition",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the position of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryPassengerSlotStatus
-	(
-	"QueryPassengerSlotStatus",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the status of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryPassengerSlotStatus",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the status of the specified slot on the vehicle.",
+    EV_RETURN
+);
+Event EV_Vehicle_BounceForwardsVelocity
+(
+    "BounceForwardsVelocity",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "For vehicles on rails that are moving forwards, reverse our velocity.",
+    EV_NORMAL
+);
+Event EV_Vehicle_BounceBackwardsVelocity
+(
+    "BounceBackwardsVelocity",
+    EV_DEFAULT,
+    "i",
+    "bStayFullSpeed",
+    "For vehicles on rails that are moving backwards, reverse our velocity. (Optionally pass bStayFullSpeed to keep "
+    "vehic"
+    "le at full speed after the bounce)",
+    EV_NORMAL
+);
+Event EV_Vehicle_StopForwardsVelocity
+(
+    "StopForwardsVelocity",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stops any forward motion for vehicles on rails.",
+    EV_NORMAL
+);
+Event EV_Vehicle_StopBackwardsVelocity
+(
+    "StopBackwardsVelocity",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Stops any backwards motion for vehicles on rails.",
+    EV_NORMAL
+);
 Event EV_Vehicle_AttachPassengerSlot
-	(
-	"AttachPassengerSlot",
-	EV_DEFAULT,
-	"ie",
-	"slot entity",
-	"Attaches an entity to the specified slot."
-	);
-	
+(
+    "AttachPassengerSlot",
+    EV_DEFAULT,
+    "ie",
+    "slot entity",
+    "Attaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryPassengerSlotEntity
-	(
-	"QueryPassengerSlotEntity",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns an entity at the specified slot.",
-	EV_RETURN );
-	
+(
+    "QueryPassengerSlotEntity",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns an entity at the specified slot.",
+    EV_RETURN
+);
 Event EV_Vehicle_DetachPassengerSlot
-	(
-	"DetachPassengerSlot",
-	EV_DEFAULT,
-	"iV",
-	"slot exit_",
-	"Detaches an entity to the specified slot."
-	);
-	
+(
+    "DetachPassengerSlot",
+    EV_DEFAULT,
+    "iV",
+    "slot exit_position",
+    "Detaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryFreeDriverSlot
-	(
-	"QueryFreeDriverSlot",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns a number that represents the first free driver slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryFreeDriverSlot",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns a number that represents the first free driver slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryDriverSlotPosition
-	(
-	"QueryDriverSlotPosition",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the position of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotPosition",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the position of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryDriverSlotStatus
-	(
-	"QueryDriverSlotStatus",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the status of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotStatus",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the status of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_AttachDriverSlot
-	(
-	"AttachDriverSlot",
-	EV_DEFAULT,
-	"ie",
-	"slot entity",
-	"Attaches an entity to the specified slot."
-	);
-	
+(
+    "AttachDriverSlot",
+    EV_DEFAULT,
+    "ie",
+    "slot entity",
+    "Attaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryDriverSlotEntity
-	(
-	"QueryDriverSlotEntity",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns an entity at the specified slot.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotEntity",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns an entity at the specified slot.",
+    EV_RETURN
+);
 Event EV_Vehicle_DetachDriverSlot
-	(
-	"DetachDriverSlot",
-	EV_DEFAULT,
-	"iV",
-	"slot exit_",
-	"Detaches an entity to the specified slot."
-	);
-	
+(
+    "DetachDriverSlot",
+    EV_DEFAULT,
+    "iV",
+    "slot exit_position",
+    "Detaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryFreeTurretSlot
-	(
-	"QueryFreeTurretSlot",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns a number that represents the first free turret slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryFreeTurretSlot",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns a number that represents the first free turret slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryTurretSlotPosition
-	(
-	"QueryTurretSlotPosition",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the position of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryTurretSlotPosition",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the position of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryTurretSlotStatus
-	(
-	"QueryTurretSlotStatus",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the status of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryTurretSlotStatus",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the status of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_AttachTurretSlot
-	(
-	"AttachTurretSlot",
-	EV_DEFAULT,
-	"ie",
-	"slot entity",
-	"Attaches an entity to the specified slot."
-	);
-	
+(
+    "AttachTurretSlot",
+    EV_DEFAULT,
+    "ie",
+    "slot entity",
+    "Attaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryTurretSlotEntity
-	(
-	"QueryTurretSlotEntity",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns an entity at the specified slot.",
-	EV_RETURN );
-	
+(
+    "QueryTurretSlotEntity",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns an entity at the specified slot.",
+    EV_RETURN
+);
 Event EV_Vehicle_DetachTurretSlot
-	(
-	"DetachTurretSlot",
-	EV_DEFAULT,
-	"iV",
-	"slot exit_",
-	"Detaches an entity to the specified slot."
-	);
-	
+(
+    "DetachTurretSlot",
+    EV_DEFAULT,
+    "iV",
+    "slot exit_position",
+    "Detaches an entity to the specified slot.",
+    EV_NORMAL
+);
 Event EV_Vehicle_WheelCorners
-	(
-	"VehicleWheelCorners",
-	EV_DEFAULT,
-	"vv",
-	"size offset",
-	"Sets the wheel trace corners."
-	);
-	
+(
+    "VehicleWheelCorners",
+    EV_DEFAULT,
+    "vv",
+    "size offset",
+    "Sets the wheel trace corners.",
+    EV_NORMAL
+);
 Event EV_Vehicle_QueryDriverSlotAngles
-	(
-	"QueryDriverSlotAngles",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the angles of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotAngles",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the angles of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryPassengerSlotAngles
-	(
-	"QueryDriverSlotAngles",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the angles of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotAngles",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the angles of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_QueryTurretSlotAngles
-	(
-	"QueryDriverSlotAngles",
-	EV_DEFAULT,
-	"i",
-	"slot",
-	"Returns the angles of the specified slot on the vehicle.",
-	EV_RETURN );
-	
+(
+    "QueryDriverSlotAngles",
+    EV_DEFAULT,
+    "i",
+    "slot",
+    "Returns the angles of the specified slot on the vehicle.",
+    EV_RETURN
+);
 Event EV_Vehicle_AnimationSet
-	(
-	"AnimationSet",
-	EV_DEFAULT,
-	"s",
-	"animset",
-	"Sets the Animation Set to use."
-	);
-	
+(
+    "AnimationSet",
+    EV_DEFAULT,
+    "s",
+    "animset",
+    "Sets the Animation Set to use.",
+    EV_NORMAL
+);
 Event EV_Vehicle_SoundSet
-	(
-	"SoundSet",
-	EV_DEFAULT,
-	"s",
-	"soundset",
-	"Sets the Sound Set to use."
-	);
-	
+(
+    "SoundSet",
+    EV_DEFAULT,
+    "s",
+    "soundset",
+    "Sets the Sound Set to use.",
+    EV_NORMAL
+);
 Event EV_Vehicle_SpawnTurret
-	(
-	"spawnturret",
-	EV_DEFAULT,
-	"is",
-	"slot tikifile",
-	"Spawns a turret with the specified model and connects it to the specified slot"
-	);
-	
+(
+    "spawnturret",
+    EV_DEFAULT,
+    "is",
+    "slot tikifile",
+    "Spawns a turret with the specified model and connects it to the specified slot",
+    EV_NORMAL
+);
 Event EV_Vehicle_ModifyDrive
-	(
-	"modifydrive",
-	EV_DEFAULT,
-	"fff",
-	"desired_speed acceleration look_ahead",
-	"Modifys the parameters of the current drive."
-	);
-	
+(
+    "modifydrive",
+    EV_DEFAULT,
+    "fff",
+    "desired_speed acceleration look_ahead",
+    "Modifys the parameters of the current drive.",
+    EV_NORMAL
+);
 Event EV_Vehicle_NextDrive
-	(
-	"nextdrive",
-	EV_DEFAULT,
-	"e",
-	"next_path",
-	"appends the specified path to the current path"
-	);
-	
+(
+    "nextdrive",
+    EV_DEFAULT,
+    "e",
+    "next_path",
+    "appends the specified path to the current path",
+    EV_NORMAL
+);
 Event EV_Vehicle_StopAtEnd
-	(
-	"stopatend",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Makes the vehicle slow down to a complete stop at the end of the path."
-	);
-	
+(
+    "stopatend",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the vehicle slow down to a complete stop at the end of the path.",
+    EV_NORMAL
+);
 Event EV_Vehicle_LockMovement
-	(
-	"lockmovement",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The Vehicle cannot move."
-	);
-	
+(
+    "lockmovement",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The Vehicle cannot move.",
+    EV_NORMAL
+);
 Event EV_Vehicle_UnlockMovement
-	(
-	"unlockmovement",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"The Vehicle can move again."
-	);
-	
+(
+    "unlockmovement",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The Vehicle can move again.",
+    EV_NORMAL
+);
 Event EV_Vehicle_RemoveOnDeath
-	(
-	"removeondeath",
-	EV_DEFAULT,
-	"i",
-	"removeondeath",
-	"If set to a non-zero value, vehicles will not be removed when they die"
-	);
-	
+(
+    "removeondeath",
+    EV_DEFAULT,
+    "i",
+    "removeondeath",
+    "If set to a non-zero value, vehicles will not be removed when they die",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetExplosionModel
-	(
-	"explosionmodel",
-	EV_DEFAULT,
-	"s",
-	"model",
-	"Sets the TIKI to call when the vehicle dies."
-	);
-	
+(
+    "explosionmodel",
+    EV_DEFAULT,
+    "s",
+    "model",
+    "Sets the TIKI to call when the vehicle dies.",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetCollisionEntity
-	(
-	"setcollisionentity",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"Sets the Collision Entity."
-	);
-	
+(
+    "setcollisionentity",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Sets the Collision Entity.",
+    EV_NORMAL
+);
 Event EV_Vehicle_CollisionEntitySetter
-	(
-	"collisionent",
-	EV_DEFAULT,
-	"e",
-	"entity",
-	"Gets the Collision Entity",
-	EV_SETTER );
-	
+(
+    "collisionent",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Gets the Collision Entity",
+    EV_SETTER
+);
 Event EV_Vehicle_CollisionEntityGetter
-	(
-	"collisionent",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Gets the Collision Entity",
-	EV_GETTER );
-	
+(
+    "collisionent",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the Collision Entity",
+    EV_GETTER
+);
 Event EV_Vehicle_SetSoundParameters
-	(
-	"setsoundparameters",
-	EV_DEFAULT,
-	"ffff",
-	"min_speed min_pitch max_speed max_pitch",
-	"Sets the Sound parameters for this vehicle"
-	);
-	
+(
+    "setsoundparameters",
+    EV_DEFAULT,
+    "ffff",
+    "min_speed min_pitch max_speed max_pitch",
+    "Sets the Sound parameters for this vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_SetVolumeParameters
-	(
-	"setvolumeparameters",
-	EV_DEFAULT,
-	"ffff",
-	"min_speed min_volume max_speed max_volume",
-	"Sets the Volume parameters for this vehicle"
-	);
-	
+(
+    "setvolumeparameters",
+    EV_DEFAULT,
+    "ffff",
+    "min_speed min_volume max_speed max_volume",
+    "Sets the Volume parameters for this vehicle",
+    EV_NORMAL
+);
 Event EV_Vehicle_Skidding
-	(
-	"skidding",
-	EV_DEFAULT,
-	"i",
-	"on_off",
-	"Makes the vehicle skid around corners."
-	);
-	
+(
+    "skidding",
+    EV_DEFAULT,
+    "i",
+    "on_off",
+    "Makes the vehicle skid around corners.",
+    EV_NORMAL
+);
 Event EV_Vehicle_ContinueSkidding
-	(
-	"_continue",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Continues the skidding animation of a vehicle."
-	);
-	
+(
+    "_continueskidding",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Continues the skidding animation of a vehicle.",
+    EV_NORMAL
+);
 Event EV_Vehicle_VehicleAnim
-	(
-	"vehicleanim",
-	EV_DEFAULT,
-	"sF",
-	"anim_name weight",
-	"Sets an animation to use in the LD Animation slot. \nWeight defaults to 1.0"
-	);
-	
+(
+    "vehicleanim",
+    EV_DEFAULT,
+    "sF",
+    "anim_name weight",
+    "Sets an animation to use in the LD Animation slot. \nWeight defaults to 1.0",
+    EV_NORMAL
+);
 Event EV_Vehicle_VehicleAnimDone
-	(
-	"_vehicleanimdone",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"For Internal Use Only"
-	);
+(
+    "_vehicleanimdone",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "For Internal Use Only",
+    EV_NORMAL
+);
+Event EV_Vehicle_VehicleMoveAnim
+(
+    "moveanim",
+    EV_DEFAULT,
+    "s",
+    "anim_name",
+    "move the vehicle with an animation",
+    EV_NORMAL
+);
+Event EV_Vehicle_VehicleMoveAnimDone
+(
+    "_moveanimdone",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "For Internal Use Only",
+    EV_NORMAL
+);
+Event EV_Vehicle_DamageSounds
+(
+    "damagesounds",
+    EV_DEFAULT,
+    "i",
+    "on_off",
+    "Makes the vehicle play damaged sounds.",
+    EV_NORMAL
+);
+Event EV_Vehicle_RunSounds
+(
+    "runsounds",
+    EV_DEFAULT,
+    "i",
+    "on_off",
+    "Makes the vehicle play running sounds.",
+    EV_NORMAL
+);
+Event EV_Vehicle_ProjectileVulnerable
+(
+    "projectilevulnerable",
+    EV_DEFAULT,
+    "I",
+    "number_of_hits",
+    "Make vehicle vulnerable to being one-shot by projectiles. If number_of_hits is given, it will take this many "
+    "shots.",
+    EV_NORMAL
+);
+Event EV_Vehicle_CanUse
+(
+    "canuse",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Returns 1 if passed entity can 'use' this vehicle.",
+    EV_RETURN
+);
 
 cvar_t *g_showvehiclemovedebug;
 cvar_t *g_showvehicleentrypoints;
 cvar_t *g_showvehicleslotpoints;
+cvar_t *g_showvehicletags;
 cvar_t *g_showvehiclepath;
 
-CLASS_DECLARATION( Animate, VehicleBase, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(Animate, VehicleBase, NULL) {
+    {NULL, NULL}
 };
 
 VehicleBase::VehicleBase()
 {
-	offset = "0 0 0";
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
 
-	if( LoadingSavegame )
-	{
-		// Archive function will setup all necessary data
-		return;
-	}
+    takedamage = DAMAGE_NO;
+    showModel();
 
-	takedamage = DAMAGE_NO;
-	edict->s.renderfx &= ~RF_DONTDRAW;
-	edict->r.svFlags &= ~SVF_NOCLIENT;
+    //
+    // rotate the mins and maxs for the model
+    //
+    setSize(mins, maxs);
 
-	//
-	// rotate the mins and maxs for the model
-	//
-	setSize( mins, maxs );
+    vlink  = NULL;
+    offset = vec_zero;
 
-	vlink = NULL;
-	offset = vec_zero;
-
-	PostEvent( EV_BecomeNonSolid, EV_POSTSPAWN );
+    PostEvent(EV_BecomeNonSolid, EV_POSTSPAWN);
 }
 
-CLASS_DECLARATION( VehicleBase, Vehicle, "script_vehicle" )
-{
-		{ &EV_Blocked,									&Vehicle::VehicleBlocked },
-		{ &EV_Touch,									&Vehicle::VehicleTouched },
-		{ &EV_Use,										&Vehicle::DriverUse },
-		{ &EV_Vehicle_Start,							&Vehicle::VehicleStart },
-		{ &EV_Vehicle_Drivable,							&Vehicle::Drivable },
-		{ &EV_Vehicle_UnDrivable,						&Vehicle::UnDrivable },
-		{ &EV_Vehicle_Jumpable,							&Vehicle::Jumpable },
-		{ &EV_Vehicle_SeatAnglesOffset,					&Vehicle::SeatAnglesOffset },
-		{ &EV_Vehicle_SeatOffset,						&Vehicle::SeatOffset },
-		{ &EV_Vehicle_Lock,								&Vehicle::Lock },
-		{ &EV_Vehicle_UnLock,							&Vehicle::UnLock },
-		{ &EV_Vehicle_SetWeapon,						&Vehicle::SetWeapon },
-		{ &EV_Vehicle_SetSpeed,							&Vehicle::SetSpeed },
-		{ &EV_Vehicle_SetTurnRate,						&Vehicle::SetTurnRate },
-		{ &EV_Vehicle_SteerInPlace,						&Vehicle::SteerInPlace },
-		{ &EV_Vehicle_ShowWeapon,						&Vehicle::ShowWeaponEvent },
-		{ &EV_Damage,									&Vehicle::EventDamage },
-		{ &EV_Vehicle_Destroyed,						&Vehicle::VehicleDestroyed },
-		{ &EV_Vehicle_Mass,								&Vehicle::SetMass },
-		{ &EV_Vehicle_Front_Mass,						&Vehicle::SetFrontMass },
-		{ &EV_Vehicle_Back_Mass,						&Vehicle::SetBackMass },
-		{ &EV_Vehicle_Tread,							&Vehicle::SetTread },
-		{ &EV_Vehicle_RollingResistance,				&Vehicle::SetRollingResistance },
-		{ &EV_Vehicle_Drag,								&Vehicle::SetDrag },
-		{ &EV_Vehicle_Drive,							&Vehicle::EventDrive },
-		{ &EV_Vehicle_DriveNoWait,						&Vehicle::EventDriveNoWait },
-		{ &EV_Vehicle_Stop,								&Vehicle::EventStop },
-		{ &EV_Vehicle_FullStop,							&Vehicle::EventFullStop },
-		{ &EV_Vehicle_BouncyCoef,						&Vehicle::BouncyCoef },
-		{ &EV_Vehicle_SpringyCoef,						&Vehicle::SpringyCoef },
-		{ &EV_Vehicle_Yaw,								&Vehicle::GetYaw },
-		{ &EV_Vehicle_Roll,								&Vehicle::RollMinMax },
-		{ &EV_Vehicle_Z,								&Vehicle::ZMinMax },
-		{ &EV_Vehicle_QueryFreePassengerSlot,			&Vehicle::QueryFreePassengerSlot },
-		{ &EV_Vehicle_QueryFreeDriverSlot,				&Vehicle::QueryFreeDriverSlot },
-		{ &EV_Vehicle_QueryFreeTurretSlot,				&Vehicle::QueryFreeTurretSlot },
-		{ &EV_Vehicle_QueryPassengerSlotPosition,		&Vehicle::QueryPassengerSlotPosition },
-		{ &EV_Vehicle_QueryDriverSlotPosition,			&Vehicle::QueryDriverSlotPosition },
-		{ &EV_Vehicle_QueryTurretSlotPosition,			&Vehicle::QueryTurretSlotPosition },
-		{ &EV_Vehicle_QueryPassengerSlotStatus,			&Vehicle::QueryPassengerSlotStatus },
-		{ &EV_Vehicle_QueryDriverSlotStatus,			&Vehicle::QueryDriverSlotStatus },
-		{ &EV_Vehicle_QueryTurretSlotStatus,			&Vehicle::QueryTurretSlotStatus },
-		{ &EV_Vehicle_QueryPassengerSlotEntity,			&Vehicle::QueryPassengerSlotEntity },
-		{ &EV_Vehicle_QueryDriverSlotEntity,			&Vehicle::QueryDriverSlotEntity },
-		{ &EV_Vehicle_QueryTurretSlotEntity,			&Vehicle::QueryTurretSlotEntity },
-		{ &EV_Vehicle_QueryDriverSlotAngles,			&Vehicle::QueryDriverSlotAngles },
-		{ &EV_Vehicle_QueryPassengerSlotAngles,			&Vehicle::QueryPassengerSlotAngles },
-		{ &EV_Vehicle_QueryTurretSlotAngles,			&Vehicle::QueryTurretSlotAngles },
-		{ &EV_Vehicle_AttachPassengerSlot,				&Vehicle::AttachPassengerSlot },
-		{ &EV_Vehicle_AttachDriverSlot,					&Vehicle::AttachDriverSlot },
-		{ &EV_Vehicle_AttachTurretSlot,					&Vehicle::AttachTurretSlot },
-		{ &EV_Vehicle_DetachPassengerSlot,				&Vehicle::DetachPassengerSlot },
-		{ &EV_Vehicle_DetachDriverSlot,					&Vehicle::DetachDriverSlot },
-		{ &EV_Vehicle_DetachTurretSlot,					&Vehicle::DetachTurretSlot },
-		{ &EV_Vehicle_WheelCorners,						&Vehicle::SetWheelCorners },
-		{ &EV_Vehicle_AnimationSet,						&Vehicle::SetAnimationSet },
-		{ &EV_Vehicle_SoundSet,							&Vehicle::SetSoundSet },
-		{ &EV_Vehicle_ModifyDrive,						&Vehicle::EventModifyDrive },
-		{ &EV_Model,									&Vehicle::EventModel },
-		{ &EV_Vehicle_NextDrive,						&Vehicle::EventNextDrive },
-		{ &EV_Vehicle_LockMovement,						&Vehicle::EventLockMovement },
-		{ &EV_Vehicle_UnlockMovement,					&Vehicle::EventUnlockMovement },
-		{ &EV_Vehicle_RemoveOnDeath,					&Vehicle::EventRemoveOnDeath },
-		{ &EV_Vehicle_SetExplosionModel,				&Vehicle::EventSetExplosionModel },
-		{ &EV_Vehicle_SetCollisionEntity,				&Vehicle::EventSetCollisionModel },
-		{ &EV_Vehicle_SetSoundParameters,				&Vehicle::EventSetSoundParameters },
-		{ &EV_Vehicle_SetVolumeParameters,				&Vehicle::EventSetVolumeParameters },
-		{ &EV_Vehicle_StopAtEnd,						&Vehicle::EventStopAtEnd },
-		{ &EV_Vehicle_Skidding,							&Vehicle::EventSkidding },
-		{ &EV_Vehicle_ContinueSkidding,					&Vehicle::EventContinueSkidding },
-		{ &EV_Vehicle_CollisionEntitySetter,			&Vehicle::EventSetCollisionModel },
-		{ &EV_Vehicle_CollisionEntityGetter,			&Vehicle::EventGetCollisionModel },
-		{ &EV_Vehicle_VehicleAnim,						&Vehicle::EventVehicleAnim },
-		{ &EV_Vehicle_VehicleAnimDone,					&Vehicle::EventVehicleAnimDone },
-		{ NULL, NULL }
+CLASS_DECLARATION(VehicleBase, Vehicle, "script_vehicle") {
+    {&EV_Blocked,                            &Vehicle::VehicleBlocked            },
+    {&EV_Touch,                              &Vehicle::VehicleTouched            },
+    {&EV_Use,                                &Vehicle::DriverUse                 },
+    {&EV_Vehicle_Start,                      &Vehicle::VehicleStart              },
+    {&EV_Vehicle_Drivable,                   &Vehicle::Drivable                  },
+    {&EV_Vehicle_PathDrivable,               &Vehicle::PathDrivable              },
+    {&EV_Vehicle_ProjectileVulnerable,       &Vehicle::SetProjectileVulnerable   },
+    {&EV_Vehicle_UnDrivable,                 &Vehicle::UnDrivable                },
+    {&EV_Vehicle_Jumpable,                   &Vehicle::Jumpable                  },
+    {&EV_Vehicle_SeatAnglesOffset,           &Vehicle::SeatAnglesOffset          },
+    {&EV_Vehicle_SeatOffset,                 &Vehicle::SeatOffset                },
+    {&EV_Vehicle_Lock,                       &Vehicle::Lock                      },
+    {&EV_Vehicle_UnLock,                     &Vehicle::UnLock                    },
+    {&EV_Vehicle_SetWeapon,                  &Vehicle::SetWeapon                 },
+    {&EV_Vehicle_SetName,                    &Vehicle::SetName                   },
+    {&EV_Vehicle_SetSpeed,                   &Vehicle::SetSpeed                  },
+    {&EV_Vehicle_SetTurnRate,                &Vehicle::SetTurnRate               },
+    {&EV_Vehicle_SteerInPlace,               &Vehicle::SteerInPlace              },
+    {&EV_Vehicle_ShowWeapon,                 &Vehicle::ShowWeaponEvent           },
+    {&EV_Damage,                             &Vehicle::EventDamage               },
+    {&EV_Vehicle_Destroyed,                  &Vehicle::VehicleDestroyed          },
+    {&EV_Vehicle_Mass,                       &Vehicle::SetMass                   },
+    {&EV_Vehicle_Front_Mass,                 &Vehicle::SetFrontMass              },
+    {&EV_Vehicle_Back_Mass,                  &Vehicle::SetBackMass               },
+    {&EV_Vehicle_Tread,                      &Vehicle::SetTread                  },
+    {&EV_Vehicle_Radius,                     &Vehicle::SetTireRadius             },
+    {&EV_Vehicle_RollingResistance,          &Vehicle::SetRollingResistance      },
+    {&EV_Vehicle_Drag,                       &Vehicle::SetDrag                   },
+    {&EV_Vehicle_Drive,                      &Vehicle::EventDrive                },
+    {&EV_Vehicle_DriveNoWait,                &Vehicle::EventDriveNoWait          },
+    {&EV_Vehicle_Stop,                       &Vehicle::EventStop                 },
+    {&EV_Vehicle_FullStop,                   &Vehicle::EventFullStop             },
+    {&EV_Vehicle_Init,                       &Vehicle::ModelInit                 },
+    {&EV_Vehicle_BouncyCoef,                 &Vehicle::BouncyCoef                },
+    {&EV_Vehicle_SpringyCoef,                &Vehicle::SpringyCoef               },
+    {&EV_Vehicle_Yaw,                        &Vehicle::GetYaw                    },
+    {&EV_Vehicle_Roll,                       &Vehicle::RollMinMax                },
+    {&EV_Vehicle_Z,                          &Vehicle::ZMinMax                   },
+    {&EV_Vehicle_QuerySpeed,                 &Vehicle::QuerySpeed                },
+    {&EV_Vehicle_QueryFreePassengerSlot,     &Vehicle::QueryFreePassengerSlot    },
+    {&EV_Vehicle_QueryFreeDriverSlot,        &Vehicle::QueryFreeDriverSlot       },
+    {&EV_Vehicle_QueryFreeTurretSlot,        &Vehicle::QueryFreeTurretSlot       },
+    {&EV_Vehicle_QueryPassengerSlotPosition, &Vehicle::QueryPassengerSlotPosition},
+    {&EV_Vehicle_QueryDriverSlotPosition,    &Vehicle::QueryDriverSlotPosition   },
+    {&EV_Vehicle_QueryTurretSlotPosition,    &Vehicle::QueryTurretSlotPosition   },
+    {&EV_Vehicle_QueryPassengerSlotStatus,   &Vehicle::QueryPassengerSlotStatus  },
+    {&EV_Vehicle_QueryDriverSlotStatus,      &Vehicle::QueryDriverSlotStatus     },
+    {&EV_Vehicle_QueryTurretSlotStatus,      &Vehicle::QueryTurretSlotStatus     },
+    {&EV_Vehicle_QueryPassengerSlotEntity,   &Vehicle::QueryPassengerSlotEntity  },
+    {&EV_Vehicle_QueryDriverSlotEntity,      &Vehicle::QueryDriverSlotEntity     },
+    {&EV_Vehicle_QueryTurretSlotEntity,      &Vehicle::QueryTurretSlotEntity     },
+    {&EV_Vehicle_QueryDriverSlotAngles,      &Vehicle::QueryDriverSlotAngles     },
+    {&EV_Vehicle_QueryPassengerSlotAngles,   &Vehicle::QueryPassengerSlotAngles  },
+    {&EV_Vehicle_BounceForwardsVelocity,     &Vehicle::BounceForwardsVelocity    },
+    {&EV_Vehicle_BounceBackwardsVelocity,    &Vehicle::BounceBackwardsVelocity   },
+    {&EV_Vehicle_StopBackwardsVelocity,      &Vehicle::StopBackwardsVelocity     },
+    {&EV_Vehicle_StopBackwardsVelocity,      &Vehicle::StopBackwardsVelocity     },
+    {&EV_Vehicle_QueryTurretSlotAngles,      &Vehicle::QueryTurretSlotAngles     },
+    {&EV_Vehicle_AttachPassengerSlot,        &Vehicle::AttachPassengerSlot       },
+    {&EV_Vehicle_AttachDriverSlot,           &Vehicle::AttachDriverSlot          },
+    {&EV_Vehicle_AttachTurretSlot,           &Vehicle::AttachTurretSlot          },
+    {&EV_Vehicle_DetachPassengerSlot,        &Vehicle::DetachPassengerSlot       },
+    {&EV_Vehicle_DetachDriverSlot,           &Vehicle::DetachDriverSlot          },
+    {&EV_Vehicle_DetachTurretSlot,           &Vehicle::DetachTurretSlot          },
+    {&EV_Vehicle_WheelCorners,               &Vehicle::SetWheelCorners           },
+    {&EV_Vehicle_AnimationSet,               &Vehicle::SetAnimationSet           },
+    {&EV_Vehicle_SoundSet,                   &Vehicle::SetSoundSet               },
+    {&EV_Vehicle_SpawnTurret,                &Vehicle::SpawnTurret               },
+    {&EV_Vehicle_ModifyDrive,                &Vehicle::EventModifyDrive          },
+    {&EV_Model,                              &Vehicle::EventModel                },
+    {&EV_Vehicle_NextDrive,                  &Vehicle::EventNextDrive            },
+    {&EV_Vehicle_LockMovement,               &Vehicle::EventLockMovement         },
+    {&EV_Vehicle_UnlockMovement,             &Vehicle::EventUnlockMovement       },
+    {&EV_Vehicle_RemoveOnDeath,              &Vehicle::EventRemoveOnDeath        },
+    {&EV_Vehicle_SetExplosionModel,          &Vehicle::EventSetExplosionModel    },
+    {&EV_Vehicle_SetCollisionEntity,         &Vehicle::EventSetCollisionModel    },
+    {&EV_Vehicle_SetSoundParameters,         &Vehicle::EventSetSoundParameters   },
+    {&EV_Vehicle_SetVolumeParameters,        &Vehicle::EventSetVolumeParameters  },
+    {&EV_Vehicle_StopAtEnd,                  &Vehicle::EventStopAtEnd            },
+    {&EV_Vehicle_Skidding,                   &Vehicle::EventSkidding             },
+    {&EV_Vehicle_ContinueSkidding,           &Vehicle::EventContinueSkidding     },
+    {&EV_Vehicle_CollisionEntitySetter,      &Vehicle::EventSetCollisionModel    },
+    {&EV_Vehicle_CollisionEntityGetter,      &Vehicle::EventGetCollisionModel    },
+    {&EV_Vehicle_VehicleAnim,                &Vehicle::EventVehicleAnim          },
+    {&EV_Vehicle_VehicleAnimDone,            &Vehicle::EventVehicleAnimDone      },
+    {&EV_Vehicle_VehicleMoveAnim,            &Vehicle::EventVehicleMoveAnim      },
+    {&EV_Vehicle_VehicleMoveAnimDone,        &Vehicle::EventVehicleMoveAnimDone  },
+    {&EV_Vehicle_DamageSounds,               &Vehicle::EventDamageSounds         },
+    {&EV_Vehicle_RunSounds,                  &Vehicle::EventRunSounds            },
+    {&EV_Remove,                             &Vehicle::Remove                    },
+    {&EV_Turret_SetMaxUseAngle,              &Vehicle::EventSetMaxUseAngle       },
+    {&EV_Vehicle_CanUse,                     &Vehicle::EventCanUse               },
+    {NULL,                                   NULL                                }
 };
 
 /*
@@ -824,137 +958,235 @@ Vehicle::Vehicle
 */
 Vehicle::Vehicle()
 {
-	entflags |= EF_VEHICLE;
+    int i;
 
-	g_showvehiclemovedebug = gi.Cvar_Get( "g_showvehiclemovedebug", "0", 0 );
-	g_showvehicleentrypoints = gi.Cvar_Get( "g_showvehicleentrypoints", "0", 0 );
-	g_showvehicleslotpoints = gi.Cvar_Get( "g_showvehicleslotpoints", "0", 0 );
-	g_showvehiclepath = gi.Cvar_Get( "g_showvehiclepath", "0", 0 );
+    entflags |= ECF_VEHICLE;
 
-	if( LoadingSavegame )
-	{
-		// Archive function will setup all necessary data
-		return;
-	}
+    AddWaitTill(STRING_DRIVE);
+    AddWaitTill(STRING_VEHICLEANIMDONE);
+    AddWaitTill(STRING_ANIMDONE);
 
-	edict->s.eType = ET_VEHICLE;
+    g_showvehiclemovedebug   = gi.Cvar_Get("g_showvehiclemovedebug", "0", 0);
+    g_showvehicleentrypoints = gi.Cvar_Get("g_showvehicleentrypoints", "0", 0);
+    g_showvehicleslotpoints  = gi.Cvar_Get("g_showvehicleslotpoints", "0", 0);
+    g_showvehicletags        = gi.Cvar_Get("g_showvehicletags", "0", 0);
+    g_showvehiclepath        = gi.Cvar_Get("g_showvehiclepath", "0", 0);
 
-	takedamage = DAMAGE_YES;
-	seatangles = vec_zero;
-	driveroffset = Vector( 0, 0, 50 );
-	seatoffset = vec_zero;
-	currentspeed = 0;
-	turnangle = 0;
-	turnimpulse = 0;
-	moveimpulse = 0;
-	jumpimpulse = 0;
-	conesize = 75;
-	hasweapon = false;
-	locked = true;
-	steerinplace = false;
-	drivable = false;
-	jumpable = false;
-	showweapon = false;
-	hasweapon = false;
-	flags |= FL_TOUCH_TRIGGERS | FL_POSTTHINK | FL_THINK | FL_DIE_EXPLODE;
-	// touch triggers by default
-	gravity = 1;
-	mass = size.length() * 10;
+    for (i = 0; i < NUM_VEHICLE_TIRES; i++) {
+        VectorClear(m_vTireEnd[i]);
+    }
+    m_bTireHit[0] = false;
+    VectorClear(m_vNormalSum);
+    m_iNumNormals = 0;
 
-	health = 1000;
-	speed = 1200;
-	maxturnrate = 60.0f;
+    if (LoadingSavegame) {
+        // Archive function will setup all necessary data
+        return;
+    }
 
-	m_vAngles = angles;
-	prev_acceleration = vec_zero;
-	real_acceleration = vec_zero;
-	prev_origin = origin;
-	real_velocity = vec_zero;
-	prev_velocity = velocity;
-	m_vPrevNormal = vec_zero;
-	prev_moveimpulse = 0;
-	m_iFrameCtr = 0;
-	m_bFrontSlipping = qfalse;
-	m_bBackSlipping = qfalse;
-	m_vAngularVelocity = vec_zero;
-	m_vAngularAcceleration = vec_zero;
-	m_sMoveGrid = new cMoveGrid( 3, 3, 1 );
-	m_bAutoPilot = qfalse;
-	m_fIdealSpeed = 0;
-	m_fIdealAccel = 0;
-	m_fIdealDistance = 100;
-	m_vOriginOffset = vec_zero;
-	m_vOriginOffset2 = vec_zero;
-	m_vAnglesOffset = vec_zero;
-	m_fBouncyCoef = 0.2f;
-	m_fSpringyCoef = 0.8f;
-	m_fYawMin = -10.0f;
-	m_fYawMax = 10.0f;
-	m_fYawCoef = 0.1f;
-	m_fRollMin = -10.0f;
-	m_fRollMax = 10.0f;
-	m_fRollCoef = 0.1f;
-	m_fZMin = -10.0f;
-	m_fZMax = 10.0f;
-	m_fZCoef = 0.1f;
-	v_angle = vec_zero;
-	m_pCurPath = NULL;
-	m_bThinkCalled = qfalse;
-	m_iCurNode = 0;
-	m_pAlternatePath = NULL;
-	m_pNextPath = NULL;
-	m_iNextPathStartNode = 0;
-	vs.hit_obstacle = qfalse;
-	m_iAlternateNode = 0;
-	m_fLookAhead = 0;
-	m_fShaderOffset = 0;
-	vs.groundTrace.fraction = 1.0f;
-	edict->clipmask = MASK_VEHICLE;
-	m_fLeftForce = 0;
-	m_fRightForce = 0;
-	m_fForwardForce = 0;
-	m_fBackForce = 0;
-	m_fUpForce = 0;
-	m_fDownForce = 0;
-	edict->s.eFlags |= EF_LINKANGLES;
-	m_bMovementLocked = qfalse;
-	m_bRemoveOnDeath = qfalse;
-	m_sExplosionModel = "fx/fx_explosion.tik";
-	m_pCollisionEntity = NULL;
-	m_fSoundMinPitch = 0.95f;
-	m_fSoundMinSpeed = 0;
-	m_fSoundMaxPitch = 1.0f;
-	m_fSoundMaxSpeed = 200.0f;
-	m_fVolumeMinPitch = 1.0f;
-	m_fVolumeMinSpeed = 0;
-	m_fVolumeMaxPitch = 1.5f;
-	m_fVolumeMaxSpeed = 200.0f;
-	m_eSoundState = ST_OFF;
-	m_fNextSoundState = level.time;
-	m_pVehicleSoundEntities[ 0 ] = NULL;
-	m_pVehicleSoundEntities[ 1 ] = NULL;
-	m_pVehicleSoundEntities[ 2 ] = NULL;
-	m_pVehicleSoundEntities[ 3 ] = NULL;
-	m_bStopEnabled = qfalse;
-	m_bEnableSkidding = qfalse;
-	m_vSkidOrigin = vec_zero;
-	m_fSkidLeftForce = 0;
-	m_fSkidRightForce = 0;
-	m_sAnimationSet = "";
-	m_sSoundSet = "";
-	m_iLastTiresUpdate = -1;
-	m_vTireEnd[ 0 ] = origin;
-	m_bTireHit[ 0 ] = false;
-	m_vTireEnd[ 1 ] = origin;
-	m_bTireHit[ 1 ] = false;
-	m_vTireEnd[ 2 ] = origin;
-	m_bTireHit[ 2 ] = false;
-	m_vTireEnd[ 3 ] = origin;
-	m_bTireHit[ 3 ] = false;
+    edict->s.eType = ET_VEHICLE;
 
-	ResetSlots();
+    moveresult   = 0;
+    isBlocked    = false;
+    m_iGear      = 1;
+    m_iRPM       = 0;
+    maxtracedist = 0;
+    airspeed     = 0;
+    for (i = 0; i < 6; i++) {
+        m_fGearRatio[i] = 0;
+    }
 
-	PostEvent( EV_Vehicle_Start, EV_POSTSPAWN );
+    m_fMass      = 0;
+    m_fFrontMass = 0;
+    m_fBackMass  = 0;
+
+    m_fWheelBase            = 0.0;
+    m_fWheelFrontLoad       = 0.0;
+    m_fWheelFrontInnerLoad  = 0.0;
+    m_fWheelFrontOutterLoad = 0.0;
+    m_fWheelFrontDist       = 0.0;
+    m_fWheelFrontSuspension = 0.0;
+    m_fWheelBackLoad        = 0.0;
+    m_fWheelBackInnerLoad   = 0.0;
+    m_fWheelBackOutterLoad  = 0.0;
+    m_fWheelBackDist        = 0.0;
+    m_fWheelBackSuspension  = 0.0;
+
+    m_fCGHeight     = 0.0;
+    m_fBankAngle    = 0.0;
+    m_fTread        = 0.0;
+    m_fTrackWidth   = 0.0;
+    m_fTireFriction = 0.0;
+    m_fDrag         = 0.0;
+    m_fTireRadius   = 0.0;
+    m_fFrontBrakes  = 0.0;
+    m_fBackBrakes   = 0.0;
+
+    m_fRollingResistance   = 0.0;
+    m_fTireRotationalSpeed = 0.0;
+    m_fFrontBrakingForce   = 0.0;
+    m_fBackBrakingForce    = 0.0;
+    m_fBrakingPerformance  = 0.0;
+
+    m_fLastTurn          = 0.0;
+    m_fTangForce         = 0.0;
+    m_fInertia           = 0.0;
+    m_fDifferentialRatio = 0.0;
+    m_fGearEfficiency    = 0.0;
+    m_fMaxTraction       = 0.0;
+    m_fTractionForce     = 0.0;
+    m_fAccelerator       = 0.0;
+    m_fTorque            = 0.0;
+    m_fStopStartDistance = 0.0;
+    m_fStopStartSpeed    = 0.0;
+    m_fStopEndDistance   = 0.0;
+    m_bWheelSpinning     = 0;
+    m_bIsSkidding        = 0;
+    m_bIsBraking         = 0;
+    m_bAutomatic         = 0;
+    m_iNumNormals        = 0;
+
+    memset(&vs, 0, sizeof(vs));
+    takedamage                 = DAMAGE_YES;
+    seatangles                 = vec_zero;
+    driveroffset               = Vector(0, 0, 50);
+    seatoffset                 = vec_zero;
+    currentspeed               = 0;
+    turnangle                  = 0;
+    turnimpulse                = 0;
+    moveimpulse                = 0;
+    jumpimpulse                = 0;
+    conesize                   = 75;
+    hasweapon                  = false;
+    locked                     = true;
+    steerinplace               = false;
+    drivable                   = false;
+    pathDrivable               = false;
+    jumpable                   = false;
+    showweapon                 = false;
+    m_iProjectileHitsRemaining = 0;
+
+    flags |= FL_TOUCH_TRIGGERS | FL_POSTTHINK | FL_THINK | FL_DIE_EXPLODE;
+    // touch triggers by default
+    gravity = 1;
+    mass    = size.length() * 10;
+
+    health      = 1000;
+    speed       = 1200;
+    maxturnrate = 60.0f;
+    m_vAngles   = angles;
+
+    prev_acceleration = vec_zero;
+    real_acceleration = vec_zero;
+    prev_origin       = origin;
+    real_velocity     = vec_zero;
+    prev_velocity     = velocity;
+
+    m_vPrevNormal    = vec_zero;
+    prev_moveimpulse = 0;
+
+    m_iFrameCtr      = 0;
+    m_bFrontSlipping = qfalse;
+    m_bBackSlipping  = qfalse;
+
+    m_vAngularVelocity     = vec_zero;
+    m_vAngularAcceleration = vec_zero;
+
+    m_sMoveGrid = new cMoveGrid(3, 3, 1);
+
+    m_bAutoPilot       = qfalse;
+    m_fIdealSpeed      = 0;
+    m_fMaxSpeed        = 0;
+    m_fIdealAccel      = 0;
+    m_fIdealDistance   = 100;
+    m_bBounceBackwards = false;
+
+    m_vOriginOffset  = vec_zero;
+    m_vOriginOffset2 = vec_zero;
+    m_vAnglesOffset  = vec_zero;
+
+    m_fBouncyCoef  = 0.2f;
+    m_fSpringyCoef = 0.8f;
+    m_fYawMin      = -10.0f;
+    m_fYawMax      = 10.0f;
+    m_fYawCoef     = 0.1f;
+    m_fRollMin     = -10.0f;
+    m_fRollMax     = 10.0f;
+    m_fRollCoef    = 0.1f;
+    m_fZMin        = -10.0f;
+    m_fZMax        = 10.0f;
+    m_fZCoef       = 0.1f;
+
+    m_vAngularVelocity     = vec_zero;
+    m_vAngularAcceleration = vec_zero;
+    v_angle                = vec_zero;
+    m_bThinkCalled         = qfalse;
+    m_pCurPath             = NULL;
+    m_iCurNode             = 0;
+    m_pAlternatePath       = NULL;
+    m_iAlternateNode       = 0;
+    m_pNextPath            = NULL;
+    m_iNextPathStartNode   = -1;
+
+    m_fLookAhead            = 0;
+    m_fShaderOffset         = 0;
+    vs.hit_obstacle         = false;
+    vs.groundTrace.fraction = 1.0f;
+    edict->clipmask         = MASK_VEHICLE;
+
+    m_fLeftForce    = 0;
+    m_fRightForce   = 0;
+    m_fForwardForce = 0;
+    m_fBackForce    = 0;
+    m_fUpForce      = 0;
+    m_fDownForce    = 0;
+
+    edict->s.eFlags |= EF_LINKANGLES;
+
+    m_bMovementLocked  = qfalse;
+    m_bRemoveOnDeath   = qtrue;
+    m_sExplosionModel  = "fx/fx_explosion.tik";
+    m_pCollisionEntity = NULL;
+
+    m_fSoundMinPitch  = 0.95f;
+    m_fSoundMinSpeed  = 0;
+    m_fSoundMaxPitch  = 1.0f;
+    m_fSoundMaxSpeed  = 200.0f;
+    m_fVolumeMinPitch = 1.0f;
+    m_fVolumeMinSpeed = 0;
+    m_fVolumeMaxPitch = 1.5f;
+    m_fVolumeMaxSpeed = 200.0f;
+
+    m_eSoundState              = ST_OFF;
+    m_fNextSoundState          = level.time;
+    m_pVehicleSoundEntities[0] = NULL;
+    m_pVehicleSoundEntities[1] = NULL;
+    m_pVehicleSoundEntities[2] = NULL;
+    m_pVehicleSoundEntities[3] = NULL;
+
+    m_bStopEnabled    = qfalse;
+    m_bEnableSkidding = qfalse;
+    m_fSkidAngle      = 0;
+    m_vSkidOrigin     = vec_zero;
+    m_fSkidLeftForce  = 0;
+    m_fSkidRightForce = 0;
+
+    m_sAnimationSet = "";
+    m_sSoundSet     = "";
+
+    m_iLastTiresUpdate = -1;
+    for (i = 0; i < NUM_VEHICLE_TIRES; i++) {
+        m_vTireEnd[i] = origin;
+        m_bTireHit[i] = false;
+    }
+
+    m_bAnimMove            = false;
+    m_fMaxUseAngle         = 0;
+    m_bBounceStayFullSpeed = false;
+
+    ResetSlots();
+
+    PostEvent(EV_Vehicle_Start, EV_POSTSPAWN);
 }
 
 /*
@@ -964,2760 +1196,13 @@ Vehicle::~Vehicle
 */
 Vehicle::~Vehicle()
 {
-	for( int i = 0; i < MAX_SOUND_ENTITIES; i++ )
-	{
-		if( m_pVehicleSoundEntities[ i ] )
-			m_pVehicleSoundEntities[ i ]->PostEvent( EV_Remove, EV_LINKDOORS );
-	}
+    RemoveVehicleSoundEntities();
 
-	if( m_pCollisionEntity )
-		m_pCollisionEntity->ProcessEvent( EV_Remove );
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->ProcessEvent(EV_Remove);
+    }
 
-	entflags &= ~EF_VEHICLE;
-}
-
-/*
-====================
-Vehicle::VehicleStart
-====================
-*/
-void Vehicle::VehicleStart
-	(
-	Event *ev
-	)
-{
-	Entity			*ent;
-	VehicleBase		*last;
-	Vector			drivemins, drivemaxs;
-	float			max;
-	orientation_t	orient;
-
-	// become solid
-	setSolidType( SOLID_BBOX );
-	edict->r.contents = CONTENTS_BBOX;
-
-	last = this;
-
-	setLocalOrigin( localorigin + Vector( 0.0f, 0.0f, 30.0f ) );
-	angles = m_vAngles;
-
-	for( ent = G_NextEntity( NULL ); ent != NULL; ent = G_NextEntity( ent ) )
-	{
-		if( ( ent != this ) && ( ent->isSubclassOf( VehicleBase ) ) )
-		{
-			if( ( ent->absmax.x >= absmin.x ) && ( ent->absmax.y >= absmin.y ) && ( ent->absmax.z >= absmin.z ) &&
-				( ent->absmin.x <= absmax.x ) && ( ent->absmin.y <= absmax.y ) && ( ent->absmin.z <= absmax.z ) )
-			{
-				last->vlink = ( VehicleBase * )ent;
-				last = ( VehicleBase * )ent;
-				last->offset = last->origin - origin;
-				last->offset = getLocalVector( last->offset );
-				last->edict->s.scale *= edict->s.scale;
-			}
-		}
-	}
-
-	last->vlink = NULL;
-
-	OpenSlotsByModel();
-
-	//
-	// get the seat offset
-	//
-	if( GetRawTag( "seat", &orient ) )
-	{
-		driveroffset = Vector( orient.origin );
-	}
-	driveroffset += seatoffset * edict->s.scale;
-
-	SetDriverAngles( angles + seatangles );
-
-	max_health = health;
-
-	//
-	// calculate drive mins and maxs
-	//
-	max = 0;
-	if( fabs( mins[ 0 ] ) > max )
-		max = fabs( mins[ 0 ] );
-	if( fabs( maxs[ 0 ] ) > max )
-		max = fabs( maxs[ 0 ] );
-	if( fabs( mins[ 1 ] ) > max )
-		max = fabs( mins[ 1 ] );
-	if( fabs( maxs[ 1 ] ) > max )
-		max = fabs( maxs[ 1 ] );
-	drivemins = Vector( -max, -max, mins[ 2 ] ) * edict->s.scale;
-	drivemaxs = Vector( max, max, maxs[ 2 ] ) * edict->s.scale;
-
-	last_origin = origin;
-	link();
-}
-
-/*
-====================
-Vehicle::Drivable
-====================
-*/
-void Vehicle::Drivable
-	(
-	Event *ev
-	)
-{
-	setMoveType( MOVETYPE_VEHICLE );
-	drivable = true;
-}
-
-/*
-====================
-Vehicle::UnDrivable
-====================
-*/
-void Vehicle::UnDrivable
-	(
-	Event *ev
-	)
-{
-	setMoveType( MOVETYPE_PUSH );
-	drivable = false;
-}
-
-/*
-====================
-Vehicle::Jumpable
-====================
-*/
-void Vehicle::Jumpable
-	(
-	Event *ev
-	)
-{
-	jumpable = true;
-}
-
-/*
-====================
-Vehicle::Lock
-====================
-*/
-void Vehicle::Lock
-	(
-	Event *ev
-	)
-{
-	Lock();
-}
-
-/*
-====================
-Vehicle::UnLock
-====================
-*/
-void Vehicle::UnLock
-	(
-	Event *ev
-	)
-{
-	UnLock();
-}
-
-/*
-====================
-Vehicle::SteerInPlace
-====================
-*/
-void Vehicle::SteerInPlace
-	(
-	Event *ev
-	)
-{
-	steerinplace = true;
-}
-
-/*
-====================
-Vehicle::SeatAnglesOffset
-====================
-*/
-void Vehicle::SeatAnglesOffset
-	(
-	Event *ev
-	)
-{
-	seatangles = ev->GetVector( 1 );
-}
-
-/*
-====================
-Vehicle::SeatOffset
-====================
-*/
-void Vehicle::SeatOffset
-	(
-	Event *ev
-	)
-{
-	seatoffset = ev->GetVector( 1 );
-}
-
-/*
-====================
-Vehicle::SetWeapon
-====================
-*/
-void Vehicle::SetWeapon
-	(
-	Event *ev
-	)
-{
-	showweapon = true;
-	hasweapon = true;
-	weaponName = ev->GetString( 1 );
-}
-
-/*
-====================
-Vehicle::ShowWeaponEvent
-====================
-*/
-void Vehicle::ShowWeaponEvent
-	(
-	Event *ev
-	)
-{
-	showweapon = true;
-}
-
-/*
-====================
-Vehicle::HasWeapon
-====================
-*/
-qboolean Vehicle::HasWeapon
-	(
-	void
-	)
-{
-	return hasweapon;
-}
-
-/*
-====================
-Vehicle::ShowWeapon
-====================
-*/
-qboolean Vehicle::ShowWeapon
-	(
-	void
-	)
-{
-	return showweapon;
-}
-
-/*
-====================
-Vehicle::SetDriverAngles
-====================
-*/
-void Vehicle::SetDriverAngles
-	(
-	Vector angles
-	)
-{
-	int i;
-
-	if( !driver.ent )
-		return;
-
-	for( i = 0; i < 3; i++ )
-	{
-		driver.ent->client->ps.delta_angles[ i ] = ANGLE2SHORT( angles[ i ] - driver.ent->client->cmd_angles[ i ] );
-	}
-}
-
-/*
-====================
-Vehicle::CheckWater
-====================
-*/
-void Vehicle::CheckWater
-	(
-	void
-	)
-{
-	Vector  point;
-	int	  cont;
-	int	  sample1;
-	int	  sample2;
-	VehicleBase *v;
-
-	unlink();
-	v = this;
-	while( v->vlink )
-	{
-		v = v->vlink;
-		v->unlink();
-	}
-
-	if( driver.ent )
-	{
-		driver.ent->unlink();
-	}
-
-	//
-	// get waterlevel
-	//
-	waterlevel = 0;
-	watertype = 0;
-
-	sample2 = maxs[ 2 ] - mins[ 2 ];
-	sample1 = sample2 / 2;
-
-	point = origin;
-	point[ 2 ] += mins[ 2 ];
-	cont = gi.pointcontents( point, 0 );
-
-	if( cont & MASK_WATER )
-	{
-		watertype = cont;
-		waterlevel = 1;
-		point[ 2 ] = origin[ 2 ] + mins[ 2 ] + sample1;
-		cont = gi.pointcontents( point, 0 );
-		if( cont & MASK_WATER )
-		{
-			waterlevel = 2;
-			point[ 2 ] = origin[ 2 ] + mins[ 2 ] + sample2;
-			cont = gi.pointcontents( point, 0 );
-			if( cont & MASK_WATER )
-			{
-				waterlevel = 3;
-			}
-		}
-	}
-
-	link();
-	v = this;
-	while( v->vlink )
-	{
-		v = v->vlink;
-		v->link();
-	}
-
-	if( driver.ent )
-	{
-		driver.ent->link();
-		driver.ent->waterlevel = waterlevel;
-		driver.ent->watertype = watertype;
-	}
-}
-
-/*
-====================
-Vehicle::WorldEffects
-====================
-*/
-void Vehicle::WorldEffects
-	(
-	void
-	)
-{
-	//
-	// Check for earthquakes
-	//
-	if( groundentity && ( level.earthquake_magnitude > 0.0f ) )
-	{
-		velocity += Vector
-			(
-			level.earthquake_magnitude * EARTHQUAKE_STRENGTH * G_CRandom(),
-			level.earthquake_magnitude * EARTHQUAKE_STRENGTH * G_CRandom(),
-			level.earthquake_magnitude * 1.5f * G_Random()
-			);
-	}
-
-	//
-	// check for lava
-	//
-	if( watertype & CONTENTS_LAVA )
-	{
-		Damage( world, world, 20 * waterlevel, origin, vec_zero, vec_zero, 0, DAMAGE_NO_ARMOR, MOD_LAVA );
-	}
-}
-
-/*
-====================
-Vehicle::DriverUse
-====================
-*/
-void Vehicle::DriverUse
-	(
-	Event *ev
-	)
-{
-	int slot;
-	Vector pos;
-	Vector dist;
-	float min_length = 1e30f;
-	int min_slot = 0;
-	int min_type = -1;
-	Entity *ent;
-	Vector vExitAngles;
-	bool bHasExitAngles;
-	Vector vExitPosition;
-
-	ent = ev->GetEntity( 1 );
-
-	if( locked )
-	{
-		return;
-	}
-
-	if( ev->NumArgs() == 2 )
-	{
-		if( ev->IsVectorAt( 2 ) )
-		{
-			vExitPosition = ev->GetVector( 2 );
-		}
-		else if( ev->IsEntityAt( 2 ) )
-		{
-			Entity *pEnt = ev->GetEntity( 2 );
-
-			bHasExitAngles = true;
-			vExitAngles = pEnt->angles;
-			vExitPosition = pEnt->origin;
-		}
-		else if( ev->IsSimpleEntityAt( 2 ) )
-		{
-			SimpleEntity *pEnt = ev->GetSimpleEntity( 2 );
-
-			bHasExitAngles = true;
-			vExitAngles = pEnt->angles;
-			vExitPosition = pEnt->origin;
-		}
-	}
-
-	slot = FindDriverSlotByEntity( ent );
-
-	if( slot >= 0 )
-	{
-		DetachDriverSlot( slot, vec_zero, NULL );
-
-		if( ent->IsSubclassOfVehicleTank() && Turrets[ 0 ].ent->IsSubclassOfVehicleTurretGun() )
-		{
-			VehicleTurretGun *pTurret = ( VehicleTurretGun * )Turrets[ 0 ].ent.Pointer();
-
-			pTurret->m_bUseRemoteControl = false;
-			pTurret->m_pRemoteOwner = NULL;
-		}
-
-		return;
-	}
-
-	slot = FindPassengerSlotByEntity( ent );
-
-	if( slot >= 0 )
-	{
-		DetachPassengerSlot( slot, vec_zero, NULL );
-		return;
-	}
-
-	if( ent->IsSubclassOfWeapon() )
-	{
-		slot = FindTurretSlotByEntity( ent );
-
-		if( slot >= 0 )
-		{
-			DetachTurretSlot( slot, vec_zero, NULL );
-		}
-	}
-	else if( ent->IsSubclassOfPlayer() )
-	{
-		Player *player = ( Player * )ent;
-
-		if( player->m_pTurret )
-		{
-			slot = FindTurretSlotByEntity( player->m_pTurret );
- 
-			if( slot >= 0 )
-			{
-				if( bHasExitAngles )
-				{
-					AttachTurretSlot( slot, player->m_pTurret, vExitPosition, &vExitAngles );
-				}
-				else
-				{
-					AttachTurretSlot( slot, player->m_pTurret, vExitPosition, NULL );
-				}
-
-				player->m_pVehicle = NULL;
-				return;
-			}
-		}
-	}
-
-	// Check for passengers slots
-	for( slot = 0; slot < MAX_PASSENGERS; slot++ )
-	{
-		if( !( Passengers[ 0 ].flags & SLOT_FREE ) )
-		{
-			continue;
-		}
-
-		QueryPassengerSlotPosition( slot, ( float * )&pos );
-
-		dist = pos - ent->origin;
-
-		if( dist.length() < min_length )
-		{
-			min_length = dist.length();
-			min_type = 0;
-			min_slot = slot;
-		}
-	}
-
-	// Check for turrets slots
-	if( ent->IsSubclassOfWeapon() )
-	{
-		for( slot = 0; slot < MAX_TURRETS; slot++ )
-		{
-			if( !( Turrets[ 0 ].flags & SLOT_FREE ) )
-			{
-				continue;
-			}
-
-			QueryTurretSlotPosition( slot, ( float * )&pos );
-
-			dist = pos - ent->origin;
-
-			if( dist.length() < min_length )
-			{
-				min_length = dist.length();
-				min_type = 1;
-				min_slot = slot;
-			}
-		}
-	}
-	else
-	{
-		for( slot = 0; slot < MAX_TURRETS; slot++ )
-		{
-			if( !( Turrets[ 0 ].flags & SLOT_BUSY ) )
-			{
-				continue;
-			}
-
-			QueryTurretSlotPosition( slot, ( float * )&pos );
-
-			dist = pos - ent->origin;
-
-			if( dist.length() < min_length )
-			{
-				min_length = dist.length();
-				min_type = 1;
-				min_slot = slot;
-			}
-		}
-	}
-
-	slot = 0;
-
-	// Check for driver(s) slot(s)
-	if( driver.flags & SLOT_FREE )
-	{
-		QueryDriverSlotPosition( slot, ( float * )&pos );
-
-		dist = pos - ent->origin;
-
-		if( dist.length() < min_length )
-		{
-			min_length = dist.length();
-			min_type = 2;
-			min_slot = slot;
-		}
-	}
-
-	switch( min_type )
-	{
-	case 0:
-		AttachPassengerSlot( min_slot, ent, vec_zero );
-		break;
-	case 1:
-		AttachTurretSlot( min_slot, ent, vec_zero, NULL );
-		break;
-	case 2:
-		AttachDriverSlot( min_slot, ent, vec_zero );
-		break;
-	}
-}
-
-/*
-====================
-Vehicle::Drive
-====================
-*/
-qboolean Vehicle::Drive
-	(
-	usercmd_t *ucmd
-	)
-{
-	Vector i, j, k;
-
-	i = velocity;
-	VectorNormalize( i );
-
-	if( !driver.ent || !driver.ent->isClient() )
-	{
-		return false;
-	}
-
-	if( !drivable )
-	{
-		driver.ent->client->ps.pm_flags |= PMF_FROZEN;
-		ucmd->forwardmove = 0;
-		ucmd->rightmove = 0;
-		ucmd->upmove = 0;
-		return false;
-	}
-
-	driver.ent->client->ps.pm_flags |= PMF_NO_PREDICTION;
-
-	moveimpulse = ( ( float )ucmd->forwardmove ) * ( VectorLength( i ) + 1.0 );
-	m_bIsBraking = ucmd->forwardmove >> 31;
-	m_fAccelerator += ( ( float )ucmd->forwardmove ) * 0.005;
-	if( m_fAccelerator < 0.0 )
-		m_fAccelerator = 0.0;
-	else if( m_fAccelerator > 1.0 )
-		m_fAccelerator = 1.0;
-
-	turnimpulse = ( ( float )-ucmd->rightmove );
-	jumpimpulse = ( ( float )ucmd->upmove * gravity ) / 350;
-	if( ( jumpimpulse < 0 ) || ( !jumpable ) )
-		jumpimpulse = 0;
-
-	turnimpulse += 8 * angledist( SHORT2ANGLE( ucmd->angles[ 1 ] ) - driver.ent->client->cmd_angles[ 1 ] );
-
-	return true;
-}
-
-/*
-====================
-Vehicle::Think
-====================
-*/
-void Vehicle::Think
-	(
-	void
-	)
-{
-	flags |= FL_POSTTHINK;
-}
-
-/*
-====================
-Vehicle::Postthink
-====================
-*/
-void Vehicle::Postthink
-	(
-	void
-	)
-{
-	float	turn;
-	Vector	i;
-	Vector	j;
-	Vector	k;
-	Vector	temp;
-	Vector	roll;
-	Vector	acceleration;
-	Vector	atmp;
-	Vector	atmp2;
-	Vector	aup;
-	VehicleBase *v;
-	VehicleBase *last;
-	float	drivespeed;
-	Vector	primal_angles = angles;
-	Vector	primal_origin = origin;
-	Vector	vTmp;
-	Vector	vAddedAngles;
-	Vector	n_angles;
-	orientation_t orient;
-
-	if( !g_vehicle->integer )
-	{
-		return;
-	}
-
-	if( m_pCollisionEntity )
-	{
-		setSolidType( SOLID_NOT );
-		m_pCollisionEntity->Solid();
-	}
-
-	prev_velocity = velocity;
-
-	FactorOutAnglesOffset();
-	FactorOutOriginOffset();
-
-	if( m_vOldMins != vec_zero && m_vOldMaxs != vec_zero )
-	{
-		mins = m_vOldMins;
-		maxs = m_vOldMaxs;
-	}
-	else
-	{
-		if( mins != vec_zero || maxs != vec_zero )
-		{
-			m_vOldMins = mins;
-			m_vOldMaxs = maxs;
-		}
-	}
-
-	SetSlotsNonSolid();
-	MoveVehicle();
-	SetSlotsSolid();
-
-	m_bThinkCalled = true;
-
-	if( !m_bAutoPilot )
-	{
-		if( !driver.ent || !driver.ent->IsSubclassOfPlayer() )
-		{
-			acceleration = velocity;
-			acceleration.z = 0;
-
-			if( acceleration.length() < 0.1f )
-			{
-				velocity = vec_zero;
-			}
-		}
-
-		moveimpulse *= 0.825f;
-		turnimpulse *= 0.825f;
-	}
-	else
-	{
-		AutoPilot();
-	}
-
-	currentspeed = moveimpulse;
-	turnangle = turnangle * 0.25f + turnimpulse;
-	if( turnangle > maxturnrate )
-	{
-		turnangle = maxturnrate;
-	}
-	else if( turnangle < -maxturnrate )
-	{
-		turnangle = -maxturnrate;
-	}
-
-	if( level.inttime <= 1200 )
-	{
-		prev_origin = origin;
-	}
-	else
-	{
-		real_velocity = origin - prev_origin;
-		prev_origin = origin;
-		prev_acceleration = real_acceleration;
-		real_acceleration = prev_velocity - real_velocity;
-		prev_velocity = real_velocity;
-
-		n_angles = real_acceleration - prev_acceleration;
-	}
-
-	UpdateSkidAngle();
-	UpdateBones();
-	UpdateShaderOffset();
-	UpdateTires();
-	UpdateNormals();
-
-	angles.AngleVectorsLeft( &i, &j, &k );
-
-	turn = level.frametime * turnangle;
-
-	velocity[ 0 ] *= 0.925f;
-	velocity[ 1 ] *= 0.925f;
-
-	velocity = Vector( orientation[ 0 ] ) * currentspeed;
-
-	drivespeed = velocity * Vector( orientation[ 0 ] );
-
-	if( drivespeed > speed )
-	{
-		drivespeed = speed;
-	}
-
-	velocity = Vector( orientation[ 0 ] ) * drivespeed;
-	velocity.z = drivespeed * jumpimpulse;
-	avelocity *= 0.05f;
-
-	if( steerinplace && drivespeed < 350.0f )
-	{
-		drivespeed = 350.0f;
-	}
-
-	avelocity[ 1 ] += turn * drivespeed;
-	angles += avelocity * level.frametime;
-
-	UpdateSound();
-
-	CalculateAnglesOffset( n_angles );
-	CalculateOriginOffset();
-
-	last_origin = origin;
-
-	vAddedAngles = angles - primal_angles;
-
-	if( vAddedAngles[ 0 ] * level.frametime > -1.0f || vAddedAngles[ 0 ] * level.frametime < 1.0f )
-	{
-		vAddedAngles[ 0 ] = 0.0f;
-	}
-
-	if( vAddedAngles[ 1 ] * level.frametime > -1.0f || vAddedAngles[ 1 ] * level.frametime < 1.0f )
-	{
-		vAddedAngles[ 1 ] = 0.0f;
-	}
-
-	if( vAddedAngles[ 2 ] * level.frametime > -1.0f || vAddedAngles[ 2 ] * level.frametime < 1.0f )
-	{
-		vAddedAngles[ 2 ] = 0.0f;
-	}
-
-	avelocity = vAddedAngles;
-
-	FactorInOriginOffset();
-	FactorInAnglesOffset( &vAddedAngles );
-
-	CalculateAnimationData( vAddedAngles, m_vOriginOffset + m_vOriginOffset2 );
-
-	if( m_pCollisionEntity )
-	{
-		n_angles = angles - m_pCollisionEntity->angles;
-
-		n_angles[ 0 ] = angledist( n_angles[ 0 ] );
-		n_angles[ 1 ] = angledist( n_angles[ 1 ] );
-		n_angles[ 2 ] = angledist( n_angles[ 2 ] );
-
-		G_PushMove( m_pCollisionEntity, origin - primal_origin, n_angles );
-		G_TouchTriggers( m_pCollisionEntity );
-
-		m_pCollisionEntity->setOrigin( origin );
-		m_pCollisionEntity->setAngles( angles );
-	}
-
-	SetupVehicleSoundEntities();
-	UpdateDriverSlot( 0 );
-
-	for( int slot = 0; slot < MAX_PASSENGERS; slot++ )
-	{
-		UpdatePassengerSlot( slot );
-	}
-
-	for( int slot = 0; slot < MAX_TURRETS; slot++ )
-	{
-		UpdateTurretSlot( slot );
-	}
-
-	atmp = angles - primal_angles;
-
-	if( g_showvehicleentrypoints->integer )
-	{
-		for( int slot = 0; slot < MAX_PASSENGERS; slot++ )
-		{
-			if( Passengers[ slot ].enter_boneindex >= 0 )
-			{
-				QueryPassengerSlotPosition( slot, ( float * )&temp );
-
-				G_DebugCircle( temp, 10.0f, 1.0f, 0.0f, 0.0f, 1.0f, true );
-			}
-		}
-
-		for( int slot = 0; slot < MAX_TURRETS; slot++ )
-		{
-			if( Turrets[ slot ].enter_boneindex >= 0 )
-			{
-				QueryTurretSlotPosition( slot, ( float * )&temp );
-
-				G_DebugCircle( temp, 10.0f, 0.0f, 1.0f, 0.0f, 1.0f, true );
-			}
-		}
-
-		if( driver.enter_boneindex >= 0 )
-		{
-			QueryTurretSlotPosition( 0, ( float * )&temp );
-
-			G_DebugCircle( temp, 10.0f, 0.0f, 0.0f, 1.0f, 1.0f, true );
-		}
-	}
-
-	if( g_showvehicleslotpoints->integer )
-	{
-		for( int slot = 0; slot < MAX_PASSENGERS; slot++ )
-		{
-			if( Passengers[ slot ].boneindex < 0 )
-			{
-				continue;
-			}
-
-			GetTagPositionAndOrientation( Passengers[ slot ].boneindex, &orient );
-			G_DebugCircle( orient.origin, 10.0, 1.0f, 0.5f, 0.5f, 1.0f, true );
-		}
-
-		for( int slot = 0; slot < MAX_TURRETS; slot++ )
-		{
-			if( Turrets[ slot ].boneindex < 0 )
-			{
-				continue;
-			}
-
-			GetTagPositionAndOrientation( Turrets[ slot ].boneindex, &orient );
-			G_DebugCircle( orient.origin, 10.0, 0.5f, 1.0f, 1.0f, 1.0f, true );
-		}
-
-		if( driver.boneindex >= 0 )
-		{
-			GetTagPositionAndOrientation( driver.boneindex, &orient );
-			G_DebugCircle( orient.origin, 10.0, 0.5f, 0.5f, 1.0f, 1.0f, true );
-		}
-	}
-
-	last = this;
-	while( last->vlink )
-	{
-		v = last->vlink;
-		v->setOrigin( origin + ( i * v->offset.x ) + ( j * v->offset.y ) + ( k * v->offset.z ) );
-		v->avelocity = avelocity;
-		v->velocity = velocity;
-		v->angles[ ROLL ] = angles[ ROLL ];
-		v->angles[ YAW ] = angles[ YAW ];
-		v->angles[ PITCH ] = ( float )( ( int )( v->angles[ PITCH ] + ( drivespeed / 4 ) ) % 360 );
-
-		v->setAngles( v->angles );
-
-		last = v;
-	}
-
-	CheckWater();
-	WorldEffects();
-
-	if( m_pCollisionEntity )
-	{
-		setSolidType( SOLID_NOT );
-		m_pCollisionEntity->Solid();
-	}
-	else
-	{
-		setSolidType( SOLID_BBOX );
-		edict->r.contents = CONTENTS_UNKNOWN2;
-	}
-}
-
-/*
-====================
-Vehicle::VehicleTouched
-====================
-*/
-void Vehicle::VehicleTouched
-	(
-	Event *ev
-	)
-
-	{
-	Entity	*other;
-	float		speed;
-   Vector   delta;
-	Vector	dir;
-
- 	other = ev->GetEntity( 1 );
-	if ( other == driver.ent )
-		{
-		return;
-		}
-
-   if ( other == world )
-      {
-      return;
-      }
-
-   if ( drivable && !driver.ent )
-      {
-      return;
-      }
-
-   delta = origin - last_origin;
-	speed = delta.length();
-	if ( speed > 2 )
-		{
-		Sound( "vehicle_crash", qtrue );
-		dir = delta * ( 1 / speed );
-      other->Damage( this, lastdriver.ent, speed * 8, origin, dir, vec_zero, speed*15, 0, MOD_VEHICLE );
-		}
-
-	}
-
-/*
-====================
-Vehicle::VehicleBlocked
-====================
-*/
-void Vehicle::VehicleBlocked
-	(
-	Event *ev
-	)
-
-	{
-   return;
-/*
-	Entity	*other;
-	float		speed;
-   float    damage;
-   Vector   delta;
-   Vector   newvel;
-	Vector	dir;
-
-   if ( !velocity[0] && !velocity[1] )
-      return;
-
-	other = ev->GetEntity( 1 );
-	if ( other == driver.ent )
-		{
-		return;
-		}
-   if ( other->isSubclassOf( VehicleBase ) )
-      {
-      delta = other->origin - origin;
-      delta.normalize();
-
-      newvel = vec_zero - ( velocity) + ( other->velocity * 0.25 );
-      if ( newvel * delta < 0 )
-         {
-         velocity = newvel;
-         delta = velocity - other->velocity;
-         damage = delta.length()/4;
-         }
-      else
-         {
-         return;
-         }
-      }
-   else if ( ( velocity.length() < 350 ) )
-      {
-      other->velocity += velocity*1.25f;
-      other->velocity[ 2 ] += 100;
-      damage = velocity.length()/4;
-      }
-   else
-      {
-      damage = other->health + 1000;
-      }
-
-	// Gib 'em outright
-	speed = fabs( velocity.length() );
-	dir = velocity * ( 1 / speed );
-   other->Damage( this, lastdriver.ent, damage, origin, dir, vec_zero, speed, 0, MOD_VEHICLE, -1, -1, 1.0f );
-*/
-   }
-
-/*
-====================
-Vehicle::Driver
-====================
-*/
-Entity *Vehicle::Driver
-	(
-	void
-	)
-
-	{
-	return driver.ent;
-	}
-
-/*
-====================
-Vehicle::IsDrivable
-====================
-*/
-qboolean Vehicle::IsDrivable
-	(
-	void
-	)
-
-	{
-	return drivable;
-	}
-
-/*
-====================
-Vehicle::EventSetSpeed
-====================
-*/
-void Vehicle::SetSpeed
-	(
-	Event *ev
-	)
-   {
-   speed = ev->GetFloat( 1 );
-   }
-
-/*
-====================
-Vehicle::EventSetTurnRate
-====================
-*/
-void Vehicle::SetTurnRate
-	(
-	Event *ev
-	)
-   {
-   maxturnrate = ev->GetFloat( 1 );
-   }
-
-/*
-====================
-Vehicle::VehicleDestroyed
-====================
-*/
-void Vehicle::VehicleDestroyed
-	(
-	Event *ev
-	)
-	
-{
-}
-
-void Vehicle::DetachRemoteOwner()
-{
-	// FIXME: unimplemented
-}
-
-/*
-====================
-Vehicle::SetMoveInfo
-====================
-*/
-void Vehicle::SetMoveInfo
-	(
-	vmove_t *vm
-	)
-{
-	memset( vm, 0, sizeof( vmove_t ) );
-
-	VectorCopy( origin, vs.origin );
-	vs.useGravity = 0;
-	vs.entityNum = entnum;
-
-	vm->vs = &vs;
-	vm->frametime = level.frametime;
-	vm->tracemask = edict->clipmask;
-	VectorCopy( mins, vm->mins );
-	VectorCopy( maxs, vm->maxs );
-
-	vs.entityNum = edict->s.number;
-	vs.desired_dir[ 0 ] = velocity[ 0 ];
-	vs.desired_dir[ 1 ] = velocity[ 1 ];
-
-	vm->desired_speed = VectorNormalize2D( this->vs.desired_dir );
-}
-
-/*
-====================
-Vehicle::GetMoveInfo
-====================
-*/
-void Vehicle::GetMoveInfo
-	(
-	vmove_t *vm
-	)
-{
-	Vector newOrigin = vm->vs->origin;
-
-	if( bindmaster )
-	{
-		newOrigin = vm->vs->origin - origin;
-	}
-
-	setLocalOrigin( newOrigin );
-
-	groundentity = NULL;
-	if( vm->vs->groundEntityNum != ENTITYNUM_NONE )
-	{
-		groundentity = &g_entities[ vm->vs->groundEntityNum ];
-	}
-}
-
-/*
-====================
-Vehicle::SetCEMoveInfo
-====================
-*/
-void Vehicle::SetCEMoveInfo
-	(
-	vmove_t *vm
-	)
-{
-	SetMoveInfo( vm );
-
-	vm->mins[ 0 ] = m_pCollisionEntity->mins[ 0 ] - 24.0f;
-	vm->mins[ 1 ] = m_pCollisionEntity->mins[ 1 ] - 24.0f;
-	vm->mins[ 2 ] = m_pCollisionEntity->mins[ 2 ];
-	vm->maxs[ 0 ] = m_pCollisionEntity->maxs[ 0 ] + 24.0f;
-	vm->maxs[ 1 ] = m_pCollisionEntity->maxs[ 1 ] + 24.0f;
-	vm->maxs[ 2 ] = m_pCollisionEntity->maxs[ 2 ];
-}
-
-/*
-====================
-Vehicle::GetCEMoveInfo
-====================
-*/
-void Vehicle::GetCEMoveInfo
-	(
-	vmove_t *vm
-	)
-{
-	GetMoveInfo( vm );
-}
-
-/*
-====================
-Vehicle::SetViewAngles
-====================
-*/
-void Vehicle::SetViewAngles
-	(
-	Vector newViewangles
-	)
-{
-	client->ps.delta_angles[ 0 ] = ANGLE2SHORT( newViewangles.x );
-	client->ps.delta_angles[ 1 ] = ANGLE2SHORT( newViewangles.y );
-	client->ps.delta_angles[ 2 ] = ANGLE2SHORT( newViewangles.z );
-
-	AnglesToAxis( newViewangles, orientation );
-
-	yaw_forward = orientation[ 0 ];
-	yaw_left = orientation[ 1 ];
-}
-
-/*
-====================
-Vehicle::EventSetMass
-====================
-*/
-void Vehicle::SetMass
-	(
-	Event *ev
-	)
-	
-{
-	m_fMass = ev->GetFloat( 1 );
-	m_fFrontMass = m_fMass * 0.5;
-	m_fBackMass = m_fMass * 0.5;
-}
-
-void Vehicle::SetFrontMass
-	(
-	Event *ev
-	)
-	
-{
-	m_fFrontMass = ev->GetFloat( 1 );
-	m_fMass = m_fFrontMass + m_fBackMass;
-}
-
-/*
-====================
-Vehicle::EventSetBackMass
-====================
-*/
-void Vehicle::SetBackMass
-	(
-	Event *ev
-	)
-	
-{
-	m_fBackMass = ev->GetFloat( 1 );
-	m_fMass = m_fFrontMass + m_fBackMass;
-}
-
-/*
-====================
-Vehicle::EventSetTread
-====================
-*/
-void Vehicle::SetTread
-	(
-	Event *ev
-	)
-	
-{
-	m_fTread = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetTireRadius
-====================
-*/
-void Vehicle::SetTireRadius
-	(
-	Event *ev
-	)
-	
-{
-	m_fTireRadius = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetRollingResistance
-====================
-*/
-void Vehicle::SetRollingResistance
-	(
-	Event *ev
-	)
-	
-{
-	m_fRollingResistance = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetDrag
-====================
-*/
-void Vehicle::SetDrag
-	(
-	Event *ev
-	)
-	
-{
-	m_fDrag = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::TorqueLookup
-====================
-*/
-float Vehicle::TorqueLookup
-	(
-	int rpm
-	)
-{
-	if( rpm > 4999 )
-	{
-		if( rpm > 5999 )
-		{
-			return 0.0;
-		}
-		else
-		{
-			return ( float )( 190 * ( 6000 - rpm ) ) * 0.001;
-		}
-	}
-	else
-	{
-		return 190.0;
-	}
-}
-
-/*
-====================
-Vehicle::UpdateVariables
-====================
-*/
-void Vehicle::UpdateVariables
-	(
-	Vector *acceleration,
-	Vector *vpn,
-	Vector *vup,
-	Vector *vright,
-	Vector *t_vpn,
-	Vector *t_vup,
-	Vector *t_vright
-	)
-{
-
-}
-
-/*
-====================
-Vehicle::EventModelInit
-====================
-*/
-void Vehicle::ModelInit
-	(
-	Event *ev
-	)
-	
-{
-	SetControllerTag( 0, gi.Tag_NumForName( edict->tiki, "tire_rotate_front_left" ) );
-	SetControllerTag( 1, gi.Tag_NumForName( edict->tiki, "tire_rotate_front_right" ) );
-	SetControllerTag( 2, gi.Tag_NumForName( edict->tiki, "steeringwheel_center" ) );
-}
-
-/*
-====================
-Vehicle::EventBouncyCoef
-====================
-*/
-void Vehicle::BouncyCoef
-	(
-	Event *ev
-	)
-	
-{
-	m_fBouncyCoef = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::EventSpringyCoef
-====================
-*/
-void Vehicle::SpringyCoef
-	(
-	Event *ev
-	)
-	
-{
-	m_fSpringyCoef = ev->GetFloat( 1 );
-}
-
-/*
-====================
-Vehicle::EventYawMinMax
-====================
-*/
-void Vehicle::YawMinMax
-	(
-	Event *ev
-	)
-	
-{
-	if( ev->NumArgs() != 3 )
-	{
-		ScriptError( "No Parameter for YawMinMax" );
-	}
-
-	m_fYawMin = ev->GetFloat( 1 );
-	m_fYawMax = ev->GetFloat( 2 );
-	m_fYawCoef = ev->GetFloat( 3 );
-
-	if( m_fYawMin > m_fYawMax )
-	{
-		ScriptError( "Mismatched mins and maxs for YawMinMax" );
-	}
-}
-
-/*
-====================
-Vehicle::EventRollMinMax
-====================
-*/
-void Vehicle::RollMinMax
-	(
-	Event *ev
-	)
-	
-{
-	if( ev->NumArgs() != 3 )
-	{
-		ScriptError( "No Parameter for RollMinMax" );
-	}
-
-	m_fRollMin = ev->GetFloat( 1 );
-	m_fRollMax = ev->GetFloat( 2 );
-	m_fRollCoef = ev->GetFloat( 3 );
-
-	if( m_fRollMin > m_fRollMax )
-	{
-		ScriptError( "Mismatched mins and maxs for RollMinMax" );
-	}
-}
-
-/*
-====================
-Vehicle::EventZMinMax
-====================
-*/
-void Vehicle::ZMinMax
-	(
-	Event *ev
-	)
-	
-{
-	if( ev->NumArgs() != 3 )
-	{
-		ScriptError( "No Parameter for ZMinMax" );
-	}
-
-	m_fZMin = ev->GetFloat( 1 );
-	m_fZMax = ev->GetFloat( 2 );
-	m_fZCoef = ev->GetFloat( 3 );
-
-	if( m_fZMin > m_fZMax )
-	{
-		ScriptError( "Mismatched mins and maxs for ZMinMax" );
-	}
-}
-
-/*
-====================
-Vehicle::EventSetAnimationSet
-====================
-*/
-void Vehicle::SetAnimationSet
-	(
-	Event *ev
-	)
-	
-{
-	m_sAnimationSet = ev->GetString( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetSoundSet
-====================
-*/
-void Vehicle::SetSoundSet
-	(
-	Event *ev
-	)
-	
-{
-	m_sSoundSet = ev->GetString( 1 );
-}
-
-/*
-====================
-Vehicle::EventSpawnTurret
-====================
-*/
-void Vehicle::SpawnTurret
-	(
-	Event *ev
-	)
-	
-{
-	VehicleTurretGun *pTurret;
-	int slot;
-
-	pTurret = new VehicleTurretGun;
-	pTurret->SetBaseOrientation( orientation, NULL );
-	pTurret->setModel( ev->GetString( 2 ) );
-
-	slot = ev->GetInteger( 1 );
-	AttachTurretSlot( slot, pTurret, vec_zero, NULL );
-
-	pTurret->SetVehicleOwner( this );
-	Event *event = new Event( EV_TakeDamage );
-	pTurret->PostEvent( event, EV_POSTSPAWN );
-	UpdateTurretSlot( slot );
-
-	pTurret->ProcessPendingEvents();
-}
-
-/*
-====================
-Vehicle::EventLockMovement
-====================
-*/
-void Vehicle::EventLockMovement
-	(
-	Event *ev
-	)
-	
-{
-	m_bMovementLocked = true;
-}
-
-/*
-====================
-Vehicle::EventUnlockMovement
-====================
-*/
-void Vehicle::EventUnlockMovement
-	(
-	Event *ev
-	)
-	
-{
-	m_bMovementLocked = false;
-}
-
-/*
-====================
-Vehicle::EventQueryFreePassengerSlot
-====================
-*/
-void Vehicle::QueryFreePassengerSlot
-	(
-	Event *ev
-	)
-	
-{
-	ev->AddInteger( QueryFreePassengerSlot() );
-}
-
-/*
-====================
-Vehicle::EventQueryFreeDriverSlot
-====================
-*/
-void Vehicle::QueryFreeDriverSlot
-	(
-	Event *ev
-	)
-	
-{
-	ev->AddInteger( QueryFreeDriverSlot() );
-}
-
-/*
-====================
-Vehicle::EventQueryFreeTurretSlot
-====================
-*/
-void Vehicle::QueryFreeTurretSlot
-	(
-	Event *ev
-	)
-	
-{
-	ev->AddInteger( QueryFreeTurretSlot() );
-}
-
-/*
-====================
-Vehicle::EventQueryPassengerSlotPosition
-====================
-*/
-void Vehicle::QueryPassengerSlotPosition
-	(
-	Event *ev
-	)
-	
-{
-	Vector vPos;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryPassengerSlotPosition( iSlot, vPos );
-	ev->AddVector( vPos );
-}
-
-/*
-====================
-Vehicle::EventQueryDriverSlotPosition
-====================
-*/
-void Vehicle::QueryDriverSlotPosition
-	(
-	Event *ev
-	)
-	
-{
-	Vector vPos;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryDriverSlotPosition( iSlot, vPos );
-	ev->AddVector( vPos );
-}
-
-/*
-====================
-Vehicle::EventQueryTurretSlotPosition
-====================
-*/
-void Vehicle::QueryTurretSlotPosition
-	(
-	Event *ev
-	)
-	
-{
-	Vector vPos;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryTurretSlotPosition( iSlot, vPos );
-	ev->AddVector( vPos );
-}
-
-/*
-====================
-Vehicle::EventQueryPassengerSlotAngles
-====================
-*/
-void Vehicle::QueryPassengerSlotAngles
-	(
-	Event *ev
-	)
-	
-{
-	Vector vAngles;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryPassengerSlotAngles( iSlot, vAngles );
-	ev->AddVector( vAngles );
-}
-
-/*
-====================
-Vehicle::EventQueryDriverSlotAngles
-====================
-*/
-void Vehicle::QueryDriverSlotAngles
-	(
-	Event *ev
-	)
-	
-{
-	Vector vAngles;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryDriverSlotAngles( iSlot, vAngles );
-	ev->AddVector( vAngles );
-}
-
-/*
-====================
-Vehicle::EventQueryTurretSlotAngles
-====================
-*/
-void Vehicle::QueryTurretSlotAngles
-	(
-	Event *ev
-	)
-	
-{
-	Vector vAngles;
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	QueryTurretSlotAngles( iSlot, vAngles );
-	ev->AddVector( vAngles );
-}
-
-/*
-====================
-Vehicle::EventQueryPassengerSlotStatus
-====================
-*/
-void Vehicle::QueryPassengerSlotStatus
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddInteger( QueryPassengerSlotStatus( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventQueryDriverSlotStatus
-====================
-*/
-void Vehicle::QueryDriverSlotStatus
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddInteger( QueryDriverSlotStatus( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventQueryTurretSlotStatus
-====================
-*/
-void Vehicle::QueryTurretSlotStatus
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddInteger( QueryTurretSlotStatus( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventQueryPassengerSlotEntity
-====================
-*/
-void Vehicle::QueryPassengerSlotEntity
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddEntity( QueryPassengerSlotEntity( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventQueryDriverSlotEntity
-====================
-*/
-void Vehicle::QueryDriverSlotEntity
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddEntity( QueryDriverSlotEntity( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventQueryTurretSlotEntity
-====================
-*/
-void Vehicle::QueryTurretSlotEntity
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	ev->AddEntity( QueryTurretSlotEntity( iSlot ) );
-}
-
-/*
-====================
-Vehicle::EventAttachPassengerSlot
-====================
-*/
-void Vehicle::AttachPassengerSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	AttachPassengerSlot( iSlot, ev->GetEntity( 2 ), vec_zero );
-	UpdatePassengerSlot( iSlot );
-}
-
-/*
-====================
-Vehicle::EventAttachDriverSlot
-====================
-*/
-void Vehicle::AttachDriverSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	AttachDriverSlot( 0, ev->GetEntity( 2 ), vec_zero );
-	UpdateDriverSlot( 0 );
-}
-
-/*
-====================
-Vehicle::EventAttachTurretSlot
-====================
-*/
-void Vehicle::AttachTurretSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	AttachTurretSlot( iSlot, ev->GetEntity( 2 ), vec_zero, NULL );
-	UpdateTurretSlot( iSlot );
-}
-
-/*
-====================
-Vehicle::EventDetachPassengerSlot
-====================
-*/
-void Vehicle::DetachPassengerSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-	Vector vExitPosition;
-	Vector vExitAngles;
-	bool bHasExitAngles = false;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_PASSENGERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	if( ev->NumArgs() == 2 )
-	{
-		if( ev->IsVectorAt( 2 ) )
-		{
-			vExitPosition = ev->GetVector( 2 );
-		}
-		else if( ev->IsEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetEntity( 2 )->origin;
-			bHasExitAngles = true;
-		}
-		else if( ev->IsSimpleEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetSimpleEntity( 2 )->origin;
-		}
-
-		DetachPassengerSlot( iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL );
-	}
-	else
-	{
-		DetachPassengerSlot( iSlot, vec_zero, NULL );
-	}
-}
-
-/*
-====================
-Vehicle::EventDetachDriverSlot
-====================
-*/
-void Vehicle::DetachDriverSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-	Vector vExitPosition;
-	Vector vExitAngles;
-	bool bHasExitAngles = false;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_DRIVERS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	if( ev->NumArgs() == 2 )
-	{
-		if( ev->IsVectorAt( 2 ) )
-		{
-			vExitPosition = ev->GetVector( 2 );
-		}
-		else if( ev->IsEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetEntity( 2 )->origin;
-			bHasExitAngles = true;
-		}
-		else if( ev->IsSimpleEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetSimpleEntity( 2 )->origin;
-		}
-
-		DetachDriverSlot( iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL );
-	}
-	else
-	{
-		DetachDriverSlot( iSlot, vec_zero, NULL );
-	}
-}
-
-/*
-====================
-Vehicle::EventDetachTurretSlot
-====================
-*/
-void Vehicle::DetachTurretSlot
-	(
-	Event *ev
-	)
-	
-{
-	int iSlot;
-	Vector vExitPosition;
-	Vector vExitAngles;
-	bool bHasExitAngles = false;
-
-	iSlot = ev->GetInteger( 1 );
-	if( iSlot >= MAX_TURRETS )
-	{
-		ScriptError( "Slot Specified is greater than maximum allowed for that parameter\n" );
-	}
-
-	if( ev->NumArgs() == 2 )
-	{
-		if( ev->IsVectorAt( 2 ) )
-		{
-			vExitPosition = ev->GetVector( 2 );
-		}
-		else if( ev->IsEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetEntity( 2 )->origin;
-			bHasExitAngles = true;
-		}
-		else if( ev->IsSimpleEntityAt( 2 ) )
-		{
-			vExitPosition = ev->GetSimpleEntity( 2 )->origin;
-		}
-
-		DetachTurretSlot( iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL );
-	}
-	else
-	{
-		DetachTurretSlot( iSlot, vec_zero, NULL );
-	}
-}
-
-/*
-====================
-Vehicle::SetWheelCorners
-====================
-*/
-void Vehicle::SetWheelCorners
-	(
-	Event *ev
-	)
-	
-{
-	Vector size;
-
-	size = ev->GetVector( 1 );
-	m_vOriginCornerOffset = ev->GetVector( 2 );
-
-	maxtracedist = size[ 2 ];
-
-	Corners[ 0 ][ 0 ] = -( size[ 0 ] * 0.5 );
-	Corners[ 0 ][ 1 ] = ( size[ 1 ] * 0.5 );
-	Corners[ 0 ][ 2 ] = size[ 2 ];
-
-	Corners[ 1 ][ 0 ] = ( size[ 0 ] * 0.5 );
-	Corners[ 1 ][ 1 ] = ( size[ 1 ] * 0.5 );
-	Corners[ 1 ][ 2 ] = size[ 2 ];
-
-	Corners[ 2 ][ 0 ] = -( size[ 0 ] * 0.5 );
-	Corners[ 2 ][ 1 ] = -( size[ 1 ] * 0.5 );
-	Corners[ 2 ][ 2 ] = size[ 2 ];
-
-	Corners[ 3 ][ 0 ] = ( size[ 0 ] * 0.5 );
-	Corners[ 3 ][ 1 ] = -( size[ 1 ] * 0.5 );
-	Corners[ 3 ][ 2 ] = size[ 2 ];
-
-	SetupVehicleSoundEntities();
-}
-
-/*
-====================
-Vehicle::EventDriveInternal
-====================
-*/
-void Vehicle::EventDriveInternal
-	(
-	Event *ev,
-	bool wait
-	)
-{
-	SimpleEntity *path;
-	SimpleEntity *alternate_path = NULL;
-
-	m_fIdealDistance = 100.0f;
-	m_fLookAhead = 256.0f;
-	m_fIdealAccel = 35.0f;
-	m_fIdealSpeed = 250.0f;
-
-	switch( ev->NumArgs() )
-	{
-	case 6:
-		alternate_path = ev->GetSimpleEntity( 6 );
-	case 5:
-		m_fLookAhead = ev->GetFloat( 5 );
-	case 4:
-		m_fIdealDistance = ev->GetFloat( 4 );
-	case 3:
-		m_fIdealAccel = ev->GetFloat( 3 );
-	case 2:
-		m_fIdealSpeed = ev->GetFloat( 2 );
-		break;
-	case 1:
-		break;
-	default:
-		ScriptError( "wrong number of arguments" );
-	}
-
-	path = ev->GetSimpleEntity( 1 );
-
-	if( path )
-	{
-		ScriptError( "Vehicle Given Drive Command with NULL path." );
-	}
-
-	if( !m_pCurPath )
-	{
-		m_pCurPath = new cSpline < 4, 512 > ;
-	}
-
-	if( !m_pAlternatePath )
-	{
-		m_pAlternatePath = new cSpline < 4, 512 > ;
-	}
-
-	SetupPath( m_pCurPath, path );
-
-	// Setup the alternate path
-	if( alternate_path )
-	{
-		SetupPath( m_pAlternatePath, alternate_path );
-	}
-
-	m_bAutoPilot = true;
-	m_iCurNode = 0;
-	m_iAlternateNode = 0;
-
-	Sound( m_sSoundSet + "snd_start" );
-}
-
-/*
-====================
-Vehicle::EventDrive
-====================
-*/
-void Vehicle::EventDrive
-	(
-	Event *ev
-	)
-	
-{
-	EventDriveInternal( ev, true );
-}
-
-/*
-====================
-Vehicle::EventDriveNoWait
-====================
-*/
-void Vehicle::EventDriveNoWait
-	(
-	Event *ev
-	)
-	
-{
-	EventDriveInternal( ev, false );
-}
-
-/*
-====================
-Vehicle::EventStop
-====================
-*/
-void Vehicle::EventStop
-	(
-	Event *ev
-	)
-	
-{
-	m_bStopEnabled = false;
-	m_bAutoPilot = false;
-	m_bIsSkidding = false;
-	moveimpulse = 0;
-	turnimpulse = 0;
-	m_iCurNode = 0;
-	Unregister( STRING_DRIVE );
-}
-
-/*
-====================
-Vehicle::EventFullStop
-====================
-*/
-void Vehicle::EventFullStop
-	(
-	Event *ev
-	)
-	
-{
-	m_bStopEnabled = 0;
-	m_bIsSkidding = 0;
-	m_bAutoPilot = 0;
-	moveimpulse = 0;
-	turnimpulse = 0;
-	velocity = vec_zero;
-	m_iCurNode = 0;
-	Unregister( STRING_DRIVE );
-}
-
-/*
-====================
-Vehicle::EventModifyDrive
-====================
-*/
-void Vehicle::EventModifyDrive
-	(
-	Event *ev
-	)
-	
-{
-	if( !level.Spawned() )
-	{
-		ScriptError(  "ModifyDrive used improperly... (used before the level is spawned)" );
-	}
-
-	if( !m_bAutoPilot || !this->m_pCurPath )
-	{
-		ScriptError( "ModifyDrive used when not driving!" );
-	}
-
-	if( ev->NumArgs() < 1 || ev->NumArgs() > 3 )
-	{
-		ScriptError( "wrong number of arguments" );
-	}
-
-	m_fIdealSpeed = ev->GetFloat( 1 );
-
-	if( ev->NumArgs() >= 2 )
-	{
-		m_fIdealAccel = ev->GetFloat( 2 );
-	}
-
-	if( ev->NumArgs() >= 3 )
-	{
-		m_fLookAhead = ev->GetFloat( 3 );
-	}
-}
-
-/*
-====================
-Vehicle::EventNextDrive
-====================
-*/
-void Vehicle::EventNextDrive
-	(
-	Event *ev
-	)
-	
-{
-	SimpleEntity *path;
-	float *i_fTmp;
-	float o_fTmp[ 4 ];
-	Vector org1;
-	Vector org2;
-
-	path = ev->GetSimpleEntity( 1 );
-
-	if( !m_bAutoPilot )
-	{
-		ScriptError( "Cannot Set Next Path because Not Currently Driving a Path." );
-	}
-
-	if( !m_pCurPath || m_pCurPath->m_iPoints == 0 )
-	{
-		ScriptError( "Cannot Set Next Path because Current Path is Empty." );
-	}
-
-	if( !m_pNextPath )
-	{
-		m_pNextPath = new cSpline < 4, 512 > ;
-	}
-
-	SetupPath( m_pNextPath, path );
-
-	i_fTmp = m_pCurPath->GetByNode( m_pCurPath->m_iPoints, NULL );
-	org1 = ( i_fTmp + 1 );
-	i_fTmp = m_pNextPath->GetByNode( 0.0f, NULL );
-	org2 = ( i_fTmp + 1 );
-
-	o_fTmp[ 0 ] = ( org2 - org1 ).length();
-	VectorClear( o_fTmp + 1 );
-
-	m_pNextPath->UniformAdd( o_fTmp );
-	m_iNextPathStartNode = m_pCurPath->Append( m_pNextPath );
-}
-
-/*
-====================
-Vehicle::EventModel
-====================
-*/
-void Vehicle::EventModel
-	(
-	Event *ev
-	)
-	
-{
-	SetModelEvent( ev );
-}
-
-/*
-====================
-Vehicle::EventRemoveOnDeath
-====================
-*/
-void Vehicle::EventRemoveOnDeath
-	(
-	Event *ev
-	)
-	
-{
-	m_bRemoveOnDeath = ev->GetBoolean( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetExplosionModel
-====================
-*/
-void Vehicle::EventSetExplosionModel
-	(
-	Event *ev
-	)
-	
-{
-	m_sExplosionModel = ev->GetString( 1 );
-}
-
-/*
-====================
-Vehicle::EventSetCollisionModel
-====================
-*/
-void Vehicle::EventSetCollisionModel
-	(
-	Event *ev
-	)
-	
-{
-	Entity *pColEnt = ev->GetEntity( 1 );
-
-	if( !pColEnt )
-	{
-		ScriptError( "Trying to set a collision model with a NULL entity." );
-	}
-
-	if( m_pCollisionEntity )
-	{
-		m_pCollisionEntity->PostEvent( EV_Remove, EV_VEHICLE );
-	}
-
-	m_pCollisionEntity = new VehicleCollisionEntity( this );
-	m_pCollisionEntity->setModel( pColEnt->model );
-
-	if( !m_pCollisionEntity->model.length() || *m_pCollisionEntity->model != '*' )
-	{
-		// Re-post the event with the correct time
-		m_pCollisionEntity->CancelEventsOfType( EV_Remove );
-		m_pCollisionEntity->PostEvent( EV_Remove, EV_VEHICLE );
-		m_pCollisionEntity = NULL;
-
-		ScriptError( "Model for Entity not of a valid type. Must be B-Model." );
-	}
-
-	m_pCollisionEntity->setOrigin( origin );
-	m_pCollisionEntity->setAngles( angles );
-}
-
-/*
-====================
-Vehicle::EventGetCollisionModel
-====================
-*/
-void Vehicle::EventGetCollisionModel
-	(
-	Event *ev
-	)
-	
-{
-	ev->AddEntity( m_pCollisionEntity );
-}
-
-/*
-====================
-Vehicle::EventSetSoundParameters
-====================
-*/
-void Vehicle::EventSetSoundParameters
-	(
-	Event *ev
-	)
-	
-{
-	m_fSoundMinSpeed = ev->GetFloat( 1 );
-	m_fSoundMinPitch = ev->GetFloat( 2 );
-	m_fSoundMaxSpeed = ev->GetFloat( 3 );
-	m_fSoundMaxPitch = ev->GetFloat( 4 );
-}
-
-/*
-====================
-Vehicle::EventSetVolumeParameters
-====================
-*/
-void Vehicle::EventSetVolumeParameters
-	(
-	Event *ev
-	)
-	
-{
-	m_fVolumeMinSpeed = ev->GetFloat( 1 );
-	m_fVolumeMinPitch = ev->GetFloat( 2 );
-	m_fVolumeMaxSpeed = ev->GetFloat( 3 );
-	m_fVolumeMaxPitch = ev->GetFloat( 4 );
-}
-
-/*
-====================
-Vehicle::EventDamage
-====================
-*/
-void Vehicle::EventDamage
-	(
-	Event *ev
-	)
-	
-{
-	Vector vDirection;
-	float fForce;
-	int i;
-
-	if( !IsDamagedBy( ev->GetEntity( 3 ) ) )
-	{
-		return;
-	}
-
-	Event *event = new Event( EV_Damage );
-
-	vDirection = ev->GetVector( 5 );
-	fForce = ev->GetFloat( 7 );
-	VectorNormalizeFast( vDirection );
-
-	m_fForwardForce += DotProduct( orientation[ 1 ], vDirection ) * fForce;
-	m_fLeftForce += DotProduct( orientation[ 0 ], vDirection ) * fForce;
-
-	for( i = 1; i <= ev->NumArgs(); i++ )
-	{
-		if( i == 7 )
-		{
-			event->AddFloat( 0 );
-		}
-		else
-		{
-			event->AddValue( ev->GetValue( i ) );
-		}
-	}
-
-	if( driver.ent )
-	{
-		if( driver.ent->IsSubclassOfPlayer() )
-		{
-			Player *player = ( Player * )driver.ent.Pointer();
-			Vector dir = ev->GetVector( 5 );
-
-			if( player->camera )
-			{
-				player->damage_yaw = AngleSubtract( player->camera->angles[ 1 ], dir.toYaw() ) + 180.5f;
-			}
-			else
-			{
-				player->damage_yaw = AngleSubtract( player->GetVAngles()[ 1 ], dir.toYaw() ) + 180.5f;
-			}
-		}
-	}
-
-	DamageEvent( event );
-	delete event;
-}
-
-/*
-====================
-Vehicle::EventStopAtEnd
-====================
-*/
-void Vehicle::EventStopAtEnd
-	(
-	Event *ev
-	)
-	
-{
-	if( !m_pCurPath )
-	{
-		ScriptError( "Tried to Stop at end of path on a vehicle who is not driving a path!" );
-	}
-
-	m_fStopStartDistance = GetPathPosition( m_pCurPath, m_iCurNode );
-	m_fStopStartSpeed = moveimpulse;
-	m_fStopEndDistance = *m_pCurPath->GetByNode( m_pCurPath->m_vPoints[ 0 ][ 0 ], NULL );
-	m_bStopEnabled = 1;
-}
-
-/*
-====================
-Vehicle::EventSkidding
-====================
-*/
-void Vehicle::EventSkidding
-	(
-	Event *ev
-	)
-	
-{
-	if( ev->NumArgs() == 1 )
-	{
-		m_bEnableSkidding = ev->GetInteger( 1 );
-	}
-	else
-	{
-		m_bEnableSkidding = true;
-	}
-
-	ProcessEvent( EV_Vehicle_ContinueSkidding );
-}
-
-/*
-====================
-Vehicle::EventContinueSkidding
-====================
-*/
-void Vehicle::EventContinueSkidding
-	(
-	Event *ev
-	)
-	
-{
-	if( m_bEnableSkidding )
-	{
-		if( HasAnim( "skidding" ) )
-		{
-			NewAnim( "skidding", EV_Vehicle_ContinueSkidding, 7, 0.000001f );
-			return;
-		}
-		else
-		{
-			assert( !"Vehicle without skidding animation." );
-		}
-	}
-	else
-	{
-		if( HasAnim( "idle" ) )
-		{
-			NewAnim( "idle", 0, 7, 0.000001f );
-			return;
-		}
-		else
-		{
-			assert( !"Vehicle without idle animation." );
-		}
-	}
-}
-
-/*
-====================
-Vehicle::EventVehicleAnim
-====================
-*/
-void Vehicle::EventVehicleAnim
-	(
-	Event *ev
-	)
-	
-{
-	float weight;
-
-	if( ev->NumArgs() > 1 )
-	{
-		weight = ev->GetFloat( 2 );
-	}
-	else
-	{
-		weight = 1.0f;
-	}
-
-	NewAnim( ev->GetString( 1 ), EV_Vehicle_VehicleAnimDone, 8, weight );
-}
-
-/*
-====================
-Vehicle::EventVehicleAnimDone
-====================
-*/
-void Vehicle::EventVehicleAnimDone
-	(
-	Event *ev
-	)
-	
-{
-	Unregister( STRING_VEHICLEANIMDONE );
-}
-
-/*
-====================
-Vehicle::TouchStuff
-====================
-*/
-void Vehicle::TouchStuff
-	(
-	vmove_t *vm
-	)
-{
-	int i, j;
-	gentity_t *other;
-	Event		*event;
-
-	if (driver.ent)
-		G_TouchTriggers(driver.ent);
-
-	for (int i = 0; i < MAX_PASSENGERS; i++)
-	{
-		if (Passengers[i].ent)
-		{
-			G_TouchTriggers(Passengers[i].ent);
-		}
-	}
-
-	for (int i = 0; i < MAX_TURRETS; i++)
-	{
-		if (Turrets[i].ent)
-		{
-			G_TouchTriggers(Turrets[i].ent);
-		}
-	}
-
-	if (getMoveType() != MOVETYPE_NOCLIP)
-	{
-		G_TouchTriggers(this);
-	}
-
-	for (i = 0; i < vm->numtouch; i++)
-	{
-		other = &g_entities[vm->touchents[i]];
-
-		for (j = 0; j < i; j++)
-		{
-			gentity_t *ge = &g_entities[j];
-
-			if (ge == other)
-				break;
-		}
-
-		if (j != i)
-		{
-			// duplicated
-			continue;
-		}
-
-		// Don't bother touching the world
-		if ((!other->entity) || (other->entity == world))
-		{
-			continue;
-		}
-
-		event = new Event(EV_Touch);
-		event->AddEntity(this);
-		other->entity->ProcessEvent(event);
-
-		event = new Event(EV_Touch);
-		event->AddEntity(other->entity);
-		ProcessEvent(event);
-	}
+    entflags &= ~ECF_VEHICLE;
 }
 
 /*
@@ -3725,36 +1210,30 @@ void Vehicle::TouchStuff
 Vehicle::ResetSlots
 ====================
 */
-void Vehicle::ResetSlots
-	(
-	void
-	)
-	
+void Vehicle::ResetSlots(void)
 {
-	driver.ent = NULL;
-	driver.boneindex = -1;
-	driver.enter_boneindex = -1;
-	driver.flags = SLOT_UNUSED;
-	lastdriver.ent = NULL;
-	lastdriver.boneindex = -1;
-	lastdriver.enter_boneindex = -1;
-	lastdriver.flags = SLOT_UNUSED;
+    driver.ent                 = NULL;
+    driver.boneindex           = -1;
+    driver.enter_boneindex     = -1;
+    driver.flags               = 0;
+    lastdriver.ent             = NULL;
+    lastdriver.boneindex       = -1;
+    lastdriver.enter_boneindex = -1;
+    lastdriver.flags           = SLOT_UNUSED;
 
-	for( int i = 0; i < MAX_PASSENGERS; i++ )
-	{
-		Passengers[ i ].ent = NULL;
-		Passengers[ i ].boneindex = -1;
-		Passengers[ i ].enter_boneindex = -1;
-		Passengers[ i ].flags = SLOT_UNUSED;
-	}
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        Passengers[i].ent             = NULL;
+        Passengers[i].boneindex       = -1;
+        Passengers[i].enter_boneindex = -1;
+        Passengers[i].flags           = SLOT_UNUSED;
+    }
 
-	for( int i = 0; i < MAX_TURRETS; i++ )
-	{
-		Turrets[ i ].ent = NULL;
-		Turrets[ i ].boneindex = -1;
-		Turrets[ i ].enter_boneindex = -1;
-		Turrets[ i ].flags = SLOT_UNUSED;
-	}
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        Turrets[i].ent             = NULL;
+        Turrets[i].boneindex       = -1;
+        Turrets[i].enter_boneindex = -1;
+        Turrets[i].flags           = SLOT_UNUSED;
+    }
 }
 
 /*
@@ -3762,1807 +1241,179 @@ void Vehicle::ResetSlots
 Vehicle::OpenSlotsByModel
 ====================
 */
-void Vehicle::OpenSlotsByModel
-	(
-	void
-	)
-	
+void Vehicle::OpenSlotsByModel(void)
 {
-	str bonename;
-	int bonenum;
-	int boneindex;
+    str bonename;
+    int bonenum;
+    int boneindex;
 
-	driver.boneindex = gi.Tag_NumForName( edict->tiki, "driver" );
-	driver.enter_boneindex = gi.Tag_NumForName( edict->tiki, "driver_enter" );
+    driver.boneindex       = gi.Tag_NumForName(edict->tiki, "driver");
+    driver.enter_boneindex = gi.Tag_NumForName(edict->tiki, "driver_enter");
 
-	if( driver.flags & SLOT_UNUSED )
-	{
-		driver.ent = NULL;
-		driver.flags = SLOT_FREE;
-	}
+    if (driver.flags & SLOT_UNUSED) {
+        driver.ent   = NULL;
+        driver.flags = SLOT_FREE;
+    }
 
-	numPassengers = 0;
+    numPassengers = 0;
 
-	for( bonenum = 0; bonenum < MAX_PASSENGERS; bonenum++ )
-	{
-		str bonenumstr = bonenum;
-		bonename = "passenger" + bonenumstr;
-		boneindex = gi.Tag_NumForName( edict->tiki, bonename.c_str() );
+    for (bonenum = 0; bonenum < MAX_PASSENGERS; bonenum++) {
+        str bonenumstr = bonenum;
+        bonename       = "passenger" + bonenumstr;
+        boneindex      = gi.Tag_NumForName(edict->tiki, bonename.c_str());
 
-		if( boneindex >= 0 )
-		{
-			numPassengers++;
+        if (boneindex >= 0) {
+            numPassengers++;
 
-			Passengers[ bonenum ].boneindex = boneindex;
-			Passengers[ bonenum ].enter_boneindex = gi.Tag_NumForName( edict->tiki, "passenger_enter" + bonenumstr);
+            Passengers[bonenum].boneindex       = boneindex;
+            Passengers[bonenum].enter_boneindex = gi.Tag_NumForName(edict->tiki, "passenger_enter" + bonenumstr);
 
-			if( Passengers[ bonenum ].flags & SLOT_UNUSED )
-			{
-				Passengers[ bonenum ].ent = NULL;
-				Passengers[ bonenum ].flags = SLOT_FREE;
-			}
-		}
-	}
+            if (Passengers[bonenum].flags & SLOT_UNUSED) {
+                Passengers[bonenum].ent   = NULL;
+                Passengers[bonenum].flags = SLOT_FREE;
+            }
+        }
+    }
 
-	numTurrets = 0;
+    numTurrets = 0;
 
-	for( bonenum = 0; bonenum < MAX_TURRETS; bonenum++ )
-	{
-		str bonenumstr = bonenum;
-		bonename = "turret" + bonenumstr;
-		boneindex = gi.Tag_NumForName( edict->tiki, bonename.c_str() );
+    for (bonenum = 0; bonenum < MAX_TURRETS; bonenum++) {
+        str bonenumstr = bonenum;
+        bonename       = "turret" + bonenumstr;
+        boneindex      = gi.Tag_NumForName(edict->tiki, bonename.c_str());
 
-		if( boneindex >= 0 )
-		{
-			numTurrets++;
+        if (boneindex >= 0) {
+            numTurrets++;
 
-			Turrets[ bonenum ].boneindex = boneindex;
-			Turrets[ bonenum ].enter_boneindex = gi.Tag_NumForName( edict->tiki, "turret_enter" + bonenumstr);
+            Turrets[bonenum].boneindex       = boneindex;
+            Turrets[bonenum].enter_boneindex = gi.Tag_NumForName(edict->tiki, "turret_enter" + bonenumstr);
 
-			if( Turrets[ bonenum ].flags & SLOT_UNUSED )
-			{
-				Turrets[ bonenum ].ent = NULL;
-				Turrets[ bonenum ].flags = SLOT_FREE;
-			}
-		}
-	}
+            if (Turrets[bonenum].flags & SLOT_UNUSED) {
+                Turrets[bonenum].ent   = NULL;
+                Turrets[bonenum].flags = SLOT_FREE;
+            }
+        }
+    }
 }
 
 /*
 ====================
-Vehicle::MoveVehicle
+Vehicle::EventModelInit
 ====================
 */
-void Vehicle::MoveVehicle
-	(
-	void
-	)
-	
+void Vehicle::ModelInit(Event *ev)
 {
-	trace_t tr;
-	Vector vecStart;
-	Vector vecStart2;
-	Vector vecEnd;
-	Vector vecDelta;
-	Vector vecAng;
-	int i;
-	gridpoint_t *gp;
-	vmove_t vm;
-	float flMoveFrac = 1.0f;
-	float fSpeed;
-	bool bDoGravity = true;
-	bool bHitPerson = false;
-	Entity *pSkippedEntities[ MAX_SKIPPED_ENTITIES ];
-	int iContentsEntities[ MAX_SKIPPED_ENTITIES ];
-	solid_t solidEntities[ MAX_SKIPPED_ENTITIES ];
-	int iNumSkippedEntities = 0;
-	Event* event = nullptr;
-
-	if( m_bMovementLocked )
-	{
-		return;
-	}
-
-	setAngles();
-	if( m_pCollisionEntity )
-	{
-		SetCEMoveInfo( &vm );
-	}
-	else
-	{
-		SetMoveInfo( &vm );
-	}
-	m_sMoveGrid->SetMoveInfo( &vm );
-	m_sMoveGrid->SetOrientation( orientation );
-	m_sMoveGrid->CalculateBoxPoints();
-	CheckGround();
-
-	VmoveSingle( &vm );
-
-	setOrigin( vm.vs->origin );
-
-	if( velocity.length() > 0.5f )
-	{
-		fSpeed = DotProduct( velocity, orientation[ 0 ] );
-		vecDelta = velocity * level.frametime;
-
-		for( i = 0; i < 3; i++ )
-		{
-			if( fSpeed > 0.0f )
-			{
-				gp = m_sMoveGrid->GetGridPoint( 0, i, 0 );
-				vecStart = gp->origin + origin;
-			}
-			else
-			{
-				gp = m_sMoveGrid->GetGridPoint( 2, i, 0 );
-				vecStart = gp->origin + origin;
-			}
-
-			if( real_velocity.length() > 0.5f )
-			{
-				vecStart2 = vecDelta + vecStart;
-
-				for( ;; )
-				{
-					tr = G_Trace( vecStart2, Vector( vm.mins ) - Vector( -32, -32, -32 ), Vector( vm.maxs ) + Vector( 32, 32, 32 ), vecStart2, this, 0x6001382, false, "Vehicle::MoveVehicle" );
-
-					if( !tr.ent || !tr.ent->entity || tr.ent->entity == world )
-					{
-						break;
-					}
-
-					tr.ent->entity->CheckGround();
-
-					if (!tr.ent->entity->groundentity || (tr.ent->entity->groundentity == edict &&
-						(!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity)))
-					{
-						Event *event = new Event( EV_Touch );
-						event->AddEntity( this );
-						tr.ent->entity->ProcessEvent( event );
-
-						event = new Event( EV_Touch );
-						event->AddEntity( tr.ent->entity );
-						ProcessEvent( event );
-
-						if( tr.ent->entity->IsSubclassOfSentient() )
-							bHitPerson = true;
-
-						if( g_showvehiclemovedebug->integer )
-						{
-							Com_Printf( "Vehicle Hit(MV0): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-						}
-
-						break;
-					}
-
-					pSkippedEntities[ iNumSkippedEntities ] = tr.ent->entity;
-					iContentsEntities[ iNumSkippedEntities ] = tr.ent->r.contents;
-					solidEntities[ iNumSkippedEntities ] = tr.ent->solid;
-					iNumSkippedEntities++;
-
-					if( iNumSkippedEntities >= MAX_SKIPPED_ENTITIES )
-					{
-						gi.Error( ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n" );
-						return;
-					}
-
-					tr.ent->entity->setSolidType( SOLID_NOT );
-
-					if( g_showvehiclemovedebug->integer )
-					{
-						Com_Printf( "Vehicle Skipped(MV0): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-					}
-				}
-			}
-
-			if( g_showvehiclemovedebug->integer )
-			{
-				G_DebugBBox( vecStart, vm.mins, vm.maxs, 1.0f, 0.0f, 0.0f, 1.0f );
-				G_DebugBBox( vecStart + Vector( 0, 0, 64.0f ), vm.mins, vm.maxs, 1.0f, 0.0f, 0.0f, 1.0f );
-			}
-
-			vecEnd = vecStart + vecDelta;
-
-			for( ;; )
-			{
-				tr = G_Trace( vecStart, Vector( vm.mins ), Vector( vm.maxs ), vecEnd, this, edict->clipmask, false, "Vehicle::MoveVehicle" );
-
-				if( tr.fraction == 1.0f && !tr.allsolid && !tr.startsolid )
-				{
-					break;
-				}
-
-				if( !tr.ent || !tr.ent->entity || tr.ent->entity == world )
-				{
-					if( g_showvehiclemovedebug->integer )
-					{
-						if( flMoveFrac > tr.fraction )
-						{
-							flMoveFrac = tr.fraction - 0.1f;
-						}
-
-						G_DebugBBox( tr.endpos, vm.mins, vm.maxs, 0.0f, 1.0f, 0.0f, 1.0f );
-					}
-
-					vecStart = tr.endpos;
-					vecEnd = tr.endpos;
-
-					for( ;; )
-					{
-						tr = G_Trace( vecStart, Vector( vm.mins ), Vector( vm.maxs ), vecEnd, this, edict->clipmask, false, "Vehicle::MoveVehicle" );
-
-						if( tr.fraction != 1.0f || tr.plane.normal[ 2 ] < 0.7f || tr.allsolid )
-						{
-							flMoveFrac = 0.0f;
-						}
-
-						if( !tr.ent || !tr.ent->entity || tr.ent->entity == world )
-						{
-							goto _label1;
-							break;
-						}
-
-						tr.ent->entity->CheckGround();
-
-						if( !tr.ent->entity->groundentity )
-						{
-							break;
-						}
-
-						if( tr.ent != edict )
-						{
-							if( !m_pCollisionEntity )
-							{
-								break;
-							}
-
-							if( tr.ent->entity != m_pCollisionEntity )
-							{
-								break;
-							}
-						}
-
-						pSkippedEntities[ iNumSkippedEntities ] = tr.ent->entity;
-						iContentsEntities[ iNumSkippedEntities ] = tr.ent->r.contents;
-						solidEntities[ iNumSkippedEntities ] = tr.ent->solid;
-						iNumSkippedEntities++;
-
-						if( iNumSkippedEntities >= MAX_SKIPPED_ENTITIES )
-						{
-							gi.Error( ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n" );
-							return;
-						}
-
-						tr.ent->entity->setSolidType( SOLID_NOT );
-						if( g_showvehiclemovedebug->integer )
-						{
-							Com_Printf( "Vehicle Skipped(MV2): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-						}
-					}
-
-					event = new Event( EV_Touch );
-					event->AddEntity( this );
-					tr.ent->entity->ProcessEvent( event );
-
-					event = new Event( EV_Touch );
-					event->AddEntity( tr.ent->entity );
-					ProcessEvent( event );
-
-					if( tr.ent->entity->IsSubclassOfPlayer() )
-					{
-						bHitPerson = true;
-					}
-					
-_label1:
-					if( g_showvehiclemovedebug->integer )
-					{
-						Com_Printf( "Vehicle Hit(MV2): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-						G_DebugBBox( vecStart, gp->vm.mins, gp->vm.maxs, 0.0f, 0.0f, 1.0f, 1.0f );
-					}
-
-					if( ( !tr.ent || !tr.ent->entity->IsSubclassOfProjectile() ) && driver.ent && driver.ent->IsSubclassOfPlayer() )
-					{
-						if( fSpeed > 0.0f )
-						{
-							if( i )
-							{
-								if( i == 2 && turnimpulse >= 0.0f )
-								{
-									turnimpulse -= 800.0f * level.frametime;
-								}
-
-								continue;
-							}
-
-							if( turnimpulse > 0.0f )
-							{
-								continue;
-							}
-
-							turnimpulse += 800 * level.frametime;
-							continue;
-						}
-
-						if( i == 0 )
-						{
-							if( turnimpulse < 0.0f )
-								continue;
-
-							turnimpulse -= 800 * level.frametime;
-							continue;
-						}
-
-						if( i == 2 && turnimpulse <= 0.0f )
-						{
-							turnimpulse += 800 * level.frametime;
-							continue;
-						}
-					}
-
-					if( flMoveFrac < 0.1f )
-					{
-						bDoGravity = false;
-					}
-
-					break;
-				}
-
-				tr.ent->entity->CheckGround();
-
-				if (!tr.ent->entity->groundentity || (tr.ent->entity->groundentity == edict &&
-					(!m_pCollisionEntity || tr.ent->entity != m_pCollisionEntity)))
-				{
-					Event *event = new Event( EV_Touch );
-					event->AddEntity( this );
-					tr.ent->entity->ProcessEvent( event );
-
-					event = new Event( EV_Touch );
-					event->AddEntity( tr.ent->entity );
-					ProcessEvent( event );
-
-					if( tr.ent->entity->IsSubclassOfSentient() )
-						bHitPerson = true;
-
-					if( g_showvehiclemovedebug->integer )
-					{
-						Com_Printf( "Vehicle Hit(MV): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-					}
-
-					break;
-				}
-
-				pSkippedEntities[ iNumSkippedEntities ] = tr.ent->entity;
-				iContentsEntities[ iNumSkippedEntities ] = tr.ent->r.contents;
-				solidEntities[ iNumSkippedEntities ] = tr.ent->solid;
-				iNumSkippedEntities++;
-
-				if( iNumSkippedEntities >= MAX_SKIPPED_ENTITIES )
-				{
-					gi.Error( ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n" );
-					return;
-				}
-
-				tr.ent->entity->setSolidType( SOLID_NOT );
-
-				if( g_showvehiclemovedebug->integer )
-				{
-					Com_Printf( "Vehicle Skipped(MV): %s : %s\n", tr.ent->entity->getClassname(), tr.ent->entity->targetname.c_str() );
-				}
-			}
-		}
-	}
+    SetControllerTag(0, gi.Tag_NumForName(edict->tiki, "Tire_rotate_front_left"));
+    SetControllerTag(1, gi.Tag_NumForName(edict->tiki, "Tire_rotate_front_right"));
+    SetControllerTag(2, gi.Tag_NumForName(edict->tiki, "steeringwheel_center"));
 }
 
 /*
 ====================
-Vehicle::AssertMove
+Vehicle::VehicleStart
 ====================
 */
-bool Vehicle::AssertMove
-	(
-	Vector vNewOrigin,
-	Vector vOldOrigin
-	)
+void Vehicle::VehicleStart(Event *ev)
 {
-	Entity *check;
-	gentity_t *edict;
-	int touch[ MAX_GENTITIES ];
-	int i;
-	int num;
+    Entity       *ent;
+    VehicleBase  *last;
+    orientation_t orient;
 
-	if( m_pCollisionEntity )
-	{
-		num = gi.AreaEntities( m_pCollisionEntity->mins, m_pCollisionEntity->maxs, touch, MAX_GENTITIES );
-	}
-	else
-	{
-		num = gi.AreaEntities( mins, maxs, touch, MAX_GENTITIES );
-	}
+    // become solid
+    setSolidType(SOLID_BBOX);
+    edict->r.contents = CONTENTS_BBOX;
 
-	if( num <= 0 )
-	{
-		return true;
-	}
+    last = this;
 
-	for( i = 0; i < num; i++ )
-	{
-		edict = &g_entities[ touch[ i ] ];
-		check = edict->entity;
+    setLocalOrigin(localorigin + Vector(0.0f, 0.0f, 30.0f));
+    angles.x = m_vAngles.x;
+    angles.z = m_vAngles.z;
 
-		if( check->edict->s.number != edict->s.number && edict->solid && check->movetype != MOVETYPE_STOP )
-		{
-			if( check->movetype != MOVETYPE_NONE
-				&& check->movetype != MOVETYPE_NOCLIP
-				&& edict->r.contents != CONTENTS_PLAYERCLIP
-				&& IsTouching( check )
-				&& G_TestEntityPosition( check, check->origin ) )
-			{
-				return false;
-			}
-		}
-	}
+    for (ent = G_NextEntity(NULL); ent != NULL; ent = G_NextEntity(ent)) {
+        if ((ent != this) && (ent->isSubclassOf(VehicleBase))) {
+            if ((ent->absmax.x >= absmin.x) && (ent->absmax.y >= absmin.y) && (ent->absmax.z >= absmin.z)
+                && (ent->absmin.x <= absmax.x) && (ent->absmin.y <= absmax.y) && (ent->absmin.z <= absmax.z)) {
+                last->vlink  = (VehicleBase *)ent;
+                last         = (VehicleBase *)ent;
+                last->offset = last->origin - origin;
+                last->offset = getLocalVector(last->offset);
+                last->edict->s.scale *= edict->s.scale;
+            }
+        }
+    }
 
-	return true;
+    last->vlink = NULL;
+
+    OpenSlotsByModel();
+
+    //
+    // get the seat offset
+    //
+    if (GetRawTag("seat", &orient)) {
+        driveroffset = Vector(orient.origin);
+    }
+    driveroffset += seatoffset * edict->s.scale;
+
+    SetDriverAngles(angles + seatangles);
+
+    max_health = health;
+
+    //
+    // since 2.0: set targetname for all busy turrets
+    //
+    for (int i = 0; i < numTurrets; i++) {
+        if (Turrets[i].flags & SLOT_BUSY) {
+            Turrets[i].ent->SetTargetName(TargetName() + "_turret" + str(i));
+        }
+    }
+
+    last_origin = origin;
+    link();
 }
 
 /*
 ====================
-Vehicle::AssertRotation
+Vehicle::SetWheelCorners
 ====================
 */
-bool Vehicle::AssertRotation
-	(
-	Vector vNewAngles,
-	Vector vOldAngles
-	)
+void Vehicle::SetWheelCorners(Event *ev)
 {
-	Vector i;
-	Vector j;
-	Vector k;
-	Vector i2;
-	Vector j2;
-	Vector k2;
-	Vector vAngleDiff;
-	float mAngleDiff[ 3 ][ 3 ];
+    Vector size;
+    Vector offset;
 
-	AngleVectorsLeft( vOldAngles, i, j, k );
-	AngleVectorsLeft( vNewAngles, i2, j2, k2 );
-	AnglesSubtract( vOldAngles, vNewAngles, vAngleDiff );
-	AngleVectorsLeft( vAngleDiff, mAngleDiff[ 0 ], mAngleDiff[ 1 ], mAngleDiff[ 2 ] );
+    size   = ev->GetVector(1);
+    offset = ev->GetVector(2);
 
-	// FIXME: not sure what it is supposed to do. Should we put an assert there ?
+    m_vOriginCornerOffset = offset;
+    maxtracedist          = size[2];
 
-	return true;
+    Corners[0][0] = -(size[0] / 2);
+    Corners[0][1] = (size[1] / 2);
+    Corners[0][2] = size[2];
+
+    Corners[1][0] = (size[0] / 2);
+    Corners[1][1] = (size[1] / 2);
+    Corners[1][2] = size[2];
+
+    Corners[2][0] = -(size[0] / 2);
+    Corners[2][1] = -(size[1] / 2);
+    Corners[2][2] = size[2];
+
+    Corners[3][0] = (size[0] / 2);
+    Corners[3][1] = -(size[1] / 2);
+    Corners[3][2] = size[2];
+
+    SetupVehicleSoundEntities();
 }
 
 /*
 ====================
-Vehicle::NoMove
+Vehicle::QuerySpeed
 ====================
 */
-void Vehicle::NoMove
-	(
-	void
-	)
-	
+float Vehicle::QuerySpeed(void)
 {
-	vmove_t vm;
-
-	SetMoveInfo( &vm );
-	VectorClear2D( vs.desired_dir );
-	VmoveSingle( &vm );
-	GetMoveInfo( &vm );
-}
-
-/*
-====================
-Vehicle::SlidePush
-====================
-*/
-void Vehicle::SlidePush
-	(
-	Vector vPush
-	)
-{
-	vmove_t vm;
-	int i;
-	int j;
-	Entity *pSkippedEntities[ MAX_SKIPPED_ENTITIES ];
-	int iContentsEntities[ MAX_SKIPPED_ENTITIES ];
-	solid_t solidEntities[ MAX_SKIPPED_ENTITIES ];
-	int iNumSkippedEntities = 0;
-	int iNumSkipped = 0;
-	gentity_t *other;
-	Vector newOrigin;
-
-	do
-	{
-		SetMoveInfo( &vm );
-
-		VectorCopy( vPush, vs.velocity );
-		vs.desired_dir[ 0 ] = vPush[ 0 ];
-		vs.desired_dir[ 1 ] = vPush[ 1 ];
-		VectorNormalize2D( vs.desired_dir );
-
-		if( g_showvehiclemovedebug->integer )
-		{
-			G_DebugBBox( origin, vm.mins, vm.maxs, 1.0f, 0.0f, 0.0f, 1.0f );
-			G_DebugBBox( origin, vm.mins, vm.maxs, 0.0f, 1.0f, 0.0f, 1.0f );
-		}
-
-		VmoveSingle( &vm );
-
-		iNumSkippedEntities = 0;
-
-		for( i = 0; i < vm.numtouch; i++ )
-		{
-			other = &g_entities[ vm.touchents[ i ] ];
-
-			for( j = 0; j < i; j++ )
-			{
-				if( &g_entities[ j ] == other )
-				{
-					break;
-				}
-			}
-
-			if( j == i && other->entity )
-			{
-				other->entity->CheckGround();
-
-				if( other->entity->groundentity && ( other->entity->groundentity == edict || other->entity == m_pCollisionEntity ) )
-				{
-					// save the entity
-					pSkippedEntities[ iNumSkipped ] = other->entity;
-					iContentsEntities[ iNumSkipped ] = other->r.contents;
-					solidEntities[ iNumSkipped ] = other->solid;
-					iNumSkipped++;
-
-					if( iNumSkipped >= MAX_SKIPPED_ENTITIES )
-					{
-						gi.Error( ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n" );
-						return;
-					}
-
-					other->entity->setSolidType( SOLID_NOT );
-					iNumSkippedEntities++;
-				}
-
-				if( g_showvehiclemovedebug->integer )
-				{
-					Com_Printf( "Vehicle Hit(SP): %s : %s\n", other->entity->getClassname(), other->entity->targetname.c_str() );
-				}
-			}
-		}
-	} while( iNumSkippedEntities != 0 );
-
-	if( bindmaster )
-	{
-		newOrigin = vm.vs->origin - bindmaster->origin;
-	}
-	else
-	{
-		newOrigin = vm.vs->origin;
-	}
-
-	setLocalOrigin( newOrigin );
-
-	if( g_showvehiclemovedebug->integer )
-	{
-		G_DebugBBox( origin, vm.mins, vm.maxs, 0, 0, 1.0f, 1.0f );
-	}
-
-	TouchStuff( &vm );
-
-	for( i = 0; i < iNumSkipped; i++ )
-	{
-		pSkippedEntities[ i ]->setSolidType( solidEntities[ i ] );
-		pSkippedEntities[ i ]->edict->r.contents = iContentsEntities[ i ];
-	}
-}
-
-/*
-====================
-Vehicle::SetupPath
-====================
-*/
-void Vehicle::SetupPath
-	(
-	cSpline<4, 512> *pPath,
-	SimpleEntity *se
-	)
-{
-	Vector vLastOrigin;
-	SimpleEntity *ent;
-	float fCurLength = 0.0f;
-	int i = 1;
-
-	if( !pPath )
-	{
-		return;
-	}
-
-	pPath->Reset();
-
-	if( !se->target.length() || !*se->target )
-	{
-		return;
-	}
-
-	vLastOrigin = se->origin;
-
-	for( ent = se; ent != NULL; ent = ent->Next(), i++ )
-	{
-		Vector vDelta = vLastOrigin - ent->origin;
-		float vTmp[ 4 ];
-
-		if( vDelta.length() == 0.0f && i > 1 )
-		{
-			Com_Printf( "^~^~^Warning: Vehicle Driving with a Path that contains 2 equal points\n" );
-		}
-		else
-		{
-			vLastOrigin = ent->origin;
-			fCurLength += vDelta.length();
-
-			vTmp[ 0 ] = fCurLength;
-			VectorCopy( vTmp + 1, ent->origin );
-
-			if( ent->IsSubclassOfVehiclePoint() )
-			{
-				pPath->Add( vTmp, ( ( VehiclePoint * )ent )->spawnflags );
-			}
-			else
-			{
-				pPath->Add( vTmp, 0 );
-			}
-		}
-
-		if( ent == se && i > 1 )
-		{
-			break;
-		}
-	}
-}
-
-/*
-====================
-Vehicle::UpdateSound
-====================
-*/
-void Vehicle::UpdateSound
-	(
-	void
-	)
-	
-{
-	float pitch;
-	float volume;
-
-	if( level.time < m_fNextSoundState )
-	{
-		return;
-	}
-
-	// Calculate the pitch based on the vehicle's speed
-	pitch = ( velocity.length() - m_fSoundMinSpeed ) / ( m_fSoundMaxSpeed - m_fSoundMinSpeed );
-
-	if( pitch > 1.0f )
-	{
-		pitch = 1.0f;
-	}
-	else if( pitch < 0.0f )
-	{
-		pitch = 0.0f;
-	}
-
-	pitch = m_fSoundMinPitch + ( m_fSoundMaxPitch - m_fSoundMinPitch ) * pitch;
-
-	volume = ( velocity.length() - m_fVolumeMinSpeed ) / ( m_fVolumeMaxSpeed - m_fVolumeMinSpeed );
-
-	if( volume > 1.0f )
-	{
-		volume = 1.0f;
-	}
-	else if( volume < 0.0f )
-	{
-		volume = 0.0f;
-	}
-
-	volume = this->m_fVolumeMinPitch + ( this->m_fVolumeMaxPitch - this->m_fVolumeMinPitch ) * volume;
-
-	switch( m_eSoundState )
-	{
-	case ST_OFF:
-		StopLoopSound();
-		TurnOffVehicleSoundEntities();
-		m_fNextSoundState = level.time;
-
-		if( driver.ent || m_bAutoPilot )
-		{
-			m_eSoundState = ST_OFF_TRANS_IDLE;
-		}
-		break;
-
-	case ST_OFF_TRANS_IDLE:
-		m_fNextSoundState = level.time;
-		m_eSoundState = ST_IDLE;
-		Sound( m_sSoundSet + "snd_on" );
-		LoopSound( m_sSoundSet + "snd_idle" );
-		break;
-
-	case ST_IDLE_TRANS_OFF:
-		m_fNextSoundState = level.time;
-		m_eSoundState = ST_OFF;
-		Sound( m_sSoundSet + "snd_off" );
-		StopLoopSound();
-		break;
-
-	case ST_IDLE:
-		m_fNextSoundState = level.time;
-
-		if( driver.ent || m_bAutoPilot )
-		{
-			if( fabs( DotProduct( orientation[ 0 ], velocity ) ) > 10.0f )
-			{
-				m_eSoundState = ST_IDLE_TRANS_RUN;
-			}
-		}
-		else
-		{
-			m_eSoundState = ST_IDLE_TRANS_OFF;
-		}
-
-		LoopSound( m_sSoundSet + "snd_idle" );
-
-		TurnOffVehicleSoundEntities();
-		break;
-
-	case ST_IDLE_TRANS_RUN:
-		m_fNextSoundState = level.time;
-		m_eSoundState = ST_RUN;
-
-		Sound( m_sSoundSet + "snd_revup" );
-		LoopSound( m_sSoundSet + "snd_run", -1.0f, -1.0f, -1.0f, pitch );
-		break;
-
-	case ST_RUN:
-		m_fNextSoundState = level.time;
-
-		if( fabs( DotProduct( orientation[ 0 ], velocity ) ) < 10.0f )
-		{
-			m_eSoundState = ST_RUN_TRANS_IDLE;
-		}
-
-		TurnOnVehicleSoundEntities();
-		LoopSound( m_sSoundSet + "snd_run", volume, -1.0f, -1.0f, pitch );
-		break;
-
-	case ST_RUN_TRANS_IDLE:
-		m_fNextSoundState = level.time;
-		m_eSoundState = ST_IDLE;
-
-		Sound( m_sSoundSet + "snd_revdown" );
-		LoopSound( m_sSoundSet + "snd_idle" );
-		break;
-
-	default:
-		m_fNextSoundState = level.time;
-		m_eSoundState = ST_OFF;
-		break;
-	}
-}
-
-/*
-====================
-Vehicle::SetupVehicleSoundEntities
-====================
-*/
-void Vehicle::SetupVehicleSoundEntities
-	(
-	void
-	)
-	
-{
-	int i;
-	Vector a;
-	Vector b;
-	Vector c;
-	Vector start;
-
-	angles.AngleVectorsLeft( &a, &b, &c );
-
-	// place the sound entities in the vehicle wheels
-	for( i = 0; i < MAX_SOUND_ENTITIES; i++ )
-	{
-		if( !m_pVehicleSoundEntities[ i ] )
-		{
-			m_pVehicleSoundEntities[ i ] = new VehicleSoundEntity( this );
-		}
-
-		start = origin + a * Corners[ i ][ 0 ] + b * Corners[ i ][ 1 ] + c * Corners[ i ][ 2 ];
-		m_pVehicleSoundEntities[ i ]->setOrigin( start );
-	}
-}
-
-/*
-====================
-Vehicle::RemoveVehicleSoundEntities
-====================
-*/
-void Vehicle::RemoveVehicleSoundEntities
-	(
-	void
-	)
-	
-{
-	for( int i = 0; i < MAX_SOUND_ENTITIES; i++ )
-	{
-		if( !m_pVehicleSoundEntities[ i ] )
-		{
-			continue;
-		}
-
-		m_pVehicleSoundEntities[ i ]->PostEvent( EV_Remove, EV_VEHICLE );
-	}
-}
-
-/*
-====================
-Vehicle::TurnOnVehicleSoundEntities
-====================
-*/
-void Vehicle::TurnOnVehicleSoundEntities
-	(
-	void
-	)
-	
-{
-	for( int i = 0; i < MAX_SOUND_ENTITIES; i++ )
-	{
-		if( !m_pVehicleSoundEntities[ i ] )
-		{
-			m_pVehicleSoundEntities[ i ] = new VehicleSoundEntity( this );
-		}
-
-		m_pVehicleSoundEntities[ i ]->Start();
-	}
-}
-
-/*
-====================
-Vehicle::TurnOffVehicleSoundEntities
-====================
-*/
-void Vehicle::TurnOffVehicleSoundEntities
-	(
-	void
-	)
-	
-{
-	for( int i = 0; i < MAX_SOUND_ENTITIES; i++ )
-	{
-		if( !m_pVehicleSoundEntities[ i ] )
-		{
-			m_pVehicleSoundEntities[ i ] = new VehicleSoundEntity( this );
-		}
-
-		m_pVehicleSoundEntities[ i ]->Stop();
-	}
-}
-
-/*
-====================
-Vehicle::UpdateTires
-====================
-*/
-void Vehicle::UpdateTires
-	(
-	void
-	)
-	
-{
-	int index;
-	trace_t trace;
-	Vector a;
-	Vector b;
-	Vector c;
-	Vector vTmp;
-	Vector t_mins;
-	Vector t_maxs;
-	Vector start;
-	Vector end;
-	Vector boxoffset;
-	Entity *pSkippedEntities[ MAX_SKIPPED_ENTITIES ];
-	int iContentsEntities[ MAX_SKIPPED_ENTITIES ];
-	solid_t solidEntities[ MAX_SKIPPED_ENTITIES ];
-	int iNumSkippedEntities;
-	int iNumSkipped = 0;
-
-	t_mins = mins * 0.25f;
-	t_maxs = maxs * 0.25f;
-
-	if( real_velocity.length() <= 0.5f && m_iLastTiresUpdate != -1 )
-	{
-		if( m_iLastTiresUpdate + 1000 > level.inttime )
-			return;
-	}
-
-	m_iLastTiresUpdate = level.inttime;
-
-	vTmp[ 1 ] = angles[ 1 ] + m_fSkidAngle;
-	AngleVectors( vTmp, a, b, c );
-
-	// Temporary make slots non-solid for G_Trace
-	SetSlotsNonSolid();
-
-	do
-	{
-		iNumSkippedEntities = 0;
-
-		for( index = 0; index < MAX_CORNERS; index++ )
-		{
-			boxoffset = Corners[ index ];
-			start = origin + a * boxoffset[ 0 ] + b * boxoffset[ 1 ] + c * boxoffset[ 2 ];
-			end = start;
-			end[ 2 ] -= 400.0f;
-
-			trace = G_Trace( start, t_mins, t_maxs, end, this, MASK_VEHICLE, false, "Vehicle::PostThink Corners" );
-
-			if( g_showvehiclemovedebug->integer )
-			{
-				G_DebugBBox( origin, start, end, 1.0f, 1.0f, 1.0f, 1.0f );
-				G_DebugBBox( origin, start, trace.endpos, 1.0f, 0.0f, 0.0f, 1.0f );
-			}
-
-			if( trace.ent && trace.ent->entity && trace.ent->entity->isSubclassOf( VehicleCollisionEntity ) )
-			{
-				// save the entity
-				pSkippedEntities[ iNumSkipped ] = trace.ent->entity;
-				iContentsEntities[ iNumSkipped ] = trace.ent->r.contents;
-				solidEntities[ iNumSkipped ] = trace.ent->solid;
-				iNumSkipped++;
-
-				if( iNumSkipped >= MAX_SKIPPED_ENTITIES )
-				{
-					gi.Error( ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n" );
-					return;
-				}
-
-				trace.ent->entity->setSolidType( SOLID_NOT );
-				iNumSkippedEntities++;
-			}
-
-			if( trace.fraction == 1.0 )
-			{
-				m_bTireHit[ index ] = false;
-			}
-			else
-			{
-				m_vTireEnd[ index ] = trace.endpos;
-				m_bTireHit[ index ] = true;
-			}
-		}
-	} while( iNumSkippedEntities != 0 );
-
-	for( index = 0; index < iNumSkipped; index++ )
-	{
-		pSkippedEntities[ index ]->setSolidType( solidEntities[ index ] );
-		pSkippedEntities[ index ]->edict->r.contents = iContentsEntities[ index ];
-	}
-
-	// Turn slots back into a solid state
-	SetSlotsSolid();
-}
-
-/*
-====================
-Vehicle::UpdateNormals
-====================
-*/
-void Vehicle::UpdateNormals
-	(
-	void
-	)
-	
-{
-	Vector vDist1;
-	Vector vDist2;
-	Vector vCross;
-	Vector temp;
-	Vector pitch;
-	Vector i;
-	Vector j;
-
-	if (real_velocity.length() <= 0.5)
-	{
-		if (m_iLastTiresUpdate != -1 && m_iLastTiresUpdate + 1000 > level.inttime)
-			return;
-	}
-
-	AngleVectorsLeft(angles, NULL, pitch, NULL);
-
-	m_vNormalSum = vec_zero;
-
-	pitch = -pitch;
-
-	m_iNumNormals = 0;
-
-	if (m_bTireHit[0] && m_bTireHit[1] && m_bTireHit[2])
-	{
-		vDist1 = m_vTireEnd[1] - m_vTireEnd[0];
-		vDist2 = m_vTireEnd[1] - m_vTireEnd[2];
-		
-		vCross.CrossProduct(vDist1, vDist2);
-		VectorNormalize(vCross);
-
-		m_vNormalSum += vCross;
-
-		m_iNumNormals++;
-	}
-
-	if (m_bTireHit[1] && m_bTireHit[2] && m_bTireHit[3])
-	{
-		vDist1 = m_vTireEnd[2] - m_vTireEnd[1];
-		vDist2 = m_vTireEnd[2] - m_vTireEnd[3];
-		
-		vCross.CrossProduct(vDist1, vDist2);
-		VectorNormalize(vCross);
-
-		m_vNormalSum += vCross;
-
-		m_iNumNormals++;
-	}
-
-	if (m_bTireHit[2] && m_bTireHit[3] && m_bTireHit[0])
-	{
-		vDist1 = m_vTireEnd[3] - m_vTireEnd[0];
-		vDist2 = m_vTireEnd[3] - m_vTireEnd[2];
-
-		vCross.CrossProduct(vDist1, vDist2);
-		VectorNormalize(vCross);
-
-		m_vNormalSum += vCross;
-
-		m_iNumNormals++;
-	}
-
-	if (m_bTireHit[3] && m_bTireHit[0] && m_bTireHit[1])
-	{
-		vDist1 = m_vTireEnd[0] - m_vTireEnd[3];
-		vDist2 = m_vTireEnd[0] - m_vTireEnd[1];
-
-		vCross.CrossProduct(vDist1, vDist2);
-		VectorNormalize(vCross);
-
-		m_vNormalSum += vCross;
-
-		m_iNumNormals++;
-	}
-
-	if (m_iNumNormals > 1)
-	{
-		temp = m_vNormalSum / m_iNumNormals;
-
-		i.CrossProduct(temp, pitch);
-
-		angles[0] = i.toPitch();
-
-		j.CrossProduct(temp, i);
-
-		angles[2] = j.toPitch();
-	}
-}
-
-/*
-====================
-Vehicle::UpdateBones
-====================
-*/
-void Vehicle::UpdateBones
-	(
-	void
-	)
-	
-{
-	float fNewTurnAngle = AngleNormalize180( turnangle - m_fSkidAngle );
-
-	if( fabs( fNewTurnAngle ) > maxturnrate )
-	{
-		fNewTurnAngle = maxturnrate;
-	}
-
-	SetControllerAngles( 0, Vector( 0, fNewTurnAngle, 0 ) );
-	SetControllerAngles( 1, Vector( 0, fNewTurnAngle, 0 ) );
-}
-
-/*
-====================
-Vehicle::UpdateShaderOffset
-====================
-*/
-void Vehicle::UpdateShaderOffset
-	(
-	void
-	)
-	
-{
-	m_fShaderOffset -= orientation[ 0 ] * real_velocity * 0.25 * level.frametime;
-	edict->s.shader_time = m_fShaderOffset;
-}
-
-/*
-====================
-Vehicle::UpdateTurretSlot
-====================
-*/
-void Vehicle::UpdateTurretSlot
-	(
-	int iSlot
-	)
-{
-	orientation_t orient;
-
-	if( !( Turrets[ iSlot ].flags & SLOT_BUSY ) || !Turrets[ iSlot ].ent )
-	{
-		return;
-	}
-
-	if( Turrets[ iSlot ].boneindex != -1 )
-	{
-		GetTag( Turrets[ iSlot ].boneindex, &orient );
-		if( Turrets[ iSlot ].ent->IsSubclassOfActor() )
-		{
-			Turrets[ iSlot ].ent->setOriginEvent( orient.origin );
-		}
-		else
-		{
-			Turrets[ iSlot ].ent->setOrigin( orient.origin );
-		}
-	}
-	else
-	{
-		Vector forward = orientation[ 0 ];
-		Vector left = orientation[ 1 ];
-		Vector up = orientation[ 2 ];
-
-		if( Turrets[ iSlot ].ent->IsSubclassOfActor() )
-		{
-			Turrets[ iSlot ].ent->setOriginEvent( origin );
-		}
-		else
-		{
-			Turrets[ iSlot ].ent->setOrigin( origin );
-		}
-	}
-
-	Turrets[ iSlot ].ent->avelocity = avelocity;
-	Turrets[ iSlot ].ent->velocity = velocity;
-
-	if( !Turrets[ iSlot ].ent->IsSubclassOfActor() || ( ( Actor * )Turrets[ iSlot ].ent.Pointer() )->m_Enemy )
-	{
-		Turrets[ iSlot ].ent->setAngles( angles );
-	}
-}
-
-/*
-====================
-Vehicle::UpdatePassengerSlot
-====================
-*/
-void Vehicle::UpdatePassengerSlot
-	(
-	int iSlot
-	)
-{
-	orientation_t orient;
-
-	if( !( Passengers[ iSlot ].flags & SLOT_BUSY ) || !Passengers[ iSlot ].ent )
-	{
-		return;
-	}
-
-	if( Passengers[ iSlot ].boneindex != -1 )
-	{
-		GetTag( Passengers[ iSlot ].boneindex, &orient );
-		if( Passengers[ iSlot ].ent->IsSubclassOfActor() )
-		{
-			Passengers[ iSlot ].ent->setOriginEvent( orient.origin );
-		}
-		else
-		{
-			Passengers[ iSlot ].ent->setOrigin( orient.origin );
-		}
-	}
-	else
-	{
-		if( Passengers[ iSlot ].ent->IsSubclassOfActor() )
-		{
-			Passengers[ iSlot ].ent->setOriginEvent( origin );
-		}
-		else
-		{
-			Passengers[ iSlot ].ent->setOrigin( origin );
-		}
-	}
-
-	Passengers[ iSlot ].ent->avelocity = avelocity;
-	Passengers[ iSlot ].ent->velocity = velocity;
-
-	if( !Passengers[ iSlot ].ent->IsSubclassOfActor() || ( ( Actor * )Passengers[ iSlot ].ent.Pointer() )->m_Enemy )
-	{
-		Passengers[ iSlot ].ent->setAngles( angles );
-	}
-}
-
-/*
-====================
-Vehicle::UpdateDriverSlot
-====================
-*/
-void Vehicle::UpdateDriverSlot
-	(
-	int iSlot
-	)
-{
-	orientation_t orient;
-
-	if( !( driver.flags & SLOT_BUSY ) || !driver.ent )
-	{
-		return;
-	}
-
-	if( driver.boneindex != -1 )
-	{
-		GetTag( driver.boneindex, &orient );
-		if( driver.ent->IsSubclassOfActor() )
-		{
-			driver.ent->setOriginEvent( orient.origin );
-		}
-		else
-		{
-			driver.ent->setOrigin( orient.origin );
-		}
-	}
-	else
-	{
-		Vector forward = orientation[ 0 ];
-		Vector left = orientation[ 1 ];
-		Vector up = orientation[ 2 ];
-
-		if( driver.ent->IsSubclassOfActor() )
-		{
-			driver.ent->setOriginEvent( origin + forward * driveroffset[ 0 ] + left * driveroffset[ 1 ] + up * driveroffset[ 2 ] );
-		}
-		else
-		{
-			driver.ent->setOrigin( origin + forward * driveroffset[ 0 ] + left * driveroffset[ 1 ] + up * driveroffset[ 2 ] );
-		}
-	}
-
-	if( drivable )
-	{
-		driver.ent->avelocity = avelocity;
-		driver.ent->velocity = velocity;
-		driver.ent->setAngles( angles );
-	}
-}
-
-/*
-====================
-Vehicle::UpdateSkidAngle
-====================
-*/
-void Vehicle::UpdateSkidAngle
-	(
-	void
-	)
-{
-	if( m_bEnableSkidding )
-	{
-		if( g_showvehiclemovedebug && g_showvehiclemovedebug->integer )
-		{
-			Com_Printf( "Skidding!\n" );
-		}
-
-		m_fSkidLeftForce += velocity.length() / 150.0f * turnangle;
-		m_fSkidRightForce += -m_fSkidAngle * 0.2;
-		m_fSkidRightForce *= 0.3f;
-		m_fSkidAngle = m_fSkidAngle + ( m_fSkidLeftForce + m_fSkidRightForce ) * 22.0f * level.frametime;
-		m_vSkidOrigin[ 0 ] = -fabs( m_fSkidAngle );
-	}
-	else
-	{
-		m_fSkidAngle = 0;
-	}
-}
-
-/*
-====================
-Vehicle::GetPathPosition
-====================
-*/
-float Vehicle::GetPathPosition
-	(
-	cSpline<4, 512> *pPath,
-	int iNode
-	)
-{
-	float *vTmp;
-	float vPrev[ 3 ];
-	float vCur[ 3 ];
-	float vTotal[ 3 ];
-	Vector vDelta;
-	float fTotal;
-	float fCoef;
-
-	vTmp = pPath->GetByNode( iNode, NULL );
-	VectorCopy( vCur, vTmp + 1 );
-
-	if( g_showvehiclemovedebug->integer )
-	{
-		G_DebugString( Vector( vTmp[ 1 ], vTmp[ 2 ], vTmp[ 3 ] ), 3.0f, 1.0f, 1.0f, 1.0f, "%f", vTmp[ 0 ] );
-	}
-
-	vTmp = pPath->GetByNode( iNode - 1, NULL );
-	VectorCopy( vPrev, vTmp + 1 );
-
-	if( g_showvehiclemovedebug->integer )
-	{
-		G_DebugString( Vector( vTmp[ 1 ], vTmp[ 2 ], vTmp[ 3 ] ), 3.0f, 1.0f, 1.0f, 1.0f, "%f", vTmp[ 0 ] );
-	}
-
-	VectorCopy( Vector( vCur ) - Vector( vPrev ), vTotal );
-	m_vIdealDir = vTotal;
-	fTotal = m_vIdealDir.length();
-	VectorNormalize( m_vIdealDir );
-	angles.AngleVectorsLeft( &vDelta, NULL, NULL );
-
-	fCoef = ProjectLineOnPlane( vDelta, DotProduct( vDelta, origin ), vPrev, vCur, NULL );
-
-	if( g_showvehiclemovedebug->integer )
-	{
-		G_DebugBBox( vPrev, Vector( -32.0f, -32.0f, -32.0f ), Vector( 32.0f, 32.0f, 32.0f ), 0, 1.0f, 1.0f, 1.0f );
-		G_DebugBBox( vCur, Vector( -32.0f, -32.0f, -32.0f ), Vector( 32.0f, 32.0f, 32.0f ), 1.0f, 1.0f, 0, 1.0f );
-		G_DebugArrow( vCur, m_vIdealDir * -1.0f, ( 1.0 - fCoef ) * fTotal, 0, 1.0f, 0, 1.0f );
-		G_DebugArrow( vPrev, m_vIdealDir, fCoef * fTotal, 0, 0, 1.0f, 1.0f );
-	}
-
-	return *pPath->GetByNode( iNode - ( 1.0 - fCoef ), NULL );
-}
-
-/*
-====================
-Vehicle::FactorInSkidOrigin
-====================
-*/
-void Vehicle::FactorInSkidOrigin
-	(
-	void
-	)
-	
-{
-	Vector vNewOrigin;
-
-	vNewOrigin[ 0 ] = orientation[ 0 ][ 0 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 0 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 0 ] * m_vSkidOrigin[ 2 ];
-	vNewOrigin[ 1 ] = orientation[ 0 ][ 1 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 1 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 1 ] * m_vSkidOrigin[ 2 ];
-	vNewOrigin[ 2 ] = orientation[ 0 ][ 2 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 2 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 2 ] * m_vSkidOrigin[ 2 ];
-
-	m_vOriginOffset2 += vNewOrigin;
-}
-
-/*
-====================
-Vehicle::FactorInOriginOffset
-====================
-*/
-void Vehicle::FactorInOriginOffset
-	(
-	void
-	)
-	
-{
-	origin += m_vOriginOffset;
-	setOrigin( origin );
-}
-
-/*
-====================
-Vehicle::CalculateOriginOffset
-====================
-*/
-void Vehicle::CalculateOriginOffset
-	(
-	void
-	)
-	
-{
-	int index;
-	Vector vTireAvg;
-	Vector vMissHit;
-	Vector temp;
-	int iNum = 0;
-	Vector acceleration;
-
-	m_vOriginOffset += m_vOriginOffset2;
-	m_vOriginOffset2 = vec_zero;
-
-	for( index = 0; index < MAX_CORNERS; index++ )
-	{
-		if( m_bTireHit[ index ] )
-		{
-			iNum++;
-			temp = m_vTireEnd[ index ];
-			vTireAvg += origin - temp;
-		}
-		else
-		{
-			temp = Corners[ index ];
-			vMissHit = temp;
-		}
-	}
-
-	if( iNum == 3 )
-	{
-		temp = m_vNormalSum * ( 1.0f / m_iNumNormals );
-		ProjectPointOnPlane( acceleration, vMissHit, temp );
-		vTireAvg += acceleration;
-	}
-	else if( iNum == 4 )
-	{
-		vTireAvg *= 0.25f;
-		MatrixTransformVector( m_vOriginCornerOffset, orientation, acceleration );
-		vTireAvg -= acceleration;
-		m_vOriginOffset2 += vTireAvg;
-	}
-
-	m_vOriginOffset2[ 0 ] += orientation[ 0 ][ 0 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 0 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 0 ] * m_vSkidOrigin[ 2 ];
-	m_vOriginOffset2[ 1 ] += orientation[ 0 ][ 1 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 1 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 1 ] * m_vSkidOrigin[ 2 ];
-	m_vOriginOffset2[ 2 ] += orientation[ 0 ][ 2 ] * m_vSkidOrigin[ 0 ] + orientation[ 1 ][ 2 ] * m_vSkidOrigin[ 1 ] + orientation[ 2 ][ 2 ] * m_vSkidOrigin[ 2 ];
-
-	Vector vTmp = real_acceleration - prev_acceleration;
-
-	m_fDownForce = vTmp[ 2 ] * m_fZCoef;
-
-	if( m_fDownForce > m_fZMax )
-	{
-		m_fDownForce = m_fZMax;
-	}
-	else if( m_fDownForce < m_fZMin )
-	{
-		m_fDownForce = m_fZMin;
-	}
-
-	m_fUpForce = ( -m_vOriginOffset[ 2 ] * m_fBouncyCoef + m_fUpForce ) * m_fSpringyCoef;
-	m_vOriginOffset2[ 2 ] += ( m_fDownForce + m_fUpForce ) * 12.0 * level.frametime;
-
-	if( m_vOriginOffset2[ 2 ] > m_fZMax )
-	{
-		m_vOriginOffset2[ 2 ] = m_fZMax;
-	}
-	else if( m_vOriginOffset2[ 2 ] < m_fZMin )
-	{
-		m_vOriginOffset2[ 2 ] = m_fZMin;
-	}
-
-	m_vOriginOffset -= m_vOriginOffset2;
-}
-
-/*
-====================
-Vehicle::FactorOutOriginOffset
-====================
-*/
-void Vehicle::FactorOutOriginOffset
-	(
-	void
-	)
-	
-{
-	origin -= m_vOriginOffset;
-	setOrigin( origin );
-}
-
-/*
-====================
-Vehicle::FactorInAnglesOffset
-====================
-*/
-void Vehicle::FactorInAnglesOffset
-	(
-	Vector *vAddedAngles
-	)
-{
-	( *vAddedAngles ) += m_vAnglesOffset;
-	( *vAddedAngles )[ 1 ] += m_fSkidAngle;
-}
-
-/*
-====================
-Vehicle::CalculateAnglesOffset
-====================
-*/
-void Vehicle::CalculateAnglesOffset
-	(
-	Vector acceleration
-	)
-{
-	if( level.time <= 1200 )
-	{
-		return;
-	}
-
-	m_fForwardForce += DotProduct( orientation[ 0 ], acceleration ) * m_fYawCoef;
-	m_fBackForce = ( -m_vAnglesOffset[ 0 ] * m_fBouncyCoef + m_fBackForce ) * m_fSpringyCoef;
-
-	m_vAnglesOffset[ 0 ] += m_fForwardForce + m_fBackForce * 12.0 * level.frametime;
-
-	if( m_vAnglesOffset[ 0 ] > m_fYawMax )
-	{
-		m_vAnglesOffset[ 0 ] = m_fYawMax;
-	}
-	else if( m_vAnglesOffset[ 0 ] < m_fYawMin )
-	{
-		m_vAnglesOffset[ 0 ] = m_fYawMin;
-	}
-
-	m_fForwardForce = 0;
-	m_fLeftForce += DotProduct( orientation[ 1 ], acceleration ) * m_fRollCoef;
-	m_fRightForce = ( -m_vAnglesOffset[ 2 ] * m_fBouncyCoef + m_fRightForce ) * m_fSpringyCoef;
-
-	m_vAnglesOffset[ 2 ] += 12.0 * ( m_fLeftForce + m_fRightForce ) *level.frametime;
-
-	if( m_vAnglesOffset[ 2 ] > m_fRollMax )
-	{
-		m_vAnglesOffset[ 2 ] = m_fRollMax;
-	}
-	else if( m_vAnglesOffset[ 2 ] < m_fRollMin )
-	{
-		m_vAnglesOffset[ 2 ] = m_fRollMin;
-	}
-
-	m_fLeftForce = 0;
-}
-
-/*
-====================
-Vehicle::FactorOutAnglesOffset
-====================
-*/
-void Vehicle::FactorOutAnglesOffset
-	(
-	void
-	)
-	
-{
-
-}
-
-/*
-====================
-Vehicle::GetTagPositionAndOrientation
-====================
-*/
-qboolean Vehicle::GetTagPositionAndOrientation
-	(
-	str tagname,
-	orientation_t *new_or
-	)
-{
-	int tagnum = gi.Tag_NumForName( edict->tiki, tagname.c_str() );
-
-	if( tagnum < 0 )
-	{
-		warning( "Vehicle::GetTagPositionAndOrientation", "Could not find tag \"%s\"", tagname.c_str() );
-		return false;
-	}
-	else
-	{
-		return GetTagPositionAndOrientation( tagnum, new_or );
-	}
-}
-
-/*
-====================
-Vehicle::GetTagPositionAndOrientation
-====================
-*/
-qboolean Vehicle::GetTagPositionAndOrientation
-	(
-	int tagnum,
-	orientation_t *new_or
-	)
-{
-	int i;
-	orientation_t tag_or;
-	float axis[ 3 ][ 3 ];
-
-	GetRawTag( tagnum, &tag_or );
-
-	AnglesToAxis( angles, axis );
-
-	VectorCopy( origin, new_or->origin );
-
-	for( i = 0; i < 3; i++ )
-	{
-		VectorMA( new_or->origin, tag_or.origin[ i ], tag_or.axis[ i ], new_or->origin );
-	}
-
-	MatrixMultiply( tag_or.axis, axis, new_or->axis );
-	return true;
-}
-
-/*
-====================
-Vehicle::CalculateAnimationData
-====================
-*/
-void Vehicle::CalculateAnimationData
-	(
-	Vector vAngles,
-	Vector vOrigin
-	)
-{
-	float fLeft = fEpsilon();
-	float fRight = fEpsilon();
-	float fForward = 0;
-	float fBack = fEpsilon();
-	float fLow = fEpsilon();
-
-	if( vAngles[ 1 ] < 0.0 )
-	{
-		fBack = vAngles[ 1 ] / m_fYawMin;
-	}
-	else if( vAngles[ 1 ] > 0.0 )
-	{
-		fForward = vAngles[ 1 ] / m_fYawMax;
-	}
-
-	if( vAngles[ 2 ] > 0.0 )
-	{
-		fRight = vAngles[ 2 ] / m_fRollMin;
-	}
-	else if( vAngles[ 2 ] < 0.0 )
-	{
-		fLeft = vAngles[ 2 ] / m_fRollMax;
-	}
-
-	if( vOrigin[ 2 ] < 0.0 )
-	{
-		fBack = vOrigin[ 2 ] / m_fZMin;
-	}
-	else if( vOrigin[ 2 ] > 0.0 )
-	{
-		fForward = vOrigin[ 2 ] / m_fZMax;
-	}
-
-	NewAnim( "idle", 0 );
-	NewAnim( "lean_left", 0, 3, fLeft );
-	NewAnim( "lean_right", 0, 4, fRight );
-	NewAnim( "lean_forward", 0, 1, fForward );
-	NewAnim( "lean_back", 0, 2, fBack );
-	NewAnim( "high", 0, 6, fEpsilon() );
-	NewAnim( "low", 0, 5, fEpsilon() );
-}
-
-/*
-====================
-Vehicle::IsDamagedBy
-
-Returns whether or not the vehicle is damaged by the specified entity.
-====================
-*/
-bool Vehicle::IsDamagedBy
-	(
-	Entity *ent
-	)
-{
-	int i = FindDriverSlotByEntity( ent );
-
-	if( i == -1 )
-	{
-		i = FindPassengerSlotByEntity( ent );
-
-		if( i == -1 )
-		{
-			i = FindTurretSlotByEntity( ent );
-
-			if( i == -1 )
-			{
-				for( i = 0; i < MAX_TURRETS; i++ )
-				{
-					TurretGun *pTurret = ( TurretGun * )Turrets[ i ].ent.Pointer();
-
-					if( !pTurret )
-					{
-						continue;
-					}
-
-					if( pTurret->IsSubclassOfTurretGun() && pTurret->GetOwner() == ent )
-					{
-						return false;
-					}
-				}
-
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-/*
-====================
-Vehicle::AutoPilot
-====================
-*/
-void Vehicle::AutoPilot
-	(
-	void
-	)
-{
-	float *vTmp;
-
-	if (!m_pCurPath || m_pCurPath->m_iPoints == 0)
-	{
-		m_bAutoPilot = false;
-		return;
-	}
-
-	if (g_showvehiclepath && g_showvehiclepath->integer)
-	{
-		int iFlags = 0;
-		float fZ;
-		Vector vTmp1;
-		Vector vTmp2;
-		for (int i = 0; i < m_pCurPath->m_iPoints; i++)
-		{
-			vTmp = m_pCurPath->GetByNode(i, &iFlags);
-			vTmp1 = vTmp + 1;
-			fZ = 0;
-			//FIXME: macros
-			if (iFlags & 1)
-			{
-				fZ = 1;
-				G_DebugString(vTmp1 + Vector(0, 0, 32), sin(level.time) + 3, 1, 1, 0, "START_STOPPING");
-			}
-			if (iFlags & 2)
-			{
-				G_DebugString(vTmp1 + Vector(0, 0, (fZ + 1) * 32), sin(level.time) + 3, 0, 1, 0, "START_SKIDDING");
-				fZ++;
-			}
-			if (iFlags & 4)
-			{
-				G_DebugString(vTmp1 + Vector(0, 0, (fZ + 1) * 32), sin(level.time) + 3, 0, 0, 1, "STOP_SKIDDING");
-			}
-			Vector vMaxs = Vector(sin(level.time), sin(level.time), sin(level.time)) * 16;
-			Vector vMins = vMaxs * -1;
-			vMaxs = Vector(sin(level.time), sin(level.time), sin(level.time)) * 16;
-			G_DebugBBox(vTmp1, vMins, vMaxs, 0, 0, 1, 1);
-
-
-			vTmp = m_pCurPath->GetByNode(i + 1, NULL);
-			vTmp2 = vTmp + 1;
-
-			G_DebugLine(vTmp1, vTmp2, 0, 1, 0, 1);
-		}
-	}
-	// FIXME: stub
-}
-
-/*
-====================
-Vehicle::GetSoundSet
-====================
-*/
-str Vehicle::GetSoundSet
-	(
-	void
-	)
-{
-	return m_sSoundSet;
+    return currentspeed;
 }
 
 /*
@@ -5570,20 +1421,15 @@ str Vehicle::GetSoundSet
 Vehicle::QueryFreePassengerSlot
 ====================
 */
-int Vehicle::QueryFreePassengerSlot
-	(
-	void
-	)
+int Vehicle::QueryFreePassengerSlot(void)
 {
-	for( int i = 0; i < numPassengers; i++ )
-	{
-		if( Passengers[ i ].flags & SLOT_FREE )
-		{
-			return i;
-		}
-	}
+    for (int i = 0; i < numPassengers; i++) {
+        if (Passengers[i].flags & SLOT_FREE) {
+            return i;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -5591,12 +1437,9 @@ int Vehicle::QueryFreePassengerSlot
 Vehicle::QueryFreeDriverSlot
 ====================
 */
-int Vehicle::QueryFreeDriverSlot
-	(
-	void
-	)
+int Vehicle::QueryFreeDriverSlot(void)
 {
-	return ( driver.flags & SLOT_FREE ) ? 0 : -1;
+    return (driver.flags & SLOT_FREE) ? 0 : -1;
 }
 
 /*
@@ -5604,20 +1447,15 @@ int Vehicle::QueryFreeDriverSlot
 Vehicle::QueryFreeTurretSlot
 ====================
 */
-int Vehicle::QueryFreeTurretSlot
-	(
-	void
-	)
+int Vehicle::QueryFreeTurretSlot(void)
 {
-	for( int i = 0; i < numTurrets; i++ )
-	{
-		if( Turrets[ i ].flags & SLOT_FREE )
-		{
-			return i;
-		}
-	}
+    for (int i = 0; i < numTurrets; i++) {
+        if (Turrets[i].flags & SLOT_FREE) {
+            return i;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -5625,23 +1463,16 @@ int Vehicle::QueryFreeTurretSlot
 Vehicle::QueryPassengerSlotPosition
 ====================
 */
-void Vehicle::QueryPassengerSlotPosition
-	(
-	int slot,
-	float *pos
-	)
+void Vehicle::QueryPassengerSlotPosition(int slot, float *pos)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	if( Passengers[ slot ].enter_boneindex >= 0 )
-	{
-		GetTagPositionAndOrientation( Passengers[ slot ].enter_boneindex, &orient );
-		VectorCopy( orient.origin, pos );
-	}
-	else
-	{
-		VectorCopy( origin, pos );
-	}
+    if (Passengers[slot].enter_boneindex >= 0) {
+        GetTagPositionAndOrientation(Passengers[slot].enter_boneindex, &orient);
+        VectorCopy(orient.origin, pos);
+    } else {
+        VectorCopy(origin, pos);
+    }
 }
 
 /*
@@ -5649,23 +1480,16 @@ void Vehicle::QueryPassengerSlotPosition
 Vehicle::QueryDriverSlotPosition
 ====================
 */
-void Vehicle::QueryDriverSlotPosition
-	(
-	int slot,
-	float *pos
-	)
+void Vehicle::QueryDriverSlotPosition(int slot, float *pos)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	if( driver.enter_boneindex >= 0 )
-	{
-		GetTagPositionAndOrientation( driver.enter_boneindex, &orient );
-		VectorCopy( orient.origin, pos );
-	}
-	else
-	{
-		VectorCopy( origin, pos );
-	}
+    if (driver.enter_boneindex >= 0) {
+        GetTagPositionAndOrientation(driver.enter_boneindex, &orient);
+        VectorCopy(orient.origin, pos);
+    } else {
+        VectorCopy(origin, pos);
+    }
 }
 
 /*
@@ -5673,23 +1497,19 @@ void Vehicle::QueryDriverSlotPosition
 Vehicle::QueryTurretSlotPosition
 ====================
 */
-void Vehicle::QueryTurretSlotPosition
-	(
-	int slot,
-	float *pos
-	)
+void Vehicle::QueryTurretSlotPosition(int slot, float *pos)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	if( Turrets[ slot ].enter_boneindex >= 0 )
-	{
-		GetTagPositionAndOrientation( Turrets[ slot ].enter_boneindex, &orient );
-		VectorCopy( orient.origin, pos );
-	}
-	else
-	{
-		VectorCopy( origin, pos );
-	}
+    if (Turrets[slot].enter_boneindex >= 0) {
+        GetTagPositionAndOrientation(Turrets[slot].enter_boneindex, &orient);
+        VectorCopy(orient.origin, pos);
+    } else if (Turrets[slot].boneindex >= 0) {
+        GetTagPositionAndOrientation(Turrets[slot].boneindex, &orient);
+        VectorCopy(orient.origin, pos);
+    } else {
+        VectorCopy(origin, pos);
+    }
 }
 
 /*
@@ -5697,16 +1517,12 @@ void Vehicle::QueryTurretSlotPosition
 Vehicle::QueryPassengerSlotAngles
 ====================
 */
-void Vehicle::QueryPassengerSlotAngles
-	(
-	int slot,
-	float *ang
-	)
+void Vehicle::QueryPassengerSlotAngles(int slot, float *ang)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	GetTagPositionAndOrientation( Passengers[ slot ].enter_boneindex, &orient );
-	MatrixToEulerAngles( orient.axis, ang );
+    GetTagPositionAndOrientation(Passengers[slot].enter_boneindex, &orient);
+    MatrixToEulerAngles(orient.axis, ang);
 }
 
 /*
@@ -5714,16 +1530,12 @@ void Vehicle::QueryPassengerSlotAngles
 Vehicle::QueryDriverSlotAngles
 ====================
 */
-void Vehicle::QueryDriverSlotAngles
-	(
-	int slot,
-	float *ang
-	)
+void Vehicle::QueryDriverSlotAngles(int slot, float *ang)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	GetTagPositionAndOrientation( driver.enter_boneindex, &orient );
-	MatrixToEulerAngles( orient.axis, ang );
+    GetTagPositionAndOrientation(driver.enter_boneindex, &orient);
+    MatrixToEulerAngles(orient.axis, ang);
 }
 
 /*
@@ -5731,16 +1543,12 @@ void Vehicle::QueryDriverSlotAngles
 Vehicle::QueryTurretSlotAngles
 ====================
 */
-void Vehicle::QueryTurretSlotAngles
-	(
-	int slot,
-	float *ang
-	)
+void Vehicle::QueryTurretSlotAngles(int slot, float *ang)
 {
-	orientation_t orient;
+    orientation_t orient;
 
-	GetTagPositionAndOrientation( Turrets[ slot ].enter_boneindex, &orient );
-	MatrixToEulerAngles( orient.axis, ang );
+    GetTagPositionAndOrientation(Turrets[slot].enter_boneindex, &orient);
+    MatrixToEulerAngles(orient.axis, ang);
 }
 
 /*
@@ -5748,12 +1556,9 @@ void Vehicle::QueryTurretSlotAngles
 Vehicle::QueryPassengerSlotStatus
 ====================
 */
-int Vehicle::QueryPassengerSlotStatus
-	(
-	int slot
-	)
+int Vehicle::QueryPassengerSlotStatus(int slot)
 {
-	return Passengers[ slot ].flags;
+    return Passengers[slot].flags;
 }
 
 /*
@@ -5761,12 +1566,9 @@ int Vehicle::QueryPassengerSlotStatus
 Vehicle::QueryDriverSlotStatus
 ====================
 */
-int Vehicle::QueryDriverSlotStatus
-	(
-	int slot
-	)
+int Vehicle::QueryDriverSlotStatus(int slot)
 {
-	return driver.flags;
+    return driver.flags;
 }
 
 /*
@@ -5774,12 +1576,417 @@ int Vehicle::QueryDriverSlotStatus
 Vehicle::QueryTurretSlotStatus
 ====================
 */
-int Vehicle::QueryTurretSlotStatus
-	(
-	int slot
-	)
+int Vehicle::QueryTurretSlotStatus(int slot)
 {
-	return Turrets[ slot ].flags;
+    return Turrets[slot].flags;
+}
+
+/*
+====================
+Vehicle::QuerySpeed
+====================
+*/
+void Vehicle::QuerySpeed(Event *ev)
+{
+    ev->AddFloat(QuerySpeed());
+}
+
+/*
+====================
+Vehicle::EventQueryFreePassengerSlot
+====================
+*/
+void Vehicle::QueryFreePassengerSlot(Event *ev)
+{
+    ev->AddInteger(QueryFreePassengerSlot());
+}
+
+/*
+====================
+Vehicle::EventQueryFreeDriverSlot
+====================
+*/
+void Vehicle::QueryFreeDriverSlot(Event *ev)
+{
+    ev->AddInteger(QueryFreeDriverSlot());
+}
+
+/*
+====================
+Vehicle::EventQueryFreeTurretSlot
+====================
+*/
+void Vehicle::QueryFreeTurretSlot(Event *ev)
+{
+    ev->AddInteger(QueryFreeTurretSlot());
+}
+
+/*
+====================
+Vehicle::EventQueryPassengerSlotPosition
+====================
+*/
+void Vehicle::QueryPassengerSlotPosition(Event *ev)
+{
+    Vector vPos;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryPassengerSlotPosition(iSlot, vPos);
+    ev->AddVector(vPos);
+}
+
+/*
+====================
+Vehicle::EventQueryDriverSlotPosition
+====================
+*/
+void Vehicle::QueryDriverSlotPosition(Event *ev)
+{
+    Vector vPos;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryDriverSlotPosition(iSlot, vPos);
+    ev->AddVector(vPos);
+}
+
+/*
+====================
+Vehicle::EventQueryTurretSlotPosition
+====================
+*/
+void Vehicle::QueryTurretSlotPosition(Event *ev)
+{
+    Vector vPos;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryTurretSlotPosition(iSlot, vPos);
+    ev->AddVector(vPos);
+}
+
+/*
+====================
+Vehicle::EventQueryPassengerSlotAngles
+====================
+*/
+void Vehicle::QueryPassengerSlotAngles(Event *ev)
+{
+    Vector vAngles;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryPassengerSlotAngles(iSlot, vAngles);
+    ev->AddVector(vAngles);
+}
+
+/*
+====================
+Vehicle::EventQueryDriverSlotAngles
+====================
+*/
+void Vehicle::QueryDriverSlotAngles(Event *ev)
+{
+    Vector vAngles;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryDriverSlotAngles(iSlot, vAngles);
+    ev->AddVector(vAngles);
+}
+
+/*
+====================
+Vehicle::EventQueryTurretSlotAngles
+====================
+*/
+void Vehicle::QueryTurretSlotAngles(Event *ev)
+{
+    Vector vAngles;
+    int    iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    QueryTurretSlotAngles(iSlot, vAngles);
+    ev->AddVector(vAngles);
+}
+
+/*
+====================
+Vehicle::EventQueryPassengerSlotStatus
+====================
+*/
+void Vehicle::QueryPassengerSlotStatus(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddInteger(QueryPassengerSlotStatus(iSlot));
+}
+
+/*
+====================
+Vehicle::EventQueryDriverSlotStatus
+====================
+*/
+void Vehicle::QueryDriverSlotStatus(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddInteger(QueryDriverSlotStatus(iSlot));
+}
+
+/*
+====================
+Vehicle::EventQueryTurretSlotStatus
+====================
+*/
+void Vehicle::QueryTurretSlotStatus(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddInteger(QueryTurretSlotStatus(iSlot));
+}
+
+/*
+====================
+Vehicle::EventQueryPassengerSlotEntity
+====================
+*/
+void Vehicle::QueryPassengerSlotEntity(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddEntity(QueryPassengerSlotEntity(iSlot));
+}
+
+/*
+====================
+Vehicle::EventQueryDriverSlotEntity
+====================
+*/
+void Vehicle::QueryDriverSlotEntity(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddEntity(QueryDriverSlotEntity(iSlot));
+}
+
+/*
+====================
+Vehicle::EventQueryTurretSlotEntity
+====================
+*/
+void Vehicle::QueryTurretSlotEntity(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    ev->AddEntity(QueryTurretSlotEntity(iSlot));
+}
+
+/*
+====================
+Vehicle::EventAttachPassengerSlot
+====================
+*/
+void Vehicle::AttachPassengerSlot(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    AttachPassengerSlot(iSlot, ev->GetEntity(2), vec_zero);
+    UpdatePassengerSlot(iSlot);
+}
+
+/*
+====================
+Vehicle::EventAttachDriverSlot
+====================
+*/
+void Vehicle::AttachDriverSlot(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    AttachDriverSlot(0, ev->GetEntity(2), vec_zero);
+    UpdateDriverSlot(0);
+}
+
+/*
+====================
+Vehicle::EventAttachTurretSlot
+====================
+*/
+void Vehicle::AttachTurretSlot(Event *ev)
+{
+    int iSlot;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    AttachTurretSlot(iSlot, ev->GetEntity(2), vec_zero, NULL);
+    UpdateTurretSlot(iSlot);
+}
+
+/*
+====================
+Vehicle::EventDetachPassengerSlot
+====================
+*/
+void Vehicle::DetachPassengerSlot(Event *ev)
+{
+    int    iSlot;
+    Vector vExitPosition;
+    Vector vExitAngles;
+    bool   bHasExitAngles = false;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_PASSENGERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    if (ev->NumArgs() == 2) {
+        if (ev->IsVectorAt(2)) {
+            vExitPosition = ev->GetVector(2);
+        } else if (ev->IsEntityAt(2)) {
+            vExitPosition  = ev->GetEntity(2)->origin;
+            bHasExitAngles = true;
+        } else if (ev->IsSimpleEntityAt(2)) {
+            vExitPosition = ev->GetSimpleEntity(2)->origin;
+        }
+
+        DetachPassengerSlot(iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL);
+    } else {
+        DetachPassengerSlot(iSlot, vec_zero, NULL);
+    }
+}
+
+/*
+====================
+Vehicle::EventDetachDriverSlot
+====================
+*/
+void Vehicle::DetachDriverSlot(Event *ev)
+{
+    int    iSlot;
+    Vector vExitPosition;
+    Vector vExitAngles;
+    bool   bHasExitAngles = false;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_DRIVERS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    if (ev->NumArgs() == 2) {
+        if (ev->IsVectorAt(2)) {
+            vExitPosition = ev->GetVector(2);
+        } else if (ev->IsEntityAt(2)) {
+            vExitPosition  = ev->GetEntity(2)->origin;
+            bHasExitAngles = true;
+        } else if (ev->IsSimpleEntityAt(2)) {
+            vExitPosition = ev->GetSimpleEntity(2)->origin;
+        }
+
+        DetachDriverSlot(iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL);
+    } else {
+        DetachDriverSlot(iSlot, vec_zero, NULL);
+    }
+}
+
+/*
+====================
+Vehicle::EventDetachTurretSlot
+====================
+*/
+void Vehicle::DetachTurretSlot(Event *ev)
+{
+    int    iSlot;
+    Vector vExitPosition;
+    Vector vExitAngles;
+    bool   bHasExitAngles = false;
+
+    iSlot = ev->GetInteger(1);
+    if (iSlot >= MAX_TURRETS) {
+        ScriptError("Slot Specified is greater than maximum allowed for that parameter\n");
+    }
+
+    if (ev->NumArgs() == 2) {
+        if (ev->IsVectorAt(2)) {
+            vExitPosition = ev->GetVector(2);
+        } else if (ev->IsEntityAt(2)) {
+            vExitAngles    = ev->GetEntity(2)->angles;
+            bHasExitAngles = true;
+            vExitPosition  = ev->GetEntity(2)->origin;
+        } else if (ev->IsSimpleEntityAt(2)) {
+            vExitPosition = ev->GetSimpleEntity(2)->origin;
+        }
+    }
+
+    DetachTurretSlot(iSlot, vExitPosition, bHasExitAngles ? &vExitAngles : NULL);
 }
 
 /*
@@ -5787,12 +1994,9 @@ int Vehicle::QueryTurretSlotStatus
 Vehicle::QueryPassengerSlotEntity
 ====================
 */
-Entity *Vehicle::QueryPassengerSlotEntity
-	(
-	int slot
-	)
+Entity *Vehicle::QueryPassengerSlotEntity(int slot)
 {
-	return Passengers[ slot ].ent;
+    return Passengers[slot].ent;
 }
 
 /*
@@ -5800,12 +2004,9 @@ Entity *Vehicle::QueryPassengerSlotEntity
 Vehicle::QueryDriverSlotEntity
 ====================
 */
-Entity *Vehicle::QueryDriverSlotEntity
-	(
-	int slot
-	)
+Entity *Vehicle::QueryDriverSlotEntity(int slot)
 {
-	return driver.ent;
+    return driver.ent;
 }
 
 /*
@@ -5813,12 +2014,103 @@ Entity *Vehicle::QueryDriverSlotEntity
 Vehicle::QueryTurretSlotEntity
 ====================
 */
-Entity *Vehicle::QueryTurretSlotEntity
-	(
-	int slot
-	)
+Entity *Vehicle::QueryTurretSlotEntity(int slot)
 {
-	return Turrets[ slot ].ent;
+    return Turrets[slot].ent;
+}
+
+/*
+====================
+Vehicle::FindExitPosition
+====================
+*/
+bool Vehicle::FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector *vAngles)
+{
+    Event  *ev;
+    Vector  yawAngles;
+    Vector  forward;
+    Vector  offset;
+    float   radius;
+    int     i, j;
+    trace_t trace;
+
+    if (!pEnt) {
+        return false;
+    }
+
+    if ((g_target_game < target_game_e::TG_MOHTA || !pEnt->IsSubclassOfPlayer()) && vOrigin != vec_zero) {
+        if (vAngles) {
+            pEnt->setAngles(*vAngles);
+        }
+
+        pEnt->setOrigin(vOrigin);
+        pEnt->velocity = vec_zero;
+
+        ev = new Event(EV_Vehicle_Exit);
+        ev->AddEntity(this);
+        pEnt->ProcessEvent(ev);
+
+        return true;
+    }
+
+    radius = (pEnt->size.length() + size.length()) * 0.5;
+
+    for (i = 0; i < 128; i += 32) {
+        for (j = 0; j < 360; j += 30) {
+            yawAngles    = vec_zero;
+            yawAngles[1] = j + angles[1] + 180;
+            yawAngles.AngleVectorsLeft(&forward);
+
+            offset = origin + forward * radius;
+            offset[2] += i;
+
+            trace = G_Trace(
+                offset,
+                pEnt->mins,
+                pEnt->maxs,
+                offset,
+                NULL,
+                pEnt->edict->clipmask,
+                pEnt->IsSubclassOfPlayer() ? qtrue : qfalse,
+                " Vehicle::FindExitPosition"
+            );
+
+            if (!trace.startsolid && !trace.allsolid) {
+                Vector end;
+
+                offset = trace.endpos;
+                end    = offset;
+                end[2] -= 128;
+
+                trace = G_Trace(
+                    offset,
+                    pEnt->mins,
+                    pEnt->maxs,
+                    end,
+                    NULL,
+                    pEnt->edict->clipmask,
+                    pEnt->IsSubclassOfPlayer() ? qtrue : qfalse,
+                    " Vehicle::FindExitPosition"
+                );
+
+                if (!trace.startsolid && !trace.allsolid && trace.fraction < 1) {
+                    pEnt->setOrigin(trace.endpos);
+                    pEnt->velocity = vec_zero;
+
+                    if (vAngles) {
+                        pEnt->setAngles(*vAngles);
+                    }
+
+                    ev = new Event(EV_Vehicle_Exit);
+                    ev->AddEntity(this);
+                    pEnt->ProcessEvent(ev);
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
 }
 
 /*
@@ -5826,43 +2118,34 @@ Entity *Vehicle::QueryTurretSlotEntity
 Vehicle::AttachPassengerSlot
 ====================
 */
-void Vehicle::AttachPassengerSlot
-	(
-	int slot,
-	Entity *ent,
-	Vector vExitPosition
-	)
+void Vehicle::AttachPassengerSlot(int slot, Entity *ent, Vector vExitPosition)
 {
-	Entity *passenger;
-	str sName;
+    Entity *passenger;
+    str     sName;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!ent) {
+        return;
+    }
 
-	passenger = Passengers[ slot ].ent;
-	if( !passenger )
-	{
-		Passengers[ slot ].ent = ent;
-		Passengers[ slot ].flags = SLOT_BUSY;
+    passenger = Passengers[slot].ent;
+    if (!passenger) {
+        Passengers[slot].ent   = ent;
+        Passengers[slot].flags = SLOT_BUSY;
 
-		sName = m_sSoundSet + "snd_doorclose";
-		Sound( sName );
+        sName = m_sSoundSet + "snd_doorclose";
+        Sound(sName);
 
-		Event *event = new Event( EV_Vehicle_Enter );
-		event->AddEntity( this );
-		driver.ent->ProcessEvent( event );
+        Event *event = new Event(EV_Vehicle_Enter);
+        event->AddEntity(this);
+        Passengers[slot].ent->ProcessEvent(event);
 
-		offset = ent->origin - origin;
+        offset = ent->origin - origin;
 
-		flags |= FL_POSTTHINK;
-		SetDriverAngles( seatangles + angles );
-	}
-	else if( !isLocked() && ent == passenger )
-	{
-		DetachPassengerSlot( slot, vec_zero, NULL );
-	}
+        flags |= FL_POSTTHINK;
+        SetDriverAngles(seatangles + angles);
+    } else if (!isLocked() && ent == passenger) {
+        DetachPassengerSlot(slot, vec_zero, NULL);
+    }
 }
 
 /*
@@ -5870,47 +2153,39 @@ void Vehicle::AttachPassengerSlot
 Vehicle::AttachDriverSlot
 ====================
 */
-void Vehicle::AttachDriverSlot
-	(
-	int slot,
-	Entity *ent,
-	Vector vExitPosition
-	)
+void Vehicle::AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition)
 {
-	Entity *d;
-	str sName;
+    Entity *d;
+    str     sName;
 
-	if( !ent || !ent->IsSubclassOfSentient() )
-	{
-		return;
-	}
+    if (!ent || !ent->IsSubclassOfSentient()) {
+        return;
+    }
 
-	d = Driver();
-	if( !d )
-	{
-		driver.ent = ent;
-		driver.flags = SLOT_BUSY;
-		lastdriver.ent = driver.ent;
+    d = Driver();
+    if (!d) {
+        driver.ent     = ent;
+        driver.flags   = SLOT_BUSY;
+        lastdriver.ent = driver.ent;
 
-		sName = m_sSoundSet + "snd_doorclose";
-		Sound( sName );
+        sName = m_sSoundSet + "snd_doorclose";
+        Sound(sName);
 
-		sName = m_sSoundSet + "snd_start";
-		Sound( sName );
+        sName = m_sSoundSet + "snd_start";
+        Sound(sName);
 
-		Event *event = new Event( EV_Vehicle_Enter );
-		event->AddEntity( this );
-		driver.ent->ProcessEvent( event );
+        Event *event = new Event(EV_Vehicle_Enter);
+        event->AddEntity(this);
+        driver.ent->ProcessEvent(event);
 
-		offset = ent->origin - origin;
+        offset = ent->origin - origin;
 
-		flags |= FL_POSTTHINK;
-		SetDriverAngles( seatangles + angles );
-	}
-	else if( !isLocked() && ent == d )
-	{
-		DetachDriverSlot( slot, vec_zero, NULL );
-	}
+        flags |= FL_POSTTHINK;
+        SetDriverAngles(seatangles + angles);
+        DriverAdded();
+    } else if (ent == d && !isLocked()) {
+        DetachDriverSlot(slot, vec_zero, NULL);
+    }
 }
 
 /*
@@ -5920,198 +2195,85 @@ Vehicle::AttachTurretSlot
 Attach a turret or a sentient that will use the turret to the vehicle.
 ====================
 */
-void Vehicle::AttachTurretSlot
-	(
-	int slot,
-	Entity *ent,
-	Vector vExitPosition,
-	Vector *vExitAngles
-	)
+void Vehicle::AttachTurretSlot(int slot, Entity *ent, Vector vExitPosition, Vector *vExitAngles)
 {
-	TurretGun *pTurret;
-	VehicleTurretGun *pVehicleTurret;
-	str sName;
+    TurretGun        *pTurret;
+    VehicleTurretGun *pVehicleTurret;
+    str               sName;
 
-	if( !ent )
-	{
-		return;
-	}
+    if (!ent) {
+        return;
+    }
 
-	pTurret = ( TurretGun * )Turrets[ slot ].ent.Pointer();
-	if( pTurret && ent->IsSubclassOfWeapon() )
-	{
-		if( !isLocked() )
-			DetachTurretSlot( slot, vec_zero, NULL );
-	}
-	else
-	{
-		if( ent->IsSubclassOfWeapon() )
-		{
-			Turrets[ slot ].ent = ent;
-			Turrets[ slot ].flags = SLOT_BUSY;
+    pTurret = (TurretGun *)Turrets[slot].ent.Pointer();
+    if (pTurret && ent->IsSubclassOfWeapon()) {
+        if (ent == pTurret && !isLocked()) {
+            DetachTurretSlot(slot, vec_zero, NULL);
+        }
+    } else if (ent->IsSubclassOfWeapon()) {
+        Turrets[slot].ent   = ent;
+        Turrets[slot].flags = SLOT_BUSY;
 
-			pTurret = ( TurretGun * )ent;
+        pTurret = (TurretGun *)ent;
 
-			ent->takedamage = DAMAGE_NO;
-			ent->setSolidType( SOLID_NOT );
+        ent->takedamage = DAMAGE_NO;
+        ent->setSolidType(SOLID_NOT);
 
-			Event *event = new Event( EV_Vehicle_Enter );
-			event->AddEntity( this );
-			Turrets[ slot ].ent->ProcessEvent( event );
+        Event *event = new Event(EV_Vehicle_Enter);
+        event->AddEntity(this);
+        Turrets[slot].ent->ProcessEvent(event);
 
-			offset = ent->origin - origin;
+        offset = ent->origin - origin;
 
-			flags |= FL_POSTTHINK;
-			Turrets[ slot ].ent->setAngles( angles );
+        flags |= FL_POSTTHINK;
+        Turrets[slot].ent->setAngles(angles);
 
-			if( pTurret->IsSubclassOfTurretGun() )
-			{
-				pTurret->m_bUsable = false;
-				pTurret->m_bRestable = false;
-			}
-		}
-		else if( pTurret )
-		{
-			Entity *pTurretOwner = NULL;
-			Entity *pRemoteTurretOwner = NULL;
+        if (pTurret->IsSubclassOfTurretGun()) {
+            pTurret->m_bUsable   = false;
+            pTurret->m_bRestable = false;
+        }
+    } else if (pTurret) {
+        Entity *pTurretOwner       = NULL;
+        Entity *pRemoteTurretOwner = NULL;
 
-			if( pTurret->IsSubclassOfTurretGun() )
-			{
-				pTurretOwner = pTurret->GetOwner();
-			}
+        if (pTurret->IsSubclassOfTurretGun()) {
+            pTurretOwner = pTurret->GetOwner();
+        }
 
-			if( pTurret->IsSubclassOfVehicleTurretGun() )
-			{
-				pVehicleTurret = ( VehicleTurretGun * )pTurret;
-				pRemoteTurretOwner = pVehicleTurret->GetRemoteOwner();
-			}
+        if (pTurret->IsSubclassOfVehicleTurretGun()) {
+            pVehicleTurret     = (VehicleTurretGun *)pTurret;
+            pRemoteTurretOwner = pVehicleTurret->GetRawRemoteOwner();
+        }
 
-			if( pTurret->IsSubclassOfTurretGun() )
-			{
-				if( pTurret->IsSubclassOfVehicleTurretGun() && pVehicleTurret->isLocked() )
-				{
-					ScriptError( "Turret is locked, cannot attach to turret slot." );
-				}
+        if (pTurret->IsSubclassOfTurretGun()) {
+            if (pTurret->IsSubclassOfVehicleTurretGun() && pVehicleTurret->isLocked()) {
+                ScriptError("Turret is locked, cannot attach to turret slot.");
+            }
 
-				pTurret->m_bUsable = true;
-			}
+            pTurret->m_bUsable = true;
+        }
 
-			Event *event = new Event( EV_Use );
-			event->AddEntity( ent );
-			pTurret->ProcessEvent( event );
+        Event *event = new Event(EV_Use);
+        event->AddEntity(ent);
+        pTurret->ProcessEvent(event);
 
-			if( ent->IsSubclassOfPlayer() )
-			{
-				Player *pPlayer = ( Player * )ent;
-				pPlayer->m_pVehicle = this;
-			}
+        if (ent->IsSubclassOfPlayer()) {
+            Player *pPlayer     = (Player *)ent;
+            pPlayer->m_pVehicle = this;
+        }
 
-			if( pTurret->IsSubclassOfTurretGun() )
-			{
-				pTurret->m_bUsable = false;
-			}
+        if (pTurret->IsSubclassOfTurretGun()) {
+            pTurret->m_bUsable = false;
+        }
 
-			if( pTurretOwner == ent || pRemoteTurretOwner == ent )
-			{
-				if( pRemoteTurretOwner )
-				{
-					pVehicleTurret->SetRemoteOwner( NULL );
-				}
+        if (pTurretOwner == ent || pRemoteTurretOwner == ent) {
+            if (pRemoteTurretOwner) {
+                pVehicleTurret->SetRemoteOwner(NULL);
+            }
 
-				if( vExitPosition != vec_zero )
-				{
-					Vector pos;
-					trace_t trace;
-
-					pos = vExitPosition;
-
-					trace = G_Trace(
-						pos,
-						ent->mins,
-						ent->maxs,
-						pos,
-						NULL,
-						edict->clipmask,
-						false,
-						"Vehicle::AttachTurretSlot" );
-
-					if( !trace.allsolid && !trace.startsolid )
-					{
-						trace = G_Trace(
-							pos,
-							ent->mins,
-							ent->maxs,
-							pos - Vector( 0, 0, 128 ),
-							NULL,
-							edict->clipmask,
-							false,
-							"Vehicle::AttachTurretSlot" );
-
-						if( trace.fraction < 1.0f )
-						{
-							if( vExitAngles )
-							{
-								ent->setAngles( *vExitAngles );
-							}
-
-							ent->setOrigin( trace.endpos );
-							velocity = vec_zero;
-
-							Event *event = new Event( EV_Vehicle_Exit );
-							event->AddEntity( this );
-							ent->ProcessEvent( event );
-						}
-					}
-				}
-				else
-				{
-					int height;
-					int ang;
-					Vector angles;
-					Vector forward;
-					Vector pos;
-					float ofs;
-					trace_t trace;
-
-					if( locked )
-						return;
-
-					//
-					// place the turret on the ground
-					//
-					ofs = size.length() * 0.5f;
-					for( height = 0; height < 100; height += 16 )
-					{
-						for( ang = 0; ang < 360; ang += 30 )
-						{
-							angles[ 1 ] = ent->angles[ 1 ] + ang + 90;
-							angles.AngleVectors( &forward, NULL, NULL );
-							pos = origin + ( forward * ofs );
-							pos[ 2 ] += height;
-							trace = G_Trace( pos, ent->mins, ent->maxs, pos, NULL, MASK_PLAYERSOLID, false, "Vehicle::AttachTurretSlot" );
-							if( !trace.startsolid && !trace.allsolid )
-							{
-								Vector end;
-
-								end = pos;
-								end[ 2 ] -= 128;
-								trace = G_Trace( pos, ent->mins, ent->maxs, end, NULL, MASK_PLAYERSOLID, false, "Vehicle::AttachTurretSlot" );
-								if( trace.fraction < 1.0f )
-								{
-									ent->setOrigin( vExitPosition );
-									ent->velocity = vec_zero;
-
-									Event *ev = new Event( EV_Vehicle_Exit );
-									ev->AddEntity( this );
-									ent->ProcessEvent( ev );
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+            FindExitPosition(ent, vExitPosition, vExitAngles);
+        }
+    }
 }
 
 /*
@@ -6119,85 +2281,22 @@ void Vehicle::AttachTurretSlot
 Vehicle::DetachPassengerSlot
 ====================
 */
-void Vehicle::DetachPassengerSlot
-	(
-	int slot,
-	Vector vExitPosition,
-	Vector *vExitAngles
-	)
+void Vehicle::DetachPassengerSlot(int slot, Vector vExitPosition, Vector *vExitAngles)
 {
-	Entity *passenger = Passengers[ slot ].ent;
+    Entity *passenger = Passengers[slot].ent;
 
-	if( !passenger )
-	{
-		return;
-	}
+    if (!passenger) {
+        return;
+    }
 
-	if( vExitPosition == vec_zero )
-	{
-		int height;
-		int ang;
-		Vector angles;
-		Vector forward;
-		Vector pos;
-		float ofs;
-		trace_t trace;
+    if (!FindExitPosition(passenger, vExitPosition, vExitAngles)) {
+        // cannot exit
+        return;
+    }
 
-		if( locked )
-			return;
-
-		//
-		// place the passenger on the ground
-		//
-		ofs = size.length() * 0.5f;
-		for( height = 0; height < 100; height += 16 )
-		{
-			for( ang = 0; ang < 360; ang += 30 )
-			{
-				angles[ 1 ] = passenger->angles[ 1 ] + ang + 90;
-				angles.AngleVectors( &forward, NULL, NULL );
-				pos = origin + ( forward * ofs );
-				pos[ 2 ] += height;
-				trace = G_Trace( pos, passenger->mins, passenger->maxs, pos, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachPassengerSlot" );
-				if( !trace.startsolid && !trace.allsolid )
-				{
-					Vector end;
-
-					end = pos;
-					end[ 2 ] -= 128;
-					trace = G_Trace( pos, passenger->mins, passenger->maxs, end, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachPassengerSlot" );
-					if( trace.fraction < 1.0f )
-					{
-						passenger->setOrigin( pos );
-						passenger->velocity = vec_zero;
-
-						Event *ev = new Event( EV_Vehicle_Exit );
-						ev->AddEntity( this );
-						passenger->ProcessEvent( ev );
-
-						Sound( m_sSoundSet + "snd_dooropen" );
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		if( vExitAngles )
-		{
-			passenger->setAngles( *vExitAngles );
-		}
-
-		passenger->setOrigin( vExitPosition );
-		passenger->velocity = vec_zero;
-
-		Event *ev = new Event( EV_Vehicle_Exit );
-		ev->AddEntity( this );
-		passenger->ProcessEvent( ev );
-	}
-
-	Passengers[ slot ].ent = NULL;
-	Passengers[ slot ].flags = SLOT_FREE;
+    Sound(m_sSoundSet + "snd_dooropen");
+    Passengers[slot].ent   = NULL;
+    Passengers[slot].flags = SLOT_FREE;
 }
 
 /*
@@ -6205,103 +2304,32 @@ void Vehicle::DetachPassengerSlot
 Vehicle::DetachDriverSlot
 ====================
 */
-void Vehicle::DetachDriverSlot
-	(
-	int slot,
-	Vector vExitPosition,
-	Vector *vExitAngles
-	)
+void Vehicle::DetachDriverSlot(int slot, Vector vExitPosition, Vector *vExitAngles)
 {
-	Entity *other = driver.ent;
+    Entity *other = driver.ent;
 
-	if( !other )
-	{
-		return;
-	}
+    if (!other) {
+        return;
+    }
 
-	if( vExitPosition == vec_zero )
-	{
-		int height;
-		int ang;
-		Vector angles;
-		Vector forward;
-		Vector pos;
-		float ofs;
-		trace_t trace;
+    if (!FindExitPosition(other, vExitPosition, vExitAngles)) {
+        // cannot exit
+        return;
+    }
 
-		if( other != driver.ent )
-		{
-			return;
-		}
+    turnimpulse = 0;
+    moveimpulse = 0;
+    jumpimpulse = 0;
 
-		if( locked )
-			return;
+    if (drivable) {
+        StopLoopSound();
+        Sound("snd_dooropen", CHAN_BODY);
+        Sound("snd_stop", CHAN_VOICE);
+        driver.ent->setSolidType(SOLID_BBOX);
+    }
 
-		//
-		// place the driver.ent on the ground
-		//
-		ofs = size.length() * 0.5f;
-		for( height = 0; height < 100; height += 16 )
-		{
-			for( ang = 0; ang < 360; ang += 30 )
-			{
-				angles[ 1 ] = driver.ent->angles[ 1 ] + ang + 90;
-				angles.AngleVectors( &forward, NULL, NULL );
-				pos = origin + ( forward * ofs );
-				pos[ 2 ] += height;
-				trace = G_Trace( pos, driver.ent->mins, driver.ent->maxs, pos, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachDriverSlot" );
-				if( !trace.startsolid && !trace.allsolid )
-				{
-					Vector end;
-
-					end = pos;
-					end[ 2 ] -= 128;
-					trace = G_Trace( pos, driver.ent->mins, driver.ent->maxs, end, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachDriverSlot" );
-					if( trace.fraction < 1.0f )
-					{
-						driver.ent->setOrigin( pos );
-
-						turnimpulse = 0;
-						moveimpulse = 0;
-						jumpimpulse = 0;
-
-						Event *event = new Event( EV_Vehicle_Exit );
-						event->AddEntity( this );
-						driver.ent->ProcessEvent( event );
-						if( hasweapon )
-						{
-							Player *player = ( Player * )driver.ent.Pointer();
-							player->takeItem( weaponName.c_str() );
-						}
-						if( drivable )
-						{
-							StopLoopSound();
-							Sound( "snd_dooropen", CHAN_BODY );
-							Sound( "snd_stop", CHAN_VOICE );
-							driver.ent->setSolidType( SOLID_BBOX );
-						}
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		if( vExitAngles )
-		{
-			other->setAngles( *vExitAngles );
-		}
-
-		other->setOrigin( vExitPosition );
-		other->velocity = vec_zero;
-
-		Event *ev = new Event( EV_Vehicle_Exit );
-		ev->AddEntity( this );
-		other->ProcessEvent( ev );
-	}
-
-	driver.ent = NULL;
-	driver.flags = SLOT_FREE;
+    driver.ent   = NULL;
+    driver.flags = SLOT_FREE;
 }
 
 /*
@@ -6311,96 +2339,34 @@ Vehicle::DetachTurretSlot
 Detach a turret or a sentient.
 ====================
 */
-void Vehicle::DetachTurretSlot
-	(
-	int slot,
-	Vector vExitPosition,
-	Vector *vExitAngles
-	)
+void Vehicle::DetachTurretSlot(int slot, Vector vExitPosition, Vector *vExitAngles)
 {
-	Entity *passenger = Turrets[ slot ].ent;
+    Entity *passenger = Turrets[slot].ent;
 
-	if( !passenger )
-	{
-		return;
-	}
+    if (!passenger) {
+        return;
+    }
 
-	if( vExitPosition == vec_zero )
-	{
-		int height;
-		int ang;
-		Vector angles;
-		Vector forward;
-		Vector pos;
-		float ofs;
-		trace_t trace;
+    if (!FindExitPosition(passenger, vExitPosition, vExitAngles)) {
+        // cannot exit
+        return;
+    }
 
-		if( locked )
-			return;
+    turnimpulse = 0;
+    moveimpulse = 0;
+    jumpimpulse = 0;
+    passenger->setSolidType(SOLID_BBOX);
 
-		//
-		// place the turret on the ground
-		//
-		ofs = size.length() * 0.5f;
-		for( height = 0; height < 100; height += 16 )
-		{
-			for( ang = 0; ang < 360; ang += 30 )
-			{
-				angles[ 1 ] = passenger->angles[ 1 ] + ang + 90;
-				angles.AngleVectors( &forward, NULL, NULL );
-				pos = origin + ( forward * ofs );
-				pos[ 2 ] += height;
-				trace = G_Trace( pos, passenger->mins, passenger->maxs, pos, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachTurretSlot" );
-				if( !trace.startsolid && !trace.allsolid )
-				{
-					Vector end;
+    Sound(m_sSoundSet + "snd_dooropen");
 
-					end = pos;
-					end[ 2 ] -= 128;
-					trace = G_Trace( pos, passenger->mins, passenger->maxs, end, NULL, MASK_PLAYERSOLID, false, "Vehicle::DetachTurretSlot" );
-					if( trace.fraction < 1.0f )
-					{
-						passenger->setOrigin( pos );
-						passenger->velocity = vec_zero;
+    if (passenger->IsSubclassOfTurretGun()) {
+        TurretGun *pTurret   = static_cast<TurretGun *>(passenger);
+        pTurret->m_bUsable   = true;
+        pTurret->m_bRestable = true;
+    }
 
-						turnimpulse = 0;
-						moveimpulse = 0;
-						jumpimpulse = 0;
-
-						Event *ev = new Event( EV_Vehicle_Exit );
-						ev->AddEntity( this );
-						passenger->ProcessEvent( ev );
-
-						Sound( m_sSoundSet + "snd_dooropen" );
-
-						TurretGun *pTurret = ( TurretGun * )passenger;
-						if( pTurret->IsSubclassOfTurretGun() )
-						{
-							pTurret->m_bUsable = true;
-							pTurret->m_bRestable = true;
-						}
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		if( vExitAngles )
-		{
-			passenger->setAngles( *vExitAngles );
-		}
-
-		passenger->setOrigin( vExitPosition );
-		passenger->velocity = vec_zero;
-
-		Event *ev = new Event( EV_Vehicle_Exit );
-		ev->AddEntity( this );
-		passenger->ProcessEvent( ev );
-	}
-
-	Turrets[ slot ].ent = NULL;
-	Turrets[ slot ].flags = SLOT_FREE;
+    Turrets[slot].ent   = NULL;
+    Turrets[slot].flags = SLOT_FREE;
 }
 
 /*
@@ -6408,20 +2374,15 @@ void Vehicle::DetachTurretSlot
 Vehicle::FindPassengerSlotByEntity
 ====================
 */
-int Vehicle::FindPassengerSlotByEntity
-	(
-	Entity *ent
-	)
+int Vehicle::FindPassengerSlotByEntity(Entity *ent)
 {
-	for( int i = 0; i < MAX_PASSENGERS; i++ )
-	{
-		if( Passengers[ i ].ent == ent )
-		{
-			return i;
-		}
-	}
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        if (Passengers[i].ent == ent) {
+            return i;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -6429,12 +2390,9 @@ int Vehicle::FindPassengerSlotByEntity
 Vehicle::FindDriverSlotByEntity
 ====================
 */
-int Vehicle::FindDriverSlotByEntity
-	(
-	Entity *ent
-	)
+int Vehicle::FindDriverSlotByEntity(Entity *ent)
 {
-	return driver.ent == ent ? 0 : -1;
+    return driver.ent == ent ? 0 : -1;
 }
 
 /*
@@ -6442,106 +2400,57 @@ int Vehicle::FindDriverSlotByEntity
 Vehicle::FindTurretSlotByEntity
 ====================
 */
-int Vehicle::FindTurretSlotByEntity
-	(
-	Entity *ent
-	)
+int Vehicle::FindTurretSlotByEntity(Entity *ent)
 {
-	for( int i = 0; i < MAX_TURRETS; i++ )
-	{
-		if( Turrets[ i ].ent == ent )
-		{
-			return i;
-		}
-	}
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        if (Turrets[i].ent == ent) {
+            return i;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
 ====================
-Vehicle::SetSlotsNonSolid
+Vehicle::Drivable
 ====================
 */
-void Vehicle::SetSlotsNonSolid
-	(
-	void
-	)
+void Vehicle::Drivable(Event *ev)
 {
-	for( int i = 0; i < MAX_PASSENGERS; i++ )
-	{
-		Passengers[ i ].NotSolid();
-	}
-
-	for( int i = 0; i < MAX_TURRETS; i++ )
-	{
-		Turrets[ i ].NotSolid();
-	}
-
-	driver.NotSolid();
-
-	if( m_pCollisionEntity )
-	{
-		m_pCollisionEntity->NotSolid();
-	}
+    setMoveType(MOVETYPE_VEHICLE);
+    drivable = true;
 }
 
 /*
 ====================
-Vehicle::SetSlotsSolid
+Vehicle::PathDrivable
 ====================
 */
-void Vehicle::SetSlotsSolid
-	(
-	void
-	)
+void Vehicle::PathDrivable(Event *ev)
 {
-	for( int i = 0; i < MAX_PASSENGERS; i++ )
-	{
-		Passengers[ i ].Solid();
-	}
-
-	for( int i = 0; i < MAX_TURRETS; i++ )
-	{
-		Turrets[ i ].Solid();
-	}
-
-	driver.Solid();
-
-	if( m_pCollisionEntity )
-	{
-		m_pCollisionEntity->Solid();
-	}
+    pathDrivable = ev->GetBoolean(1);
 }
 
 /*
 ====================
-Vehicle::KickSuspension
+Vehicle::UnDrivable
 ====================
 */
-void Vehicle::KickSuspension
-	(
-	Vector vDirection,
-	float fForce
-	)
+void Vehicle::UnDrivable(Event *ev)
 {
-	VectorNormalizeFast( vDirection );
-
-	m_fForwardForce += DotProduct( vDirection, orientation[ 1 ] ) * fForce;
-	m_fLeftForce += DotProduct( vDirection, orientation[ 0 ] ) * fForce;
+    setMoveType(MOVETYPE_PUSH);
+    drivable = false;
 }
 
 /*
 ====================
-Vehicle::isLocked
+Vehicle::Jumpable
 ====================
 */
-qboolean Vehicle::isLocked
-	(
-	void
-	)
+void Vehicle::Jumpable(Event *ev)
 {
-	return locked;
+    jumpable = true;
 }
 
 /*
@@ -6549,12 +2458,9 @@ qboolean Vehicle::isLocked
 Vehicle::Lock
 ====================
 */
-void Vehicle::Lock
-	(
-	void
-	)
+void Vehicle::Lock(Event *ev)
 {
-	locked = true;
+    Lock();
 }
 
 /*
@@ -6562,12 +2468,4417 @@ void Vehicle::Lock
 Vehicle::UnLock
 ====================
 */
-void Vehicle::UnLock
-	(
-	void
-	)
+void Vehicle::UnLock(Event *ev)
 {
-	locked = false;
+    UnLock();
+}
+
+/*
+====================
+Vehicle::SteerInPlace
+====================
+*/
+void Vehicle::SteerInPlace(Event *ev)
+{
+    steerinplace = true;
+}
+
+/*
+====================
+Vehicle::SeatAnglesOffset
+====================
+*/
+void Vehicle::SeatAnglesOffset(Event *ev)
+{
+    seatangles = ev->GetVector(1);
+}
+
+/*
+====================
+Vehicle::SeatOffset
+====================
+*/
+void Vehicle::SeatOffset(Event *ev)
+{
+    seatoffset = ev->GetVector(1);
+}
+
+/*
+====================
+Vehicle::SetWeapon
+====================
+*/
+void Vehicle::SetWeapon(Event *ev)
+{
+    showweapon = true;
+    hasweapon  = true;
+    weaponName = ev->GetString(1);
+}
+
+/*
+====================
+Vehicle::SetName
+====================
+*/
+void Vehicle::SetName(Event *ev)
+{
+    vehicleName = ev->GetString(1);
+}
+
+/*
+====================
+Vehicle::ShowWeaponEvent
+====================
+*/
+void Vehicle::ShowWeaponEvent(Event *ev)
+{
+    showweapon = true;
+}
+
+/*
+====================
+Vehicle::HasWeapon
+====================
+*/
+qboolean Vehicle::HasWeapon(void)
+{
+    return hasweapon;
+}
+
+/*
+====================
+Vehicle::ShowWeapon
+====================
+*/
+qboolean Vehicle::ShowWeapon(void)
+{
+    return showweapon;
+}
+
+/*
+====================
+Vehicle::SetDriverAngles
+====================
+*/
+void Vehicle::SetDriverAngles(Vector angles)
+{
+    int i;
+
+    if (!driver.ent || !driver.ent->client) {
+        return;
+    }
+
+    for (i = 0; i < 3; i++) {
+        driver.ent->client->ps.delta_angles[i] = ANGLE2SHORT(angles[i] - driver.ent->client->cmd_angles[i]);
+    }
+}
+
+/*
+====================
+Vehicle::Driver
+====================
+*/
+Entity *Vehicle::Driver(void)
+{
+    return driver.ent;
+}
+
+/*
+====================
+Vehicle::IsDrivable
+====================
+*/
+qboolean Vehicle::IsDrivable(void)
+{
+    return drivable;
+}
+
+/*
+====================
+Vehicle::BounceForwardsVelocity
+====================
+*/
+void Vehicle::BounceForwardsVelocity(Event *ev)
+{
+    if (m_bBounceBackwards) {
+        m_bBounceStayFullSpeed = false;
+        m_bBounceBackwards     = false;
+        currentspeed           = -currentspeed;
+        moveimpulse            = -moveimpulse;
+    }
+}
+
+/*
+====================
+Vehicle::BounceBackwardsVelocity
+====================
+*/
+void Vehicle::BounceBackwardsVelocity(Event *ev)
+{
+    if (!m_bBounceBackwards) {
+        m_bBounceBackwards = true;
+        currentspeed       = -currentspeed;
+        moveimpulse        = -moveimpulse;
+        if (ev->NumArgs() > 0) {
+            m_bBounceStayFullSpeed = ev->GetBoolean(1);
+        }
+    }
+}
+
+/*
+====================
+Vehicle::StopForwardsVelocity
+====================
+*/
+void Vehicle::StopForwardsVelocity(Event *ev)
+{
+    if (!m_bBounceBackwards) {
+        moveimpulse = 0;
+    }
+}
+
+/*
+====================
+Vehicle::StopBackwardsVelocity
+====================
+*/
+void Vehicle::StopBackwardsVelocity(Event *ev)
+{
+    if (m_bBounceBackwards) {
+        moveimpulse = 0;
+    }
+}
+
+/*
+====================
+Vehicle::EventSetSpeed
+====================
+*/
+void Vehicle::SetSpeed(Event *ev)
+{
+    speed = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::EventSetTurnRate
+====================
+*/
+void Vehicle::SetTurnRate(Event *ev)
+{
+    maxturnrate = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::SetMass
+====================
+*/
+void Vehicle::SetMass(Event *ev)
+{
+    m_fMass      = ev->GetFloat(1);
+    m_fFrontMass = m_fMass * 0.5;
+    m_fBackMass  = m_fMass * 0.5;
+}
+
+/*
+====================
+Vehicle::SetFrontMass
+====================
+*/
+void Vehicle::SetFrontMass(Event *ev)
+{
+    m_fFrontMass = ev->GetFloat(1);
+    m_fMass      = m_fFrontMass + m_fBackMass;
+}
+
+/*
+====================
+Vehicle::SetBackMass
+====================
+*/
+void Vehicle::SetBackMass(Event *ev)
+{
+    m_fBackMass = ev->GetFloat(1);
+    m_fMass     = m_fFrontMass + m_fBackMass;
+}
+
+/*
+====================
+Vehicle::SetTread
+====================
+*/
+void Vehicle::SetTread(Event *ev)
+{
+    m_fTread = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::SetTireRadius
+====================
+*/
+void Vehicle::SetTireRadius(Event *ev)
+{
+    m_fTireRadius = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::SetRollingResistance
+====================
+*/
+void Vehicle::SetRollingResistance(Event *ev)
+{
+    m_fRollingResistance = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::SetDrag
+====================
+*/
+void Vehicle::SetDrag(Event *ev)
+{
+    m_fDrag = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::BouncyCoef
+====================
+*/
+void Vehicle::BouncyCoef(Event *ev)
+{
+    m_fBouncyCoef = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::SpringyCoef
+====================
+*/
+void Vehicle::SpringyCoef(Event *ev)
+{
+    m_fSpringyCoef = ev->GetFloat(1);
+}
+
+/*
+====================
+Vehicle::YawMinMax
+====================
+*/
+void Vehicle::YawMinMax(Event *ev)
+{
+    if (ev->NumArgs() != 3) {
+        ScriptError("No Parameter for YawMinMax");
+    }
+
+    m_fYawMin  = ev->GetFloat(1);
+    m_fYawMax  = ev->GetFloat(2);
+    m_fYawCoef = ev->GetFloat(3);
+
+    if (m_fYawMin > m_fYawMax) {
+        ScriptError("Mismatched mins and maxs for YawMinMax");
+    }
+}
+
+/*
+====================
+Vehicle::RollMinMax
+====================
+*/
+void Vehicle::RollMinMax(Event *ev)
+{
+    if (ev->NumArgs() != 3) {
+        ScriptError("No Parameter for RollMinMax");
+    }
+
+    m_fRollMin  = ev->GetFloat(1);
+    m_fRollMax  = ev->GetFloat(2);
+    m_fRollCoef = ev->GetFloat(3);
+
+    if (m_fRollMin > m_fRollMax) {
+        ScriptError("Mismatched mins and maxs for RollMinMax");
+    }
+}
+
+/*
+====================
+Vehicle::ZMinMax
+====================
+*/
+void Vehicle::ZMinMax(Event *ev)
+{
+    if (ev->NumArgs() != 3) {
+        ScriptError("No Parameter for ZMinMax");
+    }
+
+    m_fZMin  = ev->GetFloat(1);
+    m_fZMax  = ev->GetFloat(2);
+    m_fZCoef = ev->GetFloat(3);
+
+    if (m_fZMin > m_fZMax) {
+        ScriptError("Mismatched mins and maxs for ZMinMax");
+    }
+}
+
+/*
+====================
+Vehicle::SetAnimationSet
+====================
+*/
+void Vehicle::SetAnimationSet(Event *ev)
+{
+    m_sAnimationSet = ev->GetString(1);
+}
+
+/*
+====================
+Vehicle::SetSoundSet
+====================
+*/
+void Vehicle::SetSoundSet(Event *ev)
+{
+    m_sSoundSet = ev->GetString(1);
+}
+
+/*
+====================
+Vehicle::GetTagPositionAndOrientation
+====================
+*/
+qboolean Vehicle::GetTagPositionAndOrientation(int tagnum, orientation_t *new_or)
+{
+    int           i;
+    orientation_t tag_or;
+    float         axis[3][3];
+
+    GetRawTag(tagnum, &tag_or);
+
+    AnglesToAxis(angles, axis);
+
+    VectorCopy(origin, new_or->origin);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(new_or->origin, tag_or.origin[i], tag_or.axis[i], new_or->origin);
+    }
+
+    MatrixMultiply(tag_or.axis, axis, new_or->axis);
+    return true;
+}
+
+/*
+====================
+Vehicle::GetTagPositionAndOrientation
+====================
+*/
+qboolean Vehicle::GetTagPositionAndOrientation(str tagname, orientation_t *new_or)
+{
+    int tagnum = gi.Tag_NumForName(edict->tiki, tagname.c_str());
+
+    if (tagnum < 0) {
+        warning("Vehicle::GetTagPositionAndOrientation", "Could not find tag \"%s\"", tagname.c_str());
+        return false;
+    } else {
+        return GetTagPositionAndOrientation(tagnum, new_or);
+    }
+}
+
+/*
+====================
+Vehicle::CheckWater
+====================
+*/
+void Vehicle::CheckWater(void)
+{
+    Vector       point;
+    int          cont;
+    int          sample1;
+    int          sample2;
+    VehicleBase *v;
+
+    unlink();
+    v = this;
+    while (v->vlink) {
+        v = v->vlink;
+        v->unlink();
+    }
+
+    if (driver.ent) {
+        driver.ent->unlink();
+    }
+
+    //
+    // get waterlevel
+    //
+    waterlevel = 0;
+    watertype  = 0;
+
+    sample2 = maxs[2] - mins[2];
+    sample1 = sample2 / 2;
+
+    point = origin;
+    point[2] += mins[2];
+    cont = gi.pointcontents(point, 0);
+
+    if (cont & MASK_WATER) {
+        watertype  = cont;
+        waterlevel = 1;
+        point[2]   = origin[2] + mins[2] + sample1;
+        cont       = gi.pointcontents(point, 0);
+        if (cont & MASK_WATER) {
+            waterlevel = 2;
+            point[2]   = origin[2] + mins[2] + sample2;
+            cont       = gi.pointcontents(point, 0);
+            if (cont & MASK_WATER) {
+                waterlevel = 3;
+            }
+        }
+    }
+
+    link();
+    v = this;
+    while (v->vlink) {
+        v = v->vlink;
+        v->link();
+    }
+
+    if (driver.ent) {
+        driver.ent->link();
+        driver.ent->waterlevel = waterlevel;
+        driver.ent->watertype  = watertype;
+    }
+}
+
+/*
+====================
+Vehicle::Drive
+====================
+*/
+qboolean Vehicle::Drive(usercmd_t *ucmd)
+{
+    Vector i, j, k;
+
+    i = velocity;
+    VectorNormalize(i);
+
+    if (!driver.ent || !driver.ent->isClient()) {
+        return false;
+    }
+
+    if (!drivable) {
+        driver.ent->client->ps.pm_flags |= PMF_FROZEN;
+        ucmd->forwardmove = 0;
+        ucmd->rightmove   = 0;
+        ucmd->upmove      = 0;
+        return false;
+    }
+
+    driver.ent->client->ps.pm_flags |= PMF_NO_PREDICTION;
+
+    moveimpulse  = ((float)ucmd->forwardmove) * (VectorLength(i) + 1.0);
+    m_bIsBraking = ucmd->forwardmove < 0;
+    m_fAccelerator += ((float)ucmd->forwardmove) * 0.005;
+    if (m_fAccelerator < 0.0) {
+        m_fAccelerator = 0.0;
+    } else if (m_fAccelerator > 1.0) {
+        m_fAccelerator = 1.0;
+    }
+
+    turnimpulse = ((float)-ucmd->rightmove);
+    jumpimpulse = ((float)ucmd->upmove * gravity) / 350;
+    if ((jumpimpulse < 0) || (!jumpable)) {
+        jumpimpulse = 0;
+    }
+
+    turnimpulse += angledist(SHORT2ANGLE(ucmd->angles[1]) - driver.ent->client->cmd_angles[1]) * 8;
+
+    return true;
+}
+
+/*
+====================
+Vehicle::PathDrive
+====================
+*/
+qboolean Vehicle::PathDrive(usercmd_t *ucmd)
+{
+    if (!pathDrivable) {
+        return false;
+    }
+
+    if (m_bAutoPilot) {
+        if (ucmd->forwardmove > 0) {
+            //
+            // forward speed
+            //
+            if (m_bBounceBackwards) {
+                m_fIdealSpeed = 0;
+                if (!currentspeed) {
+                    m_bBounceBackwards = false;
+                }
+            } else {
+                m_fIdealSpeed = m_fMaxSpeed;
+            }
+        } else if (ucmd->forwardmove < 0) {
+            //
+            // backward speed
+            //
+            if (m_bBounceBackwards) {
+                m_fIdealSpeed = -m_fMaxSpeed;
+            } else {
+                m_fIdealSpeed = 0;
+                if (!currentspeed) {
+                    m_bBounceBackwards = true;
+                }
+            }
+        } else {
+            //
+            // stopped
+            //
+            m_fIdealSpeed = 0;
+        }
+    }
+
+    return true;
+}
+
+/*
+====================
+Vehicle::AutoPilot
+====================
+*/
+void Vehicle::AutoPilot(void)
+{
+    Vector vAngles;
+    Vector vDeltaAngles, vDelta, vDeltaSave;
+    float *vTmp;
+    vec3_t vPrev, vCur, vTotal;
+    float  fTotal, fCoef;
+    Vector vWishPosition, vAlternateWishPosition;
+    float  fDistToCurPos, fCurPathPosition;
+
+    if (!m_pCurPath || m_pCurPath->m_iPoints == 0) {
+        m_bAutoPilot = false;
+        return;
+    }
+
+    if (g_showvehiclepath && g_showvehiclepath->integer) {
+        int    iFlags;
+        float  fBS;
+        Vector vTmp1;
+        Vector vTmp2;
+        Vector vBS;
+
+        iFlags = 0;
+        fBS    = sin(level.time) * 16;
+        vBS    = Vector(1, 1, 1) * fBS;
+
+        for (int i = 0; i < m_pCurPath->m_iPoints; i++) {
+            float  fZ = 0;
+            Vector vColor(0, 1, 1);
+
+            vTmp  = m_pCurPath->GetByNode(i, &iFlags);
+            vTmp1 = vTmp + 1;
+            fZ    = 0;
+
+            if (iFlags & 1) {
+                vColor = Vector(1, 1, 1);
+                fZ += 1;
+                G_DebugString(vTmp1 + Vector(0, 0, fZ * 32), sin(level.time) + 3, 1, 1, 0, "START_STOPPING");
+            }
+            if (iFlags & 2) {
+                vColor = Vector(0, 1, 1);
+                fZ += 1;
+                G_DebugString(vTmp1 + Vector(0, 0, fZ * 32), sin(level.time) + 3, 0, 1, 0, "START_SKIDDING");
+            }
+            if (iFlags & 4) {
+                fZ += 1;
+                G_DebugString(vTmp1 + Vector(0, 0, fZ * 32), sin(level.time) + 3, 0, 0, 1, "STOP_SKIDDING");
+            }
+
+            if (i == m_iCurNode) {
+                G_DebugBBox(vTmp1, vBS * -1, vBS, 1, 0, 0, 1);
+            } else {
+                G_DebugBBox(vTmp1, vBS * -1, vBS, vColor[0], vColor[1], vColor[2], 1);
+            }
+
+            vTmp  = m_pCurPath->GetByNode(i + 1, NULL);
+            vTmp2 = vTmp + 1;
+
+            G_DebugLine(vTmp1, vTmp2, 0, 1, 0, 1);
+        }
+    }
+
+    do {
+        if (m_iCurNode > 0) {
+            int iFlags;
+
+            vTmp = m_pCurPath->GetByNode(m_iCurNode, NULL);
+            VectorCopy(vTmp + 1, vCur);
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugString(vCur, 3, 1, 1, 1, "%f", vTmp[0]);
+            }
+
+            vTmp = m_pCurPath->GetByNode(m_iCurNode - 1, NULL);
+            VectorCopy(vTmp + 1, vPrev);
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugString(vPrev, 3, 1, 1, 1, "%f", vTmp[0]);
+            }
+
+            VectorSubtract(vCur, vPrev, vTotal);
+            fTotal      = VectorLength(vTotal);
+            m_vIdealDir = vTotal;
+
+            VectorNormalize(m_vIdealDir);
+            angles.AngleVectorsLeft(&vDelta, NULL, NULL);
+            fCoef = ProjectLineOnPlane(vDelta, DotProduct(origin, vDelta), vPrev, vCur, NULL);
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugBBox(vPrev, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
+                G_DebugBBox(vCur, Vector(-32, -32, -32), Vector(32, 32, 32), 1, 1, 0, 1);
+                G_DebugArrow(vCur, m_vIdealDir * -1, (1 - fCoef) * fTotal, 0, 1, 0, 1);
+                G_DebugArrow(vPrev, m_vIdealDir * 1, fCoef * fTotal, 0, 0, 1, 1);
+            }
+
+            vTmp             = m_pCurPath->GetByNode(m_iCurNode - (1.0 - fCoef), NULL);
+            fCurPathPosition = vTmp[0];
+            // Added in 2.30
+            //  Check if vehicle bounces backwards
+            if (m_bBounceBackwards) {
+                vTmp = m_pCurPath->Get(fCurPathPosition - m_fLookAhead, NULL);
+            } else {
+                vTmp = m_pCurPath->Get(fCurPathPosition + m_fLookAhead, NULL);
+            }
+            vWishPosition = vTmp + 1;
+            fDistToCurPos = Vector(origin[0] - vWishPosition[0], origin[1] - vWishPosition[1], 0).length();
+
+            // Added in 2.30
+            //  Check if vehicle bounces backwards
+            if (fCoef > 1 && !m_bBounceBackwards) {
+                m_iCurNode++;
+                if (m_iCurNode >= m_pCurPath->m_iPoints) {
+                    break;
+                }
+
+                m_pCurPath->GetByNode(m_iCurNode, &iFlags);
+                if (iFlags & 1) {
+                    ProcessEvent(EV_Vehicle_StopAtEnd);
+                }
+
+                if (iFlags & 2) {
+                    Event *event = new Event(EV_Vehicle_Skidding);
+                    event->AddInteger(1);
+                    ProcessEvent(event);
+                }
+
+                if (iFlags & 4) {
+                    Event *event = new Event(EV_Vehicle_Skidding);
+                    event->AddInteger(0);
+                    ProcessEvent(event);
+                }
+            } else if (fCoef < 0 && m_bBounceBackwards) {
+                m_iCurNode--;
+                if (m_iCurNode < 1) {
+                    m_iCurNode         = 1;
+                    m_bBounceBackwards = false;
+                    currentspeed       = -currentspeed;
+                    moveimpulse        = -moveimpulse;
+                }
+            }
+
+        cont:
+            if (m_pAlternatePath && m_pAlternatePath->m_iPoints) {
+                if (m_iAlternateNode > 1) {
+                    vTmp = m_pAlternatePath->GetByNode(m_iAlternateNode, NULL);
+                    VectorCopy(vTmp + 1, vCur);
+
+                    vTmp = m_pAlternatePath->GetByNode(m_iAlternateNode - 1, NULL);
+                    VectorCopy(vTmp + 1, vPrev);
+
+                    VectorSubtract(vCur, vPrev, vTotal);
+                    fTotal      = VectorLength(vTotal);
+                    m_vIdealDir = vTotal;
+
+                    VectorNormalize(m_vIdealDir);
+                    angles.AngleVectorsLeft(&vDelta, NULL, NULL);
+                    fCoef = ProjectLineOnPlane(vDelta, DotProduct(origin, vDelta), vPrev, vCur, NULL);
+
+                    vTmp = m_pCurPath->GetByNode(m_iAlternateNode - (1.0 - fCoef), NULL);
+                    // 2.30: bounce backward
+                    if (m_bBounceBackwards) {
+                        vTmp = m_pCurPath->Get(vTmp[0] - m_fLookAhead, NULL);
+                    } else {
+                        vTmp = m_pCurPath->Get(vTmp[0] + m_fLookAhead, NULL);
+                    }
+                    vAlternateWishPosition = vTmp + 1;
+
+                    if (fCoef > 1) {
+                        m_iAlternateNode++;
+                    } else if (fCoef < 0) {
+                        // 2.30: backward
+                        m_iAlternateNode--;
+                    }
+                } else {
+                    vTmp                   = m_pAlternatePath->GetByNode(m_iAlternateNode, NULL);
+                    vAlternateWishPosition = vTmp + 1;
+                    m_vIdealDir            = origin - vWishPosition;
+                    m_vIdealDir[2]         = 0;
+                    m_vIdealDir.normalize();
+
+                    vDelta    = vAlternateWishPosition - origin;
+                    vDelta[2] = 0;
+
+                    if (vDelta.length() <= m_fIdealDistance) {
+                        m_iAlternateNode++;
+                    }
+                }
+            }
+
+            vDelta = vWishPosition - origin;
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugLine(vWishPosition, origin, 1, 0, 0, 1);
+            }
+
+            vDeltaSave = vDelta;
+            vDelta.normalize();
+
+            if (m_pAlternatePath && m_pAlternatePath->m_iPoints) {
+                trace_t trace;
+
+                trace = G_Trace(
+                    origin, vec_zero, vec_zero, vWishPosition, this, edict->clipmask, qfalse, "Vehicle::AutoPilot"
+                );
+                if ((trace.fraction < 1 || trace.startsolid || trace.allsolid) && trace.ent
+                    && trace.entityNum != ENTITYNUM_WORLD) {
+                    vDelta     = vAlternateWishPosition - origin;
+                    vDeltaSave = vDelta;
+                    vDelta.normalize();
+                }
+            }
+
+            vDelta[2]     = 0;
+            vDeltaSave[2] = 0;
+
+            if (fDistToCurPos > 1) {
+                // Added 2.30: checks if it doesn't bounce backwards
+                if (moveimpulse >= 0 && !m_bBounceBackwards) {
+                    vectoangles(vDelta, vDeltaAngles);
+                    turnimpulse = angledist(vDeltaAngles.y - angles.y);
+                } else {
+                    Vector vVec = vDelta * -1;
+
+                    vectoangles(vVec, vDeltaAngles);
+                    if (IsSubclassOfVehicleTank()) {
+                        turnimpulse = angledist(vDeltaAngles.y - angles.y);
+                    } else {
+                        turnimpulse = -angledist(vDeltaAngles.y - angles.y);
+                    }
+                }
+            }
+
+            if (m_bStopEnabled) {
+                moveimpulse = (fCurPathPosition - m_fStopStartDistance) / (m_fStopEndDistance - m_fStopStartDistance);
+                moveimpulse *= moveimpulse;
+                moveimpulse *= moveimpulse;
+                moveimpulse *= moveimpulse;
+                moveimpulse *= moveimpulse;
+                moveimpulse = 1 - moveimpulse;
+                moveimpulse *= m_fStopStartSpeed;
+
+                if (fabs(moveimpulse) < 2) {
+                    if (m_fIdealSpeed >= 0) {
+                        moveimpulse = 2;
+                    } else {
+                        moveimpulse = -2;
+                    }
+                }
+                // 2.30: check if it stays full speed when bouncing
+            } else if (m_bBounceStayFullSpeed) {
+                if (m_fIdealSpeed > fabs(moveimpulse)) {
+                    moveimpulse -= m_fIdealAccel * level.frametime;
+                    if (fabs(moveimpulse) > m_fIdealSpeed) {
+                        moveimpulse = -m_fIdealSpeed;
+                    }
+                }
+            } else if (moveimpulse < m_fIdealSpeed) {
+                moveimpulse += m_fIdealAccel * level.frametime;
+                if (moveimpulse > m_fIdealSpeed) {
+                    moveimpulse = m_fIdealSpeed;
+                }
+            } else if (moveimpulse > m_fIdealSpeed) {
+                moveimpulse -= m_fIdealAccel * level.frametime;
+                if (moveimpulse < m_fIdealSpeed) {
+                    moveimpulse = m_fIdealSpeed;
+                }
+            }
+
+            if (m_iNextPathStartNode >= 0 && m_pNextPath && m_pNextPath->m_iPoints
+                && m_iCurNode > m_iNextPathStartNode + 2) {
+                cVehicleSpline *spline;
+
+                spline      = m_pCurPath;
+                m_pCurPath  = m_pNextPath;
+                m_pNextPath = spline;
+
+                m_iCurNode = 2;
+                m_pNextPath->Reset();
+                m_iNextPathStartNode = -1;
+
+                // notify scripts that the drive has finished
+                Unregister(STRING_DRIVE);
+
+                m_bStopEnabled    = false;
+                m_bEnableSkidding = false;
+            }
+            return;
+        }
+
+        vTmp           = m_pCurPath->GetByNode(m_iCurNode, NULL);
+        vWishPosition  = vTmp + 1;
+        m_vIdealDir    = origin - vWishPosition;
+        m_vIdealDir[2] = 0;
+        m_vIdealDir.normalize();
+
+        vDelta    = vWishPosition - origin;
+        vDelta[2] = 0;
+
+        fDistToCurPos = 2;
+        if (vDelta.length() > m_fIdealDistance) {
+            goto cont;
+        }
+
+        fDistToCurPos = 0;
+
+        m_iCurNode++;
+    } while (m_iCurNode < m_pCurPath->m_iPoints);
+
+    if (m_bStopEnabled) {
+        moveimpulse = 0;
+    }
+
+    m_bAutoPilot      = false;
+    m_bStopEnabled    = false;
+    m_bEnableSkidding = false;
+
+    StopLoopSound();
+    // play the stop sound
+    Sound(m_sSoundSet + "snd_stop", CHAN_VOICE);
+
+    delete m_pCurPath;
+    m_pCurPath  = NULL;
+    m_iCurNode  = 0;
+    turnimpulse = 0;
+
+    //
+    // notify scripts that driving has stopped
+    //
+    Unregister(STRING_DRIVE);
+}
+
+/*
+====================
+Vehicle::EventDriveInternal
+====================
+*/
+void Vehicle::EventDriveInternal(Event *ev, bool wait)
+{
+    SimpleEntity *path;
+    SimpleEntity *alternate_path = NULL;
+
+    m_fIdealDistance = 100;
+    m_fLookAhead     = 256;
+    m_fIdealAccel    = 35;
+    m_fIdealSpeed    = 250;
+    m_fMaxSpeed      = 250; // Added in 2.30
+
+    switch (ev->NumArgs()) {
+    case 6:
+        alternate_path = ev->GetSimpleEntity(6);
+    case 5:
+        m_fLookAhead = ev->GetFloat(5);
+    case 4:
+        m_fIdealDistance = ev->GetFloat(4);
+    case 3:
+        m_fIdealAccel = ev->GetFloat(3);
+    case 2:
+        m_fIdealSpeed = ev->GetFloat(2);
+        m_fMaxSpeed   = m_fIdealSpeed; // Added in 2.30
+    case 1:
+        path = ev->GetSimpleEntity(1);
+        if (!path) {
+            ScriptError("Vehicle Given Drive Command with NULL path.");
+            return;
+        }
+        break;
+    default:
+        ScriptError("wrong number of arguments");
+    }
+
+    if (!m_pCurPath) {
+        m_pCurPath = new cVehicleSpline;
+    }
+
+    if (!m_pAlternatePath) {
+        m_pAlternatePath = new cVehicleSpline;
+    }
+
+    SetupPath(m_pCurPath, path);
+
+    // Setup the alternate path
+    if (alternate_path) {
+        SetupPath(m_pAlternatePath, alternate_path);
+    }
+
+    m_bAutoPilot     = true;
+    m_iCurNode       = 0;
+    m_iAlternateNode = 0;
+
+    Sound(m_sSoundSet + "snd_start");
+}
+
+/*
+====================
+Vehicle::SetupPath
+====================
+*/
+void Vehicle::SetupPath(cVehicleSpline *pPath, SimpleEntity *se)
+{
+    Vector        vLastOrigin;
+    SimpleEntity *ent;
+    float         fCurLength = 0.0f;
+    int           i          = 1;
+
+    if (!pPath) {
+        return;
+    }
+
+    pPath->Reset();
+
+    if (!se->Target().length() || !se->Target()[0]) {
+        return;
+    }
+
+    vLastOrigin = se->origin;
+
+    for (ent = se; ent; ent = ent->Next(), i++) {
+        Vector vDelta = vLastOrigin - ent->origin;
+        float  vTmp[4];
+
+        if (vDelta.length() == 0 && i > 1) {
+            Com_Printf("^~^~^Warning: Vehicle Driving with a Path that contains 2 equal points\n");
+        } else {
+            fCurLength += vDelta.length();
+
+            vTmp[0] = fCurLength;
+            VectorCopy(ent->origin, vTmp + 1);
+
+            if (ent->IsSubclassOfVehiclePoint()) {
+                pPath->Add(vTmp, static_cast<VehiclePoint*>(ent)->spawnflags);
+            } else {
+                pPath->Add(vTmp, 0);
+            }
+
+            vLastOrigin = ent->origin;
+        }
+
+        if (ent == se && i > 1) {
+            break;
+        }
+    }
+}
+
+/*
+====================
+Vehicle::EventDrive
+====================
+*/
+void Vehicle::EventDrive(Event *ev)
+{
+    EventDriveInternal(ev, true);
+}
+
+/*
+====================
+Vehicle::EventDriveNoWait
+====================
+*/
+void Vehicle::EventDriveNoWait(Event *ev)
+{
+    EventDriveInternal(ev, false);
+}
+
+/*
+====================
+Vehicle::EventStop
+====================
+*/
+void Vehicle::EventStop(Event *ev)
+{
+    m_bStopEnabled = false;
+    m_bAutoPilot   = false;
+    m_bIsSkidding  = false;
+    moveimpulse    = 0;
+    turnimpulse    = 0;
+    m_iCurNode     = 0;
+    Unregister(STRING_DRIVE);
+}
+
+/*
+====================
+Vehicle::EventFullStop
+====================
+*/
+void Vehicle::EventFullStop(Event *ev)
+{
+    m_bAutoPilot   = false;
+    m_bStopEnabled = false;
+    m_bIsSkidding  = false;
+    moveimpulse    = 0;
+    turnimpulse    = 0;
+    velocity       = vec_zero;
+    m_iCurNode     = 0;
+    Unregister(STRING_DRIVE);
+}
+
+/*
+====================
+Vehicle::VehicleDestroyed
+====================
+*/
+void Vehicle::VehicleDestroyed(Event *ev)
+{
+    Entity      *ent;
+    Entity      *targetEnt;
+    Event       *event;
+    const char  *name;
+    VehicleBase *v;
+    Vector       vDelta;
+
+    takedamage = DAMAGE_NO;
+    setSolidType(SOLID_NOT);
+    hideModel();
+
+    ent = ev->GetEntity(1);
+    if (driver.ent) {
+        EntityPtr driverPtr;
+
+        velocity  = vec_zero;
+        driverPtr = driver.ent;
+
+        event = new Event(EV_Use);
+        event->AddEntity(driverPtr);
+        ProcessEvent(event);
+
+        vDelta = driverPtr->origin - origin;
+        vDelta[2] += 64;
+        vDelta.normalize();
+
+        // kill the driver
+        driverPtr->Damage(this, this, driverPtr->health * 2, origin, vDelta, vec_zero, 50, 0, MOD_VEHICLE);
+    }
+
+    if (flags & FL_DIE_EXPLODE) {
+        setSolidType(SOLID_NOT);
+        hideModel();
+        CreateExplosion(origin, edict->s.scale * 150, this, this, this, m_sExplosionModel);
+    }
+
+    if (flags & FL_DIE_GIBS) {
+        setSolidType(SOLID_NOT);
+        hideModel();
+        CreateGibs(this, -150, edict->s.scale, 3, NULL);
+    }
+
+    //
+    // remove all links
+    //
+    for (v = this; v->vlink; v = vlink) {
+        v->vlink->PostEvent(EV_Remove, EV_VEHICLE);
+    }
+
+    //
+    // remove all kill targets
+    //
+    name = KillTarget();
+    if (name && strcmp(name, "")) {
+        for (targetEnt = G_FindTarget(NULL, name); targetEnt; targetEnt = G_FindTarget(targetEnt, name)) {
+            targetEnt->PostEvent(EV_Remove, EV_VEHICLE);
+        }
+    }
+
+    //
+    // activate targets
+    //
+    name = Target();
+    if (name && strcmp(name, "")) {
+        for (targetEnt = G_FindTarget(NULL, name); targetEnt; targetEnt = G_FindTarget(targetEnt, name)) {
+            event = new Event(EV_Activate);
+            event->AddEntity(ent);
+            targetEnt->ProcessEvent(event);
+        }
+    }
+
+    PostEvent(EV_Remove, EV_VEHICLE);
+}
+
+/*
+====================
+Vehicle::DetachRemoteOwner
+====================
+*/
+void Vehicle::DetachRemoteOwner()
+{
+    VehicleTurretGun *vtg = static_cast<VehicleTurretGun *>(Turrets[0].ent.Pointer());
+    vtg->EndRemoteControl();
+}
+
+static float GetAngleBetweenVectors2D(const Vector& a, const Vector& b)
+{
+    float value;
+    float angle;
+
+    value = atan2f(a.x, a.y);
+    angle = RAD2DEG(value - atan2f(b.x, b.y));
+    if (fabs(angle) <= 180) {
+        return angle;
+    } else if (angle < 0) {
+        return angle + 360;
+    } else {
+        return angle - 360;
+    }
+}
+
+/*
+====================
+Vehicle::DriverUse
+====================
+*/
+void Vehicle::DriverUse(Event *ev)
+{
+    int     slot;
+    Vector  pos;
+    Vector  dist;
+    float   min_length = 1e30f;
+    int     min_slot   = 0;
+    int     min_type   = -1;
+    Entity *ent;
+    Vector  vExitAngles;
+    bool    bHasExitAngles;
+    Vector  vExitPosition;
+    bool    bHasExitPosition;
+
+    ent = ev->GetEntity(1);
+
+    bHasExitAngles   = false;
+    bHasExitPosition = false;
+
+    if (locked) {
+        return;
+    }
+
+    // Added in 2.30
+    //  Check use angle
+    if (!driver.ent && m_fMaxUseAngle && ent && Turrets[0].ent) {
+        Vector vForward;
+        Vector vDir;
+
+        AngleVectors(Turrets[0].ent->angles, vForward, NULL, NULL);
+
+        vDir = Turrets[0].ent->origin - ent->origin;
+        VectorNormalize(vDir);
+
+        if (fabs(GetAngleBetweenVectors2D(vForward, vDir)) > m_fMaxUseAngle) {
+            // Not usable
+            return;
+        }
+    }
+
+    if (ev->NumArgs() == 2) {
+        if (ev->IsVectorAt(2)) {
+            vExitPosition    = ev->GetVector(2);
+            bHasExitPosition = true;
+        } else if (ev->IsEntityAt(2)) {
+            Entity *pEnt = ev->GetEntity(2);
+
+            bHasExitAngles   = true;
+            vExitAngles      = pEnt->angles;
+            vExitPosition    = pEnt->origin;
+            bHasExitPosition = true;
+        } else if (ev->IsSimpleEntityAt(2)) {
+            SimpleEntity *pEnt = ev->GetSimpleEntity(2);
+
+            bHasExitAngles   = true;
+            vExitAngles      = pEnt->angles;
+            vExitPosition    = pEnt->origin;
+            bHasExitPosition = true;
+        }
+    }
+
+    slot = FindDriverSlotByEntity(ent);
+
+    if (slot >= 0) {
+        DetachDriverSlot(slot, vec_zero, NULL);
+
+        if (IsSubclassOfVehicleTank()) {
+            // Added check to see if the turret is valid in OPM
+            if (Turrets[0].ent && Turrets[0].ent->IsSubclassOfVehicleTurretGun()) {
+                DetachRemoteOwner();
+            }
+        }
+
+        return;
+    }
+
+    slot = FindPassengerSlotByEntity(ent);
+
+    if (slot >= 0) {
+        DetachPassengerSlot(slot, vec_zero, NULL);
+        return;
+    }
+
+    if (ent->IsSubclassOfWeapon()) {
+        slot = FindTurretSlotByEntity(ent);
+
+        if (slot >= 0) {
+            DetachTurretSlot(slot, vec_zero, NULL);
+        }
+    } else if (ent->IsSubclassOfSentient()) {
+        Sentient  *sent       = static_cast<Sentient *>(ent);
+        TurretGun *sentTurret = sent->GetTurret();
+
+        if (sentTurret) {
+            slot = FindTurretSlotByEntity(sent->GetTurret());
+
+            if (slot >= 0) {
+                if (!bHasExitPosition) {
+                    AttachTurretSlot(slot, sent, vec_zero, NULL);
+                } else if (!bHasExitAngles) {
+                    AttachTurretSlot(slot, sent, vExitPosition, NULL);
+                } else {
+                    AttachTurretSlot(slot, sent, vExitPosition, &vExitAngles);
+                }
+
+                sent->SetVehicle(NULL);
+                return;
+            }
+        }
+    }
+
+    // Check for passengers slots
+    for (slot = 0; slot < MAX_PASSENGERS; slot++) {
+        if (!(Passengers[slot].flags & SLOT_FREE)) {
+            continue;
+        }
+
+        QueryPassengerSlotPosition(slot, (float *)&pos);
+
+        dist = pos - ent->origin;
+
+        if (dist.length() < min_length) {
+            min_length = dist.length();
+            min_type   = 0;
+            min_slot   = slot;
+        }
+    }
+
+    // Check for turrets slots
+    if (ent->IsSubclassOfWeapon()) {
+        for (slot = 0; slot < MAX_TURRETS; slot++) {
+            if (!(Turrets[slot].flags & SLOT_FREE)) {
+                continue;
+            }
+
+            QueryTurretSlotPosition(slot, (float *)&pos);
+
+            dist = pos - ent->origin;
+
+            if (dist.length() < min_length) {
+                min_length = dist.length();
+                min_type   = 1;
+                min_slot   = slot;
+            }
+        }
+    } else {
+        for (slot = 0; slot < MAX_TURRETS; slot++) {
+            if (!(Turrets[slot].flags & SLOT_BUSY)) {
+                continue;
+            }
+
+            QueryTurretSlotPosition(slot, (float *)&pos);
+
+            dist = pos - ent->origin;
+
+            if (dist.length() < min_length) {
+                min_length = dist.length();
+                min_type   = 1;
+                min_slot   = slot;
+            }
+        }
+    }
+
+    slot = 0;
+
+    // Check for driver(s) slot(s)
+    if (driver.flags & SLOT_FREE) {
+        float length;
+
+        QueryDriverSlotPosition(slot, (float *)&pos);
+
+        dist = pos - ent->origin;
+
+        length = dist.length();
+        if (ent->IsSubclassOfPlayer()) {
+            length /= 2.0;
+        }
+
+        if (length < min_length) {
+            min_length = dist.length();
+            min_type   = 2;
+            min_slot   = slot;
+        }
+    }
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER || min_type == 2) {
+        switch (min_type) {
+        case 0:
+            AttachPassengerSlot(min_slot, ent, vec_zero);
+            break;
+        case 1:
+            AttachTurretSlot(min_slot, ent, vec_zero, NULL);
+            break;
+        case 2:
+            AttachDriverSlot(min_slot, ent, vec_zero);
+            break;
+        }
+    }
+}
+
+/*
+====================
+Vehicle::SetMoveInfo
+====================
+*/
+void Vehicle::SetMoveInfo(vmove_t *vm)
+{
+    memset(vm, 0, sizeof(vmove_t));
+
+    origin.copyTo(vs.origin);
+    vs.useGravity = false;
+    vs.entityNum  = entnum;
+
+    vm->vs        = &vs;
+    vm->frametime = level.frametime;
+    vm->tracemask = edict->clipmask;
+    mins.copyTo(vm->mins);
+    maxs.copyTo(vm->maxs);
+
+    vs.entityNum      = edict->s.number;
+    vs.desired_dir[0] = velocity[0];
+    vs.desired_dir[1] = velocity[1];
+
+    vm->desired_speed = VectorNormalize2D(vs.desired_dir);
+}
+
+/*
+====================
+Vehicle::GetMoveInfo
+====================
+*/
+void Vehicle::GetMoveInfo(vmove_t *vm)
+{
+    Vector newOrigin = vm->vs->origin;
+
+    if (bindmaster) {
+        newOrigin = vm->vs->origin - origin;
+    }
+
+    setLocalOrigin(newOrigin);
+
+    groundentity = NULL;
+    if (vm->vs->groundEntityNum != ENTITYNUM_NONE) {
+        groundentity = &g_entities[vm->vs->groundEntityNum];
+    }
+}
+
+/*
+====================
+Vehicle::SetCEMoveInfo
+====================
+*/
+void Vehicle::SetCEMoveInfo(vmove_t *vm)
+{
+    Vector mins, maxs;
+
+    SetMoveInfo(vm);
+
+    mins = m_pCollisionEntity->mins;
+    maxs = m_pCollisionEntity->maxs;
+    mins -= Vector(24, 24, 0);
+    maxs += Vector(24, 24, 0);
+
+    mins.copyTo(vm->mins);
+    maxs.copyTo(vm->maxs);
+}
+
+/*
+====================
+Vehicle::GetCEMoveInfo
+====================
+*/
+void Vehicle::GetCEMoveInfo(vmove_t *vm)
+{
+    GetMoveInfo(vm);
+}
+
+/*
+====================
+Vehicle::SetViewAngles
+====================
+*/
+void Vehicle::SetViewAngles(Vector newViewangles)
+{
+    client->ps.delta_angles[0] = floor(ANGLE2SHORT(newViewangles.x));
+    client->ps.delta_angles[1] = floor(ANGLE2SHORT(newViewangles.y));
+    client->ps.delta_angles[2] = floor(ANGLE2SHORT(newViewangles.z));
+
+    v_angle = newViewangles;
+    AnglesToAxis(v_angle, orientation);
+
+    yaw_forward = orientation[0];
+    yaw_left    = orientation[1];
+}
+
+/*
+====================
+Vehicle::SetSlotsNonSolid
+====================
+*/
+void Vehicle::SetSlotsNonSolid(void)
+{
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        Passengers[i].NotSolid();
+    }
+
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        Turrets[i].NotSolid();
+    }
+
+    driver.NotSolid();
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->NotSolid();
+    }
+}
+
+/*
+====================
+Vehicle::SetSlotsSolid
+====================
+*/
+void Vehicle::SetSlotsSolid(void)
+{
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        Passengers[i].Solid();
+    }
+
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        Turrets[i].Solid();
+    }
+
+    driver.Solid();
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->Solid();
+    }
+}
+
+/*
+====================
+Vehicle::AssertMove
+====================
+*/
+bool Vehicle::AssertMove(Vector vNewOrigin, Vector vOldOrigin)
+{
+    Entity    *check;
+    gentity_t *edict;
+    int        touch[MAX_GENTITIES];
+    int        i;
+    int        num;
+
+    if (m_pCollisionEntity) {
+        num = gi.AreaEntities(m_pCollisionEntity->mins, m_pCollisionEntity->maxs, touch, MAX_GENTITIES);
+    } else {
+        num = gi.AreaEntities(mins, maxs, touch, MAX_GENTITIES);
+    }
+
+    if (num <= 0) {
+        return true;
+    }
+
+    for (i = 0; i < num; i++) {
+        edict = &g_entities[touch[i]];
+        check = edict->entity;
+
+        if (check->edict->s.number != edict->s.number && edict->solid && check->movetype != MOVETYPE_STOP) {
+            if (check->movetype != MOVETYPE_NONE && check->movetype != MOVETYPE_NOCLIP
+                && edict->r.contents != CONTENTS_PLAYERCLIP && IsTouching(check)
+                && G_TestEntityPosition(check, check->origin)) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+/*
+====================
+Vehicle::AssertRotation
+====================
+*/
+bool Vehicle::AssertRotation(Vector vNewAngles, Vector vOldAngles)
+{
+    Vector i;
+    Vector j;
+    Vector k;
+    Vector i2;
+    Vector j2;
+    Vector k2;
+    Vector vAngleDiff;
+    float  mAngleDiff[3][3];
+
+    AngleVectorsLeft(vOldAngles, i, j, k);
+    AngleVectorsLeft(vNewAngles, i2, j2, k2);
+    AnglesSubtract(vOldAngles, vNewAngles, vAngleDiff);
+    AngleVectorsLeft(vAngleDiff, mAngleDiff[0], mAngleDiff[1], mAngleDiff[2]);
+
+    // FIXME: shrug
+
+    return true;
+}
+
+/*
+====================
+Vehicle::NoMove
+====================
+*/
+void Vehicle::NoMove(void)
+{
+    vmove_t vm;
+
+    SetMoveInfo(&vm);
+    VectorClear2D(vs.desired_dir);
+    VmoveSingle(&vm);
+    GetMoveInfo(&vm);
+}
+
+/*
+====================
+Vehicle::SlidePush
+====================
+*/
+void Vehicle::SlidePush(Vector vPush)
+{
+    vmove_t    vm;
+    int        i;
+    int        j;
+    Entity    *pSkippedEntities[MAX_SKIPPED_ENTITIES];
+    int        iContentsEntities[MAX_SKIPPED_ENTITIES];
+    solid_t    solidEntities[MAX_SKIPPED_ENTITIES];
+    int        iNumSkippedEntities = 0;
+    int        iNumSkipped         = 0;
+    gentity_t *other;
+    Vector     newOrigin;
+
+    do {
+        SetMoveInfo(&vm);
+
+        vPush.copyTo(vm.vs->velocity);
+        vm.frametime = 1;
+
+        vs.desired_dir[0] = vPush[0];
+        vs.desired_dir[1] = vPush[1];
+        vm.desired_speed  = VectorNormalize2D(vs.desired_dir);
+
+        if (g_showvehiclemovedebug->integer) {
+            G_DebugBBox(origin, vm.mins, vm.maxs, 1, 0, 0, 1);
+            G_DebugBBox(origin, vm.mins, vm.maxs, 0, 1, 0, 1);
+        }
+
+        VmoveSingle(&vm);
+
+        iNumSkippedEntities = 0;
+
+        for (i = 0; i < vm.numtouch; i++) {
+            other = &g_entities[vm.touchents[i]];
+
+            for (j = 0; j < i; j++) {
+                if (&g_entities[j] == other) {
+                    break;
+                }
+            }
+
+            if (j == i && other->entity) {
+                other->entity->CheckGround();
+
+                if (other->entity->groundentity && (other->entity->groundentity == edict
+                    || m_pCollisionEntity && other->entity->groundentity->entity == m_pCollisionEntity)) {
+                    // save the entity
+                    pSkippedEntities[iNumSkipped] = other->entity;
+                    iContentsEntities[iNumSkipped] = other->r.contents;
+                    solidEntities[iNumSkipped] = other->solid;
+                    iNumSkipped++;
+
+                    if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
+                        gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                        return;
+                    }
+
+                    other->entity->setSolidType(SOLID_NOT);
+                    iNumSkippedEntities++;
+                }
+
+                if (g_showvehiclemovedebug->integer) {
+                    Com_Printf(
+                        "Vehicle Hit(SP): %s : %s\n", other->entity->getClassname(), other->entity->targetname.c_str()
+                    );
+                }
+            }
+        }
+    } while (iNumSkippedEntities != 0);
+
+    newOrigin = vm.vs->origin;
+    if (bindmaster) {
+        newOrigin -= bindmaster->origin;
+    }
+
+    setLocalOrigin(newOrigin);
+
+    if (g_showvehiclemovedebug->integer) {
+        G_DebugBBox(origin, vm.mins, vm.maxs, 0, 0, 1, 1);
+    }
+
+    TouchStuff(&vm);
+
+    for (i = 0; i < iNumSkipped; i++) {
+        pSkippedEntities[i]->setSolidType(solidEntities[i]);
+        pSkippedEntities[i]->setContents(iContentsEntities[i]);
+    }
+}
+
+/*
+====================
+Vehicle::AnimMoveVehicle
+====================
+*/
+void Vehicle::AnimMoveVehicle(void)
+{
+    Vector  vPosition;
+    Vector  vAngles;
+    Entity *ent;
+
+    //
+    // velocity
+    //
+    vPosition = origin + frame_delta;
+    velocity  = (vPosition - origin) * (1.0 / level.frametime);
+
+    setOrigin(vPosition);
+
+    //
+    // angular velocity
+    //
+    vAngles = angles;
+    vAngles[1] += angular_delta;
+    avelocity = (vAngles - angles) * (1.0 / level.frametime);
+
+    setAngles(vAngles);
+
+    for (ent = teamchain; ent; ent = ent->teamchain) {
+        ent->setLocalOrigin(ent->localorigin);
+        ent->setAngles(ent->localangles);
+    }
+}
+
+/*
+====================
+Vehicle::MoveVehicle
+====================
+*/
+void Vehicle::MoveVehicle(void)
+{
+    trace_t      tr;
+    Vector       vecStart;
+    Vector       vecStart2;
+    Vector       vecEnd;
+    Vector       vecDelta;
+    Vector       vecAng;
+    int          i;
+    gridpoint_t *gp;
+    vmove_t      vm;
+    float        flMoveFrac = 1;
+    float        fSpeed;
+    bool         bDoPush    = true;
+    bool         bDoGravity = false;
+    bool         bHitPerson = false;
+    Entity      *pSkippedEntities[MAX_SKIPPED_ENTITIES];
+    int          iContentsEntities[MAX_SKIPPED_ENTITIES];
+    solid_t      solidEntities[MAX_SKIPPED_ENTITIES];
+    int          iNumSkippedEntities = 0;
+    Event       *event               = nullptr;
+    Entity      *chain;
+    Entity      *driverEnt = NULL;
+    solid_t     solidDriver = SOLID_NOT;
+    int         contentsDriver = 0;
+
+    if (m_bMovementLocked) {
+        return;
+    }
+
+    setAngles();
+    if (m_pCollisionEntity) {
+        SetCEMoveInfo(&vm);
+    } else {
+        SetMoveInfo(&vm);
+    }
+    m_sMoveGrid->SetMoveInfo(&vm);
+    m_sMoveGrid->SetOrientation(orientation);
+    m_sMoveGrid->CalculateBoxPoints();
+    CheckGround();
+
+    if (velocity.length() > 0.5f) {
+        Vector vVel;
+
+        if (driver.ent && driver.ent->edict->solid != SOLID_NOT) {
+            //
+            // Added in OPM
+            //  Make the driver nonsolid while moving.
+            //  Scripts usually set the player to nonsolid.
+            //  However some scripts still rely on the old 1.11 behavior
+            //  where the player is set to nonsolid when driving some type of vehicles
+            solidDriver = driver.ent->edict->solid;
+            contentsDriver = driver.ent->getContents();
+
+            driver.ent->setSolidType(SOLID_NOT);
+        }
+
+        fSpeed   = orientation[0] * velocity;
+        vecDelta = velocity * level.frametime;
+
+        vVel        = velocity * level.frametime * 8;
+        vecDelta[2] = 0;
+
+        for (i = 0; i < 3 && bDoPush; i++) {
+            bool bContinue = false;
+
+            if (fSpeed > 0.0f) {
+                gp = m_sMoveGrid->GetGridPoint(2, i, 0);
+            } else {
+                gp = m_sMoveGrid->GetGridPoint(0, i, 0);
+            }
+            vecStart = origin + gp->origin;
+
+            if (real_velocity.length() > 0.5f) {
+                vecEnd = vecStart + vVel;
+
+                for (;;) {
+                    tr = G_Trace(
+                        vecEnd,
+                        Vector(gp->vm.mins) - Vector(-32, -32, -32),
+                        Vector(gp->vm.maxs) + Vector(32, 32, 32),
+                        vecEnd,
+                        this,
+                        MASK_MOVEVEHICLE,
+                        false,
+                        "Vehicle::MoveVehicle"
+                    );
+
+                    if (!tr.ent || !tr.ent->entity || tr.ent->entity == world) {
+                        break;
+                    }
+
+                    tr.ent->entity->CheckGround();
+
+                    if (!tr.ent->entity->groundentity
+                        || (tr.ent->entity->groundentity != edict
+                            && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
+                        Event *event = new Event(EV_Touch);
+                        event->AddEntity(this);
+                        tr.ent->entity->ProcessEvent(event);
+
+                        event = new Event(EV_Touch);
+                        event->AddEntity(tr.ent->entity);
+                        ProcessEvent(event);
+
+                        if (tr.ent->entity->IsSubclassOfSentient()) {
+                            bHitPerson = true;
+                        }
+
+                        if (g_showvehiclemovedebug->integer) {
+                            Com_Printf(
+                                "Vehicle Hit(MV0): %s : %s\n",
+                                tr.ent->entity->getClassname(),
+                                tr.ent->entity->targetname.c_str()
+                            );
+                        }
+
+                        // Added in OPM
+                        //  Skip the entity if the sentient is dead.
+                        //  This is a workaround against sentients getting in path of vehicles
+                        //  and thus blocking them temporarily while dying.
+                        //  For example in e1l1, the first tank would get stuck, because sometimes
+                        //  there are too many actors moving in the path of the vehicle
+                        if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                            break;
+                        }
+                    }
+
+                    pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
+                    iContentsEntities[iNumSkippedEntities] = tr.ent->r.contents;
+                    solidEntities[iNumSkippedEntities]     = tr.ent->solid;
+                    iNumSkippedEntities++;
+
+                    if (iNumSkippedEntities >= MAX_SKIPPED_ENTITIES) {
+                        gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                        return;
+                    }
+
+                    tr.ent->entity->setSolidType(SOLID_NOT);
+
+                    if (g_showvehiclemovedebug->integer) {
+                        Com_Printf(
+                            "Vehicle Skipped(MV0): %s : %s\n",
+                            tr.ent->entity->getClassname(),
+                            tr.ent->entity->targetname.c_str()
+                        );
+                    }
+                }
+            }
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugBBox(vecStart, gp->vm.mins, gp->vm.maxs, 1, 0, 0, 1);
+            }
+
+            vecStart.z += 64;
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugBBox(vecStart, gp->vm.mins, gp->vm.maxs, 1, 0, 0, 1);
+            }
+
+            vecEnd = vecStart + vecDelta;
+
+            for (;;) {
+                tr = G_Trace(
+                    vecStart,
+                    Vector(gp->vm.mins),
+                    Vector(gp->vm.maxs),
+                    vecEnd,
+                    this,
+                    edict->clipmask,
+                    false,
+                    "Vehicle::MoveVehicle"
+                );
+
+                if (tr.fraction == 1.0f && !tr.allsolid && !tr.startsolid) {
+                    bContinue = true;
+                    break;
+                }
+
+                if (!tr.ent || !tr.ent->entity || tr.ent->entity == world) {
+                    break;
+                }
+
+                tr.ent->entity->CheckGround();
+
+                if (!tr.ent->entity->groundentity
+                    || (tr.ent->entity->groundentity != edict
+                        && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
+                    Event *event = new Event(EV_Touch);
+                    event->AddEntity(this);
+                    tr.ent->entity->ProcessEvent(event);
+
+                    event = new Event(EV_Touch);
+                    event->AddEntity(tr.ent->entity);
+                    ProcessEvent(event);
+
+                    if (tr.ent->entity->IsSubclassOfSentient()) {
+                        bHitPerson = true;
+                    }
+
+                    if (g_showvehiclemovedebug->integer) {
+                        Com_Printf(
+                            "Vehicle Hit(MV): %s : %s\n",
+                            tr.ent->entity->getClassname(),
+                            tr.ent->entity->TargetName().c_str()
+                        );
+                    }
+
+                    // Added in OPM
+                    //  (see the comment above)
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
+                }
+
+                pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
+                iContentsEntities[iNumSkippedEntities] = tr.ent->r.contents;
+                solidEntities[iNumSkippedEntities]     = tr.ent->solid;
+                iNumSkippedEntities++;
+
+                if (iNumSkippedEntities >= MAX_SKIPPED_ENTITIES) {
+                    gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                    return;
+                }
+
+                tr.ent->entity->setSolidType(SOLID_NOT);
+
+                if (g_showvehiclemovedebug->integer) {
+                    Com_Printf(
+                        "Vehicle Skipped(MV): %s : %s\n",
+                        tr.ent->entity->getClassname(),
+                        tr.ent->entity->TargetName().c_str()
+                    );
+                }
+            }
+
+            if (bContinue) {
+                continue;
+            }
+
+            if (flMoveFrac > tr.fraction) {
+                flMoveFrac = tr.fraction - 0.1f;
+            }
+
+            vecStart = tr.endpos;
+            vecEnd   = vecStart;
+            vecEnd.z -= 64;
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugBBox(tr.endpos, gp->vm.mins, gp->vm.maxs, 0, 1, 0, 1);
+            }
+
+            for (;;) {
+                tr = G_Trace(
+                    vecStart,
+                    Vector(gp->vm.mins),
+                    Vector(gp->vm.maxs),
+                    vecEnd,
+                    this,
+                    edict->clipmask,
+                    false,
+                    "Vehicle::MoveVehicle"
+                );
+
+                if ((tr.fraction != 1.0f && tr.plane.normal[2] < 0.7f) || tr.allsolid) {
+                    flMoveFrac = 0.0f;
+                }
+
+                if (!tr.ent || !tr.ent->entity || tr.ent->entity == world) {
+                    break;
+                }
+
+                tr.ent->entity->CheckGround();
+
+                if (!tr.ent->entity->groundentity
+                    || (tr.ent->entity->groundentity != edict
+                        && (!m_pCollisionEntity || tr.ent->entity->groundentity->entity != m_pCollisionEntity))) {
+                    Event *event = new Event(EV_Touch);
+                    event->AddEntity(this);
+                    tr.ent->entity->ProcessEvent(event);
+
+                    event = new Event(EV_Touch);
+                    event->AddEntity(tr.ent->entity);
+                    ProcessEvent(event);
+
+                    if (tr.ent->entity->IsSubclassOfSentient()) {
+                        bHitPerson = true;
+                    }
+
+                    if (g_showvehiclemovedebug->integer) {
+                        Com_Printf(
+                            "Vehicle Hit(MV2): %s : %s\n",
+                            tr.ent->entity->getClassname(),
+                            tr.ent->entity->TargetName().c_str()
+                        );
+                    }
+
+                    // Added in OPM
+                    //  (see the comment above)
+                    if (!bHitPerson || !tr.ent->entity->IsDead()) {
+                        break;
+                    }
+                }
+
+                pSkippedEntities[iNumSkippedEntities]  = tr.ent->entity;
+                iContentsEntities[iNumSkippedEntities] = tr.ent->r.contents;
+                solidEntities[iNumSkippedEntities]     = tr.ent->solid;
+                iNumSkippedEntities++;
+
+                if (iNumSkippedEntities >= MAX_SKIPPED_ENTITIES) {
+                    gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                    return;
+                }
+
+                tr.ent->entity->setSolidType(SOLID_NOT);
+                if (g_showvehiclemovedebug->integer) {
+                    Com_Printf(
+                        "Vehicle Skipped(MV2): %s : %s\n",
+                        tr.ent->entity->getClassname(),
+                        tr.ent->entity->targetname.c_str()
+                    );
+                }
+            }
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugBBox(tr.endpos, gp->vm.mins, gp->vm.maxs, 0, 0, 1, 1);
+            }
+
+            if ((!tr.ent || !tr.ent->entity->IsSubclassOfProjectile()) && driver.ent
+                && driver.ent->IsSubclassOfPlayer()) {
+                if (fSpeed > 0) {
+                    if (i) {
+                        if (i == 2 && turnimpulse >= 0.0f) {
+                            turnimpulse -= level.frametime * 800;
+                        }
+                    } else if (turnimpulse <= 0) {
+                        turnimpulse += level.frametime * 800;
+                    }
+                } else {
+                    if (i) {
+                        if (i == 2 && turnimpulse <= 0.0f) {
+                            turnimpulse += level.frametime * 800;
+                        }
+                    } else if (turnimpulse >= 0) {
+                        turnimpulse -= level.frametime * 800;
+                    }
+                }
+            }
+
+            if (flMoveFrac < 0.1f) {
+                bDoPush = false;
+            }
+        }
+
+        if (bDoPush) {
+            SlidePush(Vector(0, 0, 64));
+            SlidePush(vecDelta * flMoveFrac);
+            SlidePush(Vector(0, 0, -128));
+
+            bDoGravity = true;
+            if (!bHitPerson) {
+                velocity *= flMoveFrac;
+            }
+        } else if (!bHitPerson) {
+            velocity *= 0.5;
+        }
+
+        if (solidDriver != SOLID_NOT) {
+            driver.ent->setSolidType(solidDriver);
+            driver.ent->setContents(contentsDriver);
+        }
+    }
+
+    if (bDoGravity) {
+        velocity[2] -= sv_gravity->value * level.frametime;
+
+        tr = G_Trace(
+            origin,
+            mins,
+            maxs,
+            origin + Vector(0, 0, velocity[2] * level.frametime),
+            this,
+            edict->clipmask,
+            qtrue,
+            "Vehicle::MoveVehicle"
+        );
+
+        if (tr.fraction < 1) {
+            velocity[2] = 0;
+        }
+
+        setOrigin(tr.endpos);
+    }
+
+    for (i = 0; i < iNumSkippedEntities; i++) {
+        pSkippedEntities[i]->setSolidType(solidEntities[i]);
+        pSkippedEntities[i]->setContents(iContentsEntities[i]);
+    }
+
+    for (chain = teamchain; chain; chain = chain->teamchain) {
+        chain->setLocalOrigin(chain->localorigin);
+        chain->setAngles(chain->localangles);
+    }
+}
+
+/*
+====================
+Vehicle::Think
+====================
+*/
+void Vehicle::Think(void)
+{
+    flags |= FL_POSTTHINK;
+}
+
+/*
+====================
+Vehicle::Postthink
+====================
+*/
+void Vehicle::Postthink(void)
+{
+    float         turn;
+    Vector        i;
+    Vector        j;
+    Vector        k;
+    Vector        temp;
+    Vector        roll;
+    Vector        acceleration;
+    Vector        atmp;
+    Vector        atmp2;
+    Vector        aup;
+    VehicleBase  *v;
+    VehicleBase  *last;
+    float         drivespeed;
+    float         dot;
+    Vector        primal_angles = angles;
+    Vector        primal_origin = origin;
+    Vector        vTmp;
+    Vector        vAddedAngles;
+    Vector        n_angles;
+    orientation_t orient;
+
+    if (!g_vehicle->integer || (edict->s.renderfx & RF_DONTDRAW)) {
+        return;
+    }
+
+    if (m_pCollisionEntity) {
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    }
+
+    prev_velocity = velocity;
+
+    if (m_vOldMins != vec_zero && m_vOldMaxs != vec_zero) {
+        mins = m_vOldMins;
+        maxs = m_vOldMaxs;
+    } else if (mins != vec_zero || maxs != vec_zero) {
+        m_vOldMins = mins;
+        m_vOldMaxs = maxs;
+    }
+
+    SetSlotsNonSolid();
+    if (m_bAnimMove) { // 2.0: use vehicle's animation to move
+        AnimMoveVehicle();
+    } else {
+        if (!m_bMovementLocked) {
+            FactorOutAnglesOffset();
+            FactorOutOriginOffset();
+        }
+        MoveVehicle();
+    }
+
+    SetSlotsSolid();
+
+    m_bThinkCalled = true;
+
+    if (m_bAnimMove) {
+        moveimpulse = velocity.length() * level.frametime;
+        turnimpulse = avelocity[1] * level.frametime;
+    } else if (m_bAutoPilot) {
+        AutoPilot();
+    } else {
+        if (!driver.ent || !driver.ent->IsSubclassOfPlayer()) {
+            acceleration = velocity;
+
+            if (acceleration.length() < 0.1f) {
+                velocity = vec_zero;
+            }
+        }
+
+        moveimpulse *= 0.825f;
+        turnimpulse *= 0.825f;
+    }
+
+    currentspeed = moveimpulse;
+    turnangle    = turnangle * 0.25f + turnimpulse;
+    turnangle    = Q_clamp_float(turnangle, -maxturnrate, maxturnrate);
+
+    if (level.inttime <= 1200) {
+        prev_origin = origin;
+    } else {
+        real_velocity     = origin - prev_origin;
+        prev_origin       = origin;
+        prev_acceleration = real_acceleration;
+        real_acceleration = real_velocity - prev_velocity;
+        prev_velocity     = real_velocity;
+        acceleration      = real_acceleration - prev_acceleration;
+    }
+
+    UpdateSkidAngle();
+    UpdateBones();
+    UpdateShaderOffset();
+    UpdateTires();
+    UpdateNormals();
+
+    angles.AngleVectorsLeft(&i, &j, &k);
+
+    turn = level.frametime * turnangle;
+
+    velocity[0] *= 0.925f;
+    velocity[1] *= 0.925f;
+
+    velocity = Vector(orientation[0]) * currentspeed;
+    temp     = orientation[0];
+    temp.z   = 0;
+
+    drivespeed = velocity * temp;
+    drivespeed = Q_clamp_float(drivespeed, -speed, speed);
+    n_angles   = temp * drivespeed;
+
+    velocity   = n_angles;
+    velocity.z = drivespeed * jumpimpulse;
+    avelocity *= 0.05f;
+
+    if (steerinplace && drivespeed < 350) {
+        drivespeed = 350;
+    }
+
+    avelocity.y += turn * drivespeed;
+    angles += avelocity * level.frametime;
+
+    dot = acceleration * orientation[0];
+
+    UpdateSound();
+
+    i = orientation[0];
+    j = orientation[1];
+    k = orientation[2];
+
+    CalculateAnglesOffset(acceleration);
+    CalculateOriginOffset();
+
+    last_origin = origin;
+    vTmp        = (angles - primal_angles) * level.frametime;
+
+    if (vTmp.x > 180 || vTmp.x < -180) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > 180 || vTmp.y < -180) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > 180 || vTmp.z < -180) {
+        vTmp.z = 0;
+    }
+
+    if (vTmp.x > -1 || vTmp.x < 1) {
+        vTmp.x = 0;
+    }
+    if (vTmp.y > -1 || vTmp.y < 1) {
+        vTmp.y = 0;
+    }
+    if (vTmp.z > -1 || vTmp.z < 1) {
+        vTmp.z = 0;
+    }
+
+    avelocity = vAddedAngles;
+
+    if (!m_bAnimMove && !m_bMovementLocked) {
+        FactorInOriginOffset();
+        FactorInAnglesOffset(&vAddedAngles);
+    }
+
+    n_angles = m_vOriginOffset + m_vOriginOffset2;
+    CalculateAnimationData(vAddedAngles, m_vOriginOffset + m_vOriginOffset2);
+
+    if (m_pCollisionEntity) {
+        Vector vaDelta;
+
+        SetSlotsNonSolid();
+
+        vaDelta[0] = angledist(angles[0] - m_pCollisionEntity->angles[0]);
+        vaDelta[1] = angledist(angles[1] - m_pCollisionEntity->angles[1]);
+        vaDelta[2] = angledist(angles[2] - m_pCollisionEntity->angles[2]);
+
+        m_pCollisionEntity->Solid();
+
+        G_PushMove(m_pCollisionEntity, origin - primal_origin, vaDelta);
+        G_TouchTriggers(m_pCollisionEntity);
+
+        SetSlotsSolid();
+
+        m_pCollisionEntity->setOrigin(origin);
+        m_pCollisionEntity->setAngles(angles);
+    }
+
+    SetupVehicleSoundEntities();
+    UpdateDriverSlot(0);
+
+    for (int slot = 0; slot < MAX_PASSENGERS; slot++) {
+        UpdatePassengerSlot(slot);
+    }
+
+    atmp = angles - primal_angles;
+
+    for (int slot = 0; slot < MAX_TURRETS; slot++) {
+        UpdateTurretSlot(slot);
+    }
+
+    if (g_showvehicleentrypoints->integer) {
+        for (int slot = 0; slot < MAX_PASSENGERS; slot++) {
+            if (Passengers[slot].enter_boneindex >= 0) {
+                QueryPassengerSlotPosition(slot, (float *)&temp);
+
+                G_DebugCircle(temp, 10, 1, 0, 0, 1, true);
+            }
+        }
+
+        for (int slot = 0; slot < MAX_TURRETS; slot++) {
+            if (Turrets[slot].enter_boneindex >= 0) {
+                QueryTurretSlotPosition(slot, (float *)&temp);
+
+                G_DebugCircle(temp, 10, 0, 1, 0, 1, true);
+            }
+        }
+
+        if (driver.enter_boneindex >= 0) {
+            QueryDriverSlotPosition(0, (float *)&temp);
+
+            G_DebugCircle(temp, 10, 0, 0, 1, 1, true);
+        }
+    }
+
+    if (g_showvehicleslotpoints->integer) {
+        for (int slot = 0; slot < MAX_PASSENGERS; slot++) {
+            if (Passengers[slot].boneindex >= 0) {
+                GetTagPositionAndOrientation(Passengers[slot].boneindex, &orient);
+                G_DebugCircle(orient.origin, 10.0, 1.0f, 0.5f, 0.5f, 1.0f, true);
+
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[0]) * 32, 1, 0, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[1]) * 32, 0, 1, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[2]) * 32, 0, 0, 1, 1);
+            }
+        }
+
+        for (int slot = 0; slot < MAX_TURRETS; slot++) {
+            if (Turrets[slot].boneindex >= 0) {
+                GetTagPositionAndOrientation(Turrets[slot].boneindex, &orient);
+                G_DebugCircle(orient.origin, 10.0, 0.5f, 1.0f, 1.0f, 1.0f, true);
+
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[0]) * 32, 1, 0, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[1]) * 32, 0, 1, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[2]) * 32, 0, 0, 1, 1);
+            }
+        }
+
+        if (driver.boneindex >= 0) {
+            GetTagPositionAndOrientation(driver.boneindex, &orient);
+            G_DebugCircle(orient.origin, 10.0, 0.5f, 0.5f, 1.0f, 1.0f, true);
+
+            G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[0]) * 32, 1, 0, 0, 1);
+            G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[1]) * 32, 0, 1, 0, 1);
+            G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[2]) * 32, 0, 0, 1, 1);
+        }
+    }
+
+    if (g_showvehicletags->integer) {
+        int numtags;
+        int tagnum;
+
+        numtags = gi.TIKI_NumTags(edict->tiki);
+        for (tagnum = 0; tagnum < numtags; tagnum++) {
+            const char *name = gi.Tag_NameForNum(edict->tiki, tagnum);
+            if (!strncmp(name, "tag", 3)) {
+                GetTagPositionAndOrientation(tagnum, &orient);
+                G_DebugCircle(orient.origin, 10.0, 1, 1, 1, 1, true);
+
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[0]) * 32, 1, 0, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[1]) * 32, 0, 1, 0, 1);
+                G_DebugLine(orient.origin, orient.origin + Vector(orient.axis[2]) * 32, 0, 0, 1, 1);
+            }
+        }
+    }
+
+    for (last = this; last->vlink; last = v) {
+        v = last->vlink;
+
+        v->setOrigin(origin + i * v->offset.x + j * v->offset.y + k * v->offset.z);
+        v->avelocity = avelocity;
+        v->velocity  = velocity;
+
+        v->angles[ROLL]  = angles[ROLL];
+        v->angles[YAW]   = angles[YAW];
+        v->angles[PITCH] = (float)((int)(v->angles[PITCH] + drivespeed / 4.f) % 360);
+        v->setAngles(v->angles);
+    }
+
+    CheckWater();
+    WorldEffects();
+
+    if (m_pCollisionEntity) {
+        setSolidType(SOLID_NOT);
+        m_pCollisionEntity->Solid();
+    } else {
+        setSolidType(SOLID_BBOX);
+        setContents(CONTENTS_UNKNOWN2);
+    }
+}
+
+/*
+====================
+Vehicle::VehicleTouched
+====================
+*/
+void Vehicle::VehicleTouched(Event *ev)
+{
+    Entity *other;
+    float   dot;
+    float   speed;
+    Vector  delta;
+    Vector  dir;
+    Event  *event;
+
+    other = ev->GetEntity(1);
+    if (other == driver.ent) {
+        return;
+    }
+
+    if (other == world) {
+        return;
+    }
+
+    delta = other->origin - last_origin;
+    delta.normalize();
+
+    dot = velocity * orientation[0];
+    if (dot > 0) {
+        if (delta * orientation[0] < 0) {
+            return;
+        }
+    } else {
+        if (delta * orientation[0] > 0) {
+            return;
+        }
+    }
+
+    if (!other->IsSubclassOfVehicleTurretGun()) {
+        speed = velocity.length();
+        if (speed > 10) {
+            Sound(m_sSoundSet + "vehicle_crash");
+            dir = delta * (1 / speed);
+
+            event = new Event(EV_Damage);
+            if (lastdriver.ent && lastdriver.ent->IsSubclassOfPlayer()) {
+                event->AddEntity(lastdriver.ent);
+            } else {
+                event->AddEntity(world);
+            }
+
+            event->AddFloat(speed);
+            event->AddEntity(this);
+            event->AddVector(origin);
+            event->AddVector(dir);
+            event->AddVector(vec_zero);
+            event->AddFloat(speed);
+            event->AddInteger(0);
+            event->AddInteger(MOD_VEHICLE);
+            event->AddInteger(-1);
+            other->PostEvent(event, 0);
+        }
+    }
+}
+
+void Vehicle::SetProjectileVulnerable(Event *ev)
+{
+    if (ev->NumArgs() > 1) {
+        ScriptError("Too many arguments");
+    }
+
+    if (ev->NumArgs() > 0) {
+        m_iProjectileHitsRemaining = ev->GetInteger(1);
+        if (m_iProjectileHitsRemaining < 0) {
+            ScriptError("Negative arguments illegal");
+        }
+    } else {
+        m_iProjectileHitsRemaining = 0;
+    }
+}
+
+void Vehicle::DoProjectileVulnerability(Entity *pProjectile, Entity *pOwner, meansOfDeath_t meansOfDeath)
+{
+    Event *event;
+    Vector delta;
+
+    if (m_iProjectileHitsRemaining > 1) {
+        m_iProjectileHitsRemaining--;
+        return;
+    }
+
+    event = new Event(EV_Damage);
+    delta = origin - pProjectile->origin;
+
+    event->AddEntity(pProjectile);
+    event->AddFloat(health * 2);
+    event->AddEntity(pOwner);
+    event->AddVector(origin);
+    event->AddVector(delta);
+    event->AddVector(vec_zero);
+    event->AddFloat(0);
+    event->AddInteger(0);
+    event->AddInteger(meansOfDeath);
+    event->AddInteger(-1);
+    PostEvent(event, 0);
+}
+
+/*
+====================
+Vehicle::VehicleBlocked
+====================
+*/
+void Vehicle::VehicleBlocked(Event *ev)
+{
+    return;
+    /*
+    Entity* other;
+    float		speed;
+    float    damage;
+    Vector   delta;
+    Vector   newvel;
+    Vector	dir;
+
+    if (!velocity[0] && !velocity[1])
+        return;
+
+    other = ev->GetEntity(1);
+    if (other == driver.ent)
+    {
+        return;
+    }
+    if (other->isSubclassOf(VehicleBase))
+    {
+        delta = other->origin - origin;
+        delta.normalize();
+
+        newvel = vec_zero - (velocity)+(other->velocity * 0.25);
+        if (newvel * delta < 0)
+        {
+            velocity = newvel;
+            delta = velocity - other->velocity;
+            damage = delta.length() / 4;
+        }
+        else
+        {
+            return;
+        }
+    }
+    else if ((velocity.length() < 350))
+    {
+        other->velocity += velocity * 1.25f;
+        other->velocity[2] += 100;
+        damage = velocity.length() / 4;
+    }
+    else
+    {
+        damage = other->health + 1000;
+    }
+
+    // Gib 'em outright
+    speed = fabs(velocity.length());
+    dir = velocity * (1 / speed);
+    other->Damage(this, lastdriver.ent, damage, origin, dir, vec_zero, speed, 0, MOD_VEHICLE, -1, -1, 1.0f);
+*/
+}
+
+/*
+====================
+Vehicle::WorldEffects
+====================
+*/
+void Vehicle::WorldEffects(void)
+{
+    /*
+    //
+    // Check for earthquakes
+    //
+    if (groundentity && (level.earthquake_magnitude > 0.0f)) {
+        velocity += Vector(
+            level.earthquake_magnitude * EARTHQUAKE_STRENGTH * G_CRandom(),
+            level.earthquake_magnitude * EARTHQUAKE_STRENGTH * G_CRandom(),
+            level.earthquake_magnitude * 1.5f * G_Random()
+        );
+    }
+
+    //
+    // check for lava
+    //
+    if (watertype & CONTENTS_LAVA) {
+        Damage(world, world, 20 * waterlevel, origin, vec_zero, vec_zero, 0, DAMAGE_NO_ARMOR, MOD_LAVA);
+    }
+*/
+}
+
+/*
+====================
+Vehicle::UpdateVariables
+====================
+*/
+void Vehicle::UpdateVariables(
+    Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+)
+{}
+
+/*
+====================
+Vehicle::TorqueLookup
+====================
+*/
+float Vehicle::TorqueLookup(int rpm)
+{
+    if (rpm < 5000) {
+        return 190;
+    } else if (rpm < 6000) {
+        return (float)(190 * (6000 - rpm)) / 1000.f;
+    } else {
+        return 0;
+    }
+}
+
+/*
+====================
+Vehicle::SpawnTurret
+====================
+*/
+void Vehicle::SpawnTurret(Event *ev)
+{
+    VehicleTurretGun *pTurret;
+    int               slot;
+
+    pTurret = new VehicleTurretGun();
+    pTurret->SetBaseOrientation(orientation, NULL);
+    pTurret->setModel(ev->GetString(2));
+
+    slot = ev->GetInteger(1);
+    AttachTurretSlot(slot, pTurret, vec_zero, NULL);
+
+    pTurret->SetVehicleOwner(this);
+    pTurret->PostEvent(EV_TakeDamage, EV_POSTSPAWN);
+    UpdateTurretSlot(slot);
+
+    pTurret->ProcessPendingEvents();
+}
+
+/*
+====================
+Vehicle::EventModifyDrive
+====================
+*/
+void Vehicle::EventModifyDrive(Event *ev)
+{
+    if (!level.Spawned()) {
+        ScriptError("ModifyDrive used improperly... (used before the level is spawned)");
+    }
+
+    if (!m_bAutoPilot || !this->m_pCurPath) {
+        ScriptError("ModifyDrive used when not driving!");
+    }
+
+    if (ev->NumArgs() < 1 || ev->NumArgs() > 3) {
+        ScriptError("wrong number of arguments");
+    }
+
+    switch (ev->NumArgs()) {
+    case 3:
+        m_fLookAhead = ev->GetFloat(3);
+    case 2:
+        m_fIdealAccel = ev->GetFloat(2);
+    case 1:
+        m_fIdealSpeed = ev->GetFloat(1);
+        m_fMaxSpeed   = m_fIdealSpeed;
+        break;
+    }
+}
+
+/*
+====================
+Vehicle::EventModel
+====================
+*/
+void Vehicle::EventModel(Event *ev)
+{
+    SetModelEvent(ev);
+}
+
+/*
+====================
+Vehicle::TouchStuff
+====================
+*/
+void Vehicle::TouchStuff(vmove_t *vm)
+{
+    int        i, j;
+    gentity_t *other;
+    Event     *event;
+
+    if (driver.ent) {
+        G_TouchTriggers(driver.ent);
+    }
+
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        if (Passengers[i].ent) {
+            G_TouchTriggers(Passengers[i].ent);
+        }
+    }
+
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        if (Turrets[i].ent) {
+            G_TouchTriggers(Turrets[i].ent);
+        }
+    }
+
+    if (getMoveType() != MOVETYPE_NOCLIP) {
+        G_TouchTriggers(this);
+    }
+
+    for (i = 0; i < vm->numtouch; i++) {
+        other = &g_entities[vm->touchents[i]];
+
+        for (j = 0; j < i; j++) {
+            gentity_t *ge = &g_entities[j];
+
+            if (ge == other) {
+                break;
+            }
+        }
+
+        if (j != i) {
+            // duplicated
+            continue;
+        }
+
+        // Don't bother touching the world
+        if ((!other->entity) || (other->entity == world)) {
+            continue;
+        }
+
+        event = new Event(EV_Touch);
+        event->AddEntity(this);
+        other->entity->ProcessEvent(event);
+
+        event = new Event(EV_Touch);
+        event->AddEntity(other->entity);
+        ProcessEvent(event);
+    }
+}
+
+/*
+====================
+Vehicle::EventNextDrive
+====================
+*/
+void Vehicle::EventNextDrive(Event *ev)
+{
+    SimpleEntity *path;
+    float        *i_fTmp;
+    float         o_fTmp[4];
+    Vector        org1;
+    Vector        org2;
+
+    path = ev->GetSimpleEntity(1);
+
+    if (!m_bAutoPilot) {
+        ScriptError("Cannot Set Next Path because Not Currently Driving a Path.");
+    }
+
+    if (!m_pCurPath || m_pCurPath->m_iPoints == 0) {
+        ScriptError("Cannot Set Next Path because Current Path is Empty.");
+    }
+
+    if (!m_pNextPath) {
+        m_pNextPath = new cVehicleSpline;
+    }
+
+    SetupPath(m_pNextPath, path);
+
+    i_fTmp = m_pCurPath->GetByNode(m_pCurPath->m_iPoints, NULL);
+    org1   = (i_fTmp + 1);
+    i_fTmp = m_pNextPath->GetByNode(0.0f, NULL);
+    org2   = (i_fTmp + 1);
+
+    o_fTmp[0] = (org2 - org1).length();
+    VectorClear(o_fTmp + 1);
+
+    m_pNextPath->UniformAdd(o_fTmp);
+    m_iNextPathStartNode = m_pCurPath->Append(m_pNextPath);
+}
+
+/*
+====================
+Vehicle::EventLockMovement
+====================
+*/
+void Vehicle::EventLockMovement(Event *ev)
+{
+    m_bMovementLocked = true;
+}
+
+/*
+====================
+Vehicle::EventUnlockMovement
+====================
+*/
+void Vehicle::EventUnlockMovement(Event *ev)
+{
+    m_bMovementLocked = false;
+}
+
+/*
+====================
+Vehicle::EventRemoveOnDeath
+====================
+*/
+void Vehicle::EventRemoveOnDeath(Event *ev)
+{
+    m_bRemoveOnDeath = ev->GetBoolean(1);
+}
+
+/*
+====================
+Vehicle::EventSetExplosionModel
+====================
+*/
+void Vehicle::EventSetExplosionModel(Event *ev)
+{
+    m_sExplosionModel = ev->GetString(1);
+}
+
+/*
+====================
+Vehicle::EventSetCollisionModel
+====================
+*/
+void Vehicle::EventSetCollisionModel(Event *ev)
+{
+    Entity *pColEnt = ev->GetEntity(1);
+
+    if (!pColEnt) {
+        ScriptError("Trying to set a collision model with a NULL entity.");
+    }
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->PostEvent(EV_Remove, EV_VEHICLE);
+    }
+
+    m_pCollisionEntity = new VehicleCollisionEntity(this);
+    m_pCollisionEntity->setModel(pColEnt->model);
+
+    if (!m_pCollisionEntity->model.length() || *m_pCollisionEntity->model != '*') {
+        // Re-post the event with the correct time
+        m_pCollisionEntity->CancelEventsOfType(EV_Remove);
+        m_pCollisionEntity->PostEvent(EV_Remove, EV_VEHICLE);
+        m_pCollisionEntity = NULL;
+
+        ScriptError("Model for Entity not of a valid type. Must be B-Model.");
+    }
+
+    m_pCollisionEntity->setOrigin(origin);
+    m_pCollisionEntity->setAngles(angles);
+}
+
+/*
+====================
+Vehicle::EventGetCollisionModel
+====================
+*/
+void Vehicle::EventGetCollisionModel(Event *ev)
+{
+    ev->AddEntity(m_pCollisionEntity);
+}
+
+/*
+====================
+Vehicle::EventSetSoundParameters
+====================
+*/
+void Vehicle::EventSetSoundParameters(Event *ev)
+{
+    m_fSoundMinSpeed = ev->GetFloat(1);
+    m_fSoundMinPitch = ev->GetFloat(2);
+    m_fSoundMaxSpeed = ev->GetFloat(3);
+    m_fSoundMaxPitch = ev->GetFloat(4);
+}
+
+/*
+====================
+Vehicle::EventSetVolumeParameters
+====================
+*/
+void Vehicle::EventSetVolumeParameters(Event *ev)
+{
+    m_fVolumeMinSpeed = ev->GetFloat(1);
+    m_fVolumeMinPitch = ev->GetFloat(2);
+    m_fVolumeMaxSpeed = ev->GetFloat(3);
+    m_fVolumeMaxPitch = ev->GetFloat(4);
+}
+
+/*
+====================
+Vehicle::UpdateSound
+====================
+*/
+void Vehicle::UpdateSound(void)
+{
+    float pitch;
+    float volume;
+
+    if (level.time < m_fNextSoundState) {
+        return;
+    }
+
+    // Calculate the pitch based on the vehicle's speed
+    pitch = (velocity.length() - m_fSoundMinSpeed) / (m_fSoundMaxSpeed - m_fSoundMinSpeed);
+
+    if (pitch > 1.0f) {
+        pitch = 1.0f;
+    } else if (pitch < 0.0f) {
+        pitch = 0.0f;
+    }
+
+    pitch = m_fSoundMinPitch + (m_fSoundMaxPitch - m_fSoundMinPitch) * pitch;
+
+    volume = (velocity.length() - m_fVolumeMinSpeed) / (m_fVolumeMaxSpeed - m_fVolumeMinSpeed);
+
+    if (volume > 1.0f) {
+        volume = 1.0f;
+    } else if (volume < 0.0f) {
+        volume = 0.0f;
+    }
+
+    volume = this->m_fVolumeMinPitch + (this->m_fVolumeMaxPitch - this->m_fVolumeMinPitch) * volume;
+
+    switch (m_eSoundState) {
+    case ST_OFF:
+        StopLoopSound();
+        TurnOffVehicleSoundEntities();
+        m_fNextSoundState = level.time;
+
+        if (driver.ent || m_bAutoPilot) {
+            m_eSoundState = ST_OFF_TRANS_IDLE;
+        }
+        break;
+
+    case ST_OFF_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+        Sound(m_sSoundSet + "snd_on");
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+
+    case ST_IDLE_TRANS_OFF:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        Sound(m_sSoundSet + "snd_off");
+        StopLoopSound();
+        break;
+
+    case ST_IDLE:
+        m_fNextSoundState = level.time;
+
+        if (driver.ent || m_bAutoPilot) {
+            if (fabs(DotProduct(orientation[0], velocity)) > 10.0f) {
+                m_eSoundState = ST_IDLE_TRANS_RUN;
+            }
+        } else {
+            m_eSoundState = ST_IDLE_TRANS_OFF;
+        }
+
+        LoopSound(m_sSoundSet + "snd_idle");
+
+        TurnOffVehicleSoundEntities();
+        break;
+
+    case ST_IDLE_TRANS_RUN:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_RUN;
+
+        Sound(m_sSoundSet + "snd_revup");
+        LoopSound(m_sSoundSet + "snd_run", -1.0f, -1.0f, -1.0f, pitch);
+        break;
+
+    case ST_RUN:
+        m_fNextSoundState = level.time;
+
+        if (fabs(DotProduct(orientation[0], velocity)) < 10.0f) {
+            m_eSoundState = ST_RUN_TRANS_IDLE;
+        }
+
+        TurnOnVehicleSoundEntities();
+        LoopSound(m_sSoundSet + "snd_run", volume, -1.0f, -1.0f, pitch);
+        break;
+
+    case ST_RUN_TRANS_IDLE:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_IDLE;
+
+        Sound(m_sSoundSet + "snd_revdown");
+        LoopSound(m_sSoundSet + "snd_idle");
+        break;
+
+    default:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = ST_OFF;
+        break;
+    }
+}
+
+/*
+====================
+Vehicle::SetupVehicleSoundEntities
+====================
+*/
+void Vehicle::SetupVehicleSoundEntities(void)
+{
+    int    i;
+    Vector a;
+    Vector b;
+    Vector c;
+    Vector start;
+
+    angles.AngleVectorsLeft(&a, &b, &c);
+
+    // place the sound entities in the vehicle wheels
+    for (i = 0; i < MAX_CORNERS; i++) {
+        if (!m_pVehicleSoundEntities[i]) {
+            m_pVehicleSoundEntities[i] = new VehicleSoundEntity(this);
+        }
+
+        start = origin + a * Corners[i][0] + b * Corners[i][1] + c * Corners[i][2];
+        m_pVehicleSoundEntities[i]->setOrigin(start);
+    }
+}
+
+/*
+====================
+Vehicle::TurnOnVehicleSoundEntities
+====================
+*/
+void Vehicle::TurnOnVehicleSoundEntities(void)
+{
+    for (int i = 0; i < MAX_CORNERS; i++) {
+        if (!m_pVehicleSoundEntities[i]) {
+            m_pVehicleSoundEntities[i] = new VehicleSoundEntity(this);
+        }
+
+        m_pVehicleSoundEntities[i]->Start();
+    }
+}
+
+/*
+====================
+Vehicle::TurnOffVehicleSoundEntities
+====================
+*/
+void Vehicle::TurnOffVehicleSoundEntities(void)
+{
+    for (int i = 0; i < MAX_CORNERS; i++) {
+        if (!m_pVehicleSoundEntities[i]) {
+            m_pVehicleSoundEntities[i] = new VehicleSoundEntity(this);
+        }
+
+        m_pVehicleSoundEntities[i]->Stop();
+    }
+}
+
+/*
+====================
+Vehicle::RemoveVehicleSoundEntities
+====================
+*/
+void Vehicle::RemoveVehicleSoundEntities(void)
+{
+    for (int i = 0; i < MAX_CORNERS; i++) {
+        if (!m_pVehicleSoundEntities[i]) {
+            continue;
+        }
+
+        m_pVehicleSoundEntities[i]->PostEvent(EV_Remove, EV_VEHICLE);
+    }
+}
+
+/*
+====================
+Vehicle::KickSuspension
+====================
+*/
+void Vehicle::KickSuspension(Vector vDirection, float fForce)
+{
+    VectorNormalizeFast(vDirection);
+
+    m_fForwardForce += vDirection * orientation[1] * fForce;
+    m_fLeftForce += vDirection * orientation[0] * fForce;
+}
+
+/*
+====================
+Vehicle::EventDamage
+====================
+*/
+void Vehicle::EventDamage(Event *ev)
+{
+    Entity *pEnt;
+    Vector  vDirection;
+    float   fForce;
+    int     i;
+
+    if (!IsDamagedBy(ev->GetEntity(3))) {
+        return;
+    }
+
+    pEnt = ev->GetEntity(1);
+    if (pEnt && pEnt == driver.ent) {
+        return;
+    }
+
+    Event *event = new Event(EV_Damage, ev->NumArgs());
+
+    vDirection = ev->GetVector(5);
+    fForce     = ev->GetFloat(7);
+    KickSuspension(vDirection, fForce);
+
+    for (i = 1; i <= ev->NumArgs(); i++) {
+        if (i == 7) {
+            event->AddFloat(0);
+        } else {
+            event->AddValue(ev->GetValue(i));
+        }
+    }
+
+    if (driver.ent && driver.ent->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(driver.ent.Pointer());
+        Vector  dir    = ev->GetVector(1);
+        float   dir_yaw;
+        float   camera_yaw;
+
+        if (player->camera) {
+            dir_yaw    = dir.toYaw();
+            camera_yaw = player->camera->angles[1];
+        } else {
+            dir_yaw    = dir.toYaw();
+            camera_yaw = player->GetVAngles()[1];
+        }
+
+        player->damage_yaw = AngleSubtract(camera_yaw, dir_yaw) + 180.5;
+    }
+
+    DamageEvent(event);
+    delete event;
+}
+
+/*
+====================
+Vehicle::FactorInOriginOffset
+====================
+*/
+void Vehicle::FactorInOriginOffset(void)
+{
+    origin += m_vOriginOffset;
+    setOrigin(origin);
+}
+
+/*
+====================
+Vehicle::FactorOutOriginOffset
+====================
+*/
+void Vehicle::FactorOutOriginOffset(void)
+{
+    origin -= m_vOriginOffset;
+    setOrigin(origin);
+}
+
+/*
+====================
+Vehicle::CalculateOriginOffset
+====================
+*/
+void Vehicle::CalculateOriginOffset(void)
+{
+    int    index;
+    Vector vTireAvg;
+    Vector vMissHit;
+    Vector temp;
+    int    iNum = 0;
+    Vector acceleration;
+    Vector oldoffset;
+
+    oldoffset = m_vOriginOffset;
+    m_vOriginOffset += m_vOriginOffset2;
+    m_vOriginOffset2 = vec_zero;
+
+    for (index = 0; index < MAX_CORNERS; index++) {
+        if (m_bTireHit[index]) {
+            temp = m_vTireEnd[index];
+            vTireAvg += origin - temp;
+            iNum++;
+        } else {
+            temp     = Corners[index];
+            vMissHit = temp;
+        }
+    }
+
+    if (iNum == 3) {
+        temp = m_vNormalSum * (1.0f / m_iNumNormals);
+        ProjectPointOnPlane(acceleration, vMissHit, temp);
+        vTireAvg += acceleration;
+    } else if (iNum == 4) {
+        vTireAvg *= 0.25f;
+        MatrixTransformVector(m_vOriginCornerOffset, orientation, acceleration);
+        vTireAvg -= acceleration;
+        m_vOriginOffset2 += vTireAvg;
+    }
+
+    m_vOriginOffset2 += vec_zero;
+    FactorInSkidOrigin();
+
+    Vector vTmp = real_acceleration - prev_acceleration;
+
+    m_fDownForce = vTmp[2] * m_fZCoef;
+    m_fDownForce = Q_clamp_float(m_fDownForce, m_fZMin, m_fZMax);
+
+    m_fUpForce = -m_vOriginOffset[2] * m_fBouncyCoef + m_fUpForce;
+    m_fUpForce *= m_fSpringyCoef;
+    m_vOriginOffset[2] += (m_fDownForce + m_fUpForce) * level.frametime * 12;
+
+    if (m_vOriginOffset[2] < m_fZMin) {
+        m_vOriginOffset[2] = m_fZMin;
+    }
+
+    m_vOriginOffset -= m_vOriginOffset2;
+
+    if (!isfinite(m_vOriginOffset[0]) || !isfinite(m_vOriginOffset[1]) || !isfinite(m_vOriginOffset[2])) {
+        m_vOriginOffset = oldoffset;
+    }
+}
+
+/*
+====================
+Vehicle::UpdateTires
+====================
+*/
+void Vehicle::UpdateTires(void)
+{
+    int     index;
+    trace_t trace;
+    Vector  a;
+    Vector  b;
+    Vector  c;
+    Vector  vTmp;
+    Vector  t_mins;
+    Vector  t_maxs;
+    Vector  start;
+    Vector  end;
+    Vector  boxoffset;
+    Entity *pSkippedEntities[MAX_SKIPPED_ENTITIES];
+    int     iContentsEntities[MAX_SKIPPED_ENTITIES];
+    solid_t solidEntities[MAX_SKIPPED_ENTITIES];
+    int     iNumSkippedEntities;
+    int     iNumSkipped = 0;
+
+    t_mins = mins * 0.25f;
+    t_maxs = maxs * 0.25f;
+
+    if (real_velocity.length() <= 0.5f && m_iLastTiresUpdate != -1 && m_iLastTiresUpdate + 1000 > level.inttime) {
+        return;
+    }
+
+    m_iLastTiresUpdate = level.inttime;
+
+    vTmp.y = angles.y + m_fSkidAngle;
+    AngleVectors(vTmp, a, b, c);
+
+    // Temporary make slots non-solid for G_Trace
+    SetSlotsNonSolid();
+
+    do {
+        iNumSkippedEntities = 0;
+
+        for (index = 0; index < MAX_CORNERS; index++) {
+            boxoffset = Corners[index];
+            start     = origin + a * boxoffset[0] + b * boxoffset[1] + c * boxoffset[2];
+            end       = start + Vector(0, 0, -400);
+
+            trace = G_Trace(start, t_mins, t_maxs, end, this, MASK_VEHICLE_TIRES, false, "Vehicle::PostThink Corners");
+
+            if (g_showvehiclemovedebug->integer) {
+                G_DebugLine(start, end, 1, 1, 1, 1);
+                G_DebugLine(start, trace.endpos, 1, 0, 0, 1);
+            }
+
+            if (trace.ent && trace.ent->entity && trace.ent->entity->isSubclassOf(VehicleCollisionEntity)) {
+                // save the entity
+                pSkippedEntities[iNumSkipped]  = trace.ent->entity;
+                iContentsEntities[iNumSkipped] = trace.ent->r.contents;
+                solidEntities[iNumSkipped]     = trace.ent->solid;
+                iNumSkipped++;
+
+                if (iNumSkipped >= MAX_SKIPPED_ENTITIES) {
+                    gi.Error(ERR_DROP, "MAX_SKIPPED_ENTITIES hit in VehicleMove.\n");
+                    return;
+                }
+
+                trace.ent->entity->setSolidType(SOLID_NOT);
+                iNumSkippedEntities++;
+            }
+
+            if (trace.fraction == 1.0) {
+                m_bTireHit[index] = false;
+            } else {
+                m_vTireEnd[index] = trace.endpos;
+                m_bTireHit[index] = true;
+            }
+        }
+    } while (iNumSkippedEntities != 0);
+
+    for (index = 0; index < iNumSkipped; index++) {
+        pSkippedEntities[index]->setSolidType(solidEntities[index]);
+        pSkippedEntities[index]->setContents(iContentsEntities[index]);
+    }
+
+    // Turn slots back into a solid state
+    SetSlotsSolid();
+}
+
+/*
+====================
+Vehicle::UpdateNormals
+====================
+*/
+void Vehicle::UpdateNormals(void)
+{
+    Vector vDist1;
+    Vector vDist2;
+    Vector vCross;
+    Vector temp;
+    Vector pitch;
+    Vector i;
+    Vector j;
+
+    if (real_velocity.length() <= 0.5 && m_iLastTiresUpdate != -1 && m_iLastTiresUpdate + 1000 > level.inttime) {
+        return;
+    }
+
+    angles.AngleVectorsLeft(&i, &j, NULL);
+
+    j             = vec_zero - j;
+    m_vNormalSum  = vec_zero;
+    m_iNumNormals = 0;
+
+    if (m_bTireHit[0] && m_bTireHit[1] && m_bTireHit[2]) {
+        vDist1 = m_vTireEnd[1] - m_vTireEnd[0];
+        vDist2 = m_vTireEnd[1] - m_vTireEnd[2];
+
+        CrossProduct(vDist1, vDist2, vCross);
+        vCross.normalize();
+        m_vNormalSum += vCross;
+
+        m_iNumNormals++;
+    }
+
+    if (m_bTireHit[1] && m_bTireHit[2] && m_bTireHit[3]) {
+        vDist1 = m_vTireEnd[2] - m_vTireEnd[1];
+        vDist2 = m_vTireEnd[2] - m_vTireEnd[3];
+
+        CrossProduct(vDist1, vDist2, vCross);
+        vCross.normalize();
+        m_vNormalSum += vCross;
+
+        m_iNumNormals++;
+    }
+
+    if (m_bTireHit[2] && m_bTireHit[3] && m_bTireHit[0]) {
+        vDist1 = m_vTireEnd[3] - m_vTireEnd[0];
+        vDist2 = m_vTireEnd[3] - m_vTireEnd[2];
+
+        CrossProduct(vDist1, vDist2, vCross);
+        vCross.normalize();
+        m_vNormalSum += vCross;
+
+        m_iNumNormals++;
+    }
+
+    if (m_bTireHit[3] && m_bTireHit[0] && m_bTireHit[1]) {
+        vDist1 = m_vTireEnd[0] - m_vTireEnd[3];
+        vDist2 = m_vTireEnd[0] - m_vTireEnd[1];
+
+        CrossProduct(vDist1, vDist2, vCross);
+        vCross.normalize();
+        m_vNormalSum += vCross;
+
+        m_iNumNormals++;
+    }
+
+    if (m_iNumNormals > 1) {
+        float x, z;
+
+        temp = m_vNormalSum / m_iNumNormals;
+        i    = temp.CrossProduct(temp, j);
+
+        pitch = i;
+        x     = pitch.toPitch();
+
+        temp  = m_vNormalSum / m_iNumNormals;
+        pitch = temp.CrossProduct(temp, i);
+        z     = pitch.toPitch();
+
+        angles[0] = x;
+        angles[2] = z;
+    }
+}
+
+/*
+====================
+Vehicle::UpdateBones
+====================
+*/
+void Vehicle::UpdateBones(void)
+{
+    float fNewTurnAngle = AngleNormalize180(turnangle - m_fSkidAngle);
+    fNewTurnAngle       = Q_clamp_float(fNewTurnAngle, -maxturnrate, maxturnrate);
+
+    SetControllerAngles(0, Vector(0, fNewTurnAngle, 0));
+    SetControllerAngles(1, Vector(0, fNewTurnAngle, 0));
+}
+
+/*
+====================
+Vehicle::UpdateShaderOffset
+====================
+*/
+void Vehicle::UpdateShaderOffset(void)
+{
+    m_fShaderOffset -= real_velocity * orientation[0] / 4 * level.frametime;
+    edict->s.shader_time = m_fShaderOffset;
+}
+
+/*
+====================
+Vehicle::UpdateDriverSlot
+====================
+*/
+void Vehicle::UpdateDriverSlot(int iSlot)
+{
+    orientation_t orient;
+
+    if (!(driver.flags & SLOT_BUSY) || !driver.ent) {
+        return;
+    }
+
+    if (driver.boneindex != -1) {
+        GetTag(driver.boneindex, &orient);
+        if (driver.ent->IsSubclassOfActor()) {
+            driver.ent->setOriginEvent(orient.origin);
+        } else {
+            driver.ent->setOrigin(orient.origin);
+        }
+
+        if (drivable) {
+            driver.ent->avelocity = avelocity;
+            driver.ent->velocity  = velocity;
+            driver.ent->setAngles(angles);
+        }
+    } else {
+        Vector forward = orientation[0];
+        Vector left    = orientation[1];
+        Vector up      = orientation[2];
+
+        if (driver.ent->IsSubclassOfActor()) {
+            driver.ent->setOriginEvent(
+                origin + forward * driveroffset[0] + left * driveroffset[1] + up * driveroffset[2]
+            );
+        } else {
+            driver.ent->setOrigin(origin + forward * driveroffset[0] + left * driveroffset[1] + up * driveroffset[2]);
+        }
+
+        if (drivable) {
+            driver.ent->avelocity = avelocity;
+            driver.ent->velocity  = velocity;
+            driver.ent->setAngles(angles);
+        }
+    }
+}
+
+/*
+====================
+Vehicle::UpdatePassengerSlot
+====================
+*/
+void Vehicle::UpdatePassengerSlot(int iSlot)
+{
+    orientation_t orient;
+
+    if (!(Passengers[iSlot].flags & SLOT_BUSY) || !Passengers[iSlot].ent) {
+        return;
+    }
+
+    if (Passengers[iSlot].boneindex != -1) {
+        GetTag(Passengers[iSlot].boneindex, &orient);
+        if (Passengers[iSlot].ent->IsSubclassOfActor()) {
+            Passengers[iSlot].ent->setOriginEvent(orient.origin);
+        } else {
+            Passengers[iSlot].ent->setOrigin(orient.origin);
+        }
+
+        Passengers[iSlot].ent->avelocity = avelocity;
+        Passengers[iSlot].ent->velocity  = velocity;
+
+        if (!Passengers[iSlot].ent->IsSubclassOfActor() || !((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
+            Vector newAngles;
+
+            MatrixToEulerAngles(orient.axis, newAngles);
+            Passengers[iSlot].ent->setAngles(newAngles);
+        }
+    } else {
+        if (Passengers[iSlot].ent->IsSubclassOfActor()) {
+            Passengers[iSlot].ent->setOriginEvent(origin);
+        } else {
+            Passengers[iSlot].ent->setOrigin(origin);
+        }
+
+        Passengers[iSlot].ent->avelocity = avelocity;
+        Passengers[iSlot].ent->velocity  = velocity;
+
+        if (!Passengers[iSlot].ent->IsSubclassOfActor() || ((Actor *)Passengers[iSlot].ent.Pointer())->m_Enemy) {
+            Passengers[iSlot].ent->setAngles(angles);
+        }
+    }
+}
+
+/*
+====================
+Vehicle::UpdateTurretSlot
+====================
+*/
+void Vehicle::UpdateTurretSlot(int iSlot)
+{
+    orientation_t orient;
+
+    if (!(Turrets[iSlot].flags & SLOT_BUSY) || !Turrets[iSlot].ent) {
+        return;
+    }
+
+    if (Turrets[iSlot].boneindex != -1) {
+        GetTag(Turrets[iSlot].boneindex, &orient);
+        if (Turrets[iSlot].ent->IsSubclassOfActor()) {
+            Turrets[iSlot].ent->setOriginEvent(orient.origin);
+        } else {
+            Turrets[iSlot].ent->setOrigin(orient.origin);
+        }
+
+        Turrets[iSlot].ent->avelocity = avelocity;
+        Turrets[iSlot].ent->velocity  = velocity;
+
+        if (Turrets[iSlot].ent->IsSubclassOfVehicleTurretGun()) {
+            VehicleTurretGun *vtg = static_cast<VehicleTurretGun *>(Turrets[iSlot].ent.Pointer());
+            vtg->SetBaseOrientation(orient.axis, NULL);
+        }
+    } else {
+        Vector forward = orientation[0];
+        Vector left    = orientation[1];
+        Vector up      = orientation[2];
+
+        if (Turrets[iSlot].ent->IsSubclassOfActor()) {
+            Turrets[iSlot].ent->setOriginEvent(origin);
+        } else {
+            Turrets[iSlot].ent->setOrigin(origin);
+        }
+
+        Turrets[iSlot].ent->avelocity = avelocity;
+        Turrets[iSlot].ent->velocity  = velocity;
+
+        if (Turrets[iSlot].ent->IsSubclassOfVehicleTurretGun()) {
+            VehicleTurretGun *vtg = static_cast<VehicleTurretGun *>(Turrets[iSlot].ent.Pointer());
+            vtg->SetBaseOrientation(this->orientation, NULL);
+        }
+    }
+}
+
+/*
+====================
+Vehicle::EventStopAtEnd
+====================
+*/
+void Vehicle::EventStopAtEnd(Event *ev)
+{
+    if (!m_pCurPath) {
+        ScriptError("Tried to Stop at end of path on a vehicle who is not driving a path!");
+    }
+
+    m_fStopStartDistance = GetPathPosition(m_pCurPath, m_iCurNode);
+    m_fStopStartSpeed    = moveimpulse;
+    m_fStopEndDistance   = *m_pCurPath->GetByNode(m_pCurPath->m_iPoints, NULL);
+    m_bStopEnabled       = true;
+}
+
+/*
+====================
+Vehicle::GetPathPosition
+====================
+*/
+float Vehicle::GetPathPosition(cVehicleSpline *pPath, int iNode)
+{
+    float *vTmp;
+    vec3_t vPrev;
+    vec3_t vCur;
+    vec3_t vTotal;
+    Vector vDelta;
+    float  fTotal;
+    float  fCoef;
+
+    vTmp = pPath->GetByNode(iNode, NULL);
+    VectorCopy(vTmp + 1, vCur);
+
+    if (g_showvehiclemovedebug->integer) {
+        G_DebugString(vCur, 3.0f, 1.0f, 1.0f, 1.0f, "%f", vTmp[0]);
+    }
+
+    vTmp = pPath->GetByNode(iNode - 1, NULL);
+    VectorCopy(vTmp + 1, vPrev);
+
+    if (g_showvehiclemovedebug->integer) {
+        G_DebugString(vPrev, 3.0f, 1.0f, 1.0f, 1.0f, "%f", vTmp[0]);
+    }
+
+    VectorSubtract(vCur, vPrev, vTotal);
+    fTotal      = VectorLength(vTotal);
+    m_vIdealDir = vTotal;
+    VectorNormalize(m_vIdealDir);
+    angles.AngleVectorsLeft(&vDelta, NULL, NULL);
+
+    fCoef = ProjectLineOnPlane(vDelta, DotProduct(vDelta, origin), vPrev, vCur, NULL);
+
+    if (g_showvehiclemovedebug->integer) {
+        G_DebugBBox(vPrev, Vector(-32, -32, -32), Vector(32, 32, 32), 0, 1, 1, 1);
+        G_DebugBBox(vCur, Vector(-32, -32, -32), Vector(32, 32, 32), 1, 1, 0, 1);
+        G_DebugArrow(vCur, m_vIdealDir * -1.0, (1.0 - fCoef) * fTotal, 0, 1, 0, 1);
+        G_DebugArrow(vPrev, m_vIdealDir, fCoef * fTotal, 0, 0, 1, 1);
+    }
+
+    return *pPath->GetByNode(iNode - (1.0 - fCoef), NULL);
+}
+
+/*
+====================
+Vehicle::EventSkidding
+====================
+*/
+void Vehicle::EventSkidding(Event *ev)
+{
+    if (ev->NumArgs() == 1) {
+        m_bEnableSkidding = ev->GetInteger(1);
+    } else {
+        m_bEnableSkidding = true;
+    }
+
+    ProcessEvent(EV_Vehicle_ContinueSkidding);
+}
+
+/*
+====================
+Vehicle::UpdateSkidAngle
+====================
+*/
+void Vehicle::UpdateSkidAngle(void)
+{
+    if (m_bEnableSkidding) {
+        if (g_showvehiclemovedebug && g_showvehiclemovedebug->integer) {
+            Com_Printf("Skidding!\n");
+        }
+
+        m_fSkidLeftForce += velocity.length() / 150.0f * turnangle;
+        m_fSkidRightForce += -m_fSkidAngle * 0.2;
+        m_fSkidRightForce *= 0.3f;
+        m_fSkidAngle     = m_fSkidAngle + (m_fSkidLeftForce + m_fSkidRightForce) * 22.0f * level.frametime;
+        m_vSkidOrigin[0] = -fabs(m_fSkidAngle);
+    } else {
+        m_fSkidAngle = 0;
+    }
+}
+
+/*
+====================
+Vehicle::FactorInSkidOrigin
+====================
+*/
+void Vehicle::FactorInSkidOrigin(void)
+{
+    Vector vNewOrigin;
+
+    vNewOrigin[0] = orientation[0][0] * m_vSkidOrigin[0] + orientation[1][0] * m_vSkidOrigin[1]
+                  + orientation[2][0] * m_vSkidOrigin[2];
+    vNewOrigin[1] = orientation[0][1] * m_vSkidOrigin[0] + orientation[1][1] * m_vSkidOrigin[1]
+                  + orientation[2][1] * m_vSkidOrigin[2];
+    vNewOrigin[2] = orientation[0][2] * m_vSkidOrigin[0] + orientation[1][2] * m_vSkidOrigin[1]
+                  + orientation[2][2] * m_vSkidOrigin[2];
+
+    m_vOriginOffset2 += vNewOrigin;
+}
+
+/*
+====================
+Vehicle::EventContinueSkidding
+====================
+*/
+void Vehicle::EventContinueSkidding(Event *ev)
+{
+    if (m_bEnableSkidding) {
+        if (HasAnim("skidding")) {
+            NewAnim("skidding", EV_Vehicle_ContinueSkidding, 7, 0.000001f);
+        } else {
+            assert(!"Vehicle without skidding animation.");
+        }
+    } else {
+        if (HasAnim("idle")) {
+            NewAnim("idle", 0, 7, 0.000001f);
+        } else {
+            assert(!"Vehicle without idle animation.");
+        }
+    }
+}
+
+/*
+====================
+Vehicle::FactorInAnglesOffset
+====================
+*/
+void Vehicle::FactorInAnglesOffset(Vector *vAddedAngles)
+{
+    (*vAddedAngles) = m_vAnglesOffset;
+    vAddedAngles->y += m_fSkidAngle;
+}
+
+/*
+====================
+Vehicle::FactorOutAnglesOffset
+====================
+*/
+void Vehicle::FactorOutAnglesOffset(void) {}
+
+/*
+====================
+Vehicle::CalculateAnglesOffset
+====================
+*/
+void Vehicle::CalculateAnglesOffset(Vector acceleration)
+{
+    if (level.inttime <= 1200) {
+        // leave some time before allowing to shake
+        // so all tanks spawn peacefully in the level
+        return;
+    }
+
+    m_fForwardForce += DotProduct(orientation[0], acceleration) * m_fYawCoef;
+    m_fBackForce = -m_vAnglesOffset[0] * m_fBouncyCoef + m_fBackForce;
+    m_fBackForce *= m_fSpringyCoef;
+
+    m_vAnglesOffset[0] += m_fForwardForce + m_fBackForce * 12.0 * level.frametime;
+    m_vAnglesOffset[0] = Q_clamp_float(m_vAnglesOffset[0], m_fYawMin, m_fYawMax);
+
+    m_fForwardForce = 0;
+    m_fLeftForce += acceleration * orientation[1] * m_fRollCoef;
+    m_fRightForce = -m_vAnglesOffset[2] * m_fBouncyCoef + m_fRightForce;
+    m_fRightForce *= m_fSpringyCoef;
+
+    m_vAnglesOffset[2] += 12.0 * (m_fLeftForce + m_fRightForce) * level.frametime;
+    m_vAnglesOffset[2] = Q_clamp_float(m_vAnglesOffset[2], m_fRollMin, m_fRollMax);
+
+    m_fLeftForce = 0;
+}
+
+/*
+====================
+Vehicle::CalculateAnimationData
+====================
+*/
+void Vehicle::CalculateAnimationData(Vector vAngles, Vector vOrigin)
+{
+    float fLeft    = fEpsilon();
+    float fRight   = fEpsilon();
+    float fForward = fEpsilon();
+    float fBack    = fEpsilon();
+    float fLow     = fEpsilon();
+    float fHigh    = fEpsilon();
+
+    if (vAngles[0] < 0.0) {
+        fBack = vAngles[0] / m_fYawMin;
+    } else if (vAngles[0] > 0.0) {
+        fForward = vAngles[0] / m_fYawMax;
+    }
+
+    if (vAngles[2] < 0.0) {
+        fRight = vAngles[2] / m_fRollMin;
+    } else if (vAngles[2] > 0.0) {
+        fLeft = vAngles[2] / m_fRollMax;
+    }
+
+    if (vOrigin[2] < 0.0) {
+        fBack = vOrigin[2] / m_fZMin;
+    } else if (vOrigin[2] > 0.0) {
+        fForward = vOrigin[2] / m_fZMax;
+    }
+
+    if (!m_bAnimMove) {
+        NewAnim("idle", NULL, 0, 1.0);
+        NewAnim("lean_left", NULL, 3, fLeft);
+        NewAnim("lean_right", NULL, 4, fRight);
+        NewAnim("lean_forward", NULL, 1, fForward);
+        NewAnim("lean_back", NULL, 2, fBack);
+        NewAnim("high", NULL, 6, fLow);
+        NewAnim("low", NULL, 5, fHigh);
+    }
+}
+
+/*
+====================
+Vehicle::EventVehicleAnim
+====================
+*/
+void Vehicle::EventVehicleAnim(Event *ev)
+{
+    float weight;
+
+    if (ev->NumArgs() > 1) {
+        weight = ev->GetFloat(2);
+    } else {
+        weight = 1.0f;
+    }
+
+    NewAnim(ev->GetString(1), EV_Vehicle_VehicleAnimDone, 8, weight);
+}
+
+/*
+====================
+Vehicle::EventVehicleAnimDone
+====================
+*/
+void Vehicle::EventVehicleAnimDone(Event *ev)
+{
+    Unregister(STRING_VEHICLEANIMDONE);
+}
+
+void Vehicle::EventVehicleMoveAnim(Event *ev)
+{
+    str anim_name;
+
+    anim_name = ev->GetString(1);
+    if (!HasAnim(anim_name)) {
+        return;
+    }
+
+    m_bAnimMove = true;
+
+    StopAnimating(0);
+    StopAnimating(3);
+    StopAnimating(4);
+    StopAnimating(1);
+    StopAnimating(2);
+    StopAnimating(6);
+    StopAnimating(5);
+    StopAnimating(8);
+
+    NewAnim(anim_name, EV_Vehicle_VehicleMoveAnimDone);
+}
+
+void Vehicle::EventVehicleMoveAnimDone(Event *ev)
+{
+    Unregister(STRING_ANIMDONE);
+    moveimpulse = 0;
+    turnimpulse = 0;
+    m_bAnimMove = false;
+}
+
+void Vehicle::EventDamageSounds(Event *ev)
+{
+    if (ev->NumArgs() == 1) {
+        m_bDamageSounds = ev->GetInteger(1);
+    } else {
+        m_bDamageSounds = true;
+    }
+}
+
+void Vehicle::EventRunSounds(Event *ev)
+{
+    if (ev->NumArgs() == 1) {
+        m_bRunSounds = ev->GetInteger(1);
+    } else {
+        m_bRunSounds = true;
+    }
+}
+
+void Vehicle::Remove(Event *ev)
+{
+    int i;
+
+    for (i = 0; i < MAX_TURRETS; i++) {
+        Entity *pTurret = Turrets[i].ent;
+        if (!pTurret) {
+            continue;
+        }
+
+        pTurret->PostEvent(EV_Remove, 0);
+        Turrets[i].ent = NULL;
+    }
+
+    Entity::Remove(ev);
+}
+
+/*
+====================
+Vehicle::IsDamagedBy
+
+Returns whether or not the vehicle is damaged by the specified entity.
+====================
+*/
+bool Vehicle::IsDamagedBy(Entity *ent)
+{
+    int i;
+
+    if (FindDriverSlotByEntity(ent) != -1) {
+        return false;
+    }
+
+    if (FindPassengerSlotByEntity(ent) != -1) {
+        return false;
+    }
+
+    if (FindTurretSlotByEntity(ent) != -1) {
+        return false;
+    }
+
+    for (i = 0; i < MAX_TURRETS; i++) {
+        TurretGun *pTurret;
+
+        if (!Turrets[i].ent) {
+            continue;
+        }
+
+        pTurret = static_cast<TurretGun *>(Turrets[i].ent.Pointer());
+        if (pTurret->IsSubclassOfTurretGun() && pTurret->owner == ent) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+/*
+====================
+Vehicle::DriverAdded
+====================
+*/
+void Vehicle::DriverAdded() {}
+
+void Vehicle::EventSetMaxUseAngle(Event *ev)
+{
+    m_fMaxUseAngle = ev->GetFloat(1);
+}
+
+void Vehicle::EventCanUse(Event *ev)
+{
+    Entity *entity = ev->GetEntity(1);
+
+    if (driver.ent || !m_fMaxUseAngle || !Turrets[0].ent) {
+        ev->AddInteger(1);
+        return;
+    }
+
+    if (!entity) {
+        ev->AddInteger(0);
+        return;
+    }
+
+    Vector vForward;
+    Vector vDir;
+
+    AngleVectors(Turrets[0].ent->angles, vForward, NULL, NULL);
+
+    vDir = Turrets[0].ent->origin - entity->origin;
+    VectorNormalize(vDir);
+
+    if (fabs(GetAngleBetweenVectors2D(vForward, vDir)) > m_fMaxUseAngle) {
+        ev->AddInteger(false);
+    } else {
+        ev->AddInteger(true);
+    }
+}
+
+int Vehicle::GetProjectileHitsRemaining() const {
+    return m_iProjectileHitsRemaining;
+}
+
+/*
+====================
+Vehicle::Archive
+====================
+*/
+void Vehicle::Archive(Archiver& arc)
+{
+    VehicleBase::Archive(arc);
+
+    arc.ArchiveFloat(&maxturnrate);
+    arc.ArchiveFloat(&currentspeed);
+    arc.ArchiveFloat(&turnangle);
+    arc.ArchiveFloat(&turnimpulse);
+    arc.ArchiveFloat(&moveimpulse);
+    arc.ArchiveFloat(&jumpimpulse);
+    arc.ArchiveFloat(&speed);
+    arc.ArchiveFloat(&conesize);
+    arc.ArchiveFloat(&maxtracedist);
+    arc.ArchiveString(&weaponName);
+    arc.ArchiveString(&vehicleName);
+    arc.ArchiveVector(&last_origin);
+    arc.ArchiveVector(&seatangles);
+    arc.ArchiveVector(&seatoffset);
+    arc.ArchiveVector(&driveroffset);
+
+    arc.ArchiveVector(&Corners[0]);
+    arc.ArchiveVector(&Corners[1]);
+    arc.ArchiveVector(&Corners[2]);
+    arc.ArchiveVector(&Corners[3]);
+
+    arc.ArchiveBoolean(&drivable);
+    arc.ArchiveBoolean(&pathDrivable); // Added in 2.30
+    arc.ArchiveBoolean(&locked);
+    arc.ArchiveBoolean(&hasweapon);
+    arc.ArchiveBoolean(&showweapon);
+    arc.ArchiveBoolean(&steerinplace);
+    arc.ArchiveBoolean(&jumpable);
+
+    arc.ArchiveBoolean(&m_bMovementLocked);
+    arc.ArchiveBoolean(&m_bAnimMove);                // Added in 2.0
+    arc.ArchiveBoolean(&m_bDamageSounds);            // Added in 2.0
+    arc.ArchiveBoolean(&m_bRunSounds);               // Added in 2.0
+    arc.ArchiveInteger(&m_iProjectileHitsRemaining); // Added in 2.30
+
+    driver.Archive(arc);
+    lastdriver.Archive(arc);
+
+    for (int i = 0; i < MAX_PASSENGERS; i++) {
+        Passengers[i].Archive(arc);
+    }
+
+    for (int i = 0; i < MAX_TURRETS; i++) {
+        Turrets[i].Archive(arc);
+    }
+
+    arc.ArchiveInteger(&numPassengers);
+    arc.ArchiveInteger(&numTurrets);
+    arc.ArchiveInteger(&moveresult);
+    arc.ArchiveInteger(&isBlocked);
+    arc.ArchiveInteger(&m_iFrameCtr);
+    arc.ArchiveInteger(&m_iGear);
+    arc.ArchiveInteger(&m_iRPM);
+    arc.ArchiveInteger(&m_iNextPathStartNode);
+
+    if (!arc.Saving()) {
+        m_iLastTiresUpdate = -1;
+
+        int tempInt;
+        arc.ArchiveInteger(&tempInt);
+
+        if (tempInt) {
+            m_pAlternatePath = new cVehicleSpline;
+        } else {
+            m_pAlternatePath = NULL;
+        }
+    } else {
+        int tempInt = m_pAlternatePath != NULL;
+        arc.ArchiveInteger(&tempInt);
+    }
+
+    if (m_pAlternatePath) {
+        m_pAlternatePath->Archive(arc);
+    }
+
+    arc.ArchiveInteger(&m_iAlternateNode);
+
+    if (!arc.Saving()) {
+        int tempInt;
+        arc.ArchiveInteger(&tempInt);
+
+        if (tempInt) {
+            m_pCurPath = new cVehicleSpline;
+        } else {
+            m_pCurPath = NULL;
+        }
+    } else {
+        int tempInt = m_pCurPath != NULL;
+        arc.ArchiveInteger(&tempInt);
+    }
+
+    if (m_pCurPath) {
+        m_pCurPath->Archive(arc);
+    }
+
+    arc.ArchiveInteger(&m_iCurNode);
+
+    if (!arc.Saving()) {
+        int tempInt;
+        arc.ArchiveInteger(&tempInt);
+
+        if (tempInt) {
+            m_pNextPath = new cVehicleSpline;
+        } else {
+            m_pNextPath = NULL;
+        }
+    } else {
+        int tempInt = m_pNextPath != NULL;
+        arc.ArchiveInteger(&tempInt);
+    }
+
+    if (m_pNextPath) {
+        m_pNextPath->Archive(arc);
+    }
+
+    arc.ArchiveFloat(&maxturnrate);
+    arc.ArchiveFloat(&currentspeed);
+    arc.ArchiveFloat(&turnangle);
+    arc.ArchiveFloat(&turnimpulse);
+    arc.ArchiveFloat(&moveimpulse);
+    arc.ArchiveFloat(&prev_moveimpulse);
+    arc.ArchiveFloat(&jumpimpulse);
+    arc.ArchiveFloat(&speed);
+    arc.ArchiveFloat(&conesize);
+    arc.ArchiveFloat(&maxtracedist);
+    arc.ArchiveFloat(&airspeed);
+    arc.ArchiveFloat(&m_fGearRatio[0]);
+    arc.ArchiveFloat(&m_fGearRatio[1]);
+    arc.ArchiveFloat(&m_fGearRatio[2]);
+    arc.ArchiveFloat(&m_fGearRatio[3]);
+    arc.ArchiveFloat(&m_fGearRatio[4]);
+    arc.ArchiveFloat(&m_fGearRatio[5]);
+    arc.ArchiveFloat(&m_fMass);
+    arc.ArchiveFloat(&m_fFrontMass);
+    arc.ArchiveFloat(&m_fBackMass);
+    arc.ArchiveFloat(&m_fWheelBase);
+    arc.ArchiveFloat(&m_fWheelFrontLoad);
+    arc.ArchiveFloat(&m_fWheelFrontInnerLoad);
+    arc.ArchiveFloat(&m_fWheelFrontOutterLoad);
+    arc.ArchiveFloat(&m_fWheelFrontDist);
+    arc.ArchiveFloat(&m_fWheelFrontSuspension);
+    arc.ArchiveFloat(&m_fWheelBackLoad);
+    arc.ArchiveFloat(&m_fWheelBackInnerLoad);
+    arc.ArchiveFloat(&m_fWheelBackOutterLoad);
+    arc.ArchiveFloat(&m_fWheelBackDist);
+    arc.ArchiveFloat(&m_fWheelBackSuspension);
+    arc.ArchiveFloat(&m_fCGHeight);
+    arc.ArchiveFloat(&m_fBankAngle);
+    arc.ArchiveFloat(&m_fTread);
+    arc.ArchiveFloat(&m_fTrackWidth);
+    arc.ArchiveFloat(&m_fTireFriction);
+    arc.ArchiveFloat(&m_fDrag);
+    arc.ArchiveFloat(&m_fTireRadius);
+    arc.ArchiveFloat(&m_fFrontBrakes);
+    arc.ArchiveFloat(&m_fBackBrakes);
+    arc.ArchiveFloat(&m_fRollingResistance);
+    arc.ArchiveFloat(&m_fTireRotationalSpeed);
+    arc.ArchiveFloat(&m_fFrontBrakingForce);
+    arc.ArchiveFloat(&m_fBackBrakingForce);
+    arc.ArchiveFloat(&m_fBrakingPerformance);
+    arc.ArchiveFloat(&m_fLastTurn);
+    arc.ArchiveFloat(&m_fTangForce);
+    arc.ArchiveFloat(&m_fInertia);
+    arc.ArchiveFloat(&m_fDifferentialRatio);
+    arc.ArchiveFloat(&m_fGearEfficiency);
+    arc.ArchiveFloat(&m_fMaxTraction);
+    arc.ArchiveFloat(&m_fTractionForce);
+    arc.ArchiveFloat(&m_fAccelerator);
+    arc.ArchiveFloat(&m_fTorque);
+    arc.ArchiveFloat(&m_fDownForce);
+    arc.ArchiveFloat(&m_fUpForce);
+    arc.ArchiveFloat(&m_fLeftForce);
+    arc.ArchiveFloat(&m_fRightForce);
+    arc.ArchiveFloat(&m_fForwardForce);
+    arc.ArchiveFloat(&m_fBackForce);
+    arc.ArchiveFloat(&m_fBouncyCoef);
+    arc.ArchiveFloat(&m_fSpringyCoef);
+    arc.ArchiveFloat(&m_fYawMin);
+    arc.ArchiveFloat(&m_fYawMax);
+    arc.ArchiveFloat(&m_fRollMin);
+    arc.ArchiveFloat(&m_fRollMax);
+    arc.ArchiveFloat(&m_fZMin);
+    arc.ArchiveFloat(&m_fZMax);
+    arc.ArchiveFloat(&m_fYawCoef);
+    arc.ArchiveFloat(&m_fRollCoef);
+    arc.ArchiveFloat(&m_fZCoef);
+    arc.ArchiveFloat(&m_fShaderOffset);
+    arc.ArchiveFloat(&m_fSoundMinSpeed);
+    arc.ArchiveFloat(&m_fSoundMinPitch);
+    arc.ArchiveFloat(&m_fSoundMaxSpeed);
+    arc.ArchiveFloat(&m_fSoundMaxPitch);
+    arc.ArchiveFloat(&m_fVolumeMinSpeed);
+    arc.ArchiveFloat(&m_fVolumeMinPitch);
+    arc.ArchiveFloat(&m_fVolumeMaxSpeed);
+    arc.ArchiveFloat(&m_fVolumeMaxPitch);
+    arc.ArchiveFloat(&m_fStopStartDistance);
+    arc.ArchiveFloat(&m_fStopStartSpeed);
+    arc.ArchiveFloat(&m_fStopEndDistance);
+    arc.ArchiveFloat(&m_fSkidAngle);
+    arc.ArchiveFloat(&m_fSkidLeftForce);
+    arc.ArchiveFloat(&m_fSkidRightForce);
+    arc.ArchiveString(&weaponName);
+    arc.ArchiveString(&m_sAnimationSet);
+    arc.ArchiveString(&m_sSoundSet);
+    arc.ArchiveString(&m_sExplosionModel);
+    arc.ArchiveVector(&last_origin);
+    arc.ArchiveVector(&seatangles);
+    arc.ArchiveVector(&driveroffset);
+    arc.ArchiveVector(&Corners[0]);
+    arc.ArchiveVector(&Corners[1]);
+    arc.ArchiveVector(&Corners[2]);
+    arc.ArchiveVector(&Corners[3]);
+    arc.ArchiveVector(&v_angle);
+    arc.ArchiveVector(&yaw_forward);
+    arc.ArchiveVector(&yaw_left);
+    arc.ArchiveVector(&ground_normal);
+    arc.ArchiveVector(&base_angles);
+    arc.ArchiveVector(&prev_velocity);
+    arc.ArchiveVector(&real_velocity);
+    arc.ArchiveVector(&prev_origin);
+    arc.ArchiveVector(&real_acceleration);
+    arc.ArchiveVector(&prev_acceleration);
+    arc.ArchiveVector(&m_vOldMins);
+    arc.ArchiveVector(&m_vOldMaxs);
+    arc.ArchiveVector(&m_vCG);
+    arc.ArchiveVector(&m_vAngularAcceleration);
+    arc.ArchiveVector(&m_vAngularVelocity);
+    arc.ArchiveVector(&m_vAngles);
+    arc.ArchiveVector(&m_vFrontNormal);
+    arc.ArchiveVector(&m_vBackNormal);
+    arc.ArchiveVector(&m_vFrontAngles);
+    arc.ArchiveVector(&m_vBackAngles);
+    arc.ArchiveVector(&m_vBaseNormal);
+    arc.ArchiveVector(&m_vBaseAngles);
+    arc.ArchiveVector(&m_vPrevNormal);
+    arc.ArchiveVector(&m_vResistance);
+    arc.ArchiveVector(&m_vWheelForce);
+    arc.ArchiveVector(&m_vTangForce);
+    arc.ArchiveVector(&m_vForce);
+    arc.ArchiveVector(&m_vAcceleration);
+    arc.ArchiveVector(&m_vOriginOffset);
+    arc.ArchiveVector(&m_vOriginOffset2);
+    arc.ArchiveVector(&m_vOriginCornerOffset);
+    arc.ArchiveVector(&m_vAnglesOffset);
+    arc.ArchiveVector(&m_vSaveAngles);
+    arc.ArchiveVector(&m_vSkidOrigin);
+    arc.ArchiveBoolean(&drivable);
+    arc.ArchiveBoolean(&locked);
+    arc.ArchiveBoolean(&hasweapon);
+    arc.ArchiveBoolean(&showweapon);
+    arc.ArchiveBoolean(&steerinplace);
+    arc.ArchiveBoolean(&jumpable);
+    arc.ArchiveBoolean(&m_bWheelSpinning);
+    arc.ArchiveBoolean(&m_bIsSkidding);
+    arc.ArchiveBoolean(&m_bIsBraking);
+    arc.ArchiveBoolean(&m_bBackSlipping);
+    arc.ArchiveBoolean(&m_bFrontSlipping);
+    arc.ArchiveBoolean(&m_bAutomatic);
+    arc.ArchiveBoolean(&m_bThinkCalled);
+    arc.ArchiveBoolean(&m_bRemoveOnDeath);
+    arc.ArchiveBoolean(&m_bStopEnabled);
+    arc.ArchiveBoolean(&m_bEnableSkidding);
+
+    arc.ArchiveVec3(vs.origin);
+    arc.ArchiveVec3(vs.velocity);
+    arc.ArchiveInteger(&vs.groundEntityNum);
+    arc.ArchiveBoolean(&vs.walking);
+    arc.ArchiveBoolean(&vs.groundPlane);
+    G_ArchiveTrace(arc, &vs.groundTrace);
+    arc.ArchiveInteger(&vs.entityNum);
+    arc.ArchiveVec2(vs.desired_dir);
+    arc.ArchiveBoolean(&vs.hit_obstacle);
+    arc.ArchiveVec3(vs.hit_origin);
+    arc.ArchiveVec3(vs.obstacle_normal);
+    arc.ArchiveBoolean(&vs.useGravity);
+
+    if (!arc.Saving()) {
+        m_sMoveGrid = new cMoveGrid(3, 3, 1);
+    }
+
+    m_sMoveGrid->Archive(arc);
+
+    arc.ArchiveFloat(&m_fIdealSpeed);
+    arc.ArchiveFloat(&m_fMaxSpeed);       // Added in 2.30
+    arc.ArchiveBool(&m_bBounceBackwards); // Added in 2.30
+    arc.ArchiveVector(&m_vIdealPosition);
+    arc.ArchiveVector(&m_vIdealDir);
+    arc.ArchiveFloat(&m_fIdealAccel);
+    arc.ArchiveFloat(&m_fIdealDistance);
+    arc.ArchiveFloat(&m_fLookAhead);
+    arc.ArchiveBool(&m_bAutoPilot);
+    arc.ArchiveSafePointer(&m_pCollisionEntity);
+    ArchiveEnum(m_eSoundState, SOUND_STATE);
+    arc.ArchiveFloat(&m_fNextSoundState);
+    arc.ArchiveSafePointer(&m_pVehicleSoundEntities[0]);
+    arc.ArchiveSafePointer(&m_pVehicleSoundEntities[1]);
+    arc.ArchiveSafePointer(&m_pVehicleSoundEntities[2]);
+    arc.ArchiveSafePointer(&m_pVehicleSoundEntities[3]);
+
+    // Added in 2.30
+    arc.ArchiveFloat(&m_fMaxUseAngle);
+    arc.ArchiveBool(&m_bBounceStayFullSpeed);
+}
+
+/*
+====================
+Vehicle::GetSoundSet
+====================
+*/
+str Vehicle::GetSoundSet(void)
+{
+    return m_sSoundSet;
+}
+
+/*
+====================
+Vehicle::getName
+====================
+*/
+const str& Vehicle::getName() const
+{
+    return vehicleName;
+}
+
+/*
+====================
+Vehicle::isLocked
+====================
+*/
+qboolean Vehicle::isLocked(void)
+{
+    return locked;
+}
+
+/*
+====================
+Vehicle::Lock
+====================
+*/
+void Vehicle::Lock(void)
+{
+    locked = true;
+}
+
+/*
+====================
+Vehicle::UnLock
+====================
+*/
+void Vehicle::UnLock(void)
+{
+    locked = false;
 }
 
 /*
@@ -6575,19 +6886,15 @@ void Vehicle::UnLock
 Vehicle::GetCollisionEntity
 ====================
 */
-VehicleCollisionEntity *Vehicle::GetCollisionEntity
-	(
-	void
-	)
+VehicleCollisionEntity *Vehicle::GetCollisionEntity(void)
 {
-	return m_pCollisionEntity;
+    return m_pCollisionEntity;
 }
 
-CLASS_DECLARATION( Vehicle, DrivableVehicle, "script_drivablevehicle" )
-{
-	{ &EV_Damage,					&Entity::DamageEvent },
-	{ &EV_Killed,					&DrivableVehicle::Killed },
-	{ NULL, NULL }
+CLASS_DECLARATION(Vehicle, DrivableVehicle, "script_drivablevehicle") {
+    {&EV_Damage, &Entity::DamageEvent    },
+    {&EV_Killed, &DrivableVehicle::Killed},
+    {NULL,       NULL                    }
 };
 
 /*
@@ -6597,15 +6904,11 @@ DrivableVehicle::DrivableVehicle
 */
 DrivableVehicle::DrivableVehicle()
 {
-	if( LoadingSavegame )
-	{
-		// Archive function will setup all necessary data
-		return;
-	}
+    AddWaitTill(STRING_DEATH);
 
-	drivable = true;
-	flags |= FL_POSTTHINK | FL_THINK;
-	setMoveType( MOVETYPE_VEHICLE );
+    drivable = true;
+    setMoveType(MOVETYPE_VEHICLE);
+    flags |= FL_POSTTHINK | FL_THINK;
 }
 
 /*
@@ -6613,105 +6916,118 @@ DrivableVehicle::DrivableVehicle()
 DrivableVehicle::Killed
 ====================
 */
-void DrivableVehicle::Killed
-	(
-	Event *ev
-	)
+void DrivableVehicle::Killed(Event *ev)
 {
-	Entity * ent;
-	Entity * attacker;
-	Vector dir;
-	Event * event;
-	const char * name;
-	VehicleBase *last;
+    Entity      *ent;
+    Entity      *attacker;
+    Vector       dir;
+    Event       *event;
+    const char  *name;
+    VehicleBase *last;
+    int          i;
 
-	takedamage = DAMAGE_NO;
-	setSolidType( SOLID_NOT );
-	hideModel();
+    deadflag = DEAD_DEAD;
+    if (!m_bRemoveOnDeath) {
+        Unregister(STRING_DEATH);
+        return;
+    }
 
-	attacker = ev->GetEntity( 1 );
+    takedamage = DAMAGE_NO;
+    setSolidType(SOLID_NOT);
+    hideModel();
 
-	//
-	// kill the driver.ent
-	//
-	if( driver.ent )
-	{
-		Vector dir;
-		SentientPtr sent;
-		Event * event;
+    attacker = ev->GetEntity(1);
 
-		velocity = vec_zero;
-		sent = ( Sentient * )driver.ent.Pointer();
-		event = new Event( EV_Use );
-		event->AddEntity( sent );
-		ProcessEvent( event );
-		dir = sent->origin - origin;
-		dir[ 2 ] += 64;
-		dir.normalize();
-		sent->Damage( this, this, sent->health * 2, origin, dir, vec_zero, 50, 0, MOD_VEHICLE );
-	}
+    //
+    // kill the driver.ent
+    //
+    if (driver.ent) {
+        Vector      dir;
+        SentientPtr sent;
+        Event      *event;
 
-	if( flags & FL_DIE_EXPLODE )
-	{
-		CreateExplosion( origin, 150 * edict->s.scale, this, this, this );
-	}
+        velocity = vec_zero;
+        sent     = static_cast<Sentient *>(driver.ent.Pointer());
+        event    = new Event(EV_Use);
+        event->AddEntity(sent);
+        ProcessEvent(event);
+        dir = sent->origin - origin;
+        dir[2] += 64;
+        dir.normalize();
+        sent->Damage(this, this, sent->health * 2, origin, dir, vec_zero, 50, 0, MOD_VEHICLE);
+    }
 
-	if( flags & FL_DIE_GIBS )
-	{
-		setSolidType( SOLID_NOT );
-		hideModel();
+    //
+    // kill all passengers
+    //
+    for (i = 0; i < MAX_PASSENGERS; i++) {
+        if (Passengers[i].ent) {
+            Vector      dir;
+            SentientPtr sent;
+            Event      *event;
 
-		CreateGibs( this, -150, edict->s.scale, 3 );
-	}
-	//
-	// kill all my wheels
-	//
-	last = this;
-	while( last->vlink )
-	{
-		last->vlink->PostEvent( EV_Remove, 0 );
-		last = last->vlink;
-	}
+            velocity = vec_zero;
+            sent     = static_cast<Sentient *>(Passengers[i].ent.Pointer());
+            event    = new Event(EV_Use);
+            event->AddEntity(sent);
+            ProcessEvent(event);
+            dir = sent->origin - origin;
+            dir[2] += 64;
+            dir.normalize();
+            sent->Damage(this, this, sent->health * 2, origin, dir, vec_zero, 50, 0, MOD_VEHICLE);
+        }
+    }
 
+    //
+    // remove all turrets
+    //
+    for (i = 0; i < MAX_TURRETS; i++) {
+        if (Turrets[i].ent) {
+            Turrets[i].ent->PostEvent(EV_Remove, EV_VEHICLE);
+        }
+    }
 
-	//
-	// kill the killtargets
-	//
-	name = KillTarget();
-	if( name && strcmp( name, "" ) )
-	{
-		ent = NULL;
-		do
-		{
-			ent = ( Entity * )G_FindTarget( ent, name );
-			if( !ent )
-			{
-				break;
-			}
-			ent->PostEvent( EV_Remove, 0 );
-		} while( 1 );
-	}
+    if (flags & FL_DIE_EXPLODE) {
+        CreateExplosion(origin, 150 * edict->s.scale, this, this, this);
+    }
 
-	//
-	// fire targets
-	//
-	name = Target();
-	if( name && strcmp( name, "" ) )
-	{
-		ent = NULL;
-		do
-		{
-			ent = ( Entity * )G_FindTarget( ent, name );
-			if( !ent )
-			{
-				break;
-			}
+    if (flags & FL_DIE_GIBS) {
+        setSolidType(SOLID_NOT);
+        hideModel();
 
-			event = new Event( EV_Activate );
-			event->AddEntity( attacker );
-			ent->ProcessEvent( event );
-		} while( 1 );
-	}
+        CreateGibs(this, -150, edict->s.scale, 3);
+    }
+    //
+    // kill all my wheels
+    //
+    last = this;
+    while (last->vlink) {
+        last->vlink->PostEvent(EV_Remove, EV_VEHICLE);
+        last = last->vlink;
+    }
 
-	PostEvent( EV_Remove, 0 );
+    //
+    // kill the killtargets
+    //
+    name = KillTarget();
+    if (name && strcmp(name, "")) {
+        for (ent = G_FindTarget(NULL, name); ent; ent = G_FindTarget(ent, name)) {
+            ent->PostEvent(EV_Remove, EV_VEHICLE);
+        }
+    }
+
+    //
+    // fire targets
+    //
+    name = Target();
+    if (name && strcmp(name, "")) {
+        for (ent = G_FindTarget(NULL, name); ent; ent = G_FindTarget(ent, name)) {
+            event = new Event(EV_Activate);
+            event->AddEntity(attacker);
+            ent->ProcessEvent(event);
+        }
+    }
+
+    PostEvent(EV_Remove, EV_VEHICLE);
+    Unregister(STRING_DEATH);
 }
diff --git a/code/fgame/vehicle.h b/code/fgame/vehicle.h
index 140ef507..b8709df2 100644
--- a/code/fgame/vehicle.h
+++ b/code/fgame/vehicle.h
@@ -21,10 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // vehicle.h: Script controlled vehicles.
-// 
+//
 
-#ifndef __VEHICLE_H__
-#define __VEHICLE_H__
+#pragma once
 
 #include "g_local.h"
 #include "entity.h"
@@ -53,821 +52,557 @@ extern Event EV_Vehicle_SetTurnRate;
 extern cvar_t *g_showvehiclemovedebug;
 extern cvar_t *g_showvehicleentrypoints;
 extern cvar_t *g_showvehicleslotpoints;
+extern cvar_t *g_showvehicletags;
 extern cvar_t *g_showvehiclepath;
 
-class wheel_s {
-	Vector vOrigin;
-	Vector vAcceleration;
-	Vector vVelocity;
-	Vector vLongForce;
-	Vector vLatForce;
-	Vector vForce;
-	Vector vOrientation;
-	Vector vResistance;
-	float fYawOffset;
-	float fSlipAngle;
-	float fGripCoef;
-	float fLoad;
-	float fLongForce;
-	float fLatForce;
-	float fForce;
-	float fTraction;
-	float fLongTorque;
-	float fLatTorque;
-	float fTorque;
-	float fLongDist;
-	float fLatDist;
-	qboolean bSkidding;
-	qboolean bSpinning;
-	int iPowered;
-};
+#define NUM_VEHICLE_TIRES 4
+
+using cVehicleSpline = cSpline<4, 512>;
+
+typedef struct wheel_s {
+    Vector   vOrigin;
+    Vector   vAcceleration;
+    Vector   vVelocity;
+    Vector   vLongForce;
+    Vector   vLatForce;
+    Vector   vForce;
+    Vector   vOrientation;
+    Vector   vResistance;
+    float    fYawOffset;
+    float    fSlipAngle;
+    float    fGripCoef;
+    float    fLoad;
+    float    fLongForce;
+    float    fLatForce;
+    float    fForce;
+    float    fTraction;
+    float    fLongTorque;
+    float    fLatTorque;
+    float    fTorque;
+    float    fLongDist;
+    float    fLatDist;
+    qboolean bSkidding;
+    qboolean bSpinning;
+    int      iPowered;
+} wheel_t;
 
 class VehicleBase : public Animate
 {
 public:
-	VehicleBase *vlink;
-	Vector		 offset;
+    VehicleBase *vlink;
+    Vector       offset;
 
-	CLASS_PROTOTYPE( VehicleBase );
+    CLASS_PROTOTYPE(VehicleBase);
 
-	VehicleBase( void );
-	void Archive( Archiver &arc ) override;
+    VehicleBase(void);
+    void Archive(Archiver& arc) override;
 };
 
-inline void VehicleBase::Archive
-	(
-	Archiver &arc
-	)
+inline void VehicleBase::Archive(Archiver& arc)
 {
-	Animate::Archive( arc );
+    Animate::Archive(arc);
 
-	arc.ArchiveObjectPointer( ( Class ** )&vlink );
-	arc.ArchiveVector( &offset );
+    arc.ArchiveObjectPointer((Class **)&vlink);
+    arc.ArchiveVector(&offset);
 }
 
-typedef enum
-{
-	ST_OFF,
-	ST_OFF_TRANS_IDLE,
-	ST_IDLE_TRANS_OFF,
-	ST_IDLE,
-	ST_IDLE_TRANS_RUN,
-	ST_RUN,
-	ST_RUN_TRANS_IDLE,
-	ST_IDLE_TRANS_TURN,
-	ST_TURN,
-	ST_TURN_TRANS_IDLE
+typedef enum {
+    ST_OFF,
+    ST_OFF_TRANS_IDLE,
+    ST_IDLE_TRANS_OFF,
+    ST_IDLE,
+    ST_IDLE_TRANS_RUN,
+    ST_RUN,
+    ST_RUN_TRANS_IDLE,
+    ST_IDLE_TRANS_TURN,
+    ST_TURN,
+    ST_TURN_TRANS_IDLE
 } SOUND_STATE;
 
-#define MAX_DRIVERS						1
-#define MAX_PASSENGERS					32
-#define MAX_TURRETS						8
-#define MAX_SOUND_ENTITIES				4
-#define MAX_CORNERS						4
+#define MAX_DRIVERS          1
+#define MAX_PASSENGERS       32
+#define MAX_TURRETS          8
+#define MAX_CORNERS          4
 
-#define MAX_SKIPPED_ENTITIES			64
+#define MAX_SKIPPED_ENTITIES 64
 
 class Vehicle : public VehicleBase
 {
-	friend class VehicleSoundEntity;
-	friend class VehicleTurretGun;
+    friend class VehicleSoundEntity;
+    friend class VehicleTurretGun;
 
 protected:
-	cVehicleSlot driver;
-	cVehicleSlot lastdriver;
-	cVehicleSlot Passengers[ MAX_PASSENGERS ];
-	cTurretSlot Turrets[ MAX_TURRETS ];
-	int numPassengers;
-	int numTurrets;
-	int moveresult;
-	int isBlocked;
-	int m_iFrameCtr;
-	int m_iGear;
-	int m_iRPM;
-	int m_iLastTiresUpdate;
-	class cSpline<4, 512> *m_pAlternatePath;
-	int m_iAlternateNode;
-	class cSpline<4, 512> *m_pCurPath;
-	int m_iCurNode;
-	class cSpline<4, 512> *m_pNextPath;
-	int m_iNextPathStartNode;
-	float maxturnrate;
-	float currentspeed;
-	float turnangle;
-	float turnimpulse;
-	float moveimpulse;
-	float prev_moveimpulse;
-	float jumpimpulse;
-	float speed;
-	float conesize;
-	float maxtracedist;
-	float airspeed;
-	float m_fGearRatio[ 6 ];
-	float m_fMass;
-	float m_fFrontMass;
-	float m_fBackMass;
-	float m_fWheelBase;
-	float m_fWheelFrontLoad;
-	float m_fWheelFrontInnerLoad;
-	float m_fWheelFrontOutterLoad;
-	float m_fWheelFrontDist;
-	float m_fWheelFrontSuspension;
-	float m_fWheelBackLoad;
-	float m_fWheelBackInnerLoad;
-	float m_fWheelBackOutterLoad;
-	float m_fWheelBackDist;
-	float m_fWheelBackSuspension;
-	float m_fCGHeight;
-	float m_fBankAngle;
-	float m_fTread;
-	float m_fTrackWidth;
-	float m_fTireFriction;
-	float m_fDrag;
-	float m_fTireRadius;
-	float m_fFrontBrakes;
-	float m_fBackBrakes;
-	float m_fRollingResistance;
-	float m_fTireRotationalSpeed;
-	float m_fFrontBrakingForce;
-	float m_fBackBrakingForce;
-	float m_fBrakingPerformance;
-	float m_fLastTurn;
-	float m_fTangForce;
-	float m_fInertia;
-	float m_fDifferentialRatio;
-	float m_fGearEfficiency;
-	float m_fMaxTraction;
-	float m_fTractionForce;
-	float m_fAccelerator;
-	float m_fTorque;
-	float m_fDownForce;
-	float m_fUpForce;
-	float m_fLeftForce;
-	float m_fRightForce;
-	float m_fForwardForce;
-	float m_fBackForce;
-	float m_fBouncyCoef;
-	float m_fSpringyCoef;
-	float m_fYawMin;
-	float m_fYawMax;
-	float m_fRollMin;
-	float m_fRollMax;
-	float m_fZMin;
-	float m_fZMax;
-	float m_fYawCoef;
-	float m_fRollCoef;
-	float m_fZCoef;
-	float m_fShaderOffset;
-	float m_fSoundMinSpeed;
-	float m_fSoundMinPitch;
-	float m_fSoundMaxSpeed;
-	float m_fSoundMaxPitch;
-	float m_fVolumeMinSpeed;
-	float m_fVolumeMinPitch;
-	float m_fVolumeMaxSpeed;
-	float m_fVolumeMaxPitch;
-	float m_fStopStartDistance;
-	float m_fStopStartSpeed;
-	float m_fStopEndDistance;
-	float m_fSkidAngle;
-	float m_fSkidLeftForce;
-	float m_fSkidRightForce;
-	str weaponName;
-	str m_sAnimationSet;
-	str m_sSoundSet;
-	str m_sExplosionModel;
-	Vector last_origin;
-	Vector seatangles;
-	Vector seatoffset;
-	Vector driveroffset;
-	Vector Corners[ MAX_CORNERS ];
-	Vector v_angle;
-	Vector yaw_forward;
-	Vector yaw_left;
-	Vector ground_normal;
-	Vector base_angles;
-	Vector prev_velocity;
-	Vector real_velocity;
-	Vector prev_origin;
-	Vector real_acceleration;
-	Vector prev_acceleration;
-	Vector m_vOldMins;
-	Vector m_vOldMaxs;
-	Vector m_vCG;
-	Vector m_vAngularAcceleration;
-	Vector m_vAngularVelocity;
-	Vector m_vAngles;
-	Vector m_vFrontNormal;
-	Vector m_vBackNormal;
-	Vector m_vFrontAngles;
-	Vector m_vBackAngles;
-	Vector m_vBaseNormal;
-	Vector m_vBaseAngles;
-	Vector m_vPrevNormal;
-	Vector m_vResistance;
-	Vector m_vWheelForce;
-	Vector m_vTangForce;
-	Vector m_vForce;
-	Vector m_vAcceleration;
-	Vector m_vOriginOffset;
-	Vector m_vOriginOffset2;
-	Vector m_vOriginCornerOffset;
-	Vector m_vAnglesOffset;
-	Vector m_vSaveAngles;
-	Vector m_vSkidOrigin;
-	qboolean drivable;
-	qboolean locked;
-	qboolean hasweapon;
-	qboolean showweapon;
-	qboolean steerinplace;
-	qboolean jumpable;
-	qboolean m_bWheelSpinning;
-	qboolean m_bIsSkidding;
-	qboolean m_bIsBraking;
-	qboolean m_bBackSlipping;
-	qboolean m_bFrontSlipping;
-	qboolean m_bAutomatic;
-	qboolean m_bThinkCalled;
-	qboolean m_bMovementLocked;
-	qboolean m_bRemoveOnDeath;
-	qboolean m_bStopEnabled;
-	qboolean m_bEnableSkidding;
-	vmove_s *vm;
-	vehicleState_t vs;
-	cMoveGrid *m_sMoveGrid;
-	float m_fIdealSpeed;
-	Vector m_vIdealPosition;
-	Vector m_vIdealDir;
-	float m_fIdealAccel;
-	float m_fIdealDistance;
-	float m_fLookAhead;
-	bool m_bAutoPilot;
-	SafePtr<VehicleCollisionEntity> m_pCollisionEntity;
-	SOUND_STATE m_eSoundState;
-	float m_fNextSoundState;
-	SafePtr<VehicleSoundEntity> m_pVehicleSoundEntities[ MAX_SOUND_ENTITIES ];
-	Vector m_vTireEnd[ 4 ];
-	bool m_bTireHit[ 4 ];
-	Vector m_vNormalSum;
-	int m_iNumNormals;
+    cVehicleSlot                    driver;
+    cVehicleSlot                    lastdriver;
+    cVehicleSlot                    Passengers[MAX_PASSENGERS];
+    cTurretSlot                     Turrets[MAX_TURRETS];
+    int                             numPassengers;
+    int                             numTurrets;
+    int                             moveresult;
+    int                             isBlocked;
+    int                             m_iFrameCtr;
+    int                             m_iGear;
+    int                             m_iRPM;
+    int                             m_iLastTiresUpdate;
+    cVehicleSpline                 *m_pAlternatePath;
+    int                             m_iAlternateNode;
+    cVehicleSpline                 *m_pCurPath;
+    int                             m_iCurNode;
+    cVehicleSpline                 *m_pNextPath;
+    int                             m_iNextPathStartNode;
+    float                           maxturnrate;
+    float                           currentspeed;
+    float                           turnangle;
+    float                           turnimpulse;
+    float                           moveimpulse;
+    float                           prev_moveimpulse;
+    float                           jumpimpulse;
+    float                           speed;
+    float                           conesize;
+    float                           maxtracedist;
+    float                           airspeed;
+    float                           m_fGearRatio[6];
+    float                           m_fMass;
+    float                           m_fFrontMass;
+    float                           m_fBackMass;
+    float                           m_fWheelBase;
+    float                           m_fWheelFrontLoad;
+    float                           m_fWheelFrontInnerLoad;
+    float                           m_fWheelFrontOutterLoad;
+    float                           m_fWheelFrontDist;
+    float                           m_fWheelFrontSuspension;
+    float                           m_fWheelBackLoad;
+    float                           m_fWheelBackInnerLoad;
+    float                           m_fWheelBackOutterLoad;
+    float                           m_fWheelBackDist;
+    float                           m_fWheelBackSuspension;
+    float                           m_fCGHeight;
+    float                           m_fBankAngle;
+    float                           m_fTread;
+    float                           m_fTrackWidth;
+    float                           m_fTireFriction;
+    float                           m_fDrag;
+    float                           m_fTireRadius;
+    float                           m_fFrontBrakes;
+    float                           m_fBackBrakes;
+    float                           m_fRollingResistance;
+    float                           m_fTireRotationalSpeed;
+    float                           m_fFrontBrakingForce;
+    float                           m_fBackBrakingForce;
+    float                           m_fBrakingPerformance;
+    float                           m_fLastTurn;
+    float                           m_fTangForce;
+    float                           m_fInertia;
+    float                           m_fDifferentialRatio;
+    float                           m_fGearEfficiency;
+    float                           m_fMaxTraction;
+    float                           m_fTractionForce;
+    float                           m_fAccelerator;
+    float                           m_fTorque;
+    float                           m_fDownForce;
+    float                           m_fUpForce;
+    float                           m_fLeftForce;
+    float                           m_fRightForce;
+    float                           m_fForwardForce;
+    float                           m_fBackForce;
+    float                           m_fBouncyCoef;
+    float                           m_fSpringyCoef;
+    float                           m_fYawMin;
+    float                           m_fYawMax;
+    float                           m_fRollMin;
+    float                           m_fRollMax;
+    float                           m_fZMin;
+    float                           m_fZMax;
+    float                           m_fYawCoef;
+    float                           m_fRollCoef;
+    float                           m_fZCoef;
+    float                           m_fShaderOffset;
+    float                           m_fSoundMinSpeed;
+    float                           m_fSoundMinPitch;
+    float                           m_fSoundMaxSpeed;
+    float                           m_fSoundMaxPitch;
+    float                           m_fVolumeMinSpeed;
+    float                           m_fVolumeMinPitch;
+    float                           m_fVolumeMaxSpeed;
+    float                           m_fVolumeMaxPitch;
+    float                           m_fStopStartDistance;
+    float                           m_fStopStartSpeed;
+    float                           m_fStopEndDistance;
+    float                           m_fSkidAngle;
+    float                           m_fSkidLeftForce;
+    float                           m_fSkidRightForce;
+    str                             vehicleName;
+    str                             weaponName;
+    str                             m_sAnimationSet;
+    str                             m_sSoundSet;
+    str                             m_sExplosionModel;
+    Vector                          last_origin;
+    Vector                          seatangles;
+    Vector                          seatoffset;
+    Vector                          driveroffset;
+    Vector                          Corners[MAX_CORNERS];
+    Vector                          v_angle;
+    Vector                          yaw_forward;
+    Vector                          yaw_left;
+    Vector                          ground_normal;
+    Vector                          base_angles;
+    Vector                          prev_velocity;
+    Vector                          real_velocity;
+    Vector                          prev_origin;
+    Vector                          real_acceleration;
+    Vector                          prev_acceleration;
+    Vector                          m_vOldMins;
+    Vector                          m_vOldMaxs;
+    Vector                          m_vCG;
+    Vector                          m_vAngularAcceleration;
+    Vector                          m_vAngularVelocity;
+    Vector                          m_vAngles;
+    Vector                          m_vFrontNormal;
+    Vector                          m_vBackNormal;
+    Vector                          m_vFrontAngles;
+    Vector                          m_vBackAngles;
+    Vector                          m_vBaseNormal;
+    Vector                          m_vBaseAngles;
+    Vector                          m_vPrevNormal;
+    Vector                          m_vResistance;
+    Vector                          m_vWheelForce;
+    Vector                          m_vTangForce;
+    Vector                          m_vForce;
+    Vector                          m_vAcceleration;
+    Vector                          m_vOriginOffset;
+    Vector                          m_vOriginOffset2;
+    Vector                          m_vOriginCornerOffset;
+    Vector                          m_vAnglesOffset;
+    Vector                          m_vSaveAngles;
+    Vector                          m_vSkidOrigin;
+    qboolean                        drivable;
+    qboolean                        pathDrivable;
+    qboolean                        locked;
+    qboolean                        hasweapon;
+    qboolean                        showweapon;
+    qboolean                        steerinplace;
+    qboolean                        jumpable;
+    qboolean                        m_bWheelSpinning;
+    qboolean                        m_bIsSkidding;
+    qboolean                        m_bIsBraking;
+    qboolean                        m_bBackSlipping;
+    qboolean                        m_bFrontSlipping;
+    qboolean                        m_bAutomatic;
+    qboolean                        m_bThinkCalled;
+    qboolean                        m_bMovementLocked;
+    qboolean                        m_bRemoveOnDeath;
+    qboolean                        m_bStopEnabled;
+    qboolean                        m_bEnableSkidding;
+    qboolean                        m_bAnimMove;
+    qboolean                        m_bDamageSounds;
+    qboolean                        m_bRunSounds;
+    int                             m_iProjectileHitsRemaining;
+    vehicleState_t                  vs;
+    cMoveGrid                      *m_sMoveGrid;
+    float                           m_fIdealSpeed;
+    float                           m_fMaxSpeed;
+    bool                            m_bBounceBackwards;
+    Vector                          m_vIdealPosition;
+    Vector                          m_vIdealDir;
+    float                           m_fIdealAccel;
+    float                           m_fIdealDistance;
+    float                           m_fLookAhead;
+    bool                            m_bAutoPilot;
+    SafePtr<VehicleCollisionEntity> m_pCollisionEntity;
+    SOUND_STATE                     m_eSoundState;
+    float                           m_fNextSoundState;
+    SafePtr<VehicleSoundEntity>     m_pVehicleSoundEntities[MAX_CORNERS];
+    Vector                          m_vTireEnd[NUM_VEHICLE_TIRES];
+    bool                            m_bTireHit[NUM_VEHICLE_TIRES];
+    Vector                          m_vNormalSum;
+    int                             m_iNumNormals;
+    float                           m_fMaxUseAngle;
+    bool                            m_bBounceStayFullSpeed;
 
 protected:
-		virtual void WorldEffects( void );
-		virtual void CheckWater( void );
-		virtual void DriverUse( Event *ev );
-		virtual void VehicleStart( Event *ev );
-		virtual void VehicleTouched( Event *ev );
-		virtual void VehicleBlocked( Event *ev );
-		void Think( void ) override;
-		void Postthink( void ) override;
-		virtual void Drivable( Event *ev );
-		virtual void UnDrivable( Event *ev );
-		virtual void Jumpable( Event *ev );
-		virtual void SeatAnglesOffset( Event *ev );
-		virtual void SeatOffset( Event *ev );
-		virtual void SetDriverAngles( Vector angles );
-		virtual void Lock( Event *ev );
-		virtual void UnLock( Event *ev );
-		virtual void SetWeapon( Event *ev );
-		virtual void ShowWeaponEvent( Event *ev );
-		virtual void SetSpeed( Event *ev );
-		virtual void SetTurnRate( Event *ev );
-		virtual void SteerInPlace( Event *ev );
-		virtual void VehicleDestroyed( Event *ev );
-		virtual void SetMoveInfo( vmove_t *vm );
-		virtual void GetMoveInfo( vmove_t *vm );
-		virtual void SetCEMoveInfo( vmove_t *vm );
-		virtual void GetCEMoveInfo( vmove_t *vm );
-		virtual void SetViewAngles( Vector newViewangles );
-		virtual void SetMass( Event *ev );
-		virtual void SetFrontMass( Event *ev );
-		virtual void SetBackMass( Event *ev );
-		virtual void SetTread( Event *ev );
-		virtual void SetTireRadius( Event *ev );
-		virtual void SetRollingResistance( Event *ev );
-		virtual void SetDrag( Event *ev );
-		virtual float TorqueLookup( int rpm );
-		virtual void UpdateVariables( Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright );
-		virtual void ModelInit( Event *ev );
-		virtual void BouncyCoef( Event *ev );
-		virtual void SpringyCoef( Event *ev );
-		virtual void YawMinMax( Event *ev );
-		virtual void RollMinMax( Event *ev );
-		virtual void ZMinMax( Event *ev );
-		virtual void SetAnimationSet( Event *ev );
-		virtual void SetSoundSet( Event *ev );
-		virtual void SpawnTurret( Event *ev );
-		void EventLockMovement( Event *ev );
-		void EventUnlockMovement( Event *ev );
-		virtual void QueryFreePassengerSlot(Event* ev);
-		virtual void QueryFreeDriverSlot(Event* ev);
-		virtual void QueryFreeTurretSlot(Event* ev);
-		virtual void QueryPassengerSlotPosition(Event* ev);
-		virtual void QueryDriverSlotPosition(Event* ev);
-		virtual void QueryTurretSlotPosition(Event* ev);
-		virtual void QueryPassengerSlotAngles(Event* ev);
-		virtual void QueryDriverSlotAngles(Event* ev);
-		virtual void QueryTurretSlotAngles(Event* ev);
-		virtual void QueryPassengerSlotStatus(Event* ev);
-		virtual void QueryDriverSlotStatus(Event* ev);
-		virtual void QueryTurretSlotStatus(Event* ev);
-		virtual void QueryPassengerSlotEntity(Event* ev);
-		virtual void QueryDriverSlotEntity(Event* ev);
-		virtual void QueryTurretSlotEntity(Event* ev);
-		virtual void AttachPassengerSlot(Event* ev);
-		virtual void AttachDriverSlot(Event* ev);
-		virtual void AttachTurretSlot(Event* ev);
-		virtual void DetachPassengerSlot(Event* ev);
-		virtual void DetachDriverSlot(Event* ev);
-		virtual void DetachTurretSlot(Event* ev);
-		virtual void DetachRemoteOwner();
-		virtual void SetWheelCorners(Event* ev);
-		virtual void EventDriveInternal(Event* ev, bool wait);
-		virtual void EventDrive(Event* ev);
-		virtual void EventDriveNoWait(Event* ev);
-		virtual void EventStop(Event* ev);
-		virtual void EventFullStop(Event* ev);
-		virtual void EventModifyDrive(Event* ev);
-		virtual void EventNextDrive(Event* ev);
-		void EventModel( Event *ev );
-		void EventRemoveOnDeath( Event *ev );
-		void EventSetExplosionModel( Event *ev );
-		void EventSetCollisionModel( Event *ev );
-		void EventGetCollisionModel( Event *ev );
-		void EventSetSoundParameters( Event *ev );
-		void EventSetVolumeParameters( Event *ev );
-		void EventDamage( Event *ev );
-		void EventStopAtEnd( Event *ev );
-		void EventSkidding( Event *ev );
-		void EventContinueSkidding( Event *ev );
-		void EventVehicleAnim( Event *ev );
-		void EventVehicleAnimDone( Event *ev );
-		void TouchStuff( vmove_t *vm );
-		virtual void ResetSlots( void );
-		virtual void OpenSlotsByModel( void );
-		virtual void MoveVehicle( void );
-		virtual bool AssertMove( Vector vNewOrigin, Vector vOldOrigin );
-		virtual bool AssertRotation( Vector vNewAngles, Vector vOldAngles );
-		virtual void NoMove( void );
-		virtual void SlidePush( Vector vPush );
-		void SetupPath( cSpline<4, 512> *pPath, SimpleEntity *se );
-		virtual void UpdateSound( void );
-		void SetupVehicleSoundEntities( void );
-		void RemoveVehicleSoundEntities( void );
-		void TurnOnVehicleSoundEntities( void );
-		void TurnOffVehicleSoundEntities( void );
-		void UpdateTires( void );
-		void UpdateNormals( void );
-		void UpdateBones( void );
-		void UpdateShaderOffset( void );
-		void UpdateTurretSlot( int iSlot );
-		void UpdatePassengerSlot( int iSlot );
-		void UpdateDriverSlot( int iSlot );
-		float GetPathPosition( cSpline<4, 512> *pPath, int iNode );
-		void UpdateSkidAngle( void );
-		void FactorInSkidOrigin( void );
-		virtual void FactorInOriginOffset( void );
-		virtual void CalculateOriginOffset( void );
-		virtual void FactorOutOriginOffset( void );
-		virtual void FactorInAnglesOffset( Vector *vAddedAngles );
-		virtual void CalculateAnglesOffset( Vector acceleration );
-		virtual void FactorOutAnglesOffset( void );
-		qboolean GetTagPositionAndOrientation( str tagname, orientation_t *new_or );
-		qboolean GetTagPositionAndOrientation( int tagnum, orientation_t *new_or );
-		void CalculateAnimationData( Vector vAngles, Vector vOrigin );
-		bool IsDamagedBy( Entity *ent );
+    virtual void WorldEffects(void);
+    virtual void CheckWater(void);
+    virtual void DriverUse(Event *ev);
+    virtual void VehicleStart(Event *ev);
+    virtual void VehicleTouched(Event *ev);
+    virtual void VehicleBlocked(Event *ev);
+    void         Think(void) override;
+    void         Postthink(void) override;
+    virtual void Drivable(Event *ev);
+    virtual void PathDrivable(Event *ev); // Added in 2.30
+    virtual void UnDrivable(Event *ev);
+    virtual void Jumpable(Event *ev);
+    virtual void SeatAnglesOffset(Event *ev);
+    virtual void SeatOffset(Event *ev);
+    virtual void SetDriverAngles(Vector angles);
+    virtual void Lock(Event *ev);
+    virtual void UnLock(Event *ev);
+    virtual void SetWeapon(Event *ev);
+    virtual void SetName(Event *ev); // added in 2.0
+    virtual void ShowWeaponEvent(Event *ev);
+    // added in 2.30
+    //====
+    virtual void BounceForwardsVelocity(Event *ev);
+    virtual void BounceBackwardsVelocity(Event *ev);
+    virtual void StopForwardsVelocity(Event *ev);
+    virtual void StopBackwardsVelocity(Event *ev);
+    //====
+    virtual void  SetSpeed(Event *ev);
+    virtual void  SetTurnRate(Event *ev);
+    virtual void  SteerInPlace(Event *ev);
+    virtual void  VehicleDestroyed(Event *ev);
+    virtual void  SetMoveInfo(vmove_t *vm);
+    virtual void  GetMoveInfo(vmove_t *vm);
+    virtual void  SetCEMoveInfo(vmove_t *vm);
+    virtual void  GetCEMoveInfo(vmove_t *vm);
+    virtual void  SetViewAngles(Vector newViewangles);
+    virtual void  SetMass(Event *ev);
+    virtual void  SetFrontMass(Event *ev);
+    virtual void  SetBackMass(Event *ev);
+    virtual void  SetTread(Event *ev);
+    virtual void  SetTireRadius(Event *ev);
+    virtual void  SetRollingResistance(Event *ev);
+    virtual void  SetDrag(Event *ev);
+    virtual float TorqueLookup(int rpm);
+    virtual void  UpdateVariables(
+         Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+     );
+    virtual void ModelInit(Event *ev);
+    virtual void BouncyCoef(Event *ev);
+    virtual void SpringyCoef(Event *ev);
+    virtual void YawMinMax(Event *ev);
+    virtual void RollMinMax(Event *ev);
+    virtual void ZMinMax(Event *ev);
+    virtual void SetAnimationSet(Event *ev);
+    virtual void SetSoundSet(Event *ev);
+    virtual void SpawnTurret(Event *ev);
+    void         EventLockMovement(Event *ev);
+    void         EventUnlockMovement(Event *ev);
+    virtual void QuerySpeed(Event *ev);
+    virtual void QueryFreePassengerSlot(Event *ev);
+    virtual void QueryFreeDriverSlot(Event *ev);
+    virtual void QueryFreeTurretSlot(Event *ev);
+    virtual void QueryPassengerSlotPosition(Event *ev);
+    virtual void QueryDriverSlotPosition(Event *ev);
+    virtual void QueryTurretSlotPosition(Event *ev);
+    virtual void QueryPassengerSlotAngles(Event *ev);
+    virtual void QueryDriverSlotAngles(Event *ev);
+    virtual void QueryTurretSlotAngles(Event *ev);
+    virtual void QueryPassengerSlotStatus(Event *ev);
+    virtual void QueryDriverSlotStatus(Event *ev);
+    virtual void QueryTurretSlotStatus(Event *ev);
+    virtual void QueryPassengerSlotEntity(Event *ev);
+    virtual void QueryDriverSlotEntity(Event *ev);
+    virtual void QueryTurretSlotEntity(Event *ev);
+    virtual void AttachPassengerSlot(Event *ev);
+    virtual void AttachDriverSlot(Event *ev);
+    virtual void AttachTurretSlot(Event *ev);
+    virtual void DetachPassengerSlot(Event *ev);
+    virtual void DetachDriverSlot(Event *ev);
+    virtual void DetachTurretSlot(Event *ev);
+    virtual void DetachRemoteOwner(); // added in 2.0
+    virtual void SetWheelCorners(Event *ev);
+    virtual void EventDriveInternal(Event *ev, bool wait);
+    virtual void EventDrive(Event *ev);
+    virtual void EventDriveNoWait(Event *ev);
+    virtual void EventStop(Event *ev);
+    virtual void EventFullStop(Event *ev);
+    virtual void EventModifyDrive(Event *ev);
+    virtual void EventNextDrive(Event *ev);
+    void         EventModel(Event *ev);
+    void         EventRemoveOnDeath(Event *ev);
+    void         EventSetExplosionModel(Event *ev);
+    void         EventSetCollisionModel(Event *ev);
+    void         EventGetCollisionModel(Event *ev);
+    void         EventSetSoundParameters(Event *ev);
+    void         EventSetVolumeParameters(Event *ev);
+    void         EventDamage(Event *ev);
+    void         EventStopAtEnd(Event *ev);
+    void         EventSkidding(Event *ev);
+    void         EventContinueSkidding(Event *ev);
+    void         EventVehicleAnim(Event *ev);
+    void         EventVehicleAnimDone(Event *ev);
+    // added in 2.0
+    //====
+    void EventVehicleMoveAnim(Event *ev);
+    void EventVehicleMoveAnimDone(Event *ev);
+    void EventDamageSounds(Event *ev);
+    void EventRunSounds(Event *ev);
+    void Remove(Event *ev);
+    //====
+    void         TouchStuff(vmove_t *vm);
+    virtual void ResetSlots(void);
+    virtual void OpenSlotsByModel(void);
+    virtual void MoveVehicle(void);
+    virtual void AnimMoveVehicle(void);
+    virtual bool AssertMove(Vector vNewOrigin, Vector vOldOrigin);
+    virtual bool AssertRotation(Vector vNewAngles, Vector vOldAngles);
+    virtual void NoMove(void);
+    virtual void SlidePush(Vector vPush);
+    void         SetupPath(cVehicleSpline *pPath, SimpleEntity *se);
+    virtual void UpdateSound(void);
+    void         SetupVehicleSoundEntities(void);
+    void         RemoveVehicleSoundEntities(void);
+    void         TurnOnVehicleSoundEntities(void);
+    void         TurnOffVehicleSoundEntities(void);
+    void         UpdateTires(void);
+    void         UpdateNormals(void);
+    void         UpdateBones(void);
+    void         UpdateShaderOffset(void);
+    virtual void UpdateTurretSlot(int iSlot);
+    void         UpdatePassengerSlot(int iSlot);
+    void         UpdateDriverSlot(int iSlot);
+    float        GetPathPosition(cVehicleSpline *pPath, int iNode);
+    void         UpdateSkidAngle(void);
+    void         FactorInSkidOrigin(void);
+    virtual void FactorInOriginOffset(void);
+    virtual void CalculateOriginOffset(void);
+    virtual void FactorOutOriginOffset(void);
+    virtual void FactorInAnglesOffset(Vector *vAddedAngles);
+    virtual void CalculateAnglesOffset(Vector acceleration);
+    virtual void FactorOutAnglesOffset(void);
+    qboolean     GetTagPositionAndOrientation(str tagname, orientation_t *new_or);
+    qboolean     GetTagPositionAndOrientation(int tagnum, orientation_t *new_or);
+    void         CalculateAnimationData(Vector vAngles, Vector vOrigin);
+    bool         IsDamagedBy(Entity *ent);
 
-	public:
-		CLASS_PROTOTYPE( Vehicle );
+public:
+    CLASS_PROTOTYPE(Vehicle);
 
-		Vehicle();
-		virtual ~Vehicle();
+    Vehicle();
+    virtual ~Vehicle();
 
-		virtual qboolean Drive( usercmd_t *ucmd );
-		void AutoPilot( void );
-		virtual qboolean HasWeapon( void );
-		virtual qboolean ShowWeapon( void );
-		Entity *Driver( void );
-		virtual qboolean IsDrivable( void );
-		void Archive( Archiver& arc ) override;
-		str GetSoundSet( void );
-		virtual int QueryFreePassengerSlot( void );
-		virtual int QueryFreeDriverSlot( void );
-		virtual int QueryFreeTurretSlot( void );
-		virtual void QueryPassengerSlotPosition( int slot, float *pos );
-		virtual void QueryDriverSlotPosition( int slot, float *pos );
-		virtual void QueryTurretSlotPosition( int slot, float *pos );
-		virtual void QueryPassengerSlotAngles( int slot, float *ang );
-		virtual void QueryDriverSlotAngles( int slot, float *ang );
-		virtual void QueryTurretSlotAngles( int slot, float *ang );
-		virtual int QueryPassengerSlotStatus( int slot );
-		virtual int QueryDriverSlotStatus( int slot );
-		virtual int QueryTurretSlotStatus( int slot );
-		virtual Entity *QueryPassengerSlotEntity( int slot );
-		virtual Entity *QueryDriverSlotEntity( int slot );
-		virtual Entity *QueryTurretSlotEntity( int slot );
-		virtual void AttachPassengerSlot( int slot, Entity *ent, Vector vExitPosition );
-		virtual void AttachDriverSlot( int slot, Entity *ent, Vector vExitPosition );
-		virtual void AttachTurretSlot( int slot, Entity *ent, Vector vExitPosition, Vector *vExitAngles );
-		virtual void DetachPassengerSlot( int slot, Vector vExitPosition, Vector *vExitAngles );
-		virtual void DetachDriverSlot( int slot, Vector vExitPosition, Vector *vExitAngles );
-		virtual void DetachTurretSlot( int slot, Vector vExitPosition, Vector *vExitAngles );
-		virtual int FindPassengerSlotByEntity( Entity *ent );
-		virtual int FindDriverSlotByEntity( Entity *ent );
-		virtual int FindTurretSlotByEntity( Entity *ent );
-		virtual void SetSlotsNonSolid( void );
-		virtual void SetSlotsSolid( void );
-		void KickSuspension( Vector vDirection, float fForce );
-		qboolean isLocked( void );
-		void Lock( void );
-		void UnLock( void );
-		VehicleCollisionEntity *GetCollisionEntity( void );
+    virtual void     DriverAdded(); // added in 2.0
+    virtual qboolean Drive(usercmd_t *ucmd);
+    virtual qboolean PathDrive(usercmd_t *ucmd);
+    void             AutoPilot(void);
+    virtual qboolean HasWeapon(void);
+    virtual qboolean ShowWeapon(void);
+    Entity          *Driver(void);
+    virtual qboolean IsDrivable(void);
+    void             Archive(Archiver& arc) override;
+    str              GetSoundSet(void);
+    virtual float    QuerySpeed(void);
+    virtual int      QueryFreePassengerSlot(void);
+    virtual int      QueryFreeDriverSlot(void);
+    virtual int      QueryFreeTurretSlot(void);
+    virtual void     QueryPassengerSlotPosition(int slot, float *pos);
+    virtual void     QueryDriverSlotPosition(int slot, float *pos);
+    virtual void     QueryTurretSlotPosition(int slot, float *pos);
+    virtual void     QueryPassengerSlotAngles(int slot, float *ang);
+    virtual void     QueryDriverSlotAngles(int slot, float *ang);
+    virtual void     QueryTurretSlotAngles(int slot, float *ang);
+    virtual int      QueryPassengerSlotStatus(int slot);
+    virtual int      QueryDriverSlotStatus(int slot);
+    virtual int      QueryTurretSlotStatus(int slot);
+    virtual Entity  *QueryPassengerSlotEntity(int slot);
+    virtual Entity  *QueryDriverSlotEntity(int slot);
+    virtual Entity  *QueryTurretSlotEntity(int slot);
+    bool             FindExitPosition(Entity *pEnt, const Vector& vOrigin, const Vector *vAngles); // added in 2.0
+    virtual void     AttachPassengerSlot(int slot, Entity *ent, Vector vExitPosition);
+    virtual void     AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition);
+    virtual void     AttachTurretSlot(int slot, Entity *ent, Vector vExitPosition, Vector *vExitAngles);
+    virtual void     DetachPassengerSlot(int slot, Vector vExitPosition, Vector *vExitAngles);
+    virtual void     DetachDriverSlot(int slot, Vector vExitPosition, Vector *vExitAngles);
+    virtual void     DetachTurretSlot(int slot, Vector vExitPosition, Vector *vExitAngles);
+    virtual int      FindPassengerSlotByEntity(Entity *ent);
+    virtual int      FindDriverSlotByEntity(Entity *ent);
+    virtual int      FindTurretSlotByEntity(Entity *ent);
+    virtual void     SetSlotsNonSolid(void);
+    virtual void     SetSlotsSolid(void);
+    void             KickSuspension(Vector vDirection, float fForce);
+    qboolean         isLocked(void);
+    void             Lock(void);
+    void             UnLock(void);
+    const str&       getName() const; // added in 2.0
+    VehicleCollisionEntity *GetCollisionEntity(void);
+    // Added in 2.30
+    //====
+    void EventSetMaxUseAngle(Event *ev);
+    void EventCanUse(Event *ev);
+    int GetProjectileHitsRemaining() const;
+    void SetProjectileVulnerable(Event* ev);
+    void DoProjectileVulnerability(Entity* pProjectile, Entity* pOwner, meansOfDeath_t meansOfDeath);
+    //====
 };
 
-inline void Vehicle::Archive
-	(
-	Archiver &arc
-	)
-{
-	VehicleBase::Archive( arc );
-
-	arc.ArchiveFloat( &maxturnrate );
-	arc.ArchiveFloat( &currentspeed );
-	arc.ArchiveFloat( &turnangle );
-	arc.ArchiveFloat( &turnimpulse );
-	arc.ArchiveFloat( &moveimpulse );
-	arc.ArchiveFloat( &jumpimpulse );
-	arc.ArchiveFloat( &speed );
-	arc.ArchiveFloat( &conesize );
-	arc.ArchiveFloat( &maxtracedist );
-	arc.ArchiveString( &weaponName );
-	arc.ArchiveVector( &last_origin );
-	arc.ArchiveVector( &seatangles );
-	arc.ArchiveVector( &seatoffset );
-	arc.ArchiveVector( &driveroffset );
-
-	arc.ArchiveVector( &Corners[ 0 ] );
-	arc.ArchiveVector( &Corners[ 1 ] );
-	arc.ArchiveVector( &Corners[ 2 ] );
-	arc.ArchiveVector( &Corners[ 3 ] );
-
-	arc.ArchiveBoolean( &drivable );
-	arc.ArchiveBoolean( &locked );
-	arc.ArchiveBoolean( &hasweapon );
-	arc.ArchiveBoolean( &showweapon );
-	arc.ArchiveBoolean( &steerinplace );
-	arc.ArchiveBoolean( &jumpable );
-
-	arc.ArchiveBoolean( &m_bMovementLocked );
-	driver.Archive( arc );
-	lastdriver.Archive( arc );
-
-	for( int i = MAX_PASSENGERS - 1; i >= 0; i-- )
-	{
-		Passengers[ i ].Archive( arc );
-	}
-
-	for( int i = MAX_TURRETS - 1; i >= 0; i-- )
-	{
-		Turrets[ i ].Archive( arc );
-	}
-
-	arc.ArchiveInteger( &numPassengers );
-	arc.ArchiveInteger( &numTurrets );
-	arc.ArchiveInteger( &moveresult );
-	arc.ArchiveInteger( &isBlocked );
-	arc.ArchiveInteger( &m_iFrameCtr );
-	arc.ArchiveInteger( &m_iGear );
-	arc.ArchiveInteger( &m_iRPM );
-	arc.ArchiveInteger( &m_iNextPathStartNode );
-
-	if( !arc.Saving() )
-	{
-		m_iLastTiresUpdate = -1;
-
-		int tempInt;
-		arc.ArchiveInteger( &tempInt );
-
-		if( tempInt )
-		{
-			m_pAlternatePath = new cSpline < 4, 512 > ;
-		}
-		else
-		{
-			m_pAlternatePath = NULL;
-		}
-	}
-	else
-	{
-		int tempInt = m_pAlternatePath != NULL;
-		arc.ArchiveInteger( &tempInt );
-	}
-
-	if( m_pAlternatePath )
-	{
-		m_pAlternatePath->Archive( arc );
-	}
-
-	arc.ArchiveInteger( &m_iAlternateNode );
-
-	if( !arc.Saving() )
-	{
-		int tempInt;
-		arc.ArchiveInteger( &tempInt );
-
-		if( tempInt )
-		{
-			m_pCurPath = new cSpline < 4, 512 > ;
-		}
-		else
-		{
-			m_pCurPath = NULL;
-		}
-	}
-	else
-	{
-		int tempInt = m_pCurPath != NULL;
-		arc.ArchiveInteger( &tempInt );
-	}
-
-	if( m_pCurPath )
-	{
-		m_pCurPath->Archive( arc );
-	}
-
-	arc.ArchiveInteger( &m_iCurNode );
-
-	if( !arc.Saving() )
-	{
-		int tempInt;
-		arc.ArchiveInteger( &tempInt );
-
-		if( tempInt )
-		{
-			m_pNextPath = new cSpline < 4, 512 > ;
-		}
-		else
-		{
-			m_pNextPath = NULL;
-		}
-	}
-	else
-	{
-		int tempInt = m_pNextPath != NULL;
-		arc.ArchiveInteger( &tempInt );
-	}
-
-	if( m_pNextPath )
-	{
-		m_pNextPath->Archive( arc );
-	}
-
-	arc.ArchiveFloat( &maxturnrate );
-	arc.ArchiveFloat( &currentspeed );
-	arc.ArchiveFloat( &turnangle );
-	arc.ArchiveFloat( &turnimpulse );
-	arc.ArchiveFloat( &moveimpulse );
-	arc.ArchiveFloat( &prev_moveimpulse );
-	arc.ArchiveFloat( &jumpimpulse );
-	arc.ArchiveFloat( &speed );
-	arc.ArchiveFloat( &conesize );
-	arc.ArchiveFloat( &maxtracedist );
-	arc.ArchiveFloat( &airspeed );
-	arc.ArchiveFloat( &m_fGearRatio[ 0 ] );
-	arc.ArchiveFloat( &m_fGearRatio[ 1 ] );
-	arc.ArchiveFloat( &m_fGearRatio[ 2 ] );
-	arc.ArchiveFloat( &m_fGearRatio[ 3 ] );
-	arc.ArchiveFloat( &m_fGearRatio[ 4 ] );
-	arc.ArchiveFloat( &m_fGearRatio[ 5 ] );
-	arc.ArchiveFloat( &m_fMass );
-	arc.ArchiveFloat( &m_fFrontMass );
-	arc.ArchiveFloat( &m_fBackMass );
-	arc.ArchiveFloat( &m_fWheelBase );
-	arc.ArchiveFloat( &m_fWheelFrontLoad );
-	arc.ArchiveFloat( &m_fWheelFrontInnerLoad );
-	arc.ArchiveFloat( &m_fWheelFrontOutterLoad );
-	arc.ArchiveFloat( &m_fWheelFrontDist );
-	arc.ArchiveFloat( &m_fWheelFrontSuspension );
-	arc.ArchiveFloat( &m_fWheelBackLoad );
-	arc.ArchiveFloat( &m_fWheelBackInnerLoad );
-	arc.ArchiveFloat( &m_fWheelBackOutterLoad );
-	arc.ArchiveFloat( &m_fWheelBackDist );
-	arc.ArchiveFloat( &m_fWheelBackSuspension );
-	arc.ArchiveFloat( &m_fCGHeight );
-	arc.ArchiveFloat( &m_fBankAngle );
-	arc.ArchiveFloat( &m_fTread );
-	arc.ArchiveFloat( &m_fTrackWidth );
-	arc.ArchiveFloat( &m_fTireFriction );
-	arc.ArchiveFloat( &m_fDrag );
-	arc.ArchiveFloat( &m_fTireRadius );
-	arc.ArchiveFloat( &m_fFrontBrakes );
-	arc.ArchiveFloat( &m_fBackBrakes );
-	arc.ArchiveFloat( &m_fRollingResistance );
-	arc.ArchiveFloat( &m_fTireRotationalSpeed );
-	arc.ArchiveFloat( &m_fFrontBrakingForce );
-	arc.ArchiveFloat( &m_fBackBrakingForce );
-	arc.ArchiveFloat( &m_fBrakingPerformance );
-	arc.ArchiveFloat( &m_fLastTurn );
-	arc.ArchiveFloat( &m_fTangForce );
-	arc.ArchiveFloat( &m_fInertia );
-	arc.ArchiveFloat( &m_fDifferentialRatio );
-	arc.ArchiveFloat( &m_fGearEfficiency );
-	arc.ArchiveFloat( &m_fMaxTraction );
-	arc.ArchiveFloat( &m_fTractionForce );
-	arc.ArchiveFloat( &m_fAccelerator );
-	arc.ArchiveFloat( &m_fTorque );
-	arc.ArchiveFloat( &m_fDownForce );
-	arc.ArchiveFloat( &m_fUpForce );
-	arc.ArchiveFloat( &m_fLeftForce );
-	arc.ArchiveFloat( &m_fRightForce );
-	arc.ArchiveFloat( &m_fForwardForce );
-	arc.ArchiveFloat( &m_fBackForce );
-	arc.ArchiveFloat( &m_fBouncyCoef );
-	arc.ArchiveFloat( &m_fSpringyCoef );
-	arc.ArchiveFloat( &m_fYawMin );
-	arc.ArchiveFloat( &m_fYawMax );
-	arc.ArchiveFloat( &m_fRollMin );
-	arc.ArchiveFloat( &m_fRollMax );
-	arc.ArchiveFloat( &m_fZMin );
-	arc.ArchiveFloat( &m_fZMax );
-	arc.ArchiveFloat( &m_fYawCoef );
-	arc.ArchiveFloat( &m_fRollCoef );
-	arc.ArchiveFloat( &m_fZCoef );
-	arc.ArchiveFloat( &m_fShaderOffset );
-	arc.ArchiveFloat( &m_fSoundMinSpeed );
-	arc.ArchiveFloat( &m_fSoundMinPitch );
-	arc.ArchiveFloat( &m_fSoundMaxSpeed );
-	arc.ArchiveFloat( &m_fSoundMaxPitch );
-	arc.ArchiveFloat( &m_fVolumeMinSpeed );
-	arc.ArchiveFloat( &m_fVolumeMinPitch );
-	arc.ArchiveFloat( &m_fVolumeMaxSpeed );
-	arc.ArchiveFloat( &m_fVolumeMaxPitch );
-	arc.ArchiveFloat( &m_fStopStartDistance );
-	arc.ArchiveFloat( &m_fStopStartSpeed );
-	arc.ArchiveFloat( &m_fStopEndDistance );
-	arc.ArchiveFloat( &m_fSkidAngle );
-	arc.ArchiveFloat( &m_fSkidLeftForce );
-	arc.ArchiveFloat( &m_fSkidRightForce );
-	arc.ArchiveString( &weaponName );
-	arc.ArchiveString( &m_sAnimationSet );
-	arc.ArchiveString( &m_sSoundSet );
-	arc.ArchiveString( &m_sExplosionModel );
-	arc.ArchiveVector( &last_origin );
-	arc.ArchiveVector( &seatangles );
-	arc.ArchiveVector( &driveroffset );
-	arc.ArchiveVector( &Corners[ 0 ] );
-	arc.ArchiveVector( &Corners[ 1 ] );
-	arc.ArchiveVector( &Corners[ 2 ] );
-	arc.ArchiveVector( &Corners[ 3 ] );
-	arc.ArchiveVector( &v_angle );
-	arc.ArchiveVector( &yaw_forward );
-	arc.ArchiveVector( &yaw_left );
-	arc.ArchiveVector( &ground_normal );
-	arc.ArchiveVector( &base_angles );
-	arc.ArchiveVector( &prev_velocity );
-	arc.ArchiveVector( &real_velocity );
-	arc.ArchiveVector( &prev_origin );
-	arc.ArchiveVector( &real_acceleration );
-	arc.ArchiveVector( &prev_acceleration );
-	arc.ArchiveVector( &m_vOldMins );
-	arc.ArchiveVector( &m_vOldMaxs );
-	arc.ArchiveVector( &m_vCG );
-	arc.ArchiveVector( &m_vAngularAcceleration );
-	arc.ArchiveVector( &m_vAngularVelocity );
-	arc.ArchiveVector( &m_vAngles );
-	arc.ArchiveVector( &m_vFrontNormal );
-	arc.ArchiveVector( &m_vBackNormal );
-	arc.ArchiveVector( &m_vFrontAngles );
-	arc.ArchiveVector( &m_vBackAngles );
-	arc.ArchiveVector( &m_vBaseNormal );
-	arc.ArchiveVector( &m_vBaseAngles );
-	arc.ArchiveVector( &m_vPrevNormal );
-	arc.ArchiveVector( &m_vResistance );
-	arc.ArchiveVector( &m_vWheelForce );
-	arc.ArchiveVector( &m_vTangForce );
-	arc.ArchiveVector( &m_vForce );
-	arc.ArchiveVector( &m_vAcceleration );
-	arc.ArchiveVector( &m_vOriginOffset );
-	arc.ArchiveVector( &m_vOriginOffset2 );
-	arc.ArchiveVector( &m_vOriginCornerOffset );
-	arc.ArchiveVector( &m_vAnglesOffset );
-	arc.ArchiveVector( &m_vSaveAngles );
-	arc.ArchiveVector( &m_vSkidOrigin );
-	arc.ArchiveBoolean( &drivable );
-	arc.ArchiveBoolean( &locked );
-	arc.ArchiveBoolean( &hasweapon );
-	arc.ArchiveBoolean( &showweapon );
-	arc.ArchiveBoolean( &steerinplace );
-	arc.ArchiveBoolean( &jumpable );
-	arc.ArchiveBoolean( &m_bWheelSpinning );
-	arc.ArchiveBoolean( &m_bIsSkidding );
-	arc.ArchiveBoolean( &m_bIsBraking );
-	arc.ArchiveBoolean( &m_bBackSlipping );
-	arc.ArchiveBoolean( &m_bFrontSlipping );
-	arc.ArchiveBoolean( &m_bAutomatic );
-	arc.ArchiveBoolean( &m_bThinkCalled );
-	arc.ArchiveBoolean( &m_bRemoveOnDeath );
-	arc.ArchiveBoolean( &m_bStopEnabled );
-	arc.ArchiveBoolean( &m_bEnableSkidding );
-	arc.ArchiveRaw( &vs, sizeof( vehicleState_t ) );
-
-	if( !arc.Saving() )
-	{
-		m_sMoveGrid = new cMoveGrid( 3, 3, 1 );
-	}
-
-	m_sMoveGrid->Archive( arc );
-
-	arc.ArchiveFloat( &m_fIdealSpeed );
-	arc.ArchiveVector( &m_vIdealPosition );
-	arc.ArchiveVector( &m_vIdealDir );
-	arc.ArchiveFloat( &m_fIdealAccel );
-	arc.ArchiveFloat( &m_fIdealDistance );
-	arc.ArchiveFloat( &m_fLookAhead );
-	arc.ArchiveBool( &m_bAutoPilot );
-	arc.ArchiveSafePointer( &m_pCollisionEntity );
-	ArchiveEnum( m_eSoundState, SOUND_STATE );
-	arc.ArchiveFloat( &m_fNextSoundState );
-	arc.ArchiveSafePointer( &m_pVehicleSoundEntities[ 0 ] );
-	arc.ArchiveSafePointer( &m_pVehicleSoundEntities[ 1 ] );
-	arc.ArchiveSafePointer( &m_pVehicleSoundEntities[ 2 ] );
-	arc.ArchiveSafePointer( &m_pVehicleSoundEntities[ 3 ] );
-}
-
 class DrivableVehicle : public Vehicle
 {
 public:
+    CLASS_PROTOTYPE(DrivableVehicle);
 
-	CLASS_PROTOTYPE(DrivableVehicle);
+    DrivableVehicle(void);
 
-	DrivableVehicle(void);
-
-	virtual void Killed(Event* ev);
+    virtual void Killed(Event *ev) override;
 };
 
 class VehicleWheelsX4 : public DrivableVehicle
 {
 private:
-	wheel_s m_sWheels[4];
+    wheel_t m_sWheels[4];
 
 public:
-	CLASS_PROTOTYPE(VehicleWheelsX4);
+    CLASS_PROTOTYPE(VehicleWheelsX4);
 
-	VehicleWheelsX4();
+    VehicleWheelsX4();
 
-	virtual void UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright) override;
-	virtual float TorqueLookup(int rpm) override;
-	virtual void Think() override;
-	virtual void Postthink() override;
-	virtual void Killed(Event* ev) override;
+    virtual void UpdateVariables(
+        Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+    ) override;
+    virtual float TorqueLookup(int rpm) override;
+    virtual void  Think() override;
+    virtual void  Postthink() override;
+    virtual void  Killed(Event *ev) override;
 };
 
 class VehicleWheelsX2 : public DrivableVehicle
 {
 private:
-	wheel_s m_sWheels[2];
+    wheel_t m_sWheels[2];
 
 public:
-	CLASS_PROTOTYPE(VehicleWheelsX2);
+    CLASS_PROTOTYPE(VehicleWheelsX2);
 
-	VehicleWheelsX2();
+    VehicleWheelsX2();
 
-	virtual void UpdateVariables(Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright) override;
-	virtual float TorqueLookup(int rpm) override;
-	virtual void Think() override;
-	virtual void Postthink() override;
-	virtual void Killed(Event* ev) override;
+    virtual void UpdateVariables(
+        Vector *acceleration, Vector *vpn, Vector *vup, Vector *vright, Vector *t_vpn, Vector *t_vup, Vector *t_vright
+    ) override;
+    virtual float TorqueLookup(int rpm) override;
+    virtual void  Think() override;
+    virtual void  Postthink() override;
+    virtual void  Killed(Event *ev) override;
 };
 
 class VehicleTank : public DrivableVehicle
 {
 public:
-	CLASS_PROTOTYPE(VehicleTank);
+    CLASS_PROTOTYPE(VehicleTank);
 
-	VehicleTank();
-	~VehicleTank();
+    VehicleTank();
+    ~VehicleTank();
 
-	virtual qboolean Drive(usercmd_t *ucmd) override;
-	void EventDamage(Event *ev);
-	virtual void Think() override;
-	virtual void Postthink() override;
-	virtual void CalculateOriginOffset() override;
-	void UpdateSound() override;
-	void AttachDriverSlot(Event* ev) override;
+    virtual void     DriverAdded() override;
+    virtual qboolean Drive(usercmd_t *ucmd) override;
+    void             EventDamage(Event *ev);
+    virtual void     Think() override;
+    virtual void     Postthink() override;
+    virtual void     CalculateOriginOffset() override;
+    void             UpdateSound() override;
+    //void             AttachDriverSlot(Event* ev) override;
+    void AttachDriverSlot(int slot, Entity *ent, Vector vExitPosition) override;
 };
 
 class VehicleHalfTrack : public DrivableVehicle
 {
 public:
-	CLASS_PROTOTYPE(VehicleHalfTrack);
+    CLASS_PROTOTYPE(VehicleHalfTrack);
 
-	VehicleHalfTrack();
+    VehicleHalfTrack();
 
-	virtual void Think() override;
-	virtual void Postthink() override;
-	virtual void Killed(Event* ev) override;
+    virtual void Think() override;
+    virtual void Postthink() override;
+    virtual void Killed(Event *ev) override;
 };
 
 typedef SafePtr<Vehicle> VehiclePtr;
-
-#endif
diff --git a/code/fgame/vehicletanktandem.cpp b/code/fgame/vehicletanktandem.cpp
index d6d535f5..92e42f5a 100644
--- a/code/fgame/vehicletanktandem.cpp
+++ b/code/fgame/vehicletanktandem.cpp
@@ -21,6 +21,45 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "vehicletanktandem.h"
+#include "vehicleturret.h"
 
-// FIXME: unimplemented
+CLASS_DECLARATION(VehicleTank, VehicleTankTandem, "VehicleTankTandem") {
+    {NULL, NULL}
+};
 
+VehicleTankTandem::VehicleTankTandem()
+{
+}
+
+VehicleTankTandem::~VehicleTankTandem()
+{
+}
+
+void VehicleTankTandem::SpawnTurret(Event *ev)
+{
+    VehicleTurretGunTandem* pTurret = new VehicleTurretGunTandem();
+    int slot;
+
+    pTurret->SetBaseOrientation(orientation, NULL);
+    pTurret->setModel(ev->GetString(2));
+
+    slot = ev->GetInteger(1);
+    AttachTurretSlot(slot, pTurret, vec_zero, NULL);
+    pTurret->SetVehicleOwner(this);
+
+    pTurret->PostEvent(EV_TakeDamage, EV_POSTSPAWN);
+
+    UpdateTurretSlot(slot);
+
+    pTurret->ProcessPendingEvents();
+}
+
+void VehicleTankTandem::UpdateTurretSlot(int iSlot)
+{
+    VehicleTank::UpdateTurretSlot(iSlot);
+
+    if (Turrets[iSlot].ent && Turrets[iSlot].ent->isSubclassOf(VehicleTurretGunTandem)) {
+        VehicleTurretGunTandem* pTurret = static_cast<VehicleTurretGunTandem*>(Turrets[iSlot].ent.Pointer());
+        pTurret->UpdateLinkedTurret();
+    }
+}
diff --git a/code/fgame/vehicletanktandem.h b/code/fgame/vehicletanktandem.h
index 64b139d4..543cc8a4 100644
--- a/code/fgame/vehicletanktandem.h
+++ b/code/fgame/vehicletanktandem.h
@@ -21,3 +21,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #pragma once
+
+#include "vehicle.h"
+
+class VehicleTankTandem : public VehicleTank
+{
+private:
+    CLASS_PROTOTYPE(VehicleTankTandem);
+
+public:
+    VehicleTankTandem();
+    ~VehicleTankTandem();
+
+    void SpawnTurret(Event *ev) override;
+    void UpdateTurretSlot(int iSlot) override;
+};
diff --git a/code/fgame/vehicleturret.cpp b/code/fgame/vehicleturret.cpp
index 3905831d..6bd57faa 100644
--- a/code/fgame/vehicleturret.cpp
+++ b/code/fgame/vehicleturret.cpp
@@ -30,34 +30,156 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gibs.h"
 #include "scriptexception.h"
 
-Event EV_VehicleTurretGun_SetBaseEntity(
-    "setbaseentity", EV_DEFAULT, "e", "base_entity", "Sets the base entity to take its orientation from."
-);
+static const Vector g_vUserMins(-16, -16, 0);
+static const Vector g_vUserMaxs(16, 16, 96);
 
-Event EV_VehicleTurretGun_RemoveOnDeath(
+static constexpr float MAX_TANDEM_YAW_OFFSET  = 0;
+static constexpr float MAX_VT_PITCHCAP_OFFSET = 0;
+static constexpr float MAX_VT_YAW_OFFSET      = 0;
+
+Event EV_VehicleTurretGun_SetBaseEntity
+(
+    "setbaseentity",
+    EV_DEFAULT,
+    "e",
+    "base_entity",
+    "Sets the base entity to take its orientation from.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_RemoveOnDeath
+(
     "removeondeath",
     EV_DEFAULT,
     "i",
     "removeondeath",
-    "If set to a non-zero value, vehicles will not be removed when they die"
+    "If set to a non-zero value, vehicles will not be removed when they die",
+    EV_NORMAL
 );
-
-Event EV_VehicleTurretGun_SetCollisionEntity(
-    "setcollisionentity", EV_DEFAULT, "e", "entity", "Sets the Collision Entity."
+Event EV_VehicleTurretGun_SetCollisionEntity
+(
+    "setcollisionentity",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Sets the Collision Entity.",
+    EV_NORMAL
 );
-
-Event EV_VehicleTurretGun_Lock("lock", EV_DEFAULT, NULL, NULL, "The Turret can not be used.");
-
-Event EV_VehicleTurretGun_Unlock("unlock", EV_DEFAULT, NULL, NULL, "The Turret Can be used.");
-
-Event EV_VehicleTurretGun_SoundSet("SoundSet", EV_DEFAULT, "s", "soundset", "Sets the Sound Set to use.");
-
-Event EV_VehicleTurretGun_CollisionEntitySetter(
-    "collisionent", EV_DEFAULT, "s", "entity", "Sets the Collision Entity", EV_SETTER
+Event EV_VehicleTurretGun_Lock
+(
+    "lock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The turret cannot be used.",
+    EV_NORMAL
 );
-
-Event EV_VehicleTurretGun_CollisionEntityGetter(
-    "collisionent", EV_DEFAULT, NULL, NULL, "Gets the Collision Entity", EV_GETTER
+Event EV_VehicleTurretGun_Unlock
+(
+    "unlock",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "The turret can be used.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_SoundSet
+(
+    "SoundSet",
+    EV_DEFAULT,
+    "s",
+    "soundset",
+    "Sets the Sound Set to use.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_CollisionEntitySetter
+(
+    "collisionent",
+    EV_DEFAULT,
+    "e",
+    "entity",
+    "Sets the Collision Entity",
+    EV_SETTER
+);
+Event EV_VehicleTurretGun_CollisionEntityGetter
+(
+    "collisionent",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the Collision Entity",
+    EV_GETTER
+);
+Event EV_VehicleTurretGun_WarmupDelay
+(
+    "warmupdelay",
+    EV_DEFAULT,
+    "f",
+    "value",
+    "Set the warmup delay before use after mounting the weapon.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_FireWarmupDelay
+(
+    "firewarmupdelay",
+    EV_DEFAULT,
+    "f",
+    "value",
+    "Set the warmup delay before use after mounting the weapon.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_ReloadShots
+(
+    "reloadshots",
+    EV_DEFAULT,
+    "i",
+    "value",
+    "Set the number of shots fired before forcing a reload",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_ReloadDelay
+(
+    "reloaddelay",
+    EV_DEFAULT,
+    "f",
+    "value",
+    "Set a delay that implies a reload. Will also play a sound",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_AimOffset
+(
+    "aimoffset",
+    EV_DEFAULT,
+    "v",
+    "value",
+    "Adjust aiming angles by offset.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_AimTolerance
+(
+    "aimtolerance",
+    EV_DEFAULT,
+    "v",
+    "caps",
+    "Sets a tolerance for the angles.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_SetTargetEntity
+(
+    "settargetentity",
+    EV_DEFAULT,
+    "e",
+    "ent",
+    "Set the entity to point the turret at visually.",
+    EV_NORMAL
+);
+Event EV_VehicleTurretGun_PlayReloadSound
+(
+    "playreloadsound",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Play the turret reload sound.",
+    EV_NORMAL
 );
 
 CLASS_DECLARATION(TurretGun, VehicleTurretGun, NULL) {
@@ -70,20 +192,27 @@ CLASS_DECLARATION(TurretGun, VehicleTurretGun, NULL) {
     {&EV_VehicleTurretGun_SetCollisionEntity,    &VehicleTurretGun::EventSetCollisionModel},
     {&EV_Damage,                                 &VehicleTurretGun::EventDamage           },
     {&EV_Killed,                                 &VehicleTurretGun::EventKilled           },
-    {&EV_Turret_TurnSpeed,                       &VehicleTurretGun::EventTurnSpeed        },
     {&EV_VehicleTurretGun_Lock,                  &VehicleTurretGun::EventLock             },
     {&EV_VehicleTurretGun_Unlock,                &VehicleTurretGun::EventUnlock           },
     {&EV_VehicleTurretGun_SoundSet,              &VehicleTurretGun::SetSoundSet           },
     {&EV_VehicleTurretGun_CollisionEntitySetter, &VehicleTurretGun::EventSetCollisionModel},
     {&EV_VehicleTurretGun_CollisionEntityGetter, &VehicleTurretGun::EventGetCollisionModel},
+    {&EV_VehicleTurretGun_WarmupDelay,           &VehicleTurretGun::SetWarmupDelay        },
+    {&EV_VehicleTurretGun_FireWarmupDelay,       &VehicleTurretGun::SetFireWarmupDelay    },
+    {&EV_VehicleTurretGun_ReloadShots,           &VehicleTurretGun::SetReloadShots        },
+    {&EV_VehicleTurretGun_ReloadDelay,           &VehicleTurretGun::SetReloadDelay        },
+    {&EV_VehicleTurretGun_AimOffset,             &VehicleTurretGun::SetAimOffset          },
+    {&EV_VehicleTurretGun_AimTolerance,          &VehicleTurretGun::SetAimTolerance       },
+    {&EV_VehicleTurretGun_SetTargetEntity,       &VehicleTurretGun::SetTargetEntity       },
+    {&EV_VehicleTurretGun_PlayReloadSound,       &VehicleTurretGun::PlayReloadSound       },
     {NULL,                                       NULL                                     }
 };
 
-// FIXME
-
 VehicleTurretGun::VehicleTurretGun()
 {
-    entflags |= EF_VEHICLETURRET;
+    entflags |= ECF_VEHICLETURRET;
+
+    AddWaitTill(STRING_DEATH);
 
     if (LoadingSavegame) {
         return;
@@ -91,38 +220,76 @@ VehicleTurretGun::VehicleTurretGun()
 
     edict->s.eType = ET_MODELANIM;
     setRespawn(false);
-    respondto         = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
-    edict->clipmask   = MASK_VEHICLETURRET;
-    m_iIdleHitCount   = 0;
+
+    respondto       = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
+    edict->clipmask = MASK_VEHICLETURRET;
+
     m_bUsable         = true;
     m_bPlayerUsable   = true;
     m_bRestable       = false;
     m_fIdlePitchSpeed = 0;
-    takedamage        = DAMAGE_NO;
-    health            = 100.0f;
-    max_health        = 100.0f;
+    m_iIdleHitCount   = 0;
+
+    takedamage = DAMAGE_NO;
+    health     = 100.0f;
+    max_health = 100.0f;
+
     setSize(Vector(-16, -16, 0), Vector(16, 16, 32));
-    m_fTurnSpeed        = 1001.0f;
-    m_fPitchUpCap       = -45.0f;
-    m_fPitchDownCap     = 45.0f;
-    m_fMaxYawOffset     = 180.0f;
-    m_fUserDistance     = 64.0f;
-    m_vIdleCheckOffset  = Vector(-56, 0, 0);
-    m_bBOIsSet          = false;
-    m_iFiring           = 0;
-    m_fFireToggleTime   = 0;
-    m_pBaseEntity       = NULL;
-    m_vLastBaseAngles   = vec_zero;
-    m_vBaseAngles       = vec_zero;
-    m_vBarrelPos        = origin;
-    m_vLastBarrelPos    = origin;
+
+    m_fPitchUpCap   = -45;
+    m_fPitchDownCap = 45;
+    m_fMaxYawOffset = 180;
+    m_fTurnSpeed    = 160;
+    m_fAIPitchSpeed = 48;
+    m_fUserDistance = 64.0f;
+    m_vIdleCheckOffset.setXYZ(-56, 0, 0);
+
+    m_fMinBurstTime  = 0;
+    m_fMaxBurstTime  = 0;
+    m_fMinBurstDelay = 0;
+    m_fMaxBurstDelay = 0;
+
+    AxisClear(m_mBaseOrientation);
+    m_fFireToggleTime = 0;
+    m_iFiring         = 0;
+    m_bBOIsSet        = false;
+
+    m_pBaseEntity     = NULL;
+    m_vLastBaseAngles = vec_zero;
+    m_vBaseAngles     = vec_zero;
+
+    m_vBarrelPos     = origin;
+    m_vLastBarrelPos = origin;
+
     m_bUseRemoteControl = false;
     m_pVehicleOwner     = NULL;
-    m_bRemoveOnDeath    = true;
-    m_eSoundState       = ST_OFF;
-    m_bLocked           = true;
-    m_fNextSoundState   = level.time;
-    m_sSoundSet         = "";
+
+    m_bRemoveOnDeath  = true;
+    m_eSoundState     = STT_OFF;
+    m_fNextSoundState = level.time;
+
+    m_fWarmupDelay         = 0;
+    m_fFireWarmupDelay     = 0;
+    m_fTargetReloadTime    = 0;
+    m_fWarmupTimeRemaining = 0;
+    m_fReloadDelay         = 0;
+    m_fReloadTimeRemaining = 0;
+
+    m_iReloadShots = 1;
+    m_iAmmo        = 1;
+
+    ammo_in_clip[FIRE_PRIMARY]   = m_iAmmo;
+    ammo_clip_size[FIRE_PRIMARY] = m_iReloadShots;
+
+    m_vAimOffset[0]    = 0;
+    m_vAimOffset[1]    = 0;
+    m_vAimOffset[2]    = 0;
+    m_vAimTolerance[0] = 20;
+    m_vAimTolerance[1] = 20;
+
+    m_bLocked    = true;
+    m_bLockedAim = false;
+    m_sSoundSet  = "";
 }
 
 VehicleTurretGun::~VehicleTurretGun()
@@ -133,15 +300,226 @@ VehicleTurretGun::~VehicleTurretGun()
         m_pCollisionEntity->PostEvent(EV_Remove, 0);
     }
 
-    entflags &= ~EF_VEHICLETURRET;
+    entflags &= ~ECF_VEHICLETURRET;
 }
 
 void VehicleTurretGun::Think(void)
 {
-    // FIXME: stub
+    Sentient *sentOwner;
+    float     yawOffset, pitchOffset;
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->NotSolid();
+    }
+
+    sentOwner = GetSentientOwner();
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER && m_pRemoteOwner && m_pRemoteOwner->isSubclassOf(Player)) {
+        // always render the turret
+        edict->s.renderfx |= RF_DEPTHHACK;
+    } else {
+        edict->s.renderfx &= ~RF_DEPTHHACK;
+    }
+
+    UpdateTimers(yawOffset, pitchOffset);
+
+    if (owner) {
+        UpdateAndMoveOwner();
+        UpdateCaps(yawOffset, pitchOffset);
+    } else if (m_bUseRemoteControl) {
+        UpdateRemoteControl();
+        UpdateCaps(yawOffset, pitchOffset);
+    } else if (aim_target) {
+        UpdateAimTarget();
+        UpdateCaps(yawOffset, pitchOffset);
+    } else if (m_bRestable) {
+        IdleToRestPosition();
+    }
+
+    UpdateOrientation(false);
+    UpdateSound();
+    UpdateFireControl();
+
+    if (sentOwner) {
+        G_TouchTriggers(sentOwner);
+        UpdateOwner(sentOwner);
+    }
+
+    UpdateCollisionEntity();
 }
 
-void VehicleTurretGun::SetBaseOrientation(float (*borientation)[3], float *bangles)
+void VehicleTurretGun::P_UserAim(usercmd_t *ucmd)
+{
+    Vehicle *pVehicle;
+    int      slot;
+    int      newSlot;
+
+    TurretGun::P_UserAim(ucmd);
+
+    if (ucmd->buttons & BUTTON_ATTACKRIGHT) {
+        m_bLockedAim = false;
+        return;
+    }
+
+    if (m_bLockedAim) {
+        return;
+    }
+
+    if (m_iFiring) {
+        m_bLockedAim = false;
+        return;
+    }
+
+    if (!m_pVehicleOwner) {
+        // Added in OPM
+        return;
+    }
+
+    if (!m_pVehicleOwner->IsSubclassOfVehicle()) {
+        return;
+    }
+
+    pVehicle = static_cast<Vehicle *>(m_pVehicleOwner.Pointer());
+    slot     = pVehicle->FindTurretSlotByEntity(this);
+    newSlot  = slot + 1;
+    if (newSlot == pVehicle->numTurrets) {
+        newSlot = 0;
+    }
+
+    if (newSlot != slot) {
+        Entity *slotEnt;
+
+        slotEnt = pVehicle->QueryTurretSlotEntity(newSlot);
+        // slotEnt check:
+        //  Added in OPM
+        if (slotEnt && slotEnt->IsSubclassOfVehicleTurretGun()) {
+            VehicleTurretGun *existing;
+            Vector            newAng;
+            bool              wasThisLocked, wasExistingLocked;
+
+            existing = static_cast<VehicleTurretGun *>(slotEnt);
+
+            wasThisLocked       = m_bLocked;
+            wasExistingLocked   = existing->m_bLocked;
+            m_bLocked           = false;
+            existing->m_bLocked = false;
+
+            newAng            = existing->m_vUserViewAng;
+            m_vUserLastCmdAng = vec_zero;
+
+            pVehicle->AttachTurretSlot(newSlot, owner, vec_zero, NULL);
+            existing->m_vUserViewAng = newAng;
+
+            owner             = NULL;
+            edict->r.ownerNum = ENTITYNUM_NONE;
+
+            if (wasThisLocked) {
+                m_bLocked = true;
+            }
+            if (wasExistingLocked) {
+                existing->m_bLocked = true;
+            }
+
+            existing->m_bLockedAim = true;
+            m_bLockedAim           = false;
+        }
+    }
+}
+
+void VehicleTurretGun::TurretBeginUsed(Sentient *pEnt)
+{
+    if (m_pVehicleOwner) {
+        Vehicle *pVehicle = (Vehicle *)m_pVehicleOwner.Pointer();
+        int      slot     = pVehicle->FindTurretSlotByEntity(this);
+
+        pVehicle->UpdateTurretSlot(slot);
+        m_vBaseAngles = m_pVehicleOwner->angles;
+    }
+
+    owner             = pEnt;
+    edict->r.ownerNum = pEnt->entnum;
+    m_bHadOwner       = true;
+
+    Sound(sPickupSound);
+
+    owner->SetViewAngles(m_vBaseAngles);
+
+    m_vUserViewAng    = m_vBaseAngles;
+    m_vUserViewAng[0] = AngleNormalize180(m_vUserViewAng[0]);
+    m_vUserLastCmdAng.setXYZ(0, 0, 0);
+
+    setAngles(m_vBaseAngles);
+
+    if (owner->IsSubclassOfPlayer()) {
+        Player *player = (Player *)owner.Pointer();
+
+        player->EnterTurret(this);
+
+        if (!m_pUserCamera) {
+            m_pUserCamera = new Camera;
+        }
+
+        player->SetCamera(m_pUserCamera, 0.5);
+        m_pUserCamera->setAngles(m_vBaseAngles);
+    }
+
+    UpdateOwner(owner);
+    flags &= ~FL_THINK;
+    current_attachToTag = "";
+    ForceIdle();
+    P_CreateViewModel();
+}
+
+void VehicleTurretGun::TurretEndUsed(void)
+{
+    if (owner->IsSubclassOfPlayer()) {
+        Player *player = (Player *)owner.Pointer();
+
+        RemoveUserCamera();
+        player->ExitTurret();
+        P_DeleteViewModel();
+    }
+
+    owner             = NULL;
+    edict->r.ownerNum = ENTITYNUM_NONE;
+    m_fIdlePitchSpeed = 0;
+    m_iIdleHitCount   = 0;
+    m_iFiring         = 0;
+    m_vTargetAngles   = m_vLocalAngles;
+}
+
+void VehicleTurretGun::TurretUsed(Sentient *pEnt)
+{
+    if (!owner) {
+        TurretBeginUsed(pEnt);
+        return;
+    }
+
+    if (owner == pEnt) {
+        TurretEndUsed();
+    }
+}
+
+void VehicleTurretGun::TurretUsed(Event *ev)
+{
+    Sentient *pEnt = (Sentient *)ev->GetEntity(1);
+
+    if (!pEnt || !pEnt->IsSubclassOfSentient()) {
+        return;
+    }
+
+    if (!m_bUsable || m_bLocked) {
+        return;
+    }
+
+    if (pEnt->IsSubclassOfPlayer() && !m_bPlayerUsable) {
+        return;
+    }
+
+    TurretUsed(pEnt);
+}
+
+void VehicleTurretGun::SetBaseOrientation(const vec3_t borientation[3], const vec3_t bangles)
 {
     m_bBOIsSet = true;
 
@@ -172,206 +550,140 @@ void VehicleTurretGun::SetBaseEntity(Entity *e)
     flags |= FL_THINK;
 }
 
-void VehicleTurretGun::SetVehicleOwner(Entity *e)
-{
-    m_pVehicleOwner = e;
-}
-
-void VehicleTurretGun::SetRemoteOwner(Sentient *e)
-{
-    m_bUseRemoteControl = true;
-    m_pRemoteOwner      = e;
-}
-
-void VehicleTurretGun::RemoteControl(usercmd_t *ucmd, Sentient *owner) {}
-
-void VehicleTurretGun::CollisionCorrect(trace_t *pTr) {}
-
-void VehicleTurretGun::UpdateOrientation(bool bCollisionCheck) {}
-
-void VehicleTurretGun::UpdateSound(void)
-{
-    if (level.time < m_fNextSoundState) {
-        return;
-    }
-
-    float fDiff = AngleSubtract(m_vTargetAngles[1], m_vLocalAngles[1]);
-
-    switch (m_eSoundState) {
-    case ST_OFF:
-        StopLoopSound();
-        m_fNextSoundState = level.time;
-        if (fabs(fDiff) > 0.5f) {
-            m_eSoundState = ST_OFF_TRANS_IDLE;
-        }
-        break;
-
-    case ST_OFF_TRANS_IDLE:
-        m_eSoundState     = ST_IDLE_TRANS_OFF;
-        m_fNextSoundState = level.time;
-        LoopSound(m_sSoundSet + "snd_move");
-        break;
-
-    case ST_IDLE_TRANS_OFF:
-        m_fNextSoundState = level.time;
-        if (fabs(fDiff) < 0.5f) {
-            m_eSoundState = ST_IDLE;
-        }
-
-        LoopSound(m_sSoundSet + "snd_move");
-        break;
-
-    case ST_IDLE:
-        m_eSoundState     = ST_OFF;
-        m_fNextSoundState = level.time;
-        LoopSound(m_sSoundSet + "snd_move");
-        break;
-
-    default:
-        // FIXME: default sound?
-        break;
-    }
-}
-
-void VehicleTurretGun::UpdateOwner(Sentient *pOwner)
-{
-    // FIXME: stub
-    STUB();
-}
-
 void VehicleTurretGun::SetBaseEntity(Event *ev)
 {
     SetBaseEntity(ev->GetEntity(1));
+
+    flags |= FL_THINK;
 }
 
-void VehicleTurretGun::PlaceTurret(Event *ev)
+void VehicleTurretGun::RemoteControl(usercmd_t *ucmd, Sentient *owner)
 {
-    setSolidType(SOLID_BBOX);
-    edict->r.contents = CONTENTS_UNKNOWN2;
-    setMoveType(MOVETYPE_NONE);
-    showModel();
-    groundentity = NULL;
-    m_fStartYaw  = angles[1];
-    flags |= FL_THINK;
-    m_vLastBaseAngles = angles;
-    m_vBaseAngles     = angles;
+    Vector vNewCmdAng;
 
-    if (m_vBaseAngles.length() != 0.0f) {
-        AnglesToAxis(m_vBaseAngles, m_mBaseOrientation);
-        m_bBOIsSet = true;
+    if (!ucmd || !owner) {
+        return;
+    }
+
+    vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
+
+    if (vNewCmdAng[0] || vNewCmdAng[1] || vNewCmdAng[2]) {
+        m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
+        m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
+        m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);
+    }
+
+    m_vUserLastCmdAng = vNewCmdAng;
+
+    if (!m_bUseRemoteControl) {
+        m_bUseRemoteControl = true;
+        m_pRemoteOwner      = owner;
+        m_vUserViewAng      = m_vLocalAngles;
+
+        GetRemoteOwner()->SetViewAngles(m_vUserViewAng + m_vBaseAngles);
+    }
+
+    if (ucmd->buttons & (BUTTON_ATTACKLEFT | BUTTON_ATTACKRIGHT)) {
+        if (!m_iFiring) {
+            m_iFiring = 1;
+        }
+    } else {
+        m_iFiring           = 0;
+        m_fTargetReloadTime = 0;
+        flags |= FL_THINK;
+    }
+}
+
+void VehicleTurretGun::UpdateOrientation(bool bCollisionCheck)
+{
+    Entity *ent;
+    Vector  localAngles;
+    vec3_t  mat[3];
+
+    if (m_pBaseEntity) {
+        ent = m_pBaseEntity;
+    } else if (edict->s.parent) {
+        ent = G_GetEntity(edict->s.parent);
+    } else {
+        ent = NULL;
     }
 
     m_iPitchBone = gi.Tag_NumForName(edict->tiki, "pitch");
-    SetControllerTag(0, m_iPitchBone);
-    m_iBarrelTag = gi.Tag_NumForName(edict->tiki, "tag_barrel");
+    m_iBarrelTag = gi.Tag_NumForName(edict->tiki, GetTagBarrel());
     m_iEyeBone   = gi.Tag_NumForName(edict->tiki, "eyebone");
 
-    if (m_pRemoteOwner || owner) {
-        if (m_pRemoteOwner) {
-            UpdateOwner(m_pRemoteOwner);
-        } else {
-            UpdateOwner(owner);
-        }
-    }
-}
+    if (m_iBarrelTag >= 0) {
+        orientation_t barrel_or;
 
-void VehicleTurretGun::TurretBeginUsed(Sentient *pEnt)
-{
-    if (m_pVehicleOwner) {
-        Vehicle *pVehicle = (Vehicle *)m_pVehicleOwner.Pointer();
-        int      slot     = pVehicle->FindTurretSlotByEntity(this);
-
-        pVehicle->UpdateTurretSlot(slot);
-        m_vBaseAngles = m_pVehicleOwner->angles;
+        GetTagPositionAndOrientation(m_iBarrelTag, &barrel_or);
+        m_vLastBarrelPos = m_vBarrelPos;
+        m_vBarrelPos     = barrel_or.origin;
     }
 
-    owner = pEnt;
+    if (bCollisionCheck && m_iBarrelTag >= 0) {
+        trace_t trace;
+        // check if the new barrel position is ok
+        trace = G_Trace(
+            m_vLastBarrelPos,
+            Vector(8, 8, 8),
+            Vector(-8, -8, -8),
+            m_vBarrelPos,
+            this,
+            edict->clipmask,
+            qfalse,
+            "VehicleTurretGun::Think.BarrelCheck"
+        );
 
-    edict->r.ownerNum = pEnt->entnum;
-    m_bHadOwner       = true;
-
-    Sound(sPickupSound);
-
-    owner->SetViewAngles(m_vBaseAngles);
-
-    m_vUserViewAng    = m_vBaseAngles;
-    m_vUserViewAng[0] = AngleNormalize180(m_vUserViewAng[0]);
-    m_vUserLastCmdAng = vec_zero;
-
-    setAngles(m_vBaseAngles);
-
-    if (owner->IsSubclassOfPlayer()) {
-        Player *player = (Player *)owner.Pointer();
-
-        player->EnterTurret(this);
-
-        if (!m_pUserCamera) {
-            m_pUserCamera = new Camera;
+        if (trace.fraction == 1 || trace.startsolid || trace.allsolid) {
+            CollisionCorrect(&trace);
         }
-
-        player->SetCamera(m_pUserCamera, 0.0f);
-        m_pUserCamera->setAngles(m_vBaseAngles);
     }
 
-    UpdateOwner(owner);
-    flags &= ~FL_THINK;
-    current_attachToTag = "";
-    ForceIdle();
-    CreateViewModel();
-}
+    localAngles = m_vLocalAngles;
 
-void VehicleTurretGun::TurretEndUsed(void)
-{
-    if (owner->IsSubclassOfPlayer()) {
-        Player *player = (Player *)owner.Pointer();
-
-        if (m_pUserCamera) {
-            player->SetCamera(NULL, 0);
-            player->ZoomOff();
-            m_pUserCamera->PostEvent(EV_Remove, 0);
-            m_pUserCamera = NULL;
-        }
-
-        player->ExitTurret();
-        DeleteViewModel();
+    if (m_iPitchBone >= 0) {
+        vec3_t controllerAngles = {localAngles[0], 0, 0};
+        SetControllerAngles(0, controllerAngles);
+        localAngles[0] = 0;
     }
 
-    owner             = NULL;
-    edict->r.ownerNum = ENTITYNUM_NONE;
-    m_fIdlePitchSpeed = 0;
-    m_iIdleHitCount   = 0;
-    m_iFiring         = 0;
-}
+    AnglesToAxis(localAngles, mat);
 
-void VehicleTurretGun::TurretUsed(Sentient *pEnt)
-{
-    if (owner) {
-        if (owner == pEnt) {
-            TurretEndUsed();
-            m_iFiring = 0;
-        }
+    if (m_bBOIsSet) {
+        vec3_t BOmat[3];
+
+        MatrixMultiply(mat, m_mBaseOrientation, BOmat);
+        MatrixToEulerAngles(BOmat, angles);
+        setAngles(angles);
     } else {
-        TurretBeginUsed(pEnt);
+        setAngles(localAngles);
     }
 }
 
-void VehicleTurretGun::TurretUsed(Event *ev)
+void VehicleTurretGun::CollisionCorrect(trace_t *pTr)
 {
-    Sentient *pEnt = (Sentient *)ev->GetEntity(1);
+    float planedot;
 
-    if (!pEnt || !pEnt->IsSubclassOfSentient()) {
+    if (pTr->plane.normal == vec_zero) {
         return;
     }
 
-    if (!m_bUsable || m_bLocked) {
-        return;
+    if (pTr->plane.normal[2]) {
+        if (pTr->plane.normal[2] > 0) {
+            m_vLocalAngles[0] -= m_fAIPitchSpeed * level.frametime;
+        } else {
+            m_vLocalAngles[0] += m_fAIPitchSpeed * level.frametime;
+        }
     }
 
-    if (pEnt->IsSubclassOfPlayer() && !m_bPlayerUsable) {
-        return;
+    planedot = DotProduct(pTr->plane.normal, orientation[1]);
+    if (fabs(planedot) > 0.25f) {
+        if (planedot > 0) {
+            m_vLocalAngles[1] += m_fTurnSpeed * level.frametime;
+        } else {
+            m_vLocalAngles[1] -= m_fTurnSpeed * level.frametime;
+        }
     }
-
-    TurretUsed(pEnt);
 }
 
 void VehicleTurretGun::EventKilled(Event *ev)
@@ -421,38 +733,114 @@ void VehicleTurretGun::EventKilled(Event *ev)
 
 void VehicleTurretGun::EventDamage(Event *ev)
 {
-    Event *event = new Event(ev);
+    if (g_gametype->integer == GT_TOW && !dmManager.RoundActive()) {
+        return;
+    }
 
     if (owner) {
-        owner->ProcessEvent(event);
+        owner->ProcessEvent(*ev);
         return;
     }
 
     if (m_pVehicleOwner) {
-        m_pVehicleOwner->ProcessEvent(event);
+        m_pVehicleOwner->ProcessEvent(*ev);
         return;
     }
 
     if (!m_bUseRemoteControl) {
-        DamageEvent(event);
+        meansOfDeath_t mod = static_cast<meansOfDeath_t>(ev->GetInteger(9));
+        switch (mod) {
+        case MOD_BULLET:
+        case MOD_BASH:
+        case MOD_FAST_BULLET:
+        case MOD_VEHICLE:
+        case MOD_SHOTGUN:
+            return;
+        default:
+            break;
+        }
+
+        Entity::DamageEvent(ev);
         return;
     }
 
-    if (m_pRemoteOwner && m_pRemoteOwner->IsSubclassOfPlayer()) {
-        Player *player = (Player *)m_pRemoteOwner.Pointer();
+    if (m_pRemoteOwner && m_pRemoteOwner->IsSubclassOfSentient()) {
+        Sentient *sent = static_cast<Sentient *>(m_pRemoteOwner.Pointer());
 
-        if (player->m_pVehicle) {
-            player->m_pVehicle->ProcessEvent(event);
+        if (sent->GetVehicle()) {
+            sent->GetVehicle()->ProcessEvent(*ev);
             return;
         }
     }
 }
 
+void VehicleTurretGun::SetVehicleOwner(Entity *e)
+{
+    m_pVehicleOwner = e;
+}
+
 void VehicleTurretGun::EventRemoveOnDeath(Event *ev)
 {
     m_bRemoveOnDeath = ev->GetBoolean(1);
 }
 
+void VehicleTurretGun::UpdateSound(void)
+{
+    float fPitchDiff, fYawDiff, fDiff;
+
+    if (level.time < m_fNextSoundState) {
+        return;
+    }
+
+    fYawDiff   = fabs(AngleSubtract(m_vTargetAngles[1], m_vLocalAngles[1]));
+    fPitchDiff = fabs(AngleSubtract(m_vTargetAngles[0], m_vLocalAngles[0]));
+    if (fYawDiff > fPitchDiff) {
+        fDiff = fYawDiff;
+    } else {
+        fDiff = fPitchDiff;
+    }
+
+    if (!owner && !m_bUseRemoteControl && !aim_target && !m_bRestable) {
+        fDiff = 0;
+    }
+
+    switch (m_eSoundState) {
+    case STT_OFF:
+        StopLoopSound();
+        m_fNextSoundState = level.time;
+        if (fabs(fDiff) > 0.5f) {
+            m_eSoundState = STT_OFF_TRANS_MOVING;
+        }
+        break;
+
+    case STT_OFF_TRANS_MOVING:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = STT_MOVING;
+        Sound(m_sSoundSet + "snd_move_start");
+        break;
+
+    case STT_MOVING:
+        m_fNextSoundState = level.time;
+        if (fDiff < 0.5) {
+            m_eSoundState = STT_MOVING_TRANS_OFF;
+        }
+        LoopSound(m_sSoundSet + "snd_move");
+        break;
+
+    case STT_MOVING_TRANS_OFF:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = STT_OFF;
+        StopLoopSound();
+        Sound(m_sSoundSet + "snd_move_stop");
+        break;
+
+    default:
+        m_fNextSoundState = level.time;
+        m_eSoundState     = STT_OFF;
+        break;
+    }
+}
+
 void VehicleTurretGun::EventSetCollisionModel(Event *ev)
 {
     Entity *pColEnt = ev->GetEntity(1);
@@ -462,33 +850,27 @@ void VehicleTurretGun::EventSetCollisionModel(Event *ev)
     }
 
     if (m_pCollisionEntity) {
-        m_pCollisionEntity->PostEvent(EV_Remove, EV_VEHICLE);
+        m_pCollisionEntity->PostEvent(EV_Remove, 0);
     }
 
     m_pCollisionEntity = new VehicleCollisionEntity(this);
-    m_pCollisionEntity->setModel(pColEnt->model);
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->setModel(pColEnt->model);
+        m_pCollisionEntity->setOrigin(origin);
+        m_pCollisionEntity->setAngles(angles);
 
-    if (!m_pCollisionEntity->model.length() || *m_pCollisionEntity->model != '*') {
-        // Re-post the event with the correct time
-        m_pCollisionEntity->CancelEventsOfType(EV_Remove);
-        m_pCollisionEntity->PostEvent(EV_Remove, EV_VEHICLE);
-        m_pCollisionEntity = NULL;
+        if (m_pCollisionEntity->model.length() && *m_pCollisionEntity->model == '*') {
+            UpdateCollisionEntity();
+            m_pCollisionEntity->DisconnectPaths();
+        } else {
+            // Re-post the event with the correct time
+            m_pCollisionEntity->CancelEventsOfType(EV_Remove);
+            m_pCollisionEntity->PostEvent(EV_Remove, EV_VEHICLE);
+            m_pCollisionEntity = NULL;
 
-        ScriptError("Model for Entity not of a valid type. Must be B-Model.");
+            ScriptError("Model for Entity not of a valid type. Must be B-Model.");
+        }
     }
-
-    m_pCollisionEntity->setOrigin(origin);
-    m_pCollisionEntity->setAngles(angles);
-}
-
-void VehicleTurretGun::EventGetCollisionModel(Event *ev)
-{
-    ev->AddEntity(m_pCollisionEntity);
-}
-
-void VehicleTurretGun::EventTurnSpeed(Event *ev)
-{
-    TurnSpeed(ev->GetFloat(1));
 }
 
 void VehicleTurretGun::EventLock(Event *ev)
@@ -506,10 +888,840 @@ void VehicleTurretGun::SetSoundSet(Event *ev)
     m_sSoundSet = ev->GetString(1);
 }
 
-bool VehicleTurretGun::TurretHasBeenMounted()
+void VehicleTurretGun::UpdateOwner(Sentient *pOwner)
 {
-    // FIXME: unimplemented
-    return false;
+    Vector        jitter;
+    Vector        position;
+    Vector        forward, left, up;
+    orientation_t bone_or;
+
+    if (m_iEyeBone >= 0) {
+        GetRawTag(m_iEyeBone, &bone_or);
+        angles.AngleVectorsLeft(&forward, &left, &up);
+
+        position = origin + bone_or.origin[0] * forward + bone_or.origin[1] * left + bone_or.origin[2] * up;
+    } else {
+        (m_vBaseAngles + m_vLocalAngles).AngleVectorsLeft(&forward, &left, &up);
+
+        position = origin + forward * -16 + up * 5;
+
+        if (m_iPitchBone >= 0) {
+            GetRawTag(m_iPitchBone, &bone_or);
+            angles.AngleVectorsLeft(&forward, &left, &up);
+
+            position += bone_or.origin[0] * forward + bone_or.origin[1] * left + bone_or.origin[2] * up;
+        } else {
+            angles.AngleVectorsLeft(&forward, NULL, &up);
+            position += up * 40;
+        }
+    }
+
+    jitter = m_vUserViewAng + m_vBaseAngles;
+    P_ApplyFiringViewJitter(jitter);
+
+    if (!m_pUserCamera && pOwner->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(pOwner);
+
+        m_pUserCamera = new Camera();
+        player->SetCamera(m_pUserCamera, 0.5);
+    }
+
+    if (owner) {
+        jitter[1] = m_vUserViewAng[1];
+    }
+
+    m_pUserCamera->setOrigin(position);
+    m_pUserCamera->setAngles(jitter);
+
+    if (GetTag("tag_seat", &bone_or)) {
+        vec3_t ang;
+
+        pOwner->setOrigin(bone_or.origin);
+        MatrixToEulerAngles(bone_or.axis, ang);
+        pOwner->setAngles(ang);
+    } else {
+        // no seat
+        pOwner->setOrigin(origin);
+    }
+
+    if (pOwner->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(pOwner);
+
+        if (!player->IsZoomed()) {
+            player->ToggleZoom(80);
+        }
+
+        player->client->ps.camera_flags |= CF_CAMERA_ANGLES_TURRETMODE;
+    }
+}
+
+void VehicleTurretGun::TurretHasBeenMounted()
+{
+    m_fLastFireTime = (level.time + m_fWarmupDelay) - fire_delay[FIRE_PRIMARY];
+    if (m_fWarmupDelay > 0.25) {
+        Sound(m_sSoundSet + "snd_warmup");
+    }
+
+    m_fWarmupTimeRemaining = m_fWarmupDelay;
+}
+
+void VehicleTurretGun::PlaceTurret(Event *ev)
+{
+    setSolidType(SOLID_BBOX);
+    setContents(CONTENTS_UNKNOWN2);
+    setMoveType(MOVETYPE_NONE);
+    showModel();
+    groundentity = NULL;
+    m_fStartYaw  = angles[1];
+    flags |= FL_THINK;
+    m_vLastBaseAngles = angles;
+    m_vBaseAngles     = angles;
+
+    if (m_vBaseAngles.length() != 0.0f) {
+        AnglesToAxis(m_vBaseAngles, m_mBaseOrientation);
+        m_bBOIsSet = true;
+    }
+
+    m_iPitchBone = gi.Tag_NumForName(edict->tiki, "pitch");
+    SetControllerTag(0, m_iPitchBone);
+    m_iBarrelTag = gi.Tag_NumForName(edict->tiki, GetTagBarrel());
+    m_iEyeBone   = gi.Tag_NumForName(edict->tiki, "eyebone");
+
+    if (m_pRemoteOwner) {
+        UpdateOwner(m_pRemoteOwner);
+    } else if (owner) {
+        UpdateOwner(owner);
+    }
+}
+
+void VehicleTurretGun::EventTurnSpeed(Event *ev)
+{
+    AI_TurnSpeed(ev->GetFloat(1));
+}
+
+bool VehicleTurretGun::UseRemoteControl(void)
+{
+    return m_bUseRemoteControl;
+}
+
+qboolean VehicleTurretGun::ReadyToFire(firemode_t mode, qboolean playsound)
+{
+    if (!use_no_ammo) {
+        return Weapon::ReadyToFire(mode, playsound);
+    }
+
+    if (m_fReloadDelay <= 0) {
+        return Weapon::ReadyToFire(mode, playsound);
+    }
+
+    if (m_fReloadTimeRemaining <= 0) {
+        return Weapon::ReadyToFire(mode, playsound);
+    }
+
+    return qfalse;
+}
+
+void VehicleTurretGun::AdjustReloadStatus()
+{
+    if (!use_no_ammo) {
+        return;
+    }
+
+    if (m_fReloadDelay <= 0) {
+        return;
+    }
+
+    m_iAmmo--;
+    ammo_in_clip[FIRE_PRIMARY] = m_iAmmo;
+    if (!m_iAmmo) {
+        m_iAmmo                = m_iReloadShots;
+        m_fReloadTimeRemaining = m_fReloadDelay;
+
+        if (g_target_game <= target_game_e::TG_MOHTA) {
+            //
+            // Below 2.30 (Spearhead), the sound is played immediately.
+            // 2.30 has it wrong with the Nebelwerfer.
+            //
+            ProcessEvent(EV_VehicleTurretGun_PlayReloadSound);
+            return;
+        }
+
+        //
+        // Changed in 2.30
+        //  Play the reload sound once finished reloading
+        PostEvent(EV_VehicleTurretGun_PlayReloadSound, m_fReloadDelay * 0.5);
+    }
+}
+
+void VehicleTurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forward, vec3_t right, vec3_t up)
+{
+    Vector        delta;
+    Vector        aim_angles;
+    Sentient     *viewer;
+    orientation_t barrel_or;
+    vec3_t        weap_axis[3];
+    float         mat[3][3];
+    int           i;
+
+    viewer = owner;
+    if (!owner) {
+        viewer = GetRemoteOwner();
+    }
+
+    if (!viewer) {
+        if (forward || right || up) {
+            if (!m_bUseRemoteControl && aim_target) {
+                Vector dir;
+                Vector vAng;
+                Vector vFwd;
+
+                AngleVectors(angles, vFwd, right, up);
+                delta = aim_target->origin;
+
+                if (aim_target->HasVehicle()) {
+                    delta.z -= 60;
+                }
+
+                dir = delta - origin;
+                VectorNormalize(dir);
+                dir.x = vFwd.x;
+                dir.y = vFwd.y;
+                VectorNormalize(dir);
+                VectorToAngles(dir, vAng);
+                AngleVectors(vAng, forward, right, up);
+            } else {
+                AngleVectors(angles, forward, right, up);
+            }
+        }
+
+        VectorCopy(origin, position);
+
+        if (GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_axis[i], position);
+            }
+        }
+
+        if (vBarrelPos) {
+            VectorCopy(position, vBarrelPos);
+        }
+    } else if (viewer->IsSubclassOfPlayer()) {
+        VectorCopy(origin, position);
+
+        if (GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_axis[i], position);
+            }
+        }
+
+        if (vBarrelPos) {
+            VectorCopy(position, vBarrelPos);
+        }
+
+        delta      = viewer->GunTarget(false, position) - position;
+        aim_angles = delta.toAngles();
+
+        if (IsSubclassOfVehicleTurretGun()) {
+            vec3_t ang;
+
+            MatrixMultiply(barrel_or.axis, weap_axis, mat);
+            vectoangles(mat[0], ang);
+
+            for (i = 0; i < 2; i++) {
+                float diff;
+
+                diff = abs(AngleSubtract(aim_angles[i], ang[i]));
+                if (diff > m_vAimTolerance[i]) {
+                    aim_angles[i] = m_vAimOffset[i] + ang[i];
+                }
+            }
+        }
+
+        if (forward || right || up) {
+            AngleVectors(aim_angles, forward, right, up);
+        }
+    } else {
+        TurretGun::GetMuzzlePosition(position, vBarrelPos, forward, right, up);
+    }
+}
+
+void VehicleTurretGun::ApplyFireKickback(const Vector& org, float kickback)
+{
+    Vehicle *pVehicle;
+
+    if (!m_pVehicleOwner || !m_pVehicleOwner->IsSubclassOfVehicle()) {
+        return;
+    }
+
+    if (g_target_game <= target_game_e::TG_MOH) {
+        // Don't apply fire kickback in older version
+        // this could cause issues as models weren't made for this feature
+        return;
+    }
+
+    // Added in 2.0
+
+    pVehicle = static_cast<Vehicle *>(m_pVehicleOwner.Pointer());
+    pVehicle->m_fForwardForce += org.x * kickback;
+    pVehicle->m_fLeftForce += org.y * kickback;
+}
+
+void VehicleTurretGun::SetRemoteOwner(Sentient *e)
+{
+    m_bUseRemoteControl = true;
+    m_pRemoteOwner      = e;
+    flags |= FL_THINK;
+}
+
+void VehicleTurretGun::EventGetCollisionModel(Event *ev)
+{
+    ev->AddEntity(m_pCollisionEntity);
+}
+
+float VehicleTurretGun::FireDelay(firemode_t mode)
+{
+    return fire_delay[mode];
+}
+
+void VehicleTurretGun::SetWarmupDelay(Event *ev)
+{
+    m_fWarmupDelay = ev->GetFloat(1);
+}
+
+void VehicleTurretGun::SetFireWarmupDelay(Event *ev)
+{
+    m_fFireWarmupDelay = ev->GetFloat(1);
+}
+
+void VehicleTurretGun::SetReloadDelay(Event *ev)
+{
+    m_fReloadDelay = ev->GetFloat(1);
+}
+
+void VehicleTurretGun::SetReloadShots(Event *ev)
+{
+    m_iReloadShots               = ev->GetInteger(1);
+    m_iAmmo                      = m_iReloadShots;
+    ammo_in_clip[FIRE_PRIMARY]   = m_iAmmo;
+    ammo_clip_size[FIRE_PRIMARY] = m_iAmmo;
+}
+
+void VehicleTurretGun::SetAimOffset(Event *ev)
+{
+    m_vAimOffset = ev->GetVector(1);
+}
+
+void VehicleTurretGun::SetAimTolerance(Event *ev)
+{
+    m_vAimTolerance = ev->GetVector(1);
+}
+
+void VehicleTurretGun::SetTargetEntity(Event *ev)
+{
+    SetTargetEntity(ev->GetEntity(1));
+}
+
+void VehicleTurretGun::PlayReloadSound(Event *ev)
+{
+    Sound(m_sSoundSet + "snd_reload", CHAN_AUTO);
+}
+
+void VehicleTurretGun::SetTargetEntity(Entity *ent)
+{
+    Vector delta;
+    int    i;
+
+    if (!ent) {
+        return;
+    }
+
+    if (owner || m_pRemoteOwner) {
+        return;
+    }
+
+    delta = ent->origin - origin;
+    delta.normalize();
+
+    vectoangles(delta, m_vLocalAngles);
+    m_vLocalAngles -= m_vBaseAngles;
+
+    for (i = 0; i < 2; i++) {
+        if (m_vLocalAngles[i] > 180) {
+            m_vLocalAngles[i] -= 360;
+        }
+
+        if (m_vLocalAngles[i] < -180) {
+            m_vLocalAngles[i] += 360;
+        }
+    }
+
+    m_vLocalAngles[0] = Q_clamp_float(m_vLocalAngles[0], m_fPitchUpCap, m_fPitchDownCap);
+    m_vLocalAngles[1] = Q_clamp_float(m_vLocalAngles[1], -(m_fStartYaw + m_fMaxYawOffset), m_fStartYaw + m_fMaxYawOffset);
+
+    UpdateOrientation(false);
+}
+
+void VehicleTurretGun::UpdateAndMoveOwner()
+{
+    Vector  delta;
+    Vector  dir;
+    Vector  targetAngles;
+    Entity *parentEnt;
+    float   fDiff;
+
+    parentEnt = GetParent();
+
+    m_vUserViewAng[0] = Q_clamp_float(m_vUserViewAng[0], m_fPitchUpCap - MAX_VT_PITCHCAP_OFFSET, m_fPitchDownCap + MAX_VT_PITCHCAP_OFFSET);
+
+    fDiff = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+    fDiff = Q_clamp_float(fDiff, -(m_fMaxYawOffset + MAX_VT_YAW_OFFSET), m_fMaxYawOffset + MAX_VT_YAW_OFFSET);
+    m_vUserViewAng[1] = m_fStartYaw + fDiff;
+
+    owner->SetViewAngles(m_vUserViewAng + m_vBaseAngles);
+    delta = owner->GunTarget(true) - origin;
+
+    if (m_bBOIsSet) {
+        dir[0] = m_mBaseOrientation[0] * delta;
+        dir[1] = m_mBaseOrientation[1] * delta;
+        dir[2] = m_mBaseOrientation[2] * delta;
+    } else if (parentEnt) {
+        vec3_t mat[3];
+
+        AnglesToAxis(parentEnt->angles, mat);
+        dir[0] = mat[0] * delta;
+        dir[1] = mat[1] * delta;
+        dir[2] = mat[2] * delta;
+    } else {
+        dir = delta;
+    }
+
+    VectorNormalize(dir);
+    vectoangles(dir, m_vTargetAngles);
+}
+
+void VehicleTurretGun::UpdateTimers(float& yawTimer, float& pitchTimer)
+{
+    if (m_fReloadTimeRemaining > 0) {
+        m_fReloadTimeRemaining -= level.frametime;
+        if (m_fReloadTimeRemaining <= 0) {
+            ammo_in_clip[FIRE_PRIMARY] = m_iAmmo;
+        }
+    }
+
+    if (m_fWarmupTimeRemaining > 0) {
+        m_fWarmupTimeRemaining -= level.frametime;
+        yawTimer   = level.frametime * (m_fTurnSpeed * ((m_fWarmupDelay - m_fWarmupTimeRemaining) / m_fWarmupDelay));
+        pitchTimer = level.frametime * (m_fAIPitchSpeed * ((m_fWarmupDelay - m_fWarmupTimeRemaining) / m_fWarmupDelay));
+    } else {
+        yawTimer   = m_fTurnSpeed * level.frametime;
+        pitchTimer = m_fAIPitchSpeed * level.frametime;
+    }
+}
+
+void VehicleTurretGun::UpdateCaps(float maxYawOffset, float maxPitchOffset)
+{
+    float fDiff;
+
+    if (m_vTargetAngles[0] > 180) {
+        m_vTargetAngles[0] -= 360;
+    } else if (m_vTargetAngles[0] < -180) {
+        m_vTargetAngles[0] += 360;
+    }
+
+    m_vTargetAngles[0] = Q_clamp_float(m_vTargetAngles[0], m_fPitchUpCap, m_fPitchDownCap);
+
+    if (m_fAIPitchSpeed > 1000) {
+        m_vLocalAngles[0] = m_vTargetAngles[0];
+    } else {
+        fDiff = AngleSubtract(m_vTargetAngles[0], m_vLocalAngles[0]);
+        if (fabs(fDiff) >= maxPitchOffset) {
+            if (fDiff > 0) {
+                m_vLocalAngles[0] += maxPitchOffset;
+            } else {
+                m_vLocalAngles[0] -= maxPitchOffset;
+            }
+        } else {
+            m_vLocalAngles[0] = m_vTargetAngles[0];
+        }
+    }
+
+    fDiff = AngleSubtract(m_vTargetAngles[1], m_fStartYaw);
+    fDiff = Q_clamp_float(fDiff, -m_fMaxYawOffset, m_fMaxYawOffset);
+
+    if (m_fTurnSpeed > 1000) {
+        m_vLocalAngles[1] = m_vTargetAngles[1];
+    } else {
+        m_vTargetAngles[1] = m_fStartYaw + fDiff;
+
+        fDiff = AngleSubtract(m_vTargetAngles[1], m_vLocalAngles[1]);
+        if (fabs(fDiff) < 2) {
+            Unregister(STRING_ONTARGET);
+        }
+
+        if (fabs(fDiff) >= maxYawOffset) {
+            if (fDiff > 0) {
+                m_vLocalAngles[1] += maxYawOffset;
+            } else {
+                m_vLocalAngles[1] -= maxYawOffset;
+            }
+        } else {
+            m_vLocalAngles[1] = m_vTargetAngles[1];
+        }
+    }
+}
+
+void VehicleTurretGun::IdleToRestPosition()
+{
+    Vector  vDir, vNewAngles, vEnd;
+    trace_t trace;
+
+    if (angles[0] > 180) {
+        angles[0] -= 360;
+    }
+
+    if (angles[0] < -80) {
+        m_fIdlePitchSpeed = 0;
+        m_iIdleHitCount   = 0;
+        return;
+    }
+
+    if (m_iIdleHitCount > 1) {
+        return;
+    }
+
+    m_fIdlePitchSpeed -= level.frametime * 300;
+
+    vNewAngles = Vector(angles[0] + level.frametime * m_fIdlePitchSpeed, angles[1], angles[2]);
+    vNewAngles.AngleVectorsLeft(&vDir);
+    vEnd = origin + vDir * m_vIdleCheckOffset[0];
+
+    trace = G_Trace(origin, vec_zero, vec_zero, vEnd, this, edict->clipmask, false, "TurretGun::Think idle");
+
+    if (trace.fraction == 1) {
+        setAngles(vNewAngles);
+        m_iIdleHitCount = 0;
+        return;
+    }
+
+    int iTry;
+    for (iTry = 3; iTry > 0; iTry--) {
+        vNewAngles[0] = angles[0] + level.frametime * m_fIdlePitchSpeed * iTry * 0.25f;
+        if (vNewAngles[0] < m_fMaxIdlePitch) {
+            continue;
+        }
+
+        vNewAngles.AngleVectorsLeft(&vDir);
+        vEnd = origin + vDir * m_vIdleCheckOffset[0];
+
+        trace = G_Trace(origin, vec_zero, vec_zero, vEnd, this, edict->clipmask, false, "TurretGun::Think idle");
+
+        if (trace.fraction == 1) {
+            setAngles(vNewAngles);
+
+            m_iIdleHitCount = 0;
+            m_fIdlePitchSpeed *= 0.25f * iTry;
+            break;
+        }
+    }
+
+    if (!iTry) {
+        m_fIdlePitchSpeed = 0;
+
+        Entity *ent = G_GetEntity(trace.entityNum);
+
+        if (ent && ent == world) {
+            m_iIdleHitCount++;
+        } else {
+            m_iIdleHitCount = 0;
+        }
+    }
+}
+
+void VehicleTurretGun::UpdateFireControl()
+{
+    if (!m_iFiring) {
+        return;
+    }
+
+    if (m_iFiring == 1) {
+        if (m_fFireWarmupDelay > 0) {
+            Sound(m_sSoundSet + "snd_fire_warmup");
+            m_fTargetReloadTime = level.time + m_fFireWarmupDelay;
+            m_iFiring           = 2;
+        } else {
+            m_iFiring = 3;
+        }
+    } else if (m_iFiring == 2) {
+        if (level.time >= m_fTargetReloadTime) {
+            m_iFiring = 3;
+        }
+    }
+
+    if (m_iFiring <= 2) {
+        return;
+    }
+
+    if (!m_fMaxBurstDelay) {
+        m_iFiring = 4;
+
+        if (ReadyToFire(FIRE_PRIMARY, false)) {
+            Fire(FIRE_PRIMARY);
+            assert(!m_pVehicleOwner || (m_pVehicleOwner && m_pVehicleOwner->IsSubclassOfVehicle()));
+
+            m_fCurrViewJitter = m_fViewJitter;
+            AdjustReloadStatus();
+
+            if (m_pVehicleOwner && m_pVehicleOwner->IsSubclassOfVehicleTank()) {
+                VehicleTank *tank = static_cast<VehicleTank *>(m_pVehicleOwner.Pointer());
+                tank->KickSuspension(Vector(orientation[1]) * -1, 6);
+            }
+        }
+    } else if (m_iFiring == 4) {
+        if (ReadyToFire(FIRE_PRIMARY, false)) {
+            Fire(FIRE_PRIMARY);
+            assert(!m_pVehicleOwner || (m_pVehicleOwner && m_pVehicleOwner->IsSubclassOfVehicle()));
+
+            m_fCurrViewJitter = m_fViewJitter;
+            AdjustReloadStatus();
+
+            if (m_pVehicleOwner && m_pVehicleOwner->IsSubclassOfVehicleTank()) {
+                VehicleTank *tank = static_cast<VehicleTank *>(m_pVehicleOwner.Pointer());
+                tank->KickSuspension(Vector(orientation[1]) * -1, 6);
+            }
+
+            if (level.time > m_fFireToggleTime) {
+                m_iFiring         = 1;
+                m_fFireToggleTime = level.time + m_fMinBurstDelay + (m_fMaxBurstDelay - m_fMinBurstDelay) * random();
+            }
+        }
+    } else if (level.time > m_fFireToggleTime) {
+        m_iFiring         = 4;
+        m_fFireToggleTime = level.time + m_fMinBurstDelay + (m_fMaxBurstDelay - m_fMinBurstDelay) * random();
+    }
+}
+
+void VehicleTurretGun::UpdateCollisionEntity()
+{
+    Sentient *sentOwner;
+    Vector    amove;
+    Vector    newAngles;
+    solid_t   oldsolid;
+
+    if (!m_pCollisionEntity) {
+        return;
+    }
+
+    setSolidType(SOLID_NOT);
+
+    sentOwner = GetSentientOwner();
+    if (sentOwner) {
+        oldsolid = sentOwner->edict->solid;
+        sentOwner->setSolidType(SOLID_NOT);
+    }
+
+    m_pCollisionEntity->Solid();
+    if (m_iPitchBone < 0) {
+        newAngles = angles;
+    } else if (m_bBOIsSet) {
+        vec3_t axis[3];
+        vec3_t mat[3];
+
+        AnglesToAxis(m_vLocalAngles, axis);
+        MatrixMultiply(axis, m_mBaseOrientation, mat);
+        MatrixToEulerAngles(mat, newAngles);
+    } else {
+        newAngles = m_vLocalAngles;
+    }
+
+    amove[0] = angledist(newAngles[0] - m_pCollisionEntity->angles[0]);
+    amove[1] = angledist(newAngles[1] - m_pCollisionEntity->angles[1]);
+    amove[2] = angledist(newAngles[2] - m_pCollisionEntity->angles[2]);
+
+    G_PushMove(m_pCollisionEntity, origin - m_pCollisionEntity->origin, amove);
+
+    m_pCollisionEntity->setOrigin(origin);
+    m_pCollisionEntity->setAngles(newAngles);
+    m_pCollisionEntity->velocity  = velocity;
+    m_pCollisionEntity->avelocity = avelocity;
+
+    if (sentOwner) {
+        sentOwner->setSolidType(static_cast<solid_t>(oldsolid));
+    }
+}
+
+void VehicleTurretGun::RestrictPitch()
+{
+    m_vUserViewAng[0] = Q_clamp_float(m_vUserViewAng[0], m_fPitchUpCap - MAX_VT_PITCHCAP_OFFSET, m_fPitchDownCap + MAX_VT_PITCHCAP_OFFSET);
+}
+
+void VehicleTurretGun::RestrictYaw()
+{
+    float fDiff;
+
+    fDiff = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+    fDiff = Q_clamp_float(fDiff, -(m_fMaxYawOffset + MAX_VT_YAW_OFFSET), m_fMaxYawOffset + MAX_VT_YAW_OFFSET);
+
+    m_vUserViewAng[1] = m_fStartYaw + fDiff;
+}
+
+void VehicleTurretGun::UpdateRemoteControl()
+{
+    Sentient *sentOwner;
+    Vector    position;
+    Vector    forward, left, up;
+    Vector    start, end;
+    Vector    delta;
+    Vector    transformed;
+    trace_t   trace;
+
+    RestrictPitch();
+    RestrictYaw();
+
+    sentOwner = GetSentientOwner();
+    if (!sentOwner) {
+        return;
+    }
+
+    sentOwner->SetViewAngles(m_vUserViewAng + m_vBaseAngles);
+
+    if (m_iEyeBone < 0) {
+        (m_vUserViewAng + m_vBaseAngles).AngleVectors(&forward);
+        end = m_pRemoteOwner->origin + forward * 16384;
+
+        trace =
+            G_Trace(m_pRemoteOwner->origin, vec_zero, vec_zero, end, this, MASK_TRANSPARENT, qfalse, "VehicleTurret");
+
+        position = trace.endpos;
+    } else {
+        orientation_t eye_or;
+
+        GetRawTag(m_iEyeBone, &eye_or);
+        angles.AngleVectorsLeft(&forward, &left, &up);
+
+        start = origin + forward * eye_or.origin[0] + left * eye_or.origin[1] + up * eye_or.origin[2];
+        (m_vUserViewAng + m_vBaseAngles).AngleVectorsLeft(&forward);
+
+        end = start + forward * 8192;
+
+        trace = G_Trace(start, vec_zero, vec_zero, end, this, MASK_TRANSPARENT, qfalse, "VehicleTurret");
+
+        position = trace.endpos;
+    }
+
+    delta = position - origin;
+
+    if (m_bBOIsSet) {
+        transformed[0] = m_mBaseOrientation[0] * delta;
+        transformed[1] = m_mBaseOrientation[1] * delta;
+        transformed[2] = m_mBaseOrientation[2] * delta;
+    } else if (GetParent()) {
+        vec3_t mat[3];
+
+        AnglesToAxis(GetParent()->angles, mat);
+        transformed[0] = mat[0] * delta;
+        transformed[1] = mat[1] * delta;
+        transformed[2] = mat[2] * delta;
+    } else {
+        transformed = delta;
+    }
+
+    VectorNormalize(transformed);
+    vectoangles(transformed, m_vTargetAngles);
+}
+
+void VehicleTurretGun::UpdateAimTarget()
+{
+    Vector delta;
+    Vector transformed;
+
+    delta = aim_target->centroid - centroid;
+    if (m_bBOIsSet) {
+        transformed[0] = m_mBaseOrientation[0] * delta;
+        transformed[1] = m_mBaseOrientation[1] * delta;
+        transformed[2] = m_mBaseOrientation[2] * delta;
+    } else if (GetParent()) {
+        vec3_t mat[3];
+
+        AnglesToAxis(GetParent()->angles, mat);
+        transformed[0] = mat[0] * delta;
+        transformed[1] = mat[1] * delta;
+        transformed[2] = mat[2] * delta;
+    } else {
+        transformed = delta;
+    }
+
+    VectorNormalize(transformed);
+    vectoangles(transformed, m_vTargetAngles);
+}
+
+Entity *VehicleTurretGun::GetParent() const
+{
+    if (m_pBaseEntity) {
+        return m_pBaseEntity;
+    }
+
+    if (edict->s.parent) {
+        return G_GetEntity(edict->s.parent);
+    }
+
+    return NULL;
+}
+
+SentientPtr VehicleTurretGun::GetRemoteOwner(void)
+{
+    return m_pRemoteOwner;
+}
+
+SentientPtr VehicleTurretGun::GetSentientOwner()
+{
+    if (IsRemoteControlled()) {
+        return GetRemoteOwner();
+    } else {
+        return owner;
+    }
+}
+
+void VehicleTurretGun::EndRemoteControl()
+{
+    m_bUseRemoteControl = false;
+    m_pRemoteOwner      = NULL;
+    m_fIdlePitchSpeed   = 0;
+    m_iIdleHitCount     = 0;
+    m_iFiring           = 0;
+    m_vTargetAngles     = m_vLocalAngles;
+
+    // Added in OPM
+    //  Clear the camera shake/jitter
+    m_fCurrViewJitter = 0;
+
+    //
+    // Added in OPM.
+    //  The camera must be removed after ending the remote control.
+    RemoveUserCamera();
+}
+
+float VehicleTurretGun::GetWarmupFraction() const
+{
+    float frac;
+
+    if (!m_fTargetReloadTime) {
+        return 0;
+    }
+
+    frac = (m_fTargetReloadTime - level.time) / m_fFireWarmupDelay;
+    // Clamp between [0,1]
+    frac = Q_clamp_float(frac, 0, 1);
+
+    return 1.0 - frac;
+}
+
+bool VehicleTurretGun::IsRemoteControlled()
+{
+    return m_bUseRemoteControl;
 }
 
 bool VehicleTurretGun::isLocked(void)
@@ -527,60 +1739,473 @@ void VehicleTurretGun::UnLock(void)
     m_bLocked = false;
 }
 
-bool VehicleTurretGun::UseRemoteControl(void)
-{
-    return m_bUseRemoteControl;
-}
-
-void VehicleTurretGun::RestrictPitch()
-{
-    // FIXME: unimplemented
-}
-
-void VehicleTurretGun::RestrictYaw()
-{
-    // FIXME: unimplemented
-}
-
-void VehicleTurretGun::UpdateRemoteControl()
-{
-    // FIXME: unimplemented
-}
-
-void VehicleTurretGun::UpdateAimTarget()
-{
-    // FIXME: unimplemented
-}
-
-Entity *VehicleTurretGun::GetParent() const
-{
-    // FIXME: unimplemented
-    return NULL;
-}
-
-SentientPtr VehicleTurretGun::GetRemoteOwner(void)
-{
-    return m_pRemoteOwner;
-}
-
-SentientPtr VehicleTurretGun::GetSentientOwner()
-{
-    // FIXME: unimplemented
-    return m_pRemoteOwner;
-}
-
-void VehicleTurretGun::EndRemoteControl()
-{
-    // FIXME: unimplemented
-}
-
-float VehicleTurretGun::GetWarmupFraction() const
-{
-    // FIXME: unimplemented
-    return 0;
-}
-
 void VehicleTurretGun::Archive(Archiver& arc)
 {
-    // FIXME: unimplemented
-}
\ No newline at end of file
+    TurretGun::Archive(arc);
+
+    arc.ArchiveVector(&m_vTargetAngles);
+    arc.ArchiveVector(&m_vLocalAngles);
+    arc.ArchiveVec3(m_mBaseOrientation[0]);
+    arc.ArchiveVec3(m_mBaseOrientation[1]);
+    arc.ArchiveVec3(m_mBaseOrientation[2]);
+    arc.ArchiveInteger(&m_iPitchBone);
+    arc.ArchiveVector(&m_vBaseAngles);
+    arc.ArchiveVector(&m_vLastBaseAngles);
+    arc.ArchiveSafePointer(&m_pBaseEntity);
+    arc.ArchiveBool(&m_bBOIsSet);
+    arc.ArchiveBool(&m_bUseRemoteControl);
+    arc.ArchiveSafePointer(&m_pRemoteOwner);
+    arc.ArchiveInteger(&m_iBarrelTag);
+    arc.ArchiveInteger(&m_iEyeBone);
+    arc.ArchiveVector(&m_vBarrelPos);
+    arc.ArchiveVector(&m_vLastBarrelPos);
+    arc.ArchiveFloat(&m_fWarmupTimeRemaining);
+    arc.ArchiveFloat(&m_fWarmupDelay);
+    arc.ArchiveFloat(&m_fFireWarmupDelay);
+    arc.ArchiveFloat(&m_fTargetReloadTime);
+    arc.ArchiveInteger(&m_iReloadShots);
+    arc.ArchiveInteger(&m_iAmmo);
+    arc.ArchiveFloat(&m_fReloadDelay);
+    arc.ArchiveFloat(&m_fReloadTimeRemaining);
+    arc.ArchiveVector(&m_vAimOffset);
+    arc.ArchiveVector(&m_vAimTolerance);
+    arc.ArchiveSafePointer(&m_pVehicleOwner);
+    arc.ArchiveBool(&m_bRemoveOnDeath);
+    ArchiveEnum(m_eSoundState, SOUND_STATE_TURRET);
+    arc.ArchiveFloat(&m_fNextSoundState);
+    arc.ArchiveBool(&m_bLocked);
+    arc.ArchiveString(&m_sSoundSet);
+    arc.ArchiveSafePointer(&m_pCollisionEntity);
+}
+
+EntityPtr VehicleTurretGun::GetVehicle() const
+{
+    return m_pVehicleOwner;
+}
+
+SentientPtr VehicleTurretGun::GetRawRemoteOwner() const
+{
+    return m_pRemoteOwner;
+}
+
+Event EV_VTGP_LinkTurret
+(
+    "linkturret",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Sets the next turret in the link.",
+    EV_NORMAL
+);
+
+// Added in 2.30
+Event EV_VTGP_SetSwitchThread
+(
+    "setswitchthread",
+    EV_DEFAULT,
+    "s",
+    "thread",
+    "Set the thread to execute when turret is switched",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(VehicleTurretGun, VehicleTurretGunTandem, "VehicleTurretGunTandem") {
+    {&EV_VTGP_LinkTurret,      &VehicleTurretGunTandem::EventLinkTurret     },
+
+    // Added in 2.30
+    {&EV_VTGP_SetSwitchThread, &VehicleTurretGunTandem::EventSetSwitchThread},
+    {NULL,                     NULL                                         }
+};
+
+VehicleTurretGunTandem::VehicleTurretGunTandem()
+{
+    m_Slot.ent             = NULL;
+    m_Slot.flags           = SLOT_FREE;
+    m_Slot.boneindex       = -1;
+    m_Slot.enter_boneindex = -1;
+
+    m_PrimaryTurret = NULL;
+    m_HeadTurret    = this;
+    m_ActiveTurret  = NULL;
+
+    m_fSwitchTimeRemaining = 0;
+    // 1 second switch delay
+    m_fSwitchDelay = 1;
+}
+
+VehicleTurretGunTandem::~VehicleTurretGunTandem()
+{
+    //
+    // Added in 2.30
+    // Also remove linked turrets
+    //
+    if (m_Slot.ent) {
+        m_Slot.ent->PostEvent(EV_Remove, 0);
+    }
+}
+
+void VehicleTurretGunTandem::EventLinkTurret(Event *ev)
+{
+    VehicleTurretGunTandem *linkedTurret;
+
+    linkedTurret = new VehicleTurretGunTandem();
+    linkedTurret->SetBaseOrientation(orientation, NULL);
+    linkedTurret->setModel(ev->GetString(1));
+
+    AttachLinkedTurret(linkedTurret);
+    UpdateLinkedTurret();
+}
+
+void VehicleTurretGunTandem::AttachLinkedTurret(Entity *ent)
+{
+    if (!ent) {
+        return;
+    }
+
+    OpenSlotsByModel();
+    m_Slot.ent      = ent;
+    m_Slot.flags    = SLOT_BUSY;
+    ent->takedamage = DAMAGE_NO;
+    ent->PostEvent(EV_BecomeNonSolid, level.frametime);
+
+    // process every end of frame
+    flags |= FL_POSTTHINK;
+
+    m_Slot.ent->setAngles(angles);
+
+    if (m_PrimaryTurret) {
+        VehicleTurretGunTandem *pTurret = static_cast<VehicleTurretGunTandem *>(m_Slot.ent.Pointer());
+        pTurret->SetPrimaryTurret(m_PrimaryTurret);
+    } else {
+        VehicleTurretGunTandem *pTurret = static_cast<VehicleTurretGunTandem *>(m_Slot.ent.Pointer());
+        pTurret->SetPrimaryTurret(this);
+    }
+}
+
+void VehicleTurretGunTandem::UpdateLinkedTurret()
+{
+    VehicleTurretGun *pTurret;
+    orientation_t     tag_or;
+
+    if (!(m_Slot.flags & SLOT_BUSY) || !m_Slot.ent) {
+        return;
+    }
+    if (m_Slot.boneindex == -1) {
+        m_Slot.ent->setOrigin(origin);
+        m_Slot.ent->avelocity = avelocity;
+        m_Slot.ent->velocity  = velocity;
+
+        pTurret = static_cast<VehicleTurretGun *>(m_Slot.ent.Pointer());
+        pTurret->SetBaseOrientation(orientation, NULL);
+    } else {
+        GetTag(m_Slot.boneindex, &tag_or);
+
+        m_Slot.ent->setOrigin(tag_or.origin);
+        m_Slot.ent->avelocity = avelocity;
+        m_Slot.ent->velocity  = velocity;
+
+        pTurret = static_cast<VehicleTurretGun *>(m_Slot.ent.Pointer());
+        pTurret->SetBaseOrientation(tag_or.axis, NULL);
+    }
+}
+
+void VehicleTurretGunTandem::OpenSlotsByModel()
+{
+    int tagnum;
+
+    tagnum = gi.Tag_NumForName(edict->tiki, "turret0");
+    if (tagnum >= 0) {
+        m_Slot.boneindex = tagnum;
+        m_Slot.ent       = NULL;
+        m_Slot.flags     = SLOT_FREE;
+    }
+}
+
+void VehicleTurretGunTandem::Think()
+{
+    if (m_PrimaryTurret) {
+        ThinkSecondary();
+    } else {
+        ThinkPrimary();
+    }
+}
+
+bool VehicleTurretGunTandem::IsRemoteControlled()
+{
+    if (m_PrimaryTurret) {
+        return m_PrimaryTurret->m_bUseRemoteControl;
+    } else {
+        return m_bUseRemoteControl;
+    }
+}
+
+SentientPtr VehicleTurretGunTandem::GetRemoteOwner()
+{
+    if (m_PrimaryTurret) {
+        return m_PrimaryTurret->m_pRemoteOwner;
+    } else {
+        return m_pRemoteOwner;
+    }
+}
+
+void VehicleTurretGunTandem::EndRemoteControl()
+{
+    //
+    // Added in OPM.
+    //  This cleanups remove control stuff from the main turret and linked turrets.
+    VehicleTurretGun::EndRemoteControl();
+
+    if (m_HeadTurret && m_HeadTurret != this) {
+        return m_HeadTurret->EndRemoteControl();
+    }
+}
+
+void VehicleTurretGunTandem::ThinkSecondary()
+{
+    float     yawOffset, pitchOffset;
+    Sentient *sentOwner;
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER && m_PrimaryTurret->edict->s.renderfx & RF_DEPTHHACK) {
+        edict->s.renderfx |= RF_DEPTHHACK;
+    }
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->NotSolid();
+    }
+
+    UpdateTimers(yawOffset, pitchOffset);
+
+    if (IsRemoteControlled() && IsActiveTurret()) {
+        UpdateRemoteControl();
+        UpdateCaps(yawOffset, pitchOffset);
+    } else if (m_bRestable) {
+        IdleToRestPosition();
+    }
+
+    UpdateOrientation(false);
+    UpdateSound();
+    UpdateFireControl();
+
+    sentOwner = GetSentientOwner();
+    if (IsActiveTurret() && sentOwner) {
+        G_TouchTriggers(sentOwner);
+        UpdateOwner(sentOwner);
+    }
+
+    UpdateCollisionEntity();
+}
+
+void VehicleTurretGunTandem::ThinkPrimary()
+{
+    float     yawOffset, pitchOffset;
+    Sentient *sentOwner;
+
+    if (m_fSwitchTimeRemaining > 0) {
+        m_fSwitchTimeRemaining -= level.frametime;
+    }
+
+    if (m_ActiveTurret && m_ActiveTurret != m_HeadTurret) {
+        m_fSwitchTimeRemaining = m_fSwitchDelay;
+        m_HeadTurret->m_pUserCamera->PostEvent(EV_Remove, 0);
+        m_HeadTurret->m_pUserCamera = NULL;
+
+        // switch to the active turret
+        m_HeadTurret   = m_ActiveTurret;
+        m_ActiveTurret = NULL;
+
+        // clear angles
+        m_vUserLastCmdAng               = vec_zero;
+        m_HeadTurret->m_vUserLastCmdAng = vec_zero;
+        m_vTargetAngles                 = m_vLocalAngles;
+    }
+
+    if (m_pCollisionEntity) {
+        m_pCollisionEntity->NotSolid();
+    }
+
+    if (g_gametype->integer == GT_SINGLE_PLAYER && m_pRemoteOwner && m_pRemoteOwner->isSubclassOf(Player)) {
+        // always render the turret
+        edict->s.renderfx |= RF_DEPTHHACK;
+    } else {
+        edict->s.renderfx &= ~RF_DEPTHHACK;
+    }
+
+    UpdateTimers(yawOffset, pitchOffset);
+
+    if (IsRemoteControlled()) {
+        UpdateRemoteControl();
+        UpdateCaps(yawOffset, pitchOffset);
+    } else if (m_bRestable) {
+        IdleToRestPosition();
+    }
+
+    UpdateOrientation(false);
+    UpdateSound();
+    UpdateFireControl();
+
+    sentOwner = GetSentientOwner();
+    if (IsActiveTurret() && sentOwner) {
+        G_TouchTriggers(sentOwner);
+        UpdateOwner(sentOwner);
+    }
+
+    UpdateCollisionEntity();
+}
+
+void VehicleTurretGunTandem::SetPrimaryTurret(VehicleTurretGunTandem *pTurret)
+{
+    m_PrimaryTurret = pTurret;
+    if (m_PrimaryTurret) {
+        m_HeadTurret = NULL;
+    }
+}
+
+void VehicleTurretGunTandem::RemoteControl(usercmd_t *ucmd, Sentient *owner)
+{
+    Vector vNewCmdAng;
+
+    if (!ucmd || !owner) {
+        return;
+    }
+
+    if (m_HeadTurret && m_HeadTurret != this) {
+        m_HeadTurret->RemoteControlSecondary(ucmd, owner);
+        return;
+    }
+
+    vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
+
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
+        m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
+        m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
+        m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);
+    }
+
+    m_vUserLastCmdAng = vNewCmdAng;
+
+    RemoteControlFire(ucmd, owner);
+}
+
+void VehicleTurretGunTandem::RemoteControlSecondary(usercmd_t *ucmd, Sentient *owner)
+{
+    Vector vNewCmdAng;
+
+    if (!ucmd || !owner) {
+        return;
+    }
+
+    vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
+
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
+        m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
+        m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
+        m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);
+    }
+
+    m_vUserLastCmdAng = vNewCmdAng;
+
+    RemoteControlFire(ucmd, owner);
+}
+
+void VehicleTurretGunTandem::RemoteControlFire(usercmd_t *ucmd, Sentient *owner)
+{
+    if (ucmd->buttons & BUTTON_ATTACKLEFT) {
+        if (!m_iFiring) {
+            m_iFiring = 1;
+        }
+    } else {
+        if (ucmd->buttons & BUTTON_ATTACKRIGHT) {
+            SwitchToLinkedTurret();
+        }
+        m_iFiring = 0;
+    }
+
+    flags |= FL_THINK;
+}
+
+void VehicleTurretGunTandem::EventSetSwitchThread(Event *ev)
+{
+    if (ev->IsFromScript()) {
+        m_SwitchLabel.SetThread(ev->GetValue(1));
+    } else {
+        m_SwitchLabel.Set(ev->GetString(1));
+    }
+}
+
+void VehicleTurretGunTandem::SwitchToLinkedTurret()
+{
+    VehicleTurretGunTandem *pTurret;
+
+    if (GetPrimaryTurret()->m_fSwitchTimeRemaining > 0) {
+        return;
+    }
+
+    if (m_Slot.ent) {
+        pTurret = static_cast<VehicleTurretGunTandem*>(m_Slot.ent.Pointer());
+        // Added in 2.30
+        m_SwitchLabel.Execute(this, pTurret, NULL);
+    } else {
+        pTurret = m_PrimaryTurret;
+        // Added in 2.30
+        if (m_PrimaryTurret) {
+            // Fixed in OPM
+            //  Check for primary turret before setting the switch label
+            m_PrimaryTurret->m_SwitchLabel.Execute(this, pTurret, NULL);
+        }
+    }
+
+    SetActiveTurret(pTurret);
+}
+
+void VehicleTurretGunTandem::SetActiveTurret(VehicleTurretGunTandem *pTurret)
+{
+    if (m_PrimaryTurret) {
+        if (!m_PrimaryTurret->m_ActiveTurret) {
+            m_PrimaryTurret->m_ActiveTurret = pTurret;
+        }
+    } else if (!m_ActiveTurret) {
+        m_ActiveTurret = pTurret;
+    }
+}
+
+void VehicleTurretGunTandem::RestrictYaw()
+{
+    float delta;
+
+    delta = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+    delta = Q_clamp_float(delta, -(m_fMaxYawOffset + MAX_VT_YAW_OFFSET), m_fMaxYawOffset + MAX_VT_YAW_OFFSET);
+
+    m_vUserViewAng[1] = m_fStartYaw + delta;
+}
+
+void VehicleTurretGunTandem::Archive(Archiver& arc)
+{
+    VehicleTurretGun::Archive(arc);
+
+    m_Slot.Archive(arc);
+    arc.ArchiveSafePointer(&m_PrimaryTurret);
+    arc.ArchiveSafePointer(&m_HeadTurret);
+    arc.ArchiveSafePointer(&m_ActiveTurret);
+    arc.ArchiveFloat(&m_fSwitchTimeRemaining);
+    arc.ArchiveFloat(&m_fSwitchDelay);
+    // Added in 2.30
+    m_SwitchLabel.Archive(arc);
+}
+
+VehicleTurretGunTandem *VehicleTurretGunTandem::GetPrimaryTurret()
+{
+    if (m_PrimaryTurret) {
+        return m_PrimaryTurret;
+    } else {
+        return this;
+    }
+}
+
+bool VehicleTurretGunTandem::IsActiveTurret() const
+{
+    if (!m_PrimaryTurret) {
+        return m_HeadTurret == this;
+    }
+
+    return m_PrimaryTurret->m_HeadTurret == this;
+}
diff --git a/code/fgame/vehicleturret.h b/code/fgame/vehicleturret.h
index 2382bd41..97244137 100644
--- a/code/fgame/vehicleturret.h
+++ b/code/fgame/vehicleturret.h
@@ -23,12 +23,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // vehicleturret.h: Vehicle Turret.
 //
 
-#ifndef __VEHICLETURRET_H__
-#define __VEHICLETURRET_H__
+#pragma once
 
 #include "weapturret.h"
 #include "vehicle.h"
 
+typedef enum {
+    STT_OFF,
+    STT_OFF_TRANS_MOVING,
+    STT_MOVING,
+    STT_MOVING_TRANS_OFF
+} SOUND_STATE_TURRET;
+
 class VehicleTurretGun : public TurretGun
 {
     friend class Vehicle;
@@ -43,28 +49,46 @@ protected:
     int                             m_iPitchBone;
     bool                            m_bBOIsSet;
     bool                            m_bUseRemoteControl;
-    SentientPtr                     m_pRemoteOwner;
     int                             m_iBarrelTag;
     int                             m_iEyeBone;
     SafePtr<Entity>                 m_pVehicleOwner;
     bool                            m_bRemoveOnDeath;
     SafePtr<VehicleCollisionEntity> m_pCollisionEntity;
     bool                            m_bLocked;
-    SOUND_STATE                     m_eSoundState;
+    bool                            m_bLockedAim;
+    SOUND_STATE_TURRET              m_eSoundState;
     float                           m_fNextSoundState;
     str                             m_sSoundSet;
 
+    // added in 2.0
+    //===
+    float       m_fWarmupDelay;
+    float       m_fWarmupTimeRemaining;
+    float       m_fFireWarmupDelay;
+    float       m_fTargetReloadTime;
+    int         m_iReloadShots;
+    int         m_iAmmo;
+    float       m_fReloadDelay;
+    float       m_fReloadTimeRemaining;
+    Vector      m_vAimTolerance;
+    SentientPtr m_pRemoteOwner;
+    //===
+
 public:
     CLASS_PROTOTYPE(VehicleTurretGun);
 
     Vector m_vBarrelPos;
     Vector m_vLastBarrelPos;
+    // added in 2.0
+    Vector m_vAimOffset;
 
     VehicleTurretGun();
     virtual ~VehicleTurretGun();
 
-    void         Think(void) override;
-    void         SetBaseOrientation(float (*borientation)[3], float *bangles);
+    void Think(void) override;
+    void P_UserAim(usercmd_t *ucmd) override;
+
+    void         SetBaseOrientation(const vec3_t borientation[3], const vec3_t bangles);
     void         SetBaseEntity(Entity *e);
     void         SetVehicleOwner(Entity *e);
     void         SetRemoteOwner(Sentient *e);
@@ -99,20 +123,89 @@ public:
     virtual bool        IsRemoteControlled();
     virtual void        RestrictPitch();
     virtual void        RestrictYaw();
-    virtual bool        TurretHasBeenMounted();
+    virtual void        TurretHasBeenMounted();
 
     void    UpdateRemoteControl();
     void    UpdateAimTarget();
     Entity *GetParent() const;
     float   GetWarmupFraction() const;
 
+    qboolean ReadyToFire(firemode_t mode, qboolean playsound) override;
+    void     AdjustReloadStatus();
+    void     GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forward, vec3_t right, vec3_t up) override;
+    void     ApplyFireKickback(const Vector    &org, float kickback) override;
+    float    FireDelay(firemode_t mode) override;
+
+    // Added in 2.0
+    //====
+    void      SetWarmupDelay(Event *ev);
+    void      SetFireWarmupDelay(Event *ev);
+    void      SetReloadDelay(Event *ev);
+    void      SetReloadShots(Event *ev);
+    void      SetAimOffset(Event *ev);
+    void      SetAimTolerance(Event *ev);
+    void      SetTargetEntity(Event *ev);
+    //====
+    void      PlayReloadSound(Event *ev); // Added in 2.30
+    void      SetTargetEntity(Entity *ent);
+    void      UpdateAndMoveOwner();
+    void      UpdateTimers(float     &yawTimer, float     &pitchTimer);
+    void      UpdateCaps(float maxYawOffset, float maxPitchOffset);
+    void      IdleToRestPosition();
+    void      UpdateFireControl();
+    void      UpdateCollisionEntity();
+    EntityPtr GetVehicle() const;
+    SentientPtr GetRawRemoteOwner() const;
+
     void Archive(Archiver& arc) override;
 };
 
-inline bool VehicleTurretGun::IsRemoteControlled()
+//
+// Added in 2.0
+//
+class VehicleTurretGunTandem : public VehicleTurretGun
 {
-    // FIXME: unimplemented
-    return false;
-}
+private:
+    cTurretSlot                     m_Slot;
+    SafePtr<VehicleTurretGunTandem> m_PrimaryTurret;
+    SafePtr<VehicleTurretGunTandem> m_HeadTurret;
+    SafePtr<VehicleTurretGunTandem> m_ActiveTurret;
+    float                           m_fSwitchTimeRemaining;
+    float                           m_fSwitchDelay;
+    ScriptThreadLabel               m_SwitchLabel;
 
-#endif // __VEHICLETURRET_H__
+public:
+    CLASS_PROTOTYPE(VehicleTurretGunTandem);
+
+public:
+    VehicleTurretGunTandem();
+    ~VehicleTurretGunTandem();
+
+    virtual void EventLinkTurret(Event *ev);
+    virtual void EventSetSwitchThread(Event *ev); // Added in 2.30
+    virtual void AttachLinkedTurret(Entity *ent);
+    virtual void UpdateLinkedTurret();
+    virtual void OpenSlotsByModel();
+
+    void        Think() override;
+    bool        IsRemoteControlled() override;
+    SentientPtr GetRemoteOwner() override;
+    void        EndRemoteControl() override; // Added in OPM
+
+    virtual void            SetPrimaryTurret(VehicleTurretGunTandem *pTurret);
+    virtual void            SetActiveTurret(VehicleTurretGunTandem *pTurret);
+    VehicleTurretGunTandem *GetPrimaryTurret();
+    bool                    IsActiveTurret() const;
+
+    void         RemoteControl(usercmd_t *ucmd, Sentient *owner) override;
+    virtual void RemoteControlSecondary(usercmd_t *ucmd, Sentient *owner);
+    virtual void RemoteControlFire(usercmd_t *ucmd, Sentient *owner);
+
+    virtual void SwitchToLinkedTurret();
+    virtual void ThinkPrimary();
+    virtual void ThinkSecondary();
+
+    void RestrictYaw() override;
+
+    void Archive(Archiver& arc) override;
+};
diff --git a/code/fgame/viewthing.cpp b/code/fgame/viewthing.cpp
index 260ad8b2..75f5ab99 100644
--- a/code/fgame/viewthing.cpp
+++ b/code/fgame/viewthing.cpp
@@ -418,7 +418,7 @@ void ViewMaster::Spawn
 
 	{
 	Viewthing	*viewthing;
-   const char	*mdl;
+   str          mdl;
    Vector		forward;
 	Vector		up;
    Vector		delta;
@@ -467,7 +467,7 @@ void ViewMaster::Spawn
 
 	if( !gi.modeltiki( viewthing->model ) )
       {
-		ScriptError( "model %s not found, viewmodel not spawned.", mdl );
+		ScriptError( "model %s not found, viewmodel not spawned.", mdl.c_str() );
       delete viewthing;
       current_viewthing = NULL;
       return;
@@ -480,7 +480,7 @@ void ViewMaster::SetModelEvent
 	)
 
 	{
-   const char	*mdl;
+   str          mdl;
    char			str[ 128 ];
 	Event			*event;
 	Viewthing	*viewthing;
@@ -537,8 +537,7 @@ void ViewMaster::PassEvent
    viewthing = ( Viewthing * )( ( Entity * )current_viewthing );
 	if ( viewthing )
 		{
-		event = new Event( ev );
-		viewthing->ProcessEvent( event );
+		viewthing->ProcessEvent( *ev );
 		}
 	}
 
diff --git a/code/fgame/viewthing.h b/code/fgame/viewthing.h
index 29763439..fc466257 100644
--- a/code/fgame/viewthing.h
+++ b/code/fgame/viewthing.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // viewthing.h: Actor code for the viewthing. 
 //
 
-#ifndef __VIEWTHING_H__
-#define __VIEWTHING_H__
+#pragma once
 
 #include "animate.h"
 
@@ -113,5 +112,3 @@ inline void Viewthing::Archive
    arc.ArchiveVector( &baseorigin );
    arc.ArchiveRaw( origSurfaces, sizeof( origSurfaces ) );
    }
-
-#endif /* viewthing.h */
diff --git a/code/fgame/weapon.cpp b/code/fgame/weapon.cpp
index bc549a05..2d7de504 100644
--- a/code/fgame/weapon.cpp
+++ b/code/fgame/weapon.cpp
@@ -142,7 +142,8 @@ Event EV_Weapon_FillClip
 );
 Event EV_Weapon_EmptyClip
 (
-    "clip_empty", EV_DEFAULT,
+    "clip_empty",
+    EV_DEFAULT,
     NULL,
     NULL,
     "Empties the weapon's clip of ammo,"
@@ -194,7 +195,14 @@ Event EV_Weapon_DMSetFireDelay
     "Set the minimum time between shots from the weapon",
     EV_NORMAL
 );
-Event EV_Weapon_NotDroppable("notdroppable", EV_DEFAULT, NULL, NULL, "Makes a weapon not droppable");
+Event EV_Weapon_NotDroppable
+(
+    "notdroppable",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes a weapon not droppable"
+);
 Event EV_Weapon_SetAimAnim
 (
     "setaimanim",
@@ -204,8 +212,14 @@ Event EV_Weapon_SetAimAnim
     "Set the aim animation and frame for when a weapon fires",
     EV_NORMAL
 );
-Event
-    EV_Weapon_SetRank("rank", EV_DEFAULT, "ii", "iOrder iRank", "Set the order value and power ranking for the weapon");
+Event EV_Weapon_SetRank
+(
+    "rank",
+    EV_DEFAULT,
+    "ii",
+    "iOrder iRank",
+    "Set the order value and power ranking for the weapon"
+);
 Event EV_Weapon_SetFireType
 (
     "firetype",
@@ -215,7 +229,8 @@ Event EV_Weapon_SetFireType
     "Set the firing type of the weapon (projectile or bullet)",
     EV_NORMAL
 );
-Event EV_Weapon_SetAIRange(
+Event EV_Weapon_SetAIRange
+(
     "airange",
     EV_DEFAULT,
     "s",
@@ -349,7 +364,8 @@ Event EV_Weapon_SetDMBulletRange
     "Set the range of the bullets",
     EV_NORMAL
 );
-Event EV_Weapon_SetBulletSpread(
+Event EV_Weapon_SetBulletSpread
+(
     "bulletspread",
     EV_DEFAULT,
     "ffFF",
@@ -357,7 +373,8 @@ Event EV_Weapon_SetBulletSpread(
     "Set the min & optional max spread of the bullet in the x and y axis",
     EV_NORMAL
 );
-Event EV_Weapon_SetDMBulletSpread(
+Event EV_Weapon_SetDMBulletSpread
+(
     "dmbulletspread",
     EV_DEFAULT,
     "ffFF",
@@ -653,7 +670,8 @@ Event EV_Weapon_SetMeansOfDeath
     "Set the meansOfDeath of the weapon.",
     EV_NORMAL
 );
-Event EV_Weapon_SetWorldHitSpawn(
+Event EV_Weapon_SetWorldHitSpawn
+(
     "worldhitspawn",
     EV_DEFAULT,
     "s",
@@ -869,6 +887,30 @@ Event EV_OverCooked_Warning
     EV_NORMAL
 );
 
+//
+// Added in OPM
+//
+
+Event EV_Weapon_DoneAnimating
+(
+    "doneanimating",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signals the end of animation",
+    EV_NORMAL
+);
+
+Event EV_Weapon_GetPutaway
+(
+    "putaway",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns whether or not the given weapon is being put away",
+    EV_GETTER
+);
+
 CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_SetAnim,                       &Weapon::SetWeaponAnimEvent     },
     {&EV_Item_Pickup,                   &Weapon::PickupWeapon           },
@@ -886,7 +928,7 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_Weapon_AddToClip,              &Weapon::AddToAmmoClip          },
     {&EV_Weapon_SetMaxRange,            &Weapon::SetMaxRangeEvent       },
     {&EV_Weapon_SetMinRange,            &Weapon::SetMinRangeEvent       },
-    {&EV_Weapon_FireDelay,           &Weapon::SetFireDelay           },
+    {&EV_Weapon_FireDelay,              &Weapon::SetFireDelay           },
     {&EV_Weapon_NotDroppable,           &Weapon::NotDroppableEvent      },
     {&EV_Weapon_SetAimAnim,             &Weapon::SetAimAnim             },
     {&EV_Weapon_Shoot,                  &Weapon::Shoot                  },
@@ -965,6 +1007,11 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
     {&EV_OverCooked_Warning,            &Weapon::OnOverCookedWarning    },
     {&EV_Weapon_SetCurrentFireAnim,     &Weapon::SetCurrentFireAnim     },
     {&EV_Weapon_SetSecondaryAmmoInHud,  &Weapon::SetSecondaryAmmoInHud  },
+    //
+    // Added in OPM
+    //
+    {&EV_Weapon_DoneAnimating,          &Weapon::DoneAnimating          },
+    {&EV_Weapon_GetPutaway,             &Weapon::EventGetPutaway        },
     {NULL,                              NULL                            }
 };
 
@@ -973,7 +1020,7 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
 //======================
 Weapon::Weapon()
 {
-    entflags |= EF_WEAPON;
+    entflags |= ECF_WEAPON;
 
     mAIRange = RANGE_SHORT;
 
@@ -1062,7 +1109,7 @@ Weapon::Weapon()
     INITIALIZE_WEAPONMODE_VAR(loopfire, qfalse);
     INITIALIZE_WEAPONMODE_VAR(tracercount, 0);
     INITIALIZE_WEAPONMODE_VAR(tracerfrequency, 0);
-    INITIALIZE_WEAPONMODE_VAR(tracerspeed, 0);
+    INITIALIZE_WEAPONMODE_VAR(tracerspeed, 1);
 
     for (int i = 0; i < MAX_FIREMODES; i++) {
         INITIALIZE_WEAPONMODE_VAR(viewkickmin[i], 0);
@@ -1132,6 +1179,7 @@ Weapon::Weapon()
     INITIALIZE_WEAPONMODE_VAR(meansofdeath, MOD_NONE);
 
     // Set the stats
+    m_iNumShotsFired    = 0;
     m_iNumHits          = 0;
     m_iNumGroinShots    = 0;
     m_iNumHeadShots     = 0;
@@ -1175,7 +1223,6 @@ Weapon::Weapon()
 //Weapon::Weapon
 //======================
 Weapon::Weapon(const char *file)
-
 {
     // The tik file holds all the information available for a weapon
     Weapon();
@@ -1187,7 +1234,12 @@ Weapon::Weapon(const char *file)
 Weapon::~Weapon()
 {
     DetachGun();
-    entflags &= ~EF_WEAPON;
+
+    if (owner) {
+        RemoveFromOwner();
+    }
+
+    entflags &= ~ECF_WEAPON;
 }
 
 //======================
@@ -1197,15 +1249,9 @@ void Weapon::Delete(void)
 {
     if (g_iInThinks) {
         DetachGun();
-
-        if (owner) {
-            RemoveFromOwner();
-        }
-
-        PostEvent(EV_Remove, 0);
-    } else {
-        delete this;
     }
+
+    Item::Delete();
 }
 
 //======================
@@ -1277,7 +1323,7 @@ void Weapon::SetUseNoAmmo(Event *ev)
 //======================
 void Weapon::SetStartAmmo(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1290,7 +1336,7 @@ void Weapon::SetStartAmmo(Event *ev)
 //======================
 void Weapon::SetDMStartAmmo(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1302,7 +1348,6 @@ void Weapon::SetDMStartAmmo(Event *ev)
 //Weapon::SetMaxChargeTime
 //======================
 void Weapon::SetMaxChargeTime(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     max_charge_time[firemodeindex] = ev->GetFloat(1);
@@ -1340,7 +1385,7 @@ float Weapon::GetMaxChargeTime(firemode_t mode)
 //======================
 void Weapon::SetAmmoRequired(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1353,7 +1398,7 @@ void Weapon::SetAmmoRequired(Event *ev)
 //======================
 void Weapon::SetDMAmmoRequired(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -1376,7 +1421,6 @@ str Weapon::GetAmmoType(firemode_t mode)
 //Weapon::SetAmmoType
 //======================
 void Weapon::SetAmmoType(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
 
@@ -1592,19 +1636,15 @@ out:
 //======================
 //Weapon::GetMuzzlePosition
 //======================
-void Weapon::GetMuzzlePosition(Vector *position, Vector *forward, Vector *right, Vector *up, Vector *vBarrelPos)
+void Weapon::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forward, vec3_t right, vec3_t up)
 {
     orientation_t weap_or, barrel_or, orient;
-    //orientation_t	view_or;
-    Vector  pos, f, r, u, aim_dir;
-    Vector  vAng;
-    vec3_t  mat[3] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
-    int     i, tagnum;
-    Player *owner;
-    //qboolean		bViewShot;
+    Vector        delta;
+    Vector        aim_angles;
+    int           tagnum;
+    int           i;
 
     owner = (Player *)this->owner.Pointer();
-    assert(owner);
 
     // We should always have an owner
     if (!owner) {
@@ -1614,36 +1654,9 @@ void Weapon::GetMuzzlePosition(Vector *position, Vector *forward, Vector *right,
         }
     }
 
-    // If this is a crosshair or torsoaim weapon, then the dir is specified by the player's torso angles
-    if (crosshair) {
-        Player *player;
-
-        // Use the player's torso angles to determine direction, but use the actual barrel to determine position
-
-        player = (Player *)owner;
-        AngleVectors(player->GetViewAngles(), f, r, u);
-
-        if (forward) {
-            *forward = f;
-        }
-        if (right) {
-            *right = r;
-        }
-        if (up) {
-            *up = u;
-        }
-    }
-
-    if (current_attachToTag.length()) {
+    if (owner) {
         tagnum = gi.Tag_NumForName(owner->edict->tiki, current_attachToTag.c_str());
 
-        if (tagnum < 0) {
-            warning("Weapon::GetMuzzlePosition", "Could not find tag \"%s\"", current_attachToTag.c_str());
-            pos = owner->origin;
-            AnglesToAxis(owner->angles, mat);
-            goto out;
-        }
-
         // Get the orientation based on the frame and anim stored off in the owner.
         // This is to prevent weird timing with getting orientations on different frames of firing
         // animations and the orientations will not be consistent.
@@ -1651,159 +1664,75 @@ void Weapon::GetMuzzlePosition(Vector *position, Vector *forward, Vector *right,
 
         orient = G_TIKI_Orientation(owner->edict, tagnum);
 
-        for (i = 0; i < 3; i++) {
-            VectorMA(weap_or.origin, orient.origin[i], owner->orientation[i], weap_or.origin);
-        }
-
-        MatrixMultiply(orient.axis, owner->orientation, weap_or.axis);
-    } else {
-        VectorCopy(origin, weap_or.origin);
-        AnglesToAxis(angles, weap_or.axis);
-    }
-
-    if (!IsSubclassOfTurretGun()) {
-        if ((weapon_class & WEAPON_CLASS_THROWABLE)) {
-            AngleVectors(owner->GetViewAngles(), mat[0], mat[1], mat[2]);
-        }
-
-        pos = owner->EyePosition();
-        VectorCopy(pos, weap_or.origin);
-    } else {
-        // using the weapon's current origin
-        VectorCopy(origin, weap_or.origin);
-        AnglesToAxis(angles, weap_or.axis);
-    }
-
-    // For debugging
-    G_DrawCoordSystem(weap_or.origin, weap_or.axis[0], weap_or.axis[1], weap_or.axis[2], 50);
-    pos = weap_or.origin;
-
-    // Get the tag_barrel orientation from the weapon
-    if (!vBarrelPos || !this->GetRawTag(GetTagBarrel(), &barrel_or)) {
-        //warning( "Weapon::GetMuzzlePosition", "Could not find tag_barrel\n" );
-
         if (owner->IsSubclassOfPlayer()) {
-            Player *player = (Player *)owner;
-            AnglesToAxis(player->GetViewAngles(), weap_or.axis);
+            Player *player;
+
+            // Use the player's torso angles to determine direction, but use the actual barrel to determine position
+
+            player = static_cast<Player *>(owner.Pointer());
+
+            if (forward || right || up) {
+                AngleVectors(player->m_vViewAng, forward, right, up);
+            }
+
+            VectorCopy(player->m_vViewPos, position);
+
+            if (this->GetRawTag(GetTagBarrel(), &barrel_or) && vBarrelPos) {
+                VectorCopy(owner->origin, vBarrelPos);
+                for (i = 0; i < 3; i++) {
+                    VectorMA(vBarrelPos, orient.origin[i], owner->orientation[i], vBarrelPos);
+                }
+
+                MatrixMultiply(orient.axis, owner->orientation, weap_or.axis);
+                for (i = 0; i < 3; i++) {
+                    VectorMA(vBarrelPos, barrel_or.origin[i], weap_or.axis[i], vBarrelPos);
+                }
+            } else if (vBarrelPos) {
+                VectorCopy(position, vBarrelPos);
+            }
         } else {
-            AnglesToAxis(owner->angles, weap_or.axis);
-        }
+            VectorCopy(owner->origin, position);
 
-        AxisCopy(weap_or.axis, mat);
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, orient.origin[i], owner->orientation[i], position);
+            }
 
-        if (vBarrelPos) {
-            *vBarrelPos = weap_or.origin;
-        }
+            MatrixMultiply(orient.axis, owner->orientation, weap_or.axis);
 
-        goto out;
-    }
+            if (this->GetRawTag(GetTagBarrel(), &barrel_or)) {
+                for (i = 0; i < 3; i++) {
+                    VectorMA(position, barrel_or.origin[i], weap_or.axis[i], position);
+                }
+            }
 
-    if (owner->IsSubclassOfPlayer() && !IsSubclassOfTurretGun()) {
-        if (vBarrelPos) {
-            *vBarrelPos = origin;
+            if (vBarrelPos) {
+                VectorCopy(position, vBarrelPos);
+            }
+
+            delta      = owner->GunTarget(false, position, weap_or.axis[0]) - position;
+            aim_angles = delta.toAngles();
+
+            if (forward || right || up) {
+                AngleVectors(aim_angles, forward, right, up);
+            }
         }
     } else {
-        // Translate the barrel's orientation through the weapon's orientation
-        VectorCopy(weap_or.origin, pos);
-
-        for (i = 0; i < 3; i++) {
-            VectorMA(pos, barrel_or.origin[i], weap_or.axis[i], pos);
+        if (forward || right || up) {
+            AngleVectors(angles, forward, right, up);
         }
 
-        MatrixMultiply(barrel_or.axis, weap_or.axis, mat);
+        VectorCopy(origin, position);
+
+        if (this->GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_or.axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_or.axis[i], position);
+            }
+        }
 
         if (vBarrelPos) {
-            *vBarrelPos = pos;
-        }
-    }
-
-#if 0
-	gi.DPrintf( "own_angles: %0.2f %0.2f %0.2f\n", owner->angles[0], owner->angles[1], owner->angles[2] );
-	gi.DPrintf( "own_orient: %0.2f %0.2f %0.2f\n", owner->orientation[0][0], owner->orientation[0][1], owner->orientation[0][2] );
-	gi.DPrintf( "bone forward:  %0.2f %0.2f %0.2f\n", orient.axis[0][0], orient.axis[0][1], orient.axis[0][2] );
-	gi.DPrintf( "barrel forward: %0.2f %0.2f %0.2f\n", barrel_or.axis[0][0], barrel_or.axis[0][1], barrel_or.axis[0][2] );
-	gi.DPrintf( "weapon forward: %0.2f %0.2f %0.2f\n", weap_or.axis[0][0], weap_or.axis[0][1], weap_or.axis[0][2] );
-	gi.DPrintf( "mat forward: %0.2f %0.2f %0.2f\n \n", mat[0][0], mat[0][1], mat[0][2] );
-#endif
-
-    // Ok - we now have a position, forward, right, and up
-out:
-
-    // For debugging
-    G_DrawCoordSystem(pos, mat[0], mat[1], mat[2], 30);
-
-    if (position) {
-        *position = pos;
-    }
-
-    if (!forward && !right && !up) {
-        return;
-    }
-
-    if (!IsSubclassOfTurretGun() && owner && owner->IsSubclassOfPlayer()) {
-        // ...
-        // fixme?
-    }
-
-    if (pos != vec_zero) {
-        // ffs, wondering how they fucking done it in mohaaa...
-        //aim_dir = barrel_or.origin - pos;
-        //aim_dir.normalize();
-
-        AngleVectors(owner->GetViewAngles(), aim_dir, NULL, NULL);
-
-        if (!IsSubclassOfVehicleTurretGun()) {
-            goto out2;
-        }
-
-        Vector ang;
-
-        vectoangles(mat[0], ang);
-
-        // this is a part of the most annoying function to reverse ever
-        // fixme
-    }
-
-    // If there is a target, then use the dir based on that
-    if (aim_target) {
-        aim_dir = aim_target->centroid - pos;
-        aim_dir.normalize();
-
-        if (!IsSubclassOfTurretGun()) {
-        out2:
-            AngleVectors(aim_dir.toAngles(), mat[0], mat[1], mat[2]);
-
-            if (forward) {
-                *forward = mat[0];
-            }
-            if (right) {
-                *right = mat[1];
-            }
-            if (up) {
-                *up = mat[2];
-            }
-
-            return;
-        }
-
-        Vector ang;
-
-        vectoangles(mat[0], ang);
-
-        // again a very annoying part to reverse
-        // fixme
-    }
-
-    // If this weapon doesn't have a crosshair specified, then use the mat from the barrel for the directions
-    if (!crosshair) {
-        if (forward) {
-            *forward = mat[0];
-        }
-        if (right) {
-            *right = mat[1];
-        }
-        if (up) {
-            *up = mat[2];
+            VectorCopy(position, vBarrelPos);
         }
     }
 }
@@ -1812,7 +1741,6 @@ out:
 //Weapon::SetAmmoClipSize
 //======================
 void Weapon::SetAmmoClipSize(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     ammo_clip_size[firemodeindex] = ev->GetInteger(1);
@@ -1822,7 +1750,6 @@ void Weapon::SetAmmoClipSize(Event *ev)
 //Weapon::SetAmmoInClip
 //======================
 void Weapon::SetAmmoInClip(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     ammo_in_clip[firemodeindex] = ev->GetInteger(1);
@@ -1873,7 +1800,7 @@ void Weapon::Shoot(Event *ev)
         }
     }
 
-    if (owner->IsSubclassOfSentient() && owner->m_bOvercookDied) {
+    if (owner && owner->IsSubclassOfSentient() && owner->m_bOvercookDied) {
         owner->m_bOvercookDied = false;
         return;
     }
@@ -1896,8 +1823,8 @@ void Weapon::Shoot(Event *ev)
         return;
     }
 
-    GetMuzzlePosition(&pos, &forward, &right, &up, &vBarrel);
-    ApplyFireKickback(right, 1000.0);
+    GetMuzzlePosition(pos, vBarrel, forward, right, up);
+    ApplyFireKickback(forward, 1000.0);
 
     if (firetype[mode] != FT_LANDMINE || CanPlaceLandmine(pos, owner)) {
         if (m_fFireSpreadMultAmount[mode] != 0.0f) {
@@ -1928,13 +1855,13 @@ void Weapon::Shoot(Event *ev)
 
         switch (firetype[mode]) {
         case FT_PROJECTILE:
-            ProjectileAttack(pos, forward, owner, projectileModel[mode], charge_fraction);
+            ProjectileAttack(pos, forward, owner, projectileModel[mode], charge_fraction, 0, this);
             break;
         case FT_LANDMINE:
             PlaceLandmine(pos, owner, projectileModel[mode], this);
             break;
         case FT_DEFUSE:
-            DefuseObject(right, owner, bulletrange[mode]);
+            DefuseObject(forward, owner, bulletrange[mode]);
             break;
         case FT_BULLET:
             {
@@ -1947,11 +1874,7 @@ void Weapon::Shoot(Event *ev)
                     if (owner->client) {
                         Player *player = (Player *)owner.Pointer();
 
-                        fSpreadFactor = player->velocity.length() / sv_runspeed->integer;
-
-                        if (fSpreadFactor > 1.0f) {
-                            fSpreadFactor = 1.0f;
-                        }
+                        fSpreadFactor = GetSpreadFactor(mode);
 
                         vSpread       = bulletspreadmax[mode] * fSpreadFactor;
                         fSpreadFactor = 1.0f - fSpreadFactor;
@@ -1968,7 +1891,9 @@ void Weapon::Shoot(Event *ev)
                     vSpread = (bulletspreadmax[mode] + bulletspread[mode]) * 0.5f;
                 }
 
-                if (!g_gametype->integer && owner && owner->IsSubclassOfPlayer()) {
+                // Don't display tracers if the owner is a player for non-turret weapons
+                // It would have some artifacts for the first person model, as the tracer is created from the world model
+                if ((g_target_game == TG_MOH || g_gametype->integer == GT_SINGLE_PLAYER) && owner && owner->IsSubclassOfPlayer()) {
                     if (IsSubclassOfTurretGun()) {
                         tracerFrequency = 3;
                     } else {
@@ -2111,13 +2036,22 @@ void Weapon::Shoot(Event *ev)
                 }
             }
             break;
+        default:
+            // none or unsupported
+            break;
         }
 
-        if (!quiet[firemodeindex]) {
-            if (next_noise_time <= level.time) {
-                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
-                next_noise_time = level.time + 1;
+        if (!quiet[mode] && next_noise_time <= level.time) {
+            if (g_gametype->integer == GT_SINGLE_PLAYER) {
+                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE, 1500);
+            } else {
+                //
+                // Added in OPM
+                //  Weapon firing sounds can be heard 8000 units away
+                //  (from ubersound.scr)
+                BroadcastAIEvent(AI_EVENT_WEAPON_FIRE, 8000);
             }
+            next_noise_time = level.time + 1;
         }
 
         if (owner && owner->client) {
@@ -2169,7 +2103,6 @@ void Weapon::ApplyFireKickback(const Vector& org, float kickback) {}
 //Weapon::SetAimAnim
 //======================
 void Weapon::SetAimAnim(Event *ev)
-
 {
     str anim;
 
@@ -2182,7 +2115,6 @@ void Weapon::SetAimAnim(Event *ev)
 //Weapon::SetOwner
 //======================
 void Weapon::SetOwner(Sentient *ent)
-
 {
     assert(ent);
     if (!ent) {
@@ -2224,7 +2156,7 @@ int Weapon::AmmoAvailable(firemode_t mode)
 qboolean Weapon::UnlimitedAmmo(firemode_t mode)
 {
     if (!owner) {
-        return false;
+        return true;
     }
 
     if (!owner->isClient() || DM_FLAG(DF_INFINITE_AMMO)) {
@@ -2446,23 +2378,27 @@ qboolean Weapon::Drop(void)
             int ammo;
 
             if (ammo_clip_size[FIRE_PRIMARY]) {
-                startammo[FIRE_PRIMARY] = g_dropclips->integer * ammo_in_clip[FIRE_PRIMARY];
+                // Fixed in OPM
+                //  Always drop at least 1 because of grenades
+                startammo[FIRE_PRIMARY] = g_dropclips->integer * Q_max(ammo_in_clip[FIRE_PRIMARY], 1);
             } else {
                 startammo[FIRE_PRIMARY] = g_dropclips->integer;
             }
 
-            ammo = AmmoAvailable(FIRE_PRIMARY);
+            // Fixed in OPM
+            //  Use the max between the available ammo and the ammo in clip
+            ammo = Q_max(AmmoAvailable(FIRE_PRIMARY), ammo_in_clip[FIRE_PRIMARY]);
             if (startammo[FIRE_PRIMARY] > ammo) {
                 startammo[FIRE_PRIMARY] = ammo;
             }
 
             if (ammo_clip_size[FIRE_SECONDARY]) {
-                startammo[FIRE_SECONDARY] = g_dropclips->integer * ammo_in_clip[FIRE_SECONDARY];
+                startammo[FIRE_SECONDARY] = g_dropclips->integer * Q_max(ammo_in_clip[FIRE_SECONDARY], 1);
             } else {
                 startammo[FIRE_SECONDARY] = g_dropclips->integer;
             }
 
-            ammo = AmmoAvailable(FIRE_SECONDARY);
+            ammo = Q_max(AmmoAvailable(FIRE_SECONDARY), ammo_in_clip[FIRE_SECONDARY]);
             if (startammo[FIRE_SECONDARY] > ammo) {
                 startammo[FIRE_SECONDARY] = ammo;
             }
@@ -2505,7 +2441,10 @@ qboolean Weapon::Drop(void)
     // Remove this from the owner's item list
     RemoveFromOwner();
 
-    PostEvent(EV_Remove, g_droppeditemlife->value);
+    if (g_droppeditemlife->value > 0) {
+        PostEvent(EV_Remove, g_droppeditemlife->value);
+    }
+
     PostEvent(EV_Weapon_FallingAngleAdjust, level.frametime);
     return true;
 }
@@ -2515,10 +2454,8 @@ qboolean Weapon::Drop(void)
 //======================
 void Weapon::Charge(firemode_t mode)
 {
-    if (mode == FIRE_PRIMARY)
-    {
-        if (m_fCookTime > 0)
-        {
+    if (mode == FIRE_PRIMARY) {
+        if (m_fCookTime > 0) {
             m_eCookModeIndex = mode;
             //
             // Post cook event
@@ -2527,19 +2464,16 @@ void Weapon::Charge(firemode_t mode)
             PostEvent(EV_OverCooked_Warning, m_fCookTime - 1);
         }
         SetWeaponAnim("charge");
-    }
-    else if (mode == FIRE_SECONDARY)
-	{
-		if (m_fCookTime > 0)
-		{
-			m_eCookModeIndex = mode;
-			//
-			// Post cook event
-			//
-			PostEvent(EV_OverCooked, m_fCookTime);
-			PostEvent(EV_OverCooked_Warning, m_fCookTime - 1);
-		}
-		SetWeaponAnim("secondarycharge");
+    } else if (mode == FIRE_SECONDARY) {
+        if (m_fCookTime > 0) {
+            m_eCookModeIndex = mode;
+            //
+            // Post cook event
+            //
+            PostEvent(EV_OverCooked, m_fCookTime);
+            PostEvent(EV_OverCooked_Warning, m_fCookTime - 1);
+        }
+        SetWeaponAnim("secondarycharge");
     }
 }
 
@@ -2610,8 +2544,8 @@ void Weapon::OnOverCooked(Event *ev)
 void Weapon::ReleaseFire(firemode_t mode, float charge_time)
 {
     // Make sure to stop the wepaon from cooking
-	CancelEventsOfType(EV_OverCooked);
-	CancelEventsOfType(EV_OverCooked_Warning);
+    CancelEventsOfType(EV_OverCooked);
+    CancelEventsOfType(EV_OverCooked_Warning);
 
     // Calculate and store off the charge fraction to use when the weapon actually shoots
 
@@ -2845,7 +2779,7 @@ void Weapon::AttachToHand(Event *ev)
 //======================
 void Weapon::SetCantPartialReload(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -2857,7 +2791,7 @@ void Weapon::SetCantPartialReload(Event *ev)
 //======================
 void Weapon::SetDMCantPartialReload(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -2890,10 +2824,7 @@ void Weapon::GiveStartingAmmoToOwner(Event *ev)
     int mode;
     int i;
 
-    assert(owner);
-
     if (!owner) {
-        warning("Weapon::GiveStartingAmmoToOwner", "Owner not found\n");
         return;
     }
 
@@ -3005,83 +2936,108 @@ void Weapon::PickupWeapon(Event *ev)
                 "print \"" HUD_MESSAGE_YELLOW "%s\n\"",
                 gi.LV_ConvertString(va("Picked Up %s", item_name.c_str()))
             );
-
-            if (!(spawnflags & DROPPED_PLAYER_ITEM) && !(spawnflags & DROPPED_ITEM)) {
-                ItemPickup(other);
-                return;
-            }
-
-            if (Pickupable(other)) {
-                setMoveType(MOVETYPE_NONE);
-                setSolidType(SOLID_NOT);
-
-                hideModel();
-
-                velocity  = vec_zero;
-                avelocity = vec_zero;
-
-                CancelEventsOfType(EV_Remove);
-                CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
-
-                DetachFromOwner();
-                current_attachToTag        = "";
-                lastValid                  = qfalse;
-                edict->s.tag_num           = -1;
-                edict->s.attach_use_angles = qfalse;
-                VectorClear(edict->s.attach_offset);
-
-                setOrigin(vec_zero);
-                setAngles(vec_zero);
-                SetOwner(sen);
-
-                sen->AddItem(this);
-                sen->ReceivedItem(this);
-
-                Sound(sPickupSound);
-            }
         }
+
+        if (!(spawnflags & DROPPED_PLAYER_ITEM) && !(spawnflags & DROPPED_ITEM)) {
+            ItemPickup(other);
+            return;
+        }
+
+        if (!Pickupable(other)) {
+            return;
+        }
+
+        setMoveType(MOVETYPE_NONE);
+        setSolidType(SOLID_NOT);
+
+        hideModel();
+
+        velocity = vec_zero;
+        avelocity = vec_zero;
+
+        CancelEventsOfType(EV_Remove);
+        CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
+
+        DetachFromOwner();
+        current_attachToTag = "";
+        lastValid = qfalse;
+        edict->s.tag_num = -1;
+        edict->s.attach_use_angles = qfalse;
+        VectorClear(edict->s.attach_offset);
+
+        setOrigin(vec_zero);
+        setAngles(vec_zero);
+        SetOwner(sen);
+
+        sen->AddItem(this);
+        sen->ReceivedItem(this);
+
+        iGiveAmmo = startammo[FIRE_PRIMARY];
+
+        Sound(sPickupSound);
     } else {
-        str sAmmoName = ammo_type[FIRE_PRIMARY];
+        bool bSameAmmo[MAX_FIREMODES] = { false };
 
-        if (sen->AmmoCount(sAmmoName) != sen->MaxAmmoCount(sAmmoName)) {
-            setSolidType(SOLID_NOT);
-            hideModel();
-
-            CancelEventsOfType(EV_Item_DropToFloor);
-            CancelEventsOfType(EV_Item_Respawn);
-            CancelEventsOfType(EV_FadeOut);
-            CancelEventsOfType(EV_Remove);
-            CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
-
-            if (Respawnable()) {
-                PostEvent(EV_Item_Respawn, 0);
-            } else {
-                PostEvent(EV_Remove, 0);
+        if (sen->AmmoCount(ammo_type[FIRE_PRIMARY]) == sen->MaxAmmoCount(ammo_type[FIRE_PRIMARY])) {
+            bSameAmmo[FIRE_PRIMARY] = true;
+            if (ammo_type[0] == ammo_type[1]) {
+                bSameAmmo[FIRE_SECONDARY] = true;
             }
-
-            Sound(m_sAmmoPickupSound);
         }
+
+        if (!bSameAmmo[FIRE_SECONDARY]) {
+            if (sen->AmmoCount(ammo_type[FIRE_SECONDARY]) == sen->MaxAmmoCount(ammo_type[FIRE_SECONDARY])) {
+                bSameAmmo[FIRE_SECONDARY] = true;
+            }
+        }
+
+        if (bSameAmmo[FIRE_PRIMARY] && bSameAmmo[FIRE_SECONDARY]) {
+            return;
+        }
+
+        if (bSameAmmo[FIRE_PRIMARY]) {
+            startammo[FIRE_PRIMARY] = 0;
+        }
+
+        if (bSameAmmo[FIRE_SECONDARY]) {
+            startammo[FIRE_SECONDARY] = 0;
+        }
+
+        iGiveAmmo = ammo_in_clip[FIRE_PRIMARY] + startammo[FIRE_PRIMARY];
+
+        if (!iGiveAmmo && !startammo[FIRE_SECONDARY]) {
+            // Fixed in OPM
+            //  Don't let the sentient pick the ammo up if it already has the weapon in inventory
+            //  and the player would get no ammo.
+            //  This can only be picked up as a new weapon.
+            return;
+        }
+
+        setSolidType(SOLID_NOT);
+        hideModel();
+
+        CancelEventsOfType(EV_Item_DropToFloor);
+        CancelEventsOfType(EV_Item_Respawn);
+        CancelEventsOfType(EV_FadeOut);
+        CancelEventsOfType(EV_Remove);
+        CancelEventsOfType(EV_Weapon_FallingAngleAdjust);
+
+        if (Respawnable()) {
+            PostEvent(EV_Item_Respawn, 0);
+        } else {
+            PostEvent(EV_Remove, 0);
+        }
+
+        Sound(m_sAmmoPickupSound);
     }
 
     if (startammo[FIRE_PRIMARY] && ammo_type[FIRE_PRIMARY].length() && other->isClient()) {
         str        sMessage;
         const str& sAmmoType = ammo_type[FIRE_PRIMARY];
 
-        iGiveAmmo = startammo[FIRE_PRIMARY];
-
         sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
-        if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
-            if (!sAmmoType.icmp("agrenade")) {
-                if (iGiveAmmo == 1) {
-                    sMessage = gi.LV_ConvertString("Got 1 Grenade");
-                } else {
-                    sMessage = gi.LV_ConvertString(va("Got %i Grenades", iGiveAmmo));
-                }
-            }
-        }
-
-        if (!sAmmoType.icmp("grenade")) {
+        if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
             if (iGiveAmmo == 1) {
                 sMessage = gi.LV_ConvertString("Got 1 Grenade");
             } else {
@@ -3094,26 +3050,16 @@ void Weapon::PickupWeapon(Event *ev)
         gi.SendServerCommand(other->edict - g_entities, "print \"" HUD_MESSAGE_YELLOW "%s\n\"", sMessage.c_str());
     }
 
-    if (ammo_type[FIRE_SECONDARY] != ammo_type[FIRE_PRIMARY]) {
+    if (ammo_type[FIRE_SECONDARY] != ammo_type[FIRE_PRIMARY] && str::icmp(ammo_type[FIRE_SECONDARY], "none")) {
         if (startammo[FIRE_SECONDARY] && ammo_type[FIRE_SECONDARY].length() && other->isClient()) {
             str        sMessage;
-            const str& sAmmoType = ammo_type[FIRE_PRIMARY];
+            const str& sAmmoType = ammo_type[FIRE_SECONDARY];
 
             iGiveAmmo = startammo[FIRE_SECONDARY];
 
             sen->GiveAmmo(sAmmoType, iGiveAmmo);
 
-            if (!g_gametype->integer && other->IsSubclassOfPlayer()) {
-                if (!sAmmoType.icmp("agrenade")) {
-                    if (iGiveAmmo == 1) {
-                        sMessage = gi.LV_ConvertString("Got 1 Grenade");
-                    } else {
-                        sMessage = gi.LV_ConvertString(va("Got %i Grenades", iGiveAmmo));
-                    }
-                }
-            }
-
-            if (!sAmmoType.icmp("grenade")) {
+            if (!sAmmoType.icmp("grenade") || !sAmmoType.icmp("agrenade")) {
                 if (iGiveAmmo == 1) {
                     sMessage = gi.LV_ConvertString("Got 1 Grenade");
                 } else {
@@ -3145,6 +3091,12 @@ void Weapon::ForceIdle(void)
 
     // Force the weapon to the idle animation
     weaponstate = WEAPON_READY;
+
+    // Fixed in OPM
+    //  Stop the weapon from charging/cooking
+    CancelEventsOfType(EV_OverCooked);
+    CancelEventsOfType(EV_OverCooked_Warning);
+    charge_fraction = 0;
 }
 
 //======================
@@ -3184,7 +3136,8 @@ void Weapon::SetWeaponIdleAnimEvent(Event *ev)
 //======================
 void Weapon::SetWeaponAnimEvent(Event *ev)
 {
-    SetWeaponAnim(ev->GetString(1));
+    //SetWeaponAnim(ev->GetString(1));
+    SetWeaponAnim(ev->GetString(1), EV_Weapon_DoneAnimating);
 }
 
 //======================
@@ -3208,7 +3161,7 @@ qboolean Weapon::SetWeaponAnim(const char *anim, Event *ev)
     int idleanim = gi.Anim_NumForName(edict->tiki, "idle");
 
     edict->s.frameInfo[m_iAnimSlot].index = idleanim;
-    m_iAnimSlot                           = (m_iAnimSlot + 1) & 3;
+    m_iAnimSlot                           = (m_iAnimSlot + 1) % MAX_WEAPON_ANIM_SLOTS;
     edict->s.frameInfo[m_iAnimSlot].index = idleanim;
 
     if (ev) {
@@ -3246,7 +3199,7 @@ void Weapon::StopWeaponAnim(void)
     animnum = gi.Anim_NumForName(edict->tiki, "idle");
     StartAnimSlot(m_iAnimSlot, animnum, 1.f);
 
-    m_iAnimSlot = (m_iAnimSlot + 1) & 3;
+    m_iAnimSlot = (m_iAnimSlot + 1) % MAX_WEAPON_ANIM_SLOTS;
 }
 
 //======================
@@ -3267,7 +3220,6 @@ void Weapon::DoneRaising(Event *ev)
 //Weapon::ClientFireDone
 //======================
 void Weapon::ClientFireDone(void)
-
 {
     // This is called when the client's firing animation is done
 }
@@ -3301,21 +3253,21 @@ void Weapon::FillAmmoClip(Event *ev)
 
     if (UnlimitedAmmo(FIRE_PRIMARY)) {
         // reload directly
-		ammo_in_clip[FIRE_PRIMARY] = ammo_clip_size[0];
+        ammo_in_clip[FIRE_PRIMARY] = ammo_clip_size[0];
     } else {
         // Calc the amount the clip should get
-		amount = ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY];
+        amount = ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY];
 
-		// use up the ammo from the player
-		amount_used = owner->UseAmmo(ammo_type[FIRE_PRIMARY], amount);
+        // use up the ammo from the player
+        amount_used = owner->UseAmmo(ammo_type[FIRE_PRIMARY], amount);
 
-		// Stick it in the clip
-		ammo_in_clip[FIRE_PRIMARY] = amount_used + ammo_in_clip[FIRE_PRIMARY];
-	}
+        // Stick it in the clip
+        ammo_in_clip[FIRE_PRIMARY] = amount_used + ammo_in_clip[FIRE_PRIMARY];
+    }
 
-	owner->AmmoAmountInClipChanged(ammo_type[FIRE_PRIMARY], ammo_in_clip[FIRE_PRIMARY]);
+    owner->AmmoAmountInClipChanged(ammo_type[FIRE_PRIMARY], ammo_in_clip[FIRE_PRIMARY]);
 
-	SetShouldReload(qfalse);
+    SetShouldReload(qfalse);
 }
 
 //======================
@@ -3349,14 +3301,14 @@ void Weapon::AddToAmmoClip(Event *ev)
 
     if (!ammo_clip_size[FIRE_PRIMARY] || !owner) {
         return;
-	}
+    }
 
-	// Calc the amount the clip should get
-	amount = ev->GetInteger(1);
+    // Calc the amount the clip should get
+    amount = ev->GetInteger(1);
 
-	if (amount > ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY]) {
-		amount = ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY];
-	}
+    if (amount > ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY]) {
+        amount = ammo_clip_size[FIRE_PRIMARY] - ammo_in_clip[FIRE_PRIMARY];
+    }
 
     if (UnlimitedAmmo(FIRE_PRIMARY)) {
         // Stick it in the clip
@@ -3367,11 +3319,11 @@ void Weapon::AddToAmmoClip(Event *ev)
 
         // Stick it in the clip
         ammo_in_clip[FIRE_PRIMARY] = amount_used + ammo_in_clip[FIRE_PRIMARY];
-	}
+    }
 
-	owner->AmmoAmountInClipChanged(ammo_type[FIRE_PRIMARY], ammo_in_clip[FIRE_PRIMARY]);
+    owner->AmmoAmountInClipChanged(ammo_type[FIRE_PRIMARY], ammo_in_clip[FIRE_PRIMARY]);
 
-	SetShouldReload(qfalse);
+    SetShouldReload(qfalse);
 }
 
 //======================
@@ -3423,6 +3375,10 @@ void Weapon::DoneReloading(Event *ev)
 {
     SetShouldReload(qfalse);
     weaponstate = WEAPON_READY;
+
+    // Added in OPM
+    //  Set to idle when done reloading
+    SetWeaponIdleAnim();
 }
 
 //======================
@@ -3495,7 +3451,6 @@ void Weapon::IdleInit(Event *ev)
 //Weapon::GetMaxRange
 //======================
 float Weapon::GetMaxRange(void)
-
 {
     return maxrange;
 }
@@ -3504,7 +3459,6 @@ float Weapon::GetMaxRange(void)
 //Weapon::GetMinRange
 //======================
 float Weapon::GetMinRange(void)
-
 {
     return minrange;
 }
@@ -3513,7 +3467,6 @@ float Weapon::GetMinRange(void)
 //Weapon::SetMaxRangeEvent
 //======================
 void Weapon::SetMaxRangeEvent(Event *ev)
-
 {
     maxrange = ev->GetFloat(1);
 }
@@ -3522,7 +3475,6 @@ void Weapon::SetMaxRangeEvent(Event *ev)
 //Weapon::SetMinRangeEvent
 //======================
 void Weapon::SetMinRangeEvent(Event *ev)
-
 {
     minrange = ev->GetFloat(1);
 }
@@ -3531,7 +3483,6 @@ void Weapon::SetMinRangeEvent(Event *ev)
 //Weapon::NotDroppableEvent
 //======================
 void Weapon::NotDroppableEvent(Event *ev)
-
 {
     notdroppable = true;
 }
@@ -3540,7 +3491,6 @@ void Weapon::NotDroppableEvent(Event *ev)
 //Weapon::SetMaxRange
 //======================
 void Weapon::SetMaxRange(float val)
-
 {
     maxrange = val;
 }
@@ -3549,7 +3499,6 @@ void Weapon::SetMaxRange(float val)
 //Weapon::SetMinRange
 //======================
 void Weapon::SetMinRange(float val)
-
 {
     minrange = val;
 }
@@ -3559,8 +3508,6 @@ void Weapon::SetMinRange(float val)
 //======================
 void Weapon::WeaponSound(Event *ev)
 {
-    Event *e;
-
     // Broadcasting a sound can be time consuming.  Only do it once in a while on really fast guns.
     if (nextweaponsoundtime > level.time) {
         if (owner) {
@@ -3572,8 +3519,7 @@ void Weapon::WeaponSound(Event *ev)
     }
 
     if (owner) {
-        e = new Event(ev);
-        owner->ProcessEvent(e);
+        owner->ProcessEvent(*ev);
     } else {
         Item::BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
     }
@@ -3586,7 +3532,6 @@ void Weapon::WeaponSound(Event *ev)
 //Weapon::Removable
 //======================
 qboolean Weapon::Removable(void)
-
 {
     if (((int)(dmflags->integer) & DF_WEAPONS_STAY) && !(spawnflags & (DROPPED_ITEM | DROPPED_PLAYER_ITEM))) {
         return false;
@@ -3599,7 +3544,6 @@ qboolean Weapon::Removable(void)
 //Weapon::Pickupable
 //======================
 qboolean Weapon::Pickupable(Entity *other)
-
 {
     Sentient *sen;
 
@@ -3611,9 +3555,6 @@ qboolean Weapon::Pickupable(Entity *other)
 
     sen = (Sentient *)other;
 
-    //FIXME
-    // This should be in player
-
     // If we have the weapon and weapons stay, then don't pick it up
     if (((int)(dmflags->integer) & DF_WEAPONS_STAY) && !(spawnflags & (DROPPED_ITEM | DROPPED_PLAYER_ITEM))) {
         Weapon *weapon;
@@ -3632,7 +3573,6 @@ qboolean Weapon::Pickupable(Entity *other)
 //Weapon::AutoChange
 //======================
 qboolean Weapon::AutoChange(void)
-
 {
     return true;
 }
@@ -3658,7 +3598,7 @@ int Weapon::ClipAmmo(firemode_t mode)
 //======================
 void Weapon::SetFireDelay(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3670,7 +3610,7 @@ void Weapon::SetFireDelay(Event *ev)
 //======================
 void Weapon::SetDMFireDelay(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3737,7 +3677,6 @@ void Weapon::SetFireType(Event *ev)
 //Weapon::GetFireType
 //======================
 firetype_t Weapon::GetFireType(firemode_t mode)
-
 {
     return firetype[mode];
 }
@@ -3752,7 +3691,7 @@ firemode_t Weapon::GetFireMode()
 //======================
 void Weapon::SetProjectile(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3766,7 +3705,7 @@ void Weapon::SetProjectile(Event *ev)
 //======================
 void Weapon::SetDMProjectile(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3779,7 +3718,6 @@ void Weapon::SetDMProjectile(Event *ev)
 //Weapon::SetBulletDamage
 //======================
 void Weapon::SetBulletDamage(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     bulletdamage[firemodeindex] = ev->GetFloat(1);
@@ -3789,7 +3727,6 @@ void Weapon::SetBulletDamage(Event *ev)
 //Weapon::SetBulletLarge
 //======================
 void Weapon::SetBulletLarge(Event *ev)
-
 {
     bulletlarge[firemodeindex] = ev->GetInteger(1);
 }
@@ -3798,7 +3735,6 @@ void Weapon::SetBulletLarge(Event *ev)
 //Weapon::SetBulletLarge
 //======================
 void Weapon::SetTracerSpeed(Event *ev)
-
 {
     tracerspeed[firemodeindex] = ev->GetFloat(1);
 }
@@ -3808,7 +3744,7 @@ void Weapon::SetTracerSpeed(Event *ev)
 //======================
 void Weapon::SetDMBulletDamage(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3820,7 +3756,6 @@ void Weapon::SetDMBulletDamage(Event *ev)
 //Weapon::SetBulletKnockback
 //======================
 void Weapon::SetBulletKnockback(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     bulletknockback[firemodeindex] = ev->GetFloat(1);
@@ -3831,7 +3766,7 @@ void Weapon::SetBulletKnockback(Event *ev)
 //======================
 void Weapon::SetDMBulletKnockback(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3860,7 +3795,7 @@ void Weapon::SetBulletThroughMetal(Event *ev)
 //======================
 void Weapon::SetBulletRange(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3873,7 +3808,7 @@ void Weapon::SetBulletRange(Event *ev)
 //======================
 void Weapon::SetDMBulletRange(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3894,7 +3829,7 @@ void Weapon::SetRange(Event *ev)
 //======================
 void Weapon::SetBulletCount(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3907,7 +3842,7 @@ void Weapon::SetBulletCount(Event *ev)
 //======================
 void Weapon::SetDMBulletCount(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3920,7 +3855,7 @@ void Weapon::SetDMBulletCount(Event *ev)
 //======================
 void Weapon::SetBulletSpread(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3939,7 +3874,7 @@ void Weapon::SetBulletSpread(Event *ev)
 //======================
 void Weapon::SetDMBulletSpread(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3958,7 +3893,7 @@ void Weapon::SetDMBulletSpread(Event *ev)
 //======================
 void Weapon::SetZoomSpreadMult(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3970,7 +3905,7 @@ void Weapon::SetZoomSpreadMult(Event *ev)
 //======================
 void Weapon::SetDMZoomSpreadMult(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3983,7 +3918,7 @@ void Weapon::SetDMZoomSpreadMult(Event *ev)
 //======================
 void Weapon::SetFireSpreadMult(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -3999,7 +3934,7 @@ void Weapon::SetFireSpreadMult(Event *ev)
 //======================
 void Weapon::SetDMFireSpreadMult(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4042,7 +3977,6 @@ void Weapon::Secondary(Event *ev)
 //Weapon::AutoAim
 //====================
 void Weapon::AutoAim(Event *ev)
-
 {
     autoaim = true;
 }
@@ -4060,7 +3994,7 @@ void Weapon::Crosshair(Event *ev)
 //====================
 void Weapon::DMCrosshair(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4111,7 +4045,6 @@ void Weapon::SetHolsterAngles(Event *ev)
 //Weapon::SetHolsterScale
 //====================
 void Weapon::SetHolsterScale(Event *ev)
-
 {
     holsterScale = ev->GetFloat(1);
 }
@@ -4128,7 +4061,6 @@ void Weapon::SetQuiet(Event *ev)
 //Weapon::SetLoopFire
 //====================
 void Weapon::SetLoopFire(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     loopfire[firemodeindex] = true;
@@ -4138,7 +4070,6 @@ void Weapon::SetLoopFire(Event *ev)
 //Weapon::SetMeansOfDeath
 //======================
 void Weapon::SetMeansOfDeath(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     meansofdeath[firemodeindex] = (meansOfDeath_t)MOD_string_to_int(ev->GetString(1));
@@ -4163,7 +4094,6 @@ meansOfDeath_t Weapon::GetMeansOfDeath(firemode_t mode)
 //Weapon::SetAimTarget
 //======================
 void Weapon::SetAimTarget(Entity *ent)
-
 {
     aim_target = ent;
 }
@@ -4177,7 +4107,6 @@ void Weapon::WorldHitSpawn(firemode_t mode, Vector origin, Vector angles, float
 //Weapon::SetWorldHitSpawn
 //======================
 void Weapon::SetWorldHitSpawn(Event *ev)
-
 {
     assert((firemodeindex >= 0) && (firemodeindex < MAX_FIREMODES));
     worldhitspawn[firemodeindex] = ev->GetString(1);
@@ -4294,6 +4223,11 @@ void Weapon::FallingAngleAdjust(Event *ev)
 //======================
 qboolean Weapon::GetUseCrosshair() const
 {
+    if (g_protocol < protocol_e::PROTOCOL_MOHTA_MIN) {
+        // Always show the crosshair in 1.11 and below
+        return qtrue;
+    }
+
     if (m_fMaxFireMovement >= 1.f) {
         return crosshair;
     }
@@ -4365,7 +4299,7 @@ void Weapon::SetViewKick(Event *ev)
 //======================
 void Weapon::SetMovementSpeed(Event *ev)
 {
-    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer) {
+    if (g_protocol <= protocol_e::PROTOCOL_MOH && g_gametype->integer != GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4377,7 +4311,7 @@ void Weapon::SetMovementSpeed(Event *ev)
 //======================
 void Weapon::SetDMMovementSpeed(Event *ev)
 {
-    if (!g_gametype->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         return;
     }
 
@@ -4485,7 +4419,6 @@ void Weapon::SetRank(int order, int rank)
 //Weapon::GetRank
 //======================
 int Weapon::GetRank(void)
-
 {
     return rank;
 }
@@ -4494,7 +4427,6 @@ int Weapon::GetRank(void)
 //Weapon::GetOrder
 //======================
 int Weapon::GetOrder(void)
-
 {
     return order;
 }
@@ -4520,7 +4452,8 @@ const_str Weapon::GetWeaponGroup(void) const
 //======================
 void Weapon::SetItemSlot(int slot)
 {
-    // FIXME: unimplemented
+    weapon_class &= ~WEAPON_CLASS_ITEM_SLOT_BITS;
+    weapon_class |= slot & WEAPON_CLASS_ITEM_SLOT_BITS;
 }
 
 //======================
@@ -4616,7 +4549,7 @@ float Weapon::GetMovementSpeed() const
 //======================
 //Weapon::IsCarryableTurret
 //======================
-bool Weapon::IsCarryableTurret()
+bool Weapon::IsCarryableTurret() const
 {
     return false;
 }
@@ -4662,6 +4595,36 @@ float Weapon::GetBulletRange(firemode_t mode)
     return bulletrange[mode];
 }
 
+//======================
+//Weapon::GetSpreadFactor
+//======================
+float Weapon::GetSpreadFactor(firemode_t mode)
+{
+    float fSpreadFactor;
+
+    if (owner && owner->client) {
+        Player* player = (Player*)owner.Pointer();
+
+        fSpreadFactor = player->velocity.length() / sv_runspeed->integer;
+
+        if (fSpreadFactor > 1.0f) {
+            fSpreadFactor = 1.0f;
+        }
+    } else {
+        fSpreadFactor = 0.5f;
+    }
+
+    return fSpreadFactor;
+}
+
+//======================
+//Weapon::GetChargeFraction
+//======================
+float Weapon::GetChargeFraction(void) const
+{
+    return charge_fraction;
+}
+
 //======================
 //Weapon::GetScriptOwner
 //======================
@@ -4669,3 +4632,42 @@ Listener *Weapon::GetScriptOwner(void)
 {
     return owner;
 }
+
+//======================
+//Weapon::DoneAnimating
+//======================
+void Weapon::DoneAnimating(Event* ev) {
+    // Added in OPM
+    //  Set to idle when done reloading
+    SetWeaponIdleAnim();
+}
+
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+void Weapon::EventGetPutaway(Event* ev) {
+    // Added in OPM
+    //  Set to idle when done reloading
+    ev->AddInteger(GetPutaway());
+}
+
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+float Weapon::GetMaxFireMovementMult() const {
+    return m_fMaxFireMovement * m_fMovementSpeed;
+}
+
+//======================
+//Weapon::GetMaxFireMovementMult
+//======================
+float Weapon::GetZoomMovement() const {
+    return m_fZoomMovement * m_fMovementSpeed;
+}
+
+//======================
+//Weapon::GetMaxFireMovement
+//======================
+float Weapon::GetMaxFireMovement() const {
+    return m_fMaxFireMovement;
+}
diff --git a/code/fgame/weapon.h b/code/fgame/weapon.h
index c48b171d..18e9bf8f 100644
--- a/code/fgame/weapon.h
+++ b/code/fgame/weapon.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,8 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // class will be usable by any Sentient (players and monsters) as a weapon.
 //
 
-#ifndef __WEAPON_H__
-#define __WEAPON_H__
+#pragma once
 
 #include "g_local.h"
 #include "item.h"
@@ -92,6 +91,8 @@ typedef enum {
         }                                           \
     }
 
+static const unsigned int MAX_WEAPON_ANIM_SLOTS = 4;
+
 class Player;
 
 class Weapon : public Item
@@ -147,28 +148,28 @@ protected:
     // in its primary(index 0) and alternate(index 1) mode
 
     float          fire_delay[MAX_FIREMODES];
-    str            ammo_type[MAX_FIREMODES];              // The type of ammo used
-    int            ammorequired[MAX_FIREMODES];           // The amount of ammo required to fire this weapon
-    int            startammo[MAX_FIREMODES];              // The starting amount of ammo when the weapon is picked up
-    str            projectileModel[MAX_FIREMODES];        // The model of the projectile fired
-    float          bulletdamage[MAX_FIREMODES];           // The amount of damate a single bullet causes
-    float          bulletcount[MAX_FIREMODES];            // The number of bullets the weapon fires
-    int            bulletlarge[MAX_FIREMODES];            // The number of bullets the weapon fires
-    float          bulletrange[MAX_FIREMODES];            // The range of the bullet
-    float          bulletknockback[MAX_FIREMODES];        // The amount of knockback a bullet causes
-    float          bulletthroughwood[MAX_FIREMODES];      // The amount of knockback a bullet causes
-    float          bulletthroughmetal[MAX_FIREMODES];     // The amount of knockback a bullet causes
-    float          projectilespeed[MAX_FIREMODES];        // The speed of the projectile fired
-    Vector         bulletspread[MAX_FIREMODES];           // The amount of spread bullets can have
-    Vector         bulletspreadmax[MAX_FIREMODES];        // The max amount of spread bullets can have
-    firetype_t     firetype[MAX_FIREMODES];               // The type of fire (projectile or bullet)
-    int            ammo_clip_size[MAX_FIREMODES];         // The amount of rounds the clip can hold
-    int            ammo_in_clip[MAX_FIREMODES];           // The current amount of ammo in the clip
-    float          max_charge_time[MAX_FIREMODES];        // The max amount of time the weapon may be charged.
-    float          min_charge_time[MAX_FIREMODES];        // The min amount of time the weapon may be charged.
-    meansOfDeath_t meansofdeath[MAX_FIREMODES];           // The means of death for this mode
-    qboolean       loopfire[MAX_FIREMODES];               // The weapon loopfires and will not idle when shooting
-    str            worldhitspawn[MAX_FIREMODES];          // The models to spawn when the weapon strikes the world
+    str            ammo_type[MAX_FIREMODES];          // The type of ammo used
+    int            ammorequired[MAX_FIREMODES];       // The amount of ammo required to fire this weapon
+    int            startammo[MAX_FIREMODES];          // The starting amount of ammo when the weapon is picked up
+    str            projectileModel[MAX_FIREMODES];    // The model of the projectile fired
+    float          bulletdamage[MAX_FIREMODES];       // The amount of damate a single bullet causes
+    float          bulletcount[MAX_FIREMODES];        // The number of bullets the weapon fires
+    int            bulletlarge[MAX_FIREMODES];        // The number of bullets the weapon fires
+    float          bulletrange[MAX_FIREMODES];        // The range of the bullet
+    float          bulletknockback[MAX_FIREMODES];    // The amount of knockback a bullet causes
+    float          bulletthroughwood[MAX_FIREMODES];  // The amount of knockback a bullet causes
+    float          bulletthroughmetal[MAX_FIREMODES]; // The amount of knockback a bullet causes
+    float          projectilespeed[MAX_FIREMODES];    // The speed of the projectile fired
+    Vector         bulletspread[MAX_FIREMODES];       // The amount of spread bullets can have
+    Vector         bulletspreadmax[MAX_FIREMODES];    // The max amount of spread bullets can have
+    firetype_t     firetype[MAX_FIREMODES];           // The type of fire (projectile or bullet)
+    int            ammo_clip_size[MAX_FIREMODES];     // The amount of rounds the clip can hold
+    int            ammo_in_clip[MAX_FIREMODES];       // The current amount of ammo in the clip
+    float          max_charge_time[MAX_FIREMODES];    // The max amount of time the weapon may be charged.
+    float          min_charge_time[MAX_FIREMODES];    // The min amount of time the weapon may be charged.
+    meansOfDeath_t meansofdeath[MAX_FIREMODES];       // The means of death for this mode
+    qboolean       loopfire[MAX_FIREMODES];           // The weapon loopfires and will not idle when shooting
+    str            worldhitspawn[MAX_FIREMODES];      // The models to spawn when the weapon strikes the world
     int            tracerfrequency[MAX_FIREMODES];
     int            tracercount[MAX_FIREMODES];
     float          tracerspeed[MAX_FIREMODES];
@@ -234,27 +235,27 @@ public:
     SafePtr<Entity> aim_target;
 
 protected:
-	friend class Player;
-	friend class PlayerBot;
-	friend class Sentient;
+    friend class Player;
+    friend class PlayerBot;
+    friend class Sentient;
 
     void SetMaxRangeEvent(Event *ev);
     void SetMinRangeEvent(Event *ev);
     void SetSecondaryAmmo(const char *type, int amount, int startamount);
 
     void         DetachGun(void);
-	void         AttachGun(weaponhand_t hand, qboolean holstering = qfalse);
-	qboolean     IsSecondaryWeapon(void);
+    void         AttachGun(weaponhand_t hand, qboolean holstering = qfalse);
+    qboolean     IsSecondaryWeapon(void);
     void         PickupWeapon(Event *ev);
     void         DoneRaising(Event *ev);
     void         DoneFiring(Event *ev);
     void         Idle(Event *ev);
-	void         IdleInit(Event* ev);
-	void         FillAmmoClip(Event* ev);
-	void         EmptyAmmoClip(Event* ev);
-	void         AddToAmmoClip(Event* ev);
+    void         IdleInit(Event *ev);
+    void         FillAmmoClip(Event *ev);
+    void         EmptyAmmoClip(Event *ev);
+    void         AddToAmmoClip(Event *ev);
     void         DoneReloading(Event *ev);
-    void         ApplyFireKickback(const Vector& org, float kickback);
+    virtual void ApplyFireKickback(const Vector& org, float kickback);
     void         SetAimAnim(Event *ev);
     virtual void Shoot(Event *ev);
     void         Secondary(Event *ev);
@@ -270,7 +271,7 @@ protected:
     void         SetDMBulletRange(Event *ev);
     void         SetBulletKnockback(Event *ev);
     void         SetDMBulletKnockback(Event *ev);
-    void         SetBulletThroughWood(Event *ev); // Added in 2.0
+    void         SetBulletThroughWood(Event *ev);  // Added in 2.0
     void         SetBulletThroughMetal(Event *ev); // Added in 2.0
     void         SetBulletCount(Event *ev);
     void         SetDMBulletCount(Event *ev);
@@ -282,11 +283,11 @@ protected:
     void         SetDMFireSpreadMult(Event *ev);
     void         SetTracerFrequency(Event *ev);
     void         SetAutoPutaway(Event *ev);
-	void         SetRange(Event* ev);
-	void         SetWeaponType(Event* ev);
-	void         SetWeaponGroup(Event* ev);
-	void         SetUseNoAmmo(Event* ev);
-	void         MainAttachToTag(Event* ev);
+    void         SetRange(Event *ev);
+    void         SetWeaponType(Event *ev);
+    void         SetWeaponGroup(Event *ev);
+    void         SetUseNoAmmo(Event *ev);
+    void         MainAttachToTag(Event *ev);
     void         OffHandAttachToTag(Event *ev);
     void         HolsterAttachToTag(Event *ev);
     void         SetHolsterOffset(Event *ev);
@@ -297,17 +298,17 @@ protected:
     void         SetMovementSpeed(Event *ev);
     void         SetDMMovementSpeed(Event *ev);
     void         SetMaxFireMovement(Event *ev); // Added in 2.0
-    void         SetZoomMovement(Event *ev); // Added in 2.0
+    void         SetZoomMovement(Event *ev);    // Added in 2.0
     void         EventAmmoPickupSound(Event *ev);
     void         EventNoAmmoSound(Event *ev);
     void         EventMaxMovementSound(Event *ev); // Added in 2.0
     //====
     // Added in 2.0
-    void         SetNumFireAnims(Event *ev);
-    void         SetWeaponSubtype(Event *ev);
-    void         SetCookTime(Event *ev);
-    void         SetCurrentFireAnim(Event *ev);
-	void         SetSecondaryAmmoInHud(Event* ev);
+    void SetNumFireAnims(Event *ev);
+    void SetWeaponSubtype(Event *ev);
+    void SetCookTime(Event *ev);
+    void SetCurrentFireAnim(Event *ev);
+    void SetSecondaryAmmoInHud(Event *ev);
     //====
     void ShowInfo(float fDot, float fDist) override;
 
@@ -315,18 +316,18 @@ public:
     CLASS_PROTOTYPE(Weapon);
 
     Weapon();
-    Weapon(const char* file);
+    Weapon(const char *file);
     ~Weapon();
 
-    void      Delete(void) override;
-    int       GetRank(void);
-    int       GetOrder(void);
+    void Delete(void) override;
+    int  GetRank(void);
+    int  GetOrder(void);
 
     int GetWeaponClass(void) const;
 
     const_str GetWeaponGroup(void) const;
 
-    void SetItemSlot(int slot);
+    void  SetItemSlot(int slot);
     void  SetRank(int order, int rank);
     void  SetRankEvent(Event *ev);
     float GetMaxRange(void);
@@ -360,8 +361,8 @@ public:
     void       SetAmmoClipSize(Event *ev);
     void       SetAmmoInClip(Event *ev);
     void       SetShareClip(Event *ev);
-    void       SetTagBarrel(const char* tagBarrel); // Added in 2.0
-    str        GetTagBarrel() const; // Added in 2.0
+    void       SetTagBarrel(const char *tagBarrel); // Added in 2.0
+    str        GetTagBarrel() const;                // Added in 2.0
     void       SetModels(const char *world, const char *view);
     void       SetOwner(Sentient *ent) override;
     void       SetMaxChargeTime(Event *ev);
@@ -374,88 +375,96 @@ public:
     qboolean   HasAmmoInClip(firemode_t mode);
     int        GetClipSize(firemode_t mode);
 
-	qboolean CheckReload(firemode_t mode);
+    qboolean CheckReload(firemode_t mode);
     qboolean ShouldReload(void);
-	void SetShouldReload(qboolean should_reload);
-	void StartReloading(void);
+    void     SetShouldReload(qboolean should_reload);
+    void     StartReloading(void);
 
-    qboolean   ReadyToFire(firemode_t mode, qboolean playsound = qtrue);
-    qboolean   MuzzleClear(void);
+    virtual qboolean ReadyToFire(firemode_t mode, qboolean playsound = qtrue);
+    qboolean         MuzzleClear(void);
 
-    void       PutAway(void);
-    qboolean   Drop(void) override;
-    void       Fire(firemode_t mode);
-    void       Charge(firemode_t mode);
-    void       OnOverCookedWarning(Event *ev); // Added in 2.0
-    void       OnOverCooked(Event *ev); // Added in 2.0
-    void       ReleaseFire(firemode_t mode, float chargetime);
-    const char* GetFireAnim() const; // Added in 2.0
-    void       ClientFireDone(void);
-    qboolean   Removable(void) override;
-    qboolean   Pickupable(Entity *other) override;
-    void       DetachFromOwner(void);
-    void       AttachToOwner(weaponhand_t hand);
-    void       WeaponSound(Event *ev);
-    void       GetMuzzlePosition(
-              Vector *position, Vector *forward = NULL, Vector *right = NULL, Vector *up = NULL, Vector *vBarrelPos = NULL
-          );
-    qboolean AutoChange(void);
-	int      ClipAmmo(firemode_t mode);
-	qboolean IsDroppable(void);
-    float    FireDelay(firemode_t mode);
-    void     SetFireDelay(Event *ev);
-	void     SetDMFireDelay(Event* ev);
+    void         PutAway(void);
+    qboolean     Drop(void) override;
+    void         Fire(firemode_t mode);
+    void         Charge(firemode_t mode);
+    void         OnOverCookedWarning(Event *ev); // Added in 2.0
+    void         OnOverCooked(Event *ev);        // Added in 2.0
+    void         ReleaseFire(firemode_t mode, float chargetime);
+    const char  *GetFireAnim() const; // Added in 2.0
+    void         ClientFireDone(void);
+    qboolean     Removable(void) override;
+    qboolean     Pickupable(Entity *other) override;
+    virtual void DetachFromOwner(void);
+    void         AttachToOwner(weaponhand_t hand);
+    void         WeaponSound(Event *ev);
+    virtual void GetMuzzlePosition(
+        vec3_t position, vec3_t vBarrelPos = NULL, vec3_t forward = NULL, vec3_t right = NULL, vec3_t up = NULL
+    );
+    qboolean         AutoChange(void);
+    int              ClipAmmo(firemode_t mode);
+    qboolean         IsDroppable(void);
+    virtual float    FireDelay(firemode_t mode);
+    virtual void     SetFireDelay(Event *ev);
+    void             SetDMFireDelay(Event *ev);
 
-	weaponstate_t GetState(void);
-    void                ForceState(weaponstate_t state);
+    weaponstate_t GetState(void);
+    void          ForceState(weaponstate_t state);
 
-    void                NotDroppableEvent(Event *ev);
-    void                GiveStartingAmmoToOwner(Event *ev);
-    void                AutoAim(Event *ev);
-    void                Crosshair(Event *ev);
-    void                DMCrosshair(Event *ev);
-    void                SetZoom(Event *ev);
-    void                SetSemiAuto(Event *ev);
-    void                AttachToHand(Event *ev);
-    void                SetCantPartialReload(Event *ev);
-    void                SetDMCantPartialReload(Event *ev);
-    void                AddAdditionalStartAmmo(Event *ev); // Added in 2.0
-    void                AddStartItem(Event *ev); // Added in 2.0
-    void                SetQuiet(Event *ev);
-    void                SetLoopFire(Event *ev);
+    void         NotDroppableEvent(Event *ev);
+    void         GiveStartingAmmoToOwner(Event *ev);
+    void         AutoAim(Event *ev);
+    void         Crosshair(Event *ev);
+    void         DMCrosshair(Event *ev);
+    void         SetZoom(Event *ev);
+    void         SetSemiAuto(Event *ev);
+    void         AttachToHand(Event *ev);
+    void         SetCantPartialReload(Event *ev);
+    void         SetDMCantPartialReload(Event *ev);
+    void         AddAdditionalStartAmmo(Event *ev); // Added in 2.0
+    void         AddStartItem(Event *ev);           // Added in 2.0
+    void         SetQuiet(Event *ev);
+    void         SetLoopFire(Event *ev);
     virtual void SpecialFireProjectile(
         Vector pos, Vector forward, Vector right, Vector up, Entity *owner, str projectileModel, float charge_fraction
     );
 
-	void AttachToHolster(weaponhand_t hand);
-    str GetCurrentAttachToTag(void);
-    void SetCurrentAttachToTag(str s);
-    str GetHolsterTag(void);
-    qboolean GetUseNoAmmo(void);
+    virtual void AttachToHolster(weaponhand_t hand);
+    str          GetCurrentAttachToTag(void);
+    void         SetCurrentAttachToTag(str s);
+    str          GetHolsterTag(void);
+    qboolean     GetUseNoAmmo(void);
 
     int            GetZoom(void);
     qboolean       GetAutoZoom(void);
     void           SetMeansOfDeath(Event *ev);
     meansOfDeath_t GetMeansOfDeath(firemode_t mode);
-	void           SetAimTarget(Entity*);
+    void           SetAimTarget(Entity *);
     void           SetIdleState(int state); // Added in 2.0
     void           WorldHitSpawn(firemode_t mode, Vector org, Vector angles, float life);
     void           MakeNoise(Event *ev);
     void           FallingAngleAdjust(Event *ev);
     float          GetMovementSpeed() const;
-	qboolean       GetUseCrosshair() const;
+    qboolean       GetUseCrosshair() const;
 
-	virtual bool IsCarryableTurret(); // Added in 2.0
+    virtual bool IsCarryableTurret() const; // Added in 2.0
 
-    void           Archive(Archiver          &arc) override;
+    void Archive(Archiver& arc) override;
 
     //
-    // Added in openmohaa
-	//
-	Listener* GetScriptOwner(void) override;
-	float GetBulletRange(firemode_t firemode);
-	firemode_t GetFireMode(void);
-	qboolean   IsSemiAuto(void);
+    // Added in OPM
+    //
+    Listener  *GetScriptOwner(void) override;
+    float      GetBulletRange(firemode_t firemode);
+    float      GetSpreadFactor(firemode_t firemode);
+    float      GetChargeFraction(void) const;
+    firemode_t GetFireMode(void);
+    qboolean   IsSemiAuto(void);
+    void       DoneAnimating(Event *ev);
+    void       EventGetPutaway(Event *ev);
+
+    float GetMaxFireMovementMult() const;
+    float GetZoomMovement() const;
+    float GetMaxFireMovement() const;
 };
 
 inline void Weapon::Archive(Archiver& arc)
@@ -529,8 +538,8 @@ inline void Weapon::Archive(Archiver& arc)
     arc.ArchiveFloat(&bulletknockback[0]);
     arc.ArchiveFloat(&bulletknockback[1]);
     arc.ArchiveFloat(&bulletthroughwood[0]);
-    arc.ArchiveFloat(&bulletthroughwood[0]);
-    arc.ArchiveFloat(&bulletthroughmetal[1]);
+    arc.ArchiveFloat(&bulletthroughwood[1]);
+    arc.ArchiveFloat(&bulletthroughmetal[0]);
     arc.ArchiveFloat(&bulletthroughmetal[1]);
     arc.ArchiveFloat(&projectilespeed[0]);
     arc.ArchiveFloat(&projectilespeed[1]);
@@ -590,6 +599,7 @@ inline void Weapon::Archive(Archiver& arc)
 
     ArchiveEnum(firemodeindex, firemode_t);
 
+    arc.ArchiveInteger(&weapon_class);
     Director.ArchiveString(arc, m_csWeaponGroup);
     arc.ArchiveFloat(&m_fMovementSpeed);
     arc.ArchiveFloat(&m_fMaxFireMovement);
@@ -619,5 +629,3 @@ inline void Weapon::Archive(Archiver& arc)
 }
 
 typedef SafePtr<Weapon> WeaponPtr;
-
-#endif /* weapon.h */
diff --git a/code/fgame/weapturret.cpp b/code/fgame/weapturret.cpp
index 274e7757..9857ac24 100644
--- a/code/fgame/weapturret.cpp
+++ b/code/fgame/weapturret.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,1432 +25,2213 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110EV_DEFAULT301  U
 
 #include "g_phys.h"
 #include "weapturret.h"
+#include "vehicleturret.h"
 #include "player.h"
+#include "../script/scriptexception.h"
+
+static cvar_t *pTurretCameras = NULL;
 
 Event EV_Turret_IdleCheckOffset
 (
-	"idleCheckOffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Sets the to trace to for collision checking when idling"
+    "idleCheckOffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Sets the offset to trace to for collision checking when idling",
+    EV_NORMAL
 );
-
-Event EV_Turret_ViewOffset
+Event EV_Turret_P_ViewOffset
 (
-	"viewOffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Sets the view to use for the turret"
+    "viewOffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Sets the view offset to use for the turret",
+    EV_NORMAL
 );
-
-Event EV_Turret_SetPlayerUsable
+Event EV_Turret_MaxIdlePitch
 (
-	"setPlayerUsable",
-	EV_DEFAULT,
-	"i",
-	"state",
-	"Sets wether the turret can be used by players. 0 means no, 1 means yes."
+    "maxIdlePitch",
+    EV_DEFAULT,
+    "f",
+    "offset",
+    "Sets the offset to trace to for collision checking when idling",
+    EV_NORMAL
 );
-
-Event EV_Turret_SetAimTarget
+Event EV_Turret_MaxIdleYaw
 (
-	"setAimTarget",
-	EV_DEFAULT,
-	"S",
-	"target",
-	"Makes the turret aim at an entity"
+    "maxIdleYaw",
+    EV_DEFAULT,
+    "f",
+    "offset",
+    "Sets the offset to trace to for collision checking when idling",
+    EV_NORMAL
 );
-
-Event EV_Turret_SetAimOffset
+Event EV_Turret_P_SetPlayerUsable
 (
-	"setAimOffset",
-	EV_DEFAULT,
-	"v",
-	"offset",
-	"Makes the turret aim with specified offset"
+    "setPlayerUsable",
+    EV_DEFAULT,
+    "i",
+    "state",
+    "Sets whether the turret can be used by players. 0 means no, 1 means yes.",
+    EV_NORMAL
 );
-
-Event EV_Turret_ClearAimTarget
+Event EV_Turret_AI_SetAimTarget
 (
-	"clearAimTarget",
-	EV_DEFAULT,
-	"S",
-	"target",
-	"Makes the turret aim at an entity"
+    "setAimTarget",
+    EV_DEFAULT,
+    "S",
+    "target",
+    "Makes the turret aim at an entity",
+    EV_NORMAL
 );
-
-Event EV_Turret_StartFiring
+Event EV_Turret_AI_SetAimOffset
 (
-	"startFiring",
-	EV_DEFAULT,
-	0,
-	0,
-	"Makes the turret start shooting"
+    "setAimOffset",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Makes the turret aim with specified offset",
+    EV_NORMAL
 );
-
-Event EV_Turret_StopFiring
+Event EV_Turret_AI_ClearAimTarget
 (
-	"stopFiring",
-	EV_DEFAULT,
-	0,
-	0,
-	"Makes the turret stop shooting"
+    "clearAimTarget",
+    EV_DEFAULT,
+    "S",
+    "target",
+    "Makes the turret aim at an entity",
+    EV_NORMAL
 );
-
-Event EV_Turret_TurnSpeed
+Event EV_Turret_AI_StartFiring
 (
-	"turnSpeed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"Sets the turret's turn speed"
+    "startFiring",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the turret start shooting",
+    EV_NORMAL
+);
+Event EV_Turret_AI_StopFiring
+(
+    "stopFiring",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the turret stop shooting",
+    EV_NORMAL
+);
+Event EV_Turret_AI_TurnSpeed
+(
+    "turnSpeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the turret's turn speed",
+    EV_NORMAL
+);
+Event EV_Turret_AI_PitchSpeed
+(
+    "pitchSpeed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Sets the turret's pitch speed",
+    EV_NORMAL
 );
-
 Event EV_Turret_PitchCaps
 (
-	"pitchCaps",
-	EV_DEFAULT,
-	"v",
-	"caps",
-	"Sets the pitch caps for the turret. First number is upward cap, second is downward cap, and the third just makes it nice little vector"
+    "pitchCaps",
+    EV_DEFAULT,
+    "v",
+    "caps",
+    "Sets the pitch caps for the turret. First number is upward cap, second is downward cap, and the third just makes "
+    "it "
+    "nice little vector",
+    EV_NORMAL
 );
-
 Event EV_Turret_MaxYawOffset
 (
-	"maxYawOffset",
-	EV_DEFAULT,
-	"f",
-	"maxoffset",
-	"Sets the max yaw from the turrets central facing direction"
+    "maxYawOffset",
+    EV_DEFAULT,
+    "f",
+    "maxoffset",
+    "Sets the max yaw offset from the turrets central facing direction",
+    EV_NORMAL
 );
-
 Event EV_Turret_YawCenter
 (
-	"yawCenter",
-	EV_DEFAULT,
-	"f",
-	"yaw",
-	"Sets the yaw for the center of the turret's turning arc"
+    "yawCenter",
+    EV_DEFAULT,
+    "f",
+    "yaw",
+    "Sets the yaw for the center of the turret's turning arc",
+    EV_NORMAL
 );
-
-Event EV_Turret_UserDistance
+Event EV_Turret_P_UserDistance
 (
-	"userdistance",
-	EV_DEFAULT,
-	"f",
-	"min_dist",
-	"Sets the distance the user should be placed at while using this turret"
+    "userdistance",
+    EV_DEFAULT,
+    "f",
+    "dist",
+    "Sets the distance the user should be placed at while using this turret",
+    EV_NORMAL
 );
-
-Event EV_Turret_ViewJitter
+Event EV_Turret_P_ViewJitter
 (
-	"viewjitter",
-	EV_DEFAULT,
-	"f",
-	"amount",
-	"Sets the amount that the owner's view should be jittered when fired"
+    "viewjitter",
+    EV_DEFAULT,
+    "f",
+    "amount",
+    "Sets the amount that the owner's view should be jittered when fired",
+    EV_NORMAL
 );
-
-Event EV_Turret_BurstFireSettings
+Event EV_Turret_EventDoJitter
 (
-	"burstFireSettings",
-	EV_DEFAULT,
-	"ffff",
-	"mintime maxtime mindelay maxdelay",
-	"Sets the settings for burst mode firing"
+    "dojitter",
+    EV_DEFAULT,
+    "F",
+    "jitterAmount",
+    "Apply the jitter without firing",
+    EV_NORMAL
+);
+Event EV_Turret_AI_BurstFireSettings
+(
+    "burstFireSettings",
+    EV_DEFAULT,
+    "ffff",
+    "mintime maxtime mindelay maxdelay",
+    "Sets the settings for burst mode firing",
+    EV_NORMAL
 );
-
 Event EV_Turret_Enter
 (
-	"turretenter",
-	EV_DEFAULT,
-	"eS",
-	"turret driver_anim",
-	"Called when someone gets into a turret."
+    "turretenter",
+    EV_DEFAULT,
+    "eS",
+    "turret driver_anim",
+    "Called when someone gets into a turret.",
+    EV_NORMAL
 );
-
 Event EV_Turret_Exit
 (
-	"turretexit",
-	EV_DEFAULT,
-	"e",
-	"turret",
-	"Called when driver gets out of the turret."
+    "turretexit",
+    EV_DEFAULT,
+    "e",
+    "turret",
+    "Called when driver gets out of the turret.",
+    EV_NORMAL
 );
-
-Event EV_Turret_SetThread
+Event EV_Turret_P_SetThread
 (
-	"setthread",
-	EV_DEFAULT,
-	"s",
-	"value",
-	"Sets the name of the thread called when a player uses the turret"
+    "setthread",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the name of the thread called when a player uses the turret",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SetTargetType
+(
+    "targettype",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the target type to be none, any, or player",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SetTargetType2
+(
+    "targettype",
+    EV_DEFAULT,
+    "s",
+    "value",
+    "Sets the target type to be none any, or player",
+    EV_SETTER
+);
+Event EV_Turret_AI_GetTargetType
+(
+    "targettype",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Gets the target type",
+    EV_GETTER
+);
+Event EV_Turret_AI_ConvergeTime
+(
+    "convergeTime",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Sets the convergence time",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SuppressTime
+(
+    "suppressTime",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Sets the suppression time",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SuppressWaitTime
+(
+    "suppressWaitTime",
+    EV_DEFAULT,
+    "f",
+    "time",
+    "Sets the suppression wait nonfiring time before turret returns to default position",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SuppressWidth
+(
+    "suppressWidth",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Sets the horizontal radius of suppression fire",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SuppressHeight
+(
+    "suppressHeight",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Sets the vertical radius of suppression fire",
+    EV_NORMAL
+);
+Event EV_Turret_SetUsable
+(
+    "setusable",
+    EV_DEFAULT,
+    "i",
+    "state",
+    "Sets whether the turret can be used as a weapon. 0 means no, 1 means yes.",
+    EV_NORMAL
+);
+Event EV_Turret_AI_SetBulletSpread
+(
+    "aibulletspread",
+    EV_DEFAULT,
+    "ff",
+    "bulletSpreadX bulletSpreadY",
+    "Set the spread of the bullets in the x and y axis",
+    EV_NORMAL
+);
+Event EV_Turret_SetMaxUseAngle
+(
+    "maxuseangle",
+    EV_DEFAULT,
+    "f",
+    "maxuseangle",
+    "Set max use angle to allow player to mount the turret.",
+    EV_NORMAL
+);
+Event EV_Turret_SetStartYaw
+(
+    "startyaw",
+    EV_DEFAULT,
+    "f",
+    "startyaw",
+    "Sets the yaw to be used as the center of our allowed turn arc.",
+    EV_NORMAL
+);
+Event EV_Turret_P_SetViewAngles
+(
+    "psetviewangles",
+    EV_DEFAULT,
+    "v",
+    "offset",
+    "Sets the view angles.",
+    EV_NORMAL
 );
 
-CLASS_DECLARATION( Weapon, TurretGun, NULL )
-{
-	{ &EV_Trigger_Effect,					NULL },
-	{ &EV_Item_DropToFloor,					&TurretGun::PlaceTurret },
-	{ &EV_Item_Pickup,						NULL },
-	{ &EV_Weapon_Shoot,						&TurretGun::Shoot },
-	{ &EV_Use, 								&TurretGun::TurretUsed },
-	{ &EV_Turret_SetPlayerUsable, 			&TurretGun::SetPlayerUsable },
-	{ &EV_Turret_IdleCheckOffset, 			&TurretGun::SetIdleCheckOffset },
-	{ &EV_Turret_ViewOffset, 				&TurretGun::SetViewOffset },
-	{ &EV_Turret_SetAimTarget, 				&TurretGun::EventSetAimTarget },
-	{ &EV_Turret_SetAimOffset, 				&TurretGun::EventSetAimOffset },
-	{ &EV_Turret_ClearAimTarget, 			&TurretGun::EventClearAimTarget },
-	{ &EV_Turret_StartFiring, 				&TurretGun::EventStartFiring },
-	{ &EV_Turret_StopFiring, 				&TurretGun::EventStopFiring },
-	{ &EV_Turret_TurnSpeed, 				&TurretGun::EventTurnSpeed },
-	{ &EV_Turret_PitchCaps, 				&TurretGun::EventPitchCaps },
-	{ &EV_Turret_MaxYawOffset, 				&TurretGun::EventMaxYawOffset },
-	{ &EV_Turret_YawCenter, 				&TurretGun::EventYawCenter },
-	{ &EV_Turret_UserDistance, 				&TurretGun::EventUserDistance },
-	{ &EV_Turret_ViewJitter, 				&TurretGun::EventViewJitter },
-	{ &EV_Turret_BurstFireSettings, 		&TurretGun::EventBurstFireSettings },
-	{ &EV_Turret_SetThread, 				&TurretGun::EventSetThread },
-	{ &EV_SetViewangles, 					&TurretGun::SetViewangles },
-	{ &EV_GetViewangles, 					&TurretGun::GetViewangles },
-	{ NULL, NULL }
+CLASS_DECLARATION(Weapon, TurretGun, NULL) {
+    {&EV_Trigger_Effect,              NULL                                   },
+    {&EV_Item_DropToFloor,            &TurretGun::PlaceTurret                },
+    {&EV_Item_Pickup,                 NULL                                   },
+    {&EV_Weapon_Shoot,                &TurretGun::Shoot                      },
+    {&EV_Use,                         &TurretGun::TurretUsed                 },
+    {&EV_Turret_P_SetPlayerUsable,    &TurretGun::P_SetPlayerUsable          },
+    {&EV_Turret_SetUsable,            &TurretGun::EventSetUsable             },
+    {&EV_Turret_IdleCheckOffset,      &TurretGun::SetIdleCheckOffset         },
+    {&EV_Turret_P_ViewOffset,         &TurretGun::P_SetViewOffset            },
+    {&EV_Turret_MaxIdlePitch,         &TurretGun::EventMaxIdlePitch          },
+    {&EV_Turret_MaxIdleYaw,           &TurretGun::EventMaxIdleYaw            },
+    {&EV_Turret_AI_SetAimTarget,      &TurretGun::AI_EventSetAimTarget       },
+    {&EV_Turret_AI_SetAimOffset,      &TurretGun::AI_EventSetAimOffset       },
+    {&EV_Turret_AI_ClearAimTarget,    &TurretGun::AI_EventClearAimTarget     },
+    {&EV_Turret_AI_StartFiring,       &TurretGun::AI_EventStartFiring        },
+    {&EV_Turret_AI_StopFiring,        &TurretGun::AI_EventStopFiring         },
+    {&EV_Turret_AI_TurnSpeed,         &TurretGun::AI_EventTurnSpeed          },
+    {&EV_Turret_AI_PitchSpeed,        &TurretGun::AI_EventPitchSpeed         },
+    {&EV_Turret_PitchCaps,            &TurretGun::EventPitchCaps             },
+    {&EV_Turret_MaxYawOffset,         &TurretGun::EventMaxYawOffset          },
+    {&EV_Turret_YawCenter,            &TurretGun::EventYawCenter             },
+    {&EV_Turret_P_UserDistance,       &TurretGun::P_EventUserDistance        },
+    {&EV_Turret_P_ViewJitter,         &TurretGun::P_EventViewJitter          },
+    {&EV_Turret_EventDoJitter,        &TurretGun::P_EventDoJitter            },
+    {&EV_Turret_AI_BurstFireSettings, &TurretGun::AI_EventBurstFireSettings  },
+    {&EV_Turret_P_SetThread,          &TurretGun::EventSetThread             },
+    {&EV_Turret_SetMaxUseAngle,       &TurretGun::P_SetMaxUseAngle           },
+    {&EV_Turret_SetStartYaw,          &TurretGun::P_SetStartYaw              },
+    {&EV_Turret_P_SetViewAngles,      &TurretGun::P_SetViewAnglesForTurret   },
+    {&EV_SetViewangles,               &TurretGun::P_SetViewangles            },
+    {&EV_GetViewangles,               &TurretGun::P_GetViewangles            },
+    {&EV_Turret_AI_SetTargetType,     &TurretGun::AI_EventSetTargetType      },
+    {&EV_Turret_AI_SetTargetType2,    &TurretGun::AI_EventSetTargetType      },
+    {&EV_Turret_AI_GetTargetType,     &TurretGun::AI_EventGetTargetType      },
+    {&EV_Turret_AI_ConvergeTime,      &TurretGun::AI_EventSetConvergeTime    },
+    {&EV_Turret_AI_SuppressTime,      &TurretGun::AI_EventSetSuppressTime    },
+    {&EV_Turret_AI_SuppressWaitTime,  &TurretGun::AI_EventSetSuppressWaitTime},
+    {&EV_Turret_AI_SuppressWidth,     &TurretGun::AI_EventSetSuppressWidth   },
+    {&EV_Turret_AI_SuppressHeight,    &TurretGun::AI_EventSetSuppressHeight  },
+    {&EV_Turret_AI_SetBulletSpread,   &TurretGun::AI_EventSetBulletSpread    },
+    {NULL,                            NULL                                   }
 };
 
 TurretGun::TurretGun()
 {
-	entflags |= EF_TURRET;
+    entflags |= ECF_TURRET;
 
-	AddWaitTill(STRING_ONTARGET);
+    AddWaitTill(STRING_ONTARGET);
 
-	if( LoadingSavegame )
-	{
-		return;
-	}
+    if (LoadingSavegame) {
+        return;
+    }
 
-	// turrets must not respawn
-	// it can't be picked up
-	setRespawn( qfalse );
+    // turrets must not respawn
+    // it can't be picked up
+    setRespawn(qfalse);
 
-	// allow monsters to use the turret
-	respondto = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
+    // allow monsters to use the turret
+    respondto = TRIGGER_PLAYERS | TRIGGER_MONSTERS;
 
-	// set the clipmask
-	edict->clipmask = MASK_AUTOCALCLIFE;
+    // set the clipmask
+    edict->clipmask = MASK_AUTOCALCLIFE;
 
-	m_iIdleHitCount = 0;
+    // make the turret already usable
+    m_bUsable       = true;
+    m_bPlayerUsable = true;
+    m_bRestable     = true;
 
-	// set the fakebullets
-	m_bFakeBullets = ( spawnflags & FAKEBULLETS );
+    // set the fakebullets
+    m_bFakeBullets = (spawnflags & FAKEBULLETS);
 
-	// make the turret already usable
-	m_bUsable = true;
-	m_bPlayerUsable = true;
-	m_bRestable = true;
+    m_fIdlePitchSpeed = 0;
+    m_iIdleHitCount   = 0;
+    m_fMaxIdlePitch   = -80;
+    m_fMaxIdleYaw     = 180;
 
-	m_fIdlePitchSpeed = 0;
+    // set the size
+    setSize(Vector(-16, -16, -8), Vector(16, 16, 32));
 
-	// set the size
-	setSize( Vector( -16, -16, -8 ), Vector( 16, 16, 32 ) );
+    // setup the turret angles cap
+    m_fTurnSpeed    = 180;
+    m_fAIPitchSpeed = 180;
+    m_fPitchUpCap   = -45;
+    m_fPitchDownCap = 45;
+    m_fMaxYawOffset = 180;
+    m_fUserDistance = 64;
 
-	// setup the turret angles cap
-	m_fTurnSpeed = 180.0f;
-	m_fPitchUpCap = -45.0f;
-	m_fPitchDownCap = 45.0f;
-	m_fMaxYawOffset = 180.0f;
-	m_fUserDistance = 64.0f;
+    // set the idle angles
+    m_vIdleCheckOffset = Vector(-56, 0, 0);
 
-	// set the idle angles
-	m_vIdleCheckOffset = Vector( -56, 0, 0 );
+    // set the burst time
+    m_fMinBurstTime = 0;
+    m_fMaxBurstTime = 0;
+    // set the burst delay
+    m_fMinBurstDelay = 0;
+    m_fMaxBurstDelay = 0;
 
-	// set the burst time
-	m_fMinBurstTime = 0;
-	m_fMaxBurstTime = 0;
+    m_fFireToggleTime = level.time;
+    m_iFiring         = 0;
+    m_iTargetType     = 0;
 
-	// set the burst delay
-	m_fMinBurstDelay = 0;
-	m_fMaxBurstDelay = 0;
+    // set the camera
+    m_pUserCamera = NULL;
 
-	m_iFiring = 0;
-	m_fFireToggleTime = level.time;
+    // setup the view jitter
+    m_fViewJitter     = 0;
+    m_fCurrViewJitter = 0;
+    // turret doesn't have an owner when spawning
+    m_bHadOwner  = false;
+    m_pViewModel = NULL;
 
-	// set the camera
-	m_pUserCamera = NULL;
+    m_iAIState        = 0;
+    m_fAIConvergeTime = g_turret_convergetime->value;
+    if (m_fAIConvergeTime < 0) {
+        m_fAIConvergeTime = 0;
+    }
 
-	// setup the view jitter
-	m_fViewJitter = 0;
-	m_fCurrViewJitter = 0;
+    m_iAISuppressTime = g_turret_suppresstime->value * 1000;
+    if (m_iAISuppressTime < 0) {
+        m_iAISuppressTime = 0;
+    }
 
-	// turret doesn't have an owner when spawning
-	m_bHadOwner = 0;
+    m_iAISuppressWaitTime = g_turret_suppresswaittime->value * 1000;
+    if (m_iAISuppressWaitTime < 0) {
+        m_iAISuppressWaitTime = 0;
+    }
 
-	m_pViewModel = NULL;
+    m_iAILastTrackTime     = 0;
+    m_iAIStartSuppressTime = 0;
+    VectorClear(m_vDesiredTargetAngles);
+    m_fAIDesiredTargetSpeed = 0;
+    VectorClear(m_vAIDesiredTargetPosition);
+    VectorClear(m_vAITargetPosition);
+    VectorClear(m_vAICurrentTargetPosition);
+    VectorClear(m_vAITargetSpeed);
+    m_iAINextSuppressTime = 0;
+    m_fAISuppressWidth    = 256;
+    m_fAISuppressHeight   = 64;
+    VectorClear(m_vMuzzlePosition);
+    fire_delay[FIRE_PRIMARY] = 0.05f;
+    m_fMaxUseAngle           = 80;
 }
 
 TurretGun::~TurretGun()
 {
-	Unregister( STRING_ONTARGET );
+    Unregister(STRING_ONTARGET);
 
-	entflags &= ~EF_TURRET;
+    //
+    // Added in OPM:
+    //  Remove the user camera if any.
+    //
+    if (m_pUserCamera) {
+        RemoveUserCamera();
+    }
+
+    //
+    // Added in OPM:
+    //  Remove the view model.
+    //
+    if (m_pViewModel) {
+        m_pViewModel->Delete();
+        m_pViewModel = NULL;
+    }
+
+    //
+    // Added in OPM:
+    //  Detach the owner from the turret.
+    //
+    if (owner && owner->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(owner.Pointer());
+        player->ExitTurret();
+    }
+
+    entflags &= ~ECF_TURRET;
 }
 
-void TurretGun::Archive
-	(
-	Archiver& arc
-	)
+void TurretGun::PlaceTurret(Event *ev)
 {
-	Weapon::Archive( arc );
+    // Don't make the turret solid
+    setSolidType(SOLID_NOT);
 
-	arc.ArchiveBool( &m_bFakeBullets );
-	arc.ArchiveBool( &m_bPlayerUsable );
+    // The turret shouldn't move
+    setMoveType(MOVETYPE_NONE);
 
-	arc.ArchiveFloat( &m_fIdlePitchSpeed );
-	arc.ArchiveInteger( &m_iIdleHitCount );
-	arc.ArchiveVector( &m_vIdleCheckOffset );
-	arc.ArchiveVector( &m_vViewOffset );
+    showModel();
 
-	arc.ArchiveFloat( &m_fTurnSpeed );
-	arc.ArchiveFloat( &m_fPitchUpCap );
-	arc.ArchiveFloat( &m_fPitchDownCap );
-	arc.ArchiveFloat( &m_fStartYaw );
-	arc.ArchiveFloat( &m_fMaxYawOffset );
-	arc.ArchiveFloat( &m_fUserDistance );
+    m_fStartYaw  = angles[1];
+    groundentity = NULL;
 
-	arc.ArchiveFloat( &m_fMinBurstTime );
-	arc.ArchiveFloat( &m_fMaxBurstTime );
-	arc.ArchiveFloat( &m_fMinBurstDelay );
-	arc.ArchiveFloat( &m_fMaxBurstDelay );
+    if (m_bFakeBullets) {
+        firetype[FIRE_PRIMARY] = FT_FAKEBULLET;
+    }
 
-	arc.ArchiveFloat( &m_fFireToggleTime );
-	arc.ArchiveInteger( &m_iFiring );
-	arc.ArchiveVector( &m_vUserViewAng );
-	arc.ArchiveSafePointer( &m_pUserCamera );
-
-	arc.ArchiveFloat( &m_fViewJitter );
-	arc.ArchiveFloat( &m_fCurrViewJitter );
-
-	arc.ArchiveVector( &m_Aim_offset );
-	arc.ArchiveSafePointer( &m_pViewModel );
-	arc.ArchiveBool( &m_bUsable );
-
-	m_UseThread.Archive( arc );
-	
-	arc.ArchiveBool( &m_bHadOwner );
-	arc.ArchiveBool( &m_bRestable );
-
-	if( arc.Loading() )
-	{
-		m_vUserLastCmdAng = vec_zero;
-	}
+    flags |= FL_THINK;
 }
 
-void TurretGun::SetTargetAngles
-	(
-	Vector& vTargAngles
-	)
+void TurretGun::ThinkIdle(void)
 {
-	float fDiff;
-	float fTurnAmount;
+    Vector  vDir, vNewAngles, vEnd;
+    trace_t trace;
 
-	if( vTargAngles[ 0 ] > 180.0f )
-	{
-		vTargAngles[ 0 ] -= 360.0f;
-	}
-	else if( vTargAngles[ 0 ] < -180.0f )
-	{
-		vTargAngles[ 0 ] += 360.0f;
-	}
+    if (!m_bRestable) {
+        return;
+    }
 
-	if( vTargAngles[ 0 ] < m_fPitchUpCap )
-	{
-		vTargAngles[ 0 ] = m_fPitchUpCap;
-	}
+    if (angles[0] > 180) {
+        angles[0] -= 360;
+    }
 
-	if( vTargAngles[ 0 ] > m_fPitchDownCap )
-	{
-		vTargAngles[ 0 ] = m_fPitchDownCap;
-	}
+    if (angles[0] <= m_fMaxIdlePitch) {
+        m_fIdlePitchSpeed = 0;
+        m_iIdleHitCount   = 0;
+        angles[0]         = m_fMaxIdlePitch;
+        setAngles(angles);
+        return;
+    }
 
-	if( owner && owner->IsSubclassOfPlayer() )
-	{
-		fTurnAmount = 180.0f;
-	}
-	else
-	{
-		fTurnAmount = level.frametime * m_fTurnSpeed;
-	}
+    if (m_iIdleHitCount >= 2) {
+        return;
+    }
 
-	fDiff = AngleSubtract( m_fPitchDownCap, angles[ 0 ] );
-	if( fTurnAmount <= fabs( fDiff ) )
-	{
-		if( fDiff <= 0.0f )
-		{
-			angles[ 0 ] = angles[ 0 ] - fTurnAmount;
-		}
-		else
-		{
-			angles[ 0 ] = fTurnAmount + angles[ 0 ];
-		}
-	}
-	else
-	{
-		angles[ 0 ] = vTargAngles[ 0 ];
-	}
+    m_fIdlePitchSpeed -= level.frametime * 300.0f;
 
-	fDiff = AngleSubtract( vTargAngles[ 1 ], m_fStartYaw );
-	if( fDiff <= m_fMaxYawOffset )
-	{
-		vTargAngles[ 1 ] = fDiff + m_fStartYaw;
+    vNewAngles = Vector(
+        Q_max(angles[0] + level.frametime * m_fIdlePitchSpeed, m_fMaxIdlePitch),
+        angles[1],
+        angles[2]
+    );
 
-		if( -( m_fMaxYawOffset ) > fDiff )
-		{
-			vTargAngles[ 1 ] = m_fStartYaw - m_fMaxYawOffset;
-		}
-	}
-	else
-	{
-		vTargAngles[ 1 ] = m_fMaxYawOffset + m_fStartYaw;
-	}
+    vNewAngles.AngleVectorsLeft(&vDir);
+    vEnd = origin + vDir * m_vIdleCheckOffset[0];
 
-	fDiff = AngleSubtract( vTargAngles[ 1 ], angles[ 1 ] );
+    trace = G_Trace(origin, vec_zero, vec_zero, vEnd, this, edict->clipmask, false, "TurretGun::Think");
 
-	if( fTurnAmount <= fabs( fDiff ) )
-	{
-		if( fDiff <= 0.0f )
-		{
-			angles[ 1 ] = angles[ 1 ] - fTurnAmount;
-		}
-		else
-		{
-			angles[ 1 ] = angles[ 1 ] + fTurnAmount;
-		}
-	}
-	else
-	{
-		angles[ 1 ] = vTargAngles[ 1 ];
-	}
+    if (trace.fraction == 1.0f) {
+        setAngles(vNewAngles);
+        m_iIdleHitCount = 0;
+        return;
+    }
 
-	setAngles( angles );
+    int iTry;
+    for (iTry = 3; iTry > 0; iTry--) {
+        vNewAngles[0] = angles[0] + level.frametime * m_fIdlePitchSpeed * iTry * 0.25f;
+        if (vNewAngles[0] < m_fMaxIdlePitch) {
+            continue;
+        }
 
-	if( fabs( fDiff ) < 2.0f )
-	{
-		Unregister( STRING_ONTARGET );
-	}
+        vNewAngles.AngleVectorsLeft(&vDir);
+        vEnd = origin + vDir * m_vIdleCheckOffset[0];
+
+        trace = G_Trace(origin, vec_zero, vec_zero, vEnd, this, edict->clipmask, false, "TurretGun::Think");
+
+        if (trace.fraction == 1) {
+            setAngles(vNewAngles);
+
+            m_iIdleHitCount = 0;
+            m_fIdlePitchSpeed *= 0.25f * iTry;
+            break;
+        }
+    }
+
+    if (!iTry) {
+        m_fIdlePitchSpeed = 0;
+
+        Entity *ent = G_GetEntity(trace.entityNum);
+
+        if (ent && ent == world) {
+            m_iIdleHitCount++;
+        } else {
+            m_iIdleHitCount = 0;
+        }
+    }
 }
 
-void TurretGun::ThinkActive
-	(
-	void
-	)
+void TurretGun::AI_SetTargetAngles(vec3_t vTargAngles, float speed)
 {
-	Vector vTarg;
-	Vector vTargAngles;
-	Vector vDelta;
-	Vector vAngles;
+    float fDiff;
+    float fPitchDiff, fYawDiff;
+    float fTurnYawSpeed;
+    float fTurnPitchSpeed;
 
-	if( ( owner ) && owner->IsSubclassOfPlayer() )
-	{
-		if( m_vUserViewAng[ 0 ] < m_fPitchUpCap )
-		{
-			m_vUserViewAng[ 0 ] = m_fPitchUpCap;
-		}
-		else if( m_vUserViewAng[ 0 ] > m_fPitchDownCap )
-		{
-			m_vUserViewAng[ 0 ] = m_fPitchDownCap;
-		}
+    if (vTargAngles[0] > 180.0f) {
+        vTargAngles[0] -= 360.0f;
+    } else if (vTargAngles[0] < -180.0f) {
+        vTargAngles[0] += 360.0f;
+    }
 
-		float fDiff = AngleSubtract( m_vUserViewAng[ 1 ], m_fStartYaw );
+    if (vTargAngles[0] < m_fPitchUpCap) {
+        vTargAngles[0] = m_fPitchUpCap;
+    } else if (vTargAngles[0] > m_fPitchDownCap) {
+        vTargAngles[0] = m_fPitchDownCap;
+    }
 
-		if( fDiff <= m_fMaxYawOffset )
-		{
-			m_vUserViewAng[ 1 ] = fDiff + m_fStartYaw;
+    fDiff = AngleSubtract(vTargAngles[1], m_fStartYaw);
+    if (fDiff > m_fMaxYawOffset) {
+        vTargAngles[1] = m_fStartYaw + m_fMaxYawOffset;
+    } else if (fDiff < -m_fMaxYawOffset) {
+        vTargAngles[1] = m_fStartYaw - m_fMaxYawOffset;
+    }
 
-			if( -( m_fMaxYawOffset ) > fDiff )
-			{
-				m_vUserViewAng[ 1 ] = m_fStartYaw - m_fMaxYawOffset;
-			}
-		}
-		else
-		{
-			m_vUserViewAng[ 1 ] = m_fMaxYawOffset + m_fStartYaw;
-		}
+    fYawDiff   = AngleSubtract(vTargAngles[1], angles[1]);
+    fPitchDiff = AngleSubtract(vTargAngles[0], angles[0]);
 
-		owner->SetViewAngles( m_vUserViewAng );
-		vTarg = owner->GunTarget( false ) - origin;
-		vTargAngles = vTarg.toAngles();
+    if (speed == 0) {
+        fTurnYawSpeed   = m_fTurnSpeed * level.frametime;
+        fTurnPitchSpeed = m_fAIPitchSpeed * level.frametime;
+    } else {
+        float pitchFrameSpeed, yawFrameSpeed;
 
-		SetTargetAngles( vTargAngles );
-	}
-	else if( aim_target )
-	{
-		Vector vNewOfs;
+        // pitch
+        pitchFrameSpeed = fabs(fPitchDiff) / speed;
+        if (pitchFrameSpeed > 720) {
+            pitchFrameSpeed = 720;
+        }
+        fTurnPitchSpeed = pitchFrameSpeed * level.frametime;
 
-		vDelta = aim_target->centroid - origin;
-		vNewOfs = vDelta + m_Aim_offset;
+        // yaw
+        yawFrameSpeed = fabs(fYawDiff) / speed;
+        if (yawFrameSpeed > 720) {
+            yawFrameSpeed = 720;
+        }
+        fTurnYawSpeed = yawFrameSpeed * level.frametime;
+    }
 
-		vectoangles( vDelta, vTargAngles );
-		SetTargetAngles( vTargAngles );
+    if (fabs(fPitchDiff) < fTurnPitchSpeed) {
+        angles[0] = vTargAngles[0];
+    } else if (fPitchDiff > 0) {
+        angles[0] += fTurnPitchSpeed;
+    } else {
+        angles[0] -= fTurnPitchSpeed;
+    }
 
-		if( owner )
-		{
-			Vector forward;
+    if (fabs(fYawDiff) < fTurnYawSpeed) {
+        angles[1] = vTargAngles[1];
+    } else if (fYawDiff > 0) {
+        angles[1] += fTurnYawSpeed;
+    } else {
+        angles[1] -= fTurnYawSpeed;
+    }
 
-			AngleVectorsLeft( angles, forward, NULL, NULL );
+    setAngles(angles);
 
-			origin = forward * vNewOfs.length();
-		}
-	}
-
-	if( m_iFiring )
-	{
-		if( m_fMaxBurstTime == 0 || ( owner != NULL && owner->client ) )
-		{
-			m_iFiring = 2;
-			if( ReadyToFire( FIRE_PRIMARY ) )
-			{
-				Fire( FIRE_PRIMARY );
-
-				if( owner->IsSubclassOfPlayer() )
-				{
-					m_fCurrViewJitter = m_fViewJitter;
-				}
-			}
-		}
-		else if( m_iFiring != 2 )
-		{
-			if( level.time > m_fFireToggleTime )
-			{
-				m_iFiring = 2;
-				m_fFireToggleTime = G_Random( m_fMaxBurstTime - m_fMinBurstTime ) + ( level.time + m_fMinBurstTime );
-			}
-		}
-		else if( ReadyToFire( FIRE_PRIMARY ) )
-		{
-			Fire( FIRE_PRIMARY );
-
-			if( owner->IsSubclassOfPlayer() )
-			{
-				m_fCurrViewJitter = m_fViewJitter;
-			}
-		}
-		else if( level.time > m_fFireToggleTime )
-		{
-			m_iFiring = 1;
-			m_fFireToggleTime = G_Random( m_fMaxBurstDelay - m_fMaxBurstDelay) + ( level.time + m_fMinBurstDelay );
-		}
-	}
-
-	if( owner && owner->IsSubclassOfPlayer() )
-	{
-		vAngles = m_vUserViewAng;
-
-		if( !m_pUserCamera ) {
-			m_pUserCamera = new Camera;
-		}
-
-		if( m_fCurrViewJitter > 0.0f )
-		{
-			float x = ( float )( rand() & 0x7FFF );
-			float y = ( float )( rand() & 0x7FFF );
-			float z = ( float )( rand() & 0x7FFF );
-
-			vAngles[ 0 ] += ( x * 0.00003f + x * 0.00003f - 1.0f ) * m_fCurrViewJitter;
-			vAngles[ 1 ] += ( y * 0.00003f + y * 0.00003f - 1.0f ) * m_fCurrViewJitter;
-			vAngles[ 2 ] += ( z * 0.00003f + z * 0.00003f - 1.0f ) * m_fCurrViewJitter;
-
-			m_fCurrViewJitter -= level.frametime * 6.0f;
-
-			if( m_fCurrViewJitter < 0.0f ) {
-				m_fCurrViewJitter = 0.0f;
-			}
-		}
-
-		m_pUserCamera->setOrigin( origin );
-		m_pUserCamera->setAngles( vAngles );
-		m_pUserCamera->SetPositionOffset( m_vViewOffset );
-
-		owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_ALLOWOFFSET;
-
-		Player *player = ( Player * )owner.Pointer();
-
-		if( !player->IsZoomed() )
-		{
-			player->ToggleZoom( 80 );
-		}
-	}
-
-	if( owner && owner->client )
-	{
-		Vector vPos;
-		Vector vEnd;
-		Vector vAng;
-		Vector vForward;
-		Vector vMins;
-		Vector vMaxs;
-		trace_t trace;
-
-		Vector( 0, angles[ 1 ], 0 ).AngleVectorsLeft( &vForward );
-
-		vPos = origin - vForward * m_fUserDistance;
-		vPos[ 2 ] -= 16.0f;
-
-		vEnd = vPos;
-		vEnd[ 2 ] -= 64.0f;
-
-		vMins = owner->mins;
-		vMaxs = owner->maxs;
-		vMaxs[ 2 ] = owner->mins[ 2 ] + 4.0f;
-
-		trace = G_Trace(
-			vPos,
-			vMins,
-			vMaxs,
-			vEnd,
-			owner,
-			MASK_PLAYERSOLID,
-			qtrue,
-			"TurretGun::ThinkActive 1"
-			);
-
-		vPos = trace.endpos;
-
-		trace = G_Trace(
-			vPos,
-			owner->mins,
-			owner->maxs,
-			vPos,
-			owner,
-			MASK_PLAYERSOLID,
-			qtrue,
-			"TurretGun::ThinkActive 2"
-			);
-
-		if( !trace.allsolid && !trace.startsolid )
-		{
-			owner->setOrigin( vPos );
-		}
-	}
+    if (fabs(fDiff) < 2) {
+        Unregister(STRING_ONTARGET);
+    }
 }
 
-void TurretGun::ThinkIdle
-	(
-	void
-	)
+void TurretGun::AI_SetDesiredTargetAngles(const vec3_t angles, float speed)
 {
-	Vector vDir, vNewAngles, vEnd;
-	trace_t trace;
-
-	if( !m_bRestable ) {
-		return;
-	}
-
-	if( angles[ 0 ] > 180.0f )
-	{
-		angles[ 0 ] -= 360.0f;
-	}
-
-	if( angles[ 0 ] < -80.0f )
-	{
-		m_fIdlePitchSpeed = 0;
-		m_iIdleHitCount = 0;
-		return;
-	}
-
-	if( m_iIdleHitCount > 1 )
-	{
-		return;
-	}
-
-	m_fIdlePitchSpeed -= level.frametime * 300.0f;
-
-	vNewAngles = Vector( angles[ 0 ] + level.frametime * m_fIdlePitchSpeed, angles[ 1 ], angles[ 2 ] );
-	vNewAngles.AngleVectorsLeft( &vDir );
-	vEnd = origin + vDir * m_vIdleCheckOffset[ 0 ];
-
-	trace = G_Trace(
-		origin,
-		vec_zero,
-		vec_zero,
-		vEnd,
-		this,
-		edict->clipmask,
-		false,
-		"TurretGun::Think" );
-
-	if( trace.fraction == 1.0f )
-	{
-		setAngles( vNewAngles );
-		m_iIdleHitCount = 0;
-		return;
-	}
-
-	int iTry;
-	for( iTry = 3; iTry > 0; iTry-- )
-	{
-		vNewAngles[ 0 ] = angles[ 0 ] + level.frametime * m_fIdlePitchSpeed * iTry * 0.25f;
-		vNewAngles.AngleVectorsLeft( &vDir );
-		vEnd = origin + vDir * m_vIdleCheckOffset[ 0 ];
-
-		trace = G_Trace(
-			origin,
-			vec_zero,
-			vec_zero,
-			vEnd,
-			this,
-			edict->clipmask,
-			false,
-			"TurretGun::Think" );
-
-		if( trace.fraction == 1.0f )
-		{
-			setAngles( vNewAngles );
-
-			m_iIdleHitCount = 0;
-			m_fIdlePitchSpeed *= 0.25f * iTry;
-			break;
-		}
-	}
-
-	if( !iTry )
-	{
-		m_fIdlePitchSpeed = 0;
-
-		Entity *ent = G_GetEntity( trace.entityNum );
-
-		if( ent && ent == world )
-		{
-			m_iIdleHitCount++;
-		}
-		else
-		{
-			m_iIdleHitCount = 0;
-		}
-	}
+    VectorCopy(angles, m_vDesiredTargetAngles);
+    m_fAIDesiredTargetSpeed = speed;
 }
 
-void TurretGun::P_ThinkActive()
+void TurretGun::P_SetTargetAngles(Vector& vTargAngles)
 {
-	// FIXME: unimplemented
+    float fDiff;
+
+    if (vTargAngles[0] > 180.0f) {
+        vTargAngles[0] -= 360.0f;
+    } else if (vTargAngles[0] < -180.0f) {
+        vTargAngles[0] += 360.0f;
+    }
+
+    if (vTargAngles[0] < m_fPitchUpCap) {
+        vTargAngles[0] = m_fPitchUpCap;
+    } else if (vTargAngles[0] > m_fPitchDownCap) {
+        vTargAngles[0] = m_fPitchDownCap;
+    }
+
+    fDiff = AngleSubtract(m_fPitchDownCap, angles[0]);
+    if (fabs(fDiff) >= 180) {
+        if (fDiff > 0.0f) {
+            angles[0] += 180;
+        } else {
+            angles[0] -= 180;
+        }
+    } else {
+        angles[0] = vTargAngles[0];
+    }
+
+    fDiff = AngleSubtract(vTargAngles[1], m_fStartYaw);
+    if (fDiff > m_fMaxYawOffset) {
+        fDiff = m_fMaxYawOffset;
+    } else if (fDiff < -m_fMaxYawOffset) {
+        fDiff = -m_fMaxYawOffset;
+    }
+    vTargAngles[1] = m_fStartYaw + fDiff;
+
+    fDiff = AngleSubtract(vTargAngles[1], angles[1]);
+
+    if (fabs(fDiff) >= 180) {
+        if (fDiff > 0.0f) {
+            angles[1] += 180;
+        } else {
+            angles[1] -= 180;
+        }
+    } else {
+        angles[1] = vTargAngles[1];
+    }
+
+    setAngles(angles);
 }
 
-void TurretGun::Think
-	(
-	void
-	)
+bool TurretGun::AI_CanTarget(const vec3_t pos)
 {
-	if (owner || (!m_bHadOwner && aim_target))
-	{
-		ThinkActive();
-	}
-	else
-	{
-		ThinkIdle();
-	}
+    vec3_t delta;
+    Vector vAngles;
+    float  ang;
+    float  yawCap;
+
+    VectorSubtract(pos, origin, delta);
+    vectoangles(delta, vAngles);
+
+    ang = AngleSubtract(vAngles[1], m_fStartYaw);
+
+    if (vAngles[0] > 180) {
+        vAngles[0] -= 360;
+    } else if (vAngles[0] < -180) {
+        vAngles[0] += 360;
+    }
+
+    if (vAngles[0] < m_fPitchUpCap || vAngles[0] > m_fPitchDownCap) {
+        return false;
+    }
+
+    yawCap = AngleSubtract(vAngles[1], m_fStartYaw);
+    if (yawCap > m_fMaxYawOffset) {
+        return false;
+    } else if (yawCap < -m_fMaxYawOffset) {
+        return false;
+    }
+
+    return true;
 }
 
-void TurretGun::P_UserAim(usercmd_t* cmd)
+void TurretGun::P_ThinkActive(void)
 {
-	// FIXME: unimplemented
+    Vector vTarg;
+    Vector vTargAngles;
+    Vector vDelta;
+    Vector vAngles;
+
+    if ((owner) && owner->IsSubclassOfPlayer()) {
+        if (m_vUserViewAng[0] < m_fPitchUpCap) {
+            m_vUserViewAng[0] = m_fPitchUpCap;
+        } else if (m_vUserViewAng[0] > m_fPitchDownCap) {
+            m_vUserViewAng[0] = m_fPitchDownCap;
+        }
+
+        float fDiff = AngleSubtract(m_vUserViewAng[1], m_fStartYaw);
+
+        if (fDiff <= m_fMaxYawOffset) {
+            m_vUserViewAng[1] = fDiff + m_fStartYaw;
+
+            if (-(m_fMaxYawOffset) > fDiff) {
+                m_vUserViewAng[1] = m_fStartYaw - m_fMaxYawOffset;
+            }
+        } else {
+            m_vUserViewAng[1] = m_fMaxYawOffset + m_fStartYaw;
+        }
+
+        owner->SetViewAngles(m_vUserViewAng);
+        vTarg       = owner->GunTarget(false) - origin;
+        vTargAngles = vTarg.toAngles();
+
+        P_SetTargetAngles(vTargAngles);
+    } else if (aim_target) {
+        Vector vNewOfs;
+
+        vDelta  = aim_target->centroid - origin;
+        vNewOfs = vDelta + m_Aim_offset;
+
+        vectoangles(vDelta, vTargAngles);
+        P_SetTargetAngles(vTargAngles);
+
+        if (owner) {
+            Vector forward;
+
+            AngleVectorsLeft(angles, forward, NULL, NULL);
+
+            origin = forward * vNewOfs.length();
+        }
+    }
+
+    if (m_iFiring) {
+        if (m_fMaxBurstTime == 0 || (owner != NULL && owner->client)) {
+            m_iFiring = 2;
+            if (ReadyToFire(FIRE_PRIMARY)) {
+                Fire(FIRE_PRIMARY);
+
+                if (owner->IsSubclassOfPlayer()) {
+                    m_fCurrViewJitter = m_fViewJitter;
+                }
+            }
+        } else if (m_iFiring != 2) {
+            if (level.time > m_fFireToggleTime) {
+                m_iFiring         = 2;
+                m_fFireToggleTime = G_Random(m_fMaxBurstTime - m_fMinBurstTime) + (level.time + m_fMinBurstTime);
+            }
+        } else if (ReadyToFire(FIRE_PRIMARY)) {
+            Fire(FIRE_PRIMARY);
+
+            if (owner->IsSubclassOfPlayer()) {
+                m_fCurrViewJitter = m_fViewJitter;
+            }
+        } else if (level.time > m_fFireToggleTime) {
+            m_iFiring         = 1;
+            m_fFireToggleTime = G_Random(m_fMaxBurstDelay - m_fMaxBurstDelay) + (level.time + m_fMinBurstDelay);
+        }
+    }
+
+    if (owner && owner->IsSubclassOfPlayer()) {
+        vAngles = m_vUserViewAng;
+
+        if (!m_pUserCamera) {
+            m_pUserCamera = new Camera;
+        }
+
+        if (m_fCurrViewJitter > 0.0f) {
+            float x = (float)(rand() & 0x7FFF);
+            float y = (float)(rand() & 0x7FFF);
+            float z = (float)(rand() & 0x7FFF);
+
+            vAngles[0] += (x * 0.00003f + x * 0.00003f - 1.0f) * m_fCurrViewJitter;
+            vAngles[1] += (y * 0.00003f + y * 0.00003f - 1.0f) * m_fCurrViewJitter;
+            vAngles[2] += (z * 0.00003f + z * 0.00003f - 1.0f) * m_fCurrViewJitter;
+
+            m_fCurrViewJitter -= level.frametime * 6.0f;
+
+            if (m_fCurrViewJitter < 0.0f) {
+                m_fCurrViewJitter = 0.0f;
+            }
+        }
+
+        m_pUserCamera->setOrigin(origin);
+        m_pUserCamera->setAngles(vAngles);
+        m_pUserCamera->SetPositionOffset(m_vViewOffset);
+
+        owner->client->ps.camera_flags |= CF_CAMERA_ANGLES_TURRETMODE;
+
+        Player *player = (Player *)owner.Pointer();
+
+        if (!player->IsZoomed()) {
+            player->ToggleZoom(80);
+        }
+    }
+
+    if (owner && owner->client) {
+        Vector  vPos;
+        Vector  vEnd;
+        Vector  vAng;
+        Vector  vForward;
+        Vector  vMins;
+        Vector  vMaxs;
+        trace_t trace;
+
+        Vector(0, angles[1], 0).AngleVectorsLeft(&vForward);
+
+        vPos = origin - vForward * m_fUserDistance;
+        vPos[2] -= 16.0f;
+
+        vEnd = vPos;
+        vEnd[2] -= 64.0f;
+
+        vMins    = owner->mins;
+        vMaxs    = owner->maxs;
+        vMaxs[2] = owner->mins[2] + 4.0f;
+
+        trace = G_Trace(vPos, vMins, vMaxs, vEnd, owner, MASK_PLAYERSOLID, qtrue, "TurretGun::ThinkActive 1");
+
+        vPos = trace.endpos;
+
+        trace =
+            G_Trace(vPos, owner->mins, owner->maxs, vPos, owner, MASK_PLAYERSOLID, qtrue, "TurretGun::ThinkActive 2");
+
+        if (!trace.allsolid && !trace.startsolid) {
+            owner->setOrigin(vPos);
+        }
+    }
 }
 
-qboolean TurretGun::UserAim
-	(
-	usercmd_s *ucmd
-	)
+void TurretGun::AI_DoTargetNone()
 {
-	Vector vNewCmdAng;
+    vec3_t desiredAngles;
+    vec3_t delta;
 
-	if( owner == NULL )
-	{
-		return qfalse;
-	}
+    if (!aim_target) {
+        return;
+    }
 
-	vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
-
-	if( vNewCmdAng[ 0 ] || vNewCmdAng[ 1 ] || vNewCmdAng[ 2 ] )
-	{
-		m_vUserViewAng[ 0 ] += AngleSubtract( vNewCmdAng[ 0 ], m_vUserLastCmdAng[ 0 ] );
-		m_vUserViewAng[ 1 ] += AngleSubtract( vNewCmdAng[ 1 ], m_vUserLastCmdAng[ 1 ] );
-		m_vUserViewAng[ 2 ] += AngleSubtract( vNewCmdAng[ 2 ], m_vUserLastCmdAng[ 2 ] );
-	}
-
-	m_vUserLastCmdAng = vNewCmdAng;
-
-	if( ( ucmd->buttons & BUTTON_ATTACKLEFT ) || ( ucmd->buttons & BUTTON_ATTACKRIGHT ) )
-	{
-		if( !m_iFiring ) {
-			m_iFiring = 1;
-		}
-	}
-	else
-	{
-		m_iFiring = 0;
-	}
-
-	flags |= FL_THINK;
-
-	return qtrue;
+    VectorSubtract(aim_target->centroid, origin, delta);
+    VectorAdd(delta, m_Aim_offset, delta);
+    vectoangles(delta, desiredAngles);
+    AI_SetTargetAngles(desiredAngles, 0);
 }
 
-void TurretGun::PlaceTurret
-	(
-	Event *ev
-	)
+void TurretGun::AI_MoveToDefaultPosition()
 {
-	// Don't make the turret solid
-	setSolidType( SOLID_NOT );
+    vec3_t desiredAngles;
+    // get the first client number
+    Entity *pEnt = G_GetEntity(0);
+    if (pEnt) {
+        vec3_t delta;
 
-	// The turret shouldn't move
-	setMoveType( MOVETYPE_NONE );
+        VectorSubtract(pEnt->centroid, origin, delta);
+        vectoangles(delta, desiredAngles);
+    } else {
+        desiredAngles[0] = 0;
+    }
 
-	showModel();
-
-	groundentity = NULL;
-	m_fStartYaw = angles[ 1 ];
-
-	if( m_bFakeBullets ) {
-		firetype[ FIRE_PRIMARY ] = FT_FAKEBULLET;
-	}
-
-	flags |= FL_THINK;
+    desiredAngles[1] = m_fStartYaw;
+    desiredAngles[2] = 0;
+    AI_SetDesiredTargetAngles(desiredAngles, 0);
 }
 
-void TurretGun::TurretBeginUsed
-	(
-	Sentient *pEnt
-	)
+void TurretGun::AI_DoTargetAutoDefault()
 {
-	owner = pEnt;
-
-	edict->r.ownerNum = pEnt->entnum;
-	m_bHadOwner = true;
-
-	Sound( sPickupSound );
-
-	if( m_vUserViewAng[ 0 ] > 180.0f ) {
-		m_vUserViewAng[ 0 ] -= 360.0f;
-	}
-
-	m_vUserLastCmdAng = vec_zero;
-
-	if( owner->IsSubclassOfPlayer() )
-	{
-		Player *player = ( Player * )owner.Pointer();
-
-		player->EnterTurret( this );
-
-		if( !m_pUserCamera ) {
-			m_pUserCamera = new Camera;
-		}
-
-		player->SetCamera( m_pUserCamera, 0.0f );
-	}
-
-	current_attachToTag = "";
-	ForceIdle();
-	CreateViewModel();
+    m_iFiring = 0;
+    if (owner->m_Enemy) {
+        Actor *actor = static_cast<Actor *>(owner.Pointer());
+        if (actor->CanSeeEnemy(200)) {
+            AI_StartTrack();
+        } else {
+            AI_MoveToDefaultPosition();
+        }
+    }
 }
 
-void TurretGun::P_TurretBeginUsed(Player* pEnt)
+void TurretGun::AI_StartDefault()
 {
-	// FIXME: unimplemented
+    m_iFiring  = 0;
+    m_iAIState = 0;
+}
+
+void TurretGun::AI_StartSuppress()
+{
+    m_iAIStartSuppressTime = level.inttime;
+    m_iAIState             = 2;
+    VectorCopy(m_vAIDesiredTargetPosition, m_vAITargetPosition);
+    VectorClear(m_vAICurrentTargetPosition);
+    VectorClear(m_vAITargetSpeed);
+    m_iAINextSuppressTime = 0;
+}
+
+void TurretGun::AI_StartSuppressWait()
+{
+    m_iAIStartSuppressTime = level.inttime;
+    m_iAIState             = 3;
+}
+
+void TurretGun::AI_StartTrack()
+{
+    if (m_iAIState == 0) {
+        m_iAILastTrackTime = level.inttime;
+    }
+    m_iAIState = 1;
+}
+
+void TurretGun::AI_DoTargetAutoTrack()
+{
+    Actor *actor;
+    Vector end;
+    Vector delta;
+    vec3_t desiredAngles;
+    float  turnSpeed;
+
+    if (!owner->m_Enemy) {
+        AI_StartDefault();
+        return;
+    }
+
+    if (owner->m_Enemy != m_pAIEnemy) {
+        if (m_pAIEnemy) {
+            m_iAILastTrackTime = level.inttime;
+        }
+        m_pAIEnemy = owner->m_Enemy;
+    }
+
+    actor = static_cast<Actor *>(owner.Pointer());
+    if (!actor->CanSeeEnemy(0)) {
+        AI_StartSuppress();
+        return;
+    }
+
+    if (m_iFiring == 0) {
+        m_iFiring = 1;
+    }
+
+    end = owner->m_Enemy->centroid;
+    if (!G_SightTrace(
+            m_vMuzzlePosition,
+            vec_zero,
+            vec_zero,
+            end,
+            this,
+            owner->m_Enemy,
+            MASK_AITURRET,
+            qfalse,
+            "TurretGun::AI_DoTargetAutoTrack"
+        )) {
+        end = owner->m_Enemy->EyePosition();
+    }
+
+    VectorCopy(end, m_vAIDesiredTargetPosition);
+    delta = m_vAIDesiredTargetPosition - origin;
+    vectoangles(delta, desiredAngles);
+
+    turnSpeed = m_fAIConvergeTime - (level.inttime - m_iAILastTrackTime) / 1000;
+    if (turnSpeed < 0) {
+        turnSpeed = 0;
+    }
+
+    AI_SetDesiredTargetAngles(desiredAngles, turnSpeed);
+}
+
+void TurretGun::AI_DoSuppressionAiming()
+{
+    float  suppressRatio;
+    float  suppressTimeRatio;
+    float  height;
+    float  length;
+    vec2_t dir;
+    vec3_t deltaPos;
+    vec2_t speedxy;
+    vec3_t desiredAngles;
+
+    suppressRatio = m_fAISuppressHeight / m_fAISuppressWidth;
+
+    if (level.inttime >= m_iAINextSuppressTime) {
+        suppressTimeRatio = this->m_fAISuppressWidth / 250.0;
+        dir[0]            = m_vAIDesiredTargetPosition[1] - origin[1];
+        dir[1]            = m_vAIDesiredTargetPosition[0] - origin[0];
+        VectorNormalize2D(dir);
+
+        m_iAINextSuppressTime = level.inttime + (((random() + 1) / 2 * suppressTimeRatio) * 1000);
+
+        VectorSubtract(m_vAITargetPosition, m_vAIDesiredTargetPosition, deltaPos);
+
+        //
+        // calculate the speed at which the AI should turn
+        //
+        speedxy[0] = DotProduct2D(deltaPos, dir);
+        speedxy[1] = deltaPos[2];
+        VectorNormalize2D(speedxy);
+
+        speedxy[0] += crandom() / 2.0;
+        speedxy[1] += crandom() / 2.0;
+        VectorNormalize2D(speedxy);
+
+        speedxy[0] = 250 / (suppressTimeRatio * 0.5) * speedxy[0];
+        speedxy[1] = 250 / (suppressTimeRatio * 0.5) * speedxy[1];
+        speedxy[1] *= suppressRatio;
+        m_vAITargetSpeed[0] = speedxy[0] * dir[0];
+        m_vAITargetSpeed[1] = speedxy[0] * dir[1];
+        m_vAITargetSpeed[1] = speedxy[1];
+    }
+
+    VectorMA(m_vAICurrentTargetPosition, level.frametime, m_vAITargetSpeed, m_vAICurrentTargetPosition);
+
+    height = suppressRatio * 250;
+    if (m_vAICurrentTargetPosition[2] > height) {
+        m_vAICurrentTargetPosition[2] = height;
+    } else if (m_vAICurrentTargetPosition[2] < -height) {
+        m_vAICurrentTargetPosition[2] = -height;
+    }
+
+    length = VectorLength2D(m_vAICurrentTargetPosition);
+    if (length > 250) {
+        VectorScale2D(m_vAICurrentTargetPosition, 250 / length, m_vAICurrentTargetPosition);
+    }
+
+    VectorSubtract(m_vAIDesiredTargetPosition, m_vAITargetPosition, deltaPos);
+    VectorMA(deltaPos, level.frametime, m_vAICurrentTargetPosition, deltaPos);
+
+    if (deltaPos[2] > m_fAISuppressHeight) {
+        deltaPos[2]           = m_fAISuppressHeight;
+        m_iAINextSuppressTime = 0;
+    } else if (deltaPos[2] < -m_fAISuppressHeight) {
+        deltaPos[2]           = -m_fAISuppressHeight;
+        m_iAINextSuppressTime = 0;
+    }
+
+    length = VectorLength2D(deltaPos);
+    if (length > m_fAISuppressWidth) {
+        VectorScale(deltaPos, m_fAISuppressWidth / length, deltaPos);
+        m_iAINextSuppressTime = 0;
+    }
+
+    // calculate the target angles
+    VectorAdd(m_vAITargetPosition, deltaPos, m_vAIDesiredTargetPosition);
+    VectorSubtract(m_vAIDesiredTargetPosition, origin, deltaPos);
+
+    // set the desired angles
+    vectoangles(deltaPos, desiredAngles);
+    AI_SetDesiredTargetAngles(desiredAngles, 0);
+}
+
+void TurretGun::AI_DoTargetAutoSuppress()
+{
+    Actor *actor;
+
+    if (!owner->m_Enemy) {
+        AI_StartDefault();
+        return;
+    }
+
+    actor = static_cast<Actor *>(owner.Pointer());
+    if (actor->CanSeeEnemy(200)) {
+        AI_StartTrack();
+        return;
+    }
+
+    if (level.inttime >= m_iAISuppressTime + m_iAIStartSuppressTime) {
+        AI_StartSuppressWait();
+        return;
+    }
+
+    if (m_iFiring == 0) {
+        m_iFiring = 1;
+    }
+    AI_DoSuppressionAiming();
+}
+
+void TurretGun::AI_DoTargetAutoSuppressWait()
+{
+    m_iFiring = 0;
+    Actor *actor;
+
+    if (!owner->m_Enemy) {
+        AI_StartDefault();
+        return;
+    }
+
+    actor = static_cast<Actor *>(owner.Pointer());
+    if (actor->CanSeeEnemy(200)) {
+        AI_StartTrack();
+        return;
+    }
+
+    if (level.inttime >= m_iAISuppressWaitTime + m_iAIStartSuppressTime) {
+        AI_StartDefault();
+        return;
+    }
+
+    AI_DoSuppressionAiming();
+}
+
+void TurretGun::AI_DoTargetAuto()
+{
+    if (!owner) {
+        return;
+    }
+
+    GetMuzzlePosition(m_vMuzzlePosition, NULL, NULL, NULL, NULL);
+
+    switch (m_iAIState) {
+    case TURRETAISTATE_DEFAULT:
+        AI_DoTargetAutoDefault();
+        break;
+    case TURRETAISTATE_TRACK:
+        AI_DoTargetAutoTrack();
+        break;
+    case TURRETAISTATE_SUPPRESS:
+        AI_DoTargetAutoSuppress();
+        break;
+    case TURRETAISTATE_SUPPRESS_WAIT:
+        AI_DoTargetAutoSuppressWait();
+        break;
+    default:
+        break;
+    }
+
+    AI_SetTargetAngles(m_vDesiredTargetAngles, m_fAIDesiredTargetSpeed);
+}
+
+void TurretGun::AI_DoAiming()
+{
+    switch (m_iTargetType) {
+    case 0:
+        AI_DoTargetNone();
+        break;
+    case 1:
+        AI_DoTargetAuto();
+        break;
+    default:
+        break;
+    }
+}
+
+void TurretGun::AI_DoFiring()
+{
+    float minBurstTime, maxBurstTime;
+    float minBurstDelay, maxBurstDelay;
+
+    if (g_target_game == target_game_e::TG_MOH) {
+        //
+        // Removed in 2.0
+        //  The fire delay is always constant on 1.11 and below
+        //
+        if (m_iFiring == 1) {
+            m_iFiring = 4;
+        }
+
+        if (IsFiring() && ReadyToFire(FIRE_PRIMARY)) {
+            Fire(FIRE_PRIMARY);
+        }
+
+        return;
+    }
+
+    minBurstTime = m_fMinBurstTime;
+    maxBurstTime = m_fMaxBurstTime;
+    minBurstDelay = m_fMinBurstDelay;
+    maxBurstDelay = m_fMaxBurstDelay;
+
+    if (!maxBurstTime) {
+        // Added in OPM
+        //  default values if not set
+        maxBurstTime = minBurstTime = 0.001f;
+        maxBurstDelay = minBurstDelay = fire_delay[FIRE_PRIMARY] / 10.f;
+    }
+
+    if (m_iFiring == 1) {
+        if (m_fMaxBurstTime > 0) {
+            if (m_fFireToggleTime < level.time) {
+                m_iFiring         = 4;
+                m_fFireToggleTime = level.time + m_fMinBurstTime + (m_fMaxBurstTime - m_fMinBurstTime) * random();
+            }
+        } else {
+            m_iFiring = 4;
+        }
+    } else if (m_iFiring == 4) {
+        Fire(FIRE_PRIMARY);
+
+        if (m_fMaxBurstTime > 0) {
+            if (m_fFireToggleTime < level.time) {
+                m_iFiring         = 1;
+                m_fFireToggleTime = level.time + m_fMinBurstDelay + (m_fMaxBurstDelay - m_fMinBurstDelay) * random();
+            }
+        }
+    }
+}
+
+void TurretGun::AI_ThinkActive()
+{
+    if (!g_ai->integer) {
+        return;
+    }
+
+    AI_DoAiming();
+    AI_DoFiring();
+}
+
+void TurretGun::Think(void)
+{
+    if (!owner && (m_bHadOwner || !aim_target)) {
+        ThinkIdle();
+    } else if (owner && owner->IsSubclassOfPlayer()) {
+        P_ThinkActive();
+    } else {
+        AI_ThinkActive();
+    }
+}
+
+void TurretGun::P_UserAim(usercmd_t *ucmd)
+{
+    Vector vNewCmdAng;
+
+    vNewCmdAng = Vector(SHORT2ANGLE(ucmd->angles[0]), SHORT2ANGLE(ucmd->angles[1]), SHORT2ANGLE(ucmd->angles[2]));
+
+    if (m_vUserLastCmdAng[0] || m_vUserLastCmdAng[1] || m_vUserLastCmdAng[2]) {
+        m_vUserViewAng[0] += AngleSubtract(vNewCmdAng[0], m_vUserLastCmdAng[0]);
+        m_vUserViewAng[1] += AngleSubtract(vNewCmdAng[1], m_vUserLastCmdAng[1]);
+        m_vUserViewAng[2] += AngleSubtract(vNewCmdAng[2], m_vUserLastCmdAng[2]);
+    }
+
+    m_vUserLastCmdAng = vNewCmdAng;
+
+    if (ucmd->buttons & BUTTON_ATTACKLEFT) {
+        if (m_iFiring == 0) {
+            m_iFiring = 1;
+        }
+    } else {
+        m_iFiring = 0;
+    }
+
+    flags |= FL_THINK;
+}
+
+qboolean TurretGun::UserAim(usercmd_t *ucmd)
+{
+    P_UserAim(ucmd);
+    return qtrue;
+}
+
+void TurretGun::P_SetViewangles(Event *ev)
+{
+    m_vUserViewAng = ev->GetVector(1);
+}
+
+void TurretGun::P_SetViewAnglesForTurret(Event *ev)
+{
+    m_vUserViewAng = ev->GetVector(1);
+}
+
+void TurretGun::P_GetViewangles(Event *ev)
+{
+    ev->AddVector(m_vUserViewAng);
+}
+
+void TurretGun::AI_TurretBeginUsed(Sentient *pEnt)
+{
+    owner = pEnt;
+
+    edict->r.ownerNum = pEnt->entnum;
+    m_bHadOwner       = true;
+
+    Sound(sPickupSound);
+
+    current_attachToTag = "";
+    ForceIdle();
+}
+
+void TurretGun::P_TurretBeginUsed(Player *pEnt)
+{
+    Player *player;
+
+    if (!pTurretCameras) {
+        pTurretCameras = gi.Cvar_Get("g_turretcameras", "1", 0);
+    }
+
+    owner = pEnt;
+
+    edict->r.ownerNum = pEnt->entnum;
+    m_bHadOwner       = true;
+
+    Sound(sPickupSound);
+
+    if (m_vUserViewAng[0] > 180.0f) {
+        m_vUserViewAng[0] -= 360.0f;
+    }
+
+    m_vUserLastCmdAng = vec_zero;
+
+    player = static_cast<Player *>(owner.Pointer());
+    player->EnterTurret(this);
+
+    if (!m_pUserCamera) {
+        m_pUserCamera = new Camera;
+    }
+
+    m_pUserCamera->setOrigin(origin);
+    m_pUserCamera->setAngles(angles);
+
+    if (pTurretCameras->integer) {
+        player->SetCamera(m_pUserCamera, 0.5f);
+    }
+
+    current_attachToTag = "";
+    ForceIdle();
+    P_CreateViewModel();
+}
+
+void TurretGun::TurretBeginUsed(Sentient *pEnt)
+{
+    AI_TurretBeginUsed(pEnt);
+}
+
+void TurretGun::AI_TurretEndUsed()
+{
+    owner             = NULL;
+    edict->r.ownerNum = ENTITYNUM_NONE;
+
+    m_fIdlePitchSpeed = 0;
+    m_iIdleHitCount   = 0;
+    m_iFiring         = 0;
+}
+
+void TurretGun::RemoveUserCamera()
+{
+    if (!m_pUserCamera) {
+        return;
+    }
+
+    if (owner && owner->IsSubclassOfPlayer()) {
+        Player *player = static_cast<Player *>(owner.Pointer());
+
+        player->SetCamera(NULL, 1.0f);
+        player->ZoomOff();
+        player->client->ps.camera_flags &= ~CF_CAMERA_ANGLES_TURRETMODE;
+    }
+
+    m_pUserCamera->PostEvent(EV_Remove, 0);
+    m_pUserCamera = NULL;
 }
 
 void TurretGun::P_TurretEndUsed()
 {
-	// FIXME: unimplemented
+    Player *player = (Player *)owner.Pointer();
+    float   yawCap;
+
+    if (m_pUserCamera) {
+        player->SetCamera(NULL, 1.0f);
+        player->ZoomOff();
+        player->client->ps.camera_flags &= ~CF_CAMERA_ANGLES_TURRETMODE;
+    }
+
+    player->ExitTurret();
+    P_DeleteViewModel();
+
+    owner             = NULL;
+    edict->r.ownerNum = ENTITYNUM_NONE;
+
+    m_fIdlePitchSpeed = 0;
+    m_iIdleHitCount   = 0;
+    m_iFiring         = 0;
+
+    yawCap = AngleSubtract(angles[1], m_fStartYaw);
+    if (yawCap > m_fMaxIdleYaw) {
+        yawCap = m_fMaxIdleYaw;
+    } else if (yawCap < -m_fMaxIdleYaw) {
+        yawCap = -m_fMaxIdleYaw;
+    }
+
+    angles[1] = m_fStartYaw + yawCap;
+    setAngles(angles);
 }
 
-void TurretGun::TurretEndUsed
-	(
-	void
-	)
+void TurretGun::TurretEndUsed(void)
 {
-	if( owner->IsSubclassOfPlayer() )
-	{
-		Player *player = ( Player * )owner.Pointer();
-
-		if( m_pUserCamera )
-		{
-			player->SetCamera( NULL, 1.0f );
-			player->ZoomOff();
-			player->client->ps.camera_flags &= ~CF_CAMERA_ANGLES_TURRETMODE;
-
-			m_pUserCamera->PostEvent( EV_Remove, 0 );
-			m_pUserCamera = NULL;
-		}
-
-		player->ExitTurret();
-		DeleteViewModel();
-	}
-
-	owner = NULL;
-	edict->r.ownerNum = ENTITYNUM_NONE;
-
-	m_fIdlePitchSpeed = 0;
-	m_iIdleHitCount = 0;
-	m_iFiring = 0;
+    AI_TurretEndUsed();
 }
 
-void TurretGun::P_TurretUsed(Player* player)
+void TurretGun::P_TurretUsed(Player *player)
 {
-	// FIXME: unimplemented
+    if (player == owner) {
+        if ((!m_bPlayerUsable || !m_bUsable) && owner->health > 0.0f) {
+            return;
+        }
+    }
+
+    if (owner) {
+        if (owner == player) {
+            P_TurretEndUsed();
+            m_iFiring = 0;
+        }
+    } else {
+        m_vUserViewAng = player->GetViewAngles();
+
+        if (fabs(AngleSubtract(m_vUserViewAng[1], angles[1])) <= m_fMaxUseAngle) {
+            if (player->charge_start_time) {
+                return;
+            }
+
+            P_TurretBeginUsed(player);
+
+            flags &= ~FL_THINK;
+            m_iFiring = 0;
+            m_UseThread.Execute(this);
+        }
+    }
 }
 
-void TurretGun::TurretUsed
-	(
-	Sentient *pEnt
-	)
+void TurretGun::TurretUsed(Sentient *pEnt)
 {
-	if( ( pEnt->IsSubclassOfPlayer() ) && ( pEnt == owner ) )
-	{
-		if( ( !m_bPlayerUsable || !m_bUsable ) &&
-			owner->health > 0.0f )
-		{
-			return;
-		}
-	}
-
-	if( owner )
-	{
-		if( owner == pEnt )
-		{
-			TurretEndUsed();
-			m_iFiring = 0;
-		}
-	}
-	else
-	{
-		m_vUserViewAng = pEnt->GetViewAngles();
-
-		if( fabs( AngleSubtract( m_vUserViewAng[ 1 ], angles[ 1 ] ) ) <= 80.0f )
-		{
-			TurretBeginUsed( pEnt );
-
-			flags &= ~FL_THINK;
-			m_iFiring = 0;
-
-			if( pEnt->IsSubclassOfPlayer() )
-			{
-				m_UseThread.Execute( this );
-			}
-		}
-	}
+    P_TurretUsed(static_cast<Player *>(pEnt));
 }
 
-void TurretGun::SetAimTarget
-	(
-	Entity *ent
-	)
+void TurretGun::TurretUsed(Event *ev)
 {
-	aim_target = ent;
+    Entity *pEnt = ev->GetEntity(1);
+
+    if (!pEnt || !pEnt->IsSubclassOfPlayer()) {
+        ScriptError("Bad entity trying to use turret");
+        return;
+    }
+
+    if (m_bUsable && m_bPlayerUsable) {
+        // Make the sentient use the turret
+        P_TurretUsed(static_cast<Player *>(pEnt));
+    }
 }
 
-void TurretGun::SetAimOffset
-	(
-	const Vector& offset
-	)
+void TurretGun::P_SetPlayerUsable(Event *ev)
 {
-	m_Aim_offset = offset;
+    if (ev->GetInteger(1)) {
+        m_bPlayerUsable = true;
+    } else {
+        m_bPlayerUsable = false;
+    }
 }
 
-void TurretGun::ClearAimTarget
-	(
-	void
-	)
+void TurretGun::EventSetUsable(Event *ev)
 {
-	aim_target = NULL;
-
-	// Clear idle values
-	m_fIdlePitchSpeed = 0;
-	m_iIdleHitCount = 0;
+    if (ev->GetInteger(1)) {
+        m_bUsable   = true;
+        m_bRestable = true;
+    } else {
+        m_bUsable   = false;
+        m_bRestable = false;
+    }
 }
 
-void TurretGun::StartFiring
-	(
-	void
-	)
+void TurretGun::P_SetViewOffset(Event *ev)
 {
-	m_iFiring = 1;
+    m_vViewOffset = ev->GetVector(1);
 }
 
-void TurretGun::StopFiring
-	(
-	void
-	)
+void TurretGun::EventMaxIdlePitch(Event *ev)
 {
-	m_iFiring = 0;
+    m_fMaxIdlePitch = ev->GetFloat(1);
 }
 
-bool TurretGun::IsFiring
-	(
-	void
-	)
+void TurretGun::EventMaxIdleYaw(Event *ev)
 {
-	return m_iFiring == 2;
+    m_fMaxIdleYaw = ev->GetFloat(1);
 }
 
-void TurretGun::CalcFiringViewJitter
-	(
-	void
-	)
+void TurretGun::SetIdleCheckOffset(Event *ev)
 {
-	if( owner && owner->IsSubclassOfPlayer() )
-	{
-		m_fCurrViewJitter = m_fViewJitter;
-	}
+    m_vIdleCheckOffset = ev->GetVector(1);
 }
 
-void TurretGun::ApplyFiringViewJitter
-	(
-	Vector& vAng
-	)
+void TurretGun::AI_EventSetAimTarget(Event *ev)
 {
+    aim_target = ev->GetEntity(1);
 }
 
-void TurretGun::TurnSpeed
-	(
-	float speed
-	)
+void TurretGun::AI_EventSetAimOffset(Event *ev)
 {
-	m_fTurnSpeed = speed;
+    m_Aim_offset = ev->GetVector(1);
 }
 
-void TurretGun::PitchCaps
-	(
-	float upcap,
-	float downcap
-	)
+void TurretGun::AI_EventClearAimTarget(Event *ev)
 {
-	m_fPitchUpCap = upcap;
-	m_fPitchDownCap = downcap;
+    aim_target = NULL;
 
-	if( upcap > downcap )
-	{
-		m_fPitchUpCap = -30.0f;
-		m_fPitchDownCap = 10.0f;
-	}
+    // Clear idle values
+    m_fIdlePitchSpeed = 0;
+    m_iIdleHitCount   = 0;
 }
 
-void TurretGun::MaxYawOffset
-	(
-	float max
-	)
+void TurretGun::AI_EventStartFiring(Event *ev)
 {
-	m_fMaxYawOffset = max;
-	if( max < 0.0f )
-	{
-		m_fMaxYawOffset = 0.0f;
-	}
-	else if( max > 180.0f )
-	{
-		m_fMaxYawOffset = 180.0f;
-	}
+    if (m_iFiring == 0) {
+        m_iFiring = 1;
+    }
 }
 
-void TurretGun::YawCenter
-	(
-	float center
-	)
+void TurretGun::AI_EventStopFiring(Event *ev)
 {
-	m_fStartYaw = center;
+    m_iFiring = 0;
 }
 
-void TurretGun::UserDistance
-	(
-	float dist
-	)
+void TurretGun::AI_EventTurnSpeed(Event *ev)
 {
-	m_fUserDistance = dist;
+    AI_TurnSpeed(ev->GetFloat(1));
 }
 
-void TurretGun::BurstFireSettings
-	(
-	float min_bursttime,
-	float max_bursttime,
-	float min_burstdelay,
-	float max_burstdelay
-	)
+void TurretGun::AI_EventPitchSpeed(Event *ev)
 {
-	m_fMinBurstTime = min_bursttime;
-	m_fMaxBurstTime = max_bursttime;
-	m_fMinBurstDelay = min_burstdelay;
-	m_fMaxBurstDelay = max_burstdelay;
+    AI_PitchSpeed(ev->GetFloat(1));
 }
 
-void TurretGun::CreateViewModel
-	(
-	void
-	)
+void TurretGun::EventPitchCaps(Event *ev)
 {
-	char newmodel[ MAX_STRING_TOKENS ];
-	int tagnum;
-
-	// Owner must be a client
-	if( !owner->IsSubclassOfPlayer() ) {
-		return;
-	}
-
-	m_pViewModel = new Animate;
-
-	COM_StripExtension( model.c_str(), newmodel, sizeof( newmodel ) );
-	strcat( newmodel, "_viewmodel.tik" );
-
-	m_pViewModel->setScale( edict->s.scale );
-	m_pViewModel->detach_at_death = qtrue;
-	m_pViewModel->setModel( newmodel );
-	m_pViewModel->edict->s.renderfx |= RF_VIEWMODEL;
-
-	if( !m_pViewModel->edict->tiki )
-	{
-		delete m_pViewModel;
-		m_pViewModel = NULL;
-
-		warning( "CreateViewModel", "Couldn't find turret view model tiki %s", newmodel );
-		return;
-	}
-
-	// Get the eyes bone
-	tagnum = gi.Tag_NumForName( owner->edict->tiki, "eyes bone" );
-	if( tagnum < 0 )
-	{
-		warning( "CreateViewModel", "Tag eyes bone not found" );
-	}
-	else if( !m_pViewModel->attach( owner->entnum, tagnum ) )
-	{
-		warning( "CreateViewModel", "Could not attach model %s", newmodel );
-		DeleteViewModel();
-		return;
-	}
-
-	m_pViewModel->NewAnim( "idle" );
-
-	// Make the world model invisible to the owner
-	edict->r.svFlags |= SVF_NOTSINGLECLIENT;
-	edict->r.singleClient |= owner->edict->s.number;
-
-	// Make the viewmodel visible only to the owner
-	m_pViewModel->edict->r.svFlags |= SVF_SINGLECLIENT;
-	m_pViewModel->edict->r.singleClient |= owner->edict->s.number;
+    Vector caps = ev->GetVector(1);
+    PitchCaps(caps[0], caps[1]);
 }
 
-void TurretGun::DeleteViewModel
-	(
-	void
-	)
+void TurretGun::EventMaxYawOffset(Event *ev)
 {
-	delete m_pViewModel;
-	m_pViewModel = NULL;
-
-	edict->r.svFlags &= ~SVF_NOTSINGLECLIENT;
+    MaxYawOffset(ev->GetFloat(1));
 }
 
-qboolean TurretGun::SetWeaponAnim
-	(
-	const char *anim,
-	Event *ev
-	)
+void TurretGun::EventYawCenter(Event *ev)
 {
-	int slot;
-	int animnum;
-
-	if( !Weapon::SetWeaponAnim( anim, ev ) )
-	{
-		return qfalse;
-	}
-
-	if( !m_pViewModel )
-	{
-		return qtrue;
-	}
-
-	slot = ( m_iAnimSlot + 3 ) & 3;
-
-	animnum = gi.Anim_NumForName( m_pViewModel->edict->tiki, anim );
-	if( animnum < 0 )
-	{
-		return qtrue;
-	}
-
-	m_pViewModel->StopAnimating( slot );
-	m_pViewModel->SetTime( slot );
-
-	m_pViewModel->edict->s.frameInfo[ slot ].index = gi.Anim_NumForName( m_pViewModel->edict->tiki, "idle" );
-
-	m_pViewModel->NewAnim( animnum, m_iAnimSlot );
-	m_pViewModel->SetOnceType();
-	m_pViewModel->SetTime( slot );
-
-	return qtrue;
+    YawCenter(ev->GetFloat(1));
 }
 
-void TurretGun::StopWeaponAnim
-	(
-	void
-	)
+void TurretGun::P_EventUserDistance(Event *ev)
 {
-	if( m_pViewModel )
-	{
-		m_pViewModel->SetTime( m_iAnimSlot );
-		m_pViewModel->StopAnimating( m_iAnimSlot );
-
-		m_pViewModel->edict->s.frameInfo[ m_iAnimSlot ].index = gi.Anim_NumForName( m_pViewModel->edict->tiki, "idle" );
-		m_pViewModel->edict->s.frameInfo[ m_iAnimSlot ].weight = 1.0f;
-		m_pViewModel->edict->s.frameInfo[ m_iAnimSlot ].time = 0.0f;
-	}
-
-	Weapon::StopWeaponAnim();
+    P_UserDistance(ev->GetFloat(1));
 }
 
-bool TurretGun::CanTarget
-	(
-	float *pos
-	)
+void TurretGun::P_EventViewJitter(Event *ev)
 {
-	Vector vAngles;
-	float ang;
-
-	vectoangles( pos, vAngles );
-
-	ang = AngleSubtract( vAngles[ 1 ], m_fStartYaw );
-
-	if( vAngles[ 0 ] <= 180.0f )
-	{
-		if( vAngles[ 0 ] >= -180.0f )
-		{
-			return m_fPitchUpCap <= vAngles[ 0 ] &&
-				m_fPitchDownCap >= vAngles[ 0 ] &&
-				ang <= m_fMaxYawOffset &&
-				-m_fMaxYawOffset <= ang;
-		}
-
-		vAngles[ 0 ] += 360.0f;
-	}
-	else
-	{
-		vAngles[ 0 ] -= 360.0f;
-	}
-
-	return m_fPitchUpCap <= vAngles[ 0 ] &&
-		m_fPitchDownCap >= vAngles[ 0 ] &&
-		ang <= m_fMaxYawOffset &&
-		-m_fMaxYawOffset <= ang;
+    m_fViewJitter = ev->GetFloat(1);
 }
 
-float TurretGun::FireDelay
-	(
-	firemode_t mode
-	)
+void TurretGun::P_EventDoJitter(Event *ev)
 {
-	if( owner && owner->IsSubclassOfPlayer() )
-	{
-		return 0.06f;
-	}
-	else
-	{
-		return Weapon::FireDelay( mode );
-	}
+    if (ev->NumArgs() > 0) {
+        m_fCurrViewJitter = ev->GetFloat(1);
+    } else {
+        m_fCurrViewJitter = m_fViewJitter;
+    }
 }
 
-void TurretGun::ShowInfo
-	(
-	float fDot,
-	float fDist
-	)
+void TurretGun::AI_EventBurstFireSettings(Event *ev)
 {
-	if( fDot <= 0.90f && ( fDot <= 0.0f || fDist >= 256.0f ) ) {
-		return;
-	}
+    if (ev->NumArgs() < 4) {
+        return;
+    }
 
-	if( fDist >= 2048.0f || fDist <= 64.0f ) {
-		return;
-	}
-
-	G_DebugString( origin + Vector( 0, 0, maxs[ 2 ] + 56.0f ), 1.0f, 1.0f, 1.0f, 1.0f, "%d:%d:%s", entnum, radnum, targetname.c_str() );
-	G_DebugString( origin + Vector( 0, 0, maxs[ 2 ] + 38.0f ), 1.0f, 1.0f, 1.0f, 1.0f, "aim_target: %d", aim_target ? aim_target->entnum : -1 );
-	G_DebugString( origin + Vector( 0, 0, maxs[ 2 ] + 20.0f ), 1.0f, 1.0f, 1.0f, 1.0f, "owner: %d", owner ? owner->entnum : -1 );
+    AI_BurstFireSettings(ev->GetFloat(1), ev->GetFloat(2), ev->GetFloat(3), ev->GetFloat(4));
 }
 
-void TurretGun::TurretUsed
-	(
-	Event *ev
-	)
+bool TurretGun::IsFiring(void)
 {
-	Entity *pEnt = ev->GetEntity( 1 );
-
-	if( !pEnt ) {
-		return;
-	}
-
-	// Must be a player
-	if( !pEnt->IsSubclassOfPlayer() ) {
-		return;
-	}
-
-	if( !m_bUsable ) {
-		return;
-	}
-
-	if( m_bPlayerUsable )
-	{
-		// Make the sentient use the turret
-		TurretUsed( ( Sentient * )pEnt );
-	}
+    return m_iFiring == 4;
 }
 
-void TurretGun::SetPlayerUsable
-	(
-	Event *ev
-	)
+void TurretGun::P_ApplyFiringViewJitter(Vector& vAng)
 {
-	m_bPlayerUsable = ( ev->GetInteger( 1 ) != 0 );
+    if (m_fCurrViewJitter > 0) {
+        vAng[0] += G_CRandom() * m_fCurrViewJitter;
+        vAng[1] += G_CRandom() * m_fCurrViewJitter;
+        vAng[2] += G_CRandom() * m_fCurrViewJitter * 0.8;
+
+        // decrease the jittering over time
+        m_fCurrViewJitter -= level.frametime * 6;
+        if (m_fCurrViewJitter < 0) {
+            m_fCurrViewJitter = 0;
+        }
+    }
 }
 
-void TurretGun::SetViewOffset
-	(
-	Event *ev
-	)
+void TurretGun::AI_TurnSpeed(float speed)
 {
-	m_vViewOffset = ev->GetVector( 1 );
+    m_fTurnSpeed = speed;
 }
 
-void TurretGun::SetIdleCheckOffset
-	(
-	Event *ev
-	)
+void TurretGun::AI_PitchSpeed(float speed)
 {
-	m_vIdleCheckOffset = ev->GetVector( 1 );
+    m_fAIPitchSpeed = speed;
 }
 
-void TurretGun::EventSetAimTarget
-	(
-	Event *ev
-	)
+void TurretGun::PitchCaps(float upcap, float downcap)
 {
-	SetAimTarget( ev->GetEntity( 1 ) );
+    m_fPitchUpCap   = upcap;
+    m_fPitchDownCap = downcap;
+
+    if (upcap > downcap) {
+        m_fPitchUpCap   = -30.0f;
+        m_fPitchDownCap = 10.0f;
+    }
 }
 
-void TurretGun::EventSetAimOffset
-	(
-	Event *ev
-	)
+void TurretGun::MaxYawOffset(float max)
 {
-	SetAimOffset( ev->GetVector( 1 ) );
+    m_fMaxYawOffset = max;
+    if (max < 0.0f) {
+        m_fMaxYawOffset = 0.0f;
+    } else if (max > 180.0f) {
+        m_fMaxYawOffset = 180.0f;
+    }
 }
 
-void TurretGun::EventClearAimTarget
-	(
-	Event *ev
-	)
+void TurretGun::YawCenter(float center)
 {
-	ClearAimTarget();
+    m_fStartYaw = center;
 }
 
-void TurretGun::EventStartFiring
-	(
-	Event *ev
-	)
+void TurretGun::P_UserDistance(float dist)
 {
-	StartFiring();
+    m_fUserDistance = dist;
 }
 
-void TurretGun::EventStopFiring
-	(
-	Event *ev
-	)
+void TurretGun::AI_BurstFireSettings(
+    float min_bursttime, float max_bursttime, float min_burstdelay, float max_burstdelay
+)
 {
-	StopFiring();
+    m_fMinBurstTime  = min_bursttime;
+    m_fMaxBurstTime  = max_bursttime;
+    m_fMinBurstDelay = min_burstdelay;
+    m_fMaxBurstDelay = max_burstdelay;
 }
 
-void TurretGun::EventTurnSpeed
-	(
-	Event *ev
-	)
+void TurretGun::P_EventSetThread(Event *ev)
 {
-	TurnSpeed( ev->GetFloat( 1 ) );
+    if (ev->IsFromScript()) {
+        m_UseThread.SetThread(ev->GetValue(1));
+    } else {
+        m_UseThread.Set(ev->GetString(1));
+    }
 }
 
-void TurretGun::EventPitchCaps
-	(
-	Event *ev
-	)
+void TurretGun::P_SetMaxUseAngle(Event *ev)
 {
-	Vector caps = ev->GetVector( 1 );
-	PitchCaps( caps[ 0 ], caps[ 1 ] );
+    m_fMaxUseAngle = ev->GetFloat(1);
 }
 
-void TurretGun::EventMaxYawOffset
-	(
-	Event *ev
-	)
+void TurretGun::P_SetStartYaw(Event *ev)
 {
-	MaxYawOffset( ev->GetFloat( 1 ) );
+    m_fStartYaw = ev->GetFloat(1);
 }
 
-void TurretGun::EventYawCenter
-	(
-	Event *ev
-	)
+void TurretGun::P_CreateViewModel(void)
 {
-	YawCenter( ev->GetFloat( 1 ) );
+    char newmodel[MAX_STRING_TOKENS];
+    int  tagnum;
+
+    if (!pTurretCameras) {
+        pTurretCameras = gi.Cvar_Get("g_turretcameras", "1", 0);
+    }
+
+    if (!pTurretCameras->integer) {
+        // no camera
+        return;
+    }
+
+    m_pViewModel = new Animate;
+
+    COM_StripExtension(model.c_str(), newmodel, sizeof(newmodel));
+    strcat(newmodel, "_viewmodel.tik");
+
+    m_pViewModel->setScale(edict->s.scale);
+    m_pViewModel->detach_at_death = qtrue;
+    m_pViewModel->setModel(newmodel);
+    m_pViewModel->edict->s.renderfx |= RF_VIEWMODEL;
+
+    if (!m_pViewModel->edict->tiki) {
+        m_pViewModel->Delete();
+        m_pViewModel = NULL;
+
+        warning("CreateViewModel", "Couldn't find turret view model tiki %s", newmodel);
+        return;
+    }
+
+    // Get the eyes bone
+    tagnum = gi.Tag_NumForName(owner->edict->tiki, "eyes bone");
+    if (tagnum < 0) {
+        warning("CreateViewModel", "Tag eyes bone not found");
+    } else if (!m_pViewModel->attach(owner->entnum, tagnum)) {
+        warning("CreateViewModel", "Could not attach model %s", newmodel);
+        P_DeleteViewModel();
+        return;
+    }
+
+    m_pViewModel->NewAnim("idle");
+
+    // Make the world model invisible to the owner
+    edict->r.svFlags |= SVF_NOTSINGLECLIENT;
+    edict->r.singleClient |= owner->edict->s.number;
+
+    // Make the viewmodel visible only to the owner
+    m_pViewModel->edict->r.svFlags |= SVF_SINGLECLIENT;
+    m_pViewModel->edict->r.singleClient |= owner->edict->s.number;
 }
 
-void TurretGun::EventUserDistance
-	(
-	Event *ev
-	)
+void TurretGun::P_DeleteViewModel(void)
 {
-	UserDistance( ev->GetFloat( 1 ) );
+    if (!m_pViewModel) {
+        return;
+    }
+
+    m_pViewModel->Delete();
+    m_pViewModel = NULL;
+
+    edict->r.svFlags &= ~SVF_NOTSINGLECLIENT;
 }
 
-void TurretGun::EventViewJitter
-	(
-	Event *ev
-	)
+void TurretGun::Archive(Archiver& arc)
 {
-	m_fViewJitter = ev->GetFloat( 1 );
+    Weapon::Archive(arc);
+
+    arc.ArchiveBool(&m_bFakeBullets);
+    arc.ArchiveBool(&m_bPlayerUsable);
+
+    arc.ArchiveFloat(&m_fIdlePitchSpeed);
+    arc.ArchiveInteger(&m_iIdleHitCount);
+    arc.ArchiveVector(&m_vIdleCheckOffset);
+    arc.ArchiveFloat(&m_fMaxIdlePitch);
+    arc.ArchiveFloat(&m_fMaxIdleYaw);
+    arc.ArchiveVector(&m_vViewOffset);
+
+    arc.ArchiveFloat(&m_fTurnSpeed);
+    arc.ArchiveFloat(&m_fAIPitchSpeed);
+    arc.ArchiveFloat(&m_fPitchUpCap);
+    arc.ArchiveFloat(&m_fPitchDownCap);
+    arc.ArchiveFloat(&m_fStartYaw);
+    arc.ArchiveFloat(&m_fMaxYawOffset);
+    arc.ArchiveFloat(&m_fUserDistance);
+
+    arc.ArchiveFloat(&m_fMinBurstTime);
+    arc.ArchiveFloat(&m_fMaxBurstTime);
+    arc.ArchiveFloat(&m_fMinBurstDelay);
+    arc.ArchiveFloat(&m_fMaxBurstDelay);
+
+    arc.ArchiveFloat(&m_fFireToggleTime);
+    arc.ArchiveInteger(&m_iFiring);
+    arc.ArchiveVector(&m_vUserViewAng);
+    arc.ArchiveSafePointer(&m_pUserCamera);
+
+    arc.ArchiveFloat(&m_fViewJitter);
+    arc.ArchiveFloat(&m_fCurrViewJitter);
+
+    arc.ArchiveVector(&m_Aim_offset);
+    arc.ArchiveVector(&m_vAIBulletSpread[FIRE_PRIMARY]);
+    arc.ArchiveVector(&m_vAIBulletSpread[FIRE_SECONDARY]);
+    arc.ArchiveSafePointer(&m_pViewModel);
+    arc.ArchiveBool(&m_bUsable);
+
+    m_UseThread.Archive(arc);
+
+    arc.ArchiveBool(&m_bHadOwner);
+    arc.ArchiveBool(&m_bRestable);
+
+    arc.ArchiveVector(&m_vUserLastCmdAng);
+    arc.ArchiveInteger(&m_iTargetType);
+    arc.ArchiveInteger(&m_iAIState);
+    arc.ArchiveFloat(&m_fAIConvergeTime);
+    arc.ArchiveInteger(&m_iAISuppressTime);
+    arc.ArchiveInteger(&m_iAISuppressWaitTime);
+    arc.ArchiveInteger(&m_iAILastTrackTime);
+    arc.ArchiveInteger(&m_iAIStartSuppressTime);
+    arc.ArchiveVec3(m_vDesiredTargetAngles);
+    arc.ArchiveFloat(&m_fAIDesiredTargetSpeed);
+    arc.ArchiveSafePointer(&m_pAIEnemy);
+    arc.ArchiveVec3(m_vAIDesiredTargetPosition);
+    arc.ArchiveVec3(m_vAITargetPosition);
+    arc.ArchiveVec3(m_vAICurrentTargetPosition);
+    arc.ArchiveVec3(m_vAITargetSpeed);
+    arc.ArchiveInteger(&m_iAINextSuppressTime);
+    arc.ArchiveFloat(&m_fAISuppressWidth);
+    arc.ArchiveFloat(&m_fAISuppressHeight);
+    arc.ArchiveVec3(m_vMuzzlePosition);
+    arc.ArchiveFloat(&m_fMaxUseAngle);
+
+    //
+    // Added in 2.30
+    //  Clear the last command angles when loading
+    //  otherwise it would cause the player to face (0,0,0) when loading
+    if (arc.Loading()) {
+        m_vUserLastCmdAng = vec_zero;
+    }
 }
 
-void TurretGun::EventBurstFireSettings
-	(
-	Event *ev
-	)
+qboolean TurretGun::AI_SetWeaponAnim(const char *anim, Event *ev)
 {
-	if( ev->NumArgs() <= 3 ) {
-		return;
-	}
-
-	BurstFireSettings( ev->GetFloat( 1 ), ev->GetFloat( 2 ), ev->GetFloat( 3 ), ev->GetFloat( 4 ) );
+    return Weapon::SetWeaponAnim(anim, ev);
 }
 
-void TurretGun::EventSetThread
-	(
-	Event *ev
-	)
+qboolean TurretGun::P_SetWeaponAnim(const char *anim, Event *ev)
 {
-	if( ev->IsFromScript() )
-	{
-		m_UseThread.SetThread( ev->GetValue( 1 ) );
-	}
-	else
-	{
-		m_UseThread.Set( ev->GetString( 1 ) );
-	}
+    int slot;
+    int animnum;
+
+    if (!Weapon::SetWeaponAnim(anim, ev)) {
+        return qfalse;
+    }
+
+    if (!m_pViewModel) {
+        return qtrue;
+    }
+
+    slot = (m_iAnimSlot + 3) & 3;
+
+    animnum = gi.Anim_NumForName(m_pViewModel->edict->tiki, anim);
+    if (animnum < 0) {
+        return qtrue;
+    }
+
+    m_pViewModel->StopAnimating(slot);
+    m_pViewModel->RestartAnimSlot(slot);
+
+    m_pViewModel->edict->s.frameInfo[slot].index = gi.Anim_NumForName(m_pViewModel->edict->tiki, "idle");
+
+    m_pViewModel->NewAnim(animnum, m_iAnimSlot);
+    m_pViewModel->SetOnceType(m_iAnimSlot);
+    m_pViewModel->RestartAnimSlot(m_iAnimSlot);
+
+    return qtrue;
 }
 
-void TurretGun::SetViewangles
-	(
-	Event *ev
-	)
+qboolean TurretGun::SetWeaponAnim(const char *anim, Event *ev)
 {
-	m_vUserViewAng = ev->GetVector( 1 );
+    if (owner && owner->IsSubclassOfPlayer()) {
+        return P_SetWeaponAnim(anim, ev);
+    } else {
+        return AI_SetWeaponAnim(anim, ev);
+    }
 }
 
-void TurretGun::GetViewangles
-	(
-	Event *ev
-	)
+void TurretGun::AI_StopWeaponAnim()
 {
-	ev->AddVector( m_vUserViewAng );
+    Weapon::StopWeaponAnim();
 }
 
+void TurretGun::P_StopWeaponAnim()
+{
+    if (m_pViewModel) {
+        m_pViewModel->RestartAnimSlot(m_iAnimSlot);
+        m_pViewModel->StopAnimating(m_iAnimSlot);
+        m_pViewModel->StartAnimSlot(m_iAnimSlot, gi.Anim_NumForName(m_pViewModel->edict->tiki, "idle"), 1);
+    }
+
+    Weapon::StopWeaponAnim();
+}
+
+void TurretGun::StopWeaponAnim(void)
+{
+    if (owner && owner->IsSubclassOfPlayer()) {
+        P_StopWeaponAnim();
+    } else {
+        AI_StopWeaponAnim();
+    }
+}
+
+float TurretGun::FireDelay(firemode_t mode)
+{
+    if (g_target_game == target_game_e::TG_MOH) {
+        //
+        // Removed in 2.0
+        //
+        //  On 1.11 and below, the firedelay for players is always 0.06.
+        //  Some maps like m1l1 sets the turret firedelay higher for AI
+        if (owner && owner->IsSubclassOfPlayer()) {
+            return 0.06f;
+        }
+    }
+
+    return fire_delay[mode];
+}
+
+void TurretGun::SetFireDelay(Event *ev)
+{
+    fire_delay[FIRE_PRIMARY] = ev->GetFloat(1);
+}
+
+void TurretGun::ShowInfo(float fDot, float fDist)
+{
+    if (fDot <= 0.90f && (fDot <= 0.0f || fDist >= 256.0f)) {
+        return;
+    }
+
+    if (fDist >= 2048.0f || fDist <= 64.0f) {
+        return;
+    }
+
+    G_DebugString(
+        origin + Vector(0, 0, maxs[2] + 56.0f), 1.0f, 1.0f, 1.0f, 1.0f, "%d:%d:%s", entnum, radnum, targetname.c_str()
+    );
+    G_DebugString(
+        origin + Vector(0, 0, maxs[2] + 38.0f),
+        1.0f,
+        1.0f,
+        1.0f,
+        1.0f,
+        "aim_target: %d",
+        aim_target ? aim_target->entnum : -1
+    );
+    G_DebugString(
+        origin + Vector(0, 0, maxs[2] + 20.0f), 1.0f, 1.0f, 1.0f, 1.0f, "owner: %d", owner ? owner->entnum : -1
+    );
+}
+
+void TurretGun::AI_EventSetTargetType(Event *ev)
+{
+    int targettype;
+
+    switch (ev->GetConstString(1)) {
+    case STRING_DISGUISE_NONE:
+        targettype = 0;
+        break;
+    case STRING_AUTO:
+        targettype = 1;
+        break;
+    default:
+        ScriptError("Unknown targettype '%s'", ev->GetString(1).c_str());
+        break;
+    }
+
+    if (targettype != m_iTargetType) {
+        m_iFiring     = 0;
+        m_iTargetType = targettype;
+    }
+}
+
+void TurretGun::AI_EventGetTargetType(Event *ev)
+{
+    switch (m_iTargetType) {
+    case 0:
+        ev->AddConstString(STRING_DISGUISE_NONE);
+    case 1:
+        ev->AddConstString(STRING_AUTO);
+        break;
+    default:
+        break;
+    }
+}
+
+void TurretGun::AI_EventSetConvergeTime(Event *ev)
+{
+    float value = ev->GetFloat(1);
+    if (value <= 0) {
+        ScriptError("negative value %f not allowed", value);
+    }
+
+    m_fAIConvergeTime = value;
+}
+
+void TurretGun::AI_EventSetSuppressTime(Event *ev)
+{
+    float value = ev->GetFloat(1);
+    if (value <= 0) {
+        ScriptError("negative value %f not allowed", value);
+    }
+
+    m_iAISuppressTime = value * 1000;
+}
+
+void TurretGun::AI_EventSetSuppressWaitTime(Event *ev)
+{
+    float value = ev->GetFloat(1);
+    if (value <= 0) {
+        ScriptError("negative value %f not allowed", value);
+    }
+
+    m_iAISuppressWaitTime = value * 1000;
+}
+
+void TurretGun::AI_EventSetSuppressWidth(Event *ev)
+{
+    float value = ev->GetFloat(1);
+    if (value <= 0) {
+        ScriptError("nonpositive value %f not allowed", value);
+    }
+
+    m_fAISuppressWidth = value;
+}
+
+void TurretGun::AI_EventSetSuppressHeight(Event *ev)
+{
+    float value = ev->GetFloat(1);
+    if (value <= 0) {
+        ScriptError("nonpositive value %f not allowed", value);
+    }
+
+    m_fAISuppressHeight = value;
+}
+
+void TurretGun::AI_EventSetBulletSpread(Event *ev)
+{
+    m_vAIBulletSpread[firemodeindex].x = ev->GetFloat(1);
+    m_vAIBulletSpread[firemodeindex].y = ev->GetFloat(1);
+}
+
+void TurretGun::GetMuzzlePosition(vec3_t position, vec3_t vBarrelPos, vec3_t forward, vec3_t right, vec3_t up)
+{
+    Vector        delta;
+    Vector        aim_angles;
+    Sentient     *viewer;
+    orientation_t barrel_or;
+    vec3_t        weap_axis[3];
+    float         mat[3][3];
+    int           i;
+
+    viewer = owner;
+    if (!viewer && IsSubclassOfVehicleTurretGun()) {
+        VehicleTurretGun *vehTurret = static_cast<VehicleTurretGun *>(this);
+        viewer                      = vehTurret->GetRemoteOwner();
+    }
+
+    if (!viewer) {
+        if (forward || right || up) {
+            AngleVectors(angles, forward, right, up);
+        }
+
+        VectorCopy(origin, position);
+
+        if (GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_axis[i], position);
+            }
+        }
+
+        if (vBarrelPos) {
+            VectorCopy(position, vBarrelPos);
+        }
+    } else if (viewer->IsSubclassOfPlayer()) {
+        VectorCopy(origin, position);
+
+        if (GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_axis[i], position);
+            }
+        }
+
+        if (vBarrelPos) {
+            VectorCopy(position, vBarrelPos);
+        }
+
+        delta      = viewer->GunTarget(false, position) - position;
+        aim_angles = delta.toAngles();
+
+        if (IsSubclassOfVehicleTurretGun()) {
+            vec3_t ang;
+
+            MatrixMultiply(barrel_or.axis, weap_axis, mat);
+            vectoangles(mat[0], ang);
+
+            for (i = 0; i < 2; i++) {
+                float diff;
+
+                diff = AngleSubtract(aim_angles[i], ang[i]);
+                if (diff > 90) {
+                    aim_angles[i] = ang[i];
+                } else if (diff > 20) {
+                    aim_angles[i] = ang[i] + 20;
+                } else if (diff < -20) {
+                    if (diff >= -90) {
+                        aim_angles[i] = ang[i] - 20;
+                    } else {
+                        aim_angles[i] = ang[i];
+                    }
+                }
+            }
+        }
+
+        if (forward || right || up) {
+            AngleVectors(aim_angles, forward, right, up);
+        }
+    } else {
+        VectorCopy(origin, position);
+
+        if (GetRawTag(GetTagBarrel(), &barrel_or)) {
+            AnglesToAxis(angles, weap_axis);
+
+            for (i = 0; i < 3; i++) {
+                VectorMA(position, barrel_or.origin[i], weap_axis[i], position);
+            }
+        }
+
+        if (vBarrelPos) {
+            VectorCopy(position, vBarrelPos);
+        }
+
+        if (forward || right || up) {
+            float spread_x, spread_y;
+
+            AngleVectors(angles, forward, right, up);
+
+            spread_x = crandom() * m_vAIBulletSpread[FIRE_PRIMARY].x / bulletrange[FIRE_PRIMARY];
+            spread_y = crandom() * m_vAIBulletSpread[FIRE_PRIMARY].y / bulletrange[FIRE_PRIMARY];
+
+            VectorMA(forward, spread_x, right, forward);
+            VectorMA(forward, spread_y, up, forward);
+        }
+    }
+}
+
+Vector TurretGun::EyePosition()
+{
+    return m_vMuzzlePosition;
+}
+
+void TurretGun::setAngles(Vector ang)
+{
+    Entity::setAngles(ang);
+
+    VectorCopy(ang, m_vDesiredTargetAngles);
+}
+
+void TurretGun::CalcFiringViewJitter(void)
+{
+    if (owner && owner->IsSubclassOfPlayer()) {
+        m_fCurrViewJitter = m_fViewJitter;
+    }
+}
+
+const Vector& TurretGun::GetUserViewAngles() const
+{
+    return m_vUserViewAng;
+}
+
+void TurretGun::SetUserViewAngles(const Vector& vAngles)
+{
+    m_vUserViewAng = vAngles;
+}
diff --git a/code/fgame/weapturret.h b/code/fgame/weapturret.h
index c314f75e..6646dbf9 100644
--- a/code/fgame/weapturret.h
+++ b/code/fgame/weapturret.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,123 +23,206 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // weapturret.h: MOH Turret. Usable by sentients and monsters.
 //
 
-#ifndef __WEAPTURRET_H__
-#define __WEAPTURRET_H__
+#pragma once
 
 #include "weapon.h"
 #include "camera.h"
 
 extern Event EV_Turret_Enter;
 extern Event EV_Turret_Exit;
-extern Event EV_Turret_TurnSpeed;
+extern Event EV_Turret_AI_TurnSpeed;
+extern Event EV_Turret_SetMaxUseAngle;
 
-#define FAKEBULLETS			1
+typedef enum {
+    TURRETAISTATE_DEFAULT,
+    TURRETAISTATE_TRACK,
+    TURRETAISTATE_SUPPRESS,
+    TURRETAISTATE_SUPPRESS_WAIT
+} turretaistate_e;
 
-class TurretGun : public Weapon {
-	friend class Vehicle;
+#define FAKEBULLETS 1
+
+class TurretGun : public Weapon
+{
+    friend class Vehicle;
 
 protected:
-	bool m_bFakeBullets;
-	bool m_bPlayerUsable;
-	bool m_bUsable;
-	bool m_bRestable;
-	Vector m_vIdleCheckOffset;
-	Vector m_vViewOffset;
-	Vector m_vUserViewAng;
-	Vector m_vUserLastCmdAng;
-	float m_fIdlePitchSpeed;
-	float m_fTurnSpeed;
-	float m_fPitchUpCap;
-	float m_fPitchDownCap;
-	float m_fStartYaw;
-	float m_fMaxYawOffset;
-	float m_fUserDistance;
-	float m_fMinBurstTime;
-	float m_fMaxBurstTime;
-	float m_fMinBurstDelay;
-	float m_fMaxBurstDelay;
-	float m_fFireToggleTime;
-	int m_iFiring;
-	int m_iIdleHitCount;
-	CameraPtr m_pUserCamera;
-	float m_fViewJitter;
-	float m_fCurrViewJitter;
-	Vector m_Aim_offset;
-	SafePtr<Animate> m_pViewModel;
-	ScriptThreadLabel m_UseThread;
+    bool              m_bFakeBullets;
+    bool              m_bPlayerUsable;
+    bool              m_bUsable;
+    bool              m_bRestable;
+    Vector            m_vIdleCheckOffset;
+    Vector            m_vViewOffset;
+    float             m_fMaxIdlePitch;
+    float             m_fMaxIdleYaw;
+    Vector            m_vUserViewAng;
+    Vector            m_vUserLastCmdAng;
+    float             m_fIdlePitchSpeed;
+    float             m_fTurnSpeed;
+    float             m_fAIPitchSpeed;
+    float             m_fPitchUpCap;
+    float             m_fPitchDownCap;
+    float             m_fStartYaw;
+    float             m_fMaxYawOffset;
+    float             m_fUserDistance;
+    float             m_fMinBurstTime;
+    float             m_fMaxBurstTime;
+    float             m_fMinBurstDelay;
+    float             m_fMaxBurstDelay;
+    float             m_fFireToggleTime;
+    int               m_iFiring;
+    int               m_iIdleHitCount;
+    CameraPtr         m_pUserCamera;
+    float             m_fViewJitter;
+    float             m_fCurrViewJitter;
+    Vector            m_vAIBulletSpread[MAX_FIREMODES];
+    int               m_iTargetType;
+    SentientPtr       m_pAIEnemy;
+    Vector            m_Aim_offset;
+    SafePtr<Animate>  m_pViewModel;
+    ScriptThreadLabel m_UseThread;
 
 public:
-	bool m_bHadOwner;
+    bool m_bHadOwner;
+
+private:
+    int    m_iAIState;
+    float  m_fAIConvergeTime;
+    int    m_iAISuppressTime;
+    int    m_iAISuppressWaitTime;
+    int    m_iAILastTrackTime;
+    int    m_iAIStartSuppressTime;
+    vec3_t m_vDesiredTargetAngles;
+    float  m_fAIDesiredTargetSpeed;
+    vec3_t m_vAIDesiredTargetPosition;
+    vec3_t m_vAITargetPosition;
+    vec3_t m_vAICurrentTargetPosition;
+    vec3_t m_vAITargetSpeed;
+    int    m_iAINextSuppressTime;
+    float  m_fAISuppressWidth;
+    float  m_fAISuppressHeight;
+    Vector m_vMuzzlePosition;
+    float  m_fMaxUseAngle;
 
 protected:
-	void ThinkIdle( void );
-	void SetTargetAngles( Vector& vTargAngles );
-	void ThinkActive( void );
+    void         ThinkIdle();
+    void         P_SetTargetAngles(Vector        &vTargAngles);
+    virtual void P_ThinkActive();
 
 public:
-	CLASS_PROTOTYPE( TurretGun );
+    CLASS_PROTOTYPE(TurretGun);
 
-	TurretGun();
-	virtual ~TurretGun();
+    TurretGun();
+    virtual ~TurretGun();
 
-	void Think( void ) override;
+    // added in 2.0
+    //====
+    void AI_SetTargetAngles(vec3_t vTargAngles, float speed);
+    void AI_SetDesiredTargetAngles(const vec3_t angles, float speed);
+    void AI_DoTargetNone();
+    void AI_MoveToDefaultPosition();
+    void AI_DoTargetAutoDefault();
+    void AI_StartDefault();
+    void AI_StartSuppress();
+    void AI_StartSuppressWait();
+    void AI_StartTrack();
+    void AI_DoTargetAutoTrack();
+    void AI_DoSuppressionAiming();
+    void AI_DoTargetAutoSuppress();
+    void AI_DoTargetAutoSuppressWait();
+    void AI_DoTargetAuto();
+    void AI_DoAiming();
+    void AI_DoFiring();
+    void AI_ThinkActive();
+    //====
 
-	void PlaceTurret( Event *ev );
+    void Think() override;
 
-	virtual void P_ThinkActive();
-	virtual void P_UserAim(usercmd_t* cmd);
-	qboolean UserAim(usercmd_t* ucmd);
-	virtual void TurretBeginUsed(Sentient* pEnt);
-	virtual void P_TurretBeginUsed(Player* pEnt);
-	virtual void TurretEndUsed(void);
-	virtual void P_TurretEndUsed();
-	virtual void TurretUsed(Sentient* pEnt);
-	virtual void P_TurretUsed(Player* player);
+    void PlaceTurret(Event *ev);
 
-	void TurretUsed( Event *ev );
-	void SetPlayerUsable( Event *ev );
-	void SetViewOffset( Event *ev );
-	void SetIdleCheckOffset( Event *ev );
-	void SetAimTarget( Entity *ent );
-	void SetAimOffset( const Vector& offset );
-	void ClearAimTarget( void );
-	void StartFiring( void );
-	void StopFiring( void );
-	bool IsFiring( void );
-	void CalcFiringViewJitter( void );
-	void ApplyFiringViewJitter( Vector& vAng );
-	void TurnSpeed( float speed );
-	void PitchCaps( float upcap, float downcap );
-	void MaxYawOffset( float max );
-	void YawCenter( float center );
-	void UserDistance( float dist );
-	void BurstFireSettings( float min_bursttime, float max_bursttime, float min_burstdelay, float max_burstdelay );
-	void EventSetAimTarget( Event *ev );
-	void EventSetAimOffset( Event *ev );
-	void EventClearAimTarget( Event *ev );
-	void EventStartFiring( Event *ev );
-	void EventStopFiring( Event *ev );
-	void EventTurnSpeed( Event *ev );
-	void EventPitchCaps( Event *ev );
-	void EventMaxYawOffset( Event *ev );
-	void EventYawCenter( Event *ev );
-	void EventUserDistance( Event *ev );
-	void EventViewJitter( Event *ev );
-	void EventBurstFireSettings( Event *ev );
-	void EventSetThread( Event *ev );
-	void SetViewangles( Event *ev );
-	void GetViewangles( Event *ev );
-	void CreateViewModel( void );
-	void DeleteViewModel( void );
+    virtual void P_UserAim(usercmd_t *ucmd);
+    qboolean     UserAim(usercmd_t *ucmd);
+    virtual void TurretBeginUsed(Sentient *pEnt);
+    virtual void P_TurretBeginUsed(Player *pEnt);
+    virtual void AI_TurretBeginUsed(Sentient *pEnt); // added in 2.0
+    virtual void TurretEndUsed();
+    virtual void P_TurretEndUsed();
+    virtual void AI_TurretEndUsed(); // added in 2.0
+    void         RemoveUserCamera(); // added in 2.0
+    virtual void TurretUsed(Sentient *pEnt);
+    virtual void P_TurretUsed(Player *player);
 
-	qboolean SetWeaponAnim( const char *anim, Event *ev = NULL ) override;
-	void StopWeaponAnim( void ) override;
+    void TurretUsed(Event *ev);
+    void P_SetPlayerUsable(Event *ev);
+    void EventSetUsable(Event *ev); // added in 2.0
+    void P_SetViewOffset(Event *ev);
+    void EventMaxIdlePitch(Event *ev); // added in 2.0
+    void EventMaxIdleYaw(Event *ev);   // added in 2.0
+    void SetIdleCheckOffset(Event *ev);
+    bool IsFiring();
+    void CalcFiringViewJitter();
+    void P_ApplyFiringViewJitter(Vector& vAng);
+    void AI_TurnSpeed(float speed);
+    void AI_PitchSpeed(float speed);
+    void PitchCaps(float upcap, float downcap);
+    void MaxYawOffset(float max);
+    void YawCenter(float center);
+    void P_UserDistance(float dist);
+    void AI_BurstFireSettings(float min_bursttime, float max_bursttime, float min_burstdelay, float max_burstdelay);
+    void AI_EventSetAimTarget(Event *ev);
+    void AI_EventSetAimOffset(Event *ev);
+    void AI_EventClearAimTarget(Event *ev);
+    void AI_EventStartFiring(Event *ev);
+    void AI_EventStopFiring(Event *ev);
+    void AI_EventTurnSpeed(Event *ev);
+    void AI_EventPitchSpeed(Event *ev); // added in 2.0
+    void EventPitchCaps(Event *ev);
+    void EventMaxYawOffset(Event *ev);
+    void EventYawCenter(Event *ev);
+    void P_EventUserDistance(Event *ev);
+    void P_EventViewJitter(Event *ev);
+    void P_EventDoJitter(Event *ev); // added in 2.0
+    void AI_EventBurstFireSettings(Event *ev);
+    void P_EventSetThread(Event *ev);
+    void P_SetMaxUseAngle(Event *ev); // added in 2.0
+    void P_SetStartYaw(Event *ev);    // added in 2.0
+    void P_SetViewangles(Event *ev);
+    void P_SetViewAnglesForTurret(Event *ev);
+    void P_GetViewangles(Event *ev);
+    void P_CreateViewModel();
+    void P_DeleteViewModel();
 
-	virtual bool CanTarget( float *pos );
-	virtual float FireDelay( firemode_t mode );
-	void ShowInfo( float fDot, float fDist ) override;
+    qboolean AI_SetWeaponAnim(const char *anim, Event *ev = NULL);
+    qboolean P_SetWeaponAnim(const char *anim, Event *ev = NULL);
+    qboolean SetWeaponAnim(const char *anim, Event *ev = NULL) override;
+    void     AI_StopWeaponAnim();
+    void     P_StopWeaponAnim();
+    void     StopWeaponAnim() override;
 
-	void Archive( Archiver& arc ) override;
+    bool          AI_CanTarget(const vec3_t org);
+    virtual float FireDelay(firemode_t mode) override;
+    virtual void  SetFireDelay(Event *ev) override; // added in 2.0
+    void          ShowInfo(float fDot, float fDist) override;
+
+    // added in 2.0
+    //====
+    void AI_EventSetTargetType(Event *ev);
+    void AI_EventGetTargetType(Event *ev);
+    void AI_EventSetConvergeTime(Event *ev);
+    void AI_EventSetSuppressTime(Event *ev);
+    void AI_EventSetSuppressWaitTime(Event *ev);
+    void AI_EventSetSuppressWidth(Event *ev);
+    void AI_EventSetSuppressHeight(Event *ev);
+    void AI_EventSetBulletSpread(Event *ev);
+    void GetMuzzlePosition(
+        vec3_t position, vec3_t vBarrelPos = NULL, vec3_t forward = NULL, vec3_t right = NULL, vec3_t up = NULL
+    ) override;
+    Vector EyePosition();
+    void   setAngles(Vector ang) override;
+    //====
+
+    const Vector& GetUserViewAngles() const;
+    void SetUserViewAngles(const Vector& vAngles);
+
+    void Archive(Archiver& arc) override;
 };
-
-#endif // __WEAPTURRET_H__
diff --git a/code/fgame/weaputils.cpp b/code/fgame/weaputils.cpp
index 888a15b0..62acae3e 100644
--- a/code/fgame/weaputils.cpp
+++ b/code/fgame/weaputils.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -37,53 +37,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "earthquake.h"
 #include "trigger.h"
 #include "debuglines.h"
+#include "smokegrenade.h"
 
 constexpr unsigned long MAX_TRAVEL_DIST = 16216;
 
-static void FlashPlayers
-   (
-   Vector   org,
-   float    r,
-   float    g, 
-   float    b,
-   float    a,
-   float    rad,
-   float    time,
-   int      type
-   );
+static void FlashPlayers(Vector org, float r, float g, float b, float a, float rad, float time, int type);
 
-qboolean MeleeAttack
-    (
-    Vector pos,
-    Vector end,
-    float damage,
-    Entity *attacker,
-    meansOfDeath_t means_of_death,
-    float attack_width,
-    float attack_min_height,
-    float attack_max_height,
-    float knockback,
-    qboolean hit_dead,
-    Container<Entity *>*victimlist
-    )
+qboolean MeleeAttack(
+    Vector               pos,
+    Vector               end,
+    float                damage,
+    Entity              *attacker,
+    meansOfDeath_t       means_of_death,
+    float                attack_width,
+    float                attack_min_height,
+    float                attack_max_height,
+    float                knockback,
+    qboolean             hit_dead,
+    Container<Entity *> *victimlist
+)
 {
-    trace_t trace;
-    Entity *victim;
-    Vector dir;
-    float world_dist;
-    Vector new_pos;
-    Entity *skip_ent;
-    qboolean hit_something = false;
-    Vector mins;
-    Vector maxs;
+    trace_t             trace;
+    Entity             *victim;
+    Vector              dir;
+    float               world_dist;
+    Vector              new_pos;
+    Entity             *skip_ent;
+    qboolean            hit_something = false;
+    Vector              mins;
+    Vector              maxs;
     Container<Entity *> potential_victimlist;
-    int i;
-    int num_traces;
-    Vector start;
+    int                 i;
+    int                 num_traces;
+    Vector              start;
 
     // See how far the world is away
 
-    dir = end - pos;
+    dir        = end - pos;
     world_dist = dir.length();
 
     new_pos = pos;
@@ -92,42 +82,37 @@ qboolean MeleeAttack
 
     num_traces = 0;
 
-    while( new_pos != end )
-    {
-        trace = G_Trace( pos, vec_zero, vec_zero, end, skip_ent, MASK_SOLID, false, "MeleeAttack - World test" );
+    while (new_pos != end) {
+        trace = G_Trace(pos, vec_zero, vec_zero, end, skip_ent, MASK_SOLID, false, "MeleeAttack - World test");
 
         num_traces++;
 
-        if( trace.fraction < 1 )
-        {
-            if( ( trace.entityNum == ENTITYNUM_WORLD ) || ( trace.ent && trace.ent->entity && !trace.ent->entity->takedamage ) )
-            {
-                dir = trace.endpos - pos;
+        if (trace.fraction < 1) {
+            if ((trace.entityNum == ENTITYNUM_WORLD)
+                || (trace.ent && trace.ent->entity && !trace.ent->entity->takedamage)) {
+                dir        = trace.endpos - pos;
                 world_dist = dir.length();
                 break;
-            }
-            else
-            {
+            } else {
                 // Make sure we don't go backwards any in our trace
-                if( Vector( new_pos - pos ).length() + 0.001 >= Vector( trace.endpos - pos ).length() )
+                if (Vector(new_pos - pos).length() + 0.001 >= Vector(trace.endpos - pos).length()) {
                     break;
+                }
 
-                if( num_traces > 10 )
-                {
+                if (num_traces > 10) {
                     // We have done too many traces, stop here
-                    dir = trace.endpos - pos;
+                    dir        = trace.endpos - pos;
                     world_dist = dir.length();
                     break;
                 }
 
                 new_pos = trace.endpos;
 
-                if( trace.ent )
+                if (trace.ent) {
                     skip_ent = trace.ent->entity;
+                }
             }
-        }
-        else
-        {
+        } else {
             break;
         }
     }
@@ -136,17 +121,17 @@ qboolean MeleeAttack
 
     dir = end - pos;
     dir.normalize();
-    end = pos + ( dir * world_dist );
+    end = pos + (dir * world_dist);
 
-    start = pos - dir * ( attack_width * 1.2f );
-    start.z = pos.z - dir.z * ( end.z - start.z );
+    start   = pos - dir * (attack_width * 1.2f);
+    start.z = pos.z - dir.z * (end.z - start.z);
 
     victim = NULL;
 
-    mins = Vector( -attack_width, -attack_width, attack_min_height );
-    maxs = Vector( attack_width, attack_width, attack_max_height );
+    mins = Vector(-attack_width, -attack_width, attack_min_height);
+    maxs = Vector(attack_width, attack_width, attack_max_height);
 
-    G_TraceEntities( pos, mins, maxs, end, &potential_victimlist, MASK_MELEE );
+    G_TraceEntities(pos, mins, maxs, end, &potential_victimlist, MASK_MELEE);
 
     /*int previous_contents = attacker->edict->r.contents;
     attacker->edict->r.contents = 0;
@@ -160,34 +145,31 @@ qboolean MeleeAttack
 
     attacker->edict->r.contents = previous_contents;*/
 
-    for( i = 1; i <= potential_victimlist.NumObjects(); i++ )
-    {
-        victim = potential_victimlist.ObjectAt( i );
+    for (i = 1; i <= potential_victimlist.NumObjects(); i++) {
+        victim = potential_victimlist.ObjectAt(i);
 
-        if( victim && victim->takedamage && victim != attacker )
-        {
+        if (victim && victim->takedamage && victim != attacker) {
             dir = end - pos;
             dir.normalize();
 
-            if( dir == vec_zero )
-            {
+            if (dir == vec_zero) {
                 dir = victim->centroid - pos;
                 dir.normalize();
             }
 
-            if( victim->IsSubclassOfSentient() && !victim->IsDead() )
+            if (victim->IsSubclassOfSentient() && !victim->IsDead()) {
                 hit_something = true;
+            }
 
-            if( victim->health > 0 || hit_dead )
-            {
-                if( victimlist && victim->IsSubclassOfSentient() && !victim->IsDead() )
-                    victimlist->AddObject( victim );
+            if (victim->health > 0 || hit_dead) {
+                if (victimlist && victim->IsSubclassOfSentient() && !victim->IsDead()) {
+                    victimlist->AddObject(victim);
+                }
 
-                victim->Damage( attacker, attacker, damage, pos, dir, vec_zero, knockback, 0, means_of_death );
+                victim->Damage(attacker, attacker, damage, pos, dir, vec_zero, knockback, 0, means_of_death);
 
-                if( victim->edict->r.contents & CONTENTS_SOLID )
-                {
-                    victim->Sound( "pistol_hit" );
+                if (!(victim->edict->r.contents & CONTENTS_CLAYPIDGEON)) {
+                    victim->Sound("pistol_hit");
                 }
             }
         }
@@ -196,464 +178,469 @@ qboolean MeleeAttack
     return hit_something;
 }
 
-#define DEFAULT_SWORD_DAMAGE 10
+#define DEFAULT_SWORD_DAMAGE    10
 #define DEFAULT_SWORD_KNOCKBACK 50
 
 Event EV_Projectile_Speed
-   (
-   "speed",
-   EV_DEFAULT,
-   "f",
-   "projectileSpeed",
-   "set the speed of the projectile",
-   EV_NORMAL
-   );
+(
+    "speed",
+    EV_DEFAULT,
+    "f",
+    "projectileSpeed",
+    "set the speed of the projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_MinSpeed
-   (
-   "minspeed",
-   EV_DEFAULT,
-   "f",
-   "minspeed",
-   "set the minimum speed of the projectile (this is for charge up weapons)",
-   EV_NORMAL
-   );
+(
+    "minspeed",
+    EV_DEFAULT,
+    "f",
+    "minspeed",
+    "set the minimum speed of the projectile (this is for charge up weapons)",
+    EV_NORMAL
+);
 Event EV_Projectile_ChargeSpeed
-   (
-   "chargespeed",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "set the projectile's speed to be determined by the charge time",
-   EV_NORMAL
-   );
+(
+    "chargespeed",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "set the projectile's speed to be determined by the charge time",
+    EV_NORMAL
+);
 Event EV_Projectile_Damage
-   (
-   "hitdamage",
-   EV_DEFAULT,
-   "f",
-   "projectileHitDamage",
-   "set the damage a projectile does when it hits something",
-   EV_NORMAL
-   );
+(
+    "hitdamage",
+    EV_DEFAULT,
+    "f",
+    "projectileHitDamage",
+    "set the damage a projectile does when it hits something",
+    EV_NORMAL
+);
 Event EV_Projectile_Life
-   (
-   "life",
-   EV_DEFAULT,
-   "f",
-   "projectileLife",
-   "set the life of the projectile",
-   EV_NORMAL
-   );
+(
+    "life",
+    EV_DEFAULT,
+    "f",
+    "projectileLife",
+    "set the life of the projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_DMLife
-   (
-   "dmlife",
-   EV_DEFAULT,
-   "f",
-   "projectileLife",
-   "set the life of the projectile in DM",
-   EV_NORMAL
-   );
+(
+    "dmlife",
+    EV_DEFAULT,
+    "f",
+    "projectileLife",
+    "set the life of the projectile in DM",
+    EV_NORMAL
+);
 Event EV_Projectile_MinLife
-   (
-   "minlife",
-   EV_DEFAULT,
-   "f",
-   "minProjectileLife",
-   "set the minimum life of the projectile (this is for charge up weapons)",
-   EV_NORMAL
-   );
+(
+    "minlife",
+    EV_DEFAULT,
+    "f",
+    "minProjectileLife",
+    "set the minimum life of the projectile (this is for charge up weapons)",
+    EV_NORMAL
+);
 Event EV_Projectile_ChargeLife
-   (
-   "chargelife",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "set the projectile's life to be determined by the charge time",
-   EV_NORMAL
-   );
-Event EV_Projectile_SetFuse // Added in 2.0
-   (
-   "fuse",
-   EV_DEFAULT,
-   "i",
-   "fuse",
-   "set the projectile's life to be determined by the charge time",
-   EV_NORMAL
-   );
+(
+    "chargelife",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "set the projectile's life to be determined by the charge time",
+    EV_NORMAL
+);
+// Added in 2.0
+Event EV_Projectile_SetFuse
+(
+    "fuse",
+    EV_DEFAULT,
+    "i",
+    "fuse",
+    "set the projectile's life to be determined by the charge time",
+    EV_NORMAL
+);
 Event EV_Projectile_Knockback
-   (
-   "knockback", 
-   EV_DEFAULT,
-   "f",
-   "projectileKnockback",
-   "set the knockback of the projectile when it hits something",
-   EV_NORMAL
-   );
+(
+    "knockback",
+    EV_DEFAULT,
+    "f",
+    "projectileKnockback",
+    "set the knockback of the projectile when it hits something",
+    EV_NORMAL
+);
 Event EV_Projectile_DLight
-   (
-   "dlight",
-   EV_DEFAULT,
-   "ffff",
-   "red green blue intensity",
-   "set the color and intensity of the dynamic light on the projectile",
-   EV_NORMAL
-   );
+(
+    "dlight",
+    EV_DEFAULT,
+    "ffff",
+    "red green blue intensity",
+    "set the color and intensity of the dynamic light on the projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_Avelocity
-   (
-   "avelocity",
-   EV_DEFAULT,
-   "SFSFSF",
-   "[random|crandom] yaw [random|crandom] pitch [random|crandom] roll",
-   "set the angular velocity of the projectile",
-   EV_NORMAL
-   );
+(
+    "avelocity",
+    EV_DEFAULT,
+    "SFSFSF",
+    "[random|crandom] yaw [random|crandom] pitch [random|crandom] roll",
+    "set the angular velocity of the projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_MeansOfDeath
-   (
-   "meansofdeath",
-   EV_DEFAULT,
-   "s",
-   "meansOfDeath",
-   "set the meansOfDeath of the projectile",
-   EV_NORMAL
-   );
+(
+    "meansofdeath",
+    EV_DEFAULT,
+    "s",
+    "meansOfDeath",
+    "set the meansOfDeath of the projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_BeamCommand
-   (
-   "beam",
-   EV_DEFAULT,
-   "sSSSSSS",
-   "command arg1 arg2 arg3 arg4 arg5 arg6",
-   "send a command to the beam of this projectile",
-   EV_NORMAL
-   );
+(
+    "beam",
+    EV_DEFAULT,
+    "sSSSSSS",
+    "command arg1 arg2 arg3 arg4 arg5 arg6",
+    "send a command to the beam of this projectile",
+    EV_NORMAL
+);
 Event EV_Projectile_UpdateBeam
-   (
-   "updatebeam",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Update the attached beam",
-   EV_NORMAL
-   );
+(
+    "updatebeam",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Update the attached beam",
+    EV_NORMAL
+);
 Event EV_Projectile_BounceTouch
-   (
-   "bouncetouch",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile bounce when it hits a non-damageable solid",
-   EV_NORMAL
-   );
+(
+    "bouncetouch",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile bounce when it hits a non-damageable solid",
+    EV_NORMAL
+);
 Event EV_Projectile_BounceSound
-   (
-   "bouncesound",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Set the name of the sound that is played when the projectile bounces",
-   EV_NORMAL
-   );
+(
+    "bouncesound",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the name of the sound that is played when the projectile bounces",
+    EV_NORMAL
+);
 Event EV_Projectile_BounceSound_Metal
-   (
-   "bouncesound_metal",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Set the name of the sound that is played when the projectile bounces off metal",
-   EV_NORMAL
-   );
+(
+    "bouncesound_metal",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the name of the sound that is played when the projectile bounces off metal",
+    EV_NORMAL
+);
 Event EV_Projectile_BounceSound_Hard
-   (
-   "bouncesound_hard",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Set the name of the sound that is played when the projectile bounces off hard surfaces",
-   EV_NORMAL
-   );
+(
+    "bouncesound_hard",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the name of the sound that is played when the projectile bounces off hard surfaces",
+    EV_NORMAL
+);
 Event EV_Projectile_BounceSound_Water
-   (
-   "bouncesound_water",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Set the name of the sound that is played when the projectile bounces off water",
-   EV_NORMAL
-   );
+(
+    "bouncesound_water",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Set the name of the sound that is played when the projectile bounces off water",
+    EV_NORMAL
+);
 Event EV_Projectile_Explode
-   (
-   "explode",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile explode",
-   EV_NORMAL
-   );
+(
+    "explode",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile explode",
+    EV_NORMAL
+);
 Event EV_Projectile_ImpactMarkShader
-   (
-   "impactmarkshader",
-   EV_DEFAULT,
-   "s",
-   "shader",
-   "Set the impact mark of the shader",
-   EV_NORMAL
-   );
+(
+    "impactmarkshader",
+    EV_DEFAULT,
+    "s",
+    "shader",
+    "Set the impact mark of the shader",
+    EV_NORMAL
+);
 Event EV_Projectile_ImpactMarkRadius
-   (
-   "impactmarkradius",
-   EV_DEFAULT,
-   "f",
-   "radius",
-   "Set the radius of the impact mark",
-   EV_NORMAL
-   );
+(
+    "impactmarkradius",
+    EV_DEFAULT,
+    "f",
+    "radius",
+    "Set the radius of the impact mark",
+    EV_NORMAL
+);
 Event EV_Projectile_ImpactMarkOrientation
-   (
-   "impactmarkorientation",
-   EV_DEFAULT,
-   "f",
-   "degrees",
-   "Set the orientation of the impact mark",
-   EV_NORMAL
-   );
+(
+    "impactmarkorientation",
+    EV_DEFAULT,
+    "f",
+    "degrees",
+    "Set the orientation of the impact mark",
+    EV_NORMAL
+);
 Event EV_Projectile_SetExplosionModel
-   (
-   "explosionmodel",
-   EV_DEFAULT,
-   "s",
-   "modelname",
-   "Set the modelname of the explosion to be spawned",
-   EV_NORMAL
-   );
+(
+    "explosionmodel",
+    EV_DEFAULT,
+    "s",
+    "modelname",
+    "Set the modelname of the explosion to be spawned",
+    EV_NORMAL
+);
 Event EV_Projectile_SetAddVelocity
-   (
-   "addvelocity",
-   EV_DEFAULT,
-   "fff",
-   "velocity_x velocity_y velocity_z",
-   "Set a velocity to be added to the projectile when it is created",
-   EV_NORMAL
-   );
+(
+    "addvelocity",
+    EV_DEFAULT,
+    "fff",
+    "velocity_x velocity_y velocity_z",
+    "Set a velocity to be added to the projectile when it is created",
+    EV_NORMAL
+);
 Event EV_Projectile_AddOwnerVelocity
-   (
-   "addownervelocity",
-   EV_DEFAULT,
-   "b",
-   "bool",
-   "Set whether or not the owner's velocity is added to the projectile's velocity",
-   EV_NORMAL
-   );
+(
+    "addownervelocity",
+    EV_DEFAULT,
+    "b",
+    "bool",
+    "Set whether or not the owner's velocity is added to the projectile's velocity",
+    EV_NORMAL
+);
 Event EV_Projectile_HeatSeek
-   (
-   "heatseek",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile heat seek",
-   EV_NORMAL
-   );
+(
+    "heatseek",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile heat seek",
+    EV_NORMAL
+);
 Event EV_Projectile_Drunk
-   (
-   "drunk",
-   EV_DEFAULT,
-   "ff",
-   "amount rate",
-   "Make the projectile drunk",
-   EV_NORMAL
-   );
+(
+    "drunk",
+    EV_DEFAULT,
+    "ff",
+    "amount rate",
+    "Make the projectile drunk",
+    EV_NORMAL
+);
 Event EV_Projectile_Prethink
-   (
-   "prethink",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile think to update it's velocity",
-   EV_NORMAL
-   );
+(
+    "prethink",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile think to update it's velocity",
+    EV_NORMAL
+);
 Event EV_Projectile_SetCanHitOwner
-   (
-   "canhitowner",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile be able to hit its owner",
-   EV_NORMAL
-   );
+(
+    "canhitowner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile be able to hit its owner",
+    EV_NORMAL
+);
 Event EV_Projectile_ClearOwner
-   (
-   "clearowner",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile be able to hit its owner now",
-   EV_NORMAL
-   );
+(
+    "clearowner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile be able to hit its owner now",
+    EV_NORMAL
+);
 Event EV_Projectile_RemoveWhenStopped
-   (
-   "removewhenstopped",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Make the projectile get removed when it stops",
-   EV_NORMAL
-   );
+(
+    "removewhenstopped",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Make the projectile get removed when it stops",
+    EV_NORMAL
+);
 Event EV_Projectile_ExplodeOnTouch
-    (
+(
     "explodeontouch",
     EV_DEFAULT,
     NULL,
     NULL,
     "Make the projectile explode when it touches something damagable",
     EV_NORMAL
-    );
+);
 Event EV_Projectile_NoTouchDamage
-    (
+(
     "notouchdamage",
     EV_DEFAULT,
     NULL,
     NULL,
     "Makes the projectile not blow up or deal damage when it touches a damagable object",
     EV_NORMAL
-    );
+);
 Event EV_Projectile_SetSmashThroughGlass
-    (
+(
     "smashthroughglass",
     EV_DEFAULT,
     "i",
     "speed",
     "Makes the projectile smash through windows & other damageble glass objects when going above a set speed",
     EV_NORMAL
-    );
+);
 Event EV_Projectile_SmashThroughGlass
-    (
+(
     "_smashthroughglass",
     EV_DEFAULT,
     NULL,
     NULL,
     "Think function for smashing through glass",
     EV_NORMAL
-    );
-Event EV_Projectile_ArcToTarget // Added in 2.0
-    (
+);
+// Added in 2.0
+Event EV_Projectile_ArcToTarget
+(
     "arctotarget",
     EV_DEFAULT,
     NULL,
     NULL,
     "Make the projectile follow a normal arc on its way to its target",
     EV_NORMAL
-    );
-Event EV_Projectile_BecomeBomb // Added in 2.0
-    (
+);
+// Added in 2.0
+Event EV_Projectile_BecomeBomb
+(
     "becomebomb",
     EV_DEFAULT,
     NULL,
     NULL,
     "Make the projectile into a bomb",
     EV_NORMAL
-    );
-Event EV_Projectile_DieInWater // Added in 2.30
-    (
+);
+// Added in 2.30
+Event EV_Projectile_DieInWater
+(
     "dieinwater",
     EV_DEFAULT,
     NULL,
     NULL,
     "Make the projectile die when gets wet",
     EV_NORMAL
-    );
+);
 
-
-CLASS_DECLARATION( Animate, Projectile, NULL )
-{
-    { &EV_Touch,                                &Projectile::Touch },
-    { &EV_Projectile_Speed,                        &Projectile::SetSpeed },
-    { &EV_Projectile_MinSpeed,                    &Projectile::SetMinSpeed },
-    { &EV_Projectile_ChargeSpeed,                &Projectile::SetChargeSpeed },
-    { &EV_Projectile_Damage,                    &Projectile::SetDamage },
-    { &EV_Projectile_Life,                        &Projectile::SetLife },
-    { &EV_Projectile_DMLife,                    &Projectile::SetDMLife },
-    { &EV_Projectile_MinLife,                    &Projectile::SetMinLife },
-    { &EV_Projectile_ChargeLife,                &Projectile::SetChargeLife },
-    { &EV_Projectile_SetFuse,                    &Projectile::SetFuse },
-    { &EV_Projectile_Knockback,                    &Projectile::SetKnockback },
-    { &EV_Projectile_DLight,                    &Projectile::SetDLight },
-    { &EV_Projectile_Avelocity,                    &Projectile::SetAvelocity },
-    { &EV_Projectile_MeansOfDeath,                &Projectile::SetMeansOfDeath },
-    { &EV_Projectile_BounceTouch,                &Projectile::SetBounceTouch },
-    { &EV_Projectile_BounceSound,                &Projectile::SetBounceSound },
-    { &EV_Projectile_BounceSound_Metal,            &Projectile::SetBounceSoundMetal },
-    { &EV_Projectile_BounceSound_Hard,            &Projectile::SetBounceSoundHard },
-    { &EV_Projectile_BounceSound_Water,            &Projectile::SetBounceSoundWater },
-    { &EV_Projectile_BeamCommand,                &Projectile::BeamCommand },
-    { &EV_Projectile_UpdateBeam,                &Projectile::UpdateBeam },
-    { &EV_Projectile_Explode,                    &Projectile::Explode },
-    { &EV_Projectile_ImpactMarkShader,            &Projectile::SetImpactMarkShader },
-    { &EV_Projectile_ImpactMarkRadius,            &Projectile::SetImpactMarkRadius },
-    { &EV_Projectile_ImpactMarkOrientation,        &Projectile::SetImpactMarkOrientation },
-    { &EV_Projectile_SetExplosionModel,            &Projectile::SetExplosionModel },
-    { &EV_Projectile_SetAddVelocity,            &Projectile::SetAddVelocity },
-    { &EV_Projectile_AddOwnerVelocity,            &Projectile::AddOwnerVelocity },
-    { &EV_Projectile_HeatSeek,                    &Projectile::HeatSeek },
-    { &EV_Projectile_Drunk,                        &Projectile::Drunk },
-    { &EV_Projectile_Prethink,                    &Projectile::Prethink },
-    { &EV_Projectile_SetCanHitOwner,            &Projectile::SetCanHitOwner },
-    { &EV_Projectile_ClearOwner,                &Projectile::ClearOwner },
-    { &EV_Projectile_RemoveWhenStopped,            &Projectile::RemoveWhenStopped },
-    { &EV_Projectile_ExplodeOnTouch,            &Projectile::ExplodeOnTouch },
-    { &EV_Projectile_NoTouchDamage,                &Projectile::SetNoTouchDamage },
-    { &EV_Projectile_SetSmashThroughGlass,        &Projectile::SetSmashThroughGlass },
-    { &EV_Projectile_SmashThroughGlass,            &Projectile::SmashThroughGlassThink },
-    { &EV_Projectile_BecomeBomb,                &Projectile::BecomeBomb },
-    { &EV_Killed,                                  &Projectile::Explode },
-    { &EV_Stop,                                    &Projectile::Stopped },
-    { &EV_Projectile_ArcToTarget,                &Projectile::ArcToTarget },
-    { &EV_Projectile_DieInWater,                &Projectile::DieInWater },
-    { NULL, NULL }
+CLASS_DECLARATION(Animate, Projectile, NULL) {
+    {&EV_Touch,                            &Projectile::Touch                   },
+    {&EV_Projectile_Speed,                 &Projectile::SetSpeed                },
+    {&EV_Projectile_MinSpeed,              &Projectile::SetMinSpeed             },
+    {&EV_Projectile_ChargeSpeed,           &Projectile::SetChargeSpeed          },
+    {&EV_Projectile_Damage,                &Projectile::SetDamage               },
+    {&EV_Projectile_Life,                  &Projectile::SetLife                 },
+    {&EV_Projectile_DMLife,                &Projectile::SetDMLife               },
+    {&EV_Projectile_MinLife,               &Projectile::SetMinLife              },
+    {&EV_Projectile_ChargeLife,            &Projectile::SetChargeLife           },
+    {&EV_Projectile_SetFuse,               &Projectile::SetFuse                 },
+    {&EV_Projectile_Knockback,             &Projectile::SetKnockback            },
+    {&EV_Projectile_DLight,                &Projectile::SetDLight               },
+    {&EV_Projectile_Avelocity,             &Projectile::SetAvelocity            },
+    {&EV_Projectile_MeansOfDeath,          &Projectile::SetMeansOfDeath         },
+    {&EV_Projectile_BounceTouch,           &Projectile::SetBounceTouch          },
+    {&EV_Projectile_BounceSound,           &Projectile::SetBounceSound          },
+    {&EV_Projectile_BounceSound_Metal,     &Projectile::SetBounceSoundMetal     },
+    {&EV_Projectile_BounceSound_Hard,      &Projectile::SetBounceSoundHard      },
+    {&EV_Projectile_BounceSound_Water,     &Projectile::SetBounceSoundWater     },
+    {&EV_Projectile_BeamCommand,           &Projectile::BeamCommand             },
+    {&EV_Projectile_UpdateBeam,            &Projectile::UpdateBeam              },
+    {&EV_Projectile_Explode,               &Projectile::Explode                 },
+    {&EV_Projectile_ImpactMarkShader,      &Projectile::SetImpactMarkShader     },
+    {&EV_Projectile_ImpactMarkRadius,      &Projectile::SetImpactMarkRadius     },
+    {&EV_Projectile_ImpactMarkOrientation, &Projectile::SetImpactMarkOrientation},
+    {&EV_Projectile_SetExplosionModel,     &Projectile::SetExplosionModel       },
+    {&EV_Projectile_SetAddVelocity,        &Projectile::SetAddVelocity          },
+    {&EV_Projectile_AddOwnerVelocity,      &Projectile::AddOwnerVelocity        },
+    {&EV_Projectile_HeatSeek,              &Projectile::HeatSeek                },
+    {&EV_Projectile_Drunk,                 &Projectile::Drunk                   },
+    {&EV_Projectile_Prethink,              &Projectile::Prethink                },
+    {&EV_Projectile_SetCanHitOwner,        &Projectile::SetCanHitOwner          },
+    {&EV_Projectile_ClearOwner,            &Projectile::ClearOwner              },
+    {&EV_Projectile_RemoveWhenStopped,     &Projectile::RemoveWhenStopped       },
+    {&EV_Projectile_ExplodeOnTouch,        &Projectile::ExplodeOnTouch          },
+    {&EV_Projectile_NoTouchDamage,         &Projectile::SetNoTouchDamage        },
+    {&EV_Projectile_SetSmashThroughGlass,  &Projectile::SetSmashThroughGlass    },
+    {&EV_Projectile_SmashThroughGlass,     &Projectile::SmashThroughGlassThink  },
+    {&EV_Projectile_BecomeBomb,            &Projectile::BecomeBomb              },
+    {&EV_Killed,                           &Projectile::Explode                 },
+    {&EV_Stop,                             &Projectile::Stopped                 },
+    {&EV_Projectile_ArcToTarget,           &Projectile::ArcToTarget             },
+    {&EV_Projectile_DieInWater,            &Projectile::DieInWater              },
+    {NULL,                                 NULL                                 }
 };
 
 Projectile::Projectile()
 {
-    entflags |= EF_PROJECTILE;
+    entflags |= ECF_PROJECTILE;
 
-    if( LoadingSavegame )
-    {
+    if (LoadingSavegame) {
         // Archive function will setup all necessary data
         return;
     }
 
-    m_beam = NULL;
-    speed = 0;
-    minspeed = 0;
-    damage = 0;
-    life = 5;
-    dmlife = 0;
-    knockback = 0;
-    dlight_radius = 0;
-    dlight_color = Vector( 1, 1, 1 );
-    avelocity = Vector( 0, 0, 0 );
-    mins = Vector( -1, -1, -1 );
-    maxs = Vector( 1, 1, 1 );
-    meansofdeath = MOD_NONE;
-    projFlags = 0;
-    fLastBounceTime = 0;
-    gravity = 0;
-    impactmarkradius = 10;
-    charge_fraction = 1.0;
-    target = NULL;
-    fDrunk = 0;
-    fDrunkRate = 0;
+    minlife              = 0;
+    m_beam               = NULL;
+    speed                = 0;
+    minspeed             = 0;
+    damage               = 0;
+    life                 = 5;
+    dmlife               = 0;
+    knockback            = 0;
+    dlight_radius        = 0;
+    dlight_color         = Vector(1, 1, 1);
+    avelocity            = Vector(0, 0, 0);
+    mins                 = Vector(-1, -1, -1);
+    maxs                 = Vector(1, 1, 1);
+    meansofdeath         = MOD_NONE;
+    projFlags            = 0;
+    fLastBounceTime      = 0;
+    gravity              = 0;
+    impactmarkradius     = 10;
+    charge_fraction      = 1.0;
+    target               = NULL;
+    addownervelocity     = false;
+    fDrunk               = 0;
+    fDrunkRate           = 0;
+    can_hit_owner        = false;
+    remove_when_stopped  = false;
+    m_bExplodeOnTouch    = false;
+    m_bHurtOwnerOnly     = false;
     m_iSmashThroughGlass = 0;
-    addownervelocity = qtrue;
-    can_hit_owner = false;
-    remove_when_stopped = false;
-    m_bExplodeOnTouch = false;
-    m_bHurtOwnerOnly = false;
-    takedamage = DAMAGE_NO;
-    owner = ENTITYNUM_NONE;
-    edict->r.ownerNum = ENTITYNUM_NONE;
+    takedamage           = DAMAGE_NO;
+    owner                = ENTITYNUM_NONE;
+    edict->r.ownerNum    = ENTITYNUM_NONE;
+
+    // Added in 2.0
     m_bArcToTarget = false;
+    // Added in 2.30
     m_bDieInWater = false;
 
     // make this shootable but non-solid on the client
-    setContents( CONTENTS_SHOOTONLY );
+    setContents(CONTENTS_SHOOTONLY);
 
     //
     // touch triggers by default
@@ -661,22 +648,19 @@ Projectile::Projectile()
     flags |= FL_TOUCH_TRIGGERS;
 
     m_iTeam = 0;
+
+    // Added in OPM
     m_bHadPlayerOwner = false;
 }
 
-float Projectile::ResolveMinimumDistance
-    (
-    Entity *potential_target,
-    float currmin
-    )
-
-   {
-   float        currdist;
-    float        dot;
-    Vector    angle;
-    Vector    delta;
-    Vector    norm;
-    float        sine = 0.4f;
+float Projectile::ResolveMinimumDistance(Entity *potential_target, float currmin)
+{
+    float  currdist;
+    float  dot;
+    Vector angle;
+    Vector delta;
+    Vector norm;
+    float  sine = 0.4f;
 
     delta = potential_target->centroid - this->origin;
 
@@ -684,192 +668,153 @@ float Projectile::ResolveMinimumDistance
     norm.normalize();
 
     // Test if the target is in front of the missile
-    dot = norm * orientation[ 0 ];
-    if ( dot < 0 )
-        {
+    dot = norm * orientation[0];
+    if (dot < 0) {
         return currmin;
-        }
-
-    // Test if we're within the rocket's viewcone (45 degree cone)
-    dot = norm * orientation[ 1 ];
-    if ( fabs( dot ) > sine )
-        {
-        return currmin;
-        }
-
-    dot = norm * orientation[ 2 ];
-    if ( fabs( dot ) > sine )
-        {
-        return currmin;
-        }
-
-    currdist = delta.length();
-    if ( currdist < currmin )
-        {
-        currmin = currdist;
-        target = potential_target;
-        }
-
-    return currmin;
     }
 
-float Projectile::AdjustAngle
-    (
-    float maxadjust,
-    float currangle,
-    float targetangle
-    )
+    // Test if we're within the rocket's viewcone (45 degree cone)
+    dot = norm * orientation[1];
+    if (fabs(dot) > sine) {
+        return currmin;
+    }
 
-   {
-   float dangle;
+    dot = norm * orientation[2];
+    if (fabs(dot) > sine) {
+        return currmin;
+    }
+
+    currdist = delta.length();
+    if (currdist < currmin) {
+        currmin = currdist;
+        target  = potential_target;
+    }
+
+    return currmin;
+}
+
+float Projectile::AdjustAngle(float maxadjust, float currangle, float targetangle)
+{
+    float dangle;
     float magangle;
 
     dangle = currangle - targetangle;
 
-    if ( dangle )
-        {
-        magangle = ( float )fabs( dangle );
+    if (dangle) {
+        magangle = (float)fabs(dangle);
 
-        while( magangle >= 360.0f )
-            {
+        while (magangle >= 360.0f) {
             magangle -= 360.0f;
-            }
+        }
 
-        if ( magangle < maxadjust )
-            {
+        if (magangle < maxadjust) {
             currangle = targetangle;
+        } else {
+            if (magangle > 180.0f) {
+                maxadjust = -maxadjust;
             }
-        else 
-            {
-            if ( magangle > 180.0f  )
-                {
+            if (dangle > 0) {
                 maxadjust = -maxadjust;
-                }
-            if ( dangle > 0 )
-                {
-                maxadjust = -maxadjust;
-                }
+            }
             currangle += maxadjust;
-            }
         }
-
-    while( currangle >= 360.0f )
-        {
-        currangle -= 360.0f;
-        }
-
-    while( currangle < 0.0f )
-        {
-        currangle += 360.0f;
-        }
-
-    return currangle;
     }
 
-void Projectile::Drunk
-    (
-    Event *ev
-    )
+    while (currangle >= 360.0f) {
+        currangle -= 360.0f;
+    }
+
+    while (currangle < 0.0f) {
+        currangle += 360.0f;
+    }
+
+    return currangle;
+}
+
+void Projectile::Drunk(Event *ev)
 {
-    if( fDrunk ) {
+    if (fDrunk) {
         return;
     }
 
-    fDrunk = ev->GetFloat( 1 );
-    fDrunkRate = ev->GetFloat( 2 );
+    fDrunk     = ev->GetFloat(1);
+    fDrunkRate = ev->GetFloat(2);
 
-    PostEvent( EV_Projectile_Prethink, 0 );
+    PostEvent(EV_Projectile_Prethink, 0);
 }
 
-void Projectile::HeatSeek
-    (
-    Event *ev
-    )
+void Projectile::HeatSeek(Event *ev)
+{
+    float   mindist;
+    Entity *ent;
+    trace_t trace;
+    Vector  delta;
+    Vector  v;
+    int     n;
+    int     i;
 
-    {
-    float        mindist;
-    Entity    *ent;
-    trace_t  trace;
-    Vector    delta;
-    Vector    v;
-   int      n;
-   int      i;
-
-   if ( ( !target ) || ( target == world ) )
-        {
+    if ((!target) || (target == world)) {
         mindist = 8192.0f;
 
-       n = SentientList.NumObjects();
-       for( i = 1; i <= n; i++ )
-           {
-           ent = SentientList.ObjectAt( i );
-            if ( ent->entnum == owner )
-                {
+        n = SentientList.NumObjects();
+        for (i = 1; i <= n; i++) {
+            ent = SentientList.ObjectAt(i);
+            if (ent->entnum == owner) {
                 continue;
-                }
-
-            if ( ( ( ent->takedamage != DAMAGE_AIM ) || ( ent->health <= 0 ) ) )
-                {
-                continue;
-                }
-
-            trace = G_Trace( this->origin, vec_zero, vec_zero, ent->centroid, this, MASK_SHOT, qfalse, "DrunkMissile::HeatSeek" );
-            if ( ( trace.fraction != 1.0 ) && ( trace.ent != ent->edict ) )
-                {
-                continue;
-                }
-    
-            mindist = ResolveMinimumDistance( ent, mindist );
             }
-        }
-    else 
-        {
-      float angspeed;
 
-      delta = target->centroid - this->origin;
-        v = delta.toAngles();
+            if (((ent->takedamage != DAMAGE_AIM) || (ent->health <= 0))) {
+                continue;
+            }
 
-      angspeed = 5.0f;
-        angles.x = AdjustAngle( angspeed, angles.x, v.x );
-        angles.y = AdjustAngle( angspeed, angles.y, v.y );
-        angles.z = AdjustAngle( angspeed, angles.z, v.z );
+            trace = G_Trace(
+                this->origin, vec_zero, vec_zero, ent->centroid, this, MASK_SHOT, qfalse, "DrunkMissile::HeatSeek"
+            );
+            if ((trace.fraction != 1.0) && (trace.ent != ent->edict)) {
+                continue;
+            }
+
+            mindist = ResolveMinimumDistance(ent, mindist);
         }
-   PostEvent( EV_Projectile_HeatSeek, 0.1f );
-   PostEvent( EV_Projectile_Prethink, 0 );
+    } else {
+        float angspeed;
+
+        delta = target->centroid - this->origin;
+        v     = delta.toAngles();
+
+        angspeed = 5.0f;
+        angles.x = AdjustAngle(angspeed, angles.x, v.x);
+        angles.y = AdjustAngle(angspeed, angles.y, v.y);
+        angles.z = AdjustAngle(angspeed, angles.z, v.z);
     }
+    PostEvent(EV_Projectile_HeatSeek, 0.1f);
+    PostEvent(EV_Projectile_Prethink, 0);
+}
 
-void Projectile::Prethink
-    (
-    Event *ev
-    )
+void Projectile::Prethink(Event *ev)
 {
     Vector end;
 
-    if( fDrunk >= 0.0f )
-    {
-        if( fDrunk )
-        {
+    if (fDrunk >= 0.0f) {
+        if (fDrunk) {
             float rnd1 = G_Random();
             float rnd2 = G_Random();
 
-            angles += Vector( ( rnd1 + rnd1 - 1.0f ) * fDrunk, ( rnd2 + rnd2 - 1.0f ) * fDrunk, 0 );
+            angles += Vector((rnd1 + rnd1 - 1.0f) * fDrunk, (rnd2 + rnd2 - 1.0f) * fDrunk, 0);
 
             speed *= 0.98f;
             fDrunk += fDrunkRate;
-            if( speed < 500.0f )
-            {
+            if (speed < 500.0f) {
                 fDrunk = -fDrunk;
             }
         }
 
-        setAngles( angles );
-        velocity = Vector( orientation[ 0 ] ) * speed;
-    }
-    else
-    {
+        setAngles(angles);
+        velocity = Vector(orientation[0]) * speed;
+    } else {
         fDrunk *= 0.80f;
 
-        if( fDrunk > -1.0f ) {
+        if (fDrunk > -1.0f) {
             fDrunk = -1.0f;
         }
 
@@ -877,285 +822,215 @@ void Projectile::Prethink
         //float rnd2 = rand() & 0x7FFF;
 
         //angles += Vector( ( rnd1 * 0.00003f + rnd1 * 0.00003f - 1.0f ) * fDrunk, ( rnd2 * 0.00003f + rnd2 * 0.00003f - 1.0f ) * fDrunk, 0 );
-        velocity[ 2 ] -= 0.05f * sv_gravity->integer * 0.15f;
+        velocity[2] -= 0.05f * sv_gravity->integer * 0.15f;
 
         angles = velocity.toAngles();
-        setAngles( angles );
+        setAngles(angles);
     }
 
-    PostEvent( EV_Projectile_Prethink, 0.05f );
+    PostEvent(EV_Projectile_Prethink, 0.05f);
 }
 
-void Projectile::AddOwnerVelocity
-   (
-   Event *ev
-   )
+void Projectile::AddOwnerVelocity(Event *ev)
+{
+    addownervelocity = ev->GetBoolean(1);
+}
 
-   {
-   addownervelocity = ev->GetBoolean( 1 );
-   }
+void Projectile::SetAddVelocity(Event *ev)
+{
+    addvelocity.x = ev->GetFloat(1);
+    addvelocity.y = ev->GetFloat(2);
+    addvelocity.z = ev->GetFloat(3);
+}
 
-void Projectile::SetAddVelocity
-   (
-   Event *ev
-   )
+void Projectile::SetExplosionModel(Event *ev)
+{
+    explosionmodel = ev->GetString(1);
+}
 
-   {
-   addvelocity.x = ev->GetFloat( 1 );
-   addvelocity.y = ev->GetFloat( 2 );
-   addvelocity.z = ev->GetFloat( 3 );
-   }
+void Projectile::SetImpactMarkShader(Event *ev)
+{
+    impactmarkshader = ev->GetString(1);
+}
 
-void Projectile::SetExplosionModel
-   (
-   Event *ev
-   )
+void Projectile::SetImpactMarkRadius(Event *ev)
+{
+    impactmarkradius = ev->GetFloat(1);
+}
 
-   {
-   explosionmodel = ev->GetString( 1 );
-   }
+void Projectile::SetImpactMarkOrientation(Event *ev)
+{
+    impactmarkorientation = ev->GetString(1);
+}
 
-void Projectile::SetImpactMarkShader
-   (
-   Event *ev
-   )
-
-   {
-   impactmarkshader = ev->GetString( 1 );
-   }
-
-void Projectile::SetImpactMarkRadius
-   (
-   Event *ev
-   )
-
-   {
-   impactmarkradius = ev->GetFloat( 1 );
-   }
-
-void Projectile::SetImpactMarkOrientation
-   (
-   Event *ev
-   )
-
-   {
-   impactmarkorientation = ev->GetString( 1 );
-   }
-
-void Projectile::Explode
-    (
-    Event *ev
-    )
+void Projectile::Explode(Event *ev)
 {
     Entity *owner;
     Entity *ignoreEnt = NULL;
 
-    if( !CheckTeams() )
-    {
-        PostEvent( EV_Remove, EV_REMOVE );
+    if (!CheckTeams()) {
+        PostEvent(EV_Remove, EV_REMOVE);
         return;
     }
 
-    if( ev->NumArgs() == 1 )
-        ignoreEnt = ev->GetEntity( 1 );
+    if (ev->NumArgs() == 1) {
+        ignoreEnt = ev->GetEntity(1);
+    }
 
     // Get the owner of this projectile
-    owner = G_GetEntity( this->owner );
+    owner = G_GetEntity(this->owner);
 
     // If the owner's not here, make the world the owner
-    if( !owner )
+    if (!owner) {
         owner = world;
+    }
 
-    if( owner->IsDead() || owner == world )
+    if (owner->IsDead() || owner == world) {
         weap = NULL;
+    }
 
-    health = 0;
-    deadflag = DEAD_DEAD;
+    health     = 0;
+    deadflag   = DEAD_DEAD;
     takedamage = DAMAGE_NO;
 
     // Spawn an explosion model
-    if( explosionmodel.length() )
-    {
+    if (explosionmodel.length()) {
         // Move the projectile back off the surface a bit so we can see
         // explosion effects.
         Vector dir, v;
-        v = velocity;
-        v.normalize();
-        dir = v;
-        v = origin - v * 36;
-        setOrigin( v );
+        dir = velocity;
+        if (dir.normalize() == 0) {
+            vec3_t forward;
+            AngleVectors(angles, forward, NULL, NULL);
+            dir = forward;
+        }
+        v = origin;
 
-        ExplosionAttack( v, owner, explosionmodel, dir, ignoreEnt, 1.0f, weap, m_bHurtOwnerOnly );
+        ExplosionAttack(v, owner, explosionmodel, dir, ignoreEnt, 1.0f, weap, m_bHurtOwnerOnly);
     }
 
-    CancelEventsOfType( EV_Projectile_UpdateBeam );
+    CancelEventsOfType(EV_Projectile_UpdateBeam);
 
     // Kill the beam
-    if( m_beam )
-    {
-        m_beam->ProcessEvent( EV_Remove );
+    if (m_beam) {
+        m_beam->ProcessEvent(EV_Remove);
         m_beam = NULL;
     }
 
     // Remove the projectile
-    PostEvent( EV_Remove, level.frametime );
+    PostEvent(EV_Remove, level.frametime);
 }
 
-void Projectile::SetBounceTouch
-    (
-    Event *ev
-    )
+void Projectile::SetBounceTouch(Event *ev)
 {
     projFlags |= P_BOUNCE_TOUCH;
-    setMoveType( MOVETYPE_BOUNCE );
+    setMoveType(MOVETYPE_BOUNCE);
 }
 
-void Projectile::SetNoTouchDamage
-    (
-    Event *ev
-    )
+void Projectile::SetNoTouchDamage(Event *ev)
 {
     projFlags |= P_NO_TOUCH_DAMAGE;
 }
 
-void Projectile::SetSmashThroughGlass
-    (
-    Event *ev
-    )
+void Projectile::SetSmashThroughGlass(Event *ev)
 {
-    m_iSmashThroughGlass = ev->GetInteger( 1 );
+    m_iSmashThroughGlass = ev->GetInteger(1);
 
-    PostEvent( EV_Projectile_SmashThroughGlass, level.frametime );
+    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
 }
 
-void Projectile::SmashThroughGlassThink
-    (
-    Event *ev
-    )
+void Projectile::SmashThroughGlassThink(Event *ev)
 {
-    if( velocity.length() > m_iSmashThroughGlass )
-    {
-        Vector vEnd;
+    SmashThroughGlassThink();
+
+    PostEvent(EV_Projectile_SmashThroughGlass, level.frametime);
+}
+
+void Projectile::SmashThroughGlassThink()
+{
+    if (velocity.length() > m_iSmashThroughGlass) {
+        Vector  vEnd;
         trace_t trace;
 
-        Entity *ent = G_GetEntity( owner );
+        Entity *ent = G_GetEntity(owner);
 
         vEnd = velocity * level.frametime + velocity * level.frametime + origin;
 
-        trace = G_Trace( origin,
-            vec_zero,
-            vec_zero,
-            vEnd,
-            ent,
-            MASK_BEAM,
-            false,
-            "SmashThroughGlassThink" );
+        trace = G_Trace(origin, vec_zero, vec_zero, vEnd, ent, MASK_BEAM, false, "SmashThroughGlassThink");
 
-        if( ( trace.ent ) && ( trace.ent->entity != world ) )
-        {
+        if ((trace.ent) && (trace.ent->entity != world)) {
             Entity *obj = trace.ent->entity;
 
-            if( ( trace.surfaceFlags & SURF_GLASS ) && ( obj->takedamage ) )
-            {
-                obj->Damage( this,
-                    ent,
-                    obj->health + 1,
-                    origin,
-                    velocity,
-                    trace.plane.normal,
-                    knockback,
-                    0,
-                    meansofdeath
-                    );
+            if ((trace.surfaceFlags & SURF_GLASS) && (obj->takedamage)) {
+                obj->Damage(
+                    this, ent, obj->health + 1, origin, velocity, trace.plane.normal, knockback, 0, meansofdeath
+                );
             }
         }
     }
-
-    PostEvent( EV_Projectile_SmashThroughGlass, level.frametime );
 }
 
-void Projectile::BeamCommand
-   (
-   Event *ev
-   )
-
-   {
-   int i;
-
-   if ( !m_beam )
-      {
-      m_beam = new FuncBeam;
-
-      m_beam->setOrigin( this->origin );
-      m_beam->Ghost( NULL );
-      }
-   
-   Event *beamev = new Event( ev->GetToken( 1 ) );
-
-   for( i=2; i<=ev->NumArgs(); i++ )
-      {
-      beamev->AddToken( ev->GetToken( i ) );
-      }
-
-   m_beam->ProcessEvent( beamev );
-   PostEvent( EV_Projectile_UpdateBeam, level.frametime );
-   }
-
-void Projectile::UpdateBeam
-   (
-   Event *ev
-   )
-
-   {
-   if ( m_beam )
-      {
-      m_beam->setOrigin( this->origin );
-      PostEvent( EV_Projectile_UpdateBeam, level.frametime );
-      }
-   }
-
-void Projectile::SetBounceSound
-    (
-    Event *ev
-    )
+void Projectile::BeamCommand(Event *ev)
 {
-    bouncesound = ev->GetString( 1 );
+    int i;
+
+    if (!m_beam) {
+        m_beam = new FuncBeam;
+
+        m_beam->setOrigin(this->origin);
+        m_beam->Ghost(NULL);
+    }
+
+    Event *beamev = new Event(ev->GetToken(1));
+
+    for (i = 2; i <= ev->NumArgs(); i++) {
+        beamev->AddToken(ev->GetToken(i));
+    }
+
+    m_beam->ProcessEvent(beamev);
+    PostEvent(EV_Projectile_UpdateBeam, level.frametime);
 }
 
-void Projectile::SetBounceSoundMetal
-    (
-    Event *ev
-    )
+void Projectile::UpdateBeam(Event *ev)
 {
-    bouncesound_metal = ev->GetString( 1 );
+    if (m_beam) {
+        m_beam->setOrigin(this->origin);
+        PostEvent(EV_Projectile_UpdateBeam, level.frametime);
+    }
 }
 
-void Projectile::SetBounceSoundHard
-    (
-    Event *ev
-    )
+void Projectile::SetBounceSound(Event *ev)
 {
-    bouncesound_hard = ev->GetString( 1 );
+    bouncesound = ev->GetString(1);
 }
 
-void Projectile::SetBounceSoundWater
-    (
-    Event *ev
-    )
+void Projectile::SetBounceSoundMetal(Event *ev)
 {
-    bouncesound_water = ev->GetString( 1 );
+    bouncesound_metal = ev->GetString(1);
 }
 
-void Projectile::SetChargeLife
-   (
-   Event *ev
-   )
+void Projectile::SetBounceSoundHard(Event *ev)
+{
+    bouncesound_hard = ev->GetString(1);
+}
 
-   {
-   projFlags   |= P_CHARGE_LIFE;
-   }
+void Projectile::SetBounceSoundWater(Event *ev)
+{
+    bouncesound_water = ev->GetString(1);
+}
 
-void Projectile::SetFuse(Event* ev)
+void Projectile::SetChargeLife(Event *ev)
+{
+    if (ev->NumArgs() <= 0 || ev->GetInteger(1)) {
+        projFlags |= P_CHARGE_LIFE;
+    } else {
+        // Added in 2.0
+        //  Allow disabling the charge life when set to 0
+        projFlags &= ~P_CHARGE_LIFE;
+    }
+}
+
+void Projectile::SetFuse(Event *ev)
 {
     if (ev->GetInteger(1)) {
         projFlags |= P_FUSE;
@@ -1164,398 +1039,340 @@ void Projectile::SetFuse(Event* ev)
     }
 }
 
-void Projectile::SetMinLife
-   (
-   Event *ev
-   )
-
-   {
-   minlife  = ev->GetFloat( 1 );
-   projFlags   |= P_CHARGE_LIFE;
-   }
-
-void Projectile::SetLife
-    (
-    Event *ev
-    )
+void Projectile::SetMinLife(Event *ev)
 {
-    life = ev->GetFloat( 1 );
-}
-
-void Projectile::SetDMLife
-    (
-    Event *ev
-    )
-{
-    dmlife = ev->GetFloat( 1 );
-}
-
-void Projectile::SetSpeed
-   (
-   Event *ev
-   )
-
-   {
-   speed = ev->GetFloat( 1 );
-   }
-
-void Projectile::SetMinSpeed
-   (
-   Event *ev
-   )
-
-   {
-   minspeed = ev->GetFloat( 1 );
-   projFlags   |= P_CHARGE_SPEED;
-   }
-
-void Projectile::SetChargeSpeed
-   (
-   Event *ev
-   )
-
-   {
-   projFlags   |= P_CHARGE_SPEED;
-   }
-
-void Projectile::SetAvelocity
-   (
-   Event *ev
-   )
-
-   {
-   int i=1;
-   int j=0;
-   str vel;
-
-   if ( ev->NumArgs() < 3 )
-      {
-      warning( "ClientGameCommandManager::SetAngularVelocity", "Expecting at least 3 args for command randvel" );
-      }
-
-   while ( j < 3 )
-      {      
-      vel = ev->GetString( i++ );
-      if ( vel == "crandom" )
-         {
-         avelocity[j++] = ev->GetFloat( i++ ) * crandom();
-         }
-      else if ( vel == "random" )
-         {
-         avelocity[j++] = ev->GetFloat( i++ ) * random();
-         }
-      else
-         {
-         avelocity[j++] = atof( vel.c_str() );
-         }
-      }
-   }
-
-void Projectile::SetDamage
-   (
-   Event *ev
-   )
-
-   {
-   damage = ev->GetFloat( 1 );
-   }
-
-void Projectile::SetKnockback
-   (
-   Event *ev
-   )
-
-   {
-   knockback = ev->GetFloat( 1 );
-   }
-
-void Projectile::SetDLight
-   (
-   Event *ev
-   )
-
-   {
-   dlight_color[0] = ev->GetFloat( 1 );
-   dlight_color[1] = ev->GetFloat( 2 );
-   dlight_color[2] = ev->GetFloat( 3 );
-   dlight_radius   = ev->GetFloat( 4 );
-   }
-
-void Projectile::SetMeansOfDeath
-   (
-   Event *ev
-   )
-
-   {
-    meansofdeath = (meansOfDeath_t )MOD_string_to_int( ev->GetString( 1 ) );
-   }
-
-void Projectile::DoDecal
-    (
-    void
-    )
-{
-    if( impactmarkshader.length() )
-    {
-        Decal *decal = new Decal;
-        decal->setShader( impactmarkshader );
-        decal->setOrigin( level.impact_trace.endpos );
-        decal->setDirection( level.impact_trace.plane.normal );
-        decal->setOrientation( impactmarkorientation );
-        decal->setRadius( impactmarkradius );
+    minlife = ev->GetFloat(1);
+    if (minlife > 0) {
+        projFlags |= P_CHARGE_LIFE;
+    } else {
+        // Added in 2.0
+        //  Allow disabling the charge life when set to 0
+        projFlags &= ~P_CHARGE_LIFE;
     }
 }
 
-void Projectile::Touch
-    (
-    Event *ev
-    )
+void Projectile::SetLife(Event *ev)
 {
-    Entity   *other;
-    Entity   *owner;
-    str      realname;
+    life = ev->GetFloat(1);
+}
+
+void Projectile::SetDMLife(Event *ev)
+{
+    dmlife = ev->GetFloat(1);
+}
+
+void Projectile::SetSpeed(Event *ev)
+
+{
+    speed = ev->GetFloat(1);
+}
+
+void Projectile::SetMinSpeed(Event *ev)
+{
+    minspeed = ev->GetFloat(1);
+    projFlags |= P_CHARGE_SPEED;
+}
+
+void Projectile::SetChargeSpeed(Event *ev)
+{
+    projFlags |= P_CHARGE_SPEED;
+}
+
+void Projectile::SetAvelocity(Event *ev)
+{
+    int i = 1;
+    int j = 0;
+    str vel;
+
+    if (ev->NumArgs() < 3) {
+        warning("ClientGameCommandManager::SetAngularVelocity", "Expecting at least 3 args for command randvel");
+    }
+
+    while (j < 3) {
+        vel = ev->GetString(i++);
+        if (vel == "crandom") {
+            avelocity[j++] = ev->GetFloat(i++) * crandom();
+        } else if (vel == "random") {
+            avelocity[j++] = ev->GetFloat(i++) * random();
+        } else {
+            avelocity[j++] = atof(vel.c_str());
+        }
+    }
+}
+
+void Projectile::SetDamage(Event *ev)
+{
+    damage = ev->GetFloat(1);
+}
+
+void Projectile::SetKnockback(Event *ev)
+{
+    knockback = ev->GetFloat(1);
+}
+
+void Projectile::SetDLight(Event *ev)
+{
+    dlight_color[0] = ev->GetFloat(1);
+    dlight_color[1] = ev->GetFloat(2);
+    dlight_color[2] = ev->GetFloat(3);
+    dlight_radius   = ev->GetFloat(4);
+}
+
+void Projectile::SetMeansOfDeath(Event *ev)
+{
+    meansofdeath = (meansOfDeath_t)MOD_string_to_int(ev->GetString(1));
+}
+
+void Projectile::DoDecal(void)
+{
+    if (impactmarkshader.length()) {
+        Decal *decal = new Decal;
+        decal->setShader(impactmarkshader);
+        decal->setOrigin(level.impact_trace.endpos);
+        decal->setDirection(level.impact_trace.plane.normal);
+        decal->setOrientation(impactmarkorientation);
+        decal->setRadius(impactmarkradius);
+    }
+}
+
+void Projectile::Touch(Event *ev)
+{
+    Entity *other;
+    Entity *owner;
+    str     realname;
 
     // Other is what got hit
-    other = ev->GetEntity( 1 );
-    assert( other );
+    other = ev->GetEntity(1);
+    assert(other);
 
     // Don't touch teleporters
-    if( other->isSubclassOf( Teleporter ) )
-    {
+    if (other->isSubclassOf(Teleporter)) {
         return;
     }
 
     // Can't hit yourself with a projectile
-    if( other->entnum == this->owner )
-    {
+    if (other->entnum == this->owner) {
         return;
     }
 
     // Remove it if we hit the sky
-    if( HitSky() )
-    {
-        PostEvent( EV_Remove, 0 );
+    if (HitSky()) {
+        PostEvent(EV_Remove, 0);
         return;
     }
 
-    if( !CheckTeams() )
-    {
-        PostEvent( EV_Remove, EV_REMOVE );
+    if (!CheckTeams()) {
+        PostEvent(EV_Remove, EV_REMOVE);
         return;
     }
 
     // Bouncy Projectile
-    if( ( projFlags & P_BOUNCE_TOUCH ) )
-    {
+    if ((projFlags & P_BOUNCE_TOUCH)) {
         str snd;
+        int flags;
 
-        if( level.time - fLastBounceTime < 0.1f )
-        {
+        if (level.time - fLastBounceTime < 0.1f) {
             fLastBounceTime = level.time;
             return;
         }
 
-        if( level.impact_trace.surfaceFlags & SURF_PUDDLE || ( gi.pointcontents( level.impact_trace.endpos, 0 ) & ( CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA ) ) )
-        {
-            if( bouncesound_water.length() )
-                this->Sound( bouncesound_water, CHAN_BODY );
+        if (level.impact_trace.surfaceFlags & SURF_PUDDLE
+            || (gi.pointcontents(level.impact_trace.endpos, 0) & (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA))) {
+            if (bouncesound_water.length()) {
+                this->Sound(bouncesound_water, CHAN_BODY);
+            }
+
+            //
+            // Added in 2.30
+            //
+            if (m_bDieInWater) {
+                PostEvent(EV_Remove, 0.5f);
+            }
+
+            return;
         }
-        else
-        {
-            if( bouncesound_metal.length() )
-            {
-                snd = bouncesound_metal;
-            }
-            else if( bouncesound_hard.length() )
-            {
-                snd = bouncesound_hard;
-            }
-            else
-            {
-                snd = bouncesound;
-            }
 
-            int flags = level.impact_trace.surfaceFlags;
+        if (bouncesound_metal.length()) {
+            snd = bouncesound_metal;
+        } else if (bouncesound_hard.length()) {
+            snd = bouncesound_hard;
+        } else {
+            snd = bouncesound;
+        }
 
-            if( flags & SURF_MUD )
-            {
-                if( bouncesound.length() )
-                    Sound( bouncesound, CHAN_BODY );
+        flags = level.impact_trace.surfaceFlags;
+
+        if (flags & SURF_MUD) {
+            if (bouncesound.length()) {
+                Sound(bouncesound, CHAN_BODY);
             }
-            else if( flags & SURF_ROCK )
-            {
-                if( bouncesound_hard.length() )
-                    Sound( bouncesound_hard, CHAN_BODY );
+        } else if (flags & SURF_ROCK) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
             }
-            else if( flags & SURF_GRILL )
-            {
-                if( bouncesound_metal.length() )
-                    Sound( bouncesound_metal, CHAN_BODY );
+        } else if (flags & SURF_GRILL) {
+            if (bouncesound_metal.length()) {
+                Sound(bouncesound_metal, CHAN_BODY);
             }
-            else if( flags & SURF_WOOD )
-            {
-                if( bouncesound_hard.length() )
-                    Sound( bouncesound_hard, CHAN_BODY );
+        } else if (flags & SURF_WOOD) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
             }
-            else if( flags & SURF_METAL )
-            {
-                if( bouncesound_metal.length() )
-                    Sound( bouncesound_metal, CHAN_BODY );
+        } else if (flags & SURF_METAL) {
+            if (bouncesound_metal.length()) {
+                Sound(bouncesound_metal, CHAN_BODY);
             }
-            else if( flags & SURF_GLASS )
-            {
-                if( bouncesound_hard.length() )
-                    Sound( bouncesound_hard, CHAN_BODY );
+        } else if (flags & SURF_GLASS) {
+            if (bouncesound_hard.length()) {
+                Sound(bouncesound_hard, CHAN_BODY);
             }
-            else
-            {
-                if( bouncesound.length() )
-                    Sound( bouncesound, CHAN_BODY );
+        } else {
+            if (bouncesound.length()) {
+                Sound(bouncesound, CHAN_BODY);
             }
         }
 
-        BroadcastAIEvent( AI_EVENT_WEAPON_IMPACT );
+        BroadcastAIEvent(AI_EVENT_WEAPON_IMPACT);
+        fLastBounceTime = level.time;
+
         return;
     }
 
-    if( !m_bExplodeOnTouch && damage == 0.0f )
+    if (!m_bExplodeOnTouch && damage == 0.0f) {
         return;
+    }
 
     // Get the owner of this projectile
-    owner = G_GetEntity( this->owner );
+    owner = G_GetEntity(this->owner);
 
     // If the owner's not here, make the world the owner
-    if( !owner )
+    if (!owner) {
         owner = world;
-
-    if( owner->IsDead() || owner == world )
-        weap = NULL;
-
-    // Damage the thing that got hit
-    if( other->takedamage )
-    {
-        other->Damage( this,
-            owner,
-            damage,
-            origin,
-            velocity,
-            level.impact_trace.plane.normal,
-            knockback,
-            0,
-            meansofdeath
-            );
     }
 
-    if( !g_gametype->integer && weap )
-    {
-        if( other->IsSubclassOfPlayer() ||
-            other->IsSubclassOfVehicle() ||
-            other->IsSubclassOfVehicleTank() ||
-            other->isSubclassOf( VehicleCollisionEntity ) )
-        {
-            weap->m_iNumHits++;
-            weap->m_iNumTorsoShots++;
+    if (owner->IsDead() || owner == world) {
+        weap = NULL;
+    }
 
-            if( weap->IsSubclassOfVehicleTurretGun() )
-            {
-                VehicleTurretGun *t = ( VehicleTurretGun * )weap.Pointer();
-                Player *p = ( Player * )t->GetRemoteOwner().Pointer();
+    // Damage the thing that got hit
+    if (other->takedamage) {
+        other->Damage(
+            this, owner, damage, origin, velocity, level.impact_trace.plane.normal, knockback, 0, meansofdeath
+        );
 
-                if( p && p->IsSubclassOfPlayer() )
-                {
-                    p->m_iNumHits++;
-                    p->m_iNumTorsoShots++;
+        if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
+            if (other->IsSubclassOfSentient() || other->IsSubclassOfVehicle() || other->IsSubclassOfVehicleTank()
+                || other->isSubclassOf(VehicleCollisionEntity)) {
+                weap->m_iNumHits++;
+                weap->m_iNumTorsoShots++;
+
+                if (weap->IsSubclassOfVehicleTurretGun()) {
+                    VehicleTurretGun *t = (VehicleTurretGun *)weap.Pointer();
+                    Player           *p = (Player *)t->GetRemoteOwner().Pointer();
+
+                    if (p && p->IsSubclassOfPlayer()) {
+                        p->m_iNumHits++;
+                        p->m_iNumTorsoShots++;
+                    }
                 }
             }
         }
     }
 
-    if( !m_bExplodeOnTouch )
+    if (!m_bExplodeOnTouch) {
         return;
+    }
 
     // Make the projectile not solid
-    setSolidType( SOLID_NOT );
-    setMoveType( MOVETYPE_NONE );
+    setSolidType(SOLID_NOT);
+    setMoveType(MOVETYPE_NONE);
     hideModel();
 
     // Do a decal
     DoDecal();
 
-    BroadcastAIEvent( AI_EVENT_WEAPON_FIRE );
+    BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
 
     // Remove the projectile
-    PostEvent( EV_Remove, 0 );
+    PostEvent(EV_Remove, 0);
 
     // Call the explosion event
     Event *explEv;
-    explEv = new Event( EV_Projectile_Explode );
-    explEv->AddEntity( other );
-    ProcessEvent( explEv );
+    explEv = new Event(EV_Projectile_Explode);
+    explEv->AddEntity(other);
+    ProcessEvent(explEv);
+
+    //
+    // Added in 2.30
+    //  Check for projectile vulnerability
+    //
+
+    Vehicle *pVehicle = NULL;
+
+    if (other->IsSubclassOfVehicle()) {
+        pVehicle = static_cast<Vehicle *>(other);
+    } else if (other->IsSubclassOfVehicleTurretGun()) {
+        VehicleTurretGun *pTurret = static_cast<VehicleTurretGun *>(other);
+        Entity           *pEnt    = pTurret->GetVehicle();
+        if (pEnt && pEnt->IsSubclassOfVehicle()) {
+            pVehicle = static_cast<Vehicle *>(pEnt);
+        }
+    } else if (other->isSubclassOf(VehicleCollisionEntity)) {
+        VehicleCollisionEntity *pCollision = static_cast<VehicleCollisionEntity *>(other);
+
+        if (pCollision && pCollision->GetOwner()->IsSubclassOfVehicle()) {
+            pVehicle = static_cast<Vehicle *>(pCollision->GetOwner());
+        }
+    }
+
+    if (pVehicle && pVehicle->GetProjectileHitsRemaining() > 0) {
+        pVehicle->DoProjectileVulnerability(this, owner, meansofdeath);
+    }
 }
 
-void Projectile::SetCanHitOwner
-   (
-   Event *ev
-   )
-
-   {
+void Projectile::SetCanHitOwner(Event *ev)
+{
     can_hit_owner = true;
-    }
+}
 
-void Projectile::ClearOwner
-   (
-   Event *ev
-   )
-
-   {
-    this->owner     = ENTITYNUM_NONE;
+void Projectile::ClearOwner(Event *ev)
+{
+    this->owner       = ENTITYNUM_NONE;
     edict->r.ownerNum = ENTITYNUM_NONE;
-    }
+}
 
-void Projectile::RemoveWhenStopped
-    (
-    Event *ev
-    )
+void Projectile::RemoveWhenStopped(Event *ev)
 {
     remove_when_stopped = true;
 }
 
-void Projectile::ExplodeOnTouch
-    (
-    Event *ev
-    )
+void Projectile::ExplodeOnTouch(Event *ev)
 {
     m_bExplodeOnTouch = true;
 }
 
-Sentient *Projectile::GetOwner
-    (
-    void
-    )
+Sentient *Projectile::GetOwner(void)
 {
     Sentient *pOwner = (Sentient *)G_GetEntity(owner);
-    if (!pOwner || !pOwner->IsSubclassOfSentient())
+    if (!pOwner || !pOwner->IsSubclassOfSentient()) {
         return NULL;
-    else
+    } else {
         return pOwner;
+    }
 }
 
-void Projectile::SetOwner
-    (
-    Entity *owner
-    )
+void Projectile::SetOwner(Entity *owner)
 {
-    if (owner)
-    {
-        this->owner = owner->entnum;
+    if (owner) {
+        this->owner       = owner->entnum;
         edict->r.ownerNum = owner->entnum;
 
-        if (owner->IsSubclassOfPlayer())
-        {
-            Player* p = (Player*)owner;
-            m_iTeam = p->GetTeam();
-            // this was added in openmohaa to prevent glitches
-            // like when the player disconnects or when the player spectates
+        if (owner->IsSubclassOfPlayer()) {
+            Player *p = (Player *)owner;
+            m_iTeam   = p->GetTeam();
+            // Added in OPM
+            //  this was added to prevent glitches, like when the player
+            //  disconnects or when the player spectates
             m_bHadPlayerOwner = true;
         }
 
@@ -1563,19 +1380,17 @@ void Projectile::SetOwner
     }
 }
 
-void Projectile::ArcToTarget(Event* ev)
+void Projectile::ArcToTarget(Event *ev)
 {
     m_bArcToTarget = true;
     PostEvent(EV_Projectile_Prethink, 0);
 }
 
-void Projectile::BecomeBomb(Event* ev)
+void Projectile::BecomeBomb(Event *ev)
 {
-    if (ev->NumArgs() > 0)
-    {
-        Entity* ent = ev->GetEntity(1);
-        if (ent)
-        {
+    if (ev->NumArgs() > 0) {
+        Entity *ent = ev->GetEntity(1);
+        if (ent) {
             owner = ent->entnum;
             setOrigin(ent->origin - Vector(0, 0, 48));
             setAngles(ent->angles);
@@ -1584,27 +1399,24 @@ void Projectile::BecomeBomb(Event* ev)
     }
 
     m_bExplodeOnTouch = true;
-    gravity = 1.f;
+    gravity           = 1.f;
     setMoveType(MOVETYPE_BOUNCE);
     setSolidType(SOLID_BBOX);
     edict->clipmask = MASK_PROJECTILE;
     setSize(mins, maxs);
 }
 
-void Projectile::DieInWater(Event* ev)
+void Projectile::DieInWater(Event *ev)
 {
     m_bDieInWater = true;
 }
 
-void Projectile::Stopped
-   (
-   Event *ev
-   )
-
-   {
-    if ( remove_when_stopped )
-        PostEvent( EV_Remove, 0 );
+void Projectile::Stopped(Event *ev)
+{
+    if (remove_when_stopped) {
+        PostEvent(EV_Remove, 0);
     }
+}
 
 void Projectile::Think()
 {
@@ -1612,14 +1424,13 @@ void Projectile::Think()
 
     avelocity.x *= 1.3f;
     angle = AngleNormalize180(angles.x);
-    spin = avelocity.x * level.frametime + angle;
+    spin  = avelocity.x * level.frametime + angle;
 
     if ((angle >= 0 || spin <= 0) && (angle <= 0 || spin >= 0)) {
         angle = AngleNormalize360(angles.x);
-        spin = avelocity.x * level.frametime + angle;
+        spin  = avelocity.x * level.frametime + angle;
 
-        if ((angle < 180 && spin > 180) || (angle > 180 && spin < 180))
-        {
+        if ((angle < 180 && spin > 180) || (angle > 180 && spin < 180)) {
             setAngles(Vector(0, angles.y + 180, angles.z));
             avelocity = vec_zero;
             flags &= ~FL_THINK;
@@ -1631,45 +1442,32 @@ void Projectile::Think()
     }
 }
 
-bool Projectile::CheckTeams
-    (
-    void
-    )
+bool Projectile::CheckTeams(void)
 {
-    Player* pOwner;
+    Player *pOwner;
 
-    if (g_gametype->integer == GT_SINGLE_PLAYER)
-    {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
         // Ignore in single-player mode
         return true;
     }
 
-    pOwner = (Player*)m_pOwnerPtr.Pointer();
+    pOwner = (Player *)m_pOwnerPtr.Pointer();
 
-    if (!pOwner)
-    {
+    if (!pOwner) {
         // Owner disconnected
-        if (m_bHadPlayerOwner)
-        {
+        if (m_bHadPlayerOwner) {
             return false;
-        }
-        else
-        {
+        } else {
             return true;
         }
     }
 
-    if (pOwner->IsSubclassOfPlayer())
-    {
-        if (m_iTeam != TEAM_NONE && m_iTeam != pOwner->GetTeam())
-        {
+    if (pOwner->IsSubclassOfPlayer()) {
+        if (m_iTeam != TEAM_NONE && m_iTeam != pOwner->GetTeam()) {
             return false;
         }
-    }
-    else if (pOwner->IsSubclassOfSentient())
-    {
-        if (m_iTeam != pOwner->m_Team)
-        {
+    } else if (pOwner->IsSubclassOfSentient()) {
+        if (m_iTeam != pOwner->m_Team) {
             return false;
         }
     }
@@ -1678,233 +1476,196 @@ bool Projectile::CheckTeams
 }
 
 Event EV_Explosion_Radius
-   (
-   "radius",
-   EV_DEFAULT,
-   "f",
-   "projectileRadius",
-   "set the radius for the explosion",
-   EV_NORMAL
-   );
+(
+    "radius",
+    EV_DEFAULT,
+    "f",
+    "projectileRadius",
+    "set the radius for the explosion",
+    EV_NORMAL
+);
 Event EV_Explosion_ConstantDamage
-   (
-   "constantdamage",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Makes the explosion do constant damage over the radius",
-   EV_NORMAL
-   );
+(
+    "constantdamage",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the explosion do constant damage over the radius",
+    EV_NORMAL
+);
 Event EV_Explosion_DamageEveryFrame
-   (
-   "damageeveryframe",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "Makes the explosion damage every frame",
-   EV_NORMAL
-   );
+(
+    "damageeveryframe",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the explosion damage every frame",
+    EV_NORMAL
+);
 Event EV_Explosion_DamageAgain
-   (
-   "damageagain",
-   EV_DEFAULT,
-   NULL,
-   NULL,
-   "This event is generated each frame if explosion is set to damage each frame",
-   EV_NORMAL
-   );
+(
+    "damageagain",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "This event is generated each frame if explosion is set to damage each frame",
+    EV_NORMAL
+);
 Event EV_Explosion_Flash
-   (
-   "flash",
-   EV_DEFAULT,
-   "fffff",
-   "time r g b radius",
-   "Flash player screens",
-   EV_NORMAL
-   );
+(
+    "flash",
+    EV_DEFAULT,
+    "fffff",
+    "time r g b radius",
+    "Flash player screens",
+    EV_NORMAL
+);
 Event EV_Explosion_RadiusDamage
-   (
-   "radiusdamage",
-   EV_DEFAULT,
-   "f",
-   "radiusDamage",
-   "set the radius damage an explosion does",
-   EV_NORMAL
-   );
+(
+    "radiusdamage",
+    EV_DEFAULT,
+    "f",
+    "radiusDamage",
+    "set the radius damage an explosion does",
+    EV_NORMAL
+);
 Event EV_Explosion_Effect
-    (
+(
     "explosioneffect",
     EV_DEFAULT,
     "s",
     "explosiontype",
     "Make an explosionType explosion effect",
     EV_NORMAL
-    );
+);
 
-
-CLASS_DECLARATION( Projectile, Explosion, NULL )
-{
-    { &EV_Explosion_Radius,                        &Explosion::SetRadius },
-    { &EV_Explosion_ConstantDamage,                &Explosion::SetConstantDamage },
-    { &EV_Explosion_DamageEveryFrame,            &Explosion::SetDamageEveryFrame },
-    { &EV_Explosion_DamageAgain,                &Explosion::DamageAgain },
-    { &EV_Explosion_Flash,                           &Explosion::SetFlash },
-    { &EV_Explosion_RadiusDamage,                  &Explosion::SetRadiusDamage },
-    { &EV_Explosion_Effect,                           &Explosion::MakeExplosionEffect },
-    { NULL, NULL }
+CLASS_DECLARATION(Projectile, Explosion, NULL) {
+    {&EV_Explosion_Radius,           &Explosion::SetRadius          },
+    {&EV_Explosion_ConstantDamage,   &Explosion::SetConstantDamage  },
+    {&EV_Explosion_DamageEveryFrame, &Explosion::SetDamageEveryFrame},
+    {&EV_Explosion_DamageAgain,      &Explosion::DamageAgain        },
+    {&EV_Explosion_Flash,            &Explosion::SetFlash           },
+    {&EV_Explosion_RadiusDamage,     &Explosion::SetRadiusDamage    },
+    {&EV_Explosion_Effect,           &Explosion::MakeExplosionEffect},
+    {NULL,                           NULL                           }
 };
 
 Explosion::Explosion()
 {
-    if( LoadingSavegame )
-    {
+    if (LoadingSavegame) {
         // Archive function will setup all necessary data
         return;
     }
 
-    radius = 0;
-    constant_damage = false;
+    flash_r            = 0;
+    flash_g            = 0;
+    flash_b            = 0;
+    flash_a            = 0;
+    flash_radius       = 0;
+    radius             = 0;
+    constant_damage    = false;
     damage_every_frame = false;
-    flash_time = 0;
-    flash_type = 0;
-    owner = ENTITYNUM_NONE;
-    hurtOwnerOnly = false;
+    flash_time         = 0;
+    flash_type         = 0;
+    owner              = ENTITYNUM_NONE;
+    hurtOwnerOnly      = false;
 }
 
-void Explosion::SetFlash
-   (
-   Event *ev
-   )
+void Explosion::SetFlash(Event *ev)
+{
+    flash_time   = ev->GetFloat(1);
+    flash_r      = ev->GetFloat(2);
+    flash_g      = ev->GetFloat(3);
+    flash_b      = ev->GetFloat(4);
+    flash_a      = ev->GetFloat(5);
+    flash_radius = ev->GetFloat(6);
+    flash_type   = 0;
 
-   {
-   flash_time     = ev->GetFloat( 1 );
-   flash_r        = ev->GetFloat( 2 );
-   flash_g        = ev->GetFloat( 3 );
-   flash_b        = ev->GetFloat( 4 );
-   flash_a        = ev->GetFloat( 5 );
-   flash_radius   = ev->GetFloat( 6 );
-   flash_type     = 0;
+    if (ev->NumArgs() > 6) {
+        str t = ev->GetString(7);
 
-   if ( ev->NumArgs() > 6 ) 
-      {
-      str t = ev->GetString( 7 );
-      
-      if ( !t.icmp( "addblend" ) )
-         flash_type = 1;
-      else if ( !t.icmp( "alphablend" ) )
-         flash_type = 0;
-      }
-   }
+        if (!t.icmp("addblend")) {
+            flash_type = 1;
+        } else if (!t.icmp("alphablend")) {
+            flash_type = 0;
+        }
+    }
+}
 
-void Explosion::SetRadius
-   (
-   Event *ev
-   )
+void Explosion::SetRadius(Event *ev)
+{
+    radius = ev->GetFloat(1);
+}
 
-   {
-   radius = ev->GetFloat( 1 );
-   }
+void Explosion::SetRadiusDamage(Event *ev)
+{
+    radius_damage = ev->GetFloat(1);
+}
 
-void Explosion::SetRadiusDamage
-   (
-   Event *ev
-   )
+void Explosion::SetConstantDamage(Event *ev)
+{
+    constant_damage = true;
+}
 
-   {
-   radius_damage = ev->GetFloat( 1 );
-   }
+void Explosion::SetDamageEveryFrame(Event *ev)
+{
+    damage_every_frame = true;
+}
 
-void Explosion::SetConstantDamage
-   (
-   Event *ev
-   )
-
-   {
-   constant_damage = true;
-   }
-
-void Explosion::SetDamageEveryFrame
-   (
-   Event *ev
-   )
-
-   {
-   damage_every_frame = true;
-   }
-
-void Explosion::DamageAgain
-    (
-    Event *ev
-    )
+void Explosion::DamageAgain(Event *ev)
 {
     Entity *owner_ent;
     Weapon *weapon;
-    float dmg;
-    float rad;
+    float   dmg;
+    float   rad;
 
-    if( !CheckTeams() )
-    {
-        PostEvent( EV_Remove, EV_REMOVE );
+    if (!CheckTeams()) {
+        PostEvent(EV_Remove, EV_REMOVE);
         return;
     }
 
-    owner_ent = G_GetEntity( owner );
+    owner_ent = G_GetEntity(owner);
 
-    if( !owner_ent )
+    if (!owner_ent) {
         owner_ent = world;
+    }
 
     weapon = weap;
 
-    if( owner_ent == world || owner_ent->IsDead() )
-    {
+    if (owner_ent == world || owner_ent->IsDead()) {
         weap = NULL;
     }
 
     dmg = radius_damage;
     rad = radius;
 
-    if( rad == 0.0f )
-    {
+    if (rad == 0.0f) {
         rad = radius_damage + 60.0f;
     }
 
-    RadiusDamage( origin, this, owner_ent, dmg, NULL, meansofdeath, rad, knockback, constant_damage, weapon, false );
+    RadiusDamage(origin, this, owner_ent, dmg, NULL, meansofdeath, rad, knockback, constant_damage, weapon, false);
 
-    PostEvent( EV_Explosion_DamageAgain, level.frametime );
+    PostEvent(EV_Explosion_DamageAgain, level.frametime);
 }
 
-void Explosion::MakeExplosionEffect
-    (
-    Event *ev
-    )
+void Explosion::MakeExplosionEffect(Event *ev)
 {
     str sEffect = ev->GetString(1);
 
     gi.SetBroadcastAll();
 
-    if (!sEffect.icmp("grenade"))
-    {
+    if (!sEffect.icmp("grenade")) {
         gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_EXPLOSION_EFFECT_1));
-    }
-    else
-    {
-        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN)
-        {
-            if (!sEffect.icmp("heavyshell"))
-            {
+    } else {
+        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+            if (!sEffect.icmp("heavyshell")) {
                 gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_EXPLOSION_EFFECT_3));
-            }
-            else if (!sEffect.icmp("tank"))
-            {
+            } else if (!sEffect.icmp("tank")) {
                 gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_EXPLOSION_EFFECT_4));
-            }
-            else
-            {
+            } else {
                 gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_EXPLOSION_EFFECT_2));
             }
-        }
-        else
-        {
+        } else {
             gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_EXPLOSION_EFFECT_2));
         }
     }
@@ -1915,17 +1676,18 @@ void Explosion::MakeExplosionEffect
     gi.MSG_EndCGM();
 }
 
-Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist) {
+Entity *FindDefusableObject(const Vector& dir, Entity *owner, float maxdist)
+{
     Vector startOrg;
     Vector endOrg;
     Vector mins, maxs;
-    float fCos;
-    int numAreaEntities;
-    int i;
-    int entNums[MAX_GENTITIES];
+    float  fCos;
+    int    numAreaEntities;
+    int    i;
+    int    entNums[MAX_GENTITIES];
 
     startOrg = owner->origin;
-    endOrg = startOrg + dir * maxdist;
+    endOrg   = startOrg + dir * maxdist;
 
     if (startOrg.z > endOrg.z) {
         endOrg.z -= 10;
@@ -1957,9 +1719,9 @@ Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist) {
 
     numAreaEntities = gi.AreaEntities(mins, maxs, entNums, ARRAY_LEN(entNums));
     for (i = 0; i < numAreaEntities; i++) {
-        gentity_t* pgEnt = &g_entities[entNums[i]];
-        Entity* pEnt;
-        vec3_t delta;
+        gentity_t *pgEnt = &g_entities[entNums[i]];
+        Entity    *pEnt;
+        vec3_t     delta;
 
         if (!pgEnt->solid) {
             continue;
@@ -1978,15 +1740,16 @@ Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist) {
             return pEnt;
         }
     }
-    
+
     return NULL;
 }
 
-void DefuseObject(const Vector& dir, Entity* owner, float maxdist) {
-    Entity* defusableObj = FindDefusableObject(dir, owner, maxdist);
-    ScriptVariable* defuseThreadVar;
-    str defuseThreadName;
-    
+void DefuseObject(const Vector& dir, Entity *owner, float maxdist)
+{
+    Entity         *defusableObj = FindDefusableObject(dir, owner, maxdist);
+    ScriptVariable *defuseThreadVar;
+    str             defuseThreadName;
+
     if (!defusableObj) {
         return;
     }
@@ -1998,14 +1761,15 @@ void DefuseObject(const Vector& dir, Entity* owner, float maxdist) {
 
     ScriptThreadLabel label;
     label.Set(defuseThreadName);
-    label.Execute(defusableObj, ListenerPtr());
+    label.Execute(defusableObj, owner, ListenerPtr());
 }
 
-qboolean CanPlaceLandmine(const Vector& origin, Entity* owner) {
-    Vector vEnd;
-    Vector vDelta;
+qboolean CanPlaceLandmine(const Vector& origin, Entity *owner)
+{
+    Vector  vEnd;
+    Vector  vDelta;
     trace_t trace;
-    
+
     if (!level.RoundStarted()) {
         gi.DPrintf("Can't place landmine until the round starts\n");
         return qfalse;
@@ -2013,17 +1777,7 @@ qboolean CanPlaceLandmine(const Vector& origin, Entity* owner) {
 
     vEnd = origin - Vector(0, 0, 256);
 
-    trace = G_Trace(
-        origin,
-        vec_zero,
-        vec_zero,
-        vEnd,
-        owner,
-        MASK_LANDMINE_PLACE,
-        qfalse,
-        "LandminePlace",
-        qtrue
-    );
+    trace = G_Trace(origin, vec_zero, vec_zero, vEnd, owner, MASK_LANDMINE_PLACE, qfalse, "LandminePlace", qtrue);
 
     vDelta = origin - trace.endpos;
     if (vDelta.length() > 90) {
@@ -2050,7 +1804,7 @@ qboolean CanPlaceLandmine(const Vector& origin, Entity* owner) {
         gi.DPrintf("Can't place landmine on carpet\n");
         return qfalse;
     }
-    
+
     if (!(trace.contents & CONTENTS_SOLID)) {
         gi.DPrintf("Can't place landmine on nonsolid things\n");
         return qfalse;
@@ -2059,10 +1813,11 @@ qboolean CanPlaceLandmine(const Vector& origin, Entity* owner) {
     return qtrue;
 }
 
-void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon* weap) {
-    SpawnArgs args;
-    Listener* l;
-    TriggerLandmine* trigger;
+void PlaceLandmine(const Vector& origin, Entity *owner, const str& model, Weapon *weap)
+{
+    SpawnArgs        args;
+    Listener        *l;
+    TriggerLandmine *trigger;
 
     if (!model.length()) {
         gi.DPrintf("PlaceLandmine : No model specified for PlaceLandmine");
@@ -2085,7 +1840,7 @@ void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon
         return;
     }
 
-    trigger = static_cast<TriggerLandmine*>(l);
+    trigger = static_cast<TriggerLandmine *>(l);
     trigger->droptofloor(256);
     trigger->ProcessInitCommands();
     trigger->SetDamageable(qtrue);
@@ -2094,10 +1849,11 @@ void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon
     }
 
     trigger->setOrigin(origin);
+    VectorCopy(trigger->origin, trigger->edict->s.origin2);
 
-    if (owner->inheritsFrom(&Player::ClassInfo)) {
+    if (owner->isSubclassOf(Player)) {
         if (g_gametype->integer >= GT_TEAM) {
-            Player* p = static_cast<Player*>(owner);
+            Player *p = static_cast<Player *>(owner);
             trigger->SetTeam(p->GetTeam());
         } else {
             trigger->SetTeam(0);
@@ -2106,77 +1862,70 @@ void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon
 
     trigger->NewAnim("idle");
 
-    if (g_gametype->integer == GT_SINGLE_PLAYER)
-    {
-        if (owner) {
-            if (owner->IsDead()) {
-                weap = NULL;
-            }
-        } else {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        if (!owner) {
+            weap = NULL;
+        } else if (owner->IsDead() || owner == world) {
             weap = NULL;
         }
 
         if (weap) {
             weap->m_iNumShotsFired++;
 
-            if (owner) {
-                if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
-                    TurretGun* turret = static_cast<TurretGun*>(weap);
-                    // FIXME: find what to increment
-                }
+            if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
+                Player *p = static_cast<Player *>(owner);
+                p->m_iNumShotsFired++;
             }
         }
     }
 }
 
-Projectile *ProjectileAttack
-    (
-    Vector            start,
-    Vector            dir,
-    Entity            *owner,
-    str                projectileModel,
-    float            fraction,
-    float            real_speed,
-    Weapon            *weap
-    )
+Projectile *ProjectileAttack(
+    Vector start, Vector dir, Entity *owner, str projectileModel, float fraction, float real_speed, Weapon *weap
+)
 {
-    Event          *ev;
-    Projectile     *proj = NULL;
-    float          newspeed, newlife;
-    SpawnArgs      args;
-    Entity         *obj;
-    float          dot = 0;
+    Event      *ev;
+    Projectile *proj = NULL;
+    float       newspeed, newlife;
+    SpawnArgs   args;
+    Entity     *obj;
+    float       dot = 0;
 
-    if( !projectileModel.length() )
-    {
-        gi.DPrintf( "ProjectileAttack : No model specified for ProjectileAttack" );
+    if (!projectileModel.length()) {
+        gi.DPrintf("ProjectileAttack : No model specified for ProjectileAttack");
         return NULL;
     }
 
-    args.setArg( "model", projectileModel );
-    obj = ( Entity * )args.Spawn();
+    args.setArg("model", projectileModel);
+    // Added in 2.0
+    //  Set the projectile targetname
+    //  so they can be managed from scripts
+    args.setArg("targetname", "projectile");
 
-    if( !obj )
-    {
-        gi.DPrintf( "projectile model '%s' not found\n", projectileModel.c_str() );
+    obj = (Entity *)args.Spawn();
+
+    if (!obj) {
+        gi.DPrintf("projectile model '%s' not found\n", projectileModel.c_str());
         return NULL;
     }
 
-    if( obj->isSubclassOf(Projectile) )
-        proj = ( Projectile * )obj;
-    else
-        gi.DPrintf( "%s is not of class projectile\n", projectileModel.c_str() );
+    if (obj->isSubclassOf(Projectile)) {
+        proj = (Projectile *)obj;
+    } else {
+        gi.DPrintf("%s is not of class projectile\n", projectileModel.c_str());
+    }
 
-    if( !proj )
+    if (!proj) {
         return NULL;
+    }
 
     // Create a new projectile entity and set it off
-    proj->setMoveType( MOVETYPE_BOUNCE );
+    proj->setMoveType(MOVETYPE_BOUNCE);
     proj->ProcessInitCommands();
-    proj->SetOwner( owner );
-    proj->edict->r.ownerNum = owner->entnum;
-    proj->angles = dir.toAngles();
-    proj->charge_fraction = fraction;
+    proj->SetOwner(owner);
+    proj->angles            = dir.toAngles();
+    proj->charge_fraction   = fraction;
+    proj->weap              = weap;
 
     if (!real_speed) {
         if (proj->projFlags & P_CHARGE_SPEED) {
@@ -2188,92 +1937,85 @@ Projectile *ProjectileAttack
         newspeed = real_speed;
     }
 
-    if( proj->addownervelocity )
-    {
-        dot = DotProduct( owner->velocity, dir );
-        if( dot < 0 )
+    if (proj->addownervelocity) {
+        dot = DotProduct(owner->velocity, dir);
+        if (dot < 0) {
             dot = 0;
+        }
     }
 
-    proj->velocity = dir * ( newspeed + dot );
+    proj->velocity = dir * (newspeed + dot);
     proj->velocity += proj->addvelocity;
-    proj->setAngles( proj->angles );
-    proj->setSolidType( SOLID_BBOX );
+    proj->setAngles(proj->angles);
+    proj->setSolidType(SOLID_BBOX);
 
     proj->edict->clipmask = MASK_PROJECTILE;
 
-    proj->setSize( proj->mins, proj->maxs );
-    proj->setOrigin( start );
-    proj->origin.copyTo( proj->edict->s.origin2 );
+    proj->setSize(proj->mins, proj->maxs);
+    proj->setOrigin(start);
+    proj->origin.copyTo(proj->edict->s.origin2);
 
-    if( proj->m_beam )
-    {
-        proj->m_beam->setOrigin( start );
-        proj->m_beam->origin.copyTo( proj->m_beam->edict->s.origin2 );
+    if (proj->m_beam) {
+        proj->m_beam->setOrigin(start);
+        proj->m_beam->origin.copyTo(proj->m_beam->edict->s.origin2);
     }
 
-    if( proj->dlight_radius )
-    {
-        G_SetConstantLight( &proj->edict->s.constantLight,
-            &proj->dlight_color[ 0 ],
-            &proj->dlight_color[ 1 ],
-            &proj->dlight_color[ 2 ],
+    if (proj->dlight_radius) {
+        G_SetConstantLight(
+            &proj->edict->s.constantLight,
+            &proj->dlight_color[0],
+            &proj->dlight_color[1],
+            &proj->dlight_color[2],
             &proj->dlight_radius
-            );
+        );
     }
 
     // Calc the life of the projectile
-    if( proj->projFlags & P_CHARGE_LIFE )
-    {
-        if( g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife )
+    if (proj->projFlags & P_CHARGE_LIFE) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife * (1 - fraction);
-        else
+        } else {
             newlife = proj->life * (1 - fraction);
+        }
 
-        if( newlife < proj->minlife )
+        if (newlife < proj->minlife) {
             newlife = proj->minlife;
-    }
-    else
-    {
-        if( g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife )
+        }
+    } else {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
-        else
+        } else {
             newlife = proj->life;
+        }
     }
 
     // Remove the projectile after it's life expires
-    ev = new Event( EV_Projectile_Explode );
-    proj->PostEvent( ev, newlife );
+    ev = new Event(EV_Projectile_Explode);
+    proj->PostEvent(ev, newlife);
 
-    proj->NewAnim( "idle" );
+    proj->NewAnim("idle");
 
     // If can hit owner clear the owner of this projectile in a second
 
-    if( proj->can_hit_owner )
-        proj->PostEvent( EV_Projectile_ClearOwner, 1 );
+    if (proj->can_hit_owner) {
+        proj->PostEvent(EV_Projectile_ClearOwner, 1);
+    }
 
-    if (owner)
-    {
+    if (owner) {
         if (owner->IsDead() || owner == world) {
             // clear the weapon as the owner died
             weap = NULL;
         }
-    }
-    else
-    {
+    } else {
         // clear the weapon as there is no owner
         weap = NULL;
     }
 
-    if( g_gametype->integer == GT_SINGLE_PLAYER )
-    {
-        if( weap )
-        {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        if (weap) {
             weap->m_iNumShotsFired++;
-            if( owner->IsSubclassOfPlayer() &&
-                weap->IsSubclassOfTurretGun() )
-            {
-                Player *p = ( Player * )owner;
+            if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
+                Player *p = (Player *)owner;
                 p->m_iNumShotsFired++;
             }
         }
@@ -2282,19 +2024,19 @@ Projectile *ProjectileAttack
     return proj;
 }
 
-void BulletAttack_Stat(Entity* owner, Entity* target, trace_t* trace, Weapon* weap) {
-    Sentient* targetSen;
-    
+void BulletAttack_Stat(Entity *owner, Entity *target, trace_t *trace, Weapon *weap)
+{
+    Sentient *targetSen;
+
     if (!target->IsSubclassOfSentient() || !weap) {
         return;
     }
 
-    targetSen = static_cast<Sentient*>(target);
+    targetSen                 = static_cast<Sentient *>(target);
     targetSen->m_iLastHitTime = level.inttime;
     weap->m_iNumHits++;
 
-    switch (trace->location)
-    {
+    switch (trace->location) {
     case HITLOC_HEAD:
     case HITLOC_HELMET:
     case HITLOC_NECK:
@@ -2334,12 +2076,11 @@ void BulletAttack_Stat(Entity* owner, Entity* target, trace_t* trace, Weapon* we
     }
 
     if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
-        Player* p = static_cast<Player*>(owner);
+        Player *p = static_cast<Player *>(owner);
 
         p->m_iNumHits++;
 
-        switch (trace->location)
-        {
+        switch (trace->location) {
         case HITLOC_HEAD:
         case HITLOC_HELMET:
         case HITLOC_NECK:
@@ -2380,66 +2121,63 @@ void BulletAttack_Stat(Entity* owner, Entity* target, trace_t* trace, Weapon* we
     }
 }
 
-float BulletAttack
-(
-    Vector   start,
-    Vector   vBarrel,
-    Vector   dir,
-    Vector   right,
-    Vector   up,
-    float    range,
-    float    damage,
-    int      bulletlarge,
-    float    knockback,
-    int      dflags,
-    int      meansofdeath,
-    Vector   spread,
-    int      count,
-    Entity* owner,
-    int      iTracerFrequency,
-    int* piTracerCount,
-    float    bulletthroughwood,
-    float    bulletthroughmetal,
-    Weapon* weap,
-    float    tracerspeed
+float BulletAttack(
+    Vector  start,
+    Vector  vBarrel,
+    Vector  dir,
+    Vector  right,
+    Vector  up,
+    float   range,
+    float   damage,
+    int     bulletlarge,
+    float   knockback,
+    int     dflags,
+    int     meansofdeath,
+    Vector  spread,
+    int     count,
+    Entity *owner,
+    int     iTracerFrequency,
+    int    *piTracerCount,
+    float   bulletthroughwood,
+    float   bulletthroughmetal,
+    Weapon *weap,
+    float   tracerspeed
 )
 {
-    Vector        vDir;
-    Vector        vTmpEnd;
-    Vector        vTraceStart;
-    Vector        vTraceEnd;
-    int            i;
-    int            iTravelDist;
-    trace_t        trace;
-    Entity*        ent;
-    Entity*        newowner;
+    Vector  vDir;
+    Vector  vTmpEnd;
+    Vector  vOldTmpEnd;
+    Vector  vTraceStart;
+    Vector  vTraceEnd;
+    int     i;
+    int     iTravelDist;
+    trace_t trace;
+    Entity *ent;
+    Entity *newowner;
     //Entity        *tmpSkipEnt;
-    float        damage_total = 0;
-    float        original_value;
-    qboolean    bBulletDone;
-    qboolean    bThroughThing;
-    int            iContinueCount;
-    float        vEndArray[64][3];
-    int            iTracerCount = 0;
-    int            iNumHit;
-    int            lastSurfaceFlags;
-    float        bulletdist;
-    float        newdamage;
-    float        throughThingFrac;
-    float        oldfrac;
-    int            bulletbits;
+    float    damage_total = 0;
+    float    original_value;
+    qboolean bBulletDone;
+    qboolean bThroughThing;
+    int      iContinueCount;
+    vec3_t   vEndArray[64];
+    int      iTracerCount = 0;
+    int      iNumHit;
+    int      lastSurfaceFlags;
+    float    bulletdist;
+    float    newdamage;
+    float    throughThingFrac;
+    float    oldfrac;
+    int      bulletbits;
 
     lastSurfaceFlags = 0;
-    iNumHit = 0;
+    iNumHit          = 0;
 
-    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN)
-    {
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         bulletbits = 2;
-    }
-    else
-    {
+    } else {
         bulletlarge = damage >= 41.f;
-        bulletbits = 1;
+        bulletbits  = 1;
     }
 
     if (count > 63) {
@@ -2450,53 +2188,42 @@ float BulletAttack
         weap = NULL;
     }
 
-    for (i = 0; i < count; i++)
-    {
+    for (i = 0; i < count; i++) {
         trace_t tracethrough;
 
-        vTraceEnd = start + (dir * range) +
-            (right * grandom() * spread.x) +
-            (up * grandom() * spread.y);
+        vTraceEnd = start + (dir * range) + (right * grandom() * spread.x) + (up * grandom() * spread.y);
 
         vDir = vTraceEnd - start;
 
         VectorNormalizeFast(vDir);
 
         iContinueCount = 0;
-        iTravelDist = 0;
-        bBulletDone = qfalse;
-        bThroughThing = qfalse;
-        newowner = owner;
-        newdamage = damage;
+        iTravelDist    = 0;
+        bBulletDone    = qfalse;
+        bThroughThing  = qfalse;
+        newowner       = owner;
+        newdamage      = damage;
 
-        while (!bBulletDone && iTravelDist < MAX_TRAVEL_DIST)
-        {
+        while (!bBulletDone && iTravelDist < MAX_TRAVEL_DIST) {
             iTravelDist += MAX_TRAVEL_DIST;
             vTraceStart = start;
-            vTraceEnd = start + vDir * iTravelDist;
+            vTraceEnd   = start + vDir * iTravelDist;
+            vOldTmpEnd  = vTraceStart;
 
             memset(&trace, 0, sizeof(trace_t));
 
             oldfrac = -1;
 
-            while (trace.fraction < 1.0f)
-            {
+            while (trace.fraction < 1.0f) {
+                Vector vDeltaTrace;
+
                 trace = G_Trace(
-                    vTraceStart,
-                    vec_zero,
-                    vec_zero,
-                    vTraceEnd,
-                    newowner,
-                    MASK_SHOT_TRIG,
-                    false,
-                    "BulletAttack",
-                    true
+                    vTraceStart, vec_zero, vec_zero, vTraceEnd, newowner, MASK_SHOT_TRIG, false, "BulletAttack", true
                 );
 
                 vTmpEnd = trace.endpos;
 
-                if (bThroughThing)
-                {
+                if (bThroughThing) {
                     bThroughThing = qfalse;
 
                     tracethrough = G_Trace(
@@ -2512,13 +2239,11 @@ float BulletAttack
                     );
 
                     if (!(tracethrough.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER))
-                        && (!(tracethrough.surfaceFlags & SURF_WOOD) || bulletthroughwood)
-                        && (!(tracethrough.surfaceFlags & (SURF_GRILL | SURF_METAL)) || bulletthroughmetal)
-                        )
-                    {
-                        vTmpEnd = vTraceStart + vDir * -4;
+                        && (!(tracethrough.surfaceFlags & SURF_WOOD) || !bulletthroughwood)
+                        && (!(tracethrough.surfaceFlags & (SURF_GRILL | SURF_METAL)) || !bulletthroughmetal)) {
+                        vTmpEnd        = vTraceStart + vDir * -4;
                         trace.fraction = 1.f;
-                        bBulletDone = qtrue;
+                        bBulletDone    = qtrue;
 
                         if (g_showbullettrace->integer) {
                             bThroughThing = qtrue;
@@ -2526,16 +2251,13 @@ float BulletAttack
                         break;
                     }
 
-                    if (lastSurfaceFlags & SURF_WOOD)
-                    {
+                    if (lastSurfaceFlags & SURF_WOOD) {
                         if (tracethrough.surfaceFlags & SURF_WOOD) {
                             throughThingFrac = 1.f / bulletthroughwood;
                         } else {
                             throughThingFrac = 2.f / (bulletthroughwood + bulletthroughmetal);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         if (tracethrough.surfaceFlags & SURF_WOOD) {
                             throughThingFrac = 2.f / (bulletthroughwood + bulletthroughmetal);
                         } else {
@@ -2550,10 +2272,15 @@ float BulletAttack
                     }
 
                     newdamage -= damage * bulletdist * throughThingFrac;
+
+                    if (g_showbullettrace->integer) {
+                        gi.Printf("%.2f\n", newdamage);
+                    }
+
                     if (newdamage < 1.f) {
-                        vTmpEnd = vTraceStart + vDir * -4;
+                        vTmpEnd        = vTraceStart + vDir * -4;
                         trace.fraction = 1.f;
-                        bBulletDone = qtrue;
+                        bBulletDone    = qtrue;
 
                         if (g_showbullettrace->integer) {
                             bThroughThing = qtrue;
@@ -2562,27 +2289,43 @@ float BulletAttack
                     }
 
                     if (g_showbullettrace->integer) {
-                        G_DebugLine(tracethrough.endpos + Vector(8, 0, 0), tracethrough.endpos - Vector(8, 0, 0), 0.5f, 0.5f, 1.f, 1.f);
-                        G_DebugLine(tracethrough.endpos + Vector(0, 8, 0), tracethrough.endpos - Vector(0, 8, 0), 0.5f, 0.5f, 1.f, 1.f);
-                        G_DebugLine(tracethrough.endpos + Vector(0, 0, 8), tracethrough.endpos - Vector(0, 0, 8), 0.5f, 0.5f, 1.f, 1.f);
+                        G_DebugLine(
+                            tracethrough.endpos + Vector(8, 0, 0),
+                            tracethrough.endpos - Vector(8, 0, 0),
+                            0.5f,
+                            0.5f,
+                            1.f,
+                            1.f
+                        );
+                        G_DebugLine(
+                            tracethrough.endpos + Vector(0, 8, 0),
+                            tracethrough.endpos - Vector(0, 8, 0),
+                            0.5f,
+                            0.5f,
+                            1.f,
+                            1.f
+                        );
+                        G_DebugLine(
+                            tracethrough.endpos + Vector(0, 0, 8),
+                            tracethrough.endpos - Vector(0, 0, 8),
+                            0.5f,
+                            0.5f,
+                            1.f,
+                            1.f
+                        );
                     }
                 }
 
-                if (trace.ent)
-                {
+                if (trace.ent) {
                     ent = trace.ent->entity;
-                }
-                else
-                {
+                } else {
                     ent = NULL;
                 }
 
-                if (ent && ent != world && ent != newowner)
-                {
-                    if (ent->takedamage)
-                    {
+                if (ent && ent != world && ent != owner) {
+                    if (ent->takedamage) {
                         if (g_gametype->integer == GT_SINGLE_PLAYER && !iNumHit) {
-                            BulletAttack_Stat(newowner, ent, &trace, weap);
+                            BulletAttack_Stat(owner, ent, &trace, weap);
                         }
 
                         iNumHit++;
@@ -2593,7 +2336,7 @@ float BulletAttack
 
                         ent->Damage(
                             world,
-                            newowner,
+                            owner,
                             newdamage,
                             trace.endpos,
                             dir,
@@ -2609,12 +2352,28 @@ float BulletAttack
                         damage_total += original_value - ent->health;
                     }
 
-                    if (ent->edict->solid == SOLID_BBOX && !(trace.contents & CONTENTS_CLAYPIDGEON))
-                    {
-                        if (trace.surfaceFlags & MASK_SURF_TYPE)
-                        {
+                    if (ent->edict->solid == SOLID_BBOX && !(trace.contents & CONTENTS_CLAYPIDGEON)) {
+                        if (trace.surfaceFlags & MASK_SURF_TYPE) {
                             gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_6);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_6));
+                            gi.MSG_WriteCoord(vTmpEnd[0]);
+                            gi.MSG_WriteCoord(vTmpEnd[1]);
+                            gi.MSG_WriteCoord(vTmpEnd[2]);
+                            gi.MSG_WriteDir(trace.plane.normal);
+                            gi.MSG_WriteBits(bulletlarge, bulletbits);
+                            gi.MSG_EndCGM();
+                        } else if (trace.location >= 0 && ent->IsSubclassOfSentient()) {
+                            gi.SetBroadcastVisible(vTmpEnd, NULL);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_8));
+                            gi.MSG_WriteCoord(vTmpEnd[0]);
+                            gi.MSG_WriteCoord(vTmpEnd[1]);
+                            gi.MSG_WriteCoord(vTmpEnd[2]);
+                            gi.MSG_WriteDir(trace.plane.normal);
+                            gi.MSG_WriteBits(bulletlarge, bulletbits);
+                            gi.MSG_EndCGM();
+                        } else if (ent->edict->r.contents & CONTENTS_SOLID) {
+                            gi.SetBroadcastVisible(vTmpEnd, NULL);
+                            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_7));
                             gi.MSG_WriteCoord(vTmpEnd[0]);
                             gi.MSG_WriteCoord(vTmpEnd[1]);
                             gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2622,33 +2381,9 @@ float BulletAttack
                             gi.MSG_WriteBits(bulletlarge, bulletbits);
                             gi.MSG_EndCGM();
                         }
-                        else if (trace.location >= 0 && ent->IsSubclassOfPlayer())
-                        {
-                            gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_8);
-                            gi.MSG_WriteCoord(vTmpEnd[0]);
-                            gi.MSG_WriteCoord(vTmpEnd[1]);
-                            gi.MSG_WriteCoord(vTmpEnd[2]);
-                            gi.MSG_WriteDir(trace.plane.normal);
-                            gi.MSG_WriteBits(bulletlarge, bulletbits);
-                            gi.MSG_EndCGM();
-                        }
-                        else if (ent->edict->r.contents & CONTENTS_SOLID)
-                        {
-                            gi.SetBroadcastVisible(vTmpEnd, NULL);
-                            gi.MSG_StartCGM(CGM_BULLET_7);
-                            gi.MSG_WriteCoord(vTmpEnd[0]);
-                            gi.MSG_WriteCoord(vTmpEnd[1]);
-                            gi.MSG_WriteCoord(vTmpEnd[2]);
-                            gi.MSG_WriteDir(trace.plane.normal);
-                            gi.MSG_WriteBits(bulletlarge, bulletbits);
-                            gi.MSG_EndCGM();
-                        }
-                    }
-                    else if (ent->edict->solid == SOLID_BSP && !(trace.contents & CONTENTS_CLAYPIDGEON))
-                    {
+                    } else if (ent->edict->solid == SOLID_BSP && !(trace.contents & CONTENTS_CLAYPIDGEON)) {
                         gi.SetBroadcastVisible(vTmpEnd, NULL);
-                        gi.MSG_StartCGM(CGM_BULLET_6);
+                        gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_6));
                         gi.MSG_WriteCoord(vTmpEnd[0]);
                         gi.MSG_WriteCoord(vTmpEnd[1]);
                         gi.MSG_WriteCoord(vTmpEnd[2]);
@@ -2658,24 +2393,19 @@ float BulletAttack
                     }
                 }
 
-                if (trace.fraction < 1.0f)
-                {
-                    if (trace.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER) ||
-                        trace.contents & (CONTENTS_CLAYPIDGEON | CONTENTS_WATER) ||
-                        (bulletlarge
-                            && trace.ent
-                            && trace.ent->r.contents & CONTENTS_BBOX
-                            && !trace.ent->r.bmodel
-                            && trace.ent->entity->takedamage)
+                if (trace.fraction < 1.0f) {
+                    if (trace.surfaceFlags & (SURF_FOLIAGE | SURF_GLASS | SURF_PUDDLE | SURF_PAPER)
+                        || trace.contents & (CONTENTS_CLAYPIDGEON | CONTENTS_WATER)
+                        || (g_protocol < protocol_e::PROTOCOL_MOHTA && trace.startsolid)
+                        || (bulletlarge && trace.ent
+                            && (g_protocol < protocol_e::PROTOCOL_MOHTA || (trace.ent->r.contents & CONTENTS_BBOX))
+                            && !trace.ent->r.bmodel && trace.ent->entity->takedamage)
                         || ((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
-                        || ((trace.surfaceFlags & (SURF_GRILL|SURF_METAL)) && bulletthroughmetal)
-                        && iContinueCount < 5)
-                    {
+                        || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal && iContinueCount < 5
+                        )) {
                         if (((trace.surfaceFlags & SURF_WOOD) && bulletthroughwood)
-                            || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal))
-                        {
-                            if (trace.contents & CONTENTS_FENCE)
-                            {
+                            || ((trace.surfaceFlags & (SURF_GRILL | SURF_METAL)) && bulletthroughmetal)) {
+                            if (trace.contents & CONTENTS_FENCE) {
                                 float damageMultiplier;
 
                                 if (lastSurfaceFlags & SURF_WOOD) {
@@ -2686,10 +2416,18 @@ float BulletAttack
 
                                 newdamage -= damageMultiplier * 2 * damage;
 
-                                if (newdamage < 0)
-                                {
+                                if (newdamage < 0) {
                                     trace.fraction = 1;
-                                    bBulletDone = qtrue;
+                                    bBulletDone    = qtrue;
+
+                                    if (g_showbullettrace->integer) {
+                                        bThroughThing = qtrue;
+                                        VectorScale(vDir, 2, tracethrough.endpos);
+                                        VectorAdd(tracethrough.endpos, vTmpEnd, tracethrough.endpos);
+                                    }
+                                } else {
+                                    trace.fraction = 1;
+                                    bBulletDone    = qtrue;
 
                                     if (g_showbullettrace->integer) {
                                         bThroughThing = qtrue;
@@ -2697,28 +2435,13 @@ float BulletAttack
                                         VectorAdd(tracethrough.endpos, vTmpEnd, tracethrough.endpos);
                                     }
                                 }
-                                else
-                                {
-                                    trace.fraction = 1.f;
-                                    bBulletDone = qtrue;
-
-                                    if (g_showbullettrace->integer)
-                                    {
-                                        bThroughThing = qtrue;
-                                        VectorScale(vDir, 2, tracethrough.endpos);
-                                        VectorAdd(tracethrough.endpos, vTmpEnd, tracethrough.endpos);
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                bThroughThing = qtrue;
+                            } else {
+                                bThroughThing    = qtrue;
                                 lastSurfaceFlags = trace.surfaceFlags;
                             }
                         }
 
-                        if (!bBulletDone)
-                        {
+                        if (!bBulletDone) {
                             vTraceStart = vTmpEnd + vDir * 4;
 
                             if (trace.ent) {
@@ -2735,42 +2458,55 @@ float BulletAttack
 
                             iContinueCount++;
                         }
-                    }
-                    else
-                    {
-                        trace.fraction = 1.f;
-                        bBulletDone = qtrue;
-                    }
-
-                    if (oldfrac != trace.fraction) {
-                        oldfrac = trace.fraction;
                     } else {
-                        trace.fraction = 1.f;
+                        trace.fraction = 1;
+                        bBulletDone    = qtrue;
                     }
                 }
+
+                if (oldfrac != trace.fraction) {
+                    oldfrac = trace.fraction;
+                } else {
+                    trace.fraction = 1;
+                }
+
+                vDeltaTrace = vTmpEnd - vOldTmpEnd;
+                if (!bBulletDone && DotProduct(vDeltaTrace, vDir) < 0) {
+                    // Fixed in OPM
+                    //  Make sure the new trace doesn't start behind the last one
+                    //  This can happen in rare circumstances if the trace is out of the world limit
+                    //  Or if entities being shot are almost at the same origin
+                    break;
+                }
+
+                vOldTmpEnd = vTmpEnd;
             }
         }
 
         if (bBulletDone && g_showbullettrace->integer && bThroughThing) {
-            G_DebugLine(tracethrough.endpos + Vector(8, 0, 0), tracethrough.endpos - Vector(8, 0, 0), 0.25f, 0.25f, 0.5f, 1.f);
-            G_DebugLine(tracethrough.endpos + Vector(0, 8, 0), tracethrough.endpos - Vector(0, 8, 0), 0.25f, 0.25f, 0.5f, 1.f);
-            G_DebugLine(tracethrough.endpos + Vector(0, 0, 8), tracethrough.endpos - Vector(0, 0, 8), 0.25f, 0.25f, 0.5f, 1.f);
+            G_DebugLine(
+                tracethrough.endpos + Vector(8, 0, 0), tracethrough.endpos - Vector(8, 0, 0), 0.25f, 0.25f, 0.5f, 1.f
+            );
+            G_DebugLine(
+                tracethrough.endpos + Vector(0, 8, 0), tracethrough.endpos - Vector(0, 8, 0), 0.25f, 0.25f, 0.5f, 1.f
+            );
+            G_DebugLine(
+                tracethrough.endpos + Vector(0, 0, 8), tracethrough.endpos - Vector(0, 0, 8), 0.25f, 0.25f, 0.5f, 1.f
+            );
         }
 
-        VectorCopy(vTraceEnd, vEndArray[i]);
+        VectorCopy(vTmpEnd, vEndArray[i]);
 
-        if (iTracerFrequency && piTracerCount)
-        {
+        if (iTracerFrequency && piTracerCount) {
             (*piTracerCount)++;
 
-            if (*piTracerCount == iTracerFrequency)
-            {
+            if (*piTracerCount == iTracerFrequency) {
                 iTracerCount++;
                 *piTracerCount = 0;
             }
         }
 
-        // Draw a debug trace line to show bullet fire  
+        // Draw a debug trace line to show bullet fire
         if (g_showbullettrace->integer) {
             G_DebugLine(start, vTmpEnd, 1, 1, 1, 1);
             G_DebugLine(vTmpEnd + Vector(8, 0, 0), vTmpEnd - Vector(8, 0, 0), 0.5f, 0.25f, 0.25f, 1.f);
@@ -2780,165 +2516,149 @@ float BulletAttack
         }
     }
 
-    if(g_gametype->integer == GT_SINGLE_PLAYER && weap)
-    {
+    if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
         weap->m_iNumShotsFired++;
-        if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun())
-        {
-            Player* p = (Player*)owner;
+        if (owner && owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
+            Player *p = (Player *)owner;
             p->m_iNumShotsFired++;
         }
     }
 
-    gi.SetBroadcastVisible(start, trace.endpos);
+    gi.SetBroadcastVisible(start, vEndArray[0]);
 
-    if( count == 1 )
-    {
-        if( iTracerCount )
-        {
-            gi.MSG_StartCGM(CGM_BULLET_1);
+    if (count == 1) {
+        if (iTracerCount) {
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_1));
 
-            gi.MSG_WriteCoord( vBarrel[ 0 ] );
-            gi.MSG_WriteCoord( vBarrel[ 1 ] );
-            gi.MSG_WriteCoord( vBarrel[ 2 ] );
-        }
-        else
-        {
-            gi.MSG_StartCGM(CGM_BULLET_2);
+            gi.MSG_WriteCoord(vBarrel[0]);
+            gi.MSG_WriteCoord(vBarrel[1]);
+            gi.MSG_WriteCoord(vBarrel[2]);
+        } else {
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_2));
         }
 
-        gi.MSG_WriteCoord( start[ 0 ] );
-        gi.MSG_WriteCoord( start[ 1 ] );
-        gi.MSG_WriteCoord( start[ 2 ] );
-        gi.MSG_WriteCoord( trace.endpos[ 0 ] );
-        gi.MSG_WriteCoord( trace.endpos[ 1 ] );
-        gi.MSG_WriteCoord( trace.endpos[ 2 ] );
-        gi.MSG_WriteBits( bulletlarge, bulletbits );
-
-        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-            if (tracerspeed == 1.f) {
-                gi.MSG_WriteBits(0, 1);
-            } else {
-                gi.MSG_WriteBits(1, 1);
-                gi.MSG_WriteBits(Q_clamp(tracerspeed, 1, 1023), 10);
-            }
-        }
-    }
-    else
-    {
-        if( iTracerCount )
-        {
-            gi.MSG_StartCGM(CGM_BULLET_3);
-
-            gi.MSG_WriteCoord( vBarrel[ 0 ] );
-            gi.MSG_WriteCoord( vBarrel[ 1 ] );
-            gi.MSG_WriteCoord( vBarrel[ 2 ] );
-
-            if (iTracerCount > 63) {
-                iTracerCount = 63;
-            }
-
-            gi.MSG_WriteBits( Q_min(iTracerCount, 63), 6);
-        }
-        else
-        {
-            gi.MSG_StartCGM(CGM_BULLET_4);
-        }
-
-        gi.MSG_WriteCoord( start[ 0 ] );
-        gi.MSG_WriteCoord( start[ 1 ] );
-        gi.MSG_WriteCoord( start[ 2 ] );
+        gi.MSG_WriteCoord(start[0]);
+        gi.MSG_WriteCoord(start[1]);
+        gi.MSG_WriteCoord(start[2]);
+        gi.MSG_WriteCoord(vEndArray[0][0]);
+        gi.MSG_WriteCoord(vEndArray[0][1]);
+        gi.MSG_WriteCoord(vEndArray[0][2]);
         gi.MSG_WriteBits(bulletlarge, bulletbits);
 
         if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
             if (tracerspeed == 1.f) {
                 gi.MSG_WriteBits(0, 1);
             } else {
+                int speed;
+
+                speed = tracerspeed * (1 << 9);
+
                 gi.MSG_WriteBits(1, 1);
-                gi.MSG_WriteBits(Q_clamp(tracerspeed, 1, 1023), 10);
+                gi.MSG_WriteBits(Q_clamp(speed, 1, 1023), 10);
+            }
+        }
+    } else {
+        if (iTracerCount) {
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_3));
+
+            gi.MSG_WriteCoord(vBarrel[0]);
+            gi.MSG_WriteCoord(vBarrel[1]);
+            gi.MSG_WriteCoord(vBarrel[2]);
+
+            if (iTracerCount > 63) {
+                iTracerCount = 63;
+            }
+
+            gi.MSG_WriteBits(Q_min(iTracerCount, 63), 6);
+        } else {
+            gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_4));
+        }
+
+        gi.MSG_WriteCoord(start[0]);
+        gi.MSG_WriteCoord(start[1]);
+        gi.MSG_WriteCoord(start[2]);
+        gi.MSG_WriteBits(bulletlarge, bulletbits);
+
+        if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+            if (tracerspeed == 1.f) {
+                gi.MSG_WriteBits(0, 1);
+            } else {
+                int speed;
+
+                speed = tracerspeed * (1 << 9);
+
+                gi.MSG_WriteBits(1, 1);
+                gi.MSG_WriteBits(Q_clamp(speed, 1, 1023), 10);
             }
         }
 
-        gi.MSG_WriteBits( count, 6 );
+        gi.MSG_WriteBits(count, 6);
 
-        for( int i = count; i > 0; i-- )
-        {
-            gi.MSG_WriteCoord( vEndArray[ i ][ 0 ] );
-            gi.MSG_WriteCoord( vEndArray[ i ][ 1 ] );
-            gi.MSG_WriteCoord( vEndArray[ i ][ 2 ] );
+        for (int i = 0; i < count; i++) {
+            gi.MSG_WriteCoord(vEndArray[i][0]);
+            gi.MSG_WriteCoord(vEndArray[i][1]);
+            gi.MSG_WriteCoord(vEndArray[i][2]);
         }
     }
 
     gi.MSG_EndCGM();
 
-    if( damage_total > 0 )
+    if (damage_total > 0) {
         return damage_total;
-    else
+    } else {
         return 0;
+    }
 }
 
-void FakeBulletAttack
-    (
-    Vector    start,
-    Vector    vBarrel,
-    Vector    dir,
-    Vector    right,
-    Vector    up,
-    float     range,
-    float     damage,
-    int       large,
-    Vector    spread,
-    int       count,
-    Entity*   owner,
-    int       iTracerFrequency,
-    int*      piTracerCount,
-    float     tracerspeed
-    )
+void FakeBulletAttack(
+    Vector  start,
+    Vector  vBarrel,
+    Vector  dir,
+    Vector  right,
+    Vector  up,
+    float   range,
+    float   damage,
+    int     large,
+    Vector  spread,
+    int     count,
+    Entity *owner,
+    int     iTracerFrequency,
+    int    *piTracerCount,
+    float   tracerspeed
+)
 {
     Vector vDir;
     Vector vTraceEnd;
-    int i;
-    int bulletbits;
+    int    i;
+    int    bulletbits;
 
-    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN)
-    {
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
         bulletbits = 2;
-    }
-    else
-    {
-        large = damage >= 41.f;
+    } else {
+        large      = damage >= 41.f;
         bulletbits = 1;
     }
 
-    for (i = 0; i < count; i++)
-    {
-        vTraceEnd = start + (dir * range) +
-            (right * grandom() * spread.x) +
-            (up * grandom() * spread.y);
+    for (i = 0; i < count; i++) {
+        vTraceEnd = start + (dir * range) + (right * grandom() * spread.x) + (up * grandom() * spread.y);
 
         vDir = vTraceEnd - start;
         VectorNormalize(vDir);
         vTraceEnd = start + vDir * 9216.0f;
 
         gi.SetBroadcastVisible(start, vTraceEnd);
-        if (iTracerFrequency && piTracerCount)
-        {
+        if (iTracerFrequency && piTracerCount) {
             (*piTracerCount)++;
-            if (*piTracerCount == iTracerFrequency)
-            {
+            if (*piTracerCount == iTracerFrequency) {
                 gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_NO_BARREL_1));
                 gi.MSG_WriteCoord(vBarrel[0]);
                 gi.MSG_WriteCoord(vBarrel[1]);
                 gi.MSG_WriteCoord(vBarrel[2]);
                 *piTracerCount = 0;
-            }
-            else
-            {
+            } else {
                 gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_NO_BARREL_2));
             }
-        }
-        else
-        {
+        } else {
             gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_BULLET_NO_BARREL_2));
         }
 
@@ -2954,8 +2674,12 @@ void FakeBulletAttack
             if (tracerspeed == 1.f) {
                 gi.MSG_WriteBits(0, 1);
             } else {
+                int speed;
+
+                speed = tracerspeed * (1 << 9);
+
                 gi.MSG_WriteBits(1, 1);
-                gi.MSG_WriteBits(Q_clamp(tracerspeed, 1, 1023), 10);
+                gi.MSG_WriteBits(Q_clamp(speed, 1, 1023), 10);
             }
         }
 
@@ -2963,170 +2687,150 @@ void FakeBulletAttack
     }
 }
 
-void ClickItemAttack
-    (
-    Vector            vStart,
-    Vector            vForward,
-    float            fRange,
-    Entity            *pOwner
-    )
+void ClickItemAttack(Vector vStart, Vector vForward, float fRange, Entity *pOwner)
 {
-    Vector vEnd;
+    Event  *ev;
+    Vector  vEnd;
     trace_t trace;
 
     vEnd = vStart + vForward * fRange;
 
-    trace = G_Trace(
-        vStart,
-        vec_zero,
-        vec_zero,
-        vEnd,
-        pOwner,
-        MASK_ALL,
-        qfalse,
-        "ClickItemAttack" );
+    trace = G_Trace(vStart, vec_zero, vec_zero, vEnd, pOwner, MASK_CLICKITEM, qfalse, "ClickItemAttack");
 
-    if( g_showbullettrace->integer )
-        G_DebugLine( vStart, vEnd, 1, 1, 1, 1 );
-
-    if( trace.entityNum != ENTITYNUM_NONE && trace.ent &&
-        trace.ent->entity && trace.ent->entity->isSubclassOf( TriggerClickItem ) )
-    {
-        Event *ev = new Event( EV_Activate );
-        ev->AddEntity( pOwner );
-        trace.ent->entity->PostEvent( ev, 0 );
+    if (g_showbullettrace->integer) {
+        //G_DebugLine(vStart, vEnd, 1, 1, 1, 1);
+        // Added in OPM
+        //  White line between start and end trace position
+        G_DebugLine(vStart, trace.endpos, 1, 1, 1, 1);
+        G_DebugLine(trace.endpos, vEnd, 1, 0, 0, 1);
     }
-    else
-    {
+
+    if (trace.entityNum == ENTITYNUM_WORLD || !trace.ent || !trace.ent->entity
+        || !trace.ent->entity->isSubclassOf(TriggerClickItem)) {
         ScriptThreadLabel failThread;
 
         // Try to execute a fail thread
-        if( failThread.TrySet( "clickitem_fail" ) )
+        if (failThread.TrySet("clickitem_fail")) {
             failThread.Execute();
+        }
+
+        return;
     }
+
+    ev = new Event(EV_Activate);
+    ev->AddEntity(pOwner);
+    trace.ent->entity->PostEvent(ev, 0);
 }
 
-Projectile *HeavyAttack
-    (
-    Vector            start,
-    Vector            dir,
-    str                projectileModel,
-    float            real_speed,
-    Entity            *owner,
-    Weapon            *weap
-    )
+Projectile *HeavyAttack(Vector start, Vector dir, str projectileModel, float real_speed, Entity *owner, Weapon *weap)
 {
-    Event          *ev;
-    Projectile     *proj = NULL;
-    float          newspeed, newlife;
-    SpawnArgs      args;
-    Entity         *obj;
-    float          dot = 0;
+    Event      *ev;
+    Projectile *proj = NULL;
+    float       newspeed, newlife;
+    SpawnArgs   args;
+    Entity     *obj;
+    float       dot = 0;
 
-    if( !projectileModel.length() )
-    {
-        gi.DPrintf( "ProjectileAttack : No model specified for ProjectileAttack" );
+    if (!projectileModel.length()) {
+        gi.DPrintf("ProjectileAttack : No model specified for ProjectileAttack");
         return NULL;
     }
 
-    args.setArg( "model", projectileModel );
-    obj = ( Entity * )args.Spawn();
+    args.setArg("model", projectileModel);
+    obj = (Entity *)args.Spawn();
 
-    if( !obj )
-    {
-        gi.DPrintf( "projectile model '%s' not found\n", projectileModel.c_str() );
+    if (!obj) {
+        gi.DPrintf("projectile model '%s' not found\n", projectileModel.c_str());
         return NULL;
     }
 
-    if( obj->IsSubclassOfProjectile() )
-        proj = ( Projectile * )obj;
-    else
-        gi.DPrintf( "%s is not of class projectile\n", projectileModel.c_str() );
+    if (obj->IsSubclassOfProjectile()) {
+        proj = (Projectile *)obj;
+    } else {
+        gi.DPrintf("%s is not of class projectile\n", projectileModel.c_str());
+    }
 
-    if( !proj )
+    if (!proj) {
         return NULL;
+    }
 
     // Create a new projectile entity and set it off
-    proj->setModel( projectileModel );
-    proj->setMoveType( MOVETYPE_BOUNCE );
+    proj->setModel(projectileModel);
+    proj->setMoveType(MOVETYPE_BOUNCE);
     proj->ProcessInitCommands();
-    proj->SetOwner( owner );
+    proj->SetOwner(owner);
     proj->edict->r.ownerNum = owner->entnum;
-    proj->angles = dir.toAngles();
-    proj->charge_fraction = 1.0f;
+    proj->angles            = dir.toAngles();
+    proj->charge_fraction   = 1.0f;
 
     newspeed = real_speed;
-    if( real_speed == 0.0f )
+    if (real_speed == 0.0f) {
         newspeed = proj->speed;
-
-    if( proj->addownervelocity )
-    {
-        dot = DotProduct( owner->velocity, dir );
-        if( dot < 0 )
-            dot = 0;
     }
 
-    proj->velocity = dir * ( newspeed + dot );
+    if (proj->addownervelocity) {
+        dot = DotProduct(owner->velocity, dir);
+        if (dot < 0) {
+            dot = 0;
+        }
+    }
+
+    proj->velocity = dir * (newspeed + dot);
     proj->velocity += proj->addvelocity;
-    proj->setAngles( proj->angles );
-    proj->setSolidType( SOLID_BBOX );
+    proj->setAngles(proj->angles);
+    proj->setSolidType(SOLID_BBOX);
 
     proj->edict->clipmask = MASK_PROJECTILE;
 
-    proj->setSize( proj->mins, proj->maxs );
-    proj->setOrigin( start );
-    proj->origin.copyTo( proj->edict->s.origin2 );
+    proj->setSize(proj->mins, proj->maxs);
+    proj->setOrigin(start);
+    proj->origin.copyTo(proj->edict->s.origin2);
 
-    if( proj->m_beam )
-    {
-        proj->m_beam->setOrigin( start );
-        proj->m_beam->origin.copyTo( proj->m_beam->edict->s.origin2 );
+    if (proj->m_beam) {
+        proj->m_beam->setOrigin(start);
+        proj->m_beam->origin.copyTo(proj->m_beam->edict->s.origin2);
     }
 
-    if( proj->dlight_radius )
-    {
-        G_SetConstantLight( &proj->edict->s.constantLight,
-            &proj->dlight_color[ 0 ],
-            &proj->dlight_color[ 1 ],
-            &proj->dlight_color[ 2 ],
+    if (proj->dlight_radius) {
+        G_SetConstantLight(
+            &proj->edict->s.constantLight,
+            &proj->dlight_color[0],
+            &proj->dlight_color[1],
+            &proj->dlight_color[2],
             &proj->dlight_radius
-            );
+        );
     }
 
     // Calc the life of the projectile
-    if( proj->projFlags & P_CHARGE_LIFE )
-    {
-        if( g_gametype->integer && proj->dmlife )
+    if (proj->projFlags & P_CHARGE_LIFE) {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
-        else
+        } else {
             newlife = proj->life;
+        }
 
-        if( newlife < proj->minlife )
+        if (newlife < proj->minlife) {
             newlife = proj->minlife;
-    }
-    else
-    {
-        if( g_gametype->integer && proj->dmlife )
+        }
+    } else {
+        if (g_gametype->integer != GT_SINGLE_PLAYER && proj->dmlife) {
             newlife = proj->dmlife;
-        else
+        } else {
             newlife = proj->life;
+        }
     }
 
     // Remove the projectile after it's life expires
-    ev = new Event( EV_Projectile_Explode );
-    proj->PostEvent( ev, newlife );
+    ev = new Event(EV_Projectile_Explode);
+    proj->PostEvent(ev, newlife);
 
-    proj->NewAnim( "idle" );
+    proj->NewAnim("idle");
 
-    if( !g_gametype->integer )
-    {
-        if( weap )
-        {
+    if (g_gametype->integer == GT_SINGLE_PLAYER) {
+        if (weap) {
             weap->m_iNumShotsFired++;
-            if( owner->IsSubclassOfPlayer() &&
-                weap->IsSubclassOfTurretGun() )
-            {
-                Player *p = ( Player * )owner;
+            if (owner->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
+                Player *p = (Player *)owner;
                 p->m_iNumShotsFired++;
             }
         }
@@ -3135,305 +2839,299 @@ Projectile *HeavyAttack
     return proj;
 }
 
-void ExplosionAttack
-    (
-    Vector        pos,
-    Entity        *owner,
-    str            explosionModel,
-    Vector        dir,
-    Entity        *ignore,
-    float        scale,
-    Weapon        *weap,
-    bool        hurtOwnerOnly
-    )
+void ExplosionAttack(
+    Vector  pos,
+    Entity *owner,
+    str     explosionModel,
+    Vector  dir,
+    Entity *ignore,
+    float   scale,
+    Weapon *weap,
+    bool    hurtOwnerOnly
+)
 {
-    Explosion   *explosion;
-    Event            *ev;
+    Explosion *explosion;
+    Event     *ev;
 
-
-    if( !owner )
+    if (!owner) {
         owner = world;
+    }
 
-    if( owner->IsDead() || owner == world )
+    if (owner->IsDead() || owner == world) {
         weap = NULL;
+    }
 
-    if( explosionModel.length() )
-    {
-        explosion = new Explosion;
+    if (explosionModel.length() && gi.modeltiki(CanonicalTikiName(explosionModel))) {
+        SpawnArgs sp;
+        ClassDef *c;
 
-        // Create a new explosion entity and set it off
-        explosion->setModel( explosionModel );
+        sp.setArg("model", explosionModel);
+        c = sp.getClassDef();
+        if (c && c != Explosion::classinfostatic() && checkInheritance(Entity::classinfostatic(), c)) {
+            Entity *newent = static_cast<Entity *>(c->newInstance());
 
-        explosion->setSolidType( SOLID_NOT );
+            newent->setModel(explosionModel);
+            newent->setSolidType(SOLID_NOT);
+            newent->setOrigin(pos);
+            newent->setAngles(dir.toAngles());
+            newent->ProcessInitCommands();
 
-        // Process the INIT commands right away
-        explosion->ProcessInitCommands();
+            if (c == SmokeGrenade::classinfostatic()) {
+                //
+                // try to set the owner of the smoke grenade
+                //
+                SmokeGrenade *smoke = static_cast<SmokeGrenade *>(newent);
 
-        explosion->SetOwner( owner );
+                if (owner && owner->IsSubclassOfSentient()) {
+                    smoke->setOwner(static_cast<Sentient *>(owner));
+                }
+            }
+        } else {
+            explosion = new Explosion;
 
-        explosion->edict->r.ownerNum = owner->entnum;
-        explosion->angles = dir.toAngles();
-        explosion->velocity = dir * explosion->speed;
-        explosion->edict->s.scale = scale;
-        explosion->setAngles( explosion->angles );
-        explosion->setMoveType( MOVETYPE_FLYMISSILE );
-        explosion->edict->clipmask = MASK_PROJECTILE;
-        explosion->setSize( explosion->mins, explosion->maxs );
-        explosion->setOrigin( pos );
-        explosion->origin.copyTo( explosion->edict->s.origin2 );
-        explosion->hurtOwnerOnly = hurtOwnerOnly;
+            // Create a new explosion entity and set it off
+            explosion->setModel(explosionModel);
 
-        if( explosion->dlight_radius )
-        {
-            G_SetConstantLight( &explosion->edict->s.constantLight,
-                &explosion->dlight_color[ 0 ],
-                &explosion->dlight_color[ 1 ],
-                &explosion->dlight_color[ 2 ],
-                &explosion->dlight_radius
+            explosion->setSolidType(SOLID_NOT);
+
+            // Process the INIT commands right away
+            explosion->ProcessInitCommands();
+
+            explosion->SetOwner(owner);
+
+            explosion->edict->r.ownerNum = owner->entnum;
+            explosion->angles            = dir.toAngles();
+            explosion->velocity          = dir * explosion->speed;
+            explosion->edict->s.scale    = scale;
+            explosion->setAngles(explosion->angles);
+            explosion->setMoveType(MOVETYPE_FLYMISSILE);
+            explosion->edict->clipmask = MASK_PROJECTILE;
+            explosion->setSize(explosion->mins, explosion->maxs);
+            explosion->setOrigin(pos);
+            explosion->origin.copyTo(explosion->edict->s.origin2);
+            explosion->hurtOwnerOnly = hurtOwnerOnly;
+
+            if (explosion->dlight_radius) {
+                G_SetConstantLight(
+                    &explosion->edict->s.constantLight,
+                    &explosion->dlight_color[0],
+                    &explosion->dlight_color[1],
+                    &explosion->dlight_color[2],
+                    &explosion->dlight_radius
                 );
-        }
+            }
 
-        explosion->BroadcastAIEvent( AI_EVENT_WEAPON_FIRE );
-        explosion->NewAnim( "idle" );
+            explosion->BroadcastAIEvent(AI_EVENT_WEAPON_FIRE);
+            explosion->NewAnim("idle");
 
-        RadiusDamage( explosion->origin,
-            explosion,
-            owner,
-            explosion->radius_damage * scale,
-            ignore,
-            explosion->meansofdeath,
-            explosion->radius * scale,
-            explosion->knockback,
-            explosion->constant_damage,
-            weap,
-            explosion->hurtOwnerOnly
+            RadiusDamage(
+                explosion->origin,
+                explosion,
+                owner,
+                explosion->radius_damage * scale,
+                ignore,
+                explosion->meansofdeath,
+                explosion->radius * scale,
+                explosion->knockback,
+                explosion->constant_damage,
+                weap,
+                explosion->hurtOwnerOnly
             );
 
-        if( explosion->flash_radius )
-        {
-            FlashPlayers( explosion->origin,
-                explosion->flash_r,
-                explosion->flash_g,
-                explosion->flash_b,
-                explosion->flash_a,
-                explosion->flash_radius * scale,
-                explosion->flash_time,
-                explosion->flash_type
+            if (explosion->flash_radius) {
+                FlashPlayers(
+                    explosion->origin,
+                    explosion->flash_r,
+                    explosion->flash_g,
+                    explosion->flash_b,
+                    explosion->flash_a,
+                    explosion->flash_radius * scale,
+                    explosion->flash_time,
+                    explosion->flash_type
                 );
-        }
+            }
 
-        if( explosion->damage_every_frame )
-        {
-            explosion->PostEvent( EV_Explosion_DamageAgain, FRAMETIME );
-        }
+            if (explosion->damage_every_frame) {
+                explosion->PostEvent(EV_Explosion_DamageAgain, FRAMETIME);
+            }
 
-        // Remove explosion after the life has expired
-        if( explosion->life || ( g_gametype->integer && explosion->dmlife ) )
-        {
-            ev = new Event( EV_Remove );
+            // Remove explosion after the life has expired
+            if (explosion->life || (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife)) {
+                ev = new Event(EV_Remove);
 
-            if( g_gametype->integer && explosion->dmlife )
-                explosion->PostEvent( ev, explosion->dmlife );
-            else
-                explosion->PostEvent( ev, explosion->life );
+                if (g_gametype->integer != GT_SINGLE_PLAYER && explosion->dmlife) {
+                    explosion->PostEvent(ev, explosion->dmlife);
+                } else {
+                    explosion->PostEvent(ev, explosion->life);
+                }
+            }
         }
     }
 }
 
-static float radiusdamage_origin[ 3 ];
+static float radiusdamage_origin[3];
 
-static int radiusdamage_compare( const void *elem1, const void *elem2 )
+static int radiusdamage_compare(const void *elem1, const void *elem2)
 {
     Entity *e1, *e2;
-    float delta[ 3 ];
-    float d1, d2;
+    float   delta[3];
+    float   d1, d2;
 
-    e1 = *( Entity ** )elem1;
-    e2 = *( Entity ** )elem2;
+    e1 = *(Entity **)elem1;
+    e2 = *(Entity **)elem2;
 
-    VectorSubtract( radiusdamage_origin, e1->origin, delta );
-    d1 = VectorLengthSquared( delta );
+    VectorSubtract(radiusdamage_origin, e1->origin, delta);
+    d1 = VectorLengthSquared(delta);
 
-    VectorSubtract( radiusdamage_origin, e2->origin, delta );
-    d2 = VectorLengthSquared( delta );
+    VectorSubtract(radiusdamage_origin, e2->origin, delta);
+    d2 = VectorLengthSquared(delta);
 
-    if( d2 <= d1 )
-    {
+    if (d2 <= d1) {
         return d1 > d2;
-    }
-    else
-    {
+    } else {
         return -1;
     }
 }
 
-void RadiusDamage
-    (
-    Vector        origin,
-    Entity        *inflictor,
-    Entity        *attacker,
-    float        damage,
-    Entity        *ignore,
-    int            mod,
-    float        radius,
-    float        knockback,
-    qboolean    constant_damage,
-    Weapon        *weap,
-    bool        hurtOwnerOnly
-    )
+void RadiusDamage(
+    Vector   origin,
+    Entity  *inflictor,
+    Entity  *attacker,
+    float    damage,
+    Entity  *ignore,
+    int      mod,
+    float    radius,
+    float    knockback,
+    qboolean constant_damage,
+    Weapon  *weap,
+    bool     hurtOwnerOnly
+)
 {
-    float        points;
-    Entity        *ent;
-    Vector        org;
-    Vector        dir;
-    float        dist;
-    int            i;
-    Container< Entity * > ents;
+    float               points;
+    Entity             *ent;
+    Vector              org;
+    Vector              dir;
+    float               dist;
+    int                 i;
+    Container<Entity *> ents;
 
-    if( g_showdamage->integer )
-    {
-        Com_Printf( "radiusdamage" );
-        Com_Printf( "{\n" );
-        Com_Printf( "origin: %f %f %f\n", origin[ 0 ], origin[ 1 ], origin[ 2 ] );
+    if (g_showdamage->integer) {
+        Com_Printf("radiusdamage");
+        Com_Printf("{\n");
+        Com_Printf("origin: %f %f %f\n", origin[0], origin[1], origin[2]);
 
-        if( inflictor ) {
-            Com_Printf( "inflictor: (entnum %d, radnum %d)\n", inflictor->entnum, inflictor->radnum );
+        if (inflictor) {
+            Com_Printf("inflictor: (entnum %d, radnum %d)\n", inflictor->entnum, inflictor->radnum);
         }
 
-        if( attacker ) {
-            Com_Printf( "attacker: (entnum %d, radnum %d)\n", attacker->entnum, attacker->radnum );
+        if (attacker) {
+            Com_Printf("attacker: (entnum %d, radnum %d)\n", attacker->entnum, attacker->radnum);
         }
 
-        Com_Printf( "damage: %f\n", damage );
+        Com_Printf("damage: %f\n", damage);
 
-        if( ignore ) {
-            Com_Printf( "ignore: (entnum %d, radnum %d)\n", ignore->entnum, ignore->radnum );
+        if (ignore) {
+            Com_Printf("ignore: (entnum %d, radnum %d)\n", ignore->entnum, ignore->radnum);
         }
 
-        Com_Printf( "mod: %d\n", mod );
-        Com_Printf( "radius: %f\n", radius );
-        Com_Printf( "knockback: %f\n", knockback );
-        Com_Printf( "constant_damage: %d\n", constant_damage );
+        Com_Printf("mod: %d\n", mod);
+        Com_Printf("radius: %f\n", radius);
+        Com_Printf("knockback: %f\n", knockback);
+        Com_Printf("constant_damage: %d\n", constant_damage);
 
-        if( weap )
-        {
-            Com_Printf( "weapon %s\n", weap->getName().c_str() );
+        if (weap) {
+            Com_Printf("weapon %s\n", weap->getName().c_str());
         }
 
-        Com_Printf( "hurtOwnerOnly: %d\n", hurtOwnerOnly );
-        Com_Printf( "}\n" );
+        Com_Printf("hurtOwnerOnly: %d\n", hurtOwnerOnly);
+        Com_Printf("}\n");
     }
 
-    ent = findradius( NULL, origin, radius );
+    ent = findradius(NULL, origin, radius);
 
-    while( ent )
-    {
+    while (ent) {
         // Add ents that has contents
-        if( ent->getContents() )
-        {
-            ents.AddObject( ent );
+        if (ent->getContents()) {
+            ents.AddObject(ent);
         }
 
-        ent = findradius( ent, origin, radius );
+        ent = findradius(ent, origin, radius);
     }
 
     // Sort by the nearest to the fartest entity
-    if( ents.NumObjects() )
-    {
-        VectorCopy( origin, radiusdamage_origin );
-        ents.Sort( radiusdamage_compare );
+    if (ents.NumObjects()) {
+        VectorCopy(origin, radiusdamage_origin);
+        ents.Sort(radiusdamage_compare);
     }
 
-    for( i = 1; i <= ents.NumObjects(); i++ )
-    {
-        ent = ents.ObjectAt( i );
+    for (i = 1; i <= ents.NumObjects(); i++) {
+        ent = ents.ObjectAt(i);
 
-        if( ent == ignore || !( ent->takedamage ) || ( hurtOwnerOnly && ent != attacker ) ) {
+        if (ent == ignore || !(ent->takedamage) || (hurtOwnerOnly && ent != attacker)) {
             continue;
         }
 
         // Add this in for deathmatch maybe
 
-        if( ent->getContents() == CONTENTS_NOTTEAM1 ||
-            G_SightTrace( origin, vec_zero, vec_zero, ent->centroid, inflictor, ent, MASK_EXPLOSION, false, "RadiusDamage" ) )
-        {
-            if( constant_damage )
-            {
+        if (ent->getContents() == CONTENTS_CLAYPIDGEON
+            || G_SightTrace(
+                origin, vec_zero, vec_zero, ent->centroid, inflictor, ent, MASK_EXPLOSION, false, "RadiusDamage"
+            )) {
+            if (constant_damage) {
                 points = damage;
-            }
-            else
-            {
+            } else {
                 float ent_rad;
 
-                ent_rad = fabs( ent->maxs[ 0 ] - ent->mins[ 0 ] );
+                ent_rad = fabs(ent->maxs[0] - ent->mins[0]);
 
-                if( ent_rad < fabs( ent->maxs[ 1 ] - ent->mins[ 1 ] ) )
-                {
-                    ent_rad = fabs( ent->maxs[ 1 ] - ent->mins[ 1 ] );
+                if (ent_rad < fabs(ent->maxs[1] - ent->mins[1])) {
+                    ent_rad = fabs(ent->maxs[1] - ent->mins[1]);
                 }
 
-                if( ent_rad < fabs( ent->maxs[ 2 ] - ent->mins[ 2 ] ) )
-                {
-                    ent_rad = fabs( ent->maxs[ 2 ] - ent->mins[ 2 ] );
+                if (ent_rad < fabs(ent->maxs[2] - ent->mins[2])) {
+                    ent_rad = fabs(ent->maxs[2] - ent->mins[2]);
                 }
 
                 org = ent->centroid;
                 dir = org - origin;
 
                 dist = dir.length() - ent_rad;
-                if( dist < 0.0f ) {
+                if (dist < 0.0f) {
                     dist = 0.0f;
                 }
 
-                points = damage - damage * ( dist / radius );
+                points = damage - damage * (dist / radius);
 
-                knockback -= knockback * ( dist / radius );
+                knockback -= knockback * (dist / radius);
 
-                if( points < 0 )
+                if (points < 0) {
                     points = 0;
+                }
 
-                if( knockback < 0 )
+                if (knockback < 0) {
                     knockback = 0;
+                }
             }
 
             // reduce the damage a little for self-damage
-            if( ent == attacker )
-            {
+            if (ent == attacker) {
                 points *= 0.9f;
             }
 
-            if( points > 0 )
-            {
-                ent->Damage( inflictor,
-                    attacker,
-                    points,
-                    org,
-                    dir,
-                    vec_zero,
-                    knockback,
-                    DAMAGE_RADIUS,
-                    mod
-                    );
+            if (points > 0) {
+                ent->Damage(inflictor, attacker, points, org, dir, vec_zero, knockback, DAMAGE_RADIUS, mod);
 
-                if( !g_gametype->integer && weap )
-                {
-                    if( ent->IsSubclassOfPlayer() ||
-                        ent->IsSubclassOfVehicle() ||
-                        ent->IsSubclassOfVehicleTank() ||
-                        ent->isSubclassOf( VehicleCollisionEntity ) )
-                    {
+                if (g_gametype->integer == GT_SINGLE_PLAYER && weap) {
+                    if (ent->IsSubclassOfPlayer() || ent->IsSubclassOfVehicle() || ent->IsSubclassOfVehicleTank()
+                        || ent->isSubclassOf(VehicleCollisionEntity)) {
                         weap->m_iNumHits++;
                         weap->m_iNumTorsoShots++;
 
-                        if( attacker && attacker->IsSubclassOfPlayer() )
-                        {
-                            Player *player = ( Player * )attacker;
+                        if (attacker && attacker->IsSubclassOfPlayer() && weap->IsSubclassOfTurretGun()) {
+                            Player *player = static_cast<Player *>(attacker);
 
-                            if( weap->IsSubclassOfTurretGun() )
-                            {
-                                player->m_iNumHits++;
-                                player->m_iNumTorsoShots++;
-                            }
+                            player->m_iNumHits++;
+                            player->m_iNumTorsoShots++;
                         }
                     }
                 }
@@ -3441,85 +3139,71 @@ void RadiusDamage
         }
     }
 
-    if( mod == MOD_EXPLOSION )
-    {
+    if (mod == MOD_EXPLOSION) {
         // Create an earthquake
         new ViewJitter(
-            origin,
-            radius + 128.0f,
-            0.05f,
-            Vector( damage * 0.05f, damage * 0.05f, damage * 0.06f ),
-            0,
-            vec_zero,
-            0
-            );
+            origin, radius + 128.0f, 0.05f, Vector(damage * 0.05f, damage * 0.05f, damage * 0.06f), 0, vec_zero, 0
+        );
     }
 }
 
+void FlashPlayers(Vector org, float r, float g, float b, float a, float radius, float time, int type)
+{
+    trace_t    trace;
+    Vector     delta;
+    float      length;
+    Player    *player;
+    gentity_t *ed;
+    int        i;
+    Entity    *ent;
+    float      newa = 1;
 
-void FlashPlayers
-   (
-   Vector   org,
-   float    r,
-   float    g, 
-   float    b,
-   float    a,
-   float    radius,
-   float    time,
-   int      type
-   )
-
-   {
-   trace_t     trace;
-   Vector      delta;
-   float       length;
-   Player      *player;
-   gentity_t   *ed;
-   int         i;
-   Entity      *ent;
-   float       newa = 1;
-
-     for( i = 0; i < game.maxclients; i++ )
-      {
-      ed = &g_entities[ i ];
-        if ( !ed->inuse || !ed->entity )
+    for (i = 0; i < game.maxclients; i++) {
+        ed = &g_entities[i];
+        if (!ed->inuse || !ed->entity) {
             continue;
+        }
 
-          ent = ed->entity;
-      if ( !ent->IsSubclassOfPlayer() )
-         continue;
+        ent = ed->entity;
+        if (!ent->IsSubclassOfPlayer()) {
+            continue;
+        }
 
-      player = ( Player * )ent;
+        player = (Player *)ent;
 
-      if ( !player->WithinDistance( org, radius ) )
-         continue;
+        if (!player->WithinDistance(org, radius)) {
+            continue;
+        }
 
-      trace = G_Trace( org, vec_zero, vec_zero, player->origin, player, MASK_OPAQUE, qfalse, "FlashPlayers" );      
-      if ( trace.fraction != 1.0 )
-         continue;
+        trace = G_Trace(org, vec_zero, vec_zero, player->origin, player, MASK_OPAQUE, qfalse, "FlashPlayers");
+        if (trace.fraction != 1.0) {
+            continue;
+        }
 
-      delta = org - trace.endpos;
-      length = delta.length();
+        delta  = org - trace.endpos;
+        length = delta.length();
 
-      // If alpha is specified, then modify it by the amount of distance away from the flash the player is
-      if ( a != -1 )
-         newa = a * ( 1 - length / radius );
+        // If alpha is specified, then modify it by the amount of distance away from the flash the player is
+        if (a != -1) {
+            newa = a * (1 - length / radius);
+        }
 
-      level.m_fade_alpha      = newa;
-      level.m_fade_color[0]   = r;
-      level.m_fade_color[1]   = g;
-      level.m_fade_color[2]   = b;
-      level.m_fade_time       = time;
-      level.m_fade_time_start = time;
+        level.m_fade_alpha      = newa;
+        level.m_fade_color[0]   = r;
+        level.m_fade_color[1]   = g;
+        level.m_fade_color[2]   = b;
+        level.m_fade_time       = time;
+        level.m_fade_time_start = time;
 
-      if ( type == 1 )
-         level.m_fade_style = additive;
-      else
-         level.m_fade_style = alphablend;
+        if (type == 1) {
+            level.m_fade_style = additive;
+        } else {
+            level.m_fade_style = alphablend;
+        }
 
-//      gi.SendServerCommand( NULL, va( "fadein %0.2f %0.2f %0.2f %0.2f %i",time*1000,r*newa,g*newa,b*newa,type ) );
-      }
-   }
+        //      gi.SendServerCommand( NULL, va( "fadein %0.2f %0.2f %0.2f %0.2f %i",time*1000,r*newa,g*newa,b*newa,type ) );
+    }
+}
 
 const char *G_LocationNumToDispString(int iLocation)
 {
@@ -3569,4 +3253,3 @@ const char *G_LocationNumToDispString(int iLocation)
         return "";
     }
 }
-
diff --git a/code/fgame/weaputils.h b/code/fgame/weaputils.h
index 7d611123..2cff35ed 100644
--- a/code/fgame/weaputils.h
+++ b/code/fgame/weaputils.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,8 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // weaputils.h:
 // 
 
-#ifndef __WEAPUTILS_H__
-#define __WEAPUTILS_H__
+#pragma once
 
 #include "g_local.h"
 #include "animate.h"
@@ -82,11 +81,18 @@ public:
 	bool m_bExplodeOnTouch;
 	bool m_bHurtOwnerOnly;
 	int m_iSmashThroughGlass;
+	// Added in 2.0
 	bool m_bArcToTarget;
+	// Added in 2.30
 	bool m_bDieInWater;
+	// Added in 2.0
 	int m_iTeam;
+
+	//
+    // Added in OPM
+	//
 	bool m_bHadPlayerOwner;
-	SafePtr<Entity> m_pOwnerPtr;
+    SafePtr<Entity> m_pOwnerPtr;
 
 	Projectile();
 	void Archive( Archiver &arc ) override;
@@ -125,6 +131,7 @@ public:
 	void			HeatSeek( Event *ev );
 	void			Drunk( Event *ev );
 	void			SmashThroughGlassThink( Event *ev );
+	void			SmashThroughGlassThink(); // Added in OPM
 	void			AddOwnerVelocity( Event *ev );
 	void			Prethink( Event *ev );
 	float			ResolveMinimumDistance( Entity *potential_target, float currmin );
@@ -142,11 +149,17 @@ public:
 	void			BecomeBomb(Event* ev);
 	void			DieInWater(Event* ev);
 	//
-	// Openmohaa additions
+	// Added in OPM
 	//
-	bool			CheckTeams( void );
+	bool			CheckTeams(void);
 };
 
+inline void Projectile::SetMartyr(int entnum)
+{
+	owner = entnum;
+	m_bHurtOwnerOnly = true;
+}
+
 inline void Projectile::Archive
 	(
 	Archiver &arc
@@ -355,5 +368,3 @@ Entity* FindDefusableObject(const Vector& dir, Entity* owner, float maxdist);
 void DefuseObject(const Vector& dir, Entity* owner, float maxdist);
 qboolean CanPlaceLandmine(const Vector& origin, Entity* owner);
 void PlaceLandmine(const Vector& origin, Entity* owner, const str& model, Weapon* weap);
-
-#endif // __WEAPUTILS_H__
diff --git a/code/fgame/windows.cpp b/code/fgame/windows.cpp
index 93053e5c..b485987c 100644
--- a/code/fgame/windows.cpp
+++ b/code/fgame/windows.cpp
@@ -29,162 +29,162 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Event EV_Window_Setup
 (
-	"_Windowsetup",
-	EV_CODEONLY,
-	NULL,
-	NULL,
-	"Does the post spawn setup of the Window"
+    "_Windowsetup",
+    EV_CODEONLY,
+    NULL,
+    NULL,
+    "Does the post spawn setup of the Window"
 );
 
 Event EV_Window_SetDebris
 (
-	"debristype",
-	EV_DEFAULT,
-	"i",
-	"type",
-	"Sets the debris type of the Window"
+    "debristype",
+    EV_DEFAULT,
+    "i",
+    "type",
+    "Sets the debris type of the Window"
 );
 
-CLASS_DECLARATION( Entity, WindowObject, "func_window" )
-{
-	{ &EV_Window_Setup,					&WindowObject::WindowSetup },
-	{ &EV_Damage,						&WindowObject::WindowDamaged },
-	{ &EV_Killed,						&WindowObject::WindowKilled },
-	{ &EV_Window_SetDebris,				&WindowObject::WindowDebrisType },
-	{ NULL, NULL }
+CLASS_DECLARATION(Entity, WindowObject, "func_window") {
+    {&EV_Window_Setup,     &WindowObject::WindowSetup     },
+    {&EV_Damage,           &WindowObject::WindowDamaged   },
+    {&EV_Killed,           &WindowObject::WindowKilled    },
+    {&EV_Window_SetDebris, &WindowObject::WindowDebrisType},
+    {NULL,                 NULL                           }
 };
 
 WindowObject::WindowObject()
 {
-	m_iDebrisType = WINDOW_GLASS;
+    if (LoadingSavegame) {
+        return;
+    }
 
-	PostEvent( EV_Window_Setup, EV_POSTSPAWN );
+    edict->s.eType = ET_GENERAL;
+    health         = 250;
+    max_health     = health;
+    deadflag       = 0;
+    takedamage     = DAMAGE_YES;
+
+    m_iDebrisType = WINDOW_GLASS;
+
+    PostEvent(EV_Window_Setup, EV_POSTSPAWN);
 }
 
-void WindowObject::Archive( Archiver& arc )
+void WindowObject::Archive(Archiver& arc)
 {
-	arc.ArchiveInteger( &m_iDebrisType );
-	arc.ArchiveString( &m_sBrokenModel );
+    Entity::Archive(arc);
+
+    arc.ArchiveInteger(&m_iDebrisType);
+    arc.ArchiveString(&m_sBrokenModel);
 }
 
-void WindowObject::WindowSetup( Event *ev )
+void WindowObject::WindowSetup(Event *ev)
 {
-	Entity *pEnt;
+    Entity *pEnt;
 
-	setSolidType( SOLID_BSP );
+    setMoveType(MOVETYPE_NONE);
+    setSolidType(SOLID_BSP);
+    setContents(CONTENTS_TRIGGER);
 
-	if( Target().length() )
-	{
-		pEnt = ( Entity * )G_FindTarget( NULL, Target() );
+    if (Target().length()) {
+        // If a target is defined,
+        // find it and set the model from it
+        pEnt = (Entity *)G_FindTarget(NULL, Target());
 
-		if( pEnt )
-		{
-			// set the broken model to the target model
-			m_sBrokenModel = pEnt->model;
+        if (pEnt) {
+            m_sBrokenModel = pEnt->model;
 
-			pEnt->PostEvent( EV_Remove, 0 );
-		}
-	}
-
-	takedamage = DAMAGE_YES;
-
-	if( health <= 0.1f ) {
-		health = 100.0f;
-	}
+            // Don't keep the original entity
+            pEnt->PostEvent(EV_Remove, 0);
+        }
+    }
 }
 
-void WindowObject::WindowDebrisType( Event *ev )
+void WindowObject::WindowDebrisType(Event *ev)
 {
-	m_iDebrisType = ev->GetInteger( 1 );
+    m_iDebrisType = ev->GetInteger(1);
 }
 
-void WindowObject::WindowDamaged( Event *ev )
+void WindowObject::WindowDamaged(Event *ev)
 {
-	int iMeansOfDeath;
-	int iDamage;
-	Vector vRight;
-	Vector vForward;
-	Vector vDir;
-	Event *event;
+    int    iMeansOfDeath;
+    int    iDamage;
+    Vector vRight;
+    Vector vForward;
+    Vector vDir;
+    Event *event;
 
-	if( !takedamage ) {
-		return;
-	}
+    if (!takedamage) {
+        return;
+    }
 
-	iDamage = ev->GetInteger( 2 );
-	iMeansOfDeath = ev->GetInteger( 9 );
+    iDamage       = ev->GetInteger(2);
+    iMeansOfDeath = ev->GetInteger(9);
 
-	if( iMeansOfDeath == MOD_BASH )
-	{
-		// double damage for bash
-		iDamage *= 2;
-	}
-	else if( iMeansOfDeath == MOD_EXPLOSION )
-	{
-		// instant break
-		iDamage = health;
-	}
+    if (iMeansOfDeath == MOD_BASH) {
+        // double damage for bash
+        iDamage *= 2;
+    } else if (iMeansOfDeath == MOD_EXPLOSION) {
+        // instant break
+        iDamage *= 10;
+    }
 
-	health -= iDamage;
+    health -= iDamage;
 
-	if( health <= 0.0f )
-	{
-		event = new Event( EV_Killed );
+    if (health <= 0.0f) {
+        event = new Event(EV_Killed);
 
-		event->AddEntity( ev->GetEntity( 1 ) );
-		event->AddInteger( ev->GetInteger( 2 ) );
-		event->AddEntity( ev->GetEntity( 3 ) );
+        event->AddEntity(ev->GetEntity(1));
+        event->AddInteger(ev->GetInteger(2));
+        event->AddEntity(ev->GetEntity(3));
 
-		ProcessEvent( event );
-	}
+        ProcessEvent(event);
+    }
 }
 
-void WindowObject::WindowKilled( Event *ev )
+void WindowObject::WindowKilled(Event *ev)
 {
-	Vector vCenter;
+    Vector vCenter;
 
-	setSolidType( SOLID_NOT );
+    setSolidType(SOLID_NOT);
 
-	hideModel();
-	takedamage = DAMAGE_NO;
+    hideModel();
+    takedamage = DAMAGE_NO;
 
-	vCenter = origin + mins + maxs;
+    vCenter = (mins + maxs) * 0.5;
+    vCenter += origin;
 
-	gi.SetBroadcastVisible( vCenter, vCenter );
-	gi.MSG_StartCGM(CGM_MAKE_WINDOW_DEBRIS);
-		gi.MSG_WriteCoord( vCenter[ 0 ] );
-		gi.MSG_WriteCoord( vCenter[ 1 ] );
-		gi.MSG_WriteCoord( vCenter[ 2 ] );
-		gi.MSG_WriteByte( m_iDebrisType );
-	gi.MSG_EndCGM();
+    gi.SetBroadcastVisible(vCenter, vCenter);
+    gi.MSG_StartCGM(BG_MapCGMToProtocol(g_protocol, CGM_MAKE_WINDOW_DEBRIS));
+    gi.MSG_WriteCoord(vCenter[0]);
+    gi.MSG_WriteCoord(vCenter[1]);
+    gi.MSG_WriteCoord(vCenter[2]);
+    gi.MSG_WriteByte(m_iDebrisType);
+    gi.MSG_EndCGM();
 
-	if( m_sBrokenModel.length() )
-	{
-		Entity *ent = new Entity;
+    if (m_sBrokenModel.length()) {
+        Entity *ent = new Entity;
 
-		ent->takedamage = DAMAGE_NO;
-		ent->setModel( m_sBrokenModel );
+        ent->takedamage = DAMAGE_NO;
+        ent->setModel(m_sBrokenModel);
 
-		ent->setMoveType( MOVETYPE_NONE );
-		ent->setSolidType( SOLID_BSP );
+        ent->setMoveType(MOVETYPE_NONE);
+        ent->setSolidType(SOLID_BSP);
 
-		setModel( m_sBrokenModel );
+        setModel(m_sBrokenModel);
 
-		if( spawnflags & WINDOW_BROKEN_BLOCK )
-		{
-			ent->setContents( CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP );
-		}
-		else
-		{
-			ent->setContents( CONTENTS_SHOOTONLY );
-		}
+        if (spawnflags & WINDOW_BROKEN_BLOCK) {
+            ent->setContents(CONTENTS_MONSTERCLIP | CONTENTS_PLAYERCLIP);
+        } else {
+            ent->setContents(CONTENTS_SHOOTONLY);
+        }
 
-		ent->setOrigin( origin );
-		ent->showModel();
-	}
+        ent->setOrigin(origin);
+        ent->showModel();
+    }
 
-	deadflag = DEAD_DEAD;
+    deadflag = DEAD_DEAD;
 
-	// remove the window
-	PostEvent( EV_Remove, 0 );
+    // remove the window
+    PostEvent(EV_Remove, 0);
 }
diff --git a/code/fgame/windows.h b/code/fgame/windows.h
index ce0f9e20..871f0763 100644
--- a/code/fgame/windows.h
+++ b/code/fgame/windows.h
@@ -23,29 +23,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // windows.h: Window class
 //
 
+#pragma once
+
 #include "entity.h"
 
-#define WINDOW_BROKEN_BLOCK			1
+#define WINDOW_BROKEN_BLOCK 1
 
-enum
-{
-	WINDOW_GLASS
+enum {
+    WINDOW_GLASS
 };
 
-class WindowObject : public Entity {
+class WindowObject : public Entity
+{
 private:
-	int			m_iDebrisType;
-	str			m_sBrokenModel;
+    int m_iDebrisType;
+    str m_sBrokenModel;
 
 public:
-	CLASS_PROTOTYPE( WindowObject );
+    CLASS_PROTOTYPE(WindowObject);
 
-	WindowObject();
+    WindowObject();
 
-	void Archive( Archiver& arc ) override;
+    void Archive(Archiver& arc) override;
 
-	void				WindowSetup( Event *ev );
-	void				WindowDebrisType( Event *ev );
-	void				WindowDamaged( Event *ev );
-	void				WindowKilled( Event *ev );
+    void WindowSetup(Event *ev);
+    void WindowDebrisType(Event *ev);
+    void WindowDamaged(Event *ev);
+    void WindowKilled(Event *ev);
 };
\ No newline at end of file
diff --git a/code/fgame/world.cpp b/code/fgame/world.cpp
deleted file mode 100644
index 9c2058fc..00000000
--- a/code/fgame/world.cpp
+++ /dev/null
@@ -1,1125 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// world.cpp : Holds the target list, and general info (fog and such).
-
-#include "g_phys.h"
-#include "world.h"
-#include "level.h"
-#include "scriptmaster.h"
-#include "scriptexception.h"
-#include "player.h"
-
-#ifdef GAME_DLL
-#include "../fgame/soundman.h"
-#endif
-
-WorldPtr world;
-
-Event EV_World_MapTime
-(
-	"map_time",
-	EV_DEFAULT,
-	"i",
-	"version",
-	"Internal usage."
-);
-Event EV_World_SetSoundtrack
-(
-	"soundtrack",
-	EV_DEFAULT,
-	"s",
-	"MusicFile",
-	"Set music soundtrack for this level."
-);
-Event EV_World_SetGravity
-(
-	"gravity",
-	EV_DEFAULT,
-	"f",
-	"worldGravity",
-	"Set the gravity for the whole world."
-);
-Event EV_World_SetNextMap
-(
-	"nextmap",
-	EV_DEFAULT,
-	"s",
-	"nextMap",
-	"Set the next map to change to"
-);
-Event EV_World_SetMessage
-(
-	"message",
-	EV_DEFAULT,
-	"s",
-	"worldMessage",
-	"Set a message for the world"
-);
-Event EV_World_SetWaterColor
-(
-	"watercolor",
-	EV_DEFAULT,
-	"v",
-	"waterColor",
-	"Set the watercolor screen blend"
-);
-Event EV_World_SetWaterAlpha
-(
-	"wateralpha",
-	EV_DEFAULT,
-	"f",
-	"waterAlpha",
-	"Set the alpha of the water screen blend"
-);
-Event EV_World_SetLavaColor
-(
-	"lavacolor",
-	EV_DEFAULT,
-	"v",
-	"lavaColor",
-	"Set the color of lava screen blend"
-);
-Event EV_World_SetLavaAlpha
-(
-	"lavaalpha",
-	EV_DEFAULT,
-	"f",
-	"lavaAlpha",
-	"Set the alpha of lava screen blend"
-);
-Event EV_World_GetFarPlane_Color
-(
-	"farplane_color",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the color of the far clipping plane fog",
-	EV_GETTER
-);
-Event EV_World_SetFarPlane_Color
-(
-	"farplane_color",
-	EV_DEFAULT,
-	"v",
-	"farplaneColor",
-	"Set the color of the far clipping plane fog",
-	EV_SETTER
-);
-Event EV_World_SetFarPlane_Color2
-(
-	"farplane_color",
-	EV_DEFAULT,
-	"v",
-	"farplaneColor",
-	"Set the color of the far clipping plane fog",
-	EV_NORMAL
-);
-Event EV_World_SetAnimatedFarPlaneColor
-(
-	"animated_farplane_color",
-	EV_DEFAULT,
-	"vvff",
-	"colorStart colorEnd ZStart ZEnd",
-	"Set the color of the far clipping plane based on a color range and a Z range",
-	EV_NORMAL
-);
-Event EV_World_SetFarPlane_Cull
-(
-	"farplane_cull",
-	EV_DEFAULT,
-	"i",
-	"farplaneCull",
-	"Whether or not the far clipping plane should cull things out of the world\n"
-	"0 - no cull\n"
-	"1 - normal cull\n"
-	"2 - cull but no bsp culling"
-);
-Event EV_World_GetFarPlane
-(
-	"farplane",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the distance of the far clipping plane",
-	EV_GETTER
-);
-Event EV_World_SetFarPlane
-(
-	"farplane",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistance",
-	"Set the distance of the far clipping plane",
-	EV_SETTER
-);
-Event EV_World_SetFarClipOverride
-(
-	"farclipoverride",
-	EV_DEFAULT,
-	"f",
-	"farclipoverride",
-	"Override the min config default for the far clip distance",
-	EV_NORMAL
-);
-Event EV_World_SetFarPlaneColorOverride
-(
-	"farplaneclipcolor",
-	EV_DEFAULT,
-	"v",
-	"farplaneclipcolor",
-	"Override the fog color for the min config",
-	EV_NORMAL
-);
-Event EV_World_SetFarPlane2
-(
-	"farplane",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistance",
-	"Set the distance of the far clipping plane",
-	EV_NORMAL
-);
-Event EV_World_SetAnimatedFarPlane
-(
-	"animated_farplane",
-	EV_DEFAULT,
-	"ffff",
-	"farplaneStart farplaneEnd ZStart ZEnd",
-	"Set the distance of the far clipping plane based on a farplane range and a Z range",
-	EV_NORMAL
-);
-Event EV_World_GetFarPlaneBias
-(
-	"farplane_bias",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the distance bias of the far clipping plane",
-	EV_GETTER
-);
-Event EV_World_SetFarPlaneBias
-(
-	"farplane_bias",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistanceBias",
-	"Set the distance bias of the far clipping plane",
-	EV_SETTER
-);
-Event EV_World_SetFarPlaneBias2
-(
-	"farplane_bias",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistanceBias",
-	"Set the distance bias of the far clipping plane",
-	EV_NORMAL
-);
-Event EV_World_SetAnimatedFarPlaneBias
-(
-	"animated_farplane_bias",
-	EV_DEFAULT,
-	"ffff",
-	"biasStart biasEnd ZStart ZEnd",
-	"Set the bias of the far clipping plane based on a bias range and a Z range",
-	EV_NORMAL
-);
-Event EV_World_UpdateAnimatedFarplane
-(
-	"_update_animated_farplane",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Updates the farplane if it is being animated.",
-	EV_NORMAL
-);
-Event EV_World_GetSkyboxFarPlane
-(
-	"skybox_farplane",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the distance of the skybox far clipping plane",
-	EV_GETTER
-);
-Event EV_World_SetSkyboxFarPlane
-(
-	"skybox_farplane",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistance",
-	"Set the distance of the skybox far clipping plane",
-	EV_SETTER
-);
-Event EV_World_SetSkyboxFarPlane2
-(
-	"skybox_farplane",
-	EV_DEFAULT,
-	"f",
-	"farplaneDistance",
-	"Set the distance of the skybox far clipping plane",
-	EV_NORMAL
-);
-Event EV_World_GetSkyboxSpeed
-(
-	"skybox_speed",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the speed of the skybox",
-	EV_GETTER
-);
-Event EV_World_SetSkyboxSpeed
-(
-	"skybox_speed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"Set the speed of the skybox",
-	EV_SETTER
-);
-Event EV_World_SetSkyboxSpeed2
-(
-	"skybox_speed",
-	EV_DEFAULT,
-	"f",
-	"speed",
-	"Set the speed of the skybox",
-	EV_NORMAL
-);
-Event EV_World_SetRenderTerrain
-(
-	"render_terrain",
-	EV_DEFAULT,
-	"b",
-	"render_terrain",
-	"Set to draw or not draw terrain",
-	EV_NORMAL
-);
-Event EV_World_GetRenderTerrain
-(
-	"get_render_terrain",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Get the render terrain switch",
-	EV_GETTER
-);
-Event EV_World_SetAmbientLight
-(
-	"ambientlight",
-	EV_DEFAULT,
-	"b",
-	"ambientLight",
-	"Set whether or not ambient light should be used"
-);
-Event EV_World_SetAmbientIntensity
-(
-	"ambient",
-	EV_DEFAULT,
-	"f",
-	"ambientIntensity",
-	"Set the intensity of the ambient light"
-);
-Event EV_World_SetSunColor
-(
-	"suncolor",
-	EV_DEFAULT,
-	"v",
-	"sunColor",
-	"Set the color of the sun"
-);
-Event EV_World_SetSunLight
-(
-	"sunlight",
-	EV_DEFAULT,
-	"b",
-	"sunlight",
-	"Set whether or not there should be sunlight"
-);
-Event EV_World_SetSunDirection
-(
-	"sundirection",
-	EV_DEFAULT,
-	"v",
-	"sunlightDirection",
-	"Set the direction of the sunlight"
-);
-Event EV_World_LightmapDensity
-(
-	"lightmapdensity",
-	EV_DEFAULT,
-	"f",
-	"density",
-	"Set the default lightmap density for all world surfaces"
-);
-Event EV_World_SunFlareName
-(
-	"sunflarename",
-	EV_DEFAULT,
-	"s",
-	"flarename",
-	"Set the flare to use for the sunflare"
-);
-Event EV_World_SunFlareDirection
-(
-	"sunflaredirection",
-	EV_DEFAULT,
-	"v",
-	"angles",
-	"Set the direction of the sunflare"
-);
-Event EV_World_SetSkyAlpha
-(
-	"skyalpha",
-	EV_DEFAULT,
-	"f",
-	"newAlphaForPortalSky",
-	"Set the alpha on the sky"
-);
-Event EV_World_SetSkyPortal
-(
-	"skyportal",
-	EV_DEFAULT,
-	"b",
-	"newSkyPortalState",
-	"Whether or not to use the sky portal at all"
-);
-Event EV_World_SetNumArenas
-(
-	"numarenas",
-	EV_DEFAULT,
-	"i",
-	"numarenas",
-	"Set the number of arenas in the world",
-	EV_NORMAL
-);
-Event EV_World_SetAIVisionDistance
-(
-	"ai_visiondistance",
-	EV_DEFAULT,
-	"f",
-	"vision_distance",
-	"Sets the default AI Vision Distance",
-	EV_NORMAL
-);
-Event EV_World_SetNorthYaw
-(
-	"northyaw",
-	EV_DEFAULT,
-	"f",
-	"yaw",
-	"Sets the yaw direction that is considered to be north"
-);
-Event EV_World_SetSunDiffuse
-(
-	"sundiffuse",
-	EV_DEFAULT,
-	"f",
-	"factor",
-	"Sets the fraction of the sunlight to use for diffuse sun"
-);
-
-Event EV_World_SetSunDiffuseColor
-(
-	"sundiffusecolor",
-	EV_DEFAULT,
-	"v",
-	"diffusecolor",
-	"Sets an alternate sun color to use for clcing diffuse sun"
-);
-Event EV_World_Overbright
-(
-	"overbright",
-	EV_DEFAULT,
-	"i",
-	"use",
-	"When set to non-zero, removes the overbright cutoff of lightmaps",
-	EV_NORMAL
-);
-Event EV_World_VisDerived
-(
-	"vis_derived",
-	EV_DEFAULT,
-	"i",
-	"use",
-	"whether or not the vis compiler derives additional vis info from the manual vis",
-	EV_NORMAL
-);
-
-CLASS_DECLARATION( Entity, World, "worldspawn" )
-{
-	{ &EV_World_SetSoundtrack,				&World::SetSoundtrack },
-	{ &EV_World_SetGravity,					&World::SetGravity },
-	{ &EV_World_SetNextMap,					&World::SetNextMap },
-	{ &EV_World_SetMessage,					&World::SetMessage },
-	{ &EV_World_SetWaterColor,				&World::SetWaterColor },
-	{ &EV_World_SetWaterAlpha,				&World::SetWaterAlpha },
-	{ &EV_World_SetLavaColor,				&World::SetLavaColor },
-	{ &EV_World_SetLavaAlpha,				&World::SetLavaAlpha },
-	{ &EV_World_GetFarPlane_Color,			&World::GetFarPlane_Color },
-	{ &EV_World_SetFarPlane_Color,			&World::SetFarPlane_Color },
-	{ &EV_World_SetFarPlane_Color2,			&World::SetFarPlane_Color },
-	{ &EV_World_SetFarPlane_Cull,			&World::SetFarPlane_Cull },
-	{ &EV_World_GetFarPlane,				&World::GetFarPlane },
-	{ &EV_World_SetFarPlane,				&World::SetFarPlane },
-	{ &EV_World_SetFarClipOverride,			&World::SetFarClipOverride },
-	{ &EV_World_SetFarPlaneColorOverride,	&World::SetFarPlaneColorOverride },
-	{ &EV_World_SetFarPlane2,				&World::SetFarPlane },
-	{ &EV_World_GetFarPlaneBias,			&World::GetFarPlaneBias },
-	{ &EV_World_SetFarPlaneBias,			&World::SetFarPlaneBias },
-	{ &EV_World_SetFarPlaneBias2,			&World::SetFarPlaneBias },
-	{ &EV_World_GetSkyboxFarPlane,			&World::GetSkyboxFarplane },
-	{ &EV_World_SetSkyboxFarPlane,			&World::SetSkyboxFarplane },
-	{ &EV_World_SetSkyboxFarPlane2,			&World::SetSkyboxFarplane },
-	{ &EV_World_GetSkyboxSpeed,				&World::GetSkyboxSpeed },
-	{ &EV_World_SetSkyboxSpeed,				&World::SetSkyboxSpeed },
-	{ &EV_World_SetSkyboxSpeed2,			&World::SetSkyboxSpeed },
-	{ &EV_World_GetRenderTerrain,			&World::GetRenderTerrain },
-	{ &EV_World_SetRenderTerrain,			&World::SetRenderTerrain },
-	{ &EV_World_SetSkyAlpha,				&World::SetSkyAlpha },
-	{ &EV_World_SetSkyPortal,				&World::SetSkyPortal },
-	{ &EV_World_SetNorthYaw,				&World::SetNorthYaw },
-	{ &EV_World_SetAmbientLight,			NULL },
-	{ &EV_World_SetAmbientIntensity,		NULL },
-	{ &EV_World_SetSunColor,				NULL },
-	{ &EV_World_SetSunLight,				NULL },
-	{ &EV_World_SetSunDirection,			NULL },
-	{ &EV_World_LightmapDensity,			NULL },
-	{ &EV_World_SunFlareName,				NULL },
-	{ &EV_World_SunFlareDirection,			NULL },
-	{ &EV_World_SetNumArenas,				NULL },
-	{ &EV_World_SetSunDiffuse,				NULL },
-	{ &EV_World_SetSunDiffuseColor,			NULL },
-	{ &EV_World_Overbright,					NULL },
-	{ &EV_World_VisDerived,					NULL },
-	{ &EV_World_SetAIVisionDistance,		&World::SetAIVisionDistance },
-	{ &EV_World_SetNorthYaw,				&World::SetNorthYaw },
-	{ &EV_World_SetAnimatedFarPlaneColor,	&World::SetAnimatedFarplaneColor },
-	{ &EV_World_SetAnimatedFarPlane,		&World::SetAnimatedFarplane },
-	{ &EV_World_SetAnimatedFarPlaneBias,	&World::SetAnimatedFarplaneBias },
-	{ &EV_World_UpdateAnimatedFarplane,		&World::UpdateAnimatedFarplane },
-	{ NULL,									NULL }
-};
-
-World::World()
-{
-	world = this;
-	world_dying = qfalse;
-
-	// Anything that modifies configstrings, or spawns things is ignored when loading savegames
-	if( LoadingSavegame )
-	{
-		return;
-	}
-
-	assert( entnum == ENTITYNUM_WORLD );
-
-	setMoveType( MOVETYPE_NONE );
-	setSolidType( SOLID_BSP );
-
-	// world model is always index 1
-	edict->s.modelindex = 1;
-	model = "*1";
-
-	UpdateConfigStrings();
-
-	// clear out the soundtrack from the last level
-	ChangeSoundtrack( "" );
-
-	// set the default gravity
-	gi.cvar_set( "sv_gravity", "800" );
-
-	// set the default farplane parameters
-	farplane_distance = 0;
-	farplane_bias = 0.0;
-	farplane_color = vec_zero;
-	farplane_cull = qtrue;
-	skybox_farplane = 0.0;
-	render_terrain = qtrue;
-	skybox_speed = 0.0;
-	farclip_override = 0.f;
-	farplane_color_override = Vector(-1, -1, -1);
-	animated_farplane_start = 0.0;
-	animated_farplane_end = 0.0;
-	animated_farplane_start_z = 8192.0;
-	animated_farplane_end_z = 0.0;
-	animated_farplane_bias_start = 0.0;
-	animated_farplane_bias_end = 0.0;
-	animated_farplane_bias_start_z = 8192.0;
-	animated_farplane_bias_end_z = 0.0;
-	animated_farplane_color_start = vec_zero;
-	animated_farplane_color_end = vec_zero;
-	animated_farplane_color_start_z = 8192.0;
-	animated_farplane_color_end_z = 0.0;
-
-	UpdateFog();
-
-	sky_alpha = 1.0f;
-	sky_portal = qtrue;
-	UpdateSky();
-
-	m_fAIVisionDistance = 2048.0f;
-
-	level.cinematic = spawnflags & WORLD_CINEMATIC;
-
-	if( level.cinematic )
-		gi.cvar_set( "sv_cinematic", "1" );
-	else
-		gi.cvar_set( "sv_cinematic", "0" );
-
-	level.nextmap = "";
-	level.level_name = level.mapname;
-
-	SoundMan.Load();
-
-	// Set the color for the blends.
-	level.water_color = Vector( 0, 0, 1 );
-	level.water_alpha = 0.1f;
-	level.lava_color = Vector( 1.0f, 0.3f, 0 );
-	level.lava_alpha = 0.6f;
-
-	//
-	// set the targetname of the world
-	//
-	SetTargetName( "world" );
-
-	m_fNorth = 0;
-}
-
-void World::UpdateConfigStrings( void )
-{
-	//
-	// make some data visible to connecting client
-	//
-	gi.setConfigstring( CS_GAME_VERSION, GAME_VERSION );
-	gi.setConfigstring( CS_LEVEL_START_TIME, va( "%i", level.svsStartTime ) );
-
-	// make some data visible to the server
-	gi.setConfigstring( CS_MESSAGE, level.level_name.c_str() );
-};
-
-void World::UpdateFog(void)
-{
-	const char* fogInfoString;
-	gi.SetFarPlane(farplane_distance);
-
-	if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
-		fogInfoString = va(
-			"%d %.0f %.0f %.0f %.6f %.4f %.4f %.4f %d %.0f %.2f %.2f %.2f",
-			farplane_cull,
-			farplane_distance,
-			farplane_bias,
-			skybox_farplane,
-			skybox_speed,
-			farplane_color.x,
-			farplane_color.y,
-			farplane_color.z,
-			render_terrain,
-			farclip_override,
-			farplane_color_override.x,
-			farplane_color_override.y,
-			farplane_color_override.z
-		);
-	} else {
-		fogInfoString = va(
-			"%d %.0f %.4f %.4f %.4f",
-			farplane_cull,
-			farplane_distance,
-			farplane_color.x,
-			farplane_color.y,
-			farplane_color.z
-		);
-	}
-
-	gi.setConfigstring(CS_FOGINFO, fogInfoString);
-}
-
-void World::SetFarClipOverride(Event* ev)
-{
-	farplane_color_override = ev->GetVector(1);
-	UpdateFog();
-}
-
-void World::SetFarPlaneColorOverride(Event* ev)
-{
-	farclip_override = ev->GetFloat(1);
-	UpdateFog();
-}
-
-void World::UpdateSky( void )
-{
-	gi.SetSkyPortal( sky_portal );
-	gi.setConfigstring( CS_SKYINFO, va( "%.4f %d", sky_alpha, sky_portal ) );
-}
-
-void World::SetSoundtrack( Event *ev )
-{
-	const char *text;
-
-	text = ev->GetString( 1 );
-	ChangeSoundtrack( text );
-}
-
-void World::SetGravity( Event *ev )
-{
-	gi.cvar_set( "sv_gravity", ev->GetString( 1 ) );
-}
-
-void World::GetFarPlane(Event* ev)
-{
-	ev->AddFloat(farplane_distance);
-}
-
-void World::SetFarPlane( Event *ev )
-{
-	farplane_distance = ev->GetFloat( 1 );
-	UpdateFog();
-}
-
-void World::GetFarPlaneBias(Event* ev)
-{
-	ev->AddFloat(farplane_bias);
-}
-
-void World::SetFarPlaneBias(Event* ev)
-{
-	farplane_bias = ev->GetFloat(1);
-}
-
-void World::GetFarPlane_Color(Event* ev)
-{
-	ev->AddVector(farplane_color);
-}
-
-void World::SetFarPlane_Color(Event* ev)
-{
-	farplane_color = ev->GetVector(1);
-	UpdateFog();
-}
-
-void World::SetFarPlane_Cull( Event *ev )
-{
-	farplane_cull = ev->GetBoolean( 1 );
-	UpdateFog();
-}
-
-void World::GetSkyboxFarplane(Event* ev)
-{
-	ev->AddFloat(skybox_farplane);
-}
-
-void World::SetSkyboxFarplane(Event* ev)
-{
-	skybox_farplane = ev->GetFloat(1);
-}
-
-void World::SetAnimatedFarplaneColor(Event* ev)
-{
-
-	animated_farplane_color_start = ev->GetVector(1);
-	animated_farplane_color_end = ev->GetVector(2);
-	animated_farplane_color_start_z = ev->GetFloat(3);
-	animated_farplane_color_end_z = ev->GetFloat(4);
-
-	if (animated_farplane_color_start_z > animated_farplane_color_end_z)
-	{
-		float end_z = animated_farplane_color_end_z;
-		animated_farplane_color_end_z = animated_farplane_color_start_z;
-		animated_farplane_color_start_z = end_z;
-
-		Vector end = animated_farplane_color_end;
-		animated_farplane_color_end = animated_farplane_color_start;
-		animated_farplane_color_start = end;
-	}
-
-	PostEvent(EV_World_UpdateAnimatedFarplane, 0);
-}
-
-void World::SetAnimatedFarplane(Event* ev)
-{
-	animated_farplane_start = ev->GetFloat(1);
-	animated_farplane_end = ev->GetFloat(2);
-	animated_farplane_start_z = ev->GetFloat(3);
-	animated_farplane_end_z = ev->GetFloat(4);
-
-	if (animated_farplane_start_z > animated_farplane_end_z)
-	{
-		float end_z = animated_farplane_end_z;
-		animated_farplane_end_z = animated_farplane_start_z;
-		animated_farplane_start_z = end_z;
-
-		float end = animated_farplane_end;
-		animated_farplane_end = animated_farplane_start;
-		animated_farplane_start = end;
-	}
-
-	PostEvent(EV_World_UpdateAnimatedFarplane, 0);
-}
-
-void World::SetAnimatedFarplaneBias(Event* ev)
-{
-	animated_farplane_bias_start = ev->GetFloat(1);
-	animated_farplane_bias_end = ev->GetFloat(2);
-	animated_farplane_bias_start_z = ev->GetFloat(3);
-	animated_farplane_bias_end_z = ev->GetFloat(4);
-
-	if (animated_farplane_bias_start_z > animated_farplane_bias_end_z)
-	{
-		float end_z = animated_farplane_bias_end_z;
-		animated_farplane_bias_end_z = animated_farplane_bias_start_z;
-		animated_farplane_bias_start_z = end_z;
-
-		float end = animated_farplane_end;
-		animated_farplane_bias_end = animated_farplane_bias_start;
-		animated_farplane_bias_start = end;
-	}
-
-	PostEvent(EV_World_UpdateAnimatedFarplane, 0);
-}
-
-void World::UpdateAnimatedFarplane(Event* ev)
-{
-	Entity* player;
-
-	CancelEventsOfType(EV_World_UpdateAnimatedFarplane);
-
-	if (g_gametype->integer != GT_SINGLE_PLAYER) {
-		return;
-	}
-
-	PostEvent(EV_World_UpdateAnimatedFarplane, level.frametime);
-
-	player = g_entities[0].entity;
-	if (!player) {
-		return;
-	}
-
-	if (animated_farplane_start_z != 8192)
-	{
-		float alpha;
-
-		if (player->origin.z < animated_farplane_start_z)
-		{
-			alpha = 0;
-		} else if (player->origin.z > animated_farplane_end_z) {
-			alpha = 1;
-		} else {
-			alpha = (player->origin.z - animated_farplane_start_z) / (animated_farplane_end_z - animated_farplane_start_z);
-		}
-
-		farplane_distance = alpha * (animated_farplane_end - animated_farplane_start) + animated_farplane_start;
-	}
-
-	if (animated_farplane_bias_start_z != 8192)
-	{
-		float alpha;
-
-		if (player->origin.z < animated_farplane_bias_start_z)
-		{
-			alpha = 0;
-		} else if (player->origin.z > animated_farplane_bias_end_z) {
-			alpha = 1;
-		} else {
-			alpha = (player->origin.z - animated_farplane_bias_start_z) / (animated_farplane_bias_end_z - animated_farplane_bias_start_z);
-		}
-
-		farplane_bias = alpha * (animated_farplane_bias_end - animated_farplane_bias_start) + animated_farplane_bias_start;
-	}
-
-	if (animated_farplane_color_start_z != 8192)
-	{
-		float alpha, startAlpha, endAlpha;
-		Vector start, end;
-		float dot;
-
-		if (player->origin.z < animated_farplane_color_start_z)
-		{
-			alpha = 0;
-		} else if (player->origin.z > animated_farplane_color_end_z) {
-			alpha = 1;
-		} else {
-			alpha = (player->origin.z - animated_farplane_color_start_z) / (animated_farplane_color_end_z - animated_farplane_color_start_z);
-		}
-		
-		start = animated_farplane_color_start;
-		end = animated_farplane_color_end;
-		VectorNormalize(start);
-		VectorNormalize(end);
-
-		dot = Vector::Dot(start, end);
-		if (1.f - dot > 0.000001)
-		{
-			startAlpha = sin((1.f - alpha) * acos(dot)) / sin(acos(dot));
-			endAlpha = sin(acos(dot) * alpha) / sin(acos(dot));
-		}
-		else
-		{
-			startAlpha = 1.f - alpha;
-			endAlpha = alpha;
-		}
-
-		farplane_color = end * endAlpha + start * startAlpha;
-	}
-
-	UpdateFog();
-}
-
-void World::GetRenderTerrain(Event* ev)
-{
-	ev->AddInteger(render_terrain);
-}
-
-void World::SetRenderTerrain(Event* ev)
-{
-	render_terrain = ev->GetInteger(1);
-}
-
-void World::GetSkyboxSpeed(Event* ev)
-{
-	ev->AddInteger(skybox_speed);
-}
-
-void World::SetSkyboxSpeed(Event* ev)
-{
-	skybox_speed = ev->GetInteger(1);
-}
-
-void World::SetSkyAlpha( Event *ev )
-{
-	sky_alpha = ev->GetFloat( 1 );
-	UpdateSky();
-}
-
-void World::SetSkyPortal( Event *ev )
-{
-	sky_portal = ev->GetBoolean( 1 );
-	UpdateSky();
-}
-
-void World::SetNextMap( Event *ev )
-{
-	level.nextmap = ev->GetString( 1 );
-}
-
-void World::SetMessage( Event *ev )
-{
-	const char *text;
-
-	text = ev->GetString( 1 );
-	level.level_name = text;
-	gi.setConfigstring( CS_MESSAGE, text );
-}
-
-void World::SetWaterColor( Event *ev )
-{
-	level.water_color = ev->GetVector( 1 );
-}
-
-void World::SetWaterAlpha( Event *ev )
-{
-	level.water_alpha = ev->GetFloat( 1 );
-}
-void World::SetLavaColor( Event *ev )
-{
-	level.lava_color = ev->GetVector( 1 );
-}
-
-void World::SetLavaAlpha( Event *ev )
-{
-	level.lava_alpha = ev->GetFloat( 1 );
-}
-
-void World::SetNumArenas(Event* ev)
-{
-	level.m_numArenas = ev->GetInteger(1);
-}
-
-void World::SetAIVisionDistance(Event* ev)
-{
-	m_fAIVisionDistance = ev->GetFloat(1);
-}
-
-void World::SetNorthYaw( Event *ev )
-{
-	m_fNorth = anglemod( ev->GetFloat( 1 ) );
-}
-
-SimpleEntity *World::GetTarget( str targetname, bool quiet )
-{
-	return GetTarget( Director.AddString( targetname ), quiet );
-}
-
-SimpleEntity *World::GetTarget( const_str targetname, bool quiet )
-{
-	ConSimple* list = GetTargetList( targetname );
-
-	if( list->NumObjects() == 1 )
-	{
-		return list->ObjectAt( 1 );
-	}
-	else if( list->NumObjects() > 1 )
-	{
-		if( !quiet ) {
-			warning( "World::GetTarget", "There are %d entities with targetname '%s'. You are using a command that requires exactly one.", list->NumObjects(), Director.GetString( targetname ).c_str() );
-		}
-	}
-
-	return NULL;
-}
-
-SimpleEntity *World::GetScriptTarget( str targetname )
-{
-	return GetScriptTarget( Director.AddString( targetname ) );
-}
-
-SimpleEntity *World::GetScriptTarget( const_str targetname )
-{
-	ConSimple* list = GetTargetList( targetname );
-
-	if( list->NumObjects() == 1 )
-	{
-		return list->ObjectAt( 1 );
-	}
-	else if( list->NumObjects() > 1 )
-	{
-		ScriptError( "There are %d entities with targetname '%s'. You are using a command that requires exactly one.", list->NumObjects(), Director.GetString( targetname ).c_str() );
-	}
-
-	return NULL;
-}
-
-ConSimple *World::GetExistingTargetList( const str& targetname )
-{
-	return GetExistingTargetList( Director.AddString( targetname ) );
-}
-
-ConSimple *World::GetExistingTargetList( const_str targetname )
-{
-	return m_targetList.findKeyValue( targetname );
-}
-
-ConSimple *World::GetTargetList( str& targetname )
-{
-	return GetTargetList( Director.AddString( targetname ) );
-}
-
-ConSimple *World::GetTargetList( const_str targetname )
-{
-	return &m_targetList.addKeyValue( targetname );
-}
-
-void World::AddTargetEntity( SimpleEntity *ent )
-{
-	str targetname = ent->TargetName();
-
-	if( !targetname.length() )
-	{
-		return;
-	}
-
-	ConSimple* list = GetTargetList( targetname );
-
-	list->AddObject( ent );
-}
-
-void World::AddTargetEntityAt( SimpleEntity *ent, int index )
-{
-	str targetname = ent->TargetName();
-
-	if( !targetname.length() )
-	{
-		return;
-	}
-
-	ConSimple* list = GetTargetList( targetname );
-
-	list->AddObjectAt( index, ent );
-}
-
-int World::GetTargetnameIndex(SimpleEntity* ent)
-{
-	ConSimple* list = GetTargetList(ent->TargetName());
-
-	return list->IndexOfObject(ent);
-}
-
-void World::RemoveTargetEntity( SimpleEntity *ent )
-{
-	if (world->world_dying) {
-		return;
-	}
-
-	const str targetname = ent->TargetName();
-
-	if( !targetname.length() )
-	{
-		return;
-	}
-
-	ConSimple* list = GetExistingTargetList( targetname );
-
-	if( list )
-	{
-		list->RemoveObject( ent );
-
-		if( list->NumObjects() <= 0 )
-		{
-			m_targetList.remove( Director.AddString( targetname ) );
-		}
-	}
-}
-
-SimpleEntity *World::GetNextEntity( str targetname, SimpleEntity *ent )
-{
-	return GetNextEntity( Director.AddString( targetname ), ent );
-}
-
-SimpleEntity *World::GetNextEntity( const_str targetname, SimpleEntity *ent )
-{
-	ConSimple* list = GetTargetList( targetname );
-	int index;
-
-	if( ent )
-	{
-		index = list->IndexOfObject( ent ) + 1;
-	}
-	else
-	{
-		index = 1;
-	}
-
-	if( list->NumObjects() >= index )
-	{
-		return list->ObjectAt( index );
-	}
-	else
-	{
-		return NULL;
-	}
-}
-
-void World::FreeTargetList()
-{
-	m_targetList.clear();
-}
diff --git a/code/fgame/world.h b/code/fgame/world.h
deleted file mode 100644
index 0b4ec600..00000000
--- a/code/fgame/world.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// world.h: Global world information (fog and such).
-
-#ifndef __WORLD_H__
-#define __WORLD_H__
-
-#if defined ( CGAME_DLL )
-#include "../cgame_hook/script/centity.h"
-#elif defined ( GAME_DLL )
-#include "entity.h"
-#else
-#include "glb_local.h"
-#include "simpleentity.h"
-#endif
-
-#include "gamescript.h"
-
-#define WORLD_CINEMATIC		1
-
-typedef Container< SafePtr< SimpleEntity > > ConSimple;
-
-class World : public Entity {
-	con_set < const_str, ConSimple > m_targetList; // moh could have used con_set instead of TargetList
-	qboolean world_dying;
-
-public:
-	// farplane variables
-	float		farplane_distance;
-	float		farplane_bias;
-	Vector		farplane_color;
-	qboolean	farplane_cull;
-	float		skybox_farplane;
-	qboolean	render_terrain;
-	float		skybox_speed;
-	float		farclip_override;
-	Vector		farplane_color_override;
-	float		animated_farplane_start;
-	float		animated_farplane_end;
-	float		animated_farplane_start_z;
-	float		animated_farplane_end_z;
-	float		animated_farplane_bias_start;
-	float		animated_farplane_bias_end;
-	float		animated_farplane_bias_start_z;
-	float		animated_farplane_bias_end_z;
-	Vector		animated_farplane_color_start;
-	Vector		animated_farplane_color_end;
-	float		animated_farplane_color_start_z;
-	float		animated_farplane_color_end_z;
-
-	// sky variables
-	float		sky_alpha;
-	qboolean	sky_portal;
-
-	// orientation variables
-	float m_fAIVisionDistance;
-	float m_fNorth;
-
-public:
-	CLASS_PROTOTYPE( World );
-
-	World();
-
-	void			AddTargetEntity( SimpleEntity *ent );
-	void			AddTargetEntityAt( SimpleEntity *ent, int index );
-	void			RemoveTargetEntity( SimpleEntity *ent );
-
-	void			FreeTargetList();
-
-	SimpleEntity	*GetNextEntity( str targetname, SimpleEntity *ent );
-	SimpleEntity	*GetNextEntity( const_str targetname, SimpleEntity *ent );
-	SimpleEntity	*GetScriptTarget( str targetname );
-	SimpleEntity	*GetScriptTarget( const_str targetname );
-	SimpleEntity	*GetTarget( str targetname, bool quiet );
-	SimpleEntity	*GetTarget( const_str targetname, bool quiet );
-	int				GetTargetnameIndex( SimpleEntity *ent );
-
-	ConSimple		*GetExistingTargetList( const str& targetname );
-	ConSimple		*GetExistingTargetList( const_str targetname );
-	ConSimple		*GetTargetList( str& targetname );
-	ConSimple		*GetTargetList( const_str targetname );
-
-	void			SetFarClipOverride(Event* ev);
-	void			SetFarPlaneColorOverride(Event* ev);
-	void			SetSoundtrack( Event *ev );
-	void			SetGravity( Event *ev );
-	void			SetNextMap( Event *ev );
-	void			SetMessage( Event *ev );
-	void			SetWaterColor( Event *ev );
-	void			SetWaterAlpha( Event *ev );
-	void			SetLavaColor( Event *ev );
-	void			SetLavaAlpha( Event *ev );
-	void			GetFarPlane_Color(Event* ev);
-	void			SetFarPlane_Color( Event *ev );
-	void			GetFarPlaneBias(Event* ev);
-	void			SetFarPlaneBias(Event* ev);
-	void			SetFarPlane_Cull( Event *ev );
-	void			GetSkyboxFarplane( Event *ev );
-	void			SetSkyboxFarplane(Event* ev);
-	void			SetAnimatedFarplaneColor(Event* ev);
-	void			SetAnimatedFarplane(Event* ev);
-	void			SetAnimatedFarplaneBias(Event* ev);
-	void			UpdateAnimatedFarplane(Event* ev);
-	void			GetRenderTerrain(Event* ev);
-	void			SetRenderTerrain(Event* ev);
-	void			GetSkyboxSpeed(Event* ev);
-	void			SetSkyboxSpeed(Event* ev);
-	void			GetFarPlane( Event *ev );
-	void			SetFarPlane( Event *ev );
-	void			SetSkyAlpha( Event *ev );
-	void			SetSkyPortal( Event *ev );
-	void			SetNumArenas(Event* ev);
-	void			SetAIVisionDistance(Event* ev);
-	void			SetNorthYaw( Event *ev );
-	void			UpdateConfigStrings( void );
-	void			UpdateFog( void );
-	void			UpdateSky( void );
-};
-
-typedef SafePtr< World > WorldPtr;
-extern WorldPtr world;
-
-#endif /* __WORLD_H__ */
diff --git a/code/fgame/worldspawn.cpp b/code/fgame/worldspawn.cpp
new file mode 100644
index 00000000..cbe476fc
--- /dev/null
+++ b/code/fgame/worldspawn.cpp
@@ -0,0 +1,1300 @@
+/*
+===========================================================================
+Copyright (C) 2015 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// world.cpp : Holds the target list, and general info (fog and such).
+
+#include "g_phys.h"
+#include "worldspawn.h"
+#include "level.h"
+#include "scriptmaster.h"
+#include "scriptexception.h"
+#include "player.h"
+
+#ifdef GAME_DLL
+#    include "../fgame/soundman.h"
+#endif
+
+WorldPtr world;
+
+Event EV_World_MapTime
+(
+    "map_time",
+    EV_DEFAULT,
+    "i",
+    "version",
+    "Internal usage.",
+    EV_NORMAL
+);
+Event EV_World_SetSoundtrack
+(
+    "soundtrack",
+    EV_DEFAULT,
+    "s",
+    "MusicFile",
+    "Set music soundtrack for this level.",
+    EV_NORMAL
+);
+Event EV_World_SetGravity
+(
+    "gravity",
+    EV_DEFAULT,
+    "f",
+    "worldGravity",
+    "Set the gravity for the whole world.",
+    EV_NORMAL
+);
+Event EV_World_SetNextMap
+(
+    "nextmap",
+    EV_DEFAULT,
+    "s",
+    "nextMap",
+    "Set the next map to change to",
+    EV_NORMAL
+);
+Event EV_World_SetMessage
+(
+    "message",
+    EV_DEFAULT,
+    "s",
+    "worldMessage",
+    "Set a message for the world",
+    EV_NORMAL
+);
+Event EV_World_SetWaterColor
+(
+    "watercolor",
+    EV_DEFAULT,
+    "v",
+    "waterColor",
+    "Set the watercolor screen blend",
+    EV_NORMAL
+);
+Event EV_World_SetWaterAlpha
+(
+    "wateralpha",
+    EV_DEFAULT,
+    "f",
+    "waterAlpha",
+    "Set the alpha of the water screen blend",
+    EV_NORMAL
+);
+Event EV_World_SetLavaColor
+(
+    "lavacolor",
+    EV_DEFAULT,
+    "v",
+    "lavaColor",
+    "Set the color of lava screen blend",
+    EV_NORMAL
+);
+Event EV_World_SetLavaAlpha
+(
+    "lavaalpha",
+    EV_DEFAULT,
+    "f",
+    "lavaAlpha",
+    "Set the alpha of lava screen blend",
+    EV_NORMAL
+);
+Event EV_World_GetFarPlane_Color
+(
+    "farplane_color",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the color of the far clipping plane fog",
+    EV_GETTER
+);
+Event EV_World_SetFarPlane_Color
+(
+    "farplane_color",
+    EV_DEFAULT,
+    "v",
+    "farplaneColor",
+    "Set the color of the far clipping plane fog",
+    EV_SETTER
+);
+Event EV_World_SetFarPlane_Color2
+(
+    "farplane_color",
+    EV_DEFAULT,
+    "v",
+    "farplaneColor",
+    "Set the color of the far clipping plane fog",
+    EV_NORMAL
+);
+Event EV_World_SetAnimatedFarPlaneColor
+(
+    "animated_farplane_color",
+    EV_DEFAULT,
+    "vvff",
+    "colorStart colorEnd ZStart ZEnd",
+    "Set the color of the far clipping plane based on a color range and a Z range",
+    EV_NORMAL
+);
+Event EV_World_SetFarPlane_Cull(
+    "farplane_cull",
+    EV_DEFAULT,
+    "i",
+    "farplaneCull",
+    "Whether or not the far clipping plane should cull things out of the world\n"
+    "0 - no cull\n"
+    "1 - normal cull\n"
+    "2 - cull but no bsp culling"
+);
+Event EV_World_GetFarPlane
+(
+    "farplane",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the distance of the far clipping plane",
+    EV_GETTER
+);
+Event EV_World_SetFarPlane
+(
+    "farplane",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistance",
+    "Set the distance of the far clipping plane",
+    EV_SETTER
+);
+Event EV_World_SetFarClipOverride
+(
+    "farclipoverride",
+    EV_DEFAULT,
+    "f",
+    "farclipoverride",
+    "Override the min config default for the far clip distance",
+    EV_NORMAL
+);
+Event EV_World_SetFarPlaneColorOverride
+(
+    "farplaneclipcolor",
+    EV_DEFAULT,
+    "v",
+    "farplaneclipcolor",
+    "Override the fog color for the min config",
+    EV_NORMAL
+);
+Event EV_World_SetFarPlane2
+(
+    "farplane",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistance",
+    "Set the distance of the far clipping plane",
+    EV_NORMAL
+);
+Event EV_World_SetAnimatedFarPlane
+(
+    "animated_farplane",
+    EV_DEFAULT,
+    "ffff",
+    "farplaneStart farplaneEnd ZStart ZEnd",
+    "Set the distance of the far clipping plane based on a farplane range and a Z range",
+    EV_NORMAL
+);
+Event EV_World_GetFarPlaneBias
+(
+    "farplane_bias",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the distance bias of the far clipping plane",
+    EV_GETTER
+);
+Event EV_World_SetFarPlaneBias
+(
+    "farplane_bias",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistanceBias",
+    "Set the distance bias of the far clipping plane",
+    EV_SETTER
+);
+Event EV_World_SetFarPlaneBias2
+(
+    "farplane_bias",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistanceBias",
+    "Set the distance bias of the far clipping plane",
+    EV_NORMAL
+);
+Event EV_World_SetAnimatedFarPlaneBias
+(
+    "animated_farplane_bias",
+    EV_DEFAULT,
+    "ffff",
+    "biasStart biasEnd ZStart ZEnd",
+    "Set the bias of the far clipping plane based on a bias range and a Z range",
+    EV_NORMAL
+);
+Event EV_World_UpdateAnimatedFarplane
+(
+    "_update_animated_farplane",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Updates the farplane if it is being animated.",
+    EV_NORMAL
+);
+Event EV_World_GetSkyboxFarPlane
+(
+    "skybox_farplane",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the distance of the skybox far clipping plane",
+    EV_GETTER
+);
+Event EV_World_SetSkyboxFarPlane
+(
+    "skybox_farplane",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistance",
+    "Set the distance of the skybox far clipping plane",
+    EV_SETTER
+);
+Event EV_World_SetSkyboxFarPlane2
+(
+    "skybox_farplane",
+    EV_DEFAULT,
+    "f",
+    "farplaneDistance",
+    "Set the distance of the skybox far clipping plane",
+    EV_NORMAL
+);
+Event EV_World_GetSkyboxSpeed
+(
+    "skybox_speed",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the speed of the skybox",
+    EV_GETTER
+);
+Event EV_World_SetSkyboxSpeed
+(
+    "skybox_speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the speed of the skybox",
+    EV_SETTER
+);
+Event EV_World_SetSkyboxSpeed2
+(
+    "skybox_speed",
+    EV_DEFAULT,
+    "f",
+    "speed",
+    "Set the speed of the skybox",
+    EV_NORMAL
+);
+Event EV_World_SetRenderTerrain
+(
+    "render_terrain",
+    EV_DEFAULT,
+    "b",
+    "render_terrain",
+    "Set to draw or not draw terrain",
+    EV_NORMAL
+);
+Event EV_World_GetRenderTerrain
+(
+    "get_render_terrain",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Get the render terrain switch",
+    EV_GETTER
+);
+Event EV_World_SetAmbientLight
+(
+    "ambientlight",
+    EV_DEFAULT,
+    "b",
+    "ambientLight",
+    "Set whether or not ambient light should be used",
+    EV_NORMAL
+);
+Event EV_World_SetAmbientIntensity
+(
+    "ambient",
+    EV_DEFAULT,
+    "f",
+    "ambientIntensity",
+    "Set the intensity of the ambient light",
+    EV_NORMAL
+);
+Event EV_World_SetSunColor
+(
+    "suncolor",
+    EV_DEFAULT,
+    "v",
+    "sunColor",
+    "Set the color of the sun",
+    EV_NORMAL
+);
+Event EV_World_SetSunLight
+(
+    "sunlight",
+    EV_DEFAULT,
+    "b",
+    "sunlight",
+    "Set whether or not there should be sunlight",
+    EV_NORMAL
+);
+Event EV_World_SetSunDirection
+(
+    "sundirection",
+    EV_DEFAULT,
+    "v",
+    "sunlightDirection",
+    "Set the direction of the sunlight",
+    EV_NORMAL
+);
+Event EV_World_LightmapDensity
+(
+    "lightmapdensity",
+    EV_DEFAULT,
+    "f",
+    "density",
+    "Set the default lightmap density for all world surfaces",
+    EV_NORMAL
+);
+Event EV_World_SunFlareName
+(
+    "sunflarename",
+    EV_DEFAULT,
+    "s",
+    "flarename",
+    "Set the flare to use for the sunflare",
+    EV_NORMAL
+);
+Event EV_World_SunFlareDirection
+(
+    "sunflaredirection",
+    EV_DEFAULT,
+    "v",
+    "angles",
+    "Set the direction of the sunflare",
+    EV_NORMAL
+);
+Event EV_World_SetSkyAlpha
+(
+    "skyalpha",
+    EV_DEFAULT,
+    "f",
+    "newAlphaForPortalSky",
+    "Set the alpha on the sky",
+    EV_NORMAL
+);
+Event EV_World_SetSkyPortal
+(
+    "skyportal",
+    EV_DEFAULT,
+    "b",
+    "newSkyPortalState",
+    "Whether or not to use the sky portal at all",
+    EV_NORMAL
+);
+Event EV_World_SetNumArenas
+(
+    "numarenas",
+    EV_DEFAULT,
+    "i",
+    "numarenas",
+    "Set the number of arenas in the world",
+    EV_NORMAL
+);
+Event EV_World_SetAIVisionDistance
+(
+    "ai_visiondistance",
+    EV_DEFAULT,
+    "f",
+    "vision_distance",
+    "Sets the default AI Vision Distance",
+    EV_NORMAL
+);
+Event EV_World_SetNorthYaw
+(
+    "northyaw",
+    EV_DEFAULT,
+    "f",
+    "yaw",
+    "Sets the yaw direction that is considered to be north",
+    EV_NORMAL
+);
+Event EV_World_SetSunDiffuse
+(
+    "sundiffuse",
+    EV_DEFAULT,
+    "f",
+    "factor",
+    "Sets the fraction of the sunlight to use for diffuse sun",
+    EV_NORMAL
+);
+
+Event EV_World_SetSunDiffuseColor
+(
+    "sundiffusecolor",
+    EV_DEFAULT,
+    "v",
+    "diffusecolor",
+    "Sets an alternate sun color to use for clcing diffuse sun",
+    EV_NORMAL
+);
+Event EV_World_Overbright
+(
+    "overbright",
+    EV_DEFAULT,
+    "i",
+    "use",
+    "When set to non-zero, removes the overbright cutoff of lightmaps ",
+    EV_NORMAL
+);
+Event EV_World_VisDerived
+(
+    "vis_derived",
+    EV_DEFAULT,
+    "i",
+    "use",
+    "whether or not the vis compiler derives additional vis info from the manual vis",
+    EV_NORMAL
+);
+
+CLASS_DECLARATION(Entity, World, "worldspawn") {
+    {&EV_World_SetSoundtrack,            &World::SetSoundtrack           },
+    {&EV_World_SetGravity,               &World::SetGravity              },
+    {&EV_World_SetNextMap,               &World::SetNextMap              },
+    {&EV_World_SetMessage,               &World::SetMessage              },
+    {&EV_World_SetWaterColor,            &World::SetWaterColor           },
+    {&EV_World_SetWaterAlpha,            &World::SetWaterAlpha           },
+    {&EV_World_SetLavaColor,             &World::SetLavaColor            },
+    {&EV_World_SetLavaAlpha,             &World::SetLavaAlpha            },
+    {&EV_World_GetFarPlane_Color,        &World::GetFarPlane_Color       },
+    {&EV_World_SetFarPlane_Color,        &World::SetFarPlane_Color       },
+    {&EV_World_SetFarPlane_Color2,       &World::SetFarPlane_Color       },
+    {&EV_World_SetFarPlane_Cull,         &World::SetFarPlane_Cull        },
+    {&EV_World_GetFarPlane,              &World::GetFarPlane             },
+    {&EV_World_SetFarPlane,              &World::SetFarPlane             },
+    {&EV_World_SetFarClipOverride,       &World::SetFarClipOverride      },
+    {&EV_World_SetFarPlaneColorOverride, &World::SetFarPlaneColorOverride},
+    {&EV_World_SetFarPlane2,             &World::SetFarPlane             },
+    {&EV_World_GetFarPlaneBias,          &World::GetFarPlaneBias         },
+    {&EV_World_SetFarPlaneBias,          &World::SetFarPlaneBias         },
+    {&EV_World_SetFarPlaneBias2,         &World::SetFarPlaneBias         },
+    {&EV_World_GetSkyboxFarPlane,        &World::GetSkyboxFarplane       },
+    {&EV_World_SetSkyboxFarPlane,        &World::SetSkyboxFarplane       },
+    {&EV_World_SetSkyboxFarPlane2,       &World::SetSkyboxFarplane       },
+    {&EV_World_GetSkyboxSpeed,           &World::GetSkyboxSpeed          },
+    {&EV_World_SetSkyboxSpeed,           &World::SetSkyboxSpeed          },
+    {&EV_World_SetSkyboxSpeed2,          &World::SetSkyboxSpeed          },
+    {&EV_World_GetRenderTerrain,         &World::GetRenderTerrain        },
+    {&EV_World_SetRenderTerrain,         &World::SetRenderTerrain        },
+    {&EV_World_SetSkyAlpha,              &World::SetSkyAlpha             },
+    {&EV_World_SetSkyPortal,             &World::SetSkyPortal            },
+    {&EV_World_SetNorthYaw,              &World::SetNorthYaw             },
+    {&EV_World_SetAmbientLight,          NULL                            },
+    {&EV_World_SetAmbientIntensity,      NULL                            },
+    {&EV_World_SetSunColor,              NULL                            },
+    {&EV_World_SetSunLight,              NULL                            },
+    {&EV_World_SetSunDirection,          NULL                            },
+    {&EV_World_LightmapDensity,          NULL                            },
+    {&EV_World_SunFlareName,             NULL                            },
+    {&EV_World_SunFlareDirection,        NULL                            },
+    {&EV_World_SetNumArenas,             NULL                            },
+    {&EV_World_SetSunDiffuse,            NULL                            },
+    {&EV_World_SetSunDiffuseColor,       NULL                            },
+    {&EV_World_Overbright,               NULL                            },
+    {&EV_World_VisDerived,               NULL                            },
+    {&EV_World_SetAIVisionDistance,      &World::SetAIVisionDistance     },
+    {&EV_World_SetNorthYaw,              &World::SetNorthYaw             },
+    {&EV_World_SetAnimatedFarPlaneColor, &World::SetAnimatedFarplaneColor},
+    {&EV_World_SetAnimatedFarPlane,      &World::SetAnimatedFarplane     },
+    {&EV_World_SetAnimatedFarPlaneBias,  &World::SetAnimatedFarplaneBias },
+    {&EV_World_UpdateAnimatedFarplane,   &World::UpdateAnimatedFarplane  },
+    {NULL,                               NULL                            }
+};
+
+World::World()
+{
+    world       = this;
+    world_dying = qfalse;
+
+    // Anything that modifies configstrings, or spawns things is ignored when loading savegames
+    if (LoadingSavegame) {
+        return;
+    }
+
+    assert(entnum == ENTITYNUM_WORLD);
+
+    setMoveType(MOVETYPE_NONE);
+    setSolidType(SOLID_BSP);
+
+    // world model is always index 1
+    edict->s.modelindex = 1;
+    model               = "*1";
+
+    UpdateConfigStrings();
+
+    // clear out the soundtrack from the last level
+    ChangeSoundtrack("");
+
+    // set the default gravity
+    gi.cvar_set("sv_gravity", "800");
+
+    // set the default farplane parameters
+    farplane_distance               = 0;
+    farplane_bias                   = 0.0;
+    farplane_color                  = vec_zero;
+    farplane_cull                   = qtrue;
+    skybox_farplane                 = 0.0;
+    render_terrain                  = qtrue;
+    skybox_speed                    = 0.0;
+    farclip_override                = 0.f;
+    farplane_color_override         = Vector(-1, -1, -1);
+    animated_farplane_start         = 0.0;
+    animated_farplane_end           = 0.0;
+    animated_farplane_start_z       = 8192.0;
+    animated_farplane_end_z         = 0.0;
+    animated_farplane_bias_start    = 0.0;
+    animated_farplane_bias_end      = 0.0;
+    animated_farplane_bias_start_z  = 8192.0;
+    animated_farplane_bias_end_z    = 0.0;
+    animated_farplane_color_start   = vec_zero;
+    animated_farplane_color_end     = vec_zero;
+    animated_farplane_color_start_z = 8192.0;
+    animated_farplane_color_end_z   = 0.0;
+
+    UpdateFog();
+
+    sky_alpha  = 1.0f;
+    sky_portal = qtrue;
+    UpdateSky();
+
+    m_fAIVisionDistance = 2048.0f;
+
+    level.cinematic = spawnflags & WORLD_CINEMATIC;
+
+    if (level.cinematic) {
+        gi.cvar_set("sv_cinematic", "1");
+    } else {
+        gi.cvar_set("sv_cinematic", "0");
+    }
+
+    level.nextmap    = "";
+    level.level_name = level.mapname;
+
+    SoundMan.Load();
+
+    // Set the color for the blends.
+    level.water_color = Vector(0, 0, 1);
+    level.water_alpha = 0.1f;
+    level.lava_color  = Vector(1.0f, 0.3f, 0);
+    level.lava_alpha  = 0.6f;
+
+    //
+    // set the targetname of the world
+    //
+    SetTargetName("world");
+
+    m_fNorth = 0;
+}
+
+World::~World()
+{
+    world_dying = false;
+    FreeTargetList();
+}
+
+void World::UpdateConfigStrings(void)
+{
+    //
+    // make some data visible to connecting client
+    //
+    gi.setConfigstring(CS_GAME_VERSION, GAME_VERSION);
+    gi.setConfigstring(CS_LEVEL_START_TIME, va("%i", level.svsStartTime));
+
+    // make some data visible to the server
+    gi.setConfigstring(CS_MESSAGE, level.level_name.c_str());
+};
+
+void World::UpdateFog(void)
+{
+    const char *fogInfoString;
+    gi.SetFarPlane(farplane_distance);
+
+    if (g_protocol >= protocol_e::PROTOCOL_MOHTA_MIN) {
+        fogInfoString =
+            va("%d %.0f %.0f %.0f %.6f %.4f %.4f %.4f %d %.0f %.2f %.2f %.2f",
+               farplane_cull,
+               farplane_distance,
+               farplane_bias,
+               skybox_farplane,
+               skybox_speed,
+               farplane_color.x,
+               farplane_color.y,
+               farplane_color.z,
+               render_terrain,
+               farclip_override,
+               farplane_color_override.x,
+               farplane_color_override.y,
+               farplane_color_override.z);
+    } else {
+        fogInfoString =
+            va("%d %.0f %.4f %.4f %.4f",
+               farplane_cull,
+               farplane_distance,
+               farplane_color.x,
+               farplane_color.y,
+               farplane_color.z);
+    }
+
+    gi.setConfigstring(CS_FOGINFO, fogInfoString);
+}
+
+void World::SetFarClipOverride(Event *ev)
+{
+    farclip_override = ev->GetFloat(1);
+    UpdateFog();
+}
+
+void World::SetFarPlaneColorOverride(Event *ev)
+{
+    farplane_color_override = ev->GetVector(1);
+    UpdateFog();
+}
+
+void World::UpdateSky(void)
+{
+    gi.SetSkyPortal(sky_portal);
+    gi.setConfigstring(CS_SKYINFO, va("%.4f %d", sky_alpha, sky_portal));
+}
+
+void World::SetSoundtrack(Event *ev)
+{
+    str text;
+
+    text = ev->GetString(1);
+    ChangeSoundtrack(text);
+}
+
+void World::SetGravity(Event *ev)
+{
+    gi.cvar_set("sv_gravity", ev->GetString(1));
+}
+
+void World::GetFarPlane(Event *ev)
+{
+    ev->AddFloat(farplane_distance);
+}
+
+void World::SetFarPlane(Event *ev)
+{
+    animated_farplane_start_z = 8192;
+    if (animated_farplane_start_z == 8192 && animated_farplane_bias_start_z == 8192
+        && animated_farplane_color_start_z == 8192) {
+        CancelEventsOfType(EV_World_UpdateAnimatedFarplane);
+    }
+
+    farplane_distance = ev->GetFloat(1);
+    UpdateFog();
+}
+
+void World::GetFarPlaneBias(Event *ev)
+{
+    ev->AddFloat(farplane_bias);
+}
+
+void World::SetFarPlaneBias(Event *ev)
+{
+    animated_farplane_bias_start_z = 8192;
+    if (animated_farplane_start_z == 8192 && animated_farplane_bias_start_z == 8192
+        && animated_farplane_color_start_z == 8192) {
+        CancelEventsOfType(EV_World_UpdateAnimatedFarplane);
+    }
+
+    farplane_bias = ev->GetFloat(1);
+}
+
+void World::GetFarPlane_Color(Event *ev)
+{
+    ev->AddVector(farplane_color);
+}
+
+void World::SetFarPlane_Color(Event *ev)
+{
+    animated_farplane_color_start_z = 8192;
+    if (animated_farplane_start_z == 8192 && animated_farplane_bias_start_z == 8192
+        && animated_farplane_color_start_z == 8192) {
+        CancelEventsOfType(EV_World_UpdateAnimatedFarplane);
+    }
+
+    farplane_color = ev->GetVector(1);
+    UpdateFog();
+}
+
+void World::SetFarPlane_Cull(Event *ev)
+{
+    farplane_cull = ev->GetBoolean(1);
+    UpdateFog();
+}
+
+void World::GetSkyboxFarplane(Event *ev)
+{
+    ev->AddFloat(skybox_farplane);
+}
+
+void World::SetSkyboxFarplane(Event *ev)
+{
+    skybox_farplane = ev->GetFloat(1);
+}
+
+void World::SetAnimatedFarplaneColor(Event *ev)
+{
+    animated_farplane_color_start   = ev->GetVector(1);
+    animated_farplane_color_end     = ev->GetVector(2);
+    animated_farplane_color_start_z = ev->GetFloat(3);
+    animated_farplane_color_end_z   = ev->GetFloat(4);
+
+    if (animated_farplane_color_start_z > animated_farplane_color_end_z) {
+        float end_z                     = animated_farplane_color_end_z;
+        animated_farplane_color_end_z   = animated_farplane_color_start_z;
+        animated_farplane_color_start_z = end_z;
+
+        Vector end                    = animated_farplane_color_end;
+        animated_farplane_color_end   = animated_farplane_color_start;
+        animated_farplane_color_start = end;
+    }
+
+    PostEvent(EV_World_UpdateAnimatedFarplane, 0);
+}
+
+void World::SetAnimatedFarplane(Event *ev)
+{
+    animated_farplane_start   = ev->GetFloat(1);
+    animated_farplane_end     = ev->GetFloat(2);
+    animated_farplane_start_z = ev->GetFloat(3);
+    animated_farplane_end_z   = ev->GetFloat(4);
+
+    if (animated_farplane_start_z > animated_farplane_end_z) {
+        float end_z               = animated_farplane_end_z;
+        animated_farplane_end_z   = animated_farplane_start_z;
+        animated_farplane_start_z = end_z;
+
+        float end               = animated_farplane_end;
+        animated_farplane_end   = animated_farplane_start;
+        animated_farplane_start = end;
+    }
+
+    PostEvent(EV_World_UpdateAnimatedFarplane, 0);
+}
+
+void World::SetAnimatedFarplaneBias(Event *ev)
+{
+    animated_farplane_bias_start   = ev->GetFloat(1);
+    animated_farplane_bias_end     = ev->GetFloat(2);
+    animated_farplane_bias_start_z = ev->GetFloat(3);
+    animated_farplane_bias_end_z   = ev->GetFloat(4);
+
+    if (animated_farplane_bias_start_z > animated_farplane_bias_end_z) {
+        float end_z                    = animated_farplane_bias_end_z;
+        animated_farplane_bias_end_z   = animated_farplane_bias_start_z;
+        animated_farplane_bias_start_z = end_z;
+
+        float end                    = animated_farplane_end;
+        animated_farplane_bias_end   = animated_farplane_bias_start;
+        animated_farplane_bias_start = end;
+    }
+
+    PostEvent(EV_World_UpdateAnimatedFarplane, 0);
+}
+
+void World::UpdateAnimatedFarplane(Event *ev)
+{
+    Entity *player;
+
+    CancelEventsOfType(EV_World_UpdateAnimatedFarplane);
+
+    if (g_gametype->integer != GT_SINGLE_PLAYER) {
+        return;
+    }
+
+    PostEvent(EV_World_UpdateAnimatedFarplane, level.frametime);
+
+    player = g_entities[0].entity;
+    if (!player) {
+        return;
+    }
+
+    if (animated_farplane_start_z != 8192) {
+        float alpha;
+
+        if (player->origin.z < animated_farplane_start_z) {
+            alpha = 0;
+        } else if (player->origin.z > animated_farplane_end_z) {
+            alpha = 1;
+        } else {
+            alpha =
+                (player->origin.z - animated_farplane_start_z) / (animated_farplane_end_z - animated_farplane_start_z);
+        }
+
+        farplane_distance = alpha * (animated_farplane_end - animated_farplane_start) + animated_farplane_start;
+    }
+
+    if (animated_farplane_bias_start_z != 8192) {
+        float alpha;
+
+        if (player->origin.z < animated_farplane_bias_start_z) {
+            alpha = 0;
+        } else if (player->origin.z > animated_farplane_bias_end_z) {
+            alpha = 1;
+        } else {
+            alpha = (player->origin.z - animated_farplane_bias_start_z)
+                  / (animated_farplane_bias_end_z - animated_farplane_bias_start_z);
+        }
+
+        farplane_bias =
+            alpha * (animated_farplane_bias_end - animated_farplane_bias_start) + animated_farplane_bias_start;
+    }
+
+    if (animated_farplane_color_start_z != 8192) {
+        float  alpha, startAlpha, endAlpha;
+        Vector start, end;
+        float  dot;
+
+        if (player->origin.z < animated_farplane_color_start_z) {
+            alpha = 0;
+        } else if (player->origin.z > animated_farplane_color_end_z) {
+            alpha = 1;
+        } else {
+            alpha = (player->origin.z - animated_farplane_color_start_z)
+                  / (animated_farplane_color_end_z - animated_farplane_color_start_z);
+        }
+
+        start = animated_farplane_color_start;
+        end   = animated_farplane_color_end;
+        VectorNormalize(start);
+        VectorNormalize(end);
+
+        dot = Vector::Dot(start, end);
+        if (1.f - dot > 0.000001) {
+            startAlpha = sin((1.f - alpha) * acos(dot)) / sin(acos(dot));
+            endAlpha   = sin(acos(dot) * alpha) / sin(acos(dot));
+        } else {
+            startAlpha = 1.f - alpha;
+            endAlpha   = alpha;
+        }
+
+        farplane_color = end * endAlpha + start * startAlpha;
+    }
+
+    UpdateFog();
+}
+
+void World::GetRenderTerrain(Event *ev)
+{
+    ev->AddInteger(render_terrain);
+}
+
+void World::SetRenderTerrain(Event *ev)
+{
+    render_terrain = ev->GetInteger(1);
+    UpdateFog();
+}
+
+void World::GetSkyboxSpeed(Event *ev)
+{
+    ev->AddFloat(skybox_speed);
+}
+
+void World::SetSkyboxSpeed(Event *ev)
+{
+    skybox_speed = ev->GetFloat(1);
+}
+
+void World::SetSkyAlpha(Event *ev)
+{
+    sky_alpha = ev->GetFloat(1);
+    UpdateSky();
+}
+
+void World::SetSkyPortal(Event *ev)
+{
+    sky_portal = ev->GetBoolean(1);
+    UpdateSky();
+}
+
+void World::SetNextMap(Event *ev)
+{
+    level.nextmap = ev->GetString(1);
+}
+
+void World::SetMessage(Event *ev)
+{
+    str text;
+
+    text             = ev->GetString(1);
+    level.level_name = text;
+    gi.setConfigstring(CS_MESSAGE, text);
+}
+
+void World::SetWaterColor(Event *ev)
+{
+    level.water_color = ev->GetVector(1);
+}
+
+void World::SetWaterAlpha(Event *ev)
+{
+    level.water_alpha = ev->GetFloat(1);
+}
+
+void World::SetLavaColor(Event *ev)
+{
+    level.lava_color = ev->GetVector(1);
+}
+
+void World::SetLavaAlpha(Event *ev)
+{
+    level.lava_alpha = ev->GetFloat(1);
+}
+
+void World::SetNumArenas(Event *ev)
+{
+    level.m_numArenas = ev->GetInteger(1);
+}
+
+void World::SetAIVisionDistance(Event *ev)
+{
+    m_fAIVisionDistance = ev->GetFloat(1);
+}
+
+void World::SetNorthYaw(Event *ev)
+{
+    m_fNorth = anglemod(ev->GetFloat(1));
+}
+
+Listener *World::GetTarget(str targetname, bool quiet)
+{
+    TargetList *targetList = GetTargetList(targetname);
+
+    if (!targetList) {
+        return NULL;
+    }
+
+    if (targetList->list.NumObjects() == 1) {
+        return targetList->list.ObjectAt(1);
+    } else if (targetList->list.NumObjects() > 1) {
+        if (!quiet) {
+            warning(
+                "World::GetTarget",
+                "There are %d entities with targetname '%s'. You are using a command that requires exactly one.",
+                targetList->list.NumObjects(),
+                targetname.c_str()
+            );
+        }
+    }
+
+    return NULL;
+}
+
+Listener *World::GetScriptTarget(str targetname)
+{
+    TargetList *targetList = GetTargetList(targetname);
+
+    if (!targetList) {
+        return NULL;
+    }
+
+    if (targetList->list.NumObjects() == 1) {
+        return targetList->list.ObjectAt(1);
+    } else if (targetList->list.NumObjects() > 1) {
+        ScriptError(
+            "There are %d entities with targetname '%s'. You are using a command that requires exactly one.",
+            targetList->list.NumObjects(),
+            targetname.c_str()
+        );
+    }
+
+    return NULL;
+}
+
+TargetList *World::GetExistingTargetList(const str& targetname)
+{
+    TargetList *targetList;
+    int         i;
+
+    if (!targetname.length()) {
+        return NULL;
+    }
+
+    for (i = m_targetListContainer.NumObjects(); i > 0; i--) {
+        targetList = m_targetListContainer.ObjectAt(i);
+        if (targetname == targetList->targetname) {
+            return targetList;
+        }
+    }
+
+    return NULL;
+}
+
+TargetList *World::GetTargetList(str& targetname)
+{
+    TargetList *targetList;
+    int         i;
+
+    if (!targetname.length()) {
+        // Fixed in OPM
+        //  Don't create a targetlist for the empty target name
+        return NULL;
+    }
+
+    for (i = m_targetListContainer.NumObjects(); i > 0; i--) {
+        targetList = m_targetListContainer.ObjectAt(i);
+        if (targetname == targetList->targetname) {
+            return targetList;
+        }
+    }
+
+    targetList = new TargetList(targetname);
+    m_targetListContainer.AddObject(targetList);
+
+    return targetList;
+}
+
+void World::AddTargetEntity(SimpleEntity *ent)
+{
+    TargetList *targetList = GetTargetList(ent->TargetName());
+
+    if (!targetList) {
+        return;
+    }
+
+    targetList->AddEntity(ent);
+}
+
+void World::AddTargetEntityAt(SimpleEntity *ent, int index)
+{
+    TargetList *targetList = GetTargetList(ent->TargetName());
+
+    if (!targetList || !index) {
+        return;
+    }
+
+    targetList->AddEntityAt(ent, index);
+}
+
+int World::GetTargetnameIndex(SimpleEntity *ent)
+{
+    TargetList *targetList = GetTargetList(ent->TargetName());
+
+    if (!targetList) {
+        return 0;
+    }
+
+    return targetList->GetEntityIndex(ent);
+}
+
+void World::RemoveTargetEntity(SimpleEntity *ent)
+{
+    if (world->world_dying) {
+        return;
+    }
+
+    TargetList *targetList = GetExistingTargetList(ent->TargetName());
+    if (!targetList) {
+        return;
+    }
+
+    targetList->RemoveEntity(ent);
+}
+
+SimpleEntity *World::GetNextEntity(str targetname, SimpleEntity *ent)
+{
+    TargetList *targetList = GetExistingTargetList(targetname);
+    if (!targetList) {
+        return NULL;
+    }
+
+    return targetList->GetNextEntity(ent);
+}
+
+void World::FreeTargetList()
+{
+    int i;
+
+    for (i = 1; i <= m_targetListContainer.NumObjects(); i++) {
+        delete m_targetListContainer.ObjectAt(i);
+    }
+
+    m_targetListContainer.FreeObjectList();
+}
+
+void World::Archive(Archiver& arc)
+{
+    int         num;
+    int         num2;
+    int         i;
+    TargetList *targetList;
+
+    if (arc.Loading()) {
+        str targetname;
+
+        arc.ArchiveInteger(&num);
+        for (i = 1; i <= num; i++) {
+            arc.ArchiveString(&targetname);
+
+            targetList = new TargetList(targetname);
+            m_targetListContainer.AddObject(targetList);
+
+            arc.ArchiveObjectPosition((LightClass *)&targetList->list);
+            arc.ArchiveInteger(&num2);
+
+            targetList->list.Resize(num2);
+        }
+    } else {
+        num = m_targetListContainer.NumObjects();
+        arc.ArchiveInteger(&num);
+
+        for (i = 1; i <= num; i++) {
+            targetList = m_targetListContainer.ObjectAt(i);
+
+            arc.ArchiveString(&targetList->targetname);
+            arc.ArchiveObjectPosition((LightClass *)&targetList->list);
+
+            num2 = targetList->list.NumObjects();
+            arc.ArchiveInteger(&num2);
+        }
+    }
+
+    Entity::Archive(arc);
+
+    arc.ArchiveFloat(&farplane_distance);
+    arc.ArchiveFloat(&farplane_bias);
+    arc.ArchiveVector(&farplane_color);
+    arc.ArchiveBoolean(&farplane_cull);
+    arc.ArchiveFloat(&skybox_farplane);
+    arc.ArchiveBoolean(&render_terrain);
+    arc.ArchiveFloat(&skybox_speed);
+    arc.ArchiveFloat(&sky_alpha);
+    arc.ArchiveBoolean(&sky_portal);
+    arc.ArchiveFloat(&m_fAIVisionDistance);
+    arc.ArchiveFloat(&m_fNorth);
+    arc.ArchiveFloat(&farclip_override);
+    arc.ArchiveFloat(&farplane_color_override.x);
+    arc.ArchiveFloat(&farplane_color_override.y);
+    arc.ArchiveFloat(&farplane_color_override.z);
+    arc.ArchiveFloat(&farplane_color.x);
+    arc.ArchiveFloat(&farplane_color.y);
+    arc.ArchiveFloat(&farplane_color.z);
+    arc.ArchiveFloat(&animated_farplane_start);
+    arc.ArchiveFloat(&animated_farplane_end);
+    arc.ArchiveFloat(&animated_farplane_start_z);
+    arc.ArchiveFloat(&animated_farplane_end_z);
+    arc.ArchiveFloat(&animated_farplane_bias_start);
+    arc.ArchiveFloat(&animated_farplane_bias_end);
+    arc.ArchiveFloat(&animated_farplane_bias_start_z);
+    arc.ArchiveFloat(&animated_farplane_bias_end_z);
+    arc.ArchiveVector(&animated_farplane_color_start);
+    arc.ArchiveVector(&animated_farplane_color_end);
+    arc.ArchiveFloat(&animated_farplane_color_start_z);
+    arc.ArchiveFloat(&animated_farplane_color_end_z);
+    if (arc.Loading()) {
+        UpdateConfigStrings();
+        UpdateFog();
+        UpdateSky();
+    }
+    UpdateConfigStrings();
+}
+
+bool WithinFarplaneDistance(const Vector& org)
+{
+    float distance = world->farplane_distance;
+
+    if (!distance) {
+        // no farplane
+        return true;
+    }
+
+    return org.lengthSquared() < (Square(distance) * Square(0.828f));
+}
+
+CLASS_DECLARATION(Class, TargetList, NULL) {
+    {NULL, NULL}
+};
+
+TargetList::TargetList() {}
+
+TargetList::TargetList(const str& tname)
+    : targetname(tname)
+{}
+
+void TargetList::AddEntity(Listener *ent)
+{
+    list.AddObject(static_cast<SimpleEntity *>(ent));
+}
+
+void TargetList::AddEntityAt(Listener *ent, int i)
+{
+    list.AddObjectAt(i, static_cast<SimpleEntity *>(ent));
+}
+
+int TargetList::GetEntityIndex(Listener *ent)
+{
+    return list.IndexOfObject(static_cast<SimpleEntity *>(ent));
+}
+
+void TargetList::RemoveEntity(Listener *ent)
+{
+    list.RemoveObject(static_cast<SimpleEntity *>(ent));
+}
+
+SimpleEntity *TargetList::GetNextEntity(SimpleEntity *ent)
+{
+    int index;
+
+    if (ent) {
+        index = list.IndexOfObject(ent);
+    } else {
+        index = 0;
+    }
+
+    index++;
+
+    for (; index <= list.NumObjects(); index++) {
+        Listener *objptr;
+
+        objptr = list.ObjectAt(index);
+        if (objptr->isSubclassOf(SimpleEntity)) {
+            return static_cast<SimpleEntity *>(objptr);
+        }
+    }
+
+    return NULL;
+}
diff --git a/code/fgame/worldspawn.h b/code/fgame/worldspawn.h
new file mode 100644
index 00000000..b7ced3c8
--- /dev/null
+++ b/code/fgame/worldspawn.h
@@ -0,0 +1,197 @@
+/*
+===========================================================================
+Copyright (C) 2015 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// world.h: Global world information (fog and such).
+
+#pragma once
+
+#if defined(CGAME_DLL)
+#    include "../cgame_hook/script/centity.h"
+#elif defined(GAME_DLL)
+#    include "entity.h"
+#else
+#    include "glb_local.h"
+#    include "simpleentity.h"
+#endif
+
+#include "gamescript.h"
+
+#define WORLD_CINEMATIC 1
+
+typedef Container<SafePtr<SimpleEntity>> ConSimple;
+
+class TargetList : public Class {
+public:
+    CLASS_PROTOTYPE(TargetList);
+
+public:
+    ConSimple list;
+    str targetname;
+
+public:
+    TargetList();
+    TargetList(const str& tname);
+
+    void AddEntity(Listener* ent);
+    void AddEntityAt(Listener* ent, int i);
+    int GetEntityIndex(Listener* ent);
+    void RemoveEntity(Listener* ent);
+    SimpleEntity* GetNextEntity(SimpleEntity* ent);
+};
+
+template<>
+class con_set_Entry<const_str, ConSimple>
+{
+    friend con_set<const_str, ConSimple>;
+    friend con_set_enum<const_str, ConSimple>;
+
+private:
+    con_set_Entry *next;
+
+public:
+    const_str key;
+    ConSimple value;
+
+public:
+    void *operator new(size_t size) { return con_set<const_str, ConSimple>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_set<const_str, ConSimple>::DeleteEntry(ptr); }
+
+    void Archive(Archiver& arc) {
+        int num;
+
+        arc.ArchiveUnsigned(&key);
+        arc.ArchiveObjectPosition((LightClass*)&value);
+
+        if (arc.Loading()) {
+            arc.ArchiveInteger(&num);
+            value.Resize(num);
+        } else {
+            num = value.NumObjects();
+            arc.ArchiveInteger(&num);
+        }
+    }
+    const_str& GetKey() { return key; }
+
+    void SetKey(const const_str& newKey) { key = newKey; }
+};
+
+class World : public Entity
+{
+    Container<TargetList*> m_targetListContainer;
+    qboolean world_dying;
+
+public:
+    // farplane variables
+    float    farplane_distance;
+    float    farplane_bias;
+    Vector   farplane_color;
+    qboolean farplane_cull;
+    float    skybox_farplane;
+    qboolean render_terrain;
+    float    skybox_speed;
+    float    farclip_override;
+    Vector   farplane_color_override;
+    float    animated_farplane_start;
+    float    animated_farplane_end;
+    float    animated_farplane_start_z;
+    float    animated_farplane_end_z;
+    float    animated_farplane_bias_start;
+    float    animated_farplane_bias_end;
+    float    animated_farplane_bias_start_z;
+    float    animated_farplane_bias_end_z;
+    Vector   animated_farplane_color_start;
+    Vector   animated_farplane_color_end;
+    float    animated_farplane_color_start_z;
+    float    animated_farplane_color_end_z;
+
+    // sky variables
+    float    sky_alpha;
+    qboolean sky_portal;
+
+    // orientation variables
+    float m_fAIVisionDistance;
+    float m_fNorth;
+
+public:
+    CLASS_PROTOTYPE(World);
+
+    World();
+    ~World();
+
+    void AddTargetEntity(SimpleEntity *ent);
+    void AddTargetEntityAt(SimpleEntity *ent, int index);
+    void RemoveTargetEntity(SimpleEntity *ent);
+
+    void FreeTargetList();
+
+    SimpleEntity *GetNextEntity(str targetname, SimpleEntity *ent);
+    Listener     *GetScriptTarget(str targetname);
+    Listener     *GetTarget(str targetname, bool quiet);
+    int           GetTargetnameIndex(SimpleEntity *ent);
+
+    TargetList *GetExistingTargetList(const str& targetname);
+    TargetList *GetTargetList(str& targetname);
+
+    void SetFarClipOverride(Event *ev);
+    void SetFarPlaneColorOverride(Event *ev);
+    void SetSoundtrack(Event *ev);
+    void SetGravity(Event *ev);
+    void SetNextMap(Event *ev);
+    void SetMessage(Event *ev);
+    void SetWaterColor(Event *ev);
+    void SetWaterAlpha(Event *ev);
+    void SetLavaColor(Event *ev);
+    void SetLavaAlpha(Event *ev);
+    void GetFarPlane_Color(Event *ev);
+    void SetFarPlane_Color(Event *ev);
+    void GetFarPlaneBias(Event *ev);
+    void SetFarPlaneBias(Event *ev);
+    void SetFarPlane_Cull(Event *ev);
+    void GetSkyboxFarplane(Event *ev);
+    void SetSkyboxFarplane(Event *ev);
+    void SetAnimatedFarplaneColor(Event *ev);
+    void SetAnimatedFarplane(Event *ev);
+    void SetAnimatedFarplaneBias(Event *ev);
+    void UpdateAnimatedFarplane(Event *ev);
+    void GetRenderTerrain(Event *ev);
+    void SetRenderTerrain(Event *ev);
+    void GetSkyboxSpeed(Event *ev);
+    void SetSkyboxSpeed(Event *ev);
+    void GetFarPlane(Event *ev);
+    void SetFarPlane(Event *ev);
+    void SetSkyAlpha(Event *ev);
+    void SetSkyPortal(Event *ev);
+    void SetNumArenas(Event *ev);
+    void SetAIVisionDistance(Event *ev);
+    void SetNorthYaw(Event *ev);
+    void UpdateConfigStrings(void);
+    void UpdateFog(void);
+    void UpdateSky(void);
+
+    void Archive(Archiver& arc) override;
+};
+
+typedef SafePtr<World> WorldPtr;
+extern WorldPtr        world;
+
+bool WithinFarplaneDistance(const Vector& org);
diff --git a/code/gamespy/CMakeLists.txt b/code/gamespy/CMakeLists.txt
index fedbf2b8..db690703 100644
--- a/code/gamespy/CMakeLists.txt
+++ b/code/gamespy/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 include_directories("./common")
 include_directories("./gcdkey")
@@ -11,6 +11,7 @@ file(GLOB SRCS_common
 	"./hashtable.c"
 	"./md5c.c"
 	"./gutil.c"
+	"./gcrypt.c"
 )
 
 file(GLOB SRCS_gcdkey
@@ -101,4 +102,5 @@ foreach(LIB ${DEPENDENT_LIBS})
 	target_link_libraries(${LIB} PUBLIC gcd_common)
 endforeach()
 
+target_link_libraries(gcd_key PRIVATE gcd_qr2)
 target_link_libraries(gcd_qr2 PRIVATE gcd_natneg)
diff --git a/code/renderer/tr_swipe.cpp b/code/gamespy/cl_gamespy.c
similarity index 66%
rename from code/renderer/tr_swipe.cpp
rename to code/gamespy/cl_gamespy.c
index 08cdbc32..203497ed 100644
--- a/code/renderer/tr_swipe.cpp
+++ b/code/gamespy/cl_gamespy.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,30 +20,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_swipe.cpp -- swipe rendering
+#pragma once
 
-#include "tr_local.h"
+#include "cl_gamespy.h"
+#include "q_gamespy.h"
 
-void RB_DrawSwipeSurface(surfaceType_t* pswipe) {
-    // FIXME: unimplemented
-}
-
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
+unsigned int ServerListGetNumMasters()
 {
-    // FIXME: unimplemented
+    return Com_GetNumMasterEntries();
 }
 
-void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
+const char *ServerListGetHost(int index)
 {
-    // FIXME: unimplemented
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.host;
 }
 
-void RE_SwipeEnd()
+int ServerListGetMsPort(int index)
 {
-    // FIXME: unimplemented
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.queryport;
 }
 
-void R_AddSwipeSurfaces()
-{
-    // FIXME: unimplemented
-}
+void CL_RestartGamespy_f() {}
diff --git a/code/renderer/tr_ghost.h b/code/gamespy/cl_gamespy.h
similarity index 88%
rename from code/renderer/tr_ghost.h
rename to code/gamespy/cl_gamespy.h
index 64b139d4..45e38ee4 100644
--- a/code/renderer/tr_ghost.h
+++ b/code/gamespy/cl_gamespy.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,4 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+// cl_gamespy.h -- Game-specific client GameSpy code
+
 #pragma once
+
+void CL_RestartGamespy_f();
diff --git a/code/gamespy/common/gsAssert.c b/code/gamespy/common/gsAssert.c
index c4c56861..d8a9b658 100644
--- a/code/gamespy/common/gsAssert.c
+++ b/code/gamespy/common/gsAssert.c
@@ -96,7 +96,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	// continues rendering
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -118,7 +118,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	void  _gsDebugAssert			(const char *string)
 	{
 
-		scePrintf(string);
+		scePrintf("%s", string);
 		while(1);;
 	}
 
@@ -127,7 +127,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 #elif defined _MACOSX
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -139,7 +139,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 #elif defined _LINUX
 	void  _gsDebugAssert			(const char *string)
 	{
-		printf(string);
+		printf("%s", string);
 		
 		while(1)
 		{
@@ -170,7 +170,7 @@ void  gsDebugAssert				(const char *szError,const char *szText, const char *szFi
 	void  _gsDebugAssert			(const char *string)
 	{
 
-		printf(string);
+		printf("%s", string);
 		while(1);;
 
 	}
diff --git a/code/gamespy/common/gsPlatform.h b/code/gamespy/common/gsPlatform.h
index a4daf16e..10916417 100644
--- a/code/gamespy/common/gsPlatform.h
+++ b/code/gamespy/common/gsPlatform.h
@@ -8,7 +8,7 @@
 // Windows:          _WIN32
 // Xbox:             _WIN32 + _XBOX
 // Xbox360:          _WIN32 + _XBOX + _X360
-// MacOSX:           _MACOSX + _UNIX
+// MacOSX:           _MACOSX + _UNIX + __APPLE__
 // Linux:            _LINUX + _UNIX
 // Nintendo DS:      _NITRO
 // PSP:              _PSP
@@ -23,7 +23,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // Set the platform define
-#ifdef __mips64
+#if defined (__linux__) || defined(_LINUX) || defined(_MACOSX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+	#define _UNIX
+#elif __mips64
 	#ifndef _PS2
 		#define _PS2
 	#endif
@@ -34,10 +36,6 @@
 	#endif
 #endif
 
-#if defined(_LINUX) || defined(_MACOSX)
-	#define _UNIX
-#endif
-
 #if defined(_XBOX) || defined (_X360)
 #if _XBOX_VER >= 200
 	#define _X360
diff --git a/code/gamespy/common/gsPlatformThread.h b/code/gamespy/common/gsPlatformThread.h
index 85421ea8..7b5cf779 100644
--- a/code/gamespy/common/gsPlatformThread.h
+++ b/code/gamespy/common/gsPlatformThread.h
@@ -89,7 +89,11 @@ extern "C" {
 	} GSICriticalSection;
 	typedef void (*GSThreadFunc)(void *arg);
 
-#elif defined(_UNIX) //_LINUX || _MACOSX
+#elif defined(_UNIX) // Linux, Mac OS X, openbsd, etc.
+	#if defined(__OpenBSD__)
+		#include <pthread.h>
+	#endif
+
 	typedef pthread_mutex_t GSICriticalSection;
 	typedef struct
 	{
diff --git a/code/gamespy/darray.c b/code/gamespy/darray.c
index 3db363e2..688729fb 100644
--- a/code/gamespy/darray.c
+++ b/code/gamespy/darray.c
@@ -20,30 +20,30 @@
 #define DEF_GROWBY 8
 
 #ifdef _NO_NOPORT_H_
-	#define gsimalloc	malloc
-	#define gsifree		free
-	#define gsirealloc	realloc
-	#include "common/gsAssert.h"
+    #define gsimalloc	malloc
+    #define gsifree		free
+    #define gsirealloc	realloc
+    #include "common/gsAssert.h"
 #else
-	#include "nonport.h" //for gsimalloc/realloc/free/GS_ASSERT
+    #include "nonport.h" //for gsimalloc/realloc/free/GS_ASSERT
 #endif
 
 
 // STRUCTURES
 struct DArrayImplementation
 {
-	int count, capacity;
-	int elemsize;
-	int growby;
-	ArrayElementFreeFn elemfreefn;
-	void *list; //array of elements
+    int count, capacity;
+    int elemsize;
+    int growby;
+    ArrayElementFreeFn elemfreefn;
+    void *list; //array of elements
 };
 
 // PROTOTYPES
 static void *mylsearch(const void *key, void *base, int count, int size,
-					 ArrayCompareFn comparator);
+                     ArrayCompareFn comparator);
 static void *mybsearch(const void *elem, void *base, int num, int elemsize, 
-					   ArrayCompareFn comparator, int *found);
+                       ArrayCompareFn comparator, int *found);
 // FUNCTIONS
 
 /* FreeElement
@@ -51,8 +51,8 @@ static void *mybsearch(const void *elem, void *base, int num, int elemsize,
  */
 static void FreeElement(DArray array, int n)
 {
-	if (array->elemfreefn != NULL)
-		array->elemfreefn(ArrayNth(array,n));
+    if (array->elemfreefn != NULL)
+        array->elemfreefn(ArrayNth(array,n));
 }
 
 /* ArrayGrow
@@ -60,10 +60,10 @@ static void FreeElement(DArray array, int n)
  */
 static void ArrayGrow(DArray array)
 {
-	GS_ASSERT(array->elemsize)	// sanity check -mj Oct 31st
-	array->capacity +=  array->growby;
-	array->list = gsirealloc(array->list, (size_t) array->capacity * array->elemsize);
-	GS_ASSERT(array->list);
+    GS_ASSERT(array->elemsize)	// sanity check -mj Oct 31st
+    array->capacity +=  array->growby;
+    array->list = gsirealloc(array->list, (size_t) array->capacity * array->elemsize);
+    GS_ASSERT(array->list);
 }
 
 /* SetElement
@@ -71,94 +71,94 @@ static void ArrayGrow(DArray array)
  */
 static void SetElement(DArray array, const void *elem, int pos)
 {
-	GS_ASSERT(array)			// safety check -mj Oct 31st
-	GS_ASSERT(elem)	
-	GS_ASSERT(array->elemsize)	
+    GS_ASSERT(array)			// safety check -mj Oct 31st
+    GS_ASSERT(elem)	
+    GS_ASSERT(array->elemsize)	
 
-	memcpy(ArrayNth(array,pos), elem, (size_t)array->elemsize);
+    memcpy(ArrayNth(array,pos), elem, (size_t)array->elemsize);
 }
 
 DArray ArrayNew(int elemSize, int numElemsToAllocate, 
                 ArrayElementFreeFn elemFreeFn)
 {
-	DArray array;
+    DArray array;
 
-	array = (DArray) gsimalloc(sizeof(struct DArrayImplementation));
-	GS_ASSERT(array);
-	GS_ASSERT(elemSize);
-	if (numElemsToAllocate == 0)
-		numElemsToAllocate = DEF_GROWBY;
-	array->count	= 0;
-	array->capacity = numElemsToAllocate;;
-	array->elemsize = elemSize;
-	array->growby	= numElemsToAllocate;
-	array->elemfreefn = elemFreeFn;
-	if (array->capacity != 0)
-	{
-		array->list = gsimalloc((size_t)array->capacity * array->elemsize);
-		GS_ASSERT(array->list);
-	} else
-		array->list = NULL;
+    array = (DArray) gsimalloc(sizeof(struct DArrayImplementation));
+    GS_ASSERT(array);
+    GS_ASSERT(elemSize);
+    if (numElemsToAllocate == 0)
+        numElemsToAllocate = DEF_GROWBY;
+    array->count	= 0;
+    array->capacity = numElemsToAllocate;;
+    array->elemsize = elemSize;
+    array->growby	= numElemsToAllocate;
+    array->elemfreefn = elemFreeFn;
+    if (array->capacity != 0)
+    {
+        array->list = gsimalloc((size_t)array->capacity * array->elemsize);
+        GS_ASSERT(array->list);
+    } else
+        array->list = NULL;
 
-	return array;
+    return array;
 }
 
 void ArrayFree(DArray array)
 {
-	int i;
-	
-	GS_ASSERT(array);
-	for (i = 0; i < array->count; i++)
-	{
-		FreeElement(array, i);
-	}
-	// mj to do: move these asserts into gsi_free.  maybe, depends on whether user overloads them
-	GS_ASSERT(array->list)
-	GS_ASSERT(array)
-	gsifree(array->list);
-	gsifree(array);
+    int i;
+    
+    GS_ASSERT(array);
+    for (i = 0; i < array->count; i++)
+    {
+        FreeElement(array, i);
+    }
+    // mj to do: move these asserts into gsi_free.  maybe, depends on whether user overloads them
+    GS_ASSERT(array->list)
+    GS_ASSERT(array)
+    gsifree(array->list);
+    gsifree(array);
 }
 
 void *ArrayGetDataPtr(DArray array)
 {
-	GS_ASSERT(array);
-	return array->list;
+    GS_ASSERT(array);
+    return array->list;
 }
 
 void ArraySetDataPtr(DArray array, void *ptr, int count, int capacity)
 {
-	int i;
-	
-	GS_ASSERT(array);
-	if (array->list != NULL)
-	{
-		for (i = 0; i < array->count; i++)
-		{
-			FreeElement(array, i);
-		}
-		gsifree(array->list);
-	}
-	array->list = ptr;
-	array->count = count;
-	array->capacity = capacity;
+    int i;
+    
+    GS_ASSERT(array);
+    if (array->list != NULL)
+    {
+        for (i = 0; i < array->count; i++)
+        {
+            FreeElement(array, i);
+        }
+        gsifree(array->list);
+    }
+    array->list = ptr;
+    array->count = count;
+    array->capacity = capacity;
 
 }
 
 
 int ArrayLength(const DArray array)
 {
-	GS_ASSERT(array)
-	return array->count;
+    GS_ASSERT(array)
+    return array->count;
 }
 
 void *ArrayNth(DArray array, int n)
 {
-	// 2004.Nov.16.JED - modified GS_ASSERT to include "if" to add robustness
-	GS_ASSERT( (n >= 0) && (n < array->count));
-	if( ! ((n >= 0) && (n < array->count)) )
-		return NULL;
-	
-	return (char *)array->list + array->elemsize*n;
+    // 2004.Nov.16.JED - modified GS_ASSERT to include "if" to add robustness
+    GS_ASSERT( (n >= 0) && (n < array->count));
+    if( ! ((n >= 0) && (n < array->count)) )
+        return NULL;
+    
+    return (char *)array->list + array->elemsize*n;
 }
 
 /* ArrayAppend
@@ -166,166 +166,166 @@ void *ArrayNth(DArray array, int n)
  */
 void ArrayAppend(DArray array, const void *newElem)
 {
-	GS_ASSERT(array);
-	if(array)
-		ArrayInsertAt(array, newElem, array->count);
+    GS_ASSERT(array);
+    if(array)
+        ArrayInsertAt(array, newElem, array->count);
 }
 
 void ArrayInsertAt(DArray array, const void *newElem, int n)
 {
-	GS_ASSERT (array)
-	GS_ASSERT ( (n >= 0) && (n <= array->count));
+    GS_ASSERT (array)
+    GS_ASSERT ( (n >= 0) && (n <= array->count));
 
-	if (array->count == array->capacity)
-		ArrayGrow(array);
-	array->count++;
-	if (n < array->count - 1) //if we aren't appending
-		memmove(ArrayNth(array, n+1), ArrayNth(array,n), 
-				(size_t)(array->count - 1 - n) * array->elemsize);
-	SetElement(array, newElem, n);
+    if (array->count == array->capacity)
+        ArrayGrow(array);
+    array->count++;
+    if (n < array->count - 1) //if we aren't appending
+        memmove(ArrayNth(array, n+1), ArrayNth(array,n), 
+                (size_t)(array->count - 1 - n) * array->elemsize);
+    SetElement(array, newElem, n);
 }
 
 void ArrayInsertSorted(DArray array, const void *newElem, ArrayCompareFn comparator)
 {
-	int n;
-	void *res;
-	int found;
+    int n;
+    void *res;
+    int found;
 
-	GS_ASSERT (array)
-	GS_ASSERT (comparator);
+    GS_ASSERT (array)
+    GS_ASSERT (comparator);
 
-	res=mybsearch(newElem, array->list,	array->count, array->elemsize, comparator, &found);
-	n = (((char *)res - (char *)array->list) / array->elemsize);
-	ArrayInsertAt(array, newElem, n);
+    res=mybsearch(newElem, array->list,	array->count, array->elemsize, comparator, &found);
+    n = (((char *)res - (char *)array->list) / array->elemsize);
+    ArrayInsertAt(array, newElem, n);
 }
 
 
 void ArrayRemoveAt(DArray array, int n)
 {
- 	GS_ASSERT (array)
-  	GS_ASSERT( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+      GS_ASSERT( (n >= 0) && (n < array->count));
 
-	if (n < array->count - 1) //if not last element
-		memmove(ArrayNth(array,n),ArrayNth(array,n+1),
-			    (size_t)(array->count - 1 - n) * array->elemsize);
-	array->count--;
+    if (n < array->count - 1) //if not last element
+        memmove(ArrayNth(array,n),ArrayNth(array,n+1),
+                (size_t)(array->count - 1 - n) * array->elemsize);
+    array->count--;
 }
 
 void ArrayDeleteAt(DArray array, int n)
 {
- 	GS_ASSERT (array)
-   	GS_ASSERT ( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+       GS_ASSERT ( (n >= 0) && (n < array->count));
 
-	FreeElement(array,n);
-	ArrayRemoveAt(array, n);
+    FreeElement(array,n);
+    ArrayRemoveAt(array, n);
 }
 
 
 void ArrayReplaceAt(DArray array, const void *newElem, int n)
 {
- 	GS_ASSERT (array)
-	GS_ASSERT ( (n >= 0) && (n < array->count));
+     GS_ASSERT (array)
+    GS_ASSERT ( (n >= 0) && (n < array->count));
 
-	FreeElement(array, n);
-	SetElement(array, newElem,n);
+    FreeElement(array, n);
+    SetElement(array, newElem,n);
 }
 
 
 void ArraySort(DArray array, ArrayCompareFn comparator)
 {
- 	GS_ASSERT (array)
-	qsort(array->list, (size_t)array->count, (size_t)array->elemsize, comparator);
+     GS_ASSERT (array)
+    qsort(array->list, (size_t)array->count, (size_t)array->elemsize, comparator);
 }
 
 //GS_ASSERT will be raised by ArrayNth if fromindex out of range
 int ArraySearch(DArray array, const void *key, ArrayCompareFn comparator, 
                   int fromIndex, int isSorted)
 {
-	void *res;
-	int found = 1;
-	if (!array || array->count == 0)
-		return NOT_FOUND;
+    void *res;
+    int found = 1;
+    if (!array || array->count == 0)
+        return NOT_FOUND;
 
-   	if (isSorted)
-		res=mybsearch(key, ArrayNth(array,fromIndex),
-					array->count - fromIndex, array->elemsize, comparator, &found);
-	else
-		res=mylsearch(key, ArrayNth(array, fromIndex), 
-					  array->count - fromIndex, array->elemsize, comparator);
-	if (res != NULL && found)
-		return (((char *)res - (char *)array->list) / array->elemsize);
-	else
-		return NOT_FOUND;
+       if (isSorted)
+        res=mybsearch(key, ArrayNth(array,fromIndex),
+                    array->count - fromIndex, array->elemsize, comparator, &found);
+    else
+        res=mylsearch(key, ArrayNth(array, fromIndex), 
+                      array->count - fromIndex, array->elemsize, comparator);
+    if (res != NULL && found)
+        return (((char *)res - (char *)array->list) / array->elemsize);
+    else
+        return NOT_FOUND;
 }
 
 
 void ArrayMap(DArray array, ArrayMapFn fn, void *clientData)
 {
-	int i;
+    int i;
 
- 	GS_ASSERT (array)
-	GS_ASSERT(fn);
+     GS_ASSERT (array)
+    GS_ASSERT(fn);
 
-	for (i = 0; i < array->count; i++)
-		fn(ArrayNth(array,i), clientData);
-		
+    for (i = 0; i < array->count; i++)
+        fn(ArrayNth(array,i), clientData);
+        
 }
 
 void ArrayMapBackwards(DArray array, ArrayMapFn fn, void *clientData)
 {
-	int i;
+    int i;
 
-	GS_ASSERT(fn);
+    GS_ASSERT(fn);
 
-	for (i = (array->count - 1) ; i >= 0 ; i--)
-		fn(ArrayNth(array,i), clientData);
-		
+    for (i = (array->count - 1) ; i >= 0 ; i--)
+        fn(ArrayNth(array,i), clientData);
+        
 }
 
 void * ArrayMap2(DArray array, ArrayMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
+    int i;
+    void * pcurr;
 
-	GS_ASSERT(fn);
-	GS_ASSERT(clientData);
+    GS_ASSERT(fn);
+    GS_ASSERT(clientData);
 
-	for (i = 0; i < array->count; i++)
-	{
-		pcurr = ArrayNth(array,i);
-		if(!fn(pcurr, clientData))
-			return pcurr;
-	}
+    for (i = 0; i < array->count; i++)
+    {
+        pcurr = ArrayNth(array,i);
+        if(!fn(pcurr, clientData))
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void * ArrayMapBackwards2(DArray array, ArrayMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
+    int i;
+    void * pcurr;
 
-	GS_ASSERT(fn);
-	GS_ASSERT(clientData);
+    GS_ASSERT(fn);
+    GS_ASSERT(clientData);
 
-	for (i = (array->count - 1) ; i >= 0 ; i--)
-	{
-		pcurr = ArrayNth(array,i);
-		if(!fn(pcurr, clientData))
-			return pcurr;
-	}
+    for (i = (array->count - 1) ; i >= 0 ; i--)
+    {
+        pcurr = ArrayNth(array,i);
+        if(!fn(pcurr, clientData))
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void ArrayClear(DArray array)
 {
-	int i;
+    int i;
 
-	// This could be more optimal!
-	//////////////////////////////
-	for(i = (ArrayLength(array) - 1) ; i >= 0 ; i--)
-		ArrayDeleteAt(array, i);
+    // This could be more optimal!
+    //////////////////////////////
+    for(i = (ArrayLength(array) - 1) ; i >= 0 ; i--)
+        ArrayDeleteAt(array, i);
 }
 
 /* mylsearch
@@ -333,17 +333,17 @@ void ArrayClear(DArray array)
  * couldn't use lfind
  */
 static void *mylsearch(const void *key, void *base, int count, int size,
-					 ArrayCompareFn comparator)
+                     ArrayCompareFn comparator)
 {
-	int i;
-	GS_ASSERT(key);
-	GS_ASSERT(base);
-	for (i = 0; i < count; i++)
-	{
-		if (comparator(key, (char *)base + size*i) == 0)
-			return (char *)base + size*i;
-	}
-	return NULL;
+    int i;
+    GS_ASSERT(key);
+    GS_ASSERT(base);
+    for (i = 0; i < count; i++)
+    {
+        if (comparator(key, (char *)base + size*i) == 0)
+            return (char *)base + size*i;
+    }
+    return NULL;
 }
 
 /* mybsearch
@@ -351,27 +351,27 @@ static void *mylsearch(const void *key, void *base, int count, int size,
  */
 static void *mybsearch(const void *elem, void *base, int num, int elemsize, ArrayCompareFn comparator, int *found)
 {
-	int L, H, I, C;
-	
-	GS_ASSERT(elem);
-	GS_ASSERT(base);
-	GS_ASSERT(found);
+    int L, H, I, C;
+    
+    GS_ASSERT(elem);
+    GS_ASSERT(base);
+    GS_ASSERT(found);
 
-	L = 0;
-	H = num - 1;
-	*found = 0;
-	while (L <= H)
-	{
-		I = (L + H) >> 1;
-		C = comparator(((char *)base) + I * elemsize,elem);
-		if (C == 0)
-			*found = 1;
-		if (C < 0) 
-			L = I + 1;
-		else
-		{
-			H = I - 1;
-		}
-	}
-	return ((char *)base) + L * elemsize;
+    L = 0;
+    H = num - 1;
+    *found = 0;
+    while (L <= H)
+    {
+        I = (L + H) >> 1;
+        C = comparator(((char *)base) + I * elemsize,elem);
+        if (C == 0)
+            *found = 1;
+        if (C < 0) 
+            L = I + 1;
+        else
+        {
+            H = I - 1;
+        }
+    }
+    return ((char *)base) + L * elemsize;
 }
diff --git a/code/gamespy/darray.h b/code/gamespy/darray.h
index ad84b13f..29ed76cc 100644
--- a/code/gamespy/darray.h
+++ b/code/gamespy/darray.h
@@ -43,9 +43,9 @@ typedef struct DArrayImplementation *DArray;
  * If the two elements are "equal", return 0.
  */
 #if defined(WIN32)
-	typedef int (__cdecl *ArrayCompareFn)(const void *elem1, const void *elem2);
+    typedef int (__cdecl *ArrayCompareFn)(const void *elem1, const void *elem2);
 #else
-	typedef int (*ArrayCompareFn)(const void *elem1, const void *elem2);
+    typedef int (*ArrayCompareFn)(const void *elem1, const void *elem2);
 #endif
 
 
diff --git a/code/gamespy/gcrypt.c b/code/gamespy/gcrypt.c
new file mode 100644
index 00000000..372e239d
--- /dev/null
+++ b/code/gamespy/gcrypt.c
@@ -0,0 +1,223 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "gcrypt.h"
+#include "../qcommon/q_platform.h"
+#include "../qcommon/q_shared.h"
+
+static unsigned int rotl32(unsigned int value, unsigned int count)
+{
+    return (value << count) | (value >> (-count & 31));
+}
+
+static unsigned int crypt_seek(GCryptInfo *info, unsigned int n1, unsigned int n2)
+{
+    int part;
+    int i;
+    int keyIndex;
+    int xorKey;
+    int current;
+
+    current  = 0x8000;
+    xorKey   = n1;
+    keyIndex = 0;
+    i        = 1;
+
+    info->offset = 0;
+
+    while (current > 0) {
+        xorKey += i;
+        keyIndex += xorKey;
+        xorKey += keyIndex;
+
+        if (n2 & current) {
+            part   = rotl32(~xorKey, 24);
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 24);
+            part   = rotl32(info->key[keyIndex & 0xff] ^ keyIndex, 8);
+            xorKey ^= info->key[xorKey & 0xff];
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 8);
+
+            i += 1 + i;
+        } else {
+            info->msg[info->offset]      = xorKey;
+            info->msg[info->offset + 16] = keyIndex;
+            info->msg[info->offset + 32] = i;
+            info->offset++;
+
+            part     = rotl32(keyIndex, 24);
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 24);
+            part     = rotl32(info->key[xorKey & 0xff] ^ xorKey, 8);
+            keyIndex ^= info->key[keyIndex & 0xff];
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 8);
+
+            i *= 2;
+        }
+
+        current >>= 1;
+    }
+
+    info->xorKey   = xorKey;
+    info->keyIndex = keyIndex;
+    info->i        = i;
+    info->start    = n1;
+
+    return keyIndex ^ xorKey;
+}
+
+static void crypt_encrypt(GCryptInfo *info, unsigned int *words, int len)
+{
+    int          part;
+    unsigned int i;
+    unsigned int w;
+    int          keyIndex;
+    int          xorKey;
+    int          offset;
+
+    offset   = info->offset;
+    xorKey   = info->xorKey;
+    keyIndex = info->keyIndex;
+    i        = info->i;
+
+    for (w = 0; w < len; w++) {
+        while (i < 0x10000) {
+            xorKey += i;
+            keyIndex += xorKey;
+            xorKey += keyIndex;
+
+            info->msg[offset]      = xorKey;
+            info->msg[offset + 16] = keyIndex;
+            info->msg[offset + 32] = i;
+            offset++;
+
+            part     = rotl32(keyIndex, 24);
+            keyIndex = rotl32(info->key[part & 0xff] ^ part, 24);
+            part     = rotl32(info->key[xorKey & 0xff] ^ xorKey, 8);
+            keyIndex ^= info->key[keyIndex & 0xff];
+            xorKey = rotl32(info->key[part & 0xff] ^ part, 8);
+
+            i *= 2;
+        }
+
+        words[w] = LittleLong(keyIndex ^ xorKey);
+        offset--;
+        if (offset < 0) {
+            offset = 0;
+        }
+
+        part   = rotl32(~info->msg[offset], 24);
+        xorKey = rotl32(info->key[part & 0xff] ^ part, 24);
+        part   = rotl32(info->key[info->msg[offset + 16] & 0xff] ^ info->msg[offset + 16], 8);
+        xorKey ^= info->key[xorKey & 0xff];
+        keyIndex = rotl32(info->key[part & 0xff] ^ part, 8);
+
+        i = info->msg[offset + 32] + 1 + info->msg[offset + 32];
+    }
+
+    info->offset   = offset;
+    info->xorKey   = xorKey;
+    info->keyIndex = keyIndex;
+    info->i        = i;
+}
+
+void init_crypt_key(unsigned char *src, unsigned int len, GCryptInfo *info)
+{
+    int index;
+    int i, j, k;
+    int tmp;
+
+    info->wordPtr = NULL;
+    for (k = 0; k < 256; k++) {
+        info->key[k] = 0;
+    }
+
+    for (i = 0; i < 4; i++) {
+        for (k = 0; k < 256; k++) {
+            info->key[k] = (info->key[k] << 8) + k;
+        }
+
+        index = i;
+
+        for (j = 0; j < 2; j++) {
+            for (k = 0; k < 256; k++) {
+                index = ((info->key[k] & 0xff) + src[k % len] + index) & 0xff;
+
+                tmp              = info->key[k];
+                info->key[k]     = info->key[index];
+                info->key[index] = tmp;
+            }
+        }
+    }
+
+    for (k = 0; k < 256; k++) {
+        info->key[k] ^= k;
+    }
+
+    crypt_seek(info, 0, 0);
+}
+
+void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len)
+{
+    int i;
+
+    for (i = 0; i < len; i++) {
+        if (!info->wordPtr || ((char *)info->wordPtr - (char *)info->words) >= (sizeof(info->words) - 1)) {
+            info->wordPtr = (unsigned char *)info->words;
+            crypt_encrypt(info, info->words, ARRAY_LEN(info->words));
+        }
+
+        out[i] ^= *info->wordPtr;
+        info->wordPtr++;
+    }
+}
+
+int enctype2_encoder(unsigned char *secKey, unsigned char *data, int size)
+{
+    GCryptInfo info = {0};
+    int        i;
+    int        header_size = 8;
+
+    // move the data and put it after the header
+    for (i = size - 1; i >= 0; i--) {
+        data[1 + header_size + i] = data[i];
+    }
+
+    // initialize the header
+    for (i = 0; i < header_size; i++) {
+        data[i + 1] = 0;
+    }
+
+    // initialize the crypt key
+    init_crypt_key(data + 1, header_size, &info);
+
+    for (i = 0; i < 6; i++) {
+        data[1 + header_size + size + i] = 0;
+    }
+    crypt_docrypt(&info, data + 1 + header_size, size + 6);
+
+    for (i = 0; secKey[i]; i++) {
+        data[i + 1] ^= secKey[i];
+    }
+
+    size += 1 + header_size + 6;
+    *data = header_size ^ 0xec;
+    return size;
+}
diff --git a/code/gamespy/gcrypt.h b/code/gamespy/gcrypt.h
new file mode 100644
index 00000000..dfe6993c
--- /dev/null
+++ b/code/gamespy/gcrypt.h
@@ -0,0 +1,40 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+typedef struct {
+    int key[256];
+    int msg[48];
+
+    int offset;
+    int xorKey;
+    int keyIndex;
+    int i;
+    int start;
+
+    unsigned int   words[16];
+    unsigned char *wordPtr;
+} GCryptInfo;
+
+void init_crypt_key(unsigned char *src, unsigned int len, GCryptInfo *info);
+void crypt_docrypt(GCryptInfo *info, unsigned char *out, int len);
diff --git a/code/gamespy/goaceng.h b/code/gamespy/goaceng.h
index ab98882a..b278af78 100644
--- a/code/gamespy/goaceng.h
+++ b/code/gamespy/goaceng.h
@@ -57,7 +57,7 @@ extern "C" {
 #endif
 
 
-#define ENGINE_VERSION "1.5"
+#define ENGINE_VERSION "3.0"
 #define SERVER_TIMEOUT 3000
 /* GServerList and GServer are the abstracted serverlist and server data types.
 All access to their internal data structures is done via the functions below */
@@ -74,7 +74,9 @@ idle - no processing or querying underway, ready to being updates
 listreq - a server list request has been or is being sent
 listxfer - we are transfering the server list
 lanlist - we are waiting for replies from servers on the LAN
-querying - the servers on the list are being queried */
+querying - the servers on the list are being queried
+connecting (added in OPM) - socket is currently connecting to the master server
+*/
 typedef enum {sl_idle, sl_listxfer, sl_lanlist, sl_querying} GServerListState;
 
 /* Comparision types for the ServerListSort function
@@ -85,7 +87,7 @@ stricase - assume the values are strings and do a case insensitive compare */
 typedef enum {cm_int, cm_float, cm_strcase, cm_stricase} GCompareMode;
 
 
-typedef enum {qt_basic, qt_info, qt_rules, qt_players, qt_info_rules, qt_status} GQueryType;
+typedef enum {qt_basic, qt_info, qt_rules, qt_players, qt_info_rules, qt_status, qt_grouprooms, qt_masterinfo} GQueryType;
 
 /* Messages that are passed to the ListCallBackFn */
 #define	LIST_STATECHANGED		1 // ServerListState changed, no parameters
diff --git a/code/gamespy/gserver.c b/code/gamespy/gserver.c
index 7a300558..13571064 100644
--- a/code/gamespy/gserver.c
+++ b/code/gamespy/gserver.c
@@ -13,17 +13,17 @@ Fax(714)549-0757
 ******
 
 Updated 10-15-99 (BGW)
-	Modified ServerParseKeyVals to actually parse and store empty
-	values for keys (i.e. "\delete\\" adds key="delete" and value="")
+    Modified ServerParseKeyVals to actually parse and store empty
+    values for keys (i.e. "\delete\\" adds key="delete" and value="")
 Updated 6-17-99 (DDW)
-	Added new tokenize function to handle empty values for keys
+    Added new tokenize function to handle empty values for keys
   
-	
+    
 *******/
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::nonport.h"
+    #include "::nonport.h"
 #else
-	#include "../nonport.h"
+    #include "../nonport.h"
 #endif
 #include "goaceng.h"
 #include "gserver.h"
@@ -36,121 +36,177 @@ Updated 6-17-99 (DDW)
 
 static int KeyValHashKeyP(const void *elem, int numbuckets);
 static int KeyValCompareKeyP(const void *entry1, const void *entry2);
+static char *mytok(char *instr, char delim);
+static char *LookupKey(GServer server, char *k);
 
 
 
 void ServerFree(void *elem)
 {
-	//free a server!
-	GServer server = *(GServer *)elem;
-	
-	TableFree(server->keyvals);
-	free(server);
+    //free a server!
+    GServer server = *(GServer *)elem;
+    
+    TableFree(server->keyvals);
+    free(server);
+}
+
+static void ServerSetAddressFromString (GServer server, char *address)
+{
+    char *cpos;
+
+    cpos = strchr(address, ':');
+    if (!cpos) {
+        return;
+    }
+
+    *cpos = 0;
+    server->ip = inet_addr(address);
+    server->port = atoi(cpos + 1);
+}
+
+GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype, HashTable keylist)
+{
+    GServer       server;
+    char         *k;
+    char         *v;
+    int           curfield;
+    GKeyValuePair kvpair;
+
+    curfield = 0;
+    server   = (GServer)ServerNew(0, 0, qtype, keylist);
+    v        = mytok(serverdata + 1, '\\');
+
+    while (curfield < fieldcount) {
+        k = fieldlist[curfield];
+        if (!v) {
+            v = "";
+        }
+
+        if (!strcmp(k, "ip")) {
+            ServerSetAddressFromString(server, v);
+        } else if (qtype == qt_grouprooms && !strcmp(k, "other")) {
+            for (char *p = v; *p; ++p) {
+                if (*p == 1) {
+                    *p = '\\';
+                }
+            }
+            ServerParseKeyVals(server, v);
+        } else {
+            kvpair.key   = (char *)LookupKey(server, k);
+            kvpair.value = (char *)LookupKey(server, v);
+            TableEnter(server->keyvals, &kvpair);
+        }
+        if (++curfield < fieldcount) {
+            v = mytok(0, '\\');
+        }
+    }
+
+    return server;
 }
 
 GServer ServerNew(unsigned long ip, unsigned short port, GQueryType qtype, HashTable keylist)
 {
-	GServer server;
-	int nBuckets, nChains;
+    GServer server;
+    int nBuckets, nChains;
 
-	server = malloc(sizeof(struct GServerImplementation));
-	server->ip = ip;
-	server->port = port;
-	server->ping = 9999;
-	server->querytype = qtype;
-	/* optimize the number of buckets / chains based on query type */
-	switch (qtype)
-	{
-	case qt_basic:
-		nBuckets = 4;
-		nChains = 2;
-		break;
-	case qt_info:
-		nBuckets = 6;
-		nChains = 2;
-		break;
-	case qt_players:
-	case qt_rules:
-		nBuckets = 8;
-		nChains = 2;
-		break;
-	case qt_info_rules:
-	case qt_status:
-	default:
-		nBuckets = 8;
-		nChains=  4;
-		break;
-	}
-	server->keyvals = TableNew2(sizeof(GKeyValuePair),nBuckets,nChains, KeyValHashKeyP, KeyValCompareKeyP, NULL);
-	server->keylist = keylist;
-	return server;
+    server = malloc(sizeof(struct GServerImplementation));
+    server->ip = ip;
+    server->port = port;
+    server->ping = 9999;
+    server->querytype = qtype;
+    /* optimize the number of buckets / chains based on query type */
+    switch (qtype)
+    {
+    case qt_basic:
+        nBuckets = 4;
+        nChains = 2;
+        break;
+    case qt_info:
+        nBuckets = 6;
+        nChains = 2;
+        break;
+    case qt_players:
+    case qt_rules:
+        nBuckets = 8;
+        nChains = 2;
+        break;
+    case qt_info_rules:
+    case qt_status:
+    default:
+        nBuckets = 8;
+        nChains=  4;
+        break;
+    }
+    server->keyvals = TableNew2(sizeof(GKeyValuePair),nBuckets,nChains, KeyValHashKeyP, KeyValCompareKeyP, NULL);
+    server->keylist = keylist;
+    return server;
 }
 
 
 static char *mytok(char *instr, char delim)
 {
-	char *result;
-	static char *thestr;
+    char *result;
+    static char *thestr;
 
-	if (instr)
-		thestr = instr;
-	result=thestr;
-	while (*thestr && *thestr != delim)
-	{
-		thestr++;
-	}
-	if (thestr == result)
-		result = NULL;
-	if (*thestr) //not the null term
-		*thestr++ = '\0';
-	return result;
+    if (instr)
+        thestr = instr;
+    result=thestr;
+    while (*thestr && *thestr != delim)
+    {
+        thestr++;
+    }
+    if (thestr == result)
+        result = NULL;
+    if (*thestr) //not the null term
+        *thestr++ = '\0';
+    return result;
 }
 
 static int CheckValidKey(char *key)
 {
-	const char *InvalidKeys[]={"queryid","final"};
-	int i;
-	for (i = 0; i < sizeof(InvalidKeys)/sizeof(InvalidKeys[0]); i++)
-	{
-		if (strcmp(key,InvalidKeys[i]) == 0)
-			return 0;
-	}
-	return 1;
+    const char *InvalidKeys[]={"queryid","final"};
+    int i;
+    for (i = 0; i < sizeof(InvalidKeys)/sizeof(InvalidKeys[0]); i++)
+    {
+        if (strcmp(key,InvalidKeys[i]) == 0)
+            return 0;
+    }
+    return 1;
 }
 
 
 static char *LookupKey(GServer server, char *k)
 {
-	char **keyindex;
+    char **keyindex;
 
-	keyindex = (char **)TableLookup(server->keylist,&k);
-	if (keyindex != NULL)
-		return *keyindex;
-	k = strdup(k);
-	TableEnter(server->keylist,&k);
-	return k;
+    keyindex = (char **)TableLookup(server->keylist,&k);
+    if (keyindex != NULL)
+        return *keyindex;
+    k = strdup(k);
+    TableEnter(server->keylist,&k);
+    return k;
 }
 
 void ServerParseKeyVals(GServer server, char *keyvals)
 {
-	char *k, *v;
-	GKeyValuePair kvpair;
+    char *k, *v;
+    GKeyValuePair kvpair;
 
-	k = mytok(++keyvals,'\\'); //skip over starting backslash
-	while (k != NULL)
-	{
-		v = mytok(NULL,'\\');
-		if (v == NULL)
-			v = "";
-		if (CheckValidKey(k))
-		{
-			kvpair.key = LookupKey(server, k);
-			kvpair.value = LookupKey(server, v);
-			TableEnter(server->keyvals, &kvpair);
-		}
-		k = mytok(NULL,'\\');
+    k = mytok(++keyvals,'\\'); //skip over starting backslash
+    while (k != NULL)
+    {
+        v = mytok(NULL,'\\');
+        if (v == NULL)
+            v = "";
+        if (CheckValidKey(k))
+        {
+            kvpair.key = LookupKey(server, k);
+            kvpair.value = LookupKey(server, v);
+            TableEnter(server->keyvals, &kvpair);
+        }
+        k = mytok(NULL,'\\');
 
-	}
+    }
 }
 
 
@@ -159,7 +215,7 @@ void ServerParseKeyVals(GServer server, char *keyvals)
 Returns the ping for the specified server. */
 int ServerGetPing(GServer server)
 {
-	return server->ping;
+    return server->ping;
 }
 
 /* ServerGetAddress
@@ -167,7 +223,7 @@ int ServerGetPing(GServer server)
 Returns the string, dotted IP address for the specified server */
 char *ServerGetAddress(GServer server)
 {
-	return (char *)inet_ntoa(*(struct in_addr*)&server->ip);
+    return (char *)inet_ntoa(*(struct in_addr*)&server->ip);
 }
 
 /* ServerGetInetAddress
@@ -175,7 +231,7 @@ char *ServerGetAddress(GServer server)
 Returns the IP address for the specified server */
 unsigned int ServerGetInetAddress(GServer server)
 {
-	return server->ip;
+    return server->ip;
 }
 
 
@@ -184,18 +240,18 @@ unsigned int ServerGetInetAddress(GServer server)
 Returns the "query" port for the specified server. */
 int ServerGetQueryPort(GServer server)
 {
-	return server->port;
+    return server->port;
 }
 
 static GKeyValuePair *ServerRuleLookup(GServer server, char *key)
 {
-	GKeyValuePair kvp;
-	char **keyindex;
-	keyindex = (char **)TableLookup(server->keylist, &key);
-	if (keyindex == NULL)
-		return NULL; //otherwise, the keyindex->keyindex is valid, so use it to lookup
-	kvp.key = *keyindex;
-	return (GKeyValuePair *)TableLookup(server->keyvals, &kvp);
+    GKeyValuePair kvp;
+    char **keyindex;
+    keyindex = (char **)TableLookup(server->keylist, &key);
+    if (keyindex == NULL)
+        return NULL; //otherwise, the keyindex->keyindex is valid, so use it to lookup
+    kvp.key = *keyindex;
+    return (GKeyValuePair *)TableLookup(server->keyvals, &kvp);
 }
 
 /* ServerGet[]Value
@@ -203,60 +259,60 @@ static GKeyValuePair *ServerRuleLookup(GServer server, char *key)
 Returns the value for the specified key. */
 char *ServerGetStringValue(GServer server, char *key, char *sdefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	if (strcmp(key,"hostaddr") == 0) //ooh! they want the hostaddr!
-		return ServerGetAddress(server);
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return sdefault;
-	return kv->value;
+    if (strcmp(key,"hostaddr") == 0) //ooh! they want the hostaddr!
+        return ServerGetAddress(server);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return sdefault;
+    return kv->value;
 }
 
 int ServerGetIntValue(GServer server, char *key, int idefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	if (strcmp(key,"ping") == 0) //ooh! they want the ping!
-		return ServerGetPing(server);
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return idefault;
-	return atoi(kv->value);
+    if (strcmp(key,"ping") == 0) //ooh! they want the ping!
+        return ServerGetPing(server);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return idefault;
+    return atoi(kv->value);
 
 }
 
 double ServerGetFloatValue(GServer server, char *key, double fdefault)
 {
-	GKeyValuePair *kv;
+    GKeyValuePair *kv;
 
-	kv = ServerRuleLookup(server,key);
-	if (!kv)
-		return fdefault;
-	return atof(kv->value);
+    kv = ServerRuleLookup(server,key);
+    if (!kv)
+        return fdefault;
+    return atof(kv->value);
 }
 
 char *ServerGetPlayerStringValue(GServer server, int playernum, char *key, char *sdefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetStringValue(server, newkey, sdefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetStringValue(server, newkey, sdefault);
 }
 int ServerGetPlayerIntValue(GServer server, int playernum, char *key, int idefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetIntValue(server, newkey, idefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetIntValue(server, newkey, idefault);
 
 }
 double ServerGetPlayerFloatValue(GServer server, int playernum, char *key, double fdefault)
 {
-	char newkey[32];
-	
-	sprintf(newkey,"%s_%d",key,playernum);
-	return ServerGetFloatValue(server, newkey, fdefault);
+    char newkey[32];
+    
+    sprintf(newkey,"%s_%d",key,playernum);
+    return ServerGetFloatValue(server, newkey, fdefault);
 
 }
 
@@ -268,20 +324,20 @@ key/value. The user-defined instance data will be passed to the KeyFn callback *
 
 static void KeyMapF(void *elem, void *clientData)
 {
-	GKeyValuePair *kv = (GKeyValuePair *)elem;
-	GEnumData *ped = (GEnumData *)clientData;
-	ped->EnumFn(kv->key, kv->value, ped->instance);
+    GKeyValuePair *kv = (GKeyValuePair *)elem;
+    GEnumData *ped = (GEnumData *)clientData;
+    ped->EnumFn(kv->key, kv->value, ped->instance);
 }
 
 
 void ServerEnumKeys(GServer server, KeyEnumFn KeyFn, void *instance)
 {
-	GEnumData ed;
+    GEnumData ed;
 
-	ed.EnumFn = KeyFn;
-	ed.instance = instance;
-	ed.keylist = server->keylist;
-	TableMap(server->keyvals, KeyMapF, &ed);
+    ed.EnumFn = KeyFn;
+    ed.instance = instance;
+    ed.keylist = server->keylist;
+    TableMap(server->keyvals, KeyMapF, &ed);
 }
 
 
@@ -293,21 +349,21 @@ void ServerEnumKeys(GServer server, KeyEnumFn KeyFn, void *instance)
 #define MULTIPLIER -1664117991
 static int StringHash(char *s, int numbuckets)
 {
-	unsigned long hashcode = 0;
-	while (*s != 0)
-		hashcode = hashcode * MULTIPLIER + tolower(*s++);
+    unsigned long hashcode = 0;
+    while (*s != 0)
+        hashcode = hashcode * MULTIPLIER + tolower(*s++);
     return (hashcode % numbuckets);
 
 }
 
 int GStringHash(const void *elem, int numbuckets)
 {
-	return StringHash(*(char **)elem, numbuckets);
+    return StringHash(*(char **)elem, numbuckets);
 }
 
 static int KeyValHashKeyP(const void *elem, int numbuckets)
 {
-	return StringHash(((GKeyValuePair *)elem)->key, numbuckets);
+    return StringHash(((GKeyValuePair *)elem)->key, numbuckets);
 }
 
 
@@ -328,12 +384,12 @@ int GCaseInsensitiveCompare(const void *entry1, const void *entry2)
  */
 static int KeyValCompareKeyP(const void *entry1, const void *entry2)
 {
-   	return ((GKeyValuePair *)entry1)->key - ((GKeyValuePair *)entry2)->key;
+       return ((GKeyValuePair *)entry1)->key - ((GKeyValuePair *)entry2)->key;
 }
 
 void GStringFree(void *elem)
 {
-	free(*(char **)elem);
+    free(*(char **)elem);
 }
 
 /* keyval
@@ -341,8 +397,8 @@ void GStringFree(void *elem)
  *
 static int KeyValCompareKeyA(const void *entry1, const void *entry2)
 {
-   	return CaseInsensitiveCompare(&((GKeyValuePair *)entry1)->key, 
-								  &((GKeyValuePair *)entry2)->key);
+       return CaseInsensitiveCompare(&((GKeyValuePair *)entry1)->key, 
+                                  &((GKeyValuePair *)entry2)->key);
 }
 
 */
\ No newline at end of file
diff --git a/code/gamespy/gserver.h b/code/gamespy/gserver.h
index a62822fd..b7b9dcf6 100644
--- a/code/gamespy/gserver.h
+++ b/code/gamespy/gserver.h
@@ -27,41 +27,42 @@ extern "C" {
 #endif
 
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::hashtable.h"
+    #include "::hashtable.h"
 #else
-	#include "../hashtable.h"
+    #include "../hashtable.h"
 #endif
 
 struct GServerImplementation
 {
-	unsigned long ip;
-	unsigned short port;
-	short ping;
-	GQueryType querytype;
-	HashTable keyvals;
-	HashTable keylist;
+    unsigned long ip;
+    unsigned short port;
+    short ping;
+    GQueryType querytype;
+    HashTable keyvals;
+    HashTable keylist;
 
 };
 
 typedef struct
 {
-	char *key;
-	char *value;
+    char *key;
+    char *value;
 } GKeyValuePair;
 /*
 typedef struct
 {
-	char *key, *value;
+    char *key, *value;
 } GKeyValuePair;
 */
 typedef struct 
 {
-	KeyEnumFn EnumFn;
-	void *instance;
-	HashTable keylist;
+    KeyEnumFn EnumFn;
+    void *instance;
+    HashTable keylist;
 } GEnumData;
 
 void ServerFree(void *elem);
+GServer ServerNewData(char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype, HashTable keylist);
 GServer ServerNew(unsigned long ip, unsigned short port, GQueryType qtype, HashTable keylist);
 void ServerParseKeyVals(GServer server, char *keyvals);
 int GStringHash(const void *elem, int numbuckets);
diff --git a/code/gamespy/gserverlist.c b/code/gamespy/gserverlist.c
index 378c3eac..fefd9f31 100644
--- a/code/gamespy/gserverlist.c
+++ b/code/gamespy/gserverlist.c
@@ -19,19 +19,37 @@ Fax(714)549-0757
   for this SDK. It also has a change history for the SDK.
 
 ******/
+
+/**
+ * The following modifications were made:
+ *
+ * 1) Non-blocking server list sockets. List requests are asynchronous and won't block the game. The only blocking request could be due to DNS resolution.
+ * 2) Server list sockets will timeout after 10 seconds of no reply.
+ * 3) Parallel server list requests.
+ *  3.1) A pool of sockets is initially created
+ *  3.2) The server list connects idling sockets to available masters, afterwards the server list state is set to `sl_listxfer`.
+ *  3.3) The server list sends the list request to connected masters, and receives the data for each.
+ *  3.4) When finished fetching 1 master (got `\final`), the server list state transitions to `sl_querying`.
+ *  3.5) The server list queries all fetched servers. It can still continue fetching list from currently connected masters
+ *       but it will not connect to other masters while servers are being queried. It won't be sending more queries if remaining masters replied in under 500 ms.
+ *  3.6) When finished querying all fetched servers, the server list restarts from 3.2 and queries next masters.
+ *
+ * The idea here is to ensure the redundancy of the server list between multiple masters even if the results are combined.
+ * Optionally for best results, the game should return a list of masters from the same community.
+ */
 #include "goaceng.h"
 #include "gserver.h"
 #if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__)
-	#include "::nonport.h"
+    #include "::nonport.h"
 #else
-	#include "../nonport.h"
+    #include "../nonport.h"
 #endif
 #ifdef _MACOS
-	#include "::darray.h"
-	#include "::hashtable.h"
+    #include "::darray.h"
+    #include "::hashtable.h"
 #else
-	#include "../darray.h"
-	#include "../hashtable.h"
+    #include "../darray.h"
+    #include "../hashtable.h"
 #endif
 #include "common/gsPlatformSocket.h"
 #include "gutil.h"
@@ -45,10 +63,24 @@ Fax(714)549-0757
 #include <string.h>
 #include <stdlib.h>
 
-#define MSHOST MASTER_SERVER_HOST
-#define MSPORT	28900
+// Added in 2.0
+#include "gcrypt.h"
+
+/**
+ * @brief Custom function used to return the master host, based on game settings
+ * 
+ * @return const char* The master host
+ */
+extern unsigned int ServerListGetNumMasters();
+extern const char *ServerListGetHost(int index);
+extern int ServerListGetMsPort(int index);
+
+//#define MSHOST ServerListGetHost(0)
+//#define MSPORT ServerListGetMsPort(0)
 #define SERVER_GROWBY 64
 #define LAN_SEARCH_TIME 3000 //3 sec
+#define SERVER_QUERY_MAX_PAUSE 500
+#define INTERNET_SEARCH_TIME 10000 //10 sec
 #define LIST_NUMKEYBUCKETS 500
 #define LIST_NUMKEYCHAINS 4
 
@@ -60,33 +92,58 @@ extern "C" {
 //todo: check state changes on error
 typedef struct 
 {
-	SOCKET s;
-	GServer currentserver;
-	unsigned long starttime;
-	struct sockaddr_in saddr;
+    SOCKET s;
+    GServer currentserver;
+    unsigned long starttime;
+    struct sockaddr_in saddr;
 } UpdateInfo;
 
+typedef enum { pi_fieldcount, pi_fields, pi_servers } GParseInfoState;
+typedef enum { ls_none, ls_connecting, ls_connected } GListSocketState;
 
+typedef struct GServerListSocketImplementation
+{
+    SOCKET s;
+    GListSocketState socketstate;
+    char data[2048];
+    int oldlen;
+    gsi_time lastreplytime;
+    GCryptInfo cryptinfo;
+} *GServerListSocket;
 
 struct GServerListImplementation
 {
-	GServerListState state;
-	DArray servers;
-	UpdateInfo *updatelist; //dynamic array of updateinfos
-	char gamename[32];
-	char seckey[32];
-	char enginename[32];
-	int maxupdates;
-	int nextupdate;
-	int abortupdate;
-	ListCallBackFn CallBackFn;
-	void *instance;
-	char *sortkey;
-	gbool sortascending;
-	SOCKET slsocket;
-	unsigned long lanstarttime;
-	GQueryType querytype;
-	HashTable keylist;
+    GServerListState state;
+    DArray servers;
+    UpdateInfo *updatelist; //dynamic array of updateinfos
+    char gamename[32];
+    char seckey[32];
+    char enginename[32];
+    char filter[256];
+    int maxupdates;
+    int nextupdate;
+    int abortupdate;
+    ListCallBackFn CallBackFn;
+    void *instance;
+    char *sortkey;
+    gbool sortascending;
+    GServerListSocket slsockets;
+    int numslsockets;
+    int startslindex;
+    gsi_time lastsltime;
+    unsigned long lanstarttime;
+    GQueryType querytype;
+    HashTable keylist;
+
+    // Added in 2.0
+    int numservers;
+    // Added in 2.0
+    //GCryptInfo cryptinfo;
+    // Added in OPM
+    int encryptdata;
+    gbool async;
+
+    GParseInfoState pistate;
 };
 
 GServerList g_sortserverlist; //global serverlist for sorting info!!
@@ -94,39 +151,57 @@ GServerList g_sortserverlist; //global serverlist for sorting info!!
 /* these correspond to the qt_ constants */
 #define NUM_QUERYTYPES 6
 const char *querystrings[NUM_QUERYTYPES] = {"\\basic\\","\\info\\","\\rules\\",
-								"\\players\\","\\info\\\\rules\\","\\status\\"};
+                                "\\players\\","\\info\\\\rules\\","\\status\\"};
 const int querylengths[NUM_QUERYTYPES] = {7,6,7,9,13,8};
 
 static void KeyValFree(void *elem);
 static int KeyValCompareKeyA(const void *entry1, const void *entry2);
 static int KeyValHashKeyA(const void *elem, int numbuckets);
-
+static gbool ServerListHasFinishedFetchingList(GServerList serverlist);
 
 /* ServerListNew
 ----------------
 Creates and returns a new (empty) GServerList. */
 GServerList	ServerListNew(const char *gamename, const char *enginename, const char *seckey, int maxconcupdates, void *CallBackFn, int CallBackFnType, void *instance)
 {
-	GServerList list;
+    GServerList list;
 
-	list = (GServerList) malloc(sizeof(struct GServerListImplementation));
-	assert(list != NULL);
-	list->state = sl_idle;
-	list->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
-	list->keylist = TableNew2(sizeof(char *),LIST_NUMKEYBUCKETS,LIST_NUMKEYCHAINS,GStringHash, GCaseInsensitiveCompare, GStringFree);
-	list->maxupdates = maxconcupdates;
-	list->updatelist = malloc(maxconcupdates * sizeof(UpdateInfo));
-	memset(list->updatelist, 0, maxconcupdates * sizeof(UpdateInfo));
-	assert(list->updatelist != NULL);
-	strcpy(list->gamename, gamename);
-	strcpy(list->seckey, seckey);
-	strcpy(list->enginename, enginename);
-	list->CallBackFn = CallBackFn;
-	assert(CallBackFn != NULL);
-	list->instance = instance;
-	list->sortkey = "";
-	SocketStartUp();
-	return list;	
+    list = (GServerList) malloc(sizeof(struct GServerListImplementation));
+    assert(list != NULL);
+    list->state = sl_idle;
+    list->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
+    list->keylist = TableNew2(sizeof(char *),LIST_NUMKEYBUCKETS,LIST_NUMKEYCHAINS,GStringHash, GCaseInsensitiveCompare, GStringFree);
+    list->maxupdates = maxconcupdates;
+    list->updatelist = malloc(maxconcupdates * sizeof(UpdateInfo));
+    memset(list->updatelist, 0, maxconcupdates * sizeof(UpdateInfo));
+    assert(list->updatelist != NULL);
+    strcpy(list->gamename, gamename);
+    strcpy(list->seckey, seckey);
+    strcpy(list->enginename, enginename);
+    list->CallBackFn = CallBackFn;
+    assert(CallBackFn != NULL);
+    list->instance = instance;
+    list->sortkey = "";
+    // Added in 2.0
+    list->numservers = 0;
+    // Added in OPM
+    list->encryptdata = 1;
+    list->async = 0;
+
+    list->numslsockets = maxconcupdates / 4;
+    if (list->numslsockets < 1) {
+        list->numslsockets = 1;
+    } else if (list->numslsockets > 4) {
+        // Above 4 seems too much
+        list->numslsockets = 4;
+    }
+    list->slsockets = (GServerListSocket)malloc(sizeof(struct GServerListSocketImplementation) * list->numslsockets);
+    memset(list->slsockets, 0, sizeof(struct GServerListSocketImplementation) * list->numslsockets);
+    list->startslindex = 0;
+    list->lastsltime = current_time();
+
+    SocketStartUp();
+    return list;	
 }
 
 /* ServerListFree
@@ -134,33 +209,34 @@ GServerList	ServerListNew(const char *gamename, const char *enginename, const ch
 Free a GServerList and all internal sturctures and servers */
 void ServerListFree(GServerList serverlist)
 {
-	ArrayFree(serverlist->servers);
-	TableFree(serverlist->keylist);
-	free(serverlist->updatelist);
+    ArrayFree(serverlist->servers);
+    TableFree(serverlist->keylist);
+    free(serverlist->updatelist);
+    free(serverlist->slsockets);
 
-	free(serverlist);
-	SocketShutDown();
+    free(serverlist);
+    SocketShutDown();
 }
 
  //create update sockets and init structures
 static GError InitUpdateList(GServerList serverlist)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		serverlist->updatelist[i].s = socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
-		if (serverlist->updatelist[i].s == INVALID_SOCKET)
-		{ //ran out of sockets, just cap maxupdates here, unless we don't have any
-			if (i == 0)
-				return GE_NOSOCKET;
-			serverlist->maxupdates = i;
-			return 0;
-		}
-		serverlist->updatelist[i].currentserver = NULL;
-		serverlist->updatelist[i].starttime = 0;
-	}
-	return 0;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        serverlist->updatelist[i].s = socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP);
+        if (serverlist->updatelist[i].s == INVALID_SOCKET)
+        { //ran out of sockets, just cap maxupdates here, unless we don't have any
+            if (i == 0)
+                return GE_NOSOCKET;
+            serverlist->maxupdates = i;
+            return 0;
+        }
+        serverlist->updatelist[i].currentserver = NULL;
+        serverlist->updatelist[i].starttime = 0;
+    }
+    return 0;
 
 
 }
@@ -168,61 +244,105 @@ static GError InitUpdateList(GServerList serverlist)
 //free update sockets 
 static GError FreeUpdateList(GServerList serverlist) 
 {
-	int i;
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		closesocket(serverlist->updatelist[i].s);
-	}
-	return 0;
+    int i;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        closesocket(serverlist->updatelist[i].s);
+    }
+    return 0;
 
 
 }
 
 //create and connect a server list socket
-static GError CreateServerListSocket(GServerList serverlist)
+static GError CreateServerListSocket(GServerList serverlist, GServerListSocket slsocket, gbool async)
 {
-	struct   sockaddr_in saddr;
-	struct hostent *hent;
+    struct   sockaddr_in saddr;
+    struct hostent *hent;
+    int lasterr;
+    int i;
+    int port;
+    const char *host;
 
-	saddr.sin_family = AF_INET;
-	saddr.sin_port = htons(MSPORT);
-	saddr.sin_addr.s_addr = inet_addr(MSHOST);
-	if (saddr.sin_addr.s_addr == INADDR_NONE)
-	{
-		hent = gethostbyname(MSHOST);
-		if (!hent)
-			return GE_NODNS; 
-		saddr.sin_addr.s_addr = *(u_long *)hent->h_addr_list[0];
-	}
-	serverlist->slsocket = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
-	if (serverlist->slsocket == INVALID_SOCKET)
-		return GE_NOSOCKET;
-	if (connect ( serverlist->slsocket, (struct sockaddr *) &saddr, sizeof saddr ) != 0)
-	{
-		closesocket(serverlist->slsocket);
-		return GE_NOCONNECT; 
-	}
+    if (serverlist->startslindex >= ServerListGetNumMasters()) {
+        return GE_NODNS;
+    }
 
-	//else we are connected
-	return 0;
+    if (slsocket->socketstate != ls_none) {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+    }
+
+    port = ServerListGetMsPort(serverlist->startslindex);
+    host = ServerListGetHost(serverlist->startslindex);
+
+    saddr.sin_family = AF_INET;
+    saddr.sin_port = htons(port);
+    saddr.sin_addr.s_addr = inet_addr(host);
+    if (saddr.sin_addr.s_addr == INADDR_NONE)
+    {
+        hent = gethostbyname(host);
+        if (!hent)
+            return GE_NODNS; 
+        saddr.sin_addr.s_addr = *(u_long *)hent->h_addr_list[0];
+    }
+    slsocket->s = socket ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
+    if (slsocket->s == INVALID_SOCKET)
+        return GE_NOSOCKET;
+
+    if (async) {
+        SetSockBlocking(slsocket->s, 0);
+    }
+
+    if (connect ( slsocket->s, (struct sockaddr *) &saddr, sizeof saddr ) != 0
+        && (lasterr = GOAGetLastError(slsocket->slsocket), lasterr != WSAEWOULDBLOCK && lasterr != WSAEINPROGRESS))
+    {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        return GE_NOCONNECT;
+    }
+
+    slsocket->socketstate = ls_connecting;
+    slsocket->oldlen = 0;
+    slsocket->cryptinfo.offset = -1;
+    slsocket->lastreplytime = current_time();
+    serverlist->startslindex++;
+
+    //else we are connected
+    return 0;
 
 
 }
 
+//create and connect a server list sockets
+static GError CreateServerListForAvailableSockets(GServerList serverlist, gbool async)
+{
+    int i;
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        if (serverlist->slsockets[i].socketstate == ls_none) {
+            CreateServerListSocket(serverlist, &serverlist->slsockets[i], async);
+        }
+    }
+
+    return 0;
+}
+
 
 //create and connect a server list socket
 static GError CreateServerListLANSocket(GServerList serverlist)
 {
-	int optval = 1;
+    int optval = 1;
+    GServerListSocket slsocket = &serverlist->slsockets[0];
 
-	serverlist->slsocket = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
-	if (serverlist->slsocket == INVALID_SOCKET)
-		return GE_NOSOCKET;
-	if (setsockopt(serverlist->slsocket, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
-		return GE_NOSOCKET;
+    slsocket->s = socket ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    if (slsocket->s == INVALID_SOCKET)
+        return GE_NOSOCKET;
+    if (setsockopt(slsocket->s, SOL_SOCKET, SO_BROADCAST, (char *)&optval, sizeof(optval)) != 0)
+        return GE_NOSOCKET;
 
-	//else we are ready to broadcast
-	return 0;
+    //else we are ready to broadcast
+    return 0;
 
 
 }
@@ -230,69 +350,99 @@ static GError CreateServerListLANSocket(GServerList serverlist)
 //trigger the callback and set the new mode
 static void ServerListModeChange(GServerList serverlist, GServerListState newstate)
 {
-	serverlist->state = newstate;
-	serverlist->CallBackFn(serverlist, LIST_STATECHANGED, serverlist->instance, NULL, NULL);
+    serverlist->state = newstate;
+    serverlist->CallBackFn(serverlist, LIST_STATECHANGED, serverlist->instance, NULL, NULL);
 
 }
 
 
 // validate us to the master and send a list request
 #define SECURE "\\secure\\"
-static GError SendListRequest(GServerList serverlist, char *filter)
+static GError SendListRequest(GServerList serverlist, GServerListSocket slsocket, char *filter)
 {
-	char data[256], *ptr, result[64];
-	int len;
+    char data[256], *ptr, result[64];
+    int len;
+    int i;
+    char *modifier;
+    
+    len = recv(slsocket->s, data, sizeof(data) - 1, 0);
+    if (gsiSocketIsError(len)) {
+        return GE_NOCONNECT;
+    }
+    data[len] = '\0'; //null terminate it
+    
+    ptr = strstr ( data, SECURE );
+    if (!ptr)
+        return GE_DATAERROR;
+    ptr = ptr + strlen(SECURE);
+    gs_encrypt   ( (uchar *) serverlist->seckey, 6, (uchar *)ptr, 6 );
+    if (serverlist->encryptdata) {
+        // Added in 2.0
+        for(i = 0; i < 6; i++) {
+            ptr[i] ^= serverlist->seckey[i];
+        }
+    }
+    gs_encode ( (uchar *)ptr, 6, (uchar *) result );
 
-	
-	len = recv(serverlist->slsocket, data, sizeof(data) - 1, 0);
-	if (gsiSocketIsError(len))
-		return GE_NOCONNECT;
-	data[len] = '\0'; //null terminate it
-	
-	ptr = strstr ( data, SECURE );
-	if (!ptr)
-		return GE_DATAERROR;
-	ptr = ptr + strlen(SECURE);
-	gs_encrypt   ( (uchar *) serverlist->seckey, 6, (uchar *)ptr, 6 );
-	gs_encode ( (uchar *)ptr, 6, (uchar *) result );
+    if (serverlist->encryptdata) {
+        // Added in 2.0
+        //  Encrypt data
+        //validate to the master
+        sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\enctype\\2\\final\\\\queryid\\1.1\\",
+                serverlist->enginename, "2", result); //validate us		
+    } else {
+        //validate to the master
+        sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\final\\\\queryid\\1.1\\",
+                serverlist->enginename, ENGINE_VERSION, result); //validate us	
+    }
+    
+    len = send ( slsocket->s, data, strlen(data), 0 );
+    if (gsiSocketIsError(len) || len == 0)
+        return GE_NOCONNECT;
 
-	//validate to the master
-	sprintf(data, "\\gamename\\%s\\gamever\\%s\\location\\0\\validate\\%s\\final\\\\queryid\\1.1\\",
-			serverlist->enginename, ENGINE_VERSION, result); //validate us		
-	
-	len = send ( serverlist->slsocket, data, strlen(data), 0 );
-	if (gsiSocketIsError(len) || len == 0)
-		return GE_NOCONNECT;
+    if (serverlist->querytype == qt_grouprooms) {
+        modifier = "groups";
 
-	//send the list request
-	if (filter)
-		sprintf(data, "\\list\\cmp\\gamename\\%s\\where\\%s\\final\\", serverlist->gamename, filter);
-	else
-		sprintf(data, "\\list\\cmp\\gamename\\%s\\final\\", serverlist->gamename);
-	len = send ( serverlist->slsocket, data, strlen(data), 0 );
-	if (gsiSocketIsError(len) || len == 0)
-		return GE_NOCONNECT;
+        serverlist->pistate = pi_fieldcount;
+    } else if (serverlist->querytype == qt_masterinfo) {
+        modifier = "info2";
 
-	ServerListModeChange(serverlist, sl_listxfer);
-	return 0;
+        serverlist->pistate = pi_fieldcount;
+    } else {
+        modifier = "cmp";
+    }
+
+    //send the list request
+    if (filter)
+        sprintf(data, "\\list\\%s\\gamename\\%s\\where\\%s\\final\\", modifier, serverlist->gamename, filter);
+    else
+        sprintf(data, "\\list\\%s\\gamename\\%s\\final\\", modifier, serverlist->gamename);
+    len = send ( slsocket->s, data, strlen(data), 0 );
+    if (gsiSocketIsError(len) || len == 0)
+        return GE_NOCONNECT;
+
+    if (serverlist->state == sl_idle) {
+        ServerListModeChange(serverlist, sl_listxfer);
+    }
+    return 0;
 }
 
 
 static GError SendBroadcastRequest(GServerList serverlist, int startport, int endport, int delta)
 {
-	struct   sockaddr_in saddr;
-	short i;
+    struct   sockaddr_in saddr;
+    short i;
 
-	saddr.sin_family = AF_INET;
-	saddr.sin_addr.s_addr = 0xFFFFFFFF; //broadcast
-	for (i = startport ; i <= endport ; i += delta)
-	{
-		saddr.sin_port = htons(i);
-		sendto(serverlist->slsocket, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
-	}
-	ServerListModeChange(serverlist, sl_lanlist);
-	serverlist->lanstarttime = current_time();
-	return 0;
+    saddr.sin_family = AF_INET;
+    saddr.sin_addr.s_addr = 0xFFFFFFFF; //broadcast
+    for (i = startport ; i <= endport ; i += delta)
+    {
+        saddr.sin_port = htons(i);
+        sendto(serverlist->slsockets[0].s, "\\status\\",8,0,(struct sockaddr *)&saddr,sizeof(saddr));
+    }
+    ServerListModeChange(serverlist, sl_lanlist);
+    serverlist->lanstarttime = current_time();
+    return 0;
 
 
 
@@ -301,13 +451,13 @@ static GError SendBroadcastRequest(GServerList serverlist, int startport, int en
 //just wait for the server list to become idle
 static void DoSyncLoop(GServerList serverlist)
 {
-	while (serverlist->state != sl_idle)
-	{
-		ServerListThink(serverlist);
-		msleep(10);
-		
-	}
-	
+    while (serverlist->state != sl_idle)
+    {
+        ServerListThink(serverlist);
+        msleep(10);
+        
+    }
+    
 }
 
 /* ServerListUpdate
@@ -315,7 +465,71 @@ static void DoSyncLoop(GServerList serverlist)
 Start updating a GServerList without filters */
 GError ServerListUpdate(GServerList serverlist, gbool async)
 {
-	return ServerListUpdate2(serverlist, async, NULL, qt_status);
+    return ServerListUpdate2(serverlist, async, NULL, qt_status);
+}
+
+/* ServerListCheckSocketError
+-------------------------
+Verify if the server list socket has an error or has timed out, and abort. */
+GError ServerListCheckSocketError(GServerList serverlist, GServerListSocket slsocket)
+{
+    int so_error;
+    int len = sizeof(so_error);
+    getsockopt(slsocket->s, SOL_SOCKET, SO_ERROR, &so_error, &len);
+
+    // Abort if the socket has an error or if it connect/recv has timed out
+    if (so_error || current_time() >= slsocket->lastreplytime + INTERNET_SEARCH_TIME) {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        slsocket->socketstate = ls_none;
+        return GE_NOCONNECT;
+    }
+
+    return 0;
+}
+
+/* ServerListStartQuery
+-------------------------
+Start querying a GServerList. */
+GError ServerListStartQuery(GServerList serverlist, GServerListSocket slsocket, gbool async)
+{
+    GError error;
+    int i;
+
+    if (slsocket->socketstate != ls_connecting) {
+        return GE_BUSY;
+    }
+
+    if (serverlist->abortupdate) {
+        for(i = 0; i < serverlist->numslsockets; i++) {
+            closesocket(serverlist->slsockets[i].s);
+            serverlist->slsockets[i].s = INVALID_SOCKET;
+        }
+        ServerListModeChange(serverlist, sl_idle);
+        return GE_NOCONNECT;
+    }
+
+    if (async) {
+        // Check for pending data
+        char buf;
+        if (recv(slsocket->s, &buf, 1, MSG_PEEK) == -1) {
+            return GE_BUSY;
+        }
+    }
+
+    slsocket->socketstate = ls_connected;
+
+    error = SendListRequest(serverlist, slsocket, serverlist->filter);
+    if (error) return error;
+    if (serverlist->querytype != qt_grouprooms && serverlist->querytype != qt_masterinfo) {
+        error = InitUpdateList(serverlist);
+        if (error) return error;
+    }
+
+    if (!async)
+        DoSyncLoop(serverlist);
+
+    return 0;
 }
 
 /* ServerListUpdate2
@@ -323,24 +537,41 @@ GError ServerListUpdate(GServerList serverlist, gbool async)
 Start updating a GServerList. */
 GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQueryType querytype)
 {
-	GError error;
+    GError error;
+    int i;
 
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
 
-	serverlist->querytype = querytype;
-	error = CreateServerListSocket(serverlist);
-	if (error) return error;
-	error = SendListRequest(serverlist, filter);
-	if (error) return error;
-	error = InitUpdateList(serverlist);
-	if (error) return error;
-	serverlist->nextupdate = 0;
-	serverlist->abortupdate = 0;
-	if (!async)
-		DoSyncLoop(serverlist);
+    serverlist->querytype = querytype;
+    error = CreateServerListForAvailableSockets(serverlist, async);
+    //if (error) return error;
 
-	return 0;
+    serverlist->nextupdate = 0;
+    serverlist->abortupdate = 0;
+    // Added in 2.0
+    serverlist->numservers = ServerListCount(serverlist);
+    // Added in 2.0
+    //serverlist->cryptinfo.offset = -1;
+    if (filter) {
+        strncpy(serverlist->filter, filter, sizeof(serverlist->filter));
+    } else {
+        serverlist->filter[0] = 0;
+    }
+
+    serverlist->async = async;
+
+    if (async) {
+        // As it's asynchronous, set the state to transfering
+        ServerListModeChange(serverlist, sl_listxfer);
+        return 0;
+    }
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        ServerListStartQuery(serverlist, &serverlist->slsockets[i], async);
+    }
+
+    return 0;
 }
 
 /* ServerListLANUpdate
@@ -348,75 +579,90 @@ GError ServerListUpdate2(GServerList serverlist, gbool async, char *filter, GQue
 Start updating a GServerList from servers on the LAN. */
 GError ServerListLANUpdate(GServerList serverlist, gbool async, int startsearchport, int endsearchport, int searchdelta)
 {
-	GError error;
+    GError error;
 
-	assert(searchdelta > 0);
+    assert(searchdelta > 0);
 
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
 
-	error = InitUpdateList(serverlist);
-	if (error) return error;
-	error = CreateServerListLANSocket(serverlist);
-	if (error) return error;
-	error = SendBroadcastRequest(serverlist, startsearchport, endsearchport, searchdelta);
-	if (error) return error;
-	serverlist->nextupdate = 0;
-	serverlist->abortupdate = 0;
-	if (!async)
-		DoSyncLoop(serverlist);
+    error = InitUpdateList(serverlist);
+    if (error) return error;
+    error = CreateServerListLANSocket(serverlist);
+    if (error) return error;
+    error = SendBroadcastRequest(serverlist, startsearchport, endsearchport, searchdelta);
+    if (error) return error;
+    serverlist->nextupdate = 0;
+    serverlist->abortupdate = 0;
+    if (!async)
+        DoSyncLoop(serverlist);
 
-	return 0;
+    return 0;
 }
 
+//add a new server based on the data
+static GServer ServerListAddServerData(GServerList serverlist, char **fieldlist, int fieldcount, char *serverdata, GQueryType qtype)
+{
+    GServer server;
+
+    server = ServerNewData(fieldlist, fieldcount, serverdata, qtype, serverlist->keylist);
+    ArrayAppend(serverlist->servers, &server);
+    return server;
+}
 
 //add the server to the list with the given ip, port
 static void ServerListAddServer(GServerList serverlist, unsigned long ip, unsigned short port, GQueryType qtype)
 {
-	GServer server;
-	server =  ServerNew(ip, port, qtype, serverlist->keylist);
-	ArrayAppend(serverlist->servers,&server);
+    GServer server;
+    server =  ServerNew(ip, port, qtype, serverlist->keylist);
+    ArrayAppend(serverlist->servers,&server);
  //printf("%d %s:%d\n",++count, ip,port);
 }
 
 //add the server to the list with the given ip, port
 static void ServerListInsertServer(GServerList serverlist, unsigned long ip, unsigned short port, int pos, GQueryType qtype)
 {
-	GServer server;
-	server =  ServerNew(ip, port, qtype, serverlist->keylist);
-	ArrayInsertAt(serverlist->servers,&server,pos);
+    GServer server;
+    server =  ServerNew(ip, port, qtype, serverlist->keylist);
+    ArrayInsertAt(serverlist->servers,&server,pos);
  //printf("%d %s:%d\n",++count, ip,port);
 }
 
+//find the server in the list, returns -1 if it does not exist
+static int ServerListFindServerMax(GServerList serverlist, unsigned int ip, int port, int count)
+{
+    int i;
+    GServer server;
+
+    for (i = 0; i < count ; i++)
+    {
+        server = *(GServer *)ArrayNth(serverlist->servers,i);
+        if (port == ServerGetQueryPort(server) && ServerGetInetAddress(server)==ip)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
 //find the server in the list, returns -1 if it does not exist
 static int ServerListFindServer(GServerList serverlist, unsigned int ip, int port)
 {
-	int i;
-	GServer server;
-
-	for (i = 0; i < ArrayLength(serverlist->servers) ; i++)
-	{
-		server = *(GServer *)ArrayNth(serverlist->servers,i);
-		if (port == ServerGetQueryPort(server) && ServerGetInetAddress(server)==ip)
-		{
-			return i;
-		}
-	}
-	return -1;
+    return ServerListFindServerMax(serverlist, ip, port, ArrayLength(serverlist->servers));
 }
 
 //finds the server in the list of servers currently being queried
 // returns -1 if it does not exist
 static int ServerListFindServerInUpdateList(GServerList serverlist, GServer server)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-	{
-		if (serverlist->updatelist[i].currentserver == server)
-			return i;
-	}
-	return -1;
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+    {
+        if (serverlist->updatelist[i].currentserver == server)
+            return i;
+    }
+    return -1;
 }
 
 /* ServerListRemoveServer
@@ -424,22 +670,22 @@ static int ServerListFindServerInUpdateList(GServerList serverlist, GServer serv
 Removes a single server from the list. Frees the memory associated with the GServer */
 void ServerListRemoveServer(GServerList serverlist, char *ip, int port)
 {
-	int currentindex = ServerListFindServer(serverlist, inet_addr(ip), port);
-	int updateindex;
+    int currentindex = ServerListFindServer(serverlist, inet_addr(ip), port);
+    int updateindex;
 
-	if (currentindex == -1)
-		return; //can't do anything, it doesn't exist
+    if (currentindex == -1)
+        return; //can't do anything, it doesn't exist
 
-	//check to see whether we need to change the updatelist or move the nextupdate
-	if (serverlist->state != sl_idle && serverlist->nextupdate > currentindex) 
-	{
-		GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-		updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
-		if (updateindex != -1) //is currently being queried, stop it
-			serverlist->updatelist[updateindex].currentserver = NULL;
-		serverlist->nextupdate--; //decrement the next update, since we are removing a server
-	}
-	ArrayDeleteAt(serverlist->servers, currentindex); 
+    //check to see whether we need to change the updatelist or move the nextupdate
+    if (serverlist->state != sl_idle && serverlist->nextupdate > currentindex) 
+    {
+        GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+        updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
+        if (updateindex != -1) //is currently being queried, stop it
+            serverlist->updatelist[updateindex].currentserver = NULL;
+        serverlist->nextupdate--; //decrement the next update, since we are removing a server
+    }
+    ArrayDeleteAt(serverlist->servers, currentindex); 
 }
 
 /* ServerListUpdate
@@ -448,159 +694,297 @@ Adds an auxilliary (non-fetched) server to the update list.
 If the engine is idle, the server is added and the engine started. */
 GError ServerListAuxUpdate(GServerList serverlist, const char *ip, int port, gbool async, GQueryType querytype)
 {
-	GError error;
-	int currentindex;
-	int updateindex;
-	unsigned int real_ip = inet_addr(ip);
-	//first, see if the server already exists
-	currentindex = ServerListFindServer(serverlist,real_ip,port);
+    GError error;
+    int currentindex;
+    int updateindex;
+    unsigned int real_ip = inet_addr(ip);
+    //first, see if the server already exists
+    currentindex = ServerListFindServer(serverlist,real_ip,port);
 
 
-	//if we're idle, start things up
-	if (serverlist->state == sl_idle)
-	{
-		//prepare as if we're going to do a normal list fetch,
-		//but skip the call to SendListRequest().
+    //if we're idle, start things up
+    if (serverlist->state == sl_idle)
+    {
+        //prepare as if we're going to do a normal list fetch,
+        //but skip the call to SendListRequest().
 
-		
-		error = InitUpdateList(serverlist);
-		if (error) return error;
-		if (currentindex != -1) //we need to "move" this server to the end of the list
-		{ //move the server to the end of the array
-			GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-			holdserver->ping = 9999;//clear the ping so it gets recalculated
-			ArrayRemoveAt(serverlist->servers,currentindex);
-			ArrayAppend(serverlist->servers,&holdserver);
-		} else
-		{	//add the aux server
-			ServerListAddServer(serverlist, real_ip, (unsigned short)port, querytype);
-		}
-		
-		serverlist->nextupdate = ArrayLength(serverlist->servers) - 1;
-		serverlist->abortupdate = 0;
+        
+        error = InitUpdateList(serverlist);
+        if (error) return error;
+        if (currentindex != -1) //we need to "move" this server to the end of the list
+        { //move the server to the end of the array
+            GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+            holdserver->ping = 9999;//clear the ping so it gets recalculated
+            ArrayRemoveAt(serverlist->servers,currentindex);
+            ArrayAppend(serverlist->servers,&holdserver);
+        } else
+        {	//add the aux server
+            ServerListAddServer(serverlist, real_ip, (unsigned short)port, querytype);
+        }
+        
+        serverlist->nextupdate = ArrayLength(serverlist->servers) - 1;
+        serverlist->abortupdate = 0;
 
-		//chane the mode straight to querying
-		ServerListModeChange(serverlist, sl_querying);
-		//is it's a sync call, do it until done
-		if (!async)
-			DoSyncLoop(serverlist);
+        //chane the mode straight to querying
+        ServerListModeChange(serverlist, sl_querying);
+        //is it's a sync call, do it until done
+        if (!async)
+            DoSyncLoop(serverlist);
 
-	}
-	else
-	{
-		//if we're in the middle of an update, we should
-		//be able to just slip the aux server in for querying
-		//ServerListAddServer(serverlist, ip, port);
-		//crt -- make it the next server to be queried
-		//note: this should NEVER be called in a different thread from think!!
-		if (currentindex == -1) //it doesn't exist yet
-			ServerListInsertServer(serverlist, real_ip, (unsigned short)port, serverlist->nextupdate, querytype);
-		else 
-		{ //it exists, find out whats happening to it
-			GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
-			if (currentindex >= serverlist->nextupdate) //hasn't been queried yet!
-				return 0; //it will be queried soon anyway
-			holdserver->ping = 9999;//clear the ping so it gets recalculated
-			updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
-			if (updateindex != -1) //is currently being queried, stop it
-				serverlist->updatelist[updateindex].currentserver = NULL;
-			ArrayInsertAt(serverlist->servers,&holdserver, serverlist->nextupdate); //insert at new place
-			ArrayRemoveAt(serverlist->servers,currentindex); //remove the old one
-			serverlist->nextupdate--; //decrement the next update, since we are removing a server
-		}
-	}
-	return 0;
+    }
+    else
+    {
+        //if we're in the middle of an update, we should
+        //be able to just slip the aux server in for querying
+        //ServerListAddServer(serverlist, ip, port);
+        //crt -- make it the next server to be queried
+        //note: this should NEVER be called in a different thread from think!!
+        if (currentindex == -1) //it doesn't exist yet
+            ServerListInsertServer(serverlist, real_ip, (unsigned short)port, serverlist->nextupdate, querytype);
+        else 
+        { //it exists, find out whats happening to it
+            GServer holdserver = *(GServer *)ArrayNth(serverlist->servers,currentindex);
+            if (currentindex >= serverlist->nextupdate) //hasn't been queried yet!
+                return 0; //it will be queried soon anyway
+            holdserver->ping = 9999;//clear the ping so it gets recalculated
+            updateindex = ServerListFindServerInUpdateList(serverlist, holdserver);
+            if (updateindex != -1) //is currently being queried, stop it
+                serverlist->updatelist[updateindex].currentserver = NULL;
+            ArrayInsertAt(serverlist->servers,&holdserver, serverlist->nextupdate); //insert at new place
+            ArrayRemoveAt(serverlist->servers,currentindex); //remove the old one
+            serverlist->nextupdate--; //decrement the next update, since we are removing a server
+        }
+    }
+    return 0;
 }
 
-static GError ServerListLANList(GServerList serverlist)
+static GError ServerListLANList(GServerList serverlist, GServerListSocket slsocket)
 {
-	struct timeval timeout = {0,0};
-	fd_set set;
-	char indata[1500];
-	struct   sockaddr_in saddr;
-	int saddrlen = sizeof(saddr);
-	int error;
-
-	while (1) //we break if the select fails
-	{
-		FD_ZERO(&set);
-		FD_SET( serverlist->slsocket, &set);
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (gsiSocketIsError(error) || 0 == error) //no data
-			break;
-		error = recvfrom(serverlist->slsocket, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
-		if (gsiSocketIsError(error))
-			continue; 
-		//we got data, add the server to the list to update
-		if (strstr(indata,"\\final\\") != NULL)
-			ServerListAddServer(serverlist,saddr.sin_addr.s_addr, ntohs(saddr.sin_port), qt_status);
-	}
-	if (current_time() - serverlist->lanstarttime > LAN_SEARCH_TIME) //done waiting for replies
-	{
-		closesocket(serverlist->slsocket);
-		serverlist->slsocket = INVALID_SOCKET;
-		ServerListModeChange(serverlist, sl_querying);
-	}
-	return 0;
+    struct timeval timeout = {0,0};
+    fd_set set;
+    char indata[1500];
+    struct   sockaddr_in saddr;
+    int saddrlen = sizeof(saddr);
+    int error;
 
+    while (1) //we break if the select fails
+    {
+        FD_ZERO(&set);
+        FD_SET( slsocket->s, &set);
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (gsiSocketIsError(error) || 0 == error) //no data
+            break;
+        error = recvfrom(slsocket->s, indata, sizeof(indata) - 1, 0, (struct sockaddr *)&saddr, &saddrlen );
+        if (gsiSocketIsError(error))
+            continue; 
+        //we got data, add the server to the list to update
+        if (strstr(indata,"\\final\\") != NULL)
+            ServerListAddServer(serverlist,saddr.sin_addr.s_addr, ntohs(saddr.sin_port), qt_status);
+    }
+    if (current_time() - serverlist->lanstarttime > LAN_SEARCH_TIME) //done waiting for replies
+    {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        ServerListModeChange(serverlist, sl_querying);
+    }
+    return 0;
 }
-							 
+
+static int CountSlashOffset(char *data, int len, int slashcount)
+{
+    char *p;
+
+    for (p = data; slashcount && p != data + len; ++p) {
+        if (*p == '\\') {
+            slashcount--;
+        }
+    }
+
+    if (slashcount) {
+        return -1;
+    }
+
+    return p - data;
+}
+
+//parses and retrieve servers based on fields
+static int ServerListParseInfoList(GServerList serverlist, char *data, int len)
+{
+    char      *fieldlist[20];
+    char       tempfield[64];
+    char      *tempptr;
+    static int fieldcount;
+    int        offset;
+    int        i;
+    GServer    server;
+
+    switch (serverlist->pistate) {
+    case pi_fieldcount:
+        offset = CountSlashOffset(data, len, 3);
+        if (offset == -1) {
+            return 0;
+        }
+        if (offset < 12) {
+            return 0;
+        }
+
+        strncpy(tempfield, data + 12, offset - 12);
+        tempfield[offset - 13] = 0;
+
+        fieldcount = atoi(tempfield);
+        if (fieldcount > 20) {
+            return -1;
+        }
+
+        serverlist->pistate = pi_fields;
+
+        for (i = 0; i < fieldcount; ++i) {
+            fieldlist[i] = 0;
+        }
+
+        return offset - 1;
+    case pi_fields:
+        offset = CountSlashOffset(data, len, 2);
+        if (offset == -1) {
+            return 0;
+        }
+
+        strncpy(tempfield, data + 1, offset - 2);
+        tempfield[offset - 2] = 0;
+        tempptr               = goastrdup(tempfield);
+
+        for (i = 0; i < fieldcount; ++i) {
+            if (!fieldlist[i]) {
+                fieldlist[i] = tempptr;
+                if (i == fieldcount - 1) {
+                    serverlist->pistate = pi_servers;
+                }
+                return offset - 1;
+            }
+        }
+
+        return -1;
+    case pi_servers:
+        offset = CountSlashOffset(data, len, fieldcount + 1);
+        if (offset == -1) {
+            return 0;
+        }
+
+        server = ServerListAddServerData(serverlist, (char **)fieldlist, fieldcount, data, serverlist->querytype);
+        data[offset - 1] = '\\';
+        serverlist->CallBackFn(serverlist, 2, serverlist->instance, server, 0);
+        return offset - 1;
+    default:
+        return -1;
+    }
+}
+
 //reads the server list from the socket and parses it
-static GError ServerListReadList(GServerList serverlist)
+static GError ServerListReadList(GServerList serverlist, GServerListSocket slsocket)
 {
-	static char data[2048]; //static input buffer
-	static int oldlen = 0;
-	fd_set set;
-	struct timeval timeout = {0,0};
-	int len, i;
-	char *p;
-	unsigned long ip;
-	unsigned short port;
+    //static char data[2048]; //static input buffer
+    //static int oldlen = 0;
+    fd_set set;
+    struct timeval timeout = {0,0};
+    int len, i;
+    char *p;
+    unsigned long ip;
+    unsigned short port;
 
-	FD_ZERO(&set);
-	FD_SET(serverlist->slsocket, &set);
+    FD_ZERO(&set);
+    FD_SET(slsocket->s, &set);
 #ifndef KGTRN_ACCESS
-	i = select( FD_SETSIZE, &set, NULL, NULL, &timeout );
-	if (i <= 0)
-		return GE_NOERROR;
+    i = select( FD_SETSIZE, &set, NULL, NULL, &timeout );
+    if (i <= 0)
+        return GE_NOERROR;
 #endif
 
 //append to data
-	len = recv(serverlist->slsocket, data + oldlen, sizeof(data) - oldlen - 1, 0);
-	if (gsiSocketIsError(len) || len == 0)
-	{
-		closesocket(serverlist->slsocket);
-		serverlist->slsocket = INVALID_SOCKET;
-		oldlen = 0; //clear data so it can be used again
-		ServerListHalt(serverlist);
-		ServerListModeChange(serverlist, sl_querying);
-		return GE_NOCONNECT;
+    len = recv(slsocket->s, slsocket->data + slsocket->oldlen, sizeof(slsocket->data) - slsocket->oldlen - 1, 0);
+    if (gsiSocketIsError(len) || len == 0)
+    {
+        closesocket(slsocket->s);
+        slsocket->s = INVALID_SOCKET;
+        slsocket->socketstate = ls_none;
+        slsocket->oldlen = 0; //clear data so it can be used again
+        //ServerListHalt(serverlist);
+        ServerListModeChange(serverlist, sl_querying);
+        return GE_NOCONNECT;
 
-	}
-	oldlen += len;
+    }
 
-	p = data;
-	while (p - data <= oldlen - 6)
-	{
-		if (strncmp(p,"\\final\\",7) == 0 || serverlist->abortupdate)
-		{
-			closesocket(serverlist->slsocket);
-			serverlist->slsocket = INVALID_SOCKET;
-			oldlen = 0; //clear data so it can be used again
-			ServerListModeChange(serverlist, sl_querying);
-			return 0; //get out!!
-		}
-		if (oldlen < 6) //no way it could be a full IP, quit
-			break;
-		memcpy(&ip,p,4);
-		p += 4;
-		memcpy(&port,p,2);
-		p += 2;
-		ServerListAddServer(serverlist,ip,  ntohs(port), serverlist->querytype );
-	}
-	oldlen = oldlen - (p - data);
-	memmove(data,p,oldlen); //shift it over
-	return 0;
+    slsocket->lastreplytime = current_time();
+    serverlist->lastsltime = slsocket->lastreplytime;
+
+    if (serverlist->encryptdata && slsocket->cryptinfo.offset != -1) {
+        // Added in 2.0
+        crypt_docrypt(&slsocket->cryptinfo, slsocket->data + slsocket->oldlen, len);
+    }
+
+    slsocket->oldlen += len;
+
+    p = slsocket->data;
+
+    if (!serverlist->encryptdata) {
+        slsocket->cryptinfo.offset = 0;
+    } else if (slsocket->cryptinfo.offset == -1) {
+        // Added in 2.0
+        if (slsocket->oldlen > (*p ^ 0xEC)) {
+            *p ^= 0xEC;
+            len = strlen(serverlist->seckey);
+            for (i = 0; i < len; i++) {
+                p[i + 1] ^= serverlist->seckey[i];
+            }
+            init_crypt_key((unsigned char *)p + 1, *p, &slsocket->cryptinfo);
+            p += *p + 1;
+            crypt_docrypt(&slsocket->cryptinfo, (unsigned char *)p, slsocket->oldlen - (p - slsocket->data));
+        }
+    }
+
+    if (slsocket->cryptinfo.offset != -1)
+    {
+        while (p - slsocket->data <= slsocket->oldlen - 6)
+        {
+            if (strncmp(p,"\\final\\",7) == 0 || serverlist->abortupdate)
+            {
+                closesocket(slsocket->s);
+                slsocket->s = INVALID_SOCKET;
+                slsocket->socketstate = ls_none;
+                slsocket->oldlen = 0; //clear data so it can be used again
+                if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
+                    ServerListModeChange(serverlist, sl_idle);
+                } else {
+                    ServerListModeChange(serverlist, sl_querying);
+                }
+                return 0; //get out!!
+            }
+            if (slsocket->oldlen < 6) //no way it could be a full IP, quit
+                break;
+
+            if (serverlist->querytype == qt_grouprooms || serverlist->querytype == qt_masterinfo) {
+                i = ServerListParseInfoList(serverlist, p, slsocket->oldlen - (p - slsocket->data));
+                if (i < 0) {
+                    serverlist->abortupdate = 1;
+                } else if (!i) {
+                    // finished
+                    break;
+                }
+            } else {
+                memcpy(&ip, p, 4);
+                p += 4;
+                memcpy(&port, p, 2);
+                p += 2;
+                // Added in 2.0
+                //  Skip adding the server if already exists
+                if (ServerListFindServer(serverlist, ip, ntohs(port)) == -1) {
+                    ServerListAddServer(serverlist, ip, ntohs(port), serverlist->querytype);
+                }
+            }
+        }
+    }
+    slsocket->oldlen = slsocket->oldlen - (p - slsocket->data);
+    memmove(slsocket->data,p,slsocket->oldlen); //shift it over
+    return 0;
 
 }
 
@@ -608,96 +992,172 @@ static GError ServerListReadList(GServerList serverlist)
 
 static GError ServerListQueryLoop(GServerList serverlist)
 {
-	int i, scount = 0, error, final;
-	fd_set set;
-	struct timeval timeout = {0,0};
-	char indata[1500];
-	struct sockaddr_in saddr;
-	int saddrlen = sizeof(saddr);
-	GServer server;
+    int i, scount = 0, error, final;
+    fd_set set;
+    struct timeval timeout = {0,0};
+    char indata[1500];
+    struct sockaddr_in saddr;
+    int saddrlen = sizeof(saddr);
+    GServer server;
 
 //first, check for available data
-	FD_ZERO(&set);
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-		if (serverlist->updatelist[i].currentserver != NULL) //there is a server waiting
-		{
-			scount++;
-			FD_SET( serverlist->updatelist[i].s, &set);
+    FD_ZERO(&set);
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+        if (serverlist->updatelist[i].currentserver != NULL) //there is a server waiting
+        {
+            scount++;
+            FD_SET( serverlist->updatelist[i].s, &set);
 
-		}
-	if (scount > 0) //there are sockets to check for data
-	{
+        }
+    if (scount > 0) //there are sockets to check for data
+    {
 
-		error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
-		if (!gsiSocketIsError(error) && 0 != error)
-			for (i = 0 ; i < serverlist->maxupdates ; i++)
-				if (serverlist->updatelist[i].currentserver != NULL && FD_ISSET(serverlist->updatelist[i].s, &set) ) //there is a server waiting
-				{ //we can read data!!
-					saddrlen = sizeof(saddr);
-					error = recvfrom(serverlist->updatelist[i].s, indata, sizeof(indata) - 1, 0,(struct sockaddr *)&saddr, &saddrlen);
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (!gsiSocketIsError(error) && 0 != error)
+            for (i = 0 ; i < serverlist->maxupdates ; i++)
+                if (serverlist->updatelist[i].currentserver != NULL && FD_ISSET(serverlist->updatelist[i].s, &set) ) //there is a server waiting
+                { //we can read data!!
+                    saddrlen = sizeof(saddr);
+                    error = recvfrom(serverlist->updatelist[i].s, indata, sizeof(indata) - 1, 0,(struct sockaddr *)&saddr, &saddrlen);
 
-					if (saddr.sin_addr.s_addr != serverlist->updatelist[i].saddr.sin_addr.s_addr ||
-							saddr.sin_port != serverlist->updatelist[i].saddr.sin_port)
-						continue; //it wasn't from this server
+                    if (saddr.sin_addr.s_addr != serverlist->updatelist[i].saddr.sin_addr.s_addr ||
+                            saddr.sin_port != serverlist->updatelist[i].saddr.sin_port)
+                        continue; //it wasn't from this server
+
+                    if (!gsiSocketIsError(error)) //we got data
+                    {
+                        indata[error] = 0; //truncate and parse it
+                        final = (strstr(indata,"\\final\\") != NULL);
+                        server = serverlist->updatelist[i].currentserver;
+                        if (server->ping == 9999) //set the ping
+                            server->ping = (short)(current_time() - serverlist->updatelist[i].starttime);
+                        ServerParseKeyVals(server, indata); 
+                        if (final) //it's all done
+                        {
+                            serverlist->CallBackFn(serverlist, 
+                                                    LIST_PROGRESS, 
+                                                    serverlist->instance,
+                                                    server,
+                                                    (void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
+                            serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+                        } 
+                    } else
+                        serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+                    
+                }
+    }
+    //kill expired ones
+    for (i = 0 ; i < serverlist->maxupdates ; i++)
+        if (serverlist->updatelist[i].currentserver != NULL && current_time() - serverlist->updatelist[i].starttime > SERVER_TIMEOUT ) 
+        {
+            /* serverlist->CallBackFn(serverlist,  //do we want to notify of dead servers? if so, uncomment!
+                LIST_PROGRESS, 
+                serverlist->instance,
+                *(GServer *)serverlist->updatelist[i].currentserver,
+                (void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
+                */
+            serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
+        }
+
+    if (serverlist->abortupdate || (serverlist->nextupdate >= ArrayLength(serverlist->servers) && scount == 0)) 
+    { //we are done!!
+        FreeUpdateList(serverlist);
+        if (serverlist->abortupdate) {
+            ServerListModeChange(serverlist, sl_idle);
+            return 0;
+        }
+
+        if (serverlist->startslindex < ServerListGetNumMasters() || !ServerListHasFinishedFetchingList(serverlist)) {
+            ServerListModeChange(serverlist, sl_listxfer);
+        } else {
+            // No more masters
+            ServerListModeChange(serverlist, sl_idle);
+        }
+        return 0;
+    }
+
+    if (!ServerListHasFinishedFetchingList(serverlist) && current_time() < serverlist->lastsltime + SERVER_QUERY_MAX_PAUSE) {
+        // Make sure to not send out other queries if currently fetching from other lists
+        // to avoid overloading the network
+        return GE_BUSY;
+    }
 
-					if (!gsiSocketIsError(error)) //we got data
-					{
-						indata[error] = 0; //truncate and parse it
-						final = (strstr(indata,"\\final\\") != NULL);
-						server = serverlist->updatelist[i].currentserver;
-						if (server->ping == 9999) //set the ping
-							server->ping = (short)(current_time() - serverlist->updatelist[i].starttime);
-						ServerParseKeyVals(server, indata); 
-						if (final) //it's all done
-						{
-							serverlist->CallBackFn(serverlist, 
-													LIST_PROGRESS, 
-													serverlist->instance,
-													server,
-													(void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
-							serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-						} 
-					} else
-						serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-					
-				}
-	}
-	//kill expired ones
-	for (i = 0 ; i < serverlist->maxupdates ; i++)
-		if (serverlist->updatelist[i].currentserver != NULL && current_time() - serverlist->updatelist[i].starttime > SERVER_TIMEOUT ) 
-		{
-			/* serverlist->CallBackFn(serverlist,  //do we want to notify of dead servers? if so, uncomment!
-				LIST_PROGRESS, 
-				serverlist->instance,
-				*(GServer *)serverlist->updatelist[i].currentserver,
-				(void *)((serverlist->nextupdate * 100) / ArrayLength(serverlist->servers))); //percent done
-				*/
-			serverlist->updatelist[i].currentserver = NULL; //reuse the updatelist
-		}
-		
-	if (serverlist->abortupdate || (serverlist->nextupdate >= ArrayLength(serverlist->servers) && scount == 0)) 
-	{ //we are done!!
-		FreeUpdateList(serverlist);
-		ServerListModeChange(serverlist, sl_idle);
-		return 0;
-	}
-	
 //now, send out queries on available sockets
-	for (i = 0 ; i < serverlist->maxupdates && serverlist->nextupdate < ArrayLength(serverlist->servers) ; i++)
-		if (serverlist->updatelist[i].currentserver == NULL) //it's availalbe
-		{
-			server = *(GServer *)ArrayNth(serverlist->servers,serverlist->nextupdate);
-			serverlist->nextupdate++;
-			serverlist->updatelist[i].currentserver = server;
-			serverlist->updatelist[i].saddr.sin_family = AF_INET;
-			serverlist->updatelist[i].saddr.sin_addr.s_addr = inet_addr(ServerGetAddress(server));
-			serverlist->updatelist[i].saddr.sin_port = htons((short)ServerGetQueryPort(server));
-			sendto(serverlist->updatelist[i].s,querystrings[server->querytype] ,querylengths[server->querytype],0,(struct sockaddr *)&serverlist->updatelist[i].saddr,sizeof(struct sockaddr_in));
-			serverlist->updatelist[i].starttime = current_time();
-		}
+    for (i = 0 ; i < serverlist->maxupdates && serverlist->nextupdate < ArrayLength(serverlist->servers) ; i++)
+        if (serverlist->updatelist[i].currentserver == NULL) //it's availalbe
+        {
+            server = *(GServer *)ArrayNth(serverlist->servers,serverlist->nextupdate);
+            serverlist->nextupdate++;
+            serverlist->updatelist[i].currentserver = server;
+            serverlist->updatelist[i].saddr.sin_family = AF_INET;
+            serverlist->updatelist[i].saddr.sin_addr.s_addr = inet_addr(ServerGetAddress(server));
+            serverlist->updatelist[i].saddr.sin_port = htons((short)ServerGetQueryPort(server));
+            sendto(serverlist->updatelist[i].s,querystrings[server->querytype] ,querylengths[server->querytype],0,(struct sockaddr *)&serverlist->updatelist[i].saddr,sizeof(struct sockaddr_in));
+            serverlist->updatelist[i].starttime = current_time();
+        }
 
 
-	return 0;
+    return 0;
+}
+
+/* ServerListThinkSocket
+------------------
+For use with Async Updates. This needs to be called every ~10ms for list processing and
+updating to occur during async server list updates */
+GError ServerListThinkSocket(GServerList serverlist, GServerListSocket slsocket)
+{
+    GError socketerror;
+
+    if (slsocket->s == INVALID_SOCKET) {
+        return GE_NOSOCKET;
+    }
+
+    socketerror = ServerListCheckSocketError(serverlist, slsocket);
+    if (socketerror) {
+        return socketerror;
+    }
+
+    switch(slsocket->socketstate)
+    {
+        case ls_connecting:
+                ServerListStartQuery(serverlist, slsocket, 1);
+                break;
+        case ls_connected:
+                //read the data
+                return ServerListReadList(serverlist, slsocket);
+                break;
+        default:
+                break;
+    }
+
+    switch (serverlist->state)
+    {
+        case sl_idle: return 0;
+        case sl_listxfer:
+                 //read the data
+                //return ServerListReadList(serverlist, slsocket);
+                break;
+        case sl_lanlist:
+                return ServerListLANList(serverlist, slsocket);
+    }
+
+    return 0;
+}
+
+/* ServerListHasFinishedFetchingList
+------------------
+Whether or not the list has finished fetching */
+static gbool ServerListHasFinishedFetchingList(GServerList serverlist)
+{
+    int i;
+
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        if (serverlist->slsockets[i].s != INVALID_SOCKET) {
+            return 0;
+        }
+    }
+
+    return 1;
 }
 
 /* ServerListThink
@@ -706,24 +1166,32 @@ For use with Async Updates. This needs to be called every ~10ms for list process
 updating to occur during async server list updates */
 GError ServerListThink(GServerList serverlist)
 {
+    int i;
 
-	switch (serverlist->state)
-	{
-		case sl_idle: return 0;
-		case sl_listxfer:
-				 //read the data
-				return ServerListReadList(serverlist);
-				break;
-		case sl_lanlist:
-				return ServerListLANList(serverlist);
-		case sl_querying: 
-				//do some queries
-				return ServerListQueryLoop(serverlist);
-				break;
-	}
+    for(i = 0; i < serverlist->numslsockets; i++) {
+        ServerListThinkSocket(serverlist, &serverlist->slsockets[i]);
+    }
 
+    switch(serverlist->state)
+    {
+        case sl_idle:
+        case sl_listxfer:
+            if (!serverlist->abortupdate) {
+                if (serverlist->startslindex < ServerListGetNumMasters()) {
+                    CreateServerListForAvailableSockets(serverlist, serverlist->async);
+                } else if (serverlist->state == sl_listxfer && ServerListHasFinishedFetchingList(serverlist)) {
+                    ServerListModeChange(serverlist, sl_idle);
+                }
+            }
+            break;
+        case sl_querying: 
+            //do some queries
+            return ServerListQueryLoop(serverlist);
+        break;
+        default: break;
+    }
 
-	return 0;
+    return 0;
 }
 
 /* ServerListHalt
@@ -731,10 +1199,10 @@ GError ServerListThink(GServerList serverlist)
 Halts the current update batch */
 GError ServerListHalt(GServerList serverlist)
 {
-	if (serverlist->state != sl_idle)
-		serverlist->abortupdate = 1;
+    if (serverlist->state != sl_idle)
+        serverlist->abortupdate = 1;
 
-	return 0;
+    return 0;
 }
 
 /* ServerListClear
@@ -743,13 +1211,13 @@ Clear and free all of the servers from the server list.
 List must be in the sl_idle state */
 GError ServerListClear(GServerList serverlist)
 {
-	
-	if (serverlist->state != sl_idle)
-		return GE_BUSY;
-	//fastest way to clear is kill and recreate
-	ArrayFree(serverlist->servers);
-	serverlist->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
-	return 0;
+    
+    if (serverlist->state != sl_idle)
+        return GE_BUSY;
+    //fastest way to clear is kill and recreate
+    ArrayFree(serverlist->servers);
+    serverlist->servers = ArrayNew(sizeof(GServer), SERVER_GROWBY, ServerFree);
+    return 0;
 }
 
 /* ServerListState
@@ -757,7 +1225,7 @@ GError ServerListClear(GServerList serverlist)
 Returns the current state of the server list */
 GServerListState ServerListState(GServerList serverlist)
 {
-	return serverlist->state;
+    return serverlist->state;
 }
 
 /* ServerListErrorDesc
@@ -765,16 +1233,16 @@ GServerListState ServerListState(GServerList serverlist)
 Returns a static string description of the specified error */
 char *ServerListErrorDesc(GServerList serverlist, GError error)
 {
-	switch (error)
-	{
-	case GE_NOERROR: return "";
-	case GE_NOSOCKET: return "Unable to create socket";
-	case GE_NODNS: return "Unable to resolve master";
-	case GE_NOCONNECT: return "Connection to master reset";
-	case GE_BUSY: return "Server List is busy";
-	case GE_DATAERROR: return "Unexpected data in server list";
-	}
-	return "UNKNOWN ERROR CODE";
+    switch (error)
+    {
+    case GE_NOERROR: return "";
+    case GE_NOSOCKET: return "Unable to create socket";
+    case GE_NODNS: return "Unable to resolve master";
+    case GE_NOCONNECT: return "Connection to master reset";
+    case GE_BUSY: return "Server List is busy";
+    case GE_DATAERROR: return "Unexpected data in server list";
+    }
+    return "UNKNOWN ERROR CODE";
 
 }
 
@@ -783,9 +1251,9 @@ char *ServerListErrorDesc(GServerList serverlist, GError error)
 Returns the server at the specified index, or NULL if the index is out of bounds */
 GServer ServerListGetServer(GServerList serverlist, int index)
 {
-	if (index < 0 || index >= ArrayLength(serverlist->servers))
-		return NULL;
-	return *(GServer *)ArrayNth(serverlist->servers,index);
+    if (index < 0 || index >= ArrayLength(serverlist->servers))
+        return NULL;
+    return *(GServer *)ArrayNth(serverlist->servers,index);
 }
 
 /* ServerListCount
@@ -794,7 +1262,7 @@ Returns the number of servers on the specified list. Indexing is 0 based, so
 the actual server indexes are 0 <= valid index < Count */
 int ServerListCount(GServerList serverlist)
 {
-	return ArrayLength(serverlist->servers);
+    return ArrayLength(serverlist->servers);
 }
 
 /****
@@ -802,50 +1270,50 @@ Comparision Functions
 ***/
 static int IntKeyCompare(const void *entry1, const void *entry2)
 {
-	GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	int diff;
-	diff = ServerGetIntValue(server1, g_sortserverlist->sortkey, 0) - 
-			ServerGetIntValue(server2, g_sortserverlist->sortkey, 0);
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
-	
+    GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
+    int diff;
+    diff = ServerGetIntValue(server1, g_sortserverlist->sortkey, 0) - 
+            ServerGetIntValue(server2, g_sortserverlist->sortkey, 0);
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
+    
 }
 
 static int FloatKeyCompare(const void *entry1, const void *entry2)
 {
     GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	double f = ServerGetFloatValue(server1, g_sortserverlist->sortkey, 0) - 
-			ServerGetFloatValue(server2, g_sortserverlist->sortkey, 0);
-	if (!g_sortserverlist->sortascending) 
-		f = -f;
-	if ((float)f > (float)0.0) 
-		return 1;
-	else if ((float)f < (float)0.0) 
-		return -1; 
-	else 
-		return 0;
+    double f = ServerGetFloatValue(server1, g_sortserverlist->sortkey, 0) - 
+            ServerGetFloatValue(server2, g_sortserverlist->sortkey, 0);
+    if (!g_sortserverlist->sortascending) 
+        f = -f;
+    if ((float)f > (float)0.0) 
+        return 1;
+    else if ((float)f < (float)0.0) 
+        return -1; 
+    else 
+        return 0;
 }
 
 static int StrCaseKeyCompare(const void *entry1, const void *entry2)
 {
-	
+    
     GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
     int diff = strcmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
-				ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
+                ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
 }
 
 static int StrNoCaseKeyCompare(const void *entry1, const void *entry2)
 {
-	GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
-	int diff = strcasecmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
-				ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
-	if (!g_sortserverlist->sortascending) 
-		diff = -diff;
-	return diff;
+    GServer server1 = *(GServer *)entry1, server2 = *(GServer *)entry2;
+    int diff = strcasecmp(ServerGetStringValue(server1, g_sortserverlist->sortkey, ""),
+                ServerGetStringValue(server2, g_sortserverlist->sortkey, ""));
+    if (!g_sortserverlist->sortascending) 
+        diff = -diff;
+    return diff;
 }
 
 /* ServerListSort
@@ -855,22 +1323,22 @@ specified comparemode.
 sortkey can be a normal server key, or "ping" or "hostaddr" */
 void ServerListSort(GServerList serverlist, gbool ascending, char *sortkey, GCompareMode comparemode)
 {
-	ArrayCompareFn comparator;
-	switch (comparemode)
-	{
-	case cm_int: comparator = IntKeyCompare;
-		break;
-	case cm_float: comparator = FloatKeyCompare;
-		break;
-	case cm_strcase: comparator = StrCaseKeyCompare;
-		break;
-	case cm_stricase: comparator = StrNoCaseKeyCompare;
-		break;
-	}
-	serverlist->sortkey = sortkey;
-	serverlist->sortascending = ascending;
-	g_sortserverlist = serverlist;
-	ArraySort(serverlist->servers,comparator);
+    ArrayCompareFn comparator;
+    switch (comparemode)
+    {
+    case cm_int: comparator = IntKeyCompare;
+        break;
+    case cm_float: comparator = FloatKeyCompare;
+        break;
+    case cm_strcase: comparator = StrCaseKeyCompare;
+        break;
+    case cm_stricase: comparator = StrNoCaseKeyCompare;
+        break;
+    }
+    serverlist->sortkey = sortkey;
+    serverlist->sortascending = ascending;
+    g_sortserverlist = serverlist;
+    ArraySort(serverlist->servers,comparator);
 
 }
 
diff --git a/code/gamespy/gstats/gp_stats/gp_stats.rc b/code/gamespy/gstats/gp_stats/gp_stats.rc
index dee94b35..d0b03cff 100644
--- a/code/gamespy/gstats/gp_stats/gp_stats.rc
+++ b/code/gamespy/gstats/gp_stats/gp_stats.rc
@@ -90,7 +90,7 @@ BEGIN
     EDITTEXT        IDC_PASSWORD,65,50,110,12,ES_PASSWORD | ES_AUTOHSCROLL
     EDITTEXT        IDC_PROFILE_ID,65,65,110,12,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "Authenticate",IDC_AUTHENTICATE,35,85,50,14
-    GROUPBOX        "Persistant Data",IDC_STATIC,10,115,175,140
+    GROUPBOX        "Persistent Data",IDC_STATIC,10,115,175,140
     CONTROL         "Private Read/Write",IDC_PRIVATE_RW,"Button",
                     BS_AUTORADIOBUTTON | WS_GROUP,20,130,77,10
     CONTROL         "Private Read-Only",IDC_PRIVATE_RO,"Button",
diff --git a/code/gamespy/gutil.c b/code/gamespy/gutil.c
index 698aa946..136c2c77 100644
--- a/code/gamespy/gutil.c
+++ b/code/gamespy/gutil.c
@@ -18,68 +18,68 @@ typedef unsigned char uchar;
 
 static void swap_byte(uchar* a, uchar* b)
 {
-	uchar swapByte;
+    uchar swapByte;
 
-	swapByte = *a;
-	*a = *b;
-	*b = swapByte;
+    swapByte = *a;
+    *a = *b;
+    *b = swapByte;
 }
 
 static uchar encode_ct(uchar c)
 {
-	if (c < 26) return (uchar)('A' + c);
-	if (c < 52) return (uchar)('a' + c - 26);
-	if (c < 62) return (uchar)('0' + c - 52);
-	if (c == 62) return (uchar)('+');
-	if (c == 63) return (uchar)('/');
+    if (c < 26) return (uchar)('A' + c);
+    if (c < 52) return (uchar)('a' + c - 26);
+    if (c < 62) return (uchar)('0' + c - 52);
+    if (c == 62) return (uchar)('+');
+    if (c == 63) return (uchar)('/');
 
-	return 0;
+    return 0;
 }
 
 void gs_encode(uchar* ins, int size, uchar* result)
 {
-	int    i, pos;
-	uchar  trip[3];
-	uchar  kwart[4];
+    int    i, pos;
+    uchar  trip[3];
+    uchar  kwart[4];
 
-	i = 0;
-	while (i < size)
-	{
-		for (pos = 0; pos <= 2; pos++, i++)
-			if (i < size) trip[pos] = *ins++;
-			else trip[pos] = '\0';
-		kwart[0] = (unsigned char)((trip[0]) >> 2);
-		kwart[1] = (unsigned char)((((trip[0]) & 3) << 4) + ((trip[1]) >> 4));
-		kwart[2] = (unsigned char)((((trip[1]) & 15) << 2) + ((trip[2]) >> 6));
-		kwart[3] = (unsigned char)((trip[2]) & 63);
-		for (pos = 0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
-	}
-	*result = '\0';
+    i = 0;
+    while (i < size)
+    {
+        for (pos = 0; pos <= 2; pos++, i++)
+            if (i < size) trip[pos] = *ins++;
+            else trip[pos] = '\0';
+        kwart[0] = (unsigned char)((trip[0]) >> 2);
+        kwart[1] = (unsigned char)((((trip[0]) & 3) << 4) + ((trip[1]) >> 4));
+        kwart[2] = (unsigned char)((((trip[1]) & 15) << 2) + ((trip[2]) >> 6));
+        kwart[3] = (unsigned char)((trip[2]) & 63);
+        for (pos = 0; pos <= 3; pos++) *result++ = encode_ct(kwart[pos]);
+    }
+    *result = '\0';
 }
 
 void gs_encrypt(uchar* key, int key_len, uchar* buffer_ptr, int buffer_len)
 {
-	int counter;
-	uchar x, y, xorIndex;
-	uchar state[256];
+    int counter;
+    uchar x, y, xorIndex;
+    uchar state[256];
 
-	for (counter = 0; counter < 256; counter++) state[counter] = (uchar)counter;
+    for (counter = 0; counter < 256; counter++) state[counter] = (uchar)counter;
 
-	x = 0; y = 0;
-	for (counter = 0; counter < 256; counter++)
-	{
-		y = (uchar)((key[x] + state[counter] + y) % 256);
-		x = (uchar)((x + 1) % key_len);
-		swap_byte(&state[counter], &state[y]);
-	}
+    x = 0; y = 0;
+    for (counter = 0; counter < 256; counter++)
+    {
+        y = (uchar)((key[x] + state[counter] + y) % 256);
+        x = (uchar)((x + 1) % key_len);
+        swap_byte(&state[counter], &state[y]);
+    }
 
-	x = 0; y = 0;
-	for (counter = 0; counter < buffer_len; counter++)
-	{
-		x = (uchar)((x + buffer_ptr[counter] + 1) % 256);
-		y = (uchar)((state[x] + y) % 256);
-		swap_byte(&state[x], &state[y]);
-		xorIndex = (uchar)((state[x] + state[y]) % 256);
-		buffer_ptr[counter] ^= state[xorIndex];
-	}
+    x = 0; y = 0;
+    for (counter = 0; counter < buffer_len; counter++)
+    {
+        x = (uchar)((x + buffer_ptr[counter] + 1) % 256);
+        y = (uchar)((state[x] + y) % 256);
+        swap_byte(&state[x], &state[y]);
+        xorIndex = (uchar)((state[x] + state[y]) % 256);
+        buffer_ptr[counter] ^= state[xorIndex];
+    }
 }
diff --git a/code/gamespy/gutil.h b/code/gamespy/gutil.h
index b35d0f6c..f1889513 100644
--- a/code/gamespy/gutil.h
+++ b/code/gamespy/gutil.h
@@ -27,7 +27,7 @@ size: size of the buffer
 OUT
 ---  
 result: pointer to buffer to store result. Size should be (4 * size) / 3 + 1
-	result will be null terminated.
+    result will be null terminated.
 **********/
 void gs_encode(uchar* ins, int size, uchar* result);
 
diff --git a/code/gamespy/hashtable.c b/code/gamespy/hashtable.c
index 9313e503..84ad6275 100644
--- a/code/gamespy/hashtable.c
+++ b/code/gamespy/hashtable.c
@@ -22,208 +22,208 @@
 
 
 #ifdef _NO_NOPORT_H_
-	#define gsimalloc malloc
-	#define gsifree free
-	#define gsirealloc realloc
-	#include <assert.h>
+    #define gsimalloc malloc
+    #define gsifree free
+    #define gsirealloc realloc
+    #include <assert.h>
 #else
-	#include "nonport.h" //for gsimalloc/realloc/free/assert
+    #include "nonport.h" //for gsimalloc/realloc/free/assert
 #endif
 
 
 struct HashImplementation 
 {
-	DArray *buckets;
-	int nbuckets;
-	TableElementFreeFn freefn;
-	TableHashFn hashfn;
-	TableCompareFn compfn;
+    DArray *buckets;
+    int nbuckets;
+    TableElementFreeFn freefn;
+    TableHashFn hashfn;
+    TableCompareFn compfn;
 };
 
 HashTable TableNew(int elemSize, int nBuckets, 
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn)
+                      TableElementFreeFn freeFn)
 {
-	return TableNew2(elemSize, nBuckets, 4, hashFn, compFn, freeFn);
+    return TableNew2(elemSize, nBuckets, 4, hashFn, compFn, freeFn);
 }
 HashTable TableNew2(int elemSize, int nBuckets, int nChains,
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn)
+                      TableElementFreeFn freeFn)
 {
-	HashTable table;
-	int i;
+    HashTable table;
+    int i;
 
-	assert(hashFn);
-	assert(compFn);
-	assert(elemSize);
-	assert(nBuckets);
+    assert(hashFn);
+    assert(compFn);
+    assert(elemSize);
+    assert(nBuckets);
 
-	table = (HashTable)gsimalloc(sizeof(struct HashImplementation));
-	assert(table);
-	
-	table->buckets = (DArray *)gsimalloc(nBuckets * sizeof(DArray));
-	assert(table->buckets);
-	for (i = 0; i < nBuckets; i++) //ArrayNew will assert if allocation fails
-		table->buckets[i] = ArrayNew(elemSize, nChains, freeFn);
-	table->nbuckets = nBuckets;
-	table->freefn = freeFn;
-	table->compfn = compFn;
-	table->hashfn = hashFn;
+    table = (HashTable)gsimalloc(sizeof(struct HashImplementation));
+    assert(table);
+    
+    table->buckets = (DArray *)gsimalloc(nBuckets * sizeof(DArray));
+    assert(table->buckets);
+    for (i = 0; i < nBuckets; i++) //ArrayNew will assert if allocation fails
+        table->buckets[i] = ArrayNew(elemSize, nChains, freeFn);
+    table->nbuckets = nBuckets;
+    table->freefn = freeFn;
+    table->compfn = compFn;
+    table->hashfn = hashFn;
 
-	return table;
+    return table;
 }
 
 
 void TableFree(HashTable table)
 {
-	int i;
-	
-	assert(table);
+    int i;
+    
+    assert(table);
 
-	if (NULL == table )
-		return;
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayFree(table->buckets[i]);
-	gsifree(table->buckets);
-	gsifree(table);
+    if (NULL == table )
+        return;
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayFree(table->buckets[i]);
+    gsifree(table->buckets);
+    gsifree(table);
 }
 
 
 int TableCount(HashTable table)
 {
-	int i, count = 0;
-	
-	assert(table);
+    int i, count = 0;
+    
+    assert(table);
 
-	if (NULL == table )
-		return count;
+    if (NULL == table )
+        return count;
 
-	for (i = 0 ; i < table->nbuckets ; i++)
-		count += ArrayLength(table->buckets[i]);
-	
-	return count;
+    for (i = 0 ; i < table->nbuckets ; i++)
+        count += ArrayLength(table->buckets[i]);
+    
+    return count;
 }
 
 
 void TableEnter(HashTable table, const void *newElem)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return;
+    if (NULL == table )
+        return;
 
-	hash = table->hashfn(newElem, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], newElem, table->compfn, 0,0);
-	if (itempos == NOT_FOUND)
-		ArrayAppend(table->buckets[hash], newElem);
-	else
-		ArrayReplaceAt(table->buckets[hash], newElem, itempos);
+    hash = table->hashfn(newElem, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], newElem, table->compfn, 0,0);
+    if (itempos == NOT_FOUND)
+        ArrayAppend(table->buckets[hash], newElem);
+    else
+        ArrayReplaceAt(table->buckets[hash], newElem, itempos);
 }
 
 int TableRemove(HashTable table, const void *delElem)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return 0;
+    if (NULL == table )
+        return 0;
 
-	hash = table->hashfn(delElem, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], delElem, table->compfn, 0,0);
-	if (itempos == NOT_FOUND)
-		return 0;
-	else
-		ArrayDeleteAt(table->buckets[hash], itempos);
-	return 1;
+    hash = table->hashfn(delElem, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], delElem, table->compfn, 0,0);
+    if (itempos == NOT_FOUND)
+        return 0;
+    else
+        ArrayDeleteAt(table->buckets[hash], itempos);
+    return 1;
 }
 
 void *TableLookup(HashTable table, const void *elemKey)
 {
-	int hash, itempos;
-	
-	assert(table);
+    int hash, itempos;
+    
+    assert(table);
 
-	if (NULL == table )
-		return NULL;
+    if (NULL == table )
+        return NULL;
 
-	hash = table->hashfn(elemKey, table->nbuckets);
-	itempos = ArraySearch(table->buckets[hash], elemKey, table->compfn, 0,
-						  0);
-	if (itempos == NOT_FOUND)
-		return NULL;
-	else
-		return ArrayNth(table->buckets[hash], itempos);
+    hash = table->hashfn(elemKey, table->nbuckets);
+    itempos = ArraySearch(table->buckets[hash], elemKey, table->compfn, 0,
+                          0);
+    if (itempos == NOT_FOUND)
+        return NULL;
+    else
+        return ArrayNth(table->buckets[hash], itempos);
 }
 
 
 void TableMap(HashTable table, TableMapFn fn, void *clientData)
 {
-	int i;
-	
-	assert(table);
-	assert(fn);
+    int i;
+    
+    assert(table);
+    assert(fn);
 
-	if (NULL == table || NULL == fn)
-		return;
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayMap(table->buckets[i], fn, clientData);
-	
+    if (NULL == table || NULL == fn)
+        return;
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayMap(table->buckets[i], fn, clientData);
+    
 }
 
 void TableMapSafe(HashTable table, TableMapFn fn, void *clientData)
 {
-	int i;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayMapBackwards(table->buckets[i], fn, clientData);
-	
+    int i;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayMapBackwards(table->buckets[i], fn, clientData);
+    
 }
 
 void * TableMap2(HashTable table, TableMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-	{
-		pcurr = ArrayMap2(table->buckets[i], fn, clientData);
-		if(pcurr)
-			return pcurr;
-	}
+    int i;
+    void * pcurr;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+    {
+        pcurr = ArrayMap2(table->buckets[i], fn, clientData);
+        if(pcurr)
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void * TableMapSafe2(HashTable table, TableMapFn2 fn, void *clientData)
 {
-	int i;
-	void * pcurr;
-	
-	assert(fn);
-	
-	for (i = 0 ; i < table->nbuckets ; i++)
-	{
-		pcurr = ArrayMapBackwards2(table->buckets[i], fn, clientData);
-		if(pcurr)
-			return pcurr;
-	}
+    int i;
+    void * pcurr;
+    
+    assert(fn);
+    
+    for (i = 0 ; i < table->nbuckets ; i++)
+    {
+        pcurr = ArrayMapBackwards2(table->buckets[i], fn, clientData);
+        if(pcurr)
+            return pcurr;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 void TableClear(HashTable table)
 {
-	int i;
+    int i;
 
-	for (i = 0 ; i < table->nbuckets ; i++)
-		ArrayClear(table->buckets[i]);
+    for (i = 0 ; i < table->nbuckets ; i++)
+        ArrayClear(table->buckets[i]);
 }
diff --git a/code/gamespy/hashtable.h b/code/gamespy/hashtable.h
index d6c8a4a3..fa00c2ec 100644
--- a/code/gamespy/hashtable.h
+++ b/code/gamespy/hashtable.h
@@ -126,11 +126,11 @@ extern "C" {
 
 HashTable TableNew(int elemSize, int nBuckets, 
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn);
+                      TableElementFreeFn freeFn);
 
 HashTable TableNew2(int elemSize, int nBuckets, int nChains,
                    TableHashFn hashFn, TableCompareFn compFn, 
- 					 TableElementFreeFn freeFn);
+                      TableElementFreeFn freeFn);
 
 
  /* TableFree
diff --git a/code/gamespy/md5.h b/code/gamespy/md5.h
index 0fccee0c..0d324291 100644
--- a/code/gamespy/md5.h
+++ b/code/gamespy/md5.h
@@ -38,7 +38,7 @@ The following makes PROTOTYPES default to 0 if it has not already
 #ifdef __cplusplus
 extern "C" {
 #endif
-	
+    
 #ifndef PROTOTYPES
 #define PROTOTYPES 1
 #endif
diff --git a/code/gamespy/md5c.c b/code/gamespy/md5c.c
index de31fc6a..8383e62f 100644
--- a/code/gamespy/md5c.c
+++ b/code/gamespy/md5c.c
@@ -305,7 +305,7 @@ static void Decode (UINT4 *output, unsigned char *input, unsigned int len)
  */
 static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
 {
-	memcpy(output, input, len);
+    memcpy(output, input, len);
 /*  unsigned int i;
   
   for (i = 0; i < len; i++)
@@ -316,7 +316,7 @@ static void MD5_memcpy (POINTER output, POINTER input, unsigned int len)
  */
 static void MD5_memset (POINTER output, int value, unsigned int len)
 {
-	memset(output, value, len);
+    memset(output, value, len);
  /* unsigned int i;
   
   for (i = 0; i < len; i++)
@@ -327,26 +327,26 @@ static void MD5_memset (POINTER output, int value, unsigned int len)
 
 void MD5Print (unsigned char digest[16], char output[33])
 {
-	static const char hex_digits[] = "0123456789abcdef";
-	unsigned int i;
+    static const char hex_digits[] = "0123456789abcdef";
+    unsigned int i;
 
-	for (i = 0; i < 16; i++)
-	{
-		output[i*2  ] = hex_digits[digest[i] / 16];
-		output[i*2+1] = hex_digits[digest[i] % 16];
-	}
-	output[32] = '\0';
+    for (i = 0; i < 16; i++)
+    {
+        output[i*2  ] = hex_digits[digest[i] / 16];
+        output[i*2+1] = hex_digits[digest[i] % 16];
+    }
+    output[32] = '\0';
 }
 
 void MD5Digest (unsigned char *input, unsigned int len, char output[33])
 {
-	MD5_CTX ctx;
-	unsigned char digest[16];
+    MD5_CTX ctx;
+    unsigned char digest[16];
 
-	MD5Init(&ctx);
-	MD5Update(&ctx, input, len);
-	MD5Final(digest, &ctx);
-	MD5Print(digest, output);
+    MD5Init(&ctx);
+    MD5Update(&ctx, input, len);
+    MD5Final(digest, &ctx);
+    MD5Print(digest, output);
 
 }
 #ifdef __cplusplus
diff --git a/code/gamespy/q_gamespy.c b/code/gamespy/q_gamespy.c
new file mode 100644
index 00000000..69d98981
--- /dev/null
+++ b/code/gamespy/q_gamespy.c
@@ -0,0 +1,170 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "q_gamespy.h"
+#include "../qcommon/qcommon.h"
+#include "cl_gamespy.h"
+#include "sv_gamespy.h"
+
+#define MAX_MASTERS           8
+#define MASTER_DEFAULT_MSPORT 28900
+#define MASTER_DEFAULT_HBPORT 27900
+
+cvar_t *com_master_host[MAX_MASTERS];
+cvar_t *com_master_msport[MAX_MASTERS];
+cvar_t *com_master_hbport[MAX_MASTERS];
+
+master_entry_t entries[MAX_MASTERS];
+int            num_entries = 0;
+
+static void Com_RestartGameSpy_f(void);
+
+static qboolean ShouldRefreshMasters()
+{
+    int i;
+
+    for (i = 0; i < MAX_MASTERS; i++) {
+        if (com_master_host[i] && com_master_host[i]->latchedString) {
+            return qtrue;
+        }
+        if (com_master_msport[i] && com_master_msport[i]->latchedString) {
+            return qtrue;
+        }
+        if (com_master_hbport[i] && com_master_hbport[i]->latchedString) {
+            return qtrue;
+        }
+    }
+
+    return qfalse;
+}
+
+static void CreateMasterVar(int index, const char *host, int msport, int hbport)
+{
+    assert(index < MAX_MASTERS);
+
+    //
+    // These variables should be modified for testing purposes only.
+    // So prevent them to be saved in the configuration file.
+    //
+    com_master_host[index]   = Cvar_Get(va("com_master%d_host", index), host, CVAR_LATCH | CVAR_TEMP);
+    com_master_msport[index] = Cvar_Get(va("com_master%d_msport", index), va("%d", msport), CVAR_LATCH | CVAR_TEMP);
+    com_master_hbport[index] = Cvar_Get(va("com_master%d_hbport", index), va("%d", hbport), CVAR_LATCH | CVAR_TEMP);
+
+    com_master_host[index]->flags &= ~CVAR_ARCHIVE;
+    com_master_msport[index]->flags &= ~CVAR_ARCHIVE;
+    com_master_hbport[index]->flags &= ~CVAR_ARCHIVE;
+}
+
+qboolean Com_RefreshGameSpyMasters()
+{
+    int      msIndex = 0;
+    int      i;
+    qboolean shouldRestart;
+
+    shouldRestart = ShouldRefreshMasters();
+
+    //
+    // These masters come from the 333networks community and use the same software
+    // that emulate the GameSpy protocol -- see https://333networks.com/
+    // They are managed by different entities, are independent and sync with eachother.
+    //
+    CreateMasterVar(msIndex++, "master.333networks.com", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.errorist.eu", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.noccer.de", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master-au.unrealarchive.org", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    CreateMasterVar(msIndex++, "master.frag-net.com", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+
+    for (; msIndex < MAX_MASTERS; msIndex++) {
+        CreateMasterVar(msIndex, "", MASTER_DEFAULT_MSPORT, MASTER_DEFAULT_HBPORT);
+    }
+
+    num_entries = 0;
+
+    //
+    // Find and insert valid entries
+    //
+    for (i = 0; i < MAX_MASTER_SERVERS; i++) {
+        master_entry_t *entry = &entries[num_entries];
+
+        if (com_master_host[i]->string && com_master_host[i]->string[0]) {
+            entry->host      = com_master_host[i]->string;
+            entry->queryport = com_master_msport[i]->integer;
+            entry->hbport    = com_master_hbport[i]->integer;
+            num_entries++;
+        }
+    }
+
+    return shouldRestart;
+}
+
+void Com_InitGameSpy()
+{
+    Com_RefreshGameSpyMasters();
+
+    Cmd_AddCommand("net_gamespy_restart", Com_RestartGameSpy_f);
+}
+
+static void Com_RestartGameSpy_f(void)
+{
+    Com_RefreshGameSpyMasters();
+
+#ifndef DEDICATED
+    CL_RestartGamespy_f();
+#endif
+    SV_RestartGamespy_f();
+}
+
+unsigned int Com_GetNumMasterEntries()
+{
+    return num_entries;
+}
+
+void Com_GetMasterEntry(int index, master_entry_t *entry)
+{
+    if (index >= num_entries) {
+        entry->host      = NULL;
+        entry->hbport    = 0;
+        entry->queryport = 0;
+        return;
+    }
+
+    entry->host      = com_master_host[index]->string;
+    entry->queryport = com_master_msport[index]->integer;
+    entry->hbport    = com_master_hbport[index]->integer;
+}
+
+const char *Com_GetMasterHost()
+{
+    return com_master_host[0]->string;
+}
+
+int Com_GetMasterQueryPort()
+{
+    return com_master_msport[0]->integer;
+}
+
+int Com_GetMasterHeartbeatPort()
+{
+    return com_master_hbport[0]->integer;
+}
diff --git a/code/gamespy/q_gamespy.h b/code/gamespy/q_gamespy.h
new file mode 100644
index 00000000..a60baa3e
--- /dev/null
+++ b/code/gamespy/q_gamespy.h
@@ -0,0 +1,42 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// q_gamespy.h -- Common game-specific GameSpy code shared between client and server
+
+#pragma once
+
+#include "../qcommon/q_shared.h"
+
+typedef struct {
+    const char *host;
+    int queryport;
+    int hbport;
+} master_entry_t;
+
+void Com_InitGameSpy();
+qboolean Com_RefreshGameSpyMasters();
+
+unsigned int Com_GetNumMasterEntries();
+void Com_GetMasterEntry(int index, master_entry_t* entry);
+const char *Com_GetMasterHost();
+int Com_GetMasterQueryPort();
+int Com_GetMasterHeartbeatPort();
diff --git a/code/gamespy/sc/sciInterface.c b/code/gamespy/sc/sciInterface.c
index 1bf05252..f572337c 100644
--- a/code/gamespy/sc/sciInterface.c
+++ b/code/gamespy/sc/sciInterface.c
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-// This is declared as an extern so it can be overriden when testing
+// This is declared as an extern so it can be overridden when testing
 #define SC_SERVICE_URL_FORMAT   "http://%s.comp.pubsvs." GSI_DOMAIN_NAME "/CompetitionService/CompetitionService.asmx"
 char scServiceURL[SC_SERVICE_MAX_URL_LEN] = "";
 
diff --git a/code/gamespy/sv_gamespy.c b/code/gamespy/sv_gamespy.c
index 61055699..6f2cc451 100644
--- a/code/gamespy/sv_gamespy.c
+++ b/code/gamespy/sv_gamespy.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,36 +22,74 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_shared.h"
 #include "../server/server.h"
+#include "../qcommon/q_version.h"
 #include "sv_gqueryreporting.h"
 #include "sv_gamespy.h"
+#include "q_gamespy.h"
 
 #include "gcdkey/gcdkeys.h"
+#include "common/gsCommon.h"
+#include "common/gsAvailable.h"
 
-static char     gamemode[128];
-static qboolean gcdInitialized = qfalse;
+static char        gamemode[128];
+static qboolean    gcdInitialized = qfalse;
+static qboolean    gcdValid       = qfalse;
+static qboolean    gsRunning      = qfalse;
+extern GSIACResult __GSIACResult;
 
-static const char *SECRET_GS_KEYS[] = {"M5Fdwc", "h2P1c9", "y32FDc"};
+cvar_t *net_ip           = NULL;
+cvar_t *net_gamespy_port = NULL;
 
-static const unsigned int GCD_GAME_IDS[] = {
+static const char *SECRET_GS_KEYS[] =
+{
+    "M5Fdwc",
+    "h2P1c9",
+    "y32FDc"
+};
+
+static const unsigned int GCD_GAME_IDS[] =
+{
     0,
     641,
     802,
 };
 
-static const char *GS_GAME_NAME[] = {"mohaa", "mohaas", "mohaab"};
+static const char *GS_GAME_NAME[] =
+{
+    "mohaa",
+    "mohaas",
+    "mohaab"
+};
+
+static const char *GS_GAME_NAME_DEMO[] =
+{
+    "mohaa",
+    "mohaas",
+    "mohaabd"
+};
+
+static const char *GS_GAME_VERSION[] =
+{
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    TARGET_GAME_VERSION_MOHTT "+" PRODUCT_VERSION,
+};
+
+static const char* GS_GAME_VERSION_DEMO[] =
+{
+    TARGET_GAME_VERSION_MOH "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTA "+" PRODUCT_VERSION,
+    "d" TARGET_GAME_VERSION_MOHTT_DEMO "+" PRODUCT_VERSION,
+};
 
 static const unsigned int GAMESPY_DEFAULT_PORT = 12300;
 
-void qr_send_statechanged(qr_t qrec);
-void qr_shutdown(qr_t qrec);
-void qr_process_queries(qr_t qrec);
-
 int qr_init(
     qr_t              *qrec,
-    const char         *ip,
+    const char        *ip,
     int                baseport,
-    const char         *gamename,
-    const char         *secret_key,
+    const char        *gamename,
+    const char        *secret_key,
     qr_querycallback_t qr_basic_callback,
     qr_querycallback_t qr_info_callback,
     qr_querycallback_t qr_rules_callback,
@@ -59,30 +97,54 @@ int qr_init(
     void              *userdata
 );
 
-const char* GS_GetGameKey(unsigned int index) {
+const char *GS_GetGameKey(unsigned int index)
+{
     return SECRET_GS_KEYS[index];
 }
 
-const char* GS_GetCurrentGameKey() {
+const char *GS_GetCurrentGameKey()
+{
     return GS_GetGameKey(com_target_game->integer);
 }
 
-unsigned int GS_GetGameID(unsigned int index) {
+unsigned int GS_GetGameID(unsigned int index)
+{
     return GCD_GAME_IDS[index];
 }
 
-unsigned int GS_GetCurrentGameID() {
+unsigned int GS_GetCurrentGameID()
+{
     return GS_GetGameID(com_target_game->integer);
 }
 
-const char* GS_GetGameName(unsigned int index) {
-    return GS_GAME_NAME[index];
+const char *GS_GetGameName(unsigned int index)
+{
+    if (!com_target_demo->integer) {
+        return GS_GAME_NAME[index];
+    } else {
+        return GS_GAME_NAME_DEMO[index];
+    }
 }
 
-const char* GS_GetCurrentGameName() {
+const char *GS_GetCurrentGameName()
+{
     return GS_GetGameName(com_target_game->integer);
 }
 
+const char *GS_GetGameVersion(unsigned int index)
+{
+    if (!com_target_demo->integer) {
+        return GS_GAME_VERSION[index];
+    } else {
+        return GS_GAME_VERSION_DEMO[index];
+    }
+}
+
+const char *GS_GetCurrentGameVersion()
+{
+    return GS_GetGameVersion(com_target_game->integer);
+}
+
 static const char *ConvertMapFilename(const char *mapname)
 {
     static char converted[1024];
@@ -98,21 +160,8 @@ static const char *ConvertMapFilename(const char *mapname)
 
 static void basic_callback(char *outbuf, int maxlen, void *userdata)
 {
-    switch (com_target_game->integer) {
-    case TG_MOH:
-        Info_SetValueForKey(outbuf, "gamename", TARGET_GAME_NAME_MOH);
-        Info_SetValueForKey(outbuf, "gamever", TARGET_GAME_VERSION_MOH);
-        break;
-    case TG_MOHTA:
-        Info_SetValueForKey(outbuf, "gamename", TARGET_GAME_NAME_MOHTA);
-        Info_SetValueForKey(outbuf, "gamever", TARGET_GAME_VERSION_MOHTA);
-        break;
-    case TG_MOHTT:
-        Info_SetValueForKey(outbuf, "gamename", TARGET_GAME_NAME_MOH);
-        Info_SetValueForKey(outbuf, "gamever", TARGET_GAME_VERSION_MOHTT);
-        break;
-    }
-
+    Info_SetValueForKey(outbuf, "gamename", GS_GetCurrentGameName());
+    Info_SetValueForKey(outbuf, "gamever", GS_GetCurrentGameVersion());
     Info_SetValueForKey(outbuf, "location", va("%i", sv_location->integer));
 
     if (sv_debug_gamespy->integer) {
@@ -127,7 +176,7 @@ static void info_callback(char *outbuf, int maxlen, void *userdata)
 
     infostring[0] = 0;
     Info_SetValueForKey(infostring, "hostname", sv_hostname->string);
-    Info_SetValueForKey(infostring, "hostport", Cvar_Get("net_port", "12203", 32)->string);
+    Info_SetValueForKey(infostring, "hostport", Cvar_Get("net_port", "12203", CVAR_LATCH)->string);
     Info_SetValueForKey(infostring, "mapname", ConvertMapFilename(svs.mapName));
     Info_SetValueForKey(infostring, "gametype", g_gametypestring->string);
     Info_SetValueForKey(infostring, "numplayers", va("%i", SV_NumClients()));
@@ -138,7 +187,7 @@ static void info_callback(char *outbuf, int maxlen, void *userdata)
     Info_SetValueForKey(infostring, "sprinton", Cvar_Get("sv_sprinton", "1", 0)->string);
     Info_SetValueForKey(infostring, "realism", Cvar_Get("g_realismmode", "0", 0)->string);
     Info_SetValueForKey(infostring, "pure", va("%i", sv_pure->integer));
-    if ((Cvar_VariableIntegerValue("dmflags") & 0x40000) != 0) {
+    if ((Cvar_VariableIntegerValue("dmflags") & DF_ALLOW_LEAN_MOVEMENT) != 0) {
         allowlean = 1;
     }
 
@@ -173,39 +222,60 @@ static void rules_callback(char *outbuf, int maxlen, void *userdata)
 
 static void players_callback(char *outbuf, int maxlen, void *userdata)
 {
-    int    i;
-    char   infostring[128];
-    size_t infolen;
-    size_t currlen = 0;
+    client_t      *cl;
+    playerState_t *ps;
+    size_t         infolen;
+    size_t         currlen = 0;
+    int            i;
+    int            index;
+    char           infostring[128];
 
-    for (i = 0; i < svs.iNumClients; i++) {
-        playerState_t *ps = SV_GameClientNum(i);
+    outbuf[0] = 0;
 
-        Com_sprintf(
+    if (!svs.clients) {
+        return;
+    }
+
+    for (i = 0, index = 0; i < svs.iNumClients; i++) {
+        cl = &svs.clients[i];
+
+        if (cl->state == CS_FREE) {
+            // ignore inactive clients
+            continue;
+        }
+
+        ps = SV_GameClientNum(i);
+
+        infolen = Com_sprintf(
             infostring,
-            128,
+            sizeof(infostring),
             "\\player_%d\\%s\\frags_%d\\%d\\deaths_%d\\%d\\ping_%d\\%d",
-            i,
-            svs.clients[i].name,
-            i,
+            index,
+            cl->name,
+            index,
             ps->stats[STAT_KILLS],
-            i,
+            index,
             ps->stats[STAT_DEATHS],
-            i,
-            svs.clients[i].ping
+            index,
+            cl->ping
         );
 
-        infolen = strlen(infostring);
         if (currlen + infolen < maxlen) {
             strcat(outbuf, infostring);
             currlen += infolen;
         }
+
+        //
+        // Fixed in OPM
+        //  Some programs enumerate by testing indexes, and stop iterating if the index doesn't exist
+        //
+        index++;
     }
 }
 
 void SV_GamespyHeartbeat()
 {
-    if (!g_gametype->integer || !sv_gamespy->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER || !sv_gamespy->integer) {
         return;
     }
 
@@ -218,17 +288,27 @@ void SV_GamespyHeartbeat()
 
 void SV_ProcessGamespyQueries()
 {
-    if (!g_gametype->integer || !sv_gamespy->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER || !sv_gamespy->integer) {
         return;
     }
 
     qr_process_queries(NULL);
-    gcd_think();
+
+    if (gcdValid) {
+        // in case the game supports gcd
+        gcd_think();
+    }
 }
 
 void SV_ShutdownGamespy()
 {
-    if (!g_gametype->integer || !sv_gamespy->integer) {
+    if (g_gametype->integer == GT_SINGLE_PLAYER || !sv_gamespy->integer) {
+        return;
+    }
+
+    if (!gsRunning) {
+        // Added in OPM
+        //  Gamespy is not running
         return;
     }
 
@@ -236,17 +316,17 @@ void SV_ShutdownGamespy()
 
     if (gcdInitialized) {
         gcd_shutdown();
-        gcdInitialized = 0;
+        gcdInitialized = qfalse;
     }
 
     qr_send_statechanged(NULL);
     qr_shutdown(NULL);
+
+    gsRunning = qfalse;
 }
 
 qboolean SV_InitGamespy()
 {
-    cvar_t     *net_ip;
-    cvar_t     *net_gamespy_port;
     char        secret_key[9];
     const char *secret_gs_key;
     const char *gs_game_name;
@@ -257,15 +337,15 @@ qboolean SV_InitGamespy()
         return qfalse;
     }
 
-    secret_gs_key = SECRET_GS_KEYS[com_target_game->integer];
-    gcd_game_id   = GCD_GAME_IDS[com_target_game->integer];
-    gs_game_name  = GS_GAME_NAME[com_target_game->integer];
+    secret_gs_key = GS_GetCurrentGameKey();
+    gcd_game_id   = GS_GetCurrentGameID();
+    gs_game_name  = GS_GetCurrentGameName();
 
     sv_debug_gamespy = Cvar_Get("sv_debuggamespy", "0", 0);
     sv_location      = Cvar_Get("sv_location", "1", CVAR_ARCHIVE);
     sv_gamespy       = Cvar_Get("sv_gamespy", "1", CVAR_LATCH);
 
-    if (!sv_gamespy->integer || !g_gametype->integer) {
+    if (!sv_gamespy->integer || g_gametype->integer == GT_SINGLE_PLAYER) {
         return qfalse;
     }
 
@@ -296,13 +376,196 @@ qboolean SV_InitGamespy()
         qr_send_statechanged(NULL);
     }
 
+    // this will set the GSI as available for cdkey authorization
+    __GSIACResult = GSIACAvailable;
+
     if (!gcdInitialized) {
         if (gcd_game_id) {
             gcd_init(gcd_game_id);
+            gcdValid = qtrue;
         }
 
-        gcdInitialized = 1;
+        gcdInitialized = qtrue;
     }
 
+    gsRunning = qtrue;
+
     return qtrue;
 }
+
+void SV_CreateGamespyChallenge(char *challenge)
+{
+    int i;
+
+    for (i = 0; i < 8; i++) {
+        challenge[i] = rand() % ('Z' - 'A' + 1) + 'A'; // random letters between A and Z
+    }
+    challenge[i] = 0;
+}
+
+challenge_t *FindChallengeById(int gameid)
+{
+    challenge_t *challenge;
+    int          i;
+
+    for (i = 0; i < MAX_CHALLENGES; i++) {
+        challenge = &svs.challenges[i];
+        if (challenge->connected == gameid) {
+            return challenge;
+        }
+    }
+
+    return NULL;
+}
+
+void AuthenticateCallback(int gameid, int localid, int authenticated, char *errmsg, void *instance)
+{
+    challenge_t *challenge;
+    qboolean     valid = qfalse;
+
+    if (localid || !Q_stricmp(errmsg, "CD Key in use")) {
+        valid = qtrue;
+    }
+
+    challenge = FindChallengeById(gameid);
+    if (valid) {
+        challenge->cdkeyState = 2;
+        challenge->pingTime   = svs.time;
+
+        SV_NET_OutOfBandPrint(&svs.netprofile, challenge->adr, "challengeResponse %i", challenge->challenge);
+    } else {
+        char buf[32];
+
+        if (!challenge) {
+            return;
+        }
+
+        Com_sprintf(
+            buf,
+            sizeof(buf),
+            "%d.%d.%d.%d",
+            challenge->adr.ip[0],
+            challenge->adr.ip[1],
+            challenge->adr.ip[2],
+            challenge->adr.ip[3]
+        );
+        Com_Printf("%s failed cdkey authorization\n", buf);
+        challenge->cdkeyState = 3;
+        // tell the client about the reason
+        SV_NET_OutOfBandPrint(&svs.netprofile, challenge->adr, "droperror\nServer rejected connection:\n%s", errmsg);
+    }
+}
+
+void RefreshAuthCallback(int gameid, int localid, int hint, char *challenge, void *instance) {}
+
+void SV_GamespyAuthorize(netadr_t from, const char *response)
+{
+    char         buf[64];
+    challenge_t *challenge = FindChallenge(from, qtrue);
+    if (!challenge) {
+        return;
+    }
+
+    switch (challenge->cdkeyState) {
+    case CDKS_NONE:
+        challenge->cdkeyState = CDKS_AUTHENTICATING;
+        challenge->firstTime  = svs.time;
+
+        gcd_authenticate_user(
+            GS_GetCurrentGameID(),
+            challenge->gamespyId,
+            LittleLong(*(unsigned int *)from.ip),
+            challenge->gsChallenge,
+            response,
+            AuthenticateCallback,
+            RefreshAuthCallback,
+            NULL
+        );
+        break;
+    case CDKS_AUTHENTICATING:
+        // the server can't reach the authentication server
+        // let the client connect
+        if (svs.time - challenge->firstTime > 5000) {
+            Com_DPrintf("authorize server timed out\n");
+            challenge->cdkeyState = CDKS_AUTHENTICATED;
+            challenge->pingTime   = svs.time;
+            SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
+        }
+        break;
+    case CDKS_AUTHENTICATED:
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "challengeResponse %i", challenge->challenge);
+        break;
+    case CDKS_FAILED:
+        // authentication server told the cdkey was invalid
+        Com_sprintf(
+            buf,
+            sizeof(buf),
+            "%d.%d.%d.%d",
+            challenge->adr.ip[0],
+            challenge->adr.ip[1],
+            challenge->adr.ip[2],
+            challenge->adr.ip[3]
+        );
+        Com_Printf("%s failed cdkey authorization\n", buf);
+        // reject the client
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "droperror\nServer rejected connection:\nInvalid CD Key");
+        break;
+    default:
+        break;
+    }
+}
+
+void SV_RestartGamespy()
+{
+    if (gsRunning) {
+        //
+        // Reinitialize Gamespy
+        //
+        SV_ShutdownGamespy();
+        SV_InitGamespy();
+    }
+}
+
+void SV_RestartGamespy_f()
+{
+    SV_RestartGamespy();
+}
+
+void SV_TryRestartGamespy()
+{
+    if (Com_RefreshGameSpyMasters()) {
+        SV_RestartGamespy();
+        return;
+    }
+
+    if (net_gamespy_port && net_gamespy_port->latchedString) {
+        SV_RestartGamespy();
+        return;
+    }
+
+    if (sv_gamespy && sv_gamespy->latchedString) {
+        SV_RestartGamespy();
+        return;
+    }
+}
+
+unsigned int qr_get_num_masters()
+{
+    return Com_GetNumMasterEntries();
+}
+
+const char *qr_get_master_host(int index)
+{
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.host;
+}
+
+int qr_get_master_port(int index)
+{
+    master_entry_t entry;
+    Com_GetMasterEntry(index, &entry);
+
+    return entry.hbport;
+}
diff --git a/code/gamespy/sv_gamespy.h b/code/gamespy/sv_gamespy.h
index 5d62eaeb..769a8afe 100644
--- a/code/gamespy/sv_gamespy.h
+++ b/code/gamespy/sv_gamespy.h
@@ -1,5 +1,31 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// sv_gamespy.h -- Game-specific server GameSpy code
+
 #pragma once
 
+#include "q_gamespy.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -11,6 +37,16 @@ extern const char* GS_GetCurrentGameKey();
 extern unsigned int GS_GetCurrentGameID();
 extern const char* GS_GetCurrentGameName();
 
+void SV_CreateGamespyChallenge(char* challenge);
+void SV_GamespyAuthorize(netadr_t from, const char* response);
+void SV_GamespyHeartbeat();
+void SV_ProcessGamespyQueries();
+qboolean SV_InitGamespy();
+void SV_ShutdownGamespy();
+void SV_RestartGamespy();
+void SV_RestartGamespy_f();
+void SV_TryRestartGamespy();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/gamespy/sv_gqueryreporting.c b/code/gamespy/sv_gqueryreporting.c
index 7bf666ad..0196a538 100644
--- a/code/gamespy/sv_gqueryreporting.c
+++ b/code/gamespy/sv_gqueryreporting.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,329 +20,776 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../qcommon/q_shared.h"
+/******
+.c
+GameSpy Query & Reporting SDK 
+  
+Copyright 2000 GameSpy Industries, Inc
+
+18002 Skypark Circle
+Irvine, CA 92614
+(949)798-4200
+Fax(949)798-4299
+******
+
+
+  Please see the GameSpy Query & Reporting SDK documentation for more 
+ information
+
+ Updated 6/9/99 - DDW
+  Added get_sockaddrin function, and use for resolving
+  Made portable with additions from CEngine code
+  Double check that we don't bind to localhost (instead use INADDR_ANY)
+
+ Updated 9/1/99 - DDW
+  Add the ability to pass in 0 as the queryport, to allocate it
+  automatically.
+
+ Updated 10/11/99 - DDW
+  TCP Heartbeat support (#define TCP_HEARTBEATS)
+
+ Updated 11/20/99 - BGW
+  Split goa_process_queries into two functions: goa_check_queries() and
+  goa_check_send_heartbeat().
+
+ Updated 3/19/00 - DDW
+  Added Dreamcast CE Support
+
+ Updated 4/5/00 - DDW
+  Added Dreamcast Shinobi Support (use sendto/recvfrom for UDP sockets to work
+  around connect bug)
+
+ Updated 4/17/00 - DDW
+  Use a single socket for heartbeats/queries (conserve sockets on DC)
+
+ Updated 5/23/00 - DDW
+  Developer SDK renamed "Query & Reporting SDK"
+  Encapsulate global data in a structure so multiple simultaneous instances
+  can run in the same process. Most developers can just pass NULL for the extra
+  parameter.
+  qr_init now scans for an open port, starting from a base port.
+  heartbeats are sent every 30 seconds now until the first query is received,
+  then they are sent every 5 minutes as recommened by the developer spec
+  this helps remove the problem of dropped heartbeats causing a server to not
+  show up for 5 minutes.
+
+ Updated 10/2/00 - DDW
+  Added qr_process_queries_no_heartbeat, so you can advertise a server on the
+  LAN only.
+ Updated 11/9/00 - DDW
+  Use common alloc/re-alloc functions
+******/
+
+/********
+INCLUDES
+********/
+#if defined(applec) || defined(THINK_C) || defined(__MWERKS__) && !defined(__KATANA__) && !defined(__mips64)
+#include "::nonport.h"
+#else
+#include "nonport.h"
+#endif
 #include "sv_gqueryreporting.h"
+#include <stdlib.h>
+#include <stdio.h>
 
-#include "common/gsPlatformSocket.h"
-#include "common/gsPlatformUtil.h"
-#include "gutil.h"
+#include <string.h>
+#if !defined(UNDER_CE) && !defined(__KATANA__)
+#include <assert.h>
+#else
+#define assert(a)
+#endif
 
-static char *queries[] = {"basic", "info", "rules", "players", "status", "packets", "echo", "secure"};
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-static qr_implementation_t  static_rec;
-static qr_implementation_t *current_rec = &static_rec;
-struct sockaddr_in          hbaddr;
-char                        qr_hostname[64];
+/*****
+TCP_HEARTBEATS
+Define this to use reliable heartbeats. Only needed for certain
+classes of peer-to-peer games, please contact us if you are unsure
+whether you need this or not.
+******/
+//#define TCP_HEARTBEATS
 
-void        qr_check_queries(qr_t qrec);
-void        qr_check_send_heartbeat(qr_t qrec);
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender);
-static void send_heartbeat(qr_t qrec, int statechanged);
+/********
+TYPEDEFS
+********/
+typedef unsigned char uchar;
+#if defined(_LINUX) || defined(__linux__)
+typedef unsigned int qrsocklen_t;
+#else
+typedef int qrsocklen_t;
+#endif
 
-void qr_process_queries(qr_t qrec)
+typedef enum
 {
-    if (!qrec) {
-        qrec = current_rec;
+    qtunknown,
+    qtbasic,
+    qtinfo,
+    qtrules,
+    qtplayers,
+    qtstatus,
+    qtpackets,
+    qtecho,
+    qtsecure
+} query_t;
+
+typedef struct qr_implementation_s
+{
+    SOCKET querysock;
+    SOCKET hbsock;
+    char gamename[64];
+    char secret_key[128];
+    qr_querycallback_t qr_basic_callback;
+    qr_querycallback_t qr_info_callback;
+    qr_querycallback_t qr_rules_callback;
+    qr_querycallback_t qr_players_callback;
+    unsigned long lastheartbeat;
+    int queryid;
+    int packetnumber;
+    int qport;
+    char no_query;
+    struct sockaddr_in hbaddr;
+    qr_cdkey_process_t cdkeyprocess;
+    void* udata;
+}* qr_t;
+
+/********
+VARS
+********/
+static const char* queries[] = {"", "basic", "info", "rules", "players", "status", "packets", "echo", "secure"};
+static struct sockaddr_in hbaddr;
+struct qr_implementation_s static_rec = {INVALID_SOCKET, INVALID_SOCKET};
+static qr_t current_rec = &static_rec;
+//char qr_hostname[64] = MASTER_ADDR;
+
+//static struct sockaddr_in MasterList[8];
+static struct sockaddr_in *MasterList = NULL;
+static char keyvalue[8192];
+static int MasterCount;
+static int MasterMaxCount;
+
+/********
+PROTOTYPES
+********/
+static void send_heartbeat(qr_t qrec, int statechanged);
+static void qr_parse_query(qr_t qrec, char* query, int len, struct sockaddr* sender);
+static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hbaddr);
+static int do_connect_multi();
+void qr_check_queries(qr_t qrec);
+void qr_check_send_heartbeat(qr_t qrec);
+
+static void init_qrec(qr_t* qrec,
+                      int baseport,
+                      SOCKET hbsock,
+                      SOCKET querysock,
+                      const char* gamename,
+                      const char* secret_key,
+                      qr_querycallback_t qr_basic_callback,
+                      qr_querycallback_t qr_info_callback,
+                      qr_querycallback_t qr_rules_callback,
+                      qr_querycallback_t qr_players_callback,
+                      void* userdata);
+
+/****************************************************************************/
+/* PUBLIC FUNCTIONS */
+/****************************************************************************/
+
+/* qr_init: Initializes the sockets, etc. Returns an error value
+if an error occured, or 0 otherwise */
+int qr_init(qr_t* qrec,
+            const char* ip,
+            int baseport,
+            const char* gamename,
+            const char* secret_key,
+            qr_querycallback_t qr_basic_callback,
+            qr_querycallback_t qr_info_callback,
+            qr_querycallback_t qr_rules_callback,
+            qr_querycallback_t qr_players_callback,
+            void* userdata)
+{
+    int lasterror;
+    struct sockaddr_in saddr;
+    qrsocklen_t saddrlen;
+    int maxport;
+    SOCKET querysock;
+    SOCKET hbsock;
+
+    if (qrec != NULL) //init it to empty
+        *qrec = NULL;
+    //create our sockets
+    SocketStartUp();
+
+    querysock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+#ifdef TCP_HEARTBEATS
+    hbsock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+#else
+    hbsock = querysock; //share the socket
+#endif
+    if (INVALID_SOCKET == querysock || INVALID_SOCKET == hbsock) {
+        return E_GOA_WSOCKERROR;
     }
 
+    lasterror = 0;
+    maxport = baseport + NUM_PORTS_TO_TRY;
+    while (baseport < maxport) {
+        get_sockaddrin(ip, baseport, &saddr, NULL);
+        if (saddr.sin_addr.s_addr == htonl(0x7F000001)) //localhost -- we don't want that!
+            saddr.sin_addr.s_addr = INADDR_ANY;
+
+        lasterror = bind(querysock, (struct sockaddr*)&saddr, sizeof(saddr));
+        if (lasterror == 0)
+            break; //we found a port
+        baseport++;
+    }
+
+    if (lasterror != 0) //we weren't able to find a port
+    {
+        return E_GOA_BINDERROR;
+    }
+
+    if (baseport == 0) //we bound it dynamically
+    {
+        saddrlen = sizeof(saddr);
+        lasterror = getsockname(querysock, (struct sockaddr*)&saddr, &saddrlen);
+        if (lasterror)
+            return E_GOA_BINDERROR;
+        baseport = ntohs(saddr.sin_port);
+    }
+
+    init_qrec(qrec,
+              baseport,
+              hbsock,
+              querysock,
+              gamename,
+              secret_key,
+              qr_basic_callback,
+              qr_info_callback,
+              qr_rules_callback,
+              qr_players_callback,
+              userdata);
+
+    if (!qrec) {
+        qrec = &current_rec;
+    }
+
+    return do_connect_multi();
+}
+
+void init_qrec(qr_t* qrec,
+               int qport,
+               SOCKET hbsock,
+               SOCKET querysock,
+               const char* gamename,
+               const char* secret_key,
+               qr_querycallback_t qr_basic_callback,
+               qr_querycallback_t qr_info_callback,
+               qr_querycallback_t qr_rules_callback,
+               qr_querycallback_t qr_players_callback,
+               void* userdata)
+{
+    qr_t cr;
+
+    if (qrec == NULL) {
+        cr = &static_rec;
+    } else {
+        *qrec = (qr_t)malloc(sizeof(struct qr_implementation_s));
+        cr = *qrec;
+    }
+
+    strcpy(cr->gamename, gamename);
+    strcpy(cr->secret_key, secret_key);
+
+    cr->qport = qport;
+    cr->lastheartbeat = 0;
+    cr->hbsock = hbsock;
+    cr->querysock = querysock;
+    cr->packetnumber = 0;
+    cr->queryid = 1;
+    cr->no_query = 1;
+    cr->udata = userdata;
+    cr->qr_basic_callback = qr_basic_callback;
+    cr->qr_info_callback = qr_info_callback;
+    cr->qr_players_callback = qr_players_callback;
+    cr->qr_rules_callback = qr_rules_callback;
+    cr->cdkeyprocess = NULL;
+}
+
+int qr_init_socket(qr_t* qrec,
+                   unsigned int s,
+                   const char* gamename,
+                   const char* secret_key,
+                   qr_querycallback_t qr_basic_callback,
+                   qr_querycallback_t qr_info_callback,
+                   qr_querycallback_t qr_rules_callback,
+                   qr_querycallback_t qr_players_callback,
+                   void* userdata)
+{
+    if (qrec) {
+        *qrec = NULL;
+    }
+
+    SocketStartUp();
+    init_qrec(qrec,
+              0,
+              s,
+              s,
+              gamename,
+              secret_key,
+              qr_basic_callback,
+              qr_info_callback,
+              qr_rules_callback,
+              qr_players_callback,
+              userdata);
+
+    return do_connect_multi();
+}
+
+/* qr_process_queries: Processes any waiting queries, and sends a
+heartbeat if 5 minutes have elapsed */
+void qr_process_queries(qr_t qrec)
+{
+    if (qrec == NULL)
+        qrec = current_rec;
     qr_check_send_heartbeat(qrec);
     qr_check_queries(qrec);
 }
 
+/* qr_process_queries_no_heartbeat: Processes any waiting queries, but
+never sends heartbeats */
 void qr_process_queries_no_heartbeat(qr_t qrec)
 {
-    if (!qrec) {
+    if (qrec == NULL)
         qrec = current_rec;
-    }
-
     qr_check_queries(qrec);
 }
 
+/* qr_check_queries: Processes any waiting queries */
 void qr_check_queries(qr_t qrec)
 {
-#define INBUF_LEN 256
-    static char        indata[INBUF_LEN]; //256 byte input buffer
+    static char indata[INBUF_LEN]; //256 byte input buffer
     struct sockaddr_in saddr;
-    int                error;
+    qrsocklen_t saddrlen = sizeof(struct sockaddr_in);
+    fd_set set;
+    struct timeval timeout = {0, 0};
+    int error;
 
-#if defined(_LINUX)
-    unsigned int saddrlen = sizeof(struct sockaddr_in);
-#else
-    int saddrlen = sizeof(struct sockaddr_in);
-#endif
+    if (0 == qrec->qport)
+        return;
 
-    while (CanReceiveOnSocket((SOCKET)qrec->hbsock)) {
+    FD_ZERO(&set);
+    FD_SET(qrec->querysock, &set);
+
+    while (1) {
+        error = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
+        if (gsiSocketIsError(error) || error == 0)
+            return;
         //else we have data
-        error = (int)recvfrom((SOCKET)qrec->hbsock, indata, (INBUF_LEN - 1), 0, (struct sockaddr *)&saddr, &saddrlen);
-
+        error = recvfrom(qrec->querysock, indata, INBUF_LEN - 1, 0, (struct sockaddr*)&saddr, &saddrlen);
         if (gsiSocketIsNotError(error)) {
             indata[error] = '\0';
-            parse_query(qrec, indata, (struct sockaddr *)&saddr);
+            qr_parse_query(qrec, indata, error, (struct sockaddr*)&saddr);
         }
     }
 }
 
+/* check_send_heartbeat: Perform any scheduled outgoing
+heartbeats, (every 5 minutes) */
 void qr_check_send_heartbeat(qr_t qrec)
 {
-    unsigned long tc;
+    unsigned long tc = current_time();
 
-    tc = current_time();
+    if (INVALID_SOCKET == qrec->hbsock)
+        return; //no sockets to work with!
 
-    if ((SOCKET)qrec->hbsock != INVALID_SOCKET) {
-        if (tc - qrec->lastheartbeat <= 300000 && qrec->lastheartbeat && tc >= qrec->lastheartbeat) {
-            if (qrec->no_query > 0 && tc - qrec->lastheartbeat > 30000) {
-                send_heartbeat(qrec, 0);
-                if (qrec->no_query++ > 10) {
-                    qrec->no_query = 0;
-                }
-            }
-        } else {
-            send_heartbeat(qrec, 0);
-        }
+    //check if we need to send a heartbet
+    if (tc - qrec->lastheartbeat > HB_TIME || qrec->lastheartbeat == 0 || tc < qrec->lastheartbeat)
+        send_heartbeat(qrec, 0);
+    else if (qrec->no_query > 0
+             && tc - qrec->lastheartbeat > FIRST_HB_TIME) { //check to see if we haven't gotten a query yet
+        send_heartbeat(qrec, 0);
+        qrec->no_query++;
+        if (qrec->no_query > MAX_FIRST_COUNT)
+            qrec->no_query = 0; //stop trying to get first query
     }
 }
 
+/* qr_send_statechanged: Sends a statechanged heartbeat, call when
+your gamemode changes */
 void qr_send_statechanged(qr_t qrec)
 {
-    if (!qrec) {
+    if (qrec == NULL)
         qrec = current_rec;
-    }
     send_heartbeat(qrec, 1);
 }
 
+void qr_send_exiting(qr_t qrec)
+{
+    if (qrec == NULL)
+        qrec = current_rec;
+    send_heartbeat(qrec, 2);
+}
+
+/* qr_shutdown: Cleans up the sockets and shuts down */
 void qr_shutdown(qr_t qrec)
 {
-    if (qrec == NULL) {
+    if (qrec == NULL)
         qrec = current_rec;
+    if (INVALID_SOCKET != qrec->querysock && qrec->qport != 0) {
+        closesocket(qrec->querysock);
     }
-    if (INVALID_SOCKET != (SOCKET)qrec->hbsock && (SOCKET)qrec->querysock) //if we own the socket
-    {
-        closesocket((SOCKET)qrec->hbsock);
+    if (INVALID_SOCKET != qrec->hbsock && qrec->hbsock != qrec->querysock) {
+        closesocket(qrec->hbsock);
     }
-    qrec->hbsock        = (void *)INVALID_SOCKET;
+    qrec->hbsock = INVALID_SOCKET;
+    qrec->querysock = INVALID_SOCKET;
     qrec->lastheartbeat = 0;
-    if (qrec->querysock) //if we own the socket
+    if (qrec != &static_rec) //need to gsifree it, it was dynamically allocated
     {
-        SocketShutDown();
+        gsifree(qrec);
     }
-    if (qrec != &static_rec) //need to free it, it was dynamically allocated
-    {
-        free(qrec);
+    
+    if (MasterList) {
+        gsifree(MasterList);
+        MasterList = NULL;
     }
+
+    MasterCount = 0;
+
+    SocketShutDown();
+}
+
+/****************************************************************************/
+
+static int do_connect(SOCKET sock, char* addr, int port, struct sockaddr_in* hbaddr)
+{
+#ifdef TCP_HEARTBEATS
+    struct sockaddr_in saddr;
+
+    get_sockaddrin(addr, port, &saddr, NULL);
+
+    if (connect(sock, (struct sockaddr*)&saddr, sizeof(saddr)) == SOCKET_ERROR) {
+        return E_GOA_CONNERROR;
+    }
+
+    add_master(&saddr);
+#else
+    get_sockaddrin(addr, port, hbaddr, NULL);
+    add_master(hbaddr);
+#endif
+    return 0;
+}
+
+static int do_connect_multi()
+{
+    int i;
+
+    MasterMaxCount = qr_get_num_masters();
+    if (MasterList) {
+        gsifree(MasterList);
+        MasterList = NULL;
+    }
+
+    MasterList = gsimalloc(sizeof(struct sockaddr_in) * MasterMaxCount);
+    MasterCount = 0;
+
+    for(i = 0; i < MasterMaxCount; i++) {
+        struct sockaddr_in hbaddr;
+        if (get_sockaddrin(qr_get_master_host(i), qr_get_master_port(i), &hbaddr, NULL)) {
+            // Valid, add it
+            add_master(&hbaddr);
+        }
+    }
+
+    return 0;
 }
 
 /* Return a sockaddrin for the given host (numeric or DNS) and port)
 Returns the hostent in savehent if it is not NULL */
-static int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent)
+int get_sockaddrin(const char* host, int port, struct sockaddr_in* saddr, struct hostent** savehent)
 {
-    struct hostent *hent = NULL;
+    struct hostent* hent;
+    char broadcast_t[] = {
+        '2', '5', '5', '.', '2', '5', '5', '.', '2', '5', '5', '.', '2', '5', '5', '\0'}; //255.255.255.255
+    hent = 0;
 
+    memset(saddr, 0, sizeof(struct sockaddr_in));
     saddr->sin_family = AF_INET;
-    saddr->sin_port   = htons((unsigned short)port);
-    if (host == NULL) {
+    saddr->sin_port = htons((unsigned short)port);
+    if (host == NULL)
         saddr->sin_addr.s_addr = INADDR_ANY;
-    } else {
+    else
         saddr->sin_addr.s_addr = inet_addr(host);
-    }
 
-    if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host, "255.255.255.255") != 0) {
+    if (saddr->sin_addr.s_addr == INADDR_NONE && strcmp(host, broadcast_t) != 0) {
         hent = gethostbyname(host);
-        if (!hent) {
+        if (!hent)
             return 0;
-        }
-        saddr->sin_addr.s_addr = *(unsigned int *)hent->h_addr_list[0];
+        saddr->sin_addr.s_addr = *(u_long*)hent->h_addr_list[0];
     }
-    if (savehent != NULL) {
+    if (savehent != NULL)
         *savehent = hent;
-    }
     return 1;
 }
 
 /* value_for_key: this returns a value for a certain key in s, where s is a string
-containing key\value pairs. If the key does not exist, it returns  NULL.
+containing key\value pairs. If the key does not exist, it returns  NULL. 
 Note: the value is stored in a common buffer. If you want to keep it, make a copy! */
-static char *value_for_key(const char *s, const char *key)
+static char* value_for_key(const char* s, const char* key)
 {
-    static int  valueindex;
-    char       *pos, *pos2;
-    char        keyspec[256] = "\\";
+    static int valueindex;
+    char *pos, *pos2;
+    char keyspec[256] = "\\";
     static char value[2][256];
 
     valueindex ^= 1;
     strcat(keyspec, key);
     strcat(keyspec, "\\");
     pos = strstr(s, keyspec);
-    if (!pos) {
+    if (!pos)
         return NULL;
-    }
     pos += strlen(keyspec);
     pos2 = value[valueindex];
-    while (*pos && *pos != '\\') {
+    while (*pos && *pos != '\\')
         *pos2++ = *pos++;
-    }
     *pos2 = '\0';
     return value[valueindex];
 }
 
-static void packet_send(qr_t qrec, struct sockaddr *addr, char *buffer)
+/*****************************************************************************/
+/* Various encryption / encoding routines */
+
+#ifndef _GUTIL
+#define _GUTIL
+static void swap_byte(uchar* a, uchar* b)
+{
+    uchar swapByte;
+
+    swapByte = *a;
+    *a = *b;
+    *b = swapByte;
+}
+
+static uchar encode_ct(uchar c)
+{
+    if (c < 26)
+        return ('A' + c);
+    if (c < 52)
+        return ('a' + c - 26);
+    if (c < 62)
+        return ('0' + c - 52);
+    if (c == 62)
+        return ('+');
+    if (c == 63)
+        return ('/');
+
+    return 0;
+}
+
+void gs_encode(uchar* ins, int size, uchar* result)
+{
+    int i, pos;
+    uchar trip[3];
+    uchar kwart[4];
+
+    i = 0;
+    while (i < size) {
+        for (pos = 0; pos <= 2; pos++, i++)
+            if (i < size)
+                trip[pos] = *ins++;
+            else
+                trip[pos] = '\0';
+        kwart[0] = (trip[0]) >> 2;
+        kwart[1] = (((trip[0]) & 3) << 4) + ((trip[1]) >> 4);
+        kwart[2] = (((trip[1]) & 15) << 2) + ((trip[2]) >> 6);
+        kwart[3] = (trip[2]) & 63;
+        for (pos = 0; pos <= 3; pos++)
+            *result++ = encode_ct(kwart[pos]);
+    }
+    *result = '\0';
+}
+
+void gs_encrypt(uchar* key, int key_len, uchar* buffer_ptr, int buffer_len)
+{
+    short counter;
+    uchar x, y, xorIndex;
+    uchar state[256];
+
+    for (counter = 0; counter < 256; counter++)
+        state[counter] = (uchar)counter;
+
+    x = 0;
+    y = 0;
+    for (counter = 0; counter < 256; counter++) {
+        y = (key[x] + state[counter] + y) % 256;
+        x = (x + 1) % key_len;
+        swap_byte(&state[counter], &state[y]);
+    }
+
+    x = 0;
+    y = 0;
+    for (counter = 0; counter < buffer_len; counter++) {
+        x = (x + buffer_ptr[counter] + 1) % 256;
+        y = (state[x] + y) % 256;
+        swap_byte(&state[x], &state[y]);
+        xorIndex = (state[x] + state[y]) % 256;
+        buffer_ptr[counter] ^= state[xorIndex];
+    }
+}
+/*****************************************************************************/
+#endif
+
+/* packet_send: sends a key\value packet. Appends the queryid
+key\value pair. Clears the buffer */
+static void packet_send(qr_t qrec, struct sockaddr* addr, char* buffer)
 {
     char keyvalue[80];
 
-    if (!strlen(buffer)) {
-        return;
-    }
-
-    sprintf(keyvalue, "\\queryid\\%d.%d", qrec->queryid, qrec->packetnumber++);
+    if (strlen(buffer) == 0)
+        return;           //dont need to send an empty one!
+    qrec->packetnumber++; //packet numbers start at 1
+    snprintf(keyvalue, sizeof(keyvalue), "\\queryid\\%d.%d", qrec->queryid, qrec->packetnumber);
     strcat(buffer, keyvalue);
-
-    sendto((SOCKET)qrec->querysock, buffer, (int)strlen(buffer), 0, addr, 16);
-    *buffer = 0;
+    sendto(qrec->querysock, buffer, (int)strlen(buffer), 0, addr, sizeof(struct sockaddr_in));
+    buffer[0] = '\0';
 }
 
-static void buffer_send(qr_t qrec, struct sockaddr *sender, char *buffer, char *newdata)
+/* buffer_send: appends buffer with newdata. If the combined
+size would be too large, it flushes buffer first. Space is reserved
+on the total size to allow for the queryid key\value */
+static void buffer_send(qr_t qrec, struct sockaddr* sender, char* buffer, char* newdata)
 {
-    int   bcount;
-    int   i;
-    char *lastkey;
-    char *pos;
+    char *pos, *lastkey;
+    int bcount = 0;
 
-    bcount = 0;
-    if (strlen(newdata) + strlen(buffer) < 1350) {
+    if (strlen(buffer) + strlen(newdata) < MAX_DATA_SIZE - 50) {
         strcat(buffer, newdata);
-        return;
-    }
-
-    pos = newdata;
-    while (strlen(pos) > 1350) {
-        lastkey = pos;
-
-        for (i = 0; i < 1350; ++i) {
-            if (pos[i] == '\\') {
-                if (!(bcount % 2)) {
-                    lastkey = pos + i;
+    } else {
+        if (strlen(newdata) > MAX_DATA_SIZE - 50) //incoming data is too big already!
+        {
+            lastkey = pos = newdata;
+            while (pos - newdata < MAX_DATA_SIZE - 50) {
+                if ('\\' == *pos) {
+                    if (bcount % 2 == 0)
+                        lastkey = pos;
+                    bcount++;
                 }
-
-                ++bcount;
+                pos++;
             }
-        }
-
-        if (lastkey == pos) {
-            return;
-        }
-
-        *lastkey = 0;
-        buffer_send(qrec, sender, buffer, pos);
-        *lastkey = '\\';
-        pos      = lastkey;
-        bcount   = 0;
-
-        if (strlen(buffer) + strlen(lastkey) < 1350) {
-            strcat(buffer, pos);
-            return;
+            if (lastkey == newdata)
+                return; //endless loop - single key was too big!
+            *lastkey = '\0';
+            buffer_send(qrec, sender, buffer, newdata);
+            *lastkey = '\\';
+            buffer_send(qrec, sender, buffer, lastkey); //send the rest!
+        } else {
+            packet_send(qrec, sender, buffer);
+            strcpy(buffer, newdata);
         }
     }
-
-    packet_send(qrec, sender, buffer);
-    strcpy(buffer, pos);
 }
 
-static void send_basic(qr_t qrec, struct sockaddr *sender, char *outbuf)
+/* send_basic: sends a response to the basic query */
+static void send_basic(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-    char keyvalue[1400] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_basic_callback(keyvalue, 1400, qrec->udata);
+    assert(qrec->qr_basic_callback);
+    qrec->qr_basic_callback(keyvalue, sizeof(keyvalue), qrec->udata);
     buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
-static void send_info(qr_t qrec, struct sockaddr *sender, char *outbuf)
+/* send_info: sends a response to the info query */
+static void send_info(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-    char keyvalue[1400] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_info_callback(keyvalue, 1400, qrec->udata);
+    assert(qrec->qr_info_callback);
+    qrec->qr_info_callback(keyvalue, sizeof(keyvalue), qrec->udata);
     buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
-static void send_rules(qr_t qrec, struct sockaddr *sender, char *outbuf)
+/* send_rules: sends a response to the rules query. */
+static void send_rules(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-    char keyvalue[1400] = {0};
+    char keyvalue[BUF_SIZE] = "";
 
-    qrec->qr_rules_callback(keyvalue, 1400, qrec->udata);
+    assert(qrec->qr_rules_callback);
+    qrec->qr_rules_callback(keyvalue, sizeof(keyvalue), qrec->udata);
     buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
-static void send_players(qr_t qrec, struct sockaddr *sender, char *outbuf)
+/* send_players: sends the players and their information.*/
+static void send_players(qr_t qrec, struct sockaddr* sender, char* outbuf)
 {
-    char keyvalue[1400] = {0};
-
-    qrec->qr_players_callback(keyvalue, 1400, qrec->udata);
+    assert(qrec->qr_players_callback);
+    qrec->qr_players_callback(keyvalue, sizeof(keyvalue), qrec->udata);
     buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
-static void send_echo(qr_t qrec, struct sockaddr *sender, char *outbuf, const char *echostr)
+/* send_echo: bounces the echostr back to sender 
+Note: you should always make sure that your echostr doesn't exceed the MAX_DATA_SIZE*/
+static void send_echo(qr_t qrec, struct sockaddr* sender, char* outbuf, char* echostr)
 {
-    char keyvalue[1400] = {0};
+    char keyvalue[MAX_DATA_SIZE];
 
-    if (strlen(echostr) <= 50) {
-        sprintf(keyvalue, "\\echoresponse\\%s", echostr);
-        buffer_send(qrec, sender, outbuf, keyvalue);
-    }
+    if (strlen(echostr) > MAX_DATA_SIZE - 50)
+        return;
+    snprintf(keyvalue, sizeof(keyvalue), "\\echo\\%s", echostr);
+    buffer_send(qrec, sender, outbuf, keyvalue);
 }
 
-static void send_final(qr_t qrec, struct sockaddr *sender, char *outbuf, char *validation)
+/* send_final: sends the remaining data in outbuf. Appends the final
+key\value to the end. Also adds validation if required. */
+static void send_final(qr_t qrec, struct sockaddr* sender, char* outbuf, char* validation)
 {
     char keyvalue[256];
-    char encrypted_val[128];
+    char encrypted_val[128]; //don't need to null terminate
     char encoded_val[200];
-    int  keylen;
+    int keylen;
 
-    if (*validation) {
+    if (validation[0]) {
         keylen = (int)strlen(validation);
-
-        if (keylen > 128) {
+        if (keylen > 128)
             return;
-        }
-
         strcpy(encrypted_val, validation);
-
-        gs_encrypt((uchar *)qrec->secret_key, (int)strlen(qrec->secret_key), encrypted_val, keylen);
-        gs_encode(encrypted_val, keylen, encoded_val);
-
-        sprintf(keyvalue, "\\validate\\%s", encoded_val);
+        gs_encrypt((uchar*)qrec->secret_key, (int)strlen(qrec->secret_key), (uchar*)encrypted_val, keylen);
+        gs_encode((uchar*)encrypted_val, keylen, (uchar*)encoded_val);
+        snprintf(keyvalue, sizeof(keyvalue), "\\validate\\%s", encoded_val);
         buffer_send(qrec, sender, outbuf, keyvalue);
     }
 
-    sprintf(keyvalue, "\\final\\");
+    snprintf(keyvalue, sizeof(keyvalue), "\\final\\");
     buffer_send(qrec, sender, outbuf, keyvalue);
     packet_send(qrec, sender, outbuf);
 }
 
-static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
+/* parse_query: parse an incoming query (which may contain 1 or more
+individual queries) and reply to each query */
+static void qr_parse_query(qr_t qrec, char* query, int len, struct sockaddr* sender)
 {
-    query_t     querytype    = qtunknown;
-    char        buffer[1400] = {0};
-    const char *value;
-    char        validation[256] = {0};
+    int querytype;
+    char buffer[MAX_DATA_SIZE] = "";
+    char* value;
+    char validation[256] = "";
 
-    if (!qrec) {
+    if (qrec == NULL)
         qrec = current_rec;
-    }
-
-    if (*query == ';') {
-        // custom handler
-        qrec->qr_custom_handler(query, sender);
+    if (query[0] == 0x3B) /* a cdkey query */
+    {
+        if (qrec->cdkeyprocess != NULL) {
+            qrec->cdkeyprocess(query, len, sender);
+        }
         return;
     }
 
-    qrec->packetnumber = 0;
     qrec->queryid++;
-
-    if (qrec->no_query > 0) {
+    qrec->packetnumber = 0;
+    if (qrec->no_query > 0)
         qrec->no_query = 0;
-    }
 
-    for (querytype = qtbasic; querytype <= qtsecure; ++querytype) {
-        value = value_for_key(query, queries[querytype]);
-        if (value) {
+    for (querytype = qtbasic; querytype <= qtsecure; querytype++) {
+        if ((value = value_for_key(query, queries[querytype])))
             switch (querytype) {
             case qtbasic:
                 send_basic(qrec, sender, buffer);
@@ -363,6 +810,7 @@ static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
                 send_players(qrec, sender, buffer);
                 break;
             case qtpackets:
+                /*note: "packets" is NOT a real query type. It is simply here to illustrate how a large query would look if broken into packets */
                 send_basic(qrec, sender, buffer);
                 packet_send(qrec, sender, buffer);
                 send_info(qrec, sender, buffer);
@@ -372,160 +820,65 @@ static void parse_query(qr_t qrec, char *query, struct sockaddr *sender)
                 send_players(qrec, sender, buffer);
                 break;
             case qtecho:
+                //note: \echo\value is the syntax here
                 send_echo(qrec, sender, buffer, value);
                 break;
             case qtsecure:
                 strcpy(validation, value);
                 break;
-            default:
-                continue;
+            case qtunknown:
+                break;
             }
-        }
     }
-
     send_final(qrec, sender, buffer, validation);
 }
 
+int get_master_count()
+{
+    return MasterCount;
+}
+
+void clear_master_list()
+{
+    memset(MasterList, 0, sizeof(MasterList));
+    MasterCount = 0;
+}
+
+void add_master(struct sockaddr_in* addr)
+{
+    int i;
+    for (i = 0; i < MasterCount; i++) {
+        if (memcmp(addr, &MasterList[i], sizeof(MasterList[i])) == 0) {
+            return;
+        }
+    }
+    if (i == MasterMaxCount) {
+        return;
+    } else {
+        MasterList[i] = *addr;
+        MasterCount++;
+    }
+}
+
+/* send_heartbeat: Sends a heartbeat to the gamemaster,
+adds \statechanged\ if statechanged != 0 */
 static void send_heartbeat(qr_t qrec, int statechanged)
 {
     char buf[256];
+    int ret;
+    int i;
 
-    sprintf(buf, "\\heartbeat\\%d\\gamename\\%s", qrec->qport, qrec->gamename);
+    snprintf(buf, sizeof(buf), "\\heartbeat\\%d\\gamename\\%s", qrec->qport, qrec->gamename);
+    if (statechanged)
+        snprintf(&buf[strlen(buf)], sizeof(buf) - strlen(buf), "\\statechanged\\");
 
-    if (statechanged) {
-        sprintf(buf + strlen(buf), "\\statechanged\\%d", statechanged);
+    for (i = 0; i < MasterCount; i++) {
+        ret = sendto(qrec->hbsock, buf, (int)strlen(buf), 0, (struct sockaddr*)&MasterList[i], sizeof(MasterList[i]));
     }
 
-    sendto((SOCKET)qrec->hbsock, buf, (int)strlen(buf), 0, (const struct sockaddr *)&qrec->master_saddr, 16);
     qrec->lastheartbeat = current_time();
 }
 
-static int do_connect(void *sock, char *addr, int port, struct sockaddr_in *master_saddr)
-{
-    get_sockaddrin(addr, port, master_saddr, NULL);
-    return 0;
+#ifdef __cplusplus
 }
-
-void init_qrec(
-    qr_t              *qrec,
-    int                baseport,
-    SOCKET             hbsock,
-    SOCKET             querysock,
-    const char         *gamename,
-    const char         *secret_key,
-    qr_querycallback_t qr_basic_callback,
-    qr_querycallback_t qr_info_callback,
-    qr_querycallback_t qr_rules_callback,
-    qr_querycallback_t qr_players_callback,
-    void              *userdata
-)
-{
-    qr_t qr;
-
-    if (qrec) {
-        qr    = (qr_t)malloc(sizeof(qr_implementation_t));
-        *qrec = qr;
-    } else {
-        qr = &static_rec;
-    }
-
-    strcpy(qr->gamename, gamename);
-    strcpy(qr->secret_key, secret_key);
-
-    qr->qport               = baseport;
-    qr->hbsock              = (void *)hbsock;
-    qr->querysock           = (void *)querysock;
-    qr->queryid             = 1;
-    qr->no_query            = 1;
-    qr->udata               = userdata;
-    qr->qr_basic_callback   = qr_basic_callback;
-    qr->qr_info_callback    = qr_info_callback;
-    qr->lastheartbeat       = 0;
-    qr->packetnumber        = 0;
-    qr->qr_players_callback = qr_players_callback;
-    qr->qr_rules_callback   = qr_rules_callback;
-    qr->qr_custom_handler   = 0;
-}
-
-#define NUM_PORTS_TO_TRY 100
-
-int qr_init(
-    qr_t              *qrec,
-    const char         *ip,
-    int                baseport,
-    const char         *gamename,
-    const char         *secret_key,
-    qr_querycallback_t qr_basic_callback,
-    qr_querycallback_t qr_info_callback,
-    qr_querycallback_t qr_rules_callback,
-    qr_querycallback_t qr_players_callback,
-    void              *userdata
-)
-{
-    struct sockaddr_in saddr;
-    SOCKET             hbsock;
-    int                maxport;
-    int                lasterror = 0;
-
-#if defined(_LINUX)
-    unsigned int saddrlen;
-#else
-    int saddrlen;
 #endif
-
-    hbsock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (hbsock == INVALID_SOCKET) {
-        return 1;
-    }
-
-    maxport = baseport + NUM_PORTS_TO_TRY;
-    while (baseport < maxport) {
-        get_sockaddrin(ip, baseport, &saddr, NULL);
-        if (saddr.sin_addr.s_addr == htonl(0x7F000001)) { //localhost -- we don't want that!
-            saddr.sin_addr.s_addr = INADDR_ANY;
-        }
-
-        lasterror = bind(hbsock, (struct sockaddr *)&saddr, sizeof(saddr));
-        if (lasterror == 0) {
-            break; //we found a port
-        }
-        baseport++;
-    }
-
-    if (lasterror != 0) //we weren't able to find a port
-    {
-        return 2;
-    }
-
-    if (baseport == 0) //we bound it dynamically
-    {
-        saddrlen = sizeof(saddr);
-
-        lasterror = getsockname(hbsock, (struct sockaddr *)&saddr, &saddrlen);
-
-        if (lasterror) {
-            return 2;
-        }
-        baseport = ntohs(saddr.sin_port);
-    }
-
-    init_qrec(
-        qrec,
-        baseport,
-        hbsock,
-        hbsock,
-        gamename,
-        secret_key,
-        qr_basic_callback,
-        qr_info_callback,
-        qr_rules_callback,
-        qr_players_callback,
-        userdata
-    );
-
-    if (!qrec) {
-        qrec = &current_rec;
-    }
-
-    return do_connect((void *)hbsock, MASTER_SERVER_HOST, 27900, &(*qrec)->master_saddr);
-}
diff --git a/code/gamespy/sv_gqueryreporting.h b/code/gamespy/sv_gqueryreporting.h
index c2b6136b..23823568 100644
--- a/code/gamespy/sv_gqueryreporting.h
+++ b/code/gamespy/sv_gqueryreporting.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,45 +20,200 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+/******
+gqueryreporting.h
+GameSpy Query & Reporting SDK 
+  
+Copyright 2000 GameSpy Industries, Inc
+
+18002 Skypark Circle
+Irvine, CA 92614
+(949)798-4200
+Fax(949)798-4299
+******
+
+ Please see the GameSpy Query & Reporting SDK documentation for more 
+ information
+
+******/
+
 #pragma once
 
-#include "common/gsPlatformSocket.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-typedef void (*qr_querycallback_t)(char *outbuf, int maxlen, void *userdata);
-typedef void (*qr_custom_handler_t)(const char *query, struct sockaddr *sender);
+/********
+ERROR CONSTANTS
+---------------
+These constants are returned from qr_init to signal an error condition
+***************/
 
-typedef enum query_e {
-    qtunknown,
-    qtbasic,
-    qtinfo,
-    qtrules,
-    qtplayers,
-    qtstatus,
-    qtpackets,
-    qtecho,
-    qtsecure
-} query_t;
+#define E_GOA_WSOCKERROR 1
+#define E_GOA_BINDERROR  2
+#define E_GOA_DNSERROR   3
+#define E_GOA_CONNERROR  4
+/*********
+NUM_PORTS_TO_TRY
+----------------
+This value is the maximum number of ports that will be scanned to
+find an open query port, starting from the value passed to qr_init
+as the base port. Generally there is no reason to modify this value.
+***********/
+#define NUM_PORTS_TO_TRY 100
 
-typedef struct qr_implementation_s {
-    void               *querysock;
-    void               *hbsock;
-    char                gamename[64];
-    char                secret_key[128];
-    qr_querycallback_t  qr_basic_callback;
-    qr_querycallback_t  qr_info_callback;
-    qr_querycallback_t  qr_rules_callback;
-    qr_querycallback_t  qr_players_callback;
-    long unsigned int   lastheartbeat;
-    int                 queryid;
-    int                 packetnumber;
-    int                 qport;
-    char                no_query;
-    struct sockaddr_in  master_saddr;
-    int                 unk2;
-    int                 unk3;
-    int                 unk4;
-    qr_custom_handler_t qr_custom_handler;
-    void               *udata;
-} qr_implementation_t, *qr_t;
+/********
+DEFINES
+********/
+#define MASTER_PORT     qr_get_master_port(0)
+//#define MASTER_ADDR     "master." GSI_DOMAIN_NAME
+#define MASTER_ADDR     qr_get_master_host(0)
+#define FIRST_HB_TIME   30000  /* 30 sec */
+#define HB_TIME         300000 /* 5 minutes */
+#define MAX_FIRST_COUNT 10     /* 10 tries = 5 minutes */
+#define MAX_DATA_SIZE   1400
+#define INBUF_LEN       256
+#define BUF_SIZE        1400
 
-#define MASTER_SERVER_HOST "master.x-null.net"
+/* The hostname of the master server.
+If the app resolves the hostname, an
+IP can be stored here before calling
+qr_init */
+extern char qr_hostname[64];
+
+/**
+ * @brief Custom function used to return the master host, based on game settings
+ * 
+ * @return const char* The full master server address
+ */
+extern unsigned int qr_get_num_masters();
+extern const char *qr_get_master_host(int index);
+extern int qr_get_master_port(int index);
+
+/********
+qr_querycallback_t
+-------------------
+This is the prototype for the callback functions your game needs to
+implement for each of the four basic query types. The callback works the
+same for each query type. 
+
+[outbuf] is a pre-allocated buffer for you to place the query reply. It's size is
+[maxlen] (default is 1400). If you need larger, you can adjust the 
+	defines in gqueryreporting.c
+[userdata] is the pointer that was passed into qr_init. You can use this for an
+	object or structure pointer if needed.
+
+Simply fill outbuf with the correct data for the query type (consult the sample
+apps and the GameSpy Developer Spec). 
+outbuf should be a NULL terminated ANSI string.
+********/
+typedef void (*qr_querycallback_t)(char* outbuf, int maxlen, void* userdata);
+
+typedef void (*qr_cdkey_process_t)(char* buf, int len, struct sockaddr* fromaddr);
+
+/***********
+qr_t
+----
+This abstract type is used to instantiate multiple instances of the
+Query & Reporting SDK (for example, if you are running multiple servers
+in the same process).
+For most games, you can ignore this value and pass NULL in to all functions
+that require it. A single global instance will be used, similar to how the
+original Developer SDK worked
+************/
+typedef struct qr_implementation_s *qr_t;
+/************
+QR_INIT
+--------
+This creates/binds the sockets needed for heartbeats and queries/replies.
+[qrec] if not null, will be filled with the qr_t instance for this server.
+	If you are not using more than one instance of the Query & Reporting SDK you
+	can pass in NULL for this value.
+[ip] is an optional parameter that determines which dotted IP address to bind to on
+	a multi-homed machine. You can pass NULL to bind to all IP addresses.
+[baseport] is the port to accept queries on. If baseport is not available, the
+	Query and Reporting SDK will scan for an available port in the range of 
+	baseport -> baseport + NUM_PORTS_TO_TRY
+	Optionally, you can pass in 0 to have a port chosen automatically
+	(makes it harder for debugging/testing).
+[gamename] is the unique gamename that you were given
+[secretkey] is your unique secret key
+[qr_*_callback] are your data callback functions, this cannot be NULL
+[userdata] is an optional, implementation specific parameter that will be
+	passed to all callback functions. Use it to store an object or structure
+	pointer if needed.
+
+Returns
+0 is successful, otherwise one of the E_GOA constants above.
+************/
+int qr_init(/*[out]*/ qr_t* qrec,
+            const char* ip,
+            int baseport,
+            const char* gamename,
+            const char* secret_key,
+            qr_querycallback_t qr_basic_callback,
+            qr_querycallback_t qr_info_callback,
+            qr_querycallback_t qr_rules_callback,
+            qr_querycallback_t qr_players_callback,
+            void* userdata);
+
+/*******************
+QR_PROCESS_QUERIES
+-------------------
+This function should be called somewhere in your main program loop to
+process any pending server queries and send a heartbeat if 5 minutes has
+elapsed.
+
+Query replies are very latency sensative, so you should make sure this
+function is called at least every 100ms while your game is in progress.
+The function has very low overhead and should not cause any performance
+problems.
+Unless you are using multiple instances of the SDK, you should pass NULl
+for qrec.
+The no_heartbeat version will not send any heartbeats to the master - use
+this if you only want to advertise your server on the LAN.
+********************/
+void qr_process_queries(qr_t qrec);
+void qr_process_queries_no_heartbeat(qr_t qrec);
+
+/*****************
+QR_SEND_STATECHANGED
+--------------------
+This function forces a \statechanged\ heartbeat to be sent immediately.
+Use it any time you have changed the gamestate of your game to signal the
+master to update your status.
+Also use it before your game exits by changing the gamestate to "exiting"
+and sending a statechanged heartbeat. This will insure that your game
+is removed from the list promptly.
+Unless you are using multiple instances of the SDK, you should pass NULl
+for qrec.
+*******************/
+void qr_send_statechanged(qr_t qrec);
+
+/*****************
+QR_SHUTDOWN
+------------
+This function closes the sockets created in qr_init and takes care of
+any misc. cleanup. You should try to call it when before exiting the server
+if qr_init was called.
+If you pass in a qrec that was returned from qr_init, all resources associated
+with that qrec will be freed. If you passed NULL into qr_int, you can pass
+NULL in here as well.
+******************/
+void qr_shutdown(qr_t qrec);
+
+void qr_check_queries(qr_t qrec);
+
+void qr_send_exiting(qr_t qrec);
+
+int get_master_count();
+
+void clear_master_list();
+
+int get_sockaddrin(const char *host, int port, struct sockaddr_in *saddr, struct hostent **savehent);
+
+void add_master(struct sockaddr_in *addr);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/gamespy/webservices/AuthService.c b/code/gamespy/webservices/AuthService.c
index 0ad0ac51..11ecd459 100644
--- a/code/gamespy/webservices/AuthService.c
+++ b/code/gamespy/webservices/AuthService.c
@@ -51,7 +51,7 @@ const char WS_AUTHSERVICE_SIGNATURE_KEY[] =
 const char WS_AUTHSERVICE_SIGNATURE_EXP[] =
 	"010001";
 
-// This is declared as an extern so it can be overriden when testing
+// This is declared as an extern so it can be overridden when testing
 #define WS_LOGIN_SERVICE_URL_FORMAT   "https://%s.auth.pubsvs." GSI_DOMAIN_NAME "/AuthService/AuthService.asmx"
 char wsAuthServiceURL[WS_LOGIN_MAX_URL_LEN] = "";
 
diff --git a/code/libmad-0.15.1b/CMakeLists.txt b/code/libmad-0.15.1b/CMakeLists.txt
deleted file mode 100644
index 5b6b659a..00000000
--- a/code/libmad-0.15.1b/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(libmad)
-
-set(SRCS
-	"./bit.c"
-	"./decoder.c"
-	"./fixed.c"
-	"./frame.c"
-	"./huffman.c"
-	"./layer3.c"
-	"./layer12.c"
-	"./stream.c"
-	"./synth.c"
-	"./timer.c"
-	"./version.c"
-)
-
-add_library(libmad STATIC ${SRCS})
-target_compile_definitions(libmad PUBLIC FPM_64BIT)
diff --git a/code/libmad-0.15.1b/INSTALL b/code/libmad-0.15.1b/INSTALL
deleted file mode 100644
index 50dbe439..00000000
--- a/code/libmad-0.15.1b/INSTALL
+++ /dev/null
@@ -1,183 +0,0 @@
-Basic Installation
-==================
-
-   These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/code/libmad-0.15.1b/Makefile.am b/code/libmad-0.15.1b/Makefile.am
deleted file mode 100644
index ad5c596d..00000000
--- a/code/libmad-0.15.1b/Makefile.am
+++ /dev/null
@@ -1,140 +0,0 @@
-##
-## libmad - MPEG audio decoder library
-## Copyright (C) 2000-2004 Underbit Technologies, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
-## $Id: Makefile.am,v 1.23 2004/02/17 02:02:03 rob Exp $
-##
-
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS =		
-DIST_SUBDIRS =		msvc++
-
-lib_LTLIBRARIES =	libmad.la
-include_HEADERS =	mad.h
-
-EXTRA_PROGRAMS =	minimad
-
-minimad_SOURCES =	minimad.c
-minimad_INCLUDES =	
-minimad_LDADD =		libmad.la
-
-EXTRA_DIST =		mad.h.sed  \
-			CHANGES COPYRIGHT CREDITS README TODO VERSION
-
-exported_headers =	version.h fixed.h bit.h timer.h stream.h frame.h  \
-			synth.h decoder.h
-
-headers =		$(exported_headers)  \
-			global.h layer12.h layer3.h huffman.h
-
-data_includes =		D.dat imdct_s.dat qc_table.dat rq_table.dat  \
-			sf_table.dat
-
-libmad_la_SOURCES =	version.c fixed.c bit.c timer.c stream.c frame.c  \
-			synth.c decoder.c layer12.c layer3.c huffman.c  \
-			$(headers) $(data_includes)
-
-EXTRA_libmad_la_SOURCES =	imdct_l_arm.S #synth_mmx.S
-
-libmad_la_DEPENDENCIES =	@ASO_OBJS@
-libmad_la_LIBADD =		@ASO_OBJS@
-
-INCLUDES =		$(FPM) $(ASO)
-
-BUILT_SOURCES =		mad.h
-CLEANFILES =		mad.h
-
-## From the libtool documentation on library versioning:
-##
-## CURRENT
-##      The most recent interface number that this library implements.
-##
-## REVISION
-##      The implementation number of the CURRENT interface.
-##
-## AGE
-##      The difference between the newest and oldest interfaces that this
-##      library implements.  In other words, the library implements all the
-##      interface numbers in the range from number `CURRENT - AGE' to
-##      `CURRENT'.
-##
-##    If two libraries have identical CURRENT and AGE numbers, then the
-## dynamic linker chooses the library with the greater REVISION number.
-##
-##   1. Start with version information of `0:0:0' for each libtool library.
-##
-##   2. Update the version information only immediately before a public
-##      release of your software.  More frequent updates are unnecessary,
-##      and only guarantee that the current interface number gets larger
-##      faster.
-##
-##   3. If the library source code has changed at all since the last
-##      update, then increment REVISION (`C:R:A' becomes `C:r+1:A').
-##
-##   4. If any interfaces have been added, removed, or changed since the
-##      last update, increment CURRENT, and set REVISION to 0.
-##
-##   5. If any interfaces have been added since the last public release,
-##      then increment AGE.
-##
-##   6. If any interfaces have been removed since the last public release,
-##      then set AGE to 0.
-
-version_current =	2
-version_revision =	1
-version_age =		2
-
-version_info =		$(version_current):$(version_revision):$(version_age)
-
-libmad_la_LDFLAGS =	-version-info $(version_info)
-
-mad.h: config.status config.h Makefile.am  \
-		$(srcdir)/COPYRIGHT $(srcdir)/mad.h.sed $(exported_headers)
-	(sed -e '1s|.*|/*|' -e '1b' -e '$$s|.*| */|' -e '$$b'  \
-		-e 's/^.*/ *&/' $(srcdir)/COPYRIGHT; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo 'extern "C" {';  \
-	echo "# endif"; echo;  \
-	if [ ".$(FPM)" != "." ]; then  \
-		echo ".$(FPM)" | sed -e 's|^\.-D|# define |'; echo;  \
-	fi;  \
-	sed -ne 's/^# *define  *\(HAVE_.*_ASM\).*/# define \1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *OPT_\(SPEED\|ACCURACY\).*/# define OPT_\1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *\(SIZEOF_.*\)/# define \1/p'  \
-		config.h; echo;  \
-	for header in $(exported_headers); do  \
-		echo;  \
-		sed -n -f $(srcdir)/mad.h.sed $(srcdir)/$$header;  \
-	done; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo '}';  \
-	echo "# endif") >$@
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
-.c.s:
-	$(COMPILE) -S $<
-
-again:
-	$(MAKE) clean
-	$(MAKE)
-
-.PHONY: again
diff --git a/code/libmad-0.15.1b/Makefile.in b/code/libmad-0.15.1b/Makefile.in
deleted file mode 100644
index 723070ad..00000000
--- a/code/libmad-0.15.1b/Makefile.in
+++ /dev/null
@@ -1,821 +0,0 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) $(minimad_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-EXTRA_PROGRAMS = minimad$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/libmad.list.in \
-	$(top_srcdir)/configure COPYING INSTALL TODO config.guess \
-	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libmad.list
-am__installdirs = $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__objects_1 =
-am__objects_2 = $(am__objects_1)
-am_libmad_la_OBJECTS = version.lo fixed.lo bit.lo timer.lo stream.lo \
-	frame.lo synth.lo decoder.lo layer12.lo layer3.lo huffman.lo \
-	$(am__objects_2) $(am__objects_1)
-libmad_la_OBJECTS = $(am_libmad_la_OBJECTS)
-am_minimad_OBJECTS = minimad.$(OBJEXT)
-minimad_OBJECTS = $(am_minimad_OBJECTS)
-minimad_DEPENDENCIES = libmad.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bit.Plo ./$(DEPDIR)/decoder.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/fixed.Plo ./$(DEPDIR)/frame.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/huffman.Plo ./$(DEPDIR)/layer12.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/layer3.Plo ./$(DEPDIR)/minimad.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stream.Plo ./$(DEPDIR)/synth.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/timer.Plo ./$(DEPDIR)/version.Plo
-CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
-	$(CCASFLAGS)
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \
-	$(minimad_SOURCES)
-DIST_SOURCES = $(libmad_la_SOURCES) $(EXTRA_libmad_la_SOURCES) \
-	$(minimad_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ASO = @ASO@
-ASO_OBJS = @ASO_OBJS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPM = @FPM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = 
-DIST_SUBDIRS = msvc++
-lib_LTLIBRARIES = libmad.la
-include_HEADERS = mad.h
-minimad_SOURCES = minimad.c
-minimad_INCLUDES = 
-minimad_LDADD = libmad.la
-EXTRA_DIST = mad.h.sed  \
-			CHANGES COPYRIGHT CREDITS README TODO VERSION
-
-exported_headers = version.h fixed.h bit.h timer.h stream.h frame.h  \
-			synth.h decoder.h
-
-headers = $(exported_headers)  \
-			global.h layer12.h layer3.h huffman.h
-
-data_includes = D.dat imdct_s.dat qc_table.dat rq_table.dat  \
-			sf_table.dat
-
-libmad_la_SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c  \
-			synth.c decoder.c layer12.c layer3.c huffman.c  \
-			$(headers) $(data_includes)
-
-EXTRA_libmad_la_SOURCES = imdct_l_arm.S #synth_mmx.S
-libmad_la_DEPENDENCIES = @ASO_OBJS@
-libmad_la_LIBADD = @ASO_OBJS@
-INCLUDES = $(FPM) $(ASO)
-BUILT_SOURCES = mad.h
-CLEANFILES = mad.h
-version_current = 2
-version_revision = 1
-version_age = 2
-version_info = $(version_current):$(version_revision):$(version_age)
-libmad_la_LDFLAGS = -version-info $(version_info)
-all: $(BUILT_SOURCES) config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-libmad.list: $(top_builddir)/config.status $(srcdir)/libmad.list.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkdir_p) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libmad.la: $(libmad_la_OBJECTS) $(libmad_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libmad_la_LDFLAGS) $(libmad_la_OBJECTS) $(libmad_la_LIBADD) $(LIBS)
-minimad$(EXEEXT): $(minimad_OBJECTS) $(minimad_DEPENDENCIES) 
-	@rm -f minimad$(EXEEXT)
-	$(LINK) $(minimad_LDFLAGS) $(minimad_OBJECTS) $(minimad_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fixed.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/huffman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer12.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layer3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/minimad.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/synth.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Plo@am__quote@
-
-.S.o:
-	$(CCASCOMPILE) -c $<
-
-.S.obj:
-	$(CCASCOMPILE) -c `$(CYGPATH_W) '$<'`
-
-.S.lo:
-	$(LTCCASCOMPILE) -c -o $@ $<
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	$(mkdir_p) $(DESTDIR)$(includedir)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
-	  $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
-	  rm -f $(DESTDIR)$(includedir)/$$f; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && $(mkdir_p) "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkdir_p) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-recursive
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libLTLIBRARIES \
-	clean-libtool clean-recursive ctags ctags-recursive dist \
-	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-includeHEADERS uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-
-mad.h: config.status config.h Makefile.am  \
-		$(srcdir)/COPYRIGHT $(srcdir)/mad.h.sed $(exported_headers)
-	(sed -e '1s|.*|/*|' -e '1b' -e '$$s|.*| */|' -e '$$b'  \
-		-e 's/^.*/ *&/' $(srcdir)/COPYRIGHT; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo 'extern "C" {';  \
-	echo "# endif"; echo;  \
-	if [ ".$(FPM)" != "." ]; then  \
-		echo ".$(FPM)" | sed -e 's|^\.-D|# define |'; echo;  \
-	fi;  \
-	sed -ne 's/^# *define  *\(HAVE_.*_ASM\).*/# define \1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *OPT_\(SPEED\|ACCURACY\).*/# define OPT_\1/p'  \
-		config.h; echo;  \
-	sed -ne 's/^# *define  *\(SIZEOF_.*\)/# define \1/p'  \
-		config.h; echo;  \
-	for header in $(exported_headers); do  \
-		echo;  \
-		sed -n -f $(srcdir)/mad.h.sed $(srcdir)/$$header;  \
-	done; echo;  \
-	echo "# ifdef __cplusplus";  \
-	echo '}';  \
-	echo "# endif") >$@
-
-libtool: $(LIBTOOL_DEPS)
-	$(SHELL) ./config.status --recheck
-
-.c.s:
-	$(COMPILE) -S $<
-
-again:
-	$(MAKE) clean
-	$(MAKE)
-
-.PHONY: again
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/code/libmad-0.15.1b/README b/code/libmad-0.15.1b/README
deleted file mode 100644
index b3f15ea4..00000000
--- a/code/libmad-0.15.1b/README
+++ /dev/null
@@ -1,241 +0,0 @@
-
- libmad - MPEG audio decoder library
- Copyright (C) 2000-2004 Underbit Technologies, Inc.
-
- $Id: README,v 1.4 2004/01/23 09:41:32 rob Exp $
-
-===============================================================================
-
-INTRODUCTION
-
-  MAD (libmad) is a high-quality MPEG audio decoder. It currently supports
-  MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as
-  the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
-  and Layer III a.k.a. MP3) are fully implemented.
-
-  MAD does not yet support MPEG-2 multichannel audio (although it should be
-  backward compatible with such streams) nor does it currently support AAC.
-
-  MAD has the following special features:
-
-    - 24-bit PCM output
-    - 100% fixed-point (integer) computation
-    - completely new implementation based on the ISO/IEC standards
-    - distributed under the terms of the GNU General Public License (GPL)
-
-  Because MAD provides full 24-bit PCM output, applications using MAD are
-  able to produce high quality audio. Even when the output device supports
-  only 16-bit PCM, applications can use the extra resolution to increase the
-  audible dynamic range through the use of dithering or noise shaping.
-
-  Because MAD uses integer computation rather than floating point, it is
-  well suited for architectures without a floating point unit. All
-  calculations are performed with a 32-bit fixed-point integer
-  representation.
-
-  Because MAD is a new implementation of the ISO/IEC standards, it is
-  unencumbered by the errors of other implementations. MAD is NOT a
-  derivation of the ISO reference source or any other code. Considerable
-  effort has been expended to ensure a correct implementation, even in cases
-  where the standards are ambiguous or misleading.
-
-  Because MAD is distributed under the terms of the GPL, its redistribution
-  is not generally restricted, so long as the terms of the GPL are followed.
-  This means MAD can be incorporated into other software as long as that
-  software is also distributed under the GPL. (Should this be undesirable,
-  alternate arrangements may be possible by contacting Underbit.)
-
-===============================================================================
-
-ABOUT THE CODE
-
-  The code is optimized and performs very well, although specific
-  improvements can still be made. The output from the decoder library
-  consists of 32-bit signed linear fixed-point values that can be easily
-  scaled for any size PCM output, up to 24 bits per sample.
-
-  The API for libmad can be found in the `mad.h' header file. Note that this
-  file is automatically generated, and will not exist until after you have
-  built the library.
-
-  There are two APIs available, one high-level, and the other low-level.
-  With the low-level API, each step of the decoding process must be handled
-  explicitly, offering the greatest amount of control. With the high-level
-  API, after callbacks are configured, a single routine will decode an
-  entire bitstream.
-
-  The high-level API may either be used synchronously or asynchronously. If
-  used asynchronously, decoding will occur in a separate process.
-  Communication is possible with the decoding process by passing control
-  messages.
-
-  The file `minimad.c' contains an example usage of the libmad API that
-  shows only the bare minimum required to implement a useful decoder. It
-  expects a regular file to be redirected to standard input, and it sends
-  decoded 16-bit signed little-endian PCM samples to standard output. If a
-  decoding error occurs, it is reported to standard error and decoding
-  continues. Note that the scale() routine in this code is only provided as
-  an example; it rounds MAD's high-resolution samples down to 16 bits, but
-  does not perform any dithering or noise shaping. It is therefore not
-  recommended to use this routine as-is in your own code if sound quality is
-  important.
-
-Integer Performance
-
-  To get the best possible performance, it is recommended that an assembly
-  version of the fixed-point multiply and related routines be selected.
-  Several such assembly routines have been written for various CPUs.
-
-  If an assembly version is not available, a fast approximation version will
-  be used. This will result in reduced accuracy of the decoder.
-
-  Alternatively, if 64-bit integers are supported as a datatype by the
-  compiler, another version can be used that is much more accurate.
-  However, using an assembly version is generally much faster and just as
-  accurate.
-
-  More information can be gathered from the `fixed.h' header file.
-
-  MAD's CPU-intensive subband synthesis routine can be further optimized at
-  the expense of a slight loss in output accuracy due to a modified method
-  for fixed-point multiplication with a small windowing constant. While this
-  is helpful for performance and the output accuracy loss is generally
-  undetectable, it is disabled by default and must be explicitly enabled.
-
-  Under some architectures, other special optimizations may also be
-  available.
-
-Audio Quality
-
-  The output from MAD has been found to satisfy the ISO/IEC 11172-4
-  computational accuracy requirements for compliance. In most
-  configurations, MAD is a Full Layer III ISO/IEC 11172-3 audio decoder as
-  defined by the standard.
-
-  When the approximation version of the fixed-point multiply is used, MAD is
-  a limited accuracy ISO/IEC 11172-3 audio decoder as defined by the
-  standard.
-
-  MAD can alternatively be configured to produce output with less or more
-  accuracy than the default, as a tradeoff with performance.
-
-  MAD produces output samples with a precision greater than 24 bits. Because
-  most output formats use fewer bits, typically 16, it is recommended that a
-  dithering algorithm be used (rather than rounding or truncating) to obtain
-  the highest quality audio. However, dithering may unfavorably affect an
-  analytic examination of the output (such as compliance testing); you may
-  therefore wish to use rounding in this case instead.
-
-Portability Issues
-
-  GCC is preferred to compile the code, but other compilers may also work.
-  The assembly code in `fixed.h' depends on the inline assembly features of
-  your compiler. If you're not using GCC or MSVC++, you can either write
-  your own assembly macros or use the default (low quality output) version.
-
-  The union initialization of `huffman.c' may not be portable to all
-  platforms when GCC is not used.
-
-  The code should not be sensitive to word sizes or byte ordering, however
-  it does assume A % B has the same sign as A.
-
-===============================================================================
-
-BUILDING AND INSTALLING
-
-Windows Platforms
-
-  MAD can be built under Windows using either MSVC++ or Cygwin. A MSVC++
-  project file can be found under the `msvc++' subdirectory.
-
-  To build libmad using Cygwin, you will first need to install the Cygwin
-  tools:
-
-      http://www.cygwin.com/
-
-  You may then proceed with the following POSIX instructions within the
-  Cygwin shell.
-
-  Note that by default Cygwin will build a library that depends on the
-  Cygwin DLL. You can use MinGW to build a library that does not depend on
-  the Cygwin DLL. To do so, give the option --host=mingw32 to `configure'.
-
-POSIX Platforms (including Cygwin)
-
-  The code is distributed with a `configure' script that will generate for
-  you a `Makefile' and a `config.h' for your platform. See the file
-  `INSTALL' for generic instructions.
-
-  The specific options you may want to give `configure' are:
-
-      --enable-speed            optimize for speed over accuracy
-
-      --enable-accuracy         optimize for accuracy over speed
-
-      --disable-debugging       do not compile with debugging support, and
-                                use more optimizations
-
-      --disable-shared          do not build a shared library
-
-  Note that you need not specify one of --enable-speed or --enable-accuracy;
-  in its default configuration, MAD is optimized for both. You should only
-  use one of these options if you wish to compromise speed or accuracy for
-  the other.
-
-  By default the package will build a shared library if possible for your
-  platform. If you want only a static library, use --disable-shared.
-
-  It is not normally necessary to use the following options, but you may
-  fine-tune the configuration with them if desired:
-
-      --enable-fpm=ARCH         use the ARCH-specific version of the
-                                fixed-point math assembly routines
-                                (current options are: intel, arm, mips,
-                                sparc, ppc; also allowed are: 64bit, approx)
-
-      --enable-sso              use the subband synthesis optimization,
-                                with reduced accuracy
-
-      --disable-aso             do not use certain architecture-specific
-                                optimizations
-
-  By default an appropriate fixed-point assembly routine will be selected
-  for the configured host type, if it can be determined. Thus if you are
-  cross-compiling for another architecture, you should be sure either to
-  give `configure' a host type argument (--host) or to use an explicit
-  --enable-fpm option.
-
-  If an appropriate assembly routine cannot be determined, the default
-  approximation version will be used. In this case, use of an alternate
-  --enable-fpm is highly recommended.
-
-Experimenting and Developing
-
-  Further options for `configure' that may be useful to developers and
-  experimenters are:
-
-      --enable-debugging        enable diagnostic debugging support and
-                                debugging symbols
-
-      --enable-profiling        generate `gprof' profiling code
-
-      --enable-experimental     enable code using the EXPERIMENTAL
-                                preprocessor define
-
-===============================================================================
-
-COPYRIGHT
-
-  Please read the `COPYRIGHT' file for copyright and warranty information.
-  Also, the file `COPYING' contains the full text of the GNU GPL.
-
-  Send inquiries, comments, bug reports, suggestions, patches, etc. to:
-
-      Underbit Technologies, Inc. <support@underbit.com>
-
-  See also the MAD home page on the Web:
-
-      http://www.underbit.com/products/mad/
-
-===============================================================================
-
diff --git a/code/libmad-0.15.1b/VERSION b/code/libmad-0.15.1b/VERSION
deleted file mode 100644
index d4e8f64a..00000000
--- a/code/libmad-0.15.1b/VERSION
+++ /dev/null
@@ -1,7 +0,0 @@
-0.15.1b
-configure.ac:24
-version.h:25-28
-msvc++/config.h:99,105,120
-msvc++/mad.h:41-44
-
-Makefile.am:98-100
diff --git a/code/libmad-0.15.1b/aclocal.m4 b/code/libmad-0.15.1b/aclocal.m4
deleted file mode 100644
index 1d15e0b9..00000000
--- a/code/libmad-0.15.1b/aclocal.m4
+++ /dev/null
@@ -1,6849 +0,0 @@
-# generated automatically by aclocal 1.8.2 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 192 $
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  testring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd* | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDRT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-      fi
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi4*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-])
-AC_MSG_RESULT([$SED])
-])
-
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.2])])
-
-# Figure out how to run the assembler.             -*- Autoconf -*-
-
-# serial 3
-
-# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 6
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# serial 6						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 7
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p -- . 2>/dev/null; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
diff --git a/code/libmad-0.15.1b/bit.h b/code/libmad-0.15.1b/bit.h
deleted file mode 100644
index 5a51570b..00000000
--- a/code/libmad-0.15.1b/bit.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: bit.h,v 1.12 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
diff --git a/code/libmad-0.15.1b/config.guess b/code/libmad-0.15.1b/config.guess
deleted file mode 100644
index e8c6fc0c..00000000
--- a/code/libmad-0.15.1b/config.guess
+++ /dev/null
@@ -1,1432 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-05'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	if test $UNAME_RELEASE = "V4.0"; then
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[567]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DRAGONFLY:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/code/libmad-0.15.1b/config.h.in b/code/libmad-0.15.1b/config.h.in
deleted file mode 100644
index a29b5820..00000000
--- a/code/libmad-0.15.1b/config.h.in
+++ /dev/null
@@ -1,135 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to enable diagnostic debugging support. */
-#undef DEBUG
-
-/* Define to enable experimental code. */
-#undef EXPERIMENTAL
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the `fcntl' function. */
-#undef HAVE_FCNTL
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <limits.h> header file. */
-#undef HAVE_LIMITS_H
-
-/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */
-#undef HAVE_MADD16_ASM
-
-/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
-#undef HAVE_MADD_ASM
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `pipe' function. */
-#undef HAVE_PIPE
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-#undef HAVE_SYS_WAIT_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `waitpid' function. */
-#undef HAVE_WAITPID
-
-/* Define to disable debugging assertions. */
-#undef NDEBUG
-
-/* Define to optimize for accuracy over speed. */
-#undef OPT_ACCURACY
-
-/* Define to optimize for speed over accuracy. */
-#undef OPT_SPEED
-
-/* Define to enable a fast subband synthesis approximation optimization. */
-#undef OPT_SSO
-
-/* Define to influence a strict interpretation of the ISO/IEC standards, even
-   if this is in opposition with best accepted practices. */
-#undef OPT_STRICT
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of a `long long', as computed by sizeof. */
-#undef SIZEOF_LONG_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
diff --git a/code/libmad-0.15.1b/config.sub b/code/libmad-0.15.1b/config.sub
deleted file mode 100644
index 463186db..00000000
--- a/code/libmad-0.15.1b/config.sub
+++ /dev/null
@@ -1,1537 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-05'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/code/libmad-0.15.1b/configure b/code/libmad-0.15.1b/configure
deleted file mode 100644
index ee421cc3..00000000
--- a/code/libmad-0.15.1b/configure
+++ /dev/null
@@ -1,23106 +0,0 @@
-#! /bin/sh
-# From configure.ac Id: configure.ac,v 1.9 2004/01/23 09:41:32 rob Exp .
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for MPEG Audio Decoder 0.15.1b.
-#
-# Report bugs to <support@underbit.com>.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='MPEG Audio Decoder'
-PACKAGE_TARNAME='libmad'
-PACKAGE_VERSION='0.15.1b'
-PACKAGE_STRING='MPEG Audio Decoder 0.15.1b'
-PACKAGE_BUGREPORT='support@underbit.com'
-
-ac_unique_file="decoder.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS FPM ASO ASO_OBJS LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CCAS_set=${CCAS+set}
-ac_env_CCAS_value=$CCAS
-ac_cv_env_CCAS_set=${CCAS+set}
-ac_cv_env_CCAS_value=$CCAS
-ac_env_CCASFLAGS_set=${CCASFLAGS+set}
-ac_env_CCASFLAGS_value=$CCASFLAGS
-ac_cv_env_CCASFLAGS_set=${CCASFLAGS+set}
-ac_cv_env_CCASFLAGS_value=$CCASFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures MPEG Audio Decoder 0.15.1b to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of MPEG Audio Decoder 0.15.1b:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-speed          optimize for speed over accuracy
-  --enable-accuracy       optimize for accuracy over speed
-  --enable-fpm=ARCH       use ARCH-specific fixed-point math routines (one of:
-                          intel, arm, mips, sparc, ppc, 64bit, default)
-  --enable-sso            use subband synthesis optimization
-  --disable-aso           disable architecture-specific optimizations
-  --enable-strict-iso     use strict ISO/IEC interpretations
-  --enable-profiling      generate profiling code
-  --enable-debugging      enable diagnostic debugging support
-  --disable-debugging     do not enable debugging and use more optimization
-  --enable-experimental   enable experimental code
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CCAS        assembler compiler command (defaults to CC)
-  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <support@underbit.com>.
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-MPEG Audio Decoder configure 0.15.1b
-generated by GNU Autoconf 2.59
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by MPEG Audio Decoder $as_me 0.15.1b, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-am__api_version="1.8"
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p -- . 2>/dev/null; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libmad'
- VERSION='0.15.1b'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-
-if test "$GCC" = yes
-then
-    case "$host" in
-	*-*-mingw*)
-	    case "$build" in
-		*-*-cygwin*)
-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-		    LDFLAGS="$LDFLAGS -mno-cygwin"
-		    ;;
-	    esac
-    esac
-
-fi
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi;
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi;
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi;
-
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-
-fi
-
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
-NM="$lt_cv_path_NM"
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 3683 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  lt_cv_cc_needs_belf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-lt_cv_cc_needs_belf=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to support@underbit.com ##
-## ----------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      : > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_F77" && break
-done
-
-  F77=$ac_ct_F77
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:5240:" \
-     "checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_f77_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  testring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-fi
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDRT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-fi
-
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AR=$ac_ct_AR
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi;
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6272: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6276: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6505: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6509: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-
-if test x"$lt_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6565: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:6569: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
-      link_all_deplibs=yes
-    else
-      ld_shlibs=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec=
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8740 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8838 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# Report which librarie types wil actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
-    ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags or --without-tags was given.
-if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd12*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-        ;;
-      *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd* | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11015: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:11019: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11075: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:11079: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12429 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12527 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13354: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:13358: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13414: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:13418: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_F77="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_F77="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_F77=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
-      link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_F77=
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15446: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15450: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15679: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15683: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15739: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:15743: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_GCJ="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_GCJ=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
-      link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd* | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_GCJ=
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 17914 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18012 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext='$shrext'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-arch=""
-debug=""
-optimize=""
-profile=""
-
-set -- $CFLAGS
-CFLAGS=""
-
-if test "$GCC" = yes
-then
-    CFLAGS="-Wall"
-fi
-
-while test $# -gt 0
-do
-    case "$1" in
-	-Wall)
-	    if test "$GCC" = yes
-	    then
-		:
-	    else
-		CFLAGS="$CFLAGS $1"
-	    fi
-	    shift
-	    ;;
-	-g)
-	    debug="-g"
-	    shift
-	    ;;
-	-mno-cygwin)
-	    shift
-	    ;;
-	-m*)
-	    arch="$arch $1"
-	    shift
-	    ;;
-	-O2)
-	    optimize="-O"
-	    shift
-	    ;;
-	-fomit-frame-pointer)
-	    shift
-	    ;;
-	-O*|-f*)
-	    optimize="$optimize $1"
-	    shift
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS $1"
-	    shift
-	    ;;
-    esac
-done
-
-if test "$GCC" = yes
-then
-    if test -z "$arch"
-    then
-	case "$host" in
-	    i386-*)           ;;
-	    i?86-*)           arch="-march=i486" ;;
-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
-	    powerpc-*)        ;;
-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-	esac
-    fi
-
-    case "$optimize" in
-	-O|"-O "*)
-	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
-	    optimize="$optimize -fforce-addr"
-	    : #x optimize="$optimize -finline-functions"
-	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
-	    : #x optimize="$optimize -frerun-cse-after-loop"
-	    : #x optimize="$optimize -frerun-loop-opt"
-	    : #x optimize="$optimize -fgcse"
-	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
-	    : #* optimize="$optimize -fdelayed-branch"
-	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
-	    : #? optimize="$optimize -ffunction-sections"
-	    : #? optimize="$optimize -fcaller-saves"
-	    : #> optimize="$optimize -funroll-loops"
-	    : #> optimize="$optimize -funroll-all-loops"
-	    : #x optimize="$optimize -fmove-all-movables"
-	    : #x optimize="$optimize -freduce-all-givs"
-	    : #? optimize="$optimize -fstrict-aliasing"
-	    : #* optimize="$optimize -fstructure-noalias"
-
-	    case "$host" in
-		arm*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		mips*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    optimize="$optimize -finline-functions"
-		    ;;
-		i?86-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		powerpc-apple-*)
-		    # this triggers an internal compiler error with gcc2
-		    : #optimize="$optimize -fstrength-reduce"
-
-		    # this is really only beneficial with gcc3
-		    : #optimize="$optimize -finline-functions"
-		    ;;
-		*)
-		    # this sometimes provokes bugs in gcc 2.95.2
-		    : #optimize="$optimize -fstrength-reduce"
-		    ;;
-	    esac
-	    ;;
-    esac
-fi
-
-case "$host" in
-    mips*-agenda-*)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MADD16_ASM 1
-_ACEOF
-
-	;;
-    mips*-luxsonor-*)
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MADD_ASM 1
-_ACEOF
-
-	;;
-esac
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-
-int
-main ()
-{
-  int s;
-  wait (&s);
-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
-if test $ac_cv_header_sys_wait_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-for ac_header in assert.h limits.h unistd.h sys/types.h fcntl.h errno.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------------- ##
-## Report this to support@underbit.com ##
-## ----------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset x;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-  }
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifndef __cplusplus
-typedef int foo_t;
-static $ac_kw foo_t static_foo () {return 0; }
-$ac_kw foo_t foo () {return 0; }
-#endif
-
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
-
-case $ac_cv_c_inline in
-  inline | yes) ;;
-  *)
-    case $ac_cv_c_inline in
-      no) ac_val=;;
-      *) ac_val=$ac_cv_c_inline;;
-    esac
-    cat >>confdefs.h <<_ACEOF
-#ifndef __cplusplus
-#define inline $ac_val
-#endif
-_ACEOF
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-main ()
-{
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for int" >&5
-echo $ECHO_N "checking for int... $ECHO_C" >&6
-if test "${ac_cv_type_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((int *) 0)
-  return 0;
-if (sizeof (int))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_int=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_int=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
-echo "${ECHO_T}$ac_cv_type_int" >&6
-
-echo "$as_me:$LINENO: checking size of int" >&5
-echo $ECHO_N "checking size of int... $ECHO_C" >&6
-if test "${ac_cv_sizeof_int+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_int" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_int=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (int)); }
-unsigned long ulongval () { return (long) (sizeof (int)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (int))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (int))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_int=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (int), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_int=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-
-echo "$as_me:$LINENO: checking for long long" >&5
-echo $ECHO_N "checking for long long... $ECHO_C" >&6
-if test "${ac_cv_type_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long long *) 0)
-  return 0;
-if (sizeof (long long))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_long=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_long_long" >&6
-
-echo "$as_me:$LINENO: checking size of long long" >&5
-echo $ECHO_N "checking size of long long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long_long" = yes; then
-  # The cast to unsigned long works around a bug in the HP C Compiler
-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-  # This bug is HP SR number 8606223364.
-  if test "$cross_compiling" = yes; then
-  # Depending upon the size, compute the lo and hi bounds.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=0 ac_mid=0
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr $ac_mid + 1`
-		    if test $ac_lo -le $ac_mid; then
-		      ac_lo= ac_hi=
-		      break
-		    fi
-		    ac_mid=`expr 2 '*' $ac_mid + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=-1 ac_mid=-1
-  while :; do
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_lo=$ac_mid; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_hi=`expr '(' $ac_mid ')' - 1`
-		       if test $ac_mid -le $ac_hi; then
-			 ac_lo= ac_hi=
-			 break
-		       fi
-		       ac_mid=`expr 2 '*' $ac_mid`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo= ac_hi=
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-# Binary search between lo and hi bounds.
-while test "x$ac_lo" != "x$ac_hi"; do
-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
-test_array [0] = 0
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_hi=$ac_mid
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_lo=`expr '(' $ac_mid ')' + 1`
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-long longval () { return (long) (sizeof (long long)); }
-unsigned long ulongval () { return (long) (sizeof (long long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long long))))
-	exit (1);
-      fprintf (f, "%lu\n", i);
-    }
-  exit (ferror (f) || fclose (f) != 0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_sizeof_long_long=`cat conftest.val`
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.val
-else
-  ac_cv_sizeof_long_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-_ACEOF
-
-
-
-
-
-
-
-
-for ac_func in waitpid fcntl pipe fork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-echo "$as_me:$LINENO: checking whether to optimize for speed or for accuracy" >&5
-echo $ECHO_N "checking whether to optimize for speed or for accuracy... $ECHO_C" >&6
-
-# Check whether --enable-speed or --disable-speed was given.
-if test "${enable_speed+set}" = set; then
-  enableval="$enable_speed"
-
-    case "$enableval" in
-	yes)
-	    optimize_for="speed"
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_SPEED 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-# Check whether --enable-accuracy or --disable-accuracy was given.
-if test "${enable_accuracy+set}" = set; then
-  enableval="$enable_accuracy"
-
-    case "$enableval" in
-	yes)
-	    if test "$optimize_for" = "speed"
-	    then
-		optimize_for="both"
-	    else
-		optimize_for="accuracy"
-	    fi
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_ACCURACY 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-echo "$as_me:$LINENO: result: ${optimize_for-default}" >&5
-echo "${ECHO_T}${optimize_for-default}" >&6
-
-if test "$optimize_for" = "both"
-then
-    { { echo "$as_me:$LINENO: error: cannot optimize for both speed and accuracy" >&5
-echo "$as_me: error: cannot optimize for both speed and accuracy" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-echo "$as_me:$LINENO: checking for architecture-specific fixed-point math routines" >&5
-echo $ECHO_N "checking for architecture-specific fixed-point math routines... $ECHO_C" >&6
-# Check whether --enable-fpm or --disable-fpm was given.
-if test "${enable_fpm+set}" = set; then
-  enableval="$enable_fpm"
-
-    case "$enableval" in
-	yes)                             ;;
-	no|default|approx) FPM="DEFAULT" ;;
-	intel|i?86)        FPM="INTEL"   ;;
-	arm)               FPM="ARM"     ;;
-	mips)              FPM="MIPS"    ;;
-	sparc)             FPM="SPARC"   ;;
-	ppc|powerpc)       FPM="PPC"     ;;
-	64bit)             FPM="64BIT"   ;;
-	float)             FPM="FLOAT"   ;;
-	*)
-	    echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-	    { { echo "$as_me:$LINENO: error: bad --enable-fpm option" >&5
-echo "$as_me: error: bad --enable-fpm option" >&2;}
-   { (exit 1); exit 1; }; }
-	    ;;
-    esac
-
-fi;
-
-if test -z "$FPM" && test "$GCC" = yes
-then
-    case "$host" in
-	i?86-*)     FPM="INTEL"  ;;
-	arm*-*)     FPM="ARM"    ;;
-	mips*-*)    FPM="MIPS"   ;;
-	sparc*-*)   FPM="SPARC"  ;;
-	powerpc*-*) FPM="PPC"    ;;
-	# FIXME: need to test for 64-bit long long...
-    esac
-fi
-
-echo "$as_me:$LINENO: result: ${FPM=DEFAULT}" >&5
-echo "${ECHO_T}${FPM=DEFAULT}" >&6
-
-if test "$FPM" = "DEFAULT"
-then
-    { echo "$as_me:$LINENO: WARNING: default fixed-point math will yield limited accuracy" >&5
-echo "$as_me: WARNING: default fixed-point math will yield limited accuracy" >&2;}
-fi
-
-FPM="-DFPM_$FPM"
-
-# Check whether --enable-sso or --disable-sso was given.
-if test "${enable_sso+set}" = set; then
-  enableval="$enable_sso"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_SSO 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-
-# Check whether --enable-aso or --disable-aso was given.
-if test "${enable_aso+set}" = set; then
-  enableval="$enable_aso"
-
-else
-  enable_aso=yes
-fi;
-
-if test "$enable_aso" = yes
-then
-    case "$host" in
-	i?86-*)
-	    : #ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    : #not yet #ASO="$ASO -DASO_SYNTH"
-	    : #not yet #ASO_OBJS="synth_mmx.lo"
-	    ;;
-	arm*-*)
-	    ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_IMDCT"
-	    ASO_OBJS="imdct_l_arm.lo"
-	    ;;
-	mips*-*)
-	    ASO="$ASO -DASO_INTERLEAVE2"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    ;;
-    esac
-fi
-
-echo "$as_me:$LINENO: checking for ISO/IEC interpretation" >&5
-echo $ECHO_N "checking for ISO/IEC interpretation... $ECHO_C" >&6
-# Check whether --enable-strict-iso or --disable-strict-iso was given.
-if test "${enable_strict_iso+set}" = set; then
-  enableval="$enable_strict_iso"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define OPT_STRICT 1
-_ACEOF
-
-	    interpretation="strict"
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${interpretation-best accepted practices}" >&5
-echo "${ECHO_T}${interpretation-best accepted practices}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable profiling" >&5
-echo $ECHO_N "checking whether to enable profiling... $ECHO_C" >&6
-# Check whether --enable-profiling or --disable-profiling was given.
-if test "${enable_profiling+set}" = set; then
-  enableval="$enable_profiling"
-
-    case "$enableval" in
-	yes) profile="-pg" ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_profiling-no}" >&5
-echo "${ECHO_T}${enable_profiling-no}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable debugging" >&5
-echo $ECHO_N "checking whether to enable debugging... $ECHO_C" >&6
-# Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
-  enableval="$enable_debugging"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
-
-	    optimize=""
-	    ;;
-	no)
-	    if test -n "$profile"
-	    then
-    { { echo "$as_me:$LINENO: error: --enable-profiling and --disable-debugging are incompatible" >&5
-echo "$as_me: error: --enable-profiling and --disable-debugging are incompatible" >&2;}
-   { (exit 1); exit 1; }; }
-	    fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
-	    debug=""
-	    if test "$GCC" = yes
-	    then
-		optimize="$optimize -fomit-frame-pointer"
-	    fi
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_debugging-default}" >&5
-echo "${ECHO_T}${enable_debugging-default}" >&6
-
-echo "$as_me:$LINENO: checking whether to enable experimental code" >&5
-echo $ECHO_N "checking whether to enable experimental code... $ECHO_C" >&6
-# Check whether --enable-experimental or --disable-experimental was given.
-if test "${enable_experimental+set}" = set; then
-  enableval="$enable_experimental"
-
-    case "$enableval" in
-	yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define EXPERIMENTAL 1
-_ACEOF
-
-	    ;;
-    esac
-
-fi;
-echo "$as_me:$LINENO: result: ${enable_experimental-no}" >&5
-echo "${ECHO_T}${enable_experimental-no}" >&6
-
-
-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
-
-
-                              ac_config_files="$ac_config_files Makefile msvc++/Makefile libmad.list"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by MPEG Audio Decoder $as_me 0.15.1b, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-MPEG Audio Decoder config.status 0.15.1b
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "msvc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES msvc++/Makefile" ;;
-  "libmad.list" ) CONFIG_FILES="$CONFIG_FILES libmad.list" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CCAS@,$CCAS,;t t
-s,@CCASFLAGS@,$CCASFLAGS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-s,@FPM@,$FPM,;t t
-s,@ASO@,$ASO,;t t
-s,@ASO_OBJS@,$ASO_OBJS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/code/libmad-0.15.1b/configure.ac b/code/libmad-0.15.1b/configure.ac
deleted file mode 100644
index 9b793995..00000000
--- a/code/libmad-0.15.1b/configure.ac
+++ /dev/null
@@ -1,433 +0,0 @@
-dnl -*- m4 -*-
-dnl
-dnl libmad - MPEG audio decoder library
-dnl Copyright (C) 2000-2004 Underbit Technologies, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-dnl
-AC_REVISION([$Id: configure.ac,v 1.9 2004/01/23 09:41:32 rob Exp $])dnl
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT([MPEG Audio Decoder], [0.15.1b], [support@underbit.com], [libmad])
-AC_PREREQ(2.53)
-
-AC_CONFIG_SRCDIR([decoder.h])
-
-AM_INIT_AUTOMAKE
-
-AM_CONFIG_HEADER([config.h])
-
-dnl System type.
-
-AC_CANONICAL_HOST
-
-dnl Checks for programs.
-
-AC_PROG_CC
-AM_PROG_AS
-
-if test "$GCC" = yes
-then
-    case "$host" in
-	*-*-mingw*)
-	    case "$build" in
-		*-*-cygwin*)
-		    CPPFLAGS="$CPPFLAGS -mno-cygwin"
-		    LDFLAGS="$LDFLAGS -mno-cygwin"
-		    ;;
-	    esac
-    esac
-
-dnl    case "$host" in
-dnl	*-*-cygwin* | *-*-mingw*)
-dnl	    LDFLAGS="$LDFLAGS -no-undefined -mdll"
-dnl	    ;;
-dnl    esac
-fi
-
-dnl Support for libtool.
-
-dnl AC_DISABLE_SHARED
-dnl AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-AC_SUBST(LIBTOOL_DEPS)
-
-dnl Compiler options.
-
-arch=""
-debug=""
-optimize=""
-profile=""
-
-set -- $CFLAGS
-CFLAGS=""
-
-if test "$GCC" = yes
-then
-    CFLAGS="-Wall"
-fi
-
-while test $# -gt 0
-do
-    case "$1" in
-	-Wall)
-	    if test "$GCC" = yes
-	    then
-		:
-	    else
-		CFLAGS="$CFLAGS $1"
-	    fi
-	    shift
-	    ;;
-	-g)
-	    debug="-g"
-	    shift
-	    ;;
-	-mno-cygwin)
-	    shift
-	    ;;
-	-m*)
-	    arch="$arch $1"
-	    shift
-	    ;;
-	-O2)
-	    optimize="-O"
-	    shift
-	    ;;
-	-fomit-frame-pointer)
-	    shift
-	    ;;
-	-O*|-f*)
-	    optimize="$optimize $1"
-	    shift
-	    ;;
-	*)
-	    CFLAGS="$CFLAGS $1"
-	    shift
-	    ;;
-    esac
-done
-
-if test "$GCC" = yes
-then
-    if test -z "$arch"
-    then
-	case "$host" in
-	    i386-*)           ;;
-	    i?86-*)           arch="-march=i486" ;;
-	    arm*-empeg-*)     arch="-march=armv4 -mtune=strongarm1100" ;;
-	    armv4*-*)         arch="-march=armv4 -mtune=strongarm" ;;
-	    powerpc-*)        ;;
-	    mips*-agenda-*)   arch="-mcpu=vr4100" ;;
-	    mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;;
-	esac
-    fi
-
-    case "$optimize" in
-	-O|"-O "*)
-	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
-	    optimize="$optimize -fforce-addr"
-	    : #x optimize="$optimize -finline-functions"
-	    : #- optimize="$optimize -fstrength-reduce"
-	    optimize="$optimize -fthread-jumps"
-	    optimize="$optimize -fcse-follow-jumps"
-	    optimize="$optimize -fcse-skip-blocks"
-	    : #x optimize="$optimize -frerun-cse-after-loop"
-	    : #x optimize="$optimize -frerun-loop-opt"
-	    : #x optimize="$optimize -fgcse"
-	    optimize="$optimize -fexpensive-optimizations"
-	    optimize="$optimize -fregmove"
-	    : #* optimize="$optimize -fdelayed-branch"
-	    : #x optimize="$optimize -fschedule-insns"
-	    optimize="$optimize -fschedule-insns2"
-	    : #? optimize="$optimize -ffunction-sections"
-	    : #? optimize="$optimize -fcaller-saves"
-	    : #> optimize="$optimize -funroll-loops"
-	    : #> optimize="$optimize -funroll-all-loops"
-	    : #x optimize="$optimize -fmove-all-movables"
-	    : #x optimize="$optimize -freduce-all-givs"
-	    : #? optimize="$optimize -fstrict-aliasing"
-	    : #* optimize="$optimize -fstructure-noalias"
-
-	    case "$host" in
-		arm*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		mips*-*)
-		    optimize="$optimize -fstrength-reduce"
-		    optimize="$optimize -finline-functions"
-		    ;;
-		i?86-*)
-		    optimize="$optimize -fstrength-reduce"
-		    ;;
-		powerpc-apple-*)
-		    # this triggers an internal compiler error with gcc2
-		    : #optimize="$optimize -fstrength-reduce"
-
-		    # this is really only beneficial with gcc3
-		    : #optimize="$optimize -finline-functions"
-		    ;;
-		*)
-		    # this sometimes provokes bugs in gcc 2.95.2
-		    : #optimize="$optimize -fstrength-reduce"
-		    ;;
-	    esac
-	    ;;
-    esac
-fi
-
-case "$host" in
-    mips*-agenda-*)
-	AC_DEFINE(HAVE_MADD16_ASM, 1,
-	    [Define if your MIPS CPU supports a 2-operand MADD16 instruction.])
-	;;
-    mips*-luxsonor-*)
-	AC_DEFINE(HAVE_MADD_ASM, 1,
-	    [Define if your MIPS CPU supports a 2-operand MADD instruction.])
-	;;
-esac
-
-dnl Checks for header files.
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(assert.h limits.h unistd.h sys/types.h fcntl.h errno.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-AC_C_CONST
-AC_C_INLINE
-AC_C_BIGENDIAN
-AC_TYPE_PID_T
-
-AC_CHECK_SIZEOF(int, 2)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 8)
-
-dnl Checks for library functions.
-
-AC_CHECK_FUNCS(waitpid fcntl pipe fork)
-
-dnl Other options.
-
-AC_SUBST(FPM)
-AC_SUBST(ASO)
-AC_SUBST(ASO_OBJS)
-
-dnl handle --enable and --disable options
-
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING(whether to optimize for speed or for accuracy)
-
-AC_ARG_ENABLE(speed, AC_HELP_STRING([--enable-speed],
-		     [optimize for speed over accuracy]),
-[
-    case "$enableval" in
-	yes)
-	    optimize_for="speed"
-	    AC_DEFINE(OPT_SPEED, 1,
-		[Define to optimize for speed over accuracy.])
-	    ;;
-    esac
-])
-
-AC_ARG_ENABLE(accuracy, AC_HELP_STRING([--enable-accuracy],
-			[optimize for accuracy over speed]),
-[
-    case "$enableval" in
-	yes)
-	    if test "$optimize_for" = "speed"
-	    then
-		optimize_for="both"
-	    else
-		optimize_for="accuracy"
-	    fi
-	    AC_DEFINE(OPT_ACCURACY, 1,
-		[Define to optimize for accuracy over speed.])
-	    ;;
-    esac
-])
-
-AC_MSG_RESULT(${optimize_for-default})
-
-if test "$optimize_for" = "both"
-then
-    AC_MSG_ERROR(cannot optimize for both speed and accuracy)
-fi
-
-AC_MSG_CHECKING(for architecture-specific fixed-point math routines)
-AC_ARG_ENABLE(fpm, AC_HELP_STRING([--enable-fpm=ARCH],
-		   [use ARCH-specific fixed-point math routines
-		    (one of: intel, arm, mips, sparc, ppc, 64bit, default)]),
-[
-    case "$enableval" in
-	yes)                             ;;
-	no|default|approx) FPM="DEFAULT" ;;
-	intel|i?86)        FPM="INTEL"   ;;
-	arm)               FPM="ARM"     ;;
-	mips)              FPM="MIPS"    ;;
-	sparc)             FPM="SPARC"   ;;
-	ppc|powerpc)       FPM="PPC"     ;;
-	64bit)             FPM="64BIT"   ;;
-	float)             FPM="FLOAT"   ;;
-	*)
-	    AC_MSG_RESULT(failed)
-	    AC_MSG_ERROR([bad --enable-fpm option])
-	    ;;
-    esac
-])
-
-if test -z "$FPM" && test "$GCC" = yes
-then
-    case "$host" in
-	i?86-*)     FPM="INTEL"  ;;
-	arm*-*)     FPM="ARM"    ;;
-	mips*-*)    FPM="MIPS"   ;;
-	sparc*-*)   FPM="SPARC"  ;;
-	powerpc*-*) FPM="PPC"    ;;
-	# FIXME: need to test for 64-bit long long...
-    esac
-fi
-
-AC_MSG_RESULT(${FPM=DEFAULT})
-
-if test "$FPM" = "DEFAULT"
-then
-    AC_MSG_WARN([default fixed-point math will yield limited accuracy])
-fi
-
-FPM="-DFPM_$FPM"
-
-AC_ARG_ENABLE(sso, AC_HELP_STRING([--enable-sso],
-		   [use subband synthesis optimization]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(OPT_SSO, 1,
-    [Define to enable a fast subband synthesis approximation optimization.])
-	    ;;
-    esac
-])
-
-AC_ARG_ENABLE(aso, AC_HELP_STRING([--disable-aso],
-		   [disable architecture-specific optimizations]),
-    [], [enable_aso=yes])
-
-if test "$enable_aso" = yes
-then
-    case "$host" in
-	i?86-*)
-	    : #ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    : #not yet #ASO="$ASO -DASO_SYNTH"
-	    : #not yet #ASO_OBJS="synth_mmx.lo"
-	    ;;
-	arm*-*)
-	    ASO="$ASO -DASO_INTERLEAVE1"
-	    ASO="$ASO -DASO_IMDCT"
-	    ASO_OBJS="imdct_l_arm.lo"
-	    ;;
-	mips*-*)
-	    ASO="$ASO -DASO_INTERLEAVE2"
-	    ASO="$ASO -DASO_ZEROCHECK"
-	    ;;
-    esac
-fi
-
-AC_MSG_CHECKING(for ISO/IEC interpretation)
-AC_ARG_ENABLE(strict-iso, AC_HELP_STRING([--enable-strict-iso],
-			  [use strict ISO/IEC interpretations]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(OPT_STRICT, 1,
-    [Define to influence a strict interpretation of the ISO/IEC standards,
-     even if this is in opposition with best accepted practices.])
-	    interpretation="strict"
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${interpretation-best accepted practices})
-
-AC_MSG_CHECKING(whether to enable profiling)
-AC_ARG_ENABLE(profiling, AC_HELP_STRING([--enable-profiling],
-			 [generate profiling code]),
-[
-    case "$enableval" in
-	yes) profile="-pg" ;;
-    esac
-])
-AC_MSG_RESULT(${enable_profiling-no})
-
-AC_MSG_CHECKING(whether to enable debugging)
-AC_ARG_ENABLE(debugging, AC_HELP_STRING([--enable-debugging],
-			 [enable diagnostic debugging support])
-AC_HELP_STRING([--disable-debugging],
-	       [do not enable debugging and use more optimization]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(DEBUG, 1,
-		[Define to enable diagnostic debugging support.])
-	    optimize=""
-	    ;;
-	no)
-	    if test -n "$profile"
-	    then
-    AC_MSG_ERROR(--enable-profiling and --disable-debugging are incompatible)
-	    fi
-
-	    AC_DEFINE(NDEBUG, 1,
-		[Define to disable debugging assertions.])
-	    debug=""
-	    if test "$GCC" = yes
-	    then
-		optimize="$optimize -fomit-frame-pointer"
-	    fi
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${enable_debugging-default})
-
-AC_MSG_CHECKING(whether to enable experimental code)
-AC_ARG_ENABLE(experimental, AC_HELP_STRING([--enable-experimental],
-			    [enable experimental code]),
-[
-    case "$enableval" in
-	yes)
-	    AC_DEFINE(EXPERIMENTAL, 1,
-		[Define to enable experimental code.])
-	    ;;
-    esac
-])
-AC_MSG_RESULT(${enable_experimental-no})
-
-dnl Create output files.
-
-test -n "$arch"     && CFLAGS="$CFLAGS $arch"
-test -n "$debug"    && CFLAGS="$CFLAGS $debug"
-test -n "$optimize" && CFLAGS="$CFLAGS $optimize"
-test -n "$profile"  && CFLAGS="$CFLAGS $profile" LDFLAGS="$LDFLAGS $profile"
-
-dnl LTLIBOBJS=`echo "$LIBOBJS" | sed -e 's/\.o/.lo/g'`
-dnl AC_SUBST(LTLIBOBJS)
-
-AC_CONFIG_FILES([Makefile msvc++/Makefile  \
-	libmad.list])
-AC_OUTPUT
diff --git a/code/libmad-0.15.1b/decoder.h b/code/libmad-0.15.1b/decoder.h
deleted file mode 100644
index f0ad758d..00000000
--- a/code/libmad-0.15.1b/decoder.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: decoder.h,v 1.17 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-# include "stream.h"
-# include "frame.h"
-# include "synth.h"
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
diff --git a/code/libmad-0.15.1b/depcomp b/code/libmad-0.15.1b/depcomp
deleted file mode 100644
index 51606f8c..00000000
--- a/code/libmad-0.15.1b/depcomp
+++ /dev/null
@@ -1,464 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
-   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-   dir=`echo "$object" | sed 's,/.*$,/,'`
-   if test "$dir" = "$object"; then
-      dir=
-   fi
-   # FIXME: should be _deps on DOS.
-   depfile="$dir.deps/$base"
-fi
-
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  This file always lives in the current directory.
-  # Also, the AIX compiler puts `$object:' at the start of each line;
-  # $object doesn't have directory information.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      tmpdepfile1="$dir.libs/$base.lo.d"
-      tmpdepfile2="$dir.libs/$base.d"
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2="$dir$base.d"
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab in the [].
-      sed -e 's,^.*\.[a-z]*:[ 	]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
diff --git a/code/libmad-0.15.1b/fixed.h b/code/libmad-0.15.1b/fixed.h
deleted file mode 100644
index 4b58abf5..00000000
--- a/code/libmad-0.15.1b/fixed.h
+++ /dev/null
@@ -1,499 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp $
- */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   elif defined(OPT_INTEL)
-/*
- * Alternate Intel scaling that may or may not perform better.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrl %3,%1\n\t"  \
-	    "shll %4,%2\n\t"  \
-	    "orl %2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi),  \
-	      "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
diff --git a/code/libmad-0.15.1b/frame.h b/code/libmad-0.15.1b/frame.h
deleted file mode 100644
index 3f5bf37e..00000000
--- a/code/libmad-0.15.1b/frame.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: frame.h,v 1.20 2004/01/23 09:41:32 rob Exp $
- */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-# include "fixed.h"
-# include "timer.h"
-# include "stream.h"
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
diff --git a/code/libmad-0.15.1b/install-sh b/code/libmad-0.15.1b/install-sh
deleted file mode 100644
index 36f96f3e..00000000
--- a/code/libmad-0.15.1b/install-sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd=$cpprog
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd=$stripprog
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f "$src" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d "$dst" ]
-	then
-		dst=$dst/`basename "$src"`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-$defaultIFS}"
-
-oIFS=$IFS
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS=$oIFS
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
-
-	pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd "$dst" &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		dstfile=`basename "$dst" $transformbasename |
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ]
-	then
-		dstfile=`basename "$dst"`
-	else
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd "$src" "$dsttmp" &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-
-# Now remove or move aside any old file at destination location.  We try this
-# two ways since rm can't unlink itself on some systems and the destination
-# file might be busy for other reasons.  In this case, the final cleanup
-# might fail but the new file should still install successfully.
-
-{
-	if [ -f "$dstdir/$dstfile" ]
-	then
-		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-		{
-		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		  (exit 1); exit
-		}
-	else
-		:
-	fi
-} &&
-
-# Now rename the file to the real destination.
-
-	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/code/libmad-0.15.1b/libmad.list.in b/code/libmad-0.15.1b/libmad.list.in
deleted file mode 100644
index 4718fef3..00000000
--- a/code/libmad-0.15.1b/libmad.list.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# @configure_input@
-
-# Directories...
-$prefix=@prefix@
-$exec_prefix=@exec_prefix@
-$srcdir=@srcdir@
-
-# Product information
-%product @PACKAGE@
-%copyright GPL
-%vendor Underbit Technologies, Inc. <info@underbit.com>
-%license @srcdir@/COPYING
-%readme @srcdir@/README
-%description libmad is an MPEG audio decoder library.
-%version @VERSION@
-%packager Giuseppe "Cowo" Corbelli <cowo@lugbs.linux.it>
-
-%system all
-f 0755 root root @libdir@/libmad.la .libs/libmad.lai
-f 0644 root root @libdir@/libmad.a .libs/libmad.a
-f 0644 root root @includedir@/mad.h mad.h
diff --git a/code/libmad-0.15.1b/ltmain.sh b/code/libmad-0.15.1b/ltmain.sh
deleted file mode 100644
index 4b9f9405..00000000
--- a/code/libmad-0.15.1b/ltmain.sh
+++ /dev/null
@@ -1,6399 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.2
-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08) Debian$Rev: 192 $"
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*) 
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-# End of Shell function definitions
-#####################################
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
-    done
-    exit 0
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit 0
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi # $pass = conv
-
-    
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-    
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi 
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		   fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		path="-L$path"
-		;;
-		esac 
-		
-		;;
-		  -l*)
-		case $host in
-		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
-		  ;;
-		*) continue ;;
-		esac  		  
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-	
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	       then
-		 continue
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*) 
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs" 
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit 0
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-   
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-  
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char * 
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char * 
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat) 
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode, 
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done  
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi  
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
-	      else
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
-    else
-      exit 0
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe) 
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit 1
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/code/libmad-0.15.1b/mad.h.sed b/code/libmad-0.15.1b/mad.h.sed
deleted file mode 100644
index 70287854..00000000
--- a/code/libmad-0.15.1b/mad.h.sed
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# libmad - MPEG audio decoder library
-# Copyright (C) 2000-2004 Underbit Technologies, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# $Id: mad.h.sed,v 1.9 2004/01/23 09:41:32 rob Exp $
-#
-
-/^\/\*$/{
-N
-s/ \* libmad - /&/
-t copy
-b next
-: copy
-g
-n
-s|^ \* \$\(Id: .*\) \$$|/* \1 */|p
-/^ \*\/$/d
-b copy
-}
-/^# *include "/d
-: next
-p
diff --git a/code/libmad-0.15.1b/missing b/code/libmad-0.15.1b/missing
deleted file mode 100644
index 6a37006e..00000000
--- a/code/libmad-0.15.1b/missing
+++ /dev/null
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         system.  You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/code/libmad-0.15.1b/mkinstalldirs b/code/libmad-0.15.1b/mkinstalldirs
deleted file mode 100644
index d2d5f21b..00000000
--- a/code/libmad-0.15.1b/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-  	errstatus=$lasterr
-      else
-  	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-    	  lasterr=""
-  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-  	  if test ! -z "$lasterr"; then
-  	    errstatus=$lasterr
-  	  fi
-  	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/code/libmad-0.15.1b/msvc++/Makefile.am b/code/libmad-0.15.1b/msvc++/Makefile.am
deleted file mode 100644
index 96865c7f..00000000
--- a/code/libmad-0.15.1b/msvc++/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## libmad - MPEG audio decoder library
-## Copyright (C) 2000-2004 Underbit Technologies, Inc.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-##
-## $Id: Makefile.am,v 1.3 2004/01/23 09:41:33 rob Exp $
-##
-
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST =		mad.h config.h libmad.dsp
diff --git a/code/libmad-0.15.1b/msvc++/Makefile.in b/code/libmad-0.15.1b/msvc++/Makefile.in
deleted file mode 100644
index eaeb8634..00000000
--- a/code/libmad-0.15.1b/msvc++/Makefile.in
+++ /dev/null
@@ -1,312 +0,0 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-subdir = msvc++
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ASO = @ASO@
-ASO_OBJS = @ASO_OBJS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPM = @FPM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = mad.h config.h libmad.dsp
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  msvc++/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  msvc++/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/code/libmad-0.15.1b/msvc++/config.h b/code/libmad-0.15.1b/msvc++/config.h
deleted file mode 100644
index 02683a5f..00000000
--- a/code/libmad-0.15.1b/msvc++/config.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to enable diagnostic debugging support. */
-/* #undef DEBUG */
-
-/* Define to enable experimental code. */
-/* #undef EXPERIMENTAL */
-
-/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fcntl' function. */
-/* #undef HAVE_FCNTL */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fork' function. */
-/* #undef HAVE_FORK */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define if your MIPS CPU supports a 2-operand MADD16 instruction. */
-/* #undef HAVE_MADD16_ASM */
-
-/* Define if your MIPS CPU supports a 2-operand MADD instruction. */
-/* #undef HAVE_MADD_ASM */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `pipe' function. */
-/* #undef HAVE_PIPE */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-/* #undef HAVE_SYS_WAIT_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `waitpid' function. */
-/* #undef HAVE_WAITPID */
-
-/* Define to disable debugging assertions. */
-/* #undef NDEBUG */
-
-/* Define to optimize for accuracy over speed. */
-/* #undef OPT_ACCURACY */
-
-/* Define to optimize for speed over accuracy. */
-/* #undef OPT_SPEED */
-
-/* Define to enable a fast subband synthesis approximation optimization. */
-/* #undef OPT_SSO */
-
-/* Define to influence a strict interpretation of the ISO/IEC standards, even
-   if this is in opposition with best accepted practices. */
-/* #undef OPT_STRICT */
-
-/* Name of package */
-#define PACKAGE "libmad"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "support@underbit.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "MPEG Audio Decoder"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MPEG Audio Decoder 0.15.1b"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libmad"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15.1b"
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "0.15.1b"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-#define inline __inline
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
diff --git a/code/libmad-0.15.1b/msvc++/libmad.dsp b/code/libmad-0.15.1b/msvc++/libmad.dsp
deleted file mode 100644
index faf83132..00000000
--- a/code/libmad-0.15.1b/msvc++/libmad.dsp
+++ /dev/null
@@ -1,214 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libmad" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=libmad - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libmad.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libmad.mak" CFG="libmad - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libmad - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "libmad - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libmad - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /GX /O2 /I "." /D "NDEBUG" /D "FPM_INTEL" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /D "ASO_ZEROCHECK" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "libmad - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /Gm /GX /ZI /Od /I "." /D "FPM_DEFAULT" /D "_LIB" /D "HAVE_CONFIG_H" /D "ASO_ZEROCHECK" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "DEBUG" /FD /GZ /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libmad - Win32 Release"
-# Name "libmad - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "c"
-# Begin Source File
-
-SOURCE=..\bit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\fixed.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\frame.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\huffman.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer12.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer3.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\stream.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\synth.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\timer.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\version.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h"
-# Begin Source File
-
-SOURCE=..\bit.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\decoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\fixed.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\global.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\huffman.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer12.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\layer3.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\stream.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\synth.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\timer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\version.h
-# End Source File
-# End Group
-# Begin Group "Data Files"
-
-# PROP Default_Filter "dat"
-# Begin Source File
-
-SOURCE=..\D.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\imdct_s.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\qc_table.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\rq_table.dat
-# End Source File
-# Begin Source File
-
-SOURCE=..\sf_table.dat
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/code/libmad-0.15.1b/msvc++/mad.h b/code/libmad-0.15.1b/msvc++/mad.h
deleted file mode 100644
index d4834785..00000000
--- a/code/libmad-0.15.1b/msvc++/mad.h
+++ /dev/null
@@ -1,948 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * If you would like to negotiate alternate licensing terms, you may do
- * so by contacting: Underbit Technologies, Inc. <info@underbit.com>
- */
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-# define FPM_INTEL
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
-
-
-/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2003"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
-
-/* Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp */
-
-# ifndef LIBMAD_FIXED_H
-# define LIBMAD_FIXED_H
-
-# if SIZEOF_INT >= 4
-typedef   signed int mad_fixed_t;
-
-typedef   signed int mad_fixed64hi_t;
-typedef unsigned int mad_fixed64lo_t;
-# else
-typedef   signed long mad_fixed_t;
-
-typedef   signed long mad_fixed64hi_t;
-typedef unsigned long mad_fixed64lo_t;
-# endif
-
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
-
-# if defined(FPM_FLOAT)
-typedef double mad_sample_t;
-# else
-typedef mad_fixed_t mad_sample_t;
-# endif
-
-/*
- * Fixed-point format: 0xABBBBBBB
- * A == whole part      (sign + 3 bits)
- * B == fractional part (28 bits)
- *
- * Values are signed two's complement, so the effective range is:
- * 0x80000000 to 0x7fffffff
- *       -8.0 to +7.9999999962747097015380859375
- *
- * The smallest representable value is:
- * 0x00000001 == 0.0000000037252902984619140625 (i.e. about 3.725e-9)
- *
- * 28 bits of fractional accuracy represent about
- * 8.6 digits of decimal accuracy.
- *
- * Fixed-point numbers can be added or subtracted as normal
- * integers, but multiplication requires shifting the 64-bit result
- * from 56 fractional bits back to 28 (and rounding.)
- *
- * Changing the definition of MAD_F_FRACBITS is only partially
- * supported, and must be done with care.
- */
-
-# define MAD_F_FRACBITS		28
-
-# if MAD_F_FRACBITS == 28
-#  define MAD_F(x)		((mad_fixed_t) (x##L))
-# else
-#  if MAD_F_FRACBITS < 28
-#   warning "MAD_F_FRACBITS < 28"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 (((x##L) +  \
-				   (1L << (28 - MAD_F_FRACBITS - 1))) >>  \
-				  (28 - MAD_F_FRACBITS)))
-#  elif MAD_F_FRACBITS > 28
-#   error "MAD_F_FRACBITS > 28 not currently supported"
-#   define MAD_F(x)		((mad_fixed_t)  \
-				 ((x##L) << (MAD_F_FRACBITS - 28)))
-#  endif
-# endif
-
-# define MAD_F_MIN		((mad_fixed_t) -0x80000000L)
-# define MAD_F_MAX		((mad_fixed_t) +0x7fffffffL)
-
-# define MAD_F_ONE		MAD_F(0x10000000)
-
-# define mad_f_tofixed(x)	((mad_fixed_t)  \
-				 ((x) * (double) (1L << MAD_F_FRACBITS) + 0.5))
-# define mad_f_todouble(x)	((double)  \
-				 ((x) / (double) (1L << MAD_F_FRACBITS)))
-
-# define mad_f_intpart(x)	((x) >> MAD_F_FRACBITS)
-# define mad_f_fracpart(x)	((x) & ((1L << MAD_F_FRACBITS) - 1))
-				/* (x should be positive) */
-
-# define mad_f_fromint(x)	((x) << MAD_F_FRACBITS)
-
-# define mad_f_add(x, y)	((x) + (y))
-# define mad_f_sub(x, y)	((x) - (y))
-
-# if defined(FPM_FLOAT)
-#  error "FPM_FLOAT not yet supported"
-
-#  undef MAD_F
-#  define MAD_F(x)		mad_f_todouble(x)
-
-#  define mad_f_mul(x, y)	((x) * (y))
-#  define mad_f_scale64
-
-#  undef ASO_ZEROCHECK
-
-# elif defined(FPM_64BIT)
-
-/*
- * This version should be the most accurate if 64-bit types are supported by
- * the compiler, although it may not be the most efficient.
- */
-#  if defined(OPT_ACCURACY)
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t)  \
-     ((((mad_fixed64_t) (x) * (y)) +  \
-       (1L << (MAD_F_SCALEBITS - 1))) >> MAD_F_SCALEBITS))
-#  else
-#   define mad_f_mul(x, y)  \
-    ((mad_fixed_t) (((mad_fixed64_t) (x) * (y)) >> MAD_F_SCALEBITS))
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Intel --------------------------------------------------------------- */
-
-# elif defined(FPM_INTEL)
-
-#  if defined(_MSC_VER)
-#   pragma warning(push)
-#   pragma warning(disable: 4035)  /* no return value */
-static __forceinline
-mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
-{
-  enum {
-    fracbits = MAD_F_FRACBITS
-  };
-
-  __asm {
-    mov eax, x
-    imul y
-    shrd eax, edx, fracbits
-  }
-
-  /* implicit return of eax */
-}
-#   pragma warning(pop)
-
-#   define mad_f_mul		mad_f_mul_inline
-#   define mad_f_scale64
-#  else
-/*
- * This Intel version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#   define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("imull %3"  \
-	 : "=a" (lo), "=d" (hi)  \
-	 : "%a" (x), "rm" (y)  \
-	 : "cc")
-
-#   if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#    define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addl %2,%0\n\t"  \
-	    "adcl %3,%1"  \
-	    : "=rm" (lo), "=rm" (hi)  \
-	    : "r" (__lo), "r" (__hi), "0" (lo), "1" (hi)  \
-	    : "cc");  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   if defined(OPT_ACCURACY)
-/*
- * Surprisingly, this is faster than SHRD followed by ADC.
- */
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed64hi_t __hi_;  \
-       mad_fixed64lo_t __lo_;  \
-       mad_fixed_t __result;  \
-       asm ("addl %4,%2\n\t"  \
-	    "adcl %5,%3"  \
-	    : "=rm" (__lo_), "=rm" (__hi_)  \
-	    : "0" (lo), "1" (hi),  \
-	      "ir" (1L << (MAD_F_SCALEBITS - 1)), "ir" (0)  \
-	    : "cc");  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#    else
-#    define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("shrdl %3,%2,%1"  \
-	    : "=rm" (__result)  \
-	    : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-#   endif  /* OPT_ACCURACY */
-
-#   define MAD_F_SCALEBITS  MAD_F_FRACBITS
-#  endif
-
-/* --- ARM ----------------------------------------------------------------- */
-
-# elif defined(FPM_ARM)
-
-/* 
- * This ARM V4 version is as accurate as FPM_64BIT but much faster. The
- * least significant bit is properly rounded at no CPU cycle cost!
- */
-# if 1
-/*
- * This is faster than the default implementation via MAD_F_MLX() and
- * mad_f_scale64().
- */
-#  define mad_f_mul(x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       mad_fixed_t __result;  \
-       asm ("smull	%0, %1, %3, %4\n\t"  \
-	    "movs	%0, %0, lsr %5\n\t"  \
-	    "adc	%2, %0, %1, lsl %6"  \
-	    : "=&r" (__lo), "=&r" (__hi), "=r" (__result)  \
-	    : "%r" (x), "r" (y),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-# endif
-
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smull	%0, %1, %2, %3"  \
-	 : "=&r" (lo), "=&r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("smlal	%0, %1, %2, %3"  \
-	 : "+r" (lo), "+r" (hi)  \
-	 : "%r" (x), "r" (y))
-
-#  define MAD_F_MLN(hi, lo)  \
-    asm ("rsbs	%0, %2, #0\n\t"  \
-	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "0" (lo), "1" (hi)  \
-	 : "cc")
-
-#  define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("movs	%0, %1, lsr %3\n\t"  \
-	    "adc	%0, %0, %2, lsl %4"  \
-	    : "=&r" (__result)  \
-	    : "r" (lo), "r" (hi),  \
-	      "M" (MAD_F_SCALEBITS), "M" (32 - MAD_F_SCALEBITS)  \
-	    : "cc");  \
-       __result;  \
-    })
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- MIPS ---------------------------------------------------------------- */
-
-# elif defined(FPM_MIPS)
-
-/*
- * This MIPS version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
-
-# if defined(OPT_SPEED)
-#  define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t) ((hi) << (32 - MAD_F_SCALEBITS)))
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* --- SPARC --------------------------------------------------------------- */
-
-# elif defined(FPM_SPARC)
-
-/*
- * This SPARC V8 version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("smul %2, %3, %0\n\t"  \
-	 "rd %%y, %1"  \
-	 : "=r" (lo), "=r" (hi)  \
-	 : "%r" (x), "rI" (y))
-
-/* --- PowerPC ------------------------------------------------------------- */
-
-# elif defined(FPM_PPC)
-
-/*
- * This PowerPC version is fast and accurate; the disposition of the least
- * significant bit depends on OPT_ACCURACY via mad_f_scale64().
- */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    do {  \
-      asm ("mullw %0,%1,%2"  \
-	   : "=r" (lo)  \
-	   : "%r" (x), "r" (y));  \
-      asm ("mulhw %0,%1,%2"  \
-	   : "=r" (hi)  \
-	   : "%r" (x), "r" (y));  \
-    }  \
-    while (0)
-
-#  if defined(OPT_ACCURACY)
-/*
- * This gives best accuracy but is not very fast.
- */
-#   define MAD_F_MLA(hi, lo, x, y)  \
-    ({ mad_fixed64hi_t __hi;  \
-       mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       asm ("addc %0,%2,%3\n\t"  \
-	    "adde %1,%4,%5"  \
-	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
-	    : "xer");  \
-    })
-#  endif
-
-#  if defined(OPT_ACCURACY)
-/*
- * This is slower than the truncating version below it.
- */
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result, __round;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("extrwi %0,%1,1,0"  \
-	    : "=r" (__round)  \
-	    : "r" (__result));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       asm ("add %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "%r" (__result), "r" (__round));  \
-       __result;  \
-    })
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ({ mad_fixed_t __result;  \
-       asm ("rotrwi %0,%1,%2"  \
-	    : "=r" (__result)  \
-	    : "r" (lo), "i" (MAD_F_SCALEBITS));  \
-       asm ("insrwi %0,%1,%2,0"  \
-	    : "+r" (__result)  \
-	    : "r" (hi), "i" (MAD_F_SCALEBITS));  \
-       __result;  \
-    })
-#  endif
-
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-
-/* --- Default ------------------------------------------------------------- */
-
-# elif defined(FPM_DEFAULT)
-
-/*
- * This version is the most portable but it loses significant accuracy.
- * Furthermore, accuracy is biased against the second argument, so care
- * should be taken when ordering operands.
- *
- * The scale factors are constant as this is not used with SSO.
- *
- * Pre-rounding is required to stay within the limits of compliance.
- */
-#  if defined(OPT_SPEED)
-#   define mad_f_mul(x, y)	(((x) >> 12) * ((y) >> 16))
-#  else
-#   define mad_f_mul(x, y)	((((x) + (1L << 11)) >> 12) *  \
-				 (((y) + (1L << 15)) >> 16))
-#  endif
-
-/* ------------------------------------------------------------------------- */
-
-# else
-#  error "no FPM selected"
-# endif
-
-/* default implementations */
-
-# if !defined(mad_f_mul)
-#  define mad_f_mul(x, y)  \
-    ({ register mad_fixed64hi_t __hi;  \
-       register mad_fixed64lo_t __lo;  \
-       MAD_F_MLX(__hi, __lo, (x), (y));  \
-       mad_f_scale64(__hi, __lo);  \
-    })
-# endif
-
-# if !defined(MAD_F_MLA)
-#  define MAD_F_ML0(hi, lo, x, y)	((lo)  = mad_f_mul((x), (y)))
-#  define MAD_F_MLA(hi, lo, x, y)	((lo) += mad_f_mul((x), (y)))
-#  define MAD_F_MLN(hi, lo)		((lo)  = -(lo))
-#  define MAD_F_MLZ(hi, lo)		((void) (hi), (mad_fixed_t) (lo))
-# endif
-
-# if !defined(MAD_F_ML0)
-#  define MAD_F_ML0(hi, lo, x, y)	MAD_F_MLX((hi), (lo), (x), (y))
-# endif
-
-# if !defined(MAD_F_MLN)
-#  define MAD_F_MLN(hi, lo)		((hi) = ((lo) = -(lo)) ? ~(hi) : -(hi))
-# endif
-
-# if !defined(MAD_F_MLZ)
-#  define MAD_F_MLZ(hi, lo)		mad_f_scale64((hi), (lo))
-# endif
-
-# if !defined(mad_f_scale64)
-#  if defined(OPT_ACCURACY)
-#   define mad_f_scale64(hi, lo)  \
-    ((((mad_fixed_t)  \
-       (((hi) << (32 - (MAD_F_SCALEBITS - 1))) |  \
-	((lo) >> (MAD_F_SCALEBITS - 1)))) + 1) >> 1)
-#  else
-#   define mad_f_scale64(hi, lo)  \
-    ((mad_fixed_t)  \
-     (((hi) << (32 - MAD_F_SCALEBITS)) |  \
-      ((lo) >> MAD_F_SCALEBITS)))
-#  endif
-#  define MAD_F_SCALEBITS  MAD_F_FRACBITS
-# endif
-
-/* C routines */
-
-mad_fixed_t mad_f_abs(mad_fixed_t);
-mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
-
-# endif
-
-/* Id: bit.h,v 1.11 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_BIT_H
-# define LIBMAD_BIT_H
-
-struct mad_bitptr {
-  unsigned char const *byte;
-  unsigned short cache;
-  unsigned short left;
-};
-
-void mad_bit_init(struct mad_bitptr *, unsigned char const *);
-
-# define mad_bit_finish(bitptr)		/* nothing */
-
-unsigned int mad_bit_length(struct mad_bitptr const *,
-			    struct mad_bitptr const *);
-
-# define mad_bit_bitsleft(bitptr)  ((bitptr)->left)
-unsigned char const *mad_bit_nextbyte(struct mad_bitptr const *);
-
-void mad_bit_skip(struct mad_bitptr *, unsigned int);
-unsigned long mad_bit_read(struct mad_bitptr *, unsigned int);
-void mad_bit_write(struct mad_bitptr *, unsigned int, unsigned long);
-
-unsigned short mad_bit_crc(struct mad_bitptr, unsigned int, unsigned short);
-
-# endif
-
-/* Id: timer.h,v 1.15 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
-
-/* Id: stream.h,v 1.18 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
-
-/* Id: frame.h,v 1.19 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_FRAME_H
-# define LIBMAD_FRAME_H
-
-
-enum mad_layer {
-  MAD_LAYER_I   = 1,			/* Layer I */
-  MAD_LAYER_II  = 2,			/* Layer II */
-  MAD_LAYER_III = 3			/* Layer III */
-};
-
-enum mad_mode {
-  MAD_MODE_SINGLE_CHANNEL = 0,		/* single channel */
-  MAD_MODE_DUAL_CHANNEL	  = 1,		/* dual channel */
-  MAD_MODE_JOINT_STEREO	  = 2,		/* joint (MS/intensity) stereo */
-  MAD_MODE_STEREO	  = 3		/* normal LR stereo */
-};
-
-enum mad_emphasis {
-  MAD_EMPHASIS_NONE	  = 0,		/* no emphasis */
-  MAD_EMPHASIS_50_15_US	  = 1,		/* 50/15 microseconds emphasis */
-  MAD_EMPHASIS_CCITT_J_17 = 3,		/* CCITT J.17 emphasis */
-  MAD_EMPHASIS_RESERVED   = 2		/* unknown emphasis */
-};
-
-struct mad_header {
-  enum mad_layer layer;			/* audio layer (1, 2, or 3) */
-  enum mad_mode mode;			/* channel mode (see above) */
-  int mode_extension;			/* additional mode info */
-  enum mad_emphasis emphasis;		/* de-emphasis to use (see above) */
-
-  unsigned long bitrate;		/* stream bitrate (bps) */
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-
-  unsigned short crc_check;		/* frame CRC accumulator */
-  unsigned short crc_target;		/* final target CRC checksum */
-
-  int flags;				/* flags (see below) */
-  int private_bits;			/* private bits (see below) */
-
-  mad_timer_t duration;			/* audio playing time of frame */
-};
-
-struct mad_frame {
-  struct mad_header header;		/* MPEG audio header */
-
-  int options;				/* decoding options (from stream) */
-
-  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples */
-  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data */
-};
-
-# define MAD_NCHANNELS(header)		((header)->mode ? 2 : 1)
-# define MAD_NSBSAMPLES(header)  \
-  ((header)->layer == MAD_LAYER_I ? 12 :  \
-   (((header)->layer == MAD_LAYER_III &&  \
-     ((header)->flags & MAD_FLAG_LSF_EXT)) ? 18 : 36))
-
-enum {
-  MAD_FLAG_NPRIVATE_III	= 0x0007,	/* number of Layer III private bits */
-  MAD_FLAG_INCOMPLETE	= 0x0008,	/* header but not data is decoded */
-
-  MAD_FLAG_PROTECTION	= 0x0010,	/* frame has CRC protection */
-  MAD_FLAG_COPYRIGHT	= 0x0020,	/* frame is copyright */
-  MAD_FLAG_ORIGINAL	= 0x0040,	/* frame is original (else copy) */
-  MAD_FLAG_PADDING	= 0x0080,	/* frame has additional slot */
-
-  MAD_FLAG_I_STEREO	= 0x0100,	/* uses intensity joint stereo */
-  MAD_FLAG_MS_STEREO	= 0x0200,	/* uses middle/side joint stereo */
-  MAD_FLAG_FREEFORMAT	= 0x0400,	/* uses free format bitrate */
-
-  MAD_FLAG_LSF_EXT	= 0x1000,	/* lower sampling freq. extension */
-  MAD_FLAG_MC_EXT	= 0x2000,	/* multichannel audio extension */
-  MAD_FLAG_MPEG_2_5_EXT	= 0x4000	/* MPEG 2.5 (unofficial) extension */
-};
-
-enum {
-  MAD_PRIVATE_HEADER	= 0x0100,	/* header private bit */
-  MAD_PRIVATE_III	= 0x001f	/* Layer III private bits (up to 5) */
-};
-
-void mad_header_init(struct mad_header *);
-
-# define mad_header_finish(header)  /* nothing */
-
-int mad_header_decode(struct mad_header *, struct mad_stream *);
-
-void mad_frame_init(struct mad_frame *);
-void mad_frame_finish(struct mad_frame *);
-
-int mad_frame_decode(struct mad_frame *, struct mad_stream *);
-
-void mad_frame_mute(struct mad_frame *);
-
-# endif
-
-/* Id: synth.h,v 1.14 2003/05/27 22:40:37 rob Exp */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
-
-/* Id: decoder.h,v 1.16 2003/05/27 22:40:36 rob Exp */
-
-# ifndef LIBMAD_DECODER_H
-# define LIBMAD_DECODER_H
-
-
-enum mad_decoder_mode {
-  MAD_DECODER_MODE_SYNC  = 0,
-  MAD_DECODER_MODE_ASYNC
-};
-
-enum mad_flow {
-  MAD_FLOW_CONTINUE = 0x0000,	/* continue normally */
-  MAD_FLOW_STOP     = 0x0010,	/* stop decoding normally */
-  MAD_FLOW_BREAK    = 0x0011,	/* stop decoding and signal an error */
-  MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
-};
-
-struct mad_decoder {
-  enum mad_decoder_mode mode;
-
-  int options;
-
-  struct {
-    long pid;
-    int in;
-    int out;
-  } async;
-
-  struct {
-    struct mad_stream stream;
-    struct mad_frame frame;
-    struct mad_synth synth;
-  } *sync;
-
-  void *cb_data;
-
-  enum mad_flow (*input_func)(void *, struct mad_stream *);
-  enum mad_flow (*header_func)(void *, struct mad_header const *);
-  enum mad_flow (*filter_func)(void *,
-			       struct mad_stream const *, struct mad_frame *);
-  enum mad_flow (*output_func)(void *,
-			       struct mad_header const *, struct mad_pcm *);
-  enum mad_flow (*error_func)(void *, struct mad_stream *, struct mad_frame *);
-  enum mad_flow (*message_func)(void *, void *, unsigned int *);
-};
-
-void mad_decoder_init(struct mad_decoder *, void *,
-		      enum mad_flow (*)(void *, struct mad_stream *),
-		      enum mad_flow (*)(void *, struct mad_header const *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream const *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *,
-					struct mad_header const *,
-					struct mad_pcm *),
-		      enum mad_flow (*)(void *,
-					struct mad_stream *,
-					struct mad_frame *),
-		      enum mad_flow (*)(void *, void *, unsigned int *));
-int mad_decoder_finish(struct mad_decoder *);
-
-# define mad_decoder_options(decoder, opts)  \
-    ((void) ((decoder)->options = (opts)))
-
-int mad_decoder_run(struct mad_decoder *, enum mad_decoder_mode);
-int mad_decoder_message(struct mad_decoder *, void *, unsigned int *);
-
-# endif
-
-# ifdef __cplusplus
-}
-# endif
diff --git a/code/libmad-0.15.1b/stream.h b/code/libmad-0.15.1b/stream.h
deleted file mode 100644
index 8bff8b49..00000000
--- a/code/libmad-0.15.1b/stream.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: stream.h,v 1.20 2004/02/05 09:02:39 rob Exp $
- */
-
-# ifndef LIBMAD_STREAM_H
-# define LIBMAD_STREAM_H
-
-# include "bit.h"
-
-# define MAD_BUFFER_GUARD	8
-# define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-
-enum mad_error {
-  MAD_ERROR_NONE	   = 0x0000,	/* no error */
-
-  MAD_ERROR_BUFLEN	   = 0x0001,	/* input buffer too small (or EOF) */
-  MAD_ERROR_BUFPTR	   = 0x0002,	/* invalid (null) buffer pointer */
-
-  MAD_ERROR_NOMEM	   = 0x0031,	/* not enough memory */
-
-  MAD_ERROR_LOSTSYNC	   = 0x0101,	/* lost synchronization */
-  MAD_ERROR_BADLAYER	   = 0x0102,	/* reserved header layer value */
-  MAD_ERROR_BADBITRATE	   = 0x0103,	/* forbidden bitrate value */
-  MAD_ERROR_BADSAMPLERATE  = 0x0104,	/* reserved sample frequency value */
-  MAD_ERROR_BADEMPHASIS	   = 0x0105,	/* reserved emphasis value */
-
-  MAD_ERROR_BADCRC	   = 0x0201,	/* CRC check failed */
-  MAD_ERROR_BADBITALLOC	   = 0x0211,	/* forbidden bit allocation value */
-  MAD_ERROR_BADSCALEFACTOR = 0x0221,	/* bad scalefactor index */
-  MAD_ERROR_BADMODE        = 0x0222,	/* bad bitrate/mode combination */
-  MAD_ERROR_BADFRAMELEN	   = 0x0231,	/* bad frame length */
-  MAD_ERROR_BADBIGVALUES   = 0x0232,	/* bad big_values count */
-  MAD_ERROR_BADBLOCKTYPE   = 0x0233,	/* reserved block_type */
-  MAD_ERROR_BADSCFSI	   = 0x0234,	/* bad scalefactor selection info */
-  MAD_ERROR_BADDATAPTR	   = 0x0235,	/* bad main_data_begin pointer */
-  MAD_ERROR_BADPART3LEN	   = 0x0236,	/* bad audio data length */
-  MAD_ERROR_BADHUFFTABLE   = 0x0237,	/* bad Huffman table select */
-  MAD_ERROR_BADHUFFDATA	   = 0x0238,	/* Huffman data overrun */
-  MAD_ERROR_BADSTEREO	   = 0x0239	/* incompatible block_type for JS */
-};
-
-# define MAD_RECOVERABLE(error)	((error) & 0xff00)
-
-struct mad_stream {
-  unsigned char const *buffer;		/* input bitstream buffer */
-  unsigned char const *bufend;		/* end of buffer */
-  unsigned long skiplen;		/* bytes to skip before next frame */
-
-  int sync;				/* stream sync found */
-  unsigned long freerate;		/* free bitrate (fixed) */
-
-  unsigned char const *this_frame;	/* start of current frame */
-  unsigned char const *next_frame;	/* start of next frame */
-  struct mad_bitptr ptr;		/* current processing bit pointer */
-
-  struct mad_bitptr anc_ptr;		/* ancillary bits pointer */
-  unsigned int anc_bitlen;		/* number of ancillary bits */
-
-  unsigned char (*main_data)[MAD_BUFFER_MDLEN];
-					/* Layer III main_data() */
-  unsigned int md_len;			/* bytes in main_data */
-
-  int options;				/* decoding options (see below) */
-  enum mad_error error;			/* error code (see above) */
-};
-
-enum {
-  MAD_OPTION_IGNORECRC      = 0x0001,	/* ignore CRC errors */
-  MAD_OPTION_HALFSAMPLERATE = 0x0002	/* generate PCM at 1/2 sample rate */
-# if 0  /* not yet implemented */
-  MAD_OPTION_LEFTCHANNEL    = 0x0010,	/* decode left channel only */
-  MAD_OPTION_RIGHTCHANNEL   = 0x0020,	/* decode right channel only */
-  MAD_OPTION_SINGLECHANNEL  = 0x0030	/* combine channels */
-# endif
-};
-
-void mad_stream_init(struct mad_stream *);
-void mad_stream_finish(struct mad_stream *);
-
-# define mad_stream_options(stream, opts)  \
-    ((void) ((stream)->options = (opts)))
-
-void mad_stream_buffer(struct mad_stream *,
-		       unsigned char const *, unsigned long);
-void mad_stream_skip(struct mad_stream *, unsigned long);
-
-int mad_stream_sync(struct mad_stream *);
-
-char const *mad_stream_errorstr(struct mad_stream const *);
-
-# endif
diff --git a/code/libmad-0.15.1b/synth.h b/code/libmad-0.15.1b/synth.h
deleted file mode 100644
index 8ae4bc95..00000000
--- a/code/libmad-0.15.1b/synth.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: synth.h,v 1.15 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_SYNTH_H
-# define LIBMAD_SYNTH_H
-
-# include "fixed.h"
-# include "frame.h"
-
-struct mad_pcm {
-  unsigned int samplerate;		/* sampling frequency (Hz) */
-  unsigned short channels;		/* number of channels */
-  unsigned short length;		/* number of samples per channel */
-  mad_fixed_t samples[2][1152];		/* PCM output samples [ch][sample] */
-};
-
-struct mad_synth {
-  mad_fixed_t filter[2][2][2][16][8];	/* polyphase filterbank outputs */
-  					/* [ch][eo][peo][s][v] */
-
-  unsigned int phase;			/* current processing phase */
-
-  struct mad_pcm pcm;			/* PCM output */
-};
-
-/* single channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_SINGLE = 0
-};
-
-/* dual channel PCM selector */
-enum {
-  MAD_PCM_CHANNEL_DUAL_1 = 0,
-  MAD_PCM_CHANNEL_DUAL_2 = 1
-};
-
-/* stereo PCM selector */
-enum {
-  MAD_PCM_CHANNEL_STEREO_LEFT  = 0,
-  MAD_PCM_CHANNEL_STEREO_RIGHT = 1
-};
-
-void mad_synth_init(struct mad_synth *);
-
-# define mad_synth_finish(synth)  /* nothing */
-
-void mad_synth_mute(struct mad_synth *);
-
-void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
-
-# endif
diff --git a/code/libmad-0.15.1b/timer.h b/code/libmad-0.15.1b/timer.h
deleted file mode 100644
index eb4542bb..00000000
--- a/code/libmad-0.15.1b/timer.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: timer.h,v 1.16 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_TIMER_H
-# define LIBMAD_TIMER_H
-
-typedef struct {
-  signed long seconds;		/* whole seconds */
-  unsigned long fraction;	/* 1/MAD_TIMER_RESOLUTION seconds */
-} mad_timer_t;
-
-extern mad_timer_t const mad_timer_zero;
-
-# define MAD_TIMER_RESOLUTION	352800000UL
-
-enum mad_units {
-  MAD_UNITS_HOURS	 =    -2,
-  MAD_UNITS_MINUTES	 =    -1,
-  MAD_UNITS_SECONDS	 =     0,
-
-  /* metric units */
-
-  MAD_UNITS_DECISECONDS	 =    10,
-  MAD_UNITS_CENTISECONDS =   100,
-  MAD_UNITS_MILLISECONDS =  1000,
-
-  /* audio sample units */
-
-  MAD_UNITS_8000_HZ	 =  8000,
-  MAD_UNITS_11025_HZ	 = 11025,
-  MAD_UNITS_12000_HZ	 = 12000,
-
-  MAD_UNITS_16000_HZ	 = 16000,
-  MAD_UNITS_22050_HZ	 = 22050,
-  MAD_UNITS_24000_HZ	 = 24000,
-
-  MAD_UNITS_32000_HZ	 = 32000,
-  MAD_UNITS_44100_HZ	 = 44100,
-  MAD_UNITS_48000_HZ	 = 48000,
-
-  /* video frame/field units */
-
-  MAD_UNITS_24_FPS	 =    24,
-  MAD_UNITS_25_FPS	 =    25,
-  MAD_UNITS_30_FPS	 =    30,
-  MAD_UNITS_48_FPS	 =    48,
-  MAD_UNITS_50_FPS	 =    50,
-  MAD_UNITS_60_FPS	 =    60,
-
-  /* CD audio frames */
-
-  MAD_UNITS_75_FPS	 =    75,
-
-  /* video drop-frame units */
-
-  MAD_UNITS_23_976_FPS	 =   -24,
-  MAD_UNITS_24_975_FPS	 =   -25,
-  MAD_UNITS_29_97_FPS	 =   -30,
-  MAD_UNITS_47_952_FPS	 =   -48,
-  MAD_UNITS_49_95_FPS	 =   -50,
-  MAD_UNITS_59_94_FPS	 =   -60
-};
-
-# define mad_timer_reset(timer)	((void) (*(timer) = mad_timer_zero))
-
-int mad_timer_compare(mad_timer_t, mad_timer_t);
-
-# define mad_timer_sign(timer)	mad_timer_compare((timer), mad_timer_zero)
-
-void mad_timer_negate(mad_timer_t *);
-mad_timer_t mad_timer_abs(mad_timer_t);
-
-void mad_timer_set(mad_timer_t *, unsigned long, unsigned long, unsigned long);
-void mad_timer_add(mad_timer_t *, mad_timer_t);
-void mad_timer_multiply(mad_timer_t *, signed long);
-
-signed long mad_timer_count(mad_timer_t, enum mad_units);
-unsigned long mad_timer_fraction(mad_timer_t, unsigned long);
-void mad_timer_string(mad_timer_t, char *, char const *,
-		      enum mad_units, enum mad_units, unsigned long);
-
-# endif
diff --git a/code/libmad-0.15.1b/version.h b/code/libmad-0.15.1b/version.h
deleted file mode 100644
index d215d4c1..00000000
--- a/code/libmad-0.15.1b/version.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * libmad - MPEG audio decoder library
- * Copyright (C) 2000-2004 Underbit Technologies, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp $
- */
-
-# ifndef LIBMAD_VERSION_H
-# define LIBMAD_VERSION_H
-
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
-
-# define MAD_VERSION_STRINGIZE(str)	#str
-# define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
-
-# define MAD_VERSION		MAD_VERSION_STRING(MAD_VERSION_MAJOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_MINOR) "."  \
-				MAD_VERSION_STRING(MAD_VERSION_PATCH)  \
-				MAD_VERSION_EXTRA
-
-# define MAD_PUBLISHYEAR	"2000-2004"
-# define MAD_AUTHOR		"Underbit Technologies, Inc."
-# define MAD_EMAIL		"info@underbit.com"
-
-extern char const mad_version[];
-extern char const mad_copyright[];
-extern char const mad_author[];
-extern char const mad_build[];
-
-# endif
diff --git a/code/libmad/.github/workflows/build.yml b/code/libmad/.github/workflows/build.yml
new file mode 100644
index 00000000..ba50e409
--- /dev/null
+++ b/code/libmad/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: build
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu
+            os: ubuntu-latest
+            install_dir: ~/libmad
+            cmake_extras: -DCMAKE_BUILD_TYPE=RelWithDebInfo
+          - name: macOS
+            os: macos-latest
+            install_dir: ~/libmad
+            cmake_extras: -DCMAKE_BUILD_TYPE=RelWithDebInfo
+          - name: Windows
+            os: windows-latest
+            install_dir: C:\libmad
+            cmake_config: --config RelWithDebInfo
+
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Check out Git repository
+      uses: actions/checkout@v2
+    - name: Configure
+      run: cmake -DCMAKE_INSTALL_PREFIX=${{ matrix.install_dir }} ${{ matrix.cmake_extras }} -S . -B build
+    - name: Build
+      run: cmake --build build ${{ matrix.cmake_config }}
+      env:
+        CMAKE_BUILD_PARALLEL_LEVEL: 2
+    - name: Install
+      run: cmake --install . ${{ matrix.cmake_config }}
+      working-directory: build
+    - name: Upload Build Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.name }} libmad build
+        path: ${{ matrix.install_dir }}
diff --git a/code/libmad/.gitignore b/code/libmad/.gitignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/code/libmad/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/code/libmad-0.15.1b/CHANGES b/code/libmad/CHANGES
similarity index 94%
rename from code/libmad-0.15.1b/CHANGES
rename to code/libmad/CHANGES
index 9291760b..45a94436 100644
--- a/code/libmad-0.15.1b/CHANGES
+++ b/code/libmad/CHANGES
@@ -6,6 +6,28 @@
 
 ===============================================================================
 
+Verison 0.16.4
+  * Fix compatibility with libmad 0.15.1b
+
+Version 0.16.3
+  * Disable assembly optimizations for all 64 bit CPU architectures; they are
+    only for 32 and 16 bit architectures
+  * Fix CPU architecture detection for PowerPC
+
+Version 0.16.2
+  * Fix building assembly file on ARM
+  * Fix pkgconfig file when CMAKE_INSTALL_{INCLUDE,LIB}DIR are absolute paths
+
+Version 0.16.1
+  * Fix generation of mad.h broken by move to CMake
+  * Add CMake options for CPU architecture-specific optimizations
+
+Version 0.16.0
+  * Add CMake build system
+  * Remove autotools build system
+  * Add pkgconfig and CMake config files
+  * Apply patches from Debian and Fedora
+
 Version 0.15.1 (beta)
 
   * Updated to autoconf 2.59, automake 1.8.2, libtool 1.5.2.
diff --git a/code/libmad/CMakeLists.txt b/code/libmad/CMakeLists.txt
new file mode 100644
index 00000000..3d3e16db
--- /dev/null
+++ b/code/libmad/CMakeLists.txt
@@ -0,0 +1,240 @@
+cmake_minimum_required(VERSION 3.5)
+project(mad VERSION 0.16.4)
+
+option(BUILD_SHARED_LIBS "Build dynamic library" ON)
+
+# The library SOVERSION. This is set to 0 for backward compatibility.
+# The general policy is that minor versions of the library (e.g., 0.16.1,
+# 0.16.2) don't constitute a major ABI breakage. Major versions (e.g., 0.17,
+# 0.18) do.
+set(LIBRARY_SOVERSION 0)
+
+include(GNUInstallDirs)
+include(CheckTypeSize)
+
+#
+# Build
+#
+
+add_library(mad
+    bit.c
+    decoder.c
+    fixed.c
+    frame.c
+    huffman.c
+    layer12.c
+    layer3.c
+    stream.c
+    synth.c
+    timer.c
+    version.c
+)
+target_include_directories(mad PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+if(WIN32 AND BUILD_SHARED_LIBS)
+    set_target_properties(mad PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+endif()
+
+set_target_properties(mad PROPERTIES
+  VERSION ${PROJECT_VERSION}
+  SOVERSION ${LIBRARY_SOVERSION}
+)
+
+#
+# Compile definitions
+#
+
+option(OPTIMIZE "Optimize for SPEED (default) or ACCURACY" SPEED)
+if(OPTIMIZE STREQUAL "SPEED")
+  message(STATUS "Optimizing for speed over accuracy.")
+  target_compile_definitions(mad PRIVATE OPT_SPEED)
+else()
+  message(STATUS "Optimizing for accuracy over speed.")
+  target_compile_definitions(mad PRIVATE OPT_ACCURACY)
+endif()
+
+option(ASO "Enable CPU Architecture Specific Optimizations (x86, ARM, and MIPS only)" ON)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  message(STATUS "Using 64 bit fixed point math")
+  option(FPM_64BIT "64 bit fixed point math" ON)
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86" OR "i386")
+  message(STATUS "Using x86 fixed point math")
+  option (FPM_INTEL "x86 fixed point math" ON)
+  if(ASO)
+    target_compile_definitions(mad PRIVATE ASO_ZEROCHECK)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(arm|ARM).*")
+  message(STATUS "Using ARM fixed point math")
+  option (FPM_ARM "ARM fixed point math" ON)
+  if(ASO)
+    enable_language(ASM)
+    target_compile_definitions(mad PRIVATE ASO_INTERLEAVE1 ASO_IMDCT)
+    target_sources(mad PRIVATE imdct_l_arm.S)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(mips|MIPS).*")
+  message(STATUS "Using MIPS fixed point math")
+  option(FPM_MIPS "MIPS fixed point math" ON)
+  if(ASO)
+    target_compile_definitions(mad PRIVATE ASO_INTERLEAVE2 ASO_ZEROCHECK)
+  endif()
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".*(sparc|SPARC).*")
+  message(STATUS "Using SPARC fixed point math")
+  option(FPM_SPARC "SPARC fixed point math" ON)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES ".(ppc|PPC|powerpc).*")
+  message(STATUS "Using PowerPC fixed point math")
+  option(FPM_PPC "PowerPC fixed point math" ON)
+else()
+  message(WARNING "Target CPU architecture not detected. Fixed-point math will yield limited accuracy.")
+  option(FPM_DEFAULT "Generic fixed-point math" ON)
+endif()
+
+
+check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY LANGUAGE C)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mad.h.in ${CMAKE_CURRENT_BINARY_DIR}/mad.h @ONLY)
+
+include(CheckIncludeFile)
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+if(HAVE_SYS_TYPES_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_TYPES_H)
+endif()
+
+check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
+if(HAVE_SYS_WAIT_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_WAIT_H)
+endif()
+
+check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
+if(HAVE_SYS_MMAN_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_MMAN_H)
+endif()
+
+check_include_file(sys/stat.h HAVE_SYS_STAT_H)
+if(HAVE_SYS_STAT_H)
+  target_compile_definitions(mad PRIVATE HAVE_SYS_STAT_H)
+endif()
+
+check_include_file(unistd.h HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
+  target_compile_definitions(mad PRIVATE HAVE_UNISTD_H)
+endif()
+
+check_include_file(assert.h HAVE_ASSERT_H)
+if(HAVE_ASSERT_H)
+  target_compile_definitions(mad PRIVATE HAVE_ASSERT_H)
+endif()
+
+check_include_file(fcntl.h HAVE_FCNTL_H)
+if(HAVE_FCNTL_H)
+  target_compile_definitions(mad PRIVATE HAVE_FCNTL_H)
+endif()
+
+check_include_file(limits.h HAVE_LIMITS_H)
+if(HAVE_LIMITS_H)
+  target_compile_definitions(mad PRIVATE HAVE_LIMITS_H)
+endif()
+
+include(CheckFunctionExists)
+check_function_exists(ftruncate HAVE_FTRUNCATE)
+if(HAVE_FTRUNCATE)
+  target_compile_definitions(mad PRIVATE HAVE_FTRUNCATE)
+endif()
+
+check_function_exists(pipe HAVE_PIPE)
+if(HAVE_PIPE)
+  target_compile_definitions(mad PRIVATE HAVE_PIPE)
+endif()
+
+check_function_exists(fork HAVE_FORK)
+if(HAVE_FORK)
+  target_compile_definitions(mad PRIVATE HAVE_FORK)
+endif()
+
+check_function_exists(waitpid HAVE_WAITPID)
+if(HAVE_WAITPID)
+  target_compile_definitions(mad PRIVATE HAVE_WAITPID)
+endif()
+
+option(MADD_ASM "Enable if your MIPS CPU supports a 2-operand MADD instruction." OFF)
+if(MADD_ASM)
+  target_compile_definitions(mad PRIVATE HAVE_MADD_ASM)
+endif()
+
+option(MADD16_ASM "Enable if your MIPS CPU supports a 2-operand MADD16 instruction." OFF)
+if(MADD16_ASM)
+  target_compile_definitions(mad PRIVATE HAVE_MADD_ASM)
+endif()
+
+#
+# Example application
+#
+
+include(CMakeDependentOption)
+cmake_dependent_option(EXAMPLE "Build example executable" ON "HAVE_UNISTD_H;HAVE_SYS_STAT_H;HAVE_SYS_MMAN_H" OFF)
+if(EXAMPLE)
+  add_executable(mad_example minimad.c)
+  target_link_libraries(mad_example PRIVATE mad)
+endif()
+
+#
+# Installation
+#
+
+include(CMakePackageConfigHelpers)
+
+# Library files
+install(TARGETS mad
+  EXPORT madTargets
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+  RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+  INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+# Header files
+install(
+  FILES "${CMAKE_CURRENT_BINARY_DIR}/mad.h"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)
+
+# pkgconfig
+if(IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+  set(PKGCONFIG_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(PKGCONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(PKGCONFIG_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+  set(PKGCONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/packaging/mad.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/packaging/mad.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/packaging/mad.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
+# CMake config
+set(MAD_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/mad")
+install(
+  EXPORT madTargets
+  FILE madTargets.cmake
+  NAMESPACE mad::
+  DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
+configure_package_config_file(packaging/madConfig.cmake.in
+  "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfig.cmake"
+  INSTALL_DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfigVersion.cmake"
+  VERSION "${PROJECT_VERSION}"
+  COMPATIBILITY SameMajorVersion
+)
+install(
+  FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/packaging/madConfigVersion.cmake"
+  DESTINATION "${MAD_INSTALL_CMAKEDIR}"
+)
diff --git a/code/libmad-0.15.1b/COPYING b/code/libmad/COPYING
similarity index 100%
rename from code/libmad-0.15.1b/COPYING
rename to code/libmad/COPYING
diff --git a/code/libmad-0.15.1b/COPYRIGHT b/code/libmad/COPYRIGHT
similarity index 100%
rename from code/libmad-0.15.1b/COPYRIGHT
rename to code/libmad/COPYRIGHT
diff --git a/code/libmad-0.15.1b/CREDITS b/code/libmad/CREDITS
similarity index 100%
rename from code/libmad-0.15.1b/CREDITS
rename to code/libmad/CREDITS
diff --git a/code/libmad-0.15.1b/D.dat b/code/libmad/D.dat
similarity index 100%
rename from code/libmad-0.15.1b/D.dat
rename to code/libmad/D.dat
diff --git a/code/libmad/README.md b/code/libmad/README.md
new file mode 100644
index 00000000..fa8a2db6
--- /dev/null
+++ b/code/libmad/README.md
@@ -0,0 +1,178 @@
+# libmad - MPEG audio decoder library
+Copyright (C) 2000-2004 Underbit Technologies, Inc.
+Copyright (C) 2021-2023 Tenacity Team and Contributors
+
+`$Id: README,v 1.4 2004/01/23 09:41:32 rob Exp $`
+
+---
+
+# Introduction
+
+MAD (libmad) is a high-quality MPEG audio decoder. It currently supports
+MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as
+the so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
+and Layer III a.k.a. MP3) are fully implemented.
+
+MAD does not yet support MPEG-2 multichannel audio (although it should be
+backward compatible with such streams) nor does it currently support AAC.
+
+MAD has the following special features:
+
+  - 24-bit PCM output
+  - 100% fixed-point (integer) computation
+  - completely new implementation based on the ISO/IEC standards
+  - distributed under the terms of the GNU General Public License (GPL)
+
+Because MAD provides full 24-bit PCM output, applications using MAD are
+able to produce high quality audio. Even when the output device supports
+only 16-bit PCM, applications can use the extra resolution to increase the
+audible dynamic range through the use of dithering or noise shaping.
+
+Because MAD uses integer computation rather than floating point, it is
+well suited for architectures without a floating point unit. All
+calculations are performed with a 32-bit fixed-point integer
+representation.
+
+Because MAD is a new implementation of the ISO/IEC standards, it is
+unencumbered by the errors of other implementations. MAD is NOT a
+derivation of the ISO reference source or any other code. Considerable
+effort has been expended to ensure a correct implementation, even in cases
+where the standards are ambiguous or misleading.
+
+Because MAD is distributed under the terms of the GPL, its redistribution
+is not generally restricted, so long as the terms of the GPL are followed.
+This means MAD can be incorporated into other software as long as that
+software is also distributed under the GPL. (Should this be undesirable,
+alternate arrangements may be possible by contacting Underbit.)
+
+# About The Code
+
+The code is optimized and performs very well, although specific
+improvements can still be made. The output from the decoder library
+consists of 32-bit signed linear fixed-point values that can be easily
+scaled for any size PCM output, up to 24 bits per sample.
+
+The API for libmad can be found in the `mad.h' header file. Note that this
+file is automatically generated, and will not exist until after you have
+built the library.
+
+There are two APIs available, one high-level, and the other low-level.
+With the low-level API, each step of the decoding process must be handled
+explicitly, offering the greatest amount of control. With the high-level
+API, after callbacks are configured, a single routine will decode an
+entire bitstream.
+
+The high-level API may either be used synchronously or asynchronously. If
+used asynchronously, decoding will occur in a separate process.
+Communication is possible with the decoding process by passing control
+messages.
+
+The file `minimad.c' contains an example usage of the libmad API that
+shows only the bare minimum required to implement a useful decoder. It
+expects a regular file to be redirected to standard input, and it sends
+decoded 16-bit signed little-endian PCM samples to standard output. If a
+decoding error occurs, it is reported to standard error and decoding
+continues. Note that the scale() routine in this code is only provided as
+an example; it rounds MAD's high-resolution samples down to 16 bits, but
+does not perform any dithering or noise shaping. It is therefore not
+recommended to use this routine as-is in your own code if sound quality is
+important.
+
+## Integer Performance
+
+To get the best possible performance, it is recommended that an assembly
+version of the fixed-point multiply and related routines be selected.
+Several such assembly routines have been written for various CPUs.
+
+If an assembly version is not available, a fast approximation version will
+be used. This will result in reduced accuracy of the decoder.
+
+Alternatively, if 64-bit integers are supported as a datatype by the
+compiler, another version can be used that is much more accurate.
+However, using an assembly version is generally much faster and just as
+accurate.
+
+More information can be gathered from the `fixed.h' header file.
+
+MAD's CPU-intensive subband synthesis routine can be further optimized at
+the expense of a slight loss in output accuracy due to a modified method
+for fixed-point multiplication with a small windowing constant. While this
+is helpful for performance and the output accuracy loss is generally
+undetectable, it is disabled by default and must be explicitly enabled.
+
+Under some architectures, other special optimizations may also be
+available.
+
+## Audio Quality
+
+The output from MAD has been found to satisfy the ISO/IEC 11172-4
+computational accuracy requirements for compliance. In most
+configurations, MAD is a Full Layer III ISO/IEC 11172-3 audio decoder as
+defined by the standard.
+
+When the approximation version of the fixed-point multiply is used, MAD is
+a limited accuracy ISO/IEC 11172-3 audio decoder as defined by the
+standard.
+
+MAD can alternatively be configured to produce output with less or more
+accuracy than the default, as a tradeoff with performance.
+
+MAD produces output samples with a precision greater than 24 bits. Because
+most output formats use fewer bits, typically 16, it is recommended that a
+dithering algorithm be used (rather than rounding or truncating) to obtain
+the highest quality audio. However, dithering may unfavorably affect an
+analytic examination of the output (such as compliance testing); you may
+therefore wish to use rounding in this case instead.
+
+## Portability Issues
+
+GCC is preferred to compile the code, but other compilers may also work.
+The assembly code in `fixed.h' depends on the inline assembly features of
+your compiler. If you're not using GCC or MSVC++, you can either write
+your own assembly macros or use the default (low quality output) version.
+
+The union initialization of `huffman.c' may not be portable to all
+platforms when GCC is not used.
+
+The code should not be sensitive to word sizes or byte ordering, however
+it does assume A % B has the same sign as A.
+
+# Building and Installing
+
+libmad uses the CMake build system and has no dependencies. To build it, run:
+
+``` bash
+cmake -D CMAKE_INSTALL_PREFIX=/where/you/want/to/install/to -S . -B build
+cmake --build build --parallel number-of-cpu-cores
+cmake --install build
+```
+
+The following CMake options are available which can be toggled by passing
+'-D OPTION=VALUE' to the CMake configure step (the first call to cmake above):
+
+  * ASO (ON|OFF): Enable CPU Architecture Specific Optimizations
+    (x86, ARM, and MIPS only). ON by default.
+  * EXAMPLE (ON|OFF): Build the example application. Only works on POSIX
+    operating systems. ON by default on POSIX operating systems. The example
+    application is not installed.
+
+## Supported Platforms
+
+libmad relies on a POSIX environment. On Windows, you should use Cygwin to
+build libmad.
+
+It is planned that in a future release
+
+# Copyright
+
+Please read the `COPYRIGHT` file for copyright and warranty information.
+Also, the file `COPYING` contains the full text of the GNU GPL.
+
+Send inquiries, comments, bug reports, suggestions, patches, etc. to:
+
+    Underbit Technologies, Inc. <support@underbit.com>
+
+See also the MAD home page on the Web:
+
+    http://www.underbit.com/products/mad/
+
diff --git a/code/libmad-0.15.1b/TODO b/code/libmad/TODO
similarity index 100%
rename from code/libmad-0.15.1b/TODO
rename to code/libmad/TODO
diff --git a/code/libmad-0.15.1b/bit.c b/code/libmad/bit.c
similarity index 98%
rename from code/libmad-0.15.1b/bit.c
rename to code/libmad/bit.c
index c2bfb243..72a094ca 100644
--- a/code/libmad-0.15.1b/bit.c
+++ b/code/libmad/bit.c
@@ -19,10 +19,6 @@
  * $Id: bit.c,v 1.12 2004/01/23 09:41:32 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # ifdef HAVE_LIMITS_H
@@ -31,7 +27,7 @@
 #  define CHAR_BIT  8
 # endif
 
-# include "bit.h"
+# include "mad.h"
 
 /*
  * This is the lookup table for computing the CRC-check word.
@@ -138,6 +134,9 @@ unsigned long mad_bit_read(struct mad_bitptr *bitptr, unsigned int len)
 {
   register unsigned long value;
 
+  if (len == 0)
+    return 0;
+
   if (bitptr->left == CHAR_BIT)
     bitptr->cache = *bitptr->byte;
 
diff --git a/code/libmad-0.15.1b/decoder.c b/code/libmad/decoder.c
similarity index 78%
rename from code/libmad-0.15.1b/decoder.c
rename to code/libmad/decoder.c
index 6d6df0db..b631a686 100644
--- a/code/libmad-0.15.1b/decoder.c
+++ b/code/libmad/decoder.c
@@ -19,10 +19,6 @@
  * $Id: decoder.c,v 1.22 2004/01/23 09:41:32 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # ifdef HAVE_SYS_TYPES_H
@@ -47,10 +43,7 @@
 #  include <errno.h>
 # endif
 
-# include "stream.h"
-# include "frame.h"
-# include "synth.h"
-# include "decoder.h"
+# include "mad.h"
 
 /*
  * NAME:	decoder->init()
@@ -236,9 +229,9 @@ enum mad_flow receive(int fd, void **message, unsigned int *size)
 
     if (*size > 0) {
       if (*message == 0) {
-	*message = malloc(*size);
-	if (*message == 0)
-	  return MAD_FLOW_BREAK;
+	      *message = malloc(*size);
+	      if (*message == 0)
+      	  return MAD_FLOW_BREAK;
       }
 
       result = receive_io_blocking(fd, *message, *size);
@@ -277,8 +270,8 @@ enum mad_flow check_message(struct mad_decoder *decoder)
       result = decoder->message_func(decoder->cb_data, message, &size);
 
       if (result == MAD_FLOW_IGNORE ||
-	  result == MAD_FLOW_BREAK)
-	size = 0;
+	      result == MAD_FLOW_BREAK)
+	    size = 0;
     }
 
     if (send(decoder->async.out, message, size) != MAD_FLOW_CONTINUE)
@@ -347,114 +340,128 @@ int run_sync(struct mad_decoder *decoder)
 
   do {
     switch (decoder->input_func(decoder->cb_data, stream)) {
-    case MAD_FLOW_STOP:
-      goto done;
-    case MAD_FLOW_BREAK:
-      goto fail;
-    case MAD_FLOW_IGNORE:
-      continue;
-    case MAD_FLOW_CONTINUE:
-      break;
+      case MAD_FLOW_STOP:
+        goto done;
+      case MAD_FLOW_BREAK:
+        goto fail;
+      case MAD_FLOW_IGNORE:
+        continue;
+      case MAD_FLOW_CONTINUE:
+        break;
     }
 
-    while (1) {
-# if defined(USE_ASYNC)
+    while (1)
+    {
+      #if defined(USE_ASYNC)
       if (decoder->mode == MAD_DECODER_MODE_ASYNC) {
-	switch (check_message(decoder)) {
-	case MAD_FLOW_IGNORE:
-	case MAD_FLOW_CONTINUE:
-	  break;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_STOP:
-	  goto done;
-	}
+        switch (check_message(decoder)) {
+          case MAD_FLOW_IGNORE:
+          case MAD_FLOW_CONTINUE:
+            break;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_STOP:
+            goto done;
+        }
       }
-# endif
+      #endif
 
-      if (decoder->header_func) {
-	if (mad_header_decode(&frame->header, stream) == -1) {
-	  if (!MAD_RECOVERABLE(stream->error))
-	    break;
+      if (decoder->header_func)
+      {
+        if (mad_header_decode(&frame->header, stream) == -1)
+        {
+          if (!MAD_RECOVERABLE(stream->error))
+          {
+            break;
+          }
 
-	  switch (error_func(error_data, stream, frame)) {
-	  case MAD_FLOW_STOP:
-	    goto done;
-	  case MAD_FLOW_BREAK:
-	    goto fail;
-	  case MAD_FLOW_IGNORE:
-	  case MAD_FLOW_CONTINUE:
-	  default:
-	    continue;
-	  }
-	}
+          switch (error_func(error_data, stream, frame))
+          {
+            case MAD_FLOW_STOP:
+              goto done;
+            case MAD_FLOW_BREAK:
+              goto fail;
+            case MAD_FLOW_IGNORE:
+            case MAD_FLOW_CONTINUE:
+            default:
+              continue;
+          }
+        }
 
-	switch (decoder->header_func(decoder->cb_data, &frame->header)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  continue;
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
+        switch (decoder->header_func(decoder->cb_data, &frame->header))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            continue;
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
       }
 
-      if (mad_frame_decode(frame, stream) == -1) {
-	if (!MAD_RECOVERABLE(stream->error))
-	  break;
+      if (mad_frame_decode(frame, stream) == -1)
+      {
+        if (!MAD_RECOVERABLE(stream->error))
+          break;
 
-	switch (error_func(error_data, stream, frame)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  break;
-	case MAD_FLOW_CONTINUE:
-	default:
-	  continue;
-	}
+        switch (error_func(error_data, stream, frame))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            break;
+          case MAD_FLOW_CONTINUE:
+          default:
+            continue;
+        }
+      } else
+      {
+        bad_last_frame = 0;
       }
-      else
-	bad_last_frame = 0;
 
-      if (decoder->filter_func) {
-	switch (decoder->filter_func(decoder->cb_data, stream, frame)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	  continue;
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
+      if (decoder->filter_func)
+      {
+        switch (decoder->filter_func(decoder->cb_data, stream, frame))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+            continue;
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
       }
 
       mad_synth_frame(synth, frame);
 
-      if (decoder->output_func) {
-	switch (decoder->output_func(decoder->cb_data,
-				     &frame->header, &synth->pcm)) {
-	case MAD_FLOW_STOP:
-	  goto done;
-	case MAD_FLOW_BREAK:
-	  goto fail;
-	case MAD_FLOW_IGNORE:
-	case MAD_FLOW_CONTINUE:
-	  break;
-	}
+      if (decoder->output_func)
+      {
+        switch (decoder->output_func(decoder->cb_data,
+                  &frame->header, &synth->pcm))
+        {
+          case MAD_FLOW_STOP:
+            goto done;
+          case MAD_FLOW_BREAK:
+            goto fail;
+          case MAD_FLOW_IGNORE:
+          case MAD_FLOW_CONTINUE:
+            break;
+        }
       }
     }
   }
   while (stream->error == MAD_ERROR_BUFLEN);
 
- fail:
+fail:
   result = -1;
 
- done:
+done:
   mad_synth_finish(synth);
   mad_frame_finish(frame);
   mad_stream_finish(stream);
diff --git a/code/libmad-0.15.1b/fixed.c b/code/libmad/fixed.c
similarity index 95%
rename from code/libmad-0.15.1b/fixed.c
rename to code/libmad/fixed.c
index 9785466f..3e4055f8 100644
--- a/code/libmad-0.15.1b/fixed.c
+++ b/code/libmad/fixed.c
@@ -19,13 +19,9 @@
  * $Id: fixed.c,v 1.13 2004/01/23 09:41:32 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
-# include "fixed.h"
+# include "mad.h"
 
 /*
  * NAME:	fixed->abs()
diff --git a/code/libmad-0.15.1b/frame.c b/code/libmad/frame.c
similarity index 95%
rename from code/libmad-0.15.1b/frame.c
rename to code/libmad/frame.c
index 0cb3d0f3..03c94bfe 100644
--- a/code/libmad-0.15.1b/frame.c
+++ b/code/libmad/frame.c
@@ -19,18 +19,11 @@
  * $Id: frame.c,v 1.29 2004/02/04 22:59:19 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # include <stdlib.h>
 
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
-# include "timer.h"
+# include "mad.h"
 # include "layer12.h"
 # include "layer3.h"
 
@@ -120,11 +113,18 @@ static
 int decode_header(struct mad_header *header, struct mad_stream *stream)
 {
   unsigned int index;
+  struct mad_bitptr bufend_ptr;
 
   header->flags        = 0;
   header->private_bits = 0;
 
+  mad_bit_init(&bufend_ptr, stream->bufend);
+
   /* header() */
+  if (mad_bit_length(&stream->ptr, &bufend_ptr) < 32) {
+    stream->error = MAD_ERROR_BUFLEN;
+    return -1;
+  }
 
   /* syncword */
   mad_bit_skip(&stream->ptr, 11);
@@ -225,8 +225,13 @@ int decode_header(struct mad_header *header, struct mad_stream *stream)
   /* error_check() */
 
   /* crc_check */
-  if (header->flags & MAD_FLAG_PROTECTION)
+  if (header->flags & MAD_FLAG_PROTECTION) {
+    if (mad_bit_length(&stream->ptr, &bufend_ptr) < 16) {
+      stream->error = MAD_ERROR_BUFLEN;
+      return -1;
+    }
     header->crc_target = mad_bit_read(&stream->ptr, 16);
+  }
 
   return 0;
 }
@@ -338,7 +343,7 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
       stream->error = MAD_ERROR_BUFLEN;
       goto fail;
     }
-    else if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+    else if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
       /* mark point where frame sync word was expected */
       stream->this_frame = ptr;
       stream->next_frame = ptr + 1;
@@ -361,6 +366,8 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
     ptr = mad_bit_nextbyte(&stream->ptr);
   }
 
+  stream->error = MAD_ERROR_NONE;
+
   /* begin processing */
   stream->this_frame = ptr;
   stream->next_frame = ptr + 1;  /* possibly bogus sync word */
@@ -413,7 +420,7 @@ int mad_header_decode(struct mad_header *header, struct mad_stream *stream)
     /* check that a valid frame header follows this frame */
 
     ptr = stream->next_frame;
-    if (!(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
+    if ((end - ptr >= 2) && !(ptr[0] == 0xff && (ptr[1] & 0xe0) == 0xe0)) {
       ptr = stream->next_frame = stream->this_frame + 1;
       goto sync;
     }
diff --git a/code/libmad-0.15.1b/global.h b/code/libmad/global.h
similarity index 100%
rename from code/libmad-0.15.1b/global.h
rename to code/libmad/global.h
diff --git a/code/libmad-0.15.1b/huffman.c b/code/libmad/huffman.c
similarity index 99%
rename from code/libmad-0.15.1b/huffman.c
rename to code/libmad/huffman.c
index a230a9c1..9050c700 100644
--- a/code/libmad-0.15.1b/huffman.c
+++ b/code/libmad/huffman.c
@@ -19,10 +19,6 @@
  * $Id: huffman.c,v 1.10 2004/01/23 09:41:32 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # include "huffman.h"
diff --git a/code/libmad-0.15.1b/huffman.h b/code/libmad/huffman.h
similarity index 100%
rename from code/libmad-0.15.1b/huffman.h
rename to code/libmad/huffman.h
diff --git a/code/libmad-0.15.1b/imdct_l_arm.S b/code/libmad/imdct_l_arm.S
similarity index 99%
rename from code/libmad-0.15.1b/imdct_l_arm.S
rename to code/libmad/imdct_l_arm.S
index badec5bc..92d67e1a 100644
--- a/code/libmad-0.15.1b/imdct_l_arm.S
+++ b/code/libmad/imdct_l_arm.S
@@ -468,7 +468,7 @@ _III_imdct_l:
 
     @----
 
-    add     r2, pc, #(imdct36_long_karray-.-8)  @ r2 = base address of Knn array (PIC safe ?)
+    adr     r2, imdct36_long_karray
 
 
 loop:
diff --git a/code/libmad-0.15.1b/imdct_s.dat b/code/libmad/imdct_s.dat
similarity index 100%
rename from code/libmad-0.15.1b/imdct_s.dat
rename to code/libmad/imdct_s.dat
diff --git a/code/libmad-0.15.1b/layer12.c b/code/libmad/layer12.c
similarity index 81%
rename from code/libmad-0.15.1b/layer12.c
rename to code/libmad/layer12.c
index 6981f9ce..a334a27e 100644
--- a/code/libmad-0.15.1b/layer12.c
+++ b/code/libmad/layer12.c
@@ -19,10 +19,6 @@
  * $Id: layer12.c,v 1.17 2004/02/05 09:02:39 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # ifdef HAVE_LIMITS_H
@@ -31,10 +27,7 @@
 #  define CHAR_BIT  8
 # endif
 
-# include "fixed.h"
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
+# include "mad.h"
 # include "layer12.h"
 
 /*
@@ -72,10 +65,18 @@ mad_fixed_t const linear_table[14] = {
  * DESCRIPTION:	decode one requantized Layer I sample from a bitstream
  */
 static
-mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb)
+mad_fixed_t I_sample(struct mad_bitptr *ptr, unsigned int nb, struct mad_stream *stream)
 {
   mad_fixed_t sample;
+  struct mad_bitptr frameend_ptr;
 
+  mad_bit_init(&frameend_ptr, stream->next_frame);
+
+  if (mad_bit_length(ptr, &frameend_ptr) < nb) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    stream->sync = 0;
+    return 0;
+  }
   sample = mad_bit_read(ptr, nb);
 
   /* invert most significant bit, extend sign, then scale to fixed format */
@@ -106,6 +107,10 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
   struct mad_header *header = &frame->header;
   unsigned int nch, bound, ch, s, sb, nb;
   unsigned char allocation[2][32], scalefactor[2][32];
+  struct mad_bitptr bufend_ptr, frameend_ptr;
+
+  mad_bit_init(&bufend_ptr, stream->bufend);
+  mad_bit_init(&frameend_ptr, stream->next_frame);
 
   nch = MAD_NCHANNELS(header);
 
@@ -118,6 +123,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
   /* check CRC word */
 
   if (header->flags & MAD_FLAG_PROTECTION) {
+    if (mad_bit_length(&stream->ptr, &bufend_ptr)
+		< 4 * (bound * nch + (32 - bound))) {
+      stream->error = MAD_ERROR_BADCRC;
+      return -1;
+    }
     header->crc_check =
       mad_bit_crc(stream->ptr, 4 * (bound * nch + (32 - bound)),
 		  header->crc_check);
@@ -133,6 +143,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
 
   for (sb = 0; sb < bound; ++sb) {
     for (ch = 0; ch < nch; ++ch) {
+      if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return -1;
+      }
       nb = mad_bit_read(&stream->ptr, 4);
 
       if (nb == 15) {
@@ -145,6 +160,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
   }
 
   for (sb = bound; sb < 32; ++sb) {
+    if (mad_bit_length(&stream->ptr, &frameend_ptr) < 4) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return -1;
+    }
     nb = mad_bit_read(&stream->ptr, 4);
 
     if (nb == 15) {
@@ -161,6 +181,11 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
   for (sb = 0; sb < 32; ++sb) {
     for (ch = 0; ch < nch; ++ch) {
       if (allocation[ch][sb]) {
+        if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
 	scalefactor[ch][sb] = mad_bit_read(&stream->ptr, 6);
 
 # if defined(OPT_STRICT)
@@ -185,8 +210,10 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
       for (ch = 0; ch < nch; ++ch) {
 	nb = allocation[ch][sb];
 	frame->sbsample[ch][s][sb] = nb ?
-	  mad_f_mul(I_sample(&stream->ptr, nb),
+	  mad_f_mul(I_sample(&stream->ptr, nb, stream),
 		    sf_table[scalefactor[ch][sb]]) : 0;
+	if (stream->error != 0)
+	  return -1;
       }
     }
 
@@ -194,7 +221,14 @@ int mad_layer_I(struct mad_stream *stream, struct mad_frame *frame)
       if ((nb = allocation[0][sb])) {
 	mad_fixed_t sample;
 
-	sample = I_sample(&stream->ptr, nb);
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < nb) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+          return -1;
+	}
+	sample = I_sample(&stream->ptr, nb, stream);
+        if (stream->error != 0)
+	  return -1;
 
 	for (ch = 0; ch < nch; ++ch) {
 	  frame->sbsample[ch][s][sb] =
@@ -280,13 +314,21 @@ struct quantclass {
 static
 void II_samples(struct mad_bitptr *ptr,
 		struct quantclass const *quantclass,
-		mad_fixed_t output[3])
+		mad_fixed_t output[3], struct mad_stream *stream)
 {
   unsigned int nb, s, sample[3];
+  struct mad_bitptr frameend_ptr;
+
+  mad_bit_init(&frameend_ptr, stream->next_frame);
 
   if ((nb = quantclass->group)) {
     unsigned int c, nlevels;
 
+    if (mad_bit_length(ptr, &frameend_ptr) < quantclass->bits) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return;
+    }
     /* degrouping */
     c = mad_bit_read(ptr, quantclass->bits);
     nlevels = quantclass->nlevels;
@@ -299,8 +341,14 @@ void II_samples(struct mad_bitptr *ptr,
   else {
     nb = quantclass->bits;
 
-    for (s = 0; s < 3; ++s)
+    for (s = 0; s < 3; ++s) {
+      if (mad_bit_length(ptr, &frameend_ptr) < nb) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return;
+      }
       sample[s] = mad_bit_read(ptr, nb);
+    }
   }
 
   for (s = 0; s < 3; ++s) {
@@ -336,6 +384,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
   unsigned char const *offsets;
   unsigned char allocation[2][32], scfsi[2][32], scalefactor[2][32][3];
   mad_fixed_t samples[3];
+  struct mad_bitptr frameend_ptr;
+
+  mad_bit_init(&frameend_ptr, stream->next_frame);
 
   nch = MAD_NCHANNELS(header);
 
@@ -402,13 +453,24 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
   for (sb = 0; sb < bound; ++sb) {
     nbal = bitalloc_table[offsets[sb]].nbal;
 
-    for (ch = 0; ch < nch; ++ch)
+    for (ch = 0; ch < nch; ++ch) {
+      if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
+	stream->error = MAD_ERROR_LOSTSYNC;
+	stream->sync = 0;
+	return -1;
+      }
       allocation[ch][sb] = mad_bit_read(&stream->ptr, nbal);
+    }
   }
 
   for (sb = bound; sb < sblimit; ++sb) {
     nbal = bitalloc_table[offsets[sb]].nbal;
 
+    if (mad_bit_length(&stream->ptr, &frameend_ptr) < nbal) {
+      stream->error = MAD_ERROR_LOSTSYNC;
+      stream->sync = 0;
+      return -1;
+    }
     allocation[0][sb] =
     allocation[1][sb] = mad_bit_read(&stream->ptr, nbal);
   }
@@ -417,8 +479,14 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 
   for (sb = 0; sb < sblimit; ++sb) {
     for (ch = 0; ch < nch; ++ch) {
-      if (allocation[ch][sb])
+      if (allocation[ch][sb]) {
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < 2) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
 	scfsi[ch][sb] = mad_bit_read(&stream->ptr, 2);
+      }
     }
   }
 
@@ -441,6 +509,11 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
   for (sb = 0; sb < sblimit; ++sb) {
     for (ch = 0; ch < nch; ++ch) {
       if (allocation[ch][sb]) {
+	if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	  stream->error = MAD_ERROR_LOSTSYNC;
+	  stream->sync = 0;
+	  return -1;
+	}
 	scalefactor[ch][sb][0] = mad_bit_read(&stream->ptr, 6);
 
 	switch (scfsi[ch][sb]) {
@@ -451,11 +524,21 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 	  break;
 
 	case 0:
+	  if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	    stream->error = MAD_ERROR_LOSTSYNC;
+	    stream->sync = 0;
+	    return -1;
+	  }
 	  scalefactor[ch][sb][1] = mad_bit_read(&stream->ptr, 6);
 	  /* fall through */
 
 	case 1:
 	case 3:
+	  if (mad_bit_length(&stream->ptr, &frameend_ptr) < 6) {
+	    stream->error = MAD_ERROR_LOSTSYNC;
+	    stream->sync = 0;
+	    return -1;
+	  }
 	  scalefactor[ch][sb][2] = mad_bit_read(&stream->ptr, 6);
 	}
 
@@ -487,7 +570,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
 	if ((index = allocation[ch][sb])) {
 	  index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
 
-	  II_samples(&stream->ptr, &qc_table[index], samples);
+	  II_samples(&stream->ptr, &qc_table[index], samples, stream);
+	  if (stream->error != 0)
+            return -1;
 
 	  for (s = 0; s < 3; ++s) {
 	    frame->sbsample[ch][3 * gr + s][sb] =
@@ -505,7 +590,9 @@ int mad_layer_II(struct mad_stream *stream, struct mad_frame *frame)
       if ((index = allocation[0][sb])) {
 	index = offset_table[bitalloc_table[offsets[sb]].offset][index - 1];
 
-	II_samples(&stream->ptr, &qc_table[index], samples);
+	II_samples(&stream->ptr, &qc_table[index], samples, stream);
+	if (stream->error != 0)
+          return -1;
 
 	for (ch = 0; ch < nch; ++ch) {
 	  for (s = 0; s < 3; ++s) {
diff --git a/code/libmad-0.15.1b/layer12.h b/code/libmad/layer12.h
similarity index 96%
rename from code/libmad-0.15.1b/layer12.h
rename to code/libmad/layer12.h
index e1c49969..8caa3f75 100644
--- a/code/libmad-0.15.1b/layer12.h
+++ b/code/libmad/layer12.h
@@ -22,8 +22,7 @@
 # ifndef LIBMAD_LAYER12_H
 # define LIBMAD_LAYER12_H
 
-# include "stream.h"
-# include "frame.h"
+# include "mad.h"
 
 int mad_layer_I(struct mad_stream *, struct mad_frame *);
 int mad_layer_II(struct mad_stream *, struct mad_frame *);
diff --git a/code/libmad-0.15.1b/layer3.c b/code/libmad/layer3.c
similarity index 93%
rename from code/libmad-0.15.1b/layer3.c
rename to code/libmad/layer3.c
index 4e5d3fa0..7f18fd72 100644
--- a/code/libmad-0.15.1b/layer3.c
+++ b/code/libmad/layer3.c
@@ -19,10 +19,6 @@
  * $Id: layer3.c,v 1.43 2004/01/23 09:41:32 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # include <stdlib.h>
@@ -38,10 +34,7 @@
 #  define CHAR_BIT  8
 # endif
 
-# include "fixed.h"
-# include "bit.h"
-# include "stream.h"
-# include "frame.h"
+# include "mad.h"
 # include "huffman.h"
 # include "layer3.h"
 
@@ -598,7 +591,8 @@ enum mad_error III_sideinfo(struct mad_bitptr *ptr, unsigned int nch,
 static
 unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
 				  struct channel *channel,
-				  struct channel *gr1ch, int mode_extension)
+				  struct channel *gr1ch, int mode_extension,
+				  unsigned int bits_left, unsigned int *part2_length)
 {
   struct mad_bitptr start;
   unsigned int scalefac_compress, index, slen[4], part, n, i;
@@ -644,8 +638,12 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
 
     n = 0;
     for (part = 0; part < 4; ++part) {
-      for (i = 0; i < nsfb[part]; ++i)
+      for (i = 0; i < nsfb[part]; ++i) {
+	if (bits_left < slen[part])
+	  return MAD_ERROR_BADSCFSI;
 	channel->scalefac[n++] = mad_bit_read(ptr, slen[part]);
+	bits_left -= slen[part];
+      }
     }
 
     while (n < 39)
@@ -690,7 +688,10 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
       max = (1 << slen[part]) - 1;
 
       for (i = 0; i < nsfb[part]; ++i) {
+	if (bits_left < slen[part])
+	  return MAD_ERROR_BADSCFSI;
 	is_pos = mad_bit_read(ptr, slen[part]);
+	bits_left -= slen[part];
 
 	channel->scalefac[n] = is_pos;
 	gr1ch->scalefac[n++] = (is_pos == max);
@@ -703,7 +704,8 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
     }
   }
 
-  return mad_bit_length(&start, ptr);
+  *part2_length = mad_bit_length(&start, ptr);
+  return MAD_ERROR_NONE;
 }
 
 /*
@@ -712,7 +714,8 @@ unsigned int III_scalefactors_lsf(struct mad_bitptr *ptr,
  */
 static
 unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
-			      struct channel const *gr0ch, unsigned int scfsi)
+			      struct channel const *gr0ch, unsigned int scfsi,
+			      unsigned int bits_left, unsigned int *part2_length)
 {
   struct mad_bitptr start;
   unsigned int slen1, slen2, sfbi;
@@ -728,12 +731,20 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
     sfbi = 0;
 
     nsfb = (channel->flags & mixed_block_flag) ? 8 + 3 * 3 : 6 * 3;
-    while (nsfb--)
+    while (nsfb--) {
+      if (bits_left < slen1)
+	return MAD_ERROR_BADSCFSI;
       channel->scalefac[sfbi++] = mad_bit_read(ptr, slen1);
+      bits_left -= slen1;
+    }
 
     nsfb = 6 * 3;
-    while (nsfb--)
+    while (nsfb--) {
+      if (bits_left < slen2)
+	return MAD_ERROR_BADSCFSI;
       channel->scalefac[sfbi++] = mad_bit_read(ptr, slen2);
+      bits_left -= slen2;
+    }
 
     nsfb = 1 * 3;
     while (nsfb--)
@@ -745,8 +756,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
 	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
     }
     else {
-      for (sfbi = 0; sfbi < 6; ++sfbi)
+      for (sfbi = 0; sfbi < 6; ++sfbi) {
+	if (bits_left < slen1)
+	  return MAD_ERROR_BADSCFSI;
 	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
+	bits_left -= slen1;
+      }
     }
 
     if (scfsi & 0x4) {
@@ -754,8 +769,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
 	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
     }
     else {
-      for (sfbi = 6; sfbi < 11; ++sfbi)
+      for (sfbi = 6; sfbi < 11; ++sfbi) {
+	if (bits_left < slen1)
+	  return MAD_ERROR_BADSCFSI;
 	channel->scalefac[sfbi] = mad_bit_read(ptr, slen1);
+	bits_left -= slen1;
+      }
     }
 
     if (scfsi & 0x2) {
@@ -763,8 +782,12 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
 	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
     }
     else {
-      for (sfbi = 11; sfbi < 16; ++sfbi)
+      for (sfbi = 11; sfbi < 16; ++sfbi) {
+	if (bits_left < slen2)
+	  return MAD_ERROR_BADSCFSI;
 	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
+	bits_left -= slen2;
+      }
     }
 
     if (scfsi & 0x1) {
@@ -772,14 +795,19 @@ unsigned int III_scalefactors(struct mad_bitptr *ptr, struct channel *channel,
 	channel->scalefac[sfbi] = gr0ch->scalefac[sfbi];
     }
     else {
-      for (sfbi = 16; sfbi < 21; ++sfbi)
+      for (sfbi = 16; sfbi < 21; ++sfbi) {
+	if (bits_left < slen2)
+	  return MAD_ERROR_BADSCFSI;
 	channel->scalefac[sfbi] = mad_bit_read(ptr, slen2);
+	bits_left -= slen2;
+      }
     }
 
     channel->scalefac[21] = 0;
   }
 
-  return mad_bit_length(&start, ptr);
+  *part2_length = mad_bit_length(&start, ptr);
+  return MAD_ERROR_NONE;
 }
 
 /*
@@ -933,19 +961,17 @@ static
 enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 			      struct channel *channel,
 			      unsigned char const *sfbwidth,
-			      unsigned int part2_length)
+			      signed int part3_length)
 {
   signed int exponents[39], exp;
   signed int const *expptr;
   struct mad_bitptr peek;
-  signed int bits_left, cachesz;
+  signed int bits_left, cachesz, fakebits;
   register mad_fixed_t *xrptr;
   mad_fixed_t const *sfbound;
   register unsigned long bitcache;
 
-  bits_left = (signed) channel->part2_3_length - (signed) part2_length;
-  if (bits_left < 0)
-    return MAD_ERROR_BADPART3LEN;
+  bits_left = part3_length;
 
   III_exponents(channel, sfbwidth, exponents);
 
@@ -956,8 +982,12 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
   cachesz  = mad_bit_bitsleft(&peek);
   cachesz += ((32 - 1 - 24) + (24 - cachesz)) & ~7;
 
+  if (bits_left < cachesz) {
+    cachesz = bits_left;
+  }
   bitcache   = mad_bit_read(&peek, cachesz);
   bits_left -= cachesz;
+  fakebits = 0;
 
   xrptr = &xr[0];
 
@@ -986,7 +1016,7 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 
     big_values = channel->big_values;
 
-    while (big_values-- && cachesz + bits_left > 0) {
+    while (big_values-- && cachesz + bits_left - fakebits > 0) {
       union huffpair const *pair;
       unsigned int clumpsz, value;
       register mad_fixed_t requantized;
@@ -1023,10 +1053,19 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	unsigned int bits;
 
 	bits       = ((32 - 1 - 21) + (21 - cachesz)) & ~7;
+	if (bits_left < bits) {
+	  bits = bits_left;
+	}
 	bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
 	cachesz   += bits;
 	bits_left -= bits;
       }
+      if (cachesz < 21) {
+	unsigned int bits = 21 - cachesz;
+	bitcache <<= bits;
+	cachesz += bits;
+	fakebits += bits;
+      }
 
       /* hcod (0..19) */
 
@@ -1041,6 +1080,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
       }
 
       cachesz -= pair->value.hlen;
+      if (cachesz < fakebits)
+	return MAD_ERROR_BADHUFFDATA;
 
       if (linbits) {
 	/* x (0..14) */
@@ -1054,10 +1095,15 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 
 	case 15:
 	  if (cachesz < linbits + 2) {
-	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	    cachesz   += 16;
-	    bits_left -= 16;
+	    unsigned int bits = 16;
+	    if (bits_left < 16)
+	      bits = bits_left;
+	    bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	    cachesz   += bits;
+	    bits_left -= bits;
 	  }
+	  if (cachesz - fakebits < linbits)
+	    return MAD_ERROR_BADHUFFDATA;
 
 	  value += MASK(bitcache, cachesz, linbits);
 	  cachesz -= linbits;
@@ -1074,6 +1120,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	  }
 
 	x_final:
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
 	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
 	    -requantized : requantized;
 	}
@@ -1089,10 +1137,15 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 
 	case 15:
 	  if (cachesz < linbits + 1) {
-	    bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	    cachesz   += 16;
-	    bits_left -= 16;
+	    unsigned int bits = 16;
+	    if (bits_left < 16)
+	      bits = bits_left;
+	    bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	    cachesz   += bits;
+	    bits_left -= bits;
 	  }
+	  if (cachesz - fakebits < linbits)
+	    return MAD_ERROR_BADHUFFDATA;
 
 	  value += MASK(bitcache, cachesz, linbits);
 	  cachesz -= linbits;
@@ -1109,6 +1162,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	  }
 
 	y_final:
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
 	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
 	    -requantized : requantized;
 	}
@@ -1128,6 +1183,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	    requantized = reqcache[value] = III_requantize(value, exp);
 	  }
 
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
 	  xrptr[0] = MASK1BIT(bitcache, cachesz--) ?
 	    -requantized : requantized;
 	}
@@ -1146,6 +1203,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 	    requantized = reqcache[value] = III_requantize(value, exp);
 	  }
 
+	  if (cachesz - fakebits < 1)
+	    return MAD_ERROR_BADHUFFDATA;
 	  xrptr[1] = MASK1BIT(bitcache, cachesz--) ?
 	    -requantized : requantized;
 	}
@@ -1155,9 +1214,6 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
     }
   }
 
-  if (cachesz + bits_left < 0)
-    return MAD_ERROR_BADHUFFDATA;  /* big_values overrun */
-
   /* count1 */
   {
     union huffquad const *table;
@@ -1167,15 +1223,24 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 
     requantized = III_requantize(1, exp);
 
-    while (cachesz + bits_left > 0 && xrptr <= &xr[572]) {
+    while (cachesz + bits_left - fakebits > 0 && xrptr <= &xr[572]) {
       union huffquad const *quad;
 
       /* hcod (1..6) */
 
       if (cachesz < 10) {
-	bitcache   = (bitcache << 16) | mad_bit_read(&peek, 16);
-	cachesz   += 16;
-	bits_left -= 16;
+	unsigned int bits = 16;
+	if (bits_left < 16)
+	  bits = bits_left;
+	bitcache   = (bitcache << bits) | mad_bit_read(&peek, bits);
+	cachesz   += bits;
+	bits_left -= bits;
+      }
+      if (cachesz < 10) {
+	unsigned int bits = 10 - cachesz;
+	bitcache <<= bits;
+	cachesz += bits;
+	fakebits += bits;
       }
 
       quad = &table[MASK(bitcache, cachesz, 4)];
@@ -1188,6 +1253,11 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 		      MASK(bitcache, cachesz, quad->ptr.bits)];
       }
 
+      if (cachesz - fakebits < quad->value.hlen + quad->value.v
+        + quad->value.w + quad->value.x + quad->value.y)
+	/* We don't have enough bits to read one more entry, consider them
+	 * stuffing bits. */
+	break;
       cachesz -= quad->value.hlen;
 
       if (xrptr == sfbound) {
@@ -1236,22 +1306,8 @@ enum mad_error III_huffdecode(struct mad_bitptr *ptr, mad_fixed_t xr[576],
 
       xrptr += 2;
     }
-
-    if (cachesz + bits_left < 0) {
-# if 0 && defined(DEBUG)
-      fprintf(stderr, "huffman count1 overrun (%d bits)\n",
-	      -(cachesz + bits_left));
-# endif
-
-      /* technically the bitstream is misformatted, but apparently
-	 some encoders are just a bit sloppy with stuffing bits */
-
-      xrptr -= 4;
-    }
   }
 
-  assert(-bits_left <= MAD_BUFFER_GUARD * CHAR_BIT);
-
 # if 0 && defined(DEBUG)
   if (bits_left < 0)
     fprintf(stderr, "read %d bits too many\n", -bits_left);
@@ -2348,10 +2404,11 @@ void III_freqinver(mad_fixed_t sample[18][32], unsigned int sb)
  */
 static
 enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
-			  struct sideinfo *si, unsigned int nch)
+			  struct sideinfo *si, unsigned int nch, unsigned int md_len)
 {
   struct mad_header *header = &frame->header;
   unsigned int sfreqi, ngr, gr;
+  int bits_left = md_len * CHAR_BIT;
 
   {
     unsigned int sfreq;
@@ -2383,6 +2440,7 @@ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
     for (ch = 0; ch < nch; ++ch) {
       struct channel *channel = &granule->ch[ch];
       unsigned int part2_length;
+      unsigned int part3_length;
 
       sfbwidth[ch] = sfbwidth_table[sfreqi].l;
       if (channel->block_type == 2) {
@@ -2391,18 +2449,30 @@ enum mad_error III_decode(struct mad_bitptr *ptr, struct mad_frame *frame,
       }
 
       if (header->flags & MAD_FLAG_LSF_EXT) {
-	part2_length = III_scalefactors_lsf(ptr, channel,
+	error = III_scalefactors_lsf(ptr, channel,
 					    ch == 0 ? 0 : &si->gr[1].ch[1],
-					    header->mode_extension);
+					    header->mode_extension, bits_left, &part2_length);
       }
       else {
-	part2_length = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
-					gr == 0 ? 0 : si->scfsi[ch]);
+	error = III_scalefactors(ptr, channel, &si->gr[0].ch[ch],
+					gr == 0 ? 0 : si->scfsi[ch], bits_left, &part2_length);
       }
+      if (error)
+        return error;
 
-      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part2_length);
+      bits_left -= part2_length;
+
+      if (part2_length > channel->part2_3_length)
+        return MAD_ERROR_BADPART3LEN;
+
+      part3_length = channel->part2_3_length - part2_length;
+      if (part3_length > bits_left)
+        return MAD_ERROR_BADPART3LEN;
+
+      error = III_huffdecode(ptr, xr[ch], channel, sfbwidth[ch], part3_length);
       if (error)
 	return error;
+      bits_left -= part3_length;
     }
 
     /* joint stereo processing */
@@ -2519,11 +2589,13 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
   unsigned int nch, priv_bitlen, next_md_begin = 0;
   unsigned int si_len, data_bitlen, md_len;
   unsigned int frame_space, frame_used, frame_free;
-  struct mad_bitptr ptr;
+  struct mad_bitptr ptr, bufend_ptr;
   struct sideinfo si;
   enum mad_error error;
   int result = 0;
 
+  mad_bit_init(&bufend_ptr, stream->bufend);
+
   /* allocate Layer III dynamic structures */
 
   if (stream->main_data == 0) {
@@ -2587,14 +2659,15 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
     unsigned long header;
 
     mad_bit_init(&peek, stream->next_frame);
+    if (mad_bit_length(&peek, &bufend_ptr) >= 57) {
+      header = mad_bit_read(&peek, 32);
+      if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
+        if (!(header & 0x00010000L))  /* protection_bit */
+	  mad_bit_skip(&peek, 16);  /* crc_check */
 
-    header = mad_bit_read(&peek, 32);
-    if ((header & 0xffe60000L) /* syncword | layer */ == 0xffe20000L) {
-      if (!(header & 0x00010000L))  /* protection_bit */
-	mad_bit_skip(&peek, 16);  /* crc_check */
-
-      next_md_begin =
-	mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
+        next_md_begin =
+	  mad_bit_read(&peek, (header & 0x00080000L) /* ID */ ? 9 : 8);
+      }
     }
 
     mad_bit_finish(&peek);
@@ -2608,6 +2681,11 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
     next_md_begin = 0;
 
   md_len = si.main_data_begin + frame_space - next_md_begin;
+  if (md_len + MAD_BUFFER_GUARD > MAD_BUFFER_MDLEN) {
+    stream->error = MAD_ERROR_LOSTSYNC;
+    stream->sync = 0;
+    return -1;
+  }
 
   frame_used = 0;
 
@@ -2625,8 +2703,11 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
       }
     }
     else {
-      mad_bit_init(&ptr,
-		   *stream->main_data + stream->md_len - si.main_data_begin);
+      memmove(stream->main_data,
+	*stream->main_data + stream->md_len - si.main_data_begin,
+	si.main_data_begin);
+      stream->md_len = si.main_data_begin;
+      mad_bit_init(&ptr, *stream->main_data);
 
       if (md_len > si.main_data_begin) {
 	assert(stream->md_len + md_len -
@@ -2645,7 +2726,7 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
   /* decode main_data */
 
   if (result == 0) {
-    error = III_decode(&ptr, frame, &si, nch);
+    error = III_decode(&ptr, frame, &si, nch, md_len);
     if (error) {
       stream->error = error;
       result = -1;
diff --git a/code/libmad-0.15.1b/layer3.h b/code/libmad/layer3.h
similarity index 96%
rename from code/libmad-0.15.1b/layer3.h
rename to code/libmad/layer3.h
index 2504d461..618951b0 100644
--- a/code/libmad-0.15.1b/layer3.h
+++ b/code/libmad/layer3.h
@@ -22,8 +22,7 @@
 # ifndef LIBMAD_LAYER3_H
 # define LIBMAD_LAYER3_H
 
-# include "stream.h"
-# include "frame.h"
+# include "mad.h"
 
 int mad_layer_III(struct mad_stream *, struct mad_frame *);
 
diff --git a/code/libmad-0.15.1b/mad.h b/code/libmad/mad.h.in
similarity index 95%
rename from code/libmad-0.15.1b/mad.h
rename to code/libmad/mad.h.in
index 9ef6cc8f..0e790d3e 100644
--- a/code/libmad-0.15.1b/mad.h
+++ b/code/libmad/mad.h.in
@@ -24,24 +24,25 @@
 extern "C" {
 # endif
 
-# define FPM_INTEL
-
-
-
-# define SIZEOF_INT 4
-# define SIZEOF_LONG 4
-# define SIZEOF_LONG_LONG 8
+#cmakedefine FPM_INTEL
+#cmakedefine FPM_ARM
+#cmakedefine FPM_MIPS
+#cmakedefine FPM_SPARC
+#cmakedefine FPM_PPC
+#cmakedefine FPM_64BIT
+#cmakedefine FPM_DEFAULT
 
+# define SIZEOF_INT @SIZEOF_INT@
 
 /* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
 
 # ifndef LIBMAD_VERSION_H
 # define LIBMAD_VERSION_H
 
-# define MAD_VERSION_MAJOR	0
-# define MAD_VERSION_MINOR	15
-# define MAD_VERSION_PATCH	1
-# define MAD_VERSION_EXTRA	" (beta)"
+# define MAD_VERSION_MAJOR	@CMAKE_PROJECT_VERSION_MAJOR@
+# define MAD_VERSION_MINOR	@CMAKE_PROJECT_VERSION_MINOR@
+# define MAD_VERSION_PATCH	@CMAKE_PROJECT_VERSION_PATCH@
+# define MAD_VERSION_EXTRA	""
 
 # define MAD_VERSION_STRINGIZE(str)	#str
 # define MAD_VERSION_STRING(num)	MAD_VERSION_STRINGIZE(num)
@@ -67,23 +68,19 @@ extern char const mad_build[];
 # ifndef LIBMAD_FIXED_H
 # define LIBMAD_FIXED_H
 
+# include <stdint.h>
+
 # if SIZEOF_INT >= 4
 typedef   signed int mad_fixed_t;
-
 typedef   signed int mad_fixed64hi_t;
 typedef unsigned int mad_fixed64lo_t;
 # else
 typedef   signed long mad_fixed_t;
-
 typedef   signed long mad_fixed64hi_t;
 typedef unsigned long mad_fixed64lo_t;
 # endif
 
-# if defined(_MSC_VER)
-#  define mad_fixed64_t  signed __int64
-# elif 1 || defined(__GNUC__)
-#  define mad_fixed64_t  signed long long
-# endif
+typedef int64_t mad_fixed64_t;
 
 # if defined(FPM_FLOAT)
 typedef double mad_sample_t;
@@ -320,12 +317,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
 	 : "+r" (lo), "+r" (hi)  \
 	 : "%r" (x), "r" (y))
 
+#ifdef __thumb__
+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
+	operand.  If needed this code can also support Thumb-1
+	(simply append "s" to the end of the second two instructions). */
+#  define MAD_F_MLN(hi, lo)  \
+    asm ("rsbs        %0, %0, #0\n\t"  \
+	 "sbc   %1, %1, %1\n\t"  \
+	 "sub   %1, %1, %2"  \
+	 : "+&r" (lo), "=&r" (hi)  \
+	 : "r" (hi)  \
+	 : "cc")
+#else /* ! __thumb__ */
 #  define MAD_F_MLN(hi, lo)  \
     asm ("rsbs	%0, %2, #0\n\t"  \
 	 "rsc	%1, %3, #0"  \
-	 : "=r" (lo), "=r" (hi)  \
+	 : "=&r" (lo), "=r" (hi)  \
 	 : "0" (lo), "1" (hi)  \
 	 : "cc")
+#endif /* __thumb__ */
 
 #  define mad_f_scale64(hi, lo)  \
     ({ mad_fixed_t __result;  \
@@ -348,31 +358,13 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
  * This MIPS version is fast and accurate; the disposition of the least
  * significant bit depends on OPT_ACCURACY via mad_f_scale64().
  */
-#  define MAD_F_MLX(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" (x), "r" (y))
-
-# if defined(HAVE_MADD_ASM)
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" (x), "r" (y))
-# elif defined(HAVE_MADD16_ASM)
-/*
- * This loses significant accuracy due to the 16-bit integer limit in the
- * multiply/accumulate instruction.
- */
-#  define MAD_F_ML0(hi, lo, x, y)  \
-    asm ("mult	%2,%3"  \
-	 : "=l" (lo), "=h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLA(hi, lo, x, y)  \
-    asm ("madd16	%2,%3"  \
-	 : "+l" (lo), "+h" (hi)  \
-	 : "%r" ((x) >> 12), "r" ((y) >> 16))
-#  define MAD_F_MLZ(hi, lo)  ((mad_fixed_t) (lo))
-# endif
+   typedef unsigned int u64_di_t __attribute__ ((mode (DI)));
+#  define MAD_F_MLX(hi, lo, x, y) \
+   do { \
+      u64_di_t __ll = (u64_di_t) (x) * (y); \
+      hi = __ll >> 32; \
+      lo = __ll; \
+   } while (0)
 
 # if defined(OPT_SPEED)
 #  define mad_f_scale64(hi, lo)  \
@@ -424,8 +416,8 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
        asm ("addc %0,%2,%3\n\t"  \
 	    "adde %1,%4,%5"  \
 	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
+	    : "0" (lo), "r" (__lo), \
+	      "1" (hi), "r" (__hi) \
 	    : "xer");  \
     })
 #  endif
diff --git a/code/libmad-0.15.1b/minimad.c b/code/libmad/minimad.c
similarity index 100%
rename from code/libmad-0.15.1b/minimad.c
rename to code/libmad/minimad.c
diff --git a/code/libmad/packaging/mad.pc.in b/code/libmad/packaging/mad.pc.in
new file mode 100644
index 00000000..7cb5dbb1
--- /dev/null
+++ b/code/libmad/packaging/mad.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=@PKGCONFIG_INCLUDEDIR@
+libdir=@PKGCONFIG_LIBDIR@
+
+Name: MAD
+Description: MPEG audio decoder library
+Version: @CMAKE_PROJECT_VERSION@
+URL: https://codeberg.org/tenacityteam/libmad
+Libs: -L${libdir} -lmad
+Cflags: -I${includedir}
diff --git a/code/libmad/packaging/madConfig.cmake.in b/code/libmad/packaging/madConfig.cmake.in
new file mode 100644
index 00000000..2b2e2ce0
--- /dev/null
+++ b/code/libmad/packaging/madConfig.cmake.in
@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/madTargets.cmake")
+
+check_required_components(mad)
diff --git a/code/libmad-0.15.1b/qc_table.dat b/code/libmad/qc_table.dat
similarity index 100%
rename from code/libmad-0.15.1b/qc_table.dat
rename to code/libmad/qc_table.dat
diff --git a/code/libmad-0.15.1b/rq_table.dat b/code/libmad/rq_table.dat
similarity index 100%
rename from code/libmad-0.15.1b/rq_table.dat
rename to code/libmad/rq_table.dat
diff --git a/code/libmad-0.15.1b/sf_table.dat b/code/libmad/sf_table.dat
similarity index 100%
rename from code/libmad-0.15.1b/sf_table.dat
rename to code/libmad/sf_table.dat
diff --git a/code/libmad-0.15.1b/stream.c b/code/libmad/stream.c
similarity index 97%
rename from code/libmad-0.15.1b/stream.c
rename to code/libmad/stream.c
index 8bb4d6a4..18ce95ae 100644
--- a/code/libmad-0.15.1b/stream.c
+++ b/code/libmad/stream.c
@@ -19,16 +19,11 @@
  * $Id: stream.c,v 1.12 2004/02/05 09:02:39 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # include <stdlib.h>
 
-# include "bit.h"
-# include "stream.h"
+# include "mad.h"
 
 /*
  * NAME:	stream->init()
diff --git a/code/libmad-0.15.1b/synth.c b/code/libmad/synth.c
similarity index 99%
rename from code/libmad-0.15.1b/synth.c
rename to code/libmad/synth.c
index 1d28d438..110c9b28 100644
--- a/code/libmad-0.15.1b/synth.c
+++ b/code/libmad/synth.c
@@ -19,15 +19,9 @@
  * $Id: synth.c,v 1.25 2004/01/23 09:41:33 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
-# include "fixed.h"
-# include "frame.h"
-# include "synth.h"
+# include "mad.h"
 
 /*
  * NAME:	synth->init()
diff --git a/code/libmad-0.15.1b/timer.c b/code/libmad/timer.c
similarity index 99%
rename from code/libmad-0.15.1b/timer.c
rename to code/libmad/timer.c
index 4b909aba..df11316c 100644
--- a/code/libmad-0.15.1b/timer.c
+++ b/code/libmad/timer.c
@@ -19,10 +19,6 @@
  * $Id: timer.c,v 1.18 2004/01/23 09:41:33 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
 # include <stdio.h>
@@ -31,7 +27,7 @@
 #  include <assert.h>
 # endif
 
-# include "timer.h"
+# include "mad.h"
 
 mad_timer_t const mad_timer_zero = { 0, 0 };
 
diff --git a/code/libmad-0.15.1b/version.c b/code/libmad/version.c
similarity index 96%
rename from code/libmad-0.15.1b/version.c
rename to code/libmad/version.c
index e643fa71..f3747567 100644
--- a/code/libmad-0.15.1b/version.c
+++ b/code/libmad/version.c
@@ -19,13 +19,9 @@
  * $Id: version.c,v 1.15 2004/01/23 09:41:33 rob Exp $
  */
 
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
 # include "global.h"
 
-# include "version.h"
+# include "mad.h"
 
 char const mad_version[]   = "MPEG Audio Decoder " MAD_VERSION;
 char const mad_copyright[] = "Copyright (C) " MAD_PUBLISHYEAR " " MAD_AUTHOR;
diff --git a/code/null/null_client.c b/code/null/null_client.c
index 4027e404..3c70de34 100644
--- a/code/null/null_client.c
+++ b/code/null/null_client.c
@@ -62,6 +62,9 @@ void CL_CharEvent( int key ) {
 void CL_Disconnect() {
 }
 
+void CL_AbnormalDisconnect() {
+}
+
 void CL_MapLoading( qboolean flush, const char *pszMapName ) {
 }
 
@@ -125,3 +128,11 @@ void SCR_DebugGraph( float value ) {
 qboolean CL_FinishedIntro( void ) {
 	return qtrue;
 }
+
+int R_CountTextureMemory() {
+    return 0;
+}
+
+qboolean CL_UseLargeLightmap(const char* mapName) {
+	return qtrue;
+}
diff --git a/code/null/null_snddma.c b/code/null/null_snddma.c
index 28cfb1ec..9b782fa7 100644
--- a/code/null/null_snddma.c
+++ b/code/null/null_snddma.c
@@ -47,15 +47,30 @@ void SNDDMA_Submit(void)
 {
 }
 
-void SNDDMA_Activate(void) {
+#ifdef USE_VOIP
+void SNDDMA_StartCapture(void)
+{
 }
 
-sfxHandle_t S_RegisterSound( const char *sample, qboolean compressed )
+int SNDDMA_AvailableCaptureSamples(void)
 {
 	return 0;
 }
 
-void S_StartLocalSound( sfxHandle_t sfx, int channelNum ) {
+void SNDDMA_Capture(int samples, byte *data)
+{
+}
+
+void SNDDMA_StopCapture(void)
+{
+}
+
+void SNDDMA_MasterGain( float val )
+{
+}
+#endif
+
+void SNDDMA_Activate(void) {
 }
 
 void S_ClearSoundBuffer( void ) {
@@ -64,3 +79,17 @@ void S_ClearSoundBuffer( void ) {
 int S_IsSoundPlaying( int channel_number, const char *sfxName ){
 	return 0;
 }
+
+#if defined(NO_MODERN_DMA) && NO_MODERN_DMA
+void S_StartLocalSound(sfxHandle_t sfx, int channelNum) {
+}
+sfxHandle_t S_RegisterSound(const char* sample, qboolean compressed) {
+	return 0;
+}
+#else
+void S_StartLocalSound(const char* sound_name, qboolean force_load) {
+}
+sfxHandle_t S_RegisterSound(const char* name, int streamed, qboolean force_load) {
+	return 0;
+}
+#endif
diff --git a/code/parser/bison_source.txt b/code/parser/bison_source.txt
index e5d393ef..b3ba1d42 100644
--- a/code/parser/bison_source.txt
+++ b/code/parser/bison_source.txt
@@ -1,7 +1,7 @@
 %{
 /*
 * ===========================================================================
-* Copyright (C) 2015 the OpenMoHAA team
+* Copyright (C) 2025 the OpenMoHAA team
 * 
 * This file is part of OpenMoHAA source code.
 * 
@@ -57,7 +57,7 @@ int success_pos;
 %precedence TOKEN_EOL
 
 %union {
-	stype_t s;
+    stype_t s;
 }
 
 %left TOKEN_COMMA
@@ -71,11 +71,11 @@ int success_pos;
 %left TOKEN_LEFT_BRACKET TOKEN_RIGHT_BRACKET
 %token TOKEN_LEFT_SQUARE_BRACKET TOKEN_RIGHT_SQUARE_BRACKET
 
-%right	TOKEN_ASSIGNMENT
-		TOKEN_PLUS_EQUALS TOKEN_MINUS_EQUALS TOKEN_MULTIPLY_EQUALS TOKEN_DIVIDE_EQUALS TOKEN_MODULUS_EQUALS
-		TOKEN_AND_EQUALS TOKEN_EXCL_OR_EQUALS TOKEN_OR_EQUALS
-		TOKEN_SHIFT_LEFT_EQUALS TOKEN_SHIFT_RIGHT_EQUALS
-		TOKEN_TERNARY TOKEN_COLON
+%right  TOKEN_ASSIGNMENT
+        TOKEN_PLUS_EQUALS TOKEN_MINUS_EQUALS TOKEN_MULTIPLY_EQUALS TOKEN_DIVIDE_EQUALS TOKEN_MODULUS_EQUALS
+        TOKEN_AND_EQUALS TOKEN_EXCL_OR_EQUALS TOKEN_OR_EQUALS
+        TOKEN_SHIFT_LEFT_EQUALS TOKEN_SHIFT_RIGHT_EQUALS
+        TOKEN_TERNARY TOKEN_COLON
 
 %left TOKEN_LOGICAL_OR
 %left TOKEN_LOGICAL_AND
@@ -103,19 +103,18 @@ int success_pos;
 %left TOKEN_DOUBLE_COLON
 %left TOKEN_SEMICOLON
 %right TOKEN_DOLLAR
-%left TOKEN_NUMBER
 
 %token TOKEN_INCREMENT TOKEN_DECREMENT TOKEN_PERIOD
 
 %right TOKEN_INCREMENT TOKEN_DECREMENT TOKEN_NEG TOKEN_NOT TOKEN_COMPLEMENT
 %left TOKEN_LEFT_SQUARE_BRACKET TOKEN_RIGHT_SQUARE_BRACKET TOKEN_PERIOD
 
-%precedence		TOKEN_CATCH TOKEN_TRY
-				TOKEN_SWITCH TOKEN_CASE
-				TOKEN_BREAK TOKEN_CONTINUE
-				TOKEN_SIZE
-				TOKEN_END TOKEN_RETURN
-				TOKEN_MAKEARRAY TOKEN_ENDARRAY
+%precedence     TOKEN_CATCH TOKEN_TRY
+                TOKEN_SWITCH TOKEN_CASE
+                TOKEN_BREAK TOKEN_CONTINUE
+                TOKEN_SIZE
+                TOKEN_END TOKEN_RETURN
+                TOKEN_MAKEARRAY TOKEN_ENDARRAY
 
 %type <s.val> event_parameter_list event_parameter_list_need event_parameter
 %type <s.val> statement_list statement statement_declaration makearray_statement_list makearray_statement statement_for_condition
@@ -125,6 +124,7 @@ int success_pos;
 %type <s.val> prim_expr
 %type <s.val> listener_identifier
 %type <s.val> nonident_prim_expr
+%type <s.val> nonident_prim_expr_base
 %type <s.val> const_array_list
 %type <s.val> const_array
 %type <s.val> identifier_prim
@@ -135,203 +135,207 @@ int success_pos;
 %%
 
 program
-	: statement_list[list] { parsedata.val = node1(ENUM_statement_list, $list); }
-	| line_opt { parsedata.val = node0(ENUM_NOP); }
-	;
+    : statement_list[list] { parsedata.val = node1(ENUM_statement_list, $list); }
+    | line_opt { parsedata.val = node0(ENUM_NOP); }
+    ;
 
 statement_list
-	: statement { $$ = linked_list_end($1); }
-	| statement_list statement[stmt] { $$ = append_node($1, $stmt); }
-	;
+    : statement { $$ = linked_list_end($1); }
+    | statement_list statement[stmt] { $$ = append_node($1, $stmt); }
+    ;
 
 statement
-	: line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
-	;
+    : line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
+    ;
 
 statement_declaration
-	: TOKEN_IDENTIFIER event_parameter_list TOKEN_COLON { $$ = node3(ENUM_labeled_statement, $1, $2, TOKPOS(@1)); }
-	| TOKEN_CASE prim_expr event_parameter_list TOKEN_COLON { $$ = node3(ENUM_int_labeled_statement, $2, $3, TOKPOS(@1)); }
-	| compound_statement
-	| selection_statement
-	| iteration_statement
-	| TOKEN_TRY compound_statement[C1] TOKEN_CATCH compound_statement[C2] { $$ = node3(ENUM_try, $C1, $C2, TOKPOS(@1)); }
-	| TOKEN_BREAK { $$ = node1(ENUM_break, TOKPOS(@1)); }
-	| TOKEN_CONTINUE { $$ = node1(ENUM_continue, TOKPOS(@1)); }
-	| TOKEN_IDENTIFIER event_parameter_list { $$ = node3(ENUM_cmd_event_statement, $1, $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_statement, $1, $2, $3, TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_ASSIGNMENT expr { $$ = node3(ENUM_assignment_statement, $1, $3, TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_PLUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PLUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MINUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MINUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MULTIPLY_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MULTIPLY), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_DIVIDE_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_DIVIDE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_MODULUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PERCENTAGE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_AND_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_AND), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_EXCL_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_EXCL_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_SHIFT_LEFT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_LEFT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_SHIFT_RIGHT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_RIGHT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_INCREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_INC), $1, TOKPOS(@2)), TOKPOS(@2)); }
-	| nonident_prim_expr TOKEN_DECREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_DEC), $1, TOKPOS(@2)), TOKPOS(@2)); }
-	| TOKEN_SEMICOLON { $$ = node0(ENUM_NOP); }
-	//| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node3( ENUM_method_event_statement, node_string( parsetree_string( str( $1.stringValue ) + "::" + $3.stringValue ) ), node1( ENUM_NOP, $4 ), TOKPOS(@1) ); }
-	//| nonident_prim_expr TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node4( ENUM_method_event_statement, $1, node_string( parsetree_string( str( $2.stringValue ) + "::" + $4.stringValue ) ), node1( ENUM_NOP, $5 ), TOKPOS(@2) ); }
-	;
-	
+    : TOKEN_IDENTIFIER event_parameter_list TOKEN_COLON { $$ = node3(ENUM_labeled_statement, $1, $2, TOKPOS(@1)); }
+    | TOKEN_CASE prim_expr event_parameter_list TOKEN_COLON { $$ = node3(ENUM_int_labeled_statement, $2, $3, TOKPOS(@1)); }
+    | compound_statement
+    | selection_statement
+    | iteration_statement
+    | TOKEN_TRY compound_statement[C1] TOKEN_CATCH compound_statement[C2] { $$ = node3(ENUM_try, $C1, $C2, TOKPOS(@1)); }
+    | TOKEN_BREAK { $$ = node1(ENUM_break, TOKPOS(@1)); }
+    | TOKEN_CONTINUE { $$ = node1(ENUM_continue, TOKPOS(@1)); }
+    | TOKEN_IDENTIFIER event_parameter_list { $$ = node3(ENUM_cmd_event_statement, $1, $2, TOKPOS(@1)); }
+    | nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_statement, $1, $2, $3, TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_ASSIGNMENT expr { $$ = node3(ENUM_assignment_statement, $1, $3, TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_PLUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PLUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MINUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MINUS), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MULTIPLY_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_MULTIPLY), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_DIVIDE_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_DIVIDE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_MODULUS_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_PERCENTAGE), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_AND_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_AND), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_EXCL_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_EXCL_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_OR_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_BITWISE_OR), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_SHIFT_LEFT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_LEFT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_SHIFT_RIGHT_EQUALS expr { $$ = node3(ENUM_assignment_statement, $1, node4(ENUM_func2_expr, node1b(OP_BIN_SHIFT_RIGHT), $1, $3, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_INCREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_INC), $1, TOKPOS(@2)), TOKPOS(@2)); }
+    | nonident_prim_expr TOKEN_DECREMENT { $$ = node3(ENUM_assignment_statement, $1, node3(ENUM_func1_expr, node1b(OP_UN_DEC), $1, TOKPOS(@2)), TOKPOS(@2)); }
+    | TOKEN_SEMICOLON { $$ = node0(ENUM_NOP); }
+    //| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node3( ENUM_method_event_statement, node_string( parsetree_string( str( $1.stringValue ) + "::" + $3.stringValue ) ), node1( ENUM_NOP, $4 ), TOKPOS(@1) ); }
+    //| nonident_prim_expr TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON TOKEN_IDENTIFIER event_parameter_list { $$ = node4( ENUM_method_event_statement, $1, node_string( parsetree_string( str( $2.stringValue ) + "::" + $4.stringValue ) ), node1( ENUM_NOP, $5 ), TOKPOS(@2) ); }
+    ;
+    
 statement_for_condition
-	: line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
-	| line_opt statement_declaration[stmt_decl] TOKEN_SEMICOLON line_opt { $$ = $stmt_decl; }
-	;
+    : line_opt statement_declaration[stmt_decl] line_opt { $$ = $stmt_decl; }
+    | line_opt statement_declaration[stmt_decl] TOKEN_SEMICOLON line_opt { $$ = $stmt_decl; }
+    ;
 
 compound_statement
-	: TOKEN_LEFT_BRACES statement_list TOKEN_RIGHT_BRACES { $$ = node1(ENUM_statement_list, $2); }
-	| TOKEN_LEFT_BRACES line_opt TOKEN_RIGHT_BRACES { $$ = node0(ENUM_NOP); }
-	| line_opt compound_statement[comp_stmt] line_opt { $$ = $comp_stmt; }
-	;
+    : TOKEN_LEFT_BRACES statement_list TOKEN_RIGHT_BRACES { $$ = node1(ENUM_statement_list, $2); }
+    | TOKEN_LEFT_BRACES line_opt TOKEN_RIGHT_BRACES { $$ = node0(ENUM_NOP); }
+    | line_opt compound_statement[comp_stmt] line_opt { $$ = $comp_stmt; }
+    ;
 
 selection_statement
-	: TOKEN_IF prim_expr[exp] statement_for_condition[stmt] %prec THEN { $$ = node3(ENUM_if_statement, $exp, $stmt, TOKPOS(@1)); }
-	| TOKEN_IF prim_expr[exp] statement_for_condition[if_stmt] TOKEN_ELSE statement_for_condition[else_stmt] { $$ = node4(ENUM_if_else_statement, $exp, $if_stmt, $else_stmt, TOKPOS(@1)); }
-	| TOKEN_SWITCH prim_expr[exp] compound_statement[comp_stmt] { $$ = node3(ENUM_switch, $exp, $comp_stmt, TOKPOS(@1)); }
-	;
+    : TOKEN_IF prim_expr[exp] statement_for_condition[stmt] %prec THEN { $$ = node3(ENUM_if_statement, $exp, $stmt, TOKPOS(@1)); }
+    | TOKEN_IF prim_expr[exp] statement_for_condition[if_stmt] TOKEN_ELSE statement_for_condition[else_stmt] { $$ = node4(ENUM_if_else_statement, $exp, $if_stmt, $else_stmt, TOKPOS(@1)); }
+    | TOKEN_SWITCH prim_expr[exp] compound_statement[comp_stmt] { $$ = node3(ENUM_switch, $exp, $comp_stmt, TOKPOS(@1)); }
+    ;
 
 iteration_statement
-	: TOKEN_WHILE prim_expr[exp] statement_for_condition[stmt]{ $$ = node4(ENUM_while_statement, $exp, $stmt, node0(ENUM_NOP), TOKPOS(@1)); }
-	| TOKEN_FOR TOKEN_LEFT_BRACKET statement[init_stmt] TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
-	{
-		sval_t while_stmt = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
-		$$ = node1(ENUM_statement_list, append_node(linked_list_end($init_stmt), while_stmt));
-	}
-	| TOKEN_FOR TOKEN_LEFT_BRACKET TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
-	{
-		$$ = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
-	}
-	| TOKEN_DO statement_for_condition[stmt] TOKEN_WHILE prim_expr[exp]{ $$ = node3(ENUM_do, $stmt, $exp, TOKPOS(@1)); }
-	;
+    : TOKEN_WHILE prim_expr[exp] statement_for_condition[stmt]{ $$ = node4(ENUM_while_statement, $exp, $stmt, node0(ENUM_NOP), TOKPOS(@1)); }
+    | TOKEN_FOR TOKEN_LEFT_BRACKET statement[init_stmt] TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
+    {
+        sval_t while_stmt = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
+        $$ = node1(ENUM_statement_list, append_node(linked_list_end($init_stmt), while_stmt));
+    }
+    | TOKEN_FOR TOKEN_LEFT_BRACKET TOKEN_SEMICOLON expr[exp] TOKEN_SEMICOLON statement_list[inc_stmt] TOKEN_RIGHT_BRACKET statement_for_condition[stmt]
+    {
+        $$ = node4(ENUM_while_statement, $exp, $stmt, node1(ENUM_statement_list, $inc_stmt), TOKPOS(@1));
+    }
+    | TOKEN_DO statement_for_condition[stmt] TOKEN_WHILE prim_expr[exp]{ $$ = node3(ENUM_do, $stmt, $exp, TOKPOS(@1)); }
+    ;
 
 expr:
-	expr TOKEN_LOGICAL_AND expr { $$ = node3( ENUM_logical_and, $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LOGICAL_OR expr { $$ = node3( ENUM_logical_or, $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_AND expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_AND ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_OR ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_BITWISE_EXCL_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_EXCL_OR ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_EQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_EQUALITY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_INEQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_INEQUALITY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LESS_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_GREATER_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_LESS_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_GREATER_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_PLUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PLUS ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MINUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MINUS ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MULTIPLY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MULTIPLY ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_DIVIDE expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_DIVIDE ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_MODULUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PERCENTAGE ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_SHIFT_LEFT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_LEFT ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_SHIFT_RIGHT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_RIGHT ), $1, $3, TOKPOS(@2) ); }
-	| expr TOKEN_TERNARY expr TOKEN_COLON expr { $$ = node4( ENUM_if_else_statement, $1, $3, $5, TOKPOS(@2) ); }
-	| TOKEN_EOL expr[exp] { $$ = $exp; }
-	| nonident_prim_expr
-	| func_prim_expr
-	| TOKEN_IDENTIFIER { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	;
+    expr TOKEN_LOGICAL_AND expr { $$ = node3( ENUM_logical_and, $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LOGICAL_OR expr { $$ = node3( ENUM_logical_or, $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_AND expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_AND ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_OR ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_BITWISE_EXCL_OR expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_BITWISE_EXCL_OR ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_EQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_EQUALITY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_INEQUALITY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_INEQUALITY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LESS_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_GREATER_THAN expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_LESS_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_LESS_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_GREATER_THAN_OR_EQUAL expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_GREATER_THAN_OR_EQUAL ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_PLUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PLUS ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MINUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MINUS ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MULTIPLY expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_MULTIPLY ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_DIVIDE expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_DIVIDE ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_MODULUS expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_PERCENTAGE ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_SHIFT_LEFT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_LEFT ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_SHIFT_RIGHT expr { $$ = node4( ENUM_func2_expr, node1b( OP_BIN_SHIFT_RIGHT ), $1, $3, TOKPOS(@2) ); }
+    | expr TOKEN_TERNARY expr TOKEN_COLON expr { $$ = node4( ENUM_if_else_statement, $1, $3, $5, TOKPOS(@2) ); }
+    | TOKEN_EOL expr[exp] { $$ = $exp; }
+    | nonident_prim_expr
+    | func_prim_expr
+    | TOKEN_IDENTIFIER { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    ;
 
 func_prim_expr:
-	TOKEN_IDENTIFIER event_parameter_list_need { $$ = node3(ENUM_cmd_event_expr, $1, $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
-	| TOKEN_NEG func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
-	| TOKEN_COMPLEMENT func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
-	| TOKEN_NOT func_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
-	| TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON const_array_list
-		{
-			$$ = node3(ENUM_const_array_expr, node2(ENUM_string, $1, TOKPOS(@1)), $3, TOKPOS(@2));
-		}
-	| nonident_prim_expr TOKEN_DOUBLE_COLON const_array_list
-		{
-			$$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2));
-		}
-	| TOKEN_MAKEARRAY makearray_statement_list[stmt] TOKEN_ENDARRAY
-		{
-			$$ = node2(ENUM_makearray, $stmt, TOKPOS(@1));
-		}
-	;
+    TOKEN_IDENTIFIER event_parameter_list_need { $$ = node3(ENUM_cmd_event_expr, $1, $2, TOKPOS(@1)); }
+    | nonident_prim_expr_base TOKEN_IDENTIFIER event_parameter_list { $$ = node4(ENUM_method_event_expr, $1, $2, $3, TOKPOS(@2)); }
+    | TOKEN_NEG func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
+    | TOKEN_COMPLEMENT func_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
+    | TOKEN_NOT func_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
+    | TOKEN_IDENTIFIER TOKEN_DOUBLE_COLON const_array_list
+        {
+            $$ = node3(ENUM_const_array_expr, node2(ENUM_string, $1, TOKPOS(@1)), $3, TOKPOS(@2));
+        }
+    | nonident_prim_expr TOKEN_DOUBLE_COLON const_array_list
+        {
+            $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2));
+        }
+    | TOKEN_MAKEARRAY makearray_statement_list[stmt] TOKEN_ENDARRAY
+        {
+            $$ = node2(ENUM_makearray, $stmt, TOKPOS(@1));
+        }
+    ;
 
 event_parameter_list
-	: { $$ = sval_u{}; $$.node = NULL; }
-	| event_parameter { $$ = $1; }
-	;
+    : { $$ = sval_u{}; $$.node = NULL; }
+    | event_parameter { $$ = $1; }
+    ;
 
 event_parameter_list_need
-	: event_parameter { $$ = $1; }
-	;
+    : event_parameter { $$ = $1; }
+    ;
 
 event_parameter
-	: prim_expr { $$ = linked_list_end($1); }
-	| event_parameter prim_expr { $$ = append_node($1, $2); }
-	;
+    : prim_expr { $$ = linked_list_end($1); }
+    | event_parameter prim_expr { $$ = append_node($1, $2); }
+    ;
 
 const_array_list
-	: const_array { $$ = linked_list_end($1); }
-	| const_array_list TOKEN_DOUBLE_COLON const_array { $$ = append_node($1, $3); }
-	;
+    : const_array { $$ = linked_list_end($1); }
+    | const_array_list TOKEN_DOUBLE_COLON const_array { $$ = append_node($1, $3); }
+    ;
 
 const_array
-	: nonident_prim_expr
-	| identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	;
+    : nonident_prim_expr
+    | identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    ;
 
 prim_expr
-	: nonident_prim_expr
-	| identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| prim_expr TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
-	;
+    : nonident_prim_expr
+    | identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    | const_array TOKEN_DOUBLE_COLON const_array_list { $$ = node3(ENUM_const_array_expr, $1, $3, TOKPOS(@2)); }
+    ;
 
 identifier_prim:
-	TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
-	;
+    TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
+    ;
 
 identifier
-	: TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
-	| TOKEN_STRING { $$ = $1; @$ = @1; }
-	;
+    : TOKEN_IDENTIFIER { $$ = $1; @$ = @1; }
+    | TOKEN_STRING { $$ = $1; @$ = @1; }
+    ;
 
 listener_identifier
-	: identifier_prim { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
-	;
+    : identifier { $$ = node_listener($1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
+    ;
 
 nonident_prim_expr
-	: TOKEN_DOLLAR listener_identifier { $$ = node3(ENUM_func1_expr, node1b(OP_UN_TARGETNAME), $2, TOKPOS(@1)); }
-	| nonident_prim_expr TOKEN_PERIOD identifier { $$ = node3(ENUM_field, $1, $3, TOKPOS(@3)); }
-	| nonident_prim_expr TOKEN_PERIOD TOKEN_SIZE { $$ = node3(ENUM_func1_expr, node1b(OP_UN_SIZE), $1, TOKPOS(@3)); }
-	| nonident_prim_expr TOKEN_LEFT_SQUARE_BRACKET expr TOKEN_RIGHT_SQUARE_BRACKET { $$ = node3(ENUM_array_expr, $1, $3, TOKPOS(@2)); }
-	| TOKEN_STRING { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
-	| TOKEN_INTEGER { $$ = node2(ENUM_integer, $1, TOKPOS(@1)); }
-	| TOKEN_FLOAT { $$ = node2(ENUM_float, $1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr[exp1] expr[exp2] expr[exp3] TOKEN_RIGHT_BRACKET { $$ = node4(ENUM_vector, $exp1, $exp2, $exp3, TOKPOS(@1)); }
-	| TOKEN_LISTENER { $$ = node2(ENUM_listener, $1, TOKPOS(@1)); }
-	| TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
-	| TOKEN_LEFT_BRACKET expr TOKEN_EOL TOKEN_RIGHT_BRACKET { $$ = $2; }
-	| TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
-	| TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
-	| TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
-	| TOKEN_NULL { $$ = node1(ENUM_NULL, TOKPOS(@1)); }
-	| TOKEN_NIL { $$ = node1(ENUM_NIL, TOKPOS(@1)); }
-	;
+    : nonident_prim_expr_base
+    | TOKEN_NEG nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_MINUS), $2, TOKPOS(@1)); }
+    | TOKEN_COMPLEMENT nonident_prim_expr { $$ = node3(ENUM_func1_expr, node1b(OP_UN_COMPLEMENT), $2, TOKPOS(@1)); }
+    | TOKEN_NOT nonident_prim_expr { $$ = node2(ENUM_bool_not, $2, TOKPOS(@1)); }
+    ;
+
+nonident_prim_expr_base
+    : TOKEN_DOLLAR listener_identifier { $$ = node3(ENUM_func1_expr, node1b(OP_UN_TARGETNAME), $2, TOKPOS(@1)); }
+    | nonident_prim_expr TOKEN_PERIOD identifier { $$ = node3(ENUM_field, $1, $3, TOKPOS(@3)); }
+    | nonident_prim_expr TOKEN_PERIOD TOKEN_SIZE { $$ = node3(ENUM_func1_expr, node1b(OP_UN_SIZE), $1, TOKPOS(@3)); }
+    | nonident_prim_expr TOKEN_LEFT_SQUARE_BRACKET expr TOKEN_RIGHT_SQUARE_BRACKET { $$ = node3(ENUM_array_expr, $1, $3, TOKPOS(@2)); }
+    | TOKEN_STRING { $$ = node2(ENUM_string, $1, TOKPOS(@1)); }
+    | TOKEN_INTEGER { $$ = node2(ENUM_integer, $1, TOKPOS(@1)); }
+    | TOKEN_FLOAT { $$ = node2(ENUM_float, $1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr[exp1] expr[exp2] expr[exp3] TOKEN_RIGHT_BRACKET { $$ = node4(ENUM_vector, $exp1, $exp2, $exp3, TOKPOS(@1)); }
+    | TOKEN_LISTENER { $$ = node2(ENUM_listener, $1, TOKPOS(@1)); }
+    | TOKEN_LEFT_BRACKET expr TOKEN_RIGHT_BRACKET { $$ = $2; }
+    | TOKEN_LEFT_BRACKET expr TOKEN_EOL TOKEN_RIGHT_BRACKET { $$ = $2; }
+    | TOKEN_NULL { $$ = node1(ENUM_NULL, TOKPOS(@1)); }
+    | TOKEN_NIL { $$ = node1(ENUM_NIL, TOKPOS(@1)); }
+    ;
 
 makearray_statement_list:
-	{ $$ = node0(ENUM_NOP); }
-	| makearray_statement_list[list] makearray_statement[ma_stmt] TOKEN_EOL { $$ = append_node($list, node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
-	| makearray_statement[ma_stmt] TOKEN_EOL { $$ = linked_list_end(node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
-	| TOKEN_EOL makearray_statement_list { $$ = $2; @$ = @2; }
-	;
+    { $$ = node0(ENUM_NOP); }
+    | makearray_statement_list[list] makearray_statement[ma_stmt] TOKEN_EOL { $$ = append_node($list, node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
+    | makearray_statement[ma_stmt] TOKEN_EOL { $$ = linked_list_end(node2(ENUM_makearray, $ma_stmt, TOKPOS(@ma_stmt))); }
+    | TOKEN_EOL makearray_statement_list { $$ = $2; @$ = @2; }
+    ;
 
 makearray_statement:
-	prim_expr { $$ = linked_list_end( $1 ); }
-	| makearray_statement prim_expr { $$ = append_node( $1, $2 ); }
-	;
+    prim_expr { $$ = linked_list_end( $1 ); }
+    | makearray_statement prim_expr { $$ = append_node( $1, $2 ); }
+    ;
 
 line_opt
-	: {}
-	| TOKEN_EOL
-	;
+    : {}
+    | TOKEN_EOL
+    ;
  
 %%
diff --git a/code/parser/lex.yy.cpp b/code/parser/lex.yy.cpp
index a7175203..225052d9 100644
--- a/code/parser/lex.yy.cpp
+++ b/code/parser/lex.yy.cpp
@@ -1,3 +1,28 @@
+/*
+* ===========================================================================
+* Copyright (C) 2025 the OpenMoHAA team
+* 
+* This file is part of OpenMoHAA source code.
+* 
+* OpenMoHAA source code is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the License,
+* or (at your option) any later version.
+* 
+* OpenMoHAA source code is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with OpenMoHAA source code; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+* ===========================================================================
+*
+*
+* lex.yy.cpp: original lex generated file (unimplemented)
+*/
+
 #include "scriptcompiler.h"
 #include <stdio.h>
 
diff --git a/code/parser/lex_source.txt b/code/parser/lex_source.txt
index e1545c94..d97038b0 100644
--- a/code/parser/lex_source.txt
+++ b/code/parser/lex_source.txt
@@ -1,7 +1,7 @@
 %{
 /*
 * ===========================================================================
-* Copyright (C) 2015 the OpenMoHAA team
+* Copyright (C) 2025 the OpenMoHAA team
 * 
 * This file is part of OpenMoHAA source code.
 * 
@@ -29,147 +29,144 @@
 
 #include <stdio.h>
 
-void fprintf2( FILE *f, const char *format, ... )
+void fprintf2(FILE * f, const char *format, ...)
 {
-	va_list va;
-	static char buffer[ 4200 ];
+    va_list     va;
+    static char buffer[4200];
 
-	va_start( va, format );
-	vsprintf( buffer, format, va );
-	va_end( va );
+    va_start(va, format);
+    vsprintf(buffer, format, va);
+    va_end(va);
 
-	gi.Printf( buffer );
+    gi.Printf(buffer);
 }
 
 #define fprintf fprintf2
 
-const char* start_ptr;
-const char* in_ptr;
-extern int prev_yylex;
-extern int out_pos;
-extern int success_pos;
+const char  *start_ptr;
+const char  *in_ptr;
+extern int   prev_yylex;
+extern int   out_pos;
+extern int   success_pos;
 parseStage_e parseStage;
 
 extern yyparsedata parsedata;
 
-void yyllocset(YYLTYPE *loc, uint32_t off)
+void yyllocset(YYLTYPE * loc, uint32_t off)
 {
-	success_pos = out_pos - yyleng + off;
-	loc->sourcePos = success_pos;
-	parsedata.pos = success_pos;
+    success_pos    = out_pos - yyleng + off;
+    loc->sourcePos = success_pos;
+    parsedata.pos  = success_pos;
 }
 
 void yyreducepos(uint32_t off)
 {
-	out_pos -= off;
+    out_pos -= off;
 }
 
-#define YYLEX(n) { yyllocset(&yylloc, 0); prev_yylex = n; return n; }
-#define YYLEXOFF(n, off) { yyllocset(&yylloc, off); prev_yylex = n; return n; }
+#define YYLEX(n)               \
+    {                          \
+        yyllocset(&yylloc, 0); \
+        prev_yylex = n;        \
+        return n;              \
+    }
+#define YYLEXOFF(n, off)         \
+    {                            \
+        yyllocset(&yylloc, off); \
+        prev_yylex = n;          \
+        return n;                \
+    }
 
-#define YY_USER_ACTION \
-{ \
-	out_pos += yyleng - yy_more_len; \
-	yylloc.sourcePos = out_pos; \
-	parsedata.pos = out_pos; \
-}
+#define YY_USER_ACTION                   \
+    {                                    \
+        out_pos += yyleng - yy_more_len; \
+        yylloc.sourcePos = out_pos;      \
+        parsedata.pos    = out_pos;      \
+    }
 
-#define YY_FATAL_ERROR( n ) yylexerror( n )
+#define YY_FATAL_ERROR(n) yylexerror(n)
 
-void yylexerror( const char *msg )
+void yylexerror(const char *msg)
 {
-	gi.DPrintf( "%s\n%s", msg, yytext );
-	assert( 0 );
+    gi.DPrintf("%s\n%s", msg, yytext);
+    assert(0);
 }
 
-static void TextEscapeValue( char *str, size_t len )
+static void TextEscapeValue(char *str, size_t len)
 {
-	char *to = parsetree_malloc( len + 1 );
+    char *to = parsetree_malloc(len + 1);
 
-	yylval.s.val.stringValue = to;
+    yylval.s.val.stringValue = to;
 
-	while( len )
-	{
-		if( *str == '\\' )
-		{
-			len--;
+    while (len) {
+        if (*str == '\\') {
+            if (len == 1) {
+                break;
+            }
 
-			if( !len )
-				break;
+            if (str[1] == 'n') {
+                *to = '\n';
+                to++;
+            } else if (str[1] == 't') {
+                *to = '\t';
+                to++;
+            } else if (str[1] == '"') {
+                *to = '\"';
+                to++;
+            } else {
+                *to = str[1];
+                to++;
+            }
 
-			str++;
-			if( *str == 'n' )
-			{
-				*to = '\n';
-			}
-			else if( *str == 't' )
-			{
-				*to = '\t';
-			}
-			else if( *str == '"' )
-			{
-				*to = '\"';
-			}
-			else
-			{
-				*to = *str;
-			}
-		}
-		else
-		{
-			*to = *str;
-		}
+            len -= 2;
+            str += 2;
+        } else {
+            *to = *str;
+            to++;
+            len--;
+            str++;
+        }
+    }
 
-		len--;
-		str++;
-		to++;
-	}
-
-	*to = 0;
+    *to = 0;
 }
 
-
-static void TextValue( char *str, size_t len )
+static void TextValue(char *str, size_t len)
 {
-	char* s = parsetree_malloc(len + 1);
-	strncpy(s, str, len);
-	s[len] = 0;
-	yylval.s.val.stringValue = s;
+    char *s = parsetree_malloc(len + 1);
+    strncpy(s, str, len);
+    s[len]                   = 0;
+    yylval.s.val.stringValue = s;
 }
 
-static bool UseField( void )
+static bool UseField(void)
 {
-	return prev_yylex == TOKEN_PERIOD
-		|| prev_yylex == TOKEN_DOLLAR;
+    return prev_yylex == TOKEN_PERIOD || prev_yylex == TOKEN_DOLLAR;
 }
 
-#define YY_INPUT(buf,result,max_size) \
-{										\
-	char c;								\
-	int n;								\
-										\
-	c = '*';							\
-	for(n = 0; n < max_size; n++)		\
-	{									\
-		c = *in_ptr++;					\
-		if (!c || c == '\n') {			\
-			break;						\
-		}								\
-										\
-		buf[n] = c;						\
-	}									\
-										\
-	if (c == '\n')						\
-	{									\
-		buf[n++] = c;					\
-	}									\
-	else if (!c)						\
-	{									\
-		in_ptr--;						\
-	}									\
-										\
-	result = n;							\
-}
+#define YY_INPUT(buf, result, max_size)  \
+    {                                    \
+        char c;                          \
+        int  n;                          \
+                                         \
+        c = '*';                         \
+        for (n = 0; n < max_size; n++) { \
+            c = *in_ptr++;               \
+            if (!c || c == '\n') {       \
+                break;                   \
+            }                            \
+                                         \
+            buf[n] = c;                  \
+        }                                \
+                                         \
+        if (c == '\n') {                 \
+            buf[n++] = c;                \
+        } else if (!c) {                 \
+            in_ptr--;                    \
+        }                                \
+                                         \
+        result = n;                      \
+    }
 
 %}
 
@@ -186,174 +183,193 @@ static bool UseField( void )
 %x VARIABLES
 %x IDENTIFIER
 
-string		([^\\\"]|\\.)*
-identifier	[^\{\}\(\)\[\]\r\n\,:; \t]
-alphanum	[a-zA-Z0-9_]+
-varname		[a-zA-Z0-9_\"]+
+string          ([^\\\"\r\n]|\\.)*
+identifier      [^\{\}\(\)\[\]\r\n\,:; \t]
+nonexpr         [0-9a-zA-Z_\"'?@#`\.\x80-\xff]
+nonnumeric      [a-zA-Z_\"'?@#`\x80-\xff]
+alphanum        [a-zA-Z0-9_]+
+varname         [a-zA-Z0-9_\"$\\]+
 
 %%
 
-"/*"							{ BEGIN( C_COMMENT ); }
-<C_COMMENT>"*/"					{ BEGIN( INITIAL ); }
-<C_COMMENT>\n					{ ; }
-<C_COMMENT>.					{ ; }
-"*/"							{ Compiler.CompileError( parsedata.pos - yyleng, "'*/' found outside of comment" ); }
+"/*"                            { BEGIN(C_COMMENT); }
+<C_COMMENT>"*/"                 { BEGIN(INITIAL); }
+<C_COMMENT>\n                   { ; }
+<C_COMMENT>.                    { ; }
+"*/"                            { Compiler.CompileError( parsedata.pos - yyleng, "'*/' found outside of comment" ); }
 
-\\[\r\n]+						{ ; }
-"//"[^\r\n]*					{ if( prev_yylex != TOKEN_EOL ) YYLEX( TOKEN_EOL ); }
+\\[\r\n]+                       { ; }
+"//"[^\r\n]*                    { if(prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
 
-<VARIABLES>"size"				{ BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
-<VARIABLES>"."					{ YYLEX(TOKEN_PERIOD); }
-<VARIABLES>\"{string}\"			{ BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
-<VARIABLES>{varname}			{
-									TextValue(yytext, strlen(yytext));
-									YYLEX(TOKEN_IDENTIFIER);
-								}
-<VARIABLES>[ \t\r\n]			{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-								}
-<VARIABLES>.					{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-								}
+<VARIABLES>"size"                           { BEGIN(INITIAL); YYLEX(TOKEN_SIZE); }
+<VARIABLES>[ \t]*\./([0-9]*[^0-9[:space:]]) { YYLEX(TOKEN_PERIOD); }
+<VARIABLES>\"{string}\"                     { BEGIN(INITIAL); TextEscapeValue(yytext + 1, strlen( yytext ) - 2 ); YYLEX(TOKEN_STRING); }
+<VARIABLES>{varname}                        {
+                                                TextEscapeValue(yytext, strlen(yytext));
+                                                YYLEX(TOKEN_IDENTIFIER);
+                                            }
+<VARIABLES>[ \t\r\n]                        {
+                                                BEGIN(INITIAL);
+                                                unput(yytext[yyleng - 1]);
+                                                yyreducepos(1);
+                                            }
+<VARIABLES>.                                {
+                                                BEGIN(INITIAL);
+                                                unput(yytext[yyleng - 1]);
+                                                yyreducepos(1);
+                                            }
 
-\"{string}\"					{ TextEscapeValue( yytext + 1, strlen( yytext ) - 2 ); YYLEX( TOKEN_STRING ); }
+\"{string}\"{nonexpr}           {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
+\"{string}\"                    { TextEscapeValue(yytext + 1, yyleng - 2); YYLEX(TOKEN_STRING); }
 
-"?"								{ YYLEX( TOKEN_TERNARY ); }
-"if"							{ YYLEX( TOKEN_IF ); }
-"else"							{ YYLEX( TOKEN_ELSE ); }
-"while"							{ YYLEX( TOKEN_WHILE ); }
-"for"							{ YYLEX( TOKEN_FOR ); }
-"do"							{ YYLEX( TOKEN_DO ); }
+"?"                             { YYLEX(TOKEN_TERNARY); }
+"if"                            { YYLEX(TOKEN_IF); }
+"else"                          { YYLEX(TOKEN_ELSE); }
+"while"                         { YYLEX(TOKEN_WHILE); }
+"for"                           { YYLEX(TOKEN_FOR); }
+"do"                            { YYLEX(TOKEN_DO); }
 
-"game"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_game ); YYLEX( TOKEN_LISTENER ); }
-"group"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_group ); YYLEX( TOKEN_LISTENER ); }
-"level"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_level ); YYLEX( TOKEN_LISTENER ); }
-"local"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_local ); YYLEX( TOKEN_LISTENER ); }
-"parm"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_parm ); YYLEX( TOKEN_LISTENER ); }
-"owner"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_owner ); YYLEX( TOKEN_LISTENER ); }
-"self"							{ BEGIN( VARIABLES ); yylval.s.val = node1_( method_self ); YYLEX( TOKEN_LISTENER ); }
+"game"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_game); YYLEX(TOKEN_LISTENER); }
+"group"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_group); YYLEX(TOKEN_LISTENER); }
+"level"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_level); YYLEX(TOKEN_LISTENER); }
+"local"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_local); YYLEX(TOKEN_LISTENER); }
+"parm"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_parm); YYLEX(TOKEN_LISTENER); }
+"owner"                         { BEGIN(VARIABLES); yylval.s.val = node1_(method_owner); YYLEX(TOKEN_LISTENER); }
+"self"                          { BEGIN(VARIABLES); yylval.s.val = node1_(method_self); YYLEX(TOKEN_LISTENER); }
 
-"{"								{ parsedata.braces_count++; YYLEX( TOKEN_LEFT_BRACES ); }
-"}"								{ parsedata.braces_count--; YYLEX( TOKEN_RIGHT_BRACES ); }
-"("								{ YYLEX(TOKEN_LEFT_BRACKET); }
-")"								{ BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_BRACKET); }
-"["								{ YYLEX(TOKEN_LEFT_SQUARE_BRACKET); }
-"]"								{ BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_SQUARE_BRACKET); }
+"{"                             { parsedata.braces_count++; YYLEX(TOKEN_LEFT_BRACES); }
+"}"                             { parsedata.braces_count--; YYLEX(TOKEN_RIGHT_BRACES); }
+"("                             { YYLEX(TOKEN_LEFT_BRACKET); }
+")"                             { BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_BRACKET); }
+"["                             { YYLEX(TOKEN_LEFT_SQUARE_BRACKET); }
+"]"                             { BEGIN(VARIABLES); YYLEX(TOKEN_RIGHT_SQUARE_BRACKET); }
 
-"="								{ YYLEX( TOKEN_ASSIGNMENT ); }
-":"								{ YYLEX( TOKEN_COLON ); }
-"::"							{ YYLEX( TOKEN_DOUBLE_COLON ); }
-";"								{ YYLEX( TOKEN_SEMICOLON ); }
+"="                             { YYLEX(TOKEN_ASSIGNMENT); }
+":"                             { YYLEX(TOKEN_COLON); }
+"::"                            { YYLEX(TOKEN_DOUBLE_COLON); }
+";"                             { YYLEX(TOKEN_SEMICOLON); }
 
-"=="							{ YYLEX( TOKEN_EQUALITY ); }
-"||"							{ YYLEX( TOKEN_LOGICAL_OR ); }
-"&&"							{ YYLEX( TOKEN_LOGICAL_AND ); }
+"=="                            { YYLEX(TOKEN_EQUALITY); }
+"ifequal"                       { YYLEX(TOKEN_EQUALITY); }
+"ifstrequal"                    { YYLEX(TOKEN_EQUALITY); }
+"||"                            { YYLEX(TOKEN_LOGICAL_OR); }
+"&&"                            { YYLEX(TOKEN_LOGICAL_AND); }
 
-"|"								{ YYLEX( TOKEN_BITWISE_OR ); }
-"^"								{ YYLEX( TOKEN_BITWISE_EXCL_OR ); }
-"&"								{ YYLEX( TOKEN_BITWISE_AND ); }
-"!="							{ YYLEX( TOKEN_INEQUALITY ); }
-"<"								{ YYLEX( TOKEN_LESS_THAN ); }
-">"								{ YYLEX( TOKEN_GREATER_THAN ); }
-"<="							{ YYLEX( TOKEN_LESS_THAN_OR_EQUAL ); }
-">="							{ YYLEX( TOKEN_GREATER_THAN_OR_EQUAL ); }
-[ ]"-"							{ YYLEX( TOKEN_NEG ); }
+"|"                             { YYLEX(TOKEN_BITWISE_OR); }
+"^"                             { YYLEX(TOKEN_BITWISE_EXCL_OR); }
+"&"                             { YYLEX(TOKEN_BITWISE_AND); }
+"!="                            { YYLEX(TOKEN_INEQUALITY); }
+"ifnotequal"                    { YYLEX(TOKEN_INEQUALITY); }
+"ifstrnotequal"                 { YYLEX(TOKEN_INEQUALITY); }
+"<"                             { YYLEX(TOKEN_LESS_THAN); }
+"ifless"                        { YYLEX(TOKEN_LESS_THAN); }
+">"                             { YYLEX(TOKEN_GREATER_THAN); }
+"ifgreater"                     { YYLEX(TOKEN_GREATER_THAN); }
+"<="                            { YYLEX(TOKEN_LESS_THAN_OR_EQUAL); }
+"iflessequal"                   { YYLEX(TOKEN_LESS_THAN_OR_EQUAL); }
+">="                            { YYLEX(TOKEN_GREATER_THAN_OR_EQUAL); }
+"ifgreaterequal"                { YYLEX(TOKEN_GREATER_THAN_OR_EQUAL); }
+[ \t]"-"                        { YYLEX(TOKEN_NEG); }
 
-"+"								{ YYLEX( TOKEN_PLUS ); }
-"+="							{ YYLEX( TOKEN_PLUS_EQUALS ); }
-"++"|[ ]"++"					{ YYLEX( TOKEN_INCREMENT ); }
-"-"|"-"[ ]|[ ]"-"[ ]			{ YYLEX( TOKEN_MINUS ); }
-"-="							{ YYLEX( TOKEN_MINUS_EQUALS ); }
-[ ]"-="							{ YYLEX( TOKEN_MINUS_EQUALS ); }
-"--"|[ ]"--"					{ YYLEX( TOKEN_DECREMENT ); }
-"*"								{ YYLEX( TOKEN_MULTIPLY ); }
-"*="							{ YYLEX( TOKEN_MULTIPLY_EQUALS ); }
-"/"								{ YYLEX( TOKEN_DIVIDE ); }
-"/="							{ YYLEX( TOKEN_DIVIDE_EQUALS ); }
-"%"								{ YYLEX( TOKEN_MODULUS ); }
-"%="							{ YYLEX( TOKEN_MODULUS_EQUALS ); }
-"<<"							{ YYLEX( TOKEN_SHIFT_LEFT ); }
-"<<="							{ YYLEX( TOKEN_SHIFT_LEFT_EQUALS ); }
-">>"							{ YYLEX( TOKEN_SHIFT_RIGHT ); }
-">>="							{ YYLEX( TOKEN_SHIFT_RIGHT_EQUALS ); }
-"&="							{ YYLEX( TOKEN_AND_EQUALS ); }
-"^="							{ YYLEX( TOKEN_EXCL_OR_EQUALS ); }
-"|="							{ YYLEX( TOKEN_OR_EQUALS ); }
-"$"								{ BEGIN( VARIABLES ); YYLEX( TOKEN_DOLLAR ); }
-"!"								{ YYLEX( TOKEN_NOT ); }
-"~"								{ YYLEX( TOKEN_COMPLEMENT ); }
+"+"                             { YYLEX(TOKEN_PLUS); }
+"+="                            { YYLEX(TOKEN_PLUS_EQUALS); }
+"++"|[ \t]"++"                  { YYLEX(TOKEN_INCREMENT); }
+"-"|"-"[ \t]|[ \t]"-"[ \t]      { YYLEX(TOKEN_MINUS); }
+"-="                            { YYLEX(TOKEN_MINUS_EQUALS); }
+[ \t]"-="                       { YYLEX(TOKEN_MINUS_EQUALS); }
+"--"|[ \t]"--"                  { YYLEX(TOKEN_DECREMENT); }
+"*"                             { YYLEX(TOKEN_MULTIPLY); }
+"*="                            { YYLEX(TOKEN_MULTIPLY_EQUALS); }
+"/"                             { YYLEX(TOKEN_DIVIDE); }
+"/="                            { YYLEX(TOKEN_DIVIDE_EQUALS); }
+"%"                             { YYLEX(TOKEN_MODULUS); }
+"%="                            { YYLEX(TOKEN_MODULUS_EQUALS); }
+"<<"                            { YYLEX(TOKEN_SHIFT_LEFT); }
+"<<="                           { YYLEX(TOKEN_SHIFT_LEFT_EQUALS); }
+">>"                            { YYLEX(TOKEN_SHIFT_RIGHT); }
+">>="                           { YYLEX(TOKEN_SHIFT_RIGHT_EQUALS); }
+"&="                            { YYLEX(TOKEN_AND_EQUALS); }
+"^="                            { YYLEX(TOKEN_EXCL_OR_EQUALS); }
+"|="                            { YYLEX(TOKEN_OR_EQUALS); }
+[$]+                            { BEGIN( VARIABLES ); YYLEX(TOKEN_DOLLAR); }
+"!"                             { YYLEX(TOKEN_NOT); }
+"~"                             { YYLEX(TOKEN_COMPLEMENT); }
 
-"."								{ YYLEX( TOKEN_PERIOD ); }
+"."                             { YYLEX(TOKEN_PERIOD); }
 
-","								{ YYLEX( TOKEN_COMMA ); }
-"#"								{ YYLEX( TOKEN_NUMBER ); }
+","                             { YYLEX(TOKEN_COMMA); }
 
-"NULL"							{ YYLEX( TOKEN_NULL ); }
-"NIL"							{ YYLEX( TOKEN_NIL ); }
+"NULL"                          { YYLEX(TOKEN_NULL); }
+"NIL"                           { YYLEX(TOKEN_NIL); }
 
-"try"							{ YYLEX( TOKEN_TRY ); }
-"catch"							{ YYLEX( TOKEN_CATCH ); }
-"switch"						{ YYLEX( TOKEN_SWITCH ); }
+"try"                           { YYLEX(TOKEN_TRY); }
+"catch"                         { YYLEX(TOKEN_CATCH); }
+"switch"                        { YYLEX(TOKEN_SWITCH); }
 
-"case"							{ YYLEX( TOKEN_CASE ); }
-"break"							{ YYLEX( TOKEN_BREAK ); }
-"continue"						{ YYLEX( TOKEN_CONTINUE ); }
+"case"                          { YYLEX(TOKEN_CASE); }
+"break"                         { YYLEX(TOKEN_BREAK); }
+"continue"                      { YYLEX(TOKEN_CONTINUE); }
 
-"makearray"|"makeArray"			{ YYLEX( TOKEN_MAKEARRAY ); }
-"endarray"|"endArray"			{ YYLEX( TOKEN_ENDARRAY ); }
+"makearray"|"makeArray"         { YYLEX(TOKEN_MAKEARRAY); }
+"endarray"|"endArray"           { YYLEX(TOKEN_ENDARRAY); }
 
-[\r\n]+							{ if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
-[ \t]							{ ; }
+[\r\n]+                         { if (prev_yylex != TOKEN_EOL) YYLEX(TOKEN_EOL); }
+[ \t]                           { ; }
 
-[0-9]+									{
-											char* p = nullptr;
-											yylval.s.val.intValue = std::strtol(yytext, &p, 10);
-											YYLEX(TOKEN_INTEGER);
-										}
-[0-9\.]+|[0-9\.]+("e+"|"e-")+[0-9\.]	{
-											char* p = nullptr;
-											yylval.s.val.floatValue = std::strtof(yytext, &p);
-											YYLEX(TOKEN_FLOAT);
-										}
+[0-9]+                                  {
+                                            char* p = nullptr;
+                                            yylval.s.val.intValue = std::strtol(yytext, &p, 10);
+                                            YYLEX(TOKEN_INTEGER);
+                                        }
 
-<IDENTIFIER>{identifier}*		{
-									BEGIN(INITIAL);
-									TextEscapeValue(yytext, yyleng);
-									YYLEX(TOKEN_IDENTIFIER);
-								}
-<IDENTIFIER>[ \t\r\n]			{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-									TextEscapeValue(yytext, yyleng - 1);
-									YYLEXOFF(TOKEN_IDENTIFIER, 1);
-								}
-<IDENTIFIER>.					{
-									BEGIN(INITIAL);
-									unput(yytext[yyleng - 1]);
-									yyreducepos(1);
-									TextEscapeValue(yytext, yyleng - 1);
-									YYLEXOFF(TOKEN_IDENTIFIER, 1);
-								}
+[0-9\.]+{nonnumeric}                    {
+                                            BEGIN(IDENTIFIER);
+                                            yymore();
+                                        }
 
-{identifier}					{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+[0-9\.]+|[0-9\.]+("e+"|"e-")+[0-9\.]    {
+                                            char* p = nullptr;
+                                            yylval.s.val.floatValue = std::strtof(yytext, &p);
+                                            YYLEX(TOKEN_FLOAT);
+                                        }
 
-[a-zA-Z0-9_]+					{
-									BEGIN(IDENTIFIER);
-									yymore();
-								}
+<IDENTIFIER>{identifier}*               {
+                                            BEGIN(INITIAL);
+                                            TextEscapeValue(yytext, yyleng);
+                                            YYLEX(TOKEN_IDENTIFIER);
+                                        }
+<IDENTIFIER>[ \t\r\n]                   {
+                                            BEGIN(INITIAL);
+                                            unput(yytext[yyleng - 1]);
+                                            yyreducepos(1);
+                                            TextEscapeValue(yytext, yyleng - 1);
+                                            YYLEXOFF(TOKEN_IDENTIFIER, 1);
+                                        }
+<IDENTIFIER>.                           {
+                                            BEGIN(INITIAL);
+                                            unput(yytext[yyleng - 1]);
+                                            yyreducepos(1);
+                                            TextEscapeValue(yytext, yyleng - 1);
+                                            YYLEXOFF(TOKEN_IDENTIFIER, 1);
+                                        }
 
-<SCRIPT>[a-zA-Z0-9]+			{ BEGIN(INITIAL); }
+{identifier}                    {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
 
-.								{ YY_FATAL_ERROR("bad token:\n"); }
+[a-zA-Z0-9_]+                   {
+                                    BEGIN(IDENTIFIER);
+                                    yymore();
+                                }
+
+<SCRIPT>[a-zA-Z0-9]+            { BEGIN(INITIAL); }
+
+.                               { YY_FATAL_ERROR("bad token:\n"); }
 
 %{
 
@@ -366,31 +382,31 @@ varname		[a-zA-Z0-9_\"]+
 //
 // Implements yywrap to always append a newline to the source
 //
-int yywrap(void) {
-	if (parseStage == PS_TYPE) {
-		parseStage = PS_BODY;
-		in_ptr = start_ptr;
-		out_pos = 0;
-		success_pos = 0;
-		return 0;
-	}
+int yywrap(void)
+{
+    if (parseStage == PS_TYPE) {
+        parseStage  = PS_BODY;
+        in_ptr      = start_ptr;
+        out_pos     = 0;
+        success_pos = 0;
+        return 0;
+    }
 
-	if (parseStage == PS_BODY)
-	{
-		if (YY_START == C_COMMENT)
-		{
-			Compiler.CompileError(success_pos, "unexpected end of file found in comment");
-			return 1;
-		}
-		
-		parseStage = PS_BODY_END;
-		in_ptr = "\n";
-		return 0;
-	}
+    if (parseStage == PS_BODY) {
+        if (YY_START == C_COMMENT) {
+            Compiler.CompileError(success_pos, "unexpected end of file found in comment");
+            return 1;
+        }
 
-	return 1;
+        parseStage = PS_BODY_END;
+        in_ptr     = "\n";
+        return 0;
+    }
+
+    return 1;
 }
 
-void yy_init_script() {
-	BEGIN(SCRIPT);
+void yy_init_script()
+{
+    BEGIN(SCRIPT);
 }
diff --git a/code/parser/parsetree.cpp b/code/parser/parsetree.cpp
index a139f2fc..d1d7480c 100644
--- a/code/parser/parsetree.cpp
+++ b/code/parser/parsetree.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -342,3 +342,12 @@ sval_u node6(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_
 
     return val;
 }
+
+sval_u node_listener(sval_u val1, sval_u val2)
+{
+    if (!str::icmp(val1.stringValue, "self")) {
+        return node2(ENUM_listener, node1_(method_self), val2);
+    } else {
+        return node2(ENUM_string, val1, val2);
+    }
+}
diff --git a/code/parser/parsetree.h b/code/parser/parsetree.h
index f2769266..757ad013 100644
--- a/code/parser/parsetree.h
+++ b/code/parser/parsetree.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -101,6 +101,18 @@ enum parseStage_e {
     PS_BODY_END
 };
 
+enum {
+    method_game,
+    method_level,
+    method_local,
+    method_parm,
+    method_self,
+    method_group,
+    method_owner,
+    method_field,
+    method_array,
+};
+
 void   parsetree_freeall();
 void   parsetree_init();
 size_t parsetree_length();
@@ -124,6 +136,7 @@ sval_u node3(int type, sval_u val1, sval_u val2, sval_u val3);
 sval_u node4(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4);
 sval_u node5(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_u val5);
 sval_u node6(int type, sval_u val1, sval_u val2, sval_u val3, sval_u val4, sval_u val5, sval_u val6);
+sval_u node_listener(sval_u val1, sval_u val2);
 
 typedef struct parse_pos_s {
     int sourcePos;
diff --git a/code/parser/y.tab.cpp b/code/parser/y.tab.cpp
index 3eff57f0..f8f5401f 100644
--- a/code/parser/y.tab.cpp
+++ b/code/parser/y.tab.cpp
@@ -1,3 +1,28 @@
+/*
+* ===========================================================================
+* Copyright (C) 2025 the OpenMoHAA team
+* 
+* This file is part of OpenMoHAA source code.
+* 
+* OpenMoHAA source code is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation; either version 2 of the License,
+* or (at your option) any later version.
+* 
+* OpenMoHAA source code is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with OpenMoHAA source code; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+* ===========================================================================
+*
+*
+* y.tab.cpp: original yacc generated file (unimplemented)
+*/
+
 #include "../script/scriptcompiler.h"
 
 typedef int yy_state_type;
diff --git a/code/qcommon/CMakeLists.txt b/code/qcommon/CMakeLists.txt
index 87fdd197..cefb08d1 100644
--- a/code/qcommon/CMakeLists.txt
+++ b/code/qcommon/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(qcommon)
 
 if(${CMAKE_VERSION} VERSION_GREATER "3.12")
@@ -8,30 +9,45 @@ endif()
 include("./q_version.cmake")
 
 # Shared source files for modules
-set(SOURCES_SHARED
+set(SOURCES_SHARED_UBER
 	"${CMAKE_SOURCE_DIR}/code/qcommon/class.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_set.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/con_timer.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/delegate.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lightclass.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/listener.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/lz77.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_blockalloc.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/mem_tempalloc.cpp"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/q_math.c"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/script.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/str.cpp"
 	"${CMAKE_SOURCE_DIR}/code/script/scriptexception.cpp"
 	"${CMAKE_SOURCE_DIR}/code/script/scriptvariable.cpp"
 )
 
+add_library(qcommon_uber INTERFACE)
+target_sources(qcommon_uber INTERFACE ${SOURCES_SHARED_UBER})
+target_compile_features(qcommon_uber INTERFACE cxx_nullptr)
+target_include_directories(qcommon_uber INTERFACE "../qcommon" "../script")
+
+if(DEBUG_MEM_BLOCK)
+	target_compile_definitions(qcommon_uber INTERFACE _DEBUG_MEMBLOCK=1)
+endif()
+
+set(SOURCES_SHARED
+	"${CMAKE_SOURCE_DIR}/code/qcommon/puff.c"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/q_math.c"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
+)
+
+add_library(qcommon_shared INTERFACE)
+target_sources(qcommon_shared INTERFACE ${SOURCES_SHARED})
+target_compile_features(qcommon_shared INTERFACE c_variadic_macros)
+target_include_directories(qcommon_shared INTERFACE "../qcommon")
+target_link_libraries(qcommon_shared INTERFACE qcommon_version)
+
 add_library(qcommon INTERFACE)
-target_sources(qcommon INTERFACE ${SOURCES_SHARED})
-target_compile_definitions(qcommon INTERFACE)
-target_include_directories(qcommon INTERFACE "../qcommon" "../script")
-target_compile_features(qcommon INTERFACE cxx_nullptr)
-target_compile_features(qcommon INTERFACE c_variadic_macros)
-target_link_libraries(qcommon INTERFACE qcommon_version)
+target_link_libraries(qcommon INTERFACE qcommon_shared qcommon_uber)
 
 # Source files for standalone executable
 set(SOURCES_COMMON
@@ -45,11 +61,13 @@ set(SOURCES_COMMON
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_test.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_trace.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_trace_lbd.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/cm_trace_obfuscation.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cmd.c"
-	"${CMAKE_SOURCE_DIR}/code/qcommon/common.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/common.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/crc.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/cvar.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/files.cpp"
+	"${CMAKE_SOURCE_DIR}/code/qcommon/ioapi.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/huffman.cpp"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/md4.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/md5.c"
@@ -61,8 +79,7 @@ set(SOURCES_COMMON
 	"${CMAKE_SOURCE_DIR}/code/qcommon/q_shared.c"
 	"${CMAKE_SOURCE_DIR}/code/qcommon/unzip.c"
 	# Gamespy
-	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gamespy.c"
-	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gqueryreporting.c"
+	"${CMAKE_SOURCE_DIR}/code/gamespy/q_gamespy.c"
 )
 
 add_subdirectory("../skeletor" "./skeletor")
@@ -78,4 +95,25 @@ endif()
 
 target_compile_features(qcommon_standalone INTERFACE cxx_nullptr)
 target_compile_features(qcommon_standalone INTERFACE c_variadic_macros)
-target_link_libraries(qcommon_standalone INTERFACE omohtiki omohskeletor)
\ No newline at end of file
+target_link_libraries(qcommon_standalone INTERFACE omohtiki omohskeletor)
+
+if(USE_INTERNAL_ZLIB)
+	add_library(zlib INTERFACE)
+
+	target_sources(zlib INTERFACE
+		# zlib
+		"${CMAKE_SOURCE_DIR}/code/zlib/adler32.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/crc32.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inffast.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inflate.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/inftrees.c"
+		"${CMAKE_SOURCE_DIR}/code/zlib/zutil.c"
+	)
+
+	target_include_directories(zlib INTERFACE "${CMAKE_SOURCE_DIR}/code/zlib")
+	target_link_libraries(qcommon_standalone INTERFACE zlib)
+else()
+	find_package(ZLIB REQUIRED)
+	target_include_directories(qcommon INTERFACE ${ZLIB_INCLUDE_DIRS})
+	target_link_libraries(qcommon_standalone INTERFACE ${ZLIB_LIBRARIES})
+endif()
diff --git a/code/qcommon/alias.c b/code/qcommon/alias.c
index ebb7a421..f420a229 100644
--- a/code/qcommon/alias.c
+++ b/code/qcommon/alias.c
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,761 +24,635 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "alias.h"
 
-static AliasList_t* Aliases;
-static AliasListNode_t* foundlist[64];
+static AliasList_t *Aliases;
+//static AliasListNode_t* foundlist[64];
+// Changed in 2.0
+//static AliasListNode_t* foundlist[128];
+// Changed in OPM
+static AliasListNode_t *foundlist[256];
 
-AliasListNode_t* AliasListNode_New()
+AliasListNode_t *AliasListNode_New()
 {
-	AliasListNode_t* node = Z_TagMalloc(sizeof(AliasListNode_t), TAG_TIKI);
+    AliasListNode_t *node = Z_TagMalloc(sizeof(AliasListNode_t), TAG_TIKI);
 
-	memset(node, 0, sizeof(AliasListNode_t));
-	node->weight = 1.0f;
-	node->next = NULL;
+    memset(node, 0, sizeof(AliasListNode_t));
+    node->weight = 1.0f;
+    node->next   = NULL;
 
-	return node;
+    return node;
 }
 
-AliasList_t* AliasList_New(const char* name)
+AliasList_t *AliasList_New(const char *name)
 {
-	AliasList_t* list = Z_TagMalloc(sizeof(AliasList_t), TAG_TIKI);
+    AliasList_t *list = Z_TagMalloc(sizeof(AliasList_t), TAG_TIKI);
 
-	list->num_in_list = 0;
-	list->sorted_list = NULL;
-	list->data_list = NULL;
-	list->dirty = qfalse;
+    list->num_in_list = 0;
+    list->sorted_list = NULL;
+    list->data_list   = NULL;
+    list->dirty       = qfalse;
 
-	if (name)
-	{
-		strncpy(list->name, name, sizeof(list->name));
-	}
-	else
-	{
-		list->name[0] = 0;
-	}
+    if (name) {
+        strncpy(list->name, name, sizeof(list->name));
+    } else {
+        list->name[0] = 0;
+    }
 
-	return list;
+    return list;
 }
 
-void Alias_ListClear(AliasList_t* list)
+void Alias_ListClear(AliasList_t *list)
 {
-	AliasListNode_t* node;
-	AliasListNode_t* next;
+    AliasListNode_t *node;
+    AliasListNode_t *next;
 
-	if (list->sorted_list)
-	{
-		Z_Free(list->sorted_list);
-	}
+    if (list->sorted_list) {
+        Z_Free(list->sorted_list);
+    }
 
-	for (node = list->data_list; node != NULL; node = next)
-	{
-		next = node->next;
-		Z_Free(node);
-	}
+    for (node = list->data_list; node != NULL; node = next) {
+        if (node->subtitle) {
+            // Added in OPM
+            Z_Free(node->subtitle);
+        }
 
-	list->num_in_list = 0;
-	list->dirty = qfalse;
-	list->sorted_list = NULL;
-	list->data_list = NULL;
+        next = node->next;
+        Z_Free(node);
+    }
+
+    list->num_in_list = 0;
+    list->dirty       = qfalse;
+    list->sorted_list = NULL;
+    list->data_list   = NULL;
 }
 
-void Alias_ListDelete(AliasList_t* list)
+void Alias_ListDelete(AliasList_t *list)
 {
-	Alias_ListClear(list);
-	Z_Free(list);
+    Alias_ListClear(list);
+    Z_Free(list);
 }
 
-float getTokenFloat(const char** parameters, char* parmName, AliasListNode_t* node)
+float getTokenFloat(const char **parameters, char *parmName, AliasListNode_t *node)
 {
-	const char* token;
-	float temp_float = 0.0f;
+    const char *token;
+    float       temp_float = 0.0f;
 
-	token = COM_GetToken((char**)parameters, 1);
-	
-	if (token && *token)
-	{
-		temp_float = (float)atof(token);
-		if (temp_float < 0.0f)
-		{
-			Com_Printf("ERROR getTokenFloat: %s value out of range in %s alias\n", parmName, node->alias_name);
-		}
+    token = COM_GetToken((char **)parameters, 1);
 
-		return temp_float;
-	}
-	else
-	{
-		Com_Printf("ERROR getTokenFloat: %s value is hosed or wasn't found for %s\n", parmName, node->alias_name);
-	}
+    if (token && *token) {
+        temp_float = (float)atof(token);
+        if (temp_float < 0.0f) {
+            Com_Printf("ERROR getTokenFloat: %s value out of range in %s alias\n", parmName, node->alias_name);
+        }
 
-	return 0.0f;
+        return temp_float;
+    } else {
+        Com_Printf("ERROR getTokenFloat: %s value is hosed or wasn't found for %s\n", parmName, node->alias_name);
+    }
+
+    return 0.0f;
 }
 
-int S_ChannelNameToNum(const char* pszName)
+int S_ChannelNameToNum(const char *pszName)
 {
-	if (!Q_stricmp(pszName, "auto"))
-	{
-		return CHAN_AUTO;
-	}
-	else if (!Q_stricmp(pszName, "local"))
-	{
-		return CHAN_LOCAL;
-	}
-	else if (!Q_stricmp(pszName, "weapon"))
-	{
-		return CHAN_WEAPON;
-	}
-	else if (!Q_stricmp(pszName, "voice"))
-	{
-		return CHAN_VOICE;
-	}
-	else if (!Q_stricmp(pszName, "item"))
-	{
-		return CHAN_ITEM;
-	}
-	else if (!Q_stricmp(pszName, "body"))
-	{
-		return CHAN_BODY;
-	}
-	else if (!Q_stricmp(pszName, "dialog"))
-	{
-		return CHAN_DIALOG;
-	}
-	else if (!Q_stricmp(pszName, "dialog_secondary"))
-	{
-		return CHAN_DIALOG_SECONDARY;
-	}
-	else if (!Q_stricmp(pszName, "weaponidle"))
-	{
-		return CHAN_WEAPONIDLE;
-	}
-	else if (!Q_stricmp(pszName, "menu"))
-	{
-		return CHAN_MENU;
-	}
-	else
-	{
-		return -1;
-	}
+    if (!Q_stricmp(pszName, "auto")) {
+        return CHAN_AUTO;
+    } else if (!Q_stricmp(pszName, "local")) {
+        return CHAN_LOCAL;
+    } else if (!Q_stricmp(pszName, "weapon")) {
+        return CHAN_WEAPON;
+    } else if (!Q_stricmp(pszName, "voice")) {
+        return CHAN_VOICE;
+    } else if (!Q_stricmp(pszName, "item")) {
+        return CHAN_ITEM;
+    } else if (!Q_stricmp(pszName, "body")) {
+        return CHAN_BODY;
+    } else if (!Q_stricmp(pszName, "dialog")) {
+        return CHAN_DIALOG;
+    } else if (!Q_stricmp(pszName, "dialog_secondary")) {
+        return CHAN_DIALOG_SECONDARY;
+    } else if (!Q_stricmp(pszName, "weaponidle")) {
+        return CHAN_WEAPONIDLE;
+    } else if (!Q_stricmp(pszName, "menu")) {
+        return CHAN_MENU;
+    } else {
+        return -1;
+    }
 }
 
-const char* S_ChannelNumToName(int iChannel)
+const char *S_ChannelNumToName(int iChannel)
 {
-	switch (iChannel)
-	{
-	case CHAN_AUTO:
-		return "auto";
-	case CHAN_LOCAL:
-		return "local";
-	case CHAN_WEAPON:
-		return "weapon";
-	case CHAN_VOICE:
-		return "voice";
-	case CHAN_ITEM:
-		return "item";
-	case CHAN_BODY:
-		return "body";
-	case CHAN_DIALOG:
-		return "dialog";
-	case CHAN_DIALOG_SECONDARY:
-		return "dialog_secondary";
-	case CHAN_WEAPONIDLE:
-		return "weaponidle";
-	case CHAN_MENU:
-		return "menu";
-	default:
-		return NULL;
-	}
+    switch (iChannel) {
+    case CHAN_AUTO:
+        return "auto";
+    case CHAN_LOCAL:
+        return "local";
+    case CHAN_WEAPON:
+        return "weapon";
+    case CHAN_VOICE:
+        return "voice";
+    case CHAN_ITEM:
+        return "item";
+    case CHAN_BODY:
+        return "body";
+    case CHAN_DIALOG:
+        return "dialog";
+    case CHAN_DIALOG_SECONDARY:
+        return "dialog_secondary";
+    case CHAN_WEAPONIDLE:
+        return "weaponidle";
+    case CHAN_MENU:
+        return "menu";
+    default:
+        return NULL;
+    }
 }
 
-void Alias_ListAddParms(AliasListNode_t* node, const char* parameters)
+void Alias_ListAddParms(AliasListNode_t *node, const char *parameters)
 {
-	const char* token;
-	float temp_float;
-	const char* nptr;
+    const char *token;
+    float       temp_float;
+    const char *nptr;
 
-	if (!node || !parameters)
-	{
-		return;
-	}
+    if (!node || !parameters) {
+        return;
+    }
 
-	for (;;)
-	{
-		token = nptr = COM_GetToken((char**)&parameters, qtrue);
-		if (!token || !token[0])
-		{
-			break;
-		}
+    for (;;) {
+        token = nptr = COM_GetToken((char **)&parameters, qtrue);
+        if (!token || !token[0]) {
+            break;
+        }
 
-		if (!Q_stricmp(token, "stop"))
-		{
-			node->stop_flag = 1;
-		}
-		else if (!Q_stricmp(token, "soundparms"))
-		{
-			node->volume = getTokenFloat(&parameters, "volume", node);
-			node->volumeMod = getTokenFloat(&parameters, "volumeMod", node);
-			node->pitch = getTokenFloat(&parameters, "pitch", node);
-			node->pitchMod = getTokenFloat(&parameters, "pitchMod", node);
-			node->dist = getTokenFloat(&parameters, "dist", node);
-			node->maxDist = getTokenFloat(&parameters, "maxDist", node);
+        if (!Q_stricmp(token, "stop")) {
+            node->stop_flag = 1;
+        } else if (!Q_stricmp(token, "soundparms")) {
+            node->volume    = getTokenFloat(&parameters, "volume", node);
+            node->volumeMod = getTokenFloat(&parameters, "volumeMod", node);
+            node->pitch     = getTokenFloat(&parameters, "pitch", node);
+            node->pitchMod  = getTokenFloat(&parameters, "pitchMod", node);
+            node->dist      = getTokenFloat(&parameters, "dist", node);
+            node->maxDist   = getTokenFloat(&parameters, "maxDist", node);
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			node->channel = S_ChannelNameToNum(token);
-			if (node->channel == -1)
-			{
-				Com_Printf("%s is not avalid channel on %s alias.\n", token, node->alias_name);
-				node->channel = 0;
-			}
+            node->channel = S_ChannelNameToNum(token);
+            if (node->channel == -1) {
+                Com_Printf("%s is not avalid channel on %s alias.\n", token, node->alias_name);
+                node->channel = 0;
+            }
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("ERROR: defaulting %s to not streamed - please setup alias properly.\n", node->alias_name);
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("ERROR: defaulting %s to not streamed - please setup alias properly.\n", node->alias_name);
+                return;
+            }
 
-			if (!Q_stricmp(token, "streamed"))
-			{
-				node->streamed = qtrue;
-			}
-			else if (!Q_stricmp(token, "loaded"))
-			{
-				node->streamed = qfalse;
-			}
-			else
-			{
-				Com_Printf("ERROR: Expecting streamed or loaded in ubersound and got %s on alias %s\n", token, node->alias_name);
-				continue;
-			}
-		}
-		else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle"))
-		{
-			if (!Q_stricmp(token, "subtitle")) {
-				node->forcesubtitle = qfalse;
-			} else {
-				node->forcesubtitle = qtrue;
-			}
+            if (!Q_stricmp(token, "streamed")) {
+                node->streamed = qtrue;
+            } else if (!Q_stricmp(token, "loaded")) {
+                node->streamed = qfalse;
+            } else {
+                Com_Printf(
+                    "ERROR: Expecting streamed or loaded in ubersound and got %s on alias %s\n", token, node->alias_name
+                );
+                continue;
+            }
+        } else if (!Q_stricmp(token, "subtitle") || !Q_stricmp(token, "forcesubtitle")) {
+            size_t size;
 
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("NULL subtitle on %s alias.\n", node->alias_name);
-				return;
-			}
+            if (!Q_stricmp(token, "subtitle")) {
+                node->forcesubtitle = qfalse;
+            } else {
+                node->forcesubtitle = qtrue;
+            }
 
-			node->subtitle = Z_TagMalloc(strlen(token) + 1, TAG_TIKI);
-			strcpy(node->subtitle, token);
-		}
-		else if (!Q_stricmp(token, "pitch"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("NULL subtitle on %s alias.\n", node->alias_name);
+                return;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("Pitch value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            size           = strlen(token) + 1;
+            node->subtitle = Z_TagMalloc(size, TAG_TIKI);
+            memcpy(node->subtitle, token, size);
+        } else if (!Q_stricmp(token, "pitch")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			node->pitch = temp_float;
-		}
-		else if (!Q_stricmp(token, "pitchmod"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("Pitch value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("PitchMod value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            node->pitch = temp_float;
+        } else if (!Q_stricmp(token, "pitchmod")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			node->pitchMod = temp_float;
-		}
-		else if (!Q_stricmp(token, "volumemod"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				return;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("PitchMod value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("volumeMod value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            node->pitchMod = temp_float;
+        } else if (!Q_stricmp(token, "volumemod")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                return;
+            }
 
-			node->volumeMod = temp_float;
-		}
-		else if (!Q_stricmp(token, "dist"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("\n\n BAD DISTANCE\n\n");
-				return;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("volumeMod value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			temp_float = (float)atof(token);
-			if (temp_float < 0.0f)
-			{
-				Com_Printf("dist value out of range in %s alias\n", node->alias_name);
-				continue;
-			}
+            node->volumeMod = temp_float;
+        } else if (!Q_stricmp(token, "dist")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("\n\n BAD DISTANCE\n\n");
+                return;
+            }
 
-			node->dist = temp_float;
-		}
-		else if (!Q_stricmp(token, "channel"))
-		{
-			token = COM_GetToken((char**)&parameters, qtrue);
-			if (!token || !*token)
-			{
-				Com_Printf("\n\n BAD DISTANCE\n\n");
-				return;
-			}
+            temp_float = (float)atof(token);
+            if (temp_float < 0.0f) {
+                Com_Printf("dist value out of range in %s alias\n", node->alias_name);
+                continue;
+            }
 
-			node->channel = S_ChannelNameToNum(token);
-			if (node->channel == -1)
-			{
-				Com_Printf("%s is not a valid channel on %s alias.\n", token, node->alias_name);
-				node->channel = CHAN_AUTO;
-			}
-		}
-		else
-		{
-			Com_Printf("Unknown parameter for %s alias\n", node->alias_name);
-			continue;
-		}
-	}
+            node->dist = temp_float;
+        } else if (!Q_stricmp(token, "channel")) {
+            token = COM_GetToken((char **)&parameters, qtrue);
+            if (!token || !*token) {
+                Com_Printf("\n\n BAD DISTANCE\n\n");
+                return;
+            }
+
+            node->channel = S_ChannelNameToNum(token);
+            if (node->channel == -1) {
+                Com_Printf("%s is not a valid channel on %s alias.\n", token, node->alias_name);
+                node->channel = CHAN_AUTO;
+            }
+        } else {
+            Com_Printf("Unknown parameter for %s alias\n", node->alias_name);
+            continue;
+        }
+    }
 }
 
-qboolean Alias_ListAdd(AliasList_t* list, const char* alias, const char* name, const char* parameters)
+qboolean Alias_ListAdd(AliasList_t *list, const char *alias, const char *name, const char *parameters)
 {
-	AliasListNode_t* ptr = NULL;
-	int i;
-	AliasListNode_t* node;
+    AliasListNode_t *ptr = NULL;
+    int              i;
+    AliasListNode_t *node;
 
-	if (!list)
-	{
-		return qfalse;
-	}
+    if (!list) {
+        return qfalse;
+    }
 
-	if (list->dirty)
-	{
-		for (node = list->data_list; node != NULL; node = node->next)
-		{
-			if (!strcmp(node->alias_name, alias))
-			{
-				Com_Printf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
-				return qtrue;
-			}
-		}
-	}
-	else
-	{
-		ptr = Alias_ListFindNode(list, alias);
-	}
+    if (list->dirty) {
+        for (node = list->data_list; node != NULL; node = node->next) {
+            if (!strcmp(node->alias_name, alias)) {
+                Com_DPrintf("DUPLICATE ALIASES: %s and %s\n", node->alias_name, alias);
+                return qtrue;
+            }
+        }
+    } else {
+        ptr = Alias_ListFindNode(list, alias);
+    }
 
-	if (!ptr)
-	{
-		node = AliasListNode_New();
-		strncpy(node->alias_name, alias, sizeof(node->alias_name));
+    if (!ptr) {
+        node = AliasListNode_New();
+        strncpy(node->alias_name, alias, sizeof(node->alias_name));
 
-		for (i = 0; i < MAX_ALIASLIST_NAME_LENGTH; i++)
-		{
-			node->alias_name[i] = tolower(node->alias_name[i]);
-		}
+        for (i = 0; i < MAX_ALIASLIST_NAME_LENGTH; i++) {
+            node->alias_name[i] = tolower(node->alias_name[i]);
+        }
 
-		strncpy(node->real_name, name, sizeof(node->real_name));
-		node->stop_flag = 0;
-		Alias_ListAddParms(node, parameters);
-		list->dirty = qtrue;
-		list->num_in_list++;
-		node->next = list->data_list;
-		list->data_list = node;
-	}
-	else if (strcmp(name, ptr->real_name))
-	{
-		Com_DPrintf("Duplicate Aliases for %s in list %s.\n", alias, name);
-	}
+        strncpy(node->real_name, name, sizeof(node->real_name));
+        node->stop_flag = 0;
+        Alias_ListAddParms(node, parameters);
+        list->dirty = qtrue;
+        list->num_in_list++;
+        node->next      = list->data_list;
+        list->data_list = node;
+    } else if (strcmp(name, ptr->real_name)) {
+        Com_DPrintf("Duplicate Aliases for %s in list %s.\n", alias, name);
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
-void Alias_ListSort(AliasList_t* list)
+static int Alias_ListCompareNodes(const void *a1, const void *a2)
 {
-	int num;
-	int size;
-	int i;
-	AliasListNode_t* root;
-	AliasListNode_t* ptr;
-	AliasListNode_t* smallest = NULL;
-	AliasListNode_t* prev;
-	AliasListNode_t* smallprev;
-	AliasListNode_t* last = NULL;
+    const AliasListNode_t *ptr1 = *(const AliasListNode_t **)a1;
+    const AliasListNode_t *ptr2 = *(const AliasListNode_t **)a2;
 
-	if (!list->dirty)
-	{
-		return;
-	}
-
-	num = 0;
-
-	root = list->data_list;
-	list->data_list = NULL;
-	if (list->sorted_list)
-		Z_Free(list->sorted_list);
-
-	size = list->num_in_list * sizeof(AliasListNode_t*);
-	list->sorted_list = Z_TagMalloc(size, TAG_TIKI);
-	memset(list->sorted_list, 0, size);
-
-	for (i = 0; i < list->num_in_list; i++)
-	{
-		prev = root;
-		smallprev = root;
-
-		for (ptr = root->next; ptr != NULL; ptr = ptr->next)
-		{
-			if (strcmp(ptr->alias_name, smallprev->alias_name) < 0)
-			{
-				smallest = prev;
-				smallprev = ptr;
-			}
-
-			prev = ptr;
-		}
-
-		if (smallprev == root)
-		{
-			root = smallprev->next;
-		}
-		else
-		{
-			smallest->next = smallprev->next;
-		}
-
-		if (!last || strcmp(last->alias_name, smallprev->alias_name))
-		{
-			list->sorted_list[num++] = smallprev;
-			smallprev->next = list->data_list;
-			list->data_list = smallprev;
-			last = smallprev;
-		}
-		else
-		{
-			if (strcmp(last->real_name, smallprev->real_name))
-			{
-				Com_DPrintf("Duplicate Aliases for %s in list %s  Last: %p.\n", last->alias_name, list->name, last);
-			}
-
-			Z_Free(smallprev);
-		}
-	}
-
-	list->dirty = 0;
-	list->num_in_list = num;
+    return strcmp(ptr1->alias_name, ptr2->alias_name);
 }
 
-const char* Alias_ListFind(AliasList_t* list, const char* alias)
+void Alias_ListSort(AliasList_t *list)
 {
-	AliasListNode_t* node = Alias_ListFindNode(list, alias);
+    AliasListNode_t *ptr;
+    int              num;
+    int              i;
 
-	if (node)
-	{
-		return node->real_name;
-	}
-	else
-	{
-		return NULL;
-	}
+    if (!list->dirty) {
+        return;
+    }
+
+    if (list->sorted_list) {
+        Z_Free(list->sorted_list);
+    }
+
+    num = list->num_in_list;
+
+    list->sorted_list = Z_TagMalloc(num * sizeof(AliasListNode_t *), TAG_TIKI);
+
+    for (i = 0, ptr = list->data_list; i < num; i++, ptr = ptr->next) {
+        list->sorted_list[i] = ptr;
+    }
+
+    qsort(list->sorted_list, num, sizeof(AliasListNode_t *), Alias_ListCompareNodes);
+    list->dirty = 0;
 }
 
-void Alias_ListUpdateDialog(AliasList_t* list, const char* alias)
+const char *Alias_ListFind(AliasList_t *list, const char *alias)
 {
-	int min_index;
-	int max_index;
-	float total_weight;
+    AliasListNode_t *node = Alias_ListFindNode(list, alias);
 
-	Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
+    if (node) {
+        return node->real_name;
+    } else {
+        return NULL;
+    }
 }
 
-AliasListNode_t* Alias_ListFindNode(AliasList_t* list, const char* alias)
+void Alias_ListUpdateDialog(AliasList_t *list, const char *alias)
 {
-	char convalias[40];
-	int index;
-	int l;
-	int r;
-	int diff;
-	size_t length;
-	int __res;
+    int   min_index;
+    int   max_index;
+    float total_weight;
 
-	if (list->dirty)
-	{
-		Alias_ListSort(list);
-	}
+    Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
+}
 
-	length = strlen(alias);
+AliasListNode_t *Alias_ListFindNode(AliasList_t *list, const char *alias)
+{
+    char   convalias[40];
+    int    index;
+    int    l;
+    int    r;
+    int    diff;
+    size_t length;
+    int    __res;
 
-	for (index = 0; index < length; index++)
-	{
-		convalias[index] = tolower(alias[index]);
-	}
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	convalias[length] = 0;
+    length = strlen(alias);
 
-	r = 0;
-	l = list->num_in_list - 1;
-	for (index = l; index >= 0; index--)
-	{
-		__res = (l + r) >> 1;
-		diff = strcmp(convalias, list->sorted_list[index]->alias_name);
+    for (index = 0; index < length; index++) {
+        convalias[index] = tolower(alias[index]);
+    }
 
-		if (diff == 0)
-		{
-			return list->sorted_list[index];
-		}
-		else if (diff > 0)
-		{
-			r = __res + 1;
-		}
-		else
-		{
-			l = __res - 1;
-		}
-	}
+    convalias[length] = 0;
 
-	return NULL;
+    r = 0;
+    l = list->num_in_list - 1;
+    for (index = l; index >= 0; index--) {
+        __res = (l + r) >> 1;
+        diff  = strcmp(convalias, list->sorted_list[index]->alias_name);
+
+        if (diff == 0) {
+            return list->sorted_list[index];
+        } else if (diff > 0) {
+            r = __res + 1;
+        } else {
+            l = __res - 1;
+        }
+    }
+
+    return NULL;
 }
 
 float randweight()
 {
-	return ((float)(rand() & 0x7fff)) / ((float)0x8000);
+    return ((float)(rand() & 0x7fff)) / ((float)0x8000);
 }
 
-const char* Alias_ListFindRandom(AliasList_t* list, const char* alias, AliasListNode_t** ret)
+const char *Alias_ListFindRandom(AliasList_t *list, const char *alias, AliasListNode_t **ret)
 {
-	int min_index;
-	int max_index;
-	float total_weight;
-	int i;
-	int numfound;
-	float weight;
-	float num;
+    int   min_index;
+    int   max_index;
+    float total_weight;
+    int   i;
+    int   numfound;
+    float weight;
+    float num;
 
-	if (!*alias)
-	{
-		return NULL;
-	}
+    if (!*alias) {
+        return NULL;
+    }
 
-	Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
+    Alias_ListFindRandomRange(list, alias, &min_index, &max_index, &total_weight);
 
-	if (min_index == -1 || max_index == -1)
-	{
-		return NULL;
-	}
+    if (min_index == -1 || max_index == -1) {
+        return NULL;
+    }
 
-	num = 0.0f;
-	numfound = max_index - min_index + 1;
-	weight = randweight() * total_weight;
+    num      = 0.0f;
+    numfound = max_index - min_index + 1;
+    weight   = randweight() * total_weight;
 
-	for (i = 0; i < numfound; i++)
-	{
-		num += list->sorted_list[i + min_index]->weight;
-		if (num > weight)
-		{
-			if (ret)
-			{
-				*ret = list->sorted_list[i + min_index];
-			}
+    for (i = 0; i < numfound; i++) {
+        num += list->sorted_list[i + min_index]->weight;
+        if (num > weight) {
+            if (ret) {
+                *ret = list->sorted_list[i + min_index];
+            }
 
-			return list->sorted_list[i + min_index]->real_name;
-		}
-	}
+            return list->sorted_list[i + min_index]->real_name;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
-void Alias_ListFindRandomRange(AliasList_t* list, const char* alias, int* min_index, int* max_index, float* total_weight)
+void Alias_ListFindRandomRange(
+    AliasList_t *list, const char *alias, int *min_index, int *max_index, float *total_weight
+)
 {
-	char convalias[MAX_ALIASLIST_NAME_LENGTH];
-	int index;
-	int l;
-	int r;
-	int diff;
-	int i;
-	size_t length;
-	int numfound;
-	float totalfoundweight = 0.0f;
-	AliasListNode_t** ptr;
+    char              convalias[MAX_ALIASLIST_NAME_LENGTH];
+    int               index;
+    int               l;
+    int               r;
+    int               diff;
+    int               i;
+    size_t            length;
+    int               numfound;
+    float             totalfoundweight = 0.0f;
+    AliasListNode_t **ptr;
 
-	*min_index = -1;
-	*max_index = -1;
+    *min_index = -1;
+    *max_index = -1;
 
-	if (!*alias)
-		return;
+    if (!*alias) {
+        return;
+    }
 
-	if (list->dirty)
-		Alias_ListSort(list);
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	length = strlen(alias);
+    length = strlen(alias);
 
-	if (length > MAX_ALIASLIST_NAME_LENGTH)
-	{
-		return;
-	}
+    if (length + 1 > MAX_ALIASLIST_NAME_LENGTH) {
+        return;
+    }
 
-	for (index = 0; index < length; index++)
-	{
-		convalias[index] = tolower(alias[index]);
-	}
+    for (i = 0; i < length; i++) {
+        convalias[i] = tolower(alias[i]);
+    }
 
-	convalias[length] = 0;
+    convalias[length] = 0;
 
-	l = 0;
-	r = list->num_in_list - 1;
-	if (r >= 0)
-	{
-		do
-		{
-			index = (l + r) >> 1;
-			diff = strncmp(convalias, list->sorted_list[index]->alias_name, length);
+    l = 0;
+    r = list->num_in_list - 1;
+    while (r >= l) {
+        index = (l + r) >> 1;
+        diff  = strncmp(convalias, list->sorted_list[index]->alias_name, length);
 
-			if (diff == 0)
-			{
-				break;
-			}
-			else if (diff > 0)
-			{
-				l = index + 1;
-			}
-			else
-			{
-				r = index - 1;
-			}
-		} while (r >= l);
+        if (diff == 0) {
+            break;
+        } else if (diff > 0) {
+            l = index + 1;
+        } else {
+            r = index - 1;
+        }
+    }
 
-		if (r >= l)
-		{
-			numfound = 0;
-			*min_index = index;
-			*max_index = index;
-			totalfoundweight = 0.f;
+    if (r < l) {
+        return;
+    }
 
-			ptr = &list->sorted_list[index];
-			for (i = index + 1; i > 0; i--, ptr--)
-			{
-				if (strncmp(convalias, (*ptr)->alias_name, length)) {
-					break;
-				}
+    numfound         = 0;
+    *min_index       = index;
+    *max_index       = index;
+    totalfoundweight = 0.f;
 
-				if (numfound <= 63 && (*ptr)->alias_name[length] != '_')
-				{
-					foundlist[numfound++] = *ptr;
-					totalfoundweight += (*ptr)->weight;
-					*min_index = i - 1;
-				}
-			}
+    ptr = &list->sorted_list[index];
+    for (i = index + 1; i > 0; i--, ptr--) {
+        if (strncmp(convalias, (*ptr)->alias_name, length)) {
+            break;
+        }
 
-			ptr = &list->sorted_list[index + 1];
+        if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+            foundlist[numfound++] = *ptr;
+            totalfoundweight += (*ptr)->weight;
+            *min_index = i - 1;
+        }
+    }
 
-			for (i = index + 1; i < list->num_in_list; i++, ptr++)
-			{
-				if (strncmp(convalias, (*ptr)->alias_name, length)) {
-					break;
-				}
+    ptr = &list->sorted_list[index + 1];
+    for (i = index + 1; i < list->num_in_list; i++, ptr++) {
+        if (strncmp(convalias, (*ptr)->alias_name, length)) {
+            break;
+        }
 
-				if (numfound <= 63 && (*ptr)->alias_name[length] != '_')
-				{
-					foundlist[numfound++] = *ptr;
-					totalfoundweight += (*ptr)->weight;
-					*max_index = i;
-				}
-			}
+        if (numfound < ARRAY_LEN(foundlist) && (*ptr)->alias_name[length] != '_') {
+            foundlist[numfound++] = *ptr;
+            totalfoundweight += (*ptr)->weight;
+            *max_index = i;
+        }
+    }
 
-			if (numfound)
-			{
-				*total_weight = totalfoundweight;
-			}
-			else
-			{
-				*min_index = -1;
-				*max_index = -1;
-			}
-		}
-	}
+    if (!numfound) {
+        *min_index = -1;
+        *max_index = -1;
+        return;
+    }
+
+    *total_weight = totalfoundweight;
 }
 
-void Alias_ListDump(AliasList_t* list)
+void Alias_ListDump(AliasList_t *list)
 {
-	AliasListNode_t* ptr;
-	int i;
+    AliasListNode_t *ptr;
+    int              i;
 
-	if (list->dirty)
-		Alias_ListSort(list);
+    if (list->dirty) {
+        Alias_ListSort(list);
+    }
 
-	Com_DPrintf("Alias List: %s\n", list->name);
-	Com_DPrintf("Alias Name / Weight / Real Name\n");
+    Com_DPrintf("Alias List: %s\n", list->name);
+    Com_DPrintf("Alias Name / Weight / Real Name\n");
 
-	for (i = 0; i < list->num_in_list; ++i)
-	{
-		ptr = list->sorted_list[i];
-		Com_DPrintf("%32s %3.2f %s\n", ptr->alias_name, ptr->weight, ptr->real_name);
-	}
+    for (i = 0; i < list->num_in_list; ++i) {
+        ptr = list->sorted_list[i];
+        Com_DPrintf("%32s %3.2f %s\n", ptr->alias_name, ptr->weight, ptr->real_name);
+    }
 
-	Com_DPrintf("%d total aliases\n", list->num_in_list);
+    Com_DPrintf("%d total aliases\n", list->num_in_list);
 }
 
-const char* Alias_Find(const char* alias)
+const char *Alias_Find(const char *alias)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListFind(Aliases, alias);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListFind(Aliases, alias);
 }
 
-qboolean Alias_Add(const char* alias, const char* name, const char* parameters)
+qboolean Alias_Add(const char *alias, const char *name, const char *parameters)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListAdd(Aliases, alias, name, parameters);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListAdd(Aliases, alias, name, parameters);
 }
 
-qboolean Alias_Delete(const char* alias)
+qboolean Alias_Delete(const char *alias)
 {
-	return qtrue;
+    return qtrue;
 }
 
-const char* Alias_FindRandom(const char* alias, AliasListNode_t** ret)
+const char *Alias_FindRandom(const char *alias, AliasListNode_t **ret)
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	return Alias_ListFindRandom(Aliases, alias, ret);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    return Alias_ListFindRandom(Aliases, alias, ret);
 }
 
 void Alias_Dump()
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	Alias_ListDump(Aliases);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    Alias_ListDump(Aliases);
 }
 
 void Alias_Clear()
 {
-	if (!Aliases) Aliases = AliasList_New("Global");
-	Alias_ListClear(Aliases);
+    if (!Aliases) {
+        Aliases = AliasList_New("Global");
+    }
+    Alias_ListClear(Aliases);
 }
 
-AliasList_t* Alias_GetGlobalList()
+AliasList_t *Alias_GetGlobalList()
 {
-	return Aliases;
+    return Aliases;
 }
diff --git a/code/qcommon/bg_compat.cpp b/code/qcommon/bg_compat.cpp
index e30396d3..d53cd2e2 100644
--- a/code/qcommon/bg_compat.cpp
+++ b/code/qcommon/bg_compat.cpp
@@ -54,7 +54,7 @@ static uint32_t CPT_NormalizePlayerStateFlags_ver_6(uint32_t flags) {
 
     // Convert AA PlayerMove flags to SH/BT flags
     normalizedFlags |= flags & (1 << 0);
-    for (size_t i = 2; i < 32; ++i)
+    for (size_t i = 1; i < 32; ++i)
     {
         if (flags & (1 << (i + 2))) {
             normalizedFlags |= (1 << i);
@@ -70,7 +70,7 @@ static uint32_t CPT_DenormalizePlayerStateFlags_ver_6(uint32_t flags) {
 
     // Convert AA PlayerMove flags to SH/BT flags
     normalizedFlags |= flags & (1 << 0);
-    for (size_t i = 2; i < 32; ++i)
+    for (size_t i = 1; i < 32; ++i)
     {
 		if (flags & (1 << i)) {
             normalizedFlags |= (1 << (i + 2));
diff --git a/code/qcommon/class.cpp b/code/qcommon/class.cpp
index ea0f9dbf..f35e5192 100644
--- a/code/qcommon/class.cpp
+++ b/code/qcommon/class.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 ClassDef *ClassDef::classlist;
+ClassDef *ClassDef::classroot;
 int       ClassDef::numclasses;
 
 int                   ClassDef::dump_numclasses;
@@ -78,7 +79,7 @@ void ClassDef::SortClassList(Container<ClassDef *> *sortedList)
 
     sortedList->Resize(numclasses);
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         sortedList->AddObject(c);
     }
 
@@ -92,7 +93,7 @@ ClassDef *getClassForID(const char *name)
     ClassDef *classlist = ClassDef::classlist;
     ClassDef *c;
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         if (c->classID && !Q_stricmp(c->classID, name)) {
             return c;
         }
@@ -110,7 +111,7 @@ ClassDef *getClass(const char *name)
     ClassDef *list = ClassDef::classlist;
     ClassDef *c;
 
-    for (c = list->next; c != list; c = c->next) {
+    for (c = list; c; c = c->next) {
         if (Q_stricmp(c->classname, name) == 0) {
             return c;
         }
@@ -129,7 +130,7 @@ void listAllClasses(void)
     ClassDef *c;
     ClassDef *list = ClassDef::classlist;
 
-    for (c = list->next; c != list; c = c->next) {
+    for (c = list; c; c = c->next) {
         CLASS_DPrintf("%s\n", c->classname);
     }
 }
@@ -202,7 +203,7 @@ void CLASS_Print(FILE *class_file, const char *fmt, ...)
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     if (class_file) {
@@ -238,7 +239,7 @@ void Class::warning(const char *function, const char *format, ...) const
     va_list     va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
 
     classname = classinfo()->classname;
 
@@ -259,7 +260,7 @@ void Class::error(const char *function, const char *fmt, ...) const
     char    text[1024];
 
     va_start(argptr, fmt);
-    vsprintf(text, fmt, argptr);
+    Q_vsnprintf(text, sizeof(text), fmt, argptr);
     va_end(argptr);
 
     if (getClassID()) {
@@ -353,7 +354,7 @@ ClassDef::ClassDef(
     ClassDef *node;
 
     if (classlist == NULL) {
-        classlist = new ClassDef;
+        classlist = this;
     }
 
     this->classname      = classname;
@@ -374,7 +375,7 @@ ClassDef::ClassDef(
         this->classID = "";
     }
 
-    for (node = classlist->next; node != classlist; node = node->next) {
+    for (node = classlist; node; node = node->next) {
         if ((node->super == NULL) && (!Q_stricmp(node->superclass, this->classname))
             && (Q_stricmp(node->classname, "Class"))) {
             node->super = this;
@@ -382,7 +383,7 @@ ClassDef::ClassDef(
     }
 
     // Add to front of list
-    LL_AddFirst(classlist, this, prev, next);
+    LL_SafeAdd(classroot, this, next, prev);
 
     numclasses++;
 }
@@ -391,24 +392,24 @@ ClassDef::~ClassDef()
 {
     ClassDef *node;
 
-    if (classlist != this) {
-        LL_Remove(this, prev, next);
+    LL_SafeRemoveRoot(classlist, this, next, prev);
 
-        // Check if any subclasses were initialized before their superclass
-        for (node = classlist->next; node != classlist; node = node->next) {
-            if (node->super == this) {
-                node->super = NULL;
-            }
+    // Check if any subclasses were initialized before their superclass
+    for (node = classlist; node; node = node->next) {
+        if (node->super == this) {
+            node->super = NULL;
         }
-    } else {
-        // If the head of the list is deleted before the list is cleared, then we may have problems
-        assert(this->next == this->prev);
     }
 
     if (responseLookup) {
         delete[] responseLookup;
         responseLookup = NULL;
     }
+#ifdef WITH_SCRIPT_ENGINE
+    if (waitTillSet) {
+        delete waitTillSet;
+    }
+#endif
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -466,6 +467,11 @@ EventDef *ClassDef::GetDef(int eventnum)
     }
 }
 
+EventDef *ClassDef::GetDef(Event *ev)
+{
+    return GetDef(ev->eventnum);
+}
+
 int ClassDef::GetFlags(Event *event)
 {
     EventDef *def = GetDef(event->eventnum);
@@ -490,10 +496,9 @@ void ClassDef::BuildResponseList(void)
         delete[] responseLookup;
         responseLookup = NULL;
     }
-
-    num = Event::NumEventCommands(
-    ); //size will be total event count, because it WAS faster to look for an event via eventnum
-        //nowadays there's not much overhead in performance, TODO: change size to appropriate.
+    //size will be total event count, because it WAS faster to look for an event via eventnum
+    //nowadays there's not much overhead in performance, TODO: change size to appropriate.
+    num            = Event::NumEventCommands();
     responseLookup = (ResponseDef<Class> **)new char[sizeof(ResponseDef<Class> *) * num];
     memset(responseLookup, 0, sizeof(ResponseDef<Class> *) * num);
 
@@ -535,7 +540,7 @@ void ClassDef::BuildEventResponses(void)
     amount     = 0;
     numclasses = 0;
 
-    for (c = classlist->next; c != classlist; c = c->next) {
+    for (c = classlist; c; c = c->next) {
         c->BuildResponseList();
 
         amount += c->numEvents * sizeof(Response *);
@@ -564,8 +569,9 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     Event             **events;
     byte               *order;
     FILE               *class_file;
-    str                 classNames[MAX_INHERITANCE];
+    ClassDef           *classes[MAX_INHERITANCE];
     str                 class_filename;
+    EventDef           *def;
 
     c = getClass(classname);
     if (!c) {
@@ -597,12 +603,13 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     orderNum = 0;
     for (; c != NULL; c = c->super) {
         if (orderNum < MAX_INHERITANCE) {
-            classNames[orderNum] = c->classname;
+            classes[orderNum] = c;
         }
         r = c->responses;
         if (r) {
             for (i = 0; r[i].event != NULL; i++) {
                 ev = (int)r[i].event->eventnum;
+                assert(ev < num);
                 if (!set[ev]) {
                     set[ev] = true;
 
@@ -622,20 +629,25 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
     CLASS_Print(class_file, "********************************************************\n");
     CLASS_Print(class_file, "********************************************************\n\n");
 
+    Event::SortEventList(&ClassDef::sortedList);
+
     for (j = orderNum - 1; j >= 0; j--) {
         CLASS_Print(class_file, "\n********************************************************\n");
-        CLASS_Print(class_file, "* Class: %s\n", classNames[j].c_str());
+        CLASS_Print(class_file, "* Class: %s\n", classes[j]->classname);
         CLASS_Print(class_file, "********************************************************\n\n");
         for (i = 1; i < num; i++) {
             int index;
 
             index = ClassDef::sortedList.ObjectAt(i);
             if (events[index] && (order[index] == j)) {
-                Event::eventDefList[events[index]].PrintEventDocumentation(class_file, qfalse);
+                def = classes[j]->GetDef(events[index]);
+                def->PrintEventDocumentation(class_file, qfalse);
             }
         }
     }
 
+    ClassDef::sortedList.FreeObjectList();
+
     if (class_file != NULL) {
         CLASS_DPrintf("Printed class info to file %s\n", class_filename.c_str());
         fclose(class_file);
@@ -648,44 +660,52 @@ void ClassEvents(const char *classname, qboolean print_to_disk)
 
 void DumpClass(FILE *class_file, const char *className)
 {
+    ClassDef           *classDef;
     ClassDef           *c;
     ResponseDef<Class> *r;
     int                 ev;
     int                 i;
-    int                 num, num2;
+    int                 num;
     Event             **events;
+    EventDef           *def;
 
-    c = getClass(className);
-    if (!c) {
+    classDef = getClass(className);
+    if (!classDef) {
         return;
     }
 
-    num  = Event::commandList.size();
-    num2 = Event::NumEventCommands();
+    num = Event::NumEventCommands();
 
-    events = new Event *[num2];
-    memset(events, 0, sizeof(Event *) * num2);
+    events = new Event *[num];
+    memset(events, 0, sizeof(Event *) * num);
 
     // gather event responses for this class
-    r = c->responses;
+    r = classDef->responses;
     if (r) {
         for (i = 0; r[i].event != NULL; i++) {
             ev = (int)r[i].event->eventnum;
             if (r[i].response) {
+                assert(ev < num);
                 events[ev] = r[i].event;
             }
         }
     }
 
     CLASS_Print(class_file, "\n");
-    if (c->classID[0]) {
-        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>", c->classname, c->classname, c->classID);
+    if (classDef->classID[0]) {
+        CLASS_Print(
+            class_file,
+            "<h2> <a name=\"%s\">%s (<i>%s</i>)</a>",
+            classDef->classname,
+            classDef->classname,
+            classDef->classID
+        );
     } else {
-        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s</a>", c->classname, c->classname);
+        CLASS_Print(class_file, "<h2> <a name=\"%s\">%s</a>", classDef->classname, classDef->classname);
     }
 
     // print out lineage
-    for (c = c->super; c != NULL; c = c->super) {
+    for (c = classDef->super; c != NULL; c = c->super) {
         CLASS_Print(class_file, " -> <a href=\"#%s\">%s</a>", c->classname, c->classname);
     }
     CLASS_Print(class_file, "</h2>\n");
@@ -698,7 +718,8 @@ void DumpClass(FILE *class_file, const char *className)
 
         index = ClassDef::sortedList.ObjectAt(i);
         if (events[index]) {
-            Event::eventDefList[events[index]].PrintEventDocumentation(class_file, qtrue);
+            def = classDef->GetDef(events[index]);
+            def->PrintEventDocumentation(class_file, qtrue);
             ClassDef::dump_numevents++;
         }
     }
@@ -762,9 +783,6 @@ void DumpAllClasses(void)
     ClassDef::dump_numclasses = 0;
     ClassDef::dump_numevents  = 0;
 
-    ClassDef::sortedList.ClearObjectList();
-    ClassDef::sortedClassList.ClearObjectList();
-
     Event::SortEventList(&ClassDef::sortedList);
     ClassDef::SortClassList(&ClassDef::sortedClassList);
 
@@ -776,6 +794,8 @@ void DumpAllClasses(void)
         DumpClass(class_file, c->classname);
     }
 
+    ClassDef::sortedList.FreeObjectList();
+
     if (class_file != NULL) {
         CLASS_Print(class_file, "<H2>\n");
         CLASS_Print(
diff --git a/code/qcommon/class.h b/code/qcommon/class.h
index d6fc751e..c7f1928a 100644
--- a/code/qcommon/class.h
+++ b/code/qcommon/class.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -87,15 +87,19 @@ class Event;
         }                                                      \
         bool classname::WaitTillAllowed(str s)                 \
         {                                                      \
-            for(ClassDef* c = classinfo(); c; c = c->super) {  \
-                if (c->WaitTillDefined(s)) { return true; }    \
+            for (ClassDef *c = classinfo(); c; c = c->super) { \
+                if (c->WaitTillDefined(s)) {                   \
+                    return true;                               \
+                }                                              \
             }                                                  \
             return false;                                      \
         }                                                      \
         bool classname::WaitTillAllowed(const_str s)           \
         {                                                      \
-            for(ClassDef* c = classinfo(); c; c = c->super) {  \
-                if (c->WaitTillDefined(s)) { return true; }    \
+            for (ClassDef *c = classinfo(); c; c = c->super) { \
+                if (c->WaitTillDefined(s)) {                   \
+                    return true;                               \
+                }                                              \
             }                                                  \
             return false;                                      \
         }                                                      \
@@ -188,17 +192,15 @@ public:
     int numEvents;
 
     static ClassDef *classlist;
+    static ClassDef *classroot;
     static int       numclasses;
 
-    static void BuildEventResponses();
-
-    void BuildResponseList();
-
     static int                   dump_numclasses;
     static int                   dump_numevents;
     static Container<int>        sortedList;
     static Container<ClassDef *> sortedClassList;
 
+public:
     ClassDef();
     ~ClassDef();
 
@@ -223,27 +225,17 @@ public:
         void *(*newInstance)(void),
         int classSize
     );
-    void CreateInternal(
-        const char         *classname,
-        const char         *classID,
-        const char         *superclass,
-        ResponseDef<Class> *responses,
-        void *(*newInstance)(void),
-        int classSize
-    );
-    void CreateInternalWin(
-        const char         *classname,
-        const char         *classID,
-        const char         *superclass,
-        ResponseDef<Class> *responses,
-        void *(*newInstance)(void),
-        int classSize
-    );
 
     EventDef *GetDef(int eventnum);
+    EventDef *GetDef(Event *ev);
     int       GetFlags(Event *event);
 
     void Destroy();
+
+public:
+    static void BuildEventResponses();
+
+    void BuildResponseList();
 };
 
 ClassDef *getClassList(void);
diff --git a/code/qcommon/cm_fencemask.c b/code/qcommon/cm_fencemask.c
index eacf6aad..ead06286 100644
--- a/code/qcommon/cm_fencemask.c
+++ b/code/qcommon/cm_fencemask.c
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cm_local.h"
 #include "../client/client.h"
 
-byte cmf_dummy_trans_data;
+byte         cmf_dummy_trans_data;
 cfencemask_t cmf_dummy_trans;
 
 /*
@@ -31,40 +31,40 @@ cfencemask_t cmf_dummy_trans;
 CM_LoadFTX
 ====================
 */
-qboolean CM_LoadFTX( const char *name, byte **pic, int *width, int *height )
+qboolean CM_LoadFTX(const char *name, byte **pic, int *width, int *height)
 {
-	int length;
-	int numPixels;
-	fileHandle_t h;
-	ftx_t header;
+    int          length;
+    int          numPixels;
+    fileHandle_t h;
+    ftx_t        header;
 
-	*pic = NULL;
-	length = FS_FOpenFileRead( name, &h, qtrue, qtrue );
-	if( length <= 0 ) {
-		return qtrue;
-	}
+    *pic   = NULL;
+    length = FS_FOpenFileRead(name, &h, qtrue, qtrue);
+    if (length <= 0) {
+        return qtrue;
+    }
 
-	FS_Read( &header, sizeof( ftx_t ), h );
+    FS_Read(&header, sizeof(ftx_t), h);
 
-	header.has_alpha = LittleLong(header.has_alpha);
-	header.height = LittleLong(header.height);
-	header.width = LittleLong(header.width);
+    header.has_alpha = LittleLong(header.has_alpha);
+    header.height    = LittleLong(header.height);
+    header.width     = LittleLong(header.width);
 
-	if( !header.has_alpha ) {
-		FS_FCloseFile( h );
-		return qfalse;
-	}
+    if (!header.has_alpha) {
+        FS_FCloseFile(h);
+        return qfalse;
+    }
 
-	// Load the FTX data
-	numPixels = header.width * header.height;
-	*height = header.height;
-	*width = header.width;
-	*pic = Hunk_AllocateTempMemory( numPixels * 4 );
+    // Load the FTX data
+    numPixels = header.width * header.height;
+    *height   = header.height;
+    *width    = header.width;
+    *pic      = Hunk_AllocateTempMemory(numPixels * 4);
 
-	FS_Read( *pic, numPixels * 4, h );
-	FS_FCloseFile( h );
+    FS_Read(*pic, numPixels * 4, h);
+    FS_FCloseFile(h);
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -72,186 +72,193 @@ qboolean CM_LoadFTX( const char *name, byte **pic, int *width, int *height )
 CM_LoadTGA
 ====================
 */
-qboolean CM_LoadTGA( const char *name, byte **pic, int *width, int *height )
+qboolean CM_LoadTGA(const char *name, byte **pic, int *width, int *height)
 {
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	int		length;
-	TargaHeader		targa_header;
-	byte			*targa_rgba;
+    int         columns, rows, numPixels;
+    byte       *pixbuf;
+    int         row, column;
+    byte       *buf_p;
+    byte       *buffer;
+    int         length;
+    TargaHeader targa_header;
+    byte       *targa_rgba;
 
-	*pic = NULL;
+    *pic = NULL;
 
-	//
-	// load the file
-	//
-	length = FS_ReadFile (name, (void **)&buffer);
-	if (!buffer) {
-		return qfalse;
-	}
+    //
+    // load the file
+    //
+    length = FS_ReadFile(name, (void **)&buffer);
+    if (!buffer) {
+        return qfalse;
+    }
 
-	buf_p = buffer;
+    buf_p = buffer;
 
-	targa_header.id_length = *buf_p++;
-	targa_header.colormap_type = *buf_p++;
-	targa_header.image_type = *buf_p++;
-	
-	targa_header.colormap_index = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.colormap_length = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.colormap_size = *buf_p++;
-	targa_header.x_origin = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.y_origin = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.width = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.height = LittleShort ( *((short *)buf_p) );
-	buf_p+=2;
-	targa_header.pixel_size = *buf_p++;
-	targa_header.attributes = *buf_p++;
+    targa_header.id_length     = *buf_p++;
+    targa_header.colormap_type = *buf_p++;
+    targa_header.image_type    = *buf_p++;
 
-	if (targa_header.image_type!=2
-		&& targa_header.image_type!=10
-		&& targa_header.image_type!=3) 
-		Com_Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+    targa_header.colormap_index = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.colormap_length = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.colormap_size = *buf_p++;
+    targa_header.x_origin      = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.y_origin = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.width = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.height = LittleShort(*((short *)buf_p));
+    buf_p += 2;
+    targa_header.pixel_size = *buf_p++;
+    targa_header.attributes = *buf_p++;
 
-	if(targa_header.colormap_type!=0)
-		Com_Error (ERR_DROP, "LoadTGA: colormaps not supported\n");
+    if (targa_header.image_type != 2 && targa_header.image_type != 10 && targa_header.image_type != 3) {
+        Com_Error(ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+    }
 
-	if (targa_header.colormap_type !=0 
-		|| (targa_header.pixel_size!=32 && targa_header.pixel_size!=24))
-		Com_Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+    if (targa_header.colormap_type != 0) {
+        Com_Error(ERR_DROP, "LoadTGA: colormaps not supported\n");
+    }
 
-	columns = targa_header.width;
-	rows = targa_header.height;
-	numPixels = columns * rows;
+    if (targa_header.pixel_size != 32) {
+        if (targa_header.pixel_size != 24 && targa_header.image_type != 3) {
+            Com_Error(ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+        }
 
-	if (width)
-		*width = columns;
-	if (height)
-		*height = rows;
+        FS_FreeFile(buffer);
+        return qfalse;
+    }
+    columns   = targa_header.width;
+    rows      = targa_header.height;
+    numPixels = columns * rows;
 
-	targa_rgba = Hunk_AllocateTempMemory (numPixels*4);
-	*pic = targa_rgba;
+    if (width) {
+        *width = columns;
+    }
+    if (height) {
+        *height = rows;
+    }
 
-	if (targa_header.id_length != 0)
-		buf_p += targa_header.id_length;  // skip TARGA image comment
-	
-	if(targa_header.image_type == 2 || targa_header.image_type == 3) {  // Uncompressed, RGB images
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; column++) {
-				unsigned char red,green,blue,alphabyte;
-				switch (targa_header.pixel_size) {
-					case 24:
-							
-							blue = *buf_p++;
-							green = *buf_p++;
-							red = *buf_p++;
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = 255;
-							break;
-					case 32:
-							blue = *buf_p++;
-							green = *buf_p++;
-							red = *buf_p++;
-							alphabyte = *buf_p++;
-							*pixbuf++ = red;
-							*pixbuf++ = green;
-							*pixbuf++ = blue;
-							*pixbuf++ = alphabyte;
-							break;
-				}
-			}
-		}
-	}
-	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
-		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; ) {
-				packetHeader= *buf_p++;
-				packetSize = 1 + (packetHeader & 0x7f);
-				if (packetHeader & 0x80) {        // run-length packet
-					switch (targa_header.pixel_size) {
-						case 24:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = 255;
-								break;
-						case 32:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = *buf_p++;
-								break;
-					}
-	
-					for(j=0;j<packetSize;j++) {
-						*pixbuf++=red;
-						*pixbuf++=green;
-						*pixbuf++=blue;
-						*pixbuf++=alphabyte;
-						column++;
-						if (column==columns) { // run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}
-					}
-				}
-				else {                            // non run-length packet
-					for(j=0;j<packetSize;j++) {
-						switch (targa_header.pixel_size) {
-							case 24:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = 255;
-									break;
-							case 32:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									alphabyte = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = alphabyte;
-									break;
-						}
-						column++;
-						if (column==columns) { // pixel packet run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}						
-					}
-				}
-			}
-			breakOut:;
-		}
-	}
+    targa_rgba = Hunk_AllocateTempMemory(numPixels * 4);
+    *pic       = targa_rgba;
 
-	FS_FreeFile (buffer);
-	return qtrue;
+    if (targa_header.id_length != 0) {
+        buf_p += targa_header.id_length; // skip TARGA image comment
+    }
+
+    if (targa_header.image_type == 2 || targa_header.image_type == 3) { // Uncompressed, RGB images
+        for (row = rows - 1; row >= 0; row--) {
+            pixbuf = targa_rgba + row * columns * 4;
+            for (column = 0; column < columns; column++) {
+                unsigned char red, green, blue, alphabyte;
+                switch (targa_header.pixel_size) {
+                case 24:
+
+                    blue      = *buf_p++;
+                    green     = *buf_p++;
+                    red       = *buf_p++;
+                    *pixbuf++ = red;
+                    *pixbuf++ = green;
+                    *pixbuf++ = blue;
+                    *pixbuf++ = 255;
+                    break;
+                case 32:
+                    blue      = *buf_p++;
+                    green     = *buf_p++;
+                    red       = *buf_p++;
+                    alphabyte = *buf_p++;
+                    *pixbuf++ = red;
+                    *pixbuf++ = green;
+                    *pixbuf++ = blue;
+                    *pixbuf++ = alphabyte;
+                    break;
+                }
+            }
+        }
+    } else if (targa_header.image_type == 10) { // Runlength encoded RGB images
+        unsigned char red, green, blue, alphabyte, packetHeader, packetSize, j;
+        for (row = rows - 1; row >= 0; row--) {
+            pixbuf = targa_rgba + row * columns * 4;
+            for (column = 0; column < columns;) {
+                packetHeader = *buf_p++;
+                packetSize   = 1 + (packetHeader & 0x7f);
+                if (packetHeader & 0x80) { // run-length packet
+                    switch (targa_header.pixel_size) {
+                    case 24:
+                        blue      = *buf_p++;
+                        green     = *buf_p++;
+                        red       = *buf_p++;
+                        alphabyte = 255;
+                        break;
+                    case 32:
+                        blue      = *buf_p++;
+                        green     = *buf_p++;
+                        red       = *buf_p++;
+                        alphabyte = *buf_p++;
+                        break;
+                    }
+
+                    for (j = 0; j < packetSize; j++) {
+                        *pixbuf++ = red;
+                        *pixbuf++ = green;
+                        *pixbuf++ = blue;
+                        *pixbuf++ = alphabyte;
+                        column++;
+                        if (column == columns) { // run spans across rows
+                            column = 0;
+                            if (row > 0) {
+                                row--;
+                            } else {
+                                goto breakOut;
+                            }
+                            pixbuf = targa_rgba + row * columns * 4;
+                        }
+                    }
+                } else { // non run-length packet
+                    for (j = 0; j < packetSize; j++) {
+                        switch (targa_header.pixel_size) {
+                        case 24:
+                            blue      = *buf_p++;
+                            green     = *buf_p++;
+                            red       = *buf_p++;
+                            *pixbuf++ = red;
+                            *pixbuf++ = green;
+                            *pixbuf++ = blue;
+                            *pixbuf++ = 255;
+                            break;
+                        case 32:
+                            blue      = *buf_p++;
+                            green     = *buf_p++;
+                            red       = *buf_p++;
+                            alphabyte = *buf_p++;
+                            *pixbuf++ = red;
+                            *pixbuf++ = green;
+                            *pixbuf++ = blue;
+                            *pixbuf++ = alphabyte;
+                            break;
+                        }
+                        column++;
+                        if (column == columns) { // pixel packet run spans across rows
+                            column = 0;
+                            if (row > 0) {
+                                row--;
+                            } else {
+                                goto breakOut;
+                            }
+                            pixbuf = targa_rgba + row * columns * 4;
+                        }
+                    }
+                }
+            }
+        breakOut:;
+        }
+    }
+
+    FS_FreeFile(buffer);
+    return qtrue;
 }
 
 /*
@@ -259,64 +266,62 @@ qboolean CM_LoadTGA( const char *name, byte **pic, int *width, int *height )
 CM_LoadFCM
 ====================
 */
-qboolean CM_LoadFCM( const char *szName, cfencemask_t **pMask )
+qboolean CM_LoadFCM(const char *szName, cfencemask_t **pMask)
 {
-	unsigned int version;
-	int length;
-	int iDataSize;
-	fileHandle_t h;
-	fcm_t header;
-	cfencemask_t *m;
-	char tempName[ 256 ];
+    unsigned int  version;
+    int           length;
+    int           iDataSize;
+    fileHandle_t  h;
+    fcm_t         header;
+    cfencemask_t *m;
+    char          tempName[256];
 
-	*pMask = NULL;
+    *pMask = NULL;
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
 
-	length = FS_FOpenFileRead( tempName, &h, qtrue, qtrue );
-	if( length <= 0 ) {
-		return qfalse;
-	}
+    length = FS_FOpenFileRead(tempName, &h, qtrue, qtrue);
+    if (length <= 0) {
+        return qfalse;
+    }
 
-	FS_Read( &version, sizeof( int ), h );
+    FS_Read(&version, sizeof(int), h);
 
-	if( LittleLong( version ) != FENCEMASK_VERSION )
-	{
-		FS_FCloseFile( h );
-		Com_Printf( "CM_LoadFCM: %s is not correct version, skipping\n", tempName );
-		return qfalse;
-	}
+    if (LittleLong(version) != FENCEMASK_VERSION) {
+        FS_FCloseFile(h);
+        Com_Printf("CM_LoadFCM: %s is not correct version, skipping\n", tempName);
+        return qfalse;
+    }
 
-	FS_Read( &header, sizeof( fcm_t ), h );
+    FS_Read(&header, sizeof(fcm_t), h);
 
-	iDataSize = LittleLong( header.iWidth ) * LittleLong( header.iHeight ) + 7;
-	if( iDataSize < 0 ) {
-		iDataSize = LittleLong( header.iWidth ) * LittleLong( header.iHeight ) + 14;
-	}
+    iDataSize = LittleLong(header.iWidth) * LittleLong(header.iHeight) + 7;
+    if (iDataSize < 0) {
+        iDataSize = LittleLong(header.iWidth) * LittleLong(header.iHeight) + 14;
+    }
 
-	iDataSize >>= 3;
+    iDataSize >>= 3;
 
-	if( iDataSize != ( length - sizeof( fcm_t ) - sizeof( unsigned int ) ) )
-	{
-		FS_FCloseFile( h );
-		Com_Printf( "CM_LoadFCM: size mismatch in %s, skipping\n", tempName );
-		return qfalse;
-	}
+    if (iDataSize != (length - sizeof(fcm_t) - sizeof(unsigned int))) {
+        FS_FCloseFile(h);
+        Com_Printf("CM_LoadFCM: size mismatch in %s, skipping\n", tempName);
+        return qfalse;
+    }
 
-    m = (cfencemask_t*)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
-	*pMask = m;
-	strcpy( m->name, szName );
-	m->iWidth = header.iWidth;
+    m      = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
+    *pMask = m;
+    Q_strncpyz(m->name, szName, sizeof(m->name));
+    m->iWidth  = header.iWidth;
     m->iHeight = header.iHeight;
-    m->pData = (byte*)Hunk_Alloc(iDataSize, h_dontcare);
-	FS_Read( m->pData, iDataSize, h );
-	FS_FCloseFile( h );
+    m->pData   = (byte *)Hunk_Alloc(iDataSize, h_dontcare);
+    FS_Read(m->pData, iDataSize, h);
+    FS_FCloseFile(h);
 
-	sprintf( tempName, "f%s", szName );
-	UI_LoadResource( tempName );
+    Com_sprintf(tempName, sizeof(tempName), "f%s", szName);
+    UI_LoadResource(tempName);
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -324,72 +329,69 @@ qboolean CM_LoadFCM( const char *szName, cfencemask_t **pMask )
 CM_SaveFCM
 ====================
 */
-void CM_SaveFCM( const char *szName, cfencemask_t **pMask )
+void CM_SaveFCM(const char *szName, cfencemask_t **pMask)
 {
-	fileHandle_t h;
-	unsigned int version;
-	byte *pData;
-	int i, j;
-	int iMaskPos;
-	char endline, solid, clear;
-	char tempName[ 256 ];
+    fileHandle_t h;
+    unsigned int version;
+    byte        *pData;
+    int          i, j;
+    int          iMaskPos;
+    char         endline, solid, clear;
+    char         tempName[256];
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
-	h = FS_FOpenFileWrite( tempName );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
+    h = FS_FOpenFileWrite(tempName);
 
-	if( !h ) {
-		return;
-	}
+    if (!h) {
+        return;
+    }
 
-	version = FENCEMASK_VERSION;
-	FS_Write( &version, sizeof( unsigned int ), h );
-	FS_Write( &( *pMask )->iWidth, sizeof( int ), h );
-	FS_Write( &( *pMask )->iHeight, sizeof( int ), h );
+    version = FENCEMASK_VERSION;
+    FS_Write(&version, sizeof(unsigned int), h);
+    FS_Write(&(*pMask)->iWidth, sizeof(int), h);
+    FS_Write(&(*pMask)->iHeight, sizeof(int), h);
 
-	iMaskPos = ( *pMask )->iHeight * ( *pMask )->iWidth + 7;
-	if( iMaskPos < 0 ) {
-		iMaskPos = ( *pMask )->iHeight * ( *pMask )->iWidth + 7 * 2;
-	}
-	FS_Write( ( *pMask )->pData, iMaskPos >> 3, h );
-	FS_FCloseFile( h );
+    iMaskPos = (*pMask)->iHeight * (*pMask)->iWidth + 7;
+    if (iMaskPos < 0) {
+        iMaskPos = (*pMask)->iHeight * (*pMask)->iWidth + 7 * 2;
+    }
+    FS_Write((*pMask)->pData, iMaskPos >> 3, h);
+    FS_FCloseFile(h);
 
-	// save debug info
-	if( developer->integer && cm_FCMdebug->integer )
-	{
-		endline = '\n';
-		solid = 'X';
-		clear = '.';
+    // save debug info
+    if (developer->integer && cm_FCMdebug->integer) {
+        endline = '\n';
+        solid   = 'X';
+        clear   = '.';
 
-		COM_StripExtension( szName, tempName, sizeof( tempName ) );
-		strcat( tempName, ".fcm" );
-		h = FS_FOpenFileWrite( tempName );
-		if( !h ) {
-			return;
-		}
+        COM_StripExtension(szName, tempName, sizeof(tempName));
+        strcat(tempName, ".fcm");
+        h = FS_FOpenFileWrite(tempName);
+        if (!h) {
+            return;
+        }
 
-		pData = ( *pMask )->pData;
-		for( i = 0; i < ( *pMask )->iHeight; i++ )
-		{
-			for( j = 0; j < ( *pMask )->iWidth; j++ )
-			{
-				int b1, b2;
+        pData = (*pMask)->pData;
+        for (i = 0; i < (*pMask)->iHeight; i++) {
+            for (j = 0; j < (*pMask)->iWidth; j++) {
+                int b1, b2;
 
-				b1 = ( j + ( *pMask )->iWidth * i ) & 7;
-				b2 = pData[ ( j + ( *pMask )->iWidth * i ) >> 3 ];
+                b1 = (j + (*pMask)->iWidth * i) & 7;
+                b2 = pData[(j + (*pMask)->iWidth * i) >> 3];
 
-				if(b2 & (1 << b1)) {
-					FS_Write( &solid, 1, h );
-				} else {
-					FS_Write( &clear, 1, h );
-				}
-			}
+                if (b2 & (1 << b1)) {
+                    FS_Write(&solid, 1, h);
+                } else {
+                    FS_Write(&clear, 1, h);
+                }
+            }
 
-			FS_Write( &endline, 1, h );
-		}
+            FS_Write(&endline, 1, h);
+        }
 
-		FS_FCloseFile( h );
-	}
+        FS_FCloseFile(h);
+    }
 }
 
 /*
@@ -397,22 +399,22 @@ void CM_SaveFCM( const char *szName, cfencemask_t **pMask )
 CM_GenerateDummyFenceMask
 ====================
 */
-cfencemask_t *CM_GenerateDummyFenceMask( const char *szName, qboolean bOpaque )
+cfencemask_t *CM_GenerateDummyFenceMask(const char *szName, qboolean bOpaque)
 {
-	cfencemask_t *pMask;
+    cfencemask_t *pMask;
 
-    pMask = Hunk_Alloc(sizeof(cfencemask_t) + sizeof(byte), h_dontcare);
-	pMask->iWidth = 2;
-	pMask->iHeight = 2;
-	pMask->pData = ( byte * )( ( char * )pMask + sizeof( cfencemask_t ) );
+    pMask          = Hunk_Alloc(sizeof(cfencemask_t) + sizeof(byte), h_dontcare);
+    pMask->iWidth  = 2;
+    pMask->iHeight = 2;
+    pMask->pData   = (byte *)((char *)pMask + sizeof(cfencemask_t));
 
-	if( bOpaque ) {
-		*( byte * )pMask->pData = -1;
-	} else {
-		*( byte * )pMask->pData = 0;
-	}
+    if (bOpaque) {
+        *(byte *)pMask->pData = -1;
+    } else {
+        *(byte *)pMask->pData = 0;
+    }
 
-	return pMask;
+    return pMask;
 }
 
 /*
@@ -420,89 +422,85 @@ cfencemask_t *CM_GenerateDummyFenceMask( const char *szName, qboolean bOpaque )
 CM_GenerateFenceMask
 ====================
 */
-qboolean CM_GenerateFenceMask( const char *szName, cfencemask_t **pMask )
+qboolean CM_GenerateFenceMask(const char *szName, cfencemask_t **pMask)
 {
-	int i;
-	int iImageWidth;
-	int iImageHeight;
-	int iImageSize;
-	int iMaskSize;
-	int iWidth;
-	int iHeight;
-	byte *pImage;
-	byte *pCurrImage;
-	byte *pCurrMask;
-	qboolean bHasTrans = qfalse;
-	qboolean bHasOpaque = qfalse;
-	char tempName[ 256 ];
+    int      i;
+    int      iImageWidth;
+    int      iImageHeight;
+    int      iImageSize;
+    int      iMaskSize;
+    int      iWidth;
+    int      iHeight;
+    byte    *pImage;
+    byte    *pCurrImage;
+    byte    *pCurrMask;
+    qboolean bHasTrans  = qfalse;
+    qboolean bHasOpaque = qfalse;
+    char     tempName[256];
 
-	*pMask = NULL;
+    *pMask = NULL;
 
-	COM_StripExtension( szName, tempName, sizeof( tempName ) );
-	strcat( tempName, ".ftx" );
+    COM_StripExtension(szName, tempName, sizeof(tempName));
+    strcat(tempName, ".ftx");
 
-	if( !CM_LoadFTX( tempName, &pImage, &iImageWidth, &iImageHeight ) ) {
-		return qfalse;
-	}
+    if (!CM_LoadFTX(tempName, &pImage, &iImageWidth, &iImageHeight)) {
+        return qfalse;
+    }
 
-	if( !pImage )
-	{
-		if( !CM_LoadTGA( szName, &pImage, &iImageWidth, &iImageHeight ) ) {
-			return qfalse;
-		}
+    if (!pImage) {
+        if (!CM_LoadTGA(szName, &pImage, &iImageWidth, &iImageHeight)) {
+            return qfalse;
+        }
 
-		if( !pImage ) {
-			return qfalse;
-		}
-	}
+        if (!pImage) {
+            return qfalse;
+        }
+    }
 
-	iWidth = iImageWidth;
-	iHeight = iImageHeight;
-	iImageSize = iImageWidth * iImageHeight;
-	iMaskSize = iImageSize + 7;
-	if( iMaskSize < 0 ) {
-		iMaskSize = iImageSize + 7 * 2;
-	}
+    iWidth     = iImageWidth;
+    iHeight    = iImageHeight;
+    iImageSize = iImageWidth * iImageHeight;
+    iMaskSize  = iImageSize + 7;
+    if (iMaskSize < 0) {
+        iMaskSize = iImageSize + 7 * 2;
+    }
 
-	pCurrImage = pImage + 3;
+    pCurrImage = pImage + 3;
 
-	for( i = 0; i < iImageSize; i++, pCurrImage += sizeof( unsigned int ) )
-	{
-		if( *pCurrImage >= 0 )
-		{
-			bHasTrans = qtrue;
-		} else {
-			bHasOpaque = qtrue;
-		}
+    for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
+        if (*pCurrImage >= 128) {
+            // Treat pixels with > 128 alpha value as opaque
+            bHasOpaque = qtrue;
+        } else {
+            bHasTrans = qtrue;
+        }
 
-		if( bHasOpaque && bHasTrans ) {
-			break;
-		}
-	}
+        if (bHasOpaque && bHasTrans) {
+            break;
+        }
+    }
 
-	// load the mask if it has transparence and is opaque
-	if( bHasOpaque && bHasTrans )
-    {
+    // load the mask if it has transparence and is opaque
+    if (bHasOpaque && bHasTrans) {
         *pMask = Hunk_Alloc((iMaskSize >> 3) + sizeof(cfencemask_t), h_dontcare);
-		strcpy( ( *pMask )->name, szName );
-		( *pMask )->iWidth = iWidth;
-		( *pMask )->iHeight = iHeight;
-		( *pMask )->pData = ( byte * )( ( char * )*pMask + sizeof( cfencemask_t ) );
+        Q_strncpyz((*pMask)->name, szName, sizeof((*pMask)->name));
+        (*pMask)->iWidth  = iWidth;
+        (*pMask)->iHeight = iHeight;
+        (*pMask)->pData   = (byte *)((byte *)*pMask + sizeof(**pMask));
 
-		pCurrMask = ( *pMask )->pData;
-		pCurrImage = pImage + 3;
-		for( i = 0; i < iImageSize; i++, pCurrImage += sizeof( unsigned int ) )
-		{
-			if( *pCurrImage < 0 ) {
-				pCurrMask[ i >> 3 ] |= 1 << ( i & 7 );
-			}
-		}
-	} else {
-		*pMask = CM_GenerateDummyFenceMask( szName, bHasOpaque );
-	}
+        pCurrMask  = (*pMask)->pData;
+        pCurrImage = pImage + 3;
+        for (i = 0; i < iImageSize; i++, pCurrImage += sizeof(unsigned int)) {
+            if (*pCurrImage >= 128) {
+                pCurrMask[i >> 3] |= 1 << (i & 7);
+            }
+        }
+    } else {
+        *pMask = CM_GenerateDummyFenceMask(szName, bHasOpaque);
+    }
 
-	Hunk_FreeTempMemory( pImage );
-	return qtrue;
+    Hunk_FreeTempMemory(pImage);
+    return qtrue;
 }
 
 /*
@@ -510,13 +508,13 @@ qboolean CM_GenerateFenceMask( const char *szName, cfencemask_t **pMask )
 CM_CheckFCMFileRefresh
 ====================
 */
-qboolean CM_CheckFCMFileRefresh( const char *szFile  )
+qboolean CM_CheckFCMFileRefresh(const char *szFile)
 {
-	char tempName[ 256 ];
+    char tempName[256];
 
-	COM_StripExtension( szFile, tempName, sizeof( tempName ) );
-	strcat( tempName, ".fcm" );
-	return FS_FileNewer( szFile, tempName ) > 0;
+    COM_StripExtension(szFile, tempName, sizeof(tempName));
+    strcat(tempName, ".fcm");
+    return FS_FileNewer(szFile, tempName) > 0;
 }
 
 /*
@@ -524,70 +522,63 @@ qboolean CM_CheckFCMFileRefresh( const char *szFile  )
 CM_GetFenceMask
 ====================
 */
-cfencemask_t *CM_GetFenceMask( const char *szMaskName )
+cfencemask_t *CM_GetFenceMask(const char *szMaskName)
 {
-	qboolean save;
-	cfencemask_t *pMask;
+    qboolean      save;
+    cfencemask_t *pMask;
 
-	if( !szMaskName || !*szMaskName ) {
-		return NULL;
-	}
+    if (!szMaskName || !*szMaskName) {
+        return NULL;
+    }
 
-	if( !memcmp( szMaskName, "nomask", 7 ) ) {
-		return NULL;
-	}
+    if (!memcmp(szMaskName, "nomask", 7)) {
+        return NULL;
+    }
 
-	if( !memcmp( szMaskName, "ignore", 7 ) ) {
-		return &cmf_dummy_trans;
-	}
+    if (!memcmp(szMaskName, "ignore", 7)) {
+        return &cmf_dummy_trans;
+    }
 
-	for( pMask = cm.fencemasks; pMask != NULL; pMask = pMask->pNext )
-	{
-		if( !strcmp( szMaskName, pMask->name ) ) {
-			if( pMask->pData ) {
-				return pMask;
-			} else {
-				return NULL;
-			}
-		}
-	}
+    for (pMask = cm.fencemasks; pMask != NULL; pMask = pMask->pNext) {
+        if (!strcmp(szMaskName, pMask->name)) {
+            if (pMask->pData) {
+                return pMask;
+            } else {
+                return NULL;
+            }
+        }
+    }
 
-	save = qfalse;
+    save = qfalse;
 
-	if( developer->integer )
-	{
-		if( cm_FCMcacheall->integer )
-		{
-			save = qtrue;
-		}
-		else
-		{
-			if( CM_CheckFCMFileRefresh( szMaskName ) ) {
-				save = qtrue;
-			}
-		}
-	}
+    if (developer->integer) {
+        if (cm_FCMcacheall->integer) {
+            save = qtrue;
+        } else {
+            if (CM_CheckFCMFileRefresh(szMaskName)) {
+                save = qtrue;
+            }
+        }
+    }
 
-	if( save || !CM_LoadFCM( szMaskName, &pMask ) )
-	{
-		if( !CM_GenerateFenceMask( szMaskName, &pMask ) )
-        {
-            pMask = (cfencemask_t*)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
-			strcpy( pMask->name, szMaskName );
-			pMask->pData = NULL;
-			pMask->pNext = cm.fencemasks;
-			cm.fencemasks = pMask;
-			return NULL;
-		}
-	}
+    if (save || !CM_LoadFCM(szMaskName, &pMask)) {
+        if (!CM_GenerateFenceMask(szMaskName, &pMask)) {
+            pMask = (cfencemask_t *)Hunk_Alloc(sizeof(cfencemask_t), h_dontcare);
+            Q_strncpyz(pMask->name, szMaskName, sizeof(pMask->name));
+            pMask->pData  = NULL;
+            pMask->pNext  = cm.fencemasks;
+            cm.fencemasks = pMask;
+            return NULL;
+        }
+    }
 
-	if( save ) {
-		CM_SaveFCM( szMaskName, &pMask );
-	}
+    if (save) {
+        CM_SaveFCM(szMaskName, &pMask);
+    }
 
-	pMask->pNext = cm.fencemasks;
-	cm.fencemasks = pMask;
-	return pMask;
+    pMask->pNext  = cm.fencemasks;
+    cm.fencemasks = pMask;
+    return pMask;
 }
 
 /*
@@ -595,47 +586,49 @@ cfencemask_t *CM_GetFenceMask( const char *szMaskName )
 CM_TraceThroughFence
 ====================
 */
-qboolean CM_TraceThroughFence( traceWork_t *tw, cbrush_t *brush, cbrushside_t *side, float fTraceFraction )
+qboolean CM_TraceThroughFence(traceWork_t *tw, cbrush_t *brush, cbrushside_t *side, float fTraceFraction)
 {
-	int				i;
-	int				iMaskPos;
-	float			fS;
-	float			fT;
-	float			*vNorm;
-	vec3_t			vPos;
-	cfencemask_t	*pMask;
+    int           i;
+    int           iMaskPos;
+    float         fS;
+    float         fT;
+    float        *vNorm;
+    vec3_t        vPos;
+    cfencemask_t *pMask;
 
-	pMask = cm.shaders[ side->shaderNum ].mask;
-	if( !pMask ) {
-		return qtrue;
-	}
+    pMask = cm.shaders[side->shaderNum].mask;
+    if (!pMask) {
+        return qtrue;
+    }
 
-	if( pMask == &cmf_dummy_trans ) {
-		return qfalse;
-	}
+    if (pMask == &cmf_dummy_trans) {
+        return qfalse;
+    }
 
-	if( !side->pEq ) {
-		return qtrue;
-	}
+    if (!side->pEq) {
+        return qtrue;
+    }
 
-	for( i = 0; i < 3; i++ )
-	{
-		vNorm = side->plane->normal;
-		vPos[ i ] = tw->start[ i ] + fTraceFraction * ( tw->end[ i ] - tw->start[ i ] ) - SURFACE_CLIP_EPSILON * vNorm[ i ];
-	}
+    for (i = 0; i < 3; i++) {
+        vNorm   = side->plane->normal;
+        vPos[i] = tw->start[i] + fTraceFraction * (tw->end[i] - tw->start[i]) - SURFACE_CLIP_EPSILON * vNorm[i];
+    }
 
-	fS = DotProduct( vPos, side->pEq->fSeq ) + side->pEq->fSeq[ 3 ];
-	fS = fS - floor( fS );
-	fT = DotProduct( vPos, side->pEq->fTeq ) + side->pEq->fTeq[ 3 ];
-	fT = fT - floor( fT );
+    fS = DotProduct(vPos, side->pEq->fSeq) + side->pEq->fSeq[3];
+    fS = fS - floor(fS);
+    fT = DotProduct(vPos, side->pEq->fTeq) + side->pEq->fTeq[3];
+    fT = fT - floor(fT);
 
-	if( cm_FCMdebug->integer )
-	{
-		Com_Printf( "Trace ST coords: (%.2f %.2f) or (%i %i)\n",
-			fS, fT,
-			( int )( ( float )pMask->iWidth * fS ), ( int )( ( float )pMask->iHeight * fT ) );
-	}
+    if (cm_FCMdebug->integer) {
+        Com_Printf(
+            "Trace ST coords: (%.2f %.2f) or (%i %i)\n",
+            fS,
+            fT,
+            (int)((float)pMask->iWidth * fS),
+            (int)((float)pMask->iHeight * fT)
+        );
+    }
 
-	iMaskPos = ( int )( ( float )pMask->iWidth * fS ) + pMask->iWidth * ( int )( ( float )pMask->iHeight * fT );
-	return ( 1 << ( iMaskPos & 7 ) ) & pMask->pData[ iMaskPos >> 3 ];
+    iMaskPos = (int)((float)pMask->iWidth * fS) + pMask->iWidth * (int)((float)pMask->iHeight * fT);
+    return (1 << (iMaskPos & 7)) & pMask->pData[iMaskPos >> 3];
 }
diff --git a/code/qcommon/cm_load.c b/code/qcommon/cm_load.c
index 0eb61b7d..56b20b01 100644
--- a/code/qcommon/cm_load.c
+++ b/code/qcommon/cm_load.c
@@ -97,6 +97,7 @@ CMod_LoadShaders
 void CMod_LoadShaders( gamelump_t *l, int **shaderSubdivisions ) {
 	dshader_t		*in;
 	cshader_t		*out;
+	obfuscation_t	*obfuscationList;
 	int				i, count;
 
 	*shaderSubdivisions = NULL;
@@ -116,15 +117,22 @@ void CMod_LoadShaders( gamelump_t *l, int **shaderSubdivisions ) {
 	cm.fencemasks = NULL;
 
 	*shaderSubdivisions = Hunk_AllocateTempMemory( count * sizeof( *shaderSubdivisions ) );
+	obfuscationList = CM_SetupObfuscationMapping();
 
 	out = cm.shaders;
 	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		strcpy( out->shader, in->shader );
+		Q_strncpyz( out->shader, in->shader, sizeof( out->shader ) );
 		out->contentFlags = LittleLong( in->contentFlags );
 		out->surfaceFlags = LittleLong( in->surfaceFlags );
 		out->mask = CM_GetFenceMask( in->fenceMaskImage );
+		out->obfuscationWidthDensity = 0;
+		if (out->contentFlags & CONTENTS_DONOTENTER) {
+			CM_ObfuscationForShader(obfuscationList, out->shader, &out->obfuscationWidthDensity, &out->obfuscationHeightDensity);
+		}
 		( *shaderSubdivisions )[ i ] = LittleLong( in->subdivisions );
 	}
+
+	CM_ReleaseObfuscationMapping(obfuscationList);
 }
 
 
@@ -670,7 +678,7 @@ void CMod_LoadPatches( gamelump_t *surfs, gamelump_t *verts, int *shaderSubdivis
 		// create the internal facet structure
 		patch->pc = CM_GeneratePatchCollide( width, height, points, patch->subdivisions );
 
-		sprintf(tempName, "s%d", i);
+		Com_sprintf(tempName, sizeof(tempName), "s%d", i);
 		UI_LoadResource(tempName);
 	}
 
@@ -701,6 +709,7 @@ void CMod_LoadTerrain( gamelump_t *lump ) {
 	CM_PrepareGenerateTerrainCollide();
 
 	for( i = 0; i < numTerraPatches; i++ ) {
+		CM_SwapTerraPatch(&terraPatches[i]);
 		// Generate collision
 		CM_GenerateTerrainCollide( &terraPatches[ i ], &cm.terrain[ i ].tc );
 		cm.terrain[ i ].contents = cm.shaders[ terraPatches[ i ].iShader ].contentFlags;
@@ -735,7 +744,7 @@ void CMod_LoadTerrainIndexes( gamelump_t *lump ) {
 
 	for( i = 0; i < cm.numLeafTerrains; i++, in++ )
 	{
-		cm.leafterrains[ i ] = &cm.terrain[ *in ];
+		cm.leafterrains[ i ] = &cm.terrain[ LittleShort( *in ) ];
 	}
 }
 
@@ -758,7 +767,7 @@ unsigned CM_Checksum( dheader_t *header ) {
 
 	return LittleLong(Com_BlockChecksum(checksums, 11 * 4));
 	*/
-	return header->checksum;
+	return LittleLong(header->checksum);
 }
 
 /*
@@ -776,7 +785,7 @@ int CM_LoadLump( fileHandle_t handle, lump_t *lump, gamelump_t *glump, int size
 	if( lump->filelen ) {
 		glump->buffer = Hunk_AllocateTempMemory( lump->filelen );
 
-		if( FS_Seek( handle, lump->fileofs, FS_SEEK_SET ) ) {
+		if( FS_Seek( handle, lump->fileofs, FS_SEEK_SET ) < 0 ) {
 			Com_Error( ERR_DROP, "CM_LoadLump: Error seeking to lump." );
 		}
 
@@ -875,7 +884,7 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 
 	FS_Read( &header, sizeof( dheader_t ), h );
 
-	last_checksum = header.checksum;
+	last_checksum = LittleLong(header.checksum);
 	*checksum = last_checksum;
 
 	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
@@ -891,21 +900,21 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 
 	// load into heap
 	_R( 0 );
-	CM_LoadLump( h, &header.lumps[ LUMP_SHADERS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SHADERS ), &lump, 0);
 	_R( 1 );
 	CMod_LoadShaders( &lump, &shaderSubdivisions );
 	_R( 2 );
 	CM_FreeLump( &lump );
 	_R( 3 );
-	CM_LoadLump( h, &header.lumps[ LUMP_PLANES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_PLANES ), &lump, 0 );
 	_R( 4 );
 	CMod_LoadPlanes( &lump );
 	_R( 5 );
 	CM_FreeLump( &lump );
 	_R( 6 );
-	CM_LoadLump( h, &header.lumps[ LUMP_SURFACES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SURFACES ), &lump, 0 );
 	_R( 7 );
-	CM_LoadLump( h, &header.lumps[ LUMP_DRAWVERTS ], &lump2, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_DRAWVERTS ), &lump2, 0 );
 	_R( 8 );
 	CMod_LoadPatches( &lump, &lump2, shaderSubdivisions );
 	_R( 9 );
@@ -913,21 +922,21 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 	_R( 10 );
 	CM_FreeLump( &lump );
 	_R( 11 );
-	cm.numLeafBrushes = CM_LoadLump( h, &header.lumps[ LUMP_LEAFBRUSHES ], &lump, sizeof( int ) );
+	cm.numLeafBrushes = CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFBRUSHES ), &lump, sizeof( int ) );
 	_R( 12 );
 	CMod_LoadLeafBrushes( &lump );
 	_R( 13 );
 	CM_FreeLump( &lump );
 	_R( 14 );
-	CM_LoadLump( h, &header.lumps[ LUMP_LEAFSURFACES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFSURFACES ), &lump, 0 );
 	_R( 15 );
 	CMod_LoadLeafSurfaces( &lump );
 	_R( 16 );
 	CM_FreeLump( &lump );
 	_R( 17 );
-	CM_LoadLump( h, &header.lumps[ LUMP_LEAFS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_LEAFS ), &lump, 0 );
 	_R( 18 );
-	if( header.version > 18 ) {
+	if( header.version >= 18 ) {
 		CMod_LoadLeafs( &lump );
 	} else {
 		CMod_LoadLeafsOld( &lump );
@@ -935,55 +944,55 @@ void CM_LoadMap( const char *name, qboolean clientload, int *checksum ) {
 	_R( 19 );
 	CM_FreeLump( &lump );
 	_R( 20 );
-	CM_LoadLump( h, &header.lumps[ LUMP_NODES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_NODES ), &lump, 0 );
 	_R( 21 );
 	CMod_LoadNodes( &lump );
 	_R( 22 );
 	CM_FreeLump( &lump );
 	_R( 23 );
-	g_iNumSideEquations = CM_LoadLump( h, &header.lumps[ LUMP_SIDEEQUATIONS ], &lump, 32 );
+	g_iNumSideEquations = CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_SIDEEQUATIONS ), &lump, 32 );
 	_R( 24 );
 	CMod_LoadSideEquations( &lump );
 	_R( 25 );
 	CM_FreeLump( &lump );
 	_R( 26 );
-	CM_LoadLump( h, &header.lumps[ LUMP_BRUSHSIDES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_BRUSHSIDES ), &lump, 0 );
 	_R( 27 );
 	CMod_LoadBrushSides( &lump );
 	_R( 28 );
 	CM_FreeLump( &lump );
 	_R( 29 );
-	CM_LoadLump( h, &header.lumps[ LUMP_BRUSHES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_BRUSHES ), &lump, 0 );
 	_R( 30 );
 	CMod_LoadBrushes( &lump );
 	_R( 31 );
 	CM_FreeLump( &lump );
 	_R( 32 );
-	CM_LoadLump( h, &header.lumps[ LUMP_MODELS ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_MODELS ), &lump, 0 );
 	_R( 33 );
 	CMod_LoadSubmodels( &lump );
 	_R( 34 );
 	CM_FreeLump( &lump );
 	_R( 35 );
-	CM_LoadLump( h, &header.lumps[ LUMP_ENTITIES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_ENTITIES ), &lump, 0 );
 	_R( 36 );
 	CMod_LoadEntityString( &lump );
 	_R( 37 );
 	CM_FreeLump( &lump );
 	_R( 38 );
-	CM_LoadLump( h, &header.lumps[ LUMP_VISIBILITY ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_VISIBILITY ), &lump, 0 );
 	_R( 39 );
 	CMod_LoadVisibility( &lump );
 	_R( 40 );
 	CM_FreeLump( &lump );
 	_R( 41 );
-	CM_LoadLump( h, &header.lumps[ LUMP_TERRAIN ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_TERRAIN ), &lump, 0 );
 	_R( 42 );
 	CMod_LoadTerrain( &lump );
 	_R( 43 );
 	CM_FreeLump( &lump );
 	_R( 44 );
-	CM_LoadLump( h, &header.lumps[ LUMP_TERRAININDEXES ], &lump, 0 );
+	CM_LoadLump( h, Q_GetLumpByVersion( &header, LUMP_TERRAININDEXES ), &lump, 0 );
 	_R( 45 );
 	CMod_LoadTerrainIndexes( &lump );
 	_R( 46 );
diff --git a/code/qcommon/cm_local.h b/code/qcommon/cm_local.h
index 2e9d02f9..805f4b41 100644
--- a/code/qcommon/cm_local.h
+++ b/code/qcommon/cm_local.h
@@ -25,10 +25,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cm_polylib.h"
 #include "cm_terrain.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define	MAX_SUBMODELS			1024
 #define	BOX_MODEL_HANDLE		(MAX_SUBMODELS-1)
 #define CAPSULE_MODEL_HANDLE	510
-
+#define MAX_OBFUSCATIONS		1024
 
 typedef struct {
 	cplane_t	*plane;
@@ -63,6 +67,8 @@ typedef struct {
 	int surfaceFlags;
 	int contentFlags;
 	cfencemask_t *mask;
+	float obfuscationWidthDensity;
+	float obfuscationHeightDensity;
 } cshader_t;
 
 typedef struct cmodel_s {
@@ -219,6 +225,12 @@ typedef struct leafList_s {
 	void	(*storeLeafs)( struct leafList_s *ll, int nodenum );
 } leafList_t;
 
+typedef struct {
+    char name[MAX_QPATH];
+    float widthDensity;
+    float heightDensity;
+} obfuscation_t;
+
 extern	clipMap_t	cm;
 extern	int			c_pointcontents;
 extern	int			c_traces, c_brush_traces, c_patch_traces, c_terrain_patch_traces;
@@ -260,3 +272,12 @@ qboolean CM_SightTraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *
 // cm_fencemask.c
 cfencemask_t *CM_GetFenceMask( const char *szMaskName );
 qboolean CM_TraceThroughFence( traceWork_t *tw, cbrush_t *brush, cbrushside_t *side, float fTraceFraction );
+
+// cm_trace_obfuscation.cpp
+obfuscation_t* CM_SetupObfuscationMapping();
+void CM_ReleaseObfuscationMapping(obfuscation_t* obfuscation);
+void CM_ObfuscationForShader(obfuscation_t* list, const char* shaderName, float* widthDensity, float* heightDensity);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/qcommon/cm_patch.c b/code/qcommon/cm_patch.c
index ef4e31e6..b3128094 100644
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -787,15 +787,9 @@ static qboolean CM_ValidateFacet( facet_t *facet ) {
 	FreeWinding( w );
 	
 	for ( j = 0 ; j < 3 ; j++ ) {
-		if ( bounds[1][j] - bounds[0][j] > MAX_MAP_BOUNDS ) {
+		if ( bounds[1][j] - bounds[0][j] > MAP_SIZE ) {
 			return qfalse;		// we must be missing a plane
 		}
-		if ( bounds[0][j] >= MAX_MAP_BOUNDS ) {
-			return qfalse;
-		}
-		if ( bounds[1][j] <= -MAX_MAP_BOUNDS ) {
-			return qfalse;
-		}
 	}
 	return qtrue;		// winding is fine
 }
@@ -1131,10 +1125,37 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) {
 	// copy the results out
 	pf->numPlanes = numPlanes;
     pf->numFacets = numFacets;
-    pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
-    Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
-    pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
-    Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
+	if (numPlanes >= 1) {
+		pf->planes = Hunk_Alloc(numPlanes * sizeof(*pf->planes), h_dontcare);
+		Com_Memcpy(pf->planes, planes, numPlanes * sizeof(*pf->planes));
+	} else {
+        pf->numPlanes = 0;
+        pf->planes = NULL;
+        Com_DPrintf(
+            "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no planes (%i %i %i)-(%i %i %i)\n",
+            (int)pf->bounds[0][0],
+            (int)pf->bounds[0][1],
+            (int)pf->bounds[0][2],
+            (int)pf->bounds[1][0],
+            (int)pf->bounds[1][1],
+            (int)pf->bounds[1][2]);
+	}
+
+	if (numFacets >= 1) {
+		pf->facets = Hunk_Alloc(numFacets * sizeof(*pf->facets), h_dontcare);
+		Com_Memcpy(pf->facets, facets, numFacets * sizeof(*pf->facets));
+	} else {
+        pf->numFacets = 0;
+        pf->facets = NULL;
+        Com_DPrintf(
+            "WARNING: CM_PatchCollideFromGrid: Degenerate patch - no facets (%i %i %i)-(%i %i %i)\n",
+            (int)pf->bounds[0][0],
+            (int)pf->bounds[0][1],
+            (int)pf->bounds[0][2],
+            (int)pf->bounds[1][0],
+            (int)pf->bounds[1][1],
+            (int)pf->bounds[1][2]);
+	}
 }
 
 
@@ -1287,7 +1308,7 @@ void CM_TracePointThroughPatchCollide( traceWork_t *tw, const struct patchCollid
 		}
 		for ( j = 0 ; j < facet->numBorders ; j++ ) {
 			k = facet->borderPlanes[j];
-			if ( frontFacing[k] ^ facet->borderInward[j] ) {
+			if ( frontFacing[k] != facet->borderInward[j] ) {
 				if ( intersection[k] > intersect ) {
 					break;
 				}
@@ -1436,11 +1457,8 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s *
 		//never clip against the back side
 		if (hitnum == facet->numBorders - 1) continue;
 
-		if (enterFrac < leaveFrac && enterFrac >= 0) {
+		if (enterFrac <= leaveFrac && enterFrac >= 0) {
 			if (enterFrac < tw->trace.fraction) {
-				if (enterFrac < 0) {
-					enterFrac = 0;
-				}
 #ifndef BSPC
 				if (!cv) {
 					cv = Cvar_Get( "r_debugSurfaceUpdate", "1", 0 );
@@ -1474,84 +1492,52 @@ CM_PositionTestInPatchCollide
 ====================
 */
 qboolean CM_PositionTestInPatchCollide( traceWork_t *tw, const struct patchCollide_s *pc ) {
+    byte cross[4096];
+    patchPlane_t* planes;
+    facet_t* facet;
 	int i, j;
-	float offset, t;
-	patchPlane_t *planes;
-	facet_t	*facet;
-	float plane[4];
-	vec3_t startp;
+	float offset, d;
 
-	if (tw->isPoint) {
-		return qfalse;
+    // Check if it's within the patch bounds
+    for (i = 0; i < 3; i++) {
+        if (tw->bounds[0][i] > pc->bounds[1][i] || tw->bounds[1][i] < pc->bounds[0][i]) {
+            return qfalse;
+        }
 	}
-	//
+
+    // Check for planes that are crossing
+	for (i = 0; i < pc->numPlanes; i++) {
+		planes = &pc->planes[i];
+
+		offset = fabs(DotProduct(tw->offsets[planes->signbits], planes->plane));
+		d = DotProduct(tw->start, planes->plane) - planes->plane[3];
+
+		if (-offset > d) {
+			cross[i] = 0;
+		} else if (offset < d) {
+			cross[i] = 1;
+		} else {
+			cross[i] = 2;
+		}
+	}
+
+	j = 0;
 	facet = pc->facets;
-	for ( i = 0 ; i < pc->numFacets ; i++, facet++ ) {
-		planes = &pc->planes[ facet->surfacePlane ];
-		VectorCopy(planes->plane, plane);
-		plane[3] = planes->plane[3];
-		if ( sphere.use ) {
-			// adjust the plane distance apropriately for radius
-			plane[3] += sphere.radius;
-
-			// find the closest point on the capsule to the plane
-			t = DotProduct( plane, sphere.offset );
-			if ( t > 0 ) {
-				VectorSubtract( tw->start, sphere.offset, startp );
-			}
-			else {
-				VectorAdd( tw->start, sphere.offset, startp );
-			}
-		}
-		else {
-			offset = DotProduct( tw->offsets[ planes->signbits ], plane);
-			plane[3] -= offset;
-			VectorCopy( tw->start, startp );
-		}
-
-		if ( DotProduct( plane, startp ) - plane[3] > 0.0f ) {
-			continue;
-		}
-
-		for ( j = 0; j < facet->numBorders; j++ ) {
-			planes = &pc->planes[ facet->borderPlanes[j] ];
-			if (facet->borderInward[j]) {
-				VectorNegate(planes->plane, plane);
-				plane[3] = -planes->plane[3];
-			}
-			else {
-				VectorCopy(planes->plane, plane);
-				plane[3] = planes->plane[3];
-			}
-			if ( sphere.use ) {
-				// adjust the plane distance apropriately for radius
-				plane[3] += sphere.radius;
-
-				// find the closest point on the capsule to the plane
-				t = DotProduct( plane, sphere.offset );
-				if ( t > 0.0f ) {
-					VectorSubtract( tw->start, sphere.offset, startp );
-				}
-				else {
-					VectorAdd( tw->start, sphere.offset, startp );
+	for (i = 0; i < pc->numFacets; i++, facet++) {
+		if (cross[facet->surfacePlane] == 2) {
+			for (j = 0; j < facet->numBorders; j++) {
+				if (cross[facet->borderPlanes[j]] != 2 && cross[facet->borderPlanes[j]] != (uint8_t)facet->borderInward[j]) {
+					break;
 				}
 			}
-			else {
-				// NOTE: this works even though the plane might be flipped because the bbox is centered
-				offset = DotProduct( tw->offsets[ planes->signbits ], plane);
-				plane[3] += fabs(offset);
-				VectorCopy( tw->start, startp );
+
+			if (j < facet->numBorders) {
+				continue;
 			}
 
-			if ( DotProduct( plane, startp ) - plane[3] > 0.0f ) {
-				break;
-			}
+			// inside this patch facet
+			return qtrue;
 		}
-		if (j < facet->numBorders) {
-			continue;
-		}
-		// inside this patch facet
-		return qtrue;
 	}
 	return qfalse;
 }
diff --git a/code/qcommon/cm_patch.h b/code/qcommon/cm_patch.h
index 62f31ada..52b82f5a 100644
--- a/code/qcommon/cm_patch.h
+++ b/code/qcommon/cm_patch.h
@@ -61,7 +61,10 @@ properly.
 
 
 #define	MAX_FACETS			1024
-#define	MAX_PATCH_PLANES	4096 // 2048 su44: increased for m1l2a
+// Changed in OPM
+//  In OG it's 4096, however due to a tiny floating point difference
+//  between x86 and x64, more patch planes can appear in x64
+#define	MAX_PATCH_PLANES	6144
 
 typedef struct {
 	float	plane[4];
diff --git a/code/qcommon/cm_polylib.c b/code/qcommon/cm_polylib.c
index 569b0299..5f8816a5 100644
--- a/code/qcommon/cm_polylib.c
+++ b/code/qcommon/cm_polylib.c
@@ -160,8 +160,8 @@ void	WindingBounds (winding_t *w, vec3_t mins, vec3_t maxs)
 	vec_t	v;
 	int		i,j;
 
-	mins[0] = mins[1] = mins[2] = MAX_MAP_BOUNDS;
-	maxs[0] = maxs[1] = maxs[2] = -MAX_MAP_BOUNDS;
+	mins[0] = mins[1] = mins[2] = 99999;
+	maxs[0] = maxs[1] = maxs[2] = -99999;
 
 	for (i=0 ; i<w->numpoints ; i++)
 	{
@@ -208,7 +208,7 @@ winding_t *BaseWindingForPlane (vec3_t normal, vec_t dist)
 	
 // find the major axis
 
-	max = -MAX_MAP_BOUNDS;
+	max = -MAP_SIZE;
 	x = -1;
 	for (i=0 ; i<3; i++)
 	{
@@ -236,14 +236,14 @@ winding_t *BaseWindingForPlane (vec3_t normal, vec_t dist)
 
 	v = DotProduct (vup, normal);
 	VectorMA (vup, -v, normal, vup);
-	VectorNormalize2(vup, vup);
+	VectorNormalize(vup);
 		
 	VectorScale (normal, dist, org);
 	
 	CrossProduct (vup, normal, vright);
 	
-	VectorScale (vup, MAX_MAP_BOUNDS, vup);
-	VectorScale (vright, MAX_MAP_BOUNDS, vright);
+	VectorScale (vup, MAP_SIZE, vup);
+	VectorScale (vright, MAP_SIZE, vright);
 
 // project a really big	axis aligned box onto the plane
 	w = AllocWinding (4);
@@ -440,9 +440,9 @@ void ChopWindingInPlace (winding_t **inout, vec3_t normal, vec_t dist, vec_t eps
 		dot = DotProduct (in->p[i], normal);
 		dot -= dist;
 		dists[i] = dot;
-		if (dot > epsilon)
+		if ((dot + 0.0005) > epsilon)
 			sides[i] = SIDE_FRONT;
-		else if (dot < -epsilon)
+		else if ((dot - 0.0005) < -epsilon)
 			sides[i] = SIDE_BACK;
 		else
 		{
@@ -564,7 +564,7 @@ void CheckWinding (winding_t *w)
 		p1 = w->p[i];
 
 		for (j=0 ; j<3 ; j++)
-			if (p1[j] > MAX_MAP_BOUNDS || p1[j] < -MAX_MAP_BOUNDS)
+			if (p1[j] > MAP_SIZE || p1[j] < -MAP_SIZE)
 				Com_Error (ERR_DROP, "CheckFace: BUGUS_RANGE: %f",p1[j]);
 
 		j = i+1 == w->numpoints ? 0 : i+1;
diff --git a/code/qcommon/cm_public.h b/code/qcommon/cm_public.h
index 2defd4a3..842e8072 100644
--- a/code/qcommon/cm_public.h
+++ b/code/qcommon/cm_public.h
@@ -105,6 +105,9 @@ void CM_DrawDebugSurface( void (*drawPoly)(int color, int numPoints, float *poin
 const char *CM_GetHitLocationInfo( int i_iLocation, float *o_fRadius, vec3_t o_vOffset );
 const char *CM_GetHitLocationInfoSecondary( int i_iLocation, float *o_fRadius, vec3_t o_vOffset );
 
+// cm_trace_obfuscation.cpp
+float CM_VisualObfuscation(const vec3_t start, const vec3_t end);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/qcommon/cm_terrain.c b/code/qcommon/cm_terrain.c
index 12002e2c..c2435256 100644
--- a/code/qcommon/cm_terrain.c
+++ b/code/qcommon/cm_terrain.c
@@ -27,43 +27,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "cm_terrain.h"
 
 typedef struct varnodeIndex_s {
-	short unsigned int iTreeAndMask;
-	short unsigned int iNode;
+    short unsigned int iTreeAndMask;
+    short unsigned int iNode;
 } varnodeIndex_t;
 
 typedef struct worknode_s {
-	int i0;
-	int j0;
-	int i1;
-	int j1;
-	int i2;
-	int j2;
+    int i0;
+    int j0;
+    int i1;
+    int j1;
+    int i2;
+    int j2;
 } worknode_t;
 
 typedef struct pointtrace_s {
-	traceWork_t *tw;
-	terrainCollide_t *tc;
-	vec3_t vStart;
-	vec3_t vEnd;
-	int i;
-	int j;
-	float fSurfaceClipEpsilon;
+    traceWork_t      *tw;
+    terrainCollide_t *tc;
+    vec3_t            vStart;
+    vec3_t            vEnd;
+    int               i;
+    int               j;
+    float             fSurfaceClipEpsilon;
 } pointtrace_t;
 
-varnodeIndex_t g_vni[ 2 ][ 8 ][ 8 ][ 2 ];
+varnodeIndex_t      g_vni[2][8][8][2];
 static pointtrace_t g_trace;
 
-static int modeTable[] =
-{
-	2,
-	2,
-	5,
-	6,
-	4,
-	3,
-	0,
-	0
-};
+static int modeTable[] = {2, 2, 5, 6, 4, 3, 0, 0};
 
 /*
 =================
@@ -71,16 +61,17 @@ CM_SignbitsForNormal
 =================
 Copied over from cm_patch.c
 */
-static int CM_SignbitsForNormal( vec3_t normal ) {
-	int	bits, j;
+static int CM_SignbitsForNormal(vec3_t normal)
+{
+    int bits, j;
 
-	bits = 0;
-	for (j=0 ; j<3 ; j++) {
-		if ( normal[j] < 0 ) {
-			bits |= 1<<j;
-		}
-	}
-	return bits;
+    bits = 0;
+    for (j = 0; j < 3; j++) {
+        if (normal[j] < 0) {
+            bits |= 1 << j;
+        }
+    }
+    return bits;
 }
 
 /*
@@ -88,84 +79,72 @@ static int CM_SignbitsForNormal( vec3_t normal ) {
 CM_CalculateTerrainIndices
 ====================
 */
-void CM_CalculateTerrainIndices( worknode_t *worknode, int iDiagonal, int iTree )
+void CM_CalculateTerrainIndices(worknode_t *worknode, int iDiagonal, int iTree)
 {
-	int i;
-	int i2;
-	int j2;
-	varnodeIndex_t *vni;
+    int             i;
+    int             i2;
+    int             j2;
+    varnodeIndex_t *vni;
 
-	for( i = 0; i <= 30; i++ )
-	{
-		i2 = worknode[ i + 1 ].i0 + worknode[ i + 1 ].i1;
-		j2 = worknode[ i + 1 ].j0 + worknode[ i + 1 ].j1;
-		worknode[ i * 2 + 2 ].i0 = worknode[ i + 1 ].i1;
-		worknode[ i * 2 + 2 ].j0 = worknode[ i + 1 ].j1;
-		worknode[ i * 2 + 2 ].i1 = worknode[ i + 1 ].i2;
-		worknode[ i * 2 + 2 ].j1 = worknode[ i + 1 ].j2;
-		worknode[ i * 2 + 2 ].i2 = i2 >> 1;
-		worknode[ i * 2 + 2 ].j2 = j2 >> 1;
-		worknode[ i * 2 + 2 + 1 ].i0 = worknode[ i + 1 ].i2;
-		worknode[ i * 2 + 2 + 1 ].j0 = worknode[ i + 1 ].j2;
-		worknode[ i * 2 + 2 + 1 ].i1 = worknode[ i + 1 ].i0;
-		worknode[ i * 2 + 2 + 1 ].j1 = worknode[ i + 1 ].j0;
-		worknode[ i * 2 + 2 + 1 ].i2 = i2 >> 1;
-		worknode[ i * 2 + 2 + 1 ].j2 = j2 >> 1;
-	}
+    for (i = 0; i <= 30; i++) {
+        i2                         = worknode[i + 1].i0 + worknode[i + 1].i1;
+        j2                         = worknode[i + 1].j0 + worknode[i + 1].j1;
+        worknode[i * 2 + 2].i0     = worknode[i + 1].i1;
+        worknode[i * 2 + 2].j0     = worknode[i + 1].j1;
+        worknode[i * 2 + 2].i1     = worknode[i + 1].i2;
+        worknode[i * 2 + 2].j1     = worknode[i + 1].j2;
+        worknode[i * 2 + 2].i2     = i2 >> 1;
+        worknode[i * 2 + 2].j2     = j2 >> 1;
+        worknode[i * 2 + 2 + 1].i0 = worknode[i + 1].i2;
+        worknode[i * 2 + 2 + 1].j0 = worknode[i + 1].j2;
+        worknode[i * 2 + 2 + 1].i1 = worknode[i + 1].i0;
+        worknode[i * 2 + 2 + 1].j1 = worknode[i + 1].j0;
+        worknode[i * 2 + 2 + 1].i2 = i2 >> 1;
+        worknode[i * 2 + 2 + 1].j2 = j2 >> 1;
+    }
 
-	for( i = 32; i < 64; i++ )
-	{
-		i2 = ( worknode[ i ].i0 + worknode[ i ].i1 ) >> 1;
-		j2 = ( worknode[ i ].j0 + worknode[ i ].j1 ) >> 1;
+    for (i = 32; i < 64; i++) {
+        i2 = (worknode[i].i0 + worknode[i].i1) >> 1;
+        j2 = (worknode[i].j0 + worknode[i].j1) >> 1;
 
-		if( worknode[ i ].i0 == worknode[ i ].i1 )
-		{
-			if( worknode[ i ].j0 <= worknode[ i ].j1 )
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
+        if (worknode[i].i0 == worknode[i].i1) {
+            if (worknode[i].j0 <= worknode[i].j1) {
+                vni               = &g_vni[iDiagonal][i2][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
 
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
-			}
-			else
-			{
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
+                vni               = &g_vni[iDiagonal][i2][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
+            } else {
+                vni               = &g_vni[iDiagonal][i2 - 1][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
-			}
-		}
-		else
-		{
-			if( worknode[ i ].i0 <= worknode[ i ].i1 )
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
+                vni               = &g_vni[iDiagonal][i2 - 1][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
+            }
+        } else {
+            if (worknode[i].i0 <= worknode[i].i1) {
+                vni               = &g_vni[iDiagonal][i2][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 - 1 ][ 0 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
-			}
-			else
-			{
-				vni = &g_vni[ iDiagonal ][ i2 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x1000;
+                vni               = &g_vni[iDiagonal][i2 - 1][j2 - 1][0];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
+            } else {
+                vni               = &g_vni[iDiagonal][i2][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x1000;
 
-				vni = &g_vni[ iDiagonal ][ i2 - 1 ][ j2 ][ 1 ];
-				vni->iNode = i - 1;
-				vni->iTreeAndMask = iTree | 0x2000;
-			}
-		}
-
-	}
+                vni               = &g_vni[iDiagonal][i2 - 1][j2][1];
+                vni->iNode        = i - 1;
+                vni->iTreeAndMask = iTree | 0x2000;
+            }
+        }
+    }
 }
 
 /*
@@ -173,70 +152,82 @@ void CM_CalculateTerrainIndices( worknode_t *worknode, int iDiagonal, int iTree
 CM_PrepareGenerateTerrainCollide
 ====================
 */
-void CM_PrepareGenerateTerrainCollide( void )
+void CM_PrepareGenerateTerrainCollide(void)
 {
-	worknode_t		worknode[ 64 ];
+    worknode_t worknode[64];
 
-	memset( &g_vni, 0, sizeof( g_vni ) );
+    memset(&g_vni, 0, sizeof(g_vni));
 
-	worknode[ 1 ].i0 = 8;
-	worknode[ 1 ].j0 = 8;
-	worknode[ 1 ].i1 = 0;
-	worknode[ 1 ].j1 = 0;
-	worknode[ 1 ].i2 = 0;
-	worknode[ 1 ].j2 = 8;
+    worknode[1].i0 = 8;
+    worknode[1].j0 = 8;
+    worknode[1].i1 = 0;
+    worknode[1].j1 = 0;
+    worknode[1].i2 = 0;
+    worknode[1].j2 = 8;
 
-	CM_CalculateTerrainIndices( worknode, 0, 0 );
+    CM_CalculateTerrainIndices(worknode, 0, 0);
 
-	worknode[ 1 ].i0 = 0;
-	worknode[ 1 ].j0 = 0;
-	worknode[ 1 ].i1 = 8;
-	worknode[ 1 ].j1 = 8;
-	worknode[ 1 ].i2 = 8;
-	worknode[ 1 ].j2 = 0;
+    worknode[1].i0 = 0;
+    worknode[1].j0 = 0;
+    worknode[1].i1 = 8;
+    worknode[1].j1 = 8;
+    worknode[1].i2 = 8;
+    worknode[1].j2 = 0;
 
-	CM_CalculateTerrainIndices( worknode, 0, 1 );
+    CM_CalculateTerrainIndices(worknode, 0, 1);
 
-	worknode[ 1 ].i0 = 8;
-	worknode[ 1 ].j0 = 0;
-	worknode[ 1 ].i1 = 0;
-	worknode[ 1 ].j1 = 8;
-	worknode[ 1 ].i2 = 8;
-	worknode[ 1 ].j2 = 8;
+    worknode[1].i0 = 8;
+    worknode[1].j0 = 0;
+    worknode[1].i1 = 0;
+    worknode[1].j1 = 8;
+    worknode[1].i2 = 8;
+    worknode[1].j2 = 8;
 
-	CM_CalculateTerrainIndices( worknode, 1, 0 );
+    CM_CalculateTerrainIndices(worknode, 1, 0);
 
-	worknode[ 1 ].i0 = 0;
-	worknode[ 1 ].j0 = 8;
-	worknode[ 1 ].i1 = 8;
-	worknode[ 1 ].j1 = 0;
-	worknode[ 1 ].i2 = 0;
-	worknode[ 1 ].j2 = 0;
+    worknode[1].i0 = 0;
+    worknode[1].j0 = 8;
+    worknode[1].i1 = 8;
+    worknode[1].j1 = 0;
+    worknode[1].i2 = 0;
+    worknode[1].j2 = 0;
 
-	CM_CalculateTerrainIndices( worknode, 1, 1 );
+    CM_CalculateTerrainIndices(worknode, 1, 1);
 }
 
-void CM_PickTerrainSquareMode( terrainCollideSquare_t *square, vec3_t vTest, int i, int j, cTerraPatch_t *patch ) {
-	int flags0, flags1;
-	varnodeIndex_t *vni;
+void CM_PickTerrainSquareMode(terrainCollideSquare_t *square, vec3_t vTest, int i, int j, cTerraPatch_t *patch)
+{
+    int             flags0, flags1;
+    varnodeIndex_t *vni;
 
-	vni = &g_vni[ ( patch->flags & 0x80 ) ? 1 : 0 ][ i ][ j ][ 0 ];
+    if (patch->flags & TERPATCH_NEIGHBOR) {
+        vni = g_vni[1][i][j];
+    } else {
+        vni = g_vni[0][i][j];
+    }
 
-	flags0 = ( ( unsigned short )( patch->varTree[ vni->iTreeAndMask & 1 ][ vni->iNode ].flags & 0xFFFE & vni->iTreeAndMask ) != 0 );
-	flags1 = ( ( unsigned short )( patch->varTree[ vni[ 1 ].iTreeAndMask & 1 ][ vni[ 1 ].iNode ].flags & 0xFFFE & vni[ 1 ].iTreeAndMask ) != 0 );
+    if ((vni[0].iTreeAndMask & patch->varTree[vni[0].iTreeAndMask & 1][vni[0].iNode].flags & 0xFFFE) != 0) {
+        flags0 = 2;
+    } else {
+        flags0 = 0;
+    }
 
-	square->eMode = modeTable[ ( j + i ) & 1 | 2 * flags0 | 4 * flags1 ];
+    if ((vni[1].iTreeAndMask & patch->varTree[vni[1].iTreeAndMask & 1][vni[1].iNode].flags & 0xFFFFFFFE) != 0) {
+        flags1 = 4;
+    } else {
+        flags1 = 0;
+    }
 
-	if( square->eMode == 2 )
-	{
-		if( DotProduct( vTest, square->plane[ 0 ] ) < square->plane[ 0 ][ 3 ] ) {
-			square->eMode = 1;
-		}
-	}
-	else if( square->eMode == 5 || square->eMode == 6 )
-	{
-		VectorCopy( square->plane[ 1 ], square->plane[ 0 ] );
-	}
+    square->eMode = modeTable[(j + i) & 1 | flags0 | flags1];
+
+    if (square->eMode == 2) {
+        if (DotProduct(vTest, square->plane[0]) < square->plane[0][3]) {
+            square->eMode = 1;
+        }
+    } else if (square->eMode == 5 || square->eMode == 6) {
+        VectorCopy(square->plane[1], square->plane[0]);
+        square->plane[0][3] = square->plane[1][3];
+    }
 }
 
 /*
@@ -244,107 +235,95 @@ void CM_PickTerrainSquareMode( terrainCollideSquare_t *square, vec3_t vTest, int
 CM_GenerateTerPatchCollide
 ====================
 */
-void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc ) {
-	int i;
-	int j;
-	int x0, y0, z0;
-	float fMaxHeight;
-	float heightmap[ 9 ][ 9 ];
-	terrainCollideSquare_t *square;
-	vec3_t v1;
-	vec3_t v2;
-	vec3_t v3;
-	vec3_t v4;
-	
-	x0 = ( patch->x << 6 );
-	y0 = ( patch->y << 6 );
-	z0 = ( patch->iBaseHeight );
+void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc)
+{
+    int                     i;
+    int                     j;
+    int                     x0, y0, z0;
+    float                   fMaxHeight;
+    float                   heightmap[9][9];
+    terrainCollideSquare_t *square;
+    vec3_t                  v1;
+    vec3_t                  v2;
+    vec3_t                  v3;
+    vec3_t                  v4;
 
-	fMaxHeight = z0;
+    x0 = (patch->x << 6);
+    y0 = (patch->y << 6);
+    z0 = (patch->iBaseHeight);
 
-	for( j = 0; j < 9; j++ )
-	{
-		for( i = 0; i < 9; i++ )
-		{
-			heightmap[ i ][ j ] = ( float )( z0 + 2 * patch->heightmap[ j * 9 + i ] );
-		}
-	}
+    fMaxHeight = z0;
 
-	for( j = 0; j < 8; j++ )
-	{
-		for( i = 0; i < 8; i++ )
-		{
-			v1[ 0 ] = ( ( i << 6 ) + x0 );
-			v1[ 1 ] = ( ( j << 6 ) + y0 );
-			v1[ 2 ] = heightmap[ i ][ j ];
+    for (j = 0; j < 9; j++) {
+        for (i = 0; i < 9; i++) {
+            heightmap[i][j] = (float)(z0 + 2 * patch->heightmap[j * 9 + i]);
+        }
+    }
 
-			v2[ 0 ] = ( ( i << 6 ) + x0 ) + 64;
-			v2[ 1 ] = ( ( j << 6 ) + y0 );
-			v2[ 2 ] = heightmap[ i + 1 ][ j ];
+    for (j = 0; j < 8; j++) {
+        for (i = 0; i < 8; i++) {
+            v1[0] = ((i << 6) + x0);
+            v1[1] = ((j << 6) + y0);
+            v1[2] = heightmap[i][j];
 
-			v3[ 0 ] = ( ( i << 6 ) + x0 ) + 64;
-			v3[ 1 ] = ( ( j << 6 ) + y0 ) + 64;
-			v3[ 2 ] = heightmap[ i + 1 ][ j + 1 ];
+            v2[0] = ((i << 6) + x0) + 64;
+            v2[1] = ((j << 6) + y0);
+            v2[2] = heightmap[i + 1][j];
 
-			v4[ 0 ] = ( ( i << 6 ) + x0 );
-			v4[ 1 ] = ( ( j << 6 ) + y0 ) + 64;
-			v4[ 2 ] = heightmap[ i ][ j + 1 ];
+            v3[0] = ((i << 6) + x0) + 64;
+            v3[1] = ((j << 6) + y0) + 64;
+            v3[2] = heightmap[i + 1][j + 1];
 
-			if( fMaxHeight < v1[ 2 ] ) {
-				fMaxHeight = v1[ 2 ];
-			}
+            v4[0] = ((i << 6) + x0);
+            v4[1] = ((j << 6) + y0) + 64;
+            v4[2] = heightmap[i][j + 1];
 
-			if( fMaxHeight < v2[ 2 ] ) {
-				fMaxHeight = v2[ 2 ];
-			}
+            if (fMaxHeight < v1[2]) {
+                fMaxHeight = v1[2];
+            }
 
-			if( fMaxHeight < v3[ 2 ] ) {
-				fMaxHeight = v3[ 2 ];
-			}
+            if (fMaxHeight < v2[2]) {
+                fMaxHeight = v2[2];
+            }
 
-			if( fMaxHeight < v4[ 2 ] ) {
-				fMaxHeight = v4[ 2 ];
-			}
+            if (fMaxHeight < v3[2]) {
+                fMaxHeight = v3[2];
+            }
 
-			square = &tc->squares[ i ][ j ];
+            if (fMaxHeight < v4[2]) {
+                fMaxHeight = v4[2];
+            }
 
-			if( ( i + j ) & 1 )
-			{
-				if( patch->flags & 0x40 )
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v4, v2, v3 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v2, v4, v1 );
-				}
-				else
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v2, v4, v3 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v4, v2, v1 );
-				}
-				CM_PickTerrainSquareMode( square, v1, i, j, patch );
-			}
-			else
-			{
-				if( patch->flags & 0x40 )
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v1, v3, v4 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v3, v1, v2 );
-				}
-				else
-				{
-					CM_PlaneFromPoints( square->plane[ 0 ], v3, v1, v4 );
-					CM_PlaneFromPoints( square->plane[ 1 ], v1, v3, v2 );
-				}
-				CM_PickTerrainSquareMode( square, v2, i, j, patch );
-			}
-		}
-	}
+            square = &tc->squares[i][j];
 
-	tc->vBounds[ 0 ][ 0 ] = x0;
-	tc->vBounds[ 0 ][ 1 ] = y0;
-	tc->vBounds[ 0 ][ 2 ] = z0;
-	tc->vBounds[ 1 ][ 0 ] = ( x0 + 512 );
-	tc->vBounds[ 1 ][ 1 ] = ( y0 + 512 );
-	tc->vBounds[ 1 ][ 2 ] = fMaxHeight;
+            if ((i + j) & 1) {
+                if (patch->flags & TERPATCH_FLIP) {
+                    CM_PlaneFromPoints(square->plane[0], v4, v2, v3);
+                    CM_PlaneFromPoints(square->plane[1], v2, v4, v1);
+                } else {
+                    CM_PlaneFromPoints(square->plane[0], v2, v4, v3);
+                    CM_PlaneFromPoints(square->plane[1], v4, v2, v1);
+                }
+                CM_PickTerrainSquareMode(square, v1, i, j, patch);
+            } else {
+                if (patch->flags & TERPATCH_FLIP) {
+                    CM_PlaneFromPoints(square->plane[0], v1, v3, v4);
+                    CM_PlaneFromPoints(square->plane[1], v3, v1, v2);
+                } else {
+                    CM_PlaneFromPoints(square->plane[0], v3, v1, v4);
+                    CM_PlaneFromPoints(square->plane[1], v1, v3, v2);
+                }
+                CM_PickTerrainSquareMode(square, v2, i, j, patch);
+            }
+        }
+    }
+
+    tc->vBounds[0][0] = x0;
+    tc->vBounds[0][1] = y0;
+    tc->vBounds[0][2] = z0;
+    tc->vBounds[1][0] = (x0 + 512);
+    tc->vBounds[1][1] = (y0 + 512);
+    tc->vBounds[1][2] = fMaxHeight;
 }
 
 /*
@@ -352,40 +331,39 @@ void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc ) {
 CM_CheckTerrainPlane
 ====================
 */
-float CM_CheckTerrainPlane( vec4_t plane )
+float CM_CheckTerrainPlane(vec4_t plane)
 {
-	float	d1, d2;
-	float	f;
+    float d1, d2;
+    float f;
 
-	d1 = DotProduct( g_trace.vStart, plane ) - plane[ 3 ];
-	d2 = DotProduct( g_trace.vEnd, plane ) - plane[ 3 ];
+    d1 = DotProduct(g_trace.vStart, plane) - plane[3];
+    d2 = DotProduct(g_trace.vEnd, plane) - plane[3];
 
-	// if completely in front of face, no intersection with the entire brush
-	if( d1 > 0 && ( d2 >= SURFACE_CLIP_EPSILON || d2 >= d1 ) ) {
-		return 1;
-	}
+    // if completely in front of face, no intersection with the entire brush
+    if (d1 > 0 && (d2 >= SURFACE_CLIP_EPSILON || d2 >= d1)) {
+        return 1;
+    }
 
-	if( d1 <= 0 && d2 <= 0 )
-	{
-		if( d1 >= -32 ) {
-			return 0;
-		}
+    if (d1 <= 0 && d2 <= 0) {
+        if (d1 >= -32) {
+            return 0;
+        }
 
-		if( d2 >= -32 ) {
-			return 0;
-		}
-		return 1;
-	}
+        if (d2 >= -32) {
+            return 0;
+        }
+        return 1;
+    }
 
-	if( d1 <= d2 ) {
-		return 1;
-	}
+    if (d1 <= d2) {
+        return 1;
+    }
 
-	f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
-	if( f < 0 ) {
-		f = 0;
-	}
-	return f;
+    f = (d1 - SURFACE_CLIP_EPSILON) / (d1 - d2);
+    if (f < 0) {
+        f = 0;
+    }
+    return f;
 }
 
 /*
@@ -393,68 +371,64 @@ float CM_CheckTerrainPlane( vec4_t plane )
 CM_CheckTerrainTriSpherePoint
 ====================
 */
-float CM_CheckTerrainTriSpherePoint( vec3_t v )
+float CM_CheckTerrainTriSpherePoint(vec3_t v)
 {
-	vec3_t	vDelta, vDir;
-	float	fLenSq;
-	float	fRadSq;
-	float	fA, fB;
-	float	fDiscr;
-	float	fFrac;
-	float	fSq;
-	float	f;
+    vec3_t vDelta, vDir;
+    float  fLenSq;
+    float  fRadSq;
+    float  fA, fB;
+    float  fDiscr;
+    float  fFrac;
+    float  fSq;
+    float  f;
 
-	VectorSubtract( g_trace.vStart, v, vDir );
+    VectorSubtract(g_trace.vStart, v, vDir);
 
-	fRadSq = sphere.radius * sphere.radius;
-	fLenSq = VectorLengthSquared( vDir );
+    fRadSq = sphere.radius * sphere.radius;
+    fLenSq = VectorLengthSquared(vDir);
 
-	if( fLenSq <= fRadSq ) {
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		return 0;
-	}
+    if (fLenSq <= fRadSq) {
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        return 0;
+    }
 
-	VectorSubtract( g_trace.vEnd, g_trace.vStart, vDelta );
+    VectorSubtract(g_trace.vEnd, g_trace.vStart, vDelta);
 
-	fA = VectorLengthSquared( vDelta );
-	fB = DotProduct( vDelta, vDir );
-	fDiscr = fB * fB - ( fLenSq - fRadSq ) * fA;
+    fA     = VectorLengthSquared(vDelta);
+    fB     = DotProduct(vDelta, vDir);
+    fDiscr = fB * fB - (fLenSq - fRadSq) * fA;
 
-	if( fDiscr <= 0.0f ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fDiscr <= 0.0f) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fSq = sqrt( fDiscr );
+    fSq = sqrt(fDiscr);
 
-	if( fA > 0 )
-	{
-		fFrac = ( -fB - fSq ) / fA - g_trace.fSurfaceClipEpsilon;
+    if (fA > 0) {
+        fFrac = (-fB - fSq) / fA - g_trace.fSurfaceClipEpsilon;
 
-		if( fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction ) {
-			return fFrac;
-		}
+        if (fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction) {
+            return fFrac;
+        }
 
+        fFrac = -fB + fSq;
+    } else {
+        fFrac = (-fB + fSq) / fA - g_trace.fSurfaceClipEpsilon;
 
-		fFrac = -fB + fSq;
-	}
-	else
-	{
-		fFrac = ( -fB + fSq ) / fA - g_trace.fSurfaceClipEpsilon;
+        if (fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction) {
+            return fFrac;
+        }
 
-		if( fFrac >= 0.0f && fFrac <= g_trace.tw->trace.fraction ) {
-			return fFrac;
-		}
+        fFrac = -fB - fSq;
+    }
 
-		fFrac = -fB - fSq;
-	}
+    f = fFrac / fA - g_trace.fSurfaceClipEpsilon;
+    if (f < 0 || f > g_trace.tw->trace.fraction) {
+        f = g_trace.tw->trace.fraction;
+    }
 
-	f = fFrac / fA - g_trace.fSurfaceClipEpsilon;
-	if( f < 0 || f > g_trace.tw->trace.fraction ) {
-		f = g_trace.tw->trace.fraction;
-	}
-
-	return f;
+    return f;
 }
 
 /*
@@ -462,15 +436,15 @@ float CM_CheckTerrainTriSpherePoint( vec3_t v )
 CM_CheckTerrainTriSphereCorner
 ====================
 */
-float CM_CheckTerrainTriSphereCorner( vec4_t plane, float x0, float y0, int i, int j )
+float CM_CheckTerrainTriSphereCorner(vec4_t plane, float x0, float y0, int i, int j)
 {
-	vec3_t	v;
+    vec3_t v;
 
-	v[ 0 ] = ( ( i << 6 ) + x0 );
-	v[ 1 ] = ( ( j << 6 ) + y0 );
-	v[ 2 ] = ( plane[ 3 ] - ( v[ 1 ] * plane[ 1 ] + v[ 0 ] * plane[ 0 ] ) ) / plane[ 2 ];
+    v[0] = ((i << 6) + x0);
+    v[1] = ((j << 6) + y0);
+    v[2] = (plane[3] - (v[1] * plane[1] + v[0] * plane[0])) / plane[2];
 
-	return CM_CheckTerrainTriSpherePoint( v );
+    return CM_CheckTerrainTriSpherePoint(v);
 }
 
 /*
@@ -478,92 +452,91 @@ float CM_CheckTerrainTriSphereCorner( vec4_t plane, float x0, float y0, int i, i
 CM_CheckTerrainTriSphereEdge
 ====================
 */
-float CM_CheckTerrainTriSphereEdge( float *plane, float x0, float y0, int i0, int j0, int i1, int j1 )
+float CM_CheckTerrainTriSphereEdge(float *plane, float x0, float y0, int i0, int j0, int i1, int j1)
 {
-	vec3_t	v0, v1;
-	float	fScale;
-	float	fRadSq;
-	float	S, T;
-	vec3_t	vDeltaStart;
-	vec3_t	vDirEdge;
-	vec3_t	vDirTrace;
-	float	fSFromT_Const;
-	float	fSFromT_Scale;
-	vec3_t	vRFromT_Const;
-	vec3_t	vRFromT_Scale;
+    vec3_t v0, v1;
+    float  fScale;
+    float  fRadSq;
+    float  S, T;
+    vec3_t vDeltaStart;
+    vec3_t vDirEdge;
+    vec3_t vDirTrace;
+    float  fSFromT_Const;
+    float  fSFromT_Scale;
+    vec3_t vRFromT_Const;
+    vec3_t vRFromT_Scale;
 
-	// junk variable(s) as usual
-	float	fLengthSq, fDot;
-	float	fFrac, fFracClip;
+    // junk variable(s) as usual
+    float fLengthSq, fDot;
+    float fFrac, fFracClip;
 
-	fScale = 1.0 / plane[ 2 ];
+    fScale = 1.0 / plane[2];
 
-	v0[ 0 ] = ( i0 << 6 ) + x0;
-	v0[ 1 ] = ( j0 << 6 ) + y0;
-	v0[ 2 ] = ( plane[ 3 ] - ( v0[ 0 ] * plane[ 0 ] + v0[ 1 ] * plane[ 1 ] ) ) * fScale;
+    v0[0] = (i0 << 6) + x0;
+    v0[1] = (j0 << 6) + y0;
+    v0[2] = (plane[3] - (v0[0] * plane[0] + v0[1] * plane[1])) * fScale;
 
-	v1[ 0 ] = ( i1 << 6 ) + x0;
-	v1[ 1 ] = ( j1 << 6 ) + y0;
-	v1[ 2 ] = ( plane[ 3 ] - ( v1[ 0 ] * plane[ 0 ] + v1[ 1 ] * plane[ 1 ] ) ) * fScale;
+    v1[0] = (i1 << 6) + x0;
+    v1[1] = (j1 << 6) + y0;
+    v1[2] = (plane[3] - (v1[0] * plane[0] + v1[1] * plane[1])) * fScale;
 
-	VectorSubtract( g_trace.vStart, v0, vDirTrace );
-	VectorSubtract( v1, v0, vDirEdge );
-	VectorSubtract( g_trace.vEnd, g_trace.vStart, vDeltaStart );
+    VectorSubtract(g_trace.vStart, v0, vDirTrace);
+    VectorSubtract(v1, v0, vDirEdge);
+    VectorSubtract(g_trace.vEnd, g_trace.vStart, vDeltaStart);
 
-	fScale = 1.0 / VectorLengthSquared( vDirEdge );
-	S = DotProduct( vDirTrace, vDirEdge ) * fScale;
-	T = DotProduct( vDeltaStart, vDirEdge ) * fScale;
+    fScale = 1.0 / VectorLengthSquared(vDirEdge);
+    S      = DotProduct(vDirTrace, vDirEdge) * fScale;
+    T      = DotProduct(vDeltaStart, vDirEdge) * fScale;
 
-	VectorMA( vDirTrace, -S, vDirEdge, vRFromT_Const );
-	VectorMA( vDeltaStart, -T, vDirEdge, vRFromT_Scale );
+    VectorMA(vDirTrace, -S, vDirEdge, vRFromT_Const);
+    VectorMA(vDeltaStart, -T, vDirEdge, vRFromT_Scale);
 
-	fRadSq = sphere.radius * sphere.radius;
-	fLengthSq = VectorLengthSquared( vRFromT_Const );
+    fRadSq    = sphere.radius * sphere.radius;
+    fLengthSq = VectorLengthSquared(vRFromT_Const);
 
-	if( fLengthSq <= fRadSq )
-	{
-		if( S < 0 || S > 1 ) {
-			return CM_CheckTerrainTriSpherePoint( v0 );
-		}
+    if (fLengthSq <= fRadSq) {
+        if (S < 0 || S > 1) {
+            return CM_CheckTerrainTriSpherePoint(v0);
+        }
 
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		return 1;
-	}
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        return 1;
+    }
 
-	fDot = DotProduct( vRFromT_Scale, vRFromT_Const );
-	fSFromT_Scale = VectorLengthSquared( vRFromT_Scale );
-	fSFromT_Const = fDot * fDot - ( fLengthSq - fRadSq ) * fSFromT_Scale;
+    fDot          = DotProduct(vRFromT_Scale, vRFromT_Const);
+    fSFromT_Scale = VectorLengthSquared(vRFromT_Scale);
+    fSFromT_Const = fDot * fDot - (fLengthSq - fRadSq) * fSFromT_Scale;
 
-	if( fSFromT_Const <= 0 ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fSFromT_Const <= 0) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	if( fSFromT_Scale > 0 ) {
-		fFrac = ( -fDot - sqrt( fSFromT_Const ) ) / fSFromT_Scale;
-	} else {
-		fFrac = ( -fDot + sqrt( fSFromT_Const ) ) / fSFromT_Scale;
-	}
+    if (fSFromT_Scale > 0) {
+        fFrac = (-fDot - sqrt(fSFromT_Const)) / fSFromT_Scale;
+    } else {
+        fFrac = (-fDot + sqrt(fSFromT_Const)) / fSFromT_Scale;
+    }
 
-	fFracClip = fFrac - g_trace.fSurfaceClipEpsilon;
-	if( fFrac <= 0 || fFracClip >= g_trace.tw->trace.fraction ) {
-		return g_trace.tw->trace.fraction;
-	}
+    fFracClip = fFrac - g_trace.fSurfaceClipEpsilon;
+    if (fFrac <= 0 || fFracClip >= g_trace.tw->trace.fraction) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fFrac = fFrac * T + S;
+    fFrac = fFrac * T + S;
 
-	if( fFrac < 0 ) {
-		return CM_CheckTerrainTriSpherePoint( v0 );
-	}
+    if (fFrac < 0) {
+        return CM_CheckTerrainTriSpherePoint(v0);
+    }
 
-	if( fFrac > 1 ) {
-		return CM_CheckTerrainTriSpherePoint( v1 );
-	}
+    if (fFrac > 1) {
+        return CM_CheckTerrainTriSpherePoint(v1);
+    }
 
-	if( fFracClip < 0 ) {
-		fFracClip = 0;
-	}
-	return fFracClip;
+    if (fFracClip < 0) {
+        fFracClip = 0;
+    }
+    return fFracClip;
 }
 
 /*
@@ -571,200 +544,149 @@ float CM_CheckTerrainTriSphereEdge( float *plane, float x0, float y0, int i0, in
 CM_CheckTerrainTriSphere
 ====================
 */
-float CM_CheckTerrainTriSphere( float x0, float y0, int iPlane )
+float CM_CheckTerrainTriSphere(float x0, float y0, int iPlane)
 {
-	float	*plane;
-	float	fMaxFraction;
-	float	d1, d2;
-	float	fSpherePlane;
-	int		eMode;
-	qboolean	bFitsX, bFitsY;
-	qboolean	bFitsDiag;
-	int		iX[ 3 ];
-	int		iY[ 3 ];
+    float   *plane;
+    float    fMaxFraction;
+    float    d1, d2;
+    float    fSpherePlane;
+    int      eMode;
+    qboolean bFitsX, bFitsY;
+    qboolean bFitsDiag;
+    int      iX[3];
+    int      iY[3];
 
-	plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ iPlane ];
-	d1 = DotProduct( g_trace.vStart, plane ) - plane[ 3 ];
-	d2 = DotProduct( g_trace.vEnd, plane ) - plane[ 3 ];
+    plane = g_trace.tc->squares[g_trace.i][g_trace.j].plane[iPlane];
+    d1    = DotProduct(g_trace.vStart, plane) - plane[3];
+    d2    = DotProduct(g_trace.vEnd, plane) - plane[3];
 
-	if( d1 > sphere.radius )
-	{
-		if( d2 >= sphere.radius + SURFACE_CLIP_EPSILON ) {
-			return g_trace.tw->trace.fraction;
-		}
+    if (d1 > sphere.radius) {
+        if (d2 >= sphere.radius + SURFACE_CLIP_EPSILON) {
+            return g_trace.tw->trace.fraction;
+        }
 
-		if( d2 >= d1 ) {
-			return g_trace.tw->trace.fraction;	
-		}
-	}
+        if (d2 >= d1) {
+            return g_trace.tw->trace.fraction;
+        }
+    }
 
-	if( d1 <= -sphere.radius && d2 <= -sphere.radius ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (d1 <= -sphere.radius && d2 <= -sphere.radius) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	if( d1 <= d2 ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (d1 <= d2) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	fMaxFraction = SURFACE_CLIP_EPSILON / ( d1 - d2 );
-	g_trace.fSurfaceClipEpsilon = fMaxFraction;
-	fSpherePlane = ( d1 - sphere.radius ) / ( d1 - d2 ) - fMaxFraction;
+    fMaxFraction                = SURFACE_CLIP_EPSILON / (d1 - d2);
+    g_trace.fSurfaceClipEpsilon = fMaxFraction;
+    fSpherePlane                = (d1 - sphere.radius) / (d1 - d2) - fMaxFraction;
 
-	if( fSpherePlane < 0 ) {
-		fSpherePlane = 0;
-	}
+    if (fSpherePlane < 0) {
+        fSpherePlane = 0;
+    }
 
-	if( fSpherePlane >= g_trace.tw->trace.fraction ) {
-		return g_trace.tw->trace.fraction;
-	}
+    if (fSpherePlane >= g_trace.tw->trace.fraction) {
+        return g_trace.tw->trace.fraction;
+    }
 
-	d1 = ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] ) * fSpherePlane + g_trace.vEnd[ 0 ] - sphere.radius * plane[ 0 ] - x0;
-	d2 = ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] ) * fSpherePlane + g_trace.vEnd[ 1 ] - sphere.radius * plane[ 1 ] - y0;
+    d1 = (g_trace.vEnd[0] - g_trace.vStart[0]) * fSpherePlane + g_trace.vEnd[0] - sphere.radius * plane[0] - x0;
+    d2 = (g_trace.vEnd[1] - g_trace.vStart[1]) * fSpherePlane + g_trace.vEnd[1] - sphere.radius * plane[1] - y0;
 
-	eMode = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode;
+    eMode = g_trace.tc->squares[g_trace.i][g_trace.j].eMode;
 
-	if( eMode == 1 || eMode == 2 )
-	{
-		if( ( g_trace.i + g_trace.j ) & 1 ) {
-			eMode = iPlane ? 6 : 3;
-		} else {
-			eMode = iPlane ? 5 : 4;
-		}
-	}
+    if (eMode == 1 || eMode == 2) {
+        if ((g_trace.i + g_trace.j) & 1) {
+            eMode = iPlane ? 6 : 3;
+        } else {
+            eMode = iPlane ? 5 : 4;
+        }
+    }
 
-	switch( eMode )
-	{
-	case 3:
-		if( d1 > 64 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 > 64 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+    switch (eMode) {
+    case 3:
+        bFitsX = d1 <= 64;
+        bFitsY = d2 <= 64;
+        bFitsDiag = d1 >= 64 - d2;
 
-		if( d1 < 64 - d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 1;
-		iX[ 1 ] = 1;
-		iX[ 2 ] = 1;
-		iY[ 0 ] = 0;
-		iY[ 1 ] = 1;
-		iY[ 2 ] = 0;
-		break;
-	case 4:
-		if( d1 < 0 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 > 64 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        iX[0] = 1;
+        iX[1] = 0;
+        iX[2] = 1;
+        iY[0] = 1;
+        iY[1] = 1;
+        iY[2] = 0;
+        break;
+    case 4:
+        bFitsX = d1 >= 0;
+        bFitsY = d2 <= 64;
+        bFitsDiag = d1 <= d2;
 
-		if( d1 > d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 0;
-		iX[ 1 ] = 1;
-		iX[ 2 ] = 1;
-		iY[ 0 ] = 1;
-		iY[ 1 ] = 0;
-		iY[ 2 ] = 0;
-		break;
-	case 5:
-		if( d1 > 64 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 < 0 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        iX[0] = 0;
+        iX[1] = 1;
+        iX[2] = 0;
+        iY[0] = 1;
+        iY[1] = 1;
+        iY[2] = 0;
+        break;
+    case 5:
+        bFitsX = d1 <= 64;
+        bFitsY = d2 >= 0;
+        bFitsDiag = d1 >= d2;
 
-		if( d1 < d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 1;
-		iX[ 1 ] = 0;
-		iX[ 2 ] = 0;
-		iY[ 0 ] = 0;
-		iY[ 1 ] = 1;
-		iY[ 2 ] = 1;
-		break;
-	case 6:
-		if( d1 < 0 ) {
-			bFitsX = qfalse;
-		} else {
-			bFitsX = qtrue;
-		}
-		if( d2 < 0 ) {
-			bFitsY = qfalse;
-		} else {
-			bFitsY = qtrue;
-		}
+        iX[0] = 1;
+        iX[1] = 0;
+        iX[2] = 1;
+        iY[0] = 0;
+        iY[1] = 0;
+        iY[2] = 1;
+        break;
+    case 6:
+        bFitsX = d1 >= 0;
+        bFitsY = d2 >= 0;
+        bFitsDiag = d1 <= 64 - d2;
 
-		if( d1 > 64 - d2 ) {
-			bFitsDiag = qfalse;
-		} else {
-			bFitsDiag = qtrue;
-		}
-		iX[ 0 ] = 0;
-		iX[ 1 ] = 0;
-		iX[ 2 ] = 0;
-		iY[ 0 ] = 1;
-		iY[ 1 ] = 0;
-		iY[ 2 ] = 1;
-		break;
-	default:
-		return 0;
-	}
+        iX[0] = 0;
+        iX[1] = 1;
+        iX[2] = 0;
+        iY[0] = 0;
+        iY[1] = 0;
+        iY[2] = 1;
+        break;
+    default:
+        return 0;
+    }
 
-	if( bFitsX )
-	{
-		if( bFitsY )
-		{
-			if( bFitsDiag ) {
-				return fSpherePlane;
-			} else {
-				return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iY[ 0 ], iX[ 1 ], iY[ 1 ], iY[ 2 ] );
-			}
-		} else if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iX[ 0 ], iX[ 2 ], iY[ 0 ], iX[ 1 ] );
-		} else {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iY[ 0 ], iX[ 1 ] );
-		}
-	}
-	else if( bFitsY )
-	{
-		if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereEdge( plane, x0, y0, iX[ 0 ], iX[ 2 ], iY[ 1 ], iY[ 2 ] );
-		} else {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iY[ 1 ], iY[ 2 ] );
-		}
-	}
-	else
-	{
-		if( bFitsDiag ) {
-			return CM_CheckTerrainTriSphereCorner( plane, x0, y0, iX[ 0 ], iX[ 2 ] );
-		} else {
-			return g_trace.tw->trace.fraction;
-		}
-	}
+    if (bFitsX && bFitsY) {
+        if (bFitsDiag) {
+            return fSpherePlane;
+        }
+
+        return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[1], iY[1], iX[2], iY[2]);
+    }
+    
+    if (bFitsX && !bFitsY) {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[1], iY[1]);
+        }
+
+        return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[1], iY[1]);
+    }
+
+    if (!bFitsX && bFitsY) {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereEdge(plane, x0, y0, iX[0], iY[0], iX[2], iY[2]);
+        }
+
+        return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[2], iY[2]);
+    }
+
+    if (!bFitsX && !bFitsY) {
+        if (bFitsDiag) {
+            return CM_CheckTerrainTriSphereCorner(plane, x0, y0, iX[0], iY[0]);
+        }
+    }
+
+    return g_trace.tw->trace.fraction;
 }
 
 /*
@@ -772,24 +694,23 @@ float CM_CheckTerrainTriSphere( float x0, float y0, int iPlane )
 CM_ValidateTerrainCollidePointSquare
 ====================
 */
-qboolean CM_ValidateTerrainCollidePointSquare( float frac )
+qboolean CM_ValidateTerrainCollidePointSquare(float frac)
 {
-	float f;
+    float f;
 
-	f = g_trace.vStart[ 0 ] + frac * ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] )
-		- ( ( g_trace.i << 6 ) + g_trace.tc->vBounds[ 0 ][ 0 ] );
+    f = g_trace.vStart[0] + frac * (g_trace.vEnd[0] - g_trace.vStart[0])
+      - ((g_trace.i << 6) + g_trace.tc->vBounds[0][0]);
 
-	if( f >= 0 && f <= 64 )
-	{
-		f = g_trace.vStart[ 1 ] + frac * ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] )
-			- ( ( g_trace.j << 6 ) + g_trace.tc->vBounds[ 0 ][ 1 ] );
+    if (f >= 0 && f <= 64) {
+        f = g_trace.vStart[1] + frac * (g_trace.vEnd[1] - g_trace.vStart[1])
+          - ((g_trace.j << 6) + g_trace.tc->vBounds[0][1]);
 
-		if( f >= 0 && f <= 64 ) {
-			return qtrue;
-		}
-	}
+        if (f >= 0 && f <= 64) {
+            return qtrue;
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -797,49 +718,48 @@ qboolean CM_ValidateTerrainCollidePointSquare( float frac )
 CM_ValidateTerrainCollidePointTri
 ====================
 */
-qboolean CM_ValidateTerrainCollidePointTri( int eMode, float frac )
+qboolean CM_ValidateTerrainCollidePointTri(int eMode, float frac)
 {
-	float	x0, y0;
-	float	x, y;
-	float	dx, dy;
+    float x0, y0;
+    float x, y;
+    float dx, dy;
 
-	x0 = ( g_trace.i << 6 ) + g_trace.tc->vBounds[ 0 ][ 0 ];
-	dx = g_trace.vStart[ 0 ] + ( g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ] ) * frac;
-	x = x0 + 64;
+    x0 = (g_trace.i << 6) + g_trace.tc->vBounds[0][0];
+    dx = g_trace.vStart[0] + (g_trace.vEnd[0] - g_trace.vStart[0]) * frac;
+    x  = x0 + 64;
 
-	if( x0 > dx ) {
-		return qfalse;
-	}
+    if (x0 > dx) {
+        return qfalse;
+    }
 
-	if( x < dx ) {
-		return qfalse;
-	}
+    if (x < dx) {
+        return qfalse;
+    }
 
-	y0 = ( g_trace.j << 6 ) + g_trace.tc->vBounds[ 0 ][ 1 ];
-	dy = g_trace.vStart[ 1 ] + ( g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ] ) * frac;
-	y = y0 + 64;
+    y0 = (g_trace.j << 6) + g_trace.tc->vBounds[0][1];
+    dy = g_trace.vStart[1] + (g_trace.vEnd[1] - g_trace.vStart[1]) * frac;
+    y  = y0 + 64;
 
-	if( y0 > dy ) {
-		return qfalse;
-	}
+    if (y0 > dy) {
+        return qfalse;
+    }
 
-	if( y < dy ) {
-		return qfalse;
-	}
+    if (y < dy) {
+        return qfalse;
+    }
 
-	switch( eMode )
-	{
-	case 3:
-		return ( dx - x0 ) >= ( 64 - ( dy - y0 ) );
-	case 4:
-		return ( dx - x0 ) <= ( dy - y0 );
-	case 5:
-		return ( dx - x0 ) >= ( dy - y0 );
-	case 6:
-		return ( dx - x0 ) <= ( 64 - ( dy - y0 ) );
-	default:
-		return qtrue;
-	}
+    switch (eMode) {
+    case 3:
+        return (dx - x0) >= (64 - (dy - y0));
+    case 4:
+        return (dx - x0) <= (dy - y0);
+    case 5:
+        return (dx - x0) >= (dy - y0);
+    case 6:
+        return (dx - x0) <= (64 - (dy - y0));
+    default:
+        return qtrue;
+    }
 }
 
 /*
@@ -847,63 +767,55 @@ qboolean CM_ValidateTerrainCollidePointTri( int eMode, float frac )
 CM_TestTerrainCollideSquare
 ====================
 */
-qboolean CM_TestTerrainCollideSquare( void )
+qboolean CM_TestTerrainCollideSquare(void)
 {
-	float	*plane;
-	float	frac0;
-	float	enterFrac;
-	int		eMode;
+    float *plane;
+    float  frac0;
+    float  enterFrac;
+    int    eMode;
 
-	eMode = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode;
+    eMode = g_trace.tc->squares[g_trace.i][g_trace.j].eMode;
 
-	if( !eMode ) {
-		return qfalse;
-	}
+    if (!eMode) {
+        return qfalse;
+    }
 
-	if( eMode >= 0 && eMode <= 2 )
-	{
-		enterFrac = CM_CheckTerrainPlane( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ] );
+    if (eMode >= 0 && eMode <= 2) {
+        enterFrac = CM_CheckTerrainPlane(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0]);
 
-		plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ];
-		frac0 = CM_CheckTerrainPlane( plane );
+        plane = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1];
+        frac0 = CM_CheckTerrainPlane(plane);
 
-		if( eMode == 2 )
-		{
-			if( enterFrac > frac0 ) {
-				enterFrac = frac0;
-			}
-		}
-		else
-		{
-			if( enterFrac < frac0 ) {
-				enterFrac = frac0;
-			}
-		}
+        if (eMode == 2) {
+            if (enterFrac > frac0) {
+                enterFrac = frac0;
+            }
+        } else {
+            if (enterFrac < frac0) {
+                enterFrac = frac0;
+            }
+        }
 
-		if( enterFrac < g_trace.tw->trace.fraction && CM_ValidateTerrainCollidePointSquare( enterFrac ) )
-		{
-			g_trace.tw->trace.fraction = enterFrac;
-			VectorCopy( plane, g_trace.tw->trace.plane.normal );
-			g_trace.tw->trace.plane.dist = plane[ 3 ];
-			return qtrue;
-		}
-	}
-	else
-	{
-		plane = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ];
-		enterFrac = CM_CheckTerrainPlane( plane );
+        if (enterFrac < g_trace.tw->trace.fraction && CM_ValidateTerrainCollidePointSquare(enterFrac)) {
+            g_trace.tw->trace.fraction = enterFrac;
+            VectorCopy(plane, g_trace.tw->trace.plane.normal);
+            g_trace.tw->trace.plane.dist = plane[3];
+            return qtrue;
+        }
+    } else {
+        plane     = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0];
+        enterFrac = CM_CheckTerrainPlane(plane);
 
-		if( enterFrac < g_trace.tw->trace.fraction
-			&& CM_ValidateTerrainCollidePointTri( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].eMode, enterFrac ) )
-		{
-			g_trace.tw->trace.fraction = enterFrac;
-			VectorCopy( plane, g_trace.tw->trace.plane.normal );
-			g_trace.tw->trace.plane.dist = plane[ 3 ];
-			return qtrue;
-		}
-	}
+        if (enterFrac < g_trace.tw->trace.fraction
+            && CM_ValidateTerrainCollidePointTri(g_trace.tc->squares[g_trace.i][g_trace.j].eMode, enterFrac)) {
+            g_trace.tw->trace.fraction = enterFrac;
+            VectorCopy(plane, g_trace.tw->trace.plane.normal);
+            g_trace.tw->trace.plane.dist = plane[3];
+            return qtrue;
+        }
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -911,63 +823,54 @@ qboolean CM_TestTerrainCollideSquare( void )
 CM_CheckStartInsideTerrain
 ====================
 */
-static qboolean CM_CheckStartInsideTerrain( int i, int j, float fx, float fy )
+static qboolean CM_CheckStartInsideTerrain(int i, int j, float fx, float fy)
 {
-	float	*plane;
-	float	fDot;
+    float *plane;
+    float  fDot;
 
-	if( i < 0 || i > 7 ) {
-		return qfalse;
-	}
-	if( j < 0 || j > 7 ) {
-		return qfalse;
-	}
+    if (i < 0 || i > 7) {
+        return qfalse;
+    }
+    if (j < 0 || j > 7) {
+        return qfalse;
+    }
 
-	if( !g_trace.tc->squares[ i ][ j ].eMode ) {
-		return qfalse;
-	}
+    if (!g_trace.tc->squares[i][j].eMode) {
+        return qfalse;
+    }
 
-	if( ( i + j ) & 1 )
-	{
-		if( fx + fy >= 1 )
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 6 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 0 ];
-		}
-		else
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 3 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 1 ];
-		}
-	}
-	else
-	{
-		if( fy >= fx )
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 5 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 0 ];
-		}
-		else
-		{
-			if( g_trace.tc->squares[ i ][ j ].eMode == 4 ) {
-				return qfalse;
-			}
-			plane = g_trace.tc->squares[ i ][ j ].plane[ 1 ];
-		}
-	}
+    if ((i + j) & 1) {
+        if (fx + fy >= 1) {
+            if (g_trace.tc->squares[i][j].eMode == 6) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[0];
+        } else {
+            if (g_trace.tc->squares[i][j].eMode == 3) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[1];
+        }
+    } else {
+        if (fy >= fx) {
+            if (g_trace.tc->squares[i][j].eMode == 5) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[0];
+        } else {
+            if (g_trace.tc->squares[i][j].eMode == 4) {
+                return qfalse;
+            }
+            plane = g_trace.tc->squares[i][j].plane[1];
+        }
+    }
 
-	fDot = DotProduct( g_trace.vStart, plane );
-	if( fDot <= plane[ 3 ] && fDot + 32.0f >= plane[ 3 ] ) {
-		return qtrue;
-	}
+    fDot = DotProduct(g_trace.vStart, plane);
+    if (fDot <= plane[3] && fDot + 32.0f >= plane[3]) {
+        return qtrue;
+    }
 
-	return qfalse;
+    return qfalse;
 }
 
 /*
@@ -975,18 +878,18 @@ static qboolean CM_CheckStartInsideTerrain( int i, int j, float fx, float fy )
 CM_PositionTestPointInTerrainCollide
 ====================
 */
-qboolean CM_PositionTestPointInTerrainCollide( void )
+qboolean CM_PositionTestPointInTerrainCollide(void)
 {
-	int		i0, j0;
-	float	fx, fy;
+    int   i0, j0;
+    float fx, fy;
 
-	fx = ( g_trace.vStart[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	fy = ( g_trace.vStart[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
 
-	i0 = ( int )floor( fx );
-	j0 = ( int )floor( fy );
+    i0 = (int)floor(fx);
+    j0 = (int)floor(fy);
 
-	return CM_CheckStartInsideTerrain( i0, j0, fx - i0, fy - j0 );
+    return CM_CheckStartInsideTerrain(i0, j0, fx - i0, fy - j0);
 }
 
 /*
@@ -994,185 +897,168 @@ qboolean CM_PositionTestPointInTerrainCollide( void )
 CM_TracePointThroughTerrainCollide
 ====================
 */
-void CM_TracePointThroughTerrainCollide( void )
+void CM_TracePointThroughTerrainCollide(void)
 {
-	int i0, j0, i1, j1;
-	int di, dj;
-	int d1, d2;
-	//int nTotal;
-	float fx, fy;
-	float dx, dy, dx2, dy2;
+    int i0, j0, i1, j1;
+    int di, dj;
+    int d1, d2;
+    //int nTotal;
+    float fx, fy;
+    float dx, dy, dx2, dy2;
 
-	fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
-	fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
-	i0 = (int64_t)floor(fx);
-	j0 = (int64_t)floor(fy);
-	i1 = (int64_t)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
-	j1 = (int64_t)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
+    i0 = (int64_t)floor(fx);
+    j0 = (int64_t)floor(fy);
+    i1 = (int64_t)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int64_t)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	const float dfx = fx - i0;
-	const float dfy = fy - j0;
+    const float dfx = fx - i0;
+    const float dfy = fy - j0;
 
-	if (CM_CheckStartInsideTerrain(i0, j0, dfx, dfy))
-	{
-		g_trace.tw->trace.startsolid = qtrue;
-		g_trace.tw->trace.allsolid = qtrue;
-		g_trace.tw->trace.fraction = 0;
-		return;
-	}
+    if (CM_CheckStartInsideTerrain(i0, j0, dfx, dfy)) {
+        g_trace.tw->trace.startsolid = qtrue;
+        g_trace.tw->trace.allsolid   = qtrue;
+        g_trace.tw->trace.fraction   = 0;
+        return;
+    }
 
-	if (i0 == i1)
-	{
-		if (i0 < 0 || i0 > 7) {
-			return;
-		}
+    if (i0 == i1) {
+        if (i0 < 0 || i0 > 7) {
+            return;
+        }
 
-		if (j0 == j1)
-		{
-			if (j0 < 0 || j0 > 7) {
-				return;
-			}
+        if (j0 == j1) {
+            if (j0 < 0 || j0 > 7) {
+                return;
+            }
 
-			g_trace.i = i0;
-			g_trace.j = j0;
-			CM_TestTerrainCollideSquare();
-		}
-		else if (j0 >= j1)
-		{
-			if (j0 > 7)
-				j0 = 7;
-			if (j1 < 0)
-				j1 = 0;
+            g_trace.i = i0;
+            g_trace.j = j0;
+            CM_TestTerrainCollideSquare();
+        } else if (j0 >= j1) {
+            if (j0 > 7) {
+                j0 = 7;
+            }
+            if (j1 < 0) {
+                j1 = 0;
+            }
 
-			g_trace.i = i0;
-			for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
-		}
-		else
-		{
-			if (j0 < 0)
-				j0 = 0;
-			if (j1 > 7)
-				j1 = 7;
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
+        } else {
+            if (j0 < 0) {
+                j0 = 0;
+            }
+            if (j1 > 7) {
+                j1 = 7;
+            }
 
-			g_trace.i = i0;
-			for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
-		}
-	}
-	else if (j0 == j1)
-	{
-		if (j0 < 0 || j0 > 7) {
-			return;
-		}
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
+        }
+    } else if (j0 == j1) {
+        if (j0 < 0 || j0 > 7) {
+            return;
+        }
 
-		if (i0 >= i1)
-		{
-			if (i0 > 7)
-				i0 = 7;
-			if (i1 < 0)
-				i1 = 0;
+        if (i0 >= i1) {
+            if (i0 > 7) {
+                i0 = 7;
+            }
+            if (i1 < 0) {
+                i1 = 0;
+            }
 
-			g_trace.j = j0;
-			for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
-				if (CM_TestTerrainCollideSquare()) {
-					break;
-				}
-			}
-		}
-		else
-		{
-			if (i0 < 0)
-				i0 = 0;
-			if (i1 > 7)
-				i1 = 7;
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    break;
+                }
+            }
+        } else {
+            if (i0 < 0) {
+                i0 = 0;
+            }
+            if (i1 > 7) {
+                i1 = 7;
+            }
 
-			g_trace.j = j0;
-			for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
-				if (CM_TestTerrainCollideSquare()) {
-					break;
-				}
-			}
-		}
-	}
-	else
-	{
-		dx = g_trace.vEnd[0] - g_trace.vStart[0];
-		dy = g_trace.vEnd[1] - g_trace.vStart[1];
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    break;
+                }
+            }
+        }
+    } else {
+        dx = g_trace.vEnd[0] - g_trace.vStart[0];
+        dy = g_trace.vEnd[1] - g_trace.vStart[1];
 
-		// Fix
-		//==
-		// The original compares if delta float is zero
-		// not only it's slower, but it can be problematic if those floats are NaN
-		//==
-		if (i1 > i0)
-		{
-			// dx positive
-			d1 = 1;
-			di = i1 - i0;
-			dx2 = (i0 + 1 - fx) * dy;
-		}
-		else
-		{
-			d1 = -1;
-			di = i0 - i1;
-			dx = -dx;
-			dx2 = dfx * dy;
-		}
+        // Fix
+        //==
+        // The original compares if delta float is zero
+        // not only it's slower, but it can be problematic if those floats are NaN
+        //==
+        if (i1 > i0) {
+            // dx positive
+            d1  = 1;
+            di  = i1 - i0;
+            dx2 = (i0 + 1 - fx) * dy;
+        } else {
+            d1  = -1;
+            di  = i0 - i1;
+            dx  = -dx;
+            dx2 = dfx * dy;
+        }
 
-		if (j1 > j0)
-		{
-			// dy positive
-			d2 = 1;
-			dj = di + j1 - j0 + 1;
-			dy2 = (j0 + 1 - fy) * dx;
-		}
-		else
-		{
-			d2 = -1;
-			dy = -dy;
-			dj = di + j0 - j1 + 1;
-			dy2 = dfy * dx;
-			dx2 = -dx2;
-		}
+        if (j1 > j0) {
+            // dy positive
+            d2  = 1;
+            dj  = di + j1 - j0 + 1;
+            dy2 = (j0 + 1 - fy) * dx;
+        } else {
+            d2  = -1;
+            dy  = -dy;
+            dj  = di + j0 - j1 + 1;
+            dy2 = dfy * dx;
+            dx2 = -dx2;
+        }
 
-		g_trace.i = i0;
-		g_trace.j = j0;
+        g_trace.i = i0;
+        g_trace.j = j0;
 
-		while (1)
-		{
-			if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7)
-			{
-				if (CM_TestTerrainCollideSquare()) {
-					return;
-				}
-			}
+        while (1) {
+            if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return;
+                }
+            }
 
-			dj--;
-			if (!dj) {
-				break;
-			}
+            dj--;
+            if (!dj) {
+                break;
+            }
 
-			if (dx2 < dy2)
-			{
-				dy2 -= dx2;
-				dx2 = dy;
-				g_trace.i += d1;
-			}
-			else
-			{
-				dx2 -= dy2;
-				dy2 = dx;
-				g_trace.j += d2;
-			}
-		}
-	}
+            if (dx2 < dy2) {
+                dy2 -= dx2;
+                dx2 = dy;
+                g_trace.i += d1;
+            } else {
+                dx2 -= dy2;
+                dy2 = dx;
+                g_trace.j += d2;
+            }
+        }
+    }
 }
 
 /*
@@ -1180,87 +1066,88 @@ void CM_TracePointThroughTerrainCollide( void )
 CM_TraceCylinderThroughTerrainCollide
 ====================
 */
-void CM_TraceCylinderThroughTerrainCollide( traceWork_t *tw, const terrainCollide_t *tc )
+void CM_TraceCylinderThroughTerrainCollide(traceWork_t *tw, const terrainCollide_t *tc)
 {
-	int i0, j0, i1, j1;
-	float x0, y0;
-	float enterFrac;
+    int   i0, j0, i1, j1;
+    float x0, y0;
+    float enterFrac;
 
-	i0 = ( int )( floor( tw->bounds[ 0 ][ 0 ] - tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	i1 = ( int )( floor( tw->bounds[ 1 ][ 0 ] - tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j0 = ( int )( floor( tw->bounds[ 0 ][ 1 ] - tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j1 = ( int )( floor( tw->bounds[ 1 ][ 1 ] - tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
+    i0 = (int)(floor(tw->bounds[0][0] - tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    i1 = (int)(floor(tw->bounds[1][0] - tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j0 = (int)(floor(tw->bounds[0][1] - tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int)(floor(tw->bounds[1][1] - tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	if( i0 < 0 )
-		i0 = 0;
-	if( j0 < 0 )
-		j0 = 0;
-	if( i1 > 7 )
-		i1 = 7;
-	if( j1 > 7 )
-		j1 = 7;
+    if (i0 < 0) {
+        i0 = 0;
+    }
+    if (j0 < 0) {
+        j0 = 0;
+    }
+    if (i1 > 7) {
+        i1 = 7;
+    }
+    if (j1 > 7) {
+        j1 = 7;
+    }
 
-	y0 = ( j0 << 6 ) + tc->vBounds[ 0 ][ 1 ];
-	for( g_trace.j = j0; g_trace.j <= j1; g_trace.j++ )
-	{
-		x0 = ( i0 << 6 ) + tc->vBounds[ 0 ][ 0 ];
-		for( g_trace.i = i0; g_trace.i <= i1; g_trace.i++ )
-		{
-			switch( tc->squares[ g_trace.i ][ g_trace.j ].eMode )
-			{
-			case 1:
-			case 2:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 0 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ][ 3 ];
-				}
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 1 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ][ 3 ];
-				}
-				break;
-			case 3:	
-			case 4:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 0 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 0 ][ 3 ];
-				}
-				break;
-			case 5:
-			case 6:
-				enterFrac = CM_CheckTerrainTriSphere( x0, y0, 1 );
-				if( enterFrac < 0 )
-					enterFrac = 0;
-				if( enterFrac < g_trace.tw->trace.fraction )
-				{
-					g_trace.tw->trace.fraction = enterFrac;
-					VectorCopy( g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ], g_trace.tw->trace.plane.normal );
-					g_trace.tw->trace.plane.dist = g_trace.tc->squares[ g_trace.i ][ g_trace.j ].plane[ 1 ][ 3 ];
-				}
-				break;
-			default:
-				break;
-			}
-			x0 += 64;
-		}
+    y0 = (j0 << 6) + tc->vBounds[0][1];
+    for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+        x0 = (i0 << 6) + tc->vBounds[0][0];
+        for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+            switch (tc->squares[g_trace.i][g_trace.j].eMode) {
+            case 1:
+            case 2:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 0);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0][3];
+                }
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 1);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[1], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1][3];
+                }
+                break;
+            case 3:
+            case 4:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 0);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[0], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[0][3];
+                }
+                break;
+            case 5:
+            case 6:
+                enterFrac = CM_CheckTerrainTriSphere(x0, y0, 1);
+                if (enterFrac < 0) {
+                    enterFrac = 0;
+                }
+                if (enterFrac < g_trace.tw->trace.fraction) {
+                    g_trace.tw->trace.fraction = enterFrac;
+                    VectorCopy(g_trace.tc->squares[g_trace.i][g_trace.j].plane[1], g_trace.tw->trace.plane.normal);
+                    g_trace.tw->trace.plane.dist = g_trace.tc->squares[g_trace.i][g_trace.j].plane[1][3];
+                }
+                break;
+            default:
+                break;
+            }
+            x0 += 64;
+        }
 
-		y0 += 64;
-	}
+        y0 += 64;
+    }
 }
 
 /*
@@ -1268,65 +1155,58 @@ void CM_TraceCylinderThroughTerrainCollide( traceWork_t *tw, const terrainCollid
 CM_TraceThroughTerrainCollide
 ====================
 */
-void CM_TraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
-	int i;
+void CM_TraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
+{
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return;
+    }
 
-	if( sphere.use && cm_ter_usesphere->integer )
-	{
-		VectorSubtract( tw->start, sphere.offset, g_trace.vStart );
-		VectorSubtract( tw->end, sphere.offset, g_trace.vEnd );
-		CM_TraceCylinderThroughTerrainCollide( tw, tc );
-	}
-	else if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		CM_TracePointThroughTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return;
+    }
 
-				CM_TracePointThroughTerrainCollide();
-				if( tw->trace.allsolid ) {
-					return;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-				CM_TracePointThroughTerrainCollide();
-				if( tw->trace.allsolid ) {
-					return;
-				}
-			}
-		}
-	}
+    if (sphere.use && cm_ter_usesphere->integer) {
+        VectorSubtract(tw->start, sphere.offset, g_trace.vStart);
+        VectorSubtract(tw->end, sphere.offset, g_trace.vEnd);
+        CM_TraceCylinderThroughTerrainCollide(tw, tc);
+    } else if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        CM_TracePointThroughTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
+
+                CM_TracePointThroughTerrainCollide();
+                if (tw->trace.allsolid) {
+                    return;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
+
+                CM_TracePointThroughTerrainCollide();
+                if (tw->trace.allsolid) {
+                    return;
+                }
+            }
+        }
+    }
 }
 
 /*
@@ -1334,66 +1214,59 @@ void CM_TraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
 CM_PositionTestInTerrainCollide
 ====================
 */
-qboolean CM_PositionTestInTerrainCollide( traceWork_t *tw, terrainCollide_t *tc ) {
-	int i;
+qboolean CM_PositionTestInTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
+{
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return qfalse;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return qfalse;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return qfalse;
+    }
 
-	if( sphere.use && cm_ter_usesphere->integer )
-	{
-		VectorSubtract( tw->start, sphere.offset, g_trace.vStart );
-		VectorSubtract( tw->end, sphere.offset, g_trace.vEnd );
-		CM_TraceCylinderThroughTerrainCollide( tw, tc );
-		return tw->trace.startsolid;
-	}
-	else if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		return CM_PositionTestPointInTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qfalse;
+    }
 
-				if( CM_PositionTestPointInTerrainCollide() ) {
-					return qtrue;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-				if( CM_PositionTestPointInTerrainCollide() ) {
-					return qtrue;
-				}
-			}
-		}
-	}
+    if (sphere.use && cm_ter_usesphere->integer) {
+        VectorSubtract(tw->start, sphere.offset, g_trace.vStart);
+        VectorSubtract(tw->end, sphere.offset, g_trace.vEnd);
+        CM_TraceCylinderThroughTerrainCollide(tw, tc);
+        return tw->trace.startsolid;
+    } else if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        return CM_PositionTestPointInTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-	return qfalse;
+                if (CM_PositionTestPointInTerrainCollide()) {
+                    return qtrue;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
+
+                if (CM_PositionTestPointInTerrainCollide()) {
+                    return qtrue;
+                }
+            }
+        }
+    }
+
+    return qfalse;
 }
 
 /*
@@ -1401,173 +1274,157 @@ qboolean CM_PositionTestInTerrainCollide( traceWork_t *tw, terrainCollide_t *tc
 CM_SightTracePointThroughTerrainCollide
 ====================
 */
-qboolean CM_SightTracePointThroughTerrainCollide( void )
+qboolean CM_SightTracePointThroughTerrainCollide(void)
 {
-	int		i0, j0;
-	int		i1, j1;
-	int		di, dj;
-	float	fx, fy;
-	float	dx, dy, dx2, dy2;
-	float	d1, d2;
+    int   i0, j0;
+    int   i1, j1;
+    int   di, dj;
+    float fx, fy;
+    float dx, dy, dx2, dy2;
+    float d1, d2;
 
-	fx = ( g_trace.vStart[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	fy = ( g_trace.vStart[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 );
-	i0 = ( int )floor( fx );
-	j0 = ( int )floor( fy );
-	i1 = ( int )floor( ( g_trace.vEnd[ 0 ] - g_trace.tc->vBounds[ 0 ][ 0 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
-	j1 = ( int )floor( ( g_trace.vEnd[ 1 ] - g_trace.tc->vBounds[ 0 ][ 1 ] ) * ( SURFACE_CLIP_EPSILON / 8 ) );
+    fx = (g_trace.vStart[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8);
+    fy = (g_trace.vStart[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8);
+    i0 = (int)floor(fx);
+    j0 = (int)floor(fy);
+    i1 = (int)floor((g_trace.vEnd[0] - g_trace.tc->vBounds[0][0]) * (SURFACE_CLIP_EPSILON / 8));
+    j1 = (int)floor((g_trace.vEnd[1] - g_trace.tc->vBounds[0][1]) * (SURFACE_CLIP_EPSILON / 8));
 
-	if( CM_CheckStartInsideTerrain( i0, j0, fx - i0, fy - j0 ) ) {
-		return qfalse;
-	}
+    if (CM_CheckStartInsideTerrain(i0, j0, fx - i0, fy - j0)) {
+        return qfalse;
+    }
 
-	if( i0 == i1 )
-	{
-		if( i0 < 0 || i0 > 7 ) {
-			return qtrue;
-		}
+    if (i0 == i1) {
+        if (i0 < 0 || i0 > 7) {
+            return qtrue;
+        }
 
-		if( j0 == j1 )
-		{
-			if( j0 < 0 || j0 > 7 ) {
-				return qtrue;
-			}
+        if (j0 == j1) {
+            if (j0 < 0 || j0 > 7) {
+                return qtrue;
+            }
 
-			g_trace.i = i0;
-			g_trace.j = j0;
-			return !CM_TestTerrainCollideSquare();
-		}
-		else if( j0 >= j1 )
-		{
-			if( j0 > 7 )
-				j0 = 7;
-			if( j1 < 0 )
-				j1 = 0;
+            g_trace.i = i0;
+            g_trace.j = j0;
+            return !CM_TestTerrainCollideSquare();
+        } else if (j0 >= j1) {
+            if (j0 > 7) {
+                j0 = 7;
+            }
+            if (j1 < 0) {
+                j1 = 0;
+            }
 
-			g_trace.i = i0;
-			for( g_trace.j = j0; g_trace.j >= j1; g_trace.j-- ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			if( j0 < 0 )
-				j0 = 0;
-			if( j1 > 7 )
-				j1 = 7;
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j >= j1; g_trace.j--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            if (j0 < 0) {
+                j0 = 0;
+            }
+            if (j1 > 7) {
+                j1 = 7;
+            }
 
-			g_trace.i = i0;
-			for( g_trace.j = j0; g_trace.j <= j1; g_trace.j++ ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
-	else if( j0 == j1 )
-	{
-		if( j0 < 0 || j0 > 7 ) {
-			return qtrue;
-		}
+            g_trace.i = i0;
+            for (g_trace.j = j0; g_trace.j <= j1; g_trace.j++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        }
+    } else if (j0 == j1) {
+        if (j0 < 0 || j0 > 7) {
+            return qtrue;
+        }
 
-		if( i0 >= i1 )
-		{
-			if( i0 > 7 )
-				i0 = 7;
-			if( i1 < 0 )
-				i1 = 0;
+        if (i0 >= i1) {
+            if (i0 > 7) {
+                i0 = 7;
+            }
+            if (i1 < 0) {
+                i1 = 0;
+            }
 
-			g_trace.j = j0;
-			for( g_trace.i = i0; g_trace.i >= i1; g_trace.i-- ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			if( i0 < 0 )
-				i0 = 0;
-			if( i1 > 7 )
-				i1 = 7;
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i >= i1; g_trace.i--) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            if (i0 < 0) {
+                i0 = 0;
+            }
+            if (i1 > 7) {
+                i1 = 7;
+            }
 
-			g_trace.j = j0;
-			for( g_trace.i = i0; g_trace.i <= i1; g_trace.i++ ) {
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
-	else
-	{
-		dx = g_trace.vEnd[ 0 ] - g_trace.vStart[ 0 ];
-		dy = g_trace.vEnd[ 1 ] - g_trace.vStart[ 1 ];
+            g_trace.j = j0;
+            for (g_trace.i = i0; g_trace.i <= i1; g_trace.i++) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
+        }
+    } else {
+        dx = g_trace.vEnd[0] - g_trace.vStart[0];
+        dy = g_trace.vEnd[1] - g_trace.vStart[1];
 
-		if( dx > 0 )
-		{
-			d1 = 1;
-			di = i1 - i0;
-			dx2 = ( i0 + 1 - fx ) * dy;
-		}
-		else
-		{
-			d1 = -1;
-			di = i0 - i1;
-			dx = -dx;
-			dx2 = ( fx - i0 ) * dy;
-		}
+        if (dx > 0) {
+            d1  = 1;
+            di  = i1 - i0;
+            dx2 = (i0 + 1 - fx) * dy;
+        } else {
+            d1  = -1;
+            di  = i0 - i1;
+            dx  = -dx;
+            dx2 = (fx - i0) * dy;
+        }
 
-		if( dy > 0 )
-		{
-			d2 = 1;
-			dj = di + j1 - j0 + 1;
-			dy2 = ( j0 + 1 - fy ) * dx;
-		}
-		else
-		{
-			d2 = -1;
-			dy = -dy;
-			dj = di + j0 - j1 + 1;
-			dy2 = ( fy - j0 ) * dx;
-			dx2 = -dx2;
-		}
+        if (dy > 0) {
+            d2  = 1;
+            dj  = di + j1 - j0 + 1;
+            dy2 = (j0 + 1 - fy) * dx;
+        } else {
+            d2  = -1;
+            dy  = -dy;
+            dj  = di + j0 - j1 + 1;
+            dy2 = (fy - j0) * dx;
+            dx2 = -dx2;
+        }
 
-		g_trace.i = i0;
-		g_trace.j = j0;
+        g_trace.i = i0;
+        g_trace.j = j0;
 
-		while( 1 )
-		{
-			if( g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7 )
-			{
-				if( CM_TestTerrainCollideSquare() ) {
-					return qfalse;
-				}
-			}
+        while (1) {
+            if (g_trace.i >= 0 && g_trace.i <= 7 && g_trace.j >= 0 && g_trace.j <= 7) {
+                if (CM_TestTerrainCollideSquare()) {
+                    return qfalse;
+                }
+            }
 
-			dj--;
-			if( !dj ) {
-				break;
-			}
+            dj--;
+            if (!dj) {
+                break;
+            }
 
-			if( dx2 < dy2 )
-			{
-				dy2 -= dx2;
-				dx2 = dy;
-				g_trace.i += d1;
-			}
-			else
-			{
-				dx2 -= dy2;
-				dy2 = dx;
-				g_trace.j += d2;
-			}
-		}
-	}
+            if (dx2 < dy2) {
+                dy2 -= dx2;
+                dx2 = dy;
+                g_trace.i += d1;
+            } else {
+                dx2 -= dy2;
+                dy2 = dx;
+                g_trace.j += d2;
+            }
+        }
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 /*
@@ -1575,60 +1432,54 @@ qboolean CM_SightTracePointThroughTerrainCollide( void )
 CM_SightTraceThroughTerrainCollide
 ====================
 */
-qboolean CM_SightTraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *tc )
+qboolean CM_SightTraceThroughTerrainCollide(traceWork_t *tw, terrainCollide_t *tc)
 {
-	int i;
+    int i;
 
-	if( tw->bounds[ 0 ][ 0 ] >= tc->vBounds[ 1 ][ 0 ] ||
-		tw->bounds[ 0 ][ 1 ] >= tc->vBounds[ 1 ][ 1 ] ||
-		tw->bounds[ 0 ][ 2 ] >= tc->vBounds[ 1 ][ 2 ] ||
-		tw->bounds[ 1 ][ 0 ] <= tc->vBounds[ 0 ][ 0 ] ||
-		tw->bounds[ 1 ][ 1 ] <= tc->vBounds[ 0 ][ 1 ] ||
-		tw->bounds[ 1 ][ 2 ] <= tc->vBounds[ 0 ][ 2 ] )
-	{
-		return qtrue;
-	}
+    if (tw->bounds[0][0] >= tc->vBounds[1][0] || tw->bounds[1][0] <= tc->vBounds[0][0]) {
+        return qfalse;
+    }
 
-	g_trace.tw = tw;
-	g_trace.tc = tc;
-	VectorCopy( tw->start, g_trace.vStart );
-	VectorCopy( tw->end, g_trace.vEnd );
+    if (tw->bounds[0][1] >= tc->vBounds[1][1] || tw->bounds[1][1] <= tc->vBounds[0][1]) {
+        return qfalse;
+    }
 
-	if( tw->isPoint )
-	{
-		VectorCopy( tw->start, g_trace.vStart );
-		VectorCopy( tw->end, g_trace.vEnd );
-		return CM_SightTracePointThroughTerrainCollide();
-	}
-	else
-	{
-		if( tc->squares[ 0 ][ 0 ].plane[ 0 ][ 2 ] >= 0 )
-		{
-			for( i = 0; i < 4; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    if (tw->bounds[0][2] >= tc->vBounds[1][2] || tw->bounds[1][2] <= tc->vBounds[0][2]) {
+        return qfalse;
+    }
 
-				if( !CM_SightTracePointThroughTerrainCollide() ) {
-					return qfalse;
-				}
-			}
-		}
-		else
-		{
-			for( i = 4; i < 8; i++ )
-			{
-				VectorAdd( tw->start, tw->offsets[ i ], g_trace.vStart );
-				VectorAdd( tw->end, tw->offsets[ i ], g_trace.vEnd );
+    g_trace.tw = tw;
+    g_trace.tc = tc;
+    VectorCopy(tw->start, g_trace.vStart);
+    VectorCopy(tw->end, g_trace.vEnd);
 
-				if( !CM_SightTracePointThroughTerrainCollide() ) {
-					return qfalse;
-				}
-			}
-		}
-	}
+    if (tw->isPoint) {
+        VectorCopy(tw->start, g_trace.vStart);
+        VectorCopy(tw->end, g_trace.vEnd);
+        return CM_SightTracePointThroughTerrainCollide();
+    } else {
+        if (tc->squares[0][0].plane[0][2] >= 0) {
+            for (i = 0; i < 4; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
 
-	return qtrue;
+                if (!CM_SightTracePointThroughTerrainCollide()) {
+                    return qfalse;
+                }
+            }
+        } else {
+            for (i = 4; i < 8; i++) {
+                VectorAdd(tw->start, tw->offsets[i], g_trace.vStart);
+                VectorAdd(tw->end, tw->offsets[i], g_trace.vEnd);
+
+                if (!CM_SightTracePointThroughTerrainCollide()) {
+                    return qfalse;
+                }
+            }
+        }
+    }
+
+    return qtrue;
 }
 
 /*
@@ -1636,7 +1487,41 @@ qboolean CM_SightTraceThroughTerrainCollide( traceWork_t *tw, terrainCollide_t *
 CM_TerrainSquareType
 ====================
 */
-int CM_TerrainSquareType( int iTerrainPatch, int i, int j )
+int CM_TerrainSquareType(int iTerrainPatch, int i, int j)
 {
-	return cm.terrain[ iTerrainPatch ].tc.squares[ i ][ j ].eMode;
+    return cm.terrain[iTerrainPatch].tc.squares[i][j].eMode;
+}
+
+/*
+====================
+CM_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void CM_SwapTerraPatch(cTerraPatch_t* pPatch) {
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth = LittleShort(pPatch->iNorth);
+    pPatch->iEast = LittleShort(pPatch->iEast);
+    pPatch->iSouth = LittleShort(pPatch->iSouth);
+    pPatch->iWest = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
 }
diff --git a/code/qcommon/cm_terrain.h b/code/qcommon/cm_terrain.h
index 83fe5c15..f29597bc 100644
--- a/code/qcommon/cm_terrain.h
+++ b/code/qcommon/cm_terrain.h
@@ -28,45 +28,44 @@ void CM_TraceThroughTerPatchCollide(traceWork_t *tw, const struct terPatchCollid
 qboolean CM_PositionTestInTerPatchCollide(traceWork_t *tw, const struct terPatchCollide_s *tc);
 */
 
-#ifndef CM_TERRAIN_H
-#define CM_TERRAIN_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TER_QUADS_PER_ROW	8
-#define TER_TRIS_PER_PATCH	(TER_QUADS_PER_ROW * TER_QUADS_PER_ROW * 2)
-#define TER_PLANES_PER_TRI	5
+#define TER_QUADS_PER_ROW  8
+#define TER_TRIS_PER_PATCH (TER_QUADS_PER_ROW * TER_QUADS_PER_ROW * 2)
+#define TER_PLANES_PER_TRI 5
 
-typedef struct terTriangle_s {
-	cplane_t		planes[TER_PLANES_PER_TRI];	// 0 is the surface plane, 3 border planes follow and a cap to give it some finite volume
-} terTriangle_t;
+    typedef struct terTriangle_s {
+        cplane_t planes
+            [TER_PLANES_PER_TRI]; // 0 is the surface plane, 3 border planes follow and a cap to give it some finite volume
+    } terTriangle_t;
 
-typedef struct terPatchCollide_s {
-	vec3_t			bounds[2];
+    typedef struct terPatchCollide_s {
+        vec3_t bounds[2];
 
-	baseshader_t	*shader;
+        baseshader_t *shader;
 
-	terTriangle_t	tris[TER_TRIS_PER_PATCH];
-} terPatchCollide_t;
+        terTriangle_t tris[TER_TRIS_PER_PATCH];
+    } terPatchCollide_t;
 
-typedef struct terrainCollideSquare_s {
-	vec4_t plane[ 2 ];
-	int eMode;
-} terrainCollideSquare_t;
+    typedef struct terrainCollideSquare_s {
+        vec4_t plane[2];
+        int    eMode;
+    } terrainCollideSquare_t;
 
-typedef struct terrainCollide_s {
-	vec3_t vBounds[ 2 ];
-	terrainCollideSquare_t squares[ 8 ][ 8 ];
-} terrainCollide_t;
+    typedef struct terrainCollide_s {
+        vec3_t                 vBounds[2];
+        terrainCollideSquare_t squares[8][8];
+    } terrainCollide_t;
 
-void CM_PrepareGenerateTerrainCollide( void );
-void CM_GenerateTerrainCollide( cTerraPatch_t *patch, terrainCollide_t *tc );
-int CM_TerrainSquareType( int iTerrainPatch, int i, int j );
+    void CM_PrepareGenerateTerrainCollide(void);
+    void CM_GenerateTerrainCollide(cTerraPatch_t *patch, terrainCollide_t *tc);
+    int  CM_TerrainSquareType(int iTerrainPatch, int i, int j);
+    void CM_SwapTerraPatch(cTerraPatch_t* pPatch);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // CM_TERRAIN_H
diff --git a/code/qcommon/cm_test.c b/code/qcommon/cm_test.c
index 9a30ae32..038c0297 100644
--- a/code/qcommon/cm_test.c
+++ b/code/qcommon/cm_test.c
@@ -479,7 +479,7 @@ CM_WritePortalState
 void	CM_WritePortalState( fileHandle_t f )
 {
 	FS_Write( &cm.numAreas, sizeof( int ), f );
-	FS_Write( &cm.areaPortals, cm.numAreas * cm.numAreas * sizeof( *cm.areaPortals ), f );
+	FS_Write( cm.areaPortals, cm.numAreas * cm.numAreas * sizeof( *cm.areaPortals ), f );
 }
 
 /*
@@ -494,7 +494,7 @@ void	CM_ReadPortalState( fileHandle_t f )
 	if (numareaportals != cm.numAreas) {
 		Com_Error(ERR_DROP, "numareaportals differs from save game");
 	}
-	FS_Read(&cm.areaPortals, cm.numAreas * cm.numAreas * sizeof(*cm.areaPortals), f);
+	FS_Read(cm.areaPortals, cm.numAreas * cm.numAreas * sizeof(*cm.areaPortals), f);
 	CM_FloodAreaConnections();
 }
 
diff --git a/code/qcommon/cm_trace.c b/code/qcommon/cm_trace.c
index 62ddec33..8235e21c 100644
--- a/code/qcommon/cm_trace.c
+++ b/code/qcommon/cm_trace.c
@@ -181,6 +181,10 @@ void CM_TestBoxInBrush( traceWork_t *tw, cbrush_t *brush ) {
 
 			// find the closest point on the capsule to the plane
 			t = DotProduct( plane->normal, sphere.offset );
+			if( t < 0 )
+			{
+				t = -t;
+			}
 
 			// adjust the plane distance apropriately for radius
 			dist = t + plane->dist + sphere.radius;
@@ -673,6 +677,11 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 		leaveFrac2 = 1.0;
 		clipplane2 = NULL;
 		leadside2 = NULL;
+
+		if (!(tw->contents & CONTENTS_FENCE)) {
+			return;
+		}
+
 		//
 		// compare the trace against all planes of the brush
 		// find the latest time the trace crosses a plane towards the interior
@@ -744,17 +753,17 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
 					return;
 				}
 			}
-		}
 
-		if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
-			if( leaveFrac2 < tw->trace.fraction ) {
-				if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
-					tw->trace.fraction = leaveFrac2;
-					tw->trace.plane = *clipplane2;
-					tw->trace.surfaceFlags = leadside2->surfaceFlags;
-					tw->trace.shaderNum = leadside2->shaderNum;
-					tw->trace.contents = brush->contents;
-					return;
+			if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
+				if( leaveFrac2 < tw->trace.fraction ) {
+					if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
+						tw->trace.fraction = leaveFrac2;
+						tw->trace.plane = *clipplane2;
+						tw->trace.surfaceFlags = leadside2->surfaceFlags;
+						tw->trace.shaderNum = leadside2->shaderNum;
+						tw->trace.contents = brush->contents;
+						return;
+					}
 				}
 			}
 		}
@@ -1532,12 +1541,229 @@ CM_SightTraceThroughBrush
 */
 qboolean CM_SightTraceThroughBrush( traceWork_t *tw, cbrush_t *brush )
 {
-	// They redid the fonction in mohaa
-	CM_TraceThroughBrush( tw, brush );
+	int				i;
+	cplane_t		*plane;
+	float			dist;
+	float			enterFrac, leaveFrac, leaveFrac2;
+	float			d1, d2;
+	qboolean		startout;
+	float			f;
+	cbrushside_t	*side, *leadside, *leadside2;
+	float			t;
 
-	if( tw->trace.allsolid || tw->trace.startsolid || tw->trace.fraction < 1 ) {
-		return qfalse;
+	if( !brush->numsides ) {
+		return qtrue;
 	}
+
+	enterFrac = -1.0;
+	leaveFrac = 1.0;
+
+	c_brush_traces++;
+
+	startout = qfalse;
+
+	leadside = NULL;
+	if( !( brush->contents & CONTENTS_FENCE ) || !tw->isPoint ) {
+		if( sphere.use ) {
+			//
+			// compare the trace against all planes of the brush
+			// find the latest time the trace crosses a plane towards the interior
+			// and the earliest time the trace crosses a plane towards the exterior
+			//
+			for( i = 0; i < brush->numsides; i++ ) {
+				side = brush->sides + i;
+				plane = side->plane;
+
+				// find the closest point on the capsule to the plane
+				t = DotProduct( plane->normal, sphere.offset );
+				if( t < 0 )
+				{
+					t = -t;
+				}
+
+				// adjust the plane distance apropriately for radius
+				dist = t + plane->dist + sphere.radius;
+
+				d1 = DotProduct( tw->start, plane->normal ) - dist;
+				d2 = DotProduct( tw->end, plane->normal ) - dist;
+
+				// if it doesn't cross the plane, the plane isn't relevent
+				if( d1 <= 0 && d2 <= 0 ) {
+					continue;
+				}
+
+				if( d1 > 0 ) {
+					startout = qtrue;
+				}
+
+				// if completely in front of face, no intersection with the entire brush
+				if( d1 > 0 && ( d2 >= SURFACE_CLIP_EPSILON || d2 >= d1 ) ) {
+					return qtrue;
+				}
+
+				// crosses face
+				if( d1 > d2 ) {	// enter
+					f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+					if( f < 0 ) {
+						f = 0;
+					}
+					if( f > enterFrac ) {
+						enterFrac = f;
+						leadside = side;
+					}
+				}
+				else {	// leave
+					f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+					if( f > 1 ) {
+						f = 1;
+					}
+					if( f < leaveFrac ) {
+						leaveFrac = f;
+					}
+				}
+			}
+		} else {
+			//
+			// compare the trace against all planes of the brush
+			// find the latest time the trace crosses a plane towards the interior
+			// and the earliest time the trace crosses a plane towards the exterior
+			//
+			for( i = 0; i < brush->numsides; i++ ) {
+				side = brush->sides + i;
+				plane = side->plane;
+
+				// adjust the plane distance apropriately for mins/maxs
+				dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+
+				d1 = DotProduct( tw->start, plane->normal ) - dist;
+				d2 = DotProduct( tw->end, plane->normal ) - dist;
+
+				// if it doesn't cross the plane, the plane isn't relevent
+				if( d1 <= 0 && d2 <= 0 ) {
+					continue;
+				}
+
+				if( d1 > 0 ) {
+					startout = qtrue;
+
+					// if completely in front of face, no intersection with the entire brush
+					if( d2 >= SURFACE_CLIP_EPSILON || d2 >= d1 ) {
+						return qtrue;
+					}
+				}
+
+				// crosses face
+				if( d1 > d2 ) { // enter
+					f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+					if( f < 0 ) {
+						f = 0;
+					}
+					if( f > enterFrac ) {
+						enterFrac = f;
+					}
+				} else { // leave
+					f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+					if( f > 1 ) {
+						f = 1;
+					}
+					if( f < leaveFrac ) {
+						leaveFrac = f;
+					}
+				}
+			}
+		}
+
+		//
+		// all planes have been checked, and the trace was not
+		// completely outside the brush
+		//
+		if( !startout ) {	// original point was inside brush
+			return qfalse;
+		}
+
+		if( enterFrac <= leaveFrac ) {
+			if( enterFrac > -1 ) {
+				return qfalse;
+			}
+		}
+	} else {
+		leaveFrac2 = 1.0;
+		leadside2 = NULL;
+		//
+		// compare the trace against all planes of the brush
+		// find the latest time the trace crosses a plane towards the interior
+		// and the earliest time the trace crosses a plane towards the exterior
+		//
+		for( i = 0; i < brush->numsides; i++ ) {
+			side = brush->sides + i;
+			plane = side->plane;
+
+			// adjust the plane distance apropriately for mins/maxs
+			dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+
+			d1 = DotProduct( tw->start, plane->normal ) - dist;
+			d2 = DotProduct( tw->end, plane->normal ) - dist;
+
+			// if it doesn't cross the plane, the plane isn't relevent
+			if( d1 <= 0 && d2 <= 0 ) {
+				continue;
+			}
+
+			if( d1 > 0 ) {
+				// if completely in front of face, no intersection with the entire brush
+				if( d2 >= SURFACE_CLIP_EPSILON || d2 >= d1 ) {
+					return qtrue;
+				}
+			}
+
+			// crosses face
+			if( d1 > d2 ) {	// enter
+				f = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+				if( f < 0 ) {
+					f = 0;
+				}
+				if( f > enterFrac ) {
+					enterFrac = f;
+					leadside = side;
+				}
+			} else {	// leave
+				f = ( d1 + SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+				if( f > 1 ) {
+					f = 1;
+				}
+				if( f < leaveFrac ) {
+					leaveFrac = f;
+					leadside2 = side;
+					leaveFrac2 = ( d1 - SURFACE_CLIP_EPSILON ) / ( d1 - d2 );
+				}
+			}
+		}
+
+		//
+		// all planes have been checked, and the trace was not
+		// completely outside the brush
+		//
+		if( enterFrac <= leaveFrac ) {
+			if( enterFrac > -1 && enterFrac < tw->trace.fraction ) {
+				if( enterFrac < 0 ) {
+					enterFrac = 0;
+				}
+
+				if( CM_TraceThroughFence( tw, brush, leadside, enterFrac ) ) {
+					return qfalse;
+				}
+			}
+
+			if( ( leaveFrac2 < 1.0 ) && ( leadside2->surfaceFlags & SURF_BACKSIDE ) ) {
+				if( leaveFrac2 < tw->trace.fraction ) {
+					if( CM_TraceThroughFence( tw, brush, leadside2, leaveFrac ) ) {
+						return qfalse;
+					}
+				}
+			}
+		}
+	}
+
 	return qtrue;
 }
 
diff --git a/code/qcommon/cm_trace_obfuscation.cpp b/code/qcommon/cm_trace_obfuscation.cpp
new file mode 100644
index 00000000..b2a954ca
--- /dev/null
+++ b/code/qcommon/cm_trace_obfuscation.cpp
@@ -0,0 +1,475 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "cm_local.h"
+
+static char com_token[MAX_TOKEN_CHARS];
+
+/*
+================
+CM_NextCsvToken
+================
+*/
+char* CM_NextCsvToken(char** text, qboolean crossline) {
+    char* p;
+    char* out;
+    char c;
+    int i;
+    qboolean newline;
+    qboolean comma;
+
+    com_token[0] = 0;
+    p = *text;
+    if (!p) {
+        return com_token;
+    }
+
+    for (c = *p; isspace(c); p++, c = *p)
+    {
+        if (c == '\n' && !crossline) {
+            break;
+        }
+    }
+
+    out = com_token;
+
+    for (i = 0; ; i++, p++) {
+        c = *p;
+
+        newline = qfalse;
+        comma = qfalse;
+
+        if (*p && c != ',') {
+            comma = qtrue;
+        }
+
+        if (comma && c != '\n') {
+            newline = qtrue;
+        }
+
+        if (!newline) {
+            break;
+        }
+
+        *out = c;
+        out++;
+    }
+
+    if (c == ',') {
+        p++;
+    }
+
+    while (i > 0) {
+        if (!isspace(com_token[i - 1])) {
+            break;
+        }
+
+        i--;
+    }
+
+    com_token[i] = 0;
+    *text = p;
+
+    if (!p[0]) {
+        *text = NULL;
+    }
+
+    return com_token;
+}
+
+/*
+================
+CM_SetupObfuscationMapping
+================
+*/
+obfuscation_t* CM_SetupObfuscationMapping() {
+	obfuscation_t* list;
+    obfuscation_t* obfuscation;
+    char** files;
+    int numFiles;
+    int numObfuscations;
+	int i, j;
+	
+	list = (obfuscation_t*)Hunk_AllocateTempMemory(sizeof(obfuscation_t) * MAX_OBFUSCATIONS);
+	for (i = 0; i < MAX_OBFUSCATIONS; i++) {
+		list[i].name[0] = 0;
+		list[i].heightDensity = 0;
+		list[i].widthDensity = 0;
+	}
+
+    files = FS_ListFiles("scripts/", ".csv", qfalse, &numFiles);
+    numObfuscations = 0;
+
+    for (i = 0; i < numFiles; ++i) {
+        const char* filename = va("scripts/%s", files[i]);
+        void* buffer;
+        char* text;
+        char* token;
+
+        if (FS_ReadFile(filename, &buffer) < 0) {
+            continue;
+        }
+
+        text = (char*)buffer;
+        while (text) {
+            token = CM_NextCsvToken(&text, qtrue);
+            if (!token[0]) {
+                break;
+            }
+
+            for (j = 0; j < numObfuscations; ++j)
+            {
+                if (!Q_stricmp(token, list[j].name))
+                {
+                    Com_Printf("WARNING: using redefinition of obfuscation for '%s' in '%s'\n", token, files[i]);
+                    break;
+                }
+            }
+
+            obfuscation = &list[j];
+            Q_strncpyz(obfuscation->name, token, sizeof(obfuscation->name));
+
+            token = CM_NextCsvToken(&text, qfalse);
+            if (!text) {
+                Com_Printf(
+                    "WARNING: unexpected EOF in definition of obfuscation for '%s' in '%s'; skipping\n",
+                    obfuscation->name,
+                    files[i]
+                );
+                break;
+            }
+
+            if (token[0]) {
+                float maxNumVolumes = atof(token);
+
+                if (maxNumVolumes > 0) {
+                    obfuscation->widthDensity = 0.5f / maxNumVolumes;
+                } else {
+                    obfuscation->widthDensity = 0;
+                }
+
+                token = CM_NextCsvToken(&text, 0);
+                if (!text) {
+                    Com_Printf(
+                        "WARNING: unexpected EOF in definition of obfuscation for '%s' in '%s'; skipping\n",
+                        obfuscation->name,
+                        files[i]
+                    );
+                    break;
+                }
+
+                if (token[0]) {
+                    float maxDist = atof(token);
+
+                    if (maxDist > 0) {
+                        obfuscation->heightDensity = 1.f / maxDist;
+                    } else {
+                        obfuscation->heightDensity = 0;
+                    }
+
+                    if (numObfuscations == MAX_OBFUSCATIONS) {
+                        Com_Printf("WARNING: exceeded MAX_OBFUSCATIONS (%i)", numObfuscations);
+                    } else {
+                        numObfuscations++;
+                    }
+                } else {
+                    Com_Printf(
+                        "WARNING: missing max distance thorugh obscuring volumes for '%s' in '%s'; skipping\n",
+                        obfuscation->name,
+                        files[i]
+                    );
+                    SkipRestOfLine(&text);
+                }
+            } else {
+                Com_Printf(
+                    "WARNING: missing max number of obscuring volumes for '%s' in '%s'; skipping\n",
+                    obfuscation->name,
+                    files[i]
+                );
+                SkipRestOfLine(&text);
+            }
+        }
+
+        FS_FreeFile(buffer);
+    }
+
+    list[numObfuscations].name[0] = 0;
+
+	return list;
+}
+
+/*
+================
+CM_ReleaseObfuscationMapping
+================
+*/
+void CM_ReleaseObfuscationMapping(obfuscation_t* obfuscation) {
+	Hunk_FreeTempMemory(obfuscation);
+}
+
+/*
+================
+CM_ObfuscationForShader
+================
+*/
+void CM_ObfuscationForShader(obfuscation_t* list, const char* shaderName, float* widthDensity, float* heightDensity) {
+	obfuscation_t* current;
+
+	for (current = list; current->name[0]; current++) {
+		if (!Q_stricmp(shaderName, current->name)) {
+			*widthDensity = current->widthDensity;
+			*heightDensity = current->heightDensity;
+		}
+	}
+
+	Com_Printf("WARNING: using default obfuscation for shader %s\n", shaderName);
+	*widthDensity = 1.f / 16.f;
+	*heightDensity = 1.f / 1024.f;
+}
+
+/*
+================
+CM_ObfuscationTraceThroughBrush
+================
+*/
+float CM_ObfuscationTraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) {
+    int i;
+    cplane_t* plane;
+    float dist;
+    float enterFrac, leaveFrac;
+    float enterDensity, leaveDensity;
+    float delta;
+    float d1, d2;
+    float f;
+    cbrushside_t* side;
+
+	enterFrac = 0;
+    enterDensity = 0;
+	leaveFrac = 1.0;
+    leaveDensity = 0;
+
+	//
+	// compare the trace against all planes of the brush
+	// find the latest time the trace crosses a plane towards the interior
+	// and the earliest time the trace crosses a plane towards the exterior
+	//
+	for( i = 0; i < brush->numsides; i++ ) {
+		side = brush->sides + i;
+		plane = side->plane;
+
+		// adjust the plane distance apropriately for mins/maxs
+		//dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal );
+        dist = plane->dist;
+
+		d1 = DotProduct( tw->start, plane->normal ) - dist;
+		d2 = DotProduct( tw->end, plane->normal ) - dist;
+
+		// if it doesn't cross the plane, the plane isn't relevent
+		if( d1 >= 0 && d2 >= 0 ) {
+            return 0;
+		}
+
+        if (d1 < 0 && d2 > 0) {
+            f = d1 / (d1 - d2);
+            if (leaveFrac > f) {
+                leaveFrac = f;
+            }
+            leaveDensity = cm.shaders[brush->shaderNum].obfuscationWidthDensity;
+        } else if (d1 > 0 && d2 < 0) {
+            f = d1 / (d1 - d2);
+            if (enterFrac < f) {
+                enterFrac = f;
+            }
+            enterDensity = cm.shaders[brush->shaderNum].obfuscationWidthDensity;
+        }
+	}
+
+    delta = leaveFrac - enterFrac;
+    if (delta <= 0) {
+        return 0;
+    }
+
+    return enterDensity + cm.shaders[brush->shaderNum].obfuscationHeightDensity * tw->radius * delta + leaveDensity;
+}
+
+/*
+================
+CM_ObfuscationTraceToLeaf
+================
+*/
+float CM_ObfuscationTraceToLeaf( traceWork_t *tw, cLeaf_t *leaf ) {
+	int k;
+	cbrush_t *b;
+	float total;
+
+	total = 0;
+	// test box position against all brushes in the leaf
+	for( k = 0; k<leaf->numLeafBrushes; k++ ) {
+		b = &cm.brushes[ cm.leafbrushes[ leaf->firstLeafBrush + k ] ];
+		if( b->checkcount == cm.checkcount ) {
+			continue;	// already checked this brush in another leaf
+		}
+		b->checkcount = cm.checkcount;
+
+		if( !( b->contents & CONTENTS_DONOTENTER ) ) {
+			continue;
+		}
+
+		total += CM_ObfuscationTraceThroughBrush( tw, b );
+	}
+
+	return total;
+}
+
+/*
+==================
+CM_ObfuscationTraceThroughTree
+
+Traverse all the contacted leafs from the start to the end position.
+If the trace is a point, they will be exactly in order, but for larger
+trace volumes it is possible to hit something in a later leaf with
+a smaller intercept fraction.
+==================
+*/
+float CM_ObfuscationTraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t p1, vec3_t p2) {
+	cNode_t		*node;
+	cplane_t	*plane;
+	float		t1, t2;
+	float		frac, frac2;
+	float		idist;
+	vec3_t		mid;
+	int			side;
+	float		midf;
+
+	// if < 0, we are in a leaf node
+	if (num < 0) {
+		return CM_ObfuscationTraceToLeaf( tw, &cm.leafs[-1-num] );
+	}
+
+	//
+	// find the point distances to the seperating plane
+	// and the offset for the size of the box
+	//
+	node = cm.nodes + num;
+	plane = node->plane;
+
+	// adjust the plane distance apropriately for mins/maxs
+	if ( plane->type < 3 ) {
+		t1 = p1[plane->type] - plane->dist;
+		t2 = p2[plane->type] - plane->dist;
+	} else {
+		t1 = DotProduct (plane->normal, p1) - plane->dist;
+		t2 = DotProduct (plane->normal, p2) - plane->dist;
+	}
+
+	// see which sides we need to consider
+	if ( t1 >= SURFACE_CLIP_EPSILON && t2 >= SURFACE_CLIP_EPSILON) {
+		return CM_ObfuscationTraceThroughTree( tw, node->children[0], p1f, p2f, p1, p2 );
+	}
+	if ( t1 < -SURFACE_CLIP_EPSILON && t2 < -SURFACE_CLIP_EPSILON) {
+		return CM_ObfuscationTraceThroughTree( tw, node->children[1], p1f, p2f, p1, p2 );
+	}
+
+	// put the crosspoint SURFACE_CLIP_EPSILON pixels on the near side
+	if ( t1 < t2 ) {
+		idist = 1.0/(t1-t2);
+		side = 1;
+		frac2 = (t1 + SURFACE_CLIP_EPSILON)*idist;
+		frac = (t1 + SURFACE_CLIP_EPSILON)*idist;
+	} else if (t1 > t2) {
+		idist = 1.0/(t1-t2);
+		side = 0;
+		frac2 = (t1 - SURFACE_CLIP_EPSILON)*idist;
+		frac = (t1 + SURFACE_CLIP_EPSILON)*idist;
+	} else {
+		side = 0;
+		frac = 1;
+		frac2 = 0;
+	}
+
+	// move up to the node
+	if ( frac < 0 ) {
+		frac = 0;
+	} else if ( frac > 1 ) {
+		frac = 1;
+	}
+
+	midf = p1f + (p2f - p1f)*frac;
+
+	mid[0] = p1[0] + frac*(p2[0] - p1[0]);
+	mid[1] = p1[1] + frac*(p2[1] - p1[1]);
+	mid[2] = p1[2] + frac*(p2[2] - p1[2]);
+
+	CM_ObfuscationTraceThroughTree( tw, node->children[side], p1f, midf, p1, mid );
+
+
+	// go past the node
+	if ( frac2 < 0 ) {
+		frac2 = 0;
+	} else if ( frac2 > 1 ) {
+		frac2 = 1;
+	}
+
+	midf = p1f + (p2f - p1f)*frac2;
+
+	mid[0] = p1[0] + frac2*(p2[0] - p1[0]);
+	mid[1] = p1[1] + frac2*(p2[1] - p1[1]);
+	mid[2] = p1[2] + frac2*(p2[2] - p1[2]);
+
+	return CM_ObfuscationTraceThroughTree( tw, node->children[side^1], midf, p2f, mid, p2 );
+}
+
+/*
+================
+CM_ObfuscationTrace
+================
+*/
+float CM_ObfuscationTrace(const vec3_t start, const vec3_t end, clipHandle_t handle) {
+    cmodel_t* model;
+    vec3_t delta;
+    traceWork_t tw;
+
+    model = CM_ClipHandleToModel(handle);
+
+    c_traces++;
+    cm.checkcount++;
+
+    VectorCopy(start, tw.start);
+    VectorCopy(end, tw.end);
+    VectorSubtract(tw.end, tw.start, delta);
+    tw.radius = VectorLength(delta);
+
+    if (handle) {
+        return CM_ObfuscationTraceToLeaf(&tw, &model->leaf);
+    } else {
+        return CM_ObfuscationTraceThroughTree(&tw, 0, 0.0, 1.0, tw.start, tw.end);
+    }
+}
+
+/*
+================
+CM_VisualObfuscation
+================
+*/
+float CM_VisualObfuscation(const vec3_t start, const vec3_t end) {
+    return CM_ObfuscationTrace(start, end, 0);
+}
diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c
index a45f6e52..338456a1 100644
--- a/code/qcommon/cmd.c
+++ b/code/qcommon/cmd.c
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 
 #define	MAX_CMD_BUFFER  128*1024
-#define	MAX_CMD_LINE	1024
+#define	MAX_CMD_LINE	8192 // was increased for testing purposes
 #define MAX_ALIAS_NAME	32
 #define MAX_ALIAS_COUNT	16
 
@@ -620,7 +620,7 @@ void Cmd_Args_Sanitize(void)
 		if(strlen(c) > MAX_CVAR_VALUE_STRING - 1)
 			c[MAX_CVAR_VALUE_STRING - 1] = '\0';
 		
-		while ((c = strpbrk(c, "\n\r;"))) {
+		while ((c = strpbrk(c, "\n\r"))) {
 			*c = ' ';
 			++c;
 		}
@@ -667,7 +667,7 @@ static void Cmd_TokenizeString2( const char *text_in, qboolean ignoreQuotes ) {
 
 		while ( 1 ) {
 			// skip whitespace
-			while ( *text && *text <= ' ' ) {
+			while ( *text && ( unsigned char )*text <= ' ' ) {
 				text++;
 			}
 			if ( !*text ) {
@@ -715,7 +715,7 @@ static void Cmd_TokenizeString2( const char *text_in, qboolean ignoreQuotes ) {
 		cmd_argc++;
 
 		// skip until whitespace, quote, or command
-		while ( *text > ' ' ) {
+		while ( ( unsigned char )*text > ' ' ) {
 			if ( !ignoreQuotes && text[0] == '"' ) {
 				break;
 			}
@@ -1082,7 +1082,7 @@ void Cmd_List_f (void)
 Cmd_CompleteCfgName
 ==================
 */
-void Cmd_CompleteCfgName( char *args, int argNum ) {
+void Cmd_CompleteCfgName( const char *args, int argNum ) {
 	if( argNum == 2 ) {
 		Field_CompleteFilename( "", "cfg", qfalse, qtrue );
 	}
diff --git a/code/qcommon/common.cpp b/code/qcommon/common.c
similarity index 72%
rename from code/qcommon/common.cpp
rename to code/qcommon/common.c
index 6eeef532..e6018259 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.c
@@ -33,12 +33,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 // FPS
-#include <chrono>
+#ifdef __cplusplus
+#  include <chrono>
+#endif
+
+#include <time.h>
 
 #include "tiki.h"
 
+#ifndef DEDICATED
+#  include "../uilib/ui_public.h"
+#endif
+
+#include "../gamespy/q_gamespy.h"
+
 qboolean CL_FinishedIntro(void);
-void UI_PrintConsole(const char* msg);
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,17 +62,6 @@ int demo_protocols[] =
 
 #define MAX_NUM_ARGVS	50
 
-//wombat: i had to increase these quite a bit
-//to keep up with larger client_t.
-//i reckon this has bad effect on memory usage
-// update: put it back unless we really need it large
-#define MIN_DEDICATED_COMHUNKMEGS 1
-#define MIN_COMHUNKMEGS		56
-#define DEF_COMHUNKMEGS		96
-#define DEF_COMZONEMEGS		128
-#define DEF_COMHUNKMEGS_S	XSTRING(DEF_COMHUNKMEGS)
-#define DEF_COMZONEMEGS_S	XSTRING(DEF_COMZONEMEGS)
-
 int		com_argc;
 char	*com_argv[MAX_NUM_ARGVS+1];
 
@@ -71,6 +69,7 @@ jmp_buf abortframe;		// an ERR_DROP occured, exit the entire frame
 
 
 FILE *debuglogfile;
+static fileHandle_t pipefile;
 static fileHandle_t logfile;
 fileHandle_t	com_journalFile;			// events are written here
 fileHandle_t	com_journalDataFile;		// config files are written here
@@ -92,6 +91,8 @@ cvar_t	*com_sv_running;
 cvar_t	*com_cl_running;
 cvar_t	*com_viewlog;
 cvar_t	*com_logfile;		// 1 = buffer log, 2 = flush after each print
+cvar_t	*com_logfile_timestamps;
+cvar_t	*com_pipefile;
 cvar_t	*com_showtrace;
 cvar_t	*com_shortversion;
 cvar_t	*com_version;
@@ -112,6 +113,7 @@ cvar_t	*com_minimized;
 cvar_t	*com_maxfpsMinimized;
 cvar_t	*com_abnormalExit;
 cvar_t	*com_standalone;
+cvar_t	*com_gamename;
 cvar_t	*com_protocol;
 #ifdef LEGACY_PROTOCOL
 cvar_t	*com_legacyprotocol;
@@ -126,6 +128,12 @@ cvar_t  *con_autochat;
 cvar_t	*precache;
 cvar_t	*com_target_game;
 cvar_t	*com_target_version;
+cvar_t	*com_target_demo;
+cvar_t	*com_updatecheck_enabled;
+cvar_t	*com_updatecheck_interval;
+
+int protocol_version_demo;
+int protocol_version_full;
 
 // com_speeds times
 int		time_game;
@@ -140,6 +148,7 @@ qboolean	com_errorEntered = qfalse;
 qboolean	com_fullyInitialized = qfalse;
 qboolean	com_gameRestarting = qfalse;
 qboolean	com_gameClientRestarting = qfalse;
+qboolean	com_gotOriginalConfig = qfalse;
 
 char	com_errorMessage[MAXPRINTMSG];
 
@@ -154,6 +163,8 @@ void Com_WriteConfig_f( void );
 void CIN_CloseAllVideos(void);
 
 void Com_InitTargetGame();
+void Com_InitHunkMemory( void );
+void Z_InitMemory( void );
 
 //============================================================================
 
@@ -163,9 +174,15 @@ static void	(*rd_flush)( char *buffer );
 
 #define MAX_FPS_TIMES 16
 
+#ifdef __cplusplus
 using fps_clock_t = std::chrono::high_resolution_clock;
 using fps_time_t = fps_clock_t::time_point;
 using fps_delta_t = fps_clock_t::duration;
+#else
+typedef unsigned long long fps_clock_t;
+typedef unsigned long long fps_time_t;
+typedef unsigned long long fps_delta_t;
+#endif
 
 static int fpsindex;
 static fps_delta_t fpstimes[MAX_FPS_TIMES];
@@ -210,8 +227,13 @@ A raw string should NEVER be passed as fmt, because of "%f" type crashers.
 void QDECL Com_Printf( const char *fmt, ... ) {
 	va_list		argptr;
 	char		msg[MAXPRINTMSG];
-  static qboolean opening_qconsole = qfalse;
+	static qboolean opening_qconsole = qfalse;
+	static qboolean recursive_count = qfalse;
 
+	if (recursive_count) {
+		return;
+	}
+	recursive_count = qtrue;
 
 	va_start (argptr,fmt);
 	Q_vsnprintf (msg, sizeof(msg), fmt, argptr);
@@ -226,6 +248,7 @@ void QDECL Com_Printf( const char *fmt, ... ) {
     // TTimo nooo .. that would defeat the purpose
 		//rd_flush(rd_buffer);
 		//*rd_buffer = 0;
+		recursive_count--;
 		return;
 	}
 
@@ -250,12 +273,16 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 
 			time( &aclock );
 			newtime = localtime( &aclock );
-
+			
 			logfile = FS_FOpenTextFileWrite( "qconsole.log" );
 
+            // Remove recursive count as it won't be able to print relevant info
+            recursive_count--;
 			if(logfile)
 			{
 				Com_Printf( "logfile opened on %s\n", asctime( newtime ) );
+				Com_Printf( "=> game is version %s\n", PRODUCT_NAME " " PRODUCT_VERSION_FULL " " PLATFORM_STRING " " PRODUCT_VERSION_DATE );
+                Com_Printf( "=> targeting game ID %d\n", Cvar_VariableIntegerValue( "com_target_game" ) );
 
 				if ( com_logfile->integer > 1 )
 				{
@@ -269,13 +296,70 @@ void QDECL Com_Printf( const char *fmt, ... ) {
 				Com_Printf("Opening qconsole.log failed!\n");
 				Cvar_SetValue("logfile", 0);
 			}
+            recursive_count++;
 
       opening_qconsole = qfalse;
 		}
-		if ( logfile && FS_Initialized()) {
-			FS_Write(msg, strlen(msg), logfile);
+        if (logfile && FS_Initialized()) {
+            // Added in OPM
+            //  Write the time before each message
+            //================
+			size_t msgLen = strlen(msg);
+
+            if (msgLen > 0) {
+                if (com_logfile_timestamps->integer) {
+                    static qboolean no_newline = qfalse;
+
+                    if (!no_newline) {
+                        time_t t;
+                        time_t t_gmt;
+                        struct tm tms_local;
+                        struct tm tms_gm;
+                        double tz;
+                        const char* tzStr;
+                        char buffer[26];
+
+                        t = time(NULL);
+    #ifdef WIN32
+                        localtime_s(&tms_local, &t);
+                        gmtime_s(&tms_gm, &t);
+    #else
+                        localtime_r(&t, &tms_local);
+                        gmtime_r(&t, &tms_gm);
+    #endif
+                        t_gmt = mktime(&tms_gm);
+                        tz = difftime(t, t_gmt) / 60.0 / 60.0;
+
+                        strftime(buffer, 26, "%Y-%m-%d %H:%M:%S", &tms_local);
+                        FS_Write("[", 1, logfile);
+                        FS_Write(buffer, strlen(buffer), logfile);
+                        FS_Write(" ", 1, logfile);
+
+                        if (tz >= 0) {
+                            tzStr = va("UTC+%.03f", tz);
+                        } else {
+                            tzStr = va("UTC%.03f", tz);
+                        }
+
+                        FS_Write(tzStr, strlen(tzStr), logfile);
+                        FS_Write("] ", 2, logfile);
+                    }
+
+                    if (msg[msgLen - 1] != '\n') {
+                        // Don't write the time if the previous message has no newline
+                        no_newline = qtrue;
+                    } else {
+                        no_newline = qfalse;
+                    }
+                }
+                //================
+
+                FS_Write(msg, msgLen, logfile);
+            }
 		}
-	}
+    }
+
+    recursive_count--;
 }
 
 
@@ -301,6 +385,56 @@ void QDECL Com_DPrintf( const char *fmt, ...) {
 	Com_Printf ("%s", msg);
 }
 
+/*
+================
+Com_DPrintf2
+
+A Com_Printf that only shows up if the "developer" cvar is set
+================
+*/
+void QDECL Com_DPrintf2( const char *fmt, ...) {
+	va_list		argptr;
+	char		msg[MAXPRINTMSG];
+
+	if ( !developer || !developer->integer ) {
+		return;			// don't confuse non-developers with techie stuff...
+	}
+
+	va_start (argptr,fmt);
+	Q_vsnprintf (msg, sizeof(msg), fmt, argptr);
+	va_end (argptr);
+
+	Com_Printf ("%s", msg);
+
+#ifndef DEDICATED
+	if (com_dedicated && !com_dedicated->integer) {
+		UI_PrintDeveloperConsole(msg);
+	}
+#endif
+}
+
+/*
+================
+Com_DebugPrintf
+
+A Com_Printf that only shows up if the "developer" cvar is set
+================
+*/
+void QDECL Com_DebugPrintf( const char *fmt, ...) {
+	va_list		argptr;
+	char		msg[MAXPRINTMSG];
+
+	if ( !developer || !developer->integer ) {
+		return;			// don't confuse non-developers with techie stuff...
+	}
+
+	va_start (argptr,fmt);
+	Q_vsnprintf (msg, sizeof(msg), fmt, argptr);
+	va_end (argptr);
+
+	Sys_DebugPrint (msg);
+}
+
 #endif
 
 /*
@@ -353,37 +487,47 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 	com_errorEntered = qtrue;
 
 	va_start (argptr,fmt);
-	vsprintf (com_errorMessage,fmt,argptr);
+	Q_vsnprintf (com_errorMessage,sizeof(com_errorMessage),fmt,argptr);
 	va_end (argptr);
 
 	if (code != ERR_DISCONNECT && code != ERR_NEED_CD)
 		Cvar_Set("com_errorMessage", com_errorMessage);
 
 	if (code == ERR_DISCONNECT || code == ERR_SERVERDISCONNECT) {
-		CL_Disconnect();
-		CL_FlushMemory( );
+		if (com_cl_running && com_cl_running->integer) {
+			CL_AbnormalDisconnect();
+			CL_FlushMemory();
+			CL_StartHunkUsers(qfalse);
+		} else {
+            SV_Shutdown(va("Server disconnected: %s", com_errorMessage));
+		}
 		// make sure we can get at our local stuff
 		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if (code == ERR_DROP) {
 		Com_Printf ("********************\nERROR: %s\n********************\n", com_errorMessage);
-		SV_Shutdown (va("Server crashed: %s",  com_errorMessage));
-		CL_Disconnect();
-		CL_FlushMemory( );
+        SV_Shutdown(va("Server crashed: %s", com_errorMessage));
+#ifndef DEDICATED
+		if (com_cl_running && com_cl_running->integer) {
+			CL_AbnormalDisconnect();
+			CL_FlushMemory();
+			CL_StartHunkUsers(qfalse);
+		}
+#endif
 		FS_PureServerSetLoadedPaks("", "");
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_NEED_CD ) {
-		SV_Shutdown( "Server didn't have CD" );
-		if ( com_cl_running && com_cl_running->integer ) {
-			CL_Disconnect();
-			CL_FlushMemory( );
-			com_errorEntered = qfalse;
-			CL_CDDialog();
-		} else {
-			Com_Printf("Server didn't have CD\n" );
-		}
+        SV_Shutdown("Server didn't have CD");
+        if (com_cl_running && com_cl_running->integer) {
+            CL_Disconnect();
+            CL_FlushMemory();
+            com_errorEntered = qfalse;
+            CL_CDDialog();
+        } else {
+            Com_Printf("Server didn't have CD\n");
+        }
 		FS_PureServerSetLoadedPaks("", "");
 		longjmp (abortframe, -1);
 	} else {
@@ -514,7 +658,6 @@ be after execing the config and default.
 void Com_StartupVariable( const char *match ) {
 	int		i;
 	char	*s;
-	cvar_t	*cv;
 
 	for (i=0 ; i < com_numConsoleLines ; i++) {
 		Cmd_TokenizeString( com_consoleLines[i] );
@@ -523,11 +666,13 @@ void Com_StartupVariable( const char *match ) {
 		}
 
 		s = Cmd_Argv(1);
-		if ( !match || !strcmp( s, match ) ) {
-			Cvar_Set( s, Cmd_Argv(2) );
-			cv = Cvar_Get( s, "", 0 );
-			cv->flags |= CVAR_USER_CREATED;
-//			com_consoleLines[i] = 0;
+		
+		if(!match || !strcmp(s, match))
+		{
+			if(Cvar_Flags(s) == CVAR_NONEXISTENT)
+				Cvar_Get(s, Cmd_ArgsFrom(2), CVAR_USER_CREATED);
+			else
+				Cvar_Set2(s, Cmd_ArgsFrom(2), qfalse);
 		}
 	}
 }
@@ -555,9 +700,9 @@ qboolean Com_AddStartupCommands( void ) {
 			continue;
 		}
 
-		// set commands won't override menu startup
-		if ( Q_stricmpn( com_consoleLines[i], "set", 3 ) ) {
-			added = qtrue;
+		// set commands already added with Com_StartupVariable
+		if ( !Q_stricmpn( com_consoleLines[i], "set ", 4 ) ) {
+			continue;
 		}
 		Cbuf_AddText( com_consoleLines[i] );
 		Cbuf_AddText( "\n" );
@@ -791,7 +936,7 @@ CopyString
 char *CopyString( const char *in ) {
 	char	*out;
 
-#ifndef _DEBUG_MEM
+#ifndef ZONE_DEBUG
 	if (!in[0]) {
 		return ( char * )Z_EmptyStringPointer();
 	}
@@ -889,7 +1034,6 @@ EVENT LOOP
 static sysEvent_t  eventQueue[ MAX_QUEUED_EVENTS ];
 static int         eventHead = 0;
 static int         eventTail = 0;
-static byte        sys_packetReceived[ MAX_MSGLEN ];
 
 /*
 ================
@@ -904,6 +1048,19 @@ void Com_QueueEvent( int time, sysEventType_t type, int value, int value2, size_
 {
 	sysEvent_t  *ev;
 
+	// combine mouse movement with previous mouse event
+	if ( type == SE_MOUSE && eventHead != eventTail )
+	{
+		ev = &eventQueue[ ( eventHead + MAX_QUEUED_EVENTS - 1 ) & MASK_QUEUED_EVENTS ];
+
+		if ( ev->evType == SE_MOUSE )
+		{
+			ev->evValue += value;
+			ev->evValue2 += value2;
+			return;
+		}
+	}
+
 	ev = &eventQueue[ eventHead & MASK_QUEUED_EVENTS ];
 
 	if ( eventHead - eventTail >= MAX_QUEUED_EVENTS )
@@ -940,41 +1097,41 @@ Com_GetSystemEvent
 */
 sysEvent_t Com_GetSystemEvent(void)
 {
-    sysEvent_t  ev;
-    char* s;
+	sysEvent_t  ev;
+	char        *s;
 
-    // return if we have data
-    if (eventHead > eventTail)
-    {
-        eventTail++;
-        return eventQueue[(eventTail - 1) & MASK_QUEUED_EVENTS];
-    }
+	// return if we have data
+	if ( eventHead > eventTail )
+	{
+		eventTail++;
+		return eventQueue[ ( eventTail - 1 ) & MASK_QUEUED_EVENTS ];
+	}
 
-    // check for console commands
-    s = Sys_ConsoleInput();
-    if (s)
-    {
-        char* b;
-        int   len;
+	// check for console commands
+	s = Sys_ConsoleInput();
+	if ( s )
+	{
+		char  *b;
+		int   len;
 
-        len = strlen(s) + 1;
-        b = (char*)Z_Malloc(len);
-        strcpy(b, s);
-        Com_QueueEvent(0, SE_CONSOLE, 0, 0, len, b);
-    }
+		len = strlen( s ) + 1;
+		b = Z_Malloc( len );
+		strcpy( b, s );
+		Com_QueueEvent( 0, SE_CONSOLE, 0, 0, len, b );
+	}
 
-    // return if we have data
-    if (eventHead > eventTail)
-    {
-        eventTail++;
-        return eventQueue[(eventTail - 1) & MASK_QUEUED_EVENTS];
-    }
+	// return if we have data
+	if ( eventHead > eventTail )
+	{
+		eventTail++;
+		return eventQueue[ ( eventTail - 1 ) & MASK_QUEUED_EVENTS ];
+	}
 
-    // create an empty event to return
-    memset(&ev, 0, sizeof(ev));
-    ev.evTime = Sys_Milliseconds();
+	// create an empty event to return
+	memset( &ev, 0, sizeof( ev ) );
+	ev.evTime = Sys_Milliseconds();
 
-    return ev;
+	return ev;
 }
 
 /*
@@ -983,7 +1140,7 @@ Com_GetRealEvent
 =================
 */
 sysEvent_t	Com_GetRealEvent( void ) {
-	size_t		r;
+	int			r;
 	sysEvent_t	ev;
 
 	// either get an event from the system or the journal file
@@ -1122,7 +1279,6 @@ int Com_EventLoop( void ) {
 	MSG_Init( &buf, bufData, sizeof( bufData ) );
 
 	while ( 1 ) {
-		NET_FlushPacketQueue();
 		ev = Com_GetEvent();
 
 		// if no more events are available
@@ -1143,57 +1299,26 @@ int Com_EventLoop( void ) {
 		}
 
 
-		switch ( ev.evType ) {
-		default:
-			Com_Error( ERR_FATAL, "Com_EventLoop: bad event type %i", ev.evType );
+		switch(ev.evType)
+		{
+			case SE_KEY:
+				CL_KeyEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-        case SE_NONE:
-            break;
-		case SE_KEY:
-			CL_KeyEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_CHAR:
+				CL_CharEvent( ev.evValue );
 			break;
-		case SE_CHAR:
-			CL_CharEvent( ev.evValue );
+			case SE_MOUSE:
+				CL_MouseEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-		case SE_MOUSE:
-			CL_MouseEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_JOYSTICK_AXIS:
+				CL_JoystickEvent( ev.evValue, ev.evValue2, ev.evTime );
 			break;
-		case SE_JOYSTICK_AXIS:
-			CL_JoystickEvent( ev.evValue, ev.evValue2, ev.evTime );
+			case SE_CONSOLE:
+				Cbuf_AddText( (char *)ev.evPtr );
+				Cbuf_AddText( "\n" );
 			break;
-		case SE_CONSOLE:
-			Cbuf_AddText( (char *)ev.evPtr );
-			Cbuf_AddText( "\n" );
-			break;
-		case SE_PACKET:
-			// this cvar allows simulation of connections that
-			// drop a lot of packets.  Note that loopback connections
-			// don't go through here at all.
-			if ( com_dropsim->value > 0 ) {
-				static int seed;
-
-				if ( Q_random( &seed ) < com_dropsim->value ) {
-					break;		// drop this packet
-				}
-			}
-
-			evFrom = *(netadr_t *)ev.evPtr;
-			buf.cursize = ev.evPtrLength - sizeof( evFrom );
-
-			// we must copy the contents of the message out, because
-			// the event buffers are only large enough to hold the
-			// exact payload, but channel messages need to be large
-			// enough to hold fragment reassembly
-			if ( (unsigned)buf.cursize > buf.maxsize ) {
-				Com_Printf("Com_EventLoop: oversize packet\n");
-				continue;
-			}
-			Com_Memcpy( buf.data, (byte *)((netadr_t *)ev.evPtr + 1), buf.cursize );
-			if ( com_sv_running->integer ) {
-				Com_RunAndTimeServerPacket( &evFrom, &buf );
-			} else {
-				CL_PacketEvent( evFrom, &buf );
-			}
+			default:
+				Com_Error( ERR_FATAL, "Com_EventLoop: bad event type %i", ev.evType );
 			break;
 		}
 
@@ -1282,9 +1407,8 @@ Com_Crash_f
 A way to force a bus error for development reasons
 =================
 */
-static void Com_Crash_f(void) {
-	void* invalid_ptr = NULL;
-	*(int*)invalid_ptr = 0x12345678;
+static void Com_Crash_f( void ) {
+	* ( volatile int * ) 0 = 0x12345678;
 }
 
 /*
@@ -1547,6 +1671,38 @@ static void Com_DetectAltivec(void)
 	}
 }
 
+/*
+=================
+Com_InitRand
+Seed the random number generator, if possible with an OS supplied random seed.
+=================
+*/
+static void Com_InitRand(void)
+{
+	unsigned int seed;
+
+	if(Sys_RandomBytes((byte *) &seed, sizeof(seed)))
+		srand(seed);
+	else
+		srand(time(NULL));
+}
+
+/*
+=================
+Com_ConfigExists
+=================
+*/
+qboolean Com_ConfigExists(const char* configname) {
+	fileHandle_t handle = (fileHandle_t)0;
+
+    if (FS_FOpenFileRead(va("configs/%s", configname), &handle, qfalse, qfalse) == -1) {
+		return qfalse;
+    }
+
+	FS_FCloseFile(handle);
+	return qtrue;
+}
+
 /*
 =================
 Com_Init
@@ -1557,6 +1713,8 @@ void Com_Init( char *commandLine ) {
 	int			iEnd;
 	const char	*s;
 	char		configname[ 128 ];
+	int			qport;
+	qboolean	configExists;
 
 	Com_Printf( "--- Common Initialization ---\n" );
 
@@ -1568,6 +1726,15 @@ void Com_Init( char *commandLine ) {
 		Sys_Error("Error during initialization");
 	}
 
+	// Clear queues
+	Com_Memset( &eventQueue[ 0 ], 0, MAX_QUEUED_EVENTS * sizeof( sysEvent_t ) );
+
+	// initialize the weak pseudo-random number generator for use later.
+	Com_InitRand();
+
+	// do this before anything else decides to push events
+	Com_InitPushEvent();
+
 	// prepare enough of the subsystems to handle
 	// cvar and command buffer management
 	Com_ParseCommandLine( commandLine );
@@ -1590,7 +1757,8 @@ void Com_Init( char *commandLine ) {
 	// done early so bind command exists
 	CL_InitKeyCommands();
 
-	com_target_game = Cvar_Get("com_target_game", "0", CVAR_LATCH | CVAR_PROTECTED);
+	com_target_game = Cvar_Get("com_target_game", "0", CVAR_INIT|CVAR_PROTECTED);
+	com_target_demo = Cvar_Get("com_target_demo", "0", CVAR_INIT|CVAR_PROTECTED);
 	com_target_version = Cvar_Get("com_target_version", "0.00", CVAR_ROM);
 	com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
 	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
@@ -1610,7 +1778,9 @@ void Com_Init( char *commandLine ) {
 
 	Cbuf_AddText( "exec menu.cfg\n" );
 
-	Cbuf_AddText ("exec newconfig.cfg\n");
+	// Removed in OPM
+	//  Not relevant as there is no auto-configurator
+	//Cbuf_AddText ("exec newconfig.cfg\n");
 
 	cvar_global_force = qtrue;
 	Cbuf_Execute( 0 );
@@ -1623,27 +1793,36 @@ void Com_Init( char *commandLine ) {
 
 	config = Cvar_Get( "config", "omconfig.cfg", 0 );
 
-	if( strlen( config->string ) <= 1 )
+	if( strlen( config->string ) > 1 )
+	{
+		size_t len = strlen( config->string );
+
+		Q_strncpyz( configname, config->string, len >= sizeof( configname ) ? sizeof( configname ) : len );
+		COM_StripExtension( configname, configname, sizeof( configname ) );
+		Q_strcat( configname, sizeof( configname ), ".cfg" );
+		SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
+	}
+	else
 	{
 		long size = sizeof( configname );
 		LoadRegistryInfo(1, "config", configname, &size );
 		COM_DefaultExtension( configname, sizeof( configname ), ".cfg" );
 	}
-	else
-	{
-		size_t len = strlen( config->string );
-
-		strncpy( configname, config->string, len >= sizeof( configname ) ? sizeof( configname ) : len );
-		COM_StripExtension( configname, configname, sizeof( configname ) );
-		strcat( configname, ".cfg" );
-		SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
-	}
 
 	SaveRegistryInfo( 1, "config", configname, sizeof( configname ) );
+
 	Cvar_Set( "config", configname );
 	Com_Printf( "Config: %s\n", configname );
 
-	Cbuf_AddText( va( "exec configs/%s\n", configname ) );
+	configExists = Com_ConfigExists(configname);
+
+	if ( !configExists ) {
+		Com_Printf( "The config file '%s' doesn't exist, using unnamedsoldier.cfg as a template\n", configname );
+		Cbuf_AddText( va( "exec configs/unnamedsoldier.cfg\n", configname ) );
+		com_gotOriginalConfig = qtrue;
+	} else {
+		Cbuf_AddText( va( "exec configs/%s\n", configname ) );
+	}
 
 	if( Com_SafeMode() )
 	{
@@ -1674,6 +1853,7 @@ void Com_Init( char *commandLine ) {
 	Cmd_AddCommand("changeVectors", MSG_ReportChangeVectors_f );
 	Cmd_AddCommand("writeconfig", Com_WriteConfig_f );
 	Cmd_SetCommandCompletionFunc( "writeconfig", Cmd_CompleteCfgName );
+	Cmd_AddCommand("pause", Com_Pause_f);
 	Cmd_AddCommand("game_restart", Com_GameRestart_f);
 
 	// override anything from the config files with command line args
@@ -1714,6 +1894,7 @@ void Com_Init( char *commandLine ) {
 	com_dropsim = Cvar_Get( "com_dropsim", "0", CVAR_CHEAT );
 	com_viewlog = Cvar_Get( "viewlog", "0", CVAR_CHEAT );
 	com_logfile = Cvar_Get("logfile", "0", CVAR_TEMP);
+	com_logfile_timestamps = Cvar_Get("logfile_timestamps", "1", CVAR_TEMP);
 	com_speeds = Cvar_Get( "com_speeds", "0", 0 );
 	com_timedemo = Cvar_Get( "timedemo", "0", CVAR_CHEAT );
 	com_dedicated = Cvar_Get( "dedicated", "0", CVAR_LATCH );
@@ -1739,19 +1920,24 @@ void Com_Init( char *commandLine ) {
 		}
 	}
 
-	s = va( "%s %s %s (%s)", PRODUCT_VERSION_FULL, PLATFORM_STRING, PRODUCT_VERSION_DATE, Cvar_VariableString("com_target_extension"));
+	s = va( "%s %s (Medal of Honor: %s %s) %s %s", PRODUCT_NAME, PRODUCT_VERSION_FULL, Cvar_VariableString("com_target_extension"), Cvar_VariableString("com_target_version"), PLATFORM_STRING, PRODUCT_VERSION_DATE);
 	com_version = Cvar_Get( "version", s, CVAR_ROM | CVAR_SERVERINFO );
-	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM );
-	com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_SERVERINFO | CVAR_INIT);
+	com_gamename = Cvar_Get("com_gamename", "", CVAR_SERVERINFO | CVAR_INIT | CVAR_USERINFO | CVAR_SERVERINFO);
+	com_shortversion = Cvar_Get( "shortversion", PRODUCT_VERSION, CVAR_ROM | CVAR_USERINFO | CVAR_SERVERINFO );
+	com_protocol = Cvar_Get("com_protocol", va("%i", PROTOCOL_VERSION), CVAR_INIT);
 #ifdef LEGACY_PROTOCOL
 	com_legacyprotocol = Cvar_Get("com_legacyprotocol", va("%i", PROTOCOL_LEGACY_VERSION), CVAR_INIT);
 
+	com_updatecheck_enabled = Cvar_Get("com_updatecheck_enabled", "1", CVAR_ARCHIVE);
+	com_updatecheck_interval = Cvar_Get("com_updatecheck_interval", "15", 0);
+    Cvar_CheckRange(com_updatecheck_interval, 5, 240, qtrue);
+
 	// Keep for compatibility with old mods / mods that haven't updated yet.
 	if(com_legacyprotocol->integer > 0)
-		Cvar_Get("protocol", com_legacyprotocol->string, CVAR_ROM);
+		Cvar_Get("protocol", com_legacyprotocol->string, CVAR_SERVERINFO | CVAR_ROM);
 	else
 #endif
-		Cvar_Get("protocol", com_protocol->string, CVAR_ROM);
+		Cvar_Get("protocol", com_protocol->string, CVAR_SERVERINFO | CVAR_ROM);
 
 #ifndef DEDICATED
 	con_autochat = Cvar_Get("con_autochat", "1", CVAR_ARCHIVE);
@@ -1760,7 +1946,14 @@ void Com_Init( char *commandLine ) {
 	demo_protocols[0] = com_protocol->integer;
 
 	Sys_Init();
-	Netchan_Init( Com_Milliseconds() & 0xffff );	// pick a port value that should be nice and random
+
+#ifdef NDEBUG
+	Sys_InitPIDFile(FS_GetCurrentGameDir());
+#endif
+
+	// Pick a random port value
+	Com_RandomBytes((byte*)&qport, sizeof(int));
+	Netchan_Init(qport & 0xffff);
 	SV_Init();
 
 	com_dedicated->modified = qfalse;
@@ -1769,7 +1962,6 @@ void Com_Init( char *commandLine ) {
 	if( com_dedicated->integer )
 	{
 		Sys_CloseMutex();
-		NET_Init();
 	}
 	else
 	{
@@ -1778,7 +1970,6 @@ void Com_Init( char *commandLine ) {
 	}
 #else
     Sys_CloseMutex();
-    NET_Init();
 #endif
 
 	// set com_frameTime so that if a map is started on the
@@ -1791,12 +1982,79 @@ void Com_Init( char *commandLine ) {
 
 	com_fullyInitialized = qtrue;
 
+	// always set the cvar, but only print the info if it makes sense.
+	Com_DetectAltivec();
+#if idppc
+	Com_Printf ("Altivec support is %s\n", com_altivec->integer ? "enabled" : "disabled");
+#endif
+
+	com_pipefile = Cvar_Get( "com_pipefile", "", CVAR_ARCHIVE|CVAR_LATCH );
+	if( com_pipefile->string[0] )
+	{
+		pipefile = FS_FCreateOpenPipeFile( com_pipefile->string );
+	}
+
 	RecoverLostAutodialData();
 
+    // Added in OPM
+    //  Initialize GameSpy related stuff
+    Com_InitGameSpy();
+
 	iEnd = Sys_Milliseconds();
 	Com_Printf( "--- Common Initialization Complete --- %i ms\n", iEnd - iStart );
 }
 
+/*
+===============
+Com_ReadFromPipe
+
+Read whatever is in com_pipefile, if anything, and execute it
+===============
+*/
+void Com_ReadFromPipe( void )
+{
+	static char buf[MAX_STRING_CHARS];
+	static int accu = 0;
+	int read;
+
+	if( !pipefile )
+		return;
+
+	while( ( read = FS_Read( buf + accu, sizeof( buf ) - accu - 1, pipefile ) ) > 0 )
+	{
+		char *brk = NULL;
+		int i;
+
+		for( i = accu; i < accu + read; ++i )
+		{
+			if( buf[ i ] == '\0' )
+				buf[ i ] = '\n';
+			if( buf[ i ] == '\n' || buf[ i ] == '\r' )
+				brk = &buf[ i + 1 ];
+		}
+		buf[ accu + read ] = '\0';
+
+		accu += read;
+
+		if( brk )
+		{
+			char tmp = *brk;
+			*brk = '\0';
+			Cbuf_ExecuteText( EXEC_APPEND, buf );
+			*brk = tmp;
+
+			accu -= brk - buf;
+			memmove( buf, brk, accu + 1 );
+		}
+		else if( accu >= sizeof( buf ) - 1 ) // full
+		{
+			Cbuf_ExecuteText( EXEC_APPEND, buf );
+			accu = 0;
+		}
+	}
+}
+
+
 //==================================================================
 
 void Com_WriteConfigToFile( const char *filename ) {
@@ -1963,17 +2221,13 @@ void Com_Frame( void ) {
 	int		msec, minMsec;
 	int		timeVal, timeValSV;
 	static int	lastTime = 0, bias = 0;
-	int key;
-
+ 
 	int		timeBeforeFirstEvents;
-	int           timeBeforeServer;
-	int           timeBeforeEvents;
-	int           timeBeforeClient;
-	int           timeAfter;
-
-
-
-
+	int		timeBeforeServer;
+	int		timeBeforeEvents;
+	int		timeBeforeClient;
+	int		timeAfter;
+  
 
 	if ( setjmp (abortframe) ) {
 		return;			// an ERR_DROP was thrown
@@ -1999,10 +2253,6 @@ void Com_Frame( void ) {
 	timeBeforeClient = 0;
 	timeAfter = 0;
 
-
-	// old net chan encryption key
-	key = 0x87243987;
-
 #ifndef DEDICATED
 	// write config file if anything changed
 	Com_WriteConfiguration();
@@ -2107,6 +2357,11 @@ void Com_Frame( void ) {
 		if ( !com_dedicated->integer ) {
 			SV_Shutdown( "dedicated set to 0" );
 			CL_FlushMemory();
+		} else {
+			CL_Shutdown("dedicated set to 1", qtrue, qtrue);
+			Sys_CloseMutex();
+			Sys_ShowConsole(0, 0);
+			NET_Init();
 		}
 	}
 
@@ -2122,7 +2377,9 @@ void Com_Frame( void ) {
 		timeBeforeEvents = Sys_Milliseconds ();
 	}
 	Com_EventLoop();
-	Cbuf_Execute(msec);
+	if (CL_FinishedIntro()) {
+		Cbuf_Execute(msec);
+	}
 
 
 	//
@@ -2166,19 +2423,35 @@ void Com_Frame( void ) {
 	}
 
 	if (fps->integer) {
-		fps_time_t fpstime = fps_clock_t::now();
-		fps_delta_t delta = fpstime - fpslasttime;
+		fps_time_t fpstime;
+		fps_delta_t delta;
+
+#ifdef __cplusplus
+		fpstime = fps_clock_t::now();
+#else
+		fpstime = Sys_Milliseconds();
+#endif
+
+		delta = fpstime - fpslasttime;
 
 		fpstotal = (fpstime - fpslasttime) + (fpstotal - fpstimes[fpsindex]);
 		fpstimes[fpsindex] = fpstime - fpslasttime;
 		fpsindex = (fpsindex + 1) % MAX_FPS_TIMES;
 		fpslasttime = fpstime;
 
+#ifdef __cplusplus
 		if (fpstotal.count()) {
-			currentfps = 16.0 / std::chrono::duration<long double>(fpstotal).count();
+			currentfps = MAX_FPS_TIMES / std::chrono::duration<long double>(fpstotal).count();
 		} else {
 			currentfps = 0.0;
 		}
+#else
+		if (fpstotal) {
+			currentfps = MAX_FPS_TIMES / (fpstotal / 1000.0);
+		} else {
+			currentfps = 0.0;
+		}
+#endif
 	}
 
 	//
@@ -2198,8 +2471,9 @@ void Com_Frame( void ) {
 		c_pointcontents = 0;
 	}
 
-	// old net chan encryption key
-	key = lastTime * 0x87243987;
+	Com_ReadFromPipe();
+
+    Sys_ProcessBackgroundTasks();
 
 	com_frameNumber++;
 }
@@ -2222,71 +2496,65 @@ void Com_Shutdown (void) {
 
 }
 
-qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName )
+qboolean Com_SanitizeName(const char* pszOldName, char* pszNewName, size_t bufferSize)
 {
-	int i;
-	qboolean bBadName = false;
-	const char *p = pszOldName;
+    int i;
+    qboolean bBadName = qfalse;
+    const char* p = pszOldName;
+    size_t maxLength;
 
-	if( *pszOldName && *pszOldName <= ' ' )
-	{
-		bBadName = true;
+    maxLength = (bufferSize / sizeof(char)) - 1;
+    bBadName = qfalse;
 
-		while( *p && *p <= ' ' )
-		{
-			p++;
-		}
-	}
+    for (p = pszOldName; *p && *(unsigned char*)p <= ' '; p++) {
+        bBadName = qtrue;
+    }
 
-	i = 0;
-	for( i = 0; *p && *p >= ' '; p++, i++ )
-	{
-		if( *p == '~' || *p == '`' )
-		{
-			pszNewName[ i ] = '*';
-			bBadName = true;
-		}
-		else if( *p == '\"' )
-		{
-			pszNewName[ i ] = '\'';
-			bBadName = true;
-		}
-		else if( *p == '\\' )
-		{
-			pszNewName[ i ] = '/';
-			bBadName = true;
-		}
-		else if( *p == ';' )
-		{
-			pszNewName[ i ] = ':';
-			bBadName = true;
-		}
-		else
-		{
-			pszNewName[ i ] = *p;
-		}
-	}
+    for (i = 0; *p && *p >= ' ' && i < maxLength; p++, i++)
+    {
+        if (*p == '~' || *p == '`')
+        {
+            pszNewName[i] = '*';
+            bBadName = qtrue;
+        }
+        else if (*p == '\"')
+        {
+            pszNewName[i] = '\'';
+            bBadName = qtrue;
+        }
+        else if (*p == '\\')
+        {
+            pszNewName[i] = '/';
+            bBadName = qtrue;
+        }
+        else if (*p == ';')
+        {
+            pszNewName[i] = ':';
+            bBadName = qtrue;
+        }
+        else
+        {
+            pszNewName[i] = *p;
+        }
+    }
 
-	if( i > 0 && pszNewName[ i - 1 ] <= ' ' )
-	{
-		bBadName = true;
-		do
-		{
-			p++;
-		} while( i > 0 && pszNewName[ i - 1 ] <= ' ' );
-	}
-	pszNewName[ i ] = 0;
+    for (; i > 0 && (unsigned char)pszNewName[i - 1] <= ' '; i--) {
+        bBadName = qtrue;
+    }
 
-	if( !i )
-	{
-		memcpy( pszNewName, "*** Blank Name ***", sizeof( "*** Blank Name ***" ) );
-		bBadName = true;
-	}
+    pszNewName[i] = 0;
 
-	if( *p )
-		bBadName = true;
+    if (!i)
+    {
+        const char* pNewNameDynamic = va("*** Blank Name #%04d ***", rand() % 100000);
+        Q_strncpyz(pszNewName, pNewNameDynamic, bufferSize);
+        bBadName = qtrue;
+    }
 
-	return bBadName;
+    if (*p)
+        bBadName = qtrue;
+
+    return bBadName;
 }
 
 const char *Com_GetArchiveFileName( const char *filename, const char *extension )
@@ -2314,6 +2582,45 @@ void Com_WipeSavegame( const char *savename )
 	FS_DeleteFile( Com_GetArchiveFileName( savename, "tga" ) );
 }
 
+qboolean Com_ShiftedStrStr(const char* shifted, const char* name, int offset) {
+	char string[1024];
+	int i;
+
+	for (i = 0; name[i]; i++) {
+		string[i] = name[i] - offset;
+	}
+	string[i] = 0;
+
+	return strstr(string, shifted) != NULL;
+}
+
+qboolean COM_IsMapValid(const char* name) {
+	// FIXME: Not sure where this method comes from
+	//  this function is present only in the BT 2.40 Mac build
+	//  it is not present on the BT 2.40 Win32 build
+	return qtrue;
+
+	/*
+	char lowered[MAX_QPATH];
+
+	strcpy(lowered, name);
+	strlwr(lowered);
+
+	return Com_ShiftedStrStr("adSUbn]cS`]V", lowered, 12)
+		|| Com_ShiftedStrStr("RUDUFQJWRTDTGO", lowered, 27)
+		|| Com_ShiftedStrStr("etgfkvu", lowered, -2);
+	*/
+}
+
+void Com_SwapSaveStruct(savegamestruct_t* save) {
+	save->version = LittleShort(save->version);
+	save->time = LittleLong(save->time);
+	save->mapTime = LittleLong(save->mapTime);
+
+	save->tm_loopcount = LittleLong(save->tm_loopcount);
+	save->tm_offset = LittleLong(save->tm_offset);
+}
+
 //------------------------------------------------------------------------
 
 
@@ -2507,6 +2814,7 @@ void Field_CompleteCommand(char* cmd,
     else
         completionString = Cmd_Argv(completionArgument - 1);
 
+#if 0
 #ifndef DEDICATED
     // add a '\' to the start of the buffer if it might be sent as chat otherwise
     if (con_autochat->integer && completionField->buffer[0] &&
@@ -2527,6 +2835,7 @@ void Field_CompleteCommand(char* cmd,
 
         completionField->buffer[0] = '\\';
     }
+#endif
 #endif
 
     if (completionArgument > 1)
@@ -2535,7 +2844,7 @@ void Field_CompleteCommand(char* cmd,
         char* p;
 
 #ifndef DEDICATED
-        // This should always be true
+        // This should always be qtrue
         if (baseCmd[0] == '\\' || baseCmd[0] == '/')
             baseCmd++;
 #endif
@@ -2588,36 +2897,295 @@ void Field_AutoComplete(field_t* field)
     Field_CompleteCommand(completionField->buffer, qtrue, qtrue);
 }
 
-void Com_InitTargetGameWithType(target_game_e target_game)
-{
-	const char* protocol;
+/*
+==================
+Com_RandomBytes
 
+fills string array with len random bytes, preferably from the OS randomizer
+==================
+*/
+void Com_RandomBytes( byte *string, int len )
+{
+	int i;
+
+	if( Sys_RandomBytes( string, len ) )
+		return;
+
+	Com_Printf( "Com_RandomBytes: using weak randomization\n" );
+	for( i = 0; i < len; i++ )
+		string[i] = (unsigned char)( rand() % 256 );
+}
+
+
+/*
+==================
+Com_IsVoipTarget
+
+Returns non-zero if given clientNum is enabled in voipTargets, zero otherwise.
+If clientNum is negative return if any bit is set.
+==================
+*/
+qboolean Com_IsVoipTarget(uint8_t *voipTargets, int voipTargetsSize, int clientNum)
+{
+	int index;
+	if(clientNum < 0)
+	{
+		for(index = 0; index < voipTargetsSize; index++)
+		{
+			if(voipTargets[index])
+				return qtrue;
+		}
+		
+		return qfalse;
+	}
+
+	index = clientNum >> 3;
+	
+	if(index < voipTargetsSize)
+		return (voipTargets[index] & (1 << (clientNum & 0x07)));
+
+	return qfalse;
+}
+
+/*
+===============
+Field_CompletePlayerName
+===============
+*/
+static qboolean Field_CompletePlayerNameFinal( qboolean whitespace )
+{
+	int completionOffset;
+
+	if( matchCount == 0 )
+		return qtrue;
+
+	completionOffset = strlen( completionField->buffer ) - strlen( completionString );
+
+	Q_strncpyz( &completionField->buffer[ completionOffset ], shortestMatch,
+		sizeof( completionField->buffer ) - completionOffset );
+
+	completionField->cursor = strlen( completionField->buffer );
+
+	if( matchCount == 1 && whitespace )
+	{
+		Q_strcat( completionField->buffer, sizeof( completionField->buffer ), " " );
+		completionField->cursor++;
+		return qtrue;
+	}
+
+	return qfalse;
+}
+
+static void Name_PlayerNameCompletion( const char **names, int nameCount, void(*callback)(const char *s) ) 
+{
+	int i;
+
+	for( i = 0; i < nameCount; i++ ) {
+		callback( names[ i ] );
+	}
+}
+
+qboolean Com_FieldStringToPlayerName( char *name, int length, const char *rawname )
+{
+	char		hex[5];
+	int			i;
+	int			ch;
+
+	if( name == NULL || rawname == NULL )
+		return qfalse;
+
+	if( length <= 0 )
+		return qtrue;
+
+	for( i = 0; *rawname && i + 1 <= length; rawname++, i++ ) {
+		if( *rawname == '\\' ) {
+			Q_strncpyz( hex, rawname + 1, sizeof(hex) );
+			ch = Com_HexStrToInt( hex );
+			if( ch > -1 ) {
+				name[i] = ch;
+				rawname += 4; //hex string length, 0xXX
+			} else {
+				name[i] = *rawname;
+			}
+		} else {
+			name[i] = *rawname;
+		}
+	}
+	name[i] = '\0';
+
+	return qtrue;
+}
+
+qboolean Com_PlayerNameToFieldString( char *str, int length, const char *name )
+{
+	const char *p;
+	int i;
+	int x1, x2;
+
+	if( str == NULL || name == NULL )
+		return qfalse;
+
+	if( length <= 0 )
+		return qtrue;
+
+	*str = '\0';
+	p = name;
+
+	for( i = 0; *p != '\0'; i++, p++ )
+	{
+		if( i + 1 >= length )
+			break;
+
+		if( *p <= ' ' )
+		{
+			if( i + 5 + 1 >= length )
+				break;
+
+			x1 = *p >> 4;
+			x2 = *p & 15;
+
+			str[i+0] = '\\';
+			str[i+1] = '0';
+			str[i+2] = 'x';
+			str[i+3] = x1 > 9 ? x1 - 10 + 'a' : x1 + '0';
+			str[i+4] = x2 > 9 ? x2 - 10 + 'a' : x2 + '0';
+
+			i += 4;
+		} else {
+			str[i] = *p;
+		}		
+	}
+	str[i] = '\0';
+
+	return qtrue;
+}
+
+void Field_CompletePlayerName( const char **names, int nameCount )
+{
+	qboolean whitespace;
+
+	matchCount = 0;
+	shortestMatch[ 0 ] = 0;
+
+	if( nameCount <= 0 )
+		return;
+
+	Name_PlayerNameCompletion( names, nameCount, FindMatches );
+
+	if( completionString[0] == '\0' )
+	{
+		Com_PlayerNameToFieldString( shortestMatch, sizeof( shortestMatch ), names[ 0 ] );
+	}
+
+	//allow to tab player names
+	//if full player name switch to next player name
+	if( completionString[0] != '\0'
+		&& Q_stricmp( shortestMatch, completionString ) == 0 
+		&& nameCount > 1 ) 
+	{
+		int i;
+
+		for( i = 0; i < nameCount; i++ ) {
+			if( Q_stricmp( names[ i ], completionString ) == 0 ) 
+			{
+				i++;
+				if( i >= nameCount )
+				{
+					i = 0;
+				}
+
+				Com_PlayerNameToFieldString( shortestMatch, sizeof( shortestMatch ), names[ i ] );
+				break;
+			}
+		}
+	}
+
+	if( matchCount > 1 )
+	{
+		Com_Printf( "]%s\n", completionField->buffer );
+		
+		Name_PlayerNameCompletion( names, nameCount, PrintMatches );
+	}
+
+	whitespace = nameCount == 1? qtrue: qfalse;
+	if( !Field_CompletePlayerNameFinal( whitespace ) )
+	{
+
+	}
+}
+
+int QDECL Com_strCompare( const void *a, const void *b )
+{
+    const char **pa = (const char **)a;
+    const char **pb = (const char **)b;
+    return strcmp( *pa, *pb );
+}
+
+void Com_InitTargetGameWithType(target_game_e target_game, qboolean bIsDemo)
+{
     switch (target_game)
     {
-    case target_game_e::TG_MOH:
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOH));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOH));
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOH);
+    case TG_MOH:
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH));
+			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH));
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOH_DEMO));
+			Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOH_DEMO));
+        }
+		protocol_version_demo = protocol_version_full = PROTOCOL_MOH;
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOH, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOH);
+		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOH);
 		// "main" is already used as first argument of FS_Startup
 		Cvar_Set("fs_basegame", "");
         break;
 
-    case target_game_e::TG_MOHTA:
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTA);
+    case TG_MOHTA:
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
+		}
+		protocol_version_demo = PROTOCOL_MOHTA_DEMO;
+		protocol_version_full = PROTOCOL_MOHTA;
+		Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTA, PRODUCT_VERSION));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTA);
-        Cvar_Set("fs_basegame", "mainta");
+		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTA);
+		if (!bIsDemo) {
+			Cvar_Set("fs_basegame", "mainta");
+		} else {
+			// Targeting a demo
+			Cvar_Set("fs_basegame", "demota");
+		}
         break;
 
-    case target_game_e::TG_MOHTT:
+    case TG_MOHTT:
 		// mohta and mohtt use the same protocol version number
-        Cvar_Set("com_protocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-        Cvar_Set("com_legacyprotocol", va("%i", protocol_e::PROTOCOL_MOHTA));
-		Cvar_Set("com_target_version", TARGET_GAME_VERSION_MOHTT);
+		if (!bIsDemo) {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT, PRODUCT_VERSION));
+		} else {
+			Cvar_Set("com_protocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_legacyprotocol", va("%i", PROTOCOL_MOHTA_DEMO));
+            Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
+            Cvar_Set("com_target_version", va("%s+%s", TARGET_GAME_VERSION_MOHTT_DEMO, PRODUCT_VERSION));
+        }
+        protocol_version_demo = PROTOCOL_MOHTA_DEMO;
+        protocol_version_full = PROTOCOL_MOHTA;
+        Cvar_Set("com_protocol_alt", va("%i", PROTOCOL_MOHTA));
 		Cvar_Set("com_target_extension", PRODUCT_EXTENSION_MOHTT);
-        Cvar_Set("fs_basegame", "maintt");
+		Cvar_Set("com_gamename", TARGET_GAME_NAME_MOHTT);
+		if (!bIsDemo) {
+			Cvar_Set("fs_basegame", "maintt");
+		} else {
+			// Targeting a demo
+			Cvar_Set("fs_basegame", "demott");
+		}
         break;
 
     default:
@@ -2634,7 +3202,7 @@ Com_InitTargetGame
 ===============
 */
 void Com_InitTargetGame() {
-	Com_InitTargetGameWithType(static_cast<target_game_e>(com_target_game->integer));
+	Com_InitTargetGameWithType((target_game_e)com_target_game->integer, com_target_demo->integer);
 }
 
 #ifdef __cplusplus
diff --git a/code/qcommon/con_arrayset.h b/code/qcommon/con_arrayset.h
index f6289119..94315984 100644
--- a/code/qcommon/con_arrayset.h
+++ b/code/qcommon/con_arrayset.h
@@ -26,34 +26,76 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "mem_blockalloc.h"
 
-template<typename key, typename value>
+#if defined(GAME_DLL)
+#    include "../fgame/g_local.h"
+
+#    define ARRAYSET_Alloc gi.Malloc
+#    define ARRAYSET_Free  gi.Free
+
+#elif defined(CGAME_DLL)
+#    include "../cgame/cg_local.h"
+
+#    define ARRAYSET_Alloc cgi.Malloc
+#    define ARRAYSET_Free  cgi.Free
+
+#elif defined(REF_DLL)
+#    include "../renderercommon/tr_common.h"
+
+#    define ARRAYSET_Alloc ri.Malloc
+#    define ARRAYSET_Free  ri.Free
+
+#else
+#    include "qcommon.h"
+
+#    define ARRAYSET_Alloc Z_Malloc
+#    define ARRAYSET_Free  Z_Free
+#endif
+
+template<typename k, typename v>
+class con_arrayset;
+
+template<typename k, typename v>
 class con_arrayset_enum;
 
 template<typename k, typename v>
-class con_arrayset : public con_set<k, v>
+class con_arrayset_Entry
+{
+    friend con_arrayset<k, v>;
+    friend con_arrayset_enum<k, v>;
+
+public:
+    k            key;
+    v            value;
+    unsigned int index;
+
+    con_arrayset_Entry *next;
+
+public:
+    void *operator new(size_t size) { return con_arrayset<k, v>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_arrayset<k, v>::DeleteEntry(ptr); }
+
+    con_arrayset_Entry()
+    {
+        this->key   = k();
+        this->value = v();
+
+        index = 0;
+        next  = NULL;
+    }
+
+#ifdef ARCHIVE_SUPPORTED
+    void Archive(Archiver& arc);
+#endif
+};
+
+template<typename k, typename v>
+class con_arrayset
 {
     friend class con_arrayset_enum<k, v>;
 
 public:
-    class Entry
-    {
-    public:
-        k            key;
-        v            value;
-        unsigned int index;
-
-        Entry *next;
-
-    public:
-        void *operator new(size_t size);
-        void  operator delete(void *ptr);
-
-        Entry();
-
-#ifdef ARCHIVE_SUPPORTED
-        void Archive(Archiver& arc);
-#endif
-    };
+    using Entry = con_arrayset_Entry<k, v>;
 
 public:
     static MEM_BlockAlloc<Entry> Entry_allocator;
@@ -72,6 +114,12 @@ protected:
     Entry *addKeyEntry(const k& key);
     Entry *addNewKeyEntry(const k& key);
 
+public:
+    static void *NewEntry(size_t size);
+    static void  DeleteEntry(void *entry);
+    static void *NewTable(size_t count);
+    static void  DeleteTable(void *table);
+
 public:
     con_arrayset();
     ~con_arrayset();
@@ -80,13 +128,14 @@ public:
     void Archive(Archiver& arc);
 #endif
 
-    void clear();
-    void resize(int count = 0);
+    void         clear();
+    void         resize(int count = 0);
+    unsigned int size() const;
 
     unsigned int findKeyIndex(const k& key);
     unsigned int addKeyIndex(const k& key);
     unsigned int addNewKeyIndex(const k& key);
-    bool         remove(const k        &key);
+    bool         remove(const k& key);
 
     v& operator[](unsigned int index);
 };
@@ -95,25 +144,27 @@ template<typename k, typename v>
 MEM_BlockAlloc<typename con_arrayset<k, v>::Entry> con_arrayset<k, v>::Entry_allocator;
 
 template<typename k, typename v>
-void *con_arrayset<k, v>::Entry::operator new(size_t size)
+void *con_arrayset<k, v>::NewEntry(size_t size)
 {
     return Entry_allocator.Alloc();
 }
 
 template<typename k, typename v>
-void con_arrayset<k, v>::Entry::operator delete(void *ptr)
+void con_arrayset<k, v>::DeleteEntry(void *entry)
 {
-    Entry_allocator.Free(ptr);
+    Entry_allocator.Free(entry);
 }
 
 template<typename k, typename v>
-con_arrayset<k, v>::Entry::Entry()
+void *con_arrayset<k, v>::NewTable(size_t count)
 {
-    this->key   = k();
-    this->value = v();
+    return ARRAYSET_Alloc(sizeof(Entry *) * (int)count);
+}
 
-    index = 0;
-    next  = NULL;
+template<typename k, typename v>
+void con_arrayset<k, v>::DeleteTable(void *table)
+{
+    ARRAYSET_Free(table);
 }
 
 template<typename key, typename value>
@@ -127,7 +178,7 @@ con_arrayset<key, value>::con_arrayset()
     tableLengthIndex = 0;
 
     defaultEntry = NULL;
-    reverseTable = (&this->defaultEntry) - 1;
+    reverseTable = &this->defaultEntry;
 }
 
 template<typename key, typename value>
@@ -160,8 +211,7 @@ void con_arrayset<key, value>::resize(int count)
     }
 
     // allocate a new table
-    table = new Entry *[tableLength]();
-    memset(table, 0, tableLength * sizeof(Entry *));
+    table = new (NewTable(tableLength)) Entry *[tableLength]();
 
     // rehash the table
     for (i = oldTableLength; i > 0; i--) {
@@ -179,22 +229,27 @@ void con_arrayset<key, value>::resize(int count)
 
     if (oldTableLength > 1) {
         // delete the previous table
-        delete[] oldTable;
+        DeleteTable(oldTable);
     }
 
     // allocate a bigger reverse table
-    reverseTable = (new Entry *[this->tableLength]()) - 1;
+    reverseTable = new (NewTable(tableLength)) Entry *[this->tableLength]();
 
-    for (i = 1; i <= oldTableLength; i++) {
+    for (i = 0; i < oldTableLength; i++) {
         reverseTable[i] = oldReverseTable[i];
     }
 
     if (oldTableLength > 1) {
-        ++oldReverseTable;
-        delete[] oldReverseTable;
+        DeleteTable(oldReverseTable);
     }
 }
 
+template<typename k, typename v>
+unsigned int con_arrayset<k, v>::size() const
+{
+    return count;
+}
+
 template<typename key, typename value>
 void con_arrayset<key, value>::clear()
 {
@@ -202,10 +257,9 @@ void con_arrayset<key, value>::clear()
     Entry       *next  = NULL;
     unsigned int i;
 
-    if (this->tableLength > 1) {
-        reverseTable++;
-        delete[] reverseTable;
-        reverseTable = (&this->defaultEntry) - 1;
+    if (tableLength > 1) {
+        DeleteTable(reverseTable);
+        reverseTable = &defaultEntry;
     }
 
     for (i = 0; i < tableLength; i++) {
@@ -216,7 +270,7 @@ void con_arrayset<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
@@ -271,8 +325,6 @@ typename con_arrayset<k, v>::Entry *con_arrayset<k, v>::addNewKeyEntry(const k&
 
     index = HashCode<k>(key) % tableLength;
 
-    count++;
-
     entry = new Entry;
 
     if (defaultEntry == NULL) {
@@ -282,11 +334,12 @@ typename con_arrayset<k, v>::Entry *con_arrayset<k, v>::addNewKeyEntry(const k&
         entry->next = table[index];
     }
 
+    reverseTable[count] = entry;
+    count++;
+
     entry->key   = key;
     entry->index = count;
-
-    table[index]        = entry;
-    reverseTable[count] = entry;
+    table[index] = entry;
 
     return entry;
 }
@@ -324,7 +377,7 @@ bool con_arrayset<k, v>::remove(const k& key)
 {
     int i;
 
-    for (i = 1; i <= this->tableLength; i++) {
+    for (i = 0; i < tableLength; i++) {
         if (reverseTable[i] && reverseTable[i]->key == key) {
             reverseTable[i] = NULL;
         }
@@ -336,7 +389,7 @@ bool con_arrayset<k, v>::remove(const k& key)
 template<typename key, typename value>
 value& con_arrayset<key, value>::operator[](unsigned int index)
 {
-    return reverseTable[index]->key;
+    return reverseTable[index - 1]->key;
 }
 
 template<typename key, typename value>
diff --git a/code/qcommon/con_set.cpp b/code/qcommon/con_set.cpp
index a206658b..7d099f34 100644
--- a/code/qcommon/con_set.cpp
+++ b/code/qcommon/con_set.cpp
@@ -72,6 +72,12 @@ int HashCode<unsigned char *>(unsigned char *const& key)
     return (int)(size_t)key;
 }
 
+template<>
+int HashCode<const unsigned char*>(const unsigned char* const& key)
+{
+    return (int)(size_t)key;
+}
+
 template<>
 int HashCode<short>(const short& key)
 {
diff --git a/code/qcommon/con_set.h b/code/qcommon/con_set.h
index c3ccd178..d9a91b1b 100644
--- a/code/qcommon/con_set.h
+++ b/code/qcommon/con_set.h
@@ -26,9 +26,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "mem_blockalloc.h"
 
+#if defined(GAME_DLL)
+#    include "../fgame/g_local.h"
+
+#    define SET_Alloc gi.Malloc
+#    define SET_Free  gi.Free
+
+#elif defined(CGAME_DLL)
+#    include "../cgame/cg_local.h"
+
+#    define SET_Alloc cgi.Malloc
+#    define SET_Free  cgi.Free
+
+#elif defined(REF_DLL)
+#    include "../renderercommon/tr_common.h"
+
+#    define SET_Alloc ri.Malloc
+#    define SET_Free  ri.Free
+
+#else
+#    include "qcommon.h"
+
+#    define SET_Alloc Z_Malloc
+#    define SET_Free  Z_Free
+#endif
+
 class Class;
 class Archiver;
 
+template<typename k, typename v>
+class con_set;
+
+template<typename key, typename value>
+class con_map;
+
 template<typename key, typename value>
 class con_map_enum;
 
@@ -45,30 +76,51 @@ struct con_set_is_pointer<T *> {
     static const bool con_value = true;
 };
 
+/**
+ * This class was originally inside con_set (con_set::Entry).
+ * But because GCC is being extremely annoying and is moaning
+ * because of specialization after instantiation,
+ * the class is now laying there.
+ */
+template<typename k, typename v>
+class con_set_Entry
+{
+    friend con_set<k, v>;
+    friend con_set_enum<k, v>;
+
+private:
+    con_set_Entry *next;
+    k              key;
+
+public:
+    v value;
+
+public:
+    void *operator new(size_t size) { return con_set<k, v>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_set<k, v>::DeleteEntry(ptr); }
+
+    con_set_Entry()
+        : key(k())
+        , value(v())
+        , next(NULL)
+    {}
+
+#ifdef ARCHIVE_SUPPORTED
+    void Archive(Archiver& arc);
+#endif
+    k& GetKey() { return key; }
+
+    void SetKey(const k& newKey) { key = newKey; }
+};
+
 template<typename k, typename v>
 class con_set
 {
     friend class con_set_enum<k, v>;
 
 public:
-    class Entry
-    {
-    public:
-        k key;
-        v value;
-
-        Entry *next;
-
-    public:
-        void *operator new(size_t size);
-        void  operator delete(void *ptr);
-
-        Entry();
-
-#ifdef ARCHIVE_SUPPORTED
-        void Archive(Archiver& arc);
-#endif
-    };
+    using Entry = con_set_Entry<k, v>;
 
 public:
     static MEM_BlockAlloc<Entry> Entry_allocator;
@@ -86,6 +138,12 @@ protected:
     Entry *addKeyEntry(const k& key);
     Entry *addNewKeyEntry(const k& key);
 
+public:
+    static void *NewEntry(size_t size);
+    static void  DeleteEntry(void *entry);
+    static void *NewTable(size_t count);
+    static void  DeleteTable(void *table);
+
 public:
     con_set();
     ~con_set();
@@ -113,30 +171,33 @@ public:
 template<typename k, typename v>
 MEM_BlockAlloc<typename con_set<k, v>::Entry> con_set<k, v>::Entry_allocator;
 
-template<typename k>
-int HashCode(const k& key);
-
 template<typename k, typename v>
-void *con_set<k, v>::Entry::operator new(size_t size)
+void *con_set<k, v>::NewEntry(size_t size)
 {
     return Entry_allocator.Alloc();
 }
 
 template<typename k, typename v>
-void con_set<k, v>::Entry::operator delete(void *ptr)
+void con_set<k, v>::DeleteEntry(void *entry)
 {
-    Entry_allocator.Free(ptr);
+    Entry_allocator.Free(entry);
 }
 
 template<typename k, typename v>
-con_set<k, v>::Entry::Entry()
+void *con_set<k, v>::NewTable(size_t count)
 {
-    this->key   = k();
-    this->value = v();
-
-    next = NULL;
+    return SET_Alloc(sizeof(Entry *) * (int)count);
 }
 
+template<typename k, typename v>
+void con_set<k, v>::DeleteTable(void *table)
+{
+    SET_Free(table);
+}
+
+template<typename k>
+int HashCode(const k& key);
+
 template<typename key, typename value>
 con_set<key, value>::con_set()
 {
@@ -171,7 +232,7 @@ void con_set<key, value>::clear()
     }
 
     if (tableLength > 1) {
-        delete[] table;
+        DeleteTable(table);
     }
 
     tableLength = 1;
@@ -207,8 +268,7 @@ void con_set<key, value>::resize(int count)
     }
 
     // allocate a new table
-    table = new Entry *[tableLength]();
-    memset(table, 0, tableLength * sizeof(Entry *));
+    table = new (NewTable(tableLength)) Entry *[tableLength]();
 
     // rehash the table
     for (i = oldTableLength; i > 0; i--) {
@@ -217,7 +277,7 @@ void con_set<key, value>::resize(int count)
             old = e->next;
 
             // insert the old entry to the table hashindex
-            index = HashCode<key>(e->key) % tableLength;
+            index = HashCode<key>(e->GetKey()) % tableLength;
 
             e->next      = table[index];
             table[index] = e;
@@ -226,7 +286,7 @@ void con_set<key, value>::resize(int count)
 
     if (oldTableLength > 1) {
         // delete the previous table
-        delete[] oldTable;
+        DeleteTable(oldTable);
     }
 }
 
@@ -238,7 +298,7 @@ typename con_set<k, v>::Entry *con_set<k, v>::findKeyEntry(const k& key) const
     entry = table[HashCode<k>(key) % tableLength];
 
     for (; entry != NULL; entry = entry->next) {
-        if (entry->key == key) {
+        if (entry->GetKey() == key) {
             return entry;
         }
     }
@@ -264,28 +324,25 @@ template<typename k, typename v>
 typename con_set<k, v>::Entry *con_set<k, v>::addNewKeyEntry(const k& key)
 {
     Entry *entry;
-    int    index;
+    int    hash;
 
     if (count >= threshold) {
         resize();
     }
 
-    index = HashCode<k>(key) % tableLength;
-
     count++;
 
     entry = new Entry;
+    entry->SetKey(key);
+    hash = HashCode<k>(entry->GetKey()) % tableLength;
 
     if (defaultEntry == NULL) {
         defaultEntry = entry;
         entry->next  = NULL;
     } else {
-        entry->next = table[index];
+        entry->next = table[hash];
     }
-
-    entry->key = key;
-
-    table[index] = entry;
+    table[hash] = entry;
 
     return entry;
 }
@@ -299,25 +356,38 @@ bool con_set<key, value>::isEmpty(void)
 template<typename k, typename v>
 bool con_set<k, v>::remove(const k& key)
 {
-    int    index = HashCode<k>(key) % tableLength;
-    Entry *prev  = NULL;
-    Entry *entry;
+    int    hash;
+    int    i;
+    Entry *prev = NULL;
+    Entry *entry, *e;
 
-    for (entry = table[index]; entry != NULL; entry = entry->next) {
-        // just to make sure we're using the correct overloaded operator
-        if (!(entry->key == key)) {
+    hash = HashCode<k>(key) % tableLength;
+
+    for (entry = table[hash]; entry != NULL; entry = entry->next) {
+        // just to make sure we're using the correct overloaded operator for the key
+        if (!(entry->GetKey() == key)) {
             prev = entry;
             continue;
         }
 
         if (defaultEntry == entry) {
-            defaultEntry = prev;
+            defaultEntry = prev ? prev : table[hash];
+            // find a default entry
+            for (i = 0; i < tableLength && !defaultEntry; i++) {
+                for (e = table[i]; e; e = e->next) {
+                    if (e == entry) {
+                        continue;
+                    }
+                    defaultEntry = e;
+                    break;
+                }
+            }
         }
 
         if (prev) {
             prev->next = entry->next;
         } else {
-            table[index] = entry->next;
+            table[hash] = entry->next;
         }
 
         count--;
@@ -345,7 +415,7 @@ template<typename key, typename value>
 key *con_set<key, value>::firstKeyValue(void)
 {
     if (defaultEntry) {
-        return &defaultEntry->key;
+        return &defaultEntry->GetKey();
     } else {
         return NULL;
     }
@@ -373,7 +443,7 @@ bool con_set<k, v>::keyExists(const k& key)
     Entry *entry;
 
     for (entry = table; entry != NULL; entry = entry->next) {
-        if (entry->key == key) {
+        if (entry->GetKey() == key) {
             return true;
         }
     }
@@ -491,7 +561,7 @@ public:
     value& operator[](const key& index);
 
     value *find(const key& index);
-    bool   remove(const key  &index);
+    bool   remove(const key& index);
 
     unsigned int size();
 };
@@ -582,7 +652,7 @@ key *con_map_enum<key, value>::CurrentKey(void)
     Entry *entry = m_Set_Enum.CurrentElement();
 
     if (entry) {
-        return &entry->key;
+        return &entry->GetKey();
     } else {
         return NULL;
     }
@@ -606,7 +676,7 @@ key *con_map_enum<key, value>::NextKey(void)
     Entry *entry = m_Set_Enum.NextElement();
 
     if (entry) {
-        return &entry->key;
+        return &entry->GetKey();
     } else {
         return NULL;
     }
diff --git a/code/qcommon/con_timer.h b/code/qcommon/con_timer.h
index 75257933..f2fc8118 100644
--- a/code/qcommon/con_timer.h
+++ b/code/qcommon/con_timer.h
@@ -23,14 +23,28 @@ public:
 
     Class *GetNextElement(int& foundTime);
 
-    void SetDirty(void) { m_bDirty = true; };
-
-    bool IsDirty(void) { return m_bDirty; };
-
-    void SetTime(int inttime) { m_inttime = inttime; };
+    void SetDirty(void);
+    bool IsDirty(void);
+    void SetTime(int inttime);
 
 #if defined(ARCHIVE_SUPPORTED)
     static void ArchiveElement(class Archiver& arc, Element *e);
     void        Archive(class Archiver       &arc) override;
 #endif
-};
\ No newline at end of file
+};
+
+inline void con_timer::SetDirty(void)
+{
+    m_bDirty = true;
+};
+
+inline bool con_timer::IsDirty(void)
+{
+    return m_bDirty;
+};
+
+inline void con_timer::SetTime(int inttime)
+{
+    m_inttime = inttime;
+    m_bDirty  = true;
+}
diff --git a/code/qcommon/configurator.cpp b/code/qcommon/configurator.cpp
index c87a602c..c386c9c1 100644
--- a/code/qcommon/configurator.cpp
+++ b/code/qcommon/configurator.cpp
@@ -308,8 +308,8 @@ void Configurator::WriteData( char **data, size_t *size )
 			currentSize += len;
 			currentData = new char[ currentSize + 1 ];
 			strncpy( currentData, oldData, offset );
-			sprintf( currentData + offset, offset ? "\n\n[%s]" : "[%s]", section->name.c_str() );
-			strcpy( currentData + offset + len, oldData + offset );
+			Com_sprintf( currentData + offset, currentSize + 1 - offset, offset ? "\n\n[%s]" : "[%s]", section->name.c_str() );
+			Q_strncpyz( currentData + offset + len, oldData + offset, currentSize + 1 - offset - len );
 
 			if( currentData != oldData ) delete[] oldData;
 		}
@@ -360,8 +360,8 @@ void Configurator::WriteData( char **data, size_t *size )
 						currentSize += len;
 						currentData = new char[ currentSize + 1 ];
 						strncpy( currentData, oldData, offset );
-						sprintf( currentData + offset, "\n%s[%d]=%s", key->name.c_str(), k, value.c_str() );
-						strcpy( currentData + offset + len, oldData + offset2 );
+						Com_sprintf( currentData + offset, currentSize + 1 - offset, "\n%s[%d]=%s", key->name.c_str(), k, value.c_str() );
+						Q_strncpyz( currentData + offset + len, oldData + offset2, currentSize + 1 - offset - len );
 
 						if( currentData != oldData ) delete[] oldData;
 					}
@@ -393,8 +393,8 @@ void Configurator::WriteData( char **data, size_t *size )
 					currentSize += len;
 					currentData = new char[ currentSize + 1 ];
 					strncpy( currentData, oldData, offset );
-					sprintf( currentData + offset, "\n%s=%s", key->name.c_str(), value.c_str() );
-					strcpy( currentData + offset + len, oldData + offset2 );
+					Com_sprintf( currentData + offset, currentSize + 1 - offset "\n%s=%s", key->name.c_str(), value.c_str() );
+					Q_strncpyz( currentData + offset + len, oldData + offset2, currentSize + 1 - offset - len );
 
 					if( currentData != oldData ) delete[] oldData;
 				}
@@ -445,18 +445,18 @@ void Configurator::WriteData2( char **data, size_t *size )
 			currentSize = tlen + 1024;
 			currentData = new char[ currentSize ];
 			p = currentData + ( p - oldData );
-			strcpy( currentData, oldData );
+			Q_strncpyz( currentData, oldData, currentSize );
 
 			delete[] oldData;
 		}
 
 		if( i == 1 )
 		{
-			p += sprintf( p, "[%s]\n", section->name.c_str() );
+			p += Com_sprintf( p, currentSize - ( p - currentData ), "[%s]\n", section->name.c_str() );
 		}
 		else
 		{
-			p += sprintf( p, "\n[%s]\n", section->name.c_str() );
+			p += Com_sprintf( p, currentSize - ( p - currentData ), "\n[%s]\n", section->name.c_str() );
 		}
 
 		for( j = 0; j < section->key.NumObjects(); j++ )
@@ -500,7 +500,7 @@ void Configurator::WriteData2( char **data, size_t *size )
 							delete[] oldData;
 						}
 
-						p += sprintf( p, "%s[%d]=%s\n", key->name.c_str(), k, value.c_str() );
+						p += Com_sprintf( p, currentSize - ( p - currentData ), "%s[%d]=%s\n", key->name.c_str(), k, value.c_str() );
 					}
 				}
 			}
@@ -524,7 +524,7 @@ void Configurator::WriteData2( char **data, size_t *size )
 					delete[] oldData;
 				}
 
-				p += sprintf( p, "%s=%s\n", key->name.c_str(), value.c_str() );
+				p += Com_sprintf( p, currentSize - ( p - currentData ), "%s=%s\n", key->name.c_str(), value.c_str() );
 			}
 		}
 	}
@@ -585,7 +585,7 @@ bool Configurator::FindData( int type, const char *s, const char *k, size_t *off
 			arrayindex = GetKeyArray( key );
 			if( arrayindex >= 0 )
 			{
-				sprintf( key, "%s[%d]", key, arrayindex );
+				Com_sprintf( key, sizeof( key ), "%s[%d]", key, arrayindex );
 			}
 
 			if( type == LINE_VALUE && bFoundSection && !Q_stricmp( k, key ) )
diff --git a/code/qcommon/const_str.h b/code/qcommon/const_str.h
index 1d4dd442..43b3070c 100644
--- a/code/qcommon/const_str.h
+++ b/code/qcommon/const_str.h
@@ -28,118 +28,302 @@ typedef unsigned int const_str;
 
 #ifdef GAME_DLL
 
-enum
-{
-	STRING_NULL = 0,
-	STRING_EMPTY = 1,
-	STRING_TOUCH, STRING_BLOCK, STRING_TRIGGER, STRING_USE,
-	STRING_DAMAGE,STRING_LOCATION,
-	STRING_SAY, STRING_FAIL, STRING_BUMP,
-	STRING_DEFAULT, STRING_ALL,
-	STRING_MOVE_ACTION, STRING_RESUME, STRING_OPEN, STRING_CLOSE, STRING_PICKUP, STRING_REACH, STRING_START,
-	STRING_TELEPORT,
-	STRING_MOVE, STRING_MOVE_END, STRING_MOVETO, STRING_WALKTO, STRING_RUNTO, STRING_CROUCHTO, STRING_CRAWLTO, STRING_STOP,
-	STRING_RESET, STRING_PRESPAWN, STRING_SPAWN, STRING_PLAYERSPAWN, STRING_SKIP, STRING_ROUNDSTART,
-	STRING_VISIBLE, STRING_NOT_VISIBLE,
-	STRING_DONE, STRING_ANIMDONE, STRING_UPPERANIMDONE, STRING_SAYDONE, STRING_FLAGGEDANIMDONE,
-	STRING_IDLE, STRING_WALK, STRING_SHUFFLE,
-	STRING_ANIM_CROUCH_SCR,
-	STRING_FORGOT,
-	STRING_JOG_HUNCH, STRING_JOG_HUNCH_RIFLE,
-	STRING_KILLED,
-	STRING_ALARM, STRING_SCRIPTCLASS, STRING_FACT_SCRIPT_FACTORY,
-	STRING_DEATH, STRING_DEATH_FALL_TO_KNEES,
-	STRING_ENEMY,
-	STRING_DEAD,
-	STRING_MOOD,
-	STRING_PATROL, STRING_RUNNER, STRING_FOLLOW,
-	STRING_ACTION, STRING_MOVE_BEGIN, STRING_ACTION_BEGIN, STRING_ACTION_END,
-	STRING_SUCCESS, STRING_ENTRY, STRING_EXIT, STRING_PATH, STRING_NODE,
-	STRING_ASK_COUNT,
-	STRING_ATTACKER, STRING_USECOVER, STRING_WAITCOVER, STRING_VOID, STRING_END, STRING_ATTACK, STRING_NEAR,
-	STRING_PAPERS, STRING_CHECK_PAPERS,
-	STRING_TIMEOUT,
-	STRING_HOSTILE, STRING_LEADER,
-	STRING_GAMEMAP,
-	STRING_BORED, STRING_NERVOUS, STRING_CURIOUS, STRING_ALERT, STRING_GREET, STRING_DEFEND,
-	STRING_ANIM, STRING_ANIM_SCRIPTED, STRING_ANIM_CURIOUS, STRING_ANIMLOOP, STRING_UNDEFINED, STRING_NOTSET,
-	STRING_INCREMENT, STRING_DECREMENT, STRING_TOGGLE,
-	STRING_NORMAL, STRING_SUSPENSE, STRING_MYSTERY, STRING_SURPRISE,
-	STRING_ANIM_CROUCH_RUN_SCR,
-	STRING_ANIM_AIM_SCR, STRING_ANIM_SHOOT_SCR, STRING_ANIM_MG42_SHOOT_SCR, STRING_ANIM_MG42_IDLE_SCR, STRING_ANIM_MG42_RELOAD_SCR,
-	STRING_DRIVE,
-	STRING_GLOBAL_WEAPON_SCR, STRING_GLOBAL_MOVETO_SCR,
-	STRING_GLOBAL_ANIM_SCR, STRING_GLOBAL_ANIM_SCRIPTED_SCR, STRING_GLOBAL_ANIM_NOCLIP_SCR, STRING_GLOBAL_WALKTO_SCR, STRING_GLOBAL_RUNTO_SCR, STRING_AIMAT,
-	STRING_GLOBAL_DISABLE_AI_SCR,
-	STRING_GLOBAL_CROUCHTO_SCR, STRING_GLOBAL_CRAWLTO_SCR,
-	STRING_GLOBAL_KILLED_SCR, STRING_GLOBAL_PAIN_SCR, STRING_PAIN,
-	STRING_TRACK, STRING_HASENEMY,
-	STRING_ANIM_COWER_SCR, STRING_ANIM_STAND_SCR, STRING_ANIM_IDLE_SCR, STRING_ANIM_SURPRISE_SCR, STRING_ANIM_STANDSHOCK_SCR, STRING_ANIM_STANDIDENTIFY_SCR, STRING_ANIM_STANDFLINCH_SCR, STRING_ANIM_DOG_IDLE_SCR, STRING_ANIM_DOG_ATTACK_SCR, STRING_ANIM_DOG_CURIOUS_SCR, STRING_ANIM_DOG_CHASE_SCR,
-	STRING_CANNON, STRING_GRENADE, STRING_HEAVY,
-	STRING_ITEM, STRING_ITEMS, STRING_ITEM1, STRING_ITEM2, STRING_ITEM3, STRING_ITEM4,
-	STRING_STAND,
-	STRING_MG, STRING_PISTOL, STRING_RIFLE, STRING_SMG,
-	STRING_TURNTO,
-	STRING_STANDING, STRING_CROUCHING, STRING_PRONE, STRING_OFFGROUND, STRING_WALKING, STRING_RUNNING, STRING_FALLING,
-	STRING_ANIM_NOTHING, STRING_ANIM_DIRECT, STRING_ANIM_PATH, STRING_ANIM_WAYPOINT, STRING_ANIM_DIRECT_NOGRAVITY,
-	STRING_EMOTION_NONE, STRING_EMOTION_NEUTRAL,
-	STRING_EMOTION_WORRY, STRING_EMOTION_PANIC, STRING_EMOTION_FEAR,
-	STRING_EMOTION_DISGUST, STRING_EMOTION_ANGER,
-	STRING_EMOTION_AIMING, STRING_EMOTION_DETERMINED,
-	STRING_EMOTION_DEAD,
-	STRING_EMOTION_CURIOUS,
-	STRING_ANIM_EMOTION_SCR,
-	STRING_FORCEANIM, STRING_FORCEANIM_SCRIPTED,
-	STRING_TURRET, STRING_COVER,
-	STRING_ANIM_PAIN_SCR, STRING_ANIM_KILLED_SCR, STRING_ANIM_ATTACK_SCR, STRING_ANIM_SNIPER_SCR,
-	STRING_KNEES, STRING_CRAWL, STRING_FLOOR,
-	STRING_ANIM_PATROL_SCR, STRING_ANIM_RUN_SCR, STRING_CROUCH, STRING_CROUCHWALK, STRING_CROUCHRUN, STRING_ANIM_CROUCH_WALK_SCR, STRING_ANIM_WALK_SCR, STRING_ANIM_PRONE_SCR,
-	STRING_ANIM_RUNAWAYFIRING_SCR, STRING_ANIM_RUN_SHOOT_SCR, STRING_ANIM_RUNTO_ALARM_SCR, STRING_ANIM_RUNTO_CASUAL_SCR, STRING_ANIM_RUNTO_COVER_SCR, STRING_ANIM_RUNTO_DANGER_SCR, STRING_ANIM_RUNTO_DIVE_SCR, STRING_ANIM_RUNTO_FLEE_SCR, STRING_ANIM_RUNTO_INOPEN_SCR,
-	STRING_ANIM_DISGUISE_SALUTE_SCR, STRING_ANIM_DISGUISE_WAIT_SCR, STRING_ANIM_DISGUISE_PAPERS_SCR, STRING_ANIM_DISGUISE_ENEMY_SCR, STRING_ANIM_DISGUISE_HALT_SCR, STRING_ANIM_DISGUISE_ACCEPT_SCR, STRING_ANIM_DISGUISE_DENY_SCR,
-	STRING_ANIM_CORNERLEFT_SCR, STRING_ANIM_CORNERRIGHT_SCR,
-	STRING_ANIM_OVERATTACK_SCR,
-	STRING_ANIM_CONTINUE_LAST_ANIM_SCR,
-	STRING_FLAGGED,
-	STRING_ANIM_FULLBODY_SCR,
-	STRING_INTERNAL,
-	STRING_DISGUISE_SALUTE, STRING_DISGUISE_SENTRY, STRING_DISGUISE_OFFICER, STRING_DISGUISE_ROVER, STRING_DISGUISE_NONE,
-	STRING_MACHINEGUNNER,
-	STRING_DISGUISE,
-	STRING_DOG_IDLE, STRING_DOG_ATTACK, STRING_DOG_CURIOUS, STRING_DOG_GRENADE,
-	STRING_ANIM_GRENADERETURN_SCR, STRING_ANIM_GRENADEKICK_SCR, STRING_ANIM_GRENADETHROW_SCR, STRING_ANIM_GRENADETOSS_SCR, STRING_ANIM_GRENADEMARTYR_SCR,
-	STRING_MOVEDONE,
-	STRING_AIM, STRING_ONTARGET,
-	STRING_UNARMED,
-	STRING_BALCONY_IDLE, STRING_BALCONY_CURIOUS, STRING_BALCONY_ATTACK, STRING_BALCONY_DISGUISE, STRING_BALCONY_GRENADE, STRING_BALCONY_PAIN, STRING_BALCONY_KILLED,
-	STRING_WEAPONLESS,
-	STRING_DEATH_BALCONY_INTRO, STRING_DEATH_BALCONY_LOOP, STRING_DEATH_BALCONY_OUTTRO,
-	STRING_SOUNDDONE,
-	STRING_NOCLIP,
-	STRING_GERMAN, STRING_AMERICAN, STRING_SPECTATOR, STRING_FREEFORALL, STRING_ALLIES, STRING_AXIS,
-	STRING_DRAW, STRING_KILLS, STRING_ALLIESWIN, STRING_AXISWIN,
-	STRING_ANIM_SAY_CURIOUS_SIGHT_SCR, STRING_ANIM_SAY_CURIOUS_SOUND_SCR, STRING_ANIM_SAY_GRENADE_SIGHTED_SCR, STRING_ANIM_SAY_KILL_SCR, STRING_ANIM_SAY_MANDOWN_SCR, STRING_ANIM_SAY_SIGHTED_SCR,
-	STRING_VEHICLEANIMDONE,
-	STRING_POSTTHINK,
-	STRING_TURNDONE,
-	STRING_ANIM_NO_KILLED_SCR,
-	STRING_MG42, STRING_MP40,
-	STRING_AUTO,
-	STRING_BOTH,
-	STRING_RUNANDSHOOT,
-	//
-	// Openmohaa additions
-	//
-	STRING_RESPAWN,
-	STRING_VIEWMODELANIM_DONE,
-	STRING_LENGTH_
+enum {
+    STRING_NULL  = 0,
+    STRING_EMPTY = 1,
+    STRING_TOUCH,
+    STRING_BLOCK,
+    STRING_TRIGGER,
+    STRING_USE,
+    STRING_DAMAGE,
+    STRING_LOCATION,
+    STRING_SAY,
+    STRING_FAIL,
+    STRING_BUMP,
+    STRING_DEFAULT,
+    STRING_ALL,
+    STRING_MOVE_ACTION,
+    STRING_RESUME,
+    STRING_OPEN,
+    STRING_CLOSE,
+    STRING_PICKUP,
+    STRING_REACH,
+    STRING_START,
+    STRING_TELEPORT,
+    STRING_MOVE,
+    STRING_MOVE_END,
+    STRING_MOVETO,
+    STRING_WALKTO,
+    STRING_RUNTO,
+    STRING_CROUCHTO,
+    STRING_CRAWLTO,
+    STRING_STOP,
+    STRING_RESET,
+    STRING_PRESPAWN,
+    STRING_SPAWN,
+    STRING_PLAYERSPAWN,
+    STRING_SKIP,
+    STRING_ROUNDSTART,
+    STRING_VISIBLE,
+    STRING_NOT_VISIBLE,
+    STRING_DONE,
+    STRING_ANIMDONE,
+    STRING_UPPERANIMDONE,
+    STRING_SAYDONE,
+    STRING_FLAGGEDANIMDONE,
+    STRING_IDLE,
+    STRING_WALK,
+    STRING_SHUFFLE,
+    STRING_ANIM_CROUCH_SCR,
+    STRING_FORGOT,
+    STRING_JOG_HUNCH,
+    STRING_JOG_HUNCH_RIFLE,
+    STRING_KILLED,
+    STRING_ALARM,
+    STRING_SCRIPTCLASS,
+    STRING_FACT_SCRIPT_FACTORY,
+    STRING_DEATH,
+    STRING_DEATH_FALL_TO_KNEES,
+    STRING_ENEMY,
+    STRING_DEAD,
+    STRING_MOOD,
+    STRING_PATROL,
+    STRING_RUNNER,
+    STRING_FOLLOW,
+    STRING_ACTION,
+    STRING_MOVE_BEGIN,
+    STRING_ACTION_BEGIN,
+    STRING_ACTION_END,
+    STRING_SUCCESS,
+    STRING_ENTRY,
+    STRING_EXIT,
+    STRING_PATH,
+    STRING_NODE,
+    STRING_ASK_COUNT,
+    STRING_ATTACKER,
+    STRING_USECOVER,
+    STRING_WAITCOVER,
+    STRING_VOID,
+    STRING_END,
+    STRING_ATTACK,
+    STRING_NEAR,
+    STRING_PAPERS,
+    STRING_CHECK_PAPERS,
+    STRING_TIMEOUT,
+    STRING_HOSTILE,
+    STRING_LEADER,
+    STRING_GAMEMAP,
+    STRING_BORED,
+    STRING_NERVOUS,
+    STRING_CURIOUS,
+    STRING_ALERT,
+    STRING_GREET,
+    STRING_DEFEND,
+    STRING_ANIM,
+    STRING_ANIM_SCRIPTED,
+    STRING_ANIM_CURIOUS,
+    STRING_ANIMLOOP,
+    STRING_UNDEFINED,
+    STRING_NOTSET,
+    STRING_INCREMENT,
+    STRING_DECREMENT,
+    STRING_TOGGLE,
+    STRING_NORMAL,
+    STRING_SUSPENSE,
+    STRING_MYSTERY,
+    STRING_SURPRISE,
+    STRING_ANIM_CROUCH_RUN_SCR,
+    STRING_ANIM_AIM_SCR,
+    STRING_ANIM_SHOOT_SCR,
+    STRING_ANIM_MG42_SHOOT_SCR,
+    STRING_ANIM_MG42_IDLE_SCR,
+    STRING_ANIM_MG42_RELOAD_SCR,
+    STRING_DRIVE,
+    STRING_GLOBAL_WEAPON_SCR,
+    STRING_GLOBAL_MOVETO_SCR,
+    STRING_GLOBAL_ANIM_SCR,
+    STRING_GLOBAL_ANIM_SCRIPTED_SCR,
+    STRING_GLOBAL_ANIM_NOCLIP_SCR,
+    STRING_GLOBAL_ANIM_ATTACHED_SCR,
+    STRING_GLOBAL_WALKTO_SCR,
+    STRING_GLOBAL_RUNTO_SCR,
+    STRING_AIMAT,
+    STRING_GLOBAL_DISABLE_AI_SCR,
+    STRING_GLOBAL_CROUCHTO_SCR,
+    STRING_GLOBAL_CRAWLTO_SCR,
+    STRING_GLOBAL_KILLED_SCR,
+    STRING_GLOBAL_PAIN_SCR,
+    STRING_PAIN,
+    STRING_TRACK,
+    STRING_HASENEMY,
+    STRING_ANIM_COWER_SCR,
+    STRING_ANIM_STAND_SCR,
+    STRING_ANIM_IDLE_SCR,
+    STRING_ANIM_SURPRISE_SCR,
+    STRING_ANIM_STANDSHOCK_SCR,
+    STRING_ANIM_STANDIDENTIFY_SCR,
+    STRING_ANIM_STANDFLINCH_SCR,
+    STRING_ANIM_DOG_IDLE_SCR,
+    STRING_ANIM_DOG_ATTACK_SCR,
+    STRING_ANIM_DOG_CURIOUS_SCR,
+    STRING_ANIM_DOG_CHASE_SCR,
+    STRING_CANNON,
+    STRING_GRENADE,
+    STRING_BADPLACE,
+    STRING_HEAVY,
+    STRING_ITEM,
+    STRING_ITEMS,
+    STRING_ITEM1,
+    STRING_ITEM2,
+    STRING_ITEM3,
+    STRING_ITEM4,
+    STRING_STAND,
+    STRING_MG,
+    STRING_PISTOL,
+    STRING_RIFLE,
+    STRING_SMG,
+    STRING_TURNTO,
+    STRING_STANDING,
+    STRING_CROUCHING,
+    STRING_PRONE,
+    STRING_OFFGROUND,
+    STRING_WALKING,
+    STRING_RUNNING,
+    STRING_FALLING,
+    STRING_ANIM_NOTHING,
+    STRING_ANIM_DIRECT,
+    STRING_ANIM_PATH,
+    STRING_ANIM_WAYPOINT,
+    STRING_ANIM_DIRECT_NOGRAVITY,
+    STRING_EMOTION_NONE,
+    STRING_EMOTION_NEUTRAL,
+    STRING_EMOTION_WORRY,
+    STRING_EMOTION_PANIC,
+    STRING_EMOTION_FEAR,
+    STRING_EMOTION_DISGUST,
+    STRING_EMOTION_ANGER,
+    STRING_EMOTION_AIMING,
+    STRING_EMOTION_DETERMINED,
+    STRING_EMOTION_DEAD,
+    STRING_EMOTION_CURIOUS,
+    STRING_ANIM_EMOTION_SCR,
+    STRING_FORCEANIM,
+    STRING_FORCEANIM_SCRIPTED,
+    STRING_TURRET,
+    STRING_COVER,
+    STRING_ANIM_PAIN_SCR,
+    STRING_ANIM_KILLED_SCR,
+    STRING_ANIM_ATTACK_SCR,
+    STRING_ANIM_SNIPER_SCR,
+    STRING_ANIM_SUPPRESS_SCR,
+    STRING_KNEES,
+    STRING_CRAWL,
+    STRING_FLOOR,
+    STRING_ANIM_PATROL_SCR,
+    STRING_ANIM_RUN_SCR,
+    STRING_CROUCH,
+    STRING_CROUCHWALK,
+    STRING_CROUCHRUN,
+    STRING_ANIM_CROUCH_WALK_SCR,
+    STRING_ANIM_WALK_SCR,
+    STRING_ANIM_PRONE_SCR,
+    STRING_ANIM_RUNAWAYFIRING_SCR,
+    STRING_ANIM_RUN_SHOOT_SCR,
+    STRING_ANIM_RUNTO_ALARM_SCR,
+    STRING_ANIM_RUNTO_CASUAL_SCR,
+    STRING_ANIM_RUNTO_COVER_SCR,
+    STRING_ANIM_RUNTO_DANGER_SCR,
+    STRING_ANIM_RUNTO_DIVE_SCR,
+    STRING_ANIM_RUNTO_FLEE_SCR,
+    STRING_ANIM_RUNTO_INOPEN_SCR,
+    STRING_ANIM_DISGUISE_SALUTE_SCR,
+    STRING_ANIM_DISGUISE_WAIT_SCR,
+    STRING_ANIM_DISGUISE_PAPERS_SCR,
+    STRING_ANIM_DISGUISE_ENEMY_SCR,
+    STRING_ANIM_DISGUISE_HALT_SCR,
+    STRING_ANIM_DISGUISE_ACCEPT_SCR,
+    STRING_ANIM_DISGUISE_DENY_SCR,
+    STRING_ANIM_CORNERLEFT_SCR,
+    STRING_ANIM_CORNERRIGHT_SCR,
+    STRING_ANIM_OVERATTACK_SCR,
+    STRING_ANIM_LOWWALL_SCR,
+    STRING_ANIM_HIGHWALL_SCR,
+    STRING_ANIM_CONTINUE_LAST_ANIM_SCR,
+    STRING_FLAGGED,
+    STRING_ANIM_FULLBODY_SCR,
+    STRING_DISGUISE_SALUTE,
+    STRING_DISGUISE_SENTRY,
+    STRING_DISGUISE_OFFICER,
+    STRING_DISGUISE_ROVER,
+    STRING_DISGUISE_NONE,
+    STRING_MACHINEGUNNER,
+    STRING_DISGUISE,
+    STRING_DOG_IDLE,
+    STRING_DOG_ATTACK,
+    STRING_DOG_CURIOUS,
+    STRING_DOG_GRENADE,
+    STRING_ANIM_GRENADERETURN_SCR,
+    STRING_ANIM_GRENADEKICK_SCR,
+    STRING_ANIM_GRENADETHROW_SCR,
+    STRING_ANIM_GRENADETOSS_SCR,
+    STRING_ANIM_GRENADEMARTYR_SCR,
+    STRING_MOVEDONE,
+    STRING_AIM,
+    STRING_ONTARGET,
+    STRING_UNARMED,
+    STRING_BALCONY_IDLE,
+    STRING_BALCONY_CURIOUS,
+    STRING_BALCONY_ATTACK,
+    STRING_BALCONY_DISGUISE,
+    STRING_BALCONY_GRENADE,
+    STRING_BALCONY_PAIN,
+    STRING_BALCONY_KILLED,
+    STRING_WEAPONLESS,
+    STRING_DEATH_BALCONY_INTRO,
+    STRING_DEATH_BALCONY_LOOP,
+    STRING_DEATH_BALCONY_OUTTRO,
+    STRING_SOUNDDONE,
+    STRING_NOCLIP,
+    STRING_GERMAN,
+    STRING_AMERICAN,
+    STRING_SPECTATOR,
+    STRING_FREEFORALL,
+    STRING_ALLIES,
+    STRING_AXIS,
+    STRING_DRAW,
+    STRING_KILLS,
+    STRING_ALLIESWIN,
+    STRING_AXISWIN,
+    STRING_ANIM_SAY_CURIOUS_SIGHT_SCR,
+    STRING_ANIM_SAY_CURIOUS_SOUND_SCR,
+    STRING_ANIM_SAY_GRENADE_SIGHTED_SCR,
+    STRING_ANIM_SAY_KILL_SCR,
+    STRING_ANIM_SAY_MANDOWN_SCR,
+    STRING_ANIM_SAY_SIGHTED_SCR,
+    STRING_VEHICLEANIMDONE,
+    STRING_POSTTHINK,
+    STRING_TURNDONE,
+    STRING_ANIM_NO_KILLED_SCR,
+    STRING_MG42,
+    STRING_MP40,
+    // Added in 2.0
+    STRING_AUTO,
+    STRING_BOTH,
+    // Added in 2.30
+    STRING_RUNANDSHOOT,
+    // Added in OPM
+    STRING_RESPAWN,
+    STRING_VIEWMODELANIM_DONE,
+
+    // The number of strings
+    STRING_LENGTH_
 };
 
 #else
 
-enum
-{
-	STRING_NULL = 0,
-	STRING_EMPTY = 1
+enum {
+    STRING_NULL  = 0,
+    STRING_EMPTY = 1
 };
 
 #endif
diff --git a/code/qcommon/container.h b/code/qcommon/container.h
index 60ab4208..b2f1f63f 100644
--- a/code/qcommon/container.h
+++ b/code/qcommon/container.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,6 +33,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          gi.Error
 #    define CONTAINER_DPrintf        gi.DPrintf
 #    define CONTAINER_WDPrintf(text) gi.DPrintf(text)
+#    define CONTAINER_Alloc          gi.Malloc
+#    define CONTAINER_Free           gi.Free
 
 #elif defined(CGAME_DLL)
 //
@@ -43,8 +45,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          cgi.Error
 #    define CONTAINER_DPrintf        cgi.DPrintf
 #    define CONTAINER_WDPrintf(text) cgi.DPrintf(text)
+#    define CONTAINER_Alloc          cgi.Malloc
+#    define CONTAINER_Free           cgi.Free
 
-#else
+#elif defined(REF_DLL)
+
+#    include "../renderercommon/tr_common.h"
 
 //
 // client specific defines
@@ -52,8 +58,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #    define CONTAINER_Error          Com_Error
 #    define CONTAINER_DPrintf        Com_DPrintf
 #    define CONTAINER_WDPrintf(text) Com_DPrintf(text)
+#    define CONTAINER_Alloc          ri.Malloc
+#    define CONTAINER_Free           ri.Free
+
+#else
+
+#    include "qcommon.h"
+
+//
+// client specific defines
+//
+#    define CONTAINER_Error          Com_Error
+#    define CONTAINER_DPrintf        Com_DPrintf
+#    define CONTAINER_WDPrintf(text) Com_DPrintf(text)
+#    define CONTAINER_Alloc          Z_Malloc
+#    define CONTAINER_Free           Z_Free
 #endif
 
+#include <utility>
+#include <new>
+
 class Archiver;
 
 template<class Type>
@@ -69,34 +93,37 @@ private:
 
 public:
     Container();
+
     Container(const Container<Type>& container);
+    Container<Type>& operator=(const Container<Type>& container);
+
+    Container(Container<Type>&& container);
+    Container<Type>& operator=(Container<Type>&& container);
+
     ~Container();
 
     void Archive(Archiver& arc);
     void Archive(Archiver& arc, void (*ArchiveFunc)(Archiver& arc, Type *obj));
 
-    int   AddObject(const Type  &obj);
-    int   AddUniqueObject(const Type  &obj);
-    void  AddObjectAt(int index, const Type &obj);
+    int   AddObject(const Type& obj);
+    int   AddUniqueObject(const Type& obj);
+    void  AddObjectAt(int index, const Type& obj);
     Type *AddressOfObjectAt(int index);
-    //	void				Archive( Archiver &arc );
-    void             ClearObjectList(void);
-    void             Fix(void);
-    void             FreeObjectList(void);
-    int              IndexOfObject(const Type             &obj);
-    void             InsertObjectAt(int index, const Type            &obj);
-    int              MaxObjects(void) const;
-    int              NumObjects(void) const;
-    Type           & ObjectAt(const size_t index) const;
-    bool             ObjectInList(const Type            &obj);
-    void             RemoveObjectAt(int index);
-    void             RemoveObject(const Type            &obj);
-    void             Reset(void);
-    void             Resize(int maxelements);
-    void             SetObjectAt(int index, const Type            &obj);
-    void             Sort(int (*compare)(const void *elem1, const void *elem2));
-    Type           & operator[](const int index) const;
-    Container<Type>& operator=(const Container<Type>& container);
+    void  ClearObjectList(void);
+    void  FreeObjectList(void);
+    int   IndexOfObject(const Type& obj);
+    void  InsertObjectAt(int index, const Type& obj);
+    int   MaxObjects(void) const;
+    int   NumObjects(void) const;
+    Type& ObjectAt(const size_t index) const;
+    bool  ObjectInList(const Type& obj);
+    void  RemoveObjectAt(int index);
+    void  RemoveObject(const Type& obj);
+    void  Reset(void);
+    void  Resize(int maxelements);
+    void  SetObjectAt(int index, const Type& obj);
+    void  Sort(int (*compare)(const void *elem1, const void *elem2));
+    Type& operator[](const uintptr_t index) const;
 };
 
 template<class Type>
@@ -115,6 +142,40 @@ Container<Type>::Container(const Container<Type>& container)
     Copy(container);
 }
 
+template<class Type>
+Container<Type>& Container<Type>::operator=(const Container<Type>& container)
+{
+    Copy(container);
+
+    return *this;
+}
+
+template<class Type>
+Container<Type>::Container(Container<Type>&& container)
+{
+    objlist              = container.objlist;
+    numobjects           = container.numobjects;
+    maxobjects           = container.maxobjects;
+    container.objlist    = NULL;
+    container.numobjects = 0;
+    container.maxobjects = 0;
+}
+
+template<class Type>
+Container<Type>& Container<Type>::operator=(Container<Type>&& container)
+{
+    FreeObjectList();
+
+    objlist              = container.objlist;
+    numobjects           = container.numobjects;
+    maxobjects           = container.maxobjects;
+    container.objlist    = NULL;
+    container.numobjects = 0;
+    container.maxobjects = 0;
+
+    return *this;
+}
+
 template<class Type>
 Container<Type>::~Container()
 {
@@ -132,7 +193,7 @@ int Container<Type>::AddObject(const Type& obj)
         Resize(numobjects * 2);
     }
 
-    objlist[numobjects] = obj;
+    new (objlist + numobjects) Type(obj);
     numobjects++;
 
     return numobjects;
@@ -155,11 +216,17 @@ int Container<Type>::AddUniqueObject(const Type& obj)
 template<class Type>
 void Container<Type>::AddObjectAt(int index, const Type& obj)
 {
+    int i;
+
     if (index > maxobjects) {
         Resize(index);
     }
 
     if (index > numobjects) {
+        for (i = numobjects; i < index; i++) {
+            new (objlist + i) Type();
+        }
+
         numobjects = index;
     }
 
@@ -180,62 +247,32 @@ Type *Container<Type>::AddressOfObjectAt(int index)
     return &objlist[index - 1];
 }
 
-/*template< class Type >
-void Container<Type>::Archive( Archiver &arc )
-{
-
-}*/
-
 template<class Type>
 void Container<Type>::ClearObjectList(void)
 {
+    size_t i;
+
     if (objlist && numobjects) {
-        delete[] objlist;
-
-        if (maxobjects == 0) {
-            objlist = NULL;
-            return;
+        for (i = 0; i < numobjects; ++i) {
+            objlist[i].~Type();
         }
 
-        objlist    = new Type[maxobjects];
+        // don't free the object list, it can be reused later
         numobjects = 0;
     }
 }
 
-template<class Type>
-void Container<Type>::Fix(void)
-{
-    if (!objlist || !numobjects) {
-        return;
-    }
-
-    Type *newlist = new Type[numobjects];
-    int   j       = 0;
-
-    for (int i = 0; i < numobjects; i++) {
-        if (objlist[i] == NULL) {
-            continue;
-        }
-
-        newlist[j] = objlist[i];
-        j++;
-    }
-
-    numobjects = j;
-
-    delete[] objlist;
-    objlist = newlist;
-
-    if (!numobjects) {
-        ClearObjectList();
-    }
-}
-
 template<class Type>
 void Container<Type>::FreeObjectList(void)
 {
+    size_t i;
+
     if (objlist) {
-        delete[] objlist;
+        for (i = 0; i < numobjects; ++i) {
+            objlist[i].~Type();
+        }
+
+        CONTAINER_Free(objlist);
     }
 
     objlist    = NULL;
@@ -264,43 +301,48 @@ int Container<Type>::IndexOfObject(const Type& obj)
 template<class Type>
 void Container<Type>::InsertObjectAt(int index, const Type& obj)
 {
+    size_t i;
+
     if ((index <= 0) || (index > numobjects + 1)) {
         CONTAINER_Error(ERR_DROP, "Container::InsertObjectAt : index out of range");
         return;
     }
 
     numobjects++;
-    int arrayIndex = index - 1;
+    intptr_t arrayIndex = index - 1;
 
     if (numobjects > maxobjects) {
         maxobjects = numobjects;
         if (!objlist) {
-            objlist             = new Type[maxobjects];
-            objlist[arrayIndex] = obj;
-            return;
+            objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
+
+            for (i = 0; i < arrayIndex; ++i) {
+                new (objlist + i) Type();
+            }
+
+            new (objlist + arrayIndex) Type(obj);
         } else {
             Type *temp = objlist;
             if (maxobjects < numobjects) {
                 maxobjects = numobjects;
             }
 
-            objlist = new Type[maxobjects];
+            objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
 
-            int i;
-            for (i = arrayIndex - 1; i >= 0; i--) {
-                objlist[i] = temp[i];
+            for (i = 0; i < arrayIndex; ++i) {
+                new (objlist + i) Type(std::move(temp[i]));
             }
 
-            objlist[arrayIndex] = obj;
-            for (i = numobjects - 1; i > arrayIndex; i--) {
-                objlist[i] = temp[i - 1];
+            new (objlist + arrayIndex) Type(obj);
+            for (i = arrayIndex + 1; i < numobjects; ++i) {
+                new (objlist + i) Type(std::move(temp[i]));
             }
 
-            delete[] temp;
+            CONTAINER_Free(temp);
         }
     } else {
-        for (int i = numobjects - 1; i > arrayIndex; i--) {
-            objlist[i] = objlist[i - 1];
+        for (i = numobjects - 1; i > arrayIndex; i--) {
+            objlist[i] = std::move(objlist[i - 1]);
         }
         objlist[arrayIndex] = obj;
     }
@@ -355,8 +397,11 @@ void Container<Type>::RemoveObjectAt(int index)
     numobjects--;
 
     for (i = index - 1; i < numobjects; i++) {
-        objlist[i] = objlist[i + 1];
+        objlist[i] = std::move(objlist[i + 1]);
     }
+
+    // Destroy the last object as it's now useless
+    objlist[numobjects].~Type();
 }
 
 template<class Type>
@@ -386,8 +431,8 @@ void Container<Type>::Reset()
 template<class Type>
 void Container<Type>::Resize(int maxelements)
 {
-    Type *temp;
-    int   i;
+    Type  *temp;
+    size_t i;
 
     if (maxelements <= 0) {
         FreeObjectList();
@@ -396,7 +441,7 @@ void Container<Type>::Resize(int maxelements)
 
     if (!objlist) {
         maxobjects = maxelements;
-        objlist    = new Type[maxobjects];
+        objlist    = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
     } else {
         temp = objlist;
 
@@ -406,13 +451,17 @@ void Container<Type>::Resize(int maxelements)
             maxobjects = numobjects;
         }
 
-        objlist = new Type[maxobjects];
+        objlist = (Type *)CONTAINER_Alloc(sizeof(Type) * maxobjects);
 
         for (i = 0; i < numobjects; i++) {
-            objlist[i] = temp[i];
+            // move the older type
+            new (objlist + i) Type(std::move(temp[i]));
+
+            // destruct the older type
+            temp[i].~Type();
         }
 
-        delete[] temp;
+        CONTAINER_Free(temp);
     }
 }
 
@@ -441,7 +490,7 @@ void Container<Type>::Sort(int (*compare)(const void *elem1, const void *elem2))
 }
 
 template<class Type>
-Type& Container<Type>::operator[](const int index) const
+Type& Container<Type>::operator[](const uintptr_t index) const
 {
     return ObjectAt(index + 1);
 }
@@ -478,10 +527,17 @@ void Container<Type>::Copy(const Container<Type>& container)
     return;
 }
 
-template<class Type>
-Container<Type>& Container<Type>::operator=(const Container<Type>& container)
+template<typename T>
+void *operator new(size_t count, Container<T>& container)
 {
-    Copy(container);
+    (void)count;
 
-    return *this;
+    assert(count == sizeof(T));
+    return &container.ObjectAt(container.AddObject());
+}
+
+template<typename T>
+void operator delete(void *ptr, Container<T>& container)
+{
+    container.RemoveObject((T *)ptr);
 }
diff --git a/code/qcommon/containerclass.h b/code/qcommon/containerclass.h
index e935648b..c8f74ec8 100644
--- a/code/qcommon/containerclass.h
+++ b/code/qcommon/containerclass.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,27 +33,176 @@ class ContainerClass : public Class
     Container<Type> value;
 
 public:
-    virtual ~ContainerClass() { value.FreeObjectList(); }
-    virtual void Archive(Archiver& arc);
+    ContainerClass();
+    ContainerClass(const Container<Type>& container);
+    ContainerClass<Type>& operator=(const Container<Type>& container);
+    ContainerClass(Container<Type>&& container);
+    ContainerClass<Type>& operator=(Container<Type>&& container);
 
-    int AddObject(const Type& obj) { return value.AddObject(obj); }
-    int AddUniqueObject(const Type& obj) { return value.AddUniqueObject(obj); }
-    void AddObjectAt(int index, const Type& obj) { return value.AddObjectAt(index, obj); }
-    Type *AddressOfObjectAt(int index) { return value.AddressOfObjectAt(index); }
-    void ClearObjectList(void) { return value.ClearObjectList(); }
-    void Fix(void) { return value.Fix(); }
-    void FreeObjectList(void) { return value.FreeObjectList(); }
-    int IndexOfObject(const Type& obj) { return value.IndexOfObject(obj); }
-    void InsertObjectAt(int index, const Type& obj) { return value.InsertObjectAt(index, obj); }
-    int NumObjects(void) const { return value.NumObjects(); }
-    Type& ObjectAt(const size_t index) const { return value.ObjectAt(index); }
-    bool ObjectInList(const Type& obj) { return value.ObjectInList(obj); }
-    void RemoveObjectAt(int index) { return value.RemoveObjectAt(index); }
-    void RemoveObject(const Type& obj) { return value.RemoveObject(obj); }
-    void Reset(void) { return value.Reset(); }
-    void Resize(int maxelements) { return value.Resize(maxelements); }
-    void SetObjectAt(int index, const Type& obj) { return value.SetObjectAt(index, obj); }
-    void Sort(int (*compare)(const void *elem1, const void *elem2)) { return value.Sort(compare); }
-    Type& operator[](const int index) const { return value[index]; }
-    Container<Type>& operator=(const Container<Type>& container) { return value = container; }
+    ~ContainerClass() override;
+
+    void Archive(Archiver& arc) override;
+
+    int   AddObject(const Type& obj);
+    int   AddUniqueObject(const Type& obj);
+    void  AddObjectAt(int index, const Type& obj);
+    Type *AddressOfObjectAt(int index);
+    void  ClearObjectList(void);
+    void  FreeObjectList(void);
+    int   IndexOfObject(const Type& obj);
+    void  InsertObjectAt(int index, const Type& obj);
+    int   NumObjects(void) const;
+    Type& ObjectAt(const size_t index) const;
+    bool  ObjectInList(const Type& obj);
+    void  RemoveObjectAt(int index);
+    void  RemoveObject(const Type& obj);
+    void  Reset(void);
+    void  Resize(int maxelements);
+    void  SetObjectAt(int index, const Type& obj);
+    void  Sort(int (*compare)(const void *elem1, const void *elem2));
+    Type& operator[](const int index) const;
 };
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass()
+{}
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass(const Container<Type>& container)
+    : value(container)
+{}
+
+template<typename Type>
+ContainerClass<Type>& ContainerClass<Type>::operator=(const Container<Type>& container)
+{
+    value = container;
+
+    return *this;
+}
+
+template<typename Type>
+ContainerClass<Type>::ContainerClass(Container<Type>&& container)
+    : value(std::move(container))
+{}
+
+template<typename Type>
+ContainerClass<Type>& ContainerClass<Type>::operator=(Container<Type>&& container)
+{
+    value = std::move(container);
+
+    return *this;
+}
+
+template<typename Type>
+ContainerClass<Type>::~ContainerClass()
+{
+    value.FreeObjectList();
+}
+
+template<typename Type>
+int ContainerClass<Type>::AddObject(const Type& obj)
+{
+    return value.AddObject(obj);
+}
+
+template<typename Type>
+int ContainerClass<Type>::AddUniqueObject(const Type& obj)
+{
+    return value.AddUniqueObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::AddObjectAt(int index, const Type& obj)
+{
+    return value.AddObjectAt(index, obj);
+}
+
+template<typename Type>
+Type *ContainerClass<Type>::AddressOfObjectAt(int index)
+{
+    return value.AddressOfObjectAt(index);
+}
+
+template<typename Type>
+void ContainerClass<Type>::ClearObjectList(void)
+{
+    return value.ClearObjectList();
+}
+
+template<typename Type>
+void ContainerClass<Type>::FreeObjectList(void)
+{
+    return value.FreeObjectList();
+}
+
+template<typename Type>
+int ContainerClass<Type>::IndexOfObject(const Type& obj)
+{
+    return value.IndexOfObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::InsertObjectAt(int index, const Type& obj)
+{
+    return value.InsertObjectAt(index, obj);
+}
+
+template<typename Type>
+int ContainerClass<Type>::NumObjects(void) const
+{
+    return value.NumObjects();
+}
+
+template<typename Type>
+Type& ContainerClass<Type>::ObjectAt(const size_t index) const
+{
+    return value.ObjectAt(index);
+}
+
+template<typename Type>
+bool ContainerClass<Type>::ObjectInList(const Type& obj)
+{
+    return value.ObjectInList(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::RemoveObjectAt(int index)
+{
+    return value.RemoveObjectAt(index);
+}
+
+template<typename Type>
+void ContainerClass<Type>::RemoveObject(const Type& obj)
+{
+    return value.RemoveObject(obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::Reset(void)
+{
+    return value.Reset();
+}
+
+template<typename Type>
+void ContainerClass<Type>::Resize(int maxelements)
+{
+    return value.Resize(maxelements);
+}
+
+template<typename Type>
+void ContainerClass<Type>::SetObjectAt(int index, const Type& obj)
+{
+    return value.SetObjectAt(index, obj);
+}
+
+template<typename Type>
+void ContainerClass<Type>::Sort(int (*compare)(const void *elem1, const void *elem2))
+{
+    return value.Sort(compare);
+}
+
+template<typename Type>
+Type& ContainerClass<Type>::operator[](const int index) const
+{
+    return value[index];
+}
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index f7f04b63..2d044859 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -1017,6 +1017,167 @@ void Cvar_SetS_f( void ) {
 	v->flags |= CVAR_SERVERINFO;
 }
 
+/*
+============
+Cvar_Reset_f
+============
+*/
+void Cvar_Reset_f( void ) {
+	if ( Cmd_Argc() != 2 ) {
+		Com_Printf ("usage: reset <variable>\n");
+		return;
+	}
+	Cvar_Reset( Cmd_Argv( 1 ) );
+}
+
+/*
+============
+Cvar_Add_f
+
+su44: Adds a value to a variable
+============
+*/
+void Cvar_Add_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: add <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) + amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Subtract_f
+============
+*/
+void Cvar_Subtract_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: subtract <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) - amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Scale_f
+============
+*/
+void Cvar_Scale_f( void ) {
+	int c;
+	float current;
+	float amount;
+	char val[32];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: scale <variable> <amount>\n");
+		return;
+	}
+
+	amount = atof(Cmd_Argv(2));
+	current = Cvar_VariableValue(Cmd_Argv(1)) * amount;
+	c = (int)current;
+	if (current == c) {
+		Com_sprintf(val, 32, "%i", c);
+	} else {
+		Com_sprintf(val, 32, "%f", current);
+	}
+
+	Cvar_Set2(Cmd_Argv(1), val, qfalse);
+}
+
+/*
+============
+Cvar_Append_f
+============
+*/
+void Cvar_Append_f( void ) {
+	int c;
+	char buffer[1024];
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("usage: append <variable> <string>\n");
+		return;
+	}
+
+	Com_sprintf(buffer, sizeof(buffer), "%s %s", Cvar_VariableString(Cmd_Argv(1)), Cmd_Argv(2));
+	Cvar_Set2(Cmd_Argv(1), buffer, qfalse);
+}
+
+/*
+============
+Cvar_Append_f
+============
+*/
+void Cvar_Bitset_f( void ) {
+	cvar_t* var;
+	const char* name;
+	int bit;
+	char val[32];
+
+	// Removed in OPM
+	//  Also let clients use bitset
+	/*
+	if (!com_sv_running->integer) {
+		Com_Printf("Server is not running.\n");
+		return;
+	}
+	*/
+
+	if (Cmd_Argc() < 3 || Cmd_Argc() > 4) {
+		//Com_Printf("Usage: bitset cvar bit [value]\n");
+		Com_Printf("Usage: bitset <variable> <bit> [1=add, 0=remove]\n");
+		return;
+	}
+
+	name = Cmd_Argv(1);
+	bit = atoi(Cmd_Argv(2));
+	var = Cvar_Get(name, "", 0);
+
+	if (!var->integer && var->string[0] != '0') {
+		Com_Printf("Error: cvar %s does not store an integer\n", name);
+		return;
+	}
+
+	if (Cmd_Argc() > 3 && !atoi(Cmd_Argv(3))) {
+		Com_sprintf(val, sizeof(val), "%i", var->integer & ~(1 << bit));
+	} else {
+		Com_sprintf(val, sizeof(val), "%i", var->integer | (1 << bit));
+	}
+
+	Cvar_Set(name, val);
+}
+
 /*
 ============
 Cvar_SetA_f
@@ -1039,43 +1200,6 @@ void Cvar_SetA_f( void ) {
 	v->flags |= CVAR_ARCHIVE;
 }
 
-/*
-============
-Cvar_Add_f
-
-su44: Adds a value to a variable
-============
-*/
-void Cvar_Add_f( void ) {
-	cvar_t	*v;
-	float f;
-
-	if ( Cmd_Argc() != 3 ) {
-		Com_Printf ("usage: add <variable> <amount>\n");
-		return;
-	}
-	v = Cvar_FindVar( Cmd_Argv( 1 ) );
-	if ( !v ) {
-		Cvar_Set( Cmd_Argv( 1 ), Cmd_Argv( 2 ) );
-		return;
-	}
-	f = v->value;
-	f += atof(Cmd_Argv(2));
-	Cvar_Set(v->name,va("%f",f));
-}
-/*
-============
-Cvar_Reset_f
-============
-*/
-void Cvar_Reset_f( void ) {
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("usage: reset <variable>\n");
-		return;
-	}
-	Cvar_Reset( Cmd_Argv( 1 ) );
-}
-
 /*
 ============
 Cvar_WriteVariables
@@ -1411,9 +1535,16 @@ char *Cvar_InfoString(int bit)
 
 	info[0] = 0;
 
+	// start with read-only variable so they appear first
+	for (var = cvar_vars; var; var = var->next)
+	{
+		if (var->name && (var->flags & bit) && (var->flags & CVAR_ROM))
+			Info_SetValueForKey(info, var->name, var->string);
+	}
+
 	for(var = cvar_vars; var; var = var->next)
 	{
-		if(var->name && (var->flags & bit))
+		if (var->name && (var->flags & bit) && !(var->flags & CVAR_ROM))
 			Info_SetValueForKey (info, var->name, var->string);
 	}
 
@@ -1434,9 +1565,16 @@ char *Cvar_InfoString_Big(int bit)
 
 	info[0] = 0;
 
+	// start with read-only variable so they appear first
 	for (var = cvar_vars; var; var = var->next)
 	{
-		if(var->name && (var->flags & bit))
+		if (var->name && (var->flags & bit) && (var->flags & CVAR_ROM))
+			Info_SetValueForKey(info, var->name, var->string);
+	}
+
+	for (var = cvar_vars; var; var = var->next)
+	{
+		if (var->name && (var->flags & bit) && !(var->flags & CVAR_ROM))
 			Info_SetValueForKey_Big (info, var->name, var->string);
 	}
 	return info;
@@ -1592,7 +1730,7 @@ void Cvar_CompleteCvarName( const char *args, int argNum )
 	if( argNum == 2 )
 	{
 		// Skip "<cmd> "
-		char *p = Com_SkipTokens( args, 1, " " );
+		char *p = Com_SkipTokens((char *)args, 1, " " );
 
 		if( p > args )
 			Field_CompleteCommand( p, qfalse, qtrue );
@@ -1611,7 +1749,7 @@ void Cvar_Init (void)
 	Com_Memset(cvar_indexes, '\0', sizeof(cvar_indexes));
 	Com_Memset(hashTable, '\0', sizeof(hashTable));
 
-	cvar_cheats = Cvar_Get("sv_cheats", "1", CVAR_ROM | CVAR_SYSTEMINFO );
+	cvar_cheats = Cvar_Get("cheats", "1", CVAR_LATCH | CVAR_SYSTEMINFO );
 
 	Cmd_AddCommand ("print", Cvar_Print_f);
 	Cmd_AddCommand ("toggle", Cvar_Toggle_f);
@@ -1634,6 +1772,12 @@ void Cvar_Init (void)
 	Cmd_AddCommand ("cvar_restart", Cvar_Restart_f);
 	// su44: added for MoHAA
 	Cmd_AddCommand ("add", Cvar_Add_f);
+	Cmd_AddCommand ("subtract", Cvar_Subtract_f);
+	Cmd_AddCommand ("scale", Cvar_Scale_f);
+	Cmd_AddCommand ("append", Cvar_Append_f);
+
+	// Added in 2.30
+	Cmd_AddCommand ("bitset", Cvar_Bitset_f);
 }
 
 #ifndef STANDALONE
diff --git a/code/qcommon/delegate.cpp b/code/qcommon/delegate.cpp
new file mode 100644
index 00000000..48899977
--- /dev/null
+++ b/code/qcommon/delegate.cpp
@@ -0,0 +1,52 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "delegate.h"
+
+uint64_t DelegateHandle::currentHandle = 0;
+
+DelegateHandle::DelegateHandle()
+    : handle(GenerateDelegateID())
+{}
+
+bool DelegateHandle::operator==(const DelegateHandle& other) const
+{
+    return handle == other.handle;
+}
+
+bool DelegateHandle::operator!=(const DelegateHandle& other) const
+{
+    return handle != other.handle;
+}
+
+uint64_t DelegateHandle::GenerateDelegateID()
+{
+    uint64_t handle;
+
+    handle = ++currentHandle;
+
+    if (handle == 0) {
+        handle = ++currentHandle;
+    }
+
+    return handle;
+}
diff --git a/code/qcommon/delegate.h b/code/qcommon/delegate.h
new file mode 100644
index 00000000..103f4c00
--- /dev/null
+++ b/code/qcommon/delegate.h
@@ -0,0 +1,127 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include <functional>
+#include "container.h"
+
+template<typename T>
+using Delegate = std::function<T>;
+
+struct DelegateHandle {
+public:
+    DelegateHandle();
+
+    bool operator==(const DelegateHandle& other) const;
+    bool operator!=(const DelegateHandle& other) const;
+
+private:
+    static uint64_t GenerateDelegateID();
+    static uint64_t currentHandle;
+
+    uint64_t handle;
+};
+
+template<typename T>
+class DelegateMultiElement
+{
+public:
+    DelegateMultiElement(Delegate<T>&& inFunction);
+
+    template<typename... Args>
+    void Execute(Args&&...args) const;
+
+    DelegateHandle GetHandle() const;
+
+private:
+    DelegateHandle handle;
+    Delegate<T>    func;
+};
+
+template<typename T>
+DelegateMultiElement<T>::DelegateMultiElement(Delegate<T>&& inFunction)
+    : func(inFunction)
+{}
+
+template<typename T>
+template<typename... Args>
+void DelegateMultiElement<T>::Execute(Args&&...args) const
+{
+    func(std::move(args)...);
+}
+
+template<typename T>
+DelegateHandle DelegateMultiElement<T>::GetHandle() const
+{
+    return handle;
+}
+
+template<typename T>
+class MulticastDelegate
+{
+public:
+    DelegateHandle Add(Delegate<T>&& function);
+    void           Remove(DelegateHandle handle);
+
+    template<typename... Args>
+    void Execute(Args&&...args);
+
+private:
+    Container<DelegateMultiElement<T>> delegates;
+};
+
+template<typename T>
+DelegateHandle MulticastDelegate<T>::Add(Delegate<T>&& function)
+{
+    int index = delegates.AddObject(DelegateMultiElement<T>(std::move(function)));
+
+    return delegates.ObjectAt(index).GetHandle();
+}
+
+template<typename T>
+void MulticastDelegate<T>::Remove(DelegateHandle handle)
+{
+    int i;
+
+    for (i = delegates.NumObjects(); i > 0; i--) {
+        const DelegateMultiElement<T>& elem = delegates.ObjectAt(i);
+
+        if (elem.GetHandle() == handle) {
+            delegates.RemoveObjectAt(i);
+            break;
+        }
+    }
+}
+
+template<typename T>
+template<typename... Args>
+void MulticastDelegate<T>::Execute(Args&&...args)
+{
+    size_t i;
+
+    for (i = 1; i <= delegates.NumObjects(); i++) {
+        const DelegateMultiElement<T>& element = delegates.ObjectAt(i);
+
+        element.Execute(std::move(args)...);
+    }
+}
diff --git a/code/qcommon/files.cpp b/code/qcommon/files.cpp
index ef99d305..f3e5ccbd 100644
--- a/code/qcommon/files.cpp
+++ b/code/qcommon/files.cpp
@@ -33,6 +33,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "unzip.h"
 
+#ifndef _WIN32
+#   include <sys/types.h>
+#   include <sys/stat.h>
+#   include <errno.h>
+#   include <dirent.h>
+#endif
+
 /*
 =============================================================================
 
@@ -288,7 +295,7 @@ typedef struct {
 static fileHandleData_t	fsh[MAX_FILE_HANDLES];
 
 // TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=540
-// wether we did a reorder on the current search path when joining the server
+// whether we did a reorder on the current search path when joining the server
 static qboolean fs_reordered;
 
 // never load anything from pk3 files that are not present at the server when pure
@@ -522,17 +529,51 @@ check_filecase
 ====================
 */
 static int check_filecase( char *Path ) {
-	/*
-	int retval;
+    int retval;
+
+#ifdef _WIN32
+    retval = 0;
+#else
 	char *ptr;
 	char *filename;
-	char *basedir;
+	const char *basedir;
+    DIR* dir;
 
-	// of course there is no portable way to open a dir in Linux or Windows
-	// DAMNIT
-	// FIXME: stub
-	*/
-	return 0;
+    retval = 0;
+    ptr = strrchr(Path, '/');
+    filename = Path;
+
+    if (ptr) {
+        filename = ptr + 1;
+    }
+
+    basedir = ".";
+    if (ptr)
+    {
+        basedir = Path;
+        *ptr = 0;
+    }
+
+    dir = opendir(basedir);
+    if (dir)
+    {
+        dirent* ent;
+
+        for (ent = readdir(dir); ent && !retval; ent = readdir(dir)) {
+            if (!Q_stricmp(ent->d_name, filename)) {
+                strcpy(filename, ent->d_name);
+                retval = 1;
+            }
+        }
+
+        closedir(dir);
+    }
+
+    if (ptr) {
+        *ptr = '/';
+    }
+#endif
+    return retval;
 }
 
 /*
@@ -564,9 +605,7 @@ void FS_CorrectCase( char *path ) {
 			*ptr = 0;
 		}
 
-		getOut = access( path, 0 );
-
-		if( getOut ) {
+		if( access(path, 0) ) {
 			getOut = !check_filecase( path );
 		}
 
@@ -1455,7 +1494,11 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_
 			   !FS_IsExt(filename, ".menu", len) &&		// menu files
 			   !FS_IsExt(filename, ".game", len) &&		// menu files
 			   !FS_IsExt(filename, ".dat", len) &&		// for journal files
-			   !FS_IsDemoExt(filename, len))			// demos
+			   !FS_IsExt(filename, ".wav", len) &&		// sound files
+			   !FS_IsExt(filename, ".mp3", len) &&		// sound files
+			   !FS_IsExt(filename, ".ogg", len) &&		// sound files
+			   !FS_IsDemoExt(filename, len)			// demos
+				)
 			{
 				*file = 0;
 				return -1;
@@ -1671,107 +1714,11 @@ FS_Seek
 
 =================
 */
-int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
-#if 0
+int FS_Seek( fileHandle_t f, long offset, int origin ) {
 	int		_origin;
 
 	if ( !fs_searchpaths ) {
-		Com_Error( ERR_FATAL, "Filesystem call made without initialization\n" );
-		return -1;
-	}
-
-	switch( origin ) {
-		case FS_SEEK_CUR:
-			_origin = SEEK_CUR;
-			break;
-		case FS_SEEK_END:
-			_origin = SEEK_END;
-			break;
-		case FS_SEEK_SET:
-			_origin = SEEK_SET;
-			break;
-		default:
-			Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-			_origin = 0;
-			break;
-	}
-
-	if( fsh[ f ].zipFile == qtrue ) {
-		if( !unzIsCurrentFileOpen( fsh[ f ].handleFiles.file.o ) ) {
-			Com_Error( ERR_FATAL, "Tried to read from a zip file %s that was not open\n", fsh[ f ].name );
-		}
-		return unzseek( fsh[ f ].handleFiles.file.o, offset, _origin );
-	} else {
-		return fseek( FS_FileForHandle( f ), offset, _origin );
-	}
-
-#if 0
-
-	if (fsh[f].streamed) {
-		fsh[f].streamed = qfalse;
-	 	FS_Seek( f, offset, origin );
-		fsh[f].streamed = qtrue;
-	}
-
-	if (fsh[f].zipFile == qtrue) {
-		//FIXME: this is incomplete and really, really
-		//crappy (but better than what was here before)
-		byte	buffer[PK3_SEEK_BUFFER_SIZE];
-		int		remainder = offset;
-
-		if( offset < 0 || origin == FS_SEEK_END ) {
-			Com_Error( ERR_FATAL, "Negative offsets and FS_SEEK_END not implemented "
-					"for FS_Seek on pk3 file contents\n" );
-			return -1;
-		}
-
-		switch( origin ) {
-			case FS_SEEK_SET:
-				unzSetCurrentFileInfoPosition(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
-				unzOpenCurrentFile(fsh[f].handleFiles.file.z);
-				//fallthrough
-
-			case FS_SEEK_CUR:
-				while( remainder > PK3_SEEK_BUFFER_SIZE ) {
-					FS_Read( buffer, PK3_SEEK_BUFFER_SIZE, f );
-					remainder -= PK3_SEEK_BUFFER_SIZE;
-				}
-				FS_Read( buffer, remainder, f );
-				return offset;
-				break;
-
-			default:
-				Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-				return -1;
-				break;
-		}
-	} else {
-		FILE *file;
-		file = FS_FileForHandle(f);
-		switch( origin ) {
-		case FS_SEEK_CUR:
-			_origin = SEEK_CUR;
-			break;
-		case FS_SEEK_END:
-			_origin = SEEK_END;
-			break;
-		case FS_SEEK_SET:
-			_origin = SEEK_SET;
-			break;
-		default:
-			_origin = SEEK_CUR;
-			Com_Error( ERR_FATAL, "Bad origin in FS_Seek\n" );
-			break;
-		}
-
-		return fseek( file, offset, _origin );
-	}
-#endif
-#else
-	int		_origin;
-
-	if (!fs_searchpaths) {
-		Com_Error(ERR_FATAL, "Filesystem call made without initialization");
+		Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
 		return -1;
 	}
 
@@ -1780,67 +1727,64 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 		//(but better than what was here before)
 		byte	buffer[PK3_SEEK_BUFFER_SIZE];
 		int		remainder;
-		int		currentPosition = FS_FTell(f);
+		int		currentPosition = FS_FTell( f );
 
 		// change negative offsets into FS_SEEK_SET
-		if (offset < 0) {
-			switch (origin) {
-			case FS_SEEK_END:
-				remainder = fsh[f].zipFileLen + offset;
-				break;
+		if ( offset < 0 ) {
+			switch( origin ) {
+				case FS_SEEK_END:
+					remainder = fsh[f].zipFileLen + offset;
+					break;
 
-			case FS_SEEK_CUR:
-				remainder = currentPosition + offset;
-				break;
+				case FS_SEEK_CUR:
+					remainder = currentPosition + offset;
+					break;
 
-			case FS_SEEK_SET:
-			default:
-				remainder = 0;
-				break;
+				case FS_SEEK_SET:
+				default:
+					remainder = 0;
+					break;
 			}
 
-			if (remainder < 0) {
+			if ( remainder < 0 ) {
 				remainder = 0;
 			}
 
 			origin = FS_SEEK_SET;
-		}
-		else {
-			if (origin == FS_SEEK_END) {
+		} else {
+			if ( origin == FS_SEEK_END ) {
 				remainder = fsh[f].zipFileLen - currentPosition + offset;
-			}
-			else {
+			} else {
 				remainder = offset;
 			}
 		}
 
-		switch (origin) {
-		case FS_SEEK_SET:
-			if (remainder == currentPosition) {
-				return 0;
-			}
-			unzSetOffset(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
-			unzOpenCurrentFile(fsh[f].handleFiles.file.z);
-			//fallthrough
+		switch( origin ) {
+			case FS_SEEK_SET:
+				if ( remainder == currentPosition ) {
+					return offset;
+				}
+				unzSetOffset(fsh[f].handleFiles.file.z, fsh[f].zipFilePos);
+				unzOpenCurrentFile(fsh[f].handleFiles.file.z);
+				//fallthrough
 
-		case FS_SEEK_END:
-		case FS_SEEK_CUR:
-			while (remainder > PK3_SEEK_BUFFER_SIZE) {
-				FS_Read(buffer, PK3_SEEK_BUFFER_SIZE, f);
-				remainder -= PK3_SEEK_BUFFER_SIZE;
-			}
-			FS_Read(buffer, remainder, f);
-			return 0;
+			case FS_SEEK_END:
+			case FS_SEEK_CUR:
+				while( remainder > PK3_SEEK_BUFFER_SIZE ) {
+					FS_Read( buffer, PK3_SEEK_BUFFER_SIZE, f );
+					remainder -= PK3_SEEK_BUFFER_SIZE;
+				}
+				FS_Read( buffer, remainder, f );
+				return offset;
 
-		default:
-			Com_Error(ERR_FATAL, "Bad origin in FS_Seek");
-			return -1;
+			default:
+				Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
+				return -1;
 		}
-	}
-	else {
+	} else {
 		FILE *file;
 		file = FS_FileForHandle(f);
-		switch (origin) {
+		switch( origin ) {
 		case FS_SEEK_CUR:
 			_origin = SEEK_CUR;
 			break;
@@ -1851,13 +1795,12 @@ int FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin ) {
 			_origin = SEEK_SET;
 			break;
 		default:
-			Com_Error(ERR_FATAL, "Bad origin in FS_Seek");
+			Com_Error( ERR_FATAL, "Bad origin in FS_Seek" );
 			break;
 		}
 
-		return fseek(file, offset, _origin);
+		return fseek( file, offset, _origin );
 	}
-#endif
 }
 
 
@@ -2350,7 +2293,9 @@ static int FS_ReturnPath( const char *zname, char *zpath, int *depth ) {
 	{
 		if (zname[at]=='/' || zname[at]=='\\') {
 			len = at;
-			newdep++;
+			if (zname[at + 1]) {
+				newdep++;
+			}
 		}
 		at++;
 	}
@@ -2403,6 +2348,10 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 	pack_t			*pak;
 	fileInPack_t	*buildBuffer;
 	char			zpath[MAX_ZPATH];
+	qboolean		bDirSearch;
+	const char		*pExtToken;
+	const char		*pExtension;
+	char			currentExtension[MAX_ZPATH];
 
 	if ( !fs_searchpaths ) {
 		Com_Error( ERR_FATAL, "Filesystem call made without initialization" );
@@ -2412,8 +2361,9 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 		*numfiles = 0;
 		return NULL;
 	}
-	if ( !extension ) {
-		extension = "";
+	pExtension = extension;
+	if ( !pExtension ) {
+		pExtension = "";
 	}
 
 	pathLength = strlen( path );
@@ -2424,83 +2374,119 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, const char
 	nfiles = 0;
 	FS_ReturnPath(path, zpath, &pathDepth);
 
-	//
-	// search through the path, one element at a time, adding to list
-	//
-	for (search = fs_searchpaths ; search ; search = search->next) {
-		// is the element a pak file?
-		if (search->pack) {
+	do {
+		// enumerate extensions
+		pExtToken = strstr(pExtension, ";");
+		if (pExtToken) {
+			extensionLength = pExtToken - pExtension;
+			strncpy(currentExtension, pExtension, extensionLength);
+			currentExtension[extensionLength] = 0;
+			pExtToken++;
+		}
+		else {
+			strcpy(currentExtension, pExtension);
+			extensionLength = strlen(currentExtension);
+		}
 
-			//ZOID:  If we are pure, don't search for files on paks that
-			// aren't on the pure list
-			if ( !FS_PakIsPure(search->pack) ) {
-				continue;
-			}
+		bDirSearch = qfalse;
+		if (currentExtension[0] == '/') {
+			bDirSearch = extension[1] == 0;
+		}
 
-			// look through all the pak file elements
-			pak = search->pack;
-			buildBuffer = pak->buildBuffer;
-			for (i = 0; i < pak->numfiles; i++) {
-				char	*name;
-				int		zpathLen, depth;
+		//
+		// search through the path, one element at a time, adding to list
+		//
+		for (search = fs_searchpaths ; search ; search = search->next) {
+			// is the element a pak file?
+			if (search->pack) {
 
-				// check for directory match
-				name = buildBuffer[i].name;
-				//
-				if (filter) {
-					// case insensitive
-					if (!Com_FilterPath( filter, name, qfalse ))
-						continue;
-					// unique the match
-					nfiles = FS_AddFileToList( name, list, nfiles );
+				//ZOID:  If we are pure, don't search for files on paks that
+				// aren't on the pure list
+				if ( !FS_PakIsPure(search->pack) ) {
+					continue;
 				}
-				else {
 
+				// look through all the pak file elements
+				pak = search->pack;
+				buildBuffer = pak->buildBuffer;
+				for (i = 0; i < pak->numfiles; i++) {
+					char	*name;
+					int		zpathLen, depth;
+
+					// check for directory match
+					name = buildBuffer[i].name;
+					
 					zpathLen = FS_ReturnPath(name, zpath, &depth);
 
-					if ( (depth-pathDepth)>2 || pathLength > zpathLen || Q_stricmpn( name, path, pathLength ) ) {
+					if ( pathLength > (zpathLen + 1) || Q_stricmpn( name, path, pathLength ) || ((!wantSubs || bDirSearch) && depth - pathDepth != 1) ) {
 						continue;
 					}
 
-					// check for extension match
-					length = strlen( name );
-					if ( length < extensionLength ) {
-						continue;
+					//
+					if (filter) {
+						if (zpathLen) {
+							strcpy(zpath, name + zpathLen + 1);
+						}
+						else {
+							strcpy(zpath, name);
+						}
+						// case insensitive
+						if (!Com_FilterPath( filter, zpath, qfalse ))
+							continue;
+						// unique the match
+						nfiles = FS_AddFileToList( zpath, list, nfiles );
 					}
+					else {
+						// check for extension match
+						length = strlen( name );
+						if ( length < extensionLength ) {
+							continue;
+						}
 
-					if ( Q_stricmp( name + length - extensionLength, extension ) ) {
-						continue;
-					}
-					// unique the match
+						if ( Q_stricmp( name + length - extensionLength, extension ) ) {
+							continue;
+						}
+						// unique the match
 
-					temp = pathLength;
-					if (pathLength) {
-						temp++; // include the '/'
+						temp = pathLength;
+						if (pathLength) {
+							temp++; // include the '/'
+						}
+
+						if (bDirSearch) {
+							strcpy(zpath, name + temp);
+							zpath[length - temp - 1] = 0;
+							nfiles = FS_AddFileToList(zpath, list, nfiles);
+						}
+						else {
+							nfiles = FS_AddFileToList(name + temp, list, nfiles);
+						}
 					}
-					nfiles = FS_AddFileToList( name + temp, list, nfiles );
 				}
-			}
-		} else if (search->dir) { // scan for files in the filesystem
-			char	*netpath;
-			int		numSysFiles;
-			char	**sysFiles;
-			char	*name;
+			} else if (search->dir) { // scan for files in the filesystem
+				char	*netpath;
+				int		numSysFiles;
+				char	**sysFiles;
+				char	*name;
 
-			// don't scan directories for files if we are pure or restricted
-			if ( fs_numServerPaks && !allowNonPureFilesOnDisk ) {
-				continue;
-			} else {
-				netpath = FS_BuildOSPath( search->dir->path, search->dir->gamedir, path );
-				sysFiles = Sys_ListFiles( netpath, extension, filter, &numSysFiles, qfalse );
-				for ( i = 0 ; i < numSysFiles ; i++ ) {
-					// unique the match
-					name = sysFiles[i];
-					nfiles = FS_AddFileToList( name, list, nfiles );
+				// don't scan directories for files if we are pure or restricted
+				if ( fs_numServerPaks && !allowNonPureFilesOnDisk ) {
+					continue;
+				} else {
+					netpath = FS_BuildOSPath( search->dir->path, search->dir->gamedir, path );
+					sysFiles = Sys_ListFiles( netpath, extension, filter, &numSysFiles, wantSubs );
+					for ( i = 0 ; i < numSysFiles ; i++ ) {
+						// unique the match
+						name = sysFiles[i];
+						nfiles = FS_AddFileToList( name, list, nfiles );
+					}
+					Sys_FreeFileList( sysFiles );
 				}
-				Sys_FreeFileList( sysFiles );
 			}
 		}
-	}
+
+		pExtension = pExtToken;
+	} while (pExtToken);
 
 	// return a copy of the list
 	*numfiles = nfiles;
@@ -2847,11 +2833,11 @@ int FS_PathCmp( const char *s1, const char *s2 ) {
 		c1 = *s1++;
 		c2 = *s2++;
 
-		if (c1 >= 'a' && c1 <= 'z') {
-			c1 -= ('a' - 'A');
+		if (c1 >= 'A' && c1 <= 'Z') {
+			c1 += ('a' - 'A');
 		}
-		if (c2 >= 'a' && c2 <= 'z') {
-			c2 -= ('a' - 'A');
+		if (c2 >= 'A' && c2 <= 'Z') {
+			c2 += ('a' - 'A');
 		}
 
 		if ( c1 == '\\' || c1 == ':' ) {
@@ -3057,9 +3043,6 @@ static int QDECL paksort(const void *a, const void *b) {
 	aa = *(char **)a;
 	bb = *(char **)b;
 
-	const char* f1 = COM_SkipPath(aa);
-	const char* f2 = COM_SkipPath(bb);
-
 	return FS_PathCmp( aa, bb );
 }
 
@@ -3265,7 +3248,7 @@ qboolean FS_ComparePaks( char *neededpaks, int len, qboolean dlstring ) {
 		havepak = qfalse;
 
 		// never autodownload any of the id paks
-		if ( FS_idPak(fs_serverReferencedPakNames[i], BASEGAME) || FS_idPak(fs_serverReferencedPakNames[i], "missionpack") ) {
+		if ( FS_idPak(fs_serverReferencedPakNames[i], com_basegame->string) || FS_idPak(fs_serverReferencedPakNames[i], "missionpack") ) {
 			continue;
 		}
 
@@ -3451,10 +3434,13 @@ static void FS_Startup(const char* gameName)
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT | CVAR_PROTECTED);
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
-	//homePath = Sys_DefaultHomePath();
-	homePath = "";
+	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;
+	} else if (com_target_demo->integer) {
+		// As full and demo are different products,
+		// it's better for them to have separate location for configs and saves
+		homePath = va("%s-demo", homePath);
 	}
 	fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT|CVAR_PROTECTED );
 	fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
@@ -3546,7 +3532,7 @@ static void FS_Startup(const char* gameName)
 
 #ifndef STANDALONE
 	if (!com_standalone->integer) {
-		Com_ReadCDKey(BASEGAME);
+		Com_ReadCDKey(com_basegame->string);
 		if (fs_gamedirvar->string[0]) {
 			Com_AppendCDKey(fs_gamedirvar->string);
 		}
@@ -3742,7 +3728,7 @@ const char *FS_ReferencedPakChecksums( void ) {
 	for ( search = fs_searchpaths ; search ; search = search->next ) {
 		// is the element a pak file?
 		if ( search->pack ) {
-			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) {
+			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, com_basegame->string, strlen(com_basegame->string))) {
 				Q_strcat( info, sizeof( info ), va("%i ", search->pack->checksum ) );
 			}
 		}
@@ -3770,7 +3756,8 @@ const char *FS_ReferencedPakPureChecksums( void ) {
 
 	checksum = fs_checksumFeed;
 	numPaks = 0;
-	for (nFlags = FS_CGAME_REF; nFlags; nFlags = nFlags >> 1) {
+	for (nFlags = FS_GENERAL_REF; nFlags; nFlags = nFlags >> 1) {
+		/*
 		if (nFlags & FS_GENERAL_REF) {
 			// add a delimter between must haves and general refs
 			//Q_strcat(info, sizeof(info), "@ ");
@@ -3779,6 +3766,7 @@ const char *FS_ReferencedPakPureChecksums( void ) {
 			info[strlen(info)] = '@';
 			info[strlen(info)] = ' ';
 		}
+		*/
 		for ( search = fs_searchpaths ; search ; search = search->next ) {
 			// is the element a pak file and has it been referenced based on flag?
 			if ( search->pack && (search->pack->referenced & nFlags)) {
@@ -3790,10 +3778,6 @@ const char *FS_ReferencedPakPureChecksums( void ) {
 				numPaks++;
 			}
 		}
-		if (fs_fakeChkSum != 0) {
-			// only added if a non-pure file is referenced
-			Q_strcat( info, sizeof( info ), va("%i ", fs_fakeChkSum ) );
-		}
 	}
 	// last checksum is the encoded number of referenced pk3s
 	checksum ^= numPaks;
@@ -3824,7 +3808,7 @@ const char *FS_ReferencedPakNames( void ) {
 			if (*info) {
 				Q_strcat(info, sizeof( info ), " " );
 			}
-			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) {
+			if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, com_basegame->string, strlen(com_basegame->string))) {
 				Q_strcat( info, sizeof( info ), search->pack->pakGamename );
 				Q_strcat( info, sizeof( info ), "/" );
 				Q_strcat( info, sizeof( info ), search->pack->pakBasename );
@@ -4028,7 +4012,9 @@ void FS_Restart( int checksumFeed ) {
 	// try to start up normally
 	FS_Startup(com_basegame->string);
 
+#ifndef STANDALONE
 	FS_CheckPak0( );
+#endif
 
 	// if we can't find default.cfg, assume that the paths are
 	// busted and error out now, rather than getting an unreadable
@@ -4184,8 +4170,8 @@ void	FS_FilenameCompletion( const char *dir, const char *ext,
 
 const char *FS_GetCurrentGameDir(void)
 {
-	if(fs_gamedirvar->string[0])
-		return fs_gamedirvar->string;
+	if(fs_gamedir[0])
+		return fs_gamedir;
 
 	return com_basegame->string;
 }
@@ -4342,21 +4328,88 @@ FS_CanonicalFilename
 */
 void FS_CanonicalFilename(char* filename)
 {
-    char* p = filename;
+	char* source;
+	char* dest;
 
-    while (*p)
+	dest = filename;
+
+    for(source = filename; *source; source++)
     {
-        if (p[0] == '/' && p[1] == '/')
-        {
-            char* p2 = p + 1;
+		switch (*source) {
+		case '\t':
+		case ' ':
+			break;
+		case '\n':
+		case '\r':
+			*filename = 0;
+			break;
+		case '/':
+		case '\\':
+			if (dest == filename) {
+				*filename = 0;
+				return;
+			}
 
-            while (*p2)
-            {
-                p2[0] = p2[1];
-                p2++;
+			if (*(dest - 1) != '/') {
+				*dest = '/';
+				dest++;
+			}
+			break;
+		default:
+			*dest = tolower(*source);
+			dest++;
+			break;
+		}
+    }
+
+	*dest = 0;
+}
+
+void FS_FileTime(const char *filename, char *date, char *size)
+{
+    const char *ospath;
+    struct stat fileStat;
+    int         result = -1;
+
+    date[0] = 0;
+    size[0] = 0;
+
+    // Fixed in OPM:
+    // don't only check the home directory (fs_homepath) for possible files,
+    // but look through all searchpaths
+    //ospath = FS_BuildOSPath(fs_homepath->string, fs_gamedir, filename);
+    for (auto search = fs_searchpaths; search; search = search->next) {
+        if (search->dir != NULL && search->dir->path[0]) {
+            ospath = FS_BuildOSPath(search->dir->path, fs_gamedir, filename);
+            result = stat(ospath, &fileStat);
+            if (result != -1) {
+                // found the valid file
+                break;
             }
         }
-
-        p++;
     }
+
+    if (result == -1) {
+        int err = errno;
+        return;
+    }
+
+    time_t modTime  = fileStat.st_mtime;
+    off_t  fileSize = fileStat.st_size;
+
+    // FIXME: provide option not to use idiotic date formats
+    tm tm = *localtime(&modTime);
+    Q_snprintf(
+        date,
+        128,
+        "%2d/%02d/%04d %2d:%02d%c",
+        tm.tm_mon + 1,
+        tm.tm_mday,
+        tm.tm_year + 1900,
+        (tm.tm_hour + 12) % 12,
+        tm.tm_min,
+        tm.tm_hour < 12 ? 'a' : 'p'
+    );
+
+    Q_snprintf(size, 128, "%ld", fileSize);
 }
diff --git a/code/qcommon/huffman.c b/code/qcommon/huffman.c
deleted file mode 100644
index 0283fb70..00000000
--- a/code/qcommon/huffman.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-/* This is based on the Adaptive Huffman algorithm described in Sayood's Data
- * Compression book.  The ranks are not actually stored, but implicitly defined
- * by the location of a node within a doubly-linked list */
-
-#include "q_shared.h"
-#include "qcommon.h"
-
-static int			bloc = 0;
-
-void	Huff_putBit( int bit, byte *fout, int *offset) {
-	bloc = *offset;
-	if ((bloc&7) == 0) {
-		fout[(bloc>>3)] = 0;
-	}
-	fout[(bloc>>3)] |= bit << (bloc&7);
-	bloc++;
-	*offset = bloc;
-}
-
-int		Huff_getBloc(void)
-{
-	return bloc;
-}
-
-void	Huff_setBloc(int _bloc)
-{
-	bloc = _bloc;
-}
-
-int		Huff_getBit( byte *fin, int *offset) {
-	int t;
-	bloc = *offset;
-	t = (fin[(bloc>>3)] >> (bloc&7)) & 0x1;
-	bloc++;
-	*offset = bloc;
-	return t;
-}
-
-/* Add a bit to the output file (buffered) */
-static void add_bit (char bit, byte *fout) {
-	if ((bloc&7) == 0) {
-		fout[(bloc>>3)] = 0;
-	}
-	fout[(bloc>>3)] |= bit << (bloc&7);
-	bloc++;
-}
-
-/* Receive one bit from the input file (buffered) */
-static int get_bit (byte *fin) {
-	int t;
-	t = (fin[(bloc>>3)] >> (bloc&7)) & 0x1;
-	bloc++;
-	return t;
-}
-
-static node_t **get_ppnode(huff_t* huff) {
-	node_t **tppnode;
-	if (!huff->freelist) {
-		return &(huff->nodePtrs[huff->blocPtrs++]);
-	} else {
-		tppnode = huff->freelist;
-		huff->freelist = (node_t **)*tppnode;
-		return tppnode;
-	}
-}
-
-static void free_ppnode(huff_t* huff, node_t **ppnode) {
-	*ppnode = (node_t *)huff->freelist;
-	huff->freelist = ppnode;
-}
-
-/* Swap the location of these two nodes in the tree */
-static void swap (huff_t* huff, node_t *node1, node_t *node2) { 
-	node_t *par1, *par2;
-
-	par1 = node1->parent;
-	par2 = node2->parent;
-
-	if (par1) {
-		if (par1->left == node1) {
-			par1->left = node2;
-		} else {
-	      par1->right = node2;
-		}
-	} else {
-		huff->tree = node2;
-	}
-
-	if (par2) {
-		if (par2->left == node2) {
-			par2->left = node1;
-		} else {
-			par2->right = node1;
-		}
-	} else {
-		huff->tree = node1;
-	}
-  
-	node1->parent = par2;
-	node2->parent = par1;
-}
-
-/* Swap these two nodes in the linked list (update ranks) */
-static void swaplist(node_t *node1, node_t *node2) {
-	node_t *par1;
-
-	par1 = node1->next;
-	node1->next = node2->next;
-	node2->next = par1;
-
-	par1 = node1->prev;
-	node1->prev = node2->prev;
-	node2->prev = par1;
-
-	if (node1->next == node1) {
-		node1->next = node2;
-	}
-	if (node2->next == node2) {
-		node2->next = node1;
-	}
-	if (node1->next) {
-		node1->next->prev = node1;
-	}
-	if (node2->next) {
-		node2->next->prev = node2;
-	}
-	if (node1->prev) {
-		node1->prev->next = node1;
-	}
-	if (node2->prev) {
-		node2->prev->next = node2;
-	}
-}
-
-/* Do the increments */
-static void increment(huff_t* huff, node_t *node) {
-	node_t *lnode;
-
-	if (!node) {
-		return;
-	}
-
-	if (node->next != NULL && node->next->weight == node->weight) {
-	    lnode = *node->head;
-		if (lnode != node->parent) {
-			swap(huff, lnode, node);
-		}
-		swaplist(lnode, node);
-	}
-	if (node->prev && node->prev->weight == node->weight) {
-		*node->head = node->prev;
-	} else {
-	    *node->head = NULL;
-		free_ppnode(huff, node->head);
-	}
-	node->weight++;
-	if (node->next && node->next->weight == node->weight) {
-		node->head = node->next->head;
-	} else { 
-		node->head = get_ppnode(huff);
-		*node->head = node;
-	}
-	if (node->parent) {
-		increment(huff, node->parent);
-		if (node->prev == node->parent) {
-			swaplist(node, node->parent);
-			if (*node->head == node) {
-				*node->head = node->parent;
-			}
-		}
-	}
-}
-
-void Huff_addRef(huff_t* huff, byte ch) {
-	node_t *tnode, *tnode2;
-	if (huff->loc[ch] == NULL) { /* if this is the first transmission of this node */
-		tnode = &(huff->nodeList[huff->blocNode++]);
-		tnode2 = &(huff->nodeList[huff->blocNode++]);
-
-		tnode2->symbol = INTERNAL_NODE;
-		tnode2->weight = 1;
-		tnode2->next = huff->lhead->next;
-		if (huff->lhead->next) {
-			huff->lhead->next->prev = tnode2;
-			if (huff->lhead->next->weight == 1) {
-				tnode2->head = huff->lhead->next->head;
-			} else {
-				tnode2->head = get_ppnode(huff);
-				*tnode2->head = tnode2;
-			}
-		} else {
-			tnode2->head = get_ppnode(huff);
-			*tnode2->head = tnode2;
-		}
-		huff->lhead->next = tnode2;
-		tnode2->prev = huff->lhead;
- 
-		tnode->symbol = ch;
-		tnode->weight = 1;
-		tnode->next = huff->lhead->next;
-		if (huff->lhead->next) {
-			huff->lhead->next->prev = tnode;
-			if (huff->lhead->next->weight == 1) {
-				tnode->head = huff->lhead->next->head;
-			} else {
-				/* this should never happen */
-				tnode->head = get_ppnode(huff);
-				*tnode->head = tnode2;
-		    }
-		} else {
-			/* this should never happen */
-			tnode->head = get_ppnode(huff);
-			*tnode->head = tnode;
-		}
-		huff->lhead->next = tnode;
-		tnode->prev = huff->lhead;
-		tnode->left = tnode->right = NULL;
- 
-		if (huff->lhead->parent) {
-			if (huff->lhead->parent->left == huff->lhead) { /* lhead is guaranteed to by the NYT */
-				huff->lhead->parent->left = tnode2;
-			} else {
-				huff->lhead->parent->right = tnode2;
-			}
-		} else {
-			huff->tree = tnode2; 
-		}
- 
-		tnode2->right = tnode;
-		tnode2->left = huff->lhead;
- 
-		tnode2->parent = huff->lhead->parent;
-		huff->lhead->parent = tnode->parent = tnode2;
-     
-		huff->loc[ch] = tnode;
- 
-		increment(huff, tnode2->parent);
-	} else {
-		increment(huff, huff->loc[ch]);
-	}
-}
-
-/* Get a symbol */
-int Huff_Receive (node_t *node, int *ch, byte *fin) {
-	while (node && node->symbol == INTERNAL_NODE) {
-		if (get_bit(fin)) {
-			node = node->right;
-		} else {
-			node = node->left;
-		}
-	}
-	if (!node) {
-		return 0;
-//		Com_Error(ERR_DROP, "Illegal tree!");
-	}
-	return (*ch = node->symbol);
-}
-
-/* Get a symbol */
-void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset) {
-	bloc = *offset;
-	while (node && node->symbol == INTERNAL_NODE) {
-		if (bloc >= maxoffset) {
-			*ch = 0;
-			*offset = maxoffset + 1;
-			return;
-		}
-		if (get_bit(fin)) {
-			node = node->right;
-		} else {
-			node = node->left;
-		}
-	}
-	if (!node) {
-		*ch = 0;
-		return;
-//		Com_Error(ERR_DROP, "Illegal tree!");
-	}
-	*ch = node->symbol;
-	*offset = bloc;
-}
-
-/* Send the prefix code for this node */
-static void send(node_t *node, node_t *child, byte *fout, int maxoffset) {
-	if (node->parent) {
-		send(node->parent, node, fout, maxoffset);
-	}
-	if (child) {
-		if (bloc >= maxoffset) {
-			bloc = maxoffset + 1;
-			return;
-		}
-		if (node->right == child) {
-			add_bit(1, fout);
-		} else {
-			add_bit(0, fout);
-		}
-	}
-}
-
-/* Send a symbol */
-void Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset) {
-	int i;
-	if (huff->loc[ch] == NULL) { 
-		/* node_t hasn't been transmitted, send a NYT, then the symbol */
-		Huff_transmit(huff, NYT, fout, maxoffset);
-		for (i = 7; i >= 0; i--) {
-			add_bit((char)((ch >> i) & 0x1), fout);
-		}
-	} else {
-		send(huff->loc[ch], NULL, fout, maxoffset);
-	}
-}
-
-void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset) {
-	bloc = *offset;
-	send(huff->loc[ch], NULL, fout, maxoffset);
-	*offset = bloc;
-}
-
-void Huff_Decompress(msg_t *mbuf, int offset) {
-	int			ch, cch, i, j, size;
-	byte		seq[65536];
-	byte*		buffer;
-	huff_t		huff;
-
-	size = mbuf->cursize - offset;
-	buffer = mbuf->data + offset;
-
-	if ( size <= 0 ) {
-		return;
-	}
-
-	Com_Memset(&huff, 0, sizeof(huff_t));
-	// Initialize the tree & list with the NYT node 
-	huff.tree = huff.lhead = huff.ltail = huff.loc[NYT] = &(huff.nodeList[huff.blocNode++]);
-	huff.tree->symbol = NYT;
-	huff.tree->weight = 0;
-	huff.lhead->next = huff.lhead->prev = NULL;
-	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-
-	cch = buffer[0]*256 + buffer[1];
-	// don't overflow with bad messages
-	if ( cch > mbuf->maxsize - offset ) {
-		cch = mbuf->maxsize - offset;
-	}
-	bloc = 16;
-
-	for ( j = 0; j < cch; j++ ) {
-		ch = 0;
-		// don't overflow reading from the messages
-		// FIXME: would it be better to have an overflow check in get_bit ?
-		if ( (bloc >> 3) > size ) {
-			seq[j] = 0;
-			break;
-		}
-		Huff_Receive(huff.tree, &ch, buffer);				/* Get a character */
-		if ( ch == NYT ) {								/* We got a NYT, get the symbol associated with it */
-			ch = 0;
-			for ( i = 0; i < 8; i++ ) {
-				ch = (ch<<1) + get_bit(buffer);
-			}
-		}
-    
-		seq[j] = ch;									/* Write symbol */
-
-		Huff_addRef(&huff, (byte)ch);								/* Increment node */
-	}
-	mbuf->cursize = cch + offset;
-	Com_Memcpy(mbuf->data + offset, seq, cch);
-}
-
-extern 	int oldsize;
-
-void Huff_Compress(msg_t *mbuf, int offset) {
-	int			i, ch, size;
-	byte		seq[65536];
-	byte*		buffer;
-	huff_t		huff;
-
-	size = mbuf->cursize - offset;
-	buffer = mbuf->data + offset;
-
-	if (size<=0) {
-		return;
-	}
-
-	Com_Memset(&huff, 0, sizeof(huff_t));
-	// Add the NYT (not yet transmitted) node into the tree/list */
-	huff.tree = huff.lhead = huff.loc[NYT] =  &(huff.nodeList[huff.blocNode++]);
-	huff.tree->symbol = NYT;
-	huff.tree->weight = 0;
-	huff.lhead->next = huff.lhead->prev = NULL;
-	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-
-	seq[0] = (size>>8);
-	seq[1] = size&0xff;
-
-	bloc = 16;
-
-	for (i=0; i<size; i++ ) {
-		ch = buffer[i];
-		Huff_transmit(&huff, ch, seq, size<<3);						/* Transmit symbol */
-		Huff_addRef(&huff, (byte)ch);								/* Do update */
-	}
-
-	bloc += 8;												// next byte
-
-	mbuf->cursize = (bloc>>3) + offset;
-	Com_Memcpy(mbuf->data+offset, seq, (bloc>>3));
-}
-
-void Huff_Init(huffman_t *huff) {
-
-	Com_Memset(&huff->compressor, 0, sizeof(huff_t));
-	Com_Memset(&huff->decompressor, 0, sizeof(huff_t));
-
-	// Initialize the tree & list with the NYT node 
-	huff->decompressor.tree = huff->decompressor.lhead = huff->decompressor.ltail = huff->decompressor.loc[NYT] = &(huff->decompressor.nodeList[huff->decompressor.blocNode++]);
-	huff->decompressor.tree->symbol = NYT;
-	huff->decompressor.tree->weight = 0;
-	huff->decompressor.lhead->next = huff->decompressor.lhead->prev = NULL;
-	huff->decompressor.tree->parent = huff->decompressor.tree->left = huff->decompressor.tree->right = NULL;
-
-	// Add the NYT (not yet transmitted) node into the tree/list */
-	huff->compressor.tree = huff->compressor.lhead = huff->compressor.loc[NYT] =  &(huff->compressor.nodeList[huff->compressor.blocNode++]);
-	huff->compressor.tree->symbol = NYT;
-	huff->compressor.tree->weight = 0;
-	huff->compressor.lhead->next = huff->compressor.lhead->prev = NULL;
-	huff->compressor.tree->parent = huff->compressor.tree->left = huff->compressor.tree->right = NULL;
-}
-
diff --git a/code/qcommon/huffman.cpp b/code/qcommon/huffman.cpp
index b552390b..761717a8 100644
--- a/code/qcommon/huffman.cpp
+++ b/code/qcommon/huffman.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
-int bloc = 0;
+static int			bloc = 0;
 
 void	Huff_putBit( int bit, byte *fout, int *offset) {
 	bloc = *offset;
@@ -39,6 +39,16 @@ void	Huff_putBit( int bit, byte *fout, int *offset) {
 	*offset = bloc;
 }
 
+int		Huff_getBloc(void)
+{
+	return bloc;
+}
+
+void	Huff_setBloc(int _bloc)
+{
+	bloc = _bloc;
+}
+
 int		Huff_getBit( byte *fin, int *offset) {
 	int t;
 	bloc = *offset;
@@ -263,15 +273,20 @@ int Huff_Receive (node_t *node, int *ch, byte *fin) {
 	}
 	if (!node) {
 		return 0;
-//		Com_Error(ERR_DROP, "Illegal tree!\n");
+//		Com_Error(ERR_DROP, "Illegal tree!");
 	}
 	return (*ch = node->symbol);
 }
 
 /* Get a symbol */
-void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
+void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset) {
 	bloc = *offset;
 	while (node && node->symbol == INTERNAL_NODE) {
+		if (bloc >= maxoffset) {
+			*ch = 0;
+			*offset = maxoffset + 1;
+			return;
+		}
 		if (get_bit(fin)) {
 			node = node->right;
 		} else {
@@ -281,18 +296,22 @@ void Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset) {
 	if (!node) {
 		*ch = 0;
 		return;
-//		Com_Error(ERR_DROP, "Illegal tree!\n");
+//		Com_Error(ERR_DROP, "Illegal tree!");
 	}
 	*ch = node->symbol;
 	*offset = bloc;
 }
 
 /* Send the prefix code for this node */
-static void send(node_t *node, node_t *child, byte *fout) {
+static void send(node_t *node, node_t *child, byte *fout, int maxoffset) {
 	if (node->parent) {
-		send(node->parent, node, fout);
+		send(node->parent, node, fout, maxoffset);
 	}
 	if (child) {
+		if (bloc >= maxoffset) {
+			bloc = maxoffset + 1;
+			return;
+		}
 		if (node->right == child) {
 			add_bit(1, fout);
 		} else {
@@ -302,22 +321,22 @@ static void send(node_t *node, node_t *child, byte *fout) {
 }
 
 /* Send a symbol */
-void Huff_transmit (huff_t *huff, int ch, byte *fout) {
+void Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset) {
 	int i;
 	if (huff->loc[ch] == NULL) { 
 		/* node_t hasn't been transmitted, send a NYT, then the symbol */
-		Huff_transmit(huff, NYT, fout);
+		Huff_transmit(huff, NYT, fout, maxoffset);
 		for (i = 7; i >= 0; i--) {
 			add_bit((char)((ch >> i) & 0x1), fout);
 		}
 	} else {
-		send(huff->loc[ch], NULL, fout);
+		send(huff->loc[ch], NULL, fout, maxoffset);
 	}
 }
 
-void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset) {
+void Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset) {
 	bloc = *offset;
-	send(huff->loc[ch], NULL, fout);
+	send(huff->loc[ch], NULL, fout, maxoffset);
 	*offset = bloc;
 }
 
@@ -354,7 +373,7 @@ void Huff_Decompress(msg_t *mbuf, int offset) {
 	for ( j = 0; j < cch; j++ ) {
 		ch = 0;
 		// don't overflow reading from the messages
-		// FIXME: would it be better to have a overflow check in get_bit ?
+		// FIXME: would it be better to have an overflow check in get_bit ?
 		if ( (bloc >> 3) > size ) {
 			seq[j] = 0;
 			break;
@@ -385,7 +404,7 @@ void Huff_Compress(msg_t *mbuf, int offset) {
 	huff_t		huff;
 
 	size = mbuf->cursize - offset;
-	buffer = mbuf->data+ + offset;
+	buffer = mbuf->data + offset;
 
 	if (size<=0) {
 		return;
@@ -398,16 +417,15 @@ void Huff_Compress(msg_t *mbuf, int offset) {
 	huff.tree->weight = 0;
 	huff.lhead->next = huff.lhead->prev = NULL;
 	huff.tree->parent = huff.tree->left = huff.tree->right = NULL;
-	huff.loc[NYT] = huff.tree;
 
-	seq[0] = ( byte )(size>>8);
-	seq[1] = ( byte )size&0xff;
+	seq[0] = (byte)(size>>8);
+	seq[1] = (byte)(size&0xff);
 
 	bloc = 16;
 
 	for (i=0; i<size; i++ ) {
 		ch = buffer[i];
-		Huff_transmit(&huff, ch, seq);						/* Transmit symbol */
+		Huff_transmit(&huff, ch, seq, size<<3);						/* Transmit symbol */
 		Huff_addRef(&huff, (byte)ch);								/* Do update */
 	}
 
diff --git a/code/qcommon/json.hpp b/code/qcommon/json.hpp
new file mode 100644
index 00000000..06da8153
--- /dev/null
+++ b/code/qcommon/json.hpp
@@ -0,0 +1,22875 @@
+/*
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.7.3
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 7
+#define NLOHMANN_JSON_VERSION_PATCH 3
+
+#include <algorithm> // all_of, find, for_each
+#include <cassert> // assert
+#include <ciso646> // and, not, or
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#include <iosfwd> // istream, ostream
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <numeric> // accumulate
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <ciso646> // and, not
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+
+#include <cstddef> // size_t
+
+namespace nlohmann
+{
+namespace detail
+{
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // pair
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the author(s) have dedicated all
+ * copyright and related and neighboring rights to this software to
+ * the public domain worldwide. This software is distributed without
+ * any warranty.
+ *
+ * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 11)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 11
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(__COMPCERT__)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus) && JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#else
+#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,3,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(__cplusplus) && (__cplusplus >= 201703L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(17,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_UNREACHABLE() __assume(0)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_UNREACHABLE() std::_nassert(0)
+    #else
+        #define JSON_HEDLEY_UNREACHABLE() _nassert(0)
+    #endif
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
+#elif defined(EXIT_FAILURE)
+    #define JSON_HEDLEY_UNREACHABLE() abort()
+#else
+    #define JSON_HEDLEY_UNREACHABLE()
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+#endif
+
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#elif \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && !defined(JSON_HEDLEY_ARM_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_ASSUME(expr) ((void) ((expr) ? 1 : (__builtin_unreachable(), 1)))
+#else
+    #define JSON_HEDLEY_ASSUME(expr) ((void) (expr))
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable(!!(expr))
+#endif
+#if \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(expr, value, probability)
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1, probability)
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0, probability)
+#  define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#if !defined(JSON_HEDLEY_BUILTIN_UNPREDICTABLE)
+    #define JSON_HEDLEY_BUILTIN_UNPREDICTABLE(expr) __builtin_expect_with_probability(!!(expr), 1, 0.5)
+#endif
+#elif \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect(!!(expr), (expected)) : (((void) (expected)), !!(expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (((void) (expected)), !!(expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+    #define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0)
+    #define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif JSON_HEDLEY_TI_VERSION_CHECK(7,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+    #define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+    #define JSON_HEDLEY_PRIVATE
+    #define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+    #define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+    #if \
+        JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+        JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+        JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+        JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+        JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+        JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+        JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
+        (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_EABI__) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
+        #define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+        #define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+    #else
+        #define JSON_HEDLEY_PRIVATE
+        #define JSON_HEDLEY_PUBLIC
+    #endif
+    #define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(fallthrough,7,0,0) && !defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && !defined(JSON_HEDLEY_SUNPRO_VERSION) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+       JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  (defined(__cplusplus) && JSON_HEDLEY_TI_VERSION_CHECK(8,3,0))
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (*((T*) &(expr)))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_CPP_CAST(T, expr) static_cast<T>(expr)
+#else
+    #define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum)
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+                  a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+      `std::runtime_error` which can cope with arbitrary-length error messages.
+      Intermediate strings are built with static functions and then passed to
+      the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id;
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This exception is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+      is the index of the terminating null byte or the end of file. This also
+      holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        position_string(pos) + ": " + what_arg;
+        return parse_error(id_, pos.chars_read_total, w.c_str());
+    }
+
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
+                        ": " + what_arg;
+        return parse_error(id_, byte_, w.c_str());
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return " at line " + std::to_string(pos.lines_read + 1) +
+               ", column " + std::to_string(pos.chars_read_current_line);
+    }
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id                           | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+  public:
+    static invalid_iterator create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + what_arg;
+        return invalid_iterator(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id                     | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
+json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+  public:
+    static type_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("type_error", id_) + what_arg;
+        return type_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id                       | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
+json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
+json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+  public:
+    static out_of_range create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("out_of_range", id_) + what_arg;
+        return out_of_range(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+  public:
+    static other_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("other_error", id_) + what_arg;
+        return other_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+#include <ciso646> // not
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+
+namespace nlohmann
+{
+namespace detail
+{
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+    using type = index_sequence;
+    using value_type = std::size_t;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+
+template<std::size_t N>
+struct make_index_sequence
+    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+      typename make_index_sequence < N - N / 2 >::type > {};
+
+template<> struct make_index_sequence<0> : index_sequence<> {};
+template<> struct make_index_sequence<1> : index_sequence<0> {};
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+#include <ciso646> // not
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
+} // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename It, typename = void>
+struct iterator_types {};
+
+template <typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template <typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template <typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template <typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+// http://en.cppreference.com/w/cpp/experimental/is_detected
+namespace nlohmann
+{
+namespace detail
+{
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template <class Default,
+          class AlwaysVoid,
+          template <class...> class Op,
+          class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template <class Default, template <class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template <template <class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template <template <class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template <class Default, template <class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template <class Expected, template <class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template <class To, template <class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer>
+class basic_json;
+
+/*!
+@brief JSON Pointer
+
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+}  // namespace nlohmann
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template <typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template <typename T>
+using key_type_t = typename T::key_type;
+
+template <typename T>
+using value_type_t = typename T::value_type;
+
+template <typename T>
+using difference_type_t = typename T::difference_type;
+
+template <typename T>
+using pointer_t = typename T::pointer;
+
+template <typename T>
+using reference_t = typename T::reference;
+
+template <typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template <typename T>
+using iterator_t = typename T::iterator;
+
+template <typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template <typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template <typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template <typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_from_json<BasicJsonType, T,
+           enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template <typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template <typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template <typename BasicJsonType, typename T>
+struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+
+///////////////////
+// is_ functions //
+///////////////////
+
+template <typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template <typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+// source: https://stackoverflow.com/a/37193089/4116453
+
+template <typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template <typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType,
+          typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        std::is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value and
+        std::is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType,
+          typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t<is_detected<mapped_type_t, ConstructibleObjectType>::value and
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (std::is_default_constructible<ConstructibleObjectType>::value and
+         (std::is_move_assignable<ConstructibleObjectType>::value or
+          std::is_copy_assignable<ConstructibleObjectType>::value) and
+         (std::is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value and
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) or
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value or
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template <typename BasicJsonType, typename CompatibleStringType,
+          typename = void>
+struct is_compatible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type_impl <
+    BasicJsonType, CompatibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, CompatibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_compatible_string_type
+    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename ConstructibleStringType,
+          typename = void>
+struct is_constructible_string_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type_impl <
+    BasicJsonType, ConstructibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, ConstructibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<ConstructibleStringType,
+        typename BasicJsonType::string_t>::value;
+};
+
+template <typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
+    is_detected<iterator_t, CompatibleArrayType>::value and
+// This is needed because json_reverse_iterator has a ::iterator type...
+// Therefore it is detected as a CompatibleArrayType.
+// The real fix would be to have an Iterable concept.
+    not is_iterator_traits<
+    iterator_traits<CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        std::is_constructible<BasicJsonType,
+        typename CompatibleArrayType::value_type>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<not std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value and
+    std::is_default_constructible<ConstructibleArrayType>::value and
+(std::is_move_assignable<ConstructibleArrayType>::value or
+ std::is_copy_assignable<ConstructibleArrayType>::value) and
+is_detected<value_type_t, ConstructibleArrayType>::value and
+is_detected<iterator_t, ConstructibleArrayType>::value and
+is_complete_type<
+detected_t<value_type_t, ConstructibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        // This is needed because json_reverse_iterator has a ::iterator type,
+        // furthermore, std::back_insert_iterator (and other iterators) have a
+        // base class `iterator`... Therefore it is detected as a
+        // ConstructibleArrayType. The real fix would be to have an Iterable
+        // concept.
+        not is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value and
+
+        (std::is_same<typename ConstructibleArrayType::value_type,
+         typename BasicJsonType::array_t::value_type>::value or
+         has_from_json<BasicJsonType,
+         typename ConstructibleArrayType::value_type>::value or
+         has_non_default_from_json <
+         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
+};
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType,
+          typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t<std::is_integral<RealIntegerType>::value and
+    std::is_integral<CompatibleNumberIntegerType>::value and
+    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        std::is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value and
+        CompatibleLimits::is_integer and
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template <typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template <typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B1> struct conjunction<B1> : B1 { };
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...>
+: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template <typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template <typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <ciso646> // and
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    discarded         ///< discarded by the the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    static constexpr std::array<std::uint8_t, 8> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+    return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
+                     not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                     int> = 0>
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename ConstructibleStringType,
+    enable_if_t <
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value and
+        not std::is_same<typename BasicJsonType::string_t,
+                         ConstructibleStringType>::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.resize(j.size());
+    std::copy(j.begin(), j.end(), std::begin(l));
+}
+
+template <typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template <typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                          priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template <typename BasicJsonType, typename ConstructibleArrayType,
+          enable_if_t <
+              is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value and
+              not is_basic_json<ConstructibleArrayType>::value,
+              int > = 0 >
+
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " +
+                                      std::string(j.type_name())));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+    }
+
+    ConstructibleObjectType ret;
+    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template<typename BasicJsonType, typename ArithmeticType,
+         enable_if_t <
+             std::is_arithmetic<ArithmeticType>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
+             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+             int> = 0>
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+          typename = enable_if_t<not std::is_constructible<
+                                     typename BasicJsonType::string_t, Key>::value>>
+void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
+    {
+        return from_json(j, val);
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+#include <algorithm> // copy
+#include <ciso646> // or, and, not
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    target = std::to_string(value);
+}
+template <typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type * ;
+    using reference = value_type & ;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor;
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    const string_type empty_str = "";
+
+  public:
+    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+
+    /// dereference operator (needed for range-based for)
+    iteration_proxy_value& operator*()
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        assert(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.end());
+    }
+};
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template <std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template <typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+            : public std::integral_constant<std::size_t, 2> {};
+
+template <std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+} // namespace std
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////
+// constructors //
+//////////////////
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleStringType,
+             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleArrayType,
+             enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                         int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename CompatibleObjectType,
+             enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template <typename BasicJsonType, typename CompatibleArrayType,
+          enable_if_t<is_compatible_array_type<BasicJsonType,
+                      CompatibleArrayType>::value and
+                      not is_compatible_object_type<
+                          BasicJsonType, CompatibleArrayType>::value and
+                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
+                      not is_basic_json<CompatibleArrayType>::value,
+                      int> = 0>
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
+                const T(&)[N]>::value,
+                int> = 0 >
+void to_json(BasicJsonType& j, const T(&arr)[N])
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template < typename BasicJsonType, typename T,
+           enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `to_json` function
+namespace
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+
+namespace nlohmann
+{
+
+template<typename, typename>
+struct adl_serializer
+{
+    /*!
+    @brief convert a JSON value to any value type
+
+    This function is usually called by the `get()` function of the
+    @ref basic_json class (either explicit or via conversion operators).
+
+    @param[in] j        JSON value to read from
+    @param[in,out] val  value to write to
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /*!
+    @brief convert any value type to a JSON value
+
+    This function is usually called by the constructors of the @ref basic_json
+    class.
+
+    @param[in,out] j  JSON value to write to
+    @param[in] val    value to read from
+    */
+    template <typename BasicJsonType, typename ValueType>
+    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+    }
+};
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cassert> // assert
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <cstddef> // size_t
+#include <cstdio> //FILE *
+#include <cstring> // strlen
+#include <istream> // istream
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+@brief abstract input adapter interface
+
+Produces a stream of std::char_traits<char>::int_type characters from a
+std::istream, a buffer, or some other input type. Accepts the return of
+exactly one non-EOF character for future input. The int_type characters
+returned consist of all valid char values as positive values (typically
+unsigned char), plus an EOF value outside that range, specified by the value
+of the function std::char_traits<char>::eof(). This value is typically -1, but
+could be any arbitrary value which is not a valid char value.
+*/
+struct input_adapter_protocol
+{
+    /// get a character [0,255] or std::char_traits<char>::eof().
+    virtual std::char_traits<char>::int_type get_character() = 0;
+    virtual ~input_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
+
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter : public input_adapter_protocol
+{
+  public:
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f)  noexcept
+        : m_file(f)
+    {}
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = default;
+    ~file_input_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter : public input_adapter_protocol
+{
+  public:
+    ~input_stream_adapter() override
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        is.clear(is.rdstate() & std::ios::eofbit);
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(i), sb(*i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter(input_stream_adapter&&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, eg. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character() override
+    {
+        auto res = sb.sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (res == EOF)
+        {
+            is.clear(is.rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream& is;
+    std::streambuf& sb;
+};
+
+/// input adapter for buffer input
+class input_buffer_adapter : public input_adapter_protocol
+{
+  public:
+    input_buffer_adapter(const char* b, const std::size_t l) noexcept
+        : cursor(b), limit(b == nullptr ? nullptr : (b + l))
+    {}
+
+    // delete because of pointer members
+    input_buffer_adapter(const input_buffer_adapter&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
+    input_buffer_adapter(input_buffer_adapter&&) = delete;
+    input_buffer_adapter& operator=(input_buffer_adapter&&) = delete;
+    ~input_buffer_adapter() override = default;
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        if (JSON_HEDLEY_LIKELY(cursor < limit))
+        {
+            assert(cursor != nullptr and limit != nullptr);
+            return std::char_traits<char>::to_int_type(*(cursor++));
+        }
+
+        return std::char_traits<char>::eof();
+    }
+
+  private:
+    /// pointer to the current character
+    const char* cursor;
+    /// pointer past the last character
+    const char* const limit;
+};
+
+template<typename WideStringType, size_t T>
+struct wide_string_input_helper
+{
+    // UTF-32
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((wc >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+struct wide_string_input_helper<WideStringType, 2>
+{
+    // UTF-16
+    static void fill_buffer(const WideStringType& str,
+                            size_t& current_wchar,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (current_wchar == str.size())
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc or wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (current_wchar < str.size())
+                {
+                    const auto wc2 = static_cast<unsigned int>(str[current_wchar++]);
+                    const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    // unknown character
+                    ++current_wchar;
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+template<typename WideStringType>
+class wide_string_input_adapter : public input_adapter_protocol
+{
+  public:
+    explicit wide_string_input_adapter(const WideStringType& w) noexcept
+        : str(w)
+    {}
+
+    std::char_traits<char>::int_type get_character() noexcept override
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(typename WideStringType::value_type)>();
+
+            assert(utf8_bytes_filled > 0);
+            assert(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        assert(utf8_bytes_filled > 0);
+        assert(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// the wstring to process
+    const WideStringType& str;
+
+    /// index of the current wchar in str
+    std::size_t current_wchar = 0;
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+class input_adapter
+{
+  public:
+    // native support
+    JSON_HEDLEY_NON_NULL(2)
+    input_adapter(std::FILE* file)
+        : ia(std::make_shared<file_input_adapter>(file)) {}
+    /// input adapter for input stream
+    input_adapter(std::istream& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    /// input adapter for input stream
+    input_adapter(std::istream&& i)
+        : ia(std::make_shared<input_stream_adapter>(i)) {}
+
+    input_adapter(const std::wstring& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
+
+    input_adapter(const std::u16string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
+
+    input_adapter(const std::u32string& ws)
+        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
+
+    /// input adapter for buffer
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b, std::size_t l)
+        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
+
+    // derived support
+
+    /// input adapter for string literal
+    template<typename CharT,
+             typename std::enable_if<
+                 std::is_pointer<CharT>::value and
+                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
+                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                 int>::type = 0>
+    input_adapter(CharT b)
+        : input_adapter(reinterpret_cast<const char*>(b),
+                        std::strlen(reinterpret_cast<const char*>(b))) {}
+
+    /// input adapter for iterator range with contiguous storage
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    input_adapter(IteratorType first, IteratorType last)
+    {
+#ifndef NDEBUG
+        // assertion to check that the iterator range is indeed contiguous,
+        // see http://stackoverflow.com/a/35008842/266378 for more discussion
+        const auto is_contiguous = std::accumulate(
+                                       first, last, std::pair<bool, int>(true, 0),
+                                       [&first](std::pair<bool, int> res, decltype(*first) val)
+        {
+            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
+            return res;
+        }).first;
+        assert(is_contiguous);
+#endif
+
+        // assertion to check that each element is 1 byte long
+        static_assert(
+            sizeof(typename iterator_traits<IteratorType>::value_type) == 1,
+            "each element in the iterator range must have the size of 1 byte");
+
+        const auto len = static_cast<size_t>(std::distance(first, last));
+        if (JSON_HEDLEY_LIKELY(len > 0))
+        {
+            // there is at least one element: use the address of first
+            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
+        }
+        else
+        {
+            // the address of first cannot be used: use nullptr
+            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
+        }
+    }
+
+    /// input adapter for array
+    template<class T, std::size_t N>
+    input_adapter(T (&array)[N])
+        : input_adapter(std::begin(array), std::end(array)) {}
+
+    /// input adapter for contiguous container
+    template<class ContiguousContainer, typename
+             std::enable_if<not std::is_pointer<ContiguousContainer>::value and
+                            std::is_base_of<std::random_access_iterator_tag, typename iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
+                            int>::type = 0>
+    input_adapter(const ContiguousContainer& c)
+        : input_adapter(std::begin(c), std::end(c)) {}
+
+    operator input_adapter_t()
+    {
+        return ia;
+    }
+
+  private:
+    /// the actual adapter
+    input_adapter_t ia = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+
+#include <cassert> // assert
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    /// type for (signed) integers
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    /// type for unsigned integers
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    /// type for floating-point numbers
+    using number_float_t = typename BasicJsonType::number_float_t;
+    /// type for strings
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief an floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    /*!
+    @param[in, out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        assert(ref_stack.back()->is_object());
+        assert(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep and ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back() and not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+        {
+            // discard object
+            *ref_stack.back() = discarded;
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (not ref_stack.empty() and ref_stack.back() and ref_stack.back()->is_object())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (not keep)
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        assert(not ref_stack.empty());
+        assert(not keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (not keep and not ref_stack.empty() and ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const detail::exception& ex)
+    {
+        errored = true;
+        if (allow_exceptions)
+        {
+            // determine the proper exception type from the id
+            switch ((ex.id / 100) % 100)
+            {
+                case 1:
+                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
+                case 4:
+                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
+                // LCOV_EXCL_START
+                case 2:
+                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
+                case 3:
+                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
+                case 5:
+                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
+                default:
+                    assert(false);
+                    // LCOV_EXCL_STOP
+            }
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        assert(not keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (not keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (not keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (not ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->push_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        assert(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        assert(not key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (not store_element)
+        {
+            return {false, nullptr};
+        }
+
+        assert(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t  /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+}  // namespace detail
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template <typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template <typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template <typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template <typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template <typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template <typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template <typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template <typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template <typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template <typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template <typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template <typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
+        string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template <typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using json_sax_t = SAX;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        assert(ia);
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default;
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default;
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+
+    @return
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal();
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result and strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief determine system byte order
+
+    @return true if and only if system's byte order is little endian
+
+    @note from http://stackoverflow.com/a/1001328/266378
+    */
+    static constexpr bool little_endianess(int num = 1) noexcept
+    {
+        return *reinterpret_cast<char*>(&num) == 1;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<char>(current);
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) and get() != std::char_traits<char>::eof();
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const int element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number;
+                return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len;
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value;
+                return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+        while (int element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(not get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (not is_array and not sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size;
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char = true)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) and sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(std::size_t(-1));
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(std::size_t(-1));
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const int byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const int byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    assert(0 <= exp and exp <= 32);
+                    assert(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number;
+                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len;
+                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (not get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or std::size_t(-1) for an
+                    array of indefinite size
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal(false)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or std::size_t(-1) for an
+                    object of indefinite size
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) and sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xCA: // float 32
+            {
+                float number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number;
+                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number;
+                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len;
+                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len;
+                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const int prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number;
+                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number;
+                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
+                }
+                string_t s(1, static_cast<char>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) and sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, int> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char>::eof()` in that case.
+
+    @return character read from the input
+    */
+    int get()
+    {
+        ++chars_read;
+        return current = ia->get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    int get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        std::generate_n(std::back_inserter(result), len, [this, &success, &format]()
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "string")))
+            {
+                success = false;
+            }
+            return static_cast<char>(current);
+        });
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    input_adapter_t ia = nullptr;
+
+    /// the current character
+    int current = std::char_traits<char>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType>
+class lexer
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case lexer::token_type::value_unsigned:
+            case lexer::token_type::value_integer:
+            case lexer::token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    explicit lexer(detail::input_adapter_t&& adapter)
+        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = delete;
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = delete;
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto loc = localeconv();
+        assert(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        assert(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' and current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' and current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' and current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<int> ranges)
+    {
+        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current and current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 7159. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        assert(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' and get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(codepoint);
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<int>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<int>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 7159.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 7159. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr;
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            assert(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        assert(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        assert(current == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(get() != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    std::char_traits<char>::int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia->get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            token_string.push_back(std::char_traits<char>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
+        {
+            assert(not token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(int c)
+    {
+        token_buffer.push_back(std::char_traits<char>::to_char_type(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if ('\x00' <= c and c <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(c);
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB and get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 and not skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        do
+        {
+            get();
+        }
+        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+                return scan_literal("true", 4, token_type::literal_true);
+            case 'f':
+                return scan_literal("false", 5, token_type::literal_false);
+            case 'n':
+                return scan_literal("null", 4, token_type::literal_null);
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    detail::input_adapter_t ia = nullptr;
+
+    /// the current character
+    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char decimal_point_char = '.';
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cassert> // assert
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive decent parser.
+*/
+template<typename BasicJsonType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    enum class parse_event_t : uint8_t
+    {
+        /// the parser read `{` and started to process a JSON object
+        object_start,
+        /// the parser read `}` and finished processing a JSON object
+        object_end,
+        /// the parser read `[` and started to process a JSON array
+        array_start,
+        /// the parser read `]` and finished processing a JSON array
+        array_end,
+        /// the parser read a key of a value in an object
+        key,
+        /// the parser finished reading a JSON value
+        value
+    };
+
+    using parser_callback_t =
+        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+    /// a parser reading from an input adapter
+    explicit parser(detail::input_adapter_t&& adapter,
+                    const parser_callback_t cb = nullptr,
+                    const bool allow_exceptions_ = true)
+        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict and (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result and strict and (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(),
+                                            exception_message(token_type::end_of_input, "value")));
+        }
+
+        return result;
+    }
+
+  private:
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (not skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::value_string, "object key")));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::name_separator, "object separator")));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(not std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::uninitialized, "value")));
+                    }
+
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::literal_or_value, "value")));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_array, "array")));
+            }
+            else  // object
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse key
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::value_string, "object key")));
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
+                    {
+                        return false;
+                    }
+
+                    // parse separator (:)
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::name_separator, "object separator")));
+                    }
+
+                    // parse values
+                    get_token();
+                    continue;
+                }
+
+                // closing }
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this object. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    assert(not states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_object, "object")));
+            }
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (not context.empty())
+        {
+            error_msg += "while parsing " + context + " ";
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator++(int) noexcept
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator--(int) noexcept
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <ciso646> // not
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl
+{
+    /// allow basic_json to access private members
+    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    /// default constructor
+    iter_impl() = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  private:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                assert(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                assert(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator++(int)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator--(int)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator==(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator!=(const iter_impl& other) const
+    {
+        return not operator==(other);
+    }
+
+    /*!
+    @brief  comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return not other.operator < (*this);
+    }
+
+    /*!
+    @brief  comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return not operator<=(other);
+    }
+
+    /*!
+    @brief  comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return not operator<(other);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief  return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        assert(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        assert(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator const operator++(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator const operator--(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <algorithm> // all_of
+#include <cassert> // assert
+#include <cctype> // isdigit
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+template<typename BasicJsonType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /*!
+    @brief create JSON pointer
+
+    Create a JSON pointer according to the syntax described in
+    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+    @param[in] s  string representing the JSON pointer; if omitted, the empty
+                  string is assumed which references the whole JSON value
+
+    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
+                           not begin with a slash (`/`); see example below
+
+    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
+    not followed by `0` (representing `~`) or `1` (representing `/`); see
+    example below
+
+    @liveexample{The example shows the construction several valid JSON pointers
+    as well as the exceptional behavior.,json_pointer}
+
+    @since version 2.0.0
+    */
+    explicit json_pointer(const std::string& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /*!
+    @brief return a string representation of the JSON pointer
+
+    @invariant For each JSON pointer `ptr`, it holds:
+    @code {.cpp}
+    ptr == json_pointer(ptr.to_string());
+    @endcode
+
+    @return a string representation of the JSON pointer
+
+    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
+
+    @since version 2.0.0
+    */
+    std::string to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + escape(b);
+        });
+    }
+
+    /// @copydoc to_string()
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+    /*!
+    @brief append another JSON pointer at the end of this JSON pointer
+
+    @param[in] ptr  JSON pointer to append
+    @return JSON pointer with @a ptr appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /*!
+    @brief append an unescaped reference token at the end of this JSON pointer
+
+    @param[in] token  reference token to append
+    @return JSON pointer with @a token appended without escaping @a token
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::string token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /*!
+    @brief append an array index at the end of this JSON pointer
+
+    @param[in] array_index  array index to append
+    @return JSON pointer with @a array_index appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::size_t array_index)
+    {
+        return *this /= std::to_string(array_index);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+
+    @param[in] lhs  JSON pointer
+    @param[in] rhs  JSON pointer
+    @return a new JSON pointer with @a rhs appended to @a lhs
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a lhs and @a rhs.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] token  reference token
+    @return a new JSON pointer with unescaped @a token appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    {
+        return json_pointer(ptr) /= std::move(token);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] array_index  array index
+    @return a new JSON pointer with @a array_index appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::size_t) to append an array index
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
+    {
+        return json_pointer(ptr) /= array_index;
+    }
+
+    /*!
+    @brief returns the parent of this JSON pointer
+
+    @return parent of this JSON pointer; in case this JSON pointer is the root,
+            the root itself is returned
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @liveexample{The example shows the result of `parent_pointer` for different
+    JSON Pointers.,json_pointer__parent_pointer}
+
+    @since version 3.6.0
+    */
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /*!
+    @brief remove last reference token
+
+    @pre not `empty()`
+
+    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /*!
+    @brief return last reference token
+
+    @pre not `empty()`
+    @return last reference token
+
+    @liveexample{The example shows the usage of `back`.,json_pointer__back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    const std::string& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /*!
+    @brief append an unescaped token at the end of the reference pointer
+
+    @param[in] token  token to add
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows the result of `push_back` for different
+    JSON Pointers.,json_pointer__push_back}
+
+    @since version 3.6.0
+    */
+    void push_back(const std::string& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @copydoc push_back(const std::string&)
+    void push_back(std::string&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /*!
+    @brief return whether pointer points to the root document
+
+    @return true iff the JSON pointer points to the root document
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example shows the result of `empty` for different JSON
+    Pointers.,json_pointer__empty}
+
+    @since version 3.6.0
+    */
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    */
+    static int array_index(const std::string& s)
+    {
+        std::size_t processed_chars = 0;
+        const int res = std::stoi(s, &processed_chars);
+
+        // check if the string was completely read
+        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        return res;
+    }
+
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        auto result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    JSON_TRY
+                    {
+                        result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums or reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        JSON_TRY
+                        {
+                            ptr = &ptr->operator[](
+                                static_cast<size_type>(array_index(reference_token)));
+                        }
+                        JSON_CATCH(std::invalid_argument&)
+                        {
+                            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                        }
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // use unchecked array access
+                    JSON_TRY
+                    {
+                        ptr = &ptr->operator[](
+                            static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    // note: at performs range check
+                    JSON_TRY
+                    {
+                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    bool contains(const BasicJsonType* ptr) const
+    {
+        using size_type = typename BasicJsonType::size_type;
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (not ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+
+                    // error condition (cf. RFC 6901, Sect. 4)
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
+                    {
+                        JSON_THROW(detail::parse_error::create(106, 0,
+                                                               "array index '" + reference_token +
+                                                               "' must not begin with '0'"));
+                    }
+
+                    JSON_TRY
+                    {
+                        const auto idx = static_cast<size_type>(array_index(reference_token));
+                        if (idx >= ptr->size())
+                        {
+                            // index out of range
+                            return false;
+                        }
+
+                        ptr = &ptr->operator[](idx);
+                        break;
+                    }
+                    JSON_CATCH(std::invalid_argument&)
+                    {
+                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
+                    }
+                    break;
+                }
+
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1,
+                                                   "JSON pointer must be empty or begin with '/' - was: '" +
+                                                   reference_string + "'"));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == std::string::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                assert(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 or
+                                         (reference_token[pos + 1] != '0' and
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+                }
+            }
+
+            // finally, store the reference token
+            unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief replace all occurrences of a substring by another string
+
+    @param[in,out] s  the string to manipulate; changed so that all
+                   occurrences of @a f are replaced with @a t
+    @param[in]     f  the substring to replace with @a t
+    @param[in]     t  the string to replace @a f
+
+    @pre The search string @a f must not be empty. **This precondition is
+    enforced with an assertion.**
+
+    @since version 2.0.0
+    */
+    static void replace_substring(std::string& s, const std::string& f,
+                                  const std::string& t)
+    {
+        assert(not f.empty());
+        for (auto pos = s.find(f);                // find first occurrence of f
+                pos != std::string::npos;         // make sure f was found
+                s.replace(pos, f.size(), t),      // replace with t, and
+                pos = s.find(f, pos + t.size()))  // find next occurrence of f
+        {}
+    }
+
+    /// escape "~" to "~0" and "/" to "~1"
+    static std::string escape(std::string s)
+    {
+        replace_substring(s, "~", "~0");
+        replace_substring(s, "/", "~1");
+        return s;
+    }
+
+    /// unescape "~1" to tilde and "~0" to slash (order is important!)
+    static void unescape(std::string& s)
+    {
+        replace_substring(s, "~1", "/");
+        replace_substring(s, "~0", "~");
+    }
+
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    static void flatten(const std::string& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(reference_string + "/" + std::to_string(i),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(reference_string + "/" + escape(element.first), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(not value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(not element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief compares two JSON pointers for equality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is equal to @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return lhs.reference_tokens == rhs.reference_tokens;
+    }
+
+    /*!
+    @brief compares two JSON pointers for inequality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is not equal @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init), value_ref(&owned_value), is_rvalue(true)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...), value_ref(&owned_value),
+          is_rvalue(true) {}
+
+    // class should be movable only
+    json_ref(json_ref&&) = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (is_rvalue)
+        {
+            return std::move(*value_ref);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return *static_cast<value_type const*>(value_ref);
+    }
+
+    value_type const* operator->() const
+    {
+        return static_cast<value_type const*>(value_ref);
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type* value_ref = nullptr;
+    const bool is_rvalue;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <ios> // streamsize
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <ostream> // basic_ostream
+#include <string> // basic_string
+#include <vector> // vector
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    output_adapter(std::vector<CharType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    {
+        assert(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            default:
+            {
+                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name())));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() and
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
+                write_number(j.m_value.number_float);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.array->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type and not j.m_value.object->empty())
+                {
+                    assert(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                }
+
+                if (not use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409,
+                                            "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double, true>(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const std::uint64_t value)
+    {
+        if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64"));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), 0ul, [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    @return The size of the BSON entry
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j.m_value.number_unsigned);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            default:
+                assert(false);
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul,
+                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_signed<NumberType>::value and
+                 not std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n and n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n));
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n and n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n and n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n and n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n and n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+
+    @note This function does not need to be 100% accurate when it comes to
+          integer limits. In case a number exceeds the limits of int64_t,
+          this will be detected by a later call to function
+          write_number_with_ubjson_prefix. Therefore, we return 'L' for any
+          value that does not fit the previous limits.
+    */
+    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                // no check and assume int64_t (see note above)
+                return 'L';
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+    @tparam OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+
+    @note This function needs to respect the system's endianess, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool OutputIsLittleEndian = false>
+    void write_number(const NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec;
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value and std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_pod<CharType>::value, "CharType must be POD");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value and
+                   std::is_signed<char>::value and
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianess
+    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // and, or
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <array> // array
+#include <cassert> // assert
+#include <ciso646> // or, and, not
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template <typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        assert(x.e == y.e);
+        assert(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        assert(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        assert(delta >= 0);
+        assert(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template <typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 and E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    assert(e >= -1500);
+    assert(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    assert(index >= 0);
+    assert(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    assert(kAlpha <= cached.e + e + 64);
+    assert(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    else if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    else if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    else if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    else if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    else if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    else if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    else if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    else if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+    else
+    {
+        pow10 = 1;
+        return 1;
+    }
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    assert(len >= 1);
+    assert(dist <= delta);
+    assert(rest <= delta);
+    assert(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            and delta - rest >= ten_k
+            and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
+    {
+        assert(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    assert(M_plus.e >= kAlpha);
+    assert(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    assert(p1 > 0);
+
+    std::uint32_t pow10;
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    assert(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        assert(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    assert(m_plus.e == m_minus.e);
+    assert(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template <typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    assert(std::isfinite(value));
+    assert(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    assert(e > -1000);
+    assert(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    assert(min_exp < 0);
+    assert(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n and n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n - k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (n + 2);
+    }
+
+    if (0 < n and n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        assert(k > n);
+
+        std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
+        buf[n] = '.';
+        return buf + (k + 1);
+    }
+
+    if (min_exp < n and n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2 + (-n) + k);
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
+        buf[1] = '.';
+        buf += 1 + k;
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template <typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    assert(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    assert(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    assert(last - first >= kMaxExp + 2);
+    assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+
+    @param[in] val             value to serialize
+    @param[in] pretty_print    whether the output shall be pretty-printed
+    @param[in] indent_step     the indent level
+    @param[in] current_indent  the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val, const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(i != val.m_value.object->cend());
+                    assert(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    assert(not val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+    }
+
+  private:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint;
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                    static_cast<std::uint16_t>(codepoint));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            std::string sn(3, '\0');
+                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
+                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            assert(false);  // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (not ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    std::string sn(3, '\0');
+                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
+                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
+            }
+        }
+    }
+
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template<typename NumberType, detail::enable_if_t<
+                 std::is_same<NumberType, number_unsigned_t>::value or
+                 std::is_same<NumberType, number_integer_t>::value,
+                 int> = 0>
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin();
+
+        const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars;
+
+        if (is_negative)
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(x);
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        assert(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (not std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
+              (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        char* begin = number_buffer.data();
+        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        assert(len > 0);
+        // check if buffer was large enough
+        assert(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            const auto end = std::remove(number_buffer.begin(),
+                                         number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            assert((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' and decimal_point != '.')
+        {
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' or c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        state = utf8d[256u + state * 16u + type];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        assert(false); // LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        assert(x < 0 and x < (std::numeric_limits<number_integer_t>::max)());
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+
+/*!
+@brief a class to store JSON values
+
+@tparam ObjectType type for JSON objects (`std::map` by default; will be used
+in @ref object_t)
+@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
+in @ref array_t)
+@tparam StringType type for JSON strings and object keys (`std::string` by
+default; will be used in @ref string_t)
+@tparam BooleanType type for JSON booleans (`bool` by default; will be used
+in @ref boolean_t)
+@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
+default; will be used in @ref number_integer_t)
+@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
+`uint64_t` by default; will be used in @ref number_unsigned_t)
+@tparam NumberFloatType type for JSON floating-point numbers (`double` by
+default; will be used in @ref number_float_t)
+@tparam AllocatorType type of the allocator to use (`std::allocator` by
+default)
+@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
+and `from_json()` (@ref adl_serializer by default)
+
+@requirement The class satisfies the following concept requirements:
+- Basic
+ - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
+   JSON values can be default constructed. The result will be a JSON null
+   value.
+ - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
+   A JSON value can be constructed from an rvalue argument.
+ - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
+   A JSON value can be copy-constructed from an lvalue expression.
+ - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
+   A JSON value van be assigned from an rvalue argument.
+ - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
+   A JSON value can be copy-assigned from an lvalue expression.
+ - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
+   JSON values can be destructed.
+- Layout
+ - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
+   JSON values have
+   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   All non-static data members are private and standard layout types, the
+   class has no virtual functions or (virtual) base classes.
+- Library-wide
+ - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
+   JSON values can be compared with `==`, see @ref
+   operator==(const_reference,const_reference).
+ - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
+   JSON values can be compared with `<`, see @ref
+   operator<(const_reference,const_reference).
+ - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
+   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
+   other compatible types, using unqualified function call @ref swap().
+ - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
+   JSON values can be compared against `std::nullptr_t` objects which are used
+   to model the `null` value.
+- Container
+ - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
+   JSON values can be used like STL containers and provide iterator access.
+ - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
+   JSON values can be used like STL containers and provide reverse iterator
+   access.
+
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@internal
+@note ObjectType trick from http://stackoverflow.com/a/9860911
+@endinternal
+
+@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
+Format](http://rfc7159.net/rfc7159)
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer<basic_json>;
+    friend ::nlohmann::detail::parser<basic_json>;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer<basic_json>;
+    using parser = ::nlohmann::detail::parser<basic_json>;
+
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    /// @copydoc detail::exception
+    using exception = detail::exception;
+    /// @copydoc detail::parse_error
+    using parse_error = detail::parse_error;
+    /// @copydoc detail::invalid_iterator
+    using invalid_iterator = detail::invalid_iterator;
+    /// @copydoc detail::type_error
+    using type_error = detail::type_error;
+    /// @copydoc detail::out_of_range
+    using out_of_range = detail::out_of_range;
+    /// @copydoc detail::other_error
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /*!
+    @brief returns the allocator associated with the container
+    */
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /*!
+    @brief returns version information on the library
+
+    This function returns a JSON object with information about the library,
+    including the version number and information on the platform and compiler.
+
+    @return JSON object holding version information
+    key         | description
+    ----------- | ---------------
+    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
+    `copyright` | The copyright line for the library as string.
+    `name`      | The name of the library as string.
+    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
+    `url`       | The URL of the project as string.
+    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
+
+    @liveexample{The following code shows an example output of the `meta()`
+    function.,meta}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @complexity Constant.
+
+    @since 2.1.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+
+    /*!
+    @brief a type for an object
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+    > An object is an unordered collection of zero or more name/value pairs,
+    > where a name is a string and a value is a string, number, boolean, null,
+    > object, or array.
+
+    To store objects in C++, a type is defined by the template parameters
+    described below.
+
+    @tparam ObjectType  the container to store objects (e.g., `std::map` or
+    `std::unordered_map`)
+    @tparam StringType the type of the keys or names (e.g., `std::string`).
+    The comparison function `std::less<StringType>` is used to order elements
+    inside the container.
+    @tparam AllocatorType the allocator to use for objects (e.g.,
+    `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ObjectType (`std::map`), @a StringType
+    (`std::string`), and @a AllocatorType (`std::allocator`), the default
+    value for @a object_t is:
+
+    @code {.cpp}
+    std::map<
+      std::string, // key_type
+      basic_json, // value_type
+      std::less<std::string>, // key_compare
+      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+    >
+    @endcode
+
+    #### Behavior
+
+    The choice of @a object_t influences the behavior of the JSON class. With
+    the default type, objects have the following behavior:
+
+    - When all names are unique, objects will be interoperable in the sense
+      that all software implementations receiving that object will agree on
+      the name-value mappings.
+    - When the names within an object are not unique, it is unspecified which
+      one of the values for a given key will be chosen. For instance,
+      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
+      `{"key": 2}`.
+    - Internally, name/value pairs are stored in lexicographical order of the
+      names. Objects will also be serialized (see @ref dump) in this order.
+      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
+      and serialized as `{"a": 2, "b": 1}`.
+    - When comparing objects, the order of the name/value pairs is irrelevant.
+      This makes objects interoperable in the sense that they will not be
+      affected by these differences. For instance, `{"b": 1, "a": 2}` and
+      `{"a": 2, "b": 1}` will be treated as equal.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the object's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON object.
+
+    #### Storage
+
+    Objects are stored as pointers in a @ref basic_json type. That is, for any
+    access to object values, a pointer of type `object_t*` must be
+    dereferenced.
+
+    @sa @ref array_t -- type for an array value
+
+    @since version 1.0.0
+
+    @note The order name/value pairs are added to the object is *not*
+    preserved by the library. Therefore, iterating an object may return
+    name/value pairs in a different order than they were originally stored. In
+    fact, keys will be traversed in alphabetical order as `std::map` with
+    `std::less` is used by default. Please note this behavior conforms to [RFC
+    7159](http://rfc7159.net/rfc7159), because any order implements the
+    specified "unordered" nature of JSON objects.
+    */
+    using object_t = ObjectType<StringType,
+          basic_json,
+          object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /*!
+    @brief a type for an array
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
+    > An array is an ordered sequence of zero or more values.
+
+    To store objects in C++, a type is defined by the template parameters
+    explained below.
+
+    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
+    `std::list`)
+    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ArrayType (`std::vector`) and @a
+    AllocatorType (`std::allocator`), the default value for @a array_t is:
+
+    @code {.cpp}
+    std::vector<
+      basic_json, // value_type
+      std::allocator<basic_json> // allocator_type
+    >
+    @endcode
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the array's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON array.
+
+    #### Storage
+
+    Arrays are stored as pointers in a @ref basic_json type. That is, for any
+    access to array values, a pointer of type `array_t*` must be dereferenced.
+
+    @sa @ref object_t -- type for an object value
+
+    @since version 1.0.0
+    */
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /*!
+    @brief a type for a string
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
+    > A string is a sequence of zero or more Unicode characters.
+
+    To store objects in C++, a type is defined by the template parameter
+    described below. Unicode values are split by the JSON class into
+    byte-sized characters during deserialization.
+
+    @tparam StringType  the container to store strings (e.g., `std::string`).
+    Note this container is used for keys/names in objects, see @ref object_t.
+
+    #### Default type
+
+    With the default values for @a StringType (`std::string`), the default
+    value for @a string_t is:
+
+    @code {.cpp}
+    std::string
+    @endcode
+
+    #### Encoding
+
+    Strings are stored in UTF-8 encoding. Therefore, functions like
+    `std::string::size()` or `std::string::length()` return the number of
+    bytes in the string rather than the number of characters or glyphs.
+
+    #### String comparison
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > Software implementations are typically required to test names of object
+    > members for equality. Implementations that transform the textual
+    > representation into sequences of Unicode code units and then perform the
+    > comparison numerically, code unit by code unit, are interoperable in the
+    > sense that implementations will agree in all cases on equality or
+    > inequality of two strings. For example, implementations that compare
+    > strings with escaped characters unconverted may incorrectly find that
+    > `"a\\b"` and `"a\u005Cb"` are not equal.
+
+    This implementation is interoperable as it does compare strings code unit
+    by code unit.
+
+    #### Storage
+
+    String values are stored as pointers in a @ref basic_json type. That is,
+    for any access to string values, a pointer of type `string_t*` must be
+    dereferenced.
+
+    @since version 1.0.0
+    */
+    using string_t = StringType;
+
+    /*!
+    @brief a type for a boolean
+
+    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
+    type which differentiates the two literals `true` and `false`.
+
+    To store objects in C++, a type is defined by the template parameter @a
+    BooleanType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a BooleanType (`bool`), the default value for
+    @a boolean_t is:
+
+    @code {.cpp}
+    bool
+    @endcode
+
+    #### Storage
+
+    Boolean values are stored directly inside a @ref basic_json type.
+
+    @since version 1.0.0
+    */
+    using boolean_t = BooleanType;
+
+    /*!
+    @brief a type for a number (integer)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store integer numbers in C++, a type is defined by the template
+    parameter @a NumberIntegerType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberIntegerType (`int64_t`), the default
+    value for @a number_integer_t is:
+
+    @code {.cpp}
+    int64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
+    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
+    that are out of range will yield over/underflow when used in a
+    constructor. During deserialization, too large or small integer numbers
+    will be automatically be stored as @ref number_unsigned_t or @ref
+    number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange of the exactly supported range [INT64_MIN,
+    INT64_MAX], this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_integer_t = NumberIntegerType;
+
+    /*!
+    @brief a type for a number (unsigned)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store unsigned integer numbers in C++, a type is defined by the
+    template parameter @a NumberUnsignedType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberUnsignedType (`uint64_t`), the
+    default value for @a number_unsigned_t is:
+
+    @code {.cpp}
+    uint64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
+    number that can be stored is `0`. Integer numbers that are out of range
+    will yield over/underflow when used in a constructor. During
+    deserialization, too large or small integer numbers will be automatically
+    be stored as @ref number_integer_t or @ref number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange (when considered in conjunction with the
+    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
+    this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @since version 2.0.0
+    */
+    using number_unsigned_t = NumberUnsignedType;
+
+    /*!
+    @brief a type for a number (floating-point)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store floating-point numbers in C++, a type is defined by the template
+    parameter @a NumberFloatType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberFloatType (`double`), the default
+    value for @a number_float_t is:
+
+    @code {.cpp}
+    double
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in floating-point literals will be ignored. Internally,
+      the value will be stored as decimal number. For instance, the C++
+      floating-point literal `01.2` will be serialized to `1.2`. During
+      deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > This specification allows implementations to set limits on the range and
+    > precision of numbers accepted. Since software that implements IEEE
+    > 754-2008 binary64 (double precision) numbers is generally available and
+    > widely used, good interoperability can be achieved by implementations
+    > that expect no more precision or range than these provide, in the sense
+    > that implementations will approximate JSON numbers within the expected
+    > precision.
+
+    This implementation does exactly follow this approach, as it uses double
+    precision floating-point numbers. Note values smaller than
+    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
+    will be stored as NaN internally and be serialized to `null`.
+
+    #### Storage
+
+    Floating-point number values are stored directly inside a @ref basic_json
+    type.
+
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_float_t = NumberFloatType;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * object)
+        {
+            AllocatorTraits::deallocate(alloc, object, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
+        assert(object != nullptr);
+        return object.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = boolean_t(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = number_integer_t(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = number_unsigned_t(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = number_float_t(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.7.3")); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value)
+        {
+            string = create<string_t>(value);
+        }
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value)
+        {
+            string = create<string_t>(std::move(value));
+        }
+
+        /// constructor for objects
+        json_value(const object_t& value)
+        {
+            object = create<object_t>(value);
+        }
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value)
+        {
+            object = create<object_t>(std::move(value));
+        }
+
+        /// constructor for arrays
+        json_value(const array_t& value)
+        {
+            array = create<array_t>(value);
+        }
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value)
+        {
+            array = create<array_t>(std::move(value));
+        }
+
+        void destroy(value_t t) noexcept
+        {
+            // flatten the current json_value to a heap-allocated stack
+            std::vector<basic_json> stack;
+
+            // move the top-level items to stack
+            if (t == value_t::array)
+            {
+                stack.reserve(array->size());
+                std::move(array->begin(), array->end(), std::back_inserter(stack));
+            }
+            else if (t == value_t::object)
+            {
+                stack.reserve(object->size());
+                for (auto&& it : *object)
+                {
+                    stack.push_back(std::move(it.second));
+                }
+            }
+
+            while (not stack.empty())
+            {
+                // move the last item to local variable to be processed
+                basic_json current_item(std::move(stack.back()));
+                stack.pop_back();
+
+                // if current_item is array/object, move
+                // its children to the stack to be processed later
+                if (current_item.is_array())
+                {
+                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
+                              std::back_inserter(stack));
+
+                    current_item.m_value.array->clear();
+                }
+                else if (current_item.is_object())
+                {
+                    for (auto&& it : *current_item.m_value.object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+
+                    current_item.m_value.object->clear();
+                }
+
+                // it's now safe that current_item get destructed
+                // since it doesn't have any children
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+    */
+    void assert_invariant() const noexcept
+    {
+        assert(m_type != value_t::object or m_value.object != nullptr);
+        assert(m_type != value_t::array or m_value.array != nullptr);
+        assert(m_type != value_t::string or m_value.string != nullptr);
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /*!
+    @brief parser event types
+
+    The parser callback distinguishes the following events:
+    - `object_start`: the parser read `{` and started to process a JSON object
+    - `key`: the parser read a key of a value in an object
+    - `object_end`: the parser read `}` and finished processing a JSON object
+    - `array_start`: the parser read `[` and started to process a JSON array
+    - `array_end`: the parser read `]` and finished processing a JSON array
+    - `value`: the parser finished reading a JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    @sa @ref parser_callback_t for more information and examples
+    */
+    using parse_event_t = typename parser::parse_event_t;
+
+    /*!
+    @brief per-element parser callback type
+
+    With a parser callback function, the result of parsing a JSON text can be
+    influenced. When passed to @ref parse, it is called on certain events
+    (passed as @ref parse_event_t via parameter @a event) with a set recursion
+    depth @a depth and context JSON value @a parsed. The return value of the
+    callback function is a boolean indicating whether the element that emitted
+    the callback shall be kept or not.
+
+    We distinguish six scenarios (determined by the event type) in which the
+    callback function can be called. The following table describes the values
+    of the parameters @a depth, @a event, and @a parsed.
+
+    parameter @a event | description | parameter @a depth | parameter @a parsed
+    ------------------ | ----------- | ------------------ | -------------------
+    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
+    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
+    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
+    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
+    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
+    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    Discarding a value (i.e., returning `false`) has different effects
+    depending on the context in which function was called:
+
+    - Discarded values in structured types are skipped. That is, the parser
+      will behave as if the discarded value was never read.
+    - In case a value outside a structured type is skipped, it is replaced
+      with `null`. This case happens if the top-level element is skipped.
+
+    @param[in] depth  the depth of the recursion during parsing
+
+    @param[in] event  an event of type parse_event_t indicating the context in
+    the callback function has been called
+
+    @param[in,out] parsed  the current intermediate parse result; note that
+    writing to this value has no effect for parse_event_t::key events
+
+    @return Whether the JSON value which called the function during parsing
+    should be kept (`true`) or not (`false`). In the latter case, it is either
+    skipped completely or replaced by an empty discarded object.
+
+    @sa @ref parse for examples
+
+    @since version 1.0.0
+    */
+    using parser_callback_t = typename parser::parser_callback_t;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /*!
+    @brief create an empty value with a given type
+
+    Create an empty JSON value with a given type. The value will be default
+    initialized with an empty value which depends on the type:
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @param[in] v  the type of the value to create
+
+    @complexity Constant.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows the constructor for different @ref
+    value_t values,basic_json__value_t}
+
+    @sa @ref clear() -- restores the postcondition of this constructor
+
+    @since version 1.0.0
+    */
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a null object
+
+    Create a `null` JSON value. It either takes a null pointer as parameter
+    (explicitly creating `null`) or no parameter (implicitly creating `null`).
+    The passed null pointer itself is not read -- it is only used to choose
+    the right constructor.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @liveexample{The following code shows the constructor with and without a
+    null pointer parameter.,basic_json__nullptr_t}
+
+    @since version 1.0.0
+    */
+    basic_json(std::nullptr_t = nullptr) noexcept
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value
+
+    This is a "catch all" constructor for all compatible JSON types; that is,
+    types for which a `to_json()` method exists. The constructor forwards the
+    parameter @a val to that method (to `json_serializer<U>::to_json` method
+    with `U = uncvref_t<CompatibleType>`, to be exact).
+
+    Template type @a CompatibleType includes, but is not limited to, the
+    following types:
+    - **arrays**: @ref array_t and all kinds of compatible containers such as
+      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
+      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+      which a @ref basic_json value can be constructed.
+    - **objects**: @ref object_t and all kinds of compatible associative
+      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
+      and `std::unordered_multimap` with a `key_type` compatible to
+      @ref string_t and a `value_type` from which a @ref basic_json value can
+      be constructed.
+    - **strings**: @ref string_t, string literals, and all compatible string
+      containers can be used.
+    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
+      @ref number_float_t, and all convertible number types such as `int`,
+      `size_t`, `int64_t`, `float` or `double` can be used.
+    - **boolean**: @ref boolean_t / `bool` can be used.
+
+    See the examples below.
+
+    @tparam CompatibleType a type such that:
+    - @a CompatibleType is not derived from `std::istream`,
+    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
+         constructors),
+    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
+    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
+         @ref json_pointer, @ref iterator, etc ...)
+    - @ref @ref json_serializer<U> has a
+         `to_json(basic_json_t&, CompatibleType&&)` method
+
+    @tparam U = `uncvref_t<CompatibleType>`
+
+    @param[in] val the value to be forwarded to the respective constructor
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @liveexample{The following code shows the constructor with several
+    compatible types.,basic_json__CompatibleType}
+
+    @since version 2.1.0
+    */
+    template <typename CompatibleType,
+              typename U = detail::uncvref_t<CompatibleType>,
+              detail::enable_if_t<
+                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+    basic_json(CompatibleType && val) noexcept(noexcept(
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value from an existing one
+
+    This is a constructor for existing @ref basic_json types.
+    It does not hijack copy/move constructors, since the parameter has different
+    template arguments than the current ones.
+
+    The constructor tries to convert the internal @ref m_value of the parameter.
+
+    @tparam BasicJsonType a type such that:
+    - @a BasicJsonType is a @ref basic_json type.
+    - @a BasicJsonType has different template arguments than @ref basic_json_t.
+
+    @param[in] val the @ref basic_json value to be converted.
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @since version 3.2.0
+    */
+    template <typename BasicJsonType,
+              detail::enable_if_t<
+                  detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                assert(false);  // LCOV_EXCL_LINE
+        }
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a container (array or object) from an initializer list
+
+    Creates a JSON value of type array or object from the passed initializer
+    list @a init. In case @a type_deduction is `true` (default), the type of
+    the JSON value to be created is deducted from the initializer list @a init
+    according to the following rules:
+
+    1. If the list is empty, an empty JSON object value `{}` is created.
+    2. If the list consists of pairs whose first element is a string, a JSON
+       object value is created where the first elements of the pairs are
+       treated as keys and the second elements are as values.
+    3. In all other cases, an array is created.
+
+    The rules aim to create the best fit between a C++ initializer list and
+    JSON values. The rationale is as follows:
+
+    1. The empty initializer list is written as `{}` which is exactly an empty
+       JSON object.
+    2. C++ has no way of describing mapped types other than to list a list of
+       pairs. As JSON requires that keys must be of type string, rule 2 is the
+       weakest constraint one can pose on initializer lists to interpret them
+       as an object.
+    3. In all other cases, the initializer list could not be interpreted as
+       JSON object type, so interpreting it as JSON array type is safe.
+
+    With the rules described above, the following JSON values cannot be
+    expressed by an initializer list:
+
+    - the empty array (`[]`): use @ref array(initializer_list_t)
+      with an empty initializer list in this case
+    - arrays whose elements satisfy rule 2: use @ref
+      array(initializer_list_t) with the same initializer list
+      in this case
+
+    @note When used without parentheses around an empty initializer list, @ref
+    basic_json() is called instead of this function, yielding the JSON null
+    value.
+
+    @param[in] init  initializer list with JSON values
+
+    @param[in] type_deduction internal parameter; when set to `true`, the type
+    of the JSON value is deducted from the initializer list @a init; when set
+    to `false`, the type provided via @a manual_type is forced. This mode is
+    used by the functions @ref array(initializer_list_t) and
+    @ref object(initializer_list_t).
+
+    @param[in] manual_type internal parameter; when @a type_deduction is set
+    to `false`, the created JSON value will use the provided type (only @ref
+    value_t::array and @ref value_t::object are valid); when @a type_deduction
+    is set to `true`, this parameter has no effect
+
+    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+    `value_t::object`, but @a init contains an element which is not a pair
+    whose first element is a string. In this case, the constructor could not
+    create an object. If @a type_deduction would have be `true`, an array
+    would have been created. See @ref object(initializer_list_t)
+    for an example.
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows how JSON values are created from
+    initializer lists.,basic_json__list_init_t}
+
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (not type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object and not is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            });
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief explicitly create an array from an initializer list
+
+    Creates a JSON array value from a given initializer list. That is, given a
+    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
+    initializer list is empty, the empty array `[]` is created.
+
+    @note This function is only needed to express two edge cases that cannot
+    be realized with the initializer list constructor (@ref
+    basic_json(initializer_list_t, bool, value_t)). These cases
+    are:
+    1. creating an array whose elements are all pairs whose first element is a
+    string -- in this case, the initializer list constructor would create an
+    object, taking the first elements as keys
+    2. creating an empty array -- passing the empty initializer list to the
+    initializer list constructor yields an empty object
+
+    @param[in] init  initializer list with JSON values to create an array from
+    (optional)
+
+    @return JSON array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `array`
+    function.,array}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /*!
+    @brief explicitly create an object from an initializer list
+
+    Creates a JSON object value from a given initializer list. The initializer
+    lists elements must be pairs, and their first elements must be strings. If
+    the initializer list is empty, the empty object `{}` is created.
+
+    @note This function is only added for symmetry reasons. In contrast to the
+    related function @ref array(initializer_list_t), there are
+    no cases which can only be expressed by this function. That is, any
+    initializer list @a init can also be passed to the initializer list
+    constructor @ref basic_json(initializer_list_t, bool, value_t).
+
+    @param[in] init  initializer list to create an object from (optional)
+
+    @return JSON object value
+
+    @throw type_error.301 if @a init is not a list of pairs whose first
+    elements are strings. In this case, no object can be created. When such a
+    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+    an array would have been created from the passed initializer list @a init.
+    See example below.
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `object`
+    function.,object}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /*!
+    @brief construct an array with count copies of given value
+
+    Constructs a JSON array value by creating @a cnt copies of a passed value.
+    In case @a cnt is `0`, an empty array is created.
+
+    @param[in] cnt  the number of JSON copies of @a val to create
+    @param[in] val  the JSON value to copy
+
+    @post `std::distance(begin(),end()) == cnt` holds.
+
+    @complexity Linear in @a cnt.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows examples for the @ref
+    basic_json(size_type\, const basic_json&)
+    constructor.,basic_json__size_type_basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        assert_invariant();
+    }
+
+    /*!
+    @brief construct a JSON container given an iterator range
+
+    Constructs the JSON value with the contents of the range `[first, last)`.
+    The semantics depends on the different types a JSON value can have:
+    - In case of a null type, invalid_iterator.206 is thrown.
+    - In case of other primitive types (number, boolean, or string), @a first
+      must be `begin()` and @a last must be `end()`. In this case, the value is
+      copied. Otherwise, invalid_iterator.204 is thrown.
+    - In case of structured types (array, object), the constructor behaves as
+      similar versions for `std::vector` or `std::map`; that is, a JSON array
+      or object is constructed from the values in the range.
+
+    @tparam InputIT an input iterator type (@ref iterator or @ref
+    const_iterator)
+
+    @param[in] first begin of the range to copy from (included)
+    @param[in] last end of the range to copy from (excluded)
+
+    @pre Iterators @a first and @a last must be initialized. **This
+         precondition is enforced with an assertion (see warning).** If
+         assertions are switched off, a violation of this precondition yields
+         undefined behavior.
+
+    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+         checked efficiently. Only certain edge cases are detected; see the
+         description of the exceptions below. A violation of this precondition
+         yields undefined behavior.
+
+    @warning A precondition is enforced with a runtime assertion that will
+             result in calling `std::abort` if this precondition is not met.
+             Assertions can be disabled by defining `NDEBUG` at compile time.
+             See https://en.cppreference.com/w/cpp/error/assert for more
+             information.
+
+    @throw invalid_iterator.201 if iterators @a first and @a last are not
+    compatible (i.e., do not belong to the same JSON value). In this case,
+    the range `[first, last)` is undefined.
+    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+    primitive type (number, boolean, or string), but @a first does not point
+    to the first element any more. In this case, the range `[first, last)` is
+    undefined. See example code below.
+    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+    null value. In this case, the range `[first, last)` is undefined.
+
+    @complexity Linear in distance between @a first and @a last.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows several ways to create JSON values by
+    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
+
+    @since version 1.0.0
+    */
+    template<class InputIT, typename std::enable_if<
+                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
+                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
+    basic_json(InputIT first, InputIT last)
+    {
+        assert(first.m_object != nullptr);
+        assert(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
+                                         or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+                                                    std::string(first.m_object->type_name())));
+        }
+
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    /// @private
+    basic_json(const detail::json_ref<basic_json>& ref)
+        : basic_json(ref.moved_or_copied())
+    {}
+
+    /*!
+    @brief copy constructor
+
+    Creates a copy of a given JSON value.
+
+    @param[in] other  the JSON value to copy
+
+    @post `*this == other`
+
+    @complexity Linear in the size of @a other.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - As postcondition, it holds: `other == basic_json(other)`.
+
+    @liveexample{The following code shows an example for the copy
+    constructor.,basic_json__basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(const basic_json& other)
+        : m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief move constructor
+
+    Move constructor. Constructs a JSON value with the contents of the given
+    value @a other using move semantics. It "steals" the resources from @a
+    other and leaves it as JSON null value.
+
+    @param[in,out] other  value to move to this object
+
+    @post `*this` has the same value as @a other before the call.
+    @post @a other is a JSON null value.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
+    requirements.
+
+    @liveexample{The code below shows the move constructor explicitly called
+    via std::move.,basic_json__moveconstructor}
+
+    @since version 1.0.0
+    */
+    basic_json(basic_json&& other) noexcept
+        : m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief copy assignment
+
+    Copy assignment operator. Copies a JSON value via the "copy and swap"
+    strategy: It is expressed in terms of the copy constructor, destructor,
+    and the `swap()` member function.
+
+    @param[in] other  value to copy from
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+
+    @liveexample{The code below shows and example for the copy assignment. It
+    creates a copy of value `a` which is then swapped with `b`. Finally\, the
+    copy of `a` (which is the null value after the swap) is
+    destroyed.,basic_json__copyassignment}
+
+    @since version 1.0.0
+    */
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+
+        assert_invariant();
+        return *this;
+    }
+
+    /*!
+    @brief destructor
+
+    Destroys the JSON value and frees all allocated memory.
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - All stored elements are destroyed and all memory is freed.
+
+    @since version 1.0.0
+    */
+    ~basic_json() noexcept
+    {
+        assert_invariant();
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /*!
+    @brief serialization
+
+    Serialization function for JSON values. The function tries to mimic
+    Python's `json.dumps()` function, and currently supports its @a indent
+    and @a ensure_ascii parameters.
+
+    @param[in] indent If indent is nonnegative, then array elements and object
+    members will be pretty-printed with that indent level. An indent level of
+    `0` will only insert newlines. `-1` (the default) selects the most compact
+    representation.
+    @param[in] indent_char The character to use for indentation if @a indent is
+    greater than `0`. The default is ` ` (space).
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] error_handler  how to react on decoding errors; there are three
+    possible values: `strict` (throws and exception in case a decoding error
+    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
+    and `ignore` (ignore invalid UTF-8 sequences during serialization).
+
+    @return string containing the serialization of the JSON value
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
+    @complexity Linear.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @liveexample{The following example shows the effect of different @a indent\,
+    @a indent_char\, and @a ensure_ascii parameters to the result of the
+    serialization.,dump}
+
+    @see https://docs.python.org/2/library/json.html#json.dump
+
+    @since version 1.0.0; indentation character @a indent_char, option
+           @a ensure_ascii and exceptions added in version 3.0.0; error
+           handlers added in version 3.4.0.
+    */
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief return the type of the JSON value (explicit)
+
+    Return the type of the JSON value as a value from the @ref value_t
+    enumeration.
+
+    @return the type of the JSON value
+            Value type                | return value
+            ------------------------- | -------------------------
+            null                      | value_t::null
+            boolean                   | value_t::boolean
+            string                    | value_t::string
+            number (integer)          | value_t::number_integer
+            number (unsigned integer) | value_t::number_unsigned
+            number (floating-point)   | value_t::number_float
+            object                    | value_t::object
+            array                     | value_t::array
+            discarded                 | value_t::discarded
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `type()` for all JSON
+    types.,type}
+
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /*!
+    @brief return whether type is primitive
+
+    This function returns true if and only if the JSON type is primitive
+    (string, number, boolean, or null).
+
+    @return `true` if type is primitive (string, number, boolean, or null),
+    `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_primitive()` for all JSON
+    types.,is_primitive}
+
+    @sa @ref is_structured() -- returns whether JSON value is structured
+    @sa @ref is_null() -- returns whether JSON value is `null`
+    @sa @ref is_string() -- returns whether JSON value is a string
+    @sa @ref is_boolean() -- returns whether JSON value is a boolean
+    @sa @ref is_number() -- returns whether JSON value is a number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() or is_string() or is_boolean() or is_number();
+    }
+
+    /*!
+    @brief return whether type is structured
+
+    This function returns true if and only if the JSON type is structured
+    (array or object).
+
+    @return `true` if type is structured (array or object), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_structured()` for all JSON
+    types.,is_structured}
+
+    @sa @ref is_primitive() -- returns whether value is primitive
+    @sa @ref is_array() -- returns whether value is an array
+    @sa @ref is_object() -- returns whether value is an object
+
+    @since version 1.0.0
+    */
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() or is_object();
+    }
+
+    /*!
+    @brief return whether value is null
+
+    This function returns true if and only if the JSON value is null.
+
+    @return `true` if type is null, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_null()` for all JSON
+    types.,is_null}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_null() const noexcept
+    {
+        return m_type == value_t::null;
+    }
+
+    /*!
+    @brief return whether value is a boolean
+
+    This function returns true if and only if the JSON value is a boolean.
+
+    @return `true` if type is boolean, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_boolean()` for all JSON
+    types.,is_boolean}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_type == value_t::boolean;
+    }
+
+    /*!
+    @brief return whether value is a number
+
+    This function returns true if and only if the JSON value is a number. This
+    includes both integer (signed and unsigned) and floating-point values.
+
+    @return `true` if type is number (regardless whether integer, unsigned
+    integer or floating-type), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number()` for all JSON
+    types.,is_number}
+
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() or is_number_float();
+    }
+
+    /*!
+    @brief return whether value is an integer number
+
+    This function returns true if and only if the JSON value is a signed or
+    unsigned integer number. This excludes floating-point values.
+
+    @return `true` if type is an integer or unsigned integer number, `false`
+    otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_integer()` for all
+    JSON types.,is_number_integer}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_type == value_t::number_integer or m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is an unsigned integer number
+
+    This function returns true if and only if the JSON value is an unsigned
+    integer number. This excludes floating-point and signed integer values.
+
+    @return `true` if type is an unsigned integer number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_unsigned()` for all
+    JSON types.,is_number_unsigned}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 2.0.0
+    */
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is a floating-point number
+
+    This function returns true if and only if the JSON value is a
+    floating-point number. This excludes signed and unsigned integer values.
+
+    @return `true` if type is a floating-point number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_float()` for all
+    JSON types.,is_number_float}
+
+    @sa @ref is_number() -- check if value is number
+    @sa @ref is_number_integer() -- check if value is an integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_type == value_t::number_float;
+    }
+
+    /*!
+    @brief return whether value is an object
+
+    This function returns true if and only if the JSON value is an object.
+
+    @return `true` if type is object, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_object()` for all JSON
+    types.,is_object}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_object() const noexcept
+    {
+        return m_type == value_t::object;
+    }
+
+    /*!
+    @brief return whether value is an array
+
+    This function returns true if and only if the JSON value is an array.
+
+    @return `true` if type is array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_array()` for all JSON
+    types.,is_array}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_array() const noexcept
+    {
+        return m_type == value_t::array;
+    }
+
+    /*!
+    @brief return whether value is a string
+
+    This function returns true if and only if the JSON value is a string.
+
+    @return `true` if type is string, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_string()` for all JSON
+    types.,is_string}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_string() const noexcept
+    {
+        return m_type == value_t::string;
+    }
+
+    /*!
+    @brief return whether value is discarded
+
+    This function returns true if and only if the JSON value was discarded
+    during parsing with a callback function (see @ref parser_callback_t).
+
+    @note This function will always be `false` for JSON values after parsing.
+    That is, discarded values can only occur during parsing, but will be
+    removed when inside a structured value or replaced by null in other cases.
+
+    @return `true` if type is discarded, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_discarded()` for all JSON
+    types.,is_discarded}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_type == value_t::discarded;
+    }
+
+    /*!
+    @brief return the type of the JSON value (implicit)
+
+    Implicitly return the type of the JSON value as a value from the @ref
+    value_t enumeration.
+
+    @return the type of the JSON value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies the @ref value_t operator for
+    all JSON types.,operator__value_t}
+
+    @sa @ref type() -- return the type of the JSON value (explicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
+                 int> = 0>
+    basic_json get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @tparam BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 not std::is_same<BasicJsonType, basic_json>::value and
+                 detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    BasicJsonType get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value and
+                 not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        static_assert(std::is_default_constructible<ValueType>::value,
+                      "types must be DefaultConstructible when used with get()");
+
+        ValueType ret;
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+             detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
+                                 detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                                 int> = 0>
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        static_assert(not std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value.
+    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType v;
+    JSONSerializer<ValueType>::from_json(*this, v);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+
+    @tparam ValueType the input parameter type.
+
+    @return the input parameter, allowing chaining calls.
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get_to}
+
+    @since version 3.3.0
+    */
+    template<typename ValueType,
+             detail::enable_if_t <
+                 not detail::is_basic_json<ValueType>::value and
+                 detail::has_from_json<basic_json_t, ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N],
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+
+    /*!
+    @brief get a pointer value (implicit)
+
+    Implicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get_ptr}
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value and
+                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+
+    Implicit reference access to the internally stored JSON value. No copies
+    are made.
+
+    @warning Writing data to the referee of the result yields an undefined
+    state.
+
+    @tparam ReferenceType reference type; must be a reference to @ref array_t,
+    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
+    @ref number_float_t. Enforced by static assertion.
+
+    @return reference to the internally stored JSON value if the requested
+    reference type @a ReferenceType fits to the JSON value; throws
+    type_error.303 otherwise
+
+    @throw type_error.303 in case passed type @a ReferenceType is incompatible
+    with the stored JSON value; see example below
+
+    @complexity Constant.
+
+    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+
+    @since version 1.1.0
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+    @copydoc get_ref()
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value and
+                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   not std::is_pointer<ValueType>::value and
+                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
+                   not std::is_same<ValueType, typename string_t::value_type>::value and
+                   not detail::is_basic_json<ValueType>::value
+
+#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
+                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
+                   and not std::is_same<ValueType, typename std::string_view>::value
+#endif
+#endif
+                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
+                   , int >::type = 0 >
+    operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a reference to the element at specified location @a idx, with
+    bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__size_type}
+    */
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a const reference to the element at specified location @a idx,
+    with bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__size_type_const}
+    */
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a reference to the element at with specified key @a key, with
+    bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__object_t_key_type}
+    */
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a const reference to the element at with specified key @a key,
+    with bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__object_t_key_type_const}
+    */
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a reference to the element at specified location @a idx.
+
+    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
+    then the array is silently filled up with `null` values to make `idx` a
+    valid reference to the last stored element.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array or null; in that
+    cases, using the [] operator with an index makes no sense.
+
+    @complexity Constant if @a idx is in the range of the array. Otherwise
+    linear in `idx - size()`.
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `[]` operator. Note the addition of `null`
+    values.,operatorarray__size_type}
+
+    @since version 1.0.0
+    */
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+                m_value.array->insert(m_value.array->end(),
+                                      idx - m_value.array->size() + 1,
+                                      basic_json());
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a const reference to the element at specified location @a idx.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array; in that case,
+    using the [] operator with an index makes no sense.
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how array elements can be read using
+    the `[]` operator.,operatorarray__size_type_const}
+
+    @since version 1.0.0
+    */
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    reference operator[](const typename object_t::key_type& key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    reference operator[](T* key)
+    {
+        // implicitly convert null to object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    const_reference operator[](T* key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            assert(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(key);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const typename object_t::key_type&), this function
+    does not throw if the given key @a key was not found.
+
+    @note Unlike @ref operator[](const typename object_t::key_type& key), this
+    function does not implicitly add an element to the position defined by @a
+    key. This function is furthermore also applicable to const objects.
+
+    @param[in] key  key of the element to access
+    @param[in] default_value  the value to return if @a key is not found
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a key
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+
+    @since version 1.0.0
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return *it;
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
+    */
+    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    {
+        return value(key, string_t(default_value));
+    }
+
+    /*!
+    @brief access specified object element via JSON Pointer with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(ptr);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const json_pointer&), this function does not throw
+    if the given key @a key was not found.
+
+    @param[in] ptr  a JSON pointer to the element to access
+    @param[in] default_value  the value to return if @a ptr found no value
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a ptr
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value_ptr}
+
+    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+
+    @since version 2.0.2
+    */
+    template<class ValueType, typename std::enable_if<
+                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this);
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const json_pointer&, ValueType) const
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    string_t value(const json_pointer& ptr, const char* default_value) const
+    {
+        return value(ptr, string_t(default_value));
+    }
+
+    /*!
+    @brief access the first element
+
+    Returns a reference to the first element in the container. For a JSON
+    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
+
+    @return In case of a structured type (array or object), a reference to the
+    first element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on `null` value
+
+    @liveexample{The following code shows an example for `front()`.,front}
+
+    @sa @ref back() -- access the last element
+
+    @since version 1.0.0
+    */
+    reference front()
+    {
+        return *begin();
+    }
+
+    /*!
+    @copydoc basic_json::front()
+    */
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /*!
+    @brief access the last element
+
+    Returns a reference to the last element in the container. For a JSON
+    container `c`, the expression `c.back()` is equivalent to
+    @code {.cpp}
+    auto tmp = c.end();
+    --tmp;
+    return *tmp;
+    @endcode
+
+    @return In case of a structured type (array or object), a reference to the
+    last element is returned. In case of number, string, or boolean values, a
+    reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on a `null` value. See example
+    below.
+
+    @liveexample{The following code shows an example for `back()`.,back}
+
+    @sa @ref front() -- access the first element
+
+    @since version 1.0.0
+    */
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @copydoc basic_json::back()
+    */
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @brief remove element given an iterator
+
+    Removes the element specified by iterator @a pos. The iterator @a pos must
+    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
+    but is not dereferenceable) cannot be used as a value for @a pos.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] pos iterator to the element to remove
+    @return Iterator following the last removed element. If the iterator @a
+    pos refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.202 if called on an iterator which does not belong
+    to the current JSON value; example: `"iterator does not fit current
+    value"`
+    @throw invalid_iterator.205 if called on a primitive type with invalid
+    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
+    out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: amortized constant
+    - arrays: linear in distance between @a pos and the end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType}
+
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove elements given an iterator range
+
+    Removes the element specified by the range `[first; last)`. The iterator
+    @a first does not need to be dereferenceable if `first == last`: erasing
+    an empty range is a no-op.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] first iterator to the beginning of the range to remove
+    @param[in] last iterator past the end of the range to remove
+    @return Iterator following the last removed element. If the iterator @a
+    second refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.203 if called on iterators which does not belong
+    to the current JSON value; example: `"iterators do not fit current value"`
+    @throw invalid_iterator.204 if called on a primitive type with invalid
+    iterators (i.e., if `first != begin()` and `last != end()`); example:
+    `"iterators out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: `log(size()) + std::distance(first, last)`
+    - arrays: linear in the distance between @a first and @a last, plus linear
+      in the distance between @a last and end of the container
+    - strings: linear in the length of the string
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType_IteratorType}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
+                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
+             = 0>
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object or this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_LIKELY(not first.m_it.primitive_iterator.is_begin()
+                                       or not last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove element from a JSON object given a key
+
+    Removes elements from a JSON object with the key value @a key.
+
+    @param[in] key value of the elements to remove
+
+    @return Number of elements removed. If @a ObjectType is the default
+    `std::map` type, the return value will always be `0` (@a key was not
+    found) or `1` (@a key was found).
+
+    @post References and iterators to the erased elements are invalidated.
+    Other references and iterators are not affected.
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+
+    @complexity `log(size()) + count(key)`
+
+    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->erase(key);
+        }
+
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief remove element from a JSON array given an index
+
+    Removes element from a JSON array at the index @a idx.
+
+    @param[in] idx index of the element to remove
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
+    is out of range"`
+
+    @complexity Linear in distance between @a idx and the end of the container.
+
+    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+
+    @since version 1.0.0
+    */
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /*!
+    @brief find an element in a JSON object
+
+    Finds an element in a JSON object with key equivalent to @a key. If the
+    element is not found or the JSON value is not an object, end() is
+    returned.
+
+    @note This method always returns @ref end() when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value of the element to search for.
+
+    @return Iterator to an element with key equivalent to @a key. If no such
+    element is found or the JSON value is not an object, past-the-end (see
+    @ref end()) iterator is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `find()` is used.,find__key_type}
+
+    @sa @ref contains(KeyT&&) const -- checks whether a key exists
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    iterator find(KeyT&& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief find an element in a JSON object
+    @copydoc find(KeyT&&)
+    */
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief returns the number of occurrences of a key in a JSON object
+
+    Returns the number of elements with key @a key. If ObjectType is the
+    default `std::map` type, the return value will always be `0` (@a key was
+    not found) or `1` (@a key was found).
+
+    @note This method always returns `0` when executed on a JSON type that is
+          not an object.
+
+    @param[in] key key value of the element to count
+
+    @return Number of elements with key @a key. If the JSON value is not an
+    object, the return value will be `0`.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `count()` is used.,count}
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object
+
+    Check whether an element exists in a JSON object with key equivalent to
+    @a key. If the element is not found or the JSON value is not an object,
+    false is returned.
+
+    @note This method always returns false when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value to check its existence.
+
+    @return true if an element with specified @a key exists. If no such
+    element with such key is found or the JSON value is not an object,
+    false is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains}
+
+    @sa @ref find(KeyT&&) -- returns an iterator to an object element
+    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
+
+    @since version 3.6.0
+    */
+    template<typename KeyT, typename std::enable_if<
+                 not std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int>::type = 0>
+    bool contains(KeyT && key) const
+    {
+        return is_object() and m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object given a JSON pointer
+
+    Check whether the given JSON pointer @a ptr can be resolved in the current
+    JSON value.
+
+    @note This method can be executed on any JSON value type.
+
+    @param[in] ptr JSON pointer to check its existence.
+
+    @return true if the JSON pointer can be resolved to a stored value, false
+    otherwise.
+
+    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+
+    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+
+    @since version 3.7.0
+    */
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /*!
+    @brief returns an iterator to the first element
+
+    Returns an iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `begin()`.,begin}
+
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cbegin()
+    */
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /*!
+    @brief returns a const iterator to the first element
+
+    Returns a const iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
+
+    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
+
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to one past the last element
+
+    Returns an iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `end()`.,end}
+
+    @sa @ref cend() -- returns a const iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cend()
+    */
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /*!
+    @brief returns a const iterator to one past the last element
+
+    Returns a const iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
+
+    @liveexample{The following code shows an example for `cend()`.,cend}
+
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-beginning
+
+    Returns an iterator to the reverse-beginning; that is, the last element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(end())`.
+
+    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
+
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /*!
+    @copydoc basic_json::crbegin()
+    */
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-end
+
+    Returns an iterator to the reverse-end; that is, one before the first
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(begin())`.
+
+    @liveexample{The following code shows an example for `rend()`.,rend}
+
+    @sa @ref crend() -- returns a const reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /*!
+    @copydoc basic_json::crend()
+    */
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /*!
+    @brief returns a const reverse iterator to the last element
+
+    Returns a const iterator to the reverse-beginning; that is, the last
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
+
+    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
+
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /*!
+    @brief returns a const reverse iterator to one before the first
+
+    Returns a const reverse iterator to the reverse-end; that is, one before
+    the first element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
+
+    @liveexample{The following code shows an example for `crend()`.,crend}
+
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /*!
+    @brief wrapper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without iterator_wrapper:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without iterator proxy:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with iterator proxy:
+
+    @code{cpp}
+    for (auto it : json::iterator_wrapper(j_object))
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example).
+
+    @param[in] ref  reference to a JSON value
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @note The name of this function is not yet final and may change in the
+    future.
+
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use @ref items() instead;
+                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    */
+    JSON_HEDLEY_DEPRECATED(3.1.0)
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @copydoc iterator_wrapper(reference)
+    */
+    JSON_HEDLEY_DEPRECATED(3.1.0)
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @brief helper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without `items()` function:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without `items()` function:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with `items()` function:
+
+    @code{cpp}
+    for (auto& el : j_object.items())
+    {
+        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
+    }
+    @endcode
+
+    The `items()` function also allows to use
+    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
+    (C++17):
+
+    @code{cpp}
+    for (auto& [key, val] : j_object.items())
+    {
+        std::cout << "key: " << key << ", value:" << val << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example). For primitive types (e.g., numbers),
+          `key()` returns an empty string.
+
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the function is used.,items}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 3.1.0, structured bindings support since 3.5.0.
+    */
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /*!
+    @copydoc items()
+    */
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /*!
+    @brief checks whether the container is empty.
+
+    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `true`
+            boolean     | `false`
+            string      | `false`
+            number      | `false`
+            object      | result of function `object_t::empty()`
+            array       | result of function `array_t::empty()`
+
+    @liveexample{The following code uses `empty()` to check if a JSON
+    object contains any elements.,empty}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `empty()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return whether a string stored as JSON value
+    is empty - it returns whether the JSON container itself is empty which is
+    false in the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `begin() == end()`.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the number of elements
+
+    Returns the number of elements in a JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0`
+            boolean     | `1`
+            string      | `1`
+            number      | `1`
+            object      | result of function object_t::size()
+            array       | result of function array_t::size()
+
+    @liveexample{The following code calls `size()` on the different value
+    types.,size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their size() functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return the length of a string stored as JSON
+    value - it returns the number of elements in the JSON value which is 1 in
+    the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `std::distance(begin(), end())`.
+
+    @sa @ref empty() -- checks whether the container is empty
+    @sa @ref max_size() -- returns the maximal number of elements
+
+    @since version 1.0.0
+    */
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the maximum possible number of elements
+
+    Returns the maximum number of elements a JSON value is able to hold due to
+    system or library implementation limitations, i.e. `std::distance(begin(),
+    end())` for the JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0` (same as `size()`)
+            boolean     | `1` (same as `size()`)
+            string      | `1` (same as `size()`)
+            number      | `1` (same as `size()`)
+            object      | result of function `object_t::max_size()`
+            array       | result of function `array_t::max_size()`
+
+    @liveexample{The following code calls `max_size()` on the different value
+    types. Note the output is implementation specific.,max_size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `max_size()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of returning `b.size()` where `b` is the largest
+      possible JSON value.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /*!
+    @brief clears the contents
+
+    Clears the content of a JSON value and resets it to the default value as
+    if @ref basic_json(value_t) would have been called with the current value
+    type from @ref type():
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+
+    @post Has the same effect as calling
+    @code {.cpp}
+    *this = basic_json(type());
+    @endcode
+
+    @liveexample{The example below shows the effect of `clear()` to different
+    JSON types.,clear}
+
+    @complexity Linear in the size of the JSON value.
+
+    @iterators All iterators, pointers and references related to this container
+               are invalidated.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @sa @ref basic_json(value_t) -- constructor that creates an object with the
+        same value than calling `clear()`
+
+    @since version 1.0.0
+    */
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Appends the given element @a val to the end of the JSON value. If the
+    function is called on a JSON null value, an empty array is created before
+    appending @a val.
+
+    @param[in] val the value to add to the JSON array
+
+    @throw type_error.308 when called on a type other than JSON array or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON array. Note how the `null` value was silently
+    converted to a JSON array.,push_back}
+
+    @since version 1.0.0
+    */
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        m_value.array->push_back(std::move(val));
+        // invalidate object: mark it null so we do not call the destructor
+        // cppcheck-suppress accessMoved
+        val.m_type = value_t::null;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.array->push_back(val);
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    Inserts the given element @a val to the JSON object. If the function is
+    called on a JSON null value, an empty object is created before inserting
+    @a val.
+
+    @param[in] val the value to add to the JSON object
+
+    @throw type_error.308 when called on a type other than JSON object or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON object. Note how the `null` value was silently
+    converted to a JSON object.,push_back__object_t__value}
+
+    @since version 1.0.0
+    */
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.object->insert(val);
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(const typename object_t::value_type&)
+    */
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    This function allows to use `push_back` with an initializer list. In case
+
+    1. the current value is an object,
+    2. the initializer list @a init contains only two elements, and
+    3. the first element of @a init is a string,
+
+    @a init is converted into an object element and added using
+    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
+    is converted to a JSON value and added using @ref push_back(basic_json&&).
+
+    @param[in] init  an initializer list
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @note This function is required to resolve an ambiguous overload error,
+          because pairs like `{"key", "value"}` can be both interpreted as
+          `object_t::value_type` or `std::initializer_list<basic_json>`, see
+          https://github.com/nlohmann/json/issues/235 for more information.
+
+    @liveexample{The example shows how initializer lists are treated as
+    objects when possible.,push_back__initializer_list}
+    */
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(initializer_list_t)
+    */
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Creates a JSON value from the passed parameters @a args to the end of the
+    JSON value. If the function is called on a JSON null value, an empty array
+    is created before appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return reference to the inserted element
+
+    @throw type_error.311 when called on a type other than JSON array or
+    null; example: `"cannot use emplace_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` can be used to add
+    elements to a JSON array. Note how the `null` value was silently converted
+    to a JSON array.,emplace_back}
+
+    @since version 2.0.8, returns reference since 3.7.0
+    */
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+#ifdef JSON_HAS_CPP_17
+        return m_value.array->emplace_back(std::forward<Args>(args)...);
+#else
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+        return m_value.array->back();
+#endif
+    }
+
+    /*!
+    @brief add an object to an object if key does not exist
+
+    Inserts a new element into a JSON object constructed in-place with the
+    given @a args if there is no element with the key in the container. If the
+    function is called on a JSON null value, an empty object is created before
+    appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return a pair consisting of an iterator to the inserted element, or the
+            already-existing element if no insertion happened, and a bool
+            denoting whether the insertion took place.
+
+    @throw type_error.311 when called on a type other than JSON object or
+    null; example: `"cannot use emplace() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `emplace()` can be used to add elements
+    to a JSON object. Note how the `null` value was silently converted to a
+    JSON object. Further note how no value is added if there was already one
+    value stored with the same key.,emplace}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        assert(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        return result;
+    }
+
+    /*!
+    @brief inserts element
+
+    Inserts element @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] val element to insert
+    @return iterator pointing to the inserted @a val.
+
+    @throw type_error.309 if called on JSON values other than arrays;
+    example: `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Constant plus linear in the distance between @a pos and end of
+    the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts element
+    @copydoc insert(const_iterator, const basic_json&)
+    */
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts @a cnt copies of @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] cnt number of copies of @a val to insert
+    @param[in] val element to insert
+    @return iterator pointing to the first element inserted, or @a pos if
+    `cnt==0`
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Linear in @a cnt plus linear in the distance between @a pos
+    and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__count}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)` before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+    @throw invalid_iterator.211 if @a first or @a last are iterators into
+    container for which insert is called; example: `"passed iterators may not
+    belong to container"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `first==last`
+
+    @complexity Linear in `std::distance(first, last)` plus linear in the
+    distance between @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from initializer list @a ilist before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] ilist initializer list to insert the values from
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `ilist` is empty
+
+    @complexity Linear in `ilist.size()` plus linear in the distance between
+    @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__ilist}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(not is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)`.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than objects; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+    of elements to insert.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+    @since version 3.0.0
+    */
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from JSON object @a j and overwrites existing keys.
+
+    @param[in] j  JSON object to read values from
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_reference j)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+        if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+        }
+
+        for (auto it = j.cbegin(); it != j.cend(); ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from from range `[first, last)` and overwrites existing
+    keys.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used__range.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_iterator first, const_iterator last)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(not is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()
+                                 or not last.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of the JSON value with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value and
+        std::is_nothrow_move_assignable<value_t>::value and
+        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+        assert_invariant();
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON array with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other array to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an array; example: `"cannot
+    use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how arrays can be swapped with
+    `swap()`.,swap__array_t}
+
+    @since version 1.0.0
+    */
+    void swap(array_t& other)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            std::swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON object with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other object to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an object; example:
+    `"cannot use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how objects can be swapped with
+    `swap()`.,swap__object_t}
+
+    @since version 1.0.0
+    */
+    void swap(object_t& other)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            std::swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other string to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__string_t}
+
+    @since version 1.0.0
+    */
+    void swap(string_t& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            std::swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+  public:
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    /*!
+    @brief comparison: equal
+
+    Compares two JSON values for equality according to the following rules:
+    - Two JSON values are equal if (1) they are from the same type and (2)
+      their stored values are the same according to their respective
+      `operator==`.
+    - Integer and floating-point numbers are automatically converted before
+      comparison. Note than two NaN values are always treated as unequal.
+    - Two JSON null values are equal.
+
+    @note Floating-point inside JSON values numbers are compared with
+    `json::number_float_t::operator==` which is `double::operator==` by
+    default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    @code {.cpp}
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    @endcode
+
+    @note NaN values never compare equal to themselves or to other NaN values.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are equal
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Linear.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__equal}
+
+    @since version 1.0.0
+    */
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return *lhs.m_value.array == *rhs.m_value.array;
+
+                case value_t::object:
+                    return *lhs.m_value.object == *rhs.m_value.object;
+
+                case value_t::null:
+                    return true;
+
+                case value_t::string:
+                    return *lhs.m_value.string == *rhs.m_value.string;
+
+                case value_t::boolean:
+                    return lhs.m_value.boolean == rhs.m_value.boolean;
+
+                case value_t::number_integer:
+                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+
+                case value_t::number_unsigned:
+                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+
+                case value_t::number_float:
+                    return lhs.m_value.number_float == rhs.m_value.number_float;
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+
+        return false;
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /*!
+    @brief comparison: not equal
+
+    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are not equal
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__notequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs == rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /*!
+    @brief comparison: less than
+
+    Compares whether one JSON value @a lhs is less than another JSON value @a
+    rhs according to the following rules:
+    - If @a lhs and @a rhs have the same type, the values are compared using
+      the default `<` operator.
+    - Integer and floating-point numbers are automatically converted before
+      comparison
+    - In case @a lhs and @a rhs have different types, the values are ignored
+      and the order of the types is considered, see
+      @ref operator<(const value_t, const value_t).
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__less}
+
+    @since version 1.0.0
+    */
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    // note parentheses are necessary, see
+                    // https://github.com/nlohmann/json/issues/1530
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+                case value_t::object:
+                    return (*lhs.m_value.object) < (*rhs.m_value.object);
+
+                case value_t::null:
+                    return false;
+
+                case value_t::string:
+                    return (*lhs.m_value.string) < (*rhs.m_value.string);
+
+                case value_t::boolean:
+                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
+
+                case value_t::number_integer:
+                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
+
+                case value_t::number_unsigned:
+                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
+
+                case value_t::number_float:
+                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+        }
+
+        // We only reach this line if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        return operator<(lhs_type, rhs_type);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /*!
+    @brief comparison: less than or equal
+
+    Compares whether one JSON value @a lhs is less than or equal to another
+    JSON value by calculating `not (rhs < lhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greater}
+
+    @since version 1.0.0
+    */
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (rhs < lhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /*!
+    @brief comparison: greater than
+
+    Compares whether one JSON value @a lhs is greater than another
+    JSON value by calculating `not (lhs <= rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__lessequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs <= rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+
+    Compares whether one JSON value @a lhs is greater than or equal to another
+    JSON value by calculating `not (lhs < rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greaterequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return not (lhs < rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+
+    /*!
+    @brief serialize to stream
+
+    Serialize the given JSON value @a j to the output stream @a o. The JSON
+    value will be serialized using the @ref dump member function.
+
+    - The indentation of the output can be controlled with the member variable
+      `width` of the output stream @a o. For instance, using the manipulator
+      `std::setw(4)` on @a o sets the indentation level to `4` and the
+      serialization result is the same as calling `dump(4)`.
+
+    - The indentation character can be controlled with the member variable
+      `fill` of the output stream @a o. For instance, the manipulator
+      `std::setfill('\\t')` sets indentation to use a tab character rather than
+      the default space character.
+
+    @param[in,out] o  stream to serialize to
+    @param[in] j  JSON value to serialize
+
+    @return the stream @a o
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
+    @complexity Linear.
+
+    @liveexample{The example below shows the serialization with different
+    parameters to `width` to adjust the indentation level.,operator_serialize}
+
+    @since version 1.0.0; indentation character added in version 3.0.0
+    */
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /*!
+    @brief serialize to stream
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use
+                @ref operator<<(std::ostream&, const basic_json&)
+                instead; that is, replace calls like `j >> o;` with `o << j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED(3.0.0)
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /*!
+    @brief deserialize from a compatible input
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an array.,parse__array__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__string__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__istream__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
+
+    @since version 2.0.3 (contiguous containers)
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(detail::input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(i, cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    static bool accept(detail::input_adapter&& i)
+    {
+        return parser(i).accept(true);
+    }
+
+    /*!
+    @brief generate SAX events
+
+    The SAX event lister must follow the interface of @ref json_sax.
+
+    This function reads from a compatible input. Examples are:
+    - an array of 1-byte values
+    - strings with character/literal type with size of 1 byte
+    - input streams
+    - container with contiguous storage of 1-byte values. Compatible container
+      types include `std::vector`, `std::string`, `std::array`,
+      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
+      arrays can be used with `std::begin()`/`std::end()`. User-defined
+      containers can be used as long as they implement random-access iterators
+      and a contiguous storage.
+
+    @pre Each element of the container has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @pre The container storage is contiguous. Violating this precondition
+    yields undefined behavior. **This precondition is enforced with an
+    assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with a noncompliant container and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @param[in] i  input to read from
+    @param[in,out] sax  SAX event listener
+    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
+    @param[in] strict  whether the input has to be consumed completely
+
+    @return return value of the last processed SAX event
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
+    a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `sax_parse()` function
+    reading from string and processing the events with a user-defined SAX
+    event consumer.,sax_parse}
+
+    @since version 3.2.0
+    */
+    template <typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true)
+    {
+        assert(sax);
+        return format == input_format_t::json
+               ? parser(std::move(i)).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
+    }
+
+    /*!
+    @brief deserialize from an iterator range with contiguous storage
+
+    This function reads from an iterator range of a container with contiguous
+    storage of 1-byte values. Compatible container types include
+    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
+    `std::initializer_list`. Furthermore, C-style arrays can be used with
+    `std::begin()`/`std::end()`. User-defined containers can be used as long
+    as they implement random-access iterators and a contiguous storage.
+
+    @pre The iterator range is contiguous. Violating this precondition yields
+    undefined behavior. **This precondition is enforced with an assertion.**
+    @pre Each element in the range has a size of 1 byte. Violating this
+    precondition yields undefined behavior. **This precondition is enforced
+    with a static assertion.**
+
+    @warning There is no way to enforce all preconditions at compile-time. If
+             the function is called with noncompliant iterators and with
+             assertions switched off, the behavior is undefined and will most
+             likely yield segmentation violation.
+
+    @tparam IteratorType iterator of container with contiguous storage
+    @param[in] first  begin of the range to parse (included)
+    @param[in] last  end of the range to parse (excluded)
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an iterator range.,parse__iteratortype__parser_callback_t}
+
+    @since version 2.0.3
+    */
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static basic_json parse(IteratorType first, IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true)
+    {
+        basic_json result;
+        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
+        return result;
+    }
+
+    template<class IteratorType, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    static bool accept(IteratorType first, IteratorType last)
+    {
+        return parser(detail::input_adapter(first, last)).accept(true);
+    }
+
+    template<class IteratorType, class SAX, typename std::enable_if<
+                 std::is_base_of<
+                     std::random_access_iterator_tag,
+                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
+    {
+        return parser(detail::input_adapter(first, last)).sax_parse(sax);
+    }
+
+    /*!
+    @brief deserialize from stream
+    @deprecated This stream operator is deprecated and will be removed in
+                version 4.0.0 of the library. Please use
+                @ref operator>>(std::istream&, basic_json&)
+                instead; that is, replace calls like `j << i;` with `i >> j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED(3.0.0)
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /*!
+    @brief deserialize from stream
+
+    Deserializes an input stream to a JSON value.
+
+    @param[in,out] i  input stream to read a serialized JSON value from
+    @param[in,out] j  JSON value to write the deserialized input to
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below shows how a JSON value is constructed by
+    reading a serialization from a stream.,operator_deserialize}
+
+    @sa parse(std::istream&, const parser_callback_t) for a variant with a
+    parser callback function to filter values while parsing
+
+    @since version 1.0.0
+    */
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /*!
+    @brief return the type as string
+
+    Returns the type name as string to be used in error messages - usually to
+    indicate that a function was called on a wrong JSON type.
+
+    @return a string representation of a the @a m_type member:
+            Value type  | return value
+            ----------- | -------------
+            null        | `"null"`
+            boolean     | `"boolean"`
+            string      | `"string"`
+            number      | `"number"` (for all number types)
+            object      | `"object"`
+            array       | `"array"`
+            discarded   | `"discarded"`
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Constant.
+
+    @liveexample{The following code exemplifies `type_name()` for all JSON
+    types.,type_name}
+
+    @sa @ref type() -- return the type of the JSON value
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+    since 3.0.0
+    */
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        {
+            switch (m_type)
+            {
+                case value_t::null:
+                    return "null";
+                case value_t::object:
+                    return "object";
+                case value_t::array:
+                    return "array";
+                case value_t::string:
+                    return "string";
+                case value_t::boolean:
+                    return "boolean";
+                case value_t::discarded:
+                    return "discarded";
+                default:
+                    return "number";
+            }
+        }
+    }
+
+
+  private:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /*!
+    @brief create a CBOR serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+    Binary Object Representation) serialization format. CBOR is a binary
+    serialization format which aims to be more compact than JSON itself, yet
+    more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    CBOR types according to the CBOR specification (RFC 7049):
+
+    JSON value type | value/range                                | CBOR type                          | first byte
+    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+    null            | `null`                                     | Null                               | 0xF6
+    boolean         | `true`                                     | True                               | 0xF5
+    boolean         | `false`                                    | False                              | 0xF4
+    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
+    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
+    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
+    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
+    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
+    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
+    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
+    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_float    | *any value*                                | Double-Precision Float             | 0xFB
+    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
+    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
+    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
+    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
+    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
+    array           | *size*: 0..23                              | array                              | 0x80..0x97
+    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
+    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
+    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
+    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
+    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
+    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
+    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
+    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
+    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a CBOR value.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The following CBOR types are not used in the conversion:
+          - byte strings (0x40..0x5F)
+          - UTF-8 strings terminated by "break" (0x7F)
+          - arrays terminated by "break" (0x9F)
+          - maps terminated by "break" (0xBF)
+          - date/time (0xC0..0xC1)
+          - bignum (0xC2..0xC3)
+          - decimal fraction (0xC4)
+          - bigfloat (0xC5)
+          - tagged items (0xC6..0xD4, 0xD8..0xDB)
+          - expected conversions (0xD5..0xD7)
+          - simple values (0xE0..0xF3, 0xF8)
+          - undefined (0xF7)
+          - half and single-precision floats (0xF9-0xFA)
+          - break (0xFF)
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in CBOR format.,to_cbor}
+
+    @sa http://cbor.io
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_cbor(j);
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /*!
+    @brief create a MessagePack serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the MessagePack
+    serialization format. MessagePack is a binary serialization format which
+    aims to be more compact than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    MessagePack types according to the MessagePack specification:
+
+    JSON value type | value/range                       | MessagePack type | first byte
+    --------------- | --------------------------------- | ---------------- | ----------
+    null            | `null`                            | nil              | 0xC0
+    boolean         | `true`                            | true             | 0xC3
+    boolean         | `false`                           | false            | 0xC2
+    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
+    number_integer  | -2147483648..-32769               | int32            | 0xD2
+    number_integer  | -32768..-129                      | int16            | 0xD1
+    number_integer  | -128..-33                         | int8             | 0xD0
+    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
+    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
+    number_integer  | 128..255                          | uint 8           | 0xCC
+    number_integer  | 256..65535                        | uint 16          | 0xCD
+    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
+    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
+    number_unsigned | 128..255                          | uint 8           | 0xCC
+    number_unsigned | 256..65535                        | uint 16          | 0xCD
+    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
+    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_float    | *any value*                       | float 64         | 0xCB
+    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
+    string          | *length*: 32..255                 | str 8            | 0xD9
+    string          | *length*: 256..65535              | str 16           | 0xDA
+    string          | *length*: 65536..4294967295       | str 32           | 0xDB
+    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
+    array           | *size*: 16..65535                 | array 16         | 0xDC
+    array           | *size*: 65536..4294967295         | array 32         | 0xDD
+    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
+    object          | *size*: 16..65535                 | map 16           | 0xDE
+    object          | *size*: 65536..4294967295         | map 32           | 0xDF
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a MessagePack value.
+
+    @note The following values can **not** be converted to a MessagePack value:
+          - strings with more than 4294967295 bytes
+          - arrays with more than 4294967295 elements
+          - objects with more than 4294967295 elements
+
+    @note The following MessagePack types are not used in the conversion:
+          - bin 8 - bin 32 (0xC4..0xC6)
+          - ext 8 - ext 32 (0xC7..0xC9)
+          - float 32 (0xCA)
+          - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in MessagePack format.,to_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref from_msgpack for the analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_msgpack(j);
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /*!
+    @brief create a UBJSON serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the UBJSON
+    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
+    than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    UBJSON types according to the UBJSON specification:
+
+    JSON value type | value/range                       | UBJSON type | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | `Z`
+    boolean         | `true`                            | true        | `T`
+    boolean         | `false`                           | false       | `F`
+    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
+    number_integer  | -2147483648..-32769               | int32       | `l`
+    number_integer  | -32768..-129                      | int16       | `I`
+    number_integer  | -128..127                         | int8        | `i`
+    number_integer  | 128..255                          | uint8       | `U`
+    number_integer  | 256..32767                        | int16       | `I`
+    number_integer  | 32768..2147483647                 | int32       | `l`
+    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 0..127                            | int8        | `i`
+    number_unsigned | 128..255                          | uint8       | `U`
+    number_unsigned | 256..32767                        | int16       | `I`
+    number_unsigned | 32768..2147483647                 | int32       | `l`
+    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
+    number_float    | *any value*                       | float64     | `D`
+    string          | *with shortest length indicator*  | string      | `S`
+    array           | *see notes on optimized format*   | array       | `[`
+    object          | *see notes on optimized format*   | map         | `{`
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a UBJSON value.
+
+    @note The following values can **not** be converted to a UBJSON value:
+          - strings with more than 9223372036854775807 bytes (theoretical)
+          - unsigned integer numbers above 9223372036854775807
+
+    @note The following markers are not used in the conversion:
+          - `Z`: no-op values are not created.
+          - `C`: single-byte strings are serialized with `S` markers.
+
+    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
+          by @ref from_ubjson.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The optimized formats for containers are supported: Parameter
+          @a use_size adds size information to the beginning of a container and
+          removes the closing marker. Parameter @a use_type further checks
+          whether all elements of a container have the same type and adds the
+          type marker to the beginning of the container. The @a use_type
+          parameter must only be used together with @a use_size = true. Note
+          that @a use_size = true alone may result in larger representations -
+          the benefit of this parameter is that the receiving side is
+          immediately informed on the number of elements of the container.
+
+    @param[in] j  JSON value to serialize
+    @param[in] use_size  whether to add size annotations to container types
+    @param[in] use_type  whether to add type annotations to container types
+                         (must be combined with @a use_size = true)
+    @return UBJSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in UBJSON format.,to_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+    @since version 3.1.0
+    */
+    static std::vector<uint8_t> to_ubjson(const basic_json& j,
+                                          const bool use_size = false,
+                                          const bool use_type = false)
+    {
+        std::vector<uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and returns a vector
+           containing the corresponding BSON-representation.
+
+    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
+    stored as a single entity (a so-called document).
+
+    The library uses the following mapping from JSON values types to BSON types:
+
+    JSON value type | value/range                       | BSON type   | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | 0x0A
+    boolean         | `true`, `false`                   | boolean     | 0x08
+    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
+    number_integer  | -2147483648..2147483647           | int32       | 0x10
+    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 0..2147483647                     | int32       | 0x10
+    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
+    number_float    | *any value*                       | double      | 0x01
+    string          | *any value*                       | string      | 0x02
+    array           | *any value*                       | document    | 0x04
+    object          | *any value*                       | document    | 0x03
+
+    @warning The mapping is **incomplete**, since only JSON-objects (and things
+    contained therein) can be serialized to BSON.
+    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
+    and the keys may not contain U+0000, since they are serialized a
+    zero-terminated c-strings.
+
+    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
+    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
+    @throw type_error.317    if `!j.is_object()`
+
+    @pre The input `j` is required to be an object: `j.is_object() == true`.
+
+    @note Any BSON output created via @ref to_bson can be successfully parsed
+          by @ref from_bson.
+
+    @param[in] j  JSON value to serialize
+    @return BSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in BSON format.,to_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
+        analogous deserialization
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+    @sa @ref to_cbor(const basic_json&) for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    */
+    static std::vector<uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and forwards the
+           corresponding BSON-representation to the given output_adapter `o`.
+    @param j The JSON object to convert to BSON.
+    @param o The output adapter that receives the binary BSON representation.
+    @pre The input `j` shall be an object: `j.is_object() == true`
+    @sa @ref to_bson(const basic_json&)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_bson(j);
+    }
+
+    /*!
+    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+
+    /*!
+    @brief create a JSON value from an input in CBOR format
+
+    Deserializes a given input @a i to a JSON value using the CBOR (Concise
+    Binary Object Representation) serialization format.
+
+    The library maps CBOR types to JSON value types as follows:
+
+    CBOR type              | JSON value type | first byte
+    ---------------------- | --------------- | ----------
+    Integer                | number_unsigned | 0x00..0x17
+    Unsigned integer       | number_unsigned | 0x18
+    Unsigned integer       | number_unsigned | 0x19
+    Unsigned integer       | number_unsigned | 0x1A
+    Unsigned integer       | number_unsigned | 0x1B
+    Negative integer       | number_integer  | 0x20..0x37
+    Negative integer       | number_integer  | 0x38
+    Negative integer       | number_integer  | 0x39
+    Negative integer       | number_integer  | 0x3A
+    Negative integer       | number_integer  | 0x3B
+    Negative integer       | number_integer  | 0x40..0x57
+    UTF-8 string           | string          | 0x60..0x77
+    UTF-8 string           | string          | 0x78
+    UTF-8 string           | string          | 0x79
+    UTF-8 string           | string          | 0x7A
+    UTF-8 string           | string          | 0x7B
+    UTF-8 string           | string          | 0x7F
+    array                  | array           | 0x80..0x97
+    array                  | array           | 0x98
+    array                  | array           | 0x99
+    array                  | array           | 0x9A
+    array                  | array           | 0x9B
+    array                  | array           | 0x9F
+    map                    | object          | 0xA0..0xB7
+    map                    | object          | 0xB8
+    map                    | object          | 0xB9
+    map                    | object          | 0xBA
+    map                    | object          | 0xBB
+    map                    | object          | 0xBF
+    False                  | `false`         | 0xF4
+    True                   | `true`          | 0xF5
+    Null                   | `null`          | 0xF6
+    Half-Precision Float   | number_float    | 0xF9
+    Single-Precision Float | number_float    | 0xFA
+    Double-Precision Float | number_float    | 0xFB
+
+    @warning The mapping is **incomplete** in the sense that not all CBOR
+             types can be converted to a JSON value. The following CBOR types
+             are not supported and will yield parse errors (parse_error.112):
+             - byte strings (0x40..0x5F)
+             - date/time (0xC0..0xC1)
+             - bignum (0xC2..0xC3)
+             - decimal fraction (0xC4)
+             - bigfloat (0xC5)
+             - tagged items (0xC6..0xD4, 0xD8..0xDB)
+             - expected conversions (0xD5..0xD7)
+             - simple values (0xE0..0xF3, 0xF8)
+             - undefined (0xF7)
+
+    @warning CBOR allows map keys of any type, whereas JSON only allows
+             strings as keys in object values. Therefore, CBOR maps with keys
+             other than UTF-8 strings are rejected (parse_error.113).
+
+    @note Any CBOR output created @ref to_cbor can be successfully parsed by
+          @ref from_cbor.
+
+    @param[in] i  an input in CBOR format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from CBOR were
+    used in the given input @a v or if the input is not valid CBOR
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in CBOR
+    format to a JSON value.,from_cbor}
+
+    @sa http://cbor.io
+    @sa @ref to_cbor(const basic_json&) for the analogous serialization
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
+        related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in MessagePack format
+
+    Deserializes a given input @a i to a JSON value using the MessagePack
+    serialization format.
+
+    The library maps MessagePack types to JSON value types as follows:
+
+    MessagePack type | JSON value type | first byte
+    ---------------- | --------------- | ----------
+    positive fixint  | number_unsigned | 0x00..0x7F
+    fixmap           | object          | 0x80..0x8F
+    fixarray         | array           | 0x90..0x9F
+    fixstr           | string          | 0xA0..0xBF
+    nil              | `null`          | 0xC0
+    false            | `false`         | 0xC2
+    true             | `true`          | 0xC3
+    float 32         | number_float    | 0xCA
+    float 64         | number_float    | 0xCB
+    uint 8           | number_unsigned | 0xCC
+    uint 16          | number_unsigned | 0xCD
+    uint 32          | number_unsigned | 0xCE
+    uint 64          | number_unsigned | 0xCF
+    int 8            | number_integer  | 0xD0
+    int 16           | number_integer  | 0xD1
+    int 32           | number_integer  | 0xD2
+    int 64           | number_integer  | 0xD3
+    str 8            | string          | 0xD9
+    str 16           | string          | 0xDA
+    str 32           | string          | 0xDB
+    array 16         | array           | 0xDC
+    array 32         | array           | 0xDD
+    map 16           | object          | 0xDE
+    map 32           | object          | 0xDF
+    negative fixint  | number_integer  | 0xE0-0xFF
+
+    @warning The mapping is **incomplete** in the sense that not all
+             MessagePack types can be converted to a JSON value. The following
+             MessagePack types are not supported and will yield parse errors:
+              - bin 8 - bin 32 (0xC4..0xC6)
+              - ext 8 - ext 32 (0xC7..0xC9)
+              - fixext 1 - fixext 16 (0xD4..0xD8)
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @param[in] i  an input in MessagePack format convertible to an input
+                  adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from MessagePack were
+    used in the given input @a i or if the input is not valid MessagePack
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    MessagePack format to a JSON value.,from_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
+        the related UBJSON format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(detail::input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(A1 && a1, A2 && a2,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in UBJSON format
+
+    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
+    Binary JSON) serialization format.
+
+    The library maps UBJSON types to JSON value types as follows:
+
+    UBJSON type | JSON value type                         | marker
+    ----------- | --------------------------------------- | ------
+    no-op       | *no value, next value is read*          | `N`
+    null        | `null`                                  | `Z`
+    false       | `false`                                 | `F`
+    true        | `true`                                  | `T`
+    float32     | number_float                            | `d`
+    float64     | number_float                            | `D`
+    uint8       | number_unsigned                         | `U`
+    int8        | number_integer                          | `i`
+    int16       | number_integer                          | `I`
+    int32       | number_integer                          | `l`
+    int64       | number_integer                          | `L`
+    string      | string                                  | `S`
+    char        | string                                  | `C`
+    array       | array (optimized values are supported)  | `[`
+    object      | object (optimized values are supported) | `{`
+
+    @note The mapping is **complete** in the sense that any UBJSON value can
+          be converted to a JSON value.
+
+    @param[in] i  an input in UBJSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if a parse error occurs
+    @throw parse_error.113 if a string could not be parsed successfully
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    UBJSON format to a JSON value.,from_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(detail::input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(A1 && a1, A2 && a2,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief Create a JSON value from an input in BSON format
+
+    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
+    serialization format.
+
+    The library maps BSON record types to JSON value types as follows:
+
+    BSON type       | BSON marker byte | JSON value type
+    --------------- | ---------------- | ---------------------------
+    double          | 0x01             | number_float
+    string          | 0x02             | string
+    document        | 0x03             | object
+    array           | 0x04             | array
+    binary          | 0x05             | still unsupported
+    undefined       | 0x06             | still unsupported
+    ObjectId        | 0x07             | still unsupported
+    boolean         | 0x08             | boolean
+    UTC Date-Time   | 0x09             | still unsupported
+    null            | 0x0A             | null
+    Regular Expr.   | 0x0B             | still unsupported
+    DB Pointer      | 0x0C             | still unsupported
+    JavaScript Code | 0x0D             | still unsupported
+    Symbol          | 0x0E             | still unsupported
+    JavaScript Code | 0x0F             | still unsupported
+    int32           | 0x10             | number_integer
+    Timestamp       | 0x11             | still unsupported
+    128-bit decimal float | 0x13       | still unsupported
+    Max Key         | 0x7F             | still unsupported
+    Min Key         | 0xFF             | still unsupported
+
+    @warning The mapping is **incomplete**. The unsupported mappings
+             are indicated in the table above.
+
+    @param[in] i  an input in BSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.114 if an unsupported BSON record type is encountered
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    BSON format to a JSON value.,from_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref to_bson(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(detail::input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename A1, typename A2,
+             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(A1 && a1, A2 && a2,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. Similar to @ref operator[](const typename
+    object_t::key_type&), `null` values are created in arrays and objects if
+    necessary.
+
+    In particular:
+    - If the JSON pointer points to an object key that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned.
+    - If the JSON pointer points to an array index that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned. All indices between the current maximum and the given
+      index are also filled with `null`.
+    - The special value `-` is treated as a synonym for the index past the
+      end.
+
+    @param[in] ptr  a JSON pointer
+
+    @return reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
+
+    @since version 2.0.0
+    */
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. The function does not change the JSON
+    value; no `null` values are created. In particular, the the special value
+    `-` yields an exception.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return const reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+
+    @since version 2.0.0
+    */
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a reference to the element at with specified JSON pointer @a ptr,
+    with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer}
+    */
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a const reference to the element at with specified JSON pointer @a
+    ptr, with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
+    */
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief return flattened JSON value
+
+    The function creates a JSON object whose keys are JSON pointers (see [RFC
+    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
+    primitive. The original JSON value can be restored using the @ref
+    unflatten() function.
+
+    @return an object that maps JSON pointers to primitive values
+
+    @note Empty objects and arrays are flattened to `null` and will not be
+          reconstructed correctly by the @ref unflatten() function.
+
+    @complexity Linear in the size the JSON value.
+
+    @liveexample{The following code shows how a JSON object is flattened to an
+    object whose keys consist of JSON pointers.,flatten}
+
+    @sa @ref unflatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /*!
+    @brief unflatten a previously flattened JSON value
+
+    The function restores the arbitrary nesting of a JSON value that has been
+    flattened before using the @ref flatten() function. The JSON value must
+    meet certain constraints:
+    1. The value must be an object.
+    2. The keys must be JSON pointers (see
+       [RFC 6901](https://tools.ietf.org/html/rfc6901))
+    3. The mapped values must be primitive JSON types.
+
+    @return the original JSON from a flattened version
+
+    @note Empty objects and arrays are flattened by @ref flatten() to `null`
+          values and can not unflattened to their original type. Apart from
+          this example, for a JSON value `j`, the following is always true:
+          `j == j.flatten().unflatten()`.
+
+    @complexity Linear in the size the JSON value.
+
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+
+    @liveexample{The following code shows how a flattened JSON object is
+    unflattened into the original nested JSON object.,unflatten}
+
+    @sa @ref flatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON patch
+
+    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
+    expressing a sequence of operations to apply to a JSON) document. With
+    this function, a JSON Patch is applied to the current JSON value by
+    executing all operations from the patch.
+
+    @param[in] json_patch  JSON patch document
+    @return patched document
+
+    @note The application of a patch is atomic: Either all operations succeed
+          and the patched document is returned or an exception is thrown. In
+          any case, the original value is not changed: the patch is applied
+          to a copy of the value.
+
+    @throw parse_error.104 if the JSON patch does not consist of an array of
+    objects
+
+    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
+    attributes are missing); example: `"operation add must have member path"`
+
+    @throw out_of_range.401 if an array index is out of range.
+
+    @throw out_of_range.403 if a JSON pointer inside the patch could not be
+    resolved successfully in the current JSON value; example: `"key baz not
+    found"`
+
+    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+    "move")
+
+    @throw other_error.501 if "test" operation was unsuccessful
+
+    @complexity Linear in the size of the JSON value and the length of the
+    JSON patch. As usually only a fraction of the JSON value is affected by
+    the patch, the complexity can usually be neglected.
+
+    @liveexample{The following code shows how a JSON patch is applied to a
+    value.,patch}
+
+    @sa @ref diff -- create a JSON patch by comparing two JSON values
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+
+    @since version 2.0.0
+    */
+    basic_json patch(const basic_json& json_patch) const
+    {
+        // make a working copy to apply the patch to
+        basic_json result = *this;
+
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result[ptr];
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::array_index(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                default:            // LCOV_EXCL_LINE
+                    assert(false);  // LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [&result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(not json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type and not it->second.is_string()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(not val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+            }
+
+            // collect mandatory members
+            const std::string op = get_value("op", "op", true);
+            const std::string path = get_value(op, "path", true);
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const std::string from_path = get_value("move", "from", true);
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const std::string from_path = get_value("copy", "from", true);
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(not success))
+                    {
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
+                    }
+
+                    break;
+                }
+
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief creates a diff as a JSON patch
+
+    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
+    be changed into the value @a target by calling @ref patch function.
+
+    @invariant For two JSON values @a source and @a target, the following code
+    yields always `true`:
+    @code {.cpp}
+    source.patch(diff(source, target)) == target;
+    @endcode
+
+    @note Currently, only `remove`, `add`, and `replace` operations are
+          generated.
+
+    @param[in] source  JSON value to compare from
+    @param[in] target  JSON value to compare against
+    @param[in] path    helper value to create JSON pointers
+
+    @return a JSON patch to convert the @a source to @a target
+
+    @complexity Linear in the lengths of @a source and @a target.
+
+    @liveexample{The following code shows how a JSON patch is created as a
+    diff for two JSON values.,diff}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa @ref merge_patch -- apply a JSON Merge Patch
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
+    @since version 2.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() and i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // i now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", path + "/" + std::to_string(i)}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", path + "/" + std::to_string(i)},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto key = json_pointer::escape(it.key());
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path + "/" + key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto key = json_pointer::escape(it.key());
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path + "/" + key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON Merge Patch
+
+    The merge patch format is primarily intended for use with the HTTP PATCH
+    method as a means of describing a set of modifications to a target
+    resource's content. This function applies a merge patch to the current
+    JSON value.
+
+    The function implements the following algorithm from Section 2 of
+    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
+
+    ```
+    define MergePatch(Target, Patch):
+      if Patch is an Object:
+        if Target is not an Object:
+          Target = {} // Ignore the contents and set it to an empty Object
+        for each Name/Value pair in Patch:
+          if Value is null:
+            if Name exists in Target:
+              remove the Name/Value pair from Target
+          else:
+            Target[Name] = MergePatch(Target[Name], Value)
+        return Target
+      else:
+        return Patch
+    ```
+
+    Thereby, `Target` is the current object; that is, the patch is applied to
+    the current value.
+
+    @param[in] apply_patch  the patch to apply
+
+    @complexity Linear in the lengths of @a patch.
+
+    @liveexample{The following code shows how a JSON Merge Patch is applied to
+    a JSON document.,merge_patch}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+
+    @since version 3.0.0
+    */
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (not is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/*!
+@brief user-defined to_string function for JSON values
+
+This function implements a user-defined to_string  for JSON objects.
+
+@param[in] j  a JSON object
+@return a std::string object
+*/
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+} // namespace nlohmann
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+// specialization of std::swap, and std::hash
+namespace std
+{
+
+/// hash value for JSON objects
+template<>
+struct hash<nlohmann::json>
+{
+    /*!
+    @brief return a hash value for a JSON object
+
+    @since version 1.0.0
+    */
+    std::size_t operator()(const nlohmann::json& j) const
+    {
+        // a naive hashing via the string representation
+        const auto& h = hash<nlohmann::json::string_t>();
+        return h(j.dump());
+    }
+};
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+///        see https://github.com/nlohmann/json/pull/679
+template<>
+struct less<::nlohmann::detail::value_t>
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
+    is_nothrow_move_constructible<nlohmann::json>::value and
+    is_nothrow_move_assignable<nlohmann::json>::value
+)
+{
+    j1.swap(j2);
+}
+
+} // namespace std
+
+/*!
+@brief user-defined string literal for JSON values
+
+This operator implements a user-defined string literal for JSON objects. It
+can be used by adding `"_json"` to a string literal and returns a JSON object
+if no parse error occurred.
+
+@param[in] s  a string representation of a JSON object
+@param[in] n  the length of string @a s
+@return a JSON object
+
+@since version 1.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/*!
+@brief user-defined string literal for JSON pointer
+
+This operator implements a user-defined string literal for JSON Pointers. It
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
+object if no parse error occurred.
+
+@param[in] s  a string representation of a JSON Pointer
+@param[in] n  the length of string @a s
+@return a JSON pointer object
+
+@since version 2.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
+// restore GCC/clang diagnostic settings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+    #pragma GCC diagnostic pop
+#endif
+
+// clean up
+#undef JSON_INTERNAL_CATCH
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FALL_THROUGH
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/code/qcommon/lightclass.cpp b/code/qcommon/lightclass.cpp
index 9942b8e2..982b50bd 100644
--- a/code/qcommon/lightclass.cpp
+++ b/code/qcommon/lightclass.cpp
@@ -52,7 +52,7 @@ size_t       totalmemallocated = 0;
 unsigned int numclassesallocated = 0;
 
 void DisplayMemoryUsage() {
-    LIGHTCLASS_Printf("Classes %-5d Class memory used: %d\n", numclassesallocated, totalmemallocated);
+    LIGHTCLASS_Printf("Classes %-5d Class memory used: %zu\n", numclassesallocated, totalmemallocated);
 }
 
 #ifndef _DEBUG_MEM
@@ -98,4 +98,25 @@ void LightClass::operator delete(void *ptr)
     Z_Free(p);
 #    endif
 }
+#else
+
+void *LightClass::operator new(size_t s)
+{
+    return ::operator new(s);
+}
+
+void LightClass::operator delete(void *ptr)
+{
+    ::operator delete(ptr);
+}
+
 #endif
+
+void* LightClass::operator new(size_t size, void* placement)
+{
+    return placement;
+}
+
+void LightClass::operator delete(void* ptr, void* placement)
+{
+}
diff --git a/code/qcommon/lightclass.h b/code/qcommon/lightclass.h
index bf4bdc62..28b26b70 100644
--- a/code/qcommon/lightclass.h
+++ b/code/qcommon/lightclass.h
@@ -26,12 +26,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "q_shared.h"
 
-class LightClass {
+class LightClass
+{
 public:
-#ifndef _DEBUG_MEM
-    void* operator new(size_t);
-    void operator delete(void*);
-#endif
+    void *operator new(size_t s);
+    void  operator delete(void *ptr);
+
+    void *operator new(size_t size, void *placement);
+    void  operator delete(void *ptr, void *placement);
+
+    template<typename T>
+    void *operator new(size_t size, T& placement)
+    {
+        return operator new(size, (void *)&placement);
+    }
+
+    template<typename T>
+    void operator delete(void *ptr, T& placement)
+    {
+        return operator delete(ptr, (void *)&placement);
+    }
 };
 
 void DisplayMemoryUsage();
diff --git a/code/qcommon/listener.cpp b/code/qcommon/listener.cpp
index 3bc5b69f..d3631a6b 100644
--- a/code/qcommon/listener.cpp
+++ b/code/qcommon/listener.cpp
@@ -27,374 +27,408 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "Linklist.h"
 
 #ifdef WITH_SCRIPT_ENGINE
-#include "../fgame/archive.h"
-#include "../fgame/scriptmaster.h"
-#include "../fgame/scriptthread.h"
-#include "../script/scriptclass.h"
+#    include "../fgame/archive.h"
+#    include "../fgame/scriptmaster.h"
+#    include "../fgame/scriptthread.h"
+#    include "../script/scriptclass.h"
 #endif
 
-#if defined( GAME_DLL )
+#if defined(GAME_DLL)
 
-#include "../fgame/player.h"
-#include "../fgame/consoleevent.h"
-#include "../fgame/animationevent.h"
+#    include "../fgame/player.h"
+#    include "../fgame/consoleevent.h"
+#    include "../fgame/animationevent.h"
 
-#define LISTENER_Cvar_Get gi.Cvar_Get
+#    define LISTENER_Cvar_Get gi.Cvar_Get
 
 #elif defined(CGAME_DLL)
 
-#define LISTENER_Cvar_Get cgi.Cvar_Get
+#    define LISTENER_Cvar_Get cgi.Cvar_Get
 
-#elif defined ( UI_LIB )
+#elif defined(UI_LIB)
 #else
 
-#define LISTENER_Cvar_Get Cvar_Get
+#    define LISTENER_Cvar_Get Cvar_Get
 
-#include "../client/client.h"
+#    include "../client/client.h"
 #endif
 
 // std::move
 #include <utility>
 
-con_map< Event *, EventDef > Event::eventDefList;
-con_arrayset< command_t, command_t > Event::commandList;
+DataNode                          *Event::DataNodeList = NULL;
+con_map<Event *, EventDef>         Event::eventDefList;
+con_arrayset<command_t, command_t> Event::commandList;
 
 #ifdef WITH_SCRIPT_ENGINE
 
-con_map< const_str, unsigned int > Event::normalCommandList;
-con_map< const_str, unsigned int > Event::returnCommandList;
-con_map< const_str, unsigned int > Event::getterCommandList;
-con_map< const_str, unsigned int > Event::setterCommandList;
+con_map<const_str, unsigned int> Event::normalCommandList;
+con_map<const_str, unsigned int> Event::returnCommandList;
+con_map<const_str, unsigned int> Event::getterCommandList;
+con_map<const_str, unsigned int> Event::setterCommandList;
 
 #endif
 
 EventQueueNode Event::EventQueue;
 
-int	DisableListenerNotify = 0;
+int DisableListenerNotify = 0;
 
-bool Listener::EventSystemStarted = 0;
-
-int Event::totalevents = 1;
+bool Listener::EventSystemStarted = false;
+bool Listener::ProcessingEvents = false;
 
 Event EV_Listener_CancelFor
 (
-	"cancelFor",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Cancel for event of type name.",
-	EV_NORMAL
+    "cancelFor",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Cancel for event of type name.",
+    EV_NORMAL
 );
 
 Event EV_Listener_CommandDelay
 (
-	"commanddelay",
-	EV_DEFAULT,
-	"fsSSSSSS",
-	"delay command arg1 arg2 arg3 arg4 arg5 arg6",
-	"executes a command after the given delay.",
-	EV_NORMAL
+    "commanddelay",
+    EV_DEFAULT,
+    "fsSSSSSS",
+    "delay command arg1 arg2 arg3 arg4 arg5 arg6",
+    "executes a command after the given delay.",
+    EV_NORMAL
 );
 
 Event EV_Listener_Classname
 (
-	"classname",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"classname variable",
-	EV_GETTER
+    "classname",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "classname variable",
+    EV_GETTER
 );
 
 Event EV_Listener_SetClassname
 (
-	"classname",
-	EV_DEFAULT,
-	"s",
-	"classname",
-	"classname variable",
-	EV_NORMAL
+    "classname",
+    EV_DEFAULT,
+    "s",
+    "classname",
+    "classname variable",
+    EV_NORMAL
 );
 
 Event EV_Listener_CreateReturnThread
 (
-	"thread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Creates a thread starting at label.",
-	EV_RETURN
+    "thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Creates a thread starting at label.",
+    EV_RETURN
 );
 
 Event EV_Listener_CreateThread
 (
-	"thread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Creates a thread starting at label.",
-	EV_NORMAL
+    "thread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Creates a thread starting at label.",
+    EV_NORMAL
 );
 
 Event EV_Listener_ExecuteReturnScript
 (
-	"exec",
-	EV_DEFAULT,
-	"s",
-	"script",
-	"Executes the specified script.",
-	EV_RETURN
+    "exec",
+    EV_DEFAULT,
+    "s",
+    "script",
+    "Executes the specified script.",
+    EV_RETURN
 );
 
 Event EV_Listener_ExecuteScript
 (
-	"exec",
-	EV_DEFAULT,
-	"s",
-	"script",
-	"Executes the specified script.",
-	EV_NORMAL
+    "exec",
+    EV_DEFAULT,
+    "s",
+    "script",
+    "Executes the specified script.",
+    EV_NORMAL
 );
 
 Event EV_Delete
 (
-	"delete",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Removes this listener immediately.",
-	EV_NORMAL
+    "delete",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Removes this listener immediately.",
+    EV_NORMAL
 );
 
 Event EV_Remove
 (
-	"immediateremove",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Removes this listener immediately.",
-	EV_NORMAL
+    "immediateremove",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Removes this listener immediately.",
+    EV_NORMAL
 );
 
 Event EV_ScriptRemove
 (
-	"remove",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Removes this listener the next time events are processed.",
-	EV_NORMAL
+    "remove",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Removes this listener the next time events are processed.",
+    EV_NORMAL
 );
 
 Event EV_Listener_EndOn
 (
-	"endon",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Ends the function when the specified event is triggered.",
-	EV_NORMAL
+    "endon",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Ends the function when the specified event is triggered.",
+    EV_NORMAL
 );
 
 Event EV_Listener_InheritsFrom
 (
-	"inheritsfrom",
-	EV_DEFAULT,
-	"s",
-	"class",
-	"Returns 1 if the class inherits from the specified class. 0 otherwise.",
-	EV_RETURN
+    "inheritsfrom",
+    EV_DEFAULT,
+    "s",
+    "class",
+    "Returns 1 if the class inherits from the specified class. 0 otherwise.",
+    EV_RETURN
 );
 
 Event EV_Listener_IsInheritedBy
 (
-	"isinheritedby",
-	EV_DEFAULT,
-	"s",
-	"class",
-	"Returns 1 if the class is inherited by the specified class. 0 otherwise.",
-	EV_RETURN
+    "isinheritedby",
+    EV_DEFAULT,
+    "s",
+    "class",
+    "Returns 1 if the class is inherited by the specified class. 0 otherwise.",
+    EV_RETURN
 );
 
 Event EV_Listener_Notify
 (
-	"notify",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Triggers an event. An undefined event will be automatically created by calling waittill or endon.",
-	EV_NORMAL
+    "notify",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Triggers an event. An undefined event will be automatically created by calling waittill or endon.",
+    EV_NORMAL
 );
 
 Event EV_Listener_GetOwner
 (
-	"owner",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Returns the owner.",
-	EV_GETTER
+    "owner",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Returns the owner.",
+    EV_GETTER
 );
 
 Event EV_DelayThrow
 (
-	"delaythrow",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Internal usage.",
-	EV_NORMAL
+    "delaythrow",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Internal usage.",
+    EV_NORMAL
 );
 
 Event EV_Throw
 (
-	"throw",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Throws to the specified label.",
-	EV_NORMAL
+    "throw",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Throws to the specified label.",
+    EV_NORMAL
 );
 
 Event EV_Listener_Unregister
 (
-	"unregister",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Unregisters the label from the event of the same name.",
-	EV_NORMAL
+    "unregister",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Unregisters the label from the event of the same name.",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitCreateReturnThread
 (
-	"waitthread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Creates a thread starting at label and waits until the called thread is finished.",
-	EV_RETURN
+    "waitthread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Creates a thread starting at label and waits until the called thread is finished.",
+    EV_RETURN
 );
 
 Event EV_Listener_WaitCreateThread
 (
-	"waitthread",
-	EV_DEFAULT,
-	"s",
-	"label",
-	"Creates a thread starting at label and waits until the called thread is finished.",
-	EV_NORMAL
+    "waitthread",
+    EV_DEFAULT,
+    "s",
+    "label",
+    "Creates a thread starting at label and waits until the called thread is finished.",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitExecuteReturnScript
 (
-	"waitexec",
-	EV_DEFAULT,
-	"s",
-	"script",
-	"Executes the specified script and waits until the called thread group is finished.",
-	EV_RETURN
+    "waitexec",
+    EV_DEFAULT,
+    "s",
+    "script",
+    "Executes the specified script and waits until the called thread group is finished.",
+    EV_RETURN
 );
 
 Event EV_Listener_WaitExecuteScript
 (
-	"waitexec",
-	EV_DEFAULT,
-	"s",
-	"script",
-	"Executes the specified script and waits until the called thread group is finished.",
-	EV_NORMAL
+    "waitexec",
+    EV_DEFAULT,
+    "s",
+    "script",
+    "Executes the specified script and waits until the called thread group is finished.",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitTill
 (
-	"waitTill",
-	EV_DEFAULT,
-	"s",
-	"name",
-	"Wait until event of type name",
-	EV_NORMAL
+    "waitTill",
+    EV_DEFAULT,
+    "s",
+    "name",
+    "Wait until event of type name",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitTillTimeout
 (
-	"waittill_timeout",
-	EV_DEFAULT,
-	"fs",
-	"timeout_time name",
-	"Wait until event of type name with a timeout time",
-	EV_NORMAL
+    "waittill_timeout",
+    EV_DEFAULT,
+    "fs",
+    "timeout_time name",
+    "Wait until event of type name with a timeout time",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitTillAny
 (
-	"waittill_any",
-	EV_DEFAULT,
-	"sS",
-	"name1 ...",
-	"Wait until any event of type name",
-	EV_NORMAL
+    "waittill_any",
+    EV_DEFAULT,
+    "sS",
+    "name1 ...",
+    "Wait until any event of type name",
+    EV_NORMAL
 );
 
 Event EV_Listener_WaitTillAnyTimeout
 (
-	"waittill_any_timeout",
-	EV_DEFAULT,
-	"fsS",
-	"timeout_time name1 ...",
-	"Wait until any event of type name with a timeout time",
-	EV_NORMAL
+    "waittill_any_timeout",
+    EV_DEFAULT,
+    "fsS",
+    "timeout_time name1 ...",
+    "Wait until any event of type name with a timeout time",
+    EV_NORMAL
 );
 
-eventInfo_t *lastEvent = NULL;
+CLASS_DECLARATION(Class, Listener, NULL) {
+    {&EV_Listener_CommandDelay,            &Listener::CommandDelay           },
+    {&EV_Remove,                           &Listener::Remove                 },
+    {&EV_Delete,                           &Listener::ScriptRemove           },
+    {&EV_ScriptRemove,                     &Listener::ScriptRemove           },
+    {&EV_Listener_Classname,               &Listener::GetClassname           },
+    {&EV_Listener_InheritsFrom,            &Listener::EventInheritsFrom      },
+    {&EV_Listener_IsInheritedBy,           &Listener::EventIsInheritedBy     },
 
-cvar_t	*g_showevents;
-cvar_t	*g_eventlimit;
-cvar_t	*g_timeevents;
-cvar_t	*g_watch;
-cvar_t	*g_eventstats;
+#ifdef WITH_SCRIPT_ENGINE
+    {&EV_Listener_CancelFor,               &Listener::CancelFor              },
+    {&EV_Listener_CreateReturnThread,      &Listener::CreateReturnThread     },
+    {&EV_Listener_CreateThread,            &Listener::CreateThread           },
+    {&EV_Listener_ExecuteReturnScript,     &Listener::ExecuteReturnScript    },
+    {&EV_Listener_ExecuteScript,           &Listener::ExecuteScript          },
+    {&EV_Listener_EndOn,                   &Listener::EventEndOn             },
+    {&EV_Listener_GetOwner,                &Listener::EventGetOwner          },
+    {&EV_Listener_Notify,                  &Listener::EventNotify            },
+    {&EV_DelayThrow,                       &Listener::EventDelayThrow        },
+    {&EV_Throw,                            &Listener::EventThrow             },
+    {&EV_Listener_Unregister,              &Listener::EventUnregister        },
+    {&EV_Listener_WaitCreateReturnThread,  &Listener::WaitCreateReturnThread },
+    {&EV_Listener_WaitCreateThread,        &Listener::WaitCreateThread       },
+    {&EV_Listener_WaitExecuteReturnScript, &Listener::WaitExecuteReturnScript},
+    {&EV_Listener_WaitExecuteScript,       &Listener::WaitExecuteScript      },
+    {&EV_Listener_WaitTill,                &Listener::WaitTill               },
+    {&EV_Listener_WaitTillTimeout,         &Listener::WaitTillTimeout        },
+    {&EV_Listener_WaitTillAny,             &Listener::WaitTillAny            },
+    {&EV_Listener_WaitTillAnyTimeout,      &Listener::WaitTillAnyTimeout     },
+#endif
+    {NULL,                                 NULL                              }
+};
+
+cvar_t *g_showevents;
+cvar_t *g_eventlimit;
+cvar_t *g_timeevents;
+cvar_t *g_watch;
+cvar_t *g_eventstats;
 
 template<>
-int HashCode< Event * >( Event * const& key )
+int HashCode<Event *>(Event *const& key)
 {
-	// can't use key->eventnum because eventnum will be assigned from con_set
-	return (int)(size_t)key;
+    // can't use key->eventnum because eventnum will be assigned from con_set
+    return (int)(size_t)key;
 }
 
 template<>
-int HashCode< command_t >( const command_t& key )
+int HashCode<command_t>(const command_t& key)
 {
-	return HashCode< str >( key.command );
+    const char *p;
+    int         hash = 0;
+
+    if (key.type == EV_NORMAL || key.type == EV_RETURN) {
+        for (p = key.command; *p; p++) {
+            hash = tolower(*p) + 31 * hash;
+        }
+    } else {
+        for (p = key.command; *p; p++) {
+            hash = *p + 31 * hash;
+        }
+    }
+
+    return hash;
 }
 
 #if defined(ARCHIVE_SUPPORTED)
 
-void ArchiveListenerPtr
-	(
-	Archiver& arc,
-	SafePtr< Listener > *obj
-	)
+void ArchiveListenerPtr(Archiver& arc, SafePtr<Listener> *obj)
 {
-	arc.ArchiveSafePointer( obj );
+    arc.ArchiveSafePointer(obj);
 }
 
 template<>
-void ConList::Archive
-	(
-	Archiver& arc
-	)
+void ConList::Archive(Archiver& arc)
 {
-	value.Archive( arc, ArchiveListenerPtr );
+    value.Archive(arc, ArchiveListenerPtr);
 }
 
 template<>
-void con_set< const_str, ConList >::Entry::Archive
-	(
-	Archiver& arc
-	)
+void con_set<const_str, ConList>::Entry::Archive(Archiver& arc)
 {
-	Director.ArchiveString( arc, key );
-	value.Archive( arc );
+    Director.ArchiveString(arc, key);
+    value.Archive(arc);
 }
 
 /*
@@ -402,754 +436,653 @@ void con_set< const_str, ConList >::Entry::Archive
 Archive
 =======================
 */
-void Event::Archive( Archiver &arc )
+void Event::Archive(Archiver& arc)
 {
-	if( arc.Loading() ) {
-		fromScript = false;
-	}
+    if (arc.Loading()) {
+        fromScript = false;
+    }
 
-	Class::Archive( arc );
+    Class::Archive(arc);
 
-	arc.ArchiveUnsignedShort( &eventnum );
-	arc.ArchiveUnsignedShort( &dataSize );
+    arc.ArchiveUnsignedShort(&eventnum);
+    arc.ArchiveUnsignedShort(&dataSize);
 
-	if( arc.Loading() )
-	{
-		data = new ScriptVariable[ dataSize + 1 ];
-	}
+    if (arc.Loading()) {
+        data = new ScriptVariable[dataSize + 1];
+    }
 
-	for( int i = dataSize; i > 0; i-- )
-	{
-		data[ i ].ArchiveInternal( arc );
-	}
+    for (int i = dataSize; i > 0; i--) {
+        data[i - 1].ArchiveInternal(arc);
+    }
 }
 
-void L_ArchiveEvents
-(
-	Archiver& arc
-)
+void L_ArchiveEvents(Archiver& arc)
 {
-	EventQueueNode* event;
-	int num;
+    EventQueueNode *event;
+    int             num;
 
-	num = 0;
-	for (event = Event::EventQueue.next; event != &Event::EventQueue; event = event->next)
-	{
-		Listener* obj;
+    num = 0;
+    for (event = Event::EventQueue.next; event != &Event::EventQueue; event = event->next) {
+        Listener *obj;
 
-		assert(event);
+        assert(event);
 
-		obj = event->GetSourceObject();
+        obj = event->GetSourceObject();
 
-		assert(obj);
+        assert(obj);
 
-#if defined ( GAME_DLL )
-		if (obj->isSubclassOf(Entity) &&
-			(((Entity*)obj)->flags & FL_DONTSAVE))
-		{
-			continue;
-		}
-#endif
+#    if defined(GAME_DLL)
+        if (obj->isSubclassOf(Entity) && (((Entity *)obj)->flags & FL_DONTSAVE)) {
+            continue;
+        }
+#    endif
 
-		num++;
-	}
+        num++;
+    }
 
-	arc.ArchiveInteger(&num);
-	for (event = Event::EventQueue.next; event != &Event::EventQueue; event = event->next)
-	{
-		Listener* obj;
+    arc.ArchiveInteger(&num);
+    for (event = Event::EventQueue.next; event != &Event::EventQueue; event = event->next) {
+        Listener *obj;
 
-		assert(event);
+        assert(event);
 
-		obj = event->GetSourceObject();
+        obj = event->GetSourceObject();
 
-		assert(obj);
+        assert(obj);
 
-#if defined ( GAME_DLL )
-		if (obj->isSubclassOf(Entity) &&
-			(((Entity*)obj)->flags & FL_DONTSAVE))
-		{
-			continue;
-		}
-#endif
+#    if defined(GAME_DLL)
+        if (obj->isSubclassOf(Entity) && (((Entity *)obj)->flags & FL_DONTSAVE)) {
+            continue;
+        }
+#    endif
 
-		event->event->Archive(arc);
-		arc.ArchiveInteger(&event->inttime);
-		arc.ArchiveInteger(&event->flags);
-		arc.ArchiveSafePointer(&event->m_sourceobject);
-	}
+        event->event->Archive(arc);
+        arc.ArchiveInteger(&event->inttime);
+        arc.ArchiveInteger(&event->flags);
+        arc.ArchiveSafePointer(&event->m_sourceobject);
+    }
 }
 
-void L_UnarchiveEvents
-(
-	Archiver& arc
-)
+void L_UnarchiveEvents(Archiver& arc)
 {
-	EventQueueNode* node;
-	int i, numEvents;
+    EventQueueNode *node;
+    int             i, numEvents;
 
-	// the FreeEvents list would already be allocated at this point
-	// clear out any events that may exist
-	L_ClearEventList();
+    // the FreeEvents list would already be allocated at this point
+    // clear out any events that may exist
+    L_ClearEventList();
 
-	arc.ArchiveInteger(&numEvents);
-	for (i = 0; i < numEvents; i++)
-	{
-		node = new EventQueueNode();
-		node->event = new Event();
-		node->event->Archive(arc);
+    arc.ArchiveInteger(&numEvents);
+    for (i = 0; i < numEvents; i++) {
+        node        = new EventQueueNode();
+        node->event = new Event();
+        node->event->Archive(arc);
 
-		arc.ArchiveInteger(&node->inttime);
-		arc.ArchiveInteger(&node->flags);
-		arc.ArchiveSafePointer(&node->m_sourceobject);
+        arc.ArchiveInteger(&node->inttime);
+        arc.ArchiveInteger(&node->flags);
+        arc.ArchiveSafePointer(&node->m_sourceobject);
 
-		LL_Add(&Event::EventQueue, node, next, prev);
-	}
+        LL_Add(&Event::EventQueue, node, next, prev);
+    }
 }
 #endif
 
 void L_ClearEventList()
 {
-	EventQueueNode *node = Event::EventQueue.next, *tmp;
+    EventQueueNode *node = Event::EventQueue.next, *tmp;
 
-	while( node != &Event::EventQueue )
-	{
-		tmp = node->next;
+    while (node != &Event::EventQueue) {
+        tmp = node->next;
 
-		delete node->event;
-		delete node;
+        delete node->event;
+        delete node;
 
-		node = tmp;
-	}
+        node = tmp;
+    }
 
-	LL_Reset( &Event::EventQueue, next, prev );
+    LL_Reset(&Event::EventQueue, next, prev);
 
-	Event_allocator.FreeAll();
+    Event_allocator.FreeAll();
 
-#if defined( GAME_DLL )
-	AnimationEvent_allocator.FreeAll();
-	ConsoleEvent_allocator.FreeAll();
+#if defined(GAME_DLL)
+    AnimationEvent_allocator.FreeAll();
+    ConsoleEvent_allocator.FreeAll();
 #endif
 }
 
-bool L_EventSystemStarted( void )
+bool L_EventSystemStarted(void)
 {
-	return Listener::EventSystemStarted;
+    return Listener::EventSystemStarted;
 }
 
-void L_InitEvents( void )
+void L_InitEvents(void)
 {
-	g_showevents	= LISTENER_Cvar_Get( "g_showevents", "0", 0 );
-	g_eventlimit	= LISTENER_Cvar_Get( "g_eventlimit", "5000", 0 );
-	g_timeevents	= LISTENER_Cvar_Get( "g_timeevents", "0", 0 );
-	g_watch			= LISTENER_Cvar_Get( "g_watch", "0", 0 );
-	g_eventstats	= LISTENER_Cvar_Get( "g_eventstats", "0", 0 );
+    g_showevents = LISTENER_Cvar_Get("g_showevents", "0", 0);
+    g_eventlimit = LISTENER_Cvar_Get("g_eventlimit", "5000", 0);
+    g_timeevents = LISTENER_Cvar_Get("g_timeevents", "0", 0);
+    g_watch      = LISTENER_Cvar_Get("g_watch", "0", 0);
+    g_eventstats = LISTENER_Cvar_Get("g_eventstats", "0", 0);
 
-	Event::LoadEvents();
-	ClassDef::BuildEventResponses();
+    Event::LoadEvents();
+    ClassDef::BuildEventResponses();
 
-	LL_Reset( &Event::EventQueue, next, prev );
+    LL_Reset(&Event::EventQueue, next, prev);
 
-	L_ClearEventList();
-	Listener::EventSystemStarted = true;
+    L_ClearEventList();
+    Listener::EventSystemStarted = true;
 }
 
 void L_ProcessPendingEvents()
 {
-	EventQueueNode *node;
+    EventQueueNode *node;
 
-	int t = EVENT_msec;
-	while( !LL_Empty( &Event::EventQueue, next, prev ) )
-	{
-		Listener *obj;
+    Listener::ProcessingEvents = true;
 
-		node = Event::EventQueue.next;
+    int t = EVENT_msec;
+    while (!LL_Empty(&Event::EventQueue, next, prev)) {
+        Listener *obj;
 
-		assert( node );
+        node = Event::EventQueue.next;
 
-		obj = node->GetSourceObject();
+        assert(node);
 
-		assert( obj );
+        obj = node->GetSourceObject();
 
-		if( node->inttime > t)
-		{
-			break;
-		}
+        assert(obj);
 
-		// the event is removed from its list
-		LL_Remove( node, next, prev );
-		//gi.DPrintf2("Event: %s\n", node->event->getName().c_str());
+        if (node->inttime > t) {
+            break;
+        }
 
-		// ProcessEvent will dispose of this event when it is done
-		obj->ProcessEvent( node->event );
+        // the event is removed from its list
+        LL_Remove(node, next, prev);
+        //gi.DPrintf2("Event: %s\n", node->event->getName().c_str());
 
-		delete node;
-	}
+        // ProcessEvent will dispose of this event when it is done
+        obj->ProcessEvent(node->event);
+
+        delete node;
+    }
+
+    Listener::ProcessingEvents = false;
 }
 
-void L_ShutdownEvents( void )
+void L_ShutdownEvents(void)
 {
-	if( !Listener::EventSystemStarted ) {
-		return;
-	}
+    if (!Listener::EventSystemStarted) {
+        return;
+    }
 
-	L_ClearEventList();
+    L_ClearEventList();
 
-	eventInfo_t *evi, *prev;
-	for( evi = lastEvent; evi != NULL; evi = prev )
-	{
-		prev = evi->prev;
-		free( evi );
-	}
+    Event::commandList.clear();
+    Event::eventDefList.clear();
+#ifdef WITH_SCRIPT_ENGINE
+    Event::normalCommandList.clear();
+    Event::returnCommandList.clear();
+    Event::getterCommandList.clear();
+    Event::setterCommandList.clear();
+#endif
 
-	Event::commandList.clear();
-	Event::eventDefList.clear();
-
-	Listener::EventSystemStarted = false;
+    Listener::EventSystemStarted = false;
 }
 
 //===========================================================================
 // EventArgDef
 //===========================================================================
 
-void EventArgDef::Setup( const char *eventName, const char *argName, const char *argType, const char *argRange )
+void EventArgDef::Setup(const char *eventName, const char *argName, const char *argType, const char *argRange)
 {
-	char        scratch[ 256 ];
-	const char  *ptr;
-	char        *tokptr;
-	const char  *endptr;
-	int         index;
+    char        scratch[256];
+    const char *ptr;
+    char       *tokptr;
+    const char *endptr;
+    int         index;
 
-	// set name
-	name = argName;
+    // set name
+    name = argName;
 
-	// set optionality
-	if ( isupper( argType[ 0 ] ) )
-	{
-		optional = true;
-	}
-	else
-	{
-		optional = false;
-	}
+    // set optionality
+    if (isupper(argType[0])) {
+        optional = true;
+    } else {
+        optional = false;
+    }
 
-	// grab the ranges
-	index = 0;
-	memset( minRangeDefault, true, sizeof( minRangeDefault ) );
-	memset( minRange, 0, sizeof( minRange ) );
-	memset( maxRangeDefault, true, sizeof( maxRangeDefault ) );
-	memset( maxRange, 0, sizeof( maxRange ) );
+    // grab the ranges
+    index = 0;
+    memset(minRangeDefault, true, sizeof(minRangeDefault));
+    memset(minRange, 0, sizeof(minRange));
+    memset(maxRangeDefault, true, sizeof(maxRangeDefault));
+    memset(maxRange, 0, sizeof(maxRange));
 
-	if( argRange && argRange[ 0 ] )
-	{
-		ptr = argRange;
-		while( 1 )
-		{
-			// find opening '['
-			tokptr = ( char * )strchr( ptr, '[' );
-			if( !tokptr )
-			{
-				break;
-			}
-			// find closing ']'
-			endptr = strchr( tokptr, ']' );
-			if( !endptr )
-			{
-				assert( 0 );
-				EVENT_Printf( "Argument defintion %s, no matching ']' found for range spec in event %s.\n", name.c_str(), eventName );
-				break;
-			}
-			// point to the next range
-			ptr = endptr;
-			// skip the '['
-			tokptr++;
-			// copy off the range spec
-			// skip the ']'
-			strncpy( scratch, tokptr, endptr - tokptr );
-			// terminate the range
-			scratch[ endptr - tokptr ] = 0;
-			// see if there is one or two parameters here
-			tokptr = strchr( scratch, ',' );
-			if( !tokptr )
-			{
-				// just one parameter
-				minRange[ index >> 1 ] = ( float )atof( scratch );
-				minRangeDefault[ index >> 1 ] = false;
-				index++;
-				// skip the second parameter
-				index++;
-			}
-			else if( tokptr == scratch )
-			{
-				// just second parameter
-				// skip the first paremeter
-				index++;
-				tokptr++;
-				maxRange[ index >> 1 ] = ( float )atof( scratch );
-				maxRangeDefault[ index >> 1 ] = false;
-				index++;
-			}
-			else
-			{
-				qboolean second;
-				// one or two parameters
-				// see if there is anything behind the ','
-				if( strlen( scratch ) > ( tokptr - scratch + 1 ) )
-					second = true;
-				else
-					second = false;
-				// zero out the ','
-				*tokptr = 0;
-				minRange[ index >> 1 ] = ( float )atof( scratch );
-				minRangeDefault[ index >> 1 ] = false;
-				index++;
-				// skip over the nul character
-				tokptr++;
-				if( second )
-				{
-					maxRange[ index >> 1 ] = ( float )atof( tokptr );
-					maxRangeDefault[ index >> 1 ] = false;
-				}
-				index++;
-			}
-		}
-	}
-
-	// figure out the type of variable it is
-	switch( tolower( argType[ 0 ] ) )
-	{
-	case 'e':
-		type = IS_ENTITY;
-		break;
-	case 'v':
-		type = IS_VECTOR;
-		break;
-	case 'i':
-		type = IS_INTEGER;
-		break;
-	case 'f':
-		type = IS_FLOAT;
-		break;
-	case 's':
-		type = IS_STRING;
-		break;
-	case 'b':
-		type = IS_BOOLEAN;
-		break;
-	case 'l':
-		type = IS_LISTENER;
-		break;
-	}
-}
-
-void EV_Print( FILE *stream, const char *format, ... )
-{
-	char buffer[ 1000 ];
-	va_list va;
-
-	va_start( va, format );
-
-	vsprintf( buffer, format, va );
-
-	if( stream )
-	{
-		fprintf(stream, "%s", buffer);
-	}
-	else
-	{
-		EVENT_DPrintf("%s", buffer);
-	}
-
-	va_end( va );
-}
-
-void EventArgDef::PrintRange( FILE *event_file )
-{
-	qboolean integer;
-	qboolean single;
-	int numRanges;
-	int i;
-	
-	single = false;
-	integer = true;
-	numRanges = 1;
-	switch( type )
-	{
-	case IS_VECTOR:
-		integer = false;
-		numRanges = 3;
-		break;
-	case IS_FLOAT:
-		integer = false;
-		break;
-	case IS_STRING:
-		single = true;
-		break;
-	}
-	for( i = 0; i < numRanges; i++ )
-	{
-		if ( single )
-		{
-			if ( !minRangeDefault[ i ] )
-            {
-				if ( integer )
-				{
-					EV_Print( event_file, "<%d>", ( int )minRange[ i ] );
-				}
-				else
-				{
-					EV_Print( event_file, "<%.2f>", minRange[ i ] );
-				}
+    if (argRange && argRange[0]) {
+        ptr = argRange;
+        while (1) {
+            // find opening '['
+            tokptr = (char *)strchr(ptr, '[');
+            if (!tokptr) {
+                break;
             }
-		}
-		else
-		{
-			// both non-default
-			if ( !minRangeDefault[ i ] && !maxRangeDefault[ i ] )
-            {
-				if ( integer )
-				{
-					EV_Print( event_file, "<%d...%d>", ( int )minRange[ i ], ( int )maxRange[ i ] );
-				}
-				else
-				{
-					EV_Print( event_file, "<%.2f...%.2f>", minRange[ i ], maxRange[ i ] );
-				}
+            // find closing ']'
+            endptr = strchr(tokptr, ']');
+            if (!endptr) {
+                assert(0);
+                EVENT_Printf(
+                    "Argument definition %s, no matching ']' found for range spec in event %s.\n",
+                    name.c_str(),
+                    eventName
+                );
+                break;
             }
-			// max default
-			else if ( !minRangeDefault[ i ] && maxRangeDefault[ i ] )
-            {
-				if ( integer )
-				{
-					EV_Print( event_file, "<%d...max_integer>", ( int )minRange[ i ] );
-				}
-				else
-				{
-					EV_Print( event_file, "<%.2f...max_float>", minRange[ i ] );
-				}
+            // point to the next range
+            ptr = endptr;
+            // skip the '['
+            tokptr++;
+            // copy off the range spec
+            // skip the ']'
+            strncpy(scratch, tokptr, endptr - tokptr);
+            // terminate the range
+            scratch[endptr - tokptr] = 0;
+            // see if there is one or two parameters here
+            tokptr = strchr(scratch, ',');
+            if (!tokptr) {
+                // just one parameter
+                minRange[index >> 1]        = (float)atof(scratch);
+                minRangeDefault[index >> 1] = false;
+                index++;
+                // skip the second parameter
+                index++;
+            } else if (tokptr == scratch) {
+                // just second parameter
+                // skip the first paremeter
+                index++;
+                tokptr++;
+                maxRange[index >> 1]        = (float)atof(scratch);
+                maxRangeDefault[index >> 1] = false;
+                index++;
+            } else {
+                qboolean second;
+                // one or two parameters
+                // see if there is anything behind the ','
+                if (strlen(scratch) > (tokptr - scratch + 1)) {
+                    second = true;
+                } else {
+                    second = false;
+                }
+                // zero out the ','
+                *tokptr                     = 0;
+                minRange[index >> 1]        = (float)atof(scratch);
+                minRangeDefault[index >> 1] = false;
+                index++;
+                // skip over the nul character
+                tokptr++;
+                if (second) {
+                    maxRange[index >> 1]        = (float)atof(tokptr);
+                    maxRangeDefault[index >> 1] = false;
+                }
+                index++;
             }
-			// min default
-			else if ( minRangeDefault[ i ] && !maxRangeDefault[ i ] )
-            {
-				if ( integer )
-				{
-					EV_Print( event_file, "<min_integer...%d>", ( int )maxRange[ i ] );
-				}
-				else
-				{
-					EV_Print( event_file, "<min_float...%.2f>", maxRange[ i ] );
-				}
-            }
-		}
-	}
+        }
+    }
+
+    // figure out the type of variable it is
+    switch (tolower(argType[0])) {
+    case 'e':
+        type = IS_ENTITY;
+        break;
+    case 'v':
+        type = IS_VECTOR;
+        break;
+    case 'i':
+        type = IS_INTEGER;
+        break;
+    case 'f':
+        type = IS_FLOAT;
+        break;
+    case 's':
+        type = IS_STRING;
+        break;
+    case 'b':
+        type = IS_BOOLEAN;
+        break;
+    case 'l':
+        type = IS_LISTENER;
+        break;
+    }
 }
 
-void EventArgDef::PrintArgument( FILE *event_file )
+void EV_Print(FILE *stream, const char *format, ...)
 {
-	if( optional )
-	{
-		EV_Print( event_file, "[ " );
-	}
+    char    buffer[1000];
+    va_list va;
 
-	switch( type )
-	{
-	case IS_ENTITY:
-		EV_Print( event_file, "Entity " );
-		break;
-	case IS_VECTOR:
-		EV_Print( event_file, "Vector " );
-		break;
-	case IS_INTEGER:
-		EV_Print( event_file, "Integer " );
-		break;
-	case IS_FLOAT:
-		EV_Print( event_file, "Float " );
-		break;
-	case IS_STRING:
-		EV_Print( event_file, "String " );
-		break;
-	case IS_BOOLEAN:
-		EV_Print( event_file, "Boolean " );
-		break;
-	case IS_LISTENER:
-		EV_Print( event_file, "Listener " );
-		break;
-	}
-	EV_Print( event_file, "%s", name.c_str() );
+    va_start(va, format);
 
-	PrintRange( event_file );
-	
-	if ( optional )
-	{
-		EV_Print( event_file, " ]" );
-	}
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
+
+    if (stream) {
+        fprintf(stream, "%s", buffer);
+    } else {
+        EVENT_DPrintf("%s", buffer);
+    }
+
+    va_end(va);
 }
 
-void EventDef::Error( const char *format, ... )
+void EventArgDef::PrintRange(FILE *event_file)
 {
-	char buffer[ 1000 ];
-	va_list va;
+    qboolean integer;
+    qboolean single;
+    int      numRanges;
+    int      i;
 
-	va_start( va, format );
-	vsprintf( buffer, format, va );
-	va_end( va );
-
-	EVENT_Printf( "^~^~^ Game: '%s' : %s\n", command.c_str(), buffer );
-}
-
-void EventDef::PrintDocumentation( FILE *event_file, bool html )
-{
-	int i;
-	int p;
-	str text;
-	const char *name = command.c_str();
-	
-	if ( !html )
-	{
-		text = "   ";
-		p = 0;
-		
-		if ( flags & EV_CONSOLE )
-		{
-			text[ p++ ] = '*';
-		}
-		if ( flags & EV_CHEAT )
-		{
-			text[ p++ ] = 'C';
-		}
-		if ( flags & EV_CACHE )
-		{
-			text[ p++ ] = '%';
-		}
-	}
-	
-	if ( html )
-	{
-		EV_Print( event_file, "\n<P><tt><B>%s</B>", name );
-	}
-	else
-	{
-		if ( text[ 0 ] != ' ' )
-		{
-			EV_Print( event_file, "%s %s", text.c_str(), name );
-		}
-		else
-		{
-			EV_Print( event_file, "%s %s", text.c_str(), name );
-		}
-	}
-
-	SetupDocumentation();
-
-	if ( definition )
-	{
-		if ( html )
-		{
-			EV_Print( event_file, "( <i>" );
-		}
-		else
-		{
-			EV_Print( event_file, "( " );
-		}
-
-		for( i = 1; i <= definition->NumObjects(); i++ )
-		{
-			definition->ObjectAt( i ).PrintArgument( event_file );
-
-			if ( i < definition->NumObjects() )
-            {
-				EV_Print( event_file, ", " );
+    single    = false;
+    integer   = true;
+    numRanges = 1;
+    switch (type) {
+    case IS_VECTOR:
+        integer   = false;
+        numRanges = 3;
+        break;
+    case IS_FLOAT:
+        integer = false;
+        break;
+    case IS_STRING:
+        single = true;
+        break;
+    }
+    for (i = 0; i < numRanges; i++) {
+        if (single) {
+            if (!minRangeDefault[i]) {
+                if (integer) {
+                    EV_Print(event_file, "<%d>", (int)minRange[i]);
+                } else {
+                    EV_Print(event_file, "<%.2f>", minRange[i]);
+                }
             }
-		}
-
-		if ( html )
-		{
-			EV_Print( event_file, " </i>)</tt><BR>\n" );
-		}
-		else
-		{
-			EV_Print( event_file, " )\n" );
-		}
-
-		DeleteDocumentation();
-	}
-	else
-	{
-		if ( html )
-		{
-			EV_Print( event_file, "</tt><BR>\n" );
-		}
-		else
-		{
-			EV_Print( event_file, "\n" );
-		}
-	}
-
-	if ( documentation )
-	{
-		char new_doc[ 1024 ];
-		int old_index;
-		int new_index = 0;
-		
-		for( old_index = 0; old_index < strlen( documentation ); old_index++ )
-		{
-			if( documentation[ old_index ] == '\n' )
-			{
-				if ( html )
-				{
-					new_doc[ new_index ]		= '<';
-					new_doc[ new_index + 1 ]	= 'B';
-					new_doc[ new_index + 2 ]	= 'R';
-					new_doc[ new_index + 3 ]	= '>';
-					new_doc[ new_index + 4 ]	= '\n';
-					new_index += 5;
-				}
-				else
-				{
-					new_doc[ new_index ]		= '\n';
-					new_doc[ new_index + 1 ]	= '\t';
-					new_doc[ new_index + 2 ]	= '\t';
-					new_index += 3;
-				}
-			}
-			else
-			{
-				new_doc[ new_index ] = documentation[ old_index ];
-				new_index++;
-			}
-			
-		}
-		
-		new_doc[ new_index ] = 0;
-		
-		if ( html )
-		{
-			EV_Print( event_file, "<ul>%s</ul>\n", new_doc );
-		}
-		else
-		{
-			EV_Print( event_file, "\t\t- %s\n", new_doc );
-		}
-	}
-}
-
-void EventDef::PrintEventDocumentation( FILE *event_file, bool html )
-{
-	if( flags & EV_CODEONLY ) {
-		return;
-	}
-
-	// purposely suppressed
-	if( command[ 0 ] == '_' )
-	{
-		return;
-	}
-
-	PrintDocumentation( event_file, html );
-}
-
-void EventDef::DeleteDocumentation( void )
-{
-	if( formatspec )
-	{
-		if( argument_names )
-		{
-			definition->FreeObjectList();
-
-			delete definition;
-			definition = NULL;
-		}
-	}
-}
-
-void EventDef::SetupDocumentation( void )
-{
-	const char *name = command.c_str();
-
-	// setup documentation
-	if ( formatspec )
-	{
-		if ( argument_names )
-		{
-			char        argumentNames[ 256 ];
-			str         argSpec;
-			str         rangeSpec;
-			str         argName;
-			EventArgDef argDef;
-			const char  *namePtr;
-			const char  *specPtr;
-			size_t       specLength;
-			int          index;
-			Container<str> argNames;
-			
-			specLength = strlen( formatspec );
-			specPtr = formatspec;
-			//
-			// store off all the names
-			//
-			strcpy( argumentNames, argument_names );
-			namePtr = strtok( argumentNames, " " );
-			while ( namePtr != NULL )
-            {
-				argNames.AddObject( str( namePtr ) );
-				namePtr = strtok( NULL, " " );
+        } else {
+            // both non-default
+            if (!minRangeDefault[i] && !maxRangeDefault[i]) {
+                if (integer) {
+                    EV_Print(event_file, "<%d...%d>", (int)minRange[i], (int)maxRange[i]);
+                } else {
+                    EV_Print(event_file, "<%.2f...%.2f>", minRange[i], maxRange[i]);
+                }
             }
-			
-			index = 0;
-			
-			//
-			// create the definition container
-			//
-			definition = new Container<EventArgDef>;
-			definition->Resize( argNames.NumObjects() );
-			
-			// go throught he formatspec
-			while( specLength )
-            {
-				// clear the rangeSpec
-				rangeSpec = "";
-				// get the argSpec
-				argSpec = "";
-				argSpec += *specPtr;
-				specPtr++;
-				specLength--;
-				// see if there is a range specified
-				while ( *specPtr == '[' )
-				{
-					// add in all the characters until NULL or ']'
-					while( specLength && ( *specPtr != ']' ) )
-					{
-						rangeSpec += *specPtr;
-						specPtr++;
-						specLength--;
-					}
-					if ( specLength && ( *specPtr == ']' ) )
-					{
-						rangeSpec += *specPtr;
-						specPtr++;
-						specLength--;
-					}
-				}
-				if ( index < argNames.NumObjects() )
-				{
-					argName = argNames.ObjectAt( index + 1 );
-					argDef.Setup( name, argName, argSpec, rangeSpec );
-					definition->AddObject( argDef );
-				}
-				else
-				{
-					assert( 0 );
-					Error( "More format specifiers than argument names for event %s\n", name );
-				}
-				index++;
+            // max default
+            else if (!minRangeDefault[i] && maxRangeDefault[i]) {
+                if (integer) {
+                    EV_Print(event_file, "<%d...max_integer>", (int)minRange[i]);
+                } else {
+                    EV_Print(event_file, "<%.2f...max_float>", minRange[i]);
+                }
             }
-			if ( index < argNames.NumObjects() )
-            {
-				assert( 0 );
-				Error( "More argument names than format specifiers for event %s\n", name );
-			}
-		}
-	}
+            // min default
+            else if (minRangeDefault[i] && !maxRangeDefault[i]) {
+                if (integer) {
+                    EV_Print(event_file, "<min_integer...%d>", (int)maxRange[i]);
+                } else {
+                    EV_Print(event_file, "<min_float...%.2f>", maxRange[i]);
+                }
+            }
+        }
+    }
+}
+
+void EventArgDef::PrintArgument(FILE *event_file)
+{
+    if (optional) {
+        EV_Print(event_file, "[ ");
+    }
+
+    switch (type) {
+    case IS_ENTITY:
+        EV_Print(event_file, "Entity ");
+        break;
+    case IS_VECTOR:
+        EV_Print(event_file, "Vector ");
+        break;
+    case IS_INTEGER:
+        EV_Print(event_file, "Integer ");
+        break;
+    case IS_FLOAT:
+        EV_Print(event_file, "Float ");
+        break;
+    case IS_STRING:
+        EV_Print(event_file, "String ");
+        break;
+    case IS_BOOLEAN:
+        EV_Print(event_file, "Boolean ");
+        break;
+    case IS_LISTENER:
+        EV_Print(event_file, "Listener ");
+        break;
+    }
+    EV_Print(event_file, "%s", name.c_str());
+
+    PrintRange(event_file);
+
+    if (optional) {
+        EV_Print(event_file, " ]");
+    }
+}
+
+void EventDef::Error(const char *format, ...)
+{
+    char    buffer[1000];
+    va_list va;
+
+    va_start(va, format);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
+    va_end(va);
+
+    EVENT_Printf("^~^~^ Game: '%s' : %s\n", command.c_str(), buffer);
+}
+
+void EventDef::PrintDocumentation(FILE *event_file, bool html)
+{
+    int         i;
+    int         p;
+    str         text;
+    const char *name = command.c_str();
+
+    if (!html) {
+        text = "   ";
+        p    = 0;
+
+        if (flags & EV_CONSOLE) {
+            text[p++] = '*';
+        }
+        if (flags & EV_CHEAT) {
+            text[p++] = 'C';
+        }
+        if (flags & EV_CACHE) {
+            text[p++] = '%';
+        }
+    }
+
+    if (html) {
+        EV_Print(event_file, "\n<P><tt><B>%s</B>", name);
+    } else {
+        if (text[0] != ' ') {
+            EV_Print(event_file, "%s %s", text.c_str(), name);
+        } else {
+            EV_Print(event_file, "%s %s", text.c_str(), name);
+        }
+    }
+
+    SetupDocumentation();
+
+    if (definition) {
+        if (html) {
+            EV_Print(event_file, "( <i>");
+        } else {
+            EV_Print(event_file, "( ");
+        }
+
+        for (i = 1; i <= definition->NumObjects(); i++) {
+            definition->ObjectAt(i).PrintArgument(event_file);
+
+            if (i < definition->NumObjects()) {
+                EV_Print(event_file, ", ");
+            }
+        }
+
+        if (html) {
+            EV_Print(event_file, " </i>)</tt><BR>\n");
+        } else {
+            EV_Print(event_file, " )\n");
+        }
+
+        DeleteDocumentation();
+    } else {
+        if (html) {
+            EV_Print(event_file, "</tt><BR>\n");
+        } else {
+            EV_Print(event_file, "\n");
+        }
+    }
+
+    if (documentation) {
+        char new_doc[1024];
+        int  old_index;
+        int  new_index = 0;
+
+        for (old_index = 0; old_index < strlen(documentation); old_index++) {
+            if (documentation[old_index] == '\n') {
+                if (html) {
+                    new_doc[new_index]     = '<';
+                    new_doc[new_index + 1] = 'B';
+                    new_doc[new_index + 2] = 'R';
+                    new_doc[new_index + 3] = '>';
+                    new_doc[new_index + 4] = '\n';
+                    new_index += 5;
+                } else {
+                    new_doc[new_index]     = '\n';
+                    new_doc[new_index + 1] = '\t';
+                    new_doc[new_index + 2] = '\t';
+                    new_index += 3;
+                }
+            } else {
+                new_doc[new_index] = documentation[old_index];
+                new_index++;
+            }
+        }
+
+        new_doc[new_index] = 0;
+
+        if (html) {
+            EV_Print(event_file, "<ul>%s</ul>\n", new_doc);
+        } else {
+            EV_Print(event_file, "\t\t- %s\n", new_doc);
+        }
+    }
+}
+
+void EventDef::PrintEventDocumentation(FILE *event_file, bool html)
+{
+    if (flags & EV_CODEONLY) {
+        return;
+    }
+
+    // purposely suppressed
+    if (command[0] == '_') {
+        return;
+    }
+
+    PrintDocumentation(event_file, html);
+}
+
+void EventDef::DeleteDocumentation(void)
+{
+    if (formatspec) {
+        if (argument_names) {
+            definition->FreeObjectList();
+
+            delete definition;
+            definition = NULL;
+        }
+    }
+}
+
+void EventDef::SetupDocumentation(void)
+{
+    const char *name = command.c_str();
+
+    // setup documentation
+    if (formatspec) {
+        if (argument_names) {
+            char           argumentNames[256];
+            str            argSpec;
+            str            rangeSpec;
+            str            argName;
+            EventArgDef    argDef;
+            const char    *namePtr;
+            const char    *specPtr;
+            size_t         specLength;
+            int            index;
+            Container<str> argNames;
+
+            specLength = strlen(formatspec);
+            specPtr    = formatspec;
+            //
+            // store off all the names
+            //
+            Q_strncpyz(argumentNames, argument_names, sizeof(argumentNames));
+            namePtr = strtok(argumentNames, " ");
+            while (namePtr != NULL) {
+                argNames.AddObject(str(namePtr));
+                namePtr = strtok(NULL, " ");
+            }
+
+            index = 0;
+
+            //
+            // create the definition container
+            //
+            definition = new Container<EventArgDef>;
+            definition->Resize(argNames.NumObjects());
+
+            // go throught he formatspec
+            while (specLength) {
+                // clear the rangeSpec
+                rangeSpec = "";
+                // get the argSpec
+                argSpec = "";
+                argSpec += *specPtr;
+                specPtr++;
+                specLength--;
+                // see if there is a range specified
+                while (*specPtr == '[') {
+                    // add in all the characters until NULL or ']'
+                    while (specLength && (*specPtr != ']')) {
+                        rangeSpec += *specPtr;
+                        specPtr++;
+                        specLength--;
+                    }
+                    if (specLength && (*specPtr == ']')) {
+                        rangeSpec += *specPtr;
+                        specPtr++;
+                        specLength--;
+                    }
+                }
+                if (index < argNames.NumObjects()) {
+                    argName = argNames.ObjectAt(index + 1);
+                    argDef.Setup(name, argName, argSpec, rangeSpec);
+                    definition->AddObject(argDef);
+                } else {
+                    assert(0);
+                    Error("More format specifiers than argument names for event %s\n", name);
+                }
+                index++;
+            }
+            if (index < argNames.NumObjects()) {
+                assert(0);
+                Error("More argument names than format specifiers for event %s\n", name);
+            }
+        }
+    }
 }
 
 //====================================
@@ -1158,9 +1091,8 @@ void EventDef::SetupDocumentation( void )
 
 MEM_BlockAlloc<Event> Event_allocator;
 
-CLASS_DECLARATION( Class, Event, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(Class, Event, NULL) {
+    {NULL, NULL}
 };
 
 #ifndef _DEBUG_MEM
@@ -1170,9 +1102,9 @@ CLASS_DECLARATION( Class, Event, NULL )
 new Event
 =======================
 */
-void *Event::operator new( size_t size )
+void *Event::operator new(size_t size)
 {
-	return Event_allocator.Alloc();
+    return Event_allocator.Alloc();
 }
 
 /*
@@ -1180,9 +1112,9 @@ void *Event::operator new( size_t size )
 delete ptr
 =======================
 */
-void Event::operator delete( void *ptr )
+void Event::operator delete(void *ptr)
 {
-	Event_allocator.Free( ptr );
+    Event_allocator.Free(ptr);
 }
 
 #endif
@@ -1192,15 +1124,10 @@ void Event::operator delete( void *ptr )
 FindEventNum
 =======================
 */
-unsigned int Event::FindEventNum( str s )
+unsigned int Event::FindEventNum(const char *s)
 {
-	command_t cmd;
-
-	cmd.command = s;
-	cmd.flags = 0;
-	cmd.type = -1;
-
-	return commandList.findKeyIndex( cmd );
+    command_t cmd(s, EV_NORMAL);
+    return commandList.findKeyIndex(cmd);
 }
 
 /*
@@ -1212,7 +1139,7 @@ Number of total events
 */
 int Event::NumEventCommands()
 {
-	return totalevents;
+    return commandList.size() + 1;
 }
 
 /*
@@ -1222,83 +1149,75 @@ ListCommands
 List event commands
 =======================
 */
-void Event::ListCommands
-	(
-	const char *mask
-	)
+void Event::ListCommands(const char *mask)
 {
-	command_t *command;
-	int eventnum;
-	int num;
-	int i;
-	int n;
-	size_t l;
-	int p;
-	int hidden;
-	str text;
-	Container< int > *sortedList;
+    command_t      *command;
+    int             eventnum;
+    int             num;
+    int             i;
+    int             n;
+    size_t          l;
+    int             p;
+    int             hidden;
+    str             text;
+    Container<int> *sortedList;
 
-	if ( !commandList.size() )
-	{
-		EVENT_DPrintf( "No events.\n" );
-		return;
-	}
+    if (!commandList.size()) {
+        EVENT_DPrintf("No events.\n");
+        return;
+    }
 
-	sortedList = &ClassDef::sortedList;
-	SortEventList( sortedList );
+    sortedList = &ClassDef::sortedList;
+    SortEventList(sortedList);
 
-	l = 0;
-	if ( mask )
-	{
-		l = strlen( mask );
-	}
+    l = 0;
+    if (mask) {
+        l = strlen(mask);
+    }
 
-	hidden = 0;
-	num = 0;
-	n = sortedList->NumObjects();
-	for( i = 1; i <= n; i++ )
-	{
-		eventnum = sortedList->ObjectAt( i );
-		command = &commandList[ eventnum ];
+    hidden = 0;
+    num    = 0;
+    n      = sortedList->NumObjects();
+    for (i = 1; i <= n; i++) {
+        eventnum = sortedList->ObjectAt(i);
+        command  = &commandList[eventnum];
 
-		if ( command->flags & EV_CODEONLY )
-		{
-			hidden++;
-			continue;
-		}
+        if (command->flags & EV_CODEONLY) {
+            hidden++;
+            continue;
+        }
 
-		if ( mask && Q_stricmpn( command->command.c_str(), mask, l ) )
-		{
-			continue;
-		}
+        if (mask && Q_stricmpn(command->command, mask, l)) {
+            continue;
+        }
 
-		num++;
+        num++;
 
-		text = "   ";
-		p = 0;
-		if( command->flags & EV_CONSOLE )
-		{
-			text[ p++ ] = '*';
-		}
-		if( command->flags & EV_CHEAT )
-		{
-			text[ p++ ] = 'C';
-		}
-		if( command->flags & EV_CACHE )
-		{
-			text[ p++ ] = '%';
-		}
+        text = "   ";
+        p    = 0;
+        if (command->flags & EV_CONSOLE) {
+            text[p++] = '*';
+        }
+        if (command->flags & EV_CHEAT) {
+            text[p++] = 'C';
+        }
+        if (command->flags & EV_CACHE) {
+            text[p++] = '%';
+        }
 
-		EVENT_Printf( "%4d : %s%s\n", eventnum, text.c_str(), command->command.c_str() );
-	}
+        EVENT_Printf("%4d : %s%s\n", eventnum, text.c_str(), command->command);
+    }
 
-	EVENT_Printf( "\n* = console command.\nC = cheat command.\n%% = cache command.\n\n"
-		"Printed %d of %d total commands.\n", num, n - hidden );
+    EVENT_Printf(
+        "\n* = console command.\nC = cheat command.\n%% = cache command.\n\n"
+        "Printed %d of %d total commands.\n",
+        num,
+        n - hidden
+    );
 
-	if ( developer->integer && hidden )
-	{
-		EVENT_Printf( "Suppressed %d commands.\n", hidden );
-	}
+    if (developer->integer && hidden) {
+        EVENT_Printf("Suppressed %d commands.\n", hidden);
+    }
 }
 
 /*
@@ -1308,85 +1227,80 @@ ListDocumentation
 List event documentation
 =======================
 */
-void Event::ListDocumentation
-	(
-	const char *mask,
-	qboolean print_to_disk
-	)
+void Event::ListDocumentation(const char *mask, qboolean print_to_disk)
 {
-	int num;
-	int n;
-	size_t l;
-	int flags;
-	int hidden;
-	str name;
-	str text;
-	FILE *event_file = NULL;
-	str event_filename;
-	con_map_enum< Event *, EventDef > en = eventDefList;
-	EventDef *def;
+    int                             num;
+    int                             n;
+    size_t                          l;
+    int                             flags;
+    int                             hidden;
+    str                             name;
+    str                             text;
+    FILE                           *event_file = NULL;
+    str                             event_filename;
+    con_map_enum<Event *, EventDef> en = eventDefList;
+    EventDef                       *def;
 
-	if ( print_to_disk )
-	{
-		if ( !mask || !mask[0] )
-			event_filename = EVENT_FILENAME;
-		else
-			event_filename = str ( mask ) + ".txt";
+    if (print_to_disk) {
+        if (!mask || !mask[0]) {
+            event_filename = EVENT_FILENAME;
+        } else {
+            event_filename = str(mask) + ".txt";
+        }
 
-		event_file = fopen( event_filename.c_str(), "w" );
+        event_file = fopen(event_filename.c_str(), "w");
 
-		if ( event_file == NULL )
-			return;
-	}
+        if (event_file == NULL) {
+            return;
+        }
+    }
 
-	l = 0;
-	if ( mask )
-	{
-		l = strlen( mask );
-	}
+    l = 0;
+    if (mask) {
+        l = strlen(mask);
+    }
 
+    EV_Print(event_file, "\nCommand Documentation\n");
+    EV_Print(event_file, "=====================\n");
 
-	EV_Print( event_file, "\nCommand Documentation\n" );
-	EV_Print( event_file, "=====================\n" );
+    hidden = 0;
+    num    = 0;
+    n      = 0;
+    for (def = en.NextValue(); def != NULL; def = en.NextValue()) {
+        flags = def->flags;
+        name  = def->command;
+        n++;
 
-	hidden = 0;
-	num = 0;
-	n = 0;
-	for( def = en.NextValue(); def != NULL; def = en.NextValue() )
-	{
-		flags = def->flags;
-		name = def->command;
-		n++;
+        if (flags & EV_CODEONLY) {
+            hidden++;
+            continue;
+        }
 
-		if( flags & EV_CODEONLY )
-		{
-			hidden++;
-			continue;
-		}
+        if (mask && Q_stricmpn(name, mask, l)) {
+            continue;
+        }
 
-		if( mask && Q_stricmpn( name, mask, l ) )
-		{
-			continue;
-		}
+        num++;
 
-		num++;
+        def->PrintDocumentation(event_file, qfalse);
+    }
 
-		def->PrintDocumentation( event_file, qfalse );
-	}
+    EV_Print(
+        event_file,
+        "\n* = console command.\nC = cheat command.\n% = cache command.\n\n"
+        "Printed %d of %d total commands.\n",
+        num,
+        n - hidden
+    );
 
-	EV_Print( event_file, "\n* = console command.\nC = cheat command.\n% = cache command.\n\n"
-		"Printed %d of %d total commands.\n", num, n - hidden );
+    if (developer->integer && hidden) {
+        EV_Print(event_file, "Suppressed %d commands.\n", hidden);
+    }
 
-	if ( developer->integer && hidden )
-	{
-		EV_Print( event_file, "Suppressed %d commands.\n", hidden );
-	}
-
-	if ( event_file != NULL )
-	{
-		EVENT_Printf( "Printed event info to file %s\n", event_filename.c_str() );
-		fclose( event_file );
-	}
+    if (event_file != NULL) {
+        EVENT_Printf("Printed event info to file %s\n", event_filename.c_str());
+        fclose(event_file);
+    }
 }
 
 /*
@@ -1396,37 +1310,36 @@ PendingEvents
 List pending events
 =======================
 */
-void Event::PendingEvents
-	(
-	const char *mask
-	)
+void Event::PendingEvents(const char *mask)
 {
-	EventQueueNode *event;
-	size_t l;
-	int num;
+    EventQueueNode *event;
+    size_t          l;
+    int             num;
 
-	l = 0;
-	if ( mask )
-	{
-		l = strlen( mask );
-	}
+    l = 0;
+    if (mask) {
+        l = strlen(mask);
+    }
 
-	num = 0;
-	event = EventQueue.next;
-	while( event != &EventQueue )
-	{
-		assert( event );
-		assert( event->m_sourceobject );
+    num   = 0;
+    event = EventQueue.next;
+    while (event != &EventQueue) {
+        assert(event);
+        assert(event->m_sourceobject);
 
-		if ( !mask || !Q_stricmpn( event->event->getName().c_str(), mask, l ) )
-		{
-			num++;
-			//Event::PrintEvent( event );
-		}
+        if (!mask || !Q_stricmpn(event->event->getName(), mask, l)) {
+            num++;
+            //Event::PrintEvent( event );
+        }
 
-		event = event->next;
-	}
-	EVENT_Printf( "%d pending events as of %.2f\n", num, EVENT_time );
+        event = event->next;
+    }
+    EVENT_Printf("%d pending events as of %.2f\n", num, EVENT_time);
+}
+
+bool Event::Exists(const char *command)
+{
+    return FindEventNum(command) != 0;
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -1436,17 +1349,14 @@ void Event::PendingEvents
 FindNormalEventNum
 =======================
 */
-unsigned int Event::FindNormalEventNum( const_str s )
+unsigned int Event::FindNormalEventNum(const_str s)
 {
-	unsigned int *eventnum = normalCommandList.find( s );
-	if( eventnum )
-	{
-		return *eventnum;
-	}
-	else
-	{
-		return 0;
-	}
+    unsigned int *eventnum = normalCommandList.find(s);
+    if (eventnum) {
+        return *eventnum;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -1456,17 +1366,14 @@ FindReturnEventNum
 Finds an event that return a value
 =======================
 */
-unsigned int Event::FindReturnEventNum( const_str s )
+unsigned int Event::FindReturnEventNum(const_str s)
 {
-	unsigned int *eventnum = returnCommandList.find( s );
-	if( eventnum )
-	{
-		return *eventnum;
-	}
-	else
-	{
-		return 0;
-	}
+    unsigned int *eventnum = returnCommandList.find(s);
+    if (eventnum) {
+        return *eventnum;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -1476,17 +1383,14 @@ FindSetterEventNum
 Finds an event that act as a write-variable
 =======================
 */
-unsigned int Event::FindSetterEventNum( const_str s )
+unsigned int Event::FindSetterEventNum(const_str s)
 {
-	unsigned int *eventnum = setterCommandList.find( s );
-	if( eventnum )
-	{
-		return *eventnum;
-	}
-	else
-	{
-		return 0;
-	}
+    unsigned int *eventnum = setterCommandList.find(s);
+    if (eventnum) {
+        return *eventnum;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -1496,17 +1400,14 @@ FindGetterEventNum
 Finds an event that act as a read-variable
 =======================
 */
-unsigned int Event::FindGetterEventNum( const_str s )
+unsigned int Event::FindGetterEventNum(const_str s)
 {
-	unsigned int *eventnum = getterCommandList.find( s );
-	if( eventnum )
-	{
-		return *eventnum;
-	}
-	else
-	{
-		return 0;
-	}
+    unsigned int *eventnum = getterCommandList.find(s);
+    if (eventnum) {
+        return *eventnum;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -1514,10 +1415,10 @@ unsigned int Event::FindGetterEventNum( const_str s )
 FindNormalEventNum
 =======================
 */
-unsigned int Event::FindNormalEventNum( str s )
+unsigned int Event::FindNormalEventNum(str s)
 {
-	s.tolower();
-	return FindNormalEventNum( Director.AddString( s ) );
+    s.tolower();
+    return FindNormalEventNum(Director.AddString(s));
 }
 
 /*
@@ -1525,10 +1426,10 @@ unsigned int Event::FindNormalEventNum( str s )
 FindReturnEventNum
 =======================
 */
-unsigned int Event::FindReturnEventNum( str s )
+unsigned int Event::FindReturnEventNum(str s)
 {
-	s.tolower();
-	return FindReturnEventNum( Director.AddString( s ) );
+    s.tolower();
+    return FindReturnEventNum(Director.AddString(s));
 }
 
 /*
@@ -1536,10 +1437,9 @@ unsigned int Event::FindReturnEventNum( str s )
 FindSetterEventNum
 =======================
 */
-unsigned int Event::FindSetterEventNum( str s )
+unsigned int Event::FindSetterEventNum(str s)
 {
-	s.tolower();
-	return FindSetterEventNum( Director.AddString( s ) );
+    return FindSetterEventNum(Director.AddString(s));
 }
 
 /*
@@ -1547,10 +1447,9 @@ unsigned int Event::FindSetterEventNum( str s )
 FindGetterEventNum
 =======================
 */
-unsigned int Event::FindGetterEventNum( str s )
+unsigned int Event::FindGetterEventNum(str s)
 {
-	s.tolower();
-	return FindGetterEventNum( Director.AddString( s ) );
+    return FindGetterEventNum(Director.AddString(s));
 }
 
 /*
@@ -1560,44 +1459,32 @@ GetEventWithFlags
 Returns an event that match the specified flags and the specified type
 =======================
 */
-int Event::GetEventWithFlags( str name, int flags, uchar type )
+int Event::GetEventWithFlags(str name, int flags, uchar type)
 {
-	unsigned int *index;
-	con_map< const_str, unsigned int > *cmdList;
+    unsigned int                     *index;
+    con_map<const_str, unsigned int> *cmdList;
 
-	if( type == EV_NORMAL )
-	{
-		cmdList = &normalCommandList;
-	}
-	else if( type == EV_RETURN )
-	{
-		cmdList = &returnCommandList;
-	}
-	else if( type == EV_GETTER )
-	{
-		cmdList = &getterCommandList;
-	}
-	else if( type == EV_SETTER )
-	{
-		cmdList = &setterCommandList;
-	}
-	else
-	{
-		return 0;
-	}
+    if (type == EV_NORMAL) {
+        name.tolower();
+        cmdList = &normalCommandList;
+    } else if (type == EV_RETURN) {
+        name.tolower();
+        cmdList = &returnCommandList;
+    } else if (type == EV_GETTER) {
+        cmdList = &getterCommandList;
+    } else if (type == EV_SETTER) {
+        cmdList = &setterCommandList;
+    } else {
+        return 0;
+    }
 
-	name.tolower();
+    index = cmdList->find(Director.GetString(name));
 
-	index = cmdList->find( Director.GetString( name ) );
-
-	if( !index || !( GetEventFlags( *index ) & flags ) )
-	{
-		return 0;
-	}
-	else
-	{
-		return *index;
-	}
+    if (!index || !(GetEventFlags(*index) & flags)) {
+        return 0;
+    } else {
+        return *index;
+    }
 }
 
 /*
@@ -1605,16 +1492,16 @@ int Event::GetEventWithFlags( str name, int flags, uchar type )
 GetEvent
 =======================
 */
-int Event::GetEvent( str name, uchar type )
+int Event::GetEvent(str name, uchar type)
 {
-	return GetEventWithFlags( name, EV_DEFAULT, type );
+    return GetEventWithFlags(name, EV_DEFAULT, type);
 }
 
 #else
 
-int Event::GetEvent( str name, uchar type )
+int Event::GetEvent(str name, uchar type)
 {
-	return FindEventNum( name );
+    return FindEventNum(name);
 }
 
 #endif
@@ -1626,9 +1513,9 @@ static str str_null;
 GetEventInfo
 =======================
 */
-command_t *Event::GetEventInfo( int eventnum )
+command_t *Event::GetEventInfo(int eventnum)
 {
-	return &commandList[ eventnum ];
+    return &commandList[eventnum];
 }
 
 /*
@@ -1638,20 +1525,17 @@ GetEventFlags
 Returns the specified event flags
 =======================
 */
-int Event::GetEventFlags( int eventnum )
+int Event::GetEventFlags(int eventnum)
 {
-	command_t *cmd = &commandList[ eventnum ];
+    command_t *cmd = &commandList[eventnum];
 
-	if( cmd )
-	{
-		return cmd->flags;
-	}
-	else
-	{
-		return 0;
-	}
+    if (cmd) {
+        return cmd->flags;
+    } else {
+        return 0;
+    }
 
-	return 0;
+    return 0;
 }
 
 /*
@@ -1661,26 +1545,23 @@ GetEventName
 Returns the specified event name
 =======================
 */
-str& Event::GetEventName( int eventnum )
+const char *Event::GetEventName(int eventnum)
 {
-	command_t *cmd;
+    command_t *cmd;
 
-	if( eventnum <= 0 ) {
-		return str_null;
-	}
+    if (eventnum <= 0) {
+        return str_null;
+    }
 
-	cmd = &commandList[ eventnum ];
+    cmd = &commandList[eventnum];
 
-	if( cmd )
-	{
-		return cmd->command;
-	}
-	else
-	{
-		return str_null;
-	}
+    if (cmd) {
+        return cmd->command;
+    } else {
+        return str_null;
+    }
 
-	return str_null;
+    return str_null;
 }
 
 /*
@@ -1688,14 +1569,14 @@ str& Event::GetEventName( int eventnum )
 compareEvents
 =======================
 */
-int Event::compareEvents( const void *arg1, const void *arg2 )
+int Event::compareEvents(const void *arg1, const void *arg2)
 {
-	int num1 = *( int * )arg1;
-	int num2 = *( int * )arg2;
-	command_t *cmd1 = &commandList[ num1 ];
-	command_t *cmd2 = &commandList[ num2 ];
+    int        num1 = *(int *)arg1;
+    int        num2 = *(int *)arg2;
+    command_t *cmd1 = &commandList[num1];
+    command_t *cmd2 = &commandList[num2];
 
-	return Q_stricmp( cmd1->command.c_str(), cmd2->command.c_str() );
+    return Q_stricmp(cmd1->command, cmd2->command);
 }
 
 /*
@@ -1705,26 +1586,22 @@ SortEventList
 Sort events in alphabetical order
 =======================
 */
-void Event::SortEventList( Container< int > *sortedList )
+void Event::SortEventList(Container<int> *sortedList)
 {
-	unsigned int i;
-	command_t *cmd;
+    unsigned int i;
+    command_t   *cmd;
 
-	sortedList->Resize( commandList.size() );
+    sortedList->Resize(commandList.size());
 
-	for( i = 1; i <= commandList.size(); i++ )
-	{
-		cmd = &commandList[ i ];
+    for (i = 1; i <= commandList.size(); i++) {
+        cmd = &commandList[i];
 
-		if( cmd != NULL )
-		{
-			sortedList->AddObject( i );
-		}
-	}
+        if (cmd != NULL) {
+            sortedList->AddObject(i);
+        }
+    }
 
-	qsort( ( void * )sortedList->AddressOfObjectAt( 1 ),
-		( size_t )sortedList->NumObjects(),
-		sizeof( int ), compareEvents );
+    qsort((void *)sortedList->AddressOfObjectAt(1), (size_t)sortedList->NumObjects(), sizeof(int), compareEvents);
 }
 
 /*
@@ -1736,111 +1613,32 @@ Event loader routine
 */
 void Event::LoadEvents()
 {
-	eventInfo_t *evi = lastEvent;
-	str lower;
-	EventDef *cmd;
-	int index;
-	command_t c;
-	command_t *i;
-	con_arrayset<command_t, command_t>::Entry *entry;
-	con_arrayset_enum< command_t, command_t > en;
+    command_t c;
+    DataNode *next;
 
-	while( evi )
-	{
-		cmd = &eventDefList[ evi->ev ];
+    for (; DataNodeList; DataNodeList = next) {
+        next = DataNodeList->next;
 
-		cmd->command = evi->command;
-		cmd->flags = ( ( evi->flags == EV_DEFAULT ) - 1 ) & evi->flags;
-		cmd->formatspec = evi->formatspec;
-		cmd->argument_names = evi->argument_names;
-		cmd->documentation = evi->documentation;
-		cmd->type = evi->type;
+        EventDef *cmd = &eventDefList[DataNodeList->ev];
 
+        cmd->command        = DataNodeList->command;
+        cmd->flags          = ((DataNodeList->flags == EV_DEFAULT) - 1) & DataNodeList->flags;
+        cmd->formatspec     = DataNodeList->formatspec;
+        cmd->argument_names = DataNodeList->argument_names;
+        cmd->documentation  = DataNodeList->documentation;
+        cmd->type           = DataNodeList->type;
+
+        c.command = DataNodeList->command;
+        c.flags   = DataNodeList->flags;
+        c.type    = cmd->type;
+
+        DataNodeList->ev->eventnum = commandList.addKeyIndex(c);
 #ifdef _DEBUG
-		evi->ev->name = evi->command;
+        DataNodeList->ev->name = DataNodeList->command;
 #endif
 
-		lower = str( evi->command );
-		lower.tolower();
-
-		en = commandList;
-
-		index = 0;
-
-		for( entry = en.NextElement(); entry != NULL; entry = en.NextElement() )
-		{
-			i = &entry->value;
-
-			if( i->command == lower && i->type == cmd->type )
-			{
-				index = entry->index;
-				break;
-			}
-		}
-
-		if( !index )
-		{
-			c.command = lower;
-			c.flags = evi->flags;
-			c.type = cmd->type;
-
-			index = commandList.addKeyIndex( c );
-		}
-
-		evi->ev->eventnum = index;
-
-		evi = ( eventInfo_t * )evi->prev;
-
-		totalevents++;
-	}
-}
-
-/*
-=======================
-Event
-
-Creates an event command
-=======================
-*/
-Event::Event
-	(
-		const char *command,
-		int flags,
-		const char *formatspec,
-		const char *argument_names,
-		const char *documentation,
-		uchar type
-	)
-{
-	eventInfo_t *evi = ( eventInfo_t * )malloc( sizeof( eventInfo_t ) );
-
-	evi->ev = this;
-	evi->command = command;
-	evi->flags = flags;
-	evi->formatspec = formatspec;
-	evi->argument_names = argument_names;
-	evi->documentation = documentation;
-	evi->type = type;
-
-	evi->prev = lastEvent;
-
-	lastEvent = evi;
-
-	fromScript = false;
-	dataSize = 0;
-	maxDataSize = 0;
-	data = NULL;
-	eventnum = 0;
-}
-
-/*
-=======================
-~Event
-=======================
-*/
-Event::~Event()
-{
-	Clear();
+        delete DataNodeList;
+    }
 }
 
 /*
@@ -1850,59 +1648,53 @@ Event
 */
 Event::Event()
 {
-	fromScript = false;
-	eventnum = 0;
-	data = NULL;
-    dataSize = 0;
+    fromScript  = false;
+    eventnum    = 0;
+    data        = NULL;
+    dataSize    = 0;
     maxDataSize = 0;
-}
 
-/*
-=======================
-ErrorInternal
-=======================
-*/
-void Event::ErrorInternal( Listener *l, str text ) const
-{
-	str classname;
-	str eventname;
-
-	EVENT_DPrintf( "^~^~^ Game" );
-
-	classname = l->getClassname();
-	eventname = getName();
-
-	EVENT_DPrintf( " (Event: '%s', Object: '%s') : %s\n", eventname.c_str(), classname.c_str(), text.c_str() );
+#ifdef _DEBUG
+    name = NULL;
+#endif
 }
 
 /*
 =======================
 Event
+
+Creates an event command
 =======================
 */
-Event::Event( const Event *ev )
+Event::Event(
+    const char *command,
+    int         flags,
+    const char *formatspec,
+    const char *argument_names,
+    const char *documentation,
+    uchar       type
+)
 {
-	fromScript = ev->fromScript;
-	eventnum = ev->eventnum;
-    dataSize = ev->dataSize;
-    maxDataSize = ev->maxDataSize;
+    DataNode *node = new DataNode();
 
-	if( dataSize )
-	{
-		data = new ScriptVariable[ dataSize ];
+    node->ev             = this;
+    node->command        = command;
+    node->flags          = flags;
+    node->formatspec     = formatspec;
+    node->argument_names = argument_names;
+    node->documentation  = documentation;
+    node->type           = type;
+    node->next           = DataNodeList;
+    DataNodeList         = node;
 
-		for( int i = 0; i < dataSize; i++ )
-		{
-			data[ i ] = ev->data[ i ];
-		}
-	}
-	else
-	{
-		data = NULL;
-	}
+    fromScript  = false;
+    dataSize    = 0;
+    maxDataSize = 0;
+    data        = NULL;
+    eventnum    = 0;
 
 #ifdef _DEBUG
-	name = ev->name;
+    name = NULL;
 #endif
 }
 
@@ -1911,29 +1703,71 @@ Event::Event( const Event *ev )
 Event
 =======================
 */
-Event::Event( const Event &ev )
+Event::Event(const Event& ev)
 {
-	fromScript = ev.fromScript;
-	eventnum = ev.eventnum;
-    dataSize = ev.dataSize;
+    fromScript  = ev.fromScript;
+    eventnum    = ev.eventnum;
+    dataSize    = ev.dataSize;
     maxDataSize = ev.maxDataSize;
 
-	if( dataSize )
-	{
-		data = new ScriptVariable[ dataSize ];
+    if (dataSize) {
+        data = new ScriptVariable[maxDataSize];
 
-		for( int i = 0; i < dataSize; i++ )
-		{
-			data[ i ] = ev.data[ i ];
-		}
-	}
-	else
-	{
-		data = NULL;
-	}
+        for (int i = 0; i < dataSize; i++) {
+            data[i] = ev.data[i];
+        }
+    } else {
+        data = NULL;
+    }
 
 #ifdef _DEBUG
-	name = ev.name;
+    name = ev.name;
+#endif
+}
+
+Event::Event(const Event& ev, int numArgs)
+{
+    fromScript  = ev.fromScript;
+    eventnum    = ev.eventnum;
+    dataSize    = ev.dataSize;
+    maxDataSize = ev.maxDataSize;
+
+    if (dataSize) {
+        data = new ScriptVariable[maxDataSize];
+
+        for (int i = 0; i < dataSize; i++) {
+            data[i] = ev.data[i];
+        }
+    } else {
+        data        = new ScriptVariable[numArgs];
+        dataSize    = 0;
+        maxDataSize = numArgs;
+    }
+
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+}
+
+Event::Event(Event&& ev)
+{
+    fromScript  = ev.fromScript;
+    eventnum    = ev.eventnum;
+    dataSize    = ev.dataSize;
+    maxDataSize = ev.maxDataSize;
+    data        = ev.data;
+
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+
+    ev.data        = NULL;
+    ev.dataSize    = 0;
+    ev.maxDataSize = 0;
+    ev.eventnum    = 0;
+
+#ifdef _DEBUG
+    ev.name = NULL;
 #endif
 }
 
@@ -1944,16 +1778,16 @@ Event
 Initializes the event with the specified index
 =======================
 */
-Event::Event( int index )
+Event::Event(int index)
 {
-	fromScript = false;
-	eventnum = index;
-	data = NULL;
-    dataSize = 0;
+    fromScript  = false;
+    eventnum    = index;
+    data        = NULL;
+    dataSize    = 0;
     maxDataSize = 0;
 
 #ifdef _DEBUG
-	name = GetEventName( index );
+    name = GetEventName(index);
 #endif
 }
 
@@ -1966,10 +1800,10 @@ Initializes the event with the specified index
 */
 Event::Event(int index, int numArgs)
 {
-    fromScript = false;
-    eventnum = index;
-    data = new ScriptVariable[numArgs];
-    dataSize = 0;
+    fromScript  = false;
+    eventnum    = index;
+    data        = new ScriptVariable[numArgs];
+    dataSize    = 0;
     maxDataSize = numArgs;
 
 #ifdef _DEBUG
@@ -1984,47 +1818,140 @@ Event
 Initializes the event with the specified command
 =======================
 */
-Event::Event( str command, int numArgs )
+Event::Event(const char *command)
 {
-	command_t c;
+    eventnum = FindEventNum(command);
+    if (!eventnum) {
+        EVENT_DPrintf("^~^~^ Event '%s' does not exist.\n", command);
+    }
 
-	c.command = command.c_str();
-	c.flags = 0;
-	c.type = EV_NORMAL;
+    fromScript  = qfalse;
+    maxDataSize = 0;
+    dataSize    = 0;
+    data        = NULL;
 
-	c.command.tolower();
+#ifdef _DEBUG
+    name = command;
+#endif
+}
 
-	eventnum = commandList.findKeyIndex( c );
-	if( !eventnum )
-	{
-		EVENT_DPrintf( "^~^~^ Event '%s' does not exist.\n", command.c_str() );
-	}
+/*
+=======================
+Event
 
-    fromScript = qfalse;
+Initializes the event with the specified command
+=======================
+*/
+Event::Event(const char *command, int numArgs)
+{
+    eventnum = FindEventNum(command);
+    if (!eventnum) {
+        EVENT_DPrintf("^~^~^ Event '%s' does not exist.\n", command);
+    }
+
+    fromScript  = qfalse;
     maxDataSize = numArgs;
 
     if (numArgs) {
-        data = new ScriptVariable[numArgs];
+        data     = new ScriptVariable[numArgs];
         dataSize = 0;
-	} else {
-		dataSize = 0;
-		data = NULL;
+    } else {
+        dataSize = 0;
+        data     = NULL;
     }
 
 #ifdef _DEBUG
-	name = command;
+    name = command;
 #endif
 }
 
+/*
+=======================
+~Event
+=======================
+*/
+Event::~Event()
+{
+    Clear();
+}
+
+Event& Event::operator=(const Event& ev)
+{
+    Clear();
+    fromScript  = ev.fromScript;
+    eventnum    = ev.eventnum;
+    dataSize    = ev.dataSize;
+    maxDataSize = ev.maxDataSize;
+
+    if (dataSize) {
+        data = new ScriptVariable[dataSize];
+
+        for (int i = 0; i < dataSize; i++) {
+            data[i] = ev.data[i];
+        }
+    } else {
+        data = NULL;
+    }
+
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+
+    return *this;
+}
+
+Event& Event::operator=(Event&& ev)
+{
+    Clear();
+    fromScript  = ev.fromScript;
+    eventnum    = ev.eventnum;
+    dataSize    = ev.dataSize;
+    maxDataSize = ev.maxDataSize;
+    data        = ev.data;
+
+#ifdef _DEBUG
+    name = ev.name;
+#endif
+
+    ev.data        = NULL;
+    ev.dataSize    = 0;
+    ev.maxDataSize = 0;
+    ev.eventnum    = 0;
+
+#ifdef _DEBUG
+    ev.name = NULL;
+#endif
+
+    return *this;
+}
+
+/*
+=======================
+ErrorInternal
+=======================
+*/
+void Event::ErrorInternal(Listener *l, str text) const
+{
+    str classname;
+    str eventname;
+
+    EVENT_DPrintf("^~^~^ Game");
+
+    classname = l->getClassname();
+    eventname = getName();
+
+    EVENT_DPrintf(" (Event: '%s', Object: '%s') : %s\n", eventname.c_str(), classname.c_str(), text.c_str());
+}
+
 /*
 =======================
 AddContainer
 =======================
 */
-void Event::AddContainer( Container< SafePtr< Listener > > *container )
+void Event::AddContainer(Container<SafePtr<Listener>> *container)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setContainerValue( container );
+    ScriptVariable& variable = GetValue();
+    variable.setContainerValue(container);
 }
 
 /*
@@ -2032,10 +1959,10 @@ void Event::AddContainer( Container< SafePtr< Listener > > *container )
 AddEntity
 =======================
 */
-void Event::AddEntity( Entity *ent )
+void Event::AddEntity(Entity *ent)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setListenerValue( ( Listener * )ent );
+    ScriptVariable& variable = GetValue();
+    variable.setListenerValue((Listener *)ent);
 }
 
 /*
@@ -2043,10 +1970,10 @@ void Event::AddEntity( Entity *ent )
 AddFloat
 =======================
 */
-void Event::AddFloat( float number )
+void Event::AddFloat(float number)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setFloatValue( number );
+    ScriptVariable& variable = GetValue();
+    variable.setFloatValue(number);
 }
 
 /*
@@ -2054,10 +1981,10 @@ void Event::AddFloat( float number )
 AddInteger
 =======================
 */
-void Event::AddInteger( int number )
+void Event::AddInteger(int number)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setIntValue( number );
+    ScriptVariable& variable = GetValue();
+    variable.setIntValue(number);
 }
 
 /*
@@ -2065,10 +1992,10 @@ void Event::AddInteger( int number )
 AddListener
 =======================
 */
-void Event::AddListener( Listener * listener )
+void Event::AddListener(Listener *listener)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setListenerValue( listener );
+    ScriptVariable& variable = GetValue();
+    variable.setListenerValue(listener);
 }
 
 /*
@@ -2076,10 +2003,10 @@ void Event::AddListener( Listener * listener )
 AddNil
 =======================
 */
-void Event::AddNil( void )
+void Event::AddNil(void)
 {
-	ScriptVariable& variable = GetValue();
-	variable.Clear();
+    ScriptVariable& variable = GetValue();
+    variable.Clear();
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -2089,10 +2016,10 @@ void Event::AddNil( void )
 AddConstString
 =======================
 */
-void Event::AddConstString( const_str string )
+void Event::AddConstString(const_str string)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setConstStringValue( string );
+    ScriptVariable& variable = GetValue();
+    variable.setConstStringValue(string);
 }
 
 #endif
@@ -2102,10 +2029,10 @@ void Event::AddConstString( const_str string )
 AddString
 =======================
 */
-void Event::AddString( str string )
+void Event::AddString(str string)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setStringValue( string );
+    ScriptVariable& variable = GetValue();
+    variable.setStringValue(string);
 }
 
 /*
@@ -2113,10 +2040,10 @@ void Event::AddString( str string )
 AddToken
 =======================
 */
-void Event::AddToken( str token )
+void Event::AddToken(str token)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setStringValue( token );
+    ScriptVariable& variable = GetValue();
+    variable.setStringValue(token);
 }
 
 /*
@@ -2124,12 +2051,11 @@ void Event::AddToken( str token )
 AddTokens
 =======================
 */
-void Event::AddTokens( int argc, const char **argv )
+void Event::AddTokens(int argc, const char **argv)
 {
-	for( int i = 0; i < argc; i++ )
-	{
-		AddToken( argv[ i ] );
-	}
+    for (int i = 0; i < argc; i++) {
+        AddToken(argv[i]);
+    }
 }
 
 /*
@@ -2137,10 +2063,10 @@ void Event::AddTokens( int argc, const char **argv )
 AddValue
 =======================
 */
-void Event::AddValue( const ScriptVariable &value )
+void Event::AddValue(const ScriptVariable& value)
 {
-	ScriptVariable& variable = GetValue();
-	variable = value;
+    ScriptVariable& variable = GetValue();
+    variable                 = value;
 }
 
 /*
@@ -2148,10 +2074,26 @@ void Event::AddValue( const ScriptVariable &value )
 AddVector
 =======================
 */
-void Event::AddVector( const Vector& vector )
+void Event::AddVector(const Vector& vector)
 {
-	ScriptVariable& variable = GetValue();
-	variable.setVectorValue( vector );
+    ScriptVariable& variable = GetValue();
+    variable.setVectorValue(vector);
+}
+
+/*
+=======================
+SetValue
+=======================
+*/
+void Event::CopyValues(const ScriptVariable *values, size_t count)
+{
+    assert(count <= maxDataSize);
+
+    for (size_t i = 0; i < count; i++) {
+        data[i] = values[i];
+    }
+
+    dataSize = count;
 }
 
 /*
@@ -2159,16 +2101,15 @@ void Event::AddVector( const Vector& vector )
 Clear
 =======================
 */
-void Event::Clear( void )
+void Event::Clear(void)
 {
-	if( data )
-	{
-		delete[] data;
+    if (data) {
+        delete[] data;
 
-		data = NULL;
-        dataSize = 0;
+        data        = NULL;
+        dataSize    = 0;
         maxDataSize = 0;
-	}
+    }
 }
 
 /*
@@ -2176,11 +2117,11 @@ void Event::Clear( void )
 CheckPos
 =======================
 */
-void Event::CheckPos( int pos )
+void Event::CheckPos(int pos) const
 {
-	if( pos > NumArgs() ) {
-		ScriptError( "Index %d out of range.", pos );
-	}
+    if (pos > NumArgs()) {
+        ScriptError("Index %d out of range.", pos);
+    }
 }
 
 /*
@@ -2188,11 +2129,11 @@ void Event::CheckPos( int pos )
 GetBoolean
 =======================
 */
-bool Event::GetBoolean( int pos )
+bool Event::GetBoolean(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.booleanNumericValue();
+    return variable.booleanNumericValue();
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -2202,11 +2143,11 @@ bool Event::GetBoolean( int pos )
 GetConstString
 =======================
 */
-const_str Event::GetConstString( int pos )
+const_str Event::GetConstString(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.constStringValue();
+    return variable.constStringValue();
 }
 
 #endif
@@ -2216,11 +2157,11 @@ const_str Event::GetConstString( int pos )
 GetEntity
 =======================
 */
-Entity *Event::GetEntity( int pos )
+Entity *Event::GetEntity(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.entityValue();
+    return variable.entityValue();
 }
 
 /*
@@ -2228,11 +2169,11 @@ Entity *Event::GetEntity( int pos )
 GetFloat
 =======================
 */
-float Event::GetFloat( int pos )
+float Event::GetFloat(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.floatValue();
+    return variable.floatValue();
 }
 
 /*
@@ -2240,11 +2181,11 @@ float Event::GetFloat( int pos )
 GetInteger
 =======================
 */
-int Event::GetInteger( int pos )
+int Event::GetInteger(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.intValue();
+    return variable.intValue();
 }
 
 /*
@@ -2252,14 +2193,13 @@ int Event::GetInteger( int pos )
 GetListener
 =======================
 */
-Listener * Event::GetListener( int pos )
+Listener *Event::GetListener(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.listenerValue();
+    return variable.listenerValue();
 }
 
-
 #ifdef WITH_SCRIPT_ENGINE
 
 /*
@@ -2267,11 +2207,11 @@ Listener * Event::GetListener( int pos )
 GetSimpleEntity
 =======================
 */
-SimpleEntity * Event::GetSimpleEntity( int pos )
+SimpleEntity *Event::GetSimpleEntity(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.simpleEntityValue();
+    return variable.simpleEntityValue();
 }
 
 #endif
@@ -2281,10 +2221,10 @@ SimpleEntity * Event::GetSimpleEntity( int pos )
 GetString
 =======================
 */
-str Event::GetString( int pos )
+str Event::GetString(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
-	return variable.stringValue();
+    ScriptVariable& variable = GetValue(pos);
+    return variable.stringValue();
 }
 
 /*
@@ -2292,10 +2232,10 @@ str Event::GetString( int pos )
 GetToken
 =======================
 */
-str Event::GetToken( int pos )
+str Event::GetToken(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
-	return variable.stringValue();
+    ScriptVariable& variable = GetValue(pos);
+    return variable.stringValue();
 }
 
 /*
@@ -2303,16 +2243,15 @@ str Event::GetToken( int pos )
 GetValue
 =======================
 */
-ScriptVariable& Event::GetValue( int pos )
+ScriptVariable& Event::GetValue(int pos) const
 {
-	if( pos < 0 )
-	{
-		pos = NumArgs() + pos + 1;
-	}
+    if (pos < 0) {
+        pos = NumArgs() + pos + 1;
+    }
 
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ];
+    return data[pos - 1];
 }
 
 static ScriptVariable m_null;
@@ -2322,32 +2261,41 @@ static ScriptVariable m_null;
 GetValue
 =======================
 */
-ScriptVariable& Event::GetValue( void )
+ScriptVariable& Event::GetValue(void)
 {
+    ScriptVariable *tmp;
+    int             i;
+
+    if (fromScript) {
+        // an event method will emit the return value
+        // to the first index of the array
+        // so there is no reallocation
+        if (!data) {
+            data        = new ScriptVariable[1];
+            dataSize    = 1;
+            maxDataSize = 1;
+        }
+        return data[0];
+    }
+
     if (dataSize == maxDataSize) {
-        ScriptVariable* tmp = data;
+        tmp = data;
 
-		maxDataSize++;
-		data = new ScriptVariable[maxDataSize];
+        maxDataSize += 3;
+        data = new ScriptVariable[maxDataSize];
 
-		if (tmp != NULL)
-		{
-			for (int i = 0; i < dataSize; i++) {
-				data[i] = std::move(tmp[i]);
-			}
+        if (tmp != NULL) {
+            for (i = 0; i < dataSize; i++) {
+                data[i] = std::move(tmp[i]);
+            }
 
-			delete[] tmp;
-		}
-	}
+            delete[] tmp;
+        }
+    }
 
-	dataSize++;
+    dataSize++;
 
-	return data[ dataSize - 1 ];
-}
-
-ScriptVariable& Event::GetLastValue()
-{
-	return GetValue(NumArgs());
+    return data[dataSize - 1];
 }
 
 /*
@@ -2355,25 +2303,25 @@ ScriptVariable& Event::GetLastValue()
 GetVector
 =======================
 */
-Vector Event::GetVector( int pos )
+Vector Event::GetVector(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.vectorValue();
+    return variable.vectorValue();
 }
 
-#if defined ( GAME_DLL )
+#if defined(GAME_DLL)
 
 /*
 =======================
 GetPathNode
 =======================
 */
-PathNode *Event::GetPathNode( int pos )
+PathNode *Event::GetPathNode(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.pathNodeValue();
+    return variable.pathNodeValue();
 }
 
 /*
@@ -2381,11 +2329,11 @@ PathNode *Event::GetPathNode( int pos )
 GetWaypoint
 =======================
 */
-Waypoint *Event::GetWaypoint( int pos )
+Waypoint *Event::GetWaypoint(int pos) const
 {
-	ScriptVariable& variable = GetValue( pos );
+    ScriptVariable& variable = GetValue(pos);
 
-	return variable.waypointValue();
+    return variable.waypointValue();
 }
 
 #endif
@@ -2395,11 +2343,11 @@ Waypoint *Event::GetWaypoint( int pos )
 IsEntityAt
 =======================
 */
-qboolean Event::IsEntityAt( int pos )
+qboolean Event::IsEntityAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos- 1 ].IsEntity();
+    return data[pos - 1].IsEntity();
 }
 
 /*
@@ -2407,11 +2355,11 @@ qboolean Event::IsEntityAt( int pos )
 IsListenerAt
 =======================
 */
-qboolean Event::IsListenerAt( int pos )
+qboolean Event::IsListenerAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].IsListener();
+    return data[pos - 1].IsListener();
 }
 
 /*
@@ -2419,11 +2367,11 @@ qboolean Event::IsListenerAt( int pos )
 IsNilAt
 =======================
 */
-qboolean Event::IsNilAt( int pos )
+qboolean Event::IsNilAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].GetType() == VARIABLE_NONE;
+    return data[pos - 1].GetType() == VARIABLE_NONE;
 }
 
 /*
@@ -2431,11 +2379,11 @@ qboolean Event::IsNilAt( int pos )
 IsNumericAt
 =======================
 */
-qboolean Event::IsNumericAt( int pos )
+qboolean Event::IsNumericAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].IsNumeric();
+    return data[pos - 1].IsNumeric();
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -2445,11 +2393,11 @@ qboolean Event::IsNumericAt( int pos )
 IsSimpleEntityAt
 =======================
 */
-qboolean Event::IsSimpleEntityAt( int pos )
+qboolean Event::IsSimpleEntityAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].IsSimpleEntity();
+    return data[pos - 1].IsSimpleEntity();
 }
 
 #endif
@@ -2459,11 +2407,11 @@ qboolean Event::IsSimpleEntityAt( int pos )
 IsStringAt
 =======================
 */
-qboolean Event::IsStringAt( int pos )
+qboolean Event::IsStringAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].IsString();
+    return data[pos - 1].IsString();
 }
 
 /*
@@ -2471,11 +2419,11 @@ qboolean Event::IsStringAt( int pos )
 IsVectorAt
 =======================
 */
-qboolean Event::IsVectorAt( int pos )
+qboolean Event::IsVectorAt(int pos) const
 {
-	CheckPos( pos );
+    CheckPos(pos);
 
-	return data[ pos - 1 ].IsVector();
+    return data[pos - 1].IsVector();
 }
 
 /*
@@ -2483,29 +2431,9 @@ qboolean Event::IsVectorAt( int pos )
 IsFromScript
 =======================
 */
-qboolean Event::IsFromScript()
+qboolean Event::IsFromScript() const
 {
-	return fromScript;
-}
-
-/*
-=======================
-GetFormat
-=======================
-*/
-const char *Event::GetFormat()
-{
-	eventInfo_t *evi;
-
-	for( evi = lastEvent; evi != NULL; evi = ( eventInfo_t * )evi->prev )
-	{
-		if( evi->ev->eventnum == eventnum )
-		{
-			return evi->formatspec;
-		}
-	}
-
-	return NULL;
+    return fromScript;
 }
 
 /*
@@ -2513,9 +2441,9 @@ const char *Event::GetFormat()
 NumArgs
 =======================
 */
-int Event::NumArgs()
+int Event::NumArgs() const
 {
-	return dataSize;
+    return dataSize;
 }
 
 /*
@@ -2525,7 +2453,7 @@ getInfo
 */
 EventDef *Event::getInfo()
 {
-	return &eventDefList[ this ];
+    return &eventDefList[this];
 }
 
 /*
@@ -2533,9 +2461,9 @@ EventDef *Event::getInfo()
 getName
 =======================
 */
-str& Event::getName() const
+const char *Event::getName() const
 {
-	return GetEventName( eventnum );
+    return GetEventName(eventnum);
 }
 
 //====================================
@@ -2553,12 +2481,12 @@ Listener::Listener()
 {
 #ifdef WITH_SCRIPT_ENGINE
 
-	m_EndList = NULL;
+    m_EndList = NULL;
 
-	m_NotifyList = NULL;
-	m_WaitForList = NULL;
+    m_NotifyList  = NULL;
+    m_WaitForList = NULL;
 
-	vars = NULL;
+    vars = NULL;
 
 #endif
 }
@@ -2570,97 +2498,92 @@ Listener::Listener()
 */
 Listener::~Listener()
 {
-	if (EventSystemStarted) {
-		CancelPendingEvents();
-	}
+    if (EventSystemStarted) {
+        CancelPendingEvents();
+    }
 
 #ifdef WITH_SCRIPT_ENGINE
 
-	UnregisterAll();
-	CancelWaitingAll();
+    UnregisterAll();
+    CancelWaitingAll();
 
-	if( vars ) {
-		delete vars;
-	}
+    if (vars) {
+        delete vars;
+    }
 
 #endif
 }
 
-#define L_ARCHIVE_NOTIFYLIST		1
-#define L_ARCHIVE_WAITFORLIST		2
-#define L_ARCHIVE_VARLIST			4
-#define L_ARCHIVE_ENDLIST			8
+#define L_ARCHIVE_NOTIFYLIST  1
+#define L_ARCHIVE_WAITFORLIST 2
+#define L_ARCHIVE_VARLIST     4
+#define L_ARCHIVE_ENDLIST     8
 
 /*
 =======================
 Archive
 =======================
 */
-void Listener::Archive( Archiver &arc )
+void Listener::Archive(Archiver& arc)
 {
-	Class::Archive( arc );
+    Class::Archive(arc);
 
 #ifdef WITH_SCRIPT_ENGINE
 
-	byte flag = 0;
+    byte flag = 0;
 
-	if( !arc.Loading() )
-	{
-		if( m_NotifyList )
-			flag |= L_ARCHIVE_NOTIFYLIST;
-		if( m_WaitForList )
-			flag |= L_ARCHIVE_WAITFORLIST;
-		if( vars )
-			flag |= L_ARCHIVE_VARLIST;
-		if( m_EndList )
-			flag |= L_ARCHIVE_ENDLIST;
-	}
+    if (!arc.Loading()) {
+        if (m_NotifyList) {
+            flag |= L_ARCHIVE_NOTIFYLIST;
+        }
+        if (m_WaitForList) {
+            flag |= L_ARCHIVE_WAITFORLIST;
+        }
+        if (vars) {
+            flag |= L_ARCHIVE_VARLIST;
+        }
+        if (m_EndList) {
+            flag |= L_ARCHIVE_ENDLIST;
+        }
+    }
 
-	arc.ArchiveByte( &flag );
+    arc.ArchiveByte(&flag);
 
-	// archive the notify list
-	if( flag & L_ARCHIVE_NOTIFYLIST )
-	{
-		if( arc.Loading() )
-		{
-			m_NotifyList = new con_set < const_str, ConList > ;
-		}
+    // archive the notify list
+    if (flag & L_ARCHIVE_NOTIFYLIST) {
+        if (arc.Loading()) {
+            m_NotifyList = new con_set<const_str, ConList>;
+        }
 
-		m_NotifyList->Archive( arc );
-	}
+        m_NotifyList->Archive(arc);
+    }
 
-	// archive the waiting thread list
-	if( flag & L_ARCHIVE_WAITFORLIST )
-	{
-		if( arc.Loading() )
-		{
-			m_WaitForList = new con_set < const_str, ConList > ;
-		}
+    // archive the waiting thread list
+    if (flag & L_ARCHIVE_WAITFORLIST) {
+        if (arc.Loading()) {
+            m_WaitForList = new con_set<const_str, ConList>;
+        }
 
-		m_WaitForList->Archive( arc );
-	}
+        m_WaitForList->Archive(arc);
+    }
 
-	// archive the variable list
-	if( flag & L_ARCHIVE_VARLIST )
-	{
-		if( arc.Loading() )
-		{
-			vars = new ScriptVariableList;
-		}
+    // archive the variable list
+    if (flag & L_ARCHIVE_VARLIST) {
+        if (arc.Loading()) {
+            vars = new ScriptVariableList;
+        }
 
-		vars->Archive( arc );
-	}
+        vars->Archive(arc);
+    }
 
-	// archive the end on event list
-	if( flag & L_ARCHIVE_ENDLIST )
-	{
-		if( arc.Loading() )
-		{
-			m_EndList = new con_set < const_str, ConList >;
-		}
+    // archive the end on event list
+    if (flag & L_ARCHIVE_ENDLIST) {
+        if (arc.Loading()) {
+            m_EndList = new con_set<const_str, ConList>;
+        }
 
-		m_EndList->Archive( arc );
-	}
+        m_EndList->Archive(arc);
+    }
 
 #endif
 }
@@ -2670,25 +2593,24 @@ void Listener::Archive( Archiver &arc )
 CancelEventsOfType
 =======================
 */
-void Listener::CancelEventsOfType( Event *ev )
+void Listener::CancelEventsOfType(Event *ev)
 {
-	EventQueueNode *node;
-	EventQueueNode *next;
-	int eventnum;
+    EventQueueNode *node;
+    EventQueueNode *next;
+    int             eventnum;
 
-	node = Event::EventQueue.next;
+    node = Event::EventQueue.next;
 
-	eventnum = ev->eventnum;
-	while( node != &Event::EventQueue )
-	{
-		next = node->next;
-		if( ( node->GetSourceObject() == this ) && ( node->event->eventnum == eventnum ) )
-		{
-			LL_Remove( node, next, prev );
-			delete node;
-		}
-		node = next;
-	}
+    eventnum = ev->eventnum;
+    while (node != &Event::EventQueue) {
+        next = node->next;
+        if ((node->GetSourceObject() == this) && (node->event->eventnum == eventnum)) {
+            LL_Remove(node, next, prev);
+            delete node->event;
+            delete node;
+        }
+        node = next;
+    }
 }
 
 /*
@@ -2696,9 +2618,9 @@ void Listener::CancelEventsOfType( Event *ev )
 CancelEventsOfType
 =======================
 */
-void Listener::CancelEventsOfType( Event &ev )
+void Listener::CancelEventsOfType(Event& ev)
 {
-	this->CancelEventsOfType( &ev );
+    this->CancelEventsOfType(&ev);
 }
 
 /*
@@ -2706,23 +2628,26 @@ void Listener::CancelEventsOfType( Event &ev )
 CancelFlaggedEvents
 =======================
 */
-void Listener::CancelFlaggedEvents( int flags )
+void Listener::CancelFlaggedEvents(int flags)
 {
-	EventQueueNode *node;
-	EventQueueNode *next;
+    EventQueueNode *node;
+    EventQueueNode *next;
 
-	node = Event::EventQueue.next;
+    node = Event::EventQueue.next;
 
-	while( node != &Event::EventQueue )
-	{
-		next = node->next;
-		if( ( node->GetSourceObject() == this ) && ( node->flags & flags ) )
-		{
-			LL_Remove( node, next, prev );
-			delete node;
-		}
-		node = next;
-	}
+    while (node != &Event::EventQueue) {
+        next = node->next;
+        if ((node->GetSourceObject() == this) && (node->flags & flags)) {
+            LL_Remove(node, next, prev);
+            // Added in OPM
+            //  Original doesn't delete the posted Event
+            //  which would cause a memory leak
+            delete node->event;
+
+            delete node;
+        }
+        node = next;
+    }
 }
 
 /*
@@ -2730,23 +2655,22 @@ void Listener::CancelFlaggedEvents( int flags )
 CancelPendingEvents
 =======================
 */
-void Listener::CancelPendingEvents( void )
+void Listener::CancelPendingEvents(void)
 {
-	EventQueueNode *node;
-	EventQueueNode *next;
+    EventQueueNode *node;
+    EventQueueNode *next;
 
-	node = Event::EventQueue.next;
+    node = Event::EventQueue.next;
 
-	while( node != &Event::EventQueue )
-	{
-		next = node->next;
-		if( node->GetSourceObject() == this )
-		{
-			LL_Remove( node, next, prev );
-			delete node;
-		}
-		node = next;
-	}
+    while (node != &Event::EventQueue) {
+        next = node->next;
+        if (node->GetSourceObject() == this) {
+            LL_Remove(node, next, prev);
+            delete node->event;
+            delete node;
+        }
+        node = next;
+    }
 }
 
 /*
@@ -2754,26 +2678,24 @@ void Listener::CancelPendingEvents( void )
 EventPending
 =======================
 */
-qboolean Listener::EventPending( Event &ev )
+qboolean Listener::EventPending(Event& ev)
 {
-	EventQueueNode *event;
-	int eventnum;
+    EventQueueNode *event;
+    int             eventnum;
 
-	event = Event::EventQueue.next;
+    event = Event::EventQueue.next;
 
-	eventnum = ev.eventnum;
+    eventnum = ev.eventnum;
 
-	while( event != &Event::EventQueue )
-	{
-		if( ( event->GetSourceObject() == this ) && ( event->event->eventnum == ev.eventnum ) )
-		{
-			return true;
-		}
+    while (event != &Event::EventQueue) {
+        if ((event->GetSourceObject() == this) && (event->event->eventnum == ev.eventnum)) {
+            return true;
+        }
 
-		event = event->next;
-	}
+        event = event->next;
+    }
 
-	return false;
+    return false;
 }
 
 /*
@@ -2781,49 +2703,52 @@ qboolean Listener::EventPending( Event &ev )
 PostEventInternal
 =======================
 */
-EventQueueNode *Listener::PostEventInternal( Event *ev, float delay, int flags )
+EventQueueNode *Listener::PostEventInternal(Event *ev, float delay, int flags)
 {
-	EventQueueNode *node;
-	EventQueueNode *i;
-	int inttime;
+    EventQueueNode *node;
+    EventQueueNode *i;
+    int             inttime;
 
-	if( !classinfo()->responseLookup[ ev->eventnum ] )
-	{
-		if( !ev->eventnum )
-		{
+#if defined(GAME_DLL)
+    if (LoadingSavegame) {
+        return NULL;
+    }
+#endif
+
+    if (!classinfo()->responseLookup[ev->eventnum]) {
+        if (!ev->eventnum) {
 #ifdef _DEBUG
-			EVENT_DPrintf( "^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name.c_str(), getClassname() );
+            EVENT_DPrintf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name, getClassname());
 #else
-			EVENT_DPrintf( "^~^~^ Failed execution of event for class '%s'\n", getClassname() );
+            EVENT_DPrintf("^~^~^ Failed execution of event for class '%s'\n", getClassname());
 #endif
-		}
+        }
 
-		delete ev;
-		return NULL;
-	}
+        delete ev;
+        return NULL;
+    }
 
-	node = new EventQueueNode;
+    node = new EventQueueNode;
 
-	i = Event::EventQueue.next;
-	inttime = EVENT_msec + ( delay * 1000.0f + 0.5f );
+    i       = Event::EventQueue.next;
+    inttime = EVENT_msec + (delay * 1000.0f + 0.5f);
 
-	while( i != &Event::EventQueue && inttime > i->inttime )
-	{
-		i = i->next;
-	}
+    while (i != &Event::EventQueue && inttime > i->inttime) {
+        i = i->next;
+    }
 
-	node->inttime = inttime;
-	node->event = ev;
-	node->flags = flags;
-	node->SetSourceObject( this );
+    node->inttime = inttime;
+    node->event   = ev;
+    node->flags   = flags;
+    node->SetSourceObject(this);
 
 #ifdef _DEBUG
-	node->name = ev->name;
+    node->name = ev->name;
 #endif
 
-	LL_Add( i, node, next, prev );
+    LL_Add(i, node, next, prev);
 
-	return node;
+    return node;
 }
 
 /*
@@ -2831,9 +2756,9 @@ EventQueueNode *Listener::PostEventInternal( Event *ev, float delay, int flags )
 PostEvent
 =======================
 */
-void Listener::PostEvent( Event *ev, float delay, int flags )
+void Listener::PostEvent(Event *ev, float delay, int flags)
 {
-	PostEventInternal( ev, delay, flags );
+    PostEventInternal(ev, delay, flags);
 }
 
 /*
@@ -2841,11 +2766,11 @@ void Listener::PostEvent( Event *ev, float delay, int flags )
 PostEvent
 =======================
 */
-void Listener::PostEvent( const Event &ev, float delay, int flags )
+void Listener::PostEvent(const Event& ev, float delay, int flags)
 {
-	Event *e = new Event( ev );
+    Event *e = new Event(ev);
 
-	PostEventInternal( e, delay, flags );
+    PostEventInternal(e, delay, flags);
 }
 
 /*
@@ -2853,33 +2778,30 @@ void Listener::PostEvent( const Event &ev, float delay, int flags )
 PostponeAllEvents
 =======================
 */
-qboolean Listener::PostponeAllEvents( float time )
+qboolean Listener::PostponeAllEvents(float time)
 {
-	EventQueueNode *event;
-	EventQueueNode *node;
+    EventQueueNode *event;
+    EventQueueNode *node;
 
-	event = Event::EventQueue.next;
-	while( event != &Event::EventQueue )
-	{
-		if( event->GetSourceObject() == this )
-		{
-			event->inttime += time * 1000.0f + 0.5f;
+    event = Event::EventQueue.next;
+    while (event != &Event::EventQueue) {
+        if (event->GetSourceObject() == this) {
+            event->inttime += time * 1000.0f + 0.5f;
 
-			node = event->next;
-			while( ( node != &Event::EventQueue ) && ( event->inttime >= node->inttime ) )
-			{
-				node = node->next;
-			}
+            node = event->next;
+            while ((node != &Event::EventQueue) && (event->inttime >= node->inttime)) {
+                node = node->next;
+            }
 
-			LL_Remove( event, next, prev );
-			LL_Add( node, event, next, prev );
+            LL_Remove(event, next, prev);
+            LL_Add(node, event, next, prev);
 
-			return true;
-		}
-		event = event->next;
-	}
+            return true;
+        }
+        event = event->next;
+    }
 
-	return false;
+    return false;
 }
 
 /*
@@ -2887,36 +2809,33 @@ qboolean Listener::PostponeAllEvents( float time )
 PostponeEvent
 =======================
 */
-qboolean Listener::PostponeEvent( Event &ev, float time )
+qboolean Listener::PostponeEvent(Event& ev, float time)
 {
-	EventQueueNode *event;
-	EventQueueNode *node;
-	int eventnum;
+    EventQueueNode *event;
+    EventQueueNode *node;
+    int             eventnum;
 
-	eventnum = ev.eventnum;
+    eventnum = ev.eventnum;
 
-	event = Event::EventQueue.next;
-	while( event != &Event::EventQueue )
-	{
-		if( ( event->GetSourceObject() == this ) && ( event->event->eventnum == eventnum ) )
-		{
-			event->inttime += time * 1000.0f + 0.5f;
+    event = Event::EventQueue.next;
+    while (event != &Event::EventQueue) {
+        if ((event->GetSourceObject() == this) && (event->event->eventnum == eventnum)) {
+            event->inttime += time * 1000.0f + 0.5f;
 
-			node = event->next;
-			while( ( node != &Event::EventQueue ) && ( event->inttime >= node->inttime ) )
-			{
-				node = node->next;
-			}
+            node = event->next;
+            while ((node != &Event::EventQueue) && (event->inttime >= node->inttime)) {
+                node = node->next;
+            }
 
-			LL_Remove( event, next, prev );
-			LL_Add( node, event, next, prev );
+            LL_Remove(event, next, prev);
+            LL_Add(node, event, next, prev);
 
-			return true;
-		}
-		event = event->next;
-	}
+            return true;
+        }
+        event = event->next;
+    }
 
-	return false;
+    return false;
 }
 
 /*
@@ -2924,17 +2843,14 @@ qboolean Listener::PostponeEvent( Event &ev, float time )
 ProcessEvent
 =======================
 */
-bool Listener::ProcessEvent( Event *ev )
+bool Listener::ProcessEvent(Event *ev)
 {
-    try
-    {
+    try {
         return ProcessScriptEvent(ev);
-    }
-    catch (ScriptException& exc)
-    {
+    } catch (ScriptException& exc) {
         ev->ErrorInternal(this, exc.string);
         EVENT_DPrintf("%s\n", exc.string.c_str());
-		// at this point the event didn't get deleted
+        // at this point the event didn't get deleted
         delete ev;
         return false;
     }
@@ -2945,17 +2861,14 @@ bool Listener::ProcessEvent( Event *ev )
 ProcessEvent
 =======================
 */
-bool Listener::ProcessEvent( Event &ev )
+bool Listener::ProcessEvent(Event& ev)
 {
-    try
-    {
+    try {
         return ProcessScriptEvent(ev);
-    }
-    catch (ScriptException& exc)
-    {
+    } catch (ScriptException& exc) {
         ev.ErrorInternal(this, exc.string);
         EVENT_DPrintf("%s\n", exc.string.c_str());
-		return false;
+        return false;
     }
 }
 
@@ -2964,19 +2877,16 @@ bool Listener::ProcessEvent( Event &ev )
 ProcessEvent
 =======================
 */
-bool Listener::ProcessEvent( const Event &ev )
+bool Listener::ProcessEvent(const Event& ev)
 {
-	try
-	{
-		Event event(ev);
-		return ProcessScriptEvent(event);
-	}
-	catch (ScriptException& exc)
-	{
-		ev.ErrorInternal(this, exc.string);
+    try {
+        Event event(ev);
+        return ProcessScriptEvent(event);
+    } catch (ScriptException& exc) {
+        ev.ErrorInternal(this, exc.string);
         EVENT_DPrintf("%s\n", exc.string.c_str());
         return false;
-	}
+    }
 }
 
 /*
@@ -2984,52 +2894,49 @@ bool Listener::ProcessEvent( const Event &ev )
 ProcessEventReturn
 =======================
 */
-ScriptVariable& Listener::ProcessEventReturn( Event *ev )
+ScriptVariable& Listener::ProcessEventReturn(Event *ev)
 {
-	ClassDef *c = classinfo();
-	ResponseDef<Class> *responses = NULL;
-	Response response = NULL;
-	static ScriptVariable m_Return;
+    ClassDef             *c         = classinfo();
+    ResponseDef<Class>   *responses = NULL;
+    Response              response  = NULL;
+    static ScriptVariable m_Return;
 
-	if( !ev->eventnum )
-	{
+    if (!ev->eventnum) {
 #ifdef _DEBUG
-		EVENT_Printf( "^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name.c_str(), c->classname );
+        EVENT_DPrintf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev->name, c->classname);
 #else
-		EVENT_Printf( "^~^~^ Failed execution of event for class '%s'\n", c->classname );
+        EVENT_DPrintf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
 #endif
 
-		delete ev;
-		return m_Return;
-	}
+        delete ev;
+        return m_Return;
+    }
 
-	responses = c->responseLookup[ ev->eventnum ];
+    responses = c->responseLookup[ev->eventnum];
 
-	if( responses == NULL )
-	{
+    if (responses == NULL) {
+        EVENT_DPrintf(
+            "^~^~^ Failed execution of command '%s' for class '%s'\n", Event::GetEventName(ev->eventnum), c->classname
+        );
+        delete ev;
+        return m_Return;
+    }
 
-		EVENT_Printf( "^~^~^ Failed execution of command '%s' for class '%s'\n", Event::GetEventName( ev->eventnum ).c_str(), c->classname );
-		delete ev;
-		return m_Return;
-	}
+    response = responses->response;
 
-	response = responses->response;
+    int previousArgs = ev->NumArgs();
 
-	int previousArgs = ev->NumArgs();
+    if (response) {
+        (this->*response)(ev);
+    }
 
-	if( response )
-	{
-		( this->*response )( ev );
-	}
+    if (previousArgs != ev->NumArgs() && ev->NumArgs() != 0) {
+        m_Return = ev->GetValue(ev->NumArgs());
+    }
 
-	if( previousArgs != ev->NumArgs() && ev->NumArgs() != 0 )
-	{
-		m_Return = ev->GetValue( ev->NumArgs() );
-	}
+    delete ev;
 
-	delete ev;
-
-	return m_Return;
+    return m_Return;
 }
 
 /*
@@ -3037,12 +2944,12 @@ ScriptVariable& Listener::ProcessEventReturn( Event *ev )
 ProcessScriptEvent
 =======================
 */
-bool Listener::ProcessScriptEvent( Event *ev )
+bool Listener::ProcessScriptEvent(Event *ev)
 {
-	bool result = ProcessScriptEvent( *ev );
+    bool result = ProcessScriptEvent(*ev);
 
-	delete ev;
-	return result;
+    delete ev;
+    return result;
 }
 
 /*
@@ -3050,49 +2957,44 @@ bool Listener::ProcessScriptEvent( Event *ev )
 ProcessScriptEvent
 =======================
 */
-bool Listener::ProcessScriptEvent( Event &ev )
+bool Listener::ProcessScriptEvent(Event& ev)
 {
-	ClassDef *c = classinfo();
-	ResponseDef<Class> *responses = NULL;
-	Response response = NULL;
+    ClassDef           *c         = classinfo();
+    ResponseDef<Class> *responses = NULL;
+    Response            response  = NULL;
 
-	if( !ev.eventnum )
-	{
+    if (!ev.eventnum) {
 #ifdef _DEBUG
-		EVENT_Printf( "^~^~^ Failed execution of event '%s' for class '%s'\n", ev.name.c_str(), c->classname );
+        EVENT_DPrintf("^~^~^ Failed execution of event '%s' for class '%s'\n", ev.name, c->classname);
 #else
-		EVENT_Printf( "^~^~^ Failed execution of event for class '%s'\n", c->classname );
+        EVENT_DPrintf("^~^~^ Failed execution of event for class '%s'\n", c->classname);
 #endif
 
-		return false;
-	}
+        return false;
+    }
 
-	responses = c->responseLookup[ ev.eventnum ];
+    responses = c->responseLookup[ev.eventnum];
 
-	if( responses == NULL )
-	{
-		return true;
-	}
+    if (responses == NULL) {
+        return true;
+    }
 
-	response = responses->response;
+    response = responses->response;
 
-	if( response )
-	{
-		( this->*response )( &ev );
-	}
+    if (response) {
+        (this->*response)(&ev);
+    }
 
-	return true;
+    return true;
 }
 
-
-void Listener::ProcessContainerEvent( const Container< Event * >& conev )
+void Listener::ProcessContainerEvent(const Container<Event *>& conev)
 {
-	int num = conev.NumObjects();
+    int num = conev.NumObjects();
 
-	for( int i = 1; i <= num; i++ )
-	{
-		ProcessEvent( conev.ObjectAt( i ) );
-	}
+    for (int i = 1; i <= num; i++) {
+        ProcessEvent(conev.ObjectAt(i));
+    }
 }
 
 /*
@@ -3100,54 +3002,53 @@ void Listener::ProcessContainerEvent( const Container< Event * >& conev )
 ProcessPendingEvents
 =======================
 */
-qboolean Listener::ProcessPendingEvents( void )
+qboolean Listener::ProcessPendingEvents(void)
 {
-	EventQueueNode *event;
-	qboolean processedEvents;
-	float t;
+    EventQueueNode *event;
+    qboolean        processedEvents;
+    float           t;
 
-	processedEvents = false;
+    processedEvents = false;
 
-	t = EVENT_msec;
+    t = EVENT_msec;
 
-	event = Event::EventQueue.next;
-	while( event != &Event::EventQueue )
-	{
-		Listener *obj;
+    Listener::ProcessingEvents = true;
 
-		assert( event );
+    event = Event::EventQueue.next;
+    while (event != &Event::EventQueue) {
+        Listener *obj;
 
-		obj = event->GetSourceObject();
+        assert(event);
 
-		if( event->inttime > t )
-		{
-			break;
-		}
+        obj = event->GetSourceObject();
 
-		if( obj != this )
-		{
-			// traverse normally
-			event = event->next;
-		}
-		else
-		{
-			// the event is removed from its list and temporarily added to the active list
-			LL_Remove( event, next, prev );
+        if (event->inttime > t) {
+            break;
+        }
 
-			// ProcessEvent will dispose of this event when it is done
-			obj->ProcessEvent( event->event );
+        if (obj != this) {
+            // traverse normally
+            event = event->next;
+        } else {
+            // the event is removed from its list and temporarily added to the active list
+            LL_Remove(event, next, prev);
 
-			// free up the node
-			delete event;
+            // ProcessEvent will dispose of this event when it is done
+            obj->ProcessEvent(event->event);
 
-			// start over, since can't guarantee that we didn't process any previous or following events
-			event = Event::EventQueue.next;
+            // free up the node
+            delete event;
 
-			processedEvents = true;
-		}
-	}
+            // start over, since can't guarantee that we didn't process any previous or following events
+            event = Event::EventQueue.next;
 
-	return processedEvents;
+            processedEvents = true;
+        }
+    }
+
+    Listener::ProcessingEvents = false;
+
+    return processedEvents;
 }
 
 /*
@@ -3157,9 +3058,18 @@ GetScriptOwner
 listener.owner
 =======================
 */
-Listener *Listener::GetScriptOwner( void )
+Listener *Listener::GetScriptOwner(void)
+{
+    return NULL;
+}
+
+/*
+=======================
+SetScriptOwner
+=======================
+*/
+void Listener::SetScriptOwner(Listener* newOwner)
 {
-	return NULL;
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -3169,9 +3079,9 @@ Listener *Listener::GetScriptOwner( void )
 CreateVars
 =======================
 */
-void Listener::CreateVars( void )
+void Listener::CreateVars(void)
 {
-	vars = new ScriptVariableList;
+    vars = new ScriptVariableList;
 }
 
 /*
@@ -3179,13 +3089,12 @@ void Listener::CreateVars( void )
 ClearVars
 =======================
 */
-void Listener::ClearVars( void )
+void Listener::ClearVars(void)
 {
-	if( vars )
-	{
-		delete vars;
-		CreateVars();
-	}
+    if (vars) {
+        delete vars;
+        CreateVars();
+    }
 }
 
 /*
@@ -3193,13 +3102,13 @@ void Listener::ClearVars( void )
 Vars
 =======================
 */
-ScriptVariableList *Listener::Vars( void )
+ScriptVariableList *Listener::Vars(void)
 {
-	if( !vars ) {
-		CreateVars();
-	}
+    if (!vars) {
+        CreateVars();
+    }
 
-	return vars;
+    return vars;
 }
 
 /*
@@ -3207,9 +3116,9 @@ ScriptVariableList *Listener::Vars( void )
 BroadcastEvent
 =======================
 */
-bool Listener::BroadcastEvent( str name, Event &event )
+bool Listener::BroadcastEvent(str name, Event& event)
 {
-	return BroadcastEvent( Director.AddString( name ), event );
+    return BroadcastEvent(Director.AddString(name), event);
 }
 
 /*
@@ -3217,21 +3126,21 @@ bool Listener::BroadcastEvent( str name, Event &event )
 BroadcastEvent
 =======================
 */
-bool Listener::BroadcastEvent( const_str name, Event &event )
+bool Listener::BroadcastEvent(const_str name, Event& event)
 {
-	if( !m_NotifyList )
-	{
-		return false;
-	}
+    ConList *listeners;
 
-	ConList *listeners = m_NotifyList->findKeyValue( name );
+    if (!m_NotifyList) {
+        return false;
+    }
 
-	if( !listeners )
-	{
-		return false;
-	}
+    listeners = m_NotifyList->findKeyValue(name);
 
-	return BroadcastEvent( event, listeners );
+    if (!listeners) {
+        return false;
+    }
+
+    return BroadcastEvent(event, listeners);
 }
 
 /*
@@ -3241,42 +3150,50 @@ BroadcastEvent
 Broadcast an event to the notify list
 =======================
 */
-bool Listener::BroadcastEvent( Event &event, ConList *listeners )
+bool Listener::BroadcastEvent(Event& event, ConList *listeners)
 {
-	int num = listeners->NumObjects();
+    Listener *listener;
+    int       num = listeners->NumObjects();
+    int       i;
+    bool      found;
 
-	if( !num )
-	{
-		return false;
-	}
+    if (!num) {
+        return false;
+    }
 
-	if( num == 1 )
-	{
-		Listener *listener = listeners->ObjectAt( 1 );
+    if (num == 1) {
+        Listener *listener = listeners->ObjectAt(1);
 
-		if( listener )
-		{
-			listener->ProcessEvent( event );
-		}
+        if (listener) {
+            listener->ProcessEvent(event);
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	ConList listenersCopy = *listeners;
-	bool found = false;
+    ConList listenersCopy;
+    found = false;
 
-	for( int i = listenersCopy.NumObjects(); i > 0; i-- )
-	{
-		Listener *listener = listenersCopy.ObjectAt( i );
+    listenersCopy.Resize(num);
 
-		if( listener )
-		{
-			listener->ProcessEvent( event );
-			found = true;
-		}
-	}
+    for (i = num; i > 0; i--) {
+        listener = listeners->ObjectAt(i);
+        if (listener) {
+            listenersCopy.AddObject(listener);
+        }
+    }
 
-	return found;
+    for (i = listenersCopy.NumObjects(); i > 0; i--) {
+        listener = listenersCopy.ObjectAt(i);
+
+        if (listener) {
+            listener->ProcessEvent(event);
+            found = true;
+        }
+    }
+
+    return found;
 }
 
 /*
@@ -3284,9 +3201,9 @@ bool Listener::BroadcastEvent( Event &event, ConList *listeners )
 CancelWaiting
 =======================
 */
-void Listener::CancelWaiting( str name )
+void Listener::CancelWaiting(str name)
 {
-	CancelWaiting( Director.AddString( name ) );
+    CancelWaiting(Director.AddString(name));
 }
 
 /*
@@ -3294,48 +3211,41 @@ void Listener::CancelWaiting( str name )
 CancelWaiting
 =======================
 */
-void Listener::CancelWaiting( const_str name )
+void Listener::CancelWaiting(const_str name)
 {
-	if( !m_WaitForList )
-	{
-		return;
-	}
+    ConList *list;
 
-	ConList *list = m_WaitForList->findKeyValue( name );
-	ConList stoppedListeners;
+    if (!m_WaitForList) {
+        return;
+    }
 
-	if( !list )
-	{
-		return;
-	}
+    list = m_WaitForList->findKeyValue(name);
 
-	CancelWaitingSources( name, *list, stoppedListeners );
+    if (!list) {
+        return;
+    }
 
-	m_WaitForList->remove( name );
+    ConList stoppedListeners;
+    CancelWaitingSources(name, *list, stoppedListeners);
 
-	if( m_WaitForList->isEmpty() )
-	{
-		delete m_WaitForList;
-		m_WaitForList = NULL;
+    m_WaitForList->remove(name);
 
-		if( !DisableListenerNotify )
-		{
-			StoppedWaitFor( name, false );
-		}
-	}
+    if (m_WaitForList->isEmpty()) {
+        delete m_WaitForList;
+        m_WaitForList = NULL;
 
-	for (int i = stoppedListeners.NumObjects(); i > 0; i--)
-	{
-		Listener *listener = stoppedListeners.ObjectAt(i);
+        if (!DisableListenerNotify) {
+            StoppedWaitFor(name, false);
+        }
+    }
 
-		if (listener)
-		{
-			if (!DisableListenerNotify)
-			{
-				listener->StoppedNotify();
-			}
-		}
-	}
+    for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
+        Listener *listener = stoppedListeners.ObjectAt(i);
+
+        if (listener && !DisableListenerNotify) {
+            listener->StoppedNotify();
+        }
+    }
 }
 
 /*
@@ -3345,38 +3255,34 @@ CancelWaitingAll
 */
 void Listener::CancelWaitingAll()
 {
-	CancelWaiting( 0 );
+    CancelWaiting(0);
 
-	if( !m_WaitForList )
-	{
-		return;
-	}
+    if (!m_WaitForList) {
+        return;
+    }
 
-	con_set_enum< const_str, ConList > en = *m_WaitForList;
-	con_set< const_str, ConList >::Entry *e;
-	ConList stoppedListeners;
+    con_set_enum<const_str, ConList>    en = *m_WaitForList;
+    con_set<const_str, ConList>::Entry *e;
+    ConList                             stoppedListeners;
 
-	for( e = en.NextElement(); e != NULL; e = en.NextElement() )
-	{
-		CancelWaitingSources( e->key, e->value, stoppedListeners );
-	}
+    for (e = en.NextElement(); e != NULL; e = en.NextElement()) {
+        CancelWaitingSources(e->GetKey(), e->value, stoppedListeners);
+    }
 
-	delete m_WaitForList;
-	m_WaitForList = NULL;
+    delete m_WaitForList;
+    m_WaitForList = NULL;
 
-	if( !DisableListenerNotify )
-		StoppedWaitFor(STRING_NULL, false );
+    if (!DisableListenerNotify) {
+        StoppedWaitFor(STRING_NULL, false);
+    }
 
-	for (int i = stoppedListeners.NumObjects(); i > 0; i--)
-	{
-		Listener *listener = stoppedListeners.ObjectAt(i);
+    for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
+        Listener *listener = stoppedListeners.ObjectAt(i);
 
-		if (listener)
-		{
-			if (!DisableListenerNotify)
-				listener->StoppedNotify();
-		}
-	}
+        if (listener && !DisableListenerNotify) {
+            listener->StoppedNotify();
+        }
+    }
 }
 
 /*
@@ -3384,17 +3290,15 @@ void Listener::CancelWaitingAll()
 CancelWaitingSources
 =======================
 */
-void Listener::CancelWaitingSources( const_str name, ConList &listeners, ConList &stoppedListeners )
+void Listener::CancelWaitingSources(const_str name, ConList& listeners, ConList& stoppedListeners)
 {
-	for( int i = listeners.NumObjects(); i > 0; i-- )
-	{
-		Listener *listener = listeners.ObjectAt( i );
+    for (int i = listeners.NumObjects(); i > 0; i--) {
+        Listener *listener = listeners.ObjectAt(i);
 
-		if( listener && listener->UnregisterSource( name, this ) )
-		{
-			stoppedListeners.AddObject( listener );
-		}
-	}
+        if (listener && listener->UnregisterSource(name, this)) {
+            stoppedListeners.AddObject(listener);
+        }
+    }
 }
 
 /*
@@ -3402,9 +3306,9 @@ void Listener::CancelWaitingSources( const_str name, ConList &listeners, ConList
 Notify
 =======================
 */
-void Listener::Notify( const char *name )
+void Listener::Notify(const char *name)
 {
-	Unregister( name );
+    Unregister(name);
 }
 
 /*
@@ -3414,9 +3318,7 @@ StoppedNotify
 Called when stopped notifying for a listener
 =======================
 */
-void Listener::StoppedNotify( void )
-{
-}
+void Listener::StoppedNotify(void) {}
 
 /*
 =======================
@@ -3425,9 +3327,7 @@ StartedWaitFor
 Called when started waiting for a listener
 =======================
 */
-void Listener::StartedWaitFor( void )
-{
-}
+void Listener::StartedWaitFor(void) {}
 
 /*
 =======================
@@ -3436,18 +3336,16 @@ StoppedWaitFor
 Called when stopped wait for a listener
 =======================
 */
-void Listener::StoppedWaitFor( const_str name, bool bDeleting )
-{
-}
+void Listener::StoppedWaitFor(const_str name, bool bDeleting) {}
 
 /*
 =======================
 EndOn
 =======================
 */
-void Listener::EndOn( str name, Listener *listener )
+void Listener::EndOn(str name, Listener *listener)
 {
-	EndOn( Director.AddString( name ), listener );
+    EndOn(Director.AddString(name), listener);
 }
 
 /*
@@ -3457,16 +3355,15 @@ EndOn
 Removes the specified listener when notifying
 =======================
 */
-void Listener::EndOn( const_str name, Listener *listener )
+void Listener::EndOn(const_str name, Listener *listener)
 {
-	if( !m_EndList )
-	{
-		m_EndList = new con_set < const_str, ConList >;
-	}
+    if (!m_EndList) {
+        m_EndList = new con_set<const_str, ConList>;
+    }
 
-	ConList& list = m_EndList->addKeyValue( name );
+    ConList& list = m_EndList->addKeyValue(name);
 
-	list.AddUniqueObject( listener );
+    list.AddUniqueObject(listener);
 }
 
 /*
@@ -3474,9 +3371,9 @@ void Listener::EndOn( const_str name, Listener *listener )
 Register
 =======================
 */
-void Listener::Register( str name, Listener *listener )
+void Listener::Register(str name, Listener *listener)
 {
-	Register( Director.AddString( name ), listener );
+    Register(Director.AddString(name), listener);
 }
 
 /*
@@ -3487,10 +3384,10 @@ Registers a listener, that will be notified with Unregister
 Listener is usually a ScriptThread
 =======================
 */
-void Listener::Register( const_str name, Listener *listener )
+void Listener::Register(const_str name, Listener *listener)
 {
-	RegisterSource( name, listener );
-	listener->RegisterTarget( name, this );
+    RegisterSource(name, listener);
+    listener->RegisterTarget(name, this);
 }
 
 /*
@@ -3498,16 +3395,15 @@ void Listener::Register( const_str name, Listener *listener )
 RegisterSource
 =======================
 */
-void Listener::RegisterSource( const_str name, Listener *listener )
+void Listener::RegisterSource(const_str name, Listener *listener)
 {
-	if( !m_NotifyList )
-	{
-		m_NotifyList = new con_set < const_str, ConList >;
-	}
+    if (!m_NotifyList) {
+        m_NotifyList = new con_set<const_str, ConList>;
+    }
 
-	ConList& list = m_NotifyList->addKeyValue( name );
+    ConList& list = m_NotifyList->addKeyValue(name);
 
-	list.AddObject( listener );
+    list.AddObject(listener);
 }
 
 /*
@@ -3515,17 +3411,16 @@ void Listener::RegisterSource( const_str name, Listener *listener )
 RegisterTarget
 =======================
 */
-void Listener::RegisterTarget( const_str name, Listener *listener )
+void Listener::RegisterTarget(const_str name, Listener *listener)
 {
-	if( !m_WaitForList )
-	{
-		StartedWaitFor();
-		m_WaitForList = new con_set < const_str, ConList >;
-	}
+    if (!m_WaitForList) {
+        StartedWaitFor();
+        m_WaitForList = new con_set<const_str, ConList>;
+    }
 
-	ConList& list = m_WaitForList->addKeyValue( name );
+    ConList& list = m_WaitForList->addKeyValue(name);
 
-	list.AddObject( listener );
+    list.AddObject(listener);
 }
 
 /*
@@ -3533,9 +3428,9 @@ void Listener::RegisterTarget( const_str name, Listener *listener )
 Unregister
 =======================
 */
-void Listener::Unregister( str name )
+void Listener::Unregister(str name)
 {
-	Unregister( Director.AddString( name ) );
+    Unregister(Director.AddString(name));
 }
 
 /*
@@ -3545,93 +3440,76 @@ Unregister
 Unregister listeners from the specified event
 =======================
 */
-void Listener::Unregister( const_str name )
+void Listener::Unregister(const_str name)
 {
-	if( m_EndList )
-	{
-		ConList *list = m_EndList->findKeyValue( name );
-		bool bDeleteSelf = false;
+    if (m_EndList) {
+        ConList *list        = m_EndList->findKeyValue(name);
+        bool     bDeleteSelf = false;
 
-		if( list )
-		{
-			ConList listeners = *list;
+        if (list) {
+            ConList listeners = *list;
 
-			m_EndList->remove( name );
+            m_EndList->remove(name);
 
-			if( m_EndList->isEmpty() )
-			{
-				delete m_EndList;
-				m_EndList = NULL;
-			}
+            if (m_EndList->isEmpty()) {
+                delete m_EndList;
+                m_EndList = NULL;
+            }
 
-			for( int i = listeners.NumObjects(); i > 0; i-- )
-			{
-				Listener *listener = listeners.ObjectAt( i );
+            for (int i = listeners.NumObjects(); i > 0; i--) {
+                Listener *listener = listeners.ObjectAt(i);
 
-				if( listener )
-				{
-					if( listener == this && ( bDeleteSelf ) )
-					{
-						continue;
-					}
+                if (listener) {
+                    if (listener == this && (bDeleteSelf)) {
+                        continue;
+                    }
 
-					if( listener == this )
-					{
-						bDeleteSelf = true;
-					}
+                    if (listener == this) {
+                        bDeleteSelf = true;
+                    }
 
-					delete listener;
-				}
-			}
-		}
+                    delete listener;
+                }
+            }
+        }
 
-		if( bDeleteSelf )
-		{
-			return;
-		}
-	}
+        if (bDeleteSelf) {
+            return;
+        }
+    }
 
-	if( !m_NotifyList )
-	{
-		return;
-	}
+    if (!m_NotifyList) {
+        return;
+    }
 
-	ConList *list = m_NotifyList->findKeyValue( name );
-	ConList stoppedListeners;
-	Container< const_str > stoppedNames;
+    ConList             *list = m_NotifyList->findKeyValue(name);
+    ConList              stoppedListeners;
+    Container<const_str> stoppedNames;
 
-	if( !list )
-	{
-		return;
-	}
+    if (!list) {
+        return;
+    }
 
-	UnregisterTargets( name, *list, stoppedListeners, stoppedNames );
+    UnregisterTargets(name, *list, stoppedListeners, stoppedNames);
 
-	m_NotifyList->remove( name );
+    m_NotifyList->remove(name);
 
-	if( m_NotifyList->isEmpty() )
-	{
-		delete m_NotifyList;
-		m_NotifyList = NULL;
+    if (m_NotifyList->isEmpty()) {
+        delete m_NotifyList;
+        m_NotifyList = NULL;
 
-		if( !DisableListenerNotify )
-		{
-			StoppedNotify();
-		}
-	}
+        if (!DisableListenerNotify) {
+            StoppedNotify();
+        }
+    }
 
-	if( !DisableListenerNotify )
-	{
-		for( int i = stoppedListeners.NumObjects(); i > 0; i-- )
-		{
-			Listener *listener = stoppedListeners.ObjectAt( i );
+    for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
+        Listener *listener = stoppedListeners.ObjectAt(i);
 
-			if( listener )
-			{
-				listener->StoppedWaitFor( name, false );
-			}
-		}
-	}
+        if (listener && !DisableListenerNotify) {
+            listener->StoppedWaitFor(name, false);
+        }
+    }
 }
 
 /*
@@ -3639,9 +3517,9 @@ void Listener::Unregister( const_str name )
 Unregister
 =======================
 */
-void Listener::Unregister( str name, Listener *listener )
+void Listener::Unregister(str name, Listener *listener)
 {
-	Unregister( Director.AddString( name ) );
+    Unregister(Director.AddString(name));
 }
 
 /*
@@ -3651,21 +3529,15 @@ Unregister
 Unregister a specified listener with the specified label
 =======================
 */
-void Listener::Unregister( const_str name, Listener *listener )
+void Listener::Unregister(const_str name, Listener *listener)
 {
-	if( UnregisterSource( name, listener ) )
-	{
-		if( !DisableListenerNotify ) {
-			StoppedNotify();
-		}
-	}
+    if (UnregisterSource(name, listener) && !DisableListenerNotify) {
+        StoppedNotify();
+    }
 
-	if( listener->UnregisterTarget( name, this ) )
-	{
-		if( !DisableListenerNotify ) {
-			listener->StoppedWaitFor( name, false );
-		}
-	}
+    if (listener->UnregisterTarget(name, this) && !DisableListenerNotify) {
+        listener->StoppedWaitFor(name, false);
+    }
 }
 
 /*
@@ -3673,51 +3545,44 @@ void Listener::Unregister( const_str name, Listener *listener )
 UnregisterAll
 =======================
 */
-void Listener::UnregisterAll( void )
+void Listener::UnregisterAll(void)
 {
-	Unregister( 0 );
+    Unregister(0);
 
-	if( m_EndList )
-	{
-		delete m_EndList;
-		m_EndList = NULL;
-	}
+    if (m_EndList) {
+        delete m_EndList;
+        m_EndList = NULL;
+    }
 
-	if( !m_NotifyList )
-	{
-		return;
-	}
+    if (!m_NotifyList) {
+        return;
+    }
 
-	con_set_enum < const_str, ConList > en = *m_NotifyList;
-	con_set< const_str, ConList >::Entry *e;
-	ConList stoppedListeners;
-	Container< const_str > stoppedNames;
+    con_set_enum<const_str, ConList>    en = *m_NotifyList;
+    con_set<const_str, ConList>::Entry *e;
+    ConList                             stoppedListeners;
+    Container<const_str>                stoppedNames;
 
-	en = *m_NotifyList;
+    en = *m_NotifyList;
 
-	for( e = en.NextElement(); e != NULL; e = en.NextElement() )
-	{
-		UnregisterTargets( e->key, e->value, stoppedListeners, stoppedNames );
-	}
+    for (e = en.NextElement(); e != NULL; e = en.NextElement()) {
+        UnregisterTargets(e->GetKey(), e->value, stoppedListeners, stoppedNames);
+    }
 
-	delete m_NotifyList;
-	m_NotifyList = NULL;
+    delete m_NotifyList;
+    m_NotifyList = NULL;
 
-	if( !DisableListenerNotify ) {
-		StoppedNotify();
-	}
+    if (!DisableListenerNotify) {
+        StoppedNotify();
+    }
 
-	for( int i = stoppedListeners.NumObjects(); i > 0; i-- )
-	{
-		Listener *listener = stoppedListeners.ObjectAt( i );
+    for (int i = stoppedListeners.NumObjects(); i > 0; i--) {
+        Listener *listener = stoppedListeners.ObjectAt(i);
 
-		if( listener )
-		{
-			if( !DisableListenerNotify ) {
-				listener->StoppedWaitFor( stoppedNames.ObjectAt( i ), true );
-			}
-		}
-	}
+        if (listener && !DisableListenerNotify) {
+            listener->StoppedWaitFor(stoppedNames.ObjectAt(i), true);
+        }
+    }
 }
 
 /*
@@ -3725,42 +3590,37 @@ void Listener::UnregisterAll( void )
 UnregisterSource
 =======================
 */
-bool Listener::UnregisterSource( const_str name, Listener *listener )
+bool Listener::UnregisterSource(const_str name, Listener *listener)
 {
-	if( !m_NotifyList )
-	{
-		return false;
-	}
+    ConList *list;
 
-	ConList *list = m_NotifyList->findKeyValue( name );
-	bool found = false;
+    if (!m_NotifyList) {
+        return false;
+    }
 
-	if( !list )
-	{
-		return false;
-	}
+    list = m_NotifyList->findKeyValue(name);
 
-	for( int i = list->NumObjects(); i > 0; i-- )
-	{
-		if( list->ObjectAt( i ) == listener )
-		{
-			list->RemoveObjectAt( i );
-			found = true;
-		}
-	}
+    if (!list) {
+        return false;
+    }
 
-	if( list->NumObjects() == 0 )
-	{
-		m_NotifyList->remove( name );
+    list->RemoveObject(listener);
 
-		if( m_NotifyList->isEmpty() )
-		{
-			delete m_NotifyList;
-			m_NotifyList = NULL;
-		}
-	}
+    if (list->NumObjects()) {
+        return false;
+    }
 
-	return found;
+    m_NotifyList->remove(name);
+
+    if (!m_NotifyList->isEmpty()) {
+        // still has objects in it
+        return false;
+    }
+
+    delete m_NotifyList;
+    m_NotifyList = NULL;
+
+    return true;
 }
 
 /*
@@ -3768,42 +3628,37 @@ bool Listener::UnregisterSource( const_str name, Listener *listener )
 UnregisterTarget
 =======================
 */
-bool Listener::UnregisterTarget( const_str name, Listener *listener )
+bool Listener::UnregisterTarget(const_str name, Listener *listener)
 {
-	if( !m_WaitForList )
-	{
-		return false;
-	}
+    ConList *list;
 
-	ConList *list = m_WaitForList->findKeyValue( name );
-	bool found = false;
+    if (!m_WaitForList) {
+        return false;
+    }
 
-	if( !list )
-	{
-		return false;
-	}
+    list = m_WaitForList->findKeyValue(name);
 
-	for( int i = list->NumObjects(); i > 0; i-- )
-	{
-		if( list->ObjectAt( i ) == listener )
-		{
-			list->RemoveObjectAt( i );
-			found = true;
-		}
-	}
+    if (!list) {
+        return false;
+    }
 
-	if( list->NumObjects() == 0 )
-	{
-		m_WaitForList->remove( name );
+    list->RemoveObject(listener);
 
-		if( m_WaitForList->isEmpty() )
-		{
-			delete m_WaitForList;
-			m_WaitForList = NULL;
-		}
-	}
+    if (list->NumObjects()) {
+        return false;
+    }
 
-	return found;
+    m_WaitForList->remove(name);
+
+    if (!m_WaitForList->isEmpty()) {
+        // still has objects in it
+        return false;
+    }
+
+    delete m_WaitForList;
+    m_WaitForList = NULL;
+
+    return true;
 }
 
 /*
@@ -3811,18 +3666,18 @@ bool Listener::UnregisterTarget( const_str name, Listener *listener )
 UnregisterTargets
 =======================
 */
-void Listener::UnregisterTargets( const_str name, ConList &listeners, ConList &stoppedListeners, Container< const_str > &stoppedNames )
+void Listener::UnregisterTargets(
+    const_str name, ConList& listeners, ConList& stoppedListeners, Container<const_str>& stoppedNames
+)
 {
-	for( int i = listeners.NumObjects(); i > 0; i-- )
-	{
-		Listener *listener = listeners.ObjectAt( i );
+    for (int i = listeners.NumObjects(); i > 0; i--) {
+        Listener *listener = listeners.ObjectAt(i);
 
-		if( listener && listener->UnregisterTarget( name, this ) )
-		{
-			stoppedListeners.AddObject( listener );
-			stoppedNames.AddObject( name );
-		}
-	}
+        if (listener && listener->UnregisterTarget(name, this)) {
+            stoppedListeners.AddObject(listener);
+            stoppedNames.AddObject(name);
+        }
+    }
 }
 
 /*
@@ -3833,10 +3688,10 @@ Abort the listener from registration of the specified label
 Doesn't notify
 =======================
 */
-void Listener::AbortRegistration( const_str name, Listener *l )
+void Listener::AbortRegistration(const_str name, Listener *l)
 {
-	UnregisterSource( name, l );
-	l->UnregisterTarget( name, this );
+    UnregisterSource(name, l);
+    l->UnregisterTarget(name, this);
 }
 
 /*
@@ -3844,9 +3699,9 @@ void Listener::AbortRegistration( const_str name, Listener *l )
 RegisterSize
 =======================
 */
-int Listener::RegisterSize( str name ) const
+int Listener::RegisterSize(str name) const
 {
-	return RegisterSize( Director.AddString( name ) );
+    return RegisterSize(Director.AddString(name));
 }
 
 /*
@@ -3856,25 +3711,22 @@ RegisterSize
 Returns how many listeners in the notify list
 =======================
 */
-int Listener::RegisterSize( const_str name ) const
+int Listener::RegisterSize(const_str name) const
 {
-	ConList *listeners;
+    ConList *listeners;
 
-	if( !m_NotifyList ) {
-		return 0;
-	}
+    if (!m_NotifyList) {
+        return 0;
+    }
 
-	listeners = m_NotifyList->findKeyValue( name );
+    listeners = m_NotifyList->findKeyValue(name);
 
-	// return the number of listeners waiting for this listener
-	if( listeners )
-	{
-		return listeners->NumObjects();
-	}
-	else
-	{
-		return 0;
-	}
+    // return the number of listeners waiting for this listener
+    if (listeners) {
+        return listeners->NumObjects();
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -3882,9 +3734,9 @@ int Listener::RegisterSize( const_str name ) const
 WaitingSize
 =======================
 */
-int Listener::WaitingSize( str name ) const
+int Listener::WaitingSize(str name) const
 {
-	return WaitingSize( Director.AddString( name ) );
+    return WaitingSize(Director.AddString(name));
 }
 
 /*
@@ -3894,25 +3746,22 @@ WaitingSize
 Returns how many listeners in the wait list
 =======================
 */
-int Listener::WaitingSize( const_str name ) const
+int Listener::WaitingSize(const_str name) const
 {
-	ConList *listeners;
+    ConList *listeners;
 
-	if( !m_WaitForList ) {
-		return 0;
-	}
+    if (!m_WaitForList) {
+        return 0;
+    }
 
-	listeners = m_WaitForList->findKeyValue( name );
+    listeners = m_WaitForList->findKeyValue(name);
 
-	// return the number of listeners this listener is waiting for
-	if( listeners )
-	{
-		return listeners->NumObjects();
-	}
-	else
-	{
-		return 0;
-	}
+    // return the number of listeners this listener is waiting for
+    if (listeners) {
+        return listeners->NumObjects();
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -3920,9 +3769,9 @@ int Listener::WaitingSize( const_str name ) const
 WaitTillDisabled
 =======================
 */
-bool Listener::WaitTillDisabled( str s )
+bool Listener::WaitTillDisabled(str s)
 {
-	return WaitTillDisabled( Director.AddString( s ) );
+    return WaitTillDisabled(Director.AddString(s));
 }
 
 /*
@@ -3932,9 +3781,9 @@ WaitTillDisabled
 Returns true if the specified waittill is disabled
 =======================
 */
-bool Listener::WaitTillDisabled( const_str s )
+bool Listener::WaitTillDisabled(const_str s)
 {
-	return !WaitTillAllowed(s);
+    return !WaitTillAllowed(s);
 }
 
 #endif
@@ -3944,9 +3793,9 @@ bool Listener::WaitTillDisabled( const_str s )
 GetFlags
 =======================
 */
-int Listener::GetFlags( Event *event ) const
+int Listener::GetFlags(Event *event) const
 {
-	return classinfo()->GetFlags( event );
+    return classinfo()->GetFlags(event);
 }
 
 /*
@@ -3954,20 +3803,22 @@ int Listener::GetFlags( Event *event ) const
 ValidEvent
 =======================
 */
-qboolean Listener::ValidEvent( str name ) const
+qboolean Listener::ValidEvent(str name) const
 {
-	int num;
-	EventDef *def;
+    int       num;
+    EventDef *def;
 
-	num = Event::FindEventNum( name );
-	if( !num )
-		return qfalse;
+    num = Event::FindEventNum(name);
+    if (!num) {
+        return qfalse;
+    }
 
-	def = classinfo()->GetDef( num );
-	if( !def )
-		return qfalse;
+    def = classinfo()->GetDef(num);
+    if (!def) {
+        return qfalse;
+    }
 
-	return qtrue;
+    return qtrue;
 }
 
 //==========================
@@ -3976,17 +3827,26 @@ qboolean Listener::ValidEvent( str name ) const
 
 /*
 =======================
-EventDelete
+Remove
 =======================
 */
-void Listener::EventDelete( Event *ev )
+void Listener::Remove(Event *ev)
 {
-	if( ev->NumArgs() )
-	{
-		ScriptError( "Arguments not allowed." );
-	}
+    if (ev->NumArgs()) {
+        ScriptError("Arguments not allowed.");
+    }
 
-	delete this;
+    delete this;
+}
+
+/*
+=======================
+ScriptRemove
+=======================
+*/
+void Listener::ScriptRemove(Event *ev)
+{
+    PostEvent(EV_Remove, 0);
 }
 
 /*
@@ -3994,9 +3854,9 @@ void Listener::EventDelete( Event *ev )
 EventInheritsFrom
 =======================
 */
-void Listener::EventInheritsFrom( Event *ev )
+void Listener::EventInheritsFrom(Event *ev)
 {
-	ev->AddInteger( inheritsFrom( ev->GetString( 1 ) ) );
+    ev->AddInteger(inheritsFrom(ev->GetString(1)));
 }
 
 /*
@@ -4004,9 +3864,9 @@ void Listener::EventInheritsFrom( Event *ev )
 EventIsInheritedBy
 =======================
 */
-void Listener::EventIsInheritedBy( Event *ev )
+void Listener::EventIsInheritedBy(Event *ev)
 {
-	ev->AddInteger( isInheritedBy( ev->GetString( 1 ) ) );
+    ev->AddInteger(isInheritedBy(ev->GetString(1)));
 }
 
 /*
@@ -4014,9 +3874,9 @@ void Listener::EventIsInheritedBy( Event *ev )
 GetClassname
 =======================
 */
-void Listener::GetClassname( Event *ev )
+void Listener::GetClassname(Event *ev)
 {
-	ev->AddString( getClassname() );
+    ev->AddString(getClassname());
 }
 
 /*
@@ -4024,21 +3884,19 @@ void Listener::GetClassname( Event *ev )
 CommandDelay
 =======================
 */
-void Listener::CommandDelay( Event *ev )
+void Listener::CommandDelay(Event *ev)
 {
-	if( ev->NumArgs() < 2 )
-	{
-		ScriptError( "Not enough arguments." );
-	}
+    if (ev->NumArgs() < 2) {
+        ScriptError("Not enough arguments.");
+    }
 
-	Event *e = new Event( ev->GetString( 2 ) );
+    Event *e = new Event(ev->GetString(2));
 
-	for( int i = 3; i <= ev->NumArgs(); i++ )
-	{
-		e->AddValue( ev->GetValue( i ) );
-	}
+    for (int i = 3; i <= ev->NumArgs(); i++) {
+        e->AddValue(ev->GetValue(i));
+    }
 
-	PostEvent( e, ev->GetFloat( 1 ) );
+    PostEvent(e, ev->GetFloat(1));
 }
 
 #ifdef WITH_SCRIPT_ENGINE
@@ -4050,9 +3908,9 @@ CancelFor
 Removes all listeners in the notify list
 =======================
 */
-void Listener::CancelFor( Event *ev )
+void Listener::CancelFor(Event *ev)
 {
-	BroadcastEvent( ev->GetConstString( 1 ), EV_Remove );
+    BroadcastEvent(ev->GetConstString(1), EV_Remove);
 }
 
 /*
@@ -4062,9 +3920,9 @@ EventDelayThrow
 Same as EventThrow
 =======================
 */
-void Listener::EventDelayThrow( Event *ev )
+void Listener::EventDelayThrow(Event *ev)
 {
-	BroadcastEvent( 0, *ev );
+    BroadcastEvent(0, *ev);
 }
 
 /*
@@ -4072,16 +3930,15 @@ void Listener::EventDelayThrow( Event *ev )
 EventEndOn
 =======================
 */
-void Listener::EventEndOn( Event *ev )
+void Listener::EventEndOn(Event *ev)
 {
-	const_str name = ev->GetConstString( 1 );
+    const_str name = ev->GetConstString(1);
 
-	if( Director.CurrentThread() == this )
-	{
-		ScriptError( "cannot end for the current thread!" );
-	}
+    if (Director.CurrentThread() == this) {
+        ScriptError("cannot end for the current thread!");
+    }
 
-	EndOn( name, Director.CurrentThread() );
+    EndOn(name, Director.CurrentThread());
 }
 
 /*
@@ -4089,9 +3946,9 @@ void Listener::EventEndOn( Event *ev )
 EventGetOwner
 =======================
 */
-void Listener::EventGetOwner( Event *ev )
+void Listener::EventGetOwner(Event *ev)
 {
-	ev->AddListener( GetScriptOwner() );
+    ev->AddListener(GetScriptOwner());
 }
 
 /*
@@ -4099,11 +3956,11 @@ void Listener::EventGetOwner( Event *ev )
 EventNotify
 =======================
 */
-void Listener::EventNotify( Event *ev )
+void Listener::EventNotify(Event *ev)
 {
-	str name = ev->GetString( 1 );
+    str name = ev->GetString(1);
 
-	Notify( name );
+    Notify(name);
 }
 
 /*
@@ -4111,9 +3968,9 @@ void Listener::EventNotify( Event *ev )
 EventThrow
 =======================
 */
-void Listener::EventThrow( Event *ev )
+void Listener::EventThrow(Event *ev)
 {
-	BroadcastEvent( 0, *ev );
+    BroadcastEvent(0, *ev);
 }
 
 /*
@@ -4121,9 +3978,9 @@ void Listener::EventThrow( Event *ev )
 EventUnregister
 =======================
 */
-void Listener::EventUnregister( Event *ev )
+void Listener::EventUnregister(Event *ev)
 {
-	Unregister( ev->GetConstString( 1 ) );
+    Unregister(ev->GetConstString(1));
 }
 
 /*
@@ -4133,23 +3990,21 @@ WaitTill
 Wait until event of type name
 =======================
 */
-void Listener::WaitTill( Event *ev )
+void Listener::WaitTill(Event *ev)
 {
-	const_str name;
+    const_str name;
 
-	if( Director.CurrentThread() == this )
-	{
-		ScriptError( "cannot waittill on the current thread!" );
-	}
+    if (Director.CurrentThread() == this) {
+        ScriptError("cannot waittill on the current thread!");
+    }
 
-	name = ev->GetConstString( 1 );
+    name = ev->GetConstString(1);
 
-	if( !WaitTillAllowed( name ) )
-	{
-		ScriptError( "invalid waittill %s for '%s'", Director.GetString( name ).c_str(), getClassname() );
-	}
+    if (!WaitTillAllowed(name)) {
+        ScriptError("invalid waittill %s for '%s'", Director.GetString(name).c_str(), getClassname());
+    }
 
-	Register( name, Director.CurrentThread() );
+    Register(name, Director.CurrentThread());
 }
 
 /*
@@ -4159,26 +4014,24 @@ WaitTillTimeout
 Wait until event of type name with a timeout time
 =======================
 */
-void Listener::WaitTillTimeout( Event *ev )
+void Listener::WaitTillTimeout(Event *ev)
 {
-	const_str name;
-	float timeout_time;
+    const_str name;
+    float     timeout_time;
 
-	if( Director.CurrentThread() == this )
-	{
-		ScriptError( "cannot waittill on the current thread!" );
-	}
+    if (Director.CurrentThread() == this) {
+        ScriptError("cannot waittill on the current thread!");
+    }
 
-	timeout_time = ev->GetFloat( 1 );
-	name = ev->GetConstString( 2 );
-	
-	if( !WaitTillAllowed( name ) )
-	{
-		ScriptError( "invalid waittill %s for '%s'", Director.GetString( name ).c_str(), getClassname() );
-	}
+    timeout_time = ev->GetFloat(1);
+    name         = ev->GetConstString(2);
 
-	Register( name, Director.CurrentThread() );
-	Director.CurrentThread()->PostEvent( EV_ScriptThread_CancelWaiting, timeout_time );
+    if (!WaitTillAllowed(name)) {
+        ScriptError("invalid waittill %s for '%s'", Director.GetString(name).c_str(), getClassname());
+    }
+
+    Register(name, Director.CurrentThread());
+    Director.CurrentThread()->PostEvent(EV_ScriptThread_CancelWaiting, timeout_time);
 }
 
 /*
@@ -4188,26 +4041,23 @@ WaitTillAny
 Wait until any event of type name
 =======================
 */
-void Listener::WaitTillAny( Event *ev )
+void Listener::WaitTillAny(Event *ev)
 {
-	const_str name;
+    const_str name;
 
-	if( Director.CurrentThread() == this )
-	{
-		ScriptError( "cannot waittill any on the current thread!" );
-	}
+    if (Director.CurrentThread() == this) {
+        ScriptError("cannot waittill any on the current thread!");
+    }
 
-	for( int i = 1; i <= ev->NumArgs(); i++ )
-	{
-		name = ev->GetConstString( i );
-		
-		if( !WaitTillAllowed( name ) )
-		{
-			ScriptError( "invalid waittill %s for '%s'", Director.GetString( name ).c_str(), getClassname() );
-		}
+    for (int i = 1; i <= ev->NumArgs(); i++) {
+        name = ev->GetConstString(i);
 
-		Register( name, Director.CurrentThread() );
-	}
+        if (!WaitTillAllowed(name)) {
+            ScriptError("invalid waittill %s for '%s'", Director.GetString(name).c_str(), getClassname());
+        }
+
+        Register(name, Director.CurrentThread());
+    }
 }
 
 /*
@@ -4217,31 +4067,28 @@ WaitTillAnyTimeout
 Wait until any event of type name with a timeout time
 =======================
 */
-void Listener::WaitTillAnyTimeout( Event *ev )
+void Listener::WaitTillAnyTimeout(Event *ev)
 {
-	const_str name;
-	float timeout_time;
+    const_str name;
+    float     timeout_time;
 
-	if( Director.CurrentThread() == this )
-	{
-		ScriptError( "cannot waittill any on the current thread!" );
-	}
+    if (Director.CurrentThread() == this) {
+        ScriptError("cannot waittill any on the current thread!");
+    }
 
-	timeout_time = ev->GetFloat( 1 );
+    timeout_time = ev->GetFloat(1);
 
-	for( int i = 1; i <= ev->NumArgs(); i++ )
-	{
-		name = ev->GetConstString( i );
-		
-		if( !WaitTillAllowed( name ) )
-		{
-			ScriptError( "invalid waittill %s for '%s'", Director.GetString( name ).c_str(), getClassname() );
-		}
+    for (int i = 1; i <= ev->NumArgs(); i++) {
+        name = ev->GetConstString(i);
 
-		Register( name, Director.CurrentThread() );
-	}
+        if (!WaitTillAllowed(name)) {
+            ScriptError("invalid waittill %s for '%s'", Director.GetString(name).c_str(), getClassname());
+        }
 
-	Director.CurrentThread()->PostEvent( EV_ScriptThread_CancelWaiting, timeout_time );
+        Register(name, Director.CurrentThread());
+    }
+
+    Director.CurrentThread()->PostEvent(EV_ScriptThread_CancelWaiting, timeout_time);
 }
 
 /*
@@ -4249,15 +4096,11 @@ void Listener::WaitTillAnyTimeout( Event *ev )
 ExecuteScriptInternal
 =======================
 */
-void Listener::ExecuteScriptInternal( Event *ev, ScriptVariable& returnValue )
+void Listener::ExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
-	SafePtr< ScriptThread > thread = CreateScriptInternal( ev->GetValue( 1 ) );
-	ScriptThread *currentThread;
-	bool fReturn = returnValue.GetType() != VARIABLE_NONE;
+    ScriptThread *thread = CreateScriptInternal(ev->GetValue(1));
 
-	thread->ScriptExecute( &ev->data[ 1 ], ev->dataSize - 1, returnValue );
-
-	currentThread = Director.m_CurrentThread;
+    thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
 
 /*
@@ -4265,15 +4108,11 @@ void Listener::ExecuteScriptInternal( Event *ev, ScriptVariable& returnValue )
 ExecuteThreadInternal
 =======================
 */
-void Listener::ExecuteThreadInternal( Event *ev, ScriptVariable& returnValue )
+void Listener::ExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
-	SafePtr< ScriptThread > thread = CreateThreadInternal( ev->GetValue( 1 ) );
-	ScriptThread *currentThread;
-	bool fReturn = returnValue.GetType() != VARIABLE_NONE;
+    ScriptThread *thread = CreateThreadInternal(ev->GetValue(1));
 
-	thread->ScriptExecute( &ev->data[ 1 ], ev->dataSize - 1, returnValue );
-
-	currentThread = Director.m_CurrentThread;
+    thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
 
 /*
@@ -4281,13 +4120,14 @@ void Listener::ExecuteThreadInternal( Event *ev, ScriptVariable& returnValue )
 WaitExecuteScriptInternal
 =======================
 */
-void Listener::WaitExecuteScriptInternal( Event *ev, ScriptVariable& returnValue )
+void Listener::WaitExecuteScriptInternal(Event *ev, ScriptVariable& returnValue)
 {
-	ScriptThread *thread = CreateScriptInternal( ev->GetValue( 1 ) );
+    ScriptThread *currentThread = Director.CurrentScriptThread();
+    ScriptThread *thread        = CreateScriptInternal(ev->GetValue(1));
 
-	thread->GetScriptClass()->Register( 0, Director.CurrentThread() );
+    thread->GetScriptClass()->Register(0, currentThread);
 
-	thread->ScriptExecute( &ev->data[ 1 ], ev->dataSize - 1, returnValue );
+    thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
 
 /*
@@ -4295,13 +4135,14 @@ void Listener::WaitExecuteScriptInternal( Event *ev, ScriptVariable& returnValue
 WaitExecuteThreadInternal
 =======================
 */
-void Listener::WaitExecuteThreadInternal( Event *ev, ScriptVariable& returnValue )
+void Listener::WaitExecuteThreadInternal(Event *ev, ScriptVariable& returnValue)
 {
-	ScriptThread *thread = CreateThreadInternal( ev->GetValue( 1 ) );
+    ScriptThread *currentThread = Director.CurrentScriptThread();
+    ScriptThread *thread        = CreateThreadInternal(ev->GetValue(1));
 
-	thread->GetScriptClass()->Register( 0, Director.CurrentThread() );
+    thread->Register(0, currentThread);
 
-	thread->ScriptExecute( &ev->data[ 1 ], ev->dataSize - 1, returnValue );
+    thread->ScriptExecute(&ev->data[1], ev->dataSize - 1, returnValue);
 }
 
 /*
@@ -4309,39 +4150,38 @@ void Listener::WaitExecuteThreadInternal( Event *ev, ScriptVariable& returnValue
 CreateScriptInternal
 =======================
 */
-ScriptThread *Listener::CreateScriptInternal( const ScriptVariable& label )
+ScriptThread *Listener::CreateScriptInternal(const ScriptVariable& label)
 {
-	GameScript *scr;
-	ScriptThread *thread = NULL;
+    GameScript   *scr;
+    ScriptThread *thread = NULL;
 
-	if( label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING )
-	{
-		if( label.GetType() == VARIABLE_CONSTSTRING )
-			thread = Director.CreateScriptThread( Director.GetGameScript( label.stringValue() ), this, "" );
-		else
-			thread = Director.CreateScriptThread( Director.GetGameScript( label.constStringValue() ), this, "" );
-	}
-	else if( label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1 )
-	{
-		ScriptVariable *script = label[ 1 ];
-		ScriptVariable *labelname = label[ 2 ];
+    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+        if (label.GetType() == VARIABLE_CONSTSTRING) {
+            scr = Director.GetGameScript(label.constStringValue());
+        } else {
+            scr = Director.GetGameScript(label.stringValue());
+        }
+        thread = Director.CreateScriptThread(scr, this, "");
+    } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
+        ScriptVariable *script    = label[1];
+        ScriptVariable *labelname = label[2];
 
-		if( script->GetType() == VARIABLE_CONSTSTRING )
-			scr = Director.GetGameScript( script->constStringValue() );
-		else
-			scr = Director.GetGameScript( script->stringValue() );
+        if (script->GetType() == VARIABLE_CONSTSTRING) {
+            scr = Director.GetGameScript(script->constStringValue());
+        } else {
+            scr = Director.GetGameScript(script->stringValue());
+        }
 
-		if( labelname->GetType() == VARIABLE_CONSTSTRING )
-			thread = Director.CreateScriptThread( scr, this, labelname->constStringValue() );
-		else
-			thread = Director.CreateScriptThread( scr, this, labelname->stringValue() );
-	}
-	else
-	{
-		ScriptError( "Listener::CreateScriptInternal: bad label type '%s'", label.GetTypeName() );
-	}
+        if (labelname->GetType() == VARIABLE_CONSTSTRING) {
+            thread = Director.CreateScriptThread(scr, this, labelname->constStringValue());
+        } else {
+            thread = Director.CreateScriptThread(scr, this, labelname->stringValue());
+        }
+    } else {
+        ScriptError("Listener::CreateScriptInternal: bad label type '%s'", label.GetTypeName());
+    }
 
-	return thread;
+    return thread;
 }
 
 /*
@@ -4349,42 +4189,41 @@ ScriptThread *Listener::CreateScriptInternal( const ScriptVariable& label )
 CreateThreadInternal
 =======================
 */
-ScriptThread *Listener::CreateThreadInternal( const ScriptVariable& label )
+ScriptThread *Listener::CreateThreadInternal(const ScriptVariable& label)
 {
-	GameScript *scr;
-	ScriptThread *thread = NULL;
+    GameScript   *scr;
+    ScriptThread *thread = NULL;
+    ScriptClass  *scriptClass;
 
-	if( label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING )
-	{
-		ScriptClass *scriptClass = Director.CurrentScriptClass();
-		scr = scriptClass->GetScript();
+    if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
+        scriptClass = Director.CurrentScriptClass();
+        scr         = scriptClass->GetScript();
 
-		if( label.GetType() == VARIABLE_CONSTSTRING )
-			thread = Director.CreateScriptThread( scr, this, label.constStringValue() );
-		else
-			thread = Director.CreateScriptThread( scr, this, label.stringValue() );
-	}
-	else if( label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1 )
-	{
-		ScriptVariable *script = label[ 1 ];
-		ScriptVariable *labelname = label[ 2 ];
+        if (label.GetType() == VARIABLE_CONSTSTRING) {
+            thread = Director.CreateScriptThread(scr, this, label.constStringValue());
+        } else {
+            thread = Director.CreateScriptThread(scr, this, label.stringValue());
+        }
+    } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
+        ScriptVariable *script    = label[1];
+        ScriptVariable *labelname = label[2];
 
-		if( script->GetType() == VARIABLE_CONSTSTRING )
-			scr = Director.GetGameScript( script->constStringValue() );
-		else
-			scr = Director.GetGameScript( script->stringValue() );
+        if (script->GetType() == VARIABLE_CONSTSTRING) {
+            scr = Director.GetGameScript(script->constStringValue());
+        } else {
+            scr = Director.GetGameScript(script->stringValue());
+        }
 
-		if( labelname->GetType() == VARIABLE_CONSTSTRING )
-			thread = Director.CreateScriptThread( scr, this, labelname->constStringValue() );
-		else
-			thread = Director.CreateScriptThread( scr, this, labelname->stringValue() );
-	}
-	else
-	{
-		ScriptError( "ScriptClass::CreateThreadInternal: bad argument format" );
-	}
+        if (labelname->GetType() == VARIABLE_CONSTSTRING) {
+            thread = Director.CreateScriptThread(scr, this, labelname->constStringValue());
+        } else {
+            thread = Director.CreateScriptThread(scr, this, labelname->stringValue());
+        }
+    } else {
+        ScriptError("Listener::CreateThreadInternal: bad argument format");
+    }
 
-	return thread;
+    return thread;
 }
 
 /*
@@ -4392,15 +4231,15 @@ ScriptThread *Listener::CreateThreadInternal( const ScriptVariable& label )
 CreateReturnThread
 =======================
 */
-void Listener::CreateReturnThread( Event *ev )
+void Listener::CreateReturnThread(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	returnValue.newPointer();
+    returnValue.newPointer();
 
-	ExecuteThreadInternal( ev, returnValue );
+    ExecuteThreadInternal(ev, returnValue);
 
-	ev->AddValue( returnValue );
+    ev->AddValue(returnValue);
 }
 
 /*
@@ -4408,11 +4247,11 @@ void Listener::CreateReturnThread( Event *ev )
 CreateThread
 =======================
 */
-void Listener::CreateThread( Event *ev )
+void Listener::CreateThread(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	ExecuteThreadInternal(ev, returnValue);
+    ExecuteThreadInternal(ev, returnValue);
 }
 
 /*
@@ -4420,15 +4259,15 @@ void Listener::CreateThread( Event *ev )
 ExecuteReturnScript
 =======================
 */
-void Listener::ExecuteReturnScript( Event *ev )
+void Listener::ExecuteReturnScript(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	returnValue.newPointer();
+    returnValue.newPointer();
 
-	ExecuteScriptInternal( ev, returnValue );
+    ExecuteScriptInternal(ev, returnValue);
 
-	ev->AddValue( returnValue );
+    ev->AddValue(returnValue);
 }
 
 /*
@@ -4436,11 +4275,11 @@ void Listener::ExecuteReturnScript( Event *ev )
 ExecuteScript
 =======================
 */
-void Listener::ExecuteScript( Event *ev )
+void Listener::ExecuteScript(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	ExecuteScriptInternal(ev, returnValue);
+    ExecuteScriptInternal(ev, returnValue);
 }
 
 /*
@@ -4448,15 +4287,15 @@ void Listener::ExecuteScript( Event *ev )
 WaitCreateReturnThread
 =======================
 */
-void Listener::WaitCreateReturnThread( Event *ev )
+void Listener::WaitCreateReturnThread(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	returnValue.newPointer();
+    returnValue.newPointer();
 
-	WaitExecuteThreadInternal( ev, returnValue );
+    WaitExecuteThreadInternal(ev, returnValue);
 
-	ev->AddValue( returnValue );
+    ev->AddValue(returnValue);
 }
 
 /*
@@ -4464,11 +4303,11 @@ void Listener::WaitCreateReturnThread( Event *ev )
 WaitCreateThread
 =======================
 */
-void Listener::WaitCreateThread( Event *ev )
+void Listener::WaitCreateThread(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	WaitExecuteThreadInternal( ev, returnValue );
+    WaitExecuteThreadInternal(ev, returnValue);
 }
 
 /*
@@ -4476,15 +4315,15 @@ void Listener::WaitCreateThread( Event *ev )
 WaitExecuteReturnScript
 =======================
 */
-void Listener::WaitExecuteReturnScript( Event *ev )
+void Listener::WaitExecuteReturnScript(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	returnValue.newPointer();
+    returnValue.newPointer();
 
-	WaitExecuteScriptInternal( ev, returnValue );
+    WaitExecuteScriptInternal(ev, returnValue);
 
-	ev->AddValue( returnValue );
+    ev->AddValue(returnValue);
 }
 
 /*
@@ -4492,11 +4331,11 @@ void Listener::WaitExecuteReturnScript( Event *ev )
 WaitExecuteScript
 =======================
 */
-void Listener::WaitExecuteScript( Event *ev )
+void Listener::WaitExecuteScript(Event *ev)
 {
-	ScriptVariable returnValue;
+    ScriptVariable returnValue;
 
-	WaitExecuteScriptInternal( ev, returnValue );
+    WaitExecuteScriptInternal(ev, returnValue);
 }
 
 /*
@@ -4506,23 +4345,19 @@ ExecuteThread
 Execute a thread with optionally parameters
 =======================
 */
-void Listener::ExecuteThread( str scriptName, str labelName, Event *params )
+void Listener::ExecuteThread(str scriptName, str labelName, Event *params)
 {
-	ScriptThread *thread = Director.CreateThread( scriptName, labelName, this );
+    ScriptThread *thread = Director.CreateThread(scriptName, labelName, this);
 
-	try
-	{
-		if( !thread )
-		{
-			return;
-		}
+    try {
+        if (!thread) {
+            return;
+        }
 
-		thread->Execute( params );
-	}
-	catch( ScriptException& exc )
-	{
-		EVENT_DPrintf( "Listener::ExecuteThread: %s\n", exc.string.c_str() );
-	}
+        thread->Execute(params);
+    } catch (ScriptException& exc) {
+        EVENT_DPrintf("Listener::ExecuteThread: %s\n", exc.string.c_str());
+    }
 }
 
 /*
@@ -4532,57 +4367,47 @@ ExecuteThread
 Execute a thread with optionally parameters
 =======================
 */
-void Listener::ExecuteThread( str scriptName, str labelName, Event& params )
+void Listener::ExecuteThread(str scriptName, str labelName, Event& params)
 {
-	ScriptThread *thread = Director.CreateThread( scriptName, labelName, this );
+    ScriptThread *thread = Director.CreateThread(scriptName, labelName, this);
 
-	try
-	{
-		if( !thread )
-		{
-			return;
-		}
+    try {
+        if (!thread) {
+            return;
+        }
 
-		thread->Execute( params );
-	}
-	catch( ScriptException& exc )
-	{
-		EVENT_DPrintf( "Listener::ExecuteThread: %s\n", exc.string.c_str() );
-	}
+        thread->Execute(params);
+    } catch (ScriptException& exc) {
+        EVENT_DPrintf("Listener::ExecuteThread: %s\n", exc.string.c_str());
+    }
 }
 
 #endif
 
-CLASS_DECLARATION( Class, Listener, NULL )
+command_t::command_t() {}
+
+command_t::command_t(const char *name, byte t)
+    : command(name)
+    , type(t)
+{}
+
+bool operator==(const char* name, const command_t& command)
 {
-	{ &EV_Listener_CommandDelay,				&Listener::CommandDelay },
-	{ &EV_Delete,								&Listener::EventDelete },
-	{ &EV_Remove,								&Listener::EventDelete },
-	{ &EV_ScriptRemove,							&Listener::EventDelete },
-	{ &EV_Listener_Classname,					&Listener::GetClassname },
-	{ &EV_Listener_InheritsFrom,				&Listener::EventInheritsFrom },
-	{ &EV_Listener_IsInheritedBy,				&Listener::EventIsInheritedBy },
+    if (command.type == EV_NORMAL || command.type == EV_RETURN) {
+        return !str::icmp(name, command.command);
+    } else {
+        return !str::cmp(name, command.command);
+    }
+}
 
 #ifdef WITH_SCRIPT_ENGINE
-	{ &EV_Listener_CancelFor,					&Listener::CancelFor },
-	{ &EV_Listener_CreateReturnThread,			&Listener::CreateReturnThread },
-	{ &EV_Listener_CreateThread,				&Listener::CreateThread },
-	{ &EV_Listener_ExecuteReturnScript,			&Listener::ExecuteReturnScript },
-	{ &EV_Listener_ExecuteScript,				&Listener::ExecuteScript },
-	{ &EV_Listener_EndOn,						&Listener::EventEndOn },
-	{ &EV_Listener_GetOwner,					&Listener::EventGetOwner },
-	{ &EV_Listener_Notify,						&Listener::EventNotify },
-	{ &EV_DelayThrow,							&Listener::EventDelayThrow },
-	{ &EV_Throw,								&Listener::EventThrow },
-	{ &EV_Listener_Unregister,					&Listener::EventUnregister },
-	{ &EV_Listener_WaitCreateReturnThread,		&Listener::WaitCreateReturnThread },
-	{ &EV_Listener_WaitCreateThread,			&Listener::WaitCreateThread },
-	{ &EV_Listener_WaitExecuteReturnScript,		&Listener::WaitExecuteReturnScript },
-	{ &EV_Listener_WaitExecuteScript,			&Listener::WaitExecuteScript },
-	{ &EV_Listener_WaitTill,					&Listener::WaitTill },
-	{ &EV_Listener_WaitTillTimeout,				&Listener::WaitTillTimeout },
-	{ &EV_Listener_WaitTillAny,					&Listener::WaitTillAny },
-	{ &EV_Listener_WaitTillAnyTimeout,			&Listener::WaitTillAnyTimeout },
-#endif
-	{ NULL, NULL }
-};
+bool operator==(const command_t& cmd1, const command_t& cmd2)
+{
+    return (!str::icmp(cmd1.command, cmd2.command) && (cmd2.type == (uchar)-1 || cmd2.type == cmd1.type));
+}
+#else
+bool operator==(const command_t& cmd1, const command_t& cmd2)
+{
+    return (!str::icmp(cmd1.command, cmd2.command));
+}
+#endif
\ No newline at end of file
diff --git a/code/qcommon/listener.h b/code/qcommon/listener.h
index 4409251e..c819bfda 100644
--- a/code/qcommon/listener.h
+++ b/code/qcommon/listener.h
@@ -42,551 +42,560 @@ class Archiver;
 class EventQueueNode;
 
 // entity subclass
-#define EF_ENTITY				(1<<0)
-#define EF_ANIMATE				(1<<1)
-#define EF_SENTIENT				(1<<2)
-#define EF_PLAYER				(1<<3)
-#define EF_ACTOR				(1<<4)
-#define EF_ITEM					(1<<5)
-#define EF_INVENTORYITEM		(1<<6)
-#define EF_WEAPON				(1<<7)
-#define EF_PROJECTILE			(1<<8)
-#define EF_DOOR					(1<<9)
-#define EF_CAMERA				(1<<10)
-#define EF_VEHICLE				(1<<11)
-#define EF_VEHICLETANK			(1<<12)
-#define EF_VEHICLETURRET		(1<<13)
-#define EF_TURRET				(1<<14)
-#define EF_PATHNODE				(1<<15)
-#define EF_WAYPOINT				(1<<16)
-#define EF_TEMPWAYPOINT			(1<<17)
-#define EF_VEHICLEPOINT			(1<<18)
-#define EF_SPLINEPATH			(1<<19)
-#define EF_CRATEOBJECT			(1<<20)
-#define EF_BOT					(1<<21)
+#define ECF_ENTITY        (1 << 0)
+#define ECF_ANIMATE       (1 << 1)
+#define ECF_SENTIENT      (1 << 2)
+#define ECF_PLAYER        (1 << 3)
+#define ECF_ACTOR         (1 << 4)
+#define ECF_ITEM          (1 << 5)
+#define ECF_INVENTORYITEM (1 << 6)
+#define ECF_WEAPON        (1 << 7)
+#define ECF_PROJECTILE    (1 << 8)
+#define ECF_DOOR          (1 << 9)
+#define ECF_CAMERA        (1 << 10)
+#define ECF_VEHICLE       (1 << 11)
+#define ECF_VEHICLETANK   (1 << 12)
+#define ECF_VEHICLETURRET (1 << 13)
+#define ECF_TURRET        (1 << 14)
+#define ECF_PATHNODE      (1 << 15)
+#define ECF_WAYPOINT      (1 << 16)
+#define ECF_TEMPWAYPOINT  (1 << 17)
+#define ECF_VEHICLEPOINT  (1 << 18)
+#define ECF_SPLINEPATH    (1 << 19)
+#define ECF_CRATEOBJECT   (1 << 20)
+#define ECF_BOT           (1 << 21)
 
 // Event flags
-#define EV_CONSOLE				(1<<0)		// Allow entry from console
-#define EV_CHEAT				(1<<1)		// Only allow entry from console if cheats are enabled
-#define EV_CODEONLY				(1<<2)		// Hide from eventlist
-#define EV_CACHE				(1<<3)		// This event is used to cache data in
-#define EV_TIKIONLY				(1<<4)		// This command only applies to TIKI files
-#define EV_SCRIPTONLY			(1<<5)		// This command only applies to SCRIPT files
-#define EV_SERVERCMD			(1<<6)		// Client : server command
-#define EV_DEFAULT				-1			// default flag
-#define EV_ZERO                 0
+#define EV_CONSOLE    (1 << 0) // Allow entry from console
+#define EV_CHEAT      (1 << 1) // Only allow entry from console if cheats are enabled
+#define EV_CODEONLY   (1 << 2) // Hide from eventlist
+#define EV_CACHE      (1 << 3) // This event is used to cache data in
+#define EV_TIKIONLY   (1 << 4) // This command only applies to TIKI files
+#define EV_SCRIPTONLY (1 << 5) // This command only applies to SCRIPT files
+#define EV_SERVERCMD  (1 << 6) // Client : server command
+#define EV_DEFAULT    -1       // default flag
+#define EV_ZERO       0
 
 // Event types
-#define EV_NORMAL				0	// Normal command
-#define EV_RETURN				1	// Return as a function (local.var = local ReturnCommand)
-#define EV_GETTER				2	// Return as a variable (local.var = local.listener.some_getter)
-#define EV_SETTER				3	// Set as a variable (local.listener.some_setter = "value")
+#define EV_NORMAL 0 // Normal command
+#define EV_RETURN 1 // Return as a function (local.var = local ReturnCommand)
+#define EV_GETTER 2 // Return as a variable (local.var = local.listener.some_getter)
+#define EV_SETTER 3 // Set as a variable (local.listener.some_setter = "value")
 
 // times for posting events
-// Even though negative times technically don't make sense, the effect is to 
+// Even though negative times technically don't make sense, the effect is to
 // sort events that take place at the start of a map so that they are executed
 // in the proper order.  For example, spawnargs must occur before any script
 // commands take place, while unused entities must be removed before the spawnargs
 // are parsed.
 
-#define EV_REMOVE					-12.0f		// remove any unused entities before spawnargs are parsed
-#define EV_LINKBEAMS				-9.0f		// for finding out the endpoints of beams
-#define EV_VEHICLE					-9.0f
-#define EV_PRIORITY_SPAWNARG		-8.0f		// for priority spawn args passed in by the bsp file
-#define EV_SETUP_ROPEPIECE			-8.0f
-#define EV_SPAWNARG					-7.0f		// for spawn args passed in by the bsp file
-#define EV_SETUP_ROPEBASE			-7.0f
-#define EV_PROCESS_INIT				-6.0f
-#define EV_LINKDOORS				-5.0f		// for finding out which doors are linked together
-#define EV_POSTSPAWN				-5.0f		// for any processing that must occur after all objects are spawned
-#define EV_SPAWNENTITIES			-4.0f
-#define EV_PRIORITY_SPAWNACTOR		-3.0f
-#define EV_SPAWNACTOR				-2.0f
+#define EV_REMOVE              -9.0f // remove any unused entities before spawnargs are parsed
+#define EV_LINKBEAMS           -9.0f // for finding out the endpoints of beams
+#define EV_VEHICLE             -9.0f
+#define EV_PRIORITY_SPAWNARG   -8.0f // for priority spawn args passed in by the bsp file
+#define EV_SETUP_ROPEPIECE     -8.0f
+#define EV_SPAWNARG            -7.0f // for spawn args passed in by the bsp file
+#define EV_SETUP_ROPEBASE      -7.0f
+#define EV_PROCESS_INIT        -6.0f
+#define EV_LINKDOORS           -6.0f // for finding out which doors are linked together
+#define EV_POSTSPAWN           -5.0f // for any processing that must occur after all objects are spawned
+#define EV_SPAWNENTITIES       -4.0f
+#define EV_PRIORITY_SPAWNACTOR -3.0f
+#define EV_SPAWNACTOR          -2.0f
 
 // Posted Event Flags
-#define EVENT_LEGS_ANIM    (1<<0)      // this event is associated with an animation for the legs
-#define EVENT_TORSO_ANIM   (1<<1)      // this event is associated with an animation for the torso
-#define EVENT_DIALOG_ANIM  (1<<2)      // this event is associated with an animation for dialog lip syncing
+#define EVENT_LEGS_ANIM   (1 << 0) // this event is associated with an animation for the legs
+#define EVENT_TORSO_ANIM  (1 << 1) // this event is associated with an animation for the torso
+#define EVENT_DIALOG_ANIM (1 << 2) // this event is associated with an animation for dialog lip syncing
 
-typedef enum
-{
-	IS_STRING,
-	IS_VECTOR,
-	IS_BOOLEAN,
-	IS_INTEGER,
-	IS_FLOAT,
-	IS_ENTITY,
-	IS_LISTENER
+typedef enum {
+    IS_STRING,
+    IS_VECTOR,
+    IS_BOOLEAN,
+    IS_INTEGER,
+    IS_FLOAT,
+    IS_ENTITY,
+    IS_LISTENER
 } vartype;
 
 class EventArgDef : public Class
 {
 private:
-	int                     type;
-	str                     name;
-	float                   minRange[ 3 ];
-	qboolean                minRangeDefault[ 3 ];
-	float                   maxRange[ 3 ];
-	qboolean                maxRangeDefault[ 3 ];
-	qboolean                optional;
+    int      type;
+    str      name;
+    float    minRange[3];
+    qboolean minRangeDefault[3];
+    float    maxRange[3];
+    qboolean maxRangeDefault[3];
+    qboolean optional;
+
 public:
+    EventArgDef()
+    {
+        type = IS_INTEGER;
+        //name        = "undefined";
+        optional = qfalse;
+    };
 
-	EventArgDef()
-	{
-		type = IS_INTEGER;
-		//name        = "undefined";
-		optional = qfalse;
-	};
-	void              Setup( const char * eventName, const char *argName, const char *argType, const char *argRange );
-	void              PrintArgument( FILE *event_file = NULL );
-	void              PrintRange( FILE *event_file = NULL );
-	int               getType( void );
-	const char        *getName( void );
-	qboolean          isOptional( void );
+    void        Setup(const char *eventName, const char *argName, const char *argType, const char *argRange);
+    void        PrintArgument(FILE *event_file = NULL);
+    void        PrintRange(FILE *event_file = NULL);
+    int         getType(void);
+    const char *getName(void);
+    qboolean    isOptional(void);
 
-	float GetMinRange( int index )
-	{
-		if( index < 3 )
-			return minRange[ index ];
-		return 0.0;
-	}
+    float GetMinRange(int index)
+    {
+        if (index < 3) {
+            return minRange[index];
+        }
+        return 0.0;
+    }
 
-	qboolean GetMinRangeDefault( int index )
-	{
-		if( index < 3 )
-			return minRangeDefault[ index ];
-		return qfalse;
-	}
+    qboolean GetMinRangeDefault(int index)
+    {
+        if (index < 3) {
+            return minRangeDefault[index];
+        }
+        return qfalse;
+    }
 
-	float GetMaxRange( int index )
-	{
-		if( index < 3 )
-			return maxRange[ index ];
-		return 0.0;
-	}
+    float GetMaxRange(int index)
+    {
+        if (index < 3) {
+            return maxRange[index];
+        }
+        return 0.0;
+    }
 
-	qboolean GetMaxRangeDefault( int index )
-	{
-		if( index < 3 )
-			return maxRangeDefault[ index ];
-		return qfalse;
-	}
+    qboolean GetMaxRangeDefault(int index)
+    {
+        if (index < 3) {
+            return maxRangeDefault[index];
+        }
+        return qfalse;
+    }
 };
 
-inline int EventArgDef::getType
-(
-void
-)
+inline int EventArgDef::getType(void)
 {
-	return type;
+    return type;
 }
 
-inline const char *EventArgDef::getName
-(
-void
-)
+inline const char *EventArgDef::getName(void)
 {
-	return name.c_str();
+    return name.c_str();
 }
 
-inline qboolean EventArgDef::isOptional
-(
-void
-)
+inline qboolean EventArgDef::isOptional(void)
 {
-	return optional;
+    return optional;
 }
 
-class EventDef {
+class EventDef
+{
 public:
-	str		 		command;
-	int				flags;
-	const char		*formatspec;
-	const char		*argument_names;
-	const char		*documentation;
-	uchar			type;
-	Container<EventArgDef> *definition;
+    str                     command;
+    int                     flags;
+    const char             *formatspec;
+    const char             *argument_names;
+    const char             *documentation;
+    uchar                   type;
+    Container<EventArgDef> *definition;
 
-	EventDef() { definition = NULL; }
+    EventDef() { definition = NULL; }
 
-	void Error( const char *format, ... );
+    void Error(const char *format, ...);
 
-	void PrintDocumentation( FILE *event_file, bool html );
-	void PrintEventDocumentation( FILE *event_file, bool html );
+    void PrintDocumentation(FILE *event_file, bool html);
+    void PrintEventDocumentation(FILE *event_file, bool html);
 
-	void DeleteDocumentation( void );
-	void SetupDocumentation( void );
+    void DeleteDocumentation(void);
+    void SetupDocumentation(void);
 };
 
-class command_t {
+class DataNode
+{
 public:
-	str			command;
-	int			flags;
-	uchar		type;
-
-	friend bool		operator==( const str &name, const command_t &command );
-	friend bool		operator==( const command_t &cmd1, const command_t &cmd2 );
+    Event      *ev;
+    const char *command;
+    int         flags;
+    const char *formatspec;
+    const char *argument_names;
+    const char *documentation;
+    int         type;
+    DataNode   *next;
 };
 
-inline bool operator==( const str &name, const command_t &command )
+class command_t
 {
-	return command.command == name;
-}
+public:
+    const char *command;
+    int         flags;
+    byte        type;
 
-#ifdef WITH_SCRIPT_ENGINE
-inline bool operator==( const command_t &cmd1, const command_t &cmd2 )
-{
-	return ( cmd2.command == cmd1.command && ( cmd2.type == ( uchar )-1 || cmd2.type == cmd1.type ) );
-}
-#else
-inline bool operator==( const command_t &cmd1, const command_t &cmd2 )
-{
-	return ( cmd2.command == cmd1.command );
-}
-#endif
+public:
+    command_t();
+    command_t(const char *name, byte t);
+
+    friend bool operator==(const char *name, const command_t& command);
+    friend bool operator==(const command_t& cmd1, const command_t& cmd2);
+};
 
 class Event : public Class
 {
 public:
-	qboolean			fromScript;
-	short unsigned int	eventnum;
-	short unsigned int	dataSize;
-	short unsigned int	maxDataSize;
-	ScriptVariable		*data;
+    qboolean           fromScript;
+    short unsigned int eventnum;
+    short unsigned int dataSize;
+    short unsigned int maxDataSize;
+    ScriptVariable    *data;
 
 #ifdef _DEBUG
-	// should be used only for debugging purposes
-	str					name;
+    // should be used only for debugging purposes
+    const char *name;
 #endif
 
+private:
+    static DataNode *DataNodeList;
+
 public:
-	CLASS_PROTOTYPE( Event );
+    CLASS_PROTOTYPE(Event);
 
-	static con_map< Event *, EventDef > eventDefList;
-	static con_arrayset< command_t, command_t > commandList;
+    static con_map<Event *, EventDef>         eventDefList;
+    static con_arrayset<command_t, command_t> commandList;
 
-	static con_map< const_str, unsigned int > normalCommandList;
-	static con_map< const_str, unsigned int > returnCommandList;
-	static con_map< const_str, unsigned int > getterCommandList;
-	static con_map< const_str, unsigned int > setterCommandList;
+    static con_map<const_str, unsigned int> normalCommandList;
+    static con_map<const_str, unsigned int> returnCommandList;
+    static con_map<const_str, unsigned int> getterCommandList;
+    static con_map<const_str, unsigned int> setterCommandList;
 
-	static void LoadEvents( void );
+    static void LoadEvents(void);
 
-	static EventQueueNode EventQueue;
+    static EventQueueNode EventQueue;
 
-	static int totalevents;
-	static int NumEventCommands();
+    static int NumEventCommands();
 
-	static void       ListCommands( const char *mask = NULL );
-	static void       ListDocumentation( const char *mask, qboolean print_to_file = qfalse );
-	static void       PendingEvents( const char *mask = NULL );
+    static void ListCommands(const char *mask = NULL);
+    static void ListDocumentation(const char *mask, qboolean print_to_file = qfalse);
+    static void PendingEvents(const char *mask = NULL);
 
-	static int GetEvent( str name, uchar type = EV_NORMAL );
-	static int GetEventWithFlags( str name, int flags, uchar type = EV_NORMAL );
+    static int GetEvent(str name, uchar type = EV_NORMAL);
+    static int GetEventWithFlags(str name, int flags, uchar type = EV_NORMAL);
 
-	static command_t *GetEventInfo( int eventnum );
-	static int GetEventFlags( int eventnum );
-	static str& GetEventName( int index );
+    static command_t  *GetEventInfo(int eventnum);
+    static int         GetEventFlags(int eventnum);
+    static const char *GetEventName(int index);
 
-	static int compareEvents( const void *arg1, const void *arg2 );
-	static void SortEventList( Container< int > *sortedList );
+    static int  compareEvents(const void *arg1, const void *arg2);
+    static void SortEventList(Container<int> *sortedList);
 
-	virtual void ErrorInternal( Listener *l, str text ) const;
+    virtual void ErrorInternal(Listener *l, str text) const;
 
-	static unsigned int	FindEventNum( str s );
-	static unsigned int FindNormalEventNum( const_str s );
-	static unsigned int FindNormalEventNum( str s );
-	static unsigned int FindReturnEventNum( const_str s );
-	static unsigned int FindReturnEventNum( str s );
-	static unsigned int FindSetterEventNum( const_str s );
-	static unsigned int FindSetterEventNum( str s );
-	static unsigned int FindGetterEventNum( const_str s );
-	static unsigned int FindGetterEventNum( str s );
+    static bool         Exists(const char *command);
+    static unsigned int FindEventNum(const char *s);
+    static unsigned int FindNormalEventNum(const_str s);
+    static unsigned int FindNormalEventNum(str s);
+    static unsigned int FindReturnEventNum(const_str s);
+    static unsigned int FindReturnEventNum(str s);
+    static unsigned int FindSetterEventNum(const_str s);
+    static unsigned int FindSetterEventNum(str s);
+    static unsigned int FindGetterEventNum(const_str s);
+    static unsigned int FindGetterEventNum(str s);
 
-	bool		operator==( Event ev ) { return eventnum == ev.eventnum; }
-	bool		operator!=( Event ev ) { return eventnum != ev.eventnum; }
+    bool operator==(Event ev) { return eventnum == ev.eventnum; }
+
+    bool operator!=(Event ev) { return eventnum != ev.eventnum; }
 
 #ifndef _DEBUG_MEM
-	void *operator new( size_t size );
-	void operator delete( void *ptr );
+    void *operator new(size_t size);
+    void  operator delete(void *ptr);
 #endif
 
-	Event();
-	Event( const Event *ev );
-	Event( const Event &ev );
-	Event( int index );
-	Event( int index, int numArgs );
-	Event( str command, int numArgs = 0 );
-	Event
-	(
-		const char *command,
-		int flags,
-		const char *formatspec,		// Arguments are : 'e' (Entity) 'v' (Vector) 'i' (Integer) 'f' (Float) 's' (String) 'b' (Boolean).
-									// Uppercase arguments means optional.
-		const char *argument_names,
-		const char *documentation,
-		uchar type = EV_NORMAL
-	);
+    Event();
+    Event(const Event& ev);
+    Event(const Event& ev, int numArgs);
+    Event(Event&& ev);
+    Event(int index);
+    Event(int index, int numArgs);
+    Event(const char *command);
+    Event(const char *command, int numArgs);
+    Event(
+        const char *command,
+        int         flags,
+        const char *
+            formatspec, // Arguments are : 'e' (Entity) 'v' (Vector) 'i' (Integer) 'f' (Float) 's' (String) 'b' (Boolean).
+        // Uppercase arguments means optional.
+        const char *argument_names,
+        const char *documentation,
+        byte        type = EV_NORMAL
+    );
 
-	~Event();
+    Event& operator=(const Event& ev);
+    Event& operator=(Event&& ev);
+
+    ~Event();
 
 #if defined(ARCHIVE_SUPPORTED)
-	void Archive( Archiver &arc ) override;
+    void Archive(Archiver& arc) override;
 #endif
 
 #ifdef _GAME_DLL
-	eventInfo_t		*getInfo();
+    eventInfo_t *getInfo();
 #else
-	EventDef		*getInfo();
+    EventDef *getInfo();
 #endif
 
-	str&			getName() const;
+    const char *getName() const;
 
-	void		AddContainer( Container< SafePtr< Listener > > *container );
-	void		AddEntity( Entity * ent );
-	void		AddFloat( float number );
-	void		AddInteger( int number );
-	void		AddListener( Listener * listener );
-	void		AddNil( void );
-	void		AddConstString( const_str string );
-	void		AddString( str string );
-	void		AddToken( str token );
-	void		AddTokens( int argc, const char **argv );
-	void		AddValue( const ScriptVariable &value );
-	void		AddVector( const Vector& vector );
+    void AddContainer(Container<SafePtr<Listener>> *container);
+    void AddEntity(Entity *ent);
+    void AddFloat(float number);
+    void AddInteger(int number);
+    void AddListener(Listener *listener);
+    void AddNil(void);
+    void AddConstString(const_str string);
+    void AddString(str string);
+    void AddToken(str token);
+    void AddTokens(int argc, const char **argv);
+    void AddValue(const ScriptVariable& value);
+    void AddVector(const Vector& vector);
+    void CopyValues(const ScriptVariable *values, size_t count);
 
-	void		Clear( void );
+    void Clear(void);
 
-	void		CheckPos( int pos );
+    void CheckPos(int pos) const;
 
-	bool			GetBoolean( int pos );
+    bool GetBoolean(int pos) const;
 
-	const_str		GetConstString( int pos );
+    const_str GetConstString(int pos) const;
 
-	Entity			*GetEntity( int pos );
+    Entity *GetEntity(int pos) const;
 
-	float			GetFloat( int pos );
-	int				GetInteger( int pos );
-	Listener		*GetListener( int pos );
+    float     GetFloat(int pos) const;
+    int       GetInteger(int pos) const;
+    Listener *GetListener(int pos) const;
 
-	class PathNode	*GetPathNode( int pos );
+    class PathNode *GetPathNode(int pos) const;
 
 #ifdef WITH_SCRIPT_ENGINE
-	SimpleEntity	*GetSimpleEntity( int pos );
+    SimpleEntity *GetSimpleEntity(int pos) const;
 #endif
 
-	str				GetString( int pos );
-	str				GetToken( int pos );
-	ScriptVariable&	GetValue( int pos );
-	ScriptVariable& GetValue(void);
-	ScriptVariable& GetLastValue();
-	Vector			GetVector( int pos );
+    str             GetString(int pos) const;
+    str             GetToken(int pos) const;
+    ScriptVariable& GetValue(int pos) const;
+    ScriptVariable& GetValue(void);
+    Vector          GetVector(int pos) const;
 
-	class Waypoint	*GetWaypoint( int pos );
+    class Waypoint *GetWaypoint(int pos) const;
 
-	qboolean	IsEntityAt( int pos );
-	qboolean	IsListenerAt( int pos );
-	qboolean	IsNilAt( int pos );
-	qboolean	IsNumericAt( int pos );
+    qboolean IsEntityAt(int pos) const;
+    qboolean IsListenerAt(int pos) const;
+    qboolean IsNilAt(int pos) const;
+    qboolean IsNumericAt(int pos) const;
 #ifdef WITH_SCRIPT_ENGINE
-	qboolean	IsSimpleEntityAt( int pos );
+    qboolean IsSimpleEntityAt(int pos) const;
 #endif
-	qboolean	IsStringAt( int pos );
-	qboolean	IsVectorAt( int pos );
+    qboolean IsStringAt(int pos) const;
+    qboolean IsVectorAt(int pos) const;
 
-	qboolean	IsFromScript( void );
+    qboolean IsFromScript(void) const;
 
-	const char	*GetFormat();
-	int			NumArgs();
+    int NumArgs() const;
 };
 
-typedef struct eventInfo
+#define NODE_CANCEL      1
+#define NODE_FIXED_EVENT 2
+
+class EventQueueNode : public LightClass
 {
-	Event		*ev;
-	const char	*command;
-	int			flags;
-	const char	*formatspec;
-	const char	*argument_names;
-	const char	*documentation;
-	int			type;
-	eventInfo	*prev;
-} eventInfo_t;
-
-#define					NODE_CANCEL				1
-#define					NODE_FIXED_EVENT		2
-
-class EventQueueNode {
 public:
-	Event *event;
-	int	inttime;
-	int flags;
-	SafePtr< Listener > m_sourceobject;
+    Event            *event;
+    int               inttime;
+    int               flags;
+    SafePtr<Listener> m_sourceobject;
 
-	EventQueueNode		*prev;
-	EventQueueNode		*next;
+    EventQueueNode *prev;
+    EventQueueNode *next;
 
 #ifdef _DEBUG
-	str name;
+    const char *name;
 #endif
 
-	EventQueueNode() { prev = this; next = this; }
-	Listener	*GetSourceObject( void ) { return m_sourceobject; }
-	void		SetSourceObject( Listener *obj ) { m_sourceobject = obj; }
+    EventQueueNode()
+    {
+        prev = this;
+        next = this;
+
+#ifdef _DEBUG
+        name = NULL;
+#endif
+    }
+
+    Listener *GetSourceObject(void) { return m_sourceobject; }
+
+    void SetSourceObject(Listener *obj) { m_sourceobject = obj; }
 };
 
-template< class Type1, class Type2 >
+template<class Type1, class Type2>
 class con_map;
 
-using ConList = ContainerClass< SafePtr< Listener > >;
-using eventMap = con_map< Event *, EventDef * >;
+using ConList  = ContainerClass<SafePtr<Listener>>;
+using eventMap = con_map<Event *, EventDef *>;
 
-using ListenerPtr = SafePtr< Listener >;
+using ListenerPtr = SafePtr<Listener>;
 
 class Listener : public Class
 {
 public:
 #ifdef WITH_SCRIPT_ENGINE
-	con_set< const_str, ConList > *m_NotifyList;
-	con_set< const_str, ConList > *m_WaitForList;
-	con_set< const_str, ConList > *m_EndList;
-	ScriptVariableList *vars;
+    con_set<const_str, ConList> *m_NotifyList;
+    con_set<const_str, ConList> *m_WaitForList;
+    con_set<const_str, ConList> *m_EndList;
+    ScriptVariableList          *vars;
 #endif
 
-	static bool		EventSystemStarted;
+    static bool EventSystemStarted;
+    static bool ProcessingEvents;
 
 private:
 #ifdef WITH_SCRIPT_ENGINE
-	void			ExecuteScriptInternal( Event *ev, ScriptVariable& scriptVariable );
-	void			ExecuteThreadInternal( Event *ev, ScriptVariable& returnValue );
-	void			WaitExecuteScriptInternal( Event *ev, ScriptVariable& returnValue );
-	void			WaitExecuteThreadInternal( Event *ev, ScriptVariable& returnValue );
+    void ExecuteScriptInternal(Event *ev, ScriptVariable& scriptVariable);
+    void ExecuteThreadInternal(Event *ev, ScriptVariable& returnValue);
+    void WaitExecuteScriptInternal(Event *ev, ScriptVariable& returnValue);
+    void WaitExecuteThreadInternal(Event *ev, ScriptVariable& returnValue);
 #endif
 
-	EventQueueNode	*PostEventInternal( Event *ev, float delay, int flags );
+    EventQueueNode *PostEventInternal(Event *ev, float delay, int flags);
 
 public:
-	CLASS_PROTOTYPE( Listener );
+    CLASS_PROTOTYPE(Listener);
 
 #ifdef WITH_SCRIPT_ENGINE
-	/* Game functions */
-	virtual ScriptThread *CreateThreadInternal( const ScriptVariable& label );
-	virtual ScriptThread *CreateScriptInternal( const ScriptVariable& label );
-	virtual void	StoppedNotify( void );
-	virtual void	StartedWaitFor( void );
-	virtual void	StoppedWaitFor( const_str name, bool bDeleting );
+    /* Game functions */
+    virtual ScriptThread *CreateThreadInternal(const ScriptVariable& label);
+    virtual ScriptThread *CreateScriptInternal(const ScriptVariable& label);
+    virtual void          StoppedNotify(void);
+    virtual void          StartedWaitFor(void);
+    virtual void          StoppedWaitFor(const_str name, bool bDeleting);
 #endif
 
-	virtual Listener *GetScriptOwner( void );
+    virtual Listener *GetScriptOwner(void);
+    virtual void SetScriptOwner(Listener *newOwner);
 
-	Listener();
-	virtual ~Listener();
+    Listener();
+    virtual ~Listener();
 
-	void Archive( Archiver &arc ) override;
+    void Archive(Archiver& arc) override;
 
-	void					CancelEventsOfType( Event *ev );
-	void					CancelEventsOfType( Event &ev );
-	void					CancelFlaggedEvents( int flags );
-	void					CancelPendingEvents( void );
+    void CancelEventsOfType(Event *ev);
+    void CancelEventsOfType(Event& ev);
+    void CancelFlaggedEvents(int flags);
+    void CancelPendingEvents(void);
 
-	qboolean				EventPending( Event &ev );
+    qboolean EventPending(Event& ev);
 
-	void					PostEvent( Event *ev, float delay, int flags = 0 );
-	void					PostEvent( const Event &ev, float delay, int flags = 0 );
+    void PostEvent(Event *ev, float delay, int flags = 0);
+    void PostEvent(const Event& ev, float delay, int flags = 0);
 
-	qboolean				PostponeAllEvents( float time );
-	qboolean				PostponeEvent( Event& ev, float time );
+    qboolean PostponeAllEvents(float time);
+    qboolean PostponeEvent(Event& ev, float time);
 
-	bool					ProcessEvent( const Event &ev );
-	bool					ProcessEvent( Event *ev );
-	bool					ProcessEvent( Event &ev );
-	ScriptVariable&			ProcessEventReturn( Event * ev );
+    bool            ProcessEvent(const Event& ev);
+    bool            ProcessEvent(Event *ev);
+    bool            ProcessEvent(Event& ev);
+    ScriptVariable& ProcessEventReturn(Event *ev);
 
-	void					ProcessContainerEvent( const Container< Event * >& conev );
+    void ProcessContainerEvent(const Container<Event *>& conev);
 
-	qboolean				ProcessPendingEvents( void );
+    qboolean ProcessPendingEvents(void);
 
-	bool					ProcessScriptEvent( Event &ev );
-	bool					ProcessScriptEvent( Event *ev );
+    bool ProcessScriptEvent(Event& ev);
+    bool ProcessScriptEvent(Event *ev);
 
 #ifdef WITH_SCRIPT_ENGINE
 
-	void					CreateVars( void );
-	void					ClearVars( void );
-	ScriptVariableList		*Vars( void );
+    void                CreateVars(void);
+    void                ClearVars(void);
+    ScriptVariableList *Vars(void);
 
-	bool					BroadcastEvent( Event &event, ConList *listeners );
-	bool					BroadcastEvent( str name, Event &event );
-	bool					BroadcastEvent( const_str name, Event &event );
-	void					CancelWaiting( str name );
-	void					CancelWaiting( const_str name );
-	void					CancelWaitingAll( void );
-	void					CancelWaitingSources( const_str name, ConList &listeners, ConList &stoppedListeners );
+    bool BroadcastEvent(Event& event, ConList *listeners);
+    bool BroadcastEvent(str name, Event& event);
+    bool BroadcastEvent(const_str name, Event& event);
+    void CancelWaiting(str name);
+    void CancelWaiting(const_str name);
+    void CancelWaitingAll(void);
+    void CancelWaitingSources(const_str name, ConList& listeners, ConList& stoppedListeners);
 
-	void					ExecuteThread( str scriptName, str label, Event *params = NULL );
-	void					ExecuteThread( str scriptName, str label, Event &params );
+    void ExecuteThread(str scriptName, str label, Event *params = NULL);
+    void ExecuteThread(str scriptName, str label, Event& params);
 
-	void					EndOn( str name, Listener *listener );
-	void					EndOn( const_str name, Listener *listener );
-	void					Notify( const char *name );
-	void					Register( str name, Listener *listener );
-	void					Register( const_str name, Listener *listener );
-	void					RegisterSource( const_str name, Listener *listener );
-	void					RegisterTarget( const_str name, Listener *listener );
-	void					Unregister( str name );
-	void					Unregister( const_str name );
-	void					Unregister( str name, Listener *listener );
-	void					Unregister( const_str name, Listener *listener );
-	void					UnregisterAll( void );
-	bool					UnregisterSource( const_str name, Listener *listener );
-	bool					UnregisterTarget( const_str name, Listener *listener );
-	void					UnregisterTargets( const_str name, ConList &listeners, ConList &stoppedListeners, Container< const_str > &stoppedNames );
-	void					AbortRegistration( const_str name, Listener *l );
+    void EndOn(str name, Listener *listener);
+    void EndOn(const_str name, Listener *listener);
+    void Notify(const char *name);
+    void Register(str name, Listener *listener);
+    void Register(const_str name, Listener *listener);
+    void RegisterSource(const_str name, Listener *listener);
+    void RegisterTarget(const_str name, Listener *listener);
+    void Unregister(str name);
+    void Unregister(const_str name);
+    void Unregister(str name, Listener *listener);
+    void Unregister(const_str name, Listener *listener);
+    void UnregisterAll(void);
+    bool UnregisterSource(const_str name, Listener *listener);
+    bool UnregisterTarget(const_str name, Listener *listener);
+    void UnregisterTargets(
+        const_str name, ConList& listeners, ConList& stoppedListeners, Container<const_str>& stoppedNames
+    );
+    void AbortRegistration(const_str name, Listener *l);
 
-	int						RegisterSize( const_str name ) const;
-	int						RegisterSize( str name ) const;
-	int						WaitingSize( const_str name ) const;
-	int						WaitingSize( str name ) const;
+    int RegisterSize(const_str name) const;
+    int RegisterSize(str name) const;
+    int WaitingSize(const_str name) const;
+    int WaitingSize(str name) const;
 
-	bool					WaitTillDisabled( str s );
-	bool					WaitTillDisabled( const_str s );
+    bool WaitTillDisabled(str s);
+    bool WaitTillDisabled(const_str s);
 #endif
 
-	int						GetFlags( Event *event ) const;
-	qboolean				ValidEvent( str name ) const;
+    int      GetFlags(Event *event) const;
+    qboolean ValidEvent(str name) const;
 
-	//
-	// Scripting functions
-	//
-	void					CommandDelay( Event *ev );
-	void					EventDelete( Event *ev );
-	void					EventInheritsFrom( Event *ev );
-	void					EventIsInheritedBy( Event *ev );
-	void					GetClassname( Event *ev );
+    //
+    // Scripting functions
+    //
+    void CommandDelay(Event *ev);
+    void Remove(Event *ev);
+    void ScriptRemove(Event *ev);
+    void EventInheritsFrom(Event *ev);
+    void EventIsInheritedBy(Event *ev);
+    void GetClassname(Event *ev);
 
 #ifdef WITH_SCRIPT_ENGINE
-	void					CancelFor( Event *ev );
-	void					CreateReturnThread( Event *ev );
-	void					CreateThread( Event *ev );
-	void					ExecuteReturnScript( Event *ev );
-	void					ExecuteScript( Event *ev );
-	void					EventDelayThrow( Event *ev );
-	void					EventEndOn( Event *ev );
-	void					EventGetOwner( Event *ev );
-	void					EventNotify( Event *ev );
-	void					EventThrow( Event *ev );
-	void					EventUnregister( Event *ev );
-	void					WaitCreateReturnThread( Event *ev );
-	void					WaitCreateThread( Event *ev );
-	void					WaitExecuteReturnScript( Event *ev );
-	void					WaitExecuteScript( Event *ev );
-	void					WaitTill( Event *ev );
-	void					WaitTillTimeout( Event *ev );
-	void					WaitTillAny( Event *ev );
-	void					WaitTillAnyTimeout( Event *ev );
+    void CancelFor(Event *ev);
+    void CreateReturnThread(Event *ev);
+    void CreateThread(Event *ev);
+    void ExecuteReturnScript(Event *ev);
+    void ExecuteScript(Event *ev);
+    void EventDelayThrow(Event *ev);
+    void EventEndOn(Event *ev);
+    void EventGetOwner(Event *ev);
+    void EventNotify(Event *ev);
+    void EventThrow(Event *ev);
+    void EventUnregister(Event *ev);
+    void WaitCreateReturnThread(Event *ev);
+    void WaitCreateThread(Event *ev);
+    void WaitExecuteReturnScript(Event *ev);
+    void WaitExecuteScript(Event *ev);
+    void WaitTill(Event *ev);
+    void WaitTillTimeout(Event *ev);
+    void WaitTillAny(Event *ev);
+    void WaitTillAnyTimeout(Event *ev);
 #endif
 };
 
-qboolean IsNumeric( const char *str );
+qboolean IsNumeric(const char *str);
 
 extern Event EV_DelayThrow;
 extern Event EV_Delete;
@@ -600,75 +609,75 @@ extern Event EV_Listener_ExecuteReturnScript;
 extern Event EV_Listener_ExecuteScript;
 extern Event EV_Listener_WaitCreateReturnThread;
 
-extern int	DisableListenerNotify;
+extern int DisableListenerNotify;
 
-extern cvar_t	*g_showevents;
-extern cvar_t	*g_eventlimit;
-extern cvar_t	*g_timeevents;
-extern cvar_t	*g_watch;
-extern cvar_t	*g_eventstats;
+extern cvar_t *g_showevents;
+extern cvar_t *g_eventlimit;
+extern cvar_t *g_timeevents;
+extern cvar_t *g_watch;
+extern cvar_t *g_eventstats;
 
 extern MEM_BlockAlloc<Event> Event_allocator;
 
-#if defined( GAME_DLL )
+#if defined(GAME_DLL)
 //
 // game dll specific defines
 //
-#define EVENT_DebugPrintf gi.DebugPrintf
-#define EVENT_DPrintf gi.DPrintf
-#define EVENT_Printf gi.Printf
-#define EVENT_time   level.time
-#define EVENT_msec   level.inttime
-#define EVENT_realtime gi.Milliseconds()
-#define EVENT_Error gi.Error
+#    define EVENT_DebugPrintf gi.DebugPrintf
+#    define EVENT_DPrintf     gi.DPrintf
+#    define EVENT_Printf      gi.Printf
+#    define EVENT_time        level.time
+#    define EVENT_msec        level.inttime
+#    define EVENT_realtime    gi.Milliseconds()
+#    define EVENT_Error       gi.Error
 
-#define EVENT_FILENAME "events.txt"
+#    define EVENT_FILENAME    "events.txt"
 
-#elif defined ( CGAME_DLL )
+#elif defined(CGAME_DLL)
 //
 // cgame dll specific defines
 //
-#define EVENT_DebugPrintf cgi.DebugPrintf
-#define EVENT_DPrintf cgi.Printf
-#define EVENT_Printf cgi.Printf
-#define EVENT_time   ( ( ( float )cg.time / 1000.0f ) )
-#define EVENT_msec   cg.time
-#define EVENT_realtime   cgi.Milliseconds()
-#define EVENT_Error cgi.Error
+#    define EVENT_DebugPrintf cgi.DebugPrintf
+#    define EVENT_DPrintf     cgi.DPrintf
+#    define EVENT_Printf      cgi.Printf
+#    define EVENT_time        (((float)cg.time / 1000.0f))
+#    define EVENT_msec        cg.time
+#    define EVENT_realtime    cgi.Milliseconds()
+#    define EVENT_Error       cgi.Error
 
-#define EVENT_FILENAME "cg_events.txt"
+#    define EVENT_FILENAME    "cg_events.txt"
 
-#elif defined ( UI_LIB )
+#elif defined(UI_LIB)
 
-#define EVENT_DebugPrintf Com_DebugPrintf
-#define EVENT_DPrintf Com_Printf
-#define EVENT_Printf Com_Printf
-#define EVENT_time   ( ( ( float )cls.realtime / 1000.0f ) )
-#define EVENT_msec   cls.realtime
-#define EVENT_realtime   Sys_Milliseconds()
-#define EVENT_Error Com_Error
+#    define EVENT_DebugPrintf Com_DebugPrintf
+#    define EVENT_DPrintf     Com_DPrintf
+#    define EVENT_Printf      Com_Printf
+#    define EVENT_time        (((float)cls.realtime / 1000.0f))
+#    define EVENT_msec        cls.realtime
+#    define EVENT_realtime    Sys_Milliseconds()
+#    define EVENT_Error       Com_Error
 
-#define EVENT_FILENAME "ui_events.txt"
+#    define EVENT_FILENAME    "ui_events.txt"
 
 #else
 //
 // client specific defines
 //
-#define EVENT_DebugPrintf Com_DebugPrintf
-#define EVENT_DPrintf Com_Printf
-#define EVENT_Printf Com_Printf
-#define EVENT_time   ( ( ( float )cls.realtime / 1000.0f ) )
-#define EVENT_msec   cls.realtime
-#define EVENT_realtime Sys_Milliseconds()
-#define EVENT_Error Com_Error
+#    define EVENT_DebugPrintf Com_DebugPrintf
+#    define EVENT_DPrintf     Com_DPrintf
+#    define EVENT_Printf      Com_Printf
+#    define EVENT_time        (((float)cls.realtime / 1000.0f))
+#    define EVENT_msec        cls.realtime
+#    define EVENT_realtime    Sys_Milliseconds()
+#    define EVENT_Error       Com_Error
 
-#define EVENT_FILENAME "cl_events.txt"
+#    define EVENT_FILENAME    "cl_events.txt"
 #endif
 
 void L_ClearEventList();
-bool L_EventSystemStarted( void );
-void L_InitEvents( void );
+bool L_EventSystemStarted(void);
+void L_InitEvents(void);
 void L_ProcessPendingEvents();
-void L_ShutdownEvents( void );
-void L_ArchiveEvents( Archiver& arc );
-void L_UnarchiveEvents( Archiver& arc );
+void L_ShutdownEvents(void);
+void L_ArchiveEvents(Archiver& arc);
+void L_UnarchiveEvents(Archiver& arc);
diff --git a/code/qcommon/localization.h b/code/qcommon/localization.h
index 847451af..79e720c5 100644
--- a/code/qcommon/localization.h
+++ b/code/qcommon/localization.h
@@ -4,10 +4,10 @@
 extern "C" {
 #endif
 
-	void Sys_InitLocalization();
-	void Sys_ShutLocalization();
-	const char* Sys_LV_ConvertString(const char* var);
-	const char* Sys_LV_CL_ConvertString(const char* var);
+    void        Sys_InitLocalization();
+    void        Sys_ShutLocalization();
+    const char *Sys_LV_ConvertString(const char *var);
+    const char *Sys_LV_CL_ConvertString(const char *var);
 
 #ifdef __cplusplus
 }
diff --git a/code/qcommon/lz77.cpp b/code/qcommon/lz77.cpp
index 779fb634..03743eae 100644
--- a/code/qcommon/lz77.cpp
+++ b/code/qcommon/lz77.cpp
@@ -151,59 +151,59 @@ cLZ77::cLZ77()
 
 unsigned int cLZ77::CompressData( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
-	uint8_t* ip; // eax
-	unsigned int v7; // edi
-	unsigned int v8; // edx
-	unsigned int v9; // edx
-	unsigned int v10; // esi
-	unsigned int m_off; // edx
-	uint8_t* v12; // ebp
-	unsigned int v13; // edx
-	unsigned int v14; // esi
-	unsigned int v15; // edx
-	unsigned int v16; // ebp
-	uint8_t* v17; // esi
-	unsigned int v18; // edx
-	uint8_t* v19; // esi
-	uint8_t* v20; // eax
-	int v22; // eax
-	uint8_t v23; // bl
-	uint8_t* v24; // esi
-	unsigned int v25; // edx
-	uint8_t* v26; // esi
-	uint8_t* m_pos; // eax
-	uint8_t* v28; // ebp
-	bool v29; // zf
-	uint8_t v30; // al
-	uint8_t v31; // dl
-	uint8_t v32; // dl
-	uint8_t v33; // al
-	uint8_t v34; // al
-	uint8_t v35; // dl
-	uint8_t v36; // dl
-	uint8_t v37; // al
-	uint8_t v38; // al
-	uint8_t v39; // dl
-	uint8_t* in_end; // edi
-	uint8_t* v41; // eax
-	uint8_t* v42; // esi
-	unsigned int v43; // edx
-	unsigned int v44; // eax
-	uint8_t* v45; // edi
-	uint8_t* i; // edx
-	uint8_t* v47; // edi
-	unsigned int v48; // edx
-	unsigned int v49; // edx
-	unsigned int m_len; // eax
-	uint8_t* v51; // edi
-	uint8_t* v52; // edi
-	uint8_t* ii; // esi
-	uint8_t* v54; // edi
-	unsigned int v55; // edx
-	char v56; // dl
-	uint8_t* v57; // eax
-	uint8_t v58; // dl
-	uint8_t* v59; // edi
+	uint8_t* ip;
+	unsigned int v7;
+	unsigned int v8;
+	unsigned int v9;
+	unsigned int v10;
+	unsigned int m_off;
+	uint8_t* v12;
+	unsigned int v13;
+	unsigned int v14;
+	unsigned int v15;
+	unsigned int v16;
+	uint8_t* v17;
+	unsigned int v18;
+	uint8_t* v19;
+	uint8_t* v20;
+	int v22;
+	uint8_t v23;
+	uint8_t* v24;
+	unsigned int v25;
+	uint8_t* v26;
+	uint8_t* m_pos;
+	uint8_t* v28;
+	bool v29;
+	uint8_t v30;
+	uint8_t v31;
+	uint8_t v32;
+	uint8_t v33;
+	uint8_t v34;
+	uint8_t v35;
+	uint8_t v36;
+	uint8_t v37;
+	uint8_t v38;
+	uint8_t v39;
+	uint8_t* in_end;
+	uint8_t* v41;
+	uint8_t* v42;
+	unsigned int v43;
+	unsigned int v44;
+	uint8_t* v45;
+	uint8_t* i;
+	uint8_t* v47;
+	unsigned int v48;
+	unsigned int v49;
+	unsigned int m_len;
+	uint8_t* v51;
+	uint8_t* v52;
+	uint8_t* ii;
+	uint8_t* v54;
+	unsigned int v55;
+	char v56;
+	uint8_t* v57;
+	uint8_t v58;
+	uint8_t* v59;
 
 	this->in_end = &in[in_len];
 	this->ip_end = &in[in_len - 13];
@@ -583,337 +583,195 @@ LABEL_19:
 *************************************************************************/
 int cLZ77::Decompress( unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len )
 {
-	unsigned int v5; // eax
-	uint8_t* v6; // esi
-	unsigned int v7; // eax
-	uint8_t* v8; // esi
-	int v9; // edx
-	uint8_t* v10; // edx
-	uint8_t* v11; // ebp
-	unsigned int v12; // eax
-	uint8_t* v13; // esi
-	uint8_t* v14; // edi
-	uint8_t* v15; // esi
-	uint8_t* v16; // esi
-	uint8_t* v17; // esi
-	uint8_t* op; // edi
-	uint8_t* v19; // eax
-	uint8_t* v20; // eax
-	uint8_t* v21; // ebp
-	uint8_t* v22; // edi
-	uint8_t* v23; // edi
-	uint8_t* ip; // ebp
-	uint8_t* v25; // esi
-	uint8_t* v26; // esi
-	int v27; // ebp
-	uint8_t* v28; // edi
-	uint8_t* v29; // esi
-	uint8_t* v30; // edx
-	uint8_t* v31; // eax
-	uint8_t* v32; // edi
-	uint8_t* v33; // esi
-	unsigned int v34; // eax
-	uint8_t* v35; // edx
-	int v36; // edx
-	uint8_t* v37; // esi
-	uint8_t* v38; // edi
-	uint8_t* v39; // edx
-	uint8_t* v40; // edi
-	uint8_t* v41; // edx
-	int v42; // edx
-	uint8_t* v43; // ebp
-	uint8_t* v44; // ebp
-	uint8_t* v45; // edi
-	uint8_t* v46; // edx
-	unsigned int v47; // eax
-	uint8_t* v48; // ebp
-	uint8_t* v49; // esi
-	uint8_t* v50; // ebp
-	uint8_t* v51; // edi
-	uint8_t* v52; // esi
-	uint8_t* v53; // edx
-	uint8_t* v54; // ebp
-	uint8_t* v55; // edi
-	uint8_t* v56; // edi
-	uint8_t* v57; // eax
-	uint8_t* v58; // eax
-	uint8_t* v59; // edx
-	uint8_t* v60; // eax
-	uint8_t* v61; // edi
-	uint8_t* v62; // eax
-	uint8_t* ip_end; // ecx
+	unsigned int t;
+	unsigned short s;
 
-	this->ip_end = in + in_len;
+	this->ip_end = &in[in_len];
 	*out_len = 0;
 	this->op = out;
 	this->ip = in;
-	if (*in > 17u)
+	if (*this->ip > 17u)
 	{
-		v5 = *in - 17;
-		this->ip = in + 1;
-		if (v5 < 4)
-			goto LABEL_49;
+		t = *this->ip++ - 17;
+		if (t <= 3)
+			goto LABEL_52;
 		do
 		{
-			*this->op = *this->ip;
-			v6 = this->ip + 1;
-			--v5;
-			++this->op;
-			this->ip = v6;
-		} while (v5);
+			*this->op++ = *this->ip++;
+			--t;
+		} while (t);
 		goto LABEL_17;
 	}
+
 LABEL_5:
-	v7 = *this->ip;
-	v8 = this->ip + 1;
-	this->ip = v8;
-	if (v7 < 16)
+	t = *this->ip++;
+	if (t <= 15)
 	{
-		if (!v7)
+		if (!t)
 		{
-			for (; !*v8; this->ip = v8)
+			while (!*this->ip)
 			{
-				v7 += 255;
-				++v8;
+				t += 255;
+				++this->ip;
 			}
-			v9 = *v8;
-			this->ip = v8 + 1;
-			v7 += v9 + 15;
+			t += 15 + *this->ip++;
 		}
-		*(int*)this->op = *(int*)this->ip;
-		v10 = this->op + 4;
-		v11 = this->ip + 4;
-		v12 = v7 - 1;
-		this->op = v10;
-		this->ip = v11;
-		v13 = v11;
-		if (v12)
+		memcpy(this->op, this->ip, sizeof(unsigned int));
+		this->op += 4;
+		this->ip += 4;
+		if (--t)
 		{
-			if (v12 < 4)
+			if (t <= 3)
 			{
 				do
 				{
-					*this->op = *this->ip;
-					v16 = this->ip + 1;
-					--v12;
-					++this->op;
-					this->ip = v16;
-				} while (v12);
+					*this->op++ = *this->ip++;
+					--t;
+				} while (t);
 			}
 			else
 			{
 				do
 				{
-					v12 -= 4;
-					*(int*)v10 = *(int*)v13;
-					v14 = this->op + 4;
-					v13 = this->ip + 4;
-					this->op = v14;
-					v10 = v14;
-					this->ip = v13;
-				} while (v12 >= 4);
-				for (; v12; this->ip = v15)
-				{
-					*this->op = *this->ip;
-					v15 = this->ip + 1;
-					--v12;
-					++this->op;
-				}
+					memcpy(this->op, this->ip, sizeof(unsigned int));
+					this->op += 4;
+					this->ip += 4;
+					t -= 4;
+				} while (t > 3);
+				for (; t; --t)
+					*this->op++ = *this->ip++;
 			}
 		}
 	LABEL_17:
-		v7 = *this->ip;
-		v17 = this->ip + 1;
-		this->ip = v17;
-		if (v7 < 16)
+		t = *this->ip++;
+		if (t <= 0xF)
 		{
-			op = this->op;
-			v19 = op - (v7 >> 2) - 2049;
-			this->m_pos = v19;
-			v20 = v19 - 4 * *v17;
-			this->m_pos = v20;
-			this->ip = v17 + 1;
-			*op = *v20;
-			v21 = this->op + 1;
-			v22 = this->m_pos + 1;
-			this->op = v21;
-			this->m_pos = v22;
-			*v21 = *v22;
-		LABEL_47:
-			v59 = this->m_pos + 1;
-			v60 = ++this->op;
-			this->m_pos = v59;
-			*v60 = *v59;
+			this->m_pos = this->op - 2049;
+			this->m_pos -= t >> 2;
+			this->m_pos -= 4 * *this->ip++;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			*++this->op = *this->m_pos;
 			++this->op;
-			goto LABEL_48;
+			goto LABEL_51;
 		}
 	}
 	while (1)
 	{
-		if (v7 >= 64)
+		if (t > 0x3F)
 		{
-			v23 = this->op;
-			ip = this->ip;
-			v25 = v23 - ((v7 >> 2) & 7) - 1;
-			this->m_pos = v25;
-			v26 = v25 - 8 * *ip;
-			this->ip = ip + 1;
-			v27 = (v7 >> 5) - 1;
-			this->m_pos = v26;
-			*v23 = *v26;
-			v28 = this->op + 1;
-			v29 = this->m_pos + 1;
-			this->op = v28;
-			this->m_pos = v29;
-			*v28 = *v29;
-			v30 = this->op + 1;
-			v31 = this->m_pos + 1;
-			this->op = v30;
-			this->m_pos = v31;
+			this->m_pos = this->op - 1;
+			this->m_pos -= (t >> 2) & 7;
+			this->m_pos -= 8 * *this->ip++;
+			t = (t >> 5) - 1;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			++this->op;
 			do
 			{
-				*v30 = *this->m_pos;
-				v32 = this->op + 1;
-				v33 = this->m_pos + 1;
-				--v27;
-				this->op = v32;
-				v30 = v32;
-				this->m_pos = v33;
-			} while (v27);
-			goto LABEL_48;
+				*this->op++ = *this->m_pos++;
+				--t;
+			} while (t);
+			goto LABEL_51;
 		}
-		if (v7 >= 32)
+		if (t > 0x1F)
 		{
-			v34 = v7 & 31;
-			if (!v34)
+			t &= 0x1Fu;
+			if (!t)
 			{
-				if (!*this->ip)
+				while (!*this->ip)
 				{
-					do
-					{
-						v34 += 255;
-						v35 = this->ip + 1;
-						this->ip = v35;
-					} while (!*v35);
+					t += 255;
+					++this->ip;
 				}
-				v36 = *this->ip++;
-				v34 += v36 + 31;
+				t += 31 + *this->ip++;
 			}
-			v37 = this->op;
-			v38 = this->ip;
-			this->m_pos = v37 - 1;
-			v39 = v37 - (*(uint16_t*)v38 >> 2) - 1;
-			this->ip = v38 + 2;
-			goto LABEL_36;
+			this->m_pos = this->op - 1;
+			CopyLittleShort(&s, this->ip);
+			this->m_pos -= s >> 2;
+			this->ip += 2;
+			goto LABEL_42;
 		}
-		v37 = this->op;
-		if (v7 < 0x10)
+		if (t <= 0xF)
 		{
-			v56 = this->ip;
-			v57 = v37 - (v7 >> 2) - 1;
-			this->m_pos = v57;
-			v58 = v57 - 4 * *v56;
-			this->m_pos = v58;
-			this->ip = v56 + 1;
-			*v37 = *v58;
-			goto LABEL_47;
+			this->m_pos = this->op - 1;
+			this->m_pos -= t >> 2;
+			this->m_pos -= 4 * *this->ip++;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos;
+			++this->op;
+			goto LABEL_51;
 		}
-		v40 = v37 - 2048 * (v7 & 8);
-		v34 = v7 & 7;
-		this->m_pos = v40;
-		if (!v34)
+		this->m_pos = this->op;
+		this->m_pos -= 2048 * (t & 8);
+		t &= 7u;
+		if (!t)
 		{
-			if (!*this->ip)
+			while (!*this->ip)
 			{
-				do
-				{
-					v34 += 255;
-					v41 = this->ip + 1;
-					this->ip = v41;
-				} while (!*v41);
+				t += 255;
+				++this->ip;
 			}
-			v42 = *this->ip++;
-			v34 += v42 + 7;
+			t += 7 + *this->ip++;
 		}
-		this->m_pos -= *(unsigned short*)this->ip >> 2;
+		CopyLittleShort(&s, this->ip);
+		this->m_pos -= s >> 2;
 		this->ip += 2;
-		if (this->m_pos == v37)
+		if (this->m_pos == this->op)
 			break;
-		v39 = this->m_pos - 0x4000;
-	LABEL_36:
-		this->m_pos = v39;
-		if (v34 < 6 || v37 - v39 < 4)
+		this->m_pos -= 0x4000;
+	LABEL_42:
+		if (t <= 5 || this->op - this->m_pos <= 3)
 		{
-			*v37 = *this->m_pos;
-			v50 = this->op + 1;
-			v51 = this->m_pos + 1;
-			this->op = v50;
-			this->m_pos = v51;
-			*v50 = *v51;
-			v52 = this->op + 1;
-			v53 = this->m_pos + 1;
-			this->op = v52;
-			this->m_pos = v53;
+			*this->op = *this->m_pos++;
+			*++this->op = *this->m_pos++;
+			++this->op;
 			do
 			{
-				*v52 = *this->m_pos;
-				v54 = this->op + 1;
-				v55 = this->m_pos + 1;
-				--v34;
-				this->op = v54;
-				v52 = v54;
-				this->m_pos = v55;
-			} while (v34);
+				*this->op++ = *this->m_pos++;
+				--t;
+			} while (t);
 		}
 		else
 		{
-			*(int*)v37 = *(int*)v39;
-			v44 = this->op + 4;
-			v45 = this->m_pos + 4;
-			this->op = v44;
-			v46 = v44;
-			this->m_pos = v45;
-			v47 = v34 - 2;
+			memcpy(this->op, this->m_pos, sizeof(unsigned int));
+			this->op += 4;
+			this->m_pos += 4;
+			t -= 2;
 			do
 			{
-				v47 -= 4;
-				*(int*)v46 = *(int*)this->m_pos;
-				v46 = this->op + 4;
-				v48 = this->m_pos + 4;
-				this->op = v46;
-				this->m_pos = v48;
-			} while (v47 >= 4);
-			for (; v47; this->m_pos = v49)
-			{
-				*this->op = *this->m_pos;
-				v49 = this->m_pos + 1;
-				--v47;
-				++this->op;
-			}
+				memcpy(this->op, this->m_pos, sizeof(unsigned int));
+				this->op += 4;
+				this->m_pos += 4;
+				t -= 4;
+			} while (t > 3);
+			for (; t; --t)
+				*this->op++ = *this->m_pos++;
 		}
-	LABEL_48:
-		v5 = *(this->ip - 2) & 3;
-		if ((*(this->ip - 2) & 3) == 0)
+	LABEL_51:
+		t = *(this->ip - 2) & 3;
+
+		if (!t)
 			goto LABEL_5;
+
+	LABEL_52:
 		do
 		{
-		LABEL_49:
-			*this->op = *this->ip;
-			v61 = this->ip + 1;
-			--v5;
-			++this->op;
-			this->ip = v61;
-		} while (v5);
-		v7 = *v61;
-		this->ip = v61 + 1;
+			*this->op++ = *this->ip++;
+			--t;
+		} while (t);
+
+		t = *this->ip++;
 	}
+
 	*out_len = this->op - out;
-	v62 = this->ip;
-	ip_end = this->ip_end;
-	if (v62 == ip_end)
+
+	if (this->ip == this->ip_end)
 		return 0;
-	else
-		return (v62 < ip_end) - 2;
+
+	if (this->ip >= this->ip_end)
+		return -2;
+	return -1;
 }
 
 static unsigned char in[ 0x40000 ];
diff --git a/code/qcommon/mem_blockalloc.cpp b/code/qcommon/mem_blockalloc.cpp
index 1cb9f94d..51dd94a5 100644
--- a/code/qcommon/mem_blockalloc.cpp
+++ b/code/qcommon/mem_blockalloc.cpp
@@ -50,6 +50,20 @@ void MEM_Free(void *ptr)
     return cgi.Free(ptr);
 }
 
+#elif defined(REF_DLL)
+
+#    include "../renderercommon/tr_common.h"
+
+void *MEM_Alloc(int size)
+{
+    return ri.Malloc(size);
+}
+
+void MEM_Free(void *ptr)
+{
+    return ri.Free(ptr);
+}
+
 #else
 
 #    include "qcommon.h"
diff --git a/code/qcommon/mem_blockalloc.h b/code/qcommon/mem_blockalloc.h
index 0e372fbe..c1659336 100644
--- a/code/qcommon/mem_blockalloc.h
+++ b/code/qcommon/mem_blockalloc.h
@@ -342,7 +342,7 @@ template<typename a, size_t b>
 void MEM_BlockAlloc<a, b>::Free(void *ptr) noexcept
 {
 #if _DEBUG_MEMBLOCK
-    block_s<a, b> *block = (block_s<a, b> *)ptr;
+    block_t *block = (block_t*)ptr - offsetof(block_t, data);
 
     LL_SafeRemoveRoot(m_Block, block, next_block, prev_block);
 
diff --git a/code/qcommon/memory.c b/code/qcommon/memory.c
index 286e9f7a..b1e0da47 100644
--- a/code/qcommon/memory.c
+++ b/code/qcommon/memory.c
@@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "qcommon.h"
 
-#ifdef WIN32
-#include <Windows.h>
+#ifndef DEDICATED
+#  include "../client/client.h"
 #endif
 
 #define	ZONEID			0x7331
@@ -34,10 +34,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void Z_CheckHeap(void);
 
+typedef struct zonedebug_s {
+	const char *label;
+	const char *file;
+	int line;
+	int allocSize;
+} zonedebug_t;
+
 typedef struct memblock_s {
 	size_t	size;			// including the header and possibly tiny fragments
 	struct memblock_s		*next, *prev;
 	int     id;				// should be ZONEID
+#ifdef ZONE_DEBUG
+	zonedebug_t d;
+#endif
 } memblock_t;
 
 typedef struct memconstant_s {
@@ -48,16 +58,16 @@ typedef struct memconstant_s {
 memconstant_t emptystring = { sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, 0, 0 };
 memconstant_t numberstring[] =
 {
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '0', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '1', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '2', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '3', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '4', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '5', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '6', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '7', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '8', 0 },
-	{ sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST, '9', 0 },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'0', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'1', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'2', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'3', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'4', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'5', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'6', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'7', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'8', 0} },
+	{ {sizeof( memconstant_t ), NULL, NULL, ZONEID_CONST}, {'9', 0} },
 };
 
 static memblock_t mem_blocks[ TAG_NUM_TOTAL_TAGS ];
@@ -82,8 +92,6 @@ const char *Z_NumberStringPointer( int iNum )
 	return ( const char * )numberstring[ iNum - '0' ].mem;
 }
 
-#ifndef _DEBUG_MEM
-
 /*
 ========================
 Z_Free
@@ -114,16 +122,10 @@ void Z_Free( void *ptr )
 	block->prev = block;
 	block->next = block;
 
-#if !defined(_DEBUG) || !defined(WIN32)
 	// free the block
 	free( block );
-#else
-	HeapFree(GetProcessHeap(), 0, block);
-#endif
 }
 
-#endif
-
 /*
 ========================
 Z_FreeTags
@@ -144,15 +146,17 @@ void Z_FreeTags( int tag )
 	mem_blocks[ tag ].next = &mem_blocks[ tag ];
 }
 
-#ifndef _DEBUG_MEM
-
 /*
 ========================
 Z_TagMalloc
 ========================
 */
-void *Z_TagMalloc( int size, int tag )
-{
+#ifdef ZONE_DEBUG
+void *Z_TagMallocDebug( int size, int tag, const char *label, const char *file, int line ) {
+	int		allocSize;
+#else
+void *Z_TagMalloc( int size, int tag ) {
+#endif
 	memblock_t *block;
 
 	if( size <= 0 )
@@ -166,17 +170,17 @@ void *Z_TagMalloc( int size, int tag )
 		Com_Error( ERR_FATAL, "Z_TagMalloc: tried to use a 0 tag" );
 	}
 
+#ifdef ZONE_DEBUG
+	allocSize = size;
+#endif
+
 	size += sizeof( memblock_t );				// account for size of block header
 #ifndef _DEBUG
 	size += sizeof( int );						// space for memory trash tester
 #endif
 	size = PAD( size, sizeof( intptr_t ) );		// align to 32/64 bit boundary
 
-#if !defined(_DEBUG) || !defined(WIN32)
 	block = ( memblock_t * )malloc( size );
-#else
-	block = HeapAlloc(GetProcessHeap(), 0, size);
-#endif
 	block->id = ZONEID;
 	block->size = size;
 	block->next = &mem_blocks[ tag ];
@@ -184,6 +188,13 @@ void *Z_TagMalloc( int size, int tag )
 	block->prev->next = block;
 	mem_blocks[ tag ].prev = block;
 
+#ifdef ZONE_DEBUG
+	block->d.label = label;
+	block->d.file = file;
+	block->d.line = line;
+	block->d.allocSize = allocSize;
+#endif
+
 #ifndef _DEBUG
 	// marker for memory trash testing
 	*( int * )( ( byte * )block + block->size - sizeof( int ) ) = ZONEID;
@@ -192,8 +203,6 @@ void *Z_TagMalloc( int size, int tag )
 	return ( void * )( ( byte * )block + sizeof( memblock_t ) );
 }
 
-#endif
-
 /*
 ========================
 Z_CheckHeap
@@ -343,11 +352,14 @@ void Z_Meminfo_f( void )
 	}
 
 	Com_Printf( "\n%.2f Kbytes in %zu blocks in all memory pools\n", ( float )totalBytes / 1024.0f, totalBlocks );
+	Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
 
-	// FIXME: Count texture memory
-	//Com_Printf( "\n%.2f megabytes in 'new' system memory\n", 1.024f );
-	//Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )R_CountTextureMemory() / 1024.0f );
-	//Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )R_CountTextureMemory() + totalBytes - 1 / 1024.0f );
+#ifndef DEDICATED
+	if (re.CountTextureMemory) {
+		Com_Printf( "\n%.2f megabytes in texture memory\n", ( float )re.CountTextureMemory() / 1024.0f );
+		Com_Printf( "\n%.1f megabytes in total allocations\n", ( float )re.CountTextureMemory() + totalBytes - 1 / 1024.0f );
+	}
+#endif
 }
 
 /*
@@ -384,34 +396,18 @@ void Z_Shutdown( void ) {
 	}
 }
 
+/*
+=================
+Hunk_Alloc
+
+Allocate permanent (until the hunk is cleared) memory
+=================
+*/
 #ifdef HUNK_DEBUG
-
-/*
-=================
-Hunk_Alloc
-
-Allocate permanent (until the hunk is cleared) memory
-=================
-*/
-void* Hunk_AllocDebug(int size, ha_pref preference, const char* label, const char* file, int line) {
-    void* ptr;
-
-    ptr = Z_TagMalloc(size, TAG_STATIC);
-    memset(ptr, 0, size);
-
-    return ptr;
-}
-
+void *Hunk_AllocDebug( int size, ha_pref preference, const char *label, const char *file, int line ) {
 #else
-
-/*
-=================
-Hunk_Alloc
-
-Allocate permanent (until the hunk is cleared) memory
-=================
-*/
-void *Hunk_Alloc( int size, ha_pref preference) {
+void *Hunk_Alloc( int size, ha_pref preference ) {
+#endif
 	void *ptr;
 
 	ptr = Z_TagMalloc( size, TAG_STATIC );
@@ -420,8 +416,6 @@ void *Hunk_Alloc( int size, ha_pref preference) {
 	return ptr;
 }
 
-#endif
-
 /*
 =================
 Hunk_Clear
@@ -498,20 +492,26 @@ Com_InitHunkZoneMemory
 void Com_InitHunkMemory( void ) {
 }
 
-#ifndef _DEBUG_MEM
-
 /*
 ========================
 Z_Malloc
 ========================
 */
+#ifdef ZONE_DEBUG
+void *Z_MallocDebug( int size, const char *label, const char *file, int line ) {
+#else
 void *Z_Malloc( int size ) {
-	void *ptr;
-
-	ptr = Z_TagMalloc( size, TAG_GENERAL );
-	memset( ptr, 0, size );
-
-	return ptr;
-}
-
 #endif
+	void	*buf;
+	
+  //Z_CheckHeap ();	// DEBUG
+
+#ifdef ZONE_DEBUG
+	buf = Z_TagMallocDebug( size, TAG_GENERAL, label, file, line );
+#else
+	buf = Z_TagMalloc( size, TAG_GENERAL );
+#endif
+	Com_Memset( buf, 0, size );
+
+	return buf;
+}
diff --git a/code/qcommon/msg.cpp b/code/qcommon/msg.cpp
index 77f4c338..a83621da 100644
--- a/code/qcommon/msg.cpp
+++ b/code/qcommon/msg.cpp
@@ -232,9 +232,7 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 
 	oldsize += bits;
 
-	// this isn't an exact overflow check, but close enough
-	if ( msg->maxsize - msg->cursize < 4 ) {
-		msg->overflowed = qtrue;
+	if ( msg->overflowed ) {
 		return;
 	}
 
@@ -294,6 +292,10 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		if (bits&7) {
 			int nbits;
 			nbits = bits&7;
+			if ( msg->bit + nbits >= msg->maxsize << 3 ) {
+				msg->overflowed = qtrue;
+				return;
+			}
 			for(i=0;i<nbits;i++) {
 				Huff_putBit((value&1), msg->data, &msg->bit);
 				value = (value>>1);
@@ -302,8 +304,13 @@ void MSG_WriteBits( msg_t *msg, int value, int bits ) {
 		}
 		if (bits) {
 			for(i=0;i<bits;i+=8) {
-				Huff_offsetTransmit (&msgHuff.compressor, (value&0xff), msg->data, &msg->bit);
+				Huff_offsetTransmit( &msgHuff.compressor, (value & 0xff), msg->data, &msg->bit, msg->maxsize << 3 );
 				value = (value>>8);
+
+				if ( msg->bit >= msg->maxsize << 3 ) {
+					msg->overflowed = qtrue;
+					return;
+				}
 			}
 		}
 		msg->cursize = (msg->bit>>3)+1;
@@ -316,6 +323,10 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 	qboolean	sgn;
 	int			i, nbits;
 
+	if ( msg->readcount > msg->cursize ) {
+		return 0;
+	}
+
 	value = 0;
 
 	if ( bits < 0 ) {
@@ -358,6 +369,10 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 		nbits = 0;
 		if (bits&7) {
 			nbits = bits&7;
+			if (msg->bit + nbits > msg->cursize << 3) {
+				msg->readcount = msg->cursize + 1;
+				return 0;
+			}
 			for(i=0;i<nbits;i++) {
 				value |= (Huff_getBit(msg->data, &msg->bit)<<i);
 			}
@@ -365,8 +380,13 @@ int MSG_ReadBits( msg_t *msg, int bits ) {
 		}
 		if (bits) {
 			for(i=0;i<bits;i+=8) {
-				Huff_offsetReceive (msgHuff.decompressor.tree, &get, msg->data, &msg->bit);
+				Huff_offsetReceive (msgHuff.decompressor.tree, &get, msg->data, &msg->bit, msg->cursize<<3);
 				value |= (get<<(i+nbits));
+
+				if (msg->bit > msg->cursize<<3) {
+					msg->readcount = msg->cursize + 1;
+					return 0;
+				}
 			}
 		}
 		msg->readcount = (msg->bit>>3)+1;
@@ -758,7 +778,7 @@ char *MSG_ReadString( msg_t *msg ) {
 	l = 0;
 	do {
 		c = MSG_ReadByte(msg);		// use ReadByte so -1 is out of bounds
-		if (!c || c == -1) {
+		if ( c == -1 || c == 0 ) {
 			break;
 		}
 		// translate all fmt spec to avoid crash bugs
@@ -790,10 +810,6 @@ char *MSG_ReadBigString( msg_t *msg ) {
 		if ( c == '%' ) {
 			c = '.';
 		}
-		// don't allow higher ascii values
-		if ( c > 127 ) {
-			c = '.';
-		}
 
 		string[l] = (char)c;
 		l++;
@@ -811,18 +827,13 @@ char *MSG_ReadStringLine( msg_t *msg ) {
 	l = 0;
 	do {
 		c = MSG_ReadByte(msg);		// use ReadByte so -1 is out of bounds
-		if (c <= 0 || c == '\n') {
-		//if (c == -1 || c == 0 || c == '\n') { //Q3
+		if (c == -1 || c == 0 || c == '\n') {
 			break;
 		}
 		// translate all fmt spec to avoid crash bugs
 		if ( c == '%' ) {
 			c = '.';
 		}
-		// don't allow higher ascii values
-		if ( c > 127 ) {
-			c = '.';
-		}
 
 		string[l] = c;
 		l++;
@@ -864,6 +875,18 @@ void MSG_ReadData( msg_t *msg, void *data, int len ) {
 	}
 }
 
+// a string hasher which gives the same hash value even if the
+// string is later modified via the legacy MSG read/write code
+int MSG_HashKey(const char *string, int maxlen) {
+	int hash, i;
+
+	hash = 0;
+	for (i = 0; i < maxlen && string[i] != '\0'; i++) {
+		hash += string[i] * (119 + i);
+	}
+	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
+	return hash;
+}
 
 /*
 =============================================================================
@@ -1280,13 +1303,30 @@ typedef enum netFieldType_e {
 typedef struct {
 	const char *name;
 	size_t offset;
+	size_t size;
 	// bits: 0 = float
 	int bits;
 	int type;
 } netField_t;
 
+byte* LittleOffset(void* value, size_t size, size_t targetSize) {
+#ifdef Q3_BIG_ENDIAN
+	return (byte*)value + size - targetSize;
+#else
+	return (byte*)value;
+#endif
+}
+
+void CopyToLittleField(void* toF, const void* value, size_t size, size_t targetSize) {
+	Com_Memcpy(toF, LittleOffset((byte*)value, size, targetSize), targetSize);
+}
+
+void CopyFromLittleField(void* value, const void* fromF, size_t size, size_t targetSize) {
+	Com_Memcpy(LittleOffset((byte*)value, size, targetSize), fromF, targetSize);
+}
+
 // using the stringizing operator to save typing...
-#define	NETF(x) #x,(size_t)&((entityState_t*)0)->x
+#define	NETF(x) #x,(size_t)&((entityState_t*)0)->x,sizeof(entityState_t::x)
 
 netField_t	entityStateFields_ver_15[] =
 {
@@ -1439,6 +1479,9 @@ netField_t	entityStateFields_ver_15[] =
 };
 static constexpr unsigned long numEntityStateFields_ver_15 = sizeof(entityStateFields_ver_15) / sizeof(entityStateFields_ver_15[0]);
 
+//
+// Protocol version 6
+//
 netField_t	entityStateFields_ver_6[] = 
 {
 { NETF(netorigin[0]), 0, netFieldType_t::coord },
@@ -1495,6 +1538,160 @@ netField_t	entityStateFields_ver_6[] =
 { NETF(bone_angles[0][1]), -13, netFieldType_t::angle },
 { NETF(surfaces[4]), 8, netFieldType_t::regular },
 { NETF(surfaces[5]), 8, netFieldType_t::regular },
+{ NETF(loopSound), 16, netFieldType_t::regular },
+{ NETF(loopSoundVolume), 0, netFieldType_t::regular },
+{ NETF(loopSoundMinDist), 0, netFieldType_t::regular },
+{ NETF(loopSoundMaxDist), 0, netFieldType_t::regular },
+{ NETF(loopSoundPitch), 0, netFieldType_t::regular },
+{ NETF(loopSoundFlags), 8, netFieldType_t::regular },
+{ NETF(attach_offset[0]), 0, netFieldType_t::regular },
+{ NETF(attach_offset[1]), 0, netFieldType_t::regular },
+{ NETF(attach_offset[2]), 0, netFieldType_t::regular },
+{ NETF(beam_entnum), 16, netFieldType_t::regular },
+{ NETF(skinNum), 16, netFieldType_t::regular },
+{ NETF(wasframe), 10, netFieldType_t::regular },
+{ NETF(frameInfo[4].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[5].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[6].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[7].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[8].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[9].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[10].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[11].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[12].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[13].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[14].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[15].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[4].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[5].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[6].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[7].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[8].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[9].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[10].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[11].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[12].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[13].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[14].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[15].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[4].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[5].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[6].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[7].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[8].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[9].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[10].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[11].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[12].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[13].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[14].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[15].weight), 0, netFieldType_t::animWeight },
+{ NETF(bone_angles[1][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][1]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[4][2]), -13, netFieldType_t::angle },
+{ NETF(clientNum), 8, netFieldType_t::regular },
+{ NETF(groundEntityNum), GENTITYNUM_BITS, netFieldType_t::regular },
+{ NETF(shader_data[0]), 0, netFieldType_t::regular },
+{ NETF(shader_data[1]), 0, netFieldType_t::regular },
+{ NETF(shader_time), 0, netFieldType_t::regular },
+{ NETF(eyeVector[0]), 0, netFieldType_t::regular },
+{ NETF(eyeVector[1]), 0, netFieldType_t::regular },
+{ NETF(eyeVector[2]), 0, netFieldType_t::regular },
+{ NETF(surfaces[6]), 8, netFieldType_t::regular },
+{ NETF(surfaces[7]), 8, netFieldType_t::regular },
+{ NETF(surfaces[8]), 8, netFieldType_t::regular },
+{ NETF(surfaces[9]), 8, netFieldType_t::regular },
+{ NETF(surfaces[10]), 8, netFieldType_t::regular },
+{ NETF(surfaces[11]), 8, netFieldType_t::regular },
+{ NETF(surfaces[12]), 8, netFieldType_t::regular },
+{ NETF(surfaces[13]), 8, netFieldType_t::regular },
+{ NETF(surfaces[14]), 8, netFieldType_t::regular },
+{ NETF(surfaces[15]), 8, netFieldType_t::regular },
+{ NETF(surfaces[16]), 8, netFieldType_t::regular },
+{ NETF(surfaces[17]), 8, netFieldType_t::regular },
+{ NETF(surfaces[18]), 8, netFieldType_t::regular },
+{ NETF(surfaces[19]), 8, netFieldType_t::regular },
+{ NETF(surfaces[20]), 8, netFieldType_t::regular },
+{ NETF(surfaces[21]), 8, netFieldType_t::regular },
+{ NETF(surfaces[22]), 8, netFieldType_t::regular },
+{ NETF(surfaces[23]), 8, netFieldType_t::regular },
+{ NETF(surfaces[24]), 8, netFieldType_t::regular },
+{ NETF(surfaces[25]), 8, netFieldType_t::regular },
+{ NETF(surfaces[26]), 8, netFieldType_t::regular },
+{ NETF(surfaces[27]), 8, netFieldType_t::regular },
+{ NETF(surfaces[28]), 8, netFieldType_t::regular },
+{ NETF(surfaces[29]), 8, netFieldType_t::regular },
+{ NETF(surfaces[30]), 8, netFieldType_t::regular },
+{ NETF(surfaces[31]), 8, netFieldType_t::regular }
+};
+
+//
+// Protocol version 8
+// It adds the following fields:
+// - pos.trTime
+// - pos.trDelta[0]
+// - pos.trDelta[1]
+// - pos.trDelta[2]
+//
+netField_t	entityStateFields_ver_8[] = 
+{
+{ NETF(netorigin[0]), 0, netFieldType_t::coord },
+{ NETF(netorigin[1]), 0, netFieldType_t::coord },
+{ NETF(netangles[1]), 12, netFieldType_t::angle },
+{ NETF(frameInfo[0].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[1].time), 0, netFieldType_t::animTime },
+{ NETF(bone_angles[0][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[1][0]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][0]), -13, netFieldType_t::angle },
+{ NETF(netorigin[2]), 0, netFieldType_t::coord },
+{ NETF(frameInfo[0].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[1].weight), 0, netFieldType_t::animWeight},
+{ NETF(frameInfo[2].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[3].time), 0, netFieldType_t::animTime },
+{ NETF(frameInfo[0].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[1].index), 12, netFieldType_t::regular },
+{ NETF(actionWeight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[2].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[3].weight), 0, netFieldType_t::animWeight },
+{ NETF(frameInfo[2].index), 12, netFieldType_t::regular },
+{ NETF(frameInfo[3].index), 12, netFieldType_t::regular },
+{ NETF(eType), 8, netFieldType_t::regular },
+{ NETF(modelindex), 16, netFieldType_t::regular },
+{ NETF(parent), 16, netFieldType_t::regular },
+{ NETF(constantLight), 32, netFieldType_t::regular },
+{ NETF(renderfx), 32, netFieldType_t::regular },
+{ NETF(bone_tag[0]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[1]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[2]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[3]), -8, netFieldType_t::regular },
+{ NETF(bone_tag[4]), -8, netFieldType_t::regular },
+{ NETF(scale), 0, netFieldType_t::scale },
+{ NETF(alpha), 0, netFieldType_t::alpha },
+{ NETF(usageIndex), 16, netFieldType_t::regular },
+{ NETF(eFlags), 16, netFieldType_t::regular },
+{ NETF(solid), 32, netFieldType_t::regular },
+{ NETF(netangles[2]), 12, netFieldType_t::angle },
+{ NETF(netangles[0]), 12, netFieldType_t::angle },
+{ NETF(tag_num), 10, netFieldType_t::regular },
+{ NETF(bone_angles[1][2]), -13, netFieldType_t::angle },
+{ NETF(attach_use_angles), 1, netFieldType_t::regular },
+{ NETF(origin2[1]), 0, netFieldType_t::coord },
+{ NETF(origin2[0]), 0, netFieldType_t::coord },
+{ NETF(origin2[2]), 0, netFieldType_t::coord },
+{ NETF(bone_angles[0][2]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[2][2]), -13, netFieldType_t::angle },
+{ NETF(bone_angles[3][2]), -13, netFieldType_t::angle },
+{ NETF(surfaces[0]), 8, netFieldType_t::regular },
+{ NETF(surfaces[1]), 8, netFieldType_t::regular },
+{ NETF(surfaces[2]), 8, netFieldType_t::regular },
+{ NETF(surfaces[3]), 8, netFieldType_t::regular },
+{ NETF(bone_angles[0][1]), -13, netFieldType_t::angle },
+{ NETF(surfaces[4]), 8, netFieldType_t::regular },
+{ NETF(surfaces[5]), 8, netFieldType_t::regular },
 { NETF(pos.trTime), 32, netFieldType_t::regular },
 { NETF(pos.trDelta[0]), 0, netFieldType_t::velocity },
 { NETF(pos.trDelta[1]), 0, netFieldType_t::velocity },
@@ -1589,7 +1786,8 @@ netField_t	entityStateFields_ver_6[] =
 { NETF(surfaces[31]), 8, netFieldType_t::regular }
 };
 static constexpr unsigned long numEntityStateFields_ver_6 = sizeof(entityStateFields_ver_6) / sizeof(entityStateFields_ver_6[0]);
-static constexpr unsigned long numBiggestEntityStateFields = numEntityStateFields_ver_15 >= numEntityStateFields_ver_6 ? numEntityStateFields_ver_15 : numEntityStateFields_ver_6;
+static constexpr unsigned long numEntityStateFields_ver_8 = sizeof(entityStateFields_ver_8) / sizeof(entityStateFields_ver_8[0]);
+static constexpr unsigned long numBiggestEntityStateFields = numEntityStateFields_ver_15 >= numEntityStateFields_ver_8 ? numEntityStateFields_ver_15 : numEntityStateFields_ver_8;
 
 netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
 {
@@ -1598,11 +1796,16 @@ netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
         outNumFields = sizeof(entityStateFields_ver_15) / sizeof(entityStateFields_ver_15[0]);
         return entityStateFields_ver_15;
     }
-    else
+    else if (com_protocol->integer >= protocol_e::PROTOCOL_MOH)
+    {
+        outNumFields = sizeof(entityStateFields_ver_8) / sizeof(entityStateFields_ver_8[0]);
+        return entityStateFields_ver_8;
+    }
+	else
     {
         outNumFields = sizeof(entityStateFields_ver_6) / sizeof(entityStateFields_ver_6[0]);
         return entityStateFields_ver_6;
-    }
+	}
 }
 
 // if (int)f == f and (int)f + ( 1<<(FLOAT_INT_BITS-1) ) < ( 1 << FLOAT_INT_BITS )
@@ -1610,7 +1813,7 @@ netField_t* MSG_GetEntityStateFields(size_t& outNumFields)
 #define	FLOAT_INT_BITS	13
 #define	FLOAT_INT_BIAS	(1<<(FLOAT_INT_BITS-1))
 
-void MSG_ReadRegular_ver_15(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular_ver_15(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0)
 	{
@@ -1642,20 +1845,21 @@ void MSG_ReadRegular_ver_15(msg_t* sb, int bits, void* toF)
 	else
 	{
 		if (MSG_ReadBits(sb, 1)) {
-			*(int*)toF = MSG_ReadBits(sb, bits);
+			int tmp = MSG_ReadBits(sb, bits);
+			CopyToLittleField(toF, &tmp, sizeof(int), size);
 		}
 		else {
-			*(int*)toF = 0;
+			Com_Memset(toF, 0, size);
 		}
 	}
 }
 
-void MSG_ReadRegularSimple_ver_15(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple_ver_15(msg_t* sb, int bits, int size, void* toF)
 {
-	MSG_ReadRegular_ver_15(sb, bits, toF);
+	MSG_ReadRegular_ver_15(sb, bits, size, toF);
 }
 
-void MSG_WriteRegular_ver_15(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular_ver_15(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1688,20 +1892,36 @@ void MSG_WriteRegular_ver_15(msg_t* sb, int bits, const void* toF)
 		}
 	}
 	else {
-		if (!*(int*)toF) {
+		qboolean hasValue = qfalse;
+		for (size_t i = 0; i < size; ++i)
+		{
+			if (((byte*)toF)[i] != 0)
+			{
+				hasValue = qtrue;
+				break;
+			}
+		}
+
+		if (!hasValue) {
 			MSG_WriteBits(sb, 0, 1);
 		}
 		else {
+			//
+			// Added in OPM
+			//  Properly swap on little-endian architectures
+			int tmp = 0;
+			CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
 			MSG_WriteBits(sb, 1, 1);
 			// integer
-			MSG_WriteBits(sb, *(int*)toF, bits);
+			MSG_WriteBits(sb, tmp, bits);
 		}
 	}
 }
 
-void MSG_WriteRegularSimple_ver_15(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple_ver_15(msg_t* sb, int bits, int size, const void* toF)
 {
-	MSG_WriteRegular_ver_15(sb, bits, toF);
+	MSG_WriteRegular_ver_15(sb, bits, size, toF);
 }
 
 void MSG_WriteEntityNum_ver_15(msg_t* sb, short number)
@@ -1715,7 +1935,7 @@ unsigned short MSG_ReadEntityNum_ver_15(msg_t* sb)
 	return (unsigned short)(MSG_ReadBits(sb, GENTITYNUM_BITS) - 1) % MAX_GENTITIES;
 }
 
-void MSG_ReadRegular_ver_6(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular_ver_6(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0)
 	{
@@ -1738,15 +1958,16 @@ void MSG_ReadRegular_ver_6(msg_t* sb, int bits, void* toF)
 	else
 	{
 		if (MSG_ReadBits(sb, 1)) {
-			*(int*)toF = MSG_ReadBits(sb, bits);
+			int tmp = MSG_ReadBits(sb, bits);
+			CopyToLittleField(toF, &tmp, sizeof(int), size);
 		}
 		else {
-			*(int*)toF = 0;
+			Com_Memset(toF, 0, size);
 		}
 	}
 }
 
-void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, int size, void* toF)
 {
 	if (bits == 0) {
 		// float
@@ -1764,11 +1985,12 @@ void MSG_ReadRegularSimple_ver_6(msg_t* sb, int bits, void* toF)
 	}
 	else {
 		// integer
-		*(int*)toF = MSG_ReadBits(sb, bits);
+		int tmp = MSG_ReadBits(sb, bits);
+		CopyToLittleField(toF, &tmp, sizeof(int), size);
 	}
 }
 
-void MSG_WriteRegular_ver_6(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular_ver_6(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1802,14 +2024,20 @@ void MSG_WriteRegular_ver_6(msg_t* sb, int bits, const void* toF)
 			MSG_WriteBits(sb, 0, 1);
 		}
 		else {
+			//
+			// Added in OPM
+			//  Properly swap on little-endian architectures
+			int tmp = 0;
+			CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
 			MSG_WriteBits(sb, 1, 1);
 			// integer
-			MSG_WriteBits(sb, *(int*)toF, bits);
+			MSG_WriteBits(sb, tmp, bits);
 		}
 	}
 }
 
-void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, int size, const void* toF)
 {
 	float fullFloat;
 	int trunc;
@@ -1833,7 +2061,14 @@ void MSG_WriteRegularSimple_ver_6(msg_t* sb, int bits, const void* toF)
 	}
 	else {
 		// integer
-		MSG_WriteBits(sb, *(int*)toF, bits);
+		//
+		// Added in OPM
+		//  Properly swap on little-endian architectures
+		int tmp = 0;
+		CopyFromLittleField(&tmp, toF, sizeof(int), size);
+
+		// integer
+		MSG_WriteBits(sb, tmp, bits);
 	}
 }
 
@@ -1847,39 +2082,39 @@ unsigned short MSG_ReadEntityNum_ver_6(msg_t* sb)
 	return MSG_ReadBits(sb, GENTITYNUM_BITS) % MAX_GENTITIES;
 }
 
-void MSG_ReadRegular(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegular(msg_t* sb, int bits, int size, void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_ReadRegular_ver_15(sb, bits, toF);
+		return MSG_ReadRegular_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_ReadRegular_ver_6(sb, bits, toF);
+		return MSG_ReadRegular_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_ReadRegularSimple(msg_t* sb, int bits, void* toF)
+void MSG_ReadRegularSimple(msg_t* sb, int bits, int size, void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_ReadRegularSimple_ver_15(sb, bits, toF);
+		return MSG_ReadRegularSimple_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_ReadRegularSimple_ver_6(sb, bits, toF);
+		return MSG_ReadRegularSimple_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_WriteRegular(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegular(msg_t* sb, int bits, int size, const void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_WriteRegular_ver_15(sb, bits, toF);
+		return MSG_WriteRegular_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_WriteRegular_ver_6(sb, bits, toF);
+		return MSG_WriteRegular_ver_6(sb, bits, size, toF);
 	}
 }
 
-void MSG_WriteRegularSimple(msg_t* sb, int bits, const void* toF)
+void MSG_WriteRegularSimple(msg_t* sb, int bits, int size, const void* toF)
 {
 	if (MSG_IsProtocolVersion15()) {
-		return MSG_WriteRegularSimple_ver_15(sb, bits, toF);
+		return MSG_WriteRegularSimple_ver_15(sb, bits, size, toF);
 	} else {
-		return MSG_WriteRegularSimple_ver_6(sb, bits, toF);
+		return MSG_WriteRegularSimple_ver_6(sb, bits, size, toF);
 	}
 }
 
@@ -1950,7 +2185,7 @@ void MSG_WriteDeltaEntity( msg_t *msg, struct entityState_s *from, struct entity
 	for ( i = 0, field = entityStateFields ; i < numFields; i++, field++ ) {
 		fromF = (int *)( (byte *)from + field->offset );
 		toF = (int *)( (byte *)to + field->offset );
-		deltasNeeded[i] = MSG_DeltaNeeded(fromF, toF, field->type, field->bits);
+		deltasNeeded[i] = MSG_DeltaNeeded(fromF, toF, field->type, field->bits, field->size);
 		if (deltasNeeded[i]) {
 			lc = i+1;
 		}
@@ -1992,7 +2227,7 @@ void MSG_WriteDeltaEntity( msg_t *msg, struct entityState_s *from, struct entity
 		switch ( field->type ) {
 			// normal style
 			case netFieldType_e::regular:
-				MSG_WriteRegular(msg, field->bits, toF);
+				MSG_WriteRegular(msg, field->bits, field->size, toF);
 				break;
 			case netFieldType_e::angle:
 				MSG_WritePackedAngle(msg, *(float*)toF, field->bits);
@@ -2156,27 +2391,35 @@ int MSG_PackAlpha(float alpha, int bits)
 
 int MSG_PackCoord(float coord)
 {
-	unsigned int packed = (unsigned int)round(coord * 4.0 + MAX_PACKED_COORD_HALF);
-	if (packed >= MAX_PACKED_COORD) {
-		Com_DPrintf("Illegal XYZ coordinates for an entity, small information lost in transmission\n");
-	} else {
+	unsigned int packed;
+
+	packed = (unsigned int)round(coord * 4.0 + MAX_PACKED_COORD_HALF);
+
+	if (packed < MAX_PACKED_COORD) {
 		coordstats[packed]++;
 	}
+// 	else {
+// 		Com_DPrintf("Illegal XYZ coordinates for an entity, small information lost in transmission\n");
+// 	}
 
 	return packed;
 }
 
 int MSG_PackCoordExtra(float coord)
 {
-	unsigned int packed = (unsigned int)round(coord * 16.0 + MAX_PACKED_COORD_EXTRA_HALF);
-	if (packed >= MAX_PACKED_COORD_EXTRA) {
-		Com_DPrintf("Illegal XYZ coordinates for an entity, information lost in transmission\n");
-	}
-	else {
-		// This check wasn't added in >= 2.0
-		// which means a player could crash a server when out of bounds
+	unsigned int packed;
+
+	packed = (unsigned int)round(coord * 16.0 + MAX_PACKED_COORD_EXTRA_HALF);
+
+	// Fixed in OPM
+	//  This check wasn't added in >= 2.0
+	//  which means a player could crash a server when out of bounds
+	if (packed < MAX_PACKED_COORD_EXTRA) {
 		++coordextrastats[packed];
 	}
+//	else {
+//		Com_DPrintf("Illegal XYZ coordinates for an entity, information lost in transmission\n");
+//	}
 
 	return packed;
 }
@@ -2191,7 +2434,7 @@ float MSG_ReadPackedAnimTime_ver_15(msg_t* msg, int bits, float fromValue, float
 {
 	int packed;
 	if (!MSG_ReadBits(msg, 1)) {
-		return fromValue + frameTime;
+		return ceil((fromValue + frameTime) * 10000) / 10000;
 	}
 
 	packed = MSG_ReadBits(msg, bits);
@@ -2283,13 +2526,16 @@ void MSG_WritePackedCoordExtra_ver_15(msg_t* msg, float fromValue, float toValue
 	MSG_WriteDeltaCoordExtra(msg, packedFrom, packedTo);
 }
 
-qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int fieldType, int bits)
+qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int fieldType, int bits, int size)
 {
 	int packedFrom;
 	int packedTo;
 	int maxValue;
+	int xoredValue;
+	int i;
 
-	if (*(int*)fromField == *(int*)toField) {
+	if (!memcmp(fromField, toField, size)) {
+		// same values, not needed
 		return qfalse;
 	}
 
@@ -2301,7 +2547,16 @@ qboolean MSG_DeltaNeeded_ver_15(const void* fromField, const void* toField, int
 		}
 
 		maxValue = (1 << abs(bits)) - 1;
-		return ((*(int*)fromField ^ *(int*)toField) & maxValue) != 0;
+		xoredValue = 0;
+
+		for (i = 0; i < size; i++) {
+			byte fromVal, toVal;
+
+			fromVal = ((byte*)fromField)[i];
+			toVal = ((byte*)toField)[i];
+			xoredValue += fromVal ^ toVal;
+		}
+		return (xoredValue & maxValue) != 0;
 	case netFieldType_e::angle:
 		packedFrom = MSG_PackAngle(*(float*)fromField, bits);
 		packedTo = MSG_PackAngle(*(float*)toField, bits);
@@ -2524,11 +2779,11 @@ void MSG_WritePackedCoordExtra_ver_6(msg_t* msg, float fromValue, float toValue,
 	// Don't implement
 }
 
-qboolean MSG_DeltaNeeded_ver_6(const void* fromField, const void* toField, int fieldType, int bits)
+qboolean MSG_DeltaNeeded_ver_6(const void* fromField, const void* toField, int fieldType, int bits, int size)
 {
 	// Unoptimized in base game
 	// Doesn't compare packed values
-	return *(int*)fromField != *(int*)toField;
+	return memcmp(fromField, toField, size);
 }
 
 float MSG_ReadPackedAngle(msg_t* msg, int bits) {
@@ -2645,11 +2900,12 @@ void MSG_WritePackedCoordExtra(msg_t* msg, float fromValue, float toValue, int b
 	}
 }
 
-qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits)
-{
-    // Unoptimized in base game
-    // Doesn't compare packed values
-    return *(int*)fromField != *(int*)toField;
+qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits, int size) {
+	if (MSG_IsProtocolVersion15()) {
+		return MSG_DeltaNeeded_ver_15(fromField, toField, fieldType, bits, size);
+    } else {
+		return MSG_DeltaNeeded_ver_6(fromField, toField, fieldType, bits, size);
+	}
 }
 
 float MSG_ReadPackedVelocity(msg_t* msg, int bits)
@@ -2673,7 +2929,7 @@ int MSG_ReadPackedSimple(msg_t* msg, int fromValue, int bits)
 
 void MSG_WritePackedVelocity(msg_t* msg, float value, int bits)
 {
-	int32_t packed = (uint32_t)(value * 8.0f);
+	int32_t packed = (int32_t)(value * 8.0f);
 	if (value < 0) {
 		packed = ((-packed) & 65535) | 65536;
 	}
@@ -2756,7 +3012,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 	// su44: trying to find the cause of "unrecognized entity field type" error.
 	// Number of changed fields (lc) should never be larger than total field count....
 	if(numFields < lc) {
-		Com_Error( ERR_DROP, "MSG_ReadDeltaEntity: number of changed fields (%i) is higher than total field count (%i)\n",
+		Com_Error( ERR_DROP, "MSG_ReadDeltaEntity: number of changed fields (%i) is higher than total field count (%zu)\n",
 			lc, numFields);
 	}
 
@@ -2787,7 +3043,7 @@ void MSG_ReadDeltaEntity( msg_t *msg, entityState_t *from, entityState_t *to,
 		} else {
 			switch (field->type) {
 				case netFieldType_e::regular:
-					MSG_ReadRegular(msg, field->bits, toF);
+					MSG_ReadRegular(msg, field->bits, field->size, toF);
 					break;
 				case netFieldType_e::angle: // angles, what a mess! it wouldnt surprise me if something goes wrong here ;)
 					*(float*)toF = MSG_ReadPackedAngle(msg, field->bits);
@@ -3072,7 +3328,7 @@ plyer_state_t communication
 */
 
 // using the stringizing operator to save typing...
-#define	PSF(x) #x,(size_t)&((playerState_t*)0)->x
+#define	PSF(x) #x,(size_t)&((playerState_t*)0)->x,sizeof(playerState_t::x)
 
 netField_t	playerStateFields_ver_15[] =
 {
@@ -3266,7 +3522,7 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 		switch ( field->type ) {
 			case netFieldType_e::regular:
-				MSG_WriteRegularSimple(msg, field->bits, toF);
+				MSG_WriteRegularSimple(msg, field->bits, field->size, toF);
 				break;
 			case netFieldType_e::angle:
 				MSG_WritePackedAngle(msg, *(float*)toF, field->bits);
@@ -3313,25 +3569,25 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 		}
 	}
 	activeitemsbits = 0;
-	for (i=0 ; i<MAX_ACTIVEITEMS ; i++) {
+	for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++) {
 		if (to->activeItems[i] != from->activeItems[i]) {
 			activeitemsbits |= 1<<i;
 		}
 	}
 	ammo_amountbits = 0;
-	for (i=0 ; i<MAX_AMMO_AMOUNT ; i++) {
+	for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 		if (to->ammo_amount[i] != from->ammo_amount[i]) {
 			ammo_amountbits |= 1<<i;
 		}
 	}
 	ammobits = 0;
-	for (i=0 ; i<MAX_WEAPONS ; i++) {
+	for (i=0 ; i<MAX_AMMO ; i++) {
 		if (to->ammo_name_index[i] != from->ammo_name_index[i]) {
 			ammobits |= 1<<i;
 		}
 	}
 	max_ammo_amountbits = 0;
-	for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++) {
+	for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 		if (to->max_ammo_amount[i] != from->max_ammo_amount[i]) {
 			max_ammo_amountbits |= 1<<i;
 		}
@@ -3358,8 +3614,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( activeitemsbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, activeitemsbits, MAX_ACTIVEITEMS );
-		for (i=0 ; i<MAX_ACTIVEITEMS ; i++)
+		MSG_WriteBits( msg, activeitemsbits, MAX_ACTIVE_ITEMS );
+		for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++)
 			if (activeitemsbits & (1<<i) )
 				MSG_WriteShort (msg, to->activeItems[i]);
 	} else {
@@ -3368,8 +3624,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( ammo_amountbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, ammo_amountbits, MAX_AMMO_AMOUNT );
-		for (i=0 ; i<MAX_AMMO_AMOUNT ; i++)
+		MSG_WriteBits( msg, ammo_amountbits, MAX_AMMOCOUNT );
+		for (i=0 ; i<MAX_AMMOCOUNT ; i++)
 			if (ammo_amountbits & (1<<i) )
 				MSG_WriteShort (msg, to->ammo_amount[i]);
 	} else {
@@ -3390,8 +3646,8 @@ void MSG_WriteDeltaPlayerstate(msg_t *msg, struct playerState_s *from, struct pl
 
 	if ( max_ammo_amountbits ) {
 		MSG_WriteBits( msg, 1, 1 );	// changed
-		MSG_WriteBits( msg, max_ammo_amountbits, MAX_MAX_AMMO_AMOUNT );
-		for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++)
+		MSG_WriteBits( msg, max_ammo_amountbits, MAX_AMMOCOUNT );
+		for (i=0 ; i<MAX_AMMOCOUNT ; i++)
 			if (max_ammo_amountbits & (1<<i) )
 				MSG_WriteShort( msg, to->max_ammo_amount[i] );
 	} else {
@@ -3455,7 +3711,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		} else {
 			switch ( field->type ) {
 				case netFieldType_e::regular:
-					MSG_ReadRegularSimple(msg, field->bits, toF);
+					MSG_ReadRegularSimple(msg, field->bits, field->size, toF);
 					break;
 				case netFieldType_e::angle:
 					*(float*)toF = MSG_ReadPackedAngle(msg, field->bits);
@@ -3500,7 +3756,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		if ( MSG_ReadBits( msg, 1 ) ) {
 			LOG("PS_ITEMS");
 			bits = MSG_ReadByte(msg);
-			for (i=0 ; i<MAX_ACTIVEITEMS ; i++) {
+			for (i=0 ; i<MAX_ACTIVE_ITEMS ; i++) {
 				if (bits & (1<<i) ) {
 					to->activeItems[i] = MSG_ReadShort(msg);
 				}
@@ -3511,7 +3767,7 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 		if ( MSG_ReadBits( msg, 1 ) ) {
 			LOG("PS_AMMO_AMOUNT");
 			bits = MSG_ReadShort(msg);
-			for (i=0 ; i<MAX_AMMO_AMOUNT ; i++) {
+			for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 				if (bits & (1<<i) ) {
 					to->ammo_amount[i] = MSG_ReadShort(msg);
 				}
@@ -3531,9 +3787,9 @@ void MSG_ReadDeltaPlayerstate(msg_t *msg, playerState_t *from, playerState_t *to
 
 		// parse powerups
 		if ( MSG_ReadBits( msg, 1 ) ) {
-			LOG("PS_MAX_AMMO_AMOUNT");
+			LOG("PS_MAX_AMMOCOUNT");
 			bits = MSG_ReadShort(msg);
-			for (i=0 ; i<MAX_MAX_AMMO_AMOUNT ; i++) {
+			for (i=0 ; i<MAX_AMMOCOUNT ; i++) {
 				if (bits & (1<<i) ) {
 					to->max_ammo_amount[i] = MSG_ReadShort(msg);
 				}
diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c
index 678d9623..df7dbb4e 100644
--- a/code/qcommon/net_chan.c
+++ b/code/qcommon/net_chan.c
@@ -46,10 +46,10 @@ to the new value before sending out any replies.
 
 */
 
+#define	MAX_PACKETLEN					10000		// max size of a network packet
+#define	MAX_REMOTE_PACKETLEN			1400		// max size of a network packet
 
-#define	MAX_PACKETLEN			1400		// max size of a network packet
-
-#define	FRAGMENT_SIZE			(MAX_PACKETLEN - 100)
+#define FRAGMENT_SIZE			(((chan->remoteAddress.type == NA_LOOPBACK) ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN) - 100)
 #define	PACKET_HEADER			10			// two ints and a short
 
 #define	FRAGMENT_BIT	(1<<31)
@@ -99,6 +99,126 @@ void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int
 #endif
 }
 
+/*
+==============
+NetProfileAddPacket
+==============
+*/
+void NetProfileAddPacket(netprofpacketlist_t* list, size_t size, int type)
+{
+    list->index = (list->index + 1) % 64;
+    list->packets[list->index].updateTime = Com_Milliseconds();
+    list->packets[list->index].size = size;
+    list->packets[list->index].flags = type;
+}
+
+/*
+==============
+NetProfileSetPacketFlags
+==============
+*/
+void NetProfileSetPacketFlags(netprofpacketlist_t* list, int flags)
+{
+	list->packets[list->index].flags |= flags;
+}
+
+/*
+==============
+NetProfileCalcStats
+==============
+*/
+void NetProfileCalcStats(netprofpacketlist_t* list, int time)
+{
+    netprofpacket_t* packet;
+    int i;
+    float frequency;
+
+	if (list->updateTime < time + list->lastCalcTime) {
+		return;
+	}
+
+    list->lastCalcTime = list->updateTime;
+    list->lowestUpdateTime = list->updateTime;
+    list->highestUpdateTime = 0;
+    list->totalProcessed = 0;
+    list->totalSize = 0;
+    list->numFragmented = 0;
+    list->numDropped = 0;
+    list->numConnectionLess = 0;
+    list->totalLengthConnectionLess = 0;
+
+	for (i = 0; i < ARRAY_LEN(list->packets); i++) {
+		packet = &list->packets[i];
+		if (!packet->size) {
+			continue;
+		}
+
+		if (list->updateTime > packet->updateTime + 1000) {
+			packet->size = 0;
+			continue;
+		}
+
+		if (list->lowestUpdateTime > packet->updateTime) {
+			list->lowestUpdateTime = packet->updateTime;
+		}
+		if (list->highestUpdateTime < packet->updateTime) {
+			list->highestUpdateTime = packet->updateTime;
+		}
+
+		list->totalProcessed++;
+		list->totalSize += packet->size;
+
+		if (packet->flags & NETPROF_PACKET_FRAGMENTED) {
+			list->numFragmented++;
+		}
+		if (packet->flags & NETPROF_PACKET_DROPPED) {
+			list->numDropped++;
+		}
+		if (packet->flags & NETPROF_PACKET_MESSAGE) {
+			list->numConnectionLess++;
+			list->totalLengthConnectionLess += packet->size;
+		}
+	}
+
+    if (!list->totalProcessed) {
+        list->packetsPerSec = 0;
+        list->highestUpdateTime = list->lowestUpdateTime;
+        list->bytesPerSec = 0;
+        list->percentFragmented = 0;
+        list->percentDropped = 0;
+        list->percentConnectionLess = 0;
+
+		return;
+	}
+
+	if (list->lowestUpdateTime == list->highestUpdateTime) {
+		list->latency = 0.0;
+		frequency = 1.0;
+	} else {
+		list->latency = (list->highestUpdateTime - list->lowestUpdateTime) / 1000.0;
+		frequency = 1.0 / list->latency;
+	}
+
+	list->packetsPerSec = list->totalProcessed * frequency;
+	list->bytesPerSec = list->totalSize * frequency;
+
+	if (list->numFragmented) {
+		list->percentFragmented = (float)list->numFragmented / list->totalProcessed * 100.0;
+	} else {
+		list->percentFragmented = 0;
+	}
+
+	if (list->numDropped) {
+		list->percentDropped = (float)list->numDropped / list->totalProcessed * 100.0;
+	} else {
+		list->percentDropped = 0;
+	}
+
+	if (list->totalLengthConnectionLess) {
+		list->percentConnectionLess = (float)list->totalLengthConnectionLess / list->totalSize * 100.0;
+	}
+}
+
 // TTimo: unused, commenting out to make gcc happy
 #if 0
 /*
@@ -192,20 +312,25 @@ Netchan_TransmitNextFragment
 Send one fragment of the current message
 =================
 */
-void Netchan_TransmitNextFragment( netchan_t *chan ) {
+void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetlist ) {
 	msg_t		send;
 	byte		send_buf[MAX_PACKETLEN];
 	size_t		fragmentLength;
 
 	// write the packet header
-	MSG_InitOOB (&send, send_buf, sizeof(send_buf));				// <-- only do the oob here
+	MSG_InitOOB (&send, send_buf, chan->remoteAddress.type == NA_LOOPBACK ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN); // <-- only do the oob here
 
 	MSG_WriteLong( &send, chan->outgoingSequence | FRAGMENT_BIT );
 
 	// send the qport if we are a client
 	if ( chan->sock == NS_CLIENT ) {
 		MSG_WriteShort( &send, qport->integer );
-	}
+    }
+
+#ifdef LEGACY_PROTOCOL
+    if (!chan->compat)
+#endif
+        MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
 
 	// copy the reliable message to the packet first
 	fragmentLength = FRAGMENT_SIZE;
@@ -219,6 +344,10 @@ void Netchan_TransmitNextFragment( netchan_t *chan ) {
 
 	// send the datagram
 	NET_SendPacket( chan->sock, send.cursize, send.data, chan->remoteAddress );
+	
+	// Store send time and size of this packet for rate control
+	chan->lastSentTime = Sys_Milliseconds();
+	chan->lastSentSize = send.cursize;
 
 	if ( showpackets->integer ) {
 		Com_Printf ("%s send %4zu : s=%i fragment=%zu,%zu\n"
@@ -228,6 +357,10 @@ void Netchan_TransmitNextFragment( netchan_t *chan ) {
 			, chan->unsentFragmentStart, fragmentLength);
 	}
 
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, send.cursize, NETPROF_PACKET_FRAGMENTED);
+	}
+
 	chan->unsentFragmentStart += fragmentLength;
 
 	// this exit condition is a little tricky, because a packet
@@ -249,9 +382,9 @@ Sends a message to a connection, fragmenting if necessary
 A 0 length will still generate a packet.
 ================
 */
-void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
-	msg_t		send;
-	byte		send_buf[MAX_PACKETLEN];
+void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprofpacketlist_t *packetlist ) {
+	msg_t			send;
+	byte			send_buf[MAX_PACKETLEN];
 
 	if ( length > MAX_MSGLEN ) {
 		Com_Error( ERR_DROP, "Netchan_Transmit: length = %zu", length );
@@ -265,27 +398,36 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
 		Com_Memcpy( chan->unsentBuffer, data, length );
 
 		// only send the first fragment now
-		Netchan_TransmitNextFragment( chan );
+		Netchan_TransmitNextFragment( chan, packetlist );
 
 		return;
 	}
 
 	// write the packet header
-	MSG_InitOOB (&send, send_buf, sizeof(send_buf));
+	MSG_InitOOB (&send, send_buf, chan->remoteAddress.type == NA_LOOPBACK ? MAX_PACKETLEN : MAX_REMOTE_PACKETLEN);
 
 	MSG_WriteLong( &send, chan->outgoingSequence );
-	chan->outgoingSequence++;
 
 	// send the qport if we are a client
-	if ( chan->sock == NS_CLIENT ) {
-		MSG_WriteShort( &send, qport->integer );
-	}
+	if(chan->sock == NS_CLIENT)
+		MSG_WriteShort(&send, qport->integer);
+
+#ifdef LEGACY_PROTOCOL
+	if(!chan->compat)
+#endif
+		MSG_WriteLong(&send, NETCHAN_GENCHECKSUM(chan->challenge, chan->outgoingSequence));
+
+	chan->outgoingSequence++;
 
 	MSG_WriteData( &send, data, length );
 
 	// send the datagram
 	NET_SendPacket( chan->sock, send.cursize, send.data, chan->remoteAddress );
 
+	// Store send time and size of this packet for rate control
+	chan->lastSentTime = Sys_Milliseconds();
+	chan->lastSentSize = send.cursize;
+
 	if ( showpackets->integer ) {
 		Com_Printf( "%s send %4zu : s=%i ack=%i\n"
 			, netsrcString[ chan->sock ]
@@ -293,6 +435,10 @@ void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data ) {
 			, chan->outgoingSequence - 1
 			, chan->incomingSequence );
 	}
+
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, send.cursize, 0);
+	}
 }
 
 /*
@@ -307,7 +453,7 @@ final fragment of a multi-part message, the entire thing will be
 copied out.
 =================
 */
-qboolean Netchan_Process( netchan_t *chan, msg_t *msg ) {
+qboolean Netchan_Process( netchan_t *chan, msg_t *msg, netprofpacketlist_t *packetlist ) {
 	int			sequence;
 	int			qport;
 	int			fragmentStart, fragmentLength;
@@ -333,6 +479,17 @@ qboolean Netchan_Process( netchan_t *chan, msg_t *msg ) {
 		qport = MSG_ReadShort( msg );
 	}
 
+#ifdef LEGACY_PROTOCOL
+	if(!chan->compat)
+#endif
+	{
+		int checksum = MSG_ReadLong(msg);
+
+		// UDP spoofing protection
+		if(NETCHAN_GENCHECKSUM(chan->challenge, sequence) != checksum)
+			return qfalse;
+	}
+
 	// read the fragment information
 	if ( fragmented ) {
 		fragmentStart = MSG_ReadLong( msg );
@@ -357,6 +514,10 @@ qboolean Netchan_Process( netchan_t *chan, msg_t *msg ) {
 		}
 	}
 
+	if (packetlist) {
+		NetProfileAddPacket(packetlist, msg->cursize, fragmented ? NETPROF_PACKET_FRAGMENTED : 0);
+	}
+
 	//
 	// discard out of order or duplicated packets
 	//
@@ -473,7 +634,7 @@ LOOPBACK BUFFERS FOR LOCAL PLAYER
 
 // there needs to be enough loopback messages to hold a complete
 // gamestate of maximum size
-#define	MAX_LOOPBACK	16
+#define	MAX_LOOPBACK	32
 
 typedef struct {
 	byte	data[MAX_PACKETLEN];
diff --git a/code/qcommon/q_math.c b/code/qcommon/q_math.c
index 582f7b4c..f8efe16b 100644
--- a/code/qcommon/q_math.c
+++ b/code/qcommon/q_math.c
@@ -36,6 +36,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Z 2
 #define W 3
 
+#ifndef FLT_EPSILON
+#define FLT_EPSILON 1.19209290E-07F
+#endif
+
 vec3_t	vec3_origin = {0,0,0};
 vec3_t	axisDefault[3] = { { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 } };
 matrix_t matrixIdentity = {	1, 0, 0, 0,
@@ -327,11 +331,11 @@ float fIdentity( void )
 
 float fSign( const float number )
 {
-	if( number >= 0.0f )
-	{
+	if (number > 0) {
 		return 1;
-	} else
-	{
+	} else if (number == 0) {
+		return 0;
+	} else {
 		return -1;
 	}
 }
@@ -650,10 +654,10 @@ void RotatePointAroundVector( vec3_t dst, const vec3_t dir, const vec3_t point,
 	zrot[0][0] = zrot[1][1] = zrot[2][2] = 1.0F;
 
 	rad = DEG2RAD( degrees );
-	zrot[0][0] = cosf( rad );
-	zrot[0][1] = sinf( rad );
-	zrot[1][0] = -sinf( rad );
-	zrot[1][1] = cosf( rad );
+	zrot[0][0] = cos( rad );
+	zrot[0][1] = sin( rad );
+	zrot[1][0] = -sin( rad );
+	zrot[1][1] = cos( rad );
 
 	Matrix3x3Multiply( m, zrot, tmpmat );
 	Matrix3x3Multiply( tmpmat, im, rot );
@@ -768,14 +772,14 @@ void AnglesToAxis( const vec3_t angles, vec3_t axis[3] ) {
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 	angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-	sr = sinf( angle );
-	cr = cosf( angle );
+	sr = sin( angle );
+	cr = cos( angle );
 
 	axis[ 0 ][ 0 ] = cp*cy;
 	axis[ 0 ][ 1 ] = cp*sy;
@@ -819,11 +823,7 @@ void ProjectPointOnPlane( vec3_t dst, const vec3_t p, const vec3_t normal )
 	vec3_t n;
 	float inv_denom;
 
-	inv_denom =  DotProduct( normal, normal );
-#ifndef Q3_VM
-	assert( Q_fabs(inv_denom) != 0.0f ); // zero vectors get here
-#endif
-	inv_denom = 1.0f / inv_denom;
+	inv_denom = 1.0f / DotProduct( normal, normal );
 
 	d = DotProduct( normal, p ) * inv_denom;
 
@@ -907,7 +907,7 @@ the msvc acos doesn't always return a value between -PI and PI:
 
 int i;
 i = 1065353246;
-acosf(*(float*) &i) == -1.#IND0
+acos(*(float*) &i) == -1.#IND0
 
 	This should go in q_math but it is too late to add new traps
 	to game and ui
@@ -916,7 +916,7 @@ acosf(*(float*) &i) == -1.#IND0
 float Q_acos(float c) {
 	float angle;
 
-	angle = acosf(c);
+	angle = acos(c);
 
 	if (angle > M_PI) {
 		return (float)M_PI;
@@ -948,58 +948,242 @@ float LerpAngle (float from, float to, float frac) {
 
 	return a;
 }
-static int p[514];
-static float g3[514][3];
-static float g2[514][2];
-static float g1[514];
-
-static void init(void)
+float bias(float a, float b)
 {
-	//This is an ugly func I wont bother variable naming.
-	int i;
-	for (i = 0; i < 256; i++)
-	{
-		p[i] = i;
-		g1[i] = (rand() % 512 - 256) * 0.00390625;
-	}
-	int v21, v22;
-	for (int j = i - 1; j; p[v22 % 256] = v21)
-	{
-		v21 = p[j];
-		v22 = rand();
-		p[j--] = p[v22 % 256];
-	}
-
-	for (size_t k = 0; k < 258; k++)
-	{
-		g1[k + 256] = g1[k];
-	}
-
+	return pow(a, log(b) / log(0.5));
 }
+
+float gain(float a, float b)
+{
+	float p = log(1. - b) / log(0.5);
+
+	if (a < .001)
+		return 0.;
+	else if (a > .999)
+		return 1.;
+	if (a < 0.5)
+		return pow(2 * a, p) / 2;
+	else
+		return 1. - pow(2 * (1. - a), p) / 2;
+}
+
+float noise(float vec[], int len)
+{
+	switch (len) {
+	case 0:
+		return 0.;
+	case 1:
+		return noise1(vec[0]);
+	case 2:
+		return noise2(vec);
+	default:
+		return noise3(vec);
+	}
+}
+
+float turbulence(float *v, float freq)
+{
+	float t, vec[3];
+
+	for (t = 0. ; freq >= 1. ; freq /= 2) {
+		vec[0] = freq * v[0];
+		vec[1] = freq * v[1];
+		vec[2] = freq * v[2];
+		t += fabs(noise3(vec)) / freq;
+	}
+	return t;
+}
+
+/* noise functions over 1, 2, and 3 dimensions */
+
+#define B 0x100
+#define BM 0xff
+
+#define N 0x1000
+#define NP 12   /* 2^N */
+#define NM 0xfff
+
+static int p[B + B + 2];
+static float g3[B + B + 2][3];
+static float g2[B + B + 2][2];
+static float g1[B + B + 2];
 static int start = 1;
 
+static void init(void);
+
+#define s_curve(t) ( t * t * (3. - 2. * t) )
+
+#define lerp(t, a, b) ( a + t * (b - a) )
+
+#define setup(i,b0,b1,r0,r1)\
+	t = vec[i] + N;\
+	b0 = ((int)t) & BM;\
+	b1 = (b0+1) & BM;\
+	r0 = t - (int)t;\
+	r1 = r0 - 1.;
+
 float noise1(float arg)
 {
-	float rx0;
-	float rx1;
-	float u;
-	float sx;
-	float t;
-	int bx0;
+	int bx0, bx1;
+	float rx0, rx1, sx, t, u, v, vec[1];
 
-	if (start)
-	{
+	vec[0] = arg;
+	if (start) {
 		start = 0;
 		init();
 	}
 
-	rx0 = arg + 4096.0;
-	bx0 = (int)rx0;
-	rx1 = rx0 - bx0;
-	sx = rx1 - 1.0;
-	t = rx1 * rx1 * (3.0 - (rx1 + rx1));
-	u = rx1 * g1[p[bx0]];
-	return u + t * (sx * g1[p[bx0 + 1]] - u);
+	setup(0, bx0,bx1, rx0,rx1);
+
+	sx = s_curve(rx0);
+
+	u = rx0 * g1[ p[ bx0 ] ];
+	v = rx1 * g1[ p[ bx1 ] ];
+
+	return lerp(sx, u, v);
+}
+
+float noise2(vec3_t vec)
+{
+	int bx0, bx1, by0, by1, b00, b10, b01, b11;
+	float rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
+	register int i, j;
+
+	if (start) {
+		start = 0;
+		init();
+	}
+
+	setup(0, bx0,bx1, rx0,rx1);
+	setup(1, by0,by1, ry0,ry1);
+
+	i = p[ bx0 ];
+	j = p[ bx1 ];
+
+	b00 = p[ i + by0 ];
+	b10 = p[ j + by0 ];
+	b01 = p[ i + by1 ];
+	b11 = p[ j + by1 ];
+
+	sx = s_curve(rx0);
+	sy = s_curve(ry0);
+
+#define at2(rx,ry) ( rx * q[0] + ry * q[1] )
+
+	q = g2[ b00 ] ; u = at2(rx0,ry0);
+	q = g2[ b10 ] ; v = at2(rx1,ry0);
+	a = lerp(sx, u, v);
+
+	q = g2[ b01 ] ; u = at2(rx0,ry1);
+	q = g2[ b11 ] ; v = at2(rx1,ry1);
+	b = lerp(sx, u, v);
+
+	return lerp(sy, a, b);
+}
+
+float noise3(vec3_t vec)
+{
+	int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
+	float rx0, rx1, ry0, ry1, rz0, rz1, *q, sy, sz, a, b, c, d, t, u, v;
+	register int i, j;
+
+	if (start) {
+		start = 0;
+		init();
+	}
+
+	setup(0, bx0,bx1, rx0,rx1);
+	setup(1, by0,by1, ry0,ry1);
+	setup(2, bz0,bz1, rz0,rz1);
+
+	i = p[ bx0 ];
+	j = p[ bx1 ];
+
+	b00 = p[ i + by0 ];
+	b10 = p[ j + by0 ];
+	b01 = p[ i + by1 ];
+	b11 = p[ j + by1 ];
+
+	t  = s_curve(rx0);
+	sy = s_curve(ry0);
+	sz = s_curve(rz0);
+
+#define at3(rx,ry,rz) ( rx * q[0] + ry * q[1] + rz * q[2] )
+
+	q = g3[ b00 + bz0 ] ; u = at3(rx0,ry0,rz0);
+	q = g3[ b10 + bz0 ] ; v = at3(rx1,ry0,rz0);
+	a = lerp(t, u, v);
+
+	q = g3[ b01 + bz0 ] ; u = at3(rx0,ry1,rz0);
+	q = g3[ b11 + bz0 ] ; v = at3(rx1,ry1,rz0);
+	b = lerp(t, u, v);
+
+	c = lerp(sy, a, b);
+
+	q = g3[ b00 + bz1 ] ; u = at3(rx0,ry0,rz1);
+	q = g3[ b10 + bz1 ] ; v = at3(rx1,ry0,rz1);
+	a = lerp(t, u, v);
+
+	q = g3[ b01 + bz1 ] ; u = at3(rx0,ry1,rz1);
+	q = g3[ b11 + bz1 ] ; v = at3(rx1,ry1,rz1);
+	b = lerp(t, u, v);
+
+	d = lerp(sy, a, b);
+
+	return lerp(sz, c, d);
+}
+
+static void normalize2(vec2_t v)
+{
+	float s;
+
+	s = sqrt(v[0] * v[0] + v[1] * v[1]);
+	v[0] = v[0] / s;
+	v[1] = v[1] / s;
+}
+
+static void normalize3(vec3_t v)
+{
+	float s;
+
+	s = sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
+	v[0] = v[0] / s;
+	v[1] = v[1] / s;
+	v[2] = v[2] / s;
+}
+
+static void init(void)
+{
+	int i, j, k;
+
+	for (i = 0 ; i < B ; i++) {
+		p[i] = i;
+
+		g1[i] = (float)((rand() % (B + B)) - B) / B;
+
+		for (j = 0 ; j < 2 ; j++)
+			g2[i][j] = (float)((rand() % (B + B)) - B) / B;
+		normalize2(g2[i]);
+
+		for (j = 0 ; j < 3 ; j++)
+			g3[i][j] = (float)((rand() % (B + B)) - B) / B;
+		normalize3(g3[i]);
+	}
+
+	while (--i) {
+		k = p[i];
+		p[i] = p[j = rand() % B];
+		p[j] = k;
+	}
+
+	for (i = 0 ; i < B + 2 ; i++) {
+		p[B + i] = p[i];
+		g1[B + i] = g1[i];
+		for (j = 0 ; j < 2 ; j++)
+			g2[B + i][j] = g2[i][j];
+		for (j = 0 ; j < 3 ; j++)
+			g3[B + i][j] = g3[i][j];
+	}
 }
 
 /*
@@ -1112,7 +1296,11 @@ void AnglesSubtract( vec3_t v1, vec3_t v2, vec3_t v3 ) {
 
 
 float	AngleMod(float a) {
-	a = (360.0/65536) * ((int)(a*(65536/360.0)) & 65535);
+	if (a >= 360) {
+		return a - 360 * (int)(a / 360.0);
+	} else if (a < 0) {
+		return 360 * ((int)(-a / 360) + 1) + a;
+	}
 	return a;
 }
 
@@ -1125,7 +1313,12 @@ returns angle normalized to the range [0 <= angle < 360]
 =================
 */
 float AngleNormalize360 ( float angle ) {
-	return (360.0 / 65536) * ((int)(angle * (65536 / 360.0)) & 65535);
+	if (angle >= 360) {
+		return angle - 360 * (int)(angle / 360.0);
+	} else if (angle < 0) {
+		return 360 * ((int)(-angle / 360) + 1) + angle;
+    }
+    return angle;
 }
 
 
@@ -1827,13 +2020,13 @@ vec_t VectorNormalize( vec3_t v ) {
 	float	length, ilength;
 
 	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2];
-	length = sqrt (length);
+    if (length > FLT_EPSILON) {
+        length = sqrt(length);
 
-	if ( length ) {
-		ilength = 1/length;
-		v[0] *= ilength;
-		v[1] *= ilength;
-		v[2] *= ilength;
+        ilength = 1 / length;
+        v[0] *= ilength;
+        v[1] *= ilength;
+        v[2] *= ilength;
 	}
 		
 	return length;
@@ -2055,14 +2248,11 @@ void AngleVectors( const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
-	angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-	sr = sinf( angle );
-	cr = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 
 	if( forward )
 	{
@@ -2070,18 +2260,25 @@ void AngleVectors( const vec3_t angles, vec3_t forward, vec3_t right, vec3_t up
 		forward[ 1 ] = cp*sy;
 		forward[ 2 ] = -sp;
 	}
-	if( right )
-	{
-		right[ 0 ] = ( -1 * sr*sp*cy + -1 * cr*-sy );
-		right[ 1 ] = ( -1 * sr*sp*sy + -1 * cr*cy );
-		right[ 2 ] = -1 * sr*cp;
-	}
-	if( up )
-	{
-		up[ 0 ] = ( cr*sp*cy + -sr*-sy );
-		up[ 1 ] = ( cr*sp*sy + -sr*cy );
-		up[ 2 ] = cr*cp;
-	}
+    if ( right || up )
+    {
+        angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
+        sr = sin( angle );
+        cr = cos( angle );
+
+        if ( right )
+        {
+            right[ 0 ] = ( -1 * sr * sp * cy + -1 * cr * -sy );
+            right[ 1 ] = ( -1 * sr * sp * sy + -1 * cr * cy );
+            right[ 2 ] = -1 * sr * cp;
+        }
+        if ( up )
+        {
+            up[ 0 ] = ( cr * sp * cy + -sr * -sy );
+            up[ 1 ] = ( cr * sp * sy + -sr * cy );
+            up[ 2 ] = cr * cp;
+        }
+    }
 }
 
 void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t up )
@@ -2091,11 +2288,11 @@ void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t
 	// static to help MS compiler fp bugs
 
 	angle = angles[ YAW ] * ( M_PI * 2 / 360 );
-	sy = sinf( angle );
-	cy = cosf( angle );
+	sy = sin( angle );
+	cy = cos( angle );
 	angle = angles[ PITCH ] * ( M_PI * 2 / 360 );
-	sp = sinf( angle );
-	cp = cosf( angle );
+	sp = sin( angle );
+	cp = cos( angle );
 
 	if( forward )
 	{
@@ -2107,8 +2304,8 @@ void AngleVectorsLeft( const vec3_t angles, vec3_t forward, vec3_t left, vec3_t
 	if( left || up )
 	{
 		angle = angles[ ROLL ] * ( M_PI * 2 / 360 );
-		sr = sinf( angle );
-		cr = cosf( angle );
+		sr = sin( angle );
+		cr = cos( angle );
 
 		if( left )
 		{
@@ -2721,8 +2918,8 @@ void MatrixSetupXRotation(matrix_t m, vec_t degrees)
 	vec_t a = DEG2RAD(degrees);
 
 	m[ 0] = 1;      m[ 4] = 0;              m[ 8] = 0;              m[12] = 0;
-	m[ 1] = 0;      m[ 5] = cosf(a);         m[ 9] =-sinf(a);         m[13] = 0;
-	m[ 2] = 0;      m[ 6] = sinf(a);         m[10] = cosf(a);         m[14] = 0;
+	m[ 1] = 0;      m[ 5] = cos(a);         m[ 9] =-sin(a);         m[13] = 0;
+	m[ 2] = 0;      m[ 6] = sin(a);         m[10] = cos(a);         m[14] = 0;
 	m[ 3] = 0;      m[ 7] = 0;              m[11] = 0;              m[15] = 1;
 }
 
@@ -2730,9 +2927,9 @@ void MatrixSetupYRotation(matrix_t m, vec_t degrees)
 {
 	vec_t a = DEG2RAD(degrees);
 
-	m[ 0] = cosf(a);         m[ 4] = 0;      m[ 8] = sinf(a);         m[12] = 0;
+	m[ 0] = cos(a);         m[ 4] = 0;      m[ 8] = sin(a);         m[12] = 0;
 	m[ 1] = 0;              m[ 5] = 1;      m[ 9] = 0;              m[13] = 0;
-	m[ 2] =-sinf(a);         m[ 6] = 0;      m[10] = cosf(a);         m[14] = 0;
+	m[ 2] =-sin(a);         m[ 6] = 0;      m[10] = cos(a);         m[14] = 0;
 	m[ 3] = 0;              m[ 7] = 0;      m[11] = 0;              m[15] = 1;
 }
 
@@ -2740,8 +2937,8 @@ void MatrixSetupZRotation(matrix_t m, vec_t degrees)
 {
 	vec_t a = DEG2RAD(degrees);
 
-	m[ 0] = cosf(a);         m[ 4] =-sinf(a);         m[ 8] = 0;      m[12] = 0;
-	m[ 1] = sinf(a);         m[ 5] = cosf(a);         m[ 9] = 0;      m[13] = 0;
+	m[ 0] = cos(a);         m[ 4] =-sin(a);         m[ 8] = 0;      m[12] = 0;
+	m[ 1] = sin(a);         m[ 5] = cos(a);         m[ 9] = 0;      m[13] = 0;
 	m[ 2] = 0;              m[ 6] = 0;              m[10] = 1;      m[14] = 0;
 	m[ 3] = 0;              m[ 7] = 0;              m[11] = 0;      m[15] = 1;
 }
@@ -2921,9 +3118,6 @@ void MatrixMultiplyShear(matrix_t m, vec_t x, vec_t y)
 	Matrix4x4Multiply(tmp, shear, m);
 }
 
-#ifndef FLT_EPSILON
-#define FLT_EPSILON 1.19209290E-07F
-#endif
 void MatrixToAngles(const matrix_t m, vec3_t angles)
 {
 #if 1
@@ -2943,8 +3137,8 @@ void MatrixToAngles(const matrix_t m, vec3_t angles)
 		sp = -1.0;
 	}
 
-	theta = -asinf(sp);
-	cp = cosf(theta);
+	theta = -asin(sp);
+	cp = cos(theta);
 
 	if(cp > 8192 * FLT_EPSILON)
 	{
@@ -2962,8 +3156,8 @@ void MatrixToAngles(const matrix_t m, vec3_t angles)
 	double          a;
 	double          ca;
 
-	a = asinf(-m[2]);
-	ca = cosf(a);
+	a = asin(-m[2]);
+	ca = cos(a);
 
 	if(fabs(ca) > 0.005)		// Gimbal lock?
 	{
@@ -2987,14 +3181,14 @@ void MatrixFromAngles(matrix_t m, vec_t pitch, vec_t yaw, vec_t roll)
 	static float    sr, sp, sy, cr, cp, cy;
 
     // static to help MS compiler fp bugs
-	sp = sinf(DEG2RAD(pitch));
-	cp = cosf(DEG2RAD(pitch));
+	sp = sin(DEG2RAD(pitch));
+	cp = cos(DEG2RAD(pitch));
 
-	sy = sinf(DEG2RAD(yaw));
-	cy = cosf(DEG2RAD(yaw));
+	sy = sin(DEG2RAD(yaw));
+	cy = cos(DEG2RAD(yaw));
 
-	sr = sinf(DEG2RAD(roll));
-	cr = cosf(DEG2RAD(roll));
+	sr = sin(DEG2RAD(roll));
+	cr = cos(DEG2RAD(roll));
 
 	m[ 0] = cp*cy;  m[ 4] = (sr*sp*cy+cr*-sy);      m[ 8] = (cr*sp*cy+-sr*-sy);     m[12] = 0;
 	m[ 1] = cp*sy;  m[ 5] = (sr*sp*sy+cr*cy);       m[ 9] = (cr*sp*sy+-sr*cy);      m[13] = 0;
@@ -3667,14 +3861,14 @@ void QuatFromAngles(quat_t q, vec_t pitch, vec_t yaw, vec_t roll)
 	static float    sr, sp, sy, cr, cp, cy;
 
 	// static to help MS compiler fp bugs
-	sp = sinf(DEG2RAD(pitch));
-	cp = cosf(DEG2RAD(pitch));
+	sp = sin(DEG2RAD(pitch));
+	cp = cos(DEG2RAD(pitch));
 
-	sy = sinf(DEG2RAD(yaw));
-	cy = cosf(DEG2RAD(yaw));
+	sy = sin(DEG2RAD(yaw));
+	cy = cos(DEG2RAD(yaw));
 
-	sr = sinf(DEG2RAD(roll));
-	cr = cosf(DEG2RAD(roll));
+	sr = sin(DEG2RAD(roll));
+	cr = cos(DEG2RAD(roll));
 
 	q[0] = sr * cp * cy - cr * sp * sy;	// x
 	q[1] = cr * sp * cy + sr * cp * sy;	// y
@@ -3822,19 +4016,19 @@ void QuatToRotAngle( const quat_t q, vec_t *angle ) {
 void QuatToRotAngleAxis( const quat_t q, vec_t *angle, vec3_t axis ) {
 
 	*angle = atan( VectorLength(q)/q[3] );
-	axis[0] = q[0] / sinf(*angle);
-	axis[1] = q[1] / sinf(*angle);
-	axis[2] = q[2] / sinf(*angle);
+	axis[0] = q[0] / sin(*angle);
+	axis[1] = q[1] / sin(*angle);
+	axis[2] = q[2] / sin(*angle);
 
 	*angle *= 360.0f / M_PI;
 }
 
 void QuatFromRotAngleAxis( quat_t q, vec_t angle, const vec3_t axis ) {
 
-	q[0] = axis[0] * sinf( angle*M_PI/360 );
-	q[1] = axis[1] * sinf( angle*M_PI/360 );
-	q[2] = axis[2] * sinf( angle*M_PI/360 );
-	q[3] = cosf( angle*M_PI/360 );
+	q[0] = axis[0] * sin( angle*M_PI/360 );
+	q[1] = axis[1] * sin( angle*M_PI/360 );
+	q[2] = axis[2] * sin( angle*M_PI/360 );
+	q[3] = cos( angle*M_PI/360 );
 }
 
 void QuatToAngles( const quat_t q, vec3_t angles )
@@ -3846,7 +4040,7 @@ void QuatToAngles( const quat_t q, vec3_t angles )
 	q2[ 2 ] = q[ 2 ] * q[ 2 ];
 	q2[ 3 ] = q[ 3 ] * q[ 3 ];
 
-	angles[ PITCH ] = RAD2DEG( asinf( -2 * ( q[ 2 ] * q[ 0 ] - q[ 3 ] * q[ 1 ] ) ) );
+	angles[ PITCH ] = RAD2DEG( asin( -2 * ( q[ 2 ] * q[ 0 ] - q[ 3 ] * q[ 1 ] ) ) );
 	angles[ YAW ] = RAD2DEG( atan2( 2 * ( q[ 2 ] * q[ 3 ] + q[ 0 ] * q[ 1 ] ), ( q2[ 2 ] - q2[ 3 ] - q2[ 0 ] + q2[ 1 ] ) ) );
 	angles[ ROLL ] = RAD2DEG( atan2( 2 * ( q[ 3 ] * q[ 0 ] + q[ 2 ] * q[ 1 ] ), ( -q2[ 2 ] - q2[ 3 ] + q2[ 0 ] + q2[ 1 ] ) ) );
 }
@@ -3873,7 +4067,7 @@ void QuatToAngles( const quat_t q, vec3_t angles )
 	}
 	else
 	{
-		angles[ PITCH ] = asinf( 2.f*( SingularityTest ) ) * RAD_TO_DEG;
+		angles[ PITCH ] = asin( 2.f*( SingularityTest ) ) * RAD_TO_DEG;
 		angles[ YAW ] = atan2( YawY, YawX ) * RAD_TO_DEG;
 		angles[ ROLL ] = atan2( -2.f*( q[W]*q[X] + q[Y]*q[Z] ), ( 1.f - 2.f*( Square( q[X] ) + Square( q[Y] ) ) ) ) * RAD_TO_DEG;
 	}
@@ -4010,8 +4204,8 @@ void QuatSlerp(const quat_t from, const quat_t to, float frac, quat_t out)
 		sinom = 1.0f / sqrtf(sinSqr);
 		omega = atan2f(sinSqr * sinom, absCosom);
 
-		scale0 = sinf((1.0f - frac) * omega) * sinom;
-		scale1 = sinf(frac * omega) * sinom;
+		scale0 = sin((1.0f - frac) * omega) * sinom;
+		scale1 = sin(frac * omega) * sinom;
 	}
 	else
 	{
@@ -4058,8 +4252,8 @@ void MatrixToEulerAngles
 		sp = -1.0;
 	}
 
-	theta = -asinf( sp );
-	cp = cosf( theta );
+	theta = -asin( sp );
+	cp = cos( theta );
 
 	if( cp > 8192 * FLT_EPSILON )
 	{
@@ -4105,4 +4299,49 @@ float Q_clamp_float(float value, float min, float max) {
 	} else {
 		return value;
 	}
-}
\ No newline at end of file
+}
+
+float PointToSegmentDistanceSquared(const vec3_t origin, const vec3_t a, const vec3_t b)
+{
+	vec3_t delta;
+	vec3_t final;
+	float distSqr;
+
+	VectorSubtract(b, a, delta);
+	VectorSubtract(origin, a, final);
+	distSqr = DotProduct(delta, final);
+	if (distSqr > 0) {
+		float deltaDistSqr = VectorLengthSquared(delta);
+		vec3_t final;
+
+		if (distSqr < deltaDistSqr) {
+			vec3_t tmp;
+			VectorScale(delta, distSqr / deltaDistSqr, tmp);
+			VectorAdd(final, tmp, final);
+		} else {
+			VectorSubtract(b, origin, final);
+		}
+	}
+
+    return VectorLengthSquared(final);
+}
+
+/*
+=================
+FloatRoundedBitError
+
+On x86 with FP87, some float operations may have results that are off by 1 bit.
+This returns whether or not the operation lost 1 bit.
+=================
+*/
+qboolean FloatRoundedBitError() {
+    float a, b, c;
+    float value;
+
+    a = 91.0000610;
+    b = 40.0000038;
+    c = 0.00005;
+    value = a * b + c;
+
+    return value != 3640.00269f;
+}
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 0b80b615..57cdd932 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -86,6 +86,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DLL_SUFFIX
 #endif
 
+#if defined(TARGET_LOCAL_SYSTEM)
+#  define ARCH_SUFFIX
+#elif defined(TARGET_MULTIPLE_ARCHITECTURES)
+// Targeting multiple architecture in a single binary.
+// For example, OSX supports compiling multiple architectures in a single binary
+#  define ARCH_SUFFIX ".multiarch"
+#else
+#  define ARCH_SUFFIX "." ARCH_STRING
+#endif
+
+// alloca
+#ifdef _MSC_VER
+#  include <malloc.h>
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#  include <stdlib.h>
+#else
+#  include <alloca.h>
+#endif
+
 #if defined(_WIN64) || defined(__WIN64__)
 
 #undef idx64
@@ -107,14 +126,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '\\'
 
 #if defined(_WIN64) || defined( __WIN64__ ) 
-#define ARCH_STRING "x86_64"
+#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+#  define ARCH_STRING "x86_64"
+#elif defined(__aarch64__) || defined(__ARM64__) || defined (_M_ARM64)
+#  define ARCH_STRING "arm64"
+#endif
 #elif defined _M_ALPHA
-#define ARCH_STRING "AXP"
+#  define ARCH_STRING "AXP"
 #endif
 
 #define Q3_LITTLE_ENDIAN
 
 #define DLL_EXT ".dll"
+#define EXE_EXT ".exe"
 
 #elif defined(_WIN32) || defined(__WIN32__)
 
@@ -142,6 +166,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_LITTLE_ENDIAN
 
 #define DLL_EXT ".dll"
+#define EXE_EXT ".exe"
 
 #endif
 
@@ -159,14 +184,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define PATH_SEP '/'
 
 #ifdef __ppc__
-#define ARCH_STRING "ppc"
-#define Q3_BIG_ENDIAN
+#  define ARCH_STRING "ppc"
+#  define Q3_BIG_ENDIAN
 #elif defined __i386__
-#define ARCH_STRING "i386"
-#define Q3_LITTLE_ENDIAN
+#  define ARCH_STRING "i386"
+#  define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".dylib"
+#define EXE_EXT ""
 
 #endif
 
@@ -189,8 +215,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ARCH_STRING "x86"
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
 #  define ARCH_STRING "x86_64"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#  define ARCH_STRING "ppc64"
+#elif defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
+#  if __BIG_ENDIAN__
+#    define ARCH_STRING "ppc64"
+#  else
+#    define ARCH_STRING "ppc64el"
+#  endif
 #elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)
 #  define ARCH_STRING "ppc"
 #elif defined __s390__
@@ -205,10 +235,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  define ARCH_STRING "alpha"
 #elif defined __sparc__
 #  define ARCH_STRING "sparc"
-#elif defined __arm__
-#  define ARCH_STRING "arm"
-#elif defined(__aarch64__) || defined(__ARM64__)
-#  define ARCH_STRING "aarch64"
+#elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
+#  define ARCH_STRING "arm64"
+#elif defined __arm__ || defined (_M_ARM)
+#  if defined(__ARM_PCS_VFP) && (__ARM_PCS_VFP)
+#    define ARCH_STRING "armhf"
+#  else
+#    define ARCH_STRING "armel"
+#  endif
 #elif defined __cris__
 #  define ARCH_STRING "cris"
 #elif defined __hppa__
@@ -225,13 +259,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #  endif
 #endif
 
-#if __FLOAT_WORD_ORDER == __BIG_ENDIAN
-#define Q3_BIG_ENDIAN
+#if __BIG_ENDIAN__
+#  define Q3_BIG_ENDIAN
 #else
-#define Q3_LITTLE_ENDIAN
+#  define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
+
+#endif
+
+//============================================================== MAC OS X ===
+
+#if defined(__APPLE__) || defined(__APPLE_CC__)
+
+#define OS_STRING "macosx"
+#define ID_INLINE inline
+#define PATH_SEP '/'
+
+#ifdef __ppc__
+#  define ARCH_STRING "ppc"
+#  define Q3_BIG_ENDIAN
+#elif defined __i386__
+#  define ARCH_STRING "x86"
+#  define Q3_LITTLE_ENDIAN
+#elif defined __x86_64__
+#  undef idx64
+#  define idx64 1
+#  define ARCH_STRING "x86_64"
+#  define Q3_LITTLE_ENDIAN
+#elif defined __aarch64__
+#  define ARCH_STRING "arm64"
+#  define Q3_LITTLE_ENDIAN
+#ifndef NO_VM_COMPILED
+#  define NO_VM_COMPILED
+#endif
+#endif
+
+#define DLL_EXT ".dylib"
+#define EXE_EXT ""
 
 #endif
 
@@ -253,10 +320,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ID_INLINE inline
 #define PATH_SEP '/'
 
-#ifdef __i386__
-#define ARCH_STRING "i386"
-#elif defined __axp__
-#define ARCH_STRING "alpha"
+#if defined(__i386__) || defined(__i386)
+#define ARCH_STRING "x86"
+#elif defined(__amd64__) || defined(__x86_64__)
+#define ARCH_STRING "x86_64"
+#elif defined(__arm__)
+#define ARCH_STRING "arm"
+#elif defined(__aarch64__)
+#define ARCH_STRING "arm64"
+#elif defined(__powerpc__) || defined(__ppc__)
+#define ARCH_STRING "ppc"
+#elif defined(__powerpc64__)
+#define ARCH_STRING "ppc64"
+#elif defined(__sparc64__)
+#define ARCH_STRING "sparc64"
+#elif defined(__mips__)
+#define ARCH_STRING "mips"
+#elif defined(__riscv)
+#if __SIZEOF_POINTER__ == 8
+#define ARCH_STRING "riscv64"
+#else
+#define ARCH_STRING "riscv"
+#endif
+#else
+#define ARCH_STRING "unknown"
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
@@ -266,6 +353,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -293,6 +381,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
 
 #endif
 
@@ -309,6 +398,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define Q3_BIG_ENDIAN // SGI's MIPS are always big endian
 
 #define DLL_EXT ".so"
+#define EXE_EXT ""
+
+#endif
+
+//================================================================== EMSCRIPTEN ===
+
+#ifdef __EMSCRIPTEN__
+
+#define OS_STRING "emscripten"
+#define ID_INLINE inline
+#define PATH_SEP '/'
+
+#define ARCH_STRING "wasm32"
+
+#define Q3_LITTLE_ENDIAN
+
+#define DLL_EXT ".wasm"
 
 #endif
 
@@ -353,7 +459,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 void CopyShortSwap(void* dest, const void* src);
 void CopyLongSwap(void* dest, const void* src);
 short ShortSwap(short l);
+unsigned short UnsignedShortSwap(unsigned short l);
 int LongSwap(int l);
+unsigned int UnsignedLongSwap(unsigned int l);
 float FloatSwap(const float* f);
 short ShortSwapPtr(const void* l);
 int LongSwapPtr(const void* l);
@@ -361,6 +469,7 @@ short ShortNoSwapPtr(const void* l);
 int LongNoSwapPtr(const void* l);
 float FloatSwapPtr(const void* l);
 float FloatNoSwapPtr(const void* l);
+void SwapValue(void* dest, size_t size);
 
 #if defined( Q3_BIG_ENDIAN ) && defined( Q3_LITTLE_ENDIAN )
 #error "Endianness defined as both big and little"
@@ -374,17 +483,21 @@ float FloatNoSwapPtr(const void* l);
 //
 
 #define LittleShort(x) ShortSwap(x)
+#define LittleUnsignedShort(x) UnsignedShortSwap(x)
 #define LittleLong(x) LongSwap(x)
+#define LittleUnsignedLong(x) UnsignedLongSwap(x)
 #define LittleFloat(x) FloatSwap(&x)
 #define LittleShortPtr(x) ShortSwapPtr(&x)
 #define LittleLongPtr(x) LongSwapPtr(&x)
 #define LittleFloatPtr(x) FloatSwapPtr(&x)
+#define LittleSwap(x, size) SwapValue(x, size)
 
 #define BigShort
 #define BigLong
 #define BigFloat
 #define BigShortPtr(x) ShortNoSwapPtr(&x)
 #define BigLongPtr(x) LongNoSwapPtr(&x)
+#define BigSwap(x, size)
 
 #elif defined( Q3_LITTLE_ENDIAN )
 
@@ -392,17 +505,22 @@ float FloatNoSwapPtr(const void* l);
 #define CopyLittleLong(dest, src) Com_Memcpy(dest, src, 4)
 
 #define LittleShort
+#define LittleUnsignedShort
 #define LittleLong
 #define LittleFloat
 #define LittleShortPtr(x) ShortNoSwapPtr(&x)
 #define LittleLongPtr(x) LongNoSwapPtr(&x)
 #define LittleFloatPtr(x) FloatNoSwapPtr(&x)
+#define LittleSwap(x, size)
 
 #define BigShort(x) ShortSwap(x)
+#define BigUnsignedShort(x) UnsignedShortSwap(x)
 #define BigLong(x) LongSwap(x)
+#define BigUnsignedLong(x) UnsignedLongSwap(x)
 #define BigFloat(x) FloatSwap(&x)
 #define BigShortPtr(x) ShortSwapPtr(&x)
 #define BigLongPtr(x) LongSwapPtr(&x)
+#define BigSwap(x, size) SwapValue(x, size)
 
 #else
 #error "Endianness not defined"
diff --git a/code/qcommon/q_shared.c b/code/qcommon/q_shared.c
index 703d130e..696786a5 100644
--- a/code/qcommon/q_shared.c
+++ b/code/qcommon/q_shared.c
@@ -86,7 +86,7 @@ float vectoyaw(const vec3_t vec)
 	}
 	else {
 		//if (vec[PITCH]) {
-		yaw = (atan2(vec[YAW], vec[PITCH]) * 180 / M_PI);
+		yaw = (int)(atan2(vec[YAW], vec[PITCH]) * 180 / M_PI);
 		//} else if (vec[YAW] > 0) {
 		//	yaw = 90;
 		//} else {
@@ -345,7 +345,7 @@ void COM_ParseError( char *format, ... )
 	static char string[4096];
 
 	va_start (argptr, format);
-	vsprintf (string, format, argptr);
+	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);
 
 	Com_Printf("ERROR: %s, line %d: %s\n", com_parsename, com_lines, string);
@@ -357,7 +357,7 @@ void COM_ParseWarning( char *format, ... )
 	static char string[4096];
 
 	va_start (argptr, format);
-	vsprintf (string, format, argptr);
+	Q_vsnprintf (string, sizeof(string), format, argptr);
 	va_end (argptr);
 
 	Com_Printf("WARNING: %s, line %d: %s\n", com_parsename, com_lines, string);
@@ -944,25 +944,12 @@ void COM_MatchToken( char **buf_p, char *match ) {
 =================
 SkipBracedSection
 
-The next token should be an open brace.
+The next token should be an open brace or set depth to 1 if already parsed it.
 Skips until a matching close brace is found.
 Internal brace depths are properly skipped.
 =================
 */
-qboolean SkipBracedSection (char **program) {
-	return SkipBracedSectionEx( program, 0 );
-}
-
-/*
-=================
-SkipBracedSectionEx
-
-The next token should be an open brace.
-Skips until a matching close brace is found.
-Internal brace depths are properly skipped.
-=================
-*/
-qboolean SkipBracedSectionEx (char **program, int depth) {
+qboolean SkipBracedSection (char **program, int depth) {
 	char			*token;
 
 	do {
@@ -1195,18 +1182,24 @@ Safe strncpy that ensures a trailing zero
 =============
 */
 void Q_strncpyz( char *dest, const char *src, size_t destsize ) {
-  if ( !dest ) {
-    Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
-  }
-	if ( !src ) {
-		Com_Error( ERR_FATAL, "Q_strncpyz: NULL src" );
-	}
-	if ( destsize < 1 ) {
-		Com_Error(ERR_FATAL,"Q_strncpyz: destsize < 1" ); 
-	}
+    if ( !dest ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: NULL dest" );
+    }
 
-	strncpy( dest, src, destsize-1 );
-  dest[destsize-1] = 0;
+    if ( !src ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: NULL src" );
+    }
+
+    if ( destsize < 1 ) {
+        Com_Error( ERR_FATAL, "Q_strncpyz: destsize < 1" );
+    }
+
+    if ( dest == src ) {
+        return;
+    }
+
+    strncpy( dest, src, destsize - 1 );
+    dest[ destsize - 1 ] = 0;
 }
                  
 int Q_stricmpn( const char *s1, const char *s2, size_t n ) {
@@ -1476,20 +1469,41 @@ void CopyShortSwap(void* dest, const void* src)
 {
 	const byte* from = src;
 	byte* to = dest;
+	byte tmp[2];
 
-	to[0] = from[1];
-	to[1] = from[0];
+	Com_Memcpy(tmp, from, sizeof(tmp));
+
+	to[0] = tmp[1];
+	to[1] = tmp[0];
 }
 
 void CopyLongSwap(void* dest, const void* src)
 {
 	const byte* from = src;
 	byte* to = dest;
+	byte tmp[4];
 
-	to[0] = from[3];
-	to[1] = from[2];
-	to[2] = from[1];
-	to[3] = from[0];
+	Com_Memcpy(tmp, from, sizeof(tmp));
+
+	to[0] = tmp[3];
+	to[1] = tmp[2];
+	to[2] = tmp[1];
+	to[3] = tmp[0];
+}
+
+void SwapValue(void* dest, size_t size) {
+	byte* data = (byte*)dest;
+
+	// swap values
+	for (size_t i = size / 2; i > 0; --i)
+	{
+		uint8_t* in = data + i - 1;
+		uint8_t* out = data + size - i;
+
+		const uint8_t tmp = *in;
+		*in = *out;
+		*out = tmp;
+	}
 }
 
 short ShortSwap(short l)
@@ -1502,11 +1516,26 @@ short ShortSwap(short l)
 	return (b1 << 8) + b2;
 }
 
+unsigned short UnsignedShortSwap(unsigned short l)
+{
+	byte b1, b2;
+
+	b1 = l & 255;
+	b2 = (l >> 8) & 255;
+
+	return (b1 << 8) + b2;
+}
+
 short ShortNoSwap(short l)
 {
 	return l;
 }
 
+unsigned short UnsignedShortNoSwap(unsigned short l)
+{
+	return l;
+}
+
 int LongSwap(int l)
 {
 	byte b1, b2, b3, b4;
@@ -1519,11 +1548,28 @@ int LongSwap(int l)
 	return ((int)b1 << 24) + ((int)b2 << 16) + ((int)b3 << 8) + b4;
 }
 
+unsigned int UnsignedLongSwap(unsigned int l)
+{
+	byte b1, b2, b3, b4;
+
+	b1 = l & 255;
+	b2 = (l >> 8) & 255;
+	b3 = (l >> 16) & 255;
+	b4 = (l >> 24) & 255;
+
+	return ((unsigned int)b1 << 24) + ((unsigned int)b2 << 16) + ((unsigned int)b3 << 8) + b4;
+}
+
 int LongNoSwap(int l)
 {
 	return l;
 }
 
+unsigned int UnsignedLongNoSwap(unsigned int l)
+{
+	return l;
+}
+
 qint64 Long64Swap(qint64 ll)
 {
 	qint64 result;
@@ -1612,7 +1658,6 @@ va
 
 does a varargs printf into a temp buffer, so I don't need to have
 varargs versions of all text functions.
-FIXME: make this buffer size safe someday
 ============
 */
 const char *va( const char *format, ... )
@@ -1626,7 +1671,7 @@ const char *va( const char *format, ... )
 	index++;
 
 	va_start( argptr, format );
-	vsprintf( buf, format, argptr );
+	Q_vsnprintf( buf, sizeof(*string), format, argptr );
 	va_end( argptr );
 
 	return buf;
@@ -1808,7 +1853,8 @@ void Info_RemoveKey( char *s, const char *key ) {
 
 		if (!strcmp (key, pkey) )
 		{
-			strcpy (start, s);	// remove this part
+			memmove(start, s, strlen(s) + 1); // remove this part
+			
 			return;
 		}
 
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index aa0bea2b..15dde8ed 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -36,32 +36,36 @@ extern "C" {
 // We're always legacy
 #define LEGACY_PROTOCOL
 
-#define GAME_EXTENSION_MOH			"main"
-#define PRODUCT_EXTENSION_MOH		"Base"
-#define TARGET_GAME_VERSION_MOH		"1.12"
-#define TARGET_GAME_PROTOCOL_MOH	8
-#define TARGET_GAME_NAME_MOH		"mohaa"
+#define GAME_EXTENSION_MOH				"main"
+#define PRODUCT_EXTENSION_MOH			"Allied Assault"
+#define TARGET_GAME_VERSION_MOH			"1.12"
+#define TARGET_GAME_PROTOCOL_DEMO_MOH	6
+#define TARGET_GAME_PROTOCOL_MOH		8
+#define TARGET_GAME_NAME_MOH			"mohaa"
 
 #define HOMEPATH_NAME_UNIX_MOH		".moh"
 #define HOMEPATH_NAME_WIN_MOH		"moh"
 #define HOMEPATH_NAME_MACOSX_MOH	HOMEPATH_NAME_WIN_MOH
 
-#define GAME_EXTENSION_MOHTA		"mainta"
-#define PRODUCT_EXTENSION_MOHTA		"Spearhead"
-#define TARGET_GAME_VERSION_MOHTA	"2.16"
-#define TARGET_GAME_PROTOCOL_MOHTA	17
-#define TARGET_GAME_NAME_MOHTA		"mohaas"
+#define GAME_EXTENSION_MOHTA			"mainta"
+#define PRODUCT_EXTENSION_MOHTA			"Spearhead"
+#define TARGET_GAME_VERSION_MOHTA		"2.16"
+#define TARGET_GAME_PROTOCOL_MIN_MOHTA	16
+#define TARGET_GAME_PROTOCOL_MOHTA		17
+#define TARGET_GAME_NAME_MOHTA			"mohaas"
 
 #define HOMEPATH_NAME_UNIX_MOHTA	".mohta"
 #define HOMEPATH_NAME_WIN_MOHTA		"mohta"
 #define HOMEPATH_NAME_MACOSX_MOHTA	HOMEPATH_NAME_WIN_MOHTA
 
-#define GAME_EXTENSION_BASE_MOHTT	"maintt"
-#define PRODUCT_EXTENSION_MOHTT		"Breakthrough"
+#define GAME_EXTENSION_BASE_MOHTT		"maintt"
+#define PRODUCT_EXTENSION_MOHTT			"Breakthrough"
 // The version string must be equal or above 2.0 to be able to connect to breakthrough servers
-#define	TARGET_GAME_VERSION_MOHTT	"2.41"
-#define TARGET_GAME_PROTOCOL_MOHTT	17
-#define TARGET_GAME_NAME_MOHTT		"mohaab"
+#define	TARGET_GAME_VERSION_MOHTT		"2.41"
+#define	TARGET_GAME_VERSION_MOHTT_DEMO	"0.31"
+#define TARGET_GAME_PROTOCOL_MIN_MOHTT	16
+#define TARGET_GAME_PROTOCOL_MOHTT		17
+#define TARGET_GAME_NAME_MOHTT			"mohaab"
 
 #define HOMEPATH_NAME_UNIX_MOHTT	".mohtt"
 #define HOMEPATH_NAME_WIN_MOHTT		"mohtt"
@@ -73,12 +77,14 @@ extern "C" {
 // Note: An universal client is not currently possible without refactoring the network and the file system.
 //       Pak files must be reloaded on-the-fly depending on the server the client is connecting to.
 //
-#define HOMEPATH_NAME_UNIX		HOMEPATH_NAME_UNIX_MOH
-#define HOMEPATH_NAME_WIN		HOMEPATH_NAME_WIN_MOH
+#define HOMEPATH_NAME_UNIX		".openmohaa"
+#define HOMEPATH_NAME_WIN		"openmohaa"
 #define HOMEPATH_NAME_MACOSX	HOMEPATH_NAME_WIN
 
 #define CLIENT_WINDOW_TITLE		PRODUCT_NAME
 #define CLIENT_WINDOW_MIN_TITLE PRODUCT_NAME
+    
+#define MAX_MASTER_SERVERS      5	// number of supported master servers
 
 #define DEMOEXT	"dm_"			// standard demo extension
 
@@ -150,13 +156,11 @@ extern "C" {
 #ifndef Q3_VM
 
 #ifdef _DEBUG_MEM
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-
-#define Z_Malloc malloc
-#define Z_TagMalloc(size, tag) malloc( size )
-#define Z_Free(ptr) free(ptr)
+#  ifdef WIN32
+#    define _CRTDBG_MAP_ALLOC
+#    include <stdlib.h>
+#    include <crtdbg.h>
+#  endif
 #endif
 
 #include <assert.h>
@@ -264,8 +268,10 @@ typedef enum {
 
 typedef enum {
     PROTOCOL_MOH_MIN = 6,
+    PROTOCOL_MOH_DEMO = 6,
     PROTOCOL_MOH = 8,
     PROTOCOL_MOHTA_MIN = 15,
+    PROTOCOL_MOHTA_DEMO = 16,
     PROTOCOL_MOHTA = 17,
 } protocol_e;
 
@@ -423,7 +429,7 @@ typedef	int	fixed8_t;
 typedef	int	fixed16_t;
 
 #ifndef M_PI
-#define M_PI		3.14159265358979323846f	// matches value in gcc v2 math.h
+#define M_PI		3.14159265358979323846	// matches value in gcc v2 math.h
 #endif
 
 #ifndef M_SQRT2
@@ -706,6 +712,8 @@ void ZeroBounds(vec3_t mins, vec3_t maxs);
 void AddPointToBounds( const vec3_t v, vec3_t mins, vec3_t maxs );
 void BoundsAdd(vec3_t mins, vec3_t maxs, const vec3_t mins2, const vec3_t maxs2);
 
+float PointToSegmentDistanceSquared(const vec3_t origin, const vec3_t a, const vec3_t b);
+
 #if !defined( Q3_VM ) || ( defined( Q3_VM ) && defined( __Q3_VM_MATH ) )
 static ID_INLINE int VectorCompare( const vec3_t v1, const vec3_t v2 ) {
 	if (v1[0] != v2[0] || v1[1] != v2[1] || v1[2] != v2[2]) {
@@ -830,8 +838,11 @@ void vectoangles( const vec3_t value1, vec3_t angles );
 void VectorToAngles( const vec3_t vec, vec3_t angles );
 void AnglesToAxis(const vec3_t angles, vec3_t axis[3]);
 void YawToAxis(float yaw, float axis[2]);
-static  void init( void );
-float	noise1(float arg);
+
+float noise(float vec[], int len);
+float noise1(float arg);
+float noise2(vec3_t arg);
+float noise3(vec3_t arg);
 
 void	R_ConcatRotations( float in1[ 3 ][ 3 ], float in2[ 3 ][ 3 ], float out[ 3 ][ 3 ] );
 void	R_ConcatTransforms( float in1[ 3 ][ 4 ], float in2[ 3 ][ 4 ], float out[ 3 ][ 4 ] );
@@ -1156,8 +1167,7 @@ typedef struct pc_token_s
 
 void	COM_MatchToken( char**buf_p, char *match );
 
-qboolean SkipBracedSection (char **program);
-qboolean SkipBracedSectionEx (char **program, int depth);
+qboolean SkipBracedSection (char **program, int depth);
 void SkipRestOfLine ( char **data );
 
 void Parse1DMatrix (char **buf_p, int x, float *m);
@@ -1170,6 +1180,8 @@ size_t	QDECL Com_sprintf (char *dest, size_t size, const char *fmt, ...) __attri
 
 char *Com_SkipTokens( char *s, int numTokens, const char *sep );
 char *Com_SkipCharset( char *s, const char *sep );
+
+void Com_RandomBytes(byte* string, int len);
 void Com_BackslashToSlash( char *str );
 
 // mode parm for FS_FOpenFile
@@ -1188,6 +1200,9 @@ typedef enum {
 
 //=============================================
 
+// get the control character for the given key (moved from sdl_input.c)
+#define CTRL(a) ((a)-'a'+1)
+
 int Q_isprint( int c );
 int Q_islower( int c );
 int Q_isupper( int c );
@@ -1262,6 +1277,8 @@ void Info_NextPair( const char **s, char *key, char *value );
 void	QDECL Com_Error( int level, const char *error, ... ) __attribute__ ((format (printf, 2, 3)));
 void	QDECL Com_Printf( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
 void	QDECL Com_DPrintf( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
+void	QDECL Com_DPrintf2( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
+void	QDECL Com_DebugPrintf( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
 
 
 /*
@@ -1308,6 +1325,7 @@ default values.
 
 #define CVAR_VM_CREATED		0x8000	// cvar was created exclusively in one of the VMs.
 #define CVAR_PROTECTED		0x10000	// prevent modifying this var from VMs or the server
+#define CVAR_RESETSTRING	0x20000	// force the cvar's reset string to be set
 // These flags are only returned by the Cvar_Flags() function
 #define CVAR_MODIFIED		0x40000000	// Cvar was modified
 #define CVAR_NONEXISTENT	0x80000000	// Cvar doesn't exist.
@@ -1451,8 +1469,18 @@ typedef struct {
 // trace->entityNum can also be 0 to (MAX_GENTITIES-1)
 // or ENTITYNUM_NONE, ENTITYNUM_WORLD
 
-typedef struct {
-	int version;
+#define SAVEGAME_STRUCT_VERSION 4
+
+typedef struct savegamestruct_s {
+	//int version
+	// Modified in OPM
+	//===
+	short version;
+	// The type matches com_target_game
+	byte type;
+	// Currently unused
+	byte flags;
+	//===
 	int time;
 	int mapTime;
 	char comment[ 64 ];
@@ -1628,7 +1656,7 @@ typedef enum
 #define	MAX_CLIENTS			64		// absolute limit
 #define MAX_LOCATIONS		64
 
-#define MAX_MAP_BOUNDS          16384
+#define MAX_MAP_BOUNDS          8192
 #define MIN_MAP_BOUNDS          ( -MAX_MAP_BOUNDS )
 #define MAP_SIZE                ( MAX_MAP_BOUNDS - MIN_MAP_BOUNDS )
 
@@ -1654,6 +1682,8 @@ typedef enum
 #define	MAX_CONFIGSTRINGS	2736
 #define MAX_HUDDRAW_ELEMENTS 256
 
+#define MAX_SUBTITLES 4
+
 // these are the only configstrings that the system reserves, all the
 // other ones are strictly for servergame to clientgame communication
 #define	CS_SERVERINFO		0		// an info string with all the serverinfo cvars
@@ -1691,10 +1721,9 @@ typedef struct usereyes_s {
 
 // bit field limits
 #define	MAX_STATS				32
-#define	MAX_ACTIVEITEMS			8
+#define	MAX_ACTIVE_ITEMS		8
 #define	MAX_AMMO				16
-#define	MAX_AMMO_AMOUNT			16
-#define MAX_MAX_AMMO_AMOUNT		16
+#define	MAX_AMMOCOUNT			16
 
 #define	MAX_PERSISTANT			16
 #define	MAX_POWERUPS			16
@@ -1748,27 +1777,31 @@ typedef struct playerState_s {
 	int			iViewModelAnim;
 	int			iViewModelAnimChanged;
 
-	int			stats[ MAX_STATS ];
-	int			activeItems[ 8 ];
-	int			ammo_name_index[ 16 ];
-	int			ammo_amount[ 16 ];
-	int			max_ammo_amount[ 16 ];
+	int			stats[MAX_STATS];
+	int			activeItems[MAX_ACTIVE_ITEMS];
+	int			ammo_name_index[MAX_AMMO];
+	int			ammo_amount[MAX_AMMOCOUNT];
+	int			max_ammo_amount[MAX_AMMOCOUNT];
 
 	int			current_music_mood;
 	int			fallback_music_mood;
 	float		music_volume;
 	float		music_volume_fade_time;
+
 	int			reverb_type;
 	float		reverb_level;
-	float		blend[4];
-	float		fov;
-	float		camera_origin[3];
-	float		camera_angles[3];
+
+	float		blend[4];			// rgba full screen effect
+	float		fov;				// fov of the player
+
+    vec3_t		camera_origin;	// origin for camera view
+    vec3_t		camera_angles;	// angles for camera view
 	float		camera_time;
-	float		camera_offset[3];
-	float		camera_posofs[3];
-	int			camera_flags;
-	float		damage_angles[3];
+
+	vec3_t		camera_offset;	// angular offset for camera
+	vec3_t		camera_posofs;
+	int			camera_flags;	// third-person camera flags
+	vec3_t		damage_angles;	// these angles are added directly to the view, without lerping
 	// --
 	// Team Assault
 	int			radarInfo;
@@ -1807,30 +1840,35 @@ typedef struct playerState_s {
 #define	BUTTON_ANY			   (1 << BUTTON_ANY_BITINDEX)		   // any key whatsoever
 #define BUTTON_MOUSE           (1 << BUTTON_MOUSE_BITINDEX)
 
-#define WEAPON_COMMAND_USE_PISTOL               1
-#define WEAPON_COMMAND_USE_RIFLE                2
-#define WEAPON_COMMAND_USE_SMG                  3
-#define WEAPON_COMMAND_USE_MG                   4
-#define WEAPON_COMMAND_USE_GRENADE              5
-#define WEAPON_COMMAND_USE_HEAVY                6
-#define WEAPON_COMMAND_USE_ITEM1                7
-#define WEAPON_COMMAND_USE_ITEM2                8
-#define WEAPON_COMMAND_USE_ITEM3                9
-#define WEAPON_COMMAND_USE_ITEM4                10
-#define WEAPON_COMMAND_USE_PREV_WEAPON          11
-#define WEAPON_COMMAND_USE_NEXT_WEAPON          12
-#define WEAPON_COMMAND_USE_LAST_WEAPON          13
-#define WEAPON_COMMAND_HOLSTER                  14
-#define WEAPON_COMMAND_DROP                     15
+typedef enum {
+    WEAPON_COMMAND_NONE,
+	WEAPON_COMMAND_USE_PISTOL,
+	WEAPON_COMMAND_USE_RIFLE,
+	WEAPON_COMMAND_USE_SMG,
+	WEAPON_COMMAND_USE_MG,
+	WEAPON_COMMAND_USE_GRENADE,
+	WEAPON_COMMAND_USE_HEAVY,
+	WEAPON_COMMAND_USE_ITEM1,
+	WEAPON_COMMAND_USE_ITEM2,
+	WEAPON_COMMAND_USE_ITEM3,
+	WEAPON_COMMAND_USE_ITEM4,
+    WEAPON_COMMAND_USE_PREV_WEAPON,
+    WEAPON_COMMAND_USE_NEXT_WEAPON,
+    WEAPON_COMMAND_USE_LAST_WEAPON,
+	WEAPON_COMMAND_HOLSTER,
+    WEAPON_COMMAND_DROP,
+} weaponcommand_t;
 
-#if TARGET_GAME_PROTOCOL >= 15
-#define WEAPON_COMMAND_MAX						31
-#else
-#define WEAPON_COMMAND_MAX						15
-#endif
+#define WEAPON_COMMAND_MAX_VER6		15
+#define WEAPON_COMMAND_MAX_VER17	31
 
-#define WEAPON_COMMAND_MASK						(WEAPON_COMMAND_MAX << 7)
+static unsigned int GetWeaponCommandMask(unsigned int maxCmds) {
+	return maxCmds << 7;
+}
 
+static unsigned int GetWeaponCommand(unsigned int buttons, unsigned int maxCmds) {
+    return (buttons & (maxCmds << 7)) >> 7;
+}
 
 #define	MOVE_RUN			120			// if forwardmove or rightmove are >= MOVE_RUN,
 										// then BUTTON_WALKING should be set
diff --git a/code/qcommon/q_version.cmake b/code/qcommon/q_version.cmake
index f1ae522b..590d74e4 100644
--- a/code/qcommon/q_version.cmake
+++ b/code/qcommon/q_version.cmake
@@ -1,28 +1,49 @@
 add_library(qcommon_version INTERFACE)
 
-# Current branch
 execute_process(
-	COMMAND git branch --show-current
+	COMMAND git rev-parse --is-inside-work-tree
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	OUTPUT_VARIABLE GIT_BRANCH_NAME
+	OUTPUT_VARIABLE GIT_IS_INSIDE_WORK
 	OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-# Revision
-execute_process(
-	COMMAND git show -s --format=%H HEAD
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	OUTPUT_VARIABLE GIT_REVISION_HASH
-	OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+if ("${GIT_IS_INSIDE_WORK}" STREQUAL "true")
+	message(VERBOSE "Git was successfully detected in the source directory. Relevant Git information will be included in the game version.")
 
-# Commit date
-execute_process(
-	COMMAND git show -s --format=%ct
-	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-	OUTPUT_VARIABLE GIT_REVISION_DATE
-	OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+	# Current branch
+	execute_process(
+		COMMAND git branch --show-current
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		OUTPUT_VARIABLE GIT_BRANCH_NAME
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	# Revision
+	execute_process(
+		COMMAND git show -s --format=%H HEAD
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		OUTPUT_VARIABLE GIT_REVISION_HASH
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	# Revision
+	execute_process(
+		COMMAND git show -s --format=%h HEAD
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		OUTPUT_VARIABLE GIT_REVISION_HASH_ABBREVIATED
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+
+	# Commit date
+	execute_process(
+		COMMAND git show -s --format=%ct
+		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		OUTPUT_VARIABLE GIT_REVISION_DATE
+		OUTPUT_STRIP_TRAILING_WHITESPACE
+	)
+else()
+	message(WARNING "The repository was not detected as a Git working directory. Git information will not be available in the game version number.")
+endif()
 
 string(TIMESTAMP GIT_REVISION_DATE_TIME UTC)
 
@@ -33,10 +54,15 @@ if(NOT GIT_REVISION_BUILD_NUMBER)
 	set(GIT_REVISION_BUILD_NUMBER 0)
 endif()
 
+if(NOT PRODUCT_VERSION_STAGE)
+	set(PRODUCT_VERSION_STAGE "unstable")
+endif()
+
 message(VERBOSE "Git branch: ${GIT_BRANCH_NAME}")
 message(VERBOSE "Git revision hash: ${GIT_REVISION_HASH}")
 message(VERBOSE "Git revision date: ${GIT_REVISION_DATE}")
 message(VERBOSE "Git revision build: ${GIT_REVISION_BUILD_NUMBER}")
+message(VERBOSE "Stage: ${PRODUCT_VERSION_STAGE}")
 
 configure_file("q_version.generated.h.in" "generated/q_version.generated.h")
 target_include_directories(qcommon_version INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/generated")
diff --git a/code/qcommon/q_version.generated.h.in b/code/qcommon/q_version.generated.h.in
index 251aaa20..7a4d720e 100644
--- a/code/qcommon/q_version.generated.h.in
+++ b/code/qcommon/q_version.generated.h.in
@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define GIT_BRANCH_NAME "${GIT_BRANCH_NAME}"
 #define GIT_REVISION_HASH "${GIT_REVISION_HASH}"
+#define GIT_REVISION_HASH_ABBREVIATED "${GIT_REVISION_HASH_ABBREVIATED}"
 #define GIT_REVISION_DATE_TIME "${GIT_REVISION_DATE_TIME}"
 #define GIT_REVISION_DATE "${GIT_REVISION_DATE}"
 #define GIT_REVISION_BUILD_NUMBER ${GIT_REVISION_BUILD_NUMBER}
+#define PRODUCT_VERSION_STAGE "${PRODUCT_VERSION_STAGE}"
\ No newline at end of file
diff --git a/code/qcommon/q_version.h b/code/qcommon/q_version.h
index d85ad7b1..536a876b 100644
--- a/code/qcommon/q_version.h
+++ b/code/qcommon/q_version.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,9 +31,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 // These values are the only one that must be set for the version
 #define PRODUCT_VERSION_MAJOR			0
-#define PRODUCT_VERSION_MINOR			58
-#define PRODUCT_VERSION_PATCH			1
-#define PRODUCT_VERSION_SUFFIX			"alpha"
+#define PRODUCT_VERSION_MINOR			82
+#define PRODUCT_VERSION_PATCH			0
+#define PRODUCT_VERSION_SUFFIX			PRODUCT_VERSION_STAGE
 
 //
 // Generated version info
@@ -53,6 +53,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #   define PRODUCT_VERSION_REVISION GIT_REVISION_HASH
 #endif
 
+#ifdef GIT_REVISION_HASH_ABBREVIATED
+#   define PRODUCT_VERSION_REVISION_SHORT GIT_REVISION_HASH_ABBREVIATED
+#endif
+
 #ifdef GIT_REVISION_DATE
 #   define PRODUCT_VERSION_DATE GIT_REVISION_DATE
 #else
@@ -77,7 +81,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #   define PRODUCT_VERSION_2        PRODUCT_VERSION_1 "+" XSTRING(PRODUCT_VERSION_BUILD_NUMBER)
 
 #ifdef PRODUCT_VERSION_REVISION
-#   define PRODUCT_VERSION_3        PRODUCT_VERSION_2 "." PRODUCT_VERSION_REVISION
+#   define PRODUCT_VERSION_3        PRODUCT_VERSION_2 "." PRODUCT_VERSION_REVISION_SHORT
 #else
 #   define PRODUCT_VERSION_3        PRODUCT_VERSION_2
 #endif
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 498caf6a..cd0f9785 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -87,6 +87,7 @@ void MSG_WriteBigString (msg_t *sb, const char *s);
 void MSG_WriteScrambledString(msg_t* sb, const char* s);
 void MSG_WriteScrambledBigString(msg_t* sb, const char* s);
 void MSG_WriteAngle16 (msg_t *sb, float f);
+int MSG_HashKey(const char *string, int maxlen);
 void MSG_WriteEntityNum(msg_t* sb, short number);
 
 void	MSG_BeginReading (msg_t *sb);
@@ -154,7 +155,7 @@ int MSG_PackScale(float scale, int bits);
 int MSG_PackAlpha(float alpha, int bits);
 int MSG_PackCoord(float coord);
 int MSG_PackCoordExtra(float coord);
-qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits);
+qboolean MSG_DeltaNeeded(const void* fromField, const void* toField, int fieldType, int bits, int size);
 
 void MSG_WritePackedAngle(msg_t* msg, float value, int bits);
 void MSG_WritePackedAnimTime(msg_t* msg, float fromValue, float toValue, float frameTime, int bits);
@@ -202,8 +203,8 @@ NET
 #define	MAX_RELIABLE_COMMANDS	512			// max string commands buffered for restransmit
 
 typedef enum {
-	NA_BOT,
 	NA_BAD,					// an address lookup failed
+    NA_BOT,
 	NA_LOOPBACK,
 	NA_BROADCAST,
 	NA_IP,
@@ -254,11 +255,14 @@ void		NET_LeaveMulticast6(void);
 void		NET_Sleep(int msec);
 
 
-#define	MAX_MSGLEN			49152		// max length of a message, which may
+#define	MAX_MSGLEN				49152		// max length of a message, which may
 											// be fragmented into multiple packets
 
-#define MAX_DOWNLOAD_WINDOW			8		// max of eight download frames
-#define MAX_DOWNLOAD_BLKSIZE		2048	// 2048 byte block chunks
+#define MAX_DOWNLOAD_WINDOW		48	// ACK window of 48 download chunks. Cannot set this higher, or clients
+						// will overflow the reliable commands buffer
+#define MAX_DOWNLOAD_BLKSIZE		1024	// 896 byte block chunks
+
+#define NETCHAN_GENCHECKSUM(challenge, sequence) ((challenge) ^ ((sequence) * (challenge)))
  
 
 /*
@@ -298,14 +302,61 @@ typedef struct {
 #endif
 } netchan_t;
 
+/*
+Packet profiling
+*/
+
+#define NETPROF_PACKET_FRAGMENTED 1
+#define NETPROF_PACKET_DROPPED    2
+#define NETPROF_PACKET_MESSAGE    4
+
+#define NETPROX_MAX_PACKETS       64
+
+typedef struct {
+	int updateTime;
+	int size;
+	int flags;
+} netprofpacket_t;
+
+typedef struct {
+	int updateTime;
+	int index;
+	netprofpacket_t packets[NETPROX_MAX_PACKETS];
+	int lastCalcTime;
+	int lowestUpdateTime;
+	int highestUpdateTime;
+	int totalProcessed;
+	int totalSize;
+	int numFragmented;
+	int numDropped;
+	int numConnectionLess;
+	int totalLengthConnectionLess;
+	int packetsPerSec;
+	int bytesPerSec;
+	int percentFragmented;
+	int percentDropped;
+	int percentConnectionLess;
+	float latency;
+} netprofpacketlist_t;
+
+typedef struct {
+	qboolean initialized;
+	int rate;
+	netprofpacketlist_t outPackets;
+	netprofpacketlist_t inPackets;
+} netprofclient_t;
+
 void Netchan_Init( int qport );
 void Netchan_Setup(netsrc_t sock, netchan_t *chan, netadr_t adr, int qport, int challenge, qboolean compat);
 
-void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data );
-void Netchan_TransmitNextFragment( netchan_t *chan );
+void Netchan_Transmit( netchan_t *chan, size_t length, const byte *data, netprofpacketlist_t *packetlist );
+void Netchan_TransmitNextFragment( netchan_t *chan, netprofpacketlist_t *packetlist );
 
-qboolean Netchan_Process( netchan_t *chan, msg_t *msg );
+qboolean Netchan_Process( netchan_t *chan, msg_t *msg, netprofpacketlist_t *packetlist );
 
+void NetProfileAddPacket(netprofpacketlist_t* list, size_t size, int flags);
+void NetProfileSetPacketFlags(netprofpacketlist_t* list, int flags);
+void NetProfileCalcStats(netprofpacketlist_t* list, int time);
 
 /*
 ==============================================================
@@ -361,7 +412,11 @@ enum svc_ops_e {
 	svc_centerprint,
 	svc_locprint,
 	svc_cgameMessage,
-	svc_EOF
+	svc_EOF,
+
+// new commands, supported only by ioquake3 protocol but not legacy
+	svc_voipSpeex,     // not wrapped in USE_VOIP, so this value is reserved.
+	svc_voipOpus,      //
 };
 
 //
@@ -373,7 +428,11 @@ enum clc_ops_e {
 	clc_move,				// [[usercmd_t]
 	clc_moveNoDelta,		// [[usercmd_t]
 	clc_clientCommand,		// [string] message
-	clc_EOF
+	clc_EOF,
+
+// new commands, supported only by ioquake3 protocol but not legacy
+	clc_voipSpeex,   // not wrapped in USE_VOIP, so this value is reserved.
+	clc_voipOpus,    //
 };
 
 /*
@@ -497,7 +556,7 @@ void	Cmd_AddCommand( const char *cmd_name, xcommand_t function );
 
 void	Cmd_RemoveCommand( const char *cmd_name );
 
-typedef void (*completionFunc_t)( char *args, int argNum );
+typedef void (*completionFunc_t)( const char *args, int argNum );
 
 // don't allow VMs to remove system commands
 void	Cmd_RemoveCommandSafe( const char *cmd_name );
@@ -507,7 +566,7 @@ void	Cmd_CommandCompletion( void(*callback)(const char *s) );
 void Cmd_SetCommandCompletionFunc( const char *command,
 	completionFunc_t complete );
 void Cmd_CompleteArgument( const char *command, char *args, int argNum );
-void Cmd_CompleteCfgName( char *args, int argNum );
+void Cmd_CompleteCfgName( const char *args, int argNum );
 void	Cmd_CommandCompletion( void(*callback)(const char *s) );
 const char* Cmd_CompleteCommandByNumber(const char* partial, int number);
 // callback with each valid string
@@ -700,6 +759,8 @@ void	FS_FreeFileList( char **list );
 
 qboolean FS_FileExists( const char *file );
 
+void FS_CorrectCase(char* path);
+
 char   *FS_BuildOSPath( const char *base, const char *game, const char *qpath );
 
 qboolean FS_CreatePath(char *OSPath);
@@ -711,9 +772,10 @@ int		FS_GetModList(  char *listbuf, int bufsize );
 
 void	FS_GetModDescription(const char* modDir, char* description, int descriptionLen);
 
-fileHandle_t	FS_FOpenFileAppend( const char *filename );
 fileHandle_t	FS_FOpenFileWrite( const char *qpath );
-fileHandle_t	FS_FOpenTextFileWrite( const char *qpath );
+fileHandle_t	FS_FOpenFileAppend( const char *filename );
+fileHandle_t	FS_FCreateOpenPipeFile( const char *filename );
+fileHandle_t	FS_FOpenTextFileWrite(const char* qpath);
 // will properly create any needed paths and deal with seperater character issues
 
 void	FS_DeleteFile( const char *filename );
@@ -779,7 +841,7 @@ void 	QDECL FS_Printf( fileHandle_t f, const char *fmt, ... ) __attribute__ ((fo
 int		FS_FOpenFileByMode( const char *qpath, fileHandle_t *f, fsMode_t mode );
 // opens a file for reading, writing, or appending depending on the value of mode
 
-int		FS_Seek( fileHandle_t f, long offset, fsOrigin_t origin );
+int		FS_Seek( fileHandle_t f, long offset, int origin );
 // seek on a file (doesn't work for zip files!!!!!!!!)
 
 qboolean FS_FilenameCompare( const char *s1, const char *s2 );
@@ -825,6 +887,8 @@ void	FS_FilenameCompletion( const char *dir, const char *ext,
 const char* FS_GetCurrentGameDir();
 void	FS_GetRelativeFilename( const char *currentDirectory, const char *absoluteFilename, char *out, size_t destlen );
 
+void FS_FileTime(const char* filename, char* date, char* size);
+
 extern cvar_t* fs_debug;
 extern cvar_t* fs_mapdir;
 
@@ -933,11 +997,17 @@ int			Com_Filter(const char *filter, const char *name, int casesensitive);
 int			Com_FilterPath(const char *filter, const char *name, int casesensitive);
 int			Com_RealTime(qtime_t *qtime);
 qboolean	Com_SafeMode( void );
+void		Com_RunAndTimeServerPacket(netadr_t *evFrom, msg_t *buf);
+
+qboolean	Com_IsVoipTarget(uint8_t *voipTargets, int voipTargetsSize, int clientNum);
 
 void		Com_StartupVariable( const char *match );
 // checks for and removes command line "+set var arg" constructs
 // if match is NULL, all set commands will be executed, otherwise
 // only a set with the exact name.  Only used during startup.
+qboolean		Com_PlayerNameToFieldString( char *str, int length, const char *name );
+qboolean		Com_FieldStringToPlayerName( char *name, int length, const char *rawname );
+int QDECL	Com_strCompare( const void *a, const void *b );
 
 
 extern	float currentfps;
@@ -968,6 +1038,7 @@ extern	cvar_t	*com_minimized;
 extern	cvar_t	*com_maxfpsMinimized;
 extern	cvar_t	*com_altivec;
 extern	cvar_t	*com_standalone;
+extern	cvar_t	*com_gamename;
 extern	cvar_t	*com_basegame;
 extern	cvar_t	*com_homepath;
 extern	cvar_t	*com_altivec;
@@ -988,6 +1059,12 @@ extern  cvar_t* con_autochat;
 #endif
 extern	cvar_t* com_target_version;
 extern	cvar_t* com_target_game;
+extern	cvar_t* com_target_demo;
+extern	cvar_t* com_updatecheck_enabled;
+extern	cvar_t* com_updatecheck_interval;
+
+extern	int		protocol_version_demo;
+extern	int		protocol_version_full;
 
 // com_speeds times
 extern	int		time_game;
@@ -999,6 +1076,7 @@ extern	int		com_frameMsec;
 
 extern	qboolean	com_errorEntered;
 extern	qboolean	com_fullyInitialized;
+extern	qboolean	com_gotOriginalConfig;
 
 extern	fileHandle_t	com_journalFile;
 extern	fileHandle_t	com_journalDataFile;
@@ -1046,47 +1124,50 @@ temp file loading
 	#define ZONE_DEBUG
 #endif
 
-const char *Z_EmptyStringPointer( void );
-const char *Z_NumberStringPointer( int iNum );
-
-#ifndef _DEBUG_MEM
-void *Z_TagMalloc(int size, int tag );
-void *Z_Malloc(int size );
-void Z_Free( void *ptr );
+#ifdef ZONE_DEBUG
+#define Z_TagMalloc(size, tag)			Z_TagMallocDebug(size, tag, #size, __FILE__, __LINE__)
+#define Z_Malloc(size)					Z_MallocDebug(size, #size, __FILE__, __LINE__)
+#define S_Malloc(size)					S_MallocDebug(size, #size, __FILE__, __LINE__)
+void *Z_TagMallocDebug( int size, int tag, const char *label, const char *file, int line );	// NOT 0 filled memory
+void *Z_MallocDebug( int size, const char *label, const char *file, int line );			// returns 0 filled memory
+void *S_MallocDebug( int size, const char *label, const char *file, int line );			// returns 0 filled memory
+#else
+void *Z_TagMalloc( int size, int tag );	// NOT 0 filled memory
+void *Z_Malloc( int size );			// returns 0 filled memory
+void *S_Malloc( int size );			// NOT 0 filled memory only for small allocations
 #endif
-
+void Z_Free( void *ptr );
 void Z_FreeTags( int tag );
-
-void Z_InitMemory( void );
-void Z_Shutdown( void );
 int Z_AvailableMemory( void );
 void Z_LogHeap( void );
-void Z_Meminfo_f( void );
-
-void *Hunk_AllocateTempMemory(int size );
-void Hunk_FreeTempMemory( void *buf );
 
 void Hunk_Clear( void );
 void Hunk_ClearToMark( void );
 void Hunk_SetMark( void );
 qboolean Hunk_CheckMark( void );
 void Hunk_ClearTempMemory( void );
+void *Hunk_AllocateTempMemory( int size );
+void Hunk_FreeTempMemory( void *buf );
 int	Hunk_MemoryRemaining( void );
 void Hunk_Log( void);
-void Hunk_Trash( void );
 
 void Com_TouchMemory( void );
-void Com_InitHunkMemory(void);
+
+const char* Z_EmptyStringPointer(void);
+const char* Z_NumberStringPointer(int iNum);
 
 // commandLine should not include the executable name (argv[0])
 void Com_Init( char *commandLine );
 void Com_Frame( void );
 void Com_Shutdown( void );
 
-qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName );
+qboolean Com_SanitizeName( const char *pszOldName, char *pszNewName, size_t bufferSize );
 const char *Com_GetArchiveFileName( const char *filename, const char *extension );
 const char *Com_GetArchiveFolder();
 void Com_WipeSavegame( const char *savename );
+qboolean Com_ShiftedStrStr(const char* shifted, const char* name, int offset);
+qboolean COM_IsMapValid(const char* name);
+void Com_SwapSaveStruct(savegamestruct_t* save);
 
 
 /*
@@ -1106,13 +1187,17 @@ void CL_InitKeyCommands( void );
 
 void CL_Init( void );
 void CL_Disconnect();
+void CL_AbnormalDisconnect();
 void CL_Shutdown(const char *finalmsg, qboolean disconnect, qboolean quit);
 qboolean CL_FinishedIntro(void);
+void CL_FinishedStartStage(void);
 void CL_SetFrameNumber(int frameNumber);
 void CL_Frame( int msec );
 qboolean CL_GameCommand( void );
 void CL_KeyEvent (int key, qboolean down, unsigned time);
 
+void CL_Key_ForceCommand(int key, unsigned int time);
+
 void CL_CharEvent( int key );
 // char events are for field typing, not game control
 
@@ -1139,6 +1224,9 @@ void	CL_ForwardCommandToServer( const char *string );
 // things like godmode, noclip, etc, are commands directed to the server,
 // so when they are typed in at the console, they will need to be forwarded.
 
+qboolean CL_UseLargeLightmap(const char* mapName);
+// returns true if the standard BSP file should be used
+
 void CL_CDDialog( void );
 // bring up the "need a cd to play" dialog
 
@@ -1200,6 +1288,7 @@ void Com_FakeUnpause();
 void Com_Pause_f();
 void SV_SoundCallback( int entnum, int channel_number, const char *name );
 
+int R_CountTextureMemory();
 /*
 ==============================================================
 
@@ -1341,6 +1430,7 @@ void RecoverLostAutodialData( void );
 
 void Sys_CloseMutex( void );
 void Sys_ShowConsole( int visLevel, qboolean quitOnClose );
+void Sys_DebugPrint(const char* message);
 void Sys_PumpMessageLoop( void );
 
 qboolean SaveRegistryInfo( qboolean user, const char *pszName, void *pvBuf, long lSize );
@@ -1372,6 +1462,11 @@ typedef enum
 
 dialogResult_t Sys_Dialog( dialogType_t type, const char *message, const char *title );
 
+void Sys_RemovePIDFile( const char *gamedir );
+void Sys_InitPIDFile( const char *gamedir );
+
+void Sys_ProcessBackgroundTasks();
+
 /* This is based on the Adaptive Huffman algorithm described in Sayood's Data
  * Compression book.  The ranks are not actually stored, but implicitly defined
  * by the location of a node within a doubly-linked list */
@@ -1413,9 +1508,9 @@ void	Huff_Decompress(msg_t *buf, int offset);
 void	Huff_Init(huffman_t *huff);
 void	Huff_addRef(huff_t* huff, byte ch);
 int		Huff_Receive (node_t *node, int *ch, byte *fin);
-void	Huff_transmit (huff_t *huff, int ch, byte *fout);
-void	Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset);
-void	Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset);
+void	Huff_transmit (huff_t *huff, int ch, byte *fout, int maxoffset);
+void	Huff_offsetReceive (node_t *node, int *ch, byte *fin, int *offset, int maxoffset);
+void	Huff_offsetTransmit (huff_t *huff, int ch, byte *fout, int *offset, int maxoffset);
 void	Huff_putBit( int bit, byte *fout, int *offset);
 int		Huff_getBit( byte *fout, int *offset);
 
diff --git a/code/qcommon/qfiles.h b/code/qcommon/qfiles.h
index 405f0108..f62cb9eb 100644
--- a/code/qcommon/qfiles.h
+++ b/code/qcommon/qfiles.h
@@ -365,8 +365,8 @@ typedef struct {
 #define BSP_IDENT	(('5'<<24)+('1'<<16)+('0'<<8)+'2')
 		// little-endian "2015"
 
-#define BSP_BETA_VERSION	18	// Beta Allied Assault
-#define BSP_MIN_VERSION		18	// Beta Allied Assault
+#define BSP_BETA_VERSION	17	// Beta Allied Assault
+#define BSP_MIN_VERSION		17	// Beta Allied Assault
 #define BSP_VERSION			19	// Allied Assault
 #define BSP_MAX_VERSION		21	// Breakthrough
 
@@ -424,6 +424,10 @@ typedef struct fcm_s {
 	int iHeight;
 } fcm_t;
 
+#define MAX_TERRAIN_VARNODES 63
+#define TERPATCH_FLIP		0x40
+#define TERPATCH_NEIGHBOR	0x80
+
 typedef struct varnode_s {
 	unsigned short flags;
 } varnode_t;
@@ -436,8 +440,8 @@ typedef struct cTerraPatch_s {
 
 	vec2_t	texCoord[ 2 ][ 2 ];
 
-	char	x;
-	char	y;
+	signed char		x;
+	signed char		y;
 
 	short			iBaseHeight;
 	unsigned short	iShader;
@@ -448,7 +452,7 @@ typedef struct cTerraPatch_s {
 	short	iSouth;
 	short	iWest;
 
-	varnode_t		varTree[ 2 ][ 63 ];
+	varnode_t varTree[2][MAX_TERRAIN_VARNODES];
 
 	unsigned char	heightmap[ 9 * 9 ];
 } cTerraPatch_t;
@@ -489,8 +493,8 @@ typedef struct {
 #define LUMP_BRUSHSIDES			11
 #define LUMP_BRUSHES			12
 /*
-// FOG seems to be handled differently in MOHAA - no fog lump found yet
-#define LUMP_FOGS				0
+#define LUMP_FOGS				13
+LUMP_FOGS was removed in BSP version 19, since moh version 1.10
 */
 #define LUMP_MODELS				13
 #define LUMP_ENTITIES			14
@@ -518,6 +522,18 @@ typedef struct {
 	lump_t		lumps[ HEADER_LUMPS ];
 } dheader_t;
 
+static lump_t *Q_GetLumpByVersion(dheader_t *header, int lump)
+{
+	if (header->version <= 18) {
+		if (lump > LUMP_BRUSHES) {
+			return &header->lumps[lump + 1];
+        }
+        return &header->lumps[lump];
+	}
+
+    return &header->lumps[lump];
+}
+
 typedef struct {
 	float		mins[3], maxs[3];
 	int			firstSurface, numSurfaces;
diff --git a/code/qcommon/safeptr.h b/code/qcommon/safeptr.h
index 7da6d692..58b4436e 100644
--- a/code/qcommon/safeptr.h
+++ b/code/qcommon/safeptr.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,225 +22,277 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // safeptr.h: Safe Pointers
 
-#ifndef __SAFEPTR_H__
-#define __SAFEPTR_H__
+#pragma once
 
 #include "Linklist.h"
 
+#include <utility>
+
 class SafePtrBase
 {
 private:
-	void	AddReference( Class *ptr );
-	void	RemoveReference( Class *ptr );
+    void AddReference(Class *ptr);
+    void RemoveReference(Class *ptr);
 
 protected:
-	SafePtrBase	*prev;
-	SafePtrBase	*next;
-	Class		*ptr;
+    SafePtrBase *prev;
+    SafePtrBase *next;
+    Class       *ptr;
 
 public:
-	SafePtrBase();
-	virtual		~SafePtrBase();
-	void		InitSafePtr( Class *newptr );
-	Class		*Pointer( void );
-	void		Clear( void );
+    SafePtrBase();
+    virtual ~SafePtrBase();
+    void   InitSafePtr(Class *newptr);
+    Class *Pointer(void);
+    void   Clear(void);
+
+protected:
+    void Move(SafePtrBase&& other);
 };
 
-inline void SafePtrBase::AddReference( Class *ptr )
+inline void SafePtrBase::AddReference(Class *ptr)
 {
-	if( !ptr->SafePtrList )
-	{
-		ptr->SafePtrList = this;
-		LL_Reset( this, next, prev );
-	}
-	else
-	{
-		LL_Add( ptr->SafePtrList, this, next, prev );
-	}
+    if (!ptr->SafePtrList) {
+        ptr->SafePtrList = this;
+        LL_Reset(this, next, prev);
+    } else {
+        LL_Add(ptr->SafePtrList, this, next, prev);
+    }
 }
 
-inline void SafePtrBase::RemoveReference( Class *ptr )
+inline void SafePtrBase::RemoveReference(Class *ptr)
 {
-	if( ptr->SafePtrList == this )
-	{
-		if( ptr->SafePtrList->next == this )
-		{
-			ptr->SafePtrList = nullptr;
-		}
-		else
-		{
-			ptr->SafePtrList = next;
-			LL_Remove( this, next, prev );
-		}
-	}
-	else
-	{
-		LL_Remove( this, next, prev );
-	}
+    if (ptr->SafePtrList == this) {
+        if (ptr->SafePtrList->next == this) {
+            ptr->SafePtrList = nullptr;
+        } else {
+            ptr->SafePtrList = next;
+            LL_Remove(this, next, prev);
+        }
+    } else {
+        LL_Remove(this, next, prev);
+    }
 }
 
-inline void SafePtrBase::Clear( void )
+inline void SafePtrBase::Clear(void)
 {
-	if( ptr )
-	{
-		RemoveReference( ptr );
-		ptr = nullptr;
-	}
+    if (ptr) {
+        RemoveReference(ptr);
+        ptr = nullptr;
+    }
 }
 
 inline SafePtrBase::SafePtrBase()
 {
-	prev = nullptr;
-	next = nullptr;
-	ptr = nullptr;
+    prev = nullptr;
+    next = nullptr;
+    ptr  = nullptr;
 }
 
 inline SafePtrBase::~SafePtrBase()
 {
-	Clear();
+    Clear();
 }
 
-inline Class * SafePtrBase::Pointer( void )
+inline Class *SafePtrBase::Pointer(void)
 {
-	return ptr;
+    return ptr;
 }
 
-inline void SafePtrBase::InitSafePtr( Class *newptr )
+inline void SafePtrBase::InitSafePtr(Class *newptr)
 {
-	if( ptr != newptr )
-	{
-		if( ptr )
-		{
-			RemoveReference( ptr );
-		}
+    if (ptr != newptr) {
+        if (ptr) {
+            RemoveReference(ptr);
+        }
 
-		ptr = newptr;
-		if( ptr == nullptr )
-		{
-			return;
-		}
+        ptr = newptr;
+        if (ptr == nullptr) {
+            return;
+        }
 
-		AddReference( ptr );
-	}
+        AddReference(ptr);
+    }
+}
+
+inline void SafePtrBase::Move(SafePtrBase&& other)
+{
+    prev = other.prev;
+    next = other.next;
+    ptr  = other.ptr;
+
+    if (ptr && ptr->SafePtrList) {
+        if (ptr->SafePtrList == &other) {
+            ptr->SafePtrList = this;
+        } else {
+            if (ptr->SafePtrList->prev == &other) {
+                ptr->SafePtrList->prev = this;
+            }
+            if (ptr->SafePtrList->next == &other) {
+                ptr->SafePtrList->next = this;
+            }
+        }
+    }
+
+    if (prev) {
+        if (prev == &other) {
+            prev = this;
+        } else {
+            assert(prev->next == &other || prev->next == this);
+            prev->next = this;
+        }
+    }
+    if (next) {
+        if (next == &other) {
+            next = this;
+        } else {
+            assert(next->prev == &other || next->prev == this);
+            next->prev = this;
+        }
+    }
+
+    other.next = other.prev = NULL;
+    other.ptr               = NULL;
 }
 
 template<class T>
 class SafePtr : public SafePtrBase
 {
 public:
-	SafePtr( T* objptr = 0 );
-	SafePtr( const SafePtr& obj );
+    SafePtr(T *objptr = 0);
+    SafePtr(const SafePtr& obj);
+    SafePtr(SafePtr&& obj);
 
-	SafePtr& operator=( const SafePtr& obj );
-	SafePtr& operator=( T * const obj );
+    SafePtr& operator=(const SafePtr& obj);
+    SafePtr& operator=(T *const obj);
+    SafePtr& operator=(SafePtr&& obj);
 
 #ifdef LINUX
-	friend bool operator==<>( SafePtr<T> a, T *b );
-	friend bool operator!=<>( SafePtr<T> a, T *b );
-	friend bool operator==<>( T *a, SafePtr<T> b );
-	friend bool operator!=<>( T *a, SafePtr<T> b );
-	friend bool operator==<>( SafePtr<T> a, SafePtr<T> b );
-	friend bool operator!=<>( SafePtr<T> a, SafePtr<T> b );
+    friend bool operator== <>(SafePtr<T> a, T *b);
+    friend bool operator!= <>(SafePtr<T> a, T *b);
+    friend bool operator== <>(T *a, SafePtr<T> b);
+    friend bool operator!= <>(T *a, SafePtr<T> b);
+    friend bool operator== <>(SafePtr<T> a, SafePtr<T> b);
+    friend bool operator!= <>(SafePtr<T> a, SafePtr<T> b);
 #else
-	// The compiler/linker gets confused when the friend functions definition are not templated
-	template< class U > friend bool operator==( SafePtr<U> a, U *b );
-	template< class U > friend bool operator!=( SafePtr<U> a, U *b );
-	template< class U > friend bool operator==( U *a, SafePtr<U> b );
-	template< class U > friend bool operator!=( U *a, SafePtr<U> b );
-	template< class U > friend bool operator==( SafePtr<U> a, SafePtr<U> b );
-	template< class U > friend bool operator!=( SafePtr<U> a, SafePtr<U> b );
+    // The compiler/linker gets confused when the friend functions definition are not templated
+    template<class U>
+    friend bool operator==(SafePtr<U> a, U *b);
+    template<class U>
+    friend bool operator!=(SafePtr<U> a, U *b);
+    template<class U>
+    friend bool operator==(U *a, SafePtr<U> b);
+    template<class U>
+    friend bool operator!=(U *a, SafePtr<U> b);
+    template<class U>
+    friend bool operator==(SafePtr<U> a, SafePtr<U> b);
+    template<class U>
+    friend bool operator!=(SafePtr<U> a, SafePtr<U> b);
 #endif
 
-	bool operator !( ) const;
-	operator T*( ) const;
-	T* operator->( ) const;
-	T& operator*( ) const;
+    bool operator!() const;
+    operator T *() const;
+    T *operator->() const;
+    T& operator*() const;
 };
 
 template<class T>
-inline SafePtr<T>::SafePtr( T* objptr )
+inline SafePtr<T>::SafePtr(T *objptr)
 {
-	InitSafePtr( ( Class * )objptr );
+    InitSafePtr((Class *)objptr);
 }
 
 template<class T>
-inline SafePtr<T>::SafePtr( const SafePtr& obj )
+inline SafePtr<T>::SafePtr(const SafePtr& obj)
 {
-	InitSafePtr( obj.ptr );
+    InitSafePtr(obj.ptr);
 }
 
 template<class T>
-inline SafePtr<T>& SafePtr<T>::operator=( const SafePtr& obj )
+inline SafePtr<T>::SafePtr(SafePtr&& obj)
 {
-	InitSafePtr( obj.ptr );
-	return *this;
+    Move(std::move(obj));
 }
 
 template<class T>
-inline SafePtr<T>& SafePtr<T>::operator=( T * const obj )
+inline SafePtr<T>& SafePtr<T>::operator=(const SafePtr& obj)
 {
-	InitSafePtr( obj );
-	return *this;
+    InitSafePtr(obj.ptr);
+    return *this;
 }
 
 template<class T>
-inline bool operator==( SafePtr<T> a, T *b )
+inline SafePtr<T>& SafePtr<T>::operator=(SafePtr&& obj)
 {
-	return a.ptr == b;
+    Clear();
+    Move(std::move(obj));
+
+    return *this;
 }
 
 template<class T>
-inline bool operator!=( SafePtr<T> a, T* b )
+inline SafePtr<T>& SafePtr<T>::operator=(T *const obj)
 {
-	return a.ptr != b;
+    InitSafePtr(obj);
+    return *this;
 }
 
 template<class T>
-inline bool operator==( T* a, SafePtr<T> b )
+inline bool operator==(SafePtr<T> a, T *b)
 {
-	return a == b.ptr;
+    return a.ptr == b;
 }
 
 template<class T>
-inline bool operator!=( T* a, SafePtr<T> b )
+inline bool operator!=(SafePtr<T> a, T *b)
 {
-	return a != b.ptr;
+    return a.ptr != b;
 }
 
 template<class T>
-inline bool operator==( SafePtr<T> a, SafePtr<T> b )
+inline bool operator==(T *a, SafePtr<T> b)
 {
-	return a.ptr == b.ptr;
+    return a == b.ptr;
 }
 
 template<class T>
-inline bool operator!=( SafePtr<T> a, SafePtr<T> b )
+inline bool operator!=(T *a, SafePtr<T> b)
 {
-	return a.ptr != b.ptr;
+    return a != b.ptr;
 }
 
 template<class T>
-inline bool SafePtr<T>::operator !( ) const
+inline bool operator==(SafePtr<T> a, SafePtr<T> b)
 {
-	return ptr == nullptr;
+    return a.ptr == b.ptr;
 }
 
 template<class T>
-inline SafePtr<T>::operator T*( ) const
+inline bool operator!=(SafePtr<T> a, SafePtr<T> b)
 {
-	return ( T * )ptr;
+    return a.ptr != b.ptr;
 }
 
 template<class T>
-inline T* SafePtr<T>::operator->( ) const
+inline bool SafePtr<T>::operator!() const
 {
-	return ( T * )ptr;
+    return ptr == nullptr;
 }
 
 template<class T>
-inline T& SafePtr<T>::operator*( ) const
+inline SafePtr<T>::operator T *() const
 {
-	return *( T * )ptr;
+    return (T *)ptr;
 }
 
-#endif
+template<class T>
+inline T *SafePtr<T>::operator->() const
+{
+    return (T *)ptr;
+}
+
+template<class T>
+inline T& SafePtr<T>::operator*() const
+{
+    return *(T *)ptr;
+}
diff --git a/code/qcommon/script.cpp b/code/qcommon/script.cpp
index 20e5f912..6e98a496 100644
--- a/code/qcommon/script.cpp
+++ b/code/qcommon/script.cpp
@@ -181,7 +181,7 @@ void Script::MarkPosition(scriptmarker_t *mark)
     mark->tokenready = tokenready;
     mark->offset     = script_p - buffer;
     mark->line       = line;
-    strcpy(mark->token, token);
+    Q_strncpyz(mark->token, token, sizeof(mark->token));
 }
 
 /*
@@ -199,7 +199,7 @@ void Script::RestorePosition(const scriptmarker_t *mark)
     tokenready = mark->tokenready;
     script_p   = buffer + mark->offset;
     line       = mark->line;
-    strcpy(token, mark->token);
+    Q_strncpyz(token, mark->token, sizeof(token));
 
     assert(script_p <= end_p);
     if (script_p > end_p) {
@@ -660,7 +660,7 @@ const char *Script::GetMacroString(const char *theMacroName)
     }
 
     char tmpstr[255], *sptr = tmpstr;
-    strcpy(tmpstr, theMacroName);
+    Q_strncpyz(tmpstr, theMacroName, sizeof(tmpstr));
     tmpstr[strlen(tmpstr) - 1] = 0;
     sptr++;
 
@@ -741,7 +741,7 @@ char *Script::EvaluateMacroString(const char *theMacroString)
         bufferptr++;
     }
 
-    sprintf(evalText, "%f", value);
+    Com_sprintf(evalText, sizeof(evalText), "%f", value);
     return evalText;
 }
 
@@ -1076,7 +1076,7 @@ int Script::LinesInFile(void)
     temp_tokenready = tokenready;
     temp_script_p   = script_p;
     temp_line       = line;
-    strcpy(temp_token, token);
+    Q_strncpyz(temp_token, token, sizeof(temp_token));
 
     numentries = 0;
 
@@ -1089,7 +1089,7 @@ int Script::LinesInFile(void)
     tokenready = temp_tokenready;
     script_p   = temp_script_p;
     line       = temp_line;
-    strcpy(token, temp_token);
+    Q_strncpyz(token, temp_token, sizeof(token));
 
     return numentries;
 }
@@ -1131,6 +1131,10 @@ void Script::LoadFile(const char *name)
     Close();
 
     length = FILE_FS_ReadFile(name, (void **)&tempbuf);
+    if (length == -1) {
+        error("LoadFile", "Couldn't load %s\n", name);
+        return;
+    }
 
     hasError = false;
 
diff --git a/code/qcommon/short3.h b/code/qcommon/short3.h
index 33c80e0d..542850d4 100644
--- a/code/qcommon/short3.h
+++ b/code/qcommon/short3.h
@@ -39,8 +39,8 @@ private:
 	short3_data_t data;
 
 protected:
-	int				get() const { return *( int * )this & 0xFFFFFF; }
-	void			set( int value ) { data.highmid = value; data.low = *( ( unsigned char * )&value + 2 ); }
+	int				get() const { return data.highmid | (data.low << 16); }
+	void			set( int value ) { data.highmid = value & 0xFFFF; data.low = value >> 16; }
 
 public :
 	operator		int( void ) const { return get(); }
diff --git a/code/qcommon/str.cpp b/code/qcommon/str.cpp
index 8a1260b3..b37d2b2a 100644
--- a/code/qcommon/str.cpp
+++ b/code/qcommon/str.cpp
@@ -218,7 +218,7 @@ str operator+(const str& a, const float b)
 
     str result(a);
 
-    sprintf(text, "%f", b);
+    snprintf(text, sizeof(text), "%f", b);
     result.append(text);
 
     return result;
@@ -230,7 +230,7 @@ str operator+(const str& a, const int b)
 
     str result(a);
 
-    sprintf(text, "%d", b);
+    snprintf(text, sizeof(text), "%d", b);
     result.append(text);
 
     return result;
@@ -242,7 +242,7 @@ str operator+(const str& a, const unsigned b)
 
     str result(a);
 
-    sprintf(text, "%u", b);
+    snprintf(text, sizeof(text), "%u", b);
     result.append(text);
 
     return result;
@@ -252,7 +252,7 @@ str& str::operator+=(const float a)
 {
     char text[20];
 
-    sprintf(text, "%f", a);
+    snprintf(text, sizeof(text), "%f", a);
     append(text);
 
     return *this;
@@ -262,7 +262,7 @@ str& str::operator+=(const int a)
 {
     char text[20];
 
-    sprintf(text, "%d", a);
+    snprintf(text, sizeof(text), "%d", a);
     append(text);
 
     return *this;
@@ -272,7 +272,7 @@ str& str::operator+=(const unsigned a)
 {
     char text[20];
 
-    sprintf(text, "%u", a);
+    snprintf(text, sizeof(text), "%u", a);
     append(text);
 
     return *this;
@@ -536,11 +536,9 @@ void str::snprintf(char *dst, int size, const char *fmt, ...)
     va_list argptr;
 
     va_start(argptr, fmt);
-    len = vsprintf(buffer, fmt, argptr);
+    len = vsnprintf(buffer, sizeof(buffer), fmt, argptr);
     va_end(argptr);
 
-    assert(len < size);
-
     strncpy(dst, buffer, size - 1);
 }
 
@@ -633,7 +631,7 @@ void TestStringClass(void)
     str  b;         // b.len == 0, b.data == "\0"
     str  c("test"); // c.len == 4, c.data == "test\0"
     str  d(c);      // d.len == 4, d.data == "test\0"
-    str  e(reinterpret_cast<const char *>(NULL));
+    str  e(nullptr);
     // e.len == 0, e.data == "\0"					ASSERT!
     size_t i; // i == ?
 
@@ -655,14 +653,14 @@ void TestStringClass(void)
     a = NULL;      // a.len == 0, a.data == "\0"					ASSERT!
     a = c + d;     // a.len == 8, a.data == "testtest\0"
     a = c + "wow"; // a.len == 7, a.data == "testwow\0"
-    a = c + reinterpret_cast<const char *>(NULL);
+    a = c + nullptr;
     // a.len == 4, a.data == "test\0"			ASSERT!
     a = "this" + d; // a.len == 8, a.data == "thistest\0"
-    a = reinterpret_cast<const char *>(NULL) + d;
+    a = nullptr + d;
     // a.len == 4, a.data == "test\0"			ASSERT!
     a += c;     // a.len == 8, a.data == "testtest\0"
     a += "wow"; // a.len == 11, a.data == "testtestwow\0"
-    a += reinterpret_cast<const char *>(NULL);
+    a += nullptr;
     // a.len == 11, a.data == "testtestwow\0"	ASSERT!
 
     a  = "test";  // a.len == 4, a.data == "test\0"
diff --git a/code/qcommon/str.h b/code/qcommon/str.h
index 635eb69b..14f4ddcc 100644
--- a/code/qcommon/str.h
+++ b/code/qcommon/str.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -23,13 +23,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // str.cpp: Simple, DLL portable string class
 //
 
-#ifndef __STR_H__
-#define __STR_H__
+#pragma once
 
 #include <cassert>
 #include <cstring>
 #include <cstdio>
 #include <cstdint>
+#include <cinttypes>
 
 #ifdef _WIN32
 #    pragma warning(disable : 4710) // function 'blah' not inlined
@@ -90,7 +90,14 @@ public:
     str(const char ch);
     str(const int num);
     str(const float num);
-    str(const unsigned num);
+    str(const unsigned int num);
+    str(const long num);
+    str(const unsigned long num);
+    str(const long long num);
+    str(const unsigned long long num);
+
+    str(str&& string);
+    str& operator=(str&& string);
 
     size_t      length(void) const;
     const char *c_str(void) const;
@@ -289,7 +296,7 @@ inline str::str(const float num)
     char   text[32];
     size_t len;
 
-    sprintf(text, "%.3f", num);
+    snprintf(text, sizeof(text), "%.3f", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -302,20 +309,72 @@ inline str::str(const int num)
     char   text[32];
     size_t len;
 
-    sprintf(text, "%d", num);
+    snprintf(text, sizeof(text), "%d", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
     m_data->len = len;
 }
 
-inline str::str(const unsigned num)
+inline str::str(const unsigned int num)
     : m_data(NULL)
 {
     char   text[32];
     size_t len;
 
-    sprintf(text, "%u", num);
+    snprintf(text, sizeof(text), "%u", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    snprintf(text, sizeof(text), "%ld", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const unsigned long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    snprintf(text, sizeof(text), "%lu", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const long long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    snprintf(text, sizeof(text), "%lld", num);
+    len = strlen(text);
+    EnsureAlloced(len + 1);
+    strcpy(m_data->data, text);
+    m_data->len = len;
+}
+
+inline str::str(const unsigned long long num)
+    : m_data(NULL)
+{
+    char   text[64];
+    size_t len;
+
+    snprintf(text, sizeof(text), "%llu", num);
     len = strlen(text);
     EnsureAlloced(len + 1);
     strcpy(m_data->data, text);
@@ -331,6 +390,24 @@ inline const char *str::c_str(void) const
     }
 }
 
+inline str::str(str&& string)
+    : m_data(string.m_data)
+{
+    string.m_data = NULL;
+}
+
+inline str& str::operator=(str&& string)
+{
+    if (m_data) {
+        m_data->DelRef();
+    }
+
+    m_data        = string.m_data;
+    string.m_data = NULL;
+
+    return *this;
+}
+
 inline void str::append(const char *text)
 {
     size_t len;
@@ -349,14 +426,7 @@ inline void str::append(const char *text)
 
 inline void str::append(const str& text)
 {
-    size_t len;
-
-    len = length();
-    len += text.length();
-    EnsureAlloced(len + 1);
-
-    strcat(m_data->data, text.c_str());
-    m_data->len = len;
+    append(text.c_str());
 }
 
 inline char& str::operator[](intptr_t index)
@@ -541,39 +611,30 @@ inline bool operator!=(const char *a, const str& b)
 
 inline int str::icmpn(const char *text, size_t n) const
 {
-    assert(m_data);
     assert(text);
 
-    return str::icmpn(m_data->data, text, n);
+    return str::icmpn(c_str(), text, n);
 }
 
 inline int str::icmpn(const str& text, size_t n) const
 {
-    assert(m_data);
-    assert(text.m_data);
-
-    return str::icmpn(m_data->data, text.m_data->data, n);
+    return str::icmpn(c_str(), text.c_str(), n);
 }
 
 inline int str::icmp(const char *text) const
 {
-    assert(m_data);
     assert(text);
 
-    return str::icmp(m_data->data, text);
+    return str::icmp(c_str(), text);
 }
 
 inline int str::icmp(const str& text) const
 {
-    assert(c_str());
-    assert(text.c_str());
-
     return str::icmp(c_str(), text.c_str());
 }
 
 inline int str::cmpn(const char *text, size_t n) const
 {
-    assert(c_str());
     assert(text);
 
     return str::cmpn(c_str(), text, n);
@@ -581,16 +642,12 @@ inline int str::cmpn(const char *text, size_t n) const
 
 inline int str::cmpn(const str& text, size_t n) const
 {
-    assert(c_str());
-    assert(text.c_str());
-
     return str::cmpn(c_str(), text.c_str(), n);
 }
 
 inline void str::tolower(void)
 {
-    if (m_data)
-    {
+    if (m_data) {
         EnsureDataWritable();
 
         str::tolower(m_data->data);
@@ -599,8 +656,7 @@ inline void str::tolower(void)
 
 inline void str::toupper(void)
 {
-    if (m_data)
-    {
+    if (m_data) {
         EnsureDataWritable();
 
         str::toupper(m_data->data);
@@ -617,5 +673,3 @@ inline str::operator const char *(void) const
 {
     return c_str();
 }
-
-#endif
diff --git a/code/qcommon/surfaceflags.h b/code/qcommon/surfaceflags.h
index 575e494c..07cb1f3b 100644
--- a/code/qcommon/surfaceflags.h
+++ b/code/qcommon/surfaceflags.h
@@ -28,96 +28,94 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // these definitions also need to be in q_shared.h!
 // IneQuation was here
 
-#define	CONTENTS_SOLID			1		// an eye is never valid in a solid
-#define CONTENTS_LADDER			2
-#define	CONTENTS_LAVA			0x0008
-#define	CONTENTS_SLIME			0x0010
-#define	CONTENTS_WATER			0x0020
-#define CONTENTS_FLUID          (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA)
-#define	CONTENTS_FOG			0x0040
-#define	CONTENTS_CLAYPIDGEON	0x0080
+#define CONTENTS_SOLID       1 // an eye is never valid in a solid
+#define CONTENTS_LADDER      2
+#define CONTENTS_LAVA        0x0008
+#define CONTENTS_SLIME       0x0010
+#define CONTENTS_WATER       0x0020
+#define CONTENTS_FLUID       (CONTENTS_WATER | CONTENTS_SLIME | CONTENTS_LAVA)
+#define CONTENTS_FOG         0x0040
+#define CONTENTS_CLAYPIDGEON 0x0080
 
-#define CONTENTS_NOTTEAM1		0x0080
-#define CONTENTS_NOTTEAM2		0x0100
-#define CONTENTS_BBOX			0x0100
-#define CONTENTS_NOBOTCLIP		0x0200
-#define CONTENTS_UNKNOWN1		0x0400
-#define CONTENTS_UNKNOWN2		0x0800
+#define CONTENTS_NOTTEAM1    0x0080
+#define CONTENTS_NOTTEAM2    0x0100
+#define CONTENTS_BBOX        0x0100
+#define CONTENTS_NOBOTCLIP   0x0200
+#define CONTENTS_UNKNOWN1    0x0400
+#define CONTENTS_UNKNOWN2    0x0800
 
-#define CONTENTS_UNKNOWN3		0x1000
-#define CONTENTS_FENCE			0x2000
-#define CONTENTS_UNKNOWN4		0x4000
-#define	CONTENTS_AREAPORTAL		0x8000
+#define CONTENTS_UNKNOWN3    0x1000
+#define CONTENTS_FENCE       0x2000
+#define CONTENTS_UNKNOWN4    0x4000
+#define CONTENTS_AREAPORTAL  0x8000
 // su44: this is only for bspc .aas file compiler (bot navigation info)
 // I dont think its correct....
 #define CONTENTS_CLUSTERPORTAL CONTENTS_AREAPORTAL
 
-#define MASK_WOMBAT5				// su44: wtf is that?
+#define MASK_WOMBAT5           // su44: wtf is that?
 
-#define	CONTENTS_PLAYERCLIP		0x10000
-#define	CONTENTS_MONSTERCLIP	0x20000
-#define	CONTENTS_WEAPONCLIP		0x40000
-#define	CONTENTS_VEHICLECLIP	0x80000
-#define MASK_CLIP				(CONTENTS_PLAYERCLIP|CONTENTS_MONSTERCLIP|CONTENTS_WEAPONCLIP|CONTENTS_VEHICLECLIP)
+#define CONTENTS_PLAYERCLIP    0x10000
+#define CONTENTS_MONSTERCLIP   0x20000
+#define CONTENTS_WEAPONCLIP    0x40000
+#define CONTENTS_VEHICLECLIP   0x80000
+#define MASK_CLIP              (CONTENTS_PLAYERCLIP | CONTENTS_MONSTERCLIP | CONTENTS_WEAPONCLIP | CONTENTS_VEHICLECLIP)
 
-#define CONTENTS_SHOOTONLY		0x100000
-#define CONTENTS_DONOTENTER		0x200000
-#define CONTENTS_BOTCLIP		0x400000
-#define CONTENTS_MOVER			0x800000
-#define MASK_WOMBAT1			(CONTENTS_SHOOTONLY|CONTENTS_DONOTENTER|CONTENTS_BOTCLIP|CONTENTS_MOVER)
+#define CONTENTS_SHOOTONLY     0x100000
+#define CONTENTS_DONOTENTER    0x200000
+#define CONTENTS_BOTCLIP       0x400000
+#define CONTENTS_MOVER         0x800000
+#define MASK_WOMBAT1           (CONTENTS_SHOOTONLY | CONTENTS_DONOTENTER | CONTENTS_BOTCLIP | CONTENTS_MOVER)
 
-#define	CONTENTS_ORIGIN			0x1000000	// removed before bsping an entity
-#define	CONTENTS_BODY			0x2000000	// should never be on a brush, only in game
-#define	CONTENTS_CORPSE			0x4000000
-#define	CONTENTS_DETAIL			0x8000000	// brushes not used for the bsp
-#define MASK_WOMBAT2			(CONTENTS_ORIGIN|CONTENTS_BODY|CONTENTS_CORPSE|CONTENTS_DETAIL)
+#define CONTENTS_ORIGIN        0x1000000 // removed before bsping an entity
+#define CONTENTS_BODY          0x2000000 // should never be on a brush, only in game
+#define CONTENTS_CORPSE        0x4000000
+#define CONTENTS_DETAIL        0x8000000 // brushes not used for the bsp
+#define MASK_WOMBAT2           (CONTENTS_ORIGIN | CONTENTS_BODY | CONTENTS_CORPSE | CONTENTS_DETAIL)
 
-#define	CONTENTS_STRUCTURAL		0x10000000	// brushes used for the bsp
-#define	CONTENTS_TRANSLUCENT	0x20000000	// don't consume surface fragments inside
-#define	CONTENTS_TRIGGER		0x40000000
-#define	CONTENTS_NODROP			0x80000000	// don't leave bodies or items (death fog, lava)
+#define CONTENTS_STRUCTURAL    0x10000000 // brushes used for the bsp
+#define CONTENTS_TRANSLUCENT   0x20000000 // don't consume surface fragments inside
+#define CONTENTS_TRIGGER       0x40000000
+#define CONTENTS_NODROP        0x80000000 // don't leave bodies or items (death fog, lava)
 
-#define MASK_FOOTSTEP			0x42022901
-#define MASK_TREADMARK			0x42012B01
-#define MASK_WOMBAT				(MASK_WOMBAT2|MASK_WOMBAT1|MASK_CLIP|MASK_WOMBAT5)
+#define SURF_NODAMAGE          0x1 // never give falling damage
+#define SURF_SLICK             0x2 // effects game physics
+#define SURF_SKY               0x4 // lighting from environment map
+#define SURF_LADDER            0x8
+#define SURF_NOIMPACT          0x10 // don't make missile explosions
+#define SURF_NOMARKS           0x20 // don't leave missile marks
+#define SURF_CASTSHADOW        0x40
+#define SURF_NODRAW            0x80  // don't generate a drawsurface at all
+#define SURF_NOLIGHTMAP        0x100 // surface doesn't need a lightmap
+#define SURF_ALPHASHADOW       0x200 // do per-pixel light shadow casting in q3map
+#define SURF_NOSTEPS           0x400 // no footstep sounds
+#define SURF_NONSOLID          0x800 // don't collide against curves with this set
+#define SURF_OVERBRIGHT        0x1000
+#define SURF_PAPER             0x2000     // paper effects
+#define SURF_WOOD              0x4000     // wood effects
+#define SURF_METAL             0x8000     // metal effects
+#define SURF_ROCK              0x10000    // rock effects
+#define SURF_DIRT              0x20000    // dirt effects
+#define SURF_GRILL             0x40000    // metal grill (grate)
+#define SURF_GRASS             0x80000    // grass effects
+#define SURF_MUD               0x100000   // mud effects
+#define SURF_PUDDLE            0x200000   // puddle effects
+#define SURF_GLASS             0x400000   // glass effects
+#define SURF_GRAVEL            0x800000   // gravel effects
+#define SURF_SAND              0x1000000  // sand effects
+#define SURF_FOLIAGE           0x2000000  // foliage effects
+#define SURF_SNOW              0x4000000  // snow effects
+#define SURF_CARPET            0x8000000  // carpet effects
+#define SURF_BACKSIDE          0x10000000 // su44: backside
+#define SURF_NODLIGHT          0x20000000 // don't dlight even if solid (solid lava, skies)
+#define SURF_HINT              0x40000000 // make a primary bsp splitter
+#define SURF_PATCH             0x80000000
 
-#define	SURF_NODAMAGE			0x1		// never give falling damage
-#define	SURF_SLICK				0x2		// effects game physics
-#define	SURF_SKY				0x4		// lighting from environment map
-#define	SURF_LADDER				0x8
-#define	SURF_NOIMPACT			0x10	// don't make missile explosions
-#define	SURF_NOMARKS			0x20	// don't leave missile marks
-#define	SURF_CASTSHADOW			0x40
-#define	SURF_NODRAW				0x80	// don't generate a drawsurface at all
-#define SURF_NOLIGHTMAP			0x100	// surface doesn't need a lightmap
-#define	SURF_ALPHASHADOW		0x200	// do per-pixel light shadow casting in q3map
-#define	SURF_NOSTEPS			0x400	// no footstep sounds
-#define	SURF_NONSOLID			0x800	// don't collide against curves with this set
-#define	SURF_UNKNOWN1			0x1000	// IneQuation: WTF?
-#define	SURF_PAPER				0x2000	// paper effects
-#define	SURF_WOOD				0x4000	// wood effects
-#define	SURF_METAL				0x8000	// metal effects
-#define	SURF_ROCK				0x10000	// rock effects
-#define	SURF_DIRT				0x20000	// dirt effects
-#define SURF_GRILL				0x40000 // metal grill (grate)
-#define SURF_GRASS				0x80000	// grass effects
-#define SURF_MUD				0x100000	// mud effects
-#define SURF_PUDDLE				0x200000	// puddle effects
-#define SURF_GLASS				0x400000	// glass effects
-#define SURF_GRAVEL				0x800000	// gravel effects
-#define SURF_SAND				0x1000000	// sand effects
-#define SURF_FOLIAGE			0x2000000	// foliage effects
-#define SURF_SNOW				0x4000000	// snow effects
-#define SURF_CARPET				0x8000000	// carpet effects
-#define SURF_BACKSIDE			0x10000000	// su44: backside
-#define SURF_NODLIGHT			0x20000000	// don't dlight even if solid (solid lava, skies)
-#define	SURF_HINT				0x40000000	// make a primary bsp splitter
-#define SURF_UNKNOWN3			0x80000000	// IneQuation: WTF?
+#define SURF_FLESH             0x40    // make flesh sounds and effects
+#define SURF_POINTLIGHT        0x800   // generate lighting info at vertexes
+#define SURF_METALSTEPS        0x1000  // clanking footsteps
+#define SURF_LIGHTFILTER       0x8000  // act as a light filter during q3map -light
+#define SURF_DUST              0x40000 // leave a dust trail when walking on this surface
 
-#define	SURF_FLESH				0x40	// make flesh sounds and effects
-#define	SURF_POINTLIGHT			0x800	// generate lighting info at vertexes
-#define	SURF_METALSTEPS			0x1000	// clanking footsteps
-#define	SURF_LIGHTFILTER		0x8000	// act as a light filter during q3map -light
-#define SURF_DUST				0x40000 // leave a dust trail when walking on this surface
-
-#define MASK_SURF_TYPE        (SURF_PAPER|SURF_WOOD|SURF_METAL|SURF_ROCK|SURF_DIRT|SURF_GRILL|SURF_GRASS|SURF_MUD|SURF_PUDDLE|SURF_GLASS|SURF_GRAVEL|SURF_SAND|SURF_FOLIAGE|SURF_SNOW|SURF_CARPET)
+#define MASK_SURF_TYPE                                                                                              \
+    (SURF_PAPER | SURF_WOOD | SURF_METAL | SURF_ROCK | SURF_DIRT | SURF_GRILL | SURF_GRASS | SURF_MUD | SURF_PUDDLE \
+     | SURF_GLASS | SURF_GRAVEL | SURF_SAND | SURF_FOLIAGE | SURF_SNOW | SURF_CARPET)
diff --git a/code/qcommon/tiki.h b/code/qcommon/tiki.h
index 2f3dcab9..194e9b13 100644
--- a/code/qcommon/tiki.h
+++ b/code/qcommon/tiki.h
@@ -1,7 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2008 Leszek Godlewski
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __TIKI_H__
-#define __TIKI_H__
+#pragma once
 
 #include "q_shared.h"
 
@@ -30,86 +28,99 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef __cplusplus
 class Archiver;
-#include "../qcommon/mem_blockalloc.h"
-#include "../qcommon/con_set.h"
-#include "../qcommon/str.h"
+#    include "../qcommon/mem_blockalloc.h"
+#    include "../qcommon/con_set.h"
+#    include "../qcommon/str.h"
 #endif
 
-typedef struct AliasList_s AliasList_t;
+#define MAX_TIKI_LOAD_ANIMS                 4095
+#define MAX_TIKI_LOAD_SKEL_INDEX            12
+#define MAX_TIKI_LOAD_SERVER_INIT_COMMANDS  160
+#define MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS  180 // 2.30: Increased from 160 to 180
+#define MAX_TIKI_LOAD_HEADMODELS_LENGTH     4096
+#define MAX_TIKI_LOAD_HEADSKINS_LENGTH      4096
+#define MAX_TIKI_LOAD_MODEL_BUFFER          8192
+
+#define MAX_TIKI_LOAD_FRAME_SERVER_COMMANDS 32
+#define MAX_TIKI_LOAD_FRAME_CLIENT_COMMANDS 128
+
+#define MAX_TIKI_LOAD_SHADERS               4
+
+typedef struct AliasList_s     AliasList_t;
 typedef struct AliasListNode_s AliasListNode_t;
-typedef struct msg_s msg_t;
+typedef struct msg_s           msg_t;
 
 typedef struct {
-	int indexes[ 3 ];
+    int indexes[3];
 } tikiTriangle_t;
 
 typedef struct {
-	float st[ 2 ];
+    vec2_t st;
 } tikiSt_t;
 
 typedef struct {
-	short unsigned int xyz[ 3 ];
-	short int normal;
+    short unsigned int xyz[3];
+    short int          normal;
 } tikiXyzNormal_t;
 
 typedef struct {
-	float origin[ 3 ];
-	float axis[ 3 ][ 3 ];
+    vec3_t origin;
+    vec3_t axis[3];
 } tikiTagData_t;
 
 typedef struct {
-	char name[ 64 ];
+    char name[64];
 } tikiTag_t;
 
 typedef struct {
-	qboolean valid;
-	int surface;
-	vec3_t position;
-	vec3_t normal;
-	float damage_multiplier;
+    qboolean valid;
+    int      surface;
+    vec3_t   position;
+    vec3_t   normal;
+    float    damage_multiplier;
 } tikimdl_intersection_t;
 
 typedef struct {
-	int indexes[ 3 ];
+    int indexes[3];
 } skelTriangle_t;
 
 typedef struct dtikicmd_s {
-	int frame_num;
-	int num_args;
-	char **args;
+    int    frame_num;
+    int    num_args;
+    char **args;
 } dtikicmd_t;
 
 typedef struct {
-	int frame_num;
-	int num_args;
-	char **args;
-	char location[ 256 ];
+    int    frame_num;
+    int    num_args;
+    char **args;
+    char   location[MAX_QPATH];
 } dloadframecmd_t;
 
 typedef struct {
-	int num_args;
-	char **args;
+    int    num_args;
+    char **args;
 } dloadinitcmd_t;
 
 typedef struct {
-	char name[ 32 ];
-	char shader[ 4 ][ 64 ];
-	int numskins;
-	int flags;
-	float damage_multiplier;
+    char  name[MAX_NAME_LENGTH];
+    char  shader[MAX_TIKI_LOAD_SHADERS][MAX_RES_NAME];
+    int   numskins;
+    int   flags;
+    float damage_multiplier;
 } dloadsurface_t;
 
 typedef struct {
-	char *alias;
-	char name[ 128 ];
-	char location[ 256 ];
-	float weight;
-	float blendtime;
-	int flags;
-	int num_client_cmds;
-	int num_server_cmds;
-	dloadframecmd_t *loadservercmds[ 32 ];
-	dloadframecmd_t *loadclientcmds[ 128 ];
+    char            *alias;
+    char             name[MAX_QPATH];
+    char             location[MAX_QPATH];
+    float            weight;
+    float            blendtime;
+    int              flags;
+    int              num_client_cmds;
+    int              num_server_cmds;
+    dloadframecmd_t *loadservercmds[MAX_TIKI_LOAD_FRAME_SERVER_COMMANDS];
+    dloadframecmd_t *loadclientcmds[MAX_TIKI_LOAD_FRAME_CLIENT_COMMANDS];
 } dloadanim_t;
 
 typedef struct dloaddef_s dloaddef_t;
@@ -119,26 +130,33 @@ typedef struct dloaddef_s dloaddef_t;
 #ifdef __cplusplus
 
 typedef struct dloaddef_s {
-	const char			*path;
-	class TikiScript	tikiFile;
+    const char      *path;
+    class TikiScript tikiFile;
 
-	dloadanim_t			*loadanims[ 4095 ];
-	dloadinitcmd_t		*loadserverinitcmds[ 160 ];
-	dloadinitcmd_t		*loadclientinitcmds[ 160 ];
+    dloadanim_t    *loadanims[MAX_TIKI_LOAD_ANIMS];
+    dloadinitcmd_t *loadserverinitcmds[MAX_TIKI_LOAD_SERVER_INIT_COMMANDS];
+    dloadinitcmd_t *loadclientinitcmds[MAX_TIKI_LOAD_CLIENT_INIT_COMMANDS];
 
-	int		skelIndex_ld[ 12 ];
-	int		numanims;
-	int		numserverinitcmds;
-	int		numclientinitcmds;
+    int skelIndex_ld[MAX_TIKI_LOAD_SKEL_INDEX];
+    int numanims;
+    int numserverinitcmds;
+    int numclientinitcmds;
 
-	char		headmodels[ 4096 ];
-	char		headskins[ 4096 ];
-	qboolean	bIsCharacter;
+    char     headmodels[MAX_TIKI_LOAD_HEADMODELS_LENGTH];
+    char     headskins[MAX_TIKI_LOAD_HEADSKINS_LENGTH];
+    qboolean bIsCharacter;
 
-	struct msg_s	*modelBuf;
-	unsigned char	modelData[ 8192 ];
+    struct msg_s *modelBuf;
+    unsigned char modelData[MAX_TIKI_LOAD_MODEL_BUFFER];
 
-	qboolean bInIncludesSection;
+    qboolean bInIncludesSection;
+
+    // Added in 2.0
+    //====
+    char     idleSkel[MAX_QPATH];
+    int      numskels;
+    qboolean hasSkel;
+    //====
 } dloaddef_t;
 
 #endif
@@ -158,5 +176,3 @@ typedef struct dloaddef_s {
 #include "../tiki/tiki_frame.h"
 #include "../tiki/tiki_surface.h"
 #include "../tiki/tiki_mesh.h"
-
-#endif // __TIKI_H__
diff --git a/code/qcommon/tiki_main.cpp b/code/qcommon/tiki_main.cpp
index feeaaa53..f7589a57 100644
--- a/code/qcommon/tiki_main.cpp
+++ b/code/qcommon/tiki_main.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,34 +27,31 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tiki.h"
 #include "../tiki/tiki_shared.h"
 
-int cache_numskel = 0;
-int cache_maxskel = 0;
-skelcache_t skelcache[ TIKI_MAX_SKELCACHE ];
+int         cache_numskel = 0;
+int         cache_maxskel = 0;
+skelcache_t skelcache[TIKI_MAX_SKELCACHE];
 
 /*
 ===============
 TIKI_AddPointToBounds
 ===============
 */
-void TIKI_AddPointToBounds( float *v, float *mins, float *maxs )
+void TIKI_AddPointToBounds(float *v, float *mins, float *maxs)
 {
-	int i;
-	vec_t val;
+    int   i;
+    vec_t val;
 
-	for( i = 0; i < 3; i++ )
-	{
-		val = v[ i ];
+    for (i = 0; i < 3; i++) {
+        val = v[i];
 
-		if( val < mins[ i ] )
-		{
-			mins[ i ] = val;
-		}
+        if (val < mins[i]) {
+            mins[i] = val;
+        }
 
-		if( val > maxs[ i ] )
-		{
-			maxs[ i ] = val;
-		}
-	}
+        if (val > maxs[i]) {
+            maxs[i] = val;
+        }
+    }
 }
 
 /*
@@ -62,15 +59,15 @@ void TIKI_AddPointToBounds( float *v, float *mins, float *maxs )
 TIKI_Message
 ===============
 */
-void TIKI_Message( const char *fmt, ... )
+void TIKI_Message(const char *fmt, ...)
 {
-	char msg[ 1024 ];
-	va_list va;
+    char    msg[1024];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -78,15 +75,15 @@ void TIKI_Message( const char *fmt, ... )
 TIKI_Warning
 ===============
 */
-void TIKI_Warning( const char *fmt, ... )
+void TIKI_Warning(const char *fmt, ...)
 {
-	char msg[ 1024 ];
-	va_list va;
+    char    msg[1024];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -94,15 +91,15 @@ void TIKI_Warning( const char *fmt, ... )
 TIKI_Error
 ===============
 */
-void TIKI_Error( const char *fmt, ... )
+void TIKI_Error(const char *fmt, ...)
 {
-	char msg[ 1024 ];
-	va_list va;
+    char    msg[1024];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    TIKI_DPrintf(msg);
 }
 
 /*
@@ -110,27 +107,25 @@ void TIKI_Error( const char *fmt, ... )
 TIKI_SetupIndividualSurface
 ===============
 */
-void TIKI_SetupIndividualSurface( const char *filename, dtikisurface_t *surf, const char *name, dloadsurface_t *loadsurf )
+void TIKI_SetupIndividualSurface(const char *filename, dtikisurface_t *surf, const char *name, dloadsurface_t *loadsurf)
 {
-	int j;
+    int j;
 
-	surf->numskins = 0;
-	for( j = 0; j < loadsurf->numskins; j++ )
-	{
-		if( surf->numskins >= MAX_TIKI_SHADER )
-		{
-			TIKI_Error( "TIKI_SetupIndividualSurface: Too many skins defined for surface %s in %s.\n", loadsurf->name, filename );
-		}
-		else
-		{
-			strncpy( surf->name, name, sizeof( surf->name ) );
-			strncpy( surf->shader[ surf->numskins ], loadsurf->shader[ j ], sizeof( surf->shader[ surf->numskins ] ) );
-			surf->numskins++;
-		}
-	}
+    surf->numskins = 0;
+    for (j = 0; j < loadsurf->numskins; j++) {
+        if (surf->numskins >= MAX_TIKI_SHADER) {
+            TIKI_Error(
+                "TIKI_SetupIndividualSurface: Too many skins defined for surface %s in %s.\n", loadsurf->name, filename
+            );
+        } else {
+            strncpy(surf->name, name, sizeof(surf->name));
+            strncpy(surf->shader[surf->numskins], loadsurf->shader[j], sizeof(surf->shader[surf->numskins]));
+            surf->numskins++;
+        }
+    }
 
-	surf->flags = loadsurf->flags;
-	surf->damage_multiplier = loadsurf->damage_multiplier;
+    surf->flags             = loadsurf->flags;
+    surf->damage_multiplier = loadsurf->damage_multiplier;
 }
 
 /*
@@ -138,83 +133,74 @@ void TIKI_SetupIndividualSurface( const char *filename, dtikisurface_t *surf, co
 TIKI_CalcAnimDefSize
 ===============
 */
-size_t TIKI_CalcAnimDefSize(dloaddef_t* ld)
+size_t TIKI_CalcAnimDefSize(dloaddef_t *ld)
 {
-	int i, j, k;
+    int i, j, k;
 
-	// initial cmds
-	size_t defsize = 0;
-	// other animations
-	defsize += sizeof(dtikianimdef_t) * ld->numanims;
-	defsize += ld->numclientinitcmds * sizeof(dtikicmd_t);
-	defsize += ld->numserverinitcmds * sizeof(dtikicmd_t);
+    // initial cmds
+    size_t defsize = 0;
+    // other animations
+    defsize += sizeof(dtikianimdef_t) * ld->numanims;
+    defsize += ld->numclientinitcmds * sizeof(dtikicmd_t);
+    defsize += ld->numserverinitcmds * sizeof(dtikicmd_t);
 
-	for (i = 0; i < ld->numserverinitcmds; i++)
-	{
-		const dloadinitcmd_t* initcmd = ld->loadserverinitcmds[i];
-		defsize += sizeof(*initcmd->args) * initcmd->num_args;
+    for (i = 0; i < ld->numserverinitcmds; i++) {
+        const dloadinitcmd_t *initcmd = ld->loadserverinitcmds[i];
+        defsize += sizeof(*initcmd->args) * initcmd->num_args;
 
-		for (j = 0; j < initcmd->num_args; j++)
-		{
-			defsize += strlen(initcmd->args[j]) + 1;
-		}
+        for (j = 0; j < initcmd->num_args; j++) {
+            defsize += strlen(initcmd->args[j]) + 1;
+        }
 
-		defsize = PAD(defsize, sizeof(void*));
-	}
+        defsize = PAD(defsize, sizeof(void *));
+    }
 
-	for (i = 0; i < ld->numclientinitcmds; i++)
-	{
-		const dloadinitcmd_t* initcmd = ld->loadclientinitcmds[i];
-		defsize += sizeof(*initcmd->args) * initcmd->num_args;
+    for (i = 0; i < ld->numclientinitcmds; i++) {
+        const dloadinitcmd_t *initcmd = ld->loadclientinitcmds[i];
+        defsize += sizeof(*initcmd->args) * initcmd->num_args;
 
-		for (j = 0; j < initcmd->num_args; j++)
-		{
-			defsize += strlen(initcmd->args[j]) + 1;
-		}
+        for (j = 0; j < initcmd->num_args; j++) {
+            defsize += strlen(initcmd->args[j]) + 1;
+        }
 
-		defsize = PAD(defsize, sizeof(void*));
-	}
+        defsize = PAD(defsize, sizeof(void *));
+    }
 
-	for (i = 0; i < ld->numanims; i++)
-	{
-		const dloadanim_t* loadanim = ld->loadanims[i];
+    for (i = 0; i < ld->numanims; i++) {
+        const dloadanim_t *loadanim = ld->loadanims[i];
 
-		defsize += sizeof(dtikianimdef_t);
-		defsize += loadanim->num_server_cmds * sizeof(dtikicmd_t);
-		defsize += loadanim->num_client_cmds * sizeof(dtikianimdef_t);
+        defsize += sizeof(dtikianimdef_t);
+        defsize += loadanim->num_server_cmds * sizeof(dtikicmd_t);
+        defsize += loadanim->num_client_cmds * sizeof(dtikianimdef_t);
 
-		for (j = 0; j < loadanim->num_server_cmds; j++)
-		{
-			const dloadframecmd_t* loadframecmd = loadanim->loadservercmds[j];
-			defsize += sizeof(*loadframecmd->args) * loadframecmd->num_args;
+        for (j = 0; j < loadanim->num_server_cmds; j++) {
+            const dloadframecmd_t *loadframecmd = loadanim->loadservercmds[j];
+            defsize += sizeof(*loadframecmd->args) * loadframecmd->num_args;
 
-			for (k = 0; k < loadframecmd->num_args; k++)
-			{
-				defsize += strlen(loadframecmd->args[k]) + 1;
-			}
+            for (k = 0; k < loadframecmd->num_args; k++) {
+                defsize += strlen(loadframecmd->args[k]) + 1;
+            }
 
-			defsize = PAD(defsize, sizeof(void*));
-		}
+            defsize = PAD(defsize, sizeof(void *));
+        }
 
-		for (j = 0; j < loadanim->num_client_cmds; j++)
-		{
-			const dloadframecmd_t* loadframecmd = loadanim->loadclientcmds[j];
-			defsize += sizeof(*loadframecmd->args) * loadframecmd->num_args;
+        for (j = 0; j < loadanim->num_client_cmds; j++) {
+            const dloadframecmd_t *loadframecmd = loadanim->loadclientcmds[j];
+            defsize += sizeof(*loadframecmd->args) * loadframecmd->num_args;
 
-			for (k = 0; k < loadframecmd->num_args; k++)
-			{
-				defsize += strlen(loadframecmd->args[k]) + 1;
-			}
+            for (k = 0; k < loadframecmd->num_args; k++) {
+                defsize += strlen(loadframecmd->args[k]) + 1;
+            }
 
-			defsize = PAD(defsize, sizeof(void*));
-		}
+            defsize = PAD(defsize, sizeof(void *));
+        }
 
-		defsize = PAD(defsize, sizeof(void*));
-	}
+        defsize = PAD(defsize, sizeof(void *));
+    }
 
-	defsize += ld->modelBuf->cursize + strlen(ld->headmodels) + 1 + strlen(ld->headskins) + 1;
-	defsize = PAD(defsize, sizeof(void*));
-	return defsize;
+    defsize += ld->modelBuf->cursize + strlen(ld->headmodels) + 1 + strlen(ld->headskins) + 1;
+    defsize = PAD(defsize, sizeof(void *));
+    return defsize;
 }
 
 /*
@@ -222,15 +208,201 @@ size_t TIKI_CalcAnimDefSize(dloaddef_t* ld)
 TIKI_FillTIKIStructureSkel
 ===============
 */
-dtikianim_t *TIKI_FillTIKIStructureSkel( dloaddef_t *ld )
+dtikianim_t *TIKI_FillTIKIStructureSkel(dloaddef_t *ld)
 {
-	size_t animdefsize;
-	size_t defsize;
+    size_t animdefsize;
+    size_t defsize;
 
-	animdefsize = TIKI_CalcAnimDefSize(ld);
-	defsize = sizeof(dtikianim_t);
-	// anim name
-	defsize += strlen(ld->path) + 1;
+    animdefsize = TIKI_CalcAnimDefSize(ld);
+    defsize     = sizeof(dtikianim_t);
+    // anim name
+    defsize += strlen(ld->path) + 1;
 
-	return TIKI_InitTiki(ld, PAD(animdefsize + defsize, sizeof(void*)));
+    return TIKI_InitTiki(ld, PAD(animdefsize + defsize, sizeof(void *)));
+}
+
+/*
+===============
+TIKI_SwapSkel
+
+Swap the skeleton header on Big-Endian systems
+===============
+*/
+void TIKI_SwapSkel(skelHeader_t *pheader)
+{
+#ifdef Q3_BIG_ENDIAN
+    skelSurface_t *pSurf;
+    int            i, j, k;
+
+    //pheader->ident = LittleLong(pheader->ident);
+    pheader->version     = LittleLong(pheader->version);
+    pheader->numSurfaces = LittleLong(pheader->numSurfaces);
+    pheader->numBones    = LittleLong(pheader->numBones);
+    pheader->ofsBones    = LittleLong(pheader->ofsBones);
+    pheader->ofsSurfaces = LittleLong(pheader->ofsSurfaces);
+    pheader->ofsEnd      = LittleLong(pheader->ofsEnd);
+
+    if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+        for (i = 0; i < TIKI_SKEL_LOD_INDEXES; i++) {
+            pheader->lodIndex[i] = LittleLong(pheader->lodIndex[i]);
+        }
+
+        pheader->numBoxes = LittleLong(pheader->numBoxes);
+        pheader->ofsBoxes = LittleLong(pheader->ofsBoxes);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+        pheader->numMorphTargets = LittleLong(pheader->numMorphTargets);
+        pheader->ofsMorphTargets = LittleLong(pheader->ofsMorphTargets);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_VERSION) {
+        pheader->scale = LittleFloat(pheader->scale);
+    }
+
+    if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+        boneFileData_t *boneBuffer;
+
+        boneBuffer = (boneFileData_t *)((byte *)pheader + pheader->ofsBones);
+        for (i = 0; i < pheader->numBones; i++) {
+            boneBuffer->boneType        = (boneType_t)LittleLong(boneBuffer->boneType);
+            boneBuffer->ofsBaseData     = LittleLong(boneBuffer->ofsBaseData);
+            boneBuffer->ofsChannelNames = LittleLong(boneBuffer->ofsChannelNames);
+            boneBuffer->ofsBoneNames    = LittleLong(boneBuffer->ofsBoneNames);
+            boneBuffer->ofsEnd          = LittleLong(boneBuffer->ofsEnd);
+
+            boneBuffer = (boneFileData_t *)((byte *)boneBuffer + boneBuffer->ofsEnd);
+        }
+    } else {
+        skelBoneName_t *TIKI_bones;
+
+        TIKI_bones = (skelBoneName_t *)((byte *)pheader + pheader->ofsBones);
+
+        for (i = 0; i < pheader->numBones; i++) {
+            TIKI_bones->parent   = LittleShort(TIKI_bones->parent);
+            TIKI_bones->boxIndex = LittleShort(TIKI_bones->boxIndex);
+            TIKI_bones->flags    = LittleLong(TIKI_bones->flags);
+
+            TIKI_bones++;
+        }
+    }
+
+    pSurf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        skeletorMorph_t *pMorph;
+        skelWeight_t    *pWeight;
+        int             *pTriangles;
+        int             *pCollapse, *pCollapseIndex;
+        int              numVerts, numTriangles;
+
+        CopyLittleLong(&pSurf->ident, &pSurf->ident);
+        CopyLittleLong(&pSurf->numTriangles, &pSurf->numTriangles);
+        CopyLittleLong(&pSurf->numVerts, &pSurf->numVerts);
+        CopyLittleLong(&pSurf->staticSurfProcessed, &pSurf->staticSurfProcessed);
+        CopyLittleLong(&pSurf->ofsTriangles, &pSurf->ofsTriangles);
+        CopyLittleLong(&pSurf->ofsVerts, &pSurf->ofsVerts);
+        CopyLittleLong(&pSurf->ofsCollapse, &pSurf->ofsCollapse);
+        CopyLittleLong(&pSurf->ofsEnd, &pSurf->ofsEnd);
+
+        numVerts     = LongNoSwapPtr(&pSurf->numVerts);
+        numTriangles = LongNoSwapPtr(&pSurf->numTriangles);
+
+        if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+            CopyLittleLong(&pSurf->ofsCollapseIndex, &pSurf->ofsCollapseIndex);
+        }
+
+        pTriangles = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
+        for (j = 0; j < numTriangles; j++) {
+            CopyLittleLong(&pTriangles[j * 3 + 0], &pTriangles[j * 3 + 0]);
+            CopyLittleLong(&pTriangles[j * 3 + 1], &pTriangles[j * 3 + 1]);
+            CopyLittleLong(&pTriangles[j * 3 + 2], &pTriangles[j * 3 + 2]);
+        }
+
+        if (pheader->version >= TIKI_SKD_HEADER_OLD_VERSION) {
+            skeletorVertex_t *pVert = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
+
+            for (j = 0; j < numVerts; j++) {
+                int numMorphs, numWeights;
+
+                CopyLittleLong(&pVert->normal[0], &pVert->normal[0]);
+                CopyLittleLong(&pVert->normal[1], &pVert->normal[1]);
+                CopyLittleLong(&pVert->normal[2], &pVert->normal[2]);
+                CopyLittleLong(&pVert->texCoords[0], &pVert->texCoords[0]);
+                CopyLittleLong(&pVert->texCoords[1], &pVert->texCoords[1]);
+
+                numMorphs = LittleLong(pVert->numMorphs);
+                memcpy(&pVert->numMorphs, &numMorphs, sizeof(pVert->numMorphs));
+
+                pMorph = (skeletorMorph_t *)((byte *)pVert + sizeof(*pVert));
+
+                for (k = 0; k < numMorphs; k++, pMorph++) {
+                    int    morphIndex;
+                    vec3_t offset;
+
+                    CopyLittleLong(&pMorph->morphIndex, &pMorph->morphIndex);
+                    CopyLittleLong(&pMorph->offset[0], &pMorph->offset[0]);
+                    CopyLittleLong(&pMorph->offset[1], &pMorph->offset[1]);
+                    CopyLittleLong(&pMorph->offset[2], &pMorph->offset[2]);
+                }
+
+                numWeights = LittleLong(pVert->numWeights);
+                memcpy(&pVert->numWeights, &numWeights, sizeof(pVert->numWeights));
+
+                pWeight = (skelWeight_t *)pMorph;
+
+                for (k = 0; k < numWeights; k++, pWeight++) {
+                    CopyLittleLong(&pWeight->boneIndex, &pWeight->boneIndex);
+                    CopyLittleLong(&pWeight->boneWeight, &pWeight->boneWeight);
+                    CopyLittleLong(&pWeight->offset[0], &pWeight->offset[0]);
+                    CopyLittleLong(&pWeight->offset[1], &pWeight->offset[1]);
+                    CopyLittleLong(&pWeight->offset[2], &pWeight->offset[2]);
+                }
+
+                pVert = (skeletorVertex_t *)pWeight;
+            }
+        } else {
+            skelVertex_t *pVert = (skelVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
+
+            for (j = 0; j < numVerts; j++) {
+                vec3_t normal, texCoords;
+                int    numWeights;
+
+                CopyLittleLong(&pVert->normal[0], &pVert->normal[0]);
+                CopyLittleLong(&pVert->normal[1], &pVert->normal[1]);
+                CopyLittleLong(&pVert->normal[2], &pVert->normal[2]);
+                CopyLittleLong(&pVert->texCoords[0], &pVert->texCoords[0]);
+                CopyLittleLong(&pVert->texCoords[1], &pVert->texCoords[1]);
+
+                numWeights = LittleLong(pVert->numWeights);
+                memcpy(&pVert->numWeights, &numWeights, sizeof(pVert->numWeights));
+
+                pWeight = pVert->weights;
+
+                for (k = 0; k < numWeights; k++, pWeight++) {
+                    CopyLittleLong(&pWeight->boneIndex, &pWeight->boneIndex);
+                    CopyLittleLong(&pWeight->boneWeight, &pWeight->boneWeight);
+                    CopyLittleLong(&pWeight->offset[0], &pWeight->offset[0]);
+                    CopyLittleLong(&pWeight->offset[1], &pWeight->offset[1]);
+                    CopyLittleLong(&pWeight->offset[2], &pWeight->offset[2]);
+                }
+
+                pVert = (skelVertex_t *)pWeight;
+            }
+        }
+
+        pCollapse = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapse));
+        for (j = 0; j < numVerts; j++) {
+            CopyLittleLong(&pCollapse[j], &pCollapse[j]);
+        }
+
+        if (pheader->version >= TIKI_SKB_HEADER_VERSION) {
+            pCollapseIndex = (int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapseIndex));
+            for (j = 0; j < numVerts; j++) {
+                CopyLittleLong(&pCollapseIndex[j], &pCollapseIndex[j]);
+            }
+        }
+
+        pSurf = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
+    }
+#endif
 }
diff --git a/code/qcommon/tiki_main.h b/code/qcommon/tiki_main.h
index c367ba31..7230dad7 100644
--- a/code/qcommon/tiki_main.h
+++ b/code/qcommon/tiki_main.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,27 +22,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_main.h : TIKI main
 
-#ifndef __TIKI_MAIN_H__
-#define __TIKI_MAIN_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern int cache_numskel;
-extern int cache_maxskel;
-extern skelcache_t skelcache[];
+    extern int         cache_numskel;
+    extern int         cache_maxskel;
+    extern skelcache_t skelcache[];
 
-void TIKI_AddPointToBounds( float *v, float *mins, float *maxs );
-void TIKI_Message( const char *fmt, ... );
-void TIKI_Warning( const char *fmt, ... );
-void TIKI_Error( const char *fmt, ... );
-void TIKI_SetupIndividualSurface( const char *filename, dtikisurface_t *surf, const char *name, dloadsurface_t *loadsurf );
-size_t TIKI_CalcAnimDefSize( dloaddef_t *ld );
-dtikianim_t *TIKI_FillTIKIStructureSkel( dloaddef_t *ld );
+    void TIKI_AddPointToBounds(float *v, float *mins, float *maxs);
+    void TIKI_Message(const char *fmt, ...);
+    void TIKI_Warning(const char *fmt, ...);
+    void TIKI_Error(const char *fmt, ...);
+    void
+    TIKI_SetupIndividualSurface(const char *filename, dtikisurface_t *surf, const char *name, dloadsurface_t *loadsurf);
+    size_t       TIKI_CalcAnimDefSize(dloaddef_t *ld);
+    dtikianim_t *TIKI_FillTIKIStructureSkel(dloaddef_t *ld);
+    void         TIKI_SwapSkel(skelHeader_t* pheader);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_MAIN_H__
diff --git a/code/qcommon/tiki_script.cpp b/code/qcommon/tiki_script.cpp
index 0eb007a3..ad865b9b 100644
--- a/code/qcommon/tiki_script.cpp
+++ b/code/qcommon/tiki_script.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -394,8 +394,8 @@ void TikiScript::AddMacro( const char *name, const char *expansion )
 	}
 	else
 	{
-		strcpy( macros[ nummacros ].name, name );
-		strcpy( macros[ nummacros ].macro, expansion );
+		Q_strncpyz( macros[ nummacros ].name, name, sizeof( macros[ nummacros ].name ) );
+		Q_strncpyz( macros[ nummacros ].macro, expansion, sizeof( macros[ nummacros ].macro ) );
 		nummacros++;
 	}
 
@@ -450,13 +450,13 @@ qboolean TikiScript::ProcessCommand( qboolean crossline )
 	}
 	else if( !stricmp( command, "path" ) )
 	{
-		strcpy( path, argument1 );
+		Q_strncpyz( path, argument1, sizeof( path ) );
 		len = strlen( path );
 
 		if( path[ len - 1 ] != '/' &&
 			path[ len - 1 ] != '\\' )
 		{
-			strcat( path, "/" );
+			Q_strcat( path, sizeof( path ), "/" );
 		}
 
 		SkipToEOL();
@@ -790,7 +790,7 @@ const char *TikiScript::GetToken( qboolean crossline )
 			{
 				strcat( temptoken, macro_end + 1 );
 			}
-			strcpy( i->token, temptoken );
+			Q_strncpyz( i->token, temptoken, sizeof( i->token ) );
 		}
 		else
 		{
@@ -802,13 +802,13 @@ const char *TikiScript::GetToken( qboolean crossline )
 				if( macro_start - i->token != 0 )
 					memcpy( temptoken, i->token, macro_start - i->token );
 
-				temptoken[ macro_start - i->token + 1 ] = 0;
+				temptoken[ macro_start - i->token ] = 0;
 				strcat( temptoken, subst );
 				if( *( macro_end + 1 ) )
 				{
 					strcat( temptoken, macro_end + 1 );
 				}
-				strcpy( i->token, temptoken );
+				Q_strncpyz( i->token, temptoken, sizeof( i->token ) );
 			}
 		}
 	}
@@ -1198,7 +1198,7 @@ int TikiScript::LinesInFile( void )
 	temp_tokenready		= tokenready;
 	temp_script_p		= script_p;
 	temp_line			= line;
-	strcpy( temp_token, token );
+	Q_strncpyz( temp_token, token, sizeof( temp_token ) );
 
 	numentries = 0;
 
@@ -1212,7 +1212,7 @@ int TikiScript::LinesInFile( void )
 	tokenready	= temp_tokenready;
 	script_p	= temp_script_p;
 	line		= temp_line;
-	strcpy( token, temp_token );
+	Q_strncpyz( token, temp_token, sizeof( token ) );
 
 	return numentries;
 }
@@ -1307,7 +1307,7 @@ void TikiScript::MarkPos( void )
 {
 	mark[ mark_pos ].mark_script_p = script_p;
 	mark[ mark_pos ].mark_tokenready = tokenready;
-	strcpy( mark[ mark_pos ].mark_token, token );
+	Q_strncpyz( mark[ mark_pos ].mark_token, token, sizeof(mark[ mark_pos ].mark_token));
 	mark_pos++;
 }
 
diff --git a/code/qcommon/tiki_script.h b/code/qcommon/tiki_script.h
index bdc07f3f..7c466ee7 100644
--- a/code/qcommon/tiki_script.h
+++ b/code/qcommon/tiki_script.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,132 +22,131 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_script.h : TIKI script
 
-#ifndef TIKI_SCRIPT_H
-#define TIKI_SCRIPT_H
+#pragma once
 
-#define TOKENCOMMENT		(';')
-#define TOKENCOMMENT2		('#')
-#define TOKENEOL			('\n')
+#define TOKENCOMMENT  (';')
+#define TOKENCOMMENT2 ('#')
+#define TOKENEOL      ('\n')
 //#define TOKENNULL			('\0')
-#define TOKENSPACE			(' ')
-#define TOKENSPECIAL		('$')
+#define TOKENSPACE     (' ')
+#define TOKENSPECIAL   ('$')
 
-#define	TIKI_MAXTOKEN	256
+#define TIKI_MAXTOKEN  256
 
-#define TIKI_MAXMACROS	48
+#define TIKI_MAXMACROS 48
 
 typedef struct {
-	char name[TIKI_MAXTOKEN];
-	char macro[TIKI_MAXTOKEN];
+    char name[TIKI_MAXTOKEN];
+    char macro[TIKI_MAXTOKEN];
 } tiki_macro_t;
 
 typedef struct {
-	const char *mark_script_p;
-	qboolean mark_tokenready;
-	char mark_token[TIKI_MAXTOKEN];
+    const char *mark_script_p;
+    qboolean    mark_tokenready;
+    char        mark_token[TIKI_MAXTOKEN];
 } tiki_mark_t;
 
 #ifdef __cplusplus
 
-class TikiScript {
+class TikiScript
+{
 protected:
-	qboolean error;
-	qboolean tokenready;
-	class TikiScript *include;
-	class TikiScript *parent;
-	char filename[TIKI_MAXTOKEN];
-	const char *script_p;
-	const char *end_p;
-	tiki_macro_t macros[TIKI_MAXMACROS];
-	int nummacros;
-	int line;
-	char token[TIKI_MAXTOKEN];
-	qboolean releaseBuffer;
-	tiki_mark_t mark[ 64 ];
-	int mark_pos;
+    qboolean          error;
+    qboolean          tokenready;
+    class TikiScript *include;
+    class TikiScript *parent;
+    char              filename[TIKI_MAXTOKEN];
+    const char       *script_p;
+    const char       *end_p;
+    tiki_macro_t      macros[TIKI_MAXMACROS];
+    int               nummacros;
+    int               line;
+    char              token[TIKI_MAXTOKEN];
+    qboolean          releaseBuffer;
+    tiki_mark_t       mark[64];
+    int               mark_pos;
 
 public:
-	char *buffer;
-	int length;
-	char path[ MAX_QPATH ];
-	static class TikiScript *currentScript;
+    char                    *buffer;
+    int                      length;
+    char                     path[MAX_QPATH];
+    static class TikiScript *currentScript;
 
 protected:
-	qboolean			AtComment();
-	qboolean			AtExtendedComment();
-	qboolean			AtCommand();
-	qboolean			AtString( qboolean crossline );
-	qboolean			ProcessCommand( qboolean crossline );
-	qboolean			Completed();
-	qboolean			SafeCheckOverflow();
-	void				CheckOverflow();
-	void				Uninclude();
-	const char			*FindMacro( const char *macro );
-	void				AddMacro( const char *macro, const char *expansion );
-	qboolean			SkipToEOL();
-	void				SkipWhiteSpace( qboolean crossline );
-	void				SkipNonToken( qboolean crossline );
-	qboolean			CommentAvailable( qboolean crossline );
-	void				SkipExtendedComment();
+    qboolean    AtComment();
+    qboolean    AtExtendedComment();
+    qboolean    AtCommand();
+    qboolean    AtString(qboolean crossline);
+    qboolean    ProcessCommand(qboolean crossline);
+    qboolean    Completed();
+    qboolean    SafeCheckOverflow();
+    void        CheckOverflow();
+    void        Uninclude();
+    const char *FindMacro(const char *macro);
+    void        AddMacro(const char *macro, const char *expansion);
+    qboolean    SkipToEOL();
+    void        SkipWhiteSpace(qboolean crossline);
+    void        SkipNonToken(qboolean crossline);
+    qboolean    CommentAvailable(qboolean crossline);
+    void        SkipExtendedComment();
 
 public:
-	TikiScript();
-	~TikiScript();
+    TikiScript();
+    ~TikiScript();
 
-	void		Close();
-	const char	*Filename();
-	int			GetLineNumber();
-	void		Reset();
-	qboolean	TokenAvailable( qboolean crossline );
-	void		UnGetToken();
-	const char	*GetToken( qboolean crossline );
-	const char	*GetLine( qboolean crossline );
-	const char	*GetAndIgnoreLine( qboolean crossline );
-	const char	*GetRaw();
-	const char	*GetString( qboolean crossline );
-	qboolean	GetSpecific( const char *string );
-	int			GetInteger( qboolean crossline );
-	double		GetDouble( qboolean crossline );
-	float		GetFloat( qboolean crossline );
-	void		GetVector( qboolean crossline, float *vec );
-	int			LinesInFile();
-	void		Parse( char *data, int length, const char *name );
-	qboolean	LoadFile( const char *name, qboolean quiet );
-	const char	*Token();
-	void		MarkPos();
-	void		ReturnToMark();
-	void		ReplaceLineWithWhitespace( bool deleteFromStartOfLine );
-	void		Exclude();
-	const char	*GetParentToken();
+    void        Close();
+    const char *Filename();
+    int         GetLineNumber();
+    void        Reset();
+    qboolean    TokenAvailable(qboolean crossline);
+    void        UnGetToken();
+    const char *GetToken(qboolean crossline);
+    const char *GetLine(qboolean crossline);
+    const char *GetAndIgnoreLine(qboolean crossline);
+    const char *GetRaw();
+    const char *GetString(qboolean crossline);
+    qboolean    GetSpecific(const char *string);
+    int         GetInteger(qboolean crossline);
+    double      GetDouble(qboolean crossline);
+    float       GetFloat(qboolean crossline);
+    void        GetVector(qboolean crossline, float *vec);
+    int         LinesInFile();
+    void        Parse(char *data, int length, const char *name);
+    qboolean    LoadFile(const char *name, qboolean quiet);
+    const char *Token();
+    void        MarkPos();
+    void        ReturnToMark();
+    void        ReplaceLineWithWhitespace(bool deleteFromStartOfLine);
+    void        Exclude();
+    const char *GetParentToken();
 };
 
-class TikiSwitchKey {
+class TikiSwitchKey
+{
 public:
-	str sKeyName;
-	str sKeyValue;
-	TikiSwitchKey *pNextKey;
+    str            sKeyName;
+    str            sKeyValue;
+    TikiSwitchKey *pNextKey;
 
-	TikiSwitchKey();
+    TikiSwitchKey();
 };
 
-class TikiSwitcher {
-	TikiSwitchKey *m_pSwitchKeys;
+class TikiSwitcher
+{
+    TikiSwitchKey *m_pSwitchKeys;
 
 private:
-	TikiSwitchKey *GetSwitchKey( const char * );
-	void RemoveUnwantedSwitchOptions( TikiScript * );
+    TikiSwitchKey *GetSwitchKey(const char *);
+    void           RemoveUnwantedSwitchOptions(TikiScript *);
 
 public:
-	TikiSwitcher();
+    TikiSwitcher();
 
-	void		AddSwitchKey( const char *, const char * );
-	void		ChangeSwitchKey( const char *, const char * );
-	void		AddOrChangeSwitchKey( const char *, const char * );
-	str&		GetSwitchKeyValue( const char * );
-	void		PrecompileTikiScript( TikiScript * );
+    void AddSwitchKey(const char *, const char *);
+    void ChangeSwitchKey(const char *, const char *);
+    void AddOrChangeSwitchKey(const char *, const char *);
+    str& GetSwitchKeyValue(const char *);
+    void PrecompileTikiScript(TikiScript *);
 };
 
 #endif
-
-#endif // TIKI_SCRIPT_H
-
diff --git a/code/qcommon/unzip.c b/code/qcommon/unzip.c
index 20adcfe3..9a8ee451 100644
--- a/code/qcommon/unzip.c
+++ b/code/qcommon/unzip.c
@@ -1,1062 +1,65 @@
-/*****************************************************************************
- * name:		unzip.c
- *
- * desc:		IO on .zip files using portions of zlib 
- *
- * $Archive: /MissionPack/code/qcommon/unzip.c $
- *
- *****************************************************************************/
+/* unzip.c -- IO for uncompress .zip files using zlib
 
-#include "../client/client.h"
+   Modified for Quake III Arena to use the Z_Malloc() memory pool;
+   this means a system copy of minizip is not a suitable replacement.
+
+   Based on minizip:
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   Read unzip.h for more info
+*/
+
+/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+compatibility with older software. The following is from the original crypt.c. Code
+woven in by Terry Thorsen 1/2003.
+*/
+/*
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+*/
+/*
+  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+ */
+
+/*
+  This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+ */
+
+
+#include "../qcommon/q_shared.h"
+#include "../qcommon/qcommon.h"
 #include "unzip.h"
 
-/* unzip.h -- IO for uncompress .zip files using zlib 
-   Version 0.15 beta, Mar 19th, 1998,
-
-   Copyright (C) 1998 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-   Encryption and multi volume ZipFile (span) are not supported.
-   Old compressions used by old PKZip 1.x are not supported
-
-   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-   CAN CHANGE IN FUTURE VERSION !!
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
 
 
-*/
-/* for more info about .ZIP format, see 
-      ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip */
-
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
 #  endif
 #endif
 
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#define OF(args)  args
-#endif
-
-typedef unsigned char  Byte;  /* 8 bits */
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-typedef Byte    *voidp;
-
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-#endif /* _ZCONF_H */
-
-#define ZLIB_VERSION "1.1.3"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  (void *)0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-// static const char * zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-int deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-// static int deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-  
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so (that is, total_in bytes).
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).
-*/
-
-
-// static int deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-int inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-static int inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may some
-  introduce some output latency (reading input without producing any output)
-  except when forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
-  and Z_FINISH, but the current implementation actually flushes as much output
-  as possible anyway.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-     If a preset dictionary is needed at this point (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-  it sets strm->adler to the adler32 checksum of all output produced
-  so (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-  an error code as described below. At the end of the stream, inflate()
-  checks that its computed adler32 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
-  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
-  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
-  case, the application may then call inflateSync to look for a good
-  compression block.
-*/
-
-
-static int inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-int deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-                            
-/*
-static int deflateSetDictionary OF((z_streamp strm,
-                                             const Byte *dictionary,
-                                             uInt  dictLength));
-*/
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
-
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-/*
-static int deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-*/
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-// static int deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-/*
-static int deflateParams OF((z_streamp strm,
-				      int level,
-				      int strategy));
-*/
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-/*   
-int inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   trying to allocate a larger window.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
-*/
-
-/*
-static int inflateSetDictionary OF((z_streamp strm,
-                                             const Byte *dictionary,
-                                             uInt  dictLength));
-*/
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-// static int inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-static int inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-/*
-static int compress OF((Byte *dest,   uLong *destLen,
-                                 const Byte *source, uLong sourceLen));
-*/
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-/*
-static int compress2 OF((Byte *dest,   uLong *destLen,
-                                  const Byte *source, uLong sourceLen,
-                                  int level));
-*/
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-/*
-static int uncompress OF((Byte *dest,   uLong *destLen,
-                                   const Byte *source, uLong sourceLen));
-*/                                   
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-
-typedef voidp gzFile;
-
-gzFile gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h". (See the description
-   of deflateInit2 for more information about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-gzFile gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-int gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-int    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-int    gzwrite OF((gzFile file, 
-				   const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-int    QDECL gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-
-int gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-char * gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-int    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-int    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-int    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-long gzseek OF((gzFile file,
-				      long offset, int whence));
-/* 
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-int    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-long    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-int gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-int    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-// static const char * gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-static uLong adler32 OF((uLong adler, const Byte *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-/*
-static int deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-static int inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-static int deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-*/
-static int inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-
-// static const char   * zError           OF((int err));
-// static int            inflateSyncPoint OF((z_streamp z));
-// static const uLong * get_crc_table    OF((void));
-
-typedef unsigned char  uch;
-typedef unsigned short ush;
-typedef unsigned long  ulg;
-
-// static const char *z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-        /* Common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-#define zmemcpy Com_Memcpy
-#define zmemcmp memcmp
-#define zmemzero(dest, len) Com_Memset(dest, 0, len)
-
-/* Diagnostic functions */
-#ifdef _ZIP_DEBUG_
-   int z_verbose = 0;
-#  define Assert(cond,msg) assert(cond);
-   //{if(!(cond)) SyScriptError(msg);}
-#  define Trace(x) {if (z_verbose>=0) SyScriptError x ;}
-#  define Tracev(x) {if (z_verbose>0) SyScriptError x ;}
-#  define Tracevv(x) {if (z_verbose>1) SyScriptError x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) SyScriptError x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) SyScriptError x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-typedef uLong (*check_func) OF((uLong check, const Byte *buf, uInt len));
-static voidp zcalloc OF((voidp opaque, unsigned items, unsigned size));
-static void   zcfree  OF((voidp opaque, voidp ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidp)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-
-#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
-                      !defined(CASESENSITIVITYDEFAULT_NO)
-#define CASESENSITIVITYDEFAULT_NO
-#endif
-
 
 #ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (65536)
+#define UNZ_BUFSIZE (16384)
 #endif
 
 #ifndef UNZ_MAXFILENAMEINZIP
@@ -1075,17 +78,95 @@ static void   zcfree  OF((voidp opaque, voidp ptr));
 
 
 
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info_internal_s
+{
+    uLong offset_curfile;/* relative offset of local header 4 bytes */
+} unz_file_info_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    uLong offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    uLong pos_local_extrafield;   /* position in the local extra field in read*/
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    uLong rest_read_compressed; /* number of byte to be decompressed */
+    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip_read_info_s;
+
+
+/* unz_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info gi;       /* public global information */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    uLong num_file;             /* number of the current file in the zipfile*/
+    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
+    uLong current_file_ok;      /* flag about the usability of the current file*/
+    uLong central_pos;          /* position of the beginning of the central dir*/
+
+    uLong size_central_dir;     /* size of the central directory  */
+    uLong offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info cur_file_info; /* public info about the current file in zip*/
+    unz_file_info_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
 /* ===========================================================================
      Read a byte from a gz_stream; update next_in and avail_in. Return EOF
    for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
+   IN assertion: the stream s has been successfully opened for reading.
 */
 
-/*
-static int unzlocal_getByte(FILE *fin,int *pi)
+
+local int unzlocal_getByte OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    int *pi;
 {
     unsigned char c;
-	int err = fread(&c, 1, 1, fin);
+    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
     if (err==1)
     {
         *pi = (int)c;
@@ -1093,104 +174,107 @@ static int unzlocal_getByte(FILE *fin,int *pi)
     }
     else
     {
-        if (ferror(fin)) 
+        if (ZERROR(*pzlib_filefunc_def,filestream))
             return UNZ_ERRNO;
         else
             return UNZ_EOF;
     }
 }
-*/
+
 
 /* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets 
+   Reads a long in LSB order from the given gz_stream. Sets
 */
-static int unzlocal_getShort (FILE* fin, uLong *pX)
+local int unzlocal_getShort OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
 {
-	short	v;
-
-	fread( &v, sizeof(v), 1, fin );
-
-	*pX = LittleShort( v);
-	return UNZ_OK;
-
-/*
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(fin,&i);
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
-    
+
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
-   
+
     if (err==UNZ_OK)
         *pX = x;
     else
         *pX = 0;
     return err;
-*/
 }
 
-static int unzlocal_getLong (FILE *fin, uLong *pX)
+local int unzlocal_getLong OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
 {
-	int		v;
-
-	fread( &v, sizeof(v), 1, fin );
-
-	*pX = LittleLong( v);
-	return UNZ_OK;
-
-/*
     uLong x ;
-    int i;
+    int i = 0;
     int err;
 
-    err = unzlocal_getByte(fin,&i);
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x = (uLong)i;
-    
+
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<8;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<16;
 
     if (err==UNZ_OK)
-        err = unzlocal_getByte(fin,&i);
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
     x += ((uLong)i)<<24;
-   
+
     if (err==UNZ_OK)
         *pX = x;
     else
         *pX = 0;
     return err;
-*/
 }
 
+local int strcmpcasenosensitive_internal OF((
+    const char* fileName1,
+    const char* fileName2));
 
 /* My own strcmpi / strcasecmp */
-static int strcmpcasenosensitive_internal (const char* fileName1,const char* fileName2)
+local int strcmpcasenosensitive_internal (fileName1,fileName2)
+    const char* fileName1;
+    const char* fileName2;
 {
-	for (;;)
-	{
-		char c1=*(fileName1++);
-		char c2=*(fileName2++);
-		if ((c1>='a') && (c1<='z'))
-			c1 -= 0x20;
-		if ((c2>='a') && (c2<='z'))
-			c2 -= 0x20;
-		if (c1=='\0')
-			return ((c2=='\0') ? 0 : -1);
-		if (c2=='\0')
-			return 1;
-		if (c1<c2)
-			return -1;
-		if (c1>c2)
-			return 1;
-	}
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
 }
 
 
@@ -1204,220 +288,235 @@ static int strcmpcasenosensitive_internal (const char* fileName1,const char* fil
 #define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
 #endif
 
-/* 
+/*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
                                                                 or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
         (like 1 on Unix, 2 on Windows)
 
 */
-extern  int unzStringFileNameCompare (const char* fileName1,const char* fileName2,int iCaseSensitivity)
+extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
+    const char* fileName1;
+    const char* fileName2;
+    int iCaseSensitivity;
 {
-	if (iCaseSensitivity==0)
-		iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
 
-	if (iCaseSensitivity==1)
-		return strcmp(fileName1,fileName2);
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
 
-	return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-} 
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
 
+#ifndef BUFREADCOMMENT
 #define BUFREADCOMMENT (0x400)
+#endif
 
 /*
   Locate the Central directory of a zipfile (at the end, just before
     the global comment)
 */
-extern uLong unzlocal_SearchCentralDir(FILE *fin)
+local uLong unzlocal_SearchCentralDir OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
 {
-	unsigned char* buf;
-	uLong uSizeFile;
-	uLong uBackRead;
-	uLong uMaxBack=0xffff; /* maximum size of global comment */
-	uLong uPosFound=0;
-	
-	if (fseek(fin,0,SEEK_END) != 0)
-		return 0;
+    unsigned char* buf;
+    uLong uSizeFile;
+    uLong uBackRead;
+    uLong uMaxBack=0xffff; /* maximum size of global comment */
+    uLong uPosFound=0;
+
+    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
 
 
-	uSizeFile = ftell( fin );
-	
-	if (uMaxBack>uSizeFile)
-		uMaxBack = uSizeFile;
+    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
 
-	buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-	if (buf==NULL)
-		return 0;
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
 
-	uBackRead = 4;
-	while (uBackRead<uMaxBack)
-	{
-		uLong uReadSize,uReadPos ;
-		int i;
-		if (uBackRead+BUFREADCOMMENT>uMaxBack) 
-			uBackRead = uMaxBack;
-		else
-			uBackRead+=BUFREADCOMMENT;
-		uReadPos = uSizeFile-uBackRead ;
-		
-		uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ? 
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize,uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-		if (fseek(fin,uReadPos,SEEK_SET)!=0)
-			break;
+        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
 
-		if (fread(buf,(uInt)uReadSize,1,fin)!=1)
-			break;
+        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
 
-                for (i=(int)uReadSize-3; (i--)>0;)
-			if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && 
-				((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-			{
-				uPosFound = uReadPos+i;
-				break;
-			}
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
 
-		if (uPosFound!=0)
-			break;
-	}
-	TRYFREE(buf);
-	return uPosFound;
-}
-
-extern unzFile unzReOpen (const char* path, unzFile file)
-{
-	unz_s *s;
-	FILE * fin;
-
-    fin=fopen(path,"rb");
-	if (fin==NULL)
-		return NULL;
-
-	s=(unz_s*)ALLOC(sizeof(unz_s));
-	Com_Memcpy(s, (unz_s*)file, sizeof(unz_s));
-
-	s->file = fin;
-	return (unzFile)s;	
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
 }
 
 /*
   Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib109.zip" or on an Unix computer
-	 "zlib/zlib109.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on a Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is an unzFile Handle, usable with other function
+       of this unzip package.
 */
-extern unzFile unzOpen (const char* path)
+extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
+    const char *path;
+    zlib_filefunc_def* pzlib_filefunc_def;
 {
-	unz_s us;
-	unz_s *s;
-	uLong central_pos,uL;
-	FILE * fin ;
+    unz_s us;
+    unz_s *s;
+    uLong central_pos,uL;
 
-	uLong number_disk;          /* number of the current dist, used for 
-								   spaning ZIP, unsupported, always 0*/
-	uLong number_disk_with_CD;  /* number the the disk with central dir, used
-								   for spaning ZIP, unsupported, always 0*/
-	uLong number_entry_CD;      /* total number of entries in
-	                               the central dir 
-	                               (same than number_entry on nospan) */
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    uLong number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
 
-	int err=UNZ_OK;
+    int err=UNZ_OK;
 
-    fin=fopen(path,"rb");
-	if (fin==NULL)
-		return NULL;
+    if (unz_copyright[0]!=' ')
+        return NULL;
 
-	central_pos = unzlocal_SearchCentralDir(fin);
-	if (central_pos==0)
-		err=UNZ_ERRNO;
+    if (pzlib_filefunc_def==NULL)
+        fill_fopen_filefunc(&us.z_filefunc);
+    else
+        us.z_filefunc = *pzlib_filefunc_def;
 
-	if (fseek(fin,central_pos,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
+    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
 
-	/* the signature, already checked */
-	if (unzlocal_getLong(fin,&uL)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
+    if (central_pos==0)
+        err=UNZ_ERRNO;
 
-	/* number of this disk */
-	if (unzlocal_getShort(fin,&number_disk)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    if (ZSEEK(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
 
-	/* number of the disk with the start of the central directory */
-	if (unzlocal_getShort(fin,&number_disk_with_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* the signature, already checked */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* total number of entries in the central dir on this disk */
-	if (unzlocal_getShort(fin,&us.gi.number_entry)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* number of this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* total number of entries in the central dir */
-	if (unzlocal_getShort(fin,&number_entry_CD)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* number of the disk with the start of the central directory */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if ((number_entry_CD!=us.gi.number_entry) ||
-		(number_disk_with_CD!=0) ||
-		(number_disk!=0))
-		err=UNZ_BADZIPFILE;
+    /* total number of entries in the central dir on this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* size of the central directory */
-	if (unzlocal_getLong(fin,&us.size_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* total number of entries in the central dir */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	/* offset of start of central directory with respect to the 
-	      starting disk number */
-	if (unzlocal_getLong(fin,&us.offset_central_dir)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    if ((number_entry_CD!=us.gi.number_entry) ||
+        (number_disk_with_CD!=0) ||
+        (number_disk!=0))
+        err=UNZ_BADZIPFILE;
 
-	/* zipfile comment length */
-	if (unzlocal_getShort(fin,&us.gi.size_comment)!=UNZ_OK)
-		err=UNZ_ERRNO;
+    /* size of the central directory */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if ((central_pos<us.offset_central_dir+us.size_central_dir) && 
-		(err==UNZ_OK))
-		err=UNZ_BADZIPFILE;
+    /* offset of start of central directory with respect to the
+          starting disk number */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (err!=UNZ_OK)
-	{
-		fclose(fin);
-		return NULL;
-	}
+    /* zipfile comment length */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+        err=UNZ_ERRNO;
 
-	us.file=fin;
-	us.byte_before_the_zipfile = central_pos -
-		                    (us.offset_central_dir+us.size_central_dir);
-	us.central_pos = central_pos;
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
     us.pfile_in_zip_read = NULL;
-	
+    us.encrypted = 0;
 
-	s=(unz_s*)ALLOC(sizeof(unz_s));
-	*s=us;
-//	unzGoToFirstFile((unzFile)s);	
-	return (unzFile)s;	
+
+    s=(unz_s*)ALLOC(sizeof(unz_s));
+    *s=us;
+    unzGoToFirstFile((unzFile)s);
+    return (unzFile)s;
 }
 
 
+extern unzFile ZEXPORT unzOpen (path)
+    const char *path;
+{
+    return unzOpen2(path, NULL);
+}
+
 /*
   Close a ZipFile opened with unzipOpen.
   If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
-extern int unzClose (unzFile file)
+extern int ZEXPORT unzClose (file)
+    unzFile file;
 {
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
 
     if (s->pfile_in_zip_read!=NULL)
         unzCloseCurrentFile(file);
 
-	fclose(s->file);
-	TRYFREE(s);
-	return UNZ_OK;
+    ZCLOSE(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
 }
 
 
@@ -1425,21 +524,31 @@ extern int unzClose (unzFile file)
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
-extern int unzGetGlobalInfo (unzFile file,unz_global_info *pglobal_info)
+extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
+    unzFile file;
+    unz_global_info *pglobal_info;
 {
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	*pglobal_info=s->gi;
-	return UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
 }
 
 
 /*
    Translate date/time from Dos format to tm_unz (readable more easilty)
 */
-static void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
+
+local void unzlocal_DosDateToTmuDate OF((
+    uLong ulDosDate,
+    tm_unz* ptm));
+        
+
+local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
+    uLong ulDosDate;
+    tm_unz* ptm;
 {
     uLong uDate;
     uDate = (uLong)(ulDosDate>>16);
@@ -1455,161 +564,176 @@ static void unzlocal_DosDateToTmuDate (uLong ulDosDate, tm_unz* ptm)
 /*
   Get Info about the current file in the zipfile, with internal only info
 */
-static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
+local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
                                                   unz_file_info *pfile_info,
-                                                  unz_file_info_internal 
+                                                  unz_file_info_internal
                                                   *pfile_info_internal,
                                                   char *szFileName,
-												  uLong fileNameBufferSize,
+                                                  uLong fileNameBufferSize,
                                                   void *extraField,
-												  uLong extraFieldBufferSize,
+                                                  uLong extraFieldBufferSize,
                                                   char *szComment,
-												  uLong commentBufferSize)
+                                                  uLong commentBufferSize));
+
+local int unzlocal_GetCurrentFileInfoInternal (file,
+                                              pfile_info,
+                                              pfile_info_internal,
+                                              szFileName, fileNameBufferSize,
+                                              extraField, extraFieldBufferSize,
+                                              szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    unz_file_info_internal *pfile_info_internal;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
 {
-	unz_s* s;
-	unz_file_info file_info;
-	unz_file_info_internal file_info_internal;
-	int err=UNZ_OK;
-	uLong uMagic;
-	long lSeek=0;
+    unz_s* s;
+    unz_file_info file_info;
+    unz_file_info_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (fseek(s->file,s->pos_in_central_dir+s->byte_before_the_zipfile,SEEK_SET)!=0)
-		err=UNZ_ERRNO;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (ZSEEK(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
 
 
-	/* we check the magic */
-	if (err==UNZ_OK) {
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x02014b50)
-			err=UNZ_BADZIPFILE;
-	}
-	if (unzlocal_getShort(s->file,&file_info.version) != UNZ_OK)
-		err=UNZ_ERRNO;
+    /* we check the magic */
+    if (err==UNZ_OK)
+    {
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+    }
 
-	if (unzlocal_getShort(s->file,&file_info.version_needed) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.flag) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.compression_method) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.dosDate) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
 
     unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
 
-	if (unzlocal_getLong(s->file,&file_info.crc) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.compressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.uncompressed_size) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_file_extra) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.size_file_comment) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.disk_num_start) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&file_info.internal_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info.external_fa) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&file_info_internal.offset_curfile) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	lSeek+=file_info.size_filename;
-	if ((err==UNZ_OK) && (szFileName!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_filename<fileNameBufferSize)
-		{
-			*(szFileName+file_info.size_filename)='\0';
-			uSizeRead = file_info.size_filename;
-		}
-		else
-			uSizeRead = fileNameBufferSize;
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
 
-		if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-			if (fread(szFileName,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		lSeek -= uSizeRead;
-	}
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
 
-	
-	if ((err==UNZ_OK) && (extraField!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_extra<extraFieldBufferSize)
-			uSizeRead = file_info.size_file_extra;
-		else
-			uSizeRead = extraFieldBufferSize;
 
-		if (lSeek!=0) {
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		}
-		if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0)) {
-			if (fread(extraField,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		}
-		lSeek += file_info.size_file_extra - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_extra; 
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
 
-	
-	if ((err==UNZ_OK) && (szComment!=NULL))
-	{
-		uLong uSizeRead ;
-		if (file_info.size_file_comment<commentBufferSize)
-		{
-			*(szComment+file_info.size_file_comment)='\0';
-			uSizeRead = file_info.size_file_comment;
-		}
-		else
-			uSizeRead = commentBufferSize;
+        if (lSeek!=0)
+        {
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        }
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek += file_info.size_file_extra - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_extra;
 
-		if (lSeek!=0) {
-			if (fseek(s->file,lSeek,SEEK_CUR)==0)
-				lSeek=0;
-			else
-				err=UNZ_ERRNO;
-		}
-		if ((file_info.size_file_comment>0) && (commentBufferSize>0)) {
-			if (fread(szComment,(uInt)uSizeRead,1,s->file)!=1)
-				err=UNZ_ERRNO;
-		}
-		lSeek+=file_info.size_file_comment - uSizeRead;
-	}
-	else
-		lSeek+=file_info.size_file_comment;
 
-	if ((err==UNZ_OK) && (pfile_info!=NULL))
-		*pfile_info=file_info;
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
 
-	if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-		*pfile_info_internal=file_info_internal;
+        if (lSeek!=0)
+        {
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)!=0)
+                err=UNZ_ERRNO;
+        }
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+    }
 
-	return err;
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
 }
 
 
@@ -1619,102 +743,77 @@ static int unzlocal_GetCurrentFileInfoInternal (unzFile file,
   No preparation of the structure is needed
   return UNZ_OK if there is no problem.
 */
-extern int unzGetCurrentFileInfo (	unzFile file, unz_file_info *pfile_info,
-									char *szFileName, uLong fileNameBufferSize,
-									void *extraField, uLong extraFieldBufferSize,
-									char *szComment, uLong commentBufferSize)
+extern int ZEXPORT unzGetCurrentFileInfo (file,
+                                          pfile_info,
+                                          szFileName, fileNameBufferSize,
+                                          extraField, extraFieldBufferSize,
+                                          szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
 {
-	return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-												szFileName,fileNameBufferSize,
-												extraField,extraFieldBufferSize,
-												szComment,commentBufferSize);
+    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
 }
 
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
-extern int unzGoToFirstFile (unzFile file)
+extern int ZEXPORT unzGoToFirstFile (file)
+    unzFile file;
 {
-	int err=UNZ_OK;
-	unz_s* s;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	s->pos_in_central_dir=s->offset_central_dir;
-	s->num_file=0;
-	err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											 &s->cur_file_info_internal,
-											 NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
+    int err=UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
 }
 
-
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
-extern int unzGoToNextFile (unzFile file)
+extern int ZEXPORT unzGoToNextFile (file)
+    unzFile file;
 {
-	unz_s* s;	
-	int err;
+    unz_s* s;
+    int err;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (s->num_file+1==s->gi.number_entry)
-		return UNZ_END_OF_LIST_OF_FILE;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
 
-	s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-			s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-	s->num_file++;
-	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											   &s->cur_file_info_internal,
-											   NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return err;
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
 }
 
-/*
-  Get the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-extern int unzGetCurrentFileInfoPosition (unzFile file, unsigned long *pos )
-{
-	unz_s* s;	
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-	*pos = s->pos_in_central_dir;
-	return UNZ_OK;
-}
-
-/*
-  Set the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos )
-{
-	unz_s* s;	
-	int err;
-
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-
-	s->pos_in_central_dir = pos;
-	err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-											   &s->cur_file_info_internal,
-											   NULL,0,NULL,0,NULL,0);
-	s->current_file_ok = (err == UNZ_OK);
-	return UNZ_OK;
-}
 
 /*
   Try locate the file szFileName in the zipfile.
@@ -1724,253 +823,403 @@ extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos )
   UNZ_OK if the file is found. It becomes the current file.
   UNZ_END_OF_LIST_OF_FILE if the file is not found
 */
-extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity)
+extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
+    unzFile file;
+    const char *szFileName;
+    int iCaseSensitivity;
 {
-	unz_s* s;	
-	int err;
+    unz_s* s;
+    int err;
 
-	
-	uLong num_fileSaved;
-	uLong pos_in_central_dirSaved;
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info cur_file_infoSaved;
+    unz_file_info_internal cur_file_info_internalSaved;
+    uLong num_fileSaved;
+    uLong pos_in_central_dirSaved;
 
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
 
     if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
         return UNZ_PARAMERROR;
 
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_END_OF_LIST_OF_FILE;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
 
-	num_fileSaved = s->num_file;
-	pos_in_central_dirSaved = s->pos_in_central_dir;
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
 
-	err = unzGoToFirstFile(file);
+    err = unzGoToFirstFile(file);
 
-	while (err == UNZ_OK)
-	{
-		char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-		unzGetCurrentFileInfo(file,NULL,
-								szCurrentFileName,sizeof(szCurrentFileName)-1,
-								NULL,0,NULL,0);
-		if (unzStringFileNameCompare(szCurrentFileName,
-										szFileName,iCaseSensitivity)==0)
-			return UNZ_OK;
-		err = unzGoToNextFile(file);
-	}
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
 
-	s->num_file = num_fileSaved ;
-	s->pos_in_central_dir = pos_in_central_dirSaved ;
-	return err;
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
 }
 
 
 /*
-  Read the static header of the current zipfile
-  Check the coherency of the static header and info in the end of central
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   // offset in file
+    uLong num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGoToFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
         directory about this file
-  store in *piSizeVar the size of extra info in static header
+  store in *piSizeVar the size of extra info in local header
         (filename and size of extra field data)
 */
-static int unzlocal_CheckCurrentFileCoherencyHeader (unz_s* s, uInt* piSizeVar,
-													uLong *poffset_local_extrafield,
-													uInt *psize_local_extrafield)
+
+local int unzlocal_CheckCurrentFileCoherencyHeader OF((
+    unz_s* s,
+    uInt* piSizeVar,
+    uLong *poffset_local_extrafield,
+    uInt  *psize_local_extrafield));
+
+
+local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
+                                                    poffset_local_extrafield,
+                                                    psize_local_extrafield)
+    unz_s* s;
+    uInt* piSizeVar;
+    uLong *poffset_local_extrafield;
+    uInt  *psize_local_extrafield;
 {
-	uLong uMagic,uData,uFlags;
-	uLong size_filename;
-	uLong size_extra_field;
-	int err=UNZ_OK;
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
 
-	*piSizeVar = 0;
-	*poffset_local_extrafield = 0;
-	*psize_local_extrafield = 0;
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
 
-	if (fseek(s->file,s->cur_file_info_internal.offset_curfile +
-								s->byte_before_the_zipfile,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
 
 
-	if (err==UNZ_OK) {
-		if (unzlocal_getLong(s->file,&uMagic) != UNZ_OK)
-			err=UNZ_ERRNO;
-		else if (uMagic!=0x04034b50)
-			err=UNZ_BADZIPFILE;
-	}
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (err==UNZ_OK)
+    {
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+    }
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
 /*
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-		err=UNZ_BADZIPFILE;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
 */
-	if (unzlocal_getShort(s->file,&uFlags) != UNZ_OK)
-		err=UNZ_ERRNO;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getShort(s->file,&uData) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
 
     if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
                          (s->cur_file_info.compression_method!=Z_DEFLATED))
         err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* date/time */
-		err=UNZ_ERRNO;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* crc */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-		                      ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size compr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
-	if (unzlocal_getLong(s->file,&uData) != UNZ_OK) /* size uncompr */
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) && 
-							  ((uFlags & 8)==0))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
 
 
-	if (unzlocal_getShort(s->file,&size_filename) != UNZ_OK)
-		err=UNZ_ERRNO;
-	else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-		err=UNZ_BADZIPFILE;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
 
-	*piSizeVar += (uInt)size_filename;
+    *piSizeVar += (uInt)size_filename;
 
-	if (unzlocal_getShort(s->file,&size_extra_field) != UNZ_OK)
-		err=UNZ_ERRNO;
-	*poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-									SIZEZIPLOCALHEADER + size_filename;
-	*psize_local_extrafield = (uInt)size_extra_field;
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
 
-	*piSizeVar += (uInt)size_extra_field;
+    *piSizeVar += (uInt)size_extra_field;
 
-	return err;
+    return err;
 }
-												
+
 /*
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
 */
-extern int unzOpenCurrentFile (unzFile file)
+extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+    const char* password;
 {
-	int err=UNZ_OK;
-	int Store;
-	uInt iSizeVar;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uLong offset_local_extrafield;  /* offset of the static extra field */
-	uInt  size_local_extrafield;    /* size of the static extra field */
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uLong offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
-	if (!s->current_file_ok)
-		return UNZ_PARAMERROR;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
 
     if (s->pfile_in_zip_read != NULL)
         unzCloseCurrentFile(file);
 
-	if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-				&offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-		return UNZ_BADZIPFILE;
+    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
+                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
 
-	pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-									    ALLOC(sizeof(file_in_zip_read_info_s));
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_INTERNALERROR;
+    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
+                                        ALLOC(sizeof(file_in_zip_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
 
-	pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-	pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-	pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-	pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
 
-	if (pfile_in_zip_read_info->read_buffer==NULL)
-	{
-		TRYFREE(pfile_in_zip_read_info);
-		return UNZ_INTERNALERROR;
-	}
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
 
-	pfile_in_zip_read_info->stream_initialised=0;
-	
-	if ((s->cur_file_info.compression_method!=0) &&
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
         (s->cur_file_info.compression_method!=Z_DEFLATED))
-		err=UNZ_BADZIPFILE;
-	Store = s->cur_file_info.compression_method==0;
+        err=UNZ_BADZIPFILE;
 
-	pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-	pfile_in_zip_read_info->crc32=0;
-	pfile_in_zip_read_info->compression_method =
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->compression_method =
             s->cur_file_info.compression_method;
-	pfile_in_zip_read_info->file=s->file;
-	pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
 
     pfile_in_zip_read_info->stream.total_out = 0;
 
-	if (!Store)
-	{
-	  pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-	  pfile_in_zip_read_info->stream.zfree = (free_func)0;
-	  pfile_in_zip_read_info->stream.opaque = (voidp)0; 
-      
-	  err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-	  if (err == Z_OK)
-	    pfile_in_zip_read_info->stream_initialised=1;
+    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
+        (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      if (inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS) == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=1;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+      }
         /* windowBits is passed < 0 to tell that there is no zlib header.
          * Note that in this case inflate *requires* an extra "dummy" byte
          * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. 
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the 
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
          * size of both compressed and uncompressed data
          */
-	}
-	pfile_in_zip_read_info->rest_read_compressed = 
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
             s->cur_file_info.compressed_size ;
-	pfile_in_zip_read_info->rest_read_uncompressed = 
+    pfile_in_zip_read_info->rest_read_uncompressed =
             s->cur_file_info.uncompressed_size ;
 
-	
-	pfile_in_zip_read_info->pos_in_zipfile = 
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER + 
-			  iSizeVar;
-	
-	pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
 
 
-	s->pfile_in_zip_read = pfile_in_zip_read_info;
-    return UNZ_OK;
+    return err;
 }
 
-/*
-  Returns success if the current file is open
-*/
-extern qboolean unzIsCurrentFileOpen (unzFile file)
+extern int ZEXPORT unzOpenCurrentFile (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
 
-	s = file;
+extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
+    unzFile file;
+    const char* password;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
 
-	if(!s)
-		return qfalse;
-
-	pfile_in_zip_read_info = s->pfile_in_zip_read;
-
-	if(!pfile_in_zip_read_info)
-		return qfalse;
-
-	if(!pfile_in_zip_read_info->read_buffer)
-		return qfalse;
-
-	return qtrue;
+extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
 }
 
 /*
@@ -1983,307 +1232,306 @@ extern qboolean unzIsCurrentFileOpen (unzFile file)
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
-extern int unzReadCurrentFile  (unzFile file, void *buf, unsigned len)
+extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
 {
-	int err=UNZ_OK;
-	uInt iRead = 0;
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
 
-	if (pfile_in_zip_read_info->read_buffer == NULL)
-		return UNZ_END_OF_LIST_OF_FILE;
-	if (len==0)
-		return 0;
+    if (pfile_in_zip_read_info->read_buffer == NULL)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
 
-	pfile_in_zip_read_info->stream.next_out = (Byte*)buf;
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
 
-	pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-	
-	if (len>pfile_in_zip_read_info->rest_read_uncompressed)
-		pfile_in_zip_read_info->stream.avail_out = 
-		  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
 
-	while (pfile_in_zip_read_info->stream.avail_out>0)
-	{
-		if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
             (pfile_in_zip_read_info->rest_read_compressed>0))
-		{
-			uInt uReadThis = UNZ_BUFSIZE;
-			if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-				uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-			if (uReadThis == 0)
-				return UNZ_EOF;
-			if (s->cur_file_info.compressed_size == pfile_in_zip_read_info->rest_read_compressed)
-				if (fseek(pfile_in_zip_read_info->file,
-						  pfile_in_zip_read_info->pos_in_zipfile + 
-							 pfile_in_zip_read_info->byte_before_the_zipfile,SEEK_SET)!=0)
-					return UNZ_ERRNO;
-			if (fread(pfile_in_zip_read_info->read_buffer,uReadThis,1,
-                         pfile_in_zip_read_info->file)!=1)
-				return UNZ_ERRNO;
-			pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
 
-			pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-			
-			pfile_in_zip_read_info->stream.next_in = 
-                (Byte*)pfile_in_zip_read_info->read_buffer;
-			pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-		}
 
-		if (pfile_in_zip_read_info->compression_method==0)
-		{
-			uInt uDoCopy,i ;
-			if (pfile_in_zip_read_info->stream.avail_out < 
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
                             pfile_in_zip_read_info->stream.avail_in)
-				uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-			else
-				uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-				
-			for (i=0;i<uDoCopy;i++)
-				*(pfile_in_zip_read_info->stream.next_out+i) =
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
                         *(pfile_in_zip_read_info->stream.next_in+i);
-					
-//			pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-//								pfile_in_zip_read_info->stream.next_out,
-//								uDoCopy);
-			pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-			pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-			pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-			pfile_in_zip_read_info->stream.next_out += uDoCopy;
-			pfile_in_zip_read_info->stream.next_in += uDoCopy;
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
             pfile_in_zip_read_info->stream.total_out += uDoCopy;
-			iRead += uDoCopy;
-		}
-		else
-		{
-			uLong uTotalOutBefore,uTotalOutAfter;
-			const Byte *bufBefore;
-			uLong uOutThis;
-			int flush=Z_SYNC_FLUSH;
+            iRead += uDoCopy;
+        }
+        else
+        {
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+            int flush=Z_SYNC_FLUSH;
 
-			uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-			bufBefore = pfile_in_zip_read_info->stream.next_out;
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
 
-			/*
-			if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-			         pfile_in_zip_read_info->stream.avail_out) &&
-				(pfile_in_zip_read_info->rest_read_compressed == 0))
-				flush = Z_FINISH;
-			*/
-			err=inflate(&pfile_in_zip_read_info->stream,flush);
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
 
-			uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-			uOutThis = uTotalOutAfter-uTotalOutBefore;
-			
-//			pfile_in_zip_read_info->crc32 = 
-//                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-//                        (uInt)(uOutThis));
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
 
-			pfile_in_zip_read_info->rest_read_uncompressed -=
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
                 uOutThis;
 
-			iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-            
-			if (err==Z_STREAM_END)
-				return (iRead==0) ? UNZ_EOF : iRead;
-			if (err!=Z_OK) 
-				break;
-		}
-	}
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
 
-	if (err==Z_OK)
-		return iRead;
-	return err;
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
 }
 
 
 /*
   Give the current position in uncompressed data
 */
-extern long unztell (unzFile file)
+extern z_off_t ZEXPORT unztell (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-	return (long)pfile_in_zip_read_info->stream.total_out;
-}
-
-/*
-Seek to the specified offset according to the origin in uncompressed data
-*/
-extern long unzseek (unzFile file, long int offset, int origin)
-{
-	int new_origin;
-	int current_origin;
-	int amount;
-	unz_s* s = file;
-	char data[32000];
-
-	current_origin = unztell(file);
-	new_origin = current_origin;
-
-	switch(origin)
-	{
-	case SEEK_CUR:
-		new_origin = offset + current_origin;
-		break;
-	case SEEK_SET:
-		new_origin = offset;
-		break;
-	case SEEK_END:
-		new_origin = s->cur_file_info.uncompressed_size - offset;
-		break;
-	}
-
-	if(new_origin < current_origin)
-	{
-		return -1;
-	}
-
-
-	for( ; current_origin < new_origin; current_origin += amount )
-	{
-		amount = new_origin - current_origin;
-
-		if(new_origin - current_origin > sizeof(data))
-		{
-			amount = sizeof( data );
-		}
-
-		unzReadCurrentFile(file, data, amount);
-	}
-
-	return 0;
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
 }
 
 
 /*
-  return 1 if the end of file was reached, 0 elsewhere 
+  return 1 if the end of file was reached, 0 elsewhere
 */
-extern int unzeof (unzFile file)
+extern int ZEXPORT unzeof (file)
+    unzFile file;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
-	
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-		return 1;
-	else
-		return 0;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
 }
 
 
 
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the static-header version of the extra field (sometimes, there is
-    more info in the static-header version than in the central-header)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
 
-  if buf==NULL, it return the size of the static extra field that can be read
+  if buf==NULL, it return the size of the local extra field that can be read
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of bytes copied in buf, or (if <0) 
-	the error code
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
 */
-extern int unzGetLocalExtrafield (unzFile file,void *buf,unsigned len)
+extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
 {
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	uInt read_now;
-	uLong size_to_read;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    uLong size_to_read;
 
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-	size_to_read = (pfile_in_zip_read_info->size_local_extrafield - 
-				pfile_in_zip_read_info->pos_local_extrafield);
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
 
-	if (buf==NULL)
-		return (int)size_to_read;
-	
-	if (len>size_to_read)
-		read_now = (uInt)size_to_read;
-	else
-		read_now = (uInt)len ;
+    if (buf==NULL)
+        return (int)size_to_read;
 
-	if (read_now==0)
-		return 0;
-	
-	if (fseek(pfile_in_zip_read_info->file,
-              pfile_in_zip_read_info->offset_local_extrafield + 
-			  pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
 
-	if (fread(buf,(uInt)size_to_read,1,pfile_in_zip_read_info->file)!=1)
-		return UNZ_ERRNO;
+    if (read_now==0)
+        return 0;
 
-	return (int)read_now;
+    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
 }
 
 /*
   Close the file in zip opened with unzipOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
-extern int unzCloseCurrentFile (unzFile file)
+extern int ZEXPORT unzCloseCurrentFile (file)
+    unzFile file;
 {
-	int err=UNZ_OK;
+    int err=UNZ_OK;
 
-	unz_s* s;
-	file_in_zip_read_info_s* pfile_in_zip_read_info;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
     pfile_in_zip_read_info=s->pfile_in_zip_read;
 
-	if (pfile_in_zip_read_info==NULL)
-		return UNZ_PARAMERROR;
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
 
-/*
-	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-	{
-		if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-			err=UNZ_CRCERROR;
-	}
-*/
 
-	TRYFREE(pfile_in_zip_read_info->read_buffer);
-	pfile_in_zip_read_info->read_buffer = NULL;
-	if (pfile_in_zip_read_info->stream_initialised)
-		inflateEnd(&pfile_in_zip_read_info->stream);
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
 
-	pfile_in_zip_read_info->stream_initialised = 0;
-	TRYFREE(pfile_in_zip_read_info);
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
 
     s->pfile_in_zip_read=NULL;
 
-	return err;
+    return err;
 }
 
 
@@ -2292,2081 +1540,39 @@ extern int unzCloseCurrentFile (unzFile file)
   uSizeBuf is the size of the szComment buffer.
   return the number of byte copied or an error code <0
 */
-extern int unzGetGlobalComment (unzFile file, char *szComment, uLong uSizeBuf)
+extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
+    unzFile file;
+    char *szComment;
+    uLong uSizeBuf;
 {
-	unz_s* s;
-	uLong uReadThis ;
-	if (file==NULL)
-		return UNZ_PARAMERROR;
-	s=(unz_s*)file;
+    unz_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
 
-	uReadThis = uSizeBuf;
-	if (uReadThis>s->gi.size_comment)
-		uReadThis = s->gi.size_comment;
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
 
-	if (fseek(s->file,s->central_pos+22,SEEK_SET)!=0)
-		return UNZ_ERRNO;
+    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
 
-	if (uReadThis>0)
+    if (uReadThis>0)
     {
       *szComment='\0';
-	  if (fread(szComment,(uInt)uReadThis,1,s->file)!=1)
-		return UNZ_ERRNO;
+      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
     }
 
-	if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-		*(szComment+s->gi.size_comment)='\0';
-	return (int)uReadThis;
-}
-
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_blocks_state;
-typedef struct inflate_blocks_state inflate_blocks_statef;
-
-static inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-static int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-static void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLong *));                  /* check value on output */
-
-static int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-#if 0
-static void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Byte *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-static int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
-#endif
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* Table for deflate from PKZIP's appnote.txt. */
-static const uInt border[] = { /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Huffman code lookup table entry--this entry is four bytes for machines
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-
-typedef struct inflate_huft_s inflate_huft;
-
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
-   value below is more than safe. */
-#define MANY 1440
-
-static  int inflate_trees_bits OF((
-    uInt *,                    /* 19 code lengths */
-    uInt *,                    /* bits tree desired/actual depth */
-    inflate_huft * *,       /* bits tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-static  int inflate_trees_dynamic OF((
-    uInt,                       /* number of literal/length codes */
-    uInt,                       /* number of distance codes */
-    uInt *,                    /* that many (total) code lengths */
-    uInt *,                    /* literal desired/actual bit depth */
-    uInt *,                    /* distance desired/actual bit depth */
-    inflate_huft * *,       /* literal/length tree result */
-    inflate_huft * *,       /* distance tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-static  int inflate_trees_fixed OF((
-    uInt *,                    /* literal desired/actual bit depth */
-    uInt *,                    /* distance desired/actual bit depth */
-    inflate_huft * *,       /* literal/length tree result */
-    inflate_huft * *,       /* distance tree result */
-    z_streamp));                /* for memory allocation */
-
-
-/* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_codes_state;
-typedef struct inflate_codes_state inflate_codes_statef;
-
-static inflate_codes_statef *inflate_codes_new OF((
-    uInt, uInt,
-    inflate_huft *, inflate_huft *,
-    z_streamp ));
-
-static  int inflate_codes OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-static  void inflate_codes_free OF((
-    inflate_codes_statef *,
-    z_streamp ));
-
-/* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#ifndef _INFUTIL_H
-#define _INFUTIL_H
-
-typedef enum {
-      TYPE,     /* get type bits (3, including end bit) */
-      LENS,     /* get lengths for stored */
-      STORED,   /* processing stored block */
-      TABLE,    /* get table lengths */
-      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,    /* processing fixed or dynamic block */
-      DRY,      /* output remaining window bytes */
-      DONE,     /* finished last block, done */
-      BAD}      /* got a data error--stuck here */
-inflate_block_mode;
-
-/* inflate blocks semi-private state */
-struct inflate_blocks_state {
-
-  /* mode */
-  inflate_block_mode  mode;     /* current inflate_block mode */
-
-  /* mode dependent information */
-  union {
-    uInt left;          /* if STORED, bytes left to copy */
-    struct {
-      uInt table;               /* table lengths (14 bits) */
-      uInt index;               /* index into blens (or border) */
-      uInt *blens;             /* bit lengths of codes */
-      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;            /* if DTREE, decoding info for trees */
-    struct {
-      inflate_codes_statef 
-         *codes;
-    } decode;           /* if CODES, current state */
-  } sub;                /* submode */
-  uInt last;            /* true if this block is the last block */
-
-  /* mode independent information */
-  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;           /* bit buffer */
-  inflate_huft *hufts;  /* single malloc for tree space */
-  Byte *window;        /* sliding window */
-  Byte *end;           /* one byte after sliding window */
-  Byte *read;          /* window read pointer */
-  Byte *write;         /* window write pointer */
-  check_func checkfn;   /* check function */
-  uLong check;          /* check on output */
-
-};
-
-
-/* defines for inflate input/output */
-/*   update pointers and return */
-#define UPDBITS {s->bitb=b;s->bitk=k;}
-#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
-#define UPDOUT {s->write=q;}
-#define UPDATE {UPDBITS UPDIN UPDOUT}
-#define LEAVE {UPDATE return inflate_flush(s,z,r);}
-/*   get bytes and bits */
-#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
-#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
-#define NEXTBYTE (n--,*p++)
-#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define DUMPBITS(j) {b>>=(j);k-=(j);}
-/*   output bytes */
-#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
-#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
-#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
-/*   load static pointers */
-#define LOAD {LOADIN LOADOUT}
-
-/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-static  uInt inflate_mask[17];
-
-/* copy as much as possible from the sliding window to the output area */
-static  int inflate_flush OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-#endif
-
-								
-/*
-   Notes beyond the 1.93a appnote.txt:
-
-   1. Distance pointers never point before the beginning of the output
-      stream.
-   2. Distance pointers can point back across blocks, up to 32k away.
-   3. There is an implied maximum of 7 bits for the bit length table and
-      15 bits for the actual data.
-   4. If only one code exists, then it is encoded using one bit.  (Zero
-      would be more efficient, but perhaps a little confusing.)  If two
-      codes exist, they are coded using one bit each (0 and 1).
-   5. There is no way of sending zero distance codes--a dummy must be
-      sent if there are none.  (History: a pre 2.0 version of PKZIP would
-      store blocks with no distance codes, but this was discovered to be
-      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
-      zero distance codes, which is sent as one code of zero bits in
-      length.
-   6. There are up to 286 literal/length codes.  Code 256 represents the
-      end-of-block.  Note however that the static length tree defines
-      288 codes just to fill out the Huffman codes.  Codes 286 and 287
-      cannot be used though, since there is no length base or extra bits
-      defined for them.  Similarily, there are up to 30 distance codes.
-      However, static trees define 32 codes (all 5 bits) to fill out the
-      Huffman codes, but the last two had better not show up in the data.
-   7. Unzip can check dynamic Huffman blocks for complete code sets.
-      The exception is that a single code would not be complete (see #4).
-   8. The five bits following the block type is really the number of
-      literal codes sent minus 257.
-   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
-      (1+6+6).  Therefore, to output three times the length, you output
-      three codes (1+1+1), whereas to output four times the same length,
-      you only need two codes (1+3).  Hmm.
-  10. In the tree reconstruction algorithm, Code = Code + Increment
-      only if BitLength(i) is not zero.  (Pretty obvious.)
-  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
-  12. Note: length code 284 can represent 227-258, but length code 285
-      really is 258.  The last length deserves its own, short code
-      since it gets used a lot in very redundant files.  The length
-      258 is special since 258 - 3 (the min match length) is 255.
-  13. The literal/length and distance code bit lengths are read as a
-      single stream of lengths.  It is possible (and advantageous) for
-      a repeat code (16, 17, or 18) to go across the boundary between
-      the two sets of lengths.
- */
-
-
-void inflate_blocks_reset(inflate_blocks_statef *s, z_streamp z, uLong *c)
-{
-  if (c != Z_NULL)
-    *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.decode.codes, z);
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->bitb = 0;
-  s->read = s->write = s->window;
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, (const Byte *)Z_NULL, 0);
-  Tracev(("inflate:   blocks reset\n"));
-}
-
-
-inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c, uInt w)
-{
-  inflate_blocks_statef *s;
-
-  if ((s = (inflate_blocks_statef *)ZALLOC
-       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
-    return s;
-  if ((s->hufts =
-       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
-  {
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  if ((s->window = (Byte *)ZALLOC(z, 1, w)) == Z_NULL)
-  {
-    ZFREE(z, s->hufts);
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  s->end = s->window + w;
-  s->checkfn = c;
-  s->mode = TYPE;
-  Tracev(("inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, Z_NULL);
-  return s;
-}
-
-
-int inflate_blocks(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input based on current state */
-  while (1) switch (s->mode)
-  {
-    case TYPE:
-      NEEDBITS(3)
-      t = (uInt)b & 7;
-      s->last = t & 1;
-      switch (t >> 1)
-      {
-        case 0:                         /* stored */
-          Tracev(("inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
-          break;
-        case 1:                         /* fixed */
-          Tracev(("inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
-          {
-            uInt bl, bd;
-            inflate_huft *tl, *td;
-            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
-            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.decode.codes == Z_NULL)
-            {
-              r = Z_MEM_ERROR;
-              LEAVE
-            }
-          }
-          DUMPBITS(3)
-          s->mode = CODES;
-          break;
-        case 2:                         /* dynamic */
-          Tracev(("inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          s->mode = TABLE;
-          break;
-        case 3:                         /* illegal */
-          DUMPBITS(3)
-          s->mode = BAD;
-          z->msg = (char*)"invalid block type";
-          r = Z_DATA_ERROR;
-          LEAVE
-      }
-      break;
-    case LENS:
-      NEEDBITS(32)
-      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
-      {
-        s->mode = BAD;
-        z->msg = (char*)"invalid stored block lengths";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-      s->sub.left = (uInt)b & 0xffff;
-      b = k = 0;                      /* dump bits */
-      Tracev(("inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
-      break;
-    case STORED:
-      if (n == 0)
-        LEAVE
-      NEEDOUT
-      t = s->sub.left;
-      if (t > n) t = n;
-      if (t > m) t = m;
-      zmemcpy(q, p, t);
-      p += t;  n -= t;
-      q += t;  m -= t;
-      if ((s->sub.left -= t) != 0)
-        break;
-      Tracev(("inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      s->mode = s->last ? DRY : TYPE;
-      break;
-    case TABLE:
-      NEEDBITS(14)
-      s->sub.trees.table = t = (uInt)b & 0x3fff;
-#ifndef PKZIP_BUG_WORKAROUND
-      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-      {
-        s->mode = BAD;
-        z->msg = (char*)"too many length or distance symbols";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-#endif
-      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-      if ((s->sub.trees.blens = (uInt*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
-      {
-        r = Z_MEM_ERROR;
-        LEAVE
-      }
-      DUMPBITS(14)
-      s->sub.trees.index = 0;
-      Tracev(("inflate:       table sizes ok\n"));
-      s->mode = BTREE;
-    case BTREE:
-      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
-      {
-        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
-      }
-      while (s->sub.trees.index < 19)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
-      s->sub.trees.bb = 7;
-      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, s->hufts, z);
-      if (t != Z_OK)
-      {
-        ZFREE(z, s->sub.trees.blens);
-        r = t;
-        if (r == Z_DATA_ERROR)
-          s->mode = BAD;
-        LEAVE
-      }
-      s->sub.trees.index = 0;
-      Tracev(("inflate:       bits tree ok\n"));
-      s->mode = DTREE;
-    case DTREE:
-      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
-      {
-        inflate_huft *h;
-        uInt i, j, c;
-
-        t = s->sub.trees.bb;
-        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->bits;
-        c = h->base;
-        if (c < 16)
-        {
-          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
-        else /* c == 16..18 */
-        {
-          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
-          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
-          i = s->sub.trees.index;
-          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-            z->msg = (char*)"invalid bit length repeat";
-            r = Z_DATA_ERROR;
-            LEAVE
-          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
-            s->sub.trees.blens[i++] = c;
-          } while (--j);
-          s->sub.trees.index = i;
-        }
-      }
-      s->sub.trees.tb = Z_NULL;
-      {
-        uInt bl, bd;
-        inflate_huft *tl, *td;
-        inflate_codes_statef *c;
-
-        tl = NULL;
-        td = NULL;
-        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;         /* must be <= 9 for lookahead assumptions */
-        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                  s->hufts, z);
-        ZFREE(z, s->sub.trees.blens);
-        if (t != Z_OK)
-        {
-          if (t == (uInt)Z_DATA_ERROR)
-            s->mode = BAD;
-          r = t;
-          LEAVE
-        }
-        Tracev(("inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
-          r = Z_MEM_ERROR;
-          LEAVE
-        }
-        s->sub.decode.codes = c;
-      }
-      s->mode = CODES;
-    case CODES:
-      UPDATE
-      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
-      r = Z_OK;
-      inflate_codes_free(s->sub.decode.codes, z);
-      LOAD
-      Tracev(("inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      if (!s->last)
-      {
-        s->mode = TYPE;
-        break;
-      }
-      s->mode = DRY;
-    case DRY:
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      s->mode = DONE;
-    case DONE:
-      r = Z_STREAM_END;
-      LEAVE
-    case BAD:
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-}
-
-
-int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_blocks_reset(s, z, Z_NULL);
-  ZFREE(z, s->window);
-  ZFREE(z, s->hufts);
-  ZFREE(z, s);
-  Tracev(("inflate:   blocks freed\n"));
-  return Z_OK;
-}
-
-#if 0
-void inflate_set_dictionary(inflate_blocks_statef *s, const Byte *d, uInt n)
-{
-  zmemcpy(s->window, d, n);
-  s->read = s->write = s->window + n;
-}
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
- * IN assertion: s != Z_NULL
- */
-int inflate_blocks_sync_point(inflate_blocks_statef *s)
-{
-  return s->mode == LENS;
-}
-#endif
-
-
-/* And'ing with mask[n] masks the lower n bits */
-static uInt inflate_mask[17] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-};
-
-
-/* copy as much as possible from the sliding window to the output area */
-int inflate_flush(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt n;
-  Byte *p;
-  Byte *q;
-
-  /* static copies of source and destination pointers */
-  p = z->next_out;
-  q = s->read;
-
-  /* compute number of bytes to copy as as end of window */
-  n = (uInt)((q <= s->write ? s->write : s->end) - q);
-  if (n > z->avail_out) n = z->avail_out;
-  if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-  /* update counters */
-  z->avail_out -= n;
-  z->total_out += n;
-
-  /* update check information */
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-  /* copy as as end of window */
-  zmemcpy(p, q, n);
-  p += n;
-  q += n;
-
-  /* see if more to copy at beginning of window */
-  if (q == s->end)
-  {
-    /* wrap pointers */
-    q = s->window;
-    if (s->write == s->end)
-      s->write = s->window;
-
-    /* compute bytes to copy */
-    n = (uInt)(s->write - q);
-    if (n > z->avail_out) n = z->avail_out;
-    if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-    /* update counters */
-    z->avail_out -= n;
-    z->total_out += n;
-
-    /* update check information */
-    if (s->checkfn != Z_NULL)
-      z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-    /* copy */
-    zmemcpy(p, q, n);
-    p += n;
-    q += n;
-  }
-
-  /* update pointers */
-  z->next_out = p;
-  s->read = q;
-
-  /* done */
-  return r;
-}
-
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-
-static int huft_build OF((
-    uInt *,				/* code lengths in bits */
-    uInt,               /* number of codes */
-    uInt,               /* number of "simple" codes */
-    const uInt *,		/* list of base values for non-simple codes */
-    const uInt *,		/* list of extra bits for non-simple codes */
-    inflate_huft **,	/* result: starting table */
-    uInt *,				/* maximum lookup bits (returns actual) */
-    inflate_huft *,     /* space for trees */
-    uInt *,             /* hufts used in space */
-    uInt * ));			/* space for values */
-
-/* Tables for deflate from PKZIP's appnote.txt. */
-static const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-        /* see note #13 above about 258 */
-static const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
-static const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-static const uInt cpdext[30] = { /* Extra bits for distance codes */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-/*
-   Huffman code decoding is performed using a multi-level table lookup.
-   The fastest way to decode is to simply build a lookup table whose
-   size is determined by the longest code.  However, the time it takes
-   to build this table can also be a factor if the data being decoded
-   is not very long.  The most common codes are necessarily the
-   shortest codes, so those codes dominate the decoding time, and hence
-   the speed.  The idea is you can have a shorter table that decodes the
-   shorter, more probable codes, and then point to subsidiary tables for
-   the longer codes.  The time it costs to decode the longer codes is
-   then traded against the time it takes to make longer tables.
-
-   This results of this trade are in the variables lbits and dbits
-   below.  lbits is the number of bits the first level table for literal/
-   length codes can decode in one step, and dbits is the same thing for
-   the distance codes.  Subsequent tables are also less than or equal to
-   those sizes.  These values may be adjusted either when all of the
-   codes are shorter than that, in which case the longest code length in
-   bits is used, or when the shortest code is *longer* than the requested
-   table size, in which case the length of the shortest code in bits is
-   used.
-
-   There are two different values for the two tables, since they code a
-   different number of possibilities each.  The literal/length table
-   codes 286 possible values, or in a flat code, a little over eight
-   bits.  The distance table codes 30 possible values, or a little less
-   than five bits, flat.  The optimum values for speed end up being
-   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
-   The optimum values may differ though from machine to machine, and
-   possibly even between compilers.  Your mileage may vary.
- */
-
-
-/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
-#define BMAX 15         /* maximum bit length of any code */
-
-static int huft_build(uInt *b, uInt n, uInt s, const uInt *d, const uInt *e, inflate_huft ** t, uInt *m, inflate_huft *hp, uInt *hn, uInt *v)
-//uInt *b;               /* code lengths in bits (all assumed <= BMAX) */
-//uInt n;                 /* number of codes (assumed <= 288) */
-//uInt s;                 /* number of simple-valued codes (0..s-1) */
-//const uInt *d;         /* list of base values for non-simple codes */
-//const uInt *e;         /* list of extra bits for non-simple codes */
-//inflate_huft ** t;		/* result: starting table */
-//uInt *m;               /* maximum lookup bits, returns actual */
-//inflate_huft *hp;       /* space for trees */
-//uInt *hn;               /* hufts used in space */
-//uInt *v;               /* working area: values in order of bit length */
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-   if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
-{
-
-  uInt a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;                       /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-  register uInt *p;            /* pointer into c[], b[], or v[] */
-  inflate_huft *q;              /* points to current table */
-  struct inflate_huft_s r = {{{0, 0}}};      /* table entry for structure assignment */
-  inflate_huft *u[BMAX];        /* table stack */
-  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uInt *xp;                    /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  uInt z;                       /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  p = c;
-#define C0 *p++ = 0;
-#define C2 C0 C0 C0 C0
-#define C4 C2 C2 C2 C2
-  C4                            /* clear c[]--assume BMAX+1 is 16 */
-  p = b;  i = n;
-  do {
-    c[*p++]++;                  /* assume all entries <= BMAX */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (inflate_huft *)Z_NULL;
-    *m = 0;
-    return Z_OK;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((uInt)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((uInt)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return Z_DATA_ERROR;
-  if ((y -= c[i]) < 0)
-    return Z_DATA_ERROR;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-  n = x[g];                     /* set n to length of v */
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;   /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = g - w;
-        z = z > (uInt)l ? l : z;        /* table size upper limit */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          if (j < z)
-            while (++j < z)     /* try smaller tables up to z bits */
-            {
-              if ((f <<= 1) <= *++xp)
-                break;          /* enough codes to use up j bits */
-              f -= *xp;         /* else deduct codes from patterns */
-            }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate new table */
-        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
-        u[h] = q = hp + *hn;
-        *hn += z;
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (Byte)j;     /* bits in this table */
-          j = i >> (w - l);
-          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-        else
-          *t = q;               /* first table is returned result */
-      }
-
-      /* set up table entry in r */
-      r.bits = (Byte)(k - w);
-      if (p >= v + n)
-        r.exop = 128 + 64;      /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
-        r.base = *p++;          /* simple code is just the value */
-      }
-      else
-      {
-        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
-        r.base = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
-      while ((i & mask) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-        mask = (1 << w) - 1;
-      }
-    }
-  }
-
-
-  /* Return Z_BUF_ERROR if we were given an incomplete table */
-  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-}
-
-
-int inflate_trees_bits(uInt *c, uInt *bb, inflate_huft * *tb, inflate_huft *hp, z_streamp z)
-//uInt *c;               /* 19 code lengths */
-//uInt *bb;              /* bits tree desired/actual depth */
-//inflate_huft * *tb; /* bits tree result */
-//inflate_huft *hp;       /* space for trees */
-//z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uInt *v;             /* work area for huft_build */
-
-  if ((v = (uInt*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-  r = huft_build(c, 19, 19, (uInt*)Z_NULL, (uInt*)Z_NULL,
-                 tb, bb, hp, &hn, v);
-  if (r == Z_DATA_ERROR)
-    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR || *bb == 0)
-  {
-    z->msg = (char*)"incomplete dynamic bit lengths tree";
-    r = Z_DATA_ERROR;
-  }
-  ZFREE(z, v);
-  return r;
-}
-
-
-int inflate_trees_dynamic(uInt nl, uInt nd, uInt *c, uInt *bl, uInt *bd, inflate_huft * *tl, inflate_huft * *td, inflate_huft *hp, z_streamp z)
-//uInt nl;                /* number of literal/length codes */
-//uInt nd;                /* number of distance codes */
-//uInt *c;               /* that many (total) code lengths */
-//uInt *bl;              /* literal desired/actual bit depth */
-//uInt *bd;              /* distance desired/actual bit depth */
-//inflate_huft * *tl; /* literal/length tree result */
-//inflate_huft * *td; /* distance tree result */
-//inflate_huft *hp;       /* space for trees */
-//z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uInt *v;             /* work area for huft_build */
-
-  /* allocate work area */
-  if ((v = (uInt*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-
-  /* build literal/length tree */
-  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-  if (r != Z_OK || *bl == 0)
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"incomplete literal/length tree";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-  }
-
-  /* build distance tree */
-  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-  if (r != Z_OK || (*bd == 0 && nl > 257))
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed distance tree";
-    else if (r == Z_BUF_ERROR) {
-#ifdef PKZIP_BUG_WORKAROUND
-      r = Z_OK;
-    }
-#else
-      z->msg = (char*)"incomplete distance tree";
-      r = Z_DATA_ERROR;
-    }
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"empty distance tree with lengths";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-#endif
-  }
-
-  /* done */
-  ZFREE(z, v);
-  return Z_OK;
-}
-
-/* inffixed.h -- table for decoding fixed codes
- * Generated automatically by the maketree.c program
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-static uInt fixed_bl = 9;
-static uInt fixed_bd = 5;
-static inflate_huft fixed_tl[] = {
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
-  };
-static inflate_huft fixed_td[] = {
-    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
-    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
-    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
-    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
-    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
-    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
-    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
-    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
-  };
-
-int inflate_trees_fixed(uInt *bl, uInt *bd, inflate_huft * *tl, inflate_huft * *td, z_streamp z)
-//uInt *bl;               /* literal desired/actual bit depth */
-//uInt *bd;               /* distance desired/actual bit depth */
-//inflate_huft * *tl;  /* literal/length tree result */
-//inflate_huft * *td;  /* distance tree result */
-//z_streamp z;             /* for memory allocation */
-{
-  *bl = fixed_bl;
-  *bd = fixed_bd;
-  *tl = fixed_tl;
-  *td = fixed_td;
-  return Z_OK;
-}
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* macros for bit input with no checking and for returning unused bytes */
-#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
-
-/* Called with number of bytes left to write in window at least 258
-   (the maximum string length) and number of input bytes available
-   at least ten.  The ten bytes are six bytes for the longest length/
-   distance pair plus four bytes for overloading the bit buffer. */
-
-static int inflate_fast(uInt bl, uInt bd, inflate_huft *tl, inflate_huft *td, inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;              /* mask for literal/length tree */
-  uInt md;              /* mask for distance tree */
-  uInt c;               /* bytes to copy */
-  uInt d;               /* distance back to copy from */
-  Byte *r;             /* copy source pointer */
-
-  /* load input, output, bit values */
-  LOAD
-
-  /* initialize masks */
-  ml = inflate_mask[bl];
-  md = inflate_mask[bd];
-
-  /* do until not enough input or output space for fast loop */
-  do {                          /* assume called with m >= 258 && n >= 10 */
-    /* get literal/length code */
-    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-    {
-      DUMPBITS(t->bits)
-      Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                "inflate:         * literal '%c'\n" :
-                "inflate:         * literal 0x%02x\n", t->base));
-      *q++ = (Byte)t->base;
-      m--;
-      continue;
-    }
-    do {
-      DUMPBITS(t->bits)
-      if (e & 16)
-      {
-        /* get extra bits for length */
-        e &= 15;
-        c = t->base + ((uInt)b & inflate_mask[e]);
-        DUMPBITS(e)
-        Tracevv(("inflate:         * length %u\n", c));
-
-        /* decode distance base of block to copy */
-        GRABBITS(15);           /* max bits for distance code */
-        e = (t = td + ((uInt)b & md))->exop;
-        do {
-          DUMPBITS(t->bits)
-          if (e & 16)
-          {
-            /* get extra bits to add to distance base */
-            e &= 15;
-            GRABBITS(e)         /* get extra bits (up to 13) */
-            d = t->base + ((uInt)b & inflate_mask[e]);
-            DUMPBITS(e)
-            Tracevv(("inflate:         * distance %u\n", d));
-
-            /* do the copy */
-            m -= c;
-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
-            {                                   /*  just copy */
-              r = q - d;
-              *q++ = *r++;  c--;        /* minimum count is three, */
-              *q++ = *r++;  c--;        /*  so unroll loop a little */
-            }
-            else                        /* else offset after destination */
-            {
-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
-              r = s->end - e;           /* pointer to offset */
-              if (c > e)                /* if source crosses, */
-              {
-                c -= e;                 /* copy to end of window */
-                do {
-                  *q++ = *r++;
-                } while (--e);
-                r = s->window;          /* copy rest from start of window */
-              }
-            }
-            do {                        /* copy all or what's left */
-              *q++ = *r++;
-            } while (--c);
-            break;
-          }
-          else if ((e & 64) == 0)
-          {
-            t += t->base;
-            e = (t += ((uInt)b & inflate_mask[e]))->exop;
-          }
-          else
-          {
-            z->msg = (char*)"invalid distance code";
-            UNGRAB
-            UPDATE
-            return Z_DATA_ERROR;
-          }
-        } while (1);
-        break;
-      }
-      if ((e & 64) == 0)
-      {
-        t += t->base;
-        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
-        {
-          DUMPBITS(t->bits)
-          Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                    "inflate:         * literal '%c'\n" :
-                    "inflate:         * literal 0x%02x\n", t->base));
-          *q++ = (Byte)t->base;
-          m--;
-          break;
-        }
-      }
-      else if (e & 32)
-      {
-        Tracevv(("inflate:         * end of block\n"));
-        UNGRAB
-        UPDATE
-        return Z_STREAM_END;
-      }
-      else
-      {
-        z->msg = (char*)"invalid literal/length code";
-        UNGRAB
-        UPDATE
-        return Z_DATA_ERROR;
-      }
-    } while (1);
-  } while (m >= 258 && n >= 10);
-
-  /* not enough input or output--restore pointers and return */
-  UNGRAB
-  UPDATE
-  return Z_OK;
-}
-
-/* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,    /* x: set up for LEN */
-      LEN,      /* i: get length/literal/eob next */
-      LENEXT,   /* i: getting length extra (have base) */
-      DIST,     /* i: get distance next */
-      DISTEXT,  /* i: getting distance extra */
-      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,      /* o: got literal, waiting for output space */
-      WASH,     /* o: got eob, possibly still output waiting */
-      END,      /* x: got eob and all data flushed */
-      BADCODE}  /* x: got error */
-inflate_codes_mode;
-
-/* inflate codes private state */
-struct inflate_codes_state {
-
-  /* mode */
-  inflate_codes_mode mode;      /* current inflate_codes mode */
-
-  /* mode dependent information */
-  uInt len;
-  union {
-    struct {
-      inflate_huft *tree;       /* pointer into tree */
-      uInt need;                /* bits needed */
-    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;           /* if LIT, literal */
-    struct {
-      uInt get;                 /* bits to get for extra */
-      uInt dist;                /* distance back to copy from */
-    } copy;             /* if EXT or COPY, where and how much */
-  } sub;                /* submode */
-
-  /* mode independent information */
-  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;          /* distance tree */
-
-};
-
-
-inflate_codes_statef *inflate_codes_new(uInt bl, uInt bd, inflate_huft *tl, inflate_huft *td, z_streamp z)
-{
-  inflate_codes_statef *c;
-
-  if ((c = (inflate_codes_statef *)
-       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
-  {
-    c->mode = START;
-    c->lbits = (Byte)bl;
-    c->dbits = (Byte)bd;
-    c->ltree = tl;
-    c->dtree = td;
-    Tracev(("inflate:       codes new\n"));
-  }
-  return c;
-}
-
-
-int inflate_codes(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt j;               /* temporary storage */
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Byte *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Byte *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  Byte *f;             /* pointer to copy strings from */
-  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input and output based on current state */
-  while (1) switch (c->mode)
-  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:         /* x: set up for LEN */
-#ifndef SLOW
-      if (m >= 258 && n >= 10)
-      {
-        UPDATE
-        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-        LOAD
-        if (r != Z_OK)
-        {
-          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-          break;
-        }
-      }
-#endif /* !SLOW */
-      c->sub.code.need = c->lbits;
-      c->sub.code.tree = c->ltree;
-      c->mode = LEN;
-    case LEN:           /* i: get length/literal/eob next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e == 0)               /* literal */
-      {
-        c->sub.lit = t->base;
-        Tracevv((t->base >= 0x20 && t->base < 0x7f ?
-                 "inflate:         literal '%c'\n" :
-                 "inflate:         literal 0x%02x\n", t->base));
-        c->mode = LIT;
-        break;
-      }
-      if (e & 16)               /* length */
-      {
-        c->sub.copy.get = e & 15;
-        c->len = t->base;
-        c->mode = LENEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      if (e & 32)               /* end of block */
-      {
-        Tracevv(("inflate:         end of block\n"));
-        c->mode = WASH;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid literal/length code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case LENEXT:        /* i: getting length extra (have base) */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->len += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      c->sub.code.need = c->dbits;
-      c->sub.code.tree = c->dtree;
-      Tracevv(("inflate:         length %u\n", c->len));
-      c->mode = DIST;
-    case DIST:          /* i: get distance next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e & 16)               /* distance */
-      {
-        c->sub.copy.get = e & 15;
-        c->sub.copy.dist = t->base;
-        c->mode = DISTEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid distance code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case DISTEXT:       /* i: getting distance extra */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->sub.copy.dist += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      Tracevv(("inflate:         distance %u\n", c->sub.copy.dist));
-      c->mode = COPY;
-    case COPY:          /* o: copying bytes in window, waiting for space */
-#ifndef __TURBOC__ /* Turbo C bug for following expression */
-      f = (uInt)(q - s->window) < c->sub.copy.dist ?
-          s->end - (c->sub.copy.dist - (q - s->window)) :
-          q - c->sub.copy.dist;
-#else
-      f = q - c->sub.copy.dist;
-      if ((uInt)(q - s->window) < c->sub.copy.dist)
-        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
-#endif
-      while (c->len)
-      {
-        NEEDOUT
-        OUTBYTE(*f++)
-        if (f == s->end)
-          f = s->window;
-        c->len--;
-      }
-      c->mode = START;
-      break;
-    case LIT:           /* o: got literal, waiting for output space */
-      NEEDOUT
-      OUTBYTE(c->sub.lit)
-      c->mode = START;
-      break;
-    case WASH:          /* o: got eob, possibly more output */
-      if (k > 7)        /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;            /* can always return one */
-      }
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      c->mode = END;
-    case END:
-      r = Z_STREAM_END;
-      LEAVE
-    case BADCODE:       /* x: got error */
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-void inflate_codes_free(inflate_codes_statef *c, z_streamp z)
-{
-  ZFREE(z, c);
-  Tracev(("inflate:       codes free\n"));
-}
-
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#define BASE 65521L /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#undef DO1
-#undef DO2
-#undef DO4
-#undef DO8
-
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* ========================================================================= */
-static uLong adler32(uLong adler, const Byte *buf, uInt len)
-{
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == Z_NULL) return 1L;
-
-    while (len > 0) {
-        k = len < NMAX ? len : NMAX;
-        len -= k;
-        while (k >= 16) {
-            DO16(buf);
-	    buf += 16;
-            k -= 16;
-        }
-        if (k != 0) do {
-            s1 += *buf++;
-	    s2 += s1;
-        } while (--k);
-        s1 %= BASE;
-        s2 %= BASE;
-    }
-    return (s2 << 16) | s1;
-}
-
-
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-static inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-static int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-static void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLong *));                  /* check value on output */
-
-static int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-#if 0
-static void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Byte *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-static int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
-#endif
-
-typedef enum {
-      imMETHOD,   /* waiting for method byte */
-      imFLAG,     /* waiting for flag byte */
-      imDICT4,    /* four dictionary check bytes to go */
-      imDICT3,    /* three dictionary check bytes to go */
-      imDICT2,    /* two dictionary check bytes to go */
-      imDICT1,    /* one dictionary check byte to go */
-      imDICT0,    /* waiting for inflateSetDictionary */
-      imBLOCKS,   /* decompressing blocks */
-      imCHECK4,   /* four check bytes to go */
-      imCHECK3,   /* three check bytes to go */
-      imCHECK2,   /* two check bytes to go */
-      imCHECK1,   /* one check byte to go */
-      imDONE,     /* finished check, done */
-      imBAD}      /* got an error--stay here */
-inflate_mode;
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  inflate_mode  mode;   /* current inflate mode */
-
-  /* mode dependent information */
-  union {
-    uInt method;        /* if FLAGS, method byte */
-    struct {
-      uLong was;                /* computed check value */
-      uLong need;               /* stream check value */
-    } check;            /* if CHECK, check values to compare */
-    uInt marker;        /* if BAD, inflateSync's marker bytes count */
-  } sub;        /* submode */
-
-  /* mode independent information */
-  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  inflate_blocks_statef 
-    *blocks;            /* current inflate_blocks state */
-
-};
-
-
-int inflateReset(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  z->state->mode = z->state->nowrap ? imBLOCKS : imMETHOD;
-  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Tracev(("inflate: reset\n"));
-  return Z_OK;
-}
-
-
-int inflateEnd(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  Tracev(("inflate: end\n"));
-  return Z_OK;
-}
-
-
-
-int inflateInit2_(z_streamp z, int w, const char *version, int stream_size)
-{
-  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-      stream_size != sizeof(z_stream))
-      return Z_VERSION_ERROR;
-
-  /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->msg = Z_NULL;
-  if (z->zalloc == Z_NULL)
-  {
-    z->zalloc = (void *(*)(void *, unsigned, unsigned))zcalloc;
-    z->opaque = (voidp)0;
-  }
-  if (z->zfree == Z_NULL) z->zfree = (void (*)(void *, void *))zcfree;
-  if ((z->state = (struct internal_state *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->blocks = Z_NULL;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = (uInt)w;
-
-  /* create inflate_blocks state */
-  if ((z->state->blocks =
-      inflate_blocks_new(z, z->state->nowrap ? ((check_func)0) : adler32, (uInt)1 << w))
-      == Z_NULL)
-  {
-    inflateEnd(z);
-    return Z_MEM_ERROR;
-  }
-  Tracev(("inflate: allocated\n"));
-
-  /* reset state */
-  inflateReset(z);
-  return Z_OK;
-}
-
-#if 0
-int inflateInit_(z_streamp z, const char *version, int stream_size)
-{
-  return inflateInit2_(z, DEF_WBITS, version, stream_size);
-}
-#endif
-
-#define iNEEDBYTE {if(z->avail_in==0)return r;r=f;}
-#define iNEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int inflate(z_streamp z, int f)
-{
-  int r;
-  uInt b;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
-    return Z_STREAM_ERROR;
-  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-  r = Z_BUF_ERROR;
-  while (1) switch (z->state->mode)
-  {
-    case imMETHOD:
-      iNEEDBYTE
-      if (((z->state->sub.method = iNEXTBYTE) & 0xf) != Z_DEFLATED)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"unknown compression method";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"invalid window size";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      z->state->mode = imFLAG;
-    case imFLAG:
-      iNEEDBYTE
-      b = iNEXTBYTE;
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"incorrect header check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev(("inflate: zlib header ok\n"));
-      if (!(b & PRESET_DICT))
-      {
-        z->state->mode = imBLOCKS;
-        break;
-      }
-      z->state->mode = imDICT4;
-    case imDICT4:
-      iNEEDBYTE
-      z->state->sub.check.need = (uLong)iNEXTBYTE << 24;
-      z->state->mode = imDICT3;
-    case imDICT3:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 16;
-      z->state->mode = imDICT2;
-    case imDICT2:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 8;
-      z->state->mode = imDICT1;
-    case imDICT1:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE;
-      z->adler = z->state->sub.check.need;
-      z->state->mode = imDICT0;
-      return Z_NEED_DICT;
-    case imDICT0:
-      z->state->mode = imBAD;
-      z->msg = (char*)"need dictionary";
-      z->state->sub.marker = 0;       /* can try inflateSync */
-      return Z_STREAM_ERROR;
-    case imBLOCKS:
-      r = inflate_blocks(z->state->blocks, z, r);
-      if (r == Z_DATA_ERROR)
-      {
-        z->state->mode = imBAD;
-        z->state->sub.marker = 0;       /* can try inflateSync */
-        break;
-      }
-      if (r == Z_OK)
-        r = f;
-      if (r != Z_STREAM_END)
-        return r;
-      r = f;
-      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
-      if (z->state->nowrap)
-      {
-        z->state->mode = imDONE;
-        break;
-      }
-      z->state->mode = imCHECK4;
-    case imCHECK4:
-      iNEEDBYTE
-      z->state->sub.check.need = (uLong)iNEXTBYTE << 24;
-      z->state->mode = imCHECK3;
-    case imCHECK3:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 16;
-      z->state->mode = imCHECK2;
-    case imCHECK2:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE << 8;
-      z->state->mode = imCHECK1;
-    case imCHECK1:
-      iNEEDBYTE
-      z->state->sub.check.need += (uLong)iNEXTBYTE;
-
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = imBAD;
-        z->msg = (char*)"incorrect data check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev(("inflate: zlib check ok\n"));
-      z->state->mode = imDONE;
-    case imDONE:
-      return Z_STREAM_END;
-    case imBAD:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-// defined but not used
-#if 0
-int inflateSetDictionary(z_streamp z, const Byte *dictionary, uInt dictLength)
-{
-  uInt length = dictLength;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != imDICT0)
-    return Z_STREAM_ERROR;
-
-  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
-  z->adler = 1L;
-
-  if (length >= ((uInt)1<<z->state->wbits))
-  {
-    length = (1<<z->state->wbits)-1;
-    dictionary += dictLength - length;
-  }
-  inflate_set_dictionary(z->state->blocks, dictionary, length);
-  z->state->mode = imBLOCKS;
-  return Z_OK;
-}
-
-int inflateSync(z_streamp z)
-{
-  uInt n;       /* number of bytes to look at */
-  Byte *p;     /* pointer to bytes */
-  uInt m;       /* number of marker bytes found in a row */
-  uLong r, w;   /* temporaries to save total_in and total_out */
-
-  /* set up */
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->mode != imBAD)
-  {
-    z->state->mode = imBAD;
-    z->state->sub.marker = 0;
-  }
-  if ((n = z->avail_in) == 0)
-    return Z_BUF_ERROR;
-  p = z->next_in;
-  m = z->state->sub.marker;
-
-  /* search */
-  while (n && m < 4)
-  {
-    static const Byte mark[4] = {0, 0, 0xff, 0xff};
-    if (*p == mark[m])
-      m++;
-    else if (*p)
-      m = 0;
-    else
-      m = 4 - m;
-    p++, n--;
-  }
-
-  /* restore */
-  z->total_in += p - z->next_in;
-  z->next_in = p;
-  z->avail_in = n;
-  z->state->sub.marker = m;
-
-  /* return no joy or set up to restart on a new block */
-  if (m != 4)
-    return Z_DATA_ERROR;
-  r = z->total_in;  w = z->total_out;
-  inflateReset(z);
-  z->total_in = r;  z->total_out = w;
-  z->state->mode = imBLOCKS;
-  return Z_OK;
-}
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
- * but removes the length bytes of the resulting empty stored block. When
- * decompressing, PPP checks that at the end of input packet, inflate is
- * waiting for these length bytes.
- */
-int inflateSyncPoint(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
-    return Z_STREAM_ERROR;
-  return inflate_blocks_sync_point(z->state->blocks);
-}
-#endif
-
-voidp zcalloc (voidp opaque, unsigned items, unsigned size)
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return (voidp)Z_Malloc(items*size);
-}
-
-void  zcfree (voidp opaque, voidp ptr)
-{
-    Z_Free(ptr);
-    if (opaque) return; /* make compiler happy */
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
 }
 
 /* Additions by RX '2004 */
-long unzGetOffset (unzFile file)
+extern uLong ZEXPORT unzGetOffset (file)
+    unzFile file;
 {
     unz_s* s;
 
@@ -4381,7 +1587,9 @@ long unzGetOffset (unzFile file)
     return s->pos_in_central_dir;
 }
 
-int unzSetOffset (unzFile file, long pos)
+extern int ZEXPORT unzSetOffset (file, pos)
+        unzFile file;
+        uLong pos;
 {
     unz_s* s;
     int err;
@@ -4398,5 +1606,3 @@ int unzSetOffset (unzFile file, long pos)
     s->current_file_ok = (err == UNZ_OK);
     return err;
 }
-
-
diff --git a/code/qcommon/unzip.h b/code/qcommon/unzip.h
index 1b3c80a4..74dee975 100644
--- a/code/qcommon/unzip.h
+++ b/code/qcommon/unzip.h
@@ -1,259 +1,200 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
 
-This file is part of Quake III Arena source code.
+   Copyright (C) 1998-2005 Gilles Vollant
 
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
+   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
+     WinZip, InfoZip tools and compatible.
+
+   Multi volume ZipFile (span) are not supported.
+   Encryption compatible with pkzip 2.04g only supported
+   Old compressions used by old PKZip 1.x are not supported
+
+
+   I WAIT FEEDBACK at mail info@winimage.com
+   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
 */
 
+/* for more info about .ZIP format, see
+      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+      http://www.info-zip.org/pub/infozip/doc/
+   PkWare has also a specification at :
+      ftp://ftp.pkware.com/probdesc.zip
+*/
+
+#ifndef _unz_H
+#define _unz_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef USE_LOCAL_HEADERS
+  #include "../zlib/zlib.h"
+#else
+  #include <zlib.h>
+#endif
+#include "ioapi.h"
+
+#define NOUNCRYPT
+
 #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
 /* like the STRICT of WIN32, we define a pointer that cannot be converted
     from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__; 
+typedef struct TagunzFile__ { int unused; } unzFile__;
 typedef unzFile__ *unzFile;
 #else
-typedef void* unzFile;
+typedef voidp unzFile;
 #endif
 
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
 /* tm_unz contain date/time info */
-typedef struct tm_unz_s 
+typedef struct tm_unz_s
 {
-	unsigned int tm_sec;            /* seconds after the minute - [0,59] */
-	unsigned int tm_min;            /* minutes after the hour - [0,59] */
-	unsigned int tm_hour;           /* hours since midnight - [0,23] */
-	unsigned int tm_mday;           /* day of the month - [1,31] */
-	unsigned int tm_mon;            /* months since January - [0,11] */
-	unsigned int tm_year;           /* years - [1980..2044] */
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
 } tm_unz;
 
 /* unz_global_info structure contain global data about the ZIPfile
    These data comes from the end of central dir */
 typedef struct unz_global_info_s
 {
-	unsigned long number_entry;         /* total number of entries in the central dir on this disk */
-	unsigned long size_comment;         /* size of the global comment of the zipfile */
+    uLong number_entry;         /* total number of entries in
+                       the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
 } unz_global_info;
 
 
 /* unz_file_info contain information about a file in the zipfile */
 typedef struct unz_file_info_s
 {
-    unsigned long version;              /* version made by                 2 unsigned chars */
-    unsigned long version_needed;       /* version needed to extract       2 unsigned chars */
-    unsigned long flag;                 /* general purpose bit flag        2 unsigned chars */
-    unsigned long compression_method;   /* compression method              2 unsigned chars */
-    unsigned long dosDate;              /* last mod file date in Dos fmt   4 unsigned chars */
-    unsigned long crc;                  /* crc-32                          4 unsigned chars */
-    unsigned long compressed_size;      /* compressed size                 4 unsigned chars */ 
-    unsigned long uncompressed_size;    /* uncompressed size               4 unsigned chars */ 
-    unsigned long size_filename;        /* filename length                 2 unsigned chars */
-    unsigned long size_file_extra;      /* extra field length              2 unsigned chars */
-    unsigned long size_file_comment;    /* file comment length             2 unsigned chars */
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
 
-    unsigned long disk_num_start;       /* disk number start               2 unsigned chars */
-    unsigned long internal_fa;          /* internal file attributes        2 unsigned chars */
-    unsigned long external_fa;          /* external file attributes        4 unsigned chars */
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
 
     tm_unz tmu_date;
 } unz_file_info;
 
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    unsigned long offset_curfile;/* relative offset of static header 4 unsigned chars */
-} unz_file_info_internal;
-
-typedef void* (*alloc_func) (void* opaque, unsigned int items, unsigned int size);
-typedef void   (*free_func) (void* opaque, void* address);
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    unsigned char    *next_in;  /* next input unsigned char */
-    unsigned int     avail_in;  /* number of unsigned chars available at next_in */
-    unsigned long    total_in;  /* total nb of input unsigned chars read so */
-
-    unsigned char    *next_out; /* next output unsigned char should be put there */
-    unsigned int     avail_out; /* remaining free space at next_out */
-    unsigned long    total_out; /* total nb of unsigned chars output so */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    unsigned char*     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    unsigned long   adler;      /* adler32 value of the uncompressed data */
-    unsigned long   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream *z_streamp;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-	char  *read_buffer;         /* internal buffer for compressed data */
-	z_stream stream;            /* zLib stream structure for inflate */
-
-	unsigned long pos_in_zipfile;       /* position in unsigned char on the zipfile, for fseek*/
-	unsigned long stream_initialised;   /* flag set if stream structure is initialised*/
-
-	unsigned long offset_local_extrafield;/* offset of the static extra field */
-	unsigned int  size_local_extrafield;/* size of the static extra field */
-	unsigned long pos_local_extrafield;   /* position in the static extra field in read*/
-
-	unsigned long crc32;                /* crc32 of all data uncompressed */
-	unsigned long crc32_wait;           /* crc32 we must obtain after decompress all */
-	unsigned long rest_read_compressed; /* number of unsigned char to be decompressed */
-	unsigned long rest_read_uncompressed;/*number of unsigned char to be obtained after decomp*/
-	FILE* file;                 /* io structore of the zipfile */
-	unsigned long compression_method;   /* compression method (0==store) */
-	unsigned long byte_before_the_zipfile;/* unsigned char before the zipfile, (>0 for sfx)*/
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-	FILE* file;                 /* io structore of the zipfile */
-	unz_global_info gi;       /* public global information */
-	unsigned long byte_before_the_zipfile;/* unsigned char before the zipfile, (>0 for sfx)*/
-	unsigned long num_file;             /* number of the current file in the zipfile*/
-	unsigned long pos_in_central_dir;   /* pos of the current file in the central dir*/
-	unsigned long current_file_ok;      /* flag about the usability of the current file*/
-	unsigned long central_pos;          /* position of the beginning of the central dir*/
-
-	unsigned long size_central_dir;     /* size of the central directory  */
-	unsigned long offset_central_dir;   /* offset of start of central directory with
-								   respect to the starting disk number */
-
-	unz_file_info cur_file_info; /* public info about the current file in zip*/
-	unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-	                                    file if we are decompressing it */
-	unsigned char*	tmpFile;
-	int	tmpPos,tmpSize;
-} unz_s;
-
-#define UNZ_OK                                  (0)
-#define UNZ_END_OF_LIST_OF_FILE (-100)
-#define UNZ_ERRNO               (Z_ERRNO)
-#define UNZ_EOF                 (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-#define UNZ_CASESENSITIVE		1
-#define UNZ_NOTCASESENSITIVE	2
-#define UNZ_OSDEFAULTCASE		0
-
-extern int unzStringFileNameCompare (const char* fileName1, const char* fileName2, int iCaseSensitivity);
-
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
 /*
    Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-								or strcasecmp)
+   If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi
+                                or strcasecmp)
    If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-	(like 1 on Unix, 2 on Windows)
+    (like 1 on Unix, 2 on Windows)
 */
 
-extern unzFile unzOpen (const char *path);
-extern unzFile unzReOpen (const char* path, unzFile file);
 
+extern unzFile ZEXPORT unzOpen OF((const char *path));
 /*
   Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-	 "zlib/zlib111.zip".
-	 If the zipfile cannot be opened (file don't exist or in not valid), the
-	   return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-	   of this unzip package.
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on a Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is an unzFile Handle, usable with other function
+       of this unzip package.
 */
 
-extern int unzClose (unzFile file);
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
 
+extern int ZEXPORT unzClose OF((unzFile file));
 /*
   Close a ZipFile opened with unzipOpen.
   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
   return UNZ_OK if there is no problem. */
 
-extern int unzGetGlobalInfo (unzFile file, unz_global_info *pglobal_info);
-
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
 /*
   Write info about the ZipFile in the *pglobal_info structure.
   No preparation of the structure is needed
   return UNZ_OK if there is no problem. */
 
 
-extern int unzGetGlobalComment (unzFile file, char *szComment, unsigned long uSizeBuf);
-
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
 /*
   Get the global comment string of the ZipFile, in the szComment buffer.
   uSizeBuf is the size of the szComment buffer.
-  return the number of unsigned char copied or an error code <0
+  return the number of byte copied or an error code <0
 */
 
 
 /***************************************************************************/
 /* Unzip package allow you browse the directory of the zipfile */
 
-extern int unzGoToFirstFile (unzFile file);
-
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
 /*
   Set the current file of the zipfile to the first file.
   return UNZ_OK if there is no problem
 */
 
-extern int unzGoToNextFile (unzFile file);
-
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
 /*
   Set the current file of the zipfile to the next file.
   return UNZ_OK if there is no problem
   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
 */
 
-extern int unzGetCurrentFileInfoPosition (unzFile file, unsigned long *pos );
-
-/*
-  Get the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-
-extern int unzSetCurrentFileInfoPosition (unzFile file, unsigned long pos );
-
-/*
-  Set the position of the info of the current file in the zip.
-  return UNZ_OK if there is no problem
-*/
-
-extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensitivity);
-
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
 /*
   Try locate the file szFileName in the zipfile.
   For the iCaseSensitivity signification, see unzStringFileNameCompare
@@ -264,19 +205,44 @@ extern int unzLocateFile (unzFile file, const char *szFileName, int iCaseSensiti
 */
 
 
-extern int unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, char *szFileName, unsigned long fileNameBufferSize, void *extraField, unsigned long extraFieldBufferSize, char *szComment, unsigned long commentBufferSize);
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
 
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
 /*
   Get Info about the current file
   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-	    the current file
+        the current file
   if szFileName!=NULL, the filemane string will be copied in szFileName
-			(fileNameBufferSize is the size of the buffer)
+            (fileNameBufferSize is the size of the buffer)
   if extraField!=NULL, the extra field information will be copied in extraField
-			(extraFieldBufferSize is the size of the buffer).
-			This is the Central-header version of the extra field
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
   if szComment!=NULL, the comment string of the file will be copied in szComment
-			(commentBufferSize is the size of the buffer)
+            (commentBufferSize is the size of the buffer)
 */
 
 /***************************************************************************/
@@ -284,59 +250,81 @@ extern int unzGetCurrentFileInfo (unzFile file, unz_file_info *pfile_info, char
    from it, and close it (you can close it before reading all the file)
    */
 
-extern int unzOpenCurrentFile (unzFile file);
-
-/*
-  Returns success if the current file is open
-*/
-extern qboolean unzIsCurrentFileOpen (unzFile file);
-
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
 /*
   Open for reading data the current file in the zipfile.
   If there is no error, the return value is UNZ_OK.
 */
 
-extern int unzCloseCurrentFile (unzFile file);
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
 
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
 /*
   Close the file in zip opened with unzOpenCurrentFile
   Return UNZ_CRCERROR if all the file was read but the CRC is not good
 */
 
-												
-extern int unzReadCurrentFile (unzFile file, void* buf, unsigned len);
-
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
 /*
-  Read unsigned chars from the current file (opened by unzOpenCurrentFile)
+  Read bytes from the current file (opened by unzOpenCurrentFile)
   buf contain buffer where data must be copied
   len the size of buf.
 
-  return the number of unsigned char copied if somes unsigned chars are copied
+  return the number of byte copied if somes bytes are copied
   return 0 if the end of file was reached
   return <0 with error code if there is an error
     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
 */
 
-extern long unztell (unzFile file);
-
-/*
-  Seek to the specified offset according to the origin in uncompressed data
-*/
-
-extern long unzseek(unzFile file, long int offset, int origin);
-
+extern z_off_t ZEXPORT unztell OF((unzFile file));
 /*
   Give the current position in uncompressed data
 */
 
-extern int unzeof (unzFile file);
-
+extern int ZEXPORT unzeof OF((unzFile file));
 /*
-  return 1 if the end of file was reached, 0 elsewhere 
+  return 1 if the end of file was reached, 0 elsewhere
 */
 
-extern int unzGetLocalExtrafield (unzFile file, void* buf, unsigned len);
-
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
 /*
   Read extra field from the current file (opened by unzOpenCurrentFile)
   This is the local-header version of the extra field (sometimes, there is
@@ -345,17 +333,23 @@ extern int unzGetLocalExtrafield (unzFile file, void* buf, unsigned len);
   if buf==NULL, it return the size of the local extra field
 
   if buf!=NULL, len is the size of the buffer, the extra header is copied in
-	buf.
-  the return value is the number of unsigned chars copied in buf, or (if <0) 
-	the error code
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
 */
 
+/***************************************************************************/
+
 /* Get the current file offset */
-extern long unzGetOffset(unzFile file);
+extern uLong ZEXPORT unzGetOffset (unzFile file);
 
 /* Set the current file offset */
-extern int unzSetOffset(unzFile file, long pos);
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
 
 #ifdef __cplusplus
 }
 #endif
+
+#endif /* _unz_H */
diff --git a/code/qcommon/vector.h b/code/qcommon/vector.h
index 5acfe0a1..49400ad3 100644
--- a/code/qcommon/vector.h
+++ b/code/qcommon/vector.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // vector.h: C++ vector class.
 
-#ifndef __VECTOR_H__
-#define __VECTOR_H__
+#pragma once
 
 #include <cmath>
 #include <cstdio>
@@ -35,481 +34,505 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //#define W 3
 
 #ifdef __Q_FABS__
-#define VECTOR_FABS  Q_fabs
+#    define VECTOR_FABS Q_fabs
 #else
-#define VECTOR_FABS  fabs
+#    define VECTOR_FABS fabs
 #endif
 
-static float vrsqrt( float number )
+static float vrsqrt(float number)
 {
-	union {
-		float f;
-		int i;
-	} t;
-	float x2, y;
-	const float threehalfs = 1.5F;
+    union {
+        float f;
+        int   i;
+    } t;
 
-	x2 = number * 0.5F;
-	t.f = number;
-	t.i = 0x5f3759df - ( t.i >> 1 ); // what the fuck?
-	y = t.f;
-	y = y * ( threehalfs - ( x2 * y * y ) ); // 1st iteration
-	return y;
+    float       x2, y;
+    const float threehalfs = 1.5F;
+
+    x2  = number * 0.5F;
+    t.f = number;
+    t.i = 0x5f3759df - (t.i >> 1); // what the fuck?
+    y   = t.f;
+    y   = y * (threehalfs - (x2 * y * y)); // 1st iteration
+    return y;
 }
 
 class Vector
 {
 public:
-	float		x;
-	float		y;
-	float		z;
+    float x;
+    float y;
+    float z;
 
-	Vector();
-	Vector( const vec3_t src );
-	Vector( const float x, const float y, const float z );
-	explicit	Vector( const char *text );
+    Vector();
+    Vector(const vec3_t src);
+    Vector(const float x, const float y, const float z);
+    explicit Vector(const char *text);
 
-	operator float * ();
-	operator float const * () const;
+    operator float *();
+    operator const float *() const;
 
-	float					pitch( void ) const;
-	float					yaw( void ) const;
-	float					roll( void ) const;
-	float					operator[]( const int index ) const;
-	float &					operator[]( const int index );
-	void 					copyTo( vec3_t vec ) const;
-	void					setPitch( const float x );
-	void 					setYaw( const float y );
-	void 					setRoll( const float z );
-	void 					setXYZ( const float x, const float y, const float z );
-	const Vector &			operator=( const Vector &a );
-	const Vector &			operator=( vec3_t a );
-	const Vector &			operator=( const char *a );
-	friend Vector			operator+( const Vector &a, const Vector &b );
-	friend Vector			operator+( vec3_t a, const Vector &b );
-	friend Vector			operator+( const Vector &a, vec3_t b );
-	const Vector &			operator+=( const Vector &a );
-	const Vector &			operator+=( vec3_t a );
-	friend Vector			operator-( const Vector &a, const Vector &b );
-	friend Vector			operator-( vec3_t a, const Vector &b );
-	friend Vector			operator-( const Vector &a, vec3_t b );
-	const Vector &			operator-=( const Vector &a );
-	const Vector &			operator-=( vec3_t a );
-	friend Vector			operator*( const Vector &a, const float b );
-	friend Vector			operator*( const float a, const Vector &b );
-	friend float			operator*( const Vector &a, const Vector &b );
-	friend float			operator*( vec3_t a, const Vector &b );
-	friend float			operator*( const Vector &a, vec3_t b );
-	const Vector &			operator*=( const float a );
-	friend Vector			operator/( const Vector &a, const float b );
-	friend Vector			operator/( const float a, const Vector &b );
-	friend float			operator/( const Vector &a, const Vector &b );
-	friend float			operator/( vec3_t a, const Vector &b );
-	friend float			operator/( const Vector &a, vec3_t b );
-	const Vector &			operator/=( const float a );
-	friend int				operator==(	const Vector &a, const Vector &b );
-	friend int				operator==(	vec3_t a, const Vector &b );
-	friend int				operator==(	const Vector &a, vec3_t b );
-	friend int				operator!=(	const Vector &a, const Vector &b );
-	friend int				operator!=(	vec3_t a, const Vector &b );
-	friend int				operator!=(	const Vector &a, vec3_t b );
-	int						FuzzyEqual( const Vector &b, const float epsilon ) const;
-	int						FuzzyEqual( vec3_t b, const float epsilon ) const;
-	const Vector &			CrossProduct( const Vector &a, const Vector &b	);
-	const Vector &			CrossProduct( vec3_t a, const Vector &b	);
-	const Vector &			CrossProduct( const Vector &a, vec3_t b	);
-	float					length( void ) const;
-	float					lengthfast( void ) const;
-	float					lengthSquared( void ) const;
-	float					lengthXY() const;
-	float					lengthXYSquared() const;
-	float					normalize( void );
-	void					normalizefast( void );
-	void					EulerNormalize( void );
-	void					EulerNormalize360( void );
-	static Vector			Clamp( const Vector &value, const Vector &min, const Vector &max );
-	static void				Clamp( Vector &value, const Vector &min, const Vector &max );
-	static Vector			Cross( const Vector &vector1, const Vector &vector2 );
-	static float			Dot( const Vector &vector1, const Vector &vector2 );
-	static float			Dot( vec3_t a, const Vector &b );
-	static float			Dot( const Vector &a, vec3_t b );
-	static float			Distance( const Vector &vector1, const Vector &vector2 );
-	static float			DistanceSquared( const Vector &vector1, const Vector &vector2 );
-	static float			DistanceXY( const Vector &vector1, const Vector &vector2 );
-	static Vector			AnglesBetween( const Vector &vector1, const Vector &vector2 );
-	static float			AngleBetween( const Vector &vector1, const Vector &vector2 );
-	static bool				CloseEnough( const Vector &vector1, const Vector &vector2, const float epsilon = Vector::Epsilon()) ;
-	static bool				SmallEnough( const Vector &vector, const float epsilon = Vector::Epsilon() );
-	static float			Epsilon( void );
-	static Vector &			Identity( void );
-	Vector					operator-( void ) const;
-	friend Vector			fabs( const Vector &a );
-	float					toYaw( void	) const;
-	float					toPitch( void ) const;
-	Vector					toAngles( void ) const;
-	Vector					AnglesMod( void ) const;
-	void					AngleVectors( Vector *forward, Vector *right = NULL, Vector *up = NULL )  const;
-	void					AngleVectorsLeft( Vector *forward, Vector *right = NULL, Vector *up = NULL )  const;
-	friend Vector			LerpVector( const Vector &w1, const Vector &w2, const float t );
-	friend float			MaxValue( const Vector &a );
-	Vector					GetRotatedX( float angle ) const;
-	void					RotateX( double angle );
-	Vector					GetRotatedY( float angle ) const;
-	void					RotateY( double angle );
-	Vector					GetRotatedZ( float angle ) const;
-	void					RotateZ( float angle );
-	void					PackTo01();
-	Vector					GetPackedTo01() const;
+    float          pitch(void) const;
+    float          yaw(void) const;
+    float          roll(void) const;
+    float          operator[](const int index) const;
+    float        & operator[](const int index);
+    void           copyTo(vec3_t vec) const;
+    void           setPitch(const float x);
+    void           setYaw(const float y);
+    void           setRoll(const float z);
+    void           setXYZ(const float x, const float y, const float z);
+    const Vector & operator=(const Vector &a);
+    const Vector & operator=(vec3_t a);
+    const Vector & operator=(const char *a);
+    friend Vector  operator+(const Vector &a, const Vector &b);
+    friend Vector  operator+(vec3_t a, const Vector &b);
+    friend Vector  operator+(const Vector &a, vec3_t b);
+    const Vector & operator+=(const Vector &a);
+    const Vector & operator+=(vec3_t a);
+    friend Vector  operator-(const Vector &a, const Vector &b);
+    friend Vector  operator-(vec3_t a, const Vector &b);
+    friend Vector  operator-(const Vector &a, vec3_t b);
+    const Vector & operator-=(const Vector &a);
+    const Vector & operator-=(vec3_t a);
+    friend Vector  operator*(const Vector &a, const float b);
+    friend Vector  operator*(const float a, const Vector &b);
+    friend float   operator*(const Vector  &a, const Vector  &b);
+    friend float   operator*(vec3_t a, const Vector  &b);
+    friend float   operator*(const Vector  &a, vec3_t b);
+    const Vector & operator*=(const float a);
+    friend Vector  operator/(const Vector &a, const float b);
+    friend Vector  operator/(const float a, const Vector &b);
+    friend float   operator/(const Vector  &a, const Vector  &b);
+    friend float   operator/(vec3_t a, const Vector  &b);
+    friend float   operator/(const Vector  &a, vec3_t b);
+    const Vector & operator/=(const float a);
+    friend int     operator==(const Vector    &a, const Vector    &b);
+    friend int     operator==(vec3_t a, const Vector    &b);
+    friend int     operator==(const Vector    &a, vec3_t b);
+    friend int     operator!=(const Vector    &a, const Vector    &b);
+    friend int     operator!=(vec3_t a, const Vector    &b);
+    friend int     operator!=(const Vector    &a, vec3_t b);
+    int            FuzzyEqual(const Vector           &b, const float epsilon) const;
+    int            FuzzyEqual(vec3_t b, const float epsilon) const;
+    const Vector & CrossProduct(const Vector a, const Vector b);
+    const Vector & CrossProduct(vec3_t a, const Vector b);
+    const Vector & CrossProduct(const Vector a, vec3_t b);
+    float          length(void) const;
+    float          lengthfast(void) const;
+    float          lengthSquared(void) const;
+    float          lengthXY() const;
+    float          lengthXYSquared() const;
+    float          normalize(void);
+    void           normalizefast(void);
+    void           EulerNormalize(void);
+    void           EulerNormalize360(void);
+    static Vector  Clamp(const Vector &value, const Vector &min, const Vector &max);
+    static void    Clamp(Vector   &value, const Vector   &min, const Vector   &max);
+    static Vector  Cross(const Vector &vector1, const Vector &vector2);
+    static float   Dot(const Vector  &vector1, const Vector  &vector2);
+    static float   Dot(vec3_t a, const Vector  &b);
+    static float   Dot(const Vector  &a, vec3_t b);
+    static float   Distance(const Vector  &vector1, const Vector  &vector2);
+    static float   DistanceSquared(const Vector  &vector1, const Vector  &vector2);
+    static float   DistanceXY(const Vector  &vector1, const Vector  &vector2);
+    static Vector  AnglesBetween(const Vector &vector1, const Vector &vector2);
+    static float   AngleBetween(const Vector  &vector1, const Vector  &vector2);
+    static bool    CloseEnough(const Vector   &vector1, const Vector   &vector2, const float epsilon = Vector::Epsilon());
+    static bool    SmallEnough(const Vector   &vector, const float epsilon = Vector::Epsilon());
+    static float   Epsilon(void);
+    static Vector& Identity(void);
+    Vector         operator-(void) const;
+    friend Vector  fabs(const Vector &a);
+    float          toYaw(void) const;
+    float          toPitch(void) const;
+    Vector         toAngles(void) const;
+    Vector         AnglesMod(void) const;
+    void           AngleVectors(Vector *forward, Vector *right = NULL, Vector *up = NULL) const;
+    void           AngleVectorsLeft(Vector *forward, Vector *right = NULL, Vector *up = NULL) const;
+    friend Vector  LerpVector(const Vector &w1, const Vector &w2, const float t);
+    friend float   MaxValue(const Vector  &a);
+    Vector         GetRotatedX(float angle) const;
+    void           RotateX(double angle);
+    Vector         GetRotatedY(float angle) const;
+    void           RotateY(double angle);
+    Vector         GetRotatedZ(float angle) const;
+    void           RotateZ(float angle);
+    void           PackTo01();
+    Vector         GetPackedTo01() const;
 };
 
-static Vector vec_origin = Vector( 0, 0, 0 );
-static Vector vec_zero = Vector( 0, 0, 0 );
-static Vector g_vEyeDir = Vector( 0, 0, 0 );
+static Vector vec_origin = Vector(0, 0, 0);
+static Vector vec_zero   = Vector(0, 0, 0);
+static Vector g_vEyeDir  = Vector(0, 0, 0);
 
-inline float Vector::pitch( void ) const		{ return x; }
-inline float Vector::yaw( void ) const			{ return y; }
-inline float Vector::roll( void ) const			{ return z; }
-inline void  Vector::setPitch( float pitch )	{ x = pitch; }
-inline void  Vector::setYaw( float yaw )		{ y = yaw; }
-inline void  Vector::setRoll( float roll )		{ z = roll; }
-
-inline void Vector::copyTo(	vec3_t vec ) const
+inline float Vector::pitch(void) const
 {
-	vec[ 0 ] = x;
-	vec[ 1 ] = y;
-	vec[ 2 ] = z;
+    return x;
 }
 
-inline float Vector::operator[]( const int index ) const
+inline float Vector::yaw(void) const
 {
-	assert( ( index >= 0 ) && ( index < 3 ) );
-	return ( &x )[ index ];
+    return y;
 }
 
-inline float& Vector::operator[]( const int index )
+inline float Vector::roll(void) const
 {
-	assert( ( index >= 0 ) && ( index < 3 ) );
-	return ( &x )[ index ];
+    return z;
 }
 
-inline void  Vector::setXYZ( const float new_x, const float new_y,const float new_z	)
+inline void Vector::setPitch(float pitch)
 {
-	x = new_x;
-	y = new_y;
-	z = new_z;
+    x = pitch;
 }
 
-inline Vector::Vector(): x( 0 ), y( 0 ), z( 0 )
+inline void Vector::setYaw(float yaw)
 {
+    y = yaw;
 }
 
-inline Vector::Vector( const vec3_t src ): x( src[0] ),	y( src[1] ), z( src[2] )
+inline void Vector::setRoll(float roll)
 {
+    z = roll;
 }
 
-inline Vector::Vector( const float init_x, const float init_y, const float init_z ): x( init_x ), y( init_y ), z( init_z )
+inline void Vector::copyTo(vec3_t vec) const
 {
+    vec[0] = x;
+    vec[1] = y;
+    vec[2] = z;
 }
 
-inline Vector::Vector( const char *text	): x( 0 ), y( 0 ), z( 0 )
+inline float Vector::operator[](const int index) const
 {
-	if ( text )
-	{
-		if ( text[0] == '"' )
-			sscanf( text, "\"%f %f %f\"", &x, &y, &z );
-		else
-			sscanf( text, "%f %f %f", &x, &y, &z );
-	}
+    assert((index >= 0) && (index < 3));
+    return (&x)[index];
 }
 
-inline Vector::operator float * ( void )
+inline float& Vector::operator[](const int index)
 {
-	return &x;
+    assert((index >= 0) && (index < 3));
+    return (&x)[index];
 }
 
-inline Vector::operator float const * ( void ) const
+inline void Vector::setXYZ(const float new_x, const float new_y, const float new_z)
 {
-	return &x;
+    x = new_x;
+    y = new_y;
+    z = new_z;
 }
 
-inline const Vector & Vector::operator=( const Vector &a )
-{
-	x = a.x;
-	y = a.y;
-	z = a.z;
+inline Vector::Vector()
+    : x(0)
+    , y(0)
+    , z(0)
+{}
 
-	return *this;
+inline Vector::Vector(const vec3_t src)
+    : x(src[0])
+    , y(src[1])
+    , z(src[2])
+{}
+
+inline Vector::Vector(const float init_x, const float init_y, const float init_z)
+    : x(init_x)
+    , y(init_y)
+    , z(init_z)
+{}
+
+inline Vector::Vector(const char *text)
+    : x(0)
+    , y(0)
+    , z(0)
+{
+    if (text) {
+        if (text[0] == '"') {
+            sscanf(text, "\"%f %f %f\"", &x, &y, &z);
+        } else {
+            sscanf(text, "%f %f %f", &x, &y, &z);
+        }
+    }
 }
 
-inline const Vector & Vector::operator=( vec3_t a )
+inline Vector::operator float *(void)
 {
-	x = a[ 0 ];
-	y = a[ 1 ];
-	z = a[ 2 ];
-
-	return *this;
+    return &x;
 }
 
-inline const Vector & Vector::operator=( const char *a )
+inline Vector::operator const float *(void) const
 {
-	if( a )
-	{
-		if( a[ 0 ] == '"' )
-			sscanf( a, "\"%f %f %f\"", &x, &y, &z );
-		else
-			sscanf( a, "%f %f %f", &x, &y, &z );
-	}
-
-	return *this;
+    return &x;
 }
 
-inline Vector operator+( const Vector &a, const Vector &b )
+inline const Vector& Vector::operator=(const Vector& a)
 {
-	return Vector( a.x + b.x, a.y + b.y, a.z + b.z );
+    x = a.x;
+    y = a.y;
+    z = a.z;
+
+    return *this;
 }
 
-inline Vector operator+( vec3_t a, const Vector &b )
+inline const Vector& Vector::operator=(vec3_t a)
 {
-	return Vector( a[ 0 ] + b.x, a[ 1 ] + b.y, a[ 2 ] + b.z );
+    x = a[0];
+    y = a[1];
+    z = a[2];
+
+    return *this;
 }
 
-inline Vector operator+( const Vector &a, vec3_t b )
+inline const Vector& Vector::operator=(const char *a)
 {
-	return Vector( a.x + b[ 0 ], a.y + b[ 1 ], a.z + b[ 2 ] );
+    if (a) {
+        if (a[0] == '"') {
+            sscanf(a, "\"%f %f %f\"", &x, &y, &z);
+        } else {
+            sscanf(a, "%f %f %f", &x, &y, &z);
+        }
+    }
+
+    return *this;
 }
 
-inline const Vector & Vector::operator+=( const Vector &a )
+inline Vector operator+(const Vector& a, const Vector& b)
 {
-	x += a.x;
-	y += a.y;
-	z += a.z;
-
-	return *this;
+    return Vector(a.x + b.x, a.y + b.y, a.z + b.z);
 }
 
-inline const Vector & Vector::operator+=( vec3_t a	)
+inline Vector operator+(vec3_t a, const Vector& b)
 {
-	x += a[ 0 ];
-	y += a[ 1 ];
-	z += a[ 2 ];
-
-	return *this;
+    return Vector(a[0] + b.x, a[1] + b.y, a[2] + b.z);
 }
 
-inline Vector operator-( const Vector &a, const Vector &b )
+inline Vector operator+(const Vector& a, vec3_t b)
 {
-	return Vector( a.x - b.x, a.y - b.y, a.z - b.z );
+    return Vector(a.x + b[0], a.y + b[1], a.z + b[2]);
 }
 
-inline Vector operator-( vec3_t a, const Vector &b )
+inline const Vector& Vector::operator+=(const Vector& a)
 {
-	return Vector( a[ 0 ] - b.x, a[ 1 ] - b.y, a[ 2 ] - b.z );
+    x += a.x;
+    y += a.y;
+    z += a.z;
+
+    return *this;
 }
 
-inline Vector operator-( const Vector &a, vec3_t b )
+inline const Vector& Vector::operator+=(vec3_t a)
 {
-	return Vector( a.x - b[ 0 ], a.y - b[ 1 ], a.z - b[ 2 ] );
+    x += a[0];
+    y += a[1];
+    z += a[2];
+
+    return *this;
 }
 
-inline const Vector & Vector::operator-=( const Vector &a )
+inline Vector operator-(const Vector& a, const Vector& b)
 {
-	x -= a.x;
-	y -= a.y;
-	z -= a.z;
-
-	return *this;
+    return Vector(a.x - b.x, a.y - b.y, a.z - b.z);
 }
 
-inline const Vector & Vector::operator-=( vec3_t a )
+inline Vector operator-(vec3_t a, const Vector& b)
 {
-	x -= a[ 0 ];
-	y -= a[ 1 ];
-	z -= a[ 2 ];
-
-	return *this;
+    return Vector(a[0] - b.x, a[1] - b.y, a[2] - b.z);
 }
 
-inline Vector operator*( const Vector &a, const float b )
+inline Vector operator-(const Vector& a, vec3_t b)
 {
-	return Vector( a.x * b, a.y * b, a.z * b );
+    return Vector(a.x - b[0], a.y - b[1], a.z - b[2]);
 }
 
-inline Vector operator*( const float a,	const Vector &b	)
+inline const Vector& Vector::operator-=(const Vector& a)
 {
-	return b * a;
+    x -= a.x;
+    y -= a.y;
+    z -= a.z;
+
+    return *this;
 }
 
-inline float operator*(	const Vector &a, const Vector &b )
+inline const Vector& Vector::operator-=(vec3_t a)
 {
-	return ( a.x * b.x ) + ( a.y * b.y ) + ( a.z * b.z );
+    x -= a[0];
+    y -= a[1];
+    z -= a[2];
+
+    return *this;
 }
 
-inline float operator*( vec3_t a, const Vector &b )
+inline Vector operator*(const Vector& a, const float b)
 {
-	return ( a[ 0 ] * b.x ) + ( a[ 1 ] * b.y ) + ( a[ 2 ] * b.z );
+    return Vector(a.x * b, a.y * b, a.z * b);
 }
 
-inline float operator*(	const Vector &a, vec3_t b )
+inline Vector operator*(const float a, const Vector& b)
 {
-	return ( a.x * b[ 0 ] ) + ( a.y * b[ 1 ] ) + ( a.z * b[ 2 ] );
+    return b * a;
 }
 
-inline const Vector& Vector::operator*=( const float a )
+inline float operator*(const Vector& a, const Vector& b)
 {
-	x *= a;
-	y *= a;
-	z *= a;
-
-	return *this;
+    return (a.x * b.x) + (a.y * b.y) + (a.z * b.z);
 }
 
-inline Vector operator/( const Vector &a, const float b )
+inline float operator*(vec3_t a, const Vector& b)
 {
-	return Vector (a.x/b, a.y/b, a.z/b);
+    return (a[0] * b.x) + (a[1] * b.y) + (a[2] * b.z);
 }
 
-inline Vector operator/( const float a,	const Vector &b	)
+inline float operator*(const Vector& a, vec3_t b)
 {
-	return b / a;
+    return (a.x * b[0]) + (a.y * b[1]) + (a.z * b[2]);
 }
 
-inline float operator/(	const Vector &a, const Vector &b )
+inline const Vector& Vector::operator*=(const float a)
 {
-	return ( a.x / b.x ) + ( a.y / b.y ) + ( a.z / b.z );
+    x *= a;
+    y *= a;
+    z *= a;
+
+    return *this;
 }
 
-inline float operator/( vec3_t a, const Vector &b )
+inline Vector operator/(const Vector& a, const float b)
 {
-	return ( a[ 0 ] / b.x ) + ( a[ 1 ] / b.y ) + ( a[ 2 ] / b.z );
+    return Vector(a.x / b, a.y / b, a.z / b);
 }
 
-inline float operator/(	const Vector &a, vec3_t b )
+inline Vector operator/(const float a, const Vector& b)
 {
-	return ( a.x / b[ 0 ] ) + ( a.y / b[ 1 ] ) + ( a.z / b[ 2 ] );
+    return b / a;
 }
 
-inline const Vector &	Vector::operator/=( const float a )
+inline float operator/(const Vector& a, const Vector& b)
 {
-	*this=*this/a;
-	return *this;
+    return (a.x / b.x) + (a.y / b.y) + (a.z / b.z);
 }
 
-inline int Vector::FuzzyEqual( const Vector &b, const float epsilon ) const
+inline float operator/(vec3_t a, const Vector& b)
 {
-	return
-		(
-		( VECTOR_FABS( x - b.x ) < epsilon ) &&
-		( VECTOR_FABS( y - b.y ) < epsilon ) &&
-		( VECTOR_FABS( z - b.z ) < epsilon )
-		);
+    return (a[0] / b.x) + (a[1] / b.y) + (a[2] / b.z);
 }
 
-inline int Vector::FuzzyEqual( vec3_t b, const float epsilon ) const
+inline float operator/(const Vector& a, vec3_t b)
 {
-	return
-		(
-		( VECTOR_FABS( x - b[ 0 ] ) < epsilon ) &&
-		( VECTOR_FABS( y - b[ 1 ] ) < epsilon ) &&
-		( VECTOR_FABS( z - b[ 2 ] ) < epsilon )
-		);
+    return (a.x / b[0]) + (a.y / b[1]) + (a.z / b[2]);
 }
 
-inline int operator==( const Vector &a, const Vector &b	)
+inline const Vector& Vector::operator/=(const float a)
 {
-	return ( ( a.x == b.x ) && ( a.y == b.y ) && ( a.z == b.z ) );
+    *this = *this / a;
+    return *this;
 }
 
-inline int operator==( vec3_t a, const Vector &b )
+inline int Vector::FuzzyEqual(const Vector& b, const float epsilon) const
 {
-	return ( ( a[ 0 ] == b.x ) && ( a[ 1 ] == b.y ) && ( a[ 2 ] == b.z ) );
+    return ((VECTOR_FABS(x - b.x) < epsilon) && (VECTOR_FABS(y - b.y) < epsilon) && (VECTOR_FABS(z - b.z) < epsilon));
 }
 
-inline int operator==( const Vector &a, vec3_t b )
+inline int Vector::FuzzyEqual(vec3_t b, const float epsilon) const
 {
-	return ( ( a.x == b[ 0 ] ) && ( a.y == b[ 1 ] ) && ( a.z == b[ 2 ] ) );
+    return (
+        (VECTOR_FABS(x - b[0]) < epsilon) && (VECTOR_FABS(y - b[1]) < epsilon) && (VECTOR_FABS(z - b[2]) < epsilon)
+    );
 }
 
-inline int operator!=( const Vector &a,	const Vector &b	)
+inline int operator==(const Vector& a, const Vector& b)
 {
-	return ( ( a.x != b.x ) || ( a.y != b.y ) || ( a.z != b.z ) );
+    return ((a.x == b.x) && (a.y == b.y) && (a.z == b.z));
 }
 
-inline int operator!=( vec3_t a, const Vector &b )
+inline int operator==(vec3_t a, const Vector& b)
 {
-	return ( ( a[ 0 ] != b.x ) || ( a[ 1 ] != b.y ) || ( a[ 2 ] != b.z ) );
+    return ((a[0] == b.x) && (a[1] == b.y) && (a[2] == b.z));
 }
 
-inline int operator!=( const Vector &a, vec3_t b )
+inline int operator==(const Vector& a, vec3_t b)
 {
-	return ( ( a.x != b[ 0 ] ) || ( a.y != b[ 1 ] ) || ( a.z != b[ 2 ] ) );
+    return ((a.x == b[0]) && (a.y == b[1]) && (a.z == b[2]));
 }
 
-inline const Vector & Vector::CrossProduct( const Vector &a, const Vector &b )
+inline int operator!=(const Vector& a, const Vector& b)
 {
-	x = ( a.y * b.z ) - ( a.z * b.y );
-	y = ( a.z * b.x ) - ( a.x * b.z );
-	z = ( a.x * b.y ) - ( a.y * b.x );
-
-	return *this;
+    return ((a.x != b.x) || (a.y != b.y) || (a.z != b.z));
 }
 
-inline const Vector & Vector::CrossProduct( vec3_t a, const Vector &b )
+inline int operator!=(vec3_t a, const Vector& b)
 {
-	x = ( a[ 1 ] * b.z ) - ( a[ 2 ] * b.y );
-	y = ( a[ 2 ] * b.x ) - ( a[ 0 ] * b.z );
-	z = ( a[ 0 ] * b.y ) - ( a[ 1 ] * b.x );
-
-	return *this;
+    return ((a[0] != b.x) || (a[1] != b.y) || (a[2] != b.z));
 }
 
-inline const Vector & Vector::CrossProduct( const Vector &a, vec3_t b )
+inline int operator!=(const Vector& a, vec3_t b)
 {
-	x = ( a.y * b[ 2 ] ) - ( a.z * b[ 1 ] );
-	y = ( a.z * b[ 0 ] ) - ( a.x * b[ 2 ] );
-	z = ( a.x * b[ 1 ] ) - ( a.y * b[ 0 ] );
-
-	return *this;
+    return ((a.x != b[0]) || (a.y != b[1]) || (a.z != b[2]));
 }
 
-inline Vector Vector::Clamp(const Vector &value, const Vector &minimum, const Vector &maximum )
+inline const Vector& Vector::CrossProduct(const Vector a, const Vector b)
 {
-	Vector clamped(value);
-	Vector::Clamp(clamped, minimum, maximum);
-	return clamped;
+    x = (a.y * b.z) - (a.z * b.y);
+    y = (a.z * b.x) - (a.x * b.z);
+    z = (a.x * b.y) - (a.y * b.x);
+
+    return *this;
 }
 
-inline void Vector::Clamp(Vector &value, const Vector &minimum, const Vector &maximum)
+inline const Vector& Vector::CrossProduct(vec3_t a, const Vector b)
 {
-	for (int i = 0; i < 3; i++)
-	{
-		Q_clamp(value[i], minimum[i], maximum[i]);
-	}
-}
-inline Vector Vector::Cross( const Vector &vector1, const Vector &vector2 )
-{
-	const Vector result (
-	( vector1.y * vector2.z ) - ( vector1.z * vector2.y ),
-	( vector1.z * vector2.x ) - ( vector1.x * vector2.z ),
-	( vector1.x * vector2.y ) - ( vector1.y * vector2.x )
-	);
+    x = (a[1] * b.z) - (a[2] * b.y);
+    y = (a[2] * b.x) - (a[0] * b.z);
+    z = (a[0] * b.y) - (a[1] * b.x);
 
-	return result;
+    return *this;
 }
 
-
-inline float Vector::Dot( const Vector &vector1, const Vector &vector2 )
+inline const Vector& Vector::CrossProduct(const Vector a, vec3_t b)
 {
-	return vector1 * vector2;
+    x = (a.y * b[2]) - (a.z * b[1]);
+    y = (a.z * b[0]) - (a.x * b[2]);
+    z = (a.x * b[1]) - (a.y * b[0]);
+
+    return *this;
 }
 
-inline float Vector::Dot( vec3_t vector1, const Vector &vector2 )
+inline Vector Vector::Clamp(const Vector& value, const Vector& minimum, const Vector& maximum)
 {
-	return vector1 * vector2;
+    Vector clamped(value);
+    Vector::Clamp(clamped, minimum, maximum);
+    return clamped;
 }
 
-inline float Vector::Dot( const Vector &vector1, vec3_t vector2 )
+inline void Vector::Clamp(Vector& value, const Vector& minimum, const Vector& maximum)
 {
-	return vector1 * vector2;
+    for (int i = 0; i < 3; i++) {
+        Q_clamp(value[i], minimum[i], maximum[i]);
+    }
+}
+
+inline Vector Vector::Cross(const Vector& vector1, const Vector& vector2)
+{
+    const Vector result(
+        (vector1.y * vector2.z) - (vector1.z * vector2.y),
+        (vector1.z * vector2.x) - (vector1.x * vector2.z),
+        (vector1.x * vector2.y) - (vector1.y * vector2.x)
+    );
+
+    return result;
+}
+
+inline float Vector::Dot(const Vector& vector1, const Vector& vector2)
+{
+    return vector1 * vector2;
+}
+
+inline float Vector::Dot(vec3_t vector1, const Vector& vector2)
+{
+    return vector1 * vector2;
+}
+
+inline float Vector::Dot(const Vector& vector1, vec3_t vector2)
+{
+    return vector1 * vector2;
 }
 
 //----------------------------------------------------------------
@@ -522,19 +545,19 @@ inline float Vector::Dot( const Vector &vector1, vec3_t vector2 )
 //
 // Returns:			float - squared length
 //----------------------------------------------------------------
-inline float Vector::lengthSquared( void ) const
+inline float Vector::lengthSquared(void) const
 {
-	return ( x * x ) + ( y * y ) + ( z * z );
+    return (x * x) + (y * y) + (z * z);
 }
 
-inline float Vector::length( void ) const
+inline float Vector::length(void) const
 {
-	return sqrt( lengthSquared() );
+    return sqrt(lengthSquared());
 }
 
-inline float Vector::lengthfast( void ) const
+inline float Vector::lengthfast(void) const
 {
-	return vrsqrt( lengthSquared() );
+    return vrsqrt(lengthSquared());
 }
 
 //----------------------------------------------------------------
@@ -550,7 +573,7 @@ inline float Vector::lengthfast( void ) const
 //----------------------------------------------------------------
 inline float Vector::lengthXY() const
 {
-	return sqrt(( x * x ) + ( y * y ));
+    return sqrt((x * x) + (y * y));
 }
 
 //----------------------------------------------------------------
@@ -566,7 +589,7 @@ inline float Vector::lengthXY() const
 //----------------------------------------------------------------
 inline float Vector::lengthXYSquared() const
 {
-	return ( x * x ) + ( y * y );
+    return (x * x) + (y * y);
 }
 
 //----------------------------------------------------------------
@@ -579,20 +602,9 @@ inline float Vector::lengthXYSquared() const
 //
 // Returns:			float - length of the vector before the function
 //----------------------------------------------------------------
-inline float Vector::normalize( void )
+inline float Vector::normalize(void)
 {
-	float	length, ilength;
-
-	length = this->length();
-	if ( length )
-	{
-		ilength = 1.0f / length;
-		x *= ilength;
-		y *= ilength;
-		z *= ilength;
-	}
-
-	return length;
+    return VectorNormalize(*this);
 }
 
 //----------------------------------------------------------------
@@ -605,15 +617,15 @@ inline float Vector::normalize( void )
 //
 // Returns:			float - length of the vector before the function
 //----------------------------------------------------------------
-inline void Vector::normalizefast( void )
+inline void Vector::normalizefast(void)
 {
-	float ilength;
+    float ilength;
 
-	ilength = this->lengthfast();
+    ilength = this->lengthfast();
 
-	x *= ilength;
-	y *= ilength;
-	z *= ilength;
+    x *= ilength;
+    y *= ilength;
+    z *= ilength;
 }
 
 //----------------------------------------------------------------
@@ -629,11 +641,11 @@ inline void Vector::normalizefast( void )
 //
 // Returns:			None
 //----------------------------------------------------------------
-inline void Vector::EulerNormalize( void )
+inline void Vector::EulerNormalize(void)
 {
-	x = AngleNormalize180( x );
-	y = AngleNormalize180( y );
-	z = AngleNormalize180( z );
+    x = AngleNormalize180(x);
+    y = AngleNormalize180(y);
+    z = AngleNormalize180(z);
 }
 
 //----------------------------------------------------------------
@@ -649,11 +661,11 @@ inline void Vector::EulerNormalize( void )
 //
 // Returns:			None
 //----------------------------------------------------------------
-inline void Vector::EulerNormalize360( void )
+inline void Vector::EulerNormalize360(void)
 {
-	x = AngleNormalize360( x );
-	y = AngleNormalize360( y );
-	z = AngleNormalize360( z );
+    x = AngleNormalize360(x);
+    y = AngleNormalize360(y);
+    z = AngleNormalize360(z);
 }
 
 //----------------------------------------------------------------
@@ -666,9 +678,9 @@ inline void Vector::EulerNormalize360( void )
 //
 // Returns:			float - the epsilon constant for the class
 //----------------------------------------------------------------
-inline float Vector::Epsilon( void )
+inline float Vector::Epsilon(void)
 {
-	return 0.000000001f;
+    return 0.000000001f;
 }
 
 //----------------------------------------------------------------
@@ -681,9 +693,9 @@ inline float Vector::Epsilon( void )
 //
 // Returns:			Vector - the identity for the class
 //----------------------------------------------------------------
-inline Vector & Vector::Identity(void)
+inline Vector& Vector::Identity(void)
 {
-	return vec_zero;
+    return vec_zero;
 }
 
 //----------------------------------------------------------------
@@ -698,9 +710,9 @@ inline Vector & Vector::Identity(void)
 //
 // Returns:			float - distance between the two vectors
 //----------------------------------------------------------------
-inline float Vector::Distance(const Vector &vector1, const Vector &vector2)
+inline float Vector::Distance(const Vector& vector1, const Vector& vector2)
 {
-	return (vector1 - vector2).length();
+    return (vector1 - vector2).length();
 }
 
 //----------------------------------------------------------------
@@ -715,9 +727,9 @@ inline float Vector::Distance(const Vector &vector1, const Vector &vector2)
 //
 // Returns:			float - distance between the two vectors squared
 //----------------------------------------------------------------
-inline float Vector::DistanceSquared(const Vector &vector1, const Vector &vector2)
+inline float Vector::DistanceSquared(const Vector& vector1, const Vector& vector2)
 {
-	return (vector1 - vector2).lengthSquared();
+    return (vector1 - vector2).lengthSquared();
 }
 
 //----------------------------------------------------------------
@@ -734,45 +746,37 @@ inline float Vector::DistanceSquared(const Vector &vector1, const Vector &vector
 // Returns:			float - distance between the two vectors in the
 //						xy plane
 //----------------------------------------------------------------
-inline float Vector::DistanceXY(const Vector &vector1, const Vector &vector2)
+inline float Vector::DistanceXY(const Vector& vector1, const Vector& vector2)
 {
-	return (vector1 - vector2).lengthXY();
+    return (vector1 - vector2).lengthXY();
 }
 
-inline Vector Vector::toAngles( void ) const
+inline Vector Vector::toAngles(void) const
 {
-	float	forward;
-	float	yaw, pitch;
+    float forward;
+    float yaw, pitch;
 
-	if ( ( x == 0.0f ) && ( y == 0.0f ) )
-	{
-		yaw = 0.0f;
-		if ( z > 0.0f )
-		{
-			pitch = 90.0f;
-		}
-		else
-		{
-			pitch = 270.0f;
-		}
-	}
-	else
-	{
-		yaw = atan2( y, x ) * 180.0f / M_PI;
-		if ( yaw < 0.0f )
-		{
-			yaw += 360.0f;
-		}
+    if ((x == 0.0f) && (y == 0.0f)) {
+        yaw = 0.0f;
+        if (z > 0.0f) {
+            pitch = 90.0f;
+        } else {
+            pitch = 270.0f;
+        }
+    } else {
+        yaw = atan2(y, x) * 180.0f / M_PI;
+        if (yaw < 0.0f) {
+            yaw += 360.0f;
+        }
 
-		forward = ( float )sqrt( x * x + y * y );
-		pitch = atan2( z, forward ) * 180.0f / M_PI;
-		if ( pitch < 0.0f )
-		{
-			pitch += 360.0f;
-		}
-	}
+        forward = (float)sqrt(x * x + y * y);
+        pitch   = atan2(z, forward) * 180.0f / M_PI;
+        if (pitch < 0.0f) {
+            pitch += 360.0f;
+        }
+    }
 
-	return Vector( -pitch, yaw, 0.0f );
+    return Vector(-pitch, yaw, 0.0f);
 }
 
 //----------------------------------------------------------------
@@ -788,16 +792,16 @@ inline Vector Vector::toAngles( void ) const
 //
 // Returns:			Vector - angles between the vectors
 //----------------------------------------------------------------
-inline Vector Vector::AnglesBetween(const Vector &vector1, const Vector &vector2)
+inline Vector Vector::AnglesBetween(const Vector& vector1, const Vector& vector2)
 {
-	Vector unitVector1(vector1);
-	unitVector1.normalize();
-	Vector unitVector2(vector2);
-	unitVector2.normalize();
-	Vector angles(unitVector1.toAngles() - unitVector2.toAngles());
-	angles.EulerNormalize();
+    Vector unitVector1(vector1);
+    unitVector1.normalize();
+    Vector unitVector2(vector2);
+    unitVector2.normalize();
+    Vector angles(unitVector1.toAngles() - unitVector2.toAngles());
+    angles.EulerNormalize();
 
-	return angles;
+    return angles;
 }
 
 //----------------------------------------------------------------
@@ -813,14 +817,14 @@ inline Vector Vector::AnglesBetween(const Vector &vector1, const Vector &vector2
 //
 // Returns:			float - angle between the vectors
 //----------------------------------------------------------------
-inline float Vector::AngleBetween(const Vector &vector1, const Vector &vector2)
+inline float Vector::AngleBetween(const Vector& vector1, const Vector& vector2)
 {
-	Vector unitVector1(vector1);
-	unitVector1.normalize();
-	Vector unitVector2(vector2);
-	unitVector2.normalize();
+    Vector unitVector1(vector1);
+    unitVector1.normalize();
+    Vector unitVector2(vector2);
+    unitVector2.normalize();
 
-	return acos( Vector::Dot( unitVector1, unitVector2 ) );
+    return acos(Vector::Dot(unitVector1, unitVector2));
 }
 
 //----------------------------------------------------------------
@@ -838,9 +842,9 @@ inline float Vector::AngleBetween(const Vector &vector1, const Vector &vector2)
 //
 // Returns:			bool	 - the result of the test for closeness
 //----------------------------------------------------------------
-inline bool Vector::CloseEnough(const Vector &vector1, const Vector &vector2, const float epsilon)
+inline bool Vector::CloseEnough(const Vector& vector1, const Vector& vector2, const float epsilon)
 {
-	return Distance(vector1, vector2) < epsilon;
+    return Distance(vector1, vector2) < epsilon;
 }
 
 //----------------------------------------------------------------
@@ -857,437 +861,406 @@ inline bool Vector::CloseEnough(const Vector &vector1, const Vector &vector2, co
 //
 // Returns:			bool	 - the result of the test for smallness
 //----------------------------------------------------------------
-inline bool Vector::SmallEnough(const Vector &vector, const float epsilon)
+inline bool Vector::SmallEnough(const Vector& vector, const float epsilon)
 {
-	return CloseEnough(vector, Vector::Identity(), epsilon);
+    return CloseEnough(vector, Vector::Identity(), epsilon);
 }
 
 inline Vector Vector::operator-() const
 {
-	return Vector( -x, -y, -z );
+    return Vector(-x, -y, -z);
 }
 
-inline Vector fabs( const Vector &a )
+inline Vector fabs(const Vector& a)
 {
-	return Vector( VECTOR_FABS( a.x ), VECTOR_FABS( a.y ), VECTOR_FABS( a.z ) );
+    return Vector(VECTOR_FABS(a.x), VECTOR_FABS(a.y), VECTOR_FABS(a.z));
 }
 
-inline float MaxValue( const Vector &a )
+inline float MaxValue(const Vector& a)
 {
-	float maxy;
-	float maxz;
-	float max;
+    float maxy;
+    float maxz;
+    float max;
 
-	max = VECTOR_FABS( a.x );
-	maxy = VECTOR_FABS( a.y );
-	maxz = VECTOR_FABS( a.z );
+    max  = VECTOR_FABS(a.x);
+    maxy = VECTOR_FABS(a.y);
+    maxz = VECTOR_FABS(a.z);
 
-	if ( maxy > max )
-	{
-		max = maxy;
-	}
-	if ( maxz > max )
-	{
-		max = maxz;
-	}
-	return max;
+    if (maxy > max) {
+        max = maxy;
+    }
+    if (maxz > max) {
+        max = maxz;
+    }
+    return max;
 }
 
-inline float Vector::toYaw( void ) const
+inline float Vector::toYaw(void) const
 {
-	float yaw;
+    float yaw;
 
-	if ( ( y == 0.0f ) && ( x == 0.0f ) )
-	{
-		yaw = 0.0f;
-	}
-	else
-	{
-		yaw = ( float )( ( int )( atan2( y, x ) * 180.0f / M_PI ) );
-		if ( yaw < 0.0f )
-		{
-			yaw += 360.0f;
-		}
-	}
+    if ((y == 0.0f) && (x == 0.0f)) {
+        yaw = 0.0f;
+    } else {
+        yaw = (float)((int)(atan2(y, x) * 180.0f / M_PI));
+        if (yaw < 0.0f) {
+            yaw += 360.0f;
+        }
+    }
 
-	return yaw;
+    return yaw;
 }
 
-inline float Vector::toPitch( void ) const
+inline float Vector::toPitch(void) const
 {
-	float	forward;
-	float	pitch;
+    float forward;
+    float pitch;
 
-	if ( ( x == 0.0f ) && ( y == 0.0f ) )
-	{
-		if ( z > 0.0f )
-		{
-			pitch = 90.0f;
-		}
-		else
-		{
-			pitch = 270.0f;
-		}
-	}
-	else
-	{
-		forward = ( float )sqrt( ( x * x ) + ( y * y ) );
-		pitch = ( float )( ( int )( atan2( z, forward ) * 180.0f / M_PI ) );
-		if ( pitch < 0.0f )
-		{
-			pitch += 360.0f;
-		}
-	}
+    forward = (float)sqrt((x * x) + (y * y));
+    pitch = (float)((int)(atan2(z, forward) * 180 / M_PI));
+    if (pitch < 0.0f) {
+        pitch += 360.0f;
+    }
 
-	return pitch;
+    return pitch;
 }
 
-inline Vector Vector::AnglesMod( void ) const
+inline Vector Vector::AnglesMod(void) const
 {
-	return Vector( AngleMod( x ), AngleMod( y ), AngleMod( z ) );
+    return Vector(AngleMod(x), AngleMod(y), AngleMod(z));
 }
 
-inline void Vector::AngleVectors( Vector *forward, Vector *right, Vector *up ) const
+inline void Vector::AngleVectors(Vector *forward, Vector *right, Vector *up) const
 {
-	float				angle;
-	static float	sr, sp, sy, cr, cp, cy; // static to help MS compiler fp bugs
+    float        angle;
+    static float sr, sp, sy, cr, cp, cy; // static to help MS compiler fp bugs
 
-	angle = yaw() * ( M_PI * 2.0f / 360.0f );
-	sy = sin( angle );
-	cy = cos( angle );
+    angle = yaw() * (M_PI * 2.0f / 360.0f);
+    sy    = sin(angle);
+    cy    = cos(angle);
 
-	angle = pitch() * ( M_PI * 2.0f / 360.0f );
-	sp = sin( angle );
-	cp = cos( angle );
+    angle = pitch() * (M_PI * 2.0f / 360.0f);
+    sp    = sin(angle);
+    cp    = cos(angle);
 
-	angle = roll() * ( M_PI * 2.0f / 360.0f );
-	sr = sin( angle );
-	cr = cos( angle );
+    angle = roll() * (M_PI * 2.0f / 360.0f);
+    sr    = sin(angle);
+    cr    = cos(angle);
 
-	if( forward )
-	{
-		forward->setXYZ( cp * cy, cp * sy, -sp );
-	}
+    if (forward) {
+        forward->setXYZ(cp * cy, cp * sy, -sp);
+    }
 
-	if( right )
-	{
-		right->setXYZ( ( -1 * sr * sp * cy ) + ( -1 * cr * -sy ), ( -1 * sr * sp * sy ) + ( -1 * cr * cy ), -1 * sr * cp );
-	}
+    if (right) {
+        right->setXYZ((-1 * sr * sp * cy) + (-1 * cr * -sy), (-1 * sr * sp * sy) + (-1 * cr * cy), -1 * sr * cp);
+    }
 
-	if( up )
-	{
-		up->setXYZ( ( cr * sp * cy ) + ( -sr * -sy ), ( cr * sp * sy ) + ( -sr * cy ), cr * cp );
-	}
+    if (up) {
+        up->setXYZ((cr * sp * cy) + (-sr * -sy), (cr * sp * sy) + (-sr * cy), cr * cp);
+    }
 }
 
-inline void Vector::AngleVectorsLeft( Vector *forward, Vector *left, Vector *up ) const
+inline void Vector::AngleVectorsLeft(Vector *forward, Vector *left, Vector *up) const
 {
-	float				angle;
-	static float	sr, sp, sy, cr, cp, cy; // static to help MS compiler fp bugs
+    float        angle;
+    static float sr, sp, sy, cr, cp, cy; // static to help MS compiler fp bugs
 
-	angle = yaw() * ( M_PI * 2.0f / 360.0f );
-	sy = sin( angle );
-	cy = cos( angle );
+    angle = yaw() * (M_PI * 2 / 360);
+    sy    = sin(angle);
+    cy    = cos(angle);
 
-	angle = pitch() * ( M_PI * 2.0f / 360.0f );
-	sp = sin( angle );
-	cp = cos( angle );
+    angle = pitch() * (M_PI * 2 / 360);
+    sp    = sin(angle);
+    cp    = cos(angle);
 
-	angle = roll() * ( M_PI * 2.0f / 360.0f );
-	sr = sin( angle );
-	cr = cos( angle );
+    angle = roll() * (M_PI * 2 / 360);
+    sr    = sin(angle);
+    cr    = cos(angle);
 
-	if ( forward )
-	{
-		forward->setXYZ( cp * cy, cp * sy, -sp );
-	}
+    if (forward) {
+        forward->setXYZ(cp * cy, cp * sy, -sp);
+    }
 
-	if ( left )
-	{
-		left->setXYZ( ( sr * sp * cy ) + ( cr * -sy ), (sr * sp * sy ) + ( cr * cy ), sr * cp );
-	}
+    if (left) {
+        left->setXYZ((sr * sp * cy) + (cr * -sy), (sr * sp * sy) + (cr * cy), sr * cp);
+    }
 
-	if ( up )
-	{
-		up->setXYZ( ( cr * sp * cy ) + ( -sr * -sy ), ( cr * sp * sy ) + ( -sr * cy ), cr * cp );
-	}
+    if (up) {
+        up->setXYZ((cr * sp * cy) + (-sr * -sy), (cr * sp * sy) + (-sr * cy), cr * cp);
+    }
 }
 
-
 #define LERP_DELTA 1e-6
-inline Vector LerpVector( const Vector &vector1, const Vector &vector2, const float t )
+
+inline Vector LerpVector(const Vector& vector1, const Vector& vector2, const float t)
 {
-	float	omega, cosom, sinom, scale0, scale1;
+    float omega, cosom, sinom, scale0, scale1;
 
-	Vector w1( vector1 );
-	Vector w2( vector2 );
+    Vector w1(vector1);
+    Vector w2(vector2);
 
-	w1.normalize();
-	w2.normalize();
+    w1.normalize();
+    w2.normalize();
 
-	cosom = w1 * w2;
-	if ( ( 1.0f - cosom ) > LERP_DELTA )
-	{
-		omega = acos( cosom );
-		sinom = sin( omega );
-		scale0 = sin( ( 1.0f - t ) * omega ) / sinom;
-		scale1 = sin( t * omega ) / sinom;
-	}
-	else
-	{
-		scale0 = 1.0f - t;
-		scale1 = t;
-	}
+    cosom = w1 * w2;
+    if ((1.0f - cosom) > LERP_DELTA) {
+        omega  = acos(cosom);
+        sinom  = sin(omega);
+        scale0 = sin((1.0f - t) * omega) / sinom;
+        scale1 = sin(t * omega) / sinom;
+    } else {
+        scale0 = 1.0f - t;
+        scale1 = t;
+    }
 
-	return ( ( w1 * scale0 ) + ( w2 * scale1 ) );
+    return ((w1 * scale0) + (w2 * scale1));
 }
 
 class Quat
-	{
-	public:
-		float			x;
-		float			y;
-		float			z;
-		float			w;
-
-						Quat();
-						Quat( Vector angles );
-						Quat( float scrMatrix[ 3 ][ 3 ] );
-						Quat( const float x, const float y, const float z, const float w );
-
-		float *			vec4( void );
-		float			operator[]( const int index ) const;
-		float &			operator[]( const int index );
-		void 			set( const float x, const float y, const float z, const float w );
-		const Quat &	operator=( const Quat &a );
-		friend Quat		operator+( const Quat &a, const Quat &b );
-		const Quat &	operator+=( const Quat &a );
-		friend Quat		operator-( const Quat &a, const Quat &b );
-		const Quat &	operator-=( const Quat &a );
-		friend Quat		operator*( const Quat &a, const float b );
-		friend Quat		operator*( const float a, const Quat &b );
-		const Quat &	operator*=( const float a );
-		friend int		operator==(	const Quat &a, const Quat &b );
-		friend int		operator!=(	const Quat &a, const Quat &b );
-		float			length( void ) const;
-		float			lengthSquared( void ) const;
-		const Quat &	normalize( void );
-		Quat			operator-() const;
-		Vector			toAngles( void );
-	};
-
-inline Quat::Quat(): x( 0 ), y( 0 ), z( 0 ), w( 0 )
 {
+public:
+    float x;
+    float y;
+    float z;
+    float w;
+
+    Quat();
+    Quat(Vector angles);
+    Quat(float scrMatrix[3][3]);
+    Quat(const float x, const float y, const float z, const float w);
+
+    float      *vec4(void);
+    float       operator[](const int index) const;
+    float     & operator[](const int index);
+    void        set(const float x, const float y, const float z, const float w);
+    const Quat& operator=(const Quat& a);
+    friend Quat operator+(const Quat& a, const Quat& b);
+    const Quat& operator+=(const Quat& a);
+    friend Quat operator-(const Quat& a, const Quat& b);
+    const Quat& operator-=(const Quat& a);
+    friend Quat operator*(const Quat& a, const float b);
+    friend Quat operator*(const float a, const Quat& b);
+    const Quat& operator*=(const float a);
+    friend int  operator==(const Quat &a, const Quat &b);
+    friend int  operator!=(const Quat &a, const Quat &b);
+    float       length(void) const;
+    float       lengthSquared(void) const;
+    const Quat& normalize(void);
+    Quat        operator-() const;
+    Vector      toAngles(void);
+};
+
+inline Quat::Quat()
+    : x(0)
+    , y(0)
+    , z(0)
+    , w(0)
+{}
+
+inline Quat::Quat(Vector Angles)
+{
+    EulerToQuat(Angles, this->vec4());
 }
 
-inline Quat::Quat( Vector Angles )
+inline Quat::Quat(float srcMatrix[3][3])
 {
-	EulerToQuat( Angles, this->vec4() );
+    MatToQuat(srcMatrix, this->vec4());
 }
 
-inline Quat::Quat( float srcMatrix[ 3 ][ 3 ] )
+inline Quat::Quat(const float init_x, const float init_y, const float init_z, const float init_w)
+    : x(init_x)
+    , y(init_y)
+    , z(init_z)
+    , w(init_w)
+{}
+
+inline float Quat::operator[](const int index) const
 {
-	MatToQuat( srcMatrix, this->vec4() );
+    assert((index >= 0) && (index < 4));
+    return (&x)[index];
 }
 
-inline Quat::Quat( const float init_x, const float init_y, const float init_z, const float init_w ): x( init_x ), y( init_y ), z( init_z ), w( init_w )
+inline float& Quat::operator[](const int index)
 {
+    assert((index >= 0) && (index < 4));
+    return (&x)[index];
 }
 
-inline float Quat::operator[]( const int index ) const
+inline float *Quat::vec4(void)
 {
-	assert( ( index >= 0 ) && ( index < 4 ) );
-	return ( &x )[ index ];
+    return &x;
 }
 
-inline float & Quat::operator[]( const int index)
+inline void Quat::set(const float new_x, const float new_y, const float new_z, const float new_w)
 {
-	assert( ( index >= 0 ) && ( index < 4 ) );
-	return ( &x )[ index ];
+    x = new_x;
+    y = new_y;
+    z = new_z;
+    w = new_w;
 }
 
-inline float *Quat::vec4( void )
+inline const Quat& Quat::operator=(const Quat& a)
 {
-	return &x;
+    x = a.x;
+    y = a.y;
+    z = a.z;
+    w = a.w;
+
+    return *this;
 }
 
-inline void  Quat::set(	const float new_x, const float new_y, const float new_z, const float new_w )
+inline Quat operator+(const Quat& a, const Quat& b)
 {
-	x = new_x;
-	y = new_y;
-	z = new_z;
-	w = new_w;
+    return Quat(a.x + b.x, a.y + b.y, a.z + b.z, a.w + b.w);
 }
 
-
-inline const Quat & Quat::operator=( const Quat &a )
+inline const Quat& Quat::operator+=(const Quat& a)
 {
-	x = a.x;
-	y = a.y;
-	z = a.z;
-	w = a.w;
+    *this = *this + a;
 
-	return *this;
+    return *this;
 }
 
-inline Quat operator+( const Quat &a, const Quat &b )
+inline Quat operator-(const Quat& a, const Quat& b)
 {
-	return Quat( a.x + b.x, a.y + b.y , a.z + b.z, a.w + b.w );
+    return Quat(a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w);
 }
 
-inline const Quat & Quat::operator+=( const Quat &a )
+inline const Quat& Quat::operator-=(const Quat& a)
 {
-	*this = *this + a;
+    *this = *this - a;
 
-	return *this;
+    return *this;
 }
 
-inline Quat operator-( const Quat &a, const Quat &b )
+inline Quat operator*(const Quat& a, const float b)
 {
-	return Quat( a.x - b.x, a.y - b.y, a.z - b.z, a.w - b.w );
+    return Quat(a.x * b, a.y * b, a.z * b, a.w * b);
 }
 
-inline const Quat & Quat::operator-=( const Quat &a )
+inline Quat operator*(const float a, const Quat& b)
 {
-	*this = *this - a;
-
-	return *this;
+    return b * a;
 }
 
-inline Quat operator*( const Quat &a, const float b )
+inline const Quat& Quat::operator*=(const float a)
 {
-	return Quat( a.x * b, a.y * b, a.z * b, a.w * b );
+    *this = *this * a;
+
+    return *this;
 }
 
-inline Quat operator*( const float a, const Quat &b )
+inline int operator==(const Quat& a, const Quat& b)
 {
-	return b * a;
+    return ((a.x == b.x) && (a.y == b.y) && (a.z == b.z) && (a.w == b.w));
 }
 
-inline const Quat & Quat::operator*=( const float a )
+inline int operator!=(const Quat& a, const Quat& b)
 {
-	*this = *this * a;
-
-	return *this;
+    return (((a.x != b.x) || (a.y != b.y)) || ((a.z != b.z) && (a.w != b.w)));
 }
 
-inline int operator==( const Quat &a, const Quat &b	)
+inline float Quat::length(void) const
 {
-	return ( ( a.x == b.x ) && ( a.y == b.y ) && ( a.z == b.z ) && ( a.w == b.w ) );
+    float length;
+
+    length = (x * x) + (y * y) + (z * z) + (w * w);
+    return sqrt(length);
 }
 
-inline int operator!=( const Quat &a, const Quat &b )
+inline const Quat& Quat::normalize(void)
 {
-	return (((a.x != b.x) || (a.y != b.y)) || ((a.z != b.z) && (a.w != b.w)));
-}
+    float length, ilength;
 
-inline float Quat::length( void	) const
-{
-	float	length;
+    length = this->length();
+    if (length) {
+        ilength = 1.0f / length;
+        *this *= ilength;
+    }
 
-	length = ( x * x ) + ( y * y ) + ( z * z ) + ( w * w );
-	return sqrt( length );
-}
-
-inline const Quat & Quat::normalize( void )
-{
-	float	length, ilength;
-
-	length = this->length();
-	if ( length )
-	{
-		ilength = 1.0f / length;
-		*this *= ilength;
-	}
-
-	return *this;
+    return *this;
 }
 
 inline Quat Quat::operator-() const
 {
-	return Quat( -x, -y, -z, -w );
+    return Quat(-x, -y, -z, -w);
 }
 
-inline Vector Quat::toAngles( void )
+inline Vector Quat::toAngles(void)
 {
-	float m[ 3 ][ 3 ];
-	vec3_t angles;
+    float  m[3][3];
+    vec3_t angles;
 
-	QuatToMat( this->vec4(), m );
-	MatrixToEulerAngles( m, angles );
-	return Vector( angles );
+    QuatToMat(this->vec4(), m);
+    MatrixToEulerAngles(m, angles);
+    return Vector(angles);
 }
 
-inline Vector Vector::GetRotatedX( float angle ) const
+inline Vector Vector::GetRotatedX(float angle) const
 {
-	if( angle == 0.0 )
-		return ( *this );
+    if (angle == 0.0) {
+        return (*this);
+    }
 
-	float sinAngle = ( float )sin( M_PI*angle / 180 );
-	float cosAngle = ( float )cos( M_PI*angle / 180 );
+    float sinAngle = (float)sin(M_PI * angle / 180);
+    float cosAngle = (float)cos(M_PI * angle / 180);
 
-	return Vector( x,
-		y*cosAngle - z*sinAngle,
-		y*sinAngle + z*cosAngle );
+    return Vector(x, y * cosAngle - z * sinAngle, y * sinAngle + z * cosAngle);
 }
 
-inline void Vector::RotateX( double angle )
+inline void Vector::RotateX(double angle)
 {
-	( *this ) = GetRotatedX( angle );
+    (*this) = GetRotatedX(angle);
 }
 
-inline Vector Vector::GetRotatedY( float angle ) const
+inline Vector Vector::GetRotatedY(float angle) const
 {
-	if( angle == 0.0 )
-		return ( *this );
+    if (angle == 0.0) {
+        return (*this);
+    }
 
-	float sinAngle = ( float )sin( M_PI*angle / 180 );
-	float cosAngle = ( float )cos( M_PI*angle / 180 );
+    float sinAngle = (float)sin(M_PI * angle / 180);
+    float cosAngle = (float)cos(M_PI * angle / 180);
 
-	return Vector( x*cosAngle + z*sinAngle,
-		y,
-		-x*sinAngle + z*cosAngle );
+    return Vector(x * cosAngle + z * sinAngle, y, -x * sinAngle + z * cosAngle);
 }
 
-inline void Vector::RotateY( double angle )
+inline void Vector::RotateY(double angle)
 {
-	( *this ) = GetRotatedY( angle );
+    (*this) = GetRotatedY(angle);
 }
 
-inline Vector Vector::GetRotatedZ( float angle ) const
+inline Vector Vector::GetRotatedZ(float angle) const
 {
-	if( angle == 0.0 )
-		return ( *this );
+    if (angle == 0.0) {
+        return (*this);
+    }
 
-	float sinAngle = ( float )sin( M_PI*angle / 180 );
-	float cosAngle = ( float )cos( M_PI*angle / 180 );
+    float sinAngle = (float)sin(M_PI * angle / 180);
+    float cosAngle = (float)cos(M_PI * angle / 180);
 
-	return Vector( x*cosAngle - y*sinAngle,
-		x*sinAngle + y*cosAngle,
-		z );
+    return Vector(x * cosAngle - y * sinAngle, x * sinAngle + y * cosAngle, z);
 }
 
-inline void Vector::RotateZ( float angle )
+inline void Vector::RotateZ(float angle)
 {
-	( *this ) = GetRotatedZ( angle );
+    (*this) = GetRotatedZ(angle);
 }
 
 inline void Vector::PackTo01()
 {
-	( *this ) = GetPackedTo01();
+    (*this) = GetPackedTo01();
 }
 
 inline Vector Vector::GetPackedTo01() const
 {
-	Vector temp( *this );
+    Vector temp(*this);
 
-	temp.normalize();
+    temp.normalize();
 
-	temp = temp*0.5f + Vector( 0.5f, 0.5f, 0.5f );
+    temp = temp * 0.5f + Vector(0.5f, 0.5f, 0.5f);
 
-	return temp;
+    return temp;
 }
 
 #undef VECTOR_FABS
-
-#endif /* Vector.h */
diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
deleted file mode 100644
index b1161e69..00000000
--- a/code/renderer/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(omohrenderer)
-
-file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
-
-file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
-add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
-target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
-
-add_library(omohrenderer STATIC ${SOURCES_RENDERER})
-target_include_directories(omohrenderer PUBLIC "../sdl" "../renderercommon")
-target_compile_features(omohrenderer PUBLIC cxx_nullptr)
-target_compile_features(omohrenderer PUBLIC c_variadic_macros)
-target_link_libraries(omohrenderer PRIVATE qcommon)
-target_link_libraries(omohrenderer PRIVATE omohsdl)
-target_link_libraries(omohrenderer PRIVATE jpeg8)
diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
deleted file mode 100644
index fa00f379..00000000
--- a/code/renderer/tr_backend.c
+++ /dev/null
@@ -1,1470 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-backEndData_t	*backEndData[SMP_FRAMES];
-backEndState_t	backEnd;
-
-
-static float	s_flipMatrix[16] = {
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	0, 0, -1, 0,
-	-1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 0, 1
-};
-
-void GL_SetFogColor(const vec4_t fColor) {
-	glState.fFogColor[0] = fColor[0];
-	glState.fFogColor[1] = fColor[1];
-	glState.fFogColor[2] = fColor[2];
-	glState.fFogColor[3] = fColor[3];
-
-	if (!(glState.glStateBits & GLS_FOG_COLOR)) {
-		qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-	}
-}
-
-/*
-** GL_Bind
-*/
-void GL_Bind( image_t *image ) {
-	int texnum;
-
-	if ( !image ) {
-		ri.Printf( PRINT_WARNING, "GL_Bind: NULL image\n" );
-		texnum = tr.defaultImage->texnum;
-	} else {
-		texnum = image->texnum;
-	}
-
-	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
-		texnum = tr.dlightImage->texnum;
-	}
-
-	if ( glState.currenttextures[glState.currenttmu] != texnum ) {
-		image->frameUsed = tr.frameCount;
-		glState.currenttextures[glState.currenttmu] = texnum;
-		qglBindTexture (GL_TEXTURE_2D, texnum);
-	}
-}
-
-/*
-** GL_SelectTexture
-*/
-void GL_SelectTexture( int unit )
-{
-	if ( glState.currenttmu == unit )
-	{
-		return;
-	}
-
-	if ( unit == 0 )
-	{
-		qglActiveTextureARB( GL_TEXTURE0_ARB );
-		GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE0_ARB )\n" );
-		qglClientActiveTextureARB( GL_TEXTURE0_ARB );
-		GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE0_ARB )\n" );
-	}
-	else if ( unit == 1 )
-	{
-		qglActiveTextureARB( GL_TEXTURE1_ARB );
-		GLimp_LogComment( "glActiveTextureARB( GL_TEXTURE1_ARB )\n" );
-		qglClientActiveTextureARB( GL_TEXTURE1_ARB );
-		GLimp_LogComment( "glClientActiveTextureARB( GL_TEXTURE1_ARB )\n" );
-	} else {
-		ri.Error( ERR_DROP, "GL_SelectTexture: unit = %i", unit );
-	}
-
-	glState.currenttmu = unit;
-}
-
-
-/*
-** GL_BindMultitexture
-*/
-void GL_BindMultitexture( image_t *image0, GLuint env0, image_t *image1, GLuint env1 ) {
-	int		texnum0, texnum1;
-
-	texnum0 = image0->texnum;
-	texnum1 = image1->texnum;
-
-	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
-		texnum0 = texnum1 = tr.dlightImage->texnum;
-	}
-
-	if ( glState.currenttextures[1] != texnum1 ) {
-		GL_SelectTexture( 1 );
-		image1->frameUsed = tr.frameCount;
-		glState.currenttextures[1] = texnum1;
-		qglBindTexture( GL_TEXTURE_2D, texnum1 );
-	}
-	if ( glState.currenttextures[0] != texnum0 ) {
-		GL_SelectTexture( 0 );
-		image0->frameUsed = tr.frameCount;
-		glState.currenttextures[0] = texnum0;
-		qglBindTexture( GL_TEXTURE_2D, texnum0 );
-	}
-}
-
-
-/*
-** GL_Cull
-*/
-void GL_Cull( int cullType ) {
-	if ( glState.faceCulling == cullType ) {
-		return;
-	}
-
-	glState.faceCulling = cullType;
-
-	if ( cullType == CT_TWO_SIDED ) 
-	{
-		qglDisable( GL_CULL_FACE );
-	} 
-	else 
-	{
-		qglEnable( GL_CULL_FACE );
-
-		if ( cullType == CT_BACK_SIDED )
-		{
-			if ( backEnd.viewParms.isMirror )
-			{
-				qglCullFace( GL_FRONT );
-			}
-			else
-			{
-				qglCullFace( GL_BACK );
-			}
-		}
-		else
-		{
-			if ( backEnd.viewParms.isMirror )
-			{
-				qglCullFace( GL_BACK );
-			}
-			else
-			{
-				qglCullFace( GL_FRONT );
-			}
-		}
-	}
-}
-
-/*
-** GL_TexEnv
-*/
-void GL_TexEnv( int env )
-{
-	if ( env == glState.texEnv[glState.currenttmu] )
-	{
-		return;
-	}
-
-	glState.texEnv[glState.currenttmu] = env;
-
-
-	switch ( env )
-	{
-	case GL_MODULATE:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
-		break;
-	case GL_REPLACE:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
-		break;
-	case GL_DECAL:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL );
-		break;
-	case GL_ADD:
-		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD );
-		break;
-	case GL_COMBINE4_NV:
-	case GL_COMBINE:
-		qglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env);
-		break;
-	default:
-		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed\n", env );
-		break;
-	}
-}
-
-/*
-** GL_State
-**
-** This routine is responsible for setting the most commonly changed state
-** in Q3.
-*/
-void GL_State( unsigned long stateBits )
-{
-	unsigned long diff = glState.glStateBits ^ (glState.externalSetState | stateBits);
-
-	if ( !diff )
-	{
-		return;
-	}
-
-	//
-	// check depthFunc bits
-	//
-	if ( diff & GLS_DEPTHFUNC_EQUAL )
-	{
-		if ( stateBits & GLS_DEPTHFUNC_EQUAL )
-		{
-			qglDepthFunc( GL_EQUAL );
-		}
-		else
-		{
-			qglDepthFunc( GL_LEQUAL );
-		}
-	}
-
-	//
-	// check blend bits
-	//
-	if ( diff & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
-	{
-		GLenum srcFactor, dstFactor;
-
-		if ( stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
-		{
-			switch ( stateBits & GLS_SRCBLEND_BITS )
-			{
-			case GLS_SRCBLEND_ZERO:
-				srcFactor = GL_ZERO;
-				break;
-			case GLS_SRCBLEND_ONE:
-				srcFactor = GL_ONE;
-				break;
-			case GLS_SRCBLEND_DST_COLOR:
-				srcFactor = GL_DST_COLOR;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_DST_COLOR:
-				srcFactor = GL_ONE_MINUS_DST_COLOR;
-				break;
-			case GLS_SRCBLEND_SRC_ALPHA:
-				srcFactor = GL_SRC_ALPHA;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA:
-				srcFactor = GL_ONE_MINUS_SRC_ALPHA;
-				break;
-			case GLS_SRCBLEND_DST_ALPHA:
-				srcFactor = GL_DST_ALPHA;
-				break;
-			case GLS_SRCBLEND_ONE_MINUS_DST_ALPHA:
-				srcFactor = GL_ONE_MINUS_DST_ALPHA;
-				break;
-			case GLS_SRCBLEND_ALPHA_SATURATE:
-				srcFactor = GL_SRC_ALPHA_SATURATE;
-				break;
-			default:
-				srcFactor = GL_ONE;		// to get warning to shut up
-				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits\n" );
-				break;
-			}
-
-			switch ( stateBits & GLS_DSTBLEND_BITS )
-			{
-			case GLS_DSTBLEND_ZERO:
-				dstFactor = GL_ZERO;
-				break;
-			case GLS_DSTBLEND_ONE:
-				dstFactor = GL_ONE;
-				break;
-			case GLS_DSTBLEND_SRC_COLOR:
-				dstFactor = GL_SRC_COLOR;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_SRC_COLOR:
-				dstFactor = GL_ONE_MINUS_SRC_COLOR;
-				break;
-			case GLS_DSTBLEND_SRC_ALPHA:
-				dstFactor = GL_SRC_ALPHA;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA:
-				dstFactor = GL_ONE_MINUS_SRC_ALPHA;
-				break;
-			case GLS_DSTBLEND_DST_ALPHA:
-				dstFactor = GL_DST_ALPHA;
-				break;
-			case GLS_DSTBLEND_ONE_MINUS_DST_ALPHA:
-				dstFactor = GL_ONE_MINUS_DST_ALPHA;
-				break;
-			default:
-				dstFactor = GL_ONE;		// to get warning to shut up
-				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits\n" );
-				break;
-			}
-
-			qglEnable( GL_BLEND );
-			qglBlendFunc( srcFactor, dstFactor );
-		}
-		else
-		{
-			qglDisable( GL_BLEND );
-		}
-	}
-
-	//
-	// check depthmask
-	//
-	if ( diff & GLS_DEPTHMASK_TRUE )
-	{
-		if ( stateBits & GLS_DEPTHMASK_TRUE )
-		{
-			qglDepthMask( GL_TRUE );
-		}
-		else
-		{
-			qglDepthMask( GL_FALSE );
-		}
-	}
-
-	//
-	// fill/line mode
-	//
-	if ( diff & GLS_POLYMODE_LINE )
-	{
-		if ( stateBits & GLS_POLYMODE_LINE )
-		{
-			qglPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
-		}
-		else
-		{
-			qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-		}
-	}
-
-	//
-	// depthtest
-	//
-	if ( diff & GLS_DEPTHTEST_DISABLE )
-	{
-		if ( stateBits & GLS_DEPTHTEST_DISABLE )
-		{
-			qglDisable( GL_DEPTH_TEST );
-		}
-		else
-		{
-			qglEnable( GL_DEPTH_TEST );
-		}
-	}
-
-	if ((diff & GLS_MULTITEXTURE_ENV) || (diff & GLS_MULTITEXTURE))
-	{
-		if (stateBits & GLS_MULTITEXTURE_ENV)
-		{
-			GL_TexEnv(GL_COMBINE4_NV);
-		}
-		else if (stateBits & GLS_MULTITEXTURE)
-		{
-			if (glState.cntTexEnvExt != GLS_MULTITEXTURE)
-			{
-				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_PRIMARY_COLOR);
-				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-				glState.cntTexEnvExt = GLS_MULTITEXTURE;
-			}
-
-			GL_TexEnv(GL_COMBINE);
-		}
-		else
-		{
-			GL_TexEnv(GL_MODULATE);
-		}
-	}
-
-	//
-	// alpha test
-	//
-	if ( diff & GLS_ATEST_BITS )
-	{
-		switch ( stateBits & GLS_ATEST_BITS )
-		{
-		case 0:
-			qglDisable( GL_ALPHA_TEST );
-			break;
-		case GLS_ATEST_GT_0:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GREATER, 0.0f );
-			break;
-		case GLS_ATEST_LT_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_LESS, 0.5f );
-			break;
-		case GLS_ATEST_GE_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GEQUAL, 0.5f );
-			break;
-		default:
-			assert( 0 );
-			break;
-		}
-	}
-
-
-
-	if (diff & GLS_CLAMP_EDGE)
-	{
-		float clampValue;
-
-		if (r_forceClampToEdge->value)
-		{
-			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = 33071.0;
-			}
-			else {
-				clampValue = 10497.0;
-			}
-		}
-		else
-		{
-			if (stateBits & GLS_CLAMP_EDGE) {
-				clampValue = 10496.0;
-			}
-			else {
-				clampValue = 10497.0;
-			}
-		}
-
-		if (qglActiveTextureARB)
-		{
-			int currenttmu = glState.currenttmu;
-
-			GL_SelectTexture(0);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-
-			GL_SelectTexture(1);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-
-			GL_SelectTexture(currenttmu);
-		}
-		else
-		{
-			GL_SelectTexture(0);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
-		}
-	}
-
-	if (diff & GLS_FOG)
-	{
-		if (glState.externalSetState & GLS_FOG)
-		{
-			qglEnable(GL_FOG);
-
-			if (stateBits & GLS_FOG_BLACK)
-			{
-				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
-				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
-			}
-			else if (stateBits & GLS_FOG_WHITE)
-			{
-				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
-				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
-			}
-			else
-			{
-				//
-				// Use the global fog
-				qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-			}
-		}
-		else
-		{
-			qglDisable(GL_FOG);
-		}
-	}
-	else if (glState.externalSetState & GLS_FOG)
-	{
-		if (diff & GLS_FOG_ENABLED)
-		{
-			if (stateBits & GLS_FOG_ENABLED) {
-				qglEnable(GL_FOG);
-			}
-			else {
-				qglDisable(GL_FOG);
-			}
-		}
-
-		if (diff & GLS_FOG_COLOR)
-		{
-			if (stateBits & GLS_FOG_BLACK)
-			{
-				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
-				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
-			}
-			else if (stateBits & GLS_FOG_WHITE)
-			{
-				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
-				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
-			}
-			else
-            {
-                //
-                // Use the global fog
-                qglFogfv(GL_FOG_COLOR, glState.fFogColor);
-            }
-		}
-	}
-
-	glState.glStateBits = stateBits | glState.externalSetState;
-}
-
-
-
-/*
-================
-RB_Hyperspace
-
-A player has predicted a teleport, but hasn't arrived yet
-================
-*/
-static void RB_Hyperspace( void ) {
-	float		c;
-
-	if ( !backEnd.isHyperspace ) {
-		// do initialization shit
-	}
-
-	c = ( backEnd.refdef.time & 255 ) / 255.0f;
-	qglClearColor( c, c, c, 1 );
-	qglClear( GL_COLOR_BUFFER_BIT );
-
-	backEnd.isHyperspace = qtrue;
-}
-
-
-static void SetViewportAndScissor( void ) {
-	qglMatrixMode(GL_PROJECTION);
-	qglLoadMatrixf( backEnd.viewParms.projectionMatrix );
-	qglMatrixMode(GL_MODELVIEW);
-
-	// set the window clipping
-	qglViewport( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, 
-		backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight );
-	qglScissor( backEnd.viewParms.viewportX, backEnd.viewParms.viewportY, 
-		backEnd.viewParms.viewportWidth, backEnd.viewParms.viewportHeight );
-}
-
-/*
-=================
-RB_BeginDrawingView
-
-Any mirrored or portaled views have already been drawn, so prepare
-to actually render the visible surfaces for this view
-=================
-*/
-void RB_BeginDrawingView (void) {
-	int clearBits = 0;
-
-	// sync with gl if needed
-	if ( r_finish->integer == 1 && !glState.finishCalled ) {
-		qglFinish ();
-		glState.finishCalled = qtrue;
-	}
-	if ( r_finish->integer == 0 ) {
-		glState.finishCalled = qtrue;
-	}
-
-	// we will need to change the projection matrix before drawing
-	// 2D images again
-	backEnd.in2D = qfalse;
-
-	//
-	// set the modelview matrix for the viewer
-	//
-	SetViewportAndScissor();
-
-	R_UploadDlights();
-
-	// ensures that depth writes are enabled for the depth clear
-	GL_State( GLS_DEFAULT );
-	// clear relevant buffers
-	clearBits = GL_DEPTH_BUFFER_BIT;
-
-	if ( r_measureOverdraw->integer || r_shadows->integer == 3 )
-	{
-		clearBits |= GL_STENCIL_BUFFER_BIT;
-	}
-
-	if (!( backEnd.refdef.rdflags & RDF_NOWORLDMODEL))
-	{
-		if (backEnd.viewParms.farplane_distance && tr.skyRendered && tr.portalRendered)
-		{
-			clearBits |= GL_COLOR_BUFFER_BIT;
-			qglClearColor(glState.fFogColor[0], glState.fFogColor[1], glState.fFogColor[2], glState.fFogColor[3]);
-		}
-		else
-		{
-			if (r_fastsky->integer)
-			{
-				clearBits |= GL_COLOR_BUFFER_BIT;
-				qglClearColor(0.5, 0.5, 1.0, 1.0);
-			}
-		}
-	}
-	qglClear( clearBits );
-
-	if ( ( backEnd.refdef.rdflags & RDF_HYPERSPACE ) )
-	{
-		RB_Hyperspace();
-		return;
-	}
-	else
-	{
-		backEnd.isHyperspace = qfalse;
-	}
-
-	glState.faceCulling = -1;		// force face culling to set next time
-
-	// we will only draw a sun if there was sky rendered in this view
-	backEnd.skyRenderedThisView = qfalse;
-
-	// clip to the plane of the portal
-	if ( backEnd.viewParms.isPortal ) {
-		float	plane[4];
-		double	plane2[4];
-
-		plane[0] = backEnd.viewParms.portalPlane.normal[0];
-		plane[1] = backEnd.viewParms.portalPlane.normal[1];
-		plane[2] = backEnd.viewParms.portalPlane.normal[2];
-		plane[3] = backEnd.viewParms.portalPlane.dist;
-
-		plane2[0] = DotProduct (backEnd.viewParms.ori.axis[0], plane);
-		plane2[1] = DotProduct (backEnd.viewParms.ori.axis[1], plane);
-		plane2[2] = DotProduct (backEnd.viewParms.ori.axis[2], plane);
-		plane2[3] = DotProduct (plane, backEnd.viewParms.ori.origin) - plane[3];
-
-		qglLoadMatrixf( s_flipMatrix );
-		qglClipPlane (GL_CLIP_PLANE0, plane2);
-		qglEnable (GL_CLIP_PLANE0);
-	} else {
-		qglDisable (GL_CLIP_PLANE0);
-	}
-}
-
-
-#define	MAC_EVENT_PUMP_MSEC		5
-
-/*
-==================
-RB_RenderDrawSurfList
-==================
-*/
-void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
-	shader_t		*shader, *oldShader;
-	int				entityNum, oldEntityNum;
-	int				dlightMap, oldDlightMap;
-	qboolean		depthRange, oldDepthRange;
-	qboolean		bStaticModel, oldbStaticModel;
-	int				i;
-	drawSurf_t		*drawSurf;
-	int				oldSort;
-	float			originalTime;
-#ifdef __MACOS__
-	int				macEventTime;
-
-	Sys_PumpEvents();		// crutch up the mac's limited buffer queue size
-
-	// we don't want to pump the event loop too often and waste time, so
-	// we are going to check every shader change
-	macEventTime = ri.Milliseconds() + MAC_EVENT_PUMP_MSEC;
-#endif
-
-	// save original time for entity shader offsets
-	originalTime = backEnd.refdef.floatTime;
-
-	// clear the z buffer, set the modelview, etc
-	RB_BeginDrawingView ();
-
-	// draw everything
-	oldEntityNum = -1;
-	backEnd.currentEntity = &tr.worldEntity;
-	oldShader = NULL;
-	oldDepthRange = qfalse;
-	oldDlightMap = 0;
-	oldSort = -1;
-	oldbStaticModel = -1;
-	depthRange = qfalse;
-
-	backEnd.pc.c_surfaces += numDrawSurfs;
-	backEnd.numSpheresUsed = 0;
-
-	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
-		if ( drawSurf->sort == oldSort ) {
-			// fast path, same as previous sort
-			rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
-			continue;
-		}
-		oldSort = drawSurf->sort;
-		if (*drawSurf->surface != SF_SPRITE) {
-			R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlightMap, &bStaticModel);
-		} else {
-			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
-			entityNum = ENTITYNUM_WORLD;
-			dlightMap = 0;
-			bStaticModel = qfalse;
-		}
-
-		//
-		// change the tess parameters if needed
-		// a "entityMergable" shader is a shader that can have surfaces from seperate
-		// entities merged into a single batch, like smoke and blood puff sprites
-		if (shader != oldShader || dlightMap != oldDlightMap || (oldShader->flags & 1)
-			|| ( entityNum != oldEntityNum && !shader->entityMergable )
-			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )) {
-			if (oldShader != NULL) {
-#ifdef __MACOS__	// crutch up the mac's limited buffer queue size
-				int		t;
-
-				t = ri.Milliseconds();
-				if ( t > macEventTime ) {
-					macEventTime = t + MAC_EVENT_PUMP_MSEC;
-					Sys_PumpEvents();
-				}
-#endif
-				RB_EndSurface();
-			}
-			RB_BeginSurface( shader );
-			oldShader = shader;
-			oldDlightMap = dlightMap;
-		}
-
-		backEnd.currentSphere = &backEnd.spareSphere;
-		//
-		// change the modelview matrix if needed
-		//
-		if ( entityNum != oldEntityNum || bStaticModel != oldbStaticModel ) {
-			depthRange = qfalse;
-
-			if (bStaticModel) {
-				backEnd.shaderStartTime = 0.0;
-				backEnd.currentEntity = 0;
-				backEnd.spareSphere.TessFunction = 0;
-				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
-				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.ori );
-			}
-			else {
-				backEnd.currentStaticModel = NULL;
-				if (entityNum != ENTITYNUM_WORLD) {
-					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
-					backEnd.refdef.floatTime = originalTime - backEnd.currentEntity->e.shaderTime;
-					// we have to reset the shaderTime as well otherwise image animations start
-					// from the wrong frame
-					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-
-					// set up the transformation matrix
-					R_RotateForEntity(backEnd.currentEntity, &backEnd.viewParms, &backEnd.ori);
-
-					// set up the dynamic lighting if needed
-					if (backEnd.currentEntity->needDlights) {
-						R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
-					}
-
-					if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
-						// hack the depth range to prevent view model from poking into walls
-						depthRange = qtrue;
-					}
-				}
-				else {
-					backEnd.currentEntity = &tr.worldEntity;
-					backEnd.refdef.floatTime = originalTime;
-					backEnd.ori = backEnd.viewParms.world;
-					backEnd.shaderStartTime = 0.0;
-					// we have to reset the shaderTime as well otherwise image animations on
-					// the world (like water) continue with the wrong frame
-					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-					R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
-				}
-			}
-
-			qglLoadMatrixf( backEnd.ori.modelMatrix );
-
-			//
-			// change depthrange if needed
-			//
-			if ( oldDepthRange != depthRange ) {
-				if ( depthRange ) {
-					qglDepthRange (0, 0.3);
-				} else {
-					qglDepthRange (0, 1.875);
-				}
-				oldDepthRange = depthRange;
-			}
-
-			oldEntityNum = entityNum;
-			oldbStaticModel = bStaticModel;
-		}
-
-		tess.dlightMap = dlightMap;
-		if (r_fastdlights->integer) {
-			tess.dlightMap = 0;
-		}
-
-		if (bStaticModel)
-		{
-			if (r_drawspherelights->integer) {
-				RB_Static_BuildDLights();
-			}
-
-			if (!backEnd.currentStaticModel->bLightGridCalculated) {
-				RB_Grid_SetupStaticModel();
-			}
-		}
-		else if (backEnd.currentEntity->e.tiki)
-		{
-			if (shader->needsLGrid
-				|| shader->needsLSpherical && r_fastentlight->integer
-				|| !r_drawspherelights->integer)
-			{
-				backEnd.currentSphere->TessFunction = RB_CalcLightGridColor;
-				RB_Grid_SetupEntity();
-			}
-			else if (shader->needsLSpherical)
-			{
-				if (tr.refdef.rdflags & RDF_HUD)
-				{
-					backEnd.currentSphere = &backEnd.hudSphere;
-					backEnd.hudSphere.TessFunction = 0;
-					RB_Sphere_SetupEntity();
-				}
-				else if (backEnd.currentEntity->sphereCalculated)
-				{
-					backEnd.currentSphere = &backEnd.spheres[backEnd.currentEntity->lightingSphere];
-				}
-				else
-				{
-					if (backEnd.numSpheresUsed == 128)
-					{
-						ri.Printf(PRINT_DEVELOPER, "Spherical lighting: Ran out of space in the sphere array!\n");
-						backEnd.currentSphere = &backEnd.spareSphere;
-					}
-					else
-					{
-						backEnd.currentSphere = &backEnd.spheres[backEnd.numSpheresUsed];
-						backEnd.currentEntity->lightingSphere = backEnd.numSpheresUsed++;
-						backEnd.currentEntity->sphereCalculated = 1;
-					}
-
-					backEnd.currentSphere->TessFunction = NULL;
-					RB_Sphere_SetupEntity();
-				}
-			}
-		}
-
-		if (*drawSurf->surface == SF_SPRITE) {
-			backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
-		}
-
-		// add the triangles for this surface
-		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
-	}
-
-	backEnd.refdef.floatTime = originalTime;
-
-	// draw the contents of the last shader batch
-	if (oldShader != NULL) {
-		RB_EndSurface();
-	}
-
-	// go back to the world modelview matrix
-	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	if ( depthRange ) {
-		qglDepthRange (0, 1.875);
-	}
-
-	RB_ShadowFinish();
-	RB_RenderFlares();
-	R_DrawLensFlares();
-	if (g_bInfoworldtris)
-	{
-		g_bInfoworldtris = 0;
-		R_PrintInfoWorldtris();
-	}
-
-#if 0
-	RB_DrawSun();
-#endif
-	// darken down any stencil shadows
-	RB_ShadowFinish();		
-
-	// add light flares on lights that aren't obscured
-	RB_RenderFlares();
-
-#ifdef __MACOS__
-	Sys_PumpEvents();		// crutch up the mac's limited buffer queue size
-#endif
-}
-
-/*
-==================
-RB_RenderSpriteSurfList
-==================
-*/
-void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
-	shader_t	*shader;
-	shader_t	*oldShader;
-	qboolean	depthRange;
-	qboolean	oldDepthRange;
-	int			i;
-	drawSurf_t	*drawSurf;
-
-    backEnd.currentEntity = &tr.worldEntity;
-    backEnd.currentStaticModel = 0;
-
-	backEnd.pc.c_surfaces += numDrawSurfs;
-	backEnd.ori = backEnd.viewParms.world;
-
-	oldShader = NULL;
-    depthRange = qfalse;
-    oldDepthRange = qfalse;
-
-    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
-		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
-		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
-
-        if ((shader != oldShader || (oldShader->flags & RF_THIRD_PERSON) != 0) && !shader->entityMergable)
-        {
-			if (oldShader) {
-				RB_EndSurface();
-			}
-
-            RB_BeginSurface(shader);
-            oldShader = shader;
-        }
-
-        qglLoadMatrixf(backEnd.ori.modelMatrix);
-
-        if (oldDepthRange != depthRange)
-        {
-			if (depthRange) {
-				qglDepthRange(0.0, 0.3);
-			} else {
-                qglDepthRange(0.0, 1.0);
-			}
-
-            oldDepthRange = depthRange;
-        }
-
-        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
-
-        // add the triangles for this surface
-        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
-	}
-
-	if (oldShader) {
-		RB_EndSurface();
-	}
-
-    // go back to the world modelview matrix
-    qglLoadMatrixf(backEnd.viewParms.world.modelMatrix);
-	// go back to the previous depth range
-	if (depthRange) {
-		qglDepthRange(0.0, 1.0);
-	}
-}
-
-
-/*
-============================================================================
-
-RENDER BACK END THREAD FUNCTIONS
-
-============================================================================
-*/
-
-/*
-================
-RB_SetGL2D
-
-================
-*/
-void	RB_SetGL2D (void) {
-	backEnd.in2D = qtrue;
-
-	// set 2D virtual screen size
-	qglViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglMatrixMode(GL_PROJECTION);
-    qglLoadIdentity ();
-	qglOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1);
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity ();
-
-	GL_State( GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-
-	qglDisable( GL_CULL_FACE );
-	qglDisable( GL_CLIP_PLANE0 );
-
-	// set time for 2D shaders
-	backEnd.refdef.time = ri.Milliseconds();
-	backEnd.refdef.floatTime = backEnd.refdef.time * 0.001f;
-}
-
-
-/*
-=============
-RE_StretchRaw
-
-FIXME: not exactly backend
-Stretches a raw 32 bit power of 2 bitmap image over the given screen rectangle.
-Used for cinematics.
-=============
-*/
-void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
-	int			i, j;
-	int			start, end;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	R_SyncRenderThread();
-
-	// we definately want to sync every frame for the cinematics
-	qglFinish();
-
-	start = end = 0;
-	if ( r_speeds->integer ) {
-		start = ri.Milliseconds();
-	}
-
-	// make sure rows and cols are powers of 2
-	for ( i = 0 ; ( 1 << i ) < cols ; i++ ) {
-	}
-	for ( j = 0 ; ( 1 << j ) < rows ; j++ ) {
-	}
-	if ( ( 1 << i ) != cols || ( 1 << j ) != rows) {
-		ri.Error (ERR_DROP, "Draw_StretchRaw: size not a power of 2: %i by %i", cols, rows);
-	}
-
-	GL_Bind( tr.scratchImage );
-
-	// if the scratchImage isn't in the format we want, specify it as a new texture
-	if ( cols != tr.scratchImage->width || rows != tr.scratchImage->height ) {
-		tr.scratchImage->width = tr.scratchImage->uploadWidth = cols;
-		tr.scratchImage->height = tr.scratchImage->uploadHeight = rows;
-		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
-		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );	
-	} else {
-		// otherwise, just subimage upload it so that drivers can tell we are going to be changing
-		// it and don't try and do a texture compression
-		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
-	}
-
-	if ( r_speeds->integer ) {
-		end = ri.Milliseconds();
-		ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
-	}
-
-	RB_SetGL2D();
-
-	qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight );
-
-	qglBegin (GL_QUADS);
-	qglTexCoord2f ( 0.5f / cols,  0.5f / rows );
-	qglVertex2f (x, y);
-	qglTexCoord2f ( ( cols - 0.5f ) / cols ,  0.5f / rows );
-	qglVertex2f (x+w, y);
-	qglTexCoord2f ( ( cols - 0.5f ) / cols, ( rows - 0.5f ) / rows );
-	qglVertex2f (x+w, y+h);
-	qglTexCoord2f ( 0.5f / cols, ( rows - 0.5f ) / rows );
-	qglVertex2f (x, y+h);
-	qglEnd ();
-}
-
-/*
-=============
-RB_SetColor
-
-=============
-*/
-const void	*RB_SetColor( const void *data ) {
-	const setColorCommand_t	*cmd;
-
-	cmd = (const setColorCommand_t *)data;
-
-	backEnd.color2D[0] = cmd->color[0] * 255;
-	backEnd.color2D[1] = cmd->color[1] * 255;
-	backEnd.color2D[2] = cmd->color[2] * 255;
-	backEnd.color2D[3] = cmd->color[3] * 255;
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-=============
-RB_StretchPic
-=============
-*/
-const void *RB_StretchPic ( const void *data ) {
-	const stretchPicCommand_t	*cmd;
-	shader_t *shader;
-	int		numVerts, numIndexes;
-
-	cmd = (const stretchPicCommand_t *)data;
-
-	if ( !backEnd.in2D ) {
-		RB_SetGL2D();
-	}
-
-	shader = cmd->shader;
-	if ( shader != tess.shader ) {
-		if ( tess.numIndexes ) {
-			RB_EndSurface();
-		}
-		backEnd.currentEntity = &backEnd.entity2D;
-		RB_BeginSurface( shader );
-	}
-
-	RB_CHECKOVERFLOW( 4, 6 );
-	numVerts = tess.numVertexes;
-	numIndexes = tess.numIndexes;
-
-	tess.numVertexes += 4;
-	tess.numIndexes += 6;
-
-	tess.indexes[ numIndexes ] = numVerts + 3;
-	tess.indexes[ numIndexes + 1 ] = numVerts + 0;
-	tess.indexes[ numIndexes + 2 ] = numVerts + 2;
-	tess.indexes[ numIndexes + 3 ] = numVerts + 2;
-	tess.indexes[ numIndexes + 4 ] = numVerts + 0;
-	tess.indexes[ numIndexes + 5 ] = numVerts + 1;
-
-	*(int *)tess.vertexColors[ numVerts ] =
-		*(int *)tess.vertexColors[ numVerts + 1 ] =
-		*(int *)tess.vertexColors[ numVerts + 2 ] =
-		*(int *)tess.vertexColors[ numVerts + 3 ] = *(int *)backEnd.color2D;
-
-	tess.xyz[ numVerts ][0] = cmd->x;
-	tess.xyz[ numVerts ][1] = cmd->y;
-	tess.xyz[ numVerts ][2] = 0;
-
-	tess.texCoords[ numVerts ][0][0] = cmd->s1;
-	tess.texCoords[ numVerts ][0][1] = cmd->t1;
-
-	tess.xyz[ numVerts + 1 ][0] = cmd->x + cmd->w;
-	tess.xyz[ numVerts + 1 ][1] = cmd->y;
-	tess.xyz[ numVerts + 1 ][2] = 0;
-
-	tess.texCoords[ numVerts + 1 ][0][0] = cmd->s2;
-	tess.texCoords[ numVerts + 1 ][0][1] = cmd->t1;
-
-	tess.xyz[ numVerts + 2 ][0] = cmd->x + cmd->w;
-	tess.xyz[ numVerts + 2 ][1] = cmd->y + cmd->h;
-	tess.xyz[ numVerts + 2 ][2] = 0;
-
-	tess.texCoords[ numVerts + 2 ][0][0] = cmd->s2;
-	tess.texCoords[ numVerts + 2 ][0][1] = cmd->t2;
-
-	tess.xyz[ numVerts + 3 ][0] = cmd->x;
-	tess.xyz[ numVerts + 3 ][1] = cmd->y + cmd->h;
-	tess.xyz[ numVerts + 3 ][2] = 0;
-
-	tess.texCoords[ numVerts + 3 ][0][0] = cmd->s1;
-	tess.texCoords[ numVerts + 3 ][0][1] = cmd->t2;
-
-	return (const void *)(cmd + 1);
-}
-
-void RB_SetupFog() {
-	// FIXME: unimplemented
-}
-
-
-/*
-=============
-RB_DrawSurfs
-
-=============
-*/
-const void	*RB_DrawSurfs( const void *data ) {
-	const drawSurfsCommand_t	*cmd;
-
-	// finish any 2D drawing if needed
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	cmd = (const drawSurfsCommand_t *)data;
-
-	backEnd.refdef = cmd->refdef;
-	backEnd.viewParms = cmd->viewParms;
-
-	RB_RenderDrawSurfList( cmd->drawSurfs, cmd->numDrawSurfs );
-
-	return (const void *)(cmd + 1);
-}
-
-
-/*
-=============
-RB_DrawSurfs
-
-=============
-*/
-const void* RB_SpriteSurfs(const void* data) {
-    const drawSurfsCommand_t* cmd;
-
-    // finish any 2D drawing if needed
-    if (tess.numIndexes) {
-        RB_EndSurface();
-    }
-
-    cmd = (const drawSurfsCommand_t*)data;
-
-    backEnd.refdef = cmd->refdef;
-    backEnd.viewParms = cmd->viewParms;
-
-    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
-
-    return (const void*)(cmd + 1);
-}
-
-
-/*
-=============
-RB_DrawBuffer
-
-=============
-*/
-const void	*RB_DrawBuffer( const void *data ) {
-	const drawBufferCommand_t	*cmd;
-
-	cmd = (const drawBufferCommand_t *)data;
-
-	qglDrawBuffer( cmd->buffer );
-
-	// clear screen for debugging
-	if ( r_clear->integer ) {
-		qglClearColor( 1, 0, 0.5, 1 );
-		qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
-	}
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-===============
-RB_ShowImages
-
-Draw all the images to the screen, on top of whatever
-was there.  This is used to test for texture thrashing.
-
-Also called by RE_EndRegistration
-===============
-*/
-void RB_ShowImages( void ) {
-	int		i;
-	image_t	*image;
-	float	x, y, w, h;
-	int		start, end;
-
-	if ( !backEnd.in2D ) {
-		RB_SetGL2D();
-	}
-
-	qglClear( GL_COLOR_BUFFER_BIT );
-
-	qglFinish();
-
-	start = ri.Milliseconds();
-
-	for ( i=0 ; i<tr.numImages ; i++ ) {
-		image = &tr.images[i];
-
-		w = glConfig.vidWidth / 20;
-		h = glConfig.vidHeight / 15;
-		x = i % 20 * w;
-		y = i / 20 * h;
-
-		// show in proportional size in mode 2
-		if ( r_showImages->integer == 2 ) {
-			w *= image->uploadWidth / 512.0f;
-			h *= image->uploadHeight / 512.0f;
-		}
-
-		GL_Bind( image );
-		qglBegin (GL_QUADS);
-		qglTexCoord2f( 0, 0 );
-		qglVertex2f( x, y );
-		qglTexCoord2f( 1, 0 );
-		qglVertex2f( x + w, y );
-		qglTexCoord2f( 1, 1 );
-		qglVertex2f( x + w, y + h );
-		qglTexCoord2f( 0, 1 );
-		qglVertex2f( x, y + h );
-		qglEnd();
-	}
-
-	qglFinish();
-
-	end = ri.Milliseconds();
-	ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
-
-}
-
-
-/*
-=============
-RB_SwapBuffers
-
-=============
-*/
-const void	*RB_SwapBuffers( const void *data ) {
-	const swapBuffersCommand_t	*cmd;
-
-	// finish any 2D drawing if needed
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	// texture swapping test
-	if ( r_showImages->integer ) {
-		RB_ShowImages();
-	}
-
-	cmd = (const swapBuffersCommand_t *)data;
-
-	// we measure overdraw by reading back the stencil buffer and
-	// counting up the number of increments that have happened
-	if ( r_measureOverdraw->integer ) {
-		int i;
-		long sum = 0;
-		unsigned char *stencilReadback;
-
-		stencilReadback = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight );
-		qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, stencilReadback );
-
-		for ( i = 0; i < glConfig.vidWidth * glConfig.vidHeight; i++ ) {
-			sum += stencilReadback[i];
-		}
-
-		backEnd.pc.c_overDraw += sum;
-		ri.Hunk_FreeTempMemory( stencilReadback );
-	}
-
-
-	if ( !glState.finishCalled ) {
-		qglFinish();
-	}
-
-	GLimp_LogComment( "***************** RB_SwapBuffers *****************\n\n\n" );
-
-	GLimp_EndFrame();
-
-	backEnd.in2D = qfalse;
-
-	return (const void *)(cmd + 1);
-}
-
-/*
-====================
-RB_ExecuteRenderCommands
-
-This function will be called synchronously if running without
-smp extensions, or asynchronously by another thread.
-====================
-*/
-void RB_ExecuteRenderCommands( const void *data ) {
-	int		t1, t2;
-
-	t1 = ri.Milliseconds ();
-
-	if ( !r_smp->integer || data == backEndData[0]->commands.cmds ) {
-		backEnd.smpFrame = 0;
-	} else {
-		backEnd.smpFrame = 1;
-	}
-
-	while ( 1 ) {
-		switch ( *(const int *)data ) {
-		case RC_SET_COLOR:
-			data = RB_SetColor( data );
-			break;
-		case RC_STRETCH_PIC:
-			data = RB_StretchPic( data );
-			break;
-		case RC_DRAW_SURFS:
-			data = RB_DrawSurfs( data );
-			break;
-		case RC_SPRITE_SURFS:
-			data = RB_SpriteSurfs( data );
-			break;
-		case RC_DRAW_BUFFER:
-			data = RB_DrawBuffer( data );
-			break;
-		case RC_SWAP_BUFFERS:
-			data = RB_SwapBuffers( data );
-			break;
-		case RC_SCREENSHOT:
-			data = RB_TakeScreenshotCmd( data );
-			break;
-
-		case RC_END_OF_LIST:
-		default:
-			// stop rendering on this thread
-			t2 = ri.Milliseconds ();
-			backEnd.pc.msec = t2 - t1;
-			return;
-		}
-	}
-
-}
-
-
-/*
-================
-RB_RenderThread
-================
-*/
-void RB_RenderThread( void ) {
-	const void	*data;
-
-	// wait for either a rendering command or a quit command
-	while ( 1 ) {
-		// sleep until we have work to do
-		data = GLimp_RendererSleep();
-
-		if ( !data ) {
-			return;	// all done, renderer is shutting down
-		}
-
-		renderThreadActive = qtrue;
-
-		RB_ExecuteRenderCommands( data );
-
-		renderThreadActive = qfalse;
-	}
-}
-
diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c
deleted file mode 100644
index 0643f043..00000000
--- a/code/renderer/tr_bsp.c
+++ /dev/null
@@ -1,2427 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_map.c
-
-#include "tr_local.h"
-#include "tr_vis.h"
-
-/*
-
-Loads and prepares a map file for scene rendering.
-
-A single entry point:
-
-void RE_LoadWorldMap( const char *name );
-
-*/
-
-static	world_t		s_worldData;
-static	byte		*fileBase;
-
-int			c_subdivisions;
-int			c_gridVerts;
-
-static int map_length;
-static int nummodels;
-static int numShaders;
-static int numbrushes;
-static int numbrushsides;
-static int numFogs;
-static int numplanes;
-static int num_entities;
-static int numnodes;
-static int numleafs;
-static int numleafsurfaces;
-static int numDrawVerts;
-static int numDrawIndexes;
-static int numDrawSurfaces;
-static int numLightDefs;
-static int numLightBytes;
-static int numVisBytes;
-static int numSLights;
-static int entLightVisSize;
-static int g_iGridArraySize;
-static int g_iGridDataSize;
-static int g_iGridPaletteBytes;
-static int g_iGridOffsets;
-static int g_nStaticModelData;
-static int map_version;
-static int g_nStaticModelIndices;
-static int g_nStaticModels;
-static int g_nTerPatchIndices;
-static int g_nTerraPatches;
-
-//===============================================================================
-
-static void HSVtoRGB( float h, float s, float v, float rgb[3] )
-{
-	int i;
-	float f;
-	float p, q, t;
-
-	h *= 5;
-
-	i = floor( h );
-	f = h - i;
-
-	p = v * ( 1 - s );
-	q = v * ( 1 - s * f );
-	t = v * ( 1 - s * ( 1 - f ) );
-
-	switch ( i )
-	{
-	case 0:
-		rgb[0] = v;
-		rgb[1] = t;
-		rgb[2] = p;
-		break;
-	case 1:
-		rgb[0] = q;
-		rgb[1] = v;
-		rgb[2] = p;
-		break;
-	case 2:
-		rgb[0] = p;
-		rgb[1] = v;
-		rgb[2] = t;
-		break;
-	case 3:
-		rgb[0] = p;
-		rgb[1] = q;
-		rgb[2] = v;
-		break;
-	case 4:
-		rgb[0] = t;
-		rgb[1] = p;
-		rgb[2] = v;
-		break;
-	case 5:
-		rgb[0] = v;
-		rgb[1] = p;
-		rgb[2] = q;
-		break;
-	}
-}
-
-/*
-===============
-R_ColorShiftLightingBytes
-
-===============
-*/
-static	void R_ColorShiftLightingBytes( byte in[3], byte out[3] ) {
-	int		r, g, b;
-
-	// shift the data based on overbright range
-	r = in[0] << tr.overbrightBits;
-	g = in[1] << tr.overbrightBits;
-	b = in[2] << tr.overbrightBits;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
-
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
-
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-}
-
-/*
-===============
-R_ColorShiftLightingBytesAlpha
-
-===============
-*/
-static	void R_ColorShiftLightingBytesAlpha( byte in[4], byte out[4] ) {
-	int		r, g, b;
-
-	// shift the data based on overbright range
-	r = in[0] << tr.overbrightBits;
-	g = in[1] << tr.overbrightBits;
-	b = in[2] << tr.overbrightBits;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
-
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
-
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-	out[3] = in[3];
-}
-
-/*
-===============
-R_LoadLightmaps
-
-===============
-*/
-#define	LIGHTMAP_SIZE	128
-static	void R_LoadLightmaps(gamelump_t* l) {
-	byte		*buf, *buf_p;
-	int			len;
-	MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
-	int			i, j;
-	float maxIntensity = 0;
-	double sumIntensity = 0;
-
-    len = l->length;
-    if (!len) {
-        return;
-    }
-    buf = l->buffer;
-
-	// we are about to upload textures
-	R_SyncRenderThread();
-
-	// create all the lightmaps
-	tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
-
-	// if we are in r_vertexLight mode, we don't need the lightmaps at all
-	if ( r_vertexLight->integer ) {
-		return;
-	}
-
-	for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
-		// expand the 24 bit on-disk to 32 bit
-		buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
-
-		if ( r_lightmap->integer == 2 )
-		{	// color code by intensity as development tool	(FIXME: check range)
-			for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
-			{
-				float r = buf_p[j*3+0];
-				float g = buf_p[j*3+1];
-				float b = buf_p[j*3+2];
-				float intensity;
-				float out[3];
-
-				intensity = 0.33f * r + 0.685f * g + 0.063f * b;
-
-				if ( intensity > 255 )
-					intensity = 1.0f;
-				else
-					intensity /= 255.0f;
-
-				if ( intensity > maxIntensity )
-					maxIntensity = intensity;
-
-				HSVtoRGB( intensity, 1.00, 0.50, out );
-
-				image[j*4+0] = out[0] * 255;
-				image[j*4+1] = out[1] * 255;
-				image[j*4+2] = out[2] * 255;
-				image[j*4+3] = 255;
-
-				sumIntensity += intensity;
-			}
-		} else {
-			for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
-				R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
-				image[j*4+3] = 255;
-			}
-		}
-		tr.lightmaps[i] = R_CreateImage(va("*lightmap%d", i), image,
-			LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	}
-
-	if ( r_lightmap->integer == 2 )	{
-		ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
-	}
-
-	if (r_fastdlights->integer) {
-		s_worldData.lighting = NULL;
-	}
-	else {
-		s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
-		Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
-	}
-}
-
-
-/*
-=================
-RE_SetWorldVisData
-
-This is called by the clipmodel subsystem so we can share the 1.8 megs of
-space in big maps...
-=================
-*/
-void		RE_SetWorldVisData( const byte *vis ) {
-	tr.externalVisData = vis;
-}
-
-
-/*
-=================
-R_LoadVisibility
-=================
-*/
-static	void R_LoadVisibility(gamelump_t* l) {
-	int		len;
-	byte	*buf;
-
-	len = ( s_worldData.numClusters + 63 ) & ~63;
-	s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
-	Com_Memset( s_worldData.novis, 0xff, len );
-
-    len = l->length;
-    if (!len) {
-        return;
-    }
-    buf = l->buffer;
-
-	s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
-	s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
-
-	// CM_Load should have given us the vis data to share, so
-	// we don't need to allocate another copy
-	if ( tr.externalVisData ) {
-		s_worldData.vis = tr.externalVisData;
-	} else {
-		byte	*dest;
-
-		dest = ri.Hunk_Alloc( len - 8, h_dontcare );
-		Com_Memcpy( dest, buf + 8, len - 8 );
-		s_worldData.vis = dest;
-	}
-}
-
-/*
-================
-R_LoadSphereLights
-================
-*/
-void R_LoadSphereLights(gamelump_t* l) {
-    int				i, j;
-    mapspherel_t* at;
-    spherel_t* light;
-
-    if (l->length % sizeof(mapspherel_t)) {
-        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
-    }
-
-    tr.numSLights = l->length / sizeof(mapspherel_t);
-
-    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
-        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
-    }
-
-    at = l->buffer;
-    light = tr.sLights;
-
-    for (i = 0; i < tr.numSLights; at++, light++, i++) {
-        VectorCopy(at->origin, light->origin);
-        VectorCopy(at->color, light->color);
-        VectorCopy(at->spot_dir, light->spot_dir);
-
-        for (j = 0; j < 3; j++) {
-            light->origin[j] = LittleFloat(light->origin[j]);
-            light->color[j] = LittleFloat(light->color[j]);
-            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
-        }
-
-        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
-        light->intensity = LittleFloat(at->intensity);
-        light->spot_light = LittleLong(at->spot_light);
-        light->needs_trace = LittleLong(at->needs_trace);
-        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
-    }
-}
-
-/*
-================
-R_LoadSphereLightVis
-================
-*/
-void R_LoadSphereLightVis(gamelump_t* l) {
-    int i;
-    int j;
-    int h;
-    mnode_t* node;
-    int numentries;
-    int* entries;
-
-    memset(&tr.sSunLight, 0, sizeof(spherel_t));
-
-    if (l->length % 4) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
-            s_worldData.name);
-    }
-    else {
-        entries = l->buffer;
-        numentries = l->length / sizeof(int);
-
-        if (numentries) {
-            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
-                for (i = 0; i < numentries; ++i)
-                    entries[i] = LittleLong(entries[i]);
-
-                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
-                    j = 0;
-                    if (entries[0] != -1) {
-                        do
-                            ++j;
-                        while (entries[j] != -1);
-                    }
-                    if (j) {
-                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
-                        node->numlights = j;
-                        h = 0;
-                        if (entries[0] == -2) {
-                            node->lights[0] = &tr.sSunLight;
-                            tr.sSunLight.leaf = (mnode_t*)-1;
-                            h = 1;
-                        }
-                        while (entries[h] != -1) {
-                            node->lights[h] = &tr.sLights[entries[h]];
-                            h++;
-                        }
-                        entries += h + 1;
-                        numentries = numentries - 1 - h;
-                    }
-                    else {
-                        numentries--;
-                        entries++;
-                    }
-                }
-            }
-        }
-    }
-}
-
-//===============================================================================
-
-
-/*
-===============
-ShaderForShaderNum
-===============
-*/
-static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
-	shader_t	*shader;
-	dshader_t	*dsh;
-
-	shaderNum = LittleLong( shaderNum );
-	if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
-		ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
-	}
-	dsh = &s_worldData.shaders[ shaderNum ];
-
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		lightmapNum = LIGHTMAP_BY_VERTEX;
-	}
-
-	if ( r_fullbright->integer ) {
-		lightmapNum = LIGHTMAP_WHITEIMAGE;
-	}
-
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue, qtrue, qtrue, qtrue);
-
-	// if the shader had errors, just use default shader
-	if ( shader->defaultShader ) {
-		return tr.defaultShader;
-	}
-
-	return shader;
-}
-
-/*
-================
-R_UnpackTerraPatch
-================
-*/
-void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
-	int i, j;
-	union {
-		int16_t v;
-		uint8_t b[2];
-	} flags;
-
-    pUnpacked->byDirty = qfalse;
-    pUnpacked->visCountCheck = 0;
-    pUnpacked->visCountDraw = 0;
-    pUnpacked->uiDistRecalc = 0;
-
-    if (pPacked->lmapScale <= 0) {
-        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
-    }
-
-    pUnpacked->drawinfo.lmapStep = (float)(pPacked->lmapScale / 64);
-    pUnpacked->drawinfo.lmapSize = (float)((pPacked->lmapScale * 8) + 1);
-    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
-    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
-
-    if( s_worldData.lighting ) {
-    	pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
-    } else {
-    	pUnpacked->drawinfo.lmData = NULL;
-    }
-
-	for (i = 0; i < 2; i++) {
-		for (j = 0; j < 2; j++) {
-			pUnpacked->texCoord[i][j][0] = LittleFloat(pPacked->texCoord[i][j][0]);
-			pUnpacked->texCoord[i][j][1] = LittleFloat(pPacked->texCoord[i][j][1]);
-		}
-	}
-
-	pUnpacked->x0 = ((int)pPacked->x << 6);
-	pUnpacked->y0 = ((int)pPacked->y << 6);
-    pUnpacked->z0 = LittleShort(pPacked->iBaseHeight);
-    pUnpacked->shader = ShaderForShaderNum(LittleShort(pPacked->iShader), LittleShort(pPacked->iLightMap));
-    pUnpacked->iNorth = LittleShort(pPacked->iNorth);
-    pUnpacked->iEast = LittleShort(pPacked->iEast);
-    pUnpacked->iSouth = LittleShort(pPacked->iSouth);
-    pUnpacked->iWest = LittleShort(pPacked->iWest);
-
-    for (i = 0; i < 63; i++)
-	{
-		flags.v = pPacked->varTree[0][i].flags;
-		flags.b[1] &= 7;
-		pUnpacked->varTree[0][i].fVariance = LittleShort(flags.v);
-		pUnpacked->varTree[0][i].s.flags = LittleShort(pPacked->varTree[0][i].flags) >> 12;
-
-		flags.v = pPacked->varTree[1][i].flags;
-		flags.b[1] &= 7;
-		pUnpacked->varTree[1][i].fVariance = LittleShort(flags.v);
-		pUnpacked->varTree[1][i].s.flags = LittleShort(pPacked->varTree[1][i].flags) >> 12;
-    }
-
-	for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++) {
-		pUnpacked->heightmap[i] = pPacked->heightmap[i];
-	}
-
-    pUnpacked->zmax = 0;
-    pUnpacked->flags = pPacked->flags;
-
-    for (i = 0; i < sizeof(pUnpacked->heightmap) / sizeof(pUnpacked->heightmap[0]); i++)
-    {
-        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
-            pUnpacked->zmax = pUnpacked->heightmap[i];
-        }
-    }
-
-    pUnpacked->frameCount = 0;
-    pUnpacked->zmax += pUnpacked->zmax;
-}
-
-/*
-================
-R_LoadTerrain
-================
-IneQuation was here
-*/
-void R_LoadTerrain(gamelump_t* lump) {
-    int		i;
-    cTerraPatch_t* in;
-    cTerraPatchUnpacked_t* out;
-
-    if (!lump->length) {
-        s_worldData.numTerraPatches = 0;
-        s_worldData.terraPatches = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(cTerraPatch_t)) {
-        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
-    }
-
-    s_worldData.numTerraPatches = lump->length / sizeof(cTerraPatch_t);
-    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.terraPatches;
-
-    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
-        R_UnpackTerraPatch(in, out);
-    }
-}
-
-/*
-================
-R_LoadTerrainIndexes
-================
-*/
-void R_LoadTerrainIndexes(gamelump_t* lump) {
-    int		i;
-    short* in;
-    cTerraPatchUnpacked_t** out;
-
-    if (!lump->length) {
-        s_worldData.numVisTerraPatches = 0;
-        s_worldData.visTerraPatches = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(short)) {
-        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
-    }
-
-    s_worldData.numVisTerraPatches = lump->length / sizeof(short);
-    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.visTerraPatches;
-
-    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
-        *out = &s_worldData.terraPatches[*in];
-    }
-}
-
-/*
-===============
-ParseFace
-===============
-*/
-static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes  ) {
-	int			i, j;
-	srfSurfaceFace_t	*cv;
-	int			numPoints, numIndexes;
-	int			lightmapNum;
-    int			sfaceSize, ofsIndexes;
-    static surfaceType_t skipData = SF_SKIP;
-
-	lightmapNum = LittleLong( ds->lightmapNum );
-
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
-
-	if (surf->shader->surfaceFlags & SURF_NODRAW) {
-		// Nodraw surface doesn't need any processing
-		surf->data = &skipData;
-		return;
-	}
-
-	numPoints = LittleLong( ds->numVerts );
-	if (numPoints > MAX_FACE_POINTS) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
-    numPoints = MAX_FACE_POINTS;
-    surf->shader = tr.defaultShader;
-	}
-
-	numIndexes = LittleLong( ds->numIndexes );
-
-	// create the srfSurfaceFace_t
-	sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
-	ofsIndexes = sfaceSize;
-	sfaceSize += sizeof( int ) * numIndexes;
-
-	cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
-	cv->surfaceType = SF_FACE;
-	cv->numPoints = numPoints;
-	cv->numIndices = numIndexes;
-	cv->ofsIndices = ofsIndexes;
-
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
-			cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
-	}
-
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
-	}
-
-	// take the plane information from the lightmap vector
-	for ( i = 0 ; i < 3 ; i++ ) {
-		cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
-	cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
-	SetPlaneSignbits( &cv->plane );
-	cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
-
-	if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-	{
-		float inv;
-
-		cv->lmX = LittleLong(ds->lightmapX);
-		cv->lmY = LittleLong(ds->lightmapY);
-		cv->lmWidth = LittleLong(ds->lightmapWidth);
-		cv->lmHeight = LittleLong(ds->lightmapHeight);
-
-		if (s_worldData.lighting) {
-			cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
-		} else {
-			cv->lmData = NULL;
-		}
-
-		for (i = 0; i < 3; i++)
-		{
-			cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
-            cv->lmVecs[0][i] = LittleFloat(ds->lightmapVecs[0][i]);
-            cv->lmVecs[1][i] = LittleFloat(ds->lightmapVecs[1][i]);
-		}
-
-		inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
-		cv->lmInverseVecs[0][0] *= 1.0 / inv;
-		cv->lmInverseVecs[0][1] *= 1.0 / inv;
-		cv->lmInverseVecs[0][2] *= 1.0 / inv;
-
-		inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
-		cv->lmInverseVecs[1][0] *= 1.0 / inv;
-		cv->lmInverseVecs[1][1] *= 1.0 / inv;
-		cv->lmInverseVecs[1][2] *= 1.0 / inv;
-	}
-	else
-	{
-		cv->lmData = NULL;
-	}
-	surf->data = (surfaceType_t *)cv;
-}
-
-
-/*
-===============
-ParseMesh
-===============
-*/
-static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
-	srfGridMesh_t	*grid;
-	int				i, j;
-	int				width, height, numPoints;
-	MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
-	int				lightmapNum;
-	vec3_t			bounds[2];
-	vec3_t			tmpVec;
-	static surfaceType_t	skipData = SF_SKIP;
-
-	lightmapNum = LittleLong( ds->lightmapNum );
-
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
-
-	// we may have a nodraw surface, because they might still need to
-	// be around for movement clipping
-	if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
-		surf->data = &skipData;
-		return;
-	}
-
-	width = LittleLong( ds->patchWidth );
-	height = LittleLong( ds->patchHeight );
-
-	verts += LittleLong( ds->firstVert );
-	numPoints = width * height;
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			points[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			points[i].st[j] = LittleFloat( verts[i].st[j] );
-			points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
-	}
-
-	// pre-tesseleate
-	grid = R_SubdividePatchToGrid( width, height, points );
-	surf->data = (surfaceType_t *)grid;
-
-	if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
-	{
-		grid->lmX = LittleLong(ds->lightmapX);
-		grid->lmY = LittleLong(ds->lightmapY);
-		grid->lmWidth = LittleLong(ds->lightmapWidth);
-		grid->lmHeight = LittleLong(ds->lightmapHeight);
-		if (s_worldData.lighting) {
-			grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
-		} else {
-			grid->lmData = NULL;
-		}
-	}
-
-	// copy the level of detail origin, which is the center
-	// of the group of all curves that must subdivide the same
-	// to avoid cracking
-	for ( i = 0 ; i < 3 ; i++ ) {
-		bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
-		bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
-	}
-	VectorAdd( bounds[0], bounds[1], bounds[1] );
-	VectorScale( bounds[1], 0.5f, grid->lodOrigin );
-	VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
-	grid->lodRadius = VectorLength( tmpVec );
-}
-
-/*
-===============
-ParseTriSurf
-===============
-*/
-static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfTriangles_t	*tri;
-	int				i, j;
-	int				numVerts, numIndexes;
-
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
-
-	numVerts = LittleLong( ds->numVerts );
-	numIndexes = LittleLong( ds->numIndexes );
-
-	tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
-		+ numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
-	tri->surfaceType = SF_TRIANGLES;
-	tri->numVerts = numVerts;
-	tri->numIndexes = numIndexes;
-	tri->verts = (drawVert_t *)(tri + 1);
-	tri->indexes = (int *)(tri->verts + tri->numVerts );
-
-	surf->data = (surfaceType_t *)tri;
-
-	// copy vertexes
-	ClearBounds( tri->bounds[0], tri->bounds[1] );
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numVerts ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
-		for ( j = 0 ; j < 2 ; j++ ) {
-			tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
-			tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
-
-		R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
-	}
-
-	// copy indexes
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		tri->indexes[i] = LittleLong( indexes[i] );
-		if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
-			ri.Error( ERR_DROP, "Bad index in triangle surface" );
-		}
-	}
-}
-
-/*
-===============
-ParseFlare
-===============
-*/
-static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfFlare_t		*flare;
-	int				i;
-
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
-
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
-
-	flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
-	flare->surfaceType = SF_FLARE;
-
-	surf->data = (surfaceType_t *)flare;
-
-	for ( i = 0 ; i < 3 ; i++ ) {
-		flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
-		flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
-		flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
-}
-
-
-/*
-=================
-R_MergedWidthPoints
-
-returns true if there are grid points merged on a width edge
-=================
-*/
-int R_MergedWidthPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
-
-	for (i = 1; i < grid->width-1; i++) {
-		for (j = i + 1; j < grid->width-1; j++) {
-			if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
-}
-
-/*
-=================
-R_MergedHeightPoints
-
-returns true if there are grid points merged on a height edge
-=================
-*/
-int R_MergedHeightPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
-
-	for (i = 1; i < grid->height-1; i++) {
-		for (j = i + 1; j < grid->height-1; j++) {
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
-}
-
-/*
-=================
-R_FixSharedVertexLodError_r
-
-NOTE: never sync LoD through grid edges with merged points!
-
-FIXME: write generalized version that also avoids cracks between a patch and one that meets half way?
-=================
-*/
-void R_FixSharedVertexLodError_r( int start, srfGridMesh_t *grid1 ) {
-	int j, k, l, m, n, offset1, offset2, touch;
-	srfGridMesh_t *grid2;
-
-	for ( j = start; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// if the LOD errors are already fixed for this patch
-		if ( grid2->lodFixed == 2 ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		touch = qfalse;
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = (grid1->height-1) * grid1->width;
-			else offset1 = 0;
-			if (R_MergedWidthPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->width-1; k++) {
-				for (m = 0; m < 2; m++) {
-
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
-
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = grid1->width-1;
-			else offset1 = 0;
-			if (R_MergedHeightPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->height-1; k++) {
-				for (m = 0; m < 2; m++) {
-
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
-
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		if (touch) {
-			grid2->lodFixed = 2;
-			R_FixSharedVertexLodError_r ( start, grid2 );
-			//NOTE: this would be correct but makes things really slow
-			//grid2->lodFixed = 1;
-		}
-	}
-}
-
-/*
-=================
-R_FixSharedVertexLodError
-
-This function assumes that all patches in one group are nicely stitched together for the highest LoD.
-If this is not the case this function will still do its job but won't fix the highest LoD cracks.
-=================
-*/
-void R_FixSharedVertexLodError( void ) {
-	int i;
-	srfGridMesh_t *grid1;
-
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid1->surfaceType != SF_GRID )
-			continue;
-		//
-		if ( grid1->lodFixed )
-			continue;
-		//
-		grid1->lodFixed = 2;
-		// recursively fix other patches in the same LOD group
-		R_FixSharedVertexLodError_r( i + 1, grid1);
-	}
-}
-
-
-/*
-===============
-R_StitchPatches
-===============
-*/
-int R_StitchPatches( int grid1num, int grid2num ) {
-	float *v1, *v2;
-	srfGridMesh_t *grid1, *grid2;
-	int k, l, m, n, offset1, offset2, row, column;
-
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->width-2; k += 2) {
-
-			for (m = 0; m < 2; m++) {
-
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
-
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-					//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->height-2; k += 2) {
-			for (m = 0; m < 2; m++) {
-
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
-
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = grid1->width-1; k > 1; k -= 2) {
-
-			for (m = 0; m < 2; m++) {
-
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
-
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					if (!grid2)
-						break;
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = grid1->height-1; k > 1; k -= 2) {
-			for (m = 0; m < 2; m++) {
-
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
-
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
-}
-
-/*
-===============
-R_TryStitchPatch
-
-This function will try to stitch patches in the same LoD group together for the highest LoD.
-
-Only single missing vertice cracks will be fixed.
-
-Vertices will be joined at the patch side a crack is first found, at the other side
-of the patch (on the same row or column) the vertices will not be joined and cracks
-might still appear at that side.
-===============
-*/
-int R_TryStitchingPatch( int grid1num ) {
-	int j, numstitches;
-	srfGridMesh_t *grid1, *grid2;
-
-	numstitches = 0;
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		while (R_StitchPatches(grid1num, j))
-		{
-			numstitches++;
-		}
-	}
-	return numstitches;
-}
-
-/*
-===============
-R_StitchAllPatches
-===============
-*/
-void R_StitchAllPatches( void ) {
-	int i, stitched, numstitches;
-	srfGridMesh_t *grid1;
-
-	numstitches = 0;
-	do
-	{
-		stitched = qfalse;
-		for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-			//
-			grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-			// if this surface is not a grid
-			if ( grid1->surfaceType != SF_GRID )
-				continue;
-			//
-			if ( grid1->lodStitched )
-				continue;
-			//
-			grid1->lodStitched = qtrue;
-			stitched = qtrue;
-			//
-			numstitches += R_TryStitchingPatch( i );
-		}
-	}
-	while (stitched);
-	ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
-}
-
-/*
-===============
-R_MovePatchSurfacesToHunk
-===============
-*/
-void R_MovePatchSurfacesToHunk(void) {
-	int i, size;
-	srfGridMesh_t *grid, *hunkgrid;
-
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid->surfaceType != SF_GRID )
-			continue;
-		//
-		size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-		hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
-		Com_Memcpy(hunkgrid, grid, size);
-
-		hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
-		Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
-
-		hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
-		Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
-
-		R_FreeSurfaceGridMesh( grid );
-
-		s_worldData.surfaces[i].data = (void *) hunkgrid;
-	}
-}
-
-/*
-===============
-R_LoadSurfaces
-===============
-*/
-static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* indexLump) {
-	dsurface_t	*in;
-	msurface_t	*out;
-	drawVert_t	*dv;
-	int			*indexes;
-	int			count;
-	int			numFaces, numMeshes, numTriSurfs, numFlares;
-	int			i;
-
-	numFaces = 0;
-	numMeshes = 0;
-	numTriSurfs = 0;
-	numFlares = 0;
-
-    if (surfs->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = surfs->length / sizeof(*in);
-
-    dv = (void*)verts->buffer;
-    if (verts->length % sizeof(*dv))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-
-    indexes = (void*)indexLump->buffer;
-    if (indexLump->length % sizeof(*indexes))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-
-    in = (void*)surfs->buffer;
-	out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
-
-	s_worldData.surfaces = out;
-	s_worldData.numsurfaces = count;
-
-	for ( i = 0 ; i < count ; i++, in++, out++ ) {
-		switch ( LittleLong( in->surfaceType ) ) {
-		case MST_PATCH:
-			ParseMesh ( in, dv, out );
-			numMeshes++;
-			break;
-		case MST_TRIANGLE_SOUP:
-			ParseTriSurf( in, dv, out, indexes );
-			numTriSurfs++;
-			break;
-		case MST_PLANAR:
-			ParseFace( in, dv, out, indexes );
-			numFaces++;
-			break;
-		case MST_FLARE:
-			ParseFlare( in, dv, out, indexes );
-			numFlares++;
-			break;
-		default:
-			ri.Error( ERR_DROP, "Bad surfaceType" );
-		}
-	}
-
-#ifdef PATCH_STITCHING
-	R_StitchAllPatches();
-#endif
-
-	R_FixSharedVertexLodError();
-
-#ifdef PATCH_STITCHING
-	R_MovePatchSurfacesToHunk();
-#endif
-
-	ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
-		numFaces, numMeshes, numTriSurfs, numFlares );
-}
-
-
-
-/*
-=================
-R_LoadSubmodels
-=================
-*/
-static	void R_LoadSubmodels(gamelump_t* l) {
-	dmodel_t	*in;
-	bmodel_t	*out;
-	int			i, j, count;
-
-    in = (void*)l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-
-	s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
-
-	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		model_t *model;
-
-		model = R_AllocModel();
-
-		assert( model != NULL );			// this should never happen
-
-		model->type = MOD_BRUSH;
-		model->d.bmodel = out;
-		Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
-
-		for (j=0 ; j<3 ; j++) {
-			out->bounds[0][j] = LittleFloat (in->mins[j]);
-			out->bounds[1][j] = LittleFloat (in->maxs[j]);
-		}
-
-		out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
-		out->numSurfaces = LittleLong( in->numSurfaces );
-	}
-}
-
-
-
-//==================================================================
-
-/*
-=================
-R_SetParent
-=================
-*/
-static	void R_SetParent (mnode_t *node, mnode_t *parent)
-{
-	node->parent = parent;
-	if (node->contents != -1)
-		return;
-	R_SetParent (node->children[0], node);
-	R_SetParent (node->children[1], node);
-}
-
-/*
-=================
-R_LoadNodesAndLeafs
-=================
-*/
-static	void R_LoadNodesAndLeafs(gamelump_t* nodeLump, gamelump_t* leafLump) {
-    int			i, j, p;
-    dnode_t* in;
-    dleaf_t* inLeaf;
-    mnode_t* out;
-    int			numNodes, numLeafs;
-
-    in = (void*)nodeLump->buffer;
-    if (nodeLump->length % sizeof(dnode_t) ||
-        leafLump->length % sizeof(dleaf_t)) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    }
-    numNodes = nodeLump->length / sizeof(dnode_t);
-    numLeafs = leafLump->length / sizeof(dleaf_t);
-
-    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
-
-    s_worldData.nodes = out;
-    s_worldData.numnodes = numNodes + numLeafs;
-    s_worldData.numDecisionNodes = numNodes;
-
-    // load nodes
-    for (i = 0; i < numNodes; i++, in++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(in->mins[j]);
-            out->maxs[j] = LittleLong(in->maxs[j]);
-        }
-
-        p = LittleLong(in->planeNum);
-        out->plane = s_worldData.planes + p;
-
-        out->contents = CONTENTS_NODE;	// differentiate from leafs
-
-        for (j = 0; j < 2; j++)
-        {
-            p = LittleLong(in->children[j]);
-            if (p >= 0)
-                out->children[j] = s_worldData.nodes + p;
-            else
-                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-        }
-    }
-
-    // load leafs
-    inLeaf = (void*)leafLump->buffer;
-    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(inLeaf->mins[j]);
-            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
-        }
-
-        out->cluster = LittleLong(inLeaf->cluster);
-        out->area = LittleLong(inLeaf->area);
-
-        if (out->cluster >= s_worldData.numClusters) {
-            s_worldData.numClusters = out->cluster + 1;
-        }
-
-        out->firstmarksurface = s_worldData.marksurfaces +
-            LittleLong(inLeaf->firstLeafSurface);
-        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-
-        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
-        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
-
-        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
-        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
-    }
-
-    // chain decendants
-    R_SetParent(s_worldData.nodes, NULL);
-}
-
-/*
-=================
-R_LoadNodesAndLeafsOld
-=================
-*/
-static	void R_LoadNodesAndLeafsOld(gamelump_t* nodeLump, gamelump_t* leafLump) {
-    int			i, j, p;
-    dnode_t* in;
-    dleaf_t_ver17* inLeaf;
-    mnode_t* out;
-    int			numNodes, numLeafs;
-
-    in = nodeLump->buffer;
-    if (nodeLump->length % sizeof(dnode_t) ||
-        leafLump->length % sizeof(dleaf_t)) {
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    }
-    numNodes = nodeLump->length / sizeof(dnode_t);
-    numLeafs = leafLump->length / sizeof(dleaf_t);
-
-    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
-
-    s_worldData.nodes = out;
-    s_worldData.numnodes = numNodes + numLeafs;
-    s_worldData.numDecisionNodes = numNodes;
-
-    // load nodes
-    for (i = 0; i < numNodes; i++, in++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(in->mins[j]);
-            out->maxs[j] = LittleLong(in->maxs[j]);
-        }
-
-        p = LittleLong(in->planeNum);
-        out->plane = s_worldData.planes + p;
-
-        out->contents = CONTENTS_NODE;	// differentiate from leafs
-
-        for (j = 0; j < 2; j++)
-        {
-            p = LittleLong(in->children[j]);
-            if (p >= 0)
-                out->children[j] = s_worldData.nodes + p;
-            else
-                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-        }
-    }
-
-    // load leafs
-    inLeaf = leafLump->buffer;
-    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            out->mins[j] = LittleLong(inLeaf->mins[j]);
-            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
-        }
-
-        out->cluster = LittleLong(inLeaf->cluster);
-        out->area = LittleLong(inLeaf->area);
-
-        if (out->cluster >= s_worldData.numClusters) {
-            s_worldData.numClusters = out->cluster + 1;
-        }
-
-        out->firstmarksurface = s_worldData.marksurfaces +
-            LittleLong(inLeaf->firstLeafSurface);
-        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-
-        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
-        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
-    }
-
-    // chain decendants
-    R_SetParent(s_worldData.nodes, NULL);
-}
-
-//=============================================================================
-
-/*
-=================
-R_LoadShaders
-=================
-*/
-static	void R_LoadShaders(gamelump_t* l) {
-    int		i, count;
-    dshader_t* in, * out;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
-
-    s_worldData.shaders = out;
-    s_worldData.numShaders = count;
-
-    Com_Memcpy(out, in, count * sizeof(*out));
-
-    for (i = 0; i < count; i++) {
-        out[i].surfaceFlags = LittleLong(out[i].surfaceFlags);
-        out[i].contentFlags = LittleLong(out[i].contentFlags);
-    }
-}
-
-
-/*
-=================
-R_LoadMarksurfaces
-=================
-*/
-static	void R_LoadMarksurfaces(gamelump_t* l)
-{
-    int		i, j, count;
-    int* in;
-    msurface_t** out;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = (msurface_t**)ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
-
-    s_worldData.marksurfaces = out;
-    s_worldData.nummarksurfaces = count;
-
-    for (i = 0; i < count; i++)
-    {
-        j = LittleLong(in[i]);
-        out[i] = &s_worldData.surfaces[j];
-    }
-}
-
-
-/*
-=================
-R_LoadPlanes
-=================
-*/
-static	void R_LoadPlanes(gamelump_t* l) {
-    int			i, j;
-    cplane_t* out;
-    dplane_t* in;
-    int			count;
-    int			bits;
-
-    in = l->buffer;
-    if (l->length % sizeof(*in))
-        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
-    count = l->length / sizeof(*in);
-    out = ri.Hunk_Alloc(count * 2 * sizeof(*out), h_dontcare);
-
-    s_worldData.planes = out;
-    s_worldData.numplanes = count;
-
-    for (i = 0; i < count; i++, in++, out++) {
-        bits = 0;
-        for (j = 0; j < 3; j++) {
-            out->normal[j] = LittleFloat(in->normal[j]);
-            if (out->normal[j] < 0) {
-                bits |= 1 << j;
-            }
-        }
-
-        out->dist = LittleFloat(in->dist);
-        out->type = PlaneTypeForNormal(out->normal);
-        out->signbits = bits;
-    }
-}
-
-/*
-================
-R_LoadLightGrid
-
-================
-*/
-void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plData) {
-	int		i;
-	vec3_t	maxs;
-	int		numGridPoints;
-	world_t	*w;
-	float	*wMins, *wMaxs;
-
-	w = &s_worldData;
-
-	if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
-		ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
-		w->lightGridOffsets = 0;
-		w->lightGridData = 0;
-		return;
-	}
-
-	switch (map_version)
-	{
-    case 21:
-        w->lightGridSize[0] = 80.0;
-        w->lightGridSize[1] = 80.0;
-        w->lightGridSize[2] = 80.0;
-		break;
-    case 20:
-        w->lightGridSize[0] = 48.0;
-        w->lightGridSize[1] = 48.0;
-        w->lightGridSize[2] = 64.0;
-		break;
-    default:
-        w->lightGridSize[0] = 32.0;
-        w->lightGridSize[1] = 32.0;
-        w->lightGridSize[2] = 32.0;
-		break;
-	}
-
-	w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
-	w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
-	w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
-
-	wMins = w->bmodels[0].bounds[0];
-	wMaxs = w->bmodels[0].bounds[1];
-
-	for ( i = 0 ; i < 3 ; i++ ) {
-		w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
-		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
-		w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
-	}
-
-	numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
-
-    if (plOffsets->length != numGridPoints * 2) {
-		ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
-		w->lightGridOffsets = NULL;
-        w->lightGridData = NULL;
-        return;
-    }
-
-	if (plPal->length != 768) {
-		ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
-		w->lightGridOffsets = NULL;
-		w->lightGridData = NULL;
-		return;
-	}
-
-	w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
-	Com_Memcpy(w->lightGridOffsets, plOffsets->buffer, plOffsets->length);
-	Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
-
-    w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);
-    Com_Memcpy(w->lightGridData, plData->buffer, plData->length);
-}
-
-/*
-================
-R_LoadStaticModelData
-================
-*/
-void R_LoadStaticModelData(gamelump_t* lump) {
-    int		i;
-    byte* pDstColors;
-    byte* pSrcColors;
-
-    if (!lump->length) {
-        s_worldData.numStaticModelData = 0;
-        s_worldData.staticModelData = 0;
-        return;
-    }
-
-
-    if (lump->length % (sizeof(byte) * 3)) {
-        Com_Error(1, "R_LoadStaticModelData: funny lump size");
-    }
-
-    s_worldData.numStaticModelData = lump->length / (sizeof(byte) * 3);
-    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
-
-    pSrcColors = lump->buffer;
-    pDstColors = s_worldData.staticModelData;
-
-    for (i = 0; i < lump->length; i += sizeof(byte) * 3)
-    { 
-		// Colors are stored as integers
-		pDstColors[0] = pSrcColors[0];
-		pDstColors[1] = pSrcColors[1];
-		pDstColors[2] = pSrcColors[2];
-        pDstColors[3] = 0xFF;
-
-        pSrcColors += sizeof(byte) * 3;
-        pDstColors += sizeof(byte) * 4;
-    }
-}
-
-/*
-================
-R_CopyStaticModel
-================
-*/
-void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
-    pUnpackedSM->visCount = 0;
-	pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
-	pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
-	pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
-	pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
-	pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
-	pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
-    pUnpackedSM->scale = LittleFloat(pSM->scale);
-    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
-    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
-    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
-}
-
-/*
-================
-R_LoadStaticModelDefs
-================
-*/
-void R_LoadStaticModelDefs(gamelump_t* lump) {
-    int		i;
-    cStaticModel_t* in;
-    cStaticModelUnpacked_t* out;
-
-    if (!lump->length) {
-        s_worldData.numStaticModels = 0;
-        s_worldData.staticModels = NULL;
-        return;
-    }
-
-    if (lump->length % sizeof(cStaticModel_t)) {
-        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
-    }
-
-    s_worldData.numStaticModels = lump->length / sizeof(cStaticModel_t);
-    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.staticModels;
-
-    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
-        R_CopyStaticModel(in, out);
-    }
-}
-
-/*
-================
-R_LoadStaticModelIndexes
-================
-*/
-void R_LoadStaticModelIndexes(gamelump_t* lump) {
-    int		i;
-    short* in;
-    cStaticModelUnpacked_t** out;
-
-    if (lump->length % sizeof(short)) {
-        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
-    }
-
-    s_worldData.numVisStaticModels = lump->length / sizeof(short);
-    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
-
-    in = lump->buffer;
-    out = s_worldData.visStaticModels;
-
-    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
-        *out = &s_worldData.staticModels[*in];
-    }
-}
-
-/*
-==================
-R_LoadLump
-
-Loads a lump from the BSP file
-==================
-*/
-int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
-{
-    glump->buffer = NULL;
-    glump->length = lump->filelen;
-
-    if (lump->filelen) {
-        glump->buffer = Hunk_AllocateTempMemory(lump->filelen);
-
-        if (FS_Seek(handle, lump->fileofs, FS_SEEK_SET)) {
-            Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
-        }
-
-        FS_Read(glump->buffer, lump->filelen, handle);
-
-        if (size) {
-            return lump->filelen / size;
-        }
-    }
-
-    return 0;
-}
-
-/*
-==================
-R_FreeLump
-
-Free a previously allocated lump
-==================
-*/
-void R_FreeLump(gamelump_t* lump)
-{
-    if (lump->buffer)
-    {
-        Hunk_FreeTempMemory(lump->buffer);
-        lump->buffer = NULL;
-        lump->length = 0;
-    }
-}
-
-#define _R( id ) UI_LoadResource( "*" #id )
-
-/*
-=================
-RE_LoadWorldMap
-
-Called directly from cgame
-=================
-*/
-void RE_LoadWorldMap( const char *name ) {
-	int			i;
-    dheader_t	header;
-    fileHandle_t	h;
-    int				length;
-	vec3_t			vDefSundir;
-    gamelump_t		lump, lump2, lump3;
-
-    vDefSundir[0] = 0.45f;
-    vDefSundir[1] = 0.3f;
-    vDefSundir[2] = 0.9f;
-
-	_R(52);
-
-	// set default sun direction to be used if it isn't
-	// overridden by a shader
-	VectorCopy(vDefSundir, tr.sunDirection);
-	VectorNormalize( tr.sunDirection );
-
-	tr.worldMapLoaded = qtrue;
-
-    // load it
-    length = ri.FS_OpenFile(name, &h, qtrue, qtrue);
-    if (length <= 0) {
-        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s not found", name);
-    }
-
-    ri.FS_Read(&header, sizeof(dheader_t), h);
-    map_length = length;
-    map_version = header.version;
-
-    header.ident = LittleLong(header.ident);
-
-	// clear tr.world so if the level fails to load, the next
-	// try will not look at the partially loaded version
-	tr.world = NULL;
-
-	Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
-	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
-
-	Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
-	COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
-
-	c_gridVerts = 0;
-
-    i = LittleLong(header.version);
-    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
-        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
-            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
-    }
-
-	// load into heap
-    // load into heap
-    _R(53);
-    numShaders = R_LoadLump(h, &header.lumps[LUMP_SHADERS], &lump, sizeof(dshader_t));
-    _R(54);
-    R_LoadShaders(&lump);
-    _R(55);
-    R_FreeLump(&lump);
-    _R(56);
-    numplanes = R_LoadLump(h, &header.lumps[LUMP_PLANES], &lump, sizeof(dplane_t));
-    R_LoadPlanes(&lump);
-    _R(57);
-    R_FreeLump(&lump);
-    _R(58);
-    numLightBytes = R_LoadLump(h, &header.lumps[LUMP_LIGHTMAPS], &lump, sizeof(byte));
-    _R(59);
-    R_LoadLightmaps(&lump);
-    _R(60);
-	R_FreeLump(&lump);
-	_R(61);
-	numDrawSurfaces = R_LoadLump(h, &header.lumps[LUMP_SURFACES], &lump, sizeof(dsurface_t));
-    _R(62);
-    numDrawVerts = R_LoadLump(h, &header.lumps[LUMP_DRAWVERTS], &lump2, sizeof(drawVert_t));
-    _R(63);
-    numDrawIndexes = R_LoadLump(h, &header.lumps[LUMP_DRAWINDEXES], &lump3, sizeof(int));
-    _R(64);
-    R_LoadSurfaces(&lump, &lump2, &lump3);
-    _R(65);
-    R_FreeLump(&lump3);
-    _R(66);
-    R_FreeLump(&lump2);
-    _R(67);
-    R_FreeLump(&lump);
-    _R(68);
-    numleafsurfaces = R_LoadLump(h, &header.lumps[LUMP_LEAFSURFACES], &lump, sizeof(int));
-    _R(69);
-    R_LoadMarksurfaces(&lump);
-    _R(70);
-    R_FreeLump(&lump);
-    _R(71);
-    numleafs = R_LoadLump(h, &header.lumps[LUMP_LEAFS], &lump2, sizeof(dleaf_t));
-    _R(72);
-    numnodes = R_LoadLump(h, &header.lumps[LUMP_NODES], &lump, sizeof(mnode_t));
-    _R(73);
-    if (header.version > BSP_BETA_VERSION) {
-        R_LoadNodesAndLeafs(&lump, &lump2);
-    }
-    else {
-        R_LoadNodesAndLeafsOld(&lump, &lump2);
-    }
-    _R(74);
-    R_FreeLump(&lump);
-    _R(75);
-    R_FreeLump(&lump2);
-    _R(76);
-	numFogs = 0;
-    nummodels = R_LoadLump(h, &header.lumps[LUMP_MODELS], &lump, sizeof(bmodel_t));
-    _R(77);
-    R_LoadSubmodels(&lump);
-    _R(78);
-    R_FreeLump(&lump);
-    _R(79);
-    numVisBytes = R_LoadLump(h, &header.lumps[LUMP_VISIBILITY], &lump, sizeof(byte));
-    _R(80);
-    R_LoadVisibility(&lump);
-    _R(81);
-    R_FreeLump(&lump);
-    _R(82);
-    g_iGridPaletteBytes = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDPALETTE], &lump, sizeof(byte));
-    _R(83);
-    g_iGridOffsets = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDOFFSETS], &lump2, sizeof(short));
-    _R(84);
-    g_iGridDataSize = R_LoadLump(h, &header.lumps[LUMP_LIGHTGRIDDATA], &lump3, sizeof(byte));
-    _R(85);
-    R_LoadLightGrid( &lump, &lump2, &lump3 );
-    _R(86);
-    R_FreeLump(&lump);
-    _R(87);
-    R_FreeLump(&lump2);
-    _R(88);
-    R_FreeLump(&lump3);
-    _R(89);
-    numSLights = R_LoadLump(h, &header.lumps[LUMP_SPHERELIGHTS], &lump, sizeof(mapspherel_t));
-    _R(90);
-    R_LoadSphereLights(&lump);
-    _R(91);
-    R_FreeLump(&lump);
-    _R(92);
-    entLightVisSize = R_LoadLump(h, &header.lumps[LUMP_SPHERELIGHTVIS], &lump, sizeof(byte));
-    _R(93);
-    R_LoadSphereLightVis(&lump);
-    _R(94);
-    R_FreeLump(&lump);
-    _R(95);
-    g_nTerraPatches = R_LoadLump(h, &header.lumps[LUMP_TERRAIN], &lump, sizeof(cTerraPatch_t));
-    _R(96);
-    R_LoadTerrain(&lump);
-    _R(97);
-    R_FreeLump(&lump);
-    _R(98);
-    g_nTerPatchIndices = R_LoadLump(h, &header.lumps[LUMP_TERRAININDEXES], &lump, sizeof(short));
-    _R(99);
-    R_LoadTerrainIndexes(&lump);
-    _R(100);
-    R_FreeLump(&lump);
-    _R(101);
-    if (header.version > BSP_BETA_VERSION)
-    {
-        g_nStaticModelData = R_LoadLump(h, &header.lumps[LUMP_STATICMODELDATA], &lump, sizeof(byte));
-        _R(102);
-        R_LoadStaticModelData(&lump);
-        _R(103);
-        R_FreeLump(&lump);
-        _R(104);
-        g_nStaticModels = R_LoadLump(h, &header.lumps[LUMP_STATICMODELDEF], &lump, sizeof(cStaticModel_t));
-        _R(105);
-        R_LoadStaticModelDefs(&lump);
-        _R(106);
-        R_FreeLump(&lump);
-        _R(107);
-        g_nStaticModelIndices = R_LoadLump(h, &header.lumps[LUMP_STATICMODELINDEXES], &lump, sizeof(byte));
-        _R(108);
-        R_LoadStaticModelIndexes(&lump);
-        _R(109);
-        R_FreeLump(&lump);
-        _R(110);
-    }
-    else
-    {
-        g_nStaticModelData = 0;
-        g_nStaticModels = 0;
-        g_nStaticModelIndices = 0;
-    }
-
-	// only set tr.world now that we know the entire level has loaded properly
-	tr.world = &s_worldData;
-
-    ri.FS_CloseFile(h);
-
-    UI_LoadResource("*111");
-    R_Sphere_InitLights();
-    UI_LoadResource("*112");
-    R_InitTerrain();
-    UI_LoadResource("*113");
-    R_InitStaticModels();
-    UI_LoadResource("*114");
-    R_LevelMarksLoad(name);
-    UI_LoadResource("*115");
-    R_VisDebugLoad(name);
-    UI_LoadResource("*116");
-}
-
-int RE_MapVersion(void)
-{
-    // FIXME: unimplemented
-    return 0;
-}
-
-void RE_PrintBSPFileSizes(void)
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderer/tr_cmds.c b/code/renderer/tr_cmds.c
deleted file mode 100644
index 466f909d..00000000
--- a/code/renderer/tr_cmds.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-volatile renderCommandList_t	*renderCommandList;
-
-volatile qboolean	renderThreadActive;
-
-static backEndCounters_t pc_save;
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_SavePerformanceCounters(void) {
-    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
-}
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_PerformanceCounters( void ) {
-	if (fps->integer) {
-		ri.SetPerformanceCounters(
-			backEnd.pc.c_totalIndexes / 3,
-			backEnd.pc.c_vertexes,
-			R_SumOfUsedImages(),
-			pc_save.c_totalIndexes / 3,
-			pc_save.c_vertexes,
-			backEnd.pc.c_characterlights
-			);
-	}
-	if ( !r_speeds->integer ) {
-		// clear the counters even if we aren't printing
-		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
-		Com_Memset( &backEnd.pc, 0, sizeof( backEnd.pc ) );
-		return;
-	}
-
-	if (r_speeds->integer == 1) {
-		ri.Printf (PRINT_ALL, "%i/%i shaders/surfs %i leafs %i verts %i/%i tris %.2f mtex %.2f dc\n",
-			backEnd.pc.c_shaders, backEnd.pc.c_surfaces, tr.pc.c_leafs, backEnd.pc.c_vertexes, 
-			backEnd.pc.c_indexes/3, backEnd.pc.c_totalIndexes/3, 
-			R_SumOfUsedImages()/(1000000.0f), backEnd.pc.c_overDraw / (float)(glConfig.vidWidth * glConfig.vidHeight) ); 
-	} else if (r_speeds->integer == 2) {
-		ri.Printf (PRINT_ALL, "(patch) %i sin %i sclip  %i sout %i bin %i bclip %i bout\n",
-			tr.pc.c_sphere_cull_patch_in, tr.pc.c_sphere_cull_patch_clip, tr.pc.c_sphere_cull_patch_out, 
-			tr.pc.c_box_cull_patch_in, tr.pc.c_box_cull_patch_clip, tr.pc.c_box_cull_patch_out );
-		ri.Printf (PRINT_ALL, "(md3) %i sin %i sclip  %i sout %i bin %i bclip %i bout\n",
-			tr.pc.c_sphere_cull_md3_in, tr.pc.c_sphere_cull_md3_clip, tr.pc.c_sphere_cull_md3_out, 
-			tr.pc.c_box_cull_md3_in, tr.pc.c_box_cull_md3_clip, tr.pc.c_box_cull_md3_out );
-	} else if (r_speeds->integer == 3) {
-		ri.Printf (PRINT_ALL, "viewcluster: %i\n", tr.viewCluster );
-	} else if (r_speeds->integer == 4) {
-		if ( backEnd.pc.c_dlightVertexes ) {
-			ri.Printf (PRINT_ALL, "dlight srf:%i  culled:%i  verts:%i  tris:%i\n", 
-				tr.pc.c_dlightSurfaces, tr.pc.c_dlightSurfacesCulled,
-				backEnd.pc.c_dlightVertexes, backEnd.pc.c_dlightIndexes / 3 );
-		}
-	} 
-	else if (r_speeds->integer == 5 )
-	{
-		ri.Printf( PRINT_ALL, "zFar: %.0f\n", tr.viewParms.zFar );
-	}
-	else if (r_speeds->integer == 6 )
-	{
-		ri.Printf( PRINT_ALL, "flare adds:%i tests:%i renders:%i\n", 
-			backEnd.pc.c_flareAdds, backEnd.pc.c_flareTests, backEnd.pc.c_flareRenders );
-	}
-
-	Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
-	Com_Memset( &backEnd.pc, 0, sizeof( backEnd.pc ) );
-}
-
-
-/*
-====================
-R_InitCommandBuffers
-====================
-*/
-void R_InitCommandBuffers( void ) {
-	glConfig.smpActive = qfalse;
-	if ( r_smp->integer ) {
-		ri.Printf( PRINT_ALL, "Trying SMP acceleration...\n" );
-		if ( GLimp_SpawnRenderThread( RB_RenderThread ) ) {
-			ri.Printf( PRINT_ALL, "...succeeded.\n" );
-			glConfig.smpActive = qtrue;
-		} else {
-			ri.Printf( PRINT_ALL, "...failed.\n" );
-		}
-	}
-}
-
-/*
-====================
-R_ShutdownCommandBuffers
-====================
-*/
-void R_ShutdownCommandBuffers( void ) {
-	// kill the rendering thread
-	if ( glConfig.smpActive ) {
-		GLimp_WakeRenderer( NULL );
-		glConfig.smpActive = qfalse;
-	}
-}
-
-/*
-====================
-R_IssueRenderCommands
-====================
-*/
-int	c_blockedOnRender;
-int	c_blockedOnMain;
-
-void R_IssueRenderCommands( qboolean runPerformanceCounters ) {
-	renderCommandList_t	*cmdList;
-
-	cmdList = &backEndData[tr.smpFrame]->commands;
-	assert(cmdList); // bk001205
-	// add an end-of-list command
-	*(int *)(cmdList->cmds + cmdList->used) = RC_END_OF_LIST;
-
-	// clear it out, in case this is a sync and not a buffer flip
-	cmdList->used = 0;
-
-	if ( glConfig.smpActive ) {
-		// if the render thread is not idle, wait for it
-		if ( renderThreadActive ) {
-			c_blockedOnRender++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "R" );
-			}
-		} else {
-			c_blockedOnMain++;
-			if ( r_showSmp->integer ) {
-				ri.Printf( PRINT_ALL, "." );
-			}
-		}
-
-		// sleep until the renderer has completed
-		GLimp_FrontEndSleep();
-	}
-
-	// at this point, the back end thread is idle, so it is ok
-	// to look at it's performance counters
-	if ( runPerformanceCounters ) {
-		R_PerformanceCounters();
-	}
-
-	// actually start the commands going
-	if ( !r_skipBackEnd->integer ) {
-		// let it start on the new batch
-		if ( !glConfig.smpActive ) {
-			RB_ExecuteRenderCommands( cmdList->cmds );
-		} else {
-			GLimp_WakeRenderer( cmdList );
-		}
-	}
-}
-
-
-/*
-====================
-R_SyncRenderThread
-
-Issue any pending commands and wait for them to complete.
-After exiting, the render thread will have completed its work
-and will remain idle and the main thread is free to issue
-OpenGL calls until R_IssueRenderCommands is called.
-====================
-*/
-void R_SyncRenderThread( void ) {
-	if ( !tr.registered ) {
-		return;
-	}
-	R_IssueRenderCommands( qfalse );
-
-	if ( !glConfig.smpActive ) {
-		return;
-	}
-	GLimp_FrontEndSleep();
-}
-
-/*
-============
-R_GetCommandBuffer
-
-make sure there is enough command space, waiting on the
-render thread if needed.
-============
-*/
-void *R_GetCommandBuffer( int bytes ) {
-	renderCommandList_t	*cmdList;
-
-	cmdList = &backEndData[tr.smpFrame]->commands;
-
-	// always leave room for the end of list command
-	if ( cmdList->used + bytes + 4 > MAX_RENDER_COMMANDS ) {
-		if ( bytes > MAX_RENDER_COMMANDS - 4 ) {
-			ri.Error( ERR_FATAL, "R_GetCommandBuffer: bad size %i", bytes );
-		}
-		// if we run out of room, just start dropping commands
-		return NULL;
-	}
-
-	cmdList->used += bytes;
-
-	return cmdList->cmds + cmdList->used - bytes;
-}
-
-
-/*
-=============
-R_AddDrawSurfCmd
-
-=============
-*/
-void	R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs ) {
-	drawSurfsCommand_t	*cmd;
-
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_DRAW_SURFS;
-
-	cmd->drawSurfs = drawSurfs;
-	cmd->numDrawSurfs = numDrawSurfs;
-
-	cmd->refdef = tr.refdef;
-	cmd->viewParms = tr.viewParms;
-}
-
-
-/*
-=============
-R_AddSpriteSurfCmd
-
-=============
-*/
-void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
-    drawSurfsCommand_t* cmd;
-
-    cmd = R_GetCommandBuffer(sizeof(*cmd));
-    if (!cmd) {
-        return;
-    }
-    cmd->commandId = RC_SPRITE_SURFS;
-
-    cmd->drawSurfs = drawSurfs;
-    cmd->numDrawSurfs = numDrawSurfs;
-
-    cmd->refdef = tr.refdef;
-    cmd->viewParms = tr.viewParms;
-}
-
-
-/*
-=============
-RE_SetColor
-
-Passing NULL will set the color to white
-=============
-*/
-void	RE_SetColor( const float *rgba ) {
-	setColorCommand_t	*cmd;
-
-  if ( !tr.registered ) {
-    return;
-  }
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SET_COLOR;
-	if ( !rgba ) {
-		static float colorWhite[4] = { 1, 1, 1, 1 };
-
-		rgba = colorWhite;
-	}
-
-	cmd->color[0] = rgba[0];
-	cmd->color[1] = rgba[1];
-	cmd->color[2] = rgba[2];
-	cmd->color[3] = rgba[3];
-}
-
-
-/*
-=============
-RE_StretchPic
-=============
-*/
-void RE_StretchPic ( float x, float y, float w, float h, 
-					  float s1, float t1, float s2, float t2, qhandle_t hShader ) {
-	stretchPicCommand_t	*cmd;
-
-  if (!tr.registered) {
-    return;
-  }
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_STRETCH_PIC;
-	cmd->shader = R_GetShaderByHandle( hShader );
-	cmd->x = x;
-	cmd->y = y;
-	cmd->w = w;
-	cmd->h = h;
-	cmd->s1 = s1;
-	cmd->t1 = t1;
-	cmd->s2 = s2;
-	cmd->t2 = t2;
-}
-
-
-/*
-====================
-RE_BeginFrame
-
-If running in stereo, RE_BeginFrame will be called twice
-for each RE_EndFrame
-====================
-*/
-void RE_BeginFrame( stereoFrame_t stereoFrame ) {
-	drawBufferCommand_t	*cmd;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	glState.finishCalled = qfalse;
-
-	tr.frameCount++;
-	tr.frameSceneNum = 0;
-	g_nStaticSurfaces = 0;
-
-	//
-	// do overdraw measurement
-	//
-	if ( r_measureOverdraw->integer )
-	{
-		if ( glConfig.stencilBits < 4 )
-		{
-			ri.Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
-			ri.Cvar_Set( "r_measureOverdraw", "0" );
-			r_measureOverdraw->modified = qfalse;
-		}
-		else if ( r_shadows->integer == 2 )
-		{
-			ri.Printf( PRINT_ALL, "Warning: stencil shadows and overdraw measurement are mutually exclusive\n" );
-			ri.Cvar_Set( "r_measureOverdraw", "0" );
-			r_measureOverdraw->modified = qfalse;
-		}
-		else
-		{
-			R_SyncRenderThread();
-			qglEnable( GL_STENCIL_TEST );
-			qglStencilMask( ~0U );
-			qglClearStencil( 0U );
-			qglStencilFunc( GL_ALWAYS, 0U, ~0U );
-			qglStencilOp( GL_KEEP, GL_INCR, GL_INCR );
-		}
-		r_measureOverdraw->modified = qfalse;
-	}
-	else
-	{
-		// this is only reached if it was on and is now off
-		if ( r_measureOverdraw->modified ) {
-			R_SyncRenderThread();
-			qglDisable( GL_STENCIL_TEST );
-		}
-		r_measureOverdraw->modified = qfalse;
-	}
-
-	//
-	// texturemode stuff
-	//
-	if ( r_textureMode->modified ) {
-		R_SyncRenderThread();
-		GL_TextureMode( r_textureMode->string );
-		r_textureMode->modified = qfalse;
-	}
-
-	//
-	// gamma stuff
-	//
-	if ( r_gamma->modified ) {
-		r_gamma->modified = qfalse;
-
-		R_SyncRenderThread();
-		R_SetColorMappings();
-	}
-
-    // check for errors
-    if ( !r_ignoreGLErrors->integer ) {
-        int	err;
-
-		R_SyncRenderThread();
-        if ( ( err = qglGetError() ) != GL_NO_ERROR ) {
-            ri.Error( ERR_FATAL, "RE_BeginFrame() - glGetError() failed (0x%x)!\n", err );
-        }
-    }
-
-	//
-	// draw buffer stuff
-	//
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_DRAW_BUFFER;
-
-	if ( glConfig.stereoEnabled ) {
-		if ( stereoFrame == STEREO_LEFT ) {
-			cmd->buffer = (int)GL_BACK_LEFT;
-		} else if ( stereoFrame == STEREO_RIGHT ) {
-			cmd->buffer = (int)GL_BACK_RIGHT;
-		} else {
-			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is enabled, but stereoFrame was %i", stereoFrame );
-		}
-	} else {
-		if ( stereoFrame != STEREO_CENTER ) {
-			ri.Error( ERR_FATAL, "RE_BeginFrame: Stereo is disabled, but stereoFrame was %i", stereoFrame );
-		}
-		if ( !Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) ) {
-			cmd->buffer = (int)GL_FRONT;
-		} else {
-			cmd->buffer = (int)GL_BACK;
-		}
-	}
-}
-
-
-/*
-=============
-RE_EndFrame
-
-Returns the number of msec spent in the back end
-=============
-*/
-void RE_EndFrame( int *frontEndMsec, int *backEndMsec ) {
-	swapBuffersCommand_t	*cmd;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SWAP_BUFFERS;
-
-	R_IssueRenderCommands( qtrue );
-
-	// use the other buffers next frame, because another CPU
-	// may still be rendering into the current ones
-	R_ToggleSmpFrame();
-
-	if ( frontEndMsec ) {
-		*frontEndMsec = tr.frontEndMsec;
-	}
-	tr.frontEndMsec = 0;
-	if ( backEndMsec ) {
-		*backEndMsec = backEnd.pc.msec;
-	}
-	backEnd.pc.msec = 0;
-}
-
diff --git a/code/renderer/tr_curve.c b/code/renderer/tr_curve.c
deleted file mode 100644
index 14db39ad..00000000
--- a/code/renderer/tr_curve.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-/*
-
-This file does all of the processing necessary to turn a raw grid of points
-read from the map file into a srfGridMesh_t ready for rendering.
-
-The level of detail solution is direction independent, based only on subdivided
-distance from the true curve.
-
-Only a single entry point:
-
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
-
-*/
-
-
-/*
-============
-LerpDrawVert
-============
-*/
-static void LerpDrawVert( drawVert_t *a, drawVert_t *b, drawVert_t *out ) {
-	out->xyz[0] = 0.5f * (a->xyz[0] + b->xyz[0]);
-	out->xyz[1] = 0.5f * (a->xyz[1] + b->xyz[1]);
-	out->xyz[2] = 0.5f * (a->xyz[2] + b->xyz[2]);
-
-	out->st[0] = 0.5f * (a->st[0] + b->st[0]);
-	out->st[1] = 0.5f * (a->st[1] + b->st[1]);
-
-	out->lightmap[0] = 0.5f * (a->lightmap[0] + b->lightmap[0]);
-	out->lightmap[1] = 0.5f * (a->lightmap[1] + b->lightmap[1]);
-
-	out->color[0] = (a->color[0] + b->color[0]) >> 1;
-	out->color[1] = (a->color[1] + b->color[1]) >> 1;
-	out->color[2] = (a->color[2] + b->color[2]) >> 1;
-	out->color[3] = (a->color[3] + b->color[3]) >> 1;
-}
-
-/*
-============
-Transpose
-============
-*/
-static void Transpose( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j;
-	drawVert_t	temp;
-
-	if ( width > height ) {
-		for ( i = 0 ; i < height ; i++ ) {
-			for ( j = i + 1 ; j < width ; j++ ) {
-				if ( j < height ) {
-					// swap the value
-					temp = ctrl[j][i];
-					ctrl[j][i] = ctrl[i][j];
-					ctrl[i][j] = temp;
-				} else {
-					// just copy
-					ctrl[j][i] = ctrl[i][j];
-				}
-			}
-		}
-	} else {
-		for ( i = 0 ; i < width ; i++ ) {
-			for ( j = i + 1 ; j < height ; j++ ) {
-				if ( j < width ) {
-					// swap the value
-					temp = ctrl[i][j];
-					ctrl[i][j] = ctrl[j][i];
-					ctrl[j][i] = temp;
-				} else {
-					// just copy
-					ctrl[i][j] = ctrl[j][i];
-				}
-			}
-		}
-	}
-
-}
-
-
-/*
-=================
-MakeMeshNormals
-
-Handles all the complicated wrapping and degenerate cases
-=================
-*/
-static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j, k, dist;
-	vec3_t	normal;
-	vec3_t	sum;
-	int		count;
-	vec3_t	base;
-	vec3_t	delta;
-	int		x, y;
-	drawVert_t	*dv;
-	vec3_t		around[8], temp;
-	qboolean	good[8];
-	qboolean	wrapWidth, wrapHeight;
-	float		len;
-static	int	neighbors[8][2] = {
-	{0,1}, {1,1}, {1,0}, {1,-1}, {0,-1}, {-1,-1}, {-1,0}, {-1,1}
-	};
-
-	wrapWidth = qfalse;
-	for ( i = 0 ; i < height ; i++ ) {
-		VectorSubtract( ctrl[i][0].xyz, ctrl[i][width-1].xyz, delta );
-		len = VectorLengthSquared( delta );
-		if ( len > 1.0 ) {
-			break;
-		}
-	}
-	if ( i == height ) {
-		wrapWidth = qtrue;
-	}
-
-	wrapHeight = qfalse;
-	for ( i = 0 ; i < width ; i++ ) {
-		VectorSubtract( ctrl[0][i].xyz, ctrl[height-1][i].xyz, delta );
-		len = VectorLengthSquared( delta );
-		if ( len > 1.0 ) {
-			break;
-		}
-	}
-	if ( i == width) {
-		wrapHeight = qtrue;
-	}
-
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			count = 0;
-			dv = &ctrl[j][i];
-			VectorCopy( dv->xyz, base );
-			for ( k = 0 ; k < 8 ; k++ ) {
-				VectorClear( around[k] );
-				good[k] = qfalse;
-
-				for ( dist = 1 ; dist <= 3 ; dist++ ) {
-					x = i + neighbors[k][0] * dist;
-					y = j + neighbors[k][1] * dist;
-					if ( wrapWidth ) {
-						if ( x < 0 ) {
-							x = width - 1 + x;
-						} else if ( x >= width ) {
-							x = 1 + x - width;
-						}
-					}
-					if ( wrapHeight ) {
-						if ( y < 0 ) {
-							y = height - 1 + y;
-						} else if ( y >= height ) {
-							y = 1 + y - height;
-						}
-					}
-
-					if ( x < 0 || x >= width || y < 0 || y >= height ) {
-						break;					// edge of patch
-					}
-					VectorSubtract( ctrl[y][x].xyz, base, temp );
-					if ( VectorNormalize2( temp, temp ) == 0 ) {
-						continue;				// degenerate edge, get more dist
-					} else {
-						good[k] = qtrue;
-						VectorCopy( temp, around[k] );
-						break;					// good edge
-					}
-				}
-			}
-
-			VectorClear( sum );
-			for ( k = 0 ; k < 8 ; k++ ) {
-				if ( !good[k] || !good[(k+1)&7] ) {
-					continue;	// didn't get two points
-				}
-				CrossProduct( around[(k+1)&7], around[k], normal );
-				if ( VectorNormalize2( normal, normal ) == 0 ) {
-					continue;
-				}
-				VectorAdd( normal, sum, sum );
-				count++;
-			}
-			if ( count == 0 ) {
-//printf("bad normal\n");
-				count = 1;
-			}
-			VectorNormalize2( sum, dv->normal );
-		}
-	}
-}
-
-
-/*
-============
-InvertCtrl
-============
-*/
-static void InvertCtrl( int width, int height, drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE] ) {
-	int		i, j;
-	drawVert_t	temp;
-
-	for ( i = 0 ; i < height ; i++ ) {
-		for ( j = 0 ; j < width/2 ; j++ ) {
-			temp = ctrl[i][j];
-			ctrl[i][j] = ctrl[i][width-1-j];
-			ctrl[i][width-1-j] = temp;
-		}
-	}
-}
-
-
-/*
-=================
-InvertErrorTable
-=================
-*/
-static void InvertErrorTable( float errorTable[2][MAX_GRID_SIZE], int width, int height ) {
-	int		i;
-	float	copy[2][MAX_GRID_SIZE];
-
-	Com_Memcpy( copy, errorTable, sizeof( copy ) );
-
-	for ( i = 0 ; i < width ; i++ ) {
-		errorTable[1][i] = copy[0][i];	//[width-1-i];
-	}
-
-	for ( i = 0 ; i < height ; i++ ) {
-		errorTable[0][i] = copy[1][height-1-i];
-	}
-
-}
-
-/*
-==================
-PutPointsOnCurve
-==================
-*/
-static void PutPointsOnCurve( drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE], 
-							 int width, int height ) {
-	int			i, j;
-	drawVert_t	prev, next;
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 1 ; j < height ; j += 2 ) {
-			LerpDrawVert( &ctrl[j][i], &ctrl[j+1][i], &prev );
-			LerpDrawVert( &ctrl[j][i], &ctrl[j-1][i], &next );
-			LerpDrawVert( &prev, &next, &ctrl[j][i] );
-		}
-	}
-
-
-	for ( j = 0 ; j < height ; j++ ) {
-		for ( i = 1 ; i < width ; i += 2 ) {
-			LerpDrawVert( &ctrl[j][i], &ctrl[j][i+1], &prev );
-			LerpDrawVert( &ctrl[j][i], &ctrl[j][i-1], &next );
-			LerpDrawVert( &prev, &next, &ctrl[j][i] );
-		}
-	}
-}
-
-/*
-=================
-R_CreateSurfaceGridMesh
-=================
-*/
-srfGridMesh_t *R_CreateSurfaceGridMesh(int width, int height,
-								drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE], float errorTable[2][MAX_GRID_SIZE] ) {
-	int i, j, size;
-	drawVert_t	*vert;
-	vec3_t		tmpVec;
-	srfGridMesh_t *grid;
-
-	// copy the results out to a grid
-	size = (width * height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-
-#ifdef PATCH_STITCHING
-	grid = /*ri.Hunk_Alloc*/ ri.Malloc( size );
-	Com_Memset(grid, 0, size);
-
-	grid->widthLodError = /*ri.Hunk_Alloc*/ ri.Malloc( width * 4 );
-	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
-
-	grid->heightLodError = /*ri.Hunk_Alloc*/ ri.Malloc( height * 4 );
-	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
-#else
-	grid = ri.Hunk_Alloc( size );
-	Com_Memset(grid, 0, size);
-
-	grid->widthLodError = ri.Hunk_Alloc( width * 4 );
-	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
-
-	grid->heightLodError = ri.Hunk_Alloc( height * 4 );
-	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
-#endif
-
-	grid->width = width;
-	grid->height = height;
-	grid->surfaceType = SF_GRID;
-	ClearBounds( grid->meshBounds[0], grid->meshBounds[1] );
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			vert = &grid->verts[j*width+i];
-			*vert = ctrl[j][i];
-			AddPointToBounds( vert->xyz, grid->meshBounds[0], grid->meshBounds[1] );
-		}
-	}
-
-	// compute local origin and bounds
-	VectorAdd( grid->meshBounds[0], grid->meshBounds[1], grid->localOrigin );
-	VectorScale( grid->localOrigin, 0.5f, grid->localOrigin );
-	VectorSubtract( grid->meshBounds[0], grid->localOrigin, tmpVec );
-	grid->meshRadius = VectorLength( tmpVec );
-
-	VectorCopy( grid->localOrigin, grid->lodOrigin );
-	grid->lodRadius = grid->meshRadius;
-	//
-	return grid;
-}
-
-/*
-=================
-R_FreeSurfaceGridMesh
-=================
-*/
-void R_FreeSurfaceGridMesh( srfGridMesh_t *grid ) {
-	ri.Free(grid->widthLodError);
-	ri.Free(grid->heightLodError);
-	ri.Free(grid);
-}
-
-/*
-=================
-R_SubdividePatchToGrid
-=================
-*/
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
-	int			i, j, k, l;
-	drawVert_t	prev, next, mid;
-	float		len, maxLen;
-	int			dir;
-	int			t;
-	MAC_STATIC drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float		errorTable[2][MAX_GRID_SIZE];
-
-	for ( i = 0 ; i < width ; i++ ) {
-		for ( j = 0 ; j < height ; j++ ) {
-			ctrl[j][i] = points[j*width+i];
-		}
-	}
-
-	for ( dir = 0 ; dir < 2 ; dir++ ) {
-
-		for ( j = 0 ; j < MAX_GRID_SIZE ; j++ ) {
-			errorTable[dir][j] = 0;
-		}
-
-		// horizontal subdivisions
-		for ( j = 0 ; j + 2 < width ; j += 2 ) {
-			// check subdivided midpoints against control points
-
-			// FIXME: also check midpoints of adjacent patches against the control points
-			// this would basically stitch all patches in the same LOD group together.
-
-			maxLen = 0;
-			for ( i = 0 ; i < height ; i++ ) {
-				vec3_t		midxyz;
-				vec3_t		midxyz2;
-				vec3_t		dir;
-				vec3_t		projected;
-				float		d;
-
-				// calculate the point on the curve
-				for ( l = 0 ; l < 3 ; l++ ) {
-					midxyz[l] = (ctrl[i][j].xyz[l] + ctrl[i][j+1].xyz[l] * 2
-							+ ctrl[i][j+2].xyz[l] ) * 0.25f;
-				}
-
-				// see how far off the line it is
-				// using dist-from-line will not account for internal
-				// texture warping, but it gives a lot less polygons than
-				// dist-from-midpoint
-				VectorSubtract( midxyz, ctrl[i][j].xyz, midxyz );
-				VectorSubtract( ctrl[i][j+2].xyz, ctrl[i][j].xyz, dir );
-				VectorNormalize( dir );
-
-				d = DotProduct( midxyz, dir );
-				VectorScale( dir, d, projected );
-				VectorSubtract( midxyz, projected, midxyz2);
-				len = VectorLengthSquared( midxyz2 );			// we will do the sqrt later
-				if ( len > maxLen ) {
-					maxLen = len;
-				}
-			}
-
-			maxLen = sqrt(maxLen);
-
-			// if all the points are on the lines, remove the entire columns
-			if ( maxLen < 0.1f ) {
-				errorTable[dir][j+1] = 999;
-				continue;
-			}
-
-			// see if we want to insert subdivided columns
-			if ( width + 2 > MAX_GRID_SIZE ) {
-				errorTable[dir][j+1] = 1.0f/maxLen;
-				continue;	// can't subdivide any more
-			}
-
-			if ( maxLen <= r_subdivisions->value ) {
-				errorTable[dir][j+1] = 1.0f/maxLen;
-				continue;	// didn't need subdivision
-			}
-
-			errorTable[dir][j+2] = 1.0f/maxLen;
-
-			// insert two columns and replace the peak
-			width += 2;
-			for ( i = 0 ; i < height ; i++ ) {
-				LerpDrawVert( &ctrl[i][j], &ctrl[i][j+1], &prev );
-				LerpDrawVert( &ctrl[i][j+1], &ctrl[i][j+2], &next );
-				LerpDrawVert( &prev, &next, &mid );
-
-				for ( k = width - 1 ; k > j + 3 ; k-- ) {
-					ctrl[i][k] = ctrl[i][k-2];
-				}
-				ctrl[i][j + 1] = prev;
-				ctrl[i][j + 2] = mid;
-				ctrl[i][j + 3] = next;
-			}
-
-			// back up and recheck this set again, it may need more subdivision
-			j -= 2;
-
-		}
-
-		Transpose( width, height, ctrl );
-		t = width;
-		width = height;
-		height = t;
-	}
-
-
-	// put all the aproximating points on the curve
-	PutPointsOnCurve( ctrl, width, height );
-
-	// cull out any rows or columns that are colinear
-	for ( i = 1 ; i < width-1 ; i++ ) {
-		if ( errorTable[0][i] != 999 ) {
-			continue;
-		}
-		for ( j = i+1 ; j < width ; j++ ) {
-			for ( k = 0 ; k < height ; k++ ) {
-				ctrl[k][j-1] = ctrl[k][j];
-			}
-			errorTable[0][j-1] = errorTable[0][j];
-		}
-		width--;
-	}
-
-	for ( i = 1 ; i < height-1 ; i++ ) {
-		if ( errorTable[1][i] != 999 ) {
-			continue;
-		}
-		for ( j = i+1 ; j < height ; j++ ) {
-			for ( k = 0 ; k < width ; k++ ) {
-				ctrl[j-1][k] = ctrl[j][k];
-			}
-			errorTable[1][j-1] = errorTable[1][j];
-		}
-		height--;
-	}
-
-#if 1
-	// flip for longest tristrips as an optimization
-	// the results should be visually identical with or
-	// without this step
-	if ( height > width ) {
-		Transpose( width, height, ctrl );
-		InvertErrorTable( errorTable, width, height );
-		t = width;
-		width = height;
-		height = t;
-		InvertCtrl( width, height, ctrl );
-	}
-#endif
-
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	return R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-}
-
-/*
-===============
-R_GridInsertColumn
-===============
-*/
-srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror ) {
-	int i, j;
-	int width, height, oldwidth;
-	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float errorTable[2][MAX_GRID_SIZE];
-	float lodRadius;
-	vec3_t lodOrigin;
-
-	oldwidth = 0;
-	width = grid->width + 1;
-	if (width > MAX_GRID_SIZE)
-		return NULL;
-	height = grid->height;
-	for (i = 0; i < width; i++) {
-		if (i == column) {
-			//insert new column
-			for (j = 0; j < grid->height; j++) {
-				LerpDrawVert( &grid->verts[j * grid->width + i-1], &grid->verts[j * grid->width + i], &ctrl[j][i] );
-				if (j == row)
-					VectorCopy(point, ctrl[j][i].xyz);
-			}
-			errorTable[0][i] = loderror;
-			continue;
-		}
-		errorTable[0][i] = grid->widthLodError[oldwidth];
-		for (j = 0; j < grid->height; j++) {
-			ctrl[j][i] = grid->verts[j * grid->width + oldwidth];
-		}
-		oldwidth++;
-	}
-	for (j = 0; j < grid->height; j++) {
-		errorTable[1][j] = grid->heightLodError[j];
-	}
-	// put all the aproximating points on the curve
-	//PutPointsOnCurve( ctrl, width, height );
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	VectorCopy(grid->lodOrigin, lodOrigin);
-	lodRadius = grid->lodRadius;
-	// free the old grid
-	R_FreeSurfaceGridMesh(grid);
-	// create a new grid
-	grid = R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-	grid->lodRadius = lodRadius;
-	VectorCopy(lodOrigin, grid->lodOrigin);
-	return grid;
-}
-
-/*
-===============
-R_GridInsertRow
-===============
-*/
-srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror ) {
-	int i, j;
-	int width, height, oldheight;
-	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
-	float errorTable[2][MAX_GRID_SIZE];
-	float lodRadius;
-	vec3_t lodOrigin;
-
-	oldheight = 0;
-	width = grid->width;
-	height = grid->height + 1;
-	if (height > MAX_GRID_SIZE)
-		return NULL;
-	for (i = 0; i < height; i++) {
-		if (i == row) {
-			//insert new row
-			for (j = 0; j < grid->width; j++) {
-				LerpDrawVert( &grid->verts[(i-1) * grid->width + j], &grid->verts[i * grid->width + j], &ctrl[i][j] );
-				if (j == column)
-					VectorCopy(point, ctrl[i][j].xyz);
-			}
-			errorTable[1][i] = loderror;
-			continue;
-		}
-		errorTable[1][i] = grid->heightLodError[oldheight];
-		for (j = 0; j < grid->width; j++) {
-			ctrl[i][j] = grid->verts[oldheight * grid->width + j];
-		}
-		oldheight++;
-	}
-	for (j = 0; j < grid->width; j++) {
-		errorTable[0][j] = grid->widthLodError[j];
-	}
-	// put all the aproximating points on the curve
-	//PutPointsOnCurve( ctrl, width, height );
-	// calculate normals
-	MakeMeshNormals( width, height, ctrl );
-
-	VectorCopy(grid->lodOrigin, lodOrigin);
-	lodRadius = grid->lodRadius;
-	// free the old grid
-	R_FreeSurfaceGridMesh(grid);
-	// create a new grid
-	grid = R_CreateSurfaceGridMesh( width, height, ctrl, errorTable );
-	grid->lodRadius = lodRadius;
-	VectorCopy(lodOrigin, grid->lodOrigin);
-	return grid;
-}
diff --git a/code/renderer/tr_flares.c b/code/renderer/tr_flares.c
deleted file mode 100644
index 2363cd89..00000000
--- a/code/renderer/tr_flares.c
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_flares.c
-
-#include "tr_local.h"
-
-/*
-=============================================================================
-
-LIGHT FLARES
-
-A light flare is an effect that takes place inside the eye when bright light
-sources are visible.  The size of the flare reletive to the screen is nearly
-constant, irrespective of distance, but the intensity should be proportional to the
-projected area of the light source.
-
-A surface that has been flagged as having a light flare will calculate the depth
-buffer value that it's midpoint should have when the surface is added.
-
-After all opaque surfaces have been rendered, the depth buffer is read back for
-each flare in view.  If the point has not been obscured by a closer surface, the
-flare should be drawn.
-
-Surfaces that have a repeated texture should never be flagged as flaring, because
-there will only be a single flare added at the midpoint of the polygon.
-
-To prevent abrupt popping, the intensity of the flare is interpolated up and
-down as it changes visibility.  This involves scene to scene state, unlike almost
-all other aspects of the renderer, and is complicated by the fact that a single
-frame may have multiple scenes.
-
-RB_RenderFlares() will be called once per view (twice in a mirrored scene, potentially
-up to five or more times in a frame with 3D status bar icons).
-
-=============================================================================
-*/
-
-
-// flare states maintain visibility over multiple frames for fading
-// layers: view, mirror, menu
-typedef struct flare_s {
-	struct		flare_s	*next;		// for active chain
-
-	int			addedFrame;
-
-	qboolean	inPortal;				// true if in a portal view of the scene
-	int			frameSceneNum;
-	void		*surface;
-	int			fogNum;
-
-	int			fadeTime;
-
-	qboolean	visible;			// state of last test
-	float		drawIntensity;		// may be non 0 even if !visible due to fading
-
-	int			windowX, windowY;
-	float		eyeZ;
-
-	vec3_t		color;
-} flare_t;
-
-#define		MAX_FLARES		128
-
-flare_t		r_flareStructs[MAX_FLARES];
-flare_t		*r_activeFlares, *r_inactiveFlares;
-
-/*
-==================
-R_ClearFlares
-==================
-*/
-void R_ClearFlares( void ) {
-	int		i;
-
-	Com_Memset( r_flareStructs, 0, sizeof( r_flareStructs ) );
-	r_activeFlares = NULL;
-	r_inactiveFlares = NULL;
-
-	for ( i = 0 ; i < MAX_FLARES ; i++ ) {
-		r_flareStructs[i].next = r_inactiveFlares;
-		r_inactiveFlares = &r_flareStructs[i];
-	}
-}
-
-
-/*
-==================
-RB_AddFlare
-
-This is called at surface tesselation time
-==================
-*/
-void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal ) {
-	int				i;
-	flare_t			*f, *oldest;
-	vec3_t			local;
-	float			d;
-	vec4_t			eye, clip, normalized, window;
-
-	backEnd.pc.c_flareAdds++;
-
-	// if the point is off the screen, don't bother adding it
-	// calculate screen coordinates and depth
-	R_TransformModelToClip( point, backEnd.ori.modelMatrix, 
-		backEnd.viewParms.projectionMatrix, eye, clip );
-
-	// check to see if the point is completely off screen
-	for ( i = 0 ; i < 3 ; i++ ) {
-		if ( clip[i] >= clip[3] || clip[i] <= -clip[3] ) {
-			return;
-		}
-	}
-
-	R_TransformClipToWindow( clip, &backEnd.viewParms, normalized, window );
-
-	if ( window[0] < 0 || window[0] >= backEnd.viewParms.viewportWidth
-		|| window[1] < 0 || window[1] >= backEnd.viewParms.viewportHeight ) {
-		return;	// shouldn't happen, since we check the clip[] above, except for FP rounding
-	}
-
-	// see if a flare with a matching surface, scene, and view exists
-	oldest = r_flareStructs;
-	for ( f = r_activeFlares ; f ; f = f->next ) {
-		if ( f->surface == surface && f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal ) {
-			break;
-		}
-	}
-
-	// allocate a new one
-	if (!f ) {
-		if ( !r_inactiveFlares ) {
-			// the list is completely full
-			return;
-		}
-		f = r_inactiveFlares;
-		r_inactiveFlares = r_inactiveFlares->next;
-		f->next = r_activeFlares;
-		r_activeFlares = f;
-
-		f->surface = surface;
-		f->frameSceneNum = backEnd.viewParms.frameSceneNum;
-		f->inPortal = backEnd.viewParms.isPortal;
-		f->addedFrame = -1;
-	}
-
-	if ( f->addedFrame != backEnd.viewParms.frameCount - 1 ) {
-		f->visible = qfalse;
-		f->fadeTime = backEnd.refdef.time - 2000;
-	}
-
-	f->addedFrame = backEnd.viewParms.frameCount;
-	f->fogNum = fogNum;
-
-	VectorCopy( color, f->color );
-
-	// fade the intensity of the flare down as the
-	// light surface turns away from the viewer
-	if ( normal ) {
-		VectorSubtract( backEnd.viewParms.ori.origin, point, local );
-		VectorNormalizeFast( local );
-		d = DotProduct( local, normal );
-		VectorScale( f->color, d, f->color ); 
-	}
-
-	// save info needed to test
-	f->windowX = backEnd.viewParms.viewportX + window[0];
-	f->windowY = backEnd.viewParms.viewportY + window[1];
-
-	f->eyeZ = eye[2];
-}
-
-/*
-==================
-RB_AddDlightFlares
-==================
-*/
-void RB_AddDlightFlares( void ) {
-	dlight_t		*l;
-	int				i, j, k;
-
-	if ( !r_flares->integer ) {
-		return;
-	}
-
-	l = backEnd.refdef.dlights;
-	for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
-		RB_AddFlare( (void *)l, j, l->origin, l->color, NULL );
-	}
-}
-
-/*
-===============================================================================
-
-FLARE BACK END
-
-===============================================================================
-*/
-
-/*
-==================
-RB_TestFlare
-==================
-*/
-void RB_TestFlare( flare_t *f ) {
-	float			depth;
-	qboolean		visible;
-	float			fade;
-	float			screenZ;
-
-	backEnd.pc.c_flareTests++;
-
-	// doing a readpixels is as good as doing a glFinish(), so
-	// don't bother with another sync
-	glState.finishCalled = qfalse;
-
-	// read back the z buffer contents
-	qglReadPixels( f->windowX, f->windowY, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth );
-
-	screenZ = backEnd.viewParms.projectionMatrix[14] / 
-		( ( 2*depth - 1 ) * backEnd.viewParms.projectionMatrix[11] - backEnd.viewParms.projectionMatrix[10] );
-
-	visible = ( -f->eyeZ - -screenZ ) < 24;
-
-	if ( visible ) {
-		if ( !f->visible ) {
-			f->visible = qtrue;
-			f->fadeTime = backEnd.refdef.time - 1;
-		}
-		fade = ( ( backEnd.refdef.time - f->fadeTime ) /1000.0f ) * r_flareFade->value;
-	} else {
-		if ( f->visible ) {
-			f->visible = qfalse;
-			f->fadeTime = backEnd.refdef.time - 1;
-		}
-		fade = 1.0f - ( ( backEnd.refdef.time - f->fadeTime ) / 1000.0f ) * r_flareFade->value;
-	}
-
-	if ( fade < 0 ) {
-		fade = 0;
-	}
-	if ( fade > 1 ) {
-		fade = 1;
-	}
-
-	f->drawIntensity = fade;
-}
-
-
-/*
-==================
-RB_RenderFlare
-==================
-*/
-void RB_RenderFlare( flare_t *f ) {
-	float			size;
-	vec3_t			color;
-	int				iColor[3];
-
-	backEnd.pc.c_flareRenders++;
-
-	VectorScale( f->color, f->drawIntensity*tr.identityLight, color );
-	iColor[0] = color[0] * 255;
-	iColor[1] = color[1] * 255;
-	iColor[2] = color[2] * 255;
-
-	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / -f->eyeZ );
-
-	RB_BeginSurface( tr.flareShader );
-
-	// FIXME: use quadstamp?
-	tess.xyz[tess.numVertexes][0] = f->windowX - size;
-	tess.xyz[tess.numVertexes][1] = f->windowY - size;
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX - size;
-	tess.xyz[tess.numVertexes][1] = f->windowY + size;
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX + size;
-	tess.xyz[tess.numVertexes][1] = f->windowY + size;
-	tess.texCoords[tess.numVertexes][0][0] = 1;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.xyz[tess.numVertexes][0] = f->windowX + size;
-	tess.xyz[tess.numVertexes][1] = f->windowY - size;
-	tess.texCoords[tess.numVertexes][0][0] = 1;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = iColor[0];
-	tess.vertexColors[tess.numVertexes][1] = iColor[1];
-	tess.vertexColors[tess.numVertexes][2] = iColor[2];
-	tess.vertexColors[tess.numVertexes][3] = 255;
-	tess.numVertexes++;
-
-	tess.indexes[tess.numIndexes++] = 0;
-	tess.indexes[tess.numIndexes++] = 1;
-	tess.indexes[tess.numIndexes++] = 2;
-	tess.indexes[tess.numIndexes++] = 0;
-	tess.indexes[tess.numIndexes++] = 2;
-	tess.indexes[tess.numIndexes++] = 3;
-
-	RB_EndSurface();
-}
-
-/*
-==================
-RB_RenderFlares
-
-Because flares are simulating an occular effect, they should be drawn after
-everything (all views) in the entire frame has been drawn.
-
-Because of the way portals use the depth buffer to mark off areas, the
-needed information would be lost after each view, so we are forced to draw
-flares after each view.
-
-The resulting artifact is that flares in mirrors or portals don't dim properly
-when occluded by something in the main view, and portal flares that should
-extend past the portal edge will be overwritten.
-==================
-*/
-void RB_RenderFlares (void) {
-	flare_t		*f;
-	flare_t		**prev;
-	qboolean	draw;
-
-	if ( !r_flares->integer ) {
-		return;
-	}
-
-//	RB_AddDlightFlares();
-
-	// perform z buffer readback on each flare in this view
-	draw = qfalse;
-	prev = &r_activeFlares;
-	while ( ( f = *prev ) != NULL ) {
-		// throw out any flares that weren't added last frame
-		if ( f->addedFrame < backEnd.viewParms.frameCount - 1 ) {
-			*prev = f->next;
-			f->next = r_inactiveFlares;
-			r_inactiveFlares = f;
-			continue;
-		}
-
-		// don't draw any here that aren't from this scene / portal
-		f->drawIntensity = 0;
-		if ( f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal ) {
-			RB_TestFlare( f );
-			if ( f->drawIntensity ) {
-				draw = qtrue;
-			} else {
-				// this flare has completely faded out, so remove it from the chain
-				*prev = f->next;
-				f->next = r_inactiveFlares;
-				r_inactiveFlares = f;
-				continue;
-			}
-		}
-
-		prev = &f->next;
-	}
-
-	if ( !draw ) {
-		return;		// none visible
-	}
-
-	if ( backEnd.viewParms.isPortal ) {
-		qglDisable (GL_CLIP_PLANE0);
-	}
-
-	qglPushMatrix();
-    qglLoadIdentity();
-	qglMatrixMode( GL_PROJECTION );
-	qglPushMatrix();
-    qglLoadIdentity();
-	qglOrtho( backEnd.viewParms.viewportX, backEnd.viewParms.viewportX + backEnd.viewParms.viewportWidth,
-			  backEnd.viewParms.viewportY, backEnd.viewParms.viewportY + backEnd.viewParms.viewportHeight,
-			  -99999, 99999 );
-
-	for ( f = r_activeFlares ; f ; f = f->next ) {
-		if ( f->frameSceneNum == backEnd.viewParms.frameSceneNum
-			&& f->inPortal == backEnd.viewParms.isPortal
-			&& f->drawIntensity ) {
-			RB_RenderFlare( f );
-		}
-	}
-
-	qglPopMatrix();
-	qglMatrixMode( GL_MODELVIEW );
-	qglPopMatrix();
-}
-
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c
deleted file mode 100644
index 08cf92bf..00000000
--- a/code/renderer/tr_image.c
+++ /dev/null
@@ -1,3186 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_image.c
-#include "tr_local.h"
-
-#include <setjmp.h>
-
-/*
- * Include file for users of JPEG library.
- * You will need to have included system headers that define at least
- * the typedefs FILE and size_t before you can include jpeglib.h.
- * (stdio.h is sufficient on ANSI-conforming systems.)
- * You may also wish to include "jerror.h".
- */
-
-#define JPEG_INTERNALS
-#include "../jpeg-8c/jpeglib.h"
-
-
-static void LoadBMP( const char *name, byte **pic, int *width, int *height );
-static void LoadTGA( const char *name, byte **pic, int *width, int *height );
-static void LoadJPG( const char *name, byte **pic, int *width, int *height );
-
-static byte			 s_intensitytable[256];
-static unsigned char s_gammatable[256];
-
-int		gl_filter_min = GL_LINEAR_MIPMAP_NEAREST;
-int		gl_filter_max = GL_LINEAR;
-
-#define FILE_HASH_SIZE		1024
-static	image_t*		hashTable[FILE_HASH_SIZE];
-
-extern qboolean scr_initialized;
-
-/*
-** R_GammaCorrect
-*/
-void R_GammaCorrect( byte *buffer, int bufSize ) {
-	int i;
-
-	for ( i = 0; i < bufSize; i++ ) {
-		buffer[i] = s_gammatable[buffer[i]];
-	}
-}
-
-typedef struct {
-	char *name;
-	int	minimize, maximize;
-} textureMode_t;
-
-textureMode_t modes[] = {
-	{"GL_NEAREST", GL_NEAREST, GL_NEAREST},
-	{"GL_LINEAR", GL_LINEAR, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_NEAREST", GL_NEAREST_MIPMAP_NEAREST, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_NEAREST", GL_LINEAR_MIPMAP_NEAREST, GL_LINEAR},
-	{"GL_NEAREST_MIPMAP_LINEAR", GL_NEAREST_MIPMAP_LINEAR, GL_NEAREST},
-	{"GL_LINEAR_MIPMAP_LINEAR", GL_LINEAR_MIPMAP_LINEAR, GL_LINEAR}
-};
-
-/*
-================
-return a hash value for the filename
-================
-*/
-static long generateHashValue( const char *fname ) {
-	int		i;
-	long	hash;
-	char	letter;
-
-	hash = 0;
-	i = 0;
-	while (fname[i] != '\0') {
-		letter = tolower(fname[i]);
-		if (letter =='.') break;				// don't include extension
-		if (letter =='\\') letter = '/';		// damn path names
-		hash+=(long)(letter)*(i+119);
-		i++;
-	}
-	hash &= (FILE_HASH_SIZE-1);
-	return hash;
-}
-
-/*
-===============
-GL_TextureMode
-===============
-*/
-void GL_TextureMode( const char *string ) {
-	int		i;
-	image_t	*glt;
-
-	for ( i=0 ; i< 6 ; i++ ) {
-		if ( !Q_stricmp( modes[i].name, string ) ) {
-			break;
-		}
-	}
-
-	// hack to prevent trilinear from being set on voodoo,
-	// because their driver freaks...
-	if ( i == 5 && glConfig.hardwareType == GLHW_3DFX_2D3D ) {
-		ri.Printf( PRINT_ALL, "Refusing to set trilinear on a voodoo.\n" );
-		i = 3;
-	}
-
-
-	if ( i == 6 ) {
-		ri.Printf (PRINT_ALL, "bad filter name\n");
-		return;
-	}
-
-	gl_filter_min = modes[i].minimize;
-	gl_filter_max = modes[i].maximize;
-
-	// change all the existing mipmap texture objects
-	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		glt = &tr.images[ i ];
-		if ( glt->numMipmaps && glt->texnum ) {
-			GL_Bind (glt);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-		}
-	}
-}
-
-/*
-===============
-R_SumOfUsedImages
-===============
-*/
-int R_SumOfUsedImages( void ) {
-	int	total;
-	int i;
-
-	total = 0;
-	for ( i = 0; i < tr.numImages; i++ ) {
-		if ( tr.images[i].frameUsed == tr.frameCount ) {
-			total += tr.images[i].uploadWidth * tr.images[i].uploadHeight;
-		}
-	}
-
-	return total;
-}
-
-/*
-===============
-R_ImageList_f
-===============
-*/
-void R_ImageList_f( void ) {
-	int		i;
-	image_t	*image;
-	int		texels;
-	const char *yesno[] = {
-		"no ", "yes"
-	};
-
-	ri.Printf (PRINT_ALL, "\n      -w-- -h-- -mm- -TMU- -if-- wrap --name-------\n");
-	texels = 0;
-
-	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		image = &tr.images[ i ];
-
-		texels += image->uploadWidth*image->uploadHeight;
-		ri.Printf (PRINT_ALL,  "%4i: %4i %4i  %s   %d   ",
-			i, image->uploadWidth, image->uploadHeight, yesno[image->numMipmaps], image->TMU );
-		switch ( image->internalFormat ) {
-		case 1:
-			ri.Printf( PRINT_ALL, "I    " );
-			break;
-		case 2:
-			ri.Printf( PRINT_ALL, "IA   " );
-			break;
-		case 3:
-			ri.Printf( PRINT_ALL, "RGB  " );
-			break;
-		case 4:
-			ri.Printf( PRINT_ALL, "RGBA " );
-			break;
-		case GL_RGBA8:
-			ri.Printf( PRINT_ALL, "RGBA8" );
-			break;
-		case GL_RGB8:
-			ri.Printf( PRINT_ALL, "RGB8" );
-			break;
-		case GL_RGB4_S3TC:
-			ri.Printf( PRINT_ALL, "S3TC " );
-			break;
-		case GL_RGBA4:
-			ri.Printf( PRINT_ALL, "RGBA4" );
-			break;
-		case GL_RGB5:
-			ri.Printf( PRINT_ALL, "RGB5 " );
-			break;
-		default:
-			ri.Printf( PRINT_ALL, "???? " );
-		}
-
-		switch ( image->wrapClampModeX ) {
-		case GL_REPEAT:
-			ri.Printf( PRINT_ALL, "rept " );
-			break;
-		case GL_CLAMP:
-			ri.Printf( PRINT_ALL, "clmp " );
-			break;
-		default:
-			ri.Printf( PRINT_ALL, "%4i ", image->wrapClampModeX );
-			break;
-		}
-		
-		ri.Printf( PRINT_ALL, " %s\n", image->imgName );
-	}
-	ri.Printf (PRINT_ALL, " ---------\n");
-	ri.Printf (PRINT_ALL, " %i total texels (not including mipmaps)\n", texels);
-	ri.Printf (PRINT_ALL, " %i total images\n\n", tr.numImages );
-}
-
-//=======================================================================
-
-/*
-================
-ResampleTexture
-
-Used to resample images in a more general than quartering fashion.
-
-This will only be filtered properly if the resampled size
-is greater than half the original size.
-
-If a larger shrinking is needed, use the mipmap function 
-before or after.
-================
-*/
-static void ResampleTexture( unsigned *in, int inwidth, int inheight, unsigned *out,  
-							int outwidth, int outheight ) {
-	int		i, j;
-	unsigned	*inrow, *inrow2;
-	unsigned	frac, fracstep;
-	unsigned	p1[2048], p2[2048];
-	byte		*pix1, *pix2, *pix3, *pix4;
-
-	if (outwidth>2048)
-		ri.Error(ERR_DROP, "ResampleTexture: max width");
-								
-	fracstep = inwidth*0x10000/outwidth;
-
-	frac = fracstep>>2;
-	for ( i=0 ; i<outwidth ; i++ ) {
-		p1[i] = 4*(frac>>16);
-		frac += fracstep;
-	}
-	frac = 3*(fracstep>>2);
-	for ( i=0 ; i<outwidth ; i++ ) {
-		p2[i] = 4*(frac>>16);
-		frac += fracstep;
-	}
-
-	for (i=0 ; i<outheight ; i++, out += outwidth) {
-		inrow = in + inwidth*(int)((i+0.25)*inheight/outheight);
-		inrow2 = in + inwidth*(int)((i+0.75)*inheight/outheight);
-		frac = fracstep >> 1;
-		for (j=0 ; j<outwidth ; j++) {
-			pix1 = (byte *)inrow + p1[j];
-			pix2 = (byte *)inrow + p2[j];
-			pix3 = (byte *)inrow2 + p1[j];
-			pix4 = (byte *)inrow2 + p2[j];
-			((byte *)(out+j))[0] = (pix1[0] + pix2[0] + pix3[0] + pix4[0])>>2;
-			((byte *)(out+j))[1] = (pix1[1] + pix2[1] + pix3[1] + pix4[1])>>2;
-			((byte *)(out+j))[2] = (pix1[2] + pix2[2] + pix3[2] + pix4[2])>>2;
-			((byte *)(out+j))[3] = (pix1[3] + pix2[3] + pix3[3] + pix4[3])>>2;
-		}
-	}
-}
-
-/*
-================
-R_LightScaleTexture
-
-Scale up the pixel values in a texture to increase the
-lighting range
-================
-*/
-void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only_gamma )
-{
-	if (!tr.needsLightScale) {
-		return;
-	}
-
-	if ( only_gamma )
-	{
-		if ( !glConfig.deviceSupportsGamma )
-		{
-			int		i, c;
-			byte	*p;
-
-			p = (byte *)in;
-
-			c = inwidth*inheight;
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_gammatable[p[0]];
-				p[1] = s_gammatable[p[1]];
-				p[2] = s_gammatable[p[2]];
-			}
-		}
-	}
-	else
-	{
-		int		i, c;
-		byte	*p;
-
-		p = (byte *)in;
-
-		c = inwidth*inheight;
-
-		if ( glConfig.deviceSupportsGamma )
-		{
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_intensitytable[p[0]];
-				p[1] = s_intensitytable[p[1]];
-				p[2] = s_intensitytable[p[2]];
-			}
-		}
-		else
-		{
-			for (i=0 ; i<c ; i++, p+=4)
-			{
-				p[0] = s_gammatable[s_intensitytable[p[0]]];
-				p[1] = s_gammatable[s_intensitytable[p[1]]];
-				p[2] = s_gammatable[s_intensitytable[p[2]]];
-			}
-		}
-	}
-}
-
-/*
-================
-R_MipMap
-
-Operates in place, quartering the size of the texture
-================
-*/
-static void R_MipMap (byte *in, int width, int height) {
-	int		i, j;
-	byte	*out;
-	int		row;
-
-	if ( width == 1 && height == 1 ) {
-		return;
-	}
-
-	row = width * 4;
-	out = in;
-	width >>= 1;
-	height >>= 1;
-
-	if ( width == 0 || height == 0 ) {
-		width += height;	// get largest
-		for (i=0 ; i<width ; i++, out+=4, in+=8 ) {
-			out[0] = ( in[0] + in[4] )>>1;
-			out[1] = ( in[1] + in[5] )>>1;
-			out[2] = ( in[2] + in[6] )>>1;
-			out[3] = ( in[3] + in[7] )>>1;
-		}
-		return;
-	}
-
-	for (i=0 ; i<height ; i++, in+=row) {
-		for (j=0 ; j<width ; j++, out+=4, in+=8) {
-			out[0] = (in[0] + in[4] + in[row+0] + in[row+4])>>2;
-			out[1] = (in[1] + in[5] + in[row+1] + in[row+5])>>2;
-			out[2] = (in[2] + in[6] + in[row+2] + in[row+6])>>2;
-			out[3] = (in[3] + in[7] + in[row+3] + in[row+7])>>2;
-		}
-	}
-}
-
-
-/*
-==================
-R_BlendOverTexture
-
-Apply a color blend over a set of pixels
-==================
-*/
-static void R_BlendOverTexture( byte *data, int pixelCount, byte blend[4] ) {
-	int		i;
-	int		inverseAlpha;
-	int		premult[3];
-
-	inverseAlpha = 255 - blend[3];
-	premult[0] = blend[0] * blend[3];
-	premult[1] = blend[1] * blend[3];
-	premult[2] = blend[2] * blend[3];
-
-	for ( i = 0 ; i < pixelCount ; i++, data+=4 ) {
-		data[0] = ( data[0] * inverseAlpha + premult[0] ) >> 9;
-		data[1] = ( data[1] * inverseAlpha + premult[1] ) >> 9;
-		data[2] = ( data[2] * inverseAlpha + premult[2] ) >> 9;
-	}
-}
-
-byte	mipBlendColors[16][4] = {
-	{0,0,0,0},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-	{255,0,0,128},
-	{0,255,0,128},
-	{0,0,255,128},
-};
-
-
-/*
-===============
-Upload32
-
-===============
-*/
-extern qboolean charSet;
-static void Upload32(
-	unsigned int* data,
-	int width,
-	int height,
-	int numMipmaps,
-	qboolean picmip, 
-	qboolean dynamicallyUpdated,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int* format,
-	int* pUploadWidth,
-	int* pUploadHeight,
-	int* bytesUsed,
-	qboolean bIsLightmap
-)
-{
-	int			samples;
-	unsigned	*scaledBuffer = NULL;
-	unsigned	*resampledBuffer = NULL;
-	int			scaled_width, scaled_height;
-	int			i, c;
-	byte		*scan;
-	GLenum		internalFormat = GL_RGB;
-	float		rMax = 0, gMax = 0, bMax = 0;
-
-	//
-	// convert to exact power of 2 sizes
-	//
-	for (scaled_width = 1 ; scaled_width < width ; scaled_width<<=1)
-		;
-	for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
-		;
-	if ( r_roundImagesDown->integer && scaled_width > width )
-		scaled_width >>= 1;
-	if ( r_roundImagesDown->integer && scaled_height > height )
-		scaled_height >>= 1;
-
-	if ( scaled_width != width || scaled_height != height ) {
-		resampledBuffer = ri.Hunk_AllocateTempMemory( scaled_width * scaled_height * 4 );
-		ResampleTexture (data, width, height, resampledBuffer, scaled_width, scaled_height);
-		data = resampledBuffer;
-		width = scaled_width;
-		height = scaled_height;
-	}
-
-	//
-	// perform optional picmip operation
-	//
-	if ( picmip ) {
-		scaled_width >>= r_picmip->integer;
-		scaled_height >>= r_picmip->integer;
-	}
-
-	//
-	// clamp to minimum size
-	//
-	if (scaled_width < 1) {
-		scaled_width = 1;
-	}
-	if (scaled_height < 1) {
-		scaled_height = 1;
-	}
-
-	//
-	// clamp to the current upper OpenGL limit
-	// scale both axis down equally so we don't have to
-	// deal with a half mip resampling
-	//
-	while ( scaled_width > glConfig.maxTextureSize
-		|| scaled_height > glConfig.maxTextureSize ) {
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-	}
-
-	scaledBuffer = ri.Hunk_AllocateTempMemory( sizeof( unsigned ) * scaled_width * scaled_height );
-
-	//
-	// scan the texture for each channel's max values
-	// and verify if the alpha channel is being used or not
-	//
-	c = width*height;
-	scan = ((byte *)data);
-	samples = 3;
-	if (!bIsLightmap) {
-		for ( i = 0; i < c; i++ )
-		{
-			if ( scan[i*4+0] > rMax )
-			{
-				rMax = scan[i*4+0];
-			}
-			if ( scan[i*4+1] > gMax )
-			{
-				gMax = scan[i*4+1];
-			}
-			if ( scan[i*4+2] > bMax )
-			{
-				bMax = scan[i*4+2];
-			}
-			if ( scan[i*4 + 3] != 255 ) 
-			{
-				samples = 4;
-				break;
-			}
-		}
-		// select proper internal format
-		if ( samples == 3 )
-		{
-			if (!force32bit)
-			{
-				if (r_texturebits->integer == 16)
-				{
-					internalFormat = GL_RGB5;
-				}
-				else if (r_texturebits->integer == 32)
-				{
-					internalFormat = GL_RGB8;
-				}
-				else if (r_colorbits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_colorbits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else
-				{
-					internalFormat = 3;
-				}
-			}
-			else
-			{
-				internalFormat = GL_RGB8;
-			}
-		}
-		else if ( samples == 4 )
-		{
-			if (!force32bit)
-			{
-				if (r_texturebits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_texturebits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else if (r_colorbits->integer == 16)
-				{
-					internalFormat = GL_RGBA4;
-				}
-				else if (r_colorbits->integer == 32)
-				{
-					internalFormat = GL_RGBA8;
-				}
-				else
-				{
-					internalFormat = 4;
-				}
-			}
-			else
-			{
-				internalFormat = GL_RGB8;
-			}
-		}
-	} else {
-		internalFormat = 3;
-	}
-	// copy or resample data as appropriate for first MIP level
-	if ( ( scaled_width == width ) && 
-		( scaled_height == height ) ) {
-		if (!numMipmaps)
-		{
-			qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
-			*pUploadWidth = scaled_width;
-			*pUploadHeight = scaled_height;
-			*format = internalFormat;
-
-			goto done;
-		}
-		Com_Memcpy (scaledBuffer, data, width*height*4);
-	}
-	else
-	{
-		// use the normal mip-mapping function to go down from here
-		while ( width > scaled_width || height > scaled_height ) {
-			R_MipMap( (byte *)data, width, height );
-			width >>= 1;
-			height >>= 1;
-			if ( width < 1 ) {
-				width = 1;
-			}
-			if ( height < 1 ) {
-				height = 1;
-			}
-		}
-		Com_Memcpy( scaledBuffer, data, width * height * 4 );
-	}
-
-	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !numMipmaps);
-
-	*pUploadWidth = scaled_width;
-	*pUploadHeight = scaled_height;
-	*format = internalFormat;
-
-	qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
-
-	if (numMipmaps)
-	{
-		int		miplevel;
-
-		miplevel = 0;
-		while (scaled_width > 1 || scaled_height > 1)
-		{
-			R_MipMap( (byte *)scaledBuffer, scaled_width, scaled_height );
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			if (scaled_width < 1)
-				scaled_width = 1;
-			if (scaled_height < 1)
-				scaled_height = 1;
-			miplevel++;
-
-			if ( r_colorMipLevels->integer ) {
-				R_BlendOverTexture( (byte *)scaledBuffer, scaled_width * scaled_height, mipBlendColors[miplevel] );
-			}
-
-			qglTexImage2D (GL_TEXTURE_2D, miplevel, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
-		}
-	}
-done:
-
-	if (numMipmaps)
-	{
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-	}
-
-	GL_CheckErrors();
-
-	if ( scaledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( scaledBuffer );
-	if ( resampledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( resampledBuffer );
-}
-
-/*
-static void UploadCompressed(
-	byte* data,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean picmip,
-	int glCompressMode,
-	int* format,
-	int* pUploadWidth,
-	int* pUploadHeight,
-	int* pBytesUsed
-) {
-	byte* offset;
-	int i;
-	int iStartImage;
-	int size;
-	int blockSize;
-	int scaled_width, scaled_height;
-
-	offset = data;
-	iStartImage = 0;
-	if (picmip) {
-		iStartImage = r_picmip->integer;
-	}
-
-	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable) {
-		iStartImage = iMipmapsAvailable - 1;
-	}
-
-	scaled_width = width;
-	scaled_height = height;
-	if (iStartImage)
-	{
-		scaled_width = width >> iStartImage;
-		scaled_height = height >> iStartImage;
-	}
-	while (scaled_width > glConfig.maxTextureSize || scaled_height > glConfig.maxTextureSize)
-	{
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-		++iStartImage;
-	}
-	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable)
-	{
-		iStartImage = iMipmapsAvailable - 1;
-		scaled_width = width >> (iMipmapsAvailable - 1);
-		scaled_height = height >> (iMipmapsAvailable - 1);
-	}
-
-	*pUploadWidth = scaled_width;
-	*pUploadHeight = scaled_height;
-	*format = glCompressMode;
-	blockSize = 16;
-
-	if (glCompressMode == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || glCompressMode == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
-		blockSize = 8;
-	}
-
-	scaled_width = width;
-	scaled_height = height;
-
-	for (i = iStartImage; i; i--) {
-		int w, h;
-
-		w = scaled_width + 3;
-		if (scaled_width + 3 < 0) {
-			w = scaled_width + 6;
-		}
-		w >>= 2;
-
-		if (w > 1) {
-			h = scaled_height + 3;
-			if (scaled_height + 3 < 0) {
-				h = scaled_height + 6;
-			}
-
-			h >>= 2;
-			if (h > 1) {
-				offset += blockSize * w * h;
-			}
-		}
-
-		scaled_width >>= 1;
-		scaled_height >>= 1;
-		if (!scaled_width) scaled_width = 1;
-		if (!scaled_height) scaled_height = 1;
-	}
-
-	*pBytesUsed = 0;
-
-	for (;;)
-	{
-		while (scaled_width)
-		{
-			int w, h;
-
-			if (!scaled_height) scaled_height = 1;
-			w = scaled_width + 3;
-			if (scaled_width + 3 < 0) w = scaled_width + 6;
-			w >>= 2;
-
-			h = scaled_height + 3;
-			if (scaled_height + 3 < 0) h = scaled_height + 6;
-			h >>= 2;
-
-			size = blockSize * w * h;
-			if (w > 1 && h > 1) *pBytesUsed += size;
-			
-			qglCompressedTexImage2DARB(3553, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, data);
-			GL_CheckErrors();
-
-			if (i < iMipmapsAvailable)
-			{
-				w = scaled_width + 3;
-				if (scaled_width + 3 < 0) {
-					w = scaled_width + 6;
-				}
-
-				if (w >> 2 > 1)
-				{
-					h = scaled_height + 3;
-					if (scaled_height + 3 < 0) {
-						h = scaled_height + 6;
-					}
-
-					if (h >> 2 > 1)
-						data += size;
-				}
-			}
-			scaled_width >>= 1;
-			scaled_height >>= 1;
-			++i;
-		}
-
-		if (!scaled_height) {
-			break;
-		}
-
-		scaled_width = 1;
-	}
-
-	if (numMipmaps > 1) {
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
-	}
-	else
-	{
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	}
-
-	GL_CheckErrors();
-}
-*/
-
-/*
-================
-R_CreateImage
-
-This is the only way any image_t are created
-================
-*/
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-) {
-	image_t		*image;
-	qboolean	isLightmap = qfalse;
-	qboolean	dynamicallyUpdated = qfalse;
-	int i;
-	long		hash;
-
-	if (strlen(name) >= MAX_QPATH ) {
-		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long\n", name);
-	}
-	if (!strncmp(name, "*lightmap", 9)) {
-		isLightmap = qtrue;
-	}
-	else if (!strncmp(name, "*lightmapD", 10)) {
-		dynamicallyUpdated = qtrue;
-	}
-
-	for (i = 0; i < tr.numImages; i++)
-	{
-		if (!tr.images[i].imgName[0])
-		{
-			// found a free image
-			break;
-		}
-	}
-
-	if (i == tr.numImages)
-    {
-        if (tr.numImages == MAX_DRAWIMAGES) {
-            ri.Error(ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit\n");
-		} else {
-			tr.numImages++;
-		}
-	}
-
-	image = &tr.images[i];
-	image->texnum = 1024 + tr.numImages;
-
-	image->numMipmaps = numMipmaps;
-	image->allowPicmip = allowPicmip;
-	image->dynamicallyUpdated = dynamicallyUpdated;
-	image->force32bit = force32bit;
-	image->UseCount = 0;
-
-	strcpy (image->imgName, name);
-
-	image->width = width;
-	image->height = height;
-	image->wrapClampModeX = glWrapClampModeX;
-	image->wrapClampModeY = glWrapClampModeY;
-
-	// lightmaps are always allocated on TMU 1
-	if ( qglActiveTextureARB && isLightmap ) {
-		image->TMU = 1;
-	} else {
-		image->TMU = 0;
-	}
-
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( image->TMU );
-	}
-
-	GL_Bind(image);
-
-    Upload32(
-        (unsigned*)pic,
-        image->width,
-        image->height,
-        image->numMipmaps,
-        allowPicmip,
-        image->dynamicallyUpdated,
-        force32bit,
-        hasAlpha,
-        &image->internalFormat,
-        &image->uploadWidth,
-        &image->uploadHeight,
-        &image->bytesUsed,
-        isLightmap
-    );
-
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampModeX );
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampModeY );
-
-	qglBindTexture( GL_TEXTURE_2D, 0 );
-
-	glState.currenttextures[image->TMU] = -1;
-	if ( image->TMU == 1 ) {
-		GL_SelectTexture( 0 );
-	}
-
-	hash = generateHashValue(name);
-	image->next = hashTable[hash];
-	hashTable[hash] = image;
-	image->r_sequence = r_sequencenumber;
-
-	return image;
-}
-
-
-/*
-=========================================================
-
-BMP LOADING
-
-=========================================================
-*/
-typedef struct
-{
-	char id[2];
-	unsigned long fileSize;
-	unsigned long reserved0;
-	unsigned long bitmapDataOffset;
-	unsigned long bitmapHeaderSize;
-	unsigned long width;
-	unsigned long height;
-	unsigned short planes;
-	unsigned short bitsPerPixel;
-	unsigned long compression;
-	unsigned long bitmapDataSize;
-	unsigned long hRes;
-	unsigned long vRes;
-	unsigned long colors;
-	unsigned long importantColors;
-	unsigned char palette[256][4];
-} BMPHeader_t;
-
-static void LoadBMP( const char *name, byte **pic, int *width, int *height )
-{
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	int		length;
-	BMPHeader_t bmpHeader;
-	byte		*bmpRGBA;
-
-	*pic = NULL;
-
-	//
-	// load the file
-	//
-	length = ri.FS_ReadFile( ( char * ) name, (void **)&buffer);
-	if (!buffer) {
-		return;
-	}
-
-	buf_p = buffer;
-
-	bmpHeader.id[0] = *buf_p++;
-	bmpHeader.id[1] = *buf_p++;
-	bmpHeader.fileSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.reserved0 = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapDataOffset = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapHeaderSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.width = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.height = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.planes = LittleShort( * ( short * ) buf_p );
-	buf_p += 2;
-	bmpHeader.bitsPerPixel = LittleShort( * ( short * ) buf_p );
-	buf_p += 2;
-	bmpHeader.compression = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.bitmapDataSize = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.hRes = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.vRes = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.colors = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-	bmpHeader.importantColors = LittleLong( * ( long * ) buf_p );
-	buf_p += 4;
-
-	Com_Memcpy( bmpHeader.palette, buf_p, sizeof( bmpHeader.palette ) );
-
-	if ( bmpHeader.bitsPerPixel == 8 )
-		buf_p += 1024;
-
-	if ( bmpHeader.id[0] != 'B' && bmpHeader.id[1] != 'M' ) 
-	{
-		ri.Error( ERR_DROP, "LoadBMP: only Windows-style BMP files supported (%s)\n", name );
-	}
-	if ( bmpHeader.fileSize != length )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%d vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
-	}
-	if ( bmpHeader.compression != 0 )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: only uncompressed BMP files supported (%s)\n", name );
-	}
-	if ( bmpHeader.bitsPerPixel < 8 )
-	{
-		ri.Error( ERR_DROP, "LoadBMP: monochrome and 4-bit BMP files not supported (%s)\n", name );
-	}
-
-	columns = bmpHeader.width;
-	rows = bmpHeader.height;
-	if ( rows < 0 )
-		rows = -rows;
-	numPixels = columns * rows;
-
-	if ( width ) 
-		*width = columns;
-	if ( height )
-		*height = rows;
-
-	bmpRGBA = ri.Malloc( numPixels * 4 );
-	*pic = bmpRGBA;
-
-
-	for ( row = rows-1; row >= 0; row-- )
-	{
-		pixbuf = bmpRGBA + row*columns*4;
-
-		for ( column = 0; column < columns; column++ )
-		{
-			unsigned char red, green, blue, alpha;
-			int palIndex;
-			unsigned short shortPixel;
-
-			switch ( bmpHeader.bitsPerPixel )
-			{
-			case 8:
-				palIndex = *buf_p++;
-				*pixbuf++ = bmpHeader.palette[palIndex][2];
-				*pixbuf++ = bmpHeader.palette[palIndex][1];
-				*pixbuf++ = bmpHeader.palette[palIndex][0];
-				*pixbuf++ = 0xff;
-				break;
-			case 16:
-				shortPixel = * ( unsigned short * ) pixbuf;
-				pixbuf += 2;
-				*pixbuf++ = ( shortPixel & ( 31 << 10 ) ) >> 7;
-				*pixbuf++ = ( shortPixel & ( 31 << 5 ) ) >> 2;
-				*pixbuf++ = ( shortPixel & ( 31 ) ) << 3;
-				*pixbuf++ = 0xff;
-				break;
-
-			case 24:
-				blue = *buf_p++;
-				green = *buf_p++;
-				red = *buf_p++;
-				*pixbuf++ = red;
-				*pixbuf++ = green;
-				*pixbuf++ = blue;
-				*pixbuf++ = 255;
-				break;
-			case 32:
-				blue = *buf_p++;
-				green = *buf_p++;
-				red = *buf_p++;
-				alpha = *buf_p++;
-				*pixbuf++ = red;
-				*pixbuf++ = green;
-				*pixbuf++ = blue;
-				*pixbuf++ = alpha;
-				break;
-			default:
-				ri.Error( ERR_DROP, "LoadBMP: illegal pixel_size '%d' in file '%s'\n", bmpHeader.bitsPerPixel, name );
-				break;
-			}
-		}
-	}
-
-	ri.FS_FreeFile( buffer );
-
-}
-
-
-/*
-=================================================================
-
-PCX LOADING
-
-=================================================================
-*/
-
-
-/*
-==============
-LoadPCX
-==============
-*/
-static void LoadPCX ( const char *filename, byte **pic, byte **palette, int *width, int *height)
-{
-	byte	*raw;
-	pcx_t	*pcx;
-	int		x, y;
-	int		len;
-	int		dataByte, runLength;
-	byte	*out, *pix;
-	int		xmax, ymax;
-
-	*pic = NULL;
-	*palette = NULL;
-
-	//
-	// load the file
-	//
-	len = ri.FS_ReadFile( ( char * ) filename, (void **)&raw);
-	if (!raw) {
-		return;
-	}
-
-	//
-	// parse the PCX file
-	//
-	pcx = (pcx_t *)raw;
-	raw = &pcx->data;
-
-  	xmax = LittleShort(pcx->xmax);
-    ymax = LittleShort(pcx->ymax);
-
-	if (pcx->manufacturer != 0x0a
-		|| pcx->version != 5
-		|| pcx->encoding != 1
-		|| pcx->bits_per_pixel != 8
-		|| xmax >= 1024
-		|| ymax >= 1024)
-	{
-		ri.Printf (PRINT_ALL, "Bad pcx file %s (%i x %i) (%i x %i)\n", filename, xmax+1, ymax+1, pcx->xmax, pcx->ymax);
-		return;
-	}
-
-	out = ri.Malloc ( (ymax+1) * (xmax+1) );
-
-	*pic = out;
-
-	pix = out;
-
-	if (palette)
-	{
-		*palette = ri.Malloc(768);
-		Com_Memcpy (*palette, (byte *)pcx + len - 768, 768);
-	}
-
-	if (width)
-		*width = xmax+1;
-	if (height)
-		*height = ymax+1;
-// FIXME: use bytes_per_line here?
-
-	for (y=0 ; y<=ymax ; y++, pix += xmax+1)
-	{
-		for (x=0 ; x<=xmax ; )
-		{
-			dataByte = *raw++;
-
-			if((dataByte & 0xC0) == 0xC0)
-			{
-				runLength = dataByte & 0x3F;
-				dataByte = *raw++;
-			}
-			else
-				runLength = 1;
-
-			while(runLength-- > 0)
-				pix[x++] = dataByte;
-		}
-
-	}
-
-	if ( raw - (byte *)pcx > len)
-	{
-		ri.Printf (PRINT_DEVELOPER, "PCX file %s was malformed", filename);
-		ri.Free (*pic);
-		*pic = NULL;
-	}
-
-	ri.FS_FreeFile (pcx);
-}
-
-
-/*
-==============
-LoadPCX32
-==============
-*/
-static void LoadPCX32 ( const char *filename, byte **pic, int *width, int *height) {
-	byte	*palette;
-	byte	*pic8;
-	int		i, c, p;
-	byte	*pic32;
-
-	LoadPCX (filename, &pic8, &palette, width, height);
-	if (!pic8) {
-		*pic = NULL;
-		return;
-	}
-
-	c = (*width) * (*height);
-	pic32 = *pic = ri.Malloc(4 * c );
-	for (i = 0 ; i < c ; i++) {
-		p = pic8[i];
-		pic32[0] = palette[p*3];
-		pic32[1] = palette[p*3 + 1];
-		pic32[2] = palette[p*3 + 2];
-		pic32[3] = 255;
-		pic32 += 4;
-	}
-
-	ri.Free (pic8);
-	ri.Free (palette);
-}
-
-//==========================
-//
-// DDS Loading
-//
-//==========================
-
-typedef unsigned int   ui32_t;
-
-typedef struct ddsHeader_s
-{
-	ui32_t headerSize;
-	ui32_t flags;
-	ui32_t height;
-	ui32_t width;
-	ui32_t pitchOrFirstMipSize;
-	ui32_t volumeDepth;
-	ui32_t numMips;
-	ui32_t reserved1[11];
-	ui32_t always_0x00000020;
-	ui32_t pixelFormatFlags;
-	ui32_t fourCC;
-	ui32_t rgbBitCount;
-	ui32_t rBitMask;
-	ui32_t gBitMask;
-	ui32_t bBitMask;
-	ui32_t aBitMask;
-	ui32_t caps;
-	ui32_t caps2;
-	ui32_t caps3;
-	ui32_t caps4;
-	ui32_t reserved2;
-}
-ddsHeader_t;
-
-// flags:
-#define _DDSFLAGS_REQUIRED     0x001007
-#define _DDSFLAGS_PITCH        0x8
-#define _DDSFLAGS_MIPMAPCOUNT  0x20000
-#define _DDSFLAGS_FIRSTMIPSIZE 0x80000
-#define _DDSFLAGS_VOLUMEDEPTH  0x800000
-
-// pixelFormatFlags:
-#define DDSPF_ALPHAPIXELS 0x1
-#define DDSPF_ALPHA       0x2
-#define DDSPF_FOURCC      0x4
-#define DDSPF_RGB         0x40
-#define DDSPF_YUV         0x200
-#define DDSPF_LUMINANCE   0x20000
-
-// caps:
-#define DDSCAPS_COMPLEX  0x8
-#define DDSCAPS_MIPMAP   0x400000
-#define DDSCAPS_REQUIRED 0x1000
-
-// caps2:
-#define DDSCAPS2_CUBEMAP 0xFE00
-#define DDSCAPS2_VOLUME  0x200000
-
-typedef struct ddsHeaderDxt10_s
-{
-	ui32_t dxgiFormat;
-	ui32_t dimensions;
-	ui32_t miscFlags;
-	ui32_t arraySize;
-	ui32_t miscFlags2;
-}
-ddsHeaderDxt10_t;
-
-// dxgiFormat
-// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb173059%28v=vs.85%29.aspx
-typedef enum DXGI_FORMAT {
-	DXGI_FORMAT_UNKNOWN = 0,
-	DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
-	DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
-	DXGI_FORMAT_R32G32B32A32_UINT = 3,
-	DXGI_FORMAT_R32G32B32A32_SINT = 4,
-	DXGI_FORMAT_R32G32B32_TYPELESS = 5,
-	DXGI_FORMAT_R32G32B32_FLOAT = 6,
-	DXGI_FORMAT_R32G32B32_UINT = 7,
-	DXGI_FORMAT_R32G32B32_SINT = 8,
-	DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
-	DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
-	DXGI_FORMAT_R16G16B16A16_UNORM = 11,
-	DXGI_FORMAT_R16G16B16A16_UINT = 12,
-	DXGI_FORMAT_R16G16B16A16_SNORM = 13,
-	DXGI_FORMAT_R16G16B16A16_SINT = 14,
-	DXGI_FORMAT_R32G32_TYPELESS = 15,
-	DXGI_FORMAT_R32G32_FLOAT = 16,
-	DXGI_FORMAT_R32G32_UINT = 17,
-	DXGI_FORMAT_R32G32_SINT = 18,
-	DXGI_FORMAT_R32G8X24_TYPELESS = 19,
-	DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
-	DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
-	DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
-	DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
-	DXGI_FORMAT_R10G10B10A2_UNORM = 24,
-	DXGI_FORMAT_R10G10B10A2_UINT = 25,
-	DXGI_FORMAT_R11G11B10_FLOAT = 26,
-	DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
-	DXGI_FORMAT_R8G8B8A8_UNORM = 28,
-	DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
-	DXGI_FORMAT_R8G8B8A8_UINT = 30,
-	DXGI_FORMAT_R8G8B8A8_SNORM = 31,
-	DXGI_FORMAT_R8G8B8A8_SINT = 32,
-	DXGI_FORMAT_R16G16_TYPELESS = 33,
-	DXGI_FORMAT_R16G16_FLOAT = 34,
-	DXGI_FORMAT_R16G16_UNORM = 35,
-	DXGI_FORMAT_R16G16_UINT = 36,
-	DXGI_FORMAT_R16G16_SNORM = 37,
-	DXGI_FORMAT_R16G16_SINT = 38,
-	DXGI_FORMAT_R32_TYPELESS = 39,
-	DXGI_FORMAT_D32_FLOAT = 40,
-	DXGI_FORMAT_R32_FLOAT = 41,
-	DXGI_FORMAT_R32_UINT = 42,
-	DXGI_FORMAT_R32_SINT = 43,
-	DXGI_FORMAT_R24G8_TYPELESS = 44,
-	DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
-	DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
-	DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
-	DXGI_FORMAT_R8G8_TYPELESS = 48,
-	DXGI_FORMAT_R8G8_UNORM = 49,
-	DXGI_FORMAT_R8G8_UINT = 50,
-	DXGI_FORMAT_R8G8_SNORM = 51,
-	DXGI_FORMAT_R8G8_SINT = 52,
-	DXGI_FORMAT_R16_TYPELESS = 53,
-	DXGI_FORMAT_R16_FLOAT = 54,
-	DXGI_FORMAT_D16_UNORM = 55,
-	DXGI_FORMAT_R16_UNORM = 56,
-	DXGI_FORMAT_R16_UINT = 57,
-	DXGI_FORMAT_R16_SNORM = 58,
-	DXGI_FORMAT_R16_SINT = 59,
-	DXGI_FORMAT_R8_TYPELESS = 60,
-	DXGI_FORMAT_R8_UNORM = 61,
-	DXGI_FORMAT_R8_UINT = 62,
-	DXGI_FORMAT_R8_SNORM = 63,
-	DXGI_FORMAT_R8_SINT = 64,
-	DXGI_FORMAT_A8_UNORM = 65,
-	DXGI_FORMAT_R1_UNORM = 66,
-	DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
-	DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
-	DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
-	DXGI_FORMAT_BC1_TYPELESS = 70,
-	DXGI_FORMAT_BC1_UNORM = 71,
-	DXGI_FORMAT_BC1_UNORM_SRGB = 72,
-	DXGI_FORMAT_BC2_TYPELESS = 73,
-	DXGI_FORMAT_BC2_UNORM = 74,
-	DXGI_FORMAT_BC2_UNORM_SRGB = 75,
-	DXGI_FORMAT_BC3_TYPELESS = 76,
-	DXGI_FORMAT_BC3_UNORM = 77,
-	DXGI_FORMAT_BC3_UNORM_SRGB = 78,
-	DXGI_FORMAT_BC4_TYPELESS = 79,
-	DXGI_FORMAT_BC4_UNORM = 80,
-	DXGI_FORMAT_BC4_SNORM = 81,
-	DXGI_FORMAT_BC5_TYPELESS = 82,
-	DXGI_FORMAT_BC5_UNORM = 83,
-	DXGI_FORMAT_BC5_SNORM = 84,
-	DXGI_FORMAT_B5G6R5_UNORM = 85,
-	DXGI_FORMAT_B5G5R5A1_UNORM = 86,
-	DXGI_FORMAT_B8G8R8A8_UNORM = 87,
-	DXGI_FORMAT_B8G8R8X8_UNORM = 88,
-	DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
-	DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
-	DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
-	DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
-	DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
-	DXGI_FORMAT_BC6H_TYPELESS = 94,
-	DXGI_FORMAT_BC6H_UF16 = 95,
-	DXGI_FORMAT_BC6H_SF16 = 96,
-	DXGI_FORMAT_BC7_TYPELESS = 97,
-	DXGI_FORMAT_BC7_UNORM = 98,
-	DXGI_FORMAT_BC7_UNORM_SRGB = 99,
-	DXGI_FORMAT_AYUV = 100,
-	DXGI_FORMAT_Y410 = 101,
-	DXGI_FORMAT_Y416 = 102,
-	DXGI_FORMAT_NV12 = 103,
-	DXGI_FORMAT_P010 = 104,
-	DXGI_FORMAT_P016 = 105,
-	DXGI_FORMAT_420_OPAQUE = 106,
-	DXGI_FORMAT_YUY2 = 107,
-	DXGI_FORMAT_Y210 = 108,
-	DXGI_FORMAT_Y216 = 109,
-	DXGI_FORMAT_NV11 = 110,
-	DXGI_FORMAT_AI44 = 111,
-	DXGI_FORMAT_IA44 = 112,
-	DXGI_FORMAT_P8 = 113,
-	DXGI_FORMAT_A8P8 = 114,
-	DXGI_FORMAT_B4G4R4A4_UNORM = 115,
-	DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
-} DXGI_FORMAT;
-
-#define EncodeFourCC(x) ((((ui32_t)((x)[0]))      ) | \
-                         (((ui32_t)((x)[1])) << 8 ) | \
-                         (((ui32_t)((x)[2])) << 16) | \
-                         (((ui32_t)((x)[3])) << 24) )
-
-
-static void LoadDDS(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
-	union {
-		byte* b;
-		void* v;
-	} buffer;
-	int len;
-	ddsHeader_t* ddsHeader = NULL;
-	ddsHeaderDxt10_t* ddsHeaderDxt10 = NULL;
-	byte* data;
-
-	*pic = 0;
-	*piMipmapsAvailable = 0;
-
-	if (width)
-		*width = 0;
-	if (height)
-		*height = 0;
-
-	*pic = NULL;
-
-	//
-	// load the file
-	//
-	len = ri.FS_ReadFile((char*)name, &buffer.v);
-	if (!buffer.b || len < 0) {
-		return;
-	}
-
-	//
-	// reject files that are too small to hold even a header
-	//
-	if (len < 4 + sizeof(*ddsHeader))
-	{
-		ri.Printf(PRINT_ALL, "File %s is too small to be a DDS file.\n", name);
-		ri.FS_FreeFile(buffer.v);
-		return;
-	}
-
-	//
-	// reject files that don't start with "DDS "
-	//
-	if (*((ui32_t*)(buffer.b)) != EncodeFourCC("DDS "))
-	{
-		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
-		ri.FS_FreeFile(buffer.v);
-		return;
-	}
-
-	//
-	// parse header and dx10 header if available
-	//
-	ddsHeader = (ddsHeader_t*)(buffer.b + 4);
-	if ((ddsHeader->pixelFormatFlags & DDSPF_FOURCC) && ddsHeader->fourCC == EncodeFourCC("DX10"))
-	{
-		if (len < 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10))
-		{
-			ri.Printf(PRINT_ALL, "File %s indicates a DX10 header it is too small to contain.\n", name);
-			ri.FS_FreeFile(buffer.v);
-			return;
-		}
-
-		ddsHeaderDxt10 = (ddsHeaderDxt10_t*)(buffer.b + 4 + sizeof(ddsHeader_t));
-		data = buffer.b + 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10);
-		len -= 4 + sizeof(*ddsHeader) + sizeof(*ddsHeaderDxt10);
-	}
-	else
-	{
-		data = buffer.b + 4 + sizeof(*ddsHeader);
-		len -= 4 + sizeof(*ddsHeader);
-	}
-
-	if (width)
-		*width = ddsHeader->width;
-	if (height)
-		*height = ddsHeader->height;
-
-	if (piMipmapsAvailable)
-	{
-		if (ddsHeader->flags & _DDSFLAGS_MIPMAPCOUNT)
-			*piMipmapsAvailable = ddsHeader->numMips;
-		else
-			*piMipmapsAvailable = 1;
-	}
-
-	// FIXME: handle cube map
-	//if ((ddsHeader->caps2 & DDSCAPS2_CUBEMAP) == DDSCAPS2_CUBEMAP)
-
-	//
-	// Convert DXGI format/FourCC into OpenGL format
-	//
-	if (ddsHeaderDxt10)
-	{
-		ri.Printf(PRINT_ALL, "DDS File %s has unsupported DXGI format %d.", name, ddsHeaderDxt10->dxgiFormat);
-		ri.FS_FreeFile(buffer.v);
-		return;
-	}
-	else
-	{
-		if (ddsHeader->pixelFormatFlags & DDSPF_FOURCC)
-		{
-			if (ddsHeader->fourCC == EncodeFourCC("DXT1"))
-				*glCompressMode = GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT2"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT3"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT4"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-			else if (ddsHeader->fourCC == EncodeFourCC("DXT5"))
-				*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-			else
-			{
-				ri.Printf(PRINT_ALL, "DDS File %s has unsupported FourCC.", name);
-				ri.FS_FreeFile(buffer.v);
-				return;
-			}
-		}
-		else if (ddsHeader->pixelFormatFlags == (DDSPF_RGB | DDSPF_ALPHAPIXELS)
-			&& ddsHeader->rgbBitCount == 32
-			&& ddsHeader->rBitMask == 0x000000ff
-			&& ddsHeader->gBitMask == 0x0000ff00
-			&& ddsHeader->bBitMask == 0x00ff0000
-			&& ddsHeader->aBitMask == 0xff000000)
-		{
-			*glCompressMode = GL_RGBA8;
-		}
-		else
-		{
-			ri.Printf(PRINT_ALL, "DDS File %s has unsupported RGBA format.", name);
-			ri.FS_FreeFile(buffer.v);
-			return;
-		}
-	}
-
-	*pic = ri.Malloc(len);
-	Com_Memcpy(*pic, data, len);
-
-	ri.FS_FreeFile(buffer.v);
-}
-
-/*
-=========================================================
-
-TARGA LOADING
-
-=========================================================
-*/
-
-/*
-=============
-LoadTGA
-=============
-*/
-static void LoadTGA ( const char *name, byte **pic, int *width, int *height)
-{
-	int		columns, rows, numPixels;
-	byte	*pixbuf;
-	int		row, column;
-	byte	*buf_p;
-	byte	*buffer;
-	TargaHeader	targa_header;
-	byte		*targa_rgba;
-
-	*pic = NULL;
-
-	//
-	// load the file
-	//
-	ri.FS_ReadFile ( ( char * ) name, (void **)&buffer);
-	if (!buffer) {
-		return;
-	}
-
-	buf_p = buffer;
-
-	targa_header.id_length = *buf_p++;
-	targa_header.colormap_type = *buf_p++;
-	targa_header.image_type = *buf_p++;
-	
-	targa_header.colormap_index = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.colormap_length = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.colormap_size = *buf_p++;
-	targa_header.x_origin = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.y_origin = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.width = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.height = LittleShort ( *(short *)buf_p );
-	buf_p += 2;
-	targa_header.pixel_size = *buf_p++;
-	targa_header.attributes = *buf_p++;
-
-	if (targa_header.image_type!=2 
-		&& targa_header.image_type!=10
-		&& targa_header.image_type != 3 ) 
-	{
-		ri.Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
-	}
-
-	if ( targa_header.colormap_type != 0 )
-	{
-		ri.Error( ERR_DROP, "LoadTGA: colormaps not supported\n" );
-	}
-
-	if ( ( targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) && targa_header.image_type != 3 )
-	{
-		ri.Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
-	}
-
-	columns = targa_header.width;
-	rows = targa_header.height;
-	numPixels = columns * rows;
-
-	if (width)
-		*width = columns;
-	if (height)
-		*height = rows;
-
-	targa_rgba = ri.Malloc (numPixels*4);
-	*pic = targa_rgba;
-
-	if (targa_header.id_length != 0)
-		buf_p += targa_header.id_length;  // skip TARGA image comment
-	
-	if ( targa_header.image_type==2 || targa_header.image_type == 3 )
-	{ 
-		// Uncompressed RGB or gray scale image
-		for(row=rows-1; row>=0; row--) 
-		{
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; column++) 
-			{
-				unsigned char red,green,blue,alphabyte;
-				switch (targa_header.pixel_size) 
-				{
-					
-				case 8:
-					blue = *buf_p++;
-					green = blue;
-					red = blue;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = 255;
-					break;
-
-				case 24:
-					blue = *buf_p++;
-					green = *buf_p++;
-					red = *buf_p++;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = 255;
-					break;
-				case 32:
-					blue = *buf_p++;
-					green = *buf_p++;
-					red = *buf_p++;
-					alphabyte = *buf_p++;
-					*pixbuf++ = red;
-					*pixbuf++ = green;
-					*pixbuf++ = blue;
-					*pixbuf++ = alphabyte;
-					break;
-				default:
-					ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-					break;
-				}
-			}
-		}
-	}
-	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
-		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
-
-		red = 0;
-		green = 0;
-		blue = 0;
-		alphabyte = 0xff;
-
-		for(row=rows-1; row>=0; row--) {
-			pixbuf = targa_rgba + row*columns*4;
-			for(column=0; column<columns; ) {
-				packetHeader= *buf_p++;
-				packetSize = 1 + (packetHeader & 0x7f);
-				if (packetHeader & 0x80) {        // run-length packet
-					switch (targa_header.pixel_size) {
-						case 24:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = 255;
-								break;
-						case 32:
-								blue = *buf_p++;
-								green = *buf_p++;
-								red = *buf_p++;
-								alphabyte = *buf_p++;
-								break;
-						default:
-							ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-							break;
-					}
-	
-					for(j=0;j<packetSize;j++) {
-						*pixbuf++=red;
-						*pixbuf++=green;
-						*pixbuf++=blue;
-						*pixbuf++=alphabyte;
-						column++;
-						if (column==columns) { // run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}
-					}
-				}
-				else {                            // non run-length packet
-					for(j=0;j<packetSize;j++) {
-						switch (targa_header.pixel_size) {
-							case 24:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = 255;
-									break;
-							case 32:
-									blue = *buf_p++;
-									green = *buf_p++;
-									red = *buf_p++;
-									alphabyte = *buf_p++;
-									*pixbuf++ = red;
-									*pixbuf++ = green;
-									*pixbuf++ = blue;
-									*pixbuf++ = alphabyte;
-									break;
-							default:
-								ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
-								break;
-						}
-						column++;
-						if (column==columns) { // pixel packet run spans across rows
-							column=0;
-							if (row>0)
-								row--;
-							else
-								goto breakOut;
-							pixbuf = targa_rgba + row*columns*4;
-						}						
-					}
-				}
-			}
-			breakOut:;
-		}
-	}
-
-#if 0 
-  // TTimo: this is the chunk of code to ensure a behavior that meets TGA specs 
-  // bk0101024 - fix from Leonardo
-  // bit 5 set => top-down
-  if (targa_header.attributes & 0x20) {
-    unsigned char *flip = (unsigned char*)malloc (columns*4);
-    unsigned char *src, *dst;
-
-    for (row = 0; row < rows/2; row++) {
-      src = targa_rgba + row * 4 * columns;
-      dst = targa_rgba + (rows - row - 1) * 4 * columns;
-
-      memcpy (flip, src, columns*4);
-      memcpy (src, dst, columns*4);
-      memcpy (dst, flip, columns*4);
-    }
-    free (flip);
-  }
-#endif
-  // instead we just print a warning
-  if (targa_header.attributes & 0x20) {
-    ri.Printf( PRINT_WARNING, "WARNING: '%s' TGA file header declares top-down image, ignoring\n", name);
-  }
-
-  ri.FS_FreeFile (buffer);
-}
-
-/* Catching errors, as done in libjpeg's example.c */
-typedef struct q_jpeg_error_mgr_s
-{
-    struct jpeg_error_mgr pub;  /* "public" fields */
-
-    jmp_buf setjmp_buffer;  /* for return to caller */
-} q_jpeg_error_mgr_t;
-
-static void R_JPGErrorExit(j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce pointer */
-  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
-  
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-  ri.Printf(PRINT_ALL, "Error: %s", buffer);
-
-  /* Return control to the setjmp point */
-  longjmp(jerr->setjmp_buffer, 1);
-}
-
-static void R_JPGOutputMessage(j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-  
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-  
-  /* Send it to stderr, adding a newline */
-  ri.Printf(PRINT_ALL, "%s\n", buffer);
-}
-
-static void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
-  /* This struct contains the JPEG decompression parameters and pointers to
-   * working space (which is allocated as needed by the JPEG library).
-   */
-  struct jpeg_decompress_struct cinfo;
-  /* We use our private extension JPEG error handler.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  /* This struct represents a JPEG error handler.  It is declared separately
-   * because applications often want to supply a specialized error handler
-   * (see the second half of this file for an example).  But here we just
-   * take the easy way out and use the standard error handler, which will
-   * print a message on stderr and call exit() if compression fails.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  q_jpeg_error_mgr_t jerr;
-  /* More stuff */
-  JSAMPARRAY buffer;		/* Output row buffer */
-  int row_stride;		/* physical row width in output buffer */
-  unsigned int pixelcount, memcount;
-  unsigned int sindex, dindex;
-  unsigned char *out;
-  byte* fbuffer;
-  byte* buf;
-  int len;
-
-  /* In this example we want to open the input file before doing anything else,
-   * so that the setjmp() error recovery below can assume the file is open.
-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
-   * requires it in order to read binary files.
-   */
-
-  len = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
-  if (!fbuffer) {
-	return;
-  }
-
-  /* Step 1: allocate and initialize JPEG decompression object */
-
-  /* We have to set up the error handler first, in case the initialization
-   * step fails.  (Unlikely, but it could happen if you are out of memory.)
-   * This routine fills in the contents of struct jerr, and returns jerr's
-   * address which we place into the link field in cinfo.
-   */
-  cinfo.err = jpeg_std_error(&jerr.pub);
-  cinfo.err->error_exit = R_JPGErrorExit;
-  cinfo.err->output_message = R_JPGOutputMessage;
-
-  /* Establish the setjmp return context for R_JPGErrorExit to use. */
-  if (setjmp(jerr.setjmp_buffer))
-  {
-	  /* If we get here, the JPEG code has signaled an error.
-	   * We need to clean up the JPEG object, close the input file, and return.
-	   */
-	  jpeg_destroy_decompress(&cinfo);
-	  ri.FS_FreeFile(fbuffer);
-
-	  /* Append the filename to the error for easier debugging */
-	  ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
-	  return;
-  }
-
-  /* Now we can initialize the JPEG decompression object. */
-  jpeg_create_decompress(&cinfo);
-
-  /* Step 2: specify data source (eg, a file) */
-
-  jpeg_mem_src(&cinfo, fbuffer, len);
-
-  /* Step 3: read file parameters with jpeg_read_header() */
-
-  (void) jpeg_read_header(&cinfo, TRUE);
-  /* We can ignore the return value from jpeg_read_header since
-   *   (a) suspension is not possible with the stdio data source, and
-   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.
-   * See libjpeg.doc for more info.
-   */
-
-  /* Step 4: set parameters for decompression */
-
-  /*
-   * Make sure it always converts images to RGB color space. This will
-   * automatically convert 8-bit greyscale images to RGB as well.
-   */
-  cinfo.out_color_space = JCS_RGB;
-
-  /* In this example, we don't need to change any of the defaults set by
-   * jpeg_read_header(), so we do nothing here.
-   */
-
-  /* Step 5: Start decompressor */
-
-  (void) jpeg_start_decompress(&cinfo);
-  /* We can ignore the return value since suspension is not possible
-   * with the stdio data source.
-   */
-
-  /* We may need to do some setup of our own at this point before reading
-   * the data.  After jpeg_start_decompress() we have the correct scaled
-   * output image dimensions available, as well as the output colormap
-   * if we asked for color quantization.
-   * In this example, we need to make an output work buffer of the right size.
-   */ 
-  /* JSAMPLEs per row in output buffer */
-  pixelcount = cinfo.output_width * cinfo.output_height;
-
-  if (!cinfo.output_width || !cinfo.output_height
-      || ((pixelcount * 4) / cinfo.output_width) / 4 != cinfo.output_height
-      || pixelcount > 0x1FFFFFFF || cinfo.output_components != 3
-      )
-  {
-      // Free the memory to make sure we don't leak memory
-      ri.FS_FreeFile(fbuffer);
-      jpeg_destroy_decompress(&cinfo);
-
-      ri.Error(ERR_DROP, "LoadJPG: %s has an invalid image format: %dx%d*4=%d, components: %d", filename,
-          cinfo.output_width, cinfo.output_height, pixelcount * 4, cinfo.output_components);
-  }
-
-  memcount = pixelcount * 4;
-  row_stride = cinfo.output_width * cinfo.output_components;
-
-  out = ri.Malloc(memcount);
-
-  *width = cinfo.output_width;
-  *height = cinfo.output_height;
-
-  /* Step 6: while (scan lines remain to be read) */
-  /*           jpeg_read_scanlines(...); */
-
-  /* Here we use the library's state variable cinfo.output_scanline as the
-   * loop counter, so that we don't have to keep track ourselves.
-   */
-  while (cinfo.output_scanline < cinfo.output_height) {
-	  /* jpeg_read_scanlines expects an array of pointers to scanlines.
-	   * Here the array is only one element long, but you could ask for
-	   * more than one scanline at a time if that's more convenient.
-	   */
-	  buf = ((out + (row_stride * cinfo.output_scanline)));
-	  buffer = &buf;
-	  (void)jpeg_read_scanlines(&cinfo, buffer, 1);
-  }
-
-  buf = out;
-
-  // Expand from RGB to RGBA
-  sindex = pixelcount * cinfo.output_components;
-  dindex = memcount;
-
-  do
-  {
-      buf[--dindex] = 255;
-      buf[--dindex] = buf[--sindex];
-      buf[--dindex] = buf[--sindex];
-      buf[--dindex] = buf[--sindex];
-  } while (sindex);
-
-  *pic = out;
-
-  /* Step 7: Finish decompression */
-
-  (void) jpeg_finish_decompress(&cinfo);
-  /* We can ignore the return value since suspension is not possible
-   * with the stdio data source.
-   */
-
-  /* Step 8: Release JPEG decompression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_decompress(&cinfo);
-
-  /* After finish_decompress, we can close the input file.
-   * Here we postpone it until after no more JPEG errors are possible,
-   * so as to simplify the setjmp error logic above.  (Actually, I don't
-   * think that jpeg_destroy can do an error exit, but why assume anything...)
-   */
-  ri.FS_FreeFile (fbuffer);
-
-  /* At this point you may want to check to see whether any corrupt-data
-   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).
-   */
-
-  /* And we're done! */
-}
-
-
-/* Expanded data destination object for stdio output */
-
-typedef struct {
-  struct jpeg_destination_mgr pub; /* public fields */
-
-  byte* outfile;		/* target stream */
-  int	size;
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-
-/*
- * Initialize destination --- called by jpeg_start_compress
- * before any data is actually written.
- */
-
-void init_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  dest->pub.next_output_byte = dest->outfile;
-  dest->pub.free_in_buffer = dest->size;
-}
-
-
-/*
- * Empty the output buffer --- called whenever buffer fills up.
- *
- * In typical applications, this should write the entire output buffer
- * (ignoring the current state of next_output_byte & free_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been dumped.
- *
- * In applications that need to be able to suspend compression due to output
- * overrun, a FALSE return indicates that the buffer cannot be emptied now.
- * In this situation, the compressor will return to its caller (possibly with
- * an indication that it has not accepted all the supplied scanlines).  The
- * application should resume compression after it has made more room in the
- * output buffer.  Note that there are substantial restrictions on the use of
- * suspension --- see the documentation.
- *
- * When suspending, the compressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_output_byte & free_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point will be regenerated after resumption, so do not
- * write it out when emptying the buffer externally.
- */
-
-boolean empty_output_buffer (j_compress_ptr cinfo)
-{
-  return TRUE;
-}
-
-#if 0
-/*
- * Compression initialization.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * We require a write_all_tables parameter as a failsafe check when writing
- * multiple datastreams from the same compression object.  Since prior runs
- * will have left all the tables marked sent_table=TRUE, a subsequent run
- * would emit an abbreviated stream (no tables) by default.  This may be what
- * is wanted, but for safety's sake it should not be the default behavior:
- * programmers should have to make a deliberate choice to emit abbreviated
- * images.  Therefore the documentation and examples should encourage people
- * to pass write_all_tables=TRUE; then it will take active thought to do the
- * wrong thing.
- */
-
-GLOBAL void
-jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (write_all_tables)
-    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  jinit_compress_master(cinfo);
-  /* Set up for the first pass */
-  (*cinfo->master->prepare_for_pass) (cinfo);
-  /* Ready for application to drive first pass through jpeg_write_scanlines
-   * or jpeg_write_raw_data.
-   */
-  cinfo->next_scanline = 0;
-  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
-}
-
-/*
- * Write some scanlines of data to the JPEG compressor.
- *
- * The return value will be the number of lines actually written.
- * This should be less than the supplied num_lines only in case that
- * the data destination module has requested suspension of the compressor,
- * or if more than image_height scanlines are passed in.
- *
- * Note: we warn about excess calls to jpeg_write_scanlines() since
- * this likely signals an application programmer error.  However,
- * excess scanlines passed in the last valid call are *silently* ignored,
- * so that the application need not adjust num_lines for end-of-image
- * when using a multiple-scanline buffer.
- */
-
-GLOBAL JDIMENSION
-jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
-		      JDIMENSION num_lines)
-{
-  JDIMENSION row_ctr, rows_left;
-
-  if (cinfo->global_state != CSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height)
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_scanlines.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Ignore any extra scanlines at bottom of image. */
-  rows_left = cinfo->image_height - cinfo->next_scanline;
-  if (num_lines > rows_left)
-    num_lines = rows_left;
-
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
-  cinfo->next_scanline += row_ctr;
-  return row_ctr;
-}
-
-/*
- * Terminate destination --- called by jpeg_finish_compress
- * after all data has been written.  Usually needs to flush buffer.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-static int hackSize;
-
-void term_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-  size_t datacount = dest->size - dest->pub.free_in_buffer;
-  hackSize = datacount;
-}
-
-
-/*
- * Prepare for output to a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing compression.
- */
-
-void jpegDest (j_compress_ptr cinfo, byte* outfile, int size)
-{
-  my_dest_ptr dest;
-
-  /* The destination object is made permanent so that multiple JPEG images
-   * can be written to the same file without re-executing jpeg_stdio_dest.
-   * This makes it dangerous to use this manager and a different destination
-   * manager serially with the same JPEG object, because their private object
-   * sizes may be different.  Caveat programmer.
-   */
-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  sizeof(my_destination_mgr));
-  }
-
-  dest = (my_dest_ptr) cinfo->dest;
-  dest->pub.init_destination = init_destination;
-  dest->pub.empty_output_buffer = empty_output_buffer;
-  dest->pub.term_destination = term_destination;
-  dest->outfile = outfile;
-  dest->size = size;
-}
-
-void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer) {
-  /* This struct contains the JPEG compression parameters and pointers to
-   * working space (which is allocated as needed by the JPEG library).
-   * It is possible to have several such structures, representing multiple
-   * compression/decompression processes, in existence at once.  We refer
-   * to any one struct (and its associated working data) as a "JPEG object".
-   */
-  struct jpeg_compress_struct cinfo;
-  /* This struct represents a JPEG error handler.  It is declared separately
-   * because applications often want to supply a specialized error handler
-   * (see the second half of this file for an example).  But here we just
-   * take the easy way out and use the standard error handler, which will
-   * print a message on stderr and call exit() if compression fails.
-   * Note that this struct must live as long as the main JPEG parameter
-   * struct, to avoid dangling-pointer problems.
-   */
-  struct jpeg_error_mgr jerr;
-  /* More stuff */
-  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
-  int row_stride;		/* physical row width in image buffer */
-  unsigned char *out;
-
-  /* Step 1: allocate and initialize JPEG compression object */
-
-  /* We have to set up the error handler first, in case the initialization
-   * step fails.  (Unlikely, but it could happen if you are out of memory.)
-   * This routine fills in the contents of struct jerr, and returns jerr's
-   * address which we place into the link field in cinfo.
-   */
-  cinfo.err = jpeg_std_error(&jerr);
-  /* Now we can initialize the JPEG compression object. */
-  jpeg_CreateDecompress(&cinfo);
-
-  /* Step 2: specify data destination (eg, a file) */
-  /* Note: steps 2 and 3 can be done in either order. */
-
-  /* Here we use the library-supplied code to send compressed data to a
-   * stdio stream.  You can also write your own code to do something else.
-   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
-   * requires it in order to write binary files.
-   */
-  out = ri.Hunk_AllocateTempMemory(image_width*image_height*4);
-  jpegDest(&cinfo, out, image_width*image_height*4);
-
-  /* Step 3: set parameters for compression */
-
-  /* First we supply a description of the input image.
-   * Four fields of the cinfo struct must be filled in:
-   */
-  cinfo.image_width = image_width; 	/* image width and height, in pixels */
-  cinfo.image_height = image_height;
-  cinfo.input_components = 4;		/* # of color components per pixel */
-  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
-  /* Now use the library's routine to set default compression parameters.
-   * (You must set at least cinfo.in_color_space before calling this,
-   * since the defaults depend on the source color space.)
-   */
-  jpeg_set_defaults(&cinfo);
-  /* Now you can set any non-default parameters you wish to.
-   * Here we just illustrate the use of quality (quantization table) scaling:
-   */
-  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-
-  /* Step 4: Start compressor */
-
-  /* TRUE ensures that we will write a complete interchange-JPEG file.
-   * Pass TRUE unless you are very sure of what you're doing.
-   */
-  jpeg_start_compress(&cinfo, TRUE);
-
-  /* Step 5: while (scan lines remain to be written) */
-  /*           jpeg_write_scanlines(...); */
-
-  /* Here we use the library's state variable cinfo.next_scanline as the
-   * loop counter, so that we don't have to keep track ourselves.
-   * To keep things simple, we pass one scanline per call; you can pass
-   * more if you wish, though.
-   */
-  row_stride = image_width * 4;	/* JSAMPLEs per row in image_buffer */
-
-  while (cinfo.next_scanline < cinfo.image_height) {
-    /* jpeg_write_scanlines expects an array of pointers to scanlines.
-     * Here the array is only one element long, but you could pass
-     * more than one scanline at a time if that's more convenient.
-     */
-    row_pointer[0] = & image_buffer[((cinfo.image_height-1)*row_stride)-cinfo.next_scanline * row_stride];
-    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
-  }
-
-  /* Step 6: Finish compression */
-
-  jpeg_finish_compress(&cinfo);
-  /* After finish_compress, we can close the output file. */
-  ri.FS_WriteFile( filename, out, hackSize );
-
-  ri.Hunk_FreeTempMemory(out);
-
-  /* Step 7: release JPEG compression object */
-
-  /* This is an important step since it will release a good deal of memory. */
-  jpeg_destroy_compress(&cinfo);
-
-  /* And we're done! */
-}
-#endif
-
-//===================================================================
-
-/*
-=================
-R_LoadImage
-
-Loads any of the supported image types into a cannonical
-32 bit format.
-=================
-*/
-static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
-	size_t	len;
-	char	tempName[MAX_STRING_TOKENS + 1];
-	char altname[MAX_QPATH];
-
-
-	*hasAlpha = qfalse;
-	*glCompressMode = 0;
-	*pic = NULL;
-	*width = 0;
-	*height = 0;
-
-	len = strlen(name);
-	if (len < 5) {
-		return;
-	}
-
-	strcpy(altname, name);
-	len = strlen(altname);
-	if (glConfig.textureCompression == 1)
-	{
-		len = strlen(altname);
-		altname[len - 3] = 'd';
-		altname[len - 2] = 'd';
-		altname[len - 1] = 's';
-		LoadDDS(altname, pic, width, height, hasAlpha, glCompressMode, numMipmaps, piMipmapsAvailable);
-	}
-
-	if (!*pic)
-	{
-		if (!Q_stricmp(name + len - 4, ".tga") || !Q_stricmp(name + len - 4, ".jpg")) {
-			if (r_loadjpg->integer) {
-				len = strlen(altname);
-				altname[len - 3] = 'j';
-				altname[len - 2] = 'p';
-				altname[len - 1] = 'g';
-				// try jpg first
-				LoadJPG(altname, pic, width, height);
-			}
-			if (!*pic) {
-				altname[len - 3] = 't';
-				altname[len - 2] = 'g';
-				altname[len - 1] = 'a';
-				LoadTGA(altname, pic, width, height);
-			}
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".pcx")) {
-			LoadPCX32(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".bmp")) {
-			LoadBMP(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-		}
-		else if (!Q_stricmp(name + len - 4, ".jpg")) {
-			LoadJPG(name, pic, width, height);
-			*piMipmapsAvailable = 1;
-		}
-	}
-
-	if (scr_initialized)
-	{
-		sprintf(tempName, "n%s", name);
-		UI_LoadResource(tempName);
-	}
-}
-
-
-/*
-===============
-R_FindImageFile
-
-Finds or loads the given image.
-Returns NULL if it fails, not a default image.
-==============
-*/
-image_t* R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
-	image_t	*image;
-	int		width, height;
-	byte	*pic;
-	int		len;
-	qboolean	hasAlpha;
-	int			glCompressMode;
-	int			numMipmaps;
-	int			iMipmapsAvailable;
-	long	hash;
-
-	if (!name) {
-		return NULL;
-	}
-
-	hash = generateHashValue(name);
-
-	//
-	// see if the image is already loaded
-	//
-	for (image = hashTable[hash]; image; image = image->next) {
-		if (!strcmp(name, image->imgName)) {
-			// the white image can be used with any set of parms, but other mismatches are errors
-			if (strcmp(name, "*white")) {
-				if ((image->numMipmaps && !mipmap) || (!image->numMipmaps && mipmap)) {
-					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed mipmap parm\n", name);
-				}
-				if (image->allowPicmip != allowPicmip) {
-					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name);
-				}
-				if (image->wrapClampModeX != glWrapClampModeX || image->wrapClampModeY != glWrapClampModeY) {
-					ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name);
-				}
-			}
-			if (image->r_sequence != -1) {
-				image->r_sequence = r_sequencenumber;
-			}
-			return image;
-		}
-	}
-
-	//
-	// load the pic from disk
-	//
-	numMipmaps = mipmap;
-	iMipmapsAvailable = 0;
-	R_LoadImage(name, &pic, &width, &height, &hasAlpha, &glCompressMode, &numMipmaps, &iMipmapsAvailable);
-	if (pic == NULL) {
-		return NULL;
-	}
-
-	image = R_CreateImage(
-		name,
-		pic,
-		width,
-		height,
-		numMipmaps,
-		iMipmapsAvailable,
-		allowPicmip,
-		force32bit,
-		hasAlpha,
-		glCompressMode,
-		glWrapClampModeX,
-		glWrapClampModeY);
-
-	ri.Free(pic);
-	return image;
-}
-
-/*
-================
-R_RefreshImageFile
-================
-*/
-image_t* R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
-	char imagename[64];
-	image_t* image;
-	long hash;
-	
-	if (!name) {
-		return NULL;
-	}
-
-	strncpy(imagename, name, ARRAY_LEN(imagename));
-	hash = generateHashValue(name);
-	image = hashTable[hash];
-
-    if (image)
-    {
-        while (strcmp(name, image->imgName))
-        {
-            image = image->next;
-			if (!image) {
-				return R_FindImageFile(
-					imagename,
-					mipmap,
-					allowPicmip,
-					force32bit,
-					glWrapClampModeX,
-					glWrapClampModeY
-				);
-			}
-        }
-
-        R_FreeImage(image);
-    }
-
-    return R_FindImageFile(
-		imagename,
-		mipmap,
-		allowPicmip,
-		force32bit,
-		glWrapClampModeX,
-		glWrapClampModeY
-	);
-}
-
-/*
-================
-R_ImageExists
-================
-*/
-qboolean R_ImageExists(const char* name) {
-    image_t* image;
-    long int hash;
-
-    if (name)
-    {
-        hash = generateHashValue(name);
-        image = hashTable[hash];
-
-        if (hash)
-        {
-            for (; image != NULL; image = image->next)
-            {
-                if (!strcmp(name, image->imgName)) {
-                    return qtrue;
-                }
-            }
-        }
-    }
-
-    return qfalse;
-}
-
-/*
-================
-R_CreateDlightImage
-================
-*/
-#define	DLIGHT_SIZE	32
-static void R_CreateDlightImage( void ) {
-	int		x,y;
-	byte	data[DLIGHT_SIZE][DLIGHT_SIZE][4];
-	int		b;
-
-	// make a centered inverse-square falloff blob for dynamic lighting
-	for (x=0 ; x<DLIGHT_SIZE ; x++) {
-		for (y=0 ; y<DLIGHT_SIZE ; y++) {
-			float	d;
-
-			d = ( DLIGHT_SIZE/2 - 0.5f - x ) * ( DLIGHT_SIZE/2 - 0.5f - x ) +
-				( DLIGHT_SIZE/2 - 0.5f - y ) * ( DLIGHT_SIZE/2 - 0.5f - y );
-			b = 16000 / d;
-			if (b > 255) {
-				b = 255;
-			} else if ( b < 75 ) {
-				b = 0;
-			}
-			data[y][x][0] = 
-			data[y][x][1] = 
-			data[y][x][2] = b;
-			data[y][x][3] = 255;			
-		}
-	}
-	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	tr.dlightImage->r_sequence = -1;
-}
-
-/*
-==================
-R_CreateDefaultImage
-==================
-*/
-#define	DEFAULT_SIZE	16
-static void R_CreateDefaultImage( void ) {
-	int		x;
-	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
-
-	// the default image will be a box, to allow you to see the mapping coordinates
-	Com_Memset( data, 32, sizeof( data ) );
-	for ( x = 0 ; x < DEFAULT_SIZE ; x++ ) {
-		data[0][x][0] =
-		data[0][x][1] =
-		data[0][x][2] =
-		data[0][x][3] = 255;
-
-		data[x][0][0] =
-		data[x][0][1] =
-		data[x][0][2] =
-		data[x][0][3] = 255;
-
-		data[DEFAULT_SIZE-1][x][0] =
-		data[DEFAULT_SIZE-1][x][1] =
-		data[DEFAULT_SIZE-1][x][2] =
-		data[DEFAULT_SIZE-1][x][3] = 255;
-
-		data[x][DEFAULT_SIZE-1][0] =
-		data[x][DEFAULT_SIZE-1][1] =
-		data[x][DEFAULT_SIZE-1][2] =
-		data[x][DEFAULT_SIZE-1][3] = 255;
-	}
-	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.defaultImage->r_sequence = -1;
-}
-
-/*
-==================
-R_CreateBuiltinImages
-==================
-*/
-void R_CreateBuiltinImages(void) {
-	int		x, y;
-	int		i;
-	byte	lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
-	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
-
-	R_CreateDefaultImage();
-
-	// we use a solid white image instead of disabling texturing
-	Com_Memset( data, 255, sizeof( data ) );
-	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.whiteImage->r_sequence = -1;
-
-	// with overbright bits active, we need an image which is some fraction of full color,
-	// for default lightmaps, etc
-	for (x=0 ; x<DEFAULT_SIZE ; x++) {
-		for (y=0 ; y<DEFAULT_SIZE ; y++) {
-			data[y][x][0] = 
-			data[y][x][1] = 
-			data[y][x][2] = tr.identityLightByte;
-			data[y][x][3] = 255;			
-		}
-	}
-
-	Com_Memset(lightmap_buffer, 0xFFFFFFFF, sizeof(lightmap_buffer));
-	for (i = 0; i < 15; i++) {
-		tr.dlightImages[i] = R_CreateImage("*lightmapD%i", lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
-		tr.dlightImages[i]->r_sequence = -1;
-	}
-
-	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
-	tr.identityLightImage->r_sequence = -1;
-
-	tr.scratchImage = R_CreateImage("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, qtrue, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
-	tr.scratchImage->r_sequence = -1;
-
-	R_CreateDlightImage();
-}
-
-
-/*
-===============
-R_SetColorMappings
-===============
-*/
-void R_SetColorMappings( void ) {
-	int		i, j;
-	float	g;
-	int		inf;
-	int		shift;
-
-	// setup the overbright lighting
-	tr.overbrightBits = r_overBrightBits->integer;
-	if ( !glConfig.deviceSupportsGamma ) {
-		tr.overbrightBits = 0;		// need hardware gamma for overbright
-	}
-
-	// never overbright in windowed mode
-	if ( !glConfig.isFullscreen ) 
-	{
-		tr.overbrightBits = 0;
-	}
-
-	// allow 2 overbright bits in 24 bit, but only 1 in 16 bit
-	if ( glConfig.colorBits > 16 ) {
-		if ( tr.overbrightBits > 2 ) {
-			tr.overbrightBits = 2;
-		}
-	} else {
-		if ( tr.overbrightBits > 1 ) {
-			tr.overbrightBits = 1;
-		}
-	}
-	if ( tr.overbrightBits < 0 ) {
-		tr.overbrightBits = 0;
-	}
-
-	tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
-	tr.overbrightMult = (float)(1 << tr.overbrightShift);
-	tr.identityLight = 1.0f / (1 << tr.overbrightBits);
-	tr.identityLightByte = 255 * tr.identityLight;
-
-	if ( r_intensity->value <= 1 ) {
-		ri.Cvar_Set( "r_intensity", "1" );
-	}
-
-	if ( r_gamma->value < 0.5f ) {
-		ri.Cvar_Set( "r_gamma", "0.5" );
-	} else if ( r_gamma->value > 3.0f ) {
-		ri.Cvar_Set( "r_gamma", "3.0" );
-	}
-
-	g = r_gamma->value;
-	if (!glConfig.deviceSupportsGamma && g != 1.0) {
-		tr.needsLightScale = qtrue;
-	}
-	else if (r_intensity->value != 1.0) {
-		tr.needsLightScale = qtrue;
-	}
-	else {
-		tr.needsLightScale = qfalse;
-	}
-
-	shift = tr.overbrightBits;
-
-	for ( i = 0; i < 256; i++ ) {
-		if ( g == 1 ) {
-			inf = i;
-		} else {
-			inf = 255 * pow ( i/255.0f, 1.0f / g ) + 0.5f;
-		}
-		inf <<= shift;
-		if (inf < 0) {
-			inf = 0;
-		}
-		if (inf > 255) {
-			inf = 255;
-		}
-		s_gammatable[i] = inf;
-	}
-
-	for (i=0 ; i<256 ; i++) {
-		j = i * r_intensity->value;
-		if (j > 255) {
-			j = 255;
-		}
-		s_intensitytable[i] = j;
-	}
-
-	if ( glConfig.deviceSupportsGamma )
-	{
-		GLimp_SetGamma( s_gammatable, s_gammatable, s_gammatable );
-	}
-}
-
-/*
-===============
-R_InitImages
-===============
-*/
-void	R_InitImages( void ) {
-	Com_Memset(hashTable, 0, sizeof(hashTable));
-	// clear images
-	Com_Memset(tr.images, 0, sizeof(tr.images));
-	tr.numImages = 0;
-
-	// build brightness translation tables
-	R_SetColorMappings();
-
-	// create default texture and white texture
-	R_CreateBuiltinImages();
-}
-
-/*
-===============
-R_DeleteImageFromHash
-===============
-*/
-void R_DeleteImageFromHash(image_t* image) {
-	image_t* current;
-	image_t* prev;
-	int hash;
-
-    hash = generateHashValue(image->imgName);
-    current = hashTable[hash];
-    prev = NULL;
-
-    while (current)
-    {
-        if (image == current)
-        {
-			if (prev) {
-				prev->next = current->next;
-			} else {
-                hashTable[hash] = current->next;
-			}
-            return;
-        }
-
-        prev = current;
-        current = current->next;
-    }
-}
-
-/*
-===============
-R_FreeImage
-===============
-*/
-void R_FreeImage(image_t* image) {
-	if (image->texnum) {
-		qglDeleteTextures(1, &image->texnum);
-	}
-
-    R_DeleteImageFromHash(image);
-	memset(image, 0, sizeof(image_t));
-}
-
-/*
-===============
-R_DeleteTextures
-===============
-*/
-void R_DeleteTextures( void ) {
-	int		i;
-
-	for ( i=0; i<tr.numImages ; i++ ) {
-		qglDeleteTextures( 1, &tr.images[i].texnum );
-	}
-	Com_Memset( tr.images, 0, sizeof( tr.images ) );
-
-	tr.numImages = 0;
-
-	Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
-	if ( qglBindTexture ) {
-		if ( qglActiveTextureARB ) {
-			GL_SelectTexture( 1 );
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-			GL_SelectTexture( 0 );
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-		} else {
-			qglBindTexture( GL_TEXTURE_2D, 0 );
-		}
-	}
-}
-
-/*
-============================================================================
-
-SKINS
-
-============================================================================
-*/
-
-/*
-==================
-CommaParse
-
-This is unfortunate, but the skin files aren't
-compatable with our normal parsing rules.
-==================
-*/
-static char *CommaParse( char **data_p ) {
-	int c = 0, len;
-	char *data;
-	static	char	com_token[MAX_TOKEN_CHARS];
-
-	data = *data_p;
-	len = 0;
-	com_token[0] = 0;
-
-	// make sure incoming data is valid
-	if ( !data ) {
-		*data_p = NULL;
-		return com_token;
-	}
-
-	while ( 1 ) {
-		// skip whitespace
-		while( (c = *data) <= ' ') {
-			if( !c ) {
-				break;
-			}
-			data++;
-		}
-
-
-		c = *data;
-
-		// skip double slash comments
-		if ( c == '/' && data[1] == '/' )
-		{
-			while (*data && *data != '\n')
-				data++;
-		}
-		// skip /* */ comments
-		else if ( c=='/' && data[1] == '*' ) 
-		{
-			while ( *data && ( *data != '*' || data[1] != '/' ) ) 
-			{
-				data++;
-			}
-			if ( *data ) 
-			{
-				data += 2;
-			}
-		}
-		else
-		{
-			break;
-		}
-	}
-
-	if ( c == 0 ) {
-		return "";
-	}
-
-	// handle quoted strings
-	if (c == '\"')
-	{
-		data++;
-		while (1)
-		{
-			c = *data++;
-			if (c=='\"' || !c)
-			{
-				com_token[len] = 0;
-				*data_p = ( char * ) data;
-				return com_token;
-			}
-			if (len < MAX_TOKEN_CHARS)
-			{
-				com_token[len] = c;
-				len++;
-			}
-		}
-	}
-
-	// parse a regular word
-	do
-	{
-		if (len < MAX_TOKEN_CHARS)
-		{
-			com_token[len] = c;
-			len++;
-		}
-		data++;
-		c = *data;
-	} while (c>32 && c != ',' );
-
-	if (len == MAX_TOKEN_CHARS)
-	{
-//		Com_Printf ("Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
-		len = 0;
-	}
-	com_token[len] = 0;
-
-	*data_p = ( char * ) data;
-	return com_token;
-}
-
-
-/*
-===============
-RE_RegisterSkin
-
-===============
-*/
-qhandle_t RE_RegisterSkin( const char *name ) {
-	qhandle_t	hSkin;
-	skin_t		*skin;
-	skinSurface_t	*surf;
-	char		*text, *text_p;
-	char		*token;
-	char		surfName[MAX_QPATH];
-
-	if ( !name || !name[0] ) {
-		Com_Printf( "Empty name passed to RE_RegisterSkin\n" );
-		return 0;
-	}
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Skin name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-
-	// see if the skin is already loaded
-	for ( hSkin = 1; hSkin < tr.numSkins ; hSkin++ ) {
-		skin = tr.skins[hSkin];
-		if ( !Q_stricmp( skin->name, name ) ) {
-			if( skin->numSurfaces == 0 ) {
-				return 0;		// default skin
-			}
-			return hSkin;
-		}
-	}
-
-	// allocate a new skin
-	if ( tr.numSkins == MAX_SKINS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: RE_RegisterSkin( '%s' ) MAX_SKINS hit\n", name );
-		return 0;
-	}
-	tr.numSkins++;
-	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_dontcare );
-	tr.skins[hSkin] = skin;
-	Q_strncpyz( skin->name, name, sizeof( skin->name ) );
-	skin->numSurfaces = 0;
-
-	// make sure the render thread is stopped
-	R_SyncRenderThread();
-
-	// If not a .skin file, load as a single shader
-	if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
-		skin->numSurfaces = 1;
-		skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_dontcare);
-		skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
-		return hSkin;
-	}
-
-	// load and parse the skin file
-    ri.FS_ReadFile( name, (void **)&text );
-	if ( !text ) {
-		return 0;
-	}
-
-	text_p = text;
-	while ( text_p && *text_p ) {
-		// get surface name
-		token = CommaParse( &text_p );
-		Q_strncpyz( surfName, token, sizeof( surfName ) );
-
-		if ( !token[0] ) {
-			break;
-		}
-		// lowercase the surface name so skin compares are faster
-		Q_strlwr( surfName );
-
-		if ( *text_p == ',' ) {
-			text_p++;
-		}
-
-		if ( strstr( token, "tag_" ) ) {
-			continue;
-		}
-		
-		// parse the shader name
-		token = CommaParse( &text_p );
-
-		surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_dontcare );
-		Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-		surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
-		skin->numSurfaces++;
-	}
-
-	ri.FS_FreeFile( text );
-
-
-	// never let a skin have 0 shaders
-	if ( skin->numSurfaces == 0 ) {
-		return 0;		// use default skin
-	}
-
-	return hSkin;
-}
-
-/*
-===============
-R_GetSkinByHandle
-===============
-*/
-skin_t	*R_GetSkinByHandle( qhandle_t hSkin ) {
-	if ( hSkin < 1 || hSkin >= tr.numSkins ) {
-		return tr.skins[0];
-	}
-	return tr.skins[ hSkin ];
-}
-
-/*
-===============
-R_SkinList_f
-===============
-*/
-void	R_SkinList_f( void ) {
-	int			i, j;
-	skin_t		*skin;
-
-	ri.Printf (PRINT_ALL, "------------------\n");
-
-	for ( i = 0 ; i < tr.numSkins ; i++ ) {
-		skin = tr.skins[i];
-
-		ri.Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
-		for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
-			ri.Printf( PRINT_ALL, "       %s = %s\n", 
-				skin->surfaces[j]->name, skin->surfaces[j]->shader->name );
-		}
-	}
-	ri.Printf (PRINT_ALL, "------------------\n");
-}
-
diff --git a/code/renderer/tr_init.c b/code/renderer/tr_init.c
deleted file mode 100644
index 223e9139..00000000
--- a/code/renderer/tr_init.c
+++ /dev/null
@@ -1,1556 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_init.c -- functions that are not called every frame
-
-#include "tr_local.h"
-
-glconfig_t	glConfig;
-glstate_t	glState;
-int r_sequencenumber;
-
-static void GfxInfo_f( void );
-
-cvar_t	*r_flareSize;
-cvar_t	*r_flareFade;
-
-cvar_t	*r_ignoreFastPath;
-
-cvar_t	*r_verbose;
-cvar_t	*r_ignore;
-
-cvar_t	*r_displayRefresh;
-
-cvar_t	*r_znear;
-
-cvar_t	*r_smp;
-cvar_t	*r_showSmp;
-cvar_t	*r_skipBackEnd;
-
-cvar_t	*r_ignorehwgamma;
-cvar_t	*r_measureOverdraw;
-
-cvar_t	*r_inGameVideo;
-cvar_t	*r_fastsky;
-cvar_t	*r_fastdlights;
-cvar_t	*r_drawSun;
-cvar_t	*r_dlightBacks;
-
-cvar_t	*r_lodscale;
-
-cvar_t	*r_norefresh;
-cvar_t	*r_drawentities;
-cvar_t	*r_drawentitypoly;
-cvar_t	*r_drawstaticmodels;
-cvar_t	*r_drawstaticmodelpoly;
-cvar_t	*r_drawbrushes;
-cvar_t	*r_drawbrushmodels;
-cvar_t	*r_drawstaticdecals;
-cvar_t	*r_drawterrain;
-cvar_t	*r_drawsprites;
-cvar_t	*r_drawspherelights;
-cvar_t	*r_drawworld;
-cvar_t	*r_speeds;
-cvar_t	*r_fullbright;
-cvar_t	*r_novis;
-cvar_t	*r_nocull;
-cvar_t	*r_showcull;
-cvar_t	*r_facePlaneCull;
-cvar_t	*r_showcluster;
-cvar_t	*r_nocurves;
-
-cvar_t	*r_allowExtensions;
-
-cvar_t	*r_ext_compressed_textures;
-cvar_t	*r_ext_gamma_control;
-cvar_t	*r_ext_multitexture;
-cvar_t	*r_ext_compiled_vertex_array;
-cvar_t	*r_ext_texture_env_add;
-
-cvar_t	*r_ext_texture_env_combine;
-cvar_t	*r_ext_aniso_filter;
-cvar_t	*r_forceClampToEdge;
-cvar_t	*r_geForce3WorkAround;
-cvar_t	*r_reset_tc_array;
-
-cvar_t	*r_ignoreGLErrors;
-cvar_t	*r_logFile;
-
-cvar_t	*r_stencilbits;
-cvar_t	*r_depthbits;
-cvar_t	*r_colorbits;
-cvar_t	*r_stereo;
-cvar_t	*r_primitives;
-cvar_t	*r_textureDetails;
-cvar_t	*r_texturebits;
-
-cvar_t	*r_drawBuffer;
-cvar_t  *r_glDriver;
-cvar_t	*r_lightmap;
-cvar_t	*r_vertexLight;
-cvar_t	*r_shadows;
-cvar_t	*r_entlight_scale;
-cvar_t	*r_entlight_errbound;
-cvar_t	*r_entlight_cubelevel;
-cvar_t	*r_entlight_cubefraction;
-cvar_t	*r_entlight_maxcalc;
-cvar_t	*r_flares;
-cvar_t	*r_mode;
-cvar_t	*r_nobind;
-cvar_t	*r_singleShader;
-cvar_t	*r_lerpmodels;
-cvar_t	*r_roundImagesDown;
-cvar_t	*r_colorMipLevels;
-cvar_t	*r_picmip;
-cvar_t	*r_showtris;
-cvar_t	*r_showsky;
-cvar_t	*r_shownormals;
-cvar_t	*r_showhbox;
-cvar_t	*r_showstaticbboxes;
-cvar_t	*r_finish;
-cvar_t	*r_clear;
-cvar_t	*r_swapInterval;
-cvar_t	*r_textureMode;
-cvar_t	*r_offsetFactor;
-cvar_t	*r_offsetUnits;
-cvar_t	*r_gamma;
-cvar_t	*r_intensity;
-cvar_t	*r_lockpvs;
-cvar_t	*r_noportals;
-cvar_t	*r_entlightmap;
-cvar_t	*r_fastentlight;
-cvar_t	*r_portalOnly;
-
-cvar_t	*r_subdivisions;
-cvar_t	*r_lodCurveError;
-
-cvar_t	*r_fullscreen;
-
-cvar_t	*r_customwidth;
-cvar_t	*r_customheight;
-cvar_t	*r_customaspect;
-
-cvar_t	*r_overBrightBits;
-cvar_t	*r_mapOverBrightBits;
-
-cvar_t	*r_debugSurface;
-
-cvar_t	*r_showImages;
-cvar_t	*r_showlod;
-cvar_t	*r_showstaticlod;
-
-cvar_t	*r_ambientScale;
-cvar_t	*r_directedScale;
-cvar_t	*r_debugSort;
-cvar_t	*r_printShaders;
-cvar_t	*r_saveFontData;
-
-cvar_t	*r_maxpolys;
-int		max_polys;
-cvar_t	*r_maxpolyverts;
-int		max_polyverts;
-cvar_t* r_maxtermarks;
-int		max_termarks;
-cvar_t* r_precacheimages;
-
-cvar_t* r_staticlod;
-cvar_t* r_lodscale;
-cvar_t* r_lodcap;
-cvar_t* r_lodviewmodelcap;
-
-cvar_t* r_uselod;
-cvar_t* lod_LOD;
-cvar_t* lod_minLOD;
-cvar_t* lod_maxLOD;
-cvar_t* lod_LOD_slider;
-cvar_t* lod_curve_0_val;
-cvar_t* lod_curve_1_val;
-cvar_t* lod_curve_2_val;
-cvar_t* lod_curve_3_val;
-cvar_t* lod_curve_4_val;
-cvar_t* lod_edit_0;
-cvar_t* lod_edit_1;
-cvar_t* lod_edit_2;
-cvar_t* lod_edit_3;
-cvar_t* lod_edit_4;
-cvar_t* lod_curve_0_slider;
-cvar_t* lod_curve_1_slider;
-cvar_t* lod_curve_2_slider;
-cvar_t* lod_curve_3_slider;
-cvar_t* lod_curve_4_slider;
-cvar_t* lod_pitch_val;
-cvar_t* lod_zee_val;
-cvar_t* lod_mesh;
-cvar_t* lod_meshname;
-cvar_t* lod_tikiname;
-cvar_t* lod_metric;
-cvar_t* lod_tris;
-cvar_t* lod_position;
-cvar_t* lod_save;
-cvar_t* lod_tool;
-
-cvar_t* sys_cpuid;
-cvar_t* r_sse;
-cvar_t* r_static_shaderdata0;
-cvar_t* r_static_shaderdata1;
-cvar_t* r_static_shaderdata2;
-cvar_t* r_static_shaderdata3;
-cvar_t* r_static_shadermultiplier0;
-cvar_t* r_static_shadermultiplier1;
-cvar_t* r_static_shadermultiplier2;
-cvar_t* r_static_shadermultiplier3;
-
-cvar_t* r_numdebuglines;
-
-
-cvar_t* r_stipplelines;
-cvar_t* r_light_lines;
-cvar_t* r_light_sun_line;
-cvar_t* r_light_int_scale;
-cvar_t* r_light_nolight;
-cvar_t* r_light_showgrid;
-cvar_t* r_skyportal;
-cvar_t* r_skyportal_origin;
-cvar_t* r_farplane;
-cvar_t* r_farplane_color;
-cvar_t* r_farplane_nocull;
-cvar_t* r_farplane_nofog;
-cvar_t* r_lightcoronasize;
-cvar_t* r_useglfog;
-cvar_t* r_debuglines_depthmask;
-cvar_t* r_smoothsmokelight;
-cvar_t* r_showportal;
-cvar_t* ter_minMarkRadius;
-cvar_t* ter_fastMarks;
-cvar_t* r_bumpmap;
-cvar_t* r_loadjpg;
-cvar_t* r_loadftx;
-
-cvar_t* r_showSkeleton;
-
-cvar_t* r_ext_multisample;
-cvar_t* r_noborder;
-cvar_t* r_ext_texture_filter_anisotropic;
-cvar_t* r_stereoEnabled;
-
-qboolean  textureFilterAnisotropic = qtrue;
-int       maxAnisotropy = 16;
-float     displayAspect = 16.f / 9.f;
-qboolean  haveClampToEdge = qtrue;
-
-static void AssertCvarRange( cvar_t *cv, float minVal, float maxVal, qboolean shouldBeIntegral )
-{
-	if ( shouldBeIntegral )
-	{
-		if ( ( int ) cv->value != cv->integer )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' must be integral (%f)\n", cv->name, cv->value );
-			ri.Cvar_Set( cv->name, va( "%d", cv->integer ) );
-		}
-	}
-
-	if ( cv->value < minVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f < %f)\n", cv->name, cv->value, minVal );
-		ri.Cvar_Set( cv->name, va( "%f", minVal ) );
-	}
-	else if ( cv->value > maxVal )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: cvar '%s' out of range (%f > %f)\n", cv->name, cv->value, maxVal );
-		ri.Cvar_Set( cv->name, va( "%f", maxVal ) );
-	}
-}
-
-
-/*
-** InitOpenGL
-**
-** This function is responsible for initializing a valid OpenGL subsystem.  This
-** is done by calling GLimp_Init (which gives us a working OGL subsystem) then
-** setting variables, checking GL constants, and reporting the gfx system config
-** to the user.
-*/
-static void InitOpenGL( void )
-{
-	char renderer_buffer[1024];
-
-	//
-	// initialize OS specific portions of the renderer
-	//
-	// GLimp_Init directly or indirectly references the following cvars:
-	//		- r_fullscreen
-	//		- r_glDriver
-	//		- r_mode
-	//		- r_(color|depth|stencil)bits
-	//		- r_ignorehwgamma
-	//		- r_gamma
-	//
-	
-	if ( glConfig.vidWidth == 0 )
-	{
-		GLint		temp;
-		
-		GLimp_Init(qtrue);
-
-		strcpy( renderer_buffer, glConfig.renderer_string );
-		Q_strlwr( renderer_buffer );
-
-		// OpenGL driver constants
-		qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp );
-		glConfig.maxTextureSize = temp;
-
-		// stubbed or broken drivers may have reported 0...
-		if ( glConfig.maxTextureSize <= 0 ) 
-		{
-			glConfig.maxTextureSize = 0;
-		}
-	}
-
-	// init command buffers and SMP
-	R_InitCommandBuffers();
-
-	// print info
-	GfxInfo_f();
-
-	// set default state
-	GL_SetDefaultState();
-}
-
-/*
-==================
-GL_CheckErrors
-==================
-*/
-void GL_CheckErrors( void ) {
-    int		err;
-    char	s[64];
-
-    err = qglGetError();
-    if ( err == GL_NO_ERROR ) {
-        return;
-    }
-    if ( r_ignoreGLErrors->integer ) {
-        return;
-    }
-    switch( err ) {
-        case GL_INVALID_ENUM:
-            strcpy( s, "GL_INVALID_ENUM" );
-            break;
-        case GL_INVALID_VALUE:
-            strcpy( s, "GL_INVALID_VALUE" );
-            break;
-        case GL_INVALID_OPERATION:
-            strcpy( s, "GL_INVALID_OPERATION" );
-            break;
-        case GL_STACK_OVERFLOW:
-            strcpy( s, "GL_STACK_OVERFLOW" );
-            break;
-        case GL_STACK_UNDERFLOW:
-            strcpy( s, "GL_STACK_UNDERFLOW" );
-            break;
-        case GL_OUT_OF_MEMORY:
-            strcpy( s, "GL_OUT_OF_MEMORY" );
-            break;
-        default:
-            Com_sprintf( s, sizeof(s), "%i", err);
-            break;
-    }
-
-    ri.Error( ERR_FATAL, "GL_CheckErrors: %s", s );
-}
-
-
-/*
-** R_GetModeInfo
-*/
-typedef struct vidmode_s
-{
-    const char *description;
-    int         width, height;
-	float		pixelAspect;		// pixel width / height
-} vidmode_t;
-
-vidmode_t r_vidModes[] =
-{
-    { "Mode  0: 320x240",		320,	240,	1 },
-    { "Mode  1: 400x300",		400,	300,	1 },
-    { "Mode  2: 512x384",		512,	384,	1 },
-    { "Mode  3: 640x480",		640,	480,	1 },
-    { "Mode  4: 800x600",		800,	600,	1 },
-    { "Mode  5: 960x720",		960,	720,	1 },
-    { "Mode  6: 1024x768",		1024,	768,	1 },
-    { "Mode  7: 1152x864",		1152,	864,	1 },
-    { "Mode  8: 1280x1024",		1280,	1024,	1 },
-    { "Mode  9: 1600x1200",		1600,	1200,	1 },
-    { "Mode 10: 2048x1536",		2048,	1536,	1 },
-    { "Mode 11: 856x480 (wide)",856,	480,	1 }
-};
-static int	s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
-
-qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
-	vidmode_t	*vm;
-
-    if ( mode < -1 ) {
-        return qfalse;
-	}
-	if ( mode >= s_numVidModes ) {
-		return qfalse;
-	}
-
-	if ( mode == -1 ) {
-		*width = r_customwidth->integer;
-		*height = r_customheight->integer;
-		*windowAspect = r_customaspect->value;
-		return qtrue;
-	}
-
-	vm = &r_vidModes[mode];
-
-    *width  = vm->width;
-    *height = vm->height;
-    *windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
-
-    return qtrue;
-}
-
-/*
-** R_ModeList_f
-*/
-static void R_ModeList_f( void )
-{
-	int i;
-
-	ri.Printf( PRINT_ALL, "\n" );
-	for ( i = 0; i < s_numVidModes; i++ )
-	{
-		ri.Printf( PRINT_ALL, "%s\n", r_vidModes[i].description );
-	}
-	ri.Printf( PRINT_ALL, "\n" );
-}
-
-
-/* 
-============================================================================== 
- 
-						SCREEN SHOTS 
-
-NOTE TTimo
-some thoughts about the screenshots system:
-screenshots get written in fs_homepath + fs_gamedir
-vanilla q3 .. baseq3/screenshots/ *.tga
-team arena .. missionpack/screenshots/ *.tga
-
-two commands: "screenshot" and "screenshotJPEG"
-we use statics to store a count and start writing the first screenshot/screenshot????.tga (.jpg) available
-(with FS_FileExists / FS_FOpenFileWrite calls)
-FIXME: the statics don't get a reinit between fs_game changes
-
-============================================================================== 
-*/ 
-
-/* 
-================== 
-RB_TakeScreenshot
-================== 
-*/  
-void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
-	byte		*buffer;
-	int			i, c, temp;
-		
-	buffer = ri.Hunk_AllocateTempMemory(glConfig.vidWidth*glConfig.vidHeight*3+18);
-
-	Com_Memset (buffer, 0, 18);
-	buffer[2] = 2;		// uncompressed type
-	buffer[12] = width & 255;
-	buffer[13] = width >> 8;
-	buffer[14] = height & 255;
-	buffer[15] = height >> 8;
-	buffer[16] = 24;	// pixel size
-
-	qglReadPixels( x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer+18 ); 
-
-	// swap rgb to bgr
-	c = 18 + width * height * 3;
-	for (i=18 ; i<c ; i+=3) {
-		temp = buffer[i];
-		buffer[i] = buffer[i+2];
-		buffer[i+2] = temp;
-	}
-
-	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, glConfig.vidWidth * glConfig.vidHeight * 3 );
-	}
-
-	ri.FS_WriteFile( fileName, buffer, c );
-
-	ri.Hunk_FreeTempMemory( buffer );
-}
-
-/* 
-================== 
-RB_TakeScreenshotJPEG
-================== 
-*/  
-void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
-	// FIXME: unimplemented
-#if 0
-	byte		*buffer;
-
-	buffer = ri.Hunk_AllocateTempMemory(glConfig.vidWidth*glConfig.vidHeight*4);
-
-	qglReadPixels( x, y, width, height, GL_RGBA, GL_UNSIGNED_BYTE, buffer ); 
-
-	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer, glConfig.vidWidth * glConfig.vidHeight * 4 );
-	}
-
-	ri.FS_WriteFile( fileName, buffer, 1 );		// create path
-	SaveJPG( fileName, 95, glConfig.vidWidth, glConfig.vidHeight, buffer);
-
-	ri.Hunk_FreeTempMemory( buffer );
-#endif
-}
-
-/*
-==================
-RB_TakeScreenshotCmd
-==================
-*/
-const void *RB_TakeScreenshotCmd( const void *data ) {
-	const screenshotCommand_t	*cmd;
-	
-	cmd = (const screenshotCommand_t *)data;
-	
-	if (cmd->jpeg)
-		RB_TakeScreenshotJPEG( cmd->x, cmd->y, cmd->width, cmd->height, cmd->fileName);
-	else
-		RB_TakeScreenshot( cmd->x, cmd->y, cmd->width, cmd->height, cmd->fileName);
-	
-	return (const void *)(cmd + 1);	
-}
-
-/*
-==================
-R_TakeScreenshot
-==================
-*/
-void R_TakeScreenshot( int x, int y, int width, int height, char *name, qboolean jpeg ) {
-	static char	fileName[MAX_OSPATH]; // bad things if two screenshots per frame?
-	screenshotCommand_t	*cmd;
-
-	cmd = R_GetCommandBuffer( sizeof( *cmd ) );
-	if ( !cmd ) {
-		return;
-	}
-	cmd->commandId = RC_SCREENSHOT;
-
-	cmd->x = x;
-	cmd->y = y;
-	cmd->width = width;
-	cmd->height = height;
-	Q_strncpyz( fileName, name, sizeof(fileName) );
-	cmd->fileName = fileName;
-	cmd->jpeg = jpeg;
-}
-
-/* 
-================== 
-R_ScreenshotFilename
-================== 
-*/  
-void R_ScreenshotFilename( int lastNumber, char *fileName ) {
-	int		a,b,c,d;
-
-	if ( lastNumber < 0 || lastNumber > 9999 ) {
-		Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.tga" );
-		return;
-	}
-
-	a = lastNumber / 1000;
-	lastNumber -= a*1000;
-	b = lastNumber / 100;
-	lastNumber -= b*100;
-	c = lastNumber / 10;
-	lastNumber -= c*10;
-	d = lastNumber;
-
-	Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.tga"
-		, a, b, c, d );
-}
-
-/* 
-================== 
-R_ScreenshotFilename
-================== 
-*/  
-void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
-	int		a,b,c,d;
-
-	if ( lastNumber < 0 || lastNumber > 9999 ) {
-		Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.jpg" );
-		return;
-	}
-
-	a = lastNumber / 1000;
-	lastNumber -= a*1000;
-	b = lastNumber / 100;
-	lastNumber -= b*100;
-	c = lastNumber / 10;
-	lastNumber -= c*10;
-	d = lastNumber;
-
-	Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.jpg"
-		, a, b, c, d );
-}
-
-/*
-====================
-R_LevelShot
-
-levelshots are specialized 128*128 thumbnails for
-the menu system, sampled down from full screen distorted images
-====================
-*/
-void R_LevelShot( void ) {
-	char		checkname[MAX_OSPATH];
-	byte		*buffer;
-	byte		*source;
-	byte		*src, *dst;
-	int			x, y;
-	int			r, g, b;
-	float		xScale, yScale;
-	int			xx, yy;
-
-	sprintf( checkname, "levelshots/%s.tga", tr.world->baseName );
-
-	source = ri.Hunk_AllocateTempMemory( glConfig.vidWidth * glConfig.vidHeight * 3 );
-
-	buffer = ri.Hunk_AllocateTempMemory( 128 * 128*3 + 18);
-	Com_Memset (buffer, 0, 18);
-	buffer[2] = 2;		// uncompressed type
-	buffer[12] = 128;
-	buffer[14] = 128;
-	buffer[16] = 24;	// pixel size
-
-	qglReadPixels( 0, 0, glConfig.vidWidth, glConfig.vidHeight, GL_RGB, GL_UNSIGNED_BYTE, source ); 
-
-	// resample from source
-	xScale = glConfig.vidWidth / 512.0f;
-	yScale = glConfig.vidHeight / 384.0f;
-	for ( y = 0 ; y < 128 ; y++ ) {
-		for ( x = 0 ; x < 128 ; x++ ) {
-			r = g = b = 0;
-			for ( yy = 0 ; yy < 3 ; yy++ ) {
-				for ( xx = 0 ; xx < 4 ; xx++ ) {
-					src = source + 3 * ( glConfig.vidWidth * (int)( (y*3+yy)*yScale ) + (int)( (x*4+xx)*xScale ) );
-					r += src[0];
-					g += src[1];
-					b += src[2];
-				}
-			}
-			dst = buffer + 18 + 3 * ( y * 128 + x );
-			dst[0] = b / 12;
-			dst[1] = g / 12;
-			dst[2] = r / 12;
-		}
-	}
-
-	// gamma correct
-	if ( ( tr.overbrightBits > 0 ) && glConfig.deviceSupportsGamma ) {
-		R_GammaCorrect( buffer + 18, 128 * 128 * 3 );
-	}
-
-	ri.FS_WriteFile( checkname, buffer, 128 * 128*3 + 18 );
-
-	ri.Hunk_FreeTempMemory( buffer );
-	ri.Hunk_FreeTempMemory( source );
-
-	ri.Printf( PRINT_ALL, "Wrote %s\n", checkname );
-}
-
-/* 
-================== 
-R_ScreenShot_f
-
-screenshot
-screenshot [silent]
-screenshot [levelshot]
-screenshot [filename]
-
-Doesn't print the pacifier message if there is a second arg
-================== 
-*/  
-void R_ScreenShot_f(void) {
-    char	checkname[MAX_OSPATH];
-    static	int	lastNumber = -1;
-    qboolean	silent;
-
-    if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
-        R_LevelShot();
-        return;
-    }
-
-    if (!strcmp(ri.Cmd_Argv(1), "silent")) {
-        silent = qtrue;
-    } else {
-        silent = qfalse;
-    }
-
-    if (ri.Cmd_Argc() == 2 && !silent) {
-        // explicit filename
-        Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
-    } else {
-        // scan for a free filename
-
-        // if we have saved a previous screenshot, don't scan
-        // again, because recording demo avis can involve
-        // thousands of shots
-        if (lastNumber == -1) {
-            lastNumber = 0;
-        }
-        // scan for a free number
-        for (; lastNumber <= 9999; lastNumber++) {
-            R_ScreenshotFilename(lastNumber, checkname);
-
-            if (!ri.FS_FileExists(checkname))
-            {
-                break; // file doesn't exist
-            }
-        }
-
-        if (lastNumber >= 9999) {
-            ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
-            return;
-        }
-
-        lastNumber++;
-    }
-
-    R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
-
-    if (!silent) {
-        char message[64];
-
-        Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
-        ri.Cmd_ExecuteText(EXEC_NOW, message);
-    }
-}
-
-void R_ScreenShotJPEG_f (void) {
-	char		checkname[MAX_OSPATH];
-	static	int	lastNumber = -1;
-	qboolean	silent;
-
-	if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
-		R_LevelShot();
-		return;
-	}
-
-	if ( !strcmp( ri.Cmd_Argv(1), "silent" ) ) {
-		silent = qtrue;
-	} else {
-		silent = qfalse;
-	}
-
-	if ( ri.Cmd_Argc() == 2 && !silent ) {
-		// explicit filename
-		Com_sprintf( checkname, MAX_OSPATH, "screenshots/%s.jpg", ri.Cmd_Argv( 1 ) );
-	} else {
-		// scan for a free filename
-
-		// if we have saved a previous screenshot, don't scan
-		// again, because recording demo avis can involve
-		// thousands of shots
-		if ( lastNumber == -1 ) {
-			lastNumber = 0;
-		}
-		// scan for a free number
-		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
-			R_ScreenshotFilenameJPEG( lastNumber, checkname );
-
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
-		}
-
-		if ( lastNumber == 10000 ) {
-			ri.Printf (PRINT_ALL, "ScreenShot: Couldn't create a file\n"); 
-			return;
- 		}
-
-		lastNumber++;
-	}
-
-	R_TakeScreenshot( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qtrue );
-
-	if ( !silent ) {
-		ri.Printf (PRINT_ALL, "Wrote %s\n", checkname);
-	}
-} 
-
-//============================================================================
-
-/*
-** GL_SetDefaultState
-*/
-void GL_SetDefaultState( void )
-{
-	qglClearDepth( 1.0f );
-
-	qglCullFace(GL_FRONT);
-
-	qglColor4f (1,1,1,1);
-
-	// initialize downstream texture unit if we're running
-	// in a multitexture environment
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( 1 );
-		GL_TextureMode( r_textureMode->string );
-		GL_TexEnv( GL_MODULATE );
-		qglDisable( GL_TEXTURE_2D );
-		GL_SelectTexture( 0 );
-	}
-
-	qglEnable(GL_TEXTURE_2D);
-	GL_TextureMode( r_textureMode->string );
-	GL_TexEnv( GL_MODULATE );
-
-	qglShadeModel( GL_SMOOTH );
-	qglDepthFunc( GL_LEQUAL );
-
-	// the vertex array is always enabled, but the color and texture
-	// arrays are enabled and disabled around the compiled vertex array call
-	qglEnableClientState (GL_VERTEX_ARRAY);
-
-	//
-	// make sure our GL state vector is set correctly
-	//
-	glState.glStateBits = GLS_DEPTHTEST_DISABLE | GLS_DEPTHMASK_TRUE;
-
-	qglPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
-	qglDepthMask( GL_TRUE );
-	qglDisable( GL_DEPTH_TEST );
-	qglEnable( GL_SCISSOR_TEST );
-	qglDisable( GL_CULL_FACE );
-	qglDisable( GL_BLEND );
-
-	qglFogi(GL_FOG_MODE, GL_LINEAR);
-
-	glState.fFogColor[0] = 0.0;
-	glState.fFogColor[1] = 0.0;
-	glState.fFogColor[2] = 0.0;
-	glState.fFogColor[3] = 1.0;
-}
-
-const char* RE_GetGraphicsInfo() {
-	// FIXME: unimplemented
-	return NULL;
-}
-
-/*
-================
-GfxInfo_f
-================
-*/
-void GfxInfo_f( void ) 
-{
-	cvar_t *sys_cpustring = ri.Cvar_Get( "sys_cpustring", "", 0 );
-	const char *enablestrings[] =
-	{
-		"disabled",
-		"enabled"
-	};
-	const char *fsstrings[] =
-	{
-		"windowed",
-		"fullscreen"
-	};
-
-	ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
-	ri.Printf( PRINT_ALL, "GL_EXTENSIONS: %s\n", glConfig.extensions_string );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	//ri.Printf( PRINT_ALL, "GL_MAX_ACTIVE_TEXTURES_ARB: %d\n", glConfig.maxActiveTextures );
-	ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-	ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
-	if ( glConfig.displayFrequency )
-	{
-		ri.Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "N/A\n" );
-	}
-	if ( glConfig.deviceSupportsGamma )
-	{
-		ri.Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
-	}
-	ri.Printf( PRINT_ALL, "CPU: %s\n", sys_cpustring->string );
-
-	// rendering primitives
-	{
-		int		primitives;
-
-		// default is to use triangles if compiled vertex arrays are present
-		ri.Printf( PRINT_ALL, "rendering primitives: " );
-		primitives = r_primitives->integer;
-		if ( primitives == 0 ) {
-			if ( qglLockArraysEXT ) {
-				primitives = 2;
-			} else {
-				primitives = 1;
-			}
-		}
-		if ( primitives == -1 ) {
-			ri.Printf( PRINT_ALL, "none\n" );
-		} else if ( primitives == 2 ) {
-			ri.Printf( PRINT_ALL, "single glDrawElements\n" );
-		} else if ( primitives == 1 ) {
-			ri.Printf( PRINT_ALL, "multiple glArrayElement\n" );
-		} else if ( primitives == 3 ) {
-			ri.Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
-		}
-	}
-
-	ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
-	ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
-	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 )
-	{
-		ri.Printf( PRINT_ALL, "HACK: using vertex lightmap approximation\n" );
-	}
-	if ( glConfig.hardwareType == GLHW_RAGEPRO )
-	{
-		ri.Printf( PRINT_ALL, "HACK: ragePro approximations\n" );
-	}
-	if ( glConfig.hardwareType == GLHW_RIVA128 )
-	{
-		ri.Printf( PRINT_ALL, "HACK: riva128 approximations\n" );
-	}
-	if ( glConfig.smpActive ) {
-		ri.Printf( PRINT_ALL, "Using dual processor acceleration\n" );
-	}
-	if ( r_finish->integer ) {
-		ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
-	}
-}
-
-qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
-	// FIXME: unimplemented
-	return qfalse;
-}
-
-void R_SetFullscreen(qboolean fullscreen) {
-	// FIXME: unimplemented
-}
-
-/*
-===============
-R_Register
-===============
-*/
-void R_Register( void ) 
-{
-	//
-	// latched and archived variables
-	//
-	r_glDriver = ri.Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE | CVAR_LATCH );
-	r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compressed_textures", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE | CVAR_LATCH);
-#ifdef __linux__ // broken on linux
-	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else
-	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
-	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
-    r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
-
-	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
-	AssertCvarRange( r_picmip, 0, 16, qtrue );
-	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
-	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH );
-#ifdef __linux__
-	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-#else
-	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
-#endif
-    r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
-    r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
-	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
-    r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#if (defined(MACOS_X) || defined(__linux__)) && defined(SMP)
-  // Default to using SMP on Mac OS X or Linux if we have multiple processors
-	r_smp = ri.Cvar_Get( "r_smp", Sys_ProcessorCount() > 1 ? "1" : "0", CVAR_ARCHIVE | CVAR_LATCH);
-#else        
-	r_smp = ri.Cvar_Get( "r_smp", "0", CVAR_ARCHIVE | CVAR_LATCH);
-#endif
-    r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-
-	//
-	// temporary latched variables that can only change over a restart
-	//
-	r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
-	AssertCvarRange( r_displayRefresh, 0, 200, qtrue );
-	r_fullbright = ri.Cvar_Get ("r_fullbright", "0", CVAR_LATCH|CVAR_CHEAT );
-	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "1", CVAR_LATCH );
-	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH );
-	r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
-	r_singleShader = ri.Cvar_Get ("r_singleShader", "0", CVAR_CHEAT | CVAR_LATCH );
-
-	//
-	// archived variables that can change at any time
-	//
-	r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0);
-	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT );
-	r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE );
-	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
-	AssertCvarRange( r_znear, 0.001f, 200, qtrue );
-	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
-	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
-	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_CHEAT | CVAR_LATCH);
-	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
-	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
-	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
-	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE );
-	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
-#ifdef __MACOS__
-	r_gamma = ri.Cvar_Get( "r_gamma", "1.2", CVAR_ARCHIVE );
-#else
-	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
-#endif
-	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
-
-	r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE );
-
-	r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT );
-	r_directedScale = ri.Cvar_Get( "r_directedScale", "1", CVAR_CHEAT );
-
-	//
-	// temporary variables that can change at any time
-	//
-	r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
-    r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
-    r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
-    r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
-    lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
-    lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
-    lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
-    lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
-    lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
-    lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
-    lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
-    lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
-    lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
-    lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
-    lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
-    lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
-    lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
-    lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
-    lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
-    lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
-    lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
-    lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
-    lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
-    lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
-    lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
-    lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
-    lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
-    lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
-    lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
-    lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
-    lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
-    lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
-    lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
-
-	r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT );
-	r_printShaders = ri.Cvar_Get( "r_printShaders", "0", 0 );
-
-	r_nocurves = ri.Cvar_Get ("r_nocurves", "0", CVAR_CHEAT );
-	r_drawworld = ri.Cvar_Get ("r_drawworld", "1", CVAR_CHEAT );
-	r_lightmap = ri.Cvar_Get ("r_lightmap", "0", 0 );
-	r_portalOnly = ri.Cvar_Get ("r_portalOnly", "0", CVAR_CHEAT );
-
-	r_flareSize = ri.Cvar_Get ("r_flareSize", "40", CVAR_CHEAT);
-	r_flareFade = ri.Cvar_Get ("r_flareFade", "7", CVAR_CHEAT);
-
-	r_showSmp = ri.Cvar_Get ("r_showSmp", "0", CVAR_CHEAT);
-	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
-
-	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
-    r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
-    r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
-    r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
-    r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
-    r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
-    r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
-    r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
-    r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
-    r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
-    r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
-    r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
-    r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
-    r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
-    r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
-    r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
-	r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT );
-	r_nocull = ri.Cvar_Get ("r_nocull", "0", CVAR_CHEAT);
-	r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
-	r_novis = ri.Cvar_Get ("r_novis", "0", CVAR_CHEAT);
-	r_showcluster = ri.Cvar_Get ("r_showcluster", "0", CVAR_CHEAT);
-	r_speeds = ri.Cvar_Get ("r_speeds", "0", CVAR_CHEAT);
-	r_verbose = ri.Cvar_Get( "r_verbose", "0", CVAR_CHEAT );
-	r_logFile = ri.Cvar_Get( "r_logFile", "0", CVAR_CHEAT );
-	r_debugSurface = ri.Cvar_Get ("r_debugSurface", "0", CVAR_CHEAT);
-	r_nobind = ri.Cvar_Get ("r_nobind", "0", CVAR_CHEAT);
-	r_showtris = ri.Cvar_Get ("r_showtris", "0", CVAR_CHEAT);
-	r_showsky = ri.Cvar_Get ("r_showsky", "0", CVAR_CHEAT);
-	r_shownormals = ri.Cvar_Get ("r_shownormals", "0", CVAR_CHEAT);
-    r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
-    r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
-	r_clear = ri.Cvar_Get ("r_clear", "0", CVAR_CHEAT);
-	r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT );
-	r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT );
-	r_drawBuffer = ri.Cvar_Get( "r_drawBuffer", "GL_BACK", CVAR_CHEAT );
-	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
-	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
-    r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
-    r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
-    r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
-    r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
-    r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
-    r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
-    r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
-	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
-
-	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va("%d", MAX_POLYS), 0);
-	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va("%d", MAX_POLYVERTS), 0);
-	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
-
-    r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
-    r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
-    r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
-    r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
-    r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_ARCHIVE);
-    r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
-    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-    r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
-    r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
-    r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
-    r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
-    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
-    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
-    r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
-    r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
-    r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
-    r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
-    r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
-    sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
-    r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
-    r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
-    r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
-    r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
-    r_precacheimages = (cvar_t*)Cvar_Get("r_precacheimages", "0", 0);
-    ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
-    ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
-    fps = ri.Cvar_Get("fps", "0", 0);
-    r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
-    r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
-
-    r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
-        "0", CVAR_ARCHIVE | CVAR_LATCH);
-    r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
-
-	// make sure all the commands added here are also
-	// removed in R_Shutdown
-	ri.Cmd_AddCommand( "imagelist", R_ImageList_f );
-	ri.Cmd_AddCommand( "shaderlist", R_ShaderList_f );
-	ri.Cmd_AddCommand( "skinlist", R_SkinList_f );
-	ri.Cmd_AddCommand( "modellist", R_Modellist_f );
-	ri.Cmd_AddCommand( "modelist", R_ModeList_f );
-	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
-	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
-	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
-}
-
-void R_InitExtensions() {
-	// FIXME: qglTextureEnvCombineExists
-	glState.cntTexEnvExt = 0;
-	glState.cntnvblendmode = 0;
-
-	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, 34165.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, 8448.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, 0x47057700);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, 0x44400000);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 5890.0);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, 0x44400000);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, 0x47057700);
-	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, 770.0);
-}
-
-/*
-===============
-R_Init
-===============
-*/
-void R_Init( void ) {	
-	int	err;
-	int i;
-	byte *ptr;
-
-	ri.Printf( PRINT_ALL, "----- R_Init -----\n" );
-
-	// clear all our internal state
-	Com_Memset( &tr, 0, sizeof( tr ) );
-	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
-	Com_Memset( &tess, 0, sizeof( tess ) );
-
-//	Swap_Init();
-
-	if ( (int)tess.xyz & 15 ) {
-		Com_Printf( "WARNING: tess.xyz not 16 byte aligned\n" );
-	}
-	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
-
-	tr.worldEntity.e.shaderRGBA[0] = -1;
-	tr.worldEntity.e.shaderRGBA[1] = 0;
-	tr.worldEntity.e.shaderRGBA[2] = -1;
-	tr.worldEntity.e.shaderRGBA[3] = -1;
-
-	//
-	// init function tables
-	//
-	for ( i = 0; i < FUNCTABLE_SIZE; i++ )
-	{
-		tr.sinTable[i]		= sin( DEG2RAD( i * 360.0f / ( ( float ) ( FUNCTABLE_SIZE - 1 ) ) ) );
-		tr.squareTable[i]	= ( i < FUNCTABLE_SIZE/2 ) ? 1.0f : -1.0f;
-		tr.sawToothTable[i] = (float)i / FUNCTABLE_SIZE;
-		tr.inverseSawToothTable[i] = 1.0f - tr.sawToothTable[i];
-
-		if ( i < FUNCTABLE_SIZE / 2 )
-		{
-			if ( i < FUNCTABLE_SIZE / 4 )
-			{
-				tr.triangleTable[i] = ( float ) i / ( FUNCTABLE_SIZE / 4 );
-			}
-			else
-			{
-				tr.triangleTable[i] = 1.0f - tr.triangleTable[i-FUNCTABLE_SIZE / 4];
-			}
-		}
-		else
-		{
-			tr.triangleTable[i] = -tr.triangleTable[i-FUNCTABLE_SIZE/2];
-		}
-	}
-
-	tr.rendererhandle = ri.Milliseconds();
-
-	if (!tr.rendererhandle) {
-		tr.rendererhandle = -1;
-	}
-
-	R_NoiseInit();
-
-	R_Sky_Init();
-
-	R_Register();
-
-	max_polys = r_maxpolys->integer;
-	if (max_polys < MAX_POLYS)
-		max_polys = MAX_POLYS;
-
-	max_polyverts = r_maxpolyverts->integer;
-	if (max_polyverts < MAX_POLYVERTS)
-        max_polyverts = MAX_POLYVERTS;
-
-	max_termarks = r_maxtermarks->integer;
-    if (max_termarks < MAX_TERMARKS)
-		max_termarks = MAX_TERMARKS;
-
-    ptr = ri.Malloc(sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
-    backEndData[0] = (backEndData_t*)ptr;
-    backEndData[0]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[0]));
-    backEndData[0]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys);
-    backEndData[0]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[0]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-    backEndData[0]->staticModels = NULL;
-    backEndData[0]->staticModelData = NULL;
-    if (r_smp->integer) {
-        ptr = ri.Malloc(sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-        backEndData[1] = (backEndData_t*)ptr;
-        backEndData[1]->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData[1]));
-        backEndData[1]->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys);
-        backEndData[1]->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData[1]) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
-        backEndData[1]->staticModels = NULL;
-		backEndData[1]->staticModelData = NULL;
-    }
-    else {
-        backEndData[1] = NULL;
-    }
-	R_ToggleSmpFrame();
-
-	InitOpenGL();
-
-	R_InitExtensions();
-
-	R_InitImages();
-
-	R_StartupShaders();
-
-	R_ModelInit();
-
-	R_LevelMarksInit();
-
-	tr.pFontDebugStrings = R_LoadFont("verdana-14");
-	g_bInfoworldtris = qfalse;
-
-	err = qglGetError();
-	if ( err != GL_NO_ERROR )
-		ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err);
-
-	ri.Printf( PRINT_ALL, "----- finished R_Init -----\n" );
-}
-
-/*
-===============
-RE_Shutdown
-===============
-*/
-void RE_Shutdown( qboolean destroyWindow ) {	
-
-	ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
-
-	ri.Cmd_RemoveCommand ("modellist");
-	ri.Cmd_RemoveCommand ("screenshotJPEG");
-	ri.Cmd_RemoveCommand ("screenshot");
-	ri.Cmd_RemoveCommand ("imagelist");
-	ri.Cmd_RemoveCommand ("shaderlist");
-	ri.Cmd_RemoveCommand ("skinlist");
-	ri.Cmd_RemoveCommand ("gfxinfo");
-	ri.Cmd_RemoveCommand( "modelist" );
-	ri.Cmd_RemoveCommand( "shaderstate" );
-
-
-	if ( tr.registered ) {
-		R_SyncRenderThread();
-		R_ShutdownCommandBuffers();
-		R_DeleteTextures();
-	}
-
-	// shut down platform specific OpenGL stuff
-	if ( destroyWindow ) {
-		GLimp_Shutdown();
-
-		Com_Memset( &glConfig, 0, sizeof( glConfig ) );
-		textureFilterAnisotropic = qfalse;
-		maxAnisotropy = 0;
-		displayAspect = 0.0f;
-		haveClampToEdge = qfalse;
-
-		Com_Memset( &glState, 0, sizeof( glState ) );
-	}
-
-	tr.registered = qfalse;
-}
-
-extern qboolean scr_initialized;
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration(glconfig_t* glconfigOut) {
-
-    UI_LoadResource("*123");
-    scr_initialized = 0;
-
-    R_SyncRenderThread();
-
-    R_LevelMarksFree();
-    ri.Hunk_Clear();
-
-    *glconfigOut = glConfig;
-
-    r_sequencenumber++;
-    tr.viewCluster = -1;		// force markleafs to regenerate
-    R_ClearFlares();
-    RE_ClearScene();
-    R_SetupShaders();
-    R_InitLensFlare();
-    R_LevelMarksInit();
-
-    tr.registered = qtrue;
-
-    scr_initialized = 1;
-    UI_LoadResource("*124");
-}
-
-/*
-=============
-RE_EndRegistration
-
-Touch all images to make sure they are resident
-=============
-*/
-void RE_EndRegistration( void ) {
-	R_SyncRenderThread();
-	if (!Sys_LowPhysicalMemory()) {
-		RB_ShowImages();
-	}
-}
-
-void RE_SetRenderTime(int t) {
-	// FIXME: unimplemented
-}
-
-/*
-@@@@@@@@@@@@@@@@@@@@@
-GetRefAPI
-
-@@@@@@@@@@@@@@@@@@@@@
-*/
-refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
-	static refexport_t	re;
-
-	ri = *rimp;
-
-	Com_Memset( &re, 0, sizeof( re ) );
-
-	if ( apiVersion != REF_API_VERSION ) {
-		ri.Printf(PRINT_ALL, "Mismatched REF_API_VERSION: expected %i, got %i\n", 
-			REF_API_VERSION, apiVersion );
-		return NULL;
-	}
-
-	R_Init();
-
-	// the RE_ functions are Renderer Entry points
-
-    re.Shutdown = RE_Shutdown;
-
-    re.FreeModels = RE_FreeModels;
-    re.BeginRegistration = RE_BeginRegistration;
-    re.EndRegistration = RE_EndRegistration;
-    re.RegisterModel = RE_RegisterModel;
-    re.SpawnEffectModel = RE_SpawnEffectModel;
-    re.RegisterServerModel = RE_RegisterServerModel;
-    re.UnregisterServerModel = RE_UnregisterServerModel;
-    re.RegisterShader = RE_RegisterShader;
-    re.RegisterShaderNoMip = RE_RegisterShaderNoMip;
-	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
-    re.LoadWorld = RE_LoadWorldMap;
-    re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
-    re.MapVersion = RE_MapVersion;
-    re.LoadFont = R_LoadFont;
-    re.SetWorldVisData = RE_SetWorldVisData;
-
-    re.BeginFrame = RE_BeginFrame;
-    re.EndFrame = RE_EndFrame;
-
-    re.MarkFragments = R_MarkFragments;
-    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-    re.GetInlineModelBounds = R_GetInlineModelBounds;
-    re.GetLightingForDecal = R_GetLightingForDecal;
-    re.GetLightingForSmoke = R_GetLightingForSmoke;
-    re.R_GatherLightSources = R_GatherLightSources;
-    re.ModelBounds = R_ModelBounds;
-    re.ModelRadius = R_ModelRadius;
-
-    re.ClearScene = RE_ClearScene;
-    re.AddRefEntityToScene = RE_AddRefEntityToScene;
-    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
-    re.AddPolyToScene = RE_AddPolyToScene;
-    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
-    re.AddLightToScene = RE_AddLightToScene;
-    re.RenderScene = RE_RenderScene;
-    re.GetRenderEntity = RE_GetRenderEntity;
-
-    re.SavePerformanceCounters = R_SavePerformanceCounters;
-
-    re.R_Model_GetHandle = R_Model_GetHandle;
-    re.SetColor = Draw_SetColor;
-    re.DrawStretchPic = Draw_StretchPic;
-    re.DrawStretchPic2 = Draw_StretchPic2;
-    re.DrawStretchRaw = RE_StretchRaw;
-    re.DebugLine = R_DebugLine;
-    re.DrawTilePic = Draw_TilePic;
-    re.DrawTilePicOffset = Draw_TilePicOffset;
-    re.DrawTrianglePic = Draw_TrianglePic;
-    re.DrawBox = DrawBox;
-    re.AddBox = AddBox;
-    re.Set2DWindow = Set2DWindow;
-    re.Scissor = RE_Scissor;
-    re.DrawLineLoop = DrawLineLoop;
-    re.DrawString = R_DrawString;
-    re.GetFontHeight = R_GetFontHeight;
-    re.GetFontStringWidth = R_GetFontStringWidth;
-    re.SwipeBegin = RE_SwipeBegin;
-    re.SwipeEnd = RE_SwipeEnd;
-    re.SetRenderTime = RE_SetRenderTime;
-    re.Noise = R_NoiseGet4f;
-
-    re.SetMode = R_SetMode;
-    re.SetFullscreen = R_SetFullscreen;
-
-    re.GetShaderHeight = RE_GetShaderHeight;
-    re.GetShaderWidth = RE_GetShaderWidth;
-    re.GetGraphicsInfo = RE_GetGraphicsInfo;
-    re.ForceUpdatePose = RE_ForceUpdatePose;
-    re.TIKI_Orientation = RE_TIKI_Orientation;
-    re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
-    re.SetFrameNumber = RE_SetFrameNumber;
-
-	return &re;
-}
diff --git a/code/renderer/tr_light.c b/code/renderer/tr_light.c
deleted file mode 100644
index 5e7018b3..00000000
--- a/code/renderer/tr_light.c
+++ /dev/null
@@ -1,1318 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_light.c
-
-#include "tr_local.h"
-
-#define	DLIGHT_AT_RADIUS		16
-// at the edge of a dlight's influence, this amount of light will be added
-
-#define	DLIGHT_MINIMUM_RADIUS	16		
-// never calculate a range less than this to prevent huge light numbers
-
-typedef struct {
-  dlight_t *dl;
-  float power;
-  vec3_t origin;
-} incidentLight_t;
-
-typedef struct {
-  int dlightMap;
-  int allocated[LIGHTMAP_SIZE];
-  byte lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
-  byte* srcBase;
-  byte* dstBase;
-  incidentLight_t lights[32];
-  int numLights;
-} dlightInfo_t;
-
-typedef struct {
-  vec3_t point;
-  int s;
-  int t;
-} patchLightBlock_t;
-
-dlightInfo_t dli;
-
-void R_SetupEntityLightingGrid(trRefEntity_t* ent);
-qboolean R_DlightSample(byte* src, const vec3_t vec, byte* dst);
-qboolean R_AllocLMBlock(int w, int h, int* x, int* y);
-
-static int R_RecursiveDlightPatch(patchLightBlock_t* plb) {
-    patchLightBlock_t cut[4];
-    qboolean added;
-    int index;
-
-    if (plb[0].s < plb[1].s - 1)
-	{
-        cut[0] = plb[0];
-        cut[2] = plb[2];
-
-        VectorAdd(plb[0].point, plb[1].point, cut[1].point);
-        VectorScale(cut[1].point, 0.5f, cut[1].point);
-        VectorAdd(plb[2].point, plb[3].point, cut[3].point);
-        VectorScale(cut[3].point, 0.5f, cut[3].point);
-
-        cut[3].s = (plb[0].s + plb[1].s) >> 1;
-        cut[1].s = cut[3].s;
-        cut[1].t = plb[0].t;
-        cut[3].t = plb[2].t;
-
-        added = R_RecursiveDlightPatch(cut);
-
-        cut[0] = cut[1];
-        cut[2] = cut[3];
-
-        index = 1;
-	}
-	else if (plb[0].t < plb[2].t - 1)
-    {
-        cut[0] = plb[0];
-        cut[1] = plb[1];
-
-        VectorAdd(plb[0].point, plb[2].point, cut[2].point);
-        VectorScale(cut[2].point, 0.5f, cut[2].point);
-        VectorAdd(plb[1].point, plb[3].point, cut[3].point);
-        VectorScale(cut[3].point, 0.5f, cut[3].point);
-
-        cut[3].t = (plb[0].t + plb[2].t) >> 1;
-        cut[2].t = cut[3].t;
-        cut[2].s = plb[0].s;
-        cut[3].s = plb[1].s;
-
-        added = R_RecursiveDlightPatch(cut);
-        cut[0] = cut[2];
-        cut[1] = cut[3];
-
-        index = 2;
-	}
-	else
-	{
-		return R_DlightSample(
-			&dli.srcBase[(LIGHTMAP_SIZE * 3) + plb[0].s * 3],
-			plb[0].point,
-            &dli.dstBase[(LIGHTMAP_SIZE * 4) + plb[0].s * 4]
-        );
-	}
-
-	cut[index] = plb[index];
-	cut[3] = plb[3];
-
-	return R_RecursiveDlightPatch(cut) + added;
-}
-
-int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBits) {
-    int x, y;
-    int i, j;
-    int i2, j2;
-    int steps[2][2];
-    dlight_t* dl;
-    qboolean added;
-    float* origin;
-    drawVert_t* dv;
-
-    if (!srf->lmHeight || !srf->lmWidth)
-    {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-	dli.numLights = 0;
-
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-		if (!(dlightBits & (1 << i))) {
-			continue;
-		}
-
-		dl = &tr.refdef.dlights[i];
-		if (dl->origin[0] + dl->radius < srf->meshBounds[0][0]
-			|| dl->origin[0] - dl->radius > srf->meshBounds[1][0]
-			|| dl->origin[1] + dl->radius < srf->meshBounds[0][1]
-			|| dl->origin[1] - dl->radius > srf->meshBounds[1][1]
-			|| dl->origin[2] + dl->radius < srf->meshBounds[0][2]
-			|| dl->origin[2] - dl->radius > srf->meshBounds[1][2])
-		{
-			dlightBits &= ~(1 << i);
-			continue;
-		}
-
-		VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-		dli.lights[dli.numLights].dl = dl;
-		dli.lights[dli.numLights].power = 1.f / dl->radius;
-		dli.numLights++;
-	}
-
-	if (!dli.numLights) {
-		srf->dlightMap[tr.smpFrame] = 0;
-		return 0;
-	}
-
-	if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-    dli.srcBase = srf->lmData;
-    dli.dstBase = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
-    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
-
-    tr.pc.c_dlightSurfaces++;
-    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
-
-	added = 0;
-	
-	if (srf->verts[srf->width].lightmap[0] != srf->verts[0].lightmap[0]) {
-		if (srf->verts[srf->width].lightmap[0] < srf->verts[0].lightmap[0]) {
-			steps[0][0] = 0;
-			steps[0][1] = -1;
-		} else {
-			steps[0][0] = 0;
-			steps[0][1] = 1;
-		}
-
-		if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
-            steps[1][0] = -1;
-            steps[1][1] = 0;
-		} else {
-            steps[1][0] = 1;
-            steps[1][1] = 0;
-		}
-	} else {
-		if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
-            steps[0][0] = -1;
-            steps[0][1] = 0;
-		} else {
-            steps[0][0] = 1;
-            steps[0][1] = 0;
-		}
-
-        if (srf->verts[srf->width].lightmap[1] < srf->verts[0].lightmap[1]) {
-            steps[1][0] = 0;
-            steps[1][1] = -1;
-        } else {
-            steps[1][0] = 0;
-            steps[1][1] = -1;
-        }
-	}
-
-	for (i = 0; i < srf->height; i++) {
-		for (j = 0; j < srf->width; j++) {
-			patchLightBlock_t plb[4];
-
-			//
-			// Vert 1
-			//
-			dv = &srf->verts[i * srf->width + j];
-
-			VectorCopy(dv->xyz, plb[0].point);
-			plb[0].s = dv->lightmap[0] * 128.0 - srf->lmX;
-			plb[0].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-			i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
-
-            //
-            // Vert 2
-            //
-            dv = &srf->verts[srf->width * i2 + j2];
-
-            VectorCopy(dv->xyz, plb[1].point);
-            plb[1].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[1].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
-
-            //
-            // Vert 3
-            //
-            dv = &srf->verts[srf->width * i2 + j2];
-
-            VectorCopy(dv->xyz, plb[2].point);
-            plb[2].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[2].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
-            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
-
-            //
-            // Vert 4
-            //
-            dv = &srf->verts[srf->width * i2 + j2];
-
-            VectorCopy(dv->xyz, plb[3].point);
-            plb[3].s = dv->lightmap[0] * 128.0 - srf->lmX;
-            plb[3].t = dv->lightmap[1] * 128.0 - srf->lmY;
-
-			added |= R_RecursiveDlightPatch(plb);
-		}
-	}
-
-    if (!added) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-	for (i = 0; i < srf->lmWidth; i++) {
-		dli.allocated[x + i] = srf->lmHeight + y;
-	}
-
-    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->dlightMap[tr.smpFrame];
-}
-
-int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits) {
-    int x, y;
-    byte* src, * dst;
-    int i, j;
-    vec3_t vec;
-    vec3_t vecStepS, vecStepT;
-    dlight_t* dl;
-    float d;
-    qboolean added;
-    float* origin;
-
-	if (!srf->lmHeight || !srf->lmWidth) {
-		srf->dlightMap[tr.smpFrame] = 0;
-		return 0;
-	}
-
-	dli.numLights = 0;
-
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-        if (!(dlightBits & (1 << i))) {
-            continue;
-        }
-
-        dl = &tr.refdef.dlights[i];
-
-        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
-
-        if ((d < 0.f && !r_dlightBacks->integer)
-            || (d > dl->radius || d < -dl->radius)) {
-            // dlight doesn't reach the plane
-            dlightBits &= ~(1 << i);
-        }
-        else {
-            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
-            dli.lights[dli.numLights].dl = dl;
-            dli.lights[dli.numLights].power = 1.0 / dl->radius;
-			dli.numLights++;
-        }
-    }
-
-    if (!dli.numLights) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-	if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
-		srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-    src = srf->lmData;
-    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-	srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
-	srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
-
-	tr.pc.c_dlightSurfaces++;
-	tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
-
-	VectorCopy(srf->lmVecs[0], vecStepS);
-	VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
-
-	added = qfalse;
-	VectorCopy(srf->lmOrigin, vec);
-
-	for (i = 0; i < srf->lmHeight; i++) {
-		for (j = 0; j < srf->lmWidth; j++) {
-			added |= R_DlightSample(src, vec, dst);
-			VectorAdd(vec, vecStepS, vec);
-			src += 3;
-			dst += 4;
-		}
-
-		VectorAdd(vec, vecStepT, vec);
-		src += 3 * (LIGHTMAP_SIZE - j);
-		dst += 4 * (LIGHTMAP_SIZE - j);
-	}
-
-	if (!added) {
-        srf->dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-    for (i = 0; i < srf->lmWidth; i++) {
-        dli.allocated[x + i] = srf->lmHeight + y;
-    }
-
-    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->dlightMap[tr.smpFrame];
-}
-
-int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
-    dlight_t* dl;
-    int x, y;
-    byte* dst, * src;
-    vec3_t vec;
-    float delta, dist;
-    float* origin;
-    int i, j, k;
-    int di, dj;
-    qboolean added;
-    float lmScale;
-    int lumelsPerHeight;
-    float heightPerLumelSquared;
-    float z00, z01;
-    float z10, z11;
-
-	for (i = 0; i < tr.refdef.num_dlights; i++) {
-		dl = &tr.refdef.dlights[i];
-
-		if (dl->radius < srf->x0 - dl->transformed[0]
-			|| -512.f - dl->radius > srf->x0 - dl->transformed[0]
-			|| -512.f - dl->radius > srf->y0 - dl->transformed[1]
-			|| dl->radius < srf->y0 - dl->transformed[1])
-		{
-			continue;
-		}
-
-		if (dl->radius > 128.f) {
-			dist = 0.f;
-
-			delta = dl->transformed[0] - srf->x0;
-			if (delta <= 0.f) {
-				dist += delta * delta;
-			} else {
-				delta -= 512.f;
-				if (delta > 0.f) dist += delta * delta;
-            }
-
-            delta = dl->transformed[1] - srf->y0;
-            if (delta <= 0.f) {
-                dist += delta * delta;
-            } else {
-                delta -= 512.f;
-                if (delta > 0.f) dist += delta * delta;
-            }
-
-			delta = dl->transformed[0] - srf->z0;
-			if (delta <= 0.f) {
-				dist += delta * delta;
-			} else {
-				delta -= srf->zmax;
-				if (delta > 0.f) dist += delta * delta;
-			}
-
-			if (dl->radius * dl->radius < dist) {
-				continue;
-			}
-		}
-
-		VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
-		dli.lights[dli.numLights].dl = dl;
-		dli.lights[dli.numLights].power = 1.f / dl->radius;
-		dli.numLights++;
-	}
-
-    if (!dli.numLights)
-    {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y))
-    {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-    }
-
-	src = srf->drawinfo.lmData;
-	dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
-
-	srf->drawinfo.lmapX = x / 128.f;
-	srf->drawinfo.lmapY = y / 128.f;
-
-    tr.pc.c_dlightSurfaces++;
-    tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
-
-	added = qfalse;
-
-	lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
-	if (lumelsPerHeight == 1) {
-		vec[1] = srf->y0;
-
-		for (i = 0; i < 9; i++) {
-			vec[0] = srf->x0;
-
-			for (j = 0; j < 9; j++) {
-				vec[2] = srf->z0 + (srf->heightmap[0] << 1);
-				added |= R_DlightSample(src, vec, dst);
-
-				src += 3;
-				dst += 4;
-				vec[0] += srf->drawinfo.lmapStep;
-			}
-
-			src += (LIGHTMAP_SIZE - 9) * 3;
-			dst += (LIGHTMAP_SIZE - 9) * 4;
-			vec[1] += srf->drawinfo.lmapStep;
-		}
-	} else if (lumelsPerHeight == 2) {
-		vec[1] = srf->y0;
-
-		k = 0;
-
-		for (j = 0; j < 8; j++) {
-			vec[0] = srf->x0;
-
-			for (i = 0; i < 8; i++) {
-				z00 = srf->heightmap[k];
-				vec[2] = srf->z0 + z00 + z00;
-				added |= R_DlightSample(src, vec, dst);
-				// increase lightmap step
-				vec[0] += srf->drawinfo.lmapStep;
-
-				z01 = srf->heightmap[k];
-                vec[2] = srf->z0 + z00 + z01;
-                added |= R_DlightSample(src, vec, dst);
-
-                vec[0] += srf->drawinfo.lmapStep;
-			}
-
-            vec[2] = srf->z0 + z01 + z01;
-            added |= R_DlightSample(src, vec, dst);
-			src += (LIGHTMAP_SIZE - 16) * 3;
-			dst += (LIGHTMAP_SIZE - 16) * 4;
-			k -= 8;
-
-			vec[0] = srf->x0;
-			vec[1] += srf->drawinfo.lmapStep;
-
-			for (i = 0; i < 8; i++) {
-				z00 = srf->heightmap[k] + srf->heightmap[k + 9];
-				vec[2] = srf->z0 + z00;
-
-				added |= R_DlightSample(src, vec, dst);
-				k++;
-
-				vec[0] += srf->drawinfo.lmapStep;
-
-				z01 = srf->heightmap[k] + srf->heightmap[k + 9];
-                vec[2] = srf->z0 + (z00 + z01) * 0.5f;
-
-                added |= R_DlightSample(src, vec, dst);
-
-				src += 3;
-				dst += 4;
-				vec[0] += srf->drawinfo.lmapStep;
-			}
-		}
-
-		vec[0] = srf->x0;
-
-		for (i = 0; i < 7; i++) {
-			z00 = srf->heightmap[k];
-			vec[2] = srf->z0 + z00 + z00;
-
-			k++;
-			added |= R_DlightSample(src, vec, dst);
-			vec[0] += srf->drawinfo.lmapStep;
-
-			z01 = srf->heightmap[k];
-            vec[2] = srf->z0; z00 + z01;
-            added |= R_DlightSample(src, vec, dst);
-
-			src += 3;
-            dst += 4;
-            vec[0] += srf->drawinfo.lmapStep;
-		}
-
-        vec[2] = srf->z0 + z01 + z01;
-        added |= R_DlightSample(src, vec, dst);
-        vec[0] += srf->drawinfo.lmapStep;
-		vec[1] += srf->drawinfo.lmapStep;
-	}
-	else
-	{
-		vec[1] = srf->y0;
-
-		for (j = 0; j < 8; j++) {
-			dj = 0;
-
-			for (;;) {
-				if (j == 7) {
-					if (dj >= lumelsPerHeight + 1) {
-						break;
-					}
-				} else if (dj >= lumelsPerHeight) {
-					break;
-				}
-
-				vec[0] = srf->x0;
-
-				for (i = 0; i < 8; i++) {
-					for (;;) {
-                        if (i == 7) {
-                            if (di >= lumelsPerHeight + 1) {
-                                break;
-                            }
-                        } else if (dj >= lumelsPerHeight) {
-                            break;
-                        }
-						
-						di = 0;
-						z00 = srf->heightmap[9 * j + i];
-                        z01 = srf->heightmap[9 * (j + 1) + i];
-                        z10 = srf->heightmap[9 * j + (i + 1)];
-                        z11 = srf->heightmap[9 * (j + 1) + (i + 1)];
-
-						heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
-					
-						vec[2] = srf->z0 + (dj * (di * z11)
-							+ (lumelsPerHeight - dj) * (z10 * di)
-							+ z01 * (lumelsPerHeight - di) * dj
-							+ z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
-							* heightPerLumelSquared;
-
-                        added |= R_DlightSample(src, vec, dst);
-                        src += 3;
-                        dst += 4;
-
-						vec[0] += srf->drawinfo.lmapStep;
-					}
-				}
-
-                src += 3 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
-				dst += 4 * (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight));
-				vec[1] += srf->drawinfo.lmapStep;
-			}
-		}
-	}
-
-    if (!added) {
-        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
-        return 0;
-	}
-
-	for (i = 0; i < srf->drawinfo.lmapSize; i++) {
-		dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
-	}
-
-	lmScale = (1.f / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
-	srf->drawinfo.lmapX -= (srf->x0 * lmScale - (LIGHTMAP_SIZE * 2.f));
-	srf->drawinfo.lmapY -= (srf->y0 * lmScale - (LIGHTMAP_SIZE * 2.f));
-
-	srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
-    return srf->drawinfo.dlightMap[tr.smpFrame];
-}
-
-/*
-===============
-R_TransformDlights
-
-Transforms the origins of an array of dlights.
-Used by both the front end (for DlightBmodel) and
-the back end (before doing the lighting calculation)
-===============
-*/
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori) {
-	int		i;
-	vec3_t	temp;
-
-	for ( i = 0 ; i < count ; i++, dl++ ) {
-		VectorSubtract( dl->origin, ori->origin, temp );
-		dl->transformed[0] = DotProduct( temp, ori->axis[0] );
-		dl->transformed[1] = DotProduct( temp, ori->axis[1] );
-		dl->transformed[2] = DotProduct( temp, ori->axis[2] );
-	}
-}
-
-/*
-=============
-R_DlightBmodel
-
-Determine which dynamic lights may effect this bmodel
-=============
-*/
-void R_DlightBmodel( bmodel_t *bmodel ) {
-	int			i, j;
-	dlight_t	*dl;
-	int			mask;
-	msurface_t	*surf;
-
-	// transform all the lights
-	R_TransformDlights( tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori );
-
-	mask = 0;
-	for ( i=0 ; i<tr.refdef.num_dlights ; i++ ) {
-		dl = &tr.refdef.dlights[i];
-
-		// see if the point is close enough to the bounds to matter
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( dl->transformed[j] - bmodel->bounds[1][j] > dl->radius ) {
-				break;
-			}
-			if ( bmodel->bounds[0][j] - dl->transformed[j] > dl->radius ) {
-				break;
-			}
-		}
-		if ( j < 3 ) {
-			continue;
-		}
-
-		// we need to check this light
-		mask |= 1 << i;
-	}
-
-	tr.currentEntity->needDlights = (mask != 0);
-
-	// set the dlight bits in all the surfaces
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		surf = bmodel->firstSurface + i;
-
-		if ( *surf->data == SF_FACE ) {
-			((srfSurfaceFace_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		} else if ( *surf->data == SF_GRID ) {
-			((srfGridMesh_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		} else if ( *surf->data == SF_TRIANGLES ) {
-			((srfTriangles_t *)surf->data)->dlightBits[ tr.smpFrame ] = mask;
-		}
-	}
-}
-
-static byte* R_GetLightGridPalettedColor(int iColor)
-{
-	return &tr.world->lightGridPalette[iColor * 3];
-}
-
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
-{
-	byte* pColor;
-	int iBaseOffset;
-	int i;
-	int iOffset;
-	int iRowPos;
-	int iData;
-	int iLen;
-	int iGridPos[3];
-	int iArrayXStep;
-	float fV;
-	float fFrac[3];
-	float fOMFrac[3];
-	float fWeight, fWeight2;
-	float fTotalFactor;
-	vec3_t vLightOrigin;
-	byte* pCurData;
-
-	if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-		return;
-	}
-
-	VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
-
-	for (i = 0; i < 3; i++) {
-		fV = vLightOrigin[i] * tr.world->lightGridOOSize[i];
-		iGridPos[i] = myftol(fV);
-		fFrac[i] = fV - iGridPos[i];
-		fOMFrac[i] = 1.0 - fFrac[i];
-
-		if (iGridPos[i] < 0) {
-			iGridPos[i] = 0;
-		} else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
-			iGridPos[i] = tr.world->lightGridBounds[i] - 2;
-		}
-	}
-
-	fTotalFactor = 0;
-	iArrayXStep = tr.world->lightGridBounds[1];
-	iBaseOffset = tr.world->lightGridBounds[0] + iGridPos[0] * iArrayXStep + iGridPos[1];
-	vLight[0] = vLight[1] = vLight[2] = 0;
-
-	for (i = 0; i < 4; i++) {
-		switch (i)
-		{
-        case 0:
-			fWeight = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
-			fWeight2 = fWeight;
-			iOffset = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
-            break;
-        case 1:
-            fWeight = fFrac[0] * fFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-			iOffset = tr.world->lightGridOffsets[iArrayXStep + 1 + iBaseOffset];
-            break;
-        case 2:
-            fWeight = fFrac[0] * fOMFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iArrayXStep + iBaseOffset];
-            break;
-		case 3:
-            fWeight = fFrac[0] * fFrac[1] * fOMFrac[2];
-            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
-            iOffset = tr.world->lightGridOffsets[iArrayXStep + 1 + iBaseOffset];
-			break;
-		}
-
-		iRowPos = iGridPos[2];
-		pCurData = &tr.world->lightGridData[iOffset];
-		iData = 0;
-
-		while (1)
-		{
-			while (1)
-			{
-				if (pCurData[iData] >= 0ul) {
-					break;
-				}
-
-				iLen = -pCurData[iData];
-				if (iLen > iRowPos) {
-					iData += iRowPos;
-					if (pCurData[iData]) {
-						pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-						VectorMA(vLight, fWeight, pColor, vLight);
-						fTotalFactor += fWeight;
-					}
-
-					iData++;
-					if (iLen - 1 == iRowPos) {
-						iData++;
-					}
-
-					if (pCurData[iData]) {
-						pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-						VectorMA(vLight, fWeight2, pColor, vLight);
-					}
-
-					goto cont;
-				}
-
-                iRowPos -= iLen;
-                iData += iLen + 1;
-			}
-
-			iLen = pCurData[iData] + 2;
-			if (iLen - 1 >= iRowPos) {
-				break;
-			}
-
-			iRowPos -= iLen;
-			iData++;
-		}
-
-		if (iLen - 1 > iRowPos) {
-			if (!pCurData[iData]) {
-				continue;
-			}
-
-			pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-			VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
-			fTotalFactor += fWeight + fWeight2;
-		} else {
-            if (pCurData[iData]) {
-                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                VectorMA(vLight, fWeight, pColor, vLight);
-                fTotalFactor += fWeight;
-            }
-
-			iData += 2;
-            if (pCurData[iData]) {
-				pColor = R_GetLightGridPalettedColor(pCurData[iData]);
-                VectorMA(vLight, fWeight2, pColor, vLight);
-                fTotalFactor += fWeight2;
-            }
-		}
-
-	cont:
-		;
-	}
-
-	if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
-		VectorScale(vLight, 1.0 / fTotalFactor, vLight);
-	}
-
-	if (fTotalFactor) {
-		if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
-            float t;
-            // normalize color values
-            t = 255.0 / (float)Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
-
-            vLight[0] = (float)vLight[0] * t;
-            vLight[1] = (float)vLight[1] * t;
-            vLight[2] = (float)vLight[2] * t;
-		}
-	} else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-	}
-}
-
-void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
-{
-    if (!tr.world->lightGridData || !tr.world->lightGridOffsets) {
-        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-        return;
-    }
-
-    // FIXME: unimplemented
-    vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
-}
-
-void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-    VectorSet(vLight, 1.f, 1.f, 1.f);
-}
-
-void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-	VectorSet(vLight, 1.f, 1.f, 1.f);
-}
-
-static int RB_GetEntityGridLighting()
-{
-	int iColor;
-	int i;
-	dlight_t* dl;
-	float power;
-	vec3_t vLight;
-	vec3_t dir;
-	float d;
-	float* lightOrigin;
-
-	lightOrigin = backEnd.currentSphere->traceOrigin;
-	if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-		R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
-	} else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-	}
-
-	for (i = 0; i < backEnd.refdef.num_dlights; i++) {
-		dl = &backEnd.refdef.dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorLengthSquared(dir);
-
-		power = dl->radius * dl->radius;
-		if (power >= d) {
-			d = dl->radius * 7500.0 / d;
-			VectorMA(vLight, d, dl->color, vLight);
-		}
-	}
-
-	if (tr.overbrightShift)
-	{
-		vLight[0] = tr.overbrightMult * vLight[0];
-		vLight[1] = tr.overbrightMult * vLight[1];
-		vLight[2] = tr.overbrightMult * vLight[2];
-	}
-
-	// normalize
-	if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
-		float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
-		VectorScale(vLight, scale, vLight);
-	}
-
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (vLight[i] > tr.identityLightByte) {
-			vLight[i] = tr.identityLightByte;
-		}
-	}
-
-	// save out the byte packet version
-	((byte*)&iColor)[0] = myftol(vLight[0]);
-	((byte*)&iColor)[1] = myftol(vLight[1]);
-	((byte*)&iColor)[2] = myftol(vLight[2]);
-	((byte*)&iColor)[3] = 0xff;
-
-	return iColor;
-
-#if 0
-	int				i;
-	dlight_t* dl;
-	float			power;
-	vec3_t			dir;
-	float			d;
-	vec3_t			lightDir;
-	vec3_t			lightOrigin;
-	int				ambientlightInt = 0;
-	trRefEntity_t	*ent = backEnd.currentEntity;
-	trRefdef_t		*refdef = &backEnd.refdef;
-
-	//
-	// trace a sample point down to find ambient light
-	//
-	if (ent->e.renderfx & RF_LIGHTING_ORIGIN) {
-		// seperate lightOrigins are needed so an object that is
-		// sinking into the ground can still be lit, and so
-		// multi-part models can be lit identically
-		VectorCopy(ent->e.lightingOrigin, lightOrigin);
-	}
-	else {
-		VectorCopy(ent->e.origin, lightOrigin);
-	}
-
-	// if NOWORLDMODEL, only use dynamic lights (menu system, etc)
-	if (!(refdef->rdflags & RDF_NOWORLDMODEL)
-		&& tr.world->lightGridData) {
-		R_SetupEntityLightingGrid(ent);
-	}
-	else {
-		ent->ambientLight[0] = ent->ambientLight[1] =
-			ent->ambientLight[2] = tr.identityLight * 150;
-		ent->directedLight[0] = ent->directedLight[1] =
-			ent->directedLight[2] = tr.identityLight * 150;
-		VectorCopy(tr.sunDirection, ent->lightDir);
-	}
-
-	// bonus items and view weapons have a fixed minimum add
-	if (1 /* ent->e.renderfx & RF_MINLIGHT */) {
-		// give everything a minimum light add
-		ent->ambientLight[0] += tr.identityLight * 32;
-		ent->ambientLight[1] += tr.identityLight * 32;
-		ent->ambientLight[2] += tr.identityLight * 32;
-	}
-
-	//
-	// modify the light by dynamic lights
-	//
-	d = VectorLength(ent->directedLight);
-	VectorScale(ent->lightDir, d, lightDir);
-
-	for (i = 0; i < refdef->num_dlights; i++) {
-		dl = &refdef->dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorNormalize(dir);
-
-		power = DLIGHT_AT_RADIUS * (dl->radius * dl->radius);
-		if (d < DLIGHT_MINIMUM_RADIUS) {
-			d = DLIGHT_MINIMUM_RADIUS;
-		}
-		d = power / (d * d);
-
-		VectorMA(ent->directedLight, d, dl->color, ent->directedLight);
-		VectorMA(lightDir, d, dir, lightDir);
-	}
-
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (ent->ambientLight[i] > tr.identityLightByte) {
-			ent->ambientLight[i] = tr.identityLightByte;
-		}
-	}
-
-	// save out the byte packet version
-	((byte*)&ambientlightInt)[0] = myftol(ent->ambientLight[0]);
-	((byte*)&ambientlightInt)[1] = myftol(ent->ambientLight[1]);
-	((byte*)&ambientlightInt)[2] = myftol(ent->ambientLight[2]);
-	((byte*)&ambientlightInt)[3] = 0xff;
-
-	// transform the direction to local space
-	VectorNormalize(lightDir);
-	ent->lightDir[0] = DotProduct(lightDir, ent->e.axis[0]);
-	ent->lightDir[1] = DotProduct(lightDir, ent->e.axis[1]);
-	ent->lightDir[2] = DotProduct(lightDir, ent->e.axis[2]);
-
-	return ambientlightInt;
-#endif
-	// FIXME: unimplemented
-}
-
-void RB_SetupEntityGridLighting()
-{
-	trRefEntity_t* ent;
-	int iColor;
-
-	if (backEnd.currentEntity->bLightGridCalculated) {
-		return;
-	}
-
-	for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE; ent = &backEnd.refdef.entities[ent->e.parentEntity])
-	{
-		trRefEntity_t* newref = &backEnd.refdef.entities[ent->e.parentEntity];
-		if (newref == ent) {
-			assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-			iColor = newref->iGridLighting;
-			break;
-		}
-
-		if (newref->bLightGridCalculated) {
-			iColor = newref->iGridLighting;
-			break;
-		}
-	}
-
-	if (ent->e.parentEntity == ENTITYNUM_NONE) {
-		iColor = RB_GetEntityGridLighting();
-	}
-
-	ent = backEnd.currentEntity;
-	for (;;)
-	{
-		ent->bLightGridCalculated = 1;
-		ent->iGridLighting = iColor;
-		if (ent->e.parentEntity == ENTITYNUM_NONE) {
-			break;
-		}
-
-		if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
-			assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
-			break;
-		}
-
-		ent = &backEnd.refdef.entities[ent->e.parentEntity];
-	}
-}
-
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin)
-{
-	int iColor;
-	int i;
-	dlight_t* dl;
-	float power;
-	vec3_t vLight;
-	vec3_t dir;
-	float d;
-
-	if (ent->bLightGridCalculated) {
-		return;
-	}
-	ent->bLightGridCalculated = qtrue;
-
-	if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
-		R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
-	}
-	else {
-		vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
-	}
-
-	for (i = 0; i < refdef->num_dlights; i++) {
-		dl = &refdef->dlights[i];
-		VectorSubtract(dl->origin, lightOrigin, dir);
-		d = VectorLengthSquared(dir);
-
-		power = dl->radius * dl->radius;
-		if (power >= d) {
-			d = dl->radius * 7500.0 / d;
-			VectorMA(vLight, d, dl->color, vLight);
-		}
-	}
-
-	if (tr.overbrightShift)
-	{
-		vLight[0] = tr.overbrightMult * vLight[0];
-		vLight[1] = tr.overbrightMult * vLight[1];
-		vLight[2] = tr.overbrightMult * vLight[2];
-	}
-
-	// normalize
-	if (vLight[0] < 255.0 || vLight[1] < 255.0 || vLight[2] < 255.0) {
-		float scale = 255.0 / fmin(vLight[0], fmin(vLight[1], vLight[2]));
-		VectorScale(vLight, scale, vLight);
-	}
-
-	// clamp ambient
-	for (i = 0; i < 3; i++) {
-		if (vLight[i] > tr.identityLightByte) {
-			vLight[i] = tr.identityLightByte;
-		}
-	}
-
-	// save out the byte packet version
-	((byte*)&ent->iGridLighting)[0] = myftol(vLight[0]);
-	((byte*)&ent->iGridLighting)[1] = myftol(vLight[1]);
-	((byte*)&ent->iGridLighting)[2] = myftol(vLight[2]);
-	((byte*)&ent->iGridLighting)[3] = 0xff;
-}
-
-/*
-=============================================================================
-
-LIGHT SAMPLING
-
-=============================================================================
-*/
-
-extern	cvar_t	*r_ambientScale;
-extern	cvar_t	*r_directedScale;
-
-/*
-===============
-LogLight
-===============
-*/
-static void LogLight( trRefEntity_t *ent ) {
-	int	max1, max2;
-
-	if ( !(ent->e.renderfx & RF_FIRST_PERSON ) ) {
-		return;
-	}
-
-	max1 = ent->ambientLight[0];
-	if ( ent->ambientLight[1] > max1 ) {
-		max1 = ent->ambientLight[1];
-	} else if ( ent->ambientLight[2] > max1 ) {
-		max1 = ent->ambientLight[2];
-	}
-
-	max2 = ent->directedLight[0];
-	if ( ent->directedLight[1] > max2 ) {
-		max2 = ent->directedLight[1];
-	} else if ( ent->directedLight[2] > max2 ) {
-		max2 = ent->directedLight[2];
-	}
-
-	ri.Printf( PRINT_ALL, "amb:%i  dir:%i\n", max1, max2 );
-}
-
-void R_ClearRealDlights() {
-	memset(dli.allocated, 0, sizeof(dli.allocated));
-	dli.dlightMap = 0;
-}
-
-void R_UploadDlights() {
-	int i, h;
-
-	if (!tr.pc.c_dlightSurfaces) {
-		return;
-	}
-
-	h = 0;
-	for (i = 0; i < LIGHTMAP_SIZE; i++)
-	{
-		if (h < dli.allocated[i]) {
-			h = dli.allocated[i];
-		}
-	}
-
-	if (h)
-	{
-		if (h > LIGHTMAP_SIZE) {
-			ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
-		}
-
-		GL_Bind(tr.dlightImages[dli.dlightMap]);
-		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
-
-		tr.pc.c_dlightMaps++;
-		memset(dli.allocated, 0, sizeof(dli.allocated));
-	}
-}
-
-qboolean R_AllocLMBlock(int w, int h, int* x, int* y) {
-	int i, j;
-	int best, best2;
-
-	for (;;)
-	{
-		best = LIGHTMAP_SIZE;
-		for (i = 0; i < LIGHTMAP_SIZE - w; i++)
-		{
-			best2 = 0;
-
-			for (j = 0; j < w && dli.allocated[i] < best; j++)
-			{
-				if (best2 < dli.allocated[i]) {
-					best2 = dli.allocated[i];
-				}
-			}
-
-			if (j == w)
-			{
-				*x = i;
-				*y = best2;
-				best = best2;
-			}
-		}
-
-		if (h + best <= LIGHTMAP_SIZE) {
-			break;
-		}
-
-		if (dli.dlightMap == 14) {
-			return qfalse;
-		}
-
-		R_UploadDlights();
-		dli.dlightMap++;
-	}
-
-	return qtrue;
-}
-
-qboolean R_DlightSample(byte* src, const vec3_t vec, byte* dst) {
-	int r, g, b;
-	int k;
-	qboolean added;
-	vec3_t dir;
-	float add;
-
-	added = qfalse;
-	r = src[0];
-	g = src[1];
-	b = src[2];
-
-	for (k = 0; k < dli.numLights; k++) {
-		incidentLight_t* light = &dli.lights[k];
-
-		VectorSubtract(vec, light->origin, dir);
-		add = VectorLength(dir) * light->power;
-		if (add <= 1.f) {
-			float t = (1.0 - add) * (1.0 - add) * 375.0;
-
-			r = (int)(t * light->dl->color[0] + (float)r);
-			g = (int)(t * light->dl->color[1] + (float)g);
-			b = (int)(t * light->dl->color[2] + (float)b);
-			// light was added
-			added = qtrue;
-		}
-    }
-
-	if (tr.overbrightShift) {
-		r <<= tr.overbrightShift & 0xFF;
-		g <<= tr.overbrightShift & 0xFF;
-		b <<= tr.overbrightShift & 0xFF;
-	}
-
-	if (r > 0xFF || g > 0xFF || b > 0xFF) {
-        float t;
-		// normalize color values
-        t = 255.0 / (float)Q_max(r, Q_max(g, b));
-
-        r = (int)((float)r * t);
-        g = (int)((float)g * t);
-        b = (int)((float)b * t);
-    }
-
-	dst[0] = (byte)r;
-	dst[1] = (byte)g;
-	dst[2] = (byte)b;
-	dst[3] = -1;
-
-	return added;
-}
diff --git a/code/renderer/tr_local.h b/code/renderer/tr_local.h
deleted file mode 100644
index 6ccac79f..00000000
--- a/code/renderer/tr_local.h
+++ /dev/null
@@ -1,2361 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qfiles.h"
-#include "../qcommon/qcommon.h"
-#include "tr_public.h"
-#include "../renderercommon/qgl.h"
-#include "qgl.h"
-
-#ifdef __cplusplus
-#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
-#else
-#define GLE(ret, name, ...) extern name##proc * qgl##name;
-#endif
-
-QGL_1_1_PROCS;
-QGL_1_1_FIXED_FUNCTION_PROCS;
-QGL_DESKTOP_1_1_PROCS;
-QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
-QGL_3_0_PROCS;
-
-#undef GLE
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define GL_INDEX_TYPE		GL_UNSIGNED_INT
-typedef unsigned int glIndex_t;
-
-// fast float to int conversion
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
-long myftol( float f );
-#else
-#define	myftol(x) ((int)(x))
-#endif
-
-
-// everything that is needed by the backend needs
-// to be double buffered to allow it to run in
-// parallel on a dual cpu machine
-#define	SMP_FRAMES		2
-
-// 12 bits
-// see QSORT_SHADERNUM_SHIFT
-#define	MAX_SHADERS				16384
-
-//#define MAX_SHADER_STATES 2048
-#define MAX_STATES_PER_SHADER 32
-#define MAX_STATE_NAME 32
-
-// can't be increased without changing bit packing for drawsurfs
-
-typedef struct skelSurfaceGame_s skelSurfaceGame_t;
-typedef struct staticSurface_s staticSurface_t;
-
-// any changes in surfaceType must be mirrored in rb_surfaceTable[]
-typedef enum {
-    SF_BAD,
-    SF_SKIP,				// ignore
-    SF_FACE,
-    SF_GRID,
-    SF_POLY,
-    SF_MARK_FRAG,
-    SF_FLARE,
-    SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
-    SF_DISPLAY_LIST,
-    SF_TIKI_SKEL,
-    SF_TIKI_STATIC,
-    SF_SWIPE,
-    SF_SPRITE,
-    SF_TERRAIN_PATCH,
-    SF_TRIANGLES,
-    SF_MD3,
-    SF_MD4,
-
-    SF_NUM_SURFACE_TYPES,
-    SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
-} surfaceType_t;
-
-typedef struct {
-    struct mnode_s* cntNode;
-    qboolean inUse;
-    struct msurface_s* skySurfs[32];
-    int numSurfs;
-    vec3_t offset;
-    vec3_t mins;
-    vec3_t maxs;
-} portalsky_t;
-
-typedef struct {
-    vec3_t transformed;
-    int index;
-} sphere_dlight_t;
-
-typedef enum {
-    LIGHT_POINT,
-    LIGHT_DIRECTIONAL,
-    LIGHT_SPOT,
-    LIGHT_SPOT_FAST
-} lighttype_t;
-
-typedef struct reallightinfo_s {
-    vec3_t color;
-    lighttype_t eType;
-    float fIntensity;
-    float fDist;
-    float fSpotSlope;
-    float fSpotConst;
-    float fSpotScale;
-    vec3_t vOrigin;
-    vec3_t vDirection;
-} reallightinfo_t;
-
-typedef float cube_entry_t[3][4];
-
-typedef struct {
-    vec3_t origin;
-    vec3_t worldOrigin;
-    vec3_t traceOrigin;
-    float radius;
-    struct mnode_s* leaves[8];
-    void(*TessFunction) (unsigned char* dstColors);
-    union {
-        unsigned char level[4];
-        int value;
-    } ambient;
-    int numRealLights;
-    reallightinfo_t light[MAX_REAL_LIGHTS];
-    int bUsesCubeMap;
-    float cubemap[24][3][4];
-} sphereor_t;
-
-typedef struct spherel_s {
-    vec3_t origin;
-	vec3_t color;
-    float intensity;
-    struct mnode_s* leaf;
-    int needs_trace;
-    int spot_light;
-    float spot_radiusbydistance;
-	vec3_t spot_dir;
-    int reference_count;
-} spherel_t;
-
-typedef struct dlight_s {
-	vec3_t	origin;
-	vec3_t	color;				// range from 0.0 to 1.0, should be color normalized
-	float	radius;
-
-	dlighttype_t type;
-	vec3_t	transformed;		// origin in local coordinate system
-} dlight_t;
-
-
-// a trRefEntity_t has all the information passed in by
-// the client game, as well as some locally derived info
-typedef struct {
-	refEntity_t	e;
-
-	float		axisLength;		// compensate for non-normalized axis
-
-	qboolean	needDlights;	// true for bmodels that touch a dlight
-	qboolean	bLightGridCalculated;
-	int			iGridLighting;
-	float		lodpercentage[2];
-	qboolean	sphereCalculated;
-	int			lightingSphere;
-
-	//
-	// old lighting variables
-	//
-	vec3_t		lightDir;		// normalized direction towards light
-	vec3_t		ambientLight;	// color normalized to 0-255
-	int			ambientLightInt;	// 32 bit rgba packed
-	vec3_t		directedLight;
-} trRefEntity_t;
-
-typedef struct refSprite_s {
-    surfaceType_t surftype;
-    int hModel;
-    int shaderNum;
-    float origin[3];
-    float scale;
-    float axis[3][3];
-    unsigned char shaderRGBA[4];
-    int renderfx;
-    float shaderTime;
-} refSprite_t;
-
-typedef struct {
-	vec3_t		origin;			// in world coordinates
-	vec3_t		axis[3];		// orientation in world
-	vec3_t		viewOrigin;		// viewParms->or.origin in local coordinates
-	float		modelMatrix[16];
-} orientationr_t;
-
-typedef struct image_s {
-	char		imgName[MAX_QPATH];		// game path, including extension
-	int			width, height;				// source image
-	int			uploadWidth, uploadHeight;	// after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
-	GLuint		texnum;					// gl texture binding
-
-	int			frameUsed;			// for texture usage in frame statistics
-	int			bytesUsed;
-
-	int			internalFormat;
-	int			TMU;				// only needed for voodoo2
-	int			numMipmaps;
-
-	qboolean	dynamicallyUpdated;
-	qboolean	allowPicmip;
-	qboolean	force32bit;
-    int			wrapClampModeX;
-    int			wrapClampModeY;
-	int			r_sequence;
-	int			UseCount;
-
-	struct image_s*	next;
-} image_t;
-
-//===============================================================================
-
-typedef enum {
-	SS_BAD,
-	SS_PORTAL,			// mirrors, portals, viewscreens
-	SS_PORTALSKY,
-	SS_ENVIRONMENT,		// sky box
-	SS_OPAQUE,			// opaque
-
-	SS_DECAL,			// scorch marks, etc.
-	SS_SEE_THROUGH,		// ladders, grates, grills that may have small blended edges
-						// in addition to alpha test
-	SS_BANNER,
-
-	SS_UNDERWATER,		// for items that should be drawn in front of the water plane
-
-	SS_BLEND0,			// regular transparency and filters
-	SS_BLEND1,			// generally only used for additive type effects
-	SS_BLEND2,
-	SS_BLEND3,
-
-	SS_BLEND6,
-	SS_STENCIL_SHADOW,
-	SS_ALMOST_NEAREST,	// gun smoke puffs
-
-	SS_NEAREST			// blood blobs
-} shaderSort_t;
-
-
-#define MAX_SHADER_STAGES 8
-
-typedef enum {
-	GF_NONE,
-
-	GF_SIN,
-	GF_SQUARE,
-	GF_TRIANGLE,
-	GF_SAWTOOTH, 
-	GF_INVERSE_SAWTOOTH, 
-
-	GF_NOISE
-
-} genFunc_t;
-
-typedef enum {
-	USE_S_COORDS,
-	USE_T_COORDS
-} texDirection_t;
-
-typedef enum {
-	DEFORM_NONE,
-	DEFORM_WAVE,
-	DEFORM_NORMALS,
-	DEFORM_BULGE,
-	DEFORM_MOVE,
-	DEFORM_AUTOSPRITE,
-	DEFORM_AUTOSPRITE2,
-	DEFORM_LIGHTGLOW,
-	DEFORM_FLAP_S,
-	DEFORM_FLAP_T
-} deform_t;
-
-typedef enum {
-	AGEN_IDENTITY,
-	AGEN_SKIP,
-	AGEN_ENTITY,
-	AGEN_ONE_MINUS_ENTITY,
-	AGEN_VERTEX,
-	AGEN_ONE_MINUS_VERTEX,
-	AGEN_LIGHTING_SPECULAR,
-	AGEN_WAVEFORM,
-	AGEN_PORTAL,
-	AGEN_NOISE,
-	AGEN_DOT,
-	AGEN_ONE_MINUS_DOT,
-	AGEN_CONSTANT,
-	AGEN_GLOBAL_ALPHA,
-	AGEN_SKYALPHA,
-	AGEN_ONE_MINUS_SKYALPHA,
-	AGEN_SCOORD,
-	AGEN_TCOORD,
-	AGEN_DIST_FADE,
-    AGEN_ONE_MINUS_DIST_FADE,
-    AGEN_TIKI_DIST_FADE,
-    AGEN_ONE_MINUS_TIKI_DIST_FADE,
-	AGEN_DOT_VIEW,
-	AGEN_ONE_MINUS_DOT_VIEW,
-	AGEN_HEIGHT_FADE,
-} alphaGen_t;
-
-typedef enum {
-	CGEN_BAD,
-	CGEN_IDENTITY_LIGHTING,	// tr.identityLight
-	CGEN_IDENTITY,			// always (1,1,1,1)
-	CGEN_ENTITY,			// grabbed from entity's modulate field
-	CGEN_ONE_MINUS_ENTITY,	// grabbed from 1 - entity.modulate
-	CGEN_EXACT_VERTEX,		// tess.vertexColors
-	CGEN_VERTEX,			// tess.vertexColors * tr.identityLight
-	CGEN_ONE_MINUS_VERTEX,
-	CGEN_WAVEFORM,			// programmatically generated
-	CGEN_MULTIPLY_BY_WAVEFORM,
-	CGEN_LIGHTING_GRID,
-	CGEN_LIGHTING_SPHERICAL,
-	CGEN_CONSTANT,
-	CGEN_NOISE,
-	CGEN_GLOBAL_COLOR,
-	CGEN_STATIC,
-	CGEN_SCOORD,
-	CGEN_TCOORD,
-	CGEN_DOT,
-	CGEN_ONE_MINUS_DOT
-} colorGen_t;
-
-typedef enum {
-	TCGEN_BAD,
-	TCGEN_IDENTITY,			// clear to 0,0
-	TCGEN_LIGHTMAP,
-	TCGEN_TEXTURE,
-	TCGEN_ENVIRONMENT_MAPPED,
-	TCGEN_VECTOR,			// S and T from world coordinates
-	TCGEN_ENVIRONMENT_MAPPED2,
-	TCGEN_SUN_REFLECTION,
-	TCGEN_FOG
-} texCoordGen_t;
-
-typedef enum {
-	ACFF_NONE,
-	ACFF_MODULATE_RGB,
-	ACFF_MODULATE_RGBA,
-	ACFF_MODULATE_ALPHA
-} acff_t;
-
-typedef struct {
-	genFunc_t	func;
-
-	float base;
-	float amplitude;
-	float phase;
-	float frequency;
-} waveForm_t;
-
-#define TR_MAX_TEXMODS 4
-
-typedef enum {
-	TMOD_NONE,
-	TMOD_TRANSFORM,
-	TMOD_TURBULENT,
-	TMOD_SCROLL,
-	TMOD_SCALE,
-	TMOD_STRETCH,
-	TMOD_ROTATE,
-	TMOD_ENTITY_TRANSLATE
-} texMod_t;
-
-#define	MAX_SHADER_DEFORMS	3
-typedef struct {
-	deform_t	deformation;			// vertex coordinate modification type
-
-	vec3_t		moveVector;
-	waveForm_t	deformationWave;
-	float		deformationSpread;
-
-	float		bulgeWidth;
-	float		bulgeHeight;
-	float		bulgeSpeed;
-} deformStage_t;
-
-
-typedef struct {
-	texMod_t		type;
-
-	// used for TMOD_TURBULENT and TMOD_STRETCH
-	waveForm_t		wave;
-
-	// used for TMOD_TRANSFORM
-	float			matrix[2][2];		// s' = s * m[0][0] + t * m[1][0] + trans[0]
-	float			translate[2];		// t' = s * m[0][1] + t * m[0][1] + trans[1]
-
-	// used for TMOD_SCALE
-	float			scale[2];			// s *= scale[0]
-	                                    // t *= scale[1]
-
-	// used for TMOD_SCROLL
-	float			scroll[2];			// s' = s + scroll[0] * time
-										// t' = t + scroll[1] * time
-
-	// + = clockwise
-	// - = counterclockwise
-	float			rotateSpeed;
-
-} texModInfo_t;
-
-
-#define	MAX_IMAGE_ANIMATIONS	8
-#define BUNDLE_ANIMATE_ONCE		1
-
-typedef struct {
-	image_t			*image[MAX_IMAGE_ANIMATIONS];
-	int				numImageAnimations;
-	float			imageAnimationSpeed;
-	float			imageAnimationPhase;
-
-	texCoordGen_t	tcGen;
-	vec3_t			tcGenVectors[2];
-
-	int				numTexMods;
-	texModInfo_t	*texMods;
-
-	int				videoMapHandle;
-	qboolean		isLightmap;
-	qboolean		vertexLightmap;
-	qboolean		isVideoMap;
-	int				flags;
-} textureBundle_t;
-
-#define NUM_TEXTURE_BUNDLES 2
-
-typedef struct {
-	qboolean		active;
-	
-	textureBundle_t	bundle[NUM_TEXTURE_BUNDLES];
-	int				multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
-
-	waveForm_t		rgbWave;
-	colorGen_t		rgbGen;
-
-	waveForm_t		alphaWave;
-    alphaGen_t		alphaGen;
-
-    unsigned		stateBits;					// GLS_xxxx mask
-
-
-	qboolean		noMipMaps;
-    qboolean		noPicMip;
-    qboolean		force32bit;
-
-	float			alphaMin;
-	float			alphaMax;
-	vec3_t			specOrigin;
-
-    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
-	byte			alphaConst;
-	byte			alphaConstMin;
-} shaderStage_t;
-
-struct shaderCommands_s;
-
-#define LIGHTMAP_2D			-4		// shader is for 2D rendering
-#define LIGHTMAP_BY_VERTEX	-3		// pre-lit triangle models
-#define LIGHTMAP_WHITEIMAGE	-2
-#define	LIGHTMAP_NONE		-1
-
-typedef enum {
-	CT_FRONT_SIDED,
-	CT_BACK_SIDED,
-	CT_TWO_SIDED
-} cullType_t;
-
-typedef enum {
-	FP_NONE,		// surface is translucent and will just be adjusted properly
-	FP_EQUAL,		// surface is opaque but possibly alpha tested
-	FP_LE			// surface is trnaslucent, but still needs a fog pass (fog surface)
-} fogPass_t;
-
-typedef struct {
-	float		cloudHeight;
-	image_t		*outerbox[6], *innerbox[6];
-} skyParms_t;
-
-typedef enum {
-	SPRITE_PARALLEL,
-	SPRITE_PARALLEL_ORIENTED,
-	SPRITE_ORIENTED,
-	SPRITE_PARALLEL_UPRIGHT
-} spriteType_t;
-
-typedef struct {
-  spriteType_t type;
-  float scale;
-} spriteParms_t;
-
-typedef struct {
-	vec3_t	color;
-	float	depthForOpaque;
-} fogParms_t;
-
-
-typedef struct shader_s {
-	char		name[MAX_QPATH];		// game path, including extension
-	int			lightmapIndex;			// for a shader to match, both name and lightmapIndex must match
-
-	int			index;					// this shader == tr.shaders[index]
-	int			sortedIndex;			// this shader == tr.sortedShaders[sortedIndex]
-
-	float		sort;					// lower numbered shaders draw before higher numbered
-
-	qboolean	defaultShader;			// we want to return index 0 if the shader failed to
-										// load for some reason, but R_FindShader should
-										// still keep a name allocated for it, so if
-										// something calls RE_RegisterShader again with
-										// the same name, we don't try looking for it again
-
-	qboolean	explicitlyDefined;		// found in a .shader file
-
-	int			surfaceFlags;			// if explicitlyDefined, this will have SURF_* flags
-	int			contentFlags;
-
-	qboolean	entityMergable;			// merge across entites optimizable (smoke, blood)
-
-	qboolean	isSky;
-	skyParms_t	sky;
-	spriteParms_t sprite;
-	qboolean	isPortalSky;
-	float subdivisions;
-	float fDistRange;
-	float fDistNear;
-	fogParms_t	fogParms;
-
-	float		portalRange;			// distance to fog out at
-
-	cullType_t	cullType;				// CT_FRONT_SIDED, CT_BACK_SIDED, or CT_TWO_SIDED
-	qboolean	polygonOffset;			// set for decals and other items that must be offset 
-	qboolean	noMipMaps;				// for console fonts, 2D elements, etc.
-	qboolean	noPicMip;				// for images that must always be full resolution
-
-	fogPass_t	fogPass;				// draw a blended pass, possibly with depth test equals
-
-	qboolean	needsNormal;			// not all shaders will need all data to be gathered
-	qboolean	needsST1;
-	qboolean	needsST2;
-	qboolean	needsColor;
-
-	int			numDeforms;
-	deformStage_t	deforms[MAX_SHADER_DEFORMS];
-
-	int			numUnfoggedPasses;
-	shaderStage_t	* unfoggedStages[MAX_SHADER_STAGES];
-
-	int			needsLGrid;
-	int			needsLSpherical;
-	int			stagesWithAlphaFog;
-	int			flags;
-
-	void		(*optimalStageIteratorFunc)( void );
-
-  float clampTime;                                  // time this shader is clamped to
-  float timeOffset;                                 // current time offset for this shader
-
-  int numStates;                                    // if non-zero this is a state shader
-  struct shader_s *currentShader;                   // current state if this is a state shader
-  struct shader_s *parentShader;                    // current state if this is a state shader
-  int currentState;                                 // current state index for cycle purposes
-  long expireTime;                                  // time in milliseconds this expires
-
-  struct shader_s *remappedShader;                  // current shader this one is remapped too
-
-  int shaderStates[MAX_STATES_PER_SHADER];          // index to valid shader states
-
-	struct	shader_s	*next;
-} shader_t;
-
-typedef struct shaderState_s {
-  char shaderName[MAX_QPATH];     // name of shader this state belongs to
-  char name[MAX_STATE_NAME];      // name of this state
-  char stateShader[MAX_QPATH];    // shader this name invokes
-  int cycleTime;                  // time this cycle lasts, <= 0 is forever
-  shader_t *shader;
-} shaderState_t;
-
-
-// trRefdef_t holds everything that comes in refdef_t,
-// as well as the locally generated scene information
-typedef struct {
-	int			x, y, width, height;
-	float		fov_x, fov_y;
-	vec3_t		vieworg;
-	vec3_t		viewaxis[3];		// transformation matrix
-
-	int			time;				// time in milliseconds for shader effects and other time dependent rendering issues
-	int			rdflags;			// RDF_NOWORLDMODEL, etc
-
-	// 1 bits will prevent the associated area from rendering at all
-	byte		areamask[MAX_MAP_AREA_BYTES];
-	qboolean	areamaskModified;	// qtrue if areamask changed since last scene
-
-	float		floatTime;			// tr.refdef.time / 1000.0
-
-	// text messages for deform text shaders
-	char		text[MAX_RENDER_STRINGS][MAX_RENDER_STRING_LENGTH];
-
-	int			num_entities;
-	trRefEntity_t	*entities;
-
-    int			num_sprites;
-    refSprite_t	*sprites;
-
-	int			num_dlights;
-	struct dlight_s	*dlights;
-
-	int			numTerMarks;
-	struct srfMarkFragment_s *terMarks;
-
-	int			numPolys;
-	struct srfPoly_s	*polys;
-
-	int			numDrawSurfs;
-	struct drawSurf_s	*drawSurfs;
-
-	int			numSpriteSurfs;
-	struct drawSurf_s	*spriteSurfs;
-
-    int			numStaticModels;
-    struct cStaticModelUnpacked_s *staticModels;
-
-    int			numStaticModelData;
-    unsigned char		*staticModelData;
-    qboolean sky_portal;
-    float sky_alpha;
-    vec3_t sky_origin;
-	vec3_t sky_axis[3];
-
-} trRefdef_t;
-
-
-//=================================================================================
-
-// skins allow models to be retextured without modifying the model file
-typedef struct {
-	char		name[MAX_QPATH];
-	shader_t	*shader;
-} skinSurface_t;
-
-typedef struct skin_s {
-	char		name[MAX_QPATH];		// game path, including extension
-	int			numSurfaces;
-	skinSurface_t	*surfaces[MD3_MAX_SURFACES];
-} skin_t;
-
-
-typedef struct {
-	int			originalBrushNumber;
-	vec3_t		bounds[2];
-
-	unsigned	colorInt;				// in packed byte format
-	float		tcScale;				// texture coordinate vector scales
-	fogParms_t	parms;
-
-	// for clipping distance in fog when outside
-	qboolean	hasSurface;
-	float		surface[4];
-} fog_t;
-
-typedef struct depthfog_s {
-	float len;
-	float oolen;
-	int enabled;
-	int extrafrustums;
-} depthfog_t;
-
-typedef struct {
-	orientationr_t	ori;
-	orientationr_t	world;
-	vec3_t		pvsOrigin;			// may be different than or.origin for portals
-	qboolean	isPortal;			// true if this view is through a portal
-	qboolean	isMirror;			// the portal is a mirror, invert the face culling
-	int			frameSceneNum;		// copied from tr.frameSceneNum
-	int			frameCount;			// copied from tr.frameCount
-	cplane_t	portalPlane;		// clip anything behind this if mirroring
-	int			viewportX, viewportY, viewportWidth, viewportHeight;
-	float		fovX, fovY;
-	float		projectionMatrix[16];
-	cplane_t	frustum[5];
-	vec3_t		visBounds[2];
-	float		zFar;
-	depthfog_t	fog;
-	float		farplane_distance;
-	float		farplane_color[3];
-	qboolean	farplane_cull;
-} viewParms_t;
-
-
-/*
-==============================================================================
-
-SURFACES
-
-==============================================================================
-*/
-
-typedef struct drawSurf_s {
-	unsigned			sort;			// bit combination for fast compares
-	surfaceType_t		*surface;		// any of surface*_t
-} drawSurf_t;
-
-#define	MAX_FACE_POINTS		64
-
-#define	MAX_PATCH_SIZE		32			// max dimensions of a patch mesh in map file
-#define	MAX_GRID_SIZE		65			// max dimensions of a grid mesh in memory
-
-// when cgame directly specifies a polygon, it becomes a srfPoly_t
-// as soon as it is called
-typedef struct srfPoly_s {
-	surfaceType_t	surfaceType;
-	qhandle_t		hShader;
-	int				numVerts;
-	polyVert_t		*verts;
-	int				renderfx;
-} srfPoly_t;
-
-typedef struct srfMarkFragment_s {
-	surfaceType_t surfaceType;
-	int iIndex;
-	int numVerts;
-	polyVert_t* verts;
-} srfMarkFragment_t;
-
-typedef struct srfDisplayList_s {
-	surfaceType_t	surfaceType;
-	int				listNum;
-} srfDisplayList_t;
-
-
-typedef struct srfFlare_s {
-	surfaceType_t	surfaceType;
-	vec3_t			origin;
-	vec3_t			normal;
-	vec3_t			color;
-} srfFlare_t;
-
-typedef struct srfGridMesh_s {
-	surfaceType_t	surfaceType;
-
-	// dynamic lighting information
-    int				dlightBits[SMP_FRAMES];
-    int				dlightMap[SMP_FRAMES];
-
-	// culling information
-	vec3_t			meshBounds[2];
-	vec3_t			localOrigin;
-	float			meshRadius;
-
-	// lightmap data
-    float			lightmapOffset[2];
-    int				lmX;
-    int				lmY;
-    int				lmWidth;
-    int				lmHeight;
-    unsigned char	*lmData;
-
-	// lod information, which may be different
-	// than the culling information to allow for
-	// groups of curves that LOD as a unit
-	vec3_t			lodOrigin;
-	float			lodRadius;
-	int				lodFixed;
-	int				lodStitched;
-
-	// vertexes
-	int				width, height;
-	float			*widthLodError;
-	float			*heightLodError;
-	drawVert_t		verts[1];		// variable sized
-} srfGridMesh_t;
-
-
-
-#define	VERTEXSIZE	8
-typedef struct {
-	surfaceType_t	surfaceType;
-	cplane_t	plane;
-
-	// dynamic lighting information
-    int			dlightBits[SMP_FRAMES];
-    int			dlightMap[SMP_FRAMES];
-    float		lightmapOffset[2];
-    int			lmWidth;
-    int			lmHeight;
-    int			lmX;
-    int			lmY;
-    byte*		lmData;
-    vec3_t		lmOrigin;
-    vec3_t		lmVecs[2];
-    vec3_t		lmInverseVecs[2];
-
-	// triangle definitions (no normals at points)
-	int			numPoints;
-	int			numIndices;
-	int			ofsIndices;
-	float		points[1][VERTEXSIZE];	// variable sized
-										// there is a variable length list of indices here also
-} srfSurfaceFace_t;
-
-
-// misc_models in maps are turned into direct geometry by q3map
-typedef struct {
-	surfaceType_t	surfaceType;
-
-	// dynamic lighting information
-	int				dlightBits[SMP_FRAMES];
-
-	// culling information (FIXME: use this!)
-	vec3_t			bounds[2];
-	vec3_t			localOrigin;
-	float			radius;
-
-	// triangle definitions
-	int				numIndexes;
-	int				*indexes;
-
-	int				numVerts;
-	drawVert_t		*verts;
-} srfTriangles_t;
-
-typedef union varnodeUnpacked_u {
-    float fVariance;
-	struct {
-		byte flags;
-		unsigned char unused[3];
-	} s;
-} varnodeUnpacked_t;
-
-typedef unsigned short terraInt;
-
-typedef struct terrainVert_s {
-    vec3_t xyz;
-    vec2_t texCoords[2];
-    float fVariance;
-    float fHgtAvg;
-    float fHgtAdd;
-    unsigned int uiDistRecalc;
-    terraInt nRef;
-    terraInt iVertArray;
-    byte* pHgt;
-    terraInt iNext;
-    terraInt iPrev;
-} terrainVert_t;
-
-typedef struct terraTri_s {
-    unsigned short iPt[3];
-    terraInt nSplit;
-    unsigned int uiDistRecalc;
-    struct cTerraPatchUnpacked_s* patch;
-    varnodeUnpacked_t* varnode;
-    terraInt index;
-    byte lod;
-    byte byConstChecks;
-    terraInt iLeft;
-    terraInt iRight;
-    terraInt iBase;
-    terraInt iLeftChild;
-    terraInt iRightChild;
-    terraInt iParent;
-    terraInt iPrev;
-    terraInt iNext;
-} terraTri_t;
-
-typedef struct srfTerrain_s {
-    surfaceType_t surfaceType;
-    terraInt iVertHead;
-    terraInt iTriHead;
-    terraInt iTriTail;
-    terraInt iMergeHead;
-    int nVerts;
-    int nTris;
-    int lmapSize;
-    int dlightBits[2];
-    float lmapStep;
-    int dlightMap[2];
-    byte* lmData;
-    float lmapX;
-    float lmapY;
-} srfTerrain_t;
-
-typedef struct cTerraPatchUnpacked_s {
-    srfTerrain_t drawinfo;
-    int viewCount;
-    int visCountCheck;
-    int visCountDraw;
-    int frameCount;
-    unsigned int uiDistRecalc;
-    float s;
-    float t;
-    vec2_t texCoord[2][2];
-    float x0;
-    float y0;
-    float z0;
-    float zmax;
-    shader_t* shader;
-    short int iNorth;
-    short int iEast;
-    short int iSouth;
-    short int iWest;
-    struct cTerraPatchUnpacked_s* pNextActive;
-    varnodeUnpacked_t varTree[2][63];
-    unsigned char heightmap[81];
-    byte flags;
-    byte byDirty;
-} cTerraPatchUnpacked_t;
-
-typedef struct srfStaticModel_s {
-    surfaceType_t surfaceType;
-    struct cStaticModelUnpacked_s* parent;
-} srfStaticModel_t;
-
-typedef struct cStaticModelUnpacked_s {
-    qboolean useSpecialLighting;
-    qboolean bLightGridCalculated;
-    qboolean bRendered;
-    char model[128];
-    vec3_t origin;
-    vec3_t angles;
-    vec3_t axis[3];
-    float scale;
-    int firstVertexData;
-    int numVertexData;
-    int visCount;
-    dtiki_t* tiki;
-    sphere_dlight_t dlights[MAX_DLIGHTS];
-    int numdlights;
-    float radius;
-    float cull_radius;
-    int iGridLighting;
-    float lodpercentage[2];
-} cStaticModelUnpacked_t;
-
-extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
-
-/*
-==============================================================================
-
-BRUSH MODELS
-
-==============================================================================
-*/
-
-
-//
-// in memory representation
-//
-
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-
-typedef struct msurface_s {
-	int					viewCount;		// if == tr.viewCount, already added
-	int					frameCount;
-	struct shader_s		*shader;
-	int					fogIndex;
-
-	surfaceType_t		*data;			// any of srf*_t
-} msurface_t;
-
-
-
-#define	CONTENTS_NODE		-1
-typedef struct mnode_s {
-	// common with leaf and node
-	int			contents;		// -1 for nodes, to differentiate from leafs
-	int			visframe;		// node needs to be traversed if current
-	vec3_t		mins, maxs;		// for bounding box culling
-	struct mnode_s	*parent;
-
-	// node specific
-	cplane_t	*plane;
-	struct mnode_s	*children[2];	
-
-	// leaf specific
-	int			cluster;
-    int			area;
-    spherel_t**	lights;
-    int			numlights;
-
-	msurface_t	**firstmarksurface;
-    int			nummarksurfaces;
-
-    int			firstTerraPatch;
-    int			numTerraPatches;
-    int			firstStaticModel;
-    int			numStaticModels;
-    void**		pFirstMarkFragment;
-    int			iNumMarkFragment;
-} mnode_t;
-
-typedef struct {
-	vec3_t		bounds[2];		// for culling
-	msurface_t	*firstSurface;
-	int			numSurfaces;
-    void** pFirstMarkFragment;
-    int iNumMarkFragment;
-    int frameCount;
-    qboolean hasLightmap;
-} bmodel_t;
-
-typedef struct {
-    float width;
-    float height;
-    float origin_x;
-    float origin_y;
-    float scale;
-    shader_t* shader;
-} sprite_t;
-
-typedef struct {
-	char		name[MAX_QPATH];		// ie: maps/tim_dm2.bsp
-	char		baseName[MAX_QPATH];	// ie: tim_dm2
-
-	int			dataSize;
-
-	int			numShaders;
-	dshader_t	*shaders;
-
-	int			numBmodels;
-	bmodel_t	*bmodels;
-
-	int			numplanes;
-	cplane_t	*planes;
-
-	int			numnodes;		// includes leafs
-	int			numDecisionNodes;
-	mnode_t		*nodes;
-
-	int			numsurfaces;
-	msurface_t	*surfaces;
-
-	int			nummarksurfaces;
-	msurface_t	**marksurfaces;
-
-	vec3_t		lightGridMins;
-	vec3_t		lightGridSize;
-	vec3_t		lightGridOOSize;
-	int			lightGridBounds[3];
-	unsigned short* lightGridOffsets;
-	byte		*lightGridData;
-	byte        lightGridPalette[768];
-
-    int numTerraPatches;
-    cTerraPatchUnpacked_t* terraPatches;
-    cTerraPatchUnpacked_t* activeTerraPatches;
-
-    int numVisTerraPatches;
-    cTerraPatchUnpacked_t** visTerraPatches;
-
-    int numStaticModelData;
-    byte* staticModelData;
-
-    int numStaticModels;
-    cStaticModelUnpacked_t* staticModels;
-
-    int numVisStaticModels;
-    cStaticModelUnpacked_t** visStaticModels;
-
-	int			numClusters;
-	int			clusterBytes;
-	const byte	*vis;			// may be passed in by CM_LoadMap to save space
-
-	byte		*novis;			// clusterBytes of 0xff
-	byte		*lighting;
-} world_t;
-
-//======================================================================
-
-typedef enum {
-	MOD_BAD,
-	MOD_BRUSH,
-	MOD_TIKI,
-	MOD_SPRITE
-} modtype_t;
-
-typedef struct model_s {
-	char		name[MAX_QPATH];
-	modtype_t	type;
-	int			index;				// model = tr.models[model->index]
-
-    qboolean serveronly;
-    union {
-        bmodel_t* bmodel;
-        dtiki_t* tiki;
-        sprite_t* sprite;
-    } d;
-} model_t;
-
-
-#define	MAX_MOD_KNOWN	1024
-
-void		R_ModelInit (void);
-model_t		*R_GetModelByHandle( qhandle_t hModel );
-int			R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
-					 float frac, const char *tagName );
-
-void		R_Modellist_f (void);
-
-//====================================================
-extern	refimport_t		ri;
-
-#define	MAX_DRAWIMAGES			2048
-#define	MAX_LIGHTMAPS			256
-#define	MAX_SKINS				1024
-
-
-#define	MAX_DRAWSURFS			0x10000
-#define	MAX_SPRITESURFS			0x8000
-#define	DRAWSURF_MASK			(MAX_DRAWSURFS-1)
-
-#define MAX_SPRITE_DIST				16384.0f
-#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
-
-/*
-
-the drawsurf sort data is packed into a single 32 bit value so it can be
-compared quickly during the qsorting process
-
-the bits are allocated as follows:
-
-21 - 31	: sorted shader index
-11 - 20	: entity index
-2 - 6	: fog index
-//2		: used to be clipped flag REMOVED - 03.21.00 rad
-0 - 1	: dlightmap index
-
-	TTimo - 1.32
-17-31 : sorted shader index
-7-16  : entity index
-2-6   : fog index
-0-1   : dlightmap index
-*/
-#define	QSORT_SHADERNUM_SHIFT	22
-#define	QSORT_ENTITYNUM_SHIFT	8
-#define	QSORT_FOGNUM_SHIFT		2
-#define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_STATICMODEL_SHIFT	21
-
-extern	int			gl_filter_min, gl_filter_max;
-
-/*
-** performanceCounters_t
-*/
-typedef struct {
-	int		c_sphere_cull_patch_in, c_sphere_cull_patch_clip, c_sphere_cull_patch_out;
-	int		c_box_cull_patch_in, c_box_cull_patch_clip, c_box_cull_patch_out;
-	int		c_sphere_cull_md3_in, c_sphere_cull_md3_clip, c_sphere_cull_md3_out;
-	int		c_box_cull_md3_in, c_box_cull_md3_clip, c_box_cull_md3_out;
-
-	int		c_leafs;
-	int		c_dlightSurfaces;
-	int		c_dlightSurfacesCulled;
-	int		c_dlightMaps;
-	int		c_dlightTexels;
-} frontEndCounters_t;
-
-#define	FOG_TABLE_SIZE		256
-#define FUNCTABLE_SIZE		1024
-#define FUNCTABLE_SIZE2		10
-#define FUNCTABLE_MASK		(FUNCTABLE_SIZE-1)
-
-
-// the renderer front end should never modify glstate_t
-typedef struct {
-	int			currenttextures[2];
-	int			currenttmu;
-	qboolean	finishCalled;
-	int			texEnv[2];
-	int			faceCulling;
-	int			cntTexEnvExt;
-	int			cntnvblendmode;
-	long unsigned int glStateBits;
-	long unsigned int externalSetState;
-	vec4_t fFogColor;
-} glstate_t;
-
-
-typedef struct {
-	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes, c_characterlights;
-	float	c_overDraw;
-	
-	int		c_dlightVertexes;
-	int		c_dlightIndexes;
-
-	int		c_flareAdds;
-	int		c_flareTests;
-	int		c_flareRenders;
-
-	int		msec;			// total msec for backend run
-} backEndCounters_t;
-
-// all state modified by the back end is seperated
-// from the front end state
-typedef struct {
-	int			smpFrame;
-	trRefdef_t	refdef;
-	viewParms_t	viewParms;
-	orientationr_t	ori;
-	backEndCounters_t	pc;
-	qboolean	isHyperspace;
-	trRefEntity_t	*currentEntity;
-    qboolean skyRenderedThisView;	// flag for drawing sun
-    sphereor_t spheres[128];
-    unsigned char numSpheresUsed;
-    sphereor_t* currentSphere;
-    sphereor_t spareSphere;
-    sphereor_t hudSphere;
-    cStaticModelUnpacked_t* currentStaticModel;
-    int dsStreamVert;
-	qboolean in2D;	// if qtrue, drawstretchpic doesn't need to change modes
-	byte color2D[4];
-	qboolean vertexes2D;		// shader needs to be finished
-	trRefEntity_t entity2D;	// currentEntity will point at this when doing 2D rendering
-    int backEndMsec;
-    float shaderStartTime;
-} backEndState_t;
-
-/*
-** trGlobals_t 
-**
-** Most renderer globals are defined here.
-** backend functions should never modify any of these fields,
-** but may read fields that aren't dynamically modified
-** by the frontend.
-*/
-typedef struct {
-	qboolean				registered;		// cleared at shutdown, set at beginRegistration
-
-	int						visCount;		// incremented every time a new vis cluster is entered
-	int						frameCount;		// incremented every frame
-	int						sceneCount;		// incremented every scene
-	int						viewCount;		// incremented every view (twice a scene if portaled)
-											// and every R_MarkFragments call
-
-	int						smpFrame;		// toggles from 0 to 1 every endFrame
-
-	int						frameSceneNum;	// zeroed at RE_BeginFrame
-
-	qboolean				worldMapLoaded;
-	world_t					*world;
-
-	const byte				*externalVisData;	// from RE_SetWorldVisData, shared with CM_Load
-
-	image_t					*defaultImage;
-	image_t					*scratchImage;
-	image_t					*fogImage;
-	image_t					*dlightImage;	// inverse-quare highlight for projective adding
-	image_t					*flareImage;
-	image_t					*whiteImage;			// full of 0xff
-	image_t					*identityLightImage;	// full of tr.identityLightByte
-	image_t					*dlightImages[15];
-
-	shader_t				*defaultShader;
-	shader_t				*shadowShader;
-	shader_t				*projectionShadowShader;
-
-	shader_t				*flareShader;
-	shader_t				*sunShader;
-
-	int						numLightmaps;
-	image_t					*lightmaps[MAX_LIGHTMAPS];
-
-	trRefEntity_t			*currentEntity;
-	trRefEntity_t			worldEntity;		// point currentEntity at this when rendering world
-	int						currentEntityNum;
-	int						currentSpriteNum;
-	int						shiftedEntityNum;	// currentEntityNum << QSORT_ENTITYNUM_SHIFT
-	int                     shiftedIsStatic;
-	model_t					*currentModel;
-
-	viewParms_t				viewParms;
-
-	float					identityLight;		// 1.0 / ( 1 << overbrightBits )
-	int						identityLightByte;	// identityLight * 255
-	int						overbrightBits;		// r_overbrightBits->integer, but set to 0 if no hw gamma
-    int						overbrightShift;
-    float					overbrightMult;
-    int						needsLightScale;
-
-	orientationr_t			ori;				// for current entity
-
-	portalsky_t				portalsky;
-	qboolean				skyRendered;
-	qboolean				portalRendered;
-	trRefdef_t				refdef;
-
-	int						viewCluster;
-
-	vec3_t					sunLight;			// from the sky shader for this level
-	vec3_t					sunDirection;
-
-	frontEndCounters_t		pc;
-	int						frontEndMsec;		// not in pc due to clearing issue
-
-	//
-	// put large tables at the end, so most elements will be
-	// within the +/32K indexed range on risc processors
-	//
-	model_t					models[MAX_MOD_KNOWN];
-	int						numModels;
-
-	int						numImages;
-	image_t					images[MAX_DRAWIMAGES];
-
-	// shader indexes from other modules will be looked up in tr.shaders[]
-	// shader indexes from drawsurfs will be looked up in sortedShaders[]
-	// lower indexed sortedShaders must be rendered first (opaque surfaces before translucent)
-	int						numShaders;
-	shader_t				*shaders[MAX_SHADERS];
-	shader_t				*sortedShaders[MAX_SHADERS];
-
-	int						numSkins;
-	skin_t					*skins[MAX_SKINS];
-
-	float					sinTable[FUNCTABLE_SIZE];
-	float					squareTable[FUNCTABLE_SIZE];
-	float					triangleTable[FUNCTABLE_SIZE];
-	float					sawToothTable[FUNCTABLE_SIZE];
-	float					inverseSawToothTable[FUNCTABLE_SIZE];
-
-    spherel_t sSunLight;
-    spherel_t sLights[1532];
-    int numSLights;
-    int rendererhandle;
-    qboolean shadersParsed;
-    int frame_skel_index;
-    int skel_index[1024];
-    fontheader_t* pFontDebugStrings;
-} trGlobals_t;
-
-extern backEndState_t	backEnd;
-extern trGlobals_t	tr;
-extern glconfig_t	glConfig;		// outside of TR since it shouldn't be cleared during ref re-init
-extern glstate_t	glState;		// outside of TR since it shouldn't be cleared during ref re-init
-extern int r_sequencenumber;
-
-
-//
-// cvars
-//
-extern cvar_t	*r_flareSize;
-extern cvar_t	*r_flareFade;
-
-extern cvar_t	*r_ignore;				// used for debugging anything
-extern cvar_t	*r_verbose;				// used for verbose debug spew
-extern cvar_t	*r_ignoreFastPath;		// allows us to ignore our Tess fast paths
-
-extern cvar_t	*r_znear;				// near Z clip plane
-
-extern cvar_t	*r_stencilbits;			// number of desired stencil bits
-extern cvar_t	*r_depthbits;			// number of desired depth bits
-extern cvar_t	*r_colorbits;			// number of desired color bits, only relevant for fullscreen
-extern cvar_t	*r_stereo;				// desired pixelformat stereo flag
-extern cvar_t	*r_textureDetails;
-extern cvar_t	*r_texturebits;			// number of desired texture bits
-										// 0 = use framebuffer depth
-										// 16 = use 16-bit textures
-										// 32 = use 32-bit textures
-										// all else = error
-
-extern cvar_t	*r_measureOverdraw;		// enables stencil buffer overdraw measurement
-
-extern cvar_t	*r_lodscale;
-
-extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existance
-										// "1" = glDrawElemet tristrips
-										// "2" = glDrawElements triangles
-										// "-1" = no drawing
-
-extern cvar_t	*r_inGameVideo;				// controls whether in game video should be draw
-extern cvar_t	*r_fastsky;				// controls whether sky should be cleared or drawn
-extern cvar_t	*r_fastdlights;
-extern cvar_t	*r_drawSun;				// controls drawing of sun quad
-extern cvar_t	*r_dlightBacks;			// dlight non-facing surfaces for continuity
-
-extern	cvar_t	*r_norefresh;			// bypasses the ref rendering
-extern	cvar_t	*r_drawentities;		// disable/enable entity rendering
-extern	cvar_t	*r_drawentitypoly;
-extern	cvar_t	*r_drawstaticmodels;
-extern	cvar_t	*r_drawstaticmodelpoly;
-extern	cvar_t	*r_drawbrushes;
-extern	cvar_t	*r_drawbrushmodels;
-extern	cvar_t	*r_drawstaticdecals;
-extern	cvar_t	*r_drawterrain;
-extern	cvar_t	*r_drawsprites;
-extern	cvar_t	*r_drawspherelights;
-extern	cvar_t	*r_drawworld;			// disable/enable world rendering
-extern	cvar_t	*r_speeds;				// various levels of information display
-extern  cvar_t	*r_detailTextures;		// enables/disables detail texturing stages
-extern	cvar_t	*r_novis;				// disable/enable usage of PVS
-extern	cvar_t	*r_nocull;
-extern	cvar_t	*r_showcull;
-extern	cvar_t	*r_facePlaneCull;		// enables culling of planar surfaces with back side test
-extern	cvar_t	*r_nocurves;
-extern	cvar_t	*r_showcluster;
-
-extern cvar_t	*r_mode;				// video mode
-extern cvar_t	*r_fullscreen;
-extern cvar_t	*r_gamma;
-extern cvar_t	*r_displayRefresh;		// optional display refresh option
-extern cvar_t	*r_ignorehwgamma;		// overrides hardware gamma capabilities
-
-extern cvar_t	*r_allowExtensions;				// global enable/disable of OpenGL extensions
-extern cvar_t	*r_ext_compressed_textures;		// these control use of specific extensions
-extern cvar_t	*r_ext_gamma_control;
-extern cvar_t	*r_ext_texenv_op;
-extern cvar_t	*r_ext_multitexture;
-extern cvar_t	*r_ext_compiled_vertex_array;
-extern cvar_t	*r_ext_texture_env_add;
-extern cvar_t	*r_ext_texture_env_combine;
-extern cvar_t	*r_ext_aniso_filter;
-extern cvar_t	*r_forceClampToEdge;
-extern cvar_t	*r_geForce3WorkAround;
-extern cvar_t	*r_reset_tc_array;
-
-extern	cvar_t	*r_nobind;						// turns off binding to appropriate textures
-extern	cvar_t	*r_singleShader;				// make most world faces use default shader
-extern	cvar_t	*r_lerpmodels;
-extern	cvar_t	*r_roundImagesDown;
-extern	cvar_t	*r_colorMipLevels;				// development aid to see texture mip usage
-extern	cvar_t	*r_picmip;						// controls picmip values
-extern	cvar_t	*r_finish;
-extern	cvar_t	*r_drawBuffer;
-extern  cvar_t  *r_glDriver;
-extern	cvar_t	*r_swapInterval;
-extern	cvar_t	*r_textureMode;
-extern	cvar_t	*r_offsetFactor;
-extern	cvar_t	*r_offsetUnits;
-
-extern	cvar_t	*r_fullbright;					// avoid lightmap pass
-extern	cvar_t	*r_lightmap;					// render lightmaps only
-extern	cvar_t	*r_vertexLight;					// vertex lighting mode for better performance
-
-extern	cvar_t	*r_logFile;						// number of frames to emit GL logs
-extern	cvar_t	*r_showtris;					// enables wireframe rendering of the world
-extern	cvar_t	*r_showsky;						// forces sky in front of all surfaces
-extern	cvar_t	*r_shownormals;					// draws wireframe normals
-extern	cvar_t	*r_showhbox;
-extern	cvar_t	*r_showstaticbboxes;
-extern	cvar_t	*r_clear;						// force screen clear every frame
-
-extern	cvar_t	*r_shadows;						// controls shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
-extern	cvar_t	*r_entlight_scale;
-extern	cvar_t	*r_entlight_errbound;
-extern	cvar_t	*r_entlight_cubelevel;
-extern	cvar_t	*r_entlight_cubefraction;
-extern	cvar_t	*r_entlight_maxcalc;
-extern	cvar_t	*r_flares;						// light flares
-
-extern	cvar_t	*r_intensity;
-
-extern	cvar_t	*r_lockpvs;
-extern	cvar_t	*r_noportals;
-extern	cvar_t	*r_entlightmap;
-extern	cvar_t	*r_fastentlight;
-extern	cvar_t	*r_portalOnly;
-
-extern	cvar_t	*r_subdivisions;
-extern	cvar_t	*r_lodCurveError;
-extern	cvar_t	*r_smp;
-extern	cvar_t	*r_showSmp;
-extern	cvar_t	*r_skipBackEnd;
-
-extern	cvar_t	*r_ignoreGLErrors;
-
-extern	cvar_t	*r_overBrightBits;
-extern	cvar_t	*r_mapOverBrightBits;
-
-extern	cvar_t	*r_debugSurface;
-
-extern	cvar_t	*r_showImages;
-extern	cvar_t	*r_showlod;
-extern	cvar_t	*r_showstaticlod;
-extern	cvar_t	*r_debugSort;
-
-extern	cvar_t	*r_printShaders;
-extern	cvar_t	*r_saveFontData;
-
-extern	cvar_t* r_staticlod;
-extern	cvar_t* r_lodscale;
-extern	cvar_t* r_lodcap;
-extern	cvar_t* r_lodviewmodelcap;
-
-extern  cvar_t* r_uselod;
-extern  cvar_t* lod_LOD;
-extern  cvar_t* lod_minLOD;
-extern  cvar_t* lod_maxLOD;
-extern  cvar_t* lod_LOD_slider;
-extern  cvar_t* lod_curve_0_val;
-extern  cvar_t* lod_curve_1_val;
-extern  cvar_t* lod_curve_2_val;
-extern  cvar_t* lod_curve_3_val;
-extern  cvar_t* lod_curve_4_val;
-extern  cvar_t* lod_edit_0;
-extern  cvar_t* lod_edit_1;
-extern  cvar_t* lod_edit_2;
-extern  cvar_t* lod_edit_3;
-extern  cvar_t* lod_edit_4;
-extern  cvar_t* lod_curve_0_slider;
-extern  cvar_t* lod_curve_1_slider;
-extern  cvar_t* lod_curve_2_slider;
-extern  cvar_t* lod_curve_3_slider;
-extern  cvar_t* lod_curve_4_slider;
-extern  cvar_t* lod_pitch_val;
-extern  cvar_t* lod_zee_val;
-extern  cvar_t* lod_mesh;
-extern  cvar_t* lod_meshname;
-extern  cvar_t* lod_tikiname;
-extern  cvar_t* lod_metric;
-extern  cvar_t* lod_tris;
-extern  cvar_t* lod_position;
-extern  cvar_t* lod_save;
-extern  cvar_t* lod_tool;
-extern	cvar_t* sys_cpuid;
-extern	cvar_t* r_sse;
-extern	cvar_t* r_static_shaderdata0;
-extern	cvar_t* r_static_shaderdata1;
-extern	cvar_t* r_static_shaderdata2;
-extern	cvar_t* r_static_shaderdata3;
-extern	cvar_t* r_static_shadermultiplier0;
-extern	cvar_t* r_static_shadermultiplier1;
-extern	cvar_t* r_static_shadermultiplier2;
-extern	cvar_t* r_static_shadermultiplier3;
-
-extern  cvar_t* r_numdebuglines;
-
-extern	cvar_t* r_stipplelines;
-extern	cvar_t* r_light_lines;
-extern	cvar_t* r_light_sun_line;
-extern	cvar_t* r_light_int_scale;
-extern	cvar_t* r_light_nolight;
-extern	cvar_t* r_light_showgrid;
-extern	cvar_t* r_skyportal;
-extern	cvar_t* r_skyportal_origin;
-extern	cvar_t* r_farplane;
-extern	cvar_t* r_farplane_color;
-extern	cvar_t* r_farplane_nocull;
-extern	cvar_t* r_farplane_nofog;
-extern	cvar_t* r_lightcoronasize;
-extern	cvar_t* r_useglfog;
-extern	cvar_t* r_debuglines_depthmask;
-extern	cvar_t* r_smoothsmokelight;
-extern	cvar_t* r_showportal;
-extern	cvar_t* ter_minMarkRadius;
-extern	cvar_t* ter_fastMarks;
-extern	cvar_t* r_bumpmap;
-extern	cvar_t* r_loadjpg;
-extern	cvar_t* r_loadftx;
-
-extern  cvar_t* r_showSkeleton;
-
-//====================================================================
-
-float R_NoiseGet4f( float x, float y, float z, float t );
-void  R_NoiseInit( void );
-
-void R_SwapBuffers( int );
-
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
-void R_RenderView( viewParms_t *parms );
-
-qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum);
-
-void R_AddMD3Surfaces( trRefEntity_t *e );
-void R_AddNullModelSurfaces( trRefEntity_t *e );
-void R_AddBeamSurfaces( trRefEntity_t *e );
-void R_AddRailSurfaces( trRefEntity_t *e, qboolean isUnderwater );
-void R_AddLightningBoltSurfaces( trRefEntity_t *e );
-
-void R_AddPolygonSurfaces( void );
-
-void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel);
-
-void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap);
-
-
-#define	CULL_IN		0		// completely unclipped
-#define	CULL_CLIP	1		// clipped by one or more planes
-#define	CULL_OUT	2		// completely outside the clipping planes
-void R_LocalNormalToWorld (const vec3_t local, vec3_t world);
-void R_LocalPointToWorld (const vec3_t local, vec3_t world);
-int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]);
-int R_CullLocalBox (vec3_t bounds[2]);
-int R_CullPointAndRadius( vec3_t origin, float radius );
-int R_CullLocalPointAndRadius( vec3_t origin, float radius );
-int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
-int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
-
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *ori );
-void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori );
-void R_RotateForViewer(void);
-void R_SetupFrustum(void);
-
-/*
-** GL wrapper/helper functions
-*/
-void	GL_SetFogColor(const vec4_t fColor);
-void	GL_Bind( image_t *image );
-void	GL_SetDefaultState (void);
-void	GL_SelectTexture( int unit );
-void	GL_TextureMode( const char *string );
-void	GL_CheckErrors( void );
-void	GL_State( unsigned long stateVector );
-void	GL_TexEnv( int env );
-void	GL_Cull( int cullType );
-
-#define GLS_SRCBLEND_ZERO						0x00000001
-#define GLS_SRCBLEND_ONE						0x00000002
-#define GLS_SRCBLEND_DST_COLOR					0x00000003
-#define GLS_SRCBLEND_ONE_MINUS_DST_COLOR		0x00000004
-#define GLS_SRCBLEND_SRC_ALPHA					0x00000005
-#define GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA		0x00000006
-#define GLS_SRCBLEND_DST_ALPHA					0x00000007
-#define GLS_SRCBLEND_ONE_MINUS_DST_ALPHA		0x00000008
-#define GLS_SRCBLEND_ALPHA_SATURATE				0x00000009
-#define		GLS_SRCBLEND_BITS					0x0000000f
-
-#define GLS_DSTBLEND_ZERO						0x00000010
-#define GLS_DSTBLEND_ONE						0x00000020
-#define GLS_DSTBLEND_SRC_COLOR					0x00000030
-#define GLS_DSTBLEND_ONE_MINUS_SRC_COLOR		0x00000040
-#define GLS_DSTBLEND_SRC_ALPHA					0x00000050
-#define GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA		0x00000060
-#define GLS_DSTBLEND_DST_ALPHA					0x00000070
-#define GLS_DSTBLEND_ONE_MINUS_DST_ALPHA		0x00000080
-#define		GLS_DSTBLEND_BITS					0x000000f0
-
-#define GLS_DEPTHMASK_TRUE						0x00000100
-#define GLS_POLYMODE_LINE						0x00000200
-#define GLS_DEPTHTEST_DISABLE					0x00000400
-#define GLS_DEPTHFUNC_EQUAL						0x00000800
-
-#define GLS_CLAMP_EDGE							0x00001000
-#define GLS_MULTITEXTURE						0x00002000
-#define GLS_MULTITEXTURE_ENV					0x00004000
-#define GLS_FOG									0x00008000
-
-#define GLS_FOG_ENABLED							0x00010000
-#define GLS_FOG_BLACK							0x00020000
-#define GLS_FOG_WHITE							0x00040000
-#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
-#define GLS_COLOR_NOMASK						0x00080000
-
-#define GLS_ATEST_GT_0							0x10000000
-#define GLS_ATEST_LT_80							0x20000000
-#define GLS_ATEST_GE_80							0x40000000
-#define		GLS_ATEST_BITS						0x70000000
-
-#define GLS_DEFAULT			GLS_DEPTHMASK_TRUE
-
-void Draw_SetColor(const vec4_t rgba);
-void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
-void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
-void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
-void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
-void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
-void DrawBox(float x, float y, float w, float h);
-void AddBox(float x, float y, float w, float h);
-void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
-void RE_Scissor(int x, int y, int width, int height);
-void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
-void RE_StretchRaw(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
-void	RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
-
-void		RE_BeginFrame( stereoFrame_t stereoFrame );
-void		RE_BeginRegistration( glconfig_t *glconfig );
-void		RE_LoadWorldMap( const char *mapname );
-void		RE_PrintBSPFileSizes(void);
-int			RE_MapVersion(void);
-void		RE_SetWorldVisData( const byte *vis );
-qhandle_t	RE_RegisterModel( const char *name );
-qhandle_t	RE_RegisterSkin( const char *name );
-void		RE_Shutdown( qboolean destroyWindow );
-
-qboolean	R_GetEntityToken( char *buffer, int size );
-
-model_t		*R_AllocModel( void );
-
-void    	R_Init( void );
-image_t		*R_FindImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-image_t		*R_RefreshImageFile(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
-
-image_t* R_CreateImage(
-	const char* name,
-	byte* pic,
-	int width,
-	int height,
-	int numMipmaps,
-	int iMipmapsAvailable,
-	qboolean allowPicmip,
-	qboolean force32bit,
-	qboolean hasAlpha,
-	int glCompressMode,
-	int glWrapClampModeX,
-	int glWrapClampModeY
-);
-qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
-
-void		R_SetColorMappings( void );
-void		R_GammaCorrect( byte *buffer, int bufSize );
-
-void	R_ImageList_f( void );
-void	R_SkinList_f( void );
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=516
-const void *RB_TakeScreenshotCmd( const void *data );
-void	R_ScreenShot_f( void );
-
-void	R_InitImages( void );
-void	R_FreeImage(image_t* image);
-void	R_DeleteTextures( void );
-int		R_SumOfUsedImages( void );
-skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
-
-
-//
-// tr_shader.c
-//
-qhandle_t		 RE_RegisterShader( const char *name );
-qhandle_t		 RE_RegisterShaderNoMip( const char *name );
-qhandle_t		RE_RefreshShaderNoMip(const char* name);
-qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage);
-
-shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy);
-shader_t	*R_GetShaderByHandle( qhandle_t hShader );
-shader_t	*R_GetShaderByState( int index, long *cycleTime );
-void R_StartupShaders();
-void R_ShutdownShaders();
-void R_SetupShaders();
-void		R_ShaderList_f( void );
-void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
-
-/*
-====================================================================
-
-IMPLEMENTATION SPECIFIC FUNCTIONS
-
-====================================================================
-*/
-
-void		GLimp_Init( qboolean fixedFunction );
-void		GLimp_Shutdown( void );
-void		GLimp_EndFrame( void );
-
-qboolean	GLimp_SpawnRenderThread( void (*function)( void ) );
-void		*GLimp_RendererSleep( void );
-void		GLimp_FrontEndSleep( void );
-void		GLimp_WakeRenderer( void *data );
-
-void		GLimp_LogComment( char *comment );
-
-// NOTE TTimo linux works with float gamma value, not the gamma table
-//   the params won't be used, getting the r_gamma cvar directly
-void		GLimp_SetGamma( unsigned char red[256], 
-						    unsigned char green[256],
-							unsigned char blue[256] );
-
-
-/*
-====================================================================
-
-TESSELATOR/SHADER DECLARATIONS
-
-====================================================================
-*/
-typedef byte color4ub_t[4];
-
-typedef struct stageVars
-{
-	color4ub_t	colors[SHADER_MAX_VERTEXES];
-	vec2_t		texcoords[NUM_TEXTURE_BUNDLES][SHADER_MAX_VERTEXES];
-} stageVars_t;
-
-typedef struct shaderCommands_s 
-{
-	glIndex_t	indexes[SHADER_MAX_INDEXES];
-	vec4_t		xyz[SHADER_MAX_VERTEXES];
-	vec4_t		normal[SHADER_MAX_VERTEXES];
-	vec2_t		texCoords[SHADER_MAX_VERTEXES][2];
-	color4ub_t	vertexColors[SHADER_MAX_VERTEXES];
-	int			vertexDlightBits[SHADER_MAX_VERTEXES];
-
-	stageVars_t	svars;
-
-	color4ub_t	constantColor255[SHADER_MAX_VERTEXES];
-
-	shader_t	*shader;
-  float   shaderTime;
-	int			fogNum;
-
-	int			dlightBits;	// or together of all vertexDlightBits
-	int			dlightMap;
-
-	int			numIndexes;
-	int			numVertexes;
-
-	// info extracted from current shader
-	int			numPasses;
-	void		(*currentStageIteratorFunc)( void );
-	shaderStage_t	**xstages;
-    qboolean no_global_fog;
-    qboolean vertexColorValid;
-} shaderCommands_t;
-
-extern	shaderCommands_t	tess;
-
-void RB_BeginSurface(shader_t *shader );
-void RB_EndSurface(void);
-void RB_CheckOverflow( int verts, int indexes );
-#define RB_CHECKOVERFLOW(v,i) if (tess.numVertexes + (v) >= SHADER_MAX_VERTEXES || tess.numIndexes + (i) >= SHADER_MAX_INDEXES ) {RB_CheckOverflow(v,i);}
-
-void RB_StageIteratorGeneric( void );
-void RB_StageIteratorSky( void );
-void RB_StageIteratorVertexLitTextureUnfogged( void );
-void RB_StageIteratorLightmappedMultitextureUnfogged( void );
-
-void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color );
-void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 );
-
-void RB_ShowImages( void );
-
-
-/*
-============================================================
-
-WORLD MAP
-
-============================================================
-*/
-
-extern terraTri_t* g_pTris;
-extern terrainVert_t* g_pVert;
-
-void R_AddBrushModelSurfaces( trRefEntity_t *e );
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
-int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
-mnode_t* R_PointInLeaf(const vec3_t p);
-int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
-int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
-void R_AddWorldSurfaces( void );
-qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
-
-
-/*
-============================================================
-
-FLARES
-
-============================================================
-*/
-
-void R_ClearFlares( void );
-
-void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal );
-void RB_AddDlightFlares( void );
-void RB_RenderFlares (void);
-
-/*
-============================================================
-
-LIGHTS
-
-============================================================
-*/
-
-void R_DlightBmodel( bmodel_t *bmodel );
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
-void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
-void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
-void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent );
-void RB_SetupEntityGridLighting();
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
-int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBit);
-int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits);
-int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits);
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori );
-void RB_Light_Real(unsigned char* colors);
-void RB_Sphere_BuildDLights();
-void RB_Sphere_SetupEntity();
-void RB_Grid_SetupEntity();
-void RB_Grid_SetupStaticModel();
-void RB_Light_Fullbright(unsigned char* colors);
-void R_Sphere_InitLights();
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
-void R_UploadDlights();
-
-
-/*
-============================================================
-
-SHADOWS
-
-============================================================
-*/
-
-void RB_ShadowTessEnd( void );
-void RB_ComputeShadowVolume();
-void RB_ShadowFinish( void );
-void RB_ProjectionShadowDeform( void );
-
-/*
-============================================================
-
-SKIES
-
-============================================================
-*/
-
-void R_BuildCloudData( shaderCommands_t *shader );
-void R_InitSkyTexCoords( float cloudLayerHeight );
-void R_DrawSkyBox( shaderCommands_t *shader );
-void RB_DrawSun( void );
-void RB_ClipSkyPolygons( shaderCommands_t *shader );
-
-/*
-============================================================
-
-CURVE TESSELATION
-
-============================================================
-*/
-
-#define PATCH_STITCHING
-
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
-								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
-srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror );
-srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror );
-void R_FreeSurfaceGridMesh( srfGridMesh_t *grid );
-
-/*
-============================================================
-
-MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
-
-============================================================
-*/
-
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
-	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
-
-
-/*
-============================================================
-
-SCENE GENERATION
-
-============================================================
-*/
-
-void R_ToggleSmpFrame( void );
-
-void RE_ClearScene( void );
-void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber);
-void RE_AddRefSpriteToScene(const refEntity_t* ent);
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-refEntity_t* RE_GetRenderEntity(int entityNumber);
-qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type );
-void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
-void RE_RenderScene( const refdef_t *fd );
-
-/*
-=============================================================
-
-ANIMATED MODELS
-
-=============================================================
-*/
-
-void R_MakeAnimModel( model_t *model );
-void R_AddAnimSurfaces(trRefEntity_t* ent);
-
-/*
-=============================================================
-
-FONT
-
-=============================================================
-*/
-fontheader_t* R_LoadFont(const char* name);
-void R_LoadFontShader(fontheader_sgl_t* font);
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen);
-void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
-float R_GetFontHeight(const fontheader_t* font);
-float R_GetFontStringWidth(const fontheader_t* font, const char* s);
-
-/*
-=============================================================
-
-MARKS
-
-=============================================================
-*/
-void R_LevelMarksLoad(const char* szBSPName);
-void R_LevelMarksInit();
-void R_LevelMarksFree();
-void R_UpdateLevelMarksSystem();
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
-
-/*
-=============================================================
-
-SKY PORTALS
-
-=============================================================
-*/
-void R_Sky_Init();
-void R_Sky_Reset();
-void R_Sky_AddSurf(msurface_t* surf);
-void R_Sky_Render();
-
-/*
-=============================================================
-
-SPRITE
-
-=============================================================
-*/
-sprite_t* SPR_RegisterSprite(const char* name);
-void RB_DrawSprite(const refSprite_t* spr);
-
-
-/*
-=============================================================
-
-SUN FLARE
-
-=============================================================
-*/
-void R_InitLensFlare();
-void R_DrawLensFlares();
-
-/*
-=============================================================
-
-SWIPE
-
-=============================================================
-*/
-void RB_DrawSwipeSurface(surfaceType_t* pswipe);
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
-void RE_SwipeEnd();
-void R_AddSwipeSurfaces();
-
-/*
-=============================================================
-
-TERRAIN
-
-=============================================================
-*/
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
-void R_AddTerrainSurfaces();
-void R_InitTerrain();
-void R_TerrainPrepareFrame();
-qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
-
-/*
-=============================================================
-
-TIKI
-
-=============================================================
-*/
-void R_InitStaticModels(void);
-void RE_FreeModels(void);
-qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
-qhandle_t RE_RegisterServerModel(const char* name);
-void RE_UnregisterServerModel(qhandle_t hModel);
-orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
-qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
-float R_ModelRadius(qhandle_t handle);
-void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
-dtiki_t* R_Model_GetHandle(qhandle_t handle);
-
-float R_GetRadius(refEntity_t* model);
-void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
-void RE_ForceUpdatePose(refEntity_t* model);
-void RE_SetFrameNumber(int frameNumber);
-void R_UpdatePoseInternal(refEntity_t* model);
-void RB_SkelMesh(skelSurfaceGame_t* sf);
-void RB_StaticMesh(staticSurface_t* staticSurf);
-void RB_Static_BuildDLights();
-void R_PrintInfoStaticModels();
-void R_AddSkelSurfaces(trRefEntity_t* ent);
-void R_AddStaticModelSurfaces(void);
-void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
-float R_CalcLod(const vec3_t origin, float radius);
-void R_PrintInfoWorldtris(void);
-
-extern int g_nStaticSurfaces;
-extern qboolean g_bInfostaticmodels;
-extern qboolean g_bInfoworldtris;
-
-/*
-=============================================================
-
-UTIL
-
-=============================================================
-*/
-int RE_GetShaderHeight(qhandle_t hShader);
-int RE_GetShaderWidth(qhandle_t hShader);
-void RB_StreamBegin(shader_t* shader);
-void RB_StreamEnd(void);
-void RB_StreamBeginDrawSurf(void);
-void RB_StreamEndDrawSurf(void);
-static void addTriangle(void);
-void RB_Vertex3fv(vec3_t v);
-void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
-void RB_Vertex2f(vec_t x, vec_t y);
-void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
-void RB_Color3f(vec_t r, vec_t g, vec_t b);
-void RB_Color3fv(vec3_t col);
-void RB_Color4bv(unsigned char* colors);
-void RB_Texcoord2f(float s, float t);
-void RB_Texcoord2fv(vec2_t st);
-void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
-void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
-int RE_GetShaderWidth(qhandle_t hShader);
-int RE_GetShaderHeight(qhandle_t hShader);
-
-/*
-=============================================================
-=============================================================
-*/
-void	R_TransformModelToClip( const vec3_t src, const float *modelMatrix, const float *projectionMatrix,
-							vec4_t eye, vec4_t dst );
-void	R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t normalized, vec4_t window );
-
-void	RB_DeformTessGeometry( void );
-
-void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
-void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
-void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
-void	RB_CalcRotateTexCoords( float rotSpeed, float *dstTexCoords );
-void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
-void	RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *dstTexCoords );
-void	RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *dstTexCoords );
-void	RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors );
-void	RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor);
-void	RB_CalcAlphaFromEntity( unsigned char *dstColors );
-void	RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcStretchTexCoords( const waveForm_t *wf, float *texCoords );
-void	RB_CalcColorFromEntity( unsigned char *dstColors );
-void	RB_CalcColorFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
-void	RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
-void	RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void	RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void	RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin);
-void	RB_CalcLightGridColor(unsigned char* colors);
-void	RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax);
-void	RB_CalcDiffuseColor( unsigned char *colors );
-
-/*
-=============================================================
-
-RENDERER BACK END FUNCTIONS
-
-=============================================================
-*/
-
-void RB_RenderThread( void );
-void RB_ExecuteRenderCommands( const void *data );
-
-/*
-=============================================================
-
-RENDERER BACK END COMMAND QUEUE
-
-=============================================================
-*/
-
-#define	MAX_RENDER_COMMANDS	0x40000
-
-typedef struct suninfo_s {
-	vec3_t color;
-	vec3_t direction;
-	vec3_t flaredirection;
-	char szFlareName[64];
-	qboolean exists;
-} suninfo_t;
-
-typedef struct {
-	byte	cmds[MAX_RENDER_COMMANDS];
-	int		used;
-} renderCommandList_t;
-
-typedef struct {
-	int		commandId;
-	float	color[4];
-} setColorCommand_t;
-
-typedef struct {
-	int		commandId;
-	int		buffer;
-} drawBufferCommand_t;
-
-typedef struct {
-	int		commandId;
-	image_t	*image;
-	int		width;
-	int		height;
-	void	*data;
-} subImageCommand_t;
-
-typedef struct {
-	int		commandId;
-} swapBuffersCommand_t;
-
-typedef struct {
-	int		commandId;
-	int		buffer;
-} endFrameCommand_t;
-
-typedef struct {
-	int		commandId;
-	shader_t	*shader;
-	float	x, y;
-	float	w, h;
-	float	s1, t1;
-	float	s2, t2;
-} stretchPicCommand_t;
-
-typedef struct {
-	int		commandId;
-	trRefdef_t	refdef;
-	viewParms_t	viewParms;
-	drawSurf_t *drawSurfs;
-	int		numDrawSurfs;
-} drawSurfsCommand_t;
-
-typedef struct {
-	int commandId;
-	int x;
-	int y;
-	int width;
-	int height;
-	char *fileName;
-	qboolean jpeg;
-} screenshotCommand_t;
-
-typedef enum {
-	RC_END_OF_LIST,
-	RC_SET_COLOR,
-	RC_STRETCH_PIC,
-	RC_DRAW_SURFS,
-	RC_SPRITE_SURFS,
-	RC_DRAW_BUFFER,
-	RC_SWAP_BUFFERS,
-	RC_SCREENSHOT
-} renderCommand_t;
-
-
-// these are sort of arbitrary limits.
-// the limits apply to the sum of all scenes in a frame --
-// the main view, all the 3D icons, etc
-#define	MAX_POLYS		4096
-#define	MAX_POLYVERTS	16384
-#define	MAX_TERMARKS	1024
-
-// all of the information needed by the back end must be
-// contained in a backEndData_t.  This entire structure is
-// duplicated so the front and back end can run in parallel
-// on an SMP machine
-typedef struct {
-	drawSurf_t	drawSurfs[MAX_DRAWSURFS];
-	drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
-	dlight_t	dlights[MAX_DLIGHTS];
-	trRefEntity_t	entities[MAX_ENTITIES];
-	srfMarkFragment_t* terMarks;
-	srfPoly_t	*polys;
-	polyVert_t	*polyVerts;
-	refSprite_t sprites[2048];
-	cStaticModelUnpacked_t* staticModels;
-	byte* staticModelData;
-	renderCommandList_t	commands;
-} backEndData_t;
-
-extern	int		max_polys;
-extern	int		max_polyverts;
-
-extern	backEndData_t	*backEndData[SMP_FRAMES];	// the second one may not be allocated
-
-extern	volatile renderCommandList_t	*renderCommandList;
-
-extern	volatile qboolean	renderThreadActive;
-
-
-void *R_GetCommandBuffer( int bytes );
-void RB_ExecuteRenderCommands( const void *data );
-
-void R_SavePerformanceCounters(void);
-void R_InitCommandBuffers( void );
-void R_ShutdownCommandBuffers( void );
-
-void R_SyncRenderThread( void );
-
-void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
-
-void RE_SetColor( const float *rgba );
-void RE_StretchPic ( float x, float y, float w, float h, 
-					  float s1, float t1, float s2, float t2, qhandle_t hShader );
-void RE_BeginFrame( stereoFrame_t stereoFrame );
-void RE_EndFrame( int *frontEndMsec, int *backEndMsec );
-void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
-
-void UI_LoadResource(const char* name);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/code/renderer/tr_main.c b/code/renderer/tr_main.c
deleted file mode 100644
index b943163b..00000000
--- a/code/renderer/tr_main.c
+++ /dev/null
@@ -1,1917 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_main.c -- main control flow for each frame
-
-#include "tr_local.h"
-#include "tiki.h"
-
-trGlobals_t		tr;
-
-static float	s_flipMatrix[16] = {
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	0, 0, -1, 0,
-	-1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 0, 1
-};
-
-
-refimport_t	ri;
-
-// entities that will have procedurally generated surfaces will just
-// point at this for their sorting surface
-surfaceType_t	entitySurface = SF_ENTITY;
-
-/*
-=================
-R_CullLocalBox
-
-Returns CULL_IN, CULL_CLIP, or CULL_OUT
-=================
-*/
-int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]) {
-	int		i, j;
-	vec3_t	transformed[8];
-	float	dists[8];
-	vec3_t	v;
-	cplane_t	*frust;
-	int			anyBack;
-	int			front, back;
-
-	if ( r_nocull->integer ) {
-		return CULL_CLIP;
-	}
-
-	// transform into world space
-	for (i = 0 ; i < 8 ; i++) {
-		v[0] = bounds[i&1][0];
-		v[1] = bounds[(i>>1)&1][1];
-		v[2] = bounds[(i>>2)&1][2];
-
-		VectorCopy( tr.ori.origin, transformed[i] );
-		VectorAdd(transformed[i], offset, transformed[i]);
-		VectorMA( transformed[i], v[0], tr.ori.axis[0], transformed[i] );
-		VectorMA( transformed[i], v[1], tr.ori.axis[1], transformed[i] );
-		VectorMA( transformed[i], v[2], tr.ori.axis[2], transformed[i] );
-	}
-
-	// check against frustum planes
-	anyBack = 0;
-	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4 ; i++) {
-		frust = &tr.viewParms.frustum[i];
-
-		front = back = 0;
-		for (j = 0 ; j < 8 ; j++) {
-			dists[j] = DotProduct(transformed[j], frust->normal);
-			if ( dists[j] > frust->dist ) {
-				front = 1;
-				if ( back ) {
-					break;		// a point is in front
-				}
-			} else {
-				back = 1;
-			}
-		}
-		if ( !front ) {
-			// all points were behind one of the planes
-			return CULL_OUT;
-		}
-		anyBack |= back;
-	}
-
-	if ( !anyBack ) {
-		return CULL_IN;		// completely inside frustum
-	}
-
-	return CULL_CLIP;		// partially clipped
-}
-
-int R_CullLocalBox(vec3_t bounds[2]) {
-	return R_CullLocalBoxOffset(vec3_origin, bounds);
-}
-
-/*
-** R_CullLocalPointAndRadius
-*/
-int R_CullLocalPointAndRadius( vec3_t pt, float radius )
-{
-	vec3_t transformed;
-
-	R_LocalPointToWorld( pt, transformed );
-
-	return R_CullPointAndRadius( transformed, radius );
-}
-
-/*
-** R_CullPointAndRadius
-*/
-int R_CullPointAndRadius( vec3_t pt, float radius )
-{
-	int		i;
-	float	dist;
-	cplane_t	*frust;
-	qboolean mightBeClipped = qfalse;
-
-	if ( r_nocull->integer ) {
-		return CULL_CLIP;
-	}
-
-	// check against frustum planes
-	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4; i++)
-	{
-		frust = &tr.viewParms.frustum[i];
-
-		dist = DotProduct( pt, frust->normal) - frust->dist;
-		if ( dist < -radius )
-		{
-			return CULL_OUT;
-		}
-		else if ( dist <= radius ) 
-		{
-			mightBeClipped = qtrue;
-		}
-	}
-
-	if ( mightBeClipped )
-	{
-		return CULL_CLIP;
-	}
-
-	return CULL_IN;		// completely inside frustum
-}
-
-int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
-	vec3_t transformed;
-
-	R_LocalPointToWorld(pt, transformed);
-
-	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
-}
-
-int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
-	if (!r_nocull->integer)
-	{
-		vec3_t vDelta;
-		float fLengthSquared;
-		float fTotalDistSquared;
-
-		VectorSubtract(pt, tr.viewParms.ori.origin, vDelta);
-		fLengthSquared = VectorLengthSquared(vDelta);
-		fTotalDistSquared = (fDist + radius) * (fDist + radius);
-
-		if ((fDist + radius) * (fDist + radius) < vDelta[2] + fLengthSquared) {
-			return CULL_OUT;
-		} else if ((fDist - radius) * (fDist - radius) > vDelta[2] + fLengthSquared) {
-			return CULL_IN;
-		}
-	}
-
-	return CULL_CLIP;
-	// FIXME: unimplemented
-}
-
-/*
-=================
-R_LocalNormalToWorld
-
-=================
-*/
-void R_LocalNormalToWorld (const vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0];
-	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1];
-	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2];
-}
-
-/*
-=================
-R_LocalPointToWorld
-
-=================
-*/
-void R_LocalPointToWorld (const vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0] + tr.ori.origin[0];
-	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1] + tr.ori.origin[1];
-	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2] + tr.ori.origin[2];
-}
-
-/*
-=================
-R_WorldToLocal
-
-=================
-*/
-void R_WorldToLocal (vec3_t world, vec3_t local) {
-	local[0] = DotProduct(world, tr.ori.axis[0]);
-	local[1] = DotProduct(world, tr.ori.axis[1]);
-	local[2] = DotProduct(world, tr.ori.axis[2]);
-}
-
-/*
-==========================
-R_TransformModelToClip
-
-==========================
-*/
-void R_TransformModelToClip( const vec3_t src, const float *modelMatrix, const float *projectionMatrix,
-							vec4_t eye, vec4_t dst ) {
-	int i;
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		eye[i] = 
-			src[0] * modelMatrix[ i + 0 * 4 ] +
-			src[1] * modelMatrix[ i + 1 * 4 ] +
-			src[2] * modelMatrix[ i + 2 * 4 ] +
-			1 * modelMatrix[ i + 3 * 4 ];
-	}
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		dst[i] = 
-			eye[0] * projectionMatrix[ i + 0 * 4 ] +
-			eye[1] * projectionMatrix[ i + 1 * 4 ] +
-			eye[2] * projectionMatrix[ i + 2 * 4 ] +
-			eye[3] * projectionMatrix[ i + 3 * 4 ];
-	}
-}
-
-/*
-==========================
-R_TransformClipToWindow
-
-==========================
-*/
-void R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t normalized, vec4_t window ) {
-	normalized[0] = clip[0] / clip[3];
-	normalized[1] = clip[1] / clip[3];
-	normalized[2] = ( clip[2] + clip[3] ) / ( 2 * clip[3] );
-
-	window[0] = 0.5f * ( 1.0f + normalized[0] ) * view->viewportWidth;
-	window[1] = 0.5f * ( 1.0f + normalized[1] ) * view->viewportHeight;
-	window[2] = normalized[2];
-
-	window[0] = (int) ( window[0] + 0.5 );
-	window[1] = (int) ( window[1] + 0.5 );
-}
-
-
-/*
-==========================
-myGlMultMatrix
-
-==========================
-*/
-void myGlMultMatrix( const float *a, const float *b, float *out ) {
-	int		i, j;
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		for ( j = 0 ; j < 4 ; j++ ) {
-			out[ i * 4 + j ] =
-				a [ i * 4 + 0 ] * b [ 0 * 4 + j ]
-				+ a [ i * 4 + 1 ] * b [ 1 * 4 + j ]
-				+ a [ i * 4 + 2 ] * b [ 2 * 4 + j ]
-				+ a [ i * 4 + 3 ] * b [ 3 * 4 + j ];
-		}
-	}
-}
-
-void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
-{
-	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
-		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
-    }
-    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
-        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
-    }
-    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
-        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
-    }
-
-	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
-        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
-    }
-    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
-        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
-    }
-    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
-        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
-    }
-}
-
-/*
-=================
-R_RotateForEntity
-
-Generates an orientation for an entity and viewParms
-Does NOT produce any GL calls
-Called by both the front end and the back end
-=================
-*/
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
-					   orientationr_t *ori ) {
-	float	glMatrix[16];
-	vec3_t	delta;
-	float	axisLength;
-
-	if ( ent->e.reType != RT_MODEL ) {
-		*ori = viewParms->world;
-		return;
-	}
-
-	VectorCopy( ent->e.origin, ori->origin );
-
-	VectorCopy( ent->e.axis[0], ori->axis[0] );
-	VectorCopy( ent->e.axis[1], ori->axis[1] );
-	VectorCopy( ent->e.axis[2], ori->axis[2] );
-
-	glMatrix[0] = ori->axis[0][0];
-	glMatrix[4] = ori->axis[1][0];
-	glMatrix[8] = ori->axis[2][0];
-	glMatrix[12] = ori->origin[0];
-
-	glMatrix[1] = ori->axis[0][1];
-	glMatrix[5] = ori->axis[1][1];
-	glMatrix[9] = ori->axis[2][1];
-	glMatrix[13] = ori->origin[1];
-
-	glMatrix[2] = ori->axis[0][2];
-	glMatrix[6] = ori->axis[1][2];
-	glMatrix[10] = ori->axis[2][2];
-	glMatrix[14] = ori->origin[2];
-
-	glMatrix[3] = 0;
-	glMatrix[7] = 0;
-	glMatrix[11] = 0;
-	glMatrix[15] = 1;
-
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
-
-	// calculate the viewer origin in the model's space
-	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
-
-	// compensate for scale in the axes if necessary
-	if ( ent->e.nonNormalizedAxes ) {
-		axisLength = VectorLength( ent->e.axis[0] );
-		if ( !axisLength ) {
-			axisLength = 0;
-		} else {
-			axisLength = 1.0f / axisLength;
-		}
-	} else {
-		axisLength = 1.0f;
-	}
-
-	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] ) * axisLength;
-	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] ) * axisLength;
-	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] ) * axisLength;
-}
-
-/*
-=================
-R_RotateForStaticModel
-
-Generates an orientation for a static model and viewParms
-=================
-*/
-void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
-					   orientationr_t *ori ) {
-	float	glMatrix[16];
-	vec3_t	delta;
-	float	tiki_scale;
-
-	tiki_scale = SM->tiki->load_scale * SM->scale;
-
-	VectorCopy( SM->origin, ori->origin );
-
-	VectorCopy( SM->axis[0], ori->axis[0] );
-	VectorCopy( SM->axis[1], ori->axis[1] );
-	VectorCopy( SM->axis[2], ori->axis[2] );
-
-	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
-	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
-	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
-	glMatrix[12] = ori->origin[0];
-
-	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
-	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
-	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
-	glMatrix[13] = ori->origin[1];
-
-	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
-	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
-	glMatrix[10] = ori->axis[2][2] * tiki_scale;
-	glMatrix[14] = ori->origin[2];
-
-	glMatrix[3]  = 0;
-	glMatrix[7]  = 0;
-	glMatrix[11] = 0;
-	glMatrix[15] = 1;
-
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
-
-	// calculate the viewer origin in the model's space
-	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
-
-	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
-	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
-	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
-}
-
-/*
-=================
-R_RotateForViewer
-
-Sets up the modelview matrix for a given viewParm
-=================
-*/
-void R_RotateForViewer (void) 
-{
-	float	viewerMatrix[16];
-	vec3_t	origin;
-
-	Com_Memset (&tr.ori, 0, sizeof(tr.ori));
-	tr.ori.axis[0][0] = 1;
-	tr.ori.axis[1][1] = 1;
-	tr.ori.axis[2][2] = 1;
-	VectorCopy (tr.viewParms.ori.origin, tr.ori.viewOrigin);
-
-	// transform by the camera placement
-	VectorCopy( tr.viewParms.ori.origin, origin );
-
-	viewerMatrix[0] = tr.viewParms.ori.axis[0][0];
-	viewerMatrix[4] = tr.viewParms.ori.axis[0][1];
-	viewerMatrix[8] = tr.viewParms.ori.axis[0][2];
-	viewerMatrix[12] = -origin[0] * viewerMatrix[0] + -origin[1] * viewerMatrix[4] + -origin[2] * viewerMatrix[8];
-
-	viewerMatrix[1] = tr.viewParms.ori.axis[1][0];
-	viewerMatrix[5] = tr.viewParms.ori.axis[1][1];
-	viewerMatrix[9] = tr.viewParms.ori.axis[1][2];
-	viewerMatrix[13] = -origin[0] * viewerMatrix[1] + -origin[1] * viewerMatrix[5] + -origin[2] * viewerMatrix[9];
-
-	viewerMatrix[2] = tr.viewParms.ori.axis[2][0];
-	viewerMatrix[6] = tr.viewParms.ori.axis[2][1];
-	viewerMatrix[10] = tr.viewParms.ori.axis[2][2];
-	viewerMatrix[14] = -origin[0] * viewerMatrix[2] + -origin[1] * viewerMatrix[6] + -origin[2] * viewerMatrix[10];
-
-	viewerMatrix[3] = 0;
-	viewerMatrix[7] = 0;
-	viewerMatrix[11] = 0;
-	viewerMatrix[15] = 1;
-
-	// convert from our coordinate system (looking down X)
-	// to OpenGL's coordinate system (looking down -Z)
-	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.ori.modelMatrix );
-
-	tr.viewParms.world = tr.ori;
-
-}
-
-/*
-** SetFarClip
-*/
-static void SetFarClip( void )
-{
-	float	farthestCornerDistance = 0;
-	int		i;
-
-	// if not rendering the world (icons, menus, etc)
-	// set a 2k far clip plane
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		tr.viewParms.zFar = 2048;
-		return;
-	}
-
-	//
-	// set far clipping planes dynamically
-	//
-	farthestCornerDistance = 0;
-	for ( i = 0; i < 8; i++ )
-	{
-		vec3_t v;
-		vec3_t vecTo;
-		float distance;
-
-		if ( i & 1 )
-		{
-			v[0] = tr.viewParms.visBounds[0][0];
-		}
-		else
-		{
-			v[0] = tr.viewParms.visBounds[1][0];
-		}
-
-		if ( i & 2 )
-		{
-			v[1] = tr.viewParms.visBounds[0][1];
-		}
-		else
-		{
-			v[1] = tr.viewParms.visBounds[1][1];
-		}
-
-		if ( i & 4 )
-		{
-			v[2] = tr.viewParms.visBounds[0][2];
-		}
-		else
-		{
-			v[2] = tr.viewParms.visBounds[1][2];
-		}
-
-		VectorSubtract( v, tr.viewParms.ori.origin, vecTo );
-
-		distance = vecTo[0] * vecTo[0] + vecTo[1] * vecTo[1] + vecTo[2] * vecTo[2];
-
-		if ( distance > farthestCornerDistance )
-		{
-			farthestCornerDistance = distance;
-		}
-	}
-	tr.viewParms.zFar = sqrt( farthestCornerDistance );
-}
-
-
-/*
-===============
-R_SetupProjection
-===============
-*/
-void R_SetupProjection( void ) {
-	float	xmin, xmax, ymin, ymax;
-	float	width, height, depth;
-	float	zNear, zFar;
-
-	// dynamically compute far clip plane distance
-	SetFarClip();
-
-	//
-	// set up projection matrix
-	//
-	zNear	= r_znear->value;
-	zFar	= tr.viewParms.zFar;
-
-	ymax = zNear * tan( tr.refdef.fov_y * M_PI / 360.0f );
-	ymin = -ymax;
-
-	xmax = zNear * tan( tr.refdef.fov_x * M_PI / 360.0f );
-	xmin = -xmax;
-
-	width = xmax - xmin;
-	height = ymax - ymin;
-	depth = zFar - zNear;
-
-	tr.viewParms.projectionMatrix[0] = 2 * zNear / width;
-	tr.viewParms.projectionMatrix[4] = 0;
-	tr.viewParms.projectionMatrix[8] = ( xmax + xmin ) / width;	// normally 0
-	tr.viewParms.projectionMatrix[12] = 0;
-
-	tr.viewParms.projectionMatrix[1] = 0;
-	tr.viewParms.projectionMatrix[5] = 2 * zNear / height;
-	tr.viewParms.projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
-	tr.viewParms.projectionMatrix[13] = 0;
-
-	tr.viewParms.projectionMatrix[2] = 0;
-	tr.viewParms.projectionMatrix[6] = 0;
-	tr.viewParms.projectionMatrix[10] = -( zFar + zNear ) / depth;
-	tr.viewParms.projectionMatrix[14] = -2 * zFar * zNear / depth;
-
-	tr.viewParms.projectionMatrix[3] = 0;
-	tr.viewParms.projectionMatrix[7] = 0;
-	tr.viewParms.projectionMatrix[11] = -1;
-	tr.viewParms.projectionMatrix[15] = 0;
-}
-
-/*
-=================
-R_SetupFrustum
-
-Setup that culling frustum planes for the current view
-=================
-*/
-void R_SetupFrustum (void) {
-	int		i;
-	float	xs, xc;
-	float	ang;
-
-	ang = tr.viewParms.fovX / 180 * M_PI * 0.5f;
-	xs = sin( ang );
-	xc = cos( ang );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[0].normal );
-	VectorMA( tr.viewParms.frustum[0].normal, xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[0].normal );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[1].normal );
-	VectorMA( tr.viewParms.frustum[1].normal, -xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[1].normal );
-
-	ang = tr.viewParms.fovY / 180 * M_PI * 0.5f;
-	xs = sin( ang );
-	xc = cos( ang );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[2].normal );
-	VectorMA( tr.viewParms.frustum[2].normal, xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[2].normal );
-
-	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[3].normal );
-	VectorMA( tr.viewParms.frustum[3].normal, -xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[3].normal );
-
-	for (i=0 ; i<4 ; i++) {
-		tr.viewParms.frustum[i].type = PLANE_NON_AXIAL;
-		tr.viewParms.frustum[i].dist = DotProduct (tr.viewParms.ori.origin, tr.viewParms.frustum[i].normal);
-		SetPlaneSignbits( &tr.viewParms.frustum[i] );
-	}
-
-	if (tr.portalsky.inUse) {
-		tr.viewParms.farplane_distance = 0.0;
-	}
-	else if (r_farplane->integer)
-	{
-		tr.viewParms.farplane_distance = r_farplane->value;
-
-		sscanf(
-			r_farplane_color->string,
-			"%f %f %f",
-			&tr.viewParms.farplane_color[0],
-			&tr.viewParms.farplane_color[1],
-			&tr.viewParms.farplane_color[2]);
-
-		tr.viewParms.farplane_cull = !r_farplane_nocull->integer;
-	}
-
-	if (tr.viewParms.farplane_distance)
-	{
-		vec3_t farPoint;
-		float realPlaneLen;
-		float tmp;
-		vec4_t fogColor;
-
-		tr.viewParms.fog.len = tr.viewParms.farplane_distance;
-		tr.viewParms.fog.oolen = 1.0 / tr.viewParms.farplane_distance;
-
-		farPoint[0] = tr.viewParms.ori.origin[0] + tr.viewParms.ori.axis[0][0] * tr.viewParms.farplane_distance;
-		farPoint[1] = tr.viewParms.ori.origin[1] + tr.viewParms.ori.axis[0][1] * tr.viewParms.farplane_distance;
-		farPoint[2] = tr.viewParms.ori.origin[2] + tr.viewParms.ori.axis[0][2] * tr.viewParms.farplane_distance;
-
-		VectorNegate(tr.viewParms.ori.axis[0], tr.viewParms.frustum[4].normal);
-		tr.viewParms.frustum[4].type = PLANE_NON_AXIAL;
-		tr.viewParms.frustum[4].dist = DotProduct(farPoint, tr.viewParms.frustum[4].normal);
-		SetPlaneSignbits(&tr.viewParms.frustum[4]);
-
-		tr.viewParms.fog.enabled = r_farplane_nofog->integer == 0;
-		tr.viewParms.fog.extrafrustums = tr.viewParms.farplane_cull ? 1 : 0;
-
-		if (!r_farplane_nofog->integer)
-		{
-			qglFogf(GL_FOG_END, tr.viewParms.farplane_distance);
-
-			fogColor[0] = tr.viewParms.farplane_color[0] * tr.identityLight;
-			fogColor[1] = tr.viewParms.farplane_color[1] * tr.identityLight;
-			fogColor[2] = tr.viewParms.farplane_color[2] * tr.identityLight;
-			fogColor[3] = 1.0;
-
-			GL_SetFogColor(fogColor);
-			glState.externalSetState |= GLS_FOG;
-		}
-		else
-		{
-			glState.externalSetState &= ~GLS_FOG;
-		}
-	}
-	else
-	{
-		tr.viewParms.fog.enabled = 0;
-		tr.viewParms.fog.extrafrustums = 0;
-
-		glState.externalSetState &= ~GLS_FOG;
-	}
-}
-
-
-/*
-=================
-R_MirrorPoint
-=================
-*/
-void R_MirrorPoint (vec3_t in, orientation_t *surface, orientation_t *camera, vec3_t out) {
-	int		i;
-	vec3_t	local;
-	vec3_t	transformed;
-	float	d;
-
-	VectorSubtract( in, surface->origin, local );
-
-	VectorClear( transformed );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		d = DotProduct(local, surface->axis[i]);
-		VectorMA( transformed, d, camera->axis[i], transformed );
-	}
-
-	VectorAdd( transformed, camera->origin, out );
-}
-
-void R_MirrorVector (vec3_t in, orientation_t *surface, orientation_t *camera, vec3_t out) {
-	int		i;
-	float	d;
-
-	VectorClear( out );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		d = DotProduct(in, surface->axis[i]);
-		VectorMA( out, d, camera->axis[i], out );
-	}
-}
-
-
-/*
-=============
-R_PlaneForSurface
-=============
-*/
-void R_PlaneForSurface (surfaceType_t *surfType, cplane_t *plane) {
-	srfTriangles_t	*tri;
-	srfPoly_t		*poly;
-	drawVert_t		*v1, *v2, *v3;
-	vec4_t			plane4;
-
-	if (!surfType) {
-		Com_Memset (plane, 0, sizeof(*plane));
-		plane->normal[0] = 1;
-		return;
-	}
-	switch (*surfType) {
-	case SF_FACE:
-		*plane = ((srfSurfaceFace_t *)surfType)->plane;
-		return;
-	case SF_TRIANGLES:
-		tri = (srfTriangles_t *)surfType;
-		v1 = tri->verts + tri->indexes[0];
-		v2 = tri->verts + tri->indexes[1];
-		v3 = tri->verts + tri->indexes[2];
-		PlaneFromPoints( plane4, v1->xyz, v2->xyz, v3->xyz );
-		VectorCopy( plane4, plane->normal ); 
-		plane->dist = plane4[3];
-		return;
-	case SF_POLY:
-		poly = (srfPoly_t *)surfType;
-		PlaneFromPoints( plane4, poly->verts[0].xyz, poly->verts[1].xyz, poly->verts[2].xyz );
-		VectorCopy( plane4, plane->normal ); 
-		plane->dist = plane4[3];
-		return;
-	default:
-		Com_Memset (plane, 0, sizeof(*plane));
-		plane->normal[0] = 1;		
-		return;
-	}
-}
-
-/*
-=================
-R_GetPortalOrientation
-
-entityNum is the entity that the portal surface is a part of, which may
-be moving and rotating.
-
-Returns qtrue if it should be mirrored
-=================
-*/
-qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum, 
-							 orientation_t *surface, orientation_t *camera,
-							 vec3_t pvsOrigin, qboolean *mirror ) {
-	int			i;
-	cplane_t	originalPlane, plane;
-	trRefEntity_t	*e;
-	float		d;
-	vec3_t		transformed;
-
-	// create plane axis for the portal we are seeing
-	R_PlaneForSurface( drawSurf->surface, &originalPlane );
-
-	// rotate the plane if necessary
-	if ( entityNum != ENTITYNUM_WORLD ) {
-		tr.currentEntityNum = entityNum;
-		tr.currentEntity = &tr.refdef.entities[entityNum];
-
-		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
-
-		// rotate the plane, but keep the non-rotated version for matching
-		// against the portalSurface entities
-		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
-
-		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
-	} else {
-		plane = originalPlane;
-	}
-
-	VectorCopy( plane.normal, surface->axis[0] );
-	PerpendicularVector( surface->axis[1], surface->axis[0] );
-	CrossProduct( surface->axis[0], surface->axis[1], surface->axis[2] );
-
-	// locate the portal entity closest to this plane.
-	// origin will be the origin of the portal, origin2 will be
-	// the origin of the camera
-	for ( i = 0 ; i < tr.refdef.num_entities ; i++ ) {
-		e = &tr.refdef.entities[i];
-		if ( e->e.reType != RT_PORTALSURFACE ) {
-			continue;
-		}
-
-		d = DotProduct( e->e.origin, originalPlane.normal ) - originalPlane.dist;
-		if ( d > 64 || d < -64) {
-			continue;
-		}
-
-		// get the pvsOrigin from the entity
-		VectorCopy( e->e.oldorigin, pvsOrigin );
-
-		// if the entity is just a mirror, don't use as a camera point
-		if ( e->e.oldorigin[0] == e->e.origin[0] && 
-			e->e.oldorigin[1] == e->e.origin[1] && 
-			e->e.oldorigin[2] == e->e.origin[2] ) {
-			VectorScale( plane.normal, plane.dist, surface->origin );
-			VectorCopy( surface->origin, camera->origin );
-			VectorSubtract( vec3_origin, surface->axis[0], camera->axis[0] );
-			VectorCopy( surface->axis[1], camera->axis[1] );
-			VectorCopy( surface->axis[2], camera->axis[2] );
-
-			*mirror = qtrue;
-			return qtrue;
-		}
-
-		// project the origin onto the surface plane to get
-		// an origin point we can rotate around
-		d = DotProduct( e->e.origin, plane.normal ) - plane.dist;
-		VectorMA( e->e.origin, -d, surface->axis[0], surface->origin );
-			
-		// now get the camera origin and orientation
-		VectorCopy( e->e.oldorigin, camera->origin );
-		AxisCopy( e->e.axis, camera->axis );
-		VectorSubtract( vec3_origin, camera->axis[0], camera->axis[0] );
-		VectorSubtract( vec3_origin, camera->axis[1], camera->axis[1] );
-
-		// optionally rotate
-		if ( e->e.skinNum ) {
-			d = e->e.skinNum;
-			VectorCopy( camera->axis[1], transformed );
-			RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-			CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-		}
-		*mirror = qfalse;
-		return qtrue;
-	}
-
-	// if we didn't locate a portal entity, don't render anything.
-	// We don't want to just treat it as a mirror, because without a
-	// portal entity the server won't have communicated a proper entity set
-	// in the snapshot
-
-	// unfortunately, with local movement prediction it is easily possible
-	// to see a surface before the server has communicated the matching
-	// portal surface entity, so we don't want to print anything here...
-
-	//ri.Printf( PRINT_ALL, "Portal surface without a portal entity\n" );
-
-	return qfalse;
-}
-
-static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
-{
-	int			i;
-	cplane_t	originalPlane, plane;
-	trRefEntity_t	*e;
-	float		d;
-
-	// create plane axis for the portal we are seeing
-	R_PlaneForSurface( drawSurf->surface, &originalPlane );
-
-	// rotate the plane if necessary
-	if ( entityNum != ENTITYNUM_WORLD ) 
-	{
-		tr.currentEntityNum = entityNum;
-		tr.currentEntity = &tr.refdef.entities[entityNum];
-
-		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
-
-		// rotate the plane, but keep the non-rotated version for matching
-		// against the portalSurface entities
-		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
-
-		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
-	} 
-	else 
-	{
-		plane = originalPlane;
-	}
-
-	// locate the portal entity closest to this plane.
-	// origin will be the origin of the portal, origin2 will be
-	// the origin of the camera
-	for ( i = 0 ; i < tr.refdef.num_entities ; i++ ) 
-	{
-		e = &tr.refdef.entities[i];
-		if ( e->e.reType != RT_PORTALSURFACE ) {
-			continue;
-		}
-
-		d = DotProduct( e->e.origin, originalPlane.normal ) - originalPlane.dist;
-		if ( d > 64 || d < -64) {
-			continue;
-		}
-
-		// if the entity is just a mirror, don't use as a camera point
-		if ( e->e.oldorigin[0] == e->e.origin[0] && 
-			e->e.oldorigin[1] == e->e.origin[1] && 
-			e->e.oldorigin[2] == e->e.origin[2] ) 
-		{
-			return qtrue;
-		}
-
-		return qfalse;
-	}
-	return qfalse;
-}
-
-/*
-** SurfIsOffscreen
-**
-** Determines if a surface is completely offscreen.
-*/
-qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum) {
-	float shortest = 100000000;
-	int numTriangles;
-	qboolean doRange;
-	orientationr_t surfOr;
-	unsigned int* indices;
-	vec4_t clip, eye;
-	int i;
-	unsigned int pointOr = 0;
-	unsigned int pointAnd = (unsigned int)~0;
-	
-	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
-		return qfalse;
-	}
-
-	if (entityNum == ENTITYNUM_WORLD) {
-		surfOr = tr.viewParms.world;
-	} else {
-		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
-	}
-
-	assert( tess.numVertexes < 128 );
-
-	for ( i = 0; i < tess.numVertexes; i++ )
-	{
-		int j;
-		unsigned int pointFlags = 0;
-
-		R_TransformModelToClip( tess.xyz[i], tr.ori.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
-
-		for ( j = 0; j < 3; j++ )
-		{
-			if ( clip[j] >= clip[3] )
-			{
-				pointFlags |= (1 << (j*2));
-			}
-			else if ( clip[j] <= -clip[3] )
-			{
-				pointFlags |= ( 1 << (j*2+1));
-			}
-		}
-		pointAnd &= pointFlags;
-		pointOr |= pointFlags;
-	}
-
-	// trivially reject
-	if ( pointAnd )
-	{
-		return qtrue;
-	}
-
-	// determine if this surface is backfaced and also determine the distance
-	// to the nearest vertex so we can cull based on portal range.  Culling
-	// based on vertex distance isn't 100% correct (we should be checking for
-	// range to the surface), but it's good enough for the types of portals
-	// we have in the game right now.
-	numTriangles = tess.numIndexes / 3;
-
-	for ( i = 0; i < tess.numIndexes; i += 3 )
-	{
-		vec3_t normal;
-		float dot;
-		float len;
-
-		VectorSubtract( tess.xyz[tess.indexes[i]], tr.viewParms.ori.origin, normal );
-
-		len = VectorLengthSquared( normal );			// lose the sqrt
-		if ( len < shortest )
-		{
-			shortest = len;
-		}
-
-		if ( ( dot = DotProduct( normal, tess.normal[tess.indexes[i]] ) ) >= 0 )
-		{
-			numTriangles--;
-		}
-	}
-	if ( !numTriangles )
-	{
-		return qtrue;
-	}
-
-	if (shader->fDistRange > 0.0)
-	{
-		if (shortest > (tess.shader->portalRange * tess.shader->portalRange))
-		{
-			return qtrue;
-		}
-	}
-
-	return qfalse;
-}
-
-static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
-	int entityNum;
-	shader_t* shader;
-	int dlighted;
-	qboolean bStaticModel;
-
-	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
-	return SurfIsOffscreen((srfSurfaceFace_t*)drawSurf->surface, shader, entityNum);
-}
-
-/*
-========================
-R_MirrorViewBySurface
-
-Returns qtrue if another view has been rendered
-========================
-*/
-qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
-	viewParms_t		newParms;
-	viewParms_t		oldParms;
-	orientation_t	surface, camera;
-
-	// don't recursively mirror
-	if (tr.viewParms.isPortal) {
-		ri.Printf( PRINT_DEVELOPER, "WARNING: recursive mirror/portal found\n" );
-		return qfalse;
-	}
-
-	if ( r_noportals->integer || (r_fastsky->integer == 1) ) {
-		return qfalse;
-	}
-
-	// trivially reject portal/mirror
-	if (DrawSurfIsOffscreen( drawSurf ) ) {
-		return qfalse;
-	}
-
-	// save old viewParms so we can return to it after the mirror view
-	oldParms = tr.viewParms;
-
-	newParms = tr.viewParms;
-	newParms.isPortal = qtrue;
-	if ( !R_GetPortalOrientations( drawSurf, entityNum, &surface, &camera, 
-		newParms.pvsOrigin, &newParms.isMirror ) ) {
-		return qfalse;		// bad portal, no portalentity
-	}
-
-	R_MirrorPoint (oldParms.ori.origin, &surface, &camera, newParms.ori.origin );
-
-	VectorSubtract( vec3_origin, camera.axis[0], newParms.portalPlane.normal );
-	newParms.portalPlane.dist = DotProduct( camera.origin, newParms.portalPlane.normal );
-	
-	R_MirrorVector (oldParms.ori.axis[0], &surface, &camera, newParms.ori.axis[0]);
-	R_MirrorVector (oldParms.ori.axis[1], &surface, &camera, newParms.ori.axis[1]);
-	R_MirrorVector (oldParms.ori.axis[2], &surface, &camera, newParms.ori.axis[2]);
-
-	// OPTIMIZE: restrict the viewport on the mirrored view
-
-	// render the mirror view
-	R_RenderView (&newParms);
-
-	tr.viewParms = oldParms;
-
-	return qtrue;
-}
-
-/*
-==========================================================================================
-
-DRAWSURF SORTING
-
-==========================================================================================
-*/
-
-static void SwapDrawSurf(drawSurf_t* a, drawSurf_t* b) {
-	drawSurf_t temp = *a;
-	*a = *b;
-	*b = temp;
-}
-
-/*
-=================
-qsort replacement
-
-=================
-*/
-//#define	SWAP_DRAW_SURF(a,b) temp=((int *)a)[0];((int *)a)[0]=((int *)b)[0];((int *)b)[0]=temp; temp=((int *)a)[1];((int *)a)[1]=((int *)b)[1];((int *)b)[1]=temp;
-
-/* this parameter defines the cutoff between using quick sort and
-   insertion sort for arrays; arrays with lengths shorter or equal to the
-   below value use insertion sort */
-
-#define CUTOFF 8            /* testing shows that this is good value */
-
-static void shortsort( drawSurf_t *lo, drawSurf_t *hi ) {
-    drawSurf_t	*p, *max;
-	int			temp;
-
-    while (hi > lo) {
-        max = lo;
-        for (p = lo + 1; p <= hi; p++ ) {
-            if ( p->sort > max->sort ) {
-                max = p;
-            }
-        }
-		SwapDrawSurf(max, hi);
-        hi--;
-    }
-}
-
-
-/* sort the array between lo and hi (inclusive)
-FIXME: this was lifted and modified from the microsoft lib source...
- */
-
-void qsortFast (
-    void *base,
-    unsigned num,
-    unsigned width
-    )
-{
-    char *lo, *hi;              /* ends of sub-array currently sorting */
-    char *mid;                  /* points to middle of subarray */
-    char *loguy, *higuy;        /* traveling pointers for partition step */
-    unsigned size;              /* size of the sub-array */
-    char *lostk[30], *histk[30];
-    int stkptr;                 /* stack for saving sub-array to be processed */
-	int	temp;
-
-    /* Note: the number of stack entries required is no more than
-       1 + log2(size), so 30 is sufficient for any array */
-
-    if (num < 2 || width == 0)
-        return;                 /* nothing to do */
-
-    stkptr = 0;                 /* initialize stack */
-
-    lo = base;
-    hi = (char *)base + width * (num-1);        /* initialize limits */
-
-    /* this entry point is for pseudo-recursion calling: setting
-       lo and hi and jumping to here is like recursion, but stkptr is
-       prserved, locals aren't, so we preserve stuff on the stack */
-recurse:
-
-    size = (hi - lo) / width + 1;        /* number of el's to sort */
-
-    /* below a certain size, it is faster to use a O(n^2) sorting method */
-    if (size <= CUTOFF) {
-         shortsort((drawSurf_t *)lo, (drawSurf_t *)hi);
-    }
-    else {
-        /* First we pick a partititioning element.  The efficiency of the
-           algorithm demands that we find one that is approximately the
-           median of the values, but also that we select one fast.  Using
-           the first one produces bad performace if the array is already
-           sorted, so we use the middle one, which would require a very
-           wierdly arranged array for worst case performance.  Testing shows
-           that a median-of-three algorithm does not, in general, increase
-           performance. */
-
-        mid = lo + (size / 2) * width;      /* find middle element */
-		SwapDrawSurf(mid, lo);               /* swap it to beginning of array */
-
-        /* We now wish to partition the array into three pieces, one
-           consisiting of elements <= partition element, one of elements
-           equal to the parition element, and one of element >= to it.  This
-           is done below; comments indicate conditions established at every
-           step. */
-
-        loguy = lo;
-        higuy = hi + width;
-
-        /* Note that higuy decreases and loguy increases on every iteration,
-           so loop must terminate. */
-        for (;;) {
-            /* lo <= loguy < hi, lo < higuy <= hi + 1,
-               A[i] <= A[lo] for lo <= i <= loguy,
-               A[i] >= A[lo] for higuy <= i <= hi */
-
-            do  {
-                loguy += width;
-            } while (loguy <= hi &&  
-				( ((drawSurf_t *)loguy)->sort <= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo < loguy <= hi+1, A[i] <= A[lo] for lo <= i < loguy,
-               either loguy > hi or A[loguy] > A[lo] */
-
-            do  {
-                higuy -= width;
-            } while (higuy > lo && 
-				( ((drawSurf_t *)higuy)->sort >= ((drawSurf_t *)lo)->sort ) );
-
-            /* lo-1 <= higuy <= hi, A[i] >= A[lo] for higuy < i <= hi,
-               either higuy <= lo or A[higuy] < A[lo] */
-
-            if (higuy < loguy)
-                break;
-
-            /* if loguy > hi or higuy <= lo, then we would have exited, so
-               A[loguy] > A[lo], A[higuy] < A[lo],
-               loguy < hi, highy > lo */
-
-			SwapDrawSurf(loguy, higuy);
-
-            /* A[loguy] < A[lo], A[higuy] > A[lo]; so condition at top
-               of loop is re-established */
-        }
-
-        /*     A[i] >= A[lo] for higuy < i <= hi,
-               A[i] <= A[lo] for lo <= i < loguy,
-               higuy < loguy, lo <= higuy <= hi
-           implying:
-               A[i] >= A[lo] for loguy <= i <= hi,
-               A[i] <= A[lo] for lo <= i <= higuy,
-               A[i] = A[lo] for higuy < i < loguy */
-
-		SwapDrawSurf(lo, higuy);     /* put partition element in place */
-
-        /* OK, now we have the following:
-              A[i] >= A[higuy] for loguy <= i <= hi,
-              A[i] <= A[higuy] for lo <= i < higuy
-              A[i] = A[lo] for higuy <= i < loguy    */
-
-        /* We've finished the partition, now we want to sort the subarrays
-           [lo, higuy-1] and [loguy, hi].
-           We do the smaller one first to minimize stack usage.
-           We only sort arrays of length 2 or more.*/
-
-        if ( higuy - 1 - lo >= hi - loguy ) {
-            if (lo + width < higuy) {
-                lostk[stkptr] = lo;
-                histk[stkptr] = higuy - width;
-                ++stkptr;
-            }                           /* save big recursion for later */
-
-            if (loguy < hi) {
-                lo = loguy;
-                goto recurse;           /* do small recursion */
-            }
-        }
-        else {
-            if (loguy < hi) {
-                lostk[stkptr] = loguy;
-                histk[stkptr] = hi;
-                ++stkptr;               /* save big recursion for later */
-            }
-
-            if (lo + width < higuy) {
-                hi = higuy - width;
-                goto recurse;           /* do small recursion */
-            }
-        }
-    }
-
-    /* We have sorted the array, except for any pending sorts on the stack.
-       Check if there are any, and do them. */
-
-    --stkptr;
-    if (stkptr >= 0) {
-        lo = lostk[stkptr];
-        hi = histk[stkptr];
-        goto recurse;           /* pop subarray from stack */
-    }
-    else
-        return;                 /* all subarrays done */
-}
-
-
-//==========================================================================================
-
-/*
-=================
-R_AddDrawSurf
-=================
-*/
-void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap) {
-	int			index;
-
-	// instead of checking for overflow, we just mask the index
-	// so it wraps around
-	index = tr.refdef.numDrawSurfs & DRAWSURF_MASK;
-	// the sort data is packed into a single 32 bit value so it can be
-	// compared quickly during the qsorting process
-	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
-		| tr.shiftedEntityNum | tr.shiftedIsStatic | (dlightMap & 15);
-	tr.refdef.drawSurfs[index].surface = surface;
-	tr.refdef.numDrawSurfs++;
-}
-
-/*
-=================
-R_AddSpriteSurf
-=================
-*/
-void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
-{
-	int index;
-
-	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
-		zDistance = MAX_SPRITE_DIST_SQUARED;
-	}
-
-	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
-    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
-    tr.refdef.spriteSurfs[index].surface = surface;
-    tr.refdef.numSpriteSurfs++;
-}
-
-/*
-=================
-R_DecomposeSort
-=================
-*/
-void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
-	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 1023;
-	*dlightMap = sort & 15;
-	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
-}
-
-/*
-=================
-R_SortDrawSurfs
-=================
-*/
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs, drawSurf_t *spriteSurfs, int numSpriteSurfs ) {
-	shader_t		*shader;
-	int				entityNum;
-	int				dlighted;
-	int				i;
-	qboolean		bStaticModel;
-
-	// it is possible for some views to not have any surfaces
-	if ( numDrawSurfs < 1 ) {
-		// we still need to add it for hyperspace cases
-		R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
-		return;
-	}
-
-	// if we overflowed MAX_DRAWSURFS, the drawsurfs
-	// wrapped around in the buffer and we will be missing
-    // the first surfaces, not the last ones
-    if (numDrawSurfs > MAX_DRAWSURFS) {
-        numDrawSurfs = MAX_DRAWSURFS;
-    }
-    if (numSpriteSurfs > MAX_SPRITESURFS) {
-		numSpriteSurfs = MAX_SPRITESURFS;
-    }
-
-	// sort the drawsurfs by sort type, then orientation, then shader
-	qsortFast (drawSurfs, numDrawSurfs, sizeof(drawSurf_t) );
-	qsortFast (spriteSurfs, numSpriteSurfs, sizeof(drawSurf_t) );
-
-	R_Sky_Render();
-
-	if (!tr.viewParms.isPortal)
-	{
-		// check for any pass through drawing, which
-		// may cause another view to be rendered first
-		for (i = 0; i < numDrawSurfs; i++) {
-			R_DecomposeSort((drawSurfs + i)->sort, &entityNum, &shader, &dlighted, &bStaticModel);
-
-			if (shader->sort > SS_PORTAL) {
-				break;
-			}
-
-			// no shader should ever have this sort type
-			if (shader->sort == SS_BAD) {
-				ri.Error(ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name);
-			}
-
-			// if the mirror was completely clipped away, we may need to check another surface
-			if (R_MirrorViewBySurface((drawSurfs + i), entityNum)) {
-				// this is a debug option to see exactly what is being mirrored
-				if (r_portalOnly->integer) {
-					return;
-				}
-				break;		// only one mirror view at a time
-			}
-		}
-	}
-
-    R_AddDrawSurfCmd(drawSurfs, numDrawSurfs);
-    R_AddSpriteSurfCmd(spriteSurfs, numSpriteSurfs);
-}
-
-/*
-=============
-R_AddEntitySurfaces
-=============
-*/
-void R_AddEntitySurfaces (void) {
-	trRefEntity_t	*ent;
-	shader_t		*shader;
-
-	tr.shiftedIsStatic = 0;
-
-	for ( tr.currentEntityNum = 0; 
-	      tr.currentEntityNum < tr.refdef.num_entities; 
-		  tr.currentEntityNum++ ) {
-		ent = tr.currentEntity = &tr.refdef.entities[tr.currentEntityNum];
-
-		ent->needDlights = qfalse;
-
-		// preshift the value we are going to OR into the drawsurf sort
-		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-		//
-		// the weapon model must be handled special --
-		// we don't want the hacked weapon position showing in 
-		// mirrors, because the true body position will already be drawn
-		//
-		if ( (ent->e.renderfx & RF_FIRST_PERSON) && tr.viewParms.isPortal) {
-			continue;
-		}
-
-		// simple generated models, like sprites and beams, are not culled
-		switch ( ent->e.reType ) {
-		case RT_PORTALSURFACE:
-			break;		// don't draw anything
-		case RT_SPRITE:
-		case RT_BEAM:
-			// self blood sprites, talk balloons, etc should not be drawn in the primary
-			// view.  We can't just do this check for all entities, because md3
-			// entities may still want to cast shadows from them
-			if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
-				continue;
-			}
-			shader = R_GetShaderByHandle( ent->e.customShader );
-			R_AddDrawSurf( &entitySurface, shader, 0 );
-			break;
-
-		case RT_MODEL:
-			// we must set up parts of tr.ori for model culling
-			R_RotateForEntity( ent, &tr.viewParms, &tr.ori );
-
-			tr.currentModel = R_GetModelByHandle( ent->e.hModel );
-			if (!tr.currentModel) {
-				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
-			} else {
-				switch ( tr.currentModel->type ) {
-				case MOD_SPRITE:
-					Com_Printf("sprite model '%s' being added to renderer!\n", tr.currentModel->name);
-					break;
-				case MOD_TIKI:
-					R_AddSkelSurfaces( ent );
-					break;
-				case MOD_BRUSH:
-					R_AddBrushModelSurfaces( ent );
-					break;
-				case MOD_BAD:		// null model axis
-					if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
-						break;
-					}
-					shader = R_GetShaderByHandle( ent->e.customShader );
-					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
-					break;
-				default:
-					ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad modeltype" );
-					break;
-				}
-			}
-			break;
-		default:
-			ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad reType" );
-		}
-	}
-
-}
-
-void R_AddSpriteSurfaces()
-{
-	refSprite_t* sprite;
-	vec3_t delta;
-
-	if (!r_drawsprites->integer) {
-		return;
-	}
-
-	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
-	{
-		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
-
-        if (tr.portalsky.inUse)
-        {
-			if ((sprite->renderfx & RF_SKYENTITY) == 0) {
-				continue;
-			}
-        }
-        else if ((sprite->renderfx & RF_SKYENTITY) != 0)
-        {
-            continue;
-        }
-        
-		if (tr.viewParms.isPortal)
-        {
-			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
-				continue;
-			}
-        }
-		else if (sprite->renderfx & RF_SHADOW_PLANE) {
-			continue;
-		}
-
-		tr.currentEntityNum = ENTITYNUM_WORLD;
-        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-		if (sprite->hModel && sprite->hModel < tr.numModels) {
-			tr.currentModel = &tr.models[sprite->hModel];
-		} else {
-			tr.currentModel = &tr.models[0];
-		}
-
-		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.ori );
-		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
-
-		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
-		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
-	}
-}
-
-/*
-====================
-R_GenerateDrawSurfs
-====================
-*/
-void R_GenerateDrawSurfs( void ) {
-	R_AddWorldSurfaces ();
-	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL)) {
-		R_AddSwipeSurfaces();
-	}
-
-	R_AddPolygonSurfaces();
-
-    R_AddTerrainMarkSurfaces();
-
-    R_AddEntitySurfaces();
-
-	R_AddSpriteSurfaces();
-
-	// set the projection matrix with the minimum zfar
-	// now that we have the world bounded
-	// this needs to be done before entities are
-	// added, because they use the projection
-	// matrix for lod calculation
-	R_SetupProjection ();
-}
-
-/*
-================
-R_DebugPolygon
-================
-*/
-void R_DebugPolygon( int color, int numPoints, float *points ) {
-	int		i;
-
-	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-
-	// draw solid shade
-
-	qglColor3f( color&1, (color>>1)&1, (color>>2)&1 );
-	qglBegin( GL_POLYGON );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		qglVertex3fv( points + i * 3 );
-	}
-	qglEnd();
-
-	// draw wireframe outline
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-	qglDepthRange( 0, 0 );
-	qglColor3f( 1, 1, 1 );
-	qglBegin( GL_POLYGON );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		qglVertex3fv( points + i * 3 );
-	}
-	qglEnd();
-	qglDepthRange( 0, 1 );
-}
-
-/*
-====================
-R_DebugGraphics
-
-Visualization aid for movement clipping debugging
-====================
-*/
-void R_DebugGraphics( void ) {
-	if ( !r_debugSurface->integer ) {
-		return;
-	}
-
-	// the render thread can't make callbacks to the main thread
-	R_SyncRenderThread();
-
-	GL_Bind( tr.whiteImage);
-	GL_Cull( CT_FRONT_SIDED );
-	ri.CM_DrawDebugSurface( R_DebugPolygon );
-}
-
-#define CIRCLE_LENGTH		25
-
-/*
-================
-R_DebugCircle
-================
-*/
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
-    int				i;
-    float			ang;
-	debugline_t* line;
-	vec3_t			forward, right;
-	vec3_t			pos, lastpos;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (horizontal)
-	{
-		VectorSet(forward, 1, 0, 0);
-		VectorSet(right, 0, 1, 0);
-	}
-	else
-	{
-		VectorCopy(tr.refdef.viewaxis[1], right);
-		VectorCopy(tr.refdef.viewaxis[2], forward);
-	}
-
-	VectorClear(pos);
-	VectorClear(lastpos);
-
-	for (i = 0; i < CIRCLE_LENGTH; i++) {
-		VectorCopy(pos, lastpos);
-
-		ang = (float)i * 0.0174532925199433f;
-		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
-			cos(ang) * radius * right[0];
-		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
-			cos(ang) * radius * right[1];
-		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
-			cos(ang) * radius * right[2];
-
-		if (i > 0)
-		{
-			if (*ri.numDebugLines >= r_numdebuglines->integer) {
-				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
-				return;
-			}
-
-			line = &(*ri.DebugLines)[*ri.numDebugLines];
-			(*ri.numDebugLines)++;
-			VectorCopy(lastpos, line->start);
-			VectorCopy(pos, line->end);
-			VectorSet(line->color, r, g, b);
-			line->alpha = alpha;
-			line->width = 1.0;
-			line->factor = 1;
-			line->pattern = -1;
-		}
-	}
-}
-
-/*
-================
-R_DebugLine
-================
-*/
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
-	debugline_t* line;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (*ri.numDebugLines >= r_numdebuglines->integer) {
-		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
-		return;
-	}
-
-	line = &(*ri.DebugLines)[*ri.numDebugLines];
-	(*ri.numDebugLines)++;
-	VectorCopy(start, line->start);
-	VectorCopy(end, line->end);
-	VectorSet(line->color, r, g, b);
-	line->alpha = alpha;
-	line->width = 1.0;
-	line->factor = 1;
-	line->pattern = -1;
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugLines(void) {
-	debugline_t* line;
-	int i;
-	float width;
-	int factor;
-	unsigned short pattern;
-
-	if (!ri.DebugLines || !ri.numDebugLines) {
-		return;
-	}
-
-	if (!*ri.numDebugLines) {
-		return;
-	}
-
-	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-		return;
-	}
-
-	if (tr.portalsky.inUse) {
-		return;
-	}
-
-    R_SyncRenderThread();
-    GL_Bind(tr.whiteImage);
-	if (r_debuglines_depthmask->integer) {
-		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-	} else {
-		GL_State(GLS_POLYMODE_LINE);
-	}
-
-    qglDisableClientState(GL_COLOR_ARRAY);
-    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-    width = 1.0;
-    factor = 4;
-    pattern = -1;
-
-    if (r_stipplelines->integer)
-    {
-        qglEnable(GL_LINE_STIPPLE);
-        qglLineStipple(4, -1);
-        qglLineWidth(1.0f);
-    }
-
-	qglBegin(GL_LINES);
-
-	for (i = 0; i < *ri.numDebugLines; i++) {
-		line = &(*ri.DebugLines)[i];
-
-		if (r_stipplelines->integer) {
-			if (line->width != width || line->factor != factor || line->pattern != pattern) {
-				qglEnd();
-				qglLineStipple(line->factor, line->pattern);
-                qglLineWidth(line->width);
-                qglBegin(GL_LINES);
-                factor = line->factor;
-                width = line->width;
-                pattern = line->pattern;
-			}
-		}
-
-		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
-        qglVertex3fv(line->start);
-        qglVertex3fv(line->end);
-	}
-
-    qglEnd();
-
-    if (r_stipplelines->integer)
-    {
-        qglDisable(GL_LINE_STIPPLE);
-        qglLineStipple(1, -1);
-        qglLineWidth(1.0);
-    }
-
-    qglDepthRange(0.0, 1.0);
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugStrings(void) {
-	int i;
-	debugstring_t* string;
-
-	if (!ri.DebugStrings || !ri.numDebugStrings) {
-		return;
-	}
-
-	if (!*ri.numDebugStrings) {
-		return;
-	}
-
-    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-        return;
-    }
-
-    if (tr.portalsky.inUse) {
-        return;
-    }
-
-	for (i = 0; i < *ri.numDebugStrings; i++) {
-		string = &(*ri.DebugStrings)[i];
-
-		R_DrawFloatingString(
-			tr.pFontDebugStrings,
-			string->szText,
-			string->pos,
-			string->color,
-			string->scale,
-			64
-		);
-	}
-}
-
-/*
-================
-R_RenderView
-
-A view may be either the actual camera view,
-or a mirror / remote location
-================
-*/
-void R_RenderView (viewParms_t *parms) {
-	int		firstDrawSurf;
-	int		firstSpriteSurf;
-
-	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
-		return;
-	}
-
-	tr.viewCount++;
-
-	tr.viewParms = *parms;
-	tr.viewParms.frameSceneNum = tr.frameSceneNum;
-	tr.viewParms.frameCount = tr.frameCount;
-
-	firstDrawSurf = tr.refdef.numDrawSurfs;
-	firstSpriteSurf = tr.refdef.numSpriteSurfs;
-
-	tr.viewCount++;
-
-	// set viewParms.world
-	R_RotateForViewer ();
-
-	R_SetupFrustum ();
-
-	R_Sky_Reset();
-
-	R_DrawDebugStrings();
-
-	R_GenerateDrawSurfs();
-
-    R_SortDrawSurfs(
-		tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
-		tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
-	);
-
-	R_DrawDebugLines();
-
-	// draw main system development information (surface outlines, etc)
-	R_DebugGraphics();
-}
-
-
-
diff --git a/code/renderer/tr_marks.c b/code/renderer/tr_marks.c
deleted file mode 100644
index 0ce4db24..00000000
--- a/code/renderer/tr_marks.c
+++ /dev/null
@@ -1,953 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_marks.c -- polygon projection on the world polygons
-
-#include "tr_local.h"
-//#include "assert.h"
-
-#define MAX_VERTS_ON_POLY		64
-
-#define MARKER_OFFSET			0	// 1
-
-/*
-=============
-R_ChopPolyBehindPlane
-
-Out must have space for two more vertexes than in
-=============
-*/
-#define	SIDE_FRONT	0
-#define	SIDE_BACK	1
-#define	SIDE_ON		2
-static void R_ChopPolyBehindPlane( int numInPoints, const vec3_t inPoints[MAX_VERTS_ON_POLY],
-								   int *numOutPoints, vec3_t outPoints[MAX_VERTS_ON_POLY], 
-							const vec3_t normal, vec_t dist, vec_t epsilon) {
-	float		dists[MAX_VERTS_ON_POLY+4];
-	int			sides[MAX_VERTS_ON_POLY+4];
-	int			counts[3];
-	float		dot;
-	int			i, j;
-	const float* p1, * p2;
-	float		*clip;
-	float		d;
-
-	// don't clip if it might overflow
-	if ( numInPoints >= MAX_VERTS_ON_POLY - 2 ) {
-		*numOutPoints = 0;
-		return;
-	}
-
-	counts[0] = counts[1] = counts[2] = 0;
-
-	// determine sides for each point
-	for ( i = 0 ; i < numInPoints ; i++ ) {
-		dot = DotProduct( inPoints[i], normal );
-		dot -= dist;
-		dists[i] = dot;
-		if ( dot > epsilon ) {
-			sides[i] = SIDE_FRONT;
-		} else if ( dot < -epsilon ) {
-			sides[i] = SIDE_BACK;
-		} else {
-			sides[i] = SIDE_ON;
-		}
-		counts[sides[i]]++;
-	}
-	sides[i] = sides[0];
-	dists[i] = dists[0];
-
-	*numOutPoints = 0;
-
-	if ( !counts[0] ) {
-		return;
-	}
-	if ( !counts[1] ) {
-		*numOutPoints = numInPoints;
-		Com_Memcpy( outPoints, inPoints, numInPoints * sizeof(vec3_t) );
-		return;
-	}
-
-	for ( i = 0 ; i < numInPoints ; i++ ) {
-		p1 = inPoints[i];
-		clip = outPoints[ *numOutPoints ];
-		
-		if ( sides[i] == SIDE_ON ) {
-			VectorCopy( p1, clip );
-			(*numOutPoints)++;
-			continue;
-		}
-	
-		if ( sides[i] == SIDE_FRONT ) {
-			VectorCopy( p1, clip );
-			(*numOutPoints)++;
-			clip = outPoints[ *numOutPoints ];
-		}
-
-		if ( sides[i+1] == SIDE_ON || sides[i+1] == sides[i] ) {
-			continue;
-		}
-			
-		// generate a split point
-		p2 = inPoints[ (i+1) % numInPoints ];
-
-		d = dists[i] - dists[i+1];
-		if ( d == 0 ) {
-			dot = 0;
-		} else {
-			dot = dists[i] / d;
-		}
-
-		// clip xyz
-
-		for (j=0 ; j<3 ; j++) {
-			clip[j] = p1[j] + dot * ( p2[j] - p1[j] );
-		}
-
-		(*numOutPoints)++;
-	}
-}
-
-/*
-=================
-R_BoxSurfaces_r
-
-=================
-*/
-void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **list, int listsize, int *listlength, vec3_t dir) {
-
-	int			s, c;
-	msurface_t	*surf, **mark;
-
-	// do the tail recursion in a loop
-	while ( node->contents == -1 ) {
-		s = BoxOnPlaneSide( mins, maxs, node->plane );
-		if (s == 1) {
-			node = node->children[0];
-		} else if (s == 2) {
-			node = node->children[1];
-		} else {
-			R_BoxSurfaces_r(node->children[0], mins, maxs, list, listsize, listlength, dir);
-			node = node->children[1];
-		}
-	}
-
-	// add the individual surfaces
-	mark = node->firstmarksurface;
-	c = node->nummarksurfaces;
-	while (c--) {
-		//
-		if (*listlength >= listsize) break;
-		//
-		surf = *mark;
-		// check if the surface has NOIMPACT or NOMARKS set
-		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) ) ) {
-			surf->viewCount = tr.viewCount;
-		}
-		// extra check for surfaces to avoid list overflows
-		else if (*(surf->data) == SF_FACE) {
-			// the face plane should go through the box
-			s = BoxOnPlaneSide( mins, maxs, &(( srfSurfaceFace_t * ) surf->data)->plane );
-			if (s == 1 || s == 2) {
-				surf->viewCount = tr.viewCount;
-			} else if (DotProduct((( srfSurfaceFace_t * ) surf->data)->plane.normal, dir) > -0.5) {
-			// don't add faces that make sharp angles with the projection direction
-				surf->viewCount = tr.viewCount;
-			}
-		}
-		else if (*(surfaceType_t *) (surf->data) != SF_GRID) surf->viewCount = tr.viewCount;
-		// check the viewCount because the surface may have
-		// already been added if it spans multiple leafs
-		if (surf->viewCount != tr.viewCount) {
-			surf->viewCount = tr.viewCount;
-			list[*listlength] = (surfaceType_t *) surf->data;
-			(*listlength)++;
-		}
-		mark++;
-	}
-}
-
-/*
-=================
-R_AddMarkFragments
-
-=================
-*/
-void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POLY],
-				   int numPlanes, const vec3_t *normals, const float *dists,
-				   int maxPoints, vec3_t pointBuffer,
-				   markFragment_t *fragmentBuffer,
-				   int *returnedPoints, int *returnedFragments,
-				   float fOnEpsilon) {
-	int pingPong, i;
-	markFragment_t	*mf;
-
-	// chop the surface by all the bounding planes of the to be projected polygon
-	pingPong = 0;
-
-	for ( i = 0 ; i < numPlanes ; i++ ) {
-
-		R_ChopPolyBehindPlane( numClipPoints, clipPoints[pingPong],
-						   &numClipPoints, clipPoints[!pingPong],
-							normals[i], dists[i], 0.5 );
-		pingPong ^= 1;
-		if ( numClipPoints == 0 ) {
-			break;
-		}
-	}
-	// completely clipped away?
-	if ( numClipPoints == 0 ) {
-		return;
-	}
-
-	// add this fragment to the returned list
-	if ( numClipPoints + (*returnedPoints) > maxPoints ) {
-		return;	// not enough space for this polygon
-	}
-
-	mf = fragmentBuffer + (*returnedFragments);
-	mf->firstPoint = (*returnedPoints);
-	mf->numPoints = numClipPoints;
-	mf->iIndex = 0;
-	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
-
-	(*returnedPoints) += numClipPoints;
-	(*returnedFragments)++;
-}
-
-void R_AddMarkFragmentsToTerrain(
-	cTerraPatchUnpacked_t* pTerPatch,
-	int numPlanes,
-    const vec3_t* normals,
-    float* dists,
-	int maxPoints,
-	vec3_t pointBuffer,
-	markFragment_t* fragmentBuffer,
-	int* returnedPoints,
-	int* returnedFragments
-)
-{
-	int i, j;
-	int iType;
-	int iFirstFragment;
-	unsigned char* pubHeight;
-	vec3_t v[8];
-	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
-
-	dists[numPlanes - 2] -= 96.f;
-	dists[numPlanes - 1] -= 108.f;
-
-	v[0][0] = pTerPatch->x0;
-	v[0][1] = pTerPatch->y0;
-	v[0][2] = pTerPatch->z0;
-	v[1][0] = pTerPatch->x0;
-	v[1][1] = pTerPatch->y0 + 512.f;
-    v[1][2] = pTerPatch->z0;
-    v[2][0] = pTerPatch->x0 + 512.f;
-    v[2][1] = pTerPatch->y0 + 512.f;
-    v[2][2] = pTerPatch->z0;
-    v[3][0] = pTerPatch->x0 + 512.f;
-    v[3][1] = pTerPatch->y0;
-    v[3][2] = pTerPatch->z0;
-    v[4][0] = pTerPatch->x0;
-    v[4][1] = pTerPatch->y0;
-    v[4][2] = pTerPatch->z0 + 510.f;
-    v[5][0] = pTerPatch->x0;
-    v[5][1] = pTerPatch->y0 + 512.f;
-    v[5][2] = pTerPatch->z0 + 510.f;
-    v[6][0] = pTerPatch->x0 + 512.f;
-    v[6][1] = pTerPatch->y0 + 512.f;
-    v[6][2] = pTerPatch->z0 + 510.f;
-    v[7][0] = pTerPatch->x0 + 512.f;
-    v[7][1] = pTerPatch->y0;
-    v[7][2] = pTerPatch->z0 + 510.f;
-
-	for (i = 0; i < numPlanes; i++) {
-		pubHeight = pTerPatch->heightmap;
-		iFirstFragment = *returnedFragments;
-
-		for (j = 0; j < 8; j++) {
-			if (DotProduct(v[i], normals[i]) - dists[i] > 0.f) {
-				break;
-			}
-		}
-
-		if (j == 8)
-		{
-			dists[numPlanes - 2] += 96.f;
-			dists[numPlanes - 1] += 108.f;
-			return;
-		}
-	}
-
-	pubHeight = pTerPatch->heightmap;
-	iFirstFragment = *returnedFragments;
-
-	for (i = 0; i < 8; i++) {
-		for (j = 0; j < 8; j++) {
-			iType = ri.CM_TerrainSquareType(pTerPatch - tr.world->terraPatches, i, j);
-			if (!iType) {
-				continue;
-			}
-
-			v[0][0] = (i << 6) + pTerPatch->x0;
-			v[0][1] = (j << 6) + pTerPatch->y0;
-            v[0][2] = (pubHeight[0] << 1) + pTerPatch->z0;
-            v[1][0] = (i << 6) + pTerPatch->x0 + 64.f;
-            v[1][1] = (j << 6) + pTerPatch->y0;
-            v[1][2] = (pubHeight[1] << 1) + pTerPatch->z0;
-            v[2][0] = (i << 6) + pTerPatch->x0 + 64.f;
-            v[2][1] = (j << 6) + pTerPatch->y0 + 64.f;
-            v[2][2] = (pubHeight[10] << 1) + pTerPatch->z0;
-            v[3][0] = (i << 6) + pTerPatch->x0;
-            v[3][1] = (j << 6) + pTerPatch->y0 + 64.f;
-            v[3][2] = (pubHeight[9] << 1) + pTerPatch->z0;
-
-			if (((j & 0xFF) + (i & 0xFF)) & 1) {
-				if (iType != 3) {
-					VectorCopy(v[0], clipPoints[0][0]);
-					VectorCopy(v[3], clipPoints[0][1]);
-					VectorCopy(v[1], clipPoints[0][2]);
-
-					R_AddMarkFragments(
-						3,
-						clipPoints,
-						numPlanes,
-						normals,
-						dists,
-						maxPoints,
-						pointBuffer,
-						fragmentBuffer,
-						returnedPoints,
-						returnedFragments,
-						0.f
-					);
-				}
-
-                if (iType != 6) {
-                    VectorCopy(v[2], clipPoints[0][0]);
-                    VectorCopy(v[1], clipPoints[0][1]);
-                    VectorCopy(v[3], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-			} else {
-                if (iType != 5) {
-                    VectorCopy(v[3], clipPoints[0][0]);
-                    VectorCopy(v[2], clipPoints[0][1]);
-                    VectorCopy(v[0], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-
-                if (iType != 4) {
-                    VectorCopy(v[1], clipPoints[0][0]);
-                    VectorCopy(v[0], clipPoints[0][1]);
-                    VectorCopy(v[2], clipPoints[0][2]);
-
-                    R_AddMarkFragments(
-                        3,
-                        clipPoints,
-                        numPlanes,
-                        normals,
-                        dists,
-                        maxPoints,
-                        pointBuffer,
-                        fragmentBuffer,
-                        returnedPoints,
-                        returnedFragments,
-                        0.f
-                    );
-				}
-			}
-		}
-	}
-
-	for (i = iFirstFragment; i < *returnedFragments; i++) {
-		fragmentBuffer[i].iIndex = pTerPatch - tr.world->terraPatches + 1;
-	}
-
-    dists[numPlanes - 2] += 96.f;
-    dists[numPlanes - 1] += 108.f;
-}
-
-void R_TessellateMarkFragments(
-	int* pReturnedPoints,
-	int* pReturnedFragments,
-	int numsurfaces,
-	surfaceType_t** surfaces,
-	const vec3_t projectionDir,
-	int numPlanes,
-    const vec3_t* normals,
-    float* dists,
-	int maxPoints,
-	vec3_t pointBuffer,
-	int maxFragments,
-	markFragment_t* fragmentBuffer,
-	float fRadiusSquared
-)
-{
-	int i, j, k, m, n;
-	int* indexes;
-	float* v;
-	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
-	vec3_t v1, v2;
-	vec3_t normal;
-	drawVert_t* dv;
-	qboolean bSkipTerrain;
-	srfGridMesh_t* cv;
-	srfSurfaceFace_t* surf;
-	cTerraPatchUnpacked_t* terraPatch;
-	int numClipPoints;
-
-    bSkipTerrain = ter_minMarkRadius->value * ter_minMarkRadius->value >= (long double)fRadiusSquared;
-
-	for (i = 0; i < numsurfaces; i++) {
-		if (*surfaces[i] == SF_GRID) {
-			cv = (srfGridMesh_t*)surfaces[i];
-
-			for (m = 0; m < cv->height - 1; m++) {
-				for (n = 0; n < cv->width - 1; n++) {
-					// We triangulate the grid and chop all triangles within
-					// the bounding planes of the to be projected polygon.
-					// LOD is not taken into account, not such a big deal though.
-					//
-					// It's probably much nicer to chop the grid itself and deal
-					// with this grid as a normal SF_GRID surface so LOD will
-					// be applied. However the LOD of that chopped grid must
-					// be synced with the LOD of the original curve.
-					// One way to do this; the chopped grid shares vertices with
-					// the original curve. When LOD is applied to the original
-					// curve the unused vertices are flagged. Now the chopped curve
-					// should skip the flagged vertices. This still leaves the
-					// problems with the vertices at the chopped grid edges.
-					//
-					// To avoid issues when LOD applied to "hollow curves" (like
-					// the ones around many jump pads) we now just add a 2 unit
-					// offset to the triangle vertices.
-					// The offset is added in the vertex normal vector direction
-					// so all triangles will still fit together.
-					// The 2 unit offset should avoid pretty much all LOD problems.
-
-                    numClipPoints = 3;
-
-                    dv = cv->verts + m * cv->width + n;
-
-                    VectorCopy(dv[0].xyz, clipPoints[0][0]);
-                    VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
-                    VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-                    VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-                    VectorCopy(dv[1].xyz, clipPoints[0][2]);
-                    VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
-                    // check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalize(normal);
-                    if (DotProduct(normal, projectionDir) < -0.1) {
-                        // add the fragments of this triangle
-                        R_AddMarkFragments(numClipPoints, clipPoints,
-                            numPlanes, normals, dists,
-                            maxPoints, pointBuffer,
-                            fragmentBuffer,
-                            pReturnedPoints, pReturnedFragments, 0.f);
-
-                        if (*pReturnedFragments == maxFragments) {
-                            return;	// not enough space for more fragments
-                        }
-                    }
-
-					VectorCopy(dv[1].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
-                    // check the normal of this triangle
-                    VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-                    VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-                    CrossProduct(v1, v2, normal);
-                    VectorNormalize(normal);
-                    if (DotProduct(normal, projectionDir) < -0.05) {
-                        // add the fragments of this triangle
-                        R_AddMarkFragments(numClipPoints, clipPoints,
-                            numPlanes, normals, dists,
-                            maxPoints, pointBuffer,
-                            fragmentBuffer,
-                            pReturnedPoints, pReturnedFragments, 0.f);
-
-                        if (*pReturnedFragments == maxFragments) {
-                            return;	// not enough space for more fragments
-                        }
-                    }
-				}
-			}
-		} else if (*surfaces[i] == SF_FACE) {
-            surf = (srfSurfaceFace_t*)surfaces[i];
-            // check the normal of this face
-            if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
-                continue;
-            }
-
-            indexes = (int*)((byte*)surf + surf->ofsIndices);
-
-            for (k = 0; k < surf->numIndices; k += 3) {
-                for (j = 0; j < 3; j++) {
-                    v = surf->points[indexes[k + j]];
-                    VectorMA(v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j]);
-                }
-
-                // add the fragments of this face
-                R_AddMarkFragments(3, clipPoints,
-                    numPlanes, normals, dists,
-                    maxPoints, pointBuffer,
-                    fragmentBuffer,
-                    pReturnedPoints, pReturnedFragments, 0.f);
-                if (*pReturnedFragments == maxFragments) {
-                    return;	// not enough space for more fragments
-                }
-            }
-		} else if (*surfaces[i] == SF_TERRAIN_PATCH) {
-			terraPatch = (cTerraPatchUnpacked_t*)surfaces[i];
-
-			if (!bSkipTerrain) {
-				R_AddMarkFragmentsToTerrain(
-					terraPatch,
-					numPlanes,
-					normals,
-					dists,
-					maxPoints,
-					pointBuffer,
-					fragmentBuffer,
-					pReturnedPoints,
-					pReturnedFragments
-				);
-
-				if (*pReturnedFragments == maxFragments) {
-					return;
-				}
-			}
-		}
-	}
-}
-
-/*
-=================
-R_MarkFragments
-
-=================
-*/
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared ) {
-    int numsurfaces;
-	int i;
-    surfaceType_t* surfaces[64];
-    vec3_t mins, maxs;
-	vec3_t boxsize;
-	float radius;
-	float backpush, frontpush;
-	int returnedFragments;
-	int returnedPoints;
-	vec3_t normals[MAX_VERTS_ON_POLY + 2];
-	float dists[MAX_VERTS_ON_POLY + 2];
-	vec3_t projectionDir;
-	vec3_t v1, v2;
-	float projdir;
-
-	//increment view count for double check prevention
-	tr.viewCount++;
-
-	//
-	VectorNormalize2( projection, projectionDir );
-	// find all the brushes that are to be considered
-	ClearBounds( mins, maxs );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		vec3_t	temp;
-
-		AddPointToBounds( points[i], mins, maxs );
-		VectorAdd( points[i], projection, temp );
-		AddPointToBounds( temp, mins, maxs );
-		// make sure we get all the leafs (also the one(s) in front of the hit surface)
-		VectorMA( points[i], -20, projectionDir, temp );
-		AddPointToBounds( temp, mins, maxs );
-	}
-
-	VectorSubtract(maxs, mins, v1);
-	projdir = -DotProduct(v1, projectionDir);
-	VectorMA(v1, projdir, projectionDir, boxsize);
-	radius = VectorLength(boxsize);
-
-    frontpush = radius;
-    if (radius >= 32.f) frontpush = 32.f;
-    backpush = radius;
-	if (radius >= 20.f) backpush = radius;
-
-	if (numPoints > MAX_VERTS_ON_POLY) numPoints = MAX_VERTS_ON_POLY;
-	// create the bounding planes for the to be projected polygon
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		VectorSubtract(points[(i+1)%numPoints], points[i], v1);
-		VectorAdd(points[i], projection, v2);
-		VectorSubtract(points[i], v2, v2);
-		CrossProduct(v1, v2, normals[i]);
-		VectorNormalizeFast(normals[i]);
-		dists[i] = DotProduct(normals[i], points[i]);
-	}
-	// add near and far clipping planes for projection
-	VectorCopy(projectionDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - frontpush;
-	VectorCopy(projectionDir, normals[numPoints+1]);
-	VectorInverse(normals[numPoints+1]);
-	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - backpush;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-	numsurfaces = 0;
-
-	R_BoxSurfaces_r(tr.world->nodes, mins, maxs, surfaces, 64, &numsurfaces, projectionDir);
-	if (!numsurfaces) return 0;
-
-    R_TessellateMarkFragments(
-        &returnedPoints,
-        &returnedFragments,
-        numsurfaces,
-        surfaces,
-        projectionDir,
-        numPoints + 2,
-        normals,
-        dists,
-        maxPoints,
-        pointBuffer,
-        maxFragments,
-        fragmentBuffer,
-        fRadiusSquared
-	);
-
-    return returnedFragments;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-
-#if 0
-	for ( i = 0 ; i < numsurfaces ; i++ ) {
-
-		if (*surfaces[i] == SF_GRID) {
-			cv = (srfGridMesh_t *) surfaces[i];
-			for ( m = 0 ; m < cv->height - 1 ; m++ ) {
-				for ( n = 0 ; n < cv->width - 1 ; n++ ) {
-					// We triangulate the grid and chop all triangles within
-					// the bounding planes of the to be projected polygon.
-					// LOD is not taken into account, not such a big deal though.
-					//
-					// It's probably much nicer to chop the grid itself and deal
-					// with this grid as a normal SF_GRID surface so LOD will
-					// be applied. However the LOD of that chopped grid must
-					// be synced with the LOD of the original curve.
-					// One way to do this; the chopped grid shares vertices with
-					// the original curve. When LOD is applied to the original
-					// curve the unused vertices are flagged. Now the chopped curve
-					// should skip the flagged vertices. This still leaves the
-					// problems with the vertices at the chopped grid edges.
-					//
-					// To avoid issues when LOD applied to "hollow curves" (like
-					// the ones around many jump pads) we now just add a 2 unit
-					// offset to the triangle vertices.
-					// The offset is added in the vertex normal vector direction
-					// so all triangles will still fit together.
-					// The 2 unit offset should avoid pretty much all LOD problems.
-
-					numClipPoints = 3;
-
-					dv = cv->verts + m * cv->width + n;
-
-					VectorCopy(dv[0].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
-					// check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalizeFast(normal);
-					if (DotProduct(normal, projectionDir) < -0.1) {
-						// add the fragments of this triangle
-						R_AddMarkFragments(numClipPoints, clipPoints,
-										   numPlanes, normals, dists,
-										   maxPoints, pointBuffer,
-										    fragmentBuffer,
-										   &returnedPoints, &returnedFragments, 0.f);
-
-						if ( returnedFragments == maxFragments ) {
-							return returnedFragments;	// not enough space for more fragments
-						}
-					}
-
-					VectorCopy(dv[1].xyz, clipPoints[0][0]);
-					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
-					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
-					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
-					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
-					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
-					// check the normal of this triangle
-					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-					CrossProduct(v1, v2, normal);
-					VectorNormalizeFast(normal);
-					if (DotProduct(normal, projectionDir) < -0.05) {
-						// add the fragments of this triangle
-						R_AddMarkFragments(numClipPoints, clipPoints,
-										   numPlanes, normals, dists,
-										   maxPoints, pointBuffer,
-										    fragmentBuffer,
-										   &returnedPoints, &returnedFragments, 0.f);
-
-						if ( returnedFragments == maxFragments ) {
-							return returnedFragments;	// not enough space for more fragments
-						}
-					}
-				}
-			}
-		}
-		else if (*surfaces[i] == SF_FACE) {
-
-			surf = ( srfSurfaceFace_t * ) surfaces[i];
-			// check the normal of this face
-			if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
-				continue;
-			}
-
-			/*
-			VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
-			VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
-			CrossProduct(v1, v2, normal);
-			VectorNormalize(normal);
-			if (DotProduct(normal, projectionDir) > -0.5) continue;
-			*/
-			indexes = (int *)( (byte *)surf + surf->ofsIndices );
-			for ( k = 0 ; k < surf->numIndices ; k += 3 ) {
-				for ( j = 0 ; j < 3 ; j++ ) {
-					v = surf->points[0] + VERTEXSIZE * indexes[k+j];;
-					VectorMA( v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j] );
-				}
-				// add the fragments of this face
-				R_AddMarkFragments( 3 , clipPoints,
-								   numPlanes, normals, dists,
-								   maxPoints, pointBuffer,
-								   fragmentBuffer,
-								   &returnedPoints, &returnedFragments, 0.f);
-				if ( returnedFragments == maxFragments ) {
-					return returnedFragments;	// not enough space for more fragments
-				}
-			}
-			continue;
-		}
-		else {
-			// ignore all other world surfaces
-			// might be cool to also project polygons on a triangle soup
-			// however this will probably create huge amounts of extra polys
-			// even more than the projection onto curves
-			continue;
-		}
-	}
-	return returnedFragments;
-#endif
-}
-
-void R_BoxSurfacesForBModel_r(bmodel_t* pBmodel, const vec3_t mins, const vec3_t maxs, surfaceType_t** list, int listsize, int* listlength, const vec3_t dir)
-{
-	int s;
-	int c;
-	msurface_t* surf;
-	int i;
-
-	surf = pBmodel->firstSurface;
-
-	for (i = 0; i < listsize && i < pBmodel->numSurfaces; i++, surf++) {
-		s = surf->shader->surfaceFlags;
-		c = surf->shader->contentFlags;
-
-		if (!(s & SURF_NOIMPACT)
-			&& !(s & SURF_NOMARKS)
-			&& !(c & CONTENTS_FOG))
-		{
-			switch (*surf->data)
-			{
-			case SF_FACE:
-            {
-                int plane;
-                srfSurfaceFace_t* face;
-
-				face = (srfSurfaceFace_t*)surf->data;
-				plane = BoxOnPlaneSide(mins, maxs, &face->plane);
-				if (plane == PLANE_Y || plane == PLANE_Z) {
-					surf->viewCount = tr.viewCount;
-				}
-				else if (DotProduct(dir, face->plane.normal) > 0.5f) {
-					surf->viewCount = tr.viewCount;
-				}
-				break;
-			}
-            case SF_GRID:
-                surf->viewCount = tr.viewCount;
-				break;
-			}
-		}
-		else
-		{
-			surf->viewCount = tr.viewCount;
-		}
-
-		if (surf->viewCount != tr.viewCount)
-		{
-			surf->viewCount = tr.viewCount;
-			list[(*listlength)++] = surf->data;
-		}
-	}
-}
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
-{
-	int i;
-	int numsurfaces;
-	vec3_t vTmp;
-	vec3_t v1, v2;
-	vec3_t vMins, vMaxs;
-	vec3_t vTransPoints[64];
-	vec3_t vTransProj;
-	vec3_t vTransProjDir;
-	bmodel_t* pBmodel;
-	surfaceType_t* surfaces[64];
-	int returnedFragments;
-	int returnedPoints;
-	vec3_t normals[MAX_VERTS_ON_POLY+2];
-	float dists[MAX_VERTS_ON_POLY+2];
-
-    tr.viewCount++;
-
-    pBmodel = &tr.world->bmodels[bmodel];
-
-	if (numPoints > 64) {
-		numPoints = 64;
-	}
-
-	if (vAngles[0] || vAngles[1] || vAngles[2])
-	{
-		vec3_t axis[3];
-
-		AngleVectorsLeft(vAngles, axis[0], axis[1], axis[2]);
-	
-		for (i = 0; i < numPoints; i++) {
-			VectorSubtract(points[i], vOrigin, vTmp);
-			MatrixTransformVectorRight(axis, vTmp, vTransPoints[i]);
-		}
-
-		MatrixTransformVectorRight(axis, projection, vTransProj);
-	}
-	else
-	{
-        for (i = 0; i < numPoints; i++) {
-            VectorSubtract(points[i], vOrigin, vTransPoints[i]);
-		}
-
-		VectorCopy(projection, vTransProj);
-	}
-
-    VectorNormalize2(vTransProj, vTransProjDir);
-    ClearBounds(vMins, vMaxs);
-
-	for (i = 0; i < numPoints; i++) {
-		AddPointToBounds(vTransPoints[i], vMins, vMaxs);
-		VectorAdd(vTransPoints[i], vTransProj, vTmp);
-		AddPointToBounds(vTmp, vMins, vMaxs);
-		VectorMA(vTransPoints[i], -20.f, vTransProjDir, vTmp);
-		AddPointToBounds(vTmp, vMins, vMaxs);
-	}
-
-	for (i = 0; i < numPoints; i++) {
-		VectorSubtract(vTransPoints[(i + 1) % numPoints], vTransPoints[i], v1);
-		VectorAdd(vTransPoints[i], vTransProj, v2);
-		VectorSubtract(vTransPoints[i], v2, v2);
-		CrossProduct(v1, v2, normals[i]);
-		VectorNormalize(normals[i]);
-		dists[i] = DotProduct(normals[i], vTransPoints[i]);
-	}
-
-	VectorCopy(vTransProjDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], vTransPoints[0]) - 32.f;
-
-	VectorCopy(vTransProjDir, normals[numPoints + 1]);
-	VectorInverse(normals[numPoints + 1]);
-	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[i]) - 20.f;
-
-	returnedPoints = 0;
-	returnedFragments = 0;
-	numsurfaces = 0;
-
-	R_BoxSurfacesForBModel_r(pBmodel, vMins, vMaxs, surfaces, ARRAY_LEN(surfaces), &numsurfaces, vTransProjDir);
-	if (!numsurfaces) {
-		return 0;
-	}
-
-    R_TessellateMarkFragments(
-        &returnedPoints,
-        &returnedFragments,
-        numsurfaces,
-        surfaces,
-        vTransProjDir,
-        numPoints + 2,
-        normals,
-        dists,
-        maxPoints,
-        pointBuffer,
-        maxFragments,
-        fragmentBuffer,
-        fRadiusSquared
-	);
-
-    return returnedFragments;
-}
\ No newline at end of file
diff --git a/code/renderer/tr_marks_permanent.c b/code/renderer/tr_marks_permanent.c
deleted file mode 100644
index 43b7778b..00000000
--- a/code/renderer/tr_marks_permanent.c
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_marks_pernanent.c: permanent marks
-
-#include "tr_local.h"
-
-typedef struct lmEditPoly_s {
-	srfMarkFragment_t surf;
-	shader_t* shader;
-	int viewCount;
-	polyVert_t verts[8];
-	mnode_t* pLeafs[8];
-	int iNumLeafs;
-} lmEditPoly_t;
-
-typedef struct lmEditMarkDef_s {
-	struct lmEditMarkDef_s* pNextMark;
-	struct lmEditMarkDef_s* pPrevMark;
-	shader_t* markShader;
-	vec3_t vPos;
-	vec3_t vProjection;
-	float fRadius;
-	float fHeightScale;
-	float fWidthScale;
-	float fRotation;
-	float color[4];
-	qboolean bDoLighting;
-	lmEditPoly_t* pMarkEditPolys;
-	int iNumEditPolys;
-	vec3_t vPathCorners[4];
-} lmEditMarkDef_t;
-
-typedef struct lmPoly_s {
-	srfMarkFragment_t surf;
-	shader_t* shader;
-	int viewCount;
-} lmPoly_t;
-
-typedef struct {
-	qboolean bLevelMarksLoaded;
-	char szDCLFilename[MAX_QPATH];
-	lmPoly_t* pMarkFragments;
-	qboolean bAutoApplySettings;
-	lmEditPoly_t* pFreeEditPolys;
-	lmEditMarkDef_t activeMarkDefs;
-	lmEditMarkDef_t* pFreeMarkDefs;
-	lmEditMarkDef_t* pCurrentMark;
-	qboolean bPathLayingMode;
-	treadMark_t treadMark;
-	lmEditMarkDef_t* pTreadMarkStartDecal;
-	lmEditMarkDef_t* pTreadMarkEndDecal;
-} lmGlobals_t;
-
-typedef struct {
-  int ident;
-  int version;
-  int checksum;
-  int iNumDecals;
-  int iNumFragments;
-} dclHeader_t;
-
-typedef struct {
-  char shader[MAX_RES_NAME];
-  vec3_t vPos;
-  vec3_t vProjection;
-  float fRadius;
-  float fHeightScale;
-  float fWidthScale;
-  float fRotation;
-  float color[4];
-  qboolean bDoLighting;
-} dclSavedMarkDef_t;
-
-typedef struct {
-  char shader[MAX_RES_NAME];
-  int fogIndex;
-  int iIndex;
-  int iNumVerts;
-} dclSavedMarkPoly_t;
-
-cvar_t* dcl_editmode;
-cvar_t* dcl_showcurrent;
-cvar_t* dcl_autogetinfo;
-cvar_t* dcl_shiftstep;
-cvar_t* dcl_shader;
-cvar_t* dcl_radius;
-cvar_t* dcl_heightscale;
-cvar_t* dcl_widthscale;
-cvar_t* dcl_rotation;
-cvar_t* dcl_r;
-cvar_t* dcl_g;
-cvar_t* dcl_b;
-cvar_t* dcl_alpha;
-cvar_t* dcl_dolighting;
-cvar_t* dcl_doworld;
-cvar_t* dcl_doterrain;
-cvar_t* dcl_dobmodels;
-cvar_t* dcl_dostring;
-cvar_t* dcl_pathmode;
-cvar_t* dcl_maxsegment;
-cvar_t* dcl_minsegment;
-cvar_t* dcl_maxoffset;
-cvar_t* dcl_texturescale;
-lmGlobals_t lm;
-vec3_t vec_upwards;
-
-void DCLC_Save(void)
-{
-	// FIXME: unimplemented
-}
-
-void R_LevelMarksLoad(const char* szBSPName)
-{
-    // FIXME: unimplemented
-}
-
-void R_RemoveEditPolyFromPointerList(lmEditPoly_t* pPoly, void** pFragmentList, int* piNumFragments)
-{
-	// FIXME: unimplemented
-}
-
-void R_FreeMarkFragments(lmEditMarkDef_t* pMark)
-{
-	// FIXME: unimplemented
-}
-
-void R_InitMarkDef(lmEditMarkDef_t* pMark)
-{
-	// FIXME: unimplemented
-}
-
-lmEditMarkDef_t* R_AllocateMarkDef(void)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
-
-lmEditPoly_t* R_AllocateEditPoly(void)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
-
-qboolean R_AddEditPolyToPointerList(lmEditPoly_t* pPoly, void*** pFragmentList, int* piNumFragments)
-{
-	// FIXME: unimplemented
-	return qfalse;
-}
-
-lmEditMarkDef_t* R_ApplyLevelDecal(const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex)
-{
-	// FIXME: unimplemented
-	return NULL;
-}
-
-void DCLC_Make(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_Reapply(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_Delete(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_SelectNext(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_SelectPrev(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_SelectCh(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_SelectChNxt(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_GetInfo(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_ShiftUp(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_ShiftDown(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_ShiftLeft(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_ShiftRight(void)
-{
-	// FIXME: unimplemented
-}
-
-void DCLC_RandomRoll(void)
-{
-	// FIXME: unimplemented
-}
-
-void R_LevelMarksInit()
-{
-	memset(&lm, 0, sizeof(lm));
-
-	dcl_editmode = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
-	dcl_showcurrent = ri.Cvar_Get("dcl_showcurrent", "1", 0);
-	dcl_autogetinfo = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
-	dcl_shiftstep = ri.Cvar_Get("dcl_shiftstep", "4", 0);
-	dcl_shader = ri.Cvar_Get("dcl_shader", "blastmark", 0);
-	dcl_radius = ri.Cvar_Get("dcl_radius", "16", 0);
-	dcl_heightscale = ri.Cvar_Get("dcl_heightscale", "1", 0);
-	dcl_widthscale = ri.Cvar_Get("dcl_widthscale", "1", 0);
-	dcl_rotation = ri.Cvar_Get("dcl_rotation", "0", 0);
-	dcl_r = ri.Cvar_Get("dcl_r", "1", 0);
-	dcl_g = ri.Cvar_Get("dcl_g", "1", 0);
-	dcl_b = ri.Cvar_Get("dcl_b", "1", 0);
-	dcl_alpha = ri.Cvar_Get("dcl_alpha", "1", 0);
-	dcl_dolighting = ri.Cvar_Get("dcl_dolighting", "1", 0);
-	dcl_doworld = ri.Cvar_Get("dcl_doworld", "1", 0);
-	dcl_doterrain = ri.Cvar_Get("dcl_doterrain", "1", 0);
-	dcl_dobmodels = ri.Cvar_Get("dcl_dobmodels", "1", 0);
-	dcl_dostring = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
-	dcl_pathmode = ri.Cvar_Get("dcl_pathmode", "0", 0);
-	dcl_maxsegment = ri.Cvar_Get("dcl_maxsegment", "512", 0);
-	dcl_minsegment = ri.Cvar_Get("dcl_minsegment", "24", 0);
-	dcl_maxoffset = ri.Cvar_Get("dcl_maxoffset", "10", 0);
-	dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
-
-	if (dcl_editmode->integer)
-	{
-		ri.Cmd_AddCommand("dclc_make", DCLC_Make);
-		ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
-		ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
-		ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
-		ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
-		ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
-		ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
-		ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
-		ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
-		ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
-		ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
-		ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
-		ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
-		ri.Cmd_AddCommand("dclc_save", DCLC_Save);
-
-		lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
-		lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
-	}
-}
-
-void R_LevelMarksFree()
-{
-	int i;
-
-	if (!dcl_editmode->integer) {
-		return;
-	}
-
-	ri.Cmd_RemoveCommand("dclc_make");
-	ri.Cmd_RemoveCommand("dclc_reapply");
-	ri.Cmd_RemoveCommand("dclc_delete");
-	ri.Cmd_RemoveCommand("dclc_selectnext");
-	ri.Cmd_RemoveCommand("dclc_selectprev");
-	ri.Cmd_RemoveCommand("dclc_selectch");
-	ri.Cmd_RemoveCommand("dclc_selectchnxt");
-	ri.Cmd_RemoveCommand("dclc_getinfo");
-	ri.Cmd_RemoveCommand("dclc_shiftup");
-	ri.Cmd_RemoveCommand("dclc_shiftdown");
-	ri.Cmd_RemoveCommand("dclc_shiftleft");
-	ri.Cmd_RemoveCommand("dclc_shiftright");
-	ri.Cmd_RemoveCommand("dclc_randomroll");
-	ri.Cmd_RemoveCommand("dclc_save");
-
-	for (i = 0; i < tr.world->numBmodels; i++)
-	{
-		bmodel_t* pBmodel = &tr.world->bmodels[i];
-		if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment)
-		{
-			ri.Free(pBmodel->pFirstMarkFragment);
-			pBmodel->pFirstMarkFragment = NULL;
-			pBmodel->iNumMarkFragment = 0;
-		}
-	}
-
-	for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++)
-	{
-		mnode_t* pLeaf = &tr.world->nodes[i];
-
-		if (pLeaf->iNumMarkFragment)
-		{
-			if (pLeaf->pFirstMarkFragment)
-			{
-				ri.Free(pLeaf->pFirstMarkFragment);
-				pLeaf->pFirstMarkFragment = NULL;
-				pLeaf->iNumMarkFragment = 0;
-			}
-		}
-	}
-}
-
-void R_UpdateLevelMarksSystem()
-{
-    // FIXME: unimplemented
-}
-
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment) {
-	// FIXME: unimplemented
-}
\ No newline at end of file
diff --git a/code/renderer/tr_model.cpp b/code/renderer/tr_model.cpp
deleted file mode 100644
index ec83911c..00000000
--- a/code/renderer/tr_model.cpp
+++ /dev/null
@@ -1,1550 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_models.cpp -- model loading and caching
-
-#include "tr_local.h"
-#include "tiki.h"
-#include <vector.h>
-
-#define	LL(x) x=LittleLong(x)
-
-qboolean g_bInfoworldtris;
-
-/*
-** R_GetModelByHandle
-*/
-model_t	*R_GetModelByHandle( qhandle_t hModel ) {
-	model_t		*mod;
-
-	// out of range gets the default model
-	if( hModel < 1 || hModel >= tr.numModels ) {
-		return &tr.models[0];
-	}
-
-	mod = &tr.models[hModel];
-
-	return mod;
-}
-
-/*
-** R_Model_GetHandle
-*/
-dtiki_t	*R_Model_GetHandle( qhandle_t handle ) {
-	model_t		*model = R_GetModelByHandle( handle );
-
-	if( model->type == MOD_TIKI ) {
-		return model->d.tiki;
-	}
-
-	return NULL;
-}
-
-//===============================================================================
-
-/*
-** R_FreeModel
-*/
-void R_FreeModel( model_t *mod ) {
-	if( mod->type == MOD_TIKI ) {
-		ri.CG_EndTiki( mod->d.tiki );
-	}
-
-	memset( mod, 0, sizeof( model_t ) );
-}
-
-/*
-** R_AllocModel
-*/
-model_t *R_AllocModel( void ) {
-	int i;
-
-	for( i = 0; i < tr.numModels; i++ )
-	{
-		if( !tr.models[ i ].name[ 0 ] ) {
-			break;
-		}
-	}
-
-	if( i == tr.numModels ) {
-		if( i == MAX_MOD_KNOWN ) {
-			return NULL;
-		}
-		tr.numModels++;
-	}
-
-	tr.models[ i ].index = i;
-
-	return &tr.models[ i ];
-}
-
-/*
-** RE_FreeModels
-*/
-void RE_FreeModels( void ) {
-	int		hModel;
-
-	for( hModel = 0; hModel < tr.numModels; hModel++ )
-	{
-		if( !tr.models[ hModel ].name[ 0 ] ) {
-			continue;
-		}
-
-		R_FreeModel( &tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterShaders
-*/
-void R_RegisterShaders( model_t *mod ) {
-	dtiki_t			*tiki;
-	int				i, j;
-	dtikisurface_t	*psurface;
-	shader_t		*sh;
-
-	tiki = mod->d.tiki;
-
-	for( i = 0; i < tiki->num_surfaces; i++ )
-	{
-		psurface = &tiki->surfaces[ i ];
-
-		assert( psurface->numskins < MAX_TIKI_SHADER );
-		for( j = 0; j < psurface->numskins; j++ )
-		{
-			if( psurface->shader[ j ][ 0 ] ) {
-				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS), !(psurface->flags & TIKI_SURF_NOPICMIP), qtrue, qtrue );
-				psurface->hShader[ j ] = sh->index;
-			} else {
-				psurface->hShader[ j ] = 0;
-			}
-		}
-	}
-}
-
-/*
-** RE_UnregisterServerModel
-*/
-void RE_UnregisterServerModel( qhandle_t hModel ) {
-	if( hModel < 0 || hModel >= MAX_MOD_KNOWN ) {
-		return;
-	}
-
-	if( tr.models[ hModel ].serveronly ) {
-		R_FreeModel( &tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterModelInternal
-*/
-static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki, qboolean use ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	const char	*ptr;
-
-	if( !name || !*name )
-	{
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
-
-	if( strlen( name ) >= 128 )
-	{
-		Com_Printf( "Model name exceeds MAX_MODEL_NAME\n" );
-		return 0;
-	}
-
-	//
-	// search the currently loaded models
-	//
-	for( hModel = 1; hModel < tr.numModels; hModel++ ) {
-		mod = &tr.models[ hModel ];
-		if( !Q_stricmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
-
-	// allocate a new model_t
-
-	if( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name );
-		return 0;
-	}
-
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
-
-
-	// make sure the render thread is stopped
-	R_SyncRenderThread();
-
-	mod->serveronly = qtrue;
-
-	//
-	// load the files
-	//
-	ptr = strrchr( name, '.' );
-
-	if( ptr )
-	{
-		ptr++;
-
-		if( !stricmp( ptr, "spr" ) )
-		{
-			mod->d.sprite = SPR_RegisterSprite( name );
-			strcpy( mod->name, name );
-
-			if( mod->d.sprite )
-			{
-				mod->type = MOD_SPRITE;
-				return mod->index;
-			}
-		}
-		else if( !stricmp( ptr, "tik" ) )
-		{
-			mod->d.tiki = TIKI_RegisterTikiFlags( name, use );
-			strcpy( mod->name, name );
-
-			if( mod->d.tiki )
-			{
-				mod->type = MOD_TIKI;
-				R_RegisterShaders( mod );
-
-				if( bBeginTiki ) {
-					ri.CG_ProcessInitCommands( mod->d.tiki, NULL );
-				}
-
-				return mod->index;
-			}
-		}
-	}
-
-	ri.Printf( PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name );
-	mod->type = MOD_BAD;
-
-	return 0;
-}
-
-/*
-** RE_RegisterServerModel
-*/
-qhandle_t RE_RegisterServerModel( const char *name ) {
-	return R_RegisterModelInternal( name, qtrue, qfalse );
-}
-
-/*
-** RE_SpawnEffectModel
-*/
-qhandle_t RE_SpawnEffectModel( const char *szModel, vec3_t vPos, vec3_t *axis ) {
-	refEntity_t		new_entity;
-
-	memset( &new_entity, 0, sizeof( refEntity_t ) );
-	memset( &new_entity.shaderRGBA, 255, sizeof( byte ) * 4 );
-
-	VectorCopy( vPos, new_entity.origin );
-	new_entity.scale = 1.0;
-
-	if( axis ) {
-		AxisCopy( axis, new_entity.axis );
-	}
-
-	new_entity.hModel = R_RegisterModelInternal( szModel, qfalse, qtrue );
-
-	if( new_entity.hModel )
-	{
-		tr.models[ new_entity.hModel ].serveronly = qfalse;
-		ri.CG_ProcessInitCommands( tr.models[ new_entity.hModel ].d.tiki, &new_entity );
-	}
-
-	return new_entity.hModel;
-}
-
-/*
-** RE_RegisterModel
-*/
-qhandle_t RE_RegisterModel( const char *name ) {
-	qhandle_t		handle;
-
-	handle = R_RegisterModelInternal( name, qtrue, qtrue );
-
-	if( handle ) {
-		tr.models[ handle ].serveronly = qfalse;
-	}
-	return handle;
-}
-
-//=============================================================================
-
-/*
-===============
-R_ModelInit
-===============
-*/
-void R_ModelInit( void ) {
-	model_t		*mod;
-	int			i;
-
-	// leave a space for NULL model
-	tr.numModels = 0;
-
-	mod = R_AllocModel();
-	strcpy( mod->name, "** BAD MODEL **" );
-	mod->type = MOD_BAD;
-
-	for (i = 0; i < sizeof(tr.skel_index) / sizeof(tr.skel_index[0]); i++) {
-		tr.skel_index[i] = -1;
-	}
-}
-
-
-/*
-================
-R_Modellist_f
-================
-*/
-void R_Modellist_f( void ) {
-	int		i;
-
-	for( i = 1; i < tr.numModels; i++ ) {
-		ri.Printf( PRINT_ALL, "%s\n", tr.models[ i ].name );
-	}
-}
-
-/*
-====================
-R_ModelRadius
-====================
-*/
-float R_ModelRadius( qhandle_t handle ) {
-	int				j;
-	vec3_t			bounds[ 2 ];
-	model_t			*model;
-	float			radius, maxRadius;
-	vec3_t			tmpVec;
-	float			w;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	case MOD_BRUSH:
-		maxRadius = 0.0;
-
-		VectorCopy( model->d.bmodel->bounds[ 0 ], bounds[ 0 ] );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], bounds[ 1 ] );
-
-		for( j = 0; j < 8; j++ ) {
-			tmpVec[ 0 ] = bounds[ j & 1 ? 1 : 0 ][ 0 ];
-			tmpVec[ 1 ] = bounds[ j & 2 ? 1 : 0 ][ 1 ];
-			tmpVec[ 2 ] = bounds[ j & 4 ? 1 : 0 ][ 2 ];
-
-			radius = VectorLength( tmpVec );
-
-			if( maxRadius < radius ) {
-				maxRadius = radius;
-			}
-		}
-		break;
-	case MOD_TIKI:
-		return TIKI_GlobalRadius( model->d.tiki );
-	case MOD_SPRITE:
-		maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		w = model->d.sprite->height * model->d.sprite->scale * 0.5;
-
-		if( maxRadius <= w ) {
-			maxRadius = w;
-		}
-		break;
-	default:
-		maxRadius = 0.0;
-	}
-
-	return maxRadius;
-}
-
-/*
-====================
-R_ModelBounds
-====================
-*/
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	default:
-	case MOD_BAD:
-		VectorClear( mins );
-		VectorClear( maxs );
-		break;
-	case MOD_BRUSH:
-		VectorCopy( model->d.bmodel->bounds[ 0 ], mins );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], maxs );
-		break;
-	case MOD_TIKI:
-		TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
-		break;
-	case MOD_SPRITE:
-		mins[ 0 ] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
-		mins[ 1 ] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
-		mins[ 2 ] = -0.0;
-		maxs[ 0 ] = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		maxs[ 1 ] = model->d.sprite->height * model->d.sprite->scale * 0.5;
-		maxs[ 2 ] = 0.0;
-		break;
-	}
-}
-
-/*
-====================
-GetModelPath
-====================
-*/
-const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
-	int			i;
-	int			num;
-	skelcache_t	*cache;
-
-	num = cache_numskel;
-
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-	{
-		cache = &skelcache[ i ];
-
-		if( cache->skel )
-		{
-			if( cache->skel == skelmodel ) {
-				return cache->path;
-			}
-
-			num--;
-			if( num < 0 ) {
-				break;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/*
-====================
-GetLodCutoff
-====================
-*/
-int GetLodCutoff( skelHeaderGame_t *skelmodel, float lod_val, int renderfx ) {
-	lodControl_t	*LOD;
-	float			f;
-	float			fLODCap;
-
-	LOD = skelmodel->pLOD;
-
-	if( renderfx & RF_DEPTHHACK )
-	{
-		fLODCap = LOD->maxMetric + ( LOD->minMetric - LOD->maxMetric ) * r_lodviewmodelcap->value;
-	}
-	else
-	{
-		f = ( LOD->minMetric - LOD->maxMetric ) * r_lodcap->value + LOD->maxMetric;
-		fLODCap = ( lod_val - LOD->maxMetric ) * r_lodscale->value + LOD->maxMetric;
-
-		if( fLODCap > f ) {
-			fLODCap = f;
-		}
-	}
-
-	if( fLODCap >= LOD->minMetric || !r_uselod->integer )
-	{
-		return LOD->curve[ 0 ].val;
-	}
-	else if( fLODCap <= LOD->maxMetric )
-	{
-		return LOD->curve[ 4 ].val;
-	}
-	else if( fLODCap <= LOD->consts[ 3 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 3 ].scale + LOD->consts[ 3 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 2 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 2 ].scale + LOD->consts[ 2 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 1 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 1 ].scale + LOD->consts[ 1 ].base;
-	}
-	else
-	{
-		return fLODCap * LOD->consts[ 0 ].scale + LOD->consts[ 0 ].base;
-	}
-}
-
-/*
-====================
-GetToolLodCutoff
-====================
-*/
-int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
-	lodControl_t	*LOD;
-	float			totalRange;
-	int				i;
-	char			lodPath[ 256 ];
-	char			*ext;
-
-	LOD = skelmodel->pLOD;
-	totalRange = 0.0;
-	for( i = 0; i < 10; i++ )
-	{
-		if( skelmodel->lodIndex[ i ] > 0 ) {
-			totalRange = skelmodel->lodIndex[ i ];
-			break;
-		}
-	}
-
-	if( lod_save->integer == 1 )
-	{
-		Cvar_Set( "lod_save", "0" );
-		strcpy( lodPath, GetModelPath( skelmodel ) );
-		ext = strstr( lodPath, "skd" );
-		strcpy( ext, "lod" );
-		SaveLODFile( lodPath, LOD );
-	}
-
-	if( lod_mesh->modified )
-	{
-		lod_mesh->modified = qfalse;
-		Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
-		Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
-		Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
-		Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
-	}
-
-
-	Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
-
-	LOD->minMetric = lod_minLOD->value;
-	LOD->maxMetric = lod_maxLOD->value;
-	LOD->curve[ 0 ].val = lod_curve_0_val->value;
-	LOD->curve[ 1 ].val = lod_curve_1_val->value;
-	LOD->curve[ 2 ].val = lod_curve_2_val->value;
-	LOD->curve[ 3 ].val = lod_curve_3_val->value;
-	LOD->curve[ 4 ].val = lod_curve_4_val->value;
-
-	TIKI_CalcLodConsts( LOD );
-	return GetLodCutoff( skelmodel, lod_val, 0 );
-}
-
-/*
-==============
-R_GetTagPositionAndOrientation
-==============
-*/
-orientation_t R_GetTagPositionAndOrientation( refEntity_t *ent, int tagnum ) {
-	int i;
-	orientation_t tag_or, new_or;
-
-	tag_or = RE_TIKI_Orientation( ent, tagnum );
-
-	VectorCopy( ent->origin, new_or.origin );
-
-	for( i = 0; i < 3; i++ )
-	{
-		VectorMA( new_or.origin, tag_or.origin[ i ], ent->axis[ i ], new_or.origin );
-	}
-
-	MatrixMultiply( tag_or.axis, ent->axis, new_or.axis );
-	return new_or;
-}
-
-/*
-==============
-RB_DrawSkeletor
-==============
-*/
-void RB_DrawSkeletor( trRefEntity_t *ent ) {
-	int i;
-	dtiki_t		*tiki;
-	skeletor_c	*skeletor;
-
-	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
-
-#if 0
-	if( r_showSkeleton->integer == 1 ) {
-		//vec3_t vForward, vRight, vUp;
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-
-
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) { // draw a skeleton
-
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone != -1 ) {
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-			} else {
-				VectorCopy( ent->e.origin, parent_or.origin );
-				AxisCopy( ent->e.axis, parent_or.axis );
-			}
-
-            qglColor3f(1, 1, 1);
-            qglVertex3fv(parent_or.origin);
-            qglVertex3fv(ori.origin);
-
-			// draw bone axis
-			/*glColor3f( 1, 0, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 0 ], vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 1, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 1 ], vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 0, 1 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 2 ], vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( ori.origin );*/
-
-		}
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-	else if( r_showSkeleton->integer == 2 ) { // draw skeleton with bones
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone > 0 )	{
-				ori = R_GetTagPositionAndOrientation( &ent->e, i );
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-				qglColor3f( 1, 1, 1 );
-				qglVertex3fv( parent_or.origin );
-				qglVertex3fv( ori.origin );
-			}
-
-		}
-		qglEnd();
-
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			vec3_t up, down, front;
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-
-			VectorCopy( ori.origin, up );
-			up[ 1 ] += 5;
-			VectorCopy( ori.origin, down );
-			down[ 1 ] += 5;
-			VectorCopy( ori.origin, front );
-			front[ 0 ] += 5;
-
-			qglColor3f( 1, 0, 1 );
-			qglVertex3fv( front );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( down );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( up );
-			qglVertex3fv( ori.origin );
-		}
-
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-#endif
-}
-
-/*
-=============
-R_CullTIKI
-=============
-*/
-static int R_CullTIKI( dtiki_t *tiki, trRefEntity_t *ent ) {
-#if 0
-	//// cull bounding sphere ONLY if this is not an upscaled entity
-	if( !ent->e.nonNormalizedAxes )
-	{
-		switch( R_CullPointAndRadius( ent->e.origin, ent->e.radius ) )
-		{
-		case CULL_OUT:
-			tr.pc.c_sphere_cull_tiki_out++;
-			return CULL_OUT;
-
-		case CULL_IN:
-			tr.pc.c_sphere_cull_tiki_in++;
-			return CULL_IN;
-
-		case CULL_CLIP:
-			tr.pc.c_sphere_cull_tiki_clip++;
-			break;
-		}
-	}
-
-	switch( R_CullLocalBox( ent->e.bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_tiki_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_tiki_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_tiki_out++;
-		return CULL_OUT;
-	}
-#endif
-	// FIXME: unimplemented
-	return 0;
-}
-
-surfaceType_t	skelSurface = SF_TIKI_SKEL;
-
-/*
-==============
-R_AddSkelSurfaces
-==============
-*/
-void R_AddSkelSurfaces( trRefEntity_t *ent ) {
-	dtiki_t *tiki;
-	qboolean personalModel;
-	float tiki_scale;
-	vec3_t tiki_localorigin;
-	vec3_t tiki_worldorigin;
-	skelBoneCache_t *outbones;
-	//int tikiSurfNumOffset;
-	static cvar_t *vmEntity = NULL;
-	skeletor_c *skeletor;
-	float radius;
-	SkelVec3 centroid;
-	skelAnimFrame_t *newFrame;
-	int added;
-	shader_t *shader;
-	dtikisurface_t *dsurf;
-	byte *bsurf;
-	//float range;
-	//int render_count, total_tris;
-	skelSurfaceGame_t *surface;
-	//int skinnum;
-	//float target;
-	Vector newDistance;
-	//vec3_t org;
-	int i;
-	int mesh;
-	int iRadiusCull = 0;
-	int num_tags;
-
-	tiki = ent->e.tiki;
-
-	if( !vmEntity ) {
-		vmEntity = ri.Cvar_Get( "viewmodelentity", "", 0 );
-	}
-
-	R_UpdatePoseInternal( &ent->e );
-
-	// don't add third_person objects if in a portal
-	personalModel = ( ent->e.renderfx & RF_THIRD_PERSON ) && !tr.viewParms.isPortal;
-
-	outbones = &TIKI_Skel_Bones[ TIKI_Skel_Bones_Index ];
-
-	num_tags = tiki->m_boneList.NumChannels();
-
-	if( num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name );
-		return;
-	}
-
-	tiki_scale = tiki->load_scale * ent->e.scale;
-	VectorScale( tiki->load_origin, tiki_scale, tiki_localorigin );
-	R_LocalPointToWorld( tiki_localorigin, tiki_worldorigin );
-
-	radius = R_GetRadius( &ent->e );
-
-	if( !lod_tool->integer )
-	{
-		iRadiusCull = R_CullPointAndRadius( tiki_worldorigin, radius );
-		// FIXME: Draw a debug circle
-	}
-
-	// FIXME: calculate lod percentage
-	if( !lod_tool->integer && iRadiusCull == -1 ) {
-		return;
-	}
-
-	//if( R_CullTIKI( tiki, ent ) == CULL_OUT ) {
-	//	return;
-	//}
-
-	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + tiki->m_boneList.NumChannels() * sizeof( SkelMat4 ) );
-	R_GetFrame( &ent->e, newFrame );
-
-	//
-	// copy bones position and axis
-	//
-	for( i = 0; i < num_tags; i++ )
-	{
-		VectorCopy( newFrame->bones[ i ][ 3 ], outbones->offset );
-		outbones->matrix[ 0 ][ 0 ] = newFrame->bones[ i ][ 0 ][ 0 ];
-		outbones->matrix[ 0 ][ 1 ] = newFrame->bones[ i ][ 0 ][ 1 ];
-		outbones->matrix[ 0 ][ 2 ] = newFrame->bones[ i ][ 0 ][ 2 ];
-		outbones->matrix[ 0 ][ 3 ] = 0;
-		outbones->matrix[ 1 ][ 0 ] = newFrame->bones[ i ][ 1 ][ 0 ];
-		outbones->matrix[ 1 ][ 1 ] = newFrame->bones[ i ][ 1 ][ 1 ];
-		outbones->matrix[ 1 ][ 2 ] = newFrame->bones[ i ][ 1 ][ 2 ];
-		outbones->matrix[ 1 ][ 3 ] = 0;
-		outbones->matrix[ 2 ][ 0 ] = newFrame->bones[ i ][ 2 ][ 0 ];
-		outbones->matrix[ 2 ][ 1 ] = newFrame->bones[ i ][ 2 ][ 1 ];
-		outbones->matrix[ 2 ][ 2 ] = newFrame->bones[ i ][ 2 ][ 2 ];
-		outbones->matrix[ 2 ][ 3 ] = 0;
-		outbones++;
-	}
-
-	ri.Hunk_FreeTempMemory( newFrame );
-
-	ent->e.bonestart = TIKI_Skel_Bones_Index;
-	TIKI_Skel_Bones_Index += num_tags;
-
-	ent->e.hasMorph = qfalse;
-
-	//
-	// get the skeletor
-	//
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ent->e.entityNumber );
-
-	//
-	// add morphs
-	//
-	added = skeletor->GetMorphWeightFrame( ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
-	ent->e.morphstart = skeletorMorphCacheIndex;
-
-	if( added )
-	{
-		// found morphs
-		skeletorMorphCacheIndex += added;
-		ent->e.hasMorph = qtrue;
-	}
-
-	//
-	// draw all meshes
-	//
-	dsurf = tiki->surfaces;
-	bsurf = &ent->e.surfaces[ 0 ];
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-
-		if( !skelmodel )
-		{
-			ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name );
-			return;
-		}
-
-		if( lod_tool->integer && !stricmp( ent->e.tiki->a->name, lod_tikiname->string ) )
-		{
-			if( lod_mesh->integer > tiki->numMeshes - 1 ) {
-				ri.Cvar_Set( "lod_mesh", va( "%d", tiki->numMeshes - 1 ) );
-			}
-
-			if( mesh == lod_mesh->integer ) {
-				if( skelmodel->pLOD ) {
-					break;
-				}
-			}
-		}
-
-		//
-		// draw all surfaces
-		//
-		surface = skelmodel->pSurfaces;
-		for( i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext ) {
-
-			if( *bsurf & 4 ) {
-				continue;
-			}
-
-			shader = NULL;
-			surface->ident = SF_TIKI_SKEL;
-
-			// use a custom shader if specified
-			if( !( ent->e.customShader ) || ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				int iShaderNum = ent->e.skinNum + ( *bsurf & 3 );
-
-				if( iShaderNum >= dsurf->numskins ) {
-					iShaderNum = 0;
-				}
-				shader = tr.shaders[ dsurf->hShader[ iShaderNum ] ];
-			} else {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-			}
-
-			if( !personalModel ) {
-				if( ( *bsurf & 0x40 ) && ( dsurf->numskins > 1 ) ) {
-					int iShaderNum = ent->e.skinNum + ( *bsurf & 2 );
-
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum ] ], 0 );
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum + 1 ] ], 0);
-				} else {
-					R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0);
-				}
-			}
-
-			if( ( ent->e.customShader ) && ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-				R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0);
-			}
-		}
-	}
-
-	// FIXME: setup LOD
-}
-
-/*
-=============
-SkelVertGetNormal
-=============
-*/
-static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 0 ];
-
-	out[ 1 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 1 ];
-
-	out[ 2 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 2 ];
-}
-
-/*
-=============
-SkelMorphGetXyz
-=============
-*/
-static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
-	out[ 0 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 1 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 2 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-}
-
-/*
-=============
-SkelWeightGetXyz
-=============
-*/
-static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-				bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-				bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-				bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-SkelWeightMorphGetXyz
-=============
-*/
-static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
-	vec3_t point;
-
-	VectorAdd( totalmorph, weight->offset, point );
-
-	out[ 0 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-					bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-					bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-					bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-LerpSkelMesh
-=============
-*/
-static void LerpSkelMesh( skelSurfaceGame_t *sf ) {
-	float *outXyz;
-	vec4_t *outNormal;
-	skeletorVertex_t *newVerts;
-	skeletorMorph_t *morph;
-	skelWeight_t *weight;
-	int vertNum;
-	int morphNum;
-	int weightNum;
-	skelBoneCache_t *bones;
-	skelBoneCache_t *bone;
-	int *morphs;
-	int *morphcache;
-	float scale;
-	dtiki_t *tiki;
-	int mesh;
-	int surf;
-	skelHeaderGame_t *skelmodel;
-	skelSurfaceGame_t *psurface;
-	qboolean bFound;
-
-	tiki = backEnd.currentEntity->e.tiki;
-	newVerts = sf->pVerts;
-
-	outXyz = tess.xyz[ tess.numVertexes ];
-	outNormal = &tess.normal[ tess.numVertexes ];
-
-	bones = &TIKI_Skel_Bones[ backEnd.currentEntity->e.bonestart ];
-	morphs = &skeletorMorphCache[ backEnd.currentEntity->e.morphstart ];
-
-	scale = tiki->load_scale * backEnd.currentEntity->e.scale;
-
-	//
-	// get the mesh associated with the surface
-	//
-	bFound = qfalse;
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-		psurface = skelmodel->pSurfaces;
-
-		// find the surface
-		for( surf = 0; surf < skelmodel->numSurfaces; surf++ )
-		{
-			if( psurface == sf ) {
-				bFound = qtrue;
-				break;
-			}
-			psurface = psurface->pNext;
-		}
-
-		if( bFound ) {
-			break;
-		}
-	}
-
-	assert( bFound );
-
-	//
-	// Process LOD
-	//
-	if( skelmodel->pLOD )
-	{
-		// FIXME
-	}
-
-	//
-	// just copy the vertexes
-	//
-	for( vertNum = 0; vertNum < sf->numVerts; vertNum++ )
-	{
-		vec3_t normal;
-		vec3_t out;
-
-		VectorClear( out );
-		VectorClear( outXyz );
-
-		weight = ( skelWeight_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs );
-
-		if( backEnd.currentEntity->e.hasMorph )
-		{
-			vec3_t totalmorph;
-
-			VectorClear( totalmorph );
-			morph = ( skeletorMorph_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) );
-
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				channelNum = skelmodel->pBones[ morph->morphIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-			else
-			{
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				bone = &bones[ morph->morphIndex ];
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-		}
-		else
-        {
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-                SkelVertGetNormal(newVerts, bone, normal);
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-			else
-            {
-				bone = &bones[weight->boneIndex];
-                SkelVertGetNormal(newVerts, bone, normal);
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-		}
-
-		VectorCopy(normal, *outNormal);
-
-		VectorScale( out, scale, outXyz );
-
-		newVerts = ( skeletorVertex_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs + sizeof( skelWeight_t ) * newVerts->numWeights );
-		outXyz += 4;
-		outNormal++;
-	}
-}
-
-/*
-=============
-RB_SkelMesh
-=============
-*/
-void RB_SkelMesh( skelSurfaceGame_t *sf ) {
-	int					j;
-	skeletorVertex_t	*vert;
-	int					baseIndex, baseVertex;
-	int					numVerts;
-	int					numIndexes;
-
-	numIndexes = sf->numTriangles * 3;
-
-	RB_CHECKOVERFLOW( sf->numVerts, numIndexes );
-
-	LerpSkelMesh( sf );
-
-	baseIndex = tess.numIndexes;
-	baseVertex = tess.numVertexes;
-	for( j = 0; j < numIndexes; j++ ) {
-		tess.indexes[ baseIndex + j ] = baseVertex + sf->pTriangles[ j ];
-	}
-	tess.numIndexes += numIndexes;
-
-	numVerts = sf->numVerts;
-	vert = sf->pVerts;
-	for( j = 0; j < numVerts; j++ ) {
-		tess.texCoords[ baseVertex + j ][ 0 ][ 0 ] = vert->texCoords[ 0 ];
-		tess.texCoords[ baseVertex + j ][ 0 ][ 1 ] = vert->texCoords[ 1 ];
-		vert = ( skeletorVertex_t * )( ( byte * )vert + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * vert->numMorphs + sizeof( skelWeight_t ) * vert->numWeights );
-		// FIXME: fill in lightmapST for completeness?
-	}
-
-	tess.numVertexes += numVerts;
-
-#if 0
-	if( backEnd.currentEntity->e.staticModelIndex ) {
-		mstaticModel_t *sm;
-		color4ub_t *out;
-		color3ub_t *in;
-		int cdofs;
-		skdSurface_t *sf2;
-
-		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
-
-		tess.useStaticModelVertexColors = qtrue;
-
-		cdofs = 0;
-		sf2 = tiki->surfs;
-		while( sf2 != sf ) {
-			cdofs += sf2->numVerts;
-			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
-		}
-
-		in = &tr.world->smColors[ sm->firstVert + cdofs ];
-		out = tess.vertexColors + baseVertex;
-		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
-#if 1
-			( *out )[ 0 ] = ( *in )[ 0 ];
-			( *out )[ 1 ] = ( *in )[ 1 ];
-			( *out )[ 2 ] = ( *in )[ 2 ];
-			( *out )[ 3 ] = 255;
-#elif 0
-			( ( int* )out ) = tr.identityLightByte;
-#else		
-			// su44: set it to something special so
-			// I can debug vertex colors rendering
-			( *out )[ 0 ] = 255;
-			( *out )[ 1 ] = 0;
-			( *out )[ 2 ] = 0;
-			( *out )[ 3 ] = 255;
-#endif
-		}
-	} //else
-#endif
-	//{
-	//	// an attemp to fix bizarre vertex colors bug
-	//	color4ub_t *col;
-	//	
-	//	col = &tess.vertexColors[baseVertex];
-	//	for(i = 0; i < sf->numVerts; i++,col++) {
-	//		(*col)[0] = 255;
-	//		(*col)[1] = 255;
-	//		(*col)[2] = 255;
-	//		(*col)[3] = 255;
-	//	}
-	//}
-	//tess.numVertexes += sf->numVerts;
-}
-
-/*
-=============
-R_PrintInfoWorldtris
-=============
-*/
-void R_PrintInfoWorldtris( void ) {
-	// FIXME: stub
-}
-
-/*
-=============
-RE_SetFrameNumber
-=============
-*/
-void RE_SetFrameNumber( int frameNumber ) {
-	tr.frame_skel_index = frameNumber;
-}
-
-/*
-=============
-R_UpdatePoseInternal
-=============
-*/
-void R_UpdatePoseInternal( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		if( tr.skel_index[ model->entityNumber ] == tr.frame_skel_index ) {
-			return;
-		}
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_ForceUpdatePose
-=============
-*/
-void RE_ForceUpdatePose( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_TIKI_Orientation
-=============
-*/
-orientation_t RE_TIKI_Orientation( refEntity_t *model, int tagnum ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_OrientationInternal( model->tiki, model->entityNumber, tagnum, model->scale );
-}
-
-/*
-=============
-RE_TIKI_IsOnGround
-=============
-*/
-qboolean RE_TIKI_IsOnGround( refEntity_t *model, int tagnum, float threshold ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_IsOnGroundInternal( model->tiki, model->entityNumber, tagnum, threshold );
-}
-
-/*
-=============
-R_GetRadius
-=============
-*/
-float R_GetRadius( refEntity_t *model ) {
-	R_UpdatePoseInternal( model );
-	return ri.GetRadiusInternal( model->tiki, model->entityNumber, model->scale );
-}
-
-/*
-=============
-R_GetFrame
-=============
-*/
-void R_GetFrame( refEntity_t *model, struct skelAnimFrame_s *newFrame ) {
-	R_UpdatePoseInternal( model );
-	ri.GetFrameInternal( model->tiki, model->entityNumber, newFrame );
-}
-
-/*
-=============
-R_DebugSkeleton
-=============
-*/
-void R_DebugSkeleton( void ) {
-	int i;
-	trRefEntity_t *ent;
-	model_t *model;
-
-	// FIXME: unimplemented
-#if 0
-	R_SyncRenderThread();
-
-	GL_Bind( tr.whiteImage );
-	GL_State( 0x200 );
-
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	for( i = 0; i < tr.refdef.num_entities; i++ ) {
-		ent = &tr.refdef.entities[ i ];
-
-		if( ent->e.reType == RT_MODEL ) {
-			model = R_GetModelByHandle( ent->e.hModel );
-
-			if( model->type == MOD_TIKI ) {
-				RE_ForceUpdatePose( &ent->e );
-				RB_DrawSkeletor( ent );
-			}
-		}
-	}
-#endif
-}
-static float ProjectRadius(float r, const vec3_t location)
-{
-	Vector separation;
-	float projectedRadius;
-
-	separation = Vector(tr.viewParms.ori.origin) - Vector(location);
-	projectedRadius = separation.length();
-
-	return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
-}
-
-float R_CalcLod(const vec3_t origin, float radius)
-{
-	return ProjectRadius(radius, origin);
-}
-
-/*
-==================
-R_CountTikiLodTris
-
-Computes the number of triangles to be rendered for the given TIKI model
-based on the given LoD percentage, and passes it back with render_tris.
-The total number of triangles in the TIKI model are passed back with total_tris.
-Currently only used for debugging purposes.
-
-FIXME: Shares some code with RB_StaticMesh, common parts could be extracted.
-According to debug symbols, this was originally in tiki_mesh.cpp
-==================
-*/
-void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris)
-{
-	*render_tris = 0;
-	*total_tris = 0;
-	int numtris = 0, totaltris = 0;
-
-	for (int i = 0; i < tiki->numMeshes; i++)
-	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel(tiki->mesh[i]);
-		skelSurfaceGame_t *surface = skelmodel->pSurfaces;
-
-		for (int j = 0; j < skelmodel->numSurfaces; j++)
-		{
-			int render_count = 0;
-			if (skelmodel->pLOD)
-			{
-				int lod_cutoff = GetLodCutoff(skelmodel, lodpercentage, 0);
-				skelIndex_t *collapseIndex = surface->pCollapseIndex;
-				render_count = surface->numVerts;
-
-				// Determine the number of vertices to be rendered based on the LOD cutoff
-				while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff)
-				{
-					render_count--;
-				}
-			}
-			else
-			{
-				// The surf mesh doesn't have a LOD model, so all vertices will be rendered
-				render_count = surface->numVerts;
-			}
-
-			skelIndex_t *triangles = surface->pTriangles;
-			int indexes = surface->numTriangles * 3; // 3 vertex/index for each tri
-			skelIndex_t *collapse_map = surface->pCollapse;
-			totaltris += surface->numTriangles;
-			skelIndex_t collapse[4096]{};
-
-			// Initialize array for collapsed indices
-			int k;
-			for (k = 0; k < render_count; ++k)
-			{
-				collapse[k] = k;
-			}
-
-			// Map remaining vertices to their collapsed indices using the collapse map
-			for (k = render_count; k < surface->numVerts; ++k)
-			{
-				collapse[k] = collapse[collapse_map[k]];
-			}
-
-			// Check the first two collapsed indices of each triangle
-			for (k = 0; k < indexes; k += 3)
-			{
-				if (collapse[triangles[k]] == collapse[triangles[k + 1]])
-				{
-					// The collapsed indices of the two vertices are the same:
-					// this, and any subsequent tris do not need to be rendered
-					// because the collapsed vertices (for this surface) coincide from here.
-					break;
-				}
-			}
-
-			surface = surface->pNext;
-			numtris += k / 3;
-		}
-	}
-
-	*render_tris = numtris;
-	*total_tris = totaltris;
-}
\ No newline at end of file
diff --git a/code/renderer/tr_noise.c b/code/renderer/tr_noise.c
deleted file mode 100644
index 7e172fbe..00000000
--- a/code/renderer/tr_noise.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_noise.c
-#include "tr_local.h"
-
-#define NOISE_SIZE 256
-#define NOISE_MASK ( NOISE_SIZE - 1 )
-
-#define VAL( a ) s_noise_perm[ ( a ) & ( NOISE_MASK )]
-#define INDEX( x, y, z, t ) VAL( x + VAL( y + VAL( z + VAL( t ) ) ) )
-
-static float s_noise_table[NOISE_SIZE];
-static int s_noise_perm[NOISE_SIZE];
-
-#define LERP( a, b, w ) ( a * ( 1.0f - w ) + b * w )
-
-static float GetNoiseValue( int x, int y, int z, int t )
-{
-	int index = INDEX( ( int ) x, ( int ) y, ( int ) z, ( int ) t );
-
-	return s_noise_table[index];
-}
-
-void R_NoiseInit( void )
-{
-	int i;
-
-	srand( 1001 );
-
-	for ( i = 0; i < NOISE_SIZE; i++ )
-	{
-		s_noise_table[i] = ( float ) ( ( ( rand() / ( float ) RAND_MAX ) * 2.0 - 1.0 ) );
-		s_noise_perm[i] = ( unsigned char ) ( rand() / ( float ) RAND_MAX * 255 );
-	}
-}
-
-float R_NoiseGet4f( float x, float y, float z, float t )
-{
-	int i;
-	int ix, iy, iz, it;
-	float fx, fy, fz, ft;
-	float front[4];
-	float back[4];
-	float fvalue, bvalue, value[2], finalvalue;
-
-	ix = ( int ) floor( x );
-	fx = x - ix;
-	iy = ( int ) floor( y );
-	fy = y - iy;
-	iz = ( int ) floor( z );
-	fz = z - iz;
-	it = ( int ) floor( t );
-	ft = t - it;
-
-	for ( i = 0; i < 2; i++ )
-	{
-		front[0] = GetNoiseValue( ix, iy, iz, it + i );
-		front[1] = GetNoiseValue( ix+1, iy, iz, it + i );
-		front[2] = GetNoiseValue( ix, iy+1, iz, it + i );
-		front[3] = GetNoiseValue( ix+1, iy+1, iz, it + i );
-
-		back[0] = GetNoiseValue( ix, iy, iz + 1, it + i );
-		back[1] = GetNoiseValue( ix+1, iy, iz + 1, it + i );
-		back[2] = GetNoiseValue( ix, iy+1, iz + 1, it + i );
-		back[3] = GetNoiseValue( ix+1, iy+1, iz + 1, it + i );
-
-		fvalue = LERP( LERP( front[0], front[1], fx ), LERP( front[2], front[3], fx ), fy );
-		bvalue = LERP( LERP( back[0], back[1], fx ), LERP( back[2], back[3], fx ), fy );
-
-		value[i] = LERP( fvalue, bvalue, fz );
-	}
-
-	finalvalue = LERP( value[0], value[1], ft );
-
-	return finalvalue;
-}
diff --git a/code/renderer/tr_scene.c b/code/renderer/tr_scene.c
deleted file mode 100644
index 5a28e18b..00000000
--- a/code/renderer/tr_scene.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-#include "tr_vis.h"
-#include "tiki.h"
-
-int			r_firstSceneDrawSurf;
-int			r_firstSceneSpriteSurf;
-
-int			r_numdlights;
-int			r_firstSceneDlight;
-
-int			r_numentities;
-int			r_firstSceneEntity;
-
-int			r_numsprites;
-int			r_firstSceneSprite;
-
-int			r_numtermarks;
-int			r_firstSceneTerMark;
-
-int			r_numpolys;
-int			r_firstScenePoly;
-
-int			r_numpolyverts;
-
-
-/*
-====================
-R_ToggleSmpFrame
-
-====================
-*/
-void R_ToggleSmpFrame( void ) {
-	if ( r_smp->integer ) {
-		// use the other buffers next frame, because another CPU
-		// may still be rendering into the current ones
-		tr.smpFrame ^= 1;
-	} else {
-		tr.smpFrame = 0;
-	}
-
-	backEndData[tr.smpFrame]->commands.used = 0;
-
-	r_firstSceneDrawSurf = 0;
-	r_firstSceneSpriteSurf = 0;
-
-	r_numdlights = 0;
-	r_firstSceneDlight = 0;
-
-	r_numentities = 0;
-	r_firstSceneEntity = 0;
-
-	r_numsprites = 0;
-	r_firstSceneSprite = 0;
-
-	r_numtermarks = 0;
-	r_firstSceneTerMark = 0;
-
-	r_numpolys = 0;
-	r_firstScenePoly = 0;
-
-	r_numpolyverts = 0;
-}
-
-
-/*
-====================
-RE_ClearScene
-
-====================
-*/
-void RE_ClearScene( void ) {
-	r_firstSceneDlight = r_numdlights;
-	r_firstSceneEntity = r_numentities;
-	r_firstSceneSprite = r_numsprites;
-	r_firstSceneTerMark = r_numtermarks;
-	r_firstScenePoly = r_numpolys;
-}
-
-/*
-===========================================================================
-
-DISCRETE POLYS
-
-===========================================================================
-*/
-
-/*
-=====================
-R_AddPolygonSurfaces
-
-Adds all the scene's polys into this view's drawsurf list
-=====================
-*/
-void R_AddPolygonSurfaces( void ) {
-	int			i;
-	shader_t	*sh;
-	srfPoly_t	*poly;
-
-	tr.currentEntityNum = ENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-	for ( i = 0, poly = tr.refdef.polys; i < tr.refdef.numPolys ; i++, poly++ ) {
-		sh = R_GetShaderByHandle( poly->hShader );
-		R_AddDrawSurf( ( void * )poly, sh, qfalse );
-	}
-}
-
-/*
-=====================
-RE_AddPolyToScene
-
-=====================
-*/
-qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-	srfPoly_t	*poly;
-
-	if ( !tr.registered ) {
-		return qfalse;
-	}
-
-	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
-		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
-		return qfalse;
-	}
-
-	poly = &backEndData[tr.smpFrame]->polys[r_numpolys];
-	poly->surfaceType = SF_POLY;
-	poly->hShader = hShader;
-	poly->numVerts = numVerts;
-	poly->verts = &backEndData[tr.smpFrame]->polyVerts[r_numpolyverts];
-	poly->renderfx = renderfx;
-
-	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
-	++r_numpolys;
-	r_numpolyverts += numVerts;
-
-	return qtrue;
-}
-
-/*
-=====================
-R_AddTerrainMarkSurfaces
-=====================
-*/
-void R_AddTerrainMarkSurfaces(void) {
-    // FIXME: unimplemented
-}
-
-/*
-=====================
-RE_AddTerrainMarkToScene
-=====================
-*/
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-    // FIXME: unimplemented
-}
-
-//=================================================================================
-
-/*
-=====================
-RE_GetRenderEntity
-=====================
-*/
-refEntity_t* RE_GetRenderEntity(int entityNumber) {
-    int i;
-
-    for (i = 0; i < r_numentities; i++) {
-        if (backEndData[0]->entities[i].e.entityNumber == entityNumber) {
-            return &backEndData[0]->entities[i].e;
-        }
-    }
-
-    return NULL;
-}
-
-/*
-=====================
-RE_AddRefEntityToScene
-
-=====================
-*/
-void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
-	if ( !tr.registered ) {
-		return;
-	}
-  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=402
-	if ( r_numentities >= ENTITYNUM_WORLD ) {
-		return;
-	}
-	if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
-		ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
-	}
-
-	backEndData[tr.smpFrame]->entities[r_numentities].e = *ent;
-	backEndData[tr.smpFrame]->entities[r_numentities].bLightGridCalculated = qfalse;
-	backEndData[tr.smpFrame]->entities[r_numentities].sphereCalculated = qfalse;
-
-	if (parentEntityNumber != ENTITYNUM_NONE)
-	{
-		int i;
-
-		//
-		// Find the parent entity to attach to
-		//
-		for (i = r_firstSceneEntity; i < r_numentities; i++)
-		{
-			if (backEndData[tr.smpFrame]->entities[i].e.entityNumber == parentEntityNumber)
-			{
-				backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
-				break;
-			}
-		}
-
-		if (i == r_numentities) {
-			backEndData[tr.smpFrame]->entities[i].e.parentEntity = ENTITYNUM_NONE;
-		}
-	}
-	else
-	{
-		backEndData[tr.smpFrame]->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
-	}
-
-	r_numentities++;
-}
-
-void RE_AddRefSpriteToScene(const refEntity_t* ent) {
-	refSprite_t* spr;
-	int i;
-
-	if (!tr.registered) {
-		return;
-	}
-
-	if (r_numsprites >= MAX_SPRITES) {
-		return;
-	}
-
-	spr = &backEndData[tr.smpFrame]->sprites[r_numsprites];
-	VectorCopy(ent->origin, spr->origin);
-	spr->surftype = SF_SPRITE;
-    spr->hModel = ent->hModel;
-    spr->scale = ent->scale;
-    spr->renderfx = ent->renderfx;
-    spr->shaderTime = ent->shaderTime;
-	AxisCopy(ent->axis, spr->axis);
-
-	for (i = 0; i < 4; ++i) {
-		spr->shaderRGBA[i] = ent->shaderRGBA[i];
-	}
-
-    ++r_numsprites;
-}
-
-/*
-=====================
-RE_AddDynamicLightToScene
-
-=====================
-*/
-void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
-	dlight_t	*dl;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	if ( r_numdlights >= MAX_DLIGHTS ) {
-		return;
-	}
-	if ( intensity <= 0 ) {
-		return;
-	}
-	dl = &backEndData[tr.smpFrame]->dlights[r_numdlights++];
-	VectorCopy (org, dl->origin);
-	dl->radius = intensity;
-	dl->color[0] = r;
-	dl->color[1] = g;
-	dl->color[2] = b;
-	dl->type = type;
-}
-
-/*
-=====================
-RE_AddLightToScene
-
-=====================
-*/
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, type );
-}
-
-void R_AddLightGridSurfacesToScene() {
-	// FIXME: unimplemented
-}
-
-/*
-=====================
-RE_AddAdditiveLightToScene
-
-=====================
-*/
-void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, qtrue );
-}
-
-/*
-@@@@@@@@@@@@@@@@@@@@@
-RE_RenderScene
-
-Draw a 3D view into a part of the window, then return
-to 2D drawing.
-
-Rendering a scene may require multiple views to be rendered
-to handle mirrors,
-@@@@@@@@@@@@@@@@@@@@@
-*/
-void RE_RenderScene( const refdef_t *fd ) {
-	viewParms_t		parms;
-	int				startTime;
-
-	if ( !tr.registered ) {
-		return;
-	}
-	GLimp_LogComment( "====== RE_RenderScene =====\n" );
-
-	if ( r_norefresh->integer ) {
-		return;
-	}
-
-	startTime = ri.Milliseconds();
-
-	if (!tr.world && !( fd->rdflags & RDF_NOWORLDMODEL ) ) {
-		ri.Error (ERR_DROP, "R_RenderScene: NULL worldmodel");
-	}
-
-	if (r_light_showgrid->integer) {
-		R_AddLightGridSurfacesToScene();
-	}
-
-	R_VisDebug();
-	TIKI_Reset_Caches();
-
-	backEnd.in2D = qfalse;
-	tr.refdef.x = fd->x;
-	tr.refdef.y = fd->y;
-	tr.refdef.width = fd->width;
-	tr.refdef.height = fd->height;
-	tr.refdef.fov_x = fd->fov_x;
-	tr.refdef.fov_y = fd->fov_y;
-
-	VectorCopy( fd->vieworg, tr.refdef.vieworg );
-	VectorCopy( fd->viewaxis[0], tr.refdef.viewaxis[0] );
-	VectorCopy( fd->viewaxis[1], tr.refdef.viewaxis[1] );
-	VectorCopy( fd->viewaxis[2], tr.refdef.viewaxis[2] );
-
-	tr.refdef.time = fd->time;
-	tr.refdef.rdflags = fd->rdflags;
-
-	// copy the areamask data over and note if it has changed, which
-	// will force a reset of the visible leafs even if the view hasn't moved
-	tr.refdef.areamaskModified = qfalse;
-	if ( ! (tr.refdef.rdflags & RDF_NOWORLDMODEL) ) {
-		int		areaDiff;
-		int		i;
-
-		// compare the area bits
-		areaDiff = 0;
-		for (i = 0 ; i < MAX_MAP_AREA_BYTES/4 ; i++) {
-			areaDiff |= ((int *)tr.refdef.areamask)[i] ^ ((int *)fd->areamask)[i];
-			((int *)tr.refdef.areamask)[i] = ((int *)fd->areamask)[i];
-		}
-
-		if ( areaDiff ) {
-			// a door just opened or something
-			tr.refdef.areamaskModified = qtrue;
-		}
-	}
-
-	// copy the sky data
-	tr.refdef.sky_alpha = fd->sky_alpha;
-	tr.refdef.sky_portal = fd->sky_portal;
-
-	VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
-	VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
-	VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
-	VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
-
-	// derived info
-
-	tr.refdef.floatTime = tr.refdef.time * 0.001f;
-
-	tr.refdef.numDrawSurfs = r_firstSceneDrawSurf;
-	tr.refdef.drawSurfs = backEndData[tr.smpFrame]->drawSurfs;
-
-    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
-    tr.refdef.spriteSurfs = backEndData[tr.smpFrame]->spriteSurfs;
-
-	tr.refdef.num_entities = r_numentities - r_firstSceneEntity;
-	tr.refdef.entities = &backEndData[tr.smpFrame]->entities[r_firstSceneEntity];
-
-	tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
-	tr.refdef.sprites = &backEndData[tr.smpFrame]->sprites[r_firstSceneSprite];
-
-	tr.refdef.num_dlights = r_numdlights - r_firstSceneDlight;
-	tr.refdef.dlights = &backEndData[tr.smpFrame]->dlights[r_firstSceneDlight];
-
-	tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
-	tr.refdef.terMarks = &backEndData[tr.smpFrame]->terMarks[r_firstSceneTerMark];
-
-	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
-	tr.refdef.polys = &backEndData[tr.smpFrame]->polys[r_firstScenePoly];
-
-	backEndData[tr.smpFrame]->staticModelData = tr.refdef.staticModelData;
-
-	// turn off dynamic lighting globally by clearing all the
-	// dlights if it needs to be disabled or if vertex lighting is enabled
-	if (r_vertexLight->integer == 1 ) {
-		tr.refdef.num_dlights = 0;
-	}
-
-	// a single frame may have multiple scenes draw inside it --
-	// a 3D game view, 3D status bar renderings, 3D menus, etc.
-	// They need to be distinguished by the light flare code, because
-	// the visibility state for a given surface may be different in
-	// each scene / view.
-	tr.frameSceneNum++;
-	tr.sceneCount++;
-
-	// setup view parms for the initial view
-	//
-	// set up viewport
-	// The refdef takes 0-at-the-top y coordinates, so
-	// convert to GL's 0-at-the-bottom space
-	//
-	tr.skyRendered = qfalse;
-	tr.portalRendered = qfalse;
-	Com_Memset( &parms, 0, sizeof( parms ) );
-	parms.viewportX = tr.refdef.x;
-	parms.viewportY = glConfig.vidHeight - ( tr.refdef.y + tr.refdef.height );
-	parms.viewportWidth = tr.refdef.width;
-	parms.viewportHeight = tr.refdef.height;
-	parms.isPortal = qfalse;
-
-	parms.fovX = tr.refdef.fov_x;
-	parms.fovY = tr.refdef.fov_y;
-
-	VectorCopy( fd->vieworg, parms.ori.origin );
-	VectorCopy( fd->viewaxis[0], parms.ori.axis[0] );
-	VectorCopy( fd->viewaxis[1], parms.ori.axis[1] );
-	VectorCopy( fd->viewaxis[2], parms.ori.axis[2] );
-
-	VectorCopy( fd->vieworg, parms.pvsOrigin );
-
-	// copy the farplane data
-	parms.farplane_distance = fd->farplane_distance;
-	parms.farplane_color[0] = fd->farplane_color[0];
-	parms.farplane_color[1] = fd->farplane_color[1];
-	parms.farplane_color[2] = fd->farplane_color[2];
-	parms.farplane_cull = fd->farplane_cull;
-
-	R_ClearRealDlights();
-	R_RenderView( &parms );
-
-	// the next scene rendered in this frame will tack on after this one
-	r_firstSceneDrawSurf = tr.refdef.numDrawSurfs;
-	r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
-	r_firstSceneEntity = r_numentities;
-	r_firstSceneSprite = r_numsprites;
-	r_firstSceneDlight = r_numdlights;
-	r_firstSceneTerMark = r_numtermarks;
-	r_firstScenePoly = r_numpolys;
-
-	tr.frontEndMsec += ri.Milliseconds() - startTime;
-}
diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c
deleted file mode 100644
index 554b6b5a..00000000
--- a/code/renderer/tr_shade.c
+++ /dev/null
@@ -1,1825 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_shade.c
-
-#include "tr_local.h"
-
-/*
-
-  THIS ENTIRE FILE IS BACK END
-
-  This file deals with applying shaders to surface data in the tess struct.
-*/
-
-/*
-================
-R_ArrayElementDiscrete
-
-This is just for OpenGL conformance testing, it should never be the fastest
-================
-*/
-static void APIENTRY R_ArrayElementDiscrete( GLint index ) {
-	qglColor4ubv( tess.svars.colors[ index ] );
-	if ( glState.currenttmu ) {
-		qglMultiTexCoord2fARB( 0, tess.svars.texcoords[ 0 ][ index ][0], tess.svars.texcoords[ 0 ][ index ][1] );
-		qglMultiTexCoord2fARB( 1, tess.svars.texcoords[ 1 ][ index ][0], tess.svars.texcoords[ 1 ][ index ][1] );
-	} else {
-		qglTexCoord2fv( tess.svars.texcoords[ 0 ][ index ] );
-	}
-	qglVertex3fv( tess.xyz[ index ] );
-}
-
-/*
-===================
-R_DrawStripElements
-
-===================
-*/
-static int		c_vertexes;		// for seeing how long our average strips are
-static int		c_begins;
-static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void ( APIENTRY *element )(GLint) ) {
-	int i;
-	int last[3] = { -1, -1, -1 };
-	qboolean even;
-
-	c_begins++;
-
-	if ( numIndexes <= 0 ) {
-		return;
-	}
-
-	qglBegin( GL_TRIANGLE_STRIP );
-
-	// prime the strip
-	element( indexes[0] );
-	element( indexes[1] );
-	element( indexes[2] );
-	c_vertexes += 3;
-
-	last[0] = indexes[0];
-	last[1] = indexes[1];
-	last[2] = indexes[2];
-
-	even = qfalse;
-
-	for ( i = 3; i < numIndexes; i += 3 )
-	{
-		// odd numbered triangle in potential strip
-		if ( !even )
-		{
-			// check previous triangle to see if we're continuing a strip
-			if ( ( indexes[i+0] == last[2] ) && ( indexes[i+1] == last[1] ) )
-			{
-				element( indexes[i+2] );
-				c_vertexes++;
-				assert( indexes[i+2] < tess.numVertexes );
-				even = qtrue;
-			}
-			// otherwise we're done with this strip so finish it and start
-			// a new one
-			else
-			{
-				qglEnd();
-
-				qglBegin( GL_TRIANGLE_STRIP );
-				c_begins++;
-
-				element( indexes[i+0] );
-				element( indexes[i+1] );
-				element( indexes[i+2] );
-
-				c_vertexes += 3;
-
-				even = qfalse;
-			}
-		}
-		else
-		{
-			// check previous triangle to see if we're continuing a strip
-			if ( ( last[2] == indexes[i+1] ) && ( last[0] == indexes[i+0] ) )
-			{
-				element( indexes[i+2] );
-				c_vertexes++;
-
-				even = qfalse;
-			}
-			// otherwise we're done with this strip so finish it and start
-			// a new one
-			else
-			{
-				qglEnd();
-
-				qglBegin( GL_TRIANGLE_STRIP );
-				c_begins++;
-
-				element( indexes[i+0] );
-				element( indexes[i+1] );
-				element( indexes[i+2] );
-				c_vertexes += 3;
-
-				even = qfalse;
-			}
-		}
-
-		// cache the last three vertices
-		last[0] = indexes[i+0];
-		last[1] = indexes[i+1];
-		last[2] = indexes[i+2];
-	}
-
-	qglEnd();
-}
-
-
-
-/*
-==================
-R_DrawElements
-
-Optionally performs our own glDrawElements that looks for strip conditions
-instead of using the single glDrawElements call that may be inefficient
-without compiled vertex arrays.
-==================
-*/
-static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
-	int		primitives;
-
-	primitives = r_primitives->integer;
-
-	// default is to use triangles if compiled vertex arrays are present
-	if ( primitives == 0 ) {
-		if ( qglLockArraysEXT ) {
-			primitives = 2;
-		} else {
-			primitives = 1;
-		}
-	}
-
-
-	if ( primitives == 2 ) {
-		qglDrawElements( GL_TRIANGLES, 
-						numIndexes,
-						GL_INDEX_TYPE,
-						indexes );
-		return;
-	}
-
-	if ( primitives == 1 ) {
-		R_DrawStripElements( numIndexes,  indexes, qglArrayElement );
-		return;
-	}
-	
-	if ( primitives == 3 ) {
-		R_DrawStripElements( numIndexes,  indexes, R_ArrayElementDiscrete );
-		return;
-	}
-
-	// anything else will cause no drawing
-}
-
-
-/*
-=============================================================
-
-SURFACE SHADERS
-
-=============================================================
-*/
-
-shaderCommands_t	tess;
-static qboolean	setArraysOnce;
-
-/*
-=================
-R_BindAnimatedImage
-
-=================
-*/
-static void R_BindAnimatedImage( textureBundle_t *bundle ) {
-	int		index;
-
-	if ( bundle->numImageAnimations <= 1 ) {
-		GL_Bind( bundle->image[0] );
-		return;
-	}
-
-	// it is necessary to do this messy calc to make sure animations line up
-	// exactly with waveforms of the same frequency
-	index = myftol( tess.shaderTime * bundle->imageAnimationSpeed * FUNCTABLE_SIZE );
-	index >>= FUNCTABLE_SIZE2;
-
-	if ( index < 0 ) {
-		index = 0;	// may happen with shader time offsets
-	}
-	index %= bundle->numImageAnimations;
-
-	GL_Bind( bundle->image[ index ] );
-}
-
-/*
-================
-DrawTris
-
-Draws triangle outlines for debugging
-================
-*/
-static void DrawTris (shaderCommands_t *input, int flags) {
-	GL_Bind( tr.whiteImage );
-	qglColor3f (1,1,1);
-
-	if (flags == 1) {
-		GL_State(GLS_POLYMODE_LINE);
-	} else {
-        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-        qglDepthRange(0, 0);
-	}
-
-	if (flags < 3) {
-		qglDisableClientState(GL_COLOR_ARRAY);
-		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-		qglVertexPointer(3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-
-		if (qglLockArraysEXT) {
-			qglLockArraysEXT(0, input->numVertexes);
-			GLimp_LogComment("glLockArraysEXT\n");
-		}
-
-		R_DrawElements(input->numIndexes, input->indexes);
-
-		if (qglUnlockArraysEXT) {
-			qglUnlockArraysEXT();
-			GLimp_LogComment("glUnlockArraysEXT\n");
-		}
-		qglDepthRange(0, 1);
-	}
-
-	if (flags > 1) {
-		vec3_t start, end;
-
-        start[1] = start[0] = 0.0;
-		end[1] = end[0] = 0.0;
-
-        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-        qglDepthRange(0, 0);
-
-        qglDisable(GL_TEXTURE_2D);
-        qglBegin(GL_LINES);
-
-        qglColor4f(1.0, 0.0, 0.0, 1.0);
-
-        start[2] = 0.0 - 5.0;
-        end[2] = 0.0 + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        qglColor4f(0.0, 1.0, 0.0, 1.0);
-
-        start[2] = start[2] + 5.0;
-        end[2] = end[2] - 5.0;
-        start[1] = start[1] - 5.0;
-        end[1] = end[1] + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        qglColor4f(0.0, 0.0, 1.0, 1.0);
-
-        start[1] = start[1] + 5.0;
-        start[0] = start[0] - 5.0;
-        end[0] = end[0] + 5.0;
-        qglVertex3fv(start);
-        qglVertex3fv(end);
-
-        start[0] = start[0] + 5.0;
-        end[0] = end[0] - 5.0;
-
-        qglEnd();
-        qglEnable(GL_TEXTURE_2D);
-        qglDepthRange(0.0, 1.0);
-
-	}
-}
-
-/*
-================
-DrawNormals
-
-Draws vertex normals for debugging
-================
-*/
-static void DrawNormals (shaderCommands_t *input) {
-	int		i;
-	vec3_t	temp;
-
-	GL_Bind( tr.whiteImage );
-	qglColor3f (1,1,1);
-	qglDepthRange( 0, 0 );	// never occluded
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE );
-
-	qglBegin (GL_LINES);
-	for (i = 0 ; i < input->numVertexes ; i++) {
-		qglVertex3fv (input->xyz[i]);
-		VectorMA (input->xyz[i], 2, input->normal[i], temp);
-		qglVertex3fv (temp);
-	}
-	qglEnd ();
-
-	qglDepthRange( 0, 1 );
-}
-
-/*
-==============
-RB_BeginSurface
-
-We must set some things up before beginning any tesselation,
-because a surface may be forced to perform a RB_End due
-to overflow.
-==============
-*/
-void RB_BeginSurface( shader_t *shader ) {
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-	tess.shader = shader;
-	tess.dlightBits = 0;		// will be OR'd in by surface functions
-	tess.vertexColorValid = r_vertexLight->integer != 0;
-	tess.xstages = shader->unfoggedStages;
-	tess.numPasses = shader->numUnfoggedPasses;
-	tess.currentStageIteratorFunc = shader->optimalStageIteratorFunc;
-
-}
-
-/*
-===================
-DrawMultitextured
-
-output = t0 * t1 or t0 + t1
-
-t0 = most upstream according to spec
-t1 = most downstream according to spec
-===================
-*/
-static void DrawMultitextured( shaderCommands_t *input, int stage ) {
-	shaderStage_t	*pStage;
-
-	pStage = tess.xstages[stage];
-
-	GL_State( pStage->stateBits );
-
-	// this is an ugly hack to work around a GeForce driver
-	// bug with multitexture and clip planes
-	if ( backEnd.viewParms.isPortal ) {
-		qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
-	}
-
-	//
-	// base
-	//
-	GL_SelectTexture( 0 );
-	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
-	R_BindAnimatedImage( &pStage->bundle[0] );
-
-	if (pStage->stateBits & GLS_MULTITEXTURE_ENV)
-	{
-		glState.cntnvblendmode = pStage->multitextureEnv;
-		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
-
-		if (pStage->multitextureEnv == GL_ADD)
-		{
-			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_ADD);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_ONE_MINUS_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE1);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE3_RGB, 0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND3_RGB, GL_ONE_MINUS_SRC_COLOR);
-		}
-		else if (pStage->multitextureEnv == GL_MODULATE)
-		{
-			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE1);
-			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-		}
-		else
-		{
-			ri.Printf(3, "Unknown MT mode for: %s\n", input->shader);
-		}
-	}
-
-	//
-	// lightmap/secondary pass
-	//
-	GL_SelectTexture( 1 );
-	qglEnable( GL_TEXTURE_2D );
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	if ( r_lightmap->integer && pStage->bundle[1].isLightmap ) {
-		GL_TexEnv( GL_REPLACE );
-	} else if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
-		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
-
-		GL_TexEnv(GL_COMBINE);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_SRC_ALPHA);
-		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
-	} else {
-		GL_TexEnv( pStage->multitextureEnv );
-	}
-
-	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] );
-
-	if (!input->dlightMap || !pStage->bundle[1].isLightmap) {
-		R_BindAnimatedImage(&pStage->bundle[1]);
-	} else {
-		GL_Bind(tr.dlightImages[input->dlightMap - 1]);
-	}
-
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	qglDisable(GL_TEXTURE_2D);
-	//
-	// disable texturing on TEXTURE1, then select TEXTURE0
-	//
-	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-
-	GL_SelectTexture( 0 );
-}
-
-
-
-/*
-===================
-ProjectDlightTexture
-
-Perform dynamic lighting with another rendering pass
-===================
-*/
-static void ProjectDlightTexture( void ) {
-	int		i, l;
-#if idppc_altivec
-	vec_t	origin0, origin1, origin2;
-	float   texCoords0, texCoords1;
-	vector float floatColorVec0, floatColorVec1;
-	vector float modulateVec, colorVec, zero;
-	vector short colorShort;
-	vector signed int colorInt;
-	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
-	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff);
-#else
-	vec3_t	origin;
-	vec3_t	normal;
-#endif
-	float	*texCoords;
-	byte	*colors;
-	byte	clipBits[SHADER_MAX_VERTEXES];
-	MAC_STATIC float	texCoordsArray[SHADER_MAX_VERTEXES][2];
-	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	unsigned	hitIndexes[SHADER_MAX_INDEXES];
-	int		numIndexes;
-	int		planetype;
-	float	scale;
-	float	radius;
-	vec3_t	floatColor;
-	float	modulate;
-
-	if ( !backEnd.refdef.num_dlights ) {
-		return;
-	}
-
-#if idppc_altivec
-	// There has to be a better way to do this so that floatColor 
-	// and/or modulate are already 16-byte aligned.
-	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
-	modulatePerm = vec_lvsl(0,(float *)&modulate);
-	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
-	zero = (vector float)vec_splat_s8(0);
-#endif
-
-	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
-		dlight_t	*dl;
-
-		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definately doesn't have any of this light
-		}
-		texCoords = texCoordsArray[0];
-		colors = colorArray[0];
-
-		dl = &backEnd.refdef.dlights[l];
-#if idppc_altivec
-		origin0 = dl->transformed[0];
-		origin1 = dl->transformed[1];
-		origin2 = dl->transformed[2];
-#else
-		VectorCopy( dl->transformed, origin );
-#endif
-		radius = dl->radius * 1.75f;
-		scale = 1.75f / radius;
-
-		floatColor[0] = dl->color[0] * 255.0f;
-		floatColor[1] = dl->color[1] * 255.0f;
-		floatColor[2] = dl->color[2] * 255.0f;
-#if idppc_altivec
-		floatColorVec0 = vec_ld(0, floatColor);
-		floatColorVec1 = vec_ld(11, floatColor);
-		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
-#endif
-		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-#if idppc_altivec
-			vec_t dist0, dist1, dist2;
-#else
-			vec3_t	dist;
-#endif
-			float	vertdist;
-			int		clip;
-
-			backEnd.pc.c_dlightVertexes++;
-
-#if idppc_altivec
-			//VectorSubtract( origin, tess.xyz[i], dist );
-			dist0 = origin0 - tess.xyz[i][0];
-			dist1 = origin1 - tess.xyz[i][1];
-			dist2 = origin2 - tess.xyz[i][2];
-			texCoords0 = 0.5f + dist0 * scale;
-			texCoords1 = 0.5f + dist1 * scale;
-
-			clip = 0;
-			if ( texCoords0 < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords0 > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords1 < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords1 > 1.0f ) {
-				clip |= 8;
-			}
-			texCoords[0] = texCoords0;
-			texCoords[1] = texCoords1;
-			
-			// modulate the strength based on the height and color
-			if ( dist2 > radius ) {
-				clip |= 16;
-				modulate = 0.0f;
-			} else if ( dist2 < -radius ) {
-				clip |= 32;
-				modulate = 0.0f;
-			} else {
-				dist2 = Q_fabs(dist2);
-				if ( dist2 < radius * 0.5f ) {
-					modulate = 1.0f;
-				} else {
-					modulate = 2.0f * (radius - dist2) * scale;
-				}
-			}
-			clipBits[i] = clip;
-
-			modulateVec = vec_ld(0,(float *)&modulate);
-			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
-			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
-			colorInt = vec_cts(colorVec,0);	// RGBx
-			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
-			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
-			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
-#else
-			VectorCopy(tess.normal[i], normal);
-
-			if (fabs(normal[0]) > fabs(normal[1])) {
-				if (fabs(normal[2]) < fabs(normal[0])) {
-					planetype = 0;
-				} else {
-					planetype = 1;
-				}
-			} else {
-				if (fabs(normal[2]) < fabs(normal[1])) {
-					planetype = 1;
-				}
-				else {
-					planetype = 2;
-				}
-			}
-
-			VectorSubtract( origin, tess.xyz[i], dist );
-			if (planetype == 0)
-			{
-				texCoords[0] = 0.5f + dist[1] * scale;
-				texCoords[1] = 0.5f + dist[2] * scale;
-			}
-			else if (planetype == 1)
-			{
-				texCoords[0] = 0.5f + dist[0] * scale;
-				texCoords[1] = 0.5f + dist[2] * scale;
-			}
-			else
-			{
-				texCoords[0] = 0.5f + dist[0] * scale;
-				texCoords[1] = 0.5f + dist[1] * scale;
-			}
-
-			vertdist = DotProduct(dist, normal);
-			clip = 0;
-			if ( texCoords[0] < 0.0f ) {
-				clip |= 1;
-			} else if ( texCoords[0] > 1.0f ) {
-				clip |= 2;
-			}
-			if ( texCoords[1] < 0.0f ) {
-				clip |= 4;
-			} else if ( texCoords[1] > 1.0f ) {
-				clip |= 8;
-			}
-			// modulate the strength based on the height and color
-			if (vertdist > radius) {
-				clip |= 16;
-				modulate = 0.0f;
-			}
-			else if (vertdist < -radius) {
-				clip |= 32;
-				modulate = 0.0f;
-			}
-			else {
-				dist[2] = Q_fabs(dist[2]);
-				if (dist[2] < radius * 0.5f) {
-					modulate = 1.0f;
-				}
-				else {
-					modulate = 2.0f * (radius - dist[2]) * scale;
-				}
-			}
-			clipBits[i] = clip;
-
-			colors[0] = myftol(floatColor[0] * modulate);
-			colors[1] = myftol(floatColor[1] * modulate);
-			colors[2] = myftol(floatColor[2] * modulate);
-			colors[3] = 255;
-#endif
-		}
-
-		// build a list of triangles that need light
-		numIndexes = 0;
-		for ( i = 0 ; i < tess.numIndexes ; i += 3 ) {
-			int		a, b, c;
-
-			a = tess.indexes[i];
-			b = tess.indexes[i+1];
-			c = tess.indexes[i+2];
-			if ( clipBits[a] & clipBits[b] & clipBits[c] ) {
-				continue;	// not lighted
-			}
-			hitIndexes[numIndexes] = a;
-			hitIndexes[numIndexes+1] = b;
-			hitIndexes[numIndexes+2] = c;
-			numIndexes += 3;
-		}
-
-		if ( !numIndexes ) {
-			continue;
-		}
-
-		qglEnableClientState(GL_COLOR_ARRAY);
-		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
-		qglTexCoordPointer(2, GL_FLOAT, 0, texCoordsArray[0]);
-
-		GL_Bind( tr.dlightImage );
-		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
-		// where they aren't rendered
-		if ( dl->type & additive) {
-			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		else {
-			GL_State( GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		R_DrawElements( numIndexes, hitIndexes );
-		backEnd.pc.c_totalIndexes += numIndexes;
-		backEnd.pc.c_dlightIndexes += numIndexes;
-	}
-}
-
-/*
-===============
-ComputeColors
-===============
-*/
-static void ComputeColors( shaderStage_t *pStage )
-{
-	int		i;
-
-	//
-	// rgbGen
-	//
-	switch ( pStage->rgbGen )
-	{
-		case CGEN_IDENTITY:
-			Com_Memset( tess.svars.colors, 0xff, tess.numVertexes * 4 );
-			break;
-		default:
-		case CGEN_IDENTITY_LIGHTING:
-			Com_Memset( tess.svars.colors, tr.identityLightByte, tess.numVertexes * 4 );
-			break;
-		case CGEN_ENTITY:
-			RB_CalcColorFromEntity((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_ONE_MINUS_ENTITY:
-			RB_CalcColorFromOneMinusEntity((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_EXACT_VERTEX:
-			if (!tess.vertexColorValid) {
-				static qboolean bWarned = qfalse;
-
-				if (!bWarned) {
-					// mohta and mohtt shows the warning once
-                    bWarned = qtrue;
-
-                    ri.Printf(
-                        PRINT_WARNING,
-                        "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
-                        tess.shader->name
-					);
-				}
-				break;
-			}
-			Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
-			break;
-		case CGEN_VERTEX:
-            if (!tess.vertexColorValid) {
-                static qboolean bWarned = qfalse;
-
-				if (!bWarned) {
-					bWarned = qtrue;
-
-					ri.Printf(
-						PRINT_WARNING,
-						"Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
-						tess.shader->name);
-				}
-				break;
-			}
-			if (tr.identityLight == 1)
-			{
-				Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
-			}
-			else
-			{
-				for (i = 0; i < tess.numVertexes; i++)
-				{
-					tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
-					tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
-					tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
-					tess.svars.colors[i][3] = tess.vertexColors[i][3];
-				}
-			}
-			break;
-		case CGEN_ONE_MINUS_VERTEX:
-			if ( tr.identityLight == 1 )
-			{
-				for ( i = 0; i < tess.numVertexes; i++ )
-				{
-					tess.svars.colors[i][0] = 255 - tess.vertexColors[i][0];
-					tess.svars.colors[i][1] = 255 - tess.vertexColors[i][1];
-					tess.svars.colors[i][2] = 255 - tess.vertexColors[i][2];
-				}
-			}
-			else
-			{
-				for ( i = 0; i < tess.numVertexes; i++ )
-				{
-					tess.svars.colors[i][0] = ( 255 - tess.vertexColors[i][0] ) * tr.identityLight;
-					tess.svars.colors[i][1] = ( 255 - tess.vertexColors[i][1] ) * tr.identityLight;
-					tess.svars.colors[i][2] = ( 255 - tess.vertexColors[i][2] ) * tr.identityLight;
-				}
-			}
-			break;
-		case CGEN_WAVEFORM:
-			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, NULL);
-			break;
-		case CGEN_MULTIPLY_BY_WAVEFORM:
-			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, pStage->colorConst);
-			break;
-		case CGEN_LIGHTING_GRID:
-			RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
-			break;
-		case CGEN_LIGHTING_SPHERICAL:
-		case CGEN_STATIC:
-			if (!r_drawspherelights->integer) {
-				break;
-			}
-
-			if (!backEnd.currentStaticModel) {
-				if (backEnd.currentSphere->TessFunction) {
-					backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
-				}
-				break;
-			}
-
-			if (!tess.vertexColorValid) {
-				ri.Printf(PRINT_WARNING, "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n", tess.shader->name);
-			}
-
-			if (backEnd.currentStaticModel->useSpecialLighting)
-			{
-				for (i = 0; i < tess.numVertexes; i++)
-				{
-					int j;
-					vec3_t colorout;
-					int r, g, b;
-
-					colorout[0] = tess.vertexColors[i][0];
-					colorout[1] = tess.vertexColors[i][1];
-					colorout[2] = tess.vertexColors[i][2];
-
-					for (j = 0; j < backEnd.currentStaticModel->numdlights; j++)
-					{
-						float ooLightDistSquared;
-						float dot;
-						vec3_t diff;
-						dlight_t* dl;
-
-						dl = &backEnd.refdef.dlights[backEnd.currentStaticModel->dlights[j].index];
-						VectorSubtract(backEnd.currentStaticModel->dlights[j].transformed, tess.xyz[i], diff);
-
-						dot = DotProduct(diff, tess.normal[i]);
-						if (dot >= 0)
-						{
-							float ooLen;
-
-							ooLen = 1.0 / VectorLengthSquared(diff);
-							ooLightDistSquared = dot * (7500.0 * dl->radius * ooLen * sqrt(ooLen));
-							colorout[0] = dl->color[0] * ooLightDistSquared + colorout[0];
-							colorout[1] = dl->color[1] * ooLightDistSquared + colorout[1];
-							colorout[2] = dl->color[2] * ooLightDistSquared + colorout[2];
-						}
-					}
-
-					r = colorout[0];
-					g = colorout[1];
-					b = colorout[2];
-
-					if (tr.overbrightShift)
-					{
-						r = (int)((float)r * tr.overbrightMult);
-						g = (int)((float)g * tr.overbrightMult);
-						b = (int)((float)b * tr.overbrightMult);
-					}
-
-					if (r > 0xFF || g > 0xFF || b > 0xFF)
-					{
-						float t;
-
-						t = 255.0 / (float)Q_max(r, Q_max(g, b));
-
-						r = (int)((float)r * t);
-						g = (int)((float)g * t);
-						b = (int)((float)b * t);
-					}
-
-					tess.svars.colors[i][0] = r;
-					tess.svars.colors[i][1] = g;
-					tess.svars.colors[i][2] = b;
-				}
-			}
-			else
-			{
-				if (tr.identityLight == 1.0)
-				{
-					Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
-				}
-				else
-				{
-					for (i = 0; i < tess.numVertexes; i++) {
-						tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
-						tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
-						tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
-					}
-				}
-			}
-			break;
-		case CGEN_CONSTANT:
-			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst);
-			break;
-		case CGEN_GLOBAL_COLOR:
-			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
-			break;
-		case CGEN_SCOORD:
-			RB_CalcRGBFromTexCoords(
-				(unsigned char*)tess.svars.colors,
-				pStage->alphaMin,
-				pStage->alphaMax,
-				pStage->alphaConstMin,
-				pStage->alphaConst,
-				1.0,
-				0.0,
-				tess.svars.texcoords[0][0]
-			);
-			break;
-		case CGEN_TCOORD:
-			RB_CalcRGBFromTexCoords(
-				(unsigned char*)tess.svars.colors,
-				pStage->alphaMin,
-				pStage->alphaMax,
-				pStage->alphaConstMin,
-				pStage->alphaConst,
-				0.0,
-				1.0,
-				tess.svars.texcoords[0][0]
-			);
-			break;
-		case CGEN_DOT:
-			RB_CalcRGBFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-			break;
-		case CGEN_ONE_MINUS_DOT:
-			RB_CalcRGBFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-			break;
-	}
-
-	//
-	// alphaGen
-	//
-	switch ( pStage->alphaGen )
-	{
-	case AGEN_SKIP:
-		break;
-	case AGEN_IDENTITY:
-		if ( pStage->rgbGen != CGEN_IDENTITY
-			&& pStage->rgbGen != CGEN_LIGHTING_GRID
-			&& pStage->rgbGen != CGEN_LIGHTING_SPHERICAL)
-		{
-			if ( pStage->rgbGen != CGEN_VERTEX || tr.identityLight != 1 ) {
-				for ( i = 0; i < tess.numVertexes; i++ ) {
-					tess.svars.colors[i][3] = 0xff;
-				}
-			}
-		}
-		break;
-	case AGEN_ENTITY:
-		RB_CalcAlphaFromEntity((unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_ONE_MINUS_ENTITY:
-		RB_CalcAlphaFromOneMinusEntity((unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_VERTEX:
-		if (pStage->rgbGen != CGEN_VERTEX) {
-			for (i = 0; i < tess.numVertexes; i++) {
-				tess.svars.colors[i][3] = tess.vertexColors[i][3];
-			}
-		}
-		break;
-	case AGEN_ONE_MINUS_VERTEX:
-		for (i = 0; i < tess.numVertexes; i++)
-		{
-			tess.svars.colors[i][3] = 255 - tess.vertexColors[i][3];
-		}
-		break;
-	case AGEN_LIGHTING_SPECULAR:
-		RB_CalcSpecularAlpha((unsigned char*)tess.svars.colors, pStage->alphaMax, pStage->specOrigin);
-		break;
-	case AGEN_WAVEFORM:
-		RB_CalcWaveAlpha(&pStage->alphaWave, (unsigned char*)tess.svars.colors);
-		break;
-	case AGEN_PORTAL:
-		{
-			unsigned char alpha;
-
-			for ( i = 0; i < tess.numVertexes; i++ )
-			{
-				float len;
-				vec3_t v;
-
-				VectorSubtract( tess.xyz[i], backEnd.viewParms.ori.origin, v );
-				len = VectorLength( v );
-
-				len /= tess.shader->portalRange;
-
-				if ( len < 0 )
-				{
-					alpha = 0;
-				}
-				else if ( len > 1 )
-				{
-					alpha = 0xff;
-				}
-				else
-				{
-					alpha = len * 0xff;
-				}
-
-				tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-	case AGEN_DOT:
-		RB_CalcAlphaFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		return;
-	case AGEN_ONE_MINUS_DOT:
-		RB_CalcAlphaFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		return;
-	case AGEN_CONSTANT:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst[3]);
-		break;
-	case AGEN_GLOBAL_ALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D[3]);
-		break;
-	case AGEN_SKYALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, tr.refdef.sky_alpha * 255.0);
-		break;
-	case AGEN_ONE_MINUS_SKYALPHA:
-		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, (1.0 - tr.refdef.sky_alpha) * 255.0);
-		break;
-	case AGEN_SCOORD:
-		RB_CalcAlphaFromTexCoords(
-			(unsigned char*)tess.svars.colors,
-			pStage->alphaMin,
-			pStage->alphaMax,
-			pStage->alphaConstMin,
-			pStage->alphaConst,
-			1.0,
-			0.0,
-			tess.svars.texcoords[0][0]
-		);
-		break;
-	case AGEN_TCOORD:
-		RB_CalcAlphaFromTexCoords(
-			(unsigned char*)tess.svars.colors,
-			pStage->alphaMin,
-			pStage->alphaMax,
-			pStage->alphaConstMin,
-			pStage->alphaConst,
-			0.0,
-			1.0,
-			tess.svars.texcoords[0][0]
-		);
-		break;
-	case AGEN_DIST_FADE:
-		if (backEnd.currentStaticModel)
-		{
-			unsigned char alpha;
-
-			for (i = 0; i < tess.numVertexes; i++) {
-				float len;
-				vec3_t org, v;
-
-				VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
-				org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
-				org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
-				org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
-			
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0xff;
-				} else if (len > 1) {
-					alpha = 0;
-				} else {
-					alpha = ((1.0 - len) * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		else
-        {
-            unsigned char alpha;
-
-            for (i = 0; i < tess.numVertexes; i++) {
-                float len;
-                vec3_t org, v;
-
-				if (backEnd.currentEntity) {
-					VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
-					org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
-					org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
-					org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
-				} else {
-					VectorCopy(backEnd.viewParms.ori.origin, org);
-				}
-
-				
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0xff;
-				} else if (len > 1) {
-					alpha = 0;
-				} else {
-					alpha = ((1.0 - len) * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-	case AGEN_ONE_MINUS_DIST_FADE:
-		if (backEnd.currentStaticModel)
-		{
-			unsigned char alpha;
-
-			for (i = 0; i < tess.numVertexes; i++) {
-				float len;
-				vec3_t org, v;
-
-                VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
-                org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
-                org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
-                org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
-			
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0;
-				} else if (len > 1) {
-					alpha = 0xff;
-				} else {
-					alpha = (len * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		else
-        {
-            unsigned char alpha;
-
-            for (i = 0; i < tess.numVertexes; i++) {
-                float len;
-                vec3_t org, v;
-
-				if (backEnd.currentEntity) {
-                    VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
-                    org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
-                    org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
-                    org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
-				} else {
-					VectorCopy(backEnd.viewParms.ori.origin, org);
-				}
-
-				
-				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
-				if (len < 0) {
-					alpha = 0;
-				} else if (len > 1) {
-					alpha = 0xff;
-				} else {
-					alpha = (len * 255.0);
-                }
-                tess.svars.colors[i][3] = alpha;
-			}
-		}
-		break;
-    case AGEN_TIKI_DIST_FADE:
-    case AGEN_ONE_MINUS_TIKI_DIST_FADE:
-		{
-			unsigned char alpha;
-
-			if (backEnd.currentStaticModel)
-			{
-				float lenSqr;
-				float fDistNearSqr;
-				float fDistFarSqr;
-				vec3_t org;
-
-				VectorSubtract(backEnd.currentStaticModel->origin, backEnd.viewParms.ori.origin, org);
-
-				lenSqr = VectorLengthSquared(org);
-                fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
-                fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
-				if (lenSqr <= fDistNearSqr) {
-					alpha = 0;
-				} else if (lenSqr >= fDistFarSqr) {
-					alpha = 0xff;
-				} else {
-					float len;
-
-					len = VectorLength(org);
-					alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
-				}
-
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					alpha = 0xff - alpha;
-				}
-			}
-			else if (backEnd.currentEntity)
-			{
-				float lenSqr;
-				float fDistNearSqr;
-				float fDistFarSqr;
-				vec3_t org;
-
-				VectorSubtract(backEnd.currentEntity->e.origin, backEnd.viewParms.ori.origin, org);
-
-				lenSqr = VectorLengthSquared(org);
-				fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
-				fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
-				if (lenSqr <= fDistNearSqr) {
-					alpha = 0;
-				} else if (lenSqr >= fDistFarSqr) {
-					alpha = 0xff;
-				} else {
-					float len;
-
-                    len = VectorLength(org);
-                    alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
-				}
-
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					alpha = 0xff - alpha;
-				}
-			}
-			else
-			{
-				const char* type;
-				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
-					type = "tikiDistFade";
-				} else {
-					type = "oneMinusTikiDistFade";
-				}
-
-				ri.Error(ERR_DROP, "ERROR: '%s' shader command used on a non-tiki\n", type);
-				alpha = 0xff;
-			}
-			RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, alpha);
-		}
-		break;
-	case AGEN_DOT_VIEW:
-		RB_CalcAlphaFromDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-		break;
-	case AGEN_ONE_MINUS_DOT_VIEW:
-		RB_CalcAlphaFromOneMinusDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-        break;
-    case AGEN_HEIGHT_FADE:
-        RB_CalcAlphaFromHeightFade((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
-        break;
-	default:
-		break;
-	}
-}
-
-/*
-===============
-ComputeTexCoords
-===============
-*/
-static void ComputeTexCoords( shaderStage_t *pStage ) {
-	int		i;
-	int		b;
-
-	for ( b = 0; b < NUM_TEXTURE_BUNDLES && pStage->bundle[b].image[0]; b++ ) {
-		int tm;
-
-		//
-		// generate the texture coordinates
-		//
-		switch ( pStage->bundle[b].tcGen )
-		{
-		case TCGEN_IDENTITY:
-			Com_Memset( tess.svars.texcoords[b], 0, sizeof( float ) * 2 * tess.numVertexes );
-			break;
-		case TCGEN_TEXTURE:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = tess.texCoords[i][0][0];
-				tess.svars.texcoords[b][i][1] = tess.texCoords[i][0][1];
-			}
-			break;
-		case TCGEN_LIGHTMAP:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = tess.texCoords[i][1][0];
-				tess.svars.texcoords[b][i][1] = tess.texCoords[i][1][1];
-			}
-			break;
-		case TCGEN_ENVIRONMENT_MAPPED:
-			RB_CalcEnvironmentTexCoords( ( float * ) tess.svars.texcoords[b] );
-            break;
-		case TCGEN_VECTOR:
-			for (i = 0; i < tess.numVertexes; i++) {
-				tess.svars.texcoords[b][i][0] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[0]);
-				tess.svars.texcoords[b][i][1] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[1]);
-			}
-			break;
-        case TCGEN_ENVIRONMENT_MAPPED2:
-            RB_CalcEnvironmentTexCoords2((float*)tess.svars.texcoords[b]);
-            break;
-		case TCGEN_SUN_REFLECTION:
-			// FIXME: unimplemented
-			break;
-        default:
-            ri.Printf(
-				PRINT_DEVELOPER,
-                "WARNING: invalid tcGen '%d' specified for shader '%s'\n",
-                pStage->bundle[b].tcGen,
-                tess.shader->name
-			);
-			break;
-		}
-
-		//
-		// alter texture coordinates
-		//
-		for ( tm = 0; tm < pStage->bundle[b].numTexMods ; tm++ ) {
-			switch ( pStage->bundle[b].texMods[tm].type )
-			{
-			case TMOD_NONE:
-				tm = TR_MAX_TEXMODS;		// break out of for loop
-				break;
-
-			case TMOD_TURBULENT:
-				RB_CalcTurbulentTexCoords( &pStage->bundle[b].texMods[tm].wave, 
-						                 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_ENTITY_TRANSLATE:
-				RB_CalcScrollTexCoords( backEnd.currentEntity->e.shaderTexCoord,
-									 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_SCROLL:
-				RB_CalcScrollTexCoords( pStage->bundle[b].texMods[tm].scroll,
-										 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_SCALE:
-				RB_CalcScaleTexCoords( pStage->bundle[b].texMods[tm].scale,
-									 ( float * ) tess.svars.texcoords[b] );
-				break;
-			
-			case TMOD_STRETCH:
-				RB_CalcStretchTexCoords( &pStage->bundle[b].texMods[tm].wave, 
-						               ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_TRANSFORM:
-				RB_CalcTransformTexCoords( &pStage->bundle[b].texMods[tm],
-						                 ( float * ) tess.svars.texcoords[b] );
-				break;
-
-			case TMOD_ROTATE:
-				RB_CalcRotateTexCoords( pStage->bundle[b].texMods[tm].rotateSpeed,
-										( float * ) tess.svars.texcoords[b] );
-				break;
-
-			default:
-				ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
-				break;
-			}
-		}
-	}
-}
-
-/*
-** RB_IterateStagesGeneric
-*/
-static void RB_IterateStagesGeneric( shaderCommands_t *input )
-{
-	int stage;
-
-	for (stage = 0; stage < MAX_SHADER_STAGES; stage++)
-	{
-		shaderStage_t* pStage = tess.xstages[stage];
-
-		if (!pStage)
-		{
-			break;
-		}
-
-		if (pStage->alphaGen == AGEN_SKYALPHA && tr.refdef.sky_alpha < 0.01) {
-			continue;
-		}
-		else if (pStage->alphaGen == AGEN_ONE_MINUS_SKYALPHA && tr.refdef.sky_alpha > 0.99) {
-			continue;
-		}
-
-		ComputeTexCoords(pStage);
-		ComputeColors(pStage);
-
-		if (!setArraysOnce)
-		{
-			qglEnableClientState(GL_COLOR_ARRAY);
-			qglColorPointer(4, GL_UNSIGNED_BYTE, 0, input->svars.colors);
-		}
-
-		//
-		// do multitexture
-		//
-		if (pStage->bundle[1].image[0] != 0)
-		{
-			DrawMultitextured(input, stage);
-		}
-		else
-		{
-			if (backEnd.in2D) {
-				GL_State(pStage->stateBits | GLS_DEPTHTEST_DISABLE);
-			}
-			else {
-				GL_State(pStage->stateBits);
-			}
-
-			if (!setArraysOnce)
-			{
-				qglTexCoordPointer(2, GL_FLOAT, 0, input->svars.texcoords[0]);
-			}
-
-			//
-			// set state
-			//
-			if (pStage->bundle[0].vertexLightmap && r_vertexLight->integer && r_lightmap->integer)
-			{
-				GL_Bind(tr.whiteImage);
-			}
-			else {
-				if (input->dlightMap && tess.xstages[stage]->bundle[0].isLightmap) {
-					GL_Bind(tr.dlightImages[input->dlightMap - 1]);
-				}
-				else {
-					R_BindAnimatedImage(&pStage->bundle[0]);
-				}
-			}
-
-			//
-			// draw
-			//
-			R_DrawElements(input->numIndexes, input->indexes);
-		}
-		// allow skipping out to show just lightmaps during development
-		if (r_lightmap->integer && (pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap))
-		{
-			break;
-		}
-	}
-}
-
-
-/*
-** RB_StageIteratorGeneric
-*/
-void RB_StageIteratorGeneric( void )
-{
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	input->shaderTime = backEnd.refdef.floatTime;
-	if ((input->shader->flags & 1) != 0) {
-		input->shaderTime = backEnd.refdef.floatTime - backEnd.shaderStartTime;
-	}
-
-	RB_DeformTessGeometry();
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) 
-	{
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorGeneric( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	// set polygon offset if necessary
-	if ( input->shader->polygonOffset )
-	{
-		qglEnable( GL_POLYGON_OFFSET_FILL );
-		qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value );
-	}
-
-	//
-	// if there is only a single pass then we can enable color
-	// and texture arrays before we compile, otherwise we need
-	// to avoid compiling those arrays since they will change
-	// during multipass rendering
-	//
-	if (tess.numPasses > 1 || (tess.xstages[0] && tess.xstages[0]->multitextureEnv))
-	{
-		setArraysOnce = qfalse;
-		qglDisableClientState(GL_COLOR_ARRAY);
-		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	}
-	else
-	{
-		setArraysOnce = qtrue;
-
-		qglEnableClientState(GL_COLOR_ARRAY);
-		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, tess.svars.colors);
-
-		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		qglTexCoordPointer(2, GL_FLOAT, 0, tess.svars.texcoords[0]);
-	}
-
-	//
-	// lock XYZ
-	//
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-	if (qglLockArraysEXT)
-	{
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	//
-	// enable color and texcoord arrays after the lock if necessary
-	//
-	if ( !setArraysOnce )
-	{
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglEnableClientState( GL_COLOR_ARRAY );
-	}
-
-	//
-	// call shader function
-	//
-	RB_IterateStagesGeneric( input );
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if (tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE) {
-		ProjectDlightTexture();
-	}
-
-	// 
-	// unlock arrays
-	//
-	if (qglUnlockArraysEXT) 
-	{
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-
-	//
-	// reset polygon offset
-	//
-	if ( input->shader->polygonOffset )
-	{
-		qglDisable( GL_POLYGON_OFFSET_FILL );
-	}
-}
-
-
-/*
-** RB_StageIteratorVertexLitTexture
-*/
-void RB_StageIteratorVertexLitTextureUnfogged( void )
-{
-	shaderCommands_t *input;
-	shader_t		*shader;
-
-	input = &tess;
-
-	shader = input->shader;
-
-	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer) {
-		backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
-	}
-	else
-	{
-		//
-		// compute colors
-		//
-		RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
-	}
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) 
-	{
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorVertexLitTexturedUnfogged( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	//
-	// set arrays and lock
-	//
-	qglEnableClientState( GL_COLOR_ARRAY);
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] );
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);
-
-	if ( qglLockArraysEXT )
-	{
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	//
-	// call special shade routine
-	//
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[0] );
-	GL_State( tess.xstages[0]->stateBits );
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
-		ProjectDlightTexture();
-	}
-
-	// 
-	// unlock arrays
-	//
-	if (qglUnlockArraysEXT) 
-	{
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-}
-
-//define	REPLACE_MODE
-
-void RB_StageIteratorLightmappedMultitextureUnfogged( void ) {
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	//
-	// log this call
-	//
-	if ( r_logFile->integer ) {
-		// don't just call LogComment, or we will get
-		// a call to va() every frame!
-		GLimp_LogComment( va("--- RB_StageIteratorLightmappedMultitexture( %s ) ---\n", tess.shader->name) );
-	}
-
-	//
-	// set face culling appropriately
-	//
-	GL_Cull( input->shader->cullType );
-
-	//
-	// set color, pointers, and lock
-	//
-	GL_State( GLS_DEFAULT );
-	qglVertexPointer( 3, GL_FLOAT, 16, input->xyz );
-
-#ifdef REPLACE_MODE
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglColor3f( 1, 1, 1 );
-	qglShadeModel( GL_FLAT );
-#else
-	qglEnableClientState( GL_COLOR_ARRAY );
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.constantColor255 );
-#endif
-
-	//
-	// select base stage
-	//
-	GL_SelectTexture( 0 );
-
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[0] );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][0] );
-
-	//
-	// configure second stage
-	//
-	GL_SelectTexture( 1 );
-	qglEnable( GL_TEXTURE_2D );
-	if ( r_lightmap->integer ) {
-		GL_TexEnv( GL_REPLACE );
-	} else {
-		GL_TexEnv( GL_MODULATE );
-	}
-	if (tess.dlightMap && tess.xstages[0]->bundle[1].isLightmap) {
-		GL_Bind(tr.dlightImages[tess.dlightMap - 1]);
-	} else {
-		R_BindAnimatedImage(&tess.xstages[0]->bundle[1]);
-	}
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] );
-
-	//
-	// lock arrays
-	//
-	if ( qglLockArraysEXT ) {
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
-	}
-
-	R_DrawElements( input->numIndexes, input->indexes );
-
-	//
-	// disable texturing on TEXTURE1, then select TEXTURE0
-	//
-	qglDisable( GL_TEXTURE_2D );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	GL_SelectTexture( 0 );
-#ifdef REPLACE_MODE
-	GL_TexEnv( GL_MODULATE );
-	qglShadeModel( GL_SMOOTH );
-#endif
-
-	// 
-	// now do any dynamic lighting needed
-	//
-	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
-		ProjectDlightTexture();
-	}
-
-	//
-	// unlock arrays
-	//
-	if ( qglUnlockArraysEXT ) {
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
-	}
-}
-
-/*
-** RB_EndSurface
-*/
-void RB_EndSurface( void ) {
-	shaderCommands_t *input;
-
-	input = &tess;
-
-	if (input->numIndexes == 0) {
-		return;
-	}
-	if (input->indexes[SHADER_MAX_INDEXES-1] != 0) {
-		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_INDEXES hit");
-	}	
-	if (input->xyz[SHADER_MAX_VERTEXES-1][0] != 0) {
-		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_VERTEXES hit");
-	}
-
-	if (tess.xyz[SHADER_MAX_VERTEXES - 1][0] && r_shadows->integer != 3) {
-		tess.xyz[SHADER_MAX_VERTEXES - 1][0] = 0;
-	}
-
-	if ( tess.shader == tr.shadowShader ) {
-		RB_ComputeShadowVolume();
-		return;
-	}
-
-	// for debugging of sort order issues, stop rendering after a given sort value
-	if ( r_debugSort->integer && r_debugSort->integer < tess.shader->sort ) {
-		return;
-	}
-
-	//
-	// update performance counters
-	//
-	backEnd.pc.c_shaders++;
-	backEnd.pc.c_vertexes += tess.numVertexes;
-	backEnd.pc.c_indexes += tess.numIndexes;
-	backEnd.pc.c_totalIndexes += tess.numIndexes * tess.numPasses;
-
-	//
-	// call off to shader specific tess end function
-	//
-	tess.currentStageIteratorFunc();
-
-	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL) && !backEnd.in2D)
-	{
-		//
-		// draw debugging stuff
-		//
-		if (r_showtris->integer && developer->integer) {
-			DrawTris(input, r_showtris->integer);
-		}
-		if (r_shownormals->integer && developer->integer) {
-			DrawNormals(input);
-		}
-	}
-
-	// clear shader so we can tell we don't have any unclosed surfaces
-	tess.numIndexes = 0;
-
-	GLimp_LogComment( "----------\n" );
-}
-
diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c
deleted file mode 100644
index 0f02b6d6..00000000
--- a/code/renderer/tr_shade_calc.c
+++ /dev/null
@@ -1,1448 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_shade_calc.c
-
-#include "tr_local.h"
-
-
-#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ myftol( ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
-
-static float *TableForFunc( genFunc_t func ) 
-{
-	switch ( func )
-	{
-	case GF_SIN:
-		return tr.sinTable;
-	case GF_TRIANGLE:
-		return tr.triangleTable;
-	case GF_SQUARE:
-		return tr.squareTable;
-	case GF_SAWTOOTH:
-		return tr.sawToothTable;
-	case GF_INVERSE_SAWTOOTH:
-		return tr.inverseSawToothTable;
-	case GF_NONE:
-	default:
-		break;
-	}
-
-	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'\n", func, tess.shader->name );
-	return NULL;
-}
-
-/*
-** EvalWaveForm
-**
-** Evaluates a given waveForm_t, referencing backEnd.refdef.time directly
-*/
-static float EvalWaveForm( const waveForm_t *wf ) 
-{
-	float	*table;
-
-	table = TableForFunc( wf->func );
-
-	return WAVEVALUE( table, wf->base, wf->amplitude, wf->phase, wf->frequency );
-}
-
-static float EvalWaveFormClamped( const waveForm_t *wf )
-{
-	float glow  = EvalWaveForm( wf );
-
-	if ( glow < 0 )
-	{
-		return 0;
-	}
-
-	if ( glow > 1 )
-	{
-		return 1;
-	}
-
-	return glow;
-}
-
-/*
-** RB_CalcStretchTexCoords
-*/
-void RB_CalcStretchTexCoords( const waveForm_t *wf, float *st )
-{
-	float p;
-	texModInfo_t tmi;
-
-	p = 1.0f / EvalWaveForm( wf );
-
-	tmi.matrix[0][0] = p;
-	tmi.matrix[1][0] = 0;
-	tmi.translate[0] = 0.5f - 0.5f * p;
-
-	tmi.matrix[0][1] = 0;
-	tmi.matrix[1][1] = p;
-	tmi.translate[1] = 0.5f - 0.5f * p;
-
-	RB_CalcTransformTexCoords( &tmi, st );
-}
-
-/*
-====================================================================
-
-DEFORMATIONS
-
-====================================================================
-*/
-
-/*
-========================
-RB_CalcDeformVertexes
-
-========================
-*/
-void RB_CalcDeformVertexes( deformStage_t *ds )
-{
-	int i;
-	vec3_t	offset;
-	float	scale;
-	float	*xyz = ( float * ) tess.xyz;
-	float	*normal = ( float * ) tess.normal;
-	float	*table;
-
-	if ( ds->deformationWave.frequency == 0 )
-	{
-		scale = EvalWaveForm( &ds->deformationWave );
-
-		for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 )
-		{
-			VectorScale( normal, scale, offset );
-			
-			xyz[0] += offset[0];
-			xyz[1] += offset[1];
-			xyz[2] += offset[2];
-		}
-	}
-	else
-	{
-		table = TableForFunc( ds->deformationWave.func );
-
-		for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 )
-		{
-			float off = ( xyz[0] + xyz[1] + xyz[2] ) * ds->deformationSpread;
-
-			scale = WAVEVALUE( table, ds->deformationWave.base, 
-				ds->deformationWave.amplitude,
-				ds->deformationWave.phase + off,
-				ds->deformationWave.frequency );
-
-			VectorScale( normal, scale, offset );
-			
-			xyz[0] += offset[0];
-			xyz[1] += offset[1];
-			xyz[2] += offset[2];
-		}
-	}
-}
-
-void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
-{
-    int    i;
-    vec3_t offset;
-    float  scale;
-    vec4_t* xyz, * normal;
-	float* table;
-    float  base;
-    float  amplitude;
-    float  phase;
-    float  frequency;
-    float  min, max;
-    vec2_t (*st)[2];
-    float  vertexScale;
-
-    xyz = tess.xyz;
-    normal = tess.normal;
-    min = ds->bulgeWidth;
-    max = ds->bulgeHeight;
-    st = tess.texCoords;
-
-    if (ds->deformationWave.base != 1234567.0f) {
-        base = ds->deformationWave.base;
-    }
-    else if (backEnd.currentEntity) {
-        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
-    }
-    else {
-        base = r_static_shaderdata0->value;
-    }
-
-    if (ds->deformationWave.amplitude != 1234567.0f) {
-        amplitude = ds->deformationWave.amplitude;
-    }
-    else if (backEnd.currentEntity) {
-        amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
-    }
-    else {
-        amplitude = r_static_shaderdata1->value;
-    }
-
-    if (ds->deformationWave.phase != 1234567.0f) {
-        phase = ds->deformationWave.phase;
-    }
-    else if (backEnd.currentEntity) {
-        phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
-    }
-    else {
-        phase = r_static_shaderdata2->value;
-    }
-
-    if (ds->deformationWave.frequency != 1234567.0f) {
-        frequency = ds->deformationWave.frequency;
-    }
-    else if (backEnd.currentEntity) {
-        frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
-    }
-    else {
-        frequency = r_static_shaderdata3->value;
-    }
-
-    if (!backEnd.currentEntity) {
-        base = base * r_static_shadermultiplier0->value;
-        amplitude = amplitude * r_static_shadermultiplier1->value;
-        phase = phase * r_static_shadermultiplier2->value;
-        frequency = frequency * r_static_shadermultiplier3->value;
-    }
-
-	if (frequency) {
-		table = TableForFunc(ds->deformationWave.func);
-		for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
-			float off;
-
-			off = ((*xyz)[0] + (*xyz)[1] + (*xyz)[2]) * ds->deformationSpread;
-            scale = table[(int)((phase + off + tess.shaderTime * frequency) * 1024.0) & FUNCTABLE_MASK] * amplitude + base;
-            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
-            offset[0] = scale * vertexScale * (*normal)[0];
-            offset[1] = scale * vertexScale * (*normal)[1];
-            offset[2] = scale * vertexScale * (*normal)[2];
-			VectorAdd(*xyz, offset, *xyz);
-		}
-	}
-	else {
-        scale = EvalWaveForm(&ds->deformationWave);
-        for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
-            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
-            offset[0] = vertexScale * scale * (*normal)[0];
-            offset[1] = vertexScale * scale * (*normal)[1];
-            offset[2] = vertexScale * scale * (*normal)[2];
-            VectorAdd(*xyz, offset, *xyz);
-		}
-	}
-}
-
-/*
-=========================
-RB_CalcDeformNormals
-
-Wiggle the normals for wavy environment mapping
-=========================
-*/
-void RB_CalcDeformNormals( deformStage_t *ds ) {
-	int i;
-	float	scale;
-	float	*xyz = ( float * ) tess.xyz;
-	float	*normal = ( float * ) tess.normal;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4 ) {
-		scale = 0.98f;
-		scale = R_NoiseGet4f( xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 0 ] += ds->deformationWave.amplitude * scale;
-
-		scale = 0.98f;
-		scale = R_NoiseGet4f( 100 + xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 1 ] += ds->deformationWave.amplitude * scale;
-
-		scale = 0.98f;
-		scale = R_NoiseGet4f( 200 + xyz[0] * scale, xyz[1] * scale, xyz[2] * scale,
-			tess.shaderTime * ds->deformationWave.frequency );
-		normal[ 2 ] += ds->deformationWave.amplitude * scale;
-
-		VectorNormalizeFast( normal );
-	}
-}
-
-/*
-========================
-RB_CalcBulgeVertexes
-
-========================
-*/
-void RB_CalcBulgeVertexes( deformStage_t *ds ) {
-	int i;
-	const float *st = ( const float * ) tess.texCoords[0];
-	float		*xyz = ( float * ) tess.xyz;
-	float		*normal = ( float * ) tess.normal;
-	float		now;
-
-	now = backEnd.refdef.time * ds->bulgeSpeed * 0.001f;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, st += 4, normal += 4 ) {
-		int		off;
-		float scale;
-
-		off = (float)( FUNCTABLE_SIZE / (M_PI*2) ) * ( st[0] * ds->bulgeWidth + now );
-
-		scale = tr.sinTable[ off & FUNCTABLE_MASK ] * ds->bulgeHeight;
-			
-		xyz[0] += normal[0] * scale;
-		xyz[1] += normal[1] * scale;
-		xyz[2] += normal[2] * scale;
-	}
-}
-
-
-/*
-======================
-RB_CalcMoveVertexes
-
-A deformation that can move an entire surface along a wave path
-======================
-*/
-void RB_CalcMoveVertexes( deformStage_t *ds ) {
-	int			i;
-	float		*xyz;
-	float		*table;
-	float		scale;
-	vec3_t		offset;
-
-	table = TableForFunc( ds->deformationWave.func );
-
-	scale = WAVEVALUE( table, ds->deformationWave.base, 
-		ds->deformationWave.amplitude,
-		ds->deformationWave.phase,
-		ds->deformationWave.frequency );
-
-	VectorScale( ds->moveVector, scale, offset );
-
-	xyz = ( float * ) tess.xyz;
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4 ) {
-		VectorAdd( xyz, offset, xyz );
-	}
-}
-
-
-/*
-=============
-DeformText
-
-Change a polygon into a bunch of text polygons
-=============
-*/
-void DeformText( const char *text ) {
-	int		i;
-	vec3_t	origin, width, height;
-	size_t	len;
-	int		ch;
-	byte	color[4];
-	float	bottom, top;
-	vec3_t	mid;
-
-	height[0] = 0;
-	height[1] = 0;
-	height[2] = -1;
-	CrossProduct( tess.normal[0], height, width );
-
-	// find the midpoint of the box
-	VectorClear( mid );
-	bottom = 999999;
-	top = -999999;
-	for ( i = 0 ; i < 4 ; i++ ) {
-		VectorAdd( tess.xyz[i], mid, mid );
-		if ( tess.xyz[i][2] < bottom ) {
-			bottom = tess.xyz[i][2];
-		}
-		if ( tess.xyz[i][2] > top ) {
-			top = tess.xyz[i][2];
-		}
-	}
-	VectorScale( mid, 0.25f, origin );
-
-	// determine the individual character size
-	height[0] = 0;
-	height[1] = 0;
-	height[2] = ( top - bottom ) * 0.5f;
-
-	VectorScale( width, height[2] * -0.75f, width );
-
-	// determine the starting position
-	len = strlen( text );
-	VectorMA( origin, (len-1), width, origin );
-
-	// clear the shader indexes
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-
-	color[0] = color[1] = color[2] = color[3] = 255;
-
-	// draw each character
-	for ( i = 0 ; i < len ; i++ ) {
-		ch = text[i];
-		ch &= 255;
-
-		if ( ch != ' ' ) {
-			int		row, col;
-			float	frow, fcol, size;
-
-			row = ch>>4;
-			col = ch&15;
-
-			frow = row*0.0625f;
-			fcol = col*0.0625f;
-			size = 0.0625f;
-
-			RB_AddQuadStampExt( origin, width, height, color, fcol, frow, fcol + size, frow + size );
-		}
-		VectorMA( origin, -2, width, origin );
-	}
-}
-
-/*
-==================
-GlobalVectorToLocal
-==================
-*/
-static void GlobalVectorToLocal( const vec3_t in, vec3_t out ) {
-	out[0] = DotProduct( in, backEnd.ori.axis[0] );
-	out[1] = DotProduct( in, backEnd.ori.axis[1] );
-	out[2] = DotProduct( in, backEnd.ori.axis[2] );
-}
-
-/*
-=====================
-AutospriteDeform
-
-Assuming all the triangles for this shader are independant
-quads, rebuild them as forward facing sprites
-=====================
-*/
-static void AutospriteDeform(void) {
-    int		i;
-    int		oldVerts;
-    float* xyz;
-    vec3_t	mid, delta;
-    float	radius;
-    vec3_t	left, up;
-    vec3_t	leftDir, upDir;
-
-    if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count", tess.shader->name);
-    }
-    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count", tess.shader->name);
-    }
-
-    oldVerts = tess.numVertexes;
-    tess.numVertexes = 0;
-    tess.numIndexes = 0;
-
-    if (backEnd.currentEntity != &tr.worldEntity) {
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
-    } else {
-        VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
-        VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
-    }
-
-    for (i = 0; i < oldVerts; i += 4) {
-        // find the midpoint
-        xyz = tess.xyz[i];
-
-        mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
-        mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
-        mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
-
-        VectorSubtract(xyz, mid, delta);
-        radius = VectorLength(delta) * 0.707f;		// / sqrt(2)
-
-        VectorScale(leftDir, radius, left);
-        VectorScale(upDir, radius, up);
-
-        if (backEnd.viewParms.isMirror) {
-            VectorSubtract(vec3_origin, left, left);
-        }
-
-        // compensate for scale in the axes if necessary
-        if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes) {
-            float axisLength;
-
-			if (backEnd.currentStaticModel) {
-				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
-			} else {
-				axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
-			}
-            
-            if (!axisLength) {
-                axisLength = 0;
-            }
-            else {
-                axisLength = 1.0f / axisLength;
-            }
-            VectorScale(left, axisLength, left);
-            VectorScale(up, axisLength, up);
-        }
-
-        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
-    }
-}
-
-
-/*
-=====================
-Autosprite2Deform
-
-Autosprite2 will pivot a rectangular quad along the center of its long axis
-=====================
-*/
-int edgeVerts[6][2] = {
-	{ 0, 1 },
-	{ 0, 3 },
-	{ 0, 2 },
-	{ 1, 3 },
-	{ 1, 2 },
-	{ 3, 2 }
-};
-
-static void Autosprite2Deform( void ) {
-	int		i, j;
-	int		indexes;
-	float	*xyz;
-	vec3_t	forward;
-
-	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name );
-	}
-	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name );
-	}
-
-	if ( backEnd.currentStaticModel || backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.ori.axis[0], forward );
-	} else {
-		VectorCopy( backEnd.viewParms.ori.axis[0], forward );
-	}
-
-	// this is a lot of work for two triangles...
-	// we could precalculate a lot of it is an issue, but it would mess up
-	// the shader abstraction
-	for ( i = 0, indexes = 0 ; i < tess.numVertexes ; i+=4, indexes+=6 ) {
-		float shortLengths[2];
-		int shortNums[2];
-		float longLengths[2];
-		int longNums[2];
-		vec3_t	mid[2];
-		vec3_t	major, minor;
-		float	*v1, *v2, *v3, *v4;
-		qboolean firstOnLeft, secondOnLeft;
-		float edgeLength;
-
-		// find the midpoint
-		xyz = tess.xyz[i];
-
-		// identify the two shortest edges
-		shortNums[0] = shortNums[1] = 0;
-		shortLengths[0] = shortLengths[1] = 1000000000;
-		longNums[1] = longNums[0] = 0;
-		longLengths[1] = longLengths[0] = 0;
-
-		for ( j = 0 ; j < 6 ; j++ ) {
-			float	l;
-			vec3_t	temp;
-
-			v1 = xyz + 4 * edgeVerts[j][0];
-			v2 = xyz + 4 * edgeVerts[j][1];
-
-			VectorSubtract( v1, v2, temp );
-			
-			l = DotProduct( temp, temp );
-			if ( l < shortLengths[0] ) {
-				shortNums[1] = shortNums[0];
-				shortLengths[1] = shortLengths[0];
-				shortNums[0] = j;
-				shortLengths[0] = l;
-			} else if ( l < shortLengths[1] ) {
-				shortNums[1] = j;
-				shortLengths[1] = l;
-			}
-
-			if (l > longLengths[0]) {
-				longNums[1] = longNums[0];
-				longLengths[1] = longLengths[0];
-				longNums[0] = j;
-				longLengths[0] = l;
-			} else if (l > longLengths[1]) {
-				longNums[1] = j;
-				longLengths[1] = l;
-			}
-		}
-
-		for ( j = 0 ; j < 2 ; j++ ) {
-			v1 = xyz + 4 * edgeVerts[shortNums[j]][0];
-			v2 = xyz + 4 * edgeVerts[shortNums[j]][1];
-
-			mid[j][0] = 0.5f * (v1[0] + v2[0]);
-			mid[j][1] = 0.5f * (v1[1] + v2[1]);
-			mid[j][2] = 0.5f * (v1[2] + v2[2]);
-		}
-
-		// find the vector of the major axis
-		VectorSubtract( mid[1], mid[0], major );
-
-		// cross this with the view direction to get minor axis
-		CrossProduct( major, forward, minor );
-		VectorNormalize( minor );
-
-        v1 = xyz + 4 * edgeVerts[shortNums[0]][0];
-        v2 = xyz + 4 * edgeVerts[shortNums[0]][1];
-
-        // we need to see which direction this edge
-        // is used to determine direction of projection
-		if (edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][0]
-			|| edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][1])
-		{
-			firstOnLeft = qtrue;
-		}
-		else
-		{
-			firstOnLeft = qfalse;
-        }
-
-        if (edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][0]
-            || edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][1])
-        {
-            secondOnLeft = qtrue;
-        }
-        else
-        {
-			secondOnLeft = qfalse;
-        }
-
-		if (firstOnLeft == secondOnLeft)
-        {
-            v3 = xyz + 4 * edgeVerts[shortNums[1]][0];
-            v4 = xyz + 4 * edgeVerts[shortNums[1]][1];
-		}
-		else
-        {
-            v3 = xyz + 4 * edgeVerts[shortNums[1]][1];
-            v4 = xyz + 4 * edgeVerts[shortNums[1]][0];
-		}
-
-        // re-project the points
-		edgeLength = sqrt(shortLengths[0]) * 0.5;
-        v1[0] = -edgeLength * minor[0] + mid[0][0];
-        v1[1] = -edgeLength * minor[1] + mid[0][1];
-        v1[2] = -edgeLength * minor[2] + mid[0][2];
-		v2[0] = minor[0] * edgeLength + mid[0][0];
-        v2[1] = minor[1] * edgeLength + mid[0][1];
-        v2[2] = minor[2] * edgeLength + mid[0][2];
-
-        edgeLength = sqrt(shortLengths[1]) * 0.5;
-		v3[0] = -edgeLength * minor[0] + mid[1][0];
-        v3[1] = -edgeLength * minor[1] + mid[1][1];
-        v3[2] = -edgeLength * minor[2] + mid[1][2];
-		v4[0] = minor[0] * edgeLength + mid[1][0];
-        v4[1] = minor[1] * edgeLength + mid[1][1];
-        v4[2] = minor[2] * edgeLength + mid[1][2];
-	}
-}
-
-static void LightGlowDeform() {
-	int i;
-	int oldVerts;
-	float* xyz;
-	vec3_t mid, delta;
-	float radius, dist, ofs;
-	vec3_t forward, left, up;
-	vec3_t leftDir, upDir;
-
-    if (tess.numVertexes & 3) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count", tess.shader->name);
-    }
-    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
-        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count", tess.shader->name);
-    }
-
-	oldVerts = tess.numVertexes;
-	tess.numVertexes = 0;
-	tess.numIndexes = 0;
-
-    if (backEnd.currentEntity == &tr.worldEntity)
-    {
-		VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
-		VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
-    }
-    else
-    {
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
-        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
-    }
-
-	for (i = 0; i < oldVerts; i += 4)
-	{
-		xyz = tess.xyz[i];
-
-		mid[0] = (xyz[0] + xyz[4] + xyz[8] + xyz[12]) * 0.25f;
-		mid[1] = (xyz[1] + xyz[5] + xyz[9] + xyz[13]) * 0.25f;
-		mid[2] = (xyz[2] + xyz[6] + xyz[10] + xyz[14]) * 0.25f;
-
-		VectorSubtract(xyz, mid, delta);
-
-		radius = VectorLength(delta) * 0.707f;
-		VectorAdd(mid, backEnd.ori.origin, delta);
-		VectorSubtract(backEnd.viewParms.ori.origin, delta, forward);
-
-		dist = VectorNormalize(forward) - 4.0;
-
-		VectorScale(forward, radius, forward);
-		VectorScale(leftDir, radius, left);
-		VectorScale(upDir, radius, up);
-
-		if (backEnd.viewParms.isMirror)
-		{
-			VectorSubtract(vec3_origin, forward, forward);
-			VectorSubtract(vec3_origin, left, left);
-		}
-
-		if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes)
-		{
-			float axisLength;
-
-			if (backEnd.currentStaticModel) {
-				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
-			} else {
-                axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
-			}
-
-			if (axisLength != 0.0f) {
-				VectorScale(forward, axisLength, forward);
-				VectorScale(left, axisLength, left);
-				VectorScale(up, axisLength, up);
-			} else {
-				VectorClear(forward);
-				VectorClear(left);
-				VectorClear(up);
-			}
-		}
-
-		ofs = VectorLength(forward);
-        if (ofs > dist)
-        {
-            VectorNormalizeFast(forward);
-			VectorScale(forward, dist, forward);
-        }
-
-		VectorAdd(mid, forward, mid);
-        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
-	}
-}
-
-/*
-=====================
-RB_DeformTessGeometry
-
-=====================
-*/
-void RB_DeformTessGeometry( void ) {
-	int		i;
-	deformStage_t	*ds;
-
-	for ( i = 0 ; i < tess.shader->numDeforms ; i++ ) {
-		ds = &tess.shader->deforms[ i ];
-
-		switch ( ds->deformation ) {
-        case DEFORM_NONE:
-            break;
-		case DEFORM_NORMALS:
-			RB_CalcDeformNormals( ds );
-			break;
-		case DEFORM_WAVE:
-			RB_CalcDeformVertexes( ds );
-			break;
-		case DEFORM_BULGE:
-			RB_CalcBulgeVertexes( ds );
-			break;
-		case DEFORM_MOVE:
-			RB_CalcMoveVertexes( ds );
-			break;
-		case DEFORM_AUTOSPRITE:
-			AutospriteDeform();
-			break;
-		case DEFORM_AUTOSPRITE2:
-			Autosprite2Deform();
-			break;
-		case DEFORM_LIGHTGLOW:
-			LightGlowDeform();
-			break;
-		case DEFORM_FLAP_S:
-			RB_CalcFlapVertexes(ds, USE_S_COORDS);
-			break;
-		case DEFORM_FLAP_T:
-			RB_CalcFlapVertexes(ds, USE_T_COORDS);
-			break;
-		}
-	}
-}
-
-/*
-====================================================================
-
-COLORS
-
-====================================================================
-*/
-
-
-/*
-** RB_CalcColorFromEntity
-*/
-void RB_CalcColorFromEntity( unsigned char *dstColors )
-{
-	int	i;
-	int *pColors = ( int * ) dstColors;
-	int c;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	c = * ( int * ) backEnd.currentEntity->e.shaderRGBA;
-
-	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
-	{
-		*pColors = c;
-	}
-}
-
-/*
-** RB_CalcColorFromOneMinusEntity
-*/
-void RB_CalcColorFromOneMinusEntity( unsigned char *dstColors )
-{
-	int	i;
-	int *pColors = ( int * ) dstColors;
-	unsigned char invModulate[4];
-	int c;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	invModulate[0] = 255 - backEnd.currentEntity->e.shaderRGBA[0];
-	invModulate[1] = 255 - backEnd.currentEntity->e.shaderRGBA[1];
-	invModulate[2] = 255 - backEnd.currentEntity->e.shaderRGBA[2];
-	invModulate[3] = 255 - backEnd.currentEntity->e.shaderRGBA[3];	// this trashes alpha, but the AGEN block fixes it
-
-	c = * ( int * ) invModulate;
-
-	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
-	{
-		*pColors = * ( int * ) invModulate;
-	}
-}
-
-/*
-** RB_CalcColorFromConstant
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dstColors[i * 4] = constantColor[0];
-		dstColors[i * 4 + 1] = constantColor[1];
-		dstColors[i * 4 + 2] = constantColor[2];
-		dstColors[i * 4 + 3] = constantColor[3];
-	}
-}
-
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME: unimplemented
-}
-
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
-{
-	int i;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dstColors[i * 4 + 3] = constantAlpha;
-	}
-}
-
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	int i;
-	float dist;
-	float alpha;
-
-	for (i = 0; i < tess.numVertexes; i++) {
-		dist = fabs(backEnd.ori.viewOrigin[2] - tess.xyz[i][2]);
-		dist = Q_clamp_float(dist, alphaMin, alphaMax);
-		// Calculate the alpha height
-		alpha = (dist - alphaMin) / (alphaMax - alphaMin);
-		colors[i * 4 + 3] = (unsigned char)((1.f - alpha) * 255.0);
-	}
-}
-
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-	// FIXME: unimplemented
-}
-
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-	// FIXME: unimplemented
-}
-
-/*
-** RB_CalcAlphaFromEntity
-*/
-void RB_CalcAlphaFromEntity( unsigned char *dstColors )
-{
-	int	i;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	dstColors += 3;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		*dstColors = backEnd.currentEntity->e.shaderRGBA[3];
-	}
-}
-
-/*
-** RB_CalcAlphaFromOneMinusEntity
-*/
-void RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors )
-{
-	int	i;
-
-	if ( !backEnd.currentEntity )
-		return;
-
-	dstColors += 3;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		*dstColors = 0xff - backEnd.currentEntity->e.shaderRGBA[3];
-	}
-}
-
-/*
-** RB_CalcWaveColor
-*/
-void RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor)
-{
-	int i;
-	int v;
-	float glow;
-	int *colors = ( int * ) dstColors;
-	byte	color[4];
-
-
-  if ( wf->func == GF_NOISE ) {
-		glow = wf->base + R_NoiseGet4f( 0, 0, 0, ( tess.shaderTime + wf->phase ) * wf->frequency ) * wf->amplitude;
-	} else {
-		glow = EvalWaveForm( wf ) * tr.identityLight;
-	}
-	
-	if ( glow < 0 ) {
-		glow = 0;
-	}
-	else if ( glow > 1 ) {
-		glow = 1;
-	}
-
-	if (constantColor)
-	{
-		color[0] = constantColor[0] * glow;
-		color[1] = constantColor[1] * glow;
-		color[2] = constantColor[2] * glow;
-	}
-	else
-	{
-		v = myftol(255 * glow);
-		color[0] = color[1] = color[2] = v;
-	}
-
-	color[3] = 255;
-	v = *(int*)color;
-	
-	for ( i = 0; i < tess.numVertexes; i++, colors++ ) {
-		*colors = v;
-	}
-}
-
-/*
-** RB_CalcWaveAlpha
-*/
-void RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors )
-{
-	int i;
-	int v;
-	float glow;
-
-	glow = EvalWaveFormClamped( wf );
-
-	v = 255 * glow;
-
-	for ( i = 0; i < tess.numVertexes; i++, dstColors += 4 )
-	{
-		dstColors[3] = v;
-	}
-}
-
-
-/*
-====================================================================
-
-TEX COORDS
-
-====================================================================
-*/
-
-/*
-** RB_CalcEnvironmentTexCoords
-*/
-void RB_CalcEnvironmentTexCoords( float *st ) 
-{
-	int			i;
-	float		*v, *normal;
-	vec3_t		viewer, reflected;
-	float		d;
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	for (i = 0 ; i < tess.numVertexes ; i++, v += 4, normal += 4, st += 2 ) 
-	{
-		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
-		VectorNormalizeFast (viewer);
-
-		d = DotProduct (normal, viewer);
-
-		reflected[0] = normal[0]*2*d - viewer[0];
-		reflected[1] = normal[1]*2*d - viewer[1];
-		reflected[2] = normal[2]*2*d - viewer[2];
-
-		st[0] = 0.5 + reflected[1] * 0.5;
-		st[1] = 0.5 - reflected[2] * 0.5;
-	}
-}
-
-/*
-** RB_CalcEnvironmentTexCoords
-*/
-void RB_CalcEnvironmentTexCoords2(float* st)
-{
-    int			i;
-    float* v, * normal;
-    vec3_t		viewer, reflected, worldReflected;
-    float		d;
-
-    v = tess.xyz[0];
-    normal = tess.normal[0];
-
-    for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2)
-    {
-        VectorSubtract(backEnd.ori.viewOrigin, v, viewer);
-        VectorNormalizeFast(viewer);
-
-        d = DotProduct(normal, viewer);
-		if (d > 0.0f) {
-			VectorCopy(viewer, reflected);
-		} else {
-            d *= -2;
-            reflected[0] = normal[0] * d + viewer[0];
-            reflected[1] = normal[1] * d + viewer[1];
-            reflected[2] = normal[2] * d + viewer[2];
-		}
-
-		worldReflected[0] = reflected[0] * backEnd.ori.axis[0][0];
-		worldReflected[2] = reflected[0] * backEnd.ori.axis[0][2];
-		worldReflected[0] = backEnd.ori.axis[1][0] * reflected[1] + worldReflected[0];
-		worldReflected[2] = backEnd.ori.axis[1][2] * reflected[1] + worldReflected[2];
-		worldReflected[0] = backEnd.ori.axis[2][0] * reflected[2] + worldReflected[0];
-		worldReflected[2] = backEnd.ori.axis[2][2] * reflected[2] + worldReflected[2];
-
-        st[0] = 0.5 + reflected[1] * 0.5;
-        st[1] = 0.5 - reflected[2] * 0.5;
-    }
-}
-
-/*
-** RB_CalcTurbulentTexCoords
-*/
-void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
-{
-	int i;
-	float now;
-
-	now = ( wf->phase + tess.shaderTime * wf->frequency );
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		float s = st[0];
-		float t = st[1];
-
-		st[0] = s + tr.sinTable[ ( ( int ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-		st[1] = t + tr.sinTable[ ( ( int ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-	}
-}
-
-/*
-** RB_CalcScaleTexCoords
-*/
-void RB_CalcScaleTexCoords( const float scale[2], float *st )
-{
-	int i;
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		st[0] *= scale[0];
-		st[1] *= scale[1];
-	}
-}
-
-/*
-** RB_CalcScrollTexCoords
-*/
-void RB_CalcScrollTexCoords( const float scrollSpeed[2], float *st )
-{
-	int i;
-	float timeScale = tess.shaderTime;
-	float adjustedScrollS, adjustedScrollT;
-
-	adjustedScrollS = scrollSpeed[0] * timeScale;
-	adjustedScrollT = scrollSpeed[1] * timeScale;
-
-	// clamp so coordinates don't continuously get larger, causing problems
-	// with hardware limits
-	adjustedScrollS = adjustedScrollS - floor( adjustedScrollS );
-	adjustedScrollT = adjustedScrollT - floor( adjustedScrollT );
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		st[0] += adjustedScrollS;
-		st[1] += adjustedScrollT;
-	}
-}
-
-/*
-** RB_CalcTransformTexCoords
-*/
-void RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *st  )
-{
-	int i;
-
-	for ( i = 0; i < tess.numVertexes; i++, st += 2 )
-	{
-		float s = st[0];
-		float t = st[1];
-
-		st[0] = s * tmi->matrix[0][0] + t * tmi->matrix[1][0] + tmi->translate[0];
-		st[1] = s * tmi->matrix[0][1] + t * tmi->matrix[1][1] + tmi->translate[1];
-	}
-}
-
-/*
-** RB_CalcRotateTexCoords
-*/
-void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
-{
-	float timeScale = tess.shaderTime;
-	float degs;
-	int index;
-	float sinValue, cosValue;
-	texModInfo_t tmi;
-
-	degs = -degsPerSecond * timeScale;
-	index = degs * ( FUNCTABLE_SIZE / 360.0f );
-
-	sinValue = tr.sinTable[ index & FUNCTABLE_MASK ];
-	cosValue = tr.sinTable[ ( index + FUNCTABLE_SIZE / 4 ) & FUNCTABLE_MASK ];
-
-	tmi.matrix[0][0] = cosValue;
-	tmi.matrix[1][0] = -sinValue;
-	tmi.translate[0] = 0.5 - 0.5 * cosValue + 0.5 * sinValue;
-
-	tmi.matrix[0][1] = sinValue;
-	tmi.matrix[1][1] = cosValue;
-	tmi.translate[1] = 0.5 - 0.5 * sinValue - 0.5 * cosValue;
-
-	RB_CalcTransformTexCoords( &tmi, st );
-}
-
-
-
-
-
-
-#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
-
-long myftol( float f ) {
-	static int tmp;
-	__asm fld f
-	__asm fistp tmp
-	__asm mov eax, tmp
-}
-
-#endif
-
-/*
-** RB_CalcSpecularAlpha
-**
-** Calculates specular coefficient and places it in the alpha channel
-*/
-vec3_t lightOrigin = { -960, 1980, 96 };		// FIXME: track dynamically
-
-void RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin) {
-	int			i;
-	float		*v, *normal;
-	vec3_t		viewer,  reflected;
-	float		l, d;
-	int			b;
-	vec3_t		lightDir;
-	int			numVertexes;
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	alphas += 3;
-
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4, alphas += 4) {
-		float ilength;
-
-		VectorSubtract( lightOrigin, v, lightDir );
-//		ilength = Q_rsqrt( DotProduct( lightDir, lightDir ) );
-		VectorNormalizeFast( lightDir );
-
-		// calculate the specular color
-		d = DotProduct (normal, lightDir);
-//		d *= ilength;
-
-		// we don't optimize for the d < 0 case since this tends to
-		// cause visual artifacts such as faceted "snapping"
-		reflected[0] = normal[0]*2*d - lightDir[0];
-		reflected[1] = normal[1]*2*d - lightDir[1];
-		reflected[2] = normal[2]*2*d - lightDir[2];
-
-		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
-		ilength = Q_rsqrt( DotProduct( viewer, viewer ) );
-		l = DotProduct (reflected, viewer);
-		l *= ilength;
-
-		if (l < 0) {
-			b = 0;
-		} else {
-			l = l*l;
-			l = l*l;
-			b = l * 255;
-			if (b > 255) {
-				b = 255;
-			}
-		}
-
-		*alphas = b;
-	}
-}
-
-void RB_CalcLightGridColor(unsigned char* colors)
-{
-	int i;
-
-	if (!backEnd.currentEntity) {
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 1] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 2] = backEnd.currentStaticModel->iGridLighting;
-			colors[i * 4 + 3] = backEnd.currentStaticModel->iGridLighting;
-		}
-	}
-	else if (backEnd.currentEntity != &tr.worldEntity) {
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 1] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 2] = backEnd.currentEntity->iGridLighting;
-			colors[i * 4 + 3] = backEnd.currentEntity->iGridLighting;
-		}
-	}
-	else {
-		Com_Printf(
-			"##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
-			tess.shader->name);
-
-		for (i = 0; i < tess.numVertexes; i++) {
-			colors[i * 4] = 0xFF;
-			colors[i * 4 + 1] = 0xFF;
-			colors[i * 4 + 2] = 0xFF;
-			colors[i * 4 + 3] = 0xFF;
-		}
-	}
-}
-
-void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME/ unimplemented
-}
-
-void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax)
-{
-	// FIXME/ unimplemented
-}
-
-/*
-** RB_CalcDiffuseColor
-**
-** The basic vertex lighting calc
-*/
-void RB_CalcDiffuseColor( unsigned char *colors )
-{
-	int				i, j;
-	float			*v, *normal;
-	float			incoming;
-	trRefEntity_t	*ent;
-	int				ambientLightInt;
-	vec3_t			ambientLight;
-	vec3_t			lightDir;
-	vec3_t			directedLight;
-	int				numVertexes;
-#if idppc_altivec
-	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff,
-							   0x00, 0x00, 0x00, 0xff);
-	vector float ambientLightVec;
-	vector float directedLightVec;
-	vector float lightDirVec;
-	vector float normalVec0, normalVec1;
-	vector float incomingVec0, incomingVec1, incomingVec2;
-	vector float zero, jVec;
-	vector signed int jVecInt;
-	vector signed short jVecShort;
-	vector unsigned char jVecChar, normalPerm;
-#endif
-	ent = backEnd.currentEntity;
-	ambientLightInt = ent->ambientLightInt;
-#if idppc_altivec
-	// A lot of this could be simplified if we made sure
-	// entities light info was 16-byte aligned.
-	jVecChar = vec_lvsl(0, ent->ambientLight);
-	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
-	jVec = vec_ld(11, (vector float *)ent->ambientLight);
-	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
-
-	jVecChar = vec_lvsl(0, ent->directedLight);
-	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
-	jVec = vec_ld(11,(vector float *)ent->directedLight);
-	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
-
-	jVecChar = vec_lvsl(0, ent->lightDir);
-	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
-	jVec = vec_ld(11,(vector float *)ent->lightDir);
-	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
-
-	zero = (vector float)vec_splat_s8(0);
-	VectorCopy( ent->lightDir, lightDir );
-#else
-	VectorCopy( ent->ambientLight, ambientLight );
-	VectorCopy( ent->directedLight, directedLight );
-	VectorCopy( ent->lightDir, lightDir );
-#endif
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-#if idppc_altivec
-	normalPerm = vec_lvsl(0,normal);
-#endif
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
-#if idppc_altivec
-		normalVec0 = vec_ld(0,(vector float *)normal);
-		normalVec1 = vec_ld(11,(vector float *)normal);
-		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
-		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
-		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
-		incomingVec2 = vec_add(incomingVec0,incomingVec1);
-		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
-		incomingVec2 = vec_add(incomingVec2,incomingVec1);
-		incomingVec0 = vec_splat(incomingVec2,0);
-		incomingVec0 = vec_max(incomingVec0,zero);
-		normalPerm = vec_lvsl(12,normal);
-		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
-		jVecInt = vec_cts(jVec,0);	// RGBx
-		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
-		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
-		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
-#else
-		incoming = DotProduct (normal, lightDir);
-		if ( incoming <= 0 ) {
-			*(int *)&colors[i*4] = ambientLightInt;
-			continue;
-		} 
-		j = myftol( ambientLight[0] + incoming * directedLight[0] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+0] = j;
-
-		j = myftol( ambientLight[1] + incoming * directedLight[1] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+1] = j;
-
-		j = myftol( ambientLight[2] + incoming * directedLight[2] );
-		if ( j > 255 ) {
-			j = 255;
-		}
-		colors[i*4+2] = j;
-
-		colors[i*4+3] = 255;
-#endif
-	}
-}
-
diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c
deleted file mode 100644
index bf7af99e..00000000
--- a/code/renderer/tr_shader.c
+++ /dev/null
@@ -1,3436 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-// tr_shader.c -- this file deals with the parsing and definition of shaders
-
-
-typedef struct shadertext_s {
-    char name[64];
-    char* text;
-    shader_t* shader;
-    struct shadertext_s* next;
-} shadertext_t;
-
-static char *s_shaderText;
-
-// the shader is parsed into these global variables, then copied into
-// dynamically allocated memory if it is valid.
-static	shaderStage_t	unfoggedStages[MAX_SHADER_STAGES];		
-static	shader_t		shader;
-static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
-
-#define FILE_HASH_SIZE		8192
-
-static qboolean shader_noPicMip;
-static qboolean shader_noMipMaps;
-static qboolean shader_force32bit;
-static shadertext_t* currentShader = NULL;
-static shadertext_t* hashTable[FILE_HASH_SIZE];
-
-#define GL_CLAMP_TO_EDGE 0x812F
-
-/*
-================
-return a hash value for the filename
-================
-*/
-static long generateHashValue( const char *fname ) {
-	int		i;
-	long	hash;
-	char	letter;
-
-	hash = 0;
-	i = 0;
-	while (fname[i] != '\0') {
-		letter = tolower(fname[i]);
-		if (letter =='.') break;				// don't include extension
-		if (letter =='\\') letter = '/';		// damn path names
-		if (letter == PATH_SEP) letter = '/';		// damn path names
-		hash+=(long)(letter)*(i+119);
-		i++;
-	}
-	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
-	hash &= (FILE_HASH_SIZE-1);
-	return hash;
-}
-
-static shadertext_t* AddShaderTextToHash(const char* name, int hash)
-{
-	shadertext_t* shader;
-
-    shader = (shadertext_t*)ri.Malloc(sizeof(shadertext_t));
-
-    Com_Memset(shader, 0, sizeof(shadertext_t));
-    strncpy(shader->name, name, sizeof(shader->name));
-    shader->next = hashTable[hash];
-
-    hashTable[hash] = shader;
-    return shader;
-}
-
-static shadertext_t* AllocShaderText(const char* name)
-{
-    int hash;
-
-    hash = generateHashValue(name);
-    return AddShaderTextToHash(name, hash);
-}
-
-/*
-====================
-FindShaderText
-
-Scans the combined text description of all the shader files for
-the given shader name.
-
-return NULL if not found
-
-If found, it will return a valid shader
-=====================
-*/
-static shadertext_t* FindShaderText(const char* name)
-{
-    shadertext_t* shader;
-    int hash;
-
-    hash = generateHashValue(name);
-    shader = hashTable[hash];
-    if (!shader) {
-        return AddShaderTextToHash(name, hash);
-    }
-
-    while (Q_stricmp(shader->name, name))
-    {
-        shader = shader->next;
-        if (!shader) {
-            return AddShaderTextToHash(name, hash);
-        }
-    }
-
-    return shader;
-}
-
-/*
-===============
-ParseVector
-===============
-*/
-static qboolean ParseVector( char **text, int count, float *v ) {
-	char	*token;
-	int		i;
-
-	for ( i = 0 ; i < count ; i++ ) {
-		token = COM_ParseExt( text, qfalse );
-		if ( !token[0] ) {
-			ri.Printf( PRINT_WARNING, "WARNING: missing vector element in shader '%s'\n", shader.name );
-			return qfalse;
-		}
-		v[i] = atof( token );
-	}
-
-	return qtrue;
-}
-
-void InitStaticShaders()
-{
-	char* text;
-	const char* token;
-	char* buf;
-	char shadername[64];
-
-    if (ri.FS_ReadFile("scripts/static_shaders.txt", (void**)&buf) == -1)
-    {
-        ri.Printf(3, "Couldn't find static shaders file: scripts/staticshaders.txt\n");
-		return;
-    }
-
-    text = buf;
-    while (1)
-    {
-        token = COM_ParseExt(&text, 1);
-		if (!*token) {
-			break;
-		}
-
-        strncpy(shadername, token, 0x40u);
-		if (!R_FindShader(shadername, -1, 1, 1, 1, 1)) {
-			ri.Printf(3, "InitStaticShaders: Couldn't find shader: %s\n", shadername);
-		}
-    }
-
-    ri.FS_FreeFile(buf);
-}
-
-/*
-===============
-NameToAFunc
-===============
-*/
-static unsigned NameToAFunc( const char *funcname )
-{	
-	if ( !Q_stricmp( funcname, "GT0" ) )
-	{
-		return GLS_ATEST_GT_0;
-	}
-	else if ( !Q_stricmp( funcname, "LT128" ) )
-	{
-		return GLS_ATEST_LT_80;
-	}
-	else if ( !Q_stricmp( funcname, "GE128" ) )
-	{
-		return GLS_ATEST_GE_80;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
-	return 0;
-}
-
-
-/*
-===============
-NameToSrcBlendMode
-===============
-*/
-static int NameToSrcBlendMode( const char *name )
-{
-	if ( !Q_stricmp( name, "GL_ONE" ) )
-	{
-		return GLS_SRCBLEND_ONE;
-	}
-	else if ( !Q_stricmp( name, "GL_ZERO" ) )
-	{
-		return GLS_SRCBLEND_ZERO;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_COLOR" ) )
-	{
-		return GLS_SRCBLEND_DST_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_COLOR" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_DST_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_ALPHA" ) )
-	{
-		return GLS_SRCBLEND_ONE_MINUS_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA_SATURATE" ) )
-	{
-		return GLS_SRCBLEND_ALPHA_SATURATE;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
-	return GLS_SRCBLEND_ONE;
-}
-
-/*
-===============
-NameToDstBlendMode
-===============
-*/
-static int NameToDstBlendMode( const char *name )
-{
-	if ( !Q_stricmp( name, "GL_ONE" ) )
-	{
-		return GLS_DSTBLEND_ONE;
-	}
-	else if ( !Q_stricmp( name, "GL_ZERO" ) )
-	{
-		return GLS_DSTBLEND_ZERO;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_DST_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_DST_ALPHA" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_DST_ALPHA;
-	}
-	else if ( !Q_stricmp( name, "GL_SRC_COLOR" ) )
-	{
-		return GLS_DSTBLEND_SRC_COLOR;
-	}
-	else if ( !Q_stricmp( name, "GL_ONE_MINUS_SRC_COLOR" ) )
-	{
-		return GLS_DSTBLEND_ONE_MINUS_SRC_COLOR;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown blend mode '%s' in shader '%s', substituting GL_ONE\n", name, shader.name );
-	return GLS_DSTBLEND_ONE;
-}
-
-/*
-===============
-NameToGenFunc
-===============
-*/
-static genFunc_t NameToGenFunc( const char *funcname )
-{
-	if ( !Q_stricmp( funcname, "sin" ) )
-	{
-		return GF_SIN;
-	}
-	else if ( !Q_stricmp( funcname, "square" ) )
-	{
-		return GF_SQUARE;
-	}
-	else if ( !Q_stricmp( funcname, "triangle" ) )
-	{
-		return GF_TRIANGLE;
-	}
-	else if ( !Q_stricmp( funcname, "sawtooth" ) )
-	{
-		return GF_SAWTOOTH;
-	}
-	else if ( !Q_stricmp( funcname, "inversesawtooth" ) )
-	{
-		return GF_INVERSE_SAWTOOTH;
-	}
-	else if ( !Q_stricmp( funcname, "noise" ) )
-	{
-		return GF_NOISE;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: invalid genfunc name '%s' in shader '%s'\n", funcname, shader.name );
-	return GF_SIN;
-}
-
-
-/*
-===================
-ParseWaveForm
-===================
-*/
-static void ParseWaveForm( char **text, waveForm_t *wave )
-{
-	char *token;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->func = NameToGenFunc( token );
-
-	// BASE, AMP, PHASE, FREQ
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->base = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->amplitude = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->phase = atof( token );
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing waveform parm in shader '%s'\n", shader.name );
-		return;
-	}
-	wave->frequency = atof( token );
-}
-
-
-/*
-===================
-ParseTexMod
-===================
-*/
-static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
-{
-	const char *token;
-	char **text = &_text;
-	texModInfo_t *tmi;
-
-	if ( stage->bundle[cntBundle].numTexMods == TR_MAX_TEXMODS ) {
-		ri.Error( ERR_DROP, "ERROR: too many tcMod unfoggedStages in shader '%s'\n", shader.name );
-		return;
-	}
-
-	tmi = &stage->bundle[cntBundle].texMods[stage->bundle[cntBundle].numTexMods];
-	stage->bundle[cntBundle].numTexMods++;
-
-	token = COM_ParseExt( text, qfalse );
-
-	//
-	// turb
-	//
-	if ( !Q_stricmp( token, "turb" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod turb in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-
-		tmi->type = TMOD_TURBULENT;
-	}
-	//
-	// scale
-	//
-	else if ( !Q_stricmp( token, "scale" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scale[0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scale[1] = atof( token );
-		tmi->type = TMOD_SCALE;
-	}
-	//
-	// scroll
-	//
-	else if ( !Q_stricmp( token, "scroll" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scroll[0] = atof( token );
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->scroll[1] = atof( token );
-		tmi->type = TMOD_SCROLL;
-	}
-	//
-	// stretch
-	//
-	else if ( !Q_stricmp( token, "stretch" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.func = NameToGenFunc( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-		
-		tmi->type = TMOD_STRETCH;
-	}
-	//
-	// transform
-	//
-	else if ( !Q_stricmp( token, "transform" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[0][0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[0][1] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[1][0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->matrix[1][1] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->translate[0] = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing transform parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->translate[1] = atof( token );
-
-		tmi->type = TMOD_TRANSFORM;
-	}
-	//
-	// rotate
-	//
-	else if ( !Q_stricmp( token, "rotate" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->rotateSpeed = atof( token );
-		tmi->type = TMOD_ROTATE;
-	}
-	//
-	// entityTranslate
-	//
-	else if ( !Q_stricmp( token, "entityTranslate" ) )
-	{
-		tmi->type = TMOD_ENTITY_TRANSLATE;
-	}
-	else
-	{
-		ri.Printf(PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name);
-	}
-}
-
-
-/*
-===================
-ParseStage
-===================
-*/
-static qboolean ParseStage(shaderStage_t* stage, char** text)
-{
-	char* token;
-	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, colorBits = 0;
-	qboolean depthMaskExplicit = qfalse;
-	int cntBundle = 0;
-	int depthTestBits = 0;
-	int fogBits = 0;
-
-	stage->active = qtrue;
-	stage->noMipMaps = shader_noMipMaps;
-	stage->noPicMip = shader_noPicMip;
-	stage->force32bit = shader_force32bit;
-
-	while (1)
-	{
-		token = COM_ParseExt(text, qtrue);
-		if (!token[0])
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: no matching '}' found\n");
-			return qfalse;
-		}
-
-		if (token[0] == '}')
-		{
-			break;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nomipmaps"))
-		{
-			stage->noMipMaps = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nopicmip"))
-		{
-			stage->noPicMip = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "nofog"))
-		{
-			fogBits = GLS_FOG;
-			continue;
-		}
-		//
-		// map <name>
-		//
-		else if (!Q_stricmp(token, "map"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-
-			if (!Q_stricmp(token, "$whiteimage"))
-			{
-				stage->bundle[cntBundle].image[0] = tr.whiteImage;
-				continue;
-			}
-			else if (!Q_stricmp(token, "$lightmap"))
-			{
-				stage->bundle[cntBundle].isLightmap = qtrue;
-				if (shader.lightmapIndex < 0) {
-					stage->bundle[cntBundle].image[0] = tr.whiteImage;
-				}
-				else {
-					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
-				}
-				continue;
-			}
-			else
-			{
-				stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, GL_REPEAT, GL_REPEAT);
-				if (!stage->bundle[cntBundle].image[0])
-				{
-					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
-					return qfalse;
-				}
-			}
-		}
-		//
-		// clampmap <name>
-		//
-		else if (!Q_stricmpn(token, "clampmap", 8))
-		{
-			int clampx, clampy;
-
-			if (!token[8]) {
-				if (!r_forceClampToEdge->value) {
-					clampx = GL_CLAMP;
-					clampy = GL_CLAMP;
-				}
-				else {
-					clampx = GL_CLAMP_TO_EDGE;
-					clampy = GL_CLAMP_TO_EDGE;
-				}
-			}
-			else {
-				if (token[8] == 'x')
-				{
-					if (!r_forceClampToEdge->value) {
-						clampx = GL_CLAMP;
-					}
-					else {
-						clampx = GL_CLAMP_TO_EDGE;
-					}
-					clampy = GL_CLAMP;
-				}
-				else if (token[8] == 'y')
-				{
-					clampx = GL_CLAMP;
-					if (!r_forceClampToEdge->value) {
-						clampy = GL_CLAMP;
-					}
-					else {
-						clampy = GL_CLAMP_TO_EDGE;
-					}
-				}
-				else {
-					ri.Printf(PRINT_WARNING, "WARNING: Converting unknown clampmap type to clampmap\n");
-					continue;
-				}
-			}
-
-			token = COM_ParseExt(text, qfalse);
-			if (!token[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-
-			stage->bundle[cntBundle].image[0] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, clampx, clampy);
-			if (!stage->bundle[cntBundle].image[0])
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
-				return qfalse;
-			}
-		}
-		//
-		// animMap <frequency> <image1> .... <imageN>
-		//
-		else if ( !Q_stricmp( token, "animMap" ) || !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
-		{
-			qboolean phased;
-
-			if (!Q_stricmp(token, "animMapOnce")) {
-				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
-			}
-
-			phased = !Q_stricmp(token, "animMapPhase");
-
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
-
-			if (phased)
-            {
-                token = COM_ParseExt(text, qfalse);
-                if (!token[0])
-                {
-                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
-                    return qfalse;
-                }
-
-				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
-			}
-			// parse up to MAX_IMAGE_ANIMATIONS animations
-			while ( 1 ) {
-				int		num;
-
-				token = COM_ParseExt( text, qfalse );
-				if ( !token[0] ) {
-					break;
-				}
-				num = stage->bundle[cntBundle].numImageAnimations;
-				if ( num < MAX_IMAGE_ANIMATIONS ) {
-                    stage->bundle[cntBundle].image[num] = R_FindImageFile(token, !stage->noMipMaps, !stage->noPicMip, qfalse, GL_REPEAT, GL_REPEAT );
-					if ( !stage->bundle[cntBundle].image[num] )
-					{
-						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
-						return qfalse;
-					}
-					stage->bundle[cntBundle].numImageAnimations++;
-				}
-			}
-		}
-		//
-		// alphafunc <func>
-		//
-		else if ( !Q_stricmp( token, "alphaFunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'alphaFunc' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-
-			atestBits = NameToAFunc( token );
-		}
-		//
-		// depthFunc <func>
-		//
-		else if ( !Q_stricmp( token, "depthfunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'depthfunc' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-
-			if ( !Q_stricmp( token, "lequal" ) )
-			{
-				depthTestBits = 0;
-			}
-			else if ( !Q_stricmp( token, "equal" ) )
-			{
-				depthTestBits = GLS_DEPTHFUNC_EQUAL;
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown depthfunc '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// blendfunc <srcFactor> <dstFactor>
-		// or blendfunc <add|filter|blend>
-		//
-		else if ( !Q_stricmp( token, "blendfunc" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
-				continue;
-			}
-			// check for "simple" blends first
-			if ( !Q_stricmp( token, "add" ) ) {
-				blendSrcBits = GLS_SRCBLEND_ONE;
-				blendDstBits = GLS_DSTBLEND_ONE;
-			} else if ( !Q_stricmp( token, "filter" ) ) {
-				blendSrcBits = GLS_SRCBLEND_DST_COLOR;
-				blendDstBits = GLS_DSTBLEND_ZERO;
-			} else if ( !Q_stricmp( token, "blend" ) ) {
-				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
-				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
-				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
-				blendDstBits = GLS_DSTBLEND_ONE;
-			} else {
-				// complex double blends
-				blendSrcBits = NameToSrcBlendMode( token );
-
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-				{
-					ri.Printf( PRINT_WARNING, "WARNING: missing parm for blendFunc in shader '%s'\n", shader.name );
-					continue;
-				}
-				blendDstBits = NameToDstBlendMode( token );
-			}
-
-			// clear depth mask for blended surfaces
-			if ( !depthMaskExplicit )
-			{
-				depthMaskBits = 0;
-			}
-		}
-		//
-		// rgbGen
-		//
-		else if ( !Q_stricmp( token, "rgbGen" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameters for rgbGen in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "wave" ) )
-			{
-				ParseWaveForm( text, &stage->rgbWave );
-				stage->rgbGen = CGEN_WAVEFORM;
-			}
-			else if (!Q_stricmp(token, "colorwave"))
-			{
-				vec3_t v;
-
-				ParseVector(text, 3, v);
-				stage->colorConst[0] = v[0] * 255.0;
-				stage->colorConst[1] = v[1] * 255.0;
-				stage->colorConst[2] = v[2] * 255.0;
-				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
-				shader.flags |= 2;
-			}
-			else if (!Q_stricmp(token, "identity"))
-			{
-				stage->rgbGen = CGEN_IDENTITY;
-			}
-			else if (!Q_stricmp(token, "identityLighting"))
-			{
-				stage->rgbGen = CGEN_IDENTITY_LIGHTING;
-			}
-			else if (!Q_stricmp(token, "global"))
-			{
-				stage->rgbGen = CGEN_GLOBAL_COLOR;
-			}
-			else if (!Q_stricmp(token, "entity") || !Q_stricmp(token, "fromentity"))
-			{
-				stage->rgbGen = CGEN_ENTITY;
-			}
-			else if (!Q_stricmp(token, "oneMinusEntity"))
-			{
-				stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
-			}
-			else if (!Q_stricmp(token, "vertex") || !Q_stricmp(token, "fromclient"))
-			{
-				stage->rgbGen = CGEN_VERTEX;
-				if (stage->alphaGen == 0) {
-					stage->alphaGen = AGEN_VERTEX;
-				}
-			}
-			else if (!Q_stricmp(token, "exactVertex"))
-			{
-				stage->rgbGen = CGEN_EXACT_VERTEX;
-			}
-			else if (!Q_stricmp(token, "lightingGrid"))
-			{
-				stage->rgbGen = CGEN_LIGHTING_GRID;
-			}
-			else if (!Q_stricmp(token, "lightingSpherical"))
-			{
-				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
-			}
-			else if (!Q_stricmp(token, "oneMinusVertex"))
-			{
-				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
-			}
-			else if ( !Q_stricmp( token, "const" ) || !Q_stricmp(token, "constant"))
-			{
-				vec3_t	color;
-
-				ParseVector( text, 3, color );
-				stage->colorConst[0] = 255 * color[0];
-				stage->colorConst[1] = 255 * color[1];
-				stage->colorConst[2] = 255 * color[2];
-
-				stage->rgbGen = CGEN_CONSTANT;
-			}
-			else if (!Q_stricmp(token, "static"))
-			{
-				stage->rgbGen = CGEN_STATIC;
-				if (stage->alphaGen == AGEN_IDENTITY) {
-					stage->alphaGen = AGEN_VERTEX;
-				}
-			}
-			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
-			{
-				if (!Q_stricmp(token, "sCoord")) {
-					stage->rgbGen = CGEN_SCOORD;
-				}
-				else {
-					stage->rgbGen = CGEN_TCOORD;
-				}
-
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaConstMin = 0;
-				stage->alphaConst = -1;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaMax = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-
-				stage->alphaConstMin = atof(token) * 255.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
-					continue;
-				}
-
-				stage->alphaConst = atof(token) * 255.0;
-			}
-			else if (!Q_stricmp(token, "dot"))
-			{
-				stage->rgbGen = CGEN_DOT;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-				}
-			else if (!Q_stricmp(token, "oneminusdot"))
-			{
-				stage->rgbGen = CGEN_ONE_MINUS_DOT;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// alphaGen 
-		//
-		else if ( !Q_stricmp( token, "alphaGen" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameters for alphaGen in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "wave" ) )
-			{
-				ParseWaveForm( text, &stage->alphaWave );
-				stage->alphaGen = AGEN_WAVEFORM;
-			}
-			else if (!Q_stricmp(token, "global"))
-			{
-				stage->alphaGen = AGEN_GLOBAL_ALPHA;
-			}
-			else if ( !Q_stricmp( token, "entity" ) || !Q_stricmp(token, "fromentity"))
-			{
-				stage->alphaGen = AGEN_ENTITY;
-			}
-			else if ( !Q_stricmp( token, "oneMinusEntity" ) )
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_ENTITY;
-			}
-			else if ( !Q_stricmp( token, "vertex" ) || !Q_stricmp(token, "fromclient"))
-			{
-				stage->alphaGen = AGEN_VERTEX;
-			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) || !Q_stricmp(token, "oneMinusFromClient"))
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
-			}
-			else if (!Q_stricmp(token, "lightingSpecular"))
-			{
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
-			}
-			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
-				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
-			{
-				if (!Q_stricmp(token, "distFade")) {
-					stage->alphaGen = AGEN_DIST_FADE;
-				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
-					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
-				} else if (!Q_stricmp(token, "tikiDistFade")) {
-                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
-                } else {
-                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
-                }
-
-				shader.fDistNear = 256.0;
-				shader.fDistRange = 256.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				shader.fDistNear = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				shader.fDistRange = atof(token);
-			}
-			else if (!Q_stricmp(token, "dot"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_DOT;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "heightFade"))
-            {
-                shader.needsNormal = qtrue;
-                stage->alphaMin = 256.0f;
-                stage->alphaMax = 512.0f;
-                stage->alphaGen = AGEN_HEIGHT_FADE;
-
-                token = COM_ParseExt(text, qfalse);
-                if (token[0] == 0) {
-                    continue;
-                }
-                stage->alphaMin = atof(token);
-
-                token = COM_ParseExt(text, qfalse);
-                if (token[0] == 0) {
-                    continue;
-                }
-                stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "oneMinusDot"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_ONE_MINUS_DOT;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "dotView"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_DOT_VIEW;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "oneMinusDotView"))
-			{
-				shader.needsNormal = qtrue;
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-			}
-			else if (!Q_stricmp(token, "const") || !Q_stricmp(token, "constant"))
-			{
-				token = COM_ParseExt(text, qfalse);
-				stage->colorConst[3] = 255 * atof(token);
-				stage->alphaGen = AGEN_CONSTANT;
-			}
-			else if (!Q_stricmp(token, "skyAlpha"))
-			{
-				stage->alphaGen = AGEN_SKYALPHA;
-			}
-			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
-			{
-				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
-			}
-			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
-			{
-				if (!Q_stricmp(token, "sCoord")) {
-					stage->alphaGen = AGEN_SCOORD;
-				} else {
-					stage->alphaGen = AGEN_TCOORD;
-				}
-
-				stage->alphaMin = 0.0;
-				stage->alphaMax = 1.0;
-				stage->alphaConstMin = 0;
-				stage->alphaConst = -1;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMin = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaMax = atof(token);
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					continue;
-				}
-				stage->alphaConstMin = atof(token) * 255.0;
-
-				token = COM_ParseExt(text, qfalse);
-				if (token[0] == 0) {
-					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
-					continue;
-				}
-				stage->alphaConst = atof(token) * 255.0;
-			}
-			else if ( !Q_stricmp( token, "portal" ) )
-			{
-				stage->alphaGen = AGEN_PORTAL;
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-				{
-					shader.portalRange = 256;
-					ri.Printf( PRINT_WARNING, "WARNING: missing range parameter for alphaGen portal in shader '%s', defaulting to 256\n", shader.name );
-				}
-				else
-				{
-					shader.portalRange = atof( token );
-				}
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
-				continue;
-			}
-		}
-		//
-		// tcGen <function>
-		//
-		else if ( !Q_stricmp(token, "texgen") || !Q_stricmp( token, "tcGen" ) ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing texgen parm in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "environment" ) )
-			{
-				shader.needsNormal = qtrue;
-				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
-            }
-            else if (!Q_stricmp(token, "environmentmodel"))
-            {
-                shader.needsNormal = qtrue;
-                stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED2;
-            }
-            else if (!Q_stricmp(token, "sunreflection"))
-            {
-                shader.needsNormal = qtrue;
-                stage->bundle[cntBundle].tcGen = TCGEN_SUN_REFLECTION;
-            }
-			else if ( !Q_stricmp( token, "lightmap" ) )
-			{
-				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
-			}
-			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
-			{
-				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
-			}
-			else if ( !Q_stricmp( token, "vector" ) )
-			{
-				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
-
-				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
-			}
-			else 
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: unknown texgen parm in shader '%s'\n", shader.name );
-			}
-		}
-		//
-		// tcMod <type> <...>
-		//
-		else if ( !Q_stricmp( token, "tcMod" ) )
-		{
-			char buffer[1024] = "";
-
-			while ( 1 )
-			{
-				token = COM_ParseExt( text, qfalse );
-				if ( token[0] == 0 )
-					break;
-				strcat( buffer, token );
-				strcat( buffer, " " );
-			}
-
-			ParseTexMod( buffer, stage, cntBundle );
-
-			continue;
-		}
-		//
-		// depthmask
-		//
-		else if ( !Q_stricmp( token, "depthwrite" ) || !Q_stricmp(token, "depthmask"))
-		{
-			depthMaskBits = GLS_DEPTHMASK_TRUE;
-			depthMaskExplicit = qtrue;
-
-			continue;
-        }
-        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
-        {
-            depthMaskBits = 0;
-            depthMaskExplicit = qtrue;
-
-            continue;
-        }
-        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
-        {
-            colorBits = GLS_COLOR_NOMASK;
-
-            continue;
-        }
-		else if (!Q_stricmp(token, "noDepthTest"))
-		{
-			depthFuncBits = GLS_DEPTHTEST_DISABLE;
-			continue;
-        }
-        else if (!Q_stricmp(token, "nextBundle"))
-        {
-			if (!qglActiveTextureARB) {
-				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
-				return qfalse;
-			}
-
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] && !Q_stricmp(token, "add")) {
-				stage->multitextureEnv = GL_ADD;
-			} else {
-				stage->multitextureEnv = GL_MODULATE;
-			}
-
-			cntBundle++;
-			if (cntBundle > NUM_TEXTURE_BUNDLES) {
-				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
-				return qfalse;
-			}
-            continue;
-        }
-		else
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
-			return qfalse;
-		}
-	}
-
-	//
-	// if cgen isn't explicitly specified, use either identity or identitylighting
-	//
-	if ( stage->rgbGen == CGEN_BAD ) {
-		if ( (!cntBundle && !stage->bundle[0].isLightmap) ||
-			blendSrcBits == 0 ||
-			blendSrcBits == GLS_SRCBLEND_ONE || 
-			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) {
-			stage->rgbGen = CGEN_IDENTITY_LIGHTING;
-		} else {
-			stage->rgbGen = CGEN_IDENTITY;
-		}
-	}
-
-	//
-	// implicitly assume that a GL_ONE GL_ZERO blend mask disables blending
-	//
-	if ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && 
-		 ( blendDstBits == GLS_DSTBLEND_ZERO ) )
-	{
-		blendDstBits = blendSrcBits = 0;
-		depthMaskBits = GLS_DEPTHMASK_TRUE;
-	}
-
-	if (depthFuncBits == GLS_DEPTHTEST_DISABLE) {
-		depthMaskBits = 0;
-	}
-
-	// decide which agens we can skip
-	if ( stage->alphaGen == CGEN_IDENTITY ) {
-		if ( stage->rgbGen == CGEN_IDENTITY
-			|| stage->rgbGen == CGEN_LIGHTING_GRID
-			|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {
-			stage->alphaGen = AGEN_SKIP;
-		}
-	}
-
-	//
-	// compute state bits
-	//
-	stage->stateBits = depthMaskBits | 
-		               blendSrcBits | blendDstBits | 
-					   atestBits | 
-					   depthFuncBits |
-					   depthTestBits |
-					   colorBits |
-					   fogBits;
-
-	return qtrue;
-}
-
-/*
-===============
-ParseDeform
-
-deformVertexes wave <spread> <waveform> <base> <amplitude> <phase> <frequency>
-deformVertexes normal <frequency> <amplitude>
-deformVertexes move <vector> <waveform> <base> <amplitude> <phase> <frequency>
-deformVertexes bulge <bulgeWidth> <bulgeHeight> <bulgeSpeed>
-deformVertexes projectionShadow
-deformVertexes autoSprite
-deformVertexes autoSprite2
-deformVertexes text[0-7]
-===============
-*/
-static void ParseDeform( char **text ) {
-	char	*token;
-	deformStage_t	*ds;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: missing deform parm in shader '%s'\n", shader.name );
-		return;
-	}
-
-	if ( shader.numDeforms == MAX_SHADER_DEFORMS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_SHADER_DEFORMS in '%s'\n", shader.name );
-		return;
-	}
-
-	ds = &shader.deforms[ shader.numDeforms ];
-	shader.numDeforms++;
-
-	if ( !Q_stricmp( token, "autosprite" ) ) {
-		ds->deformation = DEFORM_AUTOSPRITE;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "autosprite2" ) ) {
-		ds->deformation = DEFORM_AUTOSPRITE2;
-		return;
-	}
-
-	if (!Q_stricmp(token, "lightglow")) {
-		ds->deformation = DEFORM_LIGHTGLOW;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "bulge" ) )	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeWidth = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeHeight = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes bulge parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->bulgeSpeed = atof( token );
-
-		ds->deformation = DEFORM_BULGE;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "wave" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-
-		if ( atof( token ) != 0 )
-		{
-			ds->deformationSpread = 1.0f / atof( token );
-		}
-		else
-		{
-			ds->deformationSpread = 100.0f;
-			ri.Printf( PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name );
-		}
-
-		ParseWaveForm( text, &ds->deformationWave );
-		ds->deformation = DEFORM_WAVE;
-		return;
-	}
-
-	if (!Q_stricmp(token, "flap")) {
-		texDirection_t coordDirection;
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 's') {
-			coordDirection = USE_S_COORDS;
-		}
-		else if (token[0] == 't') {
-			coordDirection = USE_T_COORDS;
-		}
-		else {
-			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
-			return;
-		}
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0) {
-			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
-			return;
-		}
-
-		if (!atof(token)) {
-			ds->deformationSpread = 100.0;
-			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
-		}
-		else {
-			ds->deformationSpread = 1.0 / atof(token);
-		}
-
-		ParseWaveForm(text, &ds->deformationWave);
-
-		if (coordDirection == USE_T_COORDS) {
-			ds->deformation = DEFORM_FLAP_T;
-		}
-		else {
-			ds->deformation = DEFORM_FLAP_S;
-		}
-
-		shader.needsNormal = qtrue;
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0)
-		{
-			ds->bulgeWidth = 0.0;
-			ds->bulgeHeight = 1.0;
-			return;
-		}
-		ds->bulgeWidth = atof(token);
-
-		token = COM_ParseExt(text, qfalse);
-		if (token[0] == 0)
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
-			return;
-		}
-		ds->bulgeHeight = atof(token);
-		return;
-	}
-
-	if ( !Q_stricmp( token, "normal" ) )
-	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->deformationWave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-			return;
-		}
-		ds->deformationWave.frequency = atof( token );
-
-		ds->deformation = DEFORM_NORMALS;
-		return;
-	}
-
-	if ( !Q_stricmp( token, "move" ) ) {
-		int		i;
-
-		for ( i = 0 ; i < 3 ; i++ ) {
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 ) {
-				ri.Printf( PRINT_WARNING, "WARNING: missing deformVertexes parm in shader '%s'\n", shader.name );
-				return;
-			}
-			ds->moveVector[i] = atof( token );
-		}
-
-		ParseWaveForm( text, &ds->deformationWave );
-		ds->deformation = DEFORM_MOVE;
-		return;
-	}
-
-	ri.Printf( PRINT_WARNING, "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
-}
-
-
-/*
-===============
-ParseSkyParms
-
-skyParms <outerbox> <cloudheight> <innerbox>
-===============
-*/
-static void ParseSkyParms( char **text ) {
-	char		*token;
-	static char	*suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
-	char		pathname[MAX_QPATH];
-	int			i;
-
-	// outerbox
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	if ( strcmp( token, "-" ) ) {
-		for (i=0 ; i<6 ; i++) {
-			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
-				, token, suf[i] );
-			if (!r_forceClampToEdge->integer) {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
-			}
-			else {
-				shader.sky.outerbox[i] = R_FindImageFile((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
-			}
-			if ( !shader.sky.outerbox[i] ) {
-				shader.sky.outerbox[i] = tr.defaultImage;
-			}
-		}
-	}
-
-	// cloudheight
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	shader.sky.cloudHeight = atof( token );
-	if ( !shader.sky.cloudHeight ) {
-		shader.sky.cloudHeight = 512;
-	}
-	R_InitSkyTexCoords( shader.sky.cloudHeight );
-
-
-	// innerbox
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: 'skyParms' missing parameter in shader '%s'\n", shader.name );
-		return;
-	}
-	if ( strcmp( token, "-" ) ) {
-		for (i=0 ; i<6 ; i++) {
-			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
-				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, shader_force32bit, GL_REPEAT, GL_REPEAT );
-			if ( !shader.sky.innerbox[i] ) {
-				shader.sky.innerbox[i] = tr.defaultImage;
-			}
-		}
-	}
-
-	shader.isSky = qtrue;
-}
-
-
-/*
-=================
-ParseSort
-=================
-*/
-void ParseSort( char **text ) {
-	char	*token;
-
-	token = COM_ParseExt( text, qfalse );
-	if ( token[0] == 0 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing sort parameter in shader '%s'\n", shader.name );
-		return;
-	}
-
-	if ( !Q_stricmp( token, "portal" ) ) {
-		shader.sort = SS_PORTAL;
-	} else if ( !Q_stricmp( token, "sky" ) ) {
-		shader.sort = SS_ENVIRONMENT;
-	} else if ( !Q_stricmp( token, "opaque" ) ) {
-		shader.sort = SS_OPAQUE;
-	}else if ( !Q_stricmp( token, "decal" ) ) {
-		shader.sort = SS_DECAL;
-	} else if ( !Q_stricmp( token, "seeThrough" ) ) {
-		shader.sort = SS_SEE_THROUGH;
-	} else if ( !Q_stricmp( token, "banner" ) ) {
-		shader.sort = SS_BANNER;
-	} else if ( !Q_stricmp( token, "additive" ) ) {
-		shader.sort = SS_BLEND1;
-	} else if ( !Q_stricmp( token, "nearest" ) ) {
-		shader.sort = SS_NEAREST;
-	} else if ( !Q_stricmp( token, "underwater" ) ) {
-		shader.sort = SS_UNDERWATER;
-	} else {
-		shader.sort = atof( token );
-	}
-}
-
-
-
-// this table is also present in q3map
-
-typedef struct {
-	char	*name;
-	int		clearSolid, surfaceFlags, contents;
-} infoParm_t;
-
-infoParm_t	infoParms[] = {
-	// server relevant contents
-	{"water",		1,	0,	CONTENTS_WATER },
-	{"slime",		1,	0,	CONTENTS_SLIME },		// mildly damaging
-	{"lava",		1,	0,	CONTENTS_LAVA },		// very damaging
-	{"playerclip",	1,	0,	CONTENTS_PLAYERCLIP },
-	{"monsterclip",	1,	0,	CONTENTS_MONSTERCLIP },
-	{"fence",		1,	0,	CONTENTS_FENCE },
-	{"weaponclip",	1,	0,	CONTENTS_WEAPONCLIP },
-	{"vehicleclip",	1,	0,	CONTENTS_VEHICLECLIP },
-	{"nodrop",		1,	0,	CONTENTS_NODROP },		// don't drop items or leave bodies (death fog, lava, etc)
-	{"nonsolid",	1,	SURF_NONSOLID,	0 },		// clears the solid flag
-
-	// utility relevant attributes
-	{"origin",		1,	0,	CONTENTS_ORIGIN },		// center of rotating brushes
-	{"trans",		0,	0,	CONTENTS_TRANSLUCENT },	// don't eat contained surfaces
-	{"detail",		0,	0,	CONTENTS_DETAIL },		// don't include in structural bsp
-	{"structural",	0,	0,	CONTENTS_STRUCTURAL },	// force into structural bsp even if trnas
-	{"areaportal",	1,	0,	CONTENTS_AREAPORTAL },	// divides areas
-	{"fog",			1,	0,	CONTENTS_FOG},			// carves surfaces entering
-	{"sky",			0,	SURF_SKY,			0 },	// emit light from an environment map
-	{"alphashadow",	1,	SURF_ALPHASHADOW,	0 },	// carves surfaces entering
-
-	// server attributes
-	{"slick",		0,	SURF_SLICK,		0 },
-	{"noimpact",	0,	SURF_NOIMPACT,	0 },		// don't make impact explosions or marks
-	{"nomarks",		0,	SURF_NOMARKS,	0 },		// don't make impact marks, but still explode
-	{"ladder",		0,	SURF_LADDER,	0 },
-	{"nodamage",	0,	SURF_NODAMAGE,	0 },
-	{"nosteps",		0,	SURF_NOSTEPS,	0 },
-	{"paper",		0,	SURF_PAPER,		0 },
-	{"wood",		0,	SURF_WOOD,		0 },
-	{"metal",		0,	SURF_METAL,		0 },
-	{"rock",		0,	SURF_ROCK,		0 },
-	{"dirt",		0,	SURF_DIRT,		0 },
-	{"grill",		0,	SURF_GRILL,		0 },
-	{"grass",		0,	SURF_GRASS,		0 },
-	{"mud",			0,	SURF_MUD,		0 },
-	{"puddle",		0,	SURF_PUDDLE,	0 },
-	{"glass",		0,	SURF_GLASS,		0 },
-	{"gravel",		0,	SURF_GRAVEL,	0 },
-	{"sand",		0,	SURF_SAND,		0 },
-	{"foliage",		0,	SURF_FOLIAGE,	0 },
-	{"snow",		0,	SURF_SNOW,		0 },
-	{"carpet",		0,	SURF_CARPET,	0 },
-
-	// drawsurf attributes
-	{"nodraw",		0,	SURF_NODRAW,		0 },	// don't generate a drawsurface (or a lightmap)
-	{"castshadow",	0,	SURF_CASTSHADOW,	0 },	// sample lighting at vertexes
-	{"nolightmap",	0,	SURF_NOLIGHTMAP,	0 },	// don't generate a lightmap
-	{"nodlight",	0,	SURF_NODLIGHT,		0 },	// don't ever add dynamic lights
-	{"hint",		0,	SURF_HINT,		0}			// leave a dust trail when walking on this surface
-};
-
-
-/*
-===============
-ParseSurfaceParm
-
-surfaceparm <name>
-===============
-*/
-static void ParseSurfaceParm( char **text ) {
-	char	*token;
-	int		numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]);
-	int		i;
-
-	token = COM_ParseExt( text, qfalse );
-	for ( i = 0 ; i < numInfoParms ; i++ ) {
-		if ( !Q_stricmp( token, infoParms[i].name ) ) {
-			shader.surfaceFlags |= infoParms[i].surfaceFlags;
-			shader.contentFlags |= infoParms[i].contents;
-#if 0
-			if ( infoParms[i].clearSolid ) {
-				si->contents &= ~CONTENTS_SOLID;
-			}
-#endif
-			break;
-		}
-	}
-}
-
-/*
-=================
-ParseShader
-
-The current text pointer is at the explicit text definition of the
-shader.  Parse it into the global shader variable.  Later functions
-will optimize it.
-=================
-*/
-static qboolean ParseShader( char **text )
-{
-	char *token;
-	int s;
-
-	s = 0;
-
-	token = COM_ParseExt( text, qtrue );
-	if ( token[0] != '{' )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: expecting '{', found '%s' instead in shader '%s'\n", token, shader.name );
-		return qfalse;
-	}
-
-	while ( 1 )
-	{
-		token = COM_ParseExt( text, qtrue );
-		if ( !token[0] )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: no concluding '}' in shader %s\n", shader.name );
-			return qfalse;
-		}
-
-		// end of shader definition
-		if ( token[0] == '}' )
-		{
-			break;
-		}
-		// stage definition
-		else if ( token[0] == '{' )
-		{
-			if ( !ParseStage( &unfoggedStages[s], text ) )
-			{
-				return qfalse;
-			}
-			unfoggedStages[s].active = qtrue;
-			s++;
-			continue;
-		}
-		// skip stuff that only the QuakeEdRadient needs
-		else if ( !Q_stricmpn( token, "qer", 3 ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
-			float	a, b;
-
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[0] = atof( token );
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[1] = atof( token );
-			token = COM_ParseExt( text, qfalse );
-			tr.sunLight[2] = atof( token );
-			
-			VectorNormalize( tr.sunLight );
-
-			token = COM_ParseExt( text, qfalse );
-			a = atof( token );
-			VectorScale( tr.sunLight, a, tr.sunLight);
-
-			token = COM_ParseExt( text, qfalse );
-			a = atof( token );
-			a = a / 180 * M_PI;
-
-			token = COM_ParseExt( text, qfalse );
-			b = atof( token );
-			b = b / 180 * M_PI;
-
-			tr.sunDirection[0] = cos( a ) * cos( b );
-			tr.sunDirection[1] = sin( a ) * cos( b );
-			tr.sunDirection[2] = sin( b );
-		}
-		else if ( !Q_stricmp( token, "deformVertexes" ) ) {
-			ParseDeform( text );
-			continue;
-		}
-		else if ( !Q_stricmp( token, "tesssize" ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		else if ( !Q_stricmp( token, "clampTime" ) ) {
-			token = COM_ParseExt( text, qfalse );
-      if (token[0]) {
-        shader.clampTime = atof(token);
-      }
-    }
-		// skip stuff that only the q3map needs
-		else if ( !Q_stricmpn( token, "q3map", 5 ) ) {
-			SkipRestOfLine( text );
-			continue;
-		}
-		// skip stuff that only q3map or the server needs
-		else if ( !Q_stricmp( token, "surfaceParm" ) ) {
-			ParseSurfaceParm( text );
-			continue;
-		}
-		// no mip maps
-		else if ( !Q_stricmp( token, "nomipmaps" ) )
-		{
-			shader_noMipMaps = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if ( !Q_stricmp( token, "nopicmip" ) )
-		{
-			shader_noPicMip = qtrue;
-			continue;
-		}
-		// no picmip adjustment
-		else if (!Q_stricmp(token, "force32bit"))
-		{
-			shader_force32bit = qtrue;
-			continue;
-		}
-		// polygonOffset
-		else if ( !Q_stricmp( token, "polygonOffset" ) )
-		{
-			shader.polygonOffset = qtrue;
-			continue;
-		}
-		// entityMergable, allowing sprite surfaces from multiple entities
-		// to be merged into one batch.  This is a savings for smoke
-		// puffs and blood, but can't be used for anything where the
-		// shader calcs (not the surface function) reference the entity color or scroll
-		else if ( !Q_stricmp( token, "entityMergable" ) )
-		{
-			shader.entityMergable = qtrue;
-			continue;
-			}
-		else if (!Q_stricmp(token, "noMerge"))
-		{
-			shader.flags |= 1;
-			continue;
-		}
-		// portal
-		else if ( !Q_stricmp(token, "portal") )
-		{
-			shader.sort = SS_PORTAL;
-			continue;
-		}
-		// skyparms <cloudheight> <outerbox> <innerbox>
-		else if ( !Q_stricmp( token, "skyparms" ) )
-		{
-			ParseSkyParms( text );
-			continue;
-		}
-		// portal
-		else if (!Q_stricmp(token, "portalsky"))
-		{
-			shader.sort = SS_PORTALSKY;
-			shader.isPortalSky = qtrue;
-			continue;
-		}
-		// light <value> determines flaring in q3map, not needed here
-		else if ( !Q_stricmp(token, "light") ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			continue;
-		}
-		else if (!Q_stricmp(token, "spritegen"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] == 0) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
-				continue;
-			}
-
-			if (!Q_stricmp(token, "parallel")) {
-				shader.sprite.type = SPRITE_PARALLEL;
-			} else if (!Q_stricmp(token, "parallel_oriented")) {
-				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
-			} else if (!Q_stricmp(token, "parallel_upright")) {
-				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
-			} else if (!Q_stricmp(token, "oriented")) {
-				shader.sprite.type = SPRITE_ORIENTED;
-			}
-
-			shader.sprite.scale = 1.0;
-			continue;
-		}
-		else if (!Q_stricmp(token, "spritescale"))
-		{
-			token = COM_ParseExt(text, qfalse);
-			if (token[0] == 0) {
-				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
-				continue;
-			}
-
-			shader.sprite.scale = atof(token);
-			continue;
-		}
-		// cull <face>
-		else if ( !Q_stricmp( token, "cull") ) 
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( token[0] == 0 )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing cull parms in shader '%s'\n", shader.name );
-				continue;
-			}
-
-			if ( !Q_stricmp( token, "none" ) || !Q_stricmp( token, "twosided" ) || !Q_stricmp( token, "disable" ) )
-			{
-				shader.cullType = CT_TWO_SIDED;
-			}
-			else if ( !Q_stricmp( token, "back" ) || !Q_stricmp( token, "backside" ) || !Q_stricmp( token, "backsided" ) )
-			{
-				shader.cullType = CT_BACK_SIDED;
-			}
-			else
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: invalid cull parm '%s' in shader '%s'\n", token, shader.name );
-			}
-			continue;
-		}
-		// sort
-		else if ( !Q_stricmp( token, "sort" ) )
-		{
-			ParseSort( text );
-			continue;
-		}
-		else
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
-			return qfalse;
-		}
-	}
-
-	//
-	// ignore shaders that don't have any unfoggedStages, unless it is a sky or fog
-	//
-	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG) && !(shader.surfaceFlags & SURF_NODRAW)) {
-		return qfalse;
-	}
-
-	if (!(shader.flags & 2)) {
-		shader.flags &= ~1;
-	}
-
-	if ((shader.contentFlags & CONTENTS_FENCE) != 0 && shader.cullType == CT_TWO_SIDED) {
-		shader.cullType = CT_FRONT_SIDED;
-	}
-
-	shader.explicitlyDefined = qtrue;
-
-	return qtrue;
-}
-
-/*
-========================================================================================
-
-SHADER OPTIMIZATION AND FOGGING
-
-========================================================================================
-*/
-
-/*
-===================
-ComputeStageIteratorFunc
-
-See if we can use on of the simple fastpath stage functions,
-otherwise set to the generic stage function
-===================
-*/
-static void ComputeStageIteratorFunc( void )
-{
-	shader.optimalStageIteratorFunc = RB_StageIteratorGeneric;
-
-	//
-	// see if this should go into the sky path
-	//
-	if ( shader.isSky )
-	{
-		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		goto done;
-	}
-
-	if ( r_ignoreFastPath->integer )
-	{
-		return;
-	}
-
-	//
-	// see if this can go into the vertex lit fast path
-	//
-	if ( shader.numUnfoggedPasses == 1 )
-	{
-		if ( unfoggedStages[0].rgbGen == CGEN_LIGHTING_GRID || unfoggedStages[0].rgbGen == CGEN_LIGHTING_SPHERICAL )
-		{
-			if ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP)
-			{
-				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP)
-				{
-					if ( !shader.polygonOffset )
-					{
-						if ( !unfoggedStages[0].multitextureEnv )
-						{
-							if ( !shader.numDeforms )
-							{
-								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTextureUnfogged;
-								goto done;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	//
-	// see if this can go into an optimized LM, multitextured path
-	//
-	if ( shader.numUnfoggedPasses == 1 )
-	{
-		if ( ( unfoggedStages[0].rgbGen == CGEN_IDENTITY ) && ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP ) )
-		{
-			if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
-				unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
-			{
-				if ( !shader.polygonOffset )
-				{
-					if ( !shader.numDeforms )
-					{
-						if (unfoggedStages[0].multitextureEnv )
-						{
-							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitextureUnfogged;
-							goto done;
-						}
-					}
-				}
-			}
-		}
-	}
-
-done:
-	return;
-}
-
-typedef struct {
-	int		blendA;
-	int		blendB;
-
-	int		multitextureEnv;
-	int		multitextureBlend;
-} collapse_t;
-
-static collapse_t	collapse[] = {
-	{ 0, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,	
-		GL_MODULATE, 0 },
-
-	{ 0, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, 0 },
-
-	{ GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO, GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO,
-		GL_MODULATE, GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR },
-
-	{ 0, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE,
-		GL_ADD, 0 },
-
-	{ GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE,
-		GL_ADD, GLS_DSTBLEND_ONE | GLS_SRCBLEND_ONE },
-#if 0
-	{ 0, GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA,
-		GL_DECAL, 0 },
-#endif
-	{ -1 }
-};
-
-/*
-================
-CollapseMultitexture
-
-Attempt to combine two unfoggedStages into a single multitexture stage
-FIXME: I think modulated add + modulated add collapses incorrectly
-=================
-*/
-static void CollapseMultitexture(int *stagecounter) {
-	int iUseCollapse;
-	int stagenum;
-	int abits, bbits;
-	shaderStage_t* stage;
-	textureBundle_t tmpBundle;
-
-	for (stagenum = 0; stagenum < *stagecounter - 1; stagenum++) {
-		stage = &unfoggedStages[stagenum];
-
-		// make sure both unfoggedStages are active
-		if (!stage->active || !unfoggedStages[stagenum + 1].active) {
-			continue;
-		}
-
-		if (stage->multitextureEnv) {
-			continue;
-		}
-
-		// on voodoo2, don't combine different tmus
-		if (glConfig.driverType == GLDRV_VOODOO) {
-			if (stage->bundle[0].image[0]->TMU ==
-				unfoggedStages[stagenum + 1].bundle[0].image[0]->TMU) {
-				continue;
-			}
-		}
-
-		abits = stage->stateBits;
-		bbits = unfoggedStages[stagenum + 1].stateBits;
-
-		// make sure that both unfoggedStages have identical state other than blend modes
-		if ((abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)) !=
-			(bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE))) {
-			continue;
-		}
-
-		abits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-		bbits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-
-		// search for a valid multitexture blend function
-		for (iUseCollapse = 0; collapse[iUseCollapse].blendA != -1; iUseCollapse++) {
-			if (abits == collapse[iUseCollapse].blendA
-				&& bbits == collapse[iUseCollapse].blendB) {
-				break;
-			}
-		}
-
-		// nothing found
-		if (collapse[iUseCollapse].blendA == -1) {
-			continue;
-		}
-
-		// GL_ADD is a separate extension
-		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable) {
-			continue;
-		}
-
-		// make sure waveforms have identical parameters
-		if ((stage->rgbGen != unfoggedStages[stagenum + 1].rgbGen) ||
-			(stage->alphaGen != unfoggedStages[stagenum + 1].alphaGen)) {
-			continue;
-		}
-
-		// an add collapse can only have identity colors
-		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && stage->rgbGen != CGEN_IDENTITY) {
-			continue;
-		}
-
-		if (stage->rgbGen == CGEN_WAVEFORM)
-		{
-			if (memcmp(&stage->rgbWave,
-				&unfoggedStages[stagenum + 1].rgbWave,
-				sizeof(stage->rgbWave)))
-			{
-				continue;
-			}
-		}
-		if (stage->alphaGen == CGEN_WAVEFORM)
-		{
-			if (memcmp(&stage->alphaWave,
-				&unfoggedStages[stagenum + 1].alphaWave,
-				sizeof(stage->alphaWave)))
-			{
-				continue;
-			}
-		}
-
-
-		// make sure that lightmaps are in bundle 1 for 3dfx
-		if (stage->bundle[0].isLightmap)
-		{
-			tmpBundle = stage->bundle[0];
-			stage->bundle[0] = unfoggedStages[stagenum + 1].bundle[0];
-			stage->bundle[1] = tmpBundle;
-		}
-		else
-		{
-			stage->bundle[1] = unfoggedStages[stagenum + 1].bundle[0];
-		}
-
-		// set the new blend state bits
-		stage->multitextureEnv = collapse[iUseCollapse].multitextureEnv;
-		stage->stateBits &= ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
-		stage->stateBits |= collapse[iUseCollapse].multitextureBlend;
-
-		//
-		// move down subsequent shaders
-		//
-		if (stagenum + 2 < MAX_SHADER_STAGES) {
-			memmove(&unfoggedStages[stagenum + 1], &unfoggedStages[stagenum + 2], sizeof(unfoggedStages[0]) * (MAX_SHADER_STAGES - 2 - stagenum));
-		}
-
-		Com_Memset(&unfoggedStages[MAX_SHADER_STAGES - 1], 0, sizeof(unfoggedStages[0]));
-		(*stagecounter)--;
-	}
-}
-
-/*
-=============
-
-FixRenderCommandList
-https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=493
-Arnout: this is a nasty issue. Shaders can be registered after drawsurfaces are generated
-but before the frame is rendered. This will, for the duration of one frame, cause drawsurfaces
-to be rendered with bad shaders. To fix this, need to go through all render commands and fix
-sortedIndex.
-==============
-*/
-static void FixRenderCommandList( int newShader ) {
-	renderCommandList_t	*cmdList = &backEndData[tr.smpFrame]->commands;
-
-	if( cmdList ) {
-		const void *curCmd = cmdList->cmds;
-
-		while ( 1 ) {
-			switch ( *(const int *)curCmd ) {
-			case RC_SET_COLOR:
-				{
-				const setColorCommand_t *sc_cmd = (const setColorCommand_t *)curCmd;
-				curCmd = (const void *)(sc_cmd + 1);
-				break;
-				}
-			case RC_STRETCH_PIC:
-				{
-				const stretchPicCommand_t *sp_cmd = (const stretchPicCommand_t *)curCmd;
-				curCmd = (const void *)(sp_cmd + 1);
-				break;
-				}
-			case RC_DRAW_SURFS:
-				{
-				int i;
-				drawSurf_t	*drawSurf;
-				shader_t	*shader;
-				int			fogNum;
-				int			entityNum;
-				int			dlightMap;
-				int			sortedIndex;
-				const drawSurfsCommand_t *ds_cmd =  (const drawSurfsCommand_t *)curCmd;
-
-				for( i = 0, drawSurf = ds_cmd->drawSurfs; i < ds_cmd->numDrawSurfs; i++, drawSurf++ ) {
-					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap );
-                    sortedIndex = (( drawSurf->sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1));
-					if( sortedIndex >= newShader ) {
-						sortedIndex++;
-						drawSurf->sort = (sortedIndex << QSORT_SHADERNUM_SHIFT) | entityNum | ( fogNum << QSORT_FOGNUM_SHIFT ) | (int)dlightMap;
-					}
-				}
-				curCmd = (const void *)(ds_cmd + 1);
-				break;
-				}
-			case RC_DRAW_BUFFER:
-				{
-				const drawBufferCommand_t *db_cmd = (const drawBufferCommand_t *)curCmd;
-				curCmd = (const void *)(db_cmd + 1);
-				break;
-				}
-			case RC_SWAP_BUFFERS:
-				{
-				const swapBuffersCommand_t *sb_cmd = (const swapBuffersCommand_t *)curCmd;
-				curCmd = (const void *)(sb_cmd + 1);
-				break;
-				}
-			case RC_END_OF_LIST:
-			default:
-				return;
-			}
-		}
-	}
-}
-
-/*
-==============
-SortNewShader
-
-Positions the most recently created shader in the tr.sortedShaders[]
-array so that the shader->sort key is sorted reletive to the other
-shaders.
-
-Sets shader->sortedIndex
-==============
-*/
-static void SortNewShader( void ) {
-	int		i;
-	float	sort;
-	shader_t	*newShader;
-
-	newShader = tr.shaders[ tr.numShaders - 1 ];
-	sort = newShader->sort;
-
-	for ( i = tr.numShaders - 2 ; i >= 0 ; i-- ) {
-		if ( tr.sortedShaders[ i ]->sort <= sort ) {
-			break;
-		}
-		tr.sortedShaders[i+1] = tr.sortedShaders[i];
-		tr.sortedShaders[i+1]->sortedIndex++;
-	}
-
-	newShader->sortedIndex = i+1;
-	tr.sortedShaders[i+1] = newShader;
-}
-
-
-/*
-====================
-GeneratePermanentShader
-====================
-*/
-static shader_t *GeneratePermanentShader( void ) {
-	shader_t	*newShader;
-	int			i, b;
-	int			size;
-
-	if ( tr.numShaders == MAX_SHADERS ) {
-		ri.Printf( PRINT_WARNING, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
-		return tr.defaultShader;
-	}
-
-	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_dontcare);
-
-	*newShader = shader;
-	newShader->next = currentShader->shader;
-	currentShader->shader = newShader;
-
-	tr.shaders[ tr.numShaders ] = newShader;
-	newShader->index = tr.numShaders;
-	
-	tr.sortedShaders[ tr.numShaders ] = newShader;
-	newShader->sortedIndex = tr.numShaders;
-
-	tr.numShaders++;
-
-	for ( i = 0 ; i < newShader->numUnfoggedPasses ; i++ ) {
-		if ( !unfoggedStages[i].active ) {
-			break;
-		}
-		newShader->unfoggedStages[i] = ri.Hunk_Alloc( sizeof( unfoggedStages[i] ), h_dontcare );
-		*newShader->unfoggedStages[i] = unfoggedStages[i];
-
-		for ( b = 0 ; b < NUM_TEXTURE_BUNDLES ; b++ ) {
-			size = newShader->unfoggedStages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
-			if (size) {
-				newShader->unfoggedStages[i]->bundle[b].texMods = ri.Hunk_Alloc(size, h_dontcare);
-				Com_Memcpy(newShader->unfoggedStages[i]->bundle[b].texMods, unfoggedStages[i].bundle[b].texMods, size);
-			}
-		}
-	}
-
-	SortNewShader();
-
-	currentShader = NULL;
-
-	return newShader;
-}
-
-/*
-=================
-VertexLightingCollapse
-
-If vertex lighting is enabled, only render a single
-pass, trying to guess which is the correct one to best aproximate
-what it is supposed to look like.
-=================
-*/
-static void VertexLightingCollapse( void ) {
-	int		stage;
-	shaderStage_t	*bestStage;
-	int		bestImageRank;
-	int		rank;
-
-	// if we aren't opaque, just use the first pass
-	if ( shader.sort == SS_OPAQUE ) {
-
-		// pick the best texture for the single pass
-		bestStage = &unfoggedStages[0];
-		bestImageRank = -999999;
-
-		for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
-			shaderStage_t *pStage = &unfoggedStages[stage];
-
-			if ( !pStage->active ) {
-				break;
-			}
-			rank = 0;
-
-			if ( pStage->bundle[0].isLightmap ) {
-				rank -= 100;
-			}
-			if ( pStage->bundle[0].tcGen != TCGEN_TEXTURE ) {
-				rank -= 5;
-			}
-			if ( pStage->bundle[0].numTexMods ) {
-				rank -= 5;
-			}
-			if ( pStage->rgbGen != CGEN_IDENTITY && pStage->rgbGen != CGEN_IDENTITY_LIGHTING ) {
-				rank -= 3;
-			}
-
-			if ( rank > bestImageRank  ) {
-				bestImageRank = rank;
-				bestStage = pStage;
-			}
-		}
-
-		unfoggedStages[0].bundle[0] = bestStage->bundle[0];
-		unfoggedStages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-		unfoggedStages[0].stateBits |= GLS_DEPTHMASK_TRUE;
-		if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-			unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
-		} else {
-			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		}
-		unfoggedStages[0].alphaGen = AGEN_SKIP;		
-	} else {
-		// don't use a lightmap (tesla coils)
-		if ( unfoggedStages[0].bundle[0].isLightmap ) {
-			unfoggedStages[0] = unfoggedStages[1];
-		}
-
-		// if we were in a cross-fade cgen, hack it to normal
-		if ( unfoggedStages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || unfoggedStages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_SAWTOOTH )
-			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
-			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_SAWTOOTH ) ) {
-			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		}
-	}
-
-	for ( stage = 1; stage < MAX_SHADER_STAGES; stage++ ) {
-		shaderStage_t *pStage = &unfoggedStages[stage];
-
-		if ( !pStage->active ) {
-			break;
-		}
-
-		Com_Memset( pStage, 0, sizeof( *pStage ) );
-	}
-}
-
-/*
-=========================
-FinishShader
-
-Returns a freshly allocated shader with all the needed info
-from the current global working shader
-=========================
-*/
-static shader_t *FinishShader( void ) {
-	int stage;
-	int i;
-	int bundle;
-	qboolean hasLightmapStage;
-
-	if (!currentShader) {
-		currentShader = FindShaderText(shader.name);
-	}
-
-    if (shader.defaultShader)
-    {
-        currentShader->shader = tr.defaultShader;
-        currentShader = NULL;
-        return tr.defaultShader;
-    }
-
-	hasLightmapStage = qfalse;
-
-	//
-	// set sky stuff appropriate
-	//
-	if ( shader.isPortalSky ) {
-		shader.sort = SS_PORTALSKY;
-	}
-	if ( shader.isSky ) {
-		shader.sort = SS_ENVIRONMENT;
-	}
-
-	//
-	// set polygon offset
-	//
-	if ( shader.polygonOffset && !shader.sort ) {
-		shader.sort = SS_DECAL;
-	}
-
-	shader.needsLGrid = qfalse;
-	shader.needsLSpherical = qfalse;
-
-	//
-	// set appropriate stage information
-	//
-	stage = 0;
-	for (shaderStage_t* pStage = &unfoggedStages[0]; pStage->active; pStage++, stage++) {
-		// check for a missing texture
-		if ( !pStage->bundle[0].image[0] ) {
-			ri.Printf( PRINT_WARNING, "Shader %s has a stage with no image\n", shader.name );
-			pStage->active = qfalse;
-			continue;
-		}
-
-		if (pStage->rgbGen == CGEN_LIGHTING_GRID) {
-			shader.needsLGrid = 1;
-		} else if (pStage->rgbGen == CGEN_LIGHTING_SPHERICAL || pStage->rgbGen == CGEN_STATIC) {
-			shader.needsLSpherical = 1;
-		}
-
-		//
-		// default texture coordinate generation
-		//
-		for (bundle = 0; bundle < 2; bundle++) {
-			if (pStage->bundle[bundle].isLightmap) {
-				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
-					pStage->bundle[bundle].tcGen = TCGEN_LIGHTMAP;
-				}
-				hasLightmapStage = qtrue;
-			}
-			else {
-				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
-					pStage->bundle[bundle].tcGen = TCGEN_TEXTURE;
-				}
-			}
-		}
-
-		if (pStage->multitextureEnv && pStage->bundle[0].isLightmap) {
-			//
-			// exchange bundle
-			//
-			textureBundle_t tmpBundle = pStage->bundle[0];
-			pStage->bundle[0] = pStage->bundle[1];
-			pStage->bundle[1] = tmpBundle;
-		}
-	}
-
-	//
-	// if we are in r_vertexLight mode, never use a lightmap texture
-	//
-	if (stage > 1)
-	{
-		if (r_vertexLight->integer) {
-			VertexLightingCollapse();
-			stage = 1;
-			hasLightmapStage = qfalse;
-		}
-
-		//
-		// look for multitexture potential
-		//
-		if (qglActiveTextureARB) {
-			CollapseMultitexture(&stage);
-		}
-	}
-
-	for (i = 0; i < stage; i++) {
-		int blendSrcBits, blendDstBits;
-
-		shaderStage_t* pStage = &unfoggedStages[i];
-		if (pStage->stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))
-		{
-			blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
-			blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
-			if (blendSrcBits == GLS_SRCBLEND_ONE && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR
-				|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE
-				|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_BLACK;
-			}
-			else if (blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ZERO
-					|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_SRC_COLOR)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_WHITE;
-			}
-			else if (blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA
-					|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_SRC_ALPHA
-					|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE)
-			{
-				pStage->stateBits |= GLS_FOG_ENABLED;
-			}
-			else {
-				ri.Printf(PRINT_WARNING, "Shader '%s' stage# %i is unfoggable\n", shader.name, i + 1);
-			}
-
-			if (shader.sort == SS_BAD)
-			{
-				if (pStage->stateBits & GLS_DEPTHMASK_TRUE) {
-					shader.sort = SS_SEE_THROUGH;
-				}
-				else {
-					shader.sort = SS_BLEND0;
-				}
-			}
-		}
-		else {
-			pStage->stateBits |= GLS_FOG_ENABLED;
-
-			if (shader.sort == SS_BAD) {
-				shader.sort = SS_OPAQUE;
-			}
-		}
-	}
-
-	// fogonly shaders don't have any normal passes
-	if (shader.sort == SS_BAD) {
-		shader.sort = SS_OPAQUE;
-	}
-
-	if (shader.lightmapIndex >= 0 && !hasLightmapStage) {
-		ri.Printf(PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name);
-		shader.lightmapIndex = LIGHTMAP_NONE;
-	}
-
-	//
-	// compute number of passes
-	//
-	shader.numUnfoggedPasses = 0;
-	for (stage = 0; stage < MAX_SHADER_STAGES; stage++) {
-		shaderStage_t* pStage = &unfoggedStages[stage];
-		if (!pStage->active) {
-			break;
-		}
-
-		shader.numUnfoggedPasses++;
-	}
-
-	// determine which stage iterator function is appropriate
-	ComputeStageIteratorFunc();
-
-	return GeneratePermanentShader();
-}
-
-//========================================================================================
-
-/*
-===============
-R_FindShader
-
-Will always return a valid shader, but it might be the
-default shader if the real one can't be found.
-
-In the interest of not requiring an explicit shader text entry to
-be defined for every single image used in the game, three default
-shader behaviors can be auto-created for any image:
-
-If lightmapIndex == LIGHTMAP_NONE, then the image will have
-dynamic diffuse lighting applied to it, as apropriate for most
-entity skin surfaces.
-
-If lightmapIndex == LIGHTMAP_2D, then the image will be used
-for 2D rendering unless an explicit shader is found
-
-If lightmapIndex == LIGHTMAP_BY_VERTEX, then the image will use
-the vertex rgba modulate values, as apropriate for misc_model
-pre-lit surfaces.
-
-Other lightmapIndex values will have a lightmap stage created
-and src*dest blending applied with the texture, as apropriate for
-most world construction surfaces.
-
-===============
-*/
-shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy) {
-	char		strippedName[MAX_QPATH];
-	char		fileName[MAX_QPATH];
-	int			i, j, hash;
-	char		*shaderText;
-	image_t		*image;
-	shader_t	*sh;
-
-	if ( name[0] == 0 ) {
-		return tr.defaultShader;
-	}
-
-	// use (fullbright) vertex lighting if the bsp file doesn't have
-	// lightmaps
-	if ( lightmapIndex >= 0 && lightmapIndex >= tr.numLightmaps ) {
-		lightmapIndex = LIGHTMAP_BY_VERTEX;
-	}
-
-	COM_StripExtension( name, strippedName, sizeof(strippedName));
-
-	hash = generateHashValue(strippedName);
-
-	//
-	// see if the shader is already loaded
-	//
-	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
-        if (!Q_stricmp(currentShader->name, strippedName))
-		{
-			// shader text found, but it has no shared assigned
-			break;
-		}
-	}
-
-	if (currentShader)
-	{
-		for (sh = currentShader->shader; sh; sh = sh->next)
-		{
-			if (sh->lightmapIndex == lightmapIndex || sh == tr.defaultShader) {
-				return sh;
-			}
-		}
-	}
-	else
-	{
-		// create a new shader text
-		currentShader = AddShaderTextToHash(strippedName, hash);
-	}
-
-	// make sure the render thread is stopped, because we are probably
-	// going to have to upload an image
-	if (r_smp->integer) {
-		R_SyncRenderThread();
-	}
-
-	// clear the global shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-    Com_Memset(&unfoggedStages, 0, sizeof(unfoggedStages));
-    Com_Memset(&texMods, 0, sizeof(texMods));
-
-    shader.sprite.scale = 1.0;
-    shader_noPicMip = qfalse;
-    shader_noMipMaps = qfalse;
-    shader_force32bit = qfalse;
-	Q_strncpyz(shader.name, strippedName, sizeof(shader.name));
-	shader.lightmapIndex = lightmapIndex;
-	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
-        for (j = 0; j < NUM_TEXTURE_BUNDLES; j++) {
-            unfoggedStages[i].bundle[j].texMods = texMods[i];
-		}
-	}
-
-	// FIXME: set these "need" values apropriately
-	shader.needsNormal = qfalse;
-	shader.needsST1 = qtrue;
-	shader.needsST2 = qtrue;
-	shader.needsColor = qtrue;
-
-	//
-	// attempt to define shader from an explicit parameter file
-	//
-	if ( currentShader->text ) {
-		shaderText = currentShader->text;
-		// enable this when building a pak file to get a global list
-		// of all explicit shaders
-		if ( r_printShaders->integer ) {
-			ri.Printf( PRINT_ALL, "*SHADER* %s\n", name );
-		}
-
-		if ( !ParseShader( &shaderText ) ) {
-			// had errors, so use default shader
-			shader.defaultShader = qtrue;
-		}
-
-		if (shader.lightmapIndex == LIGHTMAP_BY_VERTEX && !(shader.surfaceFlags & SURF_HINT)) {
-			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		}
-
-		sh = FinishShader();
-		return sh;
-	}
-
-	//
-	// if not defined in the in-memory shader descriptions,
-	// look for a single TGA, BMP, or PCX
-	//
-	Q_strncpyz( fileName, name, sizeof( fileName ) );
-	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
-    if (!r_forceClampToEdge->value) {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
-	}
-    else {
-        image = R_FindImageFile(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-	}
-
-	if ( !image ) {
-		ri.Printf( PRINT_DEVELOPER, "Couldn't find image for shader %s\n", name );
-		shader.defaultShader = qtrue;
-		return FinishShader();
-	}
-
-	//
-	// create the default shading commands
-	//
-	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-		// dynamic colors at vertexes
-		unfoggedStages[0].bundle[0].image[0] = image;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
-		// explicit colors at vertexes
-		unfoggedStages[0].bundle[0].image[0] = image;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
-		unfoggedStages[0].alphaGen = AGEN_SKIP;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
-		// GUI elements
-		unfoggedStages[0].bundle[0].image[0] = image;
-        unfoggedStages[0].active = qtrue;
-        unfoggedStages[0].force32bit = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_GLOBAL_COLOR;
-		unfoggedStages[0].alphaGen = AGEN_GLOBAL_ALPHA;
-		unfoggedStages[0].stateBits = GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
-		// fullbright level
-		unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-
-		unfoggedStages[1].bundle[0].image[0] = image;
-		unfoggedStages[1].active = qtrue;
-		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
-		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	} else {
-		// two pass lightmap
-		unfoggedStages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		unfoggedStages[0].bundle[0].isLightmap = qtrue;
-		unfoggedStages[0].active = qtrue;
-		unfoggedStages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
-													// for identitylight
-		unfoggedStages[0].stateBits = GLS_DEFAULT;
-
-		unfoggedStages[1].bundle[0].image[0] = image;
-		unfoggedStages[1].active = qtrue;
-		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
-		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	}
-
-	return FinishShader();
-}
-
-/* 
-====================
-RE_RegisterShader
-
-This is the exported shader entry point for the rest of the system
-It will always return an index that will be valid.
-
-This should really only be used for explicit shaders, because there is no
-way to ask for different implicit lighting modes (vertex, lightmap, etc)
-====================
-*/
-qhandle_t RE_RegisterShader( const char *name ) {
-	shader_t	*sh;
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, qtrue, qtrue, qtrue);
-
-	// we want to return 0 if the shader failed to
-	// load for some reason, but R_FindShader should
-	// still keep a name allocated for it, so if
-	// something calls RE_RegisterShader again with
-	// the same name, we don't try looking for it again
-	if ( sh->defaultShader ) {
-		return 0;
-	}
-
-	return sh->index;
-}
-
-
-/*
-====================
-RE_RegisterShaderNoMip
-
-For menu graphics that should never be picmiped
-====================
-*/
-qhandle_t RE_RegisterShaderNoMip( const char *name ) {
-	shader_t	*sh;
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		Com_Printf( "Shader name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	sh = R_FindShader( name, LIGHTMAP_2D, qfalse, qfalse, qfalse, qfalse );
-
-	// we want to return 0 if the shader failed to
-	// load for some reason, but R_FindShader should
-	// still keep a name allocated for it, so if
-	// something calls RE_RegisterShader again with
-	// the same name, we don't try looking for it again
-	if ( sh->defaultShader ) {
-		return 0;
-	}
-
-	return sh->index;
-}
-
-qhandle_t RE_RefreshShaderNoMip(const char* name) {
-	shader_t* sh;
-	char strippedName[64];
-	int hash;
-
-	if (!name || !*name) {
-		return 0;
-	}
-
-    COM_StripExtension(name, strippedName, sizeof(strippedName));
-
-	hash = generateHashValue(strippedName);
-
-	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
-		if (!Q_stricmp(currentShader->name, strippedName)) {
-			if (currentShader) {
-				image_t* image;
-
-				sh = currentShader->shader;
-				image = sh->unfoggedStages[0]->bundle[0].image[0];
-				currentShader = NULL;
-
-				if (image) {
-					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFile(
-						image->imgName,
-						image->numMipmaps,
-						image->allowPicmip,
-						image->force32bit,
-						image->wrapClampModeX,
-						image->wrapClampModeY
-					);
-				}
-
-				return sh->index;
-			}
-
-			break;
-		}
-	}
-
-    sh = R_FindShader(name, -4, 0, 0, 0, 0);
-	if (sh->defaultShader) {
-		return 0;
-	}
-
-    return sh->index;
-}
-
-/*
-====================
-R_GetShaderByHandle
-
-When a handle is passed in by another module, this range checks
-it and returns a valid (possibly default) shader_t to be used internally.
-====================
-*/
-shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
-	if ( hShader < 0 ) {
-	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader ); // bk: FIXME name
-		return tr.defaultShader;
-	}
-	if ( hShader >= tr.numShaders ) {
-		ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
-		return tr.defaultShader;
-	}
-	return tr.shaders[hShader];
-}
-
-/*
-===============
-R_ShaderList_f
-
-Dump information on all valid shaders to the console
-A second parameter will cause it to print in sorted order
-===============
-*/
-void	R_ShaderList_f (void) {
-	int			i;
-	int			count;
-	shader_t	*shader;
-
-	ri.Printf (PRINT_ALL, "-----------------------\n");
-
-	count = 0;
-	for ( i = 0 ; i < tr.numShaders ; i++ ) {
-		int stage;
-
-		if ( ri.Cmd_Argc() > 1 ) {
-			shader = tr.sortedShaders[i];
-		} else {
-			shader = tr.shaders[i];
-		}
-
-		ri.Printf( PRINT_ALL, "%i ", shader->numUnfoggedPasses );
-
-		if (shader->lightmapIndex >= 0 ) {
-			ri.Printf (PRINT_ALL, "L ");
-		} else {
-			ri.Printf (PRINT_ALL, "  ");
-		}
-
-		for (stage = 0; shader->unfoggedStages[stage] && shader->unfoggedStages[stage]->active; stage++) {
-			if (shader->unfoggedStages[stage]->multitextureEnv == GL_ADD ) {
-				ri.Printf( PRINT_ALL, "MT(a) " );
-			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_MODULATE ) {
-				ri.Printf( PRINT_ALL, "MT(m) " );
-			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_DECAL ) {
-				ri.Printf( PRINT_ALL, "MT(d) " );
-			} else {
-				ri.Printf( PRINT_ALL, "      " );
-			}
-		}
-
-		if ( shader->explicitlyDefined ) {
-			ri.Printf( PRINT_ALL, "E " );
-		} else {
-			ri.Printf( PRINT_ALL, "  " );
-		}
-
-		if ( shader->optimalStageIteratorFunc == RB_StageIteratorGeneric ) {
-			ri.Printf( PRINT_ALL, "gen " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorSky ) {
-			ri.Printf( PRINT_ALL, "sky " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitextureUnfogged ) {
-			ri.Printf( PRINT_ALL, "lmmt" );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTextureUnfogged ) {
-			ri.Printf( PRINT_ALL, "vlt " );
-		} else {
-			ri.Printf( PRINT_ALL, "    " );
-		}
-
-		if ( shader->defaultShader ) {
-			ri.Printf (PRINT_ALL,  ": %s (DEFAULTED)\n", shader->name);
-		} else {
-			ri.Printf (PRINT_ALL,  ": %s\n", shader->name);
-		}
-		count++;
-	}
-	ri.Printf (PRINT_ALL, "%i total shaders\n", count);
-	ri.Printf (PRINT_ALL, "------------------\n");
-}
-
-
-/*
-====================
-ScanAndLoadShaderFiles
-
-Finds and loads all .shader files, combining them into
-a single large text block that can be scanned for shader names
-=====================
-*/
-#define	MAX_SHADER_FILES	4096
-static void ScanAndLoadShaderFiles( void )
-{
-    char** shaderFiles;
-    char* buffers[MAX_SHADER_FILES];
-    char* p;
-    int numShaders;
-    int i;
-
-    long sum = 0;
-    // scan for shader files
-    shaderFiles = ri.FS_ListFiles("scripts", ".shader", &numShaders);
-
-    if (!shaderFiles || !numShaders)
-    {
-        ri.Printf(PRINT_WARNING, "WARNING: no shader files found\n");
-        return;
-    }
-
-    if (numShaders > MAX_SHADER_FILES) {
-        numShaders = MAX_SHADER_FILES;
-    }
-
-    // load and parse shader files
-    for (i = 0; i < numShaders; i++)
-    {
-        char filename[MAX_QPATH];
-
-        Com_sprintf(filename, sizeof(filename), "scripts/%s", shaderFiles[i]);
-        ri.Printf(PRINT_ALL, "...loading '%s'\n", filename);
-        sum += ri.FS_ReadFile(filename, (void**)&buffers[i]);
-        if (!buffers[i]) {
-            ri.Error(ERR_DROP, "Couldn't load %s", filename);
-        }
-    }
-
-    // build single large buffer
-    s_shaderText = ri.Malloc(sum + numShaders * 2);
-    s_shaderText[0] = 0;
-
-    // free in reverse order, so the temp files are all dumped
-    for (i = numShaders - 1; i >= 0; i--) {
-        strcat(s_shaderText, "\n");
-        p = &s_shaderText[strlen(s_shaderText)];
-        strcat(s_shaderText, buffers[i]);
-        ri.FS_FreeFile(buffers[i]);
-        buffers[i] = p;
-    }
-
-    COM_Compress(s_shaderText);
-    // free up memory
-    ri.FS_FreeFileList(shaderFiles);
-}
-
-static void FindShadersInShaderText()
-{
-	char* p;
-	char* oldp;
-	char* token;
-
-	if (!s_shaderText) {
-		return;
-	}
-
-	p = s_shaderText;
-    // look for label
-    while (1) {
-        oldp = p;
-        token = COM_ParseExt(&p, qtrue);
-        if (token[0] == 0) {
-            break;
-        }
-
-        if (*token == '{')
-        {
-            p = oldp;
-            SkipBracedSection(&p);
-        }
-        else
-        {
-            currentShader = AllocShaderText(token);
-            currentShader->text = p;
-        }
-    }
-}
-
-/*
-====================
-CreateInternalShaders
-====================
-*/
-static void CreateInternalShaders( void ) {
-	tr.numShaders = 0;
-
-	// init the default shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-	Com_Memset( &unfoggedStages, 0, sizeof( unfoggedStages ) );
-
-	Q_strncpyz( shader.name, "<default>", sizeof( shader.name ) );
-	shader.lightmapIndex = LIGHTMAP_NONE;
-	unfoggedStages[0].bundle[0].image[0] = tr.defaultImage;
-	unfoggedStages[0].active = qtrue;
-	unfoggedStages[0].stateBits = GLS_DEFAULT;
-	currentShader = FindShaderText(shader.name);
-    tr.defaultShader = FinishShader();
-
-    // white shader
-    Q_strncpyz(shader.name, "<white>", sizeof(shader.name));
-    shader.lightmapIndex = LIGHTMAP_NONE;
-    unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
-    unfoggedStages[0].active = qtrue;
-    unfoggedStages[0].stateBits = GLS_DEFAULT;
-    currentShader = FindShaderText(shader.name);
-	FinishShader();
-
-	// shadow shader is just a marker
-	Q_strncpyz( shader.name, "<stencil shadow>", sizeof( shader.name ) );
-    shader.sort = SS_STENCIL_SHADOW;
-    shader.lightmapIndex = LIGHTMAP_NONE;
-	currentShader = FindShaderText(shader.name);
-	tr.shadowShader = FinishShader();
-}
-
-static void CreateExternalShaders( void ) {
-	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue, qtrue, qtrue, qtrue);
-}
-
-void R_StartupShaders()
-{
-    ri.Printf(PRINT_ALL, "Initializing Shaders\n");
-
-    currentShader = NULL;
-    s_shaderText = NULL;
-
-    Com_Memset(hashTable, 0, sizeof(hashTable));
-
-    ScanAndLoadShaderFiles();
-
-    FindShadersInShaderText();
-
-    R_SetupShaders();
-}
-
-void R_ShutdownShaders()
-{
-	shadertext_t* shader, * next;
-	int hash;
-
-	if (s_shaderText) {
-		ri.Free(s_shaderText);
-	}
-
-    for (hash = 0; hash < FILE_HASH_SIZE; hash++) {
-        for (shader = hashTable[hash]; shader; shader = next) {
-            next = shader->next;
-            ri.Free(shader);
-        }
-        hashTable[hash] = NULL;
-	}
-}
-
-void R_SetupShaders()
-{
-	shadertext_t* shader;
-	int hash;
-
-    ri.Printf(0, "Setting up Shaders\n");
-    currentShader = NULL;
-    for (hash = 0; hash < FILE_HASH_SIZE; ++hash)
-    {
-		for (shader = hashTable[hash]; shader; shader = shader->next) {
-			shader->shader = NULL;
-		}
-    }
-
-    CreateInternalShaders();
-    InitStaticShaders();
-    CreateExternalShaders();
-}
diff --git a/code/renderer/tr_shadows.c b/code/renderer/tr_shadows.c
deleted file mode 100644
index d0ab3e24..00000000
--- a/code/renderer/tr_shadows.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-
-/*
-
-  for a projection shadow:
-
-  point[x] += light vector * ( z - shadow plane )
-  point[y] +=
-  point[z] = shadow plane
-
-  1 0 light[x] / light[z]
-
-*/
-
-typedef struct {
-	int		i2;
-	int		facing;
-} edgeDef_t;
-
-#define	MAX_EDGE_DEFS	32
-
-static	edgeDef_t	edgeDefs[SHADER_MAX_VERTEXES][MAX_EDGE_DEFS];
-static	int			numEdgeDefs[SHADER_MAX_VERTEXES];
-static	int			facing[SHADER_MAX_INDEXES/3];
-
-void R_RenderShadowEdges( void ) {
-	int		i;
-
-#if 0
-	int		numTris;
-
-	// dumb way -- render every triangle's edges
-	numTris = tess.numIndexes / 3;
-
-	for ( i = 0 ; i < numTris ; i++ ) {
-		int		i1, i2, i3;
-
-		if ( !facing[i] ) {
-			continue;
-		}
-
-		i1 = tess.indexes[ i*3 + 0 ];
-		i2 = tess.indexes[ i*3 + 1 ];
-		i3 = tess.indexes[ i*3 + 2 ];
-
-		qglBegin( GL_TRIANGLE_STRIP );
-		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i2 ] );
-		qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i3 ] );
-		qglVertex3fv( tess.xyz[ i3 + tess.numVertexes ] );
-		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
-		qglEnd();
-	}
-#else
-	int		c, c2;
-	int		j, k;
-	int		i2;
-	int		c_edges, c_rejected;
-	int		hit[2];
-
-	// an edge is NOT a silhouette edge if its face doesn't face the light,
-	// or if it has a reverse paired edge that also faces the light.
-	// A well behaved polyhedron would have exactly two faces for each edge,
-	// but lots of models have dangling edges or overfanned edges
-	c_edges = 0;
-	c_rejected = 0;
-
-	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		c = numEdgeDefs[ i ];
-		for ( j = 0 ; j < c ; j++ ) {
-			if ( !edgeDefs[ i ][ j ].facing ) {
-				continue;
-			}
-
-			hit[0] = 0;
-			hit[1] = 0;
-
-			i2 = edgeDefs[ i ][ j ].i2;
-			c2 = numEdgeDefs[ i2 ];
-			for ( k = 0 ; k < c2 ; k++ ) {
-				if ( edgeDefs[ i2 ][ k ].i2 == i ) {
-					hit[ edgeDefs[ i2 ][ k ].facing ]++;
-				}
-			}
-
-			// if it doesn't share the edge with another front facing
-			// triangle, it is a sil edge
-			if ( hit[ 1 ] == 0 ) {
-				qglBegin( GL_TRIANGLE_STRIP );
-				qglVertex3fv( tess.xyz[ i ] );
-				qglVertex3fv( tess.xyz[ i + tess.numVertexes ] );
-				qglVertex3fv( tess.xyz[ i2 ] );
-				qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
-				qglEnd();
-				c_edges++;
-			} else {
-				c_rejected++;
-			}
-		}
-	}
-#endif
-}
-
-void R_AddEdgeDef(int i1, int i2, int facing) {
-	int		c;
-
-	c = numEdgeDefs[i1];
-	if (c == MAX_EDGE_DEFS) {
-		return;		// overflow
-	}
-	edgeDefs[i1][c].i2 = i2;
-	edgeDefs[i1][c].facing = facing;
-
-	numEdgeDefs[i1]++;
-}
-
-/*
-=================
-RB_ShadowTessEnd
-
-triangleFromEdge[ v1 ][ v2 ]
-
-
-  set triangle from edge( v1, v2, tri )
-  if ( facing[ triangleFromEdge[ v1 ][ v2 ] ] && !facing[ triangleFromEdge[ v2 ][ v1 ] ) {
-  }
-=================
-*/
-void RB_ShadowTessEnd( void ) {
-	int		i;
-	int		numTris;
-	vec3_t	lightDir;
-
-	// we can only do this if we have enough space in the vertex buffers
-	if ( tess.numVertexes >= SHADER_MAX_VERTEXES / 2 ) {
-		return;
-	}
-
-	if ( glConfig.stencilBits < 4 ) {
-		return;
-	}
-
-	VectorCopy( backEnd.currentEntity->lightDir, lightDir );
-
-	// project vertexes away from light direction
-	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		VectorMA( tess.xyz[i], -512, lightDir, tess.xyz[i+tess.numVertexes] );
-	}
-
-	// decide which triangles face the light
-	Com_Memset( numEdgeDefs, 0, 4 * tess.numVertexes );
-
-	numTris = tess.numIndexes / 3;
-	for ( i = 0 ; i < numTris ; i++ ) {
-		int		i1, i2, i3;
-		vec3_t	d1, d2, normal;
-		float	*v1, *v2, *v3;
-		float	d;
-
-		i1 = tess.indexes[ i*3 + 0 ];
-		i2 = tess.indexes[ i*3 + 1 ];
-		i3 = tess.indexes[ i*3 + 2 ];
-
-		v1 = tess.xyz[ i1 ];
-		v2 = tess.xyz[ i2 ];
-		v3 = tess.xyz[ i3 ];
-
-		VectorSubtract( v2, v1, d1 );
-		VectorSubtract( v3, v1, d2 );
-		CrossProduct( d1, d2, normal );
-
-		d = DotProduct( normal, lightDir );
-		if ( d > 0 ) {
-			facing[ i ] = 1;
-		} else {
-			facing[ i ] = 0;
-		}
-
-		// create the edges
-		R_AddEdgeDef( i1, i2, facing[ i ] );
-		R_AddEdgeDef( i2, i3, facing[ i ] );
-		R_AddEdgeDef( i3, i1, facing[ i ] );
-	}
-
-	// draw the silhouette edges
-
-	GL_Bind( tr.whiteImage );
-	qglEnable( GL_CULL_FACE );
-	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
-	qglColor3f( 0.2f, 0.2f, 0.2f );
-
-	// don't write to the color buffer
-	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
-
-	qglEnable( GL_STENCIL_TEST );
-	qglStencilFunc( GL_ALWAYS, 1, 255 );
-
-	// mirrors have the culling order reversed
-	if ( backEnd.viewParms.isMirror ) {
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	} else {
-		qglCullFace( GL_BACK );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
-
-		R_RenderShadowEdges();
-
-		qglCullFace( GL_FRONT );
-		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
-
-		R_RenderShadowEdges();
-	}
-
-
-	// reenable writing to the color buffer
-	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
-}
-
-void RB_ComputeShadowVolume() {
-	// FIXME: unimplemented
-}
-
-/*
-=================
-RB_ShadowFinish
-
-Darken everything that is is a shadow volume.
-We have to delay this until everything has been shadowed,
-because otherwise shadows from different body parts would
-overlap and double darken.
-=================
-*/
-void RB_ShadowFinish( void ) {
-	if ( r_shadows->integer != 2 ) {
-		return;
-	}
-	if ( glConfig.stencilBits < 4 ) {
-		return;
-	}
-	qglEnable( GL_STENCIL_TEST );
-	qglStencilFunc( GL_NOTEQUAL, 0, 255 );
-
-	qglDisable (GL_CLIP_PLANE0);
-	qglDisable (GL_CULL_FACE);
-
-	GL_Bind( tr.whiteImage );
-
-    qglLoadIdentity ();
-
-	qglColor3f( 0.6f, 0.6f, 0.6f );
-	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO );
-
-//	qglColor3f( 1, 0, 0 );
-//	GL_State( GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
-
-	qglBegin( GL_QUADS );
-	qglVertex3f( -100, 100, -10 );
-	qglVertex3f( 100, 100, -10 );
-	qglVertex3f( 100, -100, -10 );
-	qglVertex3f( -100, -100, -10 );
-	qglEnd ();
-
-	qglColor4f(1,1,1,1);
-	qglDisable( GL_STENCIL_TEST );
-}
diff --git a/code/renderer/tr_sky.c b/code/renderer/tr_sky.c
deleted file mode 100644
index 4fb93466..00000000
--- a/code/renderer/tr_sky.c
+++ /dev/null
@@ -1,845 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_sky.c
-#include "tr_local.h"
-
-#define SKY_SUBDIVISIONS		8
-#define HALF_SKY_SUBDIVISIONS	(SKY_SUBDIVISIONS/2)
-
-static float s_cloudTexCoords[6][SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1][2];
-static float s_cloudTexP[6][SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1];
-
-/*
-===================================================================================
-
-POLYGON TO BOX SIDE PROJECTION
-
-===================================================================================
-*/
-
-static vec3_t sky_clip[6] = 
-{
-	{1,1,0},
-	{1,-1,0},
-	{0,-1,1},
-	{0,1,1},
-	{1,0,1},
-	{-1,0,1} 
-};
-
-static float	sky_mins[2][6], sky_maxs[2][6];
-static float	sky_min, sky_max;
-
-/*
-================
-AddSkyPolygon
-================
-*/
-static void AddSkyPolygon (int nump, vec3_t vecs) 
-{
-	int		i,j;
-	vec3_t	v, av;
-	float	s, t, dv;
-	int		axis;
-	float	*vp;
-	// s = [0]/[2], t = [1]/[2]
-	static int	vec_to_st[6][3] =
-	{
-		{-2,3,1},
-		{2,3,-1},
-
-		{1,3,2},
-		{-1,3,-2},
-
-		{-2,-1,3},
-		{-2,1,-3}
-
-	//	{-1,2,3},
-	//	{1,2,-3}
-	};
-
-	// decide which face it maps to
-	VectorCopy (vec3_origin, v);
-	for (i=0, vp=vecs ; i<nump ; i++, vp+=3)
-	{
-		VectorAdd (vp, v, v);
-	}
-	av[0] = fabs(v[0]);
-	av[1] = fabs(v[1]);
-	av[2] = fabs(v[2]);
-	if (av[0] > av[1] && av[0] > av[2])
-	{
-		if (v[0] < 0)
-			axis = 1;
-		else
-			axis = 0;
-	}
-	else if (av[1] > av[2] && av[1] > av[0])
-	{
-		if (v[1] < 0)
-			axis = 3;
-		else
-			axis = 2;
-	}
-	else
-	{
-		if (v[2] < 0)
-			axis = 5;
-		else
-			axis = 4;
-	}
-
-	// project new texture coords
-	for (i=0 ; i<nump ; i++, vecs+=3)
-	{
-		j = vec_to_st[axis][2];
-		if (j > 0)
-			dv = vecs[j - 1];
-		else
-			dv = -vecs[-j - 1];
-		if (dv < 0.001)
-			continue;	// don't divide by zero
-		j = vec_to_st[axis][0];
-		if (j < 0)
-			s = -vecs[-j -1] / dv;
-		else
-			s = vecs[j-1] / dv;
-		j = vec_to_st[axis][1];
-		if (j < 0)
-			t = -vecs[-j -1] / dv;
-		else
-			t = vecs[j-1] / dv;
-
-		if (s < sky_mins[0][axis])
-			sky_mins[0][axis] = s;
-		if (t < sky_mins[1][axis])
-			sky_mins[1][axis] = t;
-		if (s > sky_maxs[0][axis])
-			sky_maxs[0][axis] = s;
-		if (t > sky_maxs[1][axis])
-			sky_maxs[1][axis] = t;
-	}
-}
-
-#define	ON_EPSILON		0.1f			// point on plane side epsilon
-#define	MAX_CLIP_VERTS	64
-/*
-================
-ClipSkyPolygon
-================
-*/
-static void ClipSkyPolygon (int nump, vec3_t vecs, int stage) 
-{
-	float	*norm;
-	float	*v;
-	qboolean	front, back;
-	float	d, e;
-	float	dists[MAX_CLIP_VERTS];
-	int		sides[MAX_CLIP_VERTS];
-	vec3_t	newv[2][MAX_CLIP_VERTS];
-	int		newc[2];
-	int		i, j;
-
-	if (nump > MAX_CLIP_VERTS-2)
-		ri.Error (ERR_DROP, "ClipSkyPolygon: MAX_CLIP_VERTS");
-	if (stage == 6)
-	{	// fully clipped, so draw it
-		AddSkyPolygon (nump, vecs);
-		return;
-	}
-
-	front = back = qfalse;
-	norm = sky_clip[stage];
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		d = DotProduct (v, norm);
-		if (d > ON_EPSILON)
-		{
-			front = qtrue;
-			sides[i] = SIDE_FRONT;
-		}
-		else if (d < -ON_EPSILON)
-		{
-			back = qtrue;
-			sides[i] = SIDE_BACK;
-		}
-		else
-			sides[i] = SIDE_ON;
-		dists[i] = d;
-	}
-
-	if (!front || !back)
-	{	// not clipped
-		ClipSkyPolygon (nump, vecs, stage+1);
-		return;
-	}
-
-	// clip it
-	sides[i] = sides[0];
-	dists[i] = dists[0];
-	VectorCopy (vecs, (vecs+(i*3)) );
-	newc[0] = newc[1] = 0;
-
-	for (i=0, v = vecs ; i<nump ; i++, v+=3)
-	{
-		switch (sides[i])
-		{
-		case SIDE_FRONT:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			break;
-		case SIDE_BACK:
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		case SIDE_ON:
-			VectorCopy (v, newv[0][newc[0]]);
-			newc[0]++;
-			VectorCopy (v, newv[1][newc[1]]);
-			newc[1]++;
-			break;
-		}
-
-		if (sides[i] == SIDE_ON || sides[i+1] == SIDE_ON || sides[i+1] == sides[i])
-			continue;
-
-		d = dists[i] / (dists[i] - dists[i+1]);
-		for (j=0 ; j<3 ; j++)
-		{
-			e = v[j] + d*(v[j+3] - v[j]);
-			newv[0][newc[0]][j] = e;
-			newv[1][newc[1]][j] = e;
-		}
-		newc[0]++;
-		newc[1]++;
-	}
-
-	// continue
-	ClipSkyPolygon (newc[0], newv[0][0], stage+1);
-	ClipSkyPolygon (newc[1], newv[1][0], stage+1);
-}
-
-/*
-==============
-ClearSkyBox
-==============
-*/
-static void ClearSkyBox (void) {
-	int		i;
-
-	for (i=0 ; i<6 ; i++) {
-		sky_mins[0][i] = sky_mins[1][i] = 9999;
-		sky_maxs[0][i] = sky_maxs[1][i] = -9999;
-	}
-}
-
-/*
-================
-RB_ClipSkyPolygons
-================
-*/
-void RB_ClipSkyPolygons( shaderCommands_t *input )
-{
-	vec3_t		p[5];	// need one extra point for clipping
-	int			i, j;
-
-	ClearSkyBox();
-
-	for ( i = 0; i < input->numIndexes; i += 3 )
-	{
-		for (j = 0 ; j < 3 ; j++) 
-		{
-			VectorSubtract( input->xyz[input->indexes[i+j]],
-							backEnd.viewParms.ori.origin, 
-							p[j] );
-		}
-		ClipSkyPolygon( 3, p[0], 0 );
-	}
-}
-
-/*
-===================================================================================
-
-CLOUD VERTEX GENERATION
-
-===================================================================================
-*/
-
-/*
-** MakeSkyVec
-**
-** Parms: s, t range from -1 to 1
-*/
-static void MakeSkyVec( float s, float t, int axis, float outSt[2], vec3_t outXYZ )
-{
-	// 1 = s, 2 = t, 3 = 2048
-	static int	st_to_vec[6][3] =
-	{
-		{3,-1,2},
-		{-3,1,2},
-
-		{1,3,2},
-		{-1,-3,2},
-
-		{-2,-1,3},		// 0 degrees yaw, look straight up
-		{2,-1,-3}		// look straight down
-	};
-
-	vec3_t		b;
-	int			j, k;
-	float	boxSize;
-
-	boxSize = backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	b[0] = s*boxSize;
-	b[1] = t*boxSize;
-	b[2] = boxSize;
-
-	for (j=0 ; j<3 ; j++)
-	{
-		k = st_to_vec[axis][j];
-		if (k < 0)
-		{
-			outXYZ[j] = -b[-k - 1];
-		}
-		else
-		{
-			outXYZ[j] = b[k - 1];
-		}
-	}
-
-	// avoid bilerp seam
-	s = (s+1)*0.5;
-	t = (t+1)*0.5;
-	if (s < sky_min)
-	{
-		s = sky_min;
-	}
-	else if (s > sky_max)
-	{
-		s = sky_max;
-	}
-
-	if (t < sky_min)
-	{
-		t = sky_min;
-	}
-	else if (t > sky_max)
-	{
-		t = sky_max;
-	}
-
-	t = 1.0 - t;
-
-
-	if ( outSt )
-	{
-		outSt[0] = s;
-		outSt[1] = t;
-	}
-}
-
-static int	sky_texorder[6] = {0,2,1,3,4,5};
-static vec3_t	s_skyPoints[SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1];
-static float	s_skyTexCoords[SKY_SUBDIVISIONS+1][SKY_SUBDIVISIONS+1][2];
-
-static void DrawSkySide( struct image_s *image, const int mins[2], const int maxs[2] )
-{
-	int s, t;
-
-	GL_Bind( image );
-
-	for ( t = mins[1]+HALF_SKY_SUBDIVISIONS; t < maxs[1]+HALF_SKY_SUBDIVISIONS; t++ )
-	{
-		qglBegin( GL_TRIANGLE_STRIP );
-
-		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
-		{
-			qglTexCoord2fv( s_skyTexCoords[t][s] );
-			qglVertex3fv( s_skyPoints[t][s] );
-
-			qglTexCoord2fv( s_skyTexCoords[t+1][s] );
-			qglVertex3fv( s_skyPoints[t+1][s] );
-		}
-
-		qglEnd();
-	}
-}
-
-static void DrawSkyBox( shader_t *shader )
-{
-	int		i;
-
-	sky_min = 0;
-	sky_max = 1;
-
-	Com_Memset( s_skyTexCoords, 0, sizeof( s_skyTexCoords ) );
-
-	for (i=0 ; i<6 ; i++)
-	{
-		int sky_mins_subd[2], sky_maxs_subd[2];
-		int s, t;
-
-		sky_mins[0][i] = floor( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_mins[1][i] = floor( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[0][i] = ceil( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[1][i] = ceil( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-
-		if ( ( sky_mins[0][i] >= sky_maxs[0][i] ) ||
-			 ( sky_mins[1][i] >= sky_maxs[1][i] ) )
-		{
-			continue;
-		}
-
-		sky_mins_subd[0] = sky_mins[0][i] * HALF_SKY_SUBDIVISIONS;
-		sky_mins_subd[1] = sky_mins[1][i] * HALF_SKY_SUBDIVISIONS;
-		sky_maxs_subd[0] = sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS;
-		sky_maxs_subd[1] = sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_mins_subd[1] < -HALF_SKY_SUBDIVISIONS )
-			sky_mins_subd[1] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_maxs_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_maxs_subd[1] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		//
-		// iterate through the subdivisions
-		//
-		for ( t = sky_mins_subd[1]+HALF_SKY_SUBDIVISIONS; t <= sky_maxs_subd[1]+HALF_SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = sky_mins_subd[0]+HALF_SKY_SUBDIVISIONS; s <= sky_maxs_subd[0]+HALF_SKY_SUBDIVISIONS; s++ )
-			{
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							s_skyTexCoords[t][s], 
-							s_skyPoints[t][s] );
-			}
-		}
-
-		DrawSkySide( shader->sky.outerbox[sky_texorder[i]],
-			         sky_mins_subd,
-					 sky_maxs_subd );
-	}
-
-}
-
-static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean addIndexes )
-{
-	int s, t;
-	int vertexStart = tess.numVertexes;
-	int tHeight, sWidth;
-
-	tHeight = maxs[1] - mins[1] + 1;
-	sWidth = maxs[0] - mins[0] + 1;
-
-	for ( t = mins[1]+HALF_SKY_SUBDIVISIONS; t <= maxs[1]+HALF_SKY_SUBDIVISIONS; t++ )
-	{
-		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
-		{
-			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.ori.origin, tess.xyz[tess.numVertexes] );
-			tess.texCoords[tess.numVertexes][0][0] = s_skyTexCoords[t][s][0];
-			tess.texCoords[tess.numVertexes][0][1] = s_skyTexCoords[t][s][1];
-
-			tess.numVertexes++;
-
-			if ( tess.numVertexes >= SHADER_MAX_VERTEXES )
-			{
-				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()\n" );
-			}
-		}
-	}
-
-	// only add indexes for one pass, otherwise it would draw multiple times for each pass
-	if ( addIndexes ) {
-		for ( t = 0; t < tHeight-1; t++ )
-		{	
-			for ( s = 0; s < sWidth-1; s++ )
-			{
-				tess.indexes[tess.numIndexes] = vertexStart + s + t * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + t * ( sWidth );
-				tess.numIndexes++;
-
-				tess.indexes[tess.numIndexes] = vertexStart + s + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + ( t + 1 ) * ( sWidth );
-				tess.numIndexes++;
-				tess.indexes[tess.numIndexes] = vertexStart + s + 1 + t * ( sWidth );
-				tess.numIndexes++;
-			}
-		}
-	}
-}
-
-static void FillCloudBox( const shader_t *shader, int stage )
-{
-	int i;
-
-	for ( i =0; i < 6; i++ )
-	{
-		int sky_mins_subd[2], sky_maxs_subd[2];
-		int s, t;
-		float MIN_T;
-
-		if ( 1 ) // FIXME? shader->sky.fullClouds )
-		{
-			MIN_T = -HALF_SKY_SUBDIVISIONS;
-
-			// still don't want to draw the bottom, even if fullClouds
-			if ( i == 5 )
-				continue;
-		}
-		else
-		{
-			switch( i )
-			{
-			case 0:
-			case 1:
-			case 2:
-			case 3:
-				MIN_T = -1;
-				break;
-			case 5:
-				// don't draw clouds beneath you
-				continue;
-			case 4:		// top
-			default:
-				MIN_T = -HALF_SKY_SUBDIVISIONS;
-				break;
-			}
-		}
-
-		sky_mins[0][i] = floor( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_mins[1][i] = floor( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[0][i] = ceil( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-		sky_maxs[1][i] = ceil( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS ) / HALF_SKY_SUBDIVISIONS;
-
-		if ( ( sky_mins[0][i] >= sky_maxs[0][i] ) ||
-			 ( sky_mins[1][i] >= sky_maxs[1][i] ) )
-		{
-			continue;
-		}
-
-		sky_mins_subd[0] = myftol( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS );
-		sky_mins_subd[1] = myftol( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS );
-		sky_maxs_subd[0] = myftol( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS );
-		sky_maxs_subd[1] = myftol( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS );
-
-		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_mins_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_mins_subd[1] < MIN_T )
-			sky_mins_subd[1] = MIN_T;
-		else if ( sky_mins_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_mins_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		if ( sky_maxs_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = -HALF_SKY_SUBDIVISIONS;
-		else if ( sky_maxs_subd[0] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[0] = HALF_SKY_SUBDIVISIONS;
-		if ( sky_maxs_subd[1] < MIN_T )
-			sky_maxs_subd[1] = MIN_T;
-		else if ( sky_maxs_subd[1] > HALF_SKY_SUBDIVISIONS ) 
-			sky_maxs_subd[1] = HALF_SKY_SUBDIVISIONS;
-
-		//
-		// iterate through the subdivisions
-		//
-		for ( t = sky_mins_subd[1]+HALF_SKY_SUBDIVISIONS; t <= sky_maxs_subd[1]+HALF_SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = sky_mins_subd[0]+HALF_SKY_SUBDIVISIONS; s <= sky_maxs_subd[0]+HALF_SKY_SUBDIVISIONS; s++ )
-			{
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							NULL,
-							s_skyPoints[t][s] );
-
-				s_skyTexCoords[t][s][0] = s_cloudTexCoords[i][t][s][0];
-				s_skyTexCoords[t][s][1] = s_cloudTexCoords[i][t][s][1];
-			}
-		}
-
-		// only add indexes for first stage
-		FillCloudySkySide( sky_mins_subd, sky_maxs_subd, ( stage == 0 ) );
-	}
-}
-
-/*
-** R_BuildCloudData
-*/
-void R_BuildCloudData( shaderCommands_t *input )
-{
-	int			i;
-	shader_t	*shader;
-
-	shader = input->shader;
-
-	assert( shader->isSky );
-
-	sky_min = 1.0 / 256.0f;		// FIXME: not correct?
-	sky_max = 255.0 / 256.0f;
-
-	// set up for drawing
-	tess.numIndexes = 0;
-	tess.numVertexes = 0;
-
-	if ( input->shader->sky.cloudHeight )
-	{
-		for ( i = 0; i < MAX_SHADER_STAGES; i++ )
-		{
-			if ( !tess.xstages[i] ) {
-				break;
-			}
-			FillCloudBox( input->shader, i );
-		}
-	}
-}
-
-/*
-** R_InitSkyTexCoords
-** Called when a sky shader is parsed
-*/
-#define SQR( a ) ((a)*(a))
-void R_InitSkyTexCoords( float heightCloud )
-{
-	int i, s, t;
-	float radiusWorld = 4096;
-	float p;
-	float sRad, tRad;
-	vec3_t skyVec;
-	vec3_t v;
-
-	// init zfar so MakeSkyVec works even though
-	// a world hasn't been bounded
-	backEnd.viewParms.zFar = 1024;
-
-	for ( i = 0; i < 6; i++ )
-	{
-		for ( t = 0; t <= SKY_SUBDIVISIONS; t++ )
-		{
-			for ( s = 0; s <= SKY_SUBDIVISIONS; s++ )
-			{
-				// compute vector from view origin to sky side integral point
-				MakeSkyVec( ( s - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							( t - HALF_SKY_SUBDIVISIONS ) / ( float ) HALF_SKY_SUBDIVISIONS, 
-							i, 
-							NULL,
-							skyVec );
-
-				// compute parametric value 'p' that intersects with cloud layer
-				p = ( 1.0f / ( 2 * DotProduct( skyVec, skyVec ) ) ) *
-					( -2 * skyVec[2] * radiusWorld + 
-					   2 * sqrt( SQR( skyVec[2] ) * SQR( radiusWorld ) + 
-					             2 * SQR( skyVec[0] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[0] ) * SQR( heightCloud ) + 
-								 2 * SQR( skyVec[1] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[1] ) * SQR( heightCloud ) + 
-								 2 * SQR( skyVec[2] ) * radiusWorld * heightCloud +
-								 SQR( skyVec[2] ) * SQR( heightCloud ) ) );
-
-				s_cloudTexP[i][t][s] = p;
-
-				// compute intersection point based on p
-				VectorScale( skyVec, p, v );
-				v[2] += radiusWorld;
-
-				// compute vector from world origin to intersection point 'v'
-				VectorNormalize( v );
-
-				sRad = Q_acos( v[0] );
-				tRad = Q_acos( v[1] );
-
-				s_cloudTexCoords[i][t][s][0] = sRad;
-				s_cloudTexCoords[i][t][s][1] = tRad;
-			}
-		}
-	}
-}
-
-//======================================================================================
-
-/*
-** RB_DrawSun
-*/
-void RB_DrawSun( void ) {
-	float		size;
-	float		dist;
-	vec3_t		origin, vec1, vec2;
-	vec3_t		temp;
-
-	if ( !backEnd.skyRenderedThisView ) {
-		return;
-	}
-	if ( !r_drawSun->integer ) {
-		return;
-	}
-	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
-
-	dist = 	backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	size = dist * 0.4;
-
-	VectorScale( tr.sunDirection, dist, origin );
-	PerpendicularVector( vec1, tr.sunDirection );
-	CrossProduct( tr.sunDirection, vec1, vec2 );
-
-	VectorScale( vec1, size, vec1 );
-	VectorScale( vec2, size, vec2 );
-
-	// farthest depth range
-	qglDepthRange( 1.0, 1.0 );
-
-	// FIXME: use quad stamp
-	RB_BeginSurface( tr.sunShader );
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorSubtract( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 0;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorAdd( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 1;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		VectorCopy( origin, temp );
-		VectorSubtract( temp, vec1, temp );
-		VectorAdd( temp, vec2, temp );
-		VectorCopy( temp, tess.xyz[tess.numVertexes] );
-		tess.texCoords[tess.numVertexes][0][0] = 1;
-		tess.texCoords[tess.numVertexes][0][1] = 0;
-		tess.vertexColors[tess.numVertexes][0] = 255;
-		tess.vertexColors[tess.numVertexes][1] = 255;
-		tess.vertexColors[tess.numVertexes][2] = 255;
-		tess.numVertexes++;
-
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 1;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 0;
-		tess.indexes[tess.numIndexes++] = 2;
-		tess.indexes[tess.numIndexes++] = 3;
-
-	RB_EndSurface();
-
-	// back to normal depth range
-	qglDepthRange( 0.0, 1.0 );
-}
-
-
-
-
-/*
-================
-RB_StageIteratorSky
-
-All of the visible sky triangles are in tess
-
-Other things could be stuck in here, like birds in the sky, etc
-================
-*/
-void RB_StageIteratorSky( void ) {
-	if ( r_fastsky->integer ) {
-		return;
-	}
-
-	// go through all the polygons and project them onto
-	// the sky box to see which blocks on each side need
-	// to be drawn
-	RB_ClipSkyPolygons( &tess );
-
-	// r_showsky will let all the sky blocks be drawn in
-	// front of everything to allow developers to see how
-	// much sky is getting sucked in
-	if ( r_showsky->integer ) {
-		qglDepthRange( 0.0, 0.0 );
-	} else {
-		qglDepthRange( 1.875, 1.875 );
-	}
-
-	// draw the outer skybox
-	if ( tess.shader->sky.outerbox[0] && tess.shader->sky.outerbox[0] != tr.defaultImage ) {
-		qglColor3f( tr.identityLight, tr.identityLight, tr.identityLight );
-		
-		qglPushMatrix ();
-		GL_State( 0 );
-		qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
-
-		DrawSkyBox( tess.shader );
-
-		qglPopMatrix();
-	}
-
-	// generate the vertexes for all the clouds, which will be drawn
-	// by the generic shader routine
-	R_BuildCloudData( &tess );
-
-	RB_StageIteratorGeneric();
-
-	// draw the inner skybox
-
-
-	// back to normal depth range
-	qglDepthRange( 0.0, 1.0 );
-
-	// note that sky was drawn so we will draw a sun later
-	backEnd.skyRenderedThisView = qtrue;
-}
-
diff --git a/code/renderer/tr_sky_portal.cpp b/code/renderer/tr_sky_portal.cpp
deleted file mode 100644
index f66e0e39..00000000
--- a/code/renderer/tr_sky_portal.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_sky_portal.cpp: sky portal
-
-#include "tr_local.h"
-
-void R_Sky_Init()
-{
-	tr.portalsky.inUse = qfalse;
-	tr.portalsky.numSurfs = 0;
-}
-
-void R_Sky_Reset()
-{
-    if (tr.portalsky.inUse) {
-        return;
-    }
-
-	tr.portalsky.mins[0] = 8192.0;
-	tr.portalsky.mins[1] = 8192.0;
-	tr.portalsky.mins[2] = 8192.0;
-	tr.portalsky.maxs[0] = -8192.0;
-	tr.portalsky.maxs[1] = -8192.0;
-	tr.portalsky.maxs[2] = -8192.0;
-	tr.portalsky.cntNode = 0;
-	tr.portalsky.numSurfs = 0;
-}
-
-void R_Sky_AddSurf(msurface_t* surf)
-{
-	if (tr.portalsky.inUse)
-	{
-		static int last_sky_warning = 0;
-
-		if (tr.refdef.time - 1000 > last_sky_warning)
-		{
-			ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
-			last_sky_warning = tr.refdef.time;
-		}
-
-		return;
-	}
-
-	if (tr.portalsky.numSurfs < 32) {
-		tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
-	}
-
-	if (tr.portalsky.cntNode)
-	{
-		int i;
-
-		for (i = 0; i < 3; i++) {
-			if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
-				tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
-			}
-
-			if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
-				tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
-			}
-		}
-	}
-}
-
-void R_Sky_Render() {
-    int i;
-    viewParms_t newParms, oldParms;
-    mnode_t* leaf;
-
-    if (!tr.portalsky.numSurfs) {
-        return;
-    }
-
-    if (!tr.refdef.sky_portal) {
-        return;
-    }
-
-    if (tr.skyRendered) {
-        // already rendered
-        return;
-    }
-
-	if (tr.portalsky.inUse)
-	{
-		ri.Printf(PRINT_WARNING, "WARNING: Recursive skies found!  Make that not happen!\n");
-		return;
-	}
-
-    for (i = 0; i < tr.portalsky.numSurfs; i++) {
-        if (!SurfIsOffscreen((const srfSurfaceFace_t*)tr.portalsky.skySurfs[i]->data, tr.portalsky.skySurfs[i]->shader, ENTITYNUM_WORLD)) {
-            break;
-        }
-    }
-
-    if (i == tr.portalsky.numSurfs) {
-        return;
-    }
-
-    tr.skyRendered = qtrue;
-    oldParms = tr.viewParms;
-    newParms = tr.viewParms;
-
-	if (r_skyportal->integer)
-	{
-		if (sscanf(r_skyportal_origin->string, "%f %f %f", &newParms.ori.origin[0], &newParms.ori.origin[1], &newParms.ori.origin[2]) != 3)
-		{
-			ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
-			return;
-		}
-	}
-	else
-	{
-        VectorCopy(tr.refdef.sky_origin, newParms.ori.origin);
-		MatrixMultiply(newParms.ori.axis, tr.refdef.sky_axis, newParms.ori.axis);
-	}
-
-    tr.portalsky.inUse = qtrue;
-    VectorCopy(newParms.ori.origin, newParms.pvsOrigin);
-
-    leaf = R_PointInLeaf(newParms.pvsOrigin);
-    if (leaf) {
-        R_RenderView(&newParms);
-    }
-
-    tr.viewParms = oldParms;
-
-	tr.portalsky.inUse = qfalse;
-	tr.portalsky.numSurfs = 0;
-	R_RotateForViewer();
-	R_SetupFrustum();
-}
-
-void R_Sky_ChangeFrustum() {
-	// FIXME: unimplemented
-}
\ No newline at end of file
diff --git a/code/renderer/tr_sphere_shade.cpp b/code/renderer/tr_sphere_shade.cpp
deleted file mode 100644
index 4fcf5c45..00000000
--- a/code/renderer/tr_sphere_shade.cpp
+++ /dev/null
@@ -1,1430 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_sphere_shade.cpp -- sphere shade
-
-#include "tr_local.h"
-
-typedef struct gatheredLight_s {
-	spherel_t* pLight;
-	float fIntensity;
-    gatheredLight_s* pPrev;
-    gatheredLight_s* pNext;
-} gatheredLight_t;
-
-vec3_t spheredef[6];
-suninfo_t s_sun;
-static vec3_t ambientlight;
-static qboolean bEntityOverbright;
-static int iEntityLightingMax;
-static int light_reference_count = 0;
-
-const float one_half_root = 0.70710678118654752440084436210485f;
-const float one_third_root = 0.57735026918962576450914878050196f;
-
-static vec3_t offsets[26] =
-{
-	{ 1.0, 0.0, 0.0 },
-	{ -1.0, 0.0, 0.0 },
-	{ 0.0, 1.0, 0.0 },
-	{ 0.0, -1.0, 0.0 },
-	{ 0.0, 0.0, 1.0 },
-	{ 0.0, 0.0, -1.0 },
-	{ one_half_root, one_half_root, 0.0},
-	{ one_half_root, -one_half_root, 0.0 },
-	{ -one_half_root, one_half_root, 0.0 },
-	{ -one_half_root, -one_half_root, 0.0 },
-	{ one_half_root, 0.0, one_half_root },
-	{ one_half_root, 0.0, -one_half_root },
-	{ -one_half_root, 0.0, one_half_root },
-	{ -one_half_root, 0.0, -one_half_root },
-	{ 0.0, one_half_root, one_half_root },
-	{ 0.0, one_half_root, -one_half_root },
-	{ 0.0, -one_half_root, one_half_root },
-	{ 0.0, -one_half_root, -one_half_root },
-	{ one_third_root, one_third_root, one_third_root },
-	{ one_third_root, one_third_root, -one_third_root },
-	{ one_third_root, -one_third_root, one_third_root },
-	{ one_third_root, -one_third_root, -one_third_root },
-	{ -one_third_root, one_third_root, one_third_root },
-	{ -one_third_root, one_third_root, -one_third_root },
-	{ -one_third_root, -one_third_root, one_third_root },
-	{ -one_third_root, -one_third_root, -one_third_root }
-};
-
-int compare_light_intensities(const void* p1, const void* p2)
-{
-	return ((const reallightinfo_t*)p2)->fIntensity - ((const reallightinfo_t*)p1)->fIntensity;
-}
-
-static void RB_OptimizeLights()
-{
-	static int iCubeBuildInfo[24][9];
-	int i, j;
-	int nCubeMapLights;
-	float fMaxIntensity;
-	vec3_t cubecolor[256];
-	vec3_t colorout;
-	float(*cube)[3][4];
-	reallightinfo_t* pLight;
-
-	nCubeMapLights = 0;
-
-	if (backEnd.currentSphere->numRealLights > 2)
-	{
-		qsort(
-			backEnd.currentSphere->light,
-			backEnd.currentSphere->numRealLights,
-			sizeof(reallightinfo_t),
-			compare_light_intensities
-        );
-
-        for (i = 0; i < backEnd.currentSphere->numRealLights && i < r_entlight_maxcalc->integer; i++) {
-            pLight = &backEnd.currentSphere->light[i];
-
-            if (pLight->fIntensity < r_entlight_cubelevel->value
-                || pLight->fIntensity * r_entlight_cubefraction->value > pLight->fIntensity)
-            {
-				break;
-            }
-        }
-
-        nCubeMapLights = backEnd.currentSphere->numRealLights - i;
-		if (nCubeMapLights <= 1) {
-			nCubeMapLights = 0;
-		}
-	}
-
-	backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
-	if (backEnd.currentSphere->bUsesCubeMap)
-	{
-		for (i = 0; i < 26; i++) {
-			float fDot;
-			vec3_t v;
-
-			colorout[0] = backEnd.currentSphere->ambient.level[0];
-			colorout[1] = backEnd.currentSphere->ambient.level[1];
-			colorout[2] = backEnd.currentSphere->ambient.level[2];
-		
-			for (j = backEnd.currentSphere->numRealLights - nCubeMapLights; j < backEnd.currentSphere->numRealLights; j++) {
-				pLight = &backEnd.currentSphere->light[j];
-
-				switch (pLight->eType)
-				{
-                case LIGHT_SPOT:
-					{
-						fDot = DotProduct(pLight->vDirection, offsets[i]);
-                        if (fDot > 0) {
-                            float fProjSquared;
-                            float fDistSquared;
-
-							VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-							fProjSquared = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
-							fDistSquared = VectorLengthSquared(v);
-							fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
-							if (fMaxIntensity > 0) {
-								fDot /= fDistSquared;
-								if (fMaxIntensity < 1) {
-									fDot *= fMaxIntensity;
-								}
-
-								VectorMA(colorout, fDot, pLight->color, colorout);
-							}
-						}
-					}
-					break;
-				case LIGHT_SPOT_FAST:
-					fDot = DotProduct(pLight->vDirection, offsets[i]);
-                    if (fDot > 0) {
-                        float fDistSquared;
-
-						VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-                        fDistSquared = VectorLengthSquared(v);
-
-                        fDot /= fDistSquared;
-						VectorMA(colorout, fDot, pLight->color, colorout);
-					}
-					break;
-				case LIGHT_DIRECTIONAL:
-					fDot = DotProduct(pLight->vDirection, offsets[i]);
-					if (fDot > 0) {
-						VectorMA(colorout, fDot, pLight->color, colorout);
-					}
-					break;
-                case LIGHT_POINT:
-					VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-					fDot = DotProduct(v, offsets[i]);
-					if (fDot > 0) {
-						fDot /= VectorLengthSquared(v);
-						VectorMA(colorout, fDot, pLight->color, colorout);
-					}
-					break;
-				default:
-					assert(!"unhandled light type");
-					break;
-				}
-            }
-
-			cubecolor[i][0] = colorout[0];
-			if (cubecolor[i][0] > 255.f) {
-				cubecolor[i][0] = 255.f;
-            }
-
-            cubecolor[i][1] = colorout[1];
-            if (cubecolor[i][1] > 255.f) {
-                cubecolor[i][1] = 255.f;
-            }
-
-            cubecolor[i][2] = colorout[2];
-            if (cubecolor[i][2] > 255.f) {
-                cubecolor[i][2] = 255.f;
-            }
-		}
-
-		cube = backEnd.currentSphere->cubemap;
-
-		for (i = 0; i < 24; i++) {
-			for (j = 0; j < 3; j++) {
-				vec4_t f;
-
-                f[0] = cubecolor[iCubeBuildInfo[i][5]][j];
-                f[1] = cubecolor[iCubeBuildInfo[i][6]][j];
-				f[2] = cubecolor[iCubeBuildInfo[i][7]][j];
-				f[3] = cubecolor[iCubeBuildInfo[i][8]][j];
-
-                cube[i][j][0] = f[0];
-                cube[i][j][1] = (f[1] - f[0]) * iCubeBuildInfo[i][3];
-                cube[i][j][2] = (f[2] - f[0]) * iCubeBuildInfo[i][4];
-                cube[i][j][3] = (f[0] - f[1] - f[2] + f[3]) * iCubeBuildInfo[i][3] * iCubeBuildInfo[i][4];
-			}
-		}
-
-		backEnd.currentSphere->numRealLights -= nCubeMapLights;
-	}
-
-	for (i = 0; i < backEnd.currentSphere->numRealLights; i++) {
-		float fDistParallel;
-		float fDistPerp;
-		float fDistSquared;
-		float fRadiusSquared;
-		float fSlope;
-		vec3_t v;
-
-		pLight = &backEnd.currentSphere->light[i];
-
-		switch (pLight->eType)
-		{
-		case LIGHT_SPOT:
-			VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
-			fDistSquared = VectorLengthSquared(v);
-			fSlope = DotProduct(v, pLight->vDirection);
-			fDistPerp = sqrt(fDistSquared - fSlope * fSlope);
-			fRadiusSquared = backEnd.currentSphere->radius * backEnd.currentSphere->radius;
-			fDistParallel = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
-			if (fDistParallel * fDistParallel >= fRadiusSquared + pLight->fSpotSlope * 0.9f * (pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
-				pLight->eType = LIGHT_SPOT_FAST;
-			}
-			break;
-		case LIGHT_POINT:
-			if ((pLight->fDist - backEnd.currentSphere->radius) * r_entlight_errbound->value * pLight->fDist > backEnd.currentSphere->radius * pLight->fIntensity) {
-				pLight->color[0] *= 1.f / pLight->fDist;
-				pLight->color[1] *= 1.f / pLight->fDist;
-				pLight->color[2] *= 1.f / pLight->fDist;
-				pLight->eType = LIGHT_DIRECTIONAL;
-				VectorNormalize2(pLight->vOrigin, pLight->vDirection);
-			}
-			break;
-		}
-	}
-}
-
-static void RB_Light_CubeMap(unsigned char* colors)
-{
-	int i, j;
-    float* normal;
-    float* xyz;
-	unsigned char* color;
-	vec3_t colorout;
-	reallightinfo_t* pLight;
-
-	color = colors;
-    normal = (float*)tess.normal;
-    xyz = (float*)tess.xyz;
-
-    for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-		unsigned int components[3];
-
-		if (normal[1] == -1) {
-			components[0] = 1;
-			components[1] = 0;
-			components[2] = 2;
-        } else if (normal[1] == 1 && !normal[0] && !normal[2]) {
-			components[0] = 1;
-			components[1] = 0;
-			components[2] = 2;
-		} else if (Q_fabs(normal[0]) >= Q_fabs(normal[2])) {
-			components[0] = 0;
-			components[1] = 1;
-			components[2] = 2;
-		} else {
-			components[0] = 2;
-			components[1] = 1;
-			components[2] = 0;
-		}
-
-		unsigned int cubeIndex = (normal[2] < 0 ? 1 : 0) | (normal[1] < 0 ? 2 : 0) | (normal[0] < 0 ? 4 : 0) | (components[0] << 3);
-		float newnorms[3];
-		float mapping[3];
-		float (*cube)[3][4];
-
-		newnorms[0] = normal[components[0]];
-		newnorms[1] = normal[components[1]];
-		newnorms[2] = normal[components[2]];
-
-		mapping[0] = 1.f / newnorms[0] * newnorms[1];
-		mapping[1] = 1.f / newnorms[0] * newnorms[2];
-        mapping[2] = mapping[0] * mapping[1];
-
-		cube = &backEnd.currentSphere->cubemap[cubeIndex];
-        colorout[0] = (*cube)[0][0] + (*cube)[0][1] * mapping[1] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
-		colorout[1] = (*cube)[1][0] + (*cube)[1][1] * mapping[1] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
-		colorout[2] = (*cube)[2][0] + (*cube)[2][1] * mapping[1] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
-
-		for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
-            float fDistSquared;
-            float fProjSquared;
-            float fMaxIntensity;
-			float fDot;
-			vec3_t v;
-
-            pLight = &backEnd.currentSphere->light[j];
-
-            switch (pLight->eType)
-            {
-            case LIGHT_DIRECTIONAL:
-                fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-                    VectorMA(colorout, fDot, pLight->color, colorout);
-                }
-                break;
-            case LIGHT_SPOT:
-                fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-                    VectorSubtract(pLight->vOrigin, xyz, v);
-
-                    fProjSquared = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
-                    fDistSquared = VectorLengthSquared(v);
-                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
-                    if (fMaxIntensity > 0) {
-                        fDot /= fDistSquared;
-                        if (fMaxIntensity < 1) {
-                            fDot *= fMaxIntensity;
-                        }
-
-                        VectorMA(colorout, fDot, pLight->color, colorout);
-                    }
-                }
-                break;
-            case LIGHT_SPOT_FAST:
-                fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-                    VectorSubtract(pLight->vOrigin, xyz, v);
-                    fDistSquared = VectorLengthSquared(v);
-                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
-                }
-                break;
-            case LIGHT_POINT:
-                VectorSubtract(pLight->vOrigin, xyz, v);
-                fDot = DotProduct(v, normal);
-                if (fDot > 0) {
-                    fDistSquared = VectorLengthSquared(v);
-                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
-                }
-                break;
-            }
-		}
-
-		color[0] = Q_clamp_int(colorout[0], 0, 255);
-		color[1] = Q_clamp_int(colorout[1], 0, 255);
-		color[2] = Q_clamp_int(colorout[2], 0, 255);
-	}
-}
-
-void RB_Light_Real(unsigned char* colors)
-{
-	int i, j;
-	float* normal;
-	float* xyz;
-	unsigned char* color;
-	vec3_t v;
-	vec3_t colorout;
-	float fDot;
-	reallightinfo_t* pLight;
-
-	color = colors;
-    if (backEnd.currentSphere->bUsesCubeMap) {
-        RB_Light_CubeMap(colors);
-        return;
-    }
-
-	if (!backEnd.currentSphere->numRealLights) {
-		for (i = 0; i < tess.numVertexes; i++, color += 4) {
-            color[0] = backEnd.currentSphere->ambient.level[0];
-            color[1] = backEnd.currentSphere->ambient.level[1];
-            color[2] = backEnd.currentSphere->ambient.level[2];
-            color[3] = backEnd.currentSphere->ambient.level[3];
-		}
-		return;
-	}
-
-	if (backEnd.currentSphere->numRealLights != 1) {
-		normal = (float*)tess.normal;
-		xyz = (float*)tess.xyz;
-
-		for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-			colorout[0] = colorout[1] = colorout[2] = 0;
-			
-			for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
-				float fDistSquared;
-				float fProjSquared;
-				float fMaxIntensity;
-
-				pLight = &backEnd.currentSphere->light[j];
-				
-				switch (pLight->eType)
-				{
-				case LIGHT_DIRECTIONAL:
-					fDot = DotProduct(pLight->vDirection, normal);
-					if (fDot > 0) {
-						VectorMA(colorout, fDot, pLight->color, colorout);
-					}
-                    break;
-                case LIGHT_SPOT:
-                    fDot = DotProduct(pLight->vDirection, normal);
-                    if (fDot > 0) {
-                        VectorSubtract(pLight->vOrigin, xyz, v);
-
-                        fProjSquared = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
-                        fDistSquared = VectorLengthSquared(v);
-                        fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
-                        if (fMaxIntensity > 0) {
-                            fDot /= fDistSquared;
-                            if (fMaxIntensity < 1) {
-                                fDot *= fMaxIntensity;
-                            }
-
-                            VectorMA(colorout, fDot, pLight->color, colorout);
-                        }
-                    }
-                    break;
-                case LIGHT_SPOT_FAST:
-					fDot = DotProduct(pLight->vDirection, normal);
-                    if (fDot > 0) {
-                        VectorSubtract(pLight->vOrigin, xyz, v);
-                        fDistSquared = VectorLengthSquared(v);
-						VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
-					}
-                    break;
-                case LIGHT_POINT:
-					VectorSubtract(pLight->vOrigin, xyz, v);
-					fDot = DotProduct(v, normal);
-					if (fDot > 0) {
-						fDistSquared = VectorLengthSquared(v);
-						VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
-					}
-                    break;
-				}
-			}
-
-			color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
-			color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
-			color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
-			color[3] = 0xff;
-		}
-	} else {
-		normal = (float*)tess.normal;
-		xyz = (float*)tess.xyz;
-
-        pLight = &backEnd.currentSphere->light[0];
-
-		switch (backEnd.currentSphere->light[0].eType)
-		{
-		case LIGHT_DIRECTIONAL:
-			for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-                fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-					VectorScale(pLight->color, fDot, colorout);
-
-                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
-                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
-                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
-					color[3] = 0xff;
-                } else {
-                    color[0] = backEnd.currentSphere->ambient.level[0];
-                    color[1] = backEnd.currentSphere->ambient.level[1];
-                    color[2] = backEnd.currentSphere->ambient.level[2];
-                    color[3] = backEnd.currentSphere->ambient.level[3];
-				}
-			}
-			break;
-        case LIGHT_SPOT:
-			for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-                float fDistSquared;
-                float fProjSquared;
-                float fMaxIntensity;
-
-				color[0] = backEnd.currentSphere->ambient.level[0];
-				color[1] = backEnd.currentSphere->ambient.level[1];
-				color[2] = backEnd.currentSphere->ambient.level[2];
-				color[3] = backEnd.currentSphere->ambient.level[3];
-				
-				fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-                    VectorSubtract(pLight->vOrigin, xyz, v);
-
-                    fProjSquared = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
-                    fDistSquared = VectorLengthSquared(v);
-                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
-                    if (fMaxIntensity > 0) {
-                        fDot /= fDistSquared;
-                        if (fMaxIntensity < 1) {
-                            fDot *= fMaxIntensity;
-                        }
-
-                        VectorScale(pLight->color, fDot, colorout);
-                        
-						color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
-                        color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
-                        color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
-                        color[3] = 0xff;
-					}
-                }
-			}
-			break;
-        case LIGHT_SPOT_FAST:
-            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-                color[0] = backEnd.currentSphere->ambient.level[0];
-                color[1] = backEnd.currentSphere->ambient.level[1];
-                color[2] = backEnd.currentSphere->ambient.level[2];
-                color[3] = backEnd.currentSphere->ambient.level[3];
-				
-				fDot = DotProduct(pLight->vDirection, normal);
-                if (fDot > 0) {
-					float fDistSquared;
-
-                    VectorSubtract(pLight->vOrigin, xyz, v);
-                    fDistSquared = VectorLengthSquared(v);
-                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
-
-                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
-                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
-                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
-                    color[3] = 0xff;
-                }
-            }
-			break;
-        case LIGHT_POINT:
-			for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
-				VectorSubtract(pLight->vOrigin, xyz, v);
-				fDot = DotProduct(v, normal);
-				if (fDot > 0) {
-					float fDistSquared;
-
-                    fDistSquared = VectorLengthSquared(v);
-                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
-
-                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
-                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
-                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
-                    color[3] = 0xff;
-				} else {
-					color[0] = backEnd.currentSphere->ambient.level[0];
-					color[1] = backEnd.currentSphere->ambient.level[1];
-					color[2] = backEnd.currentSphere->ambient.level[2];
-					color[3] = backEnd.currentSphere->ambient.level[3];
-				}
-			}
-			break;
-		}
-	}
-}
-
-static void RB_Sphere_Light_Sun()
-{
-	int curleaf;
-	qboolean hitSun;
-	vec3_t end;
-	mnode_t* leaf;
-	trace_t trace;
-
-	if (!s_sun.exists) {
-		return;
-	}
-
-	if (tr.world->vis && backEnd.currentSphere->leaves[0] && tr.sSunLight.leaf == (struct mnode_s*)-1) {
-		vec3_t transpos;
-		vec3_t temppos;
-
-		for (curleaf = 0, leaf = backEnd.currentSphere->leaves[0]; curleaf < 8; curleaf++) {
-			if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
-				break;
-			}
-
-			leaf = backEnd.currentSphere->leaves[curleaf];
-			if (!leaf) {
-				break;
-			}
-		}
-
-		if (!leaf || (leaf->lights && leaf->lights[0] != &tr.sSunLight)) {
-			if (r_light_sun_line->integer) {
-				VectorMA(backEnd.currentSphere->worldOrigin, 16384.0, s_sun.direction, end);
-
-				VectorCopy(backEnd.currentEntity->e.origin, temppos);
-				MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
-
-				GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-
-				qglPushMatrix();
-
-				qglLoadMatrixf(backEnd.ori.modelMatrix);
-				// Clear the depth range
-				qglDepthRange(0.0, 0.0);
-
-				qglDisable(GL_TEXTURE_2D);
-
-				qglBegin(GL_LINES);
-				qglColor3f(0.0, 0.0, 0.0);
-				qglVertex3fv(backEnd.currentSphere->origin);
-				qglColor3f(0.5, 0.5, 0.5);
-				qglVertex3fv(transpos);
-				qglEnd();
-
-				qglEnable(GL_TEXTURE_2D);
-
-				// Bring the depth range back
-				qglDepthRange(0.0, 1.0);
-
-				qglPopMatrix();
-			}
-
-			return;
-		}
-	}
-
-	VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
-	ri.CM_BoxTrace(
-		&trace,
-		backEnd.currentSphere->traceOrigin,
-		end,
-		vec3_origin,
-		vec3_origin,
-		0,
-		CONTENTS_SOLID,
-		0
-	);
-
-	hitSun = (trace.surfaceFlags >> 2) & 1;
-    if (r_light_sun_line->integer) {
-        vec3_t transpos;
-        vec3_t temppos;
-
-		VectorSubtract(trace.endpos, backEnd.currentEntity->e.origin, temppos);
-        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
-
-        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
-
-        qglPushMatrix();
-
-        qglLoadMatrixf(backEnd.ori.modelMatrix);
-        // Clear the depth range
-        qglDepthRange(0.0, 0.0);
-
-        qglDisable(GL_TEXTURE_2D);
-
-        qglBegin(GL_LINES);
-
-		if (hitSun) {
-			qglColor3f(1.0, 1.0, 0.0);
-		} else {
-			qglColor3f(0.0, 0.0, 0.0);
-		}
-
-        qglVertex3fv(backEnd.currentSphere->origin);
-        qglColor3f(0.5, 0.5, 0.5);
-        qglVertex3fv(transpos);
-        qglEnd();
-
-        qglEnable(GL_TEXTURE_2D);
-
-        // Bring the depth range back
-        qglDepthRange(0.0, 1.0);
-
-        qglPopMatrix();
-	}
-
-	if (hitSun) {
-		vec3_t sunnormal;
-		sphereor_t* pSphere;
-		reallightinfo_t* pLight;
-
-		pSphere = backEnd.currentSphere;
-
-        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, s_sun.direction, sunnormal);
-		
-		pLight = &pSphere->light[pSphere->numRealLights];
-		pLight->color[0] = s_sun.color[0] * tr.overbrightMult * r_entlight_scale->value;
-		pLight->color[1] = s_sun.color[1] * tr.overbrightMult * r_entlight_scale->value;
-		pLight->color[2] = s_sun.color[2] * tr.overbrightMult * r_entlight_scale->value;
-	
-		VectorCopy(sunnormal, pLight->vDirection);
-		pLight->eType = LIGHT_DIRECTIONAL;
-		pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
-		
-		pSphere->numRealLights++;
-	}
-}
-
-static qboolean RB_Sphere_CalculateSphereOrigin()
-{
-	vec3_t *axis;
-	vec3_t sphereOrigin;
-    trRefEntity_t* refent;
-    trRefEntity_t* newref;
-
-    axis = backEnd.currentEntity->e.axis;
-	if (!backEnd.currentEntity->e.tiki) {
-		return qfalse;
-	}
-
-	backEnd.currentSphere->radius = backEnd.currentEntity->e.radius;
-	VectorCopy(backEnd.currentEntity->e.lightingOrigin, backEnd.currentSphere->worldOrigin);
-
-	VectorSubtract(backEnd.currentSphere->worldOrigin, backEnd.currentEntity->e.origin, sphereOrigin);
-	MatrixTransformVectorRight(axis, sphereOrigin, backEnd.currentSphere->origin);
-
-    for (refent = backEnd.currentEntity; ; refent = newref) {
-        if (refent->e.parentEntity == ENTITYNUM_NONE) {
-            break;
-        }
-
-        newref = &backEnd.refdef.entities[refent->e.parentEntity];
-        if (refent == newref) {
-            break;
-        }
-    }
-
-    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
-
-	return qtrue;
-}
-
-static bool RB_Sphere_SetupGlobals()
-{
-	int i;
-
-	if (backEnd.refdef.rdflags & RDF_NOWORLDMODEL) {
-		if (!(backEnd.refdef.rdflags & RDF_FULLBRIGHT)) {
-			backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
-			return false;
-		}
-	}
-	else if (!(backEnd.refdef.rdflags & RDF_FULLBRIGHT)) {
-		if (!RB_Sphere_CalculateSphereOrigin()) {
-			backEnd.currentSphere->TessFunction = &RB_CalcLightGridColor;
-
-			if (!backEnd.currentEntity->bLightGridCalculated) {
-				RB_SetupEntityGridLighting();
-			}
-
-			return false;
-		}
-	}
-	else
-	{
-		if (backEnd.refdef.vieworg[0] == 0 && backEnd.refdef.vieworg[1] == 0 && backEnd.refdef.vieworg[2] == 0) {
-			backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
-			return false;
-		}
-
-		VectorCopy(backEnd.refdef.vieworg, backEnd.currentSphere->worldOrigin);
-		VectorClear(backEnd.currentSphere->origin);
-		backEnd.currentSphere->radius = 2.0;
-	}
-
-	light_reference_count++;
-	for (i = 0; i < 8; i++) {
-		backEnd.currentSphere->leaves[i] = 0;
-	}
-
-	R_SphereInLeafs(backEnd.currentSphere->worldOrigin, backEnd.currentSphere->radius, backEnd.currentSphere->leaves, 8);
-
-	backEnd.currentSphere->TessFunction = &RB_Light_Real;
-	return true;
-}
-
-static bool RB_Sphere_ResetPointColors()
-{
-	vec3_t light_offset, amb;
-
-	R_GetLightingGridValue(backEnd.currentSphere->worldOrigin, light_offset);
-	light_offset[0] = ambientlight[0] + light_offset[0] * 0.18;
-	light_offset[1] = ambientlight[1] + light_offset[1] * 0.18;
-	light_offset[2] = ambientlight[2] + light_offset[2] * 0.18;
-	if (tr.refdef.rdflags & RDF_FULLBRIGHT)
-	{
-		float fMin = tr.identityLight * 20.0;
-
-		if (fMin <= light_offset[0] || fMin <= light_offset[1] || fMin <= light_offset[2]) {
-			light_offset[0] += fMin;
-			light_offset[1] += fMin;
-			light_offset[2] += fMin;
-		}
-	}
-
-	amb[0] = light_offset[0] * tr.overbrightMult * r_entlight_scale->value;
-	if (amb[0] > 255.0) {
-		backEnd.currentSphere->ambient.level[0] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[0] = amb[0];
-    }
-
-    amb[1] = light_offset[1] * tr.overbrightMult * r_entlight_scale->value;
-    if (amb[1] > 255.0) {
-        backEnd.currentSphere->ambient.level[1] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[1] = amb[1];
-    }
-
-    amb[2] = light_offset[2] * tr.overbrightMult * r_entlight_scale->value;
-    if (amb[2] > 255.0) {
-        backEnd.currentSphere->ambient.level[2] = 0xff;
-    } else {
-        backEnd.currentSphere->ambient.level[2] = amb[2];
-    }
-
-	backEnd.currentSphere->ambient.level[3] = 0xff;
-
-	return true;
-}
-
-static void RB_Sphere_DrawDebugLine(const spherel_t* thislight, float falloff, const vec3_t origin)
-{
-	int i;
-	vec3_t newColor;
-	vec3_t fakeLine, fakeLine2;
-
-	if (!r_light_lines->integer) {
-		return;
-	}
-
-    qglPushMatrix();
-
-    qglLoadMatrixf(backEnd.ori.modelMatrix);
-    // Clear the depth range
-    qglDepthRange(0.0, 0.0);
-
-    qglDisable(GL_TEXTURE_2D);
-
-	if (r_light_lines->integer == 2)
-	{
-		newColor[0] = thislight->color[0] * (falloff * r_entlight_scale->value / 255.0);
-		newColor[1] = thislight->color[1] * (falloff * r_entlight_scale->value / 255.0);
-		newColor[2] = thislight->color[2] * (falloff * r_entlight_scale->value / 255.0);
-	
-		if (newColor[0] > 1 || newColor[1] > 1 || newColor[2] > 1) {
-			NormalizeColor(newColor, newColor);
-		}
-    }
-    else if (thislight->spot_light)
-    {
-        newColor[0] = 1.0;
-        newColor[1] = 0.7;
-        newColor[2] = 0.7;
-    }
-    else
-    {
-        newColor[0] = 1.0;
-        newColor[1] = 1.0;
-        newColor[2] = 1.0;
-    }
-
-    qglColor3f(newColor[0], newColor[1], newColor[2]);
-
-    qglBegin(GL_LINES);
-    qglVertex3fv(origin);
-    qglVertex3fv(backEnd.currentSphere->origin);
-
-	for (i = 0; i < 5; i += 2) {
-		VectorMA(origin, 16.0, spheredef[i], fakeLine);
-		VectorMA(origin, -16.0, spheredef[i], fakeLine2);
-
-        qglVertex3fv(fakeLine);
-        qglVertex3fv(fakeLine2);
-	}
-
-	if (thislight->spot_light) {
-		qglColor3f(0.7, 1.0, 0.7);
-
-		MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, fakeLine);
-		VectorMA(origin, 32.0, fakeLine, fakeLine);
-
-        qglVertex3fv(origin);
-        qglVertex3fv(fakeLine);
-	}
-
-    qglEnd();
-    qglEnable(GL_TEXTURE_2D);
-	// Restore depth
-    qglDepthRange(0.0, 1.0);
-    qglPopMatrix();
-}
-
-static void RB_Sphere_AddSpotLight(const spherel_t* thislight)
-{
-	vec3_t lightorigin;
-	vec3_t newlight;
-	vec3_t lightline;
-	vec3_t newdir;
-	float falloff;
-	float dot;
-	float radiusByDistance;
-	float radiusAtDist;
-	float sampleRadius;
-	vec3_t pointAtDist;
-	
-	radiusByDistance = thislight->spot_radiusbydistance;
-	if (radiusByDistance < 0) {
-		vec3_t proj;
-		vec3_t delta;
-		float distfromcentroid;
-
-		dot = -(DotProduct(backEnd.currentSphere->worldOrigin, thislight->spot_dir) - DotProduct(thislight->origin, thislight->spot_dir));
-		VectorMA(thislight->origin, dot, thislight->spot_dir, proj);
-		VectorSubtract(proj, thislight->origin, delta);
-
-		distfromcentroid = VectorLengthSquared(delta);
-		if (distfromcentroid > radiusByDistance * radiusByDistance) {
-			VectorScale(delta, -radiusByDistance / sqrt(distfromcentroid), delta);
-		}
-
-		VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
-		VectorAdd(lightorigin, delta, lightorigin);
-    } else {
-        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
-	}
-
-	MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
-	VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
-
-	falloff = thislight->intensity * 7500.0 / VectorLengthSquared(newlight);
-	if (falloff >= 5.0) {
-		reallightinfo_t* pLight;
-		float fMinDist;
-		float fRadByDistSquared;
-
-		MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
-		dot = DotProduct(newlight, newdir);
-		if (dot > 0) {
-			fMinDist = sqrt((newlight[0] + newdir[0] * dot) * (newlight[0] + newdir[0] * dot)
-							+ (newlight[1] + newdir[1] * dot) * (newlight[1] + newdir[1] * dot)
-							+ (newlight[2] + newdir[2] * dot) * (newlight[2] + newdir[2] * dot));
-
-			if (fMinDist < radiusByDistance * dot) {
-				if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
-                    pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
-                    pLight->eType = LIGHT_SPOT;
-					pLight->color[0] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-					pLight->color[1] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-					pLight->color[2] *= thislight->intensity * 7500.0 * tr.overbrightMult;
-					pLight->fDist = VectorLength(newlight);
-					pLight->fIntensity = (pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f) * (thislight->intensity * 7500.0 * tr.overbrightMult);
-
-					sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
-					if (sampleRadius > 0) {
-						pLight->fIntensity /= (sampleRadius * sampleRadius);
-					}
-
-					VectorCopy(lightline, pLight->vOrigin);
-					VectorNegate(newdir, pLight->vDirection);
-					fRadByDistSquared = radiusByDistance * radiusByDistance;
-					pLight->fSpotConst = fRadByDistSquared + 1.0;
-					pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
-					pLight->fSpotSlope = radiusByDistance;
-
-					backEnd.currentSphere->numRealLights++;
-				}
-
-				RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
-			}
-		}
-	}
-}
-
-static void RB_Sphere_AddLight(const spherel_t* thislight)
-{
-	vec3_t lightorigin;
-	vec3_t newlight;
-	vec3_t lightline;
-	float intensity;
-	float falloff;
-
-	if (thislight->intensity > 0 && (backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
-		return;
-	}
-
-	if (thislight->intensity < 0 && !(backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
-		return;
-	}
-
-	if (thislight->needs_trace)
-	{
-        trace_t trace;
-		ri.CM_BoxTrace(&trace,
-			backEnd.currentSphere->traceOrigin,
-			thislight->origin,
-			vec3_origin,
-			vec3_origin,
-			0,
-			CONTENTS_SOLID,
-			0
-		);
-
-		if (trace.fraction < 1) {
-			return;
-		}
-	}
-
-    if (!thislight->spot_light)
-    {
-		reallightinfo_t* pLight;
-		float fDist;
-		float fRadius;
-
-        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
-        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
-        VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
-  
-		intensity = thislight->intensity * 7500.0;
-		falloff = 1.f / VectorLengthSquared(newlight) * intensity;
-		if (falloff >= 5.0) {
-			RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
-			if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
-				pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
-
-				fDist = VectorLength(newlight);
-				pLight->color[0] = thislight->color[0] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
-				pLight->color[1] = thislight->color[1] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
-                pLight->color[2] = thislight->color[2] * falloff * tr.overbrightMult * r_entlight_scale->value * fDist;
-			
-				VectorCopy(lightline, pLight->vOrigin);
-				pLight->fDist = fDist;
-				pLight->eType = LIGHT_POINT;
-				pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
-				
-				fRadius = fDist - backEnd.currentSphere->radius;
-				if (fRadius > 0) {
-					pLight->fIntensity /= fRadius;
-				}
-
-				backEnd.currentSphere->numRealLights++;
-			}
-		}
-	} else {
-        RB_Sphere_AddSpotLight(thislight);
-	}
-}
-
-static void RB_Sphere_BuildStaticLights()
-{
-	int i;
-	int curleaf;
-	mnode_t* leaf;
-
-	if (tr.world->vis)
-    {
-		int cntarea;
-
-		for (curleaf = 0, leaf = backEnd.currentSphere->leaves[curleaf]; curleaf < 8 && leaf; curleaf++, leaf++) {
-			cntarea = leaf->numlights;
-
-			if (cntarea) {
-				for (i = (*leaf->lights == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
-					spherel_t* pLight = leaf->lights[i];
-					byte mask = backEnd.refdef.areamask[pLight->leaf->area >> 3];
-
-					if (!(mask & (1 << (pLight->leaf->area & 7))) && pLight->reference_count != light_reference_count) {
-                        RB_Sphere_AddLight(pLight);
-						pLight->reference_count = light_reference_count;
-					}
-				}
-			}
-		}
-	}
-	else
-	{
-		for (i = 0; i < tr.numSLights; i++) {
-			RB_Sphere_AddLight(&tr.sLights[i]);
-		}
-	}
-}
-
-void RB_Sphere_BuildDLights()
-{
-	int i;
-	float length;
-	vec3_t lightorigin;
-	vec3_t delta;
-	float scale;
-	float fRadius;
-	sphereor_t* pSphere;
-	reallightinfo_t* pLight;
-
-    pSphere = backEnd.currentSphere;
-    backEnd.currentSphere->TessFunction = RB_Light_Real;
-
-	for (i = 0; i < backEnd.refdef.num_dlights && pSphere->numRealLights < MAX_REAL_LIGHTS; i++) {
-		VectorSubtract(backEnd.refdef.dlights[i].origin, pSphere->worldOrigin, delta);
-		length = VectorLength(delta);
-
-		fRadius = backEnd.refdef.dlights[i].radius + pSphere->radius;
-		if (fRadius < length) {
-			continue;
-		}
-
-		VectorSubtract(backEnd.refdef.dlights[i].origin, backEnd.currentEntity->e.origin, lightorigin);
-		scale = r_entlight_scale->value * tr.overbrightMult * 7500.0 * backEnd.refdef.dlights[i].radius / length;
-        pLight = &pSphere->light[pSphere->numRealLights];
-        pLight->color[0] = scale * backEnd.refdef.dlights[i].color[0];
-        pLight->color[1] = scale * backEnd.refdef.dlights[i].color[1];
-        pLight->color[2] = scale * backEnd.refdef.dlights[i].color[2];
-		MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, pLight->vOrigin);
-		
-		pLight->eType = LIGHT_POINT;
-		pLight->fDist = length;
-		pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
-		
-		if (pLight->fDist - backEnd.currentSphere->radius >= 0.f) {
-			pLight->fIntensity /= pLight->fDist - backEnd.currentSphere->radius;
-		}
-
-		backEnd.currentSphere->numRealLights++;
-	}
-}
-
-void RB_Sphere_SetupEntity()
-{
-	if (r_light_nolight->integer)
-	{
-		backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
-	}
-	else if (RB_Sphere_SetupGlobals() && RB_Sphere_ResetPointColors())
-	{
-		backEnd.currentSphere->numRealLights = 0;
-		RB_Sphere_Light_Sun();
-		RB_Sphere_BuildStaticLights();
-		RB_Sphere_BuildDLights();
-		backEnd.pc.c_characterlights += backEnd.currentSphere->numRealLights;
-		RB_OptimizeLights();
-	}
-}
-
-void RB_Grid_SetupEntity()
-{
-	trRefEntity_t* refent;
-	trRefEntity_t* newref;
-
-	for (refent = backEnd.currentEntity; ; refent = newref) {
-		if (refent->e.parentEntity == ENTITYNUM_NONE) {
-			break;
-		}
-
-		newref = &backEnd.refdef.entities[refent->e.parentEntity];
-		if (refent == newref) {
-			break;
-		}
-	}
-
-	VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
-	RB_SetupEntityGridLighting();
-}
-
-void RB_Grid_SetupStaticModel()
-{
-	RB_SetupStaticModelGridLighting(&tr.refdef, backEnd.currentStaticModel, backEnd.currentStaticModel->origin);
-}
-
-void RB_Light_Fullbright(unsigned char* colors)
-{
-	memset((void*)colors, 0xFF, tess.numVertexes);
-}
-
-void R_Sphere_InitLights()
-{
-	const char* ents;
-	const char* ret;
-	qboolean bFlareDirSet;
-
-	ents = ri.CM_EntityString();
-	bFlareDirSet = qfalse;
-	s_sun.szFlareName[0] = 0;
-	s_sun.exists = qfalse;
-
-	for (int i = 0; i < 128; i++) {
-		backEnd.spheres[i].TessFunction = &RB_Light_Real;
-	}
-
-	VectorClear(ambientlight);
-	backEnd.spareSphere.TessFunction = &RB_Light_Real;
-	backEnd.currentSphere = &backEnd.spareSphere;
-	bEntityOverbright = qfalse;
-	iEntityLightingMax = tr.identityLightByte;
-	s_sun.color[0] = s_sun.color[1] = s_sun.color[2] = tr.overbrightMult * 70;
-
-	while (ents)
-	{
-		ret = COM_Parse((char**)&ents);
-		if (*ret == '{' || *ret == '}') {
-			continue;
-		}
-
-		if (!strcmp(ret, "suncolor") || !strcmp(ret, "sunlight"))
-		{
-			sscanf(COM_Parse((char**)&ents), "%f %f %f", &s_sun.color[0], &s_sun.color[1], &s_sun.color[2]);
-			s_sun.color[0] *= tr.overbrightMult;
-			s_sun.color[1] *= tr.overbrightMult;
-			s_sun.color[2] *= tr.overbrightMult;
-			s_sun.exists = qtrue;
-		}
-		else if (!strcmp(ret, "sundirection"))
-		{
-			vec3_t dir;
-
-			sscanf(COM_Parse((char**)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
-			AngleVectorsLeft(dir, s_sun.direction, 0, 0);
-
-			s_sun.exists = qtrue;
-			if (!bFlareDirSet)
-			{
-				s_sun.flaredirection[0] = s_sun.direction[0];
-				s_sun.flaredirection[1] = s_sun.direction[1];
-				s_sun.flaredirection[2] = s_sun.direction[2];
-			}
-		}
-		else if (!strcmp(ret, "sunflaredirection"))
-		{
-			vec3_t dir;
-
-			sscanf(COM_Parse((char**)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
-			AngleVectorsLeft(dir, s_sun.flaredirection, 0, 0);
-			bFlareDirSet = qtrue;
-		}
-		else if (!strcmp(ret, "sunflarename"))
-		{
-			strcpy(s_sun.szFlareName, COM_Parse((char**)&ents));
-		}
-		else if (!strcmp(ret, "ambientlight"))
-		{
-			sscanf(COM_Parse((char**)&ents), "%f %f %f", &ambientlight[0], &ambientlight[1], &ambientlight[2]);
-		}
-		else if (!strcmp(ret, "overbright"))
-		{
-			ret = COM_Parse((char**)&ents);
-			if (strcmp(ret, "world") || strcmp(ret, "none"))
-			{
-				bEntityOverbright = qtrue;
-				iEntityLightingMax = 0xFF;
-			}
-		}
-		else
-		{
-			COM_Parse((char**)&ents);
-		}
-	}
-
-	if (s_sun.exists)
-	{
-		if (!s_sun.szFlareName[0]) {
-			strcpy(s_sun.szFlareName, "sun");
-		}
-	}
-}
-
-static qboolean R_CheckAddLightToList(spherel_t* pLight, const vec3_t vPos, float* pfFalloff) {
-    vec3_t vDelta;
-
-    if (pLight->intensity < 0) {
-        return qfalse;
-    }
-
-	VectorSubtract(pLight->origin, vPos, vDelta);
-	*pfFalloff = pLight->intensity * 7500.0 / VectorLengthSquared(vDelta);
-
-	return *pfFalloff >= 5.0;
-}
-
-static void R_InsertLightIntoList(spherel_t* pLight, float fIntensity, gatheredLight_t** pLightsList) {
-	gatheredLight_t* pCurrLight;
-	gatheredLight_t* pLastLight;
-
-	if (pLightsList[0]->pPrev->fIntensity >= fIntensity) {
-		return;
-	}
-
-	if (fIntensity > pLightsList[0]->fIntensity) {
-		pLightsList[0] = pLightsList[0]->pPrev;
-		pLightsList[0]->pPrev->pLight = pLight;
-		pLightsList[0]->fIntensity = fIntensity;
-	}
-
-	pCurrLight = pLightsList[0]->pNext;
-	if (!pCurrLight) {
-		return;
-	}
-
-	while (pCurrLight->fIntensity >= fIntensity) {
-		pCurrLight = pCurrLight->pNext;
-		if (!pCurrLight) {
-			return;
-		}
-	}
-
-	pLastLight = pLightsList[0]->pPrev->pPrev;
-	pCurrLight->pPrev->pNext = pLightsList[0]->pPrev;
-	pLightsList[0]->pPrev->pPrev = pCurrLight->pPrev;
-	pLightsList[0]->pPrev->pNext = pCurrLight;
-	pCurrLight->pPrev = pLightsList[0]->pPrev;
-	pLastLight->pNext = pLightsList[0];
-	pLightsList[0]->pPrev = pLastLight;
-	pCurrLight = pCurrLight->pPrev;
-	pCurrLight->fIntensity = fIntensity;
-	pCurrLight->pLight = pLight;
-}
-
-#define MAX_GATHERED_LIGHTS 8
-
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights)
-{
-	int i, j;
-	int iLightCount;
-	vec3_t vEnd;
-	vec3_t vDelta;
-	spherel_t* pCurrLight;
-	gatheredLight_t lights[MAX_GATHERED_LIGHTS];
-	gatheredLight_t* pLightsHead;
-	gatheredLight_t* pLightsCurr;
-	float fFalloff;
-	trace_t trace;
-	mnode_t* leaf;
-
-	fFalloff = 0;
-	leaf = NULL;
-
-	if (iMaxLights <= 0 || !r_drawspherelights->integer) {
-		return 0;
-	}
-
-    for (j = 0; j < 6; j++) {
-        lights[j].pNext = &lights[j + 2];
-		lights[j].pPrev = &lights[j];
-	}
-
-	lights[0].pNext = &lights[1];
-	lights[0].pPrev = &lights[MAX_GATHERED_LIGHTS - 1];
-	lights[MAX_GATHERED_LIGHTS - 1].pNext = &lights[0];
-	lights[MAX_GATHERED_LIGHTS - 1].pPrev = &lights[MAX_GATHERED_LIGHTS - 2];
-
-	if (tr.world->vis) {
-		leaf = R_PointInLeaf(vPos);
-		if (leaf->area == -1 || !leaf->numlights) {
-			leaf = NULL;
-		}
-	}
-
-	if (leaf) {
-		if (leaf->numlights) {
-			light_reference_count++;
-
-			for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
-				pCurrLight = leaf->lights[i];
-				if (pCurrLight->leaf != (mnode_t*)-1) {
-					byte mask = backEnd.refdef.areamask[pCurrLight->leaf->area >> 3];
-
-					if (!(mask & (1 << (pCurrLight->leaf->area & 7))) && pCurrLight->reference_count != light_reference_count) {
-						if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
-							R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
-						}
-
-						pCurrLight->reference_count = light_reference_count;
-					}
-				}
-			}
-		}
-	} else {
-		for (i = 0; i < tr.numSLights; i++) {
-			pCurrLight = &tr.sLights[i];
-
-			if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
-				R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
-			}
-		}
-	}
-
-	iLightCount = 0;
-
-	if (s_sun.exists) {
-		if (leaf) {
-			if (leaf->lights[0] = &tr.sSunLight) {
-				VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
-				ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
-
-				if (trace.surfaceFlags & SURF_SKY) {
-					VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
-					pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
-					pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
-					pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
-					iLightCount = 1;
-				}
-			}
-		}
-	}
-
-	pLightsCurr = pLightsHead;
-
-	for (;
-		iLightCount < iMaxLights && pLightsCurr->pLight && pLightsCurr != pLightsHead;
-		iLightCount++, pLightsCurr = pLightsCurr->pNext) {
-		VectorCopy(pLightsCurr->pLight->origin, pvLightPos[iLightCount]);
-		vDelta[0] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[0];
-		vDelta[1] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[1];
-		vDelta[2] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[2];
-	
-		if (vDelta[0] > 1.0 || vDelta[1] > 1.0 || vDelta[2] > 1.0) {
-			NormalizeColor(vDelta, vDelta);
-		}
-
-		VectorCopy(vDelta, pvLightIntensity[iLightCount]);
-		pLightsCurr = pLightsCurr->pNext;
-	}
-
-	return iLightCount;
-}
diff --git a/code/renderer/tr_staticmodels.cpp b/code/renderer/tr_staticmodels.cpp
deleted file mode 100644
index af3efe93..00000000
--- a/code/renderer/tr_staticmodels.cpp
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_staticmodels.cpp -- static model rendering
-
-#include "tr_local.h"
-#include "tiki.h"
-
-#define MAX_STATIC_MODELS_SURFS		8192
-
-int g_nStaticSurfaces;
-staticSurface_t g_staticSurfaces[MAX_STATIC_MODELS_SURFS];
-qboolean g_bInfostaticmodels = qfalse;
-
-/*
-==============
-R_InitStaticModels
-==============
-*/
-void R_InitStaticModels(void) {
-    cStaticModelUnpacked_t* pSM;
-    char	szTemp[1024];
-    bool	exists;
-    skelBoneCache_t		bones[128];
-    float	radius;
-    int		i, j, k, l;
-
-    g_bInfostaticmodels = qfalse;
-
-    if (tr.overbrightShift)
-    {
-        for (i = 0; i < tr.world->numStaticModelData; i++)
-        {
-            int		r, g, b;
-
-            r = (int)((float)tr.world->staticModelData[i * 4] * tr.overbrightMult);
-            g = (int)((float)tr.world->staticModelData[i * 4 + 1] * tr.overbrightMult);
-            b = (int)((float)tr.world->staticModelData[i * 4 + 2] * tr.overbrightMult);
-
-            if (r > 0xFF || g > 0xFF || b > 0xFF)
-            {
-                float t;
-
-                t = 255.0 / (float)Q_max(r, Q_max(g, b));
-
-                r = (int)((float)r * t);
-                g = (int)((float)g * t);
-                b = (int)((float)b * t);
-            }
-
-            tr.world->staticModelData[i * 4] = r;
-            tr.world->staticModelData[i * 4 + 1] = g;
-            tr.world->staticModelData[i * 4 + 2] = b;
-        }
-    }
-
-    for (i = 0; i < tr.world->numStaticModels; i++)
-    {
-        vec3_t mins, maxs;
-
-        pSM = &tr.world->staticModels[i];
-
-        pSM->bRendered = qfalse;
-        AngleVectorsLeft(pSM->angles, pSM->axis[0], pSM->axis[1], pSM->axis[2]);
-
-        if (!strnicmp(pSM->model, "models", 6)) {
-            strcpy(szTemp, pSM->model);
-        }
-        else {
-            sprintf(szTemp, "models/%s", pSM->model);
-        }
-
-        FS_CanonicalFilename(szTemp);
-        exists = TIKI_FindTiki(szTemp) != NULL;
-        pSM->tiki = TIKI_RegisterTiki(szTemp);
-
-        if (!pSM->tiki) {
-            ri.Printf(PRINT_WARNING, "^~^~^: Warning: Cannot Load Static Model %s\n", szTemp);
-            continue;
-        }
-
-        pSM->radius = TIKI_GlobalRadius(pSM->tiki);
-
-        //
-        // register shaders
-        //
-        for (j = 0; j < pSM->tiki->num_surfaces; j++)
-        {
-            dtikisurface_t* surf = &pSM->tiki->surfaces[j];
-
-            for (k = 0; k < surf->numskins; k++)
-            {
-                if (surf->shader[k][0]) {
-                    shader_t* sh = R_FindShader(surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS), !(surf->flags & TIKI_SURF_NOPICMIP), qtrue, qtrue);
-                    surf->hShader[k] = sh->index;
-                }
-                else {
-                    surf->hShader[k] = 0;
-                }
-            }
-        }
-
-        // prepare the skeleton frame for the static model
-        TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
-        pSM->cull_radius = radius * pSM->tiki->load_scale * pSM->scale;
-
-        // Suggestion:
-        // It would be cool to have animated static model in the future
-
-        if (!exists)
-        {
-            for (j = 0; j < pSM->tiki->numMeshes; j++)
-            {
-                skelHeaderGame_t* skelmodel = TIKI_GetSkel(pSM->tiki->mesh[j]);
-                skelSurfaceGame_t* surf;
-
-                if (!skelmodel) {
-                    ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
-                    continue;
-                }
-
-                surf = skelmodel->pSurfaces;
-
-                for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext)
-                {
-                    byte* buf;
-                    byte* p;
-                    skelWeight_t* weight;
-                    skeletorVertex_t* vert;
-
-                    if (surf->pStaticXyz) {
-                        continue;
-                    }
-
-                    // allocate static vectors
-                    p = buf = (byte*)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
-                    surf->pStaticXyz = (vec4_t*)p;
-                    p += sizeof(vec4_t) * surf->numVerts;
-                    surf->pStaticNormal = (vec4_t*)p;
-                    p += sizeof(vec4_t) * surf->numVerts;
-                    surf->pStaticTexCoords = (vec2_t(*)[2])p;
-
-                    vert = surf->pVerts;
-
-                    for (l = 0; l < surf->numVerts; l++)
-                    {
-                        int channel;
-                        skelBoneCache_t* bone;
-
-                        weight = (skelWeight_t*)((byte*)vert + sizeof(skeletorVertex_t) + vert->numMorphs * sizeof(skeletorMorph_t));
-
-                        if (j > 0) {
-                            channel = pSM->tiki->m_boneList.GetLocalFromGlobal(skelmodel->pBones[weight->boneIndex].channel);
-                        }
-                        else {
-                            channel = weight->boneIndex;
-                        }
-
-                        bone = &bones[channel];
-
-                        surf->pStaticXyz[l][0] = ((weight->offset[0] * bone->matrix[0][0]
-                            + weight->offset[1] * bone->matrix[1][0]
-                            + weight->offset[2] * bone->matrix[2][0])
-                            + bone->offset[0]) * weight->boneWeight;
-                        surf->pStaticXyz[l][1] = ((weight->offset[0] * bone->matrix[0][1]
-                            + weight->offset[1] * bone->matrix[1][1]
-                            + weight->offset[2] * bone->matrix[2][1])
-                            + bone->offset[1]) * weight->boneWeight;
-                        surf->pStaticXyz[l][2] = ((weight->offset[0] * bone->matrix[0][2]
-                            + weight->offset[1] * bone->matrix[1][2]
-                            + weight->offset[2] * bone->matrix[2][2])
-                            + bone->offset[2]) * weight->boneWeight;
-                        surf->pStaticXyz[l][3] = 0.f;
-
-                        surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
-                            + vert->normal[1] * bone->matrix[1][0]
-                            + vert->normal[2] * bone->matrix[2][0];
-                        surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
-                            + vert->normal[1] * bone->matrix[1][1]
-                            + vert->normal[2] * bone->matrix[2][1];
-                        surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
-                            + vert->normal[1] * bone->matrix[1][2]
-                            + vert->normal[2] * bone->matrix[2][2];
-                        surf->pStaticNormal[l][3] = 0.f;
-
-                        surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
-                        surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
-                        surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
-                        surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
-
-                        vert = (skeletorVertex_t*)((byte*)vert + sizeof(skeletorVertex_t) + sizeof(skeletorMorph_t) * vert->numMorphs + sizeof(skelWeight_t) * vert->numWeights);
-                    }
-                }
-            }
-        }
-    }
-
-    tr.refdef.numStaticModels = tr.world->numStaticModels;
-    tr.refdef.staticModels = tr.world->staticModels;
-    tr.refdef.numStaticModelData = tr.world->numStaticModelData;
-    tr.refdef.staticModelData = tr.world->staticModelData;
-}
-
-/*
-==============
-R_CullStaticModel
-==============
-*/
-static int R_CullStaticModel(dtiki_t* tiki, float fScale, const vec3_t vLocalOrg) {
-    vec3_t	bounds[2];
-    int		i;
-    int		cull;
-
-    for (i = 0; i < 3; i++)
-    {
-        bounds[0][i] = vLocalOrg[i] + tiki->a->mins[i] * fScale;
-        bounds[1][i] = vLocalOrg[i] + tiki->a->maxs[i] * fScale;
-    }
-
-    cull = R_CullLocalBox(bounds);
-
-    if (r_showcull->integer & 4) {
-        float fR, fG, fB;
-        vec3_t vAngles;
-
-        switch (cull)
-        {
-        case CULL_CLIP:
-            fR = 1.0f;
-            fG = 1.0f;
-            fB = 0.0f;
-            break;
-        case CULL_IN:
-            fR = 0.0f;
-            fG = 1.0f;
-            fB = 0.0f;
-            break;
-        case CULL_OUT:
-            fR = 1.0f;
-            fG = 0.2f;
-            fB = 0.2f;
-            for (i = 0; i < 2; i++) {
-                bounds[0][i] = bounds[0][i] - 16.0;
-                bounds[1][i] = bounds[1][i] + 16.0;
-            }
-            break;
-        default:
-            break;
-        }
-
-        MatrixToEulerAngles(tr.ori.axis, vAngles);
-        R_DebugRotatedBBox(tr.ori.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
-    }
-
-    switch (cull)
-    {
-    case CULL_CLIP:
-        tr.pc.c_box_cull_md3_clip++;
-        break;
-    case CULL_IN:
-        tr.pc.c_box_cull_md3_in++;
-        break;
-    case CULL_OUT:
-        tr.pc.c_box_cull_md3_out++;
-        break;
-    }
-
-    return cull;
-}
-
-/*
-==============
-R_AddStaticModelSurfaces
-==============
-*/
-void R_AddStaticModelSurfaces(void) {
-    cStaticModelUnpacked_t* SM;
-    int i, j;
-    int ofsStaticData;
-    int iRadiusCull;
-    dtiki_t* tiki;
-    float tiki_scale;
-    vec3_t tiki_localorigin;
-    vec3_t tiki_worldorigin;
-
-    if (!tr.world->numStaticModels) {
-        return;
-    }
-
-    tr.shiftedIsStatic = (1 << QSORT_STATICMODEL_SHIFT);
-
-    for (i = 0; i < tr.world->numStaticModels; i++)
-    {
-        SM = &tr.world->staticModels[i];
-
-        //if( SM->visCount != tr.visCounts[ tr.visIndex ] ) {
-        //	continue;
-        //}
-
-        tiki = SM->tiki;
-
-        if (!tiki) {
-            continue;
-        }
-
-        tr.currentEntityNum = i;
-        tr.shiftedEntityNum = i << QSORT_ENTITYNUM_SHIFT;
-
-        R_RotateForStaticModel(SM, &tr.viewParms, &tr.ori );
-
-        ofsStaticData = 0;
-
-        // get the world position
-        tiki_scale = tiki->load_scale * SM->scale;
-        VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
-        R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
-
-        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
-
-        // FIXME: r_showcull
-
-        if (iRadiusCull != CULL_OUT && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT))
-        {
-            dtikisurface_t* dsurf;
-
-			if (tr.viewParms.isPortal) {
-				SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
-			} else {
-				SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
-			}
-
-            //
-            // draw all meshes
-            //
-            dsurf = tiki->surfaces;
-            for (int mesh = 0; mesh < tiki->numMeshes; mesh++)
-            {
-                skelHeaderGame_t* skelmodel = TIKI_GetSkel(tiki->mesh[mesh]);
-                skelSurfaceGame_t* surface;
-                staticSurface_t* s_surface;
-                shader_t* shader;
-
-                if (!skelmodel) {
-                    continue;
-                }
-
-                //
-                // draw all surfaces
-                //
-                surface = skelmodel->pSurfaces;
-                for (j = 0; j < skelmodel->numSurfaces; j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++)
-                {
-                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS)
-                    {
-                        ri.Printf(PRINT_DEVELOPER, "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n", tiki->a->name);
-                        continue;
-                    }
-
-                    s_surface = &g_staticSurfaces[g_nStaticSurfaces++];
-					s_surface->ident = SF_TIKI_STATIC;
-					s_surface->ofsStaticData = ofsStaticData;
-					s_surface->surface = surface;
-					s_surface->meshNum = mesh;
-
-                    shader = tr.shaders[dsurf->hShader[0]];
-
-                    if (shader->numUnfoggedPasses == 1)
-                    {
-                        if (shader->unfoggedStages[0]->alphaGen == AGEN_DIST_FADE)
-                        {
-                            if (R_DistanceCullPointAndRadius(shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius) == CULL_OUT) {
-                                continue;
-                            }
-						}
-						else if (shader->unfoggedStages[0]->alphaGen == AGEN_ONE_MINUS_DIST_FADE)
-						{
-							if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius) == CULL_IN) {
-								continue;
-							}
-						}
-                    }
-
-                    SM->bRendered = qtrue;
-                    R_AddDrawSurf((surfaceType_t*)s_surface, shader, 0);
-
-                    if (r_showstaticlod->integer) {
-                        vec3_t org;
-                        int render_count, total_tris;
-
-                        VectorCopy(SM->origin, org);
-                        org[2] += 100.0;
-                        R_DrawDebugNumber(org, SM->lodpercentage[0], r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 3);
-
-                        org[2] += 125.0;
-                        R_CountTikiLodTris(tiki, SM->lodpercentage[0], &render_count, &total_tris);
-                        R_DrawDebugNumber(org, render_count, r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 0);
-                    }
-
-                    if (r_showstaticbboxes->integer) {
-                        vec3_t vMins, vMaxs;
-
-                        for (i = 0; i < 3; i++)
-                        {
-                            vMins[i] = tiki->a->mins[i] * tiki->load_scale * SM->scale;
-                            vMaxs[i] = tiki->a->maxs[i] * tiki->load_scale * SM->scale;
-                        }
-
-                        R_DebugRotatedBBox(SM->origin, SM->angles, vMins, vMaxs, 1.0, 0.0, 1.0, 0.75);
-                    }
-                }
-            }
-        }
-    }
-
-    tr.shiftedIsStatic = 0;
-}
-
-void RB_Static_BuildDLights()
-{
-    int i;
-
-	backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
-	backEnd.currentStaticModel->numdlights = 0;
-
-    if (!backEnd.currentStaticModel->useSpecialLighting) {
-        return;
-    }
-
-    for (i = 0; i < backEnd.refdef.num_dlights && backEnd.currentStaticModel->numdlights != 32; i++) {
-        vec3_t lightorigin, delta;
-
-        VectorCopy(backEnd.refdef.dlights[i].origin, lightorigin);
-        VectorSubtract(lightorigin, backEnd.currentStaticModel->origin, delta);
-        if (backEnd.refdef.dlights[i].radius * 2.0 >= VectorLength(delta)) {
-            MatrixTransformVectorRight(
-                backEnd.currentStaticModel->axis,
-                delta,
-                backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights].transformed
-            );
-
-            backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights++].index = i;
-        }
-    }
-
-    if (!backEnd.currentStaticModel->numdlights) {
-        backEnd.currentStaticModel->useSpecialLighting = qfalse;
-    }
-}
-
-void R_InfoStaticModels_f()
-{
-    // FIXME: unimplemented
-}
-
-/*
-=============
-RB_StaticMesh
-=============
-*/
-void RB_StaticMesh(staticSurface_t* staticSurf) {
-    int					i, j;
-    dtiki_t* tiki;
-    skelSurfaceGame_t* surf;
-    int					meshNum;
-    skelHeaderGame_t* skelmodel;
-    int					render_count;
-    skelIndex_t* collapse_map;
-    skelIndex_t* triangles;
-    int					indexes;
-    int					baseIndex, baseVertex;
-    short				collapse[1000];
-
-    assert(backEnd.currentStaticModel);
-    tiki = backEnd.currentStaticModel->tiki;
-    surf = staticSurf->surface;
-
-    assert(surf->pStaticXyz);
-
-    meshNum = staticSurf->meshNum;
-    skelmodel = TIKI_GetSkel(tiki->mesh[meshNum]);
-
-    // FIXME: LOD
-    render_count = surf->numVerts;
-
-    if (tess.numVertexes + render_count >= TIKI_MAX_VERTEXES ||
-        tess.numIndexes + surf->numTriangles >= TIKI_MAX_TRIANGLES * 3) {
-        RB_CHECKOVERFLOW(render_count, surf->numTriangles);
-    }
-
-    collapse_map = surf->pCollapse;
-    triangles = surf->pTriangles;
-    indexes = surf->numTriangles * 3;
-    baseIndex = tess.numIndexes;
-    baseVertex = tess.numVertexes;
-    tess.numVertexes += render_count;
-
-    if (render_count == surf->numVerts)
-    {
-        for (j = 0; j < indexes; j++) {
-            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
-        }
-        tess.numIndexes += indexes;
-    }
-    else
-    {
-        for (i = 0; i < render_count; i++) {
-            collapse[i] = i;
-        }
-        for (i = 0; i < surf->numVerts; i++) {
-            collapse[i] = collapse[collapse_map[i]];
-        }
-
-        for (j = 0; j < indexes; j += 3)
-        {
-            if (collapse[triangles[j]] == collapse[triangles[j + 1]] ||
-                collapse[triangles[j + 1]] == collapse[triangles[j + 2]] ||
-                collapse[triangles[j + 2]] == collapse[triangles[j]])
-            {
-                break;
-            }
-
-            tess.indexes[baseIndex + j] = baseVertex + collapse[triangles[j]];
-            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
-            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
-        }
-        tess.numIndexes += j;
-    }
-
-    for (j = 0; j < render_count; j++) {
-        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
-        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
-        tess.texCoords[baseVertex + j][0][0] = surf->pStaticTexCoords[j][0][0];
-		tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
-		tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
-		tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
-    }
-
-    if (backEndData[backEnd.smpFrame]->staticModelData) {
-        const size_t offset = backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
-		assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
-		assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
-
-        const color4ub_t* in = (const color4ub_t*)&backEndData[backEnd.smpFrame]->staticModelData[offset];
-
-        for (i = 0; i < render_count; i++)
-        {
-			tess.vertexColors[baseVertex + i][0] = in[i][0];
-			tess.vertexColors[baseVertex + i][1] = in[i][1];
-			tess.vertexColors[baseVertex + i][2] = in[i][2];
-			tess.vertexColors[baseVertex + i][3] = in[i][3];
-        }
-    }
-    else {
-        for (i = 0; i < render_count; i++) {
-            tess.vertexColors[baseVertex + i][0] = 0xFF;
-            tess.vertexColors[baseVertex + i][1] = 0xFF;
-            tess.vertexColors[baseVertex + i][2] = 0xFF;
-            tess.vertexColors[baseVertex + i][3] = 0xFF;
-        }
-    }
-
-    tess.vertexColorValid = qtrue;
-}
-
-void R_PrintInfoStaticModels()
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderer/tr_surface.c b/code/renderer/tr_surface.c
deleted file mode 100644
index a61f3dad..00000000
--- a/code/renderer/tr_surface.c
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_surf.c
-#include "tr_local.h"
-
-/*
-
-  THIS ENTIRE FILE IS BACK END
-
-backEnd.currentEntity will be valid.
-
-Tess_Begin has already been called for the surface's shader.
-
-The modelview matrix will be set.
-
-It is safe to actually issue drawing commands here if you don't want to
-use the shader system.
-*/
-
-
-//============================================================================
-
-
-/*
-==============
-RB_CheckOverflow
-==============
-*/
-void RB_CheckOverflow( int verts, int indexes ) {
-	RB_EndSurface();
-
-	if ( verts >= SHADER_MAX_VERTEXES ) {
-		ri.Error(ERR_DROP, "RB_CheckOverflow: verts > MAX (%d > %d)", verts, SHADER_MAX_VERTEXES );
-	}
-	if ( indexes >= SHADER_MAX_INDEXES ) {
-		ri.Error(ERR_DROP, "RB_CheckOverflow: indices > MAX (%d > %d)", indexes, SHADER_MAX_INDEXES );
-	}
-
-	RB_BeginSurface(tess.shader);
-}
-
-
-/*
-==============
-RB_AddQuadStampExt
-==============
-*/
-void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 ) {
-	vec3_t		normal;
-	int			ndx;
-
-	RB_CHECKOVERFLOW( 4, 6 );
-
-	ndx = tess.numVertexes;
-
-	// triangle indexes for a simple quad
-	tess.indexes[ tess.numIndexes ] = ndx;
-	tess.indexes[ tess.numIndexes + 1 ] = ndx + 1;
-	tess.indexes[ tess.numIndexes + 2 ] = ndx + 3;
-
-	tess.indexes[ tess.numIndexes + 3 ] = ndx + 3;
-	tess.indexes[ tess.numIndexes + 4 ] = ndx + 1;
-	tess.indexes[ tess.numIndexes + 5 ] = ndx + 2;
-
-	tess.xyz[ndx][0] = origin[0] + left[0] + up[0];
-	tess.xyz[ndx][1] = origin[1] + left[1] + up[1];
-	tess.xyz[ndx][2] = origin[2] + left[2] + up[2];
-
-	tess.xyz[ndx+1][0] = origin[0] - left[0] + up[0];
-	tess.xyz[ndx+1][1] = origin[1] - left[1] + up[1];
-	tess.xyz[ndx+1][2] = origin[2] - left[2] + up[2];
-
-	tess.xyz[ndx+2][0] = origin[0] - left[0] - up[0];
-	tess.xyz[ndx+2][1] = origin[1] - left[1] - up[1];
-	tess.xyz[ndx+2][2] = origin[2] - left[2] - up[2];
-
-	tess.xyz[ndx+3][0] = origin[0] + left[0] - up[0];
-	tess.xyz[ndx+3][1] = origin[1] + left[1] - up[1];
-	tess.xyz[ndx+3][2] = origin[2] + left[2] - up[2];
-
-
-	// constant normal all the way around
-	VectorSubtract( vec3_origin, backEnd.viewParms.ori.axis[0], normal );
-
-	tess.normal[ndx][0] = tess.normal[ndx+1][0] = tess.normal[ndx+2][0] = tess.normal[ndx+3][0] = normal[0];
-	tess.normal[ndx][1] = tess.normal[ndx+1][1] = tess.normal[ndx+2][1] = tess.normal[ndx+3][1] = normal[1];
-	tess.normal[ndx][2] = tess.normal[ndx+1][2] = tess.normal[ndx+2][2] = tess.normal[ndx+3][2] = normal[2];
-	
-	// standard square texture coordinates
-	tess.texCoords[ndx][0][0] = tess.texCoords[ndx][1][0] = s1;
-	tess.texCoords[ndx][0][1] = tess.texCoords[ndx][1][1] = t1;
-
-	tess.texCoords[ndx+1][0][0] = tess.texCoords[ndx+1][1][0] = s2;
-	tess.texCoords[ndx+1][0][1] = tess.texCoords[ndx+1][1][1] = t1;
-
-	tess.texCoords[ndx+2][0][0] = tess.texCoords[ndx+2][1][0] = s2;
-	tess.texCoords[ndx+2][0][1] = tess.texCoords[ndx+2][1][1] = t2;
-
-	tess.texCoords[ndx+3][0][0] = tess.texCoords[ndx+3][1][0] = s1;
-	tess.texCoords[ndx+3][0][1] = tess.texCoords[ndx+3][1][1] = t2;
-
-	// constant color all the way around
-	// should this be identity and let the shader specify from entity?
-	* ( unsigned int * ) &tess.vertexColors[ndx] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+1] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+2] = 
-	* ( unsigned int * ) &tess.vertexColors[ndx+3] = 
-		* ( unsigned int * )color;
-
-
-	tess.numVertexes += 4;
-	tess.numIndexes += 6;
-	tess.dlightMap = 0;
-}
-
-/*
-==============
-RB_AddQuadStamp
-==============
-*/
-void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color ) {
-	RB_AddQuadStampExt( origin, left, up, color, 0, 0, 1, 1 );
-}
-
-/*
-==============
-RB_SurfaceSprite
-==============
-*/
-static void RB_SurfaceSprite( void ) {
-	vec3_t		left, up;
-	float		radius;
-
-	// calculate the xyz locations for the four corners
-	radius = backEnd.currentEntity->e.radius;
-	if ( backEnd.currentEntity->e.rotation == 0 ) {
-		VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
-		VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
-	} else {
-		float	s, c;
-		float	ang;
-		
-		ang = M_PI * backEnd.currentEntity->e.rotation / 180;
-		s = sin( ang );
-		c = cos( ang );
-
-		VectorScale( backEnd.viewParms.ori.axis[1], c * radius, left );
-		VectorMA( left, -s * radius, backEnd.viewParms.ori.axis[2], left );
-
-		VectorScale( backEnd.viewParms.ori.axis[2], c * radius, up );
-		VectorMA( up, s * radius, backEnd.viewParms.ori.axis[1], up );
-	}
-	if ( backEnd.viewParms.isMirror ) {
-		VectorSubtract( vec3_origin, left, left );
-	}
-
-	RB_AddQuadStamp( backEnd.currentEntity->e.origin, left, up, backEnd.currentEntity->e.shaderRGBA );
-}
-
-
-/*
-=============
-RB_SurfacePolychain
-=============
-*/
-void RB_SurfacePolychain( srfPoly_t *p ) {
-	int		i;
-	int		numv;
-
-	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
-
-	// fan triangles into the tess array
-	numv = tess.numVertexes;
-	for ( i = 0; i < p->numVerts; i++ ) {
-		VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
-		tess.texCoords[numv][0][0] = p->verts[i].st[0];
-		tess.texCoords[numv][0][1] = p->verts[i].st[1];
-		*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
-
-		numv++;
-	}
-
-	// generate fan indexes into the tess array
-	for ( i = 0; i < p->numVerts-2; i++ ) {
-		tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
-		tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
-		tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
-		tess.numIndexes += 3;
-	}
-
-	tess.vertexColorValid = qtrue;
-	tess.numVertexes = numv;
-}
-
-/*
-=============
-RB_SurfaceMarkFragment
-=============
-*/
-void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
-	int i;
-	int numv;
-
-	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
-
-	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
-	{
-		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
-		// common part could be extracted into an inline func
-
-		// fan triangles into the tess array
-		numv = tess.numVertexes;
-		for ( i = 0; i < p->numVerts; i++ )
-		{
-			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
-			tess.texCoords[numv][0][0] = p->verts[i].st[0];
-			tess.texCoords[numv][0][1] = p->verts[i].st[1];
-			*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
-
-			numv++;
-		}
-
-		// generate fan indexes into the tess array
-		for ( i = 0; i < p->numVerts - 2; i++ ) {
-			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
-			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
-			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
-			tess.numIndexes += 3;
-		}
-
-		tess.vertexColorValid = qtrue;
-		tess.numVertexes = numv;
-	}
-}
-
-/*
-=============
-RB_SurfaceTriangles
-=============
-*/
-void RB_SurfaceTriangles( srfTriangles_t *srf ) {
-	int			i;
-	drawVert_t	*dv;
-	float		*xyz, *normal, *texCoords;
-	byte		*color;
-	int			dlightBits;
-	qboolean	needsNormal;
-
-	dlightBits = srf->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	RB_CHECKOVERFLOW( srf->numVerts, srf->numIndexes );
-
-	for ( i = 0 ; i < srf->numIndexes ; i += 3 ) {
-		tess.indexes[ tess.numIndexes + i + 0 ] = tess.numVertexes + srf->indexes[ i + 0 ];
-		tess.indexes[ tess.numIndexes + i + 1 ] = tess.numVertexes + srf->indexes[ i + 1 ];
-		tess.indexes[ tess.numIndexes + i + 2 ] = tess.numVertexes + srf->indexes[ i + 2 ];
-	}
-	tess.numIndexes += srf->numIndexes;
-
-	dv = srf->verts;
-	xyz = tess.xyz[ tess.numVertexes ];
-	normal = tess.normal[ tess.numVertexes ];
-	texCoords = tess.texCoords[ tess.numVertexes ][0];
-	color = tess.vertexColors[ tess.numVertexes ];
-	needsNormal = tess.shader->needsNormal;
-
-	for ( i = 0 ; i < srf->numVerts ; i++, dv++, xyz += 4, normal += 4, texCoords += 4, color += 4 ) {
-		xyz[0] = dv->xyz[0];
-		xyz[1] = dv->xyz[1];
-		xyz[2] = dv->xyz[2];
-
-		if ( needsNormal ) {
-			normal[0] = dv->normal[0];
-			normal[1] = dv->normal[1];
-			normal[2] = dv->normal[2];
-		}
-
-		texCoords[0] = dv->st[0];
-		texCoords[1] = dv->st[1];
-
-		texCoords[2] = dv->lightmap[0];
-		texCoords[3] = dv->lightmap[1];
-
-		*(int *)color = *(int *)dv->color;
-	}
-
-	for ( i = 0 ; i < srf->numVerts ; i++ ) {
-		tess.vertexDlightBits[ tess.numVertexes + i] = dlightBits;
-	}
-
-	tess.numVertexes += srf->numVerts;
-}
-
-
-
-/*
-==============
-RB_SurfaceBeam
-==============
-*/
-void RB_SurfaceBeam( void ) 
-{
-#define NUM_BEAM_SEGS 6
-	refEntity_t *e;
-	int	i;
-	vec3_t perpvec;
-	vec3_t direction, normalized_direction;
-	vec3_t	start_points[NUM_BEAM_SEGS], end_points[NUM_BEAM_SEGS];
-	vec3_t oldorigin, origin;
-
-	e = &backEnd.currentEntity->e;
-
-	oldorigin[0] = e->oldorigin[0];
-	oldorigin[1] = e->oldorigin[1];
-	oldorigin[2] = e->oldorigin[2];
-
-	origin[0] = e->origin[0];
-	origin[1] = e->origin[1];
-	origin[2] = e->origin[2];
-
-	normalized_direction[0] = direction[0] = oldorigin[0] - origin[0];
-	normalized_direction[1] = direction[1] = oldorigin[1] - origin[1];
-	normalized_direction[2] = direction[2] = oldorigin[2] - origin[2];
-
-	if ( VectorNormalize( normalized_direction ) == 0 )
-		return;
-
-	PerpendicularVector( perpvec, normalized_direction );
-
-	VectorScale( perpvec, 4, perpvec );
-
-	for ( i = 0; i < NUM_BEAM_SEGS ; i++ )
-	{
-		RotatePointAroundVector( start_points[i], normalized_direction, perpvec, (360.0/NUM_BEAM_SEGS)*i );
-//		VectorAdd( start_points[i], origin, start_points[i] );
-		VectorAdd( start_points[i], direction, end_points[i] );
-	}
-
-	GL_Bind( tr.whiteImage );
-
-	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE );
-
-	qglColor3f( 1, 0, 0 );
-
-	qglBegin( GL_TRIANGLE_STRIP );
-	for ( i = 0; i <= NUM_BEAM_SEGS; i++ ) {
-		qglVertex3fv( start_points[ i % NUM_BEAM_SEGS] );
-		qglVertex3fv( end_points[ i % NUM_BEAM_SEGS] );
-	}
-	qglEnd();
-}
-
-/*
-==============
-RB_SurfaceFace
-==============
-*/
-void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
-	int			i;
-	qboolean	needsNormal;
-	unsigned	*indices, *tessIndexes;
-	float		*v;
-	float		*normal;
-	int			ndx;
-	int			Bob;
-	int			numPoints;
-	int			dlightBits;
-
-	RB_CHECKOVERFLOW( surf->numPoints, surf->numIndices );
-
-	dlightBits = surf->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	if ((tess.shader->surfaceFlags & SURF_NODLIGHT) || (tess.shader->surfaceFlags & SURF_SKY)) {
-		tess.dlightBits = 0;
-	}
-
-	indices = ( unsigned * ) ( ( ( char  * ) surf ) + surf->ofsIndices );
-
-	Bob = tess.numVertexes;
-	tessIndexes = tess.indexes + tess.numIndexes;
-	for ( i = surf->numIndices-1 ; i >= 0  ; i-- ) {
-		tessIndexes[i] = indices[i] + Bob;
-	}
-
-	tess.numIndexes += surf->numIndices;
-
-	numPoints = surf->numPoints;
-
-	needsNormal = qfalse;
-	if (tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights) {
-		needsNormal = qtrue;
-	}
-
-	v = surf->points[0];
-
-	ndx = tess.numVertexes;
-
-	if (needsNormal) {
-		normal = surf->plane.normal;
-		for ( i = 0, ndx = tess.numVertexes; i < numPoints; i++, ndx++ ) {
-			VectorCopy( normal, tess.normal[ndx] );
-		}
-	}
-
-	if (tess.dlightMap)
-	{
-		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
-			VectorCopy(v, tess.xyz[ndx]);
-			tess.texCoords[ndx][0][0] = v[3];
-			tess.texCoords[ndx][0][1] = v[4];
-			tess.texCoords[ndx][1][0] = v[5] + surf->lightmapOffset[0];
-			tess.texCoords[ndx][1][1] = v[6] + surf->lightmapOffset[1];
-			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
-			tess.vertexDlightBits[ndx] = dlightBits;
-		}
-	}
-	else
-	{
-		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
-			VectorCopy(v, tess.xyz[ndx]);
-			tess.texCoords[ndx][0][0] = v[3];
-			tess.texCoords[ndx][0][1] = v[4];
-			tess.texCoords[ndx][1][0] = v[5];
-			tess.texCoords[ndx][1][1] = v[6];
-			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
-			tess.vertexDlightBits[ndx] = dlightBits;
-		}
-	}
-
-
-	tess.numVertexes += surf->numPoints;
-}
-
-
-static float	LodErrorForVolume( vec3_t local, float radius ) {
-	vec3_t		world;
-	float		d;
-
-	// never let it go negative
-	if ( r_lodCurveError->value < 0 ) {
-		return 0;
-	}
-
-	world[0] = local[0] * backEnd.ori.axis[0][0] + local[1] * backEnd.ori.axis[1][0] + 
-		local[2] * backEnd.ori.axis[2][0] + backEnd.ori.origin[0];
-	world[1] = local[0] * backEnd.ori.axis[0][1] + local[1] * backEnd.ori.axis[1][1] + 
-		local[2] * backEnd.ori.axis[2][1] + backEnd.ori.origin[1];
-	world[2] = local[0] * backEnd.ori.axis[0][2] + local[1] * backEnd.ori.axis[1][2] + 
-		local[2] * backEnd.ori.axis[2][2] + backEnd.ori.origin[2];
-
-	VectorSubtract( world, backEnd.viewParms.ori.origin, world );
-	d = DotProduct( world, backEnd.viewParms.ori.axis[0] );
-
-	if ( d < 0 ) {
-		d = -d;
-	}
-	d -= radius;
-	if ( d < 1 ) {
-		d = 1;
-	}
-
-	return r_lodCurveError->value / d;
-}
-
-/*
-=============
-RB_SurfaceGrid
-
-Just copy the grid of points and triangulate
-=============
-*/
-void RB_SurfaceGrid( srfGridMesh_t *cv ) {
-	int		i, j;
-	float	*xyz;
-	float	*texCoords;
-	float	*normal;
-	unsigned char *color;
-	drawVert_t	*dv;
-	int		rows, irows, vrows;
-	int		used;
-	int		widthTable[MAX_GRID_SIZE];
-	int		heightTable[MAX_GRID_SIZE];
-	float	lodError;
-	int		lodWidth, lodHeight;
-	int		numVertexes;
-	int		dlightBits;
-	int		*vDlightBits;
-	qboolean	needsNormal;
-
-	dlightBits = cv->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-
-	// determine the allowable discrepance
-	lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
-
-	// determine which rows and columns of the subdivision
-	// we are actually going to use
-	widthTable[0] = 0;
-	lodWidth = 1;
-	for ( i = 1 ; i < cv->width-1 ; i++ ) {
-		if ( cv->widthLodError[i] <= lodError ) {
-			widthTable[lodWidth] = i;
-			lodWidth++;
-		}
-	}
-	widthTable[lodWidth] = cv->width-1;
-	lodWidth++;
-
-	heightTable[0] = 0;
-	lodHeight = 1;
-	for ( i = 1 ; i < cv->height-1 ; i++ ) {
-		if ( cv->heightLodError[i] <= lodError ) {
-			heightTable[lodHeight] = i;
-			lodHeight++;
-		}
-	}
-	heightTable[lodHeight] = cv->height-1;
-	lodHeight++;
-
-
-	// very large grids may have more points or indexes than can be fit
-	// in the tess structure, so we may have to issue it in multiple passes
-
-	used = 0;
-	rows = 0;
-	while ( used < lodHeight - 1 ) {
-		// see how many rows of both verts and indexes we can add without overflowing
-		do {
-			vrows = ( SHADER_MAX_VERTEXES - tess.numVertexes ) / lodWidth;
-			irows = ( SHADER_MAX_INDEXES - tess.numIndexes ) / ( lodWidth * 6 );
-
-			// if we don't have enough space for at least one strip, flush the buffer
-			if ( vrows < 2 || irows < 1 ) {
-				RB_EndSurface();
-				RB_BeginSurface(tess.shader);
-			} else {
-				break;
-			}
-		} while ( 1 );
-		
-		rows = irows;
-		if ( vrows < irows + 1 ) {
-			rows = vrows - 1;
-		}
-		if ( used + rows > lodHeight ) {
-			rows = lodHeight - used;
-		}
-
-		numVertexes = tess.numVertexes;
-
-		xyz = tess.xyz[numVertexes];
-		normal = tess.normal[numVertexes];
-		texCoords = tess.texCoords[numVertexes][0];
-		color = ( unsigned char * ) &tess.vertexColors[numVertexes];
-		vDlightBits = &tess.vertexDlightBits[numVertexes];
-		needsNormal = tess.shader->needsNormal;
-
-		for ( i = 0 ; i < rows ; i++ ) {
-			for ( j = 0 ; j < lodWidth ; j++ ) {
-				dv = cv->verts + heightTable[ used + i ] * cv->width
-					+ widthTable[ j ];
-
-				xyz[0] = dv->xyz[0];
-				xyz[1] = dv->xyz[1];
-				xyz[2] = dv->xyz[2];
-				texCoords[0] = dv->st[0];
-				texCoords[1] = dv->st[1];
-				texCoords[2] = dv->lightmap[0];
-				texCoords[3] = dv->lightmap[1];
-				if ( needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights ) {
-					normal[0] = dv->normal[0];
-					normal[1] = dv->normal[1];
-					normal[2] = dv->normal[2];
-				}
-				* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-				*vDlightBits++ = dlightBits;
-				xyz += 4;
-				normal += 4;
-				texCoords += 4;
-				color += 4;
-			}
-		}
-
-
-		// add the indexes
-		{
-			int		numIndexes;
-			int		w, h;
-
-			h = rows - 1;
-			w = lodWidth - 1;
-			numIndexes = tess.numIndexes;
-			for (i = 0 ; i < h ; i++) {
-				for (j = 0 ; j < w ; j++) {
-					int		v1, v2, v3, v4;
-			
-					// vertex order to be reckognized as tristrips
-					v1 = numVertexes + i*lodWidth + j + 1;
-					v2 = v1 - 1;
-					v3 = v2 + lodWidth;
-					v4 = v3 + 1;
-
-					tess.indexes[numIndexes] = v2;
-					tess.indexes[numIndexes+1] = v3;
-					tess.indexes[numIndexes+2] = v1;
-					
-					tess.indexes[numIndexes+3] = v1;
-					tess.indexes[numIndexes+4] = v3;
-					tess.indexes[numIndexes+5] = v4;
-					numIndexes += 6;
-				}
-			}
-
-			tess.numIndexes = numIndexes;
-		}
-
-		tess.numVertexes += rows * lodWidth;
-
-		used += rows - 1;
-	}
-}
-
-
-/*
-===========================================================================
-
-NULL MODEL
-
-===========================================================================
-*/
-
-/*
-===================
-RB_SurfaceAxis
-
-Draws x/y/z lines from the origin for orientation debugging
-===================
-*/
-void RB_SurfaceAxis( void ) {
-	GL_Bind( tr.whiteImage );
-	qglLineWidth( 3 );
-	qglBegin( GL_LINES );
-	qglColor3f( 1,0,0 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 16,0,0 );
-	qglColor3f( 0,1,0 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 0,16,0 );
-	qglColor3f( 0,0,1 );
-	qglVertex3f( 0,0,0 );
-	qglVertex3f( 0,0,16 );
-	qglEnd();
-	qglLineWidth( 1 );
-}
-
-//===========================================================================
-
-/*
-====================
-RB_SurfaceEntity
-
-Entities that have a single procedurally generated surface
-====================
-*/
-void RB_SurfaceEntity( surfaceType_t *surfType ) {
-	switch( backEnd.currentEntity->e.reType ) {
-	case RT_SPRITE:
-		RB_SurfaceSprite();
-		break;
-	case RT_BEAM:
-		RB_SurfaceBeam();
-		break;
-	default:
-		RB_SurfaceAxis();
-		break;
-	}
-	return;
-}
-
-void RB_SurfaceBad( surfaceType_t *surfType ) {
-	ri.Printf( PRINT_ALL, "Bad surface tesselated.\n" );
-}
-
-#if 0
-
-void RB_SurfaceFlare( srfFlare_t *surf ) {
-	vec3_t		left, up;
-	float		radius;
-	byte		color[4];
-	vec3_t		dir;
-	vec3_t		origin;
-	float		d;
-
-	// calculate the xyz locations for the four corners
-	radius = 30;
-	VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
-	VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
-	if ( backEnd.viewParms.isMirror ) {
-		VectorSubtract( vec3_origin, left, left );
-	}
-
-	color[0] = color[1] = color[2] = color[3] = 255;
-
-	VectorMA( surf->origin, 3, surf->normal, origin );
-	VectorSubtract( origin, backEnd.viewParms.ori.origin, dir );
-	VectorNormalize( dir );
-	VectorMA( origin, r_ignore->value, dir, origin );
-
-	d = -DotProduct( dir, surf->normal );
-	if ( d < 0 ) {
-		return;
-	}
-#if 0
-	color[0] *= d;
-	color[1] *= d;
-	color[2] *= d;
-#endif
-
-	RB_AddQuadStamp( origin, left, up, color );
-}
-
-#else
-
-void RB_SurfaceFlare( srfFlare_t *surf ) {
-#if 0
-	vec3_t		left, up;
-	byte		color[4];
-
-	color[0] = surf->color[0] * 255;
-	color[1] = surf->color[1] * 255;
-	color[2] = surf->color[2] * 255;
-	color[3] = 255;
-
-	VectorClear( left );
-	VectorClear( up );
-
-	left[0] = r_ignore->value;
-
-	up[1] = r_ignore->value;
-	
-	RB_AddQuadStampExt( surf->origin, left, up, color, 0, 0, 1, 1 );
-#endif
-}
-
-#endif
-
-
-
-void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
-	// all apropriate state must be set in RB_BeginSurface
-	// this isn't implemented yet...
-	qglCallList( surf->listNum );
-}
-
-void RB_SurfaceSkip( void *surf ) {
-}
-
-void RB_DrawTerrainTris(srfTerrain_t* p) {
-	int i;
-	terraInt numv;
-	int dlightBits;
-
-	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
-
-	dlightBits = p->dlightBits[backEnd.smpFrame];
-	tess.dlightBits |= dlightBits;
-	if (p->dlightMap[backEnd.smpFrame])
-	{
-		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
-
-		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
-			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
-
-			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
-			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
-			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
-			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0] * lmScale + p->lmapX;
-			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1] * lmScale + p->lmapY;
-			tess.normal[tess.numVertexes][0] = 0;
-			tess.normal[tess.numVertexes][1] = 0;
-			tess.normal[tess.numVertexes][2] = 1.0;
-			tess.vertexColors[tess.numVertexes][0] = -1;
-			tess.vertexColors[tess.numVertexes][1] = -1;
-			tess.vertexColors[tess.numVertexes][2] = -1;
-			tess.vertexColors[tess.numVertexes][3] = -1;
-
-			g_pVert[i].iVertArray = tess.numVertexes;
-			tess.numVertexes++;
-		}
-	}
-	else
-	{
-		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
-			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
-
-			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
-			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
-			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
-			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0];
-			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1];
-			tess.vertexDlightBits[tess.numVertexes] = dlightBits;
-			tess.normal[tess.numVertexes][0] = 0;
-			tess.normal[tess.numVertexes][1] = 0;
-			tess.normal[tess.numVertexes][2] = 1.0;
-			tess.vertexColors[tess.numVertexes][0] = -1;
-			tess.vertexColors[tess.numVertexes][1] = -1;
-			tess.vertexColors[tess.numVertexes][2] = -1;
-			tess.vertexColors[tess.numVertexes][3] = -1;
-
-			g_pVert[i].iVertArray = tess.numVertexes;
-			tess.numVertexes++;
-		}
-	}
-
-	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
-	{
-		assert(tess.numVertexes < SHADER_MAX_INDEXES);
-
-		//
-		// Make sure these can be drawn
-		//
-		if (g_pTris[i].byConstChecks & 4)
-		{
-			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
-			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
-			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
-			tess.numIndexes += 3;
-		}
-	}
-}
-
-void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
-	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
-	(void(*)(void*))RB_SurfaceSkip,			// SF_SKIP, 
-	(void(*)(void*))RB_SurfaceFace,			// SF_FACE,
-    (void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
-    (void(*)(void*))RB_SurfacePolychain,	// SF_POLY,
-	(void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
-    (void(*)(void*))RB_SurfaceFlare,		// SF_FLARE
-    (void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
-    (void(*)(void*))RB_SurfaceDisplayList,	// SF_DISPLAY_LIST
-	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
-	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
-	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
-	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
-	(void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
-	(void(*)(void*))RB_SurfaceTriangles,	// SF_TRIANGLES,
-};
diff --git a/code/renderer/tr_terrain.c b/code/renderer/tr_terrain.c
deleted file mode 100644
index 7ed98a69..00000000
--- a/code/renderer/tr_terrain.c
+++ /dev/null
@@ -1,1526 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_terrain.c : Terrain rendering
-
-#include "tr_local.h"
-
-cvar_t* ter_maxlod;
-cvar_t* ter_maxtris;
-cvar_t* ter_cull;
-cvar_t* ter_lock;
-cvar_t* ter_error;
-cvar_t* ter_cautiousframes;
-cvar_t* ter_count;
-
-#define TERRAIN_TABLE_SIZE	180
-
-static float g_fDistanceTable[TERRAIN_TABLE_SIZE];
-static float g_fClipDotProductTable[TERRAIN_TABLE_SIZE];
-static float g_fClipDotSquaredTable[TERRAIN_TABLE_SIZE];
-static float g_fFogDistance;
-static float g_fClipDotProduct;
-static float g_fClipDotSquared;
-
-static vec3_t g_vClipOrigin;
-static vec3_t g_vClipVector;
-static vec3_t g_vViewOrigin;
-static vec3_t g_vViewVector;
-
-static int g_terVisCount;
-static float g_fCheck;
-static size_t g_nTris;
-static size_t g_nVerts;
-static int g_nMerge;
-static int g_nSplit;
-unsigned int g_uiTerDist;
-vec2_t g_vTerOrg;
-vec3_t g_vTerFwd;
-
-static const unsigned int MAX_TERRAIN_LOD = 6;
-static const float TERRAIN_LIGHTMAP_SIZE = 128.0f;
-
-typedef struct poolInfo_s
-{
-	terraInt iFreeHead;
-	terraInt iCur;
-	size_t nFree;
-} poolInfo_t;
-
-static int modeTable[8];
-
-terraTri_t* g_pTris;
-terrainVert_t* g_pVert;
-
-poolInfo_t g_tri;
-poolInfo_t g_vert;
-
-static void R_ValidateHeightmapForVertex(terraTri_t* pTri)
-{
-	for (terraInt i = 0; i < 3; i++)
-	{
-		terrainVert_t* pVert = &g_pVert[pTri->iPt[i]];
-		if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80])
-		{
-			pVert->pHgt = pTri->patch->heightmap;
-		}
-	}
-}
-
-static terraInt R_AllocateVert(cTerraPatchUnpacked_t* patch)
-{
-	terraInt iVert = g_vert.iFreeHead;
-
-	g_vert.iFreeHead = g_pVert[g_vert.iFreeHead].iNext;
-	g_pVert[g_vert.iFreeHead].iPrev = 0;
-
-	g_pVert[iVert].iPrev = 0;
-	g_pVert[iVert].iNext = patch->drawinfo.iVertHead;
-	g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
-
-	patch->drawinfo.iVertHead = iVert;
-	patch->drawinfo.nVerts++;
-	g_vert.nFree--;
-
-	g_pVert[iVert].nRef = 0;
-	g_pVert[iVert].uiDistRecalc = 0;
-
-	return iVert;
-}
-
-static void R_InterpolateVert(terraTri_t* pTri, terrainVert_t* pVert)
-{
-	const terrainVert_t* pVert0 = &g_pVert[pTri->iPt[0]];
-	const terrainVert_t* pVert1 = &g_pVert[pTri->iPt[1]];
-	const cTerraPatchUnpacked_t* pPatch = pTri->patch;
-
-	// Interpolate texture coordinates
-	pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
-	pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
-	pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
-	pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
-
-	pVert->pHgt = (uint8_t*)(((size_t)pVert0->pHgt + (size_t)pVert1->pHgt) >> 1);
-	pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
-	pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
-	pVert->fHgtAvg += pPatch->z0;
-	pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
-	pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
-	pVert->xyz[2] = pVert->fHgtAvg;
-}
-
-static void R_ReleaseVert(cTerraPatchUnpacked_t* patch, int iVert)
-{
-	terrainVert_t* pVert = &g_pVert[iVert];
-
-	terraInt iPrev = pVert->iPrev;
-	terraInt iNext = pVert->iNext;
-	g_pVert[iPrev].iNext = iNext;
-	g_pVert[iNext].iPrev = iPrev;
-
-	assert(patch->drawinfo.nVerts > 0);
-	patch->drawinfo.nVerts--;
-
-	if (patch->drawinfo.iVertHead == iVert)
-	{
-		patch->drawinfo.iVertHead = iNext;
-	}
-
-	pVert->iPrev = 0;
-	pVert->iNext = g_vert.iFreeHead;
-	g_pVert[g_vert.iFreeHead].iPrev = iVert;
-	g_vert.iFreeHead = iVert;
-	g_vert.nFree++;
-}
-
-terraInt R_AllocateTri(cTerraPatchUnpacked_t* patch, qboolean check)
-{
-	terraInt iTri = g_tri.iFreeHead;
-
-	g_tri.iFreeHead = g_pTris[iTri].iNext;
-	g_pTris[g_tri.iFreeHead].iPrev = 0;
-
-	g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
-	g_pTris[iTri].iNext = 0;
-	g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
-	patch->drawinfo.iTriTail = iTri;
-
-	if (!patch->drawinfo.iTriHead)
-	{
-		patch->drawinfo.iTriHead = iTri;
-	}
-
-	patch->drawinfo.nTris++;
-	g_tri.nFree--;
-
-	g_pTris[iTri].byConstChecks = check ? 0 : 4;
-	g_pTris[iTri].uiDistRecalc = 0;
-	patch->uiDistRecalc = 0;
-
-	return iTri;
-}
-
-static void R_ReleaseTri(cTerraPatchUnpacked_t* patch, terraInt iTri)
-{
-	terraTri_t* pTri = &g_pTris[iTri];
-
-	terraInt iPrev = pTri->iPrev;
-	terraInt iNext = pTri->iNext;
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
-
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
-
-	patch->uiDistRecalc = 0;
-
-	assert(patch->drawinfo.nTris > 0);
-	patch->drawinfo.nTris--;
-
-	if (patch->drawinfo.iTriHead == iTri)
-	{
-		patch->drawinfo.iTriHead = iNext;
-	}
-
-	if (patch->drawinfo.iTriTail == iTri)
-	{
-		patch->drawinfo.iTriTail = iPrev;
-	}
-
-	pTri->iPrev = 0;
-	pTri->iNext = g_tri.iFreeHead;
-	g_pTris[g_tri.iFreeHead].iPrev = iTri;
-	g_tri.iFreeHead = iTri;
-	g_tri.nFree++;
-
-	for (int i = 0; i < 3; i++)
-	{
-		terraInt ptNum = pTri->iPt[i];
-
-		g_pVert[ptNum].nRef--;
-		if (!g_pVert[ptNum].nRef) {
-			R_ReleaseVert(patch, ptNum);
-		}
-	}
-}
-
-static int R_ConstChecksForTri(terraTri_t* pTri)
-{
-	varnodeUnpacked_t vn;
-
-	if (pTri->lod == MAX_TERRAIN_LOD) {
-		return 2;
-	}
-
-	vn = *pTri->varnode;
-	vn.s.flags &= 0xF0u;
-
-	if (vn.fVariance == 0.0 && !(pTri->varnode->s.flags & 8)) {
-		return 2;
-	} else if (pTri->varnode->s.flags & 8) {
-		return 3;
-	} else if ((pTri->byConstChecks & 4) && !(pTri->varnode->s.flags & 4) && pTri->lod < ter_maxlod->integer) {
-		return 0;
-	}
-
-	return 2;
-}
-
-static void R_DemoteInAncestry(cTerraPatchUnpacked_t* patch, terraInt iTri)
-{
-	terraInt iPrev = g_pTris[iTri].iPrev;
-	terraInt iNext = g_pTris[iTri].iNext;
-
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
-
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
-
-	assert(patch->drawinfo.nTris > 0);
-	patch->drawinfo.nTris--;
-
-	if (patch->drawinfo.iTriHead == iTri)
-	{
-		patch->drawinfo.iTriHead = iNext;
-	}
-
-	if (patch->drawinfo.iTriTail == iTri)
-	{
-		patch->drawinfo.iTriTail = iPrev;
-	}
-
-	g_pTris[iTri].iPrev = 0;
-	g_pTris[iTri].iNext = patch->drawinfo.iMergeHead;
-	g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
-	patch->drawinfo.iMergeHead = iTri;
-}
-
-static void R_TerrainHeapInit()
-{
-	g_tri.iFreeHead = 1;
-	g_tri.nFree = g_nTris - 1;
-	g_vert.iFreeHead = 1;
-	g_vert.nFree = g_nVerts - 1;
-
-	for (size_t i = 0; i < g_nTris; i++)
-	{
-		g_pTris[i].iPrev = (terraInt)i - 1;
-		g_pTris[i].iNext = (terraInt)i + 1;
-	}
-
-	g_pTris[0].iPrev = 0;
-	g_pTris[g_nTris - 1].iNext = 0;
-
-	for (size_t i = 0; i < g_nVerts; i++)
-	{
-		g_pVert[i].iPrev = (terraInt)i - 1;
-		g_pVert[i].iNext = (terraInt)i + 1;
-	}
-
-	g_pVert[0].iPrev = 0;
-	g_pVert[g_nVerts - 1].iNext = 0;
-}
-
-static void R_TerrainPatchesInit()
-{
-	int i;
-
-	for (i = 0; i < tr.world->numTerraPatches; i++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[i];
-		patch->drawinfo.iTriHead = 0;
-		patch->drawinfo.iTriTail = 0;
-		patch->drawinfo.iMergeHead = 0;
-		patch->drawinfo.iVertHead = 0;
-		patch->drawinfo.nTris = 0;
-		patch->drawinfo.nVerts = 0;
-	}
-}
-
-void R_SplitTri(terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight)
-{
-	terraTri_t* pSplit = &g_pTris[iSplit];
-
-	terraTri_t* pLeft;
-	if (iLeft) {
-		pLeft = &g_pTris[iLeft];
-	} else {
-		pLeft = NULL;
-	}
-
-	terraTri_t* pRight;
-	if (iRight) {
-		pRight = &g_pTris[iRight];
-	} else {
-		pRight = NULL;
-	}
-
-	int iNextLod = pSplit->lod + 1;
-	int index = pSplit->index;
-	varnodeUnpacked_t* varnode = &pSplit->varnode[index];
-
-	if (pLeft)
-	{
-		pLeft->patch = pSplit->patch;
-		pLeft->index = index * 2;
-		pLeft->varnode = varnode;
-		pLeft->lod = iNextLod;
-		pLeft->iLeft = iRight;
-		pLeft->iRight = iRightOfLeft;
-		pLeft->iBase = pSplit->iLeft;
-		pLeft->iPt[0] = pSplit->iPt[1];
-		pLeft->iPt[1] = pSplit->iPt[2];
-		pLeft->iPt[2] = iNewPt;
-
-		R_ValidateHeightmapForVertex(pLeft);
-		pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
-
-		g_pVert[pLeft->iPt[0]].nRef++;
-		g_pVert[pLeft->iPt[1]].nRef++;
-		g_pVert[pLeft->iPt[2]].nRef++;
-		g_pTris[pSplit->iParent].nSplit++;
-		pLeft->nSplit = 0;
-	}
-
-	if (pSplit->iLeft)
-	{
-		if (g_pTris[pSplit->iLeft].lod == iNextLod)
-		{
-			g_pTris[pSplit->iLeft].iBase = iLeft;
-		}
-		else
-		{
-			g_pTris[pSplit->iLeft].iRight = iLeft;
-		}
-	}
-
-	if (pRight)
-	{
-		pRight->patch = pSplit->patch;
-		pRight->index = index * 2 + 1;
-		pRight->varnode = varnode + 1;
-		pRight->lod = iNextLod;
-		pRight->iLeft = iLeftOfRight;
-		pRight->iRight = iLeft;
-		pRight->iBase = pSplit->iRight;
-		pRight->iPt[0] = pSplit->iPt[2];
-		pRight->iPt[1] = pSplit->iPt[0];
-		pRight->iPt[2] = iNewPt;
-
-		R_ValidateHeightmapForVertex(pRight);
-		pRight->byConstChecks |= R_ConstChecksForTri(pRight);
-
-		g_pVert[pRight->iPt[0]].nRef++;
-		g_pVert[pRight->iPt[1]].nRef++;
-		g_pVert[pRight->iPt[2]].nRef++;
-		g_pTris[pSplit->iParent].nSplit++;
-		pRight->nSplit = 0;
-	}
-
-	if (pSplit->iRight)
-	{
-		if (g_pTris[pSplit->iRight].lod == iNextLod)
-		{
-			g_pTris[pSplit->iRight].iBase = iRight;
-		}
-		else
-		{
-			g_pTris[pSplit->iRight].iLeft = iRight;
-		}
-	}
-}
-
-static void R_ForceSplit(terraInt iTri)
-{
-	terraTri_t* pTri = &g_pTris[iTri];
-
-	g_nSplit++;
-
-	terraInt iBase = pTri->iBase;
-	terraTri_t* pBase = &g_pTris[iBase];
-	if (iBase && pBase->lod != pTri->lod)
-	{
-		R_ForceSplit(iBase);
-		iBase = pTri->iBase;
-		pBase = &g_pTris[iBase];
-	}
-
-	uint8_t flags = pTri->varnode->s.flags;
-
-	terraInt iTriLeft = R_AllocateTri(pTri->patch, (flags & 2));
-	terraInt iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
-
-	terraInt iNewPt = R_AllocateVert(pTri->patch);
-	R_InterpolateVert(pTri, &g_pVert[iNewPt]);
-
-	g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
-
-	terraInt iBaseLeft = 0;
-	terraInt iBaseRight = 0;
-
-	if (iBase)
-	{
-		uint8_t flags2 = pBase->varnode->s.flags;
-		flags |= flags2;
-
-		iBaseLeft = R_AllocateTri(pBase->patch, (flags2 & 2));
-		iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
-
-		terraInt iNewBasePt = iNewPt;
-		if (pBase->patch != pTri->patch)
-		{
-			iNewBasePt = R_AllocateVert(pBase->patch);
-			terrainVert_t* pVert = &g_pVert[iNewBasePt];
-			R_InterpolateVert(pBase, pVert);
-
-			pVert->fVariance = g_pVert[iNewPt].fVariance;
-			if (flags & 8)
-			{
-				pVert->fHgtAvg += pVert->fHgtAdd;
-				pVert->fHgtAdd = 0.0;
-				pVert->fVariance = 0.0;
-				pVert->xyz[2] = pVert->fHgtAvg;
-			}
-		}
-
-		R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
-
-		pBase->iLeftChild = iBaseLeft;
-		pBase->iRightChild = iBaseRight;
-		g_pTris[iBaseLeft].iParent = iBase;
-		g_pTris[iBaseRight].iParent = iBase;
-		R_DemoteInAncestry(pBase->patch, iBase);
-	}
-
-	if (flags & 8)
-	{
-		terrainVert_t* pVert = &g_pVert[iNewPt];
-		pVert->fHgtAvg += pVert->fHgtAdd;
-		pVert->fHgtAdd = 0.0;
-		pVert->fVariance = 0.0;
-		pVert->xyz[2] = pVert->fHgtAvg;
-	}
-
-	R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
-
-	pTri->iLeftChild = iTriLeft;
-	pTri->iRightChild = iTriRight;
-	g_pTris[iTriLeft].iParent = iTri;
-	g_pTris[iTriRight].iParent = iTri;
-	R_DemoteInAncestry(pTri->patch, iTri);
-}
-
-static void R_ForceMerge(terraInt iTri)
-{
-	terraTri_t* pTri = &g_pTris[iTri];
-	cTerraPatchUnpacked_t* patch = pTri->patch;
-	terraInt iPrev = pTri->iPrev;
-	terraInt iNext = pTri->iNext;
-
-	g_nMerge++;
-
-	if (pTri->iLeftChild)
-	{
-		terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
-
-		g_pTris[iTri].iLeft = iLeft;
-		if (iLeft)
-		{
-			if (g_pTris[iLeft].lod == pTri->lod)
-			{
-				g_pTris[iLeft].iRight = iTri;
-			}
-			else
-			{
-				g_pTris[iLeft].iBase = iTri;
-			}
-		}
-
-		R_ReleaseTri(pTri->patch, pTri->iLeftChild);
-
-		pTri->iLeftChild = 0;
-		g_pTris[pTri->iParent].nSplit--;
-	}
-
-	if (pTri->iRightChild)
-	{
-		terraInt iRight = g_pTris[pTri->iRightChild].iBase;
-		g_pTris[iTri].iRight = iRight;
-		if (iRight)
-		{
-			if (g_pTris[iRight].lod == pTri->lod)
-			{
-				g_pTris[iRight].iLeft = iTri;
-			}
-			else
-			{
-				g_pTris[iRight].iBase = iTri;
-			}
-		}
-
-		R_ReleaseTri(pTri->patch, pTri->iRightChild);
-
-		pTri->iLeftChild = 0;
-		g_pTris[pTri->iParent].nSplit--;
-	}
-
-	g_pTris[iPrev].iNext = iNext;
-	g_pTris[iNext].iPrev = iPrev;
-
-	if (g_tri.iCur == iTri)
-	{
-		g_tri.iCur = iNext;
-	}
-
-	patch->drawinfo.nTris++;
-	if (patch->drawinfo.iMergeHead == iTri)
-	{
-		patch->drawinfo.iMergeHead = iNext;
-	}
-
-	g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
-	g_pTris[iTri].iNext = 0;
-
-	g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
-
-	patch->drawinfo.iTriTail = iTri;
-	if (!patch->drawinfo.iTriHead)
-	{
-		patch->drawinfo.iTriHead = iTri;
-	}
-}
-
-static int R_TerraTriNeighbor(cTerraPatchUnpacked_t* terraPatches, int iPatch, int dir)
-{
-	if (iPatch >= 0)
-	{
-		int iNeighbor = 2 * iPatch + 1;
-
-		if (dir == 1)
-		{
-			if (terraPatches[iPatch].flags & 0x80)
-			{
-				return iNeighbor;
-			}
-			else
-			{
-				return iNeighbor + 1;
-			}
-		}
-		else if (dir > 1)
-		{
-			if (dir == 2)
-			{
-				return 2 * iPatch + 2;
-			}
-			if (dir == 3)
-			{
-				if (terraPatches[iPatch].flags & 0x80)
-				{
-					return iNeighbor + 1;
-				}
-				else
-				{
-					return iNeighbor;
-				}
-			}
-		}
-		else if (!dir)
-		{
-			return 2 * iPatch + 1;
-		}
-	}
-
-	return 0;
-}
-
-static void R_PreTessellateTerrain()
-{
-	size_t numTerrainPatches = tr.world->numTerraPatches;
-
-	if (!numTerrainPatches) {
-		return;
-	}
-
-	R_SyncRenderThread();
-
-	if (ter_maxtris->integer < 4 * numTerrainPatches) {
-		Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
-	}
-	else if (ter_maxtris->integer > 65535) {
-		Cvar_SetValue("ter_maxtris", 65535);
-	}
-
-	Com_DPrintf("Using ter_maxtris = %d\n", ter_maxtris->integer);
-
-	g_nTris = ter_maxtris->integer * 2 + 1;
-	g_nVerts = ter_maxtris->integer + 1;
-	g_pTris = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
-	g_pVert = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
-
-	// Init triangles & vertices
-	R_TerrainHeapInit();
-	R_TerrainPatchesInit();
-
-	for (size_t i = 0; i < numTerrainPatches; i++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[i];
-
-		patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
-		patch->drawinfo.nTris = 0;
-		patch->drawinfo.nVerts = 0;
-		patch->drawinfo.iTriHead = 0;
-		patch->drawinfo.iTriTail = 0;
-		patch->drawinfo.iVertHead = 0;
-
-		float sMin, tMin;
-
-		if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0])
-		{
-			sMin = patch->texCoord[0][0][0];
-		}
-		else
-		{
-			sMin = patch->texCoord[0][1][0];
-		}
-
-		float sMin2;
-		if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0])
-		{
-			sMin2 = patch->texCoord[1][0][0];
-		}
-		else
-		{
-			sMin2 = patch->texCoord[1][1][0];
-		}
-
-		if (sMin >= sMin2)
-		{
-			if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0])
-			{
-				sMin = floor(patch->texCoord[1][1][0]);
-			}
-			else
-			{
-				sMin = floor(patch->texCoord[1][0][0]);
-			}
-		}
-		else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0])
-		{
-			sMin = floor(patch->texCoord[0][1][0]);
-		}
-		else
-		{
-			sMin = floor(patch->texCoord[0][0][0]);
-		}
-
-		if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1])
-		{
-			tMin = patch->texCoord[0][0][1];
-		}
-		else
-		{
-			tMin = patch->texCoord[0][1][1];
-		}
-
-		float tMin2;
-		if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1])
-		{
-			tMin2 = patch->texCoord[1][0][1];
-		}
-		else
-		{
-			tMin2 = patch->texCoord[1][1][1];
-		}
-
-		if (tMin >= tMin2)
-		{
-			if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1])
-			{
-				tMin = floor(patch->texCoord[1][1][1]);
-			}
-			else
-			{
-				tMin = floor(patch->texCoord[1][0][1]);
-			}
-		}
-		else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1])
-		{
-			tMin = floor(patch->texCoord[0][1][1]);
-		}
-		else
-		{
-			tMin = floor(patch->texCoord[0][0][1]);
-		}
-
-		const float s00 = patch->texCoord[0][0][0] - sMin;
-		const float s01 = patch->texCoord[0][1][0] - sMin;
-		const float s10 = patch->texCoord[1][0][0] - sMin;
-		const float s11 = patch->texCoord[1][1][0] - sMin;
-
-		const float t00 = patch->texCoord[0][0][1] - tMin;
-		const float t01 = patch->texCoord[0][1][1] - tMin;
-		const float t10 = patch->texCoord[1][0][1] - tMin;
-		const float t11 = patch->texCoord[1][1][1] - tMin;
-
-		const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
-		const float ls = patch->s + lmapSize;
-		const float lt = patch->t + lmapSize;
-
-		terraInt iTri0 = R_AllocateTri(patch, qfalse);
-		terraInt iTri1 = R_AllocateTri(patch, qfalse);
-		terraInt i00 = R_AllocateVert(patch);
-		terraInt i01 = R_AllocateVert(patch);
-		terraInt i10 = R_AllocateVert(patch);
-		terraInt i11 = R_AllocateVert(patch);
-
-		terrainVert_t* pVert;
-		pVert = &g_pVert[i00];
-		pVert->xyz[0] = patch->x0;
-		pVert->xyz[1] = patch->y0;
-		pVert->xyz[2] = (float)(patch->heightmap[0] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[0];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s00;
-		pVert->texCoords[0][1] = t00;
-		pVert->texCoords[1][0] = patch->s;
-		pVert->texCoords[1][1] = patch->t;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
-
-		pVert = &g_pVert[i01];
-		pVert->xyz[0] = patch->x0;
-		pVert->xyz[1] = patch->y0 + 512.0f;
-		pVert->xyz[2] = (float)(patch->heightmap[72] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[72];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s01;
-		pVert->texCoords[0][1] = t01;
-		pVert->texCoords[1][0] = patch->s;
-		pVert->texCoords[1][1] = lt;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
-
-		pVert = &g_pVert[i10];
-		pVert->xyz[0] = patch->x0 + 512.0f;
-		pVert->xyz[1] = patch->y0;
-		pVert->xyz[2] = (float)(patch->heightmap[8] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[8];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s10;
-		pVert->texCoords[0][1] = t10;
-		pVert->texCoords[1][0] = ls;
-		pVert->texCoords[1][1] = patch->t;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
-
-		pVert = &g_pVert[i11];
-		pVert->xyz[0] = patch->x0 + 512.0f;
-		pVert->xyz[1] = patch->y0 + 512.0f;
-		pVert->xyz[2] = (float)(patch->heightmap[80] * 2) + patch->z0;
-		pVert->pHgt = &patch->heightmap[80];
-		pVert->fHgtAvg = pVert->xyz[2];
-		pVert->texCoords[0][0] = s11;
-		pVert->texCoords[0][1] = t11;
-		pVert->texCoords[1][0] = ls;
-		pVert->texCoords[1][1] = lt;
-		pVert->fVariance = 0.0f;
-		pVert->nRef = 4;
-
-		terraTri_t* pTri = &g_pTris[iTri0];
-		pTri->patch = patch;
-		pTri->varnode = &patch->varTree[0][0];
-		pTri->index = 1;
-		pTri->lod = 0;
-		pTri->byConstChecks |= R_ConstChecksForTri(pTri);
-
-		pTri->iBase = iTri1;
-		if ((patch->flags & 0x80u) == 0)
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i00;
-				pTri->iPt[1] = i11;
-			}
-			else
-			{
-				pTri->iPt[0] = i11;
-				pTri->iPt[1] = i00;
-			}
-			pTri->iPt[2] = i01;
-		}
-		else
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i01;
-				pTri->iPt[1] = i10;
-			}
-			else
-			{
-				pTri->iPt[0] = i10;
-				pTri->iPt[1] = i01;
-			}
-			pTri->iPt[2] = i11;
-		}
-
-		R_ValidateHeightmapForVertex(pTri);
-
-		pTri = &g_pTris[iTri1];
-		pTri->patch = patch;
-		pTri->varnode = &patch->varTree[1][0];
-		pTri->index = 1;
-		pTri->lod = 0;
-		pTri->byConstChecks |= R_ConstChecksForTri(pTri);
-
-		pTri->iBase = iTri0;
-		if ((patch->flags & 0x80u) == 0)
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i11;
-				pTri->iPt[1] = i00;
-			}
-			else
-			{
-				pTri->iPt[0] = i00;
-				pTri->iPt[1] = i11;
-			}
-			pTri->iPt[2] = i10;
-		}
-		else
-		{
-			pTri->iLeft = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
-			pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
-			if (patch->flags & 0x40)
-			{
-				pTri->iPt[0] = i10;
-				pTri->iPt[1] = i01;
-			}
-			else
-			{
-				pTri->iPt[0] = i01;
-				pTri->iPt[1] = i10;
-			}
-			pTri->iPt[2] = i00;
-		}
-
-		R_ValidateHeightmapForVertex(pTri);
-	}
-}
-
-static qboolean R_NeedSplitTri(terraTri_t * pTri)
-{
-	uint8_t byConstChecks = pTri->byConstChecks;
-	if (byConstChecks & 2) {
-		return byConstChecks & 1;
-	}
-
-	if (pTri->uiDistRecalc > g_uiTerDist) {
-		return qfalse;
-	}
-
-	float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
-		+ (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
-		* 0.5
-		+ g_vViewVector[2]
-		- pTri->varnode->fVariance * g_fCheck;
-
-	if (fRatio > 0)
-	{
-		pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
-		return qfalse;
-	}
-
-	return qtrue;
-}
-
-static void R_CalcVertMorphHeight(terrainVert_t* pVert)
-{
-	float dot;
-
-	pVert->xyz[2] = pVert->fHgtAvg;
-	pVert->uiDistRecalc = g_uiTerDist + 1;
-	dot = (pVert->fVariance * g_fCheck) - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
-
-	if (dot > 0.0)
-	{
-		float calc = dot / 400.0;
-
-		if (calc > 1.0)
-		{
-			pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
-			calc = 1.0;
-		}
-
-		pVert->xyz[2] += pVert->fHgtAdd * calc;
-	}
-	else
-	{
-		pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
-	}
-}
-
-static void R_UpdateVertMorphHeight(terrainVert_t* pVert)
-{
-	if (pVert->uiDistRecalc <= g_uiTerDist) {
-		R_CalcVertMorphHeight(pVert);
-	}
-}
-
-static void R_DoTriSplitting()
-{
-	cTerraPatchUnpacked_t* patch;
-
-	for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive)
-	{
-		if (patch->uiDistRecalc > g_uiTerDist) {
-			continue;
-		}
-
-		patch->uiDistRecalc = -1;
-		g_tri.iCur = patch->drawinfo.iTriHead;
-		while (g_tri.iCur != 0)
-		{
-			terraTri_t* pTri = &g_pTris[g_tri.iCur];
-
-			if (R_NeedSplitTri(pTri))
-			{
-				//
-				// make sure there are sufficient number of tris
-				//
-				if (g_tri.nFree < 14 || g_vert.nFree < 14) {
-					Com_DPrintf("WARNING: aborting terrain tessellation -- insufficient tris\n");
-					return;
-				}
-
-				patch->uiDistRecalc = 0;
-				R_ForceSplit(g_tri.iCur);
-
-				if (&g_pTris[g_tri.iCur] == pTri)
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-			else
-			{
-				if ((pTri->byConstChecks & 3) != 2)
-				{
-					if (patch->uiDistRecalc > pTri->uiDistRecalc)
-					{
-						patch->uiDistRecalc = pTri->uiDistRecalc;
-					}
-				}
-
-				g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-			}
-		}
-	}
-}
-
-static void R_DoGeomorphs()
-{
-	for (size_t n = 0; n < tr.world->numTerraPatches; n++)
-	{
-		cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[n];
-
-		g_vert.iCur = patch->drawinfo.iVertHead;
-
-		if (patch->visCountDraw == g_terVisCount)
-		{
-			if (patch->byDirty)
-			{
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					R_CalcVertMorphHeight(pVert);
-					g_vert.iCur = pVert->iNext;
-				}
-
-				patch->byDirty = qfalse;
-			}
-			else
-			{
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					R_UpdateVertMorphHeight(pVert);
-					g_vert.iCur = pVert->iNext;
-				}
-			}
-		}
-		else
-		{
-			if (!patch->byDirty)
-			{
-				patch->byDirty = qtrue;
-				while (g_vert.iCur)
-				{
-					terrainVert_t* pVert = &g_pVert[g_vert.iCur];
-					pVert->xyz[2] = pVert->fHgtAvg + pVert->fHgtAdd;
-					g_vert.iCur = pVert->iNext;
-				}
-			}
-		}
-	}
-}
-
-static qboolean R_MergeInternalAggressive()
-{
-	terraTri_t* pTri = &g_pTris[g_tri.iCur];
-	terraTri_t* pBase;
-
-	if (pTri->nSplit) {
-		return qfalse;
-	}
-
-	if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
-		return qfalse;
-	}
-
-	if (pTri->iBase)
-	{
-		pBase = &g_pTris[pTri->iBase];
-		if (pBase->nSplit) {
-			return qfalse;
-		}
-
-		R_ForceMerge(pTri->iBase);
-	}
-
-	R_ForceMerge(g_tri.iCur);
-	return qtrue;
-}
-
-static qboolean R_MergeInternalCautious()
-{
-	terraTri_t* pTri;
-	terraTri_t* pBase;
-
-	pTri = &g_pTris[g_tri.iCur];
-
-	if (pTri->nSplit) {
-		return qfalse;
-	}
-
-	if (pTri->varnode->s.flags & 8) {
-		return qfalse;
-	}
-
-	if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
-		return qfalse;
-	}
-
-	if (pTri->iBase)
-	{
-		pBase = &g_pTris[pTri->iBase];
-		if (pBase->nSplit || (pBase->varnode->s.flags & 8)) {
-			return qfalse;
-		}
-
-		R_ForceMerge(pTri->iBase);
-	}
-
-	R_ForceMerge(g_tri.iCur);
-	return qtrue;
-}
-
-static void R_DoTriMerging()
-{
-	int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
-
-	for (size_t n = 0; n < tr.world->numTerraPatches; n++)
-	{
-		const cTerraPatchUnpacked_t* patch = &tr.world->terraPatches[n];
-
-		g_tri.iCur = patch->drawinfo.iMergeHead;
-		if (patch->visCountDraw >= iCautiousFrame)
-		{
-			while (g_tri.iCur)
-			{
-				if (!R_MergeInternalCautious())
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-		}
-		else if(patch->visCountDraw > iCautiousFrame - 10)
-		{
-			while (g_tri.iCur)
-			{
-				if (!R_MergeInternalAggressive())
-				{
-					g_tri.iCur = g_pTris[g_tri.iCur].iNext;
-				}
-			}
-		}
-	}
-}
-
-void R_TessellateTerrain()
-{
-	if (glConfig.smpActive) {
-		R_SyncRenderThread();
-	}
-
-	R_DoTriSplitting();
-	// Morph geometry according to the view
-	R_DoGeomorphs();
-	// Split vertices
-	R_DoTriMerging();
-}
-
-void R_TerrainPrepareFrame()
-{
-	float distance;
-	int index;
-	float fFov;
-	float fCheck;
-	float fDistBound;
-
-	if (ter_lock->integer) {
-		return;
-	}
-
-	g_terVisCount++;
-	tr.world->activeTerraPatches = NULL;
-
-	if (ter_error->value < 0.1) {
-		ri.Cvar_Set("ter_error", "0.1");
-	}
-
-	distance = 1.0;
-	fFov = tr.refdef.fov_x;
-	if (fFov < 1.0) {
-		fFov = 1.0;
-	}
-
-	fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
-	if (g_terVisCount)
-	{
-		float fFarPlane = tr.viewParms.farplane_distance;
-		if (fFarPlane == 0.0) {
-			fFarPlane = 4096.0;
-		}
-
-		fDistBound = fabs((fCheck - g_fCheck) * 510.0)
-			+ fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
-			+ fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
-			+ fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
-			+ fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
-
-		g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
-		if (g_uiTerDist > 0xF0000000)
-		{
-			for (index = 0; index < tr.world->numTerraPatches; index++) {
-				tr.world->terraPatches[index].uiDistRecalc = 0;
-			}
-
-			for (index = 0; index < g_nTris; index++) {
-				g_pTris[index].uiDistRecalc = 0;
-			}
-
-			for (index = 0; index < g_nVerts; index++) {
-				g_pVert[index].uiDistRecalc = 0;
-			}
-
-			g_uiTerDist = 0;
-		}
-	}
-	else
-	{
-		fDistBound = 0.0;
-		g_uiTerDist = 0;
-	}
-
-
-	VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
-	VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
-	g_fCheck = fCheck;
-
-	if (fDistBound != 0.0)
-	{
-		index = (int)tr.refdef.fov_x;
-		distance = g_fDistanceTable[index];
-
-		g_fClipDotSquared = g_fClipDotSquaredTable[index];
-		g_fClipDotProduct = g_fClipDotProductTable[index];
-		VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
-		g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
-		g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
-		g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
-		g_vViewVector[0] = tr.refdef.viewaxis[0][0];
-		g_vViewVector[1] = tr.refdef.viewaxis[0][1];
-		g_vViewVector[2] = -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
-		VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
-
-		if (tr.viewParms.farplane_distance > 0) {
-			g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
-		} else {
-			g_fFogDistance = 999999.0;
-		}
-	}
-}
-
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch)
-{
-	if (pPatch->visCountCheck == g_terVisCount) {
-		return;
-	}
-
-	pPatch->visCountCheck = g_terVisCount;
-	if (ter_cull->integer)
-	{
-		vec3_t v;
-		float dot;
-
-		v[0] = pPatch->x0 - g_vClipOrigin[0];
-		v[1] = pPatch->y0 - g_vClipOrigin[1];
-		v[2] = pPatch->z0 - g_vClipOrigin[2];
-
-		dot = DotProduct(v, g_vClipVector);
-		if (dot > g_fFogDistance) {
-			return;
-		}
-
-		if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
-			return;
-		}
-	}
-
-	pPatch->visCountDraw = g_terVisCount;
-	pPatch->pNextActive = tr.world->activeTerraPatches;
-	tr.world->activeTerraPatches = pPatch;
-}
-
-void R_AddTerrainSurfaces()
-{
-	int i;
-	int dlight;
-	cTerraPatchUnpacked_t* patch;
-
-	if (tr.world->numTerraPatches < 0) {
-		return;
-	}
-
-	if (!ter_lock->integer) {
-		R_TessellateTerrain();
-	}
-
-	if (ter_count->integer || ter_lock->integer == 2)
-	{
-		for (i = 0; i < tr.world->numTerraPatches; i++)
-		{
-			patch = &tr.world->terraPatches[i];
-
-			if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount)
-			{
-				assert(patch->shader);
-
-				dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
-				R_AddDrawSurf((surfaceType_t*)&patch->drawinfo, patch->shader, dlight);
-			}
-
-			if (ter_count->integer && (g_nSplit || g_nMerge))
-			{
-				if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge)
-				{
-					Com_DPrintf(
-						"%5d tris / %5d verts / %4d splits / %4d merges\n",
-						g_nTris - g_tri.nFree,
-						g_nVerts - g_vert.nFree,
-						g_nSplit,
-						g_nMerge);
-				}
-
-				g_nSplit = 0;
-				g_nMerge = 0;
-			}
-		}
-	}
-	else
-	{
-		for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive)
-		{
-			assert(patch->shader);
-
-			dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
-			R_AddDrawSurf((surfaceType_t*)&patch->drawinfo, patch->shader, dlight);
-		}
-	}
-}
-
-/**
- * Calculates the height of a terrain polygon by interpolating the heights of its vertices.
- * The function finds the triangle containing the given point (x, y) within the terrain patch,
- * and then computes the height at each vertex of the polygon using barycentric interpolation.
- * Finally, it updates the z-coordinate of each vertex to store the calculated height.
- * Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
- *
- * ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
- */
-qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts)
-{
-	float x0 = 0;
-	float y0 = 0;
-	float x1 = 0;
-	float y1 = 0;
-	float x2 = 0;
-	float y2 = 0;
-	float fKx[3] = { 0 }, fKy[3] = { 0 }, fKz[3] = { 0 }, fArea[3] = { 0 };
-	float fAreaTotal = 0;
-
-	float x = pVerts->xyz[0];
-	float y = pVerts->xyz[1];
-
-	// Calculate the average of the x and y coordinates of all vertices
-	if (nVerts > 1)
-	{
-		for (int i = 1; i < nVerts; i++)
-		{
-			x += pVerts[i].xyz[0];
-			y += pVerts[i].xyz[1];
-		}
-
-		// Use the averaged values from this point onwards
-		x = x / nVerts;
-		y = y / nVerts;
-	}
-
-	// Get the first valid triangle in the patch
-	terraInt iTri = pPatch->drawinfo.iTriHead;
-	if (!iTri)
-	{
-		assert(!pPatch->drawinfo.iTriHead &&
-				va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-					x, y, pPatch->x0, pPatch->y0, pPatch->z0));
-		return qfalse;
-	}
-
-	// Find a triangle that contains the point (x, y)
-	while (qtrue)
-	{
-		if (g_pTris[iTri].byConstChecks & 4)
-		{
-			// Get all three x-y coordinates of the current triangle's vertices
-			x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
-			y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
-			x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
-			y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
-			x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
-			y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
-
-			// Calculate the signed areas of the three sub-triangles
-			fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
-			if (fArea[0] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
-
-			fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
-			if (fArea[1] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
-
-			fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
-			if (fArea[2] < -0.1)
-			{
-				// The point is outside the triangle
-				continue;
-			}
-
-			fAreaTotal = fArea[0] + fArea[1] + fArea[2];
-			if (fAreaTotal > 0.0)
-			{
-				// Found it - the point is inside the triangle
-				break;
-			}
-		}
-
-		iTri = g_pTris[iTri].iNext;
-		if (!iTri)
-		{
-			// There's no triangle that contains point (x, y) - bail out
-			assert(!g_pTris[iTri].iNext &&
-				va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n",
-					x, y, pPatch->x0, pPatch->y0, pPatch->z0));
-			return qfalse;
-		}
-	}
-
-	// Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
-	float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
-	float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
-	float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
-
-	fKy[0] = z0 * (x2 - x1);
-	fKy[1] = z1 * (x0 - x2);
-	fKy[2] = z2 * (x1 - x0);
-
-	fKx[0] = z0 * (y2 - y1);
-	fKx[1] = z1 * (y0 - y2);
-	fKx[2] = z2 * (y1 - y0);
-
-	// Note: this could be done with the CrossProduct macro if everything were in a vector
-	fKz[0] = fKx[0] * x1 - y1 * fKy[0];
-	fKz[1] = fKx[1] * x2 - y2 * fKy[1];
-	fKz[2] = fKx[2] * x0 - y0 * fKy[2];
-
-	// Calculate the height for each vertex
-	for (int i = 0; i < nVerts; i++)
-	{
-		float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
-		float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
-		float fConstZ = fKz[0] + fKz[1] + fKz[2];
-
-		// Write back the calculated height into the vertex
-		pVerts[i].xyz[2] = fScaleY - fScaleX - fConstZ;
-	}
-
-	return qtrue;
-}
-
-void R_TerrainRestart_f(void)
-{
-	if (tr.world->numTerraPatches < 0) {
-		return;
-	}
-
-	ri.Free(g_pVert);
-	g_pVert = NULL;
-	ri.Free(g_pTris);
-	g_pTris = NULL;
-
-	R_PreTessellateTerrain();
-}
-
-void R_CraterTerrain(vec_t* pos /* 0x8 */, vec_t* dir, float fDepth, float fRadius)
-{
-	// FIXME: unimplemented
-}
-
-void R_TerrainCrater_f()
-{
-	vec3_t dir;
-	VectorNegate(tr.refdef.viewaxis[2], dir);
-
-	R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
-	R_TerrainRestart_f();
-}
-
-void R_InitTerrain()
-{
-	int i;
-
-	ter_maxlod = ri.Cvar_Get("ter_maxlod", "3", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
-	ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
-	ter_lock = ri.Cvar_Get("ter_lock", "0", 0);
-	ter_error = ri.Cvar_Get("ter_error", "10", CVAR_ARCHIVE);
-	ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
-	ter_maxtris = ri.Cvar_Get("ter_maxtris", "16384", CVAR_TERRAIN_LATCH);
-	ter_count = ri.Cvar_Get("ter_count", "0", 0);
-
-	Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
-	R_PreTessellateTerrain();
-
-	for (i = 0; i < TERRAIN_TABLE_SIZE; i++)
-	{
-		float dot = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
-		g_fClipDotSquaredTable[i] = dot;
-		g_fClipDotProductTable[i] = sqrt(dot);
-		g_fDistanceTable[i] = 443.5 / sqrt(1.0 - dot);
-	}
-}
diff --git a/code/renderer/tr_util.cpp b/code/renderer/tr_util.cpp
deleted file mode 100644
index d44b6f08..00000000
--- a/code/renderer/tr_util.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_util.c -- renderer utility
-
-#include "tr_local.h"
-#include "../qcommon/str.h"
-
-static byte cntColor[4];
-static float cntSt[ 2 ];
-
-static int Numbers[12][8] = {
-    { 1, 3, 4, 5, 6, 7, 0, 0 },
-    { 4, 5, 0, 0, 0, 0, 0, 0 },
-    { 1, 4, 2, 7, 3, 0, 0, 0 },
-    { 1, 4, 2, 5, 3, 0, 0, 0 },
-    { 6, 4, 2, 5, 0, 0, 0, 0 },
-    { 1, 6, 2, 5, 3, 0, 0, 0 },
-    { 1, 6, 2, 5, 7, 3, 0, 0 },
-    { 1, 8, 0, 0, 0, 0, 0, 0 },
-    { 1, 2, 3, 4, 5, 6, 7, 0 },
-    { 1, 6, 4, 2, 5, 3, 0, 0 },
-    { 9, 10, 11, 12, 0, 0, 0, 0 },
-    { 2, 0, 0, 0, 0, 0, 0, 0 }
-};
-
-static float Lines[13][4] = {
-    { 0.0, 0.0, 0.0, 0.0 },
-    { -4.0, 8.0, 4.0, 8.0 },
-    { -4.0, 4.0, 4.0, 4.0 },
-    { -4.0, 0.0, 4.0, 0.0 },
-    { 4.0, 8.0, 4.0, 4.0 },
-    { 4.0, 4.0, 4.0, 0.0 },
-    { -4.0, 8.0, -4.0, 4.0 },
-    { -4.0, 4.0, -4.0, 0.0 },
-    { 4.0, 8.0, -4.0, 0.0 },
-    { -1.0, 2.0, 1.0, 2.0 },
-    { 1.0, 2.0, 1.0, 0.0 },
-    { -1.0, 0.0, 1.0, 0.0 },
-    { -1.0, 0.0, -1.0, 2.0 }
-};
-
-/*
-===============
-RB_StreamBegin
-===============
-*/
-void RB_StreamBegin( shader_t *shader ) {
-	RB_BeginSurface( shader );
-}
-
-/*
-===============
-RB_StreamEnd
-===============
-*/
-void RB_StreamEnd( void ) {
-	int i;
-
-	if( tess.numVertexes <= 2 ) {
-		RB_EndSurface();
-		return;
-	}
-
-	tess.indexes[ 0 ] = 0;
-	tess.indexes[ 1 ] = 1;
-	tess.indexes[ 2 ] = 2;
-
-	for( i = 0; i < tess.numVertexes - 2; i++ ) {
-		tess.indexes[ i * 3 + 0 ] = ( i & 1 ) + i;
-		tess.indexes[ i * 3 + 1 ] = i - ( ( i & 1 ) - 1 );
-		tess.indexes[ i * 3 + 2 ] = i + 2;
-		tess.numIndexes += 3;
-	}
-
-	RB_EndSurface();
-}
-
-/*
-===============
-RB_StreamBeginDrawSurf
-===============
-*/
-void RB_StreamBeginDrawSurf( void ) {
-	backEnd.dsStreamVert = tess.numVertexes;
-}
-
-/*
-===============
-RB_StreamEndDrawSurf
-===============
-*/
-void RB_StreamEndDrawSurf( void ) {
-	int		numverts;
-	int		i;
-
-	if( tess.numVertexes - backEnd.dsStreamVert <= 2 ) {
-		tess.numVertexes = backEnd.dsStreamVert;
-		return;
-	}
-
-	numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
-	for( i = 0; i < numverts; i++ ) {
-		tess.indexes[ i + tess.numIndexes ] = ( i & 1 ) + i + backEnd.dsStreamVert;
-		tess.indexes[ i + tess.numIndexes + 1 ] = i + backEnd.dsStreamVert - ( ( i & 1 ) - 1 );
-		tess.indexes[ i + tess.numIndexes + 2 ] = i + backEnd.dsStreamVert + 2;
-		tess.numIndexes += 3;
-	}
-}
-
-/*
-===============
-addTriangle
-===============
-*/
-static void addTriangle( void ) {
-	tess.texCoords[ tess.numVertexes ][ 0 ][ 0 ] = cntSt[ 0 ];
-	tess.texCoords[ tess.numVertexes ][ 0 ][ 1 ] = cntSt[ 1 ];
-	tess.vertexColors[ tess.numVertexes ][ 0 ] = cntColor[ 0 ];
-	tess.vertexColors[ tess.numVertexes ][ 1 ] = cntColor[ 1 ];
-	tess.vertexColors[ tess.numVertexes ][ 2 ] = cntColor[ 2 ];
-	tess.vertexColors[ tess.numVertexes ][ 3 ] = cntColor[ 3 ];
-	tess.vertexColorValid = qtrue;
-	tess.numVertexes++;
-}
-
-/*
-===============
-RB_Vertex3fv
-===============
-*/
-void RB_Vertex3fv( vec3_t v ) {
-	VectorCopy( v, tess.xyz[ tess.numVertexes ] );
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex3f
-===============
-*/
-void RB_Vertex3f( vec_t x, vec_t y, vec_t z ) {
-	tess.xyz[ tess.numVertexes ][ 0 ] = x;
-	tess.xyz[ tess.numVertexes ][ 1 ] = y;
-	tess.xyz[ tess.numVertexes ][ 2 ] = z;
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex2f
-===============
-*/
-void RB_Vertex2f( vec_t x, vec_t y ) {
-	RB_Vertex3f( x, y, 0 );
-}
-
-/*
-===============
-RB_Color4f
-===============
-*/
-void RB_Color4f( vec_t r, vec_t g, vec_t b, vec_t a ) {
-	cntColor[ 0 ] = r * tr.identityLightByte;
-	cntColor[ 1 ] = g * tr.identityLightByte;
-	cntColor[ 2 ] = b * tr.identityLightByte;
-	cntColor[ 3 ] = a * 255.0;
-}
-
-/*
-===============
-RB_Color3f
-===============
-*/
-void RB_Color3f( vec_t r, vec_t g, vec_t b ) {
-	RB_Color4f( r, g, b, 1.0 );
-}
-
-/*
-===============
-RB_Color3fv
-===============
-*/
-void RB_Color3fv( vec3_t col ) {
-	RB_Color3f( col[ 0 ], col[ 1 ], col[ 2 ] );
-}
-
-/*
-===============
-RB_Color4bv
-===============
-*/
-void RB_Color4bv( unsigned char *colors ) {
-	cntColor[ 0 ] = colors[ 0 ];
-	cntColor[ 1 ] = colors[ 1 ];
-	cntColor[ 2 ] = colors[ 2 ];
-	cntColor[ 3 ] = colors[ 3 ];
-}
-
-/*
-===============
-RB_Texcoord2f
-===============
-*/
-void RB_Texcoord2f( float s, float t ) {
-	cntSt[ 0 ] = s;
-	cntSt[ 1 ] = t;
-}
-
-/*
-===============
-RB_Texcoord2fv
-===============
-*/
-void RB_Texcoord2fv( vec2_t st ) {
-	cntSt[ 0 ] = st[ 0 ];
-	cntSt[ 1 ] = st[ 1 ];
-}
-
-/*
-===============
-R_DrawDebugNumber
-===============
-*/
-void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, float g, float b, int precision ) {
-	vec3_t up, right;
-	vec3_t pos1, pos2;
-	vec3_t start;
-	str text;
-	char format[20];
-	int i;
-	int j;
-	int l;
-	int num;
-	
-	VectorCopy(tr.viewParms.ori.axis[2], up);
-	VectorCopy(tr.viewParms.ori.axis[1], right);
-	VectorNegate(right, right);
-
-	VectorNormalize(up);
-	VectorNormalize(right);
-
-	VectorScale(up, scale, up);
-	VectorScale(right, scale, right);
-
-    if (precision > 0) {
-		sprintf(format, "%%.%df", precision);
-        text = va(format, number);
-	} else {
-		text = va("%d", number);
-	}
-
-	// NOTE: this cast here is needed!
-	// Otherwise the compiler will do very nasty implicit casting of negative
-	// numbers to unsigned numbers, resulting in incorrect values.
-	// -------------------v
-	VectorMA(org, 5 - 5 * (int)text.length(), right, start);
-
-	// Draw each character/digit of the text
-	for (i = 0; i < text.length(); i++) {
-		if (text[i] == '.') {
-			num = 10;
-		}
-		else if (text[i] == '-') {
-			num = 11;
-		}
-		else {
-			num = text[i] - '0';
-		}
-
-		// Get the first line index for the number to be drawn
-		l = Numbers[num][0];
-
-		// Draw each line of the character/digit
-		for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
-            pos1[0] = start[0] + Lines[l][0] * right[0] + Lines[l][1] * up[0];
-            pos1[1] = start[1] + Lines[l][0] * right[1] + Lines[l][1] * up[1];
-            pos1[2] = start[2] + Lines[l][0] * right[2] + Lines[l][1] * up[2];
-
-			pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
-			pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
-			pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
-
-			R_DebugLine(pos1, pos2, r, g, b, 1.0);
-        }
-
-		VectorMA(start, 10.0, right, start);
-	}
-}
-
-/*
-===============
-R_DebugRotatedBBox
-===============
-*/
-void R_DebugRotatedBBox( const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha ) {
-	int i;
-	vec3_t tmp;
-	vec3_t points[8];
-	vec3_t axis[3];
-
-	AnglesToAxis(ang, axis);
-
-	for (i = 0; i < 8; i++) {
-		if (i & 1) {
-			tmp[0] = mins[0];
-		} else {
-			tmp[0] = maxs[0];
-        }
-
-        if (i & 2) {
-            tmp[1] = mins[1];
-        }
-        else {
-            tmp[1] = maxs[1];
-        }
-
-		if (i & 4) {
-			tmp[2] = mins[2];
-		} else {
-			tmp[2] = maxs[2];
-		}
-
-		points[i][0] = tmp[0] * axis[0][0];
-		points[i][1] = tmp[0] * axis[0][1];
-        points[i][2] = tmp[0] * axis[0][2];
-
-        points[i][0] += tmp[1] * axis[1][0];
-        points[i][1] += tmp[1] * axis[1][1];
-        points[i][2] += tmp[1] * axis[1][2];
-
-        points[i][0] += tmp[2] * axis[2][0];
-        points[i][1] += tmp[2] * axis[2][1];
-        points[i][2] += tmp[2] * axis[2][2];
-
-		points[i][0] += org[0];
-		points[i][1] += org[1];
-		points[i][2] += org[2];
-	}
-
-    R_DebugLine(points[0], points[1], r, g, b, alpha);
-    R_DebugLine(points[1], points[3], r, g, b, alpha);
-    R_DebugLine(points[3], points[2], r, g, b, alpha);
-    R_DebugLine(points[2], points[0], r, g, b, alpha);
-    R_DebugLine(points[4], points[5], r, g, b, alpha);
-    R_DebugLine(points[5], points[7], r, g, b, alpha);
-    R_DebugLine(points[7], points[6], r, g, b, alpha);
-    R_DebugLine(points[6], points[4], r, g, b, alpha);
-
-	for (i = 0; i < 4; i++) {
-		R_DebugLine(points[i], points[i + 4], r, g, b, alpha);
-	}
-}
-
-/*
-===============
-RE_GetShaderWidth
-===============
-*/
-int RE_GetShaderWidth( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	} else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->unfoggedStages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadWidth;
-}
-
-/*
-===============
-RE_GetShaderHeight
-===============
-*/
-int RE_GetShaderHeight( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->unfoggedStages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadHeight;
-}
diff --git a/code/renderer/tr_world.c b/code/renderer/tr_world.c
deleted file mode 100644
index 7253c812..00000000
--- a/code/renderer/tr_world.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include "tr_local.h"
-
-
-
-/*
-=================
-R_CullTriSurf
-
-Returns true if the grid is completely culled away.
-Also sets the clipped hint bit in tess
-=================
-*/
-static qboolean	R_CullTriSurf( srfTriangles_t *cv ) {
-	int 	boxCull;
-
-	boxCull = R_CullLocalBox( cv->bounds );
-
-	if ( boxCull == CULL_OUT ) {
-		return qtrue;
-	}
-	return qfalse;
-}
-
-/*
-=================
-R_CullGrid
-
-Returns true if the grid is completely culled away.
-Also sets the clipped hint bit in tess
-=================
-*/
-static qboolean	R_CullGrid( srfGridMesh_t *cv ) {
-	int 	boxCull;
-	int 	sphereCull;
-
-	if ( r_nocurves->integer ) {
-		return qtrue;
-	}
-
-	if ( tr.currentEntityNum != ENTITYNUM_WORLD ) {
-		sphereCull = R_CullLocalPointAndRadius( cv->localOrigin, cv->meshRadius );
-	} else {
-		sphereCull = R_CullPointAndRadius( cv->localOrigin, cv->meshRadius );
-	}
-	boxCull = CULL_OUT;
-	
-	// check for trivial reject
-	if ( sphereCull == CULL_OUT )
-	{
-		tr.pc.c_sphere_cull_patch_out++;
-		return qtrue;
-	}
-	// check bounding box if necessary
-	else if ( sphereCull == CULL_CLIP )
-	{
-		tr.pc.c_sphere_cull_patch_clip++;
-
-		boxCull = R_CullLocalBox( cv->meshBounds );
-
-		if ( boxCull == CULL_OUT ) 
-		{
-			tr.pc.c_box_cull_patch_out++;
-			return qtrue;
-		}
-		else if ( boxCull == CULL_IN )
-		{
-			tr.pc.c_box_cull_patch_in++;
-		}
-		else
-		{
-			tr.pc.c_box_cull_patch_clip++;
-		}
-	}
-	else
-	{
-		tr.pc.c_sphere_cull_patch_in++;
-	}
-
-	return qfalse;
-}
-
-
-/*
-================
-R_CullSurface
-
-Tries to back face cull surfaces before they are lighted or
-added to the sorting list.
-
-This will also allow mirrors on both sides of a model without recursion.
-================
-*/
-static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
-	srfSurfaceFace_t *sface;
-	float			d;
-
-	if ( r_nocull->integer ) {
-		return qfalse;
-	}
-
-	if ( *surface == SF_GRID ) {
-		return R_CullGrid( (srfGridMesh_t *)surface );
-	}
-
-	if ( *surface == SF_TRIANGLES ) {
-		return R_CullTriSurf( (srfTriangles_t *)surface );
-	}
-
-	if ( *surface != SF_FACE ) {
-		return qfalse;
-	}
-
-	if ( shader->cullType == CT_TWO_SIDED ) {
-		return qfalse;
-	}
-
-	// face culling
-	if ( !r_facePlaneCull->integer ) {
-		return qfalse;
-	}
-
-	sface = ( srfSurfaceFace_t * ) surface;
-	d = DotProduct (tr.ori.viewOrigin, sface->plane.normal);
-
-	// don't cull exactly on the plane, because there are levels of rounding
-	// through the BSP, ICD, and hardware that may cause pixel gaps if an
-	// epsilon isn't allowed here 
-	if ( shader->cullType == CT_FRONT_SIDED ) {
-		if ( d < sface->plane.dist - 8 ) {
-			return qtrue;
-		}
-	} else {
-		if ( d > sface->plane.dist + 8 ) {
-			return qtrue;
-		}
-	}
-
-	return qfalse;
-}
-
-
-static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
-	float		d;
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
-		if ( d < -dl->radius || d > dl->radius ) {
-			// dlight doesn't reach the plane
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	face->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-}
-
-static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		if ( dl->origin[0] - dl->radius > grid->meshBounds[1][0]
-			|| dl->origin[0] + dl->radius < grid->meshBounds[0][0]
-			|| dl->origin[1] - dl->radius > grid->meshBounds[1][1]
-			|| dl->origin[1] + dl->radius < grid->meshBounds[0][1]
-			|| dl->origin[2] - dl->radius > grid->meshBounds[1][2]
-			|| dl->origin[2] + dl->radius < grid->meshBounds[0][2] ) {
-			// dlight doesn't reach the bounds
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	grid->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-}
-
-static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
-	// FIXME: unimplemented
-	return 0;
-}
-
-static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
-	// FIXME: more dlight culling to trisurfs...
-	surf->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-#if 0
-	int			i;
-	dlight_t	*dl;
-
-	for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-		if ( ! ( dlightBits & ( 1 << i ) ) ) {
-			continue;
-		}
-		dl = &tr.refdef.dlights[i];
-		if ( dl->origin[0] - dl->radius > grid->meshBounds[1][0]
-			|| dl->origin[0] + dl->radius < grid->meshBounds[0][0]
-			|| dl->origin[1] - dl->radius > grid->meshBounds[1][1]
-			|| dl->origin[1] + dl->radius < grid->meshBounds[0][1]
-			|| dl->origin[2] - dl->radius > grid->meshBounds[1][2]
-			|| dl->origin[2] + dl->radius < grid->meshBounds[0][2] ) {
-			// dlight doesn't reach the bounds
-			dlightBits &= ~( 1 << i );
-		}
-	}
-
-	if ( !dlightBits ) {
-		tr.pc.c_dlightSurfacesCulled++;
-	}
-
-	grid->dlightBits[ tr.smpFrame ] = dlightBits;
-	return dlightBits;
-#endif
-}
-
-/*
-====================
-R_DlightSurface
-
-The given surface is going to be drawn, and it touches a leaf
-that is touched by one or more dlights, so try to throw out
-more dlights if possible.
-====================
-*/
-static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
-	int dlightMap;
-
-	dlightMap = 0;
-
-	if ( *surf->data == SF_FACE ) {
-		if (!r_fastdlights->integer) {
-			if (surf->shader->lightmapIndex >= 0) {
-				dlightMap = R_RealDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
-			} else {
-				((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-				dlightMap = 0;
-			}
-			return dlightMap;
-        } else {
-			dlightBits = R_FastDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
-		}
-	} else if ( *surf->data == SF_GRID ) {
-		if (!r_fastdlights->integer) {
-			if (surf->shader->lightmapIndex >= 0) {
-				dlightMap = R_RealDlightPatch((srfGridMesh_t*)surf->data, dlightBits);
-			} else {
-				((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0.f;
-				dlightMap = 0;
-            }
-            return dlightMap;
-        } else {
-            dlightBits = R_FastDlightGrid((srfGridMesh_t*)surf->data, dlightBits);
-		}
-	} else {
-		return dlightMap;
-	}
-
-	if (dlightBits) {
-		tr.pc.c_dlightSurfaces++;
-		return 1;
-	}
-
-	return dlightMap;
-}
-
-int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
-{
-	int dlightMap;
-
-    dlightMap = 0;
-
-    if (r_fastdlights->integer)
-    {
-        if (R_FastDlightTerrain(surf, dlightBits)) {
-            ++tr.pc.c_dlightSurfaces;
-			dlightMap = 1;
-        }
-    } else if (surf->shader->lightmapIndex < 0) {
-        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
-    } else {
-		dlightMap = R_RealDlightTerrain(surf, dlightBits);
-    }
-
-    return dlightMap;
-}
-
-static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
-{
-    if (dlightBits && surf->frameCount != tr.frameCount)
-    {
-        surf->frameCount = tr.frameCount;
-        return R_DlightSurface(surf, dlightBits);
-    }
-
-    if (*surf->data == SF_FACE)
-    {
-        ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-        ((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-    }
-    else if (*surf->data == SF_GRID)
-    {
-        ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
-        ((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
-    }
-
-    return 0;
-}
-
-int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
-{
-	// FIXME: unimplemented
-	return 0;
-}
-
-
-/*
-======================
-R_AddWorldSurface
-======================
-*/
-static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
-	if ( surf->viewCount == tr.viewCount ) {
-		return;		// already in this view
-	}
-
-	surf->viewCount = tr.viewCount;
-	// FIXME: bmodel fog?
-
-	// try to cull before dlighting or adding
-	if ( R_CullSurface( surf->data, surf->shader ) ) {
-		return;
-	}
-
-	// check for dlighting
-	dlightBits = R_CheckDlightSurface(surf, dlightBits);
-	if (surf->shader && surf->shader->isPortalSky) {
-		// Sky portal
-		R_Sky_AddSurf(surf);
-		return;
-	}
-
-	R_AddDrawSurf( surf->data, surf->shader, dlightBits );
-}
-
-/*
-=============================================================
-
-	BRUSH MODELS
-
-=============================================================
-*/
-
-/*
-=================
-R_AddBrushModelSurfaces
-=================
-*/
-void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
-	bmodel_t	*bmodel;
-	int			clip;
-	model_t		*pModel;
-	int			i;
-
-	pModel = R_GetModelByHandle( ent->e.hModel );
-
-	bmodel = pModel->d.bmodel;
-
-	clip = R_CullLocalBox( bmodel->bounds );
-	if ( clip == CULL_OUT ) {
-		return;
-	}
-	
-	R_DlightBmodel( bmodel );
-
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		R_AddWorldSurface( bmodel->firstSurface + i, tr.currentEntity->needDlights );
-	}
-}
-
-
-/*
-=============================================================
-
-	WORLD MODEL
-
-=============================================================
-*/
-
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
-{
-	// FIXME: unimplemented
-}
-
-
-/*
-================
-R_RecursiveWorldNode
-================
-*/
-static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits ) {
-
-	do {
-		// if the node wasn't marked as potentially visible, exit
-		if (node->visframe != tr.visCount) {
-			return;
-		}
-
-		// if the bounding volume is outside the frustum, nothing
-		// inside can be visible OPTIMIZE: don't do this all the way to leafs?
-
-		if ( !r_nocull->integer ) {
-			int		r;
-
-			if (planeBits & 1) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[0]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~1;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 2) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[1]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~2;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 4) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[2]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~4;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 8) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[3]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~8;			// all descendants will also be in front
-				}
-			}
-
-			if (planeBits & 16) {
-				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[4]);
-				if (r == 2) {
-					return;						// culled
-				}
-				if (r == 1) {
-					planeBits &= ~16;			// all descendants will also be in front
-				}
-			}
-
-		}
-
-		if ( node->contents != -1 ) {
-			break;
-		}
-
-		// recurse down the children, front side first
-		R_RecursiveWorldNode (node->children[0], planeBits, dlightBits);
-
-		// tail recurse
-		node = node->children[1];
-	} while ( 1 );
-
-	{
-		// leaf node, so add mark surfaces
-		int			c;
-		msurface_t	*surf, **mark;
-
-		tr.pc.c_leafs++;
-
-		// add to z buffer bounds
-		if ( node->mins[0] < tr.viewParms.visBounds[0][0] ) {
-			tr.viewParms.visBounds[0][0] = node->mins[0];
-		}
-		if ( node->mins[1] < tr.viewParms.visBounds[0][1] ) {
-			tr.viewParms.visBounds[0][1] = node->mins[1];
-		}
-		if ( node->mins[2] < tr.viewParms.visBounds[0][2] ) {
-			tr.viewParms.visBounds[0][2] = node->mins[2];
-		}
-
-		if ( node->maxs[0] > tr.viewParms.visBounds[1][0] ) {
-			tr.viewParms.visBounds[1][0] = node->maxs[0];
-		}
-		if ( node->maxs[1] > tr.viewParms.visBounds[1][1] ) {
-			tr.viewParms.visBounds[1][1] = node->maxs[1];
-		}
-		if ( node->maxs[2] > tr.viewParms.visBounds[1][2] ) {
-			tr.viewParms.visBounds[1][2] = node->maxs[2];
-		}
-
-		tr.portalsky.cntNode = node;
-
-		if (r_drawbrushes->integer) {
-			// add the individual surfaces
-			mark = node->firstmarksurface;
-			c = node->nummarksurfaces;
-			while (c--) {
-				// the surface may have already been added if it
-				// spans multiple leafs
-				surf = *mark;
-				R_AddWorldSurface(surf, dlightBits);
-				mark++;
-			}
-		}
-
-		if (r_drawterrain->integer)
-		{
-			int i;
-
-			for (i = 0; i < node->numTerraPatches; i++) {
-				R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
-			}
-		}
-
-		if (r_drawstaticdecals->integer) {
-			if (node->pFirstMarkFragment) {
-				R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
-			}
-		}
-
-		if (r_drawstaticmodels->integer) {
-			int i;
-
-			for (i = 0; i < node->numStaticModels; i++) {
-				tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCount;
-			}
-		}
-	}
-
-}
-
-int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
-	mnode_t* nodestack[1024];
-	int iNodeStackPos;
-	mnode_t* pCurNode;
-	int nFoundNodes;
-
-	iNodeStackPos = 0;
-	pCurNode = tr.world->nodes;
-	nFoundNodes = 0;
-
-	while (1)
-    {
-        cplane_t* plane;
-		float d;
-
-		while (pCurNode->contents == -1)
-		{
-			plane = pCurNode->plane;
-			if (plane->type >= PLANE_NON_AXIAL) {
-				d = DotProduct(p, plane->normal) - plane->dist;
-			} else {
-				d = p[plane->type] - plane->dist;
-			}
-
-            if (d < r) {
-                if (d > -r) {
-                    nodestack[iNodeStackPos++] = pCurNode->children[0];
-                }
-                pCurNode = pCurNode->children[1];
-            } else {
-                pCurNode = pCurNode->children[0];
-			}
-		}
-
-		nodes[nFoundNodes++] = pCurNode;
-		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
-			break;
-		}
-
-		iNodeStackPos--;
-        pCurNode = nodestack[iNodeStackPos];
-	}
-
-	return nFoundNodes;
-}
-/*
-===============
-R_PointInLeaf
-===============
-*/
-mnode_t *R_PointInLeaf( const vec3_t p ) {
-	mnode_t		*node;
-	float		d;
-	cplane_t	*plane;
-	
-	if ( !tr.world ) {
-		ri.Error (ERR_DROP, "R_PointInLeaf: bad model");
-	}
-	
-	node = tr.world->nodes;
-	while( 1 ) {
-		if (node->contents != -1) {
-			break;
-		}
-		plane = node->plane;
-		d = DotProduct (p,plane->normal) - plane->dist;
-		if (d > 0) {
-			node = node->children[0];
-		} else {
-			node = node->children[1];
-		}
-	}
-	
-	return node;
-}
-
-/*
-==============
-R_ClusterPVS
-==============
-*/
-static const byte *R_ClusterPVS (int cluster) {
-	if (!tr.world || !tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
-		return tr.world->novis;
-	}
-
-	return tr.world->vis + cluster * tr.world->clusterBytes;
-}
-
-/*
-=================
-R_inPVS
-=================
-*/
-qboolean R_inPVS( const vec3_t p1, const vec3_t p2 ) {
-	mnode_t *leaf;
-	byte	*vis;
-
-	leaf = R_PointInLeaf( p1 );
-	vis = CM_ClusterPVS( leaf->cluster );
-	leaf = R_PointInLeaf( p2 );
-
-	if ( !(vis[leaf->cluster>>3] & (1<<(leaf->cluster&7))) ) {
-		return qfalse;
-	}
-	return qtrue;
-}
-
-/*
-===============
-R_MarkLeaves
-
-Mark the leaves and nodes that are in the PVS for the current
-cluster
-===============
-*/
-static void R_MarkLeaves (void) {
-	const byte	*vis;
-	mnode_t	*leaf, *parent;
-	int		i;
-	int		cluster;
-
-	// lockpvs lets designers walk around to determine the
-	// extent of the current pvs
-	if ( r_lockpvs->integer ) {
-		return;
-	}
-
-	// current viewcluster
-	leaf = R_PointInLeaf( tr.viewParms.pvsOrigin );
-	cluster = leaf->cluster;
-
-	// if the cluster is the same and the area visibility matrix
-	// hasn't changed, we don't need to mark everything again
-
-	// if r_showcluster was just turned on, remark everything 
-	if ( tr.viewCluster == cluster && !tr.refdef.areamaskModified 
-		&& !r_showcluster->modified ) {
-		return;
-	}
-
-	if ( r_showcluster->modified || r_showcluster->integer ) {
-		r_showcluster->modified = qfalse;
-		if ( r_showcluster->integer ) {
-			ri.Printf( PRINT_ALL, "cluster:%i  area:%i\n", cluster, leaf->area );
-		}
-	}
-
-	tr.visCount++;
-	tr.viewCluster = cluster;
-
-	if ( r_novis->integer || tr.viewCluster == -1 ) {
-		for (i=0 ; i<tr.world->numnodes ; i++) {
-			if (tr.world->nodes[i].contents != CONTENTS_SOLID) {
-				tr.world->nodes[i].visframe = tr.visCount;
-			}
-		}
-		return;
-	}
-
-	vis = R_ClusterPVS (tr.viewCluster);
-	
-	for (i=0,leaf=tr.world->nodes ; i<tr.world->numnodes ; i++, leaf++) {
-		cluster = leaf->cluster;
-		if ( cluster < 0 || cluster >= tr.world->numClusters ) {
-			continue;
-		}
-
-		// check general pvs
-		if ( !(vis[cluster>>3] & (1<<(cluster&7))) ) {
-			continue;
-		}
-
-		// check for door connection
-		if ( (tr.refdef.areamask[leaf->area>>3] & (1<<(leaf->area&7)) ) ) {
-			continue;		// not visible
-		}
-
-		parent = leaf;
-		do {
-			if (parent->visframe == tr.visCount)
-				break;
-			parent->visframe = tr.visCount;
-			parent = parent->parent;
-		} while (parent);
-	}
-}
-
-
-/*
-=============
-R_AddWorldSurfaces
-=============
-*/
-void R_AddWorldSurfaces (void) {
-	if (!r_drawworld->integer) {
-		return;
-	}
-
-	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
-		return;
-	}
-
-	tr.currentEntityNum = ENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
-
-	if (r_drawterrain->integer) {
-		R_TerrainPrepareFrame();
-	}
-
-	// determine which leaves are in the PVS / areamask
-	R_MarkLeaves();
-
-	// clear out the visible min/max
-	ClearBounds(tr.viewParms.visBounds[0], tr.viewParms.visBounds[1]);
-
-	// perform frustum culling and add all the potentially visible surfaces
-	if (tr.refdef.num_dlights > 32) {
-		tr.refdef.num_dlights = 32;
-	}
-	R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.viewParms.world);
-	R_RecursiveWorldNode(tr.world->nodes, tr.viewParms.fog.extrafrustums ? 31 : 15, (1 << tr.refdef.num_dlights) - 1);
-
-	if (r_drawterrain->integer) {
-		R_AddTerrainSurfaces();
-	}
-	if (r_drawstaticmodels->integer) {
-		R_AddStaticModelSurfaces();
-	}
-
-	if (g_bInfostaticmodels) {
-		g_bInfostaticmodels = 0;
-		R_PrintInfoStaticModels();
-	}
-
-	R_UpdateLevelMarksSystem();
-}
diff --git a/code/renderercommon/CMakeLists.txt b/code/renderercommon/CMakeLists.txt
new file mode 100644
index 00000000..dfe0ef62
--- /dev/null
+++ b/code/renderercommon/CMakeLists.txt
@@ -0,0 +1,42 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(omohrenderer)
+
+file(GLOB_RECURSE SOURCES_RENDERER_COMMON "./*.c" "./*.cpp")
+
+set(SOURCES_RENDERER_COMMON ${SOURCES_RENDERER_COMMON}
+	"../tiki/tiki_mesh.cpp"
+)
+
+add_library(omohrenderer_common STATIC ${SOURCES_RENDERER_COMMON})
+target_include_directories(omohrenderer_common PUBLIC "../sdl" "./")
+target_compile_features(omohrenderer_common PUBLIC cxx_nullptr)
+target_compile_features(omohrenderer_common PUBLIC c_variadic_macros)
+target_link_libraries(omohrenderer_common PUBLIC qcommon_shared)
+target_link_libraries(omohrenderer_common PUBLIC omohsdl_gl)
+target_compile_definitions(omohrenderer_common PRIVATE USE_INTERNAL_JPEG=1)
+
+# Add JPEG
+if(USE_INTERNAL_JPEG)
+	file(GLOB_RECURSE SOURCES_JPEG_8 "../jpeg-8c/*.c")
+	add_library(jpeg8 STATIC ${SOURCES_JPEG_8})
+	target_include_directories(jpeg8 PRIVATE "../jpeg-8c")
+	target_include_directories(omohrenderer_common PUBLIC "../jpeg-8c")
+	target_link_libraries(omohrenderer_common PRIVATE jpeg8)
+	target_compile_definitions(omohrenderer_common PUBLIC USE_INTERNAL_JPEG)
+else()
+	find_package(JPEG REQUIRED)
+	target_include_directories(omohrenderer_common PUBLIC ${JPEG_INCLUDE_DIRS})
+	target_link_libraries(omohrenderer_common PRIVATE ${JPEG_LIBRARIES})
+endif()
+
+add_subdirectory("../renderergl1" renderergl1)
+
+add_library(omohrenderer INTERFACE)
+target_link_libraries(omohrenderer INTERFACE omohrenderergl1)
+
+if (${USE_RENDERER_DLOPEN})
+	add_subdirectory("../renderergl2" renderergl2)
+	
+	target_link_libraries(omohrenderer INTERFACE omohrenderergl2)
+endif()
\ No newline at end of file
diff --git a/code/renderercommon/new/tr_types_new.h b/code/renderercommon/new/tr_types_new.h
index 0726cc4f..382cad95 100644
--- a/code/renderercommon/new/tr_types_new.h
+++ b/code/renderercommon/new/tr_types_new.h
@@ -20,10 +20,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#include "../../tiki/tiki_shared.h"
+
 #define	MAX_ENTITIES	1023		// can't be increased without changing drawsurf bit packing
 #define MAX_POINTS     32
 #define MAX_SPRITES    2048
 
+#define MAX_MARK_FRAGMENTS   128
+#define MAX_MARK_POLYVERTS   384
+
 #define RDF_FULLBRIGHT		2		// fullbright intensity
 
 typedef struct
diff --git a/code/renderercommon/qgl.h b/code/renderercommon/qgl.h
index 45ae2e4c..d857b033 100644
--- a/code/renderercommon/qgl.h
+++ b/code/renderercommon/qgl.h
@@ -62,6 +62,7 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 	GLE(void, Disable, GLenum cap) \
 	GLE(void, DrawArrays, GLenum mode, GLint first, GLsizei count) \
 	GLE(void, DrawElements, GLenum mode, GLsizei count, GLenum type, const GLvoid *indices) \
+	GLE(void, DrawPixels, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels) \
 	GLE(void, Enable, GLenum cap) \
 	GLE(void, Finish, void) \
 	GLE(void, Flush, void) \
@@ -75,6 +76,7 @@ extern void (APIENTRYP qglUnlockArraysEXT) (void);
 	GLE(const GLubyte *, GetString, GLenum name) \
 	GLE(void, LineStipple, GLint factor, GLushort pattern) \
 	GLE(void, LineWidth, GLfloat width) \
+	GLE(void, PixelZoom, GLfloat xfactor, GLfloat yfactor) \
 	GLE(void, PolygonOffset, GLfloat factor, GLfloat units) \
 	GLE(void, ReadPixels, GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) \
 	GLE(void, Scissor, GLint x, GLint y, GLsizei width, GLsizei height) \
diff --git a/code/renderercommon/tr_common.h b/code/renderercommon/tr_common.h
index 45744c87..4c75eef7 100644
--- a/code/renderercommon/tr_common.h
+++ b/code/renderercommon/tr_common.h
@@ -65,6 +65,16 @@ typedef struct image_s {
 	imgFlags_t  flags;
 
 	struct image_s*	next;
+
+    int			bytesUsed;
+    int			numMipmaps;
+	qboolean	dynamicallyUpdated;
+	qboolean	allowPicmip;
+	qboolean	force32bit;
+    int			wrapClampModeX;
+    int			wrapClampModeY;
+	int			r_sequence;
+	int			UseCount;
 } image_t;
 
 // any change in the LIGHTMAP_* defines here MUST be reflected in
@@ -125,6 +135,7 @@ float R_NoiseGet4f( float x, float y, float z, double t );
 void  R_NoiseInit( void );
 
 image_t     *R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags );
+image_t     *R_RefreshImageFile( const char *name, imgType_t type, imgFlags_t flags );
 image_t *R_CreateImage( const char *name, byte *pic, int width, int height, imgType_t type, imgFlags_t flags, int internalFormat );
 
 void R_IssuePendingRenderCommands( void );
diff --git a/code/renderercommon/tr_public.h b/code/renderercommon/tr_public.h
index 1551fd3f..47040bc3 100644
--- a/code/renderercommon/tr_public.h
+++ b/code/renderercommon/tr_public.h
@@ -130,7 +130,7 @@ typedef struct {
 	void	(*DrawStretchPic2)(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
     void    (*DrawTilePic)(float x, float y, float w, float h, qhandle_t hShader);
     void    (*DrawTilePicOffset)(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
-    void    (*DrawTrianglePic)(vec2_t* points, vec2_t* texCoords, qhandle_t hShader);
+    void    (*DrawTrianglePic)(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
     void    (*DrawBackground)(int cols, int rows, int bgr, uint8_t* data);
 
     void    (*DebugLine)(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
@@ -152,7 +152,7 @@ typedef struct {
     float   (*ModelRadius)(qhandle_t handle);
 
     dtiki_t*        (*R_Model_GetHandle)(qhandle_t handle);
-    void            (*DrawString)(fontheader_t* font, const char* text, float x, float y, int maxLen, qboolean virtualScreen);
+    void            (*DrawString)(fontheader_t* font, const char* text, float x, float y, int maxLen, const float *pvVirtualScreen);
     float           (*GetFontHeight)(const fontheader_t* font);
     float           (*GetFontStringWidth)(const fontheader_t* font, const char* string);
     fontheader_t*   (*LoadFont)(const char* name);
@@ -160,16 +160,21 @@ typedef struct {
     void            (*SwipePoint)(vec3_t point1, vec3_t point2, float time);
     void            (*SwipeEnd)();
     void            (*SetRenderTime)(int t);
-    float           (*Noise)(float x, float y, float z, float t);
+    float           (*Noise)(float x, float y, float z, double t);
     qboolean        (*SetMode)(int mode, const glconfig_t* glConfig);
     void            (*SetFullscreen)(qboolean fullScreen);
     int             (*GetShaderWidth)(qhandle_t hShader);
     int             (*GetShaderHeight)(qhandle_t hShader);
+	const char*		(*GetShaderName)(qhandle_t hShader);
+	const char*		(*GetModelName)(qhandle_t hModel);
     const char*     (*GetGraphicsInfo)();
     void            (*ForceUpdatePose)(refEntity_t* model);
     orientation_t   (*TIKI_Orientation)(refEntity_t* model, int tagNum);
     qboolean        (*TIKI_IsOnGround)(refEntity_t* model, int tagNum, float threshold);
     void            (*SetFrameNumber)(int frameNumber);
+
+	qboolean (*ImageExists)(const char* name);
+	int (*CountTextureMemory)();
 } refexport_t;
 
 //
@@ -261,16 +266,19 @@ typedef struct {
     void (*Cvar_SetDefault)(cvar_t* var, const char* varValue);
 
     long    (*FS_OpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
+	fileHandle_t (*FS_OpenFileWrite)(const char* filename);
     size_t  (*FS_Read)(void* buffer, size_t len, fileHandle_t fileHandle);
+	size_t (*FS_Write)(const void* buffer, size_t len, fileHandle_t h);
     void    (*FS_CloseFile)(fileHandle_t fileHandle);
-    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, fsOrigin_t origin);
+    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, int origin);
     long     (*FS_ReadFileEx)(const char* qpath, void** buffer, qboolean quiet);
+	void	(*FS_CanonicalFilename)(char* filename);
 
     void        (*CM_BoxTrace)(trace_t* results, const vec3_t start, const vec3_t end, const vec3_t mins, const vec3_t maxs, int model, int brushMask, int cylinder);
     int         (*CM_TerrainSquareType)(int terrainPatch, int i, int j);
     char*       (*CM_EntityString)();
 	const char* (*CM_MapTime)();
-    int         (*CG_PermanentMark)(const vec3_t origin, const vec3_t dir, float orientation, float sScale, float tScale, float red, float green, float blue, float alpha, qboolean doLighting, float sCenter, float tCenter, markFragment_t* markFragments, void* polyVerts);
+    int         (*CG_PermanentMark)(vec3_t origin, vec3_t dir, float orientation, float sScale, float tScale, float red, float green, float blue, float alpha, qboolean doLighting, float sCenter, float tCenter, markFragment_t* markFragments, void* polyVerts);
     int         (*CG_PermanentTreadMarkDecal)(treadMark_t* treadMark, qboolean startSegment, qboolean doLighting, markFragment_t* markFragments, void* polyVerts);
     int         (*CG_PermanentUpdateTreadMark)(treadMark_t* treadMark, float alpha, float minSegment, float maxSegment, float maxOffset, float texScale);
     void        (*CG_ProcessInitCommands)(dtiki_t* tiki, refEntity_t* ent);
@@ -282,13 +290,42 @@ typedef struct {
     debugstring_t** DebugStrings;
     int* numDebugStrings;
 
-    orientation_t   (*TIKI_OrientationInternal)(dtiki_t* tiki, int entNum, int tagNum, float scale);
-    qboolean        (*TIKI_IsOnGroundInternal)(dtiki_t* tiki, int entNum, int tagNum, float thresHold);
-    void            (*TIKI_SetPoseInternal)(void* skeletor, const frameInfo_t* frameInfo, const int* boneTag, const vec4_t *boneQuat, float actionWeight);
-    void*           (*TIKI_Alloc)(size_t size);
-    float           (*GetRadiusInternal)(dtiki_t* tiki, int entNum, float scale);
-    float           (*GetCentroidRadiusInternal)(dtiki_t* tiki, int entNum, float scale, vec3_t centroid);
-    void            (*GetFrameInternal)(dtiki_t* tiki, int entNum, skelAnimFrame_t* newFrame);
+    orientation_t (*TIKI_OrientationInternal)(dtiki_t *tiki, int entNum, int tagNum, float scale);
+    qboolean (*TIKI_IsOnGroundInternal)(dtiki_t *tiki, int entNum, int tagNum, float thresHold);
+    void (*TIKI_SetPoseInternal)(
+        void *skeletor, const frameInfo_t *frameInfo, const int *boneTag, const vec4_t *boneQuat, float actionWeight
+    );
+    void *(*TIKI_Alloc)(size_t size);
+    float (*GetRadiusInternal)(dtiki_t *tiki, int entNum, float scale);
+    float (*GetCentroidRadiusInternal)(dtiki_t *tiki, int entNum, float scale, vec3_t centroid);
+    void (*GetFrameInternal)(dtiki_t *tiki, int entNum, skelAnimFrame_t *newFrame);
+
+    void (*UI_LoadResource)(const char *name);
+
+    int (*CM_PointLeafnum)(const vec3_t p);
+    int (*CM_LeafCluster)(int leafnum);
+
+    //
+    // TIKI imports
+    //
+    void (*TIKI_CalcLodConsts)(lodControl_t *LOD);
+    void (*TIKI_CalculateBounds)(dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs);
+    dtiki_t *(*TIKI_FindTiki)(const char *path);
+    dtiki_t *(*TIKI_RegisterTikiFlags)(const char *path, qboolean use);
+    void *(*TIKI_GetSkeletor)(dtiki_t *tiki, int entnum);
+    skelHeaderGame_t *(*TIKI_GetSkel)(int index);
+    void (*TIKI_GetSkelAnimFrame)(dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes);
+    float (*TIKI_GlobalRadius)(dtiki_t *pmdl);
+    skelcache_t *(*TIKI_FindSkelByHeader)(skelHeaderGame_t *skelmodel);
+    int (*TIKI_GetNumChannels)(dtiki_t *tiki);
+    int (*TIKI_GetLocalChannel)(dtiki_t *tiki, int channel);
+    int (*TIKI_GetLocalFromGlobal)(dtiki_t *tiki, int channel);
+
+    //
+    // Skeletor imports
+    //
+    int (*SKEL_GetMorphWeightFrame)(void *skeletor, int index, float time, int *data);
+    int (*SKEL_GetBoneParent)(void *skeletor, int boneIndex);
 } refimport_t;
 
 
diff --git a/code/renderercommon/tr_types.h b/code/renderercommon/tr_types.h
index 84df7824..a677d155 100644
--- a/code/renderercommon/tr_types.h
+++ b/code/renderercommon/tr_types.h
@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define	MAX_DLIGHTS			32		// can't be increased, because bit flags are used on surfaces
 #define MAX_REAL_LIGHTS		32
 
-#define	REFENTITYNUM_BITS	10		// can't be increased without changing drawsurf bit packing
+#define	REFENTITYNUM_BITS	12		// can't be increased without changing drawsurf bit packing
 #define	REFENTITYNUM_MASK	((1<<REFENTITYNUM_BITS) - 1)
 // the last N-bit number (2^REFENTITYNUM_BITS - 1) is reserved for the special world refentity,
 //  and this is reflected by the value of MAX_REFENTITIES (which therefore is not a power-of-2)
@@ -182,8 +182,16 @@ typedef struct {
 
     // fog stuff
     float       farplane_distance;
+	float		farplane_bias; // added in 2.0
     vec3_t      farplane_color;
     qboolean    farplane_cull;
+	// added in 2.0
+	//==
+    qboolean	skybox_farplane;
+    qboolean	renderTerrain;
+    float		farclipOverride;
+    vec3_t		farplaneColorOverride;
+	//==
 
     // sky portal stuff
     qboolean    sky_portal;
diff --git a/code/renderergl1/CMakeLists.txt b/code/renderergl1/CMakeLists.txt
new file mode 100644
index 00000000..bec51e02
--- /dev/null
+++ b/code/renderergl1/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(omohrenderergl1)
+
+file(GLOB_RECURSE SOURCES_RENDERER "./*.c" "./*.cpp")
+
+if (${USE_RENDERER_DLOPEN})
+	add_library(omohrenderergl1 SHARED ${SOURCES_RENDERER})
+else()
+	add_library(omohrenderergl1 STATIC ${SOURCES_RENDERER})
+endif()
+
+target_compile_features(omohrenderergl1 PUBLIC cxx_nullptr)
+target_compile_features(omohrenderergl1 PUBLIC c_variadic_macros)
+target_link_libraries(omohrenderergl1 PRIVATE omohrenderer_common)
+
+get_target_property(target_type omohrenderergl1 TYPE)
+if (target_type STREQUAL "SHARED_LIBRARY")
+	target_sources(omohrenderergl1 PRIVATE "./tr_subs.c")
+	target_compile_definitions(omohrenderergl1 PUBLIC USE_RENDERER_DLOPEN=1)
+	target_compile_definitions(omohrenderergl1 PRIVATE REF_DLL=1)
+endif ()
+
+set_target_properties(omohrenderergl1 PROPERTIES PREFIX "")
+set_target_properties(omohrenderergl1 PROPERTIES OUTPUT_NAME "renderer_opengl1${TARGET_BIN_SUFFIX}")
+
+if (target_type STREQUAL "SHARED_LIBRARY")
+	INSTALL(TARGETS omohrenderergl1 DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
+
+	if(MSVC)
+		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderergl1> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
+	endif()
+endif ()
diff --git a/code/renderer/qgl.h b/code/renderergl1/qgl.h
similarity index 100%
rename from code/renderer/qgl.h
rename to code/renderergl1/qgl.h
diff --git a/code/renderer/qgl_linked.h b/code/renderergl1/qgl_linked.h
similarity index 100%
rename from code/renderer/qgl_linked.h
rename to code/renderergl1/qgl_linked.h
diff --git a/code/renderer/ref_trin.def b/code/renderergl1/ref_trin.def
similarity index 100%
rename from code/renderer/ref_trin.def
rename to code/renderergl1/ref_trin.def
diff --git a/code/renderer/renderer.vcproj b/code/renderergl1/renderer.vcproj
similarity index 100%
rename from code/renderer/renderer.vcproj
rename to code/renderergl1/renderer.vcproj
diff --git a/code/renderergl1/tr_altivec.c b/code/renderergl1/tr_altivec.c
deleted file mode 100644
index 914aa448..00000000
--- a/code/renderergl1/tr_altivec.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-/* This file is only compiled for PowerPC builds with Altivec support.
-   Altivec intrinsics need to be in a separate file, so GCC's -maltivec
-   command line can enable them, but give us the option to _not_ use that
-   on other files, where the compiler might then generate Altivec
-   instructions for normal floating point, crashing on G3 (etc) processors. */
-
-#include "tr_local.h" 
-
-#if idppc_altivec
-
-#if !defined(__APPLE__)
-#include <altivec.h>
-#endif
-
-void ProjectDlightTexture_altivec( void ) {
-	int		i, l;
-	vec_t	origin0, origin1, origin2;
-	float   texCoords0, texCoords1;
-	vector float floatColorVec0, floatColorVec1;
-	vector float modulateVec, colorVec, zero;
-	vector short colorShort;
-	vector signed int colorInt;
-	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
-	vector unsigned char vSel = VECCONST_UINT8(0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff);
-	float	*texCoords;
-	byte	*colors;
-	byte	clipBits[SHADER_MAX_VERTEXES];
-	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
-	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
-	int		numIndexes;
-	float	scale;
-	float	radius;
-	vec3_t	floatColor;
-	float	modulate = 0.0f;
-
-	if ( !backEnd.refdef.num_dlights ) {
-		return;
-	}
-
-	// There has to be a better way to do this so that floatColor
-	// and/or modulate are already 16-byte aligned.
-	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
-	modulatePerm = vec_lvsl(0,(float *)&modulate);
-	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
-	zero = (vector float)vec_splat_s8(0);
-
-	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
-		dlight_t	*dl;
-
-		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definitely doesn't have any of this light
-		}
-		texCoords = texCoordsArray[0];
-		colors = colorArray[0];
-
-		dl = &backEnd.refdef.dlights[l];
-		origin0 = dl->transformed[0];
-		origin1 = dl->transformed[1];
-		origin2 = dl->transformed[2];
-		radius = dl->radius;
-		scale = 1.0f / radius;
-
-		if(r_greyscale->integer)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = floatColor[1] = floatColor[2] = luminance;
-		}
-		else if(r_greyscale->value)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = LERP(dl->color[0] * 255.0f, luminance, r_greyscale->value);
-			floatColor[1] = LERP(dl->color[1] * 255.0f, luminance, r_greyscale->value);
-			floatColor[2] = LERP(dl->color[2] * 255.0f, luminance, r_greyscale->value);
-		}
-		else
-		{
-			floatColor[0] = dl->color[0] * 255.0f;
-			floatColor[1] = dl->color[1] * 255.0f;
-			floatColor[2] = dl->color[2] * 255.0f;
-		}
-		floatColorVec0 = vec_ld(0, floatColor);
-		floatColorVec1 = vec_ld(11, floatColor);
-		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
-		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-			int		clip = 0;
-			vec_t dist0, dist1, dist2;
-			
-			dist0 = origin0 - tess.xyz[i][0];
-			dist1 = origin1 - tess.xyz[i][1];
-			dist2 = origin2 - tess.xyz[i][2];
-
-			backEnd.pc.c_dlightVertexes++;
-
-			texCoords0 = 0.5f + dist0 * scale;
-			texCoords1 = 0.5f + dist1 * scale;
-
-			if( !r_dlightBacks->integer &&
-					// dist . tess.normal[i]
-					( dist0 * tess.normal[i][0] +
-					dist1 * tess.normal[i][1] +
-					dist2 * tess.normal[i][2] ) < 0.0f ) {
-				clip = 63;
-			} else {
-				if ( texCoords0 < 0.0f ) {
-					clip |= 1;
-				} else if ( texCoords0 > 1.0f ) {
-					clip |= 2;
-				}
-				if ( texCoords1 < 0.0f ) {
-					clip |= 4;
-				} else if ( texCoords1 > 1.0f ) {
-					clip |= 8;
-				}
-				texCoords[0] = texCoords0;
-				texCoords[1] = texCoords1;
-
-				// modulate the strength based on the height and color
-				if ( dist2 > radius ) {
-					clip |= 16;
-					modulate = 0.0f;
-				} else if ( dist2 < -radius ) {
-					clip |= 32;
-					modulate = 0.0f;
-				} else {
-					dist2 = Q_fabs(dist2);
-					if ( dist2 < radius * 0.5f ) {
-						modulate = 1.0f;
-					} else {
-						modulate = 2.0f * (radius - dist2) * scale;
-					}
-				}
-			}
-			clipBits[i] = clip;
-
-			modulateVec = vec_ld(0,(float *)&modulate);
-			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
-			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
-			colorInt = vec_cts(colorVec,0);	// RGBx
-			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
-			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
-			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
-		}
-
-		// build a list of triangles that need light
-		numIndexes = 0;
-		for ( i = 0 ; i < tess.numIndexes ; i += 3 ) {
-			int		a, b, c;
-
-			a = tess.indexes[i];
-			b = tess.indexes[i+1];
-			c = tess.indexes[i+2];
-			if ( clipBits[a] & clipBits[b] & clipBits[c] ) {
-				continue;	// not lighted
-			}
-			hitIndexes[numIndexes] = a;
-			hitIndexes[numIndexes+1] = b;
-			hitIndexes[numIndexes+2] = c;
-			numIndexes += 3;
-		}
-
-		if ( !numIndexes ) {
-			continue;
-		}
-
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] );
-
-		qglEnableClientState( GL_COLOR_ARRAY );
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray );
-
-		GL_Bind( tr.dlightImage );
-		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
-		// where they aren't rendered
-		if ( dl->additive ) {
-			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		else {
-			GL_State( GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
-		}
-		R_DrawElements( numIndexes, hitIndexes );
-		backEnd.pc.c_totalIndexes += numIndexes;
-		backEnd.pc.c_dlightIndexes += numIndexes;
-	}
-}
-
-void RB_CalcDiffuseColor_altivec( unsigned char *colors )
-{
-	int				i;
-	float			*v, *normal;
-	trRefEntity_t	*ent;
-	int				ambientLightInt;
-	vec3_t			lightDir;
-	int				numVertexes;
-	vector unsigned char vSel = VECCONST_UINT8(0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff,
-                                               0x00, 0x00, 0x00, 0xff);
-	vector float ambientLightVec;
-	vector float directedLightVec;
-	vector float lightDirVec;
-	vector float normalVec0, normalVec1;
-	vector float incomingVec0, incomingVec1, incomingVec2;
-	vector float zero, jVec;
-	vector signed int jVecInt;
-	vector signed short jVecShort;
-	vector unsigned char jVecChar, normalPerm;
-	ent = backEnd.currentEntity;
-	ambientLightInt = ent->ambientLightInt;
-	// A lot of this could be simplified if we made sure
-	// entities light info was 16-byte aligned.
-	jVecChar = vec_lvsl(0, ent->ambientLight);
-	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
-	jVec = vec_ld(11, (vector float *)ent->ambientLight);
-	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
-
-	jVecChar = vec_lvsl(0, ent->directedLight);
-	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
-	jVec = vec_ld(11,(vector float *)ent->directedLight);
-	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
-
-	jVecChar = vec_lvsl(0, ent->lightDir);
-	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
-	jVec = vec_ld(11,(vector float *)ent->lightDir);
-	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
-
-	zero = (vector float)vec_splat_s8(0);
-	VectorCopy( ent->lightDir, lightDir );
-
-	v = tess.xyz[0];
-	normal = tess.normal[0];
-
-	normalPerm = vec_lvsl(0,normal);
-	numVertexes = tess.numVertexes;
-	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
-		normalVec0 = vec_ld(0,(vector float *)normal);
-		normalVec1 = vec_ld(11,(vector float *)normal);
-		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
-		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
-		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
-		incomingVec2 = vec_add(incomingVec0,incomingVec1);
-		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
-		incomingVec2 = vec_add(incomingVec2,incomingVec1);
-		incomingVec0 = vec_splat(incomingVec2,0);
-		incomingVec0 = vec_max(incomingVec0,zero);
-		normalPerm = vec_lvsl(12,normal);
-		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
-		jVecInt = vec_cts(jVec,0);	// RGBx
-		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
-		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
-		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
-		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
-	}
-}
-
-void LerpMeshVertexes_altivec(md3Surface_t *surf, float backlerp)
-{
-	short	*oldXyz, *newXyz, *oldNormals, *newNormals;
-	float	*outXyz, *outNormal;
-	float	oldXyzScale QALIGN(16);
-	float   newXyzScale QALIGN(16);
-	float	oldNormalScale QALIGN(16);
-	float newNormalScale QALIGN(16);
-	int		vertNum;
-	unsigned lat, lng;
-	int		numVerts;
-
-	outXyz = tess.xyz[tess.numVertexes];
-	outNormal = tess.normal[tess.numVertexes];
-
-	newXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-		+ (backEnd.currentEntity->e.frame * surf->numVerts * 4);
-	newNormals = newXyz + 3;
-
-	newXyzScale = MD3_XYZ_SCALE * (1.0 - backlerp);
-	newNormalScale = 1.0 - backlerp;
-
-	numVerts = surf->numVerts;
-
-	if ( backlerp == 0 ) {
-		vector signed short newNormalsVec0;
-		vector signed short newNormalsVec1;
-		vector signed int newNormalsIntVec;
-		vector float newNormalsFloatVec;
-		vector float newXyzScaleVec;
-		vector unsigned char newNormalsLoadPermute;
-		vector unsigned char newNormalsStorePermute;
-		vector float zero;
-		
-		newNormalsStorePermute = vec_lvsl(0,(float *)&newXyzScaleVec);
-		newXyzScaleVec = *(vector float *)&newXyzScale;
-		newXyzScaleVec = vec_perm(newXyzScaleVec,newXyzScaleVec,newNormalsStorePermute);
-		newXyzScaleVec = vec_splat(newXyzScaleVec,0);		
-		newNormalsLoadPermute = vec_lvsl(0,newXyz);
-		newNormalsStorePermute = vec_lvsr(0,outXyz);
-		zero = (vector float)vec_splat_s8(0);
-		//
-		// just copy the vertexes
-		//
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			newXyz += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			newNormalsLoadPermute = vec_lvsl(0,newXyz);
-			newNormalsStorePermute = vec_lvsr(0,outXyz);
-			newNormalsVec0 = vec_ld(0,newXyz);
-			newNormalsVec1 = vec_ld(16,newXyz);
-			newNormalsVec0 = vec_perm(newNormalsVec0,newNormalsVec1,newNormalsLoadPermute);
-			newNormalsIntVec = vec_unpackh(newNormalsVec0);
-			newNormalsFloatVec = vec_ctf(newNormalsIntVec,0);
-			newNormalsFloatVec = vec_madd(newNormalsFloatVec,newXyzScaleVec,zero);
-			newNormalsFloatVec = vec_perm(newNormalsFloatVec,newNormalsFloatVec,newNormalsStorePermute);
-			//outXyz[0] = newXyz[0] * newXyzScale;
-			//outXyz[1] = newXyz[1] * newXyzScale;
-			//outXyz[2] = newXyz[2] * newXyzScale;
-
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= (FUNCTABLE_SIZE/256);
-			lng *= (FUNCTABLE_SIZE/256);
-
-			// decode X as cos( lat ) * sin( long )
-			// decode Y as sin( lat ) * sin( long )
-			// decode Z as cos( long )
-
-			outNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			outNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			outNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			vec_ste(newNormalsFloatVec,0,outXyz);
-			vec_ste(newNormalsFloatVec,4,outXyz);
-			vec_ste(newNormalsFloatVec,8,outXyz);
-		}
-	} else {
-		//
-		// interpolate and copy the vertex and normal
-		//
-		oldXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-			+ (backEnd.currentEntity->e.oldframe * surf->numVerts * 4);
-		oldNormals = oldXyz + 3;
-
-		oldXyzScale = MD3_XYZ_SCALE * backlerp;
-		oldNormalScale = backlerp;
-
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			oldXyz += 4, newXyz += 4, oldNormals += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			vec3_t uncompressedOldNormal, uncompressedNewNormal;
-
-			// interpolate the xyz
-			outXyz[0] = oldXyz[0] * oldXyzScale + newXyz[0] * newXyzScale;
-			outXyz[1] = oldXyz[1] * oldXyzScale + newXyz[1] * newXyzScale;
-			outXyz[2] = oldXyz[2] * oldXyzScale + newXyz[2] * newXyzScale;
-
-			// FIXME: interpolate lat/long instead?
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-			uncompressedNewNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedNewNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedNewNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			lat = ( oldNormals[0] >> 8 ) & 0xff;
-			lng = ( oldNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-
-			uncompressedOldNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedOldNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedOldNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			outNormal[0] = uncompressedOldNormal[0] * oldNormalScale + uncompressedNewNormal[0] * newNormalScale;
-			outNormal[1] = uncompressedOldNormal[1] * oldNormalScale + uncompressedNewNormal[1] * newNormalScale;
-			outNormal[2] = uncompressedOldNormal[2] * oldNormalScale + uncompressedNewNormal[2] * newNormalScale;
-
-//			VectorNormalize (outNormal);
-		}
-    	VectorArrayNormalize((vec4_t *)tess.normal[tess.numVertexes], numVerts);
-   	}
-}
-
-#endif
diff --git a/code/renderergl1/tr_animation.c b/code/renderergl1/tr_animation.c
deleted file mode 100644
index 2979ab9f..00000000
--- a/code/renderergl1/tr_animation.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-/*
-
-All bones should be an identity orientation to display the mesh exactly
-as it is specified.
-
-For all other frames, the bones represent the transformation from the 
-orientation of the bone in the base frame to the orientation in this
-frame.
-
-*/
-
-
-// copied and adapted from tr_mesh.c
-
-/*
-=============
-R_MDRCullModel
-=============
-*/
-
-static int R_MDRCullModel( mdrHeader_t *header, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	mdrFrame_t	*oldFrame, *newFrame;
-	int			i, frameSize;
-
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-	
-	// compute frame pointers
-	newFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
-	oldFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.oldframe);
-
-	// cull bounding sphere ONLY if this is not an upscaled entity
-	if ( !ent->e.nonNormalizedAxes )
-	{
-		if ( ent->e.frame == ent->e.oldframe )
-		{
-			switch ( R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius ) )
-			{
-				// Ummm... yeah yeah I know we don't really have an md3 here.. but we pretend
-				// we do. After all, the purpose of mdrs are not that different, are they?
-				
-				case CULL_OUT:
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-
-				case CULL_IN:
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-
-				case CULL_CLIP:
-					tr.pc.c_sphere_cull_md3_clip++;
-					break;
-			}
-		}
-		else
-		{
-			int sphereCull, sphereCullB;
-
-			sphereCull  = R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius );
-			if ( newFrame == oldFrame ) {
-				sphereCullB = sphereCull;
-			} else {
-				sphereCullB = R_CullLocalPointAndRadius( oldFrame->localOrigin, oldFrame->radius );
-			}
-
-			if ( sphereCull == sphereCullB )
-			{
-				if ( sphereCull == CULL_OUT )
-				{
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-				}
-				else if ( sphereCull == CULL_IN )
-				{
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-				}
-				else
-				{
-					tr.pc.c_sphere_cull_md3_clip++;
-				}
-			}
-		}
-	}
-	
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldFrame->bounds[0][i] < newFrame->bounds[0][i] ? oldFrame->bounds[0][i] : newFrame->bounds[0][i];
-		bounds[1][i] = oldFrame->bounds[1][i] > newFrame->bounds[1][i] ? oldFrame->bounds[1][i] : newFrame->bounds[1][i];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-		case CULL_IN:
-			tr.pc.c_box_cull_md3_in++;
-			return CULL_IN;
-		case CULL_CLIP:
-			tr.pc.c_box_cull_md3_clip++;
-			return CULL_CLIP;
-		case CULL_OUT:
-		default:
-			tr.pc.c_box_cull_md3_out++;
-			return CULL_OUT;
-	}
-}
-
-/*
-=================
-R_MDRComputeFogNum
-
-=================
-*/
-
-int R_MDRComputeFogNum( mdrHeader_t *header, trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-	mdrFrame_t		*mdrFrame;
-	vec3_t			localOrigin;
-	int frameSize;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-	
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-
-	// FIXME: non-normalized axis issues
-	mdrFrame = ( mdrFrame_t * ) ( ( byte * ) header + header->ofsFrames + frameSize * ent->e.frame);
-	VectorAdd( ent->e.origin, mdrFrame->localOrigin, localOrigin );
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - mdrFrame->radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + mdrFrame->radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-
-/*
-==============
-R_MDRAddAnimSurfaces
-==============
-*/
-
-// much stuff in there is just copied from R_AddMd3Surfaces in tr_mesh.c
-
-void R_MDRAddAnimSurfaces( trRefEntity_t *ent ) {
-	mdrHeader_t		*header;
-	mdrSurface_t	*surface;
-	mdrLOD_t		*lod;
-	shader_t		*shader;
-	skin_t		*skin;
-	int				i, j;
-	int				lodnum = 0;
-	int				fogNum = 0;
-	int				cull;
-	qboolean	personalModel;
-
-	header = (mdrHeader_t *) tr.currentModel->modelData;
-	
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-	
-	if ( ent->e.renderfx & RF_WRAP_FRAMES )
-	{
-		ent->e.frame %= header->numFrames;
-		ent->e.oldframe %= header->numFrames;
-	}	
-	
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ((ent->e.frame >= header->numFrames) 
-		|| (ent->e.frame < 0)
-		|| (ent->e.oldframe >= header->numFrames)
-		|| (ent->e.oldframe < 0) )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_MDRAddAnimSurfaces: no such frame %d to %d for '%s'\n",
-			   ent->e.oldframe, ent->e.frame, tr.currentModel->name );
-		ent->e.frame = 0;
-		ent->e.oldframe = 0;
-	}
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_MDRCullModel (header, ent);
-	if ( cull == CULL_OUT ) {
-		return;
-	}	
-
-	// figure out the current LOD of the model we're rendering, and set the lod pointer respectively.
-	lodnum = R_ComputeLOD(ent);
-	// check whether this model has as that many LODs at all. If not, try the closest thing we got.
-	if(header->numLODs <= 0)
-		return;
-	if(header->numLODs <= lodnum)
-		lodnum = header->numLODs - 1;
-
-	lod = (mdrLOD_t *)( (byte *)header + header->ofsLODs);
-	for(i = 0; i < lodnum; i++)
-	{
-		lod = (mdrLOD_t *) ((byte *) lod + lod->ofsEnd);
-	}
-	
-	// set up lighting
-	if ( !personalModel || r_shadows->integer > 1 )
-	{
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	// fogNum?
-	fogNum = R_MDRComputeFogNum( header, ent );
-
-	surface = (mdrSurface_t *)( (byte *)lod + lod->ofsSurfaces );
-
-	for ( i = 0 ; i < lod->numSurfaces ; i++ )
-	{
-		
-		if(ent->e.customShader)
-			shader = R_GetShaderByHandle(ent->e.customShader);
-		else if(ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins)
-		{
-			skin = R_GetSkinByHandle(ent->e.customSkin);
-			shader = tr.defaultShader;
-			
-			for(j = 0; j < skin->numSurfaces; j++)
-			{
-				if (!strcmp(skin->surfaces[j].name, surface->name))
-				{
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-		}
-		else if(surface->shaderIndex > 0)
-			shader = R_GetShaderByHandle( surface->shaderIndex );
-		else
-			shader = tr.defaultShader;
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-		        && r_shadows->integer == 2
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) )
-			&& shader->sort == SS_OPAQUE )
-		{
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, qfalse );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE )
-		{
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, qfalse );
-		}
-
-		if (!personalModel)
-			R_AddDrawSurf( (void *)surface, shader, fogNum, qfalse );
-
-		surface = (mdrSurface_t *)( (byte *)surface + surface->ofsEnd );
-	}
-}
-
-/*
-==============
-RB_MDRSurfaceAnim
-==============
-*/
-void RB_MDRSurfaceAnim( mdrSurface_t *surface )
-{
-	int				i, j, k;
-	float			frontlerp, backlerp;
-	int				*triangles;
-	int				indexes;
-	int				baseIndex, baseVertex;
-	int				numVerts;
-	mdrVertex_t		*v;
-	mdrHeader_t		*header;
-	mdrFrame_t		*frame;
-	mdrFrame_t		*oldFrame;
-	mdrBone_t		bones[MDR_MAX_BONES], *bonePtr, *bone;
-
-	int			frameSize;
-
-	// don't lerp if lerping off, or this is the only frame, or the last frame...
-	//
-	if (backEnd.currentEntity->e.oldframe == backEnd.currentEntity->e.frame) 
-	{
-		backlerp	= 0;	// if backlerp is 0, lerping is off and frontlerp is never used
-		frontlerp	= 1;
-	} 
-	else  
-	{
-		backlerp	= backEnd.currentEntity->e.backlerp;
-		frontlerp	= 1.0f - backlerp;
-	}
-
-	header = (mdrHeader_t *)((byte *)surface + surface->ofsHeader);
-
-	frameSize = (size_t)( &((mdrFrame_t *)0)->bones[ header->numBones ] );
-
-	frame = (mdrFrame_t *)((byte *)header + header->ofsFrames +
-		backEnd.currentEntity->e.frame * frameSize );
-	oldFrame = (mdrFrame_t *)((byte *)header + header->ofsFrames +
-		backEnd.currentEntity->e.oldframe * frameSize );
-
-	RB_CHECKOVERFLOW( surface->numVerts, surface->numTriangles * 3 );
-
-	triangles	= (int *) ((byte *)surface + surface->ofsTriangles);
-	indexes		= surface->numTriangles * 3;
-	baseIndex	= tess.numIndexes;
-	baseVertex	= tess.numVertexes;
-	
-	// Set up all triangles.
-	for (j = 0 ; j < indexes ; j++) 
-	{
-		tess.indexes[baseIndex + j] = baseVertex + triangles[j];
-	}
-	tess.numIndexes += indexes;
-
-	//
-	// lerp all the needed bones
-	//
-	if ( !backlerp ) 
-	{
-		// no lerping needed
-		bonePtr = frame->bones;
-	} 
-	else 
-	{
-		bonePtr = bones;
-		
-		for ( i = 0 ; i < header->numBones*12 ; i++ ) 
-		{
-			((float *)bonePtr)[i] = frontlerp * ((float *)frame->bones)[i] + backlerp * ((float *)oldFrame->bones)[i];
-		}
-	}
-
-	//
-	// deform the vertexes by the lerped bones
-	//
-	numVerts = surface->numVerts;
-	v = (mdrVertex_t *) ((byte *)surface + surface->ofsVerts);
-	for ( j = 0; j < numVerts; j++ ) 
-	{
-		vec3_t	tempVert, tempNormal;
-		mdrWeight_t	*w;
-
-		VectorClear( tempVert );
-		VectorClear( tempNormal );
-		w = v->weights;
-		for ( k = 0 ; k < v->numWeights ; k++, w++ ) 
-		{
-			bone = bonePtr + w->boneIndex;
-			
-			tempVert[0] += w->boneWeight * ( DotProduct( bone->matrix[0], w->offset ) + bone->matrix[0][3] );
-			tempVert[1] += w->boneWeight * ( DotProduct( bone->matrix[1], w->offset ) + bone->matrix[1][3] );
-			tempVert[2] += w->boneWeight * ( DotProduct( bone->matrix[2], w->offset ) + bone->matrix[2][3] );
-			
-			tempNormal[0] += w->boneWeight * DotProduct( bone->matrix[0], v->normal );
-			tempNormal[1] += w->boneWeight * DotProduct( bone->matrix[1], v->normal );
-			tempNormal[2] += w->boneWeight * DotProduct( bone->matrix[2], v->normal );
-		}
-
-		tess.xyz[baseVertex + j][0] = tempVert[0];
-		tess.xyz[baseVertex + j][1] = tempVert[1];
-		tess.xyz[baseVertex + j][2] = tempVert[2];
-
-		tess.normal[baseVertex + j][0] = tempNormal[0];
-		tess.normal[baseVertex + j][1] = tempNormal[1];
-		tess.normal[baseVertex + j][2] = tempNormal[2];
-
-		tess.texCoords[baseVertex + j][0][0] = v->texCoords[0];
-		tess.texCoords[baseVertex + j][0][1] = v->texCoords[1];
-
-		v = (mdrVertex_t *)&v->weights[v->numWeights];
-	}
-
-	tess.numVertexes += surface->numVerts;
-}
-
-
-#define MC_MASK_X ((1<<(MC_BITS_X))-1)
-#define MC_MASK_Y ((1<<(MC_BITS_Y))-1)
-#define MC_MASK_Z ((1<<(MC_BITS_Z))-1)
-#define MC_MASK_VECT ((1<<(MC_BITS_VECT))-1)
-
-#define MC_SCALE_VECT (1.0f/(float)((1<<(MC_BITS_VECT-1))-2))
-
-#define MC_POS_X (0)
-#define MC_SHIFT_X (0)
-
-#define MC_POS_Y ((((MC_BITS_X))/8))
-#define MC_SHIFT_Y ((((MC_BITS_X)%8)))
-
-#define MC_POS_Z ((((MC_BITS_X+MC_BITS_Y))/8))
-#define MC_SHIFT_Z ((((MC_BITS_X+MC_BITS_Y)%8)))
-
-#define MC_POS_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z))/8))
-#define MC_SHIFT_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z)%8)))
-
-#define MC_POS_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT))/8))
-#define MC_SHIFT_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT)%8)))
-
-#define MC_POS_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2))/8))
-#define MC_SHIFT_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2)%8)))
-
-#define MC_POS_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3))/8))
-#define MC_SHIFT_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3)%8)))
-
-#define MC_POS_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4))/8))
-#define MC_SHIFT_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4)%8)))
-
-#define MC_POS_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5))/8))
-#define MC_SHIFT_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5)%8)))
-
-#define MC_POS_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6))/8))
-#define MC_SHIFT_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6)%8)))
-
-#define MC_POS_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7))/8))
-#define MC_SHIFT_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7)%8)))
-
-#define MC_POS_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8))/8))
-#define MC_SHIFT_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8)%8)))
-
-void MC_UnCompress(float mat[3][4],const unsigned char * comp)
-{
-	int val;
-
-	val=(int)((unsigned short *)(comp))[0];
-	val-=1<<(MC_BITS_X-1);
-	mat[0][3]=((float)(val))*MC_SCALE_X;
-
-	val=(int)((unsigned short *)(comp))[1];
-	val-=1<<(MC_BITS_Y-1);
-	mat[1][3]=((float)(val))*MC_SCALE_Y;
-
-	val=(int)((unsigned short *)(comp))[2];
-	val-=1<<(MC_BITS_Z-1);
-	mat[2][3]=((float)(val))*MC_SCALE_Z;
-
-	val=(int)((unsigned short *)(comp))[3];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[4];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[5];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[0][2]=((float)(val))*MC_SCALE_VECT;
-
-
-	val=(int)((unsigned short *)(comp))[6];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[7];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[8];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[1][2]=((float)(val))*MC_SCALE_VECT;
-
-
-	val=(int)((unsigned short *)(comp))[9];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][0]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[10];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][1]=((float)(val))*MC_SCALE_VECT;
-
-	val=(int)((unsigned short *)(comp))[11];
-	val-=1<<(MC_BITS_VECT-1);
-	mat[2][2]=((float)(val))*MC_SCALE_VECT;
-}
diff --git a/code/renderergl1/tr_backend.c b/code/renderergl1/tr_backend.c
index 56cf37d1..ef3f1961 100644
--- a/code/renderergl1/tr_backend.c
+++ b/code/renderergl1/tr_backend.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -34,6 +34,16 @@ static float	s_flipMatrix[16] = {
 	0, 0, 0, 1
 };
 
+void GL_SetFogColor(const vec4_t fColor) {
+	glState.fFogColor[0] = fColor[0];
+	glState.fFogColor[1] = fColor[1];
+	glState.fFogColor[2] = fColor[2];
+	glState.fFogColor[3] = fColor[3];
+
+	if (!(glState.glStateBits & GLS_FOG_COLOR)) {
+		qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+	}
+}
 
 /*
 ** GL_Bind
@@ -46,6 +56,7 @@ void GL_Bind( image_t *image ) {
 		texnum = tr.defaultImage->texnum;
 	} else {
 		texnum = image->texnum;
+		image->UseCount++;
 	}
 
 	if ( r_nobind->integer && tr.dlightImage ) {		// performance evaluation option
@@ -53,7 +64,7 @@ void GL_Bind( image_t *image ) {
 	}
 
 	if ( glState.currenttextures[glState.currenttmu] != texnum ) {
-		if ( image ) {
+		if (image) {
 			image->frameUsed = tr.frameCount;
 		}
 		glState.currenttextures[glState.currenttmu] = texnum;
@@ -136,16 +147,30 @@ void GL_Cull( int cullType ) {
 	} 
 	else 
 	{
-		qboolean cullFront;
 		qglEnable( GL_CULL_FACE );
 
-		cullFront = (cullType == CT_FRONT_SIDED);
-		if ( backEnd.viewParms.isMirror )
+		if ( cullType == CT_BACK_SIDED )
 		{
-			cullFront = !cullFront;
+			if ( backEnd.viewParms.isMirror )
+			{
+				qglCullFace( GL_FRONT );
+			}
+			else
+			{
+				qglCullFace( GL_BACK );
+			}
+		}
+		else
+		{
+			if ( backEnd.viewParms.isMirror )
+			{
+				qglCullFace( GL_BACK );
+			}
+			else
+			{
+				qglCullFace( GL_FRONT );
+			}
 		}
-
-		qglCullFace( cullFront ? GL_FRONT : GL_BACK );
 	}
 }
 
@@ -176,8 +201,12 @@ void GL_TexEnv( int env )
 	case GL_ADD:
 		qglTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_ADD );
 		break;
+	case GL_COMBINE4_NV:
+	case GL_COMBINE:
+		qglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env);
+		break;
 	default:
-		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed", env );
+		ri.Error( ERR_DROP, "GL_TexEnv: invalid env '%d' passed\n", env );
 		break;
 	}
 }
@@ -190,7 +219,7 @@ void GL_TexEnv( int env )
 */
 void GL_State( unsigned long stateBits )
 {
-	unsigned long diff = stateBits ^ glState.glStateBits;
+	unsigned long diff = glState.glStateBits ^ (glState.externalSetState | stateBits);
 
 	if ( !diff )
 	{
@@ -217,7 +246,7 @@ void GL_State( unsigned long stateBits )
 	//
 	if ( diff & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
 	{
-		GLenum srcFactor = GL_ONE, dstFactor = GL_ONE;
+		GLenum srcFactor, dstFactor;
 
 		if ( stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) )
 		{
@@ -251,7 +280,8 @@ void GL_State( unsigned long stateBits )
 				srcFactor = GL_SRC_ALPHA_SATURATE;
 				break;
 			default:
-				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits" );
+				srcFactor = GL_ONE;		// to get warning to shut up
+				ri.Error( ERR_DROP, "GL_State: invalid src blend state bits\n" );
 				break;
 			}
 
@@ -282,7 +312,8 @@ void GL_State( unsigned long stateBits )
 				dstFactor = GL_ONE_MINUS_DST_ALPHA;
 				break;
 			default:
-				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits" );
+				dstFactor = GL_ONE;		// to get warning to shut up
+				ri.Error( ERR_DROP, "GL_State: invalid dst blend state bits\n" );
 				break;
 			}
 
@@ -340,35 +371,186 @@ void GL_State( unsigned long stateBits )
 		}
 	}
 
+	if ((diff & GLS_MULTITEXTURE_ENV) || (diff & GLS_MULTITEXTURE))
+	{
+		if (stateBits & GLS_MULTITEXTURE_ENV)
+		{
+			GL_TexEnv(GL_COMBINE4_NV);
+		}
+		else if (stateBits & GLS_MULTITEXTURE)
+		{
+			if (glState.cntTexEnvExt != GLS_MULTITEXTURE)
+			{
+				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_PRIMARY_COLOR);
+				qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
+				glState.cntTexEnvExt = GLS_MULTITEXTURE;
+			}
+
+			GL_TexEnv(GL_COMBINE);
+		}
+		else
+		{
+			GL_TexEnv(GL_MODULATE);
+		}
+	}
+
 	//
 	// alpha test
 	//
 	if ( diff & GLS_ATEST_BITS )
 	{
-		switch ( stateBits & GLS_ATEST_BITS )
+		switch (stateBits & GLS_ATEST_BITS)
 		{
 		case 0:
-			qglDisable( GL_ALPHA_TEST );
+			qglDisable(GL_ALPHA_TEST);
 			break;
 		case GLS_ATEST_GT_0:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GREATER, 0.0f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GREATER, 0.05f);
 			break;
 		case GLS_ATEST_LT_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_LESS, 0.5f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, 0.5f);
 			break;
 		case GLS_ATEST_GE_80:
-			qglEnable( GL_ALPHA_TEST );
-			qglAlphaFunc( GL_GEQUAL, 0.5f );
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, 0.5f);
+			break;
+		case GLS_ATEST_LT_FOLIAGE1:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, r_alpha_foliage1->value);
+			break;
+		case GLS_ATEST_GE_FOLIAGE1:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage1->value);
+			break;
+		case GLS_ATEST_LT_FOLIAGE2:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_LESS, r_alpha_foliage2->value);
+			break;
+		case GLS_ATEST_GE_FOLIAGE2:
+			qglEnable(GL_ALPHA_TEST);
+			qglAlphaFunc(GL_GEQUAL, r_alpha_foliage2->value);
 			break;
 		default:
-			assert( 0 );
+			assert(0);
 			break;
 		}
 	}
 
-	glState.glStateBits = stateBits;
+	if (diff & GLS_CLAMP_EDGE)
+	{
+		float clampValue;
+
+		if (haveClampToEdge)
+		{
+			if (stateBits & GLS_CLAMP_EDGE) {
+				clampValue = GL_CLAMP_TO_EDGE;
+			}
+			else {
+				clampValue = GL_REPEAT;
+			}
+		}
+		else
+		{
+			if (stateBits & GLS_CLAMP_EDGE) {
+				clampValue = GL_CLAMP;
+			}
+			else {
+				clampValue = GL_REPEAT;
+			}
+		}
+
+		if (qglActiveTextureARB)
+		{
+			int currenttmu = glState.currenttmu;
+
+			GL_SelectTexture(0);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+
+			GL_SelectTexture(1);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+
+			GL_SelectTexture(currenttmu);
+		}
+		else
+		{
+			GL_SelectTexture(0);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, clampValue);
+			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, clampValue);
+		}
+	}
+	
+	if (diff & GLS_FOG)
+	{
+		if (glState.externalSetState & GLS_FOG)
+		{
+			qglEnable(GL_FOG);
+
+			if (stateBits & GLS_FOG_BLACK)
+			{
+				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
+				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
+			}
+			else if (stateBits & GLS_FOG_WHITE)
+			{
+				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
+				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
+			}
+			else
+			{
+				//
+				// Use the global fog
+				qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+			}
+		}
+		else
+		{
+			qglDisable(GL_FOG);
+		}
+	}
+	else if (glState.externalSetState & GLS_FOG)
+	{
+		if (diff & GLS_FOG_ENABLED)
+		{
+			if (stateBits & GLS_FOG_ENABLED) {
+				qglEnable(GL_FOG);
+			}
+			else {
+				qglDisable(GL_FOG);
+			}
+		}
+
+		if (diff & GLS_FOG_COLOR)
+		{
+			if (stateBits & GLS_FOG_BLACK)
+			{
+				vec4_t fBlackFogColor = { 0, 0, 0, 1 };
+				qglFogfv(GL_FOG_COLOR, fBlackFogColor);
+			}
+			else if (stateBits & GLS_FOG_WHITE)
+			{
+				vec4_t fWhiteFogColor = { 1, 1, 1, 1 };
+				qglFogfv(GL_FOG_COLOR, fWhiteFogColor);
+			}
+			else
+            {
+                //
+                // Use the global fog
+                qglFogfv(GL_FOG_COLOR, glState.fFogColor);
+            }
+		}
+	}
+
+	glState.glStateBits = stateBits | glState.externalSetState;
 }
 
 
@@ -429,30 +611,40 @@ void RB_BeginDrawingView (void) {
 
 	// we will need to change the projection matrix before drawing
 	// 2D images again
-	backEnd.projection2D = qfalse;
+	backEnd.in2D = qfalse;
 
 	//
 	// set the modelview matrix for the viewer
 	//
 	SetViewportAndScissor();
 
+	R_UploadDlights();
+
 	// ensures that depth writes are enabled for the depth clear
 	GL_State( GLS_DEFAULT );
 	// clear relevant buffers
 	clearBits = GL_DEPTH_BUFFER_BIT;
 
-	if ( r_measureOverdraw->integer || r_shadows->integer == 2 )
+	if ( r_measureOverdraw->integer || r_shadows->integer == 3 )
 	{
 		clearBits |= GL_STENCIL_BUFFER_BIT;
 	}
-	if ( r_fastsky->integer && !( backEnd.refdef.rdflags & RDF_NOWORLDMODEL ) )
+
+	if (!( backEnd.refdef.rdflags & RDF_NOWORLDMODEL))
 	{
-		clearBits |= GL_COLOR_BUFFER_BIT;	// FIXME: only if sky shaders have been used
-#ifdef _DEBUG
-		qglClearColor( 0.8f, 0.7f, 0.4f, 1.0f );	// FIXME: get color of sky
-#else
-		qglClearColor( 0.0f, 0.0f, 0.0f, 1.0f );	// FIXME: get color of sky
-#endif
+		if ((backEnd.viewParms.farplane_distance && !tr.skyRendered && !tr.portalRendered) || tr.farclip)
+		{
+			clearBits |= GL_COLOR_BUFFER_BIT;
+			qglClearColor(glState.fFogColor[0], glState.fFogColor[1], glState.fFogColor[2], glState.fFogColor[3]);
+		}
+		else
+		{
+			if (r_fastsky->integer)
+			{
+				clearBits |= GL_COLOR_BUFFER_BIT;
+				qglClearColor(0.5, 0.5, 1.0, 1.0);
+			}
+		}
 	}
 	qglClear( clearBits );
 
@@ -474,17 +666,17 @@ void RB_BeginDrawingView (void) {
 	// clip to the plane of the portal
 	if ( backEnd.viewParms.isPortal ) {
 		float	plane[4];
-		GLdouble	plane2[4];
+		double	plane2[4];
 
 		plane[0] = backEnd.viewParms.portalPlane.normal[0];
 		plane[1] = backEnd.viewParms.portalPlane.normal[1];
 		plane[2] = backEnd.viewParms.portalPlane.normal[2];
 		plane[3] = backEnd.viewParms.portalPlane.dist;
 
-		plane2[0] = DotProduct (backEnd.viewParms.or.axis[0], plane);
-		plane2[1] = DotProduct (backEnd.viewParms.or.axis[1], plane);
-		plane2[2] = DotProduct (backEnd.viewParms.or.axis[2], plane);
-		plane2[3] = DotProduct (plane, backEnd.viewParms.or.origin) - plane[3];
+		plane2[0] = DotProduct (backEnd.viewParms.ori.axis[0], plane);
+		plane2[1] = DotProduct (backEnd.viewParms.ori.axis[1], plane);
+		plane2[2] = DotProduct (backEnd.viewParms.ori.axis[2], plane);
+		plane2[3] = DotProduct (plane, backEnd.viewParms.ori.origin) - plane[3];
 
 		qglLoadMatrixf( s_flipMatrix );
 		qglClipPlane (GL_CLIP_PLANE0, plane2);
@@ -494,7 +686,6 @@ void RB_BeginDrawingView (void) {
 	}
 }
 
-
 /*
 ==================
 RB_RenderDrawSurfList
@@ -502,14 +693,14 @@ RB_RenderDrawSurfList
 */
 void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	shader_t		*shader, *oldShader;
-	int				fogNum, oldFogNum;
 	int				entityNum, oldEntityNum;
-	int				dlighted, oldDlighted;
-	qboolean		depthRange, oldDepthRange, isCrosshair, wasCrosshair;
+	int				dlightMap, oldDlightMap;
+	qboolean		depthRange, oldDepthRange;
+	qboolean		bStaticModel, oldbStaticModel;
 	int				i;
 	drawSurf_t		*drawSurf;
 	int				oldSort;
-	double			originalTime;
+	float			originalTime;
 
 	// save original time for entity shader offsets
 	originalTime = backEnd.refdef.floatTime;
@@ -521,143 +712,169 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	oldEntityNum = -1;
 	backEnd.currentEntity = &tr.worldEntity;
 	oldShader = NULL;
-	oldFogNum = -1;
 	oldDepthRange = qfalse;
-	wasCrosshair = qfalse;
-	oldDlighted = qfalse;
+	oldDlightMap = 0;
 	oldSort = -1;
+	oldbStaticModel = -1;
 	depthRange = qfalse;
 
 	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.numSpheresUsed = 0;
 
 	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
-		if ( drawSurf->sort == oldSort ) {
+		if ( drawSurf->sort == oldSort && *drawSurf->surface != SF_SPRITE ) {
 			// fast path, same as previous sort
 			rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 			continue;
 		}
 		oldSort = drawSurf->sort;
-		R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted );
-
-		//
-		// change the tess parameters if needed
-		// a "entityMergable" shader is a shader that can have surfaces from separate
-		// entities merged into a single batch, like smoke and blood puff sprites
-		if ( shader != NULL && ( shader != oldShader || fogNum != oldFogNum || dlighted != oldDlighted 
-			|| ( entityNum != oldEntityNum && !shader->entityMergable ) ) ) {
-			if (oldShader != NULL) {
-				RB_EndSurface();
-			}
-			RB_BeginSurface( shader, fogNum );
-			oldShader = shader;
-			oldFogNum = fogNum;
-			oldDlighted = dlighted;
+		if (*drawSurf->surface != SF_SPRITE) {
+			R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlightMap, &bStaticModel);
+		} else {
+			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+			entityNum = ENTITYNUM_WORLD;
+			dlightMap = 0;
+			bStaticModel = qfalse;
 		}
 
+		//
+		// change the tess parameters if needed
+		// a "entityMergable" shader is a shader that can have surfaces from seperate
+		// entities merged into a single batch, like smoke and blood puff sprites
+		if (shader != oldShader || dlightMap != oldDlightMap || (oldShader->flags & 1)
+			|| ( entityNum != oldEntityNum && !shader->entityMergable )
+			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )) {
+			if (oldShader != NULL) {
+				RB_EndSurface();
+			}
+			RB_BeginSurface( shader );
+			oldShader = shader;
+			oldDlightMap = dlightMap;
+		}
+
+		backEnd.currentSphere = &backEnd.spareSphere;
 		//
 		// change the modelview matrix if needed
 		//
-		if ( entityNum != oldEntityNum ) {
-			depthRange = isCrosshair = qfalse;
+		if ( entityNum != oldEntityNum || bStaticModel != oldbStaticModel ) {
+			depthRange = qfalse;
 
-			if ( entityNum != REFENTITYNUM_WORLD ) {
-				backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+			if (bStaticModel) {
+				backEnd.shaderStartTime = 0.0;
+				backEnd.currentEntity = 0;
+				backEnd.spareSphere.TessFunction = 0;
+				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
+				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.ori );
+			}
+			else {
+				backEnd.currentStaticModel = NULL;
+				if (entityNum != ENTITYNUM_WORLD) {
+					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+					backEnd.shaderStartTime = backEnd.currentEntity->e.shaderTime;
 
-				// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
-				backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
+					// set up the transformation matrix
+					R_RotateForEntity(backEnd.currentEntity, &backEnd.viewParms, &backEnd.ori);
 
-				// we have to reset the shaderTime as well otherwise image animations start
-				// from the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
+					// set up the dynamic lighting if needed
+					if (backEnd.currentEntity->needDlights) {
+						R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
+					}
 
-				// set up the transformation matrix
-				R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
-
-				// set up the dynamic lighting if needed
-				if ( backEnd.currentEntity->needDlights ) {
-					R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
+					if (backEnd.currentEntity->e.renderfx & RF_DEPTHHACK) {
+						// hack the depth range to prevent view model from poking into walls
+						depthRange = qtrue;
+					}
 				}
-
-				if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
-				{
-					// hack the depth range to prevent view model from poking into walls
-					depthRange = qtrue;
-					
-					if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
-						isCrosshair = qtrue;
+				else {
+					backEnd.currentEntity = &tr.worldEntity;
+					backEnd.ori = backEnd.viewParms.world;
+					backEnd.shaderStartTime = 0.0;
+					R_TransformDlights(backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.ori);
 				}
-			} else {
-				backEnd.currentEntity = &tr.worldEntity;
-				backEnd.refdef.floatTime = originalTime;
-				backEnd.or = backEnd.viewParms.world;
-				// we have to reset the shaderTime as well otherwise image animations on
-				// the world (like water) continue with the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-				R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 			}
 
-			qglLoadMatrixf( backEnd.or.modelMatrix );
+			qglLoadMatrixf( backEnd.ori.modelMatrix );
 
 			//
-			// change depthrange. Also change projection matrix so first person weapon does not look like coming
-			// out of the screen.
+			// change depthrange if needed
 			//
-			if (oldDepthRange != depthRange || wasCrosshair != isCrosshair)
-			{
-				if (depthRange)
-				{
-					if(backEnd.viewParms.stereoFrame != STEREO_CENTER)
-					{
-						if(isCrosshair)
-						{
-							if(oldDepthRange)
-							{
-								// was not a crosshair but now is, change back proj matrix
-								qglMatrixMode(GL_PROJECTION);
-								qglLoadMatrixf(backEnd.viewParms.projectionMatrix);
-								qglMatrixMode(GL_MODELVIEW);
-							}
-						}
-						else
-						{
-							viewParms_t temp = backEnd.viewParms;
-
-							R_SetupProjection(&temp, r_znear->value, qfalse);
-
-							qglMatrixMode(GL_PROJECTION);
-							qglLoadMatrixf(temp.projectionMatrix);
-							qglMatrixMode(GL_MODELVIEW);
-						}
-					}
-
-					if(!oldDepthRange)
-						qglDepthRange (0, 0.3);
+			if ( oldDepthRange != depthRange ) {
+				if ( depthRange ) {
+					qglDepthRange (0, 0.3);
+				} else {
+					qglDepthRange (0, 1.0);
 				}
-				else
-				{
-					if(!wasCrosshair && backEnd.viewParms.stereoFrame != STEREO_CENTER)
-					{
-						qglMatrixMode(GL_PROJECTION);
-						qglLoadMatrixf(backEnd.viewParms.projectionMatrix);
-						qglMatrixMode(GL_MODELVIEW);
-					}
-
-					qglDepthRange (0, 1);
-				}
-
 				oldDepthRange = depthRange;
-				wasCrosshair = isCrosshair;
 			}
 
 			oldEntityNum = entityNum;
+			oldbStaticModel = bStaticModel;
+		}
+
+		tess.dlightMap = dlightMap;
+		if (r_fastdlights->integer) {
+			tess.dlightMap = 0;
+		}
+
+		if (bStaticModel)
+		{
+			if (r_drawspherelights->integer) {
+				RB_Static_BuildDLights();
+			}
+
+			if (!backEnd.currentStaticModel->bLightGridCalculated) {
+				RB_Grid_SetupStaticModel();
+			}
+		}
+		else if (backEnd.currentEntity->e.tiki)
+		{
+			if (shader->needsLGrid
+				|| shader->needsLSpherical && r_fastentlight->integer
+				|| !r_drawspherelights->integer)
+			{
+				backEnd.currentSphere->TessFunction = RB_CalcLightGridColor;
+				RB_Grid_SetupEntity();
+			}
+			else if (shader->needsLSpherical)
+			{
+				if (tr.refdef.rdflags & RDF_HUD)
+				{
+					backEnd.currentSphere = &backEnd.hudSphere;
+					backEnd.hudSphere.TessFunction = 0;
+					RB_Sphere_SetupEntity();
+				}
+				else if (backEnd.currentEntity->sphereCalculated)
+				{
+					backEnd.currentSphere = &backEnd.spheres[backEnd.currentEntity->lightingSphere];
+				}
+				else
+				{
+					if (backEnd.numSpheresUsed == MAX_SPHERE_LIGHTS)
+					{
+						ri.Printf(PRINT_DEVELOPER, "Spherical lighting: Ran out of space in the sphere array!\n");
+						backEnd.currentSphere = &backEnd.spareSphere;
+					}
+					else
+					{
+						backEnd.currentSphere = &backEnd.spheres[backEnd.numSpheresUsed];
+						backEnd.currentEntity->lightingSphere = backEnd.numSpheresUsed++;
+						backEnd.currentEntity->sphereCalculated = 1;
+					}
+
+					backEnd.currentSphere->TessFunction = NULL;
+					RB_Sphere_SetupEntity();
+				}
+			}
+		}
+
+		if (*drawSurf->surface == SF_SPRITE) {
+			backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
 		}
 
 		// add the triangles for this surface
 		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 	}
 
-	backEnd.refdef.floatTime = originalTime;
-
 	// draw the contents of the last shader batch
 	if (oldShader != NULL) {
 		RB_EndSurface();
@@ -666,13 +883,24 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// go back to the world modelview matrix
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
 	if ( depthRange ) {
-		qglDepthRange (0, 1);
+		qglDepthRange (0, 1.0);
 	}
 
-	if (r_drawSun->integer) {
-		RB_DrawSun(0.1, tr.sunShader);
+	RB_ShadowFinish();
+	if (!(backEnd.refdef.rdflags & RDF_HUD)) {
+		RB_RenderFlares();
+		R_DrawLensFlares();
 	}
 
+	if (g_bInfoworldtris)
+	{
+		g_bInfoworldtris = 0;
+		R_PrintInfoWorldtris();
+	}
+
+#if 0
+	RB_DrawSun();
+#endif
 	// darken down any stencil shadows
 	RB_ShadowFinish();		
 
@@ -680,11 +908,79 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	RB_RenderFlares();
 }
 
+/*
+==================
+RB_RenderSpriteSurfList
+==================
+*/
+void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
+	shader_t	*shader;
+	shader_t	*oldShader;
+	qboolean	depthRange;
+	qboolean	oldDepthRange;
+	int			i;
+	drawSurf_t	*drawSurf;
+
+    backEnd.currentEntity = &tr.worldEntity;
+    backEnd.currentStaticModel = 0;
+
+	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.ori = backEnd.viewParms.world;
+
+	oldShader = NULL;
+    depthRange = qfalse;
+    oldDepthRange = qfalse;
+
+    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
+		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
+
+        if ((shader != oldShader || (oldShader->flags & RF_THIRD_PERSON) != 0) && !shader->entityMergable)
+        {
+			if (oldShader) {
+				RB_EndSurface();
+			}
+
+            RB_BeginSurface(shader);
+            oldShader = shader;
+        }
+
+        qglLoadMatrixf(backEnd.ori.modelMatrix);
+
+        if (oldDepthRange != depthRange)
+        {
+			if (depthRange) {
+				qglDepthRange(0.0, 0.3);
+			} else {
+                qglDepthRange(0.0, 1.0);
+			}
+
+            oldDepthRange = depthRange;
+        }
+
+        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+
+        // add the triangles for this surface
+        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
+	}
+
+	if (oldShader) {
+		RB_EndSurface();
+	}
+
+    // go back to the world modelview matrix
+    qglLoadMatrixf(backEnd.viewParms.world.modelMatrix);
+	// go back to the previous depth range
+	if (depthRange) {
+		qglDepthRange(0.0, 1.0);
+	}
+}
+
 
 /*
 ============================================================================
 
-RENDER BACK END FUNCTIONS
+RENDER BACK END THREAD FUNCTIONS
 
 ============================================================================
 */
@@ -696,27 +992,7 @@ RB_SetGL2D
 ================
 */
 void	RB_SetGL2D (void) {
-	backEnd.projection2D = qtrue;
-
-	// set 2D virtual screen size
-	qglViewport( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglScissor( 0, 0, glConfig.vidWidth, glConfig.vidHeight );
-	qglMatrixMode(GL_PROJECTION);
-    qglLoadIdentity ();
-	qglOrtho (0, glConfig.vidWidth, glConfig.vidHeight, 0, 0, 1);
-	qglMatrixMode(GL_MODELVIEW);
-    qglLoadIdentity ();
-
-	GL_State( GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-
-	GL_Cull( CT_TWO_SIDED );
-	qglDisable( GL_CLIP_PLANE0 );
-
-	// set time for 2D shaders
-	backEnd.refdef.time = ri.Milliseconds();
-	backEnd.refdef.floatTime = backEnd.refdef.time * 0.001;
+	Set2DWindow(0, 0, glConfig.vidWidth, glConfig.vidHeight, 0.0, glConfig.vidWidth, glConfig.vidHeight, 0.0, 0.0, 1.0);
 }
 
 
@@ -729,7 +1005,7 @@ Stretches a raw 32 bit power of 2 bitmap image over the given screen rectangle.
 Used for cinematics.
 =============
 */
-void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
+void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
 	int			i, j;
 	int			start, end;
 
@@ -738,14 +1014,10 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 	}
 	R_IssuePendingRenderCommands();
 
-	if ( tess.numIndexes ) {
-		RB_EndSurface();
-	}
-
-	// we definitely want to sync every frame for the cinematics
+	// we definately want to sync every frame for the cinematics
 	qglFinish();
 
-	start = 0;
+	start = end = 0;
 	if ( r_speeds->integer ) {
 		start = ri.Milliseconds();
 	}
@@ -759,8 +1031,22 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 		ri.Error (ERR_DROP, "Draw_StretchRaw: size not a power of 2: %i by %i", cols, rows);
 	}
 
-	RE_UploadCinematic (w, h, cols, rows, data, client, dirty);
-	GL_Bind( tr.scratchImage[client] );
+	GL_Bind( tr.scratchImage );
+
+	// if the scratchImage isn't in the format we want, specify it as a new texture
+	if ( cols != tr.scratchImage->width || rows != tr.scratchImage->height ) {
+		tr.scratchImage->width = tr.scratchImage->uploadWidth = cols;
+		tr.scratchImage->height = tr.scratchImage->uploadHeight = rows;
+		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
+		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );	
+	} else {
+		// otherwise, just subimage upload it so that drivers can tell we are going to be changing
+		// it and don't try and do a texture compression
+		qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+	}
 
 	if ( r_speeds->integer ) {
 		end = ri.Milliseconds();
@@ -785,12 +1071,12 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 
 void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
 
-	GL_Bind( tr.scratchImage[client] );
+	GL_Bind( &tr.scratchImage[client] );
 
 	// if the scratchImage isn't in the format we want, specify it as a new texture
-	if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
-		tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
-		tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
+	if ( cols != tr.scratchImage[client].width || rows != tr.scratchImage[client].height ) {
+		tr.scratchImage[client].width = tr.scratchImage[client].uploadWidth = cols;
+		tr.scratchImage[client].height = tr.scratchImage[client].uploadHeight = rows;
 		qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
 		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
 		qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
@@ -805,7 +1091,6 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
 	}
 }
 
-
 /*
 =============
 RB_SetColor
@@ -837,7 +1122,7 @@ const void *RB_StretchPic ( const void *data ) {
 
 	cmd = (const stretchPicCommand_t *)data;
 
-	if ( !backEnd.projection2D ) {
+	if ( !backEnd.in2D ) {
 		RB_SetGL2D();
 	}
 
@@ -847,7 +1132,7 @@ const void *RB_StretchPic ( const void *data ) {
 			RB_EndSurface();
 		}
 		backEnd.currentEntity = &backEnd.entity2D;
-		RB_BeginSurface( shader, 0 );
+		RB_BeginSurface( shader );
 	}
 
 	RB_CHECKOVERFLOW( 4, 6 );
@@ -900,6 +1185,31 @@ const void *RB_StretchPic ( const void *data ) {
 	return (const void *)(cmd + 1);
 }
 
+/*
+=============
+RB_SetupFog
+=============
+*/
+void RB_SetupFog() {
+	if (!backEnd.viewParms.farplane_distance) {
+		glState.externalSetState &= ~GLS_FOG;
+	} else if (r_farplane_nofog->integer) {
+		glState.externalSetState &= ~GLS_FOG;
+	} else {
+		vec4_t vFogColor;
+
+		qglFogf(GL_FOG_START, backEnd.viewParms.farplane_bias);
+		qglFogf(GL_FOG_END, backEnd.viewParms.farplane_distance);
+
+        vFogColor[0] = backEnd.viewParms.farplane_color[0] * tr.identityLight;
+        vFogColor[1] = backEnd.viewParms.farplane_color[1] * tr.identityLight;
+        vFogColor[2] = backEnd.viewParms.farplane_color[2] * tr.identityLight;
+        vFogColor[3] = 1.0;
+        GL_SetFogColor(vFogColor);
+
+		glState.externalSetState |= GLS_FOG;
+	}
+}
 
 /*
 =============
@@ -920,12 +1230,39 @@ const void	*RB_DrawSurfs( const void *data ) {
 	backEnd.refdef = cmd->refdef;
 	backEnd.viewParms = cmd->viewParms;
 
+	RB_SetupFog();
 	RB_RenderDrawSurfList( cmd->drawSurfs, cmd->numDrawSurfs );
 
 	return (const void *)(cmd + 1);
 }
 
 
+/*
+=============
+RB_DrawSurfs
+
+=============
+*/
+const void* RB_SpriteSurfs(const void* data) {
+    const drawSurfsCommand_t* cmd;
+
+    // finish any 2D drawing if needed
+    if (tess.numIndexes) {
+        RB_EndSurface();
+    }
+
+    cmd = (const drawSurfsCommand_t*)data;
+
+    backEnd.refdef = cmd->refdef;
+    backEnd.viewParms = cmd->viewParms;
+	
+	RB_SetupFog();
+    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
+
+    return (const void*)(cmd + 1);
+}
+
+
 /*
 =============
 RB_DrawBuffer
@@ -958,13 +1295,13 @@ was there.  This is used to test for texture thrashing.
 Also called by RE_EndRegistration
 ===============
 */
-void RB_ShowImages( void ) {
+void RB_ShowImages( qboolean quiet ) {
 	int		i;
 	image_t	*image;
 	float	x, y, w, h;
 	int		start, end;
 
-	if ( !backEnd.projection2D ) {
+	if ( !backEnd.in2D ) {
 		RB_SetGL2D();
 	}
 
@@ -975,7 +1312,7 @@ void RB_ShowImages( void ) {
 	start = ri.Milliseconds();
 
 	for ( i=0 ; i<tr.numImages ; i++ ) {
-		image = tr.images[i];
+		image = &tr.images[i];
 
 		w = glConfig.vidWidth / 20;
 		h = glConfig.vidHeight / 15;
@@ -1004,8 +1341,10 @@ void RB_ShowImages( void ) {
 	qglFinish();
 
 	end = ri.Milliseconds();
-	ri.Printf( PRINT_ALL, "%i msec to draw all images\n", end - start );
 
+    if (!quiet) {
+        ri.Printf(PRINT_ALL, "%i msec to draw all images\n", end - start);
+    }
 }
 
 /*
@@ -1038,13 +1377,14 @@ const void *RB_ClearDepth(const void *data)
 
 	// texture swapping test
 	if (r_showImages->integer)
-		RB_ShowImages();
+		RB_ShowImages(qtrue);
 
 	qglClear(GL_DEPTH_BUFFER_BIT);
 	
 	return (const void *)(cmd + 1);
 }
 
+
 /*
 =============
 RB_SwapBuffers
@@ -1061,7 +1401,7 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	// texture swapping test
 	if ( r_showImages->integer ) {
-		RB_ShowImages();
+		RB_ShowImages(qfalse);
 	}
 
 	cmd = (const swapBuffersCommand_t *)data;
@@ -1093,7 +1433,7 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	GLimp_EndFrame();
 
-	backEnd.projection2D = qfalse;
+	backEnd.in2D = qfalse;
 
 	return (const void *)(cmd + 1);
 }
@@ -1101,6 +1441,9 @@ const void	*RB_SwapBuffers( const void *data ) {
 /*
 ====================
 RB_ExecuteRenderCommands
+
+This function will be called synchronously if running without
+smp extensions, or asynchronously by another thread.
 ====================
 */
 void RB_ExecuteRenderCommands( const void *data ) {
@@ -1121,6 +1464,9 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_DRAW_SURFS:
 			data = RB_DrawSurfs( data );
 			break;
+		case RC_SPRITE_SURFS:
+			data = RB_SpriteSurfs( data );
+			break;
 		case RC_DRAW_BUFFER:
 			data = RB_DrawBuffer( data );
 			break;
diff --git a/code/renderergl1/tr_bsp.c b/code/renderergl1/tr_bsp.c
index 5de7ff90..20f5f6d5 100644
--- a/code/renderergl1/tr_bsp.c
+++ b/code/renderergl1/tr_bsp.c
@@ -1,6 +1,7 @@
 /*
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of Quake III Arena source code.
 
@@ -15,13 +16,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_map.c
 
 #include "tr_local.h"
+#include "tr_vis.h"
 
 /*
 
@@ -39,56 +41,86 @@ static	byte		*fileBase;
 int			c_subdivisions;
 int			c_gridVerts;
 
+static int map_length;
+static int nummodels;
+static int numShaders;
+static int numbrushes;
+static int numbrushsides;
+static int numFogs;
+static int numplanes;
+static int num_entities;
+static int numnodes;
+static int numleafs;
+static int numleafsurfaces;
+static int numDrawVerts;
+static int numDrawIndexes;
+static int numDrawSurfaces;
+static int numLightDefs;
+static int numLightBytes;
+static int numVisBytes;
+static int numSLights;
+static int entLightVisSize;
+static int g_iGridArraySize;
+static int g_iGridDataSize;
+static int g_iGridPaletteBytes;
+static int g_iGridOffsets;
+static int g_nStaticModelData;
+static int map_version;
+static int g_nStaticModelIndices;
+static int g_nStaticModels;
+static int g_nTerPatchIndices;
+static int g_nTerraPatches;
+
 //===============================================================================
 
 static void HSVtoRGB( float h, float s, float v, float rgb[3] )
 {
-	int i;
-	float f;
-	float p, q, t;
+    int i;
+    float f;
+    float p, q, t;
 
-	h *= 5;
+    h *= 5;
 
-	i = floor( h );
-	f = h - i;
+    i = floor( h );
+    f = h - i;
 
-	p = v * ( 1 - s );
-	q = v * ( 1 - s * f );
-	t = v * ( 1 - s * ( 1 - f ) );
+    p = v * ( 1 - s );
+    q = v * ( 1 - s * f );
+    t = v * ( 1 - s * ( 1 - f ) );
 
-	switch ( i )
-	{
-	case 0:
-		rgb[0] = v;
-		rgb[1] = t;
-		rgb[2] = p;
-		break;
-	case 1:
-		rgb[0] = q;
-		rgb[1] = v;
-		rgb[2] = p;
-		break;
-	case 2:
-		rgb[0] = p;
-		rgb[1] = v;
-		rgb[2] = t;
-		break;
-	case 3:
-		rgb[0] = p;
-		rgb[1] = q;
-		rgb[2] = v;
-		break;
-	case 4:
-		rgb[0] = t;
-		rgb[1] = p;
-		rgb[2] = v;
-		break;
-	case 5:
-		rgb[0] = v;
-		rgb[1] = p;
-		rgb[2] = q;
-		break;
-	}
+    switch ( i )
+    {
+    case 0:
+        rgb[0] = v;
+        rgb[1] = t;
+        rgb[2] = p;
+        break;
+    case 1:
+        rgb[0] = q;
+        rgb[1] = v;
+        rgb[2] = p;
+        break;
+    case 2:
+        rgb[0] = p;
+        rgb[1] = v;
+        rgb[2] = t;
+        break;
+    case 3:
+        rgb[0] = p;
+        rgb[1] = q;
+        rgb[2] = v;
+        break;
+    case 4:
+        rgb[0] = t;
+        rgb[1] = p;
+        rgb[2] = v;
+        break;
+    case 5:
+        rgb[0] = v;
+        rgb[1] = p;
+        rgb[2] = q;
+        break;
+    }
 }
 
 /*
@@ -97,32 +129,59 @@ R_ColorShiftLightingBytes
 
 ===============
 */
-static	void R_ColorShiftLightingBytes( byte in[4], byte out[4] ) {
-	int		shift, r, g, b;
+static	void R_ColorShiftLightingBytes( byte in[3], byte out[3] ) {
+    int		r, g, b;
 
-	// shift the color data based on overbright range
-	shift = r_mapOverBrightBits->integer - tr.overbrightBits;
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
 
-	// shift the data based on overbright range
-	r = in[0] << shift;
-	g = in[1] << shift;
-	b = in[2] << shift;
-	
-	// normalize by color instead of saturating to white
-	if ( ( r | g | b ) > 255 ) {
-		int		max;
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
 
-		max = r > g ? r : g;
-		max = max > b ? max : b;
-		r = r * 255 / max;
-		g = g * 255 / max;
-		b = b * 255 / max;
-	}
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+}
 
-	out[0] = r;
-	out[1] = g;
-	out[2] = b;
-	out[3] = in[3];
+/*
+===============
+R_ColorShiftLightingBytesAlpha
+
+===============
+*/
+static	void R_ColorShiftLightingBytesAlpha( byte in[4], byte out[4] ) {
+    int		r, g, b;
+
+    // shift the data based on overbright range
+    r = in[0] << tr.overbrightShift;
+    g = in[1] << tr.overbrightShift;
+    b = in[2] << tr.overbrightShift;
+    
+    // normalize by color instead of saturating to white
+    if ( ( r | g | b ) > 255 ) {
+        int		max;
+        
+        max = r > g ? r : g;
+        max = max > b ? max : b;
+        r = r * 255 / max;
+        g = g * 255 / max;
+        b = b * 255 / max;
+    }
+
+    out[0] = r;
+    out[1] = g;
+    out[2] = b;
+    out[3] = in[3];
 }
 
 /*
@@ -132,84 +191,87 @@ R_LoadLightmaps
 ===============
 */
 #define	LIGHTMAP_SIZE	128
-static	void R_LoadLightmaps( lump_t *l ) {
-	byte		*buf, *buf_p;
-	int			len;
-	byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
-	int			i, j;
-	float maxIntensity = 0;
-	double sumIntensity = 0;
+static	void R_LoadLightmaps(gamelump_t* l) {
+    byte		*buf, *buf_p;
+    int			len;
+    MAC_STATIC byte		image[LIGHTMAP_SIZE*LIGHTMAP_SIZE*4];
+    int			i, j;
+    float maxIntensity = 0;
+    double sumIntensity = 0;
 
-	len = l->filelen;
-	if ( !len ) {
-		return;
-	}
-	buf = fileBase + l->fileofs;
+    tr.numLightmaps = 0;
 
-	// we are about to upload textures
-	R_IssuePendingRenderCommands();
+    len = l->length;
+    if (!len) {
+        return;
+    }
+    buf = l->buffer;
 
-	// create all the lightmaps
-	tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
-	if ( tr.numLightmaps == 1 ) {
-		//FIXME: HACK: maps with only one lightmap turn up fullbright for some reason.
-		//this avoids this, but isn't the correct solution.
-		tr.numLightmaps++;
-	}
+    // we are about to upload textures
+    R_IssuePendingRenderCommands();
 
+    // create all the lightmaps
+    tr.numLightmaps = len / (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3);
+    
 	// if we are in r_vertexLight mode, we don't need the lightmaps at all
 	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		return;
-	}
+        return;
+    }
 
-	tr.lightmaps = ri.Hunk_Alloc( tr.numLightmaps * sizeof(image_t *), h_low );
-	for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
-		// expand the 24 bit on-disk to 32 bit
-		buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
+    for ( i = 0 ; i < tr.numLightmaps ; i++ ) {
+        // expand the 24 bit on-disk to 32 bit
+        buf_p = buf + i * LIGHTMAP_SIZE*LIGHTMAP_SIZE * 3;
 
-		if ( r_lightmap->integer == 2 )
-		{	// color code by intensity as development tool	(FIXME: check range)
-			for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
-			{
-				float r = buf_p[j*3+0];
-				float g = buf_p[j*3+1];
-				float b = buf_p[j*3+2];
-				float intensity;
-				float out[3] = {0.0, 0.0, 0.0};
+        if ( r_lightmap->integer == 2 )
+        {	// color code by intensity as development tool	(FIXME: check range)
+            for ( j = 0; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ )
+            {
+                float r = buf_p[j*3+0];
+                float g = buf_p[j*3+1];
+                float b = buf_p[j*3+2];
+                float intensity;
+                float out[3];
 
-				intensity = 0.33f * r + 0.685f * g + 0.063f * b;
+                intensity = 0.33f * r + 0.685f * g + 0.063f * b;
 
-				if ( intensity > 255 )
-					intensity = 1.0f;
-				else
-					intensity /= 255.0f;
+                if ( intensity > 255 )
+                    intensity = 1.0f;
+                else
+                    intensity /= 255.0f;
 
-				if ( intensity > maxIntensity )
-					maxIntensity = intensity;
+                if ( intensity > maxIntensity )
+                    maxIntensity = intensity;
 
-				HSVtoRGB( intensity, 1.00, 0.50, out );
+                HSVtoRGB( intensity, 1.00, 0.50, out );
 
-				image[j*4+0] = out[0] * 255;
-				image[j*4+1] = out[1] * 255;
-				image[j*4+2] = out[2] * 255;
-				image[j*4+3] = 255;
+                image[j*4+0] = out[0] * 255;
+                image[j*4+1] = out[1] * 255;
+                image[j*4+2] = out[2] * 255;
+                image[j*4+3] = 255;
 
-				sumIntensity += intensity;
-			}
-		} else {
-			for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
-				R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
-				image[j*4+3] = 255;
-			}
-		}
-		tr.lightmaps[i] = R_CreateImage( va("*lightmap%d",i), image, 
-			LIGHTMAP_SIZE, LIGHTMAP_SIZE, IMGTYPE_COLORALPHA,
-			IMGFLAG_NOLIGHTSCALE | IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, 0 );
-	}
+                sumIntensity += intensity;
+            }
+        } else {
+            for ( j = 0 ; j < LIGHTMAP_SIZE * LIGHTMAP_SIZE; j++ ) {
+                R_ColorShiftLightingBytes( &buf_p[j*3], &image[j*4] );
+                image[j*4+3] = 255;
+            }
+        }
+        tr.lightmaps[i] = R_CreateImageOld(va("*lightmap%d", i), image,
+            LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+    }
 
-	if ( r_lightmap->integer == 2 )	{
-		ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
-	}
+    if ( r_lightmap->integer == 2 )	{
+        ri.Printf( PRINT_ALL, "Brightest lightmap value: %d\n", ( int ) ( maxIntensity * 255 ) );
+    }
+
+    if (r_fastdlights->integer) {
+        s_worldData.lighting = NULL;
+    }
+    else {
+        s_worldData.lighting = ri.Hunk_Alloc(l->length, h_dontcare);
+        Com_Memcpy(s_worldData.lighting, l->buffer, l->length);
+    }
 }
 
 
@@ -222,7 +284,7 @@ space in big maps...
 =================
 */
 void		RE_SetWorldVisData( const byte *vis ) {
-	tr.externalVisData = vis;
+    tr.externalVisData = vis;
 }
 
 
@@ -231,34 +293,137 @@ void		RE_SetWorldVisData( const byte *vis ) {
 R_LoadVisibility
 =================
 */
-static	void R_LoadVisibility( lump_t *l ) {
-	int		len;
-	byte	*buf;
+static	void R_LoadVisibility(gamelump_t* l) {
+    int		len;
+    byte	*buf;
 
-	len = ( s_worldData.numClusters + 63 ) & ~63;
-	s_worldData.novis = ri.Hunk_Alloc( len, h_low );
-	Com_Memset( s_worldData.novis, 0xff, len );
+    len = ( s_worldData.numClusters + 63 ) & ~63;
+    s_worldData.novis = ri.Hunk_Alloc( len, h_dontcare );
+    Com_Memset( s_worldData.novis, 0xff, len );
 
-    len = l->filelen;
-	if ( !len ) {
-		return;
-	}
-	buf = fileBase + l->fileofs;
+    len = l->length;
+    if (!len) {
+        return;
+    }
+    buf = l->buffer;
 
-	s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
-	s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
+    s_worldData.numClusters = LittleLong( ((int *)buf)[0] );
+    s_worldData.clusterBytes = LittleLong( ((int *)buf)[1] );
 
-	// CM_Load should have given us the vis data to share, so
-	// we don't need to allocate another copy
-	if ( tr.externalVisData ) {
-		s_worldData.vis = tr.externalVisData;
-	} else {
-		byte	*dest;
+    // CM_Load should have given us the vis data to share, so
+    // we don't need to allocate another copy
+    if ( tr.externalVisData ) {
+        s_worldData.vis = tr.externalVisData;
+    } else {
+        byte	*dest;
 
-		dest = ri.Hunk_Alloc( len - 8, h_low );
-		Com_Memcpy( dest, buf + 8, len - 8 );
-		s_worldData.vis = dest;
-	}
+        dest = ri.Hunk_Alloc( len - 8, h_dontcare );
+        Com_Memcpy( dest, buf + 8, len - 8 );
+        s_worldData.vis = dest;
+    }
+}
+
+/*
+================
+R_LoadSphereLights
+================
+*/
+void R_LoadSphereLights(gamelump_t* l) {
+    int				i, j;
+    mapspherel_t* at;
+    spherel_t* light;
+
+    if (l->length % sizeof(mapspherel_t)) {
+        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
+    }
+
+    tr.numSLights = l->length / sizeof(mapspherel_t);
+
+    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
+        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
+    }
+
+    at = l->buffer;
+    light = tr.sLights;
+
+    for (i = 0; i < tr.numSLights; at++, light++, i++) {
+        VectorCopy(at->origin, light->origin);
+        VectorCopy(at->color, light->color);
+        VectorCopy(at->spot_dir, light->spot_dir);
+
+        for (j = 0; j < 3; j++) {
+            light->origin[j] = LittleFloat(light->origin[j]);
+            light->color[j] = LittleFloat(light->color[j]);
+            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
+        }
+
+        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
+        light->intensity = LittleFloat(at->intensity);
+        light->spot_light = LittleLong(at->spot_light);
+        light->needs_trace = LittleLong(at->needs_trace);
+        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
+    }
+}
+
+/*
+================
+R_LoadSphereLightVis
+================
+*/
+void R_LoadSphereLightVis(gamelump_t* l) {
+    int i;
+    int j;
+    int h;
+    mnode_t* node;
+    int numentries;
+    int* entries;
+
+    memset(&tr.sSunLight, 0, sizeof(spherel_t));
+
+    if (l->length % 4) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
+            s_worldData.name);
+    }
+    else {
+        entries = l->buffer;
+        numentries = l->length / sizeof(int);
+
+        if (numentries) {
+            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
+                for (i = 0; i < numentries; ++i)
+                    entries[i] = LittleLong(entries[i]);
+
+                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
+                    j = 0;
+                    if (entries[0] != -1) {
+                        do
+                            ++j;
+                        while (entries[j] != -1);
+                    }
+                    if (j) {
+                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
+                        node->numlights = j;
+                        h = 0;
+                        if (entries[0] == -2) {
+                            node->lights[0] = &tr.sSunLight;
+                            tr.sSunLight.leaf = (mnode_t*)-1;
+                            h = 1;
+                        }
+                        while (entries[h] != -1) {
+                            node->lights[h] = &tr.sLights[entries[h]];
+                            h++;
+                        }
+                        entries += h + 1;
+                        numentries = numentries - 1 - h;
+                    }
+                    else {
+                        numentries--;
+                        entries++;
+                    }
+                }
+            }
+        }
+    }
 }
 
 //===============================================================================
@@ -270,31 +435,171 @@ ShaderForShaderNum
 ===============
 */
 static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
-	shader_t	*shader;
-	dshader_t	*dsh;
+    shader_t	*shader;
+    dshader_t	*dsh;
 
-	int _shaderNum = LittleLong( shaderNum );
-	if ( _shaderNum < 0 || _shaderNum >= s_worldData.numShaders ) {
-		ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", _shaderNum );
-	}
-	dsh = &s_worldData.shaders[ _shaderNum ];
+    if ( shaderNum < 0 || shaderNum >= s_worldData.numShaders ) {
+        ri.Error( ERR_DROP, "ShaderForShaderNum: bad num %i", shaderNum );
+    }
+    dsh = &s_worldData.shaders[ shaderNum ];
 
-	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		lightmapNum = LIGHTMAP_BY_VERTEX;
-	}
+    if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
+        lightmapNum = LIGHTMAP_BY_VERTEX;
+    }
 
-	if ( r_fullbright->integer ) {
-		lightmapNum = LIGHTMAP_WHITEIMAGE;
-	}
+    if ( r_fullbright->integer || !tr.numLightmaps ) {
+        lightmapNum = LIGHTMAP_WHITEIMAGE;
+    }
 
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue );
+    shader = R_FindShader( dsh->shader, lightmapNum, qtrue, r_picmip->integer, qtrue, qtrue);
 
-	// if the shader had errors, just use default shader
-	if ( shader->defaultShader ) {
-		return tr.defaultShader;
-	}
+    // if the shader had errors, just use default shader
+    if ( shader->defaultShader ) {
+        return tr.defaultShader;
+    }
 
-	return shader;
+    return shader;
+}
+
+/*
+================
+R_UnpackTerraPatch
+================
+*/
+void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
+    int i, j;
+
+    pUnpacked->byDirty = qfalse;
+    pUnpacked->visCountCheck = 0;
+    pUnpacked->visCountDraw = 0;
+    pUnpacked->uiDistRecalc = 0;
+
+    if (pPacked->lmapScale <= 0) {
+        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
+    }
+
+    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
+    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
+    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
+
+    if( s_worldData.lighting ) {
+        pUnpacked->drawinfo.lmData = &s_worldData.lighting[pPacked->iLightMap * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * pPacked->s + 3 * LIGHTMAP_SIZE * pPacked->t];
+    } else {
+        pUnpacked->drawinfo.lmData = NULL;
+    }
+
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 2; j++) {
+            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
+        }
+    }
+
+    pUnpacked->x0 = ((int)pPacked->x << 6);
+    pUnpacked->y0 = ((int)pPacked->y << 6);
+    pUnpacked->z0 = pPacked->iBaseHeight;
+    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
+    pUnpacked->iNorth = pPacked->iNorth;
+    pUnpacked->iEast = pPacked->iEast;
+    pUnpacked->iSouth = pPacked->iSouth;
+    pUnpacked->iWest = pPacked->iWest;
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
+    {
+        varnode_t *packedVarTree;
+
+        packedVarTree = &pPacked->varTree[0][i];
+        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[0][i].flags &= ~0xFF;
+        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+
+        packedVarTree = &pPacked->varTree[1][i];
+        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[1][i].flags &= ~0xFF;
+        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+    }
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
+        pUnpacked->heightmap[i] = pPacked->heightmap[i];
+    }
+
+    pUnpacked->zmax = 0;
+    pUnpacked->flags = pPacked->flags;
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
+    {
+        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
+            pUnpacked->zmax = pUnpacked->heightmap[i];
+        }
+    }
+
+    pUnpacked->frameCount = 0;
+    pUnpacked->zmax += pUnpacked->zmax;
+}
+
+/*
+================
+R_LoadTerrain
+================
+IneQuation was here
+*/
+void R_LoadTerrain(gamelump_t* lump) {
+    int		i;
+    cTerraPatch_t* in;
+    cTerraPatchUnpacked_t* out;
+
+    if (!lump->length) {
+        s_worldData.numTerraPatches = 0;
+        s_worldData.terraPatches = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(cTerraPatch_t)) {
+        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
+    }
+
+    s_worldData.numTerraPatches = lump->length / sizeof(cTerraPatch_t);
+    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.terraPatches;
+
+    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
+        R_SwapTerraPatch(in);
+        R_UnpackTerraPatch(in, out);
+    }
+}
+
+/*
+================
+R_LoadTerrainIndexes
+================
+*/
+void R_LoadTerrainIndexes(gamelump_t* lump) {
+    int		i;
+    short* in;
+    cTerraPatchUnpacked_t** out;
+
+    if (!lump->length) {
+        s_worldData.numVisTerraPatches = 0;
+        s_worldData.visTerraPatches = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
+    }
+
+    s_worldData.numVisTerraPatches = lump->length / sizeof(short);
+    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.visTerraPatches;
+
+    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
+        *out = &s_worldData.terraPatches[LittleShort(*in)];
+    }
 }
 
 /*
@@ -303,69 +608,109 @@ ParseFace
 ===============
 */
 static void ParseFace( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes  ) {
-	int			i, j;
-	srfSurfaceFace_t	*cv;
-	int			numPoints, numIndexes;
-	int			lightmapNum;
-	int			sfaceSize, ofsIndexes;
+    int			i, j;
+    srfSurfaceFace_t	*cv;
+    int			numPoints, numIndexes;
+    int			lightmapNum;
+    int			sfaceSize, ofsIndexes;
+    static surfaceType_t skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get shader value
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    if (surf->shader->surfaceFlags & SURF_NODRAW) {
+        // Nodraw surface doesn't need any processing
+        surf->data = &skipData;
+        return;
+    }
 
-	numPoints = LittleLong( ds->numVerts );
-	if (numPoints > MAX_FACE_POINTS) {
-		ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
-    numPoints = MAX_FACE_POINTS;
-    surf->shader = tr.defaultShader;
-	}
+    numPoints = LittleLong( ds->numVerts );
+    if (numPoints > MAX_FACE_POINTS) {
+        ri.Printf( PRINT_WARNING, "WARNING: MAX_FACE_POINTS exceeded: %i\n", numPoints);
+        numPoints = MAX_FACE_POINTS;
+        surf->shader = tr.defaultShader;
+    }
 
-	numIndexes = LittleLong( ds->numIndexes );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	// create the srfSurfaceFace_t
-	sfaceSize = offsetof( srfSurfaceFace_t, points ) + sizeof( *cv->points ) * numPoints;
-	ofsIndexes = sfaceSize;
-	sfaceSize += sizeof( int ) * numIndexes;
+    // create the srfSurfaceFace_t
+    sfaceSize = ( int ) &((srfSurfaceFace_t *)0)->points[numPoints];
+    ofsIndexes = sfaceSize;
+    sfaceSize += sizeof( int ) * numIndexes;
 
-	cv = ri.Hunk_Alloc( sfaceSize, h_low );
-	cv->surfaceType = SF_FACE;
-	cv->numPoints = numPoints;
-	cv->numIndices = numIndexes;
-	cv->ofsIndices = ofsIndexes;
+    cv = ri.Hunk_Alloc( sfaceSize, h_dontcare );
+    cv->surfaceType = SF_FACE;
+    cv->numPoints = numPoints;
+    cv->numIndices = numIndexes;
+    cv->ofsIndices = ofsIndexes;
 
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
-			cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytes( verts[i].color, (byte *)&cv->points[i][7] );
-	}
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            cv->points[i][j] = LittleFloat( verts[i].xyz[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            cv->points[i][3+j] = LittleFloat( verts[i].st[j] );
+            cv->points[i][5+j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, (byte *)&cv->points[i][7] );
+    }
 
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
-	}
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        ((int *)((byte *)cv + cv->ofsIndices ))[i] = LittleLong( indexes[ i ] );
+    }
 
-	// take the plane information from the lightmap vector
-	for ( i = 0 ; i < 3 ; i++ ) {
-		cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
-	cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
-	SetPlaneSignbits( &cv->plane );
-	cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
+    // take the plane information from the lightmap vector
+    for ( i = 0 ; i < 3 ; i++ ) {
+        cv->plane.normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
+    cv->plane.dist = DotProduct( cv->points[0], cv->plane.normal );
+    SetPlaneSignbits( &cv->plane );
+    cv->plane.type = PlaneTypeForNormal( cv->plane.normal );
 
-	surf->data = (surfaceType_t *)cv;
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        float inv;
+
+        cv->lmX = LittleLong(ds->lightmapX);
+        cv->lmY = LittleLong(ds->lightmapY);
+        cv->lmWidth = LittleLong(ds->lightmapWidth);
+        cv->lmHeight = LittleLong(ds->lightmapHeight);
+
+        if (s_worldData.lighting) {
+            cv->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * cv->lmX + 3 * LIGHTMAP_SIZE * cv->lmY];
+        } else {
+            cv->lmData = NULL;
+        }
+
+        for (i = 0; i < 3; i++)
+        {
+            cv->lmOrigin[i] = LittleFloat(ds->lightmapOrigin[i]);
+            cv->lmVecs[0][i] = LittleFloat(ds->lightmapVecs[0][i]);
+            cv->lmVecs[1][i] = LittleFloat(ds->lightmapVecs[1][i]);
+        }
+
+        inv = VectorNormalize2(cv->lmVecs[0], cv->lmInverseVecs[0]);
+        cv->lmInverseVecs[0][0] *= 1.0 / inv;
+        cv->lmInverseVecs[0][1] *= 1.0 / inv;
+        cv->lmInverseVecs[0][2] *= 1.0 / inv;
+
+        inv = VectorNormalize2(cv->lmVecs[1], cv->lmInverseVecs[1]);
+        cv->lmInverseVecs[1][0] *= 1.0 / inv;
+        cv->lmInverseVecs[1][1] *= 1.0 / inv;
+        cv->lmInverseVecs[1][2] *= 1.0 / inv;
+    }
+    else
+    {
+        cv->lmData = NULL;
+    }
+    surf->data = (surfaceType_t *)cv;
 }
 
 
@@ -375,65 +720,86 @@ ParseMesh
 ===============
 */
 static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, msurface_t *surf ) {
-	srfGridMesh_t	*grid;
-	int				i, j;
-	int				width, height, numPoints;
-	drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
-	int				lightmapNum;
-	vec3_t			bounds[2];
-	vec3_t			tmpVec;
-	static surfaceType_t	skipData = SF_SKIP;
+    srfGridMesh_t	*grid;
+    int				i, j;
+    int				width, height, numPoints;
+    MAC_STATIC drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE];
+    int				lightmapNum;
+    vec3_t			bounds[2];
+    vec3_t			tmpVec;
+    float           subdivisions;
+    static surfaceType_t	skipData = SF_SKIP;
 
-	lightmapNum = LittleLong( ds->lightmapNum );
+    lightmapNum = LittleLong( ds->lightmapNum );
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, lightmapNum );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader value
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), lightmapNum);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	// we may have a nodraw surface, because they might still need to
-	// be around for movement clipping
-	if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
-		surf->data = &skipData;
-		return;
-	}
+    // we may have a nodraw surface, because they might still need to
+    // be around for movement clipping
+    if ( s_worldData.shaders[ LittleLong( ds->shaderNum ) ].surfaceFlags & SURF_NODRAW ) {
+        surf->data = &skipData;
+        return;
+    }
 
-	width = LittleLong( ds->patchWidth );
-	height = LittleLong( ds->patchHeight );
+    width = LittleLong( ds->patchWidth );
+    height = LittleLong( ds->patchHeight );
 
-	verts += LittleLong( ds->firstVert );
-	numPoints = width * height;
-	for ( i = 0 ; i < numPoints ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			points[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		for ( j = 0 ; j < 2 ; j++ ) {
-			points[i].st[j] = LittleFloat( verts[i].st[j] );
-			points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
-		R_ColorShiftLightingBytes( verts[i].color, points[i].color );
-	}
+    verts += LittleLong( ds->firstVert );
+    numPoints = width * height;
+    for ( i = 0 ; i < numPoints ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            points[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            points[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        for ( j = 0 ; j < 2 ; j++ ) {
+            points[i].st[j] = LittleFloat( verts[i].st[j] );
+            points[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
+        R_ColorShiftLightingBytesAlpha( verts[i].color, points[i].color );
+    }
 
-	// pre-tesseleate
-	grid = R_SubdividePatchToGrid( width, height, points );
-	surf->data = (surfaceType_t *)grid;
+    // pre-tesseleate
+    subdivisions = LittleFloat(ds->subdivisions);
+    if (subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, subdivisions * (r_subdivisions->value / 10.0), points);
+    } else if (surf->shader->subdivisions) {
+        grid = R_SubdividePatchToGrid(width, height, surf->shader->subdivisions * (r_subdivisions->value / 10.0), points);
+    } else {
+        grid = R_SubdividePatchToGrid(width, height, r_subdivisions->value, points);
+    }
+    surf->data = (surfaceType_t *)grid;
 
-	// copy the level of detail origin, which is the center
-	// of the group of all curves that must subdivide the same
-	// to avoid cracking
-	for ( i = 0 ; i < 3 ; i++ ) {
-		bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
-		bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
-	}
-	VectorAdd( bounds[0], bounds[1], bounds[1] );
-	VectorScale( bounds[1], 0.5f, grid->lodOrigin );
-	VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
-	grid->lodRadius = VectorLength( tmpVec );
+    if (tr.numLightmaps && lightmapNum != -1 && surf->shader->lightmapIndex >= 0)
+    {
+        grid->lmX = LittleLong(ds->lightmapX);
+        grid->lmY = LittleLong(ds->lightmapY);
+        grid->lmWidth = LittleLong(ds->lightmapWidth);
+        grid->lmHeight = LittleLong(ds->lightmapHeight);
+        if (s_worldData.lighting) {
+            grid->lmData = &s_worldData.lighting[lightmapNum * (LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3) + 3 * grid->lmX + 3 * LIGHTMAP_SIZE * grid->lmY];
+        } else {
+            grid->lmData = NULL;
+        }
+    }
+
+    // copy the level of detail origin, which is the center
+    // of the group of all curves that must subdivide the same
+    // to avoid cracking
+    for ( i = 0 ; i < 3 ; i++ ) {
+        bounds[0][i] = LittleFloat( ds->lightmapVecs[0][i] );
+        bounds[1][i] = LittleFloat( ds->lightmapVecs[1][i] );
+    }
+    VectorAdd( bounds[0], bounds[1], bounds[1] );
+    VectorScale( bounds[1], 0.5f, grid->lodOrigin );
+    VectorSubtract( bounds[0], grid->lodOrigin, tmpVec );
+    grid->lodRadius = VectorLength( tmpVec );
 }
 
 /*
@@ -442,57 +808,57 @@ ParseTriSurf
 ===============
 */
 static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfTriangles_t	*tri;
-	int				i, j;
-	int				numVerts, numIndexes;
+    srfTriangles_t	*tri;
+    int				i, j;
+    int				numVerts, numIndexes;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	numVerts = LittleLong( ds->numVerts );
-	numIndexes = LittleLong( ds->numIndexes );
+    numVerts = LittleLong( ds->numVerts );
+    numIndexes = LittleLong( ds->numIndexes );
 
-	tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
-		+ numIndexes * sizeof( tri->indexes[0] ), h_low );
-	tri->surfaceType = SF_TRIANGLES;
-	tri->numVerts = numVerts;
-	tri->numIndexes = numIndexes;
-	tri->verts = (drawVert_t *)(tri + 1);
-	tri->indexes = (int *)(tri->verts + tri->numVerts );
+    tri = ri.Hunk_Alloc( sizeof( *tri ) + numVerts * sizeof( tri->verts[0] ) 
+        + numIndexes * sizeof( tri->indexes[0] ), h_dontcare );
+    tri->surfaceType = SF_TRIANGLES;
+    tri->numVerts = numVerts;
+    tri->numIndexes = numIndexes;
+    tri->verts = (drawVert_t *)(tri + 1);
+    tri->indexes = (int *)(tri->verts + tri->numVerts );
 
-	surf->data = (surfaceType_t *)tri;
+    surf->data = (surfaceType_t *)tri;
 
-	// copy vertexes
-	ClearBounds( tri->bounds[0], tri->bounds[1] );
-	verts += LittleLong( ds->firstVert );
-	for ( i = 0 ; i < numVerts ; i++ ) {
-		for ( j = 0 ; j < 3 ; j++ ) {
-			tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
-			tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
-		}
-		AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
-		for ( j = 0 ; j < 2 ; j++ ) {
-			tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
-			tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
-		}
+    // copy vertexes
+    ClearBounds( tri->bounds[0], tri->bounds[1] );
+    verts += LittleLong( ds->firstVert );
+    for ( i = 0 ; i < numVerts ; i++ ) {
+        for ( j = 0 ; j < 3 ; j++ ) {
+            tri->verts[i].xyz[j] = LittleFloat( verts[i].xyz[j] );
+            tri->verts[i].normal[j] = LittleFloat( verts[i].normal[j] );
+        }
+        AddPointToBounds( tri->verts[i].xyz, tri->bounds[0], tri->bounds[1] );
+        for ( j = 0 ; j < 2 ; j++ ) {
+            tri->verts[i].st[j] = LittleFloat( verts[i].st[j] );
+            tri->verts[i].lightmap[j] = LittleFloat( verts[i].lightmap[j] );
+        }
 
-		R_ColorShiftLightingBytes( verts[i].color, tri->verts[i].color );
-	}
+        R_ColorShiftLightingBytesAlpha( verts[i].color, tri->verts[i].color );
+    }
 
-	// copy indexes
-	indexes += LittleLong( ds->firstIndex );
-	for ( i = 0 ; i < numIndexes ; i++ ) {
-		tri->indexes[i] = LittleLong( indexes[i] );
-		if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
-			ri.Error( ERR_DROP, "Bad index in triangle surface" );
-		}
-	}
+    // copy indexes
+    indexes += LittleLong( ds->firstIndex );
+    for ( i = 0 ; i < numIndexes ; i++ ) {
+        tri->indexes[i] = LittleLong( indexes[i] );
+        if ( tri->indexes[i] < 0 || tri->indexes[i] >= numVerts ) {
+            ri.Error( ERR_DROP, "Bad index in triangle surface" );
+        }
+    }
 }
 
 /*
@@ -501,28 +867,28 @@ ParseFlare
 ===============
 */
 static void ParseFlare( dsurface_t *ds, drawVert_t *verts, msurface_t *surf, int *indexes ) {
-	srfFlare_t		*flare;
-	int				i;
+    srfFlare_t		*flare;
+    int				i;
 
-	// get fog volume
-	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
+    // get fog volume
+    surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
-	// get shader
-	surf->shader = ShaderForShaderNum( ds->shaderNum, LIGHTMAP_BY_VERTEX );
-	if ( r_singleShader->integer && !surf->shader->isSky ) {
-		surf->shader = tr.defaultShader;
-	}
+    // get shader
+    surf->shader = ShaderForShaderNum(LittleLong(ds->shaderNum), LIGHTMAP_BY_VERTEX);
+    if ( r_singleShader->integer && !surf->shader->isSky ) {
+        surf->shader = tr.defaultShader;
+    }
 
-	flare = ri.Hunk_Alloc( sizeof( *flare ), h_low );
-	flare->surfaceType = SF_FLARE;
+    flare = ri.Hunk_Alloc( sizeof( *flare ), h_dontcare );
+    flare->surfaceType = SF_FLARE;
 
-	surf->data = (surfaceType_t *)flare;
+    surf->data = (surfaceType_t *)flare;
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
-		flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
-		flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        flare->origin[i] = LittleFloat( ds->lightmapOrigin[i] );
+        flare->color[i] = LittleFloat( ds->lightmapVecs[0][i] );
+        flare->normal[i] = LittleFloat( ds->lightmapVecs[2][i] );
+    }
 }
 
 
@@ -534,17 +900,17 @@ returns true if there are grid points merged on a width edge
 =================
 */
 int R_MergedWidthPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->width-1; i++) {
-		for (j = i + 1; j < grid->width-1; j++) {
-			if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->width-1; i++) {
+        for (j = i + 1; j < grid->width-1; j++) {
+            if ( fabs(grid->verts[i + offset].xyz[0] - grid->verts[j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[1] - grid->verts[j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[i + offset].xyz[2] - grid->verts[j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -555,17 +921,17 @@ returns true if there are grid points merged on a height edge
 =================
 */
 int R_MergedHeightPoints(srfGridMesh_t *grid, int offset) {
-	int i, j;
+    int i, j;
 
-	for (i = 1; i < grid->height-1; i++) {
-		for (j = i + 1; j < grid->height-1; j++) {
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
-			if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
-			return qtrue;
-		}
-	}
-	return qfalse;
+    for (i = 1; i < grid->height-1; i++) {
+        for (j = i + 1; j < grid->height-1; j++) {
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[0] - grid->verts[grid->width * j + offset].xyz[0]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[1] - grid->verts[grid->width * j + offset].xyz[1]) > .1) continue;
+            if ( fabs(grid->verts[grid->width * i + offset].xyz[2] - grid->verts[grid->width * j + offset].xyz[2]) > .1) continue;
+            return qtrue;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -578,107 +944,107 @@ FIXME: write generalized version that also avoids cracks between a patch and one
 =================
 */
 void R_FixSharedVertexLodError_r( int start, srfGridMesh_t *grid1 ) {
-	int j, k, l, m, n, offset1, offset2, touch;
-	srfGridMesh_t *grid2;
+    int j, k, l, m, n, offset1, offset2, touch;
+    srfGridMesh_t *grid2;
 
-	for ( j = start; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// if the LOD errors are already fixed for this patch
-		if ( grid2->lodFixed == 2 ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		touch = qfalse;
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = (grid1->height-1) * grid1->width;
-			else offset1 = 0;
-			if (R_MergedWidthPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->width-1; k++) {
-				for (m = 0; m < 2; m++) {
+    for ( j = start; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // if the LOD errors are already fixed for this patch
+        if ( grid2->lodFixed == 2 ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        touch = qfalse;
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = (grid1->height-1) * grid1->width;
+            else offset1 = 0;
+            if (R_MergedWidthPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->width-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->widthLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		for (n = 0; n < 2; n++) {
-			//
-			if (n) offset1 = grid1->width-1;
-			else offset1 = 0;
-			if (R_MergedHeightPoints(grid1, offset1)) continue;
-			for (k = 1; k < grid1->height-1; k++) {
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->widthLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        for (n = 0; n < 2; n++) {
+            //
+            if (n) offset1 = grid1->width-1;
+            else offset1 = 0;
+            if (R_MergedHeightPoints(grid1, offset1)) continue;
+            for (k = 1; k < grid1->height-1; k++) {
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = (grid2->height-1) * grid2->width;
-					else offset2 = 0;
-					if (R_MergedWidthPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->width-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->widthLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-				for (m = 0; m < 2; m++) {
+                    if (m) offset2 = (grid2->height-1) * grid2->width;
+                    else offset2 = 0;
+                    if (R_MergedWidthPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->width-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->widthLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+                for (m = 0; m < 2; m++) {
 
-					if (m) offset2 = grid2->width-1;
-					else offset2 = 0;
-					if (R_MergedHeightPoints(grid2, offset2)) continue;
-					for ( l = 1; l < grid2->height-1; l++) {
-					//
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
-						if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
-						// ok the points are equal and should have the same lod error
-						grid2->heightLodError[l] = grid1->heightLodError[k];
-						touch = qtrue;
-					}
-				}
-			}
-		}
-		if (touch) {
-			grid2->lodFixed = 2;
-			R_FixSharedVertexLodError_r ( start, grid2 );
-			//NOTE: this would be correct but makes things really slow
-			//grid2->lodFixed = 1;
-		}
-	}
+                    if (m) offset2 = grid2->width-1;
+                    else offset2 = 0;
+                    if (R_MergedHeightPoints(grid2, offset2)) continue;
+                    for ( l = 1; l < grid2->height-1; l++) {
+                    //
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[0] - grid2->verts[grid2->width * l + offset2].xyz[0]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[1] - grid2->verts[grid2->width * l + offset2].xyz[1]) > .1) continue;
+                        if ( fabs(grid1->verts[grid1->width * k + offset1].xyz[2] - grid2->verts[grid2->width * l + offset2].xyz[2]) > .1) continue;
+                        // ok the points are equal and should have the same lod error
+                        grid2->heightLodError[l] = grid1->heightLodError[k];
+                        touch = qtrue;
+                    }
+                }
+            }
+        }
+        if (touch) {
+            grid2->lodFixed = 2;
+            R_FixSharedVertexLodError_r ( start, grid2 );
+            //NOTE: this would be correct but makes things really slow
+            //grid2->lodFixed = 1;
+        }
+    }
 }
 
 /*
@@ -690,23 +1056,23 @@ If this is not the case this function will still do its job but won't fix the hi
 =================
 */
 void R_FixSharedVertexLodError( void ) {
-	int i;
-	srfGridMesh_t *grid1;
+    int i;
+    srfGridMesh_t *grid1;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid1->surfaceType != SF_GRID )
-			continue;
-		//
-		if ( grid1->lodFixed )
-			continue;
-		//
-		grid1->lodFixed = 2;
-		// recursively fix other patches in the same LOD group
-		R_FixSharedVertexLodError_r( i + 1, grid1);
-	}
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid1->surfaceType != SF_GRID )
+            continue;
+        //
+        if ( grid1->lodFixed )
+            continue;
+        //
+        grid1->lodFixed = 2;
+        // recursively fix other patches in the same LOD group
+        R_FixSharedVertexLodError_r( i + 1, grid1);
+    }
 }
 
 
@@ -716,405 +1082,405 @@ R_StitchPatches
 ===============
 */
 int R_StitchPatches( int grid1num, int grid2num ) {
-	float *v1, *v2;
-	srfGridMesh_t *grid1, *grid2;
-	int k, l, m, n, offset1, offset2, row, column;
+    float *v1, *v2;
+    srfGridMesh_t *grid1, *grid2;
+    int k, l, m, n, offset1, offset2, row, column;
 
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->width-2; k += 2) {
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    grid2 = (srfGridMesh_t *) s_worldData.surfaces[grid2num].data;
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->width-2; k += 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-					//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                    //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k + 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = 0; k < grid1->height-2; k += 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k + 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k + 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = 0; k < grid1->height-2; k += 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-									grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = (grid1->height-1) * grid1->width;
-		else offset1 = 0;
-		if (R_MergedWidthPoints(grid1, offset1))
-			continue;
-		for (k = grid1->width-1; k > 1; k -= 2) {
+                    v1 = grid1->verts[grid1->width * (k + 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                    grid1->verts[grid1->width * (k + 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = (grid1->height-1) * grid1->width;
+        else offset1 = 0;
+        if (R_MergedWidthPoints(grid1, offset1))
+            continue;
+        for (k = grid1->width-1; k > 1; k -= 2) {
 
-			for (m = 0; m < 2; m++) {
+            for (m = 0; m < 2; m++) {
 
-				if ( !grid2 || grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (!grid2 || grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[k - 2 + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
-					if (!grid2)
-						break;
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	for (n = 0; n < 2; n++) {
-		//
-		if (n) offset1 = grid1->width-1;
-		else offset1 = 0;
-		if (R_MergedHeightPoints(grid1, offset1))
-			continue;
-		for (k = grid1->height-1; k > 1; k -= 2) {
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[k - 2 + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[k - 1 + offset1].xyz, grid1->widthLodError[k+1]);
+                    if (!grid2)
+                        break;
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    for (n = 0; n < 2; n++) {
+        //
+        if (n) offset1 = grid1->width-1;
+        else offset1 = 0;
+        if (R_MergedHeightPoints(grid1, offset1))
+            continue;
+        for (k = grid1->height-1; k > 1; k -= 2) {
+            for (m = 0; m < 2; m++) {
 
-				if ( !grid2 || grid2->width >= MAX_GRID_SIZE )
-					break;
-				if (m) offset2 = (grid2->height-1) * grid2->width;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->width-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if ( grid2->width >= MAX_GRID_SIZE )
+                    break;
+                if (m) offset2 = (grid2->height-1) * grid2->width;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->width-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[l + 1 + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[l + offset2].xyz;
-					v2 = grid2->verts[(l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert column into grid2 right after after column l
-					if (m) row = grid2->height-1;
-					else row = 0;
-					grid2 = R_GridInsertColumn( grid2, l+1, row,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-			for (m = 0; m < 2; m++) {
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[l + 1 + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[l + offset2].xyz;
+                    v2 = grid2->verts[(l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert column into grid2 right after after column l
+                    if (m) row = grid2->height-1;
+                    else row = 0;
+                    grid2 = R_GridInsertColumn( grid2, l+1, row,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+            for (m = 0; m < 2; m++) {
 
-				if (!grid2 || grid2->height >= MAX_GRID_SIZE)
-					break;
-				if (m) offset2 = grid2->width-1;
-				else offset2 = 0;
-				for ( l = 0; l < grid2->height-1; l++) {
-				//
-					v1 = grid1->verts[grid1->width * k + offset1].xyz;
-					v2 = grid2->verts[grid2->width * l + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
+                if (grid2->height >= MAX_GRID_SIZE)
+                    break;
+                if (m) offset2 = grid2->width-1;
+                else offset2 = 0;
+                for ( l = 0; l < grid2->height-1; l++) {
+                //
+                    v1 = grid1->verts[grid1->width * k + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * l + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
 
-					v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) > .1)
-						continue;
-					if ( fabs(v1[1] - v2[1]) > .1)
-						continue;
-					if ( fabs(v1[2] - v2[2]) > .1)
-						continue;
-					//
-					v1 = grid2->verts[grid2->width * l + offset2].xyz;
-					v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
-					if ( fabs(v1[0] - v2[0]) < .01 &&
-							fabs(v1[1] - v2[1]) < .01 &&
-							fabs(v1[2] - v2[2]) < .01)
-						continue;
-					//
-					//ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
-					// insert row into grid2 right after after row l
-					if (m) column = grid2->width-1;
-					else column = 0;
-					grid2 = R_GridInsertRow( grid2, l+1, column,
-										grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
-					grid2->lodStitched = qfalse;
-					s_worldData.surfaces[grid2num].data = (void *) grid2;
-					return qtrue;
-				}
-			}
-		}
-	}
-	return qfalse;
+                    v1 = grid1->verts[grid1->width * (k - 2) + offset1].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) > .1)
+                        continue;
+                    if ( fabs(v1[1] - v2[1]) > .1)
+                        continue;
+                    if ( fabs(v1[2] - v2[2]) > .1)
+                        continue;
+                    //
+                    v1 = grid2->verts[grid2->width * l + offset2].xyz;
+                    v2 = grid2->verts[grid2->width * (l + 1) + offset2].xyz;
+                    if ( fabs(v1[0] - v2[0]) < .01 &&
+                            fabs(v1[1] - v2[1]) < .01 &&
+                            fabs(v1[2] - v2[2]) < .01)
+                        continue;
+                    //
+                    //ri.Printf( PRINT_ALL, "found highest LoD crack between two patches\n" );
+                    // insert row into grid2 right after after row l
+                    if (m) column = grid2->width-1;
+                    else column = 0;
+                    grid2 = R_GridInsertRow( grid2, l+1, column,
+                                        grid1->verts[grid1->width * (k - 1) + offset1].xyz, grid1->heightLodError[k+1]);
+                    grid2->lodStitched = qfalse;
+                    s_worldData.surfaces[grid2num].data = (void *) grid2;
+                    return qtrue;
+                }
+            }
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -1131,29 +1497,32 @@ might still appear at that side.
 ===============
 */
 int R_TryStitchingPatch( int grid1num ) {
-	int j, numstitches;
-	srfGridMesh_t *grid1, *grid2;
+    int j, numstitches;
+    srfGridMesh_t *grid1, *grid2;
 
-	numstitches = 0;
-	grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
-	for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
-		//
-		grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
-		// if this surface is not a grid
-		if ( grid2->surfaceType != SF_GRID ) continue;
-		// grids in the same LOD group should have the exact same lod radius
-		if ( grid1->lodRadius != grid2->lodRadius ) continue;
-		// grids in the same LOD group should have the exact same lod origin
-		if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
-		if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
-		if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
-		//
-		while (R_StitchPatches(grid1num, j))
-		{
-			numstitches++;
-		}
-	}
-	return numstitches;
+    numstitches = 0;
+    grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    for ( j = 0; j < s_worldData.numsurfaces; j++ ) {
+        //
+        grid2 = (srfGridMesh_t *) s_worldData.surfaces[j].data;
+        // if this surface is not a grid
+        if ( grid2->surfaceType != SF_GRID ) continue;
+        // grids in the same LOD group should have the exact same lod radius
+        if ( grid1->lodRadius != grid2->lodRadius ) continue;
+        // grids in the same LOD group should have the exact same lod origin
+        if ( grid1->lodOrigin[0] != grid2->lodOrigin[0] ) continue;
+        if ( grid1->lodOrigin[1] != grid2->lodOrigin[1] ) continue;
+        if ( grid1->lodOrigin[2] != grid2->lodOrigin[2] ) continue;
+        //
+        while (R_StitchPatches(grid1num, j))
+        {
+            numstitches++;
+        }
+
+        // the grid1 could be reallocated again
+        grid1 = (srfGridMesh_t *) s_worldData.surfaces[grid1num].data;
+    }
+    return numstitches;
 }
 
 /*
@@ -1162,31 +1531,31 @@ R_StitchAllPatches
 ===============
 */
 void R_StitchAllPatches( void ) {
-	int i, stitched, numstitches;
-	srfGridMesh_t *grid1;
+    int i, stitched, numstitches;
+    srfGridMesh_t *grid1;
 
-	numstitches = 0;
-	do
-	{
-		stitched = qfalse;
-		for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-			//
-			grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-			// if this surface is not a grid
-			if ( grid1->surfaceType != SF_GRID )
-				continue;
-			//
-			if ( grid1->lodStitched )
-				continue;
-			//
-			grid1->lodStitched = qtrue;
-			stitched = qtrue;
-			//
-			numstitches += R_TryStitchingPatch( i );
-		}
-	}
-	while (stitched);
-	ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
+    numstitches = 0;
+    do
+    {
+        stitched = qfalse;
+        for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+            //
+            grid1 = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+            // if this surface is not a grid
+            if ( grid1->surfaceType != SF_GRID )
+                continue;
+            //
+            if ( grid1->lodStitched )
+                continue;
+            //
+            grid1->lodStitched = qtrue;
+            stitched = qtrue;
+            //
+            numstitches += R_TryStitchingPatch( i );
+        }
+    }
+    while (stitched);
+    ri.Printf( PRINT_ALL, "stitched %d LoD cracks\n", numstitches );
 }
 
 /*
@@ -1195,30 +1564,30 @@ R_MovePatchSurfacesToHunk
 ===============
 */
 void R_MovePatchSurfacesToHunk(void) {
-	int i, size;
-	srfGridMesh_t *grid, *hunkgrid;
+    int i, size;
+    srfGridMesh_t *grid, *hunkgrid;
 
-	for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
-		//
-		grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
-		// if this surface is not a grid
-		if ( grid->surfaceType != SF_GRID )
-			continue;
-		//
-		size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
-		hunkgrid = ri.Hunk_Alloc( size, h_low );
-		Com_Memcpy(hunkgrid, grid, size);
+    for ( i = 0; i < s_worldData.numsurfaces; i++ ) {
+        //
+        grid = (srfGridMesh_t *) s_worldData.surfaces[i].data;
+        // if this surface is not a grid
+        if ( grid->surfaceType != SF_GRID )
+            continue;
+        //
+        size = (grid->width * grid->height - 1) * sizeof( drawVert_t ) + sizeof( *grid );
+        hunkgrid = ri.Hunk_Alloc( size, h_dontcare );
+        Com_Memcpy(hunkgrid, grid, size);
 
-		hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_low );
-		Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
+        hunkgrid->widthLodError = ri.Hunk_Alloc( grid->width * 4, h_dontcare );
+        Com_Memcpy( hunkgrid->widthLodError, grid->widthLodError, grid->width * 4 );
 
-		hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_low );
-		Com_Memcpy( hunkgrid->heightLodError, grid->heightLodError, grid->height * 4 );
+        hunkgrid->heightLodError = ri.Hunk_Alloc( grid->height * 4, h_dontcare );
+        Com_Memcpy( grid->heightLodError, grid->heightLodError, grid->height * 4 );
 
-		R_FreeSurfaceGridMesh( grid );
+        R_FreeSurfaceGridMesh( grid );
 
-		s_worldData.surfaces[i].data = (void *) hunkgrid;
-	}
+        s_worldData.surfaces[i].data = (void *) hunkgrid;
+    }
 }
 
 /*
@@ -1226,73 +1595,73 @@ void R_MovePatchSurfacesToHunk(void) {
 R_LoadSurfaces
 ===============
 */
-static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
-	dsurface_t	*in;
-	msurface_t	*out;
-	drawVert_t	*dv;
-	int			*indexes;
-	int			count;
-	int			numFaces, numMeshes, numTriSurfs, numFlares;
-	int			i;
+static	void R_LoadSurfaces(gamelump_t* surfs, gamelump_t* verts, gamelump_t* indexLump) {
+    dsurface_t	*in;
+    msurface_t	*out;
+    drawVert_t	*dv;
+    int			*indexes;
+    int			count;
+    int			numFaces, numMeshes, numTriSurfs, numFlares;
+    int			i;
 
-	numFaces = 0;
-	numMeshes = 0;
-	numTriSurfs = 0;
-	numFlares = 0;
+    numFaces = 0;
+    numMeshes = 0;
+    numTriSurfs = 0;
+    numFlares = 0;
 
-	in = (void *)(fileBase + surfs->fileofs);
-	if (surfs->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = surfs->filelen / sizeof(*in);
+    if (surfs->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = surfs->length / sizeof(*in);
 
-	dv = (void *)(fileBase + verts->fileofs);
-	if (verts->filelen % sizeof(*dv))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
+    dv = (void*)verts->buffer;
+    if (verts->length % sizeof(*dv))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
 
-	indexes = (void *)(fileBase + indexLump->fileofs);
-	if ( indexLump->filelen % sizeof(*indexes))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
+    indexes = (void*)indexLump->buffer;
+    if (indexLump->length % sizeof(*indexes))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
 
-	out = ri.Hunk_Alloc ( count * sizeof(*out), h_low );	
+    in = (void*)surfs->buffer;
+    out = ri.Hunk_Alloc ( count * sizeof(*out), h_dontcare );	
 
-	s_worldData.surfaces = out;
-	s_worldData.numsurfaces = count;
+    s_worldData.surfaces = out;
+    s_worldData.numsurfaces = count;
 
-	for ( i = 0 ; i < count ; i++, in++, out++ ) {
-		switch ( LittleLong( in->surfaceType ) ) {
-		case MST_PATCH:
-			ParseMesh ( in, dv, out );
-			numMeshes++;
-			break;
-		case MST_TRIANGLE_SOUP:
-			ParseTriSurf( in, dv, out, indexes );
-			numTriSurfs++;
-			break;
-		case MST_PLANAR:
-			ParseFace( in, dv, out, indexes );
-			numFaces++;
-			break;
-		case MST_FLARE:
-			ParseFlare( in, dv, out, indexes );
-			numFlares++;
-			break;
-		default:
-			ri.Error( ERR_DROP, "Bad surfaceType" );
-		}
-	}
+    for ( i = 0 ; i < count ; i++, in++, out++ ) {
+        switch ( LittleLong( in->surfaceType ) ) {
+        case MST_PATCH:
+            ParseMesh ( in, dv, out );
+            numMeshes++;
+            break;
+        case MST_TRIANGLE_SOUP:
+            ParseTriSurf( in, dv, out, indexes );
+            numTriSurfs++;
+            break;
+        case MST_PLANAR:
+            ParseFace( in, dv, out, indexes );
+            numFaces++;
+            break;
+        case MST_FLARE:
+            ParseFlare( in, dv, out, indexes );
+            numFlares++;
+            break;
+        default:
+            ri.Error( ERR_DROP, "Bad surfaceType" );
+        }
+    }
 
 #ifdef PATCH_STITCHING
-	R_StitchAllPatches();
+    R_StitchAllPatches();
 #endif
 
-	R_FixSharedVertexLodError();
+    R_FixSharedVertexLodError();
 
 #ifdef PATCH_STITCHING
-	R_MovePatchSurfacesToHunk();
+    R_MovePatchSurfacesToHunk();
 #endif
 
-	ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
-		numFaces, numMeshes, numTriSurfs, numFlares );
+    ri.Printf( PRINT_ALL, "...loaded %d faces, %i meshes, %i trisurfs, %i flares\n", 
+        numFaces, numMeshes, numTriSurfs, numFlares );
 }
 
 
@@ -1302,40 +1671,38 @@ static	void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump ) {
 R_LoadSubmodels
 =================
 */
-static	void R_LoadSubmodels( lump_t *l ) {
-	dmodel_t	*in;
-	bmodel_t	*out;
-	int			i, j, count;
+static	void R_LoadSubmodels(gamelump_t* l) {
+    dmodel_t	*in;
+    bmodel_t	*out;
+    int			i, j, count;
 
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
+    in = (void*)l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
 
-	s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_low );
+    s_worldData.bmodels = out = ri.Hunk_Alloc( count * sizeof(*out), h_dontcare );
+    s_worldData.numBmodels = count;
 
-	for ( i=0 ; i<count ; i++, in++, out++ ) {
-		model_t *model;
+    for ( i=0 ; i<count ; i++, in++, out++ ) {
+        model_t *model;
 
-		model = R_AllocModel();
+        model = R_AllocModel();
 
-		assert( model != NULL );			// this should never happen
-		if ( model == NULL ) {
-			ri.Error(ERR_DROP, "R_LoadSubmodels: R_AllocModel() failed");
-		}
+        assert( model != NULL );			// this should never happen
 
-		model->type = MOD_BRUSH;
-		model->bmodel = out;
-		Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
+        model->type = MOD_BRUSH;
+        model->d.bmodel = out;
+        Com_sprintf( model->name, sizeof( model->name ), "*%d", i );
 
-		for (j=0 ; j<3 ; j++) {
-			out->bounds[0][j] = LittleFloat (in->mins[j]);
-			out->bounds[1][j] = LittleFloat (in->maxs[j]);
-		}
+        for (j=0 ; j<3 ; j++) {
+            out->bounds[0][j] = LittleFloat (in->mins[j]);
+            out->bounds[1][j] = LittleFloat (in->maxs[j]);
+        }
 
-		out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
-		out->numSurfaces = LittleLong( in->numSurfaces );
-	}
+        out->firstSurface = s_worldData.surfaces + LittleLong( in->firstSurface );
+        out->numSurfaces = LittleLong( in->numSurfaces );
+    }
 }
 
 
@@ -1349,11 +1716,11 @@ R_SetParent
 */
 static	void R_SetParent (mnode_t *node, mnode_t *parent)
 {
-	node->parent = parent;
-	if (node->contents != -1)
-		return;
-	R_SetParent (node->children[0], node);
-	R_SetParent (node->children[1], node);
+    node->parent = parent;
+    if (node->contents != -1)
+        return;
+    R_SetParent (node->children[0], node);
+    R_SetParent (node->children[1], node);
 }
 
 /*
@@ -1361,75 +1728,160 @@ static	void R_SetParent (mnode_t *node, mnode_t *parent)
 R_LoadNodesAndLeafs
 =================
 */
-static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
-	int			i, j, p;
-	dnode_t		*in;
-	dleaf_t		*inLeaf;
-	mnode_t 	*out;
-	int			numNodes, numLeafs;
+static	void R_LoadNodesAndLeafs(gamelump_t* nodeLump, gamelump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
 
-	in = (void *)(fileBase + nodeLump->fileofs);
-	if (nodeLump->filelen % sizeof(dnode_t) ||
-		leafLump->filelen % sizeof(dleaf_t) ) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	numNodes = nodeLump->filelen / sizeof(dnode_t);
-	numLeafs = leafLump->filelen / sizeof(dleaf_t);
+    in = (void*)nodeLump->buffer;
+    if (nodeLump->length % sizeof(dnode_t) ||
+        leafLump->length % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->length / sizeof(dnode_t);
+    numLeafs = leafLump->length / sizeof(dleaf_t);
 
-	out = ri.Hunk_Alloc ( (numNodes + numLeafs) * sizeof(*out), h_low);	
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
 
-	s_worldData.nodes = out;
-	s_worldData.numnodes = numNodes + numLeafs;
-	s_worldData.numDecisionNodes = numNodes;
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
 
-	// load nodes
-	for ( i=0 ; i<numNodes; i++, in++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->mins[j] = LittleLong (in->mins[j]);
-			out->maxs[j] = LittleLong (in->maxs[j]);
-		}
-	
-		p = LittleLong(in->planeNum);
-		out->plane = s_worldData.planes + p;
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
 
-		out->contents = CONTENTS_NODE;	// differentiate from leafs
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
 
-		for (j=0 ; j<2 ; j++)
-		{
-			p = LittleLong (in->children[j]);
-			if (p >= 0)
-				out->children[j] = s_worldData.nodes + p;
-			else
-				out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
-		}
-	}
-	
-	// load leafs
-	inLeaf = (void *)(fileBase + leafLump->fileofs);
-	for ( i=0 ; i<numLeafs ; i++, inLeaf++, out++)
-	{
-		for (j=0 ; j<3 ; j++)
-		{
-			out->mins[j] = LittleLong (inLeaf->mins[j]);
-			out->maxs[j] = LittleLong (inLeaf->maxs[j]);
-		}
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
 
-		out->cluster = LittleLong(inLeaf->cluster);
-		out->area = LittleLong(inLeaf->area);
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
 
-		if ( out->cluster >= s_worldData.numClusters ) {
-			s_worldData.numClusters = out->cluster + 1;
-		}
+    // load leafs
+    inLeaf = (void*)leafLump->buffer;
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
 
-		out->firstmarksurface = s_worldData.marksurfaces +
-			LittleLong(inLeaf->firstLeafSurface);
-		out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
-	}	
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
 
-	// chain descendants
-	R_SetParent (s_worldData.nodes, NULL);
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+
+        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
+        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
+}
+
+/*
+=================
+R_LoadNodesAndLeafsOld
+=================
+*/
+static	void R_LoadNodesAndLeafsOld(gamelump_t* nodeLump, gamelump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t_ver17* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
+
+    in = nodeLump->buffer;
+    if (nodeLump->length % sizeof(dnode_t) ||
+        leafLump->length % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->length / sizeof(dnode_t);
+    numLeafs = leafLump->length / sizeof(dleaf_t);
+
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
+
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
+
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
+
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
+
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
+
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
+
+    // load leafs
+    inLeaf = leafLump->buffer;
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
+
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
+
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
 }
 
 //=============================================================================
@@ -1439,25 +1891,25 @@ static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
 R_LoadShaders
 =================
 */
-static	void R_LoadShaders( lump_t *l ) {	
-	int		i, count;
-	dshader_t	*in, *out;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*sizeof(*out), h_low );
+static	void R_LoadShaders(gamelump_t* l) {
+    int		i, count;
+    dshader_t* in, * out;
 
-	s_worldData.shaders = out;
-	s_worldData.numShaders = count;
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
 
-	Com_Memcpy( out, in, count*sizeof(*out) );
+    s_worldData.shaders = out;
+    s_worldData.numShaders = count;
 
-	for ( i=0 ; i<count ; i++ ) {
-		out[i].surfaceFlags = LittleLong( out[i].surfaceFlags );
-		out[i].contentFlags = LittleLong( out[i].contentFlags );
-	}
+    Com_Memcpy(out, in, count * sizeof(*out));
+
+    for (i = 0; i < count; i++) {
+        out[i].surfaceFlags = LittleLong(out[i].surfaceFlags);
+        out[i].contentFlags = LittleLong(out[i].contentFlags);
+    }
 }
 
 
@@ -1466,26 +1918,26 @@ static	void R_LoadShaders( lump_t *l ) {
 R_LoadMarksurfaces
 =================
 */
-static	void R_LoadMarksurfaces (lump_t *l)
-{	
-	int		i, j, count;
-	int		*in;
-	msurface_t **out;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*sizeof(*out), h_low);	
+static	void R_LoadMarksurfaces(gamelump_t* l)
+{
+    int		i, j, count;
+    int* in;
+    msurface_t** out;
 
-	s_worldData.marksurfaces = out;
-	s_worldData.nummarksurfaces = count;
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = (msurface_t**)ri.Hunk_Alloc(count * sizeof(*out), h_dontcare);
 
-	for ( i=0 ; i<count ; i++)
-	{
-		j = LittleLong(in[i]);
-		out[i] = s_worldData.surfaces + j;
-	}
+    s_worldData.marksurfaces = out;
+    s_worldData.nummarksurfaces = count;
+
+    for (i = 0; i < count; i++)
+    {
+        j = LittleLong(in[i]);
+        out[i] = &s_worldData.surfaces[j];
+    }
 }
 
 
@@ -1494,276 +1946,236 @@ static	void R_LoadMarksurfaces (lump_t *l)
 R_LoadPlanes
 =================
 */
-static	void R_LoadPlanes( lump_t *l ) {
-	int			i, j;
-	cplane_t	*out;
-	dplane_t 	*in;
-	int			count;
-	int			bits;
-	
-	in = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*in))
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	count = l->filelen / sizeof(*in);
-	out = ri.Hunk_Alloc ( count*2*sizeof(*out), h_low);	
-	
-	s_worldData.planes = out;
-	s_worldData.numplanes = count;
+static	void R_LoadPlanes(gamelump_t* l) {
+    int			i, j;
+    cplane_t* out;
+    dplane_t* in;
+    int			count;
+    int			bits;
 
-	for ( i=0 ; i<count ; i++, in++, out++) {
-		bits = 0;
-		for (j=0 ; j<3 ; j++) {
-			out->normal[j] = LittleFloat (in->normal[j]);
-			if (out->normal[j] < 0) {
-				bits |= 1<<j;
-			}
-		}
+    in = l->buffer;
+    if (l->length % sizeof(*in))
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    count = l->length / sizeof(*in);
+    out = ri.Hunk_Alloc(count * 2 * sizeof(*out), h_dontcare);
 
-		out->dist = LittleFloat (in->dist);
-		out->type = PlaneTypeForNormal( out->normal );
-		out->signbits = bits;
-	}
+    s_worldData.planes = out;
+    s_worldData.numplanes = count;
+
+    for (i = 0; i < count; i++, in++, out++) {
+        bits = 0;
+        for (j = 0; j < 3; j++) {
+            out->normal[j] = LittleFloat(in->normal[j]);
+            if (out->normal[j] < 0) {
+                bits |= 1 << j;
+            }
+        }
+
+        out->dist = LittleFloat(in->dist);
+        out->type = PlaneTypeForNormal(out->normal);
+        out->signbits = bits;
+    }
 }
 
-/*
-=================
-R_LoadFogs
-
-=================
-*/
-static	void R_LoadFogs( lump_t *l, lump_t *brushesLump, lump_t *sidesLump ) {
-	int			i;
-	fog_t		*out;
-	dfog_t		*fogs;
-	dbrush_t 	*brushes, *brush;
-	dbrushside_t	*sides;
-	int			count, brushesCount, sidesCount;
-	int			sideNum;
-	int			planeNum;
-	shader_t	*shader;
-	float		d;
-	int			firstSide;
-
-	fogs = (void *)(fileBase + l->fileofs);
-	if (l->filelen % sizeof(*fogs)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	count = l->filelen / sizeof(*fogs);
-
-	// create fog structures for them
-	s_worldData.numfogs = count + 1;
-	s_worldData.fogs = ri.Hunk_Alloc ( s_worldData.numfogs*sizeof(*out), h_low);
-	out = s_worldData.fogs + 1;
-
-	if ( !count ) {
-		return;
-	}
-
-	brushes = (void *)(fileBase + brushesLump->fileofs);
-	if (brushesLump->filelen % sizeof(*brushes)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	brushesCount = brushesLump->filelen / sizeof(*brushes);
-
-	sides = (void *)(fileBase + sidesLump->fileofs);
-	if (sidesLump->filelen % sizeof(*sides)) {
-		ri.Error (ERR_DROP, "LoadMap: funny lump size in %s",s_worldData.name);
-	}
-	sidesCount = sidesLump->filelen / sizeof(*sides);
-
-	for ( i=0 ; i<count ; i++, fogs++) {
-		out->originalBrushNumber = LittleLong( fogs->brushNum );
-
-		if ( (unsigned)out->originalBrushNumber >= brushesCount ) {
-			ri.Error( ERR_DROP, "fog brushNumber out of range" );
-		}
-		brush = brushes + out->originalBrushNumber;
-
-		firstSide = LittleLong( brush->firstSide );
-
-			if ( (unsigned)firstSide > sidesCount - 6 ) {
-			ri.Error( ERR_DROP, "fog brush sideNumber out of range" );
-		}
-
-		// brushes are always sorted with the axial sides first
-		sideNum = firstSide + 0;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][0] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 1;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][0] = s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 2;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][1] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 3;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][1] = s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 4;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[0][2] = -s_worldData.planes[ planeNum ].dist;
-
-		sideNum = firstSide + 5;
-		planeNum = LittleLong( sides[ sideNum ].planeNum );
-		out->bounds[1][2] = s_worldData.planes[ planeNum ].dist;
-
-		// get information from the shader for fog parameters
-		shader = R_FindShader( fogs->shader, LIGHTMAP_NONE, qtrue );
-
-		out->parms = shader->fogParms;
-
-		out->colorInt = ColorBytes4 ( shader->fogParms.color[0] * tr.identityLight, 
-			                          shader->fogParms.color[1] * tr.identityLight, 
-			                          shader->fogParms.color[2] * tr.identityLight, 1.0 );
-
-		d = shader->fogParms.depthForOpaque < 1 ? 1 : shader->fogParms.depthForOpaque;
-		out->tcScale = 1.0f / ( d * 8 );
-
-		// set the gradient vector
-		sideNum = LittleLong( fogs->visibleSide );
-
-		if ( sideNum == -1 ) {
-			out->hasSurface = qfalse;
-		} else {
-			out->hasSurface = qtrue;
-			planeNum = LittleLong( sides[ firstSide + sideNum ].planeNum );
-			VectorSubtract( vec3_origin, s_worldData.planes[ planeNum ].normal, out->surface );
-			out->surface[3] = -s_worldData.planes[ planeNum ].dist;
-		}
-
-		out++;
-	}
-
-}
-
-
 /*
 ================
 R_LoadLightGrid
 
 ================
 */
-void R_LoadLightGrid( lump_t *l ) {
-	int		i;
-	vec3_t	maxs;
-	int		numGridPoints;
-	world_t	*w;
-	float	*wMins, *wMaxs;
+void R_LoadLightGrid(gamelump_t* plPal, gamelump_t* plOffsets, gamelump_t* plData) {
+    int		i;
+    vec3_t	maxs;
+    int		numGridPoints;
+    world_t	*w;
+    float	*wMins, *wMaxs;
 
-	w = &s_worldData;
+    w = &s_worldData;
 
-	w->lightGridInverseSize[0] = 1.0f / w->lightGridSize[0];
-	w->lightGridInverseSize[1] = 1.0f / w->lightGridSize[1];
-	w->lightGridInverseSize[2] = 1.0f / w->lightGridSize[2];
+    if (!plPal->buffer || !plOffsets->buffer || !plData->buffer) {
+        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
+        w->lightGridOffsets = 0;
+        w->lightGridData = 0;
+        return;
+    }
 
-	wMins = w->bmodels[0].bounds[0];
-	wMaxs = w->bmodels[0].bounds[1];
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
 
-	for ( i = 0 ; i < 3 ; i++ ) {
-		w->lightGridOrigin[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
-		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
-		w->lightGridBounds[i] = (maxs[i] - w->lightGridOrigin[i])/w->lightGridSize[i] + 1;
-	}
+    w->lightGridOOSize[0] = 1.0f / w->lightGridSize[0];
+    w->lightGridOOSize[1] = 1.0f / w->lightGridSize[1];
+    w->lightGridOOSize[2] = 1.0f / w->lightGridSize[2];
 
-	numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] * w->lightGridBounds[2];
+    wMins = w->bmodels[0].bounds[0];
+    wMaxs = w->bmodels[0].bounds[1];
 
-	if ( l->filelen != numGridPoints * 8 ) {
-		ri.Printf( PRINT_WARNING, "WARNING: light grid mismatch\n" );
-		w->lightGridData = NULL;
-		return;
-	}
+    for ( i = 0 ; i < 3 ; i++ ) {
+        w->lightGridMins[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
+        maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
+        w->lightGridBounds[i] = (maxs[i] - w->lightGridMins[i])/w->lightGridSize[i] + 1;
+    }
 
-	w->lightGridData = ri.Hunk_Alloc( l->filelen, h_low );
-	Com_Memcpy( w->lightGridData, (void *)(fileBase + l->fileofs), l->filelen );
+    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
 
-	// deal with overbright bits
-	for ( i = 0 ; i < numGridPoints ; i++ ) {
-		R_ColorShiftLightingBytes( &w->lightGridData[i*8], &w->lightGridData[i*8] );
-		R_ColorShiftLightingBytes( &w->lightGridData[i*8+3], &w->lightGridData[i*8+3] );
-	}
+    if (plOffsets->length != numGridPoints * 2) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    if (plPal->length != 768) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->length, h_dontcare);
+    for (i = 0; i < plOffsets->length / 2; i++) {
+        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)plOffsets->buffer)[i]);
+    }
+    Com_Memcpy(w->lightGridPalette, plPal->buffer, sizeof(s_worldData.lightGridPalette));
+
+    w->lightGridData = ri.Hunk_Alloc(plData->length, h_dontcare);
+    Com_Memcpy(w->lightGridData, plData->buffer, plData->length);
 }
 
 /*
 ================
-R_LoadEntities
+R_LoadStaticModelData
 ================
 */
-void R_LoadEntities( lump_t *l ) {
-	char *p, *token, *s;
-	char keyname[MAX_TOKEN_CHARS];
-	char value[MAX_TOKEN_CHARS];
-	world_t	*w;
+void R_LoadStaticModelData(gamelump_t* lump) {
+    int		i;
+    byte* pDstColors;
+    byte* pSrcColors;
 
-	w = &s_worldData;
-	w->lightGridSize[0] = 64;
-	w->lightGridSize[1] = 64;
-	w->lightGridSize[2] = 128;
+    if (!lump->length) {
+        s_worldData.numStaticModelData = 0;
+        s_worldData.staticModelData = 0;
+        return;
+    }
 
-	p = (char *)(fileBase + l->fileofs);
 
-	// store for reference by the cgame
-	w->entityString = ri.Hunk_Alloc( l->filelen + 1, h_low );
-	strcpy( w->entityString, p );
-	w->entityParsePoint = w->entityString;
+    if (lump->length % (sizeof(byte) * 3)) {
+        Com_Error(1, "R_LoadStaticModelData: funny lump size");
+    }
 
-	token = COM_ParseExt( &p, qtrue );
-	if (!*token || *token != '{') {
-		return;
-	}
+    s_worldData.numStaticModelData = lump->length / (sizeof(byte) * 3);
+    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
 
-	// only parse the world spawn
-	while ( 1 ) {	
-		// parse key
-		token = COM_ParseExt( &p, qtrue );
+    pSrcColors = lump->buffer;
+    pDstColors = s_worldData.staticModelData;
 
-		if ( !*token || *token == '}' ) {
-			break;
-		}
-		Q_strncpyz(keyname, token, sizeof(keyname));
+    for (i = 0; i < lump->length; i += sizeof(byte) * 3)
+    { 
+        // Colors are stored as integers
+        pDstColors[0] = pSrcColors[0];
+        pDstColors[1] = pSrcColors[1];
+        pDstColors[2] = pSrcColors[2];
+        pDstColors[3] = 0xFF;
 
-		// parse value
-		token = COM_ParseExt( &p, qtrue );
+        pSrcColors += sizeof(byte) * 3;
+        pDstColors += sizeof(byte) * 4;
+    }
+}
 
-		if ( !*token || *token == '}' ) {
-			break;
-		}
-		Q_strncpyz(value, token, sizeof(value));
+/*
+================
+R_CopyStaticModel
+================
+*/
+void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
+    pUnpackedSM->visCount = 0;
+    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
+    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
+    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
+    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
+    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
+    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
+    pUnpackedSM->scale = LittleFloat(pSM->scale);
+    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
+    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
+    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
+}
 
-		// check for remapping of shaders for vertex lighting
-		s = "vertexremapshader";
-		if (!Q_strncmp(keyname, s, strlen(s)) ) {
-			s = strchr(value, ';');
-			if (!s) {
-				ri.Printf( PRINT_WARNING, "WARNING: no semi colon in vertexshaderremap '%s'\n", value );
-				break;
-			}
-			*s++ = 0;
-			if (r_vertexLight->integer) {
-				R_RemapShader(value, s, "0");
-			}
-			continue;
-		}
-		// check for remapping of shaders
-		s = "remapshader";
-		if (!Q_strncmp(keyname, s, strlen(s)) ) {
-			s = strchr(value, ';');
-			if (!s) {
-				ri.Printf( PRINT_WARNING, "WARNING: no semi colon in shaderremap '%s'\n", value );
-				break;
-			}
-			*s++ = 0;
-			R_RemapShader(value, s, "0");
-			continue;
-		}
-		// check for a different grid size
-		if (!Q_stricmp(keyname, "gridsize")) {
-			sscanf(value, "%f %f %f", &w->lightGridSize[0], &w->lightGridSize[1], &w->lightGridSize[2] );
-			continue;
-		}
-	}
+/*
+================
+R_LoadStaticModelDefs
+================
+*/
+void R_LoadStaticModelDefs(gamelump_t* lump) {
+    int		i;
+    cStaticModel_t* in;
+    cStaticModelUnpacked_t* out;
+
+    if (!lump->length) {
+        s_worldData.numStaticModels = 0;
+        s_worldData.staticModels = NULL;
+        return;
+    }
+
+    if (lump->length % sizeof(cStaticModel_t)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numStaticModels = lump->length / sizeof(cStaticModel_t);
+    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.staticModels;
+
+    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
+        R_CopyStaticModel(in, out);
+    }
+}
+
+/*
+================
+R_LoadStaticModelIndexes
+================
+*/
+void R_LoadStaticModelIndexes(gamelump_t* lump) {
+    int i;
+    unsigned short* in;
+    cStaticModelUnpacked_t** out;
+
+    if (lump->length % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numVisStaticModels = lump->length / sizeof(short);
+    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
+
+    in = lump->buffer;
+    out = s_worldData.visStaticModels;
+
+    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
+        unsigned short index = LittleUnsignedShort(*in);
+        if (index >= s_worldData.numStaticModels) {
+            // Added in OPM
+            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
+        }
+
+        *out = &s_worldData.staticModels[index];
+    }
 }
 
 /*
@@ -1772,18 +2184,58 @@ R_GetEntityToken
 =================
 */
 qboolean R_GetEntityToken( char *buffer, int size ) {
-	const char	*s;
-
-	s = COM_Parse( &s_worldData.entityParsePoint );
-	Q_strncpyz( buffer, s, size );
-	if ( !s_worldData.entityParsePoint && !s[0] ) {
-		s_worldData.entityParsePoint = s_worldData.entityString;
-		return qfalse;
-	} else {
-		return qtrue;
-	}
+    // Stub
+    return qfalse;
 }
 
+/*
+==================
+R_LoadLump
+
+Loads a lump from the BSP file
+==================
+*/
+int R_LoadLump(fileHandle_t handle, lump_t* lump, gamelump_t* glump, int size)
+{
+    glump->buffer = NULL;
+    glump->length = lump->filelen;
+
+    if (lump->filelen) {
+        glump->buffer = ri.Hunk_AllocateTempMemory(lump->filelen);
+
+        if (ri.FS_Seek(handle, lump->fileofs, FS_SEEK_SET) < 0) {
+            Com_Error(ERR_DROP, "R_LoadLump: Error seeking to lump.");
+        }
+
+        ri.FS_Read(glump->buffer, lump->filelen, handle);
+
+        if (size) {
+            return lump->filelen / size;
+        }
+    }
+
+    return 0;
+}
+
+/*
+==================
+R_FreeLump
+
+Free a previously allocated lump
+==================
+*/
+void R_FreeLump(gamelump_t* lump)
+{
+    if (lump->buffer)
+    {
+        ri.Hunk_FreeTempMemory(lump->buffer);
+        lump->buffer = NULL;
+        lump->length = 0;
+    }
+}
+
+#define _R( id ) ri.UI_LoadResource( "*" #id )
+
 /*
 =================
 RE_LoadWorldMap
@@ -1792,79 +2244,266 @@ Called directly from cgame
 =================
 */
 void RE_LoadWorldMap( const char *name ) {
-	int			i;
-	dheader_t	*header;
-	union {
-		byte *b;
-		void *v;
-	} buffer;
-	byte		*startMarker;
+    int			i;
+    dheader_t	header;
+    fileHandle_t	h;
+    int				length;
+    vec3_t			vDefSundir;
+    gamelump_t		lump, lump2, lump3;
 
-	if ( tr.worldMapLoaded ) {
-		ri.Error( ERR_DROP, "ERROR: attempted to redundantly load world map" );
-	}
+    vDefSundir[0] = 0.45f;
+    vDefSundir[1] = 0.3f;
+    vDefSundir[2] = 0.9f;
 
-	// set default sun direction to be used if it isn't
-	// overridden by a shader
-	tr.sunDirection[0] = 0.45f;
-	tr.sunDirection[1] = 0.3f;
-	tr.sunDirection[2] = 0.9f;
+    _R(52);
 
-	VectorNormalize( tr.sunDirection );
+    // set default sun direction to be used if it isn't
+    // overridden by a shader
+    VectorCopy(vDefSundir, tr.sunDirection);
+    VectorNormalize( tr.sunDirection );
 
-	tr.worldMapLoaded = qtrue;
+    tr.worldMapLoaded = qtrue;
 
-	// load it
-    ri.FS_ReadFile( name, &buffer.v );
-	if ( !buffer.b ) {
-		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s not found", name);
-	}
+    // load it
+    length = ri.FS_OpenFile(name, &h, qtrue, qtrue);
+    if (length <= 0) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s not found", name);
+    }
 
-	// clear tr.world so if the level fails to load, the next
-	// try will not look at the partially loaded version
-	tr.world = NULL;
+    ri.FS_Read(&header, sizeof(dheader_t), h);
 
-	Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
-	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
+    for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
+        ((int *)&header)[i] = LittleLong ( ((int *)&header)[i]);
+    }
 
-	Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
-	COM_StripExtension(s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
+    map_length = length;
+    map_version = header.version;
 
-	startMarker = ri.Hunk_Alloc(0, h_low);
-	c_gridVerts = 0;
+    // clear tr.world so if the level fails to load, the next
+    // try will not look at the partially loaded version
+    tr.world = NULL;
 
-	header = (dheader_t *)buffer.b;
-	fileBase = (byte *)header;
+    Com_Memset( &s_worldData, 0, sizeof( s_worldData ) );
+    Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
 
-	i = LittleLong (header->version);
-	if ( i != BSP_VERSION ) {
-		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be %i)", 
-			name, i, BSP_VERSION);
-	}
+    Q_strncpyz( s_worldData.baseName, COM_SkipPath( s_worldData.name ), sizeof( s_worldData.name ) );
+    COM_StripExtension( s_worldData.baseName, s_worldData.baseName, sizeof(s_worldData.baseName));
 
-	// swap all the lumps
-	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
-		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
-	}
+    c_gridVerts = 0;
 
-	// load into heap
-	R_LoadShaders( &header->lumps[LUMP_SHADERS] );
-	R_LoadLightmaps( &header->lumps[LUMP_LIGHTMAPS] );
-	R_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
-	R_LoadSurfaces( &header->lumps[LUMP_SURFACES], &header->lumps[LUMP_DRAWVERTS], &header->lumps[LUMP_DRAWINDEXES] );
-	R_LoadMarksurfaces (&header->lumps[LUMP_LEAFSURFACES]);
-	R_LoadNodesAndLeafs (&header->lumps[LUMP_NODES], &header->lumps[LUMP_LEAFS]);
-	R_LoadSubmodels (&header->lumps[LUMP_MODELS]);
-	R_LoadVisibility( &header->lumps[LUMP_VISIBILITY] );
-	R_LoadEntities( &header->lumps[LUMP_ENTITIES] );
-	R_LoadLightGrid( &header->lumps[LUMP_LIGHTGRID] );
+    i = header.version;
+    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
+            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
+    }
 
-	s_worldData.dataSize = (byte *)ri.Hunk_Alloc(0, h_low) - startMarker;
+    // load into heap
+    // load into heap
+    _R(53);
+    numShaders = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SHADERS), &lump, sizeof(dshader_t));
+    _R(54);
+    R_LoadShaders(&lump);
+    _R(55);
+    R_FreeLump(&lump);
+    _R(56);
+    numplanes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_PLANES), &lump, sizeof(dplane_t));
+    R_LoadPlanes(&lump);
+    _R(57);
+    R_FreeLump(&lump);
+    _R(58);
+    numLightBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTMAPS), &lump, sizeof(byte));
+    _R(59);
+    R_LoadLightmaps(&lump);
+    _R(60);
+    R_FreeLump(&lump);
+    _R(61);
+    numDrawSurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SURFACES), &lump, sizeof(dsurface_t));
+    _R(62);
+    numDrawVerts = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWVERTS), &lump2, sizeof(drawVert_t));
+    _R(63);
+    numDrawIndexes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_DRAWINDEXES), &lump3, sizeof(int));
+    _R(64);
+    R_LoadSurfaces(&lump, &lump2, &lump3);
+    _R(65);
+    R_FreeLump(&lump3);
+    _R(66);
+    R_FreeLump(&lump2);
+    _R(67);
+    R_FreeLump(&lump);
+    _R(68);
+    numleafsurfaces = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFSURFACES), &lump, sizeof(int));
+    _R(69);
+    R_LoadMarksurfaces(&lump);
+    _R(70);
+    R_FreeLump(&lump);
+    _R(71);
+    numleafs = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LEAFS), &lump2, sizeof(dleaf_t));
+    _R(72);
+    numnodes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_NODES), &lump, sizeof(mnode_t));
+    _R(73);
+    if (header.version > BSP_BETA_VERSION) {
+        R_LoadNodesAndLeafs(&lump, &lump2);
+    }
+    else {
+        R_LoadNodesAndLeafsOld(&lump, &lump2);
+    }
+    _R(74);
+    R_FreeLump(&lump);
+    _R(75);
+    R_FreeLump(&lump2);
+    _R(76);
+    numFogs = 0;
+    nummodels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_MODELS), &lump, sizeof(bmodel_t));
+    _R(77);
+    R_LoadSubmodels(&lump);
+    _R(78);
+    R_FreeLump(&lump);
+    _R(79);
+    numVisBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_VISIBILITY), &lump, sizeof(byte));
+    _R(80);
+    R_LoadVisibility(&lump);
+    _R(81);
+    R_FreeLump(&lump);
+    _R(82);
+    g_iGridPaletteBytes = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDPALETTE), &lump, sizeof(byte));
+    _R(83);
+    g_iGridOffsets = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDOFFSETS), &lump2, sizeof(short));
+    _R(84);
+    g_iGridDataSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_LIGHTGRIDDATA), &lump3, sizeof(byte));
+    _R(85);
+    R_LoadLightGrid( &lump, &lump2, &lump3 );
+    _R(86);
+    R_FreeLump(&lump);
+    _R(87);
+    R_FreeLump(&lump2);
+    _R(88);
+    R_FreeLump(&lump3);
+    _R(89);
+    numSLights = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTS), &lump, sizeof(mapspherel_t));
+    _R(90);
+    R_LoadSphereLights(&lump);
+    _R(91);
+    R_FreeLump(&lump);
+    _R(92);
+    entLightVisSize = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_SPHERELIGHTVIS), &lump, sizeof(byte));
+    _R(93);
+    R_LoadSphereLightVis(&lump);
+    _R(94);
+    R_FreeLump(&lump);
+    _R(95);
+    g_nTerraPatches = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAIN), &lump, sizeof(cTerraPatch_t));
+    _R(96);
+    R_LoadTerrain(&lump);
+    _R(97);
+    R_FreeLump(&lump);
+    _R(98);
+    g_nTerPatchIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_TERRAININDEXES), &lump, sizeof(short));
+    _R(99);
+    R_LoadTerrainIndexes(&lump);
+    _R(100);
+    R_FreeLump(&lump);
+    _R(101);
+    if (header.version > BSP_BETA_VERSION)
+    {
+        g_nStaticModelData = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDATA), &lump, sizeof(byte));
+        _R(102);
+        R_LoadStaticModelData(&lump);
+        _R(103);
+        R_FreeLump(&lump);
+        _R(104);
+        g_nStaticModels = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELDEF), &lump, sizeof(cStaticModel_t));
+        _R(105);
+        R_LoadStaticModelDefs(&lump);
+        _R(106);
+        R_FreeLump(&lump);
+        _R(107);
+        g_nStaticModelIndices = R_LoadLump(h, Q_GetLumpByVersion(&header, LUMP_STATICMODELINDEXES), &lump, sizeof(byte));
+        _R(108);
+        R_LoadStaticModelIndexes(&lump);
+        _R(109);
+        R_FreeLump(&lump);
+        _R(110);
+    }
+    else
+    {
+        g_nStaticModelData = 0;
+        g_nStaticModels = 0;
+        g_nStaticModelIndices = 0;
+    }
 
-	// only set tr.world now that we know the entire level has loaded properly
-	tr.world = &s_worldData;
+    // only set tr.world now that we know the entire level has loaded properly
+    tr.world = &s_worldData;
 
-    ri.FS_FreeFile( buffer.v );
+    ri.FS_CloseFile(h);
+
+    ri.UI_LoadResource("*111");
+    R_Sphere_InitLights();
+    ri.UI_LoadResource("*112");
+    R_InitTerrain();
+    ri.UI_LoadResource("*113");
+    R_InitStaticModels();
+    ri.UI_LoadResource("*114");
+    R_LevelMarksLoad(name);
+    ri.UI_LoadResource("*115");
+    R_VisDebugLoad(name);
+    ri.UI_LoadResource("*116");
 }
 
+/*
+=================
+RE_MapVersion
+
+=================
+*/
+int RE_MapVersion(void)
+{
+	return map_version;
+}
+
+/*
+=================
+RE_PrintBSPFileSizes
+
+=================
+*/
+void RE_PrintBSPFileSizes(void)
+{
+  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
+  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
+  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
+  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
+  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
+  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
+  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
+  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
+  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
+  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
+  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
+  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
+  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
+  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
+  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
+  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
+  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
+  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
+  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
+  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
+  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
+  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
+  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
+  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
+  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
+  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
+}
+
+/*
+=================
+R_ClearWorld
+
+Set the world to NULL to prevent anyone from accessing
+freed world data
+=================
+*/
+void R_ClearWorld(void) {
+    tr.world = NULL;
+}
diff --git a/code/renderergl1/tr_cmds.c b/code/renderergl1/tr_cmds.c
index 89bb88a3..f389ac70 100644
--- a/code/renderergl1/tr_cmds.c
+++ b/code/renderergl1/tr_cmds.c
@@ -21,12 +21,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"
 
+static backEndCounters_t pc_save;
+
+/*
+=====================
+R_SavePerformanceCounters
+=====================
+*/
+void R_SavePerformanceCounters(void) {
+    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
+}
+
 /*
 =====================
 R_PerformanceCounters
 =====================
 */
 void R_PerformanceCounters( void ) {
+	if (r_fps->integer) {
+		ri.SetPerformanceCounters(
+			backEnd.pc.c_totalIndexes / 3,
+			backEnd.pc.c_vertexes,
+			R_SumOfUsedImages(),
+			pc_save.c_totalIndexes / 3,
+			pc_save.c_vertexes,
+			backEnd.pc.c_characterlights
+			);
+	}
 	if ( !r_speeds->integer ) {
 		// clear the counters even if we aren't printing
 		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
@@ -174,6 +195,29 @@ void	R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 }
 
 
+/*
+=============
+R_AddSpriteSurfCmd
+
+=============
+*/
+void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
+    drawSurfsCommand_t* cmd;
+
+    cmd = R_GetCommandBuffer(sizeof(*cmd));
+    if (!cmd) {
+        return;
+    }
+    cmd->commandId = RC_SPRITE_SURFS;
+
+    cmd->drawSurfs = drawSurfs;
+    cmd->numDrawSurfs = numDrawSurfs;
+
+    cmd->refdef = tr.refdef;
+    cmd->viewParms = tr.viewParms;
+}
+
+
 /*
 =============
 RE_SetColor
@@ -296,6 +340,7 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 
 	tr.frameCount++;
 	tr.frameSceneNum = 0;
+	g_nStaticSurfaces = 0;
 
 	//
 	// do overdraw measurement
diff --git a/code/renderergl1/tr_curve.c b/code/renderergl1/tr_curve.c
index eaabba46..446650f5 100644
--- a/code/renderergl1/tr_curve.c
+++ b/code/renderergl1/tr_curve.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -113,7 +113,7 @@ static void MakeMeshNormals( int width, int height, drawVert_t ctrl[MAX_GRID_SIZ
 	int		i, j, k, dist;
 	vec3_t	normal;
 	vec3_t	sum;
-	int		count = 0;
+	int		count;
 	vec3_t	base;
 	vec3_t	delta;
 	int		x, y;
@@ -182,7 +182,7 @@ static	int	neighbors[8][2] = {
 						break;					// edge of patch
 					}
 					VectorSubtract( ctrl[y][x].xyz, base, temp );
-					if ( VectorNormalize( temp ) < 0.001f ) {
+					if ( VectorNormalize2( temp, temp ) == 0 ) {
 						continue;				// degenerate edge, get more dist
 					} else {
 						good[k] = qtrue;
@@ -198,15 +198,16 @@ static	int	neighbors[8][2] = {
 					continue;	// didn't get two points
 				}
 				CrossProduct( around[(k+1)&7], around[k], normal );
-				if ( VectorNormalize( normal ) < 0.001f ) {
+				if ( VectorNormalize2( normal, normal ) == 0 ) {
 					continue;
 				}
 				VectorAdd( normal, sum, sum );
 				count++;
 			}
-			//if ( count == 0 ) {
-			//	printf("bad normal\n");
-			//}
+			if ( count == 0 ) {
+//printf("bad normal\n");
+				count = 1;
+			}
 			VectorNormalize2( sum, dv->normal );
 		}
 	}
@@ -356,16 +357,14 @@ void R_FreeSurfaceGridMesh( srfGridMesh_t *grid ) {
 R_SubdividePatchToGrid
 =================
 */
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] ) {
 	int			i, j, k, l;
-	drawVert_t_cleared( prev );
-	drawVert_t_cleared( next );
-	drawVert_t_cleared( mid );
+	drawVert_t	prev, next, mid;
 	float		len, maxLen;
 	int			dir;
 	int			t;
-	drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t	ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float		errorTable[2][MAX_GRID_SIZE];
 
 	for ( i = 0 ; i < width ; i++ ) {
@@ -432,7 +431,7 @@ srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
 				continue;	// can't subdivide any more
 			}
 
-			if ( maxLen <= r_subdivisions->value ) {
+			if ( maxLen <= subdivide ) {
 				errorTable[dir][j+1] = 1.0f/maxLen;
 				continue;	// didn't need subdivision
 			}
@@ -524,7 +523,7 @@ R_GridInsertColumn
 srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror ) {
 	int i, j;
 	int width, height, oldwidth;
-	drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float errorTable[2][MAX_GRID_SIZE];
 	float lodRadius;
 	vec3_t lodOrigin;
@@ -578,7 +577,7 @@ R_GridInsertRow
 srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror ) {
 	int i, j;
 	int width, height, oldheight;
-	drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
+	MAC_STATIC drawVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE];
 	float errorTable[2][MAX_GRID_SIZE];
 	float lodRadius;
 	vec3_t lodOrigin;
diff --git a/code/renderer/tr_draw.c b/code/renderergl1/tr_draw.c
similarity index 92%
rename from code/renderer/tr_draw.c
rename to code/renderergl1/tr_draw.c
index 7a8af315..9e60de83 100644
--- a/code/renderer/tr_draw.c
+++ b/code/renderergl1/tr_draw.c
@@ -55,7 +55,7 @@ void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, flo
 #if 1
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -102,7 +102,7 @@ void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, fl
 	float scaledWidth1, scaledHeight1;
 	float scaledWidth2, scaledHeight2;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -152,7 +152,7 @@ void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -198,7 +198,7 @@ void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, i
 	shader_t* shader;
 	float		picw, pich;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -244,7 +244,7 @@ void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhand
 	int			i;
 	shader_t* shader;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	if (hShader) {
 		shader = R_GetShaderByHandle(hShader);
@@ -278,7 +278,7 @@ void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
 	w = glConfig.vidWidth;
 	h = glConfig.vidHeight;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	qglFinish();
 
 	if (bgr) {
@@ -331,7 +331,22 @@ RE_DrawBackground_DrawPixels
 ================
 */
 void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
-	// FIXME: stub
+	R_IssuePendingRenderCommands();
+
+	GL_State(0);
+	qglDisable(GL_TEXTURE_2D);
+
+	qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
+
+	if (bgr) {
+		qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
+	} else {
+		qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
+	}
+
+	qglPixelZoom(1.0, 1.0);
+
+	qglEnable(GL_TEXTURE_2D);
 }
 
 /*
@@ -340,7 +355,7 @@ AddBox
 ================
 */
 void AddBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
@@ -364,7 +379,7 @@ DrawBox
 ================
 */
 void DrawBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglColor4ubv(backEnd.color2D);
 	qglDisable(GL_TEXTURE_2D);
@@ -390,7 +405,7 @@ DrawLineLoop
 void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
 	int		i;
 
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 
 	qglDisable(GL_TEXTURE_2D);
 
@@ -420,7 +435,7 @@ Set2DWindow
 ================
 */
 void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	R_SyncRenderThread();
+	R_IssuePendingRenderCommands();
 	qglViewport(x, y, w, h);
 	qglScissor(x, y, w, h);
 	qglMatrixMode(GL_PROJECTION);
@@ -433,6 +448,9 @@ void Set2DWindow(int x, int y, int w, int h, float left, float right, float bott
 	qglEnable(GL_BLEND);
 	qglDisable(GL_CULL_FACE);
 	qglDisable(GL_CLIP_PLANE0);
+	// Make sure to disable the fog to avoid messing up with the UI
+	qglDisable(GL_FOG);
+	qglFogf(GL_FOG_START, 0);
 
 	if (r_reset_tc_array->integer) {
 		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
diff --git a/code/renderergl1/tr_flares.c b/code/renderergl1/tr_flares.c
index 7bd95194..2363cd89 100644
--- a/code/renderergl1/tr_flares.c
+++ b/code/renderergl1/tr_flares.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -29,12 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 LIGHT FLARES
 
 A light flare is an effect that takes place inside the eye when bright light
-sources are visible.  The size of the flare relative to the screen is nearly
+sources are visible.  The size of the flare reletive to the screen is nearly
 constant, irrespective of distance, but the intensity should be proportional to the
 projected area of the light source.
 
 A surface that has been flagged as having a light flare will calculate the depth
-buffer value that its midpoint should have when the surface is added.
+buffer value that it's midpoint should have when the surface is added.
 
 After all opaque surfaces have been rendered, the depth buffer is read back for
 each flare in view.  If the point has not been obscured by a closer surface, the
@@ -75,30 +75,14 @@ typedef struct flare_s {
 	int			windowX, windowY;
 	float		eyeZ;
 
-	vec3_t		origin;
 	vec3_t		color;
 } flare_t;
 
-#define		MAX_FLARES		256
+#define		MAX_FLARES		128
 
 flare_t		r_flareStructs[MAX_FLARES];
 flare_t		*r_activeFlares, *r_inactiveFlares;
 
-int flareCoeff;
-
-/*
-==================
-R_SetFlareCoeff
-==================
-*/
-static void R_SetFlareCoeff( void ) {
-
-	if(r_flareCoeff->value == 0.0f)
-		flareCoeff = atof(FLARE_STDCOEFF);
-	else
-		flareCoeff = r_flareCoeff->value;
-}
-
 /*
 ==================
 R_ClearFlares
@@ -115,8 +99,6 @@ void R_ClearFlares( void ) {
 		r_flareStructs[i].next = r_inactiveFlares;
 		r_inactiveFlares = &r_flareStructs[i];
 	}
-
-	R_SetFlareCoeff();
 }
 
 
@@ -129,27 +111,16 @@ This is called at surface tesselation time
 */
 void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal ) {
 	int				i;
-	flare_t			*f;
+	flare_t			*f, *oldest;
 	vec3_t			local;
-	float			d = 1;
+	float			d;
 	vec4_t			eye, clip, normalized, window;
 
 	backEnd.pc.c_flareAdds++;
 
-	if(normal && (normal[0] || normal[1] || normal[2]))
-	{
-		VectorSubtract( backEnd.viewParms.or.origin, point, local );
-		VectorNormalizeFast(local);
-		d = DotProduct(local, normal);
-
-		// If the viewer is behind the flare don't add it.
-		if(d < 0)
-			return;
-	}
-
 	// if the point is off the screen, don't bother adding it
 	// calculate screen coordinates and depth
-	R_TransformModelToClip( point, backEnd.or.modelMatrix, 
+	R_TransformModelToClip( point, backEnd.ori.modelMatrix, 
 		backEnd.viewParms.projectionMatrix, eye, clip );
 
 	// check to see if the point is completely off screen
@@ -167,6 +138,7 @@ void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t
 	}
 
 	// see if a flare with a matching surface, scene, and view exists
+	oldest = r_flareStructs;
 	for ( f = r_activeFlares ; f ; f = f->next ) {
 		if ( f->surface == surface && f->frameSceneNum == backEnd.viewParms.frameSceneNum
 			&& f->inPortal == backEnd.viewParms.isPortal ) {
@@ -199,12 +171,16 @@ void RB_AddFlare( void *surface, int fogNum, vec3_t point, vec3_t color, vec3_t
 	f->addedFrame = backEnd.viewParms.frameCount;
 	f->fogNum = fogNum;
 
-	VectorCopy(point, f->origin);
 	VectorCopy( color, f->color );
 
 	// fade the intensity of the flare down as the
 	// light surface turns away from the viewer
-	VectorScale( f->color, d, f->color ); 
+	if ( normal ) {
+		VectorSubtract( backEnd.viewParms.ori.origin, point, local );
+		VectorNormalizeFast( local );
+		d = DotProduct( local, normal );
+		VectorScale( f->color, d, f->color ); 
+	}
 
 	// save info needed to test
 	f->windowX = backEnd.viewParms.viewportX + window[0];
@@ -221,40 +197,13 @@ RB_AddDlightFlares
 void RB_AddDlightFlares( void ) {
 	dlight_t		*l;
 	int				i, j, k;
-	fog_t			*fog = NULL;
 
 	if ( !r_flares->integer ) {
 		return;
 	}
 
 	l = backEnd.refdef.dlights;
-
-	if(tr.world)
-		fog = tr.world->fogs;
-
 	for (i=0 ; i<backEnd.refdef.num_dlights ; i++, l++) {
-
-		if(fog)
-		{
-			// find which fog volume the light is in 
-			for ( j = 1 ; j < tr.world->numfogs ; j++ ) {
-				fog = &tr.world->fogs[j];
-				for ( k = 0 ; k < 3 ; k++ ) {
-					if ( l->origin[k] < fog->bounds[0][k] || l->origin[k] > fog->bounds[1][k] ) {
-						break;
-					}
-				}
-				if ( k == 3 ) {
-					break;
-				}
-			}
-			if ( j == tr.world->numfogs ) {
-				j = 0;
-			}
-		}
-		else
-			j = 0;
-
 		RB_AddFlare( (void *)l, j, l->origin, l->color, NULL );
 	}
 }
@@ -326,66 +275,17 @@ void RB_RenderFlare( flare_t *f ) {
 	float			size;
 	vec3_t			color;
 	int				iColor[3];
-	float distance, intensity, factor;
-	byte fogFactors[3] = {255, 255, 255};
 
 	backEnd.pc.c_flareRenders++;
 
-	// We don't want too big values anyways when dividing by distance.
-	if(f->eyeZ > -1.0f)
-		distance = 1.0f;
-	else
-		distance = -f->eyeZ;
+	VectorScale( f->color, f->drawIntensity*tr.identityLight, color );
+	iColor[0] = color[0] * 255;
+	iColor[1] = color[1] * 255;
+	iColor[2] = color[2] * 255;
 
-	// calculate the flare size..
-	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / distance );
+	size = backEnd.viewParms.viewportWidth * ( r_flareSize->value/640.0f + 8 / -f->eyeZ );
 
-/*
- * This is an alternative to intensity scaling. It changes the size of the flare on screen instead
- * with growing distance. See in the description at the top why this is not the way to go.
-	// size will change ~ 1/r.
-	size = backEnd.viewParms.viewportWidth * (r_flareSize->value / (distance * -2.0f));
-*/
-
-/*
- * As flare sizes stay nearly constant with increasing distance we must decrease the intensity
- * to achieve a reasonable visual result. The intensity is ~ (size^2 / distance^2) which can be
- * got by considering the ratio of
- * (flaresurface on screen) : (Surface of sphere defined by flare origin and distance from flare)
- * An important requirement is:
- * intensity <= 1 for all distances.
- *
- * The formula used here to compute the intensity is as follows:
- * intensity = flareCoeff * size^2 / (distance + size*sqrt(flareCoeff))^2
- * As you can see, the intensity will have a max. of 1 when the distance is 0.
- * The coefficient flareCoeff will determine the falloff speed with increasing distance.
- */
-
-	factor = distance + size * sqrt(flareCoeff);
-	
-	intensity = flareCoeff * size * size / (factor * factor);
-
-	VectorScale(f->color, f->drawIntensity * intensity, color);
-
-	// Calculations for fogging
-	if(tr.world && f->fogNum > 0 && f->fogNum < tr.world->numfogs)
-	{
-		tess.numVertexes = 1;
-		VectorCopy(f->origin, tess.xyz[0]);
-		tess.fogNum = f->fogNum;
-	
-		RB_CalcModulateColorsByFog(fogFactors);
-		
-		// We don't need to render the flare if colors are 0 anyways.
-		if(!(fogFactors[0] || fogFactors[1] || fogFactors[2]))
-			return;
-	}
-
-	iColor[0] = color[0] * fogFactors[0];
-	iColor[1] = color[1] * fogFactors[1];
-	iColor[2] = color[2] * fogFactors[2];
-	
-	RB_BeginSurface( tr.flareShader, f->fogNum );
+	RB_BeginSurface( tr.flareShader );
 
 	// FIXME: use quadstamp?
 	tess.xyz[tess.numVertexes][0] = f->windowX - size;
@@ -463,17 +363,6 @@ void RB_RenderFlares (void) {
 		return;
 	}
 
-	if(r_flareCoeff->modified)
-	{
-		R_SetFlareCoeff();
-		r_flareCoeff->modified = qfalse;
-	}
-
-	// Reset currentEntity to world so that any previously referenced entities
-	// don't have influence on the rendering of these flares (i.e. RF_ renderer flags).
-	backEnd.currentEntity = &tr.worldEntity;
-	backEnd.or = backEnd.viewParms.world;
-
 //	RB_AddDlightFlares();
 
 	// perform z buffer readback on each flare in this view
diff --git a/code/renderer/tr_font.cpp b/code/renderergl1/tr_font.cpp
similarity index 92%
rename from code/renderer/tr_font.cpp
rename to code/renderergl1/tr_font.cpp
index 720799c7..cb567413 100644
--- a/code/renderer/tr_font.cpp
+++ b/code/renderergl1/tr_font.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -34,6 +34,29 @@ static float s_fontHeightScale = 1.0;
 static float s_fontGeneralScale = 1.0;
 static float s_fontZ = 0.0;
 
+void R_ShutdownFont() {
+    int i;
+    fontheader_t *header;
+    fontheader_sgl_t *header_sgl;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (header->charTable) {
+            ri.Free(header->charTable);
+            header->charTable = NULL;
+        }
+
+        memset(header, 0, sizeof(*header));
+    }
+
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
+    {
+        header_sgl = &s_loadedFonts_sgl[i];
+        memset(header_sgl, 0, sizeof(*header_sgl));
+    }
+}
+
 void R_SetFontHeightScale(float scale)
 {
     s_fontHeightScale = scale;
@@ -331,7 +354,7 @@ fontheader_t* R_LoadFont(const char* name) {
             else if (!Q_stricmp(token, "Chars"))
             {
                 header->charTableLength = atoi(COM_Parse(&ref));
-                header->charTable = (fontchartable_t*)Z_Malloc(header->charTableLength * sizeof(fontchartable_t));
+                header->charTable = (fontchartable_t*)ri.Malloc(header->charTableLength * sizeof(fontchartable_t));
                 if (!header->charTable)
                 {
                     ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
@@ -363,7 +386,7 @@ fontheader_t* R_LoadFont(const char* name) {
                         break;
                     }
 
-                    pRitFontNames[i] = (char*)Z_Malloc(strlen(token) + 1);
+                    pRitFontNames[i] = (char*)ri.Malloc(strlen(token) + 1);
                     if (!pRitFontNames[i])
                     {
                         ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
@@ -468,13 +491,13 @@ fontheader_t* R_LoadFont(const char* name) {
 
         // Free all allocated strings
         for (i = 0; i < header->numPages; i++) {
-            Z_Free(pRitFontNames[i]);
+            ri.Free(pRitFontNames[i]);
         }
 
         if (error)
         {
             if (header->charTable) {
-                Z_Free(header->charTable);
+                ri.Free(header->charTable);
             }
 
             header->numPages = 0;
@@ -525,7 +548,7 @@ void R_LoadFontShader(fontheader_sgl_t* font)
     }
 }
 
-void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     float charHeight;
     float startx, starty;
     int i;
@@ -534,14 +557,25 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
     i = 0;
     startx = x;
     starty = y;
-    fWidthScale = (double)glConfig.vidWidth / 640.0;
-    fHeightScale = (double)glConfig.vidHeight / 480.0;
+    if (pvVirtualScreen) {
+        if (pvVirtualScreen[0]) {
+            fWidthScale = pvVirtualScreen[0];
+        } else {
+            fWidthScale = (double)glConfig.vidWidth / 640.0;
+        }
+
+        if (pvVirtualScreen[1]) {
+            fHeightScale = pvVirtualScreen[1];
+        } else {
+            fHeightScale = (double)glConfig.vidHeight / 480.0;
+        }
+    }
 
     if (!font) {
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
@@ -570,7 +604,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
         case '\t':
             indirected = font->indirection[32];
             if (indirected == -1) {
-                Com_DPrintf("R_DrawString: no space-character in font!\n");
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no space-character in font!\n");
             } else {
                 x = s_fontGeneralScale * font->locations[indirected].size[0] * 256.0 * 3.0 + x;
             }
@@ -590,10 +624,10 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
             indirected = font->indirection[c];
             if (indirected == -1)
             {
-                Com_DPrintf("R_DrawString: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no 0x%02x-character in font!\n", c);
                 indirected = font->indirection['?'];
                 if (indirected == -1) {
-                    Com_DPrintf("R_DrawString: no '?' character in font!\n");
+                    ri.Printf(PRINT_DEVELOPER, "R_DrawString: no '?' character in font!\n");
                     break;
 				}
                 // set the indirection for the next time
@@ -636,7 +670,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
             tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
             tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 2;
 
-            if (bVirtualScreen)
+            if (pvVirtualScreen)
             {
                 // scale the string properly if virtual screen
                 tess.xyz[tess.numVertexes][0] *= fWidthScale;
@@ -659,7 +693,7 @@ void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y
     RB_EndSurface();
 }
 
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     int i;
     int code;
     unsigned short uch;
@@ -671,7 +705,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     
     if (!font->numPages) {
         if (font->sgl[0]) {
-            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, pvVirtualScreen);
         }
         return;
     }
@@ -704,7 +738,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
 
         if (uch == '\n' || uch == '\r') {
             buffer[buflen] = 0;
-            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
             
             curX = x;
             curHeight = 0.f;
@@ -728,7 +762,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
         ct = &font->charTable[code];
         if (cursgl != ct->index || buflen >= ARRAY_LEN(buffer) - 2) {
             buffer[buflen] = 0;
-            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, bVirtualScreen);
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
 
             curX += curHeight;
             curHeight = 0.f;
@@ -744,7 +778,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     if (buflen)
     {
         buffer[buflen] = 0;
-        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, bVirtualScreen);
+        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, pvVirtualScreen);
     }
 }
 
@@ -760,7 +794,7 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
     }
@@ -795,7 +829,7 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
         indirected = font->indirection[c];
         if (indirected == -1)
         {
-            Com_Printf("R_DrawFloatingString: no 0x%02x-character in font!\n", c);
+            ri.Printf(PRINT_ALL, "R_DrawFloatingString: no 0x%02x-character in font!\n", c);
             continue;
         }
 
@@ -852,7 +886,6 @@ void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const ve
 }
 
 void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
-    // FIXME: unimplemented
     return R_DrawFloatingString_sgl(font->sgl[0], text, org, color, scale, maxlen);
 }
 
@@ -887,7 +920,7 @@ float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0] * 3.0;
             } else {
-                Com_Printf("R_GetFontStringWidth: no space-character in font!\n");
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no space-character in font!\n");
             }
         }
         else
@@ -896,7 +929,7 @@ float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0];
             } else {
-                Com_Printf("R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
             }
         }
     }
diff --git a/code/renderergl1/tr_ghost.cpp b/code/renderergl1/tr_ghost.cpp
new file mode 100644
index 00000000..c68aa344
--- /dev/null
+++ b/code/renderergl1/tr_ghost.cpp
@@ -0,0 +1,1662 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_ghost.cpp
+
+#include "tr_local.h"
+#include "tr_ghost.h"
+
+GhostManager ghostManager;
+
+int frameTime;
+int lastTime;
+
+/*
+====================
+RandomizeRange
+
+====================
+*/
+float RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+Particle::Particle
+
+Initializes the particle with the specified parameters
+====================
+*/
+Particle::Particle(
+    Vector   pos,
+    Vector   vel,
+    Vector   acc,
+    int      srcColor,
+    int      dstColor,
+    float    colorRate,
+    qboolean wavy,
+    float    wavyDist,
+    float    currentTime,
+    float    dieTime,
+    float    maxspeed,
+    Vector   parentOrg,
+    qboolean swarm,
+    int      freq,
+    int      delta
+)
+{
+    m_position     = pos;
+    m_realposition = pos;
+    m_velocity     = vel;
+    m_acceleration = acc;
+
+    m_srcColor  = srcColor;
+    m_dstColor  = dstColor;
+    m_color     = srcColor;
+    m_colorRate = colorRate;
+
+    m_wavy       = wavy;
+    m_wavyDist   = wavyDist;
+    m_wavyOffset = RandomizeRange(-wavyDist, wavyDist);
+
+    m_swarm          = swarm;
+    m_swarmfrequency = freq;
+    m_swarmdelta     = delta;
+
+    m_startTime = currentTime;
+    m_dieTime   = dieTime;
+    m_life      = dieTime - currentTime;
+
+    m_maxspeed     = maxspeed;
+    m_parentOrigin = parentOrg;
+
+    Vector tempvec = m_velocity;
+    VectorNormalize(tempvec);
+
+    m_perp.x = tempvec.x * cos(M_PI / 2) - tempvec.y * sin(M_PI / 2);
+    m_perp.y = tempvec.x * sin(M_PI / 2) + tempvec.y * cos(M_PI / 2);
+
+    m_srcR = (m_srcColor & 0xff);
+    m_srcG = (m_srcColor & 0xff00) >> 8;
+    m_srcB = (m_srcColor & 0xff0000) >> 16;
+
+    m_dstR = (m_dstColor & 0xff);
+    m_dstG = (m_dstColor & 0xff00) >> 8;
+    m_dstB = (m_dstColor & 0xff0000) >> 16;
+
+    m_deltaR = m_dstR - m_srcR;
+    m_deltaG = m_dstG - m_srcG;
+    m_deltaB = m_dstB - m_srcB;
+}
+
+/*
+====================
+Particle::Update
+
+Updates the particle based on the current time
+====================
+*/
+void Particle::Update(float currentTime)
+{
+    int    r, g, b;
+    float  ftime;
+    float  time2;
+    float  factor;
+    Vector offset;
+
+    ftime = frameTime / 1000.0;
+    time2 = Square(ftime) * 0.5;
+
+    if (m_swarm) {
+        if (!(rand() % m_swarmfrequency)) {
+            m_velocity[0] = crandom() * m_maxspeed;
+            m_velocity[1] = crandom() * m_maxspeed;
+            m_velocity[2] = crandom() * m_maxspeed;
+        }
+
+        if (m_parentOrigin[0] > m_position[0]) {
+            m_velocity[0] += m_swarmdelta;
+        } else {
+            m_velocity[0] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[1] > m_position[1]) {
+            m_velocity[1] += m_swarmdelta;
+        } else {
+            m_velocity[1] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[2] > m_position[2]) {
+            m_velocity[2] += m_swarmdelta;
+        } else {
+            m_velocity[2] -= m_swarmdelta;
+        }
+    }
+
+    m_position = m_realposition;
+
+    m_position += m_velocity * ftime + m_acceleration * time2;
+    m_velocity += m_acceleration * ftime;
+    m_realposition = m_position;
+
+    if (m_wavy) {
+        offset = m_perp * sin(currentTime + m_wavyOffset) * (m_wavyOffset + m_wavyDist);
+        m_position += offset;
+    }
+
+    factor = 1.0 - (m_dieTime - currentTime) / m_life;
+    r      = m_deltaR * factor;
+    g      = m_deltaG * factor;
+    b      = m_deltaB * factor;
+
+    m_color = (r) | (g << 8) | (b << 8);
+}
+
+/*
+====================
+Particle::GetDieTime
+
+Returns the time at which the particle stops
+====================
+*/
+float Particle::GetDieTime()
+{
+    return m_dieTime;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+
+Initializes the particle emitter with specified parameters
+====================
+*/
+ParticleEmitter::ParticleEmitter(
+    Vector   position,
+    float    minSpeed,
+    float    maxSpeed,
+    float    angle,
+    float    angleVar,
+    float    minAccSpeed,
+    float    maxAccSpeed,
+    float    accAngle,
+    float    accAngleVar,
+    float    minRate,
+    float    maxRate,
+    int      srcColor,
+    int      dstColor,
+    float    minColorRate,
+    float    maxColorRate,
+    qboolean wavy,
+    float    minWavyDist,
+    float    maxWavyDist,
+    float    minLife,
+    float    maxLife,
+    qboolean particles,
+    qboolean gravityWell,
+    float    gravityWellStrength,
+    qboolean ballLightning,
+    int      minBallLightningRadius,
+    int      maxBallLightningRadius,
+    float    lightningVar,
+    int      lightningSubdivisions,
+    qboolean swarm,
+    int      swarmfreq,
+    int      swarmdelta
+)
+{
+    m_position = position;
+
+    m_minSpeed = minSpeed;
+    m_maxSpeed = maxSpeed;
+
+    m_angle       = angle;
+    m_angleVar    = angleVar;
+    m_minAccSpeed = minAccSpeed;
+    m_maxAccSpeed = maxAccSpeed;
+    m_accAngle    = accAngle;
+    m_accAngleVar = accAngleVar;
+
+    m_maxRate = 1.0 / maxRate;
+    m_minRate = 1.0 / minRate;
+
+    m_srcColor     = srcColor;
+    m_dstColor     = dstColor;
+    m_minColorRate = minColorRate;
+    m_maxColorRate = maxColorRate;
+
+    m_minWavyDist = minWavyDist;
+    m_maxWavyDist = maxWavyDist;
+    m_minLife     = minLife;
+    m_maxLife     = maxLife;
+
+    m_wavy = wavy;
+
+    m_particles = particles;
+
+    m_gravityWellStrength = gravityWellStrength;
+    m_gravityWell         = gravityWell;
+
+    m_ballLightning          = ballLightning;
+    m_minBallLightningRadius = minBallLightningRadius;
+    m_lightningVar           = lightningVar;
+    m_maxBallLightningRadius = maxBallLightningRadius;
+    m_lightningSubdivisions  = lightningSubdivisions;
+
+    m_swarm          = swarm;
+    m_swarmfrequency = swarmfreq;
+    m_swarmdelta     = swarmdelta;
+
+    m_time     = tr.refdef.time;
+    m_lasttime = m_time;
+
+    m_gravityEffectVector = vec_zero;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+====================
+*/
+ParticleEmitter::ParticleEmitter()
+{
+    m_lasttime = tr.refdef.time / 1000.0;
+}
+
+/*
+====================
+ParticleEmitter::~ParticleEmitter
+====================
+*/
+ParticleEmitter::~ParticleEmitter() {}
+
+/*
+====================
+ParticleEmitter::Emit
+
+Creates new particles based on the current time
+====================
+*/
+void ParticleEmitter::Emit(float currentTime)
+{
+    Particle *p;
+    float     rate;
+    float     delta;
+
+    rate  = GetRate();
+    delta = currentTime = m_lasttime;
+
+    if (!rate) {
+        m_lasttime = currentTime;
+        return;
+    }
+
+    for (; delta > rate; delta -= rate) {
+        p = new Particle(
+            m_position,
+            GetVelocity(),
+            GetAcceleration(),
+            GetSrcColor(),
+            GetDstColor(),
+            GetColorRate(),
+            IsWavy(),
+            GetWavyDistance(),
+            currentTime,
+            GetDieTime(currentTime),
+            m_maxSpeed,
+            GetPosition(),
+            IsSwarm(),
+            m_swarmfrequency,
+            m_swarmdelta
+        );
+
+        particleList.AddObject(p);
+
+        m_lasttime = currentTime;
+    }
+}
+
+/*
+====================
+ParticleEmitter::UpdateValues
+
+Updates all particles with the last renderer time
+====================
+*/
+void ParticleEmitter::UpdateValues()
+{
+    int i;
+    int numParticles;
+
+    numParticles = particleList.NumObjects();
+    for (i = 1; i <= numParticles; i++) {
+        Particle *p = particleList.ObjectAt(i);
+
+        p->Update(m_lasttime);
+    }
+}
+
+/*
+====================
+ParticleEmitter::GetPosition
+
+Returns the current particle position
+====================
+*/
+Vector ParticleEmitter::GetPosition()
+{
+    return m_position;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocity
+
+Returns the random velocity based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetVelocity()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirection
+
+Returns the direction of the random velocity
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMin
+
+Returns the random velocity direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMax
+
+Returns the random velocity direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_maxSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAcceleration
+
+Returns the random acceleration based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetAcceleration()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirection
+
+Returns the direction of the random acceleration
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMin
+
+Returns the random acceleration direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMax
+
+Returns the random acceleration direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the maximum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetSrcColor
+
+Returns the source color
+====================
+*/
+int ParticleEmitter::GetSrcColor()
+{
+    return m_srcColor;
+}
+
+/*
+====================
+ParticleEmitter::GetDstColor
+
+Returns the destination color
+====================
+*/
+int ParticleEmitter::GetDstColor()
+{
+    return m_dstColor;
+}
+
+/*
+====================
+ParticleEmitter::GetGravityWellStrength
+
+Returns the strength of the gravity
+====================
+*/
+float ParticleEmitter::GetGravityWellStrength()
+{
+    return m_gravityWellStrength;
+}
+
+/*
+====================
+ParticleEmitter::GetRate
+
+Returns a random rate between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetRate()
+{
+    return RandomizeRange(m_minRate, m_maxRate);
+}
+
+/*
+====================
+ParticleEmitter::GetColorRate
+
+Returns a random color between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetColorRate()
+{
+    return RandomizeRange(m_minColorRate, m_maxColorRate);
+}
+
+/*
+====================
+ParticleEmitter::GetWavyDistance
+
+Returns a random wavy distance between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetWavyDistance()
+{
+    return RandomizeRange(m_minWavyDist, m_maxWavyDist);
+}
+
+/*
+====================
+ParticleEmitter::GetDieTime
+
+Returns a random time at which the particle will stop, between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetDieTime(float currentTime)
+{
+    return currentTime + RandomizeRange(m_minLife, m_maxLife);
+}
+
+/*
+====================
+ParticleEmitter::GetBallLightningRadius
+
+Returns a random lightning radius between minimum and maximum
+====================
+*/
+int ParticleEmitter::GetBallLightningRadius()
+{
+    return RandomizeRange(m_minBallLightningRadius, m_maxBallLightningRadius);
+}
+
+/*
+====================
+ParticleEmitter::GetLightningVar
+
+Returns the maximum lightning value
+====================
+*/
+float ParticleEmitter::GetLightningVar()
+{
+    return m_lightningVar;
+}
+
+/*
+====================
+ParticleEmitter::GetLightningSubdivisions
+
+Returns the number of lightning subdivisions
+====================
+*/
+int ParticleEmitter::GetLightningSubdivisions()
+{
+    return m_lightningSubdivisions;
+}
+
+/*
+====================
+ParticleEmitter::IsWavy
+
+Returns whether or not this is a wavy particle
+====================
+*/
+qboolean ParticleEmitter::IsWavy()
+{
+    return m_wavy;
+}
+
+/*
+====================
+ParticleEmitter::IsGravityWell
+
+Returns whether or not this particle has gravity
+====================
+*/
+qboolean ParticleEmitter::IsGravityWell()
+{
+    return m_gravityWell;
+}
+
+/*
+====================
+ParticleEmitter::IsParticles
+
+Returns whether or not this contains particles
+====================
+*/
+qboolean ParticleEmitter::IsParticles()
+{
+    return m_particles;
+}
+
+/*
+====================
+ParticleEmitter::IsBallLightning
+
+Returns whether or not ball lightning can be applied
+====================
+*/
+qboolean ParticleEmitter::IsBallLightning()
+{
+    return m_ballLightning;
+}
+
+/*
+====================
+ParticleEmitter::IsSwarm
+
+Returns whether or not this is a swarm of particles
+====================
+*/
+qboolean ParticleEmitter::IsSwarm()
+{
+    return m_swarm;
+}
+
+/*
+====================
+ParticleEmitter::SetMinSpeed
+
+Sets the minimum speed
+====================
+*/
+void ParticleEmitter::SetMinSpeed(float value)
+{
+    m_minSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxSpeed
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetMaxSpeed(float value)
+{
+    m_maxSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngle
+
+Sets the angle/minimum angle
+====================
+*/
+void ParticleEmitter::SetAngle(float value)
+{
+    m_angle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngleVar
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetAngleVar(float value)
+{
+    m_angleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinAccSpeed
+
+Sets the minimum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMinAccSpeed(float value)
+{
+    m_minAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxAccSpeed
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMaxAccSpeed(float value)
+{
+    m_maxAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngle
+
+Sets the acceleration angle / minimum acceleration angle
+====================
+*/
+void ParticleEmitter::SetAccAngle(float value)
+{
+    m_accAngle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngleVar
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetAccAngleVar(float value)
+{
+    m_accAngleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinRate
+
+Sets the minimum rate
+====================
+*/
+void ParticleEmitter::SetMinRate(float value)
+{
+    m_minRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxRate
+
+Sets the maximum rate
+====================
+*/
+void ParticleEmitter::SetMaxRate(float value)
+{
+    m_maxRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetSrcColor
+
+Sets the source color
+====================
+*/
+void ParticleEmitter::SetSrcColor(int value)
+{
+    m_srcColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetDstColor
+
+Sets the destination color
+====================
+*/
+void ParticleEmitter::SetDstColor(int value)
+{
+    m_dstColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinColorRate
+
+Sets the minimum color rate
+====================
+*/
+void ParticleEmitter::SetMinColorRate(float value)
+{
+    m_minColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxColorRate
+
+Sets the maximum color rate
+====================
+*/
+void ParticleEmitter::SetMaxColorRate(float value)
+{
+    m_maxColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetWavy
+
+Sets whether or not this is a wavy particle
+====================
+*/
+void ParticleEmitter::SetWavy(int value)
+{
+    m_wavy = value;
+}
+
+/*
+====================
+ParticleEmitter::SetParticles
+
+Sets whether or not this contains particles
+====================
+*/
+void ParticleEmitter::SetParticles(int value)
+{
+    m_particles = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWell
+
+Sets whether or not this has gravity
+====================
+*/
+void ParticleEmitter::SetGravityWell(int value)
+{
+    m_gravityWell = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinWavyDist
+
+Sets the minimum wavy distance
+====================
+*/
+void ParticleEmitter::SetMinWavyDist(float value)
+{
+    m_minWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxWavyDist
+
+Sets the maximum wavy distance
+====================
+*/
+void ParticleEmitter::SetMaxWavyDist(float value)
+{
+    m_maxWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinLife
+
+Sets the minimum life
+====================
+*/
+void ParticleEmitter::SetMinLife(float value)
+{
+    m_minLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxLife
+
+Sets the maximum life
+====================
+*/
+void ParticleEmitter::SetMaxLife(float value)
+{
+    m_maxLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWellStrength
+
+Sets the strength of the gravity
+====================
+*/
+void ParticleEmitter::SetGravityWellStrength(float value)
+{
+    m_gravityWellStrength = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityEffectVector
+
+Sets the direction at which gravity is applied
+====================
+*/
+void ParticleEmitter::SetGravityEffectVector(Vector value)
+{
+    m_gravityEffectVector = value;
+}
+
+/*
+====================
+ParticleEmitter::SetBallLightning
+
+Sets whether or not it has ball lightning
+====================
+*/
+void ParticleEmitter::SetBallLightning(int value)
+{
+    m_ballLightning = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinBallLightningRadius
+
+Sets the minimum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMinBallLightningRadius(int value)
+{
+    m_minBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxBallLightningRadius
+
+Sets the maximum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMaxBallLightningRadius(int value)
+{
+    m_maxBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningVar
+
+Sets the maximum lightning value
+====================
+*/
+void ParticleEmitter::SetLightningVar(float value)
+{
+    m_lightningVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningSubdivisions
+
+Sets the number of subdivisions for the lightning
+====================
+*/
+void ParticleEmitter::SetLightningSubdivisions(int value)
+{
+    m_lightningSubdivisions = value;
+}
+
+/*
+====================
+ParticleEmitter::RandomizeRange
+
+Returns a random value between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+ParticleEmitter::RandomizeAngle
+
+Returns a random angle between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeAngle(float min, float max)
+{
+    return min + ((rand() - (RAND_MAX / 2)) / (float)RAND_MAX) * max;
+}
+
+/*
+====================
+ParticleEmitter::CalculateDirection
+
+Returns a random Vector direction based on the angle value
+====================
+*/
+Vector ParticleEmitter::CalculateDirection(float value)
+{
+    float deg = DEG2RAD(value);
+
+    return Vector(cos(deg), -sin(deg), 0);
+}
+
+/*
+====================
+ParticleEmitter::Load
+
+Loads the specified particle emitter from the string buffer
+====================
+*/
+void ParticleEmitter::Load(char **buf_p)
+{
+    m_position[0] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[1] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[2] = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_srcColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_dstColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_minLife = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxLife = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_angle       = atoi(COM_ParseExt(buf_p, qtrue));
+    m_angleVar    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngle    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngleVar = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_minAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_minWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_wavy        = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_particles = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_gravityWell         = atoi(COM_ParseExt(buf_p, qtrue));
+    m_gravityWellStrength = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_ballLightning          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningVar           = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningSubdivisions  = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_swarm          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmfrequency = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmdelta     = atoi(COM_ParseExt(buf_p, qtrue));
+}
+
+/*
+====================
+GhostTexture::GhostTexture
+====================
+*/
+GhostTexture::GhostTexture()
+{
+    m_image   = NULL;
+    m_texture = NULL;
+}
+
+/*
+====================
+GhostTexture::SetTexel
+
+Sets color at the specified xy texel location
+====================
+*/
+void GhostTexture::SetTexel(int x, int y, unsigned int color)
+{
+    m_texture[x + m_width * y] = color;
+}
+
+/*
+====================
+GhostTexture::Burn
+
+Applies fade/burn effect to the ghost texture
+====================
+*/
+void GhostTexture::Burn()
+{
+    int     x, y;
+    int     r, g, b;
+    GLint   pixel;
+    GLuint *line;
+
+    if (m_isfade) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (line[x] & 0xff) - m_faderate;
+                g = ((line[x] & 0xff00) >> 8) - m_faderate;
+                b = ((line[x] & 0xff0000) >> 16) - m_faderate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                line[x] = (r) | (g << 8) | (b << 16);
+            }
+        }
+    } else if (m_isburn) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (((line[m_width + x] & 0xff) + (line[x + 1] & 0xff) + (line[x - 1] & 0xff) + (line[x] & 0xff)) >> 2)
+                  - m_burnrate;
+                g = ((((line[m_width + x] & 0xFF00) >> 8) + ((line[x + 1] & 0xFF00) >> 8)
+                      + ((line[x - 1] & 0xFF00) >> 8) + ((line[x] & 0xFF00) >> 8))
+                     >> 2)
+                  - m_burnrate;
+                b = ((((line[m_width + x] & 0xFF0000) >> 16) + ((line[x + 1] & 0xFF0000) >> 16)
+                      + ((line[x - 1] & 0xFF0000) >> 16) + ((line[x] & 0xFF0000) >> 16))
+                     >> 2)
+                  - m_burnrate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                pixel = (r) | (g << 8) | (b << 16);
+                if (pixel > 0) {
+                    line[x] = pixel;
+                }
+            }
+        }
+    }
+
+    line = m_texture;
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+
+    for (y = 0; y < m_height; ++y) {
+        line[m_width * y]               = 0;
+        line[m_width - 1 + m_width * y] = 0;
+    }
+
+    line = &m_texture[m_width * (m_height - 1)];
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+}
+
+/*
+====================
+GhostTexture::ComputeOutCode
+
+Returns a flag value indicating if x/y variable reached xmin/xmax
+====================
+*/
+outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax)
+{
+    outcode code = 0;
+
+    if (y > ymax) {
+        code = 1;
+    } else if (y < ymin) {
+        code = 2;
+    }
+
+    if (x > xmax) {
+        code |= 4;
+    } else if (x < xmin) {
+        code |= 8;
+    }
+
+    return code;
+}
+
+/*
+====================
+GhostTexture::ClipAndDrawLine
+
+Draws a line from p0 to p1 with clipping
+====================
+*/
+void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
+{
+    int     x0, x1;
+    int     y0, y1;
+    int     d;
+    int     x, y;
+    int     ax, ay;
+    int     sx, sy;
+    int     dx, dy;
+    int     xmax, ymax;
+    bool    accept;
+    outcode outcode0;
+    outcode outcode1;
+
+    x0   = p0.x;
+    y0   = p0.y;
+    x1   = p1.x;
+    y1   = p1.y;
+    xmax = m_width - 1;
+    ymax = m_height - 1;
+
+    accept = false;
+
+    outcode0 = ComputeOutCode(x0, y0, 0, xmax, 0, ymax);
+    outcode1 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
+
+    while (outcode1 | outcode0) {
+        outcode outCodeOut;
+        if (outcode0 & outcode1) {
+            break;
+        }
+
+        outCodeOut = outcode0 ? outcode0 : outcode1;
+
+        if (outCodeOut & 1) {
+            x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0);
+            y = ymax;
+        } else if (outCodeOut & 2) {
+            x = x0 - y0 * (x1 - x0) / (y1 - y0);
+            y = 0;
+        } else if (outCodeOut & 4) {
+            x = xmax;
+            y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0);
+        } else if (outCodeOut * 8) {
+            x = 0;
+            y = y0 - x0 * (y1 - y0) / (x1 - x0);
+        } else {
+            x = x0;
+            y = y0;
+        }
+        if (outCodeOut == outcode0) {
+            y0       = y;
+            x0       = x;
+            outcode0 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        } else {
+            x1       = x;
+            y1       = y;
+            outcode1 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        }
+    }
+
+    accept = true;
+    if (!accept) {
+        return;
+    }
+
+    dx = x1 - x0;
+    if (dx < 0) {
+        dx = x0 - x1;
+    }
+    ax = dx * 2;
+    sx = dx >= 0 ? 1 : -1;
+
+    dy = y1 - y0;
+    if (dy < 0) {
+        dy = y0 - y1;
+    }
+    ay = dy * 2;
+    sy = dy >= 0 ? 1 : -1;
+
+    x = x0;
+    y = y0;
+
+    if (ax > ay) {
+        for (d = ay - (ax >> 1);; d += ay, x += sx) {
+            SetTexel(x, y, color);
+            if (x == x1) {
+                break;
+            }
+
+            if (d >= 0) {
+                y += sy;
+                d -= ax;
+            }
+        }
+    } else {
+        for (d = ax - (ay >> 1);; d += ax, y += sy) {
+            SetTexel(x, y, color);
+            if (y == y1) {
+                break;
+            }
+
+            if (d >= 0) {
+                x += sx;
+                d -= ay;
+            }
+        }
+    }
+}
+
+/*
+====================
+GhostTexture::RotateVector
+
+Rotates the vector from angle
+====================
+*/
+Vector GhostTexture::RotateVector(Vector v, float angle)
+{
+    Vector vec;
+    float  rad;
+
+    rad   = DEG2RAD(angle);
+    vec.x = cos(rad) * v.x - sin(rad) * v.y;
+    vec.y = cos(rad) * v.y + sin(rad) * v.x;
+    vec.z = 0;
+
+    return vec;
+}
+
+/*
+====================
+GhostTexture::GenerateLightning
+
+Generates a lightning effect
+====================
+*/
+void GhostTexture::GenerateLightning(
+    Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions
+)
+{
+    Vector mid;
+    Vector delta;
+    float  length;
+
+    if (numSubdivisions == maxSubdivisions) {
+        p1[0] += 0.5;
+        p1[1] += 0.5;
+        p2[0] += 0.5;
+        p2[1] += 0.5;
+        ClipAndDrawLine(p1, p2, color);
+
+        return;
+    }
+
+    delta  = p2 - p1;
+    length = delta.length() * 0.5;
+    delta.normalize();
+
+    mid = RotateVector(delta, RandomizeRange(-angleVar, angleVar));
+    mid = p1 + mid * length;
+
+    GenerateLightning(p1, mid, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+    GenerateLightning(mid, p2, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+}
+
+/*
+====================
+GhostTexture::Update
+
+Updates the ghost texture
+====================
+*/
+void GhostTexture::Update()
+{
+    Vector pos;
+    int    i, j;
+    int    numEmitters;
+    float  currentTime;
+
+    currentTime = tr.refdef.time / 1000.0;
+
+    numEmitters = m_emitterList.NumObjects();
+
+    for (i = 1; i <= numEmitters; i++) {
+        ParticleEmitter *pe = m_emitterList.ObjectAt(i);
+
+        if (pe->IsGravityWell()) {
+            break;
+        }
+
+        if (pe->IsBallLightning()) {
+            Vector p1, p2;
+
+            if (pe->GetBallLightningRadius()) {
+                p1 = pe->GetPosition();
+                p2 = pe->GetVelocityDirection();
+
+                p2 = p1 + p2 * pe->GetBallLightningRadius();
+                GenerateLightning(p1, p2, pe->GetSrcColor(), pe->GetLightningVar(), 0, pe->GetLightningSubdivisions());
+            }
+        } else if (pe->IsParticles()) {
+            pe->Emit(currentTime);
+        } else {
+            Vector p = pe->GetPosition();
+
+            SetTexel(p.x, p.y, pe->GetSrcColor());
+        }
+
+        for (j = pe->particleList.NumObjects(); j > 0; j--) {
+            Particle *p = pe->particleList.ObjectAt(j);
+
+            p->Update(currentTime);
+            if (p->m_position.x < m_width && p->m_position.x >= 0 && p->m_position.y < m_height && p->m_position.y >= 0
+                && currentTime <= p->GetDieTime()) {
+                SetTexel(p->m_position.x, p->m_position.y, p->m_color);
+            } else {
+                delete p;
+                pe->particleList.RemoveObjectAt(j);
+            }
+        }
+    }
+}
+
+/*
+====================
+R_UpdateGhostTextures
+
+Updates all ghost textures
+====================
+*/
+void R_UpdateGhostTextures()
+{
+    int i;
+    int numTextures;
+
+    frameTime = tr.refdef.time - lastTime;
+    lastTime  = tr.refdef.time;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        gt->Update();
+        gt->Burn();
+
+        GL_Bind(gt->m_image);
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, gt->m_width, gt->m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, gt->m_texture);
+    }
+}
+
+/*
+====================
+R_SetGhostImage
+
+Applies an image to the specified named ghost texture
+====================
+*/
+void R_SetGhostImage(const char *name, image_t *image)
+{
+    int i;
+    int numTextures;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        if (gt->m_name == name) {
+            gt->m_image = image;
+        }
+    }
+}
+
+/*
+====================
+LoadGHOST
+
+Loads a GHOST image file
+====================
+*/
+void LoadGHOST(const char *name, byte **pic, int *width, int *height)
+{
+    char         *buf_p;
+    char         *buffer;
+    int           numPixels;
+    int           numParticles;
+    int           i;
+    GhostTexture *gt;
+
+    if (ri.FS_ReadFile(name, (void **)&buffer) == -1) {
+        return;
+    }
+
+    buf_p = buffer;
+    COM_ParseExt(&buf_p, qtrue);
+
+    *width  = atoi(COM_ParseExt(&buf_p, qtrue));
+    *height = atoi(COM_ParseExt(&buf_p, qtrue));
+
+    numParticles = atoi(COM_ParseExt(&buf_p, qtrue));
+    numPixels    = *height * *width;
+    *pic         = new byte[numPixels * 4];
+
+    gt            = new GhostTexture();
+    gt->m_width   = *width;
+    gt->m_height  = *height;
+    gt->m_texture = new unsigned int[numPixels];
+
+    gt->m_isburn   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_burnrate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    gt->m_isfade   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_faderate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    ghostManager.m_textureList.AddObject(gt);
+
+    for (i = 0; i < numParticles; i++) {
+        ParticleEmitter *pe = new ParticleEmitter();
+        gt->m_emitterList.AddObject(pe);
+        pe->Load(&buf_p);
+    }
+}
diff --git a/code/renderergl1/tr_ghost.h b/code/renderergl1/tr_ghost.h
new file mode 100644
index 00000000..6c151ea6
--- /dev/null
+++ b/code/renderergl1/tr_ghost.h
@@ -0,0 +1,300 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "tr_local.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/container.h"
+#include "../qcommon/str.h"
+
+using outcode = unsigned int;
+
+class Particle
+{
+private:
+    float m_startTime;
+    float m_dieTime;
+
+    Vector m_velocity;
+    Vector m_acceleration;
+    Vector m_perp;
+
+    qboolean m_wavy;
+    float    m_wavyDist;
+    float    m_wavyOffset;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    int   m_deltaR;
+    int   m_deltaG;
+    int   m_deltaB;
+    int   m_srcR;
+    int   m_srcG;
+    int   m_srcB;
+    int   m_dstR;
+    int   m_dstG;
+    int   m_dstB;
+    float m_colorRate;
+
+    Vector m_realposition;
+
+    float m_life;
+    float m_maxspeed;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    Vector m_parentOrigin;
+
+public:
+    Vector m_position;
+    int    m_color;
+
+public:
+    Particle(
+        Vector   pos,
+        Vector   vel,
+        Vector   acc,
+        int      srcColor,
+        int      dstColor,
+        float    colorRate,
+        qboolean wavy,
+        float    wavyDist,
+        float    currentTime,
+        float    dieTime,
+        float    maxspeed,
+        Vector   parentOrg,
+        qboolean swarm,
+        int      freq,
+        int      delta
+    );
+
+    void  Update(float currentTime);
+    float GetDieTime();
+};
+
+class ParticleEmitter
+{
+private:
+    float m_time;
+    float m_lasttime;
+
+    Vector m_position;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    float m_minColorRate;
+    float m_maxColorRate;
+
+    float m_minRate;
+    float m_maxRate;
+
+    float m_minLife;
+    float m_maxLife;
+
+    float m_angle;
+    float m_angleVar;
+
+    float m_minSpeed;
+    float m_maxSpeed;
+    float m_accAngle;
+    float m_accAngleVar;
+    float m_minAccSpeed;
+    float m_maxAccSpeed;
+
+    float    m_minWavyDist;
+    float    m_maxWavyDist;
+    qboolean m_wavy;
+
+    qboolean m_gravityWell;
+    float    m_gravityWellStrength;
+
+    qboolean m_particles;
+    Vector   m_gravityEffectVector;
+
+    qboolean m_ballLightning;
+    int      m_minBallLightningRadius;
+    int      m_maxBallLightningRadius;
+    float    m_lightningVar;
+    int      m_lightningSubdivisions;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    int m_maxspeed;
+
+public:
+    Container<Particle *> particleList;
+
+public:
+    ParticleEmitter(
+        Vector   position,
+        float    minSpeed,
+        float    maxSpeed,
+        float    angle,
+        float    angleVar,
+        float    minAccSpeed,
+        float    maxAccSpeed,
+        float    accAngle,
+        float    accAngleVar,
+        float    minRate,
+        float    maxRate,
+        int      srcColor,
+        int      dstColor,
+        float    minColorRate,
+        float    maxColorRate,
+        qboolean wavy,
+        float    minWavyDist,
+        float    maxWavyDist,
+        float    minLife,
+        float    maxLife,
+        qboolean particles,
+        qboolean gravityWell,
+        float    gravityWellStrength,
+        qboolean ballLightning,
+        int      minBallLightningRadius,
+        int      maxBallLightningRadius,
+        float    lightningVar,
+        int      lightningSubdivisions,
+        qboolean swarm,
+        int      swarmfreq,
+        int      swarmdelta
+    );
+    ParticleEmitter();
+    ~ParticleEmitter();
+
+    void Emit(float currentTime);
+    void UpdateValues();
+
+    Vector GetPosition();
+    Vector GetVelocity();
+    Vector GetVelocityDirection();
+    Vector GetVelocityDirectionMin();
+    Vector GetVelocityDirectionMax();
+    Vector GetAcceleration();
+    Vector GetAccelerationDirection();
+    Vector GetAccelerationDirectionMin();
+    Vector GetAccelerationDirectionMax();
+
+    int GetSrcColor();
+    int GetDstColor();
+
+    float GetGravityWellStrength();
+    float GetRate();
+    float GetColorRate();
+
+    float GetWavyDistance();
+    float GetDieTime(float currentTime);
+    int   GetBallLightningRadius();
+    float GetLightningVar();
+    int   GetLightningSubdivisions();
+
+    qboolean IsWavy();
+    qboolean IsGravityWell();
+    qboolean IsParticles();
+    qboolean IsBallLightning();
+    qboolean IsSwarm();
+
+    void SetMinSpeed(float value);
+    void SetMaxSpeed(float value);
+
+    void SetAngle(float value);
+    void SetAngleVar(float value);
+
+    void SetMinAccSpeed(float value);
+    void SetMaxAccSpeed(float value);
+    void SetAccAngle(float value);
+    void SetAccAngleVar(float value);
+
+    void SetMinRate(float value);
+    void SetMaxRate(float value);
+
+    void SetSrcColor(int value);
+    void SetDstColor(int value);
+    void SetMinColorRate(float value);
+    void SetMaxColorRate(float value);
+
+    void SetWavy(int value);
+
+    void SetParticles(int value);
+    void SetGravityWell(int value);
+
+    void SetMinWavyDist(float value);
+    void SetMaxWavyDist(float value);
+
+    void SetMinLife(float value);
+    void SetMaxLife(float value);
+
+    void SetGravityWellStrength(float value);
+    void SetGravityEffectVector(Vector value);
+
+    void SetBallLightning(int value);
+    void SetMinBallLightningRadius(int value);
+    void SetMaxBallLightningRadius(int value);
+    void SetLightningVar(float value);
+    void SetLightningSubdivisions(int value);
+
+    float RandomizeRange(float minRange, float maxRange);
+    float RandomizeAngle(float minAngle, float maxAngle);
+
+    Vector CalculateDirection(float value);
+
+    void Load(char **buf_p);
+};
+
+class GhostTexture
+{
+public:
+    Container<ParticleEmitter *> m_emitterList;
+
+    int m_width;
+    int m_height;
+
+    image_t      *m_image;
+    unsigned int *m_texture;
+    str           m_name;
+
+    qboolean m_isburn;
+    qboolean m_isfade;
+    int      m_faderate;
+    int      m_burnrate;
+
+public:
+    GhostTexture();
+
+    void   Update();
+    void   SetTexel(int x, int y, unsigned int color);
+    void   Burn();
+    void   GenerateLightning(Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions);
+    Vector RotateVector(Vector v, float angle);
+    void   ClipAndDrawLine(Vector p0, Vector p1, int color);
+    outcode ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax);
+};
+
+class GhostManager
+{
+public:
+    Container<GhostTexture *> m_textureList;
+};
diff --git a/code/renderergl1/tr_image.c b/code/renderergl1/tr_image.c
index a63de580..e1a3f0d5 100644
--- a/code/renderergl1/tr_image.c
+++ b/code/renderergl1/tr_image.c
@@ -15,13 +15,31 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_image.c
 #include "tr_local.h"
 
+#include <setjmp.h>
+
+/*
+ * Include file for users of JPEG library.
+ * You will need to have included system headers that define at least
+ * the typedefs FILE and size_t before you can include jpeglib.h.
+ * (stdio.h is sufficient on ANSI-conforming systems.)
+ * You may also wish to include "jerror.h".
+ */
+
+#define JPEG_INTERNALS
+#include <jpeglib.h>
+
+
+static void LoadBMP( const char *name, byte **pic, int *width, int *height );
+static void LoadTGA( const char *name, byte **pic, int *width, int *height );
+static void LoadJPG( const char *name, byte **pic, int *width, int *height );
+
 static byte			 s_intensitytable[256];
 static unsigned char s_gammatable[256];
 
@@ -31,6 +49,8 @@ int		gl_filter_max = GL_LINEAR;
 #define FILE_HASH_SIZE		1024
 static	image_t*		hashTable[FILE_HASH_SIZE];
 
+extern qboolean scr_initialized;
+
 /*
 ** R_GammaCorrect
 */
@@ -112,8 +132,8 @@ void GL_TextureMode( const char *string ) {
 
 	// change all the existing mipmap texture objects
 	for ( i = 0 ; i < tr.numImages ; i++ ) {
-		glt = tr.images[ i ];
-		if ( glt->flags & IMGFLAG_MIPMAP ) {
+		glt = &tr.images[ i ];
+		if ( glt->numMipmaps && glt->texnum ) {
 			GL_Bind (glt);
 			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
 			qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
@@ -132,8 +152,8 @@ int R_SumOfUsedImages( void ) {
 
 	total = 0;
 	for ( i = 0; i < tr.numImages; i++ ) {
-		if ( tr.images[i]->frameUsed == tr.frameCount ) {
-			total += tr.images[i]->uploadWidth * tr.images[i]->uploadHeight;
+		if ( tr.images[i].frameUsed == tr.frameCount ) {
+			total += tr.images[i].uploadWidth * tr.images[i].uploadHeight;
 		}
 	}
 
@@ -146,139 +166,70 @@ R_ImageList_f
 ===============
 */
 void R_ImageList_f( void ) {
-	int i;
-	int estTotalSize = 0;
+	int		i;
+	image_t	*image;
+	int		texels;
+	const char *yesno[] = {
+		"no ", "yes"
+	};
 
-	ri.Printf(PRINT_ALL, "\n      -w-- -h-- type  -size- --name-------\n");
+	ri.Printf (PRINT_ALL, "\n      -w-- -h-- -mm- -TMU- -if-- wrap --name-------\n");
+	texels = 0;
 
-	for ( i = 0 ; i < tr.numImages ; i++ )
-	{
-		image_t *image = tr.images[i];
-		char *format = "???? ";
-		char *sizeSuffix;
-		int estSize;
-		int displaySize;
+	for ( i = 0 ; i < tr.numImages ; i++ ) {
+		image = &tr.images[ i ];
 
-		estSize = image->uploadHeight * image->uploadWidth;
-
-		switch(image->internalFormat)
-		{
-			case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
-				format = "sDXT1";
-				// 64 bits per 16 pixels, so 4 bits per pixel
-				estSize /= 2;
-				break;
-			case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-				format = "sDXT5";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB:
-				format = "sBPTC";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
-				format = "LATC ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
-				format = "DXT1 ";
-				// 64 bits per 16 pixels, so 4 bits per pixel
-				estSize /= 2;
-				break;
-			case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-				format = "DXT5 ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_COMPRESSED_RGBA_BPTC_UNORM_ARB:
-				format = "BPTC ";
-				// 128 bits per 16 pixels, so 1 byte per pixel
-				break;
-			case GL_RGB4_S3TC:
-				format = "S3TC ";
-				// same as DXT1?
-				estSize /= 2;
-				break;
-			case GL_RGBA4:
-			case GL_RGBA8:
-			case GL_RGBA:
-				format = "RGBA ";
-				// 4 bytes per pixel
-				estSize *= 4;
-				break;
-			case GL_LUMINANCE8:
-			case GL_LUMINANCE:
-				format = "L    ";
-				// 1 byte per pixel?
-				break;
-			case GL_RGB5:
-			case GL_RGB8:
-			case GL_RGB:
-				format = "RGB  ";
-				// 3 bytes per pixel?
-				estSize *= 3;
-				break;
-			case GL_LUMINANCE8_ALPHA8:
-			case GL_LUMINANCE_ALPHA:
-				format = "LA   ";
-				// 2 bytes per pixel?
-				estSize *= 2;
-				break;
-			case GL_SRGB_EXT:
-			case GL_SRGB8_EXT:
-				format = "sRGB ";
-				// 3 bytes per pixel?
-				estSize *= 3;
-				break;
-			case GL_SRGB_ALPHA_EXT:
-			case GL_SRGB8_ALPHA8_EXT:
-				format = "sRGBA";
-				// 4 bytes per pixel?
-				estSize *= 4;
-				break;
-			case GL_SLUMINANCE_EXT:
-			case GL_SLUMINANCE8_EXT:
-				format = "sL   ";
-				// 1 byte per pixel?
-				break;
-			case GL_SLUMINANCE_ALPHA_EXT:
-			case GL_SLUMINANCE8_ALPHA8_EXT:
-				format = "sLA  ";
-				// 2 byte per pixel?
-				estSize *= 2;
-				break;
+		texels += image->uploadWidth*image->uploadHeight;
+		ri.Printf (PRINT_ALL,  "%4i: %4i %4i  %s   %d   ",
+			i, image->uploadWidth, image->uploadHeight, yesno[image->numMipmaps], image->TMU );
+		switch ( image->internalFormat ) {
+		case 1:
+			ri.Printf( PRINT_ALL, "I    " );
+			break;
+		case 2:
+			ri.Printf( PRINT_ALL, "IA   " );
+			break;
+		case 3:
+			ri.Printf( PRINT_ALL, "RGB  " );
+			break;
+		case 4:
+			ri.Printf( PRINT_ALL, "RGBA " );
+			break;
+		case GL_RGBA8:
+			ri.Printf( PRINT_ALL, "RGBA8" );
+			break;
+		case GL_RGB8:
+			ri.Printf( PRINT_ALL, "RGB8" );
+			break;
+		case GL_RGB4_S3TC:
+			ri.Printf( PRINT_ALL, "S3TC " );
+			break;
+		case GL_RGBA4:
+			ri.Printf( PRINT_ALL, "RGBA4" );
+			break;
+		case GL_RGB5:
+			ri.Printf( PRINT_ALL, "RGB5 " );
+			break;
+		default:
+			ri.Printf( PRINT_ALL, "???? " );
 		}
 
-		// mipmap adds about 50%
-		if (image->flags & IMGFLAG_MIPMAP)
-			estSize += estSize / 2;
-
-		sizeSuffix = "b ";
-		displaySize = estSize;
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "kb";
+		switch ( image->wrapClampModeX ) {
+		case GL_REPEAT:
+			ri.Printf( PRINT_ALL, "rept " );
+			break;
+		case GL_CLAMP:
+			ri.Printf( PRINT_ALL, "clmp " );
+			break;
+		default:
+			ri.Printf( PRINT_ALL, "%4i ", image->wrapClampModeX );
+			break;
 		}
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "Mb";
-		}
-
-		if (displaySize > 1024)
-		{
-			displaySize /= 1024;
-			sizeSuffix = "Gb";
-		}
-
-		ri.Printf(PRINT_ALL, "%4i: %4ix%4i %s %4i%s %s\n", i, image->uploadWidth, image->uploadHeight, format, displaySize, sizeSuffix, image->imgName);
-		estTotalSize += estSize;
+		
+		ri.Printf( PRINT_ALL, " %s\n", image->imgName );
 	}
-
 	ri.Printf (PRINT_ALL, " ---------\n");
-	ri.Printf (PRINT_ALL, " approx %i bytes\n", estTotalSize);
+	ri.Printf (PRINT_ALL, " %i total texels (not including mipmaps)\n", texels);
 	ri.Printf (PRINT_ALL, " %i total images\n\n", tr.numImages );
 }
 
@@ -324,6 +275,7 @@ static void ResampleTexture( unsigned *in, int inwidth, int inheight, unsigned *
 	for (i=0 ; i<outheight ; i++, out += outwidth) {
 		inrow = in + inwidth*(int)((i+0.25)*inheight/outheight);
 		inrow2 = in + inwidth*(int)((i+0.75)*inheight/outheight);
+		frac = fracstep >> 1;
 		for (j=0 ; j<outwidth ; j++) {
 			pix1 = (byte *)inrow + p1[j];
 			pix2 = (byte *)inrow + p2[j];
@@ -347,6 +299,10 @@ lighting range
 */
 void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only_gamma )
 {
+	if (!tr.needsLightScale) {
+		return;
+	}
+
 	if ( only_gamma )
 	{
 		if ( !glConfig.deviceSupportsGamma )
@@ -395,63 +351,6 @@ void R_LightScaleTexture (unsigned *in, int inwidth, int inheight, qboolean only
 	}
 }
 
-
-/*
-================
-R_MipMap2
-
-Operates in place, quartering the size of the texture
-Proper linear filter
-================
-*/
-static void R_MipMap2( unsigned *in, int inWidth, int inHeight ) {
-	int			i, j, k;
-	byte		*outpix;
-	int			inWidthMask, inHeightMask;
-	int			total;
-	int			outWidth, outHeight;
-	unsigned	*temp;
-
-	outWidth = inWidth >> 1;
-	outHeight = inHeight >> 1;
-	temp = ri.Hunk_AllocateTempMemory( outWidth * outHeight * 4 );
-
-	inWidthMask = inWidth - 1;
-	inHeightMask = inHeight - 1;
-
-	for ( i = 0 ; i < outHeight ; i++ ) {
-		for ( j = 0 ; j < outWidth ; j++ ) {
-			outpix = (byte *) ( temp + i * outWidth + j );
-			for ( k = 0 ; k < 4 ; k++ ) {
-				total = 
-					1 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					1 * ((byte *)&in[ ((i*2-1)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					2 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					2 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					4 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+1)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k] +
-
-					1 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2-1)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2)&inWidthMask) ])[k] +
-					2 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2+1)&inWidthMask) ])[k] +
-					1 * ((byte *)&in[ ((i*2+2)&inHeightMask)*inWidth + ((j*2+2)&inWidthMask) ])[k];
-				outpix[k] = total / 36;
-			}
-		}
-	}
-
-	Com_Memcpy( in, temp, outWidth * outHeight * 4 );
-	ri.Hunk_FreeTempMemory( temp );
-}
-
 /*
 ================
 R_MipMap
@@ -464,11 +363,6 @@ static void R_MipMap (byte *in, int width, int height) {
 	byte	*out;
 	int		row;
 
-	if ( !r_simpleMipMaps->integer ) {
-		R_MipMap2( (unsigned *)in, width, height );
-		return;
-	}
-
 	if ( width == 1 && height == 1 ) {
 		return;
 	}
@@ -550,14 +444,22 @@ Upload32
 
 ===============
 */
-static void Upload32( unsigned *data, 
-						  int width, int height, 
-						  qboolean mipmap, 
-						  qboolean picmip, 
-							qboolean lightMap,
-						  qboolean allowCompression,
-						  int *format, 
-						  int *pUploadWidth, int *pUploadHeight )
+extern qboolean charSet;
+static void Upload32(
+	unsigned int* data,
+	int width,
+	int height,
+	int numMipmaps,
+	qboolean picmip, 
+	qboolean dynamicallyUpdated,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int* format,
+	int* pUploadWidth,
+	int* pUploadHeight,
+	int* bytesUsed,
+	qboolean bIsLightmap
+)
 {
 	int			samples;
 	unsigned	*scaledBuffer = NULL;
@@ -592,8 +494,8 @@ static void Upload32( unsigned *data,
 	// perform optional picmip operation
 	//
 	if ( picmip ) {
-		scaled_width >>= r_picmip->integer;
-		scaled_height >>= r_picmip->integer;
+		scaled_width >>= picmip;
+		scaled_height >>= picmip;
 	}
 
 	//
@@ -617,7 +519,8 @@ static void Upload32( unsigned *data,
 		scaled_height >>= 1;
 	}
 
-	scaledBuffer = ri.Hunk_AllocateTempMemory( sizeof( unsigned ) * scaled_width * scaled_height );
+	//scaledBuffer = ri.Hunk_AllocateTempMemory( 4 * scaled_width * scaled_height );
+	scaledBuffer = data;
 
 	//
 	// scan the texture for each channel's max values
@@ -626,37 +529,7 @@ static void Upload32( unsigned *data,
 	c = width*height;
 	scan = ((byte *)data);
 	samples = 3;
-
-	if( r_greyscale->integer )
-	{
-		for ( i = 0; i < c; i++ )
-		{
-			byte luma = LUMA(scan[i*4], scan[i*4 + 1], scan[i*4 + 2]);
-			scan[i*4] = luma;
-			scan[i*4 + 1] = luma;
-			scan[i*4 + 2] = luma;
-		}
-	}
-	else if( r_greyscale->value )
-	{
-		for ( i = 0; i < c; i++ )
-		{
-			float luma = LUMA(scan[i*4], scan[i*4 + 1], scan[i*4 + 2]);
-			scan[i*4] = LERP(scan[i*4], luma, r_greyscale->value);
-			scan[i*4 + 1] = LERP(scan[i*4 + 1], luma, r_greyscale->value);
-			scan[i*4 + 2] = LERP(scan[i*4 + 2], luma, r_greyscale->value);
-		}
-	}
-
-	if(lightMap)
-	{
-		if(r_greyscale->integer)
-			internalFormat = GL_LUMINANCE;
-		else
-			internalFormat = GL_RGB;
-	}
-	else
-	{
+	if (!bIsLightmap) {
 		for ( i = 0; i < c; i++ )
 		{
 			if ( scan[i*4+0] > rMax )
@@ -680,77 +553,81 @@ static void Upload32( unsigned *data,
 		// select proper internal format
 		if ( samples == 3 )
 		{
-			if(r_greyscale->integer)
+			if (!force32bit)
 			{
-				if(r_texturebits->integer == 16 || r_texturebits->integer == 32)
-					internalFormat = GL_LUMINANCE8;
-				else
-					internalFormat = GL_LUMINANCE;
-			}
-			else
-			{
-				if ( allowCompression && glConfig.textureCompression == TC_S3TC_ARB )
-				{
-					internalFormat = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-				}
-				else if ( allowCompression && glConfig.textureCompression == TC_S3TC )
-				{
-					internalFormat = GL_RGB4_S3TC;
-				}
-				else if ( r_texturebits->integer == 16 )
+				if (r_texturebits->integer == 16)
 				{
 					internalFormat = GL_RGB5;
 				}
-				else if ( r_texturebits->integer == 32 )
+				else if (r_texturebits->integer == 32)
 				{
 					internalFormat = GL_RGB8;
 				}
-				else
-				{
-					internalFormat = GL_RGB;
-				}
-			}
-		}
-		else if ( samples == 4 )
-		{
-			if(r_greyscale->integer)
-			{
-				if(r_texturebits->integer == 16 || r_texturebits->integer == 32)
-					internalFormat = GL_LUMINANCE8_ALPHA8;
-				else
-					internalFormat = GL_LUMINANCE_ALPHA;
-			}
-			else
-			{
-				if ( r_texturebits->integer == 16 )
+				else if (r_colorbits->integer == 16)
 				{
 					internalFormat = GL_RGBA4;
 				}
-				else if ( r_texturebits->integer == 32 )
+				else if (r_colorbits->integer == 32)
 				{
 					internalFormat = GL_RGBA8;
 				}
 				else
 				{
-					internalFormat = GL_RGBA;
+					internalFormat = 3;
 				}
 			}
+			else
+			{
+				internalFormat = GL_RGB8;
+			}
 		}
+		else if ( samples == 4 )
+		{
+			if (!force32bit)
+			{
+				if (r_texturebits->integer == 16)
+				{
+					internalFormat = GL_RGBA4;
+				}
+				else if (r_texturebits->integer == 32)
+				{
+					internalFormat = GL_RGBA8;
+				}
+				else if (r_colorbits->integer == 16)
+				{
+					internalFormat = GL_RGBA4;
+				}
+				else if (r_colorbits->integer == 32)
+				{
+					internalFormat = GL_RGBA8;
+				}
+				else
+				{
+					internalFormat = 4;
+				}
+			}
+			else
+			{
+				internalFormat = GL_RGBA8;
+			}
+		}
+	} else {
+		internalFormat = GL_RGB;
 	}
-
 	// copy or resample data as appropriate for first MIP level
 	if ( ( scaled_width == width ) && 
 		( scaled_height == height ) ) {
-		if (!mipmap)
+		if (!numMipmaps)
 		{
 			qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 			*pUploadWidth = scaled_width;
 			*pUploadHeight = scaled_height;
 			*format = internalFormat;
+			*bytesUsed = samples * scaled_width * scaled_height;
 
 			goto done;
 		}
-		Com_Memcpy (scaledBuffer, data, width*height*4);
+		//Com_Memcpy (scaledBuffer, data, width*height*4);
 	}
 	else
 	{
@@ -766,10 +643,10 @@ static void Upload32( unsigned *data,
 				height = 1;
 			}
 		}
-		Com_Memcpy( scaledBuffer, data, width * height * 4 );
+		//Com_Memcpy( scaledBuffer, data, width * height * 4 );
 	}
 
-	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !mipmap );
+	R_LightScaleTexture (scaledBuffer, scaled_width, scaled_height, !numMipmaps);
 
 	*pUploadWidth = scaled_width;
 	*pUploadHeight = scaled_height;
@@ -777,7 +654,9 @@ static void Upload32( unsigned *data,
 
 	qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, scaled_width, scaled_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, scaledBuffer );
 
-	if (mipmap)
+	*bytesUsed = samples * scaled_width * scaled_height;
+
+	if (numMipmaps)
 	{
 		int		miplevel;
 
@@ -802,7 +681,7 @@ static void Upload32( unsigned *data,
 	}
 done:
 
-	if (mipmap)
+	if (numMipmaps)
 	{
 		if ( textureFilterAnisotropic )
 			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
@@ -813,8 +692,8 @@ done:
 	}
 	else
 	{
-		if ( textureFilterAnisotropic )
-			qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1 );
+		if (textureFilterAnisotropic)
+			qglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1);
 
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
 		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
@@ -822,12 +701,130 @@ done:
 
 	GL_CheckErrors();
 
-	if ( scaledBuffer != 0 )
-		ri.Hunk_FreeTempMemory( scaledBuffer );
+	//if ( scaledBuffer != 0 )
+	//	ri.Hunk_FreeTempMemory( scaledBuffer );
 	if ( resampledBuffer != 0 )
 		ri.Hunk_FreeTempMemory( resampledBuffer );
 }
 
+static void UploadCompressed(
+	byte* data,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean picmip,
+	int glCompressMode,
+	int* format,
+	int* pUploadWidth,
+	int* pUploadHeight,
+	int* pBytesUsed
+) {
+	byte* offset;
+	int i;
+	int iStartImage;
+	int size;
+	int blockSize;
+	int scaled_width, scaled_height;
+
+	offset = data;
+	iStartImage = 0;
+	if (picmip > 0) {
+		iStartImage = picmip;
+	}
+
+	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable) {
+		iStartImage = iMipmapsAvailable - 1;
+	}
+
+	scaled_width = width;
+	scaled_height = height;
+	if (iStartImage)
+	{
+		scaled_width = width >> iStartImage;
+		scaled_height = height >> iStartImage;
+	}
+	while (scaled_width > glConfig.maxTextureSize || scaled_height > glConfig.maxTextureSize)
+	{
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+		++iStartImage;
+	}
+	if (iStartImage > 0 && iStartImage >= iMipmapsAvailable)
+	{
+		iStartImage = iMipmapsAvailable - 1;
+		scaled_width = width >> (iMipmapsAvailable - 1);
+		scaled_height = height >> (iMipmapsAvailable - 1);
+	}
+
+	*pUploadWidth = scaled_width;
+	*pUploadHeight = scaled_height;
+	*format = glCompressMode;
+	blockSize = 16;
+
+	if (glCompressMode == GL_COMPRESSED_RGB_S3TC_DXT1_EXT || glCompressMode == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT) {
+		blockSize = 8;
+	}
+
+	scaled_width = width;
+	scaled_height = height;
+
+	for (i = 0; i < iStartImage; i++) {
+		int w, h;
+
+		w = (scaled_width + 3) / 4;
+		if (w > 1) {
+			h = (scaled_height + 3) / 4;
+			if (h > 1) {
+				offset += blockSize * w * h;
+			}
+		}
+
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+
+		if (!scaled_width) scaled_width = 1;
+		if (!scaled_height) scaled_height = 1;
+	}
+
+	*pBytesUsed = 0;
+
+	while (scaled_width || scaled_height) {
+		int w, h;
+
+		if (!scaled_width) scaled_width = 1;
+		if (!scaled_height) scaled_height = 1;
+
+		h = (scaled_height + 3) / 4;
+		w = (scaled_width + 3) / 4;
+		size = blockSize * w * h;
+
+		if (w > 1 && h > 1) {
+			*pBytesUsed += size;
+		}
+
+		qglCompressedTexImage2D(GL_TEXTURE_2D, i - iStartImage, glCompressMode, scaled_width, scaled_height, 0, size, offset);
+		GL_CheckErrors();
+
+		if (i < iMipmapsAvailable && w > 1 && h > 1) {
+			offset += size;
+		}
+
+		scaled_width >>= 1;
+		scaled_height >>= 1;
+		i++;
+	}
+
+	if (numMipmaps > 1) {
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
+	} else {
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	}
+
+	GL_CheckErrors();
+}
 
 /*
 ================
@@ -836,39 +833,72 @@ R_CreateImage
 This is the only way any image_t are created
 ================
 */
-image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
-		imgType_t type, imgFlags_t flags, int internalFormat ) {
+image_t* R_CreateImageOld(
+	const char* name,
+	byte* pic,
+	int width,
+	int height,
+	int numMipmaps,
+	int iMipmapsAvailable,
+	qboolean allowPicmip,
+	qboolean force32bit,
+	qboolean hasAlpha,
+	int glCompressMode,
+	int glWrapClampModeX,
+	int glWrapClampModeY
+) {
 	image_t		*image;
 	qboolean	isLightmap = qfalse;
+	qboolean	dynamicallyUpdated = qfalse;
+	int i;
 	long		hash;
-	int         glWrapClampMode;
 
 	if (strlen(name) >= MAX_QPATH ) {
-		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long", name);
+		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long\n", name);
 	}
-	if ( !strncmp( name, "*lightmap", 9 ) ) {
+	if (!strncmp(name, "*lightmap", 9)) {
 		isLightmap = qtrue;
 	}
-
-	if ( tr.numImages == MAX_DRAWIMAGES ) {
-		ri.Error( ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit");
+	else if (!strncmp(name, "*lightmapD", 10)) {
+		dynamicallyUpdated = qtrue;
 	}
 
-	image = tr.images[tr.numImages] = ri.Hunk_Alloc( sizeof( image_t ), h_low );
-	qglGenTextures(1, &image->texnum);
-	tr.numImages++;
+	for (i = 0; i < tr.numImages; i++)
+	{
+		if (!tr.images[i].imgName[0])
+		{
+			// found a free image
+			break;
+		}
+	}
 
-	image->type = type;
-	image->flags = flags;
+	if (i == tr.numImages)
+    {
+        if (tr.numImages == MAX_DRAWIMAGES) {
+            ri.Error(ERR_DROP, "R_CreateImage: MAX_DRAWIMAGES hit\n");
+		} else {
+			tr.numImages++;
+		}
+	}
 
-	strcpy (image->imgName, name);
+	image = &tr.images[i];
+	//image->texnum = 1024 + i;
+    // Fixed in OPM / ioquake3
+    //  Original mohaa uses a fixed texnum instead of generating one regardless of the platform.
+    //  Here, by using glGenTextures, it will guarantee the uniqueness of the texture
+    qglGenTextures(1, &image->texnum);
+
+	image->numMipmaps = numMipmaps;
+	image->allowPicmip = allowPicmip;
+	image->dynamicallyUpdated = dynamicallyUpdated;
+	image->force32bit = force32bit;
+
+	Q_strncpyz (image->imgName, name, sizeof(image->imgName));
 
 	image->width = width;
 	image->height = height;
-	if (flags & IMGFLAG_CLAMPTOEDGE)
-		glWrapClampMode = haveClampToEdge ? GL_CLAMP_TO_EDGE : GL_CLAMP;
-	else
-		glWrapClampMode = GL_REPEAT;
+	image->wrapClampModeX = glWrapClampModeX;
+	image->wrapClampModeY = glWrapClampModeY;
 
 	// lightmaps are always allocated on TMU 1
 	if ( qglActiveTextureARB && isLightmap ) {
@@ -883,21 +913,45 @@ image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
 
 	GL_Bind(image);
 
-	Upload32( (unsigned *)pic, image->width, image->height, 
-								image->flags & IMGFLAG_MIPMAP,
-								image->flags & IMGFLAG_PICMIP,
-								isLightmap,
-								!(image->flags & IMGFLAG_NO_COMPRESSION),
-								&image->internalFormat,
-								&image->uploadWidth,
-								&image->uploadHeight );
+	if (glCompressMode) {
+		UploadCompressed(
+			(byte*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			iMipmapsAvailable,
+			allowPicmip,
+			glCompressMode,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed
+		);
+	}
+	else {
+		Upload32(
+			(unsigned int*)pic,
+			image->width,
+			image->height,
+			image->numMipmaps,
+			allowPicmip,
+			image->dynamicallyUpdated,
+			force32bit,
+			hasAlpha,
+			&image->internalFormat,
+			&image->uploadWidth,
+			&image->uploadHeight,
+			&image->bytesUsed,
+			isLightmap
+		);
+	}
 
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampMode );
-	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampMode );
+	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glWrapClampModeX );
+	qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, glWrapClampModeY );
 
-	glState.currenttextures[glState.currenttmu] = 0;
 	qglBindTexture( GL_TEXTURE_2D, 0 );
 
+	glState.currenttextures[image->TMU] = -1;
 	if ( image->TMU == 1 ) {
 		GL_SelectTexture( 0 );
 	}
@@ -905,111 +959,1512 @@ image_t *R_CreateImage( const char *name, byte *pic, int width, int height,
 	hash = generateHashValue(name);
 	image->next = hashTable[hash];
 	hashTable[hash] = image;
+	image->r_sequence = r_sequencenumber;
 
 	return image;
 }
 
-//===================================================================
 
+/*
+=========================================================
+
+BMP LOADING
+
+=========================================================
+*/
 typedef struct
 {
-	char *ext;
-	void (*ImageLoader)( const char *, unsigned char **, int *, int * );
-} imageExtToLoaderMap_t;
+	char id[2];
+	unsigned long fileSize;
+	unsigned long reserved0;
+	unsigned long bitmapDataOffset;
+	unsigned long bitmapHeaderSize;
+	unsigned long width;
+	unsigned long height;
+	unsigned short planes;
+	unsigned short bitsPerPixel;
+	unsigned long compression;
+	unsigned long bitmapDataSize;
+	unsigned long hRes;
+	unsigned long vRes;
+	unsigned long colors;
+	unsigned long importantColors;
+	unsigned char palette[256][4];
+} BMPHeader_t;
 
-// Note that the ordering indicates the order of preference used
-// when there are multiple images of different formats available
-static imageExtToLoaderMap_t imageLoaders[ ] =
+static void LoadBMP( const char *name, byte **pic, int *width, int *height )
 {
-	{ "tga",  R_LoadTGA },
-	{ "jpg",  R_LoadJPG },
-	{ "jpeg", R_LoadJPG },
-	{ "png",  R_LoadPNG },
-	{ "pcx",  R_LoadPCX },
-	{ "bmp",  R_LoadBMP }
-};
+	int		columns, rows, numPixels;
+	byte	*pixbuf;
+	int		row, column;
+	byte	*buf_p;
+	byte	*buffer;
+	int		length;
+	BMPHeader_t bmpHeader;
+	byte		*bmpRGBA;
 
-static int numImageLoaders = ARRAY_LEN( imageLoaders );
+	*pic = NULL;
+
+	//
+	// load the file
+	//
+	length = ri.FS_ReadFile( ( char * ) name, (void **)&buffer);
+	if (!buffer) {
+		return;
+	}
+
+	buf_p = buffer;
+
+	bmpHeader.id[0] = *buf_p++;
+	bmpHeader.id[1] = *buf_p++;
+	bmpHeader.fileSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.reserved0 = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapDataOffset = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapHeaderSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.width = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.height = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.planes = LittleShort( * ( short * ) buf_p );
+	buf_p += 2;
+	bmpHeader.bitsPerPixel = LittleShort( * ( short * ) buf_p );
+	buf_p += 2;
+	bmpHeader.compression = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.bitmapDataSize = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.hRes = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.vRes = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.colors = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+	bmpHeader.importantColors = LittleLong( * ( long * ) buf_p );
+	buf_p += 4;
+
+	Com_Memcpy( bmpHeader.palette, buf_p, sizeof( bmpHeader.palette ) );
+
+	if ( bmpHeader.bitsPerPixel == 8 )
+		buf_p += 1024;
+
+	if ( bmpHeader.id[0] != 'B' && bmpHeader.id[1] != 'M' ) 
+	{
+		ri.Error( ERR_DROP, "LoadBMP: only Windows-style BMP files supported (%s)\n", name );
+	}
+	if ( bmpHeader.fileSize != length )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%lu vs. %d) (%s)\n", bmpHeader.fileSize, length, name );
+	}
+	if ( bmpHeader.compression != 0 )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: only uncompressed BMP files supported (%s)\n", name );
+	}
+	if ( bmpHeader.bitsPerPixel < 8 )
+	{
+		ri.Error( ERR_DROP, "LoadBMP: monochrome and 4-bit BMP files not supported (%s)\n", name );
+	}
+
+	columns = bmpHeader.width;
+	rows = bmpHeader.height;
+	if ( rows < 0 )
+		rows = -rows;
+	numPixels = columns * rows;
+
+	if ( width ) 
+		*width = columns;
+	if ( height )
+		*height = rows;
+
+	bmpRGBA = ri.Malloc( numPixels * 4 );
+	*pic = bmpRGBA;
+
+
+	for ( row = rows-1; row >= 0; row-- )
+	{
+		pixbuf = bmpRGBA + row*columns*4;
+
+		for ( column = 0; column < columns; column++ )
+		{
+			unsigned char red, green, blue, alpha;
+			int palIndex;
+			unsigned short shortPixel;
+
+			switch ( bmpHeader.bitsPerPixel )
+			{
+			case 8:
+				palIndex = *buf_p++;
+				*pixbuf++ = bmpHeader.palette[palIndex][2];
+				*pixbuf++ = bmpHeader.palette[palIndex][1];
+				*pixbuf++ = bmpHeader.palette[palIndex][0];
+				*pixbuf++ = 0xff;
+				break;
+			case 16:
+				shortPixel = * ( unsigned short * ) pixbuf;
+				pixbuf += 2;
+				*pixbuf++ = ( shortPixel & ( 31 << 10 ) ) >> 7;
+				*pixbuf++ = ( shortPixel & ( 31 << 5 ) ) >> 2;
+				*pixbuf++ = ( shortPixel & ( 31 ) ) << 3;
+				*pixbuf++ = 0xff;
+				break;
+
+			case 24:
+				blue = *buf_p++;
+				green = *buf_p++;
+				red = *buf_p++;
+				*pixbuf++ = red;
+				*pixbuf++ = green;
+				*pixbuf++ = blue;
+				*pixbuf++ = 255;
+				break;
+			case 32:
+				blue = *buf_p++;
+				green = *buf_p++;
+				red = *buf_p++;
+				alpha = *buf_p++;
+				*pixbuf++ = red;
+				*pixbuf++ = green;
+				*pixbuf++ = blue;
+				*pixbuf++ = alpha;
+				break;
+			default:
+				ri.Error( ERR_DROP, "LoadBMP: illegal pixel_size '%d' in file '%s'\n", bmpHeader.bitsPerPixel, name );
+				break;
+			}
+		}
+	}
+
+	ri.FS_FreeFile( buffer );
+
+}
+
+
+/*
+=================================================================
+
+PCX LOADING
+
+=================================================================
+*/
+
+
+/*
+==============
+LoadPCX
+==============
+*/
+static void LoadPCX ( const char *filename, byte **pic, byte **palette, int *width, int *height)
+{
+	byte	*raw;
+	pcx_t	*pcx;
+	int		x, y;
+	int		len;
+	int		dataByte, runLength;
+	byte	*out, *pix;
+	int		xmax, ymax;
+
+	*pic = NULL;
+	*palette = NULL;
+
+	//
+	// load the file
+	//
+	len = ri.FS_ReadFile( ( char * ) filename, (void **)&raw);
+	if (!raw) {
+		return;
+	}
+
+	//
+	// parse the PCX file
+	//
+	pcx = (pcx_t *)raw;
+	raw = (byte*)pcx->data;
+
+  	xmax = LittleShort(pcx->xmax);
+    ymax = LittleShort(pcx->ymax);
+
+	if (pcx->manufacturer != 0x0a
+		|| pcx->version != 5
+		|| pcx->encoding != 1
+		|| pcx->bits_per_pixel != 8
+		|| xmax >= 1024
+		|| ymax >= 1024)
+	{
+		ri.Printf (PRINT_ALL, "Bad pcx file %s (%i x %i) (%i x %i)\n", filename, xmax+1, ymax+1, pcx->xmax, pcx->ymax);
+		return;
+	}
+
+	out = ri.Malloc ( (ymax+1) * (xmax+1) );
+
+	*pic = out;
+
+	pix = out;
+
+	if (palette)
+	{
+		*palette = ri.Malloc(768);
+		Com_Memcpy (*palette, (byte *)pcx + len - 768, 768);
+	}
+
+	if (width)
+		*width = xmax+1;
+	if (height)
+		*height = ymax+1;
+// FIXME: use bytes_per_line here?
+
+	for (y=0 ; y<=ymax ; y++, pix += xmax+1)
+	{
+		for (x=0 ; x<=xmax ; )
+		{
+			dataByte = *raw++;
+
+			if((dataByte & 0xC0) == 0xC0)
+			{
+				runLength = dataByte & 0x3F;
+				dataByte = *raw++;
+			}
+			else
+				runLength = 1;
+
+			while(runLength-- > 0)
+				pix[x++] = dataByte;
+		}
+
+	}
+
+	if ( raw - (byte *)pcx > len)
+	{
+		ri.Printf (PRINT_DEVELOPER, "PCX file %s was malformed", filename);
+		ri.Free (*pic);
+		*pic = NULL;
+	}
+
+	ri.FS_FreeFile (pcx);
+}
+
+
+/*
+==============
+LoadPCX32
+==============
+*/
+static void LoadPCX32 ( const char *filename, byte **pic, int *width, int *height) {
+	byte	*palette;
+	byte	*pic8;
+	int		i, c, p;
+	byte	*pic32;
+
+	LoadPCX (filename, &pic8, &palette, width, height);
+	if (!pic8) {
+		*pic = NULL;
+		return;
+	}
+
+	c = (*width) * (*height);
+	pic32 = *pic = ri.Malloc(4 * c );
+	for (i = 0 ; i < c ; i++) {
+		p = pic8[i];
+		pic32[0] = palette[p*3];
+		pic32[1] = palette[p*3 + 1];
+		pic32[2] = palette[p*3 + 2];
+		pic32[3] = 255;
+		pic32 += 4;
+	}
+
+	ri.Free (pic8);
+	ri.Free (palette);
+}
+
+//==========================
+//
+// DDS Loading
+//
+//==========================
+
+typedef unsigned int   ui32_t;
+
+typedef struct ddsHeader_s
+{
+	ui32_t headerSize;
+	ui32_t flags;
+	ui32_t height;
+	ui32_t width;
+	ui32_t pitchOrFirstMipSize;
+	ui32_t volumeDepth;
+	ui32_t numMips;
+	ui32_t reserved1[11];
+	ui32_t always_0x00000020;
+	ui32_t pixelFormatFlags;
+	ui32_t fourCC;
+	ui32_t rgbBitCount;
+	ui32_t rBitMask;
+	ui32_t gBitMask;
+	ui32_t bBitMask;
+	ui32_t aBitMask;
+	ui32_t caps;
+	ui32_t caps2;
+	ui32_t caps3;
+	ui32_t caps4;
+	ui32_t reserved2;
+}
+ddsHeader_t;
+
+// flags:
+#define _DDSFLAGS_REQUIRED     0x001007
+#define _DDSFLAGS_PITCH        0x8
+#define _DDSFLAGS_MIPMAPCOUNT  0x20000
+#define _DDSFLAGS_FIRSTMIPSIZE 0x80000
+#define _DDSFLAGS_VOLUMEDEPTH  0x800000
+
+// pixelFormatFlags:
+#define DDSPF_ALPHAPIXELS 0x1
+#define DDSPF_ALPHA       0x2
+#define DDSPF_FOURCC      0x4
+#define DDSPF_RGB         0x40
+#define DDSPF_YUV         0x200
+#define DDSPF_LUMINANCE   0x20000
+
+// caps:
+#define DDSCAPS_COMPLEX  0x8
+#define DDSCAPS_MIPMAP   0x400000
+#define DDSCAPS_REQUIRED 0x1000
+
+// caps2:
+#define DDSCAPS2_CUBEMAP 0xFE00
+#define DDSCAPS2_VOLUME  0x200000
+
+typedef struct ddsHeaderDxt10_s
+{
+	ui32_t dxgiFormat;
+	ui32_t dimensions;
+	ui32_t miscFlags;
+	ui32_t arraySize;
+	ui32_t miscFlags2;
+}
+ddsHeaderDxt10_t;
+
+// dxgiFormat
+// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb173059%28v=vs.85%29.aspx
+typedef enum DXGI_FORMAT {
+	DXGI_FORMAT_UNKNOWN = 0,
+	DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
+	DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
+	DXGI_FORMAT_R32G32B32A32_UINT = 3,
+	DXGI_FORMAT_R32G32B32A32_SINT = 4,
+	DXGI_FORMAT_R32G32B32_TYPELESS = 5,
+	DXGI_FORMAT_R32G32B32_FLOAT = 6,
+	DXGI_FORMAT_R32G32B32_UINT = 7,
+	DXGI_FORMAT_R32G32B32_SINT = 8,
+	DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
+	DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
+	DXGI_FORMAT_R16G16B16A16_UNORM = 11,
+	DXGI_FORMAT_R16G16B16A16_UINT = 12,
+	DXGI_FORMAT_R16G16B16A16_SNORM = 13,
+	DXGI_FORMAT_R16G16B16A16_SINT = 14,
+	DXGI_FORMAT_R32G32_TYPELESS = 15,
+	DXGI_FORMAT_R32G32_FLOAT = 16,
+	DXGI_FORMAT_R32G32_UINT = 17,
+	DXGI_FORMAT_R32G32_SINT = 18,
+	DXGI_FORMAT_R32G8X24_TYPELESS = 19,
+	DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
+	DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
+	DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
+	DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
+	DXGI_FORMAT_R10G10B10A2_UNORM = 24,
+	DXGI_FORMAT_R10G10B10A2_UINT = 25,
+	DXGI_FORMAT_R11G11B10_FLOAT = 26,
+	DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
+	DXGI_FORMAT_R8G8B8A8_UNORM = 28,
+	DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
+	DXGI_FORMAT_R8G8B8A8_UINT = 30,
+	DXGI_FORMAT_R8G8B8A8_SNORM = 31,
+	DXGI_FORMAT_R8G8B8A8_SINT = 32,
+	DXGI_FORMAT_R16G16_TYPELESS = 33,
+	DXGI_FORMAT_R16G16_FLOAT = 34,
+	DXGI_FORMAT_R16G16_UNORM = 35,
+	DXGI_FORMAT_R16G16_UINT = 36,
+	DXGI_FORMAT_R16G16_SNORM = 37,
+	DXGI_FORMAT_R16G16_SINT = 38,
+	DXGI_FORMAT_R32_TYPELESS = 39,
+	DXGI_FORMAT_D32_FLOAT = 40,
+	DXGI_FORMAT_R32_FLOAT = 41,
+	DXGI_FORMAT_R32_UINT = 42,
+	DXGI_FORMAT_R32_SINT = 43,
+	DXGI_FORMAT_R24G8_TYPELESS = 44,
+	DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
+	DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
+	DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
+	DXGI_FORMAT_R8G8_TYPELESS = 48,
+	DXGI_FORMAT_R8G8_UNORM = 49,
+	DXGI_FORMAT_R8G8_UINT = 50,
+	DXGI_FORMAT_R8G8_SNORM = 51,
+	DXGI_FORMAT_R8G8_SINT = 52,
+	DXGI_FORMAT_R16_TYPELESS = 53,
+	DXGI_FORMAT_R16_FLOAT = 54,
+	DXGI_FORMAT_D16_UNORM = 55,
+	DXGI_FORMAT_R16_UNORM = 56,
+	DXGI_FORMAT_R16_UINT = 57,
+	DXGI_FORMAT_R16_SNORM = 58,
+	DXGI_FORMAT_R16_SINT = 59,
+	DXGI_FORMAT_R8_TYPELESS = 60,
+	DXGI_FORMAT_R8_UNORM = 61,
+	DXGI_FORMAT_R8_UINT = 62,
+	DXGI_FORMAT_R8_SNORM = 63,
+	DXGI_FORMAT_R8_SINT = 64,
+	DXGI_FORMAT_A8_UNORM = 65,
+	DXGI_FORMAT_R1_UNORM = 66,
+	DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
+	DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
+	DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
+	DXGI_FORMAT_BC1_TYPELESS = 70,
+	DXGI_FORMAT_BC1_UNORM = 71,
+	DXGI_FORMAT_BC1_UNORM_SRGB = 72,
+	DXGI_FORMAT_BC2_TYPELESS = 73,
+	DXGI_FORMAT_BC2_UNORM = 74,
+	DXGI_FORMAT_BC2_UNORM_SRGB = 75,
+	DXGI_FORMAT_BC3_TYPELESS = 76,
+	DXGI_FORMAT_BC3_UNORM = 77,
+	DXGI_FORMAT_BC3_UNORM_SRGB = 78,
+	DXGI_FORMAT_BC4_TYPELESS = 79,
+	DXGI_FORMAT_BC4_UNORM = 80,
+	DXGI_FORMAT_BC4_SNORM = 81,
+	DXGI_FORMAT_BC5_TYPELESS = 82,
+	DXGI_FORMAT_BC5_UNORM = 83,
+	DXGI_FORMAT_BC5_SNORM = 84,
+	DXGI_FORMAT_B5G6R5_UNORM = 85,
+	DXGI_FORMAT_B5G5R5A1_UNORM = 86,
+	DXGI_FORMAT_B8G8R8A8_UNORM = 87,
+	DXGI_FORMAT_B8G8R8X8_UNORM = 88,
+	DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
+	DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
+	DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
+	DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
+	DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
+	DXGI_FORMAT_BC6H_TYPELESS = 94,
+	DXGI_FORMAT_BC6H_UF16 = 95,
+	DXGI_FORMAT_BC6H_SF16 = 96,
+	DXGI_FORMAT_BC7_TYPELESS = 97,
+	DXGI_FORMAT_BC7_UNORM = 98,
+	DXGI_FORMAT_BC7_UNORM_SRGB = 99,
+	DXGI_FORMAT_AYUV = 100,
+	DXGI_FORMAT_Y410 = 101,
+	DXGI_FORMAT_Y416 = 102,
+	DXGI_FORMAT_NV12 = 103,
+	DXGI_FORMAT_P010 = 104,
+	DXGI_FORMAT_P016 = 105,
+	DXGI_FORMAT_420_OPAQUE = 106,
+	DXGI_FORMAT_YUY2 = 107,
+	DXGI_FORMAT_Y210 = 108,
+	DXGI_FORMAT_Y216 = 109,
+	DXGI_FORMAT_NV11 = 110,
+	DXGI_FORMAT_AI44 = 111,
+	DXGI_FORMAT_IA44 = 112,
+	DXGI_FORMAT_P8 = 113,
+	DXGI_FORMAT_A8P8 = 114,
+	DXGI_FORMAT_B4G4R4A4_UNORM = 115,
+	DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
+} DXGI_FORMAT;
+
+#define EncodeFourCC(x) ((((ui32_t)((x)[0]))      ) | \
+                         (((ui32_t)((x)[1])) << 8 ) | \
+                         (((ui32_t)((x)[2])) << 16) | \
+                         (((ui32_t)((x)[3])) << 24) )
+
+
+static void LoadDDS(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
+	int len;
+	unsigned int signature;
+	ddsHeader_t ddsHeader;
+	ddsHeaderDxt10_t* ddsHeaderDxt10 = NULL;
+	fileHandle_t handle;
+	byte* data;
+	int w, h;
+	int minWidth, minHeight;
+	int numMips = 0;
+	int size;
+	int intSize;
+
+	*pic = NULL;
+	*piMipmapsAvailable = 0;
+
+	if (width)
+		*width = 0;
+	if (height)
+		*height = 0;
+
+	//
+	// load the file
+	//
+	len = ri.FS_OpenFile((char*)name, &handle, qtrue, qtrue);
+	if (len < 0) {
+		return;
+	}
+
+	//
+	// reject files that are too small to hold even a header
+	//
+	if (len < 4 + sizeof(ddsHeader))
+	{
+		ri.Printf(PRINT_ALL, "File %s is too small to be a DDS file.\n", name);
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	//
+	// reject files that don't start with "DDS "
+	//
+	ri.FS_Read(&signature, sizeof(signature), handle);
+	if (strncmp((const char*)&signature, "DDS ", 4))
+	{
+		ri.Printf(PRINT_ALL, "File %s is not a DDS file.\n", name);
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	ri.FS_Read(&ddsHeader, sizeof(ddsHeader), handle);
+
+	ddsHeader.headerSize = LittleLong(ddsHeader.headerSize);
+	ddsHeader.flags = LittleLong(ddsHeader.flags);
+	ddsHeader.width = LittleLong(ddsHeader.width);
+	ddsHeader.height = LittleLong(ddsHeader.height);
+	ddsHeader.numMips = LittleLong(ddsHeader.numMips);
+	ddsHeader.pitchOrFirstMipSize = LittleLong(ddsHeader.pitchOrFirstMipSize);
+	ddsHeader.fourCC = LittleLong(ddsHeader.fourCC);
+
+	//
+	// Convert DXGI format/FourCC into OpenGL format
+	//
+	if (ddsHeader.fourCC == EncodeFourCC("DXT1")) {
+		intSize = 2;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT2")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT3")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT4")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else if (ddsHeader.fourCC == EncodeFourCC("DXT5")) {
+		intSize = 4;
+		*glCompressMode = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+	} else {
+		ri.FS_CloseFile(handle);
+		return;
+	}
+
+	minWidth = ddsHeader.width;
+	for (w = 1; w < ddsHeader.width; w *= 2) {}
+
+	minHeight = ddsHeader.height;
+	for (h = 1; h < ddsHeader.height; h *= 2) {}
+
+	if (w != ddsHeader.width || h != ddsHeader.height) {
+		ri.FS_CloseFile(handle);
+		if (w == ddsHeader.width) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - height not a power of 2\n", name);
+		} else if (h == ddsHeader.height) {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width not a power of 2\n", name);
+		} else {
+			ri.Printf(PRINT_DEVELOPER, "LoadDDS: Image %s - width and height not a powers of 2\n", name);
+		}
+
+		return;
+	}
+
+	//
+	// Parse width and height
+	//
+	if (!minWidth) {
+		minWidth = 1;
+	}
+	*width = minWidth;
+
+	if (!minHeight) {
+		minHeight = 1;
+	}
+	*height = minHeight;
+
+	*hasAlpha = ddsHeader.fourCC != EncodeFourCC("DXT1");
+
+	numMips = ddsHeader.numMips;
+	if (!numMips) {
+		numMips = 1;
+	}
+
+	*piMipmapsAvailable = numMips;
+	if (*numMipmaps) {
+		*numMipmaps = numMips;
+	}
+
+	size = ddsHeader.pitchOrFirstMipSize;
+	if (*piMipmapsAvailable > 1) {
+		size = intSize * ddsHeader.pitchOrFirstMipSize;
+	}
+
+	*pic = ri.Malloc(size);
+	ri.FS_Read(*pic, size, handle);
+
+	ri.FS_CloseFile(handle);
+}
+
+/*
+=========================================================
+
+TARGA LOADING
+
+=========================================================
+*/
+
+/*
+=============
+LoadTGA
+=============
+*/
+static void LoadTGA ( const char *name, byte **pic, int *width, int *height)
+{
+	int		columns, rows, numPixels;
+	byte	*pixbuf;
+	int		row, column;
+	byte	*buf_p;
+	byte	*buffer;
+	TargaHeader	targa_header;
+	byte		*targa_rgba;
+
+	*pic = NULL;
+
+	//
+	// load the file
+	//
+	ri.FS_ReadFile ( ( char * ) name, (void **)&buffer);
+	if (!buffer) {
+		return;
+	}
+
+	buf_p = buffer;
+
+	targa_header.id_length = *buf_p++;
+	targa_header.colormap_type = *buf_p++;
+	targa_header.image_type = *buf_p++;
+	
+	targa_header.colormap_index = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.colormap_length = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.colormap_size = *buf_p++;
+	targa_header.x_origin = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.y_origin = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.width = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.height = LittleShort ( *(short *)buf_p );
+	buf_p += 2;
+	targa_header.pixel_size = *buf_p++;
+	targa_header.attributes = *buf_p++;
+
+	if (targa_header.image_type!=2 
+		&& targa_header.image_type!=10
+		&& targa_header.image_type != 3 ) 
+	{
+		ri.Error (ERR_DROP, "LoadTGA: Only type 2 (RGB), 3 (gray), and 10 (RGB) TGA images supported\n");
+	}
+
+	if ( targa_header.colormap_type != 0 )
+	{
+		ri.Error( ERR_DROP, "LoadTGA: colormaps not supported\n" );
+	}
+
+	if ( ( targa_header.pixel_size != 32 && targa_header.pixel_size != 24 ) && targa_header.image_type != 3 )
+	{
+		ri.Error (ERR_DROP, "LoadTGA: Only 32 or 24 bit images supported (no colormaps)\n");
+	}
+
+	columns = targa_header.width;
+	rows = targa_header.height;
+	numPixels = columns * rows;
+
+	if (width)
+		*width = columns;
+	if (height)
+		*height = rows;
+
+	targa_rgba = ri.Malloc (numPixels*4);
+	*pic = targa_rgba;
+
+	if (targa_header.id_length != 0)
+		buf_p += targa_header.id_length;  // skip TARGA image comment
+	
+	if ( targa_header.image_type==2 || targa_header.image_type == 3 )
+	{ 
+		// Uncompressed RGB or gray scale image
+		for(row=rows-1; row>=0; row--) 
+		{
+			pixbuf = targa_rgba + row*columns*4;
+			for(column=0; column<columns; column++) 
+			{
+				unsigned char red,green,blue,alphabyte;
+				switch (targa_header.pixel_size) 
+				{
+					
+				case 8:
+					blue = *buf_p++;
+					green = blue;
+					red = blue;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = 255;
+					break;
+
+				case 24:
+					blue = *buf_p++;
+					green = *buf_p++;
+					red = *buf_p++;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = 255;
+					break;
+				case 32:
+					blue = *buf_p++;
+					green = *buf_p++;
+					red = *buf_p++;
+					alphabyte = *buf_p++;
+					*pixbuf++ = red;
+					*pixbuf++ = green;
+					*pixbuf++ = blue;
+					*pixbuf++ = alphabyte;
+					break;
+				default:
+					ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+					break;
+				}
+			}
+		}
+	}
+	else if (targa_header.image_type==10) {   // Runlength encoded RGB images
+		unsigned char red,green,blue,alphabyte,packetHeader,packetSize,j;
+
+		red = 0;
+		green = 0;
+		blue = 0;
+		alphabyte = 0xff;
+
+		for(row=rows-1; row>=0; row--) {
+			pixbuf = targa_rgba + row*columns*4;
+			for(column=0; column<columns; ) {
+				packetHeader= *buf_p++;
+				packetSize = 1 + (packetHeader & 0x7f);
+				if (packetHeader & 0x80) {        // run-length packet
+					switch (targa_header.pixel_size) {
+						case 24:
+								blue = *buf_p++;
+								green = *buf_p++;
+								red = *buf_p++;
+								alphabyte = 255;
+								break;
+						case 32:
+								blue = *buf_p++;
+								green = *buf_p++;
+								red = *buf_p++;
+								alphabyte = *buf_p++;
+								break;
+						default:
+							ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+							break;
+					}
+	
+					for(j=0;j<packetSize;j++) {
+						*pixbuf++=red;
+						*pixbuf++=green;
+						*pixbuf++=blue;
+						*pixbuf++=alphabyte;
+						column++;
+						if (column==columns) { // run spans across rows
+							column=0;
+							if (row>0)
+								row--;
+							else
+								goto breakOut;
+							pixbuf = targa_rgba + row*columns*4;
+						}
+					}
+				}
+				else {                            // non run-length packet
+					for(j=0;j<packetSize;j++) {
+						switch (targa_header.pixel_size) {
+							case 24:
+									blue = *buf_p++;
+									green = *buf_p++;
+									red = *buf_p++;
+									*pixbuf++ = red;
+									*pixbuf++ = green;
+									*pixbuf++ = blue;
+									*pixbuf++ = 255;
+									break;
+							case 32:
+									blue = *buf_p++;
+									green = *buf_p++;
+									red = *buf_p++;
+									alphabyte = *buf_p++;
+									*pixbuf++ = red;
+									*pixbuf++ = green;
+									*pixbuf++ = blue;
+									*pixbuf++ = alphabyte;
+									break;
+							default:
+								ri.Error( ERR_DROP, "LoadTGA: illegal pixel_size '%d' in file '%s'\n", targa_header.pixel_size, name );
+								break;
+						}
+						column++;
+						if (column==columns) { // pixel packet run spans across rows
+							column=0;
+							if (row>0)
+								row--;
+							else
+								goto breakOut;
+							pixbuf = targa_rgba + row*columns*4;
+						}						
+					}
+				}
+			}
+			breakOut:;
+		}
+	}
+
+#if 0 
+  // TTimo: this is the chunk of code to ensure a behavior that meets TGA specs 
+  // bk0101024 - fix from Leonardo
+  // bit 5 set => top-down
+  if (targa_header.attributes & 0x20) {
+    unsigned char *flip = (unsigned char*)malloc (columns*4);
+    unsigned char *src, *dst;
+
+    for (row = 0; row < rows/2; row++) {
+      src = targa_rgba + row * 4 * columns;
+      dst = targa_rgba + (rows - row - 1) * 4 * columns;
+
+      memcpy (flip, src, columns*4);
+      memcpy (src, dst, columns*4);
+      memcpy (dst, flip, columns*4);
+    }
+    free (flip);
+  }
+#endif
+  // instead we just print a warning
+  if (targa_header.attributes & 0x20) {
+    ri.Printf( PRINT_WARNING, "WARNING: '%s' TGA file header declares top-down image, ignoring\n", name);
+  }
+
+  ri.FS_FreeFile (buffer);
+}
+
+/* Catching errors, as done in libjpeg's example.c */
+typedef struct q_jpeg_error_mgr_s
+{
+    struct jpeg_error_mgr pub;  /* "public" fields */
+
+    jmp_buf setjmp_buffer;  /* for return to caller */
+} q_jpeg_error_mgr_t;
+
+static void R_JPGErrorExit(j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* cinfo->err really points to a q_jpeg_error_mgr_s struct, so coerce pointer */
+  q_jpeg_error_mgr_t *jerr = (q_jpeg_error_mgr_t *)cinfo->err;
+  
+  (*cinfo->err->format_message) (cinfo, buffer);
+
+  ri.Printf(PRINT_ALL, "Error: %s", buffer);
+
+  /* Return control to the setjmp point */
+  longjmp(jerr->setjmp_buffer, 1);
+}
+
+static void R_JPGOutputMessage(j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+  
+  /* Create the message */
+  (*cinfo->err->format_message) (cinfo, buffer);
+  
+  /* Send it to stderr, adding a newline */
+  ri.Printf(PRINT_ALL, "%s\n", buffer);
+}
+
+static void LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
+  /* This struct contains the JPEG decompression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   */
+  struct jpeg_decompress_struct cinfo;
+  /* We use our private extension JPEG error handler.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  /* This struct represents a JPEG error handler.  It is declared separately
+   * because applications often want to supply a specialized error handler
+   * (see the second half of this file for an example).  But here we just
+   * take the easy way out and use the standard error handler, which will
+   * print a message on stderr and call exit() if compression fails.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  q_jpeg_error_mgr_t jerr;
+  /* More stuff */
+  JSAMPARRAY buffer;		/* Output row buffer */
+  int row_stride;		/* physical row width in output buffer */
+  unsigned int pixelcount, memcount;
+  unsigned int sindex, dindex;
+  unsigned char *out;
+  byte* fbuffer;
+  byte* buf;
+  int len;
+
+  /* In this example we want to open the input file before doing anything else,
+   * so that the setjmp() error recovery below can assume the file is open.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to read binary files.
+   */
+
+  len = ri.FS_ReadFile ( ( char * ) filename, (void **)&fbuffer);
+  if (!fbuffer) {
+	return;
+  }
+
+  /* Step 1: allocate and initialize JPEG decompression object */
+
+  /* We have to set up the error handler first, in case the initialization
+   * step fails.  (Unlikely, but it could happen if you are out of memory.)
+   * This routine fills in the contents of struct jerr, and returns jerr's
+   * address which we place into the link field in cinfo.
+   */
+  cinfo.err = jpeg_std_error(&jerr.pub);
+  cinfo.err->error_exit = R_JPGErrorExit;
+  cinfo.err->output_message = R_JPGOutputMessage;
+
+  /* Establish the setjmp return context for R_JPGErrorExit to use. */
+  if (setjmp(jerr.setjmp_buffer))
+  {
+	  /* If we get here, the JPEG code has signaled an error.
+	   * We need to clean up the JPEG object, close the input file, and return.
+	   */
+	  jpeg_destroy_decompress(&cinfo);
+	  ri.FS_FreeFile(fbuffer);
+
+	  /* Append the filename to the error for easier debugging */
+	  ri.Printf(PRINT_ALL, ", loading file %s\n", filename);
+	  return;
+  }
+
+  /* Now we can initialize the JPEG decompression object. */
+  jpeg_create_decompress(&cinfo);
+
+  /* Step 2: specify data source (eg, a file) */
+
+  jpeg_mem_src(&cinfo, fbuffer, len);
+
+  /* Step 3: read file parameters with jpeg_read_header() */
+
+  (void) jpeg_read_header(&cinfo, TRUE);
+  /* We can ignore the return value from jpeg_read_header since
+   *   (a) suspension is not possible with the stdio data source, and
+   *   (b) we passed TRUE to reject a tables-only JPEG file as an error.
+   * See libjpeg.doc for more info.
+   */
+
+  /* Step 4: set parameters for decompression */
+
+  /*
+   * Make sure it always converts images to RGB color space. This will
+   * automatically convert 8-bit greyscale images to RGB as well.
+   */
+  cinfo.out_color_space = JCS_RGB;
+
+  /* In this example, we don't need to change any of the defaults set by
+   * jpeg_read_header(), so we do nothing here.
+   */
+
+  /* Step 5: Start decompressor */
+
+  (void) jpeg_start_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* We may need to do some setup of our own at this point before reading
+   * the data.  After jpeg_start_decompress() we have the correct scaled
+   * output image dimensions available, as well as the output colormap
+   * if we asked for color quantization.
+   * In this example, we need to make an output work buffer of the right size.
+   */ 
+  /* JSAMPLEs per row in output buffer */
+  pixelcount = cinfo.output_width * cinfo.output_height;
+
+  if (!cinfo.output_width || !cinfo.output_height
+      || ((pixelcount * 4) / cinfo.output_width) / 4 != cinfo.output_height
+      || pixelcount > 0x1FFFFFFF || cinfo.output_components != 3
+      )
+  {
+      // Free the memory to make sure we don't leak memory
+      ri.FS_FreeFile(fbuffer);
+      jpeg_destroy_decompress(&cinfo);
+
+      ri.Error(ERR_DROP, "LoadJPG: %s has an invalid image format: %dx%d*4=%d, components: %d", filename,
+          cinfo.output_width, cinfo.output_height, pixelcount * 4, cinfo.output_components);
+  }
+
+  memcount = pixelcount * 4;
+  row_stride = cinfo.output_width * cinfo.output_components;
+
+  out = ri.Malloc(memcount);
+
+  *width = cinfo.output_width;
+  *height = cinfo.output_height;
+
+  /* Step 6: while (scan lines remain to be read) */
+  /*           jpeg_read_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.output_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   */
+  while (cinfo.output_scanline < cinfo.output_height) {
+	  /* jpeg_read_scanlines expects an array of pointers to scanlines.
+	   * Here the array is only one element long, but you could ask for
+	   * more than one scanline at a time if that's more convenient.
+	   */
+	  buf = ((out + (row_stride * cinfo.output_scanline)));
+	  buffer = &buf;
+	  (void)jpeg_read_scanlines(&cinfo, buffer, 1);
+  }
+
+  buf = out;
+
+  // Expand from RGB to RGBA
+  sindex = pixelcount * cinfo.output_components;
+  dindex = memcount;
+
+  do
+  {
+      buf[--dindex] = 255;
+      buf[--dindex] = buf[--sindex];
+      buf[--dindex] = buf[--sindex];
+      buf[--dindex] = buf[--sindex];
+  } while (sindex);
+
+  *pic = out;
+
+  /* Step 7: Finish decompression */
+
+  (void) jpeg_finish_decompress(&cinfo);
+  /* We can ignore the return value since suspension is not possible
+   * with the stdio data source.
+   */
+
+  /* Step 8: Release JPEG decompression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_decompress(&cinfo);
+
+  /* After finish_decompress, we can close the input file.
+   * Here we postpone it until after no more JPEG errors are possible,
+   * so as to simplify the setjmp error logic above.  (Actually, I don't
+   * think that jpeg_destroy can do an error exit, but why assume anything...)
+   */
+  ri.FS_FreeFile (fbuffer);
+
+  /* At this point you may want to check to see whether any corrupt-data
+   * warnings occurred (test whether jerr.pub.num_warnings is nonzero).
+   */
+
+  /* And we're done! */
+}
+
+
+/* Expanded data destination object for stdio output */
+
+typedef struct {
+  struct jpeg_destination_mgr pub; /* public fields */
+
+  byte* outfile;		/* target stream */
+  int	size;
+} my_destination_mgr;
+
+typedef my_destination_mgr * my_dest_ptr;
+
+
+/*
+ * Initialize destination --- called by jpeg_start_compress
+ * before any data is actually written.
+ */
+
+void init_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+
+  dest->pub.next_output_byte = dest->outfile;
+  dest->pub.free_in_buffer = dest->size;
+}
+
+
+/*
+ * Empty the output buffer --- called whenever buffer fills up.
+ *
+ * In typical applications, this should write the entire output buffer
+ * (ignoring the current state of next_output_byte & free_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been dumped.
+ *
+ * In applications that need to be able to suspend compression due to output
+ * overrun, a FALSE return indicates that the buffer cannot be emptied now.
+ * In this situation, the compressor will return to its caller (possibly with
+ * an indication that it has not accepted all the supplied scanlines).  The
+ * application should resume compression after it has made more room in the
+ * output buffer.  Note that there are substantial restrictions on the use of
+ * suspension --- see the documentation.
+ *
+ * When suspending, the compressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_output_byte & free_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point will be regenerated after resumption, so do not
+ * write it out when emptying the buffer externally.
+ */
+
+boolean empty_output_buffer (j_compress_ptr cinfo)
+{
+  return TRUE;
+}
+
+#if 0
+/*
+ * Compression initialization.
+ * Before calling this, all parameters and a data destination must be set up.
+ *
+ * We require a write_all_tables parameter as a failsafe check when writing
+ * multiple datastreams from the same compression object.  Since prior runs
+ * will have left all the tables marked sent_table=TRUE, a subsequent run
+ * would emit an abbreviated stream (no tables) by default.  This may be what
+ * is wanted, but for safety's sake it should not be the default behavior:
+ * programmers should have to make a deliberate choice to emit abbreviated
+ * images.  Therefore the documentation and examples should encourage people
+ * to pass write_all_tables=TRUE; then it will take active thought to do the
+ * wrong thing.
+ */
+
+GLOBAL void
+jpeg_start_compress (j_compress_ptr cinfo, boolean write_all_tables)
+{
+  if (cinfo->global_state != CSTATE_START)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+
+  if (write_all_tables)
+    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
+
+  /* (Re)initialize error mgr and destination modules */
+  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
+  (*cinfo->dest->init_destination) (cinfo);
+  /* Perform master selection of active modules */
+  jinit_compress_master(cinfo);
+  /* Set up for the first pass */
+  (*cinfo->master->prepare_for_pass) (cinfo);
+  /* Ready for application to drive first pass through jpeg_write_scanlines
+   * or jpeg_write_raw_data.
+   */
+  cinfo->next_scanline = 0;
+  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
+}
+
+/*
+ * Write some scanlines of data to the JPEG compressor.
+ *
+ * The return value will be the number of lines actually written.
+ * This should be less than the supplied num_lines only in case that
+ * the data destination module has requested suspension of the compressor,
+ * or if more than image_height scanlines are passed in.
+ *
+ * Note: we warn about excess calls to jpeg_write_scanlines() since
+ * this likely signals an application programmer error.  However,
+ * excess scanlines passed in the last valid call are *silently* ignored,
+ * so that the application need not adjust num_lines for end-of-image
+ * when using a multiple-scanline buffer.
+ */
+
+GLOBAL JDIMENSION
+jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
+		      JDIMENSION num_lines)
+{
+  JDIMENSION row_ctr, rows_left;
+
+  if (cinfo->global_state != CSTATE_SCANNING)
+    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
+  if (cinfo->next_scanline >= cinfo->image_height)
+    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
+
+  /* Call progress monitor hook if present */
+  if (cinfo->progress != NULL) {
+    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
+    cinfo->progress->pass_limit = (long) cinfo->image_height;
+    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
+  }
+
+  /* Give master control module another chance if this is first call to
+   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
+   * delayed so that application can write COM, etc, markers between
+   * jpeg_start_compress and jpeg_write_scanlines.
+   */
+  if (cinfo->master->call_pass_startup)
+    (*cinfo->master->pass_startup) (cinfo);
+
+  /* Ignore any extra scanlines at bottom of image. */
+  rows_left = cinfo->image_height - cinfo->next_scanline;
+  if (num_lines > rows_left)
+    num_lines = rows_left;
+
+  row_ctr = 0;
+  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
+  cinfo->next_scanline += row_ctr;
+  return row_ctr;
+}
+
+/*
+ * Terminate destination --- called by jpeg_finish_compress
+ * after all data has been written.  Usually needs to flush buffer.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+static int hackSize;
+
+void term_destination (j_compress_ptr cinfo)
+{
+  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
+  size_t datacount = dest->size - dest->pub.free_in_buffer;
+  hackSize = datacount;
+}
+
+
+/*
+ * Prepare for output to a stdio stream.
+ * The caller must have already opened the stream, and is responsible
+ * for closing it after finishing compression.
+ */
+
+void jpegDest (j_compress_ptr cinfo, byte* outfile, int size)
+{
+  my_dest_ptr dest;
+
+  /* The destination object is made permanent so that multiple JPEG images
+   * can be written to the same file without re-executing jpeg_stdio_dest.
+   * This makes it dangerous to use this manager and a different destination
+   * manager serially with the same JPEG object, because their private object
+   * sizes may be different.  Caveat programmer.
+   */
+  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
+    cinfo->dest = (struct jpeg_destination_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+				  sizeof(my_destination_mgr));
+  }
+
+  dest = (my_dest_ptr) cinfo->dest;
+  dest->pub.init_destination = init_destination;
+  dest->pub.empty_output_buffer = empty_output_buffer;
+  dest->pub.term_destination = term_destination;
+  dest->outfile = outfile;
+  dest->size = size;
+}
+
+void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer) {
+  /* This struct contains the JPEG compression parameters and pointers to
+   * working space (which is allocated as needed by the JPEG library).
+   * It is possible to have several such structures, representing multiple
+   * compression/decompression processes, in existence at once.  We refer
+   * to any one struct (and its associated working data) as a "JPEG object".
+   */
+  struct jpeg_compress_struct cinfo;
+  /* This struct represents a JPEG error handler.  It is declared separately
+   * because applications often want to supply a specialized error handler
+   * (see the second half of this file for an example).  But here we just
+   * take the easy way out and use the standard error handler, which will
+   * print a message on stderr and call exit() if compression fails.
+   * Note that this struct must live as long as the main JPEG parameter
+   * struct, to avoid dangling-pointer problems.
+   */
+  struct jpeg_error_mgr jerr;
+  /* More stuff */
+  JSAMPROW row_pointer[1];	/* pointer to JSAMPLE row[s] */
+  int row_stride;		/* physical row width in image buffer */
+  unsigned char *out;
+
+  /* Step 1: allocate and initialize JPEG compression object */
+
+  /* We have to set up the error handler first, in case the initialization
+   * step fails.  (Unlikely, but it could happen if you are out of memory.)
+   * This routine fills in the contents of struct jerr, and returns jerr's
+   * address which we place into the link field in cinfo.
+   */
+  cinfo.err = jpeg_std_error(&jerr);
+  /* Now we can initialize the JPEG compression object. */
+  jpeg_CreateDecompress(&cinfo);
+
+  /* Step 2: specify data destination (eg, a file) */
+  /* Note: steps 2 and 3 can be done in either order. */
+
+  /* Here we use the library-supplied code to send compressed data to a
+   * stdio stream.  You can also write your own code to do something else.
+   * VERY IMPORTANT: use "b" option to fopen() if you are on a machine that
+   * requires it in order to write binary files.
+   */
+  out = ri.Hunk_AllocateTempMemory(image_width*image_height*4);
+  jpegDest(&cinfo, out, image_width*image_height*4);
+
+  /* Step 3: set parameters for compression */
+
+  /* First we supply a description of the input image.
+   * Four fields of the cinfo struct must be filled in:
+   */
+  cinfo.image_width = image_width; 	/* image width and height, in pixels */
+  cinfo.image_height = image_height;
+  cinfo.input_components = 4;		/* # of color components per pixel */
+  cinfo.in_color_space = JCS_RGB; 	/* colorspace of input image */
+  /* Now use the library's routine to set default compression parameters.
+   * (You must set at least cinfo.in_color_space before calling this,
+   * since the defaults depend on the source color space.)
+   */
+  jpeg_set_defaults(&cinfo);
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
+  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+
+  /* Step 4: Start compressor */
+
+  /* TRUE ensures that we will write a complete interchange-JPEG file.
+   * Pass TRUE unless you are very sure of what you're doing.
+   */
+  jpeg_start_compress(&cinfo, TRUE);
+
+  /* Step 5: while (scan lines remain to be written) */
+  /*           jpeg_write_scanlines(...); */
+
+  /* Here we use the library's state variable cinfo.next_scanline as the
+   * loop counter, so that we don't have to keep track ourselves.
+   * To keep things simple, we pass one scanline per call; you can pass
+   * more if you wish, though.
+   */
+  row_stride = image_width * 4;	/* JSAMPLEs per row in image_buffer */
+
+  while (cinfo.next_scanline < cinfo.image_height) {
+    /* jpeg_write_scanlines expects an array of pointers to scanlines.
+     * Here the array is only one element long, but you could pass
+     * more than one scanline at a time if that's more convenient.
+     */
+    row_pointer[0] = & image_buffer[((cinfo.image_height-1)*row_stride)-cinfo.next_scanline * row_stride];
+    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
+  }
+
+  /* Step 6: Finish compression */
+
+  jpeg_finish_compress(&cinfo);
+  /* After finish_compress, we can close the output file. */
+  ri.ri.FS_WriteFile( filename, out, hackSize );
+
+  ri.Hunk_FreeTempMemory(out);
+
+  /* Step 7: release JPEG compression object */
+
+  /* This is an important step since it will release a good deal of memory. */
+  jpeg_destroy_compress(&cinfo);
+
+  /* And we're done! */
+}
+#endif
+
+//===================================================================
 
 /*
 =================
 R_LoadImage
 
-Loads any of the supported image types into a canonical
+Loads any of the supported image types into a cannonical
 32 bit format.
 =================
 */
-void R_LoadImage( const char *name, byte **pic, int *width, int *height )
-{
-	qboolean orgNameFailed = qfalse;
-	int orgLoader = -1;
-	int i;
-	char localName[ MAX_QPATH ];
-	const char *ext;
-	char *altName;
+static void R_LoadImage(const char* name, byte** pic, int* width, int* height, qboolean* hasAlpha, int* glCompressMode, int* numMipmaps, int* piMipmapsAvailable) {
+	size_t	len;
+	char	tempName[MAX_STRING_TOKENS + 1];
+	char altname[MAX_QPATH];
 
+
+	*hasAlpha = qfalse;
+	*glCompressMode = 0;
 	*pic = NULL;
 	*width = 0;
 	*height = 0;
 
-	Q_strncpyz( localName, name, MAX_QPATH );
-
-	ext = COM_GetExtension( localName );
-
-	if( *ext )
-	{
-		// Look for the correct loader and use it
-		for( i = 0; i < numImageLoaders; i++ )
-		{
-			if( !Q_stricmp( ext, imageLoaders[ i ].ext ) )
-			{
-				// Load
-				imageLoaders[ i ].ImageLoader( localName, pic, width, height );
-				break;
-			}
-		}
-
-		// A loader was found
-		if( i < numImageLoaders )
-		{
-			if( *pic == NULL )
-			{
-				// Loader failed, most likely because the file isn't there;
-				// try again without the extension
-				orgNameFailed = qtrue;
-				orgLoader = i;
-				COM_StripExtension( name, localName, MAX_QPATH );
-			}
-			else
-			{
-				// Something loaded
-				return;
-			}
-		}
+	len = strlen(name);
+	if (len < 5) {
+		return;
 	}
 
-	// Try and find a suitable match using all
-	// the image formats supported
-	for( i = 0; i < numImageLoaders; i++ )
+	strcpy(altname, name);
+	len = strlen(altname);
+	if (glConfig.textureCompression == TC_S3TC || glConfig.textureCompression == TC_S3TC_ARB)
 	{
-		if (i == orgLoader)
-			continue;
+		len = strlen(altname);
+		altname[len - 3] = 'd';
+		altname[len - 2] = 'd';
+		altname[len - 1] = 's';
+		LoadDDS(altname, pic, width, height, hasAlpha, glCompressMode, numMipmaps, piMipmapsAvailable);
+	}
 
-		altName = va( "%s.%s", localName, imageLoaders[ i ].ext );
-
-		// Load
-		imageLoaders[ i ].ImageLoader( altName, pic, width, height );
-
-		if( *pic )
-		{
-			if( orgNameFailed )
-			{
-				ri.Printf( PRINT_DEVELOPER, "WARNING: %s not present, using %s instead\n",
-						name, altName );
+	if (!*pic)
+	{
+		if (!Q_stricmp(name + len - 4, ".tga") || !Q_stricmp(name + len - 4, ".jpg")) {
+			if (r_loadjpg->integer) {
+				len = strlen(altname);
+				altname[len - 3] = 'j';
+				altname[len - 2] = 'p';
+				altname[len - 1] = 'g';
+				// try jpg first
+				LoadJPG(altname, pic, width, height);
 			}
-
-			break;
+			if (!*pic) {
+				altname[len - 3] = 't';
+				altname[len - 2] = 'g';
+				altname[len - 1] = 'a';
+				LoadTGA(altname, pic, width, height);
+			}
+			*piMipmapsAvailable = 1;
 		}
+		else if (!Q_stricmp(name + len - 4, ".pcx")) {
+			LoadPCX32(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+		}
+		else if (!Q_stricmp(name + len - 4, ".bmp")) {
+			LoadBMP(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+		}
+		else if (!Q_stricmp(name + len - 4, ".jpg")) {
+			LoadJPG(name, pic, width, height);
+			*piMipmapsAvailable = 1;
+        }
+        else if (!Q_stricmp(name + len - 4, ".gst")) {
+            LoadGHOST(name, pic, width, height);
+            *piMipmapsAvailable = 0;
+        }
+	}
+
+	if (tr.registered)
+	{
+		Com_sprintf(tempName, sizeof(tempName), "n%s", name);
+		ri.UI_LoadResource(tempName);
 	}
 }
 
@@ -1022,11 +2477,15 @@ Finds or loads the given image.
 Returns NULL if it fails, not a default image.
 ==============
 */
-image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
-{
+image_t* R_FindImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
 	image_t	*image;
 	int		width, height;
 	byte	*pic;
+	int		len;
+	qboolean	hasAlpha;
+	int			glCompressMode;
+	int			numMipmaps;
+	int			iMipmapsAvailable;
 	long	hash;
 
 	if (!name) {
@@ -1038,13 +2497,22 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 	//
 	// see if the image is already loaded
 	//
-	for (image=hashTable[hash]; image; image=image->next) {
-		if ( !strcmp( name, image->imgName ) ) {
+	for (image = hashTable[hash]; image; image = image->next) {
+		if (!strcmp(name, image->imgName)) {
 			// the white image can be used with any set of parms, but other mismatches are errors
-			if ( strcmp( name, "*white" ) ) {
-				if ( image->flags != flags ) {
-					ri.Printf( PRINT_DEVELOPER, "WARNING: reused image %s with mixed flags (%i vs %i)\n", name, image->flags, flags );
+			if (strcmp(name, "*white")) {
+				if ((image->numMipmaps && !mipmap) || (!image->numMipmaps && mipmap)) {
+					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed mipmap parm\n", name);
 				}
+				if (image->allowPicmip != allowPicmip) {
+					ri.Printf(PRINT_DEVELOPER, "WARNING: reused image %s with mixed allowPicmip parm\n", name);
+				}
+				if (image->wrapClampModeX != glWrapClampModeX || image->wrapClampModeY != glWrapClampModeY) {
+					ri.Printf(PRINT_ALL, "WARNING: reused image %s with mixed glWrapClampMode parm\n", name);
+				}
+			}
+			if (image->r_sequence != -1) {
+				image->r_sequence = r_sequencenumber;
 			}
 			return image;
 		}
@@ -1053,23 +2521,118 @@ image_t	*R_FindImageFile( const char *name, imgType_t type, imgFlags_t flags )
 	//
 	// load the pic from disk
 	//
-	R_LoadImage( name, &pic, &width, &height );
-	if ( pic == NULL ) {
+	numMipmaps = mipmap;
+	iMipmapsAvailable = 0;
+	R_LoadImage(name, &pic, &width, &height, &hasAlpha, &glCompressMode, &numMipmaps, &iMipmapsAvailable);
+	if (pic == NULL) {
 		return NULL;
 	}
 
-	image = R_CreateImage( ( char * ) name, pic, width, height, type, flags, 0 );
-	ri.Free( pic );
+	image = R_CreateImageOld(
+		name,
+		pic,
+		width,
+		height,
+		numMipmaps,
+		iMipmapsAvailable,
+		allowPicmip,
+		force32bit,
+		hasAlpha,
+		glCompressMode,
+		glWrapClampModeX,
+		glWrapClampModeY);
+
+    len = strlen(name);
+    if (len > 4 && !strcmp(&name[len - 4], ".gst")) {
+        R_SetGhostImage(name, image);
+    }
+
+	ri.Free(pic);
 	return image;
 }
 
+/*
+================
+R_RefreshImageFile
+================
+*/
+image_t* R_RefreshImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY) {
+	char imagename[64];
+	image_t* image;
+	long hash;
+	
+	if (!name) {
+		return NULL;
+	}
+
+	strncpy(imagename, name, ARRAY_LEN(imagename));
+	hash = generateHashValue(name);
+	image = hashTable[hash];
+
+    if (image)
+    {
+        while (strcmp(name, image->imgName))
+        {
+            image = image->next;
+			if (!image) {
+				return R_FindImageFileOld(
+					imagename,
+					mipmap,
+					allowPicmip,
+					force32bit,
+					glWrapClampModeX,
+					glWrapClampModeY
+				);
+			}
+        }
+
+        R_FreeImage(image);
+    }
+
+    return R_FindImageFileOld(
+		imagename,
+		mipmap,
+		allowPicmip,
+		force32bit,
+		glWrapClampModeX,
+		glWrapClampModeY
+	);
+}
+
+/*
+================
+R_ImageExists
+================
+*/
+qboolean R_ImageExists(const char* name) {
+    image_t* image;
+    long int hash;
+
+    if (name)
+    {
+        hash = generateHashValue(name);
+        image = hashTable[hash];
+
+        if (hash)
+        {
+            for (; image != NULL; image = image->next)
+            {
+                if (!strcmp(name, image->imgName)) {
+                    return qtrue;
+                }
+            }
+        }
+    }
+
+    return qfalse;
+}
 
 /*
 ================
 R_CreateDlightImage
 ================
 */
-#define	DLIGHT_SIZE	16
+#define	DLIGHT_SIZE	32
 static void R_CreateDlightImage( void ) {
 	int		x,y;
 	byte	data[DLIGHT_SIZE][DLIGHT_SIZE][4];
@@ -1082,7 +2645,7 @@ static void R_CreateDlightImage( void ) {
 
 			d = ( DLIGHT_SIZE/2 - 0.5f - x ) * ( DLIGHT_SIZE/2 - 0.5f - x ) +
 				( DLIGHT_SIZE/2 - 0.5f - y ) * ( DLIGHT_SIZE/2 - 0.5f - y );
-			b = 4000 / d;
+			b = 16000 / d;
 			if (b > 255) {
 				b = 255;
 			} else if ( b < 75 ) {
@@ -1094,91 +2657,8 @@ static void R_CreateDlightImage( void ) {
 			data[y][x][3] = 255;			
 		}
 	}
-	tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_CLAMPTOEDGE, 0 );
-}
-
-
-/*
-=================
-R_InitFogTable
-=================
-*/
-void R_InitFogTable( void ) {
-	int		i;
-	float	d;
-	float	exp;
-	
-	exp = 0.5;
-
-	for ( i = 0 ; i < FOG_TABLE_SIZE ; i++ ) {
-		d = pow ( (float)i/(FOG_TABLE_SIZE-1), exp );
-
-		tr.fogTable[i] = d;
-	}
-}
-
-/*
-================
-R_FogFactor
-
-Returns a 0.0 to 1.0 fog density value
-This is called for each texel of the fog texture on startup
-and for each vertex of transparent shaders in fog dynamically
-================
-*/
-float	R_FogFactor( float s, float t ) {
-	float	d;
-
-	s -= 1.0/512;
-	if ( s < 0 ) {
-		return 0;
-	}
-	if ( t < 1.0/32 ) {
-		return 0;
-	}
-	if ( t < 31.0/32 ) {
-		s *= (t - 1.0f/32.0f) / (30.0f/32.0f);
-	}
-
-	// we need to leave a lot of clamp range
-	s *= 8;
-
-	if ( s > 1.0 ) {
-		s = 1.0;
-	}
-
-	d = tr.fogTable[ (int)(s * (FOG_TABLE_SIZE-1)) ];
-
-	return d;
-}
-
-/*
-================
-R_CreateFogImage
-================
-*/
-#define	FOG_S	256
-#define	FOG_T	32
-static void R_CreateFogImage( void ) {
-	int		x,y;
-	byte	*data;
-	float	d;
-
-	data = ri.Hunk_AllocateTempMemory( FOG_S * FOG_T * 4 );
-
-	// S is distance, T is depth
-	for (x=0 ; x<FOG_S ; x++) {
-		for (y=0 ; y<FOG_T ; y++) {
-			d = R_FogFactor( ( x + 0.5f ) / FOG_S, ( y + 0.5f ) / FOG_T );
-
-			data[(y*FOG_S+x)*4+0] = 
-			data[(y*FOG_S+x)*4+1] = 
-			data[(y*FOG_S+x)*4+2] = 255;
-			data[(y*FOG_S+x)*4+3] = 255*d;
-		}
-	}
-	tr.fogImage = R_CreateImage("*fog", (byte *)data, FOG_S, FOG_T, IMGTYPE_COLORALPHA, IMGFLAG_CLAMPTOEDGE, 0 );
-	ri.Hunk_FreeTempMemory( data );
+	tr.dlightImage = R_CreateImageOld("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.dlightImage->r_sequence = -1;
 }
 
 /*
@@ -1214,7 +2694,8 @@ static void R_CreateDefaultImage( void ) {
 		data[x][DEFAULT_SIZE-1][2] =
 		data[x][DEFAULT_SIZE-1][3] = 255;
 	}
-	tr.defaultImage = R_CreateImage("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_MIPMAP, 0);
+	tr.defaultImage = R_CreateImageOld("*default", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, 1, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.defaultImage->r_sequence = -1;
 }
 
 /*
@@ -1222,15 +2703,18 @@ static void R_CreateDefaultImage( void ) {
 R_CreateBuiltinImages
 ==================
 */
-void R_CreateBuiltinImages( void ) {
-	int		x,y;
+void R_CreateBuiltinImages(void) {
+	int		x, y;
+	int		i;
+	byte	lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
 	byte	data[DEFAULT_SIZE][DEFAULT_SIZE][4];
 
 	R_CreateDefaultImage();
 
 	// we use a solid white image instead of disabling texturing
 	Com_Memset( data, 255, sizeof( data ) );
-	tr.whiteImage = R_CreateImage("*white", (byte *)data, 8, 8, IMGTYPE_COLORALPHA, IMGFLAG_NONE, 0);
+	tr.whiteImage = R_CreateImageOld("*white", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.whiteImage->r_sequence = -1;
 
 	// with overbright bits active, we need an image which is some fraction of full color,
 	// for default lightmaps, etc
@@ -1243,16 +2727,22 @@ void R_CreateBuiltinImages( void ) {
 		}
 	}
 
-	tr.identityLightImage = R_CreateImage("*identityLight", (byte *)data, 8, 8, IMGTYPE_COLORALPHA, IMGFLAG_NONE, 0);
+	Com_Memset(lightmap_buffer, 0xFFFFFFFF, sizeof(lightmap_buffer));
+	for (i = 0; i < 15; i++) {
+		char filename[64];
 
-
-	for(x=0;x<32;x++) {
-		// scratchimage is usually used for cinematic drawing
-		tr.scratchImage[x] = R_CreateImage("*scratch", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, IMGTYPE_COLORALPHA, IMGFLAG_PICMIP | IMGFLAG_CLAMPTOEDGE, 0);
+		Com_sprintf(filename, sizeof(filename), "*lightmapD%i", i);
+		tr.dlightImages[i] = R_CreateImageOld(filename, lightmap_buffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 0, 1, qfalse, qfalse, qfalse, 0, GL_CLAMP, GL_CLAMP);
+		tr.dlightImages[i]->r_sequence = -1;
 	}
 
+	tr.identityLightImage = R_CreateImageOld("*identityLight", (byte *)data, 8, 8, 0, 1, qfalse, qfalse, qfalse, qfalse, GL_REPEAT, GL_REPEAT);
+	tr.identityLightImage->r_sequence = -1;
+
+	tr.scratchImage = R_CreateImageOld("*scratch", (byte*)data, DEFAULT_SIZE, DEFAULT_SIZE, 0, 1, r_picmip->integer, qfalse, qfalse, qfalse, GL_CLAMP, GL_CLAMP);
+	tr.scratchImage->r_sequence = -1;
+
 	R_CreateDlightImage();
-	R_CreateFogImage();
 }
 
 
@@ -1293,10 +2783,11 @@ void R_SetColorMappings( void ) {
 		tr.overbrightBits = 0;
 	}
 
-	tr.identityLight = 1.0f / ( 1 << tr.overbrightBits );
+	tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
+	tr.overbrightMult = (float)(1 << tr.overbrightShift);
+	tr.identityLight = 1.0f / (1 << tr.overbrightBits);
 	tr.identityLightByte = 255 * tr.identityLight;
 
-
 	if ( r_intensity->value <= 1 ) {
 		ri.Cvar_Set( "r_intensity", "1" );
 	}
@@ -1308,6 +2799,15 @@ void R_SetColorMappings( void ) {
 	}
 
 	g = r_gamma->value;
+	if (!glConfig.deviceSupportsGamma && g != 1.0) {
+		tr.needsLightScale = qtrue;
+	}
+	else if (r_intensity->value != 1.0) {
+		tr.needsLightScale = qtrue;
+	}
+	else {
+		tr.needsLightScale = qfalse;
+	}
 
 	shift = tr.overbrightBits;
 
@@ -1348,6 +2848,10 @@ R_InitImages
 */
 void	R_InitImages( void ) {
 	Com_Memset(hashTable, 0, sizeof(hashTable));
+	// clear images
+	Com_Memset(tr.images, 0, sizeof(tr.images));
+	tr.numImages = 0;
+
 	// build brightness translation tables
 	R_SetColorMappings();
 
@@ -1355,6 +2859,51 @@ void	R_InitImages( void ) {
 	R_CreateBuiltinImages();
 }
 
+/*
+===============
+R_DeleteImageFromHash
+===============
+*/
+void R_DeleteImageFromHash(image_t* image) {
+	image_t* current;
+	image_t* prev;
+	int hash;
+
+    hash = generateHashValue(image->imgName);
+    current = hashTable[hash];
+    prev = NULL;
+
+    while (current)
+    {
+        if (image == current)
+        {
+			if (prev) {
+				prev->next = current->next;
+			} else {
+                hashTable[hash] = current->next;
+			}
+            return;
+        }
+
+        prev = current;
+        current = current->next;
+    }
+}
+
+/*
+===============
+R_FreeImage
+===============
+*/
+void R_FreeImage(image_t* image) {
+	if (image->texnum) {
+		qglDeleteTextures(1, &image->texnum);
+	}
+
+    R_DeleteImageFromHash(image);
+	memset(image, 0, sizeof(image_t));
+}
+
 /*
 ===============
 R_DeleteTextures
@@ -1364,23 +2913,102 @@ void R_DeleteTextures( void ) {
 	int		i;
 
 	for ( i=0; i<tr.numImages ; i++ ) {
-		qglDeleteTextures( 1, &tr.images[i]->texnum );
+        R_FreeImage(&tr.images[i]);
 	}
 	Com_Memset( tr.images, 0, sizeof( tr.images ) );
 
 	tr.numImages = 0;
 
 	Com_Memset( glState.currenttextures, 0, sizeof( glState.currenttextures ) );
-	if ( qglActiveTextureARB ) {
-		GL_SelectTexture( 1 );
-		qglBindTexture( GL_TEXTURE_2D, 0 );
-		GL_SelectTexture( 0 );
-		qglBindTexture( GL_TEXTURE_2D, 0 );
-	} else {
-		qglBindTexture( GL_TEXTURE_2D, 0 );
+	if ( qglBindTexture ) {
+		if ( qglActiveTextureARB ) {
+			GL_SelectTexture( 1 );
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+			GL_SelectTexture( 0 );
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+		} else {
+			qglBindTexture( GL_TEXTURE_2D, 0 );
+		}
 	}
 }
 
+/*
+===============
+R_DumpTextureMemory
+===============
+*/
+void R_DumpTextureMemory() {
+    int i;
+    char str_buffer[32];
+    char* Label1, * Label2;
+    fileHandle_t stat_file;
+
+    stat_file = ri.FS_OpenFileWrite("textureuse.csv");
+
+    Label1 = "Texture Name,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Size (kb),";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+    Label1 = "Num Uses,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Miplevels\n";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        ri.FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the number of bytes (in KiB)
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the sequence
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+    }
+}
+
+/*
+===============
+R_CountTextureMemory
+===============
+*/
+int R_CountTextureMemory() {
+    int total_bytes;
+    int i;
+
+    R_DumpTextureMemory();
+
+    total_bytes = 0;
+
+    for (i = 0; i < tr.numImages; i++) {
+        total_bytes = tr.images[i].bytesUsed;
+    }
+
+    return total_bytes;
+}
+
+/*
+===============
+R_FreeUnusedImages
+===============
+*/
+void R_FreeUnusedImages() {
+    int i;
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = &tr.images[i];
+
+        if (image->imgName[0] && image->r_sequence != r_sequencenumber && image->r_sequence != -1) {
+            R_FreeImage(image);
+        }
+    }
+}
+
 /*
 ============================================================================
 
@@ -1394,7 +3022,7 @@ SKINS
 CommaParse
 
 This is unfortunate, but the skin files aren't
-compatible with our normal parsing rules.
+compatable with our normal parsing rules.
 ==================
 */
 static char *CommaParse( char **data_p ) {
@@ -1427,15 +3055,12 @@ static char *CommaParse( char **data_p ) {
 		// skip double slash comments
 		if ( c == '/' && data[1] == '/' )
 		{
-			data += 2;
-			while (*data && *data != '\n') {
+			while (*data && *data != '\n')
 				data++;
-			}
 		}
 		// skip /* */ comments
 		else if ( c=='/' && data[1] == '*' ) 
 		{
-			data += 2;
 			while ( *data && ( *data != '*' || data[1] != '/' ) ) 
 			{
 				data++;
@@ -1468,7 +3093,7 @@ static char *CommaParse( char **data_p ) {
 				*data_p = ( char * ) data;
 				return com_token;
 			}
-			if (len < MAX_TOKEN_CHARS - 1)
+			if (len < MAX_TOKEN_CHARS)
 			{
 				com_token[len] = c;
 				len++;
@@ -1479,7 +3104,7 @@ static char *CommaParse( char **data_p ) {
 	// parse a regular word
 	do
 	{
-		if (len < MAX_TOKEN_CHARS - 1)
+		if (len < MAX_TOKEN_CHARS)
 		{
 			com_token[len] = c;
 			len++;
@@ -1488,6 +3113,11 @@ static char *CommaParse( char **data_p ) {
 		c = *data;
 	} while (c>32 && c != ',' );
 
+	if (len == MAX_TOKEN_CHARS)
+	{
+//		Com_Printf ("Token exceeded %i chars, discarded.\n", MAX_TOKEN_CHARS);
+		len = 0;
+	}
 	com_token[len] = 0;
 
 	*data_p = ( char * ) data;
@@ -1502,26 +3132,20 @@ RE_RegisterSkin
 ===============
 */
 qhandle_t RE_RegisterSkin( const char *name ) {
-	skinSurface_t parseSurfaces[MAX_SKIN_SURFACES];
 	qhandle_t	hSkin;
 	skin_t		*skin;
 	skinSurface_t	*surf;
-	union {
-		char *c;
-		void *v;
-	} text;
-	char		*text_p;
+	char		*text, *text_p;
 	char		*token;
 	char		surfName[MAX_QPATH];
-	int			totalSurfaces;
 
 	if ( !name || !name[0] ) {
-		ri.Printf( PRINT_DEVELOPER, "Empty name passed to RE_RegisterSkin\n" );
+		ri.Printf(PRINT_ALL,  "Empty name passed to RE_RegisterSkin\n" );
 		return 0;
 	}
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_DEVELOPER, "Skin name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Skin name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
@@ -1543,29 +3167,29 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 		return 0;
 	}
 	tr.numSkins++;
-	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
+	skin = ri.Hunk_Alloc( sizeof( skin_t ), h_dontcare );
 	tr.skins[hSkin] = skin;
 	Q_strncpyz( skin->name, name, sizeof( skin->name ) );
 	skin->numSurfaces = 0;
 
+	// make sure the render thread is stopped
 	R_IssuePendingRenderCommands();
 
 	// If not a .skin file, load as a single shader
 	if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) {
 		skin->numSurfaces = 1;
-		skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
-		skin->surfaces[0].shader = R_FindShader( name, LIGHTMAP_NONE, qtrue );
+		skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_dontcare);
+		skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
 		return hSkin;
 	}
 
 	// load and parse the skin file
-    ri.FS_ReadFile( name, &text.v );
-	if ( !text.c ) {
+    ri.FS_ReadFile( name, (void **)&text );
+	if ( !text ) {
 		return 0;
 	}
 
-	totalSurfaces = 0;
-	text_p = text.c;
+	text_p = text;
 	while ( text_p && *text_p ) {
 		// get surface name
 		token = CommaParse( &text_p );
@@ -1588,54 +3212,23 @@ qhandle_t RE_RegisterSkin( const char *name ) {
 		// parse the shader name
 		token = CommaParse( &text_p );
 
-		if ( skin->numSurfaces < MAX_SKIN_SURFACES ) {
-			surf = &parseSurfaces[skin->numSurfaces];
-			Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
-			surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue );
-			skin->numSurfaces++;
-		}
-
-		totalSurfaces++;
+		surf = skin->surfaces[ skin->numSurfaces ] = ri.Hunk_Alloc( sizeof( *skin->surfaces[0] ), h_dontcare );
+		Q_strncpyz( surf->name, surfName, sizeof( surf->name ) );
+		surf->shader = R_FindShader( token, LIGHTMAP_NONE, qtrue, qfalse, qfalse, qfalse );
+		skin->numSurfaces++;
 	}
 
-	ri.FS_FreeFile( text.v );
+	ri.FS_FreeFile( text );
 
-	if ( totalSurfaces > MAX_SKIN_SURFACES ) {
-		ri.Printf( PRINT_WARNING, "WARNING: Ignoring excess surfaces (found %d, max is %d) in skin '%s'!\n",
-					totalSurfaces, MAX_SKIN_SURFACES, name );
-	}
 
 	// never let a skin have 0 shaders
 	if ( skin->numSurfaces == 0 ) {
 		return 0;		// use default skin
 	}
 
-	// copy surfaces to skin
-	skin->surfaces = ri.Hunk_Alloc( skin->numSurfaces * sizeof( skinSurface_t ), h_low );
-	memcpy( skin->surfaces, parseSurfaces, skin->numSurfaces * sizeof( skinSurface_t ) );
-
 	return hSkin;
 }
 
-
-/*
-===============
-R_InitSkins
-===============
-*/
-void	R_InitSkins( void ) {
-	skin_t		*skin;
-
-	tr.numSkins = 1;
-
-	// make the default skin have all default shaders
-	skin = tr.skins[0] = ri.Hunk_Alloc( sizeof( skin_t ), h_low );
-	Q_strncpyz( skin->name, "<default skin>", sizeof( skin->name )  );
-	skin->numSurfaces = 1;
-	skin->surfaces = ri.Hunk_Alloc( sizeof( skinSurface_t ), h_low );
-	skin->surfaces[0].shader = tr.defaultShader;
-}
-
 /*
 ===============
 R_GetSkinByHandle
@@ -1662,10 +3255,10 @@ void	R_SkinList_f( void ) {
 	for ( i = 0 ; i < tr.numSkins ; i++ ) {
 		skin = tr.skins[i];
 
-		ri.Printf( PRINT_ALL, "%3i:%s (%d surfaces)\n", i, skin->name, skin->numSurfaces );
+		ri.Printf( PRINT_ALL, "%3i:%s\n", i, skin->name );
 		for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
 			ri.Printf( PRINT_ALL, "       %s = %s\n", 
-				skin->surfaces[j].name, skin->surfaces[j].shader->name );
+				skin->surfaces[j]->name, skin->surfaces[j]->shader->name );
 		}
 	}
 	ri.Printf (PRINT_ALL, "------------------\n");
diff --git a/code/renderergl1/tr_init.c b/code/renderergl1/tr_init.c
index 1c502018..4a818ada 100644
--- a/code/renderergl1/tr_init.c
+++ b/code/renderergl1/tr_init.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,67 +23,58 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-glconfig_t  glConfig;
-qboolean    textureFilterAnisotropic = qfalse;
-int         maxAnisotropy = 0;
-float       displayAspect = 0.0f;
-qboolean    haveClampToEdge = qfalse;
-
+glconfig_t	glConfig;
+qboolean	textureFilterAnisotropic = qfalse;
+int		 maxAnisotropy = 0;
+float	   displayAspect = 0;
+qboolean	haveClampToEdge;
 glstate_t	glState;
+int r_sequencenumber;
 
 static void GfxInfo_f( void );
 
-#ifdef USE_RENDERER_DLOPEN
-cvar_t  *com_altivec;
-#endif
-
 cvar_t	*r_flareSize;
 cvar_t	*r_flareFade;
-cvar_t	*r_flareCoeff;
-
-cvar_t	*r_railWidth;
-cvar_t	*r_railCoreWidth;
-cvar_t	*r_railSegmentLength;
 
 cvar_t	*r_ignoreFastPath;
 
 cvar_t	*r_verbose;
 cvar_t	*r_ignore;
 
-cvar_t  *r_displayRefresh;
-
-cvar_t	*r_detailTextures;
+cvar_t	*r_displayRefresh;
 
 cvar_t	*r_znear;
-cvar_t	*r_zproj;
-cvar_t	*r_stereoSeparation;
 
 cvar_t	*r_skipBackEnd;
 
-cvar_t	*r_stereoEnabled;
-cvar_t	*r_anaglyphMode;
-
-cvar_t	*r_greyscale;
-
 cvar_t	*r_ignorehwgamma;
 cvar_t	*r_measureOverdraw;
 
 cvar_t	*r_inGameVideo;
 cvar_t	*r_fastsky;
+cvar_t	*r_fastdlights;
 cvar_t	*r_drawSun;
-cvar_t	*r_dynamiclight;
 cvar_t	*r_dlightBacks;
 
-cvar_t	*r_lodbias;
 cvar_t	*r_lodscale;
 
 cvar_t	*r_norefresh;
 cvar_t	*r_drawentities;
+cvar_t	*r_drawentitypoly;
+cvar_t	*r_drawstaticmodels;
+cvar_t	*r_drawstaticmodelpoly;
+cvar_t	*r_drawbrushes;
+cvar_t	*r_drawbrushmodels;
+cvar_t	*r_drawstaticdecals;
+cvar_t	*r_drawterrain;
+cvar_t	*r_drawsprites;
+cvar_t	*r_drawspherelights;
 cvar_t	*r_drawworld;
 cvar_t	*r_speeds;
 cvar_t	*r_fullbright;
 cvar_t	*r_novis;
 cvar_t	*r_nocull;
+cvar_t	*r_showcull;
 cvar_t	*r_facePlaneCull;
 cvar_t	*r_showcluster;
 cvar_t	*r_nocurves;
@@ -91,11 +82,17 @@ cvar_t	*r_nocurves;
 cvar_t	*r_allowExtensions;
 
 cvar_t	*r_ext_compressed_textures;
+cvar_t	*r_ext_gamma_control;
 cvar_t	*r_ext_multitexture;
 cvar_t	*r_ext_compiled_vertex_array;
 cvar_t	*r_ext_texture_env_add;
-cvar_t	*r_ext_texture_filter_anisotropic;
+
+cvar_t	*r_ext_texture_env_combine;
+cvar_t	*r_ext_aniso_filter;
 cvar_t	*r_ext_max_anisotropy;
+cvar_t	*r_forceClampToEdge;
+cvar_t	*r_geForce3WorkAround;
+cvar_t	*r_reset_tc_array;
 
 cvar_t	*r_ignoreGLErrors;
 cvar_t	*r_logFile;
@@ -103,25 +100,39 @@ cvar_t	*r_logFile;
 cvar_t	*r_stencilbits;
 cvar_t	*r_depthbits;
 cvar_t	*r_colorbits;
+cvar_t	*r_stereo;
 cvar_t	*r_primitives;
+cvar_t	*r_largemap;
+cvar_t	*r_textureDetails;
 cvar_t	*r_texturebits;
-cvar_t  *r_ext_multisample;
 
 cvar_t	*r_drawBuffer;
+cvar_t  *r_glDriver;
 cvar_t	*r_lightmap;
 cvar_t	*r_vertexLight;
-cvar_t	*r_uiFullScreen;
 cvar_t	*r_shadows;
+cvar_t	*r_entlight_scale;
+cvar_t	*r_entlight_errbound;
+cvar_t	*r_entlight_cubelevel;
+cvar_t	*r_entlight_cubefraction;
+cvar_t	*r_entlight_maxcalc;
 cvar_t	*r_flares;
 cvar_t	*r_mode;
+cvar_t	*r_maxmode;
+cvar_t	*r_vidmode1024;
+cvar_t	*r_vidmodemax;
 cvar_t	*r_nobind;
 cvar_t	*r_singleShader;
+cvar_t	*r_lerpmodels;
 cvar_t	*r_roundImagesDown;
 cvar_t	*r_colorMipLevels;
 cvar_t	*r_picmip;
+cvar_t	*r_picmip_cap;
 cvar_t	*r_showtris;
 cvar_t	*r_showsky;
 cvar_t	*r_shownormals;
+cvar_t	*r_showhbox;
+cvar_t	*r_showstaticbboxes;
 cvar_t	*r_finish;
 cvar_t	*r_clear;
 cvar_t	*r_swapInterval;
@@ -132,42 +143,138 @@ cvar_t	*r_gamma;
 cvar_t	*r_intensity;
 cvar_t	*r_lockpvs;
 cvar_t	*r_noportals;
+cvar_t	*r_entlightmap;
+cvar_t	*r_fastentlight;
 cvar_t	*r_portalOnly;
 
 cvar_t	*r_subdivisions;
 cvar_t	*r_lodCurveError;
 
 cvar_t	*r_fullscreen;
-cvar_t  *r_noborder;
 
 cvar_t	*r_customwidth;
 cvar_t	*r_customheight;
-cvar_t	*r_customPixelAspect;
+cvar_t	*r_customaspect;
 
 cvar_t	*r_overBrightBits;
 cvar_t	*r_mapOverBrightBits;
 
 cvar_t	*r_debugSurface;
-cvar_t	*r_simpleMipMaps;
 
 cvar_t	*r_showImages;
+cvar_t	*r_showlod;
+cvar_t	*r_showstaticlod;
 
 cvar_t	*r_ambientScale;
 cvar_t	*r_directedScale;
-cvar_t	*r_debugLight;
 cvar_t	*r_debugSort;
 cvar_t	*r_printShaders;
 cvar_t	*r_saveFontData;
 
-cvar_t	*r_marksOnTriangleMeshes;
-
-cvar_t	*r_aviMotionJpegQuality;
-cvar_t	*r_screenshotJpegQuality;
-
 cvar_t	*r_maxpolys;
 int		max_polys;
 cvar_t	*r_maxpolyverts;
 int		max_polyverts;
+cvar_t* r_maxtermarks;
+int		max_termarks;
+cvar_t* r_precacheimages;
+
+cvar_t* r_staticlod;
+cvar_t* r_lodscale;
+cvar_t* r_lodcap;
+cvar_t* r_lodviewmodelcap;
+
+cvar_t* r_uselod;
+cvar_t* lod_LOD;
+cvar_t* lod_minLOD;
+cvar_t* lod_maxLOD;
+cvar_t* lod_LOD_slider;
+cvar_t* lod_curve_0_val;
+cvar_t* lod_curve_1_val;
+cvar_t* lod_curve_2_val;
+cvar_t* lod_curve_3_val;
+cvar_t* lod_curve_4_val;
+cvar_t* lod_edit_0;
+cvar_t* lod_edit_1;
+cvar_t* lod_edit_2;
+cvar_t* lod_edit_3;
+cvar_t* lod_edit_4;
+cvar_t* lod_curve_0_slider;
+cvar_t* lod_curve_1_slider;
+cvar_t* lod_curve_2_slider;
+cvar_t* lod_curve_3_slider;
+cvar_t* lod_curve_4_slider;
+cvar_t* lod_pitch_val;
+cvar_t* lod_zee_val;
+cvar_t* lod_mesh;
+cvar_t* lod_meshname;
+cvar_t* lod_tikiname;
+cvar_t* lod_metric;
+cvar_t* lod_tris;
+cvar_t* lod_position;
+cvar_t* lod_save;
+cvar_t* lod_tool;
+
+cvar_t* sys_cpuid;
+cvar_t* r_sse;
+cvar_t* r_static_shaderdata0;
+cvar_t* r_static_shaderdata1;
+cvar_t* r_static_shaderdata2;
+cvar_t* r_static_shaderdata3;
+cvar_t* r_static_shadermultiplier0;
+cvar_t* r_static_shadermultiplier1;
+cvar_t* r_static_shadermultiplier2;
+cvar_t* r_static_shadermultiplier3;
+
+cvar_t* r_numdebuglines;
+
+
+cvar_t* r_stipplelines;
+cvar_t* r_light_lines;
+cvar_t* r_light_sun_line;
+cvar_t* r_light_int_scale;
+cvar_t* r_light_nolight;
+cvar_t* r_light_showgrid;
+cvar_t* r_skyportal;
+cvar_t* r_skyportal_origin;
+cvar_t* r_farplane;
+cvar_t* r_farplane_bias;
+cvar_t* r_farplane_color;
+cvar_t* r_farplane_nocull;
+cvar_t* r_farplane_nofog;
+cvar_t* r_skybox_farplane;
+cvar_t* r_farclip;
+cvar_t* r_lightcoronasize;
+cvar_t* r_useglfog;
+cvar_t* r_debuglines_depthmask;
+cvar_t* r_smoothsmokelight;
+cvar_t* r_showportal;
+cvar_t* ter_minMarkRadius;
+cvar_t* ter_fastMarks;
+cvar_t* r_alpha_foliage1;
+cvar_t* r_alpha_foliage2;
+cvar_t* r_blendtrees;
+cvar_t* r_blendbushes;
+cvar_t* r_bumpmap;
+cvar_t* r_loadjpg;
+cvar_t* r_loadftx;
+
+cvar_t* r_showSkeleton;
+
+cvar_t* r_ext_multisample;
+cvar_t* r_noborder;
+cvar_t* r_ext_texture_filter_anisotropic;
+cvar_t* r_stereoEnabled;
+cvar_t* r_anaglyphMode;
+
+cvar_t* r_aviMotionJpegQuality;
+cvar_t* r_screenshotJpegQuality;
+
+cvar_t* r_developer;
+cvar_t* r_fps;
+
+static char infostring[8192];
+
 
 /*
 ** InitOpenGL
@@ -179,11 +286,14 @@ int		max_polyverts;
 */
 static void InitOpenGL( void )
 {
+	char renderer_buffer[1024];
+
 	//
 	// initialize OS specific portions of the renderer
 	//
 	// GLimp_Init directly or indirectly references the following cvars:
 	//		- r_fullscreen
+	//		- r_glDriver
 	//		- r_mode
 	//		- r_(color|depth|stencil)bits
 	//		- r_ignorehwgamma
@@ -194,7 +304,10 @@ static void InitOpenGL( void )
 	{
 		GLint		temp;
 		
-		GLimp_Init( qtrue );
+		GLimp_Init(qtrue);
+
+		strcpy( renderer_buffer, glConfig.renderer_string );
+		Q_strlwr( renderer_buffer );
 
 		// OpenGL driver constants
 		qglGetIntegerv( GL_MAX_TEXTURE_SIZE, &temp );
@@ -205,8 +318,15 @@ static void InitOpenGL( void )
 		{
 			glConfig.maxTextureSize = 0;
 		}
+
+		if (haveClampToEdge) {
+			ri.Cvar_Set("r_forceClampToEdge", "1");
+		}
 	}
 
+	// print info
+	GfxInfo_f();
+
 	// set default state
 	GL_SetDefaultState();
 }
@@ -261,8 +381,8 @@ void GL_CheckErrors( void ) {
 typedef struct vidmode_s
 {
 	const char *description;
-	int width, height;
-	float pixelAspect;		// pixel width / height
+	int		 width, height;
+	float		pixelAspect;		// pixel width / height
 } vidmode_t;
 
 vidmode_t r_vidModes[] =
@@ -280,11 +400,10 @@ vidmode_t r_vidModes[] =
 	{ "Mode 10: 2048x1536",		2048,	1536,	1 },
 	{ "Mode 11: 856x480 (wide)",856,	480,	1 }
 };
-static int	s_numVidModes = ARRAY_LEN( r_vidModes );
+static int	s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
 
 qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
 	vidmode_t	*vm;
-	float			pixelAspect;
 
 	if ( mode < -1 ) {
 		return qfalse;
@@ -296,16 +415,15 @@ qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode )
 	if ( mode == -1 ) {
 		*width = r_customwidth->integer;
 		*height = r_customheight->integer;
-		pixelAspect = r_customPixelAspect->value;
-	} else {
-		vm = &r_vidModes[mode];
-
-		*width  = vm->width;
-		*height = vm->height;
-		pixelAspect = vm->pixelAspect;
+		*windowAspect = r_customaspect->value;
+		return qtrue;
 	}
 
-	*windowAspect = (float)*width / ( *height * pixelAspect );
+	vm = &r_vidModes[mode];
+
+	*width  = vm->width;
+	*height = vm->height;
+	*windowAspect = (float)vm->width / ( vm->height * vm->pixelAspect );
 
 	return qtrue;
 }
@@ -385,13 +503,12 @@ byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *pa
 	return buffer;
 }
 
-/* 
-================== 
+/*
+==================
 RB_TakeScreenshot
-================== 
-*/  
-void RB_TakeScreenshot(int x, int y, int width, int height, char *fileName)
-{
+==================
+*/
+void RB_TakeScreenshot( int x, int y, int width, int height, char *fileName ) {
 	byte *allbuf, *buffer;
 	byte *srcptr, *destptr;
 	byte *endline, *endmem;
@@ -450,10 +567,8 @@ void RB_TakeScreenshot(int x, int y, int width, int height, char *fileName)
 ================== 
 RB_TakeScreenshotJPEG
 ================== 
-*/
-
-void RB_TakeScreenshotJPEG(int x, int y, int width, int height, char *fileName)
-{
+*/  
+void RB_TakeScreenshotJPEG( int x, int y, int width, int height, char *fileName ) {
 	byte *buffer;
 	size_t offset = 0, memcount;
 	int padlen;
@@ -561,6 +676,68 @@ void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
 		, a, b, c, d );
 }
 
+/*
+====================
+R_ResampledScreenShot
+====================
+*/
+void R_ResampledScreenShot(const char* filename, int destwidth, int destheight) {
+	char		checkname[MAX_OSPATH];
+	byte		*buffer;
+	byte		*source, *allsource;
+	byte		*src, *dst;
+	size_t			offset = 0;
+	int			padlen;
+	int			x, y;
+	int			r, g, b;
+	float		xScale, yScale;
+	int			xx, yy;
+
+	allsource = RB_ReadPixels(0, 0, glConfig.vidWidth, glConfig.vidHeight, &offset, &padlen);
+	source = allsource + offset;
+
+	buffer = ri.Hunk_AllocateTempMemory(destheight * destwidth * 3 + 18);
+	Com_Memset (buffer, 0, 18);
+	buffer[2]  = 2;		// uncompressed type
+	buffer[12] = destwidth & 255;
+	buffer[13] = destwidth >> 8;
+	buffer[14] = destheight & 255;
+	buffer[15] = destheight >> 8;
+	buffer[16] = 24;	// pixel size
+
+	// resample from source
+	xScale = glConfig.vidWidth / (float)(destwidth * 4);
+	yScale = glConfig.vidHeight / (float)(destheight * 3);
+	for ( y = 0 ; y < destheight ; y++ ) {
+		for ( x = 0 ; x < destwidth ; x++ ) {
+			r = g = b = 0;
+			for ( yy = 0 ; yy < 3 ; yy++ ) {
+				for ( xx = 0 ; xx < 4 ; xx++ ) {
+					src = source + (3 * glConfig.vidWidth + padlen) * (int)((y*3 + yy) * yScale) +
+						3 * (int) ((x*4 + xx) * xScale);
+					r += src[0];
+					g += src[1];
+					b += src[2];
+				}
+			}
+			dst = buffer + 18 + 3 * ( y * destwidth + x );
+			dst[0] = b / 12;
+			dst[1] = g / 12;
+			dst[2] = r / 12;
+		}
+	}
+
+	// gamma correct
+	if ( glConfig.deviceSupportsGamma ) {
+		R_GammaCorrect( buffer + 18, destheight * destwidth * 3 );
+	}
+
+	ri.FS_WriteFile( filename, buffer, destheight * destwidth * 3 + 18 );
+
+	ri.Hunk_FreeTempMemory( buffer );
+	ri.Hunk_FreeTempMemory( allsource );
+}
+
 /*
 ====================
 R_LevelShot
@@ -640,59 +817,85 @@ screenshot [filename]
 Doesn't print the pacifier message if there is a second arg
 ================== 
 */  
-void R_ScreenShot_f (void) {
+void R_ScreenShot_f(void) {
 	char	checkname[MAX_OSPATH];
-	static	int	lastNumber = -1;
+	static int	lastNumber = -1;
+	int		width, height;
 	qboolean	silent;
 
-	if ( !strcmp( ri.Cmd_Argv(1), "levelshot" ) ) {
+	if (!strcmp(ri.Cmd_Argv(1), "levelshot")) {
 		R_LevelShot();
 		return;
 	}
 
-	if ( !strcmp( ri.Cmd_Argv(1), "silent" ) ) {
+	if (!strcmp(ri.Cmd_Argv(1), "silent")) {
 		silent = qtrue;
 	} else {
 		silent = qfalse;
 	}
 
-	if ( ri.Cmd_Argc() == 2 && !silent ) {
+	width = 0;
+	height = 0;
+
+	if (ri.Cmd_Argc() >= 2 && !silent) {
 		// explicit filename
-		Com_sprintf( checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv( 1 ) );
+		const char* name = ri.Cmd_Argv(1);
+		if (strchr(name, '/')) {
+			Q_strncpyz(checkname, name, sizeof(checkname));
+		} else {
+			Com_sprintf(checkname, MAX_OSPATH, "screenshots/%s.tga", ri.Cmd_Argv(1));
+		}
+
+		if (ri.Cmd_Argc() > 2) {
+			width = atoi(ri.Cmd_Argv(2));
+			height = atoi(ri.Cmd_Argv(3));
+		}
 	} else {
 		// scan for a free filename
 
 		// if we have saved a previous screenshot, don't scan
 		// again, because recording demo avis can involve
 		// thousands of shots
-		if ( lastNumber == -1 ) {
+		if (lastNumber == -1) {
 			lastNumber = 0;
 		}
 		// scan for a free number
-		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
-			R_ScreenshotFilename( lastNumber, checkname );
+		for (; lastNumber <= 9999; lastNumber++) {
+			R_ScreenshotFilename(lastNumber, checkname);
 
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
+			if (!ri.FS_FileExists(checkname))
+			{
+				break; // file doesn't exist
+			}
 		}
 
-		if ( lastNumber >= 9999 ) {
-			ri.Printf (PRINT_ALL, "ScreenShot: Couldn't create a file\n"); 
+		if (lastNumber >= 9999) {
+			ri.Printf(PRINT_ALL, "ScreenShot: Couldn't create a file\n");
 			return;
- 		}
+		}
 
 		lastNumber++;
 	}
 
-	R_TakeScreenshot( 0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse );
+	if (!width || !height) {
+		R_TakeScreenshot(0, 0, glConfig.vidWidth, glConfig.vidHeight, checkname, qfalse);
 
-	if ( !silent ) {
-		ri.Printf (PRINT_ALL, "Wrote %s\n", checkname);
+		if (!silent) {
+			char message[64];
+
+			Com_sprintf(message, sizeof(message), "centerprint \"%s %s\"\n", ri.LV_ConvertString("Wrote"), checkname);
+			ri.Cmd_ExecuteText(EXEC_NOW, message);
+		}
+	} else {
+		R_ResampledScreenShot(checkname, width, height);
 	}
-} 
+}
 
+/*
+==================
+RB_TakeScreenshot
+==================
+*/
 void R_ScreenShotJPEG_f (void) {
 	char		checkname[MAX_OSPATH];
 	static	int	lastNumber = -1;
@@ -725,10 +928,10 @@ void R_ScreenShotJPEG_f (void) {
 		for ( ; lastNumber <= 9999 ; lastNumber++ ) {
 			R_ScreenshotFilenameJPEG( lastNumber, checkname );
 
-      if (!ri.FS_FileExists( checkname ))
-      {
-        break; // file doesn't exist
-      }
+	  if (!ri.FS_FileExists( checkname ))
+	  {
+		break; // file doesn't exist
+	  }
 		}
 
 		if ( lastNumber == 10000 ) {
@@ -870,6 +1073,41 @@ void GL_SetDefaultState( void )
 	qglEnable( GL_SCISSOR_TEST );
 	qglDisable( GL_CULL_FACE );
 	qglDisable( GL_BLEND );
+
+	qglFogi(GL_FOG_MODE, GL_LINEAR);
+
+	glState.fFogColor[0] = 0.0;
+	glState.fFogColor[1] = 0.0;
+	glState.fFogColor[2] = 0.0;
+	glState.fFogColor[3] = 1.0;
+}
+
+/*
+==================
+PrintAndAppendString
+==================
+*/
+void PrintAndAppendString(char* string, size_t maxlen, char* fmt, ...) {
+	char msg[1024];
+	size_t len;
+	va_list va;
+
+	va_start(va, fmt);
+	Q_vsnprintf(msg, sizeof(msg), fmt, va);
+	va_end(va);
+
+	ri.Printf(PRINT_ALL, "%s", msg);
+
+	Q_strcat(string, maxlen, msg);
+}
+
+/*
+==================
+RE_GetGraphicsInfo
+==================
+*/
+const char* RE_GetGraphicsInfo() {
+	return infostring;
 }
 
 /*
@@ -879,7 +1117,7 @@ R_PrintLongString
 Workaround for ri.Printf's 1024 characters buffer limit.
 ================
 */
-void R_PrintLongString(const char *string) {
+void R_PrintLongString(char* dest, size_t destsize, const char *string) {
 	char buffer[1024];
 	const char *p;
 	int size = strlen(string);
@@ -888,19 +1126,19 @@ void R_PrintLongString(const char *string) {
 	while(size > 0)
 	{
 		Q_strncpyz(buffer, p, sizeof (buffer) );
-		ri.Printf( PRINT_ALL, "%s", buffer );
+		PrintAndAppendString( dest, destsize, "%s", buffer );
 		p += 1023;
 		size -= 1023;
 	}
 }
 
 /*
-================
-GfxInfo_f
-================
+==================
+BuildGfxInfo
+==================
 */
-void GfxInfo_f( void ) 
-{
+void BuildGfxInfo(char* dest, size_t destsize) {
+	cvar_t *sys_cpustring = ri.Cvar_Get( "sys_cpustring", "", 0 );
 	const char *enablestrings[] =
 	{
 		"disabled",
@@ -912,10 +1150,10 @@ void GfxInfo_f( void )
 		"fullscreen"
 	};
 
-	ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
-	ri.Printf( PRINT_ALL, "GL_EXTENSIONS: " );
+	PrintAndAppendString( dest, destsize, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
+	PrintAndAppendString( dest, destsize, "GL_RENDERER: %s\n", glConfig.renderer_string );
+	PrintAndAppendString( dest, destsize, "GL_VERSION: %s\n", glConfig.version_string );
+	PrintAndAppendString( dest, destsize, "GL_EXTENSIONS: " );
 	// glConfig.extensions_string is a limited length so get the full list directly
 	if ( qglGetStringi )
 	{
@@ -925,41 +1163,42 @@ void GfxInfo_f( void )
 		qglGetIntegerv( GL_NUM_EXTENSIONS, &numExtensions );
 		for ( i = 0; i < numExtensions; i++ )
 		{
-			ri.Printf( PRINT_ALL, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
+			PrintAndAppendString( dest, destsize, "%s ", qglGetStringi( GL_EXTENSIONS, i ) );
 		}
 	}
 	else
 	{
-		R_PrintLongString( (char *) qglGetString( GL_EXTENSIONS ) );
+		R_PrintLongString( dest, destsize, (char *) qglGetString( GL_EXTENSIONS ) );
 	}
-	ri.Printf( PRINT_ALL, "\n" );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
-	ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-	ri.Printf( PRINT_ALL, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
+	PrintAndAppendString( dest, destsize, "\n" );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
+	PrintAndAppendString( dest, destsize, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
+	PrintAndAppendString( dest, destsize, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
+	PrintAndAppendString( dest, destsize, "MODE: %d, %d x %d %s hz:", r_mode->integer, glConfig.vidWidth, glConfig.vidHeight, fsstrings[r_fullscreen->integer == 1] );
 	if ( glConfig.displayFrequency )
 	{
-		ri.Printf( PRINT_ALL, "%d\n", glConfig.displayFrequency );
+		PrintAndAppendString( dest, destsize, "%d\n", glConfig.displayFrequency );
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "N/A\n" );
+		PrintAndAppendString( dest, destsize, "N/A\n" );
 	}
 	if ( glConfig.deviceSupportsGamma )
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: hardware w/ %d overbright bits\n", tr.overbrightBits );
 	}
 	else
 	{
-		ri.Printf( PRINT_ALL, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
+		PrintAndAppendString( dest, destsize, "GAMMA: software w/ %d overbright bits\n", tr.overbrightBits );
 	}
+	PrintAndAppendString( dest, destsize, "CPU: %s\n", sys_cpustring->string );
 
 	// rendering primitives
 	{
 		int		primitives;
 
 		// default is to use triangles if compiled vertex arrays are present
-		ri.Printf( PRINT_ALL, "rendering primitives: " );
+		PrintAndAppendString( dest, destsize, "rendering primitives: " );
 		primitives = r_primitives->integer;
 		if ( primitives == 0 ) {
 			if ( qglLockArraysEXT ) {
@@ -969,40 +1208,95 @@ void GfxInfo_f( void )
 			}
 		}
 		if ( primitives == -1 ) {
-			ri.Printf( PRINT_ALL, "none\n" );
+			PrintAndAppendString( dest, destsize, "none\n" );
 		} else if ( primitives == 2 ) {
-			ri.Printf( PRINT_ALL, "single glDrawElements\n" );
+			PrintAndAppendString( dest, destsize, "single glDrawElements\n" );
 		} else if ( primitives == 1 ) {
-			ri.Printf( PRINT_ALL, "multiple glArrayElement\n" );
+			PrintAndAppendString( dest, destsize, "multiple glArrayElement\n" );
 		} else if ( primitives == 3 ) {
-			ri.Printf( PRINT_ALL, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
+			PrintAndAppendString( dest, destsize, "multiple glColor4ubv + glTexCoord2fv + glVertex3fv\n" );
 		}
 	}
 
-	ri.Printf( PRINT_ALL, "texturemode: %s\n", r_textureMode->string );
-	ri.Printf( PRINT_ALL, "picmip: %d\n", r_picmip->integer );
-	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits->integer );
-	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
+	PrintAndAppendString( dest, destsize, "texturemode: %s\n", r_textureMode->string );
+	PrintAndAppendString( dest, destsize, "picmip: %d\n", r_picmip->integer );
+	PrintAndAppendString( dest, destsize, "texture bits: %d\n", r_texturebits->integer );
+	PrintAndAppendString( dest, destsize, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
+	PrintAndAppendString( dest, destsize, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
+	PrintAndAppendString( dest, destsize, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
+	PrintAndAppendString( dest, destsize, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
 	if ( r_vertexLight->integer || glConfig.hardwareType == GLHW_PERMEDIA2 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: using vertex lightmap approximation\n" );
+		PrintAndAppendString( dest, destsize, "HACK: using vertex lightmap approximation\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RAGEPRO )
 	{
-		ri.Printf( PRINT_ALL, "HACK: ragePro approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: ragePro approximations\n" );
 	}
 	if ( glConfig.hardwareType == GLHW_RIVA128 )
 	{
-		ri.Printf( PRINT_ALL, "HACK: riva128 approximations\n" );
+		PrintAndAppendString( dest, destsize, "HACK: riva128 approximations\n" );
+	}
+	if ( glConfig.smpActive ) {
+		PrintAndAppendString( dest, destsize, "Using dual processor acceleration\n" );
 	}
 	if ( r_finish->integer ) {
-		ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
+		PrintAndAppendString( dest, destsize, "Forcing glFinish\n" );
 	}
 }
 
+/*
+================
+GfxInfo_f
+================
+*/
+void GfxInfo_f( void ) 
+{
+	BuildGfxInfo(infostring, sizeof(infostring));
+	ri.Cvar_Set("r_gfxinfo", infostring);
+}
+
+/*
+==================
+FarPlaneInfo_f
+==================
+*/
+void FarPlaneInfo_f(void) {
+	ri.Printf(PRINT_ALL, "Current fog settings:\n");
+	ri.Printf(PRINT_ALL, "Distance: %i\n", (int)tr.viewParms.farplane_distance);
+	ri.Printf(PRINT_ALL, 
+		"Color: %f  %f  %f\n",
+		tr.viewParms.farplane_color[0],
+		tr.viewParms.farplane_color[1],
+		tr.viewParms.farplane_color[2]);
+	if (tr.viewParms.farplane_cull) {
+		ri.Printf(PRINT_ALL, "Cull: on\n");
+	} else {
+		ri.Printf(PRINT_ALL, "Cull: off\n");
+	}
+}
+
+/*
+==================
+R_SetMode
+==================
+*/
+qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
+    // FIXME: unimplemented
+	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
+	return qfalse;
+}
+
+/*
+==================
+R_SetFullscreen
+==================
+*/
+void R_SetFullscreen(qboolean fullscreen) {
+    // FIXME: unimplemented
+    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
+}
+
 /*
 ===============
 R_Register
@@ -1010,50 +1304,77 @@ R_Register
 */
 void R_Register( void ) 
 {
-	#ifdef USE_RENDERER_DLOPEN
-	com_altivec = ri.Cvar_Get("com_altivec", "1", CVAR_ARCHIVE);
-	#endif	
-
 	//
 	// latched and archived variables
 	//
+	r_glDriver = ri.Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE | CVAR_LATCH );
 	r_allowExtensions = ri.Cvar_Get( "r_allowExtensions", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_compressed_textures = ri.Cvar_Get( "r_ext_compressed_textures", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_ext_gamma_control = ri.Cvar_Get( "r_ext_gamma_control", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_multitexture = ri.Cvar_Get( "r_ext_multitexture", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ext_compiled_vertex_array = ri.Cvar_Get( "r_ext_compiled_vertex_array", "1", CVAR_ARCHIVE | CVAR_LATCH);
+#ifdef __linux__ // broken on linux
+	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "0", CVAR_ARCHIVE | CVAR_LATCH);
+#else
 	r_ext_texture_env_add = ri.Cvar_Get( "r_ext_texture_env_add", "1", CVAR_ARCHIVE | CVAR_LATCH);
-
-	r_ext_texture_filter_anisotropic = ri.Cvar_Get( "r_ext_texture_filter_anisotropic",
-			"0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_max_anisotropy = ri.Cvar_Get( "r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH );
+#endif
+	r_ext_texture_env_combine = ri.Cvar_Get("r_ext_texture_env_combine", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_aniso_filter = ri.Cvar_Get("r_ext_aniso_filter", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_max_anisotropy = ri.Cvar_Get("r_ext_max_anisotropy", "2", CVAR_ARCHIVE | CVAR_LATCH);
+	r_forceClampToEdge = ri.Cvar_Get("r_forceClampToEdge", "0", CVAR_ROM);
+	r_geForce3WorkAround = ri.Cvar_Get("r_geForce3WorkAround", "1", CVAR_ARCHIVE);
+	r_reset_tc_array = ri.Cvar_Get("r_reset_tc_array", "1", CVAR_ARCHIVE);
 
 	r_picmip = ri.Cvar_Get ("r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_picmip_cap = ri.Cvar_Get ("r_picmip_cap", "0", CVAR_ARCHIVE | CVAR_LATCH );
+    if (r_picmip->integer < r_picmip_cap->integer) {
+        ri.Cvar_Set("r_picmip", r_picmip_cap->string);
+    }
+
+    if (r_picmip->integer < 2) {
+        r_largemap = ri.Cvar_Get("r_largemap", "1", 0);
+	} else {
+		r_largemap = ri.Cvar_Get("r_largemap", "0", 0);
+	}
+	
 	r_roundImagesDown = ri.Cvar_Get ("r_roundImagesDown", "1", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorMipLevels = ri.Cvar_Get ("r_colorMipLevels", "0", CVAR_LATCH );
 	ri.Cvar_CheckRange( r_picmip, 0, 16, qtrue );
-	r_detailTextures = ri.Cvar_Get( "r_detailtextures", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_textureDetails = ri.Cvar_Get("r_textureDetails", "1", 33);
 	r_texturebits = ri.Cvar_Get( "r_texturebits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_colorbits = ri.Cvar_Get( "r_colorbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_stereo = ri.Cvar_Get( "r_stereo", "0", CVAR_ARCHIVE | CVAR_LATCH );
+#ifdef __linux__
+	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
+#else
 	r_stencilbits = ri.Cvar_Get( "r_stencilbits", "8", CVAR_ARCHIVE | CVAR_LATCH );
-	r_depthbits = ri.Cvar_Get( "r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_ext_multisample = ri.Cvar_Get( "r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
-	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
+#endif
+	r_depthbits = ri.Cvar_Get("r_depthbits", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_mode = ri.Cvar_Get( "r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH );
-	r_fullscreen = ri.Cvar_Get( "r_fullscreen", "1", CVAR_ARCHIVE );
-	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_maxmode = ri.Cvar_Get("r_maxmode", "6", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmode1024 = ri.Cvar_Get("r_vidmode1024", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_vidmodemax = ri.Cvar_Get("r_vidmodemax", "1", CVAR_ARCHIVE | CVAR_LATCH);
+	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	
+	// Added in 2.0
+	//  But removed because it's kind of annoying
+	//if (r_mode->integer > r_maxmode->integer)
+	//{
+	//	char buf[8];
+	//
+	//	Com_sprintf(buf, sizeof(buf), "%d", r_maxmode->integer);
+	//	ri.Cvar_Set("r_mode", buf);
+	//	r_mode = ri.Cvar_Get("r_mode", "3", CVAR_ARCHIVE | CVAR_LATCH);
+	//}
+	r_fullscreen = ri.Cvar_Get("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
 	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
-	r_customPixelAspect = ri.Cvar_Get( "r_customPixelAspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_simpleMipMaps = ri.Cvar_Get( "r_simpleMipMaps", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_vertexLight = ri.Cvar_Get( "r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH );
-	r_uiFullScreen = ri.Cvar_Get( "r_uifullscreen", "0", 0);
-	r_subdivisions = ri.Cvar_Get ("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
-	r_stereoEnabled = ri.Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	r_ignoreFastPath = ri.Cvar_Get( "r_ignoreFastPath", "1", CVAR_ARCHIVE | CVAR_LATCH );
-	r_greyscale = ri.Cvar_Get("r_greyscale", "0", CVAR_ARCHIVE | CVAR_LATCH);
-	ri.Cvar_CheckRange(r_greyscale, 0, 1, qfalse);
+	r_customaspect = ri.Cvar_Get( "r_customaspect", "1", CVAR_ARCHIVE | CVAR_LATCH );
+	r_vertexLight = ri.Cvar_Get("r_vertexLight", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ignoreFastPath = ri.Cvar_Get("r_ignoreFastPath", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_subdivisions = ri.Cvar_Get("r_subdivisions", "4", CVAR_ARCHIVE | CVAR_LATCH);
+	ri.Cvar_CheckRange(r_subdivisions, 2, 24, qtrue);
 
 	//
 	// temporary latched variables that can only change over a restart
@@ -1061,37 +1382,30 @@ void R_Register( void )
 	r_displayRefresh = ri.Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
 	ri.Cvar_CheckRange( r_displayRefresh, 0, 200, qtrue );
 	r_fullbright = ri.Cvar_Get ("r_fullbright", "0", CVAR_LATCH|CVAR_CHEAT );
-	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "2", CVAR_LATCH );
+	r_mapOverBrightBits = ri.Cvar_Get ("r_mapOverBrightBits", "1", CVAR_LATCH );
 	r_intensity = ri.Cvar_Get ("r_intensity", "1", CVAR_LATCH );
+	r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
 	r_singleShader = ri.Cvar_Get ("r_singleShader", "0", CVAR_CHEAT | CVAR_LATCH );
 
 	//
 	// archived variables that can change at any time
 	//
+	r_lerpmodels = ri.Cvar_Get("r_lerpmodels", "1", 0);
 	r_lodCurveError = ri.Cvar_Get( "r_lodCurveError", "250", CVAR_ARCHIVE|CVAR_CHEAT );
-	r_lodbias = ri.Cvar_Get( "r_lodbias", "0", CVAR_ARCHIVE );
 	r_flares = ri.Cvar_Get ("r_flares", "0", CVAR_ARCHIVE );
 	r_znear = ri.Cvar_Get( "r_znear", "4", CVAR_CHEAT );
-	ri.Cvar_CheckRange( r_znear, 0.001f, 200, qfalse );
-	r_zproj = ri.Cvar_Get( "r_zproj", "64", CVAR_ARCHIVE );
-	r_stereoSeparation = ri.Cvar_Get( "r_stereoSeparation", "64", CVAR_ARCHIVE );
+	ri.Cvar_CheckRange( r_znear, 0.001f, 200, qtrue );
 	r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "1", CVAR_ARCHIVE );
-	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
-	r_inGameVideo = ri.Cvar_Get( "r_inGameVideo", "1", CVAR_ARCHIVE );
+	r_fastsky = ri.Cvar_Get( "r_fastsky", "0", 0 );
+	r_fastdlights = ri.Cvar_Get("r_fastdlights", "1", CVAR_ARCHIVE | CVAR_LATCH);
 	r_drawSun = ri.Cvar_Get( "r_drawSun", "0", CVAR_ARCHIVE );
-	r_dynamiclight = ri.Cvar_Get( "r_dynamiclight", "1", CVAR_ARCHIVE );
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
-	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE );
-	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0",
-					CVAR_ARCHIVE | CVAR_LATCH );
+	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST", CVAR_ARCHIVE );
+	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE );
 	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
 	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
 
-	r_railWidth = ri.Cvar_Get( "r_railWidth", "16", CVAR_ARCHIVE );
-	r_railCoreWidth = ri.Cvar_Get( "r_railCoreWidth", "6", CVAR_ARCHIVE );
-	r_railSegmentLength = ri.Cvar_Get( "r_railSegmentLength", "32", CVAR_ARCHIVE );
-
 	r_primitives = ri.Cvar_Get( "r_primitives", "0", CVAR_ARCHIVE );
 
 	r_ambientScale = ri.Cvar_Get( "r_ambientScale", "0.6", CVAR_CHEAT );
@@ -1103,11 +1417,41 @@ void R_Register( void )
 	// temporary variables that can change at any time
 	//
 	r_showImages = ri.Cvar_Get( "r_showImages", "0", CVAR_TEMP );
+	r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
+	r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
+	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
+	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
+	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
+	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
+	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
+	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
+	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
+	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
+	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
+	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
+	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
+	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
+	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
+	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
+	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
+	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
+	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
+	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
+	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
+	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
+	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
+	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
+	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
+	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
+	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
+	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
+	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
+	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
+	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
+	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
 
-	r_debugLight = ri.Cvar_Get( "r_debuglight", "0", CVAR_TEMP );
 	r_debugSort = ri.Cvar_Get( "r_debugSort", "0", CVAR_CHEAT );
 	r_printShaders = ri.Cvar_Get( "r_printShaders", "0", 0 );
-	r_saveFontData = ri.Cvar_Get( "r_saveFontData", "0", 0 );
 
 	r_nocurves = ri.Cvar_Get ("r_nocurves", "0", CVAR_CHEAT );
 	r_drawworld = ri.Cvar_Get ("r_drawworld", "1", CVAR_CHEAT );
@@ -1116,16 +1460,28 @@ void R_Register( void )
 
 	r_flareSize = ri.Cvar_Get ("r_flareSize", "40", CVAR_CHEAT);
 	r_flareFade = ri.Cvar_Get ("r_flareFade", "7", CVAR_CHEAT);
-	r_flareCoeff = ri.Cvar_Get ("r_flareCoeff", FLARE_STDCOEFF, CVAR_CHEAT);
 
 	r_skipBackEnd = ri.Cvar_Get ("r_skipBackEnd", "0", CVAR_CHEAT);
 
 	r_measureOverdraw = ri.Cvar_Get( "r_measureOverdraw", "0", CVAR_CHEAT );
-	r_lodscale = ri.Cvar_Get( "r_lodscale", "5", CVAR_CHEAT );
-	r_norefresh = ri.Cvar_Get ("r_norefresh", "0", CVAR_CHEAT);
-	r_drawentities = ri.Cvar_Get ("r_drawentities", "1", CVAR_CHEAT );
+	r_norefresh = ri.Cvar_Get("r_norefresh", "0", CVAR_CHEAT);
+	r_drawentities = ri.Cvar_Get("r_drawentities", "1", CVAR_CHEAT);
+	r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
+	r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
+	r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
+	r_drawbrushes = ri.Cvar_Get("r_drawbrushes", "1", CVAR_CHEAT);
+	r_drawbrushmodels = ri.Cvar_Get("r_drawbrushmodels", "1", CVAR_CHEAT);
+	r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
+	r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
+	r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
+	r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
+	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
+	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
+	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
+	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
 	r_ignore = ri.Cvar_Get( "r_ignore", "1", CVAR_CHEAT );
 	r_nocull = ri.Cvar_Get ("r_nocull", "0", CVAR_CHEAT);
+	r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
 	r_novis = ri.Cvar_Get ("r_novis", "0", CVAR_CHEAT);
 	r_showcluster = ri.Cvar_Get ("r_showcluster", "0", CVAR_CHEAT);
 	r_speeds = ri.Cvar_Get ("r_speeds", "0", CVAR_CHEAT);
@@ -1136,21 +1492,75 @@ void R_Register( void )
 	r_showtris = ri.Cvar_Get ("r_showtris", "0", CVAR_CHEAT);
 	r_showsky = ri.Cvar_Get ("r_showsky", "0", CVAR_CHEAT);
 	r_shownormals = ri.Cvar_Get ("r_shownormals", "0", CVAR_CHEAT);
+	r_showhbox = ri.Cvar_Get("r_showhbox", "0", CVAR_CHEAT);
+	r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
 	r_clear = ri.Cvar_Get ("r_clear", "0", CVAR_CHEAT);
 	r_offsetFactor = ri.Cvar_Get( "r_offsetfactor", "-1", CVAR_CHEAT );
 	r_offsetUnits = ri.Cvar_Get( "r_offsetunits", "-2", CVAR_CHEAT );
 	r_drawBuffer = ri.Cvar_Get( "r_drawBuffer", "GL_BACK", CVAR_CHEAT );
 	r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", CVAR_CHEAT);
 	r_noportals = ri.Cvar_Get ("r_noportals", "0", CVAR_CHEAT);
+	r_entlightmap = ri.Cvar_Get("r_entlightmap", "0", CVAR_CHEAT);
+	r_fastentlight = ri.Cvar_Get("r_fastentlight", "1", CVAR_ARCHIVE);
+	r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
+	r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
+	r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
+	r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
+	r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
 	r_shadows = ri.Cvar_Get( "cg_shadows", "1", 0 );
 
-	r_marksOnTriangleMeshes = ri.Cvar_Get("r_marksOnTriangleMeshes", "0", CVAR_ARCHIVE);
-
-	r_aviMotionJpegQuality = ri.Cvar_Get("r_aviMotionJpegQuality", "90", CVAR_ARCHIVE);
-	r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
-
 	r_maxpolys = ri.Cvar_Get( "r_maxpolys", va("%d", MAX_POLYS), 0);
 	r_maxpolyverts = ri.Cvar_Get( "r_maxpolyverts", va("%d", MAX_POLYVERTS), 0);
+	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
+
+	r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
+	r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
+	r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
+	r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
+	r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
+	r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
+	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
+	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
+	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
+	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
+	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
+	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
+	r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+	r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+	r_useglfog = ri.Cvar_Get("r_useglfog", "1", 64);
+	r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
+	r_smoothsmokelight = ri.Cvar_Get("vss_smoothsmokelight", "1", CVAR_ARCHIVE);
+	r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
+	sys_cpuid = ri.Cvar_Get("sys_cpuid", "0", 0);
+	r_sse = ri.Cvar_Get("r_sse", "0", CVAR_ARCHIVE);
+	r_static_shaderdata0 = ri.Cvar_Get("r_static_shaderdata0", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata1 = ri.Cvar_Get("r_static_shaderdata1", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata2 = ri.Cvar_Get("r_static_shaderdata2", "0", CVAR_SYSTEMINFO);
+	r_static_shaderdata3 = ri.Cvar_Get("r_static_shaderdata3", "0", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier0 = ri.Cvar_Get("r_static_shadermultiplier0", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier1 = ri.Cvar_Get("r_static_shadermultiplier1", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier2 = ri.Cvar_Get("r_static_shadermultiplier2", "1", CVAR_SYSTEMINFO);
+	r_static_shadermultiplier3 = ri.Cvar_Get("r_static_shadermultiplier3", "1", CVAR_SYSTEMINFO);
+	r_precacheimages = ri.Cvar_Get("r_precacheimages", "0", 0);
+	ter_minMarkRadius = ri.Cvar_Get("ter_minMarkRadius", "8", CVAR_ARCHIVE);
+	ter_fastMarks = ri.Cvar_Get("ter_fastMarks", "1", CVAR_ARCHIVE);
+	r_alpha_foliage1 = ri.Cvar_Get("r_alpha_foliage1", "0.75", CVAR_CHEAT);
+	r_alpha_foliage2 = ri.Cvar_Get("r_alpha_foliage2", "0.75", CVAR_CHEAT);
+	r_blendtrees = ri.Cvar_Get("r_blendtrees", "0", CVAR_LATCH);
+	r_blendbushes = ri.Cvar_Get("r_blendbushes", "0", CVAR_LATCH);
+	r_fps = ri.Cvar_Get("fps", "0", 0);
+	r_loadjpg = ri.Cvar_Get("r_loadjpg", "1", CVAR_LATCH);
+	r_loadftx = ri.Cvar_Get("r_loadftx", "0", CVAR_LATCH);
+
+	r_ext_multisample = ri.Cvar_Get("r_ext_multisample", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_noborder = ri.Cvar_Get("r_noborder", "0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_ext_texture_filter_anisotropic = ri.Cvar_Get("r_ext_texture_filter_anisotropic",
+		"0", CVAR_ARCHIVE | CVAR_LATCH);
+	r_stereoEnabled = ri.Cvar_Get("r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH);
 
 	// make sure all the commands added here are also
 	// removed in R_Shutdown
@@ -1162,7 +1572,35 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "screenshot", R_ScreenShot_f );
 	ri.Cmd_AddCommand( "screenshotJPEG", R_ScreenShotJPEG_f );
 	ri.Cmd_AddCommand( "gfxinfo", GfxInfo_f );
-	ri.Cmd_AddCommand( "minimize", GLimp_Minimize );
+	ri.Cmd_AddCommand( "farplane_info", FarPlaneInfo_f );
+	ri.Cmd_AddCommand( "r_infostaticmodels", R_InfoStaticModels_f );
+	ri.Cmd_AddCommand( "r_infoworldtris", R_InfoWorldTris_f );
+
+	//
+	// Added in OPM
+	//
+
+	r_developer = ri.Cvar_Get("developer", "", 0);
+    r_showSkeleton = ri.Cvar_Get("r_showSkeleton", "0", CVAR_CHEAT);
+	r_aviMotionJpegQuality = ri.Cvar_Get("r_aviMotionJpegQuality", "90", CVAR_ARCHIVE);
+    r_screenshotJpegQuality = ri.Cvar_Get("r_screenshotJpegQuality", "90", CVAR_ARCHIVE);
+
+	ri.Cmd_AddCommand( "ter_crater", R_TerrainCrater_f );
+}
+
+void R_InitExtensions() {
+	// FIXME: qglTextureEnvCombineExists
+	glState.cntTexEnvExt = 0;
+	glState.cntnvblendmode = 0;
+
+	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, 34165.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_ALPHA, 8448.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, 0x47057700);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, 0x44400000);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 5890.0);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, 0x44400000);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, 0x47057700);
+	qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, 770.0);
 }
 
 /*
@@ -1182,16 +1620,18 @@ void R_Init( void ) {
 	Com_Memset( &backEnd, 0, sizeof( backEnd ) );
 	Com_Memset( &tess, 0, sizeof( tess ) );
 
-	if(sizeof(glconfig_t) != 11332)
-		ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t) == %u != 11332", (unsigned int) sizeof(glconfig_t));
-
 //	Swap_Init();
 
 	if ( (intptr_t)tess.xyz & 15 ) {
-		ri.Printf( PRINT_WARNING, "tess.xyz not 16 byte aligned\n" );
+		ri.Printf(PRINT_ALL,  "WARNING: tess.xyz not 16 byte aligned\n" );
 	}
 	Com_Memset( tess.constantColor255, 255, sizeof( tess.constantColor255 ) );
 
+	tr.worldEntity.e.shaderRGBA[0] = -1;
+	tr.worldEntity.e.shaderRGBA[1] = 0;
+	tr.worldEntity.e.shaderRGBA[2] = -1;
+	tr.worldEntity.e.shaderRGBA[3] = -1;
+
 	//
 	// init function tables
 	//
@@ -1219,10 +1659,16 @@ void R_Init( void ) {
 		}
 	}
 
-	R_InitFogTable();
+	tr.rendererhandle = ri.Milliseconds();
+
+	if (!tr.rendererhandle) {
+		tr.rendererhandle = -1;
+	}
 
 	R_NoiseInit();
 
+	R_Sky_Init();
+
 	R_Register();
 
 	max_polys = r_maxpolys->integer;
@@ -1233,31 +1679,38 @@ void R_Init( void ) {
 	if (max_polyverts < MAX_POLYVERTS)
 		max_polyverts = MAX_POLYVERTS;
 
-	ptr = ri.Hunk_Alloc( sizeof( *backEndData ) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts, h_low);
-	backEndData = (backEndData_t *) ptr;
-	backEndData->polys = (srfPoly_t *) ((char *) ptr + sizeof( *backEndData ));
-	backEndData->polyVerts = (polyVert_t *) ((char *) ptr + sizeof( *backEndData ) + sizeof(srfPoly_t) * max_polys);
+	max_termarks = r_maxtermarks->integer;
+	if (max_termarks < MAX_TERMARKS)
+		max_termarks = MAX_TERMARKS;
+
+	ptr = ri.Malloc(sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts + sizeof(srfMarkFragment_t) * max_termarks);
+	backEndData = (backEndData_t*)ptr;
+	backEndData->polys = (srfPoly_t*)((char*)ptr + sizeof(*backEndData));
+	backEndData->polyVerts = (polyVert_t*)((char*)ptr + sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys);
+	backEndData->terMarks = (srfMarkFragment_t*)((char*)ptr + sizeof(*backEndData) + sizeof(srfPoly_t) * max_polys + sizeof(polyVert_t) * max_polyverts);
+	backEndData->staticModels = NULL;
+	backEndData->staticModelData = NULL;
 	R_InitNextFrame();
 
 	InitOpenGL();
 
+	R_InitExtensions();
+
 	R_InitImages();
 
-	R_InitShaders();
-
-	R_InitSkins();
+	R_StartupShaders();
 
 	R_ModelInit();
 
-	R_InitFreeType();
+	R_LevelMarksInit();
 
+	tr.pFontDebugStrings = R_LoadFont("verdana-14");
+	g_bInfoworldtris = qfalse;
 
 	err = qglGetError();
 	if ( err != GL_NO_ERROR )
 		ri.Printf (PRINT_ALL, "glGetError() = 0x%x\n", err);
 
-	// print info
-	GfxInfo_f();
 	ri.Printf( PRINT_ALL, "----- finished R_Init -----\n" );
 }
 
@@ -1270,15 +1723,15 @@ void RE_Shutdown( qboolean destroyWindow ) {
 
 	ri.Printf( PRINT_ALL, "RE_Shutdown( %i )\n", destroyWindow );
 
-	ri.Cmd_RemoveCommand( "imagelist" );
-	ri.Cmd_RemoveCommand( "shaderlist" );
-	ri.Cmd_RemoveCommand( "skinlist" );
-	ri.Cmd_RemoveCommand( "modellist" );
+	ri.Cmd_RemoveCommand ("modellist");
+	ri.Cmd_RemoveCommand ("screenshotJPEG");
+	ri.Cmd_RemoveCommand ("screenshot");
+	ri.Cmd_RemoveCommand ("imagelist");
+	ri.Cmd_RemoveCommand ("shaderlist");
+	ri.Cmd_RemoveCommand ("skinlist");
+	ri.Cmd_RemoveCommand ("gfxinfo");
 	ri.Cmd_RemoveCommand( "modelist" );
-	ri.Cmd_RemoveCommand( "screenshot" );
-	ri.Cmd_RemoveCommand( "screenshotJPEG" );
-	ri.Cmd_RemoveCommand( "gfxinfo" );
-	ri.Cmd_RemoveCommand( "minimize" );
+	ri.Cmd_RemoveCommand( "shaderstate" );
 
 
 	if ( tr.registered ) {
@@ -1286,8 +1739,6 @@ void RE_Shutdown( qboolean destroyWindow ) {
 		R_DeleteTextures();
 	}
 
-	R_DoneFreeType();
-
 	// shut down platform specific OpenGL stuff
 	if ( destroyWindow ) {
 		GLimp_Shutdown();
@@ -1301,9 +1752,52 @@ void RE_Shutdown( qboolean destroyWindow ) {
 		Com_Memset( &glState, 0, sizeof( glState ) );
 	}
 
+	R_ShutdownFont();
+
+	R_ShutdownTerrain();
+
 	tr.registered = qfalse;
 }
 
+//extern qboolean scr_initialized;
+
+/*
+** RE_BeginRegistration
+*/
+void RE_BeginRegistration(glconfig_t* glconfigOut) {
+
+	ri.UI_LoadResource("*123");
+	//scr_initialized = 0;
+
+	R_IssuePendingRenderCommands();
+
+	R_LevelMarksFree();
+	R_TerrainFree();
+
+	ri.Hunk_Clear();
+
+	*glconfigOut = glConfig;
+
+	r_sequencenumber++;
+	tr.viewCluster = -1;		// force markleafs to regenerate
+	R_ClearFlares();
+	RE_ClearScene();
+
+	// Added in OPM
+	//  Clear the world because some components
+	//  like the mark system access the world object
+	//  to free allocated marks
+	R_ClearWorld();
+
+	R_SetupShaders();
+	R_InitLensFlare();
+	R_LevelMarksInit();
+
+	tr.registered = qtrue;
+
+	//scr_initialized = 1;
+	ri.UI_LoadResource("*124");
+}
 
 /*
 =============
@@ -1314,11 +1808,30 @@ Touch all images to make sure they are resident
 */
 void RE_EndRegistration( void ) {
 	R_IssuePendingRenderCommands();
-	if (!ri.Sys_LowPhysicalMemory()) {
-		RB_ShowImages();
+	if (r_precacheimages->integer) {
+		int start, end;
+
+		start = ri.Milliseconds();
+
+		RB_ShowImages(qtrue);
+
+		end = ri.Milliseconds();
+
+		ri.Printf(PRINT_ALL, "RB_ShowImages: %5.2f seconds\n", (float)((end - start) / 1000.f));
 	}
+
+	R_FreeUnusedImages();
 }
 
+/*
+=============
+RE_SetRenderTime
+=============
+*/
+void RE_SetRenderTime(int t) {
+	backEnd.refdef.floatTime = (long double)t / 1000.0;
+	R_UpdateGhostTextures();
+}
 
 /*
 @@@@@@@@@@@@@@@@@@@@@
@@ -1344,6 +1857,8 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 		return NULL;
 	}
 
+	R_Init();
+
 	// the RE_ functions are Renderer Entry points
 
 	re.Shutdown = RE_Shutdown;
@@ -1384,5 +1899,70 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	re.TakeVideoFrame = RE_TakeVideoFrame;
 
+	//
+	// After ioquake3 imports
+	//
+
+    re.FreeModels = RE_FreeModels;
+	re.EndRegistration = RE_EndRegistration;
+    re.SpawnEffectModel = RE_SpawnEffectModel;
+    re.RegisterServerModel = RE_RegisterServerModel;
+    re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+    re.LoadFont = R_LoadFont;
+
+    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+    re.GetInlineModelBounds = R_GetInlineModelBounds;
+    re.GetLightingForDecal = R_GetLightingForDecal;
+    re.GetLightingForSmoke = R_GetLightingForSmoke;
+    re.R_GatherLightSources = R_GatherLightSources;
+    re.ModelRadius = R_ModelRadius;
+    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
+    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+
+    re.GetRenderEntity = RE_GetRenderEntity;
+
+	re.SavePerformanceCounters = R_SavePerformanceCounters;
+
+	re.R_Model_GetHandle = R_Model_GetHandle;
+	re.SetColor = Draw_SetColor;
+	re.DrawStretchPic = Draw_StretchPic;
+	re.DrawStretchPic2 = Draw_StretchPic2;
+	re.DrawStretchRaw = RE_StretchRaw;
+	re.DebugLine = R_DebugLine;
+	re.DrawTilePic = Draw_TilePic;
+	re.DrawTilePicOffset = Draw_TilePicOffset;
+	re.DrawTrianglePic = Draw_TrianglePic;
+	re.DrawBox = DrawBox;
+	re.AddBox = AddBox;
+	re.Set2DWindow = Set2DWindow;
+	re.Scissor = RE_Scissor;
+	re.DrawLineLoop = DrawLineLoop;
+	re.DrawString = R_DrawString;
+	re.GetFontHeight = R_GetFontHeight;
+	re.GetFontStringWidth = R_GetFontStringWidth;
+	re.SwipeBegin = RE_SwipeBegin;
+	re.SwipeEnd = RE_SwipeEnd;
+	re.SetRenderTime = RE_SetRenderTime;
+	re.Noise = R_NoiseGet4f;
+
+	re.SetMode = R_SetMode;
+	re.SetFullscreen = R_SetFullscreen;
+
+	re.GetShaderHeight = RE_GetShaderHeight;
+	re.GetShaderWidth = RE_GetShaderWidth;
+	re.GetShaderName = RE_GetShaderName;
+	re.GetModelName = RE_GetModelName;
+	re.GetGraphicsInfo = RE_GetGraphicsInfo;
+	re.ForceUpdatePose = RE_ForceUpdatePose;
+	re.TIKI_Orientation = RE_TIKI_Orientation;
+	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
+	re.SetFrameNumber = RE_SetFrameNumber;
+
+	re.ImageExists = R_ImageExists;
+	re.CountTextureMemory = R_CountTextureMemory;
+
 	return &re;
 }
diff --git a/code/renderergl1/tr_light.c b/code/renderergl1/tr_light.c
index 3eac0535..c8587f86 100644
--- a/code/renderergl1/tr_light.c
+++ b/code/renderergl1/tr_light.c
@@ -1,21 +1,21 @@
 /*
 ===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
+Copyright (C) 2015-2024 the OpenMoHAA team
 
-This file is part of Quake III Arena source code.
+This file is part of OpenMoHAA source code.
 
-Quake III Arena source code is free software; you can redistribute it
+OpenMoHAA source code is free software; you can redistribute it
 and/or modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the License,
 or (at your option) any later version.
 
-Quake III Arena source code is distributed in the hope that it will be
+OpenMoHAA source code is distributed in the hope that it will be
 useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with OpenMoHAA source code; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,12 +23,637 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tr_local.h"
 
-#define	DLIGHT_AT_RADIUS		16
+#define DLIGHT_AT_RADIUS 16
 // at the edge of a dlight's influence, this amount of light will be added
 
-#define	DLIGHT_MINIMUM_RADIUS	16		
+#define DLIGHT_MINIMUM_RADIUS 16
+
 // never calculate a range less than this to prevent huge light numbers
 
+typedef struct {
+    dlight_t *dl;
+    float     power;
+    vec3_t    origin;
+} incidentLight_t;
+
+typedef struct {
+    int             dlightMap;
+    int             allocated[LIGHTMAP_SIZE];
+    byte            lightmap_buffer[LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4];
+    byte           *srcBase;
+    byte           *dstBase;
+    incidentLight_t lights[32];
+    int             numLights;
+} dlightInfo_t;
+
+typedef struct {
+    vec3_t point;
+    int    s;
+    int    t;
+} patchLightBlock_t;
+
+dlightInfo_t dli;
+
+void     R_SetupEntityLightingGrid(trRefEntity_t *ent);
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst);
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y);
+
+/*
+===============
+R_RecursiveDlightPatch
+===============
+*/
+static int R_RecursiveDlightPatch(patchLightBlock_t *plb)
+{
+    patchLightBlock_t cut[4];
+    qboolean          added;
+    int               index;
+
+    if (plb[0].s < plb[1].s - 1) {
+        cut[0] = plb[0];
+        cut[2] = plb[2];
+
+        VectorAdd(plb[0].point, plb[1].point, cut[1].point);
+        VectorScale(cut[1].point, 0.5f, cut[1].point);
+        VectorAdd(plb[2].point, plb[3].point, cut[3].point);
+        VectorScale(cut[3].point, 0.5f, cut[3].point);
+
+        cut[3].s = (plb[0].s + plb[1].s) >> 1;
+        cut[1].s = cut[3].s;
+        cut[1].t = plb[0].t;
+        cut[3].t = plb[2].t;
+
+        added = R_RecursiveDlightPatch(cut);
+
+        cut[0] = cut[1];
+        cut[2] = cut[3];
+
+        index = 1;
+    } else if (plb[0].t < plb[2].t - 1) {
+        cut[0] = plb[0];
+        cut[1] = plb[1];
+
+        VectorAdd(plb[0].point, plb[2].point, cut[2].point);
+        VectorScale(cut[2].point, 0.5f, cut[2].point);
+        VectorAdd(plb[1].point, plb[3].point, cut[3].point);
+        VectorScale(cut[3].point, 0.5f, cut[3].point);
+
+        cut[3].t = (plb[0].t + plb[2].t) >> 1;
+        cut[2].t = cut[3].t;
+        cut[2].s = plb[0].s;
+        cut[3].s = plb[1].s;
+
+        added  = R_RecursiveDlightPatch(cut);
+        cut[0] = cut[2];
+        cut[1] = cut[3];
+
+        index = 2;
+    } else {
+        return R_DlightSample(
+            &dli.srcBase[plb[0].t * (LIGHTMAP_SIZE * 3) + plb[0].s * 3],
+            plb[0].point,
+            &dli.dstBase[plb[0].t * (LIGHTMAP_SIZE * 4) + plb[0].s * 4]
+        );
+    }
+
+    cut[index] = plb[index];
+    cut[3]     = plb[3];
+
+    return R_RecursiveDlightPatch(cut) + added;
+}
+
+/*
+===============
+R_RealDlightPatch
+===============
+*/
+int R_RealDlightPatch(srfGridMesh_t *srf, int dlightBits)
+{
+    int         x, y;
+    int         i, j;
+    int         i2, j2;
+    int         steps[2][2];
+    dlight_t   *dl;
+    qboolean    added;
+    float      *origin;
+    drawVert_t *dv;
+
+    if (!srf->lmHeight || !srf->lmWidth) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
+
+        dl = &tr.refdef.dlights[i];
+        if (dl->origin[0] + dl->radius < srf->meshBounds[0][0] || dl->origin[0] - dl->radius > srf->meshBounds[1][0]
+            || dl->origin[1] + dl->radius < srf->meshBounds[0][1] || dl->origin[1] - dl->radius > srf->meshBounds[1][1]
+            || dl->origin[2] + dl->radius < srf->meshBounds[0][2]
+            || dl->origin[2] - dl->radius > srf->meshBounds[1][2]) {
+            dlightBits &= ~(1 << i);
+            continue;
+        }
+
+        VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
+
+    if (!dli.numLights) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.srcBase = srf->lmData;
+    dli.dstBase = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
+    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
+
+    added = qfalse;
+
+    if (srf->verts[srf->width - 1].lightmap[0] != srf->verts[0].lightmap[0]) {
+        if (srf->verts[srf->width - 1].lightmap[0] < srf->verts[0].lightmap[0]) {
+            steps[0][0] = 0;
+            steps[0][1] = -1;
+        } else {
+            steps[0][0] = 0;
+            steps[0][1] = 1;
+        }
+
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[1] < srf->verts[0].lightmap[1]) {
+            steps[1][0] = -1;
+            steps[1][1] = 0;
+        } else {
+            steps[1][0] = 1;
+            steps[1][1] = 0;
+        }
+    } else {
+        if (srf->verts[srf->width * (srf->height - 1)].lightmap[0] < srf->verts[0].lightmap[0]) {
+            steps[0][0] = -1;
+            steps[0][1] = 0;
+        } else {
+            steps[0][0] = 1;
+            steps[0][1] = 0;
+        }
+
+        if (srf->verts[srf->width - 1].lightmap[1] < srf->verts[0].lightmap[1]) {
+            steps[1][0] = 0;
+            steps[1][1] = -1;
+        } else {
+            steps[1][0] = 0;
+            steps[1][1] = 1;
+        }
+    }
+
+    for (i = 0; i < srf->height; i++) {
+        for (j = 0; j < srf->width; j++) {
+            patchLightBlock_t plb[4];
+
+            //
+            // Vert 1
+            //
+
+            dv = &srf->verts[i * srf->width + j];
+
+            VectorCopy(dv->xyz, plb[0].point);
+            plb[0].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[0].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 2
+            //
+
+            i2 = Q_clamp_int(steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[1].point);
+            plb[1].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[1].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 3
+            //
+
+            i2 = Q_clamp_int(steps[1][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[2].point);
+            plb[2].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[2].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            //
+            // Vert 4
+            //
+
+            i2 = Q_clamp_int(steps[1][0] + steps[0][0] + i, 0, srf->height - 1);
+            j2 = Q_clamp_int(steps[1][1] + steps[0][1] + j, 0, srf->width - 1);
+            dv = &srf->verts[i2 * srf->width + j2];
+
+            VectorCopy(dv->xyz, plb[3].point);
+            plb[3].s = (int)(dv->lightmap[0] * LIGHTMAP_SIZE) - srf->lmX;
+            plb[3].t = (int)(dv->lightmap[1] * LIGHTMAP_SIZE) - srf->lmY;
+
+            added |= R_RecursiveDlightPatch(plb);
+        }
+    }
+
+    if (!added) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->lmWidth; i++) {
+        dli.allocated[x + i] = srf->lmHeight + y;
+    }
+
+    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->dlightMap[tr.smpFrame];
+}
+
+/*
+===============
+R_RealDlightFace
+===============
+*/
+int R_RealDlightFace(srfSurfaceFace_t *srf, int dlightBits)
+{
+    int       x, y;
+    byte     *src, *dst;
+    int       i, j;
+    vec3_t    vec;
+    vec3_t    vecStepS, vecStepT;
+    dlight_t *dl;
+    float     d;
+    qboolean  added;
+    float    *origin;
+
+    if (!srf->lmHeight || !srf->lmWidth) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        if (!(dlightBits & (1 << i))) {
+            continue;
+        }
+
+        dl = &tr.refdef.dlights[i];
+
+        d = DotProduct(dl->transformed, srf->plane.normal) - srf->plane.dist;
+
+        if ((d < 0.f && !r_dlightBacks->integer) || (d > dl->radius || d < -dl->radius)) {
+            // dlight doesn't reach the plane
+            dlightBits &= ~(1 << i);
+        } else {
+            VectorCopy(dl->transformed, dli.lights[dli.numLights].origin);
+            dli.lights[dli.numLights].dl    = dl;
+            dli.lights[dli.numLights].power = 1.0 / dl->radius;
+            dli.numLights++;
+        }
+    }
+
+    if (!dli.numLights) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->lmWidth, srf->lmHeight, &x, &y)) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    src = srf->lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->lightmapOffset[0] = (float)x / LIGHTMAP_SIZE - (float)srf->lmX / LIGHTMAP_SIZE;
+    srf->lightmapOffset[1] = (float)y / LIGHTMAP_SIZE - (float)srf->lmY / LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->lmWidth * srf->lmHeight;
+
+    VectorCopy(srf->lmVecs[0], vecStepS);
+    VectorMA(srf->lmVecs[1], -srf->lmWidth, srf->lmVecs[0], vecStepT);
+
+    added = qfalse;
+    VectorCopy(srf->lmOrigin, vec);
+
+    for (i = 0; i < srf->lmHeight; i++) {
+        for (j = 0; j < srf->lmWidth; j++) {
+            added |= R_DlightSample(src, vec, dst);
+            VectorAdd(vec, vecStepS, vec);
+            src += 3;
+            dst += 4;
+        }
+
+        VectorAdd(vec, vecStepT, vec);
+        src += (LIGHTMAP_SIZE - j) * 3;
+        dst += (LIGHTMAP_SIZE - j) * 4;
+    }
+
+    if (!added) {
+        srf->dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->lmWidth; i++) {
+        dli.allocated[x + i] = srf->lmHeight + y;
+    }
+
+    srf->dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->dlightMap[tr.smpFrame];
+}
+
+/*
+===============
+R_RealDlightTerrain
+===============
+*/
+int R_RealDlightTerrain(cTerraPatchUnpacked_t *srf, int dlightBits)
+{
+    dlight_t *dl;
+    int       x, y;
+    byte     *dst, *src;
+    vec3_t    vec;
+    float     delta, dist;
+    float    *origin;
+    int       i, j, k;
+    int       di, dj;
+    qboolean  added;
+    float     lmScale;
+    int       lumelsPerHeight;
+    float     heightPerLumelSquared;
+    float     z00, z01;
+    float     z10, z11;
+
+    dli.numLights = 0;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+
+        if (dl->radius < srf->x0 - dl->transformed[0] || -512.f - dl->radius > srf->x0 - dl->transformed[0]
+            || -512.f - dl->radius > srf->y0 - dl->transformed[1] || dl->radius < srf->y0 - dl->transformed[1]) {
+            continue;
+        }
+
+        if (dl->radius > 128.f) {
+            dist = 0.f;
+
+            delta = dl->transformed[0] - srf->x0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= 512.f;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            delta = dl->transformed[1] - srf->y0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= 512.f;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            delta = dl->transformed[2] - srf->z0;
+            if (delta <= 0.f) {
+                dist += delta * delta;
+            } else {
+                delta -= srf->zmax;
+                if (delta > 0.f) {
+                    dist += delta * delta;
+                }
+            }
+
+            if (dl->radius * dl->radius < dist) {
+                continue;
+            }
+        }
+
+        VectorCopy(dl->origin, dli.lights[dli.numLights].origin);
+        dli.lights[dli.numLights].dl    = dl;
+        dli.lights[dli.numLights].power = 1.f / dl->radius;
+        dli.numLights++;
+    }
+
+    if (!dli.numLights) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    if (!R_AllocLMBlock(srf->drawinfo.lmapSize, srf->drawinfo.lmapSize, &x, &y)) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    src = srf->drawinfo.lmData;
+    dst = &dli.lightmap_buffer[y * 4 * LIGHTMAP_SIZE + x * 4];
+
+    srf->drawinfo.lmapX = x / (float)LIGHTMAP_SIZE;
+    srf->drawinfo.lmapY = y / (float)LIGHTMAP_SIZE;
+
+    tr.pc.c_dlightSurfaces++;
+    tr.pc.c_dlightTexels += srf->drawinfo.lmapSize * srf->drawinfo.lmapSize;
+
+    added = qfalse;
+
+    lumelsPerHeight = 64.f / srf->drawinfo.lmapStep;
+    if (lumelsPerHeight == 1) {
+        vec[1] = srf->y0;
+
+        for (i = 0; i < 9; i++) {
+            vec[0] = srf->x0;
+
+            for (j = 0; j < 9; j++) {
+                vec[2] = srf->z0 + (int)(srf->heightmap[0] << 1);
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            src += (LIGHTMAP_SIZE - 9) * 3;
+            dst += (LIGHTMAP_SIZE - 9) * 4;
+            vec[1] += srf->drawinfo.lmapStep;
+        }
+    } else if (lumelsPerHeight == 2) {
+        vec[1] = srf->y0;
+
+        k = 0;
+
+        for (j = 0; j < 8; j++) {
+            vec[0] = srf->x0;
+
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k];
+                vec[2] = srf->z0 + z00 + z00;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                // increase lightmap step
+                vec[0] += srf->drawinfo.lmapStep;
+                k++;
+
+                z01    = (int)srf->heightmap[k];
+                vec[2] = srf->z0 + z00 + z01;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            vec[2] = srf->z0 + z01 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k -= 8;
+
+            vec[0] = srf->x0;
+            vec[1] += srf->drawinfo.lmapStep;
+
+            for (i = 0; i < 8; i++) {
+                z00    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
+                vec[2] = srf->z0 + z00;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                k++;
+                vec[0] += srf->drawinfo.lmapStep;
+
+                z01    = (int)srf->heightmap[k] + (int)srf->heightmap[k + 9];
+                vec[2] = srf->z0 + (z00 + z01) * 0.5f;
+                added |= R_DlightSample(src, vec, dst);
+                src += 3;
+                dst += 4;
+                vec[0] += srf->drawinfo.lmapStep;
+            }
+
+            vec[2] = srf->z0 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += (LIGHTMAP_SIZE - 16) * 3;
+            dst += (LIGHTMAP_SIZE - 16) * 4;
+            k++;
+            vec[0] += srf->drawinfo.lmapStep;
+            vec[1] += srf->drawinfo.lmapStep;
+        }
+
+        vec[0] = srf->x0;
+
+        for (i = 0; i < 8; i++) {
+            z00    = (int)srf->heightmap[k];
+            vec[2] = srf->z0 + z00 + z00;
+            k++;
+            added |= R_DlightSample(src, vec, dst);
+            src += 3;
+            dst += 4;
+            vec[0] += srf->drawinfo.lmapStep;
+
+            z01    = (int)srf->heightmap[k];
+            vec[2] = srf->z0 + z00 + z01;
+            added |= R_DlightSample(src, vec, dst);
+            src += 3;
+            dst += 4;
+            vec[0] += srf->drawinfo.lmapStep;
+        }
+
+        vec[2] = srf->z0 + z01 + z01;
+        added |= R_DlightSample(src, vec, dst);
+        vec[0] += srf->drawinfo.lmapStep;
+        vec[1] += srf->drawinfo.lmapStep;
+    } else {
+        vec[1] = srf->y0;
+
+        for (j = 0; j < 8; j++) {
+            dj = 0;
+
+            for (;;) {
+                if (j == 7) {
+                    if (dj >= lumelsPerHeight + 1) {
+                        break;
+                    }
+                } else if (dj >= lumelsPerHeight) {
+                    break;
+                }
+
+                vec[0] = srf->x0;
+
+                for (i = 0; i < 8; i++) {
+                    for (;;) {
+                        if (i == 7) {
+                            if (di >= lumelsPerHeight + 1) {
+                                break;
+                            }
+                        } else if (dj >= lumelsPerHeight) {
+                            break;
+                        }
+
+                        di  = 0;
+                        z00 = (int)srf->heightmap[9 * j + i];
+                        z01 = (int)srf->heightmap[9 * (j + 1) + i];
+                        z10 = (int)srf->heightmap[9 * j + (i + 1)];
+                        z11 = (int)srf->heightmap[9 * (j + 1) + (i + 1)];
+
+                        heightPerLumelSquared = 2.f / (lumelsPerHeight * lumelsPerHeight);
+
+                        vec[2] =
+                            srf->z0
+                            + (dj * (di * z11) + (lumelsPerHeight - dj) * (z10 * di) + z01 * (lumelsPerHeight - di) * dj
+                               + z00 * (lumelsPerHeight - di) * (lumelsPerHeight - dj))
+                                  * heightPerLumelSquared;
+
+                        added |= R_DlightSample(src, vec, dst);
+                        src += 3;
+                        dst += 4;
+
+                        vec[0] += srf->drawinfo.lmapStep;
+                    }
+                }
+
+                src += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 3;
+                dst += (LIGHTMAP_SIZE - 1 - (8 * lumelsPerHeight)) * 4;
+                vec[1] += srf->drawinfo.lmapStep;
+            }
+        }
+    }
+
+    if (!added) {
+        srf->drawinfo.dlightMap[tr.smpFrame] = 0;
+        return 0;
+    }
+
+    for (i = 0; i < srf->drawinfo.lmapSize; i++) {
+        dli.allocated[x + i] = srf->drawinfo.lmapSize + y;
+    }
+
+    lmScale = (1.0 / LIGHTMAP_SIZE) / srf->drawinfo.lmapStep;
+    srf->drawinfo.lmapX -= (srf->x0 * lmScale - (0.5 / LIGHTMAP_SIZE));
+    srf->drawinfo.lmapY -= (srf->y0 * lmScale - (0.5 / LIGHTMAP_SIZE));
+
+    srf->drawinfo.dlightMap[tr.smpFrame] = dli.dlightMap + 1;
+    return srf->drawinfo.dlightMap[tr.smpFrame];
+}
 
 /*
 ===============
@@ -39,16 +664,17 @@ Used by both the front end (for DlightBmodel) and
 the back end (before doing the lighting calculation)
 ===============
 */
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *or) {
-	int		i;
-	vec3_t	temp;
+void R_TransformDlights(int count, dlight_t *dl, orientationr_t *ori)
+{
+    int    i;
+    vec3_t temp;
 
-	for ( i = 0 ; i < count ; i++, dl++ ) {
-		VectorSubtract( dl->origin, or->origin, temp );
-		dl->transformed[0] = DotProduct( temp, or->axis[0] );
-		dl->transformed[1] = DotProduct( temp, or->axis[1] );
-		dl->transformed[2] = DotProduct( temp, or->axis[2] );
-	}
+    for (i = 0; i < count; i++, dl++) {
+        VectorSubtract(dl->origin, ori->origin, temp);
+        dl->transformed[0] = DotProduct(temp, ori->axis[0]);
+        dl->transformed[1] = DotProduct(temp, ori->axis[1]);
+        dl->transformed[2] = DotProduct(temp, ori->axis[2]);
+    }
 }
 
 /*
@@ -58,274 +684,579 @@ R_DlightBmodel
 Determine which dynamic lights may effect this bmodel
 =============
 */
-void R_DlightBmodel( bmodel_t *bmodel ) {
-	int			i, j;
-	dlight_t	*dl;
-	int			mask;
-	msurface_t	*surf;
+void R_DlightBmodel(bmodel_t *bmodel)
+{
+    int         i, j;
+    dlight_t   *dl;
+    int         mask;
+    msurface_t *surf;
 
-	// transform all the lights
-	R_TransformDlights( tr.refdef.num_dlights, tr.refdef.dlights, &tr.or );
+    // transform all the lights
+    R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.ori);
 
-	mask = 0;
-	for ( i=0 ; i<tr.refdef.num_dlights ; i++ ) {
-		dl = &tr.refdef.dlights[i];
+    mask = 0;
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
 
-		// see if the point is close enough to the bounds to matter
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( dl->transformed[j] - bmodel->bounds[1][j] > dl->radius ) {
-				break;
-			}
-			if ( bmodel->bounds[0][j] - dl->transformed[j] > dl->radius ) {
-				break;
-			}
-		}
-		if ( j < 3 ) {
-			continue;
-		}
+        // see if the point is close enough to the bounds to matter
+        for (j = 0; j < 3; j++) {
+            if (dl->transformed[j] - bmodel->bounds[1][j] > dl->radius) {
+                break;
+            }
+            if (bmodel->bounds[0][j] - dl->transformed[j] > dl->radius) {
+                break;
+            }
+        }
+        if (j < 3) {
+            continue;
+        }
 
-		// we need to check this light
-		mask |= 1 << i;
-	}
+        // we need to check this light
+        mask |= 1 << i;
+    }
 
-	tr.currentEntity->needDlights = (mask != 0);
+    tr.currentEntity->needDlights = (mask != 0);
 
-	// set the dlight bits in all the surfaces
-	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
-		surf = bmodel->firstSurface + i;
+    // set the dlight bits in all the surfaces
+    for (i = 0; i < bmodel->numSurfaces; i++) {
+        surf = bmodel->firstSurface + i;
 
-		if ( *surf->data == SF_FACE ) {
-			((srfSurfaceFace_t *)surf->data)->dlightBits = mask;
-		} else if ( *surf->data == SF_GRID ) {
-			((srfGridMesh_t *)surf->data)->dlightBits = mask;
-		} else if ( *surf->data == SF_TRIANGLES ) {
-			((srfTriangles_t *)surf->data)->dlightBits = mask;
-		}
-	}
+        if (*surf->data == SF_FACE) {
+            ((srfSurfaceFace_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_GRID) {
+            ((srfGridMesh_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        } else if (*surf->data == SF_TRIANGLES) {
+            ((srfTriangles_t *)surf->data)->dlightBits[tr.smpFrame] = mask;
+        }
+    }
 }
 
-
-/*
-=============================================================================
-
-LIGHT SAMPLING
-
-=============================================================================
-*/
-
-extern	cvar_t	*r_ambientScale;
-extern	cvar_t	*r_directedScale;
-extern	cvar_t	*r_debugLight;
-
-/*
-=================
-R_SetupEntityLightingGrid
-
-=================
-*/
-static void R_SetupEntityLightingGrid( trRefEntity_t *ent ) {
-	vec3_t	lightOrigin;
-	int		pos[3];
-	int		i, j;
-	byte	*gridData;
-	float	frac[3];
-	int		gridStep[3];
-	vec3_t	direction;
-	float	totalFactor;
-
-	if ( ent->e.renderfx & RF_LIGHTING_ORIGIN ) {
-		// separate lightOrigins are needed so an object that is
-		// sinking into the ground can still be lit, and so
-		// multi-part models can be lit identically
-		VectorCopy( ent->e.lightingOrigin, lightOrigin );
-	} else {
-		VectorCopy( ent->e.origin, lightOrigin );
-	}
-
-	VectorSubtract( lightOrigin, tr.world->lightGridOrigin, lightOrigin );
-	for ( i = 0 ; i < 3 ; i++ ) {
-		float	v;
-
-		v = lightOrigin[i]*tr.world->lightGridInverseSize[i];
-		pos[i] = floor( v );
-		frac[i] = v - pos[i];
-		if ( pos[i] < 0 ) {
-			pos[i] = 0;
-		} else if ( pos[i] > tr.world->lightGridBounds[i] - 1 ) {
-			pos[i] = tr.world->lightGridBounds[i] - 1;
-		}
-	}
-
-	VectorClear( ent->ambientLight );
-	VectorClear( ent->directedLight );
-	VectorClear( direction );
-
-	assert( tr.world->lightGridData ); // NULL with -nolight maps
-
-	// trilerp the light value
-	gridStep[0] = 8;
-	gridStep[1] = 8 * tr.world->lightGridBounds[0];
-	gridStep[2] = 8 * tr.world->lightGridBounds[0] * tr.world->lightGridBounds[1];
-	gridData = tr.world->lightGridData + pos[0] * gridStep[0]
-		+ pos[1] * gridStep[1] + pos[2] * gridStep[2];
-
-	totalFactor = 0;
-	for ( i = 0 ; i < 8 ; i++ ) {
-		float	factor;
-		byte	*data;
-		int		lat, lng;
-		vec3_t	normal;
-		#if idppc
-		float d0, d1, d2, d3, d4, d5;
-		#endif
-		factor = 1.0;
-		data = gridData;
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( i & (1<<j) ) {
-				if ( pos[j] + 1 > tr.world->lightGridBounds[j] - 1 ) {
-					break; // ignore values outside lightgrid
-				}
-				factor *= frac[j];
-				data += gridStep[j];
-			} else {
-				factor *= (1.0f - frac[j]);
-			}
-		}
-
-		if ( j != 3 ) {
-			continue;
-		}
-		if ( !(data[0]+data[1]+data[2]) ) {
-			continue;	// ignore samples in walls
-		}
-		totalFactor += factor;
-		#if idppc
-		d0 = data[0]; d1 = data[1]; d2 = data[2];
-		d3 = data[3]; d4 = data[4]; d5 = data[5];
-
-		ent->ambientLight[0] += factor * d0;
-		ent->ambientLight[1] += factor * d1;
-		ent->ambientLight[2] += factor * d2;
-
-		ent->directedLight[0] += factor * d3;
-		ent->directedLight[1] += factor * d4;
-		ent->directedLight[2] += factor * d5;
-		#else
-		ent->ambientLight[0] += factor * data[0];
-		ent->ambientLight[1] += factor * data[1];
-		ent->ambientLight[2] += factor * data[2];
-
-		ent->directedLight[0] += factor * data[3];
-		ent->directedLight[1] += factor * data[4];
-		ent->directedLight[2] += factor * data[5];
-		#endif
-		lat = data[7];
-		lng = data[6];
-		lat *= (FUNCTABLE_SIZE/256);
-		lng *= (FUNCTABLE_SIZE/256);
-
-		// decode X as cos( lat ) * sin( long )
-		// decode Y as sin( lat ) * sin( long )
-		// decode Z as cos( long )
-
-		normal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-		normal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-		normal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-		VectorMA( direction, factor, normal, direction );
-	}
-
-	if ( totalFactor > 0 && totalFactor < 0.99 ) {
-		totalFactor = 1.0f / totalFactor;
-		VectorScale( ent->ambientLight, totalFactor, ent->ambientLight );
-		VectorScale( ent->directedLight, totalFactor, ent->directedLight );
-	}
-
-	VectorScale( ent->ambientLight, r_ambientScale->value, ent->ambientLight );
-	VectorScale( ent->directedLight, r_directedScale->value, ent->directedLight );
-
-	VectorNormalize2( direction, ent->lightDir );
-}
-
-
 /*
 ===============
-LogLight
+R_GetLightGridPalettedColor
 ===============
 */
-static void LogLight( trRefEntity_t *ent ) {
-	int	max1, max2;
-
-	if ( !(ent->e.renderfx & RF_FIRST_PERSON ) ) {
-		return;
-	}
-
-	max1 = ent->ambientLight[0];
-	if ( ent->ambientLight[1] > max1 ) {
-		max1 = ent->ambientLight[1];
-	} else if ( ent->ambientLight[2] > max1 ) {
-		max1 = ent->ambientLight[2];
-	}
-
-	max2 = ent->directedLight[0];
-	if ( ent->directedLight[1] > max2 ) {
-		max2 = ent->directedLight[1];
-	} else if ( ent->directedLight[2] > max2 ) {
-		max2 = ent->directedLight[2];
-	}
-
-	ri.Printf( PRINT_ALL, "amb:%i  dir:%i\n", max1, max2 );
+static byte *R_GetLightGridPalettedColor(int iColor)
+{
+    return &tr.world->lightGridPalette[iColor * 3];
 }
 
 /*
-=================
-R_SetupEntityLighting
-
-Calculates all the lighting values that will be used
-by the Calc_* functions
-=================
+===============
+R_GetLightingGridValue
+===============
 */
-void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent ) {
+void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight)
+{
+    byte  *pColor;
+    int    iBaseOffset;
+    int    i;
+    int    iOffset;
+    int    iRowPos;
+    int    iData;
+    int    iLen;
+    int    iGridPos[3];
+    int    iArrayXStep;
+    float  fV;
+    float  fFrac[3];
+    float  fOMFrac[3];
+    float  fWeight, fWeight2;
+    float  fTotalFactor;
+    int    iCurData;
+    vec3_t vLightOrigin;
+    byte  *pCurData;
+
+    if (!tr.world || !tr.world->lightGridData || !tr.world->lightGridOffsets) {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    VectorSubtract(vPos, tr.world->lightGridMins, vLightOrigin);
+
+    for (i = 0; i < 3; i++) {
+        fV          = vLightOrigin[i] * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV);
+        fFrac[i]    = fV - iGridPos[i];
+        fOMFrac[i]  = 1.0 - fFrac[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+        }
+    }
+
+    fTotalFactor = 0;
+    iArrayXStep  = tr.world->lightGridBounds[1];
+    iBaseOffset  = tr.world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
+    VectorClear(vLight);
+
+    for (i = 0; i < 4; i++) {
+        qboolean bContinue = qfalse;
+
+        switch (i) {
+        case 0:
+            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 1:
+            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + 1] + (tr.world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 2:
+            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        case 3:
+            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
+                    + (tr.world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        }
+
+        iRowPos  = iGridPos[2];
+        pCurData = &tr.world->lightGridData[iOffset];
+        iData    = 0;
+
+        while (1) {
+            while (1) {
+                iCurData = (char)pCurData[iData];
+                iData++;
+                if (iCurData >= 0) {
+                    break;
+                }
+
+                iLen = -iCurData;
+                if (iLen > iRowPos) {
+                    iData += iRowPos;
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight, pColor, vLight);
+                        fTotalFactor += fWeight;
+                    }
+
+                    iData++;
+                    if (iLen - 1 == iRowPos) {
+                        iData++;
+                    }
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                        VectorMA(vLight, fWeight2, pColor, vLight);
+                        fTotalFactor += fWeight2;
+                    }
+
+                    bContinue = qtrue;
+                    break;
+                }
+
+                iRowPos -= iLen;
+                iData += iLen;
+            }
+
+            if (bContinue) {
+                break;
+            }
+
+            iLen = iCurData + 2;
+            if (iLen - 1 >= iRowPos) {
+                break;
+            }
+
+            iRowPos -= iLen;
+            iData++;
+        }
+
+        if (bContinue) {
+            continue;
+        }
+
+        if (iLen - 1 > iRowPos) {
+            if (!pCurData[iData]) {
+                continue;
+            }
+
+            pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+            VectorMA(vLight, fWeight + fWeight2, pColor, vLight);
+            fTotalFactor += fWeight + fWeight2;
+        } else {
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                VectorMA(vLight, fWeight, pColor, vLight);
+                fTotalFactor += fWeight;
+            }
+
+            iData += 2;
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(pCurData[iData]);
+                VectorMA(vLight, fWeight2, pColor, vLight);
+                fTotalFactor += fWeight2;
+            }
+        }
+    }
+
+    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
+        VectorScale(vLight, 1.0 / fTotalFactor, vLight);
+    }
+
+    if (fTotalFactor) {
+        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+            float t;
+            // normalize color values
+            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+            VectorScale(vLight, t, vLight);
+        }
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+    }
+}
+
+/*
+===============
+R_GetLightingGridValueFast
+===============
+*/
+void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight)
+{
+    byte      *pColor;
+    int        i;
+    int        iRowPos;
+    int        iGridPos[3];
+    int        iArrayXStep;
+    float      fV[3];
+    vec3_t     vLightOrigin;
+    int        iData;
+    int        iLen;
+    int        iBaseOffset;
+    byte      *pCurData;
+    int        iOrder;
+    int        iToggle;
+    int        iSample[8];
+    float      fDist[3];
+    int        j, k;
+    static int iSearch[8][8] = {
+        {0, 4, 2, 6, 1, 5, 3, 7},
+        {0, 2, 4, 6, 1, 3, 5, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 2, 1, 3, 4, 6, 5, 7},
+        {0, 4, 1, 5, 2, 6, 3, 7},
+        {0, 0, 0, 0, 0, 0, 0, 0},
+        {0, 1, 4, 5, 2, 3, 6, 7},
+        {0, 1, 2, 3, 4, 5, 6, 7}
+    };
+
+    if (!tr.world->lightGridData || !tr.world->lightGridOffsets) {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    iOrder  = 0;
+    iToggle = 0;
+
+    for (i = 0; i < 3; i++) {
+        fV[i] =
+            (tr.world->lightGridSize[i] * 0.5 + vPos[i] - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i];
+        iGridPos[i] = floor(fV[i]);
+        fV[i] -= iGridPos[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+            fV[i]       = 0.0;
+        } else if (iGridPos[i] > tr.world->lightGridBounds[i] - 2) {
+            iGridPos[i] = tr.world->lightGridBounds[i] - 2;
+            fV[i]       = 1.0;
+        }
+
+        fDist[i] = 0.5 - fV[i];
+        if (fDist[i] < 0) {
+            fDist[i] = -fDist[i];
+            iToggle |= 1 << i;
+        }
+    }
+
+    if (fDist[1] >= fDist[0]) {
+        iOrder = 1;
+    }
+    if (fDist[2] >= fDist[0]) {
+        iOrder |= 2;
+    }
+    if (fDist[2] >= fDist[1]) {
+        iOrder |= 4;
+    }
+
+    for (i = 0; i < 8; i++) {
+        iSample[i] = -1;
+    }
+
+    iArrayXStep = tr.world->lightGridBounds[1];
+    iBaseOffset = iGridPos[1] + tr.world->lightGridBounds[0] + iGridPos[0] * tr.world->lightGridBounds[1];
+
+    for (i = 0; i < 8; i++) {
+        j = iSearch[iOrder][i] ^ iToggle;
+
+        if (iSample[j] < 0) {
+            switch (j & 3) {
+            case 0:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset]];
+                break;
+            case 1:
+                pCurData =
+                    &tr.world->lightGridData
+                         [tr.world->lightGridOffsets[iGridPos[0]] * 256 + tr.world->lightGridOffsets[iBaseOffset + 1]];
+                break;
+            case 2:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep]];
+                break;
+            case 3:
+            default:
+                pCurData = &tr.world->lightGridData
+                                [tr.world->lightGridOffsets[iGridPos[0] + 1] * 256
+                                 + tr.world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]];
+                break;
+            }
+
+            k = j & ~1;
+
+            iRowPos = iGridPos[2];
+            iData   = 0;
+
+            while (1) {
+                qboolean bShouldBreak = qfalse;
+
+                for (; (char)pCurData[iData] >= 0; iData += 2, iRowPos -= iLen) {
+                    iLen = (char)pCurData[iData] + 2;
+
+                    if (iLen - 1 < iRowPos) {
+                        continue;
+                    }
+
+                    if (iLen - 1 > iRowPos) {
+                        iSample[k + 1] = pCurData[iData + 1];
+                        iSample[k]     = pCurData[iData + 1];
+                    } else {
+                        iSample[k]     = pCurData[iData + 1];
+                        iSample[k + 1] = pCurData[iData + 3];
+                    }
+
+                    bShouldBreak = qtrue;
+                    break;
+                }
+
+                if (bShouldBreak) {
+                    break;
+                }
+
+                if (-(char)pCurData[iData] > iRowPos) {
+                    iSample[k] = pCurData[iRowPos + iData + 1];
+
+                    if ((-(char)pCurData[iData] - 1) == iRowPos) {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 3];
+                    } else {
+                        iSample[k + 1] = pCurData[iRowPos + iData + 2];
+                    }
+                    break;
+                }
+
+                iRowPos -= -(char)pCurData[iData];
+                iData += -(char)pCurData[iData] + 1;
+            }
+        }
+
+        if (iSample[j] > 0) {
+            pColor    = R_GetLightGridPalettedColor(iSample[j]);
+            vLight[0] = pColor[0];
+            vLight[1] = pColor[1];
+            vLight[2] = pColor[2];
+            return;
+        }
+    }
+
+    vLight[0] = vLight[1] = vLight[2] = tr.identityLightByte;
+}
+
+/*
+===============
+R_GetLightingForDecal
+===============
+*/
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
+{
+    float fMax;
+
+    R_GetLightingGridValue(vOrigin, vLight);
+
+    if (!tr.overbrightShift) {
+        return;
+    }
+
+    VectorScale(vLight, tr.overbrightMult, vLight);
+
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+}
+
+/*
+===============
+R_GetLightingForSmoke
+===============
+*/
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
+{
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    dir;
+    float     d;
+
+    if (r_smoothsmokelight->integer) {
+        R_GetLightingGridValue(vOrigin, vLight);
+    } else {
+        R_GetLightingGridValueFast(vOrigin, vLight);
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, vOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    vLight[0] /= 255.0;
+    vLight[1] /= 255.0;
+    vLight[2] /= 255.0;
+}
+
+/*
+===============
+RB_GetEntityGridLighting
+===============
+*/
+static int RB_GetEntityGridLighting()
+{
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
+    float    *lightOrigin;
+
+    lightOrigin = backEnd.currentSphere->traceOrigin;
+    if (!(backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(backEnd.currentSphere->traceOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        dl = &backEnd.refdef.dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
+
+    // save out the byte packet version
+    ((byte *)&iColor)[0] = myftol(vLight[0]);
+    ((byte *)&iColor)[1] = myftol(vLight[1]);
+    ((byte *)&iColor)[2] = myftol(vLight[2]);
+    ((byte *)&iColor)[3] = 0xff;
+
+    return iColor;
+
+#if 0
 	int				i;
-	dlight_t		*dl;
+	dlight_t* dl;
 	float			power;
 	vec3_t			dir;
 	float			d;
 	vec3_t			lightDir;
 	vec3_t			lightOrigin;
-
-	// lighting calculations 
-	if ( ent->lightingCalculated ) {
-		return;
-	}
-	ent->lightingCalculated = qtrue;
+	int				ambientlightInt = 0;
+	trRefEntity_t	*ent = backEnd.currentEntity;
+	trRefdef_t		*refdef = &backEnd.refdef;
 
 	//
 	// trace a sample point down to find ambient light
 	//
-	if ( ent->e.renderfx & RF_LIGHTING_ORIGIN ) {
-		// separate lightOrigins are needed so an object that is
+	if (ent->e.renderfx & RF_LIGHTING_ORIGIN) {
+		// seperate lightOrigins are needed so an object that is
 		// sinking into the ground can still be lit, and so
 		// multi-part models can be lit identically
-		VectorCopy( ent->e.lightingOrigin, lightOrigin );
-	} else {
-		VectorCopy( ent->e.origin, lightOrigin );
+		VectorCopy(ent->e.lightingOrigin, lightOrigin);
+	}
+	else {
+		VectorCopy(ent->e.origin, lightOrigin);
 	}
 
 	// if NOWORLDMODEL, only use dynamic lights (menu system, etc)
-	if ( !(refdef->rdflags & RDF_NOWORLDMODEL ) 
-		&& tr.world->lightGridData ) {
-		R_SetupEntityLightingGrid( ent );
-	} else {
-		ent->ambientLight[0] = ent->ambientLight[1] = 
+	if (!(refdef->rdflags & RDF_NOWORLDMODEL)
+		&& tr.world->lightGridData) {
+		R_SetupEntityLightingGrid(ent);
+	}
+	else {
+		ent->ambientLight[0] = ent->ambientLight[1] =
 			ent->ambientLight[2] = tr.identityLight * 150;
-		ent->directedLight[0] = ent->directedLight[1] = 
+		ent->directedLight[0] = ent->directedLight[1] =
 			ent->directedLight[2] = tr.identityLight * 150;
-		VectorCopy( tr.sunDirection, ent->lightDir );
+		VectorCopy(tr.sunDirection, ent->lightDir);
 	}
 
 	// bonus items and view weapons have a fixed minimum add
-	if ( 1 /* ent->e.renderfx & RF_MINLIGHT */ ) {
+	if (1 /* ent->e.renderfx & RF_MINLIGHT */) {
 		// give everything a minimum light add
 		ent->ambientLight[0] += tr.identityLight * 32;
 		ent->ambientLight[1] += tr.identityLight * 32;
@@ -335,66 +1266,348 @@ void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent ) {
 	//
 	// modify the light by dynamic lights
 	//
-	d = VectorLength( ent->directedLight );
-	VectorScale( ent->lightDir, d, lightDir );
+	d = VectorLength(ent->directedLight);
+	VectorScale(ent->lightDir, d, lightDir);
 
-	for ( i = 0 ; i < refdef->num_dlights ; i++ ) {
+	for (i = 0; i < refdef->num_dlights; i++) {
 		dl = &refdef->dlights[i];
-		VectorSubtract( dl->origin, lightOrigin, dir );
-		d = VectorNormalize( dir );
+		VectorSubtract(dl->origin, lightOrigin, dir);
+		d = VectorNormalize(dir);
 
-		power = DLIGHT_AT_RADIUS * ( dl->radius * dl->radius );
-		if ( d < DLIGHT_MINIMUM_RADIUS ) {
+		power = DLIGHT_AT_RADIUS * (dl->radius * dl->radius);
+		if (d < DLIGHT_MINIMUM_RADIUS) {
 			d = DLIGHT_MINIMUM_RADIUS;
 		}
-		d = power / ( d * d );
+		d = power / (d * d);
 
-		VectorMA( ent->directedLight, d, dl->color, ent->directedLight );
-		VectorMA( lightDir, d, dir, lightDir );
+		VectorMA(ent->directedLight, d, dl->color, ent->directedLight);
+		VectorMA(lightDir, d, dir, lightDir);
 	}
 
 	// clamp ambient
-	for ( i = 0 ; i < 3 ; i++ ) {
-		if ( ent->ambientLight[i] > tr.identityLightByte ) {
+	for (i = 0; i < 3; i++) {
+		if (ent->ambientLight[i] > tr.identityLightByte) {
 			ent->ambientLight[i] = tr.identityLightByte;
 		}
 	}
 
-	if ( r_debugLight->integer ) {
-		LogLight( ent );
-	}
-
 	// save out the byte packet version
-	((byte *)&ent->ambientLightInt)[0] = ri.ftol(ent->ambientLight[0]);
-	((byte *)&ent->ambientLightInt)[1] = ri.ftol(ent->ambientLight[1]);
-	((byte *)&ent->ambientLightInt)[2] = ri.ftol(ent->ambientLight[2]);
-	((byte *)&ent->ambientLightInt)[3] = 0xff;
-	
+	((byte*)&ambientlightInt)[0] = myftol(ent->ambientLight[0]);
+	((byte*)&ambientlightInt)[1] = myftol(ent->ambientLight[1]);
+	((byte*)&ambientlightInt)[2] = myftol(ent->ambientLight[2]);
+	((byte*)&ambientlightInt)[3] = 0xff;
+
 	// transform the direction to local space
-	VectorNormalize( lightDir );
-	ent->lightDir[0] = DotProduct( lightDir, ent->e.axis[0] );
-	ent->lightDir[1] = DotProduct( lightDir, ent->e.axis[1] );
-	ent->lightDir[2] = DotProduct( lightDir, ent->e.axis[2] );
+	VectorNormalize(lightDir);
+	ent->lightDir[0] = DotProduct(lightDir, ent->e.axis[0]);
+	ent->lightDir[1] = DotProduct(lightDir, ent->e.axis[1]);
+	ent->lightDir[2] = DotProduct(lightDir, ent->e.axis[2]);
+
+	return ambientlightInt;
+#endif
 }
 
 /*
-=================
-R_LightForPoint
-=================
+===============
+RB_SetupEntityGridLighting
+===============
 */
-int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir )
+void RB_SetupEntityGridLighting()
 {
-	trRefEntity_t ent;
-	
-	if ( tr.world->lightGridData == NULL )
-	  return qfalse;
+    trRefEntity_t *ent;
+    int            iColor;
 
-	Com_Memset(&ent, 0, sizeof(ent));
-	VectorCopy( point, ent.e.origin );
-	R_SetupEntityLightingGrid( &ent );
-	VectorCopy(ent.ambientLight, ambientLight);
-	VectorCopy(ent.directedLight, directedLight);
-	VectorCopy(ent.lightDir, lightDir);
+    if (backEnd.currentEntity->bLightGridCalculated) {
+        return;
+    }
 
-	return qtrue;
+    for (ent = backEnd.currentEntity; ent->e.parentEntity != ENTITYNUM_NONE;
+         ent = &backEnd.refdef.entities[ent->e.parentEntity]) {
+        trRefEntity_t *newref = &backEnd.refdef.entities[ent->e.parentEntity];
+        if (newref == ent) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            iColor = newref->iGridLighting;
+            break;
+        }
+
+        if (newref->bLightGridCalculated) {
+            iColor = newref->iGridLighting;
+            break;
+        }
+    }
+
+    if (ent->e.parentEntity == ENTITYNUM_NONE) {
+        iColor = RB_GetEntityGridLighting();
+    }
+
+    ent = backEnd.currentEntity;
+    for (;;) {
+        ent->bLightGridCalculated = qtrue;
+        ent->iGridLighting        = iColor;
+        if (ent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        if (ent == &backEnd.refdef.entities[ent->e.parentEntity]) {
+            assert(!"backEnd.refdef.entities[ent->e.parentEntity] refers to itself\n");
+            break;
+        }
+
+        ent = &backEnd.refdef.entities[ent->e.parentEntity];
+    }
+}
+
+/*
+===============
+RB_SetupStaticModelGridLighting
+===============
+*/
+void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
+{
+    int       iColor;
+    int       i;
+    dlight_t *dl;
+    float     power;
+    vec3_t    vLight;
+    vec3_t    dir;
+    float     d;
+
+    if (ent->bLightGridCalculated) {
+        return;
+    }
+    ent->bLightGridCalculated = qtrue;
+
+    if (!(refdef->rdflags & RDF_NOWORLDMODEL) && tr.world->lightGridData) {
+        R_GetLightingGridValue(lightOrigin, vLight);
+    } else {
+        vLight[0] = vLight[1] = vLight[2] = tr.identityLight * 150.0;
+    }
+
+    for (i = 0; i < refdef->num_dlights; i++) {
+        dl = &refdef->dlights[i];
+        VectorSubtract(dl->origin, lightOrigin, dir);
+        d = VectorLengthSquared(dir);
+
+        power = dl->radius * dl->radius;
+        if (power >= d) {
+            d = dl->radius * 7500.0 / d;
+            VectorMA(vLight, d, dl->color, vLight);
+        }
+    }
+
+    if (tr.overbrightShift) {
+        vLight[0] = tr.overbrightMult * vLight[0];
+        vLight[1] = tr.overbrightMult * vLight[1];
+        vLight[2] = tr.overbrightMult * vLight[2];
+    }
+
+    // normalize
+    if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+        float scale = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+        VectorScale(vLight, scale, vLight);
+    }
+
+    // clamp ambient
+    for (i = 0; i < 3; i++) {
+        if (vLight[i] > tr.identityLightByte) {
+            vLight[i] = tr.identityLightByte;
+        }
+    }
+
+    // save out the byte packet version
+    ((byte *)&ent->iGridLighting)[0] = myftol(vLight[0]);
+    ((byte *)&ent->iGridLighting)[1] = myftol(vLight[1]);
+    ((byte *)&ent->iGridLighting)[2] = myftol(vLight[2]);
+    ((byte *)&ent->iGridLighting)[3] = 0xff;
+}
+
+/*
+=============================================================================
+
+LIGHT SAMPLING
+
+=============================================================================
+*/
+
+extern cvar_t *r_ambientScale;
+extern cvar_t *r_directedScale;
+
+/*
+===============
+LogLight
+===============
+*/
+static void LogLight(trRefEntity_t *ent)
+{
+    int max1, max2;
+
+    if (!(ent->e.renderfx & RF_FIRST_PERSON)) {
+        return;
+    }
+
+    max1 = ent->ambientLight[0];
+    if (ent->ambientLight[1] > max1) {
+        max1 = ent->ambientLight[1];
+    } else if (ent->ambientLight[2] > max1) {
+        max1 = ent->ambientLight[2];
+    }
+
+    max2 = ent->directedLight[0];
+    if (ent->directedLight[1] > max2) {
+        max2 = ent->directedLight[1];
+    } else if (ent->directedLight[2] > max2) {
+        max2 = ent->directedLight[2];
+    }
+
+    ri.Printf(PRINT_ALL, "amb:%i  dir:%i\n", max1, max2);
+}
+
+/*
+===============
+R_ClearRealDlights
+===============
+*/
+void R_ClearRealDlights()
+{
+    memset(dli.allocated, 0, sizeof(dli.allocated));
+    dli.dlightMap = 0;
+}
+
+/*
+===============
+R_UploadDlights
+===============
+*/
+void R_UploadDlights()
+{
+    int i, h;
+
+    if (!tr.pc.c_dlightSurfaces) {
+        return;
+    }
+
+    h = 0;
+    for (i = 0; i < LIGHTMAP_SIZE; i++) {
+        if (h < dli.allocated[i]) {
+            h = dli.allocated[i];
+        }
+    }
+
+    if (h) {
+        if (h > LIGHTMAP_SIZE) {
+            ri.Error(ERR_DROP, "R_UploadDlights: bad allocated height");
+        }
+
+        GL_Bind(tr.dlightImages[dli.dlightMap]);
+        qglTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, LIGHTMAP_SIZE, h, GL_RGBA, GL_UNSIGNED_BYTE, dli.lightmap_buffer);
+
+        tr.pc.c_dlightMaps++;
+        memset(dli.allocated, 0, sizeof(dli.allocated));
+    }
+}
+
+/*
+===============
+R_AllocLMBlock
+===============
+*/
+qboolean R_AllocLMBlock(int w, int h, int *x, int *y)
+{
+    int i, j;
+    int best, best2;
+
+    for (;;) {
+        best = LIGHTMAP_SIZE;
+        for (i = 0; i < LIGHTMAP_SIZE - w; i++) {
+            best2 = 0;
+
+            for (j = 0; j < w && dli.allocated[i + j] < best; j++) {
+                if (best2 < dli.allocated[i + j]) {
+                    best2 = dli.allocated[i + j];
+                }
+            }
+
+            if (j == w) {
+                *x   = i;
+                *y   = best2;
+                best = best2;
+            }
+        }
+
+        if (h + best <= LIGHTMAP_SIZE) {
+            break;
+        }
+
+        if (dli.dlightMap == 14) {
+            return qfalse;
+        }
+
+        R_UploadDlights();
+        dli.dlightMap++;
+    }
+
+    return qtrue;
+}
+
+/*
+===============
+R_DlightSample
+===============
+*/
+qboolean R_DlightSample(byte *src, const vec3_t vec, byte *dst)
+{
+    int      r, g, b;
+    int      k;
+    qboolean added;
+    vec3_t   dir;
+    float    add;
+
+    added = qfalse;
+    r     = src[0];
+    g     = src[1];
+    b     = src[2];
+
+    for (k = 0; k < dli.numLights; k++) {
+        incidentLight_t *light = &dli.lights[k];
+
+        VectorSubtract(vec, light->origin, dir);
+        add = VectorLength(dir) * light->power;
+        if (add <= 1.f) {
+            float t = (1.0 - add) * (1.0 - add) * 375.0;
+
+            r = (int)(t * light->dl->color[0] + (float)r);
+            g = (int)(t * light->dl->color[1] + (float)g);
+            b = (int)(t * light->dl->color[2] + (float)b);
+            // light was added
+            added = qtrue;
+        }
+    }
+
+    if (tr.overbrightShift) {
+        r <<= tr.overbrightShift & 0xFF;
+        g <<= tr.overbrightShift & 0xFF;
+        b <<= tr.overbrightShift & 0xFF;
+    }
+
+    if (r > 0xFF || g > 0xFF || b > 0xFF) {
+        float t;
+        // normalize color values
+        t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+        r = (int)((float)r * t);
+        g = (int)((float)g * t);
+        b = (int)((float)b * t);
+    }
+
+    dst[0] = (byte)r;
+    dst[1] = (byte)g;
+    dst[2] = (byte)b;
+    dst[3] = -1;
+
+    return added;
+}
+
+int R_LightForPoint(vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir) {
+    // Stub
+    return 0;
 }
diff --git a/code/renderergl1/tr_local.h b/code/renderergl1/tr_local.h
index e07f575b..66cb029d 100644
--- a/code/renderergl1/tr_local.h
+++ b/code/renderergl1/tr_local.h
@@ -15,49 +15,164 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-
-#ifndef TR_LOCAL_H
-#define TR_LOCAL_H
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qfiles.h"
 #include "../qcommon/qcommon.h"
-#include "../renderercommon/tr_public.h"
-#include "../renderercommon/tr_common.h"
-#include "../renderercommon/iqm.h"
+#include "tr_public.h"
 #include "../renderercommon/qgl.h"
+#include "../renderercommon/tr_common.h"
+#include "qgl.h"
 
+#ifdef __cplusplus
+#define GLE(ret, name, ...) extern "C" name##proc * qgl##name;
+#else
 #define GLE(ret, name, ...) extern name##proc * qgl##name;
+#endif
+
 QGL_1_1_PROCS;
 QGL_1_1_FIXED_FUNCTION_PROCS;
+QGL_1_3_PROCS;
 QGL_DESKTOP_1_1_PROCS;
 QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
 QGL_3_0_PROCS;
+
 #undef GLE
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define GL_INDEX_TYPE		GL_UNSIGNED_INT
 typedef unsigned int glIndex_t;
 
-// 14 bits
-// can't be increased without changing bit packing for drawsurfs
+// fast float to int conversion
+#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+long myftol( float f );
+#else
+#define	myftol(x) ((int)(x))
+#endif
+
+
+// everything that is needed by the backend needs
+// to be double buffered to allow it to run in
+// parallel on a dual cpu machine
+#define	SMP_FRAMES		2
+
+// 12 bits
 // see QSORT_SHADERNUM_SHIFT
-#define SHADERNUM_BITS	14
-#define MAX_SHADERS		(1<<SHADERNUM_BITS)
+#define	MAX_SHADERS				16384
 
+//#define MAX_SHADER_STATES 2048
+#define MAX_STATES_PER_SHADER 32
+#define MAX_STATE_NAME 32
 
+// can't be increased without changing bit packing for drawsurfs
+
+typedef struct skelSurfaceGame_s skelSurfaceGame_t;
+typedef struct staticSurface_s staticSurface_t;
+
+// any changes in surfaceType must be mirrored in rb_surfaceTable[]
+typedef enum {
+    SF_BAD,
+    SF_SKIP,				// ignore
+    SF_FACE,
+    SF_GRID,
+    SF_POLY,
+    SF_MARK_FRAG,
+    SF_FLARE,
+    SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
+    SF_DISPLAY_LIST,
+    SF_TIKI_SKEL,
+    SF_TIKI_STATIC,
+    SF_SWIPE,
+    SF_SPRITE,
+    SF_TERRAIN_PATCH,
+    SF_TRIANGLES,
+    SF_MD3,
+    SF_MD4,
+
+    SF_NUM_SURFACE_TYPES,
+    SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
+} surfaceType_t;
+
+typedef struct {
+    struct mnode_s* cntNode;
+    struct msurface_s* skySurfs[32];
+    int numSurfs;
+    vec3_t offset;
+    vec3_t mins;
+    vec3_t maxs;
+} portalsky_t;
+
+typedef struct {
+    vec3_t transformed;
+    int index;
+} sphere_dlight_t;
+
+typedef enum {
+    LIGHT_POINT,
+    LIGHT_DIRECTIONAL,
+    LIGHT_SPOT,
+    LIGHT_SPOT_FAST
+} lighttype_t;
+
+typedef struct reallightinfo_s {
+    vec3_t color;
+    lighttype_t eType;
+    float fIntensity;
+    float fDist;
+    float fSpotSlope;
+    float fSpotConst;
+    float fSpotScale;
+    vec3_t vOrigin;
+    vec3_t vDirection;
+} reallightinfo_t;
+
+typedef float cube_entry_t[3][4];
+
+typedef struct {
+    vec3_t origin;
+    vec3_t worldOrigin;
+    vec3_t traceOrigin;
+    float radius;
+    struct mnode_s* leaves[8];
+    void(*TessFunction) (unsigned char* dstColors);
+    union {
+        unsigned char level[4];
+        int value;
+    } ambient;
+    int numRealLights;
+    reallightinfo_t light[MAX_REAL_LIGHTS];
+    int bUsesCubeMap;
+    float cubemap[24][3][4];
+} sphereor_t;
+
+typedef struct spherel_s {
+    vec3_t origin;
+	vec3_t color;
+    float intensity;
+    struct mnode_s* leaf;
+    int needs_trace;
+    int spot_light;
+    float spot_radiusbydistance;
+	vec3_t spot_dir;
+    int reference_count;
+} spherel_t;
 
 typedef struct dlight_s {
 	vec3_t	origin;
 	vec3_t	color;				// range from 0.0 to 1.0, should be color normalized
 	float	radius;
 
+	dlighttype_t type;
 	vec3_t	transformed;		// origin in local coordinate system
-	int		additive;			// texture detail is lost tho when the lightmap is dark
 } dlight_t;
 
 
@@ -69,13 +184,32 @@ typedef struct {
 	float		axisLength;		// compensate for non-normalized axis
 
 	qboolean	needDlights;	// true for bmodels that touch a dlight
-	qboolean	lightingCalculated;
+	qboolean	bLightGridCalculated;
+	int			iGridLighting;
+	float		lodpercentage[2];
+	qboolean	sphereCalculated;
+	int			lightingSphere;
+
+	//
+	// old lighting variables
+	//
 	vec3_t		lightDir;		// normalized direction towards light
 	vec3_t		ambientLight;	// color normalized to 0-255
 	int			ambientLightInt;	// 32 bit rgba packed
 	vec3_t		directedLight;
 } trRefEntity_t;
 
+typedef struct refSprite_s {
+    surfaceType_t surftype;
+    int hModel;
+    int shaderNum;
+    float origin[3];
+    float scale;
+    float axis[3][3];
+    unsigned char shaderRGBA[4];
+    int renderfx;
+    float shaderTime;
+} refSprite_t;
 
 typedef struct {
 	vec3_t		origin;			// in world coordinates
@@ -84,11 +218,38 @@ typedef struct {
 	float		modelMatrix[16];
 } orientationr_t;
 
+/*
+typedef struct image_s {
+	char		imgName[MAX_QPATH];		// game path, including extension
+	int			width, height;				// source image
+	int			uploadWidth, uploadHeight;	// after power of two and picmip but not including clamp to MAX_TEXTURE_SIZE
+	GLuint		texnum;					// gl texture binding
+
+	int			frameUsed;			// for texture usage in frame statistics
+	int			bytesUsed;
+
+	int			internalFormat;
+	int			TMU;				// only needed for voodoo2
+	int			numMipmaps;
+
+	qboolean	dynamicallyUpdated;
+	qboolean	allowPicmip;
+	qboolean	force32bit;
+    int			wrapClampModeX;
+    int			wrapClampModeY;
+	int			r_sequence;
+	int			UseCount;
+
+	struct image_s*	next;
+} image_t;
+*/
+
 //===============================================================================
 
 typedef enum {
 	SS_BAD,
 	SS_PORTAL,			// mirrors, portals, viewscreens
+	SS_PORTALSKY,
 	SS_ENVIRONMENT,		// sky box
 	SS_OPAQUE,			// opaque
 
@@ -97,8 +258,6 @@ typedef enum {
 						// in addition to alpha test
 	SS_BANNER,
 
-	SS_FOG,
-
 	SS_UNDERWATER,		// for items that should be drawn in front of the water plane
 
 	SS_BLEND0,			// regular transparency and filters
@@ -129,6 +288,10 @@ typedef enum {
 
 } genFunc_t;
 
+typedef enum {
+	USE_S_COORDS,
+	USE_T_COORDS
+} texDirection_t;
 
 typedef enum {
 	DEFORM_NONE,
@@ -136,17 +299,11 @@ typedef enum {
 	DEFORM_NORMALS,
 	DEFORM_BULGE,
 	DEFORM_MOVE,
-	DEFORM_PROJECTION_SHADOW,
 	DEFORM_AUTOSPRITE,
 	DEFORM_AUTOSPRITE2,
-	DEFORM_TEXT0,
-	DEFORM_TEXT1,
-	DEFORM_TEXT2,
-	DEFORM_TEXT3,
-	DEFORM_TEXT4,
-	DEFORM_TEXT5,
-	DEFORM_TEXT6,
-	DEFORM_TEXT7
+	DEFORM_LIGHTGLOW,
+	DEFORM_FLAP_S,
+	DEFORM_FLAP_T
 } deform_t;
 
 typedef enum {
@@ -159,7 +316,22 @@ typedef enum {
 	AGEN_LIGHTING_SPECULAR,
 	AGEN_WAVEFORM,
 	AGEN_PORTAL,
-	AGEN_CONST
+	AGEN_NOISE,
+	AGEN_DOT,
+	AGEN_ONE_MINUS_DOT,
+	AGEN_CONSTANT,
+	AGEN_GLOBAL_ALPHA,
+	AGEN_SKYALPHA,
+	AGEN_ONE_MINUS_SKYALPHA,
+	AGEN_SCOORD,
+	AGEN_TCOORD,
+	AGEN_DIST_FADE,
+    AGEN_ONE_MINUS_DIST_FADE,
+    AGEN_TIKI_DIST_FADE,
+    AGEN_ONE_MINUS_TIKI_DIST_FADE,
+	AGEN_DOT_VIEW,
+	AGEN_ONE_MINUS_DOT_VIEW,
+	AGEN_HEIGHT_FADE,
 } alphaGen_t;
 
 typedef enum {
@@ -172,9 +344,17 @@ typedef enum {
 	CGEN_VERTEX,			// tess.vertexColors * tr.identityLight
 	CGEN_ONE_MINUS_VERTEX,
 	CGEN_WAVEFORM,			// programmatically generated
-	CGEN_LIGHTING_DIFFUSE,
-	CGEN_FOG,				// standard fog
-	CGEN_CONST				// fixed color
+	CGEN_MULTIPLY_BY_WAVEFORM,
+	CGEN_LIGHTING_GRID,
+	CGEN_LIGHTING_SPHERICAL,
+	CGEN_CONSTANT,
+	CGEN_NOISE,
+	CGEN_GLOBAL_COLOR,
+	CGEN_STATIC,
+	CGEN_SCOORD,
+	CGEN_TCOORD,
+	CGEN_DOT,
+	CGEN_ONE_MINUS_DOT
 } colorGen_t;
 
 typedef enum {
@@ -183,8 +363,10 @@ typedef enum {
 	TCGEN_LIGHTMAP,
 	TCGEN_TEXTURE,
 	TCGEN_ENVIRONMENT_MAPPED,
-	TCGEN_FOG,
-	TCGEN_VECTOR			// S and T from world coordinates
+	TCGEN_VECTOR,			// S and T from world coordinates
+	TCGEN_ENVIRONMENT_MAPPED2,
+	TCGEN_SUN_REFLECTION,
+	TCGEN_FOG
 } texCoordGen_t;
 
 typedef enum {
@@ -206,14 +388,21 @@ typedef struct {
 #define TR_MAX_TEXMODS 4
 
 typedef enum {
-	TMOD_NONE,
-	TMOD_TRANSFORM,
-	TMOD_TURBULENT,
-	TMOD_SCROLL,
-	TMOD_SCALE,
-	TMOD_STRETCH,
-	TMOD_ROTATE,
-	TMOD_ENTITY_TRANSLATE
+    TMOD_NONE,
+    TMOD_TRANSFORM,
+    TMOD_TURBULENT,
+    TMOD_SCROLL,
+    TMOD_SCALE,
+    TMOD_STRETCH,
+    TMOD_ROTATE,
+    TMOD_ENTITY_TRANSLATE,
+    TMOD_NOISE,
+    TMOD_OFFSET,
+    TMOD_PARALLAX,
+    TMOD_MACRO,
+    TMOD_WAVETRANS,
+    TMOD_WAVETRANT,
+    TMOD_BULGETRANS
 } texMod_t;
 
 #define	MAX_SHADER_DEFORMS	3
@@ -244,6 +433,9 @@ typedef struct {
 	float			scale[2];			// s *= scale[0]
 	                                    // t *= scale[1]
 
+	// used for TMOD_PARALLAX
+	float			rate[2];
+
 	// used for TMOD_SCROLL
 	float			scroll[2];			// s' = s + scroll[0] * time
 										// t' = t + scroll[1] * time
@@ -251,16 +443,20 @@ typedef struct {
 	// + = clockwise
 	// - = counterclockwise
 	float			rotateSpeed;
+    float			rotateStart;
+    float			rotateCoef;
 
 } texModInfo_t;
 
 
-#define	MAX_IMAGE_ANIMATIONS	8
+#define	MAX_IMAGE_ANIMATIONS	64
+#define BUNDLE_ANIMATE_ONCE		1
 
 typedef struct {
 	image_t			*image[MAX_IMAGE_ANIMATIONS];
 	int				numImageAnimations;
 	float			imageAnimationSpeed;
+	float			imageAnimationPhase;
 
 	texCoordGen_t	tcGen;
 	vec3_t			tcGenVectors[2];
@@ -270,33 +466,50 @@ typedef struct {
 
 	int				videoMapHandle;
 	qboolean		isLightmap;
+	qboolean		vertexLightmap;
 	qboolean		isVideoMap;
+	int				flags;
 } textureBundle_t;
 
 #define NUM_TEXTURE_BUNDLES 2
 
 typedef struct {
 	qboolean		active;
+	qboolean		hasNormalMap;
 	
 	textureBundle_t	bundle[NUM_TEXTURE_BUNDLES];
+	image_t			*normalMap;
+	int				multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
 
 	waveForm_t		rgbWave;
 	colorGen_t		rgbGen;
 
 	waveForm_t		alphaWave;
-	alphaGen_t		alphaGen;
+    alphaGen_t		alphaGen;
 
-	byte			constantColor[4];			// for CGEN_CONST and AGEN_CONST
+    unsigned		stateBits;					// GLS_xxxx mask
 
-	unsigned		stateBits;					// GLS_xxxx mask
 
-	acff_t			adjustColorsForFog;
+	qboolean		noMipMaps;
+    qboolean		noPicMip;
+    qboolean		force32bit;
 
-	qboolean		isDetail;
+	float			alphaMin;
+	float			alphaMax;
+	vec3_t			specOrigin;
+
+    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
+	byte			alphaConst;
+	byte			alphaConstMin;
 } shaderStage_t;
 
 struct shaderCommands_s;
 
+#define LIGHTMAP_2D			-4		// shader is for 2D rendering
+#define LIGHTMAP_BY_VERTEX	-3		// pre-lit triangle models
+#define LIGHTMAP_WHITEIMAGE	-2
+#define	LIGHTMAP_NONE		-1
+
 typedef enum {
 	CT_FRONT_SIDED,
 	CT_BACK_SIDED,
@@ -314,6 +527,18 @@ typedef struct {
 	image_t		*outerbox[6], *innerbox[6];
 } skyParms_t;
 
+typedef enum {
+	SPRITE_PARALLEL,
+	SPRITE_PARALLEL_ORIENTED,
+	SPRITE_ORIENTED,
+	SPRITE_PARALLEL_UPRIGHT
+} spriteType_t;
+
+typedef struct {
+  spriteType_t type;
+  float scale;
+} spriteParms_t;
+
 typedef struct {
 	vec3_t	color;
 	float	depthForOpaque;
@@ -344,12 +569,15 @@ typedef struct shader_s {
 
 	qboolean	isSky;
 	skyParms_t	sky;
+	spriteParms_t sprite;
+	qboolean	isPortalSky;
+	float subdivisions;
+	float fDistRange;
+	float fDistNear;
 	fogParms_t	fogParms;
 
 	float		portalRange;			// distance to fog out at
 
-	int			multitextureEnv;		// 0, GL_MODULATE, GL_ADD (FIXME: put in stage)
-
 	cullType_t	cullType;				// CT_FRONT_SIDED, CT_BACK_SIDED, or CT_TWO_SIDED
 	qboolean	polygonOffset;			// set for decals and other items that must be offset 
 	qboolean	noMipMaps;				// for console fonts, 2D elements, etc.
@@ -366,18 +594,39 @@ typedef struct shader_s {
 	deformStage_t	deforms[MAX_SHADER_DEFORMS];
 
 	int			numUnfoggedPasses;
-	shaderStage_t	*stages[MAX_SHADER_STAGES];		
+	shaderStage_t	* unfoggedStages[MAX_SHADER_STAGES];
+
+	int			needsLGrid;
+	int			needsLSpherical;
+	int			stagesWithAlphaFog;
+	int			flags;
 
 	void		(*optimalStageIteratorFunc)( void );
 
-  double clampTime;                                  // time this shader is clamped to
-  double timeOffset;                                 // current time offset for this shader
+  float clampTime;                                  // time this shader is clamped to
+  float timeOffset;                                 // current time offset for this shader
+
+  int numStates;                                    // if non-zero this is a state shader
+  struct shader_s *currentShader;                   // current state if this is a state shader
+  struct shader_s *parentShader;                    // current state if this is a state shader
+  int currentState;                                 // current state index for cycle purposes
+  long expireTime;                                  // time in milliseconds this expires
 
   struct shader_s *remappedShader;                  // current shader this one is remapped too
 
+  int shaderStates[MAX_STATES_PER_SHADER];          // index to valid shader states
+
 	struct	shader_s	*next;
 } shader_t;
 
+typedef struct shaderState_s {
+  char shaderName[MAX_QPATH];     // name of shader this state belongs to
+  char name[MAX_STATE_NAME];      // name of this state
+  char stateShader[MAX_QPATH];    // shader this name invokes
+  int cycleTime;                  // time this cycle lasts, <= 0 is forever
+  shader_t *shader;
+} shaderState_t;
+
 
 // trRefdef_t holds everything that comes in refdef_t,
 // as well as the locally generated scene information
@@ -396,7 +645,7 @@ typedef struct {
 	byte		areamask[MAX_MAP_AREA_BYTES];
 	qboolean	areamaskModified;	// qtrue if areamask changed since last scene
 
-	double		floatTime;			// tr.refdef.time / 1000.0
+	float		floatTime;			// tr.refdef.time / 1000.0
 
 	// text messages for deform text shaders
 	char		text[MAX_RENDER_STRINGS][MAX_RENDER_STRING_LENGTH];
@@ -404,27 +653,44 @@ typedef struct {
 	int			num_entities;
 	trRefEntity_t	*entities;
 
+    int			num_sprites;
+    refSprite_t	*sprites;
+
 	int			num_dlights;
 	struct dlight_s	*dlights;
 
+	int			numTerMarks;
+	struct srfMarkFragment_s *terMarks;
+
 	int			numPolys;
 	struct srfPoly_s	*polys;
 
 	int			numDrawSurfs;
 	struct drawSurf_s	*drawSurfs;
 
+	int			numSpriteSurfs;
+	struct drawSurf_s	*spriteSurfs;
+
+    int			numStaticModels;
+    struct cStaticModelUnpacked_s *staticModels;
+
+    int			numStaticModelData;
+    unsigned char		*staticModelData;
+    qboolean sky_portal;
+    float sky_alpha;
+    vec3_t sky_origin;
+    vec3_t sky_axis[3];
+	// added in 2.0
+	//==
+    qboolean skybox_farplane;
+    qboolean render_terrain;
+	//==
 
 } trRefdef_t;
 
 
 //=================================================================================
 
-// max surfaces per-skin
-// This is an arbitry limit. Vanilla Q3 only supported 32 surfaces in skins but failed to
-// enforce the maximum limit when reading skin files. It was possile to use more than 32
-// surfaces which accessed out of bounds memory past end of skin->surfaces hunk block.
-#define MAX_SKIN_SURFACES	256
-
 // skins allow models to be retextured without modifying the model file
 typedef struct {
 	char		name[MAX_QPATH];
@@ -434,7 +700,7 @@ typedef struct {
 typedef struct skin_s {
 	char		name[MAX_QPATH];		// game path, including extension
 	int			numSurfaces;
-	skinSurface_t	*surfaces;			// dynamically allocated array of surfaces
+	skinSurface_t	*surfaces[MD3_MAX_SURFACES];
 } skin_t;
 
 
@@ -451,22 +717,35 @@ typedef struct {
 	float		surface[4];
 } fog_t;
 
+typedef struct depthfog_s {
+	float len;
+	float oolen;
+	int enabled;
+	int extrafrustums;
+} depthfog_t;
+
 typedef struct {
-	orientationr_t	or;
+	orientationr_t	ori;
 	orientationr_t	world;
 	vec3_t		pvsOrigin;			// may be different than or.origin for portals
 	qboolean	isPortal;			// true if this view is through a portal
 	qboolean	isMirror;			// the portal is a mirror, invert the face culling
+    qboolean	isPortalSky;		// since 2.0 whether or not this view is a portal sky
 	int			frameSceneNum;		// copied from tr.frameSceneNum
 	int			frameCount;			// copied from tr.frameCount
 	cplane_t	portalPlane;		// clip anything behind this if mirroring
 	int			viewportX, viewportY, viewportWidth, viewportHeight;
 	float		fovX, fovY;
 	float		projectionMatrix[16];
-	cplane_t	frustum[4];
+	cplane_t	frustum[5];
 	vec3_t		visBounds[2];
 	float		zFar;
-	stereoFrame_t	stereoFrame;
+	depthfog_t	fog;
+    float		farplane_distance;
+    float		farplane_bias; // added in 2.0
+	float		farplane_color[3];
+    qboolean	farplane_cull;
+    qboolean	renderTerrain; // added in 2.0
 } viewParms_t;
 
 
@@ -478,24 +757,6 @@ SURFACES
 ==============================================================================
 */
 
-// any changes in surfaceType must be mirrored in rb_surfaceTable[]
-typedef enum {
-	SF_BAD,
-	SF_SKIP,				// ignore
-	SF_FACE,
-	SF_GRID,
-	SF_TRIANGLES,
-	SF_POLY,
-	SF_MD3,
-	SF_MDR,
-	SF_IQM,
-	SF_FLARE,
-	SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
-
-	SF_NUM_SURFACE_TYPES,
-	SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
-} surfaceType_t;
-
 typedef struct drawSurf_s {
 	unsigned			sort;			// bit combination for fast compares
 	surfaceType_t		*surface;		// any of surface*_t
@@ -511,11 +772,23 @@ typedef struct drawSurf_s {
 typedef struct srfPoly_s {
 	surfaceType_t	surfaceType;
 	qhandle_t		hShader;
-	int				fogIndex;
 	int				numVerts;
 	polyVert_t		*verts;
+	int				renderfx;
 } srfPoly_t;
 
+typedef struct srfMarkFragment_s {
+	surfaceType_t surfaceType;
+	int iIndex;
+	int numVerts;
+	polyVert_t* verts;
+} srfMarkFragment_t;
+
+typedef struct srfDisplayList_s {
+	surfaceType_t	surfaceType;
+	int				listNum;
+} srfDisplayList_t;
+
 
 typedef struct srfFlare_s {
 	surfaceType_t	surfaceType;
@@ -528,13 +801,22 @@ typedef struct srfGridMesh_s {
 	surfaceType_t	surfaceType;
 
 	// dynamic lighting information
-	int				dlightBits;
+    int				dlightBits[SMP_FRAMES];
+    int				dlightMap[SMP_FRAMES];
 
 	// culling information
 	vec3_t			meshBounds[2];
 	vec3_t			localOrigin;
 	float			meshRadius;
 
+	// lightmap data
+    float			lightmapOffset[2];
+    int				lmX;
+    int				lmY;
+    int				lmWidth;
+    int				lmHeight;
+    unsigned char	*lmData;
+
 	// lod information, which may be different
 	// than the culling information to allow for
 	// groups of curves that LOD as a unit
@@ -558,7 +840,17 @@ typedef struct {
 	cplane_t	plane;
 
 	// dynamic lighting information
-	int			dlightBits;
+    int			dlightBits[SMP_FRAMES];
+    int			dlightMap[SMP_FRAMES];
+    float		lightmapOffset[2];
+    int			lmWidth;
+    int			lmHeight;
+    int			lmX;
+    int			lmY;
+    byte*		lmData;
+    vec3_t		lmOrigin;
+    vec3_t		lmVecs[2];
+    vec3_t		lmInverseVecs[2];
 
 	// triangle definitions (no normals at points)
 	int			numPoints;
@@ -574,7 +866,7 @@ typedef struct {
 	surfaceType_t	surfaceType;
 
 	// dynamic lighting information
-	int				dlightBits;
+	int				dlightBits[SMP_FRAMES];
 
 	// culling information (FIXME: use this!)
 	vec3_t			bounds[2];
@@ -589,63 +881,125 @@ typedef struct {
 	drawVert_t		*verts;
 } srfTriangles_t;
 
-typedef struct {
-	vec3_t translate;
-	quat_t rotate;
-	vec3_t scale;
-} iqmTransform_t;
+typedef union varnodeUnpacked_u {
+    float fVariance;
+    int flags;
+	/*
+    struct {
+#if !Q3_BIG_ENDIAN
+		byte flags;
+        unsigned char unused[3];
+#else
+        unsigned char unused[3];
+        byte flags;
+#endif
+    } s;
+	*/
+} varnodeUnpacked_t;
 
-// inter-quake-model
-typedef struct {
-	int		num_vertexes;
-	int		num_triangles;
-	int		num_frames;
-	int		num_surfaces;
-	int		num_joints;
-	int		num_poses;
-	struct srfIQModel_s	*surfaces;
+typedef unsigned short terraInt;
 
-	int		*triangles;
+typedef struct terrainVert_s {
+    vec3_t xyz;
+    vec2_t texCoords[2];
+    float fVariance;
+    float fHgtAvg;
+    float fHgtAdd;
+    unsigned int uiDistRecalc;
+    terraInt nRef;
+    terraInt iVertArray;
+    byte* pHgt;
+    terraInt iNext;
+    terraInt iPrev;
+} terrainVert_t;
 
-	// vertex arrays
-	float		*positions;
-	float		*texcoords;
-	float		*normals;
-	float		*tangents;
-	byte		*colors;
-	int		*influences; // [num_vertexes] indexes into influenceBlendVertexes
+typedef struct terraTri_s {
+    unsigned short iPt[3];
+    terraInt nSplit;
+    unsigned int uiDistRecalc;
+    struct cTerraPatchUnpacked_s* patch;
+    varnodeUnpacked_t* varnode;
+    terraInt index;
+    byte lod;
+    byte byConstChecks;
+    terraInt iLeft;
+    terraInt iRight;
+    terraInt iBase;
+    terraInt iLeftChild;
+    terraInt iRightChild;
+    terraInt iParent;
+    terraInt iPrev;
+    terraInt iNext;
+} terraTri_t;
 
-	// unique list of vertex blend indexes/weights for faster CPU vertex skinning
-	byte		*influenceBlendIndexes; // [num_influences]
-	union {
-		float	*f;
-		byte	*b;
-	} influenceBlendWeights; // [num_influences]
+typedef struct srfTerrain_s {
+    surfaceType_t surfaceType;
+    terraInt iVertHead;
+    terraInt iTriHead;
+    terraInt iTriTail;
+    terraInt iMergeHead;
+    int nVerts;
+    int nTris;
+    int lmapSize;
+    int dlightBits[2];
+    float lmapStep;
+    int dlightMap[2];
+    byte* lmData;
+    float lmapX;
+    float lmapY;
+} srfTerrain_t;
 
-	// depending upon the exporter, blend indices and weights might be int/float
-	// as opposed to the recommended byte/byte, for example Noesis exports
-	// int/float whereas the official IQM tool exports byte/byte
-	int		blendWeightsType; // IQM_UBYTE or IQM_FLOAT
+typedef struct cTerraPatchUnpacked_s {
+    srfTerrain_t drawinfo;
+    int viewCount;
+    int visCountCheck;
+    int visCountDraw;
+    int frameCount;
+    unsigned int uiDistRecalc;
+    float s;
+    float t;
+    vec2_t texCoord[2][2];
+    float x0;
+    float y0;
+    float z0;
+    float zmax;
+    shader_t* shader;
+    short int iNorth;
+    short int iEast;
+    short int iSouth;
+    short int iWest;
+    struct cTerraPatchUnpacked_s* pNextActive;
+    varnodeUnpacked_t varTree[2][63];
+    unsigned char heightmap[81];
+    byte flags;
+    byte byDirty;
+} cTerraPatchUnpacked_t;
 
-	char		*jointNames;
-	int		*jointParents;
-	float		*bindJoints; // [num_joints * 12]
-	float		*invBindJoints; // [num_joints * 12]
-	iqmTransform_t	*poses; // [num_frames * num_poses]
-	float		*bounds;
-} iqmData_t;
-
-// inter-quake-model surface
-typedef struct srfIQModel_s {
-	surfaceType_t	surfaceType;
-	char		name[MAX_QPATH];
-	shader_t	*shader;
-	iqmData_t	*data;
-	int		first_vertex, num_vertexes;
-	int		first_triangle, num_triangles;
-	int		first_influence, num_influences;
-} srfIQModel_t;
+typedef struct srfStaticModel_s {
+    surfaceType_t surfaceType;
+    struct cStaticModelUnpacked_s* parent;
+} srfStaticModel_t;
 
+typedef struct cStaticModelUnpacked_s {
+    qboolean useSpecialLighting;
+    qboolean bLightGridCalculated;
+    qboolean bRendered;
+    char model[128];
+    vec3_t origin;
+    vec3_t angles;
+    vec3_t axis[3];
+    float scale;
+    int firstVertexData;
+    int numVertexData;
+    int visCount;
+    dtiki_t* tiki;
+    sphere_dlight_t dlights[MAX_DLIGHTS];
+    int numdlights;
+    float radius;
+    float cull_radius;
+    int iGridLighting;
+    float lodpercentage[2];
+} cStaticModelUnpacked_t;
 
 extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
 
@@ -668,6 +1022,7 @@ BRUSH MODELS
 
 typedef struct msurface_s {
 	int					viewCount;		// if == tr.viewCount, already added
+	int					frameCount;
 	struct shader_s		*shader;
 	int					fogIndex;
 
@@ -690,18 +1045,40 @@ typedef struct mnode_s {
 
 	// leaf specific
 	int			cluster;
-	int			area;
+    int			area;
+    spherel_t**	lights;
+    int			numlights;
 
 	msurface_t	**firstmarksurface;
-	int			nummarksurfaces;
+    int			nummarksurfaces;
+
+    int			firstTerraPatch;
+    int			numTerraPatches;
+    int			firstStaticModel;
+    int			numStaticModels;
+    void**		pFirstMarkFragment;
+    int			iNumMarkFragment;
 } mnode_t;
 
 typedef struct {
 	vec3_t		bounds[2];		// for culling
 	msurface_t	*firstSurface;
 	int			numSurfaces;
+    void** pFirstMarkFragment;
+    int iNumMarkFragment;
+    int frameCount;
+    qboolean hasLightmap;
 } bmodel_t;
 
+typedef struct {
+    float width;
+    float height;
+    float origin_x;
+    float origin_y;
+    float scale;
+    shader_t* shader;
+} sprite_t;
+
 typedef struct {
 	char		name[MAX_QPATH];		// ie: maps/tim_dm2.bsp
 	char		baseName[MAX_QPATH];	// ie: tim_dm2
@@ -711,6 +1088,7 @@ typedef struct {
 	int			numShaders;
 	dshader_t	*shaders;
 
+	int			numBmodels;
 	bmodel_t	*bmodels;
 
 	int			numplanes;
@@ -726,24 +1104,36 @@ typedef struct {
 	int			nummarksurfaces;
 	msurface_t	**marksurfaces;
 
-	int			numfogs;
-	fog_t		*fogs;
-
-	vec3_t		lightGridOrigin;
+	vec3_t		lightGridMins;
 	vec3_t		lightGridSize;
-	vec3_t		lightGridInverseSize;
+	vec3_t		lightGridOOSize;
 	int			lightGridBounds[3];
+	unsigned short* lightGridOffsets;
 	byte		*lightGridData;
+	byte        lightGridPalette[768];
 
+    int numTerraPatches;
+    cTerraPatchUnpacked_t* terraPatches;
+    cTerraPatchUnpacked_t* activeTerraPatches;
+
+    int numVisTerraPatches;
+    cTerraPatchUnpacked_t** visTerraPatches;
+
+    int numStaticModelData;
+    byte* staticModelData;
+
+    int numStaticModels;
+    cStaticModelUnpacked_t* staticModels;
+
+    int numVisStaticModels;
+    cStaticModelUnpacked_t** visStaticModels;
 
 	int			numClusters;
 	int			clusterBytes;
 	const byte	*vis;			// may be passed in by CM_LoadMap to save space
 
 	byte		*novis;			// clusterBytes of 0xff
-
-	char		*entityString;
-	char		*entityParsePoint;
+	byte		*lighting;
 } world_t;
 
 //======================================================================
@@ -751,22 +1141,21 @@ typedef struct {
 typedef enum {
 	MOD_BAD,
 	MOD_BRUSH,
-	MOD_MESH,
-	MOD_MDR,
-	MOD_IQM
+	MOD_TIKI,
+	MOD_SPRITE
 } modtype_t;
 
 typedef struct model_s {
 	char		name[MAX_QPATH];
 	modtype_t	type;
-	int			index;		// model = tr.models[model->index]
+	int			index;				// model = tr.models[model->index]
 
-	int			dataSize;	// just for listing purposes
-	bmodel_t	*bmodel;		// only if type == MOD_BRUSH
-	md3Header_t	*md3[MD3_MAX_LODS];	// only if type == MOD_MESH
-	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
-
-	int			 numLods;
+    qboolean serveronly;
+    union {
+        bmodel_t* bmodel;
+        dtiki_t* tiki;
+        sprite_t* sprite;
+    } d;
 } model_t;
 
 
@@ -776,19 +1165,24 @@ void		R_ModelInit (void);
 model_t		*R_GetModelByHandle( qhandle_t hModel );
 int			R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
 					 float frac, const char *tagName );
-void		R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs );
 
 void		R_Modellist_f (void);
 
 //====================================================
+extern	refimport_t		ri;
 
 #define	MAX_DRAWIMAGES			2048
+#define	MAX_LIGHTMAPS			256
 #define	MAX_SKINS				1024
-
+#define MAX_SPHERE_LIGHTS		512
 
 #define	MAX_DRAWSURFS			0x10000
+#define	MAX_SPRITESURFS			0x8000
 #define	DRAWSURF_MASK			(MAX_DRAWSURFS-1)
 
+#define MAX_SPRITE_DIST				16384.0f
+#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
+
 /*
 
 the drawsurf sort data is packed into a single 32 bit value so it can be
@@ -796,24 +1190,23 @@ compared quickly during the qsorting process
 
 the bits are allocated as follows:
 
-0 - 1	: dlightmap index
-//2		: used to be clipped flag REMOVED - 03.21.00 rad
-2 - 6	: fog index
-11 - 20	: entity index
 21 - 31	: sorted shader index
+11 - 20	: entity index
+2 - 6	: fog index
+//2		: used to be clipped flag REMOVED - 03.21.00 rad
+0 - 1	: dlightmap index
 
 	TTimo - 1.32
-0-1   : dlightmap index
-2-6   : fog index
+17-31 : sorted shader index
 7-16  : entity index
-17-30 : sorted shader index
+2-6   : fog index
+0-1   : dlightmap index
 */
-#define	QSORT_FOGNUM_SHIFT	2
+#define	QSORT_SHADERNUM_SHIFT	21 // was 22, decreased in 2.30
+#define	QSORT_ENTITYNUM_SHIFT	8
+#define	QSORT_FOGNUM_SHIFT		2
 #define	QSORT_REFENTITYNUM_SHIFT	7
-#define	QSORT_SHADERNUM_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
-#if (QSORT_SHADERNUM_SHIFT+SHADERNUM_BITS) > 32
-	#error "Need to update sorting, too many bits."
-#endif
+#define	QSORT_STATICMODEL_SHIFT	20 // was 21, decreased in 2.30
 
 extern	int			gl_filter_min, gl_filter_max;
 
@@ -829,6 +1222,8 @@ typedef struct {
 	int		c_leafs;
 	int		c_dlightSurfaces;
 	int		c_dlightSurfacesCulled;
+	int		c_dlightMaps;
+	int		c_dlightTexels;
 } frontEndCounters_t;
 
 #define	FOG_TABLE_SIZE		256
@@ -844,11 +1239,16 @@ typedef struct {
 	qboolean	finishCalled;
 	int			texEnv[2];
 	int			faceCulling;
-	unsigned long	glStateBits;
+	int			cntTexEnvExt;
+	int			cntnvblendmode;
+	long unsigned int glStateBits;
+	long unsigned int externalSetState;
+	vec4_t fFogColor;
 } glstate_t;
 
+
 typedef struct {
-	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes;
+	int		c_surfaces, c_shaders, c_vertexes, c_indexes, c_totalIndexes, c_characterlights;
 	float	c_overDraw;
 	
 	int		c_dlightVertexes;
@@ -861,21 +1261,30 @@ typedef struct {
 	int		msec;			// total msec for backend run
 } backEndCounters_t;
 
-// all state modified by the back end is separated
+// all state modified by the back end is seperated
 // from the front end state
 typedef struct {
+	int			smpFrame;
 	trRefdef_t	refdef;
 	viewParms_t	viewParms;
-	orientationr_t	or;
+	orientationr_t	ori;
 	backEndCounters_t	pc;
 	qboolean	isHyperspace;
 	trRefEntity_t	*currentEntity;
-	qboolean	skyRenderedThisView;	// flag for drawing sun
-
-	qboolean	projection2D;	// if qtrue, drawstretchpic doesn't need to change modes
-	byte		color2D[4];
-	qboolean	vertexes2D;		// shader needs to be finished
-	trRefEntity_t	entity2D;	// currentEntity will point at this when doing 2D rendering
+    qboolean skyRenderedThisView;	// flag for drawing sun
+    sphereor_t spheres[MAX_SPHERE_LIGHTS];
+    unsigned short numSpheresUsed;
+    sphereor_t* currentSphere;
+    sphereor_t spareSphere;
+    sphereor_t hudSphere;
+    cStaticModelUnpacked_t* currentStaticModel;
+    int dsStreamVert;
+	qboolean in2D;	// if qtrue, drawstretchpic doesn't need to change modes
+	byte color2D[4];
+	qboolean vertexes2D;		// shader needs to be finished
+	trRefEntity_t entity2D;	// currentEntity will point at this when doing 2D rendering
+    int backEndMsec;
+    float shaderStartTime;
 } backEndState_t;
 
 /*
@@ -895,6 +1304,8 @@ typedef struct {
 	int						viewCount;		// incremented every view (twice a scene if portaled)
 											// and every R_MarkFragments call
 
+	int						smpFrame;		// toggles from 0 to 1 every endFrame
+
 	int						frameSceneNum;	// zeroed at RE_BeginFrame
 
 	qboolean				worldMapLoaded;
@@ -903,12 +1314,13 @@ typedef struct {
 	const byte				*externalVisData;	// from RE_SetWorldVisData, shared with CM_Load
 
 	image_t					*defaultImage;
-	image_t					*scratchImage[32];
+	image_t					*scratchImage;
 	image_t					*fogImage;
 	image_t					*dlightImage;	// inverse-quare highlight for projective adding
 	image_t					*flareImage;
 	image_t					*whiteImage;			// full of 0xff
 	image_t					*identityLightImage;	// full of tr.identityLightByte
+	image_t					*dlightImages[15];
 
 	shader_t				*defaultShader;
 	shader_t				*shadowShader;
@@ -918,12 +1330,14 @@ typedef struct {
 	shader_t				*sunShader;
 
 	int						numLightmaps;
-	image_t					**lightmaps;
+	image_t					*lightmaps[MAX_LIGHTMAPS];
 
 	trRefEntity_t			*currentEntity;
 	trRefEntity_t			worldEntity;		// point currentEntity at this when rendering world
 	int						currentEntityNum;
-	int						shiftedEntityNum;	// currentEntityNum << QSORT_REFENTITYNUM_SHIFT
+	int						currentSpriteNum;
+	int						shiftedEntityNum;	// currentEntityNum << QSORT_ENTITYNUM_SHIFT
+	int                     shiftedIsStatic;
 	model_t					*currentModel;
 
 	viewParms_t				viewParms;
@@ -931,9 +1345,15 @@ typedef struct {
 	float					identityLight;		// 1.0 / ( 1 << overbrightBits )
 	int						identityLightByte;	// identityLight * 255
 	int						overbrightBits;		// r_overbrightBits->integer, but set to 0 if no hw gamma
+    int						overbrightShift;
+    float					overbrightMult;
+    int						needsLightScale;
 
-	orientationr_t			or;					// for current entity
+	orientationr_t			ori;				// for current entity
 
+	portalsky_t				portalsky;
+	qboolean				skyRendered;
+	qboolean				portalRendered;
 	trRefdef_t				refdef;
 
 	int						viewCluster;
@@ -948,11 +1368,11 @@ typedef struct {
 	// put large tables at the end, so most elements will be
 	// within the +/32K indexed range on risc processors
 	//
-	model_t					*models[MAX_MOD_KNOWN];
+	model_t					models[MAX_MOD_KNOWN];
 	int						numModels;
 
 	int						numImages;
-	image_t					*images[MAX_DRAWIMAGES];
+	image_t					images[MAX_DRAWIMAGES];
 
 	// shader indexes from other modules will be looked up in tr.shaders[]
 	// shader indexes from drawsurfs will be looked up in sortedShaders[]
@@ -969,70 +1389,129 @@ typedef struct {
 	float					triangleTable[FUNCTABLE_SIZE];
 	float					sawToothTable[FUNCTABLE_SIZE];
 	float					inverseSawToothTable[FUNCTABLE_SIZE];
-	float					fogTable[FOG_TABLE_SIZE];
+
+    spherel_t sSunLight;
+    spherel_t sLights[1532];
+    int numSLights;
+    int rendererhandle;
+    qboolean shadersParsed;
+    int frame_skel_index;
+    int skel_index[1024];
+    fontheader_t* pFontDebugStrings;
+
+	int farclip;
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
 extern trGlobals_t	tr;
+extern glconfig_t	glConfig;		// outside of TR since it shouldn't be cleared during ref re-init
+
+// These variables should live inside glConfig but can't because of
+// compatibility issues to the original ID vms.  If you release a stand-alone
+// game and your mod uses tr_types.h from this build you can safely move them
+// to the glconfig_t struct.
+extern qboolean  textureFilterAnisotropic;
+extern int       maxAnisotropy;
+extern float     displayAspect;
+extern qboolean  haveClampToEdge;
+
 extern glstate_t	glState;		// outside of TR since it shouldn't be cleared during ref re-init
+extern int r_sequencenumber;
+
 
 //
 // cvars
 //
 extern cvar_t	*r_flareSize;
 extern cvar_t	*r_flareFade;
-// coefficient for the flare intensity falloff function.
-#define FLARE_STDCOEFF "150"
-extern cvar_t	*r_flareCoeff;
-
-extern cvar_t	*r_railWidth;
-extern cvar_t	*r_railCoreWidth;
-extern cvar_t	*r_railSegmentLength;
 
 extern cvar_t	*r_ignore;				// used for debugging anything
 extern cvar_t	*r_verbose;				// used for verbose debug spew
 extern cvar_t	*r_ignoreFastPath;		// allows us to ignore our Tess fast paths
 
 extern cvar_t	*r_znear;				// near Z clip plane
-extern cvar_t	*r_zproj;				// z distance of projection plane
-extern cvar_t	*r_stereoSeparation;			// separation of cameras for stereo rendering
+
+extern cvar_t	*r_stencilbits;			// number of desired stencil bits
+extern cvar_t	*r_depthbits;			// number of desired depth bits
+extern cvar_t	*r_colorbits;			// number of desired color bits, only relevant for fullscreen
+extern cvar_t	*r_stereo;				// desired pixelformat stereo flag
+extern cvar_t	*r_textureDetails;
+extern cvar_t	*r_texturebits;			// number of desired texture bits
+										// 0 = use framebuffer depth
+										// 16 = use 16-bit textures
+										// 32 = use 32-bit textures
+										// all else = error
 
 extern cvar_t	*r_measureOverdraw;		// enables stencil buffer overdraw measurement
 
-extern cvar_t	*r_lodbias;				// push/pull LOD transitions
 extern cvar_t	*r_lodscale;
 
-extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existence
+extern cvar_t	*r_primitives;			// "0" = based on compiled vertex array existance
 										// "1" = glDrawElemet tristrips
 										// "2" = glDrawElements triangles
 										// "-1" = no drawing
 
+extern cvar_t	*r_largemap;
 extern cvar_t	*r_inGameVideo;				// controls whether in game video should be draw
 extern cvar_t	*r_fastsky;				// controls whether sky should be cleared or drawn
+extern cvar_t	*r_fastdlights;
 extern cvar_t	*r_drawSun;				// controls drawing of sun quad
-extern cvar_t	*r_dynamiclight;		// dynamic lights enabled/disabled
 extern cvar_t	*r_dlightBacks;			// dlight non-facing surfaces for continuity
 
 extern	cvar_t	*r_norefresh;			// bypasses the ref rendering
 extern	cvar_t	*r_drawentities;		// disable/enable entity rendering
+extern	cvar_t	*r_drawentitypoly;
+extern	cvar_t	*r_drawstaticmodels;
+extern	cvar_t	*r_drawstaticmodelpoly;
+extern	cvar_t	*r_drawbrushes;
+extern	cvar_t	*r_drawbrushmodels;
+extern	cvar_t	*r_drawstaticdecals;
+extern	cvar_t	*r_drawterrain;
+extern	cvar_t	*r_drawsprites;
+extern	cvar_t	*r_drawspherelights;
 extern	cvar_t	*r_drawworld;			// disable/enable world rendering
 extern	cvar_t	*r_speeds;				// various levels of information display
 extern  cvar_t	*r_detailTextures;		// enables/disables detail texturing stages
 extern	cvar_t	*r_novis;				// disable/enable usage of PVS
 extern	cvar_t	*r_nocull;
+extern	cvar_t	*r_showcull;
 extern	cvar_t	*r_facePlaneCull;		// enables culling of planar surfaces with back side test
 extern	cvar_t	*r_nocurves;
 extern	cvar_t	*r_showcluster;
 
+extern cvar_t	*r_mode;				// video mode
+extern cvar_t	*r_maxmode;
+extern cvar_t	*r_vidmode1024;
+extern cvar_t	*r_vidmodemax;
+extern cvar_t	*r_fullscreen;
 extern cvar_t	*r_gamma;
 extern cvar_t	*r_displayRefresh;		// optional display refresh option
+extern cvar_t	*r_ignorehwgamma;		// overrides hardware gamma capabilities
+
+extern cvar_t	*r_allowExtensions;				// global enable/disable of OpenGL extensions
+extern cvar_t	*r_ext_compressed_textures;		// these control use of specific extensions
+extern cvar_t	*r_ext_gamma_control;
+extern cvar_t	*r_ext_texenv_op;
+extern cvar_t	*r_ext_multitexture;
+extern cvar_t	*r_ext_compiled_vertex_array;
+extern cvar_t	*r_ext_texture_env_add;
+extern cvar_t	*r_ext_texture_env_combine;
+extern cvar_t	*r_ext_aniso_filter;
+extern cvar_t	*r_ext_max_anisotropy;
+extern cvar_t	*r_forceClampToEdge;
+extern cvar_t	*r_geForce3WorkAround;
+extern cvar_t	*r_reset_tc_array;
 
 extern	cvar_t	*r_nobind;						// turns off binding to appropriate textures
 extern	cvar_t	*r_singleShader;				// make most world faces use default shader
+extern	cvar_t	*r_lerpmodels;
 extern	cvar_t	*r_roundImagesDown;
 extern	cvar_t	*r_colorMipLevels;				// development aid to see texture mip usage
 extern	cvar_t	*r_picmip;						// controls picmip values
 extern	cvar_t	*r_finish;
+extern	cvar_t	*r_drawBuffer;
+extern  cvar_t  *r_glDriver;
+extern	cvar_t	*r_swapInterval;
 extern	cvar_t	*r_textureMode;
 extern	cvar_t	*r_offsetFactor;
 extern	cvar_t	*r_offsetUnits;
@@ -1040,21 +1519,29 @@ extern	cvar_t	*r_offsetUnits;
 extern	cvar_t	*r_fullbright;					// avoid lightmap pass
 extern	cvar_t	*r_lightmap;					// render lightmaps only
 extern	cvar_t	*r_vertexLight;					// vertex lighting mode for better performance
-extern	cvar_t	*r_uiFullScreen;				// ui is running fullscreen
 
 extern	cvar_t	*r_logFile;						// number of frames to emit GL logs
 extern	cvar_t	*r_showtris;					// enables wireframe rendering of the world
 extern	cvar_t	*r_showsky;						// forces sky in front of all surfaces
 extern	cvar_t	*r_shownormals;					// draws wireframe normals
+extern	cvar_t	*r_showhbox;
+extern	cvar_t	*r_showstaticbboxes;
 extern	cvar_t	*r_clear;						// force screen clear every frame
 
 extern	cvar_t	*r_shadows;						// controls shadows: 0 = none, 1 = blur, 2 = stencil, 3 = black planar projection
+extern	cvar_t	*r_entlight_scale;
+extern	cvar_t	*r_entlight_errbound;
+extern	cvar_t	*r_entlight_cubelevel;
+extern	cvar_t	*r_entlight_cubefraction;
+extern	cvar_t	*r_entlight_maxcalc;
 extern	cvar_t	*r_flares;						// light flares
 
 extern	cvar_t	*r_intensity;
 
 extern	cvar_t	*r_lockpvs;
 extern	cvar_t	*r_noportals;
+extern	cvar_t	*r_entlightmap;
+extern	cvar_t	*r_fastentlight;
 extern	cvar_t	*r_portalOnly;
 
 extern	cvar_t	*r_subdivisions;
@@ -1063,29 +1550,111 @@ extern	cvar_t	*r_skipBackEnd;
 
 extern	cvar_t	*r_anaglyphMode;
 
-extern	cvar_t	*r_greyscale;
-
 extern	cvar_t	*r_ignoreGLErrors;
 
 extern	cvar_t	*r_overBrightBits;
 extern	cvar_t	*r_mapOverBrightBits;
 
 extern	cvar_t	*r_debugSurface;
-extern	cvar_t	*r_simpleMipMaps;
 
 extern	cvar_t	*r_showImages;
+extern	cvar_t	*r_showlod;
+extern	cvar_t	*r_showstaticlod;
 extern	cvar_t	*r_debugSort;
 
 extern	cvar_t	*r_printShaders;
+extern	cvar_t	*r_saveFontData;
 
-extern cvar_t	*r_marksOnTriangleMeshes;
+extern	cvar_t* r_staticlod;
+extern	cvar_t* r_lodscale;
+extern	cvar_t* r_lodcap;
+extern	cvar_t* r_lodviewmodelcap;
+
+extern  cvar_t* r_uselod;
+extern  cvar_t* lod_LOD;
+extern  cvar_t* lod_minLOD;
+extern  cvar_t* lod_maxLOD;
+extern  cvar_t* lod_LOD_slider;
+extern  cvar_t* lod_curve_0_val;
+extern  cvar_t* lod_curve_1_val;
+extern  cvar_t* lod_curve_2_val;
+extern  cvar_t* lod_curve_3_val;
+extern  cvar_t* lod_curve_4_val;
+extern  cvar_t* lod_edit_0;
+extern  cvar_t* lod_edit_1;
+extern  cvar_t* lod_edit_2;
+extern  cvar_t* lod_edit_3;
+extern  cvar_t* lod_edit_4;
+extern  cvar_t* lod_curve_0_slider;
+extern  cvar_t* lod_curve_1_slider;
+extern  cvar_t* lod_curve_2_slider;
+extern  cvar_t* lod_curve_3_slider;
+extern  cvar_t* lod_curve_4_slider;
+extern  cvar_t* lod_pitch_val;
+extern  cvar_t* lod_zee_val;
+extern  cvar_t* lod_mesh;
+extern  cvar_t* lod_meshname;
+extern  cvar_t* lod_tikiname;
+extern  cvar_t* lod_metric;
+extern  cvar_t* lod_tris;
+extern  cvar_t* lod_position;
+extern  cvar_t* lod_save;
+extern  cvar_t* lod_tool;
+extern	cvar_t* sys_cpuid;
+extern	cvar_t* r_sse;
+extern	cvar_t* r_static_shaderdata0;
+extern	cvar_t* r_static_shaderdata1;
+extern	cvar_t* r_static_shaderdata2;
+extern	cvar_t* r_static_shaderdata3;
+extern	cvar_t* r_static_shadermultiplier0;
+extern	cvar_t* r_static_shadermultiplier1;
+extern	cvar_t* r_static_shadermultiplier2;
+extern	cvar_t* r_static_shadermultiplier3;
+
+extern  cvar_t* r_numdebuglines;
+
+extern	cvar_t* r_stipplelines;
+extern	cvar_t* r_light_lines;
+extern	cvar_t* r_light_sun_line;
+extern	cvar_t* r_light_int_scale;
+extern	cvar_t* r_light_nolight;
+extern	cvar_t* r_light_showgrid;
+extern	cvar_t* r_skyportal;
+extern	cvar_t* r_skyportal_origin;
+extern	cvar_t* r_farplane;
+extern	cvar_t* r_farplane_bias;
+extern	cvar_t* r_farplane_color;
+extern	cvar_t* r_farplane_nocull;
+extern	cvar_t* r_farplane_nofog;
+extern	cvar_t* r_skybox_farplane;
+extern	cvar_t* r_farclip;
+extern	cvar_t* r_lightcoronasize;
+extern	cvar_t* r_useglfog;
+extern	cvar_t* r_debuglines_depthmask;
+extern	cvar_t* r_smoothsmokelight;
+extern	cvar_t* r_showportal;
+extern	cvar_t* ter_minMarkRadius;
+extern	cvar_t* ter_fastMarks;
+extern	cvar_t* r_alpha_foliage1;
+extern	cvar_t* r_alpha_foliage2;
+extern	cvar_t* r_blendtrees;
+extern	cvar_t* r_blendbushes;
+extern	cvar_t* r_bumpmap;
+extern	cvar_t* r_loadjpg;
+extern	cvar_t* r_loadftx;
+
+extern  cvar_t* r_showSkeleton;
+extern  cvar_t* r_developer;
+extern  cvar_t* r_fps;
 
 //====================================================================
 
-void R_SwapBuffers( int );
+void  R_NoiseInit( void );
 
 void R_RenderView( viewParms_t *parms );
 
+qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum);
+
 void R_AddMD3Surfaces( trRefEntity_t *e );
 void R_AddNullModelSurfaces( trRefEntity_t *e );
 void R_AddBeamSurfaces( trRefEntity_t *e );
@@ -1094,27 +1663,32 @@ void R_AddLightningBoltSurfaces( trRefEntity_t *e );
 
 void R_AddPolygonSurfaces( void );
 
-void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap );
+void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel);
 
-void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, int fogIndex, int dlightMap );
+void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap);
 
 
 #define	CULL_IN		0		// completely unclipped
 #define	CULL_CLIP	1		// clipped by one or more planes
 #define	CULL_OUT	2		// completely outside the clipping planes
-void R_LocalNormalToWorld (vec3_t local, vec3_t world);
-void R_LocalPointToWorld (vec3_t local, vec3_t world);
+void R_LocalNormalToWorld (const vec3_t local, vec3_t world);
+void R_LocalPointToWorld (const vec3_t local, vec3_t world);
+int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]);
 int R_CullLocalBox (vec3_t bounds[2]);
 int R_CullPointAndRadius( vec3_t origin, float radius );
 int R_CullLocalPointAndRadius( vec3_t origin, float radius );
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
 
-void R_SetupProjection(viewParms_t *dest, float zProj, qboolean computeFrustum);
-void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *or );
+void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms, orientationr_t *ori );
+void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori );
+void R_RotateForViewer(void);
+void R_SetupFrustum(void);
 
 /*
 ** GL wrapper/helper functions
 */
+void	GL_SetFogColor(const vec4_t fColor);
 void	GL_Bind( image_t *image );
 void	GL_SetDefaultState (void);
 void	GL_SelectTexture( int unit );
@@ -1146,29 +1720,58 @@ void	GL_Cull( int cullType );
 #define		GLS_DSTBLEND_BITS					0x000000f0
 
 #define GLS_DEPTHMASK_TRUE						0x00000100
+#define GLS_COLOR_MASK							0x00000200
+#define GLS_POLYMODE_LINE						0x00000400
+#define GLS_DEPTHTEST_DISABLE					0x00000800
+#define GLS_DEPTHFUNC_EQUAL						0x00001000
 
-#define GLS_POLYMODE_LINE						0x00001000
+#define GLS_CLAMP_EDGE							0x00002000
+#define GLS_MULTITEXTURE						0x00004000
+#define GLS_MULTITEXTURE_ENV					0x00008000
+#define GLS_FOG									0x00010000
 
-#define GLS_DEPTHTEST_DISABLE					0x00010000
-#define GLS_DEPTHFUNC_EQUAL						0x00020000
+#define GLS_FOG_ENABLED							0x00020000
+#define GLS_FOG_BLACK							0x00040000
+#define GLS_FOG_WHITE							0x00080000
+#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
+#define GLS_FOG_BITS							(GLS_FOG_WHITE|GLS_FOG_BLACK|GLS_FOG_ENABLED)
+#define GLS_COLOR_NOMASK						0x00100000
 
 #define GLS_ATEST_GT_0							0x10000000
 #define GLS_ATEST_LT_80							0x20000000
-#define GLS_ATEST_GE_80							0x40000000
-#define		GLS_ATEST_BITS						0x70000000
+#define GLS_ATEST_GE_80							0x30000000
+#define GLS_ATEST_LT_FOLIAGE1					0x40000000
+#define GLS_ATEST_GE_FOLIAGE1					0x50000000
+#define GLS_ATEST_LT_FOLIAGE2					0x60000000
+#define GLS_ATEST_GE_FOLIAGE2					0x70000000
+#define GLS_ATEST_BITS							0x70000000
 
 #define GLS_DEFAULT			GLS_DEPTHMASK_TRUE
 
-void	RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
+void Draw_SetColor(const vec4_t rgba);
+void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
+void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
+void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
+void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
+void DrawBox(float x, float y, float w, float h);
+void AddBox(float x, float y, float w, float h);
+void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
+void RE_Scissor(int x, int y, int width, int height);
+void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
+void RE_StretchRaw(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
 void	RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty);
 
 void		RE_BeginFrame( stereoFrame_t stereoFrame );
 void		RE_BeginRegistration( glconfig_t *glconfig );
 void		RE_LoadWorldMap( const char *mapname );
+void		RE_PrintBSPFileSizes(void);
+int			RE_MapVersion(void);
 void		RE_SetWorldVisData( const byte *vis );
 qhandle_t	RE_RegisterModel( const char *name );
 qhandle_t	RE_RegisterSkin( const char *name );
 void		RE_Shutdown( qboolean destroyWindow );
+void        R_ClearWorld(void);
 
 qboolean	R_GetEntityToken( char *buffer, int size );
 
@@ -1176,6 +1779,29 @@ model_t		*R_AllocModel( void );
 
 void    	R_Init( void );
 
+image_t		*R_FindImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+image_t		*R_RefreshImageFileOld(const char* name, qboolean mipmap, qboolean allowPicmip, qboolean force32bit, int glWrapClampModeX, int glWrapClampModeY);
+
+image_t* R_CreateImageOld(
+    const char* name,
+    byte* pic,
+    int width,
+    int height,
+    int numMipmaps,
+    int iMipmapsAvailable,
+    qboolean allowPicmip,
+    qboolean force32bit,
+    qboolean hasAlpha,
+    int glCompressMode,
+    int glWrapClampModeX,
+    int glWrapClampModeY
+);
+
+qboolean R_ImageExists(const char* name);
+int R_CountTextureMemory();
+
+qboolean	R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );
+
 void		R_SetColorMappings( void );
 void		R_GammaCorrect( byte *buffer, int bufSize );
 
@@ -1185,29 +1811,59 @@ void	R_SkinList_f( void );
 const void *RB_TakeScreenshotCmd( const void *data );
 void	R_ScreenShot_f( void );
 
-void	R_InitFogTable( void );
-float	R_FogFactor( float s, float t );
 void	R_InitImages( void );
+void	R_FreeImage(image_t* image);
 void	R_DeleteTextures( void );
+void    R_FreeUnusedImages( void );
 int		R_SumOfUsedImages( void );
-void	R_InitSkins( void );
 skin_t	*R_GetSkinByHandle( qhandle_t hSkin );
 
-int R_ComputeLOD( trRefEntity_t *ent );
-
 const void *RB_TakeVideoFrameCmd( const void *data );
 
 //
 // tr_shader.c
 //
-shader_t	*R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage );
+qhandle_t		 RE_RegisterShader( const char *name );
+qhandle_t		 RE_RegisterShaderNoMip( const char *name );
+qhandle_t		RE_RefreshShaderNoMip(const char* name);
+qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage);
+
+shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy);
 shader_t	*R_GetShaderByHandle( qhandle_t hShader );
 shader_t	*R_GetShaderByState( int index, long *cycleTime );
+void R_StartupShaders();
+void R_ShutdownShaders();
+void R_SetupShaders();
 shader_t *R_FindShaderByName( const char *name );
-void		R_InitShaders( void );
 void		R_ShaderList_f( void );
 void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
 
+/*
+====================================================================
+
+IMPLEMENTATION SPECIFIC FUNCTIONS
+
+====================================================================
+*/
+
+void		GLimp_Init( qboolean fixedFunction );
+void		GLimp_Shutdown( void );
+void		GLimp_EndFrame( void );
+
+qboolean	GLimp_SpawnRenderThread( void (*function)( void ) );
+void		*GLimp_RendererSleep( void );
+void		GLimp_FrontEndSleep( void );
+void		GLimp_WakeRenderer( void *data );
+
+void		GLimp_LogComment( char *comment );
+
+// NOTE TTimo linux works with float gamma value, not the gamma table
+//   the params won't be used, getting the r_gamma cvar directly
+void		GLimp_SetGamma( unsigned char red[256], 
+						    unsigned char green[256],
+							unsigned char blue[256] );
+
+
 /*
 ====================================================================
 
@@ -1223,7 +1879,6 @@ typedef struct stageVars
 	vec2_t		texcoords[NUM_TEXTURE_BUNDLES][SHADER_MAX_VERTEXES];
 } stageVars_t;
 
-
 typedef struct shaderCommands_s 
 {
 	glIndex_t	indexes[SHADER_MAX_INDEXES] QALIGN(16);
@@ -1238,10 +1893,11 @@ typedef struct shaderCommands_s
 	color4ub_t	constantColor255[SHADER_MAX_VERTEXES] QALIGN(16);
 
 	shader_t	*shader;
-	double		shaderTime;
+	float		shaderTime;
 	int			fogNum;
 
 	int			dlightBits;	// or together of all vertexDlightBits
+	int			dlightMap;
 
 	int			numIndexes;
 	int			numVertexes;
@@ -1250,24 +1906,26 @@ typedef struct shaderCommands_s
 	int			numPasses;
 	void		(*currentStageIteratorFunc)( void );
 	shaderStage_t	**xstages;
+    qboolean no_global_fog;
+    qboolean vertexColorValid;
 } shaderCommands_t;
 
 extern	shaderCommands_t	tess;
 
-void RB_BeginSurface(shader_t *shader, int fogNum );
+void RB_BeginSurface(shader_t *shader );
 void RB_EndSurface(void);
 void RB_CheckOverflow( int verts, int indexes );
 #define RB_CHECKOVERFLOW(v,i) if (tess.numVertexes + (v) >= SHADER_MAX_VERTEXES || tess.numIndexes + (i) >= SHADER_MAX_INDEXES ) {RB_CheckOverflow(v,i);}
 
 void RB_StageIteratorGeneric( void );
 void RB_StageIteratorSky( void );
-void RB_StageIteratorVertexLitTexture( void );
-void RB_StageIteratorLightmappedMultitexture( void );
+void RB_StageIteratorVertexLitTextureUnfogged( void );
+void RB_StageIteratorLightmappedMultitextureUnfogged( void );
 
 void RB_AddQuadStamp( vec3_t origin, vec3_t left, vec3_t up, byte *color );
 void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, float s1, float t1, float s2, float t2 );
 
-void RB_ShowImages( void );
+void RB_ShowImages( qboolean quiet );
 
 
 /*
@@ -1278,7 +1936,15 @@ WORLD MAP
 ============================================================
 */
 
+extern terraTri_t* g_pTris;
+extern terrainVert_t* g_pVert;
+
 void R_AddBrushModelSurfaces( trRefEntity_t *e );
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
+mnode_t* R_PointInLeaf(const vec3_t p);
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
 void R_AddWorldSurfaces( void );
 qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
 
@@ -1306,10 +1972,29 @@ LIGHTS
 */
 
 void R_DlightBmodel( bmodel_t *bmodel );
+void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
+void R_GetLightingGridValueFast(const vec3_t vPos, vec3_t vLight);
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
 void R_SetupEntityLighting( const trRefdef_t *refdef, trRefEntity_t *ent );
-void R_TransformDlights( int count, dlight_t *dl, orientationr_t *or );
-int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir );
+void RB_SetupEntityGridLighting();
+void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
+int R_RealDlightPatch(srfGridMesh_t* srf, int dlightBit);
+int R_RealDlightFace(srfSurfaceFace_t* srf, int dlightBits);
+int R_RealDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits);
+void R_TransformDlights( int count, dlight_t *dl, orientationr_t *ori );
+void RB_Light_Real(unsigned char* colors);
+void RB_Sphere_BuildDLights();
+void RB_Sphere_SetupEntity();
+void RB_Grid_SetupEntity();
+void RB_Grid_SetupStaticModel();
+void RB_Light_Fullbright(unsigned char* colors);
+void R_Sphere_InitLights();
+int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
+void R_ClearRealDlights();
+void R_UploadDlights();
 
+int R_LightForPoint(vec3_t point, vec3_t ambientLight, vec3_t directedLight, vec3_t lightDir);
 
 /*
 ============================================================
@@ -1320,6 +2005,7 @@ SHADOWS
 */
 
 void RB_ShadowTessEnd( void );
+void RB_ComputeShadowVolume();
 void RB_ShadowFinish( void );
 void RB_ProjectionShadowDeform( void );
 
@@ -1334,7 +2020,7 @@ SKIES
 void R_BuildCloudData( shaderCommands_t *shader );
 void R_InitSkyTexCoords( float cloudLayerHeight );
 void R_DrawSkyBox( shaderCommands_t *shader );
-void RB_DrawSun( float scale, shader_t *shader );
+void RB_DrawSun( void );
 void RB_ClipSkyPolygons( shaderCommands_t *shader );
 
 /*
@@ -1347,7 +2033,7 @@ CURVE TESSELATION
 
 #define PATCH_STITCHING
 
-srfGridMesh_t *R_SubdividePatchToGrid( int width, int height,
+srfGridMesh_t *R_SubdividePatchToGrid( int width, int height, float subdivide,
 								drawVert_t points[MAX_PATCH_SIZE*MAX_PATCH_SIZE] );
 srfGridMesh_t *R_GridInsertColumn( srfGridMesh_t *grid, int column, int row, vec3_t point, float loderror );
 srfGridMesh_t *R_GridInsertRow( srfGridMesh_t *grid, int row, int column, vec3_t point, float loderror );
@@ -1362,7 +2048,11 @@ MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
 */
 
 int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
 
 
 /*
@@ -1376,47 +2066,205 @@ SCENE GENERATION
 void R_InitNextFrame( void );
 
 void RE_ClearScene( void );
-void RE_AddRefEntityToScene( const refEntity_t *ent );
-void RE_AddPolyToScene( qhandle_t hShader , int numVerts, const polyVert_t *verts, int num );
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b );
+void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber);
+void RE_AddRefSpriteToScene(const refEntity_t* ent);
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+refEntity_t* RE_GetRenderEntity(int entityNumber);
+qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type );
 void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_RenderScene( const refdef_t *fd );
 
 /*
 =============================================================
 
-UNCOMPRESSING BONES
-
-=============================================================
-*/
-
-#define MC_BITS_X (16)
-#define MC_BITS_Y (16)
-#define MC_BITS_Z (16)
-#define MC_BITS_VECT (16)
-
-#define MC_SCALE_X (1.0f/64)
-#define MC_SCALE_Y (1.0f/64)
-#define MC_SCALE_Z (1.0f/64)
-
-void MC_UnCompress(float mat[3][4],const unsigned char * comp);
-
-/*
-=============================================================
-
 ANIMATED MODELS
 
 =============================================================
 */
 
-void R_MDRAddAnimSurfaces( trRefEntity_t *ent );
-void RB_MDRSurfaceAnim( mdrSurface_t *surface );
-qboolean R_LoadIQM (model_t *mod, void *buffer, int filesize, const char *name );
-void R_AddIQMSurfaces( trRefEntity_t *ent );
-void RB_IQMSurfaceAnim( surfaceType_t *surface );
-int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
-                  int startFrame, int endFrame,
-                  float frac, const char *tagName );
+void R_MakeAnimModel( model_t *model );
+void R_AddAnimSurfaces(trRefEntity_t* ent);
+
+/*
+=============================================================
+
+FONT
+
+=============================================================
+*/
+void R_ShutdownFont();
+fontheader_t* R_LoadFont(const char* name);
+void R_LoadFontShader(fontheader_sgl_t* font);
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
+float R_GetFontHeight(const fontheader_t* font);
+float R_GetFontStringWidth(const fontheader_t* font, const char* s);
+
+/*
+=============================================================
+
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
+
+/*
+=============================================================
+
+MARKS
+
+=============================================================
+*/
+void R_LevelMarksLoad(const char* szBSPName);
+void R_LevelMarksInit();
+void R_LevelMarksFree();
+void R_UpdateLevelMarksSystem();
+void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
+
+/*
+=============================================================
+
+SKY PORTALS
+
+=============================================================
+*/
+void R_Sky_Init();
+void R_Sky_Reset();
+void R_Sky_AddSurf(msurface_t* surf);
+void R_Sky_Render();
+
+/*
+=============================================================
+
+SPRITE
+
+=============================================================
+*/
+sprite_t* SPR_RegisterSprite(const char* name);
+void RB_DrawSprite(const refSprite_t* spr);
+
+
+/*
+=============================================================
+
+SUN FLARE
+
+=============================================================
+*/
+void R_InitLensFlare();
+void R_DrawLensFlares();
+
+/*
+=============================================================
+
+SWIPE
+
+=============================================================
+*/
+void RB_DrawSwipeSurface(surfaceType_t* pswipe);
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
+void RE_SwipeEnd();
+void R_AddSwipeSurfaces();
+
+/*
+=============================================================
+
+TERRAIN
+
+=============================================================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
+void R_AddTerrainSurfaces();
+void R_AddTerrainMarkSurfaces();
+void R_InitTerrain();
+void R_ShutdownTerrain();
+void R_TerrainFree();
+void R_TerrainPrepareFrame();
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
+void R_SwapTerraPatch(cTerraPatch_t* pPatch);
+
+void R_TerrainCrater_f(void);
+
+/*
+=============================================================
+
+TIKI
+
+=============================================================
+*/
+struct skelHeaderGame_s;
+struct skelAnimFrame_s;
+
+void R_InitStaticModels(void);
+void RE_FreeModels(void);
+qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
+qhandle_t RE_RegisterServerModel(const char* name);
+void RE_UnregisterServerModel(qhandle_t hModel);
+orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
+qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
+float R_ModelRadius(qhandle_t handle);
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
+dtiki_t* R_Model_GetHandle(qhandle_t handle);
+
+float R_GetRadius(refEntity_t* model);
+void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
+void RE_ForceUpdatePose(refEntity_t* model);
+void RE_SetFrameNumber(int frameNumber);
+void R_UpdatePoseInternal(refEntity_t* model);
+void RB_SkelMesh(skelSurfaceGame_t* sf);
+void RB_StaticMesh(staticSurface_t* staticSurf);
+void RB_Static_BuildDLights();
+void R_InfoStaticModels_f(void);
+void R_PrintInfoStaticModels();
+void R_AddSkelSurfaces(trRefEntity_t* ent);
+void R_AddStaticModelSurfaces(void);
+void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
+float R_CalcLod(const vec3_t origin, float radius);
+int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
+int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
+void R_InfoWorldTris_f(void);
+void R_PrintInfoWorldtris(void);
+void R_DebugSkeleton(void);
+
+extern int g_nStaticSurfaces;
+extern qboolean g_bInfostaticmodels;
+extern qboolean g_bInfoworldtris;
+
+/*
+=============================================================
+
+UTIL
+
+=============================================================
+*/
+
+void RB_StreamBegin(shader_t* shader);
+void RB_StreamEnd(void);
+void RB_StreamBeginDrawSurf(void);
+void RB_StreamEndDrawSurf(void);
+static void addTriangle(void);
+void RB_Vertex3fv(vec3_t v);
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
+void RB_Vertex2f(vec_t x, vec_t y);
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
+void RB_Color3f(vec_t r, vec_t g, vec_t b);
+void RB_Color3fv(vec3_t col);
+void RB_Color4bv(unsigned char* colors);
+void RB_Texcoord2f(float s, float t);
+void RB_Texcoord2fv(vec2_t st);
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
+void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
+int RE_GetShaderWidth(qhandle_t hShader);
+int RE_GetShaderHeight(qhandle_t hShader);
+const char* RE_GetShaderName(qhandle_t hShader);
+const char* RE_GetModelName(qhandle_t hModel);
 
 /*
 =============================================================
@@ -1429,25 +2277,45 @@ void	R_TransformClipToWindow( const vec4_t clip, const viewParms_t *view, vec4_t
 void	RB_DeformTessGeometry( void );
 
 void	RB_CalcEnvironmentTexCoords( float *dstTexCoords );
-void	RB_CalcFogTexCoords( float *dstTexCoords );
+void	RB_CalcEnvironmentTexCoords2( float *dstTexCoords );
+void	RB_CalcSunReflectionTexCoords( float *dstTexCoords );
+void	RB_CalcOffsetTexCoords(const float* offset, float* st);
+void	RB_CalcParallaxTexCoords(const float* rate, float* st);
+void	RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv);
+void	RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2]);
+void	RB_CalcMacroTexCoords(const  float* rate, float* st);
 void	RB_CalcScrollTexCoords( const float scroll[2], float *dstTexCoords );
-void	RB_CalcRotateTexCoords( float rotSpeed, float *dstTexCoords );
+void	RB_CalcRotateTexCoords( float degsPerSecond, float degsPerSecondCoef, float* st, float start );
 void	RB_CalcScaleTexCoords( const float scale[2], float *dstTexCoords );
 void	RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *dstTexCoords );
 void	RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *dstTexCoords );
-void	RB_CalcModulateColorsByFog( unsigned char *dstColors );
-void	RB_CalcModulateAlphasByFog( unsigned char *dstColors );
-void	RB_CalcModulateRGBAsByFog( unsigned char *dstColors );
 void	RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors );
-void	RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors );
+void	RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor);
 void	RB_CalcAlphaFromEntity( unsigned char *dstColors );
 void	RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors );
 void	RB_CalcStretchTexCoords( const waveForm_t *wf, float *texCoords );
 void	RB_CalcColorFromEntity( unsigned char *dstColors );
 void	RB_CalcColorFromOneMinusEntity( unsigned char *dstColors );
-void	RB_CalcSpecularAlpha( unsigned char *alphas );
+void	RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
+void	RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
+void	RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
+void	RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
+void	RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin);
+void	RB_CalcLightGridColor(unsigned char* colors);
+void	RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax);
+void	RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax);
 void	RB_CalcDiffuseColor( unsigned char *colors );
 
+void	RB_CalcStretchTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st);
+void	RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st);
+void	RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st);
+
 /*
 =============================================================
 
@@ -1456,6 +2324,7 @@ RENDERER BACK END FUNCTIONS
 =============================================================
 */
 
+void RB_RenderThread( void );
 void RB_ExecuteRenderCommands( const void *data );
 
 /*
@@ -1468,6 +2337,16 @@ RENDERER BACK END COMMAND QUEUE
 
 #define	MAX_RENDER_COMMANDS	0x40000
 
+typedef struct suninfo_s {
+	vec3_t color;
+	vec3_t direction;
+	vec3_t flaredirection;
+	char szFlareName[64];
+	qboolean exists;
+} suninfo_t;
+
+extern suninfo_t s_sun;
+
 typedef struct {
 	byte	cmds[MAX_RENDER_COMMANDS];
 	int		used;
@@ -1553,6 +2432,7 @@ typedef enum {
 	RC_SET_COLOR,
 	RC_STRETCH_PIC,
 	RC_DRAW_SURFS,
+	RC_SPRITE_SURFS,
 	RC_DRAW_BUFFER,
 	RC_SWAP_BUFFERS,
 	RC_SCREENSHOT,
@@ -1565,30 +2445,49 @@ typedef enum {
 // these are sort of arbitrary limits.
 // the limits apply to the sum of all scenes in a frame --
 // the main view, all the 3D icons, etc
-#define	MAX_POLYS		600
-#define	MAX_POLYVERTS	3000
+#define	MAX_POLYS		4096
+#define	MAX_POLYVERTS	16384
+#define	MAX_TERMARKS	1024
 
 // all of the information needed by the back end must be
-// contained in a backEndData_t
+// contained in a backEndData_t.  This entire structure is
+// duplicated so the front and back end can run in parallel
+// on an SMP machine
 typedef struct {
 	drawSurf_t	drawSurfs[MAX_DRAWSURFS];
+	drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
 	dlight_t	dlights[MAX_DLIGHTS];
-	trRefEntity_t	entities[MAX_REFENTITIES];
-	srfPoly_t	*polys;//[MAX_POLYS];
-	polyVert_t	*polyVerts;//[MAX_POLYVERTS];
+	trRefEntity_t	entities[MAX_ENTITIES];
+	srfMarkFragment_t* terMarks;
+	srfPoly_t	*polys;
+	polyVert_t	*polyVerts;
+	refSprite_t sprites[2048];
+	cStaticModelUnpacked_t* staticModels;
+	byte* staticModelData;
 	renderCommandList_t	commands;
 } backEndData_t;
 
 extern	int		max_polys;
 extern	int		max_polyverts;
+extern	int		max_termarks;
 
 extern	backEndData_t	*backEndData;	// the second one may not be allocated
 
+extern	volatile renderCommandList_t	*renderCommandList;
+
+extern	volatile qboolean	renderThreadActive;
+
 
 void *R_GetCommandBuffer( int bytes );
+void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
+void R_AddSpriteSurfCmd( drawSurf_t* drawSurfs, int numDrawSurfs );
 void RB_ExecuteRenderCommands( const void *data );
 
-void R_IssuePendingRenderCommands( void );
+void R_SavePerformanceCounters(void);
+void R_InitCommandBuffers( void );
+void R_ShutdownCommandBuffers( void );
+
+void R_SyncRenderThread( void );
 
 void R_AddDrawSurfCmd( drawSurf_t *drawSurfs, int numDrawSurfs );
 
@@ -1597,20 +2496,17 @@ void RE_StretchPic ( float x, float y, float w, float h,
 					  float s1, float t1, float s2, float t2, qhandle_t hShader );
 void RE_BeginFrame( stereoFrame_t stereoFrame );
 void RE_EndFrame( int *frontEndMsec, int *backEndMsec );
-void RE_SaveJPG(char * filename, int quality, int image_width, int image_height,
-                unsigned char *image_buffer, int padding);
-size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
-		          int image_width, int image_height, byte *image_buffer, int padding);
+void RE_SaveJPG(char* filename, int quality, int image_width, int image_height,
+    unsigned char* image_buffer, int padding);
+size_t RE_SaveJPGToBuffer(byte* buffer, size_t bufSize, int quality,
+    int image_width, int image_height, byte* image_buffer, int padding);
 void RE_TakeVideoFrame( int width, int height,
 		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg );
 
-void R_DrawElements( int numIndexes, const glIndex_t *indexes );
-void VectorArrayNormalize( vec4_t *normals, unsigned int count );
+void SaveJPG(char * filename, int quality, int image_width, int image_height, unsigned char *image_buffer);
 
-#ifdef idppc_altivec
-void LerpMeshVertexes_altivec( md3Surface_t *surf, float backlerp );
-void ProjectDlightTexture_altivec( void );
-void RB_CalcDiffuseColor_altivec( unsigned char *colors );
+void UI_LoadResource(const char* name);
+
+#ifdef __cplusplus
+}
 #endif
-
-#endif //TR_LOCAL_H
diff --git a/code/renderergl1/tr_main.c b/code/renderergl1/tr_main.c
index 09559a2e..43063bd2 100644
--- a/code/renderergl1/tr_main.c
+++ b/code/renderergl1/tr_main.c
@@ -15,15 +15,14 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_main.c -- main control flow for each frame
 
 #include "tr_local.h"
-
-#include <string.h> // memcpy
+#include "tiki.h"
 
 trGlobals_t		tr;
 
@@ -50,7 +49,7 @@ R_CullLocalBox
 Returns CULL_IN, CULL_CLIP, or CULL_OUT
 =================
 */
-int R_CullLocalBox (vec3_t bounds[2]) {
+int R_CullLocalBoxOffset(const vec3_t offset, vec3_t bounds[2]) {
 	int		i, j;
 	vec3_t	transformed[8];
 	float	dists[8];
@@ -69,15 +68,16 @@ int R_CullLocalBox (vec3_t bounds[2]) {
 		v[1] = bounds[(i>>1)&1][1];
 		v[2] = bounds[(i>>2)&1][2];
 
-		VectorCopy( tr.or.origin, transformed[i] );
-		VectorMA( transformed[i], v[0], tr.or.axis[0], transformed[i] );
-		VectorMA( transformed[i], v[1], tr.or.axis[1], transformed[i] );
-		VectorMA( transformed[i], v[2], tr.or.axis[2], transformed[i] );
+		VectorCopy( tr.ori.origin, transformed[i] );
+		VectorAdd(transformed[i], offset, transformed[i]);
+		VectorMA( transformed[i], v[0], tr.ori.axis[0], transformed[i] );
+		VectorMA( transformed[i], v[1], tr.ori.axis[1], transformed[i] );
+		VectorMA( transformed[i], v[2], tr.ori.axis[2], transformed[i] );
 	}
 
 	// check against frustum planes
 	anyBack = 0;
-	for (i = 0 ; i < 4 ; i++) {
+	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4 ; i++) {
 		frust = &tr.viewParms.frustum[i];
 
 		front = back = 0;
@@ -106,6 +106,10 @@ int R_CullLocalBox (vec3_t bounds[2]) {
 	return CULL_CLIP;		// partially clipped
 }
 
+int R_CullLocalBox(vec3_t bounds[2]) {
+	return R_CullLocalBoxOffset(vec3_origin, bounds);
+}
+
 /*
 ** R_CullLocalPointAndRadius
 */
@@ -133,7 +137,7 @@ int R_CullPointAndRadius( vec3_t pt, float radius )
 	}
 
 	// check against frustum planes
-	for (i = 0 ; i < 4 ; i++) 
+	for (i = 0 ; i < tr.viewParms.fog.extrafrustums + 4; i++)
 	{
 		frust = &tr.viewParms.frustum[i];
 
@@ -156,6 +160,34 @@ int R_CullPointAndRadius( vec3_t pt, float radius )
 	return CULL_IN;		// completely inside frustum
 }
 
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	vec3_t transformed;
+
+	R_LocalPointToWorld(pt, transformed);
+
+	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
+}
+
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	if (!r_nocull->integer)
+	{
+		vec3_t vDelta;
+		float fLengthSquared;
+		float fTotalDistSquared;
+
+		VectorSubtract(pt, tr.viewParms.ori.origin, vDelta);
+		fLengthSquared = VectorLengthSquared(vDelta);
+		fTotalDistSquared = Square(fDist + radius);
+
+		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
+			return CULL_OUT;
+		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
+			return CULL_IN;
+		}
+	}
+
+	return CULL_CLIP;
+}
 
 /*
 =================
@@ -163,10 +195,10 @@ R_LocalNormalToWorld
 
 =================
 */
-void R_LocalNormalToWorld (vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.or.axis[0][0] + local[1] * tr.or.axis[1][0] + local[2] * tr.or.axis[2][0];
-	world[1] = local[0] * tr.or.axis[0][1] + local[1] * tr.or.axis[1][1] + local[2] * tr.or.axis[2][1];
-	world[2] = local[0] * tr.or.axis[0][2] + local[1] * tr.or.axis[1][2] + local[2] * tr.or.axis[2][2];
+void R_LocalNormalToWorld (const vec3_t local, vec3_t world) {
+	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0];
+	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1];
+	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2];
 }
 
 /*
@@ -175,10 +207,10 @@ R_LocalPointToWorld
 
 =================
 */
-void R_LocalPointToWorld (vec3_t local, vec3_t world) {
-	world[0] = local[0] * tr.or.axis[0][0] + local[1] * tr.or.axis[1][0] + local[2] * tr.or.axis[2][0] + tr.or.origin[0];
-	world[1] = local[0] * tr.or.axis[0][1] + local[1] * tr.or.axis[1][1] + local[2] * tr.or.axis[2][1] + tr.or.origin[1];
-	world[2] = local[0] * tr.or.axis[0][2] + local[1] * tr.or.axis[1][2] + local[2] * tr.or.axis[2][2] + tr.or.origin[2];
+void R_LocalPointToWorld (const vec3_t local, vec3_t world) {
+	world[0] = local[0] * tr.ori.axis[0][0] + local[1] * tr.ori.axis[1][0] + local[2] * tr.ori.axis[2][0] + tr.ori.origin[0];
+	world[1] = local[0] * tr.ori.axis[0][1] + local[1] * tr.ori.axis[1][1] + local[2] * tr.ori.axis[2][1] + tr.ori.origin[1];
+	world[2] = local[0] * tr.ori.axis[0][2] + local[1] * tr.ori.axis[1][2] + local[2] * tr.ori.axis[2][2] + tr.ori.origin[2];
 }
 
 /*
@@ -188,9 +220,9 @@ R_WorldToLocal
 =================
 */
 void R_WorldToLocal (vec3_t world, vec3_t local) {
-	local[0] = DotProduct(world, tr.or.axis[0]);
-	local[1] = DotProduct(world, tr.or.axis[1]);
-	local[2] = DotProduct(world, tr.or.axis[2]);
+	local[0] = DotProduct(world, tr.ori.axis[0]);
+	local[1] = DotProduct(world, tr.ori.axis[1]);
+	local[2] = DotProduct(world, tr.ori.axis[2]);
 }
 
 /*
@@ -260,6 +292,29 @@ void myGlMultMatrix( const float *a, const float *b, float *out ) {
 	}
 }
 
+void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
+{
+	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
+		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
+        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
+        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
+    }
+
+	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
+        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
+        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
+        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
+    }
+}
+
 /*
 =================
 R_RotateForEntity
@@ -270,47 +325,47 @@ Called by both the front end and the back end
 =================
 */
 void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
-					   orientationr_t *or ) {
+					   orientationr_t *ori ) {
 	float	glMatrix[16];
 	vec3_t	delta;
 	float	axisLength;
 
 	if ( ent->e.reType != RT_MODEL ) {
-		*or = viewParms->world;
+		*ori = viewParms->world;
 		return;
 	}
 
-	VectorCopy( ent->e.origin, or->origin );
+	VectorCopy( ent->e.origin, ori->origin );
 
-	VectorCopy( ent->e.axis[0], or->axis[0] );
-	VectorCopy( ent->e.axis[1], or->axis[1] );
-	VectorCopy( ent->e.axis[2], or->axis[2] );
+	VectorCopy( ent->e.axis[0], ori->axis[0] );
+	VectorCopy( ent->e.axis[1], ori->axis[1] );
+	VectorCopy( ent->e.axis[2], ori->axis[2] );
 
-	glMatrix[0] = or->axis[0][0];
-	glMatrix[4] = or->axis[1][0];
-	glMatrix[8] = or->axis[2][0];
-	glMatrix[12] = or->origin[0];
+	glMatrix[0] = ori->axis[0][0];
+	glMatrix[4] = ori->axis[1][0];
+	glMatrix[8] = ori->axis[2][0];
+	glMatrix[12] = ori->origin[0];
 
-	glMatrix[1] = or->axis[0][1];
-	glMatrix[5] = or->axis[1][1];
-	glMatrix[9] = or->axis[2][1];
-	glMatrix[13] = or->origin[1];
+	glMatrix[1] = ori->axis[0][1];
+	glMatrix[5] = ori->axis[1][1];
+	glMatrix[9] = ori->axis[2][1];
+	glMatrix[13] = ori->origin[1];
 
-	glMatrix[2] = or->axis[0][2];
-	glMatrix[6] = or->axis[1][2];
-	glMatrix[10] = or->axis[2][2];
-	glMatrix[14] = or->origin[2];
+	glMatrix[2] = ori->axis[0][2];
+	glMatrix[6] = ori->axis[1][2];
+	glMatrix[10] = ori->axis[2][2];
+	glMatrix[14] = ori->origin[2];
 
 	glMatrix[3] = 0;
 	glMatrix[7] = 0;
 	glMatrix[11] = 0;
 	glMatrix[15] = 1;
 
-	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, or->modelMatrix );
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
 
 	// calculate the viewer origin in the model's space
 	// needed for fog, specular, and environment mapping
-	VectorSubtract( viewParms->or.origin, or->origin, delta );
+	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
 
 	// compensate for scale in the axes if necessary
 	if ( ent->e.nonNormalizedAxes ) {
@@ -324,9 +379,61 @@ void R_RotateForEntity( const trRefEntity_t *ent, const viewParms_t *viewParms,
 		axisLength = 1.0f;
 	}
 
-	or->viewOrigin[0] = DotProduct( delta, or->axis[0] ) * axisLength;
-	or->viewOrigin[1] = DotProduct( delta, or->axis[1] ) * axisLength;
-	or->viewOrigin[2] = DotProduct( delta, or->axis[2] ) * axisLength;
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] ) * axisLength;
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] ) * axisLength;
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] ) * axisLength;
+}
+
+/*
+=================
+R_RotateForStaticModel
+
+Generates an orientation for a static model and viewParms
+=================
+*/
+void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
+					   orientationr_t *ori ) {
+	float	glMatrix[16];
+	vec3_t	delta;
+	float	tiki_scale;
+
+	tiki_scale = SM->tiki->load_scale * SM->scale;
+
+	VectorCopy( SM->origin, ori->origin );
+
+	VectorCopy( SM->axis[0], ori->axis[0] );
+	VectorCopy( SM->axis[1], ori->axis[1] );
+	VectorCopy( SM->axis[2], ori->axis[2] );
+
+	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
+	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
+	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
+	glMatrix[12] = ori->origin[0];
+
+	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
+	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
+	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
+	glMatrix[13] = ori->origin[1];
+
+	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
+	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
+	glMatrix[10] = ori->axis[2][2] * tiki_scale;
+	glMatrix[14] = ori->origin[2];
+
+	glMatrix[3]  = 0;
+	glMatrix[7]  = 0;
+	glMatrix[11] = 0;
+	glMatrix[15] = 1;
+
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
+
+	// calculate the viewer origin in the model's space
+	// needed for fog, specular, and environment mapping
+	VectorSubtract( viewParms->ori.origin, ori->origin, delta );
+
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
 }
 
 /*
@@ -341,28 +448,28 @@ void R_RotateForViewer (void)
 	float	viewerMatrix[16];
 	vec3_t	origin;
 
-	Com_Memset (&tr.or, 0, sizeof(tr.or));
-	tr.or.axis[0][0] = 1;
-	tr.or.axis[1][1] = 1;
-	tr.or.axis[2][2] = 1;
-	VectorCopy (tr.viewParms.or.origin, tr.or.viewOrigin);
+	Com_Memset (&tr.ori, 0, sizeof(tr.ori));
+	tr.ori.axis[0][0] = 1;
+	tr.ori.axis[1][1] = 1;
+	tr.ori.axis[2][2] = 1;
+	VectorCopy (tr.viewParms.ori.origin, tr.ori.viewOrigin);
 
 	// transform by the camera placement
-	VectorCopy( tr.viewParms.or.origin, origin );
+	VectorCopy( tr.viewParms.ori.origin, origin );
 
-	viewerMatrix[0] = tr.viewParms.or.axis[0][0];
-	viewerMatrix[4] = tr.viewParms.or.axis[0][1];
-	viewerMatrix[8] = tr.viewParms.or.axis[0][2];
+	viewerMatrix[0] = tr.viewParms.ori.axis[0][0];
+	viewerMatrix[4] = tr.viewParms.ori.axis[0][1];
+	viewerMatrix[8] = tr.viewParms.ori.axis[0][2];
 	viewerMatrix[12] = -origin[0] * viewerMatrix[0] + -origin[1] * viewerMatrix[4] + -origin[2] * viewerMatrix[8];
 
-	viewerMatrix[1] = tr.viewParms.or.axis[1][0];
-	viewerMatrix[5] = tr.viewParms.or.axis[1][1];
-	viewerMatrix[9] = tr.viewParms.or.axis[1][2];
+	viewerMatrix[1] = tr.viewParms.ori.axis[1][0];
+	viewerMatrix[5] = tr.viewParms.ori.axis[1][1];
+	viewerMatrix[9] = tr.viewParms.ori.axis[1][2];
 	viewerMatrix[13] = -origin[0] * viewerMatrix[1] + -origin[1] * viewerMatrix[5] + -origin[2] * viewerMatrix[9];
 
-	viewerMatrix[2] = tr.viewParms.or.axis[2][0];
-	viewerMatrix[6] = tr.viewParms.or.axis[2][1];
-	viewerMatrix[10] = tr.viewParms.or.axis[2][2];
+	viewerMatrix[2] = tr.viewParms.ori.axis[2][0];
+	viewerMatrix[6] = tr.viewParms.ori.axis[2][1];
+	viewerMatrix[10] = tr.viewParms.ori.axis[2][2];
 	viewerMatrix[14] = -origin[0] * viewerMatrix[2] + -origin[1] * viewerMatrix[6] + -origin[2] * viewerMatrix[10];
 
 	viewerMatrix[3] = 0;
@@ -372,16 +479,16 @@ void R_RotateForViewer (void)
 
 	// convert from our coordinate system (looking down X)
 	// to OpenGL's coordinate system (looking down -Z)
-	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.or.modelMatrix );
+	myGlMultMatrix( viewerMatrix, s_flipMatrix, tr.ori.modelMatrix );
 
-	tr.viewParms.world = tr.or;
+	tr.viewParms.world = tr.ori;
 
 }
 
 /*
 ** SetFarClip
 */
-static void R_SetFarClip( void )
+static void SetFarClip( void )
 {
 	float	farthestCornerDistance = 0;
 	int		i;
@@ -430,7 +537,7 @@ static void R_SetFarClip( void )
 			v[2] = tr.viewParms.visBounds[1][2];
 		}
 
-		VectorSubtract( v, tr.viewParms.or.origin, vecTo );
+		VectorSubtract( v, tr.viewParms.ori.origin, vecTo );
 
 		distance = vecTo[0] * vecTo[0] + vecTo[1] * vecTo[1] + vecTo[2] * vecTo[2];
 
@@ -442,144 +549,170 @@ static void R_SetFarClip( void )
 	tr.viewParms.zFar = sqrt( farthestCornerDistance );
 }
 
-/*
-=================
-R_SetupFrustum
-
-Set up the culling frustum planes for the current view using the results we got from computing the first two rows of
-the projection matrix.
-=================
-*/
-void R_SetupFrustum (viewParms_t *dest, float xmin, float xmax, float ymax, float zProj, float stereoSep)
-{
-	vec3_t ofsorigin;
-	float oppleg, adjleg, length;
-	int i;
-	
-	if(stereoSep == 0 && xmin == -xmax)
-	{
-		// symmetric case can be simplified
-		VectorCopy(dest->or.origin, ofsorigin);
-
-		length = sqrt(xmax * xmax + zProj * zProj);
-		oppleg = xmax / length;
-		adjleg = zProj / length;
-
-		VectorScale(dest->or.axis[0], oppleg, dest->frustum[0].normal);
-		VectorMA(dest->frustum[0].normal, adjleg, dest->or.axis[1], dest->frustum[0].normal);
-
-		VectorScale(dest->or.axis[0], oppleg, dest->frustum[1].normal);
-		VectorMA(dest->frustum[1].normal, -adjleg, dest->or.axis[1], dest->frustum[1].normal);
-	}
-	else
-	{
-		// In stereo rendering, due to the modification of the projection matrix, dest->or.origin is not the
-		// actual origin that we're rendering so offset the tip of the view pyramid.
-		VectorMA(dest->or.origin, stereoSep, dest->or.axis[1], ofsorigin);
-	
-		oppleg = xmax + stereoSep;
-		length = sqrt(oppleg * oppleg + zProj * zProj);
-		VectorScale(dest->or.axis[0], oppleg / length, dest->frustum[0].normal);
-		VectorMA(dest->frustum[0].normal, zProj / length, dest->or.axis[1], dest->frustum[0].normal);
-
-		oppleg = xmin + stereoSep;
-		length = sqrt(oppleg * oppleg + zProj * zProj);
-		VectorScale(dest->or.axis[0], -oppleg / length, dest->frustum[1].normal);
-		VectorMA(dest->frustum[1].normal, -zProj / length, dest->or.axis[1], dest->frustum[1].normal);
-	}
-
-	length = sqrt(ymax * ymax + zProj * zProj);
-	oppleg = ymax / length;
-	adjleg = zProj / length;
-
-	VectorScale(dest->or.axis[0], oppleg, dest->frustum[2].normal);
-	VectorMA(dest->frustum[2].normal, adjleg, dest->or.axis[2], dest->frustum[2].normal);
-
-	VectorScale(dest->or.axis[0], oppleg, dest->frustum[3].normal);
-	VectorMA(dest->frustum[3].normal, -adjleg, dest->or.axis[2], dest->frustum[3].normal);
-	
-	for (i=0 ; i<4 ; i++) {
-		dest->frustum[i].type = PLANE_NON_AXIAL;
-		dest->frustum[i].dist = DotProduct (ofsorigin, dest->frustum[i].normal);
-		SetPlaneSignbits( &dest->frustum[i] );
-	}
-}
 
 /*
 ===============
 R_SetupProjection
 ===============
 */
-void R_SetupProjection(viewParms_t *dest, float zProj, qboolean computeFrustum)
-{
+void R_SetupProjection( void ) {
 	float	xmin, xmax, ymin, ymax;
-	float	width, height, stereoSep = r_stereoSeparation->value;
+	float	width, height, depth;
+	float	zNear, zFar;
 
-	/*
-	 * offset the view origin of the viewer for stereo rendering 
-	 * by setting the projection matrix appropriately.
-	 */
+	// dynamically compute far clip plane distance
+	SetFarClip();
 
-	if(stereoSep != 0)
-	{
-		if(dest->stereoFrame == STEREO_LEFT)
-			stereoSep = zProj / stereoSep;
-		else if(dest->stereoFrame == STEREO_RIGHT)
-			stereoSep = zProj / -stereoSep;
-		else
-			stereoSep = 0;
-	}
+	//
+	// set up projection matrix
+	//
+	zNear	= r_znear->value;
+	zFar	= tr.viewParms.zFar;
 
-	ymax = zProj * tan(dest->fovY * M_PI / 360.0f);
+	ymax = zNear * tan( tr.refdef.fov_y * M_PI / 360.0f );
 	ymin = -ymax;
 
-	xmax = zProj * tan(dest->fovX * M_PI / 360.0f);
+	xmax = zNear * tan( tr.refdef.fov_x * M_PI / 360.0f );
 	xmin = -xmax;
 
 	width = xmax - xmin;
 	height = ymax - ymin;
-	
-	dest->projectionMatrix[0] = 2 * zProj / width;
-	dest->projectionMatrix[4] = 0;
-	dest->projectionMatrix[8] = (xmax + xmin + 2 * stereoSep) / width;
-	dest->projectionMatrix[12] = 2 * zProj * stereoSep / width;
+	depth = zFar - zNear;
 
-	dest->projectionMatrix[1] = 0;
-	dest->projectionMatrix[5] = 2 * zProj / height;
-	dest->projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
-	dest->projectionMatrix[13] = 0;
+	tr.viewParms.projectionMatrix[0] = 2 * zNear / width;
+	tr.viewParms.projectionMatrix[4] = 0;
+	tr.viewParms.projectionMatrix[8] = ( xmax + xmin ) / width;	// normally 0
+	tr.viewParms.projectionMatrix[12] = 0;
 
-	dest->projectionMatrix[3] = 0;
-	dest->projectionMatrix[7] = 0;
-	dest->projectionMatrix[11] = -1;
-	dest->projectionMatrix[15] = 0;
-	
-	// Now that we have all the data for the projection matrix we can also setup the view frustum.
-	if(computeFrustum)
-		R_SetupFrustum(dest, xmin, xmax, ymax, zProj, stereoSep);
+	tr.viewParms.projectionMatrix[1] = 0;
+	tr.viewParms.projectionMatrix[5] = 2 * zNear / height;
+	tr.viewParms.projectionMatrix[9] = ( ymax + ymin ) / height;	// normally 0
+	tr.viewParms.projectionMatrix[13] = 0;
+
+	tr.viewParms.projectionMatrix[2] = 0;
+	tr.viewParms.projectionMatrix[6] = 0;
+	tr.viewParms.projectionMatrix[10] = -( zFar + zNear ) / depth;
+	tr.viewParms.projectionMatrix[14] = -2 * zFar * zNear / depth;
+
+	tr.viewParms.projectionMatrix[3] = 0;
+	tr.viewParms.projectionMatrix[7] = 0;
+	tr.viewParms.projectionMatrix[11] = -1;
+	tr.viewParms.projectionMatrix[15] = 0;
 }
 
 /*
-===============
-R_SetupProjectionZ
+=================
+R_SetupFrustum
 
-Sets the z-component transformation part in the projection matrix
-===============
+Setup that culling frustum planes for the current view
+=================
 */
-void R_SetupProjectionZ(viewParms_t *dest)
-{
-	float zNear, zFar, depth;
-	
-	zNear	= r_znear->value;
-	zFar	= dest->zFar;	
-	depth	= zFar - zNear;
+void R_SetupFrustum (void) {
+	int		i;
+	float	xs, xc;
+	float	ang;
 
-	dest->projectionMatrix[2] = 0;
-	dest->projectionMatrix[6] = 0;
-	dest->projectionMatrix[10] = -( zFar + zNear ) / depth;
-	dest->projectionMatrix[14] = -2 * zFar * zNear / depth;
+	ang = tr.viewParms.fovX / 180 * M_PI * 0.5f;
+	xs = sin( ang );
+	xc = cos( ang );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[0].normal );
+	VectorMA( tr.viewParms.frustum[0].normal, xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[0].normal );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[1].normal );
+	VectorMA( tr.viewParms.frustum[1].normal, -xc, tr.viewParms.ori.axis[1], tr.viewParms.frustum[1].normal );
+
+	ang = tr.viewParms.fovY / 180 * M_PI * 0.5f;
+	xs = sin( ang );
+	xc = cos( ang );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[2].normal );
+	VectorMA( tr.viewParms.frustum[2].normal, xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[2].normal );
+
+	VectorScale( tr.viewParms.ori.axis[0], xs, tr.viewParms.frustum[3].normal );
+	VectorMA( tr.viewParms.frustum[3].normal, -xc, tr.viewParms.ori.axis[2], tr.viewParms.frustum[3].normal );
+
+	for (i=0 ; i<4 ; i++) {
+		tr.viewParms.frustum[i].type = PLANE_NON_AXIAL;
+		tr.viewParms.frustum[i].dist = DotProduct (tr.viewParms.ori.origin, tr.viewParms.frustum[i].normal);
+		SetPlaneSignbits( &tr.viewParms.frustum[i] );
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		// since 2.0: skybox farplane
+		if (r_skybox_farplane->integer) {
+			tr.viewParms.farplane_distance = r_skybox_farplane->value;
+
+            sscanf(
+                r_farplane_color->string,
+                "%f %f %f",
+                &tr.viewParms.farplane_color[0],
+                &tr.viewParms.farplane_color[1],
+                &tr.viewParms.farplane_color[2]
+			);
+
+			if (r_farplane_nocull->integer > 0) {
+				tr.viewParms.farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				tr.viewParms.farplane_cull = 1;
+            } else {
+                tr.viewParms.farplane_cull = 2;
+            }
+		}
+	}
+	else if (r_farplane->integer)
+	{
+		tr.viewParms.farplane_distance = r_farplane->value;
+		tr.viewParms.farplane_bias = r_farplane_bias->value;
+
+		sscanf(
+			r_farplane_color->string,
+			"%f %f %f",
+			&tr.viewParms.farplane_color[0],
+			&tr.viewParms.farplane_color[1],
+			&tr.viewParms.farplane_color[2]);
+
+			if (r_farplane_nocull->integer > 0) {
+				tr.viewParms.farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				tr.viewParms.farplane_cull = 1;
+            } else {
+                tr.viewParms.farplane_cull = 2;
+            }
+	}
+
+	if (tr.viewParms.farplane_distance)
+	{
+		vec3_t farPoint;
+		float realPlaneLen;
+		float tmp;
+		vec4_t fogColor;
+
+		tr.viewParms.fog.len = tr.viewParms.farplane_distance;
+		tr.viewParms.fog.oolen = 1.0 / tr.viewParms.farplane_distance;
+		VectorMA(tr.viewParms.ori.origin, tr.viewParms.farplane_distance, tr.viewParms.ori.axis[0], farPoint);
+
+		VectorNegate(tr.viewParms.ori.axis[0], tr.viewParms.frustum[4].normal);
+		tr.viewParms.frustum[4].type = PLANE_NON_AXIAL;
+		tr.viewParms.frustum[4].dist = DotProduct(farPoint, tr.viewParms.frustum[4].normal);
+		SetPlaneSignbits(&tr.viewParms.frustum[4]);
+
+		tr.viewParms.fog.enabled = r_farplane_nofog->integer == 0;
+		if (tr.viewParms.farplane_cull) {
+			// extra fustum for culling
+			tr.viewParms.fog.extrafrustums = 1;
+		} else {
+			tr.viewParms.fog.extrafrustums = 0;
+		}
+	}
+	else
+	{
+		tr.viewParms.fog.enabled = 0;
+		tr.viewParms.fog.extrafrustums = 0;
+	}
 }
 
+
 /*
 =================
 R_MirrorPoint
@@ -679,20 +812,20 @@ qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum,
 	R_PlaneForSurface( drawSurf->surface, &originalPlane );
 
 	// rotate the plane if necessary
-	if ( entityNum != REFENTITYNUM_WORLD ) {
+	if ( entityNum != ENTITYNUM_WORLD ) {
 		tr.currentEntityNum = entityNum;
 		tr.currentEntity = &tr.refdef.entities[entityNum];
 
 		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.or );
+		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
 
 		// rotate the plane, but keep the non-rotated version for matching
 		// against the portalSurface entities
 		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.or.origin );
+		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
 
 		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.or.origin );
+		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
 	} else {
 		plane = originalPlane;
 	}
@@ -744,24 +877,7 @@ qboolean R_GetPortalOrientations( drawSurf_t *drawSurf, int entityNum,
 		VectorSubtract( vec3_origin, camera->axis[1], camera->axis[1] );
 
 		// optionally rotate
-		if ( e->e.oldframe ) {
-			// if a speed is specified
-			if ( e->e.frame ) {
-				// continuous rotate
-				d = (tr.refdef.time/1000.0f) * e->e.frame;
-				VectorCopy( camera->axis[1], transformed );
-				RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-				CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-			} else {
-				// bobbing rotate, with skinNum being the rotation offset
-				d = sin( tr.refdef.time * 0.003f );
-				d = e->e.skinNum + d * 4;
-				VectorCopy( camera->axis[1], transformed );
-				RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
-				CrossProduct( camera->axis[0], camera->axis[1], camera->axis[2] );
-			}
-		}
-		else if ( e->e.skinNum ) {
+		if ( e->e.skinNum ) {
 			d = e->e.skinNum;
 			VectorCopy( camera->axis[1], transformed );
 			RotatePointAroundVector( camera->axis[1], camera->axis[0], transformed, d );
@@ -796,22 +912,26 @@ static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
 	R_PlaneForSurface( drawSurf->surface, &originalPlane );
 
 	// rotate the plane if necessary
-	if ( entityNum != REFENTITYNUM_WORLD )
+	if ( entityNum != ENTITYNUM_WORLD ) 
 	{
 		tr.currentEntityNum = entityNum;
 		tr.currentEntity = &tr.refdef.entities[entityNum];
 
 		// get the orientation of the entity
-		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.or );
+		R_RotateForEntity( tr.currentEntity, &tr.viewParms, &tr.ori );
 
 		// rotate the plane, but keep the non-rotated version for matching
 		// against the portalSurface entities
 		R_LocalNormalToWorld( originalPlane.normal, plane.normal );
-		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.or.origin );
+		plane.dist = originalPlane.dist + DotProduct( plane.normal, tr.ori.origin );
 
 		// translate the original plane
-		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.or.origin );
+		originalPlane.dist = originalPlane.dist + DotProduct( originalPlane.normal, tr.ori.origin );
 	} 
+	else 
+	{
+		plane = originalPlane;
+	}
 
 	// locate the portal entity closest to this plane.
 	// origin will be the origin of the portal, origin2 will be
@@ -846,32 +966,38 @@ static qboolean IsMirror( const drawSurf_t *drawSurf, int entityNum )
 **
 ** Determines if a surface is completely offscreen.
 */
-static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128] ) {
+qboolean SurfIsOffscreen(const srfSurfaceFace_t* surface, shader_t* shader, int entityNum) {
 	float shortest = 100000000;
-	int entityNum;
 	int numTriangles;
-	shader_t *shader;
-	int		fogNum;
-	int dlighted;
+	qboolean doRange;
+	orientationr_t surfOr;
+	unsigned int* indices;
 	vec4_t clip, eye;
 	int i;
 	unsigned int pointOr = 0;
 	unsigned int pointAnd = (unsigned int)~0;
 
-	R_RotateForViewer();
+	if (surface->surfaceType != SF_FACE) {
+		ri.Printf(PRINT_WARNING, "WARNING: SurfIsOffscreen called on non-bmodel!\n");
+		return qfalse;
+	}
+	
+	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
+		return qfalse;
+	}
 
-	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted );
-	RB_BeginSurface( shader, fogNum );
-	rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
+	if (entityNum == ENTITYNUM_WORLD) {
+		surfOr = tr.viewParms.world;
+	} else {
+		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
+	}
 
-	assert( tess.numVertexes < 128 );
-
-	for ( i = 0; i < tess.numVertexes; i++ )
+	for ( i = 0; i < surface->numPoints; i++ )
 	{
 		int j;
 		unsigned int pointFlags = 0;
 
-		R_TransformModelToClip( tess.xyz[i], tr.or.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
+		R_TransformModelToClip( surface->points[i], surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
 
 		for ( j = 0; j < 3; j++ )
 		{
@@ -899,22 +1025,28 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 	// based on vertex distance isn't 100% correct (we should be checking for
 	// range to the surface), but it's good enough for the types of portals
 	// we have in the game right now.
-	numTriangles = tess.numIndexes / 3;
+	numTriangles = surface->numIndices / 3;
 
-	for ( i = 0; i < tess.numIndexes; i += 3 )
+	for ( i = 0; i < surface->numIndices; i += 3 )
 	{
 		vec3_t normal;
+		float dot;
 		float len;
+		unsigned* indices;
 
-		VectorSubtract( tess.xyz[tess.indexes[i]], tr.viewParms.or.origin, normal );
+		indices = (unsigned*)(((char*)surface) + surface->ofsIndices);
 
-		len = VectorLengthSquared( normal );			// lose the sqrt
-		if ( len < shortest )
-		{
-			shortest = len;
+		VectorSubtract( surface->points[indices[i]], surfOr.viewOrigin, normal);
+
+		if (shader->fDistRange > 0) {
+			len = VectorLengthSquared(normal);			// lose the sqrt
+			if (len < shortest)
+			{
+				shortest = len;
+			}
 		}
 
-		if ( DotProduct( normal, tess.normal[tess.indexes[i]] ) >= 0 )
+		if ( ( dot = DotProduct( normal, surface->plane.normal ) ) >= 0 )
 		{
 			numTriangles--;
 		}
@@ -924,21 +1056,27 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 		return qtrue;
 	}
 
-	// mirrors can early out at this point, since we don't do a fade over distance
-	// with them (although we could)
-	if ( IsMirror( drawSurf, entityNum ) )
+	if (shader->fDistRange > 0.0)
 	{
-		return qfalse;
-	}
-
-	if ( shortest > (tess.shader->portalRange*tess.shader->portalRange) )
-	{
-		return qtrue;
+		if (shortest > Square(shader->fDistRange))
+		{
+			return qtrue;
+		}
 	}
 
 	return qfalse;
 }
 
+static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
+	int entityNum;
+	shader_t* shader;
+	int dlighted;
+	qboolean bStaticModel;
+
+	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
+	return SurfIsOffscreen((srfSurfaceFace_t*)drawSurf->surface, shader, entityNum);
+}
+
 /*
 ========================
 R_MirrorViewBySurface
@@ -947,7 +1085,6 @@ Returns qtrue if another view has been rendered
 ========================
 */
 qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
-	vec4_t			clipDest[128];
 	viewParms_t		newParms;
 	viewParms_t		oldParms;
 	orientation_t	surface, camera;
@@ -963,7 +1100,7 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 	}
 
 	// trivially reject portal/mirror
-	if ( SurfIsOffscreen( drawSurf, clipDest ) ) {
+	if (DrawSurfIsOffscreen( drawSurf ) ) {
 		return qfalse;
 	}
 
@@ -977,14 +1114,14 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 		return qfalse;		// bad portal, no portalentity
 	}
 
-	R_MirrorPoint (oldParms.or.origin, &surface, &camera, newParms.or.origin );
+	R_MirrorPoint (oldParms.ori.origin, &surface, &camera, newParms.ori.origin );
 
 	VectorSubtract( vec3_origin, camera.axis[0], newParms.portalPlane.normal );
 	newParms.portalPlane.dist = DotProduct( camera.origin, newParms.portalPlane.normal );
 	
-	R_MirrorVector (oldParms.or.axis[0], &surface, &camera, newParms.or.axis[0]);
-	R_MirrorVector (oldParms.or.axis[1], &surface, &camera, newParms.or.axis[1]);
-	R_MirrorVector (oldParms.or.axis[2], &surface, &camera, newParms.or.axis[2]);
+	R_MirrorVector (oldParms.ori.axis[0], &surface, &camera, newParms.ori.axis[0]);
+	R_MirrorVector (oldParms.ori.axis[1], &surface, &camera, newParms.ori.axis[1]);
+	R_MirrorVector (oldParms.ori.axis[2], &surface, &camera, newParms.ori.axis[2]);
 
 	// OPTIMIZE: restrict the viewport on the mirrored view
 
@@ -996,43 +1133,6 @@ qboolean R_MirrorViewBySurface (drawSurf_t *drawSurf, int entityNum) {
 	return qtrue;
 }
 
-/*
-=================
-R_SpriteFogNum
-
-See if a sprite is inside a fog volume
-=================
-*/
-int R_SpriteFogNum( trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	if ( ent->e.renderfx & RF_CROSSHAIR ) {
-		return 0;
-	}
-
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( ent->e.origin[j] - ent->e.radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( ent->e.origin[j] + ent->e.radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
 /*
 ==========================================================================================
 
@@ -1099,8 +1199,7 @@ static void R_RadixSort( drawSurf_t *source, int size )
 R_AddDrawSurf
 =================
 */
-void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, 
-				   int fogIndex, int dlightMap ) {
+void R_AddDrawSurf(surfaceType_t* surface, shader_t* shader, int dlightMap) {
 	int			index;
 
 	// instead of checking for overflow, we just mask the index
@@ -1109,22 +1208,40 @@ void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
 	// the sort data is packed into a single 32 bit value so it can be
 	// compared quickly during the qsorting process
 	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
-		| tr.shiftedEntityNum | ( fogIndex << QSORT_FOGNUM_SHIFT ) | (int)dlightMap;
+		| tr.shiftedEntityNum | tr.shiftedIsStatic | (dlightMap & 15);
 	tr.refdef.drawSurfs[index].surface = surface;
 	tr.refdef.numDrawSurfs++;
 }
 
+/*
+=================
+R_AddSpriteSurf
+=================
+*/
+void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
+{
+	int index;
+
+	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
+		zDistance = MAX_SPRITE_DIST_SQUARED;
+	}
+
+	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
+    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
+    tr.refdef.spriteSurfs[index].surface = surface;
+    tr.refdef.numSpriteSurfs++;
+}
+
 /*
 =================
 R_DecomposeSort
 =================
 */
-void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap ) {
-	*fogNum = ( sort >> QSORT_FOGNUM_SHIFT ) & 31;
+void R_DecomposeSort(unsigned int sort, int* entityNum, shader_t** shader, int* dlightMap, qboolean* bStaticModel) {
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
-	*entityNum = ( sort >> QSORT_REFENTITYNUM_SHIFT ) & REFENTITYNUM_MASK;
-	*dlightMap = sort & 3;
+	*entityNum = ( sort >> QSORT_ENTITYNUM_SHIFT ) & 4095;
+	*dlightMap = sort & 15;
+	*bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
 }
 
 /*
@@ -1132,12 +1249,12 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
 R_SortDrawSurfs
 =================
 */
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
+void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs, drawSurf_t *spriteSurfs, int numSpriteSurfs ) {
 	shader_t		*shader;
-	int				fogNum;
 	int				entityNum;
 	int				dlighted;
 	int				i;
+	qboolean		bStaticModel;
 
 	// it is possible for some views to not have any surfaces
 	if ( numDrawSurfs < 1 ) {
@@ -1146,34 +1263,51 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		return;
 	}
 
+	// if we overflowed MAX_DRAWSURFS, the drawsurfs
+	// wrapped around in the buffer and we will be missing
+    // the first surfaces, not the last ones
+    if (numDrawSurfs > MAX_DRAWSURFS) {
+        numDrawSurfs = MAX_DRAWSURFS;
+    }
+    if (numSpriteSurfs > MAX_SPRITESURFS) {
+		numSpriteSurfs = MAX_SPRITESURFS;
+    }
+
 	// sort the drawsurfs by sort type, then orientation, then shader
-	R_RadixSort( drawSurfs, numDrawSurfs );
+	R_RadixSort (drawSurfs, numDrawSurfs );
+	R_RadixSort (spriteSurfs, numSpriteSurfs );
 
-	// check for any pass through drawing, which
-	// may cause another view to be rendered first
-	for ( i = 0 ; i < numDrawSurfs ; i++ ) {
-		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted );
+	R_Sky_Render();
 
-		if ( shader->sort > SS_PORTAL ) {
-			break;
-		}
+	if (!tr.viewParms.isPortal)
+	{
+		// check for any pass through drawing, which
+		// may cause another view to be rendered first
+		for (i = 0; i < numDrawSurfs; i++) {
+			R_DecomposeSort((drawSurfs + i)->sort, &entityNum, &shader, &dlighted, &bStaticModel);
 
-		// no shader should ever have this sort type
-		if ( shader->sort == SS_BAD ) {
-			ri.Error (ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name );
-		}
-
-		// if the mirror was completely clipped away, we may need to check another surface
-		if ( R_MirrorViewBySurface( (drawSurfs+i), entityNum) ) {
-			// this is a debug option to see exactly what is being mirrored
-			if ( r_portalOnly->integer ) {
-				return;
+			if (shader->sort > SS_PORTAL) {
+				break;
+			}
+
+			// no shader should ever have this sort type
+			if (shader->sort == SS_BAD) {
+				ri.Error(ERR_DROP, "Shader '%s'with sort == SS_BAD", shader->name);
+			}
+
+			// if the mirror was completely clipped away, we may need to check another surface
+			if (R_MirrorViewBySurface((drawSurfs + i), entityNum)) {
+				// this is a debug option to see exactly what is being mirrored
+				if (r_portalOnly->integer) {
+					return;
+				}
+				break;		// only one mirror view at a time
 			}
-			break;		// only one mirror view at a time
 		}
 	}
 
-	R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+    R_AddDrawSurfCmd(drawSurfs, numDrawSurfs);
+    R_AddSpriteSurfCmd(spriteSurfs, numSpriteSurfs);
 }
 
 /*
@@ -1185,9 +1319,7 @@ void R_AddEntitySurfaces (void) {
 	trRefEntity_t	*ent;
 	shader_t		*shader;
 
-	if ( !r_drawentities->integer ) {
-		return;
-	}
+	tr.shiftedIsStatic = 0;
 
 	for ( tr.currentEntityNum = 0; 
 	      tr.currentEntityNum < tr.refdef.num_entities; 
@@ -1197,7 +1329,7 @@ void R_AddEntitySurfaces (void) {
 		ent->needDlights = qfalse;
 
 		// preshift the value we are going to OR into the drawsurf sort
-		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+		tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
 
 		//
 		// the weapon model must be handled special --
@@ -1208,15 +1340,33 @@ void R_AddEntitySurfaces (void) {
 			continue;
 		}
 
+		if (tr.viewParms.isPortalSky) {
+			// Expecting a sky entity in a sky portal
+			if (!(ent->e.renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+
+		if (tr.viewParms.isPortal) {
+			if (!(ent->e.renderfx & (RF_WRAP_FRAMES | RF_SHADOW_PLANE))) {
+				continue;
+			}
+		} else {
+			if (ent->e.renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
 		// simple generated models, like sprites and beams, are not culled
 		switch ( ent->e.reType ) {
 		case RT_PORTALSURFACE:
 			break;		// don't draw anything
 		case RT_SPRITE:
 		case RT_BEAM:
-		case RT_LIGHTNING:
-		case RT_RAIL_CORE:
-		case RT_RAIL_RINGS:
 			// self blood sprites, talk balloons, etc should not be drawn in the primary
 			// view.  We can't just do this check for all entities, because md3
 			// entities may still want to cast shadows from them
@@ -1224,26 +1374,23 @@ void R_AddEntitySurfaces (void) {
 				continue;
 			}
 			shader = R_GetShaderByHandle( ent->e.customShader );
-			R_AddDrawSurf( &entitySurface, shader, R_SpriteFogNum( ent ), 0 );
+			R_AddDrawSurf( &entitySurface, shader, 0 );
 			break;
 
 		case RT_MODEL:
-			// we must set up parts of tr.or for model culling
-			R_RotateForEntity( ent, &tr.viewParms, &tr.or );
+			// we must set up parts of tr.ori for model culling
+			R_RotateForEntity( ent, &tr.viewParms, &tr.ori );
 
 			tr.currentModel = R_GetModelByHandle( ent->e.hModel );
 			if (!tr.currentModel) {
-				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0, 0 );
+				R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
 			} else {
 				switch ( tr.currentModel->type ) {
-				case MOD_MESH:
-					R_AddMD3Surfaces( ent );
+				case MOD_SPRITE:
+					ri.Printf(PRINT_ALL, "sprite model '%s' being added to renderer!\n", tr.currentModel->name);
 					break;
-				case MOD_MDR:
-					R_MDRAddAnimSurfaces( ent );
-					break;
-				case MOD_IQM:
-					R_AddIQMSurfaces( ent );
+				case MOD_TIKI:
+					R_AddSkelSurfaces( ent );
 					break;
 				case MOD_BRUSH:
 					R_AddBrushModelSurfaces( ent );
@@ -1252,7 +1399,8 @@ void R_AddEntitySurfaces (void) {
 					if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
 						break;
 					}
-					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0, 0 );
+					shader = R_GetShaderByHandle( ent->e.customShader );
+					R_AddDrawSurf( &entitySurface, tr.defaultShader, 0 );
 					break;
 				default:
 					ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad modeltype" );
@@ -1264,9 +1412,56 @@ void R_AddEntitySurfaces (void) {
 			ri.Error( ERR_DROP, "R_AddEntitySurfaces: Bad reType" );
 		}
 	}
-
 }
 
+void R_AddSpriteSurfaces()
+{
+	refSprite_t* sprite;
+	vec3_t delta;
+
+	if (!r_drawsprites->integer) {
+		return;
+	}
+
+	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
+	{
+		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
+
+        if (tr.viewParms.isPortalSky) {
+			if (!(sprite->renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+        } else {
+			if (sprite->renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+        
+		if (tr.viewParms.isPortal) {
+			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
+				continue;
+			}
+		} else {
+			if (sprite->renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
+		tr.currentEntityNum = ENTITYNUM_WORLD;
+        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+		if (sprite->hModel && sprite->hModel < tr.numModels) {
+			tr.currentModel = &tr.models[sprite->hModel];
+		} else {
+			tr.currentModel = &tr.models[0];
+		}
+
+		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.ori );
+		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
+
+		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
+		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
+	}
+}
 
 /*
 ====================
@@ -1275,22 +1470,24 @@ R_GenerateDrawSurfs
 */
 void R_GenerateDrawSurfs( void ) {
 	R_AddWorldSurfaces ();
+	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL)) {
+		R_AddSwipeSurfaces();
+	}
 
 	R_AddPolygonSurfaces();
 
+    R_AddTerrainMarkSurfaces();
+
+    R_AddEntitySurfaces();
+
+	R_AddSpriteSurfaces();
+
 	// set the projection matrix with the minimum zfar
 	// now that we have the world bounded
 	// this needs to be done before entities are
 	// added, because they use the projection
 	// matrix for lod calculation
-
-	// dynamically compute far clip plane distance
-	R_SetFarClip();
-
-	// we know the size of the clipping volume. Now set the rest of the projection matrix.
-	R_SetupProjectionZ (&tr.viewParms);
-
-	R_AddEntitySurfaces ();
+	R_SetupProjection ();
 }
 
 /*
@@ -1332,13 +1529,11 @@ Visualization aid for movement clipping debugging
 ====================
 */
 void R_DebugGraphics( void ) {
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return;
-	}
 	if ( !r_debugSurface->integer ) {
 		return;
 	}
 
+	// the render thread can't make callbacks to the main thread
 	R_IssuePendingRenderCommands();
 
 	GL_Bind( tr.whiteImage);
@@ -1346,6 +1541,219 @@ void R_DebugGraphics( void ) {
 	ri.CM_DrawDebugSurface( R_DebugPolygon );
 }
 
+#define CIRCLE_LENGTH		25
+
+/*
+================
+R_DebugCircle
+================
+*/
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
+    int				i;
+    float			ang;
+	debugline_t* line;
+	vec3_t			forward, right;
+	vec3_t			pos, lastpos;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (horizontal)
+	{
+		VectorSet(forward, 1, 0, 0);
+		VectorSet(right, 0, 1, 0);
+	}
+	else
+	{
+		VectorCopy(tr.refdef.viewaxis[1], right);
+		VectorCopy(tr.refdef.viewaxis[2], forward);
+	}
+
+	VectorClear(pos);
+	VectorClear(lastpos);
+
+	for (i = 0; i < CIRCLE_LENGTH; i++) {
+		VectorCopy(pos, lastpos);
+
+		ang = DEG2RAD((float)(i * 15));
+		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
+			cos(ang) * radius * right[0];
+		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
+			cos(ang) * radius * right[1];
+		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
+			cos(ang) * radius * right[2];
+
+		if (i > 0)
+		{
+			if (*ri.numDebugLines >= r_numdebuglines->integer) {
+				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
+				return;
+			}
+
+			line = &(*ri.DebugLines)[*ri.numDebugLines];
+			(*ri.numDebugLines)++;
+			VectorCopy(lastpos, line->start);
+			VectorCopy(pos, line->end);
+			VectorSet(line->color, r, g, b);
+			line->alpha = alpha;
+			line->width = 1.0;
+			line->factor = 1;
+			line->pattern = -1;
+		}
+	}
+}
+
+/*
+================
+R_DebugLine
+================
+*/
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
+	debugline_t* line;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (*ri.numDebugLines >= r_numdebuglines->integer) {
+		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+		return;
+	}
+
+	line = &(*ri.DebugLines)[*ri.numDebugLines];
+	(*ri.numDebugLines)++;
+	VectorCopy(start, line->start);
+	VectorCopy(end, line->end);
+	VectorSet(line->color, r, g, b);
+	line->alpha = alpha;
+	line->width = 1.0;
+	line->factor = 1;
+	line->pattern = -1;
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugLines(void) {
+	debugline_t* line;
+	int i;
+	float width;
+	int factor;
+	unsigned short pattern;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (!*ri.numDebugLines) {
+		return;
+	}
+
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+		return;
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		return;
+	}
+
+	R_IssuePendingRenderCommands();
+    GL_Bind(tr.whiteImage);
+	if (r_debuglines_depthmask->integer) {
+		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+	} else {
+		GL_State(GLS_POLYMODE_LINE);
+	}
+
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    width = 1.0;
+    factor = 4;
+    pattern = -1;
+
+    if (r_stipplelines->integer)
+    {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(4, -1);
+        qglLineWidth(1.0f);
+    }
+
+	qglBegin(GL_LINES);
+
+	for (i = 0; i < *ri.numDebugLines; i++) {
+		line = &(*ri.DebugLines)[i];
+
+		if (r_stipplelines->integer) {
+			if (line->width != width || line->factor != factor || line->pattern != pattern) {
+				qglEnd();
+				qglLineStipple(line->factor, line->pattern);
+                qglLineWidth(line->width);
+                qglBegin(GL_LINES);
+                factor = line->factor;
+                width = line->width;
+                pattern = line->pattern;
+			}
+		}
+
+		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
+        qglVertex3fv(line->start);
+        qglVertex3fv(line->end);
+	}
+
+    qglEnd();
+
+    if (r_stipplelines->integer)
+    {
+        qglDisable(GL_LINE_STIPPLE);
+        qglLineStipple(1, -1);
+        qglLineWidth(1.0);
+    }
+
+    qglDepthRange(0.0, 1.0);
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugStrings(void) {
+	int i;
+	debugstring_t* string;
+
+	if (!ri.DebugStrings || !ri.numDebugStrings) {
+		return;
+	}
+
+	if (!*ri.numDebugStrings) {
+		return;
+	}
+
+    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+	for (i = 0; i < *ri.numDebugStrings; i++) {
+		string = &(*ri.DebugStrings)[i];
+
+		R_DrawFloatingString(
+			tr.pFontDebugStrings,
+			string->szText,
+			string->pos,
+			string->color,
+			string->scale,
+			64
+		);
+	}
+}
 
 /*
 ================
@@ -1357,7 +1765,7 @@ or a mirror / remote location
 */
 void R_RenderView (viewParms_t *parms) {
 	int		firstDrawSurf;
-	int		numDrawSurfs;
+	int		firstSpriteSurf;
 
 	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
 		return;
@@ -1370,25 +1778,28 @@ void R_RenderView (viewParms_t *parms) {
 	tr.viewParms.frameCount = tr.frameCount;
 
 	firstDrawSurf = tr.refdef.numDrawSurfs;
+	firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 	tr.viewCount++;
 
 	// set viewParms.world
 	R_RotateForViewer ();
 
-	R_SetupProjection(&tr.viewParms, r_zproj->value, qtrue);
+	R_SetupFrustum ();
+
+	R_Sky_Reset();
+
+	R_DrawDebugStrings();
 
 	R_GenerateDrawSurfs();
 
-	// if we overflowed MAX_DRAWSURFS, the drawsurfs
-	// wrapped around in the buffer and we will be missing
-	// the first surfaces, not the last ones
-	numDrawSurfs = tr.refdef.numDrawSurfs;
-	if ( numDrawSurfs > MAX_DRAWSURFS ) {
-		numDrawSurfs = MAX_DRAWSURFS;
-	}
+    R_SortDrawSurfs(
+		tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+		tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+	);
 
-	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf );
+	R_DrawDebugLines();
+    R_DebugSkeleton();
 
 	// draw main system development information (surface outlines, etc)
 	R_DebugGraphics();
diff --git a/code/renderergl1/tr_marks.c b/code/renderergl1/tr_marks.c
index e757ac88..6fdb7b74 100644
--- a/code/renderergl1/tr_marks.c
+++ b/code/renderergl1/tr_marks.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -38,15 +38,16 @@ Out must have space for two more vertexes than in
 #define	SIDE_FRONT	0
 #define	SIDE_BACK	1
 #define	SIDE_ON		2
-static void R_ChopPolyBehindPlane( int numInPoints, vec3_t inPoints[MAX_VERTS_ON_POLY],
+static void R_ChopPolyBehindPlane( int numInPoints, const vec3_t inPoints[MAX_VERTS_ON_POLY],
 								   int *numOutPoints, vec3_t outPoints[MAX_VERTS_ON_POLY], 
-							vec3_t normal, vec_t dist, vec_t epsilon) {
-	float		dists[MAX_VERTS_ON_POLY+4] = { 0 };
-	int			sides[MAX_VERTS_ON_POLY+4] = { 0 };
+							const vec3_t normal, vec_t dist, vec_t epsilon) {
+	float		dists[MAX_VERTS_ON_POLY+4];
+	int			sides[MAX_VERTS_ON_POLY+4];
 	int			counts[3];
 	float		dot;
 	int			i, j;
-	float		*p1, *p2, *clip;
+	const float* p1, * p2;
+	float		*clip;
 	float		d;
 
 	// don't clip if it might overflow
@@ -158,8 +159,7 @@ void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **li
 		//
 		surf = *mark;
 		// check if the surface has NOIMPACT or NOMARKS set
-		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) )
-			|| ( surf->shader->contentFlags & CONTENTS_FOG ) ) {
+		if ( ( surf->shader->surfaceFlags & ( SURF_NOIMPACT | SURF_NOMARKS ) ) ) {
 			surf->viewCount = tr.viewCount;
 		}
 		// extra check for surfaces to avoid list overflows
@@ -173,9 +173,7 @@ void R_BoxSurfaces_r(mnode_t *node, vec3_t mins, vec3_t maxs, surfaceType_t **li
 				surf->viewCount = tr.viewCount;
 			}
 		}
-		else if (*(surfaceType_t *) (surf->data) != SF_GRID &&
-			 *(surfaceType_t *) (surf->data) != SF_TRIANGLES)
-			surf->viewCount = tr.viewCount;
+		else if (*(surfaceType_t *) (surf->data) != SF_GRID) surf->viewCount = tr.viewCount;
 		// check the viewCount because the surface may have
 		// already been added if it spans multiple leafs
 		if (surf->viewCount != tr.viewCount) {
@@ -194,11 +192,11 @@ R_AddMarkFragments
 =================
 */
 void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POLY],
-				   int numPlanes, vec3_t *normals, float *dists,
+				   int numPlanes, const vec3_t *normals, const float *dists,
 				   int maxPoints, vec3_t pointBuffer,
-				   int maxFragments, markFragment_t *fragmentBuffer,
+				   markFragment_t *fragmentBuffer,
 				   int *returnedPoints, int *returnedFragments,
-				   vec3_t mins, vec3_t maxs) {
+				   float fOnEpsilon) {
 	int pingPong, i;
 	markFragment_t	*mf;
 
@@ -224,28 +222,357 @@ void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POL
 	if ( numClipPoints + (*returnedPoints) > maxPoints ) {
 		return;	// not enough space for this polygon
 	}
-	/*
-	// all the clip points should be within the bounding box
-	for ( i = 0 ; i < numClipPoints ; i++ ) {
-		int j;
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if (clipPoints[pingPong][i][j] < mins[j] - 0.5) break;
-			if (clipPoints[pingPong][i][j] > maxs[j] + 0.5) break;
-		}
-		if (j < 3) break;
-	}
-	if (i < numClipPoints) return;
-	*/
 
 	mf = fragmentBuffer + (*returnedFragments);
 	mf->firstPoint = (*returnedPoints);
 	mf->numPoints = numClipPoints;
+	mf->iIndex = 0;
 	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
 
 	(*returnedPoints) += numClipPoints;
 	(*returnedFragments)++;
 }
 
+void R_AddMarkFragmentsToTerrain(
+	cTerraPatchUnpacked_t* pTerPatch,
+	int numPlanes,
+    const vec3_t* normals,
+    float* dists,
+	int maxPoints,
+	vec3_t pointBuffer,
+	markFragment_t* fragmentBuffer,
+	int* returnedPoints,
+	int* returnedFragments
+)
+{
+	int i, j;
+	int iType;
+	int iFirstFragment;
+	unsigned char* pubHeight;
+	vec3_t v[8];
+	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
+
+	dists[numPlanes - 2] -= 96.f;
+	dists[numPlanes - 1] -= 108.f;
+
+	v[0][0] = pTerPatch->x0;
+	v[0][1] = pTerPatch->y0;
+	v[0][2] = pTerPatch->z0;
+	v[1][0] = pTerPatch->x0;
+	v[1][1] = pTerPatch->y0 + 512.f;
+    v[1][2] = pTerPatch->z0;
+    v[2][0] = pTerPatch->x0 + 512.f;
+    v[2][1] = pTerPatch->y0 + 512.f;
+    v[2][2] = pTerPatch->z0;
+    v[3][0] = pTerPatch->x0 + 512.f;
+    v[3][1] = pTerPatch->y0;
+    v[3][2] = pTerPatch->z0;
+    v[4][0] = pTerPatch->x0;
+    v[4][1] = pTerPatch->y0;
+    v[4][2] = pTerPatch->z0 + 510.f;
+    v[5][0] = pTerPatch->x0;
+    v[5][1] = pTerPatch->y0 + 512.f;
+    v[5][2] = pTerPatch->z0 + 510.f;
+    v[6][0] = pTerPatch->x0 + 512.f;
+    v[6][1] = pTerPatch->y0 + 512.f;
+    v[6][2] = pTerPatch->z0 + 510.f;
+    v[7][0] = pTerPatch->x0 + 512.f;
+    v[7][1] = pTerPatch->y0;
+    v[7][2] = pTerPatch->z0 + 510.f;
+
+	for (i = 0; i < numPlanes; i++) {
+		pubHeight = pTerPatch->heightmap;
+		iFirstFragment = *returnedFragments;
+
+		for (j = 0; j < 8; j++) {
+			if (DotProduct(v[i], normals[i]) - dists[i] > 0.f) {
+				break;
+			}
+		}
+
+		if (j == 8)
+		{
+			dists[numPlanes - 2] += 96.f;
+			dists[numPlanes - 1] += 108.f;
+			return;
+		}
+	}
+
+	pubHeight = pTerPatch->heightmap;
+	iFirstFragment = *returnedFragments;
+
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < 8; j++) {
+			iType = ri.CM_TerrainSquareType(pTerPatch - tr.world->terraPatches, i, j);
+			if (!iType) {
+				continue;
+			}
+
+			v[0][0] = (i << 6) + pTerPatch->x0;
+			v[0][1] = (j << 6) + pTerPatch->y0;
+            v[0][2] = (pubHeight[0] << 1) + pTerPatch->z0;
+            v[1][0] = (i << 6) + pTerPatch->x0 + 64.f;
+            v[1][1] = (j << 6) + pTerPatch->y0;
+            v[1][2] = (pubHeight[1] << 1) + pTerPatch->z0;
+            v[2][0] = (i << 6) + pTerPatch->x0 + 64.f;
+            v[2][1] = (j << 6) + pTerPatch->y0 + 64.f;
+            v[2][2] = (pubHeight[10] << 1) + pTerPatch->z0;
+            v[3][0] = (i << 6) + pTerPatch->x0;
+            v[3][1] = (j << 6) + pTerPatch->y0 + 64.f;
+            v[3][2] = (pubHeight[9] << 1) + pTerPatch->z0;
+
+			if (((j & 0xFF) + (i & 0xFF)) & 1) {
+				if (iType != 3) {
+					VectorCopy(v[0], clipPoints[0][0]);
+					VectorCopy(v[3], clipPoints[0][1]);
+					VectorCopy(v[1], clipPoints[0][2]);
+
+					R_AddMarkFragments(
+						3,
+						clipPoints,
+						numPlanes,
+						normals,
+						dists,
+						maxPoints,
+						pointBuffer,
+						fragmentBuffer,
+						returnedPoints,
+						returnedFragments,
+						0.f
+					);
+				}
+
+                if (iType != 6) {
+                    VectorCopy(v[2], clipPoints[0][0]);
+                    VectorCopy(v[1], clipPoints[0][1]);
+                    VectorCopy(v[3], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+			} else {
+                if (iType != 5) {
+                    VectorCopy(v[3], clipPoints[0][0]);
+                    VectorCopy(v[2], clipPoints[0][1]);
+                    VectorCopy(v[0], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+
+                if (iType != 4) {
+                    VectorCopy(v[1], clipPoints[0][0]);
+                    VectorCopy(v[0], clipPoints[0][1]);
+                    VectorCopy(v[2], clipPoints[0][2]);
+
+                    R_AddMarkFragments(
+                        3,
+                        clipPoints,
+                        numPlanes,
+                        normals,
+                        dists,
+                        maxPoints,
+                        pointBuffer,
+                        fragmentBuffer,
+                        returnedPoints,
+                        returnedFragments,
+                        0.f
+                    );
+				}
+			}
+		}
+	}
+
+	for (i = iFirstFragment; i < *returnedFragments; i++) {
+		fragmentBuffer[i].iIndex = pTerPatch - tr.world->terraPatches + 1;
+	}
+
+    dists[numPlanes - 2] += 96.f;
+    dists[numPlanes - 1] += 108.f;
+}
+
+void R_TessellateMarkFragments(
+	int* pReturnedPoints,
+	int* pReturnedFragments,
+	int numsurfaces,
+	surfaceType_t** surfaces,
+	const vec3_t projectionDir,
+	int numPlanes,
+    const vec3_t* normals,
+    float* dists,
+	int maxPoints,
+	vec3_t pointBuffer,
+	int maxFragments,
+	markFragment_t* fragmentBuffer,
+	float fRadiusSquared
+)
+{
+	int i, j, k, m, n;
+	int* indexes;
+	float* v;
+	vec3_t clipPoints[2][MAX_VERTS_ON_POLY];
+	vec3_t v1, v2;
+	vec3_t normal;
+	drawVert_t* dv;
+	qboolean bSkipTerrain;
+	srfGridMesh_t* cv;
+	srfSurfaceFace_t* surf;
+	cTerraPatchUnpacked_t* terraPatch;
+	int numClipPoints;
+
+    bSkipTerrain = ter_minMarkRadius->value * ter_minMarkRadius->value >= (long double)fRadiusSquared;
+
+	for (i = 0; i < numsurfaces; i++) {
+		if (*surfaces[i] == SF_GRID) {
+			cv = (srfGridMesh_t*)surfaces[i];
+
+			for (m = 0; m < cv->height - 1; m++) {
+				for (n = 0; n < cv->width - 1; n++) {
+					// We triangulate the grid and chop all triangles within
+					// the bounding planes of the to be projected polygon.
+					// LOD is not taken into account, not such a big deal though.
+					//
+					// It's probably much nicer to chop the grid itself and deal
+					// with this grid as a normal SF_GRID surface so LOD will
+					// be applied. However the LOD of that chopped grid must
+					// be synced with the LOD of the original curve.
+					// One way to do this; the chopped grid shares vertices with
+					// the original curve. When LOD is applied to the original
+					// curve the unused vertices are flagged. Now the chopped curve
+					// should skip the flagged vertices. This still leaves the
+					// problems with the vertices at the chopped grid edges.
+					//
+					// To avoid issues when LOD applied to "hollow curves" (like
+					// the ones around many jump pads) we now just add a 2 unit
+					// offset to the triangle vertices.
+					// The offset is added in the vertex normal vector direction
+					// so all triangles will still fit together.
+					// The 2 unit offset should avoid pretty much all LOD problems.
+
+                    numClipPoints = 3;
+
+                    dv = cv->verts + m * cv->width + n;
+
+                    VectorCopy(dv[0].xyz, clipPoints[0][0]);
+                    VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[0].normal, clipPoints[0][0]);
+                    VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
+                    VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
+                    VectorCopy(dv[1].xyz, clipPoints[0][2]);
+                    VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[1].normal, clipPoints[0][2]);
+                    // check the normal of this triangle
+					VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+					VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+					CrossProduct(v1, v2, normal);
+					VectorNormalize(normal);
+                    if (DotProduct(normal, projectionDir) < -0.1) {
+                        // add the fragments of this triangle
+                        R_AddMarkFragments(numClipPoints, clipPoints,
+                            numPlanes, normals, dists,
+                            maxPoints, pointBuffer,
+                            fragmentBuffer,
+                            pReturnedPoints, pReturnedFragments, 0.f);
+
+                        if (*pReturnedFragments == maxFragments) {
+                            return;	// not enough space for more fragments
+                        }
+                    }
+
+					VectorCopy(dv[1].xyz, clipPoints[0][0]);
+					VectorMA(clipPoints[0][0], MARKER_OFFSET, dv[1].normal, clipPoints[0][0]);
+					VectorCopy(dv[cv->width].xyz, clipPoints[0][1]);
+					VectorMA(clipPoints[0][1], MARKER_OFFSET, dv[cv->width].normal, clipPoints[0][1]);
+					VectorCopy(dv[cv->width+1].xyz, clipPoints[0][2]);
+					VectorMA(clipPoints[0][2], MARKER_OFFSET, dv[cv->width+1].normal, clipPoints[0][2]);
+                    // check the normal of this triangle
+                    VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+                    VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+                    CrossProduct(v1, v2, normal);
+                    VectorNormalize(normal);
+                    if (DotProduct(normal, projectionDir) < -0.05) {
+                        // add the fragments of this triangle
+                        R_AddMarkFragments(numClipPoints, clipPoints,
+                            numPlanes, normals, dists,
+                            maxPoints, pointBuffer,
+                            fragmentBuffer,
+                            pReturnedPoints, pReturnedFragments, 0.f);
+
+                        if (*pReturnedFragments == maxFragments) {
+                            return;	// not enough space for more fragments
+                        }
+                    }
+				}
+			}
+		} else if (*surfaces[i] == SF_FACE) {
+            surf = (srfSurfaceFace_t*)surfaces[i];
+            // check the normal of this face
+            if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
+                continue;
+            }
+
+            indexes = (int*)((byte*)surf + surf->ofsIndices);
+
+            for (k = 0; k < surf->numIndices; k += 3) {
+                for (j = 0; j < 3; j++) {
+                    v = surf->points[indexes[k + j]];
+                    VectorMA(v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j]);
+                }
+
+                // add the fragments of this face
+                R_AddMarkFragments(3, clipPoints,
+                    numPlanes, normals, dists,
+                    maxPoints, pointBuffer,
+                    fragmentBuffer,
+                    pReturnedPoints, pReturnedFragments, 0.f);
+                if (*pReturnedFragments == maxFragments) {
+                    return;	// not enough space for more fragments
+                }
+            }
+		} else if (*surfaces[i] == SF_TERRAIN_PATCH) {
+			terraPatch = (cTerraPatchUnpacked_t*)surfaces[i];
+
+			if (!bSkipTerrain) {
+				R_AddMarkFragmentsToTerrain(
+					terraPatch,
+					numPlanes,
+					normals,
+					dists,
+					maxPoints,
+					pointBuffer,
+					fragmentBuffer,
+					pReturnedPoints,
+					pReturnedFragments
+				);
+
+				if (*pReturnedFragments == maxFragments) {
+					return;
+				}
+			}
+		}
+	}
+}
+
 /*
 =================
 R_MarkFragments
@@ -253,28 +580,21 @@ R_MarkFragments
 =================
 */
 int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer ) {
-	int				numsurfaces, numPlanes;
-	int				i, j, k, m, n;
-	surfaceType_t	*surfaces[64];
-	vec3_t			mins, maxs;
-	int				returnedFragments;
-	int				returnedPoints;
-	vec3_t			normals[MAX_VERTS_ON_POLY+2];
-	float			dists[MAX_VERTS_ON_POLY+2];
-	vec3_t			clipPoints[2][MAX_VERTS_ON_POLY];
-	int				numClipPoints;
-	float			*v;
-	srfGridMesh_t	*cv;
-	drawVert_t		*dv;
-	vec3_t			normal;
-	vec3_t			projectionDir;
-	vec3_t			v1, v2;
-	int				*indexes;
-
-	if (numPoints <= 0) {
-		return 0;
-	}
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared ) {
+    int numsurfaces;
+	int i;
+    surfaceType_t* surfaces[64];
+    vec3_t mins, maxs;
+	vec3_t boxsize;
+	float radius;
+	float backpush, frontpush;
+	int returnedFragments;
+	int returnedPoints;
+	vec3_t normals[MAX_VERTS_ON_POLY + 2];
+	float dists[MAX_VERTS_ON_POLY + 2];
+	vec3_t projectionDir;
+	vec3_t v1, v2;
+	float projdir;
 
 	//increment view count for double check prevention
 	tr.viewCount++;
@@ -294,6 +614,16 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 		AddPointToBounds( temp, mins, maxs );
 	}
 
+	VectorSubtract(maxs, mins, v1);
+	projdir = -DotProduct(v1, projectionDir);
+	VectorMA(v1, projdir, projectionDir, boxsize);
+	radius = VectorLength(boxsize);
+
+    frontpush = radius;
+    if (radius >= 32.f) frontpush = 32.f;
+    backpush = radius;
+	if (radius >= 20.f) backpush = radius;
+
 	if (numPoints > MAX_VERTS_ON_POLY) numPoints = MAX_VERTS_ON_POLY;
 	// create the bounding planes for the to be projected polygon
 	for ( i = 0 ; i < numPoints ; i++ ) {
@@ -306,24 +636,43 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 	}
 	// add near and far clipping planes for projection
 	VectorCopy(projectionDir, normals[numPoints]);
-	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - 32;
+	dists[numPoints] = DotProduct(normals[numPoints], points[0]) - frontpush;
 	VectorCopy(projectionDir, normals[numPoints+1]);
 	VectorInverse(normals[numPoints+1]);
-	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - 20;
-	numPlanes = numPoints + 2;
+	dists[numPoints+1] = DotProduct(normals[numPoints+1], points[0]) - backpush;
 
+	returnedPoints = 0;
+	returnedFragments = 0;
 	numsurfaces = 0;
+
 	R_BoxSurfaces_r(tr.world->nodes, mins, maxs, surfaces, 64, &numsurfaces, projectionDir);
-	//assert(numsurfaces <= 64);
-	//assert(numsurfaces != 64);
+	if (!numsurfaces) return 0;
+
+    R_TessellateMarkFragments(
+        &returnedPoints,
+        &returnedFragments,
+        numsurfaces,
+        surfaces,
+        projectionDir,
+        numPoints + 2,
+        normals,
+        dists,
+        maxPoints,
+        pointBuffer,
+        maxFragments,
+        fragmentBuffer,
+        fRadiusSquared
+	);
+
+    return returnedFragments;
 
 	returnedPoints = 0;
 	returnedFragments = 0;
 
+#if 0
 	for ( i = 0 ; i < numsurfaces ; i++ ) {
 
 		if (*surfaces[i] == SF_GRID) {
-
 			cv = (srfGridMesh_t *) surfaces[i];
 			for ( m = 0 ; m < cv->height - 1 ; m++ ) {
 				for ( n = 0 ; n < cv->width - 1 ; n++ ) {
@@ -368,8 +717,8 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 						R_AddMarkFragments(numClipPoints, clipPoints,
 										   numPlanes, normals, dists,
 										   maxPoints, pointBuffer,
-										   maxFragments, fragmentBuffer,
-										   &returnedPoints, &returnedFragments, mins, maxs);
+										    fragmentBuffer,
+										   &returnedPoints, &returnedFragments, 0.f);
 
 						if ( returnedFragments == maxFragments ) {
 							return returnedFragments;	// not enough space for more fragments
@@ -392,8 +741,8 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 						R_AddMarkFragments(numClipPoints, clipPoints,
 										   numPlanes, normals, dists,
 										   maxPoints, pointBuffer,
-										   maxFragments, fragmentBuffer,
-										   &returnedPoints, &returnedFragments, mins, maxs);
+										    fragmentBuffer,
+										   &returnedPoints, &returnedFragments, 0.f);
 
 						if ( returnedFragments == maxFragments ) {
 							return returnedFragments;	// not enough space for more fragments
@@ -404,55 +753,203 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 		}
 		else if (*surfaces[i] == SF_FACE) {
 
-			srfSurfaceFace_t *surf = ( srfSurfaceFace_t * ) surfaces[i];
-
+			surf = ( srfSurfaceFace_t * ) surfaces[i];
 			// check the normal of this face
 			if (DotProduct(surf->plane.normal, projectionDir) > -0.5) {
 				continue;
 			}
 
+			/*
+			VectorSubtract(clipPoints[0][0], clipPoints[0][1], v1);
+			VectorSubtract(clipPoints[0][2], clipPoints[0][1], v2);
+			CrossProduct(v1, v2, normal);
+			VectorNormalize(normal);
+			if (DotProduct(normal, projectionDir) > -0.5) continue;
+			*/
 			indexes = (int *)( (byte *)surf + surf->ofsIndices );
 			for ( k = 0 ; k < surf->numIndices ; k += 3 ) {
 				for ( j = 0 ; j < 3 ; j++ ) {
-					v = &surf->points[0][0] + VERTEXSIZE * indexes[k+j];
+					v = surf->points[0] + VERTEXSIZE * indexes[k+j];;
 					VectorMA( v, MARKER_OFFSET, surf->plane.normal, clipPoints[0][j] );
 				}
-
 				// add the fragments of this face
 				R_AddMarkFragments( 3 , clipPoints,
 								   numPlanes, normals, dists,
 								   maxPoints, pointBuffer,
-								   maxFragments, fragmentBuffer,
-								   &returnedPoints, &returnedFragments, mins, maxs);
+								   fragmentBuffer,
+								   &returnedPoints, &returnedFragments, 0.f);
 				if ( returnedFragments == maxFragments ) {
 					return returnedFragments;	// not enough space for more fragments
 				}
 			}
+			continue;
 		}
-		else if(*surfaces[i] == SF_TRIANGLES && r_marksOnTriangleMeshes->integer) {
-
-			srfTriangles_t *surf = (srfTriangles_t *) surfaces[i];
-
-			for (k = 0; k < surf->numIndexes; k += 3)
-			{
-				for(j = 0; j < 3; j++)
-				{
-					v = surf->verts[surf->indexes[k + j]].xyz;
-					VectorMA(v, MARKER_OFFSET, surf->verts[surf->indexes[k + j]].normal, clipPoints[0][j]);
-				}
-
-				// add the fragments of this face
-				R_AddMarkFragments(3, clipPoints,
-								   numPlanes, normals, dists,
-								   maxPoints, pointBuffer,
-								   maxFragments, fragmentBuffer, &returnedPoints, &returnedFragments, mins, maxs);
-				if(returnedFragments == maxFragments)
-				{
-					return returnedFragments;	// not enough space for more fragments
-				}
-			}
+		else {
+			// ignore all other world surfaces
+			// might be cool to also project polygons on a triangle soup
+			// however this will probably create huge amounts of extra polys
+			// even more than the projection onto curves
+			continue;
 		}
 	}
 	return returnedFragments;
+#endif
 }
 
+void R_BoxSurfacesForBModel_r(bmodel_t* pBmodel, const vec3_t mins, const vec3_t maxs, surfaceType_t** list, int listsize, int* listlength, const vec3_t dir)
+{
+	int s;
+	int c;
+	msurface_t* surf;
+	int i;
+
+	surf = pBmodel->firstSurface;
+
+	for (i = 0; i < listsize && i < pBmodel->numSurfaces; i++, surf++) {
+		s = surf->shader->surfaceFlags;
+		c = surf->shader->contentFlags;
+
+		if (!(s & SURF_NOIMPACT)
+			&& !(s & SURF_NOMARKS)
+			&& !(c & CONTENTS_FOG))
+		{
+			switch (*surf->data)
+			{
+			case SF_FACE:
+            {
+                int plane;
+                srfSurfaceFace_t* face;
+
+				face = (srfSurfaceFace_t*)surf->data;
+				plane = BoxOnPlaneSide(mins, maxs, &face->plane);
+				if (plane == PLANE_Y || plane == PLANE_Z) {
+					surf->viewCount = tr.viewCount;
+				}
+				else if (DotProduct(dir, face->plane.normal) > 0.5f) {
+					surf->viewCount = tr.viewCount;
+				}
+				break;
+			}
+            case SF_GRID:
+                surf->viewCount = tr.viewCount;
+				break;
+			default:
+				break;
+			}
+		}
+		else
+		{
+			surf->viewCount = tr.viewCount;
+		}
+
+		if (surf->viewCount != tr.viewCount)
+		{
+			surf->viewCount = tr.viewCount;
+			list[(*listlength)++] = surf->data;
+		}
+	}
+}
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+    int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
+{
+	int i;
+	int numsurfaces;
+	vec3_t vTmp;
+	vec3_t v1, v2;
+	vec3_t vMins, vMaxs;
+	vec3_t vTransPoints[64];
+	vec3_t vTransProj;
+	vec3_t vTransProjDir;
+	bmodel_t* pBmodel;
+	surfaceType_t* surfaces[64];
+	int returnedFragments;
+	int returnedPoints;
+	vec3_t normals[MAX_VERTS_ON_POLY+2];
+	float dists[MAX_VERTS_ON_POLY+2];
+
+    tr.viewCount++;
+
+    pBmodel = &tr.world->bmodels[bmodel];
+
+	if (numPoints > 64) {
+		numPoints = 64;
+	}
+
+	if (vAngles[0] || vAngles[1] || vAngles[2])
+	{
+		vec3_t axis[3];
+
+		AngleVectorsLeft(vAngles, axis[0], axis[1], axis[2]);
+	
+		for (i = 0; i < numPoints; i++) {
+			VectorSubtract(points[i], vOrigin, vTmp);
+			MatrixTransformVectorRight(axis, vTmp, vTransPoints[i]);
+		}
+
+		MatrixTransformVectorRight(axis, projection, vTransProj);
+	}
+	else
+	{
+        for (i = 0; i < numPoints; i++) {
+            VectorSubtract(points[i], vOrigin, vTransPoints[i]);
+		}
+
+		VectorCopy(projection, vTransProj);
+	}
+
+    VectorNormalize2(vTransProj, vTransProjDir);
+    ClearBounds(vMins, vMaxs);
+
+	for (i = 0; i < numPoints; i++) {
+		AddPointToBounds(vTransPoints[i], vMins, vMaxs);
+		VectorAdd(vTransPoints[i], vTransProj, vTmp);
+		AddPointToBounds(vTmp, vMins, vMaxs);
+		VectorMA(vTransPoints[i], -20.f, vTransProjDir, vTmp);
+		AddPointToBounds(vTmp, vMins, vMaxs);
+	}
+
+	for (i = 0; i < numPoints; i++) {
+		VectorSubtract(vTransPoints[(i + 1) % numPoints], vTransPoints[i], v1);
+		VectorAdd(vTransPoints[i], vTransProj, v2);
+		VectorSubtract(vTransPoints[i], v2, v2);
+		CrossProduct(v1, v2, normals[i]);
+		VectorNormalize(normals[i]);
+		dists[i] = DotProduct(normals[i], vTransPoints[i]);
+	}
+
+	VectorCopy(vTransProjDir, normals[numPoints]);
+	dists[numPoints] = DotProduct(normals[numPoints], vTransPoints[0]) - 32.f;
+
+	VectorCopy(vTransProjDir, normals[numPoints + 1]);
+	VectorInverse(normals[numPoints + 1]);
+	dists[numPoints + 1] = DotProduct(normals[numPoints + 1], vTransPoints[0]) - 20.f;
+
+	returnedPoints = 0;
+	returnedFragments = 0;
+	numsurfaces = 0;
+
+	R_BoxSurfacesForBModel_r(pBmodel, vMins, vMaxs, surfaces, ARRAY_LEN(surfaces), &numsurfaces, vTransProjDir);
+	if (!numsurfaces) {
+		return 0;
+	}
+
+    R_TessellateMarkFragments(
+        &returnedPoints,
+        &returnedFragments,
+        numsurfaces,
+        surfaces,
+        vTransProjDir,
+        numPoints + 2,
+        normals,
+        dists,
+        maxPoints,
+        pointBuffer,
+        maxFragments,
+        fragmentBuffer,
+        fRadiusSquared
+	);
+
+    return returnedFragments;
+}
\ No newline at end of file
diff --git a/code/renderergl1/tr_marks_permanent.c b/code/renderergl1/tr_marks_permanent.c
new file mode 100644
index 00000000..d23feb61
--- /dev/null
+++ b/code/renderergl1/tr_marks_permanent.c
@@ -0,0 +1,2001 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_marks_pernanent.c: permanent marks
+
+#include "tr_local.h"
+
+#define DCL_FILE_SIGNATURE   *(int *)"DCL "
+#define DCL_FILE_OLD_VERSION 1
+#define DCL_FILE_VERSION     2
+
+typedef struct lmEditPoly_s {
+    srfMarkFragment_t    surf;
+    shader_t            *shader;
+    int                  viewCount;
+    polyVert_t           verts[8];
+    struct lmEditPoly_s *pNextPoly;
+    mnode_t             *pLeafs[8];
+    int                  iNumLeafs;
+} lmEditPoly_t;
+
+typedef struct lmEditMarkDef_s {
+    struct lmEditMarkDef_s *pNextMark;
+    struct lmEditMarkDef_s *pPrevMark;
+    shader_t               *markShader;
+    vec3_t                  vPos;
+    vec3_t                  vProjection;
+    float                   fRadius;
+    float                   fHeightScale;
+    float                   fWidthScale;
+    float                   fRotation;
+    vec4_t                  color;
+    qboolean                bDoLighting;
+    lmEditPoly_t           *pMarkEditPolys;
+    int                     iNumEditPolys;
+    vec3_t                  vPathCorners[4];
+} lmEditMarkDef_t;
+
+typedef struct lmPoly_s {
+    srfMarkFragment_t surf;
+    shader_t         *shader;
+    int               viewCount;
+} lmPoly_t;
+
+typedef struct {
+    qboolean         bLevelMarksLoaded;
+    char             szDCLFilename[MAX_QPATH];
+    lmPoly_t        *pMarkFragments;
+    qboolean         bAutoApplySettings;
+    lmEditPoly_t    *pFreeEditPolys;
+    lmEditMarkDef_t  activeMarkDefs;
+    lmEditMarkDef_t *pFreeMarkDefs;
+    lmEditMarkDef_t *pCurrentMark;
+    qboolean         bPathLayingMode;
+    treadMark_t      treadMark;
+    lmEditMarkDef_t *pTreadMarkStartDecal;
+    lmEditMarkDef_t *pTreadMarkEndDecal;
+} lmGlobals_t;
+
+typedef struct {
+    int ident;
+    int version;
+    int checksum;
+    int iNumDecals;
+    int iNumFragments;
+} dclHeader_t;
+
+typedef struct {
+    char     shader[MAX_RES_NAME];
+    vec3_t   vPos;
+    vec3_t   vProjection;
+    float    fRadius;
+    float    fHeightScale;
+    float    fWidthScale;
+    float    fRotation;
+    vec4_t   color;
+    qboolean bDoLighting;
+} dclSavedMarkDef_t;
+
+typedef struct {
+    char shader[MAX_RES_NAME];
+    int  fogIndex;
+    int  iIndex;
+    int  iNumVerts;
+} dclSavedMarkPoly_t;
+
+cvar_t *dcl_editmode;
+cvar_t *dcl_showcurrent;
+cvar_t *dcl_autogetinfo;
+cvar_t *dcl_shiftstep;
+cvar_t *dcl_shader;
+cvar_t *dcl_radius;
+cvar_t *dcl_heightscale;
+cvar_t *dcl_widthscale;
+cvar_t *dcl_rotation;
+cvar_t *dcl_r;
+cvar_t *dcl_g;
+cvar_t *dcl_b;
+cvar_t *dcl_alpha;
+cvar_t *dcl_dolighting;
+cvar_t *dcl_doworld;
+cvar_t *dcl_doterrain;
+cvar_t *dcl_dobmodels;
+cvar_t *dcl_dostring;
+cvar_t *dcl_pathmode;
+cvar_t *dcl_maxsegment;
+cvar_t *dcl_minsegment;
+cvar_t *dcl_maxoffset;
+cvar_t *dcl_texturescale;
+
+static lmGlobals_t lm;
+
+vec3_t vec_upwards;
+
+lmEditMarkDef_t *R_AllocateMarkDef(void);
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+);
+void DCLC_Delete(void);
+void DCLC_GetInfo(void);
+
+/*
+=============
+DCLC_Save
+
+Save level marks into a DCL file
+=============
+*/
+void DCLC_Save(void)
+{
+    fileHandle_t       hFile;
+    dclHeader_t        header;
+    int                i, j;
+    int                iNumDecals, iNumFragments;
+    lmEditPoly_t      *pPoly;
+    lmEditMarkDef_t   *pMark;
+    bmodel_t          *pBmodel;
+    mnode_t           *pLeaf;
+    dclSavedMarkDef_t  saveMark;
+    dclSavedMarkPoly_t savePoly;
+    char               map_time[32];
+    int                littleValue;
+
+    hFile = ri.FS_OpenFileWrite(lm.szDCLFilename);
+    if (!hFile) {
+        ri.Printf(PRINT_ALL, "R_SaveDCLFile: couldn't write to %s\n", lm.szDCLFilename);
+    }
+
+    pMark         = lm.activeMarkDefs.pNextMark;
+    iNumDecals    = 0;
+    iNumFragments = 0;
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark, iNumDecals++) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; iNumFragments++) {
+            pPoly->viewCount = iNumFragments;
+            pPoly            = pPoly->pNextPoly;
+        }
+    }
+
+    header.ident         = DCL_FILE_SIGNATURE;
+    header.version       = LittleLong(DCL_FILE_VERSION);
+    header.checksum      = 0;
+    header.iNumDecals    = LittleLong(iNumDecals);
+    header.iNumFragments = LittleLong(iNumFragments);
+
+    ri.FS_Write(&header, sizeof(header), hFile);
+
+    //
+    // Write the map time
+    //
+    memset(map_time, 0, sizeof(map_time));
+    Q_strncpyz(map_time, ri.CM_MapTime(), sizeof(map_time));
+    ri.FS_Write(map_time, sizeof(map_time), hFile);
+
+    if (!iNumDecals) {
+        //
+        // Nothing to write
+        //
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        Q_strncpyz(saveMark.shader, pMark->markShader->name, sizeof(saveMark.shader));
+
+        saveMark.vPos[0]        = LittleFloat(pMark->vPos[0]);
+        saveMark.vPos[1]        = LittleFloat(pMark->vPos[1]);
+        saveMark.vPos[2]        = LittleFloat(pMark->vPos[2]);
+        saveMark.vProjection[0] = LittleFloat(pMark->vProjection[0]);
+        saveMark.vProjection[1] = LittleFloat(pMark->vProjection[1]);
+        saveMark.vProjection[2] = LittleFloat(pMark->vProjection[2]);
+
+        saveMark.fRadius      = LittleFloat(pMark->fRadius);
+        saveMark.fHeightScale = LittleFloat(pMark->fHeightScale);
+        saveMark.fWidthScale  = LittleFloat(pMark->fWidthScale);
+        saveMark.fRotation    = LittleFloat(pMark->fRotation);
+
+        saveMark.color[0] = LittleFloat(pMark->color[0]);
+        saveMark.color[1] = LittleFloat(pMark->color[1]);
+        saveMark.color[2] = LittleFloat(pMark->color[2]);
+        saveMark.color[3] = LittleFloat(pMark->color[3]);
+
+        saveMark.bDoLighting = LittleLong(pMark->bDoLighting);
+
+        ri.FS_Write(&saveMark, sizeof(saveMark), hFile);
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            Q_strncpyz(savePoly.shader, pMark->markShader->name, sizeof(savePoly.shader));
+
+            savePoly.fogIndex  = 0;
+            savePoly.iIndex    = LittleLong(pPoly->surf.iIndex);
+            savePoly.iNumVerts = LittleLong(pPoly->surf.numVerts);
+
+            ri.FS_Write(&savePoly, sizeof(savePoly), hFile);
+            ri.FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
+        }
+    }
+
+    for (i = 0; i < tr.world->numBmodels; i++) {
+        pBmodel = &tr.world->bmodels[i];
+
+        if (!pBmodel->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pBmodel->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pBmodel->iNumMarkFragment; i++) {
+            littleValue = ((lmPoly_t *)pBmodel->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+        pLeaf = &tr.world->nodes[i];
+
+        if (!pLeaf->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pLeaf->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+            littleValue = ((lmPoly_t *)pLeaf->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+}
+
+/*
+=============
+R_LevelMarksLoad
+
+Load level marks from a DCL file
+=============
+*/
+void R_LevelMarksLoad(const char *szBSPName)
+{
+    int          i;
+    int          iLength;
+    fileHandle_t hFile;
+    dclHeader_t  dclHeader;
+    const char  *real_map_time;
+    char         map_time[33];
+
+    if (lm.bLevelMarksLoaded) {
+        //
+        // Destroy and reallocate level marks
+        //
+
+        R_LevelMarksFree();
+        R_LevelMarksInit();
+    }
+
+    COM_StripExtension(szBSPName, lm.szDCLFilename, sizeof(lm.szDCLFilename));
+    Q_strcat(lm.szDCLFilename, sizeof(lm.szDCLFilename), ".dcl");
+
+    if (ri.FS_OpenFile(lm.szDCLFilename, &hFile, qtrue, qtrue) <= 0) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s not found\n", lm.szDCLFilename);
+        return;
+    }
+
+    lm.bLevelMarksLoaded = qtrue;
+
+    //
+    // Read the DCL file header
+    //
+
+    iLength = ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+    if (iLength < sizeof(dclHeader)) {
+        ri.FS_CloseFile(hFile);
+        ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+        return;
+    }
+
+    //
+    // Signature and version checks
+    //
+
+    if (dclHeader.ident != DCL_FILE_SIGNATURE) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s Seems to be an invalid DCL file\n", lm.szDCLFilename);
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
+        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
+    }
+
+    if (dclHeader.version != DCL_FILE_OLD_VERSION && dclHeader.version != DCL_FILE_VERSION) {
+        ri.Printf(
+            PRINT_ALL,
+            "R_LevelMarksLoad: %s is wrong version (%i should be %i)\n",
+            lm.szDCLFilename,
+            dclHeader.version,
+            DCL_FILE_VERSION
+        );
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    if (dclHeader.version == DCL_FILE_OLD_VERSION) {
+        //
+        // The old version has no map time
+        //
+        map_time[0] = 0;
+    } else {
+        map_time[32] = 0;
+        ri.FS_Read(map_time, sizeof(map_time) - 1, hFile);
+    }
+
+    ri.Printf(PRINT_ALL, "----------- Loading DCL file %s ---------\n", lm.szDCLFilename);
+
+    if (dcl_editmode->integer) {
+        dclSavedMarkDef_t saveMark;
+        lmEditMarkDef_t  *pMark;
+        qhandle_t         hShader;
+
+        //
+        // Load all editor-mode decals
+        //
+
+        for (i = 0; i < dclHeader.iNumDecals; i++) {
+            ri.FS_Read(&saveMark, sizeof(saveMark), hFile);
+
+            saveMark.vPos[0]        = LittleFloat(saveMark.vPos[0]);
+            saveMark.vPos[1]        = LittleFloat(saveMark.vPos[1]);
+            saveMark.vPos[2]        = LittleFloat(saveMark.vPos[2]);
+            saveMark.vProjection[0] = LittleFloat(saveMark.vProjection[0]);
+            saveMark.vProjection[1] = LittleFloat(saveMark.vProjection[1]);
+            saveMark.vProjection[2] = LittleFloat(saveMark.vProjection[2]);
+
+            saveMark.fRadius      = LittleFloat(saveMark.fRadius);
+            saveMark.fHeightScale = LittleFloat(saveMark.fHeightScale);
+            saveMark.fWidthScale  = LittleFloat(saveMark.fWidthScale);
+            saveMark.fRotation    = LittleFloat(saveMark.fRotation);
+
+            saveMark.color[0] = LittleFloat(saveMark.color[0]);
+            saveMark.color[1] = LittleFloat(saveMark.color[1]);
+            saveMark.color[2] = LittleFloat(saveMark.color[2]);
+            saveMark.color[3] = LittleFloat(saveMark.color[3]);
+
+            saveMark.bDoLighting = LittleLong(saveMark.bDoLighting);
+
+            pMark = R_AllocateMarkDef();
+            if (!pMark) {
+                break;
+            }
+
+            hShader = RE_RegisterShader(saveMark.shader);
+            if (hShader) {
+                pMark->markShader = R_GetShaderByHandle(hShader);
+            } else {
+                ri.Printf(PRINT_ALL, "Bad decal shader %s\n", saveMark.shader);
+                pMark->markShader = tr.defaultShader;
+            }
+
+            //
+            // Copy settings from the saved mark
+            // to the newly allocated mark def
+            //
+
+            VectorCopy(saveMark.vPos, pMark->vPos);
+            VectorCopy(saveMark.vProjection, pMark->vProjection);
+
+            pMark->fRadius      = saveMark.fRadius;
+            pMark->fWidthScale  = saveMark.fWidthScale;
+            pMark->fHeightScale = saveMark.fHeightScale;
+            pMark->fRotation    = saveMark.fRotation;
+
+            Vector4Copy(saveMark.color, pMark->color);
+            pMark->bDoLighting = saveMark.bDoLighting;
+
+            lm.pCurrentMark = pMark;
+
+            //
+            // Now add the loaded mark
+            //
+
+            if (!R_ApplyLevelDecal(pMark->vPos, pMark->vProjection, qtrue, qtrue, 0)) {
+                DCLC_Delete();
+            }
+        }
+    } else {
+        int                j;
+        int                iIndex;
+        dclSavedMarkPoly_t savePoly;
+        lmPoly_t          *pPoly;
+        shader_t          *shader;
+        qhandle_t          hShader;
+        char               szLastShaderName[MAX_RES_NAME];
+        bmodel_t          *pBmodel;
+        mnode_t           *pLeaf;
+
+        szLastShaderName[0] = 0;
+        real_map_time       = ri.CM_MapTime();
+
+        if (!*real_map_time || strcmp(real_map_time, map_time)) {
+            ri.Printf(PRINT_ALL, "!!! BSP file is newer than DCL file.\n");
+            ri.Printf(PRINT_ALL, "!!! The DCL file needs to be updated.\n");
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        if (!dclHeader.iNumDecals) {
+            //
+            // Nothing to load
+            //
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        //
+        // Skip editor stuff
+        //
+        ri.FS_Seek(hFile, sizeof(dclSavedMarkDef_t) * dclHeader.iNumDecals, FS_SEEK_CUR);
+
+        //
+        // Load all saved polys
+        //
+
+        lm.pMarkFragments = (lmPoly_t *)ri.Hunk_Alloc(sizeof(lmPoly_t) * dclHeader.iNumFragments, h_low);
+
+        for (i = 0; i < dclHeader.iNumFragments; i++) {
+            polyVert_t *pv;
+
+            ri.FS_Read(&savePoly, sizeof(savePoly), hFile);
+
+            savePoly.fogIndex  = LittleLong(savePoly.fogIndex);
+            savePoly.iIndex    = LittleLong(savePoly.iIndex);
+            savePoly.iNumVerts = LittleLong(savePoly.iNumVerts);
+
+            pPoly = &lm.pMarkFragments[i];
+
+            //
+            // Make sure to register the shader once
+            //
+            if (Q_stricmp(savePoly.shader, szLastShaderName)) {
+                hShader = RE_RegisterShader(savePoly.shader);
+                if (!hShader) {
+                    // Added in 2.30
+                    //  Don't mess with decal loading, so drop immediately
+                    Com_Error(ERR_DROP, "Decal file lists non-existant shader: %s", savePoly.shader);
+
+                    pPoly->shader           = tr.defaultShader;
+                    pPoly->surf.iIndex      = 0;
+                    pPoly->surf.surfaceType = SF_SKIP;
+                    pPoly->surf.numVerts    = 0;
+                    continue;
+                }
+
+                shader = R_GetShaderByHandle(hShader);
+                Q_strncpyz(szLastShaderName, savePoly.shader, sizeof(szLastShaderName));
+            }
+
+            pPoly->shader           = shader;
+            pPoly->surf.iIndex      = savePoly.iIndex;
+            pPoly->surf.surfaceType = SF_MARK_FRAG;
+
+            //
+            // Load vertices
+            //
+
+            pPoly->surf.numVerts = savePoly.iNumVerts;
+            pPoly->surf.verts    = (polyVert_t *)ri.Hunk_Alloc(sizeof(polyVert_t) * savePoly.iNumVerts, h_low);
+            ri.FS_Read(pPoly->surf.verts, sizeof(polyVert_t) * savePoly.iNumVerts, hFile);
+
+            for (j = 0; j < savePoly.iNumVerts; j++) {
+                pv = &pPoly->surf.verts[j];
+
+                pv->xyz[0] = LittleFloat(pv->xyz[0]);
+                pv->xyz[1] = LittleFloat(pv->xyz[1]);
+                pv->xyz[2] = LittleFloat(pv->xyz[2]);
+                pv->st[0]  = LittleFloat(pv->st[0]);
+                pv->st[1]  = LittleFloat(pv->st[1]);
+            }
+        }
+
+        //
+        // Load all brush models
+        //
+        for (i = 0; i < tr.world->numBmodels; i++) {
+            pBmodel = &tr.world->bmodels[i];
+
+            ri.FS_Read(&pBmodel->iNumMarkFragment, sizeof(int), hFile);
+            pBmodel->iNumMarkFragment = LittleLong(pBmodel->iNumMarkFragment);
+
+            //
+            // Load brush model fragments
+            //
+            if (pBmodel->iNumMarkFragment) {
+                pBmodel->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pBmodel->iNumMarkFragment, h_low);
+
+                for (j = 0; j < pBmodel->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pBmodel->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+
+        //
+        // Load all leafs
+        //
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            pLeaf = &tr.world->nodes[i];
+
+            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), hFile);
+            pLeaf->iNumMarkFragment = LittleLong(pLeaf->iNumMarkFragment);
+
+            if (pLeaf->iNumMarkFragment) {
+                pLeaf->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pLeaf->iNumMarkFragment, h_low);
+
+                //
+                // Load leaf fragments
+                //
+                for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pLeaf->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+    ri.Printf(0, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+}
+
+/*
+=============
+R_RemoveEditPolyFromPointerList
+
+=============
+*/
+void R_RemoveEditPolyFromPointerList(lmEditPoly_t *pPoly, void **pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    for (i = 0; i < *piNumFragments; i++, pFragmentList++) {
+        if (*pFragmentList == pPoly) {
+            *pFragmentList = NULL;
+        }
+
+        if (!*pFragmentList && i < *piNumFragments - 1) {
+            *pFragmentList   = pFragmentList[1];
+            pFragmentList[1] = NULL;
+        }
+    }
+
+    (*piNumFragments)--;
+}
+
+/*
+=============
+R_FreeMarkFragments
+
+Free up all allocated marks
+=============
+*/
+void R_FreeMarkFragments(lmEditMarkDef_t *pMark)
+{
+    lmEditPoly_t *pPoly;
+    int           i;
+
+    while ((pPoly = pMark->pMarkEditPolys)) {
+        pMark->pMarkEditPolys = pPoly->pNextPoly;
+
+        if (pPoly->surf.iIndex < 0) {
+            //
+            // It's a brush model
+            //
+            bmodel_t *pBmodel;
+
+            pBmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+
+            R_RemoveEditPolyFromPointerList(pPoly, pBmodel->pFirstMarkFragment, &pBmodel->iNumMarkFragment);
+            continue;
+        } else {
+            //
+            // It's a leaf
+            //
+            mnode_t *pLeaf;
+
+            for (i = 0; i < pPoly->iNumLeafs; i++) {
+                pLeaf = pPoly->pLeafs[i];
+
+                R_RemoveEditPolyFromPointerList(pPoly, pLeaf->pFirstMarkFragment, &pLeaf->iNumMarkFragment);
+            }
+        }
+
+        pPoly->pNextPoly  = lm.pFreeEditPolys;
+        lm.pFreeEditPolys = pPoly;
+    }
+
+    pMark->iNumEditPolys = 0;
+}
+
+/*
+=============
+R_InitMarkDef
+
+Applies default values to the specified mark definition
+=============
+*/
+void R_InitMarkDef(lmEditMarkDef_t *pMark)
+{
+    VectorClear(pMark->vPos);
+    VectorSet(pMark->vProjection, 0, 0, -1);
+    pMark->fRadius        = 8.0;
+    pMark->fHeightScale   = 1.0;
+    pMark->fWidthScale    = 1.0;
+    pMark->fRotation      = 0.0;
+    pMark->markShader     = tr.defaultShader;
+    pMark->color[0]       = NAN;
+    pMark->bDoLighting    = 1;
+    pMark->pMarkEditPolys = 0;
+    pMark->iNumEditPolys  = 0;
+}
+
+/*
+=============
+R_AllocateMarkDef
+
+Allocates a new mark definition for editing
+=============
+*/
+lmEditMarkDef_t *R_AllocateMarkDef(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    int              i;
+
+    if (!lm.pFreeMarkDefs) {
+        lm.pFreeMarkDefs = (lmEditMarkDef_t *)ri.Hunk_Alloc(sizeof(lmEditMarkDef_t) * MAX_MARK_FRAGMENTS, h_low);
+        if (!lm.pFreeMarkDefs) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_FRAGMENTS - 1; i++) {
+            lm.pFreeMarkDefs[i].pNextMark = &lm.pFreeMarkDefs[i + 1];
+        }
+        lm.pFreeMarkDefs[MAX_MARK_FRAGMENTS - 1].pNextMark = NULL;
+    }
+
+    pNewMark         = lm.pFreeMarkDefs;
+    lm.pFreeMarkDefs = lm.pFreeMarkDefs->pNextMark;
+
+    pNewMark->pNextMark = lm.activeMarkDefs.pNextMark;
+    pNewMark->pPrevMark = &lm.activeMarkDefs;
+
+    lm.activeMarkDefs.pNextMark->pPrevMark = pNewMark;
+    lm.activeMarkDefs.pNextMark            = pNewMark;
+
+    R_InitMarkDef(pNewMark);
+    return pNewMark;
+}
+
+/*
+=============
+R_AllocateEditPoly
+
+Allocates a new mark poly for editing
+=============
+*/
+lmEditPoly_t *R_AllocateEditPoly(void)
+{
+    lmEditPoly_t *pNewPoly;
+    int           i;
+
+    if (!lm.pFreeEditPolys) {
+        lm.pFreeEditPolys = (lmEditPoly_t *)ri.Hunk_Alloc(sizeof(lmEditPoly_t) * MAX_MARK_POLYVERTS, h_low);
+        if (!lm.pFreeEditPolys) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_POLYVERTS - 1; i++) {
+            lm.pFreeEditPolys[i].pNextPoly = &lm.pFreeEditPolys[i + 1];
+        }
+        lm.pFreeEditPolys[MAX_MARK_POLYVERTS - 1].pNextPoly = NULL;
+    }
+
+    pNewPoly                   = lm.pFreeEditPolys;
+    lm.pFreeEditPolys          = lm.pFreeEditPolys->pNextPoly;
+    pNewPoly->surf.surfaceType = SF_MARK_FRAG;
+    pNewPoly->surf.verts       = pNewPoly->verts;
+
+    return pNewPoly;
+}
+
+/*
+=============
+R_AddEditPolyToPointerList
+
+=============
+*/
+qboolean R_AddEditPolyToPointerList(lmEditPoly_t *pPoly, void ***pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    if (!*pFragmentList || (*pFragmentList)[*piNumFragments] == (void *)-1) {
+        void **pNewList = (void **)ri.Malloc((*piNumFragments + MAX_MARK_FRAGMENTS) * sizeof(void *));
+        if (!pNewList) {
+            return 0;
+        }
+
+        for (i = 0; i < *piNumFragments + MAX_MARK_FRAGMENTS; i++) {
+            pNewList[i] = NULL;
+        }
+        pNewList[*piNumFragments + MAX_MARK_FRAGMENTS - 1] = (void *)-1;
+
+        if (*pFragmentList) {
+            Com_Memcpy(pNewList, *pFragmentList, *piNumFragments * sizeof(void *));
+            ri.Free(*pFragmentList);
+        }
+
+        *pFragmentList = pNewList;
+    }
+
+    (*pFragmentList)[*piNumFragments] = pPoly;
+    (*piNumFragments)++;
+
+    return qtrue;
+}
+
+/*
+=============
+R_ApplyLevelDecal
+
+=============
+*/
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+)
+{
+    qboolean         bDoLighting;
+    qboolean         bDoMerge;
+    int              i, j, k, l;
+    int              iNumFragments;
+    float            fRadius;
+    float            fSScale, fTScale;
+    float            fR, fG, fB, fA;
+    float            fRoll;
+    shader_t        *shader;
+    qhandle_t        hShader;
+    lmEditMarkDef_t *pMark;
+    lmEditPoly_t    *pPoly;
+    vec3_t           vOrigin;
+    vec3_t           vProjection;
+    vec3_t           vTmp, vTmp2;
+    vec3_t           vNorm, vNorm2;
+    vec3_t           bounds[2];
+    markFragment_t   markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t  *mf, *mf2;
+    polyVert_t       verts[MAX_MARK_POLYVERTS];
+    bmodel_t        *pBModel;
+    mnode_t         *pNode;
+    int              iNumNewVerts, iNumMergeVerts;
+    int              iFirstEdgeVert, iFirstEdgeVert2;
+    polyVert_t      *pNewVerts[8];
+    polyVert_t      *pFragVerts;
+    polyVert_t      *pMergeVerts[16];
+    float            fDist, fDist2;
+
+    iFirstEdgeVert = iFirstEdgeVert2 = 0;
+
+    if (bUseCurrent && !lm.pCurrentMark) {
+        return NULL;
+    }
+
+    if (iPathIndex) {
+        shader = R_GetShaderByHandle(lm.treadMark.hTreadShader);
+
+        fRadius = lm.treadMark.fWidth;
+        fTScale = 1.0;
+        fSScale = 1.0;
+
+        fG = 1.0;
+        fR = 1.0;
+        fA = 1.0;
+        fB = 1.0;
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = -1.0;
+    } else if (bUseCurrent && bUseCurrentSettings) {
+        shader = lm.pCurrentMark->markShader;
+
+        fRadius = lm.pCurrentMark->fRadius;
+        fSScale = lm.pCurrentMark->fWidthScale;
+        fTScale = lm.pCurrentMark->fHeightScale;
+
+        fR = lm.pCurrentMark->color[0];
+        fG = lm.pCurrentMark->color[1];
+        fB = lm.pCurrentMark->color[2];
+        fA = lm.pCurrentMark->color[3];
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = lm.pCurrentMark->fRotation;
+    } else {
+        hShader = RE_RegisterShader(dcl_shader->string);
+        if (hShader) {
+            shader = R_GetShaderByHandle(hShader);
+        } else {
+            ri.Printf(PRINT_ALL, "Bad decal shader %s\n", dcl_shader->string);
+            shader = tr.defaultShader;
+        }
+
+        fRadius = dcl_radius->value;
+        fSScale = dcl_widthscale->value;
+        fTScale = dcl_heightscale->value;
+
+        fR = Q_clamp_float(dcl_r->value, 0.0, 1.0);
+        fG = Q_clamp_float(dcl_g->value, 0.0, 1.0);
+        fB = Q_clamp_float(dcl_b->value, 0.0, 1.0);
+        fA = Q_clamp_float(dcl_alpha->value, 0.0, 1.0);
+
+        bDoLighting = dcl_dolighting->integer != 0;
+        fRoll       = anglemod(dcl_rotation->value);
+    }
+
+    if (fRadius < 0.0) {
+        fRadius = 0.001;
+    }
+    if (fSScale < 0.0) {
+        fSScale = 0.001;
+    }
+    if (fTScale < 0.0) {
+        fTScale = 0.001;
+    }
+
+    VectorCopy(vPos, vOrigin);
+    VectorNormalize2(vDir, vProjection);
+
+    if (iPathIndex) {
+        iNumFragments =
+            ri.CG_PermanentTreadMarkDecal(&lm.treadMark, iPathIndex == 1, bDoLighting, markFragments, verts);
+    } else {
+        iNumFragments = ri.CG_PermanentMark(
+            vOrigin,
+            vProjection,
+            anglemod(fRoll + 90),
+            fSScale * fRadius,
+            fTScale * fRadius,
+            fR,
+            fG,
+            fB,
+            fA,
+            bDoLighting,
+            0.5,
+            0.5,
+            markFragments,
+            verts
+        );
+    }
+
+    if (!iNumFragments) {
+        return NULL;
+    }
+
+    if (bUseCurrent) {
+        pMark = lm.pCurrentMark;
+        R_FreeMarkFragments(lm.pCurrentMark);
+    } else {
+        pMark = R_AllocateMarkDef();
+        if (!pMark) {
+            return NULL;
+        }
+    }
+
+    VectorCopy(vOrigin, pMark->vPos);
+    VectorCopy(vProjection, pMark->vProjection);
+
+    pMark->markShader   = shader;
+    pMark->fRadius      = fRadius;
+    pMark->fWidthScale  = fSScale;
+    pMark->fHeightScale = fTScale;
+    VectorSet4(pMark->color, fR, fG, fB, fA);
+
+    pMark->bDoLighting = bDoLighting;
+    pMark->fRotation   = fRoll;
+
+    if (iPathIndex) {
+        if (iPathIndex == 1) {
+            VectorCopy(lm.treadMark.vStartVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vStartVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[3]);
+        } else {
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vEndVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vEndVerts[1], pMark->vPathCorners[3]);
+        }
+
+        VectorClear(vOrigin);
+
+        for (i = 0; i < 4; i++) {
+            VectorAdd(vOrigin, pMark->vPathCorners[i], vOrigin);
+        }
+
+        vOrigin[0] /= 4.0;
+        vOrigin[1] /= 4.0;
+        vOrigin[2] = vOrigin[2] / 4.0 + 16.0;
+        VectorCopy(vOrigin, pMark->vPos);
+    }
+
+    for (i = 0; i < iNumFragments; i++) {
+        mf = &markFragments[i];
+
+        if (!mf->numPoints) {
+            continue;
+        }
+
+        assert(mf->numPoints >= 3);
+
+        iNumNewVerts = mf->numPoints;
+        for (j = 0; j < mf->numPoints; ++j) {
+            pNewVerts[j] = &verts[mf->firstPoint + j];
+        }
+
+        VectorSubtract(pNewVerts[0]->xyz, pNewVerts[1]->xyz, vTmp);
+        VectorSubtract(pNewVerts[2]->xyz, pNewVerts[1]->xyz, vTmp2);
+        CrossProduct(vTmp, vTmp2, vNorm);
+        VectorNormalize(vNorm);
+
+        fDist = DotProduct(vNorm, pNewVerts[0]->xyz);
+
+        if (mf->iIndex <= 0) {
+            for (j = i + 1; j < iNumFragments; j++) {
+                mf2 = &markFragments[j];
+
+                if (!mf2->numPoints) {
+                    continue;
+                }
+                if (mf2->iIndex > 0 || mf->iIndex == mf2->iIndex) {
+                    continue;
+                }
+
+                pFragVerts = &verts[mf2->firstPoint];
+
+                if (fabs(DotProduct(vNorm, pFragVerts->xyz) - fDist) > 0.01) {
+                    continue;
+                }
+
+                VectorSubtract(pFragVerts[0].xyz, pFragVerts[1].xyz, vTmp);
+                VectorSubtract(pFragVerts[2].xyz, pFragVerts[1].xyz, vTmp2);
+                CrossProduct(vTmp, vTmp2, vNorm2);
+                VectorNormalize(vNorm2);
+
+                if (!VectorCompare(vNorm, vNorm2)) {
+                    continue;
+                }
+
+                bDoMerge = qfalse;
+                for (k = 0; k < iNumNewVerts; k++) {
+                    for (l = 0; l < mf2->numPoints; l++) {
+                        if (VectorCompare(pNewVerts[k]->xyz, pFragVerts[(l + 1) % mf2->numPoints].xyz)
+                            && VectorCompare(pNewVerts[(k + 1) % iNumNewVerts]->xyz, pFragVerts[l].xyz)) {
+                            bDoMerge        = 1;
+                            iFirstEdgeVert  = k;
+                            iFirstEdgeVert2 = l;
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        break;
+                    }
+                }
+
+                if (bDoMerge) {
+                    iNumMergeVerts = 0;
+                    for (k = 1; k < iNumNewVerts; ++k) {
+                        pMergeVerts[iNumMergeVerts++] = pNewVerts[(k + iFirstEdgeVert) % iNumNewVerts];
+                    }
+
+                    for (k = 1; k < mf2->numPoints; k++) {
+                        pMergeVerts[iNumMergeVerts++] = &pFragVerts[(k + iFirstEdgeVert2) % mf2->numPoints];
+                    }
+
+                    bDoMerge = qtrue;
+
+                    for (k = 0; k < iNumMergeVerts; k++) {
+                        VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                        CrossProduct(vNorm, vTmp, vNorm2);
+                        VectorNormalize(vNorm2);
+
+                        for (l = 0; l < iNumMergeVerts; l++) {
+                            if (l == k) {
+                                break;
+                            }
+
+                            if (DotProduct(pMergeVerts[l]->xyz, vNorm)
+                                > DotProduct(pMergeVerts[k]->xyz, vNorm2) + 0.01) {
+                                bDoMerge = qfalse;
+                                break;
+                            }
+                        }
+
+                        if (!bDoMerge) {
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        for (k = 0; k < iNumMergeVerts; k++) {
+                            VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                            VectorNormalize(vTmp);
+                            VectorSubtract(
+                                pMergeVerts[k]->xyz, pMergeVerts[(iNumMergeVerts + k - 1) % iNumMergeVerts]->xyz, vTmp
+                            );
+                            VectorNormalize(vTmp2);
+
+                            if (DotProduct(vTmp, vTmp2) > 0.999) {
+                                for (l = k + 1; l < iNumMergeVerts; l++) {
+                                    pMergeVerts[l - 1] = pMergeVerts[l];
+                                }
+                            }
+                        }
+
+                        if (iNumMergeVerts <= 8) {
+                            iNumNewVerts = iNumMergeVerts;
+                            for (k = 0; k < iNumMergeVerts; k++) {
+                                pNewVerts[k] = pMergeVerts[k];
+                            }
+
+                            mf2->numPoints = 0;
+                        }
+                    }
+                }
+            }
+        }
+
+        pPoly = R_AllocateEditPoly();
+        if (!pPoly) {
+            return pMark;
+        }
+
+        pPoly->shader        = shader;
+        pPoly->surf.numVerts = iNumNewVerts;
+
+        for (j = 0; j < iNumNewVerts; j++) {
+            memcpy(&pPoly->verts[j], pNewVerts[j], sizeof(polyVert_t));
+        }
+
+        pPoly->surf.iIndex = mf->iIndex;
+        pPoly->iNumLeafs   = 0;
+
+        if (mf->iIndex <= 0 || dcl_doworld->integer && dcl_doterrain->integer) {
+            if (mf->iIndex >= 0) {
+                if (dcl_doworld->integer) {
+                    ClearBounds(bounds[0], bounds[1]);
+                    VectorClear(vOrigin);
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorAdd(pPoly->verts[j].xyz, vNorm, vTmp);
+
+                        pNode = R_PointInLeaf(vTmp);
+                        if (pNode && pNode->contents != -1 && !(pNode->contents & CONTENTS_SOLID)) {
+                            for (k = 0; k < pPoly->iNumLeafs; k++) {
+                                if (pPoly->pLeafs[k] == pNode) {
+                                    break;
+                                }
+                            }
+
+                            if (k == pPoly->iNumLeafs) {
+                                R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                                pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                                pPoly->iNumLeafs++;
+                            }
+                        }
+
+                        AddPointToBounds(vTmp, bounds[0], bounds[1]);
+                        VectorAdd(vOrigin, vTmp, vOrigin);
+                    }
+
+                    VectorScale(vOrigin, 1.0 / pPoly->surf.numVerts, vOrigin);
+
+                    pNode = R_PointInLeaf(vOrigin);
+                    for (k = 0; k < pPoly->iNumLeafs; k++) {
+                        if (pPoly->pLeafs[k] == pNode) {
+                            break;
+                        }
+                    }
+
+                    if (k == pPoly->iNumLeafs) {
+                        R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                        pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                        pPoly->iNumLeafs++;
+                    }
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            } else {
+                if (dcl_dobmodels->integer) {
+                    R_AddEditPolyToPointerList(
+                        pPoly,
+                        &tr.world->bmodels[-mf->iIndex].pFirstMarkFragment,
+                        &tr.world->bmodels[-mf->iIndex].iNumMarkFragment
+                    );
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            }
+        }
+    }
+
+    return pMark;
+}
+
+/*
+=============
+DCLC_Make
+
+=============
+*/
+void DCLC_Make(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    vec3_t           vProjection;
+
+    VectorNegate(tr.refdef.viewaxis[0], vProjection);
+
+    pNewMark = R_ApplyLevelDecal(tr.refdef.vieworg, vProjection, qfalse, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Reapply
+
+=============
+*/
+void DCLC_Reapply(void)
+{
+    lmEditMarkDef_t *pNewMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    pNewMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Delete
+
+=============
+*/
+void DCLC_Delete(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    R_FreeMarkFragments(lm.pCurrentMark);
+    lm.pCurrentMark = pMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = pMark->pPrevMark;
+        if (lm.pCurrentMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = NULL;
+        }
+    }
+
+    pMark->pPrevMark->pNextMark = pMark->pNextMark;
+    pMark->pNextMark->pPrevMark = pMark->pPrevMark;
+    pMark->pNextMark            = lm.pFreeMarkDefs;
+    pMark->pPrevMark            = 0;
+    lm.pFreeMarkDefs            = pMark;
+
+    if (dcl_autogetinfo->integer) {
+        lm.bAutoApplySettings = qtrue;
+        DCLC_GetInfo();
+    } else {
+        lm.bAutoApplySettings = qfalse;
+    }
+}
+
+/*
+=============
+DCLC_SelectNext
+
+=============
+*/
+void DCLC_SelectNext(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pPrevMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pPrevMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        if (lm.activeMarkDefs.pPrevMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectPrev
+
+=============
+*/
+void DCLC_SelectPrev(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pNextMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        if (lm.activeMarkDefs.pNextMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectCh
+
+=============
+*/
+void DCLC_SelectCh(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_SelectChNxt
+
+=============
+*/
+void DCLC_SelectChNxt(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_GetInfo
+
+=============
+*/
+void DCLC_GetInfo(void)
+{
+    if (!lm.pCurrentMark) {
+        return;
+    }
+
+    if (lm.pCurrentMark->fRotation == -1) {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+    } else {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        ri.Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
+        ri.Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
+        ri.Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
+        ri.Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
+    }
+
+    ri.Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
+    ri.Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
+
+    lm.bAutoApplySettings = qtrue;
+}
+
+/*
+=============
+DCLC_ShiftUp
+
+=============
+*/
+void DCLC_ShiftUp(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftDown
+
+=============
+*/
+void DCLC_ShiftDown(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftLeft
+
+=============
+*/
+void DCLC_ShiftLeft(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftRight
+
+=============
+*/
+void DCLC_ShiftRight(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_RandomRoll
+
+=============
+*/
+void DCLC_RandomRoll(void)
+{
+    ri.Cvar_SetValue("dcl_rotation", random() * 360.0);
+}
+
+/*
+=============
+R_LevelMarksInit
+
+Initialize the level mark system with variables and commands
+=============
+*/
+void R_LevelMarksInit()
+{
+    memset(&lm, 0, sizeof(lm));
+
+    dcl_editmode     = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
+    dcl_showcurrent  = ri.Cvar_Get("dcl_showcurrent", "1", 0);
+    dcl_autogetinfo  = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
+    dcl_shiftstep    = ri.Cvar_Get("dcl_shiftstep", "4", 0);
+    dcl_shader       = ri.Cvar_Get("dcl_shader", "blastmark", 0);
+    dcl_radius       = ri.Cvar_Get("dcl_radius", "16", 0);
+    dcl_heightscale  = ri.Cvar_Get("dcl_heightscale", "1", 0);
+    dcl_widthscale   = ri.Cvar_Get("dcl_widthscale", "1", 0);
+    dcl_rotation     = ri.Cvar_Get("dcl_rotation", "0", 0);
+    dcl_r            = ri.Cvar_Get("dcl_r", "1", 0);
+    dcl_g            = ri.Cvar_Get("dcl_g", "1", 0);
+    dcl_b            = ri.Cvar_Get("dcl_b", "1", 0);
+    dcl_alpha        = ri.Cvar_Get("dcl_alpha", "1", 0);
+    dcl_dolighting   = ri.Cvar_Get("dcl_dolighting", "1", 0);
+    dcl_doworld      = ri.Cvar_Get("dcl_doworld", "1", 0);
+    dcl_doterrain    = ri.Cvar_Get("dcl_doterrain", "1", 0);
+    dcl_dobmodels    = ri.Cvar_Get("dcl_dobmodels", "1", 0);
+    dcl_dostring     = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
+    dcl_pathmode     = ri.Cvar_Get("dcl_pathmode", "0", 0);
+    dcl_maxsegment   = ri.Cvar_Get("dcl_maxsegment", "512", 0);
+    dcl_minsegment   = ri.Cvar_Get("dcl_minsegment", "24", 0);
+    dcl_maxoffset    = ri.Cvar_Get("dcl_maxoffset", "10", 0);
+    dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
+
+    if (dcl_editmode->integer) {
+        ri.Cmd_AddCommand("dclc_make", DCLC_Make);
+        ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
+        ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
+        ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
+        ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
+        ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
+        ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
+        ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
+        ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
+        ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
+        ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
+        ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
+        ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
+        ri.Cmd_AddCommand("dclc_save", DCLC_Save);
+
+        lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
+        lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
+    }
+}
+
+/*
+=============
+R_LevelMarksFree
+
+Remove level marks commands and deallocate all memory
+=============
+*/
+void R_LevelMarksFree()
+{
+    int i;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    ri.Cmd_RemoveCommand("dclc_make");
+    ri.Cmd_RemoveCommand("dclc_reapply");
+    ri.Cmd_RemoveCommand("dclc_delete");
+    ri.Cmd_RemoveCommand("dclc_selectnext");
+    ri.Cmd_RemoveCommand("dclc_selectprev");
+    ri.Cmd_RemoveCommand("dclc_selectch");
+    ri.Cmd_RemoveCommand("dclc_selectchnxt");
+    ri.Cmd_RemoveCommand("dclc_getinfo");
+    ri.Cmd_RemoveCommand("dclc_shiftup");
+    ri.Cmd_RemoveCommand("dclc_shiftdown");
+    ri.Cmd_RemoveCommand("dclc_shiftleft");
+    ri.Cmd_RemoveCommand("dclc_shiftright");
+    ri.Cmd_RemoveCommand("dclc_randomroll");
+    ri.Cmd_RemoveCommand("dclc_save");
+
+    if (tr.world) {
+        for (i = 0; i < tr.world->numBmodels; i++) {
+            bmodel_t *pBmodel = &tr.world->bmodels[i];
+
+            if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment) {
+                ri.Free(pBmodel->pFirstMarkFragment);
+                pBmodel->pFirstMarkFragment = NULL;
+                pBmodel->iNumMarkFragment   = 0;
+            }
+        }
+
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            mnode_t *pLeaf = &tr.world->nodes[i];
+
+            if (pLeaf->iNumMarkFragment && pLeaf->pFirstMarkFragment) {
+                ri.Free(pLeaf->pFirstMarkFragment);
+                pLeaf->pFirstMarkFragment = NULL;
+                pLeaf->iNumMarkFragment   = 0;
+            }
+        }
+    }
+}
+
+/*
+=============
+R_InitTreadMark
+
+=============
+*/
+static void R_InitTreadMark(treadMark_t *treadMark)
+{
+    treadMark->iReferenceNumber = 0;
+    treadMark->iLastTime        = 0;
+    treadMark->hTreadShader     = 0;
+    treadMark->iState           = 0;
+    treadMark->fWidth           = 0;
+
+    VectorClear(treadMark->vStartDir);
+    VectorClear(treadMark->vStartVerts[0]);
+    VectorClear(treadMark->vStartVerts[1]);
+    treadMark->fStartTexCoord = 0;
+    treadMark->fStartAlpha    = 0;
+
+    VectorClear(treadMark->vMidPos);
+    VectorClear(treadMark->vMidVerts[0]);
+    VectorClear(treadMark->vMidVerts[1]);
+    treadMark->fMidTexCoord = 0;
+    treadMark->fMidAlpha    = 0;
+
+    VectorClear(treadMark->vEndPos);
+    VectorClear(treadMark->vEndVerts[0]);
+    VectorClear(treadMark->vEndVerts[1]);
+    treadMark->fEndTexCoord = 0;
+    treadMark->fEndAlpha    = 0;
+}
+
+/*
+=============
+R_UpdateLevelMarksSystem
+
+Draw lines for editing
+=============
+*/
+void R_UpdateLevelMarksSystem()
+{
+    int   iReturn;
+    float fAlpha;
+    float fTexScale;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    if (dcl_pathmode->integer) {
+        if (!lm.bPathLayingMode) {
+            R_InitTreadMark(&lm.treadMark);
+            lm.treadMark.iLastTime  = -1000;
+            lm.pTreadMarkStartDecal = NULL;
+            lm.pTreadMarkEndDecal   = NULL;
+            lm.bPathLayingMode      = qtrue;
+        }
+
+        lm.treadMark.hTreadShader = RE_RegisterShader(dcl_shader->string);
+        lm.treadMark.fWidth       = Q_clamp_float(dcl_radius->value * dcl_widthscale->value, 2, 1024);
+
+        fAlpha    = Q_clamp_float(dcl_alpha->value, 0, 1);
+        fTexScale = 1.0 / dcl_texturescale->value;
+        iReturn   = ri.CG_PermanentUpdateTreadMark(
+            &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+        );
+
+        if (iReturn == 1) {
+            lm.pTreadMarkStartDecal = lm.pTreadMarkEndDecal;
+            lm.pTreadMarkEndDecal   = NULL;
+
+            ri.CG_PermanentUpdateTreadMark(
+                &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+            );
+        }
+
+        if (iReturn != -1) {
+            if (!lm.pTreadMarkEndDecal) {
+                lm.pTreadMarkEndDecal = R_AllocateMarkDef();
+            }
+
+            if (lm.pTreadMarkEndDecal) {
+                lm.pCurrentMark = lm.pTreadMarkEndDecal;
+                lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 2);
+                if (!lm.pCurrentMark) {
+                    R_FreeMarkFragments(lm.pTreadMarkEndDecal);
+                }
+            }
+
+            if (lm.treadMark.iState == 3) {
+                if (!lm.pTreadMarkStartDecal) {
+                    lm.pTreadMarkStartDecal = R_AllocateMarkDef();
+                }
+
+                if (lm.pTreadMarkStartDecal) {
+                    lm.pCurrentMark = lm.pTreadMarkStartDecal;
+                    lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 1);
+                    if (!lm.pCurrentMark) {
+                        R_FreeMarkFragments(lm.pTreadMarkStartDecal);
+                    }
+                }
+            }
+        }
+
+        if (lm.pTreadMarkEndDecal) {
+            lm.pCurrentMark = lm.pTreadMarkEndDecal;
+        } else if (lm.pTreadMarkStartDecal) {
+            lm.pCurrentMark = lm.pTreadMarkStartDecal;
+        }
+
+    } else if (lm.bPathLayingMode) {
+        lm.bPathLayingMode = qfalse;
+    }
+
+    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation != -1) {
+        qboolean bDoUpdate = qfalse;
+        float    f;
+
+        if (dcl_shader->modified) {
+            shader_t *shader;
+            qhandle_t hShader;
+
+            hShader = RE_RegisterShader(dcl_shader->string);
+            if (hShader) {
+                shader = R_GetShaderByHandle(hShader);
+                if (shader != tr.defaultShader && lm.pCurrentMark->markShader != shader) {
+                    lm.pCurrentMark->markShader = shader;
+                    // Set the decal radius
+                    ri.Cvar_SetValue("dcl_radius", 16.0);
+                    dcl_radius->modified = qfalse;
+
+                    // Set the decal scale
+                    ri.Cvar_SetValue(
+                        "dcl_heightscale", shader->unfoggedStages[0]->bundle[0].image[0]->height / 16.0 * 0.5
+                    );
+                    ri.Cvar_SetValue("dcl_widthscale", shader->unfoggedStages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
+
+                    bDoUpdate = qtrue;
+                }
+            }
+            dcl_shader->modified = 0;
+        }
+
+        if (dcl_radius->modified) {
+            f = dcl_radius->value;
+            if (lm.pCurrentMark->fRadius != f) {
+                lm.pCurrentMark->fRadius = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_radius->modified = qfalse;
+        }
+
+        if (dcl_heightscale->modified) {
+            f = dcl_heightscale->value;
+            if (lm.pCurrentMark->fHeightScale != f) {
+                lm.pCurrentMark->fHeightScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_heightscale->modified = qfalse;
+        }
+        if (dcl_widthscale->modified) {
+            f = dcl_widthscale->value;
+            if (lm.pCurrentMark->fWidthScale != f) {
+                lm.pCurrentMark->fWidthScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_widthscale->modified = qfalse;
+        }
+
+        if (dcl_rotation->modified) {
+            f = anglemod(dcl_rotation->value);
+            if (lm.pCurrentMark->fRotation != f) {
+                lm.pCurrentMark->fRotation = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_rotation->modified = qfalse;
+        }
+
+        if (dcl_r->modified) {
+            f = Q_clamp_float(dcl_r->value, 0, 1);
+            if (lm.pCurrentMark->color[0] != f) {
+                lm.pCurrentMark->color[0] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_r->modified = qfalse;
+        }
+        if (dcl_g->modified) {
+            f = Q_clamp_float(dcl_g->value, 0, 1);
+            if (lm.pCurrentMark->color[1] != f) {
+                lm.pCurrentMark->color[1] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_g->modified = qfalse;
+        }
+        if (dcl_b->modified) {
+            f = Q_clamp_float(dcl_b->value, 0, 1);
+            if (lm.pCurrentMark->color[2] != f) {
+                lm.pCurrentMark->color[2] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_b->modified = qfalse;
+        }
+        if (dcl_alpha->modified) {
+            f = Q_clamp_float(dcl_alpha->value, 0, 1);
+            if (lm.pCurrentMark->color[3] != f) {
+                lm.pCurrentMark->color[3] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_alpha->modified = qfalse;
+        }
+
+        if (dcl_dolighting->modified) {
+            qboolean bDoLighting = dcl_dolighting->integer != 0;
+            if (lm.pCurrentMark->bDoLighting != bDoLighting) {
+                lm.pCurrentMark->bDoLighting = bDoLighting;
+                bDoUpdate                    = 1;
+            }
+            dcl_dolighting->modified = 0;
+        }
+
+        if (bDoUpdate) {
+            lm.pCurrentMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qtrue, 0);
+        }
+    }
+
+    if (dcl_showcurrent->integer && lm.pCurrentMark && lm.pCurrentMark->iNumEditPolys) {
+        float          fColor;
+        float          fLength;
+        int            j;
+        int            iEntNum;
+        lmEditPoly_t  *pPoly;
+        polyVert_t    *pVert, *pVert2;
+        polyVert_t     verts[8];
+        trRefEntity_t *ent;
+        bmodel_t      *bmodel, *lastbmodel;
+        model_t       *pModel;
+        vec3_t         vOrigin;
+        vec3_t         axis[3];
+        vec3_t         vPos, vPos2;
+        vec3_t         polyaxis[3];
+
+        iEntNum    = 0;
+        ent        = NULL;
+        lastbmodel = NULL;
+        vectoangles(lm.pCurrentMark->vProjection, vPos);
+
+        vPos[2] = anglemod(vPos[2] + lm.pCurrentMark->fRotation);
+        AngleVectorsLeft(vPos, polyaxis[0], polyaxis[1], polyaxis[2]);
+        VectorNormalize2(lm.pCurrentMark->vProjection, polyaxis[0]);
+        PerpendicularVector(polyaxis[1], polyaxis[0]);
+        RotatePointAroundVector(polyaxis[2], polyaxis[0], polyaxis[1], anglemod(lm.pCurrentMark->fRotation + 90.0));
+        CrossProduct(polyaxis[0], polyaxis[2], polyaxis[1]);
+
+        fColor = sin(tr.refdef.time / 500.0) / 4.0 + 0.6;
+
+        for (pPoly = lm.pCurrentMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            if (pPoly->surf.iIndex > 0) {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, 1.0 - fColor, 0.1, 1.0);
+                }
+            } else if (pPoly->surf.iIndex < 0) {
+                bmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+                if (bmodel != lastbmodel) {
+                    //
+                    // Find the matching entity
+                    //
+
+                    ent = &tr.refdef.entities[0];
+                    for (iEntNum = 0; iEntNum < tr.refdef.num_entities; iEntNum++) {
+                        ent = &tr.refdef.entities[iEntNum];
+
+                        pModel = R_GetModelByHandle(ent->e.hModel);
+                        if (pModel->type == MOD_BRUSH && pModel->d.bmodel == bmodel) {
+                            break;
+                        }
+                    }
+
+                    VectorCopy(ent->e.origin, vOrigin);
+                    AxisCopy(ent->e.axis, axis);
+                }
+
+                if (iEntNum != tr.refdef.num_entities) {
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        MatrixTransformVector(pPoly->verts[j].xyz, axis, pPoly->verts[j].xyz);
+                        VectorAdd(pPoly->verts[j].xyz, vOrigin, pPoly->verts[j].xyz);
+                    }
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                        VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                        VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                    }
+                }
+            } else {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                }
+            }
+        }
+
+        //
+        // Draw the front
+        //
+
+        fLength = (lm.pCurrentMark->fWidthScale + lm.pCurrentMark->fHeightScale) * lm.pCurrentMark->fRadius * 0.75;
+        if (fLength < 4) {
+            fLength = 4;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[0], vPos);
+
+        R_DebugLine(lm.pCurrentMark->vPos, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the right
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fWidthScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[1], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[1], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the up
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fHeightScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[2], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[2], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+    }
+}
+
+/*
+=============
+R_AddPermanentMarkFragmentSurfaces
+
+=============
+*/
+void R_AddPermanentMarkFragmentSurfaces(void **pFirstMarkFragment, int iNumMarkFragment)
+{
+    int       i;
+    lmPoly_t *pPoly;
+
+    for (i = 0; i < iNumMarkFragment; i++) {
+        pPoly = (lmPoly_t *)pFirstMarkFragment[i];
+
+        if (pPoly->viewCount == tr.viewCount) {
+            continue;
+        }
+        pPoly->viewCount = tr.viewCount;
+
+        R_AddDrawSurf(&pPoly->surf.surfaceType, pPoly->shader, 0);
+    }
+}
\ No newline at end of file
diff --git a/code/renderergl1/tr_mesh.c b/code/renderergl1/tr_mesh.c
deleted file mode 100644
index 4cdd9fc2..00000000
--- a/code/renderergl1/tr_mesh.c
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_mesh.c: triangle model functions
-
-#include "tr_local.h"
-
-static float ProjectRadius( float r, vec3_t location )
-{
-	float pr;
-	float dist;
-	float c;
-	vec3_t	p;
-	float	projected[4];
-
-	c = DotProduct( tr.viewParms.or.axis[0], tr.viewParms.or.origin );
-	dist = DotProduct( tr.viewParms.or.axis[0], location ) - c;
-
-	if ( dist <= 0 )
-		return 0;
-
-	p[0] = 0;
-	p[1] = fabs( r );
-	p[2] = -dist;
-
-	projected[0] = p[0] * tr.viewParms.projectionMatrix[0] + 
-		           p[1] * tr.viewParms.projectionMatrix[4] +
-				   p[2] * tr.viewParms.projectionMatrix[8] +
-				   tr.viewParms.projectionMatrix[12];
-
-	projected[1] = p[0] * tr.viewParms.projectionMatrix[1] + 
-		           p[1] * tr.viewParms.projectionMatrix[5] +
-				   p[2] * tr.viewParms.projectionMatrix[9] +
-				   tr.viewParms.projectionMatrix[13];
-
-	projected[2] = p[0] * tr.viewParms.projectionMatrix[2] + 
-		           p[1] * tr.viewParms.projectionMatrix[6] +
-				   p[2] * tr.viewParms.projectionMatrix[10] +
-				   tr.viewParms.projectionMatrix[14];
-
-	projected[3] = p[0] * tr.viewParms.projectionMatrix[3] + 
-		           p[1] * tr.viewParms.projectionMatrix[7] +
-				   p[2] * tr.viewParms.projectionMatrix[11] +
-				   tr.viewParms.projectionMatrix[15];
-
-
-	pr = projected[1] / projected[3];
-
-	if ( pr > 1.0f )
-		pr = 1.0f;
-
-	return pr;
-}
-
-/*
-=============
-R_CullModel
-=============
-*/
-static int R_CullModel( md3Header_t *header, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	md3Frame_t	*oldFrame, *newFrame;
-	int			i;
-
-	// compute frame pointers
-	newFrame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.frame;
-	oldFrame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.oldframe;
-
-	// cull bounding sphere ONLY if this is not an upscaled entity
-	if ( !ent->e.nonNormalizedAxes )
-	{
-		if ( ent->e.frame == ent->e.oldframe )
-		{
-			switch ( R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius ) )
-			{
-			case CULL_OUT:
-				tr.pc.c_sphere_cull_md3_out++;
-				return CULL_OUT;
-
-			case CULL_IN:
-				tr.pc.c_sphere_cull_md3_in++;
-				return CULL_IN;
-
-			case CULL_CLIP:
-				tr.pc.c_sphere_cull_md3_clip++;
-				break;
-			}
-		}
-		else
-		{
-			int sphereCull, sphereCullB;
-
-			sphereCull  = R_CullLocalPointAndRadius( newFrame->localOrigin, newFrame->radius );
-			if ( newFrame == oldFrame ) {
-				sphereCullB = sphereCull;
-			} else {
-				sphereCullB = R_CullLocalPointAndRadius( oldFrame->localOrigin, oldFrame->radius );
-			}
-
-			if ( sphereCull == sphereCullB )
-			{
-				if ( sphereCull == CULL_OUT )
-				{
-					tr.pc.c_sphere_cull_md3_out++;
-					return CULL_OUT;
-				}
-				else if ( sphereCull == CULL_IN )
-				{
-					tr.pc.c_sphere_cull_md3_in++;
-					return CULL_IN;
-				}
-				else
-				{
-					tr.pc.c_sphere_cull_md3_clip++;
-				}
-			}
-		}
-	}
-	
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldFrame->bounds[0][i] < newFrame->bounds[0][i] ? oldFrame->bounds[0][i] : newFrame->bounds[0][i];
-		bounds[1][i] = oldFrame->bounds[1][i] > newFrame->bounds[1][i] ? oldFrame->bounds[1][i] : newFrame->bounds[1][i];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_md3_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_md3_out++;
-		return CULL_OUT;
-	}
-}
-
-
-/*
-=================
-R_ComputeLOD
-
-=================
-*/
-int R_ComputeLOD( trRefEntity_t *ent ) {
-	float radius;
-	float flod, lodscale;
-	float projectedRadius;
-	md3Frame_t *frame;
-	mdrHeader_t *mdr;
-	mdrFrame_t *mdrframe;
-	int lod;
-
-	if ( tr.currentModel->numLods < 2 )
-	{
-		// model has only 1 LOD level, skip computations and bias
-		lod = 0;
-	}
-	else
-	{
-		// multiple LODs exist, so compute projected bounding sphere
-		// and use that as a criteria for selecting LOD
-
-		if(tr.currentModel->type == MOD_MDR)
-		{
-			int frameSize;
-			mdr = (mdrHeader_t *) tr.currentModel->modelData;
-			frameSize = (size_t) (&((mdrFrame_t *)0)->bones[mdr->numBones]);
-			
-			mdrframe = (mdrFrame_t *) ((byte *) mdr + mdr->ofsFrames + frameSize * ent->e.frame);
-			
-			radius = RadiusFromBounds(mdrframe->bounds[0], mdrframe->bounds[1]);
-		}
-		else
-		{
-			frame = ( md3Frame_t * ) ( ( ( unsigned char * ) tr.currentModel->md3[0] ) + tr.currentModel->md3[0]->ofsFrames );
-
-			frame += ent->e.frame;
-
-			radius = RadiusFromBounds( frame->bounds[0], frame->bounds[1] );
-		}
-
-		if ( ( projectedRadius = ProjectRadius( radius, ent->e.origin ) ) != 0 )
-		{
-			lodscale = r_lodscale->value;
-			if (lodscale > 20) lodscale = 20;
-			flod = 1.0f - projectedRadius * lodscale;
-		}
-		else
-		{
-			// object intersects near view plane, e.g. view weapon
-			flod = 0;
-		}
-
-		flod *= tr.currentModel->numLods;
-		lod = ri.ftol(flod);
-
-		if ( lod < 0 )
-		{
-			lod = 0;
-		}
-		else if ( lod >= tr.currentModel->numLods )
-		{
-			lod = tr.currentModel->numLods - 1;
-		}
-	}
-
-	lod += r_lodbias->integer;
-	
-	if ( lod >= tr.currentModel->numLods )
-		lod = tr.currentModel->numLods - 1;
-	if ( lod < 0 )
-		lod = 0;
-
-	return lod;
-}
-
-/*
-=================
-R_ComputeFogNum
-
-=================
-*/
-int R_ComputeFogNum( md3Header_t *header, trRefEntity_t *ent ) {
-	int				i, j;
-	fog_t			*fog;
-	md3Frame_t		*md3Frame;
-	vec3_t			localOrigin;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	// FIXME: non-normalized axis issues
-	md3Frame = ( md3Frame_t * ) ( ( byte * ) header + header->ofsFrames ) + ent->e.frame;
-	VectorAdd( ent->e.origin, md3Frame->localOrigin, localOrigin );
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - md3Frame->radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + md3Frame->radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-/*
-=================
-R_AddMD3Surfaces
-
-=================
-*/
-void R_AddMD3Surfaces( trRefEntity_t *ent ) {
-	int				i;
-	md3Header_t		*header = NULL;
-	md3Surface_t	*surface = NULL;
-	md3Shader_t		*md3Shader = NULL;
-	shader_t		*shader = NULL;
-	int				cull;
-	int				lod;
-	int				fogNum;
-	qboolean		personalModel;
-
-	// don't add third_person objects if not in a portal
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-
-	if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
-		ent->e.frame %= tr.currentModel->md3[0]->numFrames;
-		ent->e.oldframe %= tr.currentModel->md3[0]->numFrames;
-	}
-
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ( (ent->e.frame >= tr.currentModel->md3[0]->numFrames) 
-		|| (ent->e.frame < 0)
-		|| (ent->e.oldframe >= tr.currentModel->md3[0]->numFrames)
-		|| (ent->e.oldframe < 0) ) {
-			ri.Printf( PRINT_DEVELOPER, "R_AddMD3Surfaces: no such frame %d to %d for '%s'\n",
-				ent->e.oldframe, ent->e.frame,
-				tr.currentModel->name );
-			ent->e.frame = 0;
-			ent->e.oldframe = 0;
-	}
-
-	//
-	// compute LOD
-	//
-	lod = R_ComputeLOD( ent );
-
-	header = tr.currentModel->md3[lod];
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_CullModel ( header, ent );
-	if ( cull == CULL_OUT ) {
-		return;
-	}
-
-	//
-	// set up lighting now that we know we aren't culled
-	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	//
-	// see if we are in a fog volume
-	//
-	fogNum = R_ComputeFogNum( header, ent );
-
-	//
-	// draw all surfaces
-	//
-	surface = (md3Surface_t *)( (byte *)header + header->ofsSurfaces );
-	for ( i = 0 ; i < header->numSurfaces ; i++ ) {
-
-		if ( ent->e.customShader ) {
-			shader = R_GetShaderByHandle( ent->e.customShader );
-		} else if ( ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins ) {
-			skin_t *skin;
-			int		j;
-
-			skin = R_GetSkinByHandle( ent->e.customSkin );
-
-			// match the surface name to something in the skin file
-			shader = tr.defaultShader;
-			for ( j = 0 ; j < skin->numSurfaces ; j++ ) {
-				// the names have both been lowercased
-				if ( !strcmp( skin->surfaces[j].name, surface->name ) ) {
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-			if (shader == tr.defaultShader) {
-				ri.Printf( PRINT_DEVELOPER, "WARNING: no shader for surface %s in skin %s\n", surface->name, skin->name);
-			}
-			else if (shader->defaultShader) {
-				ri.Printf( PRINT_DEVELOPER, "WARNING: shader %s in skin %s not found\n", shader->name, skin->name);
-			}
-		} else if ( surface->numShaders <= 0 ) {
-			shader = tr.defaultShader;
-		} else {
-			md3Shader = (md3Shader_t *) ( (byte *)surface + surface->ofsShaders );
-			md3Shader += ent->e.skinNum % surface->numShaders;
-			shader = tr.shaders[ md3Shader->shaderIndex ];
-		}
-
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-			&& r_shadows->integer == 2 
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, qfalse );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, qfalse );
-		}
-
-		// don't add third_person objects if not viewing through a portal
-		if ( !personalModel ) {
-			R_AddDrawSurf( (void *)surface, shader, fogNum, qfalse );
-		}
-
-		surface = (md3Surface_t *)( (byte *)surface + surface->ofsEnd );
-	}
-
-}
-
diff --git a/code/renderergl1/tr_model.c b/code/renderergl1/tr_model.c
deleted file mode 100644
index 51269a51..00000000
--- a/code/renderergl1/tr_model.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_models.c -- model loading and caching
-
-#include "tr_local.h"
-
-#define	LL(x) x=LittleLong(x)
-
-static qboolean R_LoadMD3(model_t *mod, int lod, void *buffer, const char *name );
-static qboolean R_LoadMDR(model_t *mod, void *buffer, int filesize, const char *name );
-
-/*
-====================
-R_RegisterMD3
-====================
-*/
-qhandle_t R_RegisterMD3(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	int			lod;
-	int			ident;
-	qboolean	loaded = qfalse;
-	int			numLoaded;
-	char filename[MAX_QPATH], namebuf[MAX_QPATH+20];
-	char *fext, defex[] = "md3";
-
-	numLoaded = 0;
-
-	strcpy(filename, name);
-
-	fext = strchr(filename, '.');
-	if(!fext)
-		fext = defex;
-	else
-	{
-		*fext = '\0';
-		fext++;
-	}
-
-	for (lod = MD3_MAX_LODS - 1 ; lod >= 0 ; lod--)
-	{
-		if(lod)
-			Com_sprintf(namebuf, sizeof(namebuf), "%s_%d.%s", filename, lod, fext);
-		else
-			Com_sprintf(namebuf, sizeof(namebuf), "%s.%s", filename, fext);
-
-		ri.FS_ReadFile( namebuf, &buf.v );
-		if(!buf.u)
-			continue;
-		
-		ident = LittleLong(* (unsigned *) buf.u);
-		if (ident == MD3_IDENT)
-			loaded = R_LoadMD3(mod, lod, buf.u, name);
-		else
-			ri.Printf(PRINT_WARNING,"R_RegisterMD3: unknown fileid for %s\n", name);
-		
-		ri.FS_FreeFile(buf.v);
-
-		if(loaded)
-		{
-			mod->numLods++;
-			numLoaded++;
-		}
-		else
-			break;
-	}
-
-	if(numLoaded)
-	{
-		// duplicate into higher lod spots that weren't
-		// loaded, in case the user changes r_lodbias on the fly
-		for(lod--; lod >= 0; lod--)
-		{
-			mod->numLods++;
-			mod->md3[lod] = mod->md3[lod + 1];
-		}
-
-		return mod->index;
-	}
-
-#ifdef _DEBUG
-	ri.Printf(PRINT_WARNING,"R_RegisterMD3: couldn't load %s\n", name);
-#endif
-
-	mod->type = MOD_BAD;
-	return 0;
-}
-
-/*
-====================
-R_RegisterMDR
-====================
-*/
-qhandle_t R_RegisterMDR(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	int	ident;
-	qboolean loaded = qfalse;
-	int filesize;
-
-	filesize = ri.FS_ReadFile(name, (void **) &buf.v);
-	if(!buf.u)
-	{
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	ident = LittleLong(*(unsigned *)buf.u);
-	if(ident == MDR_IDENT)
-		loaded = R_LoadMDR(mod, buf.u, filesize, name);
-
-	ri.FS_FreeFile (buf.v);
-	
-	if(!loaded)
-	{
-		ri.Printf(PRINT_WARNING,"R_RegisterMDR: couldn't load mdr file %s\n", name);
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	return mod->index;
-}
-
-/*
-====================
-R_RegisterIQM
-====================
-*/
-qhandle_t R_RegisterIQM(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	qboolean loaded = qfalse;
-	int filesize;
-
-	filesize = ri.FS_ReadFile(name, (void **) &buf.v);
-	if(!buf.u)
-	{
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	loaded = R_LoadIQM(mod, buf.u, filesize, name);
-
-	ri.FS_FreeFile (buf.v);
-	
-	if(!loaded)
-	{
-		ri.Printf(PRINT_WARNING,"R_RegisterIQM: couldn't load iqm file %s\n", name);
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	return mod->index;
-}
-
-
-typedef struct
-{
-	char *ext;
-	qhandle_t (*ModelLoader)( const char *, model_t * );
-} modelExtToLoaderMap_t;
-
-// Note that the ordering indicates the order of preference used
-// when there are multiple models of different formats available
-static modelExtToLoaderMap_t modelLoaders[ ] =
-{
-	{ "iqm", R_RegisterIQM },
-	{ "mdr", R_RegisterMDR },
-	{ "md3", R_RegisterMD3 }
-};
-
-static int numModelLoaders = ARRAY_LEN(modelLoaders);
-
-//===============================================================================
-
-/*
-** R_GetModelByHandle
-*/
-model_t	*R_GetModelByHandle( qhandle_t index ) {
-	model_t		*mod;
-
-	// out of range gets the defualt model
-	if ( index < 1 || index >= tr.numModels ) {
-		return tr.models[0];
-	}
-
-	mod = tr.models[index];
-
-	return mod;
-}
-
-//===============================================================================
-
-/*
-** R_AllocModel
-*/
-model_t *R_AllocModel( void ) {
-	model_t		*mod;
-
-	if ( tr.numModels == MAX_MOD_KNOWN ) {
-		return NULL;
-	}
-
-	mod = ri.Hunk_Alloc( sizeof( *tr.models[tr.numModels] ), h_low );
-	mod->index = tr.numModels;
-	tr.models[tr.numModels] = mod;
-	tr.numModels++;
-
-	return mod;
-}
-
-/*
-====================
-RE_RegisterModel
-
-Loads in a model for the given name
-
-Zero will be returned if the model fails to load.
-An entry will be retained for failed models as an
-optimization to prevent disk rescanning if they are
-asked for again.
-====================
-*/
-qhandle_t RE_RegisterModel( const char *name ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	qboolean	orgNameFailed = qfalse;
-	int			orgLoader = -1;
-	int			i;
-	char		localName[ MAX_QPATH ];
-	const char	*ext;
-	char		altName[ MAX_QPATH ];
-
-	if ( !name || !name[0] ) {
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
-
-	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Model name exceeds MAX_QPATH\n" );
-		return 0;
-	}
-
-	//
-	// search the currently loaded models
-	//
-	for ( hModel = 1 ; hModel < tr.numModels; hModel++ ) {
-		mod = tr.models[hModel];
-		if ( !strcmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
-
-	// allocate a new model_t
-
-	if ( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
-		return 0;
-	}
-
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
-
-
-	R_IssuePendingRenderCommands();
-
-	mod->type = MOD_BAD;
-	mod->numLods = 0;
-
-	//
-	// load the files
-	//
-	Q_strncpyz( localName, name, MAX_QPATH );
-
-	ext = COM_GetExtension( localName );
-
-	if( *ext )
-	{
-		// Look for the correct loader and use it
-		for( i = 0; i < numModelLoaders; i++ )
-		{
-			if( !Q_stricmp( ext, modelLoaders[ i ].ext ) )
-			{
-				// Load
-				hModel = modelLoaders[ i ].ModelLoader( localName, mod );
-				break;
-			}
-		}
-
-		// A loader was found
-		if( i < numModelLoaders )
-		{
-			if( !hModel )
-			{
-				// Loader failed, most likely because the file isn't there;
-				// try again without the extension
-				orgNameFailed = qtrue;
-				orgLoader = i;
-				COM_StripExtension( name, localName, MAX_QPATH );
-			}
-			else
-			{
-				// Something loaded
-				return mod->index;
-			}
-		}
-	}
-
-	// Try and find a suitable match using all
-	// the model formats supported
-	for( i = 0; i < numModelLoaders; i++ )
-	{
-		if (i == orgLoader)
-			continue;
-
-		Com_sprintf( altName, sizeof (altName), "%s.%s", localName, modelLoaders[ i ].ext );
-
-		// Load
-		hModel = modelLoaders[ i ].ModelLoader( altName, mod );
-
-		if( hModel )
-		{
-			if( orgNameFailed )
-			{
-				ri.Printf( PRINT_DEVELOPER, "WARNING: %s not present, using %s instead\n",
-						name, altName );
-			}
-
-			break;
-		}
-	}
-
-	return hModel;
-}
-
-/*
-=================
-R_LoadMD3
-=================
-*/
-static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_name ) {
-	int					i, j;
-	md3Header_t			*pinmodel;
-    md3Frame_t			*frame;
-	md3Surface_t		*surf;
-	md3Shader_t			*shader;
-	md3Triangle_t		*tri;
-	md3St_t				*st;
-	md3XyzNormal_t		*xyz;
-	md3Tag_t			*tag;
-	int					version;
-	int					size;
-
-	pinmodel = (md3Header_t *)buffer;
-
-	version = LittleLong (pinmodel->version);
-	if (version != MD3_VERSION) {
-		ri.Printf( PRINT_WARNING, "R_LoadMD3: %s has wrong version (%i should be %i)\n",
-				 mod_name, version, MD3_VERSION);
-		return qfalse;
-	}
-
-	mod->type = MOD_MESH;
-	size = LittleLong(pinmodel->ofsEnd);
-	mod->dataSize += size;
-	mod->md3[lod] = ri.Hunk_Alloc( size, h_low );
-
-	Com_Memcpy (mod->md3[lod], buffer, LittleLong(pinmodel->ofsEnd) );
-
-    LL(mod->md3[lod]->ident);
-    LL(mod->md3[lod]->version);
-    LL(mod->md3[lod]->numFrames);
-    LL(mod->md3[lod]->numTags);
-    LL(mod->md3[lod]->numSurfaces);
-    LL(mod->md3[lod]->ofsFrames);
-    LL(mod->md3[lod]->ofsTags);
-    LL(mod->md3[lod]->ofsSurfaces);
-    LL(mod->md3[lod]->ofsEnd);
-
-	if ( mod->md3[lod]->numFrames < 1 ) {
-		ri.Printf( PRINT_WARNING, "R_LoadMD3: %s has no frames\n", mod_name );
-		return qfalse;
-	}
-    
-	// swap all the frames
-    frame = (md3Frame_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsFrames );
-    for ( i = 0 ; i < mod->md3[lod]->numFrames ; i++, frame++) {
-    	frame->radius = LittleFloat( frame->radius );
-        for ( j = 0 ; j < 3 ; j++ ) {
-            frame->bounds[0][j] = LittleFloat( frame->bounds[0][j] );
-            frame->bounds[1][j] = LittleFloat( frame->bounds[1][j] );
-	    	frame->localOrigin[j] = LittleFloat( frame->localOrigin[j] );
-        }
-	}
-
-	// swap all the tags
-    tag = (md3Tag_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsTags );
-    for ( i = 0 ; i < mod->md3[lod]->numTags * mod->md3[lod]->numFrames ; i++, tag++) {
-        for ( j = 0 ; j < 3 ; j++ ) {
-			tag->origin[j] = LittleFloat( tag->origin[j] );
-			tag->axis[0][j] = LittleFloat( tag->axis[0][j] );
-			tag->axis[1][j] = LittleFloat( tag->axis[1][j] );
-			tag->axis[2][j] = LittleFloat( tag->axis[2][j] );
-        }
-	}
-
-	// swap all the surfaces
-	surf = (md3Surface_t *) ( (byte *)mod->md3[lod] + mod->md3[lod]->ofsSurfaces );
-	for ( i = 0 ; i < mod->md3[lod]->numSurfaces ; i++) {
-
-        LL(surf->ident);
-        LL(surf->flags);
-        LL(surf->numFrames);
-        LL(surf->numShaders);
-        LL(surf->numTriangles);
-        LL(surf->ofsTriangles);
-        LL(surf->numVerts);
-        LL(surf->ofsShaders);
-        LL(surf->ofsSt);
-        LL(surf->ofsXyzNormals);
-        LL(surf->ofsEnd);
-		
-		if ( surf->numVerts >= SHADER_MAX_VERTEXES ) {
-			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i verts on %s (%i).\n",
-				mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
-				surf->numVerts );
-			return qfalse;
-		}
-		if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) {
-			ri.Printf(PRINT_WARNING, "R_LoadMD3: %s has more than %i triangles on %s (%i).\n",
-				mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
-				surf->numTriangles );
-			return qfalse;
-		}
-	
-		// change to surface identifier
-		surf->ident = SF_MD3;
-
-		// lowercase the surface name so skin compares are faster
-		Q_strlwr( surf->name );
-
-		// strip off a trailing _1 or _2
-		// this is a crutch for q3data being a mess
-		j = strlen( surf->name );
-		if ( j > 2 && surf->name[j-2] == '_' ) {
-			surf->name[j-2] = 0;
-		}
-
-        // register the shaders
-        shader = (md3Shader_t *) ( (byte *)surf + surf->ofsShaders );
-        for ( j = 0 ; j < surf->numShaders ; j++, shader++ ) {
-            shader_t	*sh;
-
-            sh = R_FindShader( shader->name, LIGHTMAP_NONE, qtrue );
-			if ( sh->defaultShader ) {
-				shader->shaderIndex = 0;
-			} else {
-				shader->shaderIndex = sh->index;
-			}
-        }
-
-		// swap all the triangles
-		tri = (md3Triangle_t *) ( (byte *)surf + surf->ofsTriangles );
-		for ( j = 0 ; j < surf->numTriangles ; j++, tri++ ) {
-			LL(tri->indexes[0]);
-			LL(tri->indexes[1]);
-			LL(tri->indexes[2]);
-		}
-
-		// swap all the ST
-        st = (md3St_t *) ( (byte *)surf + surf->ofsSt );
-        for ( j = 0 ; j < surf->numVerts ; j++, st++ ) {
-            st->st[0] = LittleFloat( st->st[0] );
-            st->st[1] = LittleFloat( st->st[1] );
-        }
-
-		// swap all the XyzNormals
-        xyz = (md3XyzNormal_t *) ( (byte *)surf + surf->ofsXyzNormals );
-        for ( j = 0 ; j < surf->numVerts * surf->numFrames ; j++, xyz++ ) 
-		{
-            xyz->xyz[0] = LittleShort( xyz->xyz[0] );
-            xyz->xyz[1] = LittleShort( xyz->xyz[1] );
-            xyz->xyz[2] = LittleShort( xyz->xyz[2] );
-
-            xyz->normal = LittleShort( xyz->normal );
-        }
-
-
-		// find the next surface
-		surf = (md3Surface_t *)( (byte *)surf + surf->ofsEnd );
-	}
-    
-	return qtrue;
-}
-
-
-
-/*
-=================
-R_LoadMDR
-=================
-*/
-static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char *mod_name ) 
-{
-	int					i, j, k, l;
-	mdrHeader_t			*pinmodel, *mdr;
-	mdrFrame_t			*frame;
-	mdrLOD_t			*lod, *curlod;
-	mdrSurface_t			*surf, *cursurf;
-	mdrTriangle_t			*tri, *curtri;
-	mdrVertex_t			*v, *curv;
-	mdrWeight_t			*weight, *curweight;
-	mdrTag_t			*tag, *curtag;
-	int					size;
-	shader_t			*sh;
-
-	pinmodel = (mdrHeader_t *)buffer;
-
-	pinmodel->version = LittleLong(pinmodel->version);
-	if (pinmodel->version != MDR_VERSION) 
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has wrong version (%i should be %i)\n", mod_name, pinmodel->version, MDR_VERSION);
-		return qfalse;
-	}
-
-	size = LittleLong(pinmodel->ofsEnd);
-	
-	if(size > filesize)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: Header of %s is broken. Wrong filesize declared!\n", mod_name);
-		return qfalse;
-	}
-	
-	mod->type = MOD_MDR;
-
-	LL(pinmodel->numFrames);
-	LL(pinmodel->numBones);
-	LL(pinmodel->ofsFrames);
-
-	// This is a model that uses some type of compressed Bones. We don't want to uncompress every bone for each rendered frame
-	// over and over again, we'll uncompress it in this function already, so we must adjust the size of the target mdr.
-	if(pinmodel->ofsFrames < 0)
-	{
-		// mdrFrame_t is larger than mdrCompFrame_t:
-		size += pinmodel->numFrames * sizeof(frame->name);
-		// now add enough space for the uncompressed bones.
-		size += pinmodel->numFrames * pinmodel->numBones * ((sizeof(mdrBone_t) - sizeof(mdrCompBone_t)));
-	}
-	
-	// simple bounds check
-	if(pinmodel->numBones < 0 ||
-		sizeof(*mdr) + pinmodel->numFrames * (sizeof(*frame) + (pinmodel->numBones - 1) * sizeof(*frame->bones)) > size)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-		return qfalse;
-	}
-
-	mod->dataSize += size;
-	mod->modelData = mdr = ri.Hunk_Alloc( size, h_low );
-
-	// Copy all the values over from the file and fix endian issues in the process, if necessary.
-	
-	mdr->ident = LittleLong(pinmodel->ident);
-	mdr->version = pinmodel->version;	// Don't need to swap byte order on this one, we already did above.
-	Q_strncpyz(mdr->name, pinmodel->name, sizeof(mdr->name));
-	mdr->numFrames = pinmodel->numFrames;
-	mdr->numBones = pinmodel->numBones;
-	mdr->numLODs = LittleLong(pinmodel->numLODs);
-	mdr->numTags = LittleLong(pinmodel->numTags);
-	// We don't care about the other offset values, we'll generate them ourselves while loading.
-
-	mod->numLods = mdr->numLODs;
-
-	if ( mdr->numFrames < 1 ) 
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has no frames\n", mod_name);
-		return qfalse;
-	}
-
-	/* The first frame will be put into the first free space after the header */
-	frame = (mdrFrame_t *)(mdr + 1);
-	mdr->ofsFrames = (int)((byte *) frame - (byte *) mdr);
-		
-	if (pinmodel->ofsFrames < 0)
-	{
-		mdrCompFrame_t *cframe;
-				
-		// compressed model...				
-		cframe = (mdrCompFrame_t *)((byte *) pinmodel - pinmodel->ofsFrames);
-		
-		for(i = 0; i < mdr->numFrames; i++)
-		{
-			for(j = 0; j < 3; j++)
-			{
-				frame->bounds[0][j] = LittleFloat(cframe->bounds[0][j]);
-				frame->bounds[1][j] = LittleFloat(cframe->bounds[1][j]);
-				frame->localOrigin[j] = LittleFloat(cframe->localOrigin[j]);
-			}
-
-			frame->radius = LittleFloat(cframe->radius);
-			frame->name[0] = '\0';	// No name supplied in the compressed version.
-			
-			for(j = 0; j < mdr->numBones; j++)
-			{
-				for(k = 0; k < (sizeof(cframe->bones[j].Comp) / 2); k++)
-				{
-					// Do swapping for the uncompressing functions. They seem to use shorts
-					// values only, so I assume this will work. Never tested it on other
-					// platforms, though.
-					
-					((unsigned short *)(cframe->bones[j].Comp))[k] =
-						LittleShort( ((unsigned short *)(cframe->bones[j].Comp))[k] );
-				}
-				
-				/* Now do the actual uncompressing */
-				MC_UnCompress(frame->bones[j].matrix, cframe->bones[j].Comp);
-			}
-			
-			// Next Frame...
-			cframe = (mdrCompFrame_t *) &cframe->bones[j];
-			frame = (mdrFrame_t *) &frame->bones[j];
-		}
-	}
-	else
-	{
-		mdrFrame_t *curframe;
-		
-		// uncompressed model...
-		//
-    
-		curframe = (mdrFrame_t *)((byte *) pinmodel + pinmodel->ofsFrames);
-		
-		// swap all the frames
-		for ( i = 0 ; i < mdr->numFrames ; i++) 
-		{
-			for(j = 0; j < 3; j++)
-			{
-				frame->bounds[0][j] = LittleFloat(curframe->bounds[0][j]);
-				frame->bounds[1][j] = LittleFloat(curframe->bounds[1][j]);
-				frame->localOrigin[j] = LittleFloat(curframe->localOrigin[j]);
-			}
-			
-			frame->radius = LittleFloat(curframe->radius);
-			Q_strncpyz(frame->name, curframe->name, sizeof(frame->name));
-			
-			for (j = 0; j < (int) (mdr->numBones * sizeof(mdrBone_t) / 4); j++) 
-			{
-				((float *)frame->bones)[j] = LittleFloat( ((float *)curframe->bones)[j] );
-			}
-			
-			curframe = (mdrFrame_t *) &curframe->bones[mdr->numBones];
-			frame = (mdrFrame_t *) &frame->bones[mdr->numBones];
-		}
-	}
-	
-	// frame should now point to the first free address after all frames.
-	lod = (mdrLOD_t *) frame;
-	mdr->ofsLODs = (int) ((byte *) lod - (byte *)mdr);
-	
-	curlod = (mdrLOD_t *)((byte *) pinmodel + LittleLong(pinmodel->ofsLODs));
-		
-	// swap all the LOD's
-	for ( l = 0 ; l < mdr->numLODs ; l++)
-	{
-		// simple bounds check
-		if((byte *) (lod + 1) > (byte *) mdr + size)
-		{
-			ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-			return qfalse;
-		}
-
-		lod->numSurfaces = LittleLong(curlod->numSurfaces);
-		
-		// swap all the surfaces
-		surf = (mdrSurface_t *) (lod + 1);
-		lod->ofsSurfaces = (int)((byte *) surf - (byte *) lod);
-		cursurf = (mdrSurface_t *) ((byte *)curlod + LittleLong(curlod->ofsSurfaces));
-		
-		for ( i = 0 ; i < lod->numSurfaces ; i++)
-		{
-			// simple bounds check
-			if((byte *) (surf + 1) > (byte *) mdr + size)
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-				return qfalse;
-			}
-
-			// first do some copying stuff
-			
-			surf->ident = SF_MDR;
-			Q_strncpyz(surf->name, cursurf->name, sizeof(surf->name));
-			Q_strncpyz(surf->shader, cursurf->shader, sizeof(surf->shader));
-			
-			surf->ofsHeader = (byte *) mdr - (byte *) surf;
-			
-			surf->numVerts = LittleLong(cursurf->numVerts);
-			surf->numTriangles = LittleLong(cursurf->numTriangles);
-			// numBoneReferences and BoneReferences generally seem to be unused
-			
-			// now do the checks that may fail.
-			if ( surf->numVerts >= SHADER_MAX_VERTEXES ) 
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES - 1, surf->name[0] ? surf->name : "a surface",
-					  surf->numVerts );
-				return qfalse;
-			}
-			if ( surf->numTriangles*3 >= SHADER_MAX_INDEXES ) 
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, surf->name[0] ? surf->name : "a surface",
-					  surf->numTriangles );
-				return qfalse;
-			}
-			// lowercase the surface name so skin compares are faster
-			Q_strlwr( surf->name );
-
-			// register the shaders
-			sh = R_FindShader(surf->shader, LIGHTMAP_NONE, qtrue);
-			if ( sh->defaultShader ) {
-				surf->shaderIndex = 0;
-			} else {
-				surf->shaderIndex = sh->index;
-			}
-			
-			// now copy the vertexes.
-			v = (mdrVertex_t *) (surf + 1);
-			surf->ofsVerts = (int)((byte *) v - (byte *) surf);
-			curv = (mdrVertex_t *) ((byte *)cursurf + LittleLong(cursurf->ofsVerts));
-			
-			for(j = 0; j < surf->numVerts; j++)
-			{
-				LL(curv->numWeights);
-			
-				// simple bounds check
-				if(curv->numWeights < 0 || (byte *) (v + 1) + (curv->numWeights - 1) * sizeof(*weight) > (byte *) mdr + size)
-				{
-					ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-					return qfalse;
-				}
-
-				v->normal[0] = LittleFloat(curv->normal[0]);
-				v->normal[1] = LittleFloat(curv->normal[1]);
-				v->normal[2] = LittleFloat(curv->normal[2]);
-				
-				v->texCoords[0] = LittleFloat(curv->texCoords[0]);
-				v->texCoords[1] = LittleFloat(curv->texCoords[1]);
-				
-				v->numWeights = curv->numWeights;
-				weight = &v->weights[0];
-				curweight = &curv->weights[0];
-				
-				// Now copy all the weights
-				for(k = 0; k < v->numWeights; k++)
-				{
-					weight->boneIndex = LittleLong(curweight->boneIndex);
-					weight->boneWeight = LittleFloat(curweight->boneWeight);
-					
-					weight->offset[0] = LittleFloat(curweight->offset[0]);
-					weight->offset[1] = LittleFloat(curweight->offset[1]);
-					weight->offset[2] = LittleFloat(curweight->offset[2]);
-					
-					weight++;
-					curweight++;
-				}
-				
-				v = (mdrVertex_t *) weight;
-				curv = (mdrVertex_t *) curweight;
-			}
-						
-			// we know the offset to the triangles now:
-			tri = (mdrTriangle_t *) v;
-			surf->ofsTriangles = (int)((byte *) tri - (byte *) surf);
-			curtri = (mdrTriangle_t *)((byte *) cursurf + LittleLong(cursurf->ofsTriangles));
-			
-			// simple bounds check
-			if(surf->numTriangles < 0 || (byte *) (tri + surf->numTriangles) > (byte *) mdr + size)
-			{
-				ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-				return qfalse;
-			}
-
-			for(j = 0; j < surf->numTriangles; j++)
-			{
-				tri->indexes[0] = LittleLong(curtri->indexes[0]);
-				tri->indexes[1] = LittleLong(curtri->indexes[1]);
-				tri->indexes[2] = LittleLong(curtri->indexes[2]);
-				
-				tri++;
-				curtri++;
-			}
-			
-			// tri now points to the end of the surface.
-			surf->ofsEnd = (byte *) tri - (byte *) surf;
-			surf = (mdrSurface_t *) tri;
-
-			// find the next surface.
-			cursurf = (mdrSurface_t *) ((byte *) cursurf + LittleLong(cursurf->ofsEnd));
-		}
-
-		// surf points to the next lod now.
-		lod->ofsEnd = (int)((byte *) surf - (byte *) lod);
-		lod = (mdrLOD_t *) surf;
-
-		// find the next LOD.
-		curlod = (mdrLOD_t *)((byte *) curlod + LittleLong(curlod->ofsEnd));
-	}
-	
-	// lod points to the first tag now, so update the offset too.
-	tag = (mdrTag_t *) lod;
-	mdr->ofsTags = (int)((byte *) tag - (byte *) mdr);
-	curtag = (mdrTag_t *) ((byte *)pinmodel + LittleLong(pinmodel->ofsTags));
-
-	// simple bounds check
-	if(mdr->numTags < 0 || (byte *) (tag + mdr->numTags) > (byte *) mdr + size)
-	{
-		ri.Printf(PRINT_WARNING, "R_LoadMDR: %s has broken structure.\n", mod_name);
-		return qfalse;
-	}
-	
-	for (i = 0 ; i < mdr->numTags ; i++)
-	{
-		tag->boneIndex = LittleLong(curtag->boneIndex);
-		Q_strncpyz(tag->name, curtag->name, sizeof(tag->name));
-		
-		tag++;
-		curtag++;
-	}
-	
-	// And finally we know the real offset to the end.
-	mdr->ofsEnd = (int)((byte *) tag - (byte *) mdr);
-
-	// phew! we're done.
-	
-	return qtrue;
-}
-
-
-
-//=============================================================================
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration( glconfig_t *glconfigOut ) {
-
-	R_Init();
-
-	*glconfigOut = glConfig;
-
-	R_IssuePendingRenderCommands();
-
-	tr.viewCluster = -1;		// force markleafs to regenerate
-	R_ClearFlares();
-	RE_ClearScene();
-
-	tr.registered = qtrue;
-}
-
-//=============================================================================
-
-/*
-===============
-R_ModelInit
-===============
-*/
-void R_ModelInit( void ) {
-	model_t		*mod;
-
-	// leave a space for NULL model
-	tr.numModels = 0;
-
-	mod = R_AllocModel();
-	mod->type = MOD_BAD;
-}
-
-
-/*
-================
-R_Modellist_f
-================
-*/
-void R_Modellist_f( void ) {
-	int		i, j;
-	model_t	*mod;
-	int		total;
-	int		lods;
-
-	total = 0;
-	for ( i = 1 ; i < tr.numModels; i++ ) {
-		mod = tr.models[i];
-		lods = 1;
-		for ( j = 1 ; j < MD3_MAX_LODS ; j++ ) {
-			if ( mod->md3[j] && mod->md3[j] != mod->md3[j-1] ) {
-				lods++;
-			}
-		}
-		ri.Printf( PRINT_ALL, "%8i : (%i) %s\n",mod->dataSize, lods, mod->name );
-		total += mod->dataSize;
-	}
-	ri.Printf( PRINT_ALL, "%8i : Total models\n", total );
-
-#if	0		// not working right with new hunk
-	if ( tr.world ) {
-		ri.Printf( PRINT_ALL, "\n%8i : %s\n", tr.world->dataSize, tr.world->name );
-	}
-#endif
-}
-
-
-//=============================================================================
-
-
-/*
-================
-R_GetTag
-================
-*/
-static md3Tag_t *R_GetTag( md3Header_t *mod, int frame, const char *tagName ) {
-	md3Tag_t		*tag;
-	int				i;
-
-	if ( frame >= mod->numFrames ) {
-		// it is possible to have a bad frame while changing models, so don't error
-		frame = mod->numFrames - 1;
-	}
-
-	tag = (md3Tag_t *)((byte *)mod + mod->ofsTags) + frame * mod->numTags;
-	for ( i = 0 ; i < mod->numTags ; i++, tag++ ) {
-		if ( !strcmp( tag->name, tagName ) ) {
-			return tag;	// found it
-		}
-	}
-
-	return NULL;
-}
-
-md3Tag_t *R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest) 
-{
-	int				i, j, k;
-	int				frameSize;
-	mdrFrame_t		*frame;
-	mdrTag_t		*tag;
-
-	if ( framenum >= mod->numFrames ) 
-	{
-		// it is possible to have a bad frame while changing models, so don't error
-		framenum = mod->numFrames - 1;
-	}
-
-	tag = (mdrTag_t *)((byte *)mod + mod->ofsTags);
-	for ( i = 0 ; i < mod->numTags ; i++, tag++ )
-	{
-		if ( !strcmp( tag->name, tagName ) )
-		{
-			Q_strncpyz(dest->name, tag->name, sizeof(dest->name));
-
-			// uncompressed model...
-			//
-			frameSize = (intptr_t)( &((mdrFrame_t *)0)->bones[ mod->numBones ] );
-			frame = (mdrFrame_t *)((byte *)mod + mod->ofsFrames + framenum * frameSize );
-
-			for (j = 0; j < 3; j++)
-			{
-				for (k = 0; k < 3; k++)
-					dest->axis[j][k]=frame->bones[tag->boneIndex].matrix[k][j];
-			}
-
-			dest->origin[0]=frame->bones[tag->boneIndex].matrix[0][3];
-			dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3];
-			dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3];				
-
-			return dest;
-		}
-	}
-
-	return NULL;
-}
-
-/*
-================
-R_LerpTag
-================
-*/
-int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, 
-					 float frac, const char *tagName ) {
-	md3Tag_t	*start, *end;
-	md3Tag_t	start_space, end_space;
-	int		i;
-	float		frontLerp, backLerp;
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-	if ( !model->md3[0] )
-	{
-		if(model->type == MOD_MDR)
-		{
-			start = R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, &start_space);
-			end = R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, &end_space);
-		}
-		else if( model->type == MOD_IQM ) {
-			return R_IQMLerpTag( tag, model->modelData,
-					startFrame, endFrame,
-					frac, tagName );
-		} else {
-			start = end = NULL;
-		}
-	}
-	else
-	{
-		start = R_GetTag( model->md3[0], startFrame, tagName );
-		end = R_GetTag( model->md3[0], endFrame, tagName );
-	}
-
-	if ( !start || !end ) {
-		AxisClear( tag->axis );
-		VectorClear( tag->origin );
-		return qfalse;
-	}
-
-	frontLerp = frac;
-	backLerp = 1.0f - frac;
-
-	for ( i = 0 ; i < 3 ; i++ ) {
-		tag->origin[i] = start->origin[i] * backLerp +  end->origin[i] * frontLerp;
-		tag->axis[0][i] = start->axis[0][i] * backLerp +  end->axis[0][i] * frontLerp;
-		tag->axis[1][i] = start->axis[1][i] * backLerp +  end->axis[1][i] * frontLerp;
-		tag->axis[2][i] = start->axis[2][i] * backLerp +  end->axis[2][i] * frontLerp;
-	}
-	VectorNormalize( tag->axis[0] );
-	VectorNormalize( tag->axis[1] );
-	VectorNormalize( tag->axis[2] );
-	return qtrue;
-}
-
-
-/*
-====================
-R_ModelBounds
-====================
-*/
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-
-	if(model->type == MOD_BRUSH) {
-		VectorCopy( model->bmodel->bounds[0], mins );
-		VectorCopy( model->bmodel->bounds[1], maxs );
-		
-		return;
-	} else if (model->type == MOD_MESH) {
-		md3Header_t	*header;
-		md3Frame_t	*frame;
-
-		header = model->md3[0];
-		frame = (md3Frame_t *) ((byte *)header + header->ofsFrames);
-
-		VectorCopy( frame->bounds[0], mins );
-		VectorCopy( frame->bounds[1], maxs );
-		
-		return;
-	} else if (model->type == MOD_MDR) {
-		mdrHeader_t	*header;
-		mdrFrame_t	*frame;
-
-		header = (mdrHeader_t *)model->modelData;
-		frame = (mdrFrame_t *) ((byte *)header + header->ofsFrames);
-
-		VectorCopy( frame->bounds[0], mins );
-		VectorCopy( frame->bounds[1], maxs );
-		
-		return;
-	} else if(model->type == MOD_IQM) {
-		iqmData_t *iqmData;
-		
-		iqmData = model->modelData;
-
-		if(iqmData->bounds)
-		{
-			VectorCopy(iqmData->bounds, mins);
-			VectorCopy(iqmData->bounds + 3, maxs);
-			return;
-		}
-	}
-
-	VectorClear( mins );
-	VectorClear( maxs );
-}
diff --git a/code/renderergl1/tr_model.cpp b/code/renderergl1/tr_model.cpp
new file mode 100644
index 00000000..660b128e
--- /dev/null
+++ b/code/renderergl1/tr_model.cpp
@@ -0,0 +1,2009 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_models.cpp -- model loading and caching
+
+#include "tr_local.h"
+#include "tiki.h"
+#include <vector.h>
+
+#define LL(x) x = LittleLong(x)
+
+qboolean   g_bInfoworldtris = qfalse;
+static int entityNumIndexes[MAX_ENTITIES];
+static int staticModelNumIndexes[4095];
+
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg);
+
+/*
+** R_GetModelByHandle
+*/
+model_t *R_GetModelByHandle(qhandle_t hModel)
+{
+    model_t *mod;
+
+    // out of range gets the default model
+    if (hModel < 1 || hModel >= tr.numModels) {
+        return &tr.models[0];
+    }
+
+    mod = &tr.models[hModel];
+
+    return mod;
+}
+
+/*
+** R_Model_GetHandle
+*/
+dtiki_t *R_Model_GetHandle(qhandle_t handle)
+{
+    model_t *model = R_GetModelByHandle(handle);
+
+    if (model->type == MOD_TIKI) {
+        return model->d.tiki;
+    }
+
+    return NULL;
+}
+
+//===============================================================================
+
+/*
+** R_FreeModel
+*/
+void R_FreeModel(model_t *mod)
+{
+    if (mod->type == MOD_TIKI) {
+        ri.CG_EndTiki(mod->d.tiki);
+    }
+
+    memset(mod, 0, sizeof(model_t));
+}
+
+/*
+** R_AllocModel
+*/
+model_t *R_AllocModel(void)
+{
+    int i;
+
+    for (i = 0; i < tr.numModels; i++) {
+        if (!tr.models[i].name[0]) {
+            break;
+        }
+    }
+
+    if (i == tr.numModels) {
+        if (i == MAX_MOD_KNOWN) {
+            return NULL;
+        }
+        tr.numModels++;
+    }
+
+    tr.models[i].index = i;
+
+    return &tr.models[i];
+}
+
+/*
+** RE_FreeModels
+*/
+void RE_FreeModels(void)
+{
+    int hModel;
+
+    for (hModel = 0; hModel < tr.numModels; hModel++) {
+        if (!tr.models[hModel].name[0]) {
+            continue;
+        }
+
+        R_FreeModel(&tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterShaders
+*/
+void R_RegisterShaders(model_t *mod)
+{
+    dtiki_t        *tiki;
+    int             i, j;
+    dtikisurface_t *psurface;
+    shader_t       *sh;
+
+    tiki = mod->d.tiki;
+
+    for (i = 0; i < tiki->num_surfaces; i++) {
+        psurface = &tiki->surfaces[i];
+
+        assert(psurface->numskins <= MAX_TIKI_SHADER);
+        for (j = 0; j < psurface->numskins; j++) {
+            if (psurface->shader[j][0]) {
+                sh = R_FindShader(
+                    psurface->shader[j],
+                    LIGHTMAP_NONE,
+                    !(psurface->flags & TIKI_SURF_NOMIPMAPS),
+                    r_picmip->integer,
+                    qtrue,
+                    qtrue
+                );
+                psurface->hShader[j] = sh->index;
+            } else {
+                psurface->hShader[j] = 0;
+            }
+        }
+    }
+}
+
+/*
+** RE_UnregisterServerModel
+*/
+void RE_UnregisterServerModel(qhandle_t hModel)
+{
+    if (hModel < 0 || hModel >= MAX_MOD_KNOWN) {
+        return;
+    }
+
+    if (tr.models[hModel].serveronly) {
+        R_FreeModel(&tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterModelInternal
+*/
+static qhandle_t R_RegisterModelInternal(const char *name, qboolean bBeginTiki, qboolean use)
+{
+    model_t    *mod;
+    qhandle_t   hModel;
+    const char *ptr;
+
+    if (!name || !*name) {
+        ri.Printf(PRINT_ALL, "RE_RegisterModel: NULL name\n");
+        return 0;
+    }
+
+    if (strlen(name) >= 128) {
+        ri.Printf(PRINT_ALL, "Model name exceeds MAX_MODEL_NAME\n");
+        return 0;
+    }
+
+    //
+    // search the currently loaded models
+    //
+    for (hModel = 1; hModel < tr.numModels; hModel++) {
+        mod = &tr.models[hModel];
+        if (!Q_stricmp(mod->name, name)) {
+            if (mod->type == MOD_BAD) {
+                return 0;
+            }
+            return hModel;
+        }
+    }
+
+    // allocate a new model_t
+
+    if ((mod = R_AllocModel()) == NULL) {
+        ri.Printf(PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
+        return 0;
+    }
+
+    // only set the name after the model has been successfully loaded
+    Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+    // make sure the render thread is stopped
+    R_IssuePendingRenderCommands();
+
+    mod->serveronly = qtrue;
+
+    //
+    // load the files
+    //
+    ptr = strrchr(name, '.');
+
+    if (ptr) {
+        ptr++;
+
+        if (!stricmp(ptr, "spr")) {
+            mod->d.sprite = SPR_RegisterSprite(name);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.sprite) {
+                mod->type = MOD_SPRITE;
+                return mod->index;
+            }
+        } else if (!stricmp(ptr, "tik")) {
+            mod->d.tiki = ri.TIKI_RegisterTikiFlags(name, use);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.tiki) {
+                mod->type = MOD_TIKI;
+                R_RegisterShaders(mod);
+
+                if (bBeginTiki) {
+                    ri.CG_ProcessInitCommands(mod->d.tiki, NULL);
+                }
+
+                return mod->index;
+            }
+        }
+    }
+
+    ri.Printf(PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name);
+    mod->type = MOD_BAD;
+
+    return 0;
+}
+
+/*
+** RE_RegisterServerModel
+*/
+qhandle_t RE_RegisterServerModel(const char *name)
+{
+    return R_RegisterModelInternal(name, qtrue, qfalse);
+}
+
+/*
+** RE_SpawnEffectModel
+*/
+qhandle_t RE_SpawnEffectModel(const char *szModel, vec3_t vPos, vec3_t *axis)
+{
+    refEntity_t new_entity;
+
+    memset(&new_entity, 0, sizeof(refEntity_t));
+    memset(&new_entity.shaderRGBA, 255, sizeof(byte) * 4);
+
+    VectorCopy(vPos, new_entity.origin);
+    new_entity.scale = 1.0;
+
+    if (axis) {
+        AxisCopy(axis, new_entity.axis);
+    }
+
+    new_entity.hModel = R_RegisterModelInternal(szModel, qfalse, qtrue);
+
+    if (new_entity.hModel) {
+        tr.models[new_entity.hModel].serveronly = qfalse;
+        ri.CG_ProcessInitCommands(tr.models[new_entity.hModel].d.tiki, &new_entity);
+    }
+
+    return new_entity.hModel;
+}
+
+/*
+** RE_RegisterModel
+*/
+qhandle_t RE_RegisterModel(const char *name)
+{
+    qhandle_t handle;
+
+    handle = R_RegisterModelInternal(name, qtrue, qtrue);
+
+    if (handle) {
+        tr.models[handle].serveronly = qfalse;
+    }
+    return handle;
+}
+
+//=============================================================================
+
+/*
+===============
+R_ModelInit
+===============
+*/
+void R_ModelInit(void)
+{
+    model_t *mod;
+    int      i;
+
+    // leave a space for NULL model
+    tr.numModels = 0;
+
+    mod = R_AllocModel();
+    Q_strncpyz(mod->name, "** BAD MODEL **", sizeof(mod->name));
+    mod->type = MOD_BAD;
+
+    for (i = 0; i < ARRAY_LEN(tr.skel_index); i++) {
+        tr.skel_index[i] = -1;
+    }
+}
+
+/*
+================
+R_Modellist_f
+================
+*/
+void R_Modellist_f(void)
+{
+    int i;
+
+    for (i = 1; i < tr.numModels; i++) {
+        ri.Printf(PRINT_ALL, "%s\n", tr.models[i].name);
+    }
+}
+
+/*
+====================
+R_ModelRadius
+====================
+*/
+float R_ModelRadius(qhandle_t handle)
+{
+    int      j;
+    vec3_t   bounds[2];
+    model_t *model;
+    float    radius, maxRadius;
+    vec3_t   tmpVec;
+    float    w;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    case MOD_BRUSH:
+        maxRadius = 0.0;
+
+        VectorCopy(model->d.bmodel->bounds[0], bounds[0]);
+        VectorCopy(model->d.bmodel->bounds[1], bounds[1]);
+
+        for (j = 0; j < 8; j++) {
+            tmpVec[0] = bounds[j & 1 ? 1 : 0][0];
+            tmpVec[1] = bounds[j & 2 ? 1 : 0][1];
+            tmpVec[2] = bounds[j & 4 ? 1 : 0][2];
+
+            radius = VectorLength(tmpVec);
+
+            if (maxRadius < radius) {
+                maxRadius = radius;
+            }
+        }
+        break;
+    case MOD_TIKI:
+        return ri.TIKI_GlobalRadius(model->d.tiki);
+    case MOD_SPRITE:
+        maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        w         = model->d.sprite->height * model->d.sprite->scale * 0.5;
+
+        if (maxRadius <= w) {
+            maxRadius = w;
+        }
+        break;
+    default:
+        maxRadius = 0.0;
+    }
+
+    return maxRadius;
+}
+
+/*
+====================
+R_ModelBounds
+====================
+*/
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs)
+{
+    model_t *model;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    default:
+    case MOD_BAD:
+        VectorClear(mins);
+        VectorClear(maxs);
+        break;
+    case MOD_BRUSH:
+        VectorCopy(model->d.bmodel->bounds[0], mins);
+        VectorCopy(model->d.bmodel->bounds[1], maxs);
+        break;
+    case MOD_TIKI:
+        ri.TIKI_CalculateBounds(model->d.tiki, 1.0, mins, maxs);
+        break;
+    case MOD_SPRITE:
+        mins[0] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
+        mins[1] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
+        mins[2] = -0.0;
+        maxs[0] = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        maxs[1] = model->d.sprite->height * model->d.sprite->scale * 0.5;
+        maxs[2] = 0.0;
+        break;
+    }
+}
+
+#if 0
+// Replaced by TIKI_FindSkelByHeader
+/*
+====================
+GetModelPath
+====================
+*/
+const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
+	int			i;
+	int			num;
+	skelcache_t	*cache;
+
+	num = cache_numskel;
+
+	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
+	{
+		cache = &skelcache[ i ];
+
+		if( cache->skel )
+		{
+			if( cache->skel == skelmodel ) {
+				return cache->path;
+			}
+
+			num--;
+			if( num < 0 ) {
+				break;
+			}
+		}
+	}
+
+	return NULL;
+}
+#endif
+
+/*
+====================
+GetLodCutoff
+====================
+*/
+int GetLodCutoff(skelHeaderGame_t *skelmodel, float lod_val, int renderfx)
+{
+    lodControl_t *LOD;
+    float         f;
+    float         fLODCap;
+
+    LOD = skelmodel->pLOD;
+
+    if (renderfx & RF_DEPTHHACK) {
+        fLODCap = LOD->maxMetric + (LOD->minMetric - LOD->maxMetric) * r_lodviewmodelcap->value;
+    } else {
+        f       = (LOD->minMetric - LOD->maxMetric) * r_lodcap->value + LOD->maxMetric;
+        fLODCap = (lod_val - LOD->maxMetric) * r_lodscale->value + LOD->maxMetric;
+
+        if (fLODCap > f) {
+            fLODCap = f;
+        }
+    }
+
+    if (fLODCap >= LOD->minMetric || !r_uselod->integer) {
+        return LOD->curve[0].val;
+    } else if (fLODCap <= LOD->maxMetric) {
+        return LOD->curve[4].val;
+    } else if (fLODCap <= LOD->consts[3].cutoff) {
+        return fLODCap * LOD->consts[3].scale + LOD->consts[3].base;
+    } else if (fLODCap <= LOD->consts[2].cutoff) {
+        return fLODCap * LOD->consts[2].scale + LOD->consts[2].base;
+    } else if (fLODCap <= LOD->consts[1].cutoff) {
+        return fLODCap * LOD->consts[1].scale + LOD->consts[1].base;
+    } else {
+        return fLODCap * LOD->consts[0].scale + LOD->consts[0].base;
+    }
+}
+
+/*
+===============
+R_SaveLODFile
+===============
+*/
+static void R_SaveLODFile(const char *path, lodControl_t *LOD)
+{
+    fileHandle_t file = ri.FS_OpenFileWrite(path);
+    if (!file) {
+        ri.Printf(PRINT_WARNING, "SaveLODFile: Failed to open file %s\n", path);
+        return;
+    }
+
+    ri.FS_Write(LOD, sizeof(lodControl_t), file);
+}
+
+/*
+====================
+GetToolLodCutoff
+====================
+*/
+int GetToolLodCutoff(skelHeaderGame_t *skelmodel, float lod_val)
+{
+    lodControl_t *LOD;
+    float         totalRange;
+    int           i;
+    char          lodPath[256];
+    char         *ext;
+
+    LOD        = skelmodel->pLOD;
+    totalRange = 0.0;
+    for (i = 0; i < 10; i++) {
+        if (skelmodel->lodIndex[i] > 0) {
+            totalRange = skelmodel->lodIndex[i];
+            break;
+        }
+    }
+
+    if (lod_save->integer == 1) {
+        ri.Cvar_Set("lod_save", "0");
+        Q_strncpyz(lodPath, ri.TIKI_FindSkelByHeader(skelmodel)->path, sizeof(lodPath));
+        ext = strstr(lodPath, "skd");
+        strcpy(ext, "lod");
+        R_SaveLODFile(lodPath, LOD);
+    }
+
+    if (lod_mesh->modified) {
+        lod_mesh->modified = qfalse;
+        ri.Cvar_Set("lod_minLOD", va("%f", LOD->minMetric));
+        ri.Cvar_Set("lod_maxLOD", va("%f", LOD->maxMetric));
+        ri.Cvar_Set("lod_LOD_slider", va("%f", 0.5));
+        ri.Cvar_Set("lod_curve_0_slider", va("%f", LOD->curve[0].val / totalRange));
+        ri.Cvar_Set("lod_curve_1_slider", va("%f", LOD->curve[1].val / totalRange));
+        ri.Cvar_Set("lod_curve_2_slider", va("%f", LOD->curve[2].val / totalRange));
+        ri.Cvar_Set("lod_curve_3_slider", va("%f", LOD->curve[3].val / totalRange));
+        ri.Cvar_Set("lod_curve_4_slider", va("%f", LOD->curve[4].val / totalRange));
+    }
+
+    ri.Cvar_Set("lod_curve_0_val", va("%f", lod_curve_0_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_1_val", va("%f", lod_curve_1_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_2_val", va("%f", lod_curve_2_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_3_val", va("%f", lod_curve_3_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_4_val", va("%f", lod_curve_4_slider->value * totalRange));
+
+    LOD->minMetric    = lod_minLOD->value;
+    LOD->maxMetric    = lod_maxLOD->value;
+    LOD->curve[0].val = lod_curve_0_val->value;
+    LOD->curve[1].val = lod_curve_1_val->value;
+    LOD->curve[2].val = lod_curve_2_val->value;
+    LOD->curve[3].val = lod_curve_3_val->value;
+    LOD->curve[4].val = lod_curve_4_val->value;
+
+    ri.TIKI_CalcLodConsts(LOD);
+    return GetLodCutoff(skelmodel, lod_val, 0);
+}
+
+/*
+==============
+R_GetTagPositionAndOrientation
+==============
+*/
+orientation_t R_GetTagPositionAndOrientation(refEntity_t *ent, int tagnum)
+{
+    int           i;
+    orientation_t tag_or, new_or;
+
+    tag_or = RE_TIKI_Orientation(ent, tagnum);
+
+    VectorCopy(ent->origin, new_or.origin);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(new_or.origin, tag_or.origin[i], ent->axis[i], new_or.origin);
+    }
+
+    MatrixMultiply(tag_or.axis, ent->axis, new_or.axis);
+    return new_or;
+}
+
+/*
+==============
+RB_DrawSkeletor
+==============
+*/
+void RB_DrawSkeletor(trRefEntity_t *ent)
+{
+    int         i;
+    dtiki_t    *tiki;
+    skeletor_c *skeletor;
+
+    tiki     = R_Model_GetHandle(ent->e.hModel);
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ENTITYNUM_NONE);
+
+    if (r_showSkeleton->integer == 1) {
+        //vec3_t vForward, vRight, vUp;
+        orientation_t ori;
+        orientation_t parent_or;
+        int           iParentBone;
+
+        qglLineWidth(3);
+        qglBegin(GL_LINES);
+
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) { // draw a skeleton
+
+            ori         = R_GetTagPositionAndOrientation(&ent->e, i);
+            iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
+
+            if (iParentBone != -1) {
+                parent_or = R_GetTagPositionAndOrientation(&ent->e, iParentBone);
+            } else {
+                VectorCopy(ent->e.origin, parent_or.origin);
+                AxisCopy(ent->e.axis, parent_or.axis);
+            }
+
+            qglColor3f(1, 1, 1);
+            qglVertex3fv(parent_or.origin);
+            qglVertex3fv(ori.origin);
+
+            // draw bone axis
+            /*glColor3f( 1, 0, 0 );
+			glVertex3fv( parent_or.origin );
+			VectorAdd( parent_or.origin, parent_or.axis[ 0 ], vForward );
+			glVertex3fv( vForward );
+			glVertex3fv( vForward );
+			glVertex3fv( ori.origin );
+
+			glColor3f( 0, 1, 0 );
+			glVertex3fv( parent_or.origin );
+			VectorAdd( parent_or.origin, parent_or.axis[ 1 ], vRight );
+			glVertex3fv( vRight );
+			glVertex3fv( vRight );
+			glVertex3fv( ori.origin );
+
+			glColor3f( 0, 0, 1 );
+			glVertex3fv( parent_or.origin );
+			VectorAdd( parent_or.origin, parent_or.axis[ 2 ], vUp );
+			glVertex3fv( vUp );
+			glVertex3fv( vUp );
+			glVertex3fv( ori.origin );*/
+        }
+        qglEnd();
+        qglLineWidth(1);
+    } else if (r_showSkeleton->integer == 2) { // draw skeleton with bones
+        orientation_t ori;
+        orientation_t parent_or;
+        int           iParentBone;
+
+        qglLineWidth(3);
+        qglBegin(GL_LINES);
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) {
+            iParentBone = ri.SKEL_GetBoneParent(skeletor, i);
+
+            if (iParentBone > 0) {
+                ori       = R_GetTagPositionAndOrientation(&ent->e, i);
+                parent_or = R_GetTagPositionAndOrientation(&ent->e, iParentBone);
+                qglColor3f(1, 1, 1);
+                qglVertex3fv(parent_or.origin);
+                qglVertex3fv(ori.origin);
+            }
+        }
+        qglEnd();
+
+        qglBegin(GL_LINES);
+        for (i = 0; i < ri.TIKI_GetNumChannels(tiki); i++) {
+            vec3_t up, down, front;
+            ori = R_GetTagPositionAndOrientation(&ent->e, i);
+
+            VectorCopy(ori.origin, up);
+            up[1] += 5;
+            VectorCopy(ori.origin, down);
+            down[1] += 5;
+            VectorCopy(ori.origin, front);
+            front[0] += 5;
+
+            qglColor3f(1, 0, 1);
+            qglVertex3fv(front);
+            qglVertex3fv(ori.origin);
+            qglVertex3fv(down);
+            qglVertex3fv(ori.origin);
+            qglVertex3fv(up);
+            qglVertex3fv(ori.origin);
+        }
+
+        qglEnd();
+        qglLineWidth(1);
+    }
+}
+
+surfaceType_t skelSurface = SF_TIKI_SKEL;
+
+/*
+==============
+R_AddSkelSurfaces
+==============
+*/
+void R_AddSkelSurfaces(trRefEntity_t *ent)
+{
+    dtiki_t         *tiki;
+    qboolean         personalModel;
+    float            tiki_scale;
+    vec3_t           tiki_localorigin;
+    vec3_t           tiki_worldorigin;
+    skelBoneCache_t *outbones;
+    //int tikiSurfNumOffset;
+    static cvar_t   *vmEntity = NULL;
+    skeletor_c      *skeletor;
+    float            radius;
+    SkelVec3         centroid;
+    skelAnimFrame_t *newFrame;
+    int              added;
+    shader_t        *shader;
+    dtikisurface_t  *dsurf;
+    byte            *bsurf;
+    //float range;
+    //int render_count, total_tris;
+    skelSurfaceGame_t *surface;
+    //int skinnum;
+    //float target;
+    Vector newDistance;
+    //vec3_t org;
+    int i;
+    int mesh;
+    int iRadiusCull = 0;
+    int num_tags;
+
+    tiki = ent->e.tiki;
+
+    if (!vmEntity) {
+        vmEntity = ri.Cvar_Get("viewmodelentity", "", 0);
+    }
+
+    R_UpdatePoseInternal(&ent->e);
+
+    // don't add third_person objects if in a portal
+    personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
+
+    outbones = &TIKI_Skel_Bones[TIKI_Skel_Bones_Index];
+
+    num_tags = ri.TIKI_GetNumChannels(tiki);
+
+    if (num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES) {
+        ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name);
+        return;
+    }
+
+    tiki_scale = tiki->load_scale * ent->e.scale;
+    VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+    R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+    radius = R_GetRadius(&ent->e);
+
+    if (!lod_tool->integer) {
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, radius);
+        if (r_showcull->integer & 2) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_CLIP:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f + 32.f, 1, 0.2f, 0.2f, 0.5f, qfalse);
+                break;
+            }
+        }
+
+        switch (iRadiusCull) {
+        case CULL_IN:
+            tr.pc.c_sphere_cull_md3_in++;
+            break;
+        case CULL_CLIP:
+            tr.pc.c_sphere_cull_md3_clip++;
+            break;
+        case CULL_OUT:
+            tr.pc.c_sphere_cull_md3_out++;
+            break;
+        }
+    }
+
+    if (tiki->a->bIsCharacter) {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        }
+    } else {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        }
+    }
+
+    newFrame = (skelAnimFrame_t *)ri.Hunk_AllocateTempMemory(
+        sizeof(skelAnimFrame_t) + ri.TIKI_GetNumChannels(tiki) * sizeof(SkelMat4)
+    );
+    R_GetFrame(&ent->e, newFrame);
+
+    if (lod_tool->integer || iRadiusCull != CULL_CLIP
+        || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT) {
+        //
+        // copy bones position and axis
+        //
+        for (i = 0; i < num_tags; i++) {
+            VectorCopy(newFrame->bones[i][3], outbones->offset);
+            outbones->matrix[0][0] = newFrame->bones[i][0][0];
+            outbones->matrix[0][1] = newFrame->bones[i][0][1];
+            outbones->matrix[0][2] = newFrame->bones[i][0][2];
+            outbones->matrix[0][3] = 0;
+            outbones->matrix[1][0] = newFrame->bones[i][1][0];
+            outbones->matrix[1][1] = newFrame->bones[i][1][1];
+            outbones->matrix[1][2] = newFrame->bones[i][1][2];
+            outbones->matrix[1][3] = 0;
+            outbones->matrix[2][0] = newFrame->bones[i][2][0];
+            outbones->matrix[2][1] = newFrame->bones[i][2][1];
+            outbones->matrix[2][2] = newFrame->bones[i][2][2];
+            outbones->matrix[2][3] = 0;
+            outbones++;
+        }
+    }
+
+    ri.Hunk_FreeTempMemory(newFrame);
+
+    ent->e.bonestart = TIKI_Skel_Bones_Index;
+    TIKI_Skel_Bones_Index += num_tags;
+
+    ent->e.hasMorph = qfalse;
+
+    //
+    // get the skeletor
+    //
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ent->e.entityNumber);
+
+    //
+    // add morphs
+    //
+    added = ri.SKEL_GetMorphWeightFrame(
+        skeletor, ent->e.frameInfo[0].index, ent->e.frameInfo[0].time, &skeletorMorphCache[skeletorMorphCacheIndex]
+    );
+    ent->e.morphstart = skeletorMorphCacheIndex;
+
+    if (added) {
+        // found morphs
+        skeletorMorphCacheIndex += added;
+        ent->e.hasMorph = qtrue;
+    }
+
+    //
+    // draw all meshes
+    //
+    dsurf = tiki->surfaces;
+    bsurf = &ent->e.surfaces[0];
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+
+        if (!skelmodel) {
+            ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name);
+            return;
+        }
+
+        if (lod_tool->integer && !stricmp(ent->e.tiki->a->name, lod_tikiname->string)) {
+            if (lod_mesh->integer > tiki->numMeshes - 1) {
+                ri.Cvar_Set("lod_mesh", va("%d", tiki->numMeshes - 1));
+            }
+
+            if (mesh == lod_mesh->integer) {
+                if (skelmodel->pLOD) {
+                    break;
+                }
+            }
+        }
+
+        //
+        // draw all surfaces
+        //
+        surface = skelmodel->pSurfaces;
+        for (i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext) {
+            if (*bsurf & 4) {
+                continue;
+            }
+
+            shader         = NULL;
+            surface->ident = SF_TIKI_SKEL;
+
+            // use a custom shader if specified
+            if (!(ent->e.customShader) || (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                int iShaderNum = ent->e.skinNum + (*bsurf & 3);
+
+                if (iShaderNum >= dsurf->numskins) {
+                    iShaderNum = 0;
+                }
+                shader = tr.shaders[dsurf->hShader[iShaderNum]];
+            } else {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+            }
+
+            if (!personalModel) {
+                if ((*bsurf & 0x40) && (dsurf->numskins > 1)) {
+                    int iShaderNum = ent->e.skinNum + (*bsurf & 2);
+
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum]], 0);
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum + 1]], 0);
+                } else {
+                    R_AddDrawSurf((surfaceType_t *)surface, shader, 0);
+                }
+            }
+
+            if ((ent->e.customShader) && (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+                R_AddDrawSurf((surfaceType_t *)surface, shader, 0);
+            }
+        }
+    }
+
+    // FIXME: setup LOD
+}
+
+/*
+=============
+SkelVertGetNormal
+=============
+*/
+inline static void SkelVertGetNormal(skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] = vert->normal[0] * bone->matrix[0][0] + vert->normal[1] * bone->matrix[1][0]
+           + vert->normal[2] * bone->matrix[2][0];
+
+    out[1] = vert->normal[0] * bone->matrix[0][1] + vert->normal[1] * bone->matrix[1][1]
+           + vert->normal[2] * bone->matrix[2][1];
+
+    out[2] = vert->normal[0] * bone->matrix[0][2] + vert->normal[1] * bone->matrix[1][2]
+           + vert->normal[2] * bone->matrix[2][2];
+}
+
+/*
+=============
+SkelMorphGetXyz
+=============
+*/
+inline static void SkelMorphGetXyz(skeletorMorph_t *morph, int *morphcache, vec3_t out)
+{
+    VectorMA(out, *morphcache, morph->offset, out);
+}
+
+/*
+=============
+SkelWeightGetXyz
+=============
+*/
+inline static void SkelWeightGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] += ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                + weight->offset[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                + weight->offset[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                + weight->offset[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+SkelWeightMorphGetXyz
+=============
+*/
+inline static void SkelWeightMorphGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out)
+{
+    vec3_t point;
+
+    VectorAdd(totalmorph, weight->offset, point);
+
+    out[0] += ((point[0] * bone->matrix[0][0] + point[1] * bone->matrix[1][0] + point[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((point[0] * bone->matrix[0][1] + point[1] * bone->matrix[1][1] + point[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((point[0] * bone->matrix[0][2] + point[1] * bone->matrix[1][2] + point[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+RB_SkelMesh
+=============
+*/
+void RB_SkelMesh(skelSurfaceGame_t *sf)
+{
+    unsigned int       baseIndex, baseVertex;
+    unsigned int       render_count;
+    unsigned int       indexes;
+    float             *outXyz;
+    vec4_t            *outNormal;
+    skelIndex_t       *triangles;
+    skelIndex_t       *collapse_map;
+    skeletorVertex_t  *newVerts;
+    skeletorMorph_t   *morph;
+    skelWeight_t      *weight;
+    int                vertNum;
+    int                morphNum;
+    int                weightNum;
+    skelBoneCache_t   *bones;
+    skelBoneCache_t   *bone;
+    int               *morphs;
+    int               *morphcache;
+    float              scale;
+    dtiki_t           *tiki;
+    int                mesh;
+    int                surf;
+    int                i;
+    skelHeaderGame_t  *skelmodel;
+    skelSurfaceGame_t *psurface;
+    qboolean           bFound;
+    short              collapse[TIKI_MAX_VERTEXES];
+
+    if (!r_drawentitypoly->integer) {
+        return;
+    }
+
+    tiki = backEnd.currentEntity->e.tiki;
+
+    scale = tiki->load_scale * backEnd.currentEntity->e.scale;
+
+    //
+    // get the mesh associated with the surface
+    //
+    bFound = qfalse;
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+        psurface  = skelmodel->pSurfaces;
+
+        // find the surface
+        for (surf = 0; surf < skelmodel->numSurfaces; surf++) {
+            if (psurface == sf) {
+                bFound = qtrue;
+                break;
+            }
+            psurface = psurface->pNext;
+        }
+
+        if (bFound) {
+            break;
+        }
+    }
+
+    assert(bFound);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD) {
+        float lod_val;
+        int   renderfx;
+
+        lod_val  = backEnd.currentEntity->lodpercentage[0];
+        renderfx = backEnd.currentEntity->e.renderfx;
+
+        if (sf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentEntity->e.tiki->a->name, lod_tikiname->string)
+                && mesh == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0], renderfx);
+            }
+
+            collapseIndex = sf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = sf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = sf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = sf->numVerts;
+    }
+
+    indexes = sf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, indexes);
+
+    collapse_map = sf->pCollapse;
+    triangles    = sf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    outXyz    = tess.xyz[baseVertex];
+    outNormal = &tess.normal[baseVertex];
+    newVerts  = sf->pVerts;
+
+    if (render_count == sf->numVerts) {
+        for (i = 0; i < indexes; i++) {
+            tess.indexes[baseIndex + i] = baseVertex + triangles[i];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        assert(sf->numVerts < TIKI_MAX_VERTEXES);
+
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+
+        for (i = render_count; i < sf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (i = 0; i < indexes; i += 3) {
+            assert(collapse[triangles[i]] < sf->numVerts);
+            assert(collapse[triangles[i + 1]] < sf->numVerts);
+            assert(collapse[triangles[i + 2]] < sf->numVerts);
+
+            if (collapse[triangles[i]] == collapse[triangles[i + 1]]
+                || collapse[triangles[i + 1]] == collapse[triangles[i + 2]]
+                || collapse[triangles[i + 2]] == collapse[triangles[i]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + i]     = baseVertex + collapse[triangles[i]];
+            tess.indexes[baseIndex + i + 1] = baseVertex + collapse[triangles[i + 1]];
+            tess.indexes[baseIndex + i + 2] = baseVertex + collapse[triangles[i + 2]];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += i;
+    }
+
+    //
+    // just copy the vertexes
+    //
+    bones  = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
+    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
+
+    if (backEnd.currentEntity->e.hasMorph) {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    channelNum = skelmodel->pBones[morph->morphIndex].channel;
+                } else {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                }
+
+                boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone    = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    bone = &bones[morph->morphIndex];
+                } else {
+                    bone = &bones[weight->boneIndex];
+                }
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        }
+    } else {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone       = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                bone = &bones[weight->boneIndex];
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                VectorCopy(normal, *outNormal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][0][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal++;
+            }
+        }
+    }
+
+#if 0
+	if( backEnd.currentEntity->e.staticModelIndex ) {
+		mstaticModel_t *sm;
+		color4ub_t *out;
+		color3ub_t *in;
+		int cdofs;
+		skdSurface_t *sf2;
+
+		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
+
+		tess.useStaticModelVertexColors = qtrue;
+
+		cdofs = 0;
+		sf2 = tiki->surfs;
+		while( sf2 != sf ) {
+			cdofs += sf2->numVerts;
+			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
+		}
+
+		in = &tr.world->smColors[ sm->firstVert + cdofs ];
+		out = tess.vertexColors + baseVertex;
+		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
+#    if 1
+			( *out )[ 0 ] = ( *in )[ 0 ];
+			( *out )[ 1 ] = ( *in )[ 1 ];
+			( *out )[ 2 ] = ( *in )[ 2 ];
+			( *out )[ 3 ] = 255;
+#    elif 0
+			( ( int* )out ) = tr.identityLightByte;
+#    else		
+			// su44: set it to something special so
+			// I can debug vertex colors rendering
+			( *out )[ 0 ] = 255;
+			( *out )[ 1 ] = 0;
+			( *out )[ 2 ] = 0;
+			( *out )[ 3 ] = 255;
+#    endif
+		}
+	} //else
+#endif
+    //{
+    //	// an attemp to fix bizarre vertex colors bug
+    //	color4ub_t *col;
+    //
+    //	col = &tess.vertexColors[baseVertex];
+    //	for(i = 0; i < sf->numVerts; i++,col++) {
+    //		(*col)[0] = 255;
+    //		(*col)[1] = 255;
+    //		(*col)[2] = 255;
+    //		(*col)[3] = 255;
+    //	}
+    //}
+    //tess.numVertexes += sf->numVerts;
+}
+
+/*
+=============
+RB_StaticMesh
+=============
+*/
+void RB_StaticMesh(staticSurface_t *staticSurf)
+{
+    int                i, j;
+    dtiki_t           *tiki;
+    skelSurfaceGame_t *surf;
+    int                meshNum;
+    skelHeaderGame_t  *skelmodel;
+    int                render_count;
+    skelIndex_t       *collapse_map;
+    skelIndex_t       *triangles;
+    int                indexes;
+    int                baseIndex, baseVertex;
+    short              collapse[1000];
+
+    if (!r_drawstaticmodelpoly->integer) {
+        return;
+    }
+
+    assert(backEnd.currentStaticModel);
+    tiki = backEnd.currentStaticModel->tiki;
+    surf = staticSurf->surface;
+
+    assert(surf->pStaticXyz);
+    if (!surf->pStaticXyz) {
+        return;
+    }
+
+    meshNum   = staticSurf->meshNum;
+    skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD && r_staticlod->integer) {
+        float lod_val;
+
+        lod_val = backEnd.currentStaticModel->lodpercentage[0];
+
+        if (surf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
+                && meshNum == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
+            }
+
+            collapseIndex = surf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = surf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = surf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = surf->numVerts;
+    }
+
+    indexes = surf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, surf->numTriangles);
+
+    collapse_map = surf->pCollapse;
+    triangles    = surf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    if (render_count == surf->numVerts) {
+        for (j = 0; j < indexes; j++) {
+            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+        for (i = render_count; i < surf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (j = 0; j < indexes; j += 3) {
+            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
+                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
+                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
+            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
+            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += j;
+        tess.numIndexes += j;
+    }
+
+    for (j = 0; j < render_count; j++) {
+        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
+        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
+        tess.texCoords[baseVertex + j][0][0] = surf->pStaticTexCoords[j][0][0];
+        tess.texCoords[baseVertex + j][0][1] = surf->pStaticTexCoords[j][0][1];
+        tess.texCoords[baseVertex + j][1][0] = surf->pStaticTexCoords[j][1][0];
+        tess.texCoords[baseVertex + j][1][1] = surf->pStaticTexCoords[j][1][1];
+    }
+
+    if (backEndData->staticModelData) {
+        const size_t offset =
+            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
+        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
+        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
+
+        const color4ub_t *in = (const color4ub_t *)&backEndData->staticModelData[offset];
+
+        for (i = 0; i < render_count; i++) {
+            tess.vertexColors[baseVertex + i][0] = in[i][0];
+            tess.vertexColors[baseVertex + i][1] = in[i][1];
+            tess.vertexColors[baseVertex + i][2] = in[i][2];
+            tess.vertexColors[baseVertex + i][3] = in[i][3];
+        }
+    } else {
+        for (i = 0; i < render_count; i++) {
+            tess.vertexColors[baseVertex + i][0] = 0xFF;
+            tess.vertexColors[baseVertex + i][1] = 0xFF;
+            tess.vertexColors[baseVertex + i][2] = 0xFF;
+            tess.vertexColors[baseVertex + i][3] = 0xFF;
+        }
+    }
+
+    tess.vertexColorValid = qtrue;
+}
+
+/*
+=============
+R_InfoWorldTris_f
+=============
+*/
+void R_InfoWorldTris_f(void)
+{
+    int i;
+
+    g_bInfoworldtris = qtrue;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        entityNumIndexes[i] = 0;
+    }
+    for (i = 0; i < ARRAY_LEN(staticModelNumIndexes); i++) {
+        staticModelNumIndexes[i] = 0;
+    }
+}
+
+/*
+=============
+R_PrintInfoWorldtris
+=============
+*/
+void R_PrintInfoWorldtris(void)
+{
+    int               i;
+    int               numTris;
+    int               totalNumTris;
+    dtiki_t          *tiki;
+    skelHeaderGame_t *skelmodel;
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = entityNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.entities[i].e.tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        ri.Printf(PRINT_ALL, "ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    ri.Printf(PRINT_ALL, "total entity tris: %i\n\n", totalNumTris);
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = staticModelNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.staticModels[i].tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        ri.Printf(PRINT_ALL, "sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    ri.Printf(PRINT_ALL, "total static model tris: %i\n\n", totalNumTris);
+}
+
+/*
+=============
+RE_SetFrameNumber
+=============
+*/
+void RE_SetFrameNumber(int frameNumber)
+{
+    tr.frame_skel_index = frameNumber;
+}
+
+/*
+=============
+R_UpdatePoseInternal
+=============
+*/
+void R_UpdatePoseInternal(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        if (tr.skel_index[model->entityNumber] == tr.frame_skel_index) {
+            return;
+        }
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_ForceUpdatePose
+=============
+*/
+void RE_ForceUpdatePose(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_TIKI_Orientation
+=============
+*/
+orientation_t RE_TIKI_Orientation(refEntity_t *model, int tagnum)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_OrientationInternal(model->tiki, model->entityNumber, tagnum, model->scale);
+}
+
+/*
+=============
+RE_TIKI_IsOnGround
+=============
+*/
+qboolean RE_TIKI_IsOnGround(refEntity_t *model, int tagnum, float threshold)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_IsOnGroundInternal(model->tiki, model->entityNumber, tagnum, threshold);
+}
+
+/*
+=============
+R_GetRadius
+=============
+*/
+float R_GetRadius(refEntity_t *model)
+{
+    R_UpdatePoseInternal(model);
+    return ri.GetRadiusInternal(model->tiki, model->entityNumber, model->scale);
+}
+
+/*
+=============
+R_GetFrame
+=============
+*/
+void R_GetFrame(refEntity_t *model, struct skelAnimFrame_s *newFrame)
+{
+    R_UpdatePoseInternal(model);
+    ri.GetFrameInternal(model->tiki, model->entityNumber, newFrame);
+}
+
+/*
+=============
+R_DebugSkeleton
+=============
+*/
+void R_DebugSkeleton(void)
+{
+    int            i;
+    trRefEntity_t *ent;
+    model_t       *model;
+
+    if (!r_showSkeleton->integer) {
+        return;
+    }
+
+    R_IssuePendingRenderCommands();
+
+    GL_Bind(tr.whiteImage);
+    GL_State(GLS_POLYMODE_LINE);
+
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    for (i = 0; i < tr.refdef.num_entities; i++) {
+        ent = &tr.refdef.entities[i];
+
+        if (ent->e.reType == RT_MODEL) {
+            model = R_GetModelByHandle(ent->e.hModel);
+
+            if (model->type == MOD_TIKI) {
+                RE_ForceUpdatePose(&ent->e);
+                RB_DrawSkeletor(ent);
+            }
+        }
+    }
+}
+
+/*
+=============
+ProjectRadius
+=============
+*/
+static float ProjectRadius(float r, const vec3_t location)
+{
+    Vector separation;
+    float  projectedRadius;
+
+    separation      = Vector(tr.viewParms.ori.origin) - Vector(location);
+    projectedRadius = separation.length();
+
+    return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
+}
+
+/*
+=============
+R_CalcLod
+=============
+*/
+float R_CalcLod(const vec3_t origin, float radius)
+{
+    return ProjectRadius(radius, origin);
+}
+
+/*
+=============
+R_CullTIKI
+=============
+*/
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg)
+{
+    vec3_t bounds[2];
+    vec3_t delta;
+    int    i;
+    int    cull;
+
+    // FIXME: not working properly
+    return CULL_IN;
+
+    if (tr.currentEntity->e.renderfx & RF_FRAMELERP) {
+        VectorSubtract(e->origin, e->oldorigin, delta);
+    } else {
+        VectorClear(delta);
+    }
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = newFrame->bounds[0][i] * fScale + vLocalOrg[i];
+        bounds[1][i] = newFrame->bounds[1][i] * fScale + vLocalOrg[i];
+
+        if (delta[i] > 0) {
+            bounds[1][i] += delta[i];
+        } else {
+            bounds[0][i] += delta[i];
+        }
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 1) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_IN:
+            fR = 0;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_CLIP:
+            fR = 1;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_OUT:
+            fR = 1;
+            fG = 0.2f;
+            fB = 0.2f;
+
+            for (i = 0; i < 3; i++) {
+                bounds[0][i] -= 16;
+                bounds[1][i] += 16;
+            }
+            break;
+        }
+
+        MatrixToEulerAngles(tr.ori.axis, vAngles);
+        R_DebugRotatedBBox(tr.ori.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        return CULL_IN;
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        return CULL_CLIP;
+    case CULL_OUT:
+    default:
+        tr.pc.c_box_cull_md3_out++;
+        return CULL_OUT;
+    }
+}
+
+/*
+==================
+R_CountTikiLodTris
+
+Computes the number of triangles to be rendered for the given TIKI model
+based on the given LoD percentage, and passes it back with render_tris.
+The total number of triangles in the TIKI model are passed back with total_tris.
+Currently only used for debugging purposes.
+
+FIXME: Shares some code with RB_StaticMesh, common parts could be extracted.
+According to debug symbols, this was originally in tiki_mesh.cpp
+==================
+*/
+void R_CountTikiLodTris(dtiki_t *tiki, float lodpercentage, int *render_tris, int *total_tris)
+{
+    *render_tris = 0;
+    *total_tris  = 0;
+    int numtris = 0, totaltris = 0;
+
+    for (int i = 0; i < tiki->numMeshes; i++) {
+        skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
+        skelSurfaceGame_t *surface   = skelmodel->pSurfaces;
+
+        for (int j = 0; j < skelmodel->numSurfaces; j++) {
+            int render_count = 0;
+            if (skelmodel->pLOD) {
+                int          lod_cutoff    = GetLodCutoff(skelmodel, lodpercentage, 0);
+                skelIndex_t *collapseIndex = surface->pCollapseIndex;
+                render_count               = surface->numVerts;
+
+                // Determine the number of vertices to be rendered based on the LOD cutoff
+                while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff) {
+                    render_count--;
+                }
+            } else {
+                // The surf mesh doesn't have a LOD model, so all vertices will be rendered
+                render_count = surface->numVerts;
+            }
+
+            skelIndex_t *triangles    = surface->pTriangles;
+            int          indexes      = surface->numTriangles * 3; // 3 vertex/index for each tri
+            skelIndex_t *collapse_map = surface->pCollapse;
+            totaltris += surface->numTriangles;
+            skelIndex_t collapse[4096] {};
+
+            // Initialize array for collapsed indices
+            int k;
+            for (k = 0; k < render_count; ++k) {
+                collapse[k] = k;
+            }
+
+            // Map remaining vertices to their collapsed indices using the collapse map
+            for (k = render_count; k < surface->numVerts; ++k) {
+                collapse[k] = collapse[collapse_map[k]];
+            }
+
+            // Check the first two collapsed indices of each triangle
+            for (k = 0; k < indexes; k += 3) {
+                if (collapse[triangles[k]] == collapse[triangles[k + 1]]) {
+                    // The collapsed indices of the two vertices are the same:
+                    // this, and any subsequent tris do not need to be rendered
+                    // because the collapsed vertices (for this surface) coincide from here.
+                    break;
+                }
+            }
+
+            surface = surface->pNext;
+            numtris += k / 3;
+        }
+    }
+
+    *render_tris = numtris;
+    *total_tris  = totaltris;
+}
+
+/*
+==================
+R_LerpTag
+==================
+*/
+int R_LerpTag(orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, float frac, const char *tagName)
+{
+    // stub
+    return 0;
+}
\ No newline at end of file
diff --git a/code/renderergl1/tr_model_iqm.c b/code/renderergl1/tr_model_iqm.c
deleted file mode 100644
index 5050eb10..00000000
--- a/code/renderergl1/tr_model_iqm.c
+++ /dev/null
@@ -1,1495 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2011 Thilo Schulz <thilo@tjps.eu>
-Copyright (C) 2011 Matthias Bentrup <matthias.bentrup@googlemail.com>
-Copyright (C) 2011-2019 Zack Middleton <zturtleman@gmail.com>
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "tr_local.h"
-
-#define	LL(x) x=LittleLong(x)
-
-// 3x4 identity matrix
-static float identityMatrix[12] = {
-	1, 0, 0, 0,
-	0, 1, 0, 0,
-	0, 0, 1, 0
-};
-
-static qboolean IQM_CheckRange( iqmHeader_t *header, int offset,
-				int count, int size ) {
-	// return true if the range specified by offset, count and size
-	// doesn't fit into the file
-	return ( count <= 0 ||
-		 offset <= 0 ||
-		 offset > header->filesize ||
-		 offset + count * size < 0 ||
-		 offset + count * size > header->filesize );
-}
-// "multiply" 3x4 matrices, these are assumed to be the top 3 rows
-// of a 4x4 matrix with the last row = (0 0 0 1)
-static void Matrix34Multiply( const float *a, const float *b, float *out ) {
-	out[ 0] = a[0] * b[0] + a[1] * b[4] + a[ 2] * b[ 8];
-	out[ 1] = a[0] * b[1] + a[1] * b[5] + a[ 2] * b[ 9];
-	out[ 2] = a[0] * b[2] + a[1] * b[6] + a[ 2] * b[10];
-	out[ 3] = a[0] * b[3] + a[1] * b[7] + a[ 2] * b[11] + a[ 3];
-	out[ 4] = a[4] * b[0] + a[5] * b[4] + a[ 6] * b[ 8];
-	out[ 5] = a[4] * b[1] + a[5] * b[5] + a[ 6] * b[ 9];
-	out[ 6] = a[4] * b[2] + a[5] * b[6] + a[ 6] * b[10];
-	out[ 7] = a[4] * b[3] + a[5] * b[7] + a[ 6] * b[11] + a[ 7];
-	out[ 8] = a[8] * b[0] + a[9] * b[4] + a[10] * b[ 8];
-	out[ 9] = a[8] * b[1] + a[9] * b[5] + a[10] * b[ 9];
-	out[10] = a[8] * b[2] + a[9] * b[6] + a[10] * b[10];
-	out[11] = a[8] * b[3] + a[9] * b[7] + a[10] * b[11] + a[11];
-}
-static void JointToMatrix( const quat_t rot, const vec3_t scale, const vec3_t trans,
-			   float *mat ) {
-	float xx = 2.0f * rot[0] * rot[0];
-	float yy = 2.0f * rot[1] * rot[1];
-	float zz = 2.0f * rot[2] * rot[2];
-	float xy = 2.0f * rot[0] * rot[1];
-	float xz = 2.0f * rot[0] * rot[2];
-	float yz = 2.0f * rot[1] * rot[2];
-	float wx = 2.0f * rot[3] * rot[0];
-	float wy = 2.0f * rot[3] * rot[1];
-	float wz = 2.0f * rot[3] * rot[2];
-
-	mat[ 0] = scale[0] * (1.0f - (yy + zz));
-	mat[ 1] = scale[0] * (xy - wz);
-	mat[ 2] = scale[0] * (xz + wy);
-	mat[ 3] = trans[0];
-	mat[ 4] = scale[1] * (xy + wz);
-	mat[ 5] = scale[1] * (1.0f - (xx + zz));
-	mat[ 6] = scale[1] * (yz - wx);
-	mat[ 7] = trans[1];
-	mat[ 8] = scale[2] * (xz - wy);
-	mat[ 9] = scale[2] * (yz + wx);
-	mat[10] = scale[2] * (1.0f - (xx + yy));
-	mat[11] = trans[2];
-}
-static void Matrix34Invert( const float *inMat, float *outMat ) {
-	vec3_t trans;
-	float invSqrLen, *v;
-
-	outMat[ 0] = inMat[ 0]; outMat[ 1] = inMat[ 4]; outMat[ 2] = inMat[ 8];
-	outMat[ 4] = inMat[ 1]; outMat[ 5] = inMat[ 5]; outMat[ 6] = inMat[ 9];
-	outMat[ 8] = inMat[ 2]; outMat[ 9] = inMat[ 6]; outMat[10] = inMat[10];
-
-	v = outMat + 0; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-	v = outMat + 4; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-	v = outMat + 8; invSqrLen = 1.0f / DotProduct(v, v); VectorScale(v, invSqrLen, v);
-
-	trans[0] = inMat[ 3];
-	trans[1] = inMat[ 7];
-	trans[2] = inMat[11];
-
-	outMat[ 3] = -DotProduct(outMat + 0, trans);
-	outMat[ 7] = -DotProduct(outMat + 4, trans);
-	outMat[11] = -DotProduct(outMat + 8, trans);
-}
-static void QuatSlerp(const quat_t from, const quat_t _to, float fraction, quat_t out) {
-	float angle, cosAngle, sinAngle, backlerp, lerp;
-	quat_t to;
-
-	// cos() of angle
-	cosAngle = from[0] * _to[0] + from[1] * _to[1] + from[2] * _to[2] + from[3] * _to[3];
-
-	// negative handling is needed for taking shortest path (required for model joints)
-	if ( cosAngle < 0.0f ) {
-		cosAngle = -cosAngle;
-		to[0] = - _to[0];
-		to[1] = - _to[1];
-		to[2] = - _to[2];
-		to[3] = - _to[3];
-	} else {
-		QuatCopy( _to, to );
-	}
-
-	if ( cosAngle < 0.999999f ) {
-		// spherical lerp (slerp)
-		angle = acosf( cosAngle );
-		sinAngle = sinf( angle );
-		backlerp = sinf( ( 1.0f - fraction ) * angle ) / sinAngle;
-		lerp = sinf( fraction * angle ) / sinAngle;
-	} else {
-		// linear lerp
-		backlerp = 1.0f - fraction;
-		lerp = fraction;
-	}
-
-	out[0] = from[0] * backlerp + to[0] * lerp;
-	out[1] = from[1] * backlerp + to[1] * lerp;
-	out[2] = from[2] * backlerp + to[2] * lerp;
-	out[3] = from[3] * backlerp + to[3] * lerp;
-}
-static vec_t QuatNormalize2( const quat_t v, quat_t out) {
-	float	length, ilength;
-
-	length = v[0]*v[0] + v[1]*v[1] + v[2]*v[2] + v[3]*v[3];
-
-	if (length) {
-		/* writing it this way allows gcc to recognize that rsqrt can be used */
-		ilength = 1/(float)sqrt (length);
-		/* sqrt(length) = length * (1 / sqrt(length)) */
-		length *= ilength;
-		out[0] = v[0]*ilength;
-		out[1] = v[1]*ilength;
-		out[2] = v[2]*ilength;
-		out[3] = v[3]*ilength;
-	} else {
-		out[0] = out[1] = out[2] = 0;
-		out[3] = -1;
-	}
-
-	return length;
-}
-
-/*
-=================
-R_LoadIQM
-
-Load an IQM model and compute the joint matrices for every frame.
-=================
-*/
-qboolean R_LoadIQM( model_t *mod, void *buffer, int filesize, const char *mod_name ) {
-	iqmHeader_t		*header;
-	iqmVertexArray_t	*vertexarray;
-	iqmTriangle_t		*triangle;
-	iqmMesh_t		*mesh;
-	iqmJoint_t		*joint;
-	iqmPose_t		*pose;
-	iqmBounds_t		*bounds;
-	unsigned short		*framedata;
-	char			*str;
-	int			i, j, k;
-	iqmTransform_t		*transform;
-	float			*mat, *matInv;
-	size_t			size, joint_names;
-	byte			*dataPtr;
-	iqmData_t		*iqmData;
-	srfIQModel_t		*surface;
-	char			meshName[MAX_QPATH];
-	int				vertexArrayFormat[IQM_COLOR+1];
-	int				allocateInfluences;
-	byte *blendIndexes;
-	union {
-		byte *b;
-		float *f;
-	} blendWeights;
-
-	if( filesize < sizeof(iqmHeader_t) ) {
-		return qfalse;
-	}
-
-	header = (iqmHeader_t *)buffer;
-	if( Q_strncmp( header->magic, IQM_MAGIC, sizeof(header->magic) ) ) {
-		return qfalse;
-	}
-
-	LL( header->version );
-	if( header->version != IQM_VERSION ) {
-		ri.Printf(PRINT_WARNING, "R_LoadIQM: %s is a unsupported IQM version (%d), only version %d is supported.\n",
-				mod_name, header->version, IQM_VERSION);
-		return qfalse;
-	}
-
-	LL( header->filesize );
-	if( header->filesize > filesize || header->filesize > 16<<20 ) {
-		return qfalse;
-	}
-
-	LL( header->flags );
-	LL( header->num_text );
-	LL( header->ofs_text );
-	LL( header->num_meshes );
-	LL( header->ofs_meshes );
-	LL( header->num_vertexarrays );
-	LL( header->num_vertexes );
-	LL( header->ofs_vertexarrays );
-	LL( header->num_triangles );
-	LL( header->ofs_triangles );
-	LL( header->ofs_adjacency );
-	LL( header->num_joints );
-	LL( header->ofs_joints );
-	LL( header->num_poses );
-	LL( header->ofs_poses );
-	LL( header->num_anims );
-	LL( header->ofs_anims );
-	LL( header->num_frames );
-	LL( header->num_framechannels );
-	LL( header->ofs_frames );
-	LL( header->ofs_bounds );
-	LL( header->num_comment );
-	LL( header->ofs_comment );
-	LL( header->num_extensions );
-	LL( header->ofs_extensions );
-
-	// check ioq3 joint limit
-	if ( header->num_joints > IQM_MAX_JOINTS ) {
-		ri.Printf(PRINT_WARNING, "R_LoadIQM: %s has more than %d joints (%d).\n",
-				mod_name, IQM_MAX_JOINTS, header->num_joints);
-		return qfalse;
-	}
-
-	for ( i = 0; i < ARRAY_LEN( vertexArrayFormat ); i++ ) {
-		vertexArrayFormat[i] = -1;
-	}
-
-	blendIndexes = NULL;
-	blendWeights.b = NULL;
-
-	allocateInfluences = 0;
-
-	if ( header->num_meshes )
-	{
-		// check and swap vertex arrays
-		if( IQM_CheckRange( header, header->ofs_vertexarrays,
-				    header->num_vertexarrays,
-				    sizeof(iqmVertexArray_t) ) ) {
-			return qfalse;
-		}
-		vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
-		for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-			int	n, *intPtr;
-
-			if( vertexarray->size <= 0 || vertexarray->size > 4 ) {
-				return qfalse;
-			}
-
-			// total number of values
-			n = header->num_vertexes * vertexarray->size;
-
-			switch( vertexarray->format ) {
-			case IQM_BYTE:
-			case IQM_UBYTE:
-				// 1 byte, no swapping necessary
-				if( IQM_CheckRange( header, vertexarray->offset,
-						    n, sizeof(byte) ) ) {
-					return qfalse;
-				}
-				break;
-			case IQM_INT:
-			case IQM_UINT:
-			case IQM_FLOAT:
-				// 4-byte swap
-				if( IQM_CheckRange( header, vertexarray->offset,
-						    n, sizeof(float) ) ) {
-					return qfalse;
-				}
-				intPtr = (int *)((byte *)header + vertexarray->offset);
-				for( j = 0; j < n; j++, intPtr++ ) {
-					LL( *intPtr );
-				}
-				break;
-			default:
-				// not supported
-				return qfalse;
-				break;
-			}
-
-			if( vertexarray->type < ARRAY_LEN( vertexArrayFormat ) ) {
-				vertexArrayFormat[vertexarray->type] = vertexarray->format;
-			}
-
-			switch( vertexarray->type ) {
-			case IQM_POSITION:
-			case IQM_NORMAL:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 3 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_TANGENT:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_TEXCOORD:
-				if( vertexarray->format != IQM_FLOAT ||
-				    vertexarray->size != 2 ) {
-					return qfalse;
-				}
-				break;
-			case IQM_BLENDINDEXES:
-				if( (vertexarray->format != IQM_INT &&
-					 vertexarray->format != IQM_UBYTE) ||
-					vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				blendIndexes = (byte*)header + vertexarray->offset;
-				break;
-			case IQM_BLENDWEIGHTS:
-				if( (vertexarray->format != IQM_FLOAT &&
-					 vertexarray->format != IQM_UBYTE) ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				if( vertexarray->format == IQM_FLOAT ) {
-					blendWeights.f = (float*)( (byte*)header + vertexarray->offset );
-				} else {
-					blendWeights.b = (byte*)header + vertexarray->offset;
-				}
-				break;
-			case IQM_COLOR:
-				if( vertexarray->format != IQM_UBYTE ||
-				    vertexarray->size != 4 ) {
-					return qfalse;
-				}
-				break;
-			}
-		}
-
-		// check for required vertex arrays
-		if( vertexArrayFormat[IQM_POSITION] == -1 || vertexArrayFormat[IQM_NORMAL] == -1 || vertexArrayFormat[IQM_TEXCOORD] == -1 ) {
-			ri.Printf( PRINT_WARNING, "R_LoadIQM: %s is missing IQM_POSITION, IQM_NORMAL, and/or IQM_TEXCOORD array.\n", mod_name );
-			return qfalse;
-		}
-
-		if( header->num_joints ) {
-			if( vertexArrayFormat[IQM_BLENDINDEXES] == -1 || vertexArrayFormat[IQM_BLENDWEIGHTS] == -1 ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s is missing IQM_BLENDINDEXES and/or IQM_BLENDWEIGHTS array.\n", mod_name );
-				return qfalse;
-			}
-		} else {
-			// ignore blend arrays if present
-			vertexArrayFormat[IQM_BLENDINDEXES] = -1;
-			vertexArrayFormat[IQM_BLENDWEIGHTS] = -1;
-		}
-
-		// opengl1 renderer doesn't use tangents
-		vertexArrayFormat[IQM_TANGENT] = -1;
-
-		// check and swap triangles
-		if( IQM_CheckRange( header, header->ofs_triangles,
-				    header->num_triangles, sizeof(iqmTriangle_t) ) ) {
-			return qfalse;
-		}
-		triangle = (iqmTriangle_t *)((byte *)header + header->ofs_triangles);
-		for( i = 0; i < header->num_triangles; i++, triangle++ ) {
-			LL( triangle->vertex[0] );
-			LL( triangle->vertex[1] );
-			LL( triangle->vertex[2] );
-
-			if( triangle->vertex[0] > header->num_vertexes ||
-			    triangle->vertex[1] > header->num_vertexes ||
-			    triangle->vertex[2] > header->num_vertexes ) {
-				return qfalse;
-			}
-		}
-
-		// check and swap meshes
-		if( IQM_CheckRange( header, header->ofs_meshes,
-				    header->num_meshes, sizeof(iqmMesh_t) ) ) {
-			return qfalse;
-		}
-		mesh = (iqmMesh_t *)((byte *)header + header->ofs_meshes);
-		for( i = 0; i < header->num_meshes; i++, mesh++) {
-			LL( mesh->name );
-			LL( mesh->material );
-			LL( mesh->first_vertex );
-			LL( mesh->num_vertexes );
-			LL( mesh->first_triangle );
-			LL( mesh->num_triangles );
-
-			if ( mesh->name < header->num_text ) {
-				Q_strncpyz( meshName, (char*)header + header->ofs_text + mesh->name, sizeof (meshName) );
-			} else {
-				meshName[0] = '\0';
-			}
-
-			// check ioq3 limits
-			if ( mesh->num_vertexes >= SHADER_MAX_VERTEXES ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has more than %i verts on %s (%i).\n",
-					  mod_name, SHADER_MAX_VERTEXES - 1, meshName[0] ? meshName : "a surface",
-					  mesh->num_vertexes );
-				return qfalse;
-			}
-			if ( mesh->num_triangles*3 >= SHADER_MAX_INDEXES ) {
-				ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has more than %i triangles on %s (%i).\n",
-					  mod_name, ( SHADER_MAX_INDEXES / 3 ) - 1, meshName[0] ? meshName : "a surface",
-					  mesh->num_triangles );
-				return qfalse;
-			}
-
-			if( mesh->first_vertex >= header->num_vertexes ||
-			    mesh->first_vertex + mesh->num_vertexes > header->num_vertexes ||
-			    mesh->first_triangle >= header->num_triangles ||
-			    mesh->first_triangle + mesh->num_triangles > header->num_triangles ||
-			    mesh->name >= header->num_text ||
-			    mesh->material >= header->num_text ) {
-				return qfalse;
-			}
-
-			// find number of unique blend influences per mesh
-			if( header->num_joints ) {
-				for( j = 0; j < mesh->num_vertexes; j++ ) {
-					int vtx = mesh->first_vertex + j;
-
-					for( k = 0; k < j; k++ ) {
-						int influence = mesh->first_vertex + k;
-
-						if( *(int*)&blendIndexes[4*influence] != *(int*)&blendIndexes[4*vtx] ) {
-							continue;
-						}
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							if ( blendWeights.f[4*influence+0] == blendWeights.f[4*vtx+0] &&
-							     blendWeights.f[4*influence+1] == blendWeights.f[4*vtx+1] &&
-							     blendWeights.f[4*influence+2] == blendWeights.f[4*vtx+2] &&
-							     blendWeights.f[4*influence+3] == blendWeights.f[4*vtx+3] ) {
-								break;
-							}
-						} else {
-							if ( *(int*)&blendWeights.b[4*influence] == *(int*)&blendWeights.b[4*vtx] ) {
-								break;
-							}
-						}
-					}
-
-					if ( k == j ) {
-						allocateInfluences++;
-					}
-				}
-			}
-		}
-	}
-
-	if( header->num_poses != header->num_joints && header->num_poses != 0 ) {
-		ri.Printf( PRINT_WARNING, "R_LoadIQM: %s has %d poses and %d joints, must have the same number or 0 poses\n",
-			  mod_name, header->num_poses, header->num_joints );
-		return qfalse;
-	}
-
-	joint_names = 0;
-
-	if ( header->num_joints )
-	{
-		// check and swap joints
-		if( IQM_CheckRange( header, header->ofs_joints,
-					header->num_joints, sizeof(iqmJoint_t) ) ) {
-			return qfalse;
-		}
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			LL( joint->name );
-			LL( joint->parent );
-			LL( joint->translate[0] );
-			LL( joint->translate[1] );
-			LL( joint->translate[2] );
-			LL( joint->rotate[0] );
-			LL( joint->rotate[1] );
-			LL( joint->rotate[2] );
-			LL( joint->rotate[3] );
-			LL( joint->scale[0] );
-			LL( joint->scale[1] );
-			LL( joint->scale[2] );
-
-			if( joint->parent < -1 ||
-				joint->parent >= (int)header->num_joints ||
-				joint->name >= (int)header->num_text ) {
-				return qfalse;
-			}
-			joint_names += strlen( (char *)header + header->ofs_text +
-						   joint->name ) + 1;
-		}
-	}
-
-	if ( header->num_poses )
-	{
-		// check and swap poses
-		if( IQM_CheckRange( header, header->ofs_poses,
-					header->num_poses, sizeof(iqmPose_t) ) ) {
-			return qfalse;
-		}
-		pose = (iqmPose_t *)((byte *)header + header->ofs_poses);
-		for( i = 0; i < header->num_poses; i++, pose++ ) {
-			LL( pose->parent );
-			LL( pose->mask );
-			LL( pose->channeloffset[0] );
-			LL( pose->channeloffset[1] );
-			LL( pose->channeloffset[2] );
-			LL( pose->channeloffset[3] );
-			LL( pose->channeloffset[4] );
-			LL( pose->channeloffset[5] );
-			LL( pose->channeloffset[6] );
-			LL( pose->channeloffset[7] );
-			LL( pose->channeloffset[8] );
-			LL( pose->channeloffset[9] );
-			LL( pose->channelscale[0] );
-			LL( pose->channelscale[1] );
-			LL( pose->channelscale[2] );
-			LL( pose->channelscale[3] );
-			LL( pose->channelscale[4] );
-			LL( pose->channelscale[5] );
-			LL( pose->channelscale[6] );
-			LL( pose->channelscale[7] );
-			LL( pose->channelscale[8] );
-			LL( pose->channelscale[9] );
-		}
-	}
-
-	if (header->ofs_bounds)
-	{
-		// check and swap model bounds
-		if(IQM_CheckRange(header, header->ofs_bounds,
-				  header->num_frames, sizeof(*bounds)))
-		{
-			return qfalse;
-		}
-		bounds = (iqmBounds_t *) ((byte *) header + header->ofs_bounds);
-		for(i = 0; i < header->num_frames; i++)
-		{
-			LL(bounds->bbmin[0]);
-			LL(bounds->bbmin[1]);
-			LL(bounds->bbmin[2]);
-			LL(bounds->bbmax[0]);
-			LL(bounds->bbmax[1]);
-			LL(bounds->bbmax[2]);
-
-			bounds++;
-		}
-	}
-
-	// allocate the model and copy the data
-	size = sizeof(iqmData_t);
-	if( header->num_meshes ) {
-		size += header->num_meshes * sizeof( srfIQModel_t ); // surfaces
-		size += header->num_triangles * 3 * sizeof(int);	// triangles
-		size += header->num_vertexes * 3 * sizeof(float);	// positions
-		size += header->num_vertexes * 2 * sizeof(float);	// texcoords
-		size += header->num_vertexes * 3 * sizeof(float);	// normals
-
-		if ( vertexArrayFormat[IQM_TANGENT] != -1 ) {
-			size += header->num_vertexes * 4 * sizeof(float);	// tangents
-		}
-
-		if ( vertexArrayFormat[IQM_COLOR] != -1 ) {
-			size += header->num_vertexes * 4 * sizeof(byte);	// colors
-		}
-
-		if ( allocateInfluences ) {
-			size += header->num_vertexes * sizeof(int);			// influences
-			size += allocateInfluences * 4 * sizeof(byte);		// influenceBlendIndexes
-
-			if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_UBYTE ) {
-				size += allocateInfluences * 4 * sizeof(byte);	// influenceBlendWeights
-			} else if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-				size += allocateInfluences * 4 * sizeof(float);	// influenceBlendWeights
-			}
-		}
-	}
-	if( header->num_joints ) {
-		size += joint_names;								// joint names
-		size += header->num_joints * sizeof(int);			// joint parents
-		size += header->num_joints * 12 * sizeof(float);	// bind joint matricies
-		size += header->num_joints * 12 * sizeof(float);	// inverse bind joint matricies
-	}
-	if( header->num_poses ) {
-		size += header->num_poses * header->num_frames * sizeof(iqmTransform_t); // pose transforms
-	}
-	if( header->ofs_bounds ) {
-		size += header->num_frames * 6 * sizeof(float);		// model bounds
-	} else if( header->num_meshes && header->num_frames == 0 ) {
-		size += 6 * sizeof(float);							// model bounds
-	}
-
-	mod->type = MOD_IQM;
-	iqmData = (iqmData_t *)ri.Hunk_Alloc( size, h_low );
-	mod->modelData = iqmData;
-
-	// fill header
-	iqmData->num_vertexes = ( header->num_meshes > 0 ) ? header->num_vertexes : 0;
-	iqmData->num_triangles = ( header->num_meshes > 0 ) ? header->num_triangles : 0;
-	iqmData->num_frames   = header->num_frames;
-	iqmData->num_surfaces = header->num_meshes;
-	iqmData->num_joints   = header->num_joints;
-	iqmData->num_poses    = header->num_poses;
-	iqmData->blendWeightsType = vertexArrayFormat[IQM_BLENDWEIGHTS];
-
-	dataPtr = (byte*)iqmData + sizeof(iqmData_t);
-	if( header->num_meshes ) {
-		iqmData->surfaces = (struct srfIQModel_s*)dataPtr;
-		dataPtr += header->num_meshes * sizeof( srfIQModel_t );
-
-		iqmData->triangles = (int*)dataPtr;
-		dataPtr += header->num_triangles * 3 * sizeof(int);		// triangles
-
-		iqmData->positions = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 3 * sizeof(float);	// positions
-
-		iqmData->texcoords = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 2 * sizeof(float);	// texcoords
-
-		iqmData->normals = (float*)dataPtr;
-		dataPtr += header->num_vertexes * 3 * sizeof(float);	// normals
-
-		if ( vertexArrayFormat[IQM_TANGENT] != -1 ) {
-			iqmData->tangents = (float*)dataPtr;
-			dataPtr += header->num_vertexes * 4 * sizeof(float);	// tangents
-		}
-
-		if ( vertexArrayFormat[IQM_COLOR] != -1 ) {
-			iqmData->colors = (byte*)dataPtr;
-			dataPtr += header->num_vertexes * 4 * sizeof(byte);		// colors
-		}
-
-		if ( allocateInfluences ) {
-			iqmData->influences = (int*)dataPtr;
-			dataPtr += header->num_vertexes * sizeof(int);			// influences
-
-			iqmData->influenceBlendIndexes = (byte*)dataPtr;
-			dataPtr += allocateInfluences * 4 * sizeof(byte);		// influenceBlendIndexes
-
-			if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_UBYTE ) {
-				iqmData->influenceBlendWeights.b = (byte*)dataPtr;
-				dataPtr += allocateInfluences * 4 * sizeof(byte);	// influenceBlendWeights
-			} else if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-				iqmData->influenceBlendWeights.f = (float*)dataPtr;
-				dataPtr += allocateInfluences * 4 * sizeof(float);	// influenceBlendWeights
-			}
-		}
-	}
-	if( header->num_joints ) {
-		iqmData->jointNames = (char*)dataPtr;
-		dataPtr += joint_names;								// joint names
-
-		iqmData->jointParents = (int*)dataPtr;
-		dataPtr += header->num_joints * sizeof(int);		// joint parents
-
-		iqmData->bindJoints = (float*)dataPtr;
-		dataPtr += header->num_joints * 12 * sizeof(float);		// bind joint matricies
-
-		iqmData->invBindJoints = (float*)dataPtr;
-		dataPtr += header->num_joints * 12 * sizeof(float);		// inverse bind joint matricies
-	}
-	if( header->num_poses ) {
-		iqmData->poses = (iqmTransform_t*)dataPtr;
-		dataPtr += header->num_poses * header->num_frames * sizeof(iqmTransform_t); // pose transforms
-	}
-	if( header->ofs_bounds ) {
-		iqmData->bounds = (float*)dataPtr;
-		dataPtr += header->num_frames * 6 * sizeof(float);	// model bounds
-	} else if( header->num_meshes && header->num_frames == 0 ) {
-		iqmData->bounds = (float*)dataPtr;
-		dataPtr += 6 * sizeof(float);						// model bounds
-	}
-
-	if( header->num_meshes )
-	{
-		// register shaders
-		// overwrite the material offset with the shader index
-		mesh = (iqmMesh_t *)((byte *)header + header->ofs_meshes);
-		surface = iqmData->surfaces;
-		str = (char *)header + header->ofs_text;
-		for( i = 0; i < header->num_meshes; i++, mesh++, surface++ ) {
-			surface->surfaceType = SF_IQM;
-			Q_strncpyz(surface->name, str + mesh->name, sizeof (surface->name));
-			Q_strlwr(surface->name); // lowercase the surface name so skin compares are faster
-			surface->shader = R_FindShader( str + mesh->material, LIGHTMAP_NONE, qtrue );
-			if( surface->shader->defaultShader )
-				surface->shader = tr.defaultShader;
-			surface->data = iqmData;
-			surface->first_vertex = mesh->first_vertex;
-			surface->num_vertexes = mesh->num_vertexes;
-			surface->first_triangle = mesh->first_triangle;
-			surface->num_triangles = mesh->num_triangles;
-		}
-
-		// copy triangles
-		triangle = (iqmTriangle_t *)((byte *)header + header->ofs_triangles);
-		for( i = 0; i < header->num_triangles; i++, triangle++ ) {
-			iqmData->triangles[3*i+0] = triangle->vertex[0];
-			iqmData->triangles[3*i+1] = triangle->vertex[1];
-			iqmData->triangles[3*i+2] = triangle->vertex[2];
-		}
-
-		// copy vertexarrays and indexes
-		vertexarray = (iqmVertexArray_t *)((byte *)header + header->ofs_vertexarrays);
-		for( i = 0; i < header->num_vertexarrays; i++, vertexarray++ ) {
-			int	n;
-
-			// skip disabled arrays
-			if( vertexarray->type < ARRAY_LEN( vertexArrayFormat )
-			    && vertexArrayFormat[vertexarray->type] == -1 )
-				continue;
-
-			// total number of values
-			n = header->num_vertexes * vertexarray->size;
-
-			switch( vertexarray->type ) {
-			case IQM_POSITION:
-				Com_Memcpy( iqmData->positions,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_NORMAL:
-				Com_Memcpy( iqmData->normals,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_TANGENT:
-				Com_Memcpy( iqmData->tangents,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_TEXCOORD:
-				Com_Memcpy( iqmData->texcoords,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(float) );
-				break;
-			case IQM_BLENDINDEXES:
-			case IQM_BLENDWEIGHTS:
-				break;
-			case IQM_COLOR:
-				Com_Memcpy( iqmData->colors,
-					    (byte *)header + vertexarray->offset,
-					    n * sizeof(byte) );
-				break;
-			}
-		}
-
-		// find unique blend influences per mesh
-		if( allocateInfluences ) {
-			int vtx, influence, totalInfluences = 0;
-
-			surface = iqmData->surfaces;
-			for( i = 0; i < header->num_meshes; i++, surface++ ) {
-				surface->first_influence = totalInfluences;
-				surface->num_influences = 0;
-
-				for( j = 0; j < surface->num_vertexes; j++ ) {
-					vtx = surface->first_vertex + j;
-
-					for( k = 0; k < surface->num_influences; k++ ) {
-						influence = surface->first_influence + k;
-
-						if( *(int*)&iqmData->influenceBlendIndexes[4*influence] != *(int*)&blendIndexes[4*vtx] ) {
-							continue;
-						}
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							if ( iqmData->influenceBlendWeights.f[4*influence+0] == blendWeights.f[4*vtx+0] &&
-							     iqmData->influenceBlendWeights.f[4*influence+1] == blendWeights.f[4*vtx+1] &&
-							     iqmData->influenceBlendWeights.f[4*influence+2] == blendWeights.f[4*vtx+2] &&
-							     iqmData->influenceBlendWeights.f[4*influence+3] == blendWeights.f[4*vtx+3] ) {
-								break;
-							}
-						} else {
-							if ( *(int*)&iqmData->influenceBlendWeights.b[4*influence] == *(int*)&blendWeights.b[4*vtx] ) {
-								break;
-							}
-						}
-					}
-
-					iqmData->influences[vtx] = surface->first_influence + k;
-
-					if( k == surface->num_influences ) {
-						influence = surface->first_influence + k;
-
-						iqmData->influenceBlendIndexes[4*influence+0] = blendIndexes[4*vtx+0];
-						iqmData->influenceBlendIndexes[4*influence+1] = blendIndexes[4*vtx+1];
-						iqmData->influenceBlendIndexes[4*influence+2] = blendIndexes[4*vtx+2];
-						iqmData->influenceBlendIndexes[4*influence+3] = blendIndexes[4*vtx+3];
-
-						if( vertexArrayFormat[IQM_BLENDWEIGHTS] == IQM_FLOAT ) {
-							iqmData->influenceBlendWeights.f[4*influence+0] = blendWeights.f[4*vtx+0];
-							iqmData->influenceBlendWeights.f[4*influence+1] = blendWeights.f[4*vtx+1];
-							iqmData->influenceBlendWeights.f[4*influence+2] = blendWeights.f[4*vtx+2];
-							iqmData->influenceBlendWeights.f[4*influence+3] = blendWeights.f[4*vtx+3];
-						} else {
-							iqmData->influenceBlendWeights.b[4*influence+0] = blendWeights.b[4*vtx+0];
-							iqmData->influenceBlendWeights.b[4*influence+1] = blendWeights.b[4*vtx+1];
-							iqmData->influenceBlendWeights.b[4*influence+2] = blendWeights.b[4*vtx+2];
-							iqmData->influenceBlendWeights.b[4*influence+3] = blendWeights.b[4*vtx+3];
-						}
-
-						totalInfluences++;
-						surface->num_influences++;
-					}
-				}
-			}
-		}
-	}
-
-	if( header->num_joints )
-	{
-		// copy joint names
-		str = iqmData->jointNames;
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			char *name = (char *)header + header->ofs_text +
-				joint->name;
-			int len = strlen( name ) + 1;
-			Com_Memcpy( str, name, len );
-			str += len;
-		}
-
-		// copy joint parents
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			iqmData->jointParents[i] = joint->parent;
-		}
-
-		// calculate bind joint matrices and their inverses
-		mat = iqmData->bindJoints;
-		matInv = iqmData->invBindJoints;
-		joint = (iqmJoint_t *)((byte *)header + header->ofs_joints);
-		for( i = 0; i < header->num_joints; i++, joint++ ) {
-			float baseFrame[12], invBaseFrame[12];
-
-			QuatNormalize2( joint->rotate, joint->rotate );
-
-			JointToMatrix( joint->rotate, joint->scale, joint->translate, baseFrame );
-			Matrix34Invert( baseFrame, invBaseFrame );
-
-			if ( joint->parent >= 0 )
-			{
-				Matrix34Multiply( iqmData->bindJoints + 12 * joint->parent, baseFrame, mat );
-				mat += 12;
-				Matrix34Multiply( invBaseFrame, iqmData->invBindJoints + 12 * joint->parent, matInv );
-				matInv += 12;
-			}
-			else
-			{
-				Com_Memcpy( mat, baseFrame,    sizeof(baseFrame)    );
-				mat += 12;
-				Com_Memcpy( matInv, invBaseFrame, sizeof(invBaseFrame) );
-				matInv += 12;
-			}
-		}
-	}
-
-	if( header->num_poses )
-	{
-		// calculate pose transforms
-		transform = iqmData->poses;
-		framedata = (unsigned short *)((byte *)header + header->ofs_frames);
-		for( i = 0; i < header->num_frames; i++ ) {
-			pose = (iqmPose_t *)((byte *)header + header->ofs_poses);
-			for( j = 0; j < header->num_poses; j++, pose++, transform++ ) {
-				vec3_t	translate;
-				quat_t	rotate;
-				vec3_t	scale;
-
-				translate[0] = pose->channeloffset[0];
-				if( pose->mask & 0x001)
-					translate[0] += *framedata++ * pose->channelscale[0];
-				translate[1] = pose->channeloffset[1];
-				if( pose->mask & 0x002)
-					translate[1] += *framedata++ * pose->channelscale[1];
-				translate[2] = pose->channeloffset[2];
-				if( pose->mask & 0x004)
-					translate[2] += *framedata++ * pose->channelscale[2];
-
-				rotate[0] = pose->channeloffset[3];
-				if( pose->mask & 0x008)
-					rotate[0] += *framedata++ * pose->channelscale[3];
-				rotate[1] = pose->channeloffset[4];
-				if( pose->mask & 0x010)
-					rotate[1] += *framedata++ * pose->channelscale[4];
-				rotate[2] = pose->channeloffset[5];
-				if( pose->mask & 0x020)
-					rotate[2] += *framedata++ * pose->channelscale[5];
-				rotate[3] = pose->channeloffset[6];
-				if( pose->mask & 0x040)
-					rotate[3] += *framedata++ * pose->channelscale[6];
-
-				scale[0] = pose->channeloffset[7];
-				if( pose->mask & 0x080)
-					scale[0] += *framedata++ * pose->channelscale[7];
-				scale[1] = pose->channeloffset[8];
-				if( pose->mask & 0x100)
-					scale[1] += *framedata++ * pose->channelscale[8];
-				scale[2] = pose->channeloffset[9];
-				if( pose->mask & 0x200)
-					scale[2] += *framedata++ * pose->channelscale[9];
-
-				VectorCopy( translate, transform->translate );
-				QuatNormalize2( rotate, transform->rotate );
-				VectorCopy( scale, transform->scale );
-			}
-		}
-	}
-
-	// copy model bounds
-	if(header->ofs_bounds)
-	{
-		mat = iqmData->bounds;
-		bounds = (iqmBounds_t *) ((byte *) header + header->ofs_bounds);
-		for(i = 0; i < header->num_frames; i++)
-		{
-			mat[0] = bounds->bbmin[0];
-			mat[1] = bounds->bbmin[1];
-			mat[2] = bounds->bbmin[2];
-			mat[3] = bounds->bbmax[0];
-			mat[4] = bounds->bbmax[1];
-			mat[5] = bounds->bbmax[2];
-
-			mat += 6;
-			bounds++;
-		}
-	}
-	else if( header->num_meshes && header->num_frames == 0 )
-	{
-		mat = iqmData->bounds;
-
-		ClearBounds( &iqmData->bounds[0], &iqmData->bounds[3] );
-		for ( i = 0 ; i < header->num_vertexes ; i++ ) {
-			AddPointToBounds( &iqmData->positions[i*3], &iqmData->bounds[0], &iqmData->bounds[3] );
-		}
-	}
-
-	return qtrue;
-}
-
-/*
-=============
-R_CullIQM
-=============
-*/
-static int R_CullIQM( iqmData_t *data, trRefEntity_t *ent ) {
-	vec3_t		bounds[2];
-	vec_t		*oldBounds, *newBounds;
-	int		i;
-
-	if (!data->bounds) {
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	}
-
-	// compute bounds pointers
-	oldBounds = data->bounds + 6*ent->e.oldframe;
-	newBounds = data->bounds + 6*ent->e.frame;
-
-	// calculate a bounding box in the current coordinate system
-	for (i = 0 ; i < 3 ; i++) {
-		bounds[0][i] = oldBounds[i] < newBounds[i] ? oldBounds[i] : newBounds[i];
-		bounds[1][i] = oldBounds[i+3] > newBounds[i+3] ? oldBounds[i+3] : newBounds[i+3];
-	}
-
-	switch ( R_CullLocalBox( bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_md3_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_md3_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_md3_out++;
-		return CULL_OUT;
-	}
-}
-
-/*
-=================
-R_ComputeIQMFogNum
-
-=================
-*/
-int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) {
-	int			i, j;
-	fog_t			*fog;
-	const vec_t		*bounds;
-	const vec_t		defaultBounds[6] = { -8, -8, -8, 8, 8, 8 };
-	vec3_t			diag, center;
-	vec3_t			localOrigin;
-	vec_t			radius;
-
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
-		return 0;
-	}
-
-	// FIXME: non-normalized axis issues
-	if (data->bounds) {
-		bounds = data->bounds + 6*ent->e.frame;
-	} else {
-		bounds = defaultBounds;
-	}
-	VectorSubtract( bounds+3, bounds, diag );
-	VectorMA( bounds, 0.5f, diag, center );
-	VectorAdd( ent->e.origin, center, localOrigin );
-	radius = 0.5f * VectorLength( diag );
-
-	for ( i = 1 ; i < tr.world->numfogs ; i++ ) {
-		fog = &tr.world->fogs[i];
-		for ( j = 0 ; j < 3 ; j++ ) {
-			if ( localOrigin[j] - radius >= fog->bounds[1][j] ) {
-				break;
-			}
-			if ( localOrigin[j] + radius <= fog->bounds[0][j] ) {
-				break;
-			}
-		}
-		if ( j == 3 ) {
-			return i;
-		}
-	}
-
-	return 0;
-}
-
-/*
-=================
-R_AddIQMSurfaces
-
-Add all surfaces of this model
-=================
-*/
-void R_AddIQMSurfaces( trRefEntity_t *ent ) {
-	iqmData_t		*data;
-	srfIQModel_t		*surface;
-	int			i, j;
-	qboolean		personalModel;
-	int			cull;
-	int			fogNum;
-	shader_t		*shader;
-	skin_t			*skin;
-
-	data = tr.currentModel->modelData;
-	surface = data->surfaces;
-
-	// don't add third_person objects if not in a portal
-	personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
-
-	if ( ent->e.renderfx & RF_WRAP_FRAMES ) {
-		ent->e.frame %= data->num_frames;
-		ent->e.oldframe %= data->num_frames;
-	}
-
-	//
-	// Validate the frames so there is no chance of a crash.
-	// This will write directly into the entity structure, so
-	// when the surfaces are rendered, they don't need to be
-	// range checked again.
-	//
-	if ( (ent->e.frame >= data->num_frames) 
-	     || (ent->e.frame < 0)
-	     || (ent->e.oldframe >= data->num_frames)
-	     || (ent->e.oldframe < 0) ) {
-		ri.Printf( PRINT_DEVELOPER, "R_AddIQMSurfaces: no such frame %d to %d for '%s'\n",
-			   ent->e.oldframe, ent->e.frame,
-			   tr.currentModel->name );
-		ent->e.frame = 0;
-		ent->e.oldframe = 0;
-	}
-
-	//
-	// cull the entire model if merged bounding box of both frames
-	// is outside the view frustum.
-	//
-	cull = R_CullIQM ( data, ent );
-	if ( cull == CULL_OUT ) {
-		return;
-	}
-
-	//
-	// set up lighting now that we know we aren't culled
-	//
-	if ( !personalModel || r_shadows->integer > 1 ) {
-		R_SetupEntityLighting( &tr.refdef, ent );
-	}
-
-	//
-	// see if we are in a fog volume
-	//
-	fogNum = R_ComputeIQMFogNum( data, ent );
-
-	for ( i = 0 ; i < data->num_surfaces ; i++ ) {
-		if(ent->e.customShader)
-			shader = R_GetShaderByHandle( ent->e.customShader );
-		else if(ent->e.customSkin > 0 && ent->e.customSkin < tr.numSkins)
-		{
-			skin = R_GetSkinByHandle(ent->e.customSkin);
-			shader = tr.defaultShader;
-
-			for(j = 0; j < skin->numSurfaces; j++)
-			{
-				if (!strcmp(skin->surfaces[j].name, surface->name))
-				{
-					shader = skin->surfaces[j].shader;
-					break;
-				}
-			}
-		} else {
-			shader = surface->shader;
-		}
-
-		// we will add shadows even if the main object isn't visible in the view
-
-		// stencil shadows can't do personal models unless I polyhedron clip
-		if ( !personalModel
-			&& r_shadows->integer == 2 
-			&& fogNum == 0
-			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.shadowShader, 0, 0 );
-		}
-
-		// projection shadows work fine with personal models
-		if ( r_shadows->integer == 3
-			&& fogNum == 0
-			&& (ent->e.renderfx & RF_SHADOW_PLANE )
-			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)surface, tr.projectionShadowShader, 0, 0 );
-		}
-
-		if( !personalModel ) {
-			R_AddDrawSurf( (void *)surface, shader, fogNum, 0 );
-		}
-
-		surface++;
-	}
-}
-
-
-static void ComputePoseMats( iqmData_t *data, int frame, int oldframe,
-			      float backlerp, float *poseMats ) {
-	iqmTransform_t relativeJoints[IQM_MAX_JOINTS];
-	iqmTransform_t *relativeJoint;
-	const iqmTransform_t *pose;
-	const iqmTransform_t *oldpose;
-	const int *jointParent;
-	const float *invBindMat;
-	float *poseMat, lerp;
-	int i;
-
-	relativeJoint = relativeJoints;
-
-	// copy or lerp animation frame pose
-	if ( oldframe == frame ) {
-		pose = &data->poses[frame * data->num_poses];
-		for ( i = 0; i < data->num_poses; i++, pose++, relativeJoint++ ) {
-			VectorCopy( pose->translate, relativeJoint->translate );
-			QuatCopy( pose->rotate, relativeJoint->rotate );
-			VectorCopy( pose->scale, relativeJoint->scale );
-		}
-	} else {
-		lerp = 1.0f - backlerp;
-		pose = &data->poses[frame * data->num_poses];
-		oldpose = &data->poses[oldframe * data->num_poses];
-		for ( i = 0; i < data->num_poses; i++, oldpose++, pose++, relativeJoint++ ) {
-			relativeJoint->translate[0] = oldpose->translate[0] * backlerp + pose->translate[0] * lerp;
-			relativeJoint->translate[1] = oldpose->translate[1] * backlerp + pose->translate[1] * lerp;
-			relativeJoint->translate[2] = oldpose->translate[2] * backlerp + pose->translate[2] * lerp;
-
-			relativeJoint->scale[0] = oldpose->scale[0] * backlerp + pose->scale[0] * lerp;
-			relativeJoint->scale[1] = oldpose->scale[1] * backlerp + pose->scale[1] * lerp;
-			relativeJoint->scale[2] = oldpose->scale[2] * backlerp + pose->scale[2] * lerp;
-
-			QuatSlerp( oldpose->rotate, pose->rotate, lerp, relativeJoint->rotate );
-		}
-	}
-
-	// multiply by inverse of bind pose and parent 'pose mat' (bind pose transform matrix)
-	relativeJoint = relativeJoints;
-	jointParent = data->jointParents;
-	invBindMat = data->invBindJoints;
-	poseMat = poseMats;
-	for ( i = 0; i < data->num_poses; i++, relativeJoint++, jointParent++, invBindMat += 12, poseMat += 12 ) {
-		float mat1[12], mat2[12];
-
-		JointToMatrix( relativeJoint->rotate, relativeJoint->scale, relativeJoint->translate, mat1 );
-
-		if ( *jointParent >= 0 ) {
-			Matrix34Multiply( &data->bindJoints[(*jointParent)*12], mat1, mat2 );
-			Matrix34Multiply( mat2, invBindMat, mat1 );
-			Matrix34Multiply( &poseMats[(*jointParent)*12], mat1, poseMat );
-		} else {
-			Matrix34Multiply( mat1, invBindMat, poseMat );
-		}
-	}
-}
-
-static void ComputeJointMats( iqmData_t *data, int frame, int oldframe,
-			      float backlerp, float *mat ) {
-	float	*mat1;
-	int	i;
-
-	if ( data->num_poses == 0 ) {
-		Com_Memcpy( mat, data->bindJoints, data->num_joints * 12 * sizeof(float) );
-		return;
-	}
-
-	ComputePoseMats( data, frame, oldframe, backlerp, mat );
-
-	for( i = 0; i < data->num_joints; i++ ) {
-		float outmat[12];
-		mat1 = mat + 12 * i;
-
-		Com_Memcpy(outmat, mat1, sizeof(outmat));
-
-		Matrix34Multiply( outmat, data->bindJoints + 12*i, mat1 );
-	}
-}
-
-
-/*
-=================
-RB_AddIQMSurfaces
-
-Compute vertices for this model surface
-=================
-*/
-void RB_IQMSurfaceAnim( surfaceType_t *surface ) {
-	srfIQModel_t	*surf = (srfIQModel_t *)surface;
-	iqmData_t	*data = surf->data;
-	float		poseMats[IQM_MAX_JOINTS * 12];
-	float		influenceVtxMat[SHADER_MAX_VERTEXES * 12];
-	float		influenceNrmMat[SHADER_MAX_VERTEXES * 9];
-	int		i;
-
-	float		*xyz;
-	float		*normal;
-	float		*texCoords;
-	byte		*color;
-	vec4_t		*outXYZ;
-	vec4_t		*outNormal;
-	vec2_t		(*outTexCoord)[2];
-	color4ub_t	*outColor;
-
-	int	frame = data->num_frames ? backEnd.currentEntity->e.frame % data->num_frames : 0;
-	int	oldframe = data->num_frames ? backEnd.currentEntity->e.oldframe % data->num_frames : 0;
-	float	backlerp = backEnd.currentEntity->e.backlerp;
-
-	int		*tri;
-	glIndex_t	*ptr;
-	glIndex_t	base;
-
-	RB_CHECKOVERFLOW( surf->num_vertexes, surf->num_triangles * 3 );
-
-	xyz = &data->positions[surf->first_vertex * 3];
-	normal = &data->normals[surf->first_vertex * 3];
-	texCoords = &data->texcoords[surf->first_vertex * 2];
-
-	if ( data->colors ) {
-		color = &data->colors[surf->first_vertex * 4];
-	} else {
-		color = NULL;
-	}
-
-	outXYZ = &tess.xyz[tess.numVertexes];
-	outNormal = &tess.normal[tess.numVertexes];
-	outTexCoord = &tess.texCoords[tess.numVertexes];
-	outColor = &tess.vertexColors[tess.numVertexes];
-
-	if ( data->num_poses > 0 ) {
-		// compute interpolated joint matrices
-		ComputePoseMats( data, frame, oldframe, backlerp, poseMats );
-
-		// compute vertex blend influence matricies
-		for( i = 0; i < surf->num_influences; i++ ) {
-			int influence = surf->first_influence + i;
-			float *vtxMat = &influenceVtxMat[12*i];
-			float *nrmMat = &influenceNrmMat[9*i];
-			int	j;
-			float	blendWeights[4];
-
-			if ( data->blendWeightsType == IQM_FLOAT ) {
-				blendWeights[0] = data->influenceBlendWeights.f[4*influence + 0];
-				blendWeights[1] = data->influenceBlendWeights.f[4*influence + 1];
-				blendWeights[2] = data->influenceBlendWeights.f[4*influence + 2];
-				blendWeights[3] = data->influenceBlendWeights.f[4*influence + 3];
-			} else {
-				blendWeights[0] = (float)data->influenceBlendWeights.b[4*influence + 0] / 255.0f;
-				blendWeights[1] = (float)data->influenceBlendWeights.b[4*influence + 1] / 255.0f;
-				blendWeights[2] = (float)data->influenceBlendWeights.b[4*influence + 2] / 255.0f;
-				blendWeights[3] = (float)data->influenceBlendWeights.b[4*influence + 3] / 255.0f;
-			}
-
-			if ( blendWeights[0] <= 0.0f ) {
-				// no blend joint, use identity matrix.
-				vtxMat[0] = identityMatrix[0];
-				vtxMat[1] = identityMatrix[1];
-				vtxMat[2] = identityMatrix[2];
-				vtxMat[3] = identityMatrix[3];
-				vtxMat[4] = identityMatrix[4];
-				vtxMat[5] = identityMatrix[5];
-				vtxMat[6] = identityMatrix[6];
-				vtxMat[7] = identityMatrix[7];
-				vtxMat[8] = identityMatrix[8];
-				vtxMat[9] = identityMatrix[9];
-				vtxMat[10] = identityMatrix[10];
-				vtxMat[11] = identityMatrix[11];
-			} else {
-				// compute the vertex matrix by blending the up to
-				// four blend weights
-				vtxMat[0] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 0];
-				vtxMat[1] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 1];
-				vtxMat[2] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 2];
-				vtxMat[3] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 3];
-				vtxMat[4] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 4];
-				vtxMat[5] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 5];
-				vtxMat[6] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 6];
-				vtxMat[7] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 7];
-				vtxMat[8] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 8];
-				vtxMat[9] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 9];
-				vtxMat[10] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 10];
-				vtxMat[11] = blendWeights[0] * poseMats[12 * data->influenceBlendIndexes[4*influence + 0] + 11];
-
-				for( j = 1; j < 4; j++ ) {
-					if ( blendWeights[j] <= 0.0f ) {
-						break;
-					}
-
-					vtxMat[0] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 0];
-					vtxMat[1] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 1];
-					vtxMat[2] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 2];
-					vtxMat[3] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 3];
-					vtxMat[4] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 4];
-					vtxMat[5] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 5];
-					vtxMat[6] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 6];
-					vtxMat[7] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 7];
-					vtxMat[8] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 8];
-					vtxMat[9] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 9];
-					vtxMat[10] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 10];
-					vtxMat[11] += blendWeights[j] * poseMats[12 * data->influenceBlendIndexes[4*influence + j] + 11];
-				}
-			}
-
-			// compute the normal matrix as transpose of the adjoint
-			// of the vertex matrix
-			nrmMat[ 0] = vtxMat[ 5]*vtxMat[10] - vtxMat[ 6]*vtxMat[ 9];
-			nrmMat[ 1] = vtxMat[ 6]*vtxMat[ 8] - vtxMat[ 4]*vtxMat[10];
-			nrmMat[ 2] = vtxMat[ 4]*vtxMat[ 9] - vtxMat[ 5]*vtxMat[ 8];
-			nrmMat[ 3] = vtxMat[ 2]*vtxMat[ 9] - vtxMat[ 1]*vtxMat[10];
-			nrmMat[ 4] = vtxMat[ 0]*vtxMat[10] - vtxMat[ 2]*vtxMat[ 8];
-			nrmMat[ 5] = vtxMat[ 1]*vtxMat[ 8] - vtxMat[ 0]*vtxMat[ 9];
-			nrmMat[ 6] = vtxMat[ 1]*vtxMat[ 6] - vtxMat[ 2]*vtxMat[ 5];
-			nrmMat[ 7] = vtxMat[ 2]*vtxMat[ 4] - vtxMat[ 0]*vtxMat[ 6];
-			nrmMat[ 8] = vtxMat[ 0]*vtxMat[ 5] - vtxMat[ 1]*vtxMat[ 4];
-		}
-
-		// transform vertexes and fill other data
-		for( i = 0; i < surf->num_vertexes;
-		     i++, xyz+=3, normal+=3, texCoords+=2,
-		     outXYZ++, outNormal++, outTexCoord++ ) {
-			int influence = data->influences[surf->first_vertex + i] - surf->first_influence;
-			float *vtxMat = &influenceVtxMat[12*influence];
-			float *nrmMat = &influenceNrmMat[9*influence];
-
-			(*outTexCoord)[0][0] = texCoords[0];
-			(*outTexCoord)[0][1] = texCoords[1];
-
-			(*outXYZ)[0] =
-				vtxMat[ 0] * xyz[0] +
-				vtxMat[ 1] * xyz[1] +
-				vtxMat[ 2] * xyz[2] +
-				vtxMat[ 3];
-			(*outXYZ)[1] =
-				vtxMat[ 4] * xyz[0] +
-				vtxMat[ 5] * xyz[1] +
-				vtxMat[ 6] * xyz[2] +
-				vtxMat[ 7];
-			(*outXYZ)[2] =
-				vtxMat[ 8] * xyz[0] +
-				vtxMat[ 9] * xyz[1] +
-				vtxMat[10] * xyz[2] +
-				vtxMat[11];
-
-			(*outNormal)[0] =
-				nrmMat[ 0] * normal[0] +
-				nrmMat[ 1] * normal[1] +
-				nrmMat[ 2] * normal[2];
-			(*outNormal)[1] =
-				nrmMat[ 3] * normal[0] +
-				nrmMat[ 4] * normal[1] +
-				nrmMat[ 5] * normal[2];
-			(*outNormal)[2] =
-				nrmMat[ 6] * normal[0] +
-				nrmMat[ 7] * normal[1] +
-				nrmMat[ 8] * normal[2];
-		}
-	} else {
-		// copy vertexes and fill other data
-		for( i = 0; i < surf->num_vertexes;
-		     i++, xyz+=3, normal+=3, texCoords+=2,
-		     outXYZ++, outNormal++, outTexCoord++ ) {
-			(*outTexCoord)[0][0] = texCoords[0];
-			(*outTexCoord)[0][1] = texCoords[1];
-
-			(*outXYZ)[0] = xyz[0];
-			(*outXYZ)[1] = xyz[1];
-			(*outXYZ)[2] = xyz[2];
-
-			(*outNormal)[0] = normal[0];
-			(*outNormal)[1] = normal[1];
-			(*outNormal)[2] = normal[2];
-		}
-	}
-
-	if ( color ) {
-		Com_Memcpy( outColor, color, surf->num_vertexes * sizeof( outColor[0] ) );
-	} else {
-		Com_Memset( outColor, 0, surf->num_vertexes * sizeof( outColor[0] ) );
-	}
-
-	tri = data->triangles + 3 * surf->first_triangle;
-	ptr = &tess.indexes[tess.numIndexes];
-	base = tess.numVertexes;
-
-	for( i = 0; i < surf->num_triangles; i++ ) {
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-		*ptr++ = base + (*tri++ - surf->first_vertex);
-	}
-
-	tess.numIndexes += 3 * surf->num_triangles;
-	tess.numVertexes += surf->num_vertexes;
-}
-
-int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
-		  int startFrame, int endFrame, 
-		  float frac, const char *tagName ) {
-	float	jointMats[IQM_MAX_JOINTS * 12];
-	int	joint;
-	char	*names = data->jointNames;
-
-	// get joint number by reading the joint names
-	for( joint = 0; joint < data->num_joints; joint++ ) {
-		if( !strcmp( tagName, names ) )
-			break;
-		names += strlen( names ) + 1;
-	}
-	if( joint >= data->num_joints ) {
-		AxisClear( tag->axis );
-		VectorClear( tag->origin );
-		return qfalse;
-	}
-
-	ComputeJointMats( data, startFrame, endFrame, frac, jointMats );
-
-	tag->axis[0][0] = jointMats[12 * joint + 0];
-	tag->axis[1][0] = jointMats[12 * joint + 1];
-	tag->axis[2][0] = jointMats[12 * joint + 2];
-	tag->origin[0] = jointMats[12 * joint + 3];
-	tag->axis[0][1] = jointMats[12 * joint + 4];
-	tag->axis[1][1] = jointMats[12 * joint + 5];
-	tag->axis[2][1] = jointMats[12 * joint + 6];
-	tag->origin[1] = jointMats[12 * joint + 7];
-	tag->axis[0][2] = jointMats[12 * joint + 8];
-	tag->axis[1][2] = jointMats[12 * joint + 9];
-	tag->axis[2][2] = jointMats[12 * joint + 10];
-	tag->origin[2] = jointMats[12 * joint + 11];
-
-	return qtrue;
-}
diff --git a/code/renderer/tr_public.h b/code/renderergl1/tr_public.h
similarity index 98%
rename from code/renderer/tr_public.h
rename to code/renderergl1/tr_public.h
index 016bae99..c1311eea 100644
--- a/code/renderer/tr_public.h
+++ b/code/renderergl1/tr_public.h
@@ -201,7 +201,7 @@ typedef struct {
     int     (*FS_OpenFile)(const char* qpath, fileHandle_t *file, qboolean uniqueFILE, qboolean quiet);
     size_t  (*FS_Read)(void* buffer, size_t len, fileHandle_t fileHandle);
     void    (*FS_CloseFile)(fileHandle_t fileHandle);
-    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, fsOrigin_t origin);
+    int     (*FS_Seek)(fileHandle_t fileHandle, long offset, int origin);
 	int		(*FS_FileIsInPAK)( const char *name, int *pCheckSum );
     int		(*FS_ReadFile)(const char* name, void** buf);
     int     (*FS_ReadFileEx)(const char* qpath, void** buffer, qboolean quiet);
@@ -243,8 +243,6 @@ typedef struct {
 // returned.
 refexport_t*GetRefAPI( int apiVersion, refimport_t *rimp );
 
-qboolean R_ImageExists(const char* name);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/code/renderergl1/tr_scene.c b/code/renderergl1/tr_scene.c
index 639f4e2d..19375ca7 100644
--- a/code/renderergl1/tr_scene.c
+++ b/code/renderergl1/tr_scene.c
@@ -15,14 +15,17 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
 #include "tr_local.h"
+#include "tr_vis.h"
+#include "tiki.h"
 
 int			r_firstSceneDrawSurf;
+int			r_firstSceneSpriteSurf;
 
 int			r_numdlights;
 int			r_firstSceneDlight;
@@ -30,6 +33,12 @@ int			r_firstSceneDlight;
 int			r_numentities;
 int			r_firstSceneEntity;
 
+int			r_numsprites;
+int			r_firstSceneSprite;
+
+int			r_numtermarks;
+int			r_firstSceneTerMark;
+
 int			r_numpolys;
 int			r_firstScenePoly;
 
@@ -38,7 +47,7 @@ int			r_numpolyverts;
 
 /*
 ====================
-R_InitNextFrame
+R_ToggleSmpFrame
 
 ====================
 */
@@ -46,6 +55,7 @@ void R_InitNextFrame( void ) {
 	backEndData->commands.used = 0;
 
 	r_firstSceneDrawSurf = 0;
+	r_firstSceneSpriteSurf = 0;
 
 	r_numdlights = 0;
 	r_firstSceneDlight = 0;
@@ -53,6 +63,12 @@ void R_InitNextFrame( void ) {
 	r_numentities = 0;
 	r_firstSceneEntity = 0;
 
+	r_numsprites = 0;
+	r_firstSceneSprite = 0;
+
+	r_numtermarks = 0;
+	r_firstSceneTerMark = 0;
+
 	r_numpolys = 0;
 	r_firstScenePoly = 0;
 
@@ -69,6 +85,8 @@ RE_ClearScene
 void RE_ClearScene( void ) {
 	r_firstSceneDlight = r_numdlights;
 	r_firstSceneEntity = r_numentities;
+	r_firstSceneSprite = r_numsprites;
+	r_firstSceneTerMark = r_numtermarks;
 	r_firstScenePoly = r_numpolys;
 }
 
@@ -92,12 +110,12 @@ void R_AddPolygonSurfaces( void ) {
 	shader_t	*sh;
 	srfPoly_t	*poly;
 
-	tr.currentEntityNum = REFENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+	tr.currentEntityNum = ENTITYNUM_WORLD;
+	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
 
 	for ( i = 0, poly = tr.refdef.polys; i < tr.refdef.numPolys ; i++, poly++ ) {
 		sh = R_GetShaderByHandle( poly->hShader );
-		R_AddDrawSurf( ( void * )poly, sh, poly->fogIndex, qfalse );
+		R_AddDrawSurf( ( void * )poly, sh, qfalse );
 	}
 }
 
@@ -107,88 +125,98 @@ RE_AddPolyToScene
 
 =====================
 */
-void RE_AddPolyToScene( qhandle_t hShader, int numVerts, const polyVert_t *verts, int numPolys ) {
+qboolean RE_AddPolyToScene(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
 	srfPoly_t	*poly;
-	int			i, j;
-	int			fogIndex;
-	fog_t		*fog;
-	vec3_t		bounds[2];
 
 	if ( !tr.registered ) {
-		return;
+		return qfalse;
 	}
 
-	if ( !hShader ) {
-		ri.Printf( PRINT_WARNING, "WARNING: RE_AddPolyToScene: NULL poly shader\n");
-		return;
+	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
+		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
+		return qfalse;
 	}
 
-	for ( j = 0; j < numPolys; j++ ) {
-		if ( r_numpolyverts + numVerts > max_polyverts || r_numpolys >= max_polys ) {
-      /*
-      NOTE TTimo this was initially a PRINT_WARNING
-      but it happens a lot with high fighting scenes and particles
-      since we don't plan on changing the const and making for room for those effects
-      simply cut this message to developer only
-      */
-			ri.Printf( PRINT_DEVELOPER, "WARNING: RE_AddPolyToScene: r_max_polys or r_max_polyverts reached\n");
-			return;
-		}
+	poly = &backEndData->polys[r_numpolys];
+	poly->surfaceType = SF_POLY;
+	poly->hShader = hShader;
+	poly->numVerts = numVerts;
+	poly->verts = &backEndData->polyVerts[r_numpolyverts];
+	poly->renderfx = renderfx;
 
-		poly = &backEndData->polys[r_numpolys];
-		poly->surfaceType = SF_POLY;
-		poly->hShader = hShader;
-		poly->numVerts = numVerts;
-		poly->verts = &backEndData->polyVerts[r_numpolyverts];
-		
-		Com_Memcpy( poly->verts, &verts[numVerts*j], numVerts * sizeof( *verts ) );
+	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
+	++r_numpolys;
+	r_numpolyverts += numVerts;
 
-		if ( glConfig.hardwareType == GLHW_RAGEPRO ) {
-			poly->verts->modulate[0] = 255;
-			poly->verts->modulate[1] = 255;
-			poly->verts->modulate[2] = 255;
-			poly->verts->modulate[3] = 255;
-		}
-		// done.
-		r_numpolys++;
-		r_numpolyverts += numVerts;
-
-		// if no world is loaded
-		if ( tr.world == NULL ) {
-			fogIndex = 0;
-		}
-		// see if it is in a fog volume
-		else if ( tr.world->numfogs == 1 ) {
-			fogIndex = 0;
-		} else {
-			// find which fog volume the poly is in
-			VectorCopy( poly->verts[0].xyz, bounds[0] );
-			VectorCopy( poly->verts[0].xyz, bounds[1] );
-			for ( i = 1 ; i < poly->numVerts ; i++ ) {
-				AddPointToBounds( poly->verts[i].xyz, bounds[0], bounds[1] );
-			}
-			for ( fogIndex = 1 ; fogIndex < tr.world->numfogs ; fogIndex++ ) {
-				fog = &tr.world->fogs[fogIndex]; 
-				if ( bounds[1][0] >= fog->bounds[0][0]
-					&& bounds[1][1] >= fog->bounds[0][1]
-					&& bounds[1][2] >= fog->bounds[0][2]
-					&& bounds[0][0] <= fog->bounds[1][0]
-					&& bounds[0][1] <= fog->bounds[1][1]
-					&& bounds[0][2] <= fog->bounds[1][2] ) {
-					break;
-				}
-			}
-			if ( fogIndex == tr.world->numfogs ) {
-				fogIndex = 0;
-			}
-		}
-		poly->fogIndex = fogIndex;
-	}
+	return qtrue;
 }
 
+/*
+=====================
+R_AddTerrainMarkSurfaces
+=====================
+*/
+void R_AddTerrainMarkSurfaces(void) {
+    srfMarkFragment_t* terMark;
+    int j;
+    shader_t* shader;
+
+    for (j = 0; j < tr.refdef.numTerMarks; j++)
+    {
+        terMark = &tr.refdef.terMarks[j];
+
+        shader = R_GetShaderByHandle(terMark->surfaceType);
+        terMark->surfaceType = SF_MARK_FRAG;
+        R_AddDrawSurf(&terMark->surfaceType, shader, 0);
+    }
+}
+
+/*
+=====================
+RE_AddTerrainMarkToScene
+=====================
+*/
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+    srfMarkFragment_t* terMark;
+
+    if (!tr.registered) {
+        return;
+    }
+
+    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
+        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
+        return;
+    }
+
+    terMark = &backEndData->terMarks[r_numtermarks];
+    terMark->surfaceType = hShader;
+    terMark->iIndex = iTerrainIndex;
+    terMark->numVerts = numVerts;
+    terMark->verts = &backEndData->polyVerts[r_numpolyverts];
+    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
+
+    r_numtermarks++;
+    r_numpolyverts += numVerts;
+}
 
 //=================================================================================
 
+/*
+=====================
+RE_GetRenderEntity
+=====================
+*/
+refEntity_t* RE_GetRenderEntity(int entityNumber) {
+    int i;
+
+    for (i = 0; i < r_numentities; i++) {
+        if (backEndData->entities[i].e.entityNumber == entityNumber) {
+            return &backEndData->entities[i].e;
+        }
+    }
+
+    return NULL;
+}
 
 /*
 =====================
@@ -196,32 +224,77 @@ RE_AddRefEntityToScene
 
 =====================
 */
-void RE_AddRefEntityToScene( const refEntity_t *ent ) {
+void RE_AddRefEntityToScene( const refEntity_t *ent, int parentEntityNumber) {
 	if ( !tr.registered ) {
 		return;
 	}
-	if ( r_numentities >= MAX_REFENTITIES ) {
-		ri.Printf(PRINT_DEVELOPER, "RE_AddRefEntityToScene: Dropping refEntity, reached MAX_REFENTITIES\n");
+  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=402
+	if ( r_numentities >= ENTITYNUM_WORLD ) {
 		return;
 	}
-	if ( Q_isnan(ent->origin[0]) || Q_isnan(ent->origin[1]) || Q_isnan(ent->origin[2]) ) {
-		static qboolean firstTime = qtrue;
-		if (firstTime) {
-			firstTime = qfalse;
-			ri.Printf( PRINT_WARNING, "RE_AddRefEntityToScene passed a refEntity which has an origin with a NaN component\n");
-		}
-		return;
-	}
-	if ( (int)ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
+	if ( ent->reType < 0 || ent->reType >= RT_MAX_REF_ENTITY_TYPE ) {
 		ri.Error( ERR_DROP, "RE_AddRefEntityToScene: bad reType %i", ent->reType );
 	}
 
 	backEndData->entities[r_numentities].e = *ent;
-	backEndData->entities[r_numentities].lightingCalculated = qfalse;
+	backEndData->entities[r_numentities].bLightGridCalculated = qfalse;
+	backEndData->entities[r_numentities].sphereCalculated = qfalse;
+
+	if (parentEntityNumber != ENTITYNUM_NONE)
+	{
+		int i;
+
+		//
+		// Find the parent entity to attach to
+		//
+		for (i = r_firstSceneEntity; i < r_numentities; i++)
+		{
+			if (backEndData->entities[i].e.entityNumber == parentEntityNumber)
+			{
+				backEndData->entities[r_numentities].e.parentEntity = i - r_firstSceneEntity;
+				break;
+			}
+		}
+
+		if (i == r_numentities) {
+			backEndData->entities[i].e.parentEntity = ENTITYNUM_NONE;
+		}
+	}
+	else
+	{
+		backEndData->entities[r_numentities].e.parentEntity = ENTITYNUM_NONE;
+	}
 
 	r_numentities++;
 }
 
+void RE_AddRefSpriteToScene(const refEntity_t* ent) {
+	refSprite_t* spr;
+	int i;
+
+	if (!tr.registered) {
+		return;
+	}
+
+	if (r_numsprites >= MAX_SPRITES) {
+		return;
+	}
+
+	spr = &backEndData->sprites[r_numsprites];
+	VectorCopy(ent->origin, spr->origin);
+	spr->surftype = SF_SPRITE;
+    spr->hModel = ent->hModel;
+    spr->scale = ent->scale;
+    spr->renderfx = ent->renderfx;
+    spr->shaderTime = ent->shaderTime;
+	AxisCopy(ent->axis, spr->axis);
+
+	for (i = 0; i < 4; ++i) {
+		spr->shaderRGBA[i] = ent->shaderRGBA[i];
+	}
+
+    ++r_numsprites;
+}
 
 /*
 =====================
@@ -229,7 +302,7 @@ RE_AddDynamicLightToScene
 
 =====================
 */
-void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int additive ) {
+void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
 	dlight_t	*dl;
 
 	if ( !tr.registered ) {
@@ -241,17 +314,13 @@ void RE_AddDynamicLightToScene( const vec3_t org, float intensity, float r, floa
 	if ( intensity <= 0 ) {
 		return;
 	}
-	// these cards don't have the correct blend mode
-	if ( glConfig.hardwareType == GLHW_RIVA128 || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		return;
-	}
 	dl = &backEndData->dlights[r_numdlights++];
 	VectorCopy (org, dl->origin);
 	dl->radius = intensity;
 	dl->color[0] = r;
 	dl->color[1] = g;
 	dl->color[2] = b;
-	dl->additive = additive;
+	dl->type = type;
 }
 
 /*
@@ -260,8 +329,93 @@ RE_AddLightToScene
 
 =====================
 */
-void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b ) {
-	RE_AddDynamicLightToScene( org, intensity, r, g, b, qfalse );
+void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, float b, int type ) {
+	RE_AddDynamicLightToScene( org, intensity, r, g, b, type );
+}
+
+/*
+=====================
+R_AddLightGridSurfacesToScene
+
+Draw small dots to make a grid.
+A dot matches the calculated color of the light at its location
+=====================
+*/
+void R_AddLightGridSurfacesToScene() {
+    vec3_t vMin, vMax;
+    vec3_t vPos;
+    vec3_t vLight;
+    int i;
+    qhandle_t hShader;
+    polyVert_t verts[4];
+
+    if (!tr.world) {
+        return;
+    }
+    if (!tr.world->lightGridData) {
+        return;
+    }
+    if (!tr.world->lightGridOffsets) {
+        return;
+    }
+
+    hShader = RE_RegisterShader("showgrid");
+    R_GetShaderByHandle(hShader);
+
+    for (i = 0; i < 3; i++) {
+        vMin[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] - 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+        vMax[i] = tr.world->lightGridMins[i] + floor((tr.refdef.vieworg[i] + 256.0 - tr.world->lightGridMins[i]) * tr.world->lightGridOOSize[i]) * tr.world->lightGridSize[i];
+    }
+
+    for (vPos[2] = vMin[2]; vPos[2] < vMax[2]; vPos[2] += tr.world->lightGridSize[2]) {
+        for (vPos[1] = vMin[1]; vPos[1] < vMax[1]; vPos[1] += tr.world->lightGridSize[1]) {
+            for (vPos[0] = vMin[0]; vPos[0] < vMax[0]; vPos[0] += tr.world->lightGridSize[0]) {
+                R_GetLightingGridValueFast(vPos, vLight);
+
+                verts[0].xyz[0] = vPos[0] - 2.0;
+                verts[0].xyz[1] = vPos[1] - 2.0;
+                verts[0].xyz[2] = vPos[2];
+                verts[0].st[0] = 0.0;
+                verts[0].st[1] = 0.0;
+                verts[0].modulate[0] = vLight[0];
+                verts[0].modulate[1] = vLight[1];
+                verts[0].modulate[2] = vLight[2];
+                verts[0].modulate[3] = 0xff;
+
+                verts[1].xyz[0] = vPos[0] + 2.0;
+                verts[1].xyz[1] = vPos[1] - 2.0;
+                verts[1].xyz[2] = vPos[2];
+                verts[1].st[0] = 0.0;
+                verts[1].st[1] = 1.0;
+                verts[1].modulate[0] = vLight[0];
+                verts[1].modulate[1] = vLight[1];
+                verts[1].modulate[2] = vLight[2];
+                verts[1].modulate[3] = 0xff;
+
+                verts[2].xyz[0] = vPos[0] + 2.0;
+                verts[2].xyz[1] = vPos[1] + 2.0;
+                verts[2].xyz[2] = vPos[2];
+                verts[2].st[0] = 1.0;
+                verts[2].st[1] = 1.0;
+                verts[2].modulate[0] = vLight[0];
+                verts[2].modulate[1] = vLight[1];
+                verts[2].modulate[2] = vLight[2];
+                verts[2].modulate[3] = 0xff;
+
+                verts[3].xyz[0] = vPos[0] - 2.0;
+                verts[3].xyz[1] = vPos[1] + 2.0;
+                verts[3].xyz[2] = vPos[2];
+                verts[3].st[0] = 1.0;
+                verts[3].st[1] = 0.0;
+                verts[3].modulate[0] = vLight[0];
+                verts[3].modulate[1] = vLight[1];
+                verts[3].modulate[2] = vLight[2];
+                verts[3].modulate[3] = 0xff;
+
+                RE_AddPolyToScene(hShader, 4, verts, 0);
+            }
+        }
+    }
 }
 
 /*
@@ -304,8 +458,14 @@ void RE_RenderScene( const refdef_t *fd ) {
 		ri.Error (ERR_DROP, "R_RenderScene: NULL worldmodel");
 	}
 
-	Com_Memcpy( tr.refdef.text, fd->text, sizeof( tr.refdef.text ) );
+	if (r_light_showgrid->integer) {
+		R_AddLightGridSurfacesToScene();
+	}
 
+	R_VisDebug();
+	TIKI_Reset_Caches();
+
+	backEnd.in2D = qfalse;
 	tr.refdef.x = fd->x;
 	tr.refdef.y = fd->y;
 	tr.refdef.width = fd->width;
@@ -341,28 +501,45 @@ void RE_RenderScene( const refdef_t *fd ) {
 		}
 	}
 
+	// copy the sky data
+	tr.refdef.sky_alpha = fd->sky_alpha;
+	tr.refdef.sky_portal = fd->sky_portal;
+
+	VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
+	VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
+	VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
+	VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
 
 	// derived info
 
-	tr.refdef.floatTime = tr.refdef.time * 0.001;
+	tr.refdef.floatTime = tr.refdef.time * 0.001f;
 
 	tr.refdef.numDrawSurfs = r_firstSceneDrawSurf;
 	tr.refdef.drawSurfs = backEndData->drawSurfs;
 
+    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
+    tr.refdef.spriteSurfs = backEndData->spriteSurfs;
+
 	tr.refdef.num_entities = r_numentities - r_firstSceneEntity;
 	tr.refdef.entities = &backEndData->entities[r_firstSceneEntity];
 
+	tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
+	tr.refdef.sprites = &backEndData->sprites[r_firstSceneSprite];
+
 	tr.refdef.num_dlights = r_numdlights - r_firstSceneDlight;
 	tr.refdef.dlights = &backEndData->dlights[r_firstSceneDlight];
 
+	tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
+	tr.refdef.terMarks = &backEndData->terMarks[r_firstSceneTerMark];
+
 	tr.refdef.numPolys = r_numpolys - r_firstScenePoly;
 	tr.refdef.polys = &backEndData->polys[r_firstScenePoly];
 
+	backEndData->staticModelData = tr.refdef.staticModelData;
+
 	// turn off dynamic lighting globally by clearing all the
 	// dlights if it needs to be disabled or if vertex lighting is enabled
-	if ( r_dynamiclight->integer == 0 ||
-		 r_vertexLight->integer == 1 ||
-		 glConfig.hardwareType == GLHW_PERMEDIA2 ) {
+	if (r_vertexLight->integer == 1 ) {
 		tr.refdef.num_dlights = 0;
 	}
 
@@ -380,6 +557,8 @@ void RE_RenderScene( const refdef_t *fd ) {
 	// The refdef takes 0-at-the-top y coordinates, so
 	// convert to GL's 0-at-the-bottom space
 	//
+	tr.skyRendered = qfalse;
+	tr.portalRendered = qfalse;
 	Com_Memset( &parms, 0, sizeof( parms ) );
 	parms.viewportX = tr.refdef.x;
 	parms.viewportY = glConfig.vidHeight - ( tr.refdef.y + tr.refdef.height );
@@ -389,22 +568,81 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	parms.fovX = tr.refdef.fov_x;
 	parms.fovY = tr.refdef.fov_y;
-	
-	parms.stereoFrame = tr.refdef.stereoFrame;
 
-	VectorCopy( fd->vieworg, parms.or.origin );
-	VectorCopy( fd->viewaxis[0], parms.or.axis[0] );
-	VectorCopy( fd->viewaxis[1], parms.or.axis[1] );
-	VectorCopy( fd->viewaxis[2], parms.or.axis[2] );
+	VectorCopy( fd->vieworg, parms.ori.origin );
+	VectorCopy( fd->viewaxis[0], parms.ori.axis[0] );
+	VectorCopy( fd->viewaxis[1], parms.ori.axis[1] );
+	VectorCopy( fd->viewaxis[2], parms.ori.axis[2] );
 
 	VectorCopy( fd->vieworg, parms.pvsOrigin );
 
+	// copy the farplane data
+	parms.farplane_distance = fd->farplane_distance;
+	parms.farplane_bias = fd->farplane_bias;
+	parms.farplane_color[0] = fd->farplane_color[0];
+	parms.farplane_color[1] = fd->farplane_color[1];
+	parms.farplane_color[2] = fd->farplane_color[2];
+	parms.farplane_cull = fd->farplane_cull;
+	parms.renderTerrain = fd->renderTerrain;
+
+	tr.refdef.skybox_farplane = fd->skybox_farplane;
+	tr.refdef.render_terrain = parms.renderTerrain;
+
+	if (fd->farclipOverride >= 15900 || fd->farclipOverride <= -0.99) {
+		tr.farclip = 0;
+	} else {
+		tr.farclip = r_farclip->integer;
+		if (!tr.farclip && (r_picmip->integer > 1 || r_colorbits->integer == 16)) {
+			tr.farclip = 2800;
+		}
+	}
+
+	if (tr.farclip) {
+        if (fd->farclipOverride != 0) {
+            parms.farplane_distance = fd->farclipOverride;
+		} else {
+			parms.farplane_distance = tr.farclip;
+		}
+
+		if (fd->farplane_color[0] >= 0 && fd->farplane_color[1] >= 0 && fd->farplane_color[2] >= 0) {
+            parms.farplane_color[0] = fd->farplane_color[0];
+            parms.farplane_color[1] = fd->farplane_color[1];
+            parms.farplane_color[2] = fd->farplane_color[2];
+		}
+
+		if (fd->farplaneColorOverride[0] >= 0 && fd->farplaneColorOverride[1] >= 0 && fd->farplaneColorOverride[2] >= 0) {
+			parms.farplane_color[0] = fd->farplaneColorOverride[0];
+			parms.farplane_color[1] = fd->farplaneColorOverride[1];
+			parms.farplane_color[2] = fd->farplaneColorOverride[2];
+		}
+
+		parms.farplane_cull = qtrue;
+
+        if (fd->farplane_distance > 0 && fd->farplane_distance < parms.farplane_distance) {
+            parms.farplane_distance = fd->farplane_distance;
+		} else {
+			if (fd->farplane_bias == 0) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else if (fd->farplane_distance <= 500.f) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else {
+				parms.farplane_bias = parms.farplane_distance / fd->farplane_distance;
+			}
+		}
+	} else if (parms.farplane_bias == 0) {
+		parms.farplane_bias = parms.farplane_distance * 0.18f;
+	}
+
+	R_ClearRealDlights();
 	R_RenderView( &parms );
 
 	// the next scene rendered in this frame will tack on after this one
 	r_firstSceneDrawSurf = tr.refdef.numDrawSurfs;
+	r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
 	r_firstSceneEntity = r_numentities;
+	r_firstSceneSprite = r_numsprites;
 	r_firstSceneDlight = r_numdlights;
+	r_firstSceneTerMark = r_numtermarks;
 	r_firstScenePoly = r_numpolys;
 
 	tr.frontEndMsec += ri.Milliseconds() - startTime;
diff --git a/code/renderergl1/tr_shade.c b/code/renderergl1/tr_shade.c
index 7ea78d13..23270d8d 100644
--- a/code/renderergl1/tr_shade.c
+++ b/code/renderergl1/tr_shade.c
@@ -15,13 +15,13 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_shade.c
 
-#include "tr_local.h" 
+#include "tr_local.h"
 
 /*
 
@@ -160,7 +160,7 @@ instead of using the single glDrawElements call that may be inefficient
 without compiled vertex arrays.
 ==================
 */
-void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
+static void R_DrawElements( int numIndexes, const glIndex_t *indexes ) {
 	int		primitives;
 
 	primitives = r_primitives->integer;
@@ -215,35 +215,28 @@ R_BindAnimatedImage
 =================
 */
 static void R_BindAnimatedImage( textureBundle_t *bundle ) {
-	int64_t index;
+	int index;
 
-	if ( bundle->isVideoMap ) {
-		ri.CIN_RunCinematic(bundle->videoMapHandle);
-		ri.CIN_UploadCinematic(bundle->videoMapHandle);
-		return;
-	}
-
-	if ( bundle->numImageAnimations <= 1 ) {
-		GL_Bind( bundle->image[0] );
+	if (bundle->numImageAnimations <= 1) {
+		GL_Bind(bundle->image[0]);
 		return;
 	}
 
 	// it is necessary to do this messy calc to make sure animations line up
 	// exactly with waveforms of the same frequency
-	index = tess.shaderTime * bundle->imageAnimationSpeed * FUNCTABLE_SIZE;
+	index = myftol((tess.shaderTime + bundle->imageAnimationPhase) * bundle->imageAnimationSpeed * FUNCTABLE_SIZE);
 	index >>= FUNCTABLE_SIZE2;
 
-	if ( index < 0 ) {
+	if (index < 0) {
 		index = 0;	// may happen with shader time offsets
 	}
-
-	// Windows x86 doesn't load renderer DLL with 64 bit modulus
-	//index %= bundle->numImageAnimations;
-	while ( index >= bundle->numImageAnimations ) {
-		index -= bundle->numImageAnimations;
+	if (!(bundle->flags & BUNDLE_ANIMATE_ONCE)) {
+		index %= bundle->numImageAnimations;
+	} else if (index >= bundle->numImageAnimations) {
+		index = bundle->numImageAnimations - 1;
 	}
 
-	GL_Bind( bundle->image[ index ] );
+	GL_Bind(bundle->image[index]);
 }
 
 /*
@@ -253,33 +246,83 @@ DrawTris
 Draws triangle outlines for debugging
 ================
 */
-static void DrawTris (shaderCommands_t *input) {
+static void DrawTris (shaderCommands_t *input, int flags) {
 	GL_Bind( tr.whiteImage );
 	qglColor3f (1,1,1);
 
-	GL_State( GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE );
-	qglDepthRange( 0, 0 );
-
-	qglDisableClientState (GL_COLOR_ARRAY);
-	qglDisableClientState (GL_TEXTURE_COORD_ARRAY);
-
-	qglVertexPointer (3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
-
-	if (qglLockArraysEXT) {
-		qglLockArraysEXT(0, input->numVertexes);
-		GLimp_LogComment( "glLockArraysEXT\n" );
+	if (flags == 1) {
+		GL_State(GLS_POLYMODE_LINE);
+	} else {
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+        qglDepthRange(0, 0);
 	}
 
-	R_DrawElements( input->numIndexes, input->indexes );
+	if (flags < 3) {
+		qglDisableClientState(GL_COLOR_ARRAY);
+		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+		qglVertexPointer(3, GL_FLOAT, 16, input->xyz);	// padded for SIMD
+
+		if (qglLockArraysEXT) {
+			qglLockArraysEXT(0, input->numVertexes);
+			GLimp_LogComment("glLockArraysEXT\n");
+		}
+
+		R_DrawElements(input->numIndexes, input->indexes);
+
+		if (qglUnlockArraysEXT) {
+			qglUnlockArraysEXT();
+			GLimp_LogComment("glUnlockArraysEXT\n");
+		}
+		qglDepthRange(0, 1);
+	}
+
+	if (flags > 1) {
+		vec3_t start, end;
+
+        start[1] = start[0] = 0.0;
+		end[1] = end[0] = 0.0;
+
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+        qglDepthRange(0, 0);
+
+        qglDisable(GL_TEXTURE_2D);
+        qglBegin(GL_LINES);
+
+        qglColor4f(1.0, 0.0, 0.0, 1.0);
+
+        start[2] = 0.0 - 5.0;
+        end[2] = 0.0 + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        qglColor4f(0.0, 1.0, 0.0, 1.0);
+
+        start[2] = start[2] + 5.0;
+        end[2] = end[2] - 5.0;
+        start[1] = start[1] - 5.0;
+        end[1] = end[1] + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        qglColor4f(0.0, 0.0, 1.0, 1.0);
+
+        start[1] = start[1] + 5.0;
+        start[0] = start[0] - 5.0;
+        end[0] = end[0] + 5.0;
+        qglVertex3fv(start);
+        qglVertex3fv(end);
+
+        start[0] = start[0] + 5.0;
+        end[0] = end[0] - 5.0;
+
+        qglEnd();
+        qglEnable(GL_TEXTURE_2D);
+        qglDepthRange(0.0, 1.0);
 
-	if (qglUnlockArraysEXT) {
-		qglUnlockArraysEXT();
-		GLimp_LogComment( "glUnlockArraysEXT\n" );
 	}
-	qglDepthRange( 0, 1 );
 }
 
-
 /*
 ================
 DrawNormals
@@ -316,24 +359,15 @@ because a surface may be forced to perform a RB_End due
 to overflow.
 ==============
 */
-void RB_BeginSurface( shader_t *shader, int fogNum ) {
-
-	shader_t *state = (shader->remappedShader) ? shader->remappedShader : shader;
-
+void RB_BeginSurface( shader_t *shader ) {
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
-	tess.shader = state;
-	tess.fogNum = fogNum;
+	tess.shader = shader;
 	tess.dlightBits = 0;		// will be OR'd in by surface functions
-	tess.xstages = state->stages;
-	tess.numPasses = state->numUnfoggedPasses;
-	tess.currentStageIteratorFunc = state->optimalStageIteratorFunc;
-
-	tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-	if (tess.shader->clampTime && tess.shaderTime >= tess.shader->clampTime) {
-		tess.shaderTime = tess.shader->clampTime;
-	}
-
+	tess.vertexColorValid = r_vertexLight->integer != 0;
+	tess.xstages = shader->unfoggedStages;
+	tess.numPasses = shader->numUnfoggedPasses;
+	tess.currentStageIteratorFunc = shader->optimalStageIteratorFunc;
 
 }
 
@@ -367,6 +401,40 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) {
 	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
 	R_BindAnimatedImage( &pStage->bundle[0] );
 
+/*
+	// was removed since 2.0
+	if (pStage->stateBits & GLS_MULTITEXTURE_ENV)
+	{
+		glState.cntnvblendmode = pStage->multitextureEnv;
+		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
+
+		if (pStage->multitextureEnv == GL_ADD)
+		{
+			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_ADD);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, 0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_ONE_MINUS_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE1);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE3_RGB, 0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND3_RGB, GL_ONE_MINUS_SRC_COLOR);
+		}
+		else if (pStage->multitextureEnv == GL_MODULATE)
+		{
+			qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_TEXTURE1);
+			qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+		}
+		else
+		{
+			ri.Printf(3, "Unknown MT mode for: %s\n", input->shader);
+		}
+	}
+*/
+
 	//
 	// lightmap/secondary pass
 	//
@@ -374,23 +442,41 @@ static void DrawMultitextured( shaderCommands_t *input, int stage ) {
 	qglEnable( GL_TEXTURE_2D );
 	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
 
-	if ( r_lightmap->integer ) {
+	if ( r_lightmap->integer && pStage->bundle[1].isLightmap ) {
 		GL_TexEnv( GL_REPLACE );
+/*
+	// was removed since 2.0
+	} else if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
+		glState.cntTexEnvExt = GLS_MULTITEXTURE_ENV;
+
+		GL_TexEnv(GL_COMBINE);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_SRC_ALPHA);
+		qglTexEnvf(GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA);
+*/
 	} else {
-		GL_TexEnv( tess.shader->multitextureEnv );
+		GL_TexEnv( pStage->multitextureEnv );
 	}
 
 	qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[1] );
 
-	R_BindAnimatedImage( &pStage->bundle[1] );
+	if (!input->dlightMap || !pStage->bundle[1].isLightmap) {
+		R_BindAnimatedImage(&pStage->bundle[1]);
+	} else {
+		GL_Bind(tr.dlightImages[input->dlightMap - 1]);
+	}
 
 	R_DrawElements( input->numIndexes, input->indexes );
 
+	qglDisable(GL_TEXTURE_2D);
 	//
 	// disable texturing on TEXTURE1, then select TEXTURE0
 	//
-	//qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-	qglDisable( GL_TEXTURE_2D );
+	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
 	GL_SelectTexture( 0 );
 }
@@ -404,114 +490,208 @@ ProjectDlightTexture
 Perform dynamic lighting with another rendering pass
 ===================
 */
-static void ProjectDlightTexture_scalar( void ) {
+static void ProjectDlightTexture( void ) {
 	int		i, l;
+#if idppc_altivec
+	vec_t	origin0, origin1, origin2;
+	float   texCoords0, texCoords1;
+	vector float floatColorVec0, floatColorVec1;
+	vector float modulateVec, colorVec, zero;
+	vector short colorShort;
+	vector signed int colorInt;
+	vector unsigned char floatColorVecPerm, modulatePerm, colorChar;
+	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff);
+#else
 	vec3_t	origin;
+	vec3_t	normal;
+#endif
 	float	*texCoords;
 	byte	*colors;
 	byte	clipBits[SHADER_MAX_VERTEXES];
-	float	texCoordsArray[SHADER_MAX_VERTEXES][2];
+	MAC_STATIC float	texCoordsArray[SHADER_MAX_VERTEXES][2];
 	byte	colorArray[SHADER_MAX_VERTEXES][4];
-	glIndex_t	hitIndexes[SHADER_MAX_INDEXES];
+	unsigned	hitIndexes[SHADER_MAX_INDEXES];
 	int		numIndexes;
+	int		planetype;
 	float	scale;
 	float	radius;
 	vec3_t	floatColor;
-	float	modulate = 0.0f;
+	float	modulate;
 
 	if ( !backEnd.refdef.num_dlights ) {
 		return;
 	}
 
+#if idppc_altivec
+	// There has to be a better way to do this so that floatColor 
+	// and/or modulate are already 16-byte aligned.
+	floatColorVecPerm = vec_lvsl(0,(float *)floatColor);
+	modulatePerm = vec_lvsl(0,(float *)&modulate);
+	modulatePerm = (vector unsigned char)vec_splat((vector unsigned int)modulatePerm,0);
+	zero = (vector float)vec_splat_s8(0);
+#endif
+
 	for ( l = 0 ; l < backEnd.refdef.num_dlights ; l++ ) {
 		dlight_t	*dl;
 
 		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
-			continue;	// this surface definitely doesn't have any of this light
+			continue;	// this surface definately doesn't have any of this light
 		}
 		texCoords = texCoordsArray[0];
 		colors = colorArray[0];
 
 		dl = &backEnd.refdef.dlights[l];
+#if idppc_altivec
+		origin0 = dl->transformed[0];
+		origin1 = dl->transformed[1];
+		origin2 = dl->transformed[2];
+#else
 		VectorCopy( dl->transformed, origin );
-		radius = dl->radius;
-		scale = 1.0f / radius;
-
-		if(r_greyscale->integer)
-		{
-			float luminance;
-
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = floatColor[1] = floatColor[2] = luminance;
-		}
-		else if(r_greyscale->value)
-		{
-			float luminance;
-			
-			luminance = LUMA(dl->color[0], dl->color[1], dl->color[2]) * 255.0f;
-			floatColor[0] = LERP(dl->color[0] * 255.0f, luminance, r_greyscale->value);
-			floatColor[1] = LERP(dl->color[1] * 255.0f, luminance, r_greyscale->value);
-			floatColor[2] = LERP(dl->color[2] * 255.0f, luminance, r_greyscale->value);
-		}
-		else
-		{
-			floatColor[0] = dl->color[0] * 255.0f;
-			floatColor[1] = dl->color[1] * 255.0f;
-			floatColor[2] = dl->color[2] * 255.0f;
-		}
+#endif
+		radius = dl->radius * 1.75f;
+		scale = 1.75f / radius;
 
+		floatColor[0] = dl->color[0] * 255.0f;
+		floatColor[1] = dl->color[1] * 255.0f;
+		floatColor[2] = dl->color[2] * 255.0f;
+#if idppc_altivec
+		floatColorVec0 = vec_ld(0, floatColor);
+		floatColorVec1 = vec_ld(11, floatColor);
+		floatColorVec0 = vec_perm(floatColorVec0,floatColorVec0,floatColorVecPerm);
+#endif
 		for ( i = 0 ; i < tess.numVertexes ; i++, texCoords += 2, colors += 4 ) {
-			int		clip = 0;
+#if idppc_altivec
+			vec_t dist0, dist1, dist2;
+#else
 			vec3_t	dist;
-			
-			VectorSubtract( origin, tess.xyz[i], dist );
+#endif
+			float	vertdist;
+			int		clip;
 
 			backEnd.pc.c_dlightVertexes++;
 
-			texCoords[0] = 0.5f + dist[0] * scale;
-			texCoords[1] = 0.5f + dist[1] * scale;
+#if idppc_altivec
+			//VectorSubtract( origin, tess.xyz[i], dist );
+			dist0 = origin0 - tess.xyz[i][0];
+			dist1 = origin1 - tess.xyz[i][1];
+			dist2 = origin2 - tess.xyz[i][2];
+			texCoords0 = 0.5f + dist0 * scale;
+			texCoords1 = 0.5f + dist1 * scale;
 
-			if( !r_dlightBacks->integer &&
-					// dist . tess.normal[i]
-					( dist[0] * tess.normal[i][0] +
-					dist[1] * tess.normal[i][1] +
-					dist[2] * tess.normal[i][2] ) < 0.0f ) {
-				clip = 63;
+			clip = 0;
+			if ( texCoords0 < 0.0f ) {
+				clip |= 1;
+			} else if ( texCoords0 > 1.0f ) {
+				clip |= 2;
+			}
+			if ( texCoords1 < 0.0f ) {
+				clip |= 4;
+			} else if ( texCoords1 > 1.0f ) {
+				clip |= 8;
+			}
+			texCoords[0] = texCoords0;
+			texCoords[1] = texCoords1;
+			
+			// modulate the strength based on the height and color
+			if ( dist2 > radius ) {
+				clip |= 16;
+				modulate = 0.0f;
+			} else if ( dist2 < -radius ) {
+				clip |= 32;
+				modulate = 0.0f;
 			} else {
-				if ( texCoords[0] < 0.0f ) {
-					clip |= 1;
-				} else if ( texCoords[0] > 1.0f ) {
-					clip |= 2;
-				}
-				if ( texCoords[1] < 0.0f ) {
-					clip |= 4;
-				} else if ( texCoords[1] > 1.0f ) {
-					clip |= 8;
-				}
-				texCoords[0] = texCoords[0];
-				texCoords[1] = texCoords[1];
-
-				// modulate the strength based on the height and color
-				if ( dist[2] > radius ) {
-					clip |= 16;
-					modulate = 0.0f;
-				} else if ( dist[2] < -radius ) {
-					clip |= 32;
-					modulate = 0.0f;
+				dist2 = Q_fabs(dist2);
+				if ( dist2 < radius * 0.5f ) {
+					modulate = 1.0f;
 				} else {
-					dist[2] = Q_fabs(dist[2]);
-					if ( dist[2] < radius * 0.5f ) {
-						modulate = 1.0f;
-					} else {
-						modulate = 2.0f * (radius - dist[2]) * scale;
-					}
+					modulate = 2.0f * (radius - dist2) * scale;
 				}
 			}
 			clipBits[i] = clip;
-			colors[0] = ri.ftol(floatColor[0] * modulate);
-			colors[1] = ri.ftol(floatColor[1] * modulate);
-			colors[2] = ri.ftol(floatColor[2] * modulate);
+
+			modulateVec = vec_ld(0,(float *)&modulate);
+			modulateVec = vec_perm(modulateVec,modulateVec,modulatePerm);
+			colorVec = vec_madd(floatColorVec0,modulateVec,zero);
+			colorInt = vec_cts(colorVec,0);	// RGBx
+			colorShort = vec_pack(colorInt,colorInt);		// RGBxRGBx
+			colorChar = vec_packsu(colorShort,colorShort);	// RGBxRGBxRGBxRGBx
+			colorChar = vec_sel(colorChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
+			vec_ste((vector unsigned int)colorChar,0,(unsigned int *)colors);	// store color
+#else
+			VectorCopy(tess.normal[i], normal);
+
+			if (fabs(normal[0]) > fabs(normal[1])) {
+				if (fabs(normal[2]) < fabs(normal[0])) {
+					planetype = 0;
+				} else {
+					planetype = 1;
+				}
+			} else {
+				if (fabs(normal[2]) < fabs(normal[1])) {
+					planetype = 1;
+				}
+				else {
+					planetype = 2;
+				}
+			}
+
+			VectorSubtract( origin, tess.xyz[i], dist );
+			if (planetype == 0)
+			{
+				texCoords[0] = 0.5f + dist[1] * scale;
+				texCoords[1] = 0.5f + dist[2] * scale;
+			}
+			else if (planetype == 1)
+			{
+				texCoords[0] = 0.5f + dist[0] * scale;
+				texCoords[1] = 0.5f + dist[2] * scale;
+			}
+			else
+			{
+				texCoords[0] = 0.5f + dist[0] * scale;
+				texCoords[1] = 0.5f + dist[1] * scale;
+			}
+
+			vertdist = DotProduct(dist, normal);
+			clip = 0;
+			if ( texCoords[0] < 0.0f ) {
+				clip |= 1;
+			} else if ( texCoords[0] > 1.0f ) {
+				clip |= 2;
+			}
+			if ( texCoords[1] < 0.0f ) {
+				clip |= 4;
+			} else if ( texCoords[1] > 1.0f ) {
+				clip |= 8;
+			}
+			// modulate the strength based on the height and color
+			if (vertdist > radius) {
+				clip |= 16;
+				modulate = 0.0f;
+			}
+			else if (vertdist < -radius) {
+				clip |= 32;
+				modulate = 0.0f;
+			}
+			else {
+				dist[2] = Q_fabs(dist[2]);
+				if (dist[2] < radius * 0.5f) {
+					modulate = 1.0f;
+				}
+				else {
+					modulate = 2.0f * (radius - dist[2]) * scale;
+				}
+			}
+			clipBits[i] = clip;
+
+			colors[0] = myftol(floatColor[0] * modulate);
+			colors[1] = myftol(floatColor[1] * modulate);
+			colors[2] = myftol(floatColor[2] * modulate);
 			colors[3] = 255;
+#endif
 		}
 
 		// build a list of triangles that need light
@@ -535,16 +715,15 @@ static void ProjectDlightTexture_scalar( void ) {
 			continue;
 		}
 
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
-		qglTexCoordPointer( 2, GL_FLOAT, 0, texCoordsArray[0] );
-
-		qglEnableClientState( GL_COLOR_ARRAY );
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, colorArray );
+		qglEnableClientState(GL_COLOR_ARRAY);
+		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, colorArray);
+		qglTexCoordPointer(2, GL_FLOAT, 0, texCoordsArray[0]);
 
 		GL_Bind( tr.dlightImage );
 		// include GLS_DEPTHFUNC_EQUAL so alpha tested surfaces don't add light
 		// where they aren't rendered
-		if ( dl->additive ) {
+		if ( dl->type & additive) {
 			GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE | GLS_DEPTHFUNC_EQUAL );
 		}
 		else {
@@ -556,54 +735,6 @@ static void ProjectDlightTexture_scalar( void ) {
 	}
 }
 
-static void ProjectDlightTexture( void ) {
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		ProjectDlightTexture_altivec();
-		return;
-	}
-#endif
-	ProjectDlightTexture_scalar();
-}
-
-
-/*
-===================
-RB_FogPass
-
-Blends a fog texture on top of everything else
-===================
-*/
-static void RB_FogPass( void ) {
-	fog_t		*fog;
-	int			i;
-
-	qglEnableClientState( GL_COLOR_ARRAY );
-	qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
-
-	qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-	qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] );
-
-	fog = tr.world->fogs + tess.fogNum;
-
-	for ( i = 0; i < tess.numVertexes; i++ ) {
-		* ( int * )&tess.svars.colors[i] = fog->colorInt;
-	}
-
-	RB_CalcFogTexCoords( ( float * ) tess.svars.texcoords[0] );
-
-	GL_Bind( tr.fogImage );
-
-	if ( tess.shader->fogPass == FP_EQUAL ) {
-		GL_State( GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_DEPTHFUNC_EQUAL );
-	} else {
-		GL_State( GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA );
-	}
-
-	R_DrawElements( tess.numIndexes, tess.indexes );
-}
-
 /*
 ===============
 ComputeColors
@@ -625,25 +756,51 @@ static void ComputeColors( shaderStage_t *pStage )
 		case CGEN_IDENTITY_LIGHTING:
 			Com_Memset( tess.svars.colors, tr.identityLightByte, tess.numVertexes * 4 );
 			break;
-		case CGEN_LIGHTING_DIFFUSE:
-			RB_CalcDiffuseColor( ( unsigned char * ) tess.svars.colors );
+		case CGEN_ENTITY:
+			RB_CalcColorFromEntity((unsigned char*)tess.svars.colors);
+			break;
+		case CGEN_ONE_MINUS_ENTITY:
+			RB_CalcColorFromOneMinusEntity((unsigned char*)tess.svars.colors);
 			break;
 		case CGEN_EXACT_VERTEX:
+			if (!tess.vertexColorValid) {
+				static qboolean bWarned = qfalse;
+
+				if (!bWarned) {
+					// mohta and mohtt shows the warning once
+                    bWarned = qtrue;
+
+                    ri.Printf(
+                        PRINT_WARNING,
+                        "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
+                        tess.shader->name
+					);
+				}
+				break;
+			}
 			Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
 			break;
-		case CGEN_CONST:
-			for ( i = 0; i < tess.numVertexes; i++ ) {
-				*(int *)tess.svars.colors[i] = *(int *)pStage->constantColor;
-			}
-			break;
 		case CGEN_VERTEX:
-			if ( tr.identityLight == 1 )
+            if (!tess.vertexColorValid) {
+                static qboolean bWarned = qfalse;
+
+				if (!bWarned) {
+					bWarned = qtrue;
+
+					ri.Printf(
+						PRINT_WARNING,
+						"Vertex color specified for shader '%s', but vertex colors are not valid for this model\n",
+						tess.shader->name);
+				}
+				break;
+			}
+			if (tr.identityLight == 1)
 			{
-				Com_Memcpy( tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof( tess.vertexColors[0] ) );
+				Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
 			}
 			else
 			{
-				for ( i = 0; i < tess.numVertexes; i++ )
+				for (i = 0; i < tess.numVertexes; i++)
 				{
 					tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
 					tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
@@ -672,25 +829,148 @@ static void ComputeColors( shaderStage_t *pStage )
 				}
 			}
 			break;
-		case CGEN_FOG:
+		case CGEN_WAVEFORM:
+			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, NULL);
+			break;
+		case CGEN_MULTIPLY_BY_WAVEFORM:
+			RB_CalcWaveColor(&pStage->rgbWave, (unsigned char*)tess.svars.colors, pStage->colorConst);
+			break;
+		case CGEN_LIGHTING_GRID:
+			RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
+			break;
+		case CGEN_LIGHTING_SPHERICAL:
+		case CGEN_STATIC:
+			if (!r_drawspherelights->integer) {
+				break;
+			}
+
+			if (!backEnd.currentStaticModel) {
+				if (backEnd.currentSphere->TessFunction) {
+					backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
+				}
+				break;
+			}
+
+			if (!tess.vertexColorValid) {
+				ri.Printf(PRINT_WARNING, "Vertex color specified for shader '%s', but vertex colors are not valid for this model\n", tess.shader->name);
+			}
+
+			if (backEnd.currentStaticModel->useSpecialLighting)
 			{
-				fog_t		*fog;
+				for (i = 0; i < tess.numVertexes; i++)
+				{
+					int j;
+					vec3_t colorout;
+					int r, g, b;
 
-				fog = tr.world->fogs + tess.fogNum;
+					colorout[0] = tess.vertexColors[i][0];
+					colorout[1] = tess.vertexColors[i][1];
+					colorout[2] = tess.vertexColors[i][2];
 
-				for ( i = 0; i < tess.numVertexes; i++ ) {
-					* ( int * )&tess.svars.colors[i] = fog->colorInt;
+					for (j = 0; j < backEnd.currentStaticModel->numdlights; j++)
+					{
+						float ooLightDistSquared;
+						float dot;
+						vec3_t diff;
+						dlight_t* dl;
+
+						dl = &backEnd.refdef.dlights[backEnd.currentStaticModel->dlights[j].index];
+						VectorSubtract(backEnd.currentStaticModel->dlights[j].transformed, tess.xyz[i], diff);
+
+						dot = DotProduct(diff, tess.normal[i]);
+						if (dot >= 0)
+						{
+							float ooLen;
+
+							ooLen = 1.0 / VectorLengthSquared(diff);
+							ooLightDistSquared = dot * (7500.0 * dl->radius * ooLen * sqrt(ooLen));
+							colorout[0] = dl->color[0] * ooLightDistSquared + colorout[0];
+							colorout[1] = dl->color[1] * ooLightDistSquared + colorout[1];
+							colorout[2] = dl->color[2] * ooLightDistSquared + colorout[2];
+						}
+					}
+
+					r = colorout[0];
+					g = colorout[1];
+					b = colorout[2];
+
+					if (tr.overbrightShift)
+					{
+						r = (int)((float)r * tr.overbrightMult);
+						g = (int)((float)g * tr.overbrightMult);
+						b = (int)((float)b * tr.overbrightMult);
+					}
+
+					if (r > 0xFF || g > 0xFF || b > 0xFF)
+					{
+						float t;
+
+						t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+						r = (int)((float)r * t);
+						g = (int)((float)g * t);
+						b = (int)((float)b * t);
+					}
+
+					tess.svars.colors[i][0] = r;
+					tess.svars.colors[i][1] = g;
+					tess.svars.colors[i][2] = b;
+					// Fixed in OPM
+					//  This sets the alpha channel which will prevent vertices from hiding
+					tess.svars.colors[i][3] = tess.vertexColors[i][3];
+				}
+			}
+			else
+			{
+				if (tr.identityLight == 1.0)
+				{
+					Com_Memcpy(tess.svars.colors, tess.vertexColors, tess.numVertexes * sizeof(tess.vertexColors[0]));
+				}
+				else
+				{
+					for (i = 0; i < tess.numVertexes; i++) {
+						tess.svars.colors[i][0] = tess.vertexColors[i][0] * tr.identityLight;
+						tess.svars.colors[i][1] = tess.vertexColors[i][1] * tr.identityLight;
+						tess.svars.colors[i][2] = tess.vertexColors[i][2] * tr.identityLight;
+					}
 				}
 			}
 			break;
-		case CGEN_WAVEFORM:
-			RB_CalcWaveColor( &pStage->rgbWave, ( unsigned char * ) tess.svars.colors );
+		case CGEN_CONSTANT:
+			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst);
 			break;
-		case CGEN_ENTITY:
-			RB_CalcColorFromEntity( ( unsigned char * ) tess.svars.colors );
+		case CGEN_GLOBAL_COLOR:
+			RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
 			break;
-		case CGEN_ONE_MINUS_ENTITY:
-			RB_CalcColorFromOneMinusEntity( ( unsigned char * ) tess.svars.colors );
+		case CGEN_SCOORD:
+			RB_CalcRGBFromTexCoords(
+				(unsigned char*)tess.svars.colors,
+				pStage->alphaMin,
+				pStage->alphaMax,
+				pStage->alphaConstMin,
+				pStage->alphaConst,
+				1.0,
+				0.0,
+				tess.svars.texcoords[0][0]
+			);
+			break;
+		case CGEN_TCOORD:
+			RB_CalcRGBFromTexCoords(
+				(unsigned char*)tess.svars.colors,
+				pStage->alphaMin,
+				pStage->alphaMax,
+				pStage->alphaConstMin,
+				pStage->alphaConst,
+				0.0,
+				1.0,
+				tess.svars.texcoords[0][0]
+			);
+			break;
+		case CGEN_DOT:
+			RB_CalcRGBFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+			break;
+		case CGEN_ONE_MINUS_DOT:
+			RB_CalcRGBFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
 			break;
 	}
 
@@ -702,47 +982,42 @@ static void ComputeColors( shaderStage_t *pStage )
 	case AGEN_SKIP:
 		break;
 	case AGEN_IDENTITY:
-		if ( pStage->rgbGen != CGEN_IDENTITY ) {
-			if ( ( pStage->rgbGen == CGEN_VERTEX && tr.identityLight != 1 ) ||
-				 pStage->rgbGen != CGEN_VERTEX ) {
+		if ( pStage->rgbGen != CGEN_IDENTITY
+			&& pStage->rgbGen != CGEN_LIGHTING_GRID
+			&& pStage->rgbGen != CGEN_LIGHTING_SPHERICAL)
+		{
+			if ( pStage->rgbGen != CGEN_VERTEX || tr.identityLight != 1 ) {
 				for ( i = 0; i < tess.numVertexes; i++ ) {
 					tess.svars.colors[i][3] = 0xff;
 				}
 			}
 		}
 		break;
-	case AGEN_CONST:
-		if ( pStage->rgbGen != CGEN_CONST ) {
-			for ( i = 0; i < tess.numVertexes; i++ ) {
-				tess.svars.colors[i][3] = pStage->constantColor[3];
-			}
-		}
-		break;
-	case AGEN_WAVEFORM:
-		RB_CalcWaveAlpha( &pStage->alphaWave, ( unsigned char * ) tess.svars.colors );
-		break;
-	case AGEN_LIGHTING_SPECULAR:
-		RB_CalcSpecularAlpha( ( unsigned char * ) tess.svars.colors );
-		break;
 	case AGEN_ENTITY:
-		RB_CalcAlphaFromEntity( ( unsigned char * ) tess.svars.colors );
+		RB_CalcAlphaFromEntity((unsigned char*)tess.svars.colors);
 		break;
 	case AGEN_ONE_MINUS_ENTITY:
-		RB_CalcAlphaFromOneMinusEntity( ( unsigned char * ) tess.svars.colors );
+		RB_CalcAlphaFromOneMinusEntity((unsigned char*)tess.svars.colors);
 		break;
-    case AGEN_VERTEX:
-		if ( pStage->rgbGen != CGEN_VERTEX ) {
-			for ( i = 0; i < tess.numVertexes; i++ ) {
+	case AGEN_VERTEX:
+		if (pStage->rgbGen != CGEN_VERTEX) {
+			for (i = 0; i < tess.numVertexes; i++) {
 				tess.svars.colors[i][3] = tess.vertexColors[i][3];
 			}
 		}
-        break;
-    case AGEN_ONE_MINUS_VERTEX:
-        for ( i = 0; i < tess.numVertexes; i++ )
-        {
+		break;
+	case AGEN_ONE_MINUS_VERTEX:
+		for (i = 0; i < tess.numVertexes; i++)
+		{
 			tess.svars.colors[i][3] = 255 - tess.vertexColors[i][3];
-        }
-        break;
+		}
+		break;
+	case AGEN_LIGHTING_SPECULAR:
+		RB_CalcSpecularAlpha((unsigned char*)tess.svars.colors, pStage->alphaMax, pStage->specOrigin);
+		break;
+	case AGEN_WAVEFORM:
+		RB_CalcWaveAlpha(&pStage->alphaWave, (unsigned char*)tess.svars.colors);
+		break;
 	case AGEN_PORTAL:
 		{
 			unsigned char alpha;
@@ -752,7 +1027,7 @@ static void ComputeColors( shaderStage_t *pStage )
 				float len;
 				vec3_t v;
 
-				VectorSubtract( tess.xyz[i], backEnd.viewParms.or.origin, v );
+				VectorSubtract( tess.xyz[i], backEnd.viewParms.ori.origin, v );
 				len = VectorLength( v );
 
 				len /= tess.shader->portalRange;
@@ -774,50 +1049,243 @@ static void ComputeColors( shaderStage_t *pStage )
 			}
 		}
 		break;
-	}
+	case AGEN_DOT:
+		RB_CalcAlphaFromDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		return;
+	case AGEN_ONE_MINUS_DOT:
+		RB_CalcAlphaFromOneMinusDot((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		return;
+	case AGEN_CONSTANT:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, pStage->colorConst[3]);
+		break;
+	case AGEN_GLOBAL_ALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D[3]);
+		break;
+	case AGEN_SKYALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, tr.refdef.sky_alpha * 255.0);
+		break;
+	case AGEN_ONE_MINUS_SKYALPHA:
+		RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, (1.0 - tr.refdef.sky_alpha) * 255.0);
+		break;
+	case AGEN_SCOORD:
+		RB_CalcAlphaFromTexCoords(
+			(unsigned char*)tess.svars.colors,
+			pStage->alphaMin,
+			pStage->alphaMax,
+			pStage->alphaConstMin,
+			pStage->alphaConst,
+			1.0,
+			0.0,
+			tess.svars.texcoords[0][0]
+		);
+		break;
+	case AGEN_TCOORD:
+		RB_CalcAlphaFromTexCoords(
+			(unsigned char*)tess.svars.colors,
+			pStage->alphaMin,
+			pStage->alphaMax,
+			pStage->alphaConstMin,
+			pStage->alphaConst,
+			0.0,
+			1.0,
+			tess.svars.texcoords[0][0]
+		);
+		break;
+	case AGEN_DIST_FADE:
+		if (backEnd.currentStaticModel)
+		{
+			unsigned char alpha;
 
-	//
-	// fog adjustment for colors to fade out as fog increases
-	//
-	if ( tess.fogNum )
-	{
-		switch ( pStage->adjustColorsForFog )
-		{
-		case ACFF_MODULATE_RGB:
-			RB_CalcModulateColorsByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_MODULATE_ALPHA:
-			RB_CalcModulateAlphasByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_MODULATE_RGBA:
-			RB_CalcModulateRGBAsByFog( ( unsigned char * ) tess.svars.colors );
-			break;
-		case ACFF_NONE:
-			break;
+			for (i = 0; i < tess.numVertexes; i++) {
+				float len;
+				vec3_t org, v;
+
+				VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
+				org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
+				org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
+				org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
+			
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0xff;
+				} else if (len > 1) {
+					alpha = 0;
+				} else {
+					alpha = ((1.0 - len) * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
-	}
-	
-	// if in greyscale rendering mode turn all color values into greyscale.
-	if(r_greyscale->integer)
-	{
-		int scale;
-		for(i = 0; i < tess.numVertexes; i++)
-		{
-			scale = LUMA(tess.svars.colors[i][0], tess.svars.colors[i][1], tess.svars.colors[i][2]);
- 			tess.svars.colors[i][0] = tess.svars.colors[i][1] = tess.svars.colors[i][2] = scale;
+		else
+        {
+            unsigned char alpha;
+
+            for (i = 0; i < tess.numVertexes; i++) {
+                float len;
+                vec3_t org, v;
+
+				if (backEnd.currentEntity) {
+					VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
+					org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
+					org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
+					org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
+				} else {
+					VectorCopy(backEnd.viewParms.ori.origin, org);
+				}
+
+				
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0xff;
+				} else if (len > 1) {
+					alpha = 0;
+				} else {
+					alpha = ((1.0 - len) * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
-	}
-	else if(r_greyscale->value)
-	{
-		float scale;
-		
-		for(i = 0; i < tess.numVertexes; i++)
+		break;
+	case AGEN_ONE_MINUS_DIST_FADE:
+		if (backEnd.currentStaticModel)
 		{
-			scale = LUMA(tess.svars.colors[i][0], tess.svars.colors[i][1], tess.svars.colors[i][2]);
-			tess.svars.colors[i][0] = LERP(tess.svars.colors[i][0], scale, r_greyscale->value);
-			tess.svars.colors[i][1] = LERP(tess.svars.colors[i][1], scale, r_greyscale->value);
-			tess.svars.colors[i][2] = LERP(tess.svars.colors[i][2], scale, r_greyscale->value);
+			unsigned char alpha;
+
+			for (i = 0; i < tess.numVertexes; i++) {
+				float len;
+				vec3_t org, v;
+
+                VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentStaticModel->origin, v);
+                org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentStaticModel->axis[0]);
+                org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentStaticModel->axis[1]);
+                org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentStaticModel->axis[2]);
+			
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0;
+				} else if (len > 1) {
+					alpha = 0xff;
+				} else {
+					alpha = (len * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
 		}
+		else
+        {
+            unsigned char alpha;
+
+            for (i = 0; i < tess.numVertexes; i++) {
+                float len;
+                vec3_t org, v;
+
+				if (backEnd.currentEntity) {
+                    VectorSubtract(backEnd.viewParms.ori.origin, backEnd.currentEntity->e.origin, v);
+                    org[0] = tess.xyz[i][0] - DotProduct(v, backEnd.currentEntity->e.axis[0]);
+                    org[1] = tess.xyz[i][1] - DotProduct(v, backEnd.currentEntity->e.axis[1]);
+                    org[2] = tess.xyz[i][2] - DotProduct(v, backEnd.currentEntity->e.axis[2]);
+				} else {
+					VectorCopy(backEnd.viewParms.ori.origin, org);
+				}
+
+				
+				len = (VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange;
+				if (len < 0) {
+					alpha = 0;
+				} else if (len > 1) {
+					alpha = 0xff;
+				} else {
+					alpha = (len * 255.0);
+                }
+                tess.svars.colors[i][3] = alpha;
+			}
+		}
+		break;
+    case AGEN_TIKI_DIST_FADE:
+    case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+		{
+			unsigned char alpha;
+
+			if (backEnd.currentStaticModel)
+			{
+				float lenSqr;
+				float fDistNearSqr;
+				float fDistFarSqr;
+				vec3_t org;
+
+				VectorSubtract(backEnd.currentStaticModel->origin, backEnd.viewParms.ori.origin, org);
+
+				lenSqr = VectorLengthSquared(org);
+                fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
+                fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
+				if (lenSqr <= fDistNearSqr) {
+					alpha = 0;
+				} else if (lenSqr >= fDistFarSqr) {
+					alpha = 0xff;
+				} else {
+					float len;
+
+					len = VectorLength(org);
+					alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
+				}
+
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					alpha = 0xff - alpha;
+				}
+			}
+			else if (backEnd.currentEntity)
+			{
+				float lenSqr;
+				float fDistNearSqr;
+				float fDistFarSqr;
+				vec3_t org;
+
+				VectorSubtract(backEnd.currentEntity->e.origin, backEnd.viewParms.ori.origin, org);
+
+				lenSqr = VectorLengthSquared(org);
+				fDistNearSqr = tess.shader->fDistNear * tess.shader->fDistNear;
+				fDistFarSqr = (tess.shader->fDistNear + tess.shader->fDistRange) * (tess.shader->fDistNear + tess.shader->fDistRange);
+				if (lenSqr <= fDistNearSqr) {
+					alpha = 0;
+				} else if (lenSqr >= fDistFarSqr) {
+					alpha = 0xff;
+				} else {
+					float len;
+
+                    len = VectorLength(org);
+                    alpha = (((VectorLength(org) - tess.shader->fDistNear) / tess.shader->fDistRange) * 255.0);
+				}
+
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					alpha = 0xff - alpha;
+				}
+			}
+			else
+			{
+				const char* type;
+				if (pStage->alphaGen == AGEN_TIKI_DIST_FADE) {
+					type = "tikiDistFade";
+				} else {
+					type = "oneMinusTikiDistFade";
+				}
+
+				ri.Error(ERR_DROP, "ERROR: '%s' shader command used on a non-tiki\n", type);
+				alpha = 0xff;
+			}
+			RB_CalcAlphaFromConstant((unsigned char*)tess.svars.colors, alpha);
+		}
+		break;
+	case AGEN_DOT_VIEW:
+		RB_CalcAlphaFromDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+		break;
+	case AGEN_ONE_MINUS_DOT_VIEW:
+		RB_CalcAlphaFromOneMinusDotView((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+        break;
+    case AGEN_HEIGHT_FADE:
+        RB_CalcAlphaFromHeightFade((unsigned char*)tess.svars.colors, pStage->alphaMin, pStage->alphaMax);
+        break;
+	default:
+		break;
 	}
 }
 
@@ -830,7 +1298,7 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 	int		i;
 	int		b;
 
-	for ( b = 0; b < NUM_TEXTURE_BUNDLES; b++ ) {
+	for ( b = 0; b < NUM_TEXTURE_BUNDLES && pStage->bundle[b].image[0]; b++ ) {
 		int tm;
 
 		//
@@ -853,20 +1321,29 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 				tess.svars.texcoords[b][i][1] = tess.texCoords[i][1][1];
 			}
 			break;
-		case TCGEN_VECTOR:
-			for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-				tess.svars.texcoords[b][i][0] = DotProduct( tess.xyz[i], pStage->bundle[b].tcGenVectors[0] );
-				tess.svars.texcoords[b][i][1] = DotProduct( tess.xyz[i], pStage->bundle[b].tcGenVectors[1] );
-			}
-			break;
-		case TCGEN_FOG:
-			RB_CalcFogTexCoords( ( float * ) tess.svars.texcoords[b] );
-			break;
 		case TCGEN_ENVIRONMENT_MAPPED:
 			RB_CalcEnvironmentTexCoords( ( float * ) tess.svars.texcoords[b] );
+            break;
+		case TCGEN_VECTOR:
+			for (i = 0; i < tess.numVertexes; i++) {
+				tess.svars.texcoords[b][i][0] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[0]);
+				tess.svars.texcoords[b][i][1] = DotProduct(tess.xyz[i], pStage->bundle[b].tcGenVectors[1]);
+			}
+			break;
+        case TCGEN_ENVIRONMENT_MAPPED2:
+            RB_CalcEnvironmentTexCoords2((float*)tess.svars.texcoords[b]);
+            break;
+		case TCGEN_SUN_REFLECTION:
+			RB_CalcSunReflectionTexCoords(tess.svars.texcoords[b][0]);
+			break;
+        default:
+            ri.Printf(
+				PRINT_DEVELOPER,
+                "WARNING: invalid tcGen '%d' specified for shader '%s'\n",
+                pStage->bundle[b].tcGen,
+                tess.shader->name
+			);
 			break;
-		case TCGEN_BAD:
-			return;
 		}
 
 		//
@@ -911,11 +1388,37 @@ static void ComputeTexCoords( shaderStage_t *pStage ) {
 
 			case TMOD_ROTATE:
 				RB_CalcRotateTexCoords( pStage->bundle[b].texMods[tm].rotateSpeed,
-										( float * ) tess.svars.texcoords[b] );
+										pStage->bundle[b].texMods[tm].rotateCoef,
+										( float * ) tess.svars.texcoords[b],
+										pStage->bundle[b].texMods[tm].rotateStart );
 				break;
 
+			case TMOD_OFFSET:
+				RB_CalcOffsetTexCoords(pStage->bundle[b].texMods[tm].scroll, tess.svars.texcoords[b][0]);
+				break;
+
+            case TMOD_PARALLAX:
+				RB_CalcParallaxTexCoords(pStage->bundle[b].texMods[tm].rate, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_MACRO:
+				RB_CalcMacroTexCoords(pStage->bundle[b].texMods[tm].scale, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANS:
+				RB_CalcTransWaveTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_WAVETRANT:
+				RB_CalcTransWaveTexCoordsT(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
+            case TMOD_BULGETRANS:
+				RB_CalcBulgeTexCoords(&pStage->bundle[b].texMods[tm].wave, tess.svars.texcoords[b][0]);
+                break;
+
 			default:
-				ri.Error( ERR_DROP, "ERROR: unknown texmod '%d' in shader '%s'", pStage->bundle[b].texMods[tm].type, tess.shader->name );
+				ri.Printf(PRINT_WARNING, "WARNING: invalid tcMod '%d' specified for shader '%s'\n", pStage->bundle[b].texMods[tm].type, tess.shader->name );
 				break;
 			}
 		}
@@ -929,52 +1432,75 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 {
 	int stage;
 
-	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ )
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++)
 	{
-		shaderStage_t *pStage = tess.xstages[stage];
+		shaderStage_t* pStage = tess.xstages[stage];
 
-		if ( !pStage )
+		if (!pStage)
 		{
 			break;
 		}
 
-		ComputeColors( pStage );
-		ComputeTexCoords( pStage );
+		if (pStage->alphaGen == AGEN_SKYALPHA && tr.refdef.sky_alpha < 0.01) {
+			continue;
+		}
+		else if (pStage->alphaGen == AGEN_ONE_MINUS_SKYALPHA && tr.refdef.sky_alpha > 0.99) {
+			continue;
+		}
 
-		if ( !setArraysOnce )
+		ComputeTexCoords(pStage);
+		ComputeColors(pStage);
+
+		if (!setArraysOnce)
 		{
-			qglEnableClientState( GL_COLOR_ARRAY );
-			qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, input->svars.colors );
+			qglEnableClientState(GL_COLOR_ARRAY);
+			qglColorPointer(4, GL_UNSIGNED_BYTE, 0, input->svars.colors);
 		}
 
 		//
 		// do multitexture
 		//
-		if ( pStage->bundle[1].image[0] != 0 )
+		if (pStage->bundle[1].image[0] != 0)
 		{
-			DrawMultitextured( input, stage );
+			DrawMultitextured(input, stage);
 		}
 		else
 		{
-			if ( !setArraysOnce )
+			if (backEnd.in2D) {
+				GL_State(pStage->stateBits | GLS_DEPTHTEST_DISABLE);
+			}
+			else {
+				GL_State(pStage->stateBits);
+			}
+
+			if (!setArraysOnce)
 			{
-				qglTexCoordPointer( 2, GL_FLOAT, 0, input->svars.texcoords[0] );
+				qglTexCoordPointer(2, GL_FLOAT, 0, input->svars.texcoords[0]);
 			}
 
 			//
 			// set state
 			//
-			R_BindAnimatedImage( &pStage->bundle[0] );
-
-			GL_State( pStage->stateBits );
+			if (pStage->bundle[0].vertexLightmap && r_vertexLight->integer && r_lightmap->integer)
+			{
+				GL_Bind(tr.whiteImage);
+			}
+			else {
+				if (input->dlightMap && tess.xstages[stage]->bundle[0].isLightmap) {
+					GL_Bind(tr.dlightImages[input->dlightMap - 1]);
+				}
+				else {
+					R_BindAnimatedImage(&pStage->bundle[0]);
+				}
+			}
 
 			//
 			// draw
 			//
-			R_DrawElements( input->numIndexes, input->indexes );
+			R_DrawElements(input->numIndexes, input->indexes);
 		}
 		// allow skipping out to show just lightmaps during development
-		if ( r_lightmap->integer && ( pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap ) )
+		if (r_lightmap->integer && (pStage->bundle[0].isLightmap || pStage->bundle[1].isLightmap || pStage->bundle[0].vertexLightmap))
 		{
 			break;
 		}
@@ -988,10 +1514,13 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 void RB_StageIteratorGeneric( void )
 {
 	shaderCommands_t *input;
-	shader_t		*shader;
 
 	input = &tess;
-	shader = input->shader;
+
+	input->shaderTime = backEnd.refdef.floatTime;
+	if ((input->shader->flags & 1) != 0) {
+		input->shaderTime = backEnd.refdef.floatTime - backEnd.shaderStartTime;
+	}
 
 	RB_DeformTessGeometry();
 
@@ -1008,10 +1537,10 @@ void RB_StageIteratorGeneric( void )
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	// set polygon offset if necessary
-	if ( shader->polygonOffset )
+	if ( input->shader->polygonOffset )
 	{
 		qglEnable( GL_POLYGON_OFFSET_FILL );
 		qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value );
@@ -1023,21 +1552,21 @@ void RB_StageIteratorGeneric( void )
 	// to avoid compiling those arrays since they will change
 	// during multipass rendering
 	//
-	if ( tess.numPasses > 1 || shader->multitextureEnv )
+	if (tess.numPasses > 1 || (tess.xstages[0] && tess.xstages[0]->multitextureEnv))
 	{
 		setArraysOnce = qfalse;
-		qglDisableClientState (GL_COLOR_ARRAY);
-		qglDisableClientState (GL_TEXTURE_COORD_ARRAY);
+		qglDisableClientState(GL_COLOR_ARRAY);
+		qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
 	}
 	else
 	{
 		setArraysOnce = qtrue;
 
-		qglEnableClientState( GL_COLOR_ARRAY);
-		qglColorPointer( 4, GL_UNSIGNED_BYTE, 0, tess.svars.colors );
+		qglEnableClientState(GL_COLOR_ARRAY);
+		qglColorPointer(4, GL_UNSIGNED_BYTE, 0, tess.svars.colors);
 
-		qglEnableClientState( GL_TEXTURE_COORD_ARRAY);
-		qglTexCoordPointer( 2, GL_FLOAT, 0, tess.svars.texcoords[0] );
+		qglEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		qglTexCoordPointer(2, GL_FLOAT, 0, tess.svars.texcoords[0]);
 	}
 
 	//
@@ -1067,18 +1596,10 @@ void RB_StageIteratorGeneric( void )
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE
-		&& !(tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY) ) ) {
+	if (tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	// 
 	// unlock arrays
 	//
@@ -1091,7 +1612,7 @@ void RB_StageIteratorGeneric( void )
 	//
 	// reset polygon offset
 	//
-	if ( shader->polygonOffset )
+	if ( input->shader->polygonOffset )
 	{
 		qglDisable( GL_POLYGON_OFFSET_FILL );
 	}
@@ -1101,18 +1622,37 @@ void RB_StageIteratorGeneric( void )
 /*
 ** RB_StageIteratorVertexLitTexture
 */
-void RB_StageIteratorVertexLitTexture( void )
+void RB_StageIteratorVertexLitTextureUnfogged( void )
 {
 	shaderCommands_t *input;
 	shader_t		*shader;
 
 	input = &tess;
+
 	shader = input->shader;
 
-	//
-	// compute colors
-	//
-	RB_CalcDiffuseColor( ( unsigned char * ) tess.svars.colors );
+	if (backEnd.currentSphere->TessFunction && r_drawspherelights->integer)
+	{
+		//
+		// compute colors using the sphere function
+		//
+		backEnd.currentSphere->TessFunction((unsigned char*)tess.svars.colors);
+	}
+	else if (backEnd.currentStaticModel)
+	{
+		//
+		// compute colors
+		//
+		ComputeColors(input->xstages[0]);
+	}
+	else
+	{
+		//
+		// calculate using previously calculated lighting grid
+		// for the entity
+		//
+		RB_CalcLightGridColor((unsigned char*)tess.svars.colors);
+	}
 
 	//
 	// log this call
@@ -1127,7 +1667,7 @@ void RB_StageIteratorVertexLitTexture( void )
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	//
 	// set arrays and lock
@@ -1155,17 +1695,10 @@ void RB_StageIteratorVertexLitTexture( void )
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE ) {
+	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	// 
 	// unlock arrays
 	//
@@ -1178,12 +1711,10 @@ void RB_StageIteratorVertexLitTexture( void )
 
 //define	REPLACE_MODE
 
-void RB_StageIteratorLightmappedMultitexture( void ) {
+void RB_StageIteratorLightmappedMultitextureUnfogged( void ) {
 	shaderCommands_t *input;
-	shader_t		*shader;
 
 	input = &tess;
-	shader = input->shader;
 
 	//
 	// log this call
@@ -1197,12 +1728,12 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	//
 	// set face culling appropriately
 	//
-	GL_Cull( shader->cullType );
+	GL_Cull( input->shader->cullType );
 
 	//
 	// set color, pointers, and lock
 	//
-	GL_State( GLS_DEFAULT );
+	GL_State( GLS_DEFAULT | (tess.xstages[0]->stateBits & (GLS_ATEST_BITS | GLS_FOG_BITS)));
 	qglVertexPointer( 3, GL_FLOAT, 16, input->xyz );
 
 #ifdef REPLACE_MODE
@@ -1233,7 +1764,11 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	} else {
 		GL_TexEnv( GL_MODULATE );
 	}
-	R_BindAnimatedImage( &tess.xstages[0]->bundle[1] );
+	if (tess.dlightMap && tess.xstages[0]->bundle[1].isLightmap) {
+		GL_Bind(tr.dlightImages[tess.dlightMap - 1]);
+	} else {
+		R_BindAnimatedImage(&tess.xstages[0]->bundle[1]);
+	}
 	qglEnableClientState( GL_TEXTURE_COORD_ARRAY );
 	qglTexCoordPointer( 2, GL_FLOAT, 16, tess.texCoords[0][1] );
 
@@ -1262,17 +1797,10 @@ void RB_StageIteratorLightmappedMultitexture( void ) {
 	// 
 	// now do any dynamic lighting needed
 	//
-	if ( tess.dlightBits && tess.shader->sort <= SS_OPAQUE ) {
+	if ( tess.dlightBits && !tess.dlightMap && tess.shader->sort <= SS_OPAQUE ) {
 		ProjectDlightTexture();
 	}
 
-	//
-	// now do fog
-	//
-	if ( tess.fogNum && tess.shader->fogPass ) {
-		RB_FogPass();
-	}
-
 	//
 	// unlock arrays
 	//
@@ -1293,7 +1821,6 @@ void RB_EndSurface( void ) {
 	if (input->numIndexes == 0) {
 		return;
 	}
-
 	if (input->indexes[SHADER_MAX_INDEXES-1] != 0) {
 		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_INDEXES hit");
 	}	
@@ -1301,8 +1828,12 @@ void RB_EndSurface( void ) {
 		ri.Error (ERR_DROP, "RB_EndSurface() - SHADER_MAX_VERTEXES hit");
 	}
 
+	if (tess.xyz[SHADER_MAX_VERTEXES - 1][0] && r_shadows->integer != 3) {
+		tess.xyz[SHADER_MAX_VERTEXES - 1][0] = 0;
+	}
+
 	if ( tess.shader == tr.shadowShader ) {
-		RB_ShadowTessEnd();
+		RB_ComputeShadowVolume();
 		return;
 	}
 
@@ -1324,15 +1855,19 @@ void RB_EndSurface( void ) {
 	//
 	tess.currentStageIteratorFunc();
 
-	//
-	// draw debugging stuff
-	//
-	if ( r_showtris->integer ) {
-		DrawTris (input);
-	}
-	if ( r_shownormals->integer ) {
-		DrawNormals (input);
+	if (!(tr.refdef.rdflags & RDF_NOWORLDMODEL) && !backEnd.in2D)
+	{
+		//
+		// draw debugging stuff
+		//
+		if (r_showtris->integer && r_developer->integer) {
+			DrawTris(input, r_showtris->integer);
+		}
+		if (r_shownormals->integer && r_developer->integer) {
+			DrawNormals(input);
+		}
 	}
+
 	// clear shader so we can tell we don't have any unclosed surfaces
 	tess.numIndexes = 0;
 
diff --git a/code/renderergl1/tr_shade_calc.c b/code/renderergl1/tr_shade_calc.c
index 455424ed..9c8dd658 100644
--- a/code/renderergl1/tr_shade_calc.c
+++ b/code/renderergl1/tr_shade_calc.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tr_local.h"
 
 
-#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ ( (int64_t) ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
+#define	WAVEVALUE( table, base, amplitude, phase, freq )  ((base) + table[ myftol( ( ( (phase) + tess.shaderTime * (freq) ) * FUNCTABLE_SIZE ) ) & FUNCTABLE_MASK ] * (amplitude))
 
 static float *TableForFunc( genFunc_t func ) 
 {
@@ -45,7 +45,7 @@ static float *TableForFunc( genFunc_t func )
 		break;
 	}
 
-	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'", func, tess.shader->name );
+	ri.Error( ERR_DROP, "TableForFunc called with invalid function '%d' in shader '%s'\n", func, tess.shader->name );
 	return NULL;
 }
 
@@ -57,10 +57,54 @@ static float *TableForFunc( genFunc_t func )
 static float EvalWaveForm( const waveForm_t *wf ) 
 {
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
 	table = TableForFunc( wf->func );
 
-	return WAVEVALUE( table, wf->base, wf->amplitude, wf->phase, wf->frequency );
+    if (wf->base != 1234567.0f) {
+        base = wf->base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (wf->amplitude != 1234567.0f) {
+		amplitude = wf->amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (wf->phase != 1234567.0f) {
+		phase = wf->phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (wf->frequency != 1234567.0f) {
+		frequency = wf->frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	return WAVEVALUE( table, base, amplitude, phase, frequency );
 }
 
 static float EvalWaveFormClamped( const waveForm_t *wf )
@@ -101,6 +145,65 @@ void RB_CalcStretchTexCoords( const waveForm_t *wf, float *st )
 	RB_CalcTransformTexCoords( &tmi, st );
 }
 
+/*
+========================
+RB_CalcTransWaveTexCoords
+
+========================
+*/
+void RB_CalcTransWaveTexCoords(const waveForm_t* wf, float* st)
+{
+	float p;
+	int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[0] += p;
+    }
+}
+
+/*
+========================
+RB_CalcTransWaveTexCoordsT
+
+========================
+*/
+void RB_CalcTransWaveTexCoordsT(const waveForm_t* wf, float* st)
+{
+    float p;
+    int i;
+
+    p = EvalWaveForm(wf);
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+        st[1] += p;
+    }
+}
+
+/*
+========================
+RB_CalcBulgeTexCoords
+
+========================
+*/
+void RB_CalcBulgeTexCoords(const waveForm_t* wf, float* st)
+{
+	int i;
+	int off;
+	float offset;
+	float now;
+	float amplitude;
+	float width;
+
+    amplitude = wf->amplitude;
+    width = wf->base;
+    now = backEnd.refdef.time / 1000.0 * wf->frequency + wf->phase;
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		off = (now + st[0] * width) * FUNCTABLE_SIZE;
+		offset = tr.sinTable[off & FUNCTABLE_MASK] * amplitude;
+	}
+}
+
 /*
 ====================================================================
 
@@ -123,8 +226,52 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 	float	*xyz = ( float * ) tess.xyz;
 	float	*normal = ( float * ) tess.normal;
 	float	*table;
+	float	base;
+	float	amplitude;
+	float	phase;
+	float	frequency;
 
-	if ( ds->deformationWave.frequency == 0 )
+    if (ds->deformationWave.base != 1234567.0f) {
+        base = ds->deformationWave.base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (ds->deformationWave.amplitude != 1234567.0f) {
+		amplitude = ds->deformationWave.amplitude;
+    } else if (backEnd.currentEntity) {
+		amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+		amplitude = r_static_shaderdata1->value;
+    }
+
+    if (ds->deformationWave.phase != 1234567.0f) {
+		phase = ds->deformationWave.phase;
+    } else if (backEnd.currentEntity) {
+		phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+		phase = r_static_shaderdata2->value;
+    }
+
+    if (ds->deformationWave.frequency != 1234567.0f) {
+		frequency = ds->deformationWave.frequency;
+    } else if (backEnd.currentEntity) {
+		frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+		frequency = r_static_shaderdata1->value;
+    }
+
+	if (!backEnd.currentEntity)
+	{
+		base *= r_static_shadermultiplier0->value;
+		amplitude *= r_static_shadermultiplier1->value;
+		phase *= r_static_shadermultiplier2->value;
+		frequency *= r_static_shadermultiplier3->value;
+	}
+
+	if ( frequency == 0 )
 	{
 		scale = EvalWaveForm( &ds->deformationWave );
 
@@ -145,10 +292,7 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 		{
 			float off = ( xyz[0] + xyz[1] + xyz[2] ) * ds->deformationSpread;
 
-			scale = WAVEVALUE( table, ds->deformationWave.base, 
-				ds->deformationWave.amplitude,
-				ds->deformationWave.phase + off,
-				ds->deformationWave.frequency );
+			scale = WAVEVALUE( table, base, amplitude, phase + off, frequency );
 
 			VectorScale( normal, scale, offset );
 			
@@ -159,6 +303,91 @@ void RB_CalcDeformVertexes( deformStage_t *ds )
 	}
 }
 
+void RB_CalcFlapVertexes(deformStage_t* ds, texDirection_t coordsToUse)
+{
+    int    i;
+    vec3_t offset;
+    float  scale;
+    vec4_t* xyz, * normal;
+	float* table;
+    float  base;
+    float  amplitude;
+    float  phase;
+    float  frequency;
+    float  min, max;
+    vec2_t (*st)[2];
+    float  vertexScale;
+
+    xyz = tess.xyz;
+    normal = tess.normal;
+    min = ds->bulgeWidth;
+    max = ds->bulgeHeight;
+    st = tess.texCoords;
+
+    if (ds->deformationWave.base != 1234567.0f) {
+        base = ds->deformationWave.base;
+    } else if (backEnd.currentEntity) {
+        base = (float)backEnd.currentEntity->e.surfaces[0] / 16.0 - 8.0;
+    } else {
+        base = r_static_shaderdata0->value;
+    }
+
+    if (ds->deformationWave.amplitude != 1234567.0f) {
+        amplitude = ds->deformationWave.amplitude;
+    } else if (backEnd.currentEntity) {
+        amplitude = (float)backEnd.currentEntity->e.surfaces[1] / 16.0;
+    } else {
+        amplitude = r_static_shaderdata1->value;
+    }
+
+    if (ds->deformationWave.phase != 1234567.0f) {
+        phase = ds->deformationWave.phase;
+    } else if (backEnd.currentEntity) {
+        phase = (float)backEnd.currentEntity->e.surfaces[2] / 16.0 - 8.0;
+    } else {
+        phase = r_static_shaderdata2->value;
+    }
+
+    if (ds->deformationWave.frequency != 1234567.0f) {
+        frequency = ds->deformationWave.frequency;
+    } else if (backEnd.currentEntity) {
+        frequency = (float)backEnd.currentEntity->e.surfaces[3] / 16.0;
+    } else {
+        frequency = r_static_shaderdata3->value;
+    }
+
+    if (!backEnd.currentEntity) {
+        base = base * r_static_shadermultiplier0->value;
+        amplitude = amplitude * r_static_shadermultiplier1->value;
+        phase = phase * r_static_shadermultiplier2->value;
+        frequency = frequency * r_static_shadermultiplier3->value;
+    }
+
+	if (frequency) {
+		table = TableForFunc(ds->deformationWave.func);
+		for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
+			float off;
+
+			off = ((*xyz)[0] + (*xyz)[1] + (*xyz)[2]) * ds->deformationSpread;
+			scale = WAVEVALUE(table, base, amplitude, phase, frequency);
+            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
+            offset[0] = scale * vertexScale * (*normal)[0];
+            offset[1] = scale * vertexScale * (*normal)[1];
+            offset[2] = scale * vertexScale * (*normal)[2];
+			VectorAdd(*xyz, offset, *xyz);
+		}
+	} else {
+        scale = EvalWaveForm(&ds->deformationWave);
+        for (i = 0; i < tess.numVertexes; i++, xyz++, st++, normal++) {
+            vertexScale = (max - min) * (*st)[0][coordsToUse] + min;
+            offset[0] = vertexScale * scale * (*normal)[0];
+            offset[1] = vertexScale * scale * (*normal)[1];
+            offset[2] = vertexScale * scale * (*normal)[2];
+            VectorAdd(*xyz, offset, *xyz);
+		}
+	}
+}
+
 /*
 =========================
 RB_CalcDeformNormals
@@ -203,12 +432,12 @@ void RB_CalcBulgeVertexes( deformStage_t *ds ) {
 	const float *st = ( const float * ) tess.texCoords[0];
 	float		*xyz = ( float * ) tess.xyz;
 	float		*normal = ( float * ) tess.normal;
-	double		now;
+	float		now;
 
-	now = backEnd.refdef.time * 0.001 * ds->bulgeSpeed;
+	now = backEnd.refdef.time * ds->bulgeSpeed * 0.001f;
 
 	for ( i = 0; i < tess.numVertexes; i++, xyz += 4, st += 4, normal += 4 ) {
-		int64_t off;
+		int		off;
 		float scale;
 
 		off = (float)( FUNCTABLE_SIZE / (M_PI*2) ) * ( st[0] * ds->bulgeWidth + now );
@@ -262,7 +491,7 @@ Change a polygon into a bunch of text polygons
 void DeformText( const char *text ) {
 	int		i;
 	vec3_t	origin, width, height;
-	int		len;
+	size_t	len;
 	int		ch;
 	byte	color[4];
 	float	bottom, top;
@@ -333,80 +562,87 @@ GlobalVectorToLocal
 ==================
 */
 static void GlobalVectorToLocal( const vec3_t in, vec3_t out ) {
-	out[0] = DotProduct( in, backEnd.or.axis[0] );
-	out[1] = DotProduct( in, backEnd.or.axis[1] );
-	out[2] = DotProduct( in, backEnd.or.axis[2] );
+	out[0] = DotProduct( in, backEnd.ori.axis[0] );
+	out[1] = DotProduct( in, backEnd.ori.axis[1] );
+	out[2] = DotProduct( in, backEnd.ori.axis[2] );
 }
 
 /*
 =====================
 AutospriteDeform
 
-Assuming all the triangles for this shader are independent
+Assuming all the triangles for this shader are independant
 quads, rebuild them as forward facing sprites
 =====================
 */
-static void AutospriteDeform( void ) {
-	int		i;
-	int		oldVerts;
-	float	*xyz;
-	vec3_t	mid, delta;
-	float	radius;
-	vec3_t	left, up;
-	vec3_t	leftDir, upDir;
+static void AutospriteDeform(void) {
+    int		i;
+    int		oldVerts;
+    float* xyz;
+    vec3_t	mid, delta;
+    float	radius;
+    vec3_t	left, up;
+    vec3_t	leftDir, upDir;
 
-	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name );
-	}
-	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name );
-	}
-
-	oldVerts = tess.numVertexes;
-	tess.numVertexes = 0;
-	tess.numIndexes = 0;
-
-	if ( backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[1], leftDir );
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[2], upDir );
-	} else {
-		VectorCopy( backEnd.viewParms.or.axis[1], leftDir );
-		VectorCopy( backEnd.viewParms.or.axis[2], upDir );
-	}
-
-	for ( i = 0 ; i < oldVerts ; i+=4 ) {
-		// find the midpoint
-		xyz = tess.xyz[i];
-
-		mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
-		mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
-		mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
-
-		VectorSubtract( xyz, mid, delta );
-		radius = VectorLength( delta ) * 0.707f;		// / sqrt(2)
-
-		VectorScale( leftDir, radius, left );
-		VectorScale( upDir, radius, up );
-
-		if ( backEnd.viewParms.isMirror ) {
-			VectorSubtract( vec3_origin, left, left );
-		}
-
-	  // compensate for scale in the axes if necessary
-  	if ( backEnd.currentEntity->e.nonNormalizedAxes ) {
-      float axisLength;
-		  axisLength = VectorLength( backEnd.currentEntity->e.axis[0] );
-  		if ( !axisLength ) {
-	  		axisLength = 0;
-  		} else {
-	  		axisLength = 1.0f / axisLength;
-  		}
-      VectorScale(left, axisLength, left);
-      VectorScale(up, axisLength, up);
+    if (tess.numVertexes & 3) {
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd vertex count\n", tess.shader->name);
+    }
+    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
+        ri.Printf(PRINT_WARNING, "Autosprite shader %s had odd index count\n", tess.shader->name);
     }
 
-		RB_AddQuadStamp( mid, left, up, tess.vertexColors[i] );
-	}
+    oldVerts = tess.numVertexes;
+    tess.numVertexes = 0;
+    tess.numIndexes = 0;
+
+    if (backEnd.currentEntity != &tr.worldEntity) {
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
+    } else {
+        VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
+        VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
+    }
+
+    for (i = 0; i < oldVerts; i += 4) {
+        // find the midpoint
+        xyz = tess.xyz[i];
+
+        mid[0] = 0.25f * (xyz[0] + xyz[4] + xyz[8] + xyz[12]);
+        mid[1] = 0.25f * (xyz[1] + xyz[5] + xyz[9] + xyz[13]);
+        mid[2] = 0.25f * (xyz[2] + xyz[6] + xyz[10] + xyz[14]);
+
+        VectorSubtract(xyz, mid, delta);
+        radius = VectorLength(delta) * 0.707f;		// / sqrt(2)
+
+        VectorScale(leftDir, radius, left);
+        VectorScale(upDir, radius, up);
+
+        if (backEnd.viewParms.isMirror) {
+            VectorSubtract(vec3_origin, left, left);
+        }
+
+        // compensate for scale in the axes if necessary
+        if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes) {
+            float axisLength;
+
+			if (backEnd.currentStaticModel) {
+				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+			} else {
+				axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+			}
+            
+            if (!axisLength) {
+                axisLength = 0;
+            }
+            else {
+                axisLength = 1.0f / axisLength;
+            }
+            VectorScale(left, axisLength, left);
+            VectorScale(up, axisLength, up);
+        }
+
+        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
+    }
 }
 
 
@@ -419,48 +655,54 @@ Autosprite2 will pivot a rectangular quad along the center of its long axis
 */
 int edgeVerts[6][2] = {
 	{ 0, 1 },
-	{ 0, 2 },
 	{ 0, 3 },
-	{ 1, 2 },
+	{ 0, 2 },
 	{ 1, 3 },
-	{ 2, 3 }
+	{ 1, 2 },
+	{ 3, 2 }
 };
 
 static void Autosprite2Deform( void ) {
-	int		i, j, k;
+	int		i, j;
 	int		indexes;
 	float	*xyz;
 	vec3_t	forward;
 
 	if ( tess.numVertexes & 3 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd vertex count\n", tess.shader->name );
 	}
 	if ( tess.numIndexes != ( tess.numVertexes >> 2 ) * 6 ) {
-		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count", tess.shader->name );
+		ri.Printf( PRINT_WARNING, "Autosprite2 shader %s had odd index count\n", tess.shader->name );
 	}
 
-	if ( backEnd.currentEntity != &tr.worldEntity ) {
-		GlobalVectorToLocal( backEnd.viewParms.or.axis[0], forward );
+	if ( backEnd.currentStaticModel || backEnd.currentEntity != &tr.worldEntity ) {
+		GlobalVectorToLocal( backEnd.viewParms.ori.axis[0], forward );
 	} else {
-		VectorCopy( backEnd.viewParms.or.axis[0], forward );
+		VectorCopy( backEnd.viewParms.ori.axis[0], forward );
 	}
 
 	// this is a lot of work for two triangles...
 	// we could precalculate a lot of it is an issue, but it would mess up
 	// the shader abstraction
 	for ( i = 0, indexes = 0 ; i < tess.numVertexes ; i+=4, indexes+=6 ) {
-		float	lengths[2];
-		int		nums[2];
+		float shortLengths[2];
+		int shortNums[2];
+		float longLengths[2];
+		int longNums[2];
 		vec3_t	mid[2];
 		vec3_t	major, minor;
-		float	*v1, *v2;
+		float	*v1, *v2, *v3, *v4;
+		qboolean firstOnLeft, secondOnLeft;
+		float edgeLength;
 
 		// find the midpoint
 		xyz = tess.xyz[i];
 
 		// identify the two shortest edges
-		nums[0] = nums[1] = 0;
-		lengths[0] = lengths[1] = 999999;
+		shortNums[0] = shortNums[1] = 0;
+		shortLengths[0] = shortLengths[1] = 1000000000;
+		longNums[1] = longNums[0] = 0;
+		longLengths[1] = longLengths[0] = 0;
 
 		for ( j = 0 ; j < 6 ; j++ ) {
 			float	l;
@@ -472,20 +714,30 @@ static void Autosprite2Deform( void ) {
 			VectorSubtract( v1, v2, temp );
 			
 			l = DotProduct( temp, temp );
-			if ( l < lengths[0] ) {
-				nums[1] = nums[0];
-				lengths[1] = lengths[0];
-				nums[0] = j;
-				lengths[0] = l;
-			} else if ( l < lengths[1] ) {
-				nums[1] = j;
-				lengths[1] = l;
+			if ( l < shortLengths[0] ) {
+				shortNums[1] = shortNums[0];
+				shortLengths[1] = shortLengths[0];
+				shortNums[0] = j;
+				shortLengths[0] = l;
+			} else if ( l < shortLengths[1] ) {
+				shortNums[1] = j;
+				shortLengths[1] = l;
+			}
+
+			if (l > longLengths[0]) {
+				longNums[1] = longNums[0];
+				longLengths[1] = longLengths[0];
+				longNums[0] = j;
+				longLengths[0] = l;
+			} else if (l > longLengths[1]) {
+				longNums[1] = j;
+				longLengths[1] = l;
 			}
 		}
 
 		for ( j = 0 ; j < 2 ; j++ ) {
-			v1 = xyz + 4 * edgeVerts[nums[j]][0];
-			v2 = xyz + 4 * edgeVerts[nums[j]][1];
+			v1 = xyz + 4 * edgeVerts[shortNums[j]][0];
+			v2 = xyz + 4 * edgeVerts[shortNums[j]][1];
 
 			mid[j][0] = 0.5f * (v1[0] + v2[0]);
 			mid[j][1] = 0.5f * (v1[1] + v2[1]);
@@ -498,36 +750,151 @@ static void Autosprite2Deform( void ) {
 		// cross this with the view direction to get minor axis
 		CrossProduct( major, forward, minor );
 		VectorNormalize( minor );
-		
-		// re-project the points
-		for ( j = 0 ; j < 2 ; j++ ) {
-			float	l;
 
-			v1 = xyz + 4 * edgeVerts[nums[j]][0];
-			v2 = xyz + 4 * edgeVerts[nums[j]][1];
+        v1 = xyz + 4 * edgeVerts[shortNums[0]][0];
+        v2 = xyz + 4 * edgeVerts[shortNums[0]][1];
 
-			l = 0.5 * sqrt( lengths[j] );
-			
-			// we need to see which direction this edge
-			// is used to determine direction of projection
-			for ( k = 0 ; k < 5 ; k++ ) {
-				if ( tess.indexes[ indexes + k ] == i + edgeVerts[nums[j]][0]
-					&& tess.indexes[ indexes + k + 1 ] == i + edgeVerts[nums[j]][1] ) {
-					break;
-				}
-			}
-
-			if ( k == 5 ) {
-				VectorMA( mid[j], l, minor, v1 );
-				VectorMA( mid[j], -l, minor, v2 );
-			} else {
-				VectorMA( mid[j], -l, minor, v1 );
-				VectorMA( mid[j], l, minor, v2 );
-			}
+        // we need to see which direction this edge
+        // is used to determine direction of projection
+		if (edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][0]
+			|| edgeVerts[shortNums[0]][0] == edgeVerts[longNums[0]][1])
+		{
+			firstOnLeft = qtrue;
 		}
+		else
+		{
+			firstOnLeft = qfalse;
+        }
+
+        if (edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][0]
+            || edgeVerts[shortNums[1]][0] == edgeVerts[longNums[1]][1])
+        {
+            secondOnLeft = qtrue;
+        }
+        else
+        {
+			secondOnLeft = qfalse;
+        }
+
+		if (firstOnLeft == secondOnLeft)
+        {
+            v3 = xyz + 4 * edgeVerts[shortNums[1]][0];
+            v4 = xyz + 4 * edgeVerts[shortNums[1]][1];
+		}
+		else
+        {
+            v3 = xyz + 4 * edgeVerts[shortNums[1]][1];
+            v4 = xyz + 4 * edgeVerts[shortNums[1]][0];
+		}
+
+        // re-project the points
+		edgeLength = sqrt(shortLengths[0]) * 0.5;
+        v1[0] = -edgeLength * minor[0] + mid[0][0];
+        v1[1] = -edgeLength * minor[1] + mid[0][1];
+        v1[2] = -edgeLength * minor[2] + mid[0][2];
+		v2[0] = minor[0] * edgeLength + mid[0][0];
+        v2[1] = minor[1] * edgeLength + mid[0][1];
+        v2[2] = minor[2] * edgeLength + mid[0][2];
+
+        edgeLength = sqrt(shortLengths[1]) * 0.5;
+		v3[0] = -edgeLength * minor[0] + mid[1][0];
+        v3[1] = -edgeLength * minor[1] + mid[1][1];
+        v3[2] = -edgeLength * minor[2] + mid[1][2];
+		v4[0] = minor[0] * edgeLength + mid[1][0];
+        v4[1] = minor[1] * edgeLength + mid[1][1];
+        v4[2] = minor[2] * edgeLength + mid[1][2];
 	}
 }
 
+static void LightGlowDeform() {
+	int i;
+	int oldVerts;
+	float* xyz;
+	vec3_t mid, delta;
+	float radius, dist, ofs;
+	vec3_t forward, left, up;
+	vec3_t leftDir, upDir;
+
+    if (tess.numVertexes & 3) {
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd vertex count\n", tess.shader->name);
+    }
+    if (tess.numIndexes != (tess.numVertexes >> 2) * 6) {
+        ri.Printf(PRINT_WARNING, "LightGlowDeform shader %s had odd index count\n", tess.shader->name);
+    }
+
+	oldVerts = tess.numVertexes;
+	tess.numVertexes = 0;
+	tess.numIndexes = 0;
+
+    if (backEnd.currentEntity == &tr.worldEntity)
+    {
+		VectorCopy(backEnd.viewParms.ori.axis[1], leftDir);
+		VectorCopy(backEnd.viewParms.ori.axis[2], upDir);
+    }
+    else
+    {
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[1], leftDir);
+        GlobalVectorToLocal(backEnd.viewParms.ori.axis[2], upDir);
+    }
+
+	for (i = 0; i < oldVerts; i += 4)
+	{
+		xyz = tess.xyz[i];
+
+		mid[0] = (xyz[0] + xyz[4] + xyz[8] + xyz[12]) * 0.25f;
+		mid[1] = (xyz[1] + xyz[5] + xyz[9] + xyz[13]) * 0.25f;
+		mid[2] = (xyz[2] + xyz[6] + xyz[10] + xyz[14]) * 0.25f;
+
+		VectorSubtract(xyz, mid, delta);
+
+		radius = VectorLength(delta) * 0.707f;
+		VectorAdd(mid, backEnd.ori.origin, delta);
+		VectorSubtract(backEnd.viewParms.ori.origin, delta, forward);
+
+		dist = VectorNormalize(forward) - 4.0;
+
+		VectorScale(forward, radius, forward);
+		VectorScale(leftDir, radius, left);
+		VectorScale(upDir, radius, up);
+
+		if (backEnd.viewParms.isMirror)
+		{
+			VectorSubtract(vec3_origin, forward, forward);
+			VectorSubtract(vec3_origin, left, left);
+		}
+
+		if (backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes)
+		{
+			float axisLength;
+
+			if (backEnd.currentStaticModel) {
+				axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+			} else {
+                axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+			}
+
+			if (axisLength != 0.0f) {
+				VectorScale(forward, axisLength, forward);
+				VectorScale(left, axisLength, left);
+				VectorScale(up, axisLength, up);
+			} else {
+				VectorClear(forward);
+				VectorClear(left);
+				VectorClear(up);
+			}
+		}
+
+		ofs = VectorLength(forward);
+        if (ofs > dist)
+        {
+            VectorNormalizeFast(forward);
+			VectorScale(forward, dist, forward);
+        }
+
+		VectorAdd(mid, forward, mid);
+        RB_AddQuadStamp(mid, left, up, tess.vertexColors[i]);
+	}
+}
 
 /*
 =====================
@@ -557,24 +924,20 @@ void RB_DeformTessGeometry( void ) {
 		case DEFORM_MOVE:
 			RB_CalcMoveVertexes( ds );
 			break;
-		case DEFORM_PROJECTION_SHADOW:
-			RB_ProjectionShadowDeform();
-			break;
 		case DEFORM_AUTOSPRITE:
 			AutospriteDeform();
 			break;
 		case DEFORM_AUTOSPRITE2:
 			Autosprite2Deform();
 			break;
-		case DEFORM_TEXT0:
-		case DEFORM_TEXT1:
-		case DEFORM_TEXT2:
-		case DEFORM_TEXT3:
-		case DEFORM_TEXT4:
-		case DEFORM_TEXT5:
-		case DEFORM_TEXT6:
-		case DEFORM_TEXT7:
-			DeformText( backEnd.refdef.text[ds->deformation - DEFORM_TEXT0] );
+		case DEFORM_LIGHTGLOW:
+			LightGlowDeform();
+			break;
+		case DEFORM_FLAP_S:
+			RB_CalcFlapVertexes(ds, USE_S_COORDS);
+			break;
+		case DEFORM_FLAP_T:
+			RB_CalcFlapVertexes(ds, USE_T_COORDS);
 			break;
 		}
 	}
@@ -631,7 +994,178 @@ void RB_CalcColorFromOneMinusEntity( unsigned char *dstColors )
 
 	for ( i = 0; i < tess.numVertexes; i++, pColors++ )
 	{
-		*pColors = c;
+		*pColors = * ( int * ) invModulate;
+	}
+}
+
+/*
+** RB_CalcColorFromConstant
+*/
+void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dstColors[i * 4] = constantColor[0];
+		dstColors[i * 4 + 1] = constantColor[1];
+		dstColors[i * 4 + 2] = constantColor[2];
+		dstColors[i * 4 + 3] = constantColor[3];
+	}
+}
+
+/*
+** RB_CalcRGBFromDot
+*/
+void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcRGBFromOneMinusDot
+*/
+void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromConstant
+*/
+void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dstColors[i * 4 + 3] = constantAlpha;
+	}
+}
+
+/*
+** RB_CalcAlphaFromDot
+*/
+void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromHeightFade
+*/
+void RB_CalcAlphaFromHeightFade(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	float dist;
+	float alpha;
+
+	for (i = 0; i < tess.numVertexes; i++) {
+		dist = fabs(backEnd.ori.viewOrigin[2] - tess.xyz[i][2]);
+		dist = Q_clamp_float(dist, alphaMin, alphaMax);
+		// Calculate the alpha height
+		alpha = (dist - alphaMin) / (alphaMax - alphaMin);
+		colors[i * 4 + 3] = (unsigned char)((1.f - alpha) * 255.0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromOneMinusDot
+*/
+void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+		float f;
+
+		VectorSubtract(backEnd.ori.viewOrigin, tess.xyz[i], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        f = 1.0 - Square(DotProduct(tess.normal[i], viewInModel));
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - 255), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)Q_max(f, 0);
+	}
+}
+
+/*
+** RB_CalcAlphaFromTexCoords
+*/
+void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
+	
+		colors[3] = (unsigned char)f;
+	}
+}
+
+/*
+** RB_CalcRGBFromTexCoords
+*/
+void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
+{
+	int i;
+
+	for (i = 0; i < tess.numVertexes; i++, colors += 4, st += 2) {
+		float f;
+
+        f = sWeight * tess.texCoords[i][0][0] + tWeight * tess.texCoords[i][0][1];
+        f = ((alphaMax - alphaMin) * f + alphaMin) * 255.0;
+		f = f - Q_max((int)(f - alphaCap), 0);
+		f = alphaMinCap + Q_max((int)(f - alphaMinCap), 0);
+
+		colors[0] = colors[1] = colors[2] = (unsigned char)f;
 	}
 }
 
@@ -674,7 +1208,7 @@ void RB_CalcAlphaFromOneMinusEntity( unsigned char *dstColors )
 /*
 ** RB_CalcWaveColor
 */
-void RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors )
+void RB_CalcWaveColor(const waveForm_t* wf, unsigned char* dstColors, unsigned char* constantColor)
 {
 	int i;
 	int v;
@@ -696,10 +1230,20 @@ void RB_CalcWaveColor( const waveForm_t *wf, unsigned char *dstColors )
 		glow = 1;
 	}
 
-	v = ri.ftol(255 * glow);
-	color[0] = color[1] = color[2] = v;
+	if (constantColor)
+	{
+		color[0] = constantColor[0] * glow;
+		color[1] = constantColor[1] * glow;
+		color[2] = constantColor[2] * glow;
+	}
+	else
+	{
+		v = myftol(255 * glow);
+		color[0] = color[1] = color[2] = v;
+	}
+
 	color[3] = 255;
-	v = *(int *)color;
+	v = *(int*)color;
 	
 	for ( i = 0; i < tess.numVertexes; i++, colors++ ) {
 		*colors = v;
@@ -725,65 +1269,6 @@ void RB_CalcWaveAlpha( const waveForm_t *wf, unsigned char *dstColors )
 	}
 }
 
-/*
-** RB_CalcModulateColorsByFog
-*/
-void RB_CalcModulateColorsByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2];
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[0] *= f;
-		colors[1] *= f;
-		colors[2] *= f;
-	}
-}
-
-/*
-** RB_CalcModulateAlphasByFog
-*/
-void RB_CalcModulateAlphasByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2];
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[3] *= f;
-	}
-}
-
-/*
-** RB_CalcModulateRGBAsByFog
-*/
-void RB_CalcModulateRGBAsByFog( unsigned char *colors ) {
-	int		i;
-	float	texCoords[SHADER_MAX_VERTEXES][2] = {{0.0f}};
-
-	// calculate texcoords so we can derive density
-	// this is not wasted, because it would only have
-	// been previously called if the surface was opaque
-	RB_CalcFogTexCoords( texCoords[0] );
-
-	for ( i = 0; i < tess.numVertexes; i++, colors += 4 ) {
-		float f = 1.0 - R_FogFactor( texCoords[i][0], texCoords[i][1] );
-		colors[0] *= f;
-		colors[1] *= f;
-		colors[2] *= f;
-		colors[3] *= f;
-	}
-}
-
 
 /*
 ====================================================================
@@ -793,95 +1278,6 @@ TEX COORDS
 ====================================================================
 */
 
-/*
-========================
-RB_CalcFogTexCoords
-
-To do the clipped fog plane really correctly, we should use
-projected textures, but I don't trust the drivers and it
-doesn't fit our shader data.
-========================
-*/
-void RB_CalcFogTexCoords( float *st ) {
-	int			i;
-	float		*v;
-	float		s, t;
-	float		eyeT;
-	qboolean	eyeOutside;
-	fog_t		*fog;
-	vec3_t		local;
-	vec4_t		fogDistanceVector, fogDepthVector = {0, 0, 0, 0};
-
-	fog = tr.world->fogs + tess.fogNum;
-
-	// all fogging distance is based on world Z units
-	VectorSubtract( backEnd.or.origin, backEnd.viewParms.or.origin, local );
-	fogDistanceVector[0] = -backEnd.or.modelMatrix[2];
-	fogDistanceVector[1] = -backEnd.or.modelMatrix[6];
-	fogDistanceVector[2] = -backEnd.or.modelMatrix[10];
-	fogDistanceVector[3] = DotProduct( local, backEnd.viewParms.or.axis[0] );
-
-	// scale the fog vectors based on the fog's thickness
-	fogDistanceVector[0] *= fog->tcScale;
-	fogDistanceVector[1] *= fog->tcScale;
-	fogDistanceVector[2] *= fog->tcScale;
-	fogDistanceVector[3] *= fog->tcScale;
-
-	// rotate the gradient vector for this orientation
-	if ( fog->hasSurface ) {
-		fogDepthVector[0] = fog->surface[0] * backEnd.or.axis[0][0] + 
-			fog->surface[1] * backEnd.or.axis[0][1] + fog->surface[2] * backEnd.or.axis[0][2];
-		fogDepthVector[1] = fog->surface[0] * backEnd.or.axis[1][0] + 
-			fog->surface[1] * backEnd.or.axis[1][1] + fog->surface[2] * backEnd.or.axis[1][2];
-		fogDepthVector[2] = fog->surface[0] * backEnd.or.axis[2][0] + 
-			fog->surface[1] * backEnd.or.axis[2][1] + fog->surface[2] * backEnd.or.axis[2][2];
-		fogDepthVector[3] = -fog->surface[3] + DotProduct( backEnd.or.origin, fog->surface );
-
-		eyeT = DotProduct( backEnd.or.viewOrigin, fogDepthVector ) + fogDepthVector[3];
-	} else {
-		eyeT = 1;	// non-surface fog always has eye inside
-	}
-
-	// see if the viewpoint is outside
-	// this is needed for clipping distance even for constant fog
-
-	if ( eyeT < 0 ) {
-		eyeOutside = qtrue;
-	} else {
-		eyeOutside = qfalse;
-	}
-
-	fogDistanceVector[3] += 1.0/512;
-
-	// calculate density for each point
-	for (i = 0, v = tess.xyz[0] ; i < tess.numVertexes ; i++, v += 4) {
-		// calculate the length in fog
-		s = DotProduct( v, fogDistanceVector ) + fogDistanceVector[3];
-		t = DotProduct( v, fogDepthVector ) + fogDepthVector[3];
-
-		// partially clipped fogs use the T axis		
-		if ( eyeOutside ) {
-			if ( t < 1.0 ) {
-				t = 1.0/32;	// point is outside, so no fogging
-			} else {
-				t = 1.0/32 + 30.0/32 * t / ( t - eyeT );	// cut the distance at the fog plane
-			}
-		} else {
-			if ( t < 0 ) {
-				t = 1.0/32;	// point is outside, so no fogging
-			} else {
-				t = 31.0/32;
-			}
-		}
-
-		st[0] = s;
-		st[1] = t;
-		st += 2;
-	}
-}
-
-
-
 /*
 ** RB_CalcEnvironmentTexCoords
 */
@@ -897,7 +1293,7 @@ void RB_CalcEnvironmentTexCoords( float *st )
 
 	for (i = 0 ; i < tess.numVertexes ; i++, v += 4, normal += 4, st += 2 ) 
 	{
-		VectorSubtract (backEnd.or.viewOrigin, v, viewer);
+		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
 		VectorNormalizeFast (viewer);
 
 		d = DotProduct (normal, viewer);
@@ -911,13 +1307,98 @@ void RB_CalcEnvironmentTexCoords( float *st )
 	}
 }
 
+/*
+** RB_CalcEnvironmentTexCoords
+*/
+void RB_CalcEnvironmentTexCoords2(float* st)
+{
+    int			i;
+    float* v, * normal;
+    vec3_t		viewer, reflected, worldReflected;
+    float		d;
+
+    v = tess.xyz[0];
+    normal = tess.normal[0];
+
+    for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2)
+    {
+        VectorSubtract(backEnd.ori.viewOrigin, v, viewer);
+        VectorNormalizeFast(viewer);
+
+        d = DotProduct(normal, viewer);
+		if (d > 0.0f) {
+			VectorCopy(viewer, reflected);
+		} else {
+            d *= -2;
+            reflected[0] = normal[0] * d + viewer[0];
+            reflected[1] = normal[1] * d + viewer[1];
+            reflected[2] = normal[2] * d + viewer[2];
+		}
+
+		worldReflected[0] = reflected[0] * backEnd.ori.axis[0][0];
+		worldReflected[2] = reflected[0] * backEnd.ori.axis[0][2];
+		worldReflected[0] = backEnd.ori.axis[1][0] * reflected[1] + worldReflected[0];
+		worldReflected[2] = backEnd.ori.axis[1][2] * reflected[1] + worldReflected[2];
+		worldReflected[0] = backEnd.ori.axis[2][0] * reflected[2] + worldReflected[0];
+		worldReflected[2] = backEnd.ori.axis[2][2] * reflected[2] + worldReflected[2];
+
+        st[0] = 0.5 + reflected[1] * 0.5;
+        st[1] = 0.5 - reflected[2] * 0.5;
+    }
+}
+
+/*
+** RB_CalcSunReflectionTexCoords
+*/
+void RB_CalcSunReflectionTexCoords(float* st) {
+	int i;
+	vec3_t viewer;
+	vec3_t reflected;
+	vec3_t sunReflected;
+	float d;
+	float* v;
+	float* normal;
+	vec3_t sunAxis[3];
+
+    v = tess.xyz[0];
+    normal = tess.normal[0];
+    sunAxis[0][0] = tr.sunDirection[0];
+    sunAxis[0][1] = tr.sunDirection[1];
+    sunAxis[0][2] = tr.sunDirection[2];
+    sunAxis[1][0] = tr.sunDirection[1];
+    sunAxis[1][1] = -tr.sunDirection[0];
+    sunAxis[1][2] = 0.0;
+    VectorNormalizeFast(sunAxis[1]);
+    CrossProduct(sunAxis[0], sunAxis[1], sunAxis[2]);
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		VectorSubtract(v, backEnd.ori.viewOrigin, viewer);
+		VectorNormalizeFast(viewer);
+
+		d = DotProduct(viewer, normal);
+		if (d > 0) {
+			VectorCopy(viewer, reflected);
+		} else {
+			d *= -2;
+			VectorMA(viewer, d, normal, reflected);
+		}
+
+		VectorScale(sunAxis[0], reflected[0], sunReflected);
+		VectorMA(sunReflected, reflected[2], sunAxis[1], sunReflected);
+		VectorMA(sunReflected, -reflected[1], sunAxis[2], sunReflected);
+
+		st[0] = sunReflected[1] + 0.5;
+		st[1] = sunReflected[2] + 0.5;
+	}
+}
+
 /*
 ** RB_CalcTurbulentTexCoords
 */
 void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
 {
 	int i;
-	double now;
+	float now;
 
 	now = ( wf->phase + tess.shaderTime * wf->frequency );
 
@@ -926,8 +1407,8 @@ void RB_CalcTurbulentTexCoords( const waveForm_t *wf, float *st )
 		float s = st[0];
 		float t = st[1];
 
-		st[0] = s + tr.sinTable[ ( ( int64_t ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
-		st[1] = t + tr.sinTable[ ( ( int64_t ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
+		st[0] = s + tr.sinTable[ ( ( int ) ( ( ( tess.xyz[i][0] + tess.xyz[i][2] )* 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
+		st[1] = t + tr.sinTable[ ( ( int ) ( ( tess.xyz[i][1] * 1.0/128 * 0.125 + now ) * FUNCTABLE_SIZE ) ) & ( FUNCTABLE_MASK ) ] * wf->amplitude;
 	}
 }
 
@@ -945,14 +1426,140 @@ void RB_CalcScaleTexCoords( const float scale[2], float *st )
 	}
 }
 
+/*
+** RB_CalcOffsetTexCoords
+*/
+void RB_CalcOffsetTexCoords( const float *offset, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+	if (offset[0] != 1234567) {
+		offsetS = offset[0];
+	} else if (backEnd.currentEntity) {
+        offsetS = backEnd.currentEntity->e.shader_data[0];
+    } else {
+        offsetS = r_static_shaderdata0->value;
+    }
+
+	if (offset[0] != 1234567) {
+		offsetT = offset[1];
+	} else if (backEnd.currentEntity) {
+		offsetT = backEnd.currentEntity->e.shader_data[1];
+    } else {
+		offsetT = r_static_shaderdata1->value;
+    }
+
+    if (!backEnd.currentEntity) {
+        offsetS = offsetS * r_static_shadermultiplier0->value;
+        offsetT = offsetT * r_static_shadermultiplier1->value;
+    }
+
+	for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		float s, t;
+
+		s = st[0];
+		t = st[1];
+
+		st[0] = s + offsetS;
+		st[1] = t + offsetT;
+	}
+}
+
+/*
+** RB_CalcParallaxTexCoords
+*/
+void RB_CalcParallaxTexCoords( const float *rate, float *st )
+{
+	int i;
+	float offsetS, offsetT;
+
+    offsetS = tr.refdef.vieworg[0] * rate[0];
+    offsetT = tr.refdef.vieworg[1] * rate[1];
+    for (i = 0; i < tess.numVertexes; i++, st += 2) {
+		st[0] += offsetS;
+		st[1] += offsetT;
+    }
+}
+
+static vec3_t rb_baseaxis[18];
+
+
+void RB_TextureAxisFromPlane(const vec3_t normal, vec3_t xv, vec3_t yv)
+{
+	int bestaxis;
+	vec_t dot;
+	vec_t best;
+	int i;
+
+	if (normal[0] == 1) {
+		bestaxis = 2;
+	} else if (normal[0] == -1) {
+		bestaxis = 3;
+	} else if (normal[1] == 1) {
+		bestaxis = 4;
+	} else if (normal[1] == -1) {
+		bestaxis = 5;
+	} else if (normal[2] == 1) {
+		bestaxis = 0;
+	} else if (normal[2] == -1) {
+		bestaxis = 1;
+	} else {
+		best = 0;
+		bestaxis = 0;
+
+		for (i = 0; i < 6; i++) {
+			dot = DotProduct(rb_baseaxis[i * 3], normal);
+			if (dot > best) {
+				best = dot;
+				bestaxis = i;
+			}
+		}
+	}
+
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 1], xv);
+	VectorCopy(rb_baseaxis[bestaxis * 3 + 2], yv);
+}
+
+void RB_QuakeTextureVecs(const vec3_t normal, const vec2_t scale, vec3_t mappingVecs[2])
+{
+	RB_TextureAxisFromPlane(normal, mappingVecs[0], mappingVecs[1]);
+
+	VectorScale(mappingVecs[0], scale[0], mappingVecs[0]);
+	VectorScale(mappingVecs[1], scale[1], mappingVecs[1]);
+}
+
+/*
+** RB_CalcMacroTexCoords
+*/
+void RB_CalcMacroTexCoords( const  float* rate, float *st )
+{
+	int i;
+	vec3_t vecs[2];
+	vec_t* v;
+	vec_t* normal;
+	float width, height;
+    v = tess.xyz[0];
+
+    normal = tess.normal[0];
+    width = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
+    height = (float)tess.shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
+
+	for (i = 0; i < tess.numVertexes; i++, v += 4, normal += 4, st += 2) {
+		RB_QuakeTextureVecs(normal, rate, vecs);
+		st[0] = DotProduct(vecs[0], v) / width;
+		st[1] = DotProduct(vecs[1], v) / height;
+	}
+}
+
 /*
 ** RB_CalcScrollTexCoords
 */
 void RB_CalcScrollTexCoords( const float scrollSpeed[2], float *st )
 {
 	int i;
-	double timeScale = tess.shaderTime;
-	double adjustedScrollS, adjustedScrollT;
+	float timeScale = tess.shaderTime;
+	float adjustedScrollS, adjustedScrollT;
 
 	adjustedScrollS = scrollSpeed[0] * timeScale;
 	adjustedScrollT = scrollSpeed[1] * timeScale;
@@ -989,15 +1596,24 @@ void RB_CalcTransformTexCoords( const texModInfo_t *tmi, float *st  )
 /*
 ** RB_CalcRotateTexCoords
 */
-void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
+void RB_CalcRotateTexCoords(float degsPerSecond, float degsPerSecondCoef, float* st, float start)
 {
-	double timeScale = tess.shaderTime;
-	double degs;
-	int64_t index;
+	float timeScale = tess.shaderTime;
+	float degs;
+	int index;
 	float sinValue, cosValue;
 	texModInfo_t tmi;
 
-	degs = -degsPerSecond * timeScale;
+    if (degsPerSecond != 1234567) {
+		degs = -degsPerSecond * degsPerSecondCoef * tess.shaderTime - start;
+	} else if (backEnd.currentEntity) {
+		degs = -backEnd.currentEntity->e.shader_data[0] * degsPerSecondCoef * tess.shaderTime - start;
+	} else {
+		degs = r_static_shaderdata0->value;
+	}
+	if (!backEnd.currentEntity) {
+		degs *= r_static_shadermultiplier0->value;
+	}
 	index = degs * ( FUNCTABLE_SIZE / 360.0f );
 
 	sinValue = tr.sinTable[ index & FUNCTABLE_MASK ];
@@ -1015,6 +1631,21 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 }
 
 
+
+
+
+
+#if id386 && !( (defined __linux__ || defined __FreeBSD__ ) && (defined __i386__ ) ) // rb010123
+
+long myftol( float f ) {
+	static int tmp;
+	__asm fld f
+	__asm fistp tmp
+	__asm mov eax, tmp
+}
+
+#endif
+
 /*
 ** RB_CalcSpecularAlpha
 **
@@ -1022,7 +1653,7 @@ void RB_CalcRotateTexCoords( float degsPerSecond, float *st )
 */
 vec3_t lightOrigin = { -960, 1980, 96 };		// FIXME: track dynamically
 
-void RB_CalcSpecularAlpha( unsigned char *alphas ) {
+void RB_CalcSpecularAlpha(unsigned char* alphas, float alphaMax, vec3_t lightOrigin) {
 	int			i;
 	float		*v, *normal;
 	vec3_t		viewer,  reflected;
@@ -1054,7 +1685,7 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
 		reflected[1] = normal[1]*2*d - lightDir[1];
 		reflected[2] = normal[2]*2*d - lightDir[2];
 
-		VectorSubtract (backEnd.or.viewOrigin, v, viewer);
+		VectorSubtract (backEnd.ori.viewOrigin, v, viewer);
 		ilength = Q_rsqrt( DotProduct( viewer, viewer ) );
 		l = DotProduct (reflected, viewer);
 		l *= ilength;
@@ -1074,12 +1705,99 @@ void RB_CalcSpecularAlpha( unsigned char *alphas ) {
 	}
 }
 
+void RB_CalcLightGridColor(unsigned char* colors)
+{
+	int i;
+
+	if (!backEnd.currentEntity) {
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
+		}
+	}
+	else if (backEnd.currentEntity != &tr.worldEntity) {
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
+			colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
+			colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
+			colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
+		}
+	}
+	else {
+		ri.Printf(PRINT_ALL, 
+			"##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
+			tess.shader->name);
+
+		for (i = 0; i < tess.numVertexes; i++) {
+			colors[i * 4] = 0xFF;
+			colors[i * 4 + 1] = 0xFF;
+			colors[i * 4 + 2] = 0xFF;
+			colors[i * 4 + 3] = 0xFF;
+		}
+	}
+}
+
+void RB_CalcAlphaFromDotView(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+        ri.Printf(PRINT_ALL, "normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+
+		u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (float)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
+}
+
+void RB_CalcAlphaFromOneMinusDotView(unsigned char* colors, float alphaMin, float alphaMax)
+{
+	int i;
+	vec3_t viewInModel;
+
+    for (i = 0; i < tess.numVertexes; i++, colors += 4) {
+        union {
+            float f;
+            int i;
+        } u;
+
+		VectorCopy(tr.refdef.viewaxis[0], viewInModel);
+		VectorNormalizeFast(viewInModel);
+
+        u.f = DotProduct(viewInModel, tess.normal[i]);
+        u.f = fabs(u.f);
+		u.f = 1.0 - u.f;
+        ri.Printf(PRINT_ALL, "normal: %f %f %f  dot: %f  i %d\n", tess.normal[i][0], tess.normal[i][1], tess.normal[i][2], u.f, i);
+        
+        u.f = ((alphaMax - alphaMin) * u.f + alphaMin) * 255.0;
+        u.f = u.f - (long double)(~((int)(u.f - 255.0) >> 31) & (int)(u.f - 255.0));
+
+        u.i &= ~(u.i >> 31);
+		colors[3] = u.i;
+	}
+}
+
 /*
 ** RB_CalcDiffuseColor
 **
 ** The basic vertex lighting calc
 */
-static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
+void RB_CalcDiffuseColor( unsigned char *colors )
 {
 	int				i, j;
 	float			*v, *normal;
@@ -1090,53 +1808,101 @@ static void RB_CalcDiffuseColor_scalar( unsigned char *colors )
 	vec3_t			lightDir;
 	vec3_t			directedLight;
 	int				numVertexes;
+#if idppc_altivec
+	vector unsigned char vSel = (vector unsigned char)(0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff,
+							   0x00, 0x00, 0x00, 0xff);
+	vector float ambientLightVec;
+	vector float directedLightVec;
+	vector float lightDirVec;
+	vector float normalVec0, normalVec1;
+	vector float incomingVec0, incomingVec1, incomingVec2;
+	vector float zero, jVec;
+	vector signed int jVecInt;
+	vector signed short jVecShort;
+	vector unsigned char jVecChar, normalPerm;
+#endif
 	ent = backEnd.currentEntity;
 	ambientLightInt = ent->ambientLightInt;
+#if idppc_altivec
+	// A lot of this could be simplified if we made sure
+	// entities light info was 16-byte aligned.
+	jVecChar = vec_lvsl(0, ent->ambientLight);
+	ambientLightVec = vec_ld(0, (vector float *)ent->ambientLight);
+	jVec = vec_ld(11, (vector float *)ent->ambientLight);
+	ambientLightVec = vec_perm(ambientLightVec,jVec,jVecChar);
+
+	jVecChar = vec_lvsl(0, ent->directedLight);
+	directedLightVec = vec_ld(0,(vector float *)ent->directedLight);
+	jVec = vec_ld(11,(vector float *)ent->directedLight);
+	directedLightVec = vec_perm(directedLightVec,jVec,jVecChar);	 
+
+	jVecChar = vec_lvsl(0, ent->lightDir);
+	lightDirVec = vec_ld(0,(vector float *)ent->lightDir);
+	jVec = vec_ld(11,(vector float *)ent->lightDir);
+	lightDirVec = vec_perm(lightDirVec,jVec,jVecChar);	 
+
+	zero = (vector float)vec_splat_s8(0);
+	VectorCopy( ent->lightDir, lightDir );
+#else
 	VectorCopy( ent->ambientLight, ambientLight );
 	VectorCopy( ent->directedLight, directedLight );
 	VectorCopy( ent->lightDir, lightDir );
+#endif
 
 	v = tess.xyz[0];
 	normal = tess.normal[0];
 
+#if idppc_altivec
+	normalPerm = vec_lvsl(0,normal);
+#endif
 	numVertexes = tess.numVertexes;
 	for (i = 0 ; i < numVertexes ; i++, v += 4, normal += 4) {
+#if idppc_altivec
+		normalVec0 = vec_ld(0,(vector float *)normal);
+		normalVec1 = vec_ld(11,(vector float *)normal);
+		normalVec0 = vec_perm(normalVec0,normalVec1,normalPerm);
+		incomingVec0 = vec_madd(normalVec0, lightDirVec, zero);
+		incomingVec1 = vec_sld(incomingVec0,incomingVec0,4);
+		incomingVec2 = vec_add(incomingVec0,incomingVec1);
+		incomingVec1 = vec_sld(incomingVec1,incomingVec1,4);
+		incomingVec2 = vec_add(incomingVec2,incomingVec1);
+		incomingVec0 = vec_splat(incomingVec2,0);
+		incomingVec0 = vec_max(incomingVec0,zero);
+		normalPerm = vec_lvsl(12,normal);
+		jVec = vec_madd(incomingVec0, directedLightVec, ambientLightVec);
+		jVecInt = vec_cts(jVec,0);	// RGBx
+		jVecShort = vec_pack(jVecInt,jVecInt);		// RGBxRGBx
+		jVecChar = vec_packsu(jVecShort,jVecShort);	// RGBxRGBxRGBxRGBx
+		jVecChar = vec_sel(jVecChar,vSel,vSel);		// RGBARGBARGBARGBA replace alpha with 255
+		vec_ste((vector unsigned int)jVecChar,0,(unsigned int *)&colors[i*4]);	// store color
+#else
 		incoming = DotProduct (normal, lightDir);
 		if ( incoming <= 0 ) {
 			*(int *)&colors[i*4] = ambientLightInt;
 			continue;
 		} 
-		j = ri.ftol(ambientLight[0] + incoming * directedLight[0]);
+		j = myftol( ambientLight[0] + incoming * directedLight[0] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+0] = j;
 
-		j = ri.ftol(ambientLight[1] + incoming * directedLight[1]);
+		j = myftol( ambientLight[1] + incoming * directedLight[1] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+1] = j;
 
-		j = ri.ftol(ambientLight[2] + incoming * directedLight[2]);
+		j = myftol( ambientLight[2] + incoming * directedLight[2] );
 		if ( j > 255 ) {
 			j = 255;
 		}
 		colors[i*4+2] = j;
 
 		colors[i*4+3] = 255;
-	}
-}
-
-void RB_CalcDiffuseColor( unsigned char *colors )
-{
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		RB_CalcDiffuseColor_altivec( colors );
-		return;
-	}
 #endif
-	RB_CalcDiffuseColor_scalar( colors );
+	}
 }
 
diff --git a/code/renderergl1/tr_shader.c b/code/renderergl1/tr_shader.c
index 2384a118..5902f383 100644
--- a/code/renderergl1/tr_shader.c
+++ b/code/renderergl1/tr_shader.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -23,29 +23,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tr_shader.c -- this file deals with the parsing and definition of shaders
 
+
+typedef struct shadertext_s {
+    char name[64];
+    char* text;
+    shader_t* shader;
+    struct shadertext_s* next;
+} shadertext_t;
+
 static char *s_shaderText;
 
 // the shader is parsed into these global variables, then copied into
 // dynamically allocated memory if it is valid.
-static	shaderStage_t	stages[MAX_SHADER_STAGES];		
+static	shaderStage_t	unfoggedStages[MAX_SHADER_STAGES];		
 static	shader_t		shader;
 static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
 
-#define FILE_HASH_SIZE		1024
-static	shader_t*		hashTable[FILE_HASH_SIZE];
+#define FILE_HASH_SIZE		8192
 
-#define MAX_SHADERTEXT_HASH		2048
-static char **shaderTextHashTable[MAX_SHADERTEXT_HASH];
+static qboolean shader_noPicMip;
+static qboolean shader_noMipMaps;
+static qboolean shader_force32bit;
+static shadertext_t* currentShader = NULL;
+static shadertext_t* hashTable[FILE_HASH_SIZE];
+
+#define GL_CLAMP_TO_EDGE 0x812F
 
 /*
 ================
 return a hash value for the filename
 ================
 */
-#ifdef __GNUCC__
-  #warning TODO: check if long is ok here 
-#endif
-static long generateHashValue( const char *fname, const int size ) {
+static long generateHashValue( const char *fname ) {
 	int		i;
 	long	hash;
 	char	letter;
@@ -61,15 +70,72 @@ static long generateHashValue( const char *fname, const int size ) {
 		i++;
 	}
 	hash = (hash ^ (hash >> 10) ^ (hash >> 20));
-	hash &= (size-1);
+	hash &= (FILE_HASH_SIZE-1);
 	return hash;
 }
 
+static shadertext_t* AddShaderTextToHash(const char* name, int hash)
+{
+	shadertext_t* shader;
+
+    shader = (shadertext_t*)ri.Malloc(sizeof(shadertext_t));
+
+    Com_Memset(shader, 0, sizeof(shadertext_t));
+    strncpy(shader->name, name, sizeof(shader->name));
+    shader->next = hashTable[hash];
+
+    hashTable[hash] = shader;
+    return shader;
+}
+
+static shadertext_t* AllocShaderText(const char* name)
+{
+    int hash;
+
+    hash = generateHashValue(name);
+    return AddShaderTextToHash(name, hash);
+}
+
+/*
+====================
+FindShaderText
+
+Scans the combined text description of all the shader files for
+the given shader name.
+
+return NULL if not found
+
+If found, it will return a valid shader
+=====================
+*/
+static shadertext_t* FindShaderText(const char* name)
+{
+    shadertext_t* shader;
+    int hash;
+
+    hash = generateHashValue(name);
+    shader = hashTable[hash];
+    if (!shader) {
+        return AddShaderTextToHash(name, hash);
+    }
+
+    while (Q_stricmp(shader->name, name))
+    {
+        shader = shader->next;
+        if (!shader) {
+            return AddShaderTextToHash(name, hash);
+        }
+    }
+
+    return shader;
+}
+
 void R_RemapShader(const char *shaderName, const char *newShaderName, const char *timeOffset) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh, *sh2;
-	qhandle_t	h;
+	char			strippedName[MAX_QPATH];
+	int				hash;
+	shader_t		*sh, *sh2;
+	shadertext_t	*sht;
+	qhandle_t		h;
 
 	sh = R_FindShaderByName( shaderName );
 	if (sh == NULL || sh == tr.defaultShader) {
@@ -95,13 +161,13 @@ void R_RemapShader(const char *shaderName, const char *newShaderName, const char
 	// remap all the shaders with the given name
 	// even tho they might have different lightmaps
 	COM_StripExtension(shaderName, strippedName, sizeof(strippedName));
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
-	for (sh = hashTable[hash]; sh; sh = sh->next) {
+	hash = generateHashValue(strippedName);
+	for (sht = hashTable[hash]; sht; sht = sht->next) {
 		if (Q_stricmp(sh->name, strippedName) == 0) {
-			if (sh != sh2) {
-				sh->remappedShader = sh2;
+			if (sht->shader != sh2) {
+				sht->shader->remappedShader = sh2;
 			} else {
-				sh->remappedShader = NULL;
+				sht->shader->remappedShader = NULL;
 			}
 		}
 	}
@@ -119,13 +185,6 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 	char	*token;
 	int		i;
 
-	// FIXME: spaces are currently required after parens, should change parseext...
-	token = COM_ParseExt( text, qfalse );
-	if ( strcmp( token, "(" ) ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing parenthesis in shader '%s'\n", shader.name );
-		return qfalse;
-	}
-
 	for ( i = 0 ; i < count ; i++ ) {
 		token = COM_ParseExt( text, qfalse );
 		if ( !token[0] ) {
@@ -135,15 +194,38 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 		v[i] = atof( token );
 	}
 
-	token = COM_ParseExt( text, qfalse );
-	if ( strcmp( token, ")" ) ) {
-		ri.Printf( PRINT_WARNING, "WARNING: missing parenthesis in shader '%s'\n", shader.name );
-		return qfalse;
-	}
-
 	return qtrue;
 }
 
+void InitStaticShaders()
+{
+	char* text;
+	const char* token;
+	char* buf;
+	char shadername[64];
+
+    if (ri.FS_ReadFile("scripts/static_shaders.txt", (void**)&buf) == -1)
+    {
+        ri.Printf(3, "Couldn't find static shaders file: scripts/staticshaders.txt\n");
+		return;
+    }
+
+    text = buf;
+    while (1)
+    {
+        token = COM_ParseExt(&text, 1);
+		if (!*token) {
+			break;
+		}
+
+        strncpy(shadername, token, 0x40u);
+		if (!R_FindShader(shadername, -1, 1, r_picmip->integer, 1, 1)) {
+			ri.Printf(3, "InitStaticShaders: Couldn't find shader: %s\n", shadername);
+		}
+    }
+
+    ri.FS_FreeFile(buf);
+}
 
 /*
 ===============
@@ -164,6 +246,22 @@ static unsigned NameToAFunc( const char *funcname )
 	{
 		return GLS_ATEST_GE_80;
 	}
+	else if ( !Q_stricmp( funcname, "LT_FOLIAGE1" ) )
+	{
+		return GLS_ATEST_LT_FOLIAGE1;
+	}
+	else if ( !Q_stricmp( funcname, "GE_FOLIAGE1" ) )
+	{
+		return GLS_ATEST_GE_FOLIAGE1;
+	}
+	else if ( !Q_stricmp( funcname, "LT_FOLIAGE2" ) )
+	{
+		return GLS_ATEST_LT_FOLIAGE2;
+	}
+	else if ( !Q_stricmp( funcname, "GE_FOLIAGE2" ) )
+	{
+		return GLS_ATEST_GE_FOLIAGE2;
+	}
 
 	ri.Printf( PRINT_WARNING, "WARNING: invalid alphaFunc name '%s' in shader '%s'\n", funcname, shader.name );
 	return 0;
@@ -356,19 +454,19 @@ static void ParseWaveForm( char **text, waveForm_t *wave )
 ParseTexMod
 ===================
 */
-static void ParseTexMod( char *_text, shaderStage_t *stage )
+static void ParseTexMod( char *_text, shaderStage_t *stage, int cntBundle )
 {
 	const char *token;
 	char **text = &_text;
 	texModInfo_t *tmi;
 
-	if ( stage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
-		ri.Error( ERR_DROP, "ERROR: too many tcMod stages in shader '%s'", shader.name );
+	if ( stage->bundle[cntBundle].numTexMods == TR_MAX_TEXMODS ) {
+		ri.Error( ERR_DROP, "ERROR: too many tcMod unfoggedStages in shader '%s'\n", shader.name );
 		return;
 	}
 
-	tmi = &stage->bundle[0].texMods[stage->bundle[0].numTexMods];
-	stage->bundle[0].numTexMods++;
+	tmi = &stage->bundle[cntBundle].texMods[stage->bundle[cntBundle].numTexMods];
+	stage->bundle[cntBundle].numTexMods++;
 
 	token = COM_ParseExt( text, qfalse );
 
@@ -407,6 +505,8 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 		tmi->wave.frequency = atof( token );
 
 		tmi->type = TMOD_TURBULENT;
+
+		shader.flags |= 2;
 	}
 	//
 	// scale
@@ -441,62 +541,103 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[0] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
 		token = COM_ParseExt( text, qfalse );
 		if ( token[0] == 0 )
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: missing scale scroll parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->scroll[1] = atof( token );
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0)) / 1000.0;
+			}
+		}
+
 		tmi->type = TMOD_SCROLL;
+
+		shader.flags |= 2;
 	}
 	//
 	// stretch
 	//
 	else if ( !Q_stricmp( token, "stretch" ) )
 	{
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.func = NameToGenFunc( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.base = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.amplitude = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.phase = atof( token );
-
-		token = COM_ParseExt( text, qfalse );
-		if ( token[0] == 0 )
-		{
-			ri.Printf( PRINT_WARNING, "WARNING: missing stretch parms in shader '%s'\n", shader.name );
-			return;
-		}
-		tmi->wave.frequency = atof( token );
-		
+		ParseWaveForm(text, &tmi->wave);
 		tmi->type = TMOD_STRETCH;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrans" ) )
+    {
+		ParseWaveForm(text, &tmi->wave);
+		tmi->type = TMOD_WAVETRANS;
+		shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "wavetrant" ) )
+    {
+        ParseWaveForm(text, &tmi->wave);
+        tmi->type = TMOD_WAVETRANT;
+        shader.flags |= 2;
+	}
+	else if ( !Q_stricmp( token, "bulge" ) )
+	{
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+			return;
+		}
+
+        tmi->wave.base = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.amplitude = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.frequency = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing tcMod bulge parms in shader '%s'\n", shader.name);
+            return;
+        }
+
+		tmi->wave.phase = atof(token);
+
+		tmi->type = TMOD_BULGETRANS;
+		shader.flags |= 2;
 	}
 	//
 	// transform
@@ -564,8 +705,78 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 			ri.Printf( PRINT_WARNING, "WARNING: missing tcMod rotate parms in shader '%s'\n", shader.name );
 			return;
 		}
-		tmi->rotateSpeed = atof( token );
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->rotateSpeed = 1234567;
+		} else {
+			tmi->rotateSpeed = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (!Q_stricmp(token, "fromEntity")) {
+				tmi->rotateStart = 1234567;
+			} else {
+				tmi->rotateStart = atof(token);
+			}
+		} else {
+			tmi->rotateStart = 0;
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			tmi->rotateCoef = atof(token);
+		} else {
+			tmi->rotateCoef = 1;
+		}
+
 		tmi->type = TMOD_ROTATE;
+		shader.flags |= 2;
+	}
+    else if (!Q_stricmp(token, "offset")) {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[0] = 1234567;
+		} else {
+			tmi->scroll[0] = atof(token);
+		}
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing offset parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		if (!Q_stricmp(token, "fromEntity")) {
+			tmi->scroll[1] = 1234567;
+		} else {
+			tmi->scroll[1] = atof(token);
+        }
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[0] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[0] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+        token = COM_ParseExt(text, qfalse);
+		if (token[0]) {
+			if (atof(token) < 0) {
+				tmi->scroll[1] -= (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			} else if (atof(token) > 0) {
+				tmi->scroll[1] += (rand() % (int)(atof(token) * 1000.0 + 1.0)) / 1000.0;
+			}
+		}
+
+		tmi->type = TMOD_OFFSET;
 	}
 	//
 	// entityTranslate
@@ -574,9 +785,49 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 	{
 		tmi->type = TMOD_ENTITY_TRANSLATE;
 	}
+	else if ( !Q_stricmp( token, "parallax" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[0] = atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing rate parms in shader '%s'\n", shader.name);
+            return;
+		}
+
+		tmi->rate[1] = atof(token);
+		tmi->type = TMOD_PARALLAX;
+	}
+	else if ( !Q_stricmp( token, "macro" ) )
+    {
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[0] = 1.0 / atof(token);
+
+        token = COM_ParseExt(text, qfalse);
+        if (token[0] == 0) {
+            ri.Printf(PRINT_WARNING, "WARNING: missing scale parms in shader '%s' for macro definition\n", shader.name);
+            return;
+        }
+
+		tmi->scale[1] = 1.0 / atof(token);
+
+		tmi->type = TMOD_MACRO;
+		shader.needsNormal = qtrue;
+	}
 	else
 	{
-		ri.Printf( PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name );
+		ri.Printf(PRINT_WARNING, "WARNING: unknown tcMod '%s' in shader '%s'\n", token, shader.name);
 	}
 }
 
@@ -586,70 +837,97 @@ static void ParseTexMod( char *_text, shaderStage_t *stage )
 ParseStage
 ===================
 */
-static qboolean ParseStage( shaderStage_t *stage, char **text )
+static qboolean ParseStage(shaderStage_t* stage, char** text, qboolean picmip)
 {
-	char *token;
-	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0;
+	char* token;
+	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0, colorBits = 0;
 	qboolean depthMaskExplicit = qfalse;
+	int cntBundle = 0;
+	int depthTestBits = 0;
+	int fogBits = 0;
+	qboolean shouldProcess = qtrue;
 
 	stage->active = qtrue;
+	stage->noMipMaps = shader_noMipMaps;
+	stage->noPicMip = shader_noPicMip;
+	stage->force32bit = shader_force32bit;
 
-	while ( 1 )
+	while (1)
 	{
-		token = COM_ParseExt( text, qtrue );
-		if ( !token[0] )
+		token = COM_ParseExt(text, qtrue);
+		if (!token[0])
 		{
-			ri.Printf( PRINT_WARNING, "WARNING: no matching '}' found\n" );
+			ri.Printf(PRINT_WARNING, "WARNING: no matching '}' found\n");
 			return qfalse;
 		}
 
-		if ( token[0] == '}' )
+		if (token[0] == '}')
 		{
 			break;
 		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nomipmaps"))
+		{
+			stage->noMipMaps = qtrue;
+			continue;
+		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nopicmip"))
+		{
+			stage->noPicMip = qtrue;
+			continue;
+		}
+		// no picmip adjustment
+		else if (!Q_stricmp(token, "nofog"))
+		{
+			fogBits = GLS_FOG;
+			continue;
+		}
 		//
 		// map <name>
 		//
-		else if ( !Q_stricmp( token, "map" ) )
+		else if (!Q_stricmp(token, "map"))
 		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'map' keyword in shader '%s'\n", shader.name);
 				return qfalse;
 			}
 
-			if ( !Q_stricmp( token, "$whiteimage" ) )
+			if (!Q_stricmp(token, "$whiteimage"))
 			{
-				stage->bundle[0].image[0] = tr.whiteImage;
+				stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				continue;
 			}
-			else if ( !Q_stricmp( token, "$lightmap" ) )
+			else if (!Q_stricmp(token, "$lightmap"))
 			{
-				stage->bundle[0].isLightmap = qtrue;
-				if ( shader.lightmapIndex < 0 || !tr.lightmaps ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
-				} else {
-					stage->bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+				stage->bundle[cntBundle].isLightmap = qtrue;
+				if (shader.lightmapIndex < 0) {
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
+				}
+				else {
+					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
 				}
 				continue;
 			}
+			else if (!Q_stricmp(token, "$bumpmap"))
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'bumpmap' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				// This is not implemented in mohaa
+			}
 			else
 			{
-				imgType_t type = IMGTYPE_COLORALPHA;
-				imgFlags_t flags = IMGFLAG_NONE;
-
-				if (!shader.noMipMaps)
-					flags |= IMGFLAG_MIPMAP;
-
-				if (!shader.noPicMip)
-					flags |= IMGFLAG_PICMIP;
-
-				stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-
-				if ( !stage->bundle[0].image[0] )
+				stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, stage->noPicMip ? qfalse : picmip, stage->force32bit, GL_REPEAT, GL_REPEAT);
+				if (!stage->bundle[cntBundle].image[0])
 				{
-					ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+					ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
 					return qfalse;
 				}
 			}
@@ -657,46 +935,96 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		//
 		// clampmap <name>
 		//
-		else if ( !Q_stricmp( token, "clampmap" ) )
+		else if (!Q_stricmpn(token, "clampmap", 8))
 		{
-			imgType_t type = IMGTYPE_COLORALPHA;
-			imgFlags_t flags = IMGFLAG_CLAMPTOEDGE;
+			int clampx, clampy;
 
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
+			if (!token[8]) {
+				if (!haveClampToEdge) {
+					clampx = GL_CLAMP;
+					clampy = GL_CLAMP;
+				}
+				else {
+					clampx = GL_CLAMP_TO_EDGE;
+					clampy = GL_CLAMP_TO_EDGE;
+				}
+			}
+			else {
+				if (token[8] == 'x')
+				{
+					if (!haveClampToEdge) {
+						clampx = GL_CLAMP;
+					}
+					else {
+						clampx = GL_CLAMP_TO_EDGE;
+					}
+					clampy = GL_CLAMP;
+				}
+				else if (token[8] == 'y')
+				{
+					clampx = GL_CLAMP;
+					if (!haveClampToEdge) {
+						clampy = GL_CLAMP;
+					}
+					else {
+						clampy = GL_CLAMP_TO_EDGE;
+					}
+				}
+				else {
+					ri.Printf(PRINT_WARNING, "WARNING: Converting unknown clampmap type to clampmap\n");
+					continue;
+				}
+			}
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'clampmap' keyword in shader '%s'\n", shader.name);
 				return qfalse;
 			}
 
-			if (!shader.noMipMaps)
-				flags |= IMGFLAG_MIPMAP;
-
-			if (!shader.noPicMip)
-				flags |= IMGFLAG_PICMIP;
-
-			stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-			if ( !stage->bundle[0].image[0] )
+			stage->bundle[cntBundle].image[0] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, clampx, clampy);
+			if (!stage->bundle[cntBundle].image[0])
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+				ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
 				return qfalse;
 			}
 		}
 		//
 		// animMap <frequency> <image1> .... <imageN>
 		//
-		else if ( !Q_stricmp( token, "animMap" ) )
+		else if ( !Q_stricmp( token, "animMap" ) || !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
 		{
-			int	totalImages = 0;
+			qboolean phased;
+
+			shader.flags |= 3;
+
+			if (!Q_stricmp(token, "animMapOnce")) {
+				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
+			}
+
+			phased = !Q_stricmp(token, "animMapPhase");
 
 			token = COM_ParseExt( text, qfalse );
 			if ( !token[0] )
 			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMap' keyword in shader '%s'\n", shader.name );
+				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationPhase = 0;
 
+			if (phased)
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
+			}
 			// parse up to MAX_IMAGE_ANIMATIONS animations
 			while ( 1 ) {
 				int		num;
@@ -705,47 +1033,39 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				if ( !token[0] ) {
 					break;
 				}
-				num = stage->bundle[0].numImageAnimations;
+				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
-					imgFlags_t flags = IMGFLAG_NONE;
-
-					if (!shader.noMipMaps)
-						flags |= IMGFLAG_MIPMAP;
-
-					if (!shader.noPicMip)
-						flags |= IMGFLAG_PICMIP;
-
-					stage->bundle[0].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
-					if ( !stage->bundle[0].image[num] )
+                    stage->bundle[cntBundle].image[num] = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT );
+					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 						return qfalse;
 					}
-					stage->bundle[0].numImageAnimations++;
+					stage->bundle[cntBundle].numImageAnimations++;
 				}
-				totalImages++;
-			}
-
-			if ( totalImages > MAX_IMAGE_ANIMATIONS ) {
-				ri.Printf( PRINT_WARNING, "WARNING: ignoring excess images for 'animMap' (found %d, max is %d) in shader '%s'\n",
-						totalImages, MAX_IMAGE_ANIMATIONS, shader.name );
 			}
 		}
-		else if ( !Q_stricmp( token, "videoMap" ) )
-		{
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] )
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
-				return qfalse;
-			}
-			stage->bundle[0].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
-			if (stage->bundle[0].videoMapHandle != -1) {
-				stage->bundle[0].isVideoMap = qtrue;
-				stage->bundle[0].image[0] = tr.scratchImage[stage->bundle[0].videoMapHandle];
-			} else {
-				ri.Printf( PRINT_WARNING, "WARNING: could not load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
+		else if (!Q_stricmp(token, "normalmap"))
+        {
+			//
+			// added in 2.30
+			//
+
+            token = COM_ParseExt(text, qfalse);
+            if (!token[0])
+            {
+                ri.Printf(PRINT_WARNING, "WARNING: missing parameter for 'normalmap' keyword in shader '%s'\n", shader.name);
+                return qfalse;
+            }
+
+			stage->normalMap = R_FindImageFileOld(token, !stage->noMipMaps, (!stage->noPicMip ? picmip : 0), stage->force32bit, GL_REPEAT, GL_REPEAT);
+			if (!stage->normalMap)
+            {
+                ri.Printf(PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name);
+                return qfalse;
 			}
+
+			stage->hasNormalMap = qtrue;
 		}
 		//
 		// alphafunc <func>
@@ -776,11 +1096,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "lequal" ) )
 			{
-				depthFuncBits = 0;
+				depthTestBits = 0;
 			}
 			else if ( !Q_stricmp( token, "equal" ) )
 			{
-				depthFuncBits = GLS_DEPTHFUNC_EQUAL;
+				depthTestBits = GLS_DEPTHFUNC_EQUAL;
 			}
 			else
 			{
@@ -789,13 +1109,6 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 		}
 		//
-		// detail
-		//
-		else if ( !Q_stricmp( token, "detail" ) )
-		{
-			stage->isDetail = qtrue;
-		}
-		//
 		// blendfunc <srcFactor> <dstFactor>
 		// or blendfunc <add|filter|blend>
 		//
@@ -817,6 +1130,9 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			} else if ( !Q_stricmp( token, "blend" ) ) {
 				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
 				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
+			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
+				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
+				blendDstBits = GLS_DSTBLEND_ONE;
 			} else {
 				// complex double blends
 				blendSrcBits = NameToSrcBlendMode( token );
@@ -853,54 +1169,161 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ParseWaveForm( text, &stage->rgbWave );
 				stage->rgbGen = CGEN_WAVEFORM;
 			}
-			else if ( !Q_stricmp( token, "const" ) )
+			else if (!Q_stricmp(token, "colorwave"))
 			{
-				vec3_t	color;
+				vec3_t v;
 
-				VectorClear( color );
-
-				ParseVector( text, 3, color );
-				stage->constantColor[0] = 255 * color[0];
-				stage->constantColor[1] = 255 * color[1];
-				stage->constantColor[2] = 255 * color[2];
-
-				stage->rgbGen = CGEN_CONST;
+				ParseVector(text, 3, v);
+				stage->colorConst[0] = v[0] * 255.0;
+				stage->colorConst[1] = v[1] * 255.0;
+				stage->colorConst[2] = v[2] * 255.0;
+				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
+				shader.flags |= 2;
 			}
-			else if ( !Q_stricmp( token, "identity" ) )
+			else if (!Q_stricmp(token, "identity"))
 			{
 				stage->rgbGen = CGEN_IDENTITY;
 			}
-			else if ( !Q_stricmp( token, "identityLighting" ) )
+			else if (!Q_stricmp(token, "identityLighting"))
 			{
 				stage->rgbGen = CGEN_IDENTITY_LIGHTING;
 			}
-			else if ( !Q_stricmp( token, "entity" ) )
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->rgbGen = CGEN_GLOBAL_COLOR;
+			}
+			else if (!Q_stricmp(token, "entity") || !Q_stricmp(token, "fromentity"))
 			{
 				stage->rgbGen = CGEN_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "oneMinusEntity" ) )
+			else if (!Q_stricmp(token, "oneMinusEntity"))
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "vertex" ) )
+			else if (!Q_stricmp(token, "vertex") || !Q_stricmp(token, "fromclient"))
 			{
 				stage->rgbGen = CGEN_VERTEX;
-				if ( stage->alphaGen == 0 ) {
+				if (stage->alphaGen == 0) {
 					stage->alphaGen = AGEN_VERTEX;
 				}
 			}
-			else if ( !Q_stricmp( token, "exactVertex" ) )
+			else if (!Q_stricmp(token, "exactVertex"))
 			{
 				stage->rgbGen = CGEN_EXACT_VERTEX;
 			}
-			else if ( !Q_stricmp( token, "lightingDiffuse" ) )
+			else if (!Q_stricmp(token, "lightingGrid"))
 			{
-				stage->rgbGen = CGEN_LIGHTING_DIFFUSE;
+				stage->rgbGen = CGEN_LIGHTING_GRID;
 			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
+			else if (!Q_stricmp(token, "lightingSpherical"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
+			}
+			else if (!Q_stricmp(token, "oneMinusVertex"))
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
 			}
+			else if ( !Q_stricmp( token, "const" ) || !Q_stricmp(token, "constant"))
+			{
+				vec3_t	color;
+
+				ParseVector( text, 3, color );
+				stage->colorConst[0] = 255 * color[0];
+				stage->colorConst[1] = 255 * color[1];
+				stage->colorConst[2] = 255 * color[2];
+
+				stage->rgbGen = CGEN_CONSTANT;
+			}
+			else if (!Q_stricmp(token, "static"))
+			{
+				stage->rgbGen = CGEN_STATIC;
+				if (stage->alphaGen == AGEN_IDENTITY) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->rgbGen = CGEN_SCOORD;
+				}
+				else {
+					stage->rgbGen = CGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				shader.needsNormal = qtrue;
+
+				stage->rgbGen = CGEN_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneminusdot"))
+			{
+				shader.needsNormal = qtrue;
+
+				stage->rgbGen = CGEN_ONE_MINUS_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -924,17 +1347,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ParseWaveForm( text, &stage->alphaWave );
 				stage->alphaGen = AGEN_WAVEFORM;
 			}
-			else if ( !Q_stricmp( token, "const" ) )
+			else if (!Q_stricmp(token, "global"))
 			{
-				token = COM_ParseExt( text, qfalse );
-				stage->constantColor[3] = 255 * atof( token );
-				stage->alphaGen = AGEN_CONST;
+				stage->alphaGen = AGEN_GLOBAL_ALPHA;
 			}
-			else if ( !Q_stricmp( token, "identity" ) )
-			{
-				stage->alphaGen = AGEN_IDENTITY;
-			}
-			else if ( !Q_stricmp( token, "entity" ) )
+			else if ( !Q_stricmp( token, "entity" ) || !Q_stricmp(token, "fromentity"))
 			{
 				stage->alphaGen = AGEN_ENTITY;
 			}
@@ -942,18 +1359,204 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			{
 				stage->alphaGen = AGEN_ONE_MINUS_ENTITY;
 			}
-			else if ( !Q_stricmp( token, "vertex" ) )
+			else if ( !Q_stricmp( token, "vertex" ) || !Q_stricmp(token, "fromclient"))
 			{
 				stage->alphaGen = AGEN_VERTEX;
 			}
-			else if ( !Q_stricmp( token, "lightingSpecular" ) )
-			{
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
-			}
-			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
+			else if ( !Q_stricmp( token, "oneMinusVertex" ) || !Q_stricmp(token, "oneMinusFromClient"))
 			{
 				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
 			}
+			else if (!Q_stricmp(token, "lightingSpecular"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+				stage->alphaMax = 255;
+				stage->specOrigin[0] = -960;
+				stage->specOrigin[1] = 1980;
+				stage->specOrigin[2] = 96;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0]) {
+					stage->alphaMax = atof(token) * 255.0;
+					ParseVector(text, 3, stage->specOrigin);
+				}
+			}
+			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
+				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
+			{
+				if (!Q_stricmp(token, "distFade")) {
+					stage->alphaGen = AGEN_DIST_FADE;
+				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
+					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
+				} else if (!Q_stricmp(token, "tikiDistFade")) {
+                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
+                } else {
+                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
+                }
+
+				shader.fDistNear = 256.0;
+				shader.fDistRange = 256.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistNear = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistRange = atof(token);
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "heightFade"))
+            {
+                shader.needsNormal = qtrue;
+                stage->alphaMin = 256.0f;
+                stage->alphaMax = 512.0f;
+                stage->alphaGen = AGEN_HEIGHT_FADE;
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMin = atof(token);
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDot"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "dotView"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDotView"))
+			{
+				shader.needsNormal = qtrue;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "const") || !Q_stricmp(token, "constant"))
+			{
+				token = COM_ParseExt(text, qfalse);
+				stage->colorConst[3] = 255 * atof(token);
+				stage->alphaGen = AGEN_CONSTANT;
+			}
+			else if (!Q_stricmp(token, "skyAlpha"))
+			{
+				stage->alphaGen = AGEN_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->alphaGen = AGEN_SCOORD;
+				} else {
+					stage->alphaGen = AGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+				stage->alphaConst = atof(token) * 255.0;
+			}
 			else if ( !Q_stricmp( token, "portal" ) )
 			{
 				stage->alphaGen = AGEN_PORTAL;
@@ -988,22 +1591,33 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "environment" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_ENVIRONMENT_MAPPED;
-			}
+				shader.needsNormal = qtrue;
+				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
+            }
+            else if (!Q_stricmp(token, "environmentmodel"))
+            {
+                shader.needsNormal = qtrue;
+                stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED2;
+            }
+            else if (!Q_stricmp(token, "sunreflection"))
+            {
+                shader.needsNormal = qtrue;
+                stage->bundle[cntBundle].tcGen = TCGEN_SUN_REFLECTION;
+            }
 			else if ( !Q_stricmp( token, "lightmap" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
 			}
 			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_TEXTURE;
+				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
 			}
 			else if ( !Q_stricmp( token, "vector" ) )
 			{
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[1] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
 
-				stage->bundle[0].tcGen = TCGEN_VECTOR;
+				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
 			}
 			else 
 			{
@@ -1022,23 +1636,99 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				token = COM_ParseExt( text, qfalse );
 				if ( token[0] == 0 )
 					break;
-				Q_strcat( buffer, sizeof (buffer), token );
-				Q_strcat( buffer, sizeof (buffer), " " );
+				strcat( buffer, token );
+				strcat( buffer, " " );
 			}
 
-			ParseTexMod( buffer, stage );
+			ParseTexMod( buffer, stage, cntBundle );
 
 			continue;
 		}
 		//
 		// depthmask
 		//
-		else if ( !Q_stricmp( token, "depthwrite" ) )
+		else if ( !Q_stricmp( token, "depthwrite" ) || !Q_stricmp(token, "depthmask"))
 		{
 			depthMaskBits = GLS_DEPTHMASK_TRUE;
 			depthMaskExplicit = qtrue;
 
 			continue;
+        }
+        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
+        {
+            depthMaskBits = 0;
+            depthMaskExplicit = qtrue;
+
+            continue;
+        }
+        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
+        {
+            colorBits = GLS_COLOR_NOMASK;
+
+            continue;
+        }
+		else if (!Q_stricmp(token, "noDepthTest"))
+		{
+			depthFuncBits = GLS_DEPTHTEST_DISABLE;
+			continue;
+        }
+        else if (!Q_stricmp(token, "nextBundle"))
+        {
+			if (!qglActiveTextureARB) {
+				ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
+				return qfalse;
+			}
+
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] && !Q_stricmp(token, "add")) {
+				stage->multitextureEnv = GL_ADD;
+			} else {
+				stage->multitextureEnv = GL_MODULATE;
+			}
+
+			cntBundle++;
+			if (cntBundle > NUM_TEXTURE_BUNDLES) {
+				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
+				return qfalse;
+			}
+            continue;
+        }
+		//
+		// Added in 2.0
+		//
+		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
+		{
+			cvar_t* var;
+			qboolean isNot = token[6] != 0;
+			qboolean evaluatedValue;
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			var = ri.Cvar_Get(token, "0", 0);
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			if (atof(token) != var->value) {
+				evaluatedValue = qfalse;
+			} else if (var->value) {
+				evaluatedValue = qtrue;
+			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
+				evaluatedValue = qtrue;
+			} else if (!Q_stricmp(var->string, token)) {
+				evaluatedValue = qtrue;
+			} else {
+				return qfalse;
+			}
+
+			shouldProcess &= evaluatedValue ^ isNot;
 		}
 		else
 		{
@@ -1047,20 +1737,29 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		}
 	}
 
+	// Added in 2.0
+	//  Ignore vars that didn't met with 'ifCvar' / 'ifCvarnot'
+	if (!shouldProcess) {
+		stage->active = qfalse;
+		stage->rgbGen = CGEN_BAD;
+		return qtrue;
+	}
+
 	//
 	// if cgen isn't explicitly specified, use either identity or identitylighting
 	//
 	if ( stage->rgbGen == CGEN_BAD ) {
-		if ( blendSrcBits == 0 ||
-			blendSrcBits == GLS_SRCBLEND_ONE || 
-			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) {
+		if (cntBundle || stage->bundle[0].isLightmap) {
+			stage->rgbGen = CGEN_IDENTITY;
+		} else if (blendSrcBits == 0 ||
+			blendSrcBits == GLS_SRCBLEND_ONE ||
+			blendSrcBits == GLS_SRCBLEND_SRC_ALPHA) {
 			stage->rgbGen = CGEN_IDENTITY_LIGHTING;
 		} else {
 			stage->rgbGen = CGEN_IDENTITY;
 		}
 	}
 
-
 	//
 	// implicitly assume that a GL_ONE GL_ZERO blend mask disables blending
 	//
@@ -1071,10 +1770,15 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 		depthMaskBits = GLS_DEPTHMASK_TRUE;
 	}
 
+	if (depthFuncBits == GLS_DEPTHTEST_DISABLE) {
+		depthMaskBits = 0;
+	}
+
 	// decide which agens we can skip
 	if ( stage->alphaGen == AGEN_IDENTITY ) {
 		if ( stage->rgbGen == CGEN_IDENTITY
-			|| stage->rgbGen == CGEN_LIGHTING_DIFFUSE ) {
+			|| stage->rgbGen == CGEN_LIGHTING_GRID
+			|| stage->rgbGen == CGEN_LIGHTING_SPHERICAL ) {
 			stage->alphaGen = AGEN_SKIP;
 		}
 	}
@@ -1085,7 +1789,10 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 	stage->stateBits = depthMaskBits | 
 		               blendSrcBits | blendDstBits | 
 					   atestBits | 
-					   depthFuncBits;
+					   depthFuncBits |
+					   depthTestBits |
+					   colorBits |
+					   fogBits;
 
 	return qtrue;
 }
@@ -1123,11 +1830,6 @@ static void ParseDeform( char **text ) {
 	ds = &shader.deforms[ shader.numDeforms ];
 	shader.numDeforms++;
 
-	if ( !Q_stricmp( token, "projectionShadow" ) ) {
-		ds->deformation = DEFORM_PROJECTION_SHADOW;
-		return;
-	}
-
 	if ( !Q_stricmp( token, "autosprite" ) ) {
 		ds->deformation = DEFORM_AUTOSPRITE;
 		return;
@@ -1138,14 +1840,8 @@ static void ParseDeform( char **text ) {
 		return;
 	}
 
-	if ( !Q_stricmpn( token, "text", 4 ) ) {
-		int		n;
-		
-		n = token[4] - '0';
-		if ( n < 0 || n > 7 ) {
-			n = 0;
-		}
-		ds->deformation = DEFORM_TEXT0 + n;
+	if (!Q_stricmp(token, "lightglow")) {
+		ds->deformation = DEFORM_LIGHTGLOW;
 		return;
 	}
 
@@ -1175,6 +1871,7 @@ static void ParseDeform( char **text ) {
 		ds->bulgeSpeed = atof( token );
 
 		ds->deformation = DEFORM_BULGE;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1199,6 +1896,66 @@ static void ParseDeform( char **text ) {
 
 		ParseWaveForm( text, &ds->deformationWave );
 		ds->deformation = DEFORM_WAVE;
+		shader.needsNormal = qtrue;
+		return;
+	}
+
+	if (!Q_stricmp(token, "flap")) {
+		texDirection_t coordDirection;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 's') {
+			coordDirection = USE_S_COORDS;
+		}
+		else if (token[0] == 't') {
+			coordDirection = USE_T_COORDS;
+		}
+		else {
+			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
+			return;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
+			return;
+		}
+
+		if (!atof(token)) {
+			ds->deformationSpread = 100.0;
+			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
+		}
+		else {
+			ds->deformationSpread = 1.0 / atof(token);
+		}
+
+		ParseWaveForm(text, &ds->deformationWave);
+
+		if (coordDirection == USE_T_COORDS) {
+			ds->deformation = DEFORM_FLAP_T;
+		}
+		else {
+			ds->deformation = DEFORM_FLAP_S;
+		}
+
+		shader.needsNormal = qtrue;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ds->bulgeWidth = 0.0;
+			ds->bulgeHeight = 1.0;
+			return;
+		}
+		ds->bulgeWidth = atof(token);
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
+			return;
+		}
+		ds->bulgeHeight = atof(token);
 		return;
 	}
 
@@ -1221,6 +1978,7 @@ static void ParseDeform( char **text ) {
 		ds->deformationWave.frequency = atof( token );
 
 		ds->deformation = DEFORM_NORMALS;
+		shader.needsNormal = qtrue;
 		return;
 	}
 
@@ -1257,7 +2015,6 @@ static void ParseSkyParms( char **text ) {
 	static char	*suf[6] = {"rt", "bk", "lf", "ft", "up", "dn"};
 	char		pathname[MAX_QPATH];
 	int			i;
-	imgFlags_t imgFlags = IMGFLAG_MIPMAP | IMGFLAG_PICMIP;
 
 	// outerbox
 	token = COM_ParseExt( text, qfalse );
@@ -1269,8 +2026,12 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, IMGTYPE_COLORALPHA, imgFlags | IMGFLAG_CLAMPTOEDGE );
-
+			if (!haveClampToEdge) {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
+			}
+			else {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, r_picmip->integer, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+			}
 			if ( !shader.sky.outerbox[i] ) {
 				shader.sky.outerbox[i] = tr.defaultImage;
 			}
@@ -1300,7 +2061,11 @@ static void ParseSkyParms( char **text ) {
 		for (i=0 ; i<6 ; i++) {
 			Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
 				, token, suf[i] );
-			shader.sky.innerbox[i] = R_FindImageFile( ( char * ) pathname, IMGTYPE_COLORALPHA, imgFlags );
+			if (!haveClampToEdge) {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, qtrue, shader_force32bit, GL_CLAMP, GL_CLAMP);
+			} else {
+				shader.sky.outerbox[i] = R_FindImageFileOld((char*)pathname, qtrue, r_picmip->integer, shader_force32bit, GL_CLAMP_TO_EDGE, GL_CLAMP_TO_EDGE);
+			}
 			if ( !shader.sky.innerbox[i] ) {
 				shader.sky.innerbox[i] = tr.defaultImage;
 			}
@@ -1364,8 +2129,11 @@ infoParm_t	infoParms[] = {
 	{"lava",		1,	0,	CONTENTS_LAVA },		// very damaging
 	{"playerclip",	1,	0,	CONTENTS_PLAYERCLIP },
 	{"monsterclip",	1,	0,	CONTENTS_MONSTERCLIP },
+	{"fence",		1,	0,	CONTENTS_FENCE },
+	{"weaponclip",	1,	0,	CONTENTS_WEAPONCLIP },
+	{"vehicleclip",	1,	0,	CONTENTS_VEHICLECLIP },
 	{"nodrop",		1,	0,	CONTENTS_NODROP },		// don't drop items or leave bodies (death fog, lava, etc)
-	{"nonsolid",	1,	SURF_NONSOLID,	0},						// clears the solid flag
+	{"nonsolid",	1,	SURF_NONSOLID,	0 },		// clears the solid flag
 
 	// utility relevant attributes
 	{"origin",		1,	0,	CONTENTS_ORIGIN },		// center of rotating brushes
@@ -1373,14 +2141,9 @@ infoParm_t	infoParms[] = {
 	{"detail",		0,	0,	CONTENTS_DETAIL },		// don't include in structural bsp
 	{"structural",	0,	0,	CONTENTS_STRUCTURAL },	// force into structural bsp even if trnas
 	{"areaportal",	1,	0,	CONTENTS_AREAPORTAL },	// divides areas
-	{"clusterportal", 1,0,  CONTENTS_CLUSTERPORTAL },	// for bots
-	{"donotenter",  1,  0,  CONTENTS_DONOTENTER },		// for bots
-
 	{"fog",			1,	0,	CONTENTS_FOG},			// carves surfaces entering
-	{"sky",			0,	SURF_SKY,		0 },		// emit light from an environment map
-	{"lightfilter",	0,	SURF_LIGHTFILTER, 0 },		// filter light going through it
-	{"alphashadow",	0,	SURF_ALPHASHADOW, 0 },		// test light on a per-pixel basis
-	{"hint",		0,	SURF_HINT,		0 },		// use as a primary splitter
+	{"sky",			0,	SURF_SKY,			0 },	// emit light from an environment map
+	{"alphashadow",	1,	SURF_ALPHASHADOW,	0 },	// carves surfaces entering
 
 	// server attributes
 	{"slick",		0,	SURF_SLICK,		0 },
@@ -1388,16 +2151,29 @@ infoParm_t	infoParms[] = {
 	{"nomarks",		0,	SURF_NOMARKS,	0 },		// don't make impact marks, but still explode
 	{"ladder",		0,	SURF_LADDER,	0 },
 	{"nodamage",	0,	SURF_NODAMAGE,	0 },
-	{"metalsteps",	0,	SURF_METALSTEPS,0 },
-	{"flesh",		0,	SURF_FLESH,		0 },
 	{"nosteps",		0,	SURF_NOSTEPS,	0 },
+	{"paper",		0,	SURF_PAPER,		0 },
+	{"wood",		0,	SURF_WOOD,		0 },
+	{"metal",		0,	SURF_METAL,		0 },
+	{"rock",		0,	SURF_ROCK,		0 },
+	{"dirt",		0,	SURF_DIRT,		0 },
+	{"grill",		0,	SURF_GRILL,		0 },
+	{"grass",		0,	SURF_GRASS,		0 },
+	{"mud",			0,	SURF_MUD,		0 },
+	{"puddle",		0,	SURF_PUDDLE,	0 },
+	{"glass",		0,	SURF_GLASS,		0 },
+	{"gravel",		0,	SURF_GRAVEL,	0 },
+	{"sand",		0,	SURF_SAND,		0 },
+	{"foliage",		0,	SURF_FOLIAGE,	0 },
+	{"snow",		0,	SURF_SNOW,		0 },
+	{"carpet",		0,	SURF_CARPET,	0 },
 
 	// drawsurf attributes
-	{"nodraw",		0,	SURF_NODRAW,	0 },	// don't generate a drawsurface (or a lightmap)
-	{"pointlight",	0,	SURF_POINTLIGHT, 0 },	// sample lighting at vertexes
-	{"nolightmap",	0,	SURF_NOLIGHTMAP,0 },	// don't generate a lightmap
-	{"nodlight",	0,	SURF_NODLIGHT, 0 },		// don't ever add dynamic lights
-	{"dust",		0,	SURF_DUST, 0}			// leave a dust trail when walking on this surface
+	{"nodraw",		0,	SURF_NODRAW,		0 },	// don't generate a drawsurface (or a lightmap)
+	{"castshadow",	0,	SURF_CASTSHADOW,	0 },	// sample lighting at vertexes
+	{"nolightmap",	0,	SURF_NOLIGHTMAP,	0 },	// don't generate a lightmap
+	{"nodlight",	0,	SURF_NODLIGHT,		0 },	// don't ever add dynamic lights
+	{"hint",		0,	SURF_HINT,		0}			// leave a dust trail when walking on this surface
 };
 
 
@@ -1410,7 +2186,7 @@ surfaceparm <name>
 */
 static void ParseSurfaceParm( char **text ) {
 	char	*token;
-	int		numInfoParms = ARRAY_LEN( infoParms );
+	int		numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]);
 	int		i;
 
 	token = COM_ParseExt( text, qfalse );
@@ -1437,12 +2213,16 @@ shader.  Parse it into the global shader variable.  Later functions
 will optimize it.
 =================
 */
-static qboolean ParseShader( char **text )
+static qboolean ParseShader( char **text, qboolean picmip )
 {
 	char *token;
 	int s;
+	int matchingendifs;
+	qboolean bInElseBlock;
 
 	s = 0;
+	matchingendifs = 0;
+	bInElseBlock = qfalse;
 
 	token = COM_ParseExt( text, qtrue );
 	if ( token[0] != '{' )
@@ -1468,18 +2248,22 @@ static qboolean ParseShader( char **text )
 		// stage definition
 		else if ( token[0] == '{' )
 		{
-			if ( s >= MAX_SHADER_STAGES ) {
-				ri.Printf( PRINT_WARNING, "WARNING: too many stages in shader %s (max is %i)\n", shader.name, MAX_SHADER_STAGES );
-				return qfalse;
-			}
-
-			if ( !ParseStage( &stages[s], text ) )
+			if ( !ParseStage( &unfoggedStages[s], text, picmip ) )
 			{
 				return qfalse;
 			}
-			stages[s].active = qtrue;
+			if (unfoggedStages[s].rgbGen != CGEN_BAD) {
+				unfoggedStages[s].active = qtrue;
+				if (s > 0) {
+					if (!(unfoggedStages[s].stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has opaque maps defined after stage 0!!!\n", shader.name);
+					}
+					if (unfoggedStages[s].stateBits & GLS_DEPTHMASK_TRUE) {
+						ri.Printf(PRINT_WARNING, "WARNING: shader '%s' has depthmask enabled after stage 0!!!\n", shader.name);
+					}
+				}
+			}
 			s++;
-
 			continue;
 		}
 		// skip stuff that only the QuakeEdRadient needs
@@ -1488,7 +2272,7 @@ static qboolean ParseShader( char **text )
 			continue;
 		}
 		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) || !Q_stricmp( token, "q3map_sunExt" ) ) {
+		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
 			float	a, b;
 
 			token = COM_ParseExt( text, qfalse );
@@ -1515,9 +2299,6 @@ static qboolean ParseShader( char **text )
 			tr.sunDirection[0] = cos( a ) * cos( b );
 			tr.sunDirection[1] = sin( a ) * cos( b );
 			tr.sunDirection[2] = sin( b );
-
-			SkipRestOfLine( text );
-			continue;
 		}
 		else if ( !Q_stricmp( token, "deformVertexes" ) ) {
 			ParseDeform( text );
@@ -1546,14 +2327,19 @@ static qboolean ParseShader( char **text )
 		// no mip maps
 		else if ( !Q_stricmp( token, "nomipmaps" ) )
 		{
-			shader.noMipMaps = qtrue;
-			shader.noPicMip = qtrue;
+			shader_noMipMaps = qtrue;
 			continue;
 		}
 		// no picmip adjustment
 		else if ( !Q_stricmp( token, "nopicmip" ) )
 		{
-			shader.noPicMip = qtrue;
+			shader_noPicMip = qtrue;
+			continue;
+		}
+		// force 32 bit images
+		else if (!Q_stricmp(token, "force32bit"))
+		{
+			shader_force32bit = qtrue;
 			continue;
 		}
 		// polygonOffset
@@ -1570,41 +2356,10 @@ static qboolean ParseShader( char **text )
 		{
 			shader.entityMergable = qtrue;
 			continue;
-		}
-		// fogParms
-		else if ( !Q_stricmp( token, "fogParms" ) ) 
+			}
+		else if (!Q_stricmp(token, "noMerge"))
 		{
-			if ( !ParseVector( text, 3, shader.fogParms.color ) ) {
-				return qfalse;
-			}
-
-			if ( r_greyscale->integer )
-			{
-				float luminance;
-
-				luminance = LUMA( shader.fogParms.color[0], shader.fogParms.color[1], shader.fogParms.color[2] );
-				VectorSet( shader.fogParms.color, luminance, luminance, luminance );
-			}
-			else if ( r_greyscale->value )
-			{
-				float luminance;
-
-				luminance = LUMA( shader.fogParms.color[0], shader.fogParms.color[1], shader.fogParms.color[2] );
-				shader.fogParms.color[0] = LERP( shader.fogParms.color[0], luminance, r_greyscale->value );
-				shader.fogParms.color[1] = LERP( shader.fogParms.color[1], luminance, r_greyscale->value );
-				shader.fogParms.color[2] = LERP( shader.fogParms.color[2], luminance, r_greyscale->value );
-			}
-
-			token = COM_ParseExt( text, qfalse );
-			if ( !token[0] ) 
-			{
-				ri.Printf( PRINT_WARNING, "WARNING: missing parm for 'fogParms' keyword in shader '%s'\n", shader.name );
-				continue;
-			}
-			shader.fogParms.depthForOpaque = atof( token );
-
-			// skip any old gradient directions
-			SkipRestOfLine( text );
+			shader.flags |= 1;
 			continue;
 		}
 		// portal
@@ -1619,10 +2374,49 @@ static qboolean ParseShader( char **text )
 			ParseSkyParms( text );
 			continue;
 		}
+		// portal
+		else if (!Q_stricmp(token, "portalsky"))
+		{
+			shader.sort = SS_PORTALSKY;
+			shader.isPortalSky = qtrue;
+			continue;
+		}
 		// light <value> determines flaring in q3map, not needed here
 		else if ( !Q_stricmp(token, "light") ) 
 		{
-			(void)COM_ParseExt( text, qfalse );
+			token = COM_ParseExt( text, qfalse );
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritegen"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			if (!Q_stricmp(token, "parallel")) {
+				shader.sprite.type = SPRITE_PARALLEL;
+			} else if (!Q_stricmp(token, "parallel_oriented")) {
+				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
+			} else if (!Q_stricmp(token, "parallel_upright")) {
+				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
+			} else if (!Q_stricmp(token, "oriented")) {
+				shader.sprite.type = SPRITE_ORIENTED;
+			}
+
+			shader.sprite.scale = 1.0;
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritescale"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			shader.sprite.scale = atof(token);
 			continue;
 		}
 		// cull <face>
@@ -1655,6 +2449,107 @@ static qboolean ParseShader( char **text )
 			ParseSort( text );
 			continue;
 		}
+		else if (!Q_stricmp(token, "#if") || !Q_stricmp(token, "#if_not") || !Q_stricmp(token, "#else"))
+		{
+			qboolean conditionpassed;
+
+			conditionpassed = qfalse;
+			if (!Q_stricmp(token, "#else"))
+			{
+				if (bInElseBlock) {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: illegal #else after a previous #else in shader '%s'\n",
+						shader.name);
+				}
+
+				matchingendifs--;
+				if (matchingendifs < 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: unmatched #else in shader '%s'\n", shader.name);
+				}
+
+				bInElseBlock = qtrue;
+			}
+			else
+			{
+				qboolean bInvertResult;
+
+				bInvertResult = !Q_stricmp(token, "#if_not");
+
+				token = COM_ParseExt(text, qfalse);
+				if (!Q_stricmp(token, "separate_env")) {
+					conditionpassed = r_textureDetails->integer != 0;
+				} else if (!Q_stricmp(token, "0") || !Q_stricmp(token, "false")) {
+					conditionpassed = qfalse;
+				} else if (!Q_stricmp(token, "1") || !Q_stricmp(token, "true")) {
+					conditionpassed = qtrue;
+				} else {
+					ri.Printf(
+						PRINT_WARNING,
+						"WARNING: invalid #if argument '%s' in shader '%s', not passing.\n",
+						token,
+						shader.name);
+				}
+
+				if (bInvertResult) {
+					conditionpassed = !conditionpassed;
+				}
+			}
+
+			if (!conditionpassed) {
+				int nestedifs = 0;
+
+				SkipRestOfLine(text);
+
+				while (1) {
+					token = COM_ParseExt(text, qtrue);
+					if (!token[0]) {
+						ri.Printf(PRINT_WARNING, "WARNING: no matching #endif in shader '%s'\n", shader.name);
+						break;
+					}
+
+					if (!Q_stricmp(token, "#if")) {
+						nestedifs++;
+						SkipRestOfLine(text);
+					} else if (!Q_stricmp(token, "#endif")) {
+						nestedifs--;
+					} else if (!Q_stricmp(token, "#else")) {
+						if (bInElseBlock) {
+							ri.Printf(
+								PRINT_WARNING,
+								"WARNING: illegal #else after a previous #else in shader '%s'\n",
+								shader.name);
+							break;
+						}
+
+						if (!nestedifs) {
+							matchingendifs++;
+							break;
+						}
+						nestedifs++;
+					} else {
+						SkipRestOfLine(text);
+					}
+
+					if (nestedifs == -1) {
+						break;
+					}
+				}
+			} else {
+				matchingendifs++;
+			}
+
+			continue;
+		}
+		else if (!Q_stricmp(token, "#endif"))
+		{
+			matchingendifs--;
+			if (matchingendifs < 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: unmatched #endif in shader '%s'\n", shader.name);
+			}
+
+			bInElseBlock = qfalse;
+		}
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
@@ -1663,12 +2558,20 @@ static qboolean ParseShader( char **text )
 	}
 
 	//
-	// ignore shaders that don't have any stages, unless it is a sky or fog
+	// ignore shaders that don't have any unfoggedStages, unless it is a sky or fog
 	//
-	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG ) ) {
+	if ( s == 0 && !shader.isSky && !(shader.contentFlags & CONTENTS_FOG) && !(shader.surfaceFlags & SURF_NODRAW)) {
 		return qfalse;
 	}
 
+	if (!(shader.flags & 2)) {
+		shader.flags &= ~1;
+	}
+
+	if ((shader.contentFlags & CONTENTS_FENCE) != 0 && shader.cullType == CT_TWO_SIDED) {
+		shader.cullType = CT_FRONT_SIDED;
+	}
+
 	shader.explicitlyDefined = qtrue;
 
 	return qtrue;
@@ -1700,7 +2603,7 @@ static void ComputeStageIteratorFunc( void )
 	if ( shader.isSky )
 	{
 		shader.optimalStageIteratorFunc = RB_StageIteratorSky;
-		return;
+		goto done;
 	}
 
 	if ( r_ignoreFastPath->integer )
@@ -1713,20 +2616,20 @@ static void ComputeStageIteratorFunc( void )
 	//
 	if ( shader.numUnfoggedPasses == 1 )
 	{
-		if ( stages[0].rgbGen == CGEN_LIGHTING_DIFFUSE )
+		if ( unfoggedStages[0].rgbGen == CGEN_LIGHTING_GRID || unfoggedStages[0].rgbGen == CGEN_LIGHTING_SPHERICAL )
 		{
-			if ( stages[0].alphaGen == AGEN_IDENTITY )
+			if ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP)
 			{
-				if ( stages[0].bundle[0].tcGen == TCGEN_TEXTURE )
+				if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && !unfoggedStages[0].bundle[0].numTexMods)
 				{
 					if ( !shader.polygonOffset )
 					{
-						if ( !shader.multitextureEnv )
+						if ( !unfoggedStages[0].multitextureEnv )
 						{
 							if ( !shader.numDeforms )
 							{
-								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTexture;
-								return;
+								shader.optimalStageIteratorFunc = RB_StageIteratorVertexLitTextureUnfogged;
+								goto done;
 							}
 						}
 					}
@@ -1740,24 +2643,28 @@ static void ComputeStageIteratorFunc( void )
 	//
 	if ( shader.numUnfoggedPasses == 1 )
 	{
-		if ( ( stages[0].rgbGen == CGEN_IDENTITY ) && ( stages[0].alphaGen == AGEN_IDENTITY ) )
+		if ( ( unfoggedStages[0].rgbGen == CGEN_IDENTITY ) && ( unfoggedStages[0].alphaGen == AGEN_IDENTITY || unfoggedStages[0].alphaGen == AGEN_SKIP ) )
 		{
-			if ( stages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
-				stages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
+			if ( unfoggedStages[0].bundle[0].tcGen == TCGEN_TEXTURE && 
+				unfoggedStages[0].bundle[1].tcGen == TCGEN_LIGHTMAP )
 			{
 				if ( !shader.polygonOffset )
 				{
 					if ( !shader.numDeforms )
 					{
-						if ( shader.multitextureEnv )
+						if (unfoggedStages[0].multitextureEnv )
 						{
-							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitexture;
+							shader.optimalStageIteratorFunc = RB_StageIteratorLightmappedMultitextureUnfogged;
+							goto done;
 						}
 					}
 				}
 			}
 		}
 	}
+
+done:
+	return;
 }
 
 typedef struct {
@@ -1803,117 +2710,132 @@ static collapse_t	collapse[] = {
 ================
 CollapseMultitexture
 
-Attempt to combine two stages into a single multitexture stage
+Attempt to combine two unfoggedStages into a single multitexture stage
 FIXME: I think modulated add + modulated add collapses incorrectly
 =================
 */
-static qboolean CollapseMultitexture( void ) {
+static void CollapseMultitexture(int *stagecounter) {
+	int iUseCollapse;
+	int stagenum;
 	int abits, bbits;
-	int i;
+	shaderStage_t* stage;
 	textureBundle_t tmpBundle;
 
-	if ( !qglActiveTextureARB ) {
-		return qfalse;
-	}
+	for (stagenum = 0; stagenum < *stagecounter - 1; stagenum++) {
+		stage = &unfoggedStages[stagenum];
 
-	// make sure both stages are active
-	if ( !stages[0].active || !stages[1].active ) {
-		return qfalse;
-	}
-
-	// on voodoo2, don't combine different tmus
-	if ( glConfig.driverType == GLDRV_VOODOO ) {
-		if ( stages[0].bundle[0].image[0]->TMU ==
-			 stages[1].bundle[0].image[0]->TMU ) {
-			return qfalse;
+		// make sure both unfoggedStages are active
+		if (!stage[0].active || !stage[1].active) {
+			continue;
 		}
-	}
 
-	abits = stages[0].stateBits;
-	bbits = stages[1].stateBits;
-
-	// make sure that both stages have identical state other than blend modes
-	if ( ( abits & ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE ) ) !=
-		( bbits & ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE ) ) ) {
-		return qfalse;
-	}
-
-	abits &= ( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-	bbits &= ( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-
-	// search for a valid multitexture blend function
-	for ( i = 0; collapse[i].blendA != -1 ; i++ ) {
-		if ( abits == collapse[i].blendA
-			&& bbits == collapse[i].blendB ) {
-			break;
+		if (stage->multitextureEnv) {
+			continue;
 		}
-	}
 
-	// nothing found
-	if ( collapse[i].blendA == -1 ) {
-		return qfalse;
-	}
+		// on voodoo2, don't combine different tmus
+		if (glConfig.driverType == GLDRV_VOODOO) {
+			if (stage[1].bundle[0].image[0]->TMU ==
+				unfoggedStages[stagenum].bundle[0].image[0]->TMU) {
+				continue;
+			}
+		}
 
-	// GL_ADD is a separate extension
-	if ( collapse[i].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable ) {
-		return qfalse;
-	}
+		abits = stage[0].stateBits;
+		bbits = stage[1].stateBits;
 
-	// make sure waveforms have identical parameters
-	if ( ( stages[0].rgbGen != stages[1].rgbGen ) ||
-		( stages[0].alphaGen != stages[1].alphaGen ) )  {
-		return qfalse;
-	}
+		// make sure that both unfoggedStages have identical state other than blend modes
+		if (
+			(abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)) !=
+			(bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE))
+            && (bbits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
+					& abits & ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHMASK_TRUE)
+					& ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS | GLS_DEPTHFUNC_EQUAL | GLS_DEPTHMASK_TRUE)
+				|| !(abits & GLS_DEPTHMASK_TRUE)
+				|| !(bbits & GLS_DEPTHFUNC_EQUAL))
+			) {
+			continue;
+		}
 
-	// an add collapse can only have identity colors
-	if ( collapse[i].multitextureEnv == GL_ADD && stages[0].rgbGen != CGEN_IDENTITY ) {
-		return qfalse;
-	}
+		abits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+		bbits &= (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
 
-	if ( stages[0].rgbGen == CGEN_WAVEFORM )
-	{
-		if ( memcmp( &stages[0].rgbWave,
-					 &stages[1].rgbWave,
-					 sizeof( stages[0].rgbWave ) ) )
+		// search for a valid multitexture blend function
+		for (iUseCollapse = 0; collapse[iUseCollapse].blendA != -1; iUseCollapse++) {
+			if (abits == collapse[iUseCollapse].blendA
+				&& bbits == collapse[iUseCollapse].blendB) {
+				break;
+			}
+		}
+
+		// nothing found
+		if (collapse[iUseCollapse].blendA == -1) {
+			continue;
+		}
+
+		// GL_ADD is a separate extension
+		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && !glConfig.textureEnvAddAvailable) {
+			continue;
+		}
+
+		// make sure waveforms have identical parameters
+		if ((stage->rgbGen != unfoggedStages[stagenum + 1].rgbGen) ||
+			(stage->alphaGen != unfoggedStages[stagenum + 1].alphaGen)) {
+			continue;
+		}
+
+		// an add collapse can only have identity colors
+		if (collapse[iUseCollapse].multitextureEnv == GL_ADD && stage->rgbGen != CGEN_IDENTITY) {
+			continue;
+		}
+
+		if (stage->rgbGen == CGEN_WAVEFORM)
 		{
-			return qfalse;
+			if (memcmp(&stage->rgbWave,
+				&unfoggedStages[stagenum + 1].rgbWave,
+				sizeof(stage->rgbWave)))
+			{
+				continue;
+			}
 		}
-	}
-	if ( stages[0].alphaGen == AGEN_WAVEFORM )
-	{
-		if ( memcmp( &stages[0].alphaWave,
-					 &stages[1].alphaWave,
-					 sizeof( stages[0].alphaWave ) ) )
+		if (stage->alphaGen == CGEN_WAVEFORM)
 		{
-			return qfalse;
+			if (memcmp(&stage->alphaWave,
+				&unfoggedStages[stagenum + 1].alphaWave,
+				sizeof(stage->alphaWave)))
+			{
+				continue;
+			}
 		}
+
+
+		// make sure that lightmaps are in bundle 1 for 3dfx
+		if (stage->bundle[0].isLightmap)
+		{
+			tmpBundle = stage->bundle[0];
+			stage->bundle[0] = stage[1].bundle[0];
+			stage->bundle[1] = tmpBundle;
+		}
+		else
+		{
+			stage->bundle[1] = stage[1].bundle[0];
+		}
+
+		// set the new blend state bits
+		stage->multitextureEnv = collapse[iUseCollapse].multitextureEnv;
+		stage->stateBits &= ~(GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+		stage->stateBits |= collapse[iUseCollapse].multitextureBlend;
+
+		//
+		// move down subsequent shaders
+		//
+		if (stagenum + 2 < MAX_SHADER_STAGES) {
+			memmove(&unfoggedStages[stagenum + 1], &unfoggedStages[stagenum + 2], sizeof(unfoggedStages[0]) * (MAX_SHADER_STAGES - 2 - stagenum));
+		}
+
+		Com_Memset(&unfoggedStages[MAX_SHADER_STAGES - 1], 0, sizeof(unfoggedStages[0]));
+		(*stagecounter)--;
 	}
-
-
-	// make sure that lightmaps are in bundle 1 for 3dfx
-	if ( stages[0].bundle[0].isLightmap )
-	{
-		tmpBundle = stages[0].bundle[0];
-		stages[0].bundle[0] = stages[1].bundle[0];
-		stages[0].bundle[1] = tmpBundle;
-	}
-	else
-	{
-		stages[0].bundle[1] = stages[1].bundle[0];
-	}
-
-	// set the new blend state bits
-	shader.multitextureEnv = collapse[i].multitextureEnv;
-	stages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-	stages[0].stateBits |= collapse[i].multitextureBlend;
-
-	//
-	// move down subsequent shaders
-	//
-	memmove( &stages[1], &stages[2], sizeof( stages[0] ) * ( MAX_SHADER_STAGES - 2 ) );
-	Com_Memset( &stages[MAX_SHADER_STAGES-1], 0, sizeof( stages[0] ) );
-
-	return qtrue;
 }
 
 /*
@@ -1934,8 +2856,6 @@ static void FixRenderCommandList( int newShader ) {
 		const void *curCmd = cmdList->cmds;
 
 		while ( 1 ) {
-			curCmd = PADP(curCmd, sizeof(void *));
-
 			switch ( *(const int *)curCmd ) {
 			case RC_SET_COLOR:
 				{
@@ -1996,7 +2916,7 @@ static void FixRenderCommandList( int newShader ) {
 SortNewShader
 
 Positions the most recently created shader in the tr.sortedShaders[]
-array so that the shader->sort key is sorted relative to the other
+array so that the shader->sort key is sorted reletive to the other
 shaders.
 
 Sets shader->sortedIndex
@@ -2018,10 +2938,6 @@ static void SortNewShader( void ) {
 		tr.sortedShaders[i+1]->sortedIndex++;
 	}
 
-	// Arnout: fix rendercommandlist
-	// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=493
-	FixRenderCommandList( i+1 );
-
 	newShader->sortedIndex = i+1;
 	tr.sortedShaders[i+1] = newShader;
 }
@@ -2035,22 +2951,18 @@ GeneratePermanentShader
 static shader_t *GeneratePermanentShader( void ) {
 	shader_t	*newShader;
 	int			i, b;
-	int			size, hash;
+	int			size;
 
 	if ( tr.numShaders == MAX_SHADERS ) {
 		ri.Printf( PRINT_WARNING, "WARNING: GeneratePermanentShader - MAX_SHADERS hit\n");
 		return tr.defaultShader;
 	}
 
-	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_low );
+	newShader = ri.Hunk_Alloc( sizeof( shader_t ), h_dontcare);
 
 	*newShader = shader;
-
-	if ( shader.sort <= SS_OPAQUE ) {
-		newShader->fogPass = FP_EQUAL;
-	} else if ( shader.contentFlags & CONTENTS_FOG ) {
-		newShader->fogPass = FP_LE;
-	}
+	newShader->next = currentShader->shader;
+	currentShader->shader = newShader;
 
 	tr.shaders[ tr.numShaders ] = newShader;
 	newShader->index = tr.numShaders;
@@ -2061,24 +2973,24 @@ static shader_t *GeneratePermanentShader( void ) {
 	tr.numShaders++;
 
 	for ( i = 0 ; i < newShader->numUnfoggedPasses ; i++ ) {
-		if ( !stages[i].active ) {
+		if ( !unfoggedStages[i].active ) {
 			break;
 		}
-		newShader->stages[i] = ri.Hunk_Alloc( sizeof( stages[i] ), h_low );
-		*newShader->stages[i] = stages[i];
+		newShader->unfoggedStages[i] = ri.Hunk_Alloc( sizeof( unfoggedStages[i] ), h_dontcare );
+		*newShader->unfoggedStages[i] = unfoggedStages[i];
 
 		for ( b = 0 ; b < NUM_TEXTURE_BUNDLES ; b++ ) {
-			size = newShader->stages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
-			newShader->stages[i]->bundle[b].texMods = ri.Hunk_Alloc( size, h_low );
-			Com_Memcpy( newShader->stages[i]->bundle[b].texMods, stages[i].bundle[b].texMods, size );
+			size = newShader->unfoggedStages[i]->bundle[b].numTexMods * sizeof( texModInfo_t );
+			if (size) {
+				newShader->unfoggedStages[i]->bundle[b].texMods = ri.Hunk_Alloc(size, h_dontcare);
+				Com_Memcpy(newShader->unfoggedStages[i]->bundle[b].texMods, unfoggedStages[i].bundle[b].texMods, size);
+			}
 		}
 	}
 
 	SortNewShader();
 
-	hash = generateHashValue(newShader->name, FILE_HASH_SIZE);
-	newShader->next = hashTable[hash];
-	hashTable[hash] = newShader;
+	currentShader = NULL;
 
 	return newShader;
 }
@@ -2088,7 +3000,7 @@ static shader_t *GeneratePermanentShader( void ) {
 VertexLightingCollapse
 
 If vertex lighting is enabled, only render a single
-pass, trying to guess which is the correct one to best approximate
+pass, trying to guess which is the correct one to best aproximate
 what it is supposed to look like.
 =================
 */
@@ -2102,11 +3014,11 @@ static void VertexLightingCollapse( void ) {
 	if ( shader.sort == SS_OPAQUE ) {
 
 		// pick the best texture for the single pass
-		bestStage = &stages[0];
+		bestStage = &unfoggedStages[0];
 		bestImageRank = -999999;
 
 		for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
-			shaderStage_t *pStage = &stages[stage];
+			shaderStage_t *pStage = &unfoggedStages[stage];
 
 			if ( !pStage->active ) {
 				break;
@@ -2132,37 +3044,37 @@ static void VertexLightingCollapse( void ) {
 			}
 		}
 
-		stages[0].bundle[0] = bestStage->bundle[0];
-		stages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
-		stages[0].stateBits |= GLS_DEPTHMASK_TRUE;
+		unfoggedStages[0].bundle[0] = bestStage->bundle[0];
+		unfoggedStages[0].stateBits &= ~( GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS );
+		unfoggedStages[0].stateBits |= GLS_DEPTHMASK_TRUE;
 		if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-			stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
+			unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
 		} else {
-			stages[0].rgbGen = CGEN_EXACT_VERTEX;
+			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
 		}
-		stages[0].alphaGen = AGEN_SKIP;		
+		unfoggedStages[0].alphaGen = AGEN_SKIP;		
 	} else {
 		// don't use a lightmap (tesla coils)
-		if ( stages[0].bundle[0].isLightmap ) {
-			stages[0] = stages[1];
+		if ( unfoggedStages[0].bundle[0].isLightmap ) {
+			unfoggedStages[0] = unfoggedStages[1];
 		}
 
 		// if we were in a cross-fade cgen, hack it to normal
-		if ( stages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || stages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( unfoggedStages[0].rgbGen == CGEN_ONE_MINUS_ENTITY || unfoggedStages[1].rgbGen == CGEN_ONE_MINUS_ENTITY ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
-		if ( ( stages[0].rgbGen == CGEN_WAVEFORM && stages[0].rgbWave.func == GF_SAWTOOTH )
-			&& ( stages[1].rgbGen == CGEN_WAVEFORM && stages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_SAWTOOTH )
+			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_INVERSE_SAWTOOTH ) ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
-		if ( ( stages[0].rgbGen == CGEN_WAVEFORM && stages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
-			&& ( stages[1].rgbGen == CGEN_WAVEFORM && stages[1].rgbWave.func == GF_SAWTOOTH ) ) {
-			stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		if ( ( unfoggedStages[0].rgbGen == CGEN_WAVEFORM && unfoggedStages[0].rgbWave.func == GF_INVERSE_SAWTOOTH )
+			&& ( unfoggedStages[1].rgbGen == CGEN_WAVEFORM && unfoggedStages[1].rgbWave.func == GF_SAWTOOTH ) ) {
+			unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
 		}
 	}
 
 	for ( stage = 1; stage < MAX_SHADER_STAGES; stage++ ) {
-		shaderStage_t *pStage = &stages[stage];
+		shaderStage_t *pStage = &unfoggedStages[stage];
 
 		if ( !pStage->active ) {
 			break;
@@ -2172,26 +3084,6 @@ static void VertexLightingCollapse( void ) {
 	}
 }
 
-/*
-===============
-InitShader
-===============
-*/
-static void InitShader( const char *name, int lightmapIndex ) {
-	int i;
-
-	// clear the global shader
-	Com_Memset( &shader, 0, sizeof( shader ) );
-	Com_Memset( &stages, 0, sizeof( stages ) );
-
-	Q_strncpyz( shader.name, name, sizeof( shader.name ) );
-	shader.lightmapIndex = lightmapIndex;
-
-	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
-		stages[i].bundle[0].texMods = texMods[i];
-	}
-}
-
 /*
 =========================
 FinishShader
@@ -2202,15 +3094,29 @@ from the current global working shader
 */
 static shader_t *FinishShader( void ) {
 	int stage;
-	qboolean		hasLightmapStage;
-	qboolean		vertexLightmap;
+	int i;
+	int bundle;
+	qboolean hasLightmapStage;
+
+	if (!currentShader) {
+		currentShader = FindShaderText(shader.name);
+	}
+
+    if (shader.defaultShader)
+    {
+        currentShader->shader = tr.defaultShader;
+        currentShader = NULL;
+        return tr.defaultShader;
+    }
 
 	hasLightmapStage = qfalse;
-	vertexLightmap = qfalse;
 
 	//
 	// set sky stuff appropriate
 	//
+	if ( shader.isPortalSky ) {
+		shader.sort = SS_PORTALSKY;
+	}
 	if ( shader.isSky ) {
 		shader.sort = SS_ENVIRONMENT;
 	}
@@ -2222,159 +3128,155 @@ static shader_t *FinishShader( void ) {
 		shader.sort = SS_DECAL;
 	}
 
+	shader.needsLGrid = qfalse;
+	shader.needsLSpherical = qfalse;
+
 	//
 	// set appropriate stage information
 	//
-	for ( stage = 0; stage < MAX_SHADER_STAGES; ) {
-		shaderStage_t *pStage = &stages[stage];
+	stage = 0;
+	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t *pStage = &unfoggedStages[stage];
 
 		if ( !pStage->active ) {
 			break;
 		}
 
-    // check for a missing texture
+		// check for a missing texture
 		if ( !pStage->bundle[0].image[0] ) {
 			ri.Printf( PRINT_WARNING, "Shader %s has a stage with no image\n", shader.name );
 			pStage->active = qfalse;
-			stage++;
 			continue;
 		}
 
-		//
-		// ditch this stage if it's detail and detail textures are disabled
-		//
-		if ( pStage->isDetail && !r_detailTextures->integer )
-		{
-			int index;
-			
-			for(index = stage + 1; index < MAX_SHADER_STAGES; index++)
-			{
-				if(!stages[index].active)
-					break;
-			}
-			
-			if(index < MAX_SHADER_STAGES)
-				memmove(pStage, pStage + 1, sizeof(*pStage) * (index - stage));
-			else
-			{
-				if(stage + 1 < MAX_SHADER_STAGES)
-					memmove(pStage, pStage + 1, sizeof(*pStage) * (index - stage - 1));
-				
-				Com_Memset(&stages[index - 1], 0, sizeof(*stages));
-			}
-			
-			continue;
+		if (pStage->rgbGen == CGEN_LIGHTING_GRID) {
+			shader.needsLGrid = qtrue;
+		} else if (pStage->rgbGen == CGEN_LIGHTING_SPHERICAL || pStage->rgbGen == CGEN_STATIC) {
+			shader.needsLSpherical = qtrue;
 		}
 
 		//
 		// default texture coordinate generation
 		//
-		if ( pStage->bundle[0].isLightmap ) {
-			if ( pStage->bundle[0].tcGen == TCGEN_BAD ) {
-				pStage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+		for (bundle = 0; bundle < 2; bundle++) {
+			if (pStage->bundle[bundle].isLightmap) {
+				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
+					pStage->bundle[bundle].tcGen = TCGEN_LIGHTMAP;
+				}
+				hasLightmapStage = qtrue;
 			}
-			hasLightmapStage = qtrue;
-		} else {
-			if ( pStage->bundle[0].tcGen == TCGEN_BAD ) {
-				pStage->bundle[0].tcGen = TCGEN_TEXTURE;
-			}
-		}
-
-
-    // not a true lightmap but we want to leave existing 
-    // behaviour in place and not print out a warning
-    //if (pStage->rgbGen == CGEN_VERTEX) {
-    //  vertexLightmap = qtrue;
-    //}
-
-
-
-		//
-		// determine sort order and fog color adjustment
-		//
-		if ( ( pStage->stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) ) &&
-			 ( stages[0].stateBits & ( GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS ) ) ) {
-			int blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
-			int blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
-
-			// fog color adjustment only works for blend modes that have a contribution
-			// that aproaches 0 as the modulate values aproach 0 --
-			// GL_ONE, GL_ONE
-			// GL_ZERO, GL_ONE_MINUS_SRC_COLOR
-			// GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA
-
-			// modulate, additive
-			if ( ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && ( blendDstBits == GLS_DSTBLEND_ONE ) ) ||
-				( ( blendSrcBits == GLS_SRCBLEND_ZERO ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR ) ) ) {
-				pStage->adjustColorsForFog = ACFF_MODULATE_RGB;
-			}
-			// strict blend
-			else if ( ( blendSrcBits == GLS_SRCBLEND_SRC_ALPHA ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA ) )
-			{
-				pStage->adjustColorsForFog = ACFF_MODULATE_ALPHA;
-			}
-			// premultiplied alpha
-			else if ( ( blendSrcBits == GLS_SRCBLEND_ONE ) && ( blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA ) )
-			{
-				pStage->adjustColorsForFog = ACFF_MODULATE_RGBA;
-			} else {
-				// we can't adjust this one correctly, so it won't be exactly correct in fog
-			}
-
-			// don't screw with sort order if this is a portal or environment
-			if ( !shader.sort ) {
-				// see through item, like a grill or grate
-				if ( pStage->stateBits & GLS_DEPTHMASK_TRUE ) {
-					shader.sort = SS_SEE_THROUGH;
-				} else {
-					shader.sort = SS_BLEND0;
+			else {
+				if (pStage->bundle[bundle].tcGen == TCGEN_BAD) {
+					pStage->bundle[bundle].tcGen = TCGEN_TEXTURE;
 				}
 			}
 		}
-		
-		stage++;
-	}
 
-	// there are times when you will need to manually apply a sort to
-	// opaque alpha tested shaders that have later blend passes
-	if ( !shader.sort ) {
-		shader.sort = SS_OPAQUE;
+		if (pStage->multitextureEnv && pStage->bundle[0].isLightmap) {
+			//
+			// exchange bundle
+			//
+			textureBundle_t tmpBundle = pStage->bundle[0];
+			pStage->bundle[0] = pStage->bundle[1];
+			pStage->bundle[1] = tmpBundle;
+		}
 	}
 
 	//
 	// if we are in r_vertexLight mode, never use a lightmap texture
 	//
-	if ( stage > 1 && ( (r_vertexLight->integer && !r_uiFullScreen->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) ) {
-		VertexLightingCollapse();
-		stage = 1;
-		hasLightmapStage = qfalse;
-	}
+	if (stage > 1)
+	{
+		if (r_vertexLight->integer) {
+			VertexLightingCollapse();
+			stage = 1;
+			hasLightmapStage = qfalse;
+		}
 
-	//
-	// look for multitexture potential
-	//
-	if ( stage > 1 && CollapseMultitexture() ) {
-		stage--;
-	}
-
-	if ( shader.lightmapIndex >= 0 && !hasLightmapStage ) {
-		if (vertexLightmap) {
-			ri.Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has VERTEX forced lightmap!\n", shader.name );
-		} else {
-			ri.Printf( PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name );
-  			shader.lightmapIndex = LIGHTMAP_NONE;
+		//
+		// look for multitexture potential
+		//
+		if (qglActiveTextureARB) {
+			CollapseMultitexture(&stage);
 		}
 	}
 
+	for (i = 0; i < stage; i++) {
+		int blendSrcBits, blendDstBits;
+
+		shaderStage_t* pStage = &unfoggedStages[i];
+		if (pStage->stateBits & (GLS_SRCBLEND_BITS | GLS_DSTBLEND_BITS))
+		{
+			blendSrcBits = pStage->stateBits & GLS_SRCBLEND_BITS;
+			blendDstBits = pStage->stateBits & GLS_DSTBLEND_BITS;
+			if (blendSrcBits == GLS_SRCBLEND_ONE && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_COLOR
+				|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE
+				|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_DST_COLOR && blendDstBits == GLS_DSTBLEND_ONE)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_BLACK;
+			}
+			else if (blendSrcBits == GLS_SRCBLEND_DST_COLOR && blendDstBits == GLS_DSTBLEND_ZERO
+					|| blendSrcBits == GLS_SRCBLEND_ZERO && blendDstBits == GLS_DSTBLEND_SRC_COLOR)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED | GLS_FOG_WHITE;
+			}
+			else if (blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA
+					|| blendSrcBits == GLS_SRCBLEND_ONE_MINUS_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_SRC_ALPHA
+					|| blendSrcBits == GLS_SRCBLEND_SRC_ALPHA && blendDstBits == GLS_DSTBLEND_ONE)
+			{
+				pStage->stateBits |= GLS_FOG_ENABLED;
+			}
+			else {
+				ri.Printf(PRINT_WARNING, "Shader '%s' stage# %i is unfoggable\n", shader.name, i + 1);
+			}
+
+			if (shader.sort == SS_BAD)
+			{
+				if (pStage->stateBits & GLS_DEPTHMASK_TRUE) {
+					shader.sort = SS_SEE_THROUGH;
+				}
+				else {
+					shader.sort = SS_BLEND0;
+				}
+			}
+		}
+		else {
+			pStage->stateBits |= GLS_FOG_ENABLED;
+
+			if (shader.sort == SS_BAD) {
+				shader.sort = SS_OPAQUE;
+			}
+		}
+
+		if (pStage->stateBits & GLS_MULTITEXTURE_ENV) {
+			pStage->stateBits &= ~GLS_FOG_ENABLED;
+		}
+	}
+
+	// fogonly shaders don't have any normal passes
+	if (shader.sort == SS_BAD) {
+		shader.sort = SS_OPAQUE;
+	}
+
+	if (shader.lightmapIndex >= 0 && !hasLightmapStage) {
+		ri.Printf(PRINT_DEVELOPER, "WARNING: shader '%s' has lightmap but no lightmap stage!\n", shader.name);
+		shader.lightmapIndex = LIGHTMAP_NONE;
+	}
 
 	//
 	// compute number of passes
 	//
-	shader.numUnfoggedPasses = stage;
+	shader.numUnfoggedPasses = 0;
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++) {
+		shaderStage_t* pStage = &unfoggedStages[stage];
+		if (!pStage->active) {
+			break;
+		}
 
-	// fogonly shaders don't have any normal passes
-	if (stage == 0 && !shader.isSky)
-		shader.sort = SS_FOG;
+		shader.numUnfoggedPasses++;
+	}
 
 	// determine which stage iterator function is appropriate
 	ComputeStageIteratorFunc();
@@ -2384,64 +3286,6 @@ static shader_t *FinishShader( void ) {
 
 //========================================================================================
 
-/*
-====================
-FindShaderInShaderText
-
-Scans the combined text description of all the shader files for
-the given shader name.
-
-return NULL if not found
-
-If found, it will return a valid shader
-=====================
-*/
-static char *FindShaderInShaderText( const char *shadername ) {
-
-	char *token, *p;
-
-	int i, hash;
-
-	hash = generateHashValue(shadername, MAX_SHADERTEXT_HASH);
-
-	if(shaderTextHashTable[hash])
-	{
-		for (i = 0; shaderTextHashTable[hash][i]; i++)
-		{
-			p = shaderTextHashTable[hash][i];
-			token = COM_ParseExt(&p, qtrue);
-		
-			if(!Q_stricmp(token, shadername))
-				return p;
-		}
-	}
-
-	p = s_shaderText;
-
-	if ( !p ) {
-		return NULL;
-	}
-
-	// look for label
-	while ( 1 ) {
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		if ( !Q_stricmp( token, shadername ) ) {
-			return p;
-		}
-		else {
-			// skip the definition
-			SkipBracedSection( &p, 0 );
-		}
-	}
-
-	return NULL;
-}
-
-
 /*
 ==================
 R_FindShaderByName
@@ -2451,9 +3295,9 @@ default shader if the real one can't be found.
 ==================
 */
 shader_t *R_FindShaderByName( const char *name ) {
-	char		strippedName[MAX_QPATH];
-	int			hash;
-	shader_t	*sh;
+	char			strippedName[MAX_QPATH];
+	int				hash;
+	shadertext_t	*sh;
 
 	if ( (name==NULL) || (name[0] == 0) ) {
 		return tr.defaultShader;
@@ -2461,7 +3305,7 @@ shader_t *R_FindShaderByName( const char *name ) {
 
 	COM_StripExtension(name, strippedName, sizeof(strippedName));
 
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
+	hash = generateHashValue(strippedName);
 
 	//
 	// see if the shader is already loaded
@@ -2473,14 +3317,13 @@ shader_t *R_FindShaderByName( const char *name ) {
 		// with that same strippedName a new default shader is created.
 		if (Q_stricmp(sh->name, strippedName) == 0) {
 			// match found
-			return sh;
+			return sh->shader;
 		}
 	}
 
 	return tr.defaultShader;
 }
 
-
 /*
 ===============
 R_FindShader
@@ -2493,25 +3336,26 @@ be defined for every single image used in the game, three default
 shader behaviors can be auto-created for any image:
 
 If lightmapIndex == LIGHTMAP_NONE, then the image will have
-dynamic diffuse lighting applied to it, as appropriate for most
+dynamic diffuse lighting applied to it, as apropriate for most
 entity skin surfaces.
 
 If lightmapIndex == LIGHTMAP_2D, then the image will be used
 for 2D rendering unless an explicit shader is found
 
 If lightmapIndex == LIGHTMAP_BY_VERTEX, then the image will use
-the vertex rgba modulate values, as appropriate for misc_model
+the vertex rgba modulate values, as apropriate for misc_model
 pre-lit surfaces.
 
 Other lightmapIndex values will have a lightmap stage created
-and src*dest blending applied with the texture, as appropriate for
+and src*dest blending applied with the texture, as apropriate for
 most world construction surfaces.
 
 ===============
 */
-shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage ) {
+shader_t* R_FindShader(const char* name, int lightmapIndex, qboolean mipRawImage, qboolean picmip, qboolean wrapx, qboolean wrapy) {
 	char		strippedName[MAX_QPATH];
-	int			hash;
+	char		fileName[MAX_QPATH];
+	int			i, j, hash;
 	char		*shaderText;
 	image_t		*image;
 	shader_t	*sh;
@@ -2530,29 +3374,59 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 		lightmapIndex = LIGHTMAP_BY_VERTEX;
 	}
 
-	COM_StripExtension(name, strippedName, sizeof(strippedName));
+	COM_StripExtension( name, strippedName, sizeof(strippedName));
 
-	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
+	hash = generateHashValue(strippedName);
 
 	//
 	// see if the shader is already loaded
 	//
-	for (sh = hashTable[hash]; sh; sh = sh->next) {
+	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
 		// NOTE: if there was no shader or image available with the name strippedName
 		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
 		// have to check all default shaders otherwise for every call to R_FindShader
 		// with that same strippedName a new default shader is created.
-		if ( (sh->lightmapIndex == lightmapIndex || sh->defaultShader) &&
-		     !Q_stricmp(sh->name, strippedName)) {
-			// match found
-			return sh;
+        if (!Q_stricmp(currentShader->name, strippedName))
+		{
+			// shader text found, but it has no shared assigned
+			break;
 		}
 	}
 
-	InitShader( strippedName, lightmapIndex );
+	if (currentShader)
+	{
+		for (sh = currentShader->shader; sh; sh = sh->next)
+		{
+			if (sh->lightmapIndex == lightmapIndex || sh == tr.defaultShader) {
+				return sh;
+			}
+		}
+	}
+	else
+	{
+		// create a new shader text
+		currentShader = AddShaderTextToHash(strippedName, hash);
+	}
 
-	// FIXME: set these "need" values appropriately
-	shader.needsNormal = qtrue;
+	// clear the global shader
+	Com_Memset( &shader, 0, sizeof( shader ) );
+    Com_Memset(&unfoggedStages, 0, sizeof(unfoggedStages));
+    Com_Memset(&texMods, 0, sizeof(texMods));
+
+    shader.sprite.scale = 1.0;
+    shader_noPicMip = qfalse;
+    shader_noMipMaps = qfalse;
+    shader_force32bit = qfalse;
+	Q_strncpyz(shader.name, strippedName, sizeof(shader.name));
+	shader.lightmapIndex = lightmapIndex;
+	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
+        for (j = 0; j < NUM_TEXTURE_BUNDLES; j++) {
+            unfoggedStages[i].bundle[j].texMods = texMods[i];
+		}
+	}
+
+	// FIXME: set these "need" values apropriately
+	shader.needsNormal = qfalse;
 	shader.needsST1 = qtrue;
 	shader.needsST2 = qtrue;
 	shader.needsColor = qtrue;
@@ -2560,47 +3434,44 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 	//
 	// attempt to define shader from an explicit parameter file
 	//
-	shaderText = FindShaderInShaderText( strippedName );
-	if ( shaderText ) {
+	if ( currentShader->text ) {
+		shaderText = currentShader->text;
 		// enable this when building a pak file to get a global list
 		// of all explicit shaders
 		if ( r_printShaders->integer ) {
 			ri.Printf( PRINT_ALL, "*SHADER* %s\n", name );
 		}
 
-		if ( !ParseShader( &shaderText ) ) {
+		if ( !ParseShader( &shaderText, picmip ) ) {
 			// had errors, so use default shader
 			shader.defaultShader = qtrue;
 		}
+
+		if (shader.lightmapIndex == LIGHTMAP_BY_VERTEX && !(shader.surfaceFlags & SURF_HINT)) {
+			unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
+		}
+
 		sh = FinishShader();
 		return sh;
 	}
 
-
 	//
 	// if not defined in the in-memory shader descriptions,
-	// look for a single supported image file
+	// look for a single TGA, BMP, or PCX
 	//
-	{
-		imgFlags_t flags;
+	Q_strncpyz( fileName, name, sizeof( fileName ) );
+	COM_DefaultExtension( fileName, sizeof( fileName ), ".tga" );
+    if (!haveClampToEdge) {
+        image = R_FindImageFileOld(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP, wrapy ? GL_REPEAT : GL_CLAMP);
+	}
+    else {
+        image = R_FindImageFileOld(fileName, mipRawImage, picmip, qfalse, wrapx ? GL_REPEAT : GL_CLAMP_TO_EDGE, wrapy ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+	}
 
-		flags = IMGFLAG_NONE;
-
-		if (mipRawImage)
-		{
-			flags |= IMGFLAG_MIPMAP | IMGFLAG_PICMIP;
-		}
-		else
-		{
-			flags |= IMGFLAG_CLAMPTOEDGE;
-		}
-
-		image = R_FindImageFile( name, IMGTYPE_COLORALPHA, flags );
-		if ( !image ) {
-			ri.Printf( PRINT_DEVELOPER, "Couldn't find image file for shader %s\n", name );
-			shader.defaultShader = qtrue;
-			return FinishShader();
-		}
+	if ( !image ) {
+		ri.Printf( PRINT_WARNING, "Couldn't find image for shader %s\n", name );
+		shader.defaultShader = qtrue;
+		return FinishShader();
 	}
 
 	//
@@ -2608,149 +3479,57 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 	//
 	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
 		// dynamic colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = image;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_LIGHTING_GRID;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
 		// explicit colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_EXACT_VERTEX;
-		stages[0].alphaGen = AGEN_SKIP;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = image;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_EXACT_VERTEX;
+		unfoggedStages[0].alphaGen = AGEN_SKIP;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
 		// GUI elements
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_VERTEX;
-		stages[0].alphaGen = AGEN_VERTEX;
-		stages[0].stateBits = GLS_DEPTHTEST_DISABLE |
+		unfoggedStages[0].bundle[0].image[0] = image;
+        unfoggedStages[0].active = qtrue;
+        unfoggedStages[0].force32bit = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_GLOBAL_COLOR;
+		unfoggedStages[0].alphaGen = AGEN_GLOBAL_ALPHA;
+		unfoggedStages[0].stateBits = GLS_DEPTHTEST_DISABLE |
 			  GLS_SRCBLEND_SRC_ALPHA |
 			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
 	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
 		// fullbright level
-		stages[0].bundle[0].image[0] = tr.whiteImage;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
+		unfoggedStages[1].bundle[0].image[0] = image;
+		unfoggedStages[1].active = qtrue;
+		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
+		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
 	} else {
 		// two pass lightmap
-		stages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		stages[0].bundle[0].isLightmap = qtrue;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
+		unfoggedStages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+		unfoggedStages[0].bundle[0].isLightmap = qtrue;
+		unfoggedStages[0].active = qtrue;
+		unfoggedStages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
 													// for identitylight
-		stages[0].stateBits = GLS_DEFAULT;
+		unfoggedStages[0].stateBits = GLS_DEFAULT;
 
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
+		unfoggedStages[1].bundle[0].image[0] = image;
+		unfoggedStages[1].active = qtrue;
+		unfoggedStages[1].rgbGen = CGEN_IDENTITY;
+		unfoggedStages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
 	}
 
 	return FinishShader();
 }
 
 
-qhandle_t RE_RegisterShaderFromImage(const char *name, int lightmapIndex, image_t *image, qboolean mipRawImage) {
-	int			hash;
-	shader_t	*sh;
-
-	hash = generateHashValue(name, FILE_HASH_SIZE);
-
-	// probably not necessary since this function
-	// only gets called from tr_font.c with lightmapIndex == LIGHTMAP_2D
-	// but better safe than sorry.
-	if ( lightmapIndex >= tr.numLightmaps ) {
-		lightmapIndex = LIGHTMAP_WHITEIMAGE;
-	}
-
-	//
-	// see if the shader is already loaded
-	//
-	for (sh=hashTable[hash]; sh; sh=sh->next) {
-		// NOTE: if there was no shader or image available with the name strippedName
-		// then a default shader is created with lightmapIndex == LIGHTMAP_NONE, so we
-		// have to check all default shaders otherwise for every call to R_FindShader
-		// with that same strippedName a new default shader is created.
-		if ( (sh->lightmapIndex == lightmapIndex || sh->defaultShader) &&
-			// index by name
-			!Q_stricmp(sh->name, name)) {
-			// match found
-			return sh->index;
-		}
-	}
-
-	InitShader( name, lightmapIndex );
-
-	// FIXME: set these "need" values appropriately
-	shader.needsNormal = qtrue;
-	shader.needsST1 = qtrue;
-	shader.needsST2 = qtrue;
-	shader.needsColor = qtrue;
-
-	//
-	// create the default shading commands
-	//
-	if ( shader.lightmapIndex == LIGHTMAP_NONE ) {
-		// dynamic colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_LIGHTING_DIFFUSE;
-		stages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_BY_VERTEX ) {
-		// explicit colors at vertexes
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_EXACT_VERTEX;
-		stages[0].alphaGen = AGEN_SKIP;
-		stages[0].stateBits = GLS_DEFAULT;
-	} else if ( shader.lightmapIndex == LIGHTMAP_2D ) {
-		// GUI elements
-		stages[0].bundle[0].image[0] = image;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_VERTEX;
-		stages[0].alphaGen = AGEN_VERTEX;
-		stages[0].stateBits = GLS_DEPTHTEST_DISABLE |
-			  GLS_SRCBLEND_SRC_ALPHA |
-			  GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
-	} else if ( shader.lightmapIndex == LIGHTMAP_WHITEIMAGE ) {
-		// fullbright level
-		stages[0].bundle[0].image[0] = tr.whiteImage;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY_LIGHTING;
-		stages[0].stateBits = GLS_DEFAULT;
-
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	} else {
-		// two pass lightmap
-		stages[0].bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
-		stages[0].bundle[0].isLightmap = qtrue;
-		stages[0].active = qtrue;
-		stages[0].rgbGen = CGEN_IDENTITY;	// lightmaps are scaled on creation
-													// for identitylight
-		stages[0].stateBits = GLS_DEFAULT;
-
-		stages[1].bundle[0].image[0] = image;
-		stages[1].active = qtrue;
-		stages[1].rgbGen = CGEN_IDENTITY;
-		stages[1].stateBits |= GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-	}
-
-	sh = FinishShader();
-  return sh->index; 
-}
-
-
 /* 
 ====================
 RE_RegisterShader
@@ -2770,7 +3549,7 @@ qhandle_t RE_RegisterShaderLightMap( const char *name, int lightmapIndex ) {
 		return 0;
 	}
 
-	sh = R_FindShader( name, lightmapIndex, qtrue );
+	sh = R_FindShader( name, lightmapIndex, qtrue, qfalse, qfalse, qfalse );
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -2784,7 +3563,6 @@ qhandle_t RE_RegisterShaderLightMap( const char *name, int lightmapIndex ) {
 	return sh->index;
 }
 
-
 /* 
 ====================
 RE_RegisterShader
@@ -2800,11 +3578,11 @@ qhandle_t RE_RegisterShader( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
-	sh = R_FindShader( name, LIGHTMAP_2D, qtrue );
+	sh = R_FindShader( name, LIGHTMAP_2D, qtrue, r_picmip->integer, qtrue, qtrue);
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -2830,11 +3608,11 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
 	shader_t	*sh;
 
 	if ( strlen( name ) >= MAX_QPATH ) {
-		ri.Printf( PRINT_ALL, "Shader name exceeds MAX_QPATH\n" );
+		ri.Printf(PRINT_ALL,  "Shader name exceeds MAX_QPATH\n" );
 		return 0;
 	}
 
-	sh = R_FindShader( name, LIGHTMAP_2D, qfalse );
+	sh = R_FindShader( name, LIGHTMAP_2D, qfalse, qfalse, qfalse, qfalse );
 
 	// we want to return 0 if the shader failed to
 	// load for some reason, but R_FindShader should
@@ -2848,6 +3626,54 @@ qhandle_t RE_RegisterShaderNoMip( const char *name ) {
 	return sh->index;
 }
 
+qhandle_t RE_RefreshShaderNoMip(const char* name) {
+	shader_t* sh;
+	char strippedName[64];
+	int hash;
+
+	if (!name || !*name) {
+		return 0;
+	}
+
+    COM_StripExtension(name, strippedName, sizeof(strippedName));
+
+	hash = generateHashValue(strippedName);
+
+	for (currentShader = hashTable[hash]; currentShader; currentShader = currentShader->next) {
+		if (!Q_stricmp(currentShader->name, strippedName)) {
+			if (currentShader) {
+				image_t* image;
+
+				sh = currentShader->shader;
+				image = sh->unfoggedStages[0]->bundle[0].image[0];
+				currentShader = NULL;
+
+				if (image) {
+					sh->unfoggedStages[0]->bundle[0].image[0] = R_RefreshImageFileOld(
+						image->imgName,
+						image->numMipmaps,
+						image->allowPicmip,
+						image->force32bit,
+						image->wrapClampModeX,
+						image->wrapClampModeY
+					);
+				}
+
+				return sh->index;
+			}
+
+			break;
+		}
+	}
+
+    sh = R_FindShader(name, -4, 0, 0, 0, 0);
+	if (sh->defaultShader) {
+		return 0;
+	}
+
+    return sh->index;
+}
+
 /*
 ====================
 R_GetShaderByHandle
@@ -2858,7 +3684,7 @@ it and returns a valid (possibly default) shader_t to be used internally.
 */
 shader_t *R_GetShaderByHandle( qhandle_t hShader ) {
 	if ( hShader < 0 ) {
-	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader );
+	  ri.Printf( PRINT_WARNING, "R_GetShaderByHandle: out of range hShader '%d'\n", hShader ); // bk: FIXME name
 		return tr.defaultShader;
 	}
 	if ( hShader >= tr.numShaders ) {
@@ -2885,6 +3711,8 @@ void	R_ShaderList_f (void) {
 
 	count = 0;
 	for ( i = 0 ; i < tr.numShaders ; i++ ) {
+		int stage;
+
 		if ( ri.Cmd_Argc() > 1 ) {
 			shader = tr.sortedShaders[i];
 		} else {
@@ -2898,15 +3726,19 @@ void	R_ShaderList_f (void) {
 		} else {
 			ri.Printf (PRINT_ALL, "  ");
 		}
-		if ( shader->multitextureEnv == GL_ADD ) {
-			ri.Printf( PRINT_ALL, "MT(a) " );
-		} else if ( shader->multitextureEnv == GL_MODULATE ) {
-			ri.Printf( PRINT_ALL, "MT(m) " );
-		} else if ( shader->multitextureEnv == GL_DECAL ) {
-			ri.Printf( PRINT_ALL, "MT(d) " );
-		} else {
-			ri.Printf( PRINT_ALL, "      " );
+
+		for (stage = 0; shader->unfoggedStages[stage] && shader->unfoggedStages[stage]->active; stage++) {
+			if (shader->unfoggedStages[stage]->multitextureEnv == GL_ADD ) {
+				ri.Printf( PRINT_ALL, "MT(a) " );
+			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_MODULATE ) {
+				ri.Printf( PRINT_ALL, "MT(m) " );
+			} else if (shader->unfoggedStages[stage]->multitextureEnv == GL_DECAL ) {
+				ri.Printf( PRINT_ALL, "MT(d) " );
+			} else {
+				ri.Printf( PRINT_ALL, "      " );
+			}
 		}
+
 		if ( shader->explicitlyDefined ) {
 			ri.Printf( PRINT_ALL, "E " );
 		} else {
@@ -2917,9 +3749,9 @@ void	R_ShaderList_f (void) {
 			ri.Printf( PRINT_ALL, "gen " );
 		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorSky ) {
 			ri.Printf( PRINT_ALL, "sky " );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitexture ) {
+		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorLightmappedMultitextureUnfogged ) {
 			ri.Printf( PRINT_ALL, "lmmt" );
-		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTexture ) {
+		} else if ( shader->optimalStageIteratorFunc == RB_StageIteratorVertexLitTextureUnfogged ) {
 			ri.Printf( PRINT_ALL, "vlt " );
 		} else {
 			ri.Printf( PRINT_ALL, "    " );
@@ -2936,6 +3768,7 @@ void	R_ShaderList_f (void) {
 	ri.Printf (PRINT_ALL, "------------------\n");
 }
 
+
 /*
 ====================
 ScanAndLoadShaderFiles
@@ -2947,155 +3780,89 @@ a single large text block that can be scanned for shader names
 #define	MAX_SHADER_FILES	4096
 static void ScanAndLoadShaderFiles( void )
 {
-	char **shaderFiles;
-	char *buffers[MAX_SHADER_FILES] = {0};
-	char *p;
-	int numShaderFiles;
-	int i;
-	char *oldp, *token, *hashMem, *textEnd;
-	int shaderTextHashTableSizes[MAX_SHADERTEXT_HASH], hash, size;
-	char shaderName[MAX_QPATH];
-	int shaderLine;
+    char** shaderFiles;
+    char* buffers[MAX_SHADER_FILES];
+    char* p;
+    int numShaders;
+    int i;
 
-	long sum = 0, summand;
-	// scan for shader files
-	shaderFiles = ri.FS_ListFiles( "scripts", ".shader", &numShaderFiles );
+    long sum = 0;
+    // scan for shader files
+    shaderFiles = ri.FS_ListFiles("scripts", ".shader", &numShaders);
 
-	if ( !shaderFiles || !numShaderFiles )
-	{
-		ri.Printf( PRINT_WARNING, "WARNING: no shader files found\n" );
+    if (!shaderFiles || !numShaders)
+    {
+        ri.Printf(PRINT_WARNING, "WARNING: no shader files found\n");
+        return;
+    }
+
+    if (numShaders > MAX_SHADER_FILES) {
+        numShaders = MAX_SHADER_FILES;
+    }
+
+    // load and parse shader files
+    for (i = 0; i < numShaders; i++)
+    {
+        char filename[MAX_QPATH];
+
+        Com_sprintf(filename, sizeof(filename), "scripts/%s", shaderFiles[i]);
+        ri.Printf(PRINT_ALL, "...loading '%s'\n", filename);
+        sum += ri.FS_ReadFile(filename, (void**)&buffers[i]);
+        if (!buffers[i]) {
+            ri.Error(ERR_DROP, "Couldn't load %s", filename);
+        }
+    }
+
+    // build single large buffer
+    s_shaderText = ri.Malloc(sum + numShaders * 2);
+    s_shaderText[0] = 0;
+
+    // free in reverse order, so the temp files are all dumped
+    for (i = numShaders - 1; i >= 0; i--) {
+        strcat(s_shaderText, "\n");
+        p = &s_shaderText[strlen(s_shaderText)];
+        strcat(s_shaderText, buffers[i]);
+        ri.FS_FreeFile(buffers[i]);
+        buffers[i] = p;
+    }
+
+    COM_Compress(s_shaderText);
+    // free up memory
+    ri.FS_FreeFileList(shaderFiles);
+}
+
+static void FindShadersInShaderText()
+{
+	char* p;
+	char* oldp;
+	char* token;
+
+	if (!s_shaderText) {
 		return;
 	}
 
-	if ( numShaderFiles > MAX_SHADER_FILES ) {
-		numShaderFiles = MAX_SHADER_FILES;
-	}
-
-	// load and parse shader files
-	for ( i = 0; i < numShaderFiles; i++ )
-	{
-		char filename[MAX_QPATH];
-
-		Com_sprintf( filename, sizeof( filename ), "scripts/%s", shaderFiles[i] );
-		ri.Printf( PRINT_DEVELOPER, "...loading '%s'\n", filename );
-		summand = ri.FS_ReadFile( filename, (void **)&buffers[i] );
-		
-		if ( !buffers[i] )
-			ri.Error( ERR_DROP, "Couldn't load %s", filename );
-		
-		// Do a simple check on the shader structure in that file to make sure one bad shader file cannot fuck up all other shaders.
-		p = buffers[i];
-		COM_BeginParseSession(filename);
-		while(1)
-		{
-			token = COM_ParseExt(&p, qtrue);
-			
-			if(!*token)
-				break;
-
-			Q_strncpyz(shaderName, token, sizeof(shaderName));
-			shaderLine = COM_GetCurrentParseLine();
-
-			token = COM_ParseExt(&p, qtrue);
-			if(token[0] != '{' || token[1] != '\0')
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing opening brace",
-							filename, shaderName, shaderLine);
-				if (token[0])
-				{
-					ri.Printf(PRINT_WARNING, " (found \"%s\" on line %d)", token, COM_GetCurrentParseLine());
-				}
-				ri.Printf(PRINT_WARNING, ".\n");
-				ri.FS_FreeFile(buffers[i]);
-				buffers[i] = NULL;
-				break;
-			}
-
-			if(!SkipBracedSection(&p, 1))
-			{
-				ri.Printf(PRINT_WARNING, "WARNING: Ignoring shader file %s. Shader \"%s\" on line %d missing closing brace.\n",
-							filename, shaderName, shaderLine);
-				ri.FS_FreeFile(buffers[i]);
-				buffers[i] = NULL;
-				break;
-			}
-		}
-			
-		
-		if (buffers[i])
-			sum += summand;		
-	}
-
-	// build single large buffer
-	s_shaderText = ri.Hunk_Alloc( sum + numShaderFiles*2, h_low );
-	s_shaderText[ 0 ] = '\0';
-	textEnd = s_shaderText;
- 
-	// free in reverse order, so the temp files are all dumped
-	for ( i = numShaderFiles - 1; i >= 0 ; i-- )
-	{
-		if ( !buffers[i] )
-			continue;
-
-		strcat( textEnd, buffers[i] );
-		strcat( textEnd, "\n" );
-		textEnd += strlen( textEnd );
-		ri.FS_FreeFile( buffers[i] );
-	}
-
-	COM_Compress( s_shaderText );
-
-	// free up memory
-	ri.FS_FreeFileList( shaderFiles );
-
-	Com_Memset(shaderTextHashTableSizes, 0, sizeof(shaderTextHashTableSizes));
-	size = 0;
-
 	p = s_shaderText;
-	// look for shader names
-	while ( 1 ) {
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
-		shaderTextHashTableSizes[hash]++;
-		size++;
-		SkipBracedSection(&p, 0);
-	}
-
-	size += MAX_SHADERTEXT_HASH;
-
-	hashMem = ri.Hunk_Alloc( size * sizeof(char *), h_low );
-
-	for (i = 0; i < MAX_SHADERTEXT_HASH; i++) {
-		shaderTextHashTable[i] = (char **) hashMem;
-		hashMem = ((char *) hashMem) + ((shaderTextHashTableSizes[i] + 1) * sizeof(char *));
-	}
-
-	Com_Memset(shaderTextHashTableSizes, 0, sizeof(shaderTextHashTableSizes));
-
-	p = s_shaderText;
-	// look for shader names
-	while ( 1 ) {
-		oldp = p;
-		token = COM_ParseExt( &p, qtrue );
-		if ( token[0] == 0 ) {
-			break;
-		}
-
-		hash = generateHashValue(token, MAX_SHADERTEXT_HASH);
-		shaderTextHashTable[hash][shaderTextHashTableSizes[hash]++] = oldp;
-
-		SkipBracedSection(&p, 0);
-	}
-
-	return;
+    // look for label
+    while (1) {
+        oldp = p;
+        token = COM_ParseExt(&p, qtrue);
+        if (token[0] == 0) {
+            break;
+        }
 
+        if (*token == '{')
+        {
+            p = oldp;
+            SkipBracedSection(&p, 0);
+        }
+        else
+        {
+            currentShader = AllocShaderText(token);
+            currentShader->text = p;
+        }
+    }
 }
 
-
 /*
 ====================
 CreateInternalShaders
@@ -3105,51 +3872,87 @@ static void CreateInternalShaders( void ) {
 	tr.numShaders = 0;
 
 	// init the default shader
-	InitShader( "<default>", LIGHTMAP_NONE );
-	stages[0].bundle[0].image[0] = tr.defaultImage;
-	stages[0].active = qtrue;
-	stages[0].stateBits = GLS_DEFAULT;
-	tr.defaultShader = FinishShader();
+	Com_Memset( &shader, 0, sizeof( shader ) );
+	Com_Memset( &unfoggedStages, 0, sizeof( unfoggedStages ) );
+
+	Q_strncpyz( shader.name, "<default>", sizeof( shader.name ) );
+	shader.lightmapIndex = LIGHTMAP_NONE;
+	unfoggedStages[0].bundle[0].image[0] = tr.defaultImage;
+	unfoggedStages[0].active = qtrue;
+	unfoggedStages[0].stateBits = GLS_DEFAULT;
+	currentShader = FindShaderText(shader.name);
+    tr.defaultShader = FinishShader();
+
+    // white shader
+    Q_strncpyz(shader.name, "<white>", sizeof(shader.name));
+    shader.lightmapIndex = LIGHTMAP_NONE;
+    unfoggedStages[0].bundle[0].image[0] = tr.whiteImage;
+    unfoggedStages[0].active = qtrue;
+    unfoggedStages[0].stateBits = GLS_DEFAULT;
+    currentShader = FindShaderText(shader.name);
+	FinishShader();
 
 	// shadow shader is just a marker
 	Q_strncpyz( shader.name, "<stencil shadow>", sizeof( shader.name ) );
-	shader.sort = SS_STENCIL_SHADOW;
+    shader.sort = SS_STENCIL_SHADOW;
+    shader.lightmapIndex = LIGHTMAP_NONE;
+	currentShader = FindShaderText(shader.name);
 	tr.shadowShader = FinishShader();
 }
 
 static void CreateExternalShaders( void ) {
-	tr.projectionShadowShader = R_FindShader( "projectionShadow", LIGHTMAP_NONE, qtrue );
-	tr.flareShader = R_FindShader( "flareShader", LIGHTMAP_NONE, qtrue );
+	tr.flareShader = R_FindShader( "flare", LIGHTMAP_NONE, qtrue, r_picmip->integer, qtrue, qtrue);
+}
 
-	// Hack to make fogging work correctly on flares. Fog colors are calculated
-	// in tr_flare.c already.
-	if(!tr.flareShader->defaultShader)
-	{
-		int index;
-		
-		for(index = 0; index < tr.flareShader->numUnfoggedPasses; index++)
-		{
-			tr.flareShader->stages[index]->adjustColorsForFog = ACFF_NONE;
-			tr.flareShader->stages[index]->stateBits |= GLS_DEPTHTEST_DISABLE;
-		}
+void R_StartupShaders()
+{
+    ri.Printf(PRINT_ALL, "Initializing Shaders\n");
+
+    currentShader = NULL;
+    s_shaderText = NULL;
+
+    Com_Memset(hashTable, 0, sizeof(hashTable));
+
+    ScanAndLoadShaderFiles();
+
+    FindShadersInShaderText();
+
+    R_SetupShaders();
+}
+
+void R_ShutdownShaders()
+{
+	shadertext_t* shader, * next;
+	int hash;
+
+	if (s_shaderText) {
+		ri.Free(s_shaderText);
 	}
 
-	tr.sunShader = R_FindShader( "sun", LIGHTMAP_NONE, qtrue );
+    for (hash = 0; hash < FILE_HASH_SIZE; hash++) {
+        for (shader = hashTable[hash]; shader; shader = next) {
+            next = shader->next;
+            ri.Free(shader);
+        }
+        hashTable[hash] = NULL;
+	}
 }
 
-/*
-==================
-R_InitShaders
-==================
-*/
-void R_InitShaders( void ) {
-	ri.Printf( PRINT_ALL, "Initializing Shaders\n" );
+void R_SetupShaders()
+{
+	shadertext_t* shader;
+	int hash;
 
-	Com_Memset(hashTable, 0, sizeof(hashTable));
+    ri.Printf(0, "Setting up Shaders\n");
+    currentShader = NULL;
+    for (hash = 0; hash < FILE_HASH_SIZE; ++hash)
+    {
+		for (shader = hashTable[hash]; shader; shader = shader->next) {
+			shader->shader = NULL;
+		}
+    }
 
-	CreateInternalShaders();
-
-	ScanAndLoadShaderFiles();
-
-	CreateExternalShaders();
+    CreateInternalShaders();
+    InitStaticShaders();
+    CreateExternalShaders();
 }
diff --git a/code/renderergl1/tr_shadows.c b/code/renderergl1/tr_shadows.c
index 13fbfdf7..5db94a28 100644
--- a/code/renderergl1/tr_shadows.c
+++ b/code/renderergl1/tr_shadows.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -44,20 +44,6 @@ typedef struct {
 static	edgeDef_t	edgeDefs[SHADER_MAX_VERTEXES][MAX_EDGE_DEFS];
 static	int			numEdgeDefs[SHADER_MAX_VERTEXES];
 static	int			facing[SHADER_MAX_INDEXES/3];
-static	vec3_t		shadowXyz[SHADER_MAX_VERTEXES];
-
-void R_AddEdgeDef( int i1, int i2, int facing ) {
-	int		c;
-
-	c = numEdgeDefs[ i1 ];
-	if ( c == MAX_EDGE_DEFS ) {
-		return;		// overflow
-	}
-	edgeDefs[ i1 ][ c ].i2 = i2;
-	edgeDefs[ i1 ][ c ].facing = facing;
-
-	numEdgeDefs[ i1 ]++;
-}
 
 void R_RenderShadowEdges( void ) {
 	int		i;
@@ -81,13 +67,13 @@ void R_RenderShadowEdges( void ) {
 
 		qglBegin( GL_TRIANGLE_STRIP );
 		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( shadowXyz[ i1 ] );
+		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i2 ] );
-		qglVertex3fv( shadowXyz[ i2 ] );
+		qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i3 ] );
-		qglVertex3fv( shadowXyz[ i3 ] );
+		qglVertex3fv( tess.xyz[ i3 + tess.numVertexes ] );
 		qglVertex3fv( tess.xyz[ i1 ] );
-		qglVertex3fv( shadowXyz[ i1 ] );
+		qglVertex3fv( tess.xyz[ i1 + tess.numVertexes ] );
 		qglEnd();
 	}
 #else
@@ -127,9 +113,9 @@ void R_RenderShadowEdges( void ) {
 			if ( hit[ 1 ] == 0 ) {
 				qglBegin( GL_TRIANGLE_STRIP );
 				qglVertex3fv( tess.xyz[ i ] );
-				qglVertex3fv( shadowXyz[ i ] );
+				qglVertex3fv( tess.xyz[ i + tess.numVertexes ] );
 				qglVertex3fv( tess.xyz[ i2 ] );
-				qglVertex3fv( shadowXyz[ i2 ] );
+				qglVertex3fv( tess.xyz[ i2 + tess.numVertexes ] );
 				qglEnd();
 				c_edges++;
 			} else {
@@ -140,6 +126,19 @@ void R_RenderShadowEdges( void ) {
 #endif
 }
 
+void R_AddEdgeDef(int i1, int i2, int facing) {
+	int		c;
+
+	c = numEdgeDefs[i1];
+	if (c == MAX_EDGE_DEFS) {
+		return;		// overflow
+	}
+	edgeDefs[i1][c].i2 = i2;
+	edgeDefs[i1][c].facing = facing;
+
+	numEdgeDefs[i1]++;
+}
+
 /*
 =================
 RB_ShadowTessEnd
@@ -156,7 +155,11 @@ void RB_ShadowTessEnd( void ) {
 	int		i;
 	int		numTris;
 	vec3_t	lightDir;
-	GLboolean rgba[4];
+
+	// we can only do this if we have enough space in the vertex buffers
+	if ( tess.numVertexes >= SHADER_MAX_VERTEXES / 2 ) {
+		return;
+	}
 
 	if ( glConfig.stencilBits < 4 ) {
 		return;
@@ -166,7 +169,7 @@ void RB_ShadowTessEnd( void ) {
 
 	// project vertexes away from light direction
 	for ( i = 0 ; i < tess.numVertexes ; i++ ) {
-		VectorMA( tess.xyz[i], -512, lightDir, shadowXyz[i] );
+		VectorMA( tess.xyz[i], -512, lightDir, tess.xyz[i+tess.numVertexes] );
 	}
 
 	// decide which triangles face the light
@@ -207,31 +210,141 @@ void RB_ShadowTessEnd( void ) {
 	// draw the silhouette edges
 
 	GL_Bind( tr.whiteImage );
+	qglEnable( GL_CULL_FACE );
 	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
 	qglColor3f( 0.2f, 0.2f, 0.2f );
 
 	// don't write to the color buffer
-	qglGetBooleanv(GL_COLOR_WRITEMASK, rgba);
 	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
 
 	qglEnable( GL_STENCIL_TEST );
 	qglStencilFunc( GL_ALWAYS, 1, 255 );
 
-	GL_Cull( CT_BACK_SIDED );
-	qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+	// mirrors have the culling order reversed
+	if ( backEnd.viewParms.isMirror ) {
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
 
-	R_RenderShadowEdges();
+		R_RenderShadowEdges();
 
-	GL_Cull( CT_FRONT_SIDED );
-	qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
 
-	R_RenderShadowEdges();
+		R_RenderShadowEdges();
+	} else {
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	}
 
 
 	// reenable writing to the color buffer
-	qglColorMask(rgba[0], rgba[1], rgba[2], rgba[3]);
+	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
 }
 
+/*
+=================
+RB_ComputeShadowVolume
+
+=================
+*/
+void RB_ComputeShadowVolume() {
+    int i;
+    int numTris;
+    vec3_t lightDir;
+
+    if (r_shadows->integer != 3 || glConfig.stencilBits < 8) {
+        return;
+    }
+
+    VectorSet(lightDir, -2.0, 1.5, 1.0);
+
+    // project vertexes away from light direction
+    for (i = 0; i < tess.numVertexes; i++) {
+        VectorMA(tess.xyz[i], -512, lightDir, tess.xyz[i + tess.numVertexes]);
+    }
+
+    // decide which triangles face the light
+    Com_Memset(numEdgeDefs, 0, 4 * tess.numVertexes);
+
+    numTris = tess.numIndexes / 3;
+    for (i = 0; i < numTris; i++) {
+        int		i1, i2, i3;
+        vec3_t	d1, d2, normal;
+        float* v1, * v2, * v3;
+        float	d;
+
+        i1 = tess.indexes[i * 3 + 0];
+        i2 = tess.indexes[i * 3 + 1];
+        i3 = tess.indexes[i * 3 + 2];
+
+        v1 = tess.xyz[i1];
+        v2 = tess.xyz[i2];
+        v3 = tess.xyz[i3];
+
+        VectorSubtract(v2, v1, d1);
+        VectorSubtract(v3, v1, d2);
+        CrossProduct(d1, d2, normal);
+
+        d = DotProduct(normal, lightDir);
+        if (d > 0) {
+            facing[i] = 1;
+        } else {
+            facing[i] = 0;
+        }
+
+        // create the edges
+        R_AddEdgeDef(i1, i2, facing[i]);
+        R_AddEdgeDef(i2, i3, facing[i]);
+        R_AddEdgeDef(i3, i1, facing[i]);
+    }
+
+	// draw the silhouette edges
+
+	GL_Bind( tr.whiteImage );
+	qglEnable( GL_CULL_FACE );
+	GL_State( GLS_SRCBLEND_ONE | GLS_DSTBLEND_ZERO );
+	qglColor3f( 0.2f, 0.2f, 0.2f );
+
+	// don't write to the color buffer
+	qglColorMask( GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE );
+
+	qglEnable( GL_STENCIL_TEST );
+	qglStencilFunc( GL_ALWAYS, 1, 255 );
+
+	// mirrors have the culling order reversed
+	if ( backEnd.viewParms.isMirror ) {
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	} else {
+		qglCullFace( GL_BACK );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_INCR );
+
+		R_RenderShadowEdges();
+
+		qglCullFace( GL_FRONT );
+		qglStencilOp( GL_KEEP, GL_KEEP, GL_DECR );
+
+		R_RenderShadowEdges();
+	}
+
+
+	// reenable writing to the color buffer
+	qglColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE );
+}
 
 /*
 =================
@@ -254,7 +367,7 @@ void RB_ShadowFinish( void ) {
 	qglStencilFunc( GL_NOTEQUAL, 0, 255 );
 
 	qglDisable (GL_CLIP_PLANE0);
-	GL_Cull( CT_TWO_SIDED );
+	qglDisable (GL_CULL_FACE);
 
 	GL_Bind( tr.whiteImage );
 
@@ -276,50 +389,3 @@ void RB_ShadowFinish( void ) {
 	qglColor4f(1,1,1,1);
 	qglDisable( GL_STENCIL_TEST );
 }
-
-
-/*
-=================
-RB_ProjectionShadowDeform
-
-=================
-*/
-void RB_ProjectionShadowDeform( void ) {
-	float	*xyz;
-	int		i;
-	float	h;
-	vec3_t	ground;
-	vec3_t	light;
-	float	groundDist;
-	float	d;
-	vec3_t	lightDir;
-
-	xyz = ( float * ) tess.xyz;
-
-	ground[0] = backEnd.or.axis[0][2];
-	ground[1] = backEnd.or.axis[1][2];
-	ground[2] = backEnd.or.axis[2][2];
-
-	groundDist = backEnd.or.origin[2] - backEnd.currentEntity->e.shadowPlane;
-
-	VectorCopy( backEnd.currentEntity->lightDir, lightDir );
-	d = DotProduct( lightDir, ground );
-	// don't let the shadows get too long or go negative
-	if ( d < 0.5 ) {
-		VectorMA( lightDir, (0.5 - d), ground, lightDir );
-		d = DotProduct( lightDir, ground );
-	}
-	d = 1.0 / d;
-
-	light[0] = lightDir[0] * d;
-	light[1] = lightDir[1] * d;
-	light[2] = lightDir[2] * d;
-
-	for ( i = 0; i < tess.numVertexes; i++, xyz += 4 ) {
-		h = DotProduct( xyz, ground ) + groundDist;
-
-		xyz[0] -= light[0] * h;
-		xyz[1] -= light[1] * h;
-		xyz[2] -= light[2] * h;
-	}
-}
diff --git a/code/renderergl1/tr_sky.c b/code/renderergl1/tr_sky.c
index 1d12e924..6da4a80d 100644
--- a/code/renderergl1/tr_sky.c
+++ b/code/renderergl1/tr_sky.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -269,7 +269,7 @@ void RB_ClipSkyPolygons( shaderCommands_t *input )
 		for (j = 0 ; j < 3 ; j++) 
 		{
 			VectorSubtract( input->xyz[input->indexes[i+j]],
-							backEnd.viewParms.or.origin, 
+							backEnd.viewParms.ori.origin, 
 							p[j] );
 		}
 		ClipSkyPolygon( 3, p[0], 0 );
@@ -467,7 +467,7 @@ static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean ad
 	{
 		for ( s = mins[0]+HALF_SKY_SUBDIVISIONS; s <= maxs[0]+HALF_SKY_SUBDIVISIONS; s++ )
 		{
-			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.or.origin, tess.xyz[tess.numVertexes] );
+			VectorAdd( s_skyPoints[t][s], backEnd.viewParms.ori.origin, tess.xyz[tess.numVertexes] );
 			tess.texCoords[tess.numVertexes][0][0] = s_skyTexCoords[t][s][0];
 			tess.texCoords[tess.numVertexes][0][1] = s_skyTexCoords[t][s][1];
 
@@ -475,7 +475,7 @@ static void FillCloudySkySide( const int mins[2], const int maxs[2], qboolean ad
 
 			if ( tess.numVertexes >= SHADER_MAX_VERTEXES )
 			{
-				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()" );
+				ri.Error( ERR_DROP, "SHADER_MAX_VERTEXES hit in FillCloudySkySide()\n" );
 			}
 		}
 	}
@@ -553,10 +553,10 @@ static void FillCloudBox( const shader_t *shader, int stage )
 			continue;
 		}
 
-		sky_mins_subd[0] = ri.ftol(sky_mins[0][i] * HALF_SKY_SUBDIVISIONS);
-		sky_mins_subd[1] = ri.ftol(sky_mins[1][i] * HALF_SKY_SUBDIVISIONS);
-		sky_maxs_subd[0] = ri.ftol(sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS);
-		sky_maxs_subd[1] = ri.ftol(sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS);
+		sky_mins_subd[0] = myftol( sky_mins[0][i] * HALF_SKY_SUBDIVISIONS );
+		sky_mins_subd[1] = myftol( sky_mins[1][i] * HALF_SKY_SUBDIVISIONS );
+		sky_maxs_subd[0] = myftol( sky_maxs[0][i] * HALF_SKY_SUBDIVISIONS );
+		sky_maxs_subd[1] = myftol( sky_maxs[1][i] * HALF_SKY_SUBDIVISIONS );
 
 		if ( sky_mins_subd[0] < -HALF_SKY_SUBDIVISIONS ) 
 			sky_mins_subd[0] = -HALF_SKY_SUBDIVISIONS;
@@ -618,14 +618,14 @@ void R_BuildCloudData( shaderCommands_t *input )
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
 
-	if ( shader->sky.cloudHeight )
+	if ( input->shader->sky.cloudHeight )
 	{
 		for ( i = 0; i < MAX_SHADER_STAGES; i++ )
 		{
 			if ( !tess.xstages[i] ) {
 				break;
 			}
-			FillCloudBox( shader, i );
+			FillCloudBox( input->shader, i );
 		}
 	}
 }
@@ -696,21 +696,23 @@ void R_InitSkyTexCoords( float heightCloud )
 /*
 ** RB_DrawSun
 */
-void RB_DrawSun( float scale, shader_t *shader ) {
+void RB_DrawSun( void ) {
 	float		size;
 	float		dist;
 	vec3_t		origin, vec1, vec2;
-	byte		sunColor[4] = { 255, 255, 255, 255 };
+	vec3_t		temp;
 
 	if ( !backEnd.skyRenderedThisView ) {
 		return;
 	}
-
+	if ( !r_drawSun->integer ) {
+		return;
+	}
 	qglLoadMatrixf( backEnd.viewParms.world.modelMatrix );
-	qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);
+	qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
 
 	dist = 	backEnd.viewParms.zFar / 1.75;		// div sqrt(3)
-	size = dist * scale;
+	size = dist * 0.4;
 
 	VectorScale( tr.sunDirection, dist, origin );
 	PerpendicularVector( vec1, tr.sunDirection );
@@ -722,9 +724,58 @@ void RB_DrawSun( float scale, shader_t *shader ) {
 	// farthest depth range
 	qglDepthRange( 1.0, 1.0 );
 
-	RB_BeginSurface( shader, 0 );
+	// FIXME: use quad stamp
+	RB_BeginSurface( tr.sunShader );
+		VectorCopy( origin, temp );
+		VectorSubtract( temp, vec1, temp );
+		VectorSubtract( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 0;
+		tess.texCoords[tess.numVertexes][0][1] = 0;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
 
-	RB_AddQuadStamp(origin, vec1, vec2, sunColor);
+		VectorCopy( origin, temp );
+		VectorAdd( temp, vec1, temp );
+		VectorSubtract( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 0;
+		tess.texCoords[tess.numVertexes][0][1] = 1;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		VectorCopy( origin, temp );
+		VectorAdd( temp, vec1, temp );
+		VectorAdd( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 1;
+		tess.texCoords[tess.numVertexes][0][1] = 1;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		VectorCopy( origin, temp );
+		VectorSubtract( temp, vec1, temp );
+		VectorAdd( temp, vec2, temp );
+		VectorCopy( temp, tess.xyz[tess.numVertexes] );
+		tess.texCoords[tess.numVertexes][0][0] = 1;
+		tess.texCoords[tess.numVertexes][0][1] = 0;
+		tess.vertexColors[tess.numVertexes][0] = 255;
+		tess.vertexColors[tess.numVertexes][1] = 255;
+		tess.vertexColors[tess.numVertexes][2] = 255;
+		tess.numVertexes++;
+
+		tess.indexes[tess.numIndexes++] = 0;
+		tess.indexes[tess.numIndexes++] = 1;
+		tess.indexes[tess.numIndexes++] = 2;
+		tess.indexes[tess.numIndexes++] = 0;
+		tess.indexes[tess.numIndexes++] = 2;
+		tess.indexes[tess.numIndexes++] = 3;
 
 	RB_EndSurface();
 
@@ -745,7 +796,7 @@ Other things could be stuck in here, like birds in the sky, etc
 ================
 */
 void RB_StageIteratorSky( void ) {
-	if ( r_fastsky->integer ) {
+	if ( r_fastsky->integer || tr.farclip ) {
 		return;
 	}
 
@@ -769,8 +820,7 @@ void RB_StageIteratorSky( void ) {
 		
 		qglPushMatrix ();
 		GL_State( 0 );
-		GL_Cull( CT_FRONT_SIDED );
-		qglTranslatef (backEnd.viewParms.or.origin[0], backEnd.viewParms.or.origin[1], backEnd.viewParms.or.origin[2]);
+		qglTranslatef (backEnd.viewParms.ori.origin[0], backEnd.viewParms.ori.origin[1], backEnd.viewParms.ori.origin[2]);
 
 		DrawSkyBox( tess.shader );
 
diff --git a/code/renderergl1/tr_sky_portal.cpp b/code/renderergl1/tr_sky_portal.cpp
new file mode 100644
index 00000000..02ca1a5c
--- /dev/null
+++ b/code/renderergl1/tr_sky_portal.cpp
@@ -0,0 +1,254 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sky_portal.cpp: sky portal
+
+#include "tr_local.h"
+
+/*
+=================
+R_Sky_Init
+
+=================
+*/
+void R_Sky_Init()
+{
+    tr.viewParms.isPortalSky = qfalse;
+    tr.portalsky.numSurfs    = 0;
+}
+
+/*
+=================
+R_Sky_Reset
+
+=================
+*/
+void R_Sky_Reset()
+{
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    tr.portalsky.mins[0]  = 8192.0;
+    tr.portalsky.mins[1]  = 8192.0;
+    tr.portalsky.mins[2]  = 8192.0;
+    tr.portalsky.maxs[0]  = -8192.0;
+    tr.portalsky.maxs[1]  = -8192.0;
+    tr.portalsky.maxs[2]  = -8192.0;
+    tr.portalsky.cntNode  = 0;
+    tr.portalsky.numSurfs = 0;
+}
+
+/*
+=================
+R_Sky_AddSurf
+
+=================
+*/
+void R_Sky_AddSurf(msurface_t *surf)
+{
+    if (tr.viewParms.isPortalSky) {
+        static int last_sky_warning = 0;
+
+        if (tr.refdef.time - 1000 > last_sky_warning) {
+            ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
+            last_sky_warning = tr.refdef.time;
+        }
+
+        return;
+    }
+
+    if (tr.portalsky.numSurfs < 32) {
+        tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
+    }
+
+    if (tr.portalsky.cntNode) {
+        int i;
+
+        for (i = 0; i < 3; i++) {
+            if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
+                tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
+            }
+
+            if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
+                tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
+            }
+        }
+    }
+}
+
+/*
+=================
+R_Sky_Render
+
+=================
+*/
+void R_Sky_Render()
+{
+    int         i;
+    viewParms_t newParms, oldParms;
+    mnode_t    *leaf;
+
+    if (!tr.portalsky.numSurfs) {
+        return;
+    }
+
+    if (!tr.refdef.sky_portal) {
+        return;
+    }
+
+    if (tr.skyRendered) {
+        // already rendered
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    for (i = 0; i < tr.portalsky.numSurfs; i++) {
+        if (!SurfIsOffscreen(
+                (const srfSurfaceFace_t *)tr.portalsky.skySurfs[i]->data,
+                tr.portalsky.skySurfs[i]->shader,
+                ENTITYNUM_WORLD
+            )) {
+            break;
+        }
+    }
+
+    if (i == tr.portalsky.numSurfs) {
+        return;
+    }
+
+    oldParms = tr.viewParms;
+    newParms = tr.viewParms;
+
+    if (r_skyportal->integer) {
+        if (sscanf(
+                r_skyportal_origin->string,
+                "%f %f %f",
+                &newParms.ori.origin[0],
+                &newParms.ori.origin[1],
+                &newParms.ori.origin[2]
+            )
+            != 3) {
+            ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
+            return;
+        }
+    } else {
+        VectorCopy(tr.refdef.sky_origin, newParms.ori.origin);
+        MatrixMultiply(newParms.ori.axis, tr.refdef.sky_axis, newParms.ori.axis);
+    }
+
+    VectorCopy(newParms.ori.origin, newParms.pvsOrigin);
+    newParms.isPortalSky       = qtrue;
+    newParms.farplane_distance = tr.refdef.skybox_farplane;
+    newParms.renderTerrain     = tr.refdef.render_terrain;
+
+    if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
+        newParms.farplane_bias = 0.0;
+    } else {
+        newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
+    }
+
+    leaf = R_PointInLeaf(newParms.pvsOrigin);
+    if (leaf) {
+        R_RenderView(&newParms);
+    }
+
+    tr.viewParms = oldParms;
+
+    tr.portalsky.numSurfs = 0;
+    tr.skyRendered        = qtrue;
+
+    R_RotateForViewer();
+    R_SetupFrustum();
+}
+
+/*
+=================
+R_Sky_ChangeFrustum
+
+=================
+*/
+void R_Sky_ChangeFrustum()
+{
+    cplane_t *frust;
+    int       i;
+    vec3_t    bounds[2];
+    vec3_t    origin;
+    cplane_t  abouts[4];
+
+    VectorCopy(tr.portalsky.mins, bounds[0]);
+    VectorCopy(tr.portalsky.maxs, bounds[1]);
+    VectorCopy(tr.viewParms.ori.origin, origin);
+
+    VectorCopy(tr.viewParms.ori.axis[2], abouts[0].normal);
+    VectorNegate(tr.viewParms.ori.axis[2], abouts[1].normal);
+    VectorCopy(tr.viewParms.ori.axis[1], abouts[2].normal);
+    VectorNegate(tr.viewParms.ori.axis[1], abouts[3].normal);
+
+    for (i = 0; i < 4; i++) {
+        cplane_t out;
+        int      i1;
+        float    leastfov = 99999;
+
+        frust = &tr.viewParms.frustum[i];
+
+        abouts[i].dist = DotProduct(tr.viewParms.ori.origin, abouts[i].normal);
+        CrossProduct(frust->normal, abouts[i].normal, out.normal);
+
+        for (i1 = 0; i1 < 8; i1++) {
+            vec3_t point;
+            vec_t  distFromFrustum;
+            float  angle;
+            int    i2;
+
+            for (i2 = 0; i2 < 3; i2++) {
+                point[i2] = bounds[i1 % 3][i2];
+            }
+
+            VectorSubtract(point, origin, point);
+            distFromFrustum = DotProduct(point, frust->normal);
+            if (distFromFrustum <= 0) {
+                break;
+            }
+
+            angle = atan2(DotProduct(point, out.normal), distFromFrustum);
+            if (angle >= 0) {
+                angle = RAD2DEG(angle);
+                if (leastfov > angle) {
+                    leastfov = angle;
+                }
+            }
+        }
+
+        if (leastfov > 0 && leastfov < 180) {
+            RotatePointAroundVector(frust->normal, abouts[i].normal, frust->normal, leastfov);
+            VectorNormalize(frust->normal);
+
+            frust->type = PLANE_NON_AXIAL;
+            frust->dist = DotProduct(origin, frust->normal);
+            SetPlaneSignbits(frust);
+        }
+    }
+}
diff --git a/code/renderergl1/tr_sphere_shade.cpp b/code/renderergl1/tr_sphere_shade.cpp
new file mode 100644
index 00000000..baf1bec2
--- /dev/null
+++ b/code/renderergl1/tr_sphere_shade.cpp
@@ -0,0 +1,1454 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sphere_shade.cpp -- sphere shade
+
+#include "tr_local.h"
+
+typedef struct gatheredLight_s {
+    spherel_t       *pLight;
+    float            fIntensity;
+    gatheredLight_s *pPrev;
+    gatheredLight_s *pNext;
+} gatheredLight_t;
+
+vec3_t          spheredef[6];
+suninfo_t       s_sun;
+static vec3_t   ambientlight;
+static qboolean bEntityOverbright;
+static int      iEntityLightingMax;
+static int      light_reference_count = 0;
+
+const float one_half_root  = 0.70710678118654752440084436210485f;
+const float one_third_root = 0.57735026918962576450914878050196f;
+
+static vec3_t offsets[26] = {
+    {1.0,             0.0,             0.0            },
+    {-1.0,            0.0,             0.0            },
+    {0.0,             1.0,             0.0            },
+    {0.0,             -1.0,            0.0            },
+    {0.0,             0.0,             1.0            },
+    {0.0,             0.0,             -1.0           },
+    {one_half_root,   one_half_root,   0.0            },
+    {one_half_root,   -one_half_root,  0.0            },
+    {-one_half_root,  one_half_root,   0.0            },
+    {-one_half_root,  -one_half_root,  0.0            },
+    {one_half_root,   0.0,             one_half_root  },
+    {one_half_root,   0.0,             -one_half_root },
+    {-one_half_root,  0.0,             one_half_root  },
+    {-one_half_root,  0.0,             -one_half_root },
+    {0.0,             one_half_root,   one_half_root  },
+    {0.0,             one_half_root,   -one_half_root },
+    {0.0,             -one_half_root,  one_half_root  },
+    {0.0,             -one_half_root,  -one_half_root },
+    {one_third_root,  one_third_root,  one_third_root },
+    {one_third_root,  one_third_root,  -one_third_root},
+    {one_third_root,  -one_third_root, one_third_root },
+    {one_third_root,  -one_third_root, -one_third_root},
+    {-one_third_root, one_third_root,  one_third_root },
+    {-one_third_root, one_third_root,  -one_third_root},
+    {-one_third_root, -one_third_root, one_third_root },
+    {-one_third_root, -one_third_root, -one_third_root}
+};
+
+int compare_light_intensities(const void *p1, const void *p2)
+{
+    return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((const reallightinfo_t *)p1)->fIntensity;
+}
+
+static void RB_OptimizeLights()
+{
+    static int iCubeBuildInfo[24][9] = {
+        {0, 1, 2, 1,  1,  0, 6,  10, 18},
+        {0, 1, 2, 1,  -1, 0, 6,  11, 19},
+        {0, 1, 2, -1, 1,  0, 7,  10, 20},
+        {0, 1, 2, -1, -1, 0, 7,  11, 21},
+        {0, 1, 2, -1, -1, 1, 8,  12, 22},
+        {0, 1, 2, -1, 1,  1, 8,  13, 23},
+        {0, 1, 2, 1,  -1, 1, 9,  12, 24},
+        {0, 1, 2, 1,  1,  1, 9,  13, 25},
+        {1, 0, 2, 1,  1,  2, 6,  14, 18},
+        {1, 0, 2, 1,  -1, 2, 6,  15, 19},
+        {1, 0, 2, -1, -1, 3, 7,  16, 20},
+        {1, 0, 2, -1, 1,  3, 7,  17, 21},
+        {1, 0, 2, -1, 1,  2, 8,  14, 22},
+        {1, 0, 2, -1, -1, 2, 8,  15, 23},
+        {1, 0, 2, 1,  -1, 3, 9,  16, 24},
+        {1, 0, 2, 1,  1,  3, 9,  17, 25},
+        {2, 1, 0, 1,  1,  4, 14, 10, 18},
+        {2, 1, 0, -1, -1, 5, 15, 11, 19},
+        {2, 1, 0, -1, 1,  4, 16, 10, 20},
+        {2, 1, 0, 1,  -1, 5, 17, 11, 21},
+        {2, 1, 0, 1,  -1, 4, 14, 12, 22},
+        {2, 1, 0, -1, 1,  5, 15, 13, 23},
+        {2, 1, 0, -1, -1, 4, 16, 12, 24},
+        {2, 1, 0, 1,  1,  5, 17, 13, 25}
+    };
+    int    i, j;
+    int    nCubeMapLights;
+    float  fMaxIntensity;
+    vec3_t cubecolor[26];
+    vec3_t colorout;
+    float(*cube)[3][4];
+    reallightinfo_t *pLight;
+
+    nCubeMapLights = 0;
+
+    // FIXME: re-enable when cubemap light is fixed
+#if 0
+    if (backEnd.currentSphere->numRealLights > 2) {
+        qsort(
+            backEnd.currentSphere->light,
+            backEnd.currentSphere->numRealLights,
+            sizeof(reallightinfo_t),
+            compare_light_intensities
+        );
+
+        for (i = 0; i < backEnd.currentSphere->numRealLights && i < r_entlight_maxcalc->integer; i++) {
+            pLight = &backEnd.currentSphere->light[i];
+
+            if (pLight->fIntensity < r_entlight_cubelevel->value
+                || pLight->fIntensity * r_entlight_cubefraction->value > pLight->fIntensity) {
+                break;
+            }
+        }
+
+        nCubeMapLights = backEnd.currentSphere->numRealLights - i;
+        if (nCubeMapLights <= 1) {
+            nCubeMapLights = 0;
+        }
+    }
+#endif
+
+    backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        for (i = 0; i < 26; i++) {
+            float  fDot;
+            vec3_t v;
+
+            colorout[0] = backEnd.currentSphere->ambient.level[0];
+            colorout[1] = backEnd.currentSphere->ambient.level[1];
+            colorout[2] = backEnd.currentSphere->ambient.level[2];
+
+            for (j = backEnd.currentSphere->numRealLights - nCubeMapLights; j < backEnd.currentSphere->numRealLights;
+                 j++) {
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_SPOT:
+                    {
+                        fDot = DotProduct(pLight->vDirection, offsets[i]);
+                        if (fDot > 0) {
+                            float fProjSquared;
+                            float fDistSquared;
+
+                            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                            fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                            fDistSquared  = VectorLengthSquared(v);
+                            fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                            if (fMaxIntensity > 0) {
+                                fDot /= fDistSquared;
+                                if (fMaxIntensity < 1) {
+                                    fDot *= fMaxIntensity;
+                                }
+
+                                VectorMA(colorout, fDot, pLight->color, colorout);
+                            }
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        float fDistSquared;
+
+                        VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                        fDistSquared = VectorLengthSquared(v);
+
+                        fDot /= fDistSquared;
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                    fDot = DotProduct(v, offsets[i]);
+                    if (fDot > 0) {
+                        fDot /= VectorLengthSquared(v);
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                default:
+                    assert(!"unhandled light type");
+                    break;
+                }
+            }
+
+            cubecolor[i][0] = Q_min(colorout[0], 255);
+            cubecolor[i][1] = Q_min(colorout[1], 255);
+            cubecolor[i][2] = Q_min(colorout[2], 255);
+        }
+
+        cube = backEnd.currentSphere->cubemap;
+
+        for (i = 0; i < 24; i++) {
+            for (j = 0; j < 3; j++) {
+                vec4_t f;
+
+                f[0] = cubecolor[iCubeBuildInfo[i][5]][j];
+                f[1] = cubecolor[iCubeBuildInfo[i][6]][j];
+                f[2] = cubecolor[iCubeBuildInfo[i][7]][j];
+                f[3] = cubecolor[iCubeBuildInfo[i][8]][j];
+
+                cube[i][j][0] = f[0];
+                cube[i][j][1] = (f[1] - f[0]) * iCubeBuildInfo[i][3];
+                cube[i][j][2] = (f[2] - f[0]) * iCubeBuildInfo[i][4];
+                cube[i][j][3] = (f[0] - f[1] - f[2] + f[3]) * iCubeBuildInfo[i][3] * iCubeBuildInfo[i][4];
+            }
+        }
+
+        backEnd.currentSphere->numRealLights -= nCubeMapLights;
+    }
+
+    for (i = 0; i < backEnd.currentSphere->numRealLights; i++) {
+        float  fDistParallel;
+        float  fDistPerp;
+        float  fDistSquared;
+        float  fRadiusSquared;
+        float  fSlope;
+        vec3_t v;
+
+        pLight = &backEnd.currentSphere->light[i];
+
+        switch (pLight->eType) {
+        case LIGHT_SPOT:
+            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+            fDistSquared   = VectorLengthSquared(v);
+            fSlope         = DotProduct(v, pLight->vDirection);
+            fDistPerp      = sqrt(fDistSquared - Square(fSlope));
+            fRadiusSquared = Square(backEnd.currentSphere->radius);
+            fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
+            if (Square(fDistParallel) >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+                pLight->eType = LIGHT_SPOT_FAST;
+            }
+            break;
+        case LIGHT_POINT:
+            if ((pLight->fDist - backEnd.currentSphere->radius) * r_entlight_errbound->value * pLight->fDist
+                > backEnd.currentSphere->radius * pLight->fIntensity) {
+                pLight->eType = LIGHT_DIRECTIONAL;
+
+                VectorScale(pLight->color, 1.0f / pLight->fDist, pLight->color);
+                VectorNormalize2(pLight->vOrigin, pLight->vDirection);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static void RB_Light_CubeMap(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           colorout;
+    reallightinfo_t *pLight;
+
+    color  = colors;
+    normal = (float *)tess.normal;
+    xyz    = (float *)tess.xyz;
+
+    for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+        unsigned int components[3];
+
+        if (normal[1] == -1) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (normal[1] == 1 && !normal[0] && !normal[2]) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (Q_fabs(normal[0]) >= Q_fabs(normal[2])) {
+            components[0] = 0;
+            components[1] = 1;
+            components[2] = 2;
+        } else {
+            components[0] = 2;
+            components[1] = 1;
+            components[2] = 0;
+        }
+
+        unsigned int cubeIndex =
+            (normal[2] < 0 ? 1 : 0) | (normal[1] < 0 ? 2 : 0) | (normal[0] < 0 ? 4 : 0) | (components[0] << 3);
+        float newnorms[3];
+        float mapping[3];
+        float(*cube)[3][4];
+
+        newnorms[0] = normal[components[0]];
+        newnorms[1] = normal[components[1]];
+        newnorms[2] = normal[components[2]];
+
+        mapping[0] = 1.f / newnorms[0] * newnorms[1];
+        mapping[1] = 1.f / newnorms[0] * newnorms[2];
+        mapping[2] = mapping[0] * mapping[1];
+
+        cube = &backEnd.currentSphere->cubemap[cubeIndex];
+        colorout[0] =
+            (*cube)[0][0] + (*cube)[0][1] * mapping[0] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
+        colorout[1] =
+            (*cube)[1][0] + (*cube)[1][1] * mapping[0] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
+        colorout[2] =
+            (*cube)[2][0] + (*cube)[2][1] * mapping[0] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
+
+        for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+            float  fDistSquared;
+            float  fProjSquared;
+            float  fMaxIntensity;
+            float  fDot;
+            vec3_t v;
+
+            pLight = &backEnd.currentSphere->light[j];
+
+            switch (pLight->eType) {
+            case LIGHT_DIRECTIONAL:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorMA(colorout, fDot, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_SPOT:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                }
+                break;
+            case LIGHT_SPOT_FAST:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_POINT:
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            }
+        }
+
+        color[0] = Q_min(colorout[0], 255);
+        color[1] = Q_min(colorout[1], 255);
+        color[2] = Q_min(colorout[2], 255);
+        color[3] = 0xff;
+    }
+}
+
+void RB_Light_Real(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           v;
+    vec3_t           colorout;
+    float            fDot;
+    reallightinfo_t *pLight;
+
+    color = colors;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        RB_Light_CubeMap(colors);
+        return;
+    }
+
+    if (!backEnd.currentSphere->numRealLights) {
+        for (i = 0; i < tess.numVertexes; i++, color += 4) {
+            color[0] = backEnd.currentSphere->ambient.level[0];
+            color[1] = backEnd.currentSphere->ambient.level[1];
+            color[2] = backEnd.currentSphere->ambient.level[2];
+            color[3] = backEnd.currentSphere->ambient.level[3];
+        }
+        return;
+    }
+
+    if (backEnd.currentSphere->numRealLights != 1) {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+            colorout[0] = colorout[1] = colorout[2] = 0;
+
+            for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_SPOT:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+
+                        fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                        fDistSquared  = VectorLengthSquared(v);
+                        fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                        if (fMaxIntensity > 0) {
+                            fDot /= fDistSquared;
+                            if (fMaxIntensity < 1) {
+                                fDot *= fMaxIntensity;
+                            }
+
+                            VectorMA(colorout, fDot, pLight->color, colorout);
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDot = DotProduct(v, normal);
+                    if (fDot > 0) {
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                }
+            }
+
+            color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+            color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+            color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+            color[3] = 0xff;
+        }
+    } else {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        pLight = &backEnd.currentSphere->light[0];
+
+        switch (backEnd.currentSphere->light[0].eType) {
+        case LIGHT_DIRECTIONAL:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorScale(pLight->color, fDot, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        case LIGHT_SPOT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorScale(pLight->color, fDot, colorout);
+
+                        color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                        color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                        color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                        color[3] = 0xff;
+                    }
+                }
+            }
+            break;
+        case LIGHT_SPOT_FAST:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                }
+            }
+            break;
+        case LIGHT_POINT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        }
+    }
+}
+
+static void RB_Sphere_Light_Sun()
+{
+    int      curleaf;
+    qboolean hitSun;
+    vec3_t   end;
+    mnode_t *leaf;
+    trace_t  trace;
+
+    if (!s_sun.exists) {
+        return;
+    }
+
+    if (tr.world->vis && backEnd.currentSphere->leaves[0] && tr.sSunLight.leaf == (struct mnode_s *)-1) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
+                break;
+            }
+        }
+
+        if (!leaf || (leaf->lights && leaf->lights[0] != &tr.sSunLight)) {
+            if (r_light_sun_line->integer) {
+                VectorMA(backEnd.currentSphere->worldOrigin, 16384.0, s_sun.direction, end);
+
+                VectorCopy(backEnd.currentEntity->e.origin, temppos);
+                MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+                GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+                qglPushMatrix();
+
+                qglLoadMatrixf(backEnd.ori.modelMatrix);
+                // Clear the depth range
+                qglDepthRange(0.0, 0.0);
+
+                qglDisable(GL_TEXTURE_2D);
+
+                qglBegin(GL_LINES);
+                qglColor3f(0.0, 0.0, 0.0);
+                qglVertex3fv(backEnd.currentSphere->origin);
+                qglColor3f(0.5, 0.5, 0.5);
+                qglVertex3fv(transpos);
+                qglEnd();
+
+                qglEnable(GL_TEXTURE_2D);
+
+                // Bring the depth range back
+                qglDepthRange(0.0, 1.0);
+
+                qglPopMatrix();
+            }
+
+            return;
+        }
+    }
+
+    VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
+    ri.CM_BoxTrace(
+        &trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0
+    );
+
+    hitSun = (trace.surfaceFlags >> 2) & 1;
+    if (r_light_sun_line->integer) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        VectorSubtract(trace.endpos, backEnd.currentEntity->e.origin, temppos);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+        qglPushMatrix();
+
+        qglLoadMatrixf(backEnd.ori.modelMatrix);
+        // Clear the depth range
+        qglDepthRange(0.0, 0.0);
+
+        qglDisable(GL_TEXTURE_2D);
+
+        qglBegin(GL_LINES);
+
+        if (hitSun) {
+            qglColor3f(1.0, 1.0, 0.0);
+        } else {
+            qglColor3f(0.0, 0.0, 0.0);
+        }
+
+        qglVertex3fv(backEnd.currentSphere->origin);
+        qglColor3f(0.5, 0.5, 0.5);
+        qglVertex3fv(transpos);
+        qglEnd();
+
+        qglEnable(GL_TEXTURE_2D);
+
+        // Bring the depth range back
+        qglDepthRange(0.0, 1.0);
+
+        qglPopMatrix();
+    }
+
+    if (hitSun) {
+        vec3_t           sunnormal;
+        sphereor_t      *pSphere;
+        reallightinfo_t *pLight;
+
+        pSphere = backEnd.currentSphere;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, s_sun.direction, sunnormal);
+
+        pLight = &pSphere->light[pSphere->numRealLights];
+        VectorScale(s_sun.color, r_entlight_scale->value, pLight->color);
+        //VectorScale(s_sun.color, r_entlight_scale->value * tr.overbrightMult, pLight->color);
+
+        VectorCopy(sunnormal, pLight->vDirection);
+        pLight->eType      = LIGHT_DIRECTIONAL;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        pSphere->numRealLights++;
+    }
+}
+
+static qboolean RB_Sphere_CalculateSphereOrigin()
+{
+    vec3_t        *axis;
+    vec3_t         sphereOrigin;
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    axis = backEnd.currentEntity->e.axis;
+    if (!backEnd.currentEntity->e.tiki) {
+        return qfalse;
+    }
+
+    backEnd.currentSphere->radius = backEnd.currentEntity->e.radius;
+    VectorCopy(backEnd.currentEntity->e.lightingOrigin, backEnd.currentSphere->worldOrigin);
+
+    VectorSubtract(backEnd.currentSphere->worldOrigin, backEnd.currentEntity->e.origin, sphereOrigin);
+    MatrixTransformVectorRight(axis, sphereOrigin, backEnd.currentSphere->origin);
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+
+    return qtrue;
+}
+
+static bool RB_Sphere_SetupGlobals()
+{
+    int i;
+
+    if ((backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && !(backEnd.refdef.rdflags & RDF_HUD)) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+        return false;
+    }
+
+    if (backEnd.refdef.rdflags & RDF_HUD) {
+        if (!backEnd.refdef.vieworg[0] && !backEnd.refdef.vieworg[1] && !backEnd.refdef.vieworg[2]) {
+            backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+            return false;
+        }
+
+        VectorCopy(backEnd.refdef.vieworg, backEnd.currentSphere->worldOrigin);
+        VectorClear(backEnd.currentSphere->origin);
+        backEnd.currentSphere->radius = 2.0;
+    } else if (!RB_Sphere_CalculateSphereOrigin()) {
+        backEnd.currentSphere->TessFunction = &RB_CalcLightGridColor;
+
+        if (!backEnd.currentEntity->bLightGridCalculated) {
+            RB_SetupEntityGridLighting();
+        }
+
+        return false;
+    }
+
+    light_reference_count++;
+    for (i = 0; i < 8; i++) {
+        backEnd.currentSphere->leaves[i] = 0;
+    }
+
+    R_SphereInLeafs(
+        backEnd.currentSphere->worldOrigin, backEnd.currentSphere->radius, backEnd.currentSphere->leaves, 8
+    );
+
+    backEnd.currentSphere->TessFunction = &RB_Light_Real;
+    return true;
+}
+
+static bool RB_Sphere_ResetPointColors()
+{
+    vec3_t light_offset, amb;
+
+    R_GetLightingGridValue(backEnd.currentSphere->worldOrigin, light_offset);
+    light_offset[0] = ambientlight[0] + light_offset[0] * 0.18;
+    light_offset[1] = ambientlight[1] + light_offset[1] * 0.18;
+    light_offset[2] = ambientlight[2] + light_offset[2] * 0.18;
+    if (tr.refdef.rdflags & RDF_FULLBRIGHT) {
+        float fMin = tr.identityLight * 20.0;
+
+        if (fMin <= light_offset[0] || fMin <= light_offset[1] || fMin <= light_offset[2]) {
+            light_offset[0] += fMin;
+            light_offset[1] += fMin;
+            light_offset[2] += fMin;
+        }
+    }
+
+    VectorScale(light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
+    backEnd.currentSphere->ambient.level[0] = Q_min(amb[0], 0xff);
+    backEnd.currentSphere->ambient.level[1] = Q_min(amb[1], 0xff);
+    backEnd.currentSphere->ambient.level[2] = Q_min(amb[2], 0xff);
+    backEnd.currentSphere->ambient.level[3] = 0xff;
+
+    return true;
+}
+
+static void RB_Sphere_DrawDebugLine(const spherel_t *thislight, float falloff, const vec3_t origin)
+{
+    int    i;
+    vec3_t newColor;
+    vec3_t fakeLine, fakeLine2;
+
+    if (!r_light_lines->integer) {
+        return;
+    }
+
+    qglPushMatrix();
+
+    qglLoadMatrixf(backEnd.ori.modelMatrix);
+    // Clear the depth range
+    qglDepthRange(0.0, 0.0);
+
+    qglDisable(GL_TEXTURE_2D);
+
+    if (r_light_lines->integer == 2) {
+        newColor[0] = thislight->color[0] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[1] = thislight->color[1] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[2] = thislight->color[2] * (falloff * r_entlight_scale->value / 255.0);
+
+        if (newColor[0] > 1 || newColor[1] > 1 || newColor[2] > 1) {
+            NormalizeColor(newColor, newColor);
+        }
+    } else if (thislight->spot_light) {
+        newColor[0] = 1.0;
+        newColor[1] = 0.7;
+        newColor[2] = 0.7;
+    } else {
+        newColor[0] = 1.0;
+        newColor[1] = 1.0;
+        newColor[2] = 1.0;
+    }
+
+    qglColor3f(newColor[0], newColor[1], newColor[2]);
+
+    qglBegin(GL_LINES);
+    qglVertex3fv(origin);
+    qglVertex3fv(backEnd.currentSphere->origin);
+
+    for (i = 0; i < 5; i += 2) {
+        VectorMA(origin, 16.0, spheredef[i], fakeLine);
+        VectorMA(origin, -16.0, spheredef[i], fakeLine2);
+
+        qglVertex3fv(fakeLine);
+        qglVertex3fv(fakeLine2);
+    }
+
+    if (thislight->spot_light) {
+        qglColor3f(0.7, 1.0, 0.7);
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, fakeLine);
+        VectorMA(origin, 32.0, fakeLine, fakeLine);
+
+        qglVertex3fv(origin);
+        qglVertex3fv(fakeLine);
+    }
+
+    qglEnd();
+    qglEnable(GL_TEXTURE_2D);
+    // Restore depth
+    qglDepthRange(0.0, 1.0);
+    qglPopMatrix();
+}
+
+static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    vec3_t newdir;
+    float  falloff;
+    float  dot;
+    float  radiusByDistance;
+    float  radiusAtDist;
+    float  sampleRadius;
+    vec3_t pointAtDist;
+
+    radiusByDistance = thislight->spot_radiusbydistance;
+    if (radiusByDistance < 0) {
+        vec3_t proj;
+        vec3_t delta;
+        float  distfromcentroid;
+
+        dot =
+            -(DotProduct(backEnd.currentSphere->worldOrigin, thislight->spot_dir)
+              - DotProduct(thislight->origin, thislight->spot_dir));
+        VectorMA(thislight->origin, dot, thislight->spot_dir, proj);
+        VectorSubtract(proj, thislight->origin, delta);
+
+        distfromcentroid = VectorLengthSquared(delta);
+        if (distfromcentroid > radiusByDistance * radiusByDistance) {
+            VectorScale(delta, -radiusByDistance / sqrt(distfromcentroid), delta);
+        }
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        VectorAdd(lightorigin, delta, lightorigin);
+    } else {
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+    }
+
+    MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+    VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+    falloff = thislight->intensity * 7500.0 / VectorLengthSquared(newlight);
+    if (falloff >= 5.0) {
+        reallightinfo_t *pLight;
+        float            fMinDist;
+        float            fRadByDistSquared;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
+        dot = -DotProduct(newlight, newdir);
+        if (dot > 0) {
+            fMinDist = sqrt(
+                Square(newlight[0] + newdir[0] * dot) + Square(newlight[1] + newdir[1] * dot)
+                + Square(newlight[2] + newdir[2] * dot)
+            );
+
+            if (fMinDist < radiusByDistance * dot && backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                pLight->eType = LIGHT_SPOT;
+                VectorScale(thislight->color, thislight->intensity * 7500.0 * tr.overbrightMult, pLight->color);
+                pLight->fDist = VectorLength(newlight);
+                pLight->fIntensity =
+                    (thislight->color[0] * 0.299f + thislight->color[1] * 0.587f + thislight->color[2] * 0.114f)
+                    * (thislight->intensity * 7500.0 * tr.overbrightMult);
+
+                sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
+                if (sampleRadius > 0) {
+                    pLight->fIntensity /= (sampleRadius * sampleRadius);
+                }
+
+                VectorCopy(lightline, pLight->vOrigin);
+                VectorNegate(newdir, pLight->vDirection);
+                fRadByDistSquared  = radiusByDistance * radiusByDistance;
+                pLight->fSpotConst = fRadByDistSquared + 1.0;
+                pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
+                pLight->fSpotSlope = radiusByDistance;
+
+                backEnd.currentSphere->numRealLights++;
+            }
+
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+        }
+    }
+}
+
+static void RB_Sphere_AddLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    float  intensity;
+    float  falloff;
+
+    if (thislight->intensity > 0 && (backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->intensity < 0 && !(backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->needs_trace) {
+        trace_t trace;
+        ri.CM_BoxTrace(
+            &trace,
+            backEnd.currentSphere->traceOrigin,
+            thislight->origin,
+            vec3_origin,
+            vec3_origin,
+            0,
+            CONTENTS_SOLID,
+            0
+        );
+
+        if (trace.fraction < 1) {
+            return;
+        }
+    }
+
+    if (!thislight->spot_light) {
+        reallightinfo_t *pLight;
+        float            fDist;
+        float            fRadius;
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+        VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+        intensity = fabs(thislight->intensity) * 7500.0;
+        falloff   = 1.f / VectorLengthSquared(newlight) * intensity;
+        if (falloff >= 5.0) {
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+
+            if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                fDist = VectorLength(newlight);
+                VectorScale(
+                    thislight->color, falloff * tr.overbrightMult * r_entlight_scale->value * fDist, pLight->color
+                );
+
+                VectorCopy(lightline, pLight->vOrigin);
+                pLight->fDist      = fDist;
+                pLight->eType      = LIGHT_POINT;
+                pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+                fRadius = fDist - backEnd.currentSphere->radius;
+                if (fRadius > 0) {
+                    pLight->fIntensity /= fRadius;
+                }
+
+                backEnd.currentSphere->numRealLights++;
+            }
+        }
+    } else {
+        RB_Sphere_AddSpotLight(thislight);
+    }
+}
+
+static void RB_Sphere_BuildStaticLights()
+{
+    int      i;
+    int      curleaf;
+    mnode_t *leaf;
+
+    if (tr.world->vis) {
+        int cntarea;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            cntarea = leaf->numlights;
+
+            if (cntarea) {
+                for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
+                    spherel_t *pLight = leaf->lights[i];
+                    byte       mask   = backEnd.refdef.areamask[pLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pLight->leaf->area & 7))) && pLight->reference_count != light_reference_count) {
+                        RB_Sphere_AddLight(pLight);
+                        pLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            RB_Sphere_AddLight(&tr.sLights[i]);
+        }
+    }
+}
+
+void RB_Sphere_BuildDLights()
+{
+    int              i;
+    float            length;
+    vec3_t           lightorigin;
+    vec3_t           delta;
+    float            scale;
+    float            fRadius;
+    sphereor_t      *pSphere;
+    reallightinfo_t *pLight;
+
+    pSphere                             = backEnd.currentSphere;
+    backEnd.currentSphere->TessFunction = RB_Light_Real;
+
+    for (i = 0; i < backEnd.refdef.num_dlights && pSphere->numRealLights < MAX_REAL_LIGHTS; i++) {
+        VectorSubtract(backEnd.refdef.dlights[i].origin, pSphere->worldOrigin, delta);
+        length = VectorLength(delta);
+
+        fRadius = backEnd.refdef.dlights[i].radius + pSphere->radius;
+        if (fRadius < length) {
+            continue;
+        }
+
+        VectorSubtract(backEnd.refdef.dlights[i].origin, backEnd.currentEntity->e.origin, lightorigin);
+        scale  = r_entlight_scale->value * tr.overbrightMult * 7500.0 * backEnd.refdef.dlights[i].radius / length;
+        pLight = &pSphere->light[pSphere->numRealLights];
+        pLight->color[0] = scale * backEnd.refdef.dlights[i].color[0];
+        pLight->color[1] = scale * backEnd.refdef.dlights[i].color[1];
+        pLight->color[2] = scale * backEnd.refdef.dlights[i].color[2];
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, pLight->vOrigin);
+
+        pLight->eType      = LIGHT_POINT;
+        pLight->fDist      = length;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        if (pLight->fDist - backEnd.currentSphere->radius >= 0.f) {
+            pLight->fIntensity /= pLight->fDist - backEnd.currentSphere->radius;
+        }
+
+        backEnd.currentSphere->numRealLights++;
+    }
+}
+
+void RB_Sphere_SetupEntity()
+{
+    if (r_light_nolight->integer) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+    } else if (RB_Sphere_SetupGlobals() && RB_Sphere_ResetPointColors()) {
+        backEnd.currentSphere->numRealLights = 0;
+        RB_Sphere_Light_Sun();
+        RB_Sphere_BuildStaticLights();
+        RB_Sphere_BuildDLights();
+        backEnd.pc.c_characterlights += backEnd.currentSphere->numRealLights;
+        RB_OptimizeLights();
+    }
+}
+
+void RB_Grid_SetupEntity()
+{
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+    RB_SetupEntityGridLighting();
+}
+
+void RB_Grid_SetupStaticModel()
+{
+    RB_SetupStaticModelGridLighting(&tr.refdef, backEnd.currentStaticModel, backEnd.currentStaticModel->origin);
+}
+
+void RB_Light_Fullbright(unsigned char *colors)
+{
+    int i;
+
+    for (i = 0; i < tess.numVertexes; i++) {
+        colors[i * 4]     = 0xFF;
+        colors[i * 4 + 1] = 0xFF;
+        colors[i * 4 + 2] = 0xFF;
+        colors[i * 4 + 3] = 0xFF;
+    }
+}
+
+void R_Sphere_InitLights()
+{
+    const char *ents;
+    const char *ret;
+    qboolean    bFlareDirSet;
+    qboolean    bIsWorld;
+    qboolean    bWorldProcessed;
+
+    ents            = ri.CM_EntityString();
+    bFlareDirSet    = qfalse;
+    bIsWorld        = qfalse;
+    bWorldProcessed = qfalse;
+
+    s_sun.szFlareName[0] = 0;
+    s_sun.exists         = qfalse;
+
+    for (int i = 0; i < MAX_SPHERE_LIGHTS; i++) {
+        backEnd.spheres[i].TessFunction = &RB_Light_Real;
+    }
+
+    VectorClear(ambientlight);
+    backEnd.spareSphere.TessFunction = &RB_Light_Real;
+    backEnd.currentSphere            = &backEnd.spareSphere;
+    bEntityOverbright                = qfalse;
+    iEntityLightingMax               = tr.identityLightByte;
+    s_sun.color[0] = s_sun.color[1] = s_sun.color[2] = tr.overbrightMult * 70;
+
+    while (ents) {
+        ret = COM_Parse((char **)&ents);
+        if (*ret == '{' || *ret == '}') {
+            continue;
+        }
+
+        if (!bWorldProcessed && !strcmp(ret, "classname")) {
+            //
+            // Added in 2.0
+            //  Make sure that the world's properties are not overridden
+            //  by some random entities
+            //
+            if (!strcmp(COM_Parse((char **)&ents), "worldspawn")) {
+                bIsWorld = qtrue;
+            } else {
+                bWorldProcessed = qtrue;
+            }
+
+            continue;
+        }
+
+        if (!strcmp(ret, "suncolor") || !strcmp(ret, "sunlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple suncolors defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &s_sun.color[0], &s_sun.color[1], &s_sun.color[2]);
+            s_sun.color[0] *= tr.overbrightMult;
+            s_sun.color[1] *= tr.overbrightMult;
+            s_sun.color[2] *= tr.overbrightMult;
+            s_sun.exists = qtrue;
+        } else if (!strcmp(ret, "sundirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple sundirections defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.direction, 0, 0);
+
+            s_sun.exists = qtrue;
+            if (!bFlareDirSet) {
+                s_sun.flaredirection[0] = s_sun.direction[0];
+                s_sun.flaredirection[1] = s_sun.direction[1];
+                s_sun.flaredirection[2] = s_sun.direction[2];
+            }
+        } else if (!strcmp(ret, "sunflaredirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.flaredirection, 0, 0);
+            bFlareDirSet = qtrue;
+        } else if (!strcmp(ret, "sunflarename")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            Q_strncpyz(s_sun.szFlareName, COM_Parse((char **)&ents), sizeof(s_sun.szFlareName));
+        } else if (!strcmp(ret, "ambientlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple ambientlights defined in map\n");
+                continue;
+            }
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &ambientlight[0], &ambientlight[1], &ambientlight[2]);
+        } else if (!strcmp(ret, "overbright")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            ret = COM_Parse((char **)&ents);
+            if (strcmp(ret, "world") || strcmp(ret, "none")) {
+                bEntityOverbright  = qtrue;
+                iEntityLightingMax = 0xFF;
+            }
+        } else {
+            COM_Parse((char **)&ents);
+        }
+    }
+
+    if (s_sun.exists && !s_sun.szFlareName[0]) {
+        Q_strncpyz(s_sun.szFlareName, "sun", sizeof(s_sun.szFlareName));
+    }
+}
+
+static qboolean R_CheckAddLightToList(spherel_t *pLight, const vec3_t vPos, float *pfFalloff)
+{
+    vec3_t vDelta;
+
+    if (pLight->intensity < 0) {
+        return qfalse;
+    }
+
+    VectorSubtract(pLight->origin, vPos, vDelta);
+    *pfFalloff = pLight->intensity * 7500.0 / VectorLengthSquared(vDelta);
+
+    return *pfFalloff >= 5.0;
+}
+
+static void R_InsertLightIntoList(spherel_t *pLight, float fIntensity, gatheredLight_t **pLightsList)
+{
+    gatheredLight_t *pCurrLight;
+    gatheredLight_t *pLastLight;
+
+    if (pLightsList[0]->pPrev->fIntensity >= fIntensity) {
+        return;
+    }
+
+    if (fIntensity > pLightsList[0]->fIntensity) {
+        pLightsList[0]             = pLightsList[0]->pPrev;
+        pLightsList[0]->pLight     = pLight;
+        pLightsList[0]->fIntensity = fIntensity;
+        return;
+    }
+
+    pCurrLight = pLightsList[0]->pNext;
+    if (!pCurrLight) {
+        return;
+    }
+
+    while (pCurrLight->fIntensity >= fIntensity) {
+        pCurrLight = pCurrLight->pNext;
+        if (!pCurrLight) {
+            return;
+        }
+    }
+
+    pLastLight                   = pLightsList[0]->pPrev->pPrev;
+    pCurrLight->pPrev->pNext     = pLightsList[0]->pPrev;
+    pLightsList[0]->pPrev->pPrev = pCurrLight->pPrev;
+    pLightsList[0]->pPrev->pNext = pCurrLight;
+    pCurrLight->pPrev            = pLightsList[0]->pPrev;
+    pLastLight->pNext            = pLightsList[0];
+    pLightsList[0]->pPrev        = pLastLight;
+    pCurrLight                   = pCurrLight->pPrev;
+    pCurrLight->fIntensity       = fIntensity;
+    pCurrLight->pLight           = pLight;
+}
+
+#define MAX_GATHERED_LIGHTS 8
+
+int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightIntensity, int iMaxLights)
+{
+    int              i, j;
+    int              iLightCount;
+    vec3_t           vEnd;
+    vec3_t           vDelta;
+    spherel_t       *pCurrLight;
+    gatheredLight_t  lights[MAX_GATHERED_LIGHTS];
+    gatheredLight_t *pLightsHead;
+    gatheredLight_t *pLightsCurr;
+    float            fFalloff;
+    trace_t          trace;
+    mnode_t         *leaf;
+
+    fFalloff = 0;
+    leaf     = NULL;
+
+    if (iMaxLights <= 0 || !r_drawspherelights->integer) {
+        return 0;
+    }
+
+    memset(lights, 0, sizeof(lights));
+
+    for (j = 0; j < MAX_GATHERED_LIGHTS - 2; j++) {
+        lights[j + 1].pNext = &lights[j + 2];
+        lights[j + 1].pPrev = &lights[j];
+    }
+
+    lights[0].pNext                       = &lights[1];
+    lights[0].pPrev                       = &lights[MAX_GATHERED_LIGHTS - 1];
+    lights[MAX_GATHERED_LIGHTS - 1].pNext = &lights[0];
+    lights[MAX_GATHERED_LIGHTS - 1].pPrev = &lights[MAX_GATHERED_LIGHTS - 2];
+    pLightsHead                           = &lights[0];
+
+    if (tr.world->vis) {
+        leaf = R_PointInLeaf(vPos);
+        if (leaf->area == -1 || !leaf->numlights) {
+            leaf = NULL;
+        }
+    }
+
+    if (leaf) {
+        if (leaf->numlights) {
+            light_reference_count++;
+
+            for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
+                pCurrLight = leaf->lights[i];
+                if (pCurrLight->leaf != (mnode_t *)-1) {
+                    byte mask = backEnd.refdef.areamask[pCurrLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pCurrLight->leaf->area & 7)))
+                        && pCurrLight->reference_count != light_reference_count) {
+                        if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                            R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+                        }
+
+                        pCurrLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            pCurrLight = &tr.sLights[i];
+
+            if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+            }
+        }
+    }
+
+    iLightCount = 0;
+
+    if (s_sun.exists) {
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
+            ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+            if (trace.surfaceFlags & SURF_SKY) {
+                VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
+                pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
+                pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
+                pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
+                iLightCount            = 1;
+            }
+        }
+    }
+
+    pLightsCurr = pLightsHead;
+
+    for (; iLightCount < iMaxLights && iLightCount < MAX_GATHERED_LIGHTS && pLightsCurr->pLight;
+         iLightCount++, pLightsCurr = pLightsCurr->pNext) {
+        VectorCopy(pLightsCurr->pLight->origin, pvLightPos[iLightCount]);
+        vDelta[0] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[0];
+        vDelta[1] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[1];
+        vDelta[2] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[2];
+
+        if (vDelta[0] > 1.0 || vDelta[1] > 1.0 || vDelta[2] > 1.0) {
+            NormalizeColor(vDelta, vDelta);
+        }
+
+        VectorCopy(vDelta, pvLightIntensity[iLightCount]);
+        pLightsCurr = pLightsCurr->pNext;
+        if (pLightsCurr == pLightsHead) {
+            break;
+        }
+    }
+
+    return iLightCount;
+}
diff --git a/code/renderer/tr_sprite.c b/code/renderergl1/tr_sprite.c
similarity index 100%
rename from code/renderer/tr_sprite.c
rename to code/renderergl1/tr_sprite.c
diff --git a/code/renderergl1/tr_staticmodels.cpp b/code/renderergl1/tr_staticmodels.cpp
new file mode 100644
index 00000000..c62f5674
--- /dev/null
+++ b/code/renderergl1/tr_staticmodels.cpp
@@ -0,0 +1,588 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_staticmodels.cpp -- static model rendering
+
+#include "tr_local.h"
+#include "tiki.h"
+
+#define MAX_STATIC_MODELS_SURFS    8192
+#define MAX_DISTINCT_STATIC_MODELS 1000
+
+int             g_nStaticSurfaces;
+staticSurface_t g_staticSurfaces[MAX_STATIC_MODELS_SURFS];
+qboolean        g_bInfostaticmodels = qfalse;
+
+/*
+==============
+R_InitStaticModels
+==============
+*/
+void R_InitStaticModels(void)
+{
+    cStaticModelUnpacked_t *pSM;
+    char                    szTemp[1024];
+    skelBoneCache_t         bones[128];
+    float                   radius;
+    int                     i, j, k, l;
+
+    g_bInfostaticmodels = qfalse;
+
+    if (tr.overbrightShift) {
+        for (i = 0; i < tr.world->numStaticModelData; i++) {
+            int r, g, b;
+
+            r = (int)((float)tr.world->staticModelData[i * 4] * tr.overbrightMult);
+            g = (int)((float)tr.world->staticModelData[i * 4 + 1] * tr.overbrightMult);
+            b = (int)((float)tr.world->staticModelData[i * 4 + 2] * tr.overbrightMult);
+
+            if (r > 0xFF || g > 0xFF || b > 0xFF) {
+                float t;
+
+                t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+                r = (int)((float)r * t);
+                g = (int)((float)g * t);
+                b = (int)((float)b * t);
+            }
+
+            tr.world->staticModelData[i * 4]     = r;
+            tr.world->staticModelData[i * 4 + 1] = g;
+            tr.world->staticModelData[i * 4 + 2] = b;
+        }
+    }
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        vec3_t mins, maxs;
+
+        pSM = &tr.world->staticModels[i];
+
+        pSM->bRendered = qfalse;
+        AngleVectorsLeft(pSM->angles, pSM->axis[0], pSM->axis[1], pSM->axis[2]);
+
+        if (!strnicmp(pSM->model, "models", 6)) {
+            Q_strncpyz(szTemp, pSM->model, sizeof(szTemp));
+        } else {
+            Com_sprintf(szTemp, sizeof(szTemp), "models/%s", pSM->model);
+        }
+
+        ri.FS_CanonicalFilename(szTemp);
+        //const bool exists = ri.TIKI_FindTiki(szTemp) != NULL;
+        pSM->tiki = ri.TIKI_RegisterTikiFlags(szTemp, qfalse);
+
+        if (!pSM->tiki) {
+            ri.Printf(PRINT_WARNING, "^~^~^: Warning: Cannot Load Static Model %s\n", szTemp);
+            continue;
+        }
+
+        pSM->radius = ri.TIKI_GlobalRadius(pSM->tiki);
+
+        //
+        // register shaders
+        //
+        for (j = 0; j < pSM->tiki->num_surfaces; j++) {
+            dtikisurface_t *surf = &pSM->tiki->surfaces[j];
+
+            for (k = 0; k < surf->numskins; k++) {
+                if (surf->shader[k][0]) {
+                    shader_t *sh = R_FindShader(
+                        surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS), r_picmip->integer, qtrue, qtrue
+                    );
+                    surf->hShader[k] = sh->index;
+                } else {
+                    surf->hShader[k] = 0;
+                }
+            }
+        }
+
+        // prepare the skeleton frame for the static model
+        ri.TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
+        pSM->cull_radius = radius * pSM->tiki->load_scale * pSM->scale;
+
+        // Suggestion:
+        // It would be cool to have animated static model in the future
+
+        // Removed in 2.0
+        //  This only leads to issues where pStaticXyz is not initialized
+        //  and it can occurs if the TIKI model is registered before the static model
+        //if (exists) {
+        //    continue;
+        //}
+
+        for (j = 0; j < pSM->tiki->numMeshes; j++) {
+            skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
+            skelSurfaceGame_t *surf;
+
+            if (!skelmodel) {
+                ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
+                continue;
+            }
+
+            surf = skelmodel->pSurfaces;
+
+            for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
+                byte             *buf;
+                byte             *p;
+                skelWeight_t     *weight;
+                skeletorVertex_t *vert;
+
+                if (surf->pStaticXyz) {
+                    continue;
+                }
+
+                // allocate static vectors
+                p = buf =
+                    (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
+                surf->pStaticXyz = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticNormal = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticTexCoords = (vec2_t(*)[2])p;
+
+                vert = surf->pVerts;
+
+                for (l = 0; l < surf->numVerts; l++) {
+                    int              channel;
+                    skelBoneCache_t *bone;
+
+                    weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                              + vert->numMorphs * sizeof(skeletorMorph_t));
+
+                    if (j > 0) {
+                        channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
+                    } else {
+                        channel = weight->boneIndex;
+                    }
+
+                    bone = &bones[channel];
+
+                    surf->pStaticXyz[l][0] =
+                        ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                          + weight->offset[2] * bone->matrix[2][0])
+                         + bone->offset[0])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][1] =
+                        ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                          + weight->offset[2] * bone->matrix[2][1])
+                         + bone->offset[1])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][2] =
+                        ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                          + weight->offset[2] * bone->matrix[2][2])
+                         + bone->offset[2])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][3] = 0.f;
+
+                    surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
+                                              + vert->normal[1] * bone->matrix[1][0]
+                                              + vert->normal[2] * bone->matrix[2][0];
+                    surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
+                                              + vert->normal[1] * bone->matrix[1][1]
+                                              + vert->normal[2] * bone->matrix[2][1];
+                    surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
+                                              + vert->normal[1] * bone->matrix[1][2]
+                                              + vert->normal[2] * bone->matrix[2][2];
+                    surf->pStaticNormal[l][3] = 0.f;
+
+                    surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
+                    surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
+
+                    vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * vert->numMorphs
+                                                + sizeof(skelWeight_t) * vert->numWeights);
+                }
+            }
+        }
+    }
+
+    tr.refdef.numStaticModels    = tr.world->numStaticModels;
+    tr.refdef.staticModels       = tr.world->staticModels;
+    tr.refdef.numStaticModelData = tr.world->numStaticModelData;
+    tr.refdef.staticModelData    = tr.world->staticModelData;
+}
+
+/*
+==============
+R_CullStaticModel
+==============
+*/
+static int R_CullStaticModel(dtiki_t *tiki, float fScale, const vec3_t vLocalOrg)
+{
+    vec3_t bounds[2];
+    int    i;
+    int    cull;
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = vLocalOrg[i] + tiki->a->mins[i] * fScale;
+        bounds[1][i] = vLocalOrg[i] + tiki->a->maxs[i] * fScale;
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 4) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_CLIP:
+            fR = 1.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_IN:
+            fR = 0.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_OUT:
+            fR = 1.0f;
+            fG = 0.2f;
+            fB = 0.2f;
+            for (i = 0; i < 2; i++) {
+                bounds[0][i] = bounds[0][i] - 16.0;
+                bounds[1][i] = bounds[1][i] + 16.0;
+            }
+            break;
+        default:
+            break;
+        }
+
+        MatrixToEulerAngles(tr.ori.axis, vAngles);
+        R_DebugRotatedBBox(tr.ori.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        break;
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        break;
+    case CULL_OUT:
+        tr.pc.c_box_cull_md3_out++;
+        break;
+    }
+
+    return cull;
+}
+
+/*
+==============
+R_AddStaticModelSurfaces
+==============
+*/
+void R_AddStaticModelSurfaces(void)
+{
+    cStaticModelUnpacked_t *SM;
+    int                     i, j, k;
+    int                     ofsStaticData;
+    int                     iRadiusCull;
+    dtiki_t                *tiki;
+    float                   tiki_scale;
+    vec3_t                  tiki_localorigin;
+    vec3_t                  tiki_worldorigin;
+
+    if (!tr.world->numStaticModels) {
+        return;
+    }
+
+    tr.shiftedIsStatic = (1 << QSORT_STATICMODEL_SHIFT);
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+
+        //if( SM->visCount != tr.visCounts[ tr.visIndex ] ) {
+        //	continue;
+        //}
+
+        tiki = SM->tiki;
+
+        if (!tiki) {
+            continue;
+        }
+
+        tr.currentEntityNum = i;
+        tr.shiftedEntityNum = i << QSORT_ENTITYNUM_SHIFT;
+
+        R_RotateForStaticModel(SM, &tr.viewParms, &tr.ori);
+
+        ofsStaticData = 0;
+
+        // get the world position
+        tiki_scale = tiki->load_scale * SM->scale;
+        VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+        R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
+
+        if (r_showcull->integer & 8) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.2, 0.0, 1.0, 0.0, 0.5, 0);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.4 + 16.0, 1.0, 0.2, 0.2, 0.5, 0);
+                break;
+            }
+        }
+
+        if (iRadiusCull != CULL_OUT
+            && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT)) {
+            dtikisurface_t *dsurf;
+
+            if (tr.viewParms.isPortal) {
+                SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            } else {
+                SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            }
+
+            //
+            // draw all meshes
+            //
+            dsurf = tiki->surfaces;
+            for (int mesh = 0; mesh < tiki->numMeshes; mesh++) {
+                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+                skelSurfaceGame_t *surface;
+                staticSurface_t   *s_surface;
+                shader_t          *shader;
+                float              fDist;
+                vec3_t             vDelta;
+
+                if (!skelmodel) {
+                    continue;
+                }
+
+                //
+                // draw all surfaces
+                //
+                surface = skelmodel->pSurfaces;
+                for (j = 0; j < skelmodel->numSurfaces;
+                     j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++) {
+                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS) {
+                        ri.Printf(
+                            PRINT_DEVELOPER,
+                            "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n",
+                            tiki->a->name
+                        );
+                        continue;
+                    }
+
+                    s_surface                = &g_staticSurfaces[g_nStaticSurfaces++];
+                    s_surface->ident         = SF_TIKI_STATIC;
+                    s_surface->ofsStaticData = ofsStaticData;
+                    s_surface->surface       = surface;
+                    s_surface->meshNum       = mesh;
+
+                    shader = tr.shaders[dsurf->hShader[0]];
+
+                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer) {
+                        switch (shader->unfoggedStages[0]->alphaGen) {
+                        case AGEN_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(
+                                    shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius
+                                )
+                                == CULL_OUT) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius)
+                                == CULL_IN) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.ori.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) >= Square(fDist)) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.ori.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) <= Square(shader->fDistNear)) {
+                                continue;
+                            }
+                            break;
+                        }
+                    }
+
+                    SM->bRendered = qtrue;
+                    R_AddDrawSurf((surfaceType_t *)s_surface, shader, 0);
+
+                    if (r_showstaticlod->integer) {
+                        vec3_t org;
+                        int    render_count, total_tris;
+
+                        VectorCopy(SM->origin, org);
+                        org[2] += 100.0;
+                        R_DrawDebugNumber(org, SM->lodpercentage[0], r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 3);
+
+                        org[2] += 125.0;
+                        R_CountTikiLodTris(tiki, SM->lodpercentage[0], &render_count, &total_tris);
+                        R_DrawDebugNumber(org, render_count, r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 0);
+                    }
+
+                    if (r_showstaticbboxes->integer) {
+                        vec3_t vMins, vMaxs;
+
+                        for (k = 0; k < 3; k++) {
+                            vMins[k] = tiki->a->mins[k] * tiki->load_scale * SM->scale;
+                            vMaxs[k] = tiki->a->maxs[k] * tiki->load_scale * SM->scale;
+                        }
+
+                        R_DebugRotatedBBox(SM->origin, SM->angles, vMins, vMaxs, 1.0, 0.0, 1.0, 0.75);
+                    }
+                }
+            }
+        }
+    }
+
+    tr.shiftedIsStatic = 0;
+}
+
+/*
+==============
+RB_Static_BuildDLights
+==============
+*/
+void RB_Static_BuildDLights()
+{
+    int i;
+
+    backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
+    backEnd.currentStaticModel->numdlights         = 0;
+
+    if (!backEnd.currentStaticModel->useSpecialLighting) {
+        return;
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights && backEnd.currentStaticModel->numdlights != 32; i++) {
+        vec3_t lightorigin, delta;
+
+        VectorCopy(backEnd.refdef.dlights[i].origin, lightorigin);
+        VectorSubtract(lightorigin, backEnd.currentStaticModel->origin, delta);
+        if (backEnd.refdef.dlights[i].radius * 2.0 >= VectorLength(delta)) {
+            MatrixTransformVectorRight(
+                backEnd.currentStaticModel->axis,
+                delta,
+                backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights].transformed
+            );
+
+            backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights++].index = i;
+        }
+    }
+
+    if (!backEnd.currentStaticModel->numdlights) {
+        backEnd.currentStaticModel->useSpecialLighting = qfalse;
+    }
+}
+
+/*
+==============
+R_InfoStaticModels_f
+==============
+*/
+void R_InfoStaticModels_f(void)
+{
+    g_bInfostaticmodels = qtrue;
+}
+
+/*
+==============
+R_PrintInfoStaticModels
+==============
+*/
+void R_PrintInfoStaticModels()
+{
+    int                     iRenderCount;
+    int                     i, j;
+    cStaticModelUnpacked_t *SM;
+    dtiki_t                *tikis[MAX_DISTINCT_STATIC_MODELS];
+    int                     tiki_count[MAX_DISTINCT_STATIC_MODELS];
+    cStaticModelUnpacked_t *pSM[MAX_DISTINCT_STATIC_MODELS];
+    int                     count;
+
+    ri.Printf(PRINT_ALL, "Static model info:\n");
+    ri.Printf(PRINT_ALL, "------------------\n");
+
+    count        = 0;
+    iRenderCount = 0;
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+        if (!SM->bRendered) {
+            continue;
+        }
+
+        SM->bRendered = qfalse;
+        iRenderCount++;
+
+        if (!SM->tiki) {
+            ri.Printf(PRINT_ALL, "ERROR: static model with no tiki\n");
+            continue;
+        }
+
+        for (j = 0; j < count; j++) {
+            if (SM->tiki == tikis[j]) {
+                tiki_count[j]++;
+                break;
+            }
+        }
+
+        if (count >= MAX_DISTINCT_STATIC_MODELS) {
+            ri.Printf(PRINT_ALL, "R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
+            break;
+        }
+
+        if (j == count) {
+            tikis[count]      = SM->tiki;
+            pSM[count]        = SM;
+            tiki_count[count] = 1;
+
+            count++;
+        }
+    }
+
+    ri.Printf(PRINT_ALL, "Total static models rendered: %d\n", iRenderCount);
+
+    for (i = 0; i < count; i++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tikis[i]->mesh[0]);
+
+        ri.Printf(PRINT_ALL, 
+            "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
+            tikis[i]->a->name,
+            skelmodel ? skelmodel->version : -1,
+            tiki_count[i],
+            tikis[i]->a->mins[0],
+            tikis[i]->a->mins[1],
+            tikis[i]->a->mins[2],
+            tikis[i]->a->maxs[0],
+            tikis[i]->a->maxs[1],
+            tikis[i]->a->maxs[2],
+            pSM[i]->cull_radius
+        );
+    }
+}
diff --git a/code/renderergl1/tr_subs.c b/code/renderergl1/tr_subs.c
index 6f490128..cbe7503d 100644
--- a/code/renderergl1/tr_subs.c
+++ b/code/renderergl1/tr_subs.c
@@ -35,6 +35,18 @@ void QDECL Com_Printf( const char *msg, ... )
 	ri.Printf(PRINT_ALL, "%s", text);
 }
 
+void QDECL Com_DPrintf( const char *msg, ... )
+{
+	va_list         argptr;
+	char            text[1024];
+
+	va_start(argptr, msg);
+	Q_vsnprintf(text, sizeof(text), msg, argptr);
+	va_end(argptr);
+
+	ri.Printf(PRINT_DEVELOPER, "%s", text);
+}
+
 void QDECL Com_Error( int level, const char *error, ... )
 {
 	va_list         argptr;
diff --git a/code/renderergl1/tr_sun_flare.cpp b/code/renderergl1/tr_sun_flare.cpp
new file mode 100644
index 00000000..547333e1
--- /dev/null
+++ b/code/renderergl1/tr_sun_flare.cpp
@@ -0,0 +1,729 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sun_flare.cpp: Sun flares
+
+#include "tr_local.h"
+
+#define MAX_FLARES 20
+
+class flare_s
+{
+public:
+    float     size;
+    float     where;
+    shader_t *shader;
+    float     alphascale;
+};
+
+class lens_flare
+{
+public:
+    static int max_flares;
+
+    float dot_min;
+    float fullscale;
+
+    // List of flares
+    int     num_flares;
+    flare_s flares[MAX_FLARES];
+
+    shader_t *fullscreen;
+    int       fullfade;
+    qboolean  blend_active;
+
+    // Flare location
+    vec3_t trace_v;
+    vec3_t v;
+
+    // Color and alpha
+    vec3_t color;
+    float  alpha;
+
+    // Screen projection
+    vec2_t screen;
+    float  dot;
+
+    int   lasttime;
+    float lastbright;
+
+    // Whether or not it's inside a portal sky
+    bool inportalsky;
+
+    qboolean initted;
+
+public:
+    lens_flare()
+    {
+        color[0] = 1.0;
+        color[1] = 1.0;
+        color[2] = 1.0;
+        alpha    = 1.0;
+        initted  = false;
+    }
+
+    bool         CheckRange();
+    bool         CheckRay();
+    bool         ScreenCalc();
+    virtual void Try();
+    virtual void Init(const char *which);
+    void         ScreenBlend();
+    void         InPortalSky();
+    void         NotInPortalSky();
+    void         SetVect(const float *vect);
+
+    void SetColor(const float *c) { VectorCopy(c, color); }
+
+    void SetAlpha(float a) { alpha = a; }
+};
+
+class dlight_lens_flare : public lens_flare
+{
+public:
+    shader_t *corona_shader;
+
+public:
+    dlight_lens_flare() { corona_shader = NULL; }
+
+    void Try() override;
+
+    void Init(const char *which) override
+    {
+        lens_flare::Init(which);
+        corona_shader = R_FindShader("textures/sprites/corona", -1, qfalse, qfalse, qfalse, qfalse);
+    }
+};
+
+class sun_flare_class : public lens_flare
+{
+public:
+    bool SunCheckRay();
+    void SunScreenCalc();
+    void SunTry();
+};
+
+lens_flare        torches;
+dlight_lens_flare dlights;
+sun_flare_class   sunFlare;
+int               lens_flare::max_flares;
+
+void lens_flare::SetVect(const float *vect)
+{
+    if (inportalsky) {
+        vec3_t offset;
+        vec3_t rot_offset;
+
+        VectorSubtract(vect, tr.refdef.sky_origin, offset);
+        VectorRotate(offset, tr.refdef.sky_axis, rot_offset);
+        VectorAdd(tr.refdef.vieworg, rot_offset, v);
+
+        VectorNormalize(offset);
+        VectorMA(tr.refdef.vieworg, 16384, offset, trace_v);
+    } else {
+        VectorCopy(vect, v);
+        VectorCopy(vect, trace_v);
+    }
+}
+
+void lens_flare::InPortalSky()
+{
+    inportalsky = true;
+}
+
+void lens_flare::NotInPortalSky()
+{
+    inportalsky = false;
+}
+
+bool lens_flare::CheckRange()
+{
+    vec3_t diff;
+
+    VectorSubtract(v, backEnd.viewParms.ori.origin, diff);
+    VectorNormalizeFast(diff);
+    dot = DotProduct(backEnd.viewParms.ori.axis[0], diff);
+
+    return dot > dot_min;
+}
+
+bool lens_flare::CheckRay()
+{
+    trace_t trace;
+
+    ri.CM_BoxTrace(&trace, backEnd.viewParms.ori.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse);
+    if (inportalsky) {
+        return (trace.surfaceFlags & 4) != 0;
+    }
+
+    return trace.fraction == 1.0;
+}
+
+bool lens_flare::ScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    bool   retval;
+    int    i, j;
+
+    retval = true;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.ori.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        if (clip[i] >= clip[3] || clip[i] <= -clip[3]) {
+            retval = false;
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+
+    return retval;
+}
+
+void lens_flare::Try()
+{
+    vec2_t diff;
+    vec2_t point;
+    float  alpha;
+    int    i;
+
+    if (!ScreenCalc()) {
+        return;
+    }
+    if (!CheckRange()) {
+        return;
+    }
+    if (!CheckRay()) {
+        return;
+    }
+
+    VectorScale2D(screen, -2.0, diff);
+    alpha = (dot - dot_min) / (1.0 - dot_min);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    lasttime     = backEnd.refdef.time;
+    blend_active = true;
+    lastbright   = Square(alpha) * Square(alpha) * this->fullscale;
+}
+
+void dlight_lens_flare::Try()
+{
+    float size;
+
+    size = r_lightcoronasize->value;
+    lens_flare::Try();
+    lens_flare::CheckRange();
+
+    if (dot <= 0) {
+        return;
+    }
+
+    if (!CheckRay()) {
+        return;
+    }
+
+    RB_Color4f(color[0], color[1], color[2], alpha);
+    RB_StreamBegin(corona_shader);
+    RB_Texcoord2f(0.0, 0.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] + size);
+    RB_Texcoord2f(1.0, 0.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] + size);
+    RB_Texcoord2f(0.0, 1.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] - size);
+    RB_Texcoord2f(1.0, 1.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] - size);
+    RB_StreamEnd();
+}
+
+void lens_flare::ScreenBlend()
+{
+    float alpha;
+    int   timediff;
+
+    if (!fullscreen || !blend_active) {
+        return;
+    }
+
+    timediff = backEnd.refdef.time - lasttime;
+    if (timediff > fullfade) {
+        blend_active = false;
+        return;
+    }
+
+    alpha = (float)(fullfade - timediff) / fullfade * lastbright;
+    if (alpha <= 0.0001) {
+        blend_active = false;
+        return;
+    }
+
+    RB_Color4f(1.0, 1.0, 1.0, alpha);
+
+    RB_StreamBegin(fullscreen);
+    RB_Vertex2f(-1.0, -1.0);
+    RB_Vertex2f(1.0, -1.0);
+    RB_Vertex2f(-1.0, 1.0);
+    RB_Vertex2f(1.0, 1.0);
+
+    RB_StreamEnd();
+}
+
+class tmpRiFile
+{
+private:
+    bool  file_exists;
+    void *buf;
+
+public:
+    tmpRiFile()
+    {
+        file_exists = false;
+        buf         = NULL;
+    }
+
+    ~tmpRiFile() { close(); }
+
+    int open(const char *which, void **buffer)
+    {
+        close();
+
+        if (ri.FS_ReadFile(which, buffer) != -1) {
+            file_exists = true;
+            buf         = *buffer;
+        }
+
+        return file_exists;
+    }
+
+    bool exists() const { return file_exists; }
+
+    void close()
+    {
+        if (file_exists) {
+            ri.FS_FreeFile(buf);
+            file_exists = false;
+        }
+    }
+};
+
+void lens_flare::Init(const char *which)
+{
+    char       *file;
+    const char *token;
+    tmpRiFile   theFile;
+
+    initted = false;
+    theFile.open("global/lensflaredefs.txt", (void **)&file);
+
+    if (!theFile.exists()) {
+        ri.Printf(PRINT_WARNING, "WARNING: Could not open lens flare info file!\n");
+        return;
+    }
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find begin for section '%s' in lensflares\n", which);
+            return;
+        }
+
+        if (!Q_stricmp(token, "begin")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!Q_stricmp(token, which)) {
+                break;
+            }
+        }
+    }
+
+    dot_min      = 0.8f;
+    fullscale    = 0.7f;
+    num_flares   = 0;
+    fullscreen   = NULL;
+    initted      = true;
+    fullfade     = 0;
+    blend_active = false;
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find end for section '%s' in lensflares\n", which);
+            break;
+        }
+
+        if (!Q_stricmp(token, "dot_min")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: invalid dot_min in lensflares\n");
+                continue;
+            }
+            dot_min = atof(token);
+        } else if (!Q_stricmp(token, "flare")) {
+            assert(num_flares < MAX_FLARES);
+
+            flares[num_flares].alphascale = 1.0;
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 1 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].size = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 2 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].where = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 3 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].shader = R_FindShader(token, -1, qfalse, qfalse, qfalse, qfalse);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (token[0]) {
+                flares[num_flares].alphascale = atof(token);
+            }
+
+            num_flares++;
+        } else if (!Q_stricmp(token, "fullscale")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullscale, assuming default (in lensflares)\n");
+                continue;
+            }
+            fullscale = atof(token);
+        } else if (!Q_stricmp(token, "fullscreen")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullsreen in lensflares\n");
+                continue;
+            }
+            fullscreen = R_FindShader(token, -1, qfalse, qfalse, qfalse, qfalse);
+        } else if (!Q_stricmp(token, "fullfade")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullfade in lensflares\n");
+                continue;
+            }
+            fullfade = atof(token);
+        } else if (!Q_stricmp(token, "end")) {
+            break;
+        }
+    }
+
+    if (!num_flares) {
+        ri.Printf(PRINT_WARNING, "WARNING: no lensflares defined!\n");
+    }
+    lasttime = backEnd.refdef.time - fullfade;
+}
+
+static void R_DrawSunFlare()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        if (!s_sun.szFlareName[0]) {
+            return;
+        }
+        if (Q_stricmp(s_sun.szFlareName, "none")) {
+            sunFlare.Init(s_sun.szFlareName);
+        }
+    }
+
+    if (!sunFlare.initted) {
+        s_sun.szFlareName[0] = 0;
+        return;
+    }
+
+    if (!sunFlare.num_flares) {
+        return;
+    }
+
+    VectorMA(backEnd.viewParms.ori.origin, 16384, s_sun.flaredirection, sunFlare.trace_v);
+    VectorMA(backEnd.viewParms.ori.origin, 128, s_sun.flaredirection, sunFlare.v);
+
+    sunFlare.SunTry();
+}
+
+static void R_DrawSunFlareBlend()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        return;
+    }
+
+    sunFlare.ScreenBlend();
+}
+
+void R_DrawLensFlares()
+{
+    int i;
+
+    R_RotateForViewer();
+
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglMatrixMode(GL_PROJECTION);
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglOrtho(-1.0, 1.0, -1.0, 1.0, -99999.0, 99999.0);
+
+    tess.no_global_fog = true;
+    R_DrawSunFlare();
+
+    for (i = 0; i < backEnd.refdef.num_entities; i++) {
+        if ((backEnd.viewParms.isPortalSky && !(backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))
+            || (!backEnd.viewParms.isPortalSky && (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))) {
+            continue;
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_LENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                dlights.InPortalSky();
+            } else {
+                dlights.NotInPortalSky();
+            }
+
+            dlights.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            //
+            // Set the dlight color from entity
+            //
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            dlights.SetColor(rgb);
+
+            dlights.Try();
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_VIEWLENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                torches.InPortalSky();
+            } else {
+                torches.NotInPortalSky();
+            }
+
+            torches.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            torches.SetColor(rgb);
+
+            torches.Try();
+        }
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        if ((backEnd.refdef.dlights[i].type & dlighttype_t::lensflare)
+            || (backEnd.refdef.dlights[i].type & dlighttype_t::additive)) {
+            dlights.NotInPortalSky();
+            dlights.SetVect(backEnd.refdef.dlights[i].origin);
+            dlights.SetColor(backEnd.refdef.dlights[i].color);
+
+            dlights.Try();
+        }
+    }
+
+    R_DrawSunFlareBlend();
+    tess.no_global_fog = qfalse;
+
+    qglPopMatrix();
+    qglMatrixMode(GL_MODELVIEW);
+    qglPopMatrix();
+}
+
+void R_InitLensFlare()
+{
+    torches.Init("entity");
+    dlights.Init("dlight");
+    sunFlare.initted = false;
+}
+
+bool sun_flare_class::SunCheckRay()
+{
+    mnode_t *pViewLeaf;
+    trace_t  trace;
+
+    pViewLeaf = R_PointInLeaf(tr.refdef.vieworg);
+
+    if (pViewLeaf->area == -1 || !tr.world->vis || tr.sSunLight.leaf != (mnode_s *)-1
+        || pViewLeaf->numlights && pViewLeaf->lights[0] == &tr.sSunLight) {
+        ri.CM_BoxTrace(
+            &trace, backEnd.viewParms.ori.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse
+        );
+
+        if (trace.surfaceFlags & SURF_SKY) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void sun_flare_class::SunScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    int    i, j;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.ori.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+}
+
+void sun_flare_class::SunTry()
+{
+    vec2_t   diff;
+    vec2_t   point;
+    float    alpha;
+    int      i;
+    qboolean bDrawingFade = qfalse;
+
+    if (!CheckRange()) {
+        return;
+    }
+
+    if (SunCheckRay()) {
+        alpha = (dot - dot_min) / (1.0 - dot_min);
+    } else {
+        int timediff;
+
+        if (!fullscreen) {
+            return;
+        }
+        if (!blend_active) {
+            return;
+        }
+
+        timediff = backEnd.refdef.time - lasttime;
+        alpha    = (float)(fullfade - timediff) / fullfade * lastbright;
+
+        if (alpha <= 0.0001) {
+            return;
+        }
+
+        bDrawingFade = qtrue;
+    }
+
+    SunScreenCalc();
+    VectorScale2D(screen, -2.0, diff);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    if (!bDrawingFade) {
+        lasttime     = backEnd.refdef.time;
+        blend_active = true;
+        lastbright   = Square(alpha) * Square(alpha) * fullscale;
+    }
+}
diff --git a/code/renderergl1/tr_surface.c b/code/renderergl1/tr_surface.c
index 41e72738..1d5d83da 100644
--- a/code/renderergl1/tr_surface.c
+++ b/code/renderergl1/tr_surface.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -46,11 +46,6 @@ RB_CheckOverflow
 ==============
 */
 void RB_CheckOverflow( int verts, int indexes ) {
-	if (tess.numVertexes + verts < SHADER_MAX_VERTEXES
-		&& tess.numIndexes + indexes < SHADER_MAX_INDEXES) {
-		return;
-	}
-
 	RB_EndSurface();
 
 	if ( verts >= SHADER_MAX_VERTEXES ) {
@@ -60,7 +55,7 @@ void RB_CheckOverflow( int verts, int indexes ) {
 		ri.Error(ERR_DROP, "RB_CheckOverflow: indices > MAX (%d > %d)", indexes, SHADER_MAX_INDEXES );
 	}
 
-	RB_BeginSurface(tess.shader, tess.fogNum );
+	RB_BeginSurface(tess.shader);
 }
 
 
@@ -104,7 +99,7 @@ void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, flo
 
 
 	// constant normal all the way around
-	VectorSubtract( vec3_origin, backEnd.viewParms.or.axis[0], normal );
+	VectorSubtract( vec3_origin, backEnd.viewParms.ori.axis[0], normal );
 
 	tess.normal[ndx][0] = tess.normal[ndx+1][0] = tess.normal[ndx+2][0] = tess.normal[ndx+3][0] = normal[0];
 	tess.normal[ndx][1] = tess.normal[ndx+1][1] = tess.normal[ndx+2][1] = tess.normal[ndx+3][1] = normal[1];
@@ -134,6 +129,7 @@ void RB_AddQuadStampExt( vec3_t origin, vec3_t left, vec3_t up, byte *color, flo
 
 	tess.numVertexes += 4;
 	tess.numIndexes += 6;
+	tess.dlightMap = 0;
 }
 
 /*
@@ -157,8 +153,8 @@ static void RB_SurfaceSprite( void ) {
 	// calculate the xyz locations for the four corners
 	radius = backEnd.currentEntity->e.radius;
 	if ( backEnd.currentEntity->e.rotation == 0 ) {
-		VectorScale( backEnd.viewParms.or.axis[1], radius, left );
-		VectorScale( backEnd.viewParms.or.axis[2], radius, up );
+		VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
+		VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
 	} else {
 		float	s, c;
 		float	ang;
@@ -167,11 +163,11 @@ static void RB_SurfaceSprite( void ) {
 		s = sin( ang );
 		c = cos( ang );
 
-		VectorScale( backEnd.viewParms.or.axis[1], c * radius, left );
-		VectorMA( left, -s * radius, backEnd.viewParms.or.axis[2], left );
+		VectorScale( backEnd.viewParms.ori.axis[1], c * radius, left );
+		VectorMA( left, -s * radius, backEnd.viewParms.ori.axis[2], left );
 
-		VectorScale( backEnd.viewParms.or.axis[2], c * radius, up );
-		VectorMA( up, s * radius, backEnd.viewParms.or.axis[1], up );
+		VectorScale( backEnd.viewParms.ori.axis[2], c * radius, up );
+		VectorMA( up, s * radius, backEnd.viewParms.ori.axis[1], up );
 	}
 	if ( backEnd.viewParms.isMirror ) {
 		VectorSubtract( vec3_origin, left, left );
@@ -186,7 +182,7 @@ static void RB_SurfaceSprite( void ) {
 RB_SurfacePolychain
 =============
 */
-static void RB_SurfacePolychain( srfPoly_t *p ) {
+void RB_SurfacePolychain( srfPoly_t *p ) {
 	int		i;
 	int		numv;
 
@@ -211,16 +207,57 @@ static void RB_SurfacePolychain( srfPoly_t *p ) {
 		tess.numIndexes += 3;
 	}
 
+	tess.vertexColorValid = qtrue;
 	tess.numVertexes = numv;
 }
 
+/*
+=============
+RB_SurfaceMarkFragment
+=============
+*/
+void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
+	int i;
+	int numv;
+
+	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
+
+	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
+	{
+		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
+		// common part could be extracted into an inline func
+
+		// fan triangles into the tess array
+		numv = tess.numVertexes;
+		for ( i = 0; i < p->numVerts; i++ )
+		{
+			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
+			tess.texCoords[numv][0][0] = p->verts[i].st[0];
+			tess.texCoords[numv][0][1] = p->verts[i].st[1];
+			*(int *)&tess.vertexColors[numv] = *(int *)p->verts[ i ].modulate;
+
+			numv++;
+		}
+
+		// generate fan indexes into the tess array
+		for ( i = 0; i < p->numVerts - 2; i++ ) {
+			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
+			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
+			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
+			tess.numIndexes += 3;
+		}
+
+		tess.vertexColorValid = qtrue;
+		tess.numVertexes = numv;
+	}
+}
 
 /*
 =============
 RB_SurfaceTriangles
 =============
 */
-static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
+void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 	int			i;
 	drawVert_t	*dv;
 	float		*xyz, *normal, *texCoords;
@@ -228,7 +265,7 @@ static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 	int			dlightBits;
 	qboolean	needsNormal;
 
-	dlightBits = srf->dlightBits;
+	dlightBits = srf->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
 	RB_CHECKOVERFLOW( srf->numVerts, srf->numIndexes );
@@ -281,7 +318,7 @@ static void RB_SurfaceTriangles( srfTriangles_t *srf ) {
 RB_SurfaceBeam
 ==============
 */
-static void RB_SurfaceBeam( void )
+void RB_SurfaceBeam( void ) 
 {
 #define NUM_BEAM_SEGS 6
 	refEntity_t *e;
@@ -333,449 +370,15 @@ static void RB_SurfaceBeam( void )
 	qglEnd();
 }
 
-//================================================================================
-
-static void DoRailCore( const vec3_t start, const vec3_t end, const vec3_t up, float len, float spanWidth )
-{
-	float		spanWidth2;
-	int			vbase;
-	float		t = len / 256.0f;
-
-	RB_CHECKOVERFLOW( 4, 6 );
-
-	vbase = tess.numVertexes;
-
-	spanWidth2 = -spanWidth;
-
-	// FIXME: use quad stamp?
-	VectorMA( start, spanWidth, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0] * 0.25;
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1] * 0.25;
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2] * 0.25;
-	tess.numVertexes++;
-
-	VectorMA( start, spanWidth2, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = 0;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	VectorMA( end, spanWidth, up, tess.xyz[tess.numVertexes] );
-
-	tess.texCoords[tess.numVertexes][0][0] = t;
-	tess.texCoords[tess.numVertexes][0][1] = 0;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	VectorMA( end, spanWidth2, up, tess.xyz[tess.numVertexes] );
-	tess.texCoords[tess.numVertexes][0][0] = t;
-	tess.texCoords[tess.numVertexes][0][1] = 1;
-	tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-	tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-	tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-	tess.numVertexes++;
-
-	tess.indexes[tess.numIndexes++] = vbase;
-	tess.indexes[tess.numIndexes++] = vbase + 1;
-	tess.indexes[tess.numIndexes++] = vbase + 2;
-
-	tess.indexes[tess.numIndexes++] = vbase + 2;
-	tess.indexes[tess.numIndexes++] = vbase + 1;
-	tess.indexes[tess.numIndexes++] = vbase + 3;
-}
-
-static void DoRailDiscs( int numSegs, const vec3_t start, const vec3_t dir, const vec3_t right, const vec3_t up )
-{
-	int i;
-	vec3_t	pos[4];
-	vec3_t	v;
-	int		spanWidth = r_railWidth->integer;
-	float c, s;
-	float		scale;
-
-	if ( numSegs > 1 )
-		numSegs--;
-	if ( !numSegs )
-		return;
-
-	scale = 0.25;
-
-	for ( i = 0; i < 4; i++ )
-	{
-		c = cos( DEG2RAD( 45 + i * 90 ) );
-		s = sin( DEG2RAD( 45 + i * 90 ) );
-		v[0] = ( right[0] * c + up[0] * s ) * scale * spanWidth;
-		v[1] = ( right[1] * c + up[1] * s ) * scale * spanWidth;
-		v[2] = ( right[2] * c + up[2] * s ) * scale * spanWidth;
-		VectorAdd( start, v, pos[i] );
-
-		if ( numSegs > 1 )
-		{
-			// offset by 1 segment if we're doing a long distance shot
-			VectorAdd( pos[i], dir, pos[i] );
-		}
-	}
-
-	for ( i = 0; i < numSegs; i++ )
-	{
-		int j;
-
-		RB_CHECKOVERFLOW( 4, 6 );
-
-		for ( j = 0; j < 4; j++ )
-		{
-			VectorCopy( pos[j], tess.xyz[tess.numVertexes] );
-			tess.texCoords[tess.numVertexes][0][0] = ( j < 2 );
-			tess.texCoords[tess.numVertexes][0][1] = ( j && j != 3 );
-			tess.vertexColors[tess.numVertexes][0] = backEnd.currentEntity->e.shaderRGBA[0];
-			tess.vertexColors[tess.numVertexes][1] = backEnd.currentEntity->e.shaderRGBA[1];
-			tess.vertexColors[tess.numVertexes][2] = backEnd.currentEntity->e.shaderRGBA[2];
-			tess.numVertexes++;
-
-			VectorAdd( pos[j], dir, pos[j] );
-		}
-
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 0;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 1;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 3;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 3;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 1;
-		tess.indexes[tess.numIndexes++] = tess.numVertexes - 4 + 2;
-	}
-}
-
-/*
-** RB_SurfaceRailRinges
-*/
-static void RB_SurfaceRailRings( void ) {
-	refEntity_t *e;
-	int			numSegs;
-	int			len;
-	vec3_t		vec;
-	vec3_t		right, up;
-	vec3_t		start, end;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, start );
-	VectorCopy( e->origin, end );
-
-	// compute variables
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-	MakeNormalVectors( vec, right, up );
-	numSegs = ( len ) / r_railSegmentLength->value;
-	if ( numSegs <= 0 ) {
-		numSegs = 1;
-	}
-
-	VectorScale( vec, r_railSegmentLength->value, vec );
-
-	DoRailDiscs( numSegs, start, vec, right, up );
-}
-
-/*
-** RB_SurfaceRailCore
-*/
-static void RB_SurfaceRailCore( void ) {
-	refEntity_t *e;
-	int			len;
-	vec3_t		right;
-	vec3_t		vec;
-	vec3_t		start, end;
-	vec3_t		v1, v2;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, start );
-	VectorCopy( e->origin, end );
-
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-
-	// compute side vector
-	VectorSubtract( start, backEnd.viewParms.or.origin, v1 );
-	VectorNormalize( v1 );
-	VectorSubtract( end, backEnd.viewParms.or.origin, v2 );
-	VectorNormalize( v2 );
-	CrossProduct( v1, v2, right );
-	VectorNormalize( right );
-
-	DoRailCore( start, end, right, len, r_railCoreWidth->integer );
-}
-
-/*
-** RB_SurfaceLightningBolt
-*/
-static void RB_SurfaceLightningBolt( void ) {
-	refEntity_t *e;
-	int			len;
-	vec3_t		right;
-	vec3_t		vec;
-	vec3_t		start, end;
-	vec3_t		v1, v2;
-	int			i;
-
-	e = &backEnd.currentEntity->e;
-
-	VectorCopy( e->oldorigin, end );
-	VectorCopy( e->origin, start );
-
-	// compute variables
-	VectorSubtract( end, start, vec );
-	len = VectorNormalize( vec );
-
-	// compute side vector
-	VectorSubtract( start, backEnd.viewParms.or.origin, v1 );
-	VectorNormalize( v1 );
-	VectorSubtract( end, backEnd.viewParms.or.origin, v2 );
-	VectorNormalize( v2 );
-	CrossProduct( v1, v2, right );
-	VectorNormalize( right );
-
-	for ( i = 0 ; i < 4 ; i++ ) {
-		vec3_t	temp;
-
-		DoRailCore( start, end, right, len, 8 );
-		RotatePointAroundVector( temp, vec, right, 45 );
-		VectorCopy( temp, right );
-	}
-}
-
-/*
-** VectorArrayNormalize
-*
-* The inputs to this routing seem to always be close to length = 1.0 (about 0.6 to 2.0)
-* This means that we don't have to worry about zero length or enormously long vectors.
-*/
-void VectorArrayNormalize(vec4_t *normals, unsigned int count)
-{
-//    assert(count);
-        
-#if idppc
-    {
-        float half = 0.5;
-        float one  = 1.0;
-        float *components = (float *)normals;
-        
-        // Vanilla PPC code, but since PPC has a reciprocal square root estimate instruction,
-        // runs *much* faster than calling sqrt().  We'll use a single Newton-Raphson
-        // refinement step to get a little more precision.  This seems to yield results
-        // that are correct to 3 decimal places and usually correct to at least 4 (sometimes 5).
-        // (That is, for the given input range of about 0.6 to 2.0).
-        do {
-            float x, y, z;
-            float B, y0, y1;
-            
-            x = components[0];
-            y = components[1];
-            z = components[2];
-            components += 4;
-            B = x*x + y*y + z*z;
-
-#ifdef __GNUC__            
-            asm("frsqrte %0,%1" : "=f" (y0) : "f" (B));
-#else
-			y0 = __frsqrte(B);
-#endif
-            y1 = y0 + half*y0*(one - B*y0*y0);
-
-            x = x * y1;
-            y = y * y1;
-            components[-4] = x;
-            z = z * y1;
-            components[-3] = y;
-            components[-2] = z;
-        } while(count--);
-    }
-#else // No assembly version for this architecture, or C_ONLY defined
-	// given the input, it's safe to call VectorNormalizeFast
-    while (count--) {
-        VectorNormalizeFast(normals[0]);
-        normals++;
-    }
-#endif
-
-}
-
-
-
-/*
-** LerpMeshVertexes
-*/
-static void LerpMeshVertexes_scalar(md3Surface_t *surf, float backlerp)
-{
-	short	*oldXyz, *newXyz, *oldNormals, *newNormals;
-	float	*outXyz, *outNormal;
-	float	oldXyzScale, newXyzScale;
-	float	oldNormalScale, newNormalScale;
-	int		vertNum;
-	unsigned lat, lng;
-	int		numVerts;
-
-	outXyz = tess.xyz[tess.numVertexes];
-	outNormal = tess.normal[tess.numVertexes];
-
-	newXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-		+ (backEnd.currentEntity->e.frame * surf->numVerts * 4);
-	newNormals = newXyz + 3;
-
-	newXyzScale = MD3_XYZ_SCALE * (1.0 - backlerp);
-	newNormalScale = 1.0 - backlerp;
-
-	numVerts = surf->numVerts;
-
-	if ( backlerp == 0 ) {
-		//
-		// just copy the vertexes
-		//
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			newXyz += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-
-			outXyz[0] = newXyz[0] * newXyzScale;
-			outXyz[1] = newXyz[1] * newXyzScale;
-			outXyz[2] = newXyz[2] * newXyzScale;
-
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= (FUNCTABLE_SIZE/256);
-			lng *= (FUNCTABLE_SIZE/256);
-
-			// decode X as cos( lat ) * sin( long )
-			// decode Y as sin( lat ) * sin( long )
-			// decode Z as cos( long )
-
-			outNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			outNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			outNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-		}
-	} else {
-		//
-		// interpolate and copy the vertex and normal
-		//
-		oldXyz = (short *)((byte *)surf + surf->ofsXyzNormals)
-			+ (backEnd.currentEntity->e.oldframe * surf->numVerts * 4);
-		oldNormals = oldXyz + 3;
-
-		oldXyzScale = MD3_XYZ_SCALE * backlerp;
-		oldNormalScale = backlerp;
-
-		for (vertNum=0 ; vertNum < numVerts ; vertNum++,
-			oldXyz += 4, newXyz += 4, oldNormals += 4, newNormals += 4,
-			outXyz += 4, outNormal += 4) 
-		{
-			vec3_t uncompressedOldNormal, uncompressedNewNormal;
-
-			// interpolate the xyz
-			outXyz[0] = oldXyz[0] * oldXyzScale + newXyz[0] * newXyzScale;
-			outXyz[1] = oldXyz[1] * oldXyzScale + newXyz[1] * newXyzScale;
-			outXyz[2] = oldXyz[2] * oldXyzScale + newXyz[2] * newXyzScale;
-
-			// FIXME: interpolate lat/long instead?
-			lat = ( newNormals[0] >> 8 ) & 0xff;
-			lng = ( newNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-			uncompressedNewNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedNewNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedNewNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			lat = ( oldNormals[0] >> 8 ) & 0xff;
-			lng = ( oldNormals[0] & 0xff );
-			lat *= 4;
-			lng *= 4;
-
-			uncompressedOldNormal[0] = tr.sinTable[(lat+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK] * tr.sinTable[lng];
-			uncompressedOldNormal[1] = tr.sinTable[lat] * tr.sinTable[lng];
-			uncompressedOldNormal[2] = tr.sinTable[(lng+(FUNCTABLE_SIZE/4))&FUNCTABLE_MASK];
-
-			outNormal[0] = uncompressedOldNormal[0] * oldNormalScale + uncompressedNewNormal[0] * newNormalScale;
-			outNormal[1] = uncompressedOldNormal[1] * oldNormalScale + uncompressedNewNormal[1] * newNormalScale;
-			outNormal[2] = uncompressedOldNormal[2] * oldNormalScale + uncompressedNewNormal[2] * newNormalScale;
-
-//			VectorNormalize (outNormal);
-		}
-    	VectorArrayNormalize((vec4_t *)tess.normal[tess.numVertexes], numVerts);
-   	}
-}
-
-static void LerpMeshVertexes(md3Surface_t *surf, float backlerp)
-{
-#if idppc_altivec
-	if (com_altivec->integer) {
-		// must be in a separate translation unit or G3 systems will crash.
-		LerpMeshVertexes_altivec( surf, backlerp );
-		return;
-	}
-#endif // idppc_altivec
-	LerpMeshVertexes_scalar( surf, backlerp );
-}
-
-
-/*
-=============
-RB_SurfaceMesh
-=============
-*/
-static void RB_SurfaceMesh(md3Surface_t *surface) {
-	int				j;
-	float			backlerp;
-	int				*triangles;
-	float			*texCoords;
-	int				indexes;
-	int				Bob, Doug;
-	int				numVerts;
-
-	if (  backEnd.currentEntity->e.oldframe == backEnd.currentEntity->e.frame ) {
-		backlerp = 0;
-	} else  {
-		backlerp = backEnd.currentEntity->e.backlerp;
-	}
-
-	RB_CHECKOVERFLOW( surface->numVerts, surface->numTriangles*3 );
-
-	LerpMeshVertexes (surface, backlerp);
-
-	triangles = (int *) ((byte *)surface + surface->ofsTriangles);
-	indexes = surface->numTriangles * 3;
-	Bob = tess.numIndexes;
-	Doug = tess.numVertexes;
-	for (j = 0 ; j < indexes ; j++) {
-		tess.indexes[Bob + j] = Doug + triangles[j];
-	}
-	tess.numIndexes += indexes;
-
-	texCoords = (float *) ((byte *)surface + surface->ofsSt);
-
-	numVerts = surface->numVerts;
-	for ( j = 0; j < numVerts; j++ ) {
-		tess.texCoords[Doug + j][0][0] = texCoords[j*2+0];
-		tess.texCoords[Doug + j][0][1] = texCoords[j*2+1];
-		// FIXME: fill in lightmapST for completeness?
-	}
-
-	tess.numVertexes += surface->numVerts;
-
-}
-
-
 /*
 ==============
 RB_SurfaceFace
 ==============
 */
-static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
+void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 	int			i;
-	unsigned	*indices;
-	glIndex_t	*tessIndexes;
+	qboolean	needsNormal;
+	unsigned	*indices, *tessIndexes;
 	float		*v;
 	float		*normal;
 	int			ndx;
@@ -785,9 +388,13 @@ static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 
 	RB_CHECKOVERFLOW( surf->numPoints, surf->numIndices );
 
-	dlightBits = surf->dlightBits;
+	dlightBits = surf->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
+	if ((tess.shader->surfaceFlags & SURF_NODLIGHT) || (tess.shader->surfaceFlags & SURF_SKY)) {
+		tess.dlightBits = 0;
+	}
+
 	indices = ( unsigned * ) ( ( ( char  * ) surf ) + surf->ofsIndices );
 
 	Bob = tess.numVertexes;
@@ -800,21 +407,45 @@ static void RB_SurfaceFace( srfSurfaceFace_t *surf ) {
 
 	numPoints = surf->numPoints;
 
-	if ( tess.shader->needsNormal ) {
+	needsNormal = qfalse;
+	if (tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights) {
+		needsNormal = qtrue;
+	}
+
+	v = surf->points[0];
+
+	ndx = tess.numVertexes;
+
+	if (needsNormal) {
 		normal = surf->plane.normal;
 		for ( i = 0, ndx = tess.numVertexes; i < numPoints; i++, ndx++ ) {
 			VectorCopy( normal, tess.normal[ndx] );
 		}
 	}
 
-	for ( i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++ ) {
-		VectorCopy( v, tess.xyz[ndx]);
-		tess.texCoords[ndx][0][0] = v[3];
-		tess.texCoords[ndx][0][1] = v[4];
-		tess.texCoords[ndx][1][0] = v[5];
-		tess.texCoords[ndx][1][1] = v[6];
-		* ( unsigned int * ) &tess.vertexColors[ndx] = * ( unsigned int * ) &v[7];
-		tess.vertexDlightBits[ndx] = dlightBits;
+	if (tess.dlightMap)
+	{
+		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
+			VectorCopy(v, tess.xyz[ndx]);
+			tess.texCoords[ndx][0][0] = v[3];
+			tess.texCoords[ndx][0][1] = v[4];
+			tess.texCoords[ndx][1][0] = v[5] + surf->lightmapOffset[0];
+			tess.texCoords[ndx][1][1] = v[6] + surf->lightmapOffset[1];
+			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
+			tess.vertexDlightBits[ndx] = dlightBits;
+		}
+	}
+	else
+	{
+		for (i = 0, v = surf->points[0], ndx = tess.numVertexes; i < numPoints; i++, v += VERTEXSIZE, ndx++) {
+			VectorCopy(v, tess.xyz[ndx]);
+			tess.texCoords[ndx][0][0] = v[3];
+			tess.texCoords[ndx][0][1] = v[4];
+			tess.texCoords[ndx][1][0] = v[5];
+			tess.texCoords[ndx][1][1] = v[6];
+			*(unsigned int*)&tess.vertexColors[ndx] = *(unsigned int*)&v[7];
+			tess.vertexDlightBits[ndx] = dlightBits;
+		}
 	}
 
 
@@ -831,15 +462,15 @@ static float	LodErrorForVolume( vec3_t local, float radius ) {
 		return 0;
 	}
 
-	world[0] = local[0] * backEnd.or.axis[0][0] + local[1] * backEnd.or.axis[1][0] + 
-		local[2] * backEnd.or.axis[2][0] + backEnd.or.origin[0];
-	world[1] = local[0] * backEnd.or.axis[0][1] + local[1] * backEnd.or.axis[1][1] + 
-		local[2] * backEnd.or.axis[2][1] + backEnd.or.origin[1];
-	world[2] = local[0] * backEnd.or.axis[0][2] + local[1] * backEnd.or.axis[1][2] + 
-		local[2] * backEnd.or.axis[2][2] + backEnd.or.origin[2];
+	world[0] = local[0] * backEnd.ori.axis[0][0] + local[1] * backEnd.ori.axis[1][0] + 
+		local[2] * backEnd.ori.axis[2][0] + backEnd.ori.origin[0];
+	world[1] = local[0] * backEnd.ori.axis[0][1] + local[1] * backEnd.ori.axis[1][1] + 
+		local[2] * backEnd.ori.axis[2][1] + backEnd.ori.origin[1];
+	world[2] = local[0] * backEnd.ori.axis[0][2] + local[1] * backEnd.ori.axis[1][2] + 
+		local[2] * backEnd.ori.axis[2][2] + backEnd.ori.origin[2];
 
-	VectorSubtract( world, backEnd.viewParms.or.origin, world );
-	d = DotProduct( world, backEnd.viewParms.or.axis[0] );
+	VectorSubtract( world, backEnd.viewParms.ori.origin, world );
+	d = DotProduct( world, backEnd.viewParms.ori.axis[0] );
 
 	if ( d < 0 ) {
 		d = -d;
@@ -859,7 +490,7 @@ RB_SurfaceGrid
 Just copy the grid of points and triangulate
 =============
 */
-static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
+void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	int		i, j;
 	float	*xyz;
 	float	*texCoords;
@@ -877,9 +508,13 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	int		*vDlightBits;
 	qboolean	needsNormal;
 
-	dlightBits = cv->dlightBits;
+	dlightBits = cv->dlightBits[backEnd.smpFrame];
 	tess.dlightBits |= dlightBits;
 
+	if (tess.shader->surfaceFlags & (SURF_NODLIGHT | SURF_SKY)) {
+		tess.dlightBits = 0;
+	}
+
 	// determine the allowable discrepance
 	lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
 
@@ -912,6 +547,7 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	// in the tess structure, so we may have to issue it in multiple passes
 
 	used = 0;
+	rows = 0;
 	while ( used < lodHeight - 1 ) {
 		// see how many rows of both verts and indexes we can add without overflowing
 		do {
@@ -921,7 +557,7 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 			// if we don't have enough space for at least one strip, flush the buffer
 			if ( vrows < 2 || irows < 1 ) {
 				RB_EndSurface();
-				RB_BeginSurface(tess.shader, tess.fogNum );
+				RB_BeginSurface(tess.shader);
 			} else {
 				break;
 			}
@@ -942,31 +578,59 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 		texCoords = tess.texCoords[numVertexes][0];
 		color = ( unsigned char * ) &tess.vertexColors[numVertexes];
 		vDlightBits = &tess.vertexDlightBits[numVertexes];
-		needsNormal = tess.shader->needsNormal;
+		needsNormal = tess.shader->needsNormal || tess.shader->needsLSpherical || tr.refdef.num_dlights;
 
-		for ( i = 0 ; i < rows ; i++ ) {
-			for ( j = 0 ; j < lodWidth ; j++ ) {
-				dv = cv->verts + heightTable[ used + i ] * cv->width
-					+ widthTable[ j ];
+		if ( tess.dlightMap ) {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
 
-				xyz[0] = dv->xyz[0];
-				xyz[1] = dv->xyz[1];
-				xyz[2] = dv->xyz[2];
-				texCoords[0] = dv->st[0];
-				texCoords[1] = dv->st[1];
-				texCoords[2] = dv->lightmap[0];
-				texCoords[3] = dv->lightmap[1];
-				if ( needsNormal ) {
-					normal[0] = dv->normal[0];
-					normal[1] = dv->normal[1];
-					normal[2] = dv->normal[2];
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0] + cv->lightmapOffset[0];
+					texCoords[3] = dv->lightmap[1] + cv->lightmapOffset[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
+				}
+			}
+		} else {
+			for ( i = 0 ; i < rows ; i++ ) {
+				for ( j = 0 ; j < lodWidth ; j++ ) {
+					dv = cv->verts + heightTable[ used + i ] * cv->width
+						+ widthTable[ j ];
+
+					xyz[0] = dv->xyz[0];
+					xyz[1] = dv->xyz[1];
+					xyz[2] = dv->xyz[2];
+					texCoords[0] = dv->st[0];
+					texCoords[1] = dv->st[1];
+					texCoords[2] = dv->lightmap[0];
+					texCoords[3] = dv->lightmap[1];
+					if ( needsNormal ) {
+						normal[0] = dv->normal[0];
+						normal[1] = dv->normal[1];
+						normal[2] = dv->normal[2];
+					}
+					* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
+					*vDlightBits++ = dlightBits;
+					xyz += 4;
+					normal += 4;
+					texCoords += 4;
+					color += 4;
 				}
-				* ( unsigned int * ) color = * ( unsigned int * ) dv->color;
-				*vDlightBits++ = dlightBits;
-				xyz += 4;
-				normal += 4;
-				texCoords += 4;
-				color += 4;
 			}
 		}
 
@@ -1025,9 +689,8 @@ RB_SurfaceAxis
 Draws x/y/z lines from the origin for orientation debugging
 ===================
 */
-static void RB_SurfaceAxis( void ) {
+void RB_SurfaceAxis( void ) {
 	GL_Bind( tr.whiteImage );
-	GL_State( GLS_DEFAULT );
 	qglLineWidth( 3 );
 	qglBegin( GL_LINES );
 	qglColor3f( 1,0,0 );
@@ -1052,7 +715,7 @@ RB_SurfaceEntity
 Entities that have a single procedurally generated surface
 ====================
 */
-static void RB_SurfaceEntity( surfaceType_t *surfType ) {
+void RB_SurfaceEntity( surfaceType_t *surfType ) {
 	switch( backEnd.currentEntity->e.reType ) {
 	case RT_SPRITE:
 		RB_SurfaceSprite();
@@ -1060,45 +723,179 @@ static void RB_SurfaceEntity( surfaceType_t *surfType ) {
 	case RT_BEAM:
 		RB_SurfaceBeam();
 		break;
-	case RT_RAIL_CORE:
-		RB_SurfaceRailCore();
-		break;
-	case RT_RAIL_RINGS:
-		RB_SurfaceRailRings();
-		break;
-	case RT_LIGHTNING:
-		RB_SurfaceLightningBolt();
-		break;
 	default:
 		RB_SurfaceAxis();
 		break;
 	}
+	return;
 }
 
-static void RB_SurfaceBad( surfaceType_t *surfType ) {
+void RB_SurfaceBad( surfaceType_t *surfType ) {
 	ri.Printf( PRINT_ALL, "Bad surface tesselated.\n" );
 }
 
-static void RB_SurfaceFlare(srfFlare_t *surf)
-{
-	if (r_flares->integer)
-		RB_AddFlare(surf, tess.fogNum, surf->origin, surf->color, surf->normal);
+#if 0
+
+void RB_SurfaceFlare( srfFlare_t *surf ) {
+	vec3_t		left, up;
+	float		radius;
+	byte		color[4];
+	vec3_t		dir;
+	vec3_t		origin;
+	float		d;
+
+	// calculate the xyz locations for the four corners
+	radius = 30;
+	VectorScale( backEnd.viewParms.ori.axis[1], radius, left );
+	VectorScale( backEnd.viewParms.ori.axis[2], radius, up );
+	if ( backEnd.viewParms.isMirror ) {
+		VectorSubtract( vec3_origin, left, left );
+	}
+
+	color[0] = color[1] = color[2] = color[3] = 255;
+
+	VectorMA( surf->origin, 3, surf->normal, origin );
+	VectorSubtract( origin, backEnd.viewParms.ori.origin, dir );
+	VectorNormalize( dir );
+	VectorMA( origin, r_ignore->value, dir, origin );
+
+	d = -DotProduct( dir, surf->normal );
+	if ( d < 0 ) {
+		return;
+	}
+#if 0
+	color[0] *= d;
+	color[1] *= d;
+	color[2] *= d;
+#endif
+
+	RB_AddQuadStamp( origin, left, up, color );
 }
 
-static void RB_SurfaceSkip( void *surf ) {
+#else
+
+void RB_SurfaceFlare( srfFlare_t *surf ) {
+#if 0
+	vec3_t		left, up;
+	byte		color[4];
+
+	color[0] = surf->color[0] * 255;
+	color[1] = surf->color[1] * 255;
+	color[2] = surf->color[2] * 255;
+	color[3] = 255;
+
+	VectorClear( left );
+	VectorClear( up );
+
+	left[0] = r_ignore->value;
+
+	up[1] = r_ignore->value;
+	
+	RB_AddQuadStampExt( surf->origin, left, up, color, 0, 0, 1, 1 );
+#endif
 }
 
+#endif
+
+
+
+void RB_SurfaceDisplayList( srfDisplayList_t *surf ) {
+	// all apropriate state must be set in RB_BeginSurface
+	// this isn't implemented yet...
+	qglCallList( surf->listNum );
+}
+
+void RB_SurfaceSkip( void *surf ) {
+}
+
+void RB_DrawTerrainTris(srfTerrain_t* p) {
+	int i;
+	terraInt numv;
+	int dlightBits;
+
+	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
+
+	dlightBits = p->dlightBits[backEnd.smpFrame];
+	tess.dlightBits |= dlightBits;
+	if (p->dlightMap[backEnd.smpFrame])
+	{
+		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
+
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
+			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
+			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
+			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.vertexColors[tess.numVertexes][0] = -1;
+			tess.vertexColors[tess.numVertexes][1] = -1;
+			tess.vertexColors[tess.numVertexes][2] = -1;
+			tess.vertexColors[tess.numVertexes][3] = -1;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+	else
+	{
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+			tess.texCoords[tess.numVertexes][0][0] = g_pVert[i].texCoords[0][0];
+			tess.texCoords[tess.numVertexes][0][1] = g_pVert[i].texCoords[0][1];
+			tess.texCoords[tess.numVertexes][1][0] = g_pVert[i].texCoords[1][0];
+			tess.texCoords[tess.numVertexes][1][1] = g_pVert[i].texCoords[1][1];
+			tess.vertexDlightBits[tess.numVertexes] = dlightBits;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.vertexColors[tess.numVertexes][0] = -1;
+			tess.vertexColors[tess.numVertexes][1] = -1;
+			tess.vertexColors[tess.numVertexes][2] = -1;
+			tess.vertexColors[tess.numVertexes][3] = -1;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+
+	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
+	{
+		assert(tess.numVertexes < SHADER_MAX_INDEXES);
+
+		//
+		// Make sure these can be drawn
+		//
+		if (g_pTris[i].byConstChecks & 4)
+		{
+			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
+			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
+			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
+			tess.numIndexes += 3;
+		}
+	}
+}
 
 void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
 	(void(*)(void*))RB_SurfaceSkip,			// SF_SKIP, 
 	(void(*)(void*))RB_SurfaceFace,			// SF_FACE,
-	(void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
-	(void(*)(void*))RB_SurfaceTriangles,		// SF_TRIANGLES,
-	(void(*)(void*))RB_SurfacePolychain,		// SF_POLY,
-	(void(*)(void*))RB_SurfaceMesh,			// SF_MD3,
-	(void(*)(void*))RB_MDRSurfaceAnim,		// SF_MDR,
-	(void(*)(void*))RB_IQMSurfaceAnim,		// SF_IQM,
-	(void(*)(void*))RB_SurfaceFlare,		// SF_FLARE,
-	(void(*)(void*))RB_SurfaceEntity		// SF_ENTITY
+    (void(*)(void*))RB_SurfaceGrid,			// SF_GRID,
+    (void(*)(void*))RB_SurfacePolychain,	// SF_POLY,
+	(void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
+    (void(*)(void*))RB_SurfaceFlare,		// SF_FLARE
+    (void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
+    (void(*)(void*))RB_SurfaceDisplayList,	// SF_DISPLAY_LIST
+	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
+	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
+	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
+	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
+	(void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
+	(void(*)(void*))RB_SurfaceTriangles,	// SF_TRIANGLES,
 };
diff --git a/code/renderergl1/tr_swipe.cpp b/code/renderergl1/tr_swipe.cpp
new file mode 100644
index 00000000..0e87ed63
--- /dev/null
+++ b/code/renderergl1/tr_swipe.cpp
@@ -0,0 +1,183 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_swipe.cpp -- swipe rendering
+
+#include "tr_local.h"
+
+#define MAX_SWIPE_POINTS 1024
+#define MAX_SWIPES       32
+
+typedef struct {
+    vec3_t points[2];
+    float  time;
+} rswipepoint_t;
+
+typedef struct {
+    surfaceType_t surftype;
+    float         life;
+    float         time;
+    int           lastrendtime;
+    qhandle_t     shader;
+    int           numswipes;
+    rswipepoint_t swipes[MAX_SWIPE_POINTS];
+} rendswipe_t;
+
+static int         lastswipeframe;
+static int         numswipes;
+static rendswipe_t swipes[MAX_SWIPES];
+
+/*
+======================
+RE_SwipeBegin
+======================
+*/
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
+{
+    rendswipe_t *swipe;
+
+    if (tr.frameCount != lastswipeframe) {
+        swipe     = &swipes[0];
+        numswipes = 0;
+    }
+
+    if (numswipes >= MAX_SWIPES) {
+        return;
+    }
+
+    swipe = &swipes[numswipes++];
+
+    swipe->life         = life;
+    swipe->time         = thistime;
+    swipe->surftype     = SF_SWIPE;
+    swipe->numswipes    = 0;
+    swipe->lastrendtime = 0;
+    swipe->shader       = shader;
+
+    if (shader < 0 && life) {
+        ri.Printf(PRINT_DEVELOPER, "RE_SwipeBegin: Invalid shader handle\n");
+    }
+
+    lastswipeframe = tr.frameCount;
+}
+
+/*
+======================
+RE_SwipePoint
+======================
+*/
+void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
+{
+    rendswipe_t *swipe = &swipes[numswipes - 1];
+
+    if (swipe->numswipes >= MAX_SWIPE_POINTS) {
+        return;
+    }
+
+    VectorCopy(point1, swipe->swipes[swipe->numswipes - 1].points[0]);
+    VectorCopy(point2, swipe->swipes[swipe->numswipes - 1].points[1]);
+}
+
+/*
+======================
+RE_SwipeEnd
+======================
+*/
+void RE_SwipeEnd() {}
+
+/*
+======================
+R_AddSwipeSurfaces
+======================
+*/
+void R_AddSwipeSurfaces()
+{
+    shader_t *shader;
+    int       at;
+
+    if (!numswipes) {
+        return;
+    }
+
+    tr.currentEntityNum = ENTITYNUM_WORLD;
+    tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+
+    for (at = 0; at < numswipes; at++) {
+        rendswipe_t *swipe     = &swipes[at];
+        int          timedelta = 0;
+
+        if (!swipe->numswipes) {
+            continue;
+        }
+
+        if (swipe->lastrendtime) {
+            timedelta = tr.refdef.time - swipe->lastrendtime;
+        }
+        swipe->lastrendtime = tr.refdef.time;
+
+        if (timedelta) {
+            swipe->time += timedelta;
+        }
+
+        shader = R_GetShaderByHandle(swipe->shader);
+        R_AddDrawSurf(&swipe->surftype, shader, 0);
+    }
+}
+
+/*
+======================
+RB_DrawSwipeSurface
+======================
+*/
+void RB_DrawSwipeSurface(surfaceType_t *pswipe)
+{
+    int          i;
+    float        oolife;
+    rendswipe_t *swipe = (rendswipe_t *)pswipe;
+
+    oolife = 1.0 / swipe->life;
+
+    RB_CHECKOVERFLOW(swipe->numswipes * 2, swipe->numswipes * 6);
+
+    RB_StreamBeginDrawSurf();
+
+    for (i = 0; i < swipe->numswipes; i++) {
+        rswipepoint_t *swipepoint = &swipe->swipes[i];
+        float          alpha;
+        float          f;
+
+        f = 1.0 - (swipe->time - swipepoint->time) * oolife;
+        if (f > 0 && swipe->time >= swipepoint->time) {
+            alpha = f - Q_max(f - 1.0, 0);
+
+            RB_Color4f(alpha, alpha, alpha, alpha);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[0]);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[1]);
+        } else if (i == swipe->numswipes - 1) {
+            swipe->numswipes = 0;
+        }
+    }
+
+    RB_StreamEndDrawSurf();
+}
diff --git a/code/renderergl1/tr_terrain.c b/code/renderergl1/tr_terrain.c
new file mode 100644
index 00000000..10f73a15
--- /dev/null
+++ b/code/renderergl1/tr_terrain.c
@@ -0,0 +1,1719 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_terrain.c : Terrain rendering
+
+#include "tr_local.h"
+
+cvar_t *ter_maxlod;
+cvar_t *ter_maxtris;
+cvar_t *ter_cull;
+cvar_t *ter_lock;
+cvar_t *ter_error;
+cvar_t *ter_cautiousframes;
+cvar_t *ter_count;
+
+#define TERRAIN_TABLE_SIZE 180
+
+static float g_fDistanceTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotProductTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotSquaredTable[TERRAIN_TABLE_SIZE];
+static float g_fFogDistance;
+static float g_fClipDotProduct;
+static float g_fClipDotSquared;
+
+static vec3_t g_vClipOrigin;
+static vec3_t g_vClipVector;
+static vec3_t g_vViewOrigin;
+static vec3_t g_vViewVector;
+
+static int    g_terVisCount;
+static float  g_fCheck;
+static size_t g_nTris;
+static size_t g_nVerts;
+static int    g_nMerge;
+static int    g_nSplit;
+unsigned int  g_uiTerDist;
+vec2_t        g_vTerOrg;
+vec3_t        g_vTerFwd;
+
+static const unsigned int MAX_TERRAIN_LOD       = 6;
+static const float        TERRAIN_LIGHTMAP_SIZE = 128.0f;
+
+#define VARNODE_INVISIBLE	4
+#define VARNODE_DELETE		8
+
+typedef struct poolInfo_s {
+    terraInt iFreeHead;
+    terraInt iCur;
+    size_t   nFree;
+} poolInfo_t;
+
+static int modeTable[8];
+
+terraTri_t    *g_pTris;
+terrainVert_t *g_pVert;
+
+poolInfo_t g_tri;
+poolInfo_t g_vert;
+
+/*
+================
+R_ValidateHeightmapForVertex
+================
+*/
+static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
+{
+    for (terraInt i = 0; i < 3; i++) {
+        terrainVert_t *pVert = &g_pVert[pTri->iPt[i]];
+        if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80]) {
+            pVert->pHgt = pTri->patch->heightmap;
+        }
+    }
+}
+
+/*
+================
+R_AllocateVert
+================
+*/
+static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
+{
+    terraInt iVert = g_vert.iFreeHead;
+
+    g_vert.iFreeHead                = g_pVert[g_vert.iFreeHead].iNext;
+    g_pVert[g_vert.iFreeHead].iPrev = 0;
+
+    g_pVert[iVert].iPrev                     = 0;
+    g_pVert[iVert].iNext                     = patch->drawinfo.iVertHead;
+    g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
+
+    patch->drawinfo.iVertHead = iVert;
+    patch->drawinfo.nVerts++;
+
+    assert(g_vert.nFree > 0);
+    g_vert.nFree--;
+
+    g_pVert[iVert].nRef         = 0;
+    g_pVert[iVert].uiDistRecalc = 0;
+
+    return iVert;
+}
+
+/*
+================
+R_InterpolateVert
+================
+*/
+static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
+{
+    const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
+    const terrainVert_t         *pVert1 = &g_pVert[pTri->iPt[1]];
+    const cTerraPatchUnpacked_t *pPatch = pTri->patch;
+    const byte                  *pMinHeight, *pMaxHeight;
+
+    // Interpolate texture coordinates
+    pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
+    pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
+    pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
+    pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
+
+    // Fixed in OPM
+    //  Use the delta of the two pointers instead of adding them + divide to get the average height,
+    //  otherwise the resulting integer would overflow/warp and cause a segmentation fault.
+    //  Although rare, the overflow issue can occur in the original game
+    pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight || pMinHeight == pMaxHeight);
+
+    // Calculate the average Z
+    pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
+    pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
+    pVert->fHgtAvg += pPatch->z0;
+    // Calculate the average position
+    pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
+    pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
+    pVert->xyz[2] = pVert->fHgtAvg;
+}
+
+/*
+================
+R_ReleaseVert
+================
+*/
+static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
+{
+    terrainVert_t *pVert = &g_pVert[iVert];
+
+    terraInt iPrev       = pVert->iPrev;
+    terraInt iNext       = pVert->iNext;
+    g_pVert[iPrev].iNext = iNext;
+    g_pVert[iNext].iPrev = iPrev;
+
+    assert(patch->drawinfo.nVerts > 0);
+    patch->drawinfo.nVerts--;
+
+    if (patch->drawinfo.iVertHead == iVert) {
+        patch->drawinfo.iVertHead = iNext;
+    }
+
+    pVert->iPrev                    = 0;
+    pVert->iNext                    = g_vert.iFreeHead;
+    g_pVert[g_vert.iFreeHead].iPrev = iVert;
+    g_vert.iFreeHead                = iVert;
+    g_vert.nFree++;
+}
+
+/*
+================
+R_AllocateTri
+================
+*/
+terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
+{
+    terraInt iTri = g_tri.iFreeHead;
+
+    g_tri.iFreeHead                = g_pTris[iTri].iNext;
+    g_pTris[g_tri.iFreeHead].iPrev = 0;
+
+    g_pTris[iTri].iPrev                     = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext                     = 0;
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+    patch->drawinfo.iTriTail                = iTri;
+
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+
+    patch->drawinfo.nTris++;
+    assert(g_tri.nFree > 0);
+    g_tri.nFree--;
+
+    g_pTris[iTri].byConstChecks = check ? 0 : 4;
+    g_pTris[iTri].uiDistRecalc  = 0;
+    patch->uiDistRecalc         = 0;
+
+    return iTri;
+}
+
+/*
+================
+R_ReleaseTri
+================
+*/
+static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraTri_t *pTri = &g_pTris[iTri];
+
+    terraInt iPrev       = pTri->iPrev;
+    terraInt iNext       = pTri->iNext;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->uiDistRecalc = 0;
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    pTri->iPrev                    = 0;
+    pTri->iNext                    = g_tri.iFreeHead;
+    g_pTris[g_tri.iFreeHead].iPrev = iTri;
+    g_tri.iFreeHead                = iTri;
+    g_tri.nFree++;
+
+    for (int i = 0; i < 3; i++) {
+        terraInt ptNum = pTri->iPt[i];
+
+        g_pVert[ptNum].nRef--;
+        if (!g_pVert[ptNum].nRef) {
+            R_ReleaseVert(patch, ptNum);
+        }
+    }
+}
+
+/*
+================
+R_ConstChecksForTri
+================
+*/
+static int R_ConstChecksForTri(terraTri_t *pTri)
+{
+    varnodeUnpacked_t vn;
+
+    if (pTri->lod == MAX_TERRAIN_LOD) {
+        return 2;
+    }
+
+    vn = *pTri->varnode;
+    //vn.s.flags &= 0xF0;
+    vn.flags &= 0xFFFFFFF0;
+
+    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & VARNODE_DELETE)) {
+        return 2;
+    } else if (pTri->varnode->flags & VARNODE_DELETE) {
+        return 3;
+    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->flags & 4) && pTri->lod < ter_maxlod->integer) {
+        return 0;
+    }
+
+    return 2;
+}
+
+/*
+================
+R_DemoteInAncestry
+================
+*/
+static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraInt iPrev = g_pTris[iTri].iPrev;
+    terraInt iNext = g_pTris[iTri].iNext;
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    g_pTris[iTri].iPrev                       = 0;
+    g_pTris[iTri].iNext                       = patch->drawinfo.iMergeHead;
+    g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
+    patch->drawinfo.iMergeHead                = iTri;
+}
+
+/*
+================
+R_TerrainHeapInit
+================
+*/
+static void R_TerrainHeapInit()
+{
+    g_tri.iFreeHead  = 1;
+    g_tri.nFree      = g_nTris - 1;
+    g_vert.iFreeHead = 1;
+    g_vert.nFree     = g_nVerts - 1;
+
+    for (size_t i = 0; i < g_nTris; i++) {
+        g_pTris[i].iPrev = (terraInt)i - 1;
+        g_pTris[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pTris[0].iPrev           = 0;
+    g_pTris[g_nTris - 1].iNext = 0;
+
+    for (size_t i = 0; i < g_nVerts; i++) {
+        g_pVert[i].iPrev = (terraInt)i - 1;
+        g_pVert[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pVert[0].iPrev            = 0;
+    g_pVert[g_nVerts - 1].iNext = 0;
+}
+
+/*
+================
+R_TerrainPatchesInit
+================
+*/
+static void R_TerrainPatchesInit()
+{
+    int i;
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+        patch->drawinfo.iTriHead     = 0;
+        patch->drawinfo.iTriTail     = 0;
+        patch->drawinfo.iMergeHead   = 0;
+        patch->drawinfo.iVertHead    = 0;
+        patch->drawinfo.nTris        = 0;
+        patch->drawinfo.nVerts       = 0;
+    }
+}
+
+/*
+================
+R_SplitTri
+================
+*/
+
+void R_SplitTri(
+    terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight
+)
+{
+    terraTri_t *pSplit = &g_pTris[iSplit];
+
+    terraTri_t *pLeft;
+    if (iLeft) {
+        pLeft = &g_pTris[iLeft];
+    } else {
+        pLeft = NULL;
+    }
+
+    terraTri_t *pRight;
+    if (iRight) {
+        pRight = &g_pTris[iRight];
+    } else {
+        pRight = NULL;
+    }
+
+    int                iNextLod = pSplit->lod + 1;
+    int                index    = pSplit->index;
+    varnodeUnpacked_t *varnode  = &pSplit->varnode[index];
+
+    if (pLeft) {
+        pLeft->patch   = pSplit->patch;
+        pLeft->index   = index * 2;
+        pLeft->varnode = varnode;
+        pLeft->lod     = iNextLod;
+        pLeft->iLeft   = iRight;
+        pLeft->iRight  = iRightOfLeft;
+        pLeft->iBase   = pSplit->iLeft;
+        pLeft->iPt[0]  = pSplit->iPt[1];
+        pLeft->iPt[1]  = pSplit->iPt[2];
+        pLeft->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pLeft);
+        pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
+
+        g_pVert[pLeft->iPt[0]].nRef++;
+        g_pVert[pLeft->iPt[1]].nRef++;
+        g_pVert[pLeft->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pLeft->nSplit = 0;
+    }
+
+    if (pSplit->iLeft) {
+        if (g_pTris[pSplit->iLeft].lod == iNextLod) {
+            g_pTris[pSplit->iLeft].iBase = iLeft;
+        } else {
+            g_pTris[pSplit->iLeft].iRight = iLeft;
+        }
+    }
+
+    if (pRight) {
+        pRight->patch   = pSplit->patch;
+        pRight->index   = index * 2 + 1;
+        pRight->varnode = varnode + 1;
+        pRight->lod     = iNextLod;
+        pRight->iLeft   = iLeftOfRight;
+        pRight->iRight  = iLeft;
+        pRight->iBase   = pSplit->iRight;
+        pRight->iPt[0]  = pSplit->iPt[2];
+        pRight->iPt[1]  = pSplit->iPt[0];
+        pRight->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pRight);
+        pRight->byConstChecks |= R_ConstChecksForTri(pRight);
+
+        g_pVert[pRight->iPt[0]].nRef++;
+        g_pVert[pRight->iPt[1]].nRef++;
+        g_pVert[pRight->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pRight->nSplit = 0;
+    }
+
+    if (pSplit->iRight) {
+        if (g_pTris[pSplit->iRight].lod == iNextLod) {
+            g_pTris[pSplit->iRight].iBase = iRight;
+        } else {
+            g_pTris[pSplit->iRight].iLeft = iRight;
+        }
+    }
+}
+
+/*
+================
+R_ForceSplit
+================
+*/
+static void R_ForceSplit(terraInt iTri)
+{
+    terraTri_t    *pTri = &g_pTris[iTri];
+    terraTri_t    *pBase;
+    terrainVert_t *pVert;
+    terraInt       iBase;
+    terraInt       iTriLeft, iTriRight;
+    terraInt       iNewPt;
+    terraInt       iBaseLeft = 0, iBaseRight = 0;
+    terraInt       iNewBasePt;
+    uint32_t       flags, flags2;
+
+    g_nSplit++;
+
+    iBase = pTri->iBase;
+    pBase = &g_pTris[iBase];
+    if (iBase && pBase->lod != pTri->lod) {
+        assert(g_pTris[pTri->iBase].iBase != iTri);
+        assert(g_tri.nFree >= 8);
+
+        R_ForceSplit(iBase);
+
+        assert(g_tri.nFree >= 4);
+
+        iBase = pTri->iBase;
+        pBase = &g_pTris[iBase];
+    }
+
+    flags = pTri->varnode->flags;
+
+    iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
+    iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
+
+    iNewPt = R_AllocateVert(pTri->patch);
+    R_InterpolateVert(pTri, &g_pVert[iNewPt]);
+
+    g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
+
+    iBaseLeft  = 0;
+    iBaseRight = 0;
+
+    if (iBase) {
+        flags2 = pBase->varnode->flags;
+        flags |= flags2;
+
+        iBaseLeft  = R_AllocateTri(pBase->patch, (flags2 & 2));
+        iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
+
+        iNewBasePt = iNewPt;
+        if (pBase->patch != pTri->patch) {
+            iNewBasePt = R_AllocateVert(pBase->patch);
+            pVert      = &g_pVert[iNewBasePt];
+            R_InterpolateVert(pBase, pVert);
+
+            pVert->fVariance = g_pVert[iNewPt].fVariance;
+            if (flags & VARNODE_DELETE) {
+                pVert->fHgtAvg += pVert->fHgtAdd;
+                pVert->fHgtAdd   = 0.0;
+                pVert->fVariance = 0.0;
+                pVert->xyz[2]    = pVert->fHgtAvg;
+            }
+        }
+
+        R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
+
+        pBase->iLeftChild           = iBaseLeft;
+        pBase->iRightChild          = iBaseRight;
+        g_pTris[iBaseLeft].iParent  = iBase;
+        g_pTris[iBaseRight].iParent = iBase;
+        R_DemoteInAncestry(pBase->patch, iBase);
+    }
+
+    if (flags & VARNODE_DELETE) {
+        pVert = &g_pVert[iNewPt];
+        pVert->fHgtAvg += pVert->fHgtAdd;
+        pVert->fHgtAdd   = 0.0;
+        pVert->fVariance = 0.0;
+        pVert->xyz[2]    = pVert->fHgtAvg;
+    }
+
+    R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
+
+    pTri->iLeftChild           = iTriLeft;
+    pTri->iRightChild          = iTriRight;
+    g_pTris[iTriLeft].iParent  = iTri;
+    g_pTris[iTriRight].iParent = iTri;
+    R_DemoteInAncestry(pTri->patch, iTri);
+}
+
+/*
+================
+R_ForceMerge
+================
+*/
+static void R_ForceMerge(terraInt iTri)
+{
+    terraTri_t            *pTri  = &g_pTris[iTri];
+    cTerraPatchUnpacked_t *patch = pTri->patch;
+    terraInt               iPrev = pTri->iPrev;
+    terraInt               iNext = pTri->iNext;
+
+    g_nMerge++;
+
+    if (pTri->iLeftChild) {
+        terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
+
+        pTri->iLeft = iLeft;
+        if (iLeft) {
+            if (g_pTris[iLeft].lod == pTri->lod) {
+                g_pTris[iLeft].iRight = iTri;
+            } else {
+                g_pTris[iLeft].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iLeftChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    if (pTri->iRightChild) {
+        terraInt iRight = g_pTris[pTri->iRightChild].iBase;
+
+        pTri->iRight = iRight;
+        if (iRight) {
+            if (g_pTris[iRight].lod == pTri->lod) {
+                g_pTris[iRight].iLeft = iTri;
+            } else {
+                g_pTris[iRight].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iRightChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->drawinfo.nTris++;
+    if (patch->drawinfo.iMergeHead == iTri) {
+        patch->drawinfo.iMergeHead = iNext;
+    }
+
+    g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext = 0;
+
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+
+    patch->drawinfo.iTriTail = iTri;
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+}
+
+/*
+================
+R_TerraTriNeighbor
+================
+*/
+static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, int dir)
+{
+    int iNeighbor;
+
+    if (iPatch < 0) {
+        return 0;
+    }
+
+    iNeighbor = 2 * iPatch + 1;
+
+    switch (dir) {
+    case 0:
+        return iNeighbor;
+    case 1:
+        if (terraPatches[iPatch].flags & TERPATCH_NEIGHBOR) {
+            return iNeighbor;
+        } else {
+            return iNeighbor + 1;
+        }
+        break;
+    case 2:
+        return iNeighbor + 1;
+    case 3:
+        if (terraPatches[iPatch].flags & TERPATCH_NEIGHBOR) {
+            return iNeighbor + 1;
+        } else {
+            return iNeighbor;
+        }
+        break;
+    }
+
+    return 0;
+}
+
+/*
+================
+R_PreTessellateTerrain
+================
+*/
+static void R_PreTessellateTerrain()
+{
+    size_t numTerrainPatches = tr.world->numTerraPatches;
+
+    if (!numTerrainPatches) {
+        return;
+    }
+
+    R_IssuePendingRenderCommands();
+
+    if (ter_maxtris->integer < 4 * numTerrainPatches) {
+        ri.Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
+    } else if (ter_maxtris->integer > 65535) {
+        ri.Cvar_SetValue("ter_maxtris", 65535);
+    }
+
+    ri.Printf(PRINT_DEVELOPER, "Using ter_maxtris = %d\n", ter_maxtris->integer);
+
+    g_nTris  = ter_maxtris->integer * 2 + 1;
+    g_nVerts = ter_maxtris->integer + 1;
+    g_pTris  = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
+    g_pVert  = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
+
+    // Init triangles & vertices
+    R_TerrainHeapInit();
+    R_TerrainPatchesInit();
+
+    for (size_t i = 0; i < numTerrainPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+
+        patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
+        patch->drawinfo.nTris       = 0;
+        patch->drawinfo.nVerts      = 0;
+        patch->drawinfo.iTriHead    = 0;
+        patch->drawinfo.iTriTail    = 0;
+        patch->drawinfo.iVertHead   = 0;
+
+        float sMin, tMin;
+
+        if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0]) {
+            sMin = patch->texCoord[0][0][0];
+        } else {
+            sMin = patch->texCoord[0][1][0];
+        }
+
+        float sMin2;
+        if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0]) {
+            sMin2 = patch->texCoord[1][0][0];
+        } else {
+            sMin2 = patch->texCoord[1][1][0];
+        }
+
+        if (sMin >= sMin2) {
+            if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0]) {
+                sMin = floor(patch->texCoord[1][1][0]);
+            } else {
+                sMin = floor(patch->texCoord[1][0][0]);
+            }
+        } else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0]) {
+            sMin = floor(patch->texCoord[0][1][0]);
+        } else {
+            sMin = floor(patch->texCoord[0][0][0]);
+        }
+
+        if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1]) {
+            tMin = patch->texCoord[0][0][1];
+        } else {
+            tMin = patch->texCoord[0][1][1];
+        }
+
+        float tMin2;
+        if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1]) {
+            tMin2 = patch->texCoord[1][0][1];
+        } else {
+            tMin2 = patch->texCoord[1][1][1];
+        }
+
+        if (tMin >= tMin2) {
+            if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1]) {
+                tMin = floor(patch->texCoord[1][1][1]);
+            } else {
+                tMin = floor(patch->texCoord[1][0][1]);
+            }
+        } else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1]) {
+            tMin = floor(patch->texCoord[0][1][1]);
+        } else {
+            tMin = floor(patch->texCoord[0][0][1]);
+        }
+
+        const float s00 = patch->texCoord[0][0][0] - sMin;
+        const float s01 = patch->texCoord[0][1][0] - sMin;
+        const float s10 = patch->texCoord[1][0][0] - sMin;
+        const float s11 = patch->texCoord[1][1][0] - sMin;
+
+        const float t00 = patch->texCoord[0][0][1] - tMin;
+        const float t01 = patch->texCoord[0][1][1] - tMin;
+        const float t10 = patch->texCoord[1][0][1] - tMin;
+        const float t11 = patch->texCoord[1][1][1] - tMin;
+
+        const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
+        const float ls       = patch->s + lmapSize;
+        const float lt       = patch->t + lmapSize;
+
+        terraInt iTri0 = R_AllocateTri(patch, qfalse);
+        terraInt iTri1 = R_AllocateTri(patch, qfalse);
+        terraInt i00   = R_AllocateVert(patch);
+        terraInt i01   = R_AllocateVert(patch);
+        terraInt i10   = R_AllocateVert(patch);
+        terraInt i11   = R_AllocateVert(patch);
+
+        terrainVert_t *pVert;
+        pVert                  = &g_pVert[i00];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[0] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[0];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s00;
+        pVert->texCoords[0][1] = t00;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i01];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[72] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[72];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s01;
+        pVert->texCoords[0][1] = t01;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i10];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[8] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[8];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s10;
+        pVert->texCoords[0][1] = t10;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i11];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[80] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[80];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s11;
+        pVert->texCoords[0][1] = t11;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        terraTri_t *pTri = &g_pTris[iTri0];
+        pTri->patch      = patch;
+        pTri->varnode    = &patch->varTree[0][0];
+        pTri->index      = 1;
+        pTri->lod        = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri1;
+        if ((patch->flags & TERPATCH_NEIGHBOR) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            if (patch->flags & TERPATCH_FLIP) {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            } else {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            }
+            pTri->iPt[2] = i01;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            if (patch->flags & TERPATCH_FLIP) {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            } else {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            }
+            pTri->iPt[2] = i11;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+
+        pTri          = &g_pTris[iTri1];
+        pTri->patch   = patch;
+        pTri->varnode = &patch->varTree[1][0];
+        pTri->index   = 1;
+        pTri->lod     = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri0;
+        if ((patch->flags & TERPATCH_NEIGHBOR) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            if (patch->flags & TERPATCH_FLIP) {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            } else {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            }
+            pTri->iPt[2] = i10;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            if (patch->flags & TERPATCH_FLIP) {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            } else {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            }
+            pTri->iPt[2] = i00;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+    }
+}
+
+/*
+================
+R_NeedSplitTri
+================
+*/
+static qboolean R_NeedSplitTri(terraTri_t *pTri)
+{
+    uint8_t byConstChecks = pTri->byConstChecks;
+    if (byConstChecks & 2) {
+        return byConstChecks & 1;
+    }
+
+    if (pTri->uiDistRecalc > g_uiTerDist) {
+        return qfalse;
+    }
+
+    float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
+                    + (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
+                     * 0.5
+                 + g_vViewVector[2] - pTri->varnode->fVariance * g_fCheck;
+
+    if (fRatio > 0) {
+        pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
+        return qfalse;
+    }
+
+    return qtrue;
+}
+
+/*
+================
+R_CalcVertMorphHeight
+================
+*/
+static void R_CalcVertMorphHeight(terrainVert_t *pVert)
+{
+    float dot;
+
+    pVert->xyz[2]       = pVert->fHgtAvg;
+    pVert->uiDistRecalc = g_uiTerDist + 1;
+    dot                 = (pVert->fVariance * g_fCheck)
+        - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
+
+    if (dot > 0.0) {
+        float calc = dot / 400.0;
+
+        if (calc > 1.0) {
+            pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
+            calc                = 1.0;
+        }
+
+        pVert->xyz[2] += pVert->fHgtAdd * calc;
+    } else {
+        pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
+    }
+}
+
+/*
+================
+R_UpdateVertMorphHeight
+================
+*/
+static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
+{
+    if (pVert->uiDistRecalc <= g_uiTerDist) {
+        R_CalcVertMorphHeight(pVert);
+    }
+}
+
+/*
+================
+R_DoTriSplitting
+================
+*/
+static void R_DoTriSplitting()
+{
+    cTerraPatchUnpacked_t *patch;
+
+    for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+        if (patch->uiDistRecalc > g_uiTerDist) {
+            continue;
+        }
+
+        patch->uiDistRecalc = -1;
+        g_tri.iCur          = patch->drawinfo.iTriHead;
+        while (g_tri.iCur != 0) {
+            terraTri_t *pTri = &g_pTris[g_tri.iCur];
+
+            if (R_NeedSplitTri(pTri)) {
+                //
+                // make sure there are sufficient number of tris
+                //
+                // Fixed in OPM
+                //  Properly check the number of tris, which is double the number of verts
+                if (g_tri.nFree < 14*2 || g_vert.nFree < 14) {
+                    ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
+                    return;
+                }
+
+                patch->uiDistRecalc = 0;
+                R_ForceSplit(g_tri.iCur);
+
+                if (&g_pTris[g_tri.iCur] == pTri) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            } else {
+                if ((pTri->byConstChecks & 3) != 2) {
+                    if (patch->uiDistRecalc > pTri->uiDistRecalc) {
+                        patch->uiDistRecalc = pTri->uiDistRecalc;
+                    }
+                }
+
+                g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+            }
+        }
+    }
+}
+
+/*
+================
+R_DoGeomorphs
+================
+*/
+static void R_DoGeomorphs()
+{
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_vert.iCur = patch->drawinfo.iVertHead;
+
+        if (patch->visCountDraw == g_terVisCount) {
+            if (patch->byDirty) {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_CalcVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+
+                patch->byDirty = qfalse;
+            } else {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_UpdateVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+            }
+        } else {
+            if (!patch->byDirty) {
+                patch->byDirty = qtrue;
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    pVert->xyz[2]        = pVert->fHgtAvg;
+                    g_vert.iCur          = pVert->iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_MergeInternalAggressive
+================
+*/
+static qboolean R_MergeInternalAggressive()
+{
+    terraTri_t *pTri = &g_pTris[g_tri.iCur];
+    terraTri_t *pBase;
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_MergeInternalCautious
+================
+*/
+static qboolean R_MergeInternalCautious()
+{
+    terraTri_t *pTri;
+    terraTri_t *pBase;
+
+    pTri = &g_pTris[g_tri.iCur];
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (pTri->varnode->flags & VARNODE_DELETE) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit || (pBase->varnode->flags & VARNODE_DELETE)) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_DoTriMerging
+================
+*/
+static void R_DoTriMerging()
+{
+    int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
+
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        const cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_tri.iCur = patch->drawinfo.iMergeHead;
+        if (patch->visCountDraw >= iCautiousFrame) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalCautious()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        } else if (patch->visCountDraw > iCautiousFrame - 10) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalAggressive()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_TessellateTerrain
+================
+*/
+void R_TessellateTerrain()
+{
+    R_DoTriSplitting();
+    // Morph geometry according to the view
+    R_DoGeomorphs();
+    // Merge vertices
+    R_DoTriMerging();
+}
+
+/*
+================
+R_TerrainPrepareFrame
+================
+*/
+void R_TerrainPrepareFrame()
+{
+    float distance;
+    int   index;
+    float fFov;
+    float fCheck;
+    float fDistBound;
+
+    if (ter_lock->integer) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    g_terVisCount++;
+    tr.world->activeTerraPatches = NULL;
+
+    if (ter_error->value < 0.1) {
+        ri.Cvar_Set("ter_error", "0.1");
+    }
+
+    distance = 1.0;
+    fFov     = tr.refdef.fov_x;
+    if (fFov < 1.0) {
+        fFov = 1.0;
+    }
+
+    fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
+    if (g_terVisCount) {
+        float fFarPlane = tr.viewParms.farplane_distance;
+        if (fFarPlane == 0.0) {
+            fFarPlane = 4096.0;
+        }
+
+        fDistBound = fabs((fCheck - g_fCheck) * 510.0) + fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
+                   + fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
+                   + fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
+                   + fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
+
+        g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
+        if (g_uiTerDist > 0xF0000000) {
+            for (index = 0; index < tr.world->numTerraPatches; index++) {
+                tr.world->terraPatches[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nTris; index++) {
+                g_pTris[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nVerts; index++) {
+                g_pVert[index].uiDistRecalc = 0;
+            }
+
+            g_uiTerDist = 0;
+        }
+    } else {
+        fDistBound  = 0.0;
+        g_uiTerDist = 0;
+    }
+
+    VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
+    VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
+    g_fCheck = fCheck;
+
+    if (fDistBound != 0.0) {
+        index    = (int)tr.refdef.fov_x;
+        distance = g_fDistanceTable[index];
+
+        g_fClipDotSquared = g_fClipDotSquaredTable[index];
+        g_fClipDotProduct = g_fClipDotProductTable[index];
+        VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
+        g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
+        g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
+        g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
+        g_vViewVector[0] = tr.refdef.viewaxis[0][0];
+        g_vViewVector[1] = tr.refdef.viewaxis[0][1];
+        g_vViewVector[2] =
+            -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
+        VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
+
+        if (tr.viewParms.farplane_distance > 0) {
+            g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
+        } else {
+            g_fFogDistance = 999999.0;
+        }
+    }
+}
+
+/*
+================
+R_MarkTerrainPatch
+================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
+{
+    if (pPatch->visCountCheck == g_terVisCount) {
+        return;
+    }
+
+    pPatch->visCountCheck = g_terVisCount;
+    if (ter_cull->integer) {
+        vec3_t v;
+        float  dot;
+
+        v[0] = pPatch->x0 - g_vClipOrigin[0];
+        v[1] = pPatch->y0 - g_vClipOrigin[1];
+        v[2] = pPatch->z0 - g_vClipOrigin[2];
+
+        dot = DotProduct(v, g_vClipVector);
+        if (dot > g_fFogDistance) {
+            return;
+        }
+
+        if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
+            return;
+        }
+    }
+
+    pPatch->visCountDraw         = g_terVisCount;
+    pPatch->pNextActive          = tr.world->activeTerraPatches;
+    tr.world->activeTerraPatches = pPatch;
+}
+
+/*
+================
+R_AddTerrainSurfaces
+================
+*/
+void R_AddTerrainSurfaces()
+{
+    int                    i;
+    int                    dlight;
+    cTerraPatchUnpacked_t *patch;
+
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+
+    if (!ter_lock->integer) {
+        R_TessellateTerrain();
+    }
+
+    if (ter_count->integer || ter_lock->integer == 2) {
+        for (i = 0; i < tr.world->numTerraPatches; i++) {
+            patch = &tr.world->terraPatches[i];
+
+            if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount) {
+                assert(patch->shader);
+
+                dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+                R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, dlight);
+            }
+
+            if (ter_count->integer && (g_nSplit || g_nMerge)) {
+                if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
+                    ri.Printf(
+                        PRINT_DEVELOPER,
+                        "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
+                        g_nTris - g_tri.nFree,
+                        g_nVerts - g_vert.nFree,
+                        g_nSplit,
+                        g_nMerge
+                    );
+                }
+
+                g_nSplit = 0;
+                g_nMerge = 0;
+            }
+        }
+    } else {
+        for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+            assert(patch->shader);
+
+            dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+            R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, dlight);
+        }
+    }
+}
+
+/*
+================
+R_TerrainHeightForPoly
+
+Calculates the height of a terrain polygon by interpolating the heights of its vertices.
+The function finds the triangle containing the given point (x, y) within the terrain patch,
+and then computes the height at each vertex of the polygon using barycentric interpolation.
+Finally, it updates the z-coordinate of each vertex to store the calculated height.
+Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
+
+ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
+================
+*/
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVerts, int nVerts)
+{
+    float x0     = 0;
+    float y0     = 0;
+    float x1     = 0;
+    float y1     = 0;
+    float x2     = 0;
+    float y2     = 0;
+    float fKx[3] = {0}, fKy[3] = {0}, fKz[3] = {0}, fArea[3] = {0};
+    float fAreaTotal = 0;
+
+    float    x = pVerts->xyz[0];
+    float    y = pVerts->xyz[1];
+    terraInt iTri;
+
+    // Calculate the average of the x and y coordinates of all vertices
+    if (nVerts > 1) {
+        for (int i = 1; i < nVerts; i++) {
+            x += pVerts[i].xyz[0];
+            y += pVerts[i].xyz[1];
+        }
+
+        // Use the averaged values from this point onwards
+        x = x / nVerts;
+        y = y / nVerts;
+    }
+
+    // Get the first valid triangle in the patch
+    iTri = pPatch->drawinfo.iTriHead;
+
+    // Find a triangle that contains the point (x, y)
+    for (iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
+        if (g_pTris[iTri].byConstChecks & 4) {
+            // Get all three x-y coordinates of the current triangle's vertices
+            x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
+            y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
+            x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
+            y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
+            x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
+            y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
+
+            // Calculate the signed areas of the three sub-triangles
+            fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
+            if (fArea[0] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
+            if (fArea[1] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
+            if (fArea[2] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fAreaTotal = fArea[0] + fArea[1] + fArea[2];
+            if (fAreaTotal > 0.0) {
+                //
+                // Found it - the point is inside the triangle
+                // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
+                //
+
+                float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
+                float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
+                float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
+
+                fKy[0] = z0 * (x2 - x1);
+                fKy[1] = z1 * (x0 - x2);
+                fKy[2] = z2 * (x1 - x0);
+
+                fKx[0] = z0 * (y2 - y1);
+                fKx[1] = z1 * (y0 - y2);
+                fKx[2] = z2 * (y1 - y0);
+
+                // Note: this could be done with the CrossProduct macro if everything were in a vector
+                fKz[0] = fKx[0] * x1 - y1 * fKy[0];
+                fKz[1] = fKx[1] * x2 - y2 * fKy[1];
+                fKz[2] = fKx[2] * x0 - y0 * fKy[2];
+
+                // Calculate the height for each vertex
+                for (int i = 0; i < nVerts; i++) {
+                    float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
+                    float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
+                    float fConstZ = fKz[0] + fKz[1] + fKz[2];
+
+                    // Write back the calculated height into the vertex
+                    pVerts[i].xyz[2] = fScaleX - fScaleY - fConstZ;
+                }
+
+                return qtrue;
+            }
+        }
+    }
+
+    assert(
+        !pPatch->drawinfo.iTriHead
+        && va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n", x, y, pPatch->x0, pPatch->y0, pPatch->z0)
+    );
+    return qfalse;
+}
+
+/*
+================
+R_TerrainRestart_f
+================
+*/
+void R_TerrainRestart_f(void)
+{
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+
+    R_TerrainFree();
+
+    R_PreTessellateTerrain();
+}
+
+/*
+================
+R_CraterTerrain
+================
+*/
+void R_CraterTerrain(const vec3_t pos, const vec3_t dir, float fDepth, float fRadius)
+{
+    int                    i, j, k;
+    int                    index;
+    qboolean               bMorphed;
+    cTerraPatchUnpacked_t *pPatch;
+    float                  x, y, z;
+    float                  dzSquared;
+    float                  heightmap[81];
+    float                  fMinHeight, fMaxHeight;
+    float                  fMaxOrig;
+    vec3_t                 vArcCenter;
+    float                  fArcRadius;
+    float                  fArcSquared;
+
+    fArcRadius  = (fRadius * fRadius / fDepth + fDepth) * 0.5;
+    fArcSquared = Square(fArcRadius);
+    VectorMA(pos, fDepth - fArcRadius, dir, vArcCenter);
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        pPatch = &tr.world->terraPatches[i];
+
+        bMorphed = qfalse;
+
+        fMaxOrig   = pPatch->z0;
+        fMaxHeight = pPatch->z0;
+        fMinHeight = pPatch->z0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                x = pPatch->x0 + (k << 6);
+                y = pPatch->y0 + (j << 6);
+                z = pPatch->z0 + (pPatch->heightmap[index] * 2);
+
+                heightmap[index] = z;
+
+                if (fMaxHeight < z) {
+                    fMaxHeight = z;
+                }
+                if (fMaxOrig < z) {
+                    fMaxOrig = z;
+                }
+
+                dzSquared = fArcSquared - (Square(x - vArcCenter[0]) + Square(y - vArcCenter[1]));
+
+                if (Square(z - vArcCenter[2]) > dzSquared) {
+                    continue;
+                }
+
+                if (pPatch->flags & TERPATCH_FLIP) {
+                    heightmap[index] = vArcCenter[2] + sqrt(dzSquared);
+                    if (fMaxHeight < heightmap[index]) {
+                        fMaxHeight = heightmap[index];
+                    }
+                } else {
+                    heightmap[index] = vArcCenter[2] - sqrt(dzSquared);
+                    if (fMinHeight > heightmap[index]) {
+                        fMinHeight = heightmap[index];
+                    }
+                }
+
+                bMorphed = qtrue;
+            }
+        }
+
+        if (!bMorphed) {
+            continue;
+        }
+
+        if (fMinHeight < fMaxOrig - 510.0) {
+            fMinHeight = fMaxOrig - 510.0;
+        }
+
+        pPatch->z0 = floor((fMinHeight + 1.0) * 0.5) * 2.0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                pPatch->heightmap[index] = Q_clamp_float(floor((heightmap[index] - pPatch->z0 + 1.0) * 0.5), 0, 255);
+            }
+        }
+    }
+}
+
+/*
+================
+R_TerrainCrater_f
+================
+*/
+void R_TerrainCrater_f(void)
+{
+    vec3_t dir;
+
+    if (!ri.Cvar_VariableIntegerValue("cheats")) {
+        //
+        // Added in OPM
+        //  This command may be used for debugging purposes.
+        //  It also prevents executing this command accidentally
+        //
+        return;
+    }
+
+    VectorNegate(tr.refdef.viewaxis[2], dir);
+
+    R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
+    R_TerrainRestart_f();
+}
+
+/*
+================
+R_InitTerrain
+================
+*/
+void R_InitTerrain()
+{
+    int i;
+
+    ter_maxlod = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxlod, 3, 6, qtrue);
+
+    ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock = ri.Cvar_Get("ter_lock", "0", CVAR_CHEAT);
+
+    ter_error = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ri.Cvar_CheckRange(ter_error, 0.1, 16, qfalse);
+
+    ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
+
+    ter_maxtris = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxtris, 16384, 65536, qtrue);
+
+    ter_count = ri.Cvar_Get("ter_count", "0", 0);
+
+    ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
+    R_PreTessellateTerrain();
+
+    for (i = 0; i < TERRAIN_TABLE_SIZE; i++) {
+        float dot                 = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
+        g_fClipDotSquaredTable[i] = dot;
+        g_fClipDotProductTable[i] = sqrt(dot);
+        g_fDistanceTable[i]       = 443.5 / sqrt(1.0 - dot);
+    }
+}
+
+/*
+================
+R_ShutdownTerrain
+================
+*/
+void R_ShutdownTerrain()
+{
+    ri.Cmd_RemoveCommand("ter_restart");
+
+    R_TerrainFree();
+}
+
+/*
+================
+R_TerrainFree
+
+Frees terrain memory
+================
+*/
+void R_TerrainFree()
+{
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
+}
+
+/*
+====================
+R_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void R_SwapTerraPatch(cTerraPatch_t *pPatch)
+{
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight       = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader           = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap         = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth            = LittleShort(pPatch->iNorth);
+    pPatch->iEast             = LittleShort(pPatch->iEast);
+    pPatch->iSouth            = LittleShort(pPatch->iSouth);
+    pPatch->iWest             = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
+}
diff --git a/code/renderergl1/tr_util.cpp b/code/renderergl1/tr_util.cpp
new file mode 100644
index 00000000..3853f50f
--- /dev/null
+++ b/code/renderergl1/tr_util.cpp
@@ -0,0 +1,459 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_util.c -- renderer utility
+
+#include "tr_local.h"
+#include "../qcommon/str.h"
+
+static byte  cntColor[4];
+static float cntSt[2];
+
+static int Numbers[12][8] = {
+    {1, 3,  4,  5,  6, 7, 0, 0},
+    {4, 5,  0,  0,  0, 0, 0, 0},
+    {1, 4,  2,  7,  3, 0, 0, 0},
+    {1, 4,  2,  5,  3, 0, 0, 0},
+    {6, 4,  2,  5,  0, 0, 0, 0},
+    {1, 6,  2,  5,  3, 0, 0, 0},
+    {1, 6,  2,  5,  7, 3, 0, 0},
+    {1, 8,  0,  0,  0, 0, 0, 0},
+    {1, 2,  3,  4,  5, 6, 7, 0},
+    {1, 6,  4,  2,  5, 3, 0, 0},
+    {9, 10, 11, 12, 0, 0, 0, 0},
+    {2, 0,  0,  0,  0, 0, 0, 0}
+};
+
+static float Lines[13][4] = {
+    {0.0,  0.0, 0.0,  0.0},
+    {-4.0, 8.0, 4.0,  8.0},
+    {-4.0, 4.0, 4.0,  4.0},
+    {-4.0, 0.0, 4.0,  0.0},
+    {4.0,  8.0, 4.0,  4.0},
+    {4.0,  4.0, 4.0,  0.0},
+    {-4.0, 8.0, -4.0, 4.0},
+    {-4.0, 4.0, -4.0, 0.0},
+    {4.0,  8.0, -4.0, 0.0},
+    {-1.0, 2.0, 1.0,  2.0},
+    {1.0,  2.0, 1.0,  0.0},
+    {-1.0, 0.0, 1.0,  0.0},
+    {-1.0, 0.0, -1.0, 2.0}
+};
+
+/*
+===============
+RB_StreamBegin
+===============
+*/
+void RB_StreamBegin(shader_t *shader)
+{
+    RB_BeginSurface(shader);
+}
+
+/*
+===============
+RB_StreamEnd
+===============
+*/
+void RB_StreamEnd(void)
+{
+    int i;
+
+    if (tess.numVertexes <= 2) {
+        RB_EndSurface();
+        return;
+    }
+
+    tess.indexes[0] = 0;
+    tess.indexes[1] = 1;
+    tess.indexes[2] = 2;
+
+    for (i = 0; i < tess.numVertexes - 2; i++) {
+        tess.indexes[i * 3 + 0] = (i & 1) + i;
+        tess.indexes[i * 3 + 1] = i - ((i & 1) - 1);
+        tess.indexes[i * 3 + 2] = i + 2;
+        tess.numIndexes += 3;
+    }
+
+    RB_EndSurface();
+}
+
+/*
+===============
+RB_StreamBeginDrawSurf
+===============
+*/
+void RB_StreamBeginDrawSurf(void)
+{
+    backEnd.dsStreamVert = tess.numVertexes;
+}
+
+/*
+===============
+RB_StreamEndDrawSurf
+===============
+*/
+void RB_StreamEndDrawSurf(void)
+{
+    int numverts;
+    int i;
+
+    if (tess.numVertexes - backEnd.dsStreamVert <= 2) {
+        tess.numVertexes = backEnd.dsStreamVert;
+        return;
+    }
+
+    numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
+    for (i = 0; i < numverts; i++) {
+        tess.indexes[i + tess.numIndexes]     = (i & 1) + i + backEnd.dsStreamVert;
+        tess.indexes[i + tess.numIndexes + 1] = i + backEnd.dsStreamVert - ((i & 1) - 1);
+        tess.indexes[i + tess.numIndexes + 2] = i + backEnd.dsStreamVert + 2;
+        tess.numIndexes += 3;
+    }
+}
+
+/*
+===============
+addTriangle
+===============
+*/
+static void addTriangle(void)
+{
+    tess.texCoords[tess.numVertexes][0][0] = cntSt[0];
+    tess.texCoords[tess.numVertexes][0][1] = cntSt[1];
+    tess.vertexColors[tess.numVertexes][0] = cntColor[0];
+    tess.vertexColors[tess.numVertexes][1] = cntColor[1];
+    tess.vertexColors[tess.numVertexes][2] = cntColor[2];
+    tess.vertexColors[tess.numVertexes][3] = cntColor[3];
+    tess.vertexColorValid                  = qtrue;
+    tess.numVertexes++;
+}
+
+/*
+===============
+RB_Vertex3fv
+===============
+*/
+void RB_Vertex3fv(vec3_t v)
+{
+    VectorCopy(v, tess.xyz[tess.numVertexes]);
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex3f
+===============
+*/
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z)
+{
+    tess.xyz[tess.numVertexes][0] = x;
+    tess.xyz[tess.numVertexes][1] = y;
+    tess.xyz[tess.numVertexes][2] = z;
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex2f
+===============
+*/
+void RB_Vertex2f(vec_t x, vec_t y)
+{
+    RB_Vertex3f(x, y, 0);
+}
+
+/*
+===============
+RB_Color4f
+===============
+*/
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a)
+{
+    cntColor[0] = r * tr.identityLightByte;
+    cntColor[1] = g * tr.identityLightByte;
+    cntColor[2] = b * tr.identityLightByte;
+    cntColor[3] = a * 255.0;
+}
+
+/*
+===============
+RB_Color3f
+===============
+*/
+void RB_Color3f(vec_t r, vec_t g, vec_t b)
+{
+    RB_Color4f(r, g, b, 1.0);
+}
+
+/*
+===============
+RB_Color3fv
+===============
+*/
+void RB_Color3fv(vec3_t col)
+{
+    RB_Color3f(col[0], col[1], col[2]);
+}
+
+/*
+===============
+RB_Color4bv
+===============
+*/
+void RB_Color4bv(unsigned char *colors)
+{
+    cntColor[0] = colors[0];
+    cntColor[1] = colors[1];
+    cntColor[2] = colors[2];
+    cntColor[3] = colors[3];
+}
+
+/*
+===============
+RB_Texcoord2f
+===============
+*/
+void RB_Texcoord2f(float s, float t)
+{
+    cntSt[0] = s;
+    cntSt[1] = t;
+}
+
+/*
+===============
+RB_Texcoord2fv
+===============
+*/
+void RB_Texcoord2fv(vec2_t st)
+{
+    cntSt[0] = st[0];
+    cntSt[1] = st[1];
+}
+
+/*
+===============
+R_DrawDebugNumber
+===============
+*/
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision)
+{
+    vec3_t up, right;
+    vec3_t pos1, pos2;
+    vec3_t start;
+    str    text;
+    char   format[20];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
+
+    VectorCopy(tr.viewParms.ori.axis[2], up);
+    VectorCopy(tr.viewParms.ori.axis[1], right);
+    VectorNegate(right, right);
+
+    VectorNormalize(up);
+    VectorNormalize(right);
+
+    VectorScale(up, scale, up);
+    VectorScale(right, scale, right);
+
+    if (precision > 0) {
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
+        text = va(format, number);
+    } else {
+        text = va("%d", (int)number);
+    }
+
+    // NOTE: this cast here is needed!
+    // Otherwise the compiler will do very nasty implicit casting of negative
+    // numbers to unsigned numbers, resulting in incorrect values.
+    // -------------------v
+    VectorMA(org, 5 - 5 * (int)text.length(), right, start);
+
+    // Draw each character/digit of the text
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
+
+        // Get the first line index for the number to be drawn
+        l = Numbers[num][0];
+
+        // Draw each line of the character/digit
+        for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
+            pos1[0] = start[0] + Lines[l][0] * right[0] + Lines[l][1] * up[0];
+            pos1[1] = start[1] + Lines[l][0] * right[1] + Lines[l][1] * up[1];
+            pos1[2] = start[2] + Lines[l][0] * right[2] + Lines[l][1] * up[2];
+
+            pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
+            pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
+            pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
+
+            R_DebugLine(pos1, pos2, r, g, b, 1.0);
+        }
+
+        VectorMA(start, 10.0, right, start);
+    }
+}
+
+/*
+===============
+R_DebugRotatedBBox
+===============
+*/
+void R_DebugRotatedBBox(
+    const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha
+)
+{
+    int    i;
+    vec3_t tmp;
+    vec3_t points[8];
+    vec3_t axis[3];
+
+    AnglesToAxis(ang, axis);
+
+    for (i = 0; i < 8; i++) {
+        if (i & 1) {
+            tmp[0] = mins[0];
+        } else {
+            tmp[0] = maxs[0];
+        }
+
+        if (i & 2) {
+            tmp[1] = mins[1];
+        } else {
+            tmp[1] = maxs[1];
+        }
+
+        if (i & 4) {
+            tmp[2] = mins[2];
+        } else {
+            tmp[2] = maxs[2];
+        }
+
+        points[i][0] = tmp[0] * axis[0][0];
+        points[i][1] = tmp[0] * axis[0][1];
+        points[i][2] = tmp[0] * axis[0][2];
+
+        points[i][0] += tmp[1] * axis[1][0];
+        points[i][1] += tmp[1] * axis[1][1];
+        points[i][2] += tmp[1] * axis[1][2];
+
+        points[i][0] += tmp[2] * axis[2][0];
+        points[i][1] += tmp[2] * axis[2][1];
+        points[i][2] += tmp[2] * axis[2][2];
+
+        points[i][0] += org[0];
+        points[i][1] += org[1];
+        points[i][2] += org[2];
+    }
+
+    R_DebugLine(points[0], points[1], r, g, b, alpha);
+    R_DebugLine(points[1], points[3], r, g, b, alpha);
+    R_DebugLine(points[3], points[2], r, g, b, alpha);
+    R_DebugLine(points[2], points[0], r, g, b, alpha);
+    R_DebugLine(points[4], points[5], r, g, b, alpha);
+    R_DebugLine(points[5], points[7], r, g, b, alpha);
+    R_DebugLine(points[7], points[6], r, g, b, alpha);
+    R_DebugLine(points[6], points[4], r, g, b, alpha);
+
+    for (i = 0; i < 4; i++) {
+        R_DebugLine(points[i], points[i + 4], r, g, b, alpha);
+    }
+}
+
+/*
+===============
+RE_GetShaderWidth
+===============
+*/
+int RE_GetShaderWidth(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->unfoggedStages[0]->bundle[0].image[0]->uploadWidth;
+}
+
+/*
+===============
+RE_GetShaderHeight
+===============
+*/
+int RE_GetShaderHeight(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->unfoggedStages[0]->bundle[0].image[0]->uploadHeight;
+}
+
+/*
+===============
+RE_GetShaderName
+===============
+*/
+const char *RE_GetShaderName(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->name;
+}
+
+/*
+===============
+RE_GetModelName
+===============
+*/
+const char *RE_GetModelName(qhandle_t hModel)
+{
+    model_t *model;
+
+    if (!hModel) {
+        return "";
+    }
+
+    model = R_GetModelByHandle(hModel);
+
+    return model->name;
+}
diff --git a/code/renderergl1/tr_vis.cpp b/code/renderergl1/tr_vis.cpp
new file mode 100644
index 00000000..b4dbf0de
--- /dev/null
+++ b/code/renderergl1/tr_vis.cpp
@@ -0,0 +1,361 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_vis.cpp: visibility culling
+
+#include "tr_local.h"
+#include "tr_vis.h"
+
+#define MAX_POINTS_ON_WINDING 128
+#define MAX_MAP_VISIBILITY    0x200000
+#define MAX_VPORTALS          1024
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[24];
+} viswinding_t;
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[4];
+} winding_t;
+
+typedef struct {
+    vec3_t normal;
+    float  dist;
+} plane_t;
+
+typedef struct {
+    int           num;
+    qboolean      hint;
+    plane_t       plane;
+    int           leaf;
+    vec3_t        origin;
+    float         radius;
+    viswinding_t *winding;
+} vportal_t;
+
+typedef struct leaf_s {
+    int        numportals;
+    vportal_t *portals[MAX_VPORTALS];
+} leaf_t;
+
+int             portalclusters;
+int             numportals;
+int             numfaces;
+int             leafbytes;
+int             leaflongs;
+int             portalbytes;
+int             portallongs;
+vportal_t      *portals;
+leaf_t         *leafs;
+int             numVisBytes;
+static char     mapname[256];
+static qboolean prev_showportal = qfalse;
+
+winding_t *AllocWinding(int points)
+{
+    winding_t *w;
+    int        s;
+
+    if (points > MAX_POINTS_ON_WINDING) {
+        ri.Error(ERR_DROP, "Exceeded MAX_POINTS_ON_WINDING");
+        return NULL;
+    }
+    s = sizeof(vec_t) * 4 * points + sizeof(int) * 4;
+
+    w = (winding_t *)malloc(s);
+    if (!w) {
+        ri.Error(ERR_DROP, "Couldn't allocate winding");
+        return NULL;
+    }
+
+    if (s < 0) {
+        s = sizeof(vec_t) * 4 * points + sizeof(int) * 4 + 3;
+    }
+
+    memset(w, 0, s);
+
+    return w;
+}
+
+viswinding_t *AllocVisWinding(int points)
+{
+    return (viswinding_t *)AllocWinding(points);
+}
+
+void PlaneFromWinding(viswinding_t *w, plane_t *plane)
+{
+    vec3_t v1, v2;
+
+    VectorSubtract(w->p[2], w->p[1], v1);
+    VectorSubtract(w->p[2], w->p[1], v1);
+    CrossProduct(v2, v1, plane->normal);
+    VectorNormalize(plane->normal);
+
+    plane->dist = DotProduct(w->p[0], plane->normal);
+}
+
+void SetPortalSphere(vportal_t *p)
+{
+    int           i;
+    vec3_t        total;
+    vec3_t        dist;
+    viswinding_t *w;
+    float         r;
+    float         bestr;
+
+    w = p->winding;
+    VectorCopy(vec3_origin, total);
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorAdd(total, w->p[i], total);
+    }
+
+    for (i = 0; i < 3; i++) {
+        total[i] /= w->numpoints;
+    }
+
+    bestr = 0;
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorSubtract(w->p[i], total, dist);
+        r = VectorLength(dist);
+        if (bestr < r) {
+            bestr = r;
+        }
+    }
+
+    VectorCopy(total, p->origin);
+    p->radius = bestr;
+}
+
+void LoadPortals(const char *name)
+{
+    int         i, j;
+    vportal_t  *p;
+    leaf_t     *l;
+    const char *magic;
+    int         leafnums[2];
+    plane_t     plane;
+    char       *data;
+    char       *f;
+    int         numpoints;
+    qboolean    bHint;
+
+    if (ri.FS_ReadFile(name, (void **)&f) == -1) {
+        ri.Error(ERR_DROP, "LoadPortals: couldn't read %s\n", name);
+        return;
+    }
+
+    data  = f;
+    magic = COM_Parse(&data);
+
+    if (strcmp(magic, "PRT1")) {
+        ri.Error(1, "LoadPortals: not a portal file");
+    }
+
+    portalclusters = atoi(COM_Parse(&data));
+    numportals     = atoi(COM_Parse(&data));
+    numfaces       = atoi(COM_Parse(&data));
+
+    ri.Printf(PRINT_DEVELOPER, "%6i portalclusters\n", portalclusters);
+    ri.Printf(PRINT_DEVELOPER, "%6i numportals\n", numportals);
+    ri.Printf(PRINT_DEVELOPER, "%6i numfaces\n", numfaces);
+
+    leafbytes   = ((portalclusters + 63) & 0xC0) >> 3;
+    leaflongs   = leafbytes >> 2;
+    portalbytes = ((numportals * 2 + 63) & 0xC0) >> 3;
+    portallongs = portalbytes >> 2;
+
+    //
+    // Initialize portals
+    //
+    portals = (vportal_t *)malloc(numportals * sizeof(vportal_t));
+    if (!portals) {
+        ri.Error(ERR_DROP, "LoadPortals: portals allocation failed\n");
+        return;
+    }
+    memset(portals, 0, numportals * sizeof(vportal_t));
+
+    //
+    // Initialize leafs
+    //
+    leafs = (leaf_t *)malloc(portalclusters * sizeof(leaf_t));
+    if (!leafs) {
+        ri.Error(ERR_DROP, "LoadPortals: leafs allocation failed\n");
+        return;
+    }
+    memset(leafs, 0, portalclusters * sizeof(leaf_t));
+
+    assert(leafbytes * portalclusters + sizeof(leafnums) <= MAX_MAP_VISIBILITY);
+    if (numVisBytes > MAX_MAP_VISIBILITY) {
+        ri.Error(ERR_DROP, "LoadPortals: NumVisBytes %d exceeds %d\n", numVisBytes, 0x200000);
+    }
+
+    for (i = 0; i < numportals; i++) {
+        viswinding_t *w;
+
+        p = &portals[i];
+
+        numpoints   = atoi(COM_Parse(&data));
+        leafnums[0] = atoi(COM_Parse(&data));
+        leafnums[1] = atoi(COM_Parse(&data));
+
+        if (numpoints > MAX_POINTS_ON_WINDING) {
+            ri.Error(ERR_DROP, "LoadPortals: portal %i has too many points", i);
+            return;
+        }
+
+        if (leafnums[0] > portalclusters || leafnums[1] > portalclusters) {
+            ri.Error(ERR_DROP, "LoadPortals: reading portal %i", i);
+            return;
+        }
+
+        bHint        = atoi(COM_Parse(&data));
+        w            = AllocVisWinding(numpoints);
+        w->numpoints = numpoints;
+        p->winding   = w;
+
+        for (j = 0; j < numpoints; j++) {
+            magic = COM_Parse(&data);
+            if (magic[0] != '(') {
+                ri.Error(ERR_DROP, "LoadPortals: expecting '(' not '%s'", magic);
+                return;
+            }
+
+            if (magic[1]) {
+                w->p[j][0] = atof(magic + 1);
+            } else {
+                w->p[j][0] = atof(COM_Parse(&data));
+            }
+
+            w->p[j][1] = atof(COM_Parse(&data));
+            w->p[j][2] = atof(COM_Parse(&data));
+
+            magic = COM_Parse(&data);
+            if (strcmp(")", magic)) {
+                ri.Error(ERR_DROP, "LoadPortals: expecting ')' not '%s'", magic);
+            }
+        }
+
+        PlaneFromWinding(w, &plane);
+
+        //
+        // Leafs
+        //
+
+        // First leaf
+
+        l = &leafs[leafnums[0]];
+
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = w;
+        VectorSubtract(vec3_origin, plane.normal, p->plane.normal);
+        p->plane.dist = -plane.dist;
+        p->leaf = leafnums[1];
+        SetPortalSphere(p);
+
+        // Second leaf
+
+        p++;
+
+        l = &leafs[leafnums[1]];
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = (viswinding_t *)AllocVisWinding(w->numpoints);
+        p->winding->numpoints       = w->numpoints;
+
+        for (j = 0; j < w->numpoints; j++) {
+            VectorCopy(w->p[numpoints - (j + 1)], p->winding->p[j]);
+        }
+
+        p->plane = plane;
+        p->leaf  = leafnums[0];
+        SetPortalSphere(p);
+    }
+
+    ri.FS_FreeFile(f);
+}
+
+void R_VisDebug()
+{
+    int           leafnum;
+    int           cluster;
+    int           numportals;
+    leaf_t       *leaf;
+    vportal_t    *p;
+    int           pnum;
+    viswinding_t *w;
+    int           numpoints;
+    int           i;
+
+    if (!r_showportal->integer) {
+        return;
+    }
+
+    if (!prev_showportal) {
+        char buffer[256];
+
+        prev_showportal = qtrue;
+        COM_StripExtension(mapname, buffer, sizeof(buffer));
+        Q_strcat(buffer, sizeof(buffer), ".prt");
+        LoadPortals(buffer);
+    }
+
+    leafnum = ri.CM_PointLeafnum(tr.refdef.vieworg);
+    cluster = ri.CM_LeafCluster(leafnum);
+    if (cluster < 0) {
+        return;
+    }
+
+    leaf       = &leafs[cluster];
+    numportals = leaf->numportals;
+    for (pnum = 0; pnum < numportals; pnum++) {
+        p = leaf->portals[pnum];
+        w = p->winding;
+
+        numpoints = w->numpoints;
+        for (i = 0; i < numpoints; i++) {
+            R_DebugLine(w->p[i], w->p[(i + 1) % numpoints], 0.0, 1.0, 0.0, 1.0);
+        }
+    }
+}
+
+void R_VisDebugLoad(const char *szBSPName)
+{
+    prev_showportal = qfalse;
+    return Q_strncpyz(mapname, szBSPName, sizeof(mapname));
+}
diff --git a/code/renderer/tr_vis.h b/code/renderergl1/tr_vis.h
similarity index 96%
rename from code/renderer/tr_vis.h
rename to code/renderergl1/tr_vis.h
index 3524c6e5..e31cb444 100644
--- a/code/renderer/tr_vis.h
+++ b/code/renderergl1/tr_vis.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
diff --git a/code/renderergl1/tr_world.c b/code/renderergl1/tr_world.c
index 88eca6d8..2e36217a 100644
--- a/code/renderergl1/tr_world.c
+++ b/code/renderergl1/tr_world.c
@@ -15,7 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
+along with Foobar; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
@@ -58,11 +58,16 @@ static qboolean	R_CullGrid( srfGridMesh_t *cv ) {
 		return qtrue;
 	}
 
-	if ( tr.currentEntityNum != REFENTITYNUM_WORLD ) {
+	if (!tr.refdef.render_terrain) {
+		return qtrue;
+	}
+
+	if ( tr.currentEntityNum != ENTITYNUM_WORLD ) {
 		sphereCull = R_CullLocalPointAndRadius( cv->localOrigin, cv->meshRadius );
 	} else {
 		sphereCull = R_CullPointAndRadius( cv->localOrigin, cv->meshRadius );
 	}
+	boxCull = CULL_OUT;
 	
 	// check for trivial reject
 	if ( sphereCull == CULL_OUT )
@@ -140,7 +145,7 @@ static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
 	}
 
 	sface = ( srfSurfaceFace_t * ) surface;
-	d = DotProduct (tr.or.viewOrigin, sface->plane.normal);
+	d = DotProduct (tr.ori.viewOrigin, sface->plane.normal);
 
 	// don't cull exactly on the plane, because there are levels of rounding
 	// through the BSP, ICD, and hardware that may cause pixel gaps if an
@@ -158,8 +163,12 @@ static qboolean	R_CullSurface( surfaceType_t *surface, shader_t *shader ) {
 	return qfalse;
 }
 
-
-static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
+/*
+======================
+R_FastDlightFace
+======================
+*/
+static int R_FastDlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 	float		d;
 	int			i;
 	dlight_t	*dl;
@@ -169,7 +178,7 @@ static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 			continue;
 		}
 		dl = &tr.refdef.dlights[i];
-		d = DotProduct( dl->origin, face->plane.normal ) - face->plane.dist;
+		d = DotProduct( dl->transformed, face->plane.normal ) - face->plane.dist;
 		if ( d < -dl->radius || d > dl->radius ) {
 			// dlight doesn't reach the plane
 			dlightBits &= ~( 1 << i );
@@ -180,11 +189,16 @@ static int R_DlightFace( srfSurfaceFace_t *face, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	face->dlightBits = dlightBits;
+	face->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 }
 
-static int R_DlightGrid( srfGridMesh_t *grid, int dlightBits ) {
+/*
+======================
+R_FastDlightGrid
+======================
+*/
+static int R_FastDlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 	int			i;
 	dlight_t	*dl;
 
@@ -208,14 +222,52 @@ static int R_DlightGrid( srfGridMesh_t *grid, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	grid->dlightBits = dlightBits;
+	grid->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 }
 
+/*
+======================
+R_FastDlightTerrain
+======================
+*/
+static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
+    dlight_t* dl;
+    float* origin;
+    int i;
 
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+        origin = dl->transformed;
+
+        if (srf->x0 - origin[0] > dl->radius
+            || srf->x0 - origin[0] < -512.0 - dl->radius
+            || srf->y0 - origin[1] > dl->radius
+            || srf->y0 - origin[1] < -512.0 - dl->radius
+            || srf->z0 - origin[2] > dl->radius
+            || srf->z0 - origin[2] < -srf->zmax - dl->radius
+            ) {
+            // dlight doesn't reach the bounds
+            dlightBits &= ~(1 << i);
+        }
+    }
+
+    if (!dlightBits) {
+        tr.pc.c_dlightSurfacesCulled++;
+    }
+
+    srf->drawinfo.dlightBits[tr.smpFrame] = dlightBits;
+    return dlightBits;
+}
+
+/*
+======================
+R_DlightTrisurf
+======================
+*/
 static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
 	// FIXME: more dlight culling to trisurfs...
-	surf->dlightBits = dlightBits;
+	surf->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 #if 0
 	int			i;
@@ -241,7 +293,7 @@ static int R_DlightTrisurf( srfTriangles_t *surf, int dlightBits ) {
 		tr.pc.c_dlightSurfacesCulled++;
 	}
 
-	grid->dlightBits = dlightBits;
+	grid->dlightBits[ tr.smpFrame ] = dlightBits;
 	return dlightBits;
 #endif
 }
@@ -256,24 +308,136 @@ more dlights if possible.
 ====================
 */
 static int R_DlightSurface( msurface_t *surf, int dlightBits ) {
+	int dlightMap;
+
+	dlightMap = 0;
+
 	if ( *surf->data == SF_FACE ) {
-		dlightBits = R_DlightFace( (srfSurfaceFace_t *)surf->data, dlightBits );
+		if (!r_fastdlights->integer) {
+			if (surf->shader->lightmapIndex >= 0) {
+				dlightMap = R_RealDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
+			} else {
+				((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+				dlightMap = 0;
+			}
+			return dlightMap;
+        } else {
+			dlightBits = R_FastDlightFace((srfSurfaceFace_t*)surf->data, dlightBits);
+		}
 	} else if ( *surf->data == SF_GRID ) {
-		dlightBits = R_DlightGrid( (srfGridMesh_t *)surf->data, dlightBits );
-	} else if ( *surf->data == SF_TRIANGLES ) {
-		dlightBits = R_DlightTrisurf( (srfTriangles_t *)surf->data, dlightBits );
+		if (!r_fastdlights->integer) {
+			if (surf->shader->lightmapIndex >= 0) {
+				dlightMap = R_RealDlightPatch((srfGridMesh_t*)surf->data, dlightBits);
+			} else {
+				((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0.f;
+				dlightMap = 0;
+            }
+            return dlightMap;
+        } else {
+            dlightBits = R_FastDlightGrid((srfGridMesh_t*)surf->data, dlightBits);
+		}
 	} else {
-		dlightBits = 0;
+		return dlightMap;
 	}
 
-	if ( dlightBits ) {
+	if (dlightBits) {
 		tr.pc.c_dlightSurfaces++;
+		return 1;
 	}
 
-	return dlightBits;
+	return dlightMap;
 }
 
+/*
+======================
+R_DlightTerrain
+======================
+*/
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	int dlightMap;
 
+    dlightMap = 0;
+
+    if (r_fastdlights->integer)
+    {
+        if (R_FastDlightTerrain(surf, dlightBits)) {
+            ++tr.pc.c_dlightSurfaces;
+			dlightMap = 1;
+        }
+    } else if (surf->shader->lightmapIndex < 0) {
+        surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+    } else {
+		dlightMap = R_RealDlightTerrain(surf, dlightBits);
+    }
+
+    return dlightMap;
+}
+
+/*
+======================
+R_CheckDlightSurface
+======================
+*/
+static int R_CheckDlightSurface(msurface_t* surf, int dlightBits)
+{
+    if (dlightBits && surf->frameCount != tr.frameCount)
+    {
+        surf->frameCount = tr.frameCount;
+        return R_DlightSurface(surf, dlightBits);
+    }
+
+	if (dlightBits)
+	{
+		//
+		// Added in 2.0
+		//  Return the existing dlight map
+		if (*surf->data == SF_FACE)
+		{
+			return ((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			return ((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame];
+		}
+	}
+	else
+	{
+		if (*surf->data == SF_FACE)
+		{
+			((srfSurfaceFace_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfSurfaceFace_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+		else if (*surf->data == SF_GRID)
+		{
+			((srfGridMesh_t*)surf->data)->dlightMap[tr.smpFrame] = 0;
+			((srfGridMesh_t*)surf->data)->dlightBits[tr.smpFrame] = 0;
+		}
+	}
+
+    return 0;
+}
+
+/*
+======================
+R_CheckDlightTerrain
+======================
+*/
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	if (surf->frameCount == tr.frameCount) {
+		return surf->drawinfo.dlightMap[tr.smpFrame];
+	}
+
+	surf->frameCount = tr.frameCount;
+	if (dlightBits) {
+		return R_DlightTerrain(surf, dlightBits);
+	}
+
+	surf->drawinfo.dlightMap[tr.smpFrame] = 0;
+	surf->drawinfo.dlightBits[tr.smpFrame] = 0;
+	return 0;
+}
 
 /*
 ======================
@@ -281,9 +445,9 @@ R_AddWorldSurface
 ======================
 */
 static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
-	if ( surf->viewCount == tr.viewCount ) {
-		return;		// already in this view
-	}
+	//if ( surf->viewCount == tr.viewCount ) {
+	//	return;		// already in this view
+	//}
 
 	surf->viewCount = tr.viewCount;
 	// FIXME: bmodel fog?
@@ -294,12 +458,14 @@ static void R_AddWorldSurface( msurface_t *surf, int dlightBits ) {
 	}
 
 	// check for dlighting
-	if ( dlightBits ) {
-		dlightBits = R_DlightSurface( surf, dlightBits );
-		dlightBits = ( dlightBits != 0 );
+	dlightBits = R_CheckDlightSurface(surf, dlightBits);
+	if (surf->shader && surf->shader->isPortalSky) {
+		// Sky portal
+		R_Sky_AddSurf(surf);
+		return;
 	}
 
-	R_AddDrawSurf( surf->data, surf->shader, surf->fogIndex, dlightBits );
+	R_AddDrawSurf( surf->data, surf->shader, dlightBits );
 }
 
 /*
@@ -323,14 +489,13 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 
 	pModel = R_GetModelByHandle( ent->e.hModel );
 
-	bmodel = pModel->bmodel;
+	bmodel = pModel->d.bmodel;
 
 	clip = R_CullLocalBox( bmodel->bounds );
 	if ( clip == CULL_OUT ) {
 		return;
 	}
 	
-	R_SetupEntityLighting( &tr.refdef, ent );
 	R_DlightBmodel( bmodel );
 
 	for ( i = 0 ; i < bmodel->numSurfaces ; i++ ) {
@@ -347,17 +512,24 @@ void R_AddBrushModelSurfaces ( trRefEntity_t *ent ) {
 =============================================================
 */
 
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
+{
+	bmodel_t* bmodel;
+
+	bmodel = &tr.world->bmodels[iIndex];
+	VectorCopy(bmodel->bounds[0], vMins);
+	VectorCopy(bmodel->bounds[1], vMaxs);
+}
+
 
 /*
 ================
 R_RecursiveWorldNode
 ================
 */
-static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigned int dlightBits ) {
+static void R_RecursiveWorldNode( mnode_t *node, int planeBits, int dlightBits ) {
 
 	do {
-		unsigned int newDlights[2];
-
 		// if the node wasn't marked as potentially visible, exit
 		if (node->visframe != tr.visCount) {
 			return;
@@ -369,85 +541,67 @@ static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigne
 		if ( !r_nocull->integer ) {
 			int		r;
 
-			if ( planeBits & 1 ) {
+			if (planeBits & 1) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[0]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~1;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 2 ) {
+			if (planeBits & 2) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[1]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~2;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 4 ) {
+			if (planeBits & 4) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[2]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~4;			// all descendants will also be in front
 				}
 			}
 
-			if ( planeBits & 8 ) {
+			if (planeBits & 8) {
 				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[3]);
 				if (r == 2) {
 					return;						// culled
 				}
-				if ( r == 1 ) {
+				if (r == 1) {
 					planeBits &= ~8;			// all descendants will also be in front
 				}
 			}
 
+			if (planeBits & 16) {
+				r = BoxOnPlaneSide(node->mins, node->maxs, &tr.viewParms.frustum[4]);
+				if (r == 2) {
+					return;						// culled
+				}
+				if (r == 1) {
+					planeBits &= ~16;			// all descendants will also be in front
+				}
+			}
+
 		}
 
 		if ( node->contents != -1 ) {
 			break;
 		}
 
-		// node is just a decision point, so go down both sides
-		// since we don't care about sort orders, just go positive to negative
-
-		// determine which dlights are needed
-		newDlights[0] = 0;
-		newDlights[1] = 0;
-		if ( dlightBits ) {
-			int	i;
-
-			for ( i = 0 ; i < tr.refdef.num_dlights ; i++ ) {
-				dlight_t	*dl;
-				float		dist;
-
-				if ( dlightBits & ( 1 << i ) ) {
-					dl = &tr.refdef.dlights[i];
-					dist = DotProduct( dl->origin, node->plane->normal ) - node->plane->dist;
-					
-					if ( dist > -dl->radius ) {
-						newDlights[0] |= ( 1 << i );
-					}
-					if ( dist < dl->radius ) {
-						newDlights[1] |= ( 1 << i );
-					}
-				}
-			}
-		}
-
 		// recurse down the children, front side first
-		R_RecursiveWorldNode (node->children[0], planeBits, newDlights[0] );
+		R_RecursiveWorldNode (node->children[0], planeBits, dlightBits);
 
 		// tail recurse
 		node = node->children[1];
-		dlightBits = newDlights[1];
 	} while ( 1 );
 
 	{
@@ -478,27 +632,100 @@ static void R_RecursiveWorldNode( mnode_t *node, unsigned int planeBits, unsigne
 			tr.viewParms.visBounds[1][2] = node->maxs[2];
 		}
 
-		// add the individual surfaces
-		mark = node->firstmarksurface;
-		c = node->nummarksurfaces;
-		while (c--) {
-			// the surface may have already been added if it
-			// spans multiple leafs
-			surf = *mark;
-			R_AddWorldSurface( surf, dlightBits );
-			mark++;
+		tr.portalsky.cntNode = node;
+
+		if (r_drawbrushes->integer) {
+			// add the individual surfaces
+			mark = node->firstmarksurface;
+			c = node->nummarksurfaces;
+			while (c--) {
+				// the surface may have already been added if it
+				// spans multiple leafs
+				surf = *mark;
+				if (surf->viewCount != tr.viewCount) {
+					R_AddWorldSurface(surf, dlightBits);
+				}
+				mark++;
+			}
+		}
+
+		if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
+		{
+			int i;
+
+			for (i = 0; i < node->numTerraPatches; i++) {
+				R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
+			}
+		}
+
+		if (r_drawstaticdecals->integer) {
+			if (node->pFirstMarkFragment) {
+				R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
+			}
+		}
+
+		if (r_drawstaticmodels->integer) {
+			int i;
+
+			for (i = 0; i < node->numStaticModels; i++) {
+				tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCount;
+			}
 		}
 	}
 
 }
 
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
+	mnode_t* nodestack[1024];
+	int iNodeStackPos;
+	mnode_t* pCurNode;
+	int nFoundNodes;
 
+	iNodeStackPos = 0;
+	pCurNode = tr.world->nodes;
+	nFoundNodes = 0;
+
+	while (1)
+    {
+        cplane_t* plane;
+		float d;
+
+		while (pCurNode->contents == -1)
+		{
+			plane = pCurNode->plane;
+			if (plane->type >= PLANE_NON_AXIAL) {
+				d = DotProduct(p, plane->normal) - plane->dist;
+			} else {
+				d = p[plane->type] - plane->dist;
+			}
+
+            if (d < r) {
+                if (d > -r) {
+                    nodestack[iNodeStackPos++] = pCurNode->children[0];
+                }
+                pCurNode = pCurNode->children[1];
+            } else {
+                pCurNode = pCurNode->children[0];
+			}
+		}
+
+		nodes[nFoundNodes++] = pCurNode;
+		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
+			break;
+		}
+
+		iNodeStackPos--;
+        pCurNode = nodestack[iNodeStackPos];
+	}
+
+	return nFoundNodes;
+}
 /*
 ===============
 R_PointInLeaf
 ===============
 */
-static mnode_t *R_PointInLeaf( const vec3_t p ) {
+mnode_t *R_PointInLeaf( const vec3_t p ) {
 	mnode_t		*node;
 	float		d;
 	cplane_t	*plane;
@@ -506,7 +733,7 @@ static mnode_t *R_PointInLeaf( const vec3_t p ) {
 	if ( !tr.world ) {
 		ri.Error (ERR_DROP, "R_PointInLeaf: bad model");
 	}
-
+	
 	node = tr.world->nodes;
 	while( 1 ) {
 		if (node->contents != -1) {
@@ -530,7 +757,7 @@ R_ClusterPVS
 ==============
 */
 static const byte *R_ClusterPVS (int cluster) {
-	if (!tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
+	if (!tr.world || !tr.world->vis || cluster < 0 || cluster >= tr.world->numClusters ) {
 		return tr.world->novis;
 	}
 
@@ -547,7 +774,7 @@ qboolean R_inPVS( const vec3_t p1, const vec3_t p2 ) {
 	byte	*vis;
 
 	leaf = R_PointInLeaf( p1 );
-	vis = ri.CM_ClusterPVS( leaf->cluster ); // why not R_ClusterPVS ??
+	vis = ri.CM_ClusterPVS( leaf->cluster );
 	leaf = R_PointInLeaf( p2 );
 
 	if ( !(vis[leaf->cluster>>3] & (1<<(leaf->cluster&7))) ) {
@@ -643,26 +870,45 @@ R_AddWorldSurfaces
 =============
 */
 void R_AddWorldSurfaces (void) {
-	if ( !r_drawworld->integer ) {
+	if (!r_drawworld->integer) {
 		return;
 	}
 
-	if ( tr.refdef.rdflags & RDF_NOWORLDMODEL ) {
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
 		return;
 	}
 
-	tr.currentEntityNum = REFENTITYNUM_WORLD;
-	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+	tr.currentEntityNum = ENTITYNUM_WORLD;
+	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_ENTITYNUM_SHIFT;
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_TerrainPrepareFrame();
+	}
 
 	// determine which leaves are in the PVS / areamask
-	R_MarkLeaves ();
+	R_MarkLeaves();
 
 	// clear out the visible min/max
-	ClearBounds( tr.viewParms.visBounds[0], tr.viewParms.visBounds[1] );
+	ClearBounds(tr.viewParms.visBounds[0], tr.viewParms.visBounds[1]);
 
 	// perform frustum culling and add all the potentially visible surfaces
-	if ( tr.refdef.num_dlights > MAX_DLIGHTS ) {
-		tr.refdef.num_dlights = MAX_DLIGHTS ;
+	if (tr.refdef.num_dlights > 32) {
+		tr.refdef.num_dlights = 32;
 	}
-	R_RecursiveWorldNode( tr.world->nodes, 15, ( 1ULL << tr.refdef.num_dlights ) - 1 );
+	R_TransformDlights(tr.refdef.num_dlights, tr.refdef.dlights, &tr.viewParms.world);
+	R_RecursiveWorldNode(tr.world->nodes, tr.viewParms.fog.extrafrustums ? 31 : 15, (1 << tr.refdef.num_dlights) - 1);
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_AddTerrainSurfaces();
+	}
+	if (r_drawstaticmodels->integer) {
+		R_AddStaticModelSurfaces();
+	}
+
+	if (g_bInfostaticmodels) {
+		g_bInfostaticmodels = 0;
+		R_PrintInfoStaticModels();
+	}
+
+	R_UpdateLevelMarksSystem();
 }
diff --git a/code/renderergl2/CMakeLists.txt b/code/renderergl2/CMakeLists.txt
new file mode 100644
index 00000000..90682de3
--- /dev/null
+++ b/code/renderergl2/CMakeLists.txt
@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.12)
+
+project(omohrenderergl2)
+
+file(GLOB SOURCES_RENDERER "*.c" "*.cpp" "../renderercommon/tr_*.c")
+# Remove Quake III old model source
+list(REMOVE_ITEM SOURCES_RENDERER "${CMAKE_CURRENT_SOURCE_DIR}/tr_model.c")
+
+include("glsl/shaders.cmake")
+
+if (${USE_RENDERER_DLOPEN})
+	add_library(omohrenderergl2 SHARED ${SOURCES_RENDERER} ${SHADER_SRCS})
+else()
+	add_library(omohrenderergl2 STATIC ${SOURCES_RENDERER} ${SHADER_SRCS})
+endif()
+
+target_compile_features(omohrenderergl2 PUBLIC cxx_nullptr)
+target_compile_features(omohrenderergl2 PUBLIC c_variadic_macros)
+target_link_libraries(omohrenderergl2 PRIVATE omohrenderer_common)
+
+get_target_property(target_type omohrenderergl2 TYPE)
+if (target_type STREQUAL "SHARED_LIBRARY")
+	target_sources(omohrenderergl2 PRIVATE "./tr_subs.c")
+	target_compile_definitions(omohrenderergl2 PUBLIC USE_RENDERER_DLOPEN=1)
+	target_compile_definitions(omohrenderergl2 PRIVATE REF_DLL=1)
+endif ()
+
+set_target_properties(omohrenderergl2 PROPERTIES PREFIX "")
+set_target_properties(omohrenderergl2 PROPERTIES OUTPUT_NAME "renderer_opengl2${TARGET_BIN_SUFFIX}")
+
+if (target_type STREQUAL "SHARED_LIBRARY")
+	INSTALL(TARGETS omohrenderergl2 DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR})
+
+	if(MSVC)
+		INSTALL(FILES $<TARGET_PDB_FILE:omohrenderergl2> DESTINATION ${CMAKE_INSTALL_LIBDIR}/${LIB_INSTALL_SUBDIR} OPTIONAL)
+	endif()
+endif ()
diff --git a/code/renderergl2/glsl/depthblur_fp.glsl b/code/renderergl2/glsl/depthblur_fp.glsl
index d63df88a..205ee451 100644
--- a/code/renderergl2/glsl/depthblur_fp.glsl
+++ b/code/renderergl2/glsl/depthblur_fp.glsl
@@ -52,10 +52,9 @@ vec4 depthGaussian1D(sampler2D imageMap, sampler2D depthMap, vec2 tex, float zFa
 #endif
 
 	float zLimit = 5.0 / zFar;
-	int i, j;
-	for (i = 0; i < 2; i++)
+	for (int i = 0; i < 2; i++)
 	{
-		for (j = 1; j < BLUR_SIZE; j++)
+		for (int j = 1; j < BLUR_SIZE; j++)
 		{
 			vec2 offset = direction * (float(j) - 0.25) + nudge;
 #if defined(USE_DEPTH)
diff --git a/code/renderergl2/glsl/generic_vp.glsl b/code/renderergl2/glsl/generic_vp.glsl
index a0055263..e6af9f81 100644
--- a/code/renderergl2/glsl/generic_vp.glsl
+++ b/code/renderergl2/glsl/generic_vp.glsl
@@ -16,8 +16,16 @@ attribute vec4 attr_TexCoord0;
 attribute vec4 attr_TexCoord1;
 #endif
 
-uniform vec4   u_DiffuseTexMatrix;
-uniform vec4   u_DiffuseTexOffTurb;
+#if defined(USE_TCMOD)
+uniform vec4   u_DiffuseTexMatrix0;
+uniform vec4   u_DiffuseTexMatrix1;
+uniform vec4   u_DiffuseTexMatrix2;
+uniform vec4   u_DiffuseTexMatrix3;
+uniform vec4   u_DiffuseTexMatrix4;
+uniform vec4   u_DiffuseTexMatrix5;
+uniform vec4   u_DiffuseTexMatrix6;
+uniform vec4   u_DiffuseTexMatrix7;
+#endif
 
 #if defined(USE_TCGEN) || defined(USE_RGBAGEN)
 uniform vec3   u_LocalViewOrigin;
@@ -140,19 +148,28 @@ vec2 GenTexCoords(int TCGen, vec3 position, vec3 normal, vec3 TCGenVector0, vec3
 #endif
 
 #if defined(USE_TCMOD)
-vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix, vec4 offTurb)
+vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix[8])
 {
-	float amplitude = offTurb.z;
-	float phase = offTurb.w * 2.0 * M_PI;
-	vec2 st2;
-	st2.x = st.x * texMatrix.x + (st.y * texMatrix.z + offTurb.x);
-	st2.y = st.x * texMatrix.y + (st.y * texMatrix.w + offTurb.y);
-
+	vec2 st2 = st;
 	vec2 offsetPos = vec2(position.x + position.z, position.y);
-	
-	vec2 texOffset = sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(phase));
-	
-	return st2 + texOffset * amplitude;	
+
+	st2 = vec2(st2.x * texMatrix[0].x + st2.y * texMatrix[0].y + texMatrix[0].z,
+	           st2.x * texMatrix[1].x + st2.y * texMatrix[1].y + texMatrix[1].z);
+	st2 += texMatrix[0].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[1].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[2].x + st2.y * texMatrix[2].y + texMatrix[2].z,
+	           st2.x * texMatrix[3].x + st2.y * texMatrix[3].y + texMatrix[3].z);
+	st2 += texMatrix[2].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[3].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[4].x + st2.y * texMatrix[4].y + texMatrix[4].z,
+	           st2.x * texMatrix[5].x + st2.y * texMatrix[5].y + texMatrix[5].z);
+	st2 += texMatrix[4].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[5].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[6].x + st2.y * texMatrix[6].y + texMatrix[6].z,
+	           st2.x * texMatrix[7].x + st2.y * texMatrix[7].y + texMatrix[7].z);
+	st2 += texMatrix[6].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[7].w * 2.0 * M_PI));
+
+	return st2;
 }
 #endif
 
@@ -236,7 +253,16 @@ void main()
 #endif
 
 #if defined(USE_TCMOD)
-	var_DiffuseTex = ModTexCoords(tex, position, u_DiffuseTexMatrix, u_DiffuseTexOffTurb);
+	vec4 diffuseTexMatrix[8];
+	diffuseTexMatrix[0] = u_DiffuseTexMatrix0;
+	diffuseTexMatrix[1] = u_DiffuseTexMatrix1;
+	diffuseTexMatrix[2] = u_DiffuseTexMatrix2;
+	diffuseTexMatrix[3] = u_DiffuseTexMatrix3;
+	diffuseTexMatrix[4] = u_DiffuseTexMatrix4;
+	diffuseTexMatrix[5] = u_DiffuseTexMatrix5;
+	diffuseTexMatrix[6] = u_DiffuseTexMatrix6;
+	diffuseTexMatrix[7] = u_DiffuseTexMatrix7;
+	var_DiffuseTex = ModTexCoords(tex, position, diffuseTexMatrix);
 #else
     var_DiffuseTex = tex;
 #endif
diff --git a/code/renderergl2/glsl/lightall_vp.glsl b/code/renderergl2/glsl/lightall_vp.glsl
index 428cf1e6..8ff5e7bb 100644
--- a/code/renderergl2/glsl/lightall_vp.glsl
+++ b/code/renderergl2/glsl/lightall_vp.glsl
@@ -37,8 +37,14 @@ uniform vec3   u_LocalViewOrigin;
 #endif
 
 #if defined(USE_TCMOD)
-uniform vec4   u_DiffuseTexMatrix;
-uniform vec4   u_DiffuseTexOffTurb;
+uniform vec4   u_DiffuseTexMatrix0;
+uniform vec4   u_DiffuseTexMatrix1;
+uniform vec4   u_DiffuseTexMatrix2;
+uniform vec4   u_DiffuseTexMatrix3;
+uniform vec4   u_DiffuseTexMatrix4;
+uniform vec4   u_DiffuseTexMatrix5;
+uniform vec4   u_DiffuseTexMatrix6;
+uniform vec4   u_DiffuseTexMatrix7;
 #endif
 
 uniform mat4   u_ModelViewProjectionMatrix;
@@ -114,19 +120,28 @@ vec2 GenTexCoords(int TCGen, vec3 position, vec3 normal, vec3 TCGenVector0, vec3
 #endif
 
 #if defined(USE_TCMOD)
-vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix, vec4 offTurb)
+vec2 ModTexCoords(vec2 st, vec3 position, vec4 texMatrix[8])
 {
-	float amplitude = offTurb.z;
-	float phase = offTurb.w * 2.0 * M_PI;
-	vec2 st2;
-	st2.x = st.x * texMatrix.x + (st.y * texMatrix.z + offTurb.x);
-	st2.y = st.x * texMatrix.y + (st.y * texMatrix.w + offTurb.y);
-
+	vec2 st2 = st;
 	vec2 offsetPos = vec2(position.x + position.z, position.y);
 
-	vec2 texOffset = sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(phase));
+	st2 = vec2(st2.x * texMatrix[0].x + st2.y * texMatrix[0].y + texMatrix[0].z,
+	           st2.x * texMatrix[1].x + st2.y * texMatrix[1].y + texMatrix[1].z);
+	st2 += texMatrix[0].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[1].w * 2.0 * M_PI));
 
-	return st2 + texOffset * amplitude;	
+	st2 = vec2(st2.x * texMatrix[2].x + st2.y * texMatrix[2].y + texMatrix[2].z,
+	           st2.x * texMatrix[3].x + st2.y * texMatrix[3].y + texMatrix[3].z);
+	st2 += texMatrix[2].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[3].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[4].x + st2.y * texMatrix[4].y + texMatrix[4].z,
+	           st2.x * texMatrix[5].x + st2.y * texMatrix[5].y + texMatrix[5].z);
+	st2 += texMatrix[4].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[5].w * 2.0 * M_PI));
+
+	st2 = vec2(st2.x * texMatrix[6].x + st2.y * texMatrix[6].y + texMatrix[6].z,
+	           st2.x * texMatrix[7].x + st2.y * texMatrix[7].y + texMatrix[7].z);
+	st2 += texMatrix[6].w * sin(offsetPos * (2.0 * M_PI / 1024.0) + vec2(texMatrix[7].w * 2.0 * M_PI));
+
+	return st2;
 }
 #endif
 
@@ -183,7 +198,16 @@ void main()
 #endif
 
 #if defined(USE_TCMOD)
-	var_TexCoords.xy = ModTexCoords(texCoords, position, u_DiffuseTexMatrix, u_DiffuseTexOffTurb);
+	vec4 diffuseTexMatrix[8];
+	diffuseTexMatrix[0] = u_DiffuseTexMatrix0;
+	diffuseTexMatrix[1] = u_DiffuseTexMatrix1;
+	diffuseTexMatrix[2] = u_DiffuseTexMatrix2;
+	diffuseTexMatrix[3] = u_DiffuseTexMatrix3;
+	diffuseTexMatrix[4] = u_DiffuseTexMatrix4;
+	diffuseTexMatrix[5] = u_DiffuseTexMatrix5;
+	diffuseTexMatrix[6] = u_DiffuseTexMatrix6;
+	diffuseTexMatrix[7] = u_DiffuseTexMatrix7;
+	var_TexCoords.xy = ModTexCoords(texCoords, position, diffuseTexMatrix);
 #else
 	var_TexCoords.xy = texCoords;
 #endif
diff --git a/code/renderergl2/glsl/shaders.cmake b/code/renderergl2/glsl/shaders.cmake
index 925f3513..3f8b3fc3 100644
--- a/code/renderergl2/glsl/shaders.cmake
+++ b/code/renderergl2/glsl/shaders.cmake
@@ -1,6 +1,6 @@
-file(GLOB_RECURSE SHADER_GLSL_SRCS "code/renderergl2/glsl/*.glsl")
+file(GLOB_RECURSE SHADER_GLSL_SRCS "*.glsl")
 
-add_executable(stringify "code/tools/stringify.cpp")
+add_executable(stringify "../tools/stringify.cpp")
 
 foreach (shader ${SHADER_GLSL_SRCS})
 	get_filename_component(shaderfile ${shader} NAME_WE)
diff --git a/code/renderergl2/glsl/shadowmask_fp.glsl b/code/renderergl2/glsl/shadowmask_fp.glsl
index 2b57e3ba..1a562cbf 100644
--- a/code/renderergl2/glsl/shadowmask_fp.glsl
+++ b/code/renderergl2/glsl/shadowmask_fp.glsl
@@ -103,14 +103,19 @@ void main()
 
 	vec4 shadowpos = u_ShadowMvp * biasPos;
 
+	if ( depth >= 0.999 )
+	{
+		result = 1.0;
+	}
+	else
 #if defined(USE_SHADOW_CASCADE)
 	if (all(lessThan(abs(shadowpos.xyz), vec3(abs(shadowpos.w)))))
-	{
 #endif
+	{
 		shadowpos.xyz = shadowpos.xyz * (0.5 / shadowpos.w) + vec3(0.5);
 		result = PCF(u_ShadowMap, shadowpos.xy, shadowpos.z);
-#if defined(USE_SHADOW_CASCADE)
 	}
+#if defined(USE_SHADOW_CASCADE)
 	else
 	{
 		shadowpos = u_ShadowMvp2 * biasPos;
diff --git a/code/renderergl2/glsl/ssao_fp.glsl b/code/renderergl2/glsl/ssao_fp.glsl
index f3054404..2171f6e7 100644
--- a/code/renderergl2/glsl/ssao_fp.glsl
+++ b/code/renderergl2/glsl/ssao_fp.glsl
@@ -77,8 +77,7 @@ float ambientOcclusion(sampler2D depthMap, const vec2 tex, const float zFarDivZN
 
 	float invZFar = 1.0 / zFar;
 	float zLimit = 20.0 * invZFar;
-	int i;
-	for (i = 0; i < NUM_SAMPLES; i++)
+	for (int i = 0; i < NUM_SAMPLES; i++)
 	{
 		vec2 offset = rmat * poissonDisc[i] * offsetScale;
 		float sampleDiff = getLinearDepth(depthMap, tex + offset, zFarDivZNear) - sampleZ;
diff --git a/code/renderergl2/new/tr_cmds.c b/code/renderergl2/new/tr_cmds.c
deleted file mode 100644
index 90c60eba..00000000
--- a/code/renderergl2/new/tr_cmds.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-static backEndCounters_t pc_save;
-
-/*
-=====================
-R_PerformanceCounters
-=====================
-*/
-void R_SavePerformanceCounters(void) {
-    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
-}
-
-void R_SyncRenderThread() {
-    R_IssuePendingRenderCommands();
-}
diff --git a/code/renderergl2/new/tr_draw.c b/code/renderergl2/new/tr_draw.c
deleted file mode 100644
index fdaff185..00000000
--- a/code/renderergl2/new/tr_draw.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_draw.c -- drawing
-
-#include "../tr_local.h"
-
-vec4_t r_colorWhite = { 1.0, 1.0, 1.0, 1.0 };
-
-/*
-================
-Draw_SetColor
-================
-*/
-void Draw_SetColor(const vec4_t rgba) {
-#if 1
-	if (!rgba) {
-		rgba = r_colorWhite;
-	}
-
-	backEnd.color2D[0] = (byte)(rgba[0] * tr.identityLightByte);
-	backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
-	backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
-	backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
-#else
-	RE_SetColor(rgba);
-#endif
-}
-
-/*
-================
-Draw_StretchPic
-================
-*/
-void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader) {
-#if 1
-	shader_t* shader;
-
-	R_SyncRenderThread();
-
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
-
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
-	RB_BeginSurface(shader, 0, 0);
-
-	RB_Texcoord2f(s1, t1);
-	RB_Vertex2f(x, y);
-
-	RB_Texcoord2f(s2, t1);
-	RB_Vertex2f(x + w, y);
-
-	RB_Texcoord2f(s1, t2);
-	RB_Vertex2f(x, y + h);
-
-	RB_Texcoord2f(s2, t2);
-	RB_Vertex2f(x + w, y + h);
-
-	RB_StreamEnd();
-#else
-	RE_StretchPic(x, y, w, h, s1, t1, s2, t2, hShader);
-#endif
-}
-
-/*
-================
-Draw_TilePic
-================
-*/
-void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
-	shader_t* shader;
-	float		picw, pich;
-
-	R_SyncRenderThread();
-
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
-
-	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
-	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
-
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
-
-	RB_StreamBegin(shader);
-
-	RB_Texcoord2f(x / picw, y / pich);
-	RB_Vertex2f(x, y);
-
-	RB_Texcoord2f((x + w) / picw, y / pich);
-	RB_Vertex2f(x + w, y);
-
-	RB_Texcoord2f(x / picw, (y + h) / pich);
-	RB_Vertex2f(x, y + h);
-
-	RB_Texcoord2f((x + w) / picw, (y + h) / pich);
-	RB_Vertex2f(x + w, y + h);
-
-	RB_StreamEnd();
-}
-
-/*
-================
-Draw_TilePicOffset
-================
-*/
-void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY) {
-	shader_t* shader;
-	float		picw, pich;
-
-	R_SyncRenderThread();
-
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	if (w <= 0) {
-		w = shader->stages[0]->bundle[0].image[0]->width;
-		h = shader->stages[0]->bundle[0].image[0]->height;
-	}
-
-	picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
-	pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
-
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
-
-	RB_StreamBegin(shader);
-
-	RB_Texcoord2f(x / picw, y / pich);
-	RB_Vertex2f(x + offsetX, y + offsetY);
-
-	RB_Texcoord2f((x + w) / picw, y / pich);
-	RB_Vertex2f(x + offsetX + w, y + offsetY);
-
-	RB_Texcoord2f(x / picw, (y + h) / pich);
-	RB_Vertex2f(x + offsetX, y + offsetY + h);
-
-	RB_Texcoord2f((x + w) / picw, (y + h) / pich);
-	RB_Vertex2f(x + offsetX + w, y + offsetY + h);
-
-	RB_StreamEnd();
-}
-
-/*
-================
-Draw_TrianglePic
-================
-*/
-void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader) {
-	int			i;
-	shader_t* shader;
-
-	R_SyncRenderThread();
-
-	if (hShader) {
-		shader = R_GetShaderByHandle(hShader);
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	// draw the pic
-	RB_Color4f(backEnd.color2D[0], backEnd.color2D[1], backEnd.color2D[2], backEnd.color2D[3]);
-
-	RB_BeginSurface(shader, 0, 0);
-
-	for (i = 0; i < 3; i++) {
-		RB_Texcoord2f(vTexCoords[i][0], vTexCoords[i][1]);
-		RB_Vertex2f(vPoints[i][0], vPoints[i][1]);
-	}
-
-	RB_StreamEnd();
-}
-
-/*
-================
-RE_DrawBackground_TexSubImage
-================
-*/
-void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
-	GLenum	format;
-    int		w, h;
-    vec4_t quadVerts[4];
-    vec2_t texCoords[4];
-
-	w = glConfig.vidWidth;
-	h = glConfig.vidHeight;
-
-	R_SyncRenderThread();
-	qglFinish();
-
-	if (bgr) {
-		format = GL_BGR_EXT;
-	}
-	else {
-		format = GL_RGB;
-	}
-
-	GL_BindToTMU(tr.scratchImage[0], TB_COLORMAP);
-
-	if (cols == tr.scratchImage[0]->width && rows == tr.scratchImage[0]->height && format == tr.scratchImage[0]->internalFormat)
-	{
-		qglTexSubImage2D(3553, 0, 0, 0, cols, rows, format, 5121, data);
-	}
-	else
-	{
-		tr.scratchImage[0]->uploadWidth = cols;
-		tr.scratchImage[0]->uploadHeight = rows;
-		tr.scratchImage[0]->internalFormat = format;
-		qglTexImage2D(GL_TEXTURE_2D, 0, 3, cols, rows, 0, format, 5121, data);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 9729.0);
-		qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 9729.0);
-	}
-
-	qglDisable(GL_CULL_FACE);
-	qglDisable(GL_DEPTH_TEST);
-	qglEnable(GL_TEXTURE_2D);
-
-	VectorSet4(quadVerts[0], 0.0f, 0.0f, 0.0f, 1.0f);
-	VectorSet4(quadVerts[1], w, 0.0f, 0.0f, 1.0f);
-	VectorSet4(quadVerts[2], w, h, 0.0f, 1.0f);
-    VectorSet4(quadVerts[3], 0.0f, h, 0.0f, 1.0f);
-
-    VectorSet2(texCoords[0], 0.5f / cols, (rows - 0.5f) / rows);
-    VectorSet2(texCoords[1], (cols - 0.5f) / cols, (rows - 0.5f) / rows);
-    VectorSet2(texCoords[2], (cols - 0.5f) / cols, 0.5f / rows);
-    VectorSet2(texCoords[3], 0.5f / cols, 0.5f / rows);
-
-    GLSL_BindProgram(&tr.textureColorShader);
-
-    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, colorWhite);
-
-    RB_InstantQuad2(quadVerts, texCoords);
-}
-
-/*
-================
-RE_DrawBackground_DrawPixels
-================
-*/
-void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
-	// FIXME: stub
-}
-
-/*
-================
-AddBox
-================
-*/
-void AddBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
-
-	qglDisable(GL_TEXTURE_2D);
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
-
-    {
-        shaderProgram_t* sp = &tr.textureColorShader;
-        vec4_t color = { backEnd.color2D[0] / 255.0f, backEnd.color2D[1] / 255.0f, backEnd.color2D[2] / 255.0f, backEnd.color2D[3] / 255.0f };
-        vec4_t quadVerts[4];
-        vec2_t texCoords[4];
-
-        VectorSet4(quadVerts[0], x, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[1], x + w, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-        VectorSet4(quadVerts[3], x, y + h, 0.0f, 1.0f);
-
-        VectorSet2(texCoords[0], 0.0f, 0.0f);
-        VectorSet2(texCoords[1], 1.0f, 0.0f);
-        VectorSet2(texCoords[2], 1.0f, 1.0f);
-        VectorSet2(texCoords[3], 0.0f, 1.0f);
-
-        GLSL_BindProgram(sp);
-
-        GLSL_SetUniformMat4(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-        GLSL_SetUniformVec4(sp, UNIFORM_COLOR, color);
-
-        RB_InstantQuad2(quadVerts, texCoords);
-    }
-
-	qglEnable(GL_TEXTURE_2D);
-}
-
-/*
-================
-DrawBox
-================
-*/
-void DrawBox(float x, float y, float w, float h) {
-	R_SyncRenderThread();
-
-	qglDisable(GL_TEXTURE_2D);
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
-
-    {
-        shaderProgram_t* sp = &tr.textureColorShader;
-        vec4_t color = { backEnd.color2D[0] / 255.0f, backEnd.color2D[1] / 255.0f, backEnd.color2D[2] / 255.0f, backEnd.color2D[3] / 255.0f };
-        vec4_t quadVerts[4];
-        vec2_t texCoords[4];
-
-        VectorSet4(quadVerts[0], x, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[1], x + w, y, 0.0f, 1.0f);
-        VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
-        VectorSet4(quadVerts[3], x, y + h, 0.0f, 1.0f);
-
-        VectorSet2(texCoords[0], 0.0f, 0.0f);
-        VectorSet2(texCoords[1], 1.0f, 0.0f);
-        VectorSet2(texCoords[2], 1.0f, 1.0f);
-        VectorSet2(texCoords[3], 0.0f, 1.0f);
-
-        GLSL_BindProgram(sp);
-
-        GLSL_SetUniformMat4(sp, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
-        GLSL_SetUniformVec4(sp, UNIFORM_COLOR, color);
-
-        RB_InstantQuad2(quadVerts, texCoords);
-    }
-
-	qglEnable(GL_TEXTURE_2D);
-}
-
-/*
-================
-DrawLineLoop
-================
-*/
-void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
-	int		i;
-
-	R_SyncRenderThread();
-
-	qglDisable(GL_TEXTURE_2D);
-
-	if (stipple_factor) {
-		qglEnable(GL_LINE_STIPPLE);
-		glLineStipple(stipple_factor, stipple_mask);
-	}
-
-	// FIXME: unimplemented
-	/*
-	qglBegin(GL_LINE_LOOP);
-
-	for (i = 0; i < count; i++) {
-		qglVertex2f(points[i][0], points[i][1]);
-	}
-
-	qglEnd();
-	*/
-
-	qglEnable(GL_TEXTURE_2D);
-
-	if (stipple_factor) {
-		qglDisable(GL_LINE_STIPPLE);
-	}
-}
-
-/*
-================
-Set2DWindow
-================
-*/
-void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
-	mat4_t matrix;
-
-	R_SyncRenderThread();
-	qglViewport(x, y, w, h);
-	qglScissor(x, y, w, h);
-
-    Mat4Ortho(left, right, bottom, top, n, f, matrix);
-    GL_SetProjectionMatrix(matrix);
-    Mat4Identity(matrix);
-    GL_SetModelviewMatrix(matrix);
-
-	GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
-	qglEnable(GL_BLEND);
-	qglDisable(GL_CULL_FACE);
-	qglDisable(GL_CLIP_PLANE0);
-
-	//if (r_reset_tc_array->integer) {
-	//	qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
-	//}
-
-	if (!backEnd.projection2D)
-	{
-		backEnd.refdef.time = ri.Milliseconds();
-		backEnd.projection2D = qtrue;
-		backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
-	}
-}
-
-/*
-================
-RE_Scissor
-================
-*/
-void RE_Scissor(int x, int y, int width, int height) {
-	qglEnable(GL_SCISSOR_TEST);
-	qglScissor(x, y, width, height);
-}
diff --git a/code/renderergl2/new/tr_init.c b/code/renderergl2/new/tr_init.c
deleted file mode 100644
index 14969cfc..00000000
--- a/code/renderergl2/new/tr_init.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-cvar_t* r_reset_tc_array;
-cvar_t* r_numdebuglines;
-
-
-cvar_t* r_staticlod;
-cvar_t* r_lodscale;
-cvar_t* r_lodcap;
-cvar_t* r_lodviewmodelcap;
-
-cvar_t* r_uselod;
-cvar_t* lod_LOD;
-cvar_t* lod_minLOD;
-cvar_t* lod_maxLOD;
-cvar_t* lod_LOD_slider;
-cvar_t* lod_curve_0_val;
-cvar_t* lod_curve_1_val;
-cvar_t* lod_curve_2_val;
-cvar_t* lod_curve_3_val;
-cvar_t* lod_curve_4_val;
-cvar_t* lod_edit_0;
-cvar_t* lod_edit_1;
-cvar_t* lod_edit_2;
-cvar_t* lod_edit_3;
-cvar_t* lod_edit_4;
-cvar_t* lod_curve_0_slider;
-cvar_t* lod_curve_1_slider;
-cvar_t* lod_curve_2_slider;
-cvar_t* lod_curve_3_slider;
-cvar_t* lod_curve_4_slider;
-cvar_t* lod_pitch_val;
-cvar_t* lod_zee_val;
-cvar_t* lod_mesh;
-cvar_t* lod_meshname;
-cvar_t* lod_tikiname;
-cvar_t* lod_metric;
-cvar_t* lod_tris;
-cvar_t* lod_position;
-cvar_t* lod_save;
-cvar_t* lod_tool;
-
-cvar_t* r_showSkeleton;
-
-int r_sequencenumber;
-
-//=============================================================================
-
-/*
-** RE_BeginRegistration
-*/
-void RE_BeginRegistration(glconfig_t* glconfigOut) {
-    int	i;
-
-    R_Init();
-
-    *glconfigOut = glConfig;
-
-    R_IssuePendingRenderCommands();
-
-    tr.visIndex = 0;
-    // force markleafs to regenerate
-    for (i = 0; i < MAX_VISCOUNTS; i++) {
-        tr.visClusters[i] = -2;
-    }
-
-    R_ClearFlares();
-    RE_ClearScene();
-
-    tr.registered = qtrue;
-}
-
-const char* RE_GetGraphicsInfo() {
-    // FIXME: unimplemented
-    return NULL;
-}
-
-qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
-    // FIXME: unimplemented
-    return qfalse;
-}
-
-void R_SetFullscreen(qboolean fullscreen) {
-    // FIXME: unimplemented
-}
-
-void RE_SetRenderTime(int t) {
-    // FIXME: unimplemented
-}
-
-void GetRefAPI_new(refimport_t* ri, refexport_t* re)
-{
-    re->FreeModels = RE_FreeModels;
-    re->SpawnEffectModel = RE_SpawnEffectModel;
-    re->RegisterServerModel = RE_RegisterServerModel;
-    re->UnregisterServerModel = RE_UnregisterServerModel;
-    re->RefreshShaderNoMip = RE_RefreshShaderNoMip;
-    re->PrintBSPFileSizes = RE_PrintBSPFileSizes;
-    re->MapVersion = RE_MapVersion;
-    re->LoadFont = R_LoadFont;
-
-    re->BeginFrame = RE_BeginFrame;
-    
-    re->MarkFragments = R_MarkFragments_New;
-    re->MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
-    re->GetInlineModelBounds = R_GetInlineModelBounds;
-    re->GetLightingForDecal = R_GetLightingForDecal;
-    re->GetLightingForSmoke = R_GetLightingForSmoke;
-    re->R_GatherLightSources = R_GatherLightSources;
-    re->ModelBounds = R_ModelBounds;
-    re->ModelRadius = R_ModelRadius;
-
-    re->AddRefEntityToScene = RE_AddRefEntityToScene;
-    re->AddRefSpriteToScene = RE_AddRefSpriteToScene;
-    re->AddPolyToScene = RE_AddPolyToScene;
-    re->AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
-    re->AddLightToScene = RE_AddLightToScene;
-    re->RenderScene = RE_RenderScene;
-    re->GetRenderEntity = RE_GetRenderEntity;
-
-    re->SavePerformanceCounters = R_SavePerformanceCounters;
-
-    re->R_Model_GetHandle = R_Model_GetHandle;
-    re->DrawStretchRaw = RE_StretchRaw;
-    re->DebugLine = R_DebugLine;
-    re->DrawStretchPic = Draw_StretchPic;
-    re->DrawTilePic = Draw_TilePic;
-    re->DrawTilePicOffset = Draw_TilePicOffset;
-    re->DrawTrianglePic = Draw_TrianglePic;
-    re->DrawBox = DrawBox;
-    re->AddBox = AddBox;
-    re->Set2DWindow = Set2DWindow;
-    re->Scissor = RE_Scissor;
-    re->DrawLineLoop = DrawLineLoop;
-    re->DrawString = R_DrawString;
-    re->GetFontHeight = R_GetFontHeight;
-    re->GetFontStringWidth = R_GetFontStringWidth;
-    re->SwipeBegin = RE_SwipeBegin;
-    re->SwipeEnd = RE_SwipeEnd;
-    re->SetRenderTime = RE_SetRenderTime;
-    re->Noise = R_NoiseGet4f;
-
-    re->SetMode = R_SetMode;
-    re->SetFullscreen = R_SetFullscreen;
-
-    re->GetShaderHeight = RE_GetShaderHeight;
-    re->GetShaderWidth = RE_GetShaderWidth;
-    re->GetGraphicsInfo = RE_GetGraphicsInfo;
-    re->ForceUpdatePose = RE_ForceUpdatePose;
-    re->TIKI_Orientation = RE_TIKI_Orientation;
-    re->TIKI_IsOnGround = RE_TIKI_IsOnGround;
-    re->SetFrameNumber = RE_SetFrameNumber;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_light.c b/code/renderergl2/new/tr_light.c
deleted file mode 100644
index e79a8072..00000000
--- a/code/renderergl2/new/tr_light.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-void R_GetLightingForDecal(vec3_t vLight, vec3_t vFacing, vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-}
-
-void R_GetLightingForSmoke(vec3_t vLight, vec3_t vOrigin)
-{
-    // FIXME: unimplemented
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_local.h b/code/renderergl2/new/tr_local.h
deleted file mode 100644
index 6e97ca52..00000000
--- a/code/renderergl2/new/tr_local.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-extern int r_sequencenumber;
-
-void GetRefAPI_new(refimport_t* ri, refexport_t* re);
-
-extern cvar_t* r_reset_tc_array;
-extern  cvar_t* r_numdebuglines;
-
-extern cvar_t* r_staticlod;
-extern cvar_t* r_lodscale;
-extern cvar_t* r_lodcap;
-extern cvar_t* r_lodviewmodelcap;
-
-extern cvar_t* r_uselod;
-extern cvar_t* lod_LOD;
-extern cvar_t* lod_minLOD;
-extern cvar_t* lod_maxLOD;
-extern cvar_t* lod_LOD_slider;
-extern cvar_t* lod_curve_0_val;
-extern cvar_t* lod_curve_1_val;
-extern cvar_t* lod_curve_2_val;
-extern cvar_t* lod_curve_3_val;
-extern cvar_t* lod_curve_4_val;
-extern cvar_t* lod_edit_0;
-extern cvar_t* lod_edit_1;
-extern cvar_t* lod_edit_2;
-extern cvar_t* lod_edit_3;
-extern cvar_t* lod_edit_4;
-extern cvar_t* lod_curve_0_slider;
-extern cvar_t* lod_curve_1_slider;
-extern cvar_t* lod_curve_2_slider;
-extern cvar_t* lod_curve_3_slider;
-extern cvar_t* lod_curve_4_slider;
-extern cvar_t* lod_pitch_val;
-extern cvar_t* lod_zee_val;
-extern cvar_t* lod_mesh;
-extern cvar_t* lod_meshname;
-extern cvar_t* lod_tikiname;
-extern cvar_t* lod_metric;
-extern cvar_t* lod_tris;
-extern cvar_t* lod_position;
-extern cvar_t* lod_save;
-extern cvar_t* lod_tool;
-extern cvar_t* r_showSkeleton;
-
-typedef union varnodeUnpacked_u {
-    float fVariance;
-    struct {
-        byte flags;
-        unsigned char unused[3];
-    } s;
-} varnodeUnpacked_t;
-
-typedef unsigned short terraInt;
-
-typedef struct terrainVert_s {
-    vec3_t xyz;
-    vec2_t texCoords[2];
-    float fVariance;
-    float fHgtAvg;
-    float fHgtAdd;
-    unsigned int uiDistRecalc;
-    terraInt nRef;
-    terraInt iVertArray;
-    byte* pHgt;
-    terraInt iNext;
-    terraInt iPrev;
-} terrainVert_t;
-
-typedef struct terraTri_s {
-    unsigned short iPt[3];
-    terraInt nSplit;
-    unsigned int uiDistRecalc;
-    struct cTerraPatchUnpacked_s* patch;
-    varnodeUnpacked_t* varnode;
-    terraInt index;
-    byte lod;
-    byte byConstChecks;
-    terraInt iLeft;
-    terraInt iRight;
-    terraInt iBase;
-    terraInt iLeftChild;
-    terraInt iRightChild;
-    terraInt iParent;
-    terraInt iPrev;
-    terraInt iNext;
-} terraTri_t;
-
-typedef struct srfTerrain_s {
-    surfaceType_t surfaceType;
-    terraInt iVertHead;
-    terraInt iTriHead;
-    terraInt iTriTail;
-    terraInt iMergeHead;
-    int nVerts;
-    int nTris;
-    int lmapSize;
-    int dlightBits[2];
-    float lmapStep;
-    int dlightMap[2];
-    byte* lmData;
-    float lmapX;
-    float lmapY;
-} srfTerrain_t;
-
-typedef struct cTerraPatchUnpacked_s {
-    srfTerrain_t drawinfo;
-    int viewCount;
-    int visCountCheck;
-    int visCountDraw;
-    int frameCount;
-    unsigned int uiDistRecalc;
-    float s;
-    float t;
-    vec2_t texCoord[2][2];
-    float x0;
-    float y0;
-    float z0;
-    float zmax;
-    shader_t* shader;
-    short int iNorth;
-    short int iEast;
-    short int iSouth;
-    short int iWest;
-    struct cTerraPatchUnpacked_s* pNextActive;
-    varnodeUnpacked_t varTree[2][63];
-    unsigned char heightmap[81];
-    byte flags;
-    byte byDirty;
-} cTerraPatchUnpacked_t;
-
-typedef struct srfStaticModel_s {
-    surfaceType_t surfaceType;
-    struct cStaticModelUnpacked_s* parent;
-} srfStaticModel_t;
-
-typedef struct cStaticModelUnpacked_s {
-    qboolean useSpecialLighting;
-    qboolean bLightGridCalculated;
-    qboolean bRendered;
-    char model[128];
-    vec3_t origin;
-    vec3_t angles;
-    vec3_t axis[3];
-    float scale;
-    int firstVertexData;
-    int numVertexData;
-    int visCount;
-    dtiki_t* tiki;
-    sphere_dlight_t dlights[32];
-    int numdlights;
-    float radius;
-    float cull_radius;
-    int iGridLighting;
-    float lodpercentage[2];
-} cStaticModelUnpacked_t;
-
-typedef struct refSprite_s {
-    surfaceType_t surftype;
-    int hModel;
-    int shaderNum;
-    float origin[3];
-    float scale;
-    float axis[3][3];
-    unsigned char shaderRGBA[4];
-    int renderfx;
-    float shaderTime;
-} refSprite_t;
-
-//
-// tr_shader.c
-//
-qhandle_t		RE_RefreshShaderNoMip(const char* name);
-
-//
-// tr_bsp.c
-//
-void		RE_PrintBSPFileSizes(void);
-int			RE_MapVersion(void);
-
-typedef struct skelSurfaceGame_s skelSurfaceGame_t;
-typedef struct staticSurface_s staticSurface_t;
-
-/*
-============================================================
-
-DRAWING
-
-============================================================
-*/
-void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
-void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
-void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
-void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
-void DrawBox(float x, float y, float w, float h);
-void AddBox(float x, float y, float w, float h);
-void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
-void RE_Scissor(int x, int y, int width, int height);
-void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
-
-/*
-============================================================
-
-FLARES
-
-============================================================
-*/
-
-void R_ClearFlares(void);
-
-void RB_AddFlare(void* surface, int fogNum, vec3_t point, vec3_t color, vec3_t normal);
-void RB_AddDlightFlares(void);
-void RB_RenderFlares(void);
-
-/*
-=============================================================
-
-FONT
-
-=============================================================
-*/
-fontheader_t* R_LoadFont(const char* name);
-void R_LoadFontShader(fontheader_t* font);
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen);
-float R_GetFontHeight(const fontheader_t* font);
-float R_GetFontStringWidth(const fontheader_t* font, const char* s);
-
-/*
-============================================================
-
-LIGHTS
-
-============================================================
-*/
-
-void R_DlightBmodel(bmodel_t* bmodel);
-void R_GetLightingGridValue(const vec3_t vPos, vec3_t vLight);
-void R_GetLightingForDecal(vec3_t vLight, vec3_t vFacing, vec3_t vOrigin);
-void R_GetLightingForSmoke(vec3_t vLight, vec3_t vOrigin);
-void R_SetupEntityLighting(const trRefdef_t* refdef, trRefEntity_t* ent);
-void RB_SetupEntityGridLighting();
-void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
-void R_TransformDlights(int count, dlight_t* dl, orientationr_t* ori);
-void RB_Light_Real(unsigned char* colors);
-void RB_Sphere_BuildDLights();
-void RB_Sphere_SetupEntity();
-void RB_Grid_SetupEntity();
-void RB_Grid_SetupStaticModel();
-void RB_Light_Fullbright(unsigned char* colors);
-void R_Sphere_InitLights();
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
-void R_UploadDlights();
-
-/*
-=============================================================
-
-MARKS
-
-=============================================================
-*/
-void R_LevelMarksLoad(const char* szBSPName);
-void R_LevelMarksInit();
-void R_LevelMarksFree();
-void R_UpdateLevelMarksSystem();
-void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
-
-int R_MarkFragments_New(int numPoints, const vec3_t* points, const vec3_t projection,
-    int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t angles, const vec3_t origin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float radiusSquared);
-
-
-/*
-=============================================================
-
-SHADE
-
-=============================================================
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor);
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha);
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax);
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st);
-
-/*
-=============================================================
-
-SKY PORTALS
-
-=============================================================
-*/
-void R_Sky_Init();
-void R_Sky_Reset();
-void R_Sky_AddSurf(msurface_t* surf);
-
-/*
-=============================================================
-
-SPRITE
-
-=============================================================
-*/
-sprite_t* SPR_RegisterSprite(const char* name);
-void RB_DrawSprite(const refSprite_t* spr);
-
-
-/*
-=============================================================
-
-SUN FLARE
-
-=============================================================
-*/
-void R_InitLensFlare();
-void R_DrawLensFlares();
-
-/*
-=============================================================
-
-SWIPE
-
-=============================================================
-*/
-void RB_DrawSwipeSurface(surfaceType_t* pswipe);
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
-void RE_SwipeEnd();
-
-/*
-=============================================================
-
-TERRAIN
-
-=============================================================
-*/
-void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
-void R_AddTerrainSurfaces();
-void R_InitTerrain();
-void R_TerrainPrepareFrame();
-
-/*
-=============================================================
-
-SCENE GENERATION
-
-=============================================================
-*/
-void RE_AddRefSpriteToScene(const refEntity_t* ent);
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
-refEntity_t* RE_GetRenderEntity(int entityNumber);
-
-/*
-=============================================================
-
-TIKI
-
-=============================================================
-*/
-void R_InitStaticModels(void);
-void RE_FreeModels(void);
-qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
-qhandle_t RE_RegisterServerModel(const char* name);
-void RE_UnregisterServerModel(qhandle_t hModel);
-orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
-qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
-float R_ModelRadius(qhandle_t handle);
-void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
-dtiki_t* R_Model_GetHandle(qhandle_t handle);
-
-float R_GetRadius(refEntity_t* model);
-void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
-void RE_ForceUpdatePose(refEntity_t* model);
-void RE_SetFrameNumber(int frameNumber);
-void R_UpdatePoseInternal(refEntity_t* model);
-void RB_SkelMesh(skelSurfaceGame_t* sf);
-void RB_StaticMesh(staticSurface_t* staticSurf);
-void RB_Static_BuildDLights();
-void R_PrintInfoStaticModels();
-void R_AddSkelSurfaces(trRefEntity_t* ent);
-void R_AddStaticModelSurfaces(void);
-float R_CalcLod(const vec3_t origin, float radius);
-int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
-    float frac, const char* tagName);
-void R_PrintInfoWorldtris(void);
-
-/*
-=============================================================
-
-UTIL
-
-=============================================================
-*/
-int RE_GetShaderHeight(qhandle_t hShader);
-int RE_GetShaderWidth(qhandle_t hShader);
-void RB_StreamBegin(shader_t* shader);
-void RB_StreamEnd(void);
-void RB_StreamBeginDrawSurf(void);
-void RB_StreamEndDrawSurf(void);
-static void addTriangle(void);
-void RB_Vertex3fv(vec3_t v);
-void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
-void RB_Vertex2f(vec_t x, vec_t y);
-void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
-void RB_Color3f(vec_t r, vec_t g, vec_t b);
-void RB_Color3fv(vec3_t col);
-void RB_Color4bv(unsigned char* colors);
-void RB_Texcoord2f(float s, float t);
-void RB_Texcoord2fv(vec2_t st);
-void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
-void R_DebugRotatedBBox(const vec3_t org, vec3_t ang, vec3_t mins, vec3_t maxs, float r, float g, float b, float alpha);
-const char* RE_GetGraphicsInfo();
-
-/*
-=============================================================
-
-WORLD MAP
-
-=============================================================
-*/
-void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
-
-extern int g_nStaticSurfaces;
-extern qboolean g_bInfostaticmodels;
-extern qboolean g_bInfoworldtris;
-
-//
-//
-//
-
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
-
-void RE_SetRenderTime(int t);
-qboolean R_SetMode(int mode, const glconfig_t* glConfig);
-void R_SetFullscreen(qboolean fullscreen);
-void R_SavePerformanceCounters(void);
-void R_SyncRenderThread(void);
diff --git a/code/renderergl2/new/tr_local_begin.h b/code/renderergl2/new/tr_local_begin.h
deleted file mode 100644
index 76316645..00000000
--- a/code/renderergl2/new/tr_local_begin.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#pragma once
-
-typedef struct suninfo_s {
-    vec3_t color;
-    vec3_t direction;
-    vec3_t flaredirection;
-    char szFlareName[64];
-    qboolean exists;
-} suninfo_t;
-
-typedef struct {
-    vec3_t transformed;
-    int index;
-} sphere_dlight_t;
-
-typedef enum {
-    LIGHT_POINT,
-    LIGHT_DIRECTIONAL,
-    LIGHT_SPOT,
-    LIGHT_SPOT_FAST
-} lighttype_t;
-
-typedef struct reallightinfo_s {
-    vec3_t color;
-    lighttype_t eType;
-    float fIntensity;
-    float fDist;
-    float fSpotSlope;
-    float fSpotConst;
-    float fSpotScale;
-    vec3_t vOrigin;
-    vec3_t vDirection;
-} reallightinfo_t;
-
-typedef float cube_entry_t[3][4];
-
-typedef struct {
-    vec3_t origin;
-    vec3_t worldOrigin;
-    vec3_t traceOrigin;
-    float radius;
-    struct mnode_s* leaves[8];
-    void(*TessFunction) (unsigned char* dstColors);
-    union {
-        unsigned char level[4];
-        int value;
-    } ambient;
-    int numRealLights;
-    reallightinfo_t light[32];
-    int bUsesCubeMap;
-    float cubemap[24][3][4];
-} sphereor_t;
-
-typedef struct spherel_s {
-    vec3_t origin;
-    vec3_t color;
-    float intensity;
-    struct mnode_s* leaf;
-    int needs_trace;
-    int spot_light;
-    float spot_radiusbydistance;
-    vec3_t spot_dir;
-    int reference_count;
-} spherel_t;
-
-typedef enum {
-    SPRITE_PARALLEL,
-    SPRITE_PARALLEL_ORIENTED,
-    SPRITE_ORIENTED,
-    SPRITE_PARALLEL_UPRIGHT
-} spriteType_t;
-
-typedef struct {
-    spriteType_t type;
-    float scale;
-} spriteParms_t;
-
-typedef struct {
-    float width;
-    float height;
-    float origin_x;
-    float origin_y;
-    float scale;
-    struct shader_s* shader;
-} sprite_t;
diff --git a/code/renderergl2/new/tr_main.c b/code/renderergl2/new/tr_main.c
deleted file mode 100644
index 02e20309..00000000
--- a/code/renderergl2/new/tr_main.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-#define CIRCLE_LENGTH		25
-
-/*
-================
-R_DebugCircle
-================
-*/
-void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
-    int				i;
-    float			ang;
-    debugline_t* line;
-    vec3_t			forward, right;
-    vec3_t			pos, lastpos;
-
-    if (!ri.DebugLines || !ri.numDebugLines) {
-        return;
-    }
-
-    if (horizontal)
-    {
-        VectorSet(forward, 1, 0, 0);
-        VectorSet(right, 0, 1, 0);
-    }
-    else
-    {
-        VectorCopy(tr.refdef.viewaxis[1], right);
-        VectorCopy(tr.refdef.viewaxis[2], forward);
-    }
-
-    VectorClear(pos);
-    VectorClear(lastpos);
-
-    for (i = 0; i < CIRCLE_LENGTH; i++) {
-        VectorCopy(pos, lastpos);
-
-        ang = (float)i * 0.0174532925199433f;
-        pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
-            cos(ang) * radius * right[0];
-        pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
-            cos(ang) * radius * right[1];
-        pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
-            cos(ang) * radius * right[2];
-
-        if (i > 0)
-        {
-            if (*ri.numDebugLines >= r_numdebuglines->integer) {
-                ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
-                return;
-            }
-
-            line = &(*ri.DebugLines)[*ri.numDebugLines];
-            (*ri.numDebugLines)++;
-            VectorCopy(lastpos, line->start);
-            VectorCopy(pos, line->end);
-            VectorSet(line->color, r, g, b);
-            line->alpha = alpha;
-            line->width = 1.0;
-            line->factor = 1;
-            line->pattern = -1;
-        }
-    }
-}
-
-/*
-================
-R_DebugLine
-================
-*/
-void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
-    debugline_t* line;
-
-    if (!ri.DebugLines || !ri.numDebugLines) {
-        return;
-    }
-
-    if (*ri.numDebugLines >= r_numdebuglines->integer) {
-        ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
-    }
-
-    line = &(*ri.DebugLines)[*ri.numDebugLines];
-    (*ri.numDebugLines)++;
-    VectorCopy(start, line->start);
-    VectorCopy(end, line->end);
-    VectorSet(line->color, r, g, b);
-    line->alpha = alpha;
-    line->width = 1.0;
-    line->factor = 1;
-    line->pattern = -1;
-}
-
-/*
-================
-R_DrawDebugLines
-================
-*/
-void R_DrawDebugLines(void) {
-    // FIXME: stub
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_marks.c b/code/renderergl2/new/tr_marks.c
deleted file mode 100644
index 248aee5b..00000000
--- a/code/renderergl2/new/tr_marks.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-int R_MarkFragments_New(int numPoints, const vec3_t* points, const vec3_t projection,
-    int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared) {
-    return R_MarkFragments(numPoints, points, projection, maxPoints, pointBuffer, maxFragments, fragmentBuffer);
-}
-
-int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t angles, const vec3_t origin, int numPoints,
-    const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
-    int maxFragments, markFragment_t* fragmentBuffer, float radiusSquared)
-{
-    // FIXME: unimplemented
-    return 0;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_model.cpp b/code/renderergl2/new/tr_model.cpp
deleted file mode 100644
index 8ce84cda..00000000
--- a/code/renderergl2/new/tr_model.cpp
+++ /dev/null
@@ -1,1463 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_models.cpp -- model loading and caching
-
-#include "../tr_local.h"
-#include "tiki.h"
-#include <vector.h>
-
-#define	LL(x) x=LittleLong(x)
-
-qboolean g_bInfoworldtris;
-
-/*
-** R_GetModelByHandle
-*/
-model_t	*R_GetModelByHandle( qhandle_t hModel ) {
-	model_t		*mod;
-
-	// out of range gets the default model
-	if( hModel < 1 || hModel >= tr.numModels ) {
-		return tr.models[0];
-	}
-
-	mod = tr.models[hModel];
-
-	return mod;
-}
-
-/*
-** R_Model_GetHandle
-*/
-dtiki_t	*R_Model_GetHandle( qhandle_t handle ) {
-	model_t		*model = R_GetModelByHandle( handle );
-
-	if( model->type == MOD_TIKI ) {
-		return model->d.tiki;
-	}
-
-	return NULL;
-}
-
-//===============================================================================
-
-/*
-** R_FreeModel
-*/
-void R_FreeModel( model_t *mod ) {
-	if( mod->type == MOD_TIKI ) {
-		ri.CG_EndTiki( mod->d.tiki );
-	}
-
-	ri.Free(mod);
-}
-
-/*
-** R_AllocModel
-*/
-model_t* R_AllocModel(void) {
-    model_t* mod;
-
-    if (tr.numModels == MAX_MOD_KNOWN) {
-        return NULL;
-    }
-
-    mod = (model_t*)ri.Malloc(sizeof(*tr.models[tr.numModels]));
-    mod->index = tr.numModels;
-    tr.models[tr.numModels] = mod;
-    tr.numModels++;
-
-    return mod;
-}
-
-/*
-** RE_FreeModels
-*/
-void RE_FreeModels( void ) {
-	int		hModel;
-
-	for( hModel = 0; hModel < tr.numModels; hModel++ )
-	{
-		if( !tr.models[ hModel ]->name[ 0 ] ) {
-			continue;
-		}
-
-		R_FreeModel( tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterShaders
-*/
-void R_RegisterShaders( model_t *mod ) {
-	dtiki_t			*tiki;
-	int				i, j;
-	dtikisurface_t	*psurface;
-	shader_t		*sh;
-
-	tiki = mod->d.tiki;
-
-	for( i = 0; i < tiki->num_surfaces; i++ )
-	{
-		psurface = &tiki->surfaces[ i ];
-
-		assert( psurface->numskins < MAX_TIKI_SHADER );
-		for( j = 0; j < psurface->numskins; j++ )
-		{
-			if( psurface->shader[ j ][ 0 ] ) {
-				sh = R_FindShader( psurface->shader[ j ], LIGHTMAP_NONE, !( psurface->flags & TIKI_SURF_NOMIPMAPS) );
-				psurface->hShader[ j ] = sh->index;
-			} else {
-				psurface->hShader[ j ] = 0;
-			}
-		}
-	}
-}
-
-/*
-** RE_UnregisterServerModel
-*/
-void RE_UnregisterServerModel( qhandle_t hModel ) {
-	if( hModel < 0 || hModel >= MAX_MOD_KNOWN ) {
-		return;
-	}
-
-	if( tr.models[ hModel ]->serveronly ) {
-		R_FreeModel( tr.models[ hModel ] );
-	}
-}
-
-/*
-** R_RegisterModelInternal
-*/
-static qhandle_t R_RegisterModelInternal( const char *name, qboolean bBeginTiki, qboolean use ) {
-	model_t		*mod;
-	qhandle_t	hModel;
-	const char	*ptr;
-
-	if( !name || !*name )
-	{
-		ri.Printf( PRINT_ALL, "RE_RegisterModel: NULL name\n" );
-		return 0;
-	}
-
-	if( strlen( name ) >= 128 )
-	{
-		Com_Printf( "Model name exceeds MAX_MODEL_NAME\n" );
-		return 0;
-	}
-
-	//
-	// search the currently loaded models
-	//
-	for( hModel = 1; hModel < tr.numModels; hModel++ ) {
-		mod = tr.models[ hModel ];
-		if( !strcmp( mod->name, name ) ) {
-			if( mod->type == MOD_BAD ) {
-				return 0;
-			}
-			return hModel;
-		}
-	}
-
-	// allocate a new model_t
-
-	if( ( mod = R_AllocModel() ) == NULL ) {
-		ri.Printf( PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name );
-		return 0;
-	}
-
-	// only set the name after the model has been successfully loaded
-	Q_strncpyz( mod->name, name, sizeof( mod->name ) );
-
-
-	// make sure the render thread is stopped
-	R_SyncRenderThread();
-
-	mod->serveronly = qtrue;
-
-	//
-	// load the files
-	//
-	ptr = strrchr( name, '.' );
-
-	if( ptr )
-	{
-		ptr++;
-
-		if( !stricmp( ptr, "spr" ) )
-		{
-			mod->d.sprite = SPR_RegisterSprite( name );
-			strcpy( mod->name, name );
-
-			if( mod->d.sprite )
-			{
-				mod->type = MOD_SPRITE;
-				return mod->index;
-			}
-		}
-		else if( !stricmp( ptr, "tik" ) )
-		{
-			mod->d.tiki = TIKI_RegisterTikiFlags( name, use );
-			strcpy( mod->name, name );
-
-			if( mod->d.tiki )
-			{
-				mod->type = MOD_TIKI;
-				R_RegisterShaders( mod );
-
-				if( bBeginTiki ) {
-					ri.CG_ProcessInitCommands( mod->d.tiki, NULL );
-				}
-
-				return mod->index;
-			}
-		}
-	}
-
-	ri.Printf( PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name );
-	mod->type = MOD_BAD;
-
-	return 0;
-}
-
-/*
-** RE_RegisterServerModel
-*/
-qhandle_t RE_RegisterServerModel( const char *name ) {
-	return R_RegisterModelInternal( name, qtrue, qfalse );
-}
-
-/*
-** RE_SpawnEffectModel
-*/
-qhandle_t RE_SpawnEffectModel( const char *szModel, vec3_t vPos, vec3_t *axis ) {
-	refEntity_t		new_entity;
-
-	memset( &new_entity, 0, sizeof( refEntity_t ) );
-	memset( &new_entity.shaderRGBA, 255, sizeof( byte ) * 4 );
-
-	VectorCopy( vPos, new_entity.origin );
-	new_entity.scale = 1.0;
-
-	if( axis ) {
-		AxisCopy( axis, new_entity.axis );
-	}
-
-	new_entity.hModel = R_RegisterModelInternal( szModel, qfalse, qtrue );
-
-	if( new_entity.hModel )
-	{
-		tr.models[ new_entity.hModel ]->serveronly = qfalse;
-		ri.CG_ProcessInitCommands( tr.models[ new_entity.hModel ]->d.tiki, &new_entity );
-	}
-
-	return new_entity.hModel;
-}
-
-/*
-** RE_RegisterModel
-*/
-qhandle_t RE_RegisterModel( const char *name ) {
-	qhandle_t		handle;
-
-	handle = R_RegisterModelInternal( name, qtrue, qtrue );
-
-	if( handle ) {
-		tr.models[ handle ]->serveronly = qfalse;
-	}
-	return handle;
-}
-
-//=============================================================================
-
-/*
-===============
-R_ModelInit
-===============
-*/
-void R_ModelInit( void ) {
-	model_t		*mod;
-	int			i;
-
-	// leave a space for NULL model
-	tr.numModels = 0;
-
-	mod = R_AllocModel();
-	strcpy( mod->name, "** BAD MODEL **" );
-	mod->type = MOD_BAD;
-
-	for (i = 0; i < sizeof(tr.skel_index) / sizeof(tr.skel_index[0]); i++) {
-		tr.skel_index[i] = -1;
-	}
-}
-
-
-/*
-================
-R_Modellist_f
-================
-*/
-void R_Modellist_f( void ) {
-	int		i;
-
-	for( i = 1; i < tr.numModels; i++ ) {
-		ri.Printf( PRINT_ALL, "%s\n", tr.models[ i ]->name );
-	}
-}
-
-/*
-====================
-R_ModelRadius
-====================
-*/
-float R_ModelRadius( qhandle_t handle ) {
-	int				j;
-	vec3_t			bounds[ 2 ];
-	model_t			*model;
-	float			radius, maxRadius;
-	vec3_t			tmpVec;
-	float			w;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	case MOD_BRUSH:
-		maxRadius = 0.0;
-
-		VectorCopy( model->d.bmodel->bounds[ 0 ], bounds[ 0 ] );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], bounds[ 1 ] );
-
-		for( j = 0; j < 8; j++ ) {
-			tmpVec[ 0 ] = bounds[ j & 1 ? 1 : 0 ][ 0 ];
-			tmpVec[ 1 ] = bounds[ j & 2 ? 1 : 0 ][ 1 ];
-			tmpVec[ 2 ] = bounds[ j & 4 ? 1 : 0 ][ 2 ];
-
-			radius = VectorLength( tmpVec );
-
-			if( maxRadius < radius ) {
-				maxRadius = radius;
-			}
-		}
-		break;
-	case MOD_TIKI:
-		return TIKI_GlobalRadius( model->d.tiki );
-	case MOD_SPRITE:
-		maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		w = model->d.sprite->height * model->d.sprite->scale * 0.5;
-
-		if( maxRadius <= w ) {
-			maxRadius = w;
-		}
-		break;
-	default:
-		maxRadius = 0.0;
-	}
-
-	return maxRadius;
-}
-
-/*
-====================
-R_ModelBounds
-====================
-*/
-void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
-	model_t		*model;
-
-	model = R_GetModelByHandle( handle );
-
-	switch( model->type )
-	{
-	default:
-	case MOD_BAD:
-		VectorClear( mins );
-		VectorClear( maxs );
-		break;
-	case MOD_BRUSH:
-		VectorCopy( model->d.bmodel->bounds[ 0 ], mins );
-		VectorCopy( model->d.bmodel->bounds[ 1 ], maxs );
-		break;
-	case MOD_TIKI:
-		TIKI_CalculateBounds( model->d.tiki, 1.0, mins, maxs );
-		break;
-	case MOD_SPRITE:
-		mins[ 0 ] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
-		mins[ 1 ] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
-		mins[ 2 ] = -0.0;
-		maxs[ 0 ] = model->d.sprite->width * model->d.sprite->scale * 0.5;
-		maxs[ 1 ] = model->d.sprite->height * model->d.sprite->scale * 0.5;
-		maxs[ 2 ] = 0.0;
-		break;
-	}
-}
-
-/*
-====================
-GetModelPath
-====================
-*/
-const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
-	int			i;
-	int			num;
-	skelcache_t	*cache;
-
-	num = cache_numskel;
-
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-	{
-		cache = &skelcache[ i ];
-
-		if( cache->skel )
-		{
-			if( cache->skel == skelmodel ) {
-				return cache->path;
-			}
-
-			num--;
-			if( num < 0 ) {
-				break;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/*
-====================
-GetLodCutoff
-====================
-*/
-int GetLodCutoff( skelHeaderGame_t *skelmodel, float lod_val, int renderfx ) {
-	lodControl_t	*LOD;
-	float			f;
-	float			fLODCap;
-
-	LOD = skelmodel->pLOD;
-
-	if( renderfx & RF_DEPTHHACK )
-	{
-		fLODCap = LOD->maxMetric + ( LOD->minMetric - LOD->maxMetric ) * r_lodviewmodelcap->value;
-	}
-	else
-	{
-		f = ( LOD->minMetric - LOD->maxMetric ) * r_lodcap->value + LOD->maxMetric;
-		fLODCap = ( lod_val - LOD->maxMetric ) * r_lodscale->value + LOD->maxMetric;
-
-		if( fLODCap > f ) {
-			fLODCap = f;
-		}
-	}
-
-	if( fLODCap >= LOD->minMetric || !r_uselod->integer )
-	{
-		return LOD->curve[ 0 ].val;
-	}
-	else if( fLODCap <= LOD->maxMetric )
-	{
-		return LOD->curve[ 4 ].val;
-	}
-	else if( fLODCap <= LOD->consts[ 3 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 3 ].scale + LOD->consts[ 3 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 2 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 2 ].scale + LOD->consts[ 2 ].base;
-	}
-	else if( fLODCap <= LOD->consts[ 1 ].cutoff )
-	{
-		return fLODCap * LOD->consts[ 1 ].scale + LOD->consts[ 1 ].base;
-	}
-	else
-	{
-		return fLODCap * LOD->consts[ 0 ].scale + LOD->consts[ 0 ].base;
-	}
-}
-
-/*
-====================
-GetToolLodCutoff
-====================
-*/
-int GetToolLodCutoff( skelHeaderGame_t *skelmodel, float lod_val ) {
-	lodControl_t	*LOD;
-	float			totalRange;
-	int				i;
-	char			lodPath[ 256 ];
-	char			*ext;
-
-	LOD = skelmodel->pLOD;
-	totalRange = 0.0;
-	for( i = 0; i < 10; i++ )
-	{
-		if( skelmodel->lodIndex[ i ] > 0 ) {
-			totalRange = skelmodel->lodIndex[ i ];
-			break;
-		}
-	}
-
-	if( lod_save->integer == 1 )
-	{
-		Cvar_Set( "lod_save", "0" );
-		strcpy( lodPath, GetModelPath( skelmodel ) );
-		ext = strstr( lodPath, "skd" );
-		strcpy( ext, "lod" );
-		SaveLODFile( lodPath, LOD );
-	}
-
-	if( lod_mesh->modified )
-	{
-		lod_mesh->modified = qfalse;
-		Cvar_Set( "lod_minLOD", va( "%f", LOD->minMetric ) );
-		Cvar_Set( "lod_maxLOD", va( "%f", LOD->maxMetric ) );
-		Cvar_Set( "lod_LOD_slider", va( "%f", 0.5 ) );
-		Cvar_Set( "lod_curve_0_slider", va( "%f", LOD->curve[ 0 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_1_slider", va( "%f", LOD->curve[ 1 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_2_slider", va( "%f", LOD->curve[ 2 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_3_slider", va( "%f", LOD->curve[ 3 ].val / totalRange ) );
-		Cvar_Set( "lod_curve_4_slider", va( "%f", LOD->curve[ 4 ].val / totalRange ) );
-	}
-
-
-	Cvar_Set( "lod_curve_0_val", va( "%f", lod_curve_0_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_1_val", va( "%f", lod_curve_1_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_2_val", va( "%f", lod_curve_2_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_3_val", va( "%f", lod_curve_3_slider->value * totalRange ) );
-	Cvar_Set( "lod_curve_4_val", va( "%f", lod_curve_4_slider->value * totalRange ) );
-
-	LOD->minMetric = lod_minLOD->value;
-	LOD->maxMetric = lod_maxLOD->value;
-	LOD->curve[ 0 ].val = lod_curve_0_val->value;
-	LOD->curve[ 1 ].val = lod_curve_1_val->value;
-	LOD->curve[ 2 ].val = lod_curve_2_val->value;
-	LOD->curve[ 3 ].val = lod_curve_3_val->value;
-	LOD->curve[ 4 ].val = lod_curve_4_val->value;
-
-	TIKI_CalcLodConsts( LOD );
-	return GetLodCutoff( skelmodel, lod_val, 0 );
-}
-
-/*
-==============
-R_GetTagPositionAndOrientation
-==============
-*/
-orientation_t R_GetTagPositionAndOrientation( refEntity_t *ent, int tagnum ) {
-	int i;
-	orientation_t tag_or, new_or;
-
-	tag_or = RE_TIKI_Orientation( ent, tagnum );
-
-	VectorCopy( ent->origin, new_or.origin );
-
-	for( i = 0; i < 3; i++ )
-	{
-		VectorMA( new_or.origin, tag_or.origin[ i ], ent->axis[ i ], new_or.origin );
-	}
-
-	MatrixMultiply( tag_or.axis, ent->axis, new_or.axis );
-	return new_or;
-}
-
-/*
-==============
-RB_DrawSkeletor
-==============
-*/
-void RB_DrawSkeletor( trRefEntity_t *ent ) {
-	int i;
-	dtiki_t		*tiki;
-	skeletor_c	*skeletor;
-
-	tiki = R_Model_GetHandle( ent->e.hModel );
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ENTITYNUM_NONE );
-
-	// FIXME: unimplemented
-#if 0
-	if( r_showSkeleton->integer == 1 ) {
-		//vec3_t vForward, vRight, vUp;
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-
-
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) { // draw a skeleton
-
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone != -1 ) {
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-			} else {
-				VectorCopy( ent->e.origin, parent_or.origin );
-				AxisCopy( ent->e.axis, parent_or.axis );
-			}
-
-            qglColor3f(1, 1, 1);
-            qglVertex3fv(parent_or.origin);
-            qglVertex3fv(ori.origin);
-
-			// draw bone axis
-			/*glColor3f( 1, 0, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 0 ], vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( vForward );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 1, 0 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 1 ], vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( vRight );
-			glVertex3fv( ori.origin );
-
-			glColor3f( 0, 0, 1 );
-			glVertex3fv( parent_or.origin );
-			VectorAdd( parent_or.origin, parent_or.axis[ 2 ], vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( vUp );
-			glVertex3fv( ori.origin );*/
-
-		}
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-	else if( r_showSkeleton->integer == 2 ) { // draw skeleton with bones
-		orientation_t ori;
-		orientation_t parent_or;
-		int iParentBone;
-
-		qglLineWidth( 3 );
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			iParentBone = skeletor->GetBoneParent( i );
-
-			if( iParentBone > 0 )	{
-				ori = R_GetTagPositionAndOrientation( &ent->e, i );
-				parent_or = R_GetTagPositionAndOrientation( &ent->e, iParentBone );
-				qglColor3f( 1, 1, 1 );
-				qglVertex3fv( parent_or.origin );
-				qglVertex3fv( ori.origin );
-			}
-
-		}
-		qglEnd();
-
-		qglBegin( GL_LINES );
-		for( i = 0; i < tiki->m_boneList.NumChannels(); i++ ) {
-			vec3_t up, down, front;
-			ori = R_GetTagPositionAndOrientation( &ent->e, i );
-
-			VectorCopy( ori.origin, up );
-			up[ 1 ] += 5;
-			VectorCopy( ori.origin, down );
-			down[ 1 ] += 5;
-			VectorCopy( ori.origin, front );
-			front[ 0 ] += 5;
-
-			qglColor3f( 1, 0, 1 );
-			qglVertex3fv( front );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( down );
-			qglVertex3fv( ori.origin );
-			qglVertex3fv( up );
-			qglVertex3fv( ori.origin );
-		}
-
-		qglEnd();
-		qglLineWidth( 1 );
-	}
-#endif
-}
-
-/*
-=============
-R_CullTIKI
-=============
-*/
-static int R_CullTIKI( dtiki_t *tiki, trRefEntity_t *ent ) {
-#if 0
-	//// cull bounding sphere ONLY if this is not an upscaled entity
-	if( !ent->e.nonNormalizedAxes )
-	{
-		switch( R_CullPointAndRadius( ent->e.origin, ent->e.radius ) )
-		{
-		case CULL_OUT:
-			tr.pc.c_sphere_cull_tiki_out++;
-			return CULL_OUT;
-
-		case CULL_IN:
-			tr.pc.c_sphere_cull_tiki_in++;
-			return CULL_IN;
-
-		case CULL_CLIP:
-			tr.pc.c_sphere_cull_tiki_clip++;
-			break;
-		}
-	}
-
-	switch( R_CullLocalBox( ent->e.bounds ) )
-	{
-	case CULL_IN:
-		tr.pc.c_box_cull_tiki_in++;
-		return CULL_IN;
-	case CULL_CLIP:
-		tr.pc.c_box_cull_tiki_clip++;
-		return CULL_CLIP;
-	case CULL_OUT:
-	default:
-		tr.pc.c_box_cull_tiki_out++;
-		return CULL_OUT;
-	}
-#endif
-	// FIXME: unimplemented
-	return 0;
-}
-
-surfaceType_t	skelSurface = SF_TIKI_SKEL;
-
-/*
-==============
-R_AddSkelSurfaces
-==============
-*/
-void R_AddSkelSurfaces( trRefEntity_t *ent ) {
-	dtiki_t *tiki;
-	qboolean personalModel;
-	float tiki_scale;
-	vec3_t tiki_localorigin;
-	vec3_t tiki_worldorigin;
-	skelBoneCache_t *outbones;
-	//int tikiSurfNumOffset;
-	static cvar_t *vmEntity = NULL;
-	skeletor_c *skeletor;
-	float radius;
-	SkelVec3 centroid;
-	skelAnimFrame_t *newFrame;
-	int added;
-	shader_t *shader;
-	dtikisurface_t *dsurf;
-	byte *bsurf;
-	//float range;
-	//int render_count, total_tris;
-	skelSurfaceGame_t *surface;
-	//int skinnum;
-	//float target;
-	Vector newDistance;
-	//vec3_t org;
-	int i;
-	int mesh;
-	int iRadiusCull = 0;
-	int num_tags;
-
-	tiki = ent->e.tiki;
-
-	if( !vmEntity ) {
-		vmEntity = ri.Cvar_Get( "viewmodelentity", "", 0 );
-	}
-
-	R_UpdatePoseInternal( &ent->e );
-
-	// don't add third_person objects if in a portal
-	personalModel = ( ent->e.renderfx & RF_THIRD_PERSON ) && !tr.viewParms.isPortal;
-
-	outbones = &TIKI_Skel_Bones[ TIKI_Skel_Bones_Index ];
-
-	num_tags = tiki->m_boneList.NumChannels();
-
-	if( num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES )
-	{
-		ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name );
-		return;
-	}
-
-	tiki_scale = tiki->load_scale * ent->e.scale;
-	VectorScale( tiki->load_origin, tiki_scale, tiki_localorigin );
-	R_LocalPointToWorld( tiki_localorigin, tiki_worldorigin );
-
-	radius = R_GetRadius( &ent->e );
-
-	if( !lod_tool->integer )
-	{
-		iRadiusCull = R_CullPointAndRadius( tiki_worldorigin, radius );
-		// FIXME: Draw a debug circle
-	}
-
-	// FIXME: calculate lod percentage
-	if( !lod_tool->integer && iRadiusCull == -1 ) {
-		return;
-	}
-
-	//if( R_CullTIKI( tiki, ent ) == CULL_OUT ) {
-	//	return;
-	//}
-
-	newFrame = ( skelAnimFrame_t * )ri.Hunk_AllocateTempMemory( sizeof( skelAnimFrame_t ) + tiki->m_boneList.NumChannels() * sizeof( SkelMat4 ) );
-	R_GetFrame( &ent->e, newFrame );
-
-	//
-	// copy bones position and axis
-	//
-	for( i = 0; i < num_tags; i++ )
-	{
-		VectorCopy( newFrame->bones[ i ][ 3 ], outbones->offset );
-		outbones->matrix[ 0 ][ 0 ] = newFrame->bones[ i ][ 0 ][ 0 ];
-		outbones->matrix[ 0 ][ 1 ] = newFrame->bones[ i ][ 0 ][ 1 ];
-		outbones->matrix[ 0 ][ 2 ] = newFrame->bones[ i ][ 0 ][ 2 ];
-		outbones->matrix[ 0 ][ 3 ] = 0;
-		outbones->matrix[ 1 ][ 0 ] = newFrame->bones[ i ][ 1 ][ 0 ];
-		outbones->matrix[ 1 ][ 1 ] = newFrame->bones[ i ][ 1 ][ 1 ];
-		outbones->matrix[ 1 ][ 2 ] = newFrame->bones[ i ][ 1 ][ 2 ];
-		outbones->matrix[ 1 ][ 3 ] = 0;
-		outbones->matrix[ 2 ][ 0 ] = newFrame->bones[ i ][ 2 ][ 0 ];
-		outbones->matrix[ 2 ][ 1 ] = newFrame->bones[ i ][ 2 ][ 1 ];
-		outbones->matrix[ 2 ][ 2 ] = newFrame->bones[ i ][ 2 ][ 2 ];
-		outbones->matrix[ 2 ][ 3 ] = 0;
-		outbones++;
-	}
-
-	ri.Hunk_FreeTempMemory( newFrame );
-
-	ent->e.bonestart = TIKI_Skel_Bones_Index;
-	TIKI_Skel_Bones_Index += num_tags;
-
-	ent->e.hasMorph = qfalse;
-
-	//
-	// get the skeletor
-	//
-	skeletor = ( skeletor_c * )TIKI_GetSkeletor( tiki, ent->e.entityNumber );
-
-	//
-	// add morphs
-	//
-	added = skeletor->GetMorphWeightFrame( ent->e.frameInfo[ 0 ].index, ent->e.frameInfo[ 0 ].time, &skeletorMorphCache[ skeletorMorphCacheIndex ] );
-	ent->e.morphstart = skeletorMorphCacheIndex;
-
-	if( added )
-	{
-		// found morphs
-		skeletorMorphCacheIndex += added;
-		ent->e.hasMorph = qtrue;
-	}
-
-	//
-	// draw all meshes
-	//
-	dsurf = tiki->surfaces;
-	bsurf = &ent->e.surfaces[ 0 ];
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelHeaderGame_t *skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-
-		if( !skelmodel )
-		{
-			ri.Printf( PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name );
-			return;
-		}
-
-		if( lod_tool->integer && !stricmp( ent->e.tiki->a->name, lod_tikiname->string ) )
-		{
-			if( lod_mesh->integer > tiki->numMeshes - 1 ) {
-				ri.Cvar_Set( "lod_mesh", va( "%d", tiki->numMeshes - 1 ) );
-			}
-
-			if( mesh == lod_mesh->integer ) {
-				if( skelmodel->pLOD ) {
-					break;
-				}
-			}
-		}
-
-		//
-		// draw all surfaces
-		//
-		surface = skelmodel->pSurfaces;
-		for( i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext ) {
-
-			if( *bsurf & 4 ) {
-				continue;
-			}
-
-			shader = NULL;
-			surface->ident = SF_TIKI_SKEL;
-
-			// use a custom shader if specified
-			if( !( ent->e.customShader ) || ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				int iShaderNum = ent->e.skinNum + ( *bsurf & 3 );
-
-				if( iShaderNum >= dsurf->numskins ) {
-					iShaderNum = 0;
-				}
-				shader = tr.shaders[ dsurf->hShader[ iShaderNum ] ];
-			} else {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-			}
-
-			if( !personalModel ) {
-				if( ( *bsurf & 0x40 ) && ( dsurf->numskins > 1 ) ) {
-					int iShaderNum = ent->e.skinNum + ( *bsurf & 2 );
-
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum ] ], 0, 0, 0, 0 );
-					R_AddDrawSurf( ( surfaceType_t * )surface, tr.shaders[ dsurf->hShader[ iShaderNum + 1 ] ], 0, 0, 0, 0 );
-				} else {
-					R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0, 0, 0, 0 );
-				}
-			}
-
-			if( ( ent->e.customShader ) && ( ent->e.renderfx & RF_CUSTOMSHADERPASS ) ) {
-				shader = R_GetShaderByHandle( ent->e.customShader );
-				R_AddDrawSurf( ( surfaceType_t * )surface, shader, 0, 0, 0, 0 );
-			}
-		}
-	}
-
-	// FIXME: setup LOD
-}
-
-/*
-=============
-SkelVertGetNormal
-=============
-*/
-static void SkelVertGetNormal( skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 0 ];
-
-	out[ 1 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 1 ];
-
-	out[ 2 ] = vert->normal[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-			vert->normal[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-			vert->normal[ 2 ] * bone->matrix[ 2 ][ 2 ];
-}
-
-/*
-=============
-SkelMorphGetXyz
-=============
-*/
-static void SkelMorphGetXyz( skeletorMorph_t *morph, int *morphcache, vec3_t out ) {
-	out[ 0 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 1 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-
-	out[ 2 ] += morph->offset[ 0 ] * *morphcache +
-				morph->offset[ 1 ] * *morphcache +
-				morph->offset[ 2 ] * *morphcache;
-}
-
-/*
-=============
-SkelWeightGetXyz
-=============
-*/
-static void SkelWeightGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out ) {
-	out[ 0 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-				bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-				bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( weight->offset[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-				weight->offset[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-				weight->offset[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-				bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-SkelWeightMorphGetXyz
-=============
-*/
-static void SkelWeightMorphGetXyz( skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out ) {
-	vec3_t point;
-
-	VectorAdd( totalmorph, weight->offset, point );
-
-	out[ 0 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 0 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 0 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 0 ] ) +
-					bone->offset[ 0 ] ) * weight->boneWeight;
-
-	out[ 1 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 1 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 1 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 1 ] ) +
-					bone->offset[ 1 ] ) * weight->boneWeight;
-
-	out[ 2 ] += ( ( point[ 0 ] * bone->matrix[ 0 ][ 2 ] +
-					point[ 1 ] * bone->matrix[ 1 ][ 2 ] +
-					point[ 2 ] * bone->matrix[ 2 ][ 2 ] ) +
-					bone->offset[ 2 ] ) * weight->boneWeight;
-}
-
-/*
-=============
-LerpSkelMesh
-=============
-*/
-static void LerpSkelMesh( skelSurfaceGame_t *sf ) {
-    float* outXyz;
-    int16_t* outNormal;
-	skeletorVertex_t *newVerts;
-	skeletorMorph_t *morph;
-	skelWeight_t *weight;
-	int vertNum;
-	int morphNum;
-	int weightNum;
-	skelBoneCache_t *bones;
-	skelBoneCache_t *bone;
-	int *morphs;
-	int *morphcache;
-	float scale;
-	dtiki_t *tiki;
-	int mesh;
-	int surf;
-	skelHeaderGame_t *skelmodel;
-	skelSurfaceGame_t *psurface;
-	qboolean bFound;
-
-	tiki = backEnd.currentEntity->e.tiki;
-	newVerts = sf->pVerts;
-
-	outXyz = tess.xyz[ tess.numVertexes ];
-	outNormal = tess.normal[ tess.numVertexes ];
-
-	bones = &TIKI_Skel_Bones[ backEnd.currentEntity->e.bonestart ];
-	morphs = &skeletorMorphCache[ backEnd.currentEntity->e.morphstart ];
-
-	scale = tiki->load_scale * backEnd.currentEntity->e.scale;
-
-	//
-	// get the mesh associated with the surface
-	//
-	bFound = qfalse;
-	for( mesh = 0; mesh < tiki->numMeshes; mesh++ )
-	{
-		skelmodel = TIKI_GetSkel( tiki->mesh[ mesh ] );
-		psurface = skelmodel->pSurfaces;
-
-		// find the surface
-		for( surf = 0; surf < skelmodel->numSurfaces; surf++ )
-		{
-			if( psurface == sf ) {
-				bFound = qtrue;
-				break;
-			}
-			psurface = psurface->pNext;
-		}
-
-		if( bFound ) {
-			break;
-		}
-	}
-
-	assert( bFound );
-
-	//
-	// Process LOD
-	//
-	if( skelmodel->pLOD )
-	{
-		// FIXME
-	}
-
-	//
-	// just copy the vertexes
-	//
-	for( vertNum = 0; vertNum < sf->numVerts; vertNum++ )
-	{
-		vec3_t normal;
-		vec3_t out;
-
-		VectorClear( out );
-		VectorClear( outXyz );
-
-		weight = ( skelWeight_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs );
-
-		if( backEnd.currentEntity->e.hasMorph )
-		{
-			vec3_t totalmorph;
-
-			VectorClear( totalmorph );
-			morph = ( skeletorMorph_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) );
-
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				channelNum = skelmodel->pBones[ morph->morphIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-			else
-			{
-				for( morphNum = 0; morphNum < newVerts->numMorphs; morphNum++ ) {
-					morphcache = &morphs[ morph->morphIndex ];
-
-					if( *morphcache ) {
-						SkelMorphGetXyz( morph, morphcache, totalmorph );
-					}
-
-					morph++;
-				}
-
-				bone = &bones[ morph->morphIndex ];
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					if( !weightNum ) {
-						SkelWeightMorphGetXyz( weight, bone, totalmorph, out );
-					} else {
-						SkelWeightGetXyz( weight, bone, out );
-					}
-
-					weight++;
-				}
-			}
-		}
-		else
-		{
-			if( mesh > 0 )
-			{
-				int channelNum;
-				int boneNum;
-
-				channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-				boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-				bone = &bones[ boneNum ];
-
-				SkelVertGetNormal( newVerts, bone, normal );
-
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					channelNum = skelmodel->pBones[ weight->boneIndex ].channel;
-					boneNum = tiki->m_boneList.GetLocalFromGlobal( channelNum );
-					bone = &bones[ boneNum ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-			else
-			{
-				for( weightNum = 0; weightNum < newVerts->numWeights; weightNum++ ) {
-					bone = &bones[ weight->boneIndex ];
-
-					SkelWeightGetXyz( weight, bone, out );
-
-					weight++;
-				}
-			}
-		}
-
-		R_VaoPackNormal(outNormal, normal);
-
-		VectorScale( out, scale, outXyz );
-
-		newVerts = ( skeletorVertex_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * newVerts->numMorphs + sizeof( skelWeight_t ) * newVerts->numWeights );
-		outXyz += 4;
-		outNormal += 4;
-	}
-}
-
-/*
-=============
-RB_SkelMesh
-=============
-*/
-void RB_SkelMesh( skelSurfaceGame_t *sf ) {
-	int					j;
-	skeletorVertex_t	*vert;
-	int					baseIndex, baseVertex;
-	int					numVerts;
-	int					numIndexes;
-
-	numIndexes = sf->numTriangles * 3;
-
-	RB_CHECKOVERFLOW( sf->numVerts, numIndexes );
-
-	LerpSkelMesh( sf );
-
-	baseIndex = tess.numIndexes;
-	baseVertex = tess.numVertexes;
-	for( j = 0; j < numIndexes; j++ ) {
-		tess.indexes[ baseIndex + j ] = baseVertex + sf->pTriangles[ j ];
-	}
-	tess.numIndexes += numIndexes;
-
-	numVerts = sf->numVerts;
-	vert = sf->pVerts;
-	for( j = 0; j < numVerts; j++ ) {
-		tess.texCoords[ baseVertex + j ][ 0 ] = vert->texCoords[ 0 ];
-		tess.texCoords[ baseVertex + j ][ 1 ] = vert->texCoords[ 1 ];
-		vert = ( skeletorVertex_t * )( ( byte * )vert + sizeof( skeletorVertex_t ) + sizeof( skeletorMorph_t ) * vert->numMorphs + sizeof( skelWeight_t ) * vert->numWeights );
-		// FIXME: fill in lightmapST for completeness?
-	}
-
-	tess.numVertexes += numVerts;
-
-#if 0
-	if( backEnd.currentEntity->e.staticModelIndex ) {
-		mstaticModel_t *sm;
-		color4ub_t *out;
-		color3ub_t *in;
-		int cdofs;
-		skdSurface_t *sf2;
-
-		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
-
-		tess.useStaticModelVertexColors = qtrue;
-
-		cdofs = 0;
-		sf2 = tiki->surfs;
-		while( sf2 != sf ) {
-			cdofs += sf2->numVerts;
-			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
-		}
-
-		in = &tr.world->smColors[ sm->firstVert + cdofs ];
-		out = tess.vertexColors + baseVertex;
-		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
-#if 1
-			( *out )[ 0 ] = ( *in )[ 0 ];
-			( *out )[ 1 ] = ( *in )[ 1 ];
-			( *out )[ 2 ] = ( *in )[ 2 ];
-			( *out )[ 3 ] = 255;
-#elif 0
-			( ( int* )out ) = tr.identityLightByte;
-#else		
-			// su44: set it to something special so
-			// I can debug vertex colors rendering
-			( *out )[ 0 ] = 255;
-			( *out )[ 1 ] = 0;
-			( *out )[ 2 ] = 0;
-			( *out )[ 3 ] = 255;
-#endif
-		}
-	} //else
-#endif
-	//{
-	//	// an attemp to fix bizarre vertex colors bug
-	//	color4ub_t *col;
-	//	
-	//	col = &tess.vertexColors[baseVertex];
-	//	for(i = 0; i < sf->numVerts; i++,col++) {
-	//		(*col)[0] = 255;
-	//		(*col)[1] = 255;
-	//		(*col)[2] = 255;
-	//		(*col)[3] = 255;
-	//	}
-	//}
-	//tess.numVertexes += sf->numVerts;
-}
-
-/*
-=============
-R_PrintInfoWorldtris
-=============
-*/
-void R_PrintInfoWorldtris( void ) {
-	// FIXME: stub
-}
-
-/*
-=============
-RE_SetFrameNumber
-=============
-*/
-void RE_SetFrameNumber( int frameNumber ) {
-	tr.frame_skel_index = frameNumber;
-}
-
-/*
-=============
-R_UpdatePoseInternal
-=============
-*/
-void R_UpdatePoseInternal( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		if( tr.skel_index[ model->entityNumber ] == tr.frame_skel_index ) {
-			return;
-		}
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_ForceUpdatePose
-=============
-*/
-void RE_ForceUpdatePose( refEntity_t *model ) {
-	if( model->entityNumber != ENTITYNUM_NONE ) {
-		tr.skel_index[ model->entityNumber ] = tr.frame_skel_index;
-	}
-
-	ri.TIKI_SetPoseInternal( TIKI_GetSkeletor( model->tiki, model->entityNumber ), model->frameInfo, model->bone_tag, model->bone_quat, model->actionWeight );
-}
-
-/*
-=============
-RE_TIKI_Orientation
-=============
-*/
-orientation_t RE_TIKI_Orientation( refEntity_t *model, int tagnum ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_OrientationInternal( model->tiki, model->entityNumber, tagnum, model->scale );
-}
-
-/*
-=============
-RE_TIKI_IsOnGround
-=============
-*/
-qboolean RE_TIKI_IsOnGround( refEntity_t *model, int tagnum, float threshold ) {
-	R_UpdatePoseInternal( model );
-	return ri.TIKI_IsOnGroundInternal( model->tiki, model->entityNumber, tagnum, threshold );
-}
-
-/*
-=============
-R_GetRadius
-=============
-*/
-float R_GetRadius( refEntity_t *model ) {
-	R_UpdatePoseInternal( model );
-	return ri.GetRadiusInternal( model->tiki, model->entityNumber, model->scale );
-}
-
-/*
-=============
-R_GetFrame
-=============
-*/
-void R_GetFrame( refEntity_t *model, struct skelAnimFrame_s *newFrame ) {
-	R_UpdatePoseInternal( model );
-	ri.GetFrameInternal( model->tiki, model->entityNumber, newFrame );
-}
-
-/*
-=============
-R_DebugSkeleton
-=============
-*/
-void R_DebugSkeleton( void ) {
-	int i;
-	trRefEntity_t *ent;
-	model_t *model;
-
-	// FIXME: unimplemented
-#if 0
-	R_SyncRenderThread();
-
-	GL_BindToTMU( tr.whiteImage, TB_COLORMAP );
-	GL_State( 0x200 );
-
-	qglDisableClientState( GL_COLOR_ARRAY );
-	qglDisableClientState( GL_TEXTURE_COORD_ARRAY );
-
-	for( i = 0; i < tr.refdef.num_entities; i++ ) {
-		ent = &tr.refdef.entities[ i ];
-
-		if( ent->e.reType == RT_MODEL ) {
-			model = R_GetModelByHandle( ent->e.hModel );
-
-			if( model->type == MOD_TIKI ) {
-				RE_ForceUpdatePose( &ent->e );
-				RB_DrawSkeletor( ent );
-			}
-		}
-	}
-#endif
-}
-static float ProjectRadius(float r, const vec3_t location)
-{
-	Vector separation;
-	float projectedRadius;
-
-	separation = Vector(tr.viewParms.or.origin) - Vector(location);
-	projectedRadius = separation.length();
-
-	return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
-}
-
-float R_CalcLod(const vec3_t origin, float radius)
-{
-	return ProjectRadius(radius, origin);
-}
-
-int R_LerpTag(orientation_t* tag, qhandle_t handle, int startFrame, int endFrame,
-	float frac, const char* tagName)
-{
-	// This is unused
-	return 0;
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_scene.c b/code/renderergl2/new/tr_scene.c
deleted file mode 100644
index 08ac082e..00000000
--- a/code/renderergl2/new/tr_scene.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-extern int			r_firstSceneDrawSurf;
-
-extern int			r_numdlights;
-extern int			r_firstSceneDlight;
-
-extern int			r_numentities;
-extern int			r_firstSceneEntity;
-
-extern int			r_numpolys;
-extern int			r_firstScenePoly;
-
-extern int			r_numpolyverts;
-
-void RE_AddRefSpriteToScene(const refEntity_t* ent) {
-    // FIXME: unimplemented
-}
-
-/*
-=====================
-R_AddTerrainMarkSurfaces
-=====================
-*/
-void R_AddTerrainMarkSurfaces(void) {
-    // FIXME: unimplemented
-}
-
-/*
-=====================
-RE_AddTerrainMarkToScene
-=====================
-*/
-void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
-    // FIXME: unimplemented
-}
-
-//=================================================================================
-
-/*
-=====================
-RE_GetRenderEntity
-=====================
-*/
-refEntity_t* RE_GetRenderEntity(int entityNumber) {
-    int i;
-
-    for (i = 0; i < r_numentities; i++) {
-        if (backEndData->entities[i].e.entityNumber == entityNumber) {
-            return &backEndData->entities[i].e;
-        }
-    }
-
-    return NULL;
-}
diff --git a/code/renderergl2/new/tr_shade_calc.c b/code/renderergl2/new/tr_shade_calc.c
deleted file mode 100644
index 809f31dd..00000000
--- a/code/renderergl2/new/tr_shade_calc.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-/*
-** RB_CalcColorFromConstant
-*/
-void RB_CalcColorFromConstant(unsigned char* dstColors, unsigned char* constantColor)
-{
-    int i;
-
-    for (i = 0; i < tess.numVertexes; i++) {
-        dstColors[i * 4] = constantColor[0];
-        dstColors[i * 4 + 1] = constantColor[1];
-        dstColors[i * 4 + 2] = constantColor[2];
-        dstColors[i * 4 + 3] = constantColor[3];
-    }
-}
-
-void RB_CalcRGBFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcRGBFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromConstant(unsigned char* dstColors, int constantAlpha)
-{
-    int i;
-
-    for (i = 0; i < tess.numVertexes; i++) {
-        dstColors[i * 4 + 3] = constantAlpha;
-    }
-}
-
-void RB_CalcAlphaFromDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromOneMinusDot(unsigned char* colors, float alphaMin, float alphaMax)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcAlphaFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-    // FIXME: unimplemented
-}
-
-void RB_CalcRGBFromTexCoords(unsigned char* colors, float alphaMin, float alphaMax, int alphaMinCap, int alphaCap, float sWeight, float tWeight, float* st)
-{
-    // FIXME: unimplemented
-}
diff --git a/code/renderergl2/new/tr_shader.c b/code/renderergl2/new/tr_shader.c
deleted file mode 100644
index 53dbeada..00000000
--- a/code/renderergl2/new/tr_shader.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../tr_local.h"
-
-qhandle_t RE_RefreshShaderNoMip(const char* name) {
-    // FIXME: unimplemented
-    // Workaround
-    return RE_RegisterShaderNoMip(name);
-}
\ No newline at end of file
diff --git a/code/renderergl2/new/tr_sphere_shade.cpp b/code/renderergl2/new/tr_sphere_shade.cpp
deleted file mode 100644
index 1f22f0a2..00000000
--- a/code/renderergl2/new/tr_sphere_shade.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-// tr_sphere_shade.cpp -- sphere shade
-
-#include "../tr_local.h"
-
-vec3_t spheredef[6];
-suninfo_t s_sun;
-static vec3_t ambientlight;
-static qboolean bEntityOverbright;
-static int iEntityLightingMax;
-static int light_reference_count = 0;
-
-int compare_light_intensities(const void* p1, const void* p2)
-{
-	return ((const reallightinfo_t*)p2)->fIntensity - ((const reallightinfo_t*)p1)->fIntensity;
-}
-
-static void RB_OptimizeLights()
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Light_CubeMap(const color4ub_t colors)
-{
-	// FIXME: unimplemented
-}
-
-void RB_Light_Real(unsigned char* colors)
-{
-	int i, j;
-	float* normal;
-	float* xyz;
-	unsigned char* color;
-	vec3_t v;
-	vec3_t colorout;
-	float fDot;
-	reallightinfo_t* pLight;
-
-
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_Light_Sun()
-{
-	// FIXME: unimplemented
-}
-
-static qboolean RB_Sphere_CalculateSphereOrigin()
-{
-	// FIXME: unimplemented
-	return qfalse;
-}
-
-static void RB_Sphere_DrawDebugLine(const spherel_t* thislight, float falloff, const vec3_t origin)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_AddSpotLight(const spherel_t* thislight)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_AddLight(const spherel_t* thislight)
-{
-	// FIXME: unimplemented
-}
-
-static void RB_Sphere_BuildStaticLights()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Sphere_BuildDLights()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Sphere_SetupEntity()
-{
-    // FIXME: unimplemented
-}
-
-void RB_Grid_SetupEntity()
-{
-	// FIXME: unimplemented
-}
-
-void RB_Grid_SetupStaticModel()
-{
-    // FIXME: unimplemented
-}
-
-void RB_Light_Fullbright(unsigned char* colors)
-{
-	memset((void*)colors, 0xFF, tess.numVertexes);
-}
-
-void R_Sphere_InitLights()
-{
-    // FIXME: unimplemented
-}
-
-int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights)
-{
-    // FIXME: unimplemented
-    return 0;
-}
diff --git a/code/renderergl2/new/tr_sprite.c b/code/renderergl2/new/tr_sprite.c
deleted file mode 100644
index 1cf6473c..00000000
--- a/code/renderergl2/new/tr_sprite.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 2010 su44
-
-This file is part of OpenMoHAA source code.
-
-OpenMoHAA source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-OpenMoHAA source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with OpenMoHAA source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_sprite.c - MoHAA sprite system
-
-#include "../tr_local.h"
-
-/*
-=====================
-SPR_RegisterSprite
-=====================
-*/
-sprite_t *SPR_RegisterSprite(const char *name)
-{
-	image_t *spriteImage;
-	shader_t *shader;
-	sprite_t *spr;
-	char shadername[256];
-	COM_StripExtension(name,shadername,sizeof(shadername));
-	shader = R_FindShader(shadername,-1,qfalse,qfalse,qfalse,qfalse);
-	if(shader) {
-		spriteImage = 0;
-		if(shader->stages[0])
-			spriteImage = shader->stages[0]->bundle[0].image[0];
-		if ( !spriteImage ) {
-			ri.Printf(1, "Could not find image for sprite in shader %s\n", name);
-			return 0;
-		}
-		spr = ri.Hunk_Alloc(sizeof(sprite_t), h_dontcare);
-		spr->height = spriteImage->height;
-		spr->width = spriteImage->width;
-		spr->origin_x = spr->width * 0.5;
-		spr->origin_y = spr->height * 0.5;
-		spr->shader = shader;
-		spr->scale = spr->shader->sprite.scale;
-		return spr;
-	}
-	return 0;
-}
-
-/*
-=====================
-RB_DrawSprite
-=====================
-*/
-void RB_DrawSprite( const refSprite_t *spr ) {
-	// FIXME: stub
-}
diff --git a/code/renderergl2/new/tr_util.cpp b/code/renderergl2/new/tr_util.cpp
deleted file mode 100644
index ebfcb58d..00000000
--- a/code/renderergl2/new/tr_util.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// tr_util.c -- renderer utility
-
-#include "../tr_local.h"
-
-static const size_t colorSize = (1 << (sizeof(uint16_t) * 8)) - 1;
-static uint16_t cntColor[4];
-static float cntSt[ 2 ];
-
-/*
-===============
-RB_StreamBegin
-===============
-*/
-void RB_StreamBegin( shader_t *shader ) {
-	RB_BeginSurface( shader, 0, 0 );
-}
-
-/*
-===============
-RB_StreamEnd
-===============
-*/
-void RB_StreamEnd( void ) {
-	int i;
-
-	if( tess.numVertexes <= 2 ) {
-		RB_EndSurface();
-		return;
-	}
-
-	tess.indexes[ 0 ] = 0;
-	tess.indexes[ 1 ] = 1;
-	tess.indexes[ 2 ] = 2;
-
-	for( i = 0; i < tess.numVertexes - 2; i++ ) {
-		tess.indexes[ i * 3 + 0 ] = ( i & 1 ) + i;
-		tess.indexes[ i * 3 + 1 ] = i - ( ( i & 1 ) - 1 );
-		tess.indexes[ i * 3 + 2 ] = i + 2;
-		tess.numIndexes += 3;
-	}
-
-	RB_EndSurface();
-}
-
-/*
-===============
-RB_StreamBeginDrawSurf
-===============
-*/
-void RB_StreamBeginDrawSurf( void ) {
-	backEnd.dsStreamVert = tess.numVertexes;
-}
-
-/*
-===============
-RB_StreamEndDrawSurf
-===============
-*/
-void RB_StreamEndDrawSurf( void ) {
-	int		numverts;
-	int		i;
-
-	if( tess.numVertexes - backEnd.dsStreamVert <= 2 ) {
-		tess.numVertexes = backEnd.dsStreamVert;
-		return;
-	}
-
-	numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
-	for( i = 0; i < numverts; i++ ) {
-		tess.indexes[ i + tess.numIndexes ] = ( i & 1 ) + i + backEnd.dsStreamVert;
-		tess.indexes[ i + tess.numIndexes + 1 ] = i + backEnd.dsStreamVert - ( ( i & 1 ) - 1 );
-		tess.indexes[ i + tess.numIndexes + 2 ] = i + backEnd.dsStreamVert + 2;
-		tess.numIndexes += 3;
-	}
-}
-
-/*
-===============
-addTriangle
-===============
-*/
-static void addTriangle(void) {
-    tess.texCoords[tess.numVertexes][0] = cntSt[0];
-    tess.texCoords[tess.numVertexes][1] = cntSt[1];
-    tess.color[tess.numVertexes][0] = cntColor[0];
-    tess.color[tess.numVertexes][1] = cntColor[1];
-    tess.color[tess.numVertexes][2] = cntColor[2];
-    tess.color[tess.numVertexes][3] = cntColor[3];
-	tess.numVertexes++;
-}
-
-/*
-===============
-RB_Vertex3fv
-===============
-*/
-void RB_Vertex3fv( vec3_t v ) {
-	VectorCopy( v, tess.xyz[ tess.numVertexes ] );
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex3f
-===============
-*/
-void RB_Vertex3f( vec_t x, vec_t y, vec_t z ) {
-	tess.xyz[ tess.numVertexes ][ 0 ] = x;
-	tess.xyz[ tess.numVertexes ][ 1 ] = y;
-	tess.xyz[ tess.numVertexes ][ 2 ] = z;
-	addTriangle();
-}
-
-/*
-===============
-RB_Vertex2f
-===============
-*/
-void RB_Vertex2f( vec_t x, vec_t y ) {
-	RB_Vertex3f( x, y, 0 );
-}
-
-/*
-===============
-RB_Color4f
-===============
-*/
-void RB_Color4f( vec_t r, vec_t g, vec_t b, vec_t a ) {
-	cntColor[ 0 ] = r * tr.identityLightByte;
-	cntColor[ 1 ] = g * tr.identityLightByte;
-	cntColor[ 2 ] = b * tr.identityLightByte;
-	cntColor[ 3 ] = a * 255.0;
-}
-
-/*
-===============
-RB_Color3f
-===============
-*/
-void RB_Color3f( vec_t r, vec_t g, vec_t b ) {
-	RB_Color4f( r, g, b, 1.0 );
-}
-
-/*
-===============
-RB_Color3fv
-===============
-*/
-void RB_Color3fv( vec3_t col ) {
-	RB_Color3f( col[ 0 ], col[ 1 ], col[ 2 ] );
-}
-
-/*
-===============
-RB_Color4bv
-===============
-*/
-void RB_Color4bv( unsigned char *colors ) {
-	cntColor[ 0 ] = colors[ 0 ];
-	cntColor[ 1 ] = colors[ 1 ];
-	cntColor[ 2 ] = colors[ 2 ];
-	cntColor[ 3 ] = colors[ 3 ];
-}
-
-/*
-===============
-RB_Texcoord2f
-===============
-*/
-void RB_Texcoord2f( float s, float t ) {
-	cntSt[ 0 ] = s;
-	cntSt[ 1 ] = t;
-}
-
-/*
-===============
-RB_Texcoord2fv
-===============
-*/
-void RB_Texcoord2fv( vec2_t st ) {
-	cntSt[ 0 ] = st[ 0 ];
-	cntSt[ 1 ] = st[ 1 ];
-}
-
-static int Numbers[ 12 ][ 8 ];
-static float Lines[ 13 ][ 4 ];
-
-/*
-===============
-R_DrawDebugNumber
-===============
-*/
-void R_DrawDebugNumber( const vec3_t org, float number, float scale, float r, float g, float b, int precision ) {
-	// FIXME: unimplemented
-}
-
-/*
-===============
-R_DebugRotatedBBox
-===============
-*/
-void R_DebugRotatedBBox( const vec3_t org, vec3_t ang, vec3_t mins, vec3_t maxs, float r, float g, float b, float alpha ) {
-
-}
-
-/*
-===============
-RE_GetShaderWidth
-===============
-*/
-int RE_GetShaderWidth( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	} else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->stages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadWidth;
-}
-
-/*
-===============
-RE_GetShaderHeight
-===============
-*/
-int RE_GetShaderHeight( qhandle_t hShader ) {
-	shader_t *shader;
-
-	if( hShader ) {
-		shader = R_GetShaderByHandle( hShader );
-	}
-	else {
-		shader = tr.defaultShader;
-	}
-
-	return shader->stages[ 0 ]->bundle[ 0 ].image[ 0 ]->uploadHeight;
-}
diff --git a/code/renderergl2/tr_backend.c b/code/renderergl2/tr_backend.c
index ba3e2abb..e31e0048 100644
--- a/code/renderergl2/tr_backend.c
+++ b/code/renderergl2/tr_backend.c
@@ -36,6 +36,13 @@ static float	s_flipMatrix[16] = {
 	0, 0, 0, 1
 };
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+const void* RB_SpriteSurfs(const void* data);
+
+//=========================
 
 /*
 ** GL_BindToTMU
@@ -342,9 +349,7 @@ void RB_BeginDrawingView (void) {
 	{
 		FBO_t *fbo = backEnd.viewParms.targetFbo;
 
-		// FIXME: HUGE HACK: render to the screen fbo if we've already postprocessed the frame and aren't drawing more world
-		// drawing more world check is in case of double renders, such as skyportals
-		if (fbo == NULL && !(backEnd.framePostProcessed && (backEnd.refdef.rdflags & RDF_NOWORLDMODEL)))
+		if (fbo == NULL)
 			fbo = tr.renderFbo;
 
 		if (tr.renderCubeFbo && fbo == tr.renderCubeFbo)
@@ -435,6 +440,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	int				oldSort;
 	double			originalTime;
 	FBO_t*			fbo = NULL;
+	qboolean		bStaticModel, oldbStaticModel;
 
 	// save original time for entity shader offsets
 	originalTime = backEnd.refdef.floatTime;
@@ -452,12 +458,16 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	oldPshadowed = qfalse;
 	oldCubemapIndex = -1;
 	oldSort = -1;
+	// OPENMOHAA-specific stuff
+	//=========================
+    oldbStaticModel = -1;
+    //=========================
 
 	backEnd.pc.c_surfaces += numDrawSurfs;
 
 	for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) {
 		if ( drawSurf->sort == oldSort && drawSurf->cubemapIndex == oldCubemapIndex) {
-			if (backEnd.depthFill && shader && shader->sort != SS_OPAQUE)
+			if (backEnd.depthFill && shader && (shader->sort != SS_OPAQUE && shader->sort != SS_PORTAL))
 				continue;
 
 			// fast path, same as previous sort
@@ -465,7 +475,19 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			continue;
 		}
 		oldSort = drawSurf->sort;
-		R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		if (*drawSurf->surface != SF_SPRITE) {
+			R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed,
+				&bStaticModel );
+		} else {
+			shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+			entityNum = ENTITYNUM_WORLD;
+			dlighted = 0;
+			bStaticModel = qfalse;
+        }
+        //=========================
 		cubemapIndex = drawSurf->cubemapIndex;
 
 		//
@@ -473,7 +495,9 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 		// a "entityMergable" shader is a shader that can have surfaces from separate
 		// entities merged into a single batch, like smoke and blood puff sprites
 		if ( shader != NULL && ( shader != oldShader || fogNum != oldFogNum || dlighted != oldDlighted || pshadowed != oldPshadowed || cubemapIndex != oldCubemapIndex
-			|| ( entityNum != oldEntityNum && !shader->entityMergable ) ) ) {
+			|| ( entityNum != oldEntityNum && !shader->entityMergable )
+			|| ( bStaticModel != oldbStaticModel && !shader->entityMergable )
+			) ) {
 			if (oldShader != NULL) {
 				RB_EndSurface();
 			}
@@ -486,49 +510,65 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 			oldCubemapIndex = cubemapIndex;
 		}
 
-		if (backEnd.depthFill && shader && shader->sort != SS_OPAQUE)
+		if (backEnd.depthFill && shader && (shader->sort != SS_OPAQUE && shader->sort != SS_PORTAL))
 			continue;
 
 		//
 		// change the modelview matrix if needed
 		//
-		if ( entityNum != oldEntityNum ) {
+		if ( entityNum != oldEntityNum
+			|| bStaticModel != oldbStaticModel ) {
 			depthRange = isCrosshair = qfalse;
+			
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			if (bStaticModel) {
+				backEnd.shaderStartTime = 0.0;
+				backEnd.currentEntity = 0;
+				backEnd.spareSphere.TessFunction = 0;
+				backEnd.currentStaticModel = &backEnd.refdef.staticModels[entityNum];
+				R_RotateForStaticModel(backEnd.currentStaticModel, &backEnd.viewParms, &backEnd.or);
+			}
+			else {
+                backEnd.currentStaticModel = NULL;
+			//=========================
 
-			if ( entityNum != REFENTITYNUM_WORLD ) {
-				backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
+				if ( entityNum != REFENTITYNUM_WORLD ) {
+					backEnd.currentEntity = &backEnd.refdef.entities[entityNum];
 
-				// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
-				backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
+					// FIXME: e.shaderTime must be passed as int to avoid fp-precision loss issues
+					backEnd.refdef.floatTime = originalTime - (double)backEnd.currentEntity->e.shaderTime;
 
-				// we have to reset the shaderTime as well otherwise image animations start
-				// from the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
+					// we have to reset the shaderTime as well otherwise image animations start
+					// from the wrong frame
+					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
 
-				// set up the transformation matrix
-				R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
+					// set up the transformation matrix
+					R_RotateForEntity( backEnd.currentEntity, &backEnd.viewParms, &backEnd.or );
 
-				// set up the dynamic lighting if needed
-				if ( backEnd.currentEntity->needDlights ) {
+					// set up the dynamic lighting if needed
+					if ( backEnd.currentEntity->needDlights ) {
+						R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
+					}
+
+					if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
+					{
+						// hack the depth range to prevent view model from poking into walls
+						depthRange = qtrue;
+					
+						if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
+							isCrosshair = qtrue;
+					}
+				} else {
+					backEnd.currentEntity = &tr.worldEntity;
+					backEnd.refdef.floatTime = originalTime;
+					backEnd.or = backEnd.viewParms.world;
+					// we have to reset the shaderTime as well otherwise image animations on
+					// the world (like water) continue with the wrong frame
+					tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
 					R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 				}
-
-				if(backEnd.currentEntity->e.renderfx & RF_DEPTHHACK)
-				{
-					// hack the depth range to prevent view model from poking into walls
-					depthRange = qtrue;
-					
-					if(backEnd.currentEntity->e.renderfx & RF_CROSSHAIR)
-						isCrosshair = qtrue;
-				}
-			} else {
-				backEnd.currentEntity = &tr.worldEntity;
-				backEnd.refdef.floatTime = originalTime;
-				backEnd.or = backEnd.viewParms.world;
-				// we have to reset the shaderTime as well otherwise image animations on
-				// the world (like water) continue with the wrong frame
-				tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-				R_TransformDlights( backEnd.refdef.num_dlights, backEnd.refdef.dlights, &backEnd.or );
 			}
 
 			GL_SetModelviewMatrix( backEnd.or.modelMatrix );
@@ -578,9 +618,18 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 				wasCrosshair = isCrosshair;
 			}
 
-			oldEntityNum = entityNum;
+            oldEntityNum = entityNum;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+            oldbStaticModel = bStaticModel;
+            //=========================
 		}
 
+        if (*drawSurf->surface == SF_SPRITE) {
+            backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+        }
+
 		// add the triangles for this surface
 		rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 	}
@@ -708,10 +757,9 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 		ri.Printf( PRINT_ALL, "qglTexSubImage2D %i, %i: %i msec\n", cols, rows, end - start );
 	}
 
-	// FIXME: HUGE hack
 	if (glRefConfig.framebufferObject)
 	{
-		FBO_Bind(backEnd.framePostProcessed ? NULL : tr.renderFbo);
+		FBO_Bind(tr.renderFbo);
 	}
 
 	RB_SetGL2D();
@@ -735,6 +783,7 @@ void RE_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *
 }
 
 void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int client, qboolean dirty) {
+	byte *buffer;
 	GLuint texture;
 
 	if (!tr.scratchImage[client])
@@ -749,7 +798,18 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
 	if ( cols != tr.scratchImage[client]->width || rows != tr.scratchImage[client]->height ) {
 		tr.scratchImage[client]->width = tr.scratchImage[client]->uploadWidth = cols;
 		tr.scratchImage[client]->height = tr.scratchImage[client]->uploadHeight = rows;
-		qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+
+		if ( qglesMajorVersion >= 1 ) {
+			buffer = ri.Hunk_AllocateTempMemory( 3 * cols * rows );
+
+			R_ConvertTextureFormat( data, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer );
+			qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB, cols, rows, 0, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+
+			ri.Hunk_FreeTempMemory( buffer );
+		} else {
+			qglTextureImage2DEXT(texture, GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
+		}
+
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
 		qglTextureParameterfEXT(texture, GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -758,7 +818,16 @@ void RE_UploadCinematic (int w, int h, int cols, int rows, const byte *data, int
 		if (dirty) {
 			// otherwise, just subimage upload it so that drivers can tell we are going to be changing
 			// it and don't try and do a texture compression
-			qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+			if ( qglesMajorVersion >= 1 ) {
+				buffer = ri.Hunk_AllocateTempMemory( 3 * cols * rows );
+
+				R_ConvertTextureFormat( data, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer );
+				qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGB, GL_UNSIGNED_BYTE, buffer);
+
+				ri.Hunk_FreeTempMemory( buffer );
+			} else {
+				qglTextureSubImage2DEXT(texture, GL_TEXTURE_2D, 0, 0, 0, cols, rows, GL_RGBA, GL_UNSIGNED_BYTE, data);
+			}
 		}
 	}
 }
@@ -795,9 +864,8 @@ const void *RB_StretchPic ( const void *data ) {
 
 	cmd = (const stretchPicCommand_t *)data;
 
-	// FIXME: HUGE hack
 	if (glRefConfig.framebufferObject)
-		FBO_Bind(backEnd.framePostProcessed ? NULL : tr.renderFbo);
+		FBO_Bind(tr.renderFbo);
 
 	RB_SetGL2D();
 
@@ -1144,14 +1212,14 @@ const void	*RB_DrawSurfs( const void *data ) {
 			if (glRefConfig.occlusionQuery)
 			{
 				tr.sunFlareQueryActive[tr.sunFlareQueryIndex] = qtrue;
-				qglBeginQuery(GL_SAMPLES_PASSED, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
+				qglBeginQuery(glRefConfig.occlusionQueryTarget, tr.sunFlareQuery[tr.sunFlareQueryIndex]);
 			}
 
 			RB_DrawSun(0.3, tr.sunFlareShader);
 
 			if (glRefConfig.occlusionQuery)
 			{
-				qglEndQuery(GL_SAMPLES_PASSED);
+				qglEndQuery(glRefConfig.occlusionQueryTarget);
 			}
 
 			FBO_Bind(oldFbo);
@@ -1173,6 +1241,13 @@ const void	*RB_DrawSurfs( const void *data ) {
 			qglGenerateTextureMipmapEXT(cubemap->image->texnum, GL_TEXTURE_CUBE_MAP);
 	}
 
+	// FIXME? backEnd.viewParms doesn't get properly initialized for 2D drawing.
+	// r_cubeMapping 1 generates cubemaps with R_RenderCubemapSide()
+	// and sets isMirror = qtrue. Clear it here to prevent it from leaking
+	// to 2D drawing and causing the loading screen to be culled.
+	backEnd.viewParms.isMirror = qfalse;
+	backEnd.viewParms.flags = 0;
+
 	return (const void *)(cmd + 1);
 }
 
@@ -1199,6 +1274,10 @@ const void	*RB_DrawBuffer( const void *data ) {
 
 	// clear screen for debugging
 	if ( r_clear->integer ) {
+		if (glRefConfig.framebufferObject && tr.renderFbo) {
+			FBO_Bind(tr.renderFbo);
+		}
+
 		qglClearColor( 1, 0, 0.5, 1 );
 		qglClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
 	}
@@ -1313,14 +1392,7 @@ const void *RB_ClearDepth(const void *data)
 
 	if (glRefConfig.framebufferObject)
 	{
-		if (!tr.renderFbo || backEnd.framePostProcessed)
-		{
-			FBO_Bind(NULL);
-		}
-		else
-		{
-			FBO_Bind(tr.renderFbo);
-		}
+		FBO_Bind(tr.renderFbo);
 	}
 
 	qglClear(GL_DEPTH_BUFFER_BIT);
@@ -1378,18 +1450,15 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	if (glRefConfig.framebufferObject)
 	{
-		if (!backEnd.framePostProcessed)
+		if (tr.msaaResolveFbo && r_hdr->integer)
 		{
-			if (tr.msaaResolveFbo && r_hdr->integer)
-			{
-				// Resolving an RGB16F MSAA FBO to the screen messes with the brightness, so resolve to an RGB16F FBO first
-				FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-				FBO_FastBlit(tr.msaaResolveFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			}
-			else if (tr.renderFbo)
-			{
-				FBO_FastBlit(tr.renderFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-			}
+			// Resolving an RGB16F MSAA FBO to the screen messes with the brightness, so resolve to an RGB16F FBO first
+			FBO_FastBlit(tr.renderFbo, NULL, tr.msaaResolveFbo, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+			FBO_FastBlit(tr.msaaResolveFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+		}
+		else if (tr.renderFbo)
+		{
+			FBO_FastBlit(tr.renderFbo, NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 		}
 	}
 
@@ -1401,7 +1470,6 @@ const void	*RB_SwapBuffers( const void *data ) {
 
 	GLimp_EndFrame();
 
-	backEnd.framePostProcessed = qfalse;
 	backEnd.projection2D = qfalse;
 
 	return (const void *)(cmd + 1);
@@ -1452,7 +1520,7 @@ RB_PostProcess
 const void *RB_PostProcess(const void *data)
 {
 	const postProcessCommand_t *cmd = data;
-	FBO_t *srcFbo;
+	FBO_t *srcFbo, *dstFbo;
 	ivec4_t srcBox, dstBox;
 	qboolean autoExposure;
 
@@ -1473,6 +1541,8 @@ const void *RB_PostProcess(const void *data)
 	}
 
 	srcFbo = tr.renderFbo;
+	dstFbo = tr.renderFbo;
+
 	if (tr.msaaResolveFbo)
 	{
 		// Resolve the MSAA before anything else
@@ -1506,13 +1576,13 @@ const void *RB_PostProcess(const void *data)
 		if (r_hdr->integer && (r_toneMap->integer || r_forceToneMap->integer))
 		{
 			autoExposure = r_autoExposure->integer || r_forceAutoExposure->integer;
-			RB_ToneMap(srcFbo, srcBox, NULL, dstBox, autoExposure);
+
+			// Use an intermediate FBO because it can't blit to the same FBO directly
+			// and can't read from an MSAA dstFbo later.
+			RB_ToneMap(srcFbo, srcBox, tr.screenScratchFbo, srcBox, autoExposure);
+			FBO_FastBlit(tr.screenScratchFbo, srcBox, srcFbo, srcBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 		}
-		else if (r_cameraExposure->value == 0.0f)
-		{
-			FBO_FastBlit(srcFbo, srcBox, NULL, dstBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
-		}
-		else
+		else if (r_cameraExposure->value != 0.0f)
 		{
 			vec4_t color;
 
@@ -1521,17 +1591,20 @@ const void *RB_PostProcess(const void *data)
 			color[2] = pow(2, r_cameraExposure->value); //exp2(r_cameraExposure->value);
 			color[3] = 1.0f;
 
-			FBO_Blit(srcFbo, srcBox, NULL, NULL, dstBox, NULL, color, 0);
+			FBO_BlitFromTexture(tr.whiteImage, NULL, NULL, srcFbo, srcBox, NULL, color, GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO);
 		}
 	}
 
 	if (r_drawSunRays->integer)
-		RB_SunRays(NULL, srcBox, NULL, dstBox);
+		RB_SunRays(srcFbo, srcBox, srcFbo, srcBox);
 
 	if (1)
-		RB_BokehBlur(NULL, srcBox, NULL, dstBox, backEnd.refdef.blurFactor);
+		RB_BokehBlur(srcFbo, srcBox, srcFbo, srcBox, backEnd.refdef.blurFactor);
 	else
-		RB_GaussianBlur(backEnd.refdef.blurFactor);
+		RB_GaussianBlur(srcFbo, srcFbo, backEnd.refdef.blurFactor);
+
+	if (srcFbo != dstFbo)
+		FBO_FastBlit(srcFbo, srcBox, dstFbo, dstBox, GL_COLOR_BUFFER_BIT, GL_NEAREST);
 
 #if 0
 	if (0)
@@ -1547,7 +1620,7 @@ const void *RB_PostProcess(const void *data)
 		if (scale < 0.01f)
 			scale = 5.0f;
 
-		FBO_FastBlit(NULL, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(dstFbo, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
 		iQtrBox[0] = backEnd.viewParms.viewportX      * tr.quarterImage[0]->width / (float)glConfig.vidWidth;
 		iQtrBox[1] = backEnd.viewParms.viewportY      * tr.quarterImage[0]->height / (float)glConfig.vidHeight;
@@ -1593,7 +1666,7 @@ const void *RB_PostProcess(const void *data)
 
 		SetViewportAndScissor();
 
-		FBO_FastBlit(tr.quarterFbo[1], NULL, NULL, NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(tr.quarterFbo[1], NULL, dstFbo, NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 		FBO_Bind(NULL);
 	}
 #endif
@@ -1602,42 +1675,42 @@ const void *RB_PostProcess(const void *data)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 0, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[0], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[0], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 128, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[1], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[1], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[2], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[2], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 384, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunShadowDepthImage[3], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0 && r_shadows->integer == 4)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 512 + 0, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[0], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[0], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 128, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[1], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[1], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 256, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[2], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[2], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512 + 384, glConfig.vidHeight - 128, 128, 128);
-		FBO_BlitFromTexture(tr.pshadowMaps[3], NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.pshadowMaps[3], NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.renderDepthImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.renderDepthImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 		VectorSet4(dstBox, 512, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.screenShadowImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.screenShadowImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 	if (0)
 	{
 		ivec4_t dstBox;
 		VectorSet4(dstBox, 256, glConfig.vidHeight - 256, 256, 256);
-		FBO_BlitFromTexture(tr.sunRaysImage, NULL, NULL, NULL, dstBox, NULL, NULL, 0);
+		FBO_BlitFromTexture(tr.sunRaysImage, NULL, NULL, dstFbo, dstBox, NULL, NULL, 0);
 	}
 
 #if 0
@@ -1649,14 +1722,12 @@ const void *RB_PostProcess(const void *data)
 		if (cubemapIndex)
 		{
 			VectorSet4(dstBox, 0, glConfig.vidHeight - 256, 256, 256);
-			//FBO_BlitFromTexture(tr.renderCubeImage, NULL, NULL, NULL, dstBox, &tr.testcubeShader, NULL, 0);
-			FBO_BlitFromTexture(tr.cubemaps[cubemapIndex - 1].image, NULL, NULL, NULL, dstBox, &tr.testcubeShader, NULL, 0);
+			//FBO_BlitFromTexture(tr.renderCubeImage, NULL, NULL, dstFbo, dstBox, &tr.testcubeShader, NULL, 0);
+			FBO_BlitFromTexture(tr.cubemaps[cubemapIndex - 1].image, NULL, NULL, dstFbo, dstBox, &tr.testcubeShader, NULL, 0);
 		}
 	}
 #endif
 
-	backEnd.framePostProcessed = qtrue;
-
 	return (const void *)(cmd + 1);
 }
 
@@ -1779,6 +1850,13 @@ void RB_ExecuteRenderCommands( const void *data ) {
 		case RC_EXPORT_CUBEMAPS:
 			data = RB_ExportCubemaps(data);
 			break;
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		case RC_SPRITE_SURFS:
+			data = RB_SpriteSurfs( data );
+			break;
+		//=========================
 		case RC_END_OF_LIST:
 		default:
 			// finish any 2D drawing if needed
@@ -1793,3 +1871,113 @@ void RB_ExecuteRenderCommands( const void *data ) {
 	}
 
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+
+
+
+/*
+=============
+RE_StretchRaw2
+
+=============
+*/
+void RE_StretchRaw2 (int x, int y, int w, int h, int cols, int rows, int components, const byte* data) {
+	RE_StretchRaw(x, y, w, h, cols, rows, data, 0, qtrue);
+}
+
+/*
+==================
+RB_RenderSpriteSurfList
+==================
+*/
+void RB_RenderSpriteSurfList(drawSurf_t* drawSurfs, int numDrawSurfs) {
+	shader_t	*shader;
+	shader_t	*oldShader;
+	qboolean	depthRange;
+	qboolean	oldDepthRange;
+	int			i;
+	drawSurf_t	*drawSurf;
+
+    backEnd.currentEntity = &tr.worldEntity;
+    backEnd.currentStaticModel = NULL;
+
+	backEnd.pc.c_surfaces += numDrawSurfs;
+	backEnd.or = backEnd.viewParms.world;
+
+	oldShader = NULL;
+    depthRange = qfalse;
+    oldDepthRange = qfalse;
+
+    for (i = 0, drawSurf = drawSurfs; i < numDrawSurfs; i++, drawSurf++) {
+		shader = tr.sortedShaders[((refSprite_t*)drawSurf->surface)->shaderNum];
+		depthRange = (((refSprite_t*)drawSurf->surface)->renderfx & RF_DEPTHHACK) != 0;
+
+        if (shader != oldShader)
+        {
+			if (oldShader) {
+				RB_EndSurface();
+			}
+
+            RB_BeginSurface(shader, 0, 0);
+            oldShader = shader;
+        }
+		
+		GL_SetModelviewMatrix( backEnd.or.modelMatrix );
+
+        if (oldDepthRange != depthRange)
+        {
+			if (depthRange) {
+				qglDepthRange(0.0, 0.3);
+			} else {
+                qglDepthRange(0.0, 1.0);
+			}
+
+            oldDepthRange = depthRange;
+        }
+
+        backEnd.shaderStartTime = ((refSprite_t*)drawSurf->surface)->shaderTime;
+
+        // add the triangles for this surface
+        rb_surfaceTable[*drawSurf->surface](drawSurf->surface);
+	}
+
+	if (oldShader) {
+		RB_EndSurface();
+	}
+
+    // go back to the world modelview matrix
+	GL_SetModelviewMatrix( backEnd.viewParms.world.modelMatrix );
+	// go back to the previous depth range
+	if (depthRange) {
+		qglDepthRange(0.0, 1.0);
+	}
+}
+
+/*
+=============
+RB_SpriteSurfs
+
+=============
+*/
+const void* RB_SpriteSurfs(const void* data) {
+    const drawSurfsCommand_t* cmd;
+
+    // finish any 2D drawing if needed
+    if (tess.numIndexes) {
+        RB_EndSurface();
+    }
+
+    cmd = (const drawSurfsCommand_t*)data;
+
+    backEnd.refdef = cmd->refdef;
+    backEnd.viewParms = cmd->viewParms;
+	
+	//RB_SetupFog();
+    RB_RenderSpriteSurfList(cmd->drawSurfs, cmd->numDrawSurfs);
+
+    return (const void*)(cmd + 1);
+}
diff --git a/code/renderergl2/tr_bsp.c b/code/renderergl2/tr_bsp.c
index ad5fe3a3..92d76d40 100644
--- a/code/renderergl2/tr_bsp.c
+++ b/code/renderergl2/tr_bsp.c
@@ -37,12 +37,50 @@ void RE_LoadWorldMap( const char *name );
 
 */
 
+#define _R( id ) ri.UI_LoadResource( "*" #id )
+
 static	world_t		s_worldData;
 static	byte		*fileBase;
 
 int			c_subdivisions;
 int			c_gridVerts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+static int map_length;
+static int nummodels;
+static int numShaders;
+static int numbrushes;
+static int numbrushsides;
+static int numFogs;
+static int numplanes;
+static int num_entities;
+static int numnodes;
+static int numleafs;
+static int numleafsurfaces;
+static int numDrawVerts;
+static int numDrawIndexes;
+static int numDrawSurfaces;
+static int numLightDefs;
+static int numLightBytes;
+static int numVisBytes;
+static int numSLights;
+static int entLightVisSize;
+static int g_iGridArraySize;
+static int g_iGridDataSize;
+static int g_iGridPaletteBytes;
+static int g_iGridOffsets;
+static int g_nStaticModelData;
+static int map_version;
+static int g_nStaticModelIndices;
+static int g_nStaticModels;
+static int g_nTerPatchIndices;
+static int g_nTerraPatches;
+
+//=========================
+
 //===============================================================================
 
 static void HSVtoRGB( float h, float s, float v, float rgb[3] )
@@ -210,6 +248,8 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 	float maxIntensity = 0;
 	double sumIntensity = 0;
 
+	tr.numLightmaps = 0;
+
 	len = l->filelen;
 	if ( !len ) {
 		return;
@@ -276,7 +316,7 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 		tr.deluxemaps = ri.Hunk_Alloc( tr.numLightmaps * sizeof(image_t *), h_low );
 
 	textureInternalFormat = GL_RGBA8;
-	if (r_hdr->integer)
+	if (r_hdr->integer && !qglesMajorVersion)
 	{
 		// Check for the first hdr lightmap, if it exists, use GL_RGBA16 for textures.
 		char filename[MAX_QPATH];
@@ -497,6 +537,7 @@ static	void R_LoadLightmaps( lump_t *l, lump_t *surfs ) {
 }
 
 
+// If FatPackU() or FatPackV() changes, update FixFatLightmapTexCoords()
 static float FatPackU(float input, int lightmapnum)
 {
 	if (lightmapnum < 0)
@@ -616,7 +657,7 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
 		lightmapNum = LIGHTMAP_WHITEIMAGE;
 	}
 
-	shader = R_FindShader( dsh->shader, lightmapNum, qtrue );
+	shader = R_FindShaderEx( dsh->shader, FatLightmap( lightmapNum ), qtrue, lightmapNum );
 
 	// if the shader had errors, just use default shader
 	if ( shader->defaultShader ) {
@@ -705,7 +746,7 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
 	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
 	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, FatLightmap(realLightmapNum) );
+	surf->shader = ShaderForShaderNum( ds->shaderNum, realLightmapNum );
 	if ( r_singleShader->integer && !surf->shader->isSky ) {
 		surf->shader = tr.defaultShader;
 	}
@@ -812,7 +853,7 @@ static void ParseMesh ( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
 	surf->fogIndex = LittleLong( ds->fogNum ) + 1;
 
 	// get shader value
-	surf->shader = ShaderForShaderNum( ds->shaderNum, FatLightmap(realLightmapNum) );
+	surf->shader = ShaderForShaderNum( ds->shaderNum, realLightmapNum );
 	if ( r_singleShader->integer && !surf->shader->isSky ) {
 		surf->shader = tr.defaultShader;
 	}
@@ -1945,6 +1986,16 @@ static	void R_LoadNodesAndLeafs (lump_t *nodeLump, lump_t *leafLump) {
 
 		out->firstmarksurface = LittleLong(inLeaf->firstLeafSurface);
 		out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+	
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+
+        out->firstStaticModel = LittleLong(inLeaf->firstStaticModel);
+        out->numStaticModels = LittleLong(inLeaf->numStaticModels);
+		//=========================
 	}	
 
 	// chain descendants
@@ -2283,6 +2334,29 @@ void R_LoadEntities( lump_t *l ) {
 	w->lightGridSize[1] = 64;
 	w->lightGridSize[2] = 128;
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
+    //=========================
+
 	p = (char *)(fileBase + l->fileofs);
 
 	// store for reference by the cgame
@@ -2693,6 +2767,530 @@ void R_CalcVertexLightDirs( void )
 	}
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+================
+R_LoadSphereLights
+================
+*/
+void R_LoadSphereLights(lump_t* l) {
+    int				i, j;
+    mapspherel_t* at;
+    spherel_t* light;
+
+    if (l->filelen % sizeof(mapspherel_t)) {
+        Com_Error(ERR_DROP, "LoadMap: funny lump size in spherelight data for %s\n", s_worldData.name);
+    }
+
+    tr.numSLights = l->filelen / sizeof(mapspherel_t);
+
+    if (tr.numSLights >= MAX_MAP_SPHERE_L_SIZE) {
+        Com_Error(ERR_DROP, "LoadMap: Too many spherelights on map %s, limit is %d\n", s_worldData.name, MAX_MAP_SPHERE_L_SIZE);
+    }
+
+	at = (mapspherel_t*)(fileBase + l->fileofs);
+    light = tr.sLights;
+
+    for (i = 0; i < tr.numSLights; at++, light++, i++) {
+        VectorCopy(at->origin, light->origin);
+        VectorCopy(at->color, light->color);
+        VectorCopy(at->spot_dir, light->spot_dir);
+
+        for (j = 0; j < 3; j++) {
+            light->origin[j] = LittleFloat(light->origin[j]);
+            light->color[j] = LittleFloat(light->color[j]);
+            light->spot_dir[j] = LittleFloat(light->spot_dir[j]);
+        }
+
+        light->spot_radiusbydistance = LittleFloat(at->spot_radiusbydistance);
+        light->intensity = LittleFloat(at->intensity);
+        light->spot_light = LittleLong(at->spot_light);
+        light->needs_trace = LittleLong(at->needs_trace);
+        light->leaf = &s_worldData.nodes[s_worldData.numDecisionNodes + LittleLong(at->leaf)];
+    }
+}
+
+/*
+================
+R_LoadSphereLightVis
+================
+*/
+void R_LoadSphereLightVis(lump_t* l) {
+    int i;
+    int j;
+    int h;
+    mnode_t* node;
+    int numentries;
+    int* entries;
+
+    memset(&tr.sSunLight, 0, sizeof(spherel_t));
+
+    if (l->filelen % 4) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in spherelight vis data for %s\n",
+            s_worldData.name);
+    }
+    else {
+        entries = (int*)(fileBase + l->fileofs);
+        numentries = l->filelen / sizeof(int);
+
+        if (numentries) {
+            if (numentries != s_worldData.numnodes - s_worldData.numDecisionNodes) {
+                for (i = 0; i < numentries; ++i)
+                    entries[i] = LittleLong(entries[i]);
+
+                for (node = &s_worldData.nodes[s_worldData.numDecisionNodes]; numentries; node++) {
+                    j = 0;
+                    if (entries[0] != -1) {
+                        do
+                            ++j;
+                        while (entries[j] != -1);
+                    }
+                    if (j) {
+                        node->lights = ri.Hunk_Alloc(j * sizeof(spherel_t*), h_dontcare);
+                        node->numlights = j;
+                        h = 0;
+                        if (entries[0] == -2) {
+                            node->lights[0] = &tr.sSunLight;
+                            tr.sSunLight.leaf = (mnode_t*)-1;
+                            h = 1;
+                        }
+                        while (entries[h] != -1) {
+                            node->lights[h] = &tr.sLights[entries[h]];
+                            h++;
+                        }
+                        entries += h + 1;
+                        numentries = numentries - 1 - h;
+                    }
+                    else {
+                        numentries--;
+                        entries++;
+                    }
+                }
+            }
+        }
+    }
+}
+
+/*
+=================
+R_LoadNodesAndLeafsOld
+=================
+*/
+static	void R_LoadNodesAndLeafsOld(lump_t* nodeLump, lump_t* leafLump) {
+    int			i, j, p;
+    dnode_t* in;
+    dleaf_t_ver17* inLeaf;
+    mnode_t* out;
+    int			numNodes, numLeafs;
+
+    in = (dnode_t*)(fileBase + nodeLump->fileofs);
+    if (nodeLump->filelen % sizeof(dnode_t) ||
+        leafLump->filelen % sizeof(dleaf_t)) {
+        ri.Error(ERR_DROP, "LoadMap: funny lump size in %s", s_worldData.name);
+    }
+    numNodes = nodeLump->filelen / sizeof(dnode_t);
+    numLeafs = leafLump->filelen / sizeof(dleaf_t);
+
+    out = ri.Hunk_Alloc((numNodes + numLeafs) * sizeof(*out), h_dontcare);
+
+    s_worldData.nodes = out;
+    s_worldData.numnodes = numNodes + numLeafs;
+    s_worldData.numDecisionNodes = numNodes;
+
+    // load nodes
+    for (i = 0; i < numNodes; i++, in++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(in->mins[j]);
+            out->maxs[j] = LittleLong(in->maxs[j]);
+        }
+
+        p = LittleLong(in->planeNum);
+        out->plane = s_worldData.planes + p;
+
+        out->contents = CONTENTS_NODE;	// differentiate from leafs
+
+        for (j = 0; j < 2; j++)
+        {
+            p = LittleLong(in->children[j]);
+            if (p >= 0)
+                out->children[j] = s_worldData.nodes + p;
+            else
+                out->children[j] = s_worldData.nodes + numNodes + (-1 - p);
+        }
+    }
+
+    // load leafs
+    inLeaf = (dleaf_t_ver17*)(fileBase + leafLump->fileofs);
+    for (i = 0; i < numLeafs; i++, inLeaf++, out++)
+    {
+        for (j = 0; j < 3; j++)
+        {
+            out->mins[j] = LittleLong(inLeaf->mins[j]);
+            out->maxs[j] = LittleLong(inLeaf->maxs[j]);
+        }
+
+        out->cluster = LittleLong(inLeaf->cluster);
+        out->area = LittleLong(inLeaf->area);
+
+        if (out->cluster >= s_worldData.numClusters) {
+            s_worldData.numClusters = out->cluster + 1;
+        }
+
+        out->firstmarksurface = s_worldData.marksurfaces +
+            LittleLong(inLeaf->firstLeafSurface);
+        out->nummarksurfaces = LittleLong(inLeaf->numLeafSurfaces);
+
+        out->firstTerraPatch = LittleLong(inLeaf->firstTerraPatch);
+        out->numTerraPatches = LittleLong(inLeaf->numTerraPatches);
+    }
+
+    // chain decendants
+    R_SetParent(s_worldData.nodes, NULL);
+}
+
+/*
+================
+R_UnpackTerraPatch
+================
+*/
+void R_UnpackTerraPatch(cTerraPatch_t* pPacked, cTerraPatchUnpacked_t* pUnpacked) {
+    int i, j;
+
+    pUnpacked->byDirty = qfalse;
+    pUnpacked->visCountCheck = 0;
+    pUnpacked->visCountDraw = 0;
+    pUnpacked->uiDistRecalc = 0;
+
+    if (pPacked->lmapScale <= 0) {
+        Com_Error(ERR_DROP, "invalid map: terrain has lmapScale <= 0");
+    }
+
+    pUnpacked->drawinfo.lmapStep = (float)(64 / pPacked->lmapScale);
+    pUnpacked->drawinfo.lmapSize = pPacked->lmapScale * 8 + 1;
+    pUnpacked->s = ((float)pPacked->s + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->t = ((float)pPacked->t + 0.5) / LIGHTMAP_SIZE;
+    pUnpacked->drawinfo.lmData = NULL;
+
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 2; j++) {
+            pUnpacked->texCoord[i][j][0] = pPacked->texCoord[i][j][0];
+            pUnpacked->texCoord[i][j][1] = pPacked->texCoord[i][j][1];
+        }
+    }
+
+    pUnpacked->x0 = ((int)pPacked->x << 6);
+    pUnpacked->y0 = ((int)pPacked->y << 6);
+    pUnpacked->z0 = pPacked->iBaseHeight;
+    pUnpacked->shader = ShaderForShaderNum(pPacked->iShader, pPacked->iLightMap);
+    pUnpacked->iNorth = pPacked->iNorth;
+    pUnpacked->iEast = pPacked->iEast;
+    pUnpacked->iSouth = pPacked->iSouth;
+    pUnpacked->iWest = pPacked->iWest;
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++)
+    {
+        varnode_t *packedVarTree;
+
+        packedVarTree = &pPacked->varTree[0][i];
+        pUnpacked->varTree[0][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[0][i].flags &= ~0xFF;
+        pUnpacked->varTree[0][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+
+        packedVarTree = &pPacked->varTree[1][i];
+        pUnpacked->varTree[1][i].fVariance = packedVarTree->flags & 0x7FF;
+        pUnpacked->varTree[1][i].flags &= ~0xFF;
+        pUnpacked->varTree[1][i].flags |= (packedVarTree->flags >> 12) & 0xFF;
+    }
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++) {
+        pUnpacked->heightmap[i] = pPacked->heightmap[i];
+    }
+
+    pUnpacked->zmax = 0;
+    pUnpacked->flags = pPacked->flags;
+
+    for (i = 0; i < ARRAY_LEN(pUnpacked->heightmap); i++)
+    {
+        if (pUnpacked->zmax < pUnpacked->heightmap[i]) {
+            pUnpacked->zmax = pUnpacked->heightmap[i];
+        }
+    }
+
+    pUnpacked->frameCount = 0;
+    pUnpacked->zmax += pUnpacked->zmax;
+}
+
+/*
+================
+R_LoadTerrain
+================
+IneQuation was here
+*/
+void R_LoadTerrain(lump_t* lump) {
+    int		i;
+    cTerraPatch_t* in;
+    cTerraPatchUnpacked_t* out;
+
+    if (!lump->filelen) {
+        s_worldData.numTerraPatches = 0;
+        s_worldData.terraPatches = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(cTerraPatch_t)) {
+        Com_Error(ERR_DROP, "R_LoadTerrain: funny lump size");
+    }
+
+    s_worldData.numTerraPatches = lump->filelen / sizeof(cTerraPatch_t);
+    s_worldData.terraPatches = ri.Hunk_Alloc(s_worldData.numTerraPatches * sizeof(cTerraPatchUnpacked_t), h_dontcare);
+
+    in = (cTerraPatch_t*)(fileBase + lump->fileofs);
+    out = s_worldData.terraPatches;
+
+    for (i = 0; i < s_worldData.numTerraPatches; in++, out++, i++) {
+        R_SwapTerraPatch(in);
+        R_UnpackTerraPatch(in, out);
+    }
+}
+
+/*
+================
+R_LoadTerrainIndexes
+================
+*/
+void R_LoadTerrainIndexes(lump_t* lump) {
+    int		i;
+    short* in;
+    cTerraPatchUnpacked_t** out;
+
+    if (!lump->filelen) {
+        s_worldData.numVisTerraPatches = 0;
+        s_worldData.visTerraPatches = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadTerrainIndexes: funny lump size");
+    }
+
+    s_worldData.numVisTerraPatches = lump->filelen / sizeof(short);
+    s_worldData.visTerraPatches = ri.Hunk_Alloc(s_worldData.numVisTerraPatches * sizeof(cTerraPatchUnpacked_t*), h_dontcare);
+
+    in = (short*)(fileBase + lump->fileofs);
+    out = s_worldData.visTerraPatches;
+
+    for (i = 0; i < s_worldData.numVisTerraPatches; in++, out++, i++) {
+        *out = &s_worldData.terraPatches[LittleShort(*in)];
+    }
+}
+
+/*
+================
+R_LoadLightGrid2
+
+================
+*/
+void R_LoadLightGrid2(lump_t* plPal, lump_t* plOffsets, lump_t* plData) {
+    int		i;
+    vec3_t	maxs;
+    int		numGridPoints;
+    world_t	*w;
+    float	*wMins, *wMaxs;
+
+    w = &s_worldData;
+
+    if (!plPal->filelen || !plOffsets->filelen || !plData->filelen) {
+        ri.Printf(PRINT_WARNING, "WARNING: No light grid data present\n");
+        w->lightGridOffsets = 0;
+        w->lightGridData = 0;
+        return;
+    }
+
+    switch (map_version)
+    {
+    case 21:
+        w->lightGridSize[0] = 80.0;
+        w->lightGridSize[1] = 80.0;
+        w->lightGridSize[2] = 80.0;
+        break;
+    case 20:
+        w->lightGridSize[0] = 48.0;
+        w->lightGridSize[1] = 48.0;
+        w->lightGridSize[2] = 64.0;
+        break;
+    default:
+        w->lightGridSize[0] = 32.0;
+        w->lightGridSize[1] = 32.0;
+        w->lightGridSize[2] = 32.0;
+        break;
+    }
+
+    w->lightGridInverseSize[0] = 1.0f / w->lightGridSize[0];
+    w->lightGridInverseSize[1] = 1.0f / w->lightGridSize[1];
+    w->lightGridInverseSize[2] = 1.0f / w->lightGridSize[2];
+
+    wMins = w->bmodels[0].bounds[0];
+    wMaxs = w->bmodels[0].bounds[1];
+
+	for ( i = 0 ; i < 3 ; i++ ) {
+		w->lightGridOrigin[i] = w->lightGridSize[i] * ceil( wMins[i] / w->lightGridSize[i] );
+		maxs[i] = w->lightGridSize[i] * floor( wMaxs[i] / w->lightGridSize[i] );
+		w->lightGridBounds[i] = (maxs[i] - w->lightGridOrigin[i])/w->lightGridSize[i] + 1;
+	}
+
+    numGridPoints = w->lightGridBounds[0] * w->lightGridBounds[1] + w->lightGridBounds[0];
+
+    if (plOffsets->filelen != numGridPoints * 2) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid offset size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    if (plPal->filelen != 768) {
+        ri.Printf(PRINT_WARNING, "WARNING: light grid palette size mismatch\n");
+        w->lightGridOffsets = NULL;
+        w->lightGridData = NULL;
+        return;
+    }
+
+    w->lightGridOffsets = ri.Hunk_Alloc(plOffsets->filelen, h_dontcare);
+    for (i = 0; i < plOffsets->filelen / 2; i++) {
+        w->lightGridOffsets[i] = LittleUnsignedShort(((short*)(fileBase + plOffsets->fileofs))[i]);
+    }
+    Com_Memcpy(w->lightGridPalette, fileBase + plPal->fileofs, sizeof(s_worldData.lightGridPalette));
+
+    w->lightGridData = ri.Hunk_Alloc(plData->filelen, h_dontcare);
+    Com_Memcpy(w->lightGridData, fileBase + plData->fileofs, plData->filelen);
+}
+
+/*
+================
+R_LoadStaticModelData
+================
+*/
+void R_LoadStaticModelData(lump_t* lump) {
+    int		i;
+    byte* pDstColors;
+    byte* pSrcColors;
+
+    if (!lump->filelen) {
+        s_worldData.numStaticModelData = 0;
+        s_worldData.staticModelData = 0;
+        return;
+    }
+
+
+    if (lump->filelen % (sizeof(byte) * 3)) {
+        Com_Error(1, "R_LoadStaticModelData: funny lump size");
+    }
+
+    s_worldData.numStaticModelData = lump->filelen / (sizeof(byte) * 3);
+    s_worldData.staticModelData = (byte*)ri.Hunk_Alloc(s_worldData.numStaticModelData * sizeof(color4ub_t), h_dontcare);
+
+    pSrcColors = (byte*)(fileBase + lump->fileofs);
+    pDstColors = s_worldData.staticModelData;
+
+    for (i = 0; i < lump->filelen; i += sizeof(byte) * 3)
+    { 
+        // Colors are stored as integers
+        pDstColors[0] = pSrcColors[0];
+        pDstColors[1] = pSrcColors[1];
+        pDstColors[2] = pSrcColors[2];
+        pDstColors[3] = 0xFF;
+
+        pSrcColors += sizeof(byte) * 3;
+        pDstColors += sizeof(byte) * 4;
+    }
+}
+
+/*
+================
+R_CopyStaticModel
+================
+*/
+void R_CopyStaticModel(cStaticModel_t* pSM, cStaticModelUnpacked_t* pUnpackedSM) {
+    pUnpackedSM->visCount = 0;
+    pUnpackedSM->angles[0] = LittleFloat(pSM->angles[0]);
+    pUnpackedSM->angles[1] = LittleFloat(pSM->angles[1]);
+    pUnpackedSM->angles[2] = LittleFloat(pSM->angles[2]);
+    pUnpackedSM->origin[0] = LittleFloat(pSM->origin[0]);
+    pUnpackedSM->origin[1] = LittleFloat(pSM->origin[1]);
+    pUnpackedSM->origin[2] = LittleFloat(pSM->origin[2]);
+    pUnpackedSM->scale = LittleFloat(pSM->scale);
+    pUnpackedSM->firstVertexData = LittleLong(pSM->firstVertexData) * sizeof(color4ub_t) / (sizeof(byte) * 3);
+    pUnpackedSM->numVertexData = LittleLong(pSM->numVertexData);
+    memcpy(pUnpackedSM->model, pSM->model, sizeof(pUnpackedSM->model));
+}
+
+/*
+================
+R_LoadStaticModelDefs
+================
+*/
+void R_LoadStaticModelDefs(lump_t* lump) {
+    int		i;
+    cStaticModel_t* in;
+    cStaticModelUnpacked_t* out;
+
+    if (!lump->filelen) {
+        s_worldData.numStaticModels = 0;
+        s_worldData.staticModels = NULL;
+        return;
+    }
+
+    if (lump->filelen % sizeof(cStaticModel_t)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numStaticModels = lump->filelen / sizeof(cStaticModel_t);
+    s_worldData.staticModels = ri.Hunk_Alloc(s_worldData.numStaticModels * sizeof(cStaticModelUnpacked_t), h_dontcare);
+
+    in = (cStaticModel_t*)(fileBase + lump->fileofs);
+    out = s_worldData.staticModels;
+
+    for (i = 0; i < s_worldData.numStaticModels; in++, out++, i++) {
+        R_CopyStaticModel(in, out);
+    }
+}
+
+/*
+================
+R_LoadStaticModelIndexes
+================
+*/
+void R_LoadStaticModelIndexes(lump_t* lump) {
+    int i;
+    unsigned short* in;
+    cStaticModelUnpacked_t** out;
+
+    if (lump->filelen % sizeof(short)) {
+        Com_Error(ERR_DROP, "R_LoadStaticModelDefs: funny lump size");
+    }
+
+    s_worldData.numVisStaticModels = lump->filelen / sizeof(short);
+    s_worldData.visStaticModels = ri.Hunk_Alloc(s_worldData.numVisStaticModels * sizeof(cStaticModelUnpacked_t*), h_dontcare);
+
+    in = (unsigned short*)(fileBase + lump->fileofs);
+    out = s_worldData.visStaticModels;
+
+    for (i = 0; i < s_worldData.numVisStaticModels; in++, out++, i++) {
+        unsigned short index = LittleUnsignedShort(*in);
+        if (index >= s_worldData.numStaticModels) {
+            // Added in OPM
+            Com_Error(ERR_DROP, "R_LoadStaticModelIndexes: bad static model index %d", index);
+        }
+
+        *out = &s_worldData.staticModels[index];
+    }
+}
+
+//=========================
 
 /*
 =================
@@ -2762,28 +3360,142 @@ void RE_LoadWorldMap( const char *name ) {
 	fileBase = (byte *)header;
 
 	i = LittleLong (header->version);
+#if 0
 	if ( i != BSP_VERSION ) {
 		ri.Error (ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be %i)", 
 			name, i, BSP_VERSION);
 	}
+#endif
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    if (i < BSP_MIN_VERSION || i > BSP_MAX_VERSION) {
+        ri.Error(ERR_DROP, "RE_LoadWorldMap: %s has wrong version number (%i should be between %i and %i)",
+            name, i, BSP_MIN_VERSION, BSP_MAX_VERSION);
+    }
+    //=========================
 
 	// swap all the lumps
 	for (i=0 ; i<sizeof(dheader_t)/4 ; i++) {
 		((int *)header)[i] = LittleLong ( ((int *)header)[i]);
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    map_version = header->version;
+    //=========================
+
 	// load into heap
+#if 0
 	R_LoadEntities( &header->lumps[LUMP_ENTITIES] );
 	R_LoadShaders( &header->lumps[LUMP_SHADERS] );
 	R_LoadLightmaps( &header->lumps[LUMP_LIGHTMAPS], &header->lumps[LUMP_SURFACES] );
 	R_LoadPlanes (&header->lumps[LUMP_PLANES]);
-	R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
+	//R_LoadFogs( &header->lumps[LUMP_FOGS], &header->lumps[LUMP_BRUSHES], &header->lumps[LUMP_BRUSHSIDES] );
 	R_LoadSurfaces( &header->lumps[LUMP_SURFACES], &header->lumps[LUMP_DRAWVERTS], &header->lumps[LUMP_DRAWINDEXES] );
 	R_LoadMarksurfaces (&header->lumps[LUMP_LEAFSURFACES]);
 	R_LoadNodesAndLeafs (&header->lumps[LUMP_NODES], &header->lumps[LUMP_LEAFS]);
 	R_LoadSubmodels (&header->lumps[LUMP_MODELS]);
 	R_LoadVisibility( &header->lumps[LUMP_VISIBILITY] );
 	R_LoadLightGrid( &header->lumps[LUMP_LIGHTGRID] );
+#endif
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	_R(53);
+    _R(54);
+    R_LoadShaders(Q_GetLumpByVersion(header, LUMP_SHADERS));
+    _R(55);
+    _R(56);
+    R_LoadPlanes(Q_GetLumpByVersion(header, LUMP_PLANES));
+    _R(57);
+    _R(58);
+    _R(59);
+    R_LoadLightmaps(Q_GetLumpByVersion(header, LUMP_LIGHTMAPS), Q_GetLumpByVersion(header, LUMP_SURFACES));
+    _R(60);
+    _R(61);
+    _R(62);
+    _R(63);
+    _R(64);
+    R_LoadSurfaces(Q_GetLumpByVersion(header, LUMP_SURFACES), Q_GetLumpByVersion(header, LUMP_DRAWVERTS), Q_GetLumpByVersion(header, LUMP_DRAWINDEXES));
+    _R(65);
+    _R(66);
+    _R(67);
+    _R(68);
+    _R(69);
+    R_LoadMarksurfaces(Q_GetLumpByVersion(header, LUMP_LEAFSURFACES));
+    _R(70);
+    _R(71);
+    _R(72);
+    _R(73);
+    if (header->version > BSP_BETA_VERSION) {
+        R_LoadNodesAndLeafs(Q_GetLumpByVersion(header, LUMP_NODES), Q_GetLumpByVersion(header, LUMP_LEAFS));
+    } else {
+        R_LoadNodesAndLeafsOld(Q_GetLumpByVersion(header, LUMP_NODES), Q_GetLumpByVersion(header, LUMP_LEAFS));
+    }
+    _R(74);
+    _R(75);
+    _R(76);
+    numFogs = 0;
+    _R(77);
+    R_LoadSubmodels(Q_GetLumpByVersion(header, LUMP_MODELS));
+    _R(78);
+    _R(79);
+    _R(80);
+    R_LoadVisibility(Q_GetLumpByVersion(header, LUMP_VISIBILITY));
+    _R(81);
+    _R(82);
+    _R(83);
+    _R(84);
+    _R(85);
+    R_LoadLightGrid2(Q_GetLumpByVersion(header, LUMP_LIGHTGRIDPALETTE), Q_GetLumpByVersion(header, LUMP_LIGHTGRIDOFFSETS), Q_GetLumpByVersion(header, LUMP_LIGHTGRIDDATA));
+    _R(86);
+    _R(87);
+    _R(88);
+    _R(89);
+    _R(90);
+    R_LoadSphereLights(Q_GetLumpByVersion(header, LUMP_SPHERELIGHTS));
+    _R(91);
+    _R(92);
+    _R(93);
+    R_LoadSphereLightVis(Q_GetLumpByVersion(header, LUMP_SPHERELIGHTVIS));
+    _R(94);
+    _R(95);
+    _R(96);
+    R_LoadTerrain(Q_GetLumpByVersion(header, LUMP_TERRAIN));
+    _R(97);
+    _R(98);
+    _R(99);
+    R_LoadTerrainIndexes(Q_GetLumpByVersion(header, LUMP_TERRAININDEXES));
+    _R(100);
+    _R(101);
+    if (header->version > BSP_BETA_VERSION)
+    {
+        _R(102);
+        R_LoadStaticModelData(Q_GetLumpByVersion(header, LUMP_STATICMODELDATA));
+        _R(103);
+        _R(104);
+        _R(105);
+        R_LoadStaticModelDefs(Q_GetLumpByVersion(header, LUMP_STATICMODELDEF));
+        _R(106);
+        _R(107);
+        _R(108);
+        R_LoadStaticModelIndexes(Q_GetLumpByVersion(header, LUMP_STATICMODELINDEXES));
+        _R(109);
+        _R(110);
+    }
+    else
+    {
+        g_nStaticModelData = 0;
+        g_nStaticModels = 0;
+        g_nStaticModelIndices = 0;
+    }
+
+    ri.UI_LoadResource("*111");
+    R_Sphere_InitLights();
+	//=========================
 
 	// determine vertex light directions
 	R_CalcVertexLightDirs();
@@ -3014,4 +3726,81 @@ void RE_LoadWorldMap( const char *name ) {
 	}
 
     ri.FS_FreeFile( buffer.v );
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    ri.UI_LoadResource("*112");
+    R_InitTerrain();
+    ri.UI_LoadResource("*113");
+    R_InitStaticModels();
+    ri.UI_LoadResource("*114");
+    R_LevelMarksLoad(name);
+    ri.UI_LoadResource("*115");
+    R_VisDebugLoad(name);
+    ri.UI_LoadResource("*116");
+    //=========================
+}
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=================
+RE_MapVersion
+
+=================
+*/
+int RE_MapVersion(void)
+{
+	return map_version;
+}
+
+/*
+=================
+RE_PrintBSPFileSizes
+
+=================
+*/
+void RE_PrintBSPFileSizes(void)
+{
+  ri.Printf(PRINT_ALL, "%s: %i\n", s_worldData.name, map_length);
+  ri.Printf(PRINT_ALL, "%6i   models                %7i\n", nummodels, 40 * nummodels);
+  ri.Printf(PRINT_ALL, "%6i   shaders               %7i\n", numShaders, 140 * numShaders);
+  ri.Printf(PRINT_ALL, "%6i   brushes               %7i\n", numbrushes, 12 * numbrushes);
+  ri.Printf(PRINT_ALL, "%6i   brushsides            %7i\n", numbrushsides, 12 * numbrushsides);
+  ri.Printf(PRINT_ALL, "%6i   fogs                  %7i\n", numFogs, 72 * numFogs);
+  ri.Printf(PRINT_ALL, "%6i   planes                %7i\n", numplanes, 16 * numplanes);
+  ri.Printf(PRINT_ALL, "%6i   nodes                 %7i\n", numnodes, 36 * numnodes);
+  ri.Printf(PRINT_ALL, "%6i   leafs                 %7i\n", numleafs, numleafs << 6);
+  ri.Printf(PRINT_ALL, "%6i   leafsurfaces          %7i\n", numleafsurfaces, 4 * numleafsurfaces);
+  ri.Printf(PRINT_ALL, "%6i   drawverts             %7i\n", numDrawVerts, 44 * numDrawVerts);
+  ri.Printf(PRINT_ALL, "%6i   drawindexes           %7i\n", numDrawIndexes, 4 * numDrawIndexes);
+  ri.Printf(PRINT_ALL, "%6i   drawsurfaces          %7i\n", numDrawSurfaces, 108 * numDrawSurfaces);
+  ri.Printf(PRINT_ALL, "%6i   lightdefs             %7i\n", numLightDefs, 52 * numLightDefs);
+  ri.Printf(PRINT_ALL, "%6i   lightmaps             %7i\n", numLightBytes / 49152, numLightBytes);
+  ri.Printf(PRINT_ALL, "         visibility            %7i\n", numVisBytes);
+  ri.Printf(PRINT_ALL, "%6i   entitylights          %7i\n", numSLights, 56 * numSLights);
+  ri.Printf(PRINT_ALL, "         entitylightvis        %7i\n", entLightVisSize);
+  ri.Printf(PRINT_ALL, "         light grid palette    %7i\n", g_iGridPaletteBytes);
+  ri.Printf(PRINT_ALL, "%6i   light grid offsets    %7i\n", g_iGridOffsets, 2 * g_iGridOffsets);
+  ri.Printf(PRINT_ALL, "         light grid data       %7i\n", g_iGridDataSize);
+  ri.Printf(PRINT_ALL, "%6i   terrain               %7i\n", g_nTerraPatches, 388 * g_nTerraPatches);
+  ri.Printf(PRINT_ALL, "%6i   terrain indexes       %7i\n", g_nTerPatchIndices, 2 * g_nTerPatchIndices);
+  ri.Printf(PRINT_ALL, "         static model data     %7i\n", g_nStaticModelData);
+  ri.Printf(PRINT_ALL, "%6i   static models defs    %7i\n", g_nStaticModels, 164 * g_nStaticModels);
+  ri.Printf(PRINT_ALL, "         static model indexes  %7i\n", g_nStaticModelIndices);
+}
+
+/*
+=================
+R_ClearWorld
+
+Set the world to NULL to prevent anyone from accessing
+freed world data
+=================
+*/
+void R_ClearWorld(void) {
+    tr.world = NULL;
 }
diff --git a/code/renderergl2/tr_cmds.c b/code/renderergl2/tr_cmds.c
index 38ba45d2..d1b5fc58 100644
--- a/code/renderergl2/tr_cmds.c
+++ b/code/renderergl2/tr_cmds.c
@@ -21,12 +21,34 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "tr_local.h"
 
+static backEndCounters_t pc_save;
+
+/*
+=====================
+R_SavePerformanceCounters
+=====================
+*/
+void R_SavePerformanceCounters(void) {
+    memcpy(&pc_save, &backEnd.pc, sizeof(pc_save));
+}
+
 /*
 =====================
 R_PerformanceCounters
 =====================
 */
 void R_PerformanceCounters( void ) {
+	if (r_fps->integer) {
+		ri.SetPerformanceCounters(
+			backEnd.pc.c_totalIndexes / 3,
+			backEnd.pc.c_vertexes,
+			R_SumOfUsedImages(),
+			pc_save.c_totalIndexes / 3,
+			pc_save.c_vertexes,
+			backEnd.pc.c_characterlights
+			);
+	}
+
 	if ( !r_speeds->integer ) {
 		// clear the counters even if we aren't printing
 		Com_Memset( &tr.pc, 0, sizeof( tr.pc ) );
@@ -348,7 +370,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	//
 	if ( r_measureOverdraw->integer )
 	{
-		if ( glConfig.stencilBits < 4 )
+		if ( qglesMajorVersion >= 1 && !glRefConfig.readStencil )
+		{
+			ri.Printf( PRINT_WARNING, "OpenGL ES needs GL_NV_read_stencil to read stencil bits to measure overdraw\n" );
+			ri.Cvar_Set( "r_measureOverdraw", "0" );
+			r_measureOverdraw->modified = qfalse;
+		}
+		else if ( glConfig.stencilBits < 4 )
 		{
 			ri.Printf( PRINT_ALL, "Warning: not enough stencil bits to measure overdraw: %d\n", glConfig.stencilBits );
 			ri.Cvar_Set( "r_measureOverdraw", "0" );
@@ -426,6 +454,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 	}
 	else
 	{
+		if (qglesMajorVersion >= 1 && r_anaglyphMode->integer)
+		{
+			ri.Printf( PRINT_WARNING, "OpenGL ES does not support drawing to separate buffer for anaglyph mode\n" );
+			ri.Cvar_Set( "r_anaglyphMode", "0" );
+			r_anaglyphMode->modified = qfalse;
+		}
+
 		if(r_anaglyphMode->integer)
 		{
 			if(r_anaglyphMode->modified)
@@ -519,7 +554,13 @@ void RE_BeginFrame( stereoFrame_t stereoFrame ) {
 		}
 	}
 	
-	tr.refdef.stereoFrame = stereoFrame;
+    tr.refdef.stereoFrame = stereoFrame;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    g_nStaticSurfaces = 0;
 }
 
 
@@ -583,3 +624,29 @@ void RE_TakeVideoFrame( int width, int height,
 	cmd->encodeBuffer = encodeBuffer;
 	cmd->motionJpeg = motionJpeg;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=============
+R_AddSpriteSurfCmd
+
+=============
+*/
+void	R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs) {
+    drawSurfsCommand_t* cmd;
+
+    cmd = R_GetCommandBuffer(sizeof(*cmd));
+    if (!cmd) {
+        return;
+    }
+    cmd->commandId = RC_SPRITE_SURFS;
+
+    cmd->drawSurfs = drawSurfs;
+    cmd->numDrawSurfs = numDrawSurfs;
+
+    cmd->refdef = tr.refdef;
+    cmd->viewParms = tr.viewParms;
+}
diff --git a/code/renderergl2/tr_curve.c b/code/renderergl2/tr_curve.c
index d175789b..54910d04 100644
--- a/code/renderergl2/tr_curve.c
+++ b/code/renderergl2/tr_curve.c
@@ -388,10 +388,10 @@ void R_CreateSurfaceGridMesh(srfBspSurface_t *grid, int width, int height,
 	grid->numVerts = (width * height);
 	grid->verts = ri.Malloc(grid->numVerts * sizeof(srfVert_t));
 #else
-	grid->widthLodError = ri.Hunk_Alloc( width * 4 );
+	grid->widthLodError = ri.Hunk_Alloc( width * 4, h_low );
 	Com_Memcpy( grid->widthLodError, errorTable[0], width * 4 );
 
-	grid->heightLodError = ri.Hunk_Alloc( height * 4 );
+	grid->heightLodError = ri.Hunk_Alloc( height * 4, h_low );
 	Com_Memcpy( grid->heightLodError, errorTable[1], height * 4 );
 
 	grid->numIndexes = numIndexes;
diff --git a/code/renderergl2/tr_draw.c b/code/renderergl2/tr_draw.c
new file mode 100644
index 00000000..b06a7a15
--- /dev/null
+++ b/code/renderergl2/tr_draw.c
@@ -0,0 +1,535 @@
+/*
+===========================================================================
+Copyright (C) 1999-2005 Id Software, Inc.
+
+This file is part of Quake III Arena source code.
+
+Quake III Arena source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+Quake III Arena source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Quake III Arena source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_draw.c -- drawing
+
+#include "tr_local.h"
+
+vec4_t r_colorWhite = { 1.0, 1.0, 1.0, 1.0 };
+
+/*
+================
+Draw_SetColor
+================
+*/
+void Draw_SetColor(const vec4_t rgba) {
+#if 1
+    if (!rgba) {
+        rgba = r_colorWhite;
+    }
+
+    backEnd.color2D[0] = (byte)(rgba[0] * tr.identityLightByte);
+    backEnd.color2D[1] = (byte)(rgba[1] * tr.identityLightByte);
+    backEnd.color2D[2] = (byte)(rgba[2] * tr.identityLightByte);
+    backEnd.color2D[3] = (byte)(rgba[3] * 255.0);
+#else
+    RE_SetColor(rgba);
+#endif
+}
+
+/*
+================
+Draw_StretchPic
+================
+*/
+void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader) {
+#if 1
+    shader_t* shader;
+
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
+
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    // draw the pic
+    RB_BeginSurface(shader, 0, 0);
+
+    RB_Color4bv(backEnd.color2D);
+
+    RB_Texcoord2f(s1, t1);
+    RB_Vertex2f(x, y);
+
+    RB_Texcoord2f(s2, t1);
+    RB_Vertex2f(x + w, y);
+
+    RB_Texcoord2f(s1, t2);
+    RB_Vertex2f(x, y + h);
+
+    RB_Texcoord2f(s2, t2);
+    RB_Vertex2f(x + w, y + h);
+
+    RB_StreamEnd();
+#else
+    RE_StretchPic(x, y, w, h, s1, t1, s2, t2, hShader);
+#endif
+}
+
+/*
+================
+Draw_StretchPic2
+================
+*/
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader) {
+    shader_t* shader;
+    float halfWidth, halfHeight;
+    float scaledWidth1, scaledHeight1;
+    float scaledWidth2, scaledHeight2;
+
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
+
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    halfWidth = w * 0.5f;
+    halfHeight = h * 0.5f;
+    scaledWidth1 = halfWidth * sy;
+    scaledHeight1 = halfHeight * sx;
+    scaledWidth2 = halfWidth * sx;
+    scaledHeight2 = halfHeight * sy;
+
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
+    RB_BeginSurface(shader, 0, 0);
+
+    RB_Texcoord2f(s1, t1);
+    RB_Vertex3f(x + halfWidth - (scaledWidth2 + -scaledHeight2), y + halfWidth - scaledHeight1 - scaledWidth1, 0);
+
+    RB_Texcoord2f(t2, t1);
+    RB_Vertex3f(scaledWidth2 - -scaledHeight2 + x + halfWidth, scaledWidth1 - scaledHeight1 + y + halfWidth, 0);
+
+    RB_Texcoord2f(s1, s2);
+    RB_Vertex3f(x+ halfWidth - (scaledWidth2 + scaledHeight2), scaledHeight1 - scaledWidth1 + y + halfWidth, 0);
+
+    RB_Texcoord2f(t2, s2);
+    RB_Vertex3f(scaledWidth2 - scaledHeight2 + x + halfWidth, scaledWidth1 + scaledHeight1 + y + halfWidth, 0);
+
+    RB_StreamEnd();
+}
+
+
+/*
+================
+Draw_TilePic
+================
+*/
+void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader) {
+    shader_t* shader;
+    float        picw, pich;
+
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
+
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
+    pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
+
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
+
+    RB_StreamBegin(shader);
+
+    RB_Texcoord2f(x / picw, y / pich);
+    RB_Vertex2f(x, y);
+
+    RB_Texcoord2f((x + w) / picw, y / pich);
+    RB_Vertex2f(x + w, y);
+
+    RB_Texcoord2f(x / picw, (y + h) / pich);
+    RB_Vertex2f(x, y + h);
+
+    RB_Texcoord2f((x + w) / picw, (y + h) / pich);
+    RB_Vertex2f(x + w, y + h);
+
+    RB_StreamEnd();
+}
+
+/*
+================
+Draw_TilePicOffset
+================
+*/
+void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY) {
+    shader_t* shader;
+    float        picw, pich;
+
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
+
+    if (w <= 0) {
+        w = shader->stages[0]->bundle[0].image[0]->width;
+        h = shader->stages[0]->bundle[0].image[0]->height;
+    }
+
+    picw = shader->stages[0]->bundle[0].image[0]->uploadWidth;
+    pich = shader->stages[0]->bundle[0].image[0]->uploadHeight;
+
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
+
+    RB_StreamBegin(shader);
+
+    RB_Texcoord2f(x / picw, y / pich);
+    RB_Vertex2f(x + offsetX, y + offsetY);
+
+    RB_Texcoord2f((x + w) / picw, y / pich);
+    RB_Vertex2f(x + offsetX + w, y + offsetY);
+
+    RB_Texcoord2f(x / picw, (y + h) / pich);
+    RB_Vertex2f(x + offsetX, y + offsetY + h);
+
+    RB_Texcoord2f((x + w) / picw, (y + h) / pich);
+    RB_Vertex2f(x + offsetX + w, y + offsetY + h);
+
+    RB_StreamEnd();
+}
+
+/*
+================
+Draw_TrianglePic
+================
+*/
+void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader) {
+    int            i;
+    shader_t* shader;
+
+    R_IssuePendingRenderCommands();
+
+    if (glRefConfig.framebufferObject)
+        FBO_Bind(tr.renderFbo);
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    }
+    else {
+        shader = tr.defaultShader;
+    }
+
+    // draw the pic
+    RB_Color4bv(backEnd.color2D);
+
+    RB_BeginSurface(shader, 0, 0);
+
+    for (i = 0; i < 3; i++) {
+        RB_Texcoord2f(vTexCoords[i][0], vTexCoords[i][1]);
+        RB_Vertex2f(vPoints[i][0], vPoints[i][1]);
+    }
+
+    RB_StreamEnd();
+}
+
+/*
+================
+RE_DrawBackground_TexSubImage
+================
+*/
+void RE_DrawBackground_TexSubImage(int cols, int rows, int bgr, byte* data) {
+    // FIXME: unimplemented (GL2)
+#if 0
+    GLenum    format;
+    int        w, h;
+
+    w = glConfig.vidWidth;
+    h = glConfig.vidHeight;
+
+    R_IssuePendingRenderCommands();
+    qglFinish();
+
+    if (bgr) {
+        format = GL_BGR_EXT;
+    }
+    else {
+        format = GL_RGB;
+    }
+
+    GL_Bind(tr.scratchImage);
+
+    if (cols == tr.scratchImage->width && rows == tr.scratchImage->height && format == tr.scratchImage->internalFormat)
+    {
+        qglTexSubImage2D(3553, 0, 0, 0, cols, rows, format, 5121, data);
+    }
+    else
+    {
+        tr.scratchImage->uploadWidth = cols;
+        tr.scratchImage->uploadHeight = rows;
+        tr.scratchImage->internalFormat = format;
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, cols, rows, 0, format, 5121, data);
+        qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, 9729.0);
+        qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, 9729.0);
+    }
+
+    qglDisable(GL_CULL_FACE);
+    qglDisable(GL_DEPTH_TEST);
+    qglEnable(GL_TEXTURE_2D);
+
+    qglBegin(GL_QUADS);
+
+    qglTexCoord2f(0.5 / (GLfloat)cols, ((GLfloat)rows - 0.5) / rows);
+    qglVertex2f(0, 0);
+
+    qglTexCoord2f(((GLfloat)cols - 0.5) / cols, ((GLfloat)rows - 0.5) / rows);
+    qglVertex2f(w, 0);
+
+    qglTexCoord2f(((GLfloat)cols - 0.5) / cols, 0.5 / (GLfloat)rows);
+    qglVertex2f(w, h);
+
+    qglTexCoord2f(0.5 / (GLfloat)rows, 0.5 / (GLfloat)rows);
+    qglVertex2f(0, h);
+
+    qglEnd();
+#endif
+}
+
+/*
+================
+RE_DrawBackground_DrawPixels
+================
+*/
+void RE_DrawBackground_DrawPixels(int cols, int rows, int bgr, byte* data) {
+    // FIXME: unimplemented (GL2)
+#if 0
+    R_IssuePendingRenderCommands();
+
+    GL_State(0);
+    qglDisable(GL_TEXTURE_2D);
+
+    qglPixelZoom(glConfig.vidWidth / rows, glConfig.vidHeight / cols);
+
+    if (bgr) {
+        qglDrawPixels(cols, rows, GL_BGR, GL_UNSIGNED_BYTE, data);
+    } else {
+        qglDrawPixels(cols, rows, GL_RGB, GL_UNSIGNED_BYTE, data);
+    }
+
+    qglPixelZoom(1.0, 1.0);
+
+    qglEnable(GL_TEXTURE_2D);
+#endif
+}
+
+/*
+================
+AddBox
+================
+*/
+void AddBox(float x, float y, float w, float h) {
+    vec4_t quadVerts[4];
+    vec2_t texCoords[4];
+    vec4_t color;
+
+    R_IssuePendingRenderCommands();
+
+    GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE);
+
+    if (glRefConfig.framebufferObject)
+    {
+        FBO_Bind(tr.renderFbo);
+    }
+
+    color[0] = backEnd.color2D[0] / 255.0;
+    color[1] = backEnd.color2D[1] / 255.0;
+    color[2] = backEnd.color2D[2] / 255.0;
+    color[3] = backEnd.color2D[3] / 255.0;
+    
+    VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+    VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
+
+    VectorSet2(texCoords[0], 0.0f, 0.0f);
+    VectorSet2(texCoords[1], 1.0f, 0.0f);
+    VectorSet2(texCoords[2], 1.0f, 1.0f);
+    VectorSet2(texCoords[3], 0.0f, 1.0f);
+
+    GLSL_BindProgram(&tr.textureColorShader);
+    
+    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+
+    RB_InstantQuad2(quadVerts, texCoords);
+}
+
+/*
+================
+DrawBox
+================
+*/
+void DrawBox(float x, float y, float w, float h) {
+    vec4_t quadVerts[4];
+    vec2_t texCoords[4];
+    vec4_t color;
+
+    R_IssuePendingRenderCommands();
+
+    GL_BindToTMU(tr.whiteImage, TB_COLORMAP);
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA | GLS_SRCBLEND_SRC_ALPHA);
+
+    if (glRefConfig.framebufferObject)
+    {
+        FBO_Bind(tr.renderFbo);
+    }
+
+    color[0] = backEnd.color2D[0] / 255.0;
+    color[1] = backEnd.color2D[1] / 255.0;
+    color[2] = backEnd.color2D[2] / 255.0;
+    color[3] = backEnd.color2D[3] / 255.0;
+    
+    VectorSet4(quadVerts[0], x,     y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[1], x + w, y,     0.0f, 1.0f);
+    VectorSet4(quadVerts[2], x + w, y + h, 0.0f, 1.0f);
+    VectorSet4(quadVerts[3], x,     y + h, 0.0f, 1.0f);
+
+    VectorSet2(texCoords[0], 0.0f, 0.0f);
+    VectorSet2(texCoords[1], 1.0f, 0.0f);
+    VectorSet2(texCoords[2], 1.0f, 1.0f);
+    VectorSet2(texCoords[3], 0.0f, 1.0f);
+
+    GLSL_BindProgram(&tr.textureColorShader);
+    
+    GLSL_SetUniformMat4(&tr.textureColorShader, UNIFORM_MODELVIEWPROJECTIONMATRIX, glState.modelviewProjection);
+    GLSL_SetUniformVec4(&tr.textureColorShader, UNIFORM_COLOR, color);
+
+    RB_InstantQuad2(quadVerts, texCoords);
+}
+
+/*
+================
+DrawLineLoop
+================
+*/
+void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask) {
+    // FIXME: unimplemented (GL2)
+#if 0
+    int        i;
+
+    R_IssuePendingRenderCommands();
+
+    qglDisable(GL_TEXTURE_2D);
+
+    if (stipple_factor) {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(stipple_factor, stipple_mask);
+    }
+
+    qglBegin(GL_LINE_LOOP);
+
+    for (i = 0; i < count; i++) {
+        qglVertex2f(points[i][0], points[i][1]);
+    }
+
+    qglEnd();
+
+    qglEnable(GL_TEXTURE_2D);
+
+    if (stipple_factor) {
+        qglDisable(GL_LINE_STIPPLE);
+    }
+#endif
+}
+
+/*
+================
+Set2DWindow
+================
+*/
+void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f) {
+    mat4_t matrix;
+
+    R_IssuePendingRenderCommands();
+
+    backEnd.projection2D = qtrue;
+    backEnd.last2DFBO = glState.currentFBO;
+
+    qglViewport(x, y, w, h);
+    qglScissor(x, y, w, h);
+
+    Mat4Ortho(left, right, bottom, top, n, f, matrix);
+    GL_SetProjectionMatrix(matrix);
+    Mat4Identity(matrix);
+    GL_SetModelviewMatrix(matrix);
+
+    GL_State(GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
+
+    GL_Cull(CT_TWO_SIDED);
+
+    if (!backEnd.projection2D)
+    {
+        backEnd.refdef.time = ri.Milliseconds();
+        backEnd.projection2D = qtrue;
+        backEnd.refdef.floatTime = backEnd.refdef.time / 1000.0;
+    }
+}
+
+/*
+================
+RE_Scissor
+================
+*/
+void RE_Scissor(int x, int y, int width, int height) {
+    qglEnable(GL_SCISSOR_TEST);
+    qglScissor(x, y, width, height);
+}
diff --git a/code/renderergl2/tr_extensions.c b/code/renderergl2/tr_extensions.c
index ebc985a9..856526bf 100644
--- a/code/renderergl2/tr_extensions.c
+++ b/code/renderergl2/tr_extensions.c
@@ -45,6 +45,17 @@ void GLimp_InitExtraExtensions(void)
 	if (strstr((char *)qglGetString(GL_RENDERER), "Intel"))
 		glRefConfig.intelGraphics = qtrue;
 
+	if (qglesMajorVersion)
+	{
+		glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_SHORT;
+		glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned short);
+	}
+	else
+	{
+		glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_INT;
+		glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned int);
+	}
+
 	// set DSA fallbacks
 #define GLE(ret, name, ...) qgl##name = GLDSA_##name;
 	QGL_EXT_direct_state_access_PROCS;
@@ -53,8 +64,107 @@ void GLimp_InitExtraExtensions(void)
 	// GL function loader, based on https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
 #define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name);
 
+	//
+	// OpenGL ES extensions
+	//
+	if (qglesMajorVersion)
+	{
+		if (!r_allowExtensions->integer)
+			goto done;
+
+		extension = "GL_EXT_occlusion_query_boolean";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.occlusionQuery = qtrue;
+			glRefConfig.occlusionQueryTarget = GL_ANY_SAMPLES_PASSED;
+
+			if (qglesMajorVersion >= 3) {
+				QGL_ARB_occlusion_query_PROCS;
+			} else {
+				// GL_EXT_occlusion_query_boolean uses EXT suffix
+#undef GLE
+#define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name "EXT");
+
+				QGL_ARB_occlusion_query_PROCS;
+
+#undef GLE
+#define GLE(ret, name, ...) qgl##name = (name##proc *) SDL_GL_GetProcAddress("gl" #name);
+			}
+
+			ri.Printf(PRINT_ALL, result[glRefConfig.occlusionQuery], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_NV_read_depth
+		extension = "GL_NV_read_depth";
+		if (SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.readDepth = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.readDepth], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_NV_read_stencil
+		extension = "GL_NV_read_stencil";
+		if (SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.readStencil = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.readStencil], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_EXT_shadow_samplers
+		extension = "GL_EXT_shadow_samplers";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.shadowSamplers = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.shadowSamplers], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_OES_standard_derivatives
+		extension = "GL_OES_standard_derivatives";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.standardDerivatives = qtrue;
+			ri.Printf(PRINT_ALL, result[glRefConfig.standardDerivatives], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		// GL_OES_element_index_uint
+		extension = "GL_OES_element_index_uint";
+		if (qglesMajorVersion >= 3 || SDL_GL_ExtensionSupported(extension))
+		{
+			glRefConfig.vaoCacheGlIndexType = GL_UNSIGNED_INT;
+			glRefConfig.vaoCacheGlIndexSize = sizeof(unsigned int);
+			ri.Printf(PRINT_ALL, result[1], extension);
+		}
+		else
+		{
+			ri.Printf(PRINT_ALL, result[2], extension);
+		}
+
+		goto done;
+	}
+
 	// OpenGL 1.5 - GL_ARB_occlusion_query
 	glRefConfig.occlusionQuery = qtrue;
+	glRefConfig.occlusionQueryTarget = GL_SAMPLES_PASSED;
 	QGL_ARB_occlusion_query_PROCS;
 
 	// OpenGL 3.0 - GL_ARB_framebuffer_object
@@ -146,18 +256,6 @@ void GLimp_InitExtraExtensions(void)
 		ri.Printf(PRINT_ALL, result[2], extension);
 	}
 
-	// Determine GLSL version
-	if (1)
-	{
-		char version[256];
-
-		Q_strncpyz(version, (char *)qglGetString(GL_SHADING_LANGUAGE_VERSION), sizeof(version));
-
-		sscanf(version, "%d.%d", &glRefConfig.glslMajorVersion, &glRefConfig.glslMinorVersion);
-
-		ri.Printf(PRINT_ALL, "...using GLSL version %s\n", version);
-	}
-
 	glRefConfig.memInfo = MI_NONE;
 
 	// GL_NVX_gpu_memory_info
@@ -249,5 +347,26 @@ void GLimp_InitExtraExtensions(void)
 		ri.Printf(PRINT_ALL, result[2], extension);
 	}
 
+done:
+
+	// Determine GLSL version
+	if (1)
+	{
+		char version[256], *version_p;
+
+		Q_strncpyz(version, (char *)qglGetString(GL_SHADING_LANGUAGE_VERSION), sizeof(version));
+
+		// Skip leading text such as "OpenGL ES GLSL ES "
+		version_p = version;
+		while ( *version_p && !isdigit( *version_p ) )
+		{
+			version_p++;
+		}
+
+		sscanf(version_p, "%d.%d", &glRefConfig.glslMajorVersion, &glRefConfig.glslMinorVersion);
+
+		ri.Printf(PRINT_ALL, "...using GLSL version %s\n", version);
+	}
+
 #undef GLE
 }
diff --git a/code/renderergl2/tr_fbo.c b/code/renderergl2/tr_fbo.c
index 26f50c3f..223cbe7f 100644
--- a/code/renderergl2/tr_fbo.c
+++ b/code/renderergl2/tr_fbo.c
@@ -170,9 +170,13 @@ void FBO_CreateBuffer(FBO_t *fbo, int format, int index, int multisample)
 	}
 
 	absent = *pRenderBuffer == 0;
-	if (absent)
+	if (absent) {
 		qglGenRenderbuffers(1, pRenderBuffer);
 
+		// workaround AMD Windows driver requiring bind to create renderbuffer
+		GL_BindRenderbuffer(*pRenderBuffer);
+	}
+
 	if (multisample && glRefConfig.framebufferMultisample)
 		qglNamedRenderbufferStorageMultisampleEXT(*pRenderBuffer, multisample, format, fbo->width, fbo->height);
 	else
@@ -644,10 +648,30 @@ void FBO_FastBlit(FBO_t *src, ivec4_t srcBox, FBO_t *dst, ivec4_t dstBox, int bu
 		int width  = dst ? dst->width  : glConfig.vidWidth;
 		int height = dst ? dst->height : glConfig.vidHeight;
 
+		qglScissor(0, 0, width, height);
+
 		VectorSet4(dstBoxFinal, 0, 0, width, height);
 	}
 	else
 	{
+		ivec4_t scissorBox;
+
+		Vector4Copy(dstBox, scissorBox);
+
+		if (scissorBox[2] < 0)
+		{
+			scissorBox[0] += scissorBox[2];
+			scissorBox[2] = fabsf(scissorBox[2]);
+		}
+
+		if (scissorBox[3] < 0)
+		{
+			scissorBox[1] += scissorBox[3];
+			scissorBox[3] = fabsf(scissorBox[3]);
+		}
+
+		qglScissor(scissorBox[0], scissorBox[1], scissorBox[2], scissorBox[3]);
+
 		VectorSet4(dstBoxFinal, dstBox[0], dstBox[1], dstBox[0] + dstBox[2], dstBox[1] + dstBox[3]);
 	}
 
diff --git a/code/renderergl2/tr_flares.c b/code/renderergl2/tr_flares.c
index fc83df7b..0ad12be0 100644
--- a/code/renderergl2/tr_flares.c
+++ b/code/renderergl2/tr_flares.c
@@ -79,7 +79,7 @@ typedef struct flare_s {
 	vec3_t		color;
 } flare_t;
 
-#define		MAX_FLARES		128
+#define		MAX_FLARES		256
 
 flare_t		r_flareStructs[MAX_FLARES];
 flare_t		*r_activeFlares, *r_inactiveFlares;
@@ -478,6 +478,14 @@ void RB_RenderFlares (void) {
 		return;
 	}
 
+	if ( r_flares->modified ) {
+		if ( qglesMajorVersion >= 1 && !glRefConfig.readDepth ) {
+			ri.Printf( PRINT_WARNING, "OpenGL ES needs GL_NV_read_depth to read depth to determine if flares are visible\n" );
+			ri.Cvar_Set( "r_flares", "0" );
+		}
+		r_flares->modified = qfalse;
+	}
+
 	if(r_flareCoeff->modified)
 	{
 		R_SetFlareCoeff();
diff --git a/code/renderergl2/new/tr_font.cpp b/code/renderergl2/tr_font.cpp
similarity index 51%
rename from code/renderergl2/new/tr_font.cpp
rename to code/renderergl2/tr_font.cpp
index a3d763df..021a5c48 100644
--- a/code/renderergl2/new/tr_font.cpp
+++ b/code/renderergl2/tr_font.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,16 +22,41 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tr_font.cpp -- font rendering
 
-#include "../tr_local.h"
+#include "tr_local.h"
 
 #define MAX_LOADED_FONTS 255
 
+static fontheader_sgl_t s_loadedFonts_sgl[MAX_LOADED_FONTS];
+static int s_numLoadedFonts_sgl = 0;
 static fontheader_t s_loadedFonts[MAX_LOADED_FONTS];
 static int s_numLoadedFonts = 0;
 static float s_fontHeightScale = 1.0;
 static float s_fontGeneralScale = 1.0;
 static float s_fontZ = 0.0;
 
+void R_ShutdownFont() {
+    int i;
+    fontheader_t *header;
+    fontheader_sgl_t *header_sgl;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (header->charTable) {
+            ri.Free(header->charTable);
+            header->charTable = NULL;
+        }
+
+        memset(header, 0, sizeof(*header));
+    }
+
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
+    {
+        header_sgl = &s_loadedFonts_sgl[i];
+        memset(header_sgl, 0, sizeof(*header_sgl));
+    }
+}
+
 void R_SetFontHeightScale(float scale)
 {
     s_fontHeightScale = scale;
@@ -47,20 +72,75 @@ void R_SetFontZ(float zed)
     s_fontZ = zed;
 }
 
-fontheader_t* R_LoadFont(const char* name)
+static int CodeSearch(const fontheader_t* font, unsigned short uch) {
+    int mid;
+    int l, r;
+
+    r = font->charTableLength;
+    l = 0;
+    while (l < r) {
+        mid = (l + r) / 2;
+        
+        if (font->charTable[mid].cp > uch) {
+            r = (l + r) / 2;
+            continue;
+        }
+
+        if (uch == font->charTable[mid].cp) {
+            return (l + r) / 2;
+        }
+
+        l = mid + 1;
+    }
+
+    if (uch != font->charTable[l].cp) {
+        return -1;
+    }
+
+    return l;
+}
+
+static qboolean DBCSIsLeadByte(const fontheader_t* font, unsigned short uch) {
+    // Byte ranges found in Wikipedia articles with relevant search strings in each case
+    switch (font->codePage) {
+    case 932:
+        // Shift_jis
+        return ((uch >= 0x81) && (uch <= 0x9F)) ||
+            ((uch >= 0xE0) && (uch <= 0xFC));
+        // Lead bytes F0 to FC may be a Microsoft addition.
+    case 936:
+        // GBK
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 949:
+        // Korean Wansung KS C-5601-1987
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 950:
+        // Big5
+        return (uch >= 0x81) && (uch <= 0xFE);
+    case 1361:
+        // Korean Johab KS C-5601-1992
+        return
+            ((uch >= 0x84) && (uch <= 0xD3)) ||
+            ((uch >= 0xD8) && (uch <= 0xDE)) ||
+            ((uch >= 0xE0) && (uch <= 0xF9));
+    }
+    return false;
+}
+
+fontheader_sgl_t* R_LoadFont_sgl(const char* name)
 {
     int i;
     char* theFile;
-    fontheader_t* header;
+    fontheader_sgl_t* header;
     char* ref;
     const char* token;
     qboolean error;
 
     error = qfalse;
 
-    for (i = 0; i < s_numLoadedFonts; i++)
+    for (i = 0; i < s_numLoadedFonts_sgl; i++)
     {
-        header = &s_loadedFonts[i];
+        header = &s_loadedFonts_sgl[i];
         if (!Q_stricmp(name, header->name)) {
             return header;
         }
@@ -72,14 +152,13 @@ fontheader_t* R_LoadFont(const char* name)
         return NULL;
     }
 
-    va("fonts/%s.RitualFont", name);
     if (ri.FS_ReadFile(va("fonts/%s.RitualFont", name), (void**)&theFile) == -1)
     {
         ri.Printf(PRINT_WARNING, "LoadFont: Couldn't load font %s\n", name);
-        return 0;
+        return NULL;
     }
 
-    header = &s_loadedFonts[s_numLoadedFonts];
+    header = &s_loadedFonts_sgl[s_numLoadedFonts_sgl];
     header->height = 0.0;
     header->aspectRatio = 0.0;
     Q_strncpyz(header->name, name, sizeof(header->name));
@@ -152,7 +231,7 @@ fontheader_t* R_LoadFont(const char* name)
                 header->locations[i].pos[1] = atof(COM_Parse(&ref)) * header->aspectRatio / 256.0;
                 header->locations[i].size[0] = atof(COM_Parse(&ref)) / 256.0;
                 header->locations[i].size[1] = atof(COM_Parse(&ref)) * header->aspectRatio / 256.0;
-
+            
                 token = COM_Parse(&ref);
                 if (Q_stricmp(token, "}"))
                 {
@@ -211,14 +290,228 @@ fontheader_t* R_LoadFont(const char* name)
     }
     else
     {
-        s_numLoadedFonts++;
+        s_numLoadedFonts_sgl++;
         return header;
     }
 
     return NULL;
 }
 
-void R_LoadFontShader(fontheader_t* font)
+fontheader_t* R_LoadFont(const char* name) {
+    int i;
+    char* theFile;
+    fontheader_t* header;
+    char* ref;
+    const char* token;
+    qboolean error;
+    char* pRitFontNames[32];
+
+    error = qfalse;
+
+    for (i = 0; i < s_numLoadedFonts; i++)
+    {
+        header = &s_loadedFonts[i];
+        if (!Q_stricmp(name, header->name)) {
+            return header;
+        }
+    }
+
+    if (s_numLoadedFonts >= MAX_LOADED_FONTS)
+    {
+        ri.Printf(PRINT_WARNING, "LoadFont: Too many fonts loaded!  Couldn't load %s\n", name);
+        return NULL;
+    }
+
+    if (ri.FS_ReadFile(va("fonts/%s.RitualFont", name), (void**)&theFile) == -1)
+    {
+        ri.Printf(PRINT_WARNING, "LoadFont: Couldn't load font %s\n", name);
+        return NULL;
+    }
+
+    memset(pRitFontNames, 0, sizeof(pRitFontNames));
+    ref = theFile;
+    header = &s_loadedFonts[s_numLoadedFonts];
+
+    token = COM_Parse(&ref);
+    if (Q_stricmp(token, "RitFontList"))
+    {
+        if (Q_stricmp(token, "RitFont"))
+        {
+            ri.Printf(PRINT_WARNING, "LoadFont: Not actual font %s\n", name);
+            return NULL;
+        }
+        header->numPages = 0;
+    }
+    else
+    {
+        while (ref && !error)
+        {
+            token = COM_Parse(&ref);
+            if (!Q_stricmp(token, "CodePage"))
+            {
+                header->codePage = atoi(COM_Parse(&ref));
+            }
+            else if (!Q_stricmp(token, "Chars"))
+            {
+                header->charTableLength = atoi(COM_Parse(&ref));
+                header->charTable = (fontchartable_t*)ri.Malloc(header->charTableLength * sizeof(fontchartable_t));
+                if (!header->charTable)
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else if (!Q_stricmp(token, "Pages"))
+            {
+                header->numPages = atoi(COM_Parse(&ref));
+            }
+            else if (!Q_stricmp(token, "RitFontName"))
+            {
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "{"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+
+                for (i = 0; i < header->numPages; i++)
+                {
+                    token = COM_Parse(&ref);
+                    if (!token[0])
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    pRitFontNames[i] = (char*)ri.Malloc(strlen(token) + 1);
+                    if (!pRitFontNames[i])
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Couldn't alloc mem %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    strcpy(pRitFontNames[i], token);
+                }
+
+                if (error) {
+                    break;
+                }
+
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "}"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else if (!Q_stricmp(token, "CharTable"))
+            {
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "{"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+
+                for (i = 0; i < header->charTableLength; i++) {
+                    token = COM_Parse(&ref);
+                    if (Q_stricmp(token, "{"))
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+
+                    header->charTable[i].cp = atoi(COM_Parse(&ref));
+                    header->charTable[i].index = atoi(COM_Parse(&ref));
+                    header->charTable[i].loc = atoi(COM_Parse(&ref));
+                    atoi(COM_Parse(&ref));
+
+                    token = COM_Parse(&ref);
+                    if (Q_stricmp(token, "}"))
+                    {
+                        ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                        error = qtrue;
+                        break;
+                    }
+                }
+
+                if (error) {
+                    break;
+                }
+
+                token = COM_Parse(&ref);
+                if (Q_stricmp(token, "}"))
+                {
+                    ri.Printf(PRINT_WARNING, "LoadFont: Bad Format %s\n", name);
+                    error = qtrue;
+                    break;
+                }
+            }
+            else
+            {
+                ri.Printf(PRINT_WARNING, "LoadFont: Bad Token %s\n", name);
+                error = qtrue;
+                break;
+            }
+        }
+    }
+
+    ri.FS_FreeFile(theFile);
+
+    if (!header->numPages)
+    {
+        header->charTableLength = 0;
+        header->charTable = NULL;
+        header->sgl[0] = R_LoadFont_sgl(name);
+        if (!header->sgl[0])
+        {
+            ri.Printf(PRINT_WARNING, "LoadFont: failed %s\n", name);
+            return NULL;
+        }
+    }
+    else
+    {
+        for (i = 0; i < header->numPages; i++)
+        {
+            header->sgl[i] = R_LoadFont_sgl(pRitFontNames[i]);
+            if (!header->sgl[i])
+            {
+                ri.Printf(PRINT_WARNING, "LoadFont: failed %s(%s)\n", pRitFontNames[i], name);
+                error = qtrue;
+                break;
+            }
+        }
+
+        // Free all allocated strings
+        for (i = 0; i < header->numPages; i++) {
+            ri.Free(pRitFontNames[i]);
+        }
+
+        if (error)
+        {
+            if (header->charTable) {
+                ri.Free(header->charTable);
+            }
+
+            header->numPages = 0;
+            header->charTableLength = 0;
+            header->charTable = NULL;
+        }
+    }
+
+    strcpy(header->name, name);
+    s_numLoadedFonts++;
+    return header;
+}
+
+void R_LoadFontShader(fontheader_sgl_t* font)
 {
     int i;
     int save;
@@ -242,8 +535,8 @@ void R_LoadFontShader(fontheader_t* font)
         {
             if (fontshader->stages[0] != NULL && fontshader->stages[0]->active)
             {
-                fontshader->stages[0]->rgbGen = CGEN_GLOBAL_COLOR;
-                fontshader->stages[0]->alphaGen = AGEN_GLOBAL_ALPHA;
+                fontshader->stages[0]->rgbGen = CGEN_ENTITY;
+                fontshader->stages[0]->alphaGen = AGEN_ENTITY;
             }
         }
 
@@ -255,7 +548,7 @@ void R_LoadFontShader(fontheader_t* font)
     }
 }
 
-void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, qboolean bVirtualScreen) {
+void R_DrawString_sgl(fontheader_sgl_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
     float charHeight;
     float startx, starty;
     int i;
@@ -264,14 +557,25 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     i = 0;
     startx = x;
     starty = y;
-    fWidthScale = (double)glConfig.vidWidth / 640.0;
-    fHeightScale = (double)glConfig.vidHeight / 480.0;
+    if (pvVirtualScreen) {
+        if (pvVirtualScreen[0]) {
+            fWidthScale = pvVirtualScreen[0];
+        } else {
+            fWidthScale = (double)glConfig.vidWidth / 640.0;
+        }
+
+        if (pvVirtualScreen[1]) {
+            fHeightScale = pvVirtualScreen[1];
+        } else {
+            fHeightScale = (double)glConfig.vidHeight / 480.0;
+        }
+    }
 
     if (!font) {
         return;
     }
 
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
 
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
@@ -281,6 +585,9 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
         R_LoadFontShader(font);
     }
 
+    Vector4Copy(backEnd.color2D, backEnd.entity2D.e.shaderRGBA);
+    backEnd.currentEntity = &backEnd.entity2D;
+
     charHeight = s_fontHeightScale * font->height * s_fontGeneralScale;
     RB_BeginSurface((shader_t*)font->shader, 0, 0);
 
@@ -300,9 +607,8 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
         case '\t':
             indirected = font->indirection[32];
             if (indirected == -1) {
-                Com_DPrintf("R_DrawString: no space-character in font!\n");
-            }
-            else {
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no space-character in font!\n");
+            } else {
                 x = s_fontGeneralScale * font->locations[indirected].size[0] * 256.0 * 3.0 + x;
             }
             break;
@@ -321,19 +627,17 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
             indirected = font->indirection[c];
             if (indirected == -1)
             {
-                Com_DPrintf("R_DrawString: no 0x%02x-character in font!\n", c);
+                ri.Printf(PRINT_DEVELOPER, "R_DrawString: no 0x%02x-character in font!\n", c);
                 indirected = font->indirection['?'];
                 if (indirected == -1) {
-                    Com_DPrintf("R_DrawString: no '?' character in font!\n");
+                    ri.Printf(PRINT_DEVELOPER, "R_DrawString: no '?' character in font!\n");
                     break;
-                }
+				}
                 // set the indirection for the next time
-                font->indirection[c] = indirected;
+				font->indirection[c] = indirected;
             }
 
-            if (tess.numVertexes + 4 >= SHADER_MAX_VERTEXES || tess.numIndexes + 6 >= SHADER_MAX_INDEXES) {
-                RB_CheckOverflow(4, 6);
-            }
+            RB_CHECKOVERFLOW(4, 6);
 
             loc = &font->locations[indirected];
 
@@ -369,7 +673,7 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
             tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
             tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 2;
 
-            if (bVirtualScreen)
+            if (pvVirtualScreen)
             {
                 // scale the string properly if virtual screen
                 tess.xyz[tess.numVertexes][0] *= fWidthScale;
@@ -392,7 +696,96 @@ void R_DrawString(fontheader_t* font, const char* text, float x, float y, int ma
     RB_EndSurface();
 }
 
-void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen) {
+    int i;
+    int code;
+    unsigned short uch;
+    char buffer[512];
+    size_t buflen;
+    int cursgl;
+    float curX, curY;
+    float curHeight;
+    
+    if (!font->numPages) {
+        if (font->sgl[0]) {
+            R_DrawString_sgl(font->sgl[0], text, x, y, maxlen, pvVirtualScreen);
+        }
+        return;
+    }
+
+    if (maxlen < 0) {
+        maxlen = strlen(text);
+    }
+    
+    curX = x;
+    curY = y;
+    curHeight = 0.f;
+    cursgl = -1;
+    buflen = 0;
+
+    i = 0;
+    while(i < maxlen) {
+        fontchartable_t* ct;
+
+        uch = text[i];
+        i++;
+
+        if (DBCSIsLeadByte(font, uch)) {
+            uch = (uch << 8) | text[i];
+            i++;
+        }
+
+        if (!uch) {
+            break;
+        }
+
+        if (uch == '\n' || uch == '\r') {
+            buffer[buflen] = 0;
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
+            
+            curX = x;
+            curHeight = 0.f;
+            buflen = 0;
+            if (uch == '\n') {
+                curY += font->sgl[0]->height * s_fontGeneralScale * s_fontHeightScale;
+            }
+
+            continue;
+        }
+
+        code = CodeSearch(font, uch);
+        if (code < 0) {
+            continue;
+        }
+
+        if (cursgl == -1) {
+            cursgl = font->charTable[code].index;
+        }
+
+        ct = &font->charTable[code];
+        if (cursgl != ct->index || buflen >= ARRAY_LEN(buffer) - 2) {
+            buffer[buflen] = 0;
+            R_DrawString_sgl(font->sgl[cursgl], buffer, curX, curY, maxlen, pvVirtualScreen);
+
+            curX += curHeight;
+            curHeight = 0.f;
+            buflen = 0;
+            ct = &font->charTable[code];
+            cursgl = ct->index;
+        }
+
+        buffer[buflen++] = ct->loc;
+        curHeight += font->sgl[cursgl]->locations[ct->loc].size[0] * 256.0f;
+    }
+
+    if (buflen)
+    {
+        buffer[buflen] = 0;
+        R_DrawString_sgl(font->sgl[cursgl], buffer, curX, y, buflen, pvVirtualScreen);
+    }
+}
+
+void R_DrawFloatingString_sgl(fontheader_sgl_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
     shader_t* fontshader;
     qhandle_t fsh;
     float charWidth, charHeight;
@@ -404,8 +797,7 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         return;
     }
 
-
-    R_SyncRenderThread();
+    R_IssuePendingRenderCommands();
     if (font->trhandle != r_sequencenumber) {
         font->shader = NULL;
     }
@@ -435,12 +827,12 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         unsigned char c;
         int indirected;
         letterloc_t* loc;
-
+        
         c = text[i];
         indirected = font->indirection[c];
         if (indirected == -1)
         {
-            Com_Printf("R_DrawFloatingString: no 0x%02x-character in font!\n", c);
+            ri.Printf(PRINT_ALL, "R_DrawFloatingString: no 0x%02x-character in font!\n", c);
             continue;
         }
 
@@ -485,8 +877,10 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
         verts[0].xyz[1] = verts[1].xyz[1] + tr.refdef.viewaxis[1][1] * charWidth;
         verts[0].xyz[2] = verts[1].xyz[2] + tr.refdef.viewaxis[1][2] * charWidth;
         verts[0].xyz[0] = verts[1].xyz[0] + tr.refdef.viewaxis[1][0] * charWidth;
-
-        RE_AddPolyToScene(fsh, 4, verts, 1);
+    
+        if (RE_AddPolyToScene2(fsh, 4, verts, 0)) {
+            ++tr.refdef.numPolys;
+        }
 
         pos[0] = verts[2].xyz[0];
         pos[1] = verts[2].xyz[1];
@@ -494,16 +888,20 @@ void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org
     }
 }
 
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen) {
+    return R_DrawFloatingString_sgl(font->sgl[0], text, org, color, scale, maxlen);
+}
+
 float R_GetFontHeight(const fontheader_t* font)
 {
-    if (!font) {
+    if (!font || !font->sgl[0]) {
         return 0.0;
     }
 
-    return font->height * s_fontGeneralScale * s_fontHeightScale;
+    return font->sgl[0]->height * s_fontGeneralScale * s_fontHeightScale;
 }
 
-float R_GetFontStringWidth(const fontheader_t* font, const char* s)
+float R_GetFontStringWidth_sgl(const fontheader_sgl_t* font, const char* s)
 {
     float widths;
     int i;
@@ -519,14 +917,13 @@ float R_GetFontStringWidth(const fontheader_t* font, const char* s)
         int indirected;
         char c = *s;
 
-        if (c == 9)
+        if (c == '\t')
         {
             indirected = font->indirection[32];
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0] * 3.0;
-            }
-            else {
-                Com_Printf("R_GetFontStringWidth: no space-character in font!\n");
+            } else {
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no space-character in font!\n");
             }
         }
         else
@@ -534,12 +931,52 @@ float R_GetFontStringWidth(const fontheader_t* font, const char* s)
             indirected = font->indirection[c];
             if (indirected != -1) {
                 widths += font->locations[indirected].size[0];
-            }
-            else {
-                Com_Printf("R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
+            } else {
+                ri.Printf(PRINT_ALL, "R_GetFontStringWidth: no 0x%02x-character in font!\n", c);
             }
         }
     }
 
     return widths * s_fontGeneralScale * 256.0;
 }
+
+float R_GetFontStringWidth(const fontheader_t* font, const char* s)
+{
+    int i;
+    int code;
+    fontchartable_t* ct;
+    float width = 0.f;
+
+    if (!font->numPages) {
+        return R_GetFontStringWidth_sgl(font->sgl[0], s);
+    }
+
+    i = 0;
+    while(s[i]) {
+        unsigned char uch = s[i++];
+
+        if (DBCSIsLeadByte(font, uch)) {
+            uch = (uch << 8) | s[i++];
+            if (!uch) {
+                break;
+            }
+        }
+
+        if (uch == '\t') {
+            code = CodeSearch(font, ' ');
+            if (code >= 0) {
+                ct = &font->charTable[code];
+                width += font->sgl[ct->index]->locations[ct->loc].size[0] * 3.f;
+            }
+        }
+        else {
+            code = CodeSearch(font, uch);
+            if (code >= 0) {
+                ct = &font->charTable[code];
+                width += font->sgl[ct->index]->locations[ct->loc].size[0];
+            }
+        }
+    }
+
+    return width;
+}
diff --git a/code/renderergl2/tr_ghost.cpp b/code/renderergl2/tr_ghost.cpp
new file mode 100644
index 00000000..2c767e8d
--- /dev/null
+++ b/code/renderergl2/tr_ghost.cpp
@@ -0,0 +1,1662 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_ghost.cpp
+
+#include "tr_local.h"
+#include "tr_ghost.h"
+
+GhostManager ghostManager;
+
+int frameTime;
+int lastTime;
+
+/*
+====================
+RandomizeRange
+
+====================
+*/
+float RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+Particle::Particle
+
+Initializes the particle with the specified parameters
+====================
+*/
+Particle::Particle(
+    Vector   pos,
+    Vector   vel,
+    Vector   acc,
+    int      srcColor,
+    int      dstColor,
+    float    colorRate,
+    qboolean wavy,
+    float    wavyDist,
+    float    currentTime,
+    float    dieTime,
+    float    maxspeed,
+    Vector   parentOrg,
+    qboolean swarm,
+    int      freq,
+    int      delta
+)
+{
+    m_position     = pos;
+    m_realposition = pos;
+    m_velocity     = vel;
+    m_acceleration = acc;
+
+    m_srcColor  = srcColor;
+    m_dstColor  = dstColor;
+    m_color     = srcColor;
+    m_colorRate = colorRate;
+
+    m_wavy       = wavy;
+    m_wavyDist   = wavyDist;
+    m_wavyOffset = RandomizeRange(-wavyDist, wavyDist);
+
+    m_swarm          = swarm;
+    m_swarmfrequency = freq;
+    m_swarmdelta     = delta;
+
+    m_startTime = currentTime;
+    m_dieTime   = dieTime;
+    m_life      = dieTime - currentTime;
+
+    m_maxspeed     = maxspeed;
+    m_parentOrigin = parentOrg;
+
+    Vector tempvec = m_velocity;
+    VectorNormalize(tempvec);
+
+    m_perp.x = tempvec.x * cos(M_PI / 2) - tempvec.y * sin(M_PI / 2);
+    m_perp.y = tempvec.x * sin(M_PI / 2) + tempvec.y * cos(M_PI / 2);
+
+    m_srcR = (m_srcColor & 0xff);
+    m_srcG = (m_srcColor & 0xff00) >> 8;
+    m_srcB = (m_srcColor & 0xff0000) >> 16;
+
+    m_dstR = (m_dstColor & 0xff);
+    m_dstG = (m_dstColor & 0xff00) >> 8;
+    m_dstB = (m_dstColor & 0xff0000) >> 16;
+
+    m_deltaR = m_dstR - m_srcR;
+    m_deltaG = m_dstG - m_srcG;
+    m_deltaB = m_dstB - m_srcB;
+}
+
+/*
+====================
+Particle::Update
+
+Updates the particle based on the current time
+====================
+*/
+void Particle::Update(float currentTime)
+{
+    int    r, g, b;
+    float  ftime;
+    float  time2;
+    float  factor;
+    Vector offset;
+
+    ftime = frameTime / 1000.0;
+    time2 = Square(ftime) * 0.5;
+
+    if (m_swarm) {
+        if (!(rand() % m_swarmfrequency)) {
+            m_velocity[0] = crandom() * m_maxspeed;
+            m_velocity[1] = crandom() * m_maxspeed;
+            m_velocity[2] = crandom() * m_maxspeed;
+        }
+
+        if (m_parentOrigin[0] > m_position[0]) {
+            m_velocity[0] += m_swarmdelta;
+        } else {
+            m_velocity[0] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[1] > m_position[1]) {
+            m_velocity[1] += m_swarmdelta;
+        } else {
+            m_velocity[1] -= m_swarmdelta;
+        }
+        if (m_parentOrigin[2] > m_position[2]) {
+            m_velocity[2] += m_swarmdelta;
+        } else {
+            m_velocity[2] -= m_swarmdelta;
+        }
+    }
+
+    m_position = m_realposition;
+
+    m_position += m_velocity * ftime + m_acceleration * time2;
+    m_velocity += m_acceleration * ftime;
+    m_realposition = m_position;
+
+    if (m_wavy) {
+        offset = m_perp * sin(currentTime + m_wavyOffset) * (m_wavyOffset + m_wavyDist);
+        m_position += offset;
+    }
+
+    factor = 1.0 - (m_dieTime - currentTime) / m_life;
+    r      = m_deltaR * factor;
+    g      = m_deltaG * factor;
+    b      = m_deltaB * factor;
+
+    m_color = (r) | (g << 8) | (b << 8);
+}
+
+/*
+====================
+Particle::GetDieTime
+
+Returns the time at which the particle stops
+====================
+*/
+float Particle::GetDieTime()
+{
+    return m_dieTime;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+
+Initializes the particle emitter with specified parameters
+====================
+*/
+ParticleEmitter::ParticleEmitter(
+    Vector   position,
+    float    minSpeed,
+    float    maxSpeed,
+    float    angle,
+    float    angleVar,
+    float    minAccSpeed,
+    float    maxAccSpeed,
+    float    accAngle,
+    float    accAngleVar,
+    float    minRate,
+    float    maxRate,
+    int      srcColor,
+    int      dstColor,
+    float    minColorRate,
+    float    maxColorRate,
+    qboolean wavy,
+    float    minWavyDist,
+    float    maxWavyDist,
+    float    minLife,
+    float    maxLife,
+    qboolean particles,
+    qboolean gravityWell,
+    float    gravityWellStrength,
+    qboolean ballLightning,
+    int      minBallLightningRadius,
+    int      maxBallLightningRadius,
+    float    lightningVar,
+    int      lightningSubdivisions,
+    qboolean swarm,
+    int      swarmfreq,
+    int      swarmdelta
+)
+{
+    m_position = position;
+
+    m_minSpeed = minSpeed;
+    m_maxSpeed = maxSpeed;
+
+    m_angle       = angle;
+    m_angleVar    = angleVar;
+    m_minAccSpeed = minAccSpeed;
+    m_maxAccSpeed = maxAccSpeed;
+    m_accAngle    = accAngle;
+    m_accAngleVar = accAngleVar;
+
+    m_maxRate = 1.0 / maxRate;
+    m_minRate = 1.0 / minRate;
+
+    m_srcColor     = srcColor;
+    m_dstColor     = dstColor;
+    m_minColorRate = minColorRate;
+    m_maxColorRate = maxColorRate;
+
+    m_minWavyDist = minWavyDist;
+    m_maxWavyDist = maxWavyDist;
+    m_minLife     = minLife;
+    m_maxLife     = maxLife;
+
+    m_wavy = wavy;
+
+    m_particles = particles;
+
+    m_gravityWellStrength = gravityWellStrength;
+    m_gravityWell         = gravityWell;
+
+    m_ballLightning          = ballLightning;
+    m_minBallLightningRadius = minBallLightningRadius;
+    m_lightningVar           = lightningVar;
+    m_maxBallLightningRadius = maxBallLightningRadius;
+    m_lightningSubdivisions  = lightningSubdivisions;
+
+    m_swarm          = swarm;
+    m_swarmfrequency = swarmfreq;
+    m_swarmdelta     = swarmdelta;
+
+    m_time     = tr.refdef.time;
+    m_lasttime = m_time;
+
+    m_gravityEffectVector = vec_zero;
+}
+
+/*
+====================
+ParticleEmitter::ParticleEmitter
+====================
+*/
+ParticleEmitter::ParticleEmitter()
+{
+    m_lasttime = tr.refdef.time / 1000.0;
+}
+
+/*
+====================
+ParticleEmitter::~ParticleEmitter
+====================
+*/
+ParticleEmitter::~ParticleEmitter() {}
+
+/*
+====================
+ParticleEmitter::Emit
+
+Creates new particles based on the current time
+====================
+*/
+void ParticleEmitter::Emit(float currentTime)
+{
+    Particle *p;
+    float     rate;
+    float     delta;
+
+    rate  = GetRate();
+    delta = currentTime = m_lasttime;
+
+    if (!rate) {
+        m_lasttime = currentTime;
+        return;
+    }
+
+    for (; delta > rate; delta -= rate) {
+        p = new Particle(
+            m_position,
+            GetVelocity(),
+            GetAcceleration(),
+            GetSrcColor(),
+            GetDstColor(),
+            GetColorRate(),
+            IsWavy(),
+            GetWavyDistance(),
+            currentTime,
+            GetDieTime(currentTime),
+            m_maxSpeed,
+            GetPosition(),
+            IsSwarm(),
+            m_swarmfrequency,
+            m_swarmdelta
+        );
+
+        particleList.AddObject(p);
+
+        m_lasttime = currentTime;
+    }
+}
+
+/*
+====================
+ParticleEmitter::UpdateValues
+
+Updates all particles with the last renderer time
+====================
+*/
+void ParticleEmitter::UpdateValues()
+{
+    int i;
+    int numParticles;
+
+    numParticles = particleList.NumObjects();
+    for (i = 1; i <= numParticles; i++) {
+        Particle *p = particleList.ObjectAt(i);
+
+        p->Update(m_lasttime);
+    }
+}
+
+/*
+====================
+ParticleEmitter::GetPosition
+
+Returns the current particle position
+====================
+*/
+Vector ParticleEmitter::GetPosition()
+{
+    return m_position;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocity
+
+Returns the random velocity based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetVelocity()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirection
+
+Returns the direction of the random velocity
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v *= var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMin
+
+Returns the random velocity direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetVelocityDirectionMax
+
+Returns the random velocity direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetVelocityDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_angle, m_angleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v *= m_maxSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAcceleration
+
+Returns the random acceleration based on random angle, and random speed
+====================
+*/
+Vector ParticleEmitter::GetAcceleration()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirection
+
+Returns the direction of the random acceleration
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirection()
+{
+    float  var;
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    //
+    // Calculate the velocity from random speed
+    //
+    var = RandomizeRange(m_minSpeed, m_maxSpeed);
+    v += m_gravityEffectVector * var;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMin
+
+Returns the random acceleration direction based on random angle, and minimum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMin()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the minimum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetAccelerationDirectionMax
+
+Returns the random acceleration direction based on random angle, and maximum speed
+====================
+*/
+Vector ParticleEmitter::GetAccelerationDirectionMax()
+{
+    float  angle;
+    Vector v;
+
+    //
+    // Calculate the direction from random angle
+    //
+    angle = RandomizeAngle(m_accAngle, m_accAngleVar);
+    v     = CalculateDirection(angle);
+
+    // Use the maximum speed
+    v += m_gravityEffectVector * m_minSpeed;
+
+    v.normalize();
+
+    return v;
+}
+
+/*
+====================
+ParticleEmitter::GetSrcColor
+
+Returns the source color
+====================
+*/
+int ParticleEmitter::GetSrcColor()
+{
+    return m_srcColor;
+}
+
+/*
+====================
+ParticleEmitter::GetDstColor
+
+Returns the destination color
+====================
+*/
+int ParticleEmitter::GetDstColor()
+{
+    return m_dstColor;
+}
+
+/*
+====================
+ParticleEmitter::GetGravityWellStrength
+
+Returns the strength of the gravity
+====================
+*/
+float ParticleEmitter::GetGravityWellStrength()
+{
+    return m_gravityWellStrength;
+}
+
+/*
+====================
+ParticleEmitter::GetRate
+
+Returns a random rate between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetRate()
+{
+    return RandomizeRange(m_minRate, m_maxRate);
+}
+
+/*
+====================
+ParticleEmitter::GetColorRate
+
+Returns a random color between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetColorRate()
+{
+    return RandomizeRange(m_minColorRate, m_maxColorRate);
+}
+
+/*
+====================
+ParticleEmitter::GetWavyDistance
+
+Returns a random wavy distance between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetWavyDistance()
+{
+    return RandomizeRange(m_minWavyDist, m_maxWavyDist);
+}
+
+/*
+====================
+ParticleEmitter::GetDieTime
+
+Returns a random time at which the particle will stop, between minimum and maximum
+====================
+*/
+float ParticleEmitter::GetDieTime(float currentTime)
+{
+    return currentTime + RandomizeRange(m_minLife, m_maxLife);
+}
+
+/*
+====================
+ParticleEmitter::GetBallLightningRadius
+
+Returns a random lightning radius between minimum and maximum
+====================
+*/
+int ParticleEmitter::GetBallLightningRadius()
+{
+    return RandomizeRange(m_minBallLightningRadius, m_maxBallLightningRadius);
+}
+
+/*
+====================
+ParticleEmitter::GetLightningVar
+
+Returns the maximum lightning value
+====================
+*/
+float ParticleEmitter::GetLightningVar()
+{
+    return m_lightningVar;
+}
+
+/*
+====================
+ParticleEmitter::GetLightningSubdivisions
+
+Returns the number of lightning subdivisions
+====================
+*/
+int ParticleEmitter::GetLightningSubdivisions()
+{
+    return m_lightningSubdivisions;
+}
+
+/*
+====================
+ParticleEmitter::IsWavy
+
+Returns whether or not this is a wavy particle
+====================
+*/
+qboolean ParticleEmitter::IsWavy()
+{
+    return m_wavy;
+}
+
+/*
+====================
+ParticleEmitter::IsGravityWell
+
+Returns whether or not this particle has gravity
+====================
+*/
+qboolean ParticleEmitter::IsGravityWell()
+{
+    return m_gravityWell;
+}
+
+/*
+====================
+ParticleEmitter::IsParticles
+
+Returns whether or not this contains particles
+====================
+*/
+qboolean ParticleEmitter::IsParticles()
+{
+    return m_particles;
+}
+
+/*
+====================
+ParticleEmitter::IsBallLightning
+
+Returns whether or not ball lightning can be applied
+====================
+*/
+qboolean ParticleEmitter::IsBallLightning()
+{
+    return m_ballLightning;
+}
+
+/*
+====================
+ParticleEmitter::IsSwarm
+
+Returns whether or not this is a swarm of particles
+====================
+*/
+qboolean ParticleEmitter::IsSwarm()
+{
+    return m_swarm;
+}
+
+/*
+====================
+ParticleEmitter::SetMinSpeed
+
+Sets the minimum speed
+====================
+*/
+void ParticleEmitter::SetMinSpeed(float value)
+{
+    m_minSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxSpeed
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetMaxSpeed(float value)
+{
+    m_maxSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngle
+
+Sets the angle/minimum angle
+====================
+*/
+void ParticleEmitter::SetAngle(float value)
+{
+    m_angle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAngleVar
+
+Sets the maximum speed
+====================
+*/
+void ParticleEmitter::SetAngleVar(float value)
+{
+    m_angleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinAccSpeed
+
+Sets the minimum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMinAccSpeed(float value)
+{
+    m_minAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxAccSpeed
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetMaxAccSpeed(float value)
+{
+    m_maxAccSpeed = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngle
+
+Sets the acceleration angle / minimum acceleration angle
+====================
+*/
+void ParticleEmitter::SetAccAngle(float value)
+{
+    m_accAngle = value;
+}
+
+/*
+====================
+ParticleEmitter::SetAccAngleVar
+
+Sets the maximum acceleration speed
+====================
+*/
+void ParticleEmitter::SetAccAngleVar(float value)
+{
+    m_accAngleVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinRate
+
+Sets the minimum rate
+====================
+*/
+void ParticleEmitter::SetMinRate(float value)
+{
+    m_minRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxRate
+
+Sets the maximum rate
+====================
+*/
+void ParticleEmitter::SetMaxRate(float value)
+{
+    m_maxRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetSrcColor
+
+Sets the source color
+====================
+*/
+void ParticleEmitter::SetSrcColor(int value)
+{
+    m_srcColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetDstColor
+
+Sets the destination color
+====================
+*/
+void ParticleEmitter::SetDstColor(int value)
+{
+    m_dstColor = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinColorRate
+
+Sets the minimum color rate
+====================
+*/
+void ParticleEmitter::SetMinColorRate(float value)
+{
+    m_minColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxColorRate
+
+Sets the maximum color rate
+====================
+*/
+void ParticleEmitter::SetMaxColorRate(float value)
+{
+    m_maxColorRate = value;
+}
+
+/*
+====================
+ParticleEmitter::SetWavy
+
+Sets whether or not this is a wavy particle
+====================
+*/
+void ParticleEmitter::SetWavy(int value)
+{
+    m_wavy = value;
+}
+
+/*
+====================
+ParticleEmitter::SetParticles
+
+Sets whether or not this contains particles
+====================
+*/
+void ParticleEmitter::SetParticles(int value)
+{
+    m_particles = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWell
+
+Sets whether or not this has gravity
+====================
+*/
+void ParticleEmitter::SetGravityWell(int value)
+{
+    m_gravityWell = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinWavyDist
+
+Sets the minimum wavy distance
+====================
+*/
+void ParticleEmitter::SetMinWavyDist(float value)
+{
+    m_minWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxWavyDist
+
+Sets the maximum wavy distance
+====================
+*/
+void ParticleEmitter::SetMaxWavyDist(float value)
+{
+    m_maxWavyDist = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinLife
+
+Sets the minimum life
+====================
+*/
+void ParticleEmitter::SetMinLife(float value)
+{
+    m_minLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxLife
+
+Sets the maximum life
+====================
+*/
+void ParticleEmitter::SetMaxLife(float value)
+{
+    m_maxLife = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityWellStrength
+
+Sets the strength of the gravity
+====================
+*/
+void ParticleEmitter::SetGravityWellStrength(float value)
+{
+    m_gravityWellStrength = value;
+}
+
+/*
+====================
+ParticleEmitter::SetGravityEffectVector
+
+Sets the direction at which gravity is applied
+====================
+*/
+void ParticleEmitter::SetGravityEffectVector(Vector value)
+{
+    m_gravityEffectVector = value;
+}
+
+/*
+====================
+ParticleEmitter::SetBallLightning
+
+Sets whether or not it has ball lightning
+====================
+*/
+void ParticleEmitter::SetBallLightning(int value)
+{
+    m_ballLightning = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMinBallLightningRadius
+
+Sets the minimum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMinBallLightningRadius(int value)
+{
+    m_minBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetMaxBallLightningRadius
+
+Sets the maximum ball lightning radius
+====================
+*/
+void ParticleEmitter::SetMaxBallLightningRadius(int value)
+{
+    m_maxBallLightningRadius = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningVar
+
+Sets the maximum lightning value
+====================
+*/
+void ParticleEmitter::SetLightningVar(float value)
+{
+    m_lightningVar = value;
+}
+
+/*
+====================
+ParticleEmitter::SetLightningSubdivisions
+
+Sets the number of subdivisions for the lightning
+====================
+*/
+void ParticleEmitter::SetLightningSubdivisions(int value)
+{
+    m_lightningSubdivisions = value;
+}
+
+/*
+====================
+ParticleEmitter::RandomizeRange
+
+Returns a random value between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeRange(float min, float max)
+{
+    return min + (max - min) * (rand() / (float)RAND_MAX);
+}
+
+/*
+====================
+ParticleEmitter::RandomizeAngle
+
+Returns a random angle between the range [min, max]
+====================
+*/
+float ParticleEmitter::RandomizeAngle(float min, float max)
+{
+    return min + ((rand() - (RAND_MAX / 2)) / (float)RAND_MAX) * max;
+}
+
+/*
+====================
+ParticleEmitter::CalculateDirection
+
+Returns a random Vector direction based on the angle value
+====================
+*/
+Vector ParticleEmitter::CalculateDirection(float value)
+{
+    float deg = DEG2RAD(value);
+
+    return Vector(cos(deg), -sin(deg), 0);
+}
+
+/*
+====================
+ParticleEmitter::Load
+
+Loads the specified particle emitter from the string buffer
+====================
+*/
+void ParticleEmitter::Load(char **buf_p)
+{
+    m_position[0] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[1] = atoi(COM_ParseExt(buf_p, qtrue));
+    m_position[2] = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_srcColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_dstColor     = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxColorRate = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxRate = atof(COM_ParseExt(buf_p, qtrue));
+    m_minLife = atoi(COM_ParseExt(buf_p, qtrue));
+    m_maxLife = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_angle       = atoi(COM_ParseExt(buf_p, qtrue));
+    m_angleVar    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngle    = atoi(COM_ParseExt(buf_p, qtrue));
+    m_accAngleVar = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_minSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxSpeed    = atof(COM_ParseExt(buf_p, qtrue));
+    m_minAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxAccSpeed = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_minWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxWavyDist = atof(COM_ParseExt(buf_p, qtrue));
+    m_wavy        = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_particles = atoi(COM_ParseExt(buf_p, qtrue));
+
+    m_gravityWell         = atoi(COM_ParseExt(buf_p, qtrue));
+    m_gravityWellStrength = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_ballLightning          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_minBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_maxBallLightningRadius = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningVar           = atof(COM_ParseExt(buf_p, qtrue));
+    m_lightningSubdivisions  = atof(COM_ParseExt(buf_p, qtrue));
+
+    m_swarm          = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmfrequency = atoi(COM_ParseExt(buf_p, qtrue));
+    m_swarmdelta     = atoi(COM_ParseExt(buf_p, qtrue));
+}
+
+/*
+====================
+GhostTexture::GhostTexture
+====================
+*/
+GhostTexture::GhostTexture()
+{
+    m_image   = NULL;
+    m_texture = NULL;
+}
+
+/*
+====================
+GhostTexture::SetTexel
+
+Sets color at the specified xy texel location
+====================
+*/
+void GhostTexture::SetTexel(int x, int y, unsigned int color)
+{
+    m_texture[x + m_width * y] = color;
+}
+
+/*
+====================
+GhostTexture::Burn
+
+Applies fade/burn effect to the ghost texture
+====================
+*/
+void GhostTexture::Burn()
+{
+    int     x, y;
+    int     r, g, b;
+    GLint   pixel;
+    GLuint *line;
+
+    if (m_isfade) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (line[x] & 0xff) - m_faderate;
+                g = ((line[x] & 0xff00) >> 8) - m_faderate;
+                b = ((line[x] & 0xff0000) >> 16) - m_faderate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                line[x] = (r) | (g << 8) | (b << 16);
+            }
+        }
+    } else if (m_isburn) {
+        for (y = 1; y < m_height - 1; y++) {
+            line = &m_texture[m_width * y];
+
+            for (x = 1; x < m_width - 1; x++) {
+                r = (((line[m_width + x] & 0xff) + (line[x + 1] & 0xff) + (line[x - 1] & 0xff) + (line[x] & 0xff)) >> 2)
+                  - m_burnrate;
+                g = ((((line[m_width + x] & 0xFF00) >> 8) + ((line[x + 1] & 0xFF00) >> 8)
+                      + ((line[x - 1] & 0xFF00) >> 8) + ((line[x] & 0xFF00) >> 8))
+                     >> 2)
+                  - m_burnrate;
+                b = ((((line[m_width + x] & 0xFF0000) >> 16) + ((line[x + 1] & 0xFF0000) >> 16)
+                      + ((line[x - 1] & 0xFF0000) >> 16) + ((line[x] & 0xFF0000) >> 16))
+                     >> 2)
+                  - m_burnrate;
+
+                if (r < 0) {
+                    r = 0;
+                }
+                if (g < 0) {
+                    g = 0;
+                }
+                if (b < 0) {
+                    b = 0;
+                }
+
+                pixel = (r) | (g << 8) | (b << 16);
+                if (pixel > 0) {
+                    line[x] = pixel;
+                }
+            }
+        }
+    }
+
+    line = m_texture;
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+
+    for (y = 0; y < m_height; ++y) {
+        line[m_width * y]               = 0;
+        line[m_width - 1 + m_width * y] = 0;
+    }
+
+    line = &m_texture[m_width * (m_height - 1)];
+
+    for (x = 0; x < m_width; x++) {
+        line[x] = 0;
+    }
+}
+
+/*
+====================
+GhostTexture::ComputeOutCode
+
+Returns a flag value indicating if x/y variable reached xmin/xmax
+====================
+*/
+outcode GhostTexture::ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax)
+{
+    outcode code = 0;
+
+    if (y > ymax) {
+        code = 1;
+    } else if (y < ymin) {
+        code = 2;
+    }
+
+    if (x > xmax) {
+        code |= 4;
+    } else if (x < xmin) {
+        code |= 8;
+    }
+
+    return code;
+}
+
+/*
+====================
+GhostTexture::ClipAndDrawLine
+
+Draws a line from p0 to p1 with clipping
+====================
+*/
+void GhostTexture::ClipAndDrawLine(Vector p0, Vector p1, int color)
+{
+    int     x0, x1;
+    int     y0, y1;
+    int     d;
+    int     x, y;
+    int     ax, ay;
+    int     sx, sy;
+    int     dx, dy;
+    int     xmax, ymax;
+    bool    accept;
+    outcode outcode0;
+    outcode outcode1;
+
+    x0   = p0.x;
+    y0   = p0.y;
+    x1   = p1.x;
+    y1   = p1.y;
+    xmax = m_width - 1;
+    ymax = m_height - 1;
+
+    accept = false;
+
+    outcode0 = ComputeOutCode(x0, y0, 0, xmax, 0, ymax);
+    outcode1 = ComputeOutCode(x1, y1, 0, xmax, 0, ymax);
+
+    while (outcode1 | outcode0) {
+        outcode outCodeOut;
+        if (outcode0 & outcode1) {
+            break;
+        }
+
+        outCodeOut = outcode0 ? outcode0 : outcode1;
+
+        if (outCodeOut & 1) {
+            x = x0 + (x1 - x0) * (ymax - y0) / (y1 - y0);
+            y = ymax;
+        } else if (outCodeOut & 2) {
+            x = x0 - y0 * (x1 - x0) / (y1 - y0);
+            y = 0;
+        } else if (outCodeOut & 4) {
+            x = xmax;
+            y = y0 + (y1 - y0) * (xmax - x0) / (x1 - x0);
+        } else if (outCodeOut * 8) {
+            x = 0;
+            y = y0 - x0 * (y1 - y0) / (x1 - x0);
+        } else {
+            x = x0;
+            y = y0;
+        }
+        if (outCodeOut == outcode0) {
+            y0       = y;
+            x0       = x;
+            outcode0 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        } else {
+            x1       = x;
+            y1       = y;
+            outcode1 = ComputeOutCode(x, y, 0, xmax, 0, ymax);
+        }
+    }
+
+    accept = true;
+    if (!accept) {
+        return;
+    }
+
+    dx = x1 - x0;
+    if (dx < 0) {
+        dx = x0 - x1;
+    }
+    ax = dx * 2;
+    sx = dx >= 0 ? 1 : -1;
+
+    dy = y1 - y0;
+    if (dy < 0) {
+        dy = y0 - y1;
+    }
+    ay = dy * 2;
+    sy = dy >= 0 ? 1 : -1;
+
+    x = x0;
+    y = y0;
+
+    if (ax > ay) {
+        for (d = ay - (ax >> 1);; d += ay, x += sx) {
+            SetTexel(x, y, color);
+            if (x == x1) {
+                break;
+            }
+
+            if (d >= 0) {
+                y += sy;
+                d -= ax;
+            }
+        }
+    } else {
+        for (d = ax - (ay >> 1);; d += ax, y += sy) {
+            SetTexel(x, y, color);
+            if (y == y1) {
+                break;
+            }
+
+            if (d >= 0) {
+                x += sx;
+                d -= ay;
+            }
+        }
+    }
+}
+
+/*
+====================
+GhostTexture::RotateVector
+
+Rotates the vector from angle
+====================
+*/
+Vector GhostTexture::RotateVector(Vector v, float angle)
+{
+    Vector vec;
+    float  rad;
+
+    rad   = DEG2RAD(angle);
+    vec.x = cos(rad) * v.x - sin(rad) * v.y;
+    vec.y = cos(rad) * v.y + sin(rad) * v.x;
+    vec.z = 0;
+
+    return vec;
+}
+
+/*
+====================
+GhostTexture::GenerateLightning
+
+Generates a lightning effect
+====================
+*/
+void GhostTexture::GenerateLightning(
+    Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions
+)
+{
+    Vector mid;
+    Vector delta;
+    float  length;
+
+    if (numSubdivisions == maxSubdivisions) {
+        p1[0] += 0.5;
+        p1[1] += 0.5;
+        p2[0] += 0.5;
+        p2[1] += 0.5;
+        ClipAndDrawLine(p1, p2, color);
+
+        return;
+    }
+
+    delta  = p2 - p1;
+    length = delta.length() * 0.5;
+    delta.normalize();
+
+    mid = RotateVector(delta, RandomizeRange(-angleVar, angleVar));
+    mid = p1 + mid * length;
+
+    GenerateLightning(p1, mid, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+    GenerateLightning(mid, p2, color, angleVar, numSubdivisions + 1, maxSubdivisions);
+}
+
+/*
+====================
+GhostTexture::Update
+
+Updates the ghost texture
+====================
+*/
+void GhostTexture::Update()
+{
+    Vector pos;
+    int    i, j;
+    int    numEmitters;
+    float  currentTime;
+
+    currentTime = tr.refdef.time / 1000.0;
+
+    numEmitters = m_emitterList.NumObjects();
+
+    for (i = 1; i <= numEmitters; i++) {
+        ParticleEmitter *pe = m_emitterList.ObjectAt(i);
+
+        if (pe->IsGravityWell()) {
+            break;
+        }
+
+        if (pe->IsBallLightning()) {
+            Vector p1, p2;
+
+            if (pe->GetBallLightningRadius()) {
+                p1 = pe->GetPosition();
+                p2 = pe->GetVelocityDirection();
+
+                p2 = p1 + p2 * pe->GetBallLightningRadius();
+                GenerateLightning(p1, p2, pe->GetSrcColor(), pe->GetLightningVar(), 0, pe->GetLightningSubdivisions());
+            }
+        } else if (pe->IsParticles()) {
+            pe->Emit(currentTime);
+        } else {
+            Vector p = pe->GetPosition();
+
+            SetTexel(p.x, p.y, pe->GetSrcColor());
+        }
+
+        for (j = pe->particleList.NumObjects(); j > 0; j--) {
+            Particle *p = pe->particleList.ObjectAt(j);
+
+            p->Update(currentTime);
+            if (p->m_position.x < m_width && p->m_position.x >= 0 && p->m_position.y < m_height && p->m_position.y >= 0
+                && currentTime <= p->GetDieTime()) {
+                SetTexel(p->m_position.x, p->m_position.y, p->m_color);
+            } else {
+                delete p;
+                pe->particleList.RemoveObjectAt(j);
+            }
+        }
+    }
+}
+
+/*
+====================
+R_UpdateGhostTextures
+
+Updates all ghost textures
+====================
+*/
+void R_UpdateGhostTextures()
+{
+    int i;
+    int numTextures;
+
+    frameTime = tr.refdef.time - lastTime;
+    lastTime  = tr.refdef.time;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        gt->Update();
+        gt->Burn();
+
+        GL_BindToTMU(gt->m_image, 0);
+        qglTexImage2D(GL_TEXTURE_2D, 0, 3, gt->m_width, gt->m_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, gt->m_texture);
+    }
+}
+
+/*
+====================
+R_SetGhostImage
+
+Applies an image to the specified named ghost texture
+====================
+*/
+void R_SetGhostImage(const char *name, image_t *image)
+{
+    int i;
+    int numTextures;
+
+    numTextures = ghostManager.m_textureList.NumObjects();
+    for (i = 1; i <= numTextures; i++) {
+        GhostTexture *gt = ghostManager.m_textureList.ObjectAt(i);
+
+        if (gt->m_name == name) {
+            gt->m_image = image;
+        }
+    }
+}
+
+/*
+====================
+LoadGHOST
+
+Loads a GHOST image file
+====================
+*/
+void LoadGHOST(const char *name, byte **pic, int *width, int *height)
+{
+    char         *buf_p;
+    char         *buffer;
+    int           numPixels;
+    int           numParticles;
+    int           i;
+    GhostTexture *gt;
+
+    if (ri.FS_ReadFile(name, (void **)&buffer) == -1) {
+        return;
+    }
+
+    buf_p = buffer;
+    COM_ParseExt(&buf_p, qtrue);
+
+    *width  = atoi(COM_ParseExt(&buf_p, qtrue));
+    *height = atoi(COM_ParseExt(&buf_p, qtrue));
+
+    numParticles = atoi(COM_ParseExt(&buf_p, qtrue));
+    numPixels    = *height * *width;
+    *pic         = new byte[numPixels * 4];
+
+    gt            = new GhostTexture();
+    gt->m_width   = *width;
+    gt->m_height  = *height;
+    gt->m_texture = new unsigned int[numPixels];
+
+    gt->m_isburn   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_burnrate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    gt->m_isfade   = atoi(COM_ParseExt(&buf_p, qtrue));
+    gt->m_faderate = atof(COM_ParseExt(&buf_p, qtrue));
+
+    ghostManager.m_textureList.AddObject(gt);
+
+    for (i = 0; i < numParticles; i++) {
+        ParticleEmitter *pe = new ParticleEmitter();
+        gt->m_emitterList.AddObject(pe);
+        pe->Load(&buf_p);
+    }
+}
diff --git a/code/renderergl2/tr_ghost.h b/code/renderergl2/tr_ghost.h
new file mode 100644
index 00000000..6c151ea6
--- /dev/null
+++ b/code/renderergl2/tr_ghost.h
@@ -0,0 +1,300 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "tr_local.h"
+#include "../qcommon/vector.h"
+#include "../qcommon/container.h"
+#include "../qcommon/str.h"
+
+using outcode = unsigned int;
+
+class Particle
+{
+private:
+    float m_startTime;
+    float m_dieTime;
+
+    Vector m_velocity;
+    Vector m_acceleration;
+    Vector m_perp;
+
+    qboolean m_wavy;
+    float    m_wavyDist;
+    float    m_wavyOffset;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    int   m_deltaR;
+    int   m_deltaG;
+    int   m_deltaB;
+    int   m_srcR;
+    int   m_srcG;
+    int   m_srcB;
+    int   m_dstR;
+    int   m_dstG;
+    int   m_dstB;
+    float m_colorRate;
+
+    Vector m_realposition;
+
+    float m_life;
+    float m_maxspeed;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    Vector m_parentOrigin;
+
+public:
+    Vector m_position;
+    int    m_color;
+
+public:
+    Particle(
+        Vector   pos,
+        Vector   vel,
+        Vector   acc,
+        int      srcColor,
+        int      dstColor,
+        float    colorRate,
+        qboolean wavy,
+        float    wavyDist,
+        float    currentTime,
+        float    dieTime,
+        float    maxspeed,
+        Vector   parentOrg,
+        qboolean swarm,
+        int      freq,
+        int      delta
+    );
+
+    void  Update(float currentTime);
+    float GetDieTime();
+};
+
+class ParticleEmitter
+{
+private:
+    float m_time;
+    float m_lasttime;
+
+    Vector m_position;
+
+    int   m_srcColor;
+    int   m_dstColor;
+    float m_minColorRate;
+    float m_maxColorRate;
+
+    float m_minRate;
+    float m_maxRate;
+
+    float m_minLife;
+    float m_maxLife;
+
+    float m_angle;
+    float m_angleVar;
+
+    float m_minSpeed;
+    float m_maxSpeed;
+    float m_accAngle;
+    float m_accAngleVar;
+    float m_minAccSpeed;
+    float m_maxAccSpeed;
+
+    float    m_minWavyDist;
+    float    m_maxWavyDist;
+    qboolean m_wavy;
+
+    qboolean m_gravityWell;
+    float    m_gravityWellStrength;
+
+    qboolean m_particles;
+    Vector   m_gravityEffectVector;
+
+    qboolean m_ballLightning;
+    int      m_minBallLightningRadius;
+    int      m_maxBallLightningRadius;
+    float    m_lightningVar;
+    int      m_lightningSubdivisions;
+
+    qboolean m_swarm;
+    int      m_swarmfrequency;
+    int      m_swarmdelta;
+
+    int m_maxspeed;
+
+public:
+    Container<Particle *> particleList;
+
+public:
+    ParticleEmitter(
+        Vector   position,
+        float    minSpeed,
+        float    maxSpeed,
+        float    angle,
+        float    angleVar,
+        float    minAccSpeed,
+        float    maxAccSpeed,
+        float    accAngle,
+        float    accAngleVar,
+        float    minRate,
+        float    maxRate,
+        int      srcColor,
+        int      dstColor,
+        float    minColorRate,
+        float    maxColorRate,
+        qboolean wavy,
+        float    minWavyDist,
+        float    maxWavyDist,
+        float    minLife,
+        float    maxLife,
+        qboolean particles,
+        qboolean gravityWell,
+        float    gravityWellStrength,
+        qboolean ballLightning,
+        int      minBallLightningRadius,
+        int      maxBallLightningRadius,
+        float    lightningVar,
+        int      lightningSubdivisions,
+        qboolean swarm,
+        int      swarmfreq,
+        int      swarmdelta
+    );
+    ParticleEmitter();
+    ~ParticleEmitter();
+
+    void Emit(float currentTime);
+    void UpdateValues();
+
+    Vector GetPosition();
+    Vector GetVelocity();
+    Vector GetVelocityDirection();
+    Vector GetVelocityDirectionMin();
+    Vector GetVelocityDirectionMax();
+    Vector GetAcceleration();
+    Vector GetAccelerationDirection();
+    Vector GetAccelerationDirectionMin();
+    Vector GetAccelerationDirectionMax();
+
+    int GetSrcColor();
+    int GetDstColor();
+
+    float GetGravityWellStrength();
+    float GetRate();
+    float GetColorRate();
+
+    float GetWavyDistance();
+    float GetDieTime(float currentTime);
+    int   GetBallLightningRadius();
+    float GetLightningVar();
+    int   GetLightningSubdivisions();
+
+    qboolean IsWavy();
+    qboolean IsGravityWell();
+    qboolean IsParticles();
+    qboolean IsBallLightning();
+    qboolean IsSwarm();
+
+    void SetMinSpeed(float value);
+    void SetMaxSpeed(float value);
+
+    void SetAngle(float value);
+    void SetAngleVar(float value);
+
+    void SetMinAccSpeed(float value);
+    void SetMaxAccSpeed(float value);
+    void SetAccAngle(float value);
+    void SetAccAngleVar(float value);
+
+    void SetMinRate(float value);
+    void SetMaxRate(float value);
+
+    void SetSrcColor(int value);
+    void SetDstColor(int value);
+    void SetMinColorRate(float value);
+    void SetMaxColorRate(float value);
+
+    void SetWavy(int value);
+
+    void SetParticles(int value);
+    void SetGravityWell(int value);
+
+    void SetMinWavyDist(float value);
+    void SetMaxWavyDist(float value);
+
+    void SetMinLife(float value);
+    void SetMaxLife(float value);
+
+    void SetGravityWellStrength(float value);
+    void SetGravityEffectVector(Vector value);
+
+    void SetBallLightning(int value);
+    void SetMinBallLightningRadius(int value);
+    void SetMaxBallLightningRadius(int value);
+    void SetLightningVar(float value);
+    void SetLightningSubdivisions(int value);
+
+    float RandomizeRange(float minRange, float maxRange);
+    float RandomizeAngle(float minAngle, float maxAngle);
+
+    Vector CalculateDirection(float value);
+
+    void Load(char **buf_p);
+};
+
+class GhostTexture
+{
+public:
+    Container<ParticleEmitter *> m_emitterList;
+
+    int m_width;
+    int m_height;
+
+    image_t      *m_image;
+    unsigned int *m_texture;
+    str           m_name;
+
+    qboolean m_isburn;
+    qboolean m_isfade;
+    int      m_faderate;
+    int      m_burnrate;
+
+public:
+    GhostTexture();
+
+    void   Update();
+    void   SetTexel(int x, int y, unsigned int color);
+    void   Burn();
+    void   GenerateLightning(Vector p1, Vector p2, int color, float angleVar, int numSubdivisions, int maxSubdivisions);
+    Vector RotateVector(Vector v, float angle);
+    void   ClipAndDrawLine(Vector p0, Vector p1, int color);
+    outcode ComputeOutCode(int x, int y, int xmin, int xmax, int ymin, int ymax);
+};
+
+class GhostManager
+{
+public:
+    Container<GhostTexture *> m_textureList;
+};
diff --git a/code/renderergl2/tr_glsl.c b/code/renderergl2/tr_glsl.c
index 86cca599..39223bf6 100644
--- a/code/renderergl2/tr_glsl.c
+++ b/code/renderergl2/tr_glsl.c
@@ -88,8 +88,14 @@ static uniformInfo_t uniformsInfo[] =
 
 	{ "u_EnableTextures", GLSL_VEC4 },
 
-	{ "u_DiffuseTexMatrix",  GLSL_VEC4 },
-	{ "u_DiffuseTexOffTurb", GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix0",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix1",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix2",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix3",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix4",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix5",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix6",  GLSL_VEC4 },
+	{ "u_DiffuseTexMatrix7",  GLSL_VEC4 },
 
 	{ "u_TCGen0",        GLSL_INT },
 	{ "u_TCGen0Vector0", GLSL_VEC3 },
@@ -243,11 +249,25 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 	// HACK: abuse the GLSL preprocessor to turn GLSL 1.20 shaders into 1.30 ones
 	if(glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 30))
 	{
-		if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 50))
+		if (qglesMajorVersion >= 3 && glRefConfig.glslMajorVersion >= 3)
+			Q_strcat(dest, size, "#version 300 es\n");
+		else if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 50))
 			Q_strcat(dest, size, "#version 150\n");
 		else
 			Q_strcat(dest, size, "#version 130\n");
 
+		// `extra' may contain #extension which must be directly after #version
+		if (extra)
+		{
+			Q_strcat(dest, size, extra);
+		}
+
+		if (qglesMajorVersion >= 2)
+		{
+			Q_strcat(dest, size, "precision mediump float;\n");
+			Q_strcat(dest, size, "precision mediump sampler2DShadow;\n");
+		}
+
 		if(shaderType == GL_VERTEX_SHADER)
 		{
 			Q_strcat(dest, size, "#define attribute in\n");
@@ -266,8 +286,34 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 	}
 	else
 	{
-		Q_strcat(dest, size, "#version 120\n");
-		Q_strcat(dest, size, "#define shadow2D(a,b) shadow2D(a,b).r \n");
+		if (qglesMajorVersion >= 2)
+		{
+			Q_strcat(dest, size, "#version 100\n");
+
+			if (extra)
+			{
+				Q_strcat(dest, size, extra);
+			}
+
+			Q_strcat(dest, size, "precision mediump float;\n");
+
+			if (glRefConfig.shadowSamplers)
+			{
+				Q_strcat(dest, size, "precision mediump sampler2DShadow;\n");
+				Q_strcat(dest, size, "#define shadow2D(a,b) shadow2DEXT(a,b)\n");
+			}
+		}
+		else
+		{
+			Q_strcat(dest, size, "#version 120\n");
+
+			if (extra)
+			{
+				Q_strcat(dest, size, extra);
+			}
+
+			Q_strcat(dest, size, "#define shadow2D(a,b) shadow2D(a,b).r\n");
+		}
 	}
 
 	// HACK: add some macros to avoid extra uniforms and save speed and code maintenance
@@ -355,11 +401,6 @@ static void GLSL_GetShaderHeader( GLenum shaderType, const GLchar *extra, char *
 		Q_strcat(dest, size, va("#define ROUGHNESS_MIPS float(%d)\n", numRoughnessMips));
 	}
 
-	if (extra)
-	{
-		Q_strcat(dest, size, extra);
-	}
-
 	// OK we added a lot of stuff but if we do something bad in the GLSL shaders then we want the proper line
 	// so we have to reset the line counting
 	Q_strcat(dest, size, "#line 0\n");
@@ -927,6 +968,15 @@ void GLSL_InitGPUShaders(void)
 
 	startTime = ri.Milliseconds();
 
+	// OpenGL ES may not have enough attributes to fit ones used for vertex animation
+	if ( glRefConfig.maxVertexAttribs > ATTR_INDEX_NORMAL2 ) {
+		ri.Printf(PRINT_ALL, "Using GPU vertex animation\n");
+		glRefConfig.gpuVertexAnimation = qtrue;
+	} else {
+		ri.Printf(PRINT_ALL, "Using CPU vertex animation\n");
+		glRefConfig.gpuVertexAnimation = qfalse;
+	}
+
 	for (i = 0; i < GENERICDEF_COUNT; i++)
 	{	
 		if ((i & GENERICDEF_USE_VERTEX_ANIMATION) && (i & GENERICDEF_USE_BONE_ANIMATION))
@@ -949,6 +999,9 @@ void GLSL_InitGPUShaders(void)
 
 		if (i & GENERICDEF_USE_VERTEX_ANIMATION)
 		{
+			if (!glRefConfig.gpuVertexAnimation)
+				continue;
+
 			Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n");
 			attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
 		}
@@ -1000,6 +1053,9 @@ void GLSL_InitGPUShaders(void)
 		if ((i & FOGDEF_USE_VERTEX_ANIMATION) && (i & FOGDEF_USE_BONE_ANIMATION))
 			continue;
 
+		if ((i & FOGDEF_USE_VERTEX_ANIMATION) && !glRefConfig.gpuVertexAnimation)
+			continue;
+
 		if ((i & FOGDEF_USE_BONE_ANIMATION) && !glRefConfig.glslMaxAnimatedBones)
 			continue;
 
@@ -1180,12 +1236,17 @@ void GLSL_InitGPUShaders(void)
 
 		if (i & LIGHTDEF_ENTITY_VERTEX_ANIMATION)
 		{
-			Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n#define USE_MODELMATRIX\n");
-			attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
+			Q_strcat(extradefines, 1024, "#define USE_MODELMATRIX\n");
 
-			if (r_normalMapping->integer)
+			if (glRefConfig.gpuVertexAnimation)
 			{
-				attribs |= ATTR_TANGENT2;
+				Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n");
+				attribs |= ATTR_POSITION2 | ATTR_NORMAL2;
+
+				if (r_normalMapping->integer)
+				{
+					attribs |= ATTR_TANGENT2;
+				}
 			}
 		}
 		else if (i & LIGHTDEF_ENTITY_BONE_ANIMATION)
@@ -1220,6 +1281,9 @@ void GLSL_InitGPUShaders(void)
 		if ((i & SHADOWMAPDEF_USE_VERTEX_ANIMATION) && (i & SHADOWMAPDEF_USE_BONE_ANIMATION))
 			continue;
 
+		if ((i & SHADOWMAPDEF_USE_VERTEX_ANIMATION) && !glRefConfig.gpuVertexAnimation)
+			continue;
+
 		if ((i & SHADOWMAPDEF_USE_BONE_ANIMATION) && !glRefConfig.glslMaxAnimatedBones)
 			continue;
 
@@ -1344,86 +1408,110 @@ void GLSL_InitGPUShaders(void)
 	}
 
 
-	attribs = ATTR_POSITION | ATTR_TEXCOORD;
-	extradefines[0] = '\0';
-
-	if (r_shadowFilter->integer >= 1)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER\n");
-
-	if (r_shadowFilter->integer >= 2)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER2\n");
-
-	if (r_shadowCascadeZFar->integer != 0)
-		Q_strcat(extradefines, 1024, "#define USE_SHADOW_CASCADE\n");
-
-	Q_strcat(extradefines, 1024, va("#define r_shadowMapSize %f\n", r_shadowMapSize->value));
-	Q_strcat(extradefines, 1024, va("#define r_shadowCascadeZFar %f\n", r_shadowCascadeZFar->value));
-
-
-	if (!GLSL_InitGPUShader(&tr.shadowmaskShader, "shadowmask", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowmask_vp, fallbackShader_shadowmask_fp))
-	{
-		ri.Error(ERR_FATAL, "Could not load shadowmask shader!");
-	}
-	
-	GLSL_InitUniforms(&tr.shadowmaskShader);
-
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP,  TB_SHADOWMAP);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP2, TB_SHADOWMAP2);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP3, TB_SHADOWMAP3);
-	GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP4, TB_SHADOWMAP4);
-
-	GLSL_FinishGPUShader(&tr.shadowmaskShader);
-
-	numEtcShaders++;
-
-
-	attribs = ATTR_POSITION | ATTR_TEXCOORD;
-	extradefines[0] = '\0';
-
-	if (!GLSL_InitGPUShader(&tr.ssaoShader, "ssao", attribs, qtrue, extradefines, qtrue, fallbackShader_ssao_vp, fallbackShader_ssao_fp))
-	{
-		ri.Error(ERR_FATAL, "Could not load ssao shader!");
-	}
-
-	GLSL_InitUniforms(&tr.ssaoShader);
-
-	GLSL_SetUniformInt(&tr.ssaoShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
-
-	GLSL_FinishGPUShader(&tr.ssaoShader);
-
-	numEtcShaders++;
-
-
-	for (i = 0; i < 4; i++)
+	// GLSL 1.10+ or GL_EXT_shadow_samplers extension are required for sampler2DShadow type
+	if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 10)
+	    || glRefConfig.shadowSamplers)
 	{
 		attribs = ATTR_POSITION | ATTR_TEXCOORD;
 		extradefines[0] = '\0';
 
-		if (i & 1)
-			Q_strcat(extradefines, 1024, "#define USE_VERTICAL_BLUR\n");
-		else
-			Q_strcat(extradefines, 1024, "#define USE_HORIZONTAL_BLUR\n");
-
-		if (!(i & 2))
-			Q_strcat(extradefines, 1024, "#define USE_DEPTH\n");
-
-
-		if (!GLSL_InitGPUShader(&tr.depthBlurShader[i], "depthBlur", attribs, qtrue, extradefines, qtrue, fallbackShader_depthblur_vp, fallbackShader_depthblur_fp))
+		if (qglesMajorVersion < 3 && glRefConfig.shadowSamplers)
 		{
-			ri.Error(ERR_FATAL, "Could not load depthBlur shader!");
+			Q_strcat(extradefines, 1024, "#extension GL_EXT_shadow_samplers : enable\n");
 		}
-		
-		GLSL_InitUniforms(&tr.depthBlurShader[i]);
 
-		GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENIMAGEMAP, TB_COLORMAP);
-		GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENDEPTHMAP, TB_LIGHTMAP);
+		if (r_shadowFilter->integer >= 1)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER\n");
 
-		GLSL_FinishGPUShader(&tr.depthBlurShader[i]);
+		if (r_shadowFilter->integer >= 2)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_FILTER2\n");
+
+		if (r_shadowCascadeZFar->integer != 0)
+			Q_strcat(extradefines, 1024, "#define USE_SHADOW_CASCADE\n");
+
+		Q_strcat(extradefines, 1024, va("#define r_shadowMapSize %f\n", r_shadowMapSize->value));
+		Q_strcat(extradefines, 1024, va("#define r_shadowCascadeZFar %f\n", r_shadowCascadeZFar->value));
+
+		if (!GLSL_InitGPUShader(&tr.shadowmaskShader, "shadowmask", attribs, qtrue, extradefines, qtrue, fallbackShader_shadowmask_vp, fallbackShader_shadowmask_fp))
+		{
+			ri.Error(ERR_FATAL, "Could not load shadowmask shader!");
+		}
+	
+		GLSL_InitUniforms(&tr.shadowmaskShader);
+
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP,  TB_SHADOWMAP);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP2, TB_SHADOWMAP2);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP3, TB_SHADOWMAP3);
+		GLSL_SetUniformInt(&tr.shadowmaskShader, UNIFORM_SHADOWMAP4, TB_SHADOWMAP4);
+
+		GLSL_FinishGPUShader(&tr.shadowmaskShader);
 
 		numEtcShaders++;
 	}
 
+
+	// GLSL 1.10+ or GL_OES_standard_derivatives extension are required for dFdx() and dFdy() GLSL functions
+	if (glRefConfig.glslMajorVersion > 1 || (glRefConfig.glslMajorVersion == 1 && glRefConfig.glslMinorVersion >= 10)
+	    || glRefConfig.standardDerivatives)
+	{
+		attribs = ATTR_POSITION | ATTR_TEXCOORD;
+		extradefines[0] = '\0';
+
+		if (qglesMajorVersion < 3 && glRefConfig.standardDerivatives)
+		{
+			Q_strcat(extradefines, 1024, "#extension GL_OES_standard_derivatives : enable\n");
+		}
+
+		if (!GLSL_InitGPUShader(&tr.ssaoShader, "ssao", attribs, qtrue, extradefines, qtrue, fallbackShader_ssao_vp, fallbackShader_ssao_fp))
+		{
+			ri.Error(ERR_FATAL, "Could not load ssao shader!");
+		}
+
+		GLSL_InitUniforms(&tr.ssaoShader);
+
+		GLSL_SetUniformInt(&tr.ssaoShader, UNIFORM_SCREENDEPTHMAP, TB_COLORMAP);
+
+		GLSL_FinishGPUShader(&tr.ssaoShader);
+
+		numEtcShaders++;
+
+
+		for (i = 0; i < 4; i++)
+		{
+			attribs = ATTR_POSITION | ATTR_TEXCOORD;
+			extradefines[0] = '\0';
+
+			if (qglesMajorVersion < 3 && glRefConfig.standardDerivatives)
+			{
+				Q_strcat(extradefines, 1024, "#extension GL_OES_standard_derivatives : enable\n");
+			}
+
+			if (i & 1)
+				Q_strcat(extradefines, 1024, "#define USE_VERTICAL_BLUR\n");
+			else
+				Q_strcat(extradefines, 1024, "#define USE_HORIZONTAL_BLUR\n");
+
+			if (!(i & 2))
+				Q_strcat(extradefines, 1024, "#define USE_DEPTH\n");
+
+
+			if (!GLSL_InitGPUShader(&tr.depthBlurShader[i], "depthBlur", attribs, qtrue, extradefines, qtrue, fallbackShader_depthblur_vp, fallbackShader_depthblur_fp))
+			{
+				ri.Error(ERR_FATAL, "Could not load depthBlur shader!");
+			}
+		
+			GLSL_InitUniforms(&tr.depthBlurShader[i]);
+
+			GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENIMAGEMAP, TB_COLORMAP);
+			GLSL_SetUniformInt(&tr.depthBlurShader[i], UNIFORM_SCREENDEPTHMAP, TB_LIGHTMAP);
+
+			GLSL_FinishGPUShader(&tr.depthBlurShader[i]);
+
+			numEtcShaders++;
+		}
+	}
+
 #if 0
 	attribs = ATTR_POSITION | ATTR_TEXCOORD;
 	extradefines[0] = '\0';
@@ -1456,7 +1544,7 @@ void GLSL_ShutdownGPUShaders(void)
 
 	ri.Printf(PRINT_ALL, "------- GLSL_ShutdownGPUShaders -------\n");
 
-	for (i = 0; i < ATTR_INDEX_COUNT; i++)
+	for (i = 0; i < ATTR_INDEX_COUNT && i < glRefConfig.maxVertexAttribs; i++)
 		qglDisableVertexAttribArray(i);
 
 	GL_BindNullProgram();
diff --git a/code/renderergl2/tr_image.c b/code/renderergl2/tr_image.c
index de4a38c0..42c28955 100644
--- a/code/renderergl2/tr_image.c
+++ b/code/renderergl2/tr_image.c
@@ -1455,6 +1455,106 @@ byte	mipBlendColors[16][4] = {
 	{0,0,255,128},
 };
 
+/*
+==================
+R_ConvertTextureFormat
+
+Convert RGBA unsigned byte to specified format and type
+==================
+*/
+#define ROW_PADDING( width, bpp, alignment ) PAD( (width) * (bpp), (alignment) ) - (width) * (bpp)
+void R_ConvertTextureFormat( const byte *in, int width, int height, GLenum format, GLenum type, byte *out )
+{
+	int x, y, rowPadding;
+	int unpackAlign = 4; // matches GL_UNPACK_ALIGNMENT default
+
+	if ( format == GL_RGB && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 3, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++;
+				*out++ = *in++;
+				*out++ = *in++;
+				in++;
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_LUMINANCE && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 1, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++; // red
+				in += 3;
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++ )
+			{
+				*out++ = *in++; // red
+				in += 2;
+				*out++ = *in++; // alpha
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_RGB && type == GL_UNSIGNED_SHORT_5_6_5 )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++, in += 4, out += 2 )
+			{
+				*((unsigned short*)out) = ( (unsigned short)( in[0] >> 3 ) << 11 )
+					    | ( (unsigned short)( in[1] >> 2 ) << 5 )
+					    | ( (unsigned short)( in[2] >> 3 ) << 0 );
+			}
+
+			out += rowPadding;
+		}
+	}
+	else if ( format == GL_RGBA && type == GL_UNSIGNED_SHORT_4_4_4_4 )
+	{
+		rowPadding = ROW_PADDING( width, 2, unpackAlign );
+
+		for ( y = 0; y < height; y++ )
+		{
+			for ( x = 0; x < width; x++, in += 4, out += 2 )
+			{
+				*((unsigned short*)out) = ( (unsigned short)( in[0] >> 4 ) << 12 )
+					    | ( (unsigned short)( in[1] >> 4 ) << 8 )
+					    | ( (unsigned short)( in[2] >> 4 ) << 4 )
+					    | ( (unsigned short)( in[3] >> 4 ) << 0 );
+			}
+
+			out += rowPadding;
+		}
+	}
+	else
+	{
+		ri.Error( ERR_DROP, "Unable to convert RGBA image to OpenGL format 0x%X and type 0x%X", format, type );
+	}
+}
+
 static void RawImage_SwizzleRA( byte *data, int width, int height )
 {
 	int i;
@@ -1944,18 +2044,20 @@ static GLenum PixelDataFormatFromInternalFormat(GLenum internalFormat)
 	}
 }
 
-static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int width, int height, GLenum target, GLenum picFormat, int numMips, GLenum internalFormat, imgType_t type, imgFlags_t flags, qboolean subtexture )
+static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int width, int height, GLenum target, GLenum picFormat, GLenum dataFormat, GLenum dataType, int numMips, GLenum internalFormat, imgType_t type, imgFlags_t flags, qboolean subtexture )
 {
-	GLenum dataFormat, dataType;
 	qboolean rgtc = internalFormat == GL_COMPRESSED_RG_RGTC2;
 	qboolean rgba8 = picFormat == GL_RGBA8 || picFormat == GL_SRGB8_ALPHA8_EXT;
 	qboolean rgba = rgba8 || picFormat == GL_RGBA16;
 	qboolean mipmap = !!(flags & IMGFLAG_MIPMAP);
 	int size, miplevel;
 	qboolean lastMip = qfalse;
+	byte *formatBuffer = NULL;
 
-	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
-	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+	if (qglesMajorVersion && rgba8 && (dataFormat != GL_RGBA || dataType != GL_UNSIGNED_BYTE))
+	{
+		formatBuffer = ri.Hunk_AllocateTempMemory(4 * width * height);
+	}
 
 	miplevel = 0;
 	do
@@ -1974,6 +2076,11 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 
 			if (rgba8 && rgtc)
 				RawImage_UploadToRgtc2Texture(texture, miplevel, x, y, width, height, data);
+			else if (formatBuffer)
+			{
+				R_ConvertTextureFormat(data, width, height, dataFormat, dataType, formatBuffer);
+				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, formatBuffer);
+			}
 			else
 				qglTextureSubImage2DEXT(texture, target, miplevel, x, y, width, height, dataFormat, dataType, data);
 		}
@@ -2007,6 +2114,9 @@ static void RawImage_UploadTexture(GLuint texture, byte *data, int x, int y, int
 		}
 	}
 	while (!lastMip);
+
+	if (formatBuffer != NULL)
+		ri.Hunk_FreeTempMemory(formatBuffer);
 }
 
 
@@ -2016,7 +2126,7 @@ Upload32
 
 ===============
 */
-static void Upload32(byte *data, int x, int y, int width, int height, GLenum picFormat, int numMips, image_t *image, qboolean scaled)
+static void Upload32(byte *data, int x, int y, int width, int height, GLenum picFormat, GLenum dataFormat, GLenum dataType, int numMips, image_t *image, qboolean scaled)
 {
 	int			i, c;
 	byte		*scan;
@@ -2071,7 +2181,7 @@ static void Upload32(byte *data, int x, int y, int width, int height, GLenum pic
 		for (i = 0; i < 6; i++)
 		{
 			int w2 = width, h2 = height;
-			RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, picFormat, numMips, internalFormat, type, flags, qfalse);
+			RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, picFormat, dataFormat, dataType, numMips, internalFormat, type, flags, qfalse);
 			for (c = numMips; c; c--)
 			{
 				data += CalculateMipSize(w2, h2, picFormat);
@@ -2082,7 +2192,7 @@ static void Upload32(byte *data, int x, int y, int width, int height, GLenum pic
 	}
 	else
 	{
-		RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_2D, picFormat, numMips, internalFormat, type, flags, qfalse);
+		RawImage_UploadTexture(image->texnum, data, x, y, width, height, GL_TEXTURE_2D, picFormat, dataFormat, dataType, numMips, internalFormat, type, flags, qfalse);
 	}
 
 	GL_CheckErrors();
@@ -2108,7 +2218,7 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	qboolean    picmip = !!(flags & IMGFLAG_PICMIP);
 	qboolean    lastMip;
 	GLenum textureTarget = cubemap ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D;
-	GLenum dataFormat;
+	GLenum dataFormat, dataType;
 
 	if (strlen(name) >= MAX_QPATH ) {
 		ri.Error (ERR_DROP, "R_CreateImage: \"%s\" is too long", name);
@@ -2140,6 +2250,53 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	if (!internalFormat)
 		internalFormat = RawImage_GetFormat(pic, width * height, picFormat, isLightmap, image->type, image->flags);
 
+	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
+	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+
+	// Convert image data format for OpenGL ES, data is converted for each mip level
+	if (qglesMajorVersion)
+	{
+		switch (internalFormat)
+		{
+			case GL_LUMINANCE:
+			case GL_LUMINANCE8:
+				internalFormat = GL_LUMINANCE;
+				dataFormat = GL_LUMINANCE;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_LUMINANCE_ALPHA:
+			case GL_LUMINANCE8_ALPHA8:
+				internalFormat = GL_LUMINANCE_ALPHA;
+				dataFormat = GL_LUMINANCE_ALPHA;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGB:
+			case GL_RGB8:
+				internalFormat = GL_RGB;
+				dataFormat = GL_RGB;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGB5:
+				internalFormat = GL_RGB;
+				dataFormat = GL_RGB;
+				dataType = GL_UNSIGNED_SHORT_5_6_5;
+				break;
+			case GL_RGBA:
+			case GL_RGBA8:
+				internalFormat = GL_RGBA;
+				dataFormat = GL_RGBA;
+				dataType = GL_UNSIGNED_BYTE;
+				break;
+			case GL_RGBA4:
+				internalFormat = GL_RGBA;
+				dataFormat = GL_RGBA;
+				dataType = GL_UNSIGNED_SHORT_4_4_4_4;
+				break;
+			default:
+				ri.Error( ERR_DROP, "Missing OpenGL ES support for image '%s' with internal format 0x%X\n", name, internalFormat );
+		}
+	}
+
 	image->internalFormat = internalFormat;
 
 	// Possibly scale image before uploading.
@@ -2164,7 +2321,6 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 	image->uploadHeight = height;
 
 	// Allocate texture storage so we don't have to worry about it later.
-	dataFormat = PixelDataFormatFromInternalFormat(internalFormat);
 	mipWidth = width;
 	mipHeight = height;
 	miplevel = 0;
@@ -2176,11 +2332,11 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 			int i;
 
 			for (i = 0; i < 6; i++)
-				qglTextureImage2DEXT(image->texnum, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, GL_UNSIGNED_BYTE, NULL);
+				qglTextureImage2DEXT(image->texnum, GL_TEXTURE_CUBE_MAP_POSITIVE_X + i, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, dataType, NULL);
 		}
 		else
 		{
-			qglTextureImage2DEXT(image->texnum, GL_TEXTURE_2D, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, GL_UNSIGNED_BYTE, NULL);
+			qglTextureImage2DEXT(image->texnum, GL_TEXTURE_2D, miplevel, internalFormat, mipWidth, mipHeight, 0, dataFormat, dataType, NULL);
 		}
 
 		mipWidth  = MAX(1, mipWidth >> 1);
@@ -2191,7 +2347,7 @@ image_t *R_CreateImage2( const char *name, byte *pic, int width, int height, GLe
 
 	// Upload data.
 	if (pic)
-		Upload32(pic, 0, 0, width, height, picFormat, numMips, image, scaled);
+		Upload32(pic, 0, 0, width, height, picFormat, dataFormat, dataType, numMips, image, scaled);
 
 	if (resampledBuffer != NULL)
 		ri.Hunk_FreeTempMemory(resampledBuffer);
@@ -2252,7 +2408,13 @@ image_t *R_CreateImage(const char *name, byte *pic, int width, int height, imgTy
 
 void R_UpdateSubImage( image_t *image, byte *pic, int x, int y, int width, int height, GLenum picFormat )
 {
-	Upload32(pic, x, y, width, height, picFormat, 0, image, qfalse);
+	GLenum dataFormat, dataType;
+
+	// TODO: This is fine for lightmaps but (unused) general RGBA images need to store dataFormat / dataType in image_t for OpenGL ES?
+	dataFormat = PixelDataFormatFromInternalFormat(image->internalFormat);
+	dataType = picFormat == GL_RGBA16 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_BYTE;
+
+	Upload32(pic, x, y, width, height, picFormat, dataFormat, dataType, 0, image, qfalse);
 }
 
 //===================================================================
@@ -2322,6 +2484,40 @@ void R_LoadImage( const char *name, byte **pic, int *width, int *height, GLenum
 			return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	// The original game will first try to load the JPG file before the TGA
+	// this is really dirty, but unfortunately without it,
+	// some unexpected artifacts (like broken UI elements) will appear
+    if (!Q_stricmp(ext, "tga")) {
+        char altJPEGName[MAX_QPATH];
+		int len;
+
+        Q_strncpyz(altJPEGName, name, sizeof(altJPEGName));
+
+        len = strlen(altJPEGName);
+		altJPEGName[len - 3] = 'j';
+		altJPEGName[len - 2] = 'p';
+		altJPEGName[len - 1] = 'g';
+
+		// Look for the correct loader and use it
+		for (i = 0; i < numImageLoaders; i++)
+		{
+			if (!Q_stricmp(imageLoaders[i].ext, "jpg"))
+			{
+				// Load
+				imageLoaders[i].ImageLoader(altJPEGName, pic, width, height);
+				break;
+			}
+		}
+
+		if (*pic) {
+			return;
+        }
+    }
+    //=========================
+
 	if( *ext )
 	{
 		// Look for the correct loader and use it
@@ -2766,7 +2962,7 @@ void R_CreateBuiltinImages( void ) {
 
 		tr.renderImage = R_CreateImage("_render", NULL, width, height, IMGTYPE_COLORALPHA, IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, hdrFormat);
 
-		if (r_shadowBlur->integer)
+		if (r_shadowBlur->integer || r_hdr->integer)
 			tr.screenScratchImage = R_CreateImage("screenScratch", NULL, width, height, IMGTYPE_COLORALPHA, IMGFLAG_NO_COMPRESSION | IMGFLAG_CLAMPTOEDGE, rgbFormat);
 
 		if (r_shadowBlur->integer || r_ssao->integer)
@@ -2902,6 +3098,13 @@ void R_SetColorMappings( void ) {
 	{
 		GLimp_SetGamma( s_gammatable, s_gammatable, s_gammatable );
 	}
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    tr.overbrightShift = r_mapOverBrightBits->integer - tr.overbrightBits;
+    tr.overbrightMult = (float)(1 << tr.overbrightShift);
+    //=========================
 }
 
 /*
@@ -3226,7 +3429,14 @@ void	R_SkinList_f( void ) {
 	ri.Printf (PRINT_ALL, "------------------\n");
 }
 
+//
+// OPENMOHAA-specific stuff
+//
 
+image_t* R_RefreshImageFile(const char* name, imgType_t type, imgFlags_t flags) {
+	// FIXME: unimplemented (GL2)
+	return NULL;
+}
 
 /*
 ================
@@ -3256,3 +3466,62 @@ qboolean R_ImageExists(const char* name) {
     return qfalse;
 }
 
+/*
+===============
+R_DumpTextureMemory
+===============
+*/
+void R_DumpTextureMemory() {
+    int i;
+    char str_buffer[32];
+    char* Label1, * Label2;
+    fileHandle_t stat_file;
+
+    stat_file = ri.FS_OpenFileWrite("textureuse.csv");
+
+    Label1 = "Texture Name,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Size (kb),";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+    Label1 = "Num Uses,";
+    ri.FS_Write(Label1, strlen(Label1), stat_file);
+    Label2 = "Miplevels\n";
+    ri.FS_Write(Label2, strlen(Label2), stat_file);
+
+    for (i = 0; i < tr.numImages; i++) {
+        image_t* image = tr.images[i];
+
+        ri.FS_Write(image->imgName, strlen(image->imgName), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the number of bytes (in KiB)
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->bytesUsed >> 10);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+
+        // Write the sequence
+        Q_snprintf(str_buffer, sizeof(str_buffer), "%d", image->r_sequence);
+        ri.FS_Write(str_buffer, strlen(str_buffer), stat_file);
+        ri.FS_Write(", ", 2, stat_file);
+    }
+}
+
+/*
+===============
+R_CountTextureMemory
+===============
+*/
+int R_CountTextureMemory() {
+    int total_bytes;
+    int i;
+
+    R_DumpTextureMemory();
+
+    total_bytes = 0;
+
+    for (i = 0; i < tr.numImages; i++) {
+        total_bytes = tr.images[i]->bytesUsed;
+    }
+
+    return total_bytes;
+}
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
index 64aa1c4c..c40b9d93 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
@@ -236,6 +236,107 @@ int		max_polys;
 cvar_t	*r_maxpolyverts;
 int		max_polyverts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+int r_sequencenumber;
+
+// DRAWING
+
+cvar_t *r_drawentitypoly;
+cvar_t *r_drawstaticmodels;
+cvar_t *r_drawstaticmodelpoly;
+cvar_t *r_drawstaticdecals;
+cvar_t *r_drawterrain;
+cvar_t *r_drawsprites;
+cvar_t *r_drawspherelights;
+
+cvar_t *r_numdebuglines;
+cvar_t *r_stipplelines;
+cvar_t *r_debuglines_depthmask;
+
+cvar_t	*r_maxpolys;
+int		max_polys;
+cvar_t	*r_maxpolyverts;
+int		max_polyverts;
+cvar_t* r_maxtermarks;
+int		max_termarks;
+
+cvar_t* r_skyportal;
+cvar_t* r_skyportal_origin;
+cvar_t* r_farplane;
+cvar_t* r_farplane_bias;
+cvar_t* r_farplane_color;
+cvar_t* r_farplane_nocull;
+cvar_t* r_farplane_nofog;
+cvar_t* r_skybox_farplane;
+cvar_t* r_farclip;
+
+// Lighting
+
+cvar_t* r_lightcoronasize;
+cvar_t *r_entlight_scale;
+cvar_t *r_entlight_errbound;
+cvar_t *r_entlight_cubelevel;
+cvar_t *r_entlight_cubefraction;
+cvar_t *r_entlight_maxcalc;
+cvar_t *r_light_lines;
+cvar_t *r_light_sun_line;
+cvar_t *r_light_int_scale;
+cvar_t *r_light_nolight;
+cvar_t *r_light_showgrid;
+
+// LOD
+
+cvar_t* r_staticlod;
+cvar_t* r_lodscale;
+cvar_t* r_lodcap;
+cvar_t* r_lodviewmodelcap;
+
+cvar_t* r_uselod;
+cvar_t* lod_LOD;
+cvar_t* lod_minLOD;
+cvar_t* lod_maxLOD;
+cvar_t* lod_LOD_slider;
+cvar_t* lod_curve_0_val;
+cvar_t* lod_curve_1_val;
+cvar_t* lod_curve_2_val;
+cvar_t* lod_curve_3_val;
+cvar_t* lod_curve_4_val;
+cvar_t* lod_edit_0;
+cvar_t* lod_edit_1;
+cvar_t* lod_edit_2;
+cvar_t* lod_edit_3;
+cvar_t* lod_edit_4;
+cvar_t* lod_curve_0_slider;
+cvar_t* lod_curve_1_slider;
+cvar_t* lod_curve_2_slider;
+cvar_t* lod_curve_3_slider;
+cvar_t* lod_curve_4_slider;
+cvar_t* lod_pitch_val;
+cvar_t* lod_zee_val;
+cvar_t* lod_mesh;
+cvar_t* lod_meshname;
+cvar_t* lod_tikiname;
+cvar_t* lod_metric;
+cvar_t* lod_tris;
+cvar_t* lod_position;
+cvar_t* lod_save;
+cvar_t* lod_tool;
+
+// Utils
+
+cvar_t* r_developer;
+cvar_t* r_fps;
+cvar_t* r_showstaticbboxes;
+cvar_t* r_showcull;
+cvar_t* r_showlod;
+cvar_t* r_showstaticlod;
+cvar_t* r_showportal;
+
+//=========================
+
 /*
 ** InitOpenGL
 **
@@ -279,8 +380,16 @@ static void InitOpenGL( void )
 		qglGetIntegerv( GL_MAX_TEXTURE_IMAGE_UNITS, &temp );
 		glConfig.numTextureUnits = temp;
 
+		qglGetIntegerv( GL_MAX_VERTEX_ATTRIBS, &temp );
+		glRefConfig.maxVertexAttribs = temp;
+
 		// reserve 160 components for other uniforms
-		qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_COMPONENTS, &temp );
+		if ( qglesMajorVersion ) {
+			qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_VECTORS, &temp );
+			temp *= 4;
+		} else {
+			qglGetIntegerv( GL_MAX_VERTEX_UNIFORM_COMPONENTS, &temp );
+		}
 		glRefConfig.glslMaxAnimatedBones = Com_Clamp( 0, IQM_MAX_JOINTS, ( temp - 160 ) / 16 );
 		if ( glRefConfig.glslMaxAnimatedBones < 12 ) {
 			glRefConfig.glslMaxAnimatedBones = 0;
@@ -451,21 +560,43 @@ Return value must be freed with ri.Hunk_FreeTempMemory()
 byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *padlen)
 {
 	byte *buffer, *bufstart;
-	int padwidth, linelen;
-	GLint packAlign;
-	
+	int padwidth, linelen, bytesPerPixel;
+	int yin, xin, xout;
+	GLint packAlign, format;
+
+	// OpenGL ES is only required to support reading GL_RGBA
+	if (qglesMajorVersion >= 1) {
+		format = GL_RGBA;
+		bytesPerPixel = 4;
+	} else {
+		format = GL_RGB;
+		bytesPerPixel = 3;
+	}
+
 	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-	
-	linelen = width * 3;
+
+	linelen = width * bytesPerPixel;
 	padwidth = PAD(linelen, packAlign);
-	
+
 	// Allocate a few more bytes so that we can choose an alignment we like
 	buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + packAlign - 1);
-	
-	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
 
-	qglReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart);
-	
+	bufstart = PADP((intptr_t) buffer + *offset, packAlign);
+	qglReadPixels(x, y, width, height, format, GL_UNSIGNED_BYTE, bufstart);
+
+	linelen = width * 3;
+
+	// Convert RGBA to RGB, in place, line by line
+	if (format == GL_RGBA) {
+		for (yin = 0; yin < height; yin++) {
+			for (xin = 0, xout = 0; xout < linelen; xin += 4, xout += 3) {
+				bufstart[yin*padwidth + xout + 0] = bufstart[yin*padwidth + xin + 0];
+				bufstart[yin*padwidth + xout + 1] = bufstart[yin*padwidth + xin + 1];
+				bufstart[yin*padwidth + xout + 2] = bufstart[yin*padwidth + xin + 2];
+			}
+		}
+	}
+
 	*offset = bufstart - buffer;
 	*padlen = padwidth - linelen;
 	
@@ -877,9 +1008,10 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 {
 	const videoFrameCommand_t	*cmd;
 	byte				*cBuf;
-	size_t				memcount, linelen;
+	size_t				memcount, bytesPerPixel, linelen, avilinelen;
 	int				padwidth, avipadwidth, padlen, avipadlen;
-	GLint packAlign;
+	int				yin, xin, xout;
+	GLint packAlign, format;
 
 	// finish any 2D drawing if needed
 	if(tess.numIndexes)
@@ -887,20 +1019,32 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	cmd = (const videoFrameCommand_t *)data;
 	
+	// OpenGL ES is only required to support reading GL_RGBA
+	if (qglesMajorVersion >= 1) {
+		format = GL_RGBA;
+		bytesPerPixel = 4;
+	} else {
+		format = GL_RGB;
+		bytesPerPixel = 3;
+	}
+
 	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
 
-	linelen = cmd->width * 3;
+	linelen = cmd->width * bytesPerPixel;
 
 	// Alignment stuff for glReadPixels
 	padwidth = PAD(linelen, packAlign);
 	padlen = padwidth - linelen;
+
+	avilinelen = cmd->width * 3;
+
 	// AVI line padding
-	avipadwidth = PAD(linelen, AVI_LINE_PADDING);
-	avipadlen = avipadwidth - linelen;
+	avipadwidth = PAD(avilinelen, AVI_LINE_PADDING);
+	avipadlen = avipadwidth - avilinelen;
 
 	cBuf = PADP(cmd->captureBuffer, packAlign);
 		
-	qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB,
+	qglReadPixels(0, 0, cmd->width, cmd->height, format,
 		GL_UNSIGNED_BYTE, cBuf);
 
 	memcount = padwidth * cmd->height;
@@ -911,7 +1055,21 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	if(cmd->motionJpeg)
 	{
-		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, linelen * cmd->height,
+		// Convert RGBA to RGB, in place, line by line
+		if (format == GL_RGBA) {
+			linelen = cmd->width * 3;
+			padlen = padwidth - linelen;
+
+			for (yin = 0; yin < cmd->height; yin++) {
+				for (xin = 0, xout = 0; xout < linelen; xin += 4, xout += 3) {
+					cBuf[yin*padwidth + xout + 0] = cBuf[yin*padwidth + xin + 0];
+					cBuf[yin*padwidth + xout + 1] = cBuf[yin*padwidth + xin + 1];
+					cBuf[yin*padwidth + xout + 2] = cBuf[yin*padwidth + xin + 2];
+				}
+			}
+		}
+
+		memcount = RE_SaveJPGToBuffer(cmd->encodeBuffer, avilinelen * cmd->height,
 			r_aviMotionJpegQuality->integer,
 			cmd->width, cmd->height, cBuf, padlen);
 		ri.CL_WriteAVIVideoFrame(cmd->encodeBuffer, memcount);
@@ -934,7 +1092,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 				*destptr++ = srcptr[2];
 				*destptr++ = srcptr[1];
 				*destptr++ = srcptr[0];
-				srcptr += 3;
+				srcptr += bytesPerPixel;
 			}
 			
 			Com_Memset(destptr, '\0', avipadlen);
@@ -1308,8 +1466,15 @@ void R_Register( void )
 	r_dlightBacks = ri.Cvar_Get( "r_dlightBacks", "1", CVAR_ARCHIVE );
 	r_finish = ri.Cvar_Get ("r_finish", "0", CVAR_ARCHIVE);
 	r_textureMode = ri.Cvar_Get( "r_textureMode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE );
+#ifdef __EMSCRIPTEN__
+	// Under Emscripten we don't throttle framerate with com_maxfps by default, so enable
+	// vsync by default instead.
+	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "1",
+					CVAR_ARCHIVE | CVAR_LATCH );
+#else
 	r_swapInterval = ri.Cvar_Get( "r_swapInterval", "0",
 					CVAR_ARCHIVE | CVAR_LATCH );
+#endif
 	r_gamma = ri.Cvar_Get( "r_gamma", "1", CVAR_ARCHIVE );
 	r_facePlaneCull = ri.Cvar_Get ("r_facePlaneCull", "1", CVAR_ARCHIVE );
 
@@ -1388,6 +1553,100 @@ void R_Register( void )
 	ri.Cmd_AddCommand( "minimize", GLimp_Minimize );
 	ri.Cmd_AddCommand( "gfxmeminfo", GfxMemInfo_f );
 	ri.Cmd_AddCommand( "exportCubemaps", R_ExportCubemaps_f );
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	ri.Cvar_CheckRange(r_subdivisions, 2, 24, qtrue);
+
+	// Draw
+
+    r_drawentitypoly = ri.Cvar_Get("r_drawentitypoly", "1", CVAR_CHEAT);
+    r_drawstaticmodels = ri.Cvar_Get("r_drawstaticmodels", "1", CVAR_CHEAT);
+    r_drawstaticmodelpoly = ri.Cvar_Get("r_drawstaticmodelpoly", "1", CVAR_CHEAT);
+    r_drawstaticdecals = ri.Cvar_Get("r_drawstaticdecals", "0", 0);
+    r_drawterrain = ri.Cvar_Get("r_drawterrain", "1", CVAR_CHEAT);
+    r_drawsprites = ri.Cvar_Get("r_drawsprites", "1", CVAR_CHEAT);
+    r_drawspherelights = ri.Cvar_Get("r_drawspherelights", "1", CVAR_CHEAT);
+
+    r_debuglines_depthmask = ri.Cvar_Get("r_debuglines_depthmask", "0", CVAR_ARCHIVE);
+    r_stipplelines = ri.Cvar_Get("r_stipplelines", "1", CVAR_ARCHIVE);
+    r_numdebuglines = ri.Cvar_Get("g_numdebuglines", "4096", CVAR_LATCH);
+
+	r_maxtermarks = ri.Cvar_Get("r_maxtermarks", va("%d", MAX_TERMARKS), 0);
+	
+    r_skyportal = ri.Cvar_Get("r_skyportal", "0", 0);
+    r_skyportal_origin = ri.Cvar_Get("r_skyportal_origin", "0 0 0", 0);
+	r_farplane = ri.Cvar_Get("r_farplane", "0", CVAR_CHEAT);
+	r_farplane_bias = ri.Cvar_Get("r_farplane_bias", "0", CVAR_CHEAT);
+	r_farplane_color = ri.Cvar_Get("r_farplane_color", ".5 .5 .5", CVAR_CHEAT);
+	r_farplane_nocull = ri.Cvar_Get("r_farplane_nocull", "0", CVAR_CHEAT);
+	r_farplane_nofog = ri.Cvar_Get("r_farplane_nofog", "0", CVAR_CHEAT);
+	r_skybox_farplane = ri.Cvar_Get("r_skybox_farplane", "0", CVAR_CHEAT);
+	r_farclip = ri.Cvar_Get("r_farclip", "0", CVAR_CHEAT);
+
+	// Lighting
+
+    r_lightcoronasize = ri.Cvar_Get("r_lightcoronasize", ".1", CVAR_ARCHIVE);
+    r_light_lines = ri.Cvar_Get("r_light_lines", "0", CVAR_CHEAT);
+    r_light_sun_line = ri.Cvar_Get("r_light_sun_line", "0", CVAR_CHEAT);
+    r_light_int_scale = ri.Cvar_Get("r_light_int_scale", "0.05", CVAR_ARCHIVE);
+    r_light_nolight = ri.Cvar_Get("r_light_nolight", "0", CVAR_CHEAT | CVAR_ARCHIVE);
+    r_light_showgrid = ri.Cvar_Get("r_light_showgrid", "0", CVAR_CHEAT);
+    r_entlight_scale = ri.Cvar_Get("r_entlight_scale", "1.3", CVAR_CHEAT);
+    r_entlight_errbound = ri.Cvar_Get("r_entlight_errbound", "6", CVAR_ARCHIVE);
+    r_entlight_cubelevel = ri.Cvar_Get("r_entlight_cubelevel", "0", CVAR_ARCHIVE);
+    r_entlight_cubefraction = ri.Cvar_Get("r_entlight_cubefraction", "0.5", CVAR_ARCHIVE);
+    r_entlight_maxcalc = ri.Cvar_Get("r_entlight_maxcalc", "2", CVAR_ARCHIVE);
+
+	// LOD
+
+	r_staticlod = ri.Cvar_Get("r_staticlod", "1", CVAR_CHEAT);
+	r_lodscale = ri.Cvar_Get("r_lodscale", "5", CVAR_ARCHIVE);
+	r_lodcap = ri.Cvar_Get("r_lodcap", "0.35", CVAR_ARCHIVE);
+	r_lodviewmodelcap = ri.Cvar_Get("r_lodviewmodelcap", "0.25", CVAR_ARCHIVE);
+	
+	r_uselod = ri.Cvar_Get("r_uselod", "1", CVAR_TEMP);
+	lod_LOD = ri.Cvar_Get("lod_LOD", "0", CVAR_TEMP);
+	lod_minLOD = ri.Cvar_Get("lod_minLOD", "1.0", CVAR_TEMP);
+	lod_maxLOD = ri.Cvar_Get("lod_maxLOD", "0.3", CVAR_TEMP);
+	lod_LOD_slider = ri.Cvar_Get("lod_LOD_slider", "0.5", CVAR_TEMP);
+	lod_edit_0 = ri.Cvar_Get("lod_edit_0", "0", CVAR_TEMP);
+	lod_edit_1 = ri.Cvar_Get("lod_edit_1", "0", CVAR_TEMP);
+	lod_edit_2 = ri.Cvar_Get("lod_edit_2", "0", CVAR_TEMP);
+	lod_edit_3 = ri.Cvar_Get("lod_edit_3", "0", CVAR_TEMP);
+	lod_edit_4 = ri.Cvar_Get("lod_edit_4", "0", CVAR_TEMP);
+	lod_curve_0_val = ri.Cvar_Get("lod_curve_0_val", "0", CVAR_TEMP);
+	lod_curve_1_val = ri.Cvar_Get("lod_curve_1_val", "0", CVAR_TEMP);
+	lod_curve_2_val = ri.Cvar_Get("lod_curve_2_val", "0", CVAR_TEMP);
+	lod_curve_3_val = ri.Cvar_Get("lod_curve_3_val", "0", CVAR_TEMP);
+	lod_curve_4_val = ri.Cvar_Get("lod_curve_4_val", "0", CVAR_TEMP);
+	lod_curve_0_slider = ri.Cvar_Get("lod_curve_0_slider", "0", CVAR_TEMP);
+	lod_curve_1_slider = ri.Cvar_Get("lod_curve_1_slider", "0", CVAR_TEMP);
+	lod_curve_2_slider = ri.Cvar_Get("lod_curve_2_slider", "0", CVAR_TEMP);
+	lod_curve_3_slider = ri.Cvar_Get("lod_curve_3_slider", "0", CVAR_TEMP);
+	lod_curve_4_slider = ri.Cvar_Get("lod_curve_4_slider", "0", CVAR_TEMP);
+	lod_pitch_val = ri.Cvar_Get("lod_pitch_val", "0", CVAR_TEMP);
+	lod_zee_val = ri.Cvar_Get("lod_zee_val", "0", CVAR_TEMP);
+	lod_mesh = ri.Cvar_Get("lod_mesh", "0", CVAR_TEMP);
+	lod_meshname = ri.Cvar_Get("lod_meshname", "", CVAR_TEMP);
+	lod_tikiname = ri.Cvar_Get("lod_tikiname", "", CVAR_TEMP);
+	lod_metric = ri.Cvar_Get("lod_metric", "0.0", CVAR_TEMP);
+	lod_tris = ri.Cvar_Get("lod_tris", "", CVAR_TEMP);
+	lod_save = ri.Cvar_Get("lod_save", "0", CVAR_TEMP);
+	lod_position = ri.Cvar_Get("lod_position", "0 0 0", CVAR_TEMP);
+	lod_tool = ri.Cvar_Get("lod_tool", "0", CVAR_TEMP);
+
+	// Utils
+
+    r_fps = ri.Cvar_Get("fps", "0", 0);
+    r_developer = ri.Cvar_Get("developer", "", 0);
+    r_showstaticbboxes = ri.Cvar_Get("r_showstaticbboxes", "0", CVAR_CHEAT);
+    r_showcull = ri.Cvar_Get("r_showcull", "0", CVAR_CHEAT);
+    r_showlod = ri.Cvar_Get("r_showlod", "0", CVAR_TEMP);
+    r_showstaticlod = ri.Cvar_Get("r_showstaticlod", "0", CVAR_TEMP);
+    r_showportal = ri.Cvar_Get("r_showportal", "0", 0);
 }
 
 void R_InitQueries(void)
@@ -1503,6 +1762,22 @@ void R_Init( void ) {
 
 	R_InitQueries();
 
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+
+    R_Sky_Init();
+
+    max_termarks = r_maxtermarks->integer;
+    if (max_termarks < MAX_TERMARKS)
+        max_termarks = MAX_TERMARKS;
+
+    R_LevelMarksInit();
+
+    tr.pFontDebugStrings = R_LoadFont("verdana-14");
+    g_bInfoworldtris = qfalse;
+
+	//=========================
 
 	err = qglGetError();
 	if ( err != GL_NO_ERROR )
@@ -1561,9 +1836,49 @@ void RE_Shutdown( qboolean destroyWindow ) {
 		Com_Memset( &glState, 0, sizeof( glState ) );
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    R_ShutdownTerrain();
+    //=========================
+
 	tr.registered = qfalse;
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+** RE_BeginRegistration
+*/
+void RE_BeginRegistration(glconfig_t* glconfigOut) {
+
+    R_Init();
+
+    *glconfigOut = glConfig;
+
+    R_IssuePendingRenderCommands();
+
+    tr.viewCluster = -1;		// force markleafs to regenerate
+    R_ClearFlares();
+    RE_ClearScene();
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    R_LevelMarksFree();
+    R_TerrainFree();
+
+    R_InitLensFlare();
+    R_LevelMarksInit();
+
+    ri.UI_LoadResource("*124");
+	//=========================
+
+    tr.registered = qtrue;
+}
+//=========================
 
 /*
 =============
@@ -1579,6 +1894,53 @@ void RE_EndRegistration( void ) {
 	}
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+==================
+R_SetMode
+==================
+*/
+qboolean R_SetMode(int mode, const glconfig_t* glConfig) {
+    // FIXME: unimplemented (GL2)
+	ri.Printf(PRINT_WARNING, "R_SetMode is unimplemented. To change the video mode, set the \"r_mode\" variable and execute the \"vid_restart\" command.\n");
+	return qfalse;
+}
+
+/*
+==================
+R_SetFullscreen
+==================
+*/
+void R_SetFullscreen(qboolean fullscreen) {
+    // FIXME: unimplemented (GL2)
+    ri.Printf(PRINT_WARNING, "R_SetFullscreen is unimplemented. To change the fullscreen mode, set the \"r_fullscreen\" variable and execute the \"vid_restart\" command.\n");
+}
+
+/*
+=============
+RE_SetRenderTime
+=============
+*/
+void RE_SetRenderTime(int t) {
+    backEnd.refdef.floatTime = (long double)t / 1000.0;
+    R_UpdateGhostTextures();
+}
+
+/*
+==================
+RE_GetGraphicsInfo
+==================
+*/
+const char* RE_GetGraphicsInfo() {
+	// FIXME: unimplemented (GL2)
+	// Looks like it's unused anyway
+	return "";
+}
+
+//=========================
 
 /*
 @@@@@@@@@@@@@@@@@@@@@
@@ -1625,16 +1987,16 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 	re.ModelBounds = R_ModelBounds;
 
 	re.ClearScene = RE_ClearScene;
-	re.AddRefEntityToScene = RE_AddRefEntityToScene;
-	re.AddPolyToScene = RE_AddPolyToScene;
+	re.AddRefEntityToScene = RE_AddRefEntityToScene2;
+	re.AddPolyToScene = RE_AddPolyToScene2;
 	re.LightForPoint = R_LightForPoint;
-	re.AddLightToScene = RE_AddLightToScene;
+	re.AddLightToScene = RE_AddLightToScene2;
 	re.AddAdditiveLightToScene = RE_AddAdditiveLightToScene;
 	re.RenderScene = RE_RenderScene;
 
 	re.SetColor = RE_SetColor;
 	re.DrawStretchPic = RE_StretchPic;
-	re.DrawStretchRaw = RE_StretchRaw;
+	re.DrawStretchRaw = RE_StretchRaw2;
 	re.UploadCinematic = RE_UploadCinematic;
 
 	re.RegisterFont = RE_RegisterFont;
@@ -1644,7 +2006,71 @@ refexport_t *GetRefAPI ( int apiVersion, refimport_t *rimp ) {
 
 	re.TakeVideoFrame = RE_TakeVideoFrame;
 
-	GetRefAPI_new(rimp, &re);
+	//
+	// After ioquake3 imports
+	//
+
+    re.FreeModels = RE_FreeModels;
+	re.EndRegistration = RE_EndRegistration;
+    re.SpawnEffectModel = RE_SpawnEffectModel;
+    re.RegisterServerModel = RE_RegisterServerModel;
+    re.UnregisterServerModel = RE_UnregisterServerModel;
+	re.RefreshShaderNoMip = RE_RefreshShaderNoMip;
+	re.PrintBSPFileSizes = RE_PrintBSPFileSizes;
+	re.MapVersion = RE_MapVersion;
+    re.LoadFont = R_LoadFont;
+
+    re.MarkFragmentsForInlineModel = R_MarkFragmentsForInlineModel;
+    re.GetInlineModelBounds = R_GetInlineModelBounds;
+    re.GetLightingForDecal = R_GetLightingForDecal;
+    re.GetLightingForSmoke = R_GetLightingForSmoke;
+    re.R_GatherLightSources = R_GatherLightSources;
+    re.ModelRadius = R_ModelRadius;
+    re.AddPolyToScene = RE_AddPolyToScene2;
+    re.AddRefSpriteToScene = RE_AddRefSpriteToScene;
+    re.AddTerrainMarkToScene = RE_AddTerrainMarkToScene;
+
+    re.GetRenderEntity = RE_GetRenderEntity;
+
+	re.SavePerformanceCounters = R_SavePerformanceCounters;
+
+	re.R_Model_GetHandle = R_Model_GetHandle;
+	re.SetColor = Draw_SetColor;
+	re.DrawStretchPic = Draw_StretchPic;
+	re.DrawStretchPic2 = Draw_StretchPic2;
+	re.DrawStretchRaw = RE_StretchRaw2;
+	re.DebugLine = R_DebugLine;
+	re.DrawTilePic = Draw_TilePic;
+	re.DrawTilePicOffset = Draw_TilePicOffset;
+	re.DrawTrianglePic = Draw_TrianglePic;
+	re.DrawBox = DrawBox;
+	re.AddBox = AddBox;
+	re.Set2DWindow = Set2DWindow;
+	re.Scissor = RE_Scissor;
+	re.DrawLineLoop = DrawLineLoop;
+	re.DrawString = R_DrawString;
+	re.GetFontHeight = R_GetFontHeight;
+	re.GetFontStringWidth = R_GetFontStringWidth;
+	re.SwipeBegin = RE_SwipeBegin;
+	re.SwipeEnd = RE_SwipeEnd;
+	re.SetRenderTime = RE_SetRenderTime;
+	re.Noise = R_NoiseGet4f;
+
+	re.SetMode = R_SetMode;
+	re.SetFullscreen = R_SetFullscreen;
+
+	re.GetShaderHeight = RE_GetShaderHeight;
+	re.GetShaderWidth = RE_GetShaderWidth;
+	re.GetShaderName = RE_GetShaderName;
+	re.GetModelName = RE_GetModelName;
+	re.GetGraphicsInfo = RE_GetGraphicsInfo;
+	re.ForceUpdatePose = RE_ForceUpdatePose;
+	re.TIKI_Orientation = RE_TIKI_Orientation;
+	re.TIKI_IsOnGround = RE_TIKI_IsOnGround;
+	re.SetFrameNumber = RE_SetFrameNumber;
+
+	re.ImageExists = R_ImageExists;
+	re.CountTextureMemory = R_CountTextureMemory;
 
 	return &re;
 }
diff --git a/code/renderergl2/tr_light.c b/code/renderergl2/tr_light.c
index 3ac2154e..183f7280 100644
--- a/code/renderergl2/tr_light.c
+++ b/code/renderergl2/tr_light.c
@@ -127,6 +127,7 @@ R_SetupEntityLightingGrid
 
 =================
 */
+#if 0
 static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
 	vec3_t	lightOrigin;
 	int		pos[3];
@@ -277,6 +278,9 @@ static void R_SetupEntityLightingGrid( trRefEntity_t *ent, world_t *world ) {
 
 	VectorNormalize2( direction, ent->lightDir );
 }
+#endif
+
+static void R_SetupEntityLightingGrid(trRefEntity_t* ent, world_t* world);
 
 
 /*
@@ -461,7 +465,7 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 	return qtrue;
 }
 
-
+#if 0
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world )
 {
 	trRefEntity_t ent;
@@ -480,7 +484,7 @@ int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *w
 
 	return qtrue;
 }
-
+#endif
 
 int R_CubemapForPoint( vec3_t point )
 {
@@ -509,3 +513,392 @@ int R_CubemapForPoint( vec3_t point )
 
 	return cubemapIndex + 1;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+===============
+RB_SetupEntityGridLighting
+===============
+*/
+void RB_SetupEntityGridLighting()
+{
+	// FIXME: unimplemented
+}
+
+/*
+===============
+RB_SetupStaticModelGridLighting
+===============
+*/
+void RB_SetupStaticModelGridLighting(trRefdef_t *refdef, cStaticModelUnpacked_t *ent, const vec3_t lightOrigin)
+{
+    // FIXME: unimplemented
+}
+
+/*
+===============
+R_PointInLeaf
+===============
+*/
+mnode_t *R_FindPoint( world_t *world, const vec3_t p ) {
+	mnode_t		*node;
+	float		d;
+	cplane_t	*plane;
+
+	node = world->nodes;
+	while( 1 ) {
+		if (node->contents != -1) {
+			break;
+		}
+		plane = node->plane;
+		d = DotProduct (p,plane->normal) - plane->dist;
+		if (d > 0) {
+			node = node->children[0];
+		} else {
+			node = node->children[1];
+		}
+	}
+	
+	return node;
+}
+
+/*
+===============
+R_GetLightGridPalettedColor
+===============
+*/
+static byte *R_GetLightGridPalettedColor(world_t *world, int iColor)
+{
+    return &world->lightGridPalette[iColor * 3];
+}
+
+/*
+===============
+R_GetLightingGridValue
+===============
+*/
+void R_GetLightingGridValue(world_t *world, const vec3_t vPos, vec3_t vAmbientLight, vec3_t vDirectedLight)
+{
+    byte  *pColor;
+    int    iBaseOffset;
+    int    i;
+    int    iOffset;
+    int    iRowPos;
+    int    iData;
+    int    iLen;
+    int    iGridPos[3];
+    int    iArrayXStep;
+    float  fV;
+    float  fFrac[3];
+    float  fOMFrac[3];
+    float  fWeight, fWeight2;
+    float  fTotalFactor;
+    int    iCurData;
+    vec3_t vLightOrigin;
+    byte  *pCurData;
+
+    if (!world || !world->lightGridData || !world->lightGridOffsets) {
+		vDirectedLight[0] = vDirectedLight[1] = vDirectedLight[2] = tr.identityLightByte;
+		vAmbientLight[0] = vAmbientLight[1] = vAmbientLight[2] = tr.identityLightByte;
+        return;
+    }
+
+    VectorSubtract(vPos, world->lightGridOrigin, vLightOrigin);
+
+    for (i = 0; i < 3; i++) {
+        fV          = vLightOrigin[i] * world->lightGridInverseSize[i];
+        iGridPos[i] = floor(fV);
+        fFrac[i]    = fV - iGridPos[i];
+        fOMFrac[i]  = 1.0 - fFrac[i];
+
+        if (iGridPos[i] < 0) {
+            iGridPos[i] = 0;
+        } else if (iGridPos[i] > world->lightGridBounds[i] - 2) {
+            iGridPos[i] = world->lightGridBounds[i] - 2;
+        }
+    }
+
+    fTotalFactor = 0;
+    iArrayXStep  = world->lightGridBounds[1];
+    iBaseOffset  = world->lightGridBounds[0] + iGridPos[1] + iArrayXStep * iGridPos[0];
+    VectorClear(vDirectedLight);
+    VectorClear(vAmbientLight);
+
+    for (i = 0; i < 4; i++) {
+        qboolean bContinue = qfalse;
+
+        switch (i) {
+        case 0:
+            fWeight  = fOMFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset] + (world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 1:
+            fWeight  = fOMFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fOMFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + 1] + (world->lightGridOffsets[iGridPos[0]] << 8);
+            break;
+        case 2:
+            fWeight  = fFrac[0] * fOMFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fOMFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + iArrayXStep]
+                    + (world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        case 3:
+            fWeight  = fFrac[0] * fFrac[1] * fOMFrac[2];
+            fWeight2 = fFrac[0] * fFrac[1] * fFrac[2];
+            iOffset  = world->lightGridOffsets[iBaseOffset + iArrayXStep + 1]
+                    + (world->lightGridOffsets[iGridPos[0] + 1] << 8);
+            break;
+        }
+
+        iRowPos  = iGridPos[2];
+        pCurData = &world->lightGridData[iOffset];
+        iData    = 0;
+
+        while (1) {
+            while (1) {
+                iCurData = (char)pCurData[iData];
+                iData++;
+                if (iCurData >= 0) {
+                    break;
+                }
+
+                iLen = -iCurData;
+                if (iLen > iRowPos) {
+                    iData += iRowPos;
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                        VectorMA(vAmbientLight, fWeight, pColor, vAmbientLight);
+                        fTotalFactor += fWeight;
+                    }
+
+                    iData++;
+                    if (iLen - 1 == iRowPos) {
+                        iData++;
+                    }
+
+                    if (pCurData[iData]) {
+                        pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                        VectorMA(vDirectedLight, fWeight2, pColor, vDirectedLight);
+                        fTotalFactor += fWeight2;
+                    }
+
+                    bContinue = qtrue;
+                    break;
+                }
+
+                iRowPos -= iLen;
+                iData += iLen;
+            }
+
+            if (bContinue) {
+                break;
+            }
+
+            iLen = iCurData + 2;
+            if (iLen - 1 >= iRowPos) {
+                break;
+            }
+
+            iRowPos -= iLen;
+            iData++;
+        }
+
+        if (bContinue) {
+            continue;
+        }
+
+        if (iLen - 1 > iRowPos) {
+            if (!pCurData[iData]) {
+                continue;
+            }
+
+            pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+            VectorMA(vAmbientLight, fWeight + fWeight2, pColor, vAmbientLight);
+            VectorMA(vDirectedLight, fWeight + fWeight2, pColor, vDirectedLight);
+            fTotalFactor += fWeight + fWeight2;
+        } else {
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                VectorMA(vAmbientLight, fWeight, pColor, vAmbientLight);
+                fTotalFactor += fWeight;
+            }
+
+            iData += 2;
+            if (pCurData[iData]) {
+                pColor = R_GetLightGridPalettedColor(world, pCurData[iData]);
+                VectorMA(vDirectedLight, fWeight2, pColor, vDirectedLight);
+                fTotalFactor += fWeight2;
+            }
+        }
+    }
+
+    if (fTotalFactor > 0.0 && fTotalFactor < 0.99) {
+        VectorScale(vAmbientLight, 1.0 / fTotalFactor, vAmbientLight);
+        VectorScale(vDirectedLight, 1.0 / fTotalFactor, vDirectedLight);
+    }
+
+    if (fTotalFactor) {
+		/*
+        if (vLight[0] > 255.0 || vLight[1] > 255.0 || vLight[2] > 255.0) {
+            float t;
+            // normalize color values
+            t = 255.0 / Q_max(vLight[0], Q_max(vLight[1], vLight[2]));
+            VectorScale(vLight, t, vLight);
+        }
+		*/
+    } else {
+		vDirectedLight[0] = vDirectedLight[1] = vDirectedLight[2] = tr.identityLightByte;
+		vAmbientLight[0] = vAmbientLight[1] = vAmbientLight[2] = tr.identityLightByte;
+    }
+}
+
+/*
+===============
+R_GetLightingForDecal
+===============
+*/
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+===============
+R_GetLightingForSmoke
+===============
+*/
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin)
+{
+	// FIXME: unimplemented (GL2)
+}
+
+qboolean R_FindGridPointForSphere(world_t *world, const vec3_t sphereOrigin, const vec3_t point, vec3_t out) {
+    int i, j, k;
+    int gridStep[3][3];
+	trace_t trace;
+
+    for (i = 0; i < 3; i++) {
+        gridStep[i][0] = 0;
+        gridStep[i][1] = -world->lightGridSize[i];
+        gridStep[i][2] = world->lightGridSize[i];
+    }
+
+	for (i = 0; i < 3; i++) {
+		for (j = 0; j < 3; j++) {
+			for (k = 0; k < 3; k++) {
+				vec3_t vOffset;
+
+                vOffset[0] = point[0] + gridStep[0][i];
+                vOffset[1] = point[1] + gridStep[1][j];
+                vOffset[2] = point[2] + gridStep[2][k];
+
+				ri.CM_BoxTrace(&trace, point, sphereOrigin, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+				if (trace.fraction == 1 || trace.surfaceFlags & SURF_SKY) {
+					return qtrue;
+				}
+			}
+		}
+	}
+
+	return qfalse;
+}
+
+int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world )
+{
+    vec3_t vLight;
+    vec3_t vEnd;
+    mnode_t* leaf;
+    trace_t trace;
+    vec3_t summedDir;
+    float addSize;
+    int iNumLights;
+    int i;
+	int j, k, l;
+    int gridStep[3][3];
+
+	if ( world->lightGridData == NULL )
+	  return qfalse;
+
+    VectorClear(summedDir);
+	leaf = NULL;
+	iNumLights = 0;
+
+    if (world->vis) {
+        leaf = R_FindPoint(world, point);
+        if (leaf->area == -1 || !leaf->numlights) {
+            leaf = NULL;
+        }
+    }
+
+    if (leaf && leaf->numlights) {
+        spherel_t* sphere;
+
+		for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
+			sphere = leaf->lights[i];
+			if (sphere->leaf != (mnode_t*)-1) {
+				byte mask = backEnd.refdef.areamask[sphere->leaf->area >> 3];
+
+                if (!(mask & (1 << (sphere->leaf->area & 7)))) {
+
+                    ri.CM_BoxTrace(&trace, point, sphere->origin, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+                    if (trace.fraction == 1) {
+                        vec3_t dir;
+
+                        VectorSubtract(sphere->origin, point, dir);
+
+                        addSize = VectorLength(sphere->color);
+                        VectorMA(summedDir, addSize, dir, summedDir);
+
+                        iNumLights++;
+                    }
+				}
+			}
+		}
+	}
+	
+    if (s_sun.exists) {
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            vec3_t newPoint;
+
+            VectorMA(point, 16384.0, s_sun.direction, vEnd);
+
+
+            ri.CM_BoxTrace(&trace, point, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+            if (trace.surfaceFlags & SURF_SKY) {
+                addSize = VectorLength(s_sun.color);
+
+                VectorMA(summedDir, addSize, s_sun.direction, summedDir);
+
+                iNumLights++;
+            }
+        }
+    }
+
+	VectorNormalize(summedDir);
+
+    if (DotProduct(summedDir, normal) > 0.2f)
+        VectorCopy(summedDir, lightDir);
+    else
+        VectorCopy(normal, lightDir);
+
+	return qtrue;
+}
+
+static void R_SetupEntityLightingGrid(trRefEntity_t* ent, world_t* world)
+{
+	vec3_t normal;
+
+    R_GetLightingGridValue(world, ent->e.origin, ent->ambientLight, ent->directedLight);
+
+	VectorSet(normal, 1, 0, 0);
+    R_LightDirForPoint(ent->e.origin, ent->lightDir, normal, world);
+}
diff --git a/code/renderergl2/tr_local.h b/code/renderergl2/tr_local.h
index fa451e27..9c517dcc 100644
--- a/code/renderergl2/tr_local.h
+++ b/code/renderergl2/tr_local.h
@@ -51,16 +51,16 @@ QGL_ARB_occlusion_query_PROCS;
 QGL_ARB_framebuffer_object_PROCS;
 QGL_ARB_vertex_array_object_PROCS;
 QGL_EXT_direct_state_access_PROCS;
-
-//
-// non-ioq3
-//
-//QGL_DESKTOP_1_1_FIXED_FUNCTION_PROCS;
-//QGL_1_1_FIXED_FUNCTION_PROCS;
 #undef GLE
 
-#define GL_INDEX_TYPE		GL_UNSIGNED_INT
-typedef unsigned int glIndex_t;
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GL_INDEX_TYPE		GL_UNSIGNED_SHORT
+typedef unsigned short glIndex_t;
+
+typedef unsigned int vaoCacheGlIndex_t;
 
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
 
@@ -78,12 +78,24 @@ typedef unsigned int glIndex_t;
 #define MAX_DRAWN_PSHADOWS    16 // do not increase past 32, because bit flags are used on surfaces
 #define PSHADOW_MAP_SIZE      512
 
+//
+// OPENMOHAA-specific stuff
+//=========================
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#define MAX_SPHERE_LIGHTS		512
+#define	MAX_SPRITESURFS			0x8000
 
-#include "new/tr_local_begin.h"
+#define MAX_SPRITE_DIST				16384.0f
+#define MAX_SPRITE_DIST_SQUARED		(MAX_SPRITE_DIST * MAX_SPRITE_DIST)
+
+typedef enum {
+    USE_S_COORDS,
+    USE_T_COORDS
+} texDirection_t;
+
+#define BUNDLE_ANIMATE_ONCE		1
+
+//=========================
 
 typedef struct cubemap_s {
 	char name[MAX_QPATH];
@@ -99,6 +111,12 @@ typedef struct dlight_s {
 
 	vec3_t	transformed;		// origin in local coordinate system
 	int		additive;			// texture detail is lost tho when the lightmap is dark
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    dlighttype_t type;
 } dlight_t;
 
 
@@ -117,6 +135,13 @@ typedef struct {
 	vec3_t		ambientLight;	// color normalized to 0-255
 	int			ambientLightInt;	// 32 bit rgba packed
 	vec3_t		directedLight;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    int			iGridLighting;
+    float		lodpercentage[2];
 } trRefEntity_t;
 
 
@@ -226,7 +251,14 @@ typedef enum {
 	DEFORM_TEXT4,
 	DEFORM_TEXT5,
 	DEFORM_TEXT6,
-	DEFORM_TEXT7
+	DEFORM_TEXT7,
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	DEFORM_LIGHTGLOW,
+	DEFORM_FLAP_S,
+	DEFORM_FLAP_T,
+	//=========================
 } deform_t;
 
 // deformVertexes types that can be handled by the GPU
@@ -260,18 +292,26 @@ typedef enum {
 	AGEN_PORTAL,
     AGEN_CONST,
 
-	//
-	// non-ioq3
-	//
-    AGEN_GLOBAL_ALPHA,
-    AGEN_SKYALPHA,
-    AGEN_ONE_MINUS_SKYALPHA,
-    AGEN_SCOORD,
-    AGEN_TCOORD,
-    AGEN_DIST_FADE,
+    //
+    // OPENMOHAA-specific stuff
+    //
+	
+	AGEN_NOISE,
+	AGEN_DOT,
+	AGEN_ONE_MINUS_DOT,
+	AGEN_CONSTANT,
+	AGEN_GLOBAL_ALPHA,
+	AGEN_SKYALPHA,
+	AGEN_ONE_MINUS_SKYALPHA,
+	AGEN_SCOORD,
+	AGEN_TCOORD,
+	AGEN_DIST_FADE,
     AGEN_ONE_MINUS_DIST_FADE,
-    AGEN_DOT_VIEW,
-    AGEN_ONE_MINUS_DOT_VIEW,
+    AGEN_TIKI_DIST_FADE,
+    AGEN_ONE_MINUS_TIKI_DIST_FADE,
+	AGEN_DOT_VIEW,
+	AGEN_ONE_MINUS_DOT_VIEW,
+	AGEN_HEIGHT_FADE,
 } alphaGen_t;
 
 typedef enum {
@@ -288,11 +328,12 @@ typedef enum {
 	CGEN_WAVEFORM,			// programmatically generated
 	CGEN_LIGHTING_DIFFUSE,
 	CGEN_FOG,				// standard fog
-    CGEN_CONST,				// fixed color
+	CGEN_CONST,				// fixed color
+
 	//
-	// non-ioq3 values
+	// OPENMOHAA-specific stuff
 	//
-    CGEN_CONSTANT = CGEN_CONST,
+	
     CGEN_MULTIPLY_BY_WAVEFORM,
     CGEN_LIGHTING_GRID,
     CGEN_LIGHTING_SPHERICAL,
@@ -302,7 +343,7 @@ typedef enum {
     CGEN_SCOORD,
     CGEN_TCOORD,
     CGEN_DOT,
-    CGEN_ONE_MINUS_DOT
+    CGEN_ONE_MINUS_DOT,
 } colorGen_t;
 
 typedef enum {
@@ -383,7 +424,12 @@ typedef struct {
 } texModInfo_t;
 
 
-#define	MAX_IMAGE_ANIMATIONS	8
+//#define	MAX_IMAGE_ANIMATIONS	8
+//
+// OPENMOHAA-specific stuff
+//=========================
+#define	MAX_IMAGE_ANIMATIONS	64
+//=========================
 
 typedef struct {
 	image_t			*image[MAX_IMAGE_ANIMATIONS];
@@ -399,6 +445,13 @@ typedef struct {
 	int				videoMapHandle;
 	qboolean		isLightmap;
 	qboolean		isVideoMap;
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    float imageAnimationPhase;
+    int flags;
+    //=========================
 } textureBundle_t;
 
 enum
@@ -455,6 +508,17 @@ typedef struct {
 	vec4_t normalScale;
 	vec4_t specularScale;
 
+	//
+	// OPENMOHAA-SPECIFIC stuff
+	//
+
+	float			alphaMin;
+	float			alphaMax;
+	vec3_t			specOrigin;
+
+    byte			colorConst[4];			// for CGEN_CONST and AGEN_CONST
+	byte			alphaConst;
+	byte			alphaConstMin;
 } shaderStage_t;
 
 struct shaderCommands_s;
@@ -481,6 +545,24 @@ typedef struct {
 	float	depthForOpaque;
 } fogParms_t;
 
+//
+// OPENMOHAA-specific stuff
+//
+//=============================
+
+typedef enum {
+	SPRITE_PARALLEL,
+	SPRITE_PARALLEL_ORIENTED,
+	SPRITE_ORIENTED,
+	SPRITE_PARALLEL_UPRIGHT
+} spriteType_t;
+
+typedef struct {
+  spriteType_t type;
+  float scale;
+} spriteParms_t;
+
+//=============================
 
 typedef struct shader_s {
 	char		name[MAX_QPATH];		// game path, including extension
@@ -536,8 +618,11 @@ typedef struct shader_s {
 	struct	shader_s	*next;
 
 	//
-	// non-ioq3
-    //
+	// OPENMOHAA-specific stuff
+	//
+	qboolean force32bit;
+    float fDistRange;
+    float fDistNear;
     spriteParms_t sprite;
 } shader_t;
 
@@ -686,8 +771,14 @@ typedef enum
 
 	UNIFORM_ENABLETEXTURES,
 
-	UNIFORM_DIFFUSETEXMATRIX,
-	UNIFORM_DIFFUSETEXOFFTURB,
+	UNIFORM_DIFFUSETEXMATRIX0,
+	UNIFORM_DIFFUSETEXMATRIX1,
+	UNIFORM_DIFFUSETEXMATRIX2,
+	UNIFORM_DIFFUSETEXMATRIX3,
+	UNIFORM_DIFFUSETEXMATRIX4,
+	UNIFORM_DIFFUSETEXMATRIX5,
+	UNIFORM_DIFFUSETEXMATRIX6,
+	UNIFORM_DIFFUSETEXMATRIX7,
 
 	UNIFORM_TCGEN0,
 	UNIFORM_TCGEN0VECTOR0,
@@ -816,6 +907,33 @@ typedef struct {
 
 	float       autoExposureMinMax[2];
 	float       toneMinAvgMaxLinear[3];
+
+	
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    int num_sprites;
+	struct refSprite_s *sprites;
+
+	int numTerMarks;
+	struct srfMarkFragment_s *terMarks;
+
+	int numSpriteSurfs;
+	struct drawSurf_s *spriteSurfs;
+
+    int numStaticModels;
+    struct cStaticModelUnpacked_s *staticModels;
+
+    int numStaticModelData;
+    unsigned char *staticModelData;
+
+    qboolean sky_portal;
+    float sky_alpha;
+    vec3_t sky_origin;
+    vec3_t sky_axis[3];
+    qboolean skybox_farplane;
+    qboolean render_terrain;
 } trRefdef_t;
 
 
@@ -853,6 +971,19 @@ typedef struct {
 	float		surface[4];
 } fog_t;
 
+//
+// OPENMOHAA-specific stuff
+// 
+//=========================
+typedef struct depthfog_s {
+	float len;
+	float oolen;
+	int enabled;
+	int extrafrustums;
+} depthfog_t;
+
+//=========================
+
 typedef enum {
 	VPF_NONE            = 0x00,
 	VPF_NOVIEWMODEL     = 0x01,
@@ -886,6 +1017,18 @@ typedef struct {
 	float		zFar;
 	float       zNear;
 	stereoFrame_t	stereoFrame;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    qboolean	isPortalSky;		// since 2.0 whether or not this view is a portal sky
+    depthfog_t	fog;
+    float		farplane_distance;
+    float		farplane_bias; // added in 2.0
+    float		farplane_color[3];
+    qboolean	farplane_cull;
+    qboolean	renderTerrain; // added in 2.0
 } viewParms_t;
 
 
@@ -915,19 +1058,15 @@ typedef enum {
 	SF_VAO_IQM,
 
 	//
-	// non-ioq3 stuff
+	// OPENMOHAA-specific stuff
 	//
+
     SF_MARK_FRAG,
-	SF_DISPLAY_LIST,
     SF_TIKI_SKEL,
     SF_TIKI_STATIC,
     SF_SWIPE,
     SF_SPRITE,
     SF_TERRAIN_PATCH,
-
-	//
-	//
-	//
 	SF_NUM_SURFACE_TYPES,
 	SF_MAX = 0x7fffffff			// ensures that sizeof( surfaceType_t ) == sizeof( int )
 } surfaceType_t;
@@ -951,6 +1090,12 @@ typedef struct srfPoly_s {
 	int				fogIndex;
 	int				numVerts;
 	polyVert_t		*verts;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    int renderfx;
 } srfPoly_t;
 
 
@@ -1109,6 +1254,212 @@ typedef struct srfVaoMdvMesh_s
 
 extern	void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])(void *);
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+typedef struct {
+    struct mnode_s* cntNode;
+    struct msurface_s* skySurfs[32];
+    int numSurfs;
+    vec3_t offset;
+    vec3_t mins;
+    vec3_t maxs;
+} portalsky_t;
+
+typedef struct {
+    vec3_t transformed;
+    int index;
+} sphere_dlight_t;
+
+typedef enum {
+    LIGHT_POINT,
+    LIGHT_DIRECTIONAL,
+    LIGHT_SPOT,
+    LIGHT_SPOT_FAST
+} lighttype_t;
+
+typedef struct reallightinfo_s {
+    vec3_t color;
+    lighttype_t eType;
+    float fIntensity;
+    float fDist;
+    float fSpotSlope;
+    float fSpotConst;
+    float fSpotScale;
+    vec3_t vOrigin;
+    vec3_t vDirection;
+} reallightinfo_t;
+
+typedef float cube_entry_t[3][4];
+
+typedef struct {
+    vec3_t origin;
+    vec3_t worldOrigin;
+    vec3_t traceOrigin;
+    float radius;
+    struct mnode_s* leaves[8];
+    void(*TessFunction) (unsigned char* dstColors);
+    union {
+        unsigned char level[4];
+        int value;
+    } ambient;
+    int numRealLights;
+    reallightinfo_t light[MAX_REAL_LIGHTS];
+    int bUsesCubeMap;
+    float cubemap[24][3][4];
+} sphereor_t;
+
+typedef struct spherel_s {
+    vec3_t origin;
+	vec3_t color;
+    float intensity;
+    struct mnode_s* leaf;
+    int needs_trace;
+    int spot_light;
+    float spot_radiusbydistance;
+	vec3_t spot_dir;
+    int reference_count;
+} spherel_t;
+
+typedef struct suninfo_s {
+	vec3_t color;
+	vec3_t direction;
+	vec3_t flaredirection;
+	char szFlareName[64];
+	qboolean exists;
+} suninfo_t;
+
+typedef union varnodeUnpacked_u {
+    float fVariance;
+    int flags;
+} varnodeUnpacked_t;
+
+typedef unsigned short terraInt;
+
+typedef struct terrainVert_s {
+    vec3_t xyz;
+    vec2_t texCoords[2];
+    float fVariance;
+    float fHgtAvg;
+    float fHgtAdd;
+    unsigned int uiDistRecalc;
+    terraInt nRef;
+    terraInt iVertArray;
+    byte* pHgt;
+    terraInt iNext;
+    terraInt iPrev;
+} terrainVert_t;
+
+typedef struct terraTri_s {
+    unsigned short iPt[3];
+    terraInt nSplit;
+    unsigned int uiDistRecalc;
+    struct cTerraPatchUnpacked_s* patch;
+    varnodeUnpacked_t* varnode;
+    terraInt index;
+    byte lod;
+    byte byConstChecks;
+    terraInt iLeft;
+    terraInt iRight;
+    terraInt iBase;
+    terraInt iLeftChild;
+    terraInt iRightChild;
+    terraInt iParent;
+    terraInt iPrev;
+    terraInt iNext;
+} terraTri_t;
+
+typedef struct srfTerrain_s {
+    surfaceType_t surfaceType;
+    terraInt iVertHead;
+    terraInt iTriHead;
+    terraInt iTriTail;
+    terraInt iMergeHead;
+    int nVerts;
+    int nTris;
+    int lmapSize;
+    int dlightBits[2];
+    float lmapStep;
+    int dlightMap[2];
+    byte* lmData;
+    float lmapX;
+    float lmapY;
+} srfTerrain_t;
+
+typedef struct cTerraPatchUnpacked_s {
+    srfTerrain_t drawinfo;
+    int viewCount;
+    int visCountCheck;
+    int visCountDraw;
+    int frameCount;
+    unsigned int uiDistRecalc;
+    float s;
+    float t;
+    vec2_t texCoord[2][2];
+    float x0;
+    float y0;
+    float z0;
+    float zmax;
+    shader_t* shader;
+    short int iNorth;
+    short int iEast;
+    short int iSouth;
+    short int iWest;
+    struct cTerraPatchUnpacked_s* pNextActive;
+    varnodeUnpacked_t varTree[2][63];
+    unsigned char heightmap[81];
+    byte flags;
+    byte byDirty;
+} cTerraPatchUnpacked_t;
+
+typedef struct srfStaticModel_s {
+    surfaceType_t surfaceType;
+    struct cStaticModelUnpacked_s* parent;
+} srfStaticModel_t;
+
+typedef struct srfMarkFragment_s {
+	surfaceType_t surfaceType;
+	int iIndex;
+	int numVerts;
+	polyVert_t* verts;
+} srfMarkFragment_t;
+
+typedef struct cStaticModelUnpacked_s {
+    qboolean useSpecialLighting;
+    qboolean bLightGridCalculated;
+    qboolean bRendered;
+    char model[128];
+    vec3_t origin;
+    vec3_t angles;
+    vec3_t axis[3];
+    float scale;
+    int firstVertexData;
+    int numVertexData;
+    int visCount;
+    dtiki_t* tiki;
+    sphere_dlight_t dlights[MAX_DLIGHTS];
+    int numdlights;
+    float radius;
+    float cull_radius;
+    int iGridLighting;
+    float lodpercentage[2];
+} cStaticModelUnpacked_t;
+
+typedef struct refSprite_s {
+    surfaceType_t surftype;
+    int hModel;
+    int shaderNum;
+    float origin[3];
+    float scale;
+    float axis[3][3];
+    byte shaderRGBA[4];
+    int renderfx;
+    float shaderTime;
+} refSprite_t;
+
+//=========================
+
 /*
 ==============================================================================
 
@@ -1195,12 +1546,35 @@ typedef struct mnode_s {
 
 	int         firstmarksurface;
 	int			nummarksurfaces;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    spherel_t**	lights;
+    int			numlights;
+
+    int			firstTerraPatch;
+    int			numTerraPatches;
+    int			firstStaticModel;
+    int			numStaticModels;
+    void**		pFirstMarkFragment;
+    int			iNumMarkFragment;
 } mnode_t;
 
 typedef struct {
 	vec3_t		bounds[2];		// for culling
 	int	        firstSurface;
 	int			numSurfaces;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    void** pFirstMarkFragment;
+    int iNumMarkFragment;
+    int frameCount;
+    qboolean hasLightmap;
 } bmodel_t;
 
 typedef struct {
@@ -1250,8 +1624,43 @@ typedef struct {
 
 	char		*entityString;
 	char		*entityParsePoint;
+	
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	unsigned short* lightGridOffsets;
+	byte        lightGridPalette[768];
+
+    int numTerraPatches;
+    cTerraPatchUnpacked_t* terraPatches;
+    cTerraPatchUnpacked_t* activeTerraPatches;
+
+    int numVisTerraPatches;
+    cTerraPatchUnpacked_t** visTerraPatches;
+
+    int numStaticModelData;
+    byte* staticModelData;
+
+    int numStaticModels;
+    cStaticModelUnpacked_t* staticModels;
+
+    int numVisStaticModels;
+    cStaticModelUnpacked_t** visStaticModels;
 } world_t;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+typedef struct {
+    float width;
+    float height;
+    float origin_x;
+    float origin_y;
+    float scale;
+    shader_t* shader;
+} sprite_t;
+//=========================
 
 /*
 ==============================================================================
@@ -1333,9 +1742,10 @@ typedef enum {
 	MOD_BRUSH,
 	MOD_MESH,
 	MOD_MDR,
-    MOD_IQM,
+	MOD_IQM,
+
 	//
-	// non-ioq3
+	// OPENMOHAA-specific stuff
 	//
     MOD_TIKI,
     MOD_SPRITE
@@ -1351,17 +1761,14 @@ typedef struct model_s {
 	mdvModel_t	*mdv[MD3_MAX_LODS];	// only if type == MOD_MESH
 	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
 
-    int			 numLods;
+	int			 numLods;
 
-	//
-	// non-ioq3
-	//
-    qboolean serveronly;
+	// OPENMOHAA-specific stuff
     union {
-        bmodel_t* bmodel;
         dtiki_t* tiki;
         sprite_t* sprite;
     } d;
+    qboolean serveronly;
 } model_t;
 
 
@@ -1410,9 +1817,15 @@ the bits are allocated as follows:
 1     : pshadow flag
 0     : dlight flag
 */
+/*
 #define	QSORT_FOGNUM_SHIFT	2
 #define	QSORT_REFENTITYNUM_SHIFT	7
 #define	QSORT_SHADERNUM_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
+*/
+#define	QSORT_FOGNUM_SHIFT	2
+#define	QSORT_REFENTITYNUM_SHIFT	4
+#define	QSORT_STATICMODEL_SHIFT	(QSORT_REFENTITYNUM_SHIFT+REFENTITYNUM_BITS)
+#define	QSORT_SHADERNUM_SHIFT	(QSORT_STATICMODEL_SHIFT+1)
 #if (QSORT_SHADERNUM_SHIFT+SHADERNUM_BITS) > 32
 	#error "Need to update sorting, too many bits."
 #endif
@@ -1478,6 +1891,7 @@ typedef struct {
 	qboolean    intelGraphics;
 
 	qboolean	occlusionQuery;
+	GLenum		occlusionQueryTarget;
 
 	int glslMajorVersion;
 	int glslMinorVersion;
@@ -1501,6 +1915,18 @@ typedef struct {
 
 	qboolean vertexArrayObject;
 	qboolean directStateAccess;
+
+	int maxVertexAttribs;
+	qboolean gpuVertexAnimation;
+
+	GLenum vaoCacheGlIndexType; // GL_UNSIGNED_INT or GL_UNSIGNED_SHORT
+	size_t vaoCacheGlIndexSize; // must be <= sizeof( vaoCacheGlIndex_t )
+
+	// OpenGL ES extensions
+	qboolean readDepth;
+	qboolean readStencil;
+	qboolean shadowSamplers;
+	qboolean standardDerivatives;
 } glRefConfig_t;
 
 
@@ -1530,6 +1956,12 @@ typedef struct {
 	int     c_dlightDraws;
 
 	int		msec;			// total msec for backend run
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	int		c_characterlights;
 } backEndCounters_t;
 
 // all state modified by the back end is separated
@@ -1550,13 +1982,19 @@ typedef struct {
 
 	FBO_t *last2DFBO;
 	qboolean    colorMask[4];
-	qboolean    framePostProcessed;
 	qboolean    depthFill;
 
 	//
-	// non-ioq3
-    //
-	int dsStreamVert;
+	// OPENMOHAA-specific stuff
+	//
+    sphereor_t spheres[MAX_SPHERE_LIGHTS];
+    unsigned short numSpheresUsed;
+    sphereor_t* currentSphere;
+    sphereor_t spareSphere;
+    sphereor_t hudSphere;
+    cStaticModelUnpacked_t* currentStaticModel;
+    float shaderStartTime;
+    int dsStreamVert;
 } backEndState_t;
 
 /*
@@ -1739,16 +2177,31 @@ typedef struct {
 	float					triangleTable[FUNCTABLE_SIZE];
 	float					sawToothTable[FUNCTABLE_SIZE];
 	float					inverseSawToothTable[FUNCTABLE_SIZE];
-    float					fogTable[FOG_TABLE_SIZE];
+	float					fogTable[FOG_TABLE_SIZE];
 
-    spherel_t				sSunLight;
-    spherel_t				sLights[1532];
-    int						numSLights;
-    int						rendererhandle;
-    qboolean				shadersParsed;
-    int						frame_skel_index;
-    int						skel_index[1024];
-    fontheader_t			*pFontDebugStrings;
+	//
+	// OPENMOHAA-specific stuff
+    //
+
+    int currentSpriteNum;
+    int shiftedIsStatic;
+
+    int overbrightShift;
+    float overbrightMult;
+
+    portalsky_t portalsky;
+    qboolean skyRendered;
+    qboolean portalRendered;
+
+    spherel_t sSunLight;
+    spherel_t sLights[1532];
+    int numSLights;
+    int rendererhandle;
+    qboolean shadersParsed;
+    int frame_skel_index;
+    int skel_index[1024];
+    fontheader_t* pFontDebugStrings;
+    int farclip;
 } trGlobals_t;
 
 extern backEndState_t	backEnd;
@@ -1920,6 +2373,107 @@ extern	cvar_t	*r_printShaders;
 
 extern cvar_t	*r_marksOnTriangleMeshes;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+extern int r_sequencenumber;
+
+// DRAWING
+
+extern cvar_t	*r_drawentitypoly;
+extern cvar_t	*r_drawstaticmodels;
+extern cvar_t	*r_drawstaticmodelpoly;
+extern cvar_t	*r_drawstaticdecals;
+extern cvar_t	*r_drawterrain;
+extern cvar_t	*r_drawsprites;
+extern cvar_t	*r_drawspherelights;
+
+extern cvar_t	*r_numdebuglines;
+extern cvar_t	*r_stipplelines;
+extern cvar_t	*r_debuglines_depthmask;
+
+extern cvar_t	*r_maxpolys;
+extern int		max_polys;
+extern cvar_t	*r_maxpolyverts;
+extern int		max_polyverts;
+extern cvar_t* r_maxtermarks;
+extern int		max_termarks;
+
+extern cvar_t* r_skyportal;
+extern cvar_t* r_skyportal_origin;
+extern cvar_t* r_farplane;
+extern cvar_t* r_farplane_bias;
+extern cvar_t* r_farplane_color;
+extern cvar_t* r_farplane_nocull;
+extern cvar_t* r_farplane_nofog;
+extern cvar_t* r_skybox_farplane;
+extern cvar_t* r_farclip;
+
+// Lighting
+
+extern cvar_t* r_lightcoronasize;
+extern cvar_t *r_entlight_scale;
+extern cvar_t *r_entlight_errbound;
+extern cvar_t *r_entlight_cubelevel;
+extern cvar_t *r_entlight_cubefraction;
+extern cvar_t *r_entlight_maxcalc;
+extern cvar_t *r_light_lines;
+extern cvar_t *r_light_sun_line;
+extern cvar_t *r_light_int_scale;
+extern cvar_t *r_light_nolight;
+extern cvar_t *r_light_showgrid;
+
+// LOD
+
+extern cvar_t* r_staticlod;
+extern cvar_t* r_lodscale;
+extern cvar_t* r_lodcap;
+extern cvar_t* r_lodviewmodelcap;
+
+extern cvar_t* r_uselod;
+extern cvar_t* lod_LOD;
+extern cvar_t* lod_minLOD;
+extern cvar_t* lod_maxLOD;
+extern cvar_t* lod_LOD_slider;
+extern cvar_t* lod_curve_0_val;
+extern cvar_t* lod_curve_1_val;
+extern cvar_t* lod_curve_2_val;
+extern cvar_t* lod_curve_3_val;
+extern cvar_t* lod_curve_4_val;
+extern cvar_t* lod_edit_0;
+extern cvar_t* lod_edit_1;
+extern cvar_t* lod_edit_2;
+extern cvar_t* lod_edit_3;
+extern cvar_t* lod_edit_4;
+extern cvar_t* lod_curve_0_slider;
+extern cvar_t* lod_curve_1_slider;
+extern cvar_t* lod_curve_2_slider;
+extern cvar_t* lod_curve_3_slider;
+extern cvar_t* lod_curve_4_slider;
+extern cvar_t* lod_pitch_val;
+extern cvar_t* lod_zee_val;
+extern cvar_t* lod_mesh;
+extern cvar_t* lod_meshname;
+extern cvar_t* lod_tikiname;
+extern cvar_t* lod_metric;
+extern cvar_t* lod_tris;
+extern cvar_t* lod_position;
+extern cvar_t* lod_save;
+extern cvar_t* lod_tool;
+
+// UTILS
+
+extern cvar_t* r_developer;
+extern cvar_t* r_fps;
+extern cvar_t* r_showstaticbboxes;
+extern cvar_t* r_showcull;
+extern cvar_t* r_showlod;
+extern cvar_t* r_showstaticlod;
+extern cvar_t* r_showportal;
+
+//=========================
+
 //====================================================================
 
 static ID_INLINE qboolean ShaderRequiresCPUDeforms(const shader_t * shader)
@@ -1965,7 +2519,7 @@ void R_AddLightningBoltSurfaces( trRefEntity_t *e );
 void R_AddPolygonSurfaces( void );
 
 void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap, int *pshadowMap );
+					 int *fogNum, int *dlightMap, int *pshadowMap, qboolean *bStaticModel );
 
 void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader, 
 				   int fogIndex, int dlightMap, int pshadowMap, int cubemap );
@@ -2082,6 +2636,7 @@ const void *RB_TakeVideoFrameCmd( const void *data );
 // tr_shader.c
 //
 shader_t	*R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage );
+shader_t	*R_FindShaderEx( const char *name, int lightmapIndex, qboolean mipRawImage, int realLightmapIndex );
 shader_t	*R_GetShaderByHandle( qhandle_t hShader );
 shader_t	*R_GetShaderByState( int index, long *cycleTime );
 shader_t *R_FindShaderByName( const char *name );
@@ -2089,6 +2644,54 @@ void		R_InitShaders( void );
 void		R_ShaderList_f( void );
 void    R_RemapShader(const char *oldShader, const char *newShader, const char *timeOffset);
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+#define GLS_MULTITEXTURE						0x00004000
+#define GLS_MULTITEXTURE_ENV					0x00008000
+#define GLS_FOG									0x00080000
+
+#define GLS_FOG_ENABLED							0x00100000
+#define GLS_FOG_BLACK							0x00200000
+#define GLS_FOG_WHITE							0x00400000
+#define GLS_FOG_COLOR							(GLS_FOG_BLACK | GLS_FOG_WHITE)
+#define GLS_FOG_BITS							(GLS_FOG_WHITE|GLS_FOG_BLACK|GLS_FOG_ENABLED)
+#define GLS_COLOR_NOMASK						0x00800000
+
+void R_RotateForStaticModel(cStaticModelUnpacked_t* SM, const viewParms_t* viewParms, orientationr_t* ori);
+void R_RotateForViewer(void);
+void R_SetupFrustum(void);
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius);
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius);
+qboolean R_ImageExists(const char* name);
+int R_CountTextureMemory();
+
+//
+// tr_bsp.c
+//
+void		RE_PrintBSPFileSizes(void);
+int			RE_MapVersion(void);
+
+//
+// tr_cmds.c
+//
+void R_SavePerformanceCounters(void);
+
+//
+// tr_main.c
+//
+
+void R_AddSpriteSurfaces();
+qboolean SurfIsOffscreen2(const srfBspSurface_t* surface, shader_t* shader, int entityNum);
+
+//
+// tr_shader.c
+//
+qhandle_t		RE_RefreshShaderNoMip(const char* name);
+//=========================
+
+
 /*
 ====================================================================
 
@@ -2150,6 +2753,12 @@ typedef struct shaderCommands_s
 	int			numPasses;
 	void		(*currentStageIteratorFunc)( void );
 	shaderStage_t	**xstages;
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+    qboolean no_global_fog;
 } shaderCommands_t;
 
 extern	shaderCommands_t	tess;
@@ -2182,9 +2791,10 @@ WORLD MAP
 ============================================================
 */
 
-void R_AddBrushModelSurfaces( trRefEntity_t *e );
-void R_AddWorldSurfaces( void );
+void R_AddBrushModelSurfaces(trRefEntity_t* e);
+void R_AddWorldSurfaces(void);
 qboolean R_inPVS( const vec3_t p1, const vec3_t p2 );
+mnode_t* R_PointInLeaf(const vec3_t p);
 
 
 /*
@@ -2216,7 +2826,6 @@ int R_LightForPoint( vec3_t point, vec3_t ambientLight, vec3_t directedLight, ve
 int R_LightDirForPoint( vec3_t point, vec3_t lightDir, vec3_t normal, world_t *world );
 int R_CubemapForPoint( vec3_t point );
 
-
 /*
 ============================================================
 
@@ -2266,8 +2875,12 @@ MARKERS, POLYGON PROJECTION ON WORLD POLYGONS
 ============================================================
 */
 
-int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projection,
-				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer );
+int R_MarkFragments(int numPoints, const vec3_t *points, const vec3_t projection,
+				   int maxPoints, vec3_t pointBuffer, int maxFragments, markFragment_t *fragmentBuffer, float fRadiusSquared);
+
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared);
 
 
 /*
@@ -2299,6 +2912,7 @@ void            R_VaoList_f(void);
 void            RB_UpdateTessVao(unsigned int attribBits);
 
 void VaoCache_Commit(void);
+void VaoCache_DrawElements(int numIndexes, int firstIndex);
 void VaoCache_Init(void);
 void VaoCache_BindVao(void);
 void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboolean *recycleIndexBuffer, int numVerts, int numIndexes);
@@ -2348,7 +2962,8 @@ void RE_AddLightToScene( const vec3_t org, float intensity, float r, float g, fl
 void RE_AddAdditiveLightToScene( const vec3_t org, float intensity, float r, float g, float b );
 void RE_BeginScene( const refdef_t *fd );
 void RE_RenderScene( const refdef_t *fd );
-void RE_EndScene( void );
+void RE_EndScene(void);
+void RE_AddRefEntityToScene2(const refEntity_t* ent, int parentEntityNumber);
 
 /*
 =============================================================
@@ -2387,6 +3002,280 @@ int R_IQMLerpTag( orientation_t *tag, iqmData_t *data,
                   int startFrame, int endFrame,
                   float frac, const char *tagName );
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+=============================================================
+
+DRAWING
+
+=============================================================
+*/
+
+void Draw_SetColor(const vec4_t rgba);
+void Draw_StretchPic(float x, float y, float w, float h, float s1, float t1, float s2, float t2, qhandle_t hShader);
+void Draw_StretchPic2(float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader);
+void Draw_TilePic(float x, float y, float w, float h, qhandle_t hShader);
+void Draw_TilePicOffset(float x, float y, float w, float h, qhandle_t hShader, int offsetX, int offsetY);
+void Draw_TrianglePic(const vec2_t vPoints[3], const vec2_t vTexCoords[3], qhandle_t hShader);
+void DrawBox(float x, float y, float w, float h);
+void AddBox(float x, float y, float w, float h);
+void Set2DWindow(int x, int y, int w, int h, float left, float right, float bottom, float top, float n, float f);
+void RE_Scissor(int x, int y, int width, int height);
+void DrawLineLoop(const vec2_t* points, int count, int stipple_factor, int stipple_mask);
+void RE_StretchRaw2(int x, int y, int w, int h, int cols, int rows, int components, const byte* data);
+
+/*
+=============================================================
+
+FONT
+
+=============================================================
+*/
+void R_ShutdownFont();
+fontheader_t* R_LoadFont(const char* name);
+void R_LoadFontShader(fontheader_sgl_t* font);
+void R_DrawString(fontheader_t* font, const char* text, float x, float y, int maxlen, const float *pvVirtualScreen);
+void R_DrawFloatingString(fontheader_t* font, const char* text, const vec3_t org, const vec4_t color, float scale, int maxlen);
+float R_GetFontHeight(const fontheader_t* font);
+float R_GetFontStringWidth(const fontheader_t* font, const char* s);
+
+/*
+=============================================================
+
+GHOST
+
+=============================================================
+*/
+
+void R_UpdateGhostTextures();
+void R_SetGhostImage(const char* name, image_t* image);
+void LoadGHOST(const char* name, byte** pic, int* width, int* height);
+
+/*
+============================================================
+
+LIGHTS
+
+============================================================
+*/
+
+void R_GetLightingForDecal(vec3_t vLight, const vec3_t vFacing, const vec3_t vOrigin);
+void R_GetLightingForSmoke(vec3_t vLight, const vec3_t vOrigin);
+void R_GetLightingGridValue(world_t* world, const vec3_t vPos, vec3_t vAmbientLight, vec3_t vDirectedLight);
+void RB_SetupEntityGridLighting();
+void RB_SetupStaticModelGridLighting(trRefdef_t* refdef, cStaticModelUnpacked_t* ent, const vec3_t lightOrigin);
+
+void RB_Light_Real(unsigned char* colors);
+void RB_Sphere_BuildDLights();
+void RB_Sphere_SetupEntity();
+void RB_Grid_SetupEntity();
+void RB_Grid_SetupStaticModel();
+void RB_Light_Fullbright(unsigned char* colors);
+void R_Sphere_InitLights();
+int R_GatherLightSources(const vec3_t vPos, vec3_t* pvLightPos, vec3_t* pvLightIntensity, int iMaxLights);
+
+extern suninfo_t s_sun;
+
+/*
+=============================================================
+
+MARKS
+
+=============================================================
+*/
+void R_LevelMarksLoad(const char* szBSPName);
+void R_LevelMarksInit();
+void R_LevelMarksFree();
+void R_UpdateLevelMarksSystem();
+void R_AddPermanentMarkFragmentSurfaces(void** pFirstMarkFragment, int iNumMarkFragment);
+
+/*
+============================================================
+
+SCENE
+
+============================================================
+*/
+
+void RE_AddRefSpriteToScene(const refEntity_t* ent);
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+refEntity_t* RE_GetRenderEntity(int entityNumber);
+qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx);
+void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type);
+
+/*
+============================================================
+
+SHADE CALC
+
+============================================================
+*/
+
+void RB_CalcLightGridColor(unsigned char* colors);
+
+/*
+=============================================================
+
+SKY PORTALS
+
+=============================================================
+*/
+void R_Sky_Init();
+void R_Sky_Reset();
+void R_Sky_AddSurf(msurface_t* surf);
+void R_Sky_Render();
+
+/*
+=============================================================
+
+SPRITE
+
+=============================================================
+*/
+sprite_t* SPR_RegisterSprite(const char* name);
+void RB_DrawSprite(const refSprite_t* spr);
+
+
+/*
+=============================================================
+
+SUN FLARE
+
+=============================================================
+*/
+void R_InitLensFlare();
+void R_DrawLensFlares();
+
+/*
+=============================================================
+
+SWIPE
+
+=============================================================
+*/
+void RB_DrawSwipeSurface(surfaceType_t* pswipe);
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader);
+void RE_SwipeEnd();
+void R_AddSwipeSurfaces();
+
+/*
+=============================================================
+
+TERRAIN
+
+=============================================================
+*/
+
+extern terraTri_t* g_pTris;
+extern terrainVert_t* g_pVert;
+
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t* pPatch);
+void R_AddTerrainSurfaces();
+void R_AddTerrainMarkSurfaces();
+void R_InitTerrain();
+void R_ShutdownTerrain();
+void R_TerrainFree();
+void R_TerrainPrepareFrame();
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t* pPatch, polyVert_t* pVerts, int nVerts);
+void R_SwapTerraPatch(cTerraPatch_t* pPatch);
+
+void R_TerrainCrater_f(void);
+
+/*
+=============================================================
+
+TIKI
+
+=============================================================
+*/
+struct skelHeaderGame_s;
+struct skelAnimFrame_s;
+
+void R_InitStaticModels(void);
+void RE_FreeModels(void);
+qhandle_t RE_SpawnEffectModel(const char* szModel, vec3_t vPos, vec3_t* axis);
+qhandle_t RE_RegisterServerModel(const char* name);
+void RE_UnregisterServerModel(qhandle_t hModel);
+orientation_t RE_TIKI_Orientation(refEntity_t* model, int tagnum);
+qboolean RE_TIKI_IsOnGround(refEntity_t* model, int tagnum, float threshold);
+float R_ModelRadius(qhandle_t handle);
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs);
+dtiki_t* R_Model_GetHandle(qhandle_t handle);
+
+float R_GetRadius(refEntity_t* model);
+void R_GetFrame(refEntity_t* model, struct skelAnimFrame_s* newFrame);
+void RE_ForceUpdatePose(refEntity_t* model);
+void RE_SetFrameNumber(int frameNumber);
+void R_UpdatePoseInternal(refEntity_t* model);
+void RB_SkelMesh(skelSurfaceGame_t* sf);
+void RB_StaticMesh(staticSurface_t* staticSurf);
+void RB_Static_BuildDLights();
+void R_InfoStaticModels_f(void);
+void R_PrintInfoStaticModels();
+void R_AddSkelSurfaces(trRefEntity_t* ent);
+void R_AddStaticModelSurfaces(void);
+void R_CountTikiLodTris(dtiki_t* tiki, float lodpercentage, int* render_tris, int* total_tris);
+float R_CalcLod(const vec3_t origin, float radius);
+int GetLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val, int renderfx);
+int GetToolLodCutoff(struct skelHeaderGame_s* skelmodel, float lod_val);
+void R_InfoWorldTris_f(void);
+void R_PrintInfoWorldtris(void);
+void R_DebugSkeleton(void);
+
+extern int g_nStaticSurfaces;
+extern qboolean g_bInfostaticmodels;
+extern qboolean g_bInfoworldtris;
+
+/*
+=============================================================
+
+UTIL
+
+=============================================================
+*/
+
+void RB_StreamBegin(shader_t* shader);
+void RB_StreamEnd(void);
+void RB_StreamBeginDrawSurf(void);
+void RB_StreamEndDrawSurf(void);
+static void addTriangle(void);
+void RB_Vertex3fv(vec3_t v);
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z);
+void RB_Vertex2f(vec_t x, vec_t y);
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a);
+void RB_Color3f(vec_t r, vec_t g, vec_t b);
+void RB_Color3fv(vec3_t col);
+void RB_Color4bv(unsigned char* colors);
+void RB_Texcoord2f(float s, float t);
+void RB_Texcoord2fv(vec2_t st);
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision);
+void R_DebugRotatedBBox(const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha);
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal);
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha);
+int RE_GetShaderWidth(qhandle_t hShader);
+int RE_GetShaderHeight(qhandle_t hShader);
+const char* RE_GetShaderName(qhandle_t hShader);
+const char* RE_GetModelName(qhandle_t hModel);
+
+/*
+============================================================
+
+WORLD MAP
+
+============================================================
+*/
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs);
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes);
+mnode_t* R_PointInLeaf(const vec3_t p);
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits);
+
+void R_AddSpriteSurfCmd(drawSurf_t* drawSurfs, int numDrawSurfs);
+
+//=========================
+
 /*
 =============================================================
 =============================================================
@@ -2539,7 +3428,13 @@ typedef enum {
 	RC_CLEARDEPTH,
 	RC_CAPSHADOWMAP,
 	RC_POSTPROCESS,
-	RC_EXPORT_CUBEMAPS
+	RC_EXPORT_CUBEMAPS,
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+
+	RC_SPRITE_SURFS,
 } renderCommand_t;
 
 
@@ -2548,6 +3443,7 @@ typedef enum {
 // the main view, all the 3D icons, etc
 #define	MAX_POLYS		600
 #define	MAX_POLYVERTS	3000
+#define	MAX_TERMARKS	1024
 
 // all of the information needed by the back end must be
 // contained in a backEndData_t
@@ -2559,6 +3455,15 @@ typedef struct {
 	polyVert_t	*polyVerts;//[MAX_POLYVERTS];
 	pshadow_t pshadows[MAX_CALC_PSHADOWS];
 	renderCommandList_t	commands;
+
+	//
+	// OPENMOHAA-specific stuff
+    //
+    drawSurf_t  spriteSurfs[MAX_SPRITESURFS];
+	srfMarkFragment_t* terMarks;
+    refSprite_t sprites[2048];
+    cStaticModelUnpacked_t* staticModels;
+    byte* staticModelData;
 } backEndData_t;
 
 extern	int		max_polys;
@@ -2588,7 +3493,7 @@ size_t RE_SaveJPGToBuffer(byte *buffer, size_t bufSize, int quality,
 void RE_TakeVideoFrame( int width, int height,
 		byte *captureBuffer, byte *encodeBuffer, qboolean motionJpeg );
 
-#include "new/tr_local.h"
+void R_ConvertTextureFormat( const byte *in, int width, int height, GLenum format, GLenum type, byte *out );
 
 #ifdef __cplusplus
 }
diff --git a/code/renderergl2/tr_main.c b/code/renderergl2/tr_main.c
index 02f7d489..0e1c56c7 100644
--- a/code/renderergl2/tr_main.c
+++ b/code/renderergl2/tr_main.c
@@ -743,6 +743,86 @@ void R_SetupFrustum (viewParms_t *dest, float xmin, float xmax, float ymax, floa
 		SetPlaneSignbits( &dest->frustum[4] );
 		dest->flags |= VPF_FARPLANEFRUSTUM;
 	}
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	
+	if (dest->isPortalSky) {
+		// since 2.0: skybox farplane
+		if (r_skybox_farplane->integer) {
+			dest->farplane_distance = r_skybox_farplane->value;
+
+            sscanf(
+                r_farplane_color->string,
+                "%f %f %f",
+                &dest->farplane_color[0],
+                &dest->farplane_color[1],
+                &dest->farplane_color[2]
+			);
+
+			if (r_farplane_nocull->integer > 0) {
+				dest->farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				dest->farplane_cull = 1;
+            } else {
+                dest->farplane_cull = 2;
+            }
+		}
+	}
+	else if (r_farplane->integer)
+	{
+		dest->farplane_distance = r_farplane->value;
+		dest->farplane_bias = r_farplane_bias->value;
+
+		sscanf(
+			r_farplane_color->string,
+			"%f %f %f",
+			&dest->farplane_color[0],
+			&dest->farplane_color[1],
+			&dest->farplane_color[2]);
+
+			if (r_farplane_nocull->integer > 0) {
+				dest->farplane_cull = 0;
+			} else if (r_farplane_nocull->integer == 0) {
+				dest->farplane_cull = 1;
+            } else {
+                dest->farplane_cull = 2;
+            }
+	}
+
+	if (dest->farplane_distance)
+	{
+		vec3_t farPoint;
+		float realPlaneLen;
+		float tmp;
+		vec4_t fogColor;
+
+		dest->fog.len = dest->farplane_distance;
+		dest->fog.oolen = 1.0 / dest->farplane_distance;
+		VectorMA(dest->or.origin, dest->farplane_distance, dest->or.axis[0], farPoint);
+
+		VectorNegate(dest->or.axis[0], dest->frustum[4].normal);
+		dest->frustum[4].type = PLANE_NON_AXIAL;
+		dest->frustum[4].dist = DotProduct(farPoint, dest->frustum[4].normal);
+		SetPlaneSignbits(&dest->frustum[4]);
+
+		dest->fog.enabled = r_farplane_nofog->integer == 0;
+		if (dest->farplane_cull) {
+            // extra fustum for culling
+            dest->flags |= VPF_FARPLANEFRUSTUM;
+			dest->fog.extrafrustums = 1;
+		} else {
+			dest->fog.extrafrustums = 0;
+		}
+	}
+	else
+	{
+		dest->fog.enabled = 0;
+		dest->fog.extrafrustums = 0;
+    }
+
+    //=========================
 }
 
 /*
@@ -1208,10 +1288,12 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, vec4_t clipDest[128
 	int i;
 	unsigned int pointOr = 0;
 	unsigned int pointAnd = (unsigned int)~0;
+	qboolean bStaticModel;
 
 	R_RotateForViewer();
 
-	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+	R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed,
+			&bStaticModel );
 	RB_BeginSurface( shader, fogNum, drawSurf->cubemapIndex);
 	rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 
@@ -1469,7 +1551,8 @@ void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
 	// compared quickly during the qsorting process
 	tr.refdef.drawSurfs[index].sort = (shader->sortedIndex << QSORT_SHADERNUM_SHIFT) 
 		| tr.shiftedEntityNum | ( fogIndex << QSORT_FOGNUM_SHIFT ) 
-		| ((int)pshadowMap << QSORT_PSHADOW_SHIFT) | (int)dlightMap;
+		| ((int)pshadowMap << QSORT_PSHADOW_SHIFT) | (int)dlightMap
+		| tr.shiftedIsStatic;
 	tr.refdef.drawSurfs[index].cubemapIndex = cubemap;
 	tr.refdef.drawSurfs[index].surface = surface;
 	tr.refdef.numDrawSurfs++;
@@ -1481,12 +1564,21 @@ R_DecomposeSort
 =================
 */
 void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader, 
-					 int *fogNum, int *dlightMap, int *pshadowMap ) {
+					 int *fogNum, int *dlightMap, int *pshadowMap,
+                     qboolean *bStaticModel
+			) {
 	*fogNum = ( sort >> QSORT_FOGNUM_SHIFT ) & 31;
 	*shader = tr.sortedShaders[ ( sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1) ];
 	*entityNum = ( sort >> QSORT_REFENTITYNUM_SHIFT ) & REFENTITYNUM_MASK;
 	*pshadowMap = (sort >> QSORT_PSHADOW_SHIFT ) & 1;
-	*dlightMap = sort & 1;
+    *dlightMap = sort & 1;
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	*fogNum = 0;
+    *bStaticModel = sort & (1 << QSORT_STATICMODEL_SHIFT);
+    //=========================
 }
 
 /*
@@ -1494,13 +1586,16 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
 R_SortDrawSurfs
 =================
 */
-void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
+void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs,
+	drawSurf_t *spriteSurfs, int numSpriteSurfs
+) {
 	shader_t		*shader;
 	int				fogNum;
 	int				entityNum;
 	int				dlighted;
 	int             pshadowed;
-	int				i;
+    int				i;
+    qboolean		bStaticModel;
 
 	//ri.Printf(PRINT_ALL, "firstDrawSurf %d numDrawSurfs %d\n", (int)(drawSurfs - tr.refdef.drawSurfs), numDrawSurfs);
 
@@ -1508,11 +1603,13 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	if ( numDrawSurfs < 1 ) {
 		// we still need to add it for hyperspace cases
 		R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+		R_AddSpriteSurfCmd( spriteSurfs, numSpriteSurfs );
 		return;
 	}
 
 	// sort the drawsurfs by sort type, then orientation, then shader
 	R_RadixSort( drawSurfs, numDrawSurfs );
+	R_RadixSort( spriteSurfs, numSpriteSurfs );
 
 	// skip pass through drawing if rendering a shadow map
 	if (tr.viewParms.flags & (VPF_SHADOWMAP | VPF_DEPTHSHADOW))
@@ -1524,7 +1621,7 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	// check for any pass through drawing, which
 	// may cause another view to be rendered first
 	for ( i = 0 ; i < numDrawSurfs ; i++ ) {
-		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed );
+		R_DecomposeSort( (drawSurfs+i)->sort, &entityNum, &shader, &fogNum, &dlighted, &pshadowed, &bStaticModel );
 
 		if ( shader->sort > SS_PORTAL ) {
 			break;
@@ -1546,6 +1643,7 @@ void R_SortDrawSurfs( drawSurf_t *drawSurfs, int numDrawSurfs ) {
 	}
 
 	R_AddDrawSurfCmd( drawSurfs, numDrawSurfs );
+    R_AddSpriteSurfCmd( spriteSurfs, numSpriteSurfs );
 }
 
 static void R_AddEntitySurface (int entityNum)
@@ -1611,6 +1709,16 @@ static void R_AddEntitySurface (int entityNum)
 			case MOD_BRUSH:
 				R_AddBrushModelSurfaces( ent );
 				break;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			case MOD_SPRITE:
+				ri.Printf(PRINT_ALL, "sprite model '%s' being added to renderer!\n", tr.currentModel->name);
+                break;
+            case MOD_TIKI:
+                R_AddSkelSurfaces(ent);
+                break;
+			//=========================
 			case MOD_BAD:		// null model axis
 				if ( (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal) {
 					break;
@@ -1640,6 +1748,12 @@ void R_AddEntitySurfaces (void) {
 		return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    tr.shiftedIsStatic = 0;
+    //=========================
+
 	for ( i = 0; i < tr.refdef.num_entities; i++)
 		R_AddEntitySurface(i);
 }
@@ -1671,6 +1785,12 @@ void R_GenerateDrawSurfs( void ) {
 	R_SetupProjectionZ (&tr.viewParms);
 
 	R_AddEntitySurfaces ();
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    R_AddSpriteSurfaces();
+	//=========================
 }
 
 /*
@@ -1729,6 +1849,223 @@ void R_DebugGraphics( void ) {
 	ri.CM_DrawDebugSurface( R_DebugPolygon );
 }
 
+#define CIRCLE_LENGTH		25
+
+/*
+================
+R_DebugCircle
+================
+*/
+void R_DebugCircle(const vec3_t org, float radius, float r, float g, float b, float alpha, qboolean horizontal) {
+    int				i;
+    float			ang;
+	debugline_t* line;
+	vec3_t			forward, right;
+	vec3_t			pos, lastpos;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (horizontal)
+	{
+		VectorSet(forward, 1, 0, 0);
+		VectorSet(right, 0, 1, 0);
+	}
+	else
+	{
+		VectorCopy(tr.refdef.viewaxis[1], right);
+		VectorCopy(tr.refdef.viewaxis[2], forward);
+	}
+
+	VectorClear(pos);
+	VectorClear(lastpos);
+
+	for (i = 0; i < CIRCLE_LENGTH; i++) {
+		VectorCopy(pos, lastpos);
+
+		ang = DEG2RAD((float)(i * 15));
+		pos[0] = (org[0] + sin(ang) * radius * forward[0]) +
+			cos(ang) * radius * right[0];
+		pos[1] = (org[1] + sin(ang) * radius * forward[1]) +
+			cos(ang) * radius * right[1];
+		pos[2] = (org[2] + sin(ang) * radius * forward[2]) +
+			cos(ang) * radius * right[2];
+
+		if (i > 0)
+		{
+			if (*ri.numDebugLines >= r_numdebuglines->integer) {
+				ri.Printf(PRINT_ALL, "R_DebugCircle: Exceeded MAX_DEBUG_LINES\n");
+				return;
+			}
+
+			line = &(*ri.DebugLines)[*ri.numDebugLines];
+			(*ri.numDebugLines)++;
+			VectorCopy(lastpos, line->start);
+			VectorCopy(pos, line->end);
+			VectorSet(line->color, r, g, b);
+			line->alpha = alpha;
+			line->width = 1.0;
+			line->factor = 1;
+			line->pattern = -1;
+		}
+	}
+}
+
+/*
+================
+R_DebugLine
+================
+*/
+void R_DebugLine(const vec3_t start, const vec3_t end, float r, float g, float b, float alpha) {
+	debugline_t* line;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (*ri.numDebugLines >= r_numdebuglines->integer) {
+		ri.Printf(PRINT_ALL, "R_DebugLine: Exceeded MAX_DEBUG_LINES\n");
+		return;
+	}
+
+	line = &(*ri.DebugLines)[*ri.numDebugLines];
+	(*ri.numDebugLines)++;
+	VectorCopy(start, line->start);
+	VectorCopy(end, line->end);
+	VectorSet(line->color, r, g, b);
+	line->alpha = alpha;
+	line->width = 1.0;
+	line->factor = 1;
+	line->pattern = -1;
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugLines(void) {
+	// FIXME: unimplemented
+#if 0
+	debugline_t* line;
+	int i;
+	float width;
+	int factor;
+	unsigned short pattern;
+
+	if (!ri.DebugLines || !ri.numDebugLines) {
+		return;
+	}
+
+	if (!*ri.numDebugLines) {
+		return;
+	}
+
+	if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+		return;
+	}
+
+	if (tr.viewParms.isPortalSky) {
+		return;
+	}
+
+	R_IssuePendingRenderCommands();
+    GL_BindToTMU(tr.whiteImage, 0);
+	if (r_debuglines_depthmask->integer) {
+		GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+	} else {
+		GL_State(GLS_POLYMODE_LINE);
+	}
+
+    qglDisableClientState(GL_COLOR_ARRAY);
+    qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
+
+    width = 1.0;
+    factor = 4;
+    pattern = -1;
+
+    if (r_stipplelines->integer)
+    {
+        qglEnable(GL_LINE_STIPPLE);
+        qglLineStipple(4, -1);
+        qglLineWidth(1.0f);
+    }
+
+	qglBegin(GL_LINES);
+
+	for (i = 0; i < *ri.numDebugLines; i++) {
+		line = &(*ri.DebugLines)[i];
+
+		if (r_stipplelines->integer) {
+			if (line->width != width || line->factor != factor || line->pattern != pattern) {
+				qglEnd();
+				qglLineStipple(line->factor, line->pattern);
+                qglLineWidth(line->width);
+                qglBegin(GL_LINES);
+                factor = line->factor;
+                width = line->width;
+                pattern = line->pattern;
+			}
+		}
+
+		qglColor4f(line->color[0], line->color[1], line->color[2], line->alpha);
+        qglVertex3fv(line->start);
+        qglVertex3fv(line->end);
+	}
+
+    qglEnd();
+
+    if (r_stipplelines->integer)
+    {
+        qglDisable(GL_LINE_STIPPLE);
+        qglLineStipple(1, -1);
+        qglLineWidth(1.0);
+    }
+
+    qglDepthRange(0.0, 1.0);
+#endif
+}
+
+/*
+================
+R_DrawDebugLines
+================
+*/
+void R_DrawDebugStrings(void) {
+	int i;
+	debugstring_t* string;
+
+	if (!ri.DebugStrings || !ri.numDebugStrings) {
+		return;
+	}
+
+	if (!*ri.numDebugStrings) {
+		return;
+	}
+
+    if (tr.refdef.rdflags & RDF_NOWORLDMODEL) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+	for (i = 0; i < *ri.numDebugStrings; i++) {
+		string = &(*ri.DebugStrings)[i];
+
+		R_DrawFloatingString(
+			tr.pFontDebugStrings,
+			string->szText,
+			string->pos,
+			string->color,
+			string->scale,
+			64
+		);
+	}
+}
+
 
 /*
 ================
@@ -1740,7 +2077,8 @@ or a mirror / remote location
 */
 void R_RenderView (viewParms_t *parms) {
 	int		firstDrawSurf;
-	int		numDrawSurfs;
+    int		numDrawSurfs;
+    int		firstSpriteSurf;
 
 	if ( parms->viewportWidth <= 0 || parms->viewportHeight <= 0 ) {
 		return;
@@ -1752,7 +2090,8 @@ void R_RenderView (viewParms_t *parms) {
 	tr.viewParms.frameSceneNum = tr.frameSceneNum;
 	tr.viewParms.frameCount = tr.frameCount;
 
-	firstDrawSurf = tr.refdef.numDrawSurfs;
+    firstDrawSurf = tr.refdef.numDrawSurfs;
+    firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 	tr.viewCount++;
 
@@ -1771,7 +2110,9 @@ void R_RenderView (viewParms_t *parms) {
 		numDrawSurfs = MAX_DRAWSURFS;
 	}
 
-	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf );
+	R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, numDrawSurfs - firstDrawSurf,
+        tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+	);
 
 	// draw main system development information (surface outlines, etc)
 	R_DebugGraphics();
@@ -1922,6 +2263,24 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 					radius = 0.5f * VectorLength( diag );
 				}
 				break;
+				// OPENMOHAA-specific stuff
+				//=========================
+				case MOD_TIKI:
+					radius = ri.TIKI_GlobalRadius(model->d.tiki);
+                    break;
+				case MOD_SPRITE:
+				{
+					float w;
+
+					radius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+					w = model->d.sprite->height * model->d.sprite->scale * 0.5;
+
+					if (radius <= w) {
+						radius = w;
+					}
+				}
+					break;
+				//=========================
 
 				default:
 					break;
@@ -2075,6 +2434,7 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 	for ( i = 0; i < tr.refdef.num_pshadows; i++)
 	{
 		int firstDrawSurf;
+		int firstSpriteSurf;
 		pshadow_t *shadow = &tr.refdef.pshadows[i];
 		int j;
 
@@ -2117,7 +2477,8 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 			tr.viewParms.frameSceneNum = tr.frameSceneNum;
 			tr.viewParms.frameCount = tr.frameCount;
 
-			firstDrawSurf = tr.refdef.numDrawSurfs;
+            firstDrawSurf = tr.refdef.numDrawSurfs;
+            firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 			tr.viewCount++;
 
@@ -2188,7 +2549,9 @@ void R_RenderPshadowMaps(const refdef_t *fd)
 				R_AddEntitySurface(shadow->entityNums[j]);
 			}
 
-			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf );
+			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+				tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf
+			);
 
 			if (!glRefConfig.framebufferObject)
 				R_AddCapShadowmapCmd( i, -1 );
@@ -2484,6 +2847,7 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 
 	{
 		int firstDrawSurf;
+		int firstSpriteSurf;
 
 		Com_Memset( &shadowParms, 0, sizeof( shadowParms ) );
 
@@ -2527,6 +2891,7 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 			tr.viewParms.frameCount = tr.frameCount;
 
 			firstDrawSurf = tr.refdef.numDrawSurfs;
+			firstSpriteSurf = tr.refdef.numSpriteSurfs;
 
 			tr.viewCount++;
 
@@ -2541,7 +2906,8 @@ void R_RenderSunShadowMaps(const refdef_t *fd, int level)
 
 			R_AddEntitySurfaces ();
 
-			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf );
+			R_SortDrawSurfs( tr.refdef.drawSurfs + firstDrawSurf, tr.refdef.numDrawSurfs - firstDrawSurf,
+				tr.refdef.spriteSurfs + firstSpriteSurf, tr.refdef.numSpriteSurfs - firstSpriteSurf );
 		}
 
 		Mat4Multiply(tr.viewParms.projectionMatrix, tr.viewParms.world.modelMatrix, tr.refdef.sunShadowMvp[level]);
@@ -2672,3 +3038,302 @@ void R_RenderCubemapSide( int cubemapIndex, int cubemapSide, qboolean subscene )
 	if (!subscene)
 		RE_EndScene();
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+void R_AdjustVisBoundsForSprite(refSprite_t* ent, viewParms_t* viewParms, orientationr_t* or )
+{
+	if (tr.viewParms.visBounds[0][0] > ent->origin[0] - ent->scale) {
+		tr.viewParms.visBounds[0][0] = ent->origin[0] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][1] > ent->origin[1] - ent->scale) {
+        tr.viewParms.visBounds[0][1] = ent->origin[1] - ent->scale;
+    }
+    if (tr.viewParms.visBounds[0][2] > ent->origin[2] - ent->scale) {
+        tr.viewParms.visBounds[0][2] = ent->origin[2] - ent->scale;
+    }
+
+	if (tr.viewParms.visBounds[1][0] < ent->origin[0] + ent->scale) {
+        tr.viewParms.visBounds[1][0] = ent->origin[0] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][1] < ent->origin[1] + ent->scale) {
+        tr.viewParms.visBounds[1][1] = ent->origin[1] + ent->scale;
+    }
+    if (tr.viewParms.visBounds[1][2] < ent->origin[2] + ent->scale) {
+        tr.viewParms.visBounds[1][2] = ent->origin[2] + ent->scale;
+    }
+}
+
+/*
+=================
+R_AddSpriteSurf
+=================
+*/
+void R_AddSpriteSurf(surfaceType_t* surface, shader_t* shader, float zDistance)
+{
+	int index;
+
+	if (zDistance > MAX_SPRITE_DIST_SQUARED) {
+		zDistance = MAX_SPRITE_DIST_SQUARED;
+	}
+
+	index = tr.refdef.numSpriteSurfs % MAX_SPRITES;
+    tr.refdef.spriteSurfs[index].sort = (int)(MAX_SPRITE_DIST_SQUARED - zDistance) | (shader->sortedIndex << QSORT_SHADERNUM_SHIFT);
+    tr.refdef.spriteSurfs[index].surface = surface;
+    tr.refdef.numSpriteSurfs++;
+}
+
+void R_AddSpriteSurfaces()
+{
+	refSprite_t* sprite;
+	vec3_t delta;
+
+	if (!r_drawsprites->integer) {
+		return;
+	}
+
+	for (tr.currentSpriteNum = 0; tr.currentSpriteNum < tr.refdef.num_sprites; ++tr.currentSpriteNum)
+	{
+		sprite = &tr.refdef.sprites[tr.currentSpriteNum];
+
+        if (tr.viewParms.isPortalSky) {
+			if (!(sprite->renderfx & RF_SKYENTITY)) {
+				continue;
+			}
+        } else {
+			if (sprite->renderfx & RF_SKYENTITY) {
+				continue;
+			}
+		}
+        
+		if (tr.viewParms.isPortal) {
+			if (!(sprite->renderfx & (RF_SHADOW_PLANE | RF_WRAP_FRAMES))) {
+				continue;
+			}
+		} else {
+			if (sprite->renderfx & RF_SHADOW_PLANE) {
+				continue;
+			}
+		}
+
+		tr.currentEntityNum = ENTITYNUM_WORLD;
+        tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+		if (sprite->hModel && sprite->hModel < tr.numModels) {
+			tr.currentModel = tr.models[sprite->hModel];
+		} else {
+			tr.currentModel = tr.models[0];
+		}
+
+		if (tr.currentModel->type != MOD_SPRITE) {
+			continue;
+		}
+
+		R_AdjustVisBoundsForSprite(&tr.refdef.sprites[tr.currentSpriteNum], &tr.viewParms, &tr.or );
+		sprite->shaderNum = tr.currentModel->d.sprite->shader->sortedIndex;
+
+		VectorSubtract(sprite->origin, tr.refdef.vieworg, delta);
+		R_AddSpriteSurf(&sprite->surftype, tr.currentModel->d.sprite->shader, VectorLengthSquared(delta));
+	}
+}
+
+/*
+=================
+R_RotateForStaticModel
+
+Generates an orientation for a static model and viewParms
+=================
+*/
+void R_RotateForStaticModel( cStaticModelUnpacked_t *SM, const viewParms_t *viewParms,
+					   orientationr_t *ori ) {
+	float	glMatrix[16];
+	vec3_t	delta;
+	float	tiki_scale;
+
+	tiki_scale = SM->tiki->load_scale * SM->scale;
+
+	VectorCopy( SM->origin, ori->origin );
+
+	VectorCopy( SM->axis[0], ori->axis[0] );
+	VectorCopy( SM->axis[1], ori->axis[1] );
+	VectorCopy( SM->axis[2], ori->axis[2] );
+
+	glMatrix[0]  = ori->axis[0][0] * tiki_scale;
+	glMatrix[4]  = ori->axis[1][0] * tiki_scale;
+	glMatrix[8]  = ori->axis[2][0] * tiki_scale;
+	glMatrix[12] = ori->origin[0];
+
+	glMatrix[1]  = ori->axis[0][1] * tiki_scale;
+	glMatrix[5]  = ori->axis[1][1] * tiki_scale;
+	glMatrix[9]  = ori->axis[2][1] * tiki_scale;
+	glMatrix[13] = ori->origin[1];
+
+	glMatrix[2]  = ori->axis[0][2] * tiki_scale;
+	glMatrix[6]  = ori->axis[1][2] * tiki_scale;
+	glMatrix[10] = ori->axis[2][2] * tiki_scale;
+	glMatrix[14] = ori->origin[2];
+
+	glMatrix[3]  = 0;
+	glMatrix[7]  = 0;
+	glMatrix[11] = 0;
+	glMatrix[15] = 1;
+
+	myGlMultMatrix( glMatrix, viewParms->world.modelMatrix, ori->modelMatrix );
+
+	// calculate the viewer origin in the model's space
+	// needed for fog, specular, and environment mapping
+	VectorSubtract( viewParms->or.origin, ori->origin, delta );
+
+	ori->viewOrigin[0] = DotProduct( delta, ori->axis[0] );
+	ori->viewOrigin[1] = DotProduct( delta, ori->axis[1] );
+	ori->viewOrigin[2] = DotProduct( delta, ori->axis[2] );
+}
+
+int R_DistanceCullLocalPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	vec3_t transformed;
+
+	R_LocalPointToWorld(pt, transformed);
+
+	return R_DistanceCullPointAndRadius(fDist, transformed, radius);
+}
+
+int R_DistanceCullPointAndRadius(float fDist, const vec3_t pt, float radius) {
+	if (!r_nocull->integer)
+	{
+		vec3_t vDelta;
+		float fLengthSquared;
+		float fTotalDistSquared;
+
+		VectorSubtract(pt, tr.viewParms.or.origin, vDelta);
+		fLengthSquared = VectorLengthSquared(vDelta);
+		fTotalDistSquared = Square(fDist + radius);
+
+		if (Square(fDist + radius) < Square(vDelta[2]) + fLengthSquared) {
+			return CULL_OUT;
+		} else if (Square(fDist - radius) > Square(vDelta[2]) + fLengthSquared) {
+			return CULL_IN;
+		}
+	}
+
+	return CULL_CLIP;
+}
+
+/*
+** SurfIsOffscreen
+**
+** Determines if a surface is completely offscreen.
+*/
+qboolean SurfIsOffscreen2(const srfBspSurface_t* surface, shader_t* shader, int entityNum) {
+	float shortest = 100000000;
+	int numTriangles;
+	qboolean doRange;
+	orientationr_t surfOr;
+	unsigned int* indices;
+	vec4_t clip, eye;
+	int i;
+	unsigned int pointOr = 0;
+	unsigned int pointAnd = (unsigned int)~0;
+
+	if (surface->surfaceType != SF_FACE) {
+		ri.Printf(PRINT_WARNING, "WARNING: SurfIsOffscreen called on non-bmodel!\n");
+		return qfalse;
+	}
+	
+	if ( glConfig.smpActive ) {		// FIXME!  we can't do RB_BeginSurface/RB_EndSurface stuff with smp!
+		return qfalse;
+	}
+
+	if (entityNum == ENTITYNUM_WORLD) {
+		surfOr = tr.viewParms.world;
+	} else {
+		R_RotateForEntity(&tr.refdef.entities[entityNum], &tr.viewParms, &surfOr);
+	}
+
+	for ( i = 0; i < surface->numVerts; i++ )
+	{
+		int j;
+		unsigned int pointFlags = 0;
+
+		R_TransformModelToClip( surface->verts[i].xyz, surfOr.modelMatrix, tr.viewParms.projectionMatrix, eye, clip );
+
+		for ( j = 0; j < 3; j++ )
+		{
+			if ( clip[j] >= clip[3] )
+			{
+				pointFlags |= (1 << (j*2));
+			}
+			else if ( clip[j] <= -clip[3] )
+			{
+				pointFlags |= ( 1 << (j*2+1));
+			}
+		}
+		pointAnd &= pointFlags;
+		pointOr |= pointFlags;
+	}
+
+	// trivially reject
+	if ( pointAnd )
+	{
+		return qtrue;
+	}
+
+	// determine if this surface is backfaced and also determine the distance
+	// to the nearest vertex so we can cull based on portal range.  Culling
+	// based on vertex distance isn't 100% correct (we should be checking for
+	// range to the surface), but it's good enough for the types of portals
+	// we have in the game right now.
+	numTriangles = surface->numIndexes / 3;
+
+	for ( i = 0; i < surface->numIndexes; i += 3 )
+	{
+		vec3_t normal;
+		float dot;
+		float len;
+		unsigned* indices;
+
+		indices = surface->indexes; // (unsigned*)(((char*)surface) + surface->ofsIndices);
+
+		VectorSubtract( surface->verts[indices[i]].xyz, surfOr.viewOrigin, normal);
+
+		if (shader->fDistRange > 0) {
+			len = VectorLengthSquared(normal);			// lose the sqrt
+			if (len < shortest)
+			{
+				shortest = len;
+			}
+		}
+
+		if ( ( dot = DotProduct( normal, surface->cullPlane.normal ) ) >= 0 )
+		{
+			numTriangles--;
+		}
+	}
+	if ( !numTriangles )
+	{
+		return qtrue;
+	}
+
+	if (shader->fDistRange > 0.0)
+	{
+		if (shortest > Square(shader->fDistRange))
+		{
+			return qtrue;
+		}
+	}
+
+	return qfalse;
+}
+
+static qboolean DrawSurfIsOffscreen(drawSurf_t* drawSurf) {
+	// FIXME: unimplemented (GL2)
+#if 0
+	int entityNum;
+	shader_t* shader;
+	int dlighted;
+	qboolean bStaticModel;
+
+	R_DecomposeSort(drawSurf->sort, &entityNum, &shader, &dlighted, &bStaticModel);
+	return SurfIsOffscreen2((srfBspSurface_t*)drawSurf->surface, shader, entityNum);
+#endif
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_marks.c b/code/renderergl2/tr_marks.c
index 682c13d8..0c81b4e8 100644
--- a/code/renderergl2/tr_marks.c
+++ b/code/renderergl2/tr_marks.c
@@ -243,6 +243,7 @@ void R_AddMarkFragments(int numClipPoints, vec3_t clipPoints[2][MAX_VERTS_ON_POL
 	mf = fragmentBuffer + (*returnedFragments);
 	mf->firstPoint = (*returnedPoints);
 	mf->numPoints = numClipPoints;
+	mf->iIndex = 0; // OPENMOHAA-specific stuff
 	Com_Memcpy( pointBuffer + (*returnedPoints) * 3, clipPoints[pingPong], numClipPoints * sizeof(vec3_t) );
 
 	(*returnedPoints) += numClipPoints;
@@ -469,7 +470,10 @@ int R_MarkFragments( int numPoints, const vec3_t *points, const vec3_t projectio
 	return returnedFragments;
 }
 
-
-
-
-
+int R_MarkFragmentsForInlineModel(clipHandle_t bmodel, const vec3_t vAngles, const vec3_t vOrigin, int numPoints,
+	const vec3_t* points, const vec3_t projection, int maxPoints, vec3_t pointBuffer,
+	int maxFragments, markFragment_t* fragmentBuffer, float fRadiusSquared)
+{
+	// FIXME: unimplemented (GL2)
+	return 0;
+}
diff --git a/code/renderergl2/tr_marks_permanent.c b/code/renderergl2/tr_marks_permanent.c
new file mode 100644
index 00000000..eb16ce7c
--- /dev/null
+++ b/code/renderergl2/tr_marks_permanent.c
@@ -0,0 +1,2001 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_marks_pernanent.c: permanent marks
+
+#include "tr_local.h"
+
+#define DCL_FILE_SIGNATURE   *(int *)"DCL "
+#define DCL_FILE_OLD_VERSION 1
+#define DCL_FILE_VERSION     2
+
+typedef struct lmEditPoly_s {
+    srfMarkFragment_t    surf;
+    shader_t            *shader;
+    int                  viewCount;
+    polyVert_t           verts[8];
+    struct lmEditPoly_s *pNextPoly;
+    mnode_t             *pLeafs[8];
+    int                  iNumLeafs;
+} lmEditPoly_t;
+
+typedef struct lmEditMarkDef_s {
+    struct lmEditMarkDef_s *pNextMark;
+    struct lmEditMarkDef_s *pPrevMark;
+    shader_t               *markShader;
+    vec3_t                  vPos;
+    vec3_t                  vProjection;
+    float                   fRadius;
+    float                   fHeightScale;
+    float                   fWidthScale;
+    float                   fRotation;
+    vec4_t                  color;
+    qboolean                bDoLighting;
+    lmEditPoly_t           *pMarkEditPolys;
+    int                     iNumEditPolys;
+    vec3_t                  vPathCorners[4];
+} lmEditMarkDef_t;
+
+typedef struct lmPoly_s {
+    srfMarkFragment_t surf;
+    shader_t         *shader;
+    int               viewCount;
+} lmPoly_t;
+
+typedef struct {
+    qboolean         bLevelMarksLoaded;
+    char             szDCLFilename[MAX_QPATH];
+    lmPoly_t        *pMarkFragments;
+    qboolean         bAutoApplySettings;
+    lmEditPoly_t    *pFreeEditPolys;
+    lmEditMarkDef_t  activeMarkDefs;
+    lmEditMarkDef_t *pFreeMarkDefs;
+    lmEditMarkDef_t *pCurrentMark;
+    qboolean         bPathLayingMode;
+    treadMark_t      treadMark;
+    lmEditMarkDef_t *pTreadMarkStartDecal;
+    lmEditMarkDef_t *pTreadMarkEndDecal;
+} lmGlobals_t;
+
+typedef struct {
+    int ident;
+    int version;
+    int checksum;
+    int iNumDecals;
+    int iNumFragments;
+} dclHeader_t;
+
+typedef struct {
+    char     shader[MAX_RES_NAME];
+    vec3_t   vPos;
+    vec3_t   vProjection;
+    float    fRadius;
+    float    fHeightScale;
+    float    fWidthScale;
+    float    fRotation;
+    vec4_t   color;
+    qboolean bDoLighting;
+} dclSavedMarkDef_t;
+
+typedef struct {
+    char shader[MAX_RES_NAME];
+    int  fogIndex;
+    int  iIndex;
+    int  iNumVerts;
+} dclSavedMarkPoly_t;
+
+cvar_t *dcl_editmode;
+cvar_t *dcl_showcurrent;
+cvar_t *dcl_autogetinfo;
+cvar_t *dcl_shiftstep;
+cvar_t *dcl_shader;
+cvar_t *dcl_radius;
+cvar_t *dcl_heightscale;
+cvar_t *dcl_widthscale;
+cvar_t *dcl_rotation;
+cvar_t *dcl_r;
+cvar_t *dcl_g;
+cvar_t *dcl_b;
+cvar_t *dcl_alpha;
+cvar_t *dcl_dolighting;
+cvar_t *dcl_doworld;
+cvar_t *dcl_doterrain;
+cvar_t *dcl_dobmodels;
+cvar_t *dcl_dostring;
+cvar_t *dcl_pathmode;
+cvar_t *dcl_maxsegment;
+cvar_t *dcl_minsegment;
+cvar_t *dcl_maxoffset;
+cvar_t *dcl_texturescale;
+
+static lmGlobals_t lm;
+
+vec3_t vec_upwards;
+
+lmEditMarkDef_t *R_AllocateMarkDef(void);
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+);
+void DCLC_Delete(void);
+void DCLC_GetInfo(void);
+
+/*
+=============
+DCLC_Save
+
+Save level marks into a DCL file
+=============
+*/
+void DCLC_Save(void)
+{
+    fileHandle_t       hFile;
+    dclHeader_t        header;
+    int                i, j;
+    int                iNumDecals, iNumFragments;
+    lmEditPoly_t      *pPoly;
+    lmEditMarkDef_t   *pMark;
+    bmodel_t          *pBmodel;
+    mnode_t           *pLeaf;
+    dclSavedMarkDef_t  saveMark;
+    dclSavedMarkPoly_t savePoly;
+    char               map_time[32];
+    int                littleValue;
+
+    hFile = ri.FS_OpenFileWrite(lm.szDCLFilename);
+    if (!hFile) {
+        ri.Printf(PRINT_ALL, "R_SaveDCLFile: couldn't write to %s\n", lm.szDCLFilename);
+    }
+
+    pMark         = lm.activeMarkDefs.pNextMark;
+    iNumDecals    = 0;
+    iNumFragments = 0;
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark, iNumDecals++) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; iNumFragments++) {
+            pPoly->viewCount = iNumFragments;
+            pPoly            = pPoly->pNextPoly;
+        }
+    }
+
+    header.ident         = DCL_FILE_SIGNATURE;
+    header.version       = LittleLong(DCL_FILE_VERSION);
+    header.checksum      = 0;
+    header.iNumDecals    = LittleLong(iNumDecals);
+    header.iNumFragments = LittleLong(iNumFragments);
+
+    ri.FS_Write(&header, sizeof(header), hFile);
+
+    //
+    // Write the map time
+    //
+    memset(map_time, 0, sizeof(map_time));
+    Q_strncpyz(map_time, ri.CM_MapTime(), sizeof(map_time));
+    ri.FS_Write(map_time, sizeof(map_time), hFile);
+
+    if (!iNumDecals) {
+        //
+        // Nothing to write
+        //
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        Q_strncpyz(saveMark.shader, pMark->markShader->name, sizeof(saveMark.shader));
+
+        saveMark.vPos[0]        = LittleFloat(pMark->vPos[0]);
+        saveMark.vPos[1]        = LittleFloat(pMark->vPos[1]);
+        saveMark.vPos[2]        = LittleFloat(pMark->vPos[2]);
+        saveMark.vProjection[0] = LittleFloat(pMark->vProjection[0]);
+        saveMark.vProjection[1] = LittleFloat(pMark->vProjection[1]);
+        saveMark.vProjection[2] = LittleFloat(pMark->vProjection[2]);
+
+        saveMark.fRadius      = LittleFloat(pMark->fRadius);
+        saveMark.fHeightScale = LittleFloat(pMark->fHeightScale);
+        saveMark.fWidthScale  = LittleFloat(pMark->fWidthScale);
+        saveMark.fRotation    = LittleFloat(pMark->fRotation);
+
+        saveMark.color[0] = LittleFloat(pMark->color[0]);
+        saveMark.color[1] = LittleFloat(pMark->color[1]);
+        saveMark.color[2] = LittleFloat(pMark->color[2]);
+        saveMark.color[3] = LittleFloat(pMark->color[3]);
+
+        saveMark.bDoLighting = LittleLong(pMark->bDoLighting);
+
+        ri.FS_Write(&saveMark, sizeof(saveMark), hFile);
+    }
+
+    for (pMark = lm.activeMarkDefs.pNextMark; pMark != &lm.activeMarkDefs; pMark = pMark->pNextMark) {
+        for (pPoly = pMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            Q_strncpyz(savePoly.shader, pMark->markShader->name, sizeof(savePoly.shader));
+
+            savePoly.fogIndex  = 0;
+            savePoly.iIndex    = LittleLong(pPoly->surf.iIndex);
+            savePoly.iNumVerts = LittleLong(pPoly->surf.numVerts);
+
+            ri.FS_Write(&savePoly, sizeof(savePoly), hFile);
+            ri.FS_Write(pPoly->verts, sizeof(pPoly->verts[0]) * savePoly.iNumVerts, hFile);
+        }
+    }
+
+    for (i = 0; i < tr.world->numBModels; i++) {
+        pBmodel = &tr.world->bmodels[i];
+
+        if (!pBmodel->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pBmodel->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pBmodel->iNumMarkFragment; i++) {
+            littleValue = ((lmPoly_t *)pBmodel->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+        pLeaf = &tr.world->nodes[i];
+
+        if (!pLeaf->iNumMarkFragment) {
+            //
+            // No fragment to save
+            //
+            littleValue = 0;
+            ri.FS_Write(&littleValue, sizeof(littleValue), hFile);
+            continue;
+        }
+
+        littleValue = LittleLong(pLeaf->iNumMarkFragment);
+        ri.FS_Write(&littleValue, sizeof(int), hFile);
+
+        for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+            littleValue = ((lmPoly_t *)pLeaf->pFirstMarkFragment[j])->viewCount;
+            ri.FS_Write(&littleValue, sizeof(int), hFile);
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+}
+
+/*
+=============
+R_LevelMarksLoad
+
+Load level marks from a DCL file
+=============
+*/
+void R_LevelMarksLoad(const char *szBSPName)
+{
+    int          i;
+    int          iLength;
+    fileHandle_t hFile;
+    dclHeader_t  dclHeader;
+    const char  *real_map_time;
+    char         map_time[33];
+
+    if (lm.bLevelMarksLoaded) {
+        //
+        // Destroy and reallocate level marks
+        //
+
+        R_LevelMarksFree();
+        R_LevelMarksInit();
+    }
+
+    COM_StripExtension(szBSPName, lm.szDCLFilename, sizeof(lm.szDCLFilename));
+    Q_strcat(lm.szDCLFilename, sizeof(lm.szDCLFilename), ".dcl");
+
+    if (ri.FS_OpenFile(lm.szDCLFilename, &hFile, qtrue, qtrue) <= 0) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s not found\n", lm.szDCLFilename);
+        return;
+    }
+
+    lm.bLevelMarksLoaded = qtrue;
+
+    //
+    // Read the DCL file header
+    //
+
+    iLength = ri.FS_Read(&dclHeader, sizeof(dclHeader), hFile);
+    if (iLength < sizeof(dclHeader)) {
+        ri.FS_CloseFile(hFile);
+        ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+        return;
+    }
+
+    //
+    // Signature and version checks
+    //
+
+    if (dclHeader.ident != DCL_FILE_SIGNATURE) {
+        ri.Printf(PRINT_ALL, "R_LevelMarksLoad: %s Seems to be an invalid DCL file\n", lm.szDCLFilename);
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    for (i = 0; i < sizeof(dclHeader) / sizeof(int); i++) {
+        ((int *)&dclHeader)[i] = LittleLong(((int *)&dclHeader)[i]);
+    }
+
+    if (dclHeader.version != DCL_FILE_OLD_VERSION && dclHeader.version != DCL_FILE_VERSION) {
+        ri.Printf(
+            PRINT_ALL,
+            "R_LevelMarksLoad: %s is wrong version (%i should be %i)\n",
+            lm.szDCLFilename,
+            dclHeader.version,
+            DCL_FILE_VERSION
+        );
+        ri.FS_CloseFile(hFile);
+        return;
+    }
+
+    if (dclHeader.version == DCL_FILE_OLD_VERSION) {
+        //
+        // The old version has no map time
+        //
+        map_time[0] = 0;
+    } else {
+        map_time[32] = 0;
+        ri.FS_Read(map_time, sizeof(map_time) - 1, hFile);
+    }
+
+    ri.Printf(PRINT_ALL, "----------- Loading DCL file %s ---------\n", lm.szDCLFilename);
+
+    if (dcl_editmode->integer) {
+        dclSavedMarkDef_t saveMark;
+        lmEditMarkDef_t  *pMark;
+        qhandle_t         hShader;
+
+        //
+        // Load all editor-mode decals
+        //
+
+        for (i = 0; i < dclHeader.iNumDecals; i++) {
+            ri.FS_Read(&saveMark, sizeof(saveMark), hFile);
+
+            saveMark.vPos[0]        = LittleFloat(saveMark.vPos[0]);
+            saveMark.vPos[1]        = LittleFloat(saveMark.vPos[1]);
+            saveMark.vPos[2]        = LittleFloat(saveMark.vPos[2]);
+            saveMark.vProjection[0] = LittleFloat(saveMark.vProjection[0]);
+            saveMark.vProjection[1] = LittleFloat(saveMark.vProjection[1]);
+            saveMark.vProjection[2] = LittleFloat(saveMark.vProjection[2]);
+
+            saveMark.fRadius      = LittleFloat(saveMark.fRadius);
+            saveMark.fHeightScale = LittleFloat(saveMark.fHeightScale);
+            saveMark.fWidthScale  = LittleFloat(saveMark.fWidthScale);
+            saveMark.fRotation    = LittleFloat(saveMark.fRotation);
+
+            saveMark.color[0] = LittleFloat(saveMark.color[0]);
+            saveMark.color[1] = LittleFloat(saveMark.color[1]);
+            saveMark.color[2] = LittleFloat(saveMark.color[2]);
+            saveMark.color[3] = LittleFloat(saveMark.color[3]);
+
+            saveMark.bDoLighting = LittleLong(saveMark.bDoLighting);
+
+            pMark = R_AllocateMarkDef();
+            if (!pMark) {
+                break;
+            }
+
+            hShader = RE_RegisterShader(saveMark.shader);
+            if (hShader) {
+                pMark->markShader = R_GetShaderByHandle(hShader);
+            } else {
+                ri.Printf(PRINT_ALL, "Bad decal shader %s\n", saveMark.shader);
+                pMark->markShader = tr.defaultShader;
+            }
+
+            //
+            // Copy settings from the saved mark
+            // to the newly allocated mark def
+            //
+
+            VectorCopy(saveMark.vPos, pMark->vPos);
+            VectorCopy(saveMark.vProjection, pMark->vProjection);
+
+            pMark->fRadius      = saveMark.fRadius;
+            pMark->fWidthScale  = saveMark.fWidthScale;
+            pMark->fHeightScale = saveMark.fHeightScale;
+            pMark->fRotation    = saveMark.fRotation;
+
+            Vector4Copy(saveMark.color, pMark->color);
+            pMark->bDoLighting = saveMark.bDoLighting;
+
+            lm.pCurrentMark = pMark;
+
+            //
+            // Now add the loaded mark
+            //
+
+            if (!R_ApplyLevelDecal(pMark->vPos, pMark->vProjection, qtrue, qtrue, 0)) {
+                DCLC_Delete();
+            }
+        }
+    } else {
+        int                j;
+        int                iIndex;
+        dclSavedMarkPoly_t savePoly;
+        lmPoly_t          *pPoly;
+        shader_t          *shader;
+        qhandle_t          hShader;
+        char               szLastShaderName[MAX_RES_NAME];
+        bmodel_t          *pBmodel;
+        mnode_t           *pLeaf;
+
+        szLastShaderName[0] = 0;
+        real_map_time       = ri.CM_MapTime();
+
+        if (!*real_map_time || strcmp(real_map_time, map_time)) {
+            ri.Printf(PRINT_ALL, "!!! BSP file is newer than DCL file.\n");
+            ri.Printf(PRINT_ALL, "!!! The DCL file needs to be updated.\n");
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        if (!dclHeader.iNumDecals) {
+            //
+            // Nothing to load
+            //
+            ri.FS_CloseFile(hFile);
+            ri.Printf(PRINT_ALL, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+            return;
+        }
+
+        //
+        // Skip editor stuff
+        //
+        ri.FS_Seek(hFile, sizeof(dclSavedMarkDef_t) * dclHeader.iNumDecals, FS_SEEK_CUR);
+
+        //
+        // Load all saved polys
+        //
+
+        lm.pMarkFragments = (lmPoly_t *)ri.Hunk_Alloc(sizeof(lmPoly_t) * dclHeader.iNumFragments, h_low);
+
+        for (i = 0; i < dclHeader.iNumFragments; i++) {
+            polyVert_t *pv;
+
+            ri.FS_Read(&savePoly, sizeof(savePoly), hFile);
+
+            savePoly.fogIndex  = LittleLong(savePoly.fogIndex);
+            savePoly.iIndex    = LittleLong(savePoly.iIndex);
+            savePoly.iNumVerts = LittleLong(savePoly.iNumVerts);
+
+            pPoly = &lm.pMarkFragments[i];
+
+            //
+            // Make sure to register the shader once
+            //
+            if (Q_stricmp(savePoly.shader, szLastShaderName)) {
+                hShader = RE_RegisterShader(savePoly.shader);
+                if (!hShader) {
+                    // Added in 2.30
+                    //  Don't mess with decal loading, so drop immediately
+                    Com_Error(ERR_DROP, "Decal file lists non-existant shader: %s", savePoly.shader);
+
+                    pPoly->shader           = tr.defaultShader;
+                    pPoly->surf.iIndex      = 0;
+                    pPoly->surf.surfaceType = SF_SKIP;
+                    pPoly->surf.numVerts    = 0;
+                    continue;
+                }
+
+                shader = R_GetShaderByHandle(hShader);
+                Q_strncpyz(szLastShaderName, savePoly.shader, sizeof(szLastShaderName));
+            }
+
+            pPoly->shader           = shader;
+            pPoly->surf.iIndex      = savePoly.iIndex;
+            pPoly->surf.surfaceType = SF_MARK_FRAG;
+
+            //
+            // Load vertices
+            //
+
+            pPoly->surf.numVerts = savePoly.iNumVerts;
+            pPoly->surf.verts    = (polyVert_t *)ri.Hunk_Alloc(sizeof(polyVert_t) * savePoly.iNumVerts, h_low);
+            ri.FS_Read(pPoly->surf.verts, sizeof(polyVert_t) * savePoly.iNumVerts, hFile);
+
+            for (j = 0; j < savePoly.iNumVerts; j++) {
+                pv = &pPoly->surf.verts[j];
+
+                pv->xyz[0] = LittleFloat(pv->xyz[0]);
+                pv->xyz[1] = LittleFloat(pv->xyz[1]);
+                pv->xyz[2] = LittleFloat(pv->xyz[2]);
+                pv->st[0]  = LittleFloat(pv->st[0]);
+                pv->st[1]  = LittleFloat(pv->st[1]);
+            }
+        }
+
+        //
+        // Load all brush models
+        //
+        for (i = 0; i < tr.world->numBModels; i++) {
+            pBmodel = &tr.world->bmodels[i];
+
+            ri.FS_Read(&pBmodel->iNumMarkFragment, sizeof(int), hFile);
+            pBmodel->iNumMarkFragment = LittleLong(pBmodel->iNumMarkFragment);
+
+            //
+            // Load brush model fragments
+            //
+            if (pBmodel->iNumMarkFragment) {
+                pBmodel->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pBmodel->iNumMarkFragment, h_low);
+
+                for (j = 0; j < pBmodel->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pBmodel->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+
+        //
+        // Load all leafs
+        //
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            pLeaf = &tr.world->nodes[i];
+
+            ri.FS_Read(&pLeaf->iNumMarkFragment, sizeof(int), hFile);
+            pLeaf->iNumMarkFragment = LittleLong(pLeaf->iNumMarkFragment);
+
+            if (pLeaf->iNumMarkFragment) {
+                pLeaf->pFirstMarkFragment = (void **)ri.Hunk_Alloc(sizeof(void *) * pLeaf->iNumMarkFragment, h_low);
+
+                //
+                // Load leaf fragments
+                //
+                for (j = 0; j < pLeaf->iNumMarkFragment; j++) {
+                    ri.FS_Read(&iIndex, sizeof(iIndex), hFile);
+                    iIndex = LittleLong(iIndex);
+
+                    pLeaf->pFirstMarkFragment[j] = &lm.pMarkFragments[iIndex];
+                }
+            }
+        }
+    }
+
+    ri.FS_CloseFile(hFile);
+    ri.Printf(0, "------ Finished loading DCL file %s -----\n", lm.szDCLFilename);
+}
+
+/*
+=============
+R_RemoveEditPolyFromPointerList
+
+=============
+*/
+void R_RemoveEditPolyFromPointerList(lmEditPoly_t *pPoly, void **pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    for (i = 0; i < *piNumFragments; i++, pFragmentList++) {
+        if (*pFragmentList == pPoly) {
+            *pFragmentList = NULL;
+        }
+
+        if (!*pFragmentList && i < *piNumFragments - 1) {
+            *pFragmentList   = pFragmentList[1];
+            pFragmentList[1] = NULL;
+        }
+    }
+
+    (*piNumFragments)--;
+}
+
+/*
+=============
+R_FreeMarkFragments
+
+Free up all allocated marks
+=============
+*/
+void R_FreeMarkFragments(lmEditMarkDef_t *pMark)
+{
+    lmEditPoly_t *pPoly;
+    int           i;
+
+    while ((pPoly = pMark->pMarkEditPolys)) {
+        pMark->pMarkEditPolys = pPoly->pNextPoly;
+
+        if (pPoly->surf.iIndex < 0) {
+            //
+            // It's a brush model
+            //
+            bmodel_t *pBmodel;
+
+            pBmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+
+            R_RemoveEditPolyFromPointerList(pPoly, pBmodel->pFirstMarkFragment, &pBmodel->iNumMarkFragment);
+            continue;
+        } else {
+            //
+            // It's a leaf
+            //
+            mnode_t *pLeaf;
+
+            for (i = 0; i < pPoly->iNumLeafs; i++) {
+                pLeaf = pPoly->pLeafs[i];
+
+                R_RemoveEditPolyFromPointerList(pPoly, pLeaf->pFirstMarkFragment, &pLeaf->iNumMarkFragment);
+            }
+        }
+
+        pPoly->pNextPoly  = lm.pFreeEditPolys;
+        lm.pFreeEditPolys = pPoly;
+    }
+
+    pMark->iNumEditPolys = 0;
+}
+
+/*
+=============
+R_InitMarkDef
+
+Applies default values to the specified mark definition
+=============
+*/
+void R_InitMarkDef(lmEditMarkDef_t *pMark)
+{
+    VectorClear(pMark->vPos);
+    VectorSet(pMark->vProjection, 0, 0, -1);
+    pMark->fRadius        = 8.0;
+    pMark->fHeightScale   = 1.0;
+    pMark->fWidthScale    = 1.0;
+    pMark->fRotation      = 0.0;
+    pMark->markShader     = tr.defaultShader;
+    pMark->color[0]       = NAN;
+    pMark->bDoLighting    = 1;
+    pMark->pMarkEditPolys = 0;
+    pMark->iNumEditPolys  = 0;
+}
+
+/*
+=============
+R_AllocateMarkDef
+
+Allocates a new mark definition for editing
+=============
+*/
+lmEditMarkDef_t *R_AllocateMarkDef(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    int              i;
+
+    if (!lm.pFreeMarkDefs) {
+        lm.pFreeMarkDefs = (lmEditMarkDef_t *)ri.Hunk_Alloc(sizeof(lmEditMarkDef_t) * MAX_MARK_FRAGMENTS, h_low);
+        if (!lm.pFreeMarkDefs) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_FRAGMENTS - 1; i++) {
+            lm.pFreeMarkDefs[i].pNextMark = &lm.pFreeMarkDefs[i + 1];
+        }
+        lm.pFreeMarkDefs[MAX_MARK_FRAGMENTS - 1].pNextMark = NULL;
+    }
+
+    pNewMark         = lm.pFreeMarkDefs;
+    lm.pFreeMarkDefs = lm.pFreeMarkDefs->pNextMark;
+
+    pNewMark->pNextMark = lm.activeMarkDefs.pNextMark;
+    pNewMark->pPrevMark = &lm.activeMarkDefs;
+
+    lm.activeMarkDefs.pNextMark->pPrevMark = pNewMark;
+    lm.activeMarkDefs.pNextMark            = pNewMark;
+
+    R_InitMarkDef(pNewMark);
+    return pNewMark;
+}
+
+/*
+=============
+R_AllocateEditPoly
+
+Allocates a new mark poly for editing
+=============
+*/
+lmEditPoly_t *R_AllocateEditPoly(void)
+{
+    lmEditPoly_t *pNewPoly;
+    int           i;
+
+    if (!lm.pFreeEditPolys) {
+        lm.pFreeEditPolys = (lmEditPoly_t *)ri.Hunk_Alloc(sizeof(lmEditPoly_t) * MAX_MARK_POLYVERTS, h_low);
+        if (!lm.pFreeEditPolys) {
+            return NULL;
+        }
+
+        for (i = 0; i < MAX_MARK_POLYVERTS - 1; i++) {
+            lm.pFreeEditPolys[i].pNextPoly = &lm.pFreeEditPolys[i + 1];
+        }
+        lm.pFreeEditPolys[MAX_MARK_POLYVERTS - 1].pNextPoly = NULL;
+    }
+
+    pNewPoly                   = lm.pFreeEditPolys;
+    lm.pFreeEditPolys          = lm.pFreeEditPolys->pNextPoly;
+    pNewPoly->surf.surfaceType = SF_MARK_FRAG;
+    pNewPoly->surf.verts       = pNewPoly->verts;
+
+    return pNewPoly;
+}
+
+/*
+=============
+R_AddEditPolyToPointerList
+
+=============
+*/
+qboolean R_AddEditPolyToPointerList(lmEditPoly_t *pPoly, void ***pFragmentList, int *piNumFragments)
+{
+    int i;
+
+    if (!*pFragmentList || (*pFragmentList)[*piNumFragments] == (void *)-1) {
+        void **pNewList = (void **)ri.Malloc((*piNumFragments + MAX_MARK_FRAGMENTS) * sizeof(void *));
+        if (!pNewList) {
+            return 0;
+        }
+
+        for (i = 0; i < *piNumFragments + MAX_MARK_FRAGMENTS; i++) {
+            pNewList[i] = NULL;
+        }
+        pNewList[*piNumFragments + MAX_MARK_FRAGMENTS - 1] = (void *)-1;
+
+        if (*pFragmentList) {
+            Com_Memcpy(pNewList, *pFragmentList, *piNumFragments * sizeof(void *));
+            ri.Free(*pFragmentList);
+        }
+
+        *pFragmentList = pNewList;
+    }
+
+    (*pFragmentList)[*piNumFragments] = pPoly;
+    (*piNumFragments)++;
+
+    return qtrue;
+}
+
+/*
+=============
+R_ApplyLevelDecal
+
+=============
+*/
+lmEditMarkDef_t *R_ApplyLevelDecal(
+    const vec3_t vPos, const vec3_t vDir, qboolean bUseCurrent, qboolean bUseCurrentSettings, int iPathIndex
+)
+{
+    qboolean         bDoLighting;
+    qboolean         bDoMerge;
+    int              i, j, k, l;
+    int              iNumFragments;
+    float            fRadius;
+    float            fSScale, fTScale;
+    float            fR, fG, fB, fA;
+    float            fRoll;
+    shader_t        *shader;
+    qhandle_t        hShader;
+    lmEditMarkDef_t *pMark;
+    lmEditPoly_t    *pPoly;
+    vec3_t           vOrigin;
+    vec3_t           vProjection;
+    vec3_t           vTmp, vTmp2;
+    vec3_t           vNorm, vNorm2;
+    vec3_t           bounds[2];
+    markFragment_t   markFragments[MAX_MARK_FRAGMENTS];
+    markFragment_t  *mf, *mf2;
+    polyVert_t       verts[MAX_MARK_POLYVERTS];
+    bmodel_t        *pBModel;
+    mnode_t         *pNode;
+    int              iNumNewVerts, iNumMergeVerts;
+    int              iFirstEdgeVert, iFirstEdgeVert2;
+    polyVert_t      *pNewVerts[8];
+    polyVert_t      *pFragVerts;
+    polyVert_t      *pMergeVerts[16];
+    float            fDist, fDist2;
+
+    iFirstEdgeVert = iFirstEdgeVert2 = 0;
+
+    if (bUseCurrent && !lm.pCurrentMark) {
+        return NULL;
+    }
+
+    if (iPathIndex) {
+        shader = R_GetShaderByHandle(lm.treadMark.hTreadShader);
+
+        fRadius = lm.treadMark.fWidth;
+        fTScale = 1.0;
+        fSScale = 1.0;
+
+        fG = 1.0;
+        fR = 1.0;
+        fA = 1.0;
+        fB = 1.0;
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = -1.0;
+    } else if (bUseCurrent && bUseCurrentSettings) {
+        shader = lm.pCurrentMark->markShader;
+
+        fRadius = lm.pCurrentMark->fRadius;
+        fSScale = lm.pCurrentMark->fWidthScale;
+        fTScale = lm.pCurrentMark->fHeightScale;
+
+        fR = lm.pCurrentMark->color[0];
+        fG = lm.pCurrentMark->color[1];
+        fB = lm.pCurrentMark->color[2];
+        fA = lm.pCurrentMark->color[3];
+
+        bDoLighting = lm.pCurrentMark->bDoLighting;
+        fRoll       = lm.pCurrentMark->fRotation;
+    } else {
+        hShader = RE_RegisterShader(dcl_shader->string);
+        if (hShader) {
+            shader = R_GetShaderByHandle(hShader);
+        } else {
+            ri.Printf(PRINT_ALL, "Bad decal shader %s\n", dcl_shader->string);
+            shader = tr.defaultShader;
+        }
+
+        fRadius = dcl_radius->value;
+        fSScale = dcl_widthscale->value;
+        fTScale = dcl_heightscale->value;
+
+        fR = Q_clamp_float(dcl_r->value, 0.0, 1.0);
+        fG = Q_clamp_float(dcl_g->value, 0.0, 1.0);
+        fB = Q_clamp_float(dcl_b->value, 0.0, 1.0);
+        fA = Q_clamp_float(dcl_alpha->value, 0.0, 1.0);
+
+        bDoLighting = dcl_dolighting->integer != 0;
+        fRoll       = anglemod(dcl_rotation->value);
+    }
+
+    if (fRadius < 0.0) {
+        fRadius = 0.001;
+    }
+    if (fSScale < 0.0) {
+        fSScale = 0.001;
+    }
+    if (fTScale < 0.0) {
+        fTScale = 0.001;
+    }
+
+    VectorCopy(vPos, vOrigin);
+    VectorNormalize2(vDir, vProjection);
+
+    if (iPathIndex) {
+        iNumFragments =
+            ri.CG_PermanentTreadMarkDecal(&lm.treadMark, iPathIndex == 1, bDoLighting, markFragments, verts);
+    } else {
+        iNumFragments = ri.CG_PermanentMark(
+            vOrigin,
+            vProjection,
+            anglemod(fRoll + 90),
+            fSScale * fRadius,
+            fTScale * fRadius,
+            fR,
+            fG,
+            fB,
+            fA,
+            bDoLighting,
+            0.5,
+            0.5,
+            markFragments,
+            verts
+        );
+    }
+
+    if (!iNumFragments) {
+        return NULL;
+    }
+
+    if (bUseCurrent) {
+        pMark = lm.pCurrentMark;
+        R_FreeMarkFragments(lm.pCurrentMark);
+    } else {
+        pMark = R_AllocateMarkDef();
+        if (!pMark) {
+            return NULL;
+        }
+    }
+
+    VectorCopy(vOrigin, pMark->vPos);
+    VectorCopy(vProjection, pMark->vProjection);
+
+    pMark->markShader   = shader;
+    pMark->fRadius      = fRadius;
+    pMark->fWidthScale  = fSScale;
+    pMark->fHeightScale = fTScale;
+    VectorSet4(pMark->color, fR, fG, fB, fA);
+
+    pMark->bDoLighting = bDoLighting;
+    pMark->fRotation   = fRoll;
+
+    if (iPathIndex) {
+        if (iPathIndex == 1) {
+            VectorCopy(lm.treadMark.vStartVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vStartVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[3]);
+        } else {
+            VectorCopy(lm.treadMark.vMidVerts[1], pMark->vPathCorners[0]);
+            VectorCopy(lm.treadMark.vMidVerts[0], pMark->vPathCorners[1]);
+            VectorCopy(lm.treadMark.vEndVerts[0], pMark->vPathCorners[2]);
+            VectorCopy(lm.treadMark.vEndVerts[1], pMark->vPathCorners[3]);
+        }
+
+        VectorClear(vOrigin);
+
+        for (i = 0; i < 4; i++) {
+            VectorAdd(vOrigin, pMark->vPathCorners[i], vOrigin);
+        }
+
+        vOrigin[0] /= 4.0;
+        vOrigin[1] /= 4.0;
+        vOrigin[2] = vOrigin[2] / 4.0 + 16.0;
+        VectorCopy(vOrigin, pMark->vPos);
+    }
+
+    for (i = 0; i < iNumFragments; i++) {
+        mf = &markFragments[i];
+
+        if (!mf->numPoints) {
+            continue;
+        }
+
+        assert(mf->numPoints >= 3);
+
+        iNumNewVerts = mf->numPoints;
+        for (j = 0; j < mf->numPoints; ++j) {
+            pNewVerts[j] = &verts[mf->firstPoint + j];
+        }
+
+        VectorSubtract(pNewVerts[0]->xyz, pNewVerts[1]->xyz, vTmp);
+        VectorSubtract(pNewVerts[2]->xyz, pNewVerts[1]->xyz, vTmp2);
+        CrossProduct(vTmp, vTmp2, vNorm);
+        VectorNormalize(vNorm);
+
+        fDist = DotProduct(vNorm, pNewVerts[0]->xyz);
+
+        if (mf->iIndex <= 0) {
+            for (j = i + 1; j < iNumFragments; j++) {
+                mf2 = &markFragments[j];
+
+                if (!mf2->numPoints) {
+                    continue;
+                }
+                if (mf2->iIndex > 0 || mf->iIndex == mf2->iIndex) {
+                    continue;
+                }
+
+                pFragVerts = &verts[mf2->firstPoint];
+
+                if (fabs(DotProduct(vNorm, pFragVerts->xyz) - fDist) > 0.01) {
+                    continue;
+                }
+
+                VectorSubtract(pFragVerts[0].xyz, pFragVerts[1].xyz, vTmp);
+                VectorSubtract(pFragVerts[2].xyz, pFragVerts[1].xyz, vTmp2);
+                CrossProduct(vTmp, vTmp2, vNorm2);
+                VectorNormalize(vNorm2);
+
+                if (!VectorCompare(vNorm, vNorm2)) {
+                    continue;
+                }
+
+                bDoMerge = qfalse;
+                for (k = 0; k < iNumNewVerts; k++) {
+                    for (l = 0; l < mf2->numPoints; l++) {
+                        if (VectorCompare(pNewVerts[k]->xyz, pFragVerts[(l + 1) % mf2->numPoints].xyz)
+                            && VectorCompare(pNewVerts[(k + 1) % iNumNewVerts]->xyz, pFragVerts[l].xyz)) {
+                            bDoMerge        = 1;
+                            iFirstEdgeVert  = k;
+                            iFirstEdgeVert2 = l;
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        break;
+                    }
+                }
+
+                if (bDoMerge) {
+                    iNumMergeVerts = 0;
+                    for (k = 1; k < iNumNewVerts; ++k) {
+                        pMergeVerts[iNumMergeVerts++] = pNewVerts[(k + iFirstEdgeVert) % iNumNewVerts];
+                    }
+
+                    for (k = 1; k < mf2->numPoints; k++) {
+                        pMergeVerts[iNumMergeVerts++] = &pFragVerts[(k + iFirstEdgeVert2) % mf2->numPoints];
+                    }
+
+                    bDoMerge = qtrue;
+
+                    for (k = 0; k < iNumMergeVerts; k++) {
+                        VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                        CrossProduct(vNorm, vTmp, vNorm2);
+                        VectorNormalize(vNorm2);
+
+                        for (l = 0; l < iNumMergeVerts; l++) {
+                            if (l == k) {
+                                break;
+                            }
+
+                            if (DotProduct(pMergeVerts[l]->xyz, vNorm)
+                                > DotProduct(pMergeVerts[k]->xyz, vNorm2) + 0.01) {
+                                bDoMerge = qfalse;
+                                break;
+                            }
+                        }
+
+                        if (!bDoMerge) {
+                            break;
+                        }
+                    }
+
+                    if (bDoMerge) {
+                        for (k = 0; k < iNumMergeVerts; k++) {
+                            VectorSubtract(pMergeVerts[(k + 1) % iNumMergeVerts]->xyz, pMergeVerts[k]->xyz, vTmp);
+                            VectorNormalize(vTmp);
+                            VectorSubtract(
+                                pMergeVerts[k]->xyz, pMergeVerts[(iNumMergeVerts + k - 1) % iNumMergeVerts]->xyz, vTmp
+                            );
+                            VectorNormalize(vTmp2);
+
+                            if (DotProduct(vTmp, vTmp2) > 0.999) {
+                                for (l = k + 1; l < iNumMergeVerts; l++) {
+                                    pMergeVerts[l - 1] = pMergeVerts[l];
+                                }
+                            }
+                        }
+
+                        if (iNumMergeVerts <= 8) {
+                            iNumNewVerts = iNumMergeVerts;
+                            for (k = 0; k < iNumMergeVerts; k++) {
+                                pNewVerts[k] = pMergeVerts[k];
+                            }
+
+                            mf2->numPoints = 0;
+                        }
+                    }
+                }
+            }
+        }
+
+        pPoly = R_AllocateEditPoly();
+        if (!pPoly) {
+            return pMark;
+        }
+
+        pPoly->shader        = shader;
+        pPoly->surf.numVerts = iNumNewVerts;
+
+        for (j = 0; j < iNumNewVerts; j++) {
+            memcpy(&pPoly->verts[j], pNewVerts[j], sizeof(polyVert_t));
+        }
+
+        pPoly->surf.iIndex = mf->iIndex;
+        pPoly->iNumLeafs   = 0;
+
+        if (mf->iIndex <= 0 || dcl_doworld->integer && dcl_doterrain->integer) {
+            if (mf->iIndex >= 0) {
+                if (dcl_doworld->integer) {
+                    ClearBounds(bounds[0], bounds[1]);
+                    VectorClear(vOrigin);
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorAdd(pPoly->verts[j].xyz, vNorm, vTmp);
+
+                        pNode = R_PointInLeaf(vTmp);
+                        if (pNode && pNode->contents != -1 && !(pNode->contents & CONTENTS_SOLID)) {
+                            for (k = 0; k < pPoly->iNumLeafs; k++) {
+                                if (pPoly->pLeafs[k] == pNode) {
+                                    break;
+                                }
+                            }
+
+                            if (k == pPoly->iNumLeafs) {
+                                R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                                pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                                pPoly->iNumLeafs++;
+                            }
+                        }
+
+                        AddPointToBounds(vTmp, bounds[0], bounds[1]);
+                        VectorAdd(vOrigin, vTmp, vOrigin);
+                    }
+
+                    VectorScale(vOrigin, 1.0 / pPoly->surf.numVerts, vOrigin);
+
+                    pNode = R_PointInLeaf(vOrigin);
+                    for (k = 0; k < pPoly->iNumLeafs; k++) {
+                        if (pPoly->pLeafs[k] == pNode) {
+                            break;
+                        }
+                    }
+
+                    if (k == pPoly->iNumLeafs) {
+                        R_AddEditPolyToPointerList(pPoly, &pNode->pFirstMarkFragment, &pNode->iNumMarkFragment);
+                        pPoly->pLeafs[pPoly->iNumLeafs] = pNode;
+                        pPoly->iNumLeafs++;
+                    }
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            } else {
+                if (dcl_dobmodels->integer) {
+                    R_AddEditPolyToPointerList(
+                        pPoly,
+                        &tr.world->bmodels[-mf->iIndex].pFirstMarkFragment,
+                        &tr.world->bmodels[-mf->iIndex].iNumMarkFragment
+                    );
+
+                    pPoly->pNextPoly      = pMark->pMarkEditPolys;
+                    pMark->pMarkEditPolys = pPoly;
+                    pMark->iNumEditPolys++;
+                }
+            }
+        }
+    }
+
+    return pMark;
+}
+
+/*
+=============
+DCLC_Make
+
+=============
+*/
+void DCLC_Make(void)
+{
+    lmEditMarkDef_t *pNewMark;
+    vec3_t           vProjection;
+
+    VectorNegate(tr.refdef.viewaxis[0], vProjection);
+
+    pNewMark = R_ApplyLevelDecal(tr.refdef.vieworg, vProjection, qfalse, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Reapply
+
+=============
+*/
+void DCLC_Reapply(void)
+{
+    lmEditMarkDef_t *pNewMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    pNewMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qfalse, 0);
+    if (pNewMark) {
+        lm.pCurrentMark       = pNewMark;
+        lm.bAutoApplySettings = qtrue;
+    }
+}
+
+/*
+=============
+DCLC_Delete
+
+=============
+*/
+void DCLC_Delete(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    R_FreeMarkFragments(lm.pCurrentMark);
+    lm.pCurrentMark = pMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = pMark->pPrevMark;
+        if (lm.pCurrentMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = NULL;
+        }
+    }
+
+    pMark->pPrevMark->pNextMark = pMark->pNextMark;
+    pMark->pNextMark->pPrevMark = pMark->pPrevMark;
+    pMark->pNextMark            = lm.pFreeMarkDefs;
+    pMark->pPrevMark            = 0;
+    lm.pFreeMarkDefs            = pMark;
+
+    if (dcl_autogetinfo->integer) {
+        lm.bAutoApplySettings = qtrue;
+        DCLC_GetInfo();
+    } else {
+        lm.bAutoApplySettings = qfalse;
+    }
+}
+
+/*
+=============
+DCLC_SelectNext
+
+=============
+*/
+void DCLC_SelectNext(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pPrevMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pPrevMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pPrevMark;
+        if (lm.activeMarkDefs.pPrevMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectPrev
+
+=============
+*/
+void DCLC_SelectPrev(void)
+{
+    lmEditMarkDef_t *pMark;
+
+    lm.bAutoApplySettings = dcl_autogetinfo->integer != 0;
+
+    if (!lm.pCurrentMark) {
+        if (lm.activeMarkDefs.pNextMark != &lm.activeMarkDefs) {
+            lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        }
+
+        if (dcl_autogetinfo->integer) {
+            DCLC_GetInfo();
+        }
+        return;
+    }
+    pMark = lm.pCurrentMark;
+
+    lm.pCurrentMark = lm.pCurrentMark->pNextMark;
+    if (lm.pCurrentMark == &lm.activeMarkDefs) {
+        lm.pCurrentMark = lm.activeMarkDefs.pNextMark;
+        if (lm.activeMarkDefs.pNextMark == &lm.activeMarkDefs) {
+            lm.pCurrentMark = pMark;
+        }
+    }
+
+    if (dcl_autogetinfo->integer) {
+        DCLC_GetInfo();
+    }
+}
+
+/*
+=============
+DCLC_SelectCh
+
+=============
+*/
+void DCLC_SelectCh(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_SelectChNxt
+
+=============
+*/
+void DCLC_SelectChNxt(void)
+{
+    // Nothing to do
+}
+
+/*
+=============
+DCLC_GetInfo
+
+=============
+*/
+void DCLC_GetInfo(void)
+{
+    if (!lm.pCurrentMark) {
+        return;
+    }
+
+    if (lm.pCurrentMark->fRotation == -1) {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+    } else {
+        ri.Cvar_Set("dcl_shader", lm.pCurrentMark->markShader->name);
+        ri.Cvar_SetValue("dcl_radius", lm.pCurrentMark->fRadius);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_heightscale", lm.pCurrentMark->fHeightScale);
+        ri.Cvar_SetValue("dcl_widthscale", lm.pCurrentMark->fWidthScale);
+        ri.Cvar_SetValue("dcl_rotation", lm.pCurrentMark->fRotation);
+        ri.Cvar_SetValue("dcl_r", lm.pCurrentMark->color[0]);
+        ri.Cvar_SetValue("dcl_g", lm.pCurrentMark->color[1]);
+        ri.Cvar_SetValue("dcl_b", lm.pCurrentMark->color[2]);
+    }
+
+    ri.Cvar_SetValue("dcl_alpha", lm.pCurrentMark->color[3]);
+    ri.Cvar_SetValue("dcl_dolighting", lm.pCurrentMark->bDoLighting);
+
+    lm.bAutoApplySettings = qtrue;
+}
+
+/*
+=============
+DCLC_ShiftUp
+
+=============
+*/
+void DCLC_ShiftUp(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftDown
+
+=============
+*/
+void DCLC_ShiftDown(void)
+{
+    vec3_t vAngles;
+    vec3_t vUp;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, NULL, vUp);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vUp, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftLeft
+
+=============
+*/
+void DCLC_ShiftLeft(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, -dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_ShiftRight
+
+=============
+*/
+void DCLC_ShiftRight(void)
+{
+    vec3_t vAngles;
+    vec3_t vRight;
+
+    if (!lm.pCurrentMark) {
+        return;
+    }
+    if (lm.pCurrentMark->fRotation == -1) {
+        return;
+    }
+
+    vectoangles(lm.pCurrentMark->vProjection, vAngles);
+    AngleVectors(vAngles, NULL, vRight, NULL);
+
+    VectorMA(lm.pCurrentMark->vPos, dcl_shiftstep->value, vRight, lm.pCurrentMark->vPos);
+
+    DCLC_Reapply();
+}
+
+/*
+=============
+DCLC_RandomRoll
+
+=============
+*/
+void DCLC_RandomRoll(void)
+{
+    ri.Cvar_SetValue("dcl_rotation", random() * 360.0);
+}
+
+/*
+=============
+R_LevelMarksInit
+
+Initialize the level mark system with variables and commands
+=============
+*/
+void R_LevelMarksInit()
+{
+    memset(&lm, 0, sizeof(lm));
+
+    dcl_editmode     = ri.Cvar_Get("dcl_editmode", "0", CVAR_LATCH);
+    dcl_showcurrent  = ri.Cvar_Get("dcl_showcurrent", "1", 0);
+    dcl_autogetinfo  = ri.Cvar_Get("dcl_autogetinfo", "1", 0);
+    dcl_shiftstep    = ri.Cvar_Get("dcl_shiftstep", "4", 0);
+    dcl_shader       = ri.Cvar_Get("dcl_shader", "blastmark", 0);
+    dcl_radius       = ri.Cvar_Get("dcl_radius", "16", 0);
+    dcl_heightscale  = ri.Cvar_Get("dcl_heightscale", "1", 0);
+    dcl_widthscale   = ri.Cvar_Get("dcl_widthscale", "1", 0);
+    dcl_rotation     = ri.Cvar_Get("dcl_rotation", "0", 0);
+    dcl_r            = ri.Cvar_Get("dcl_r", "1", 0);
+    dcl_g            = ri.Cvar_Get("dcl_g", "1", 0);
+    dcl_b            = ri.Cvar_Get("dcl_b", "1", 0);
+    dcl_alpha        = ri.Cvar_Get("dcl_alpha", "1", 0);
+    dcl_dolighting   = ri.Cvar_Get("dcl_dolighting", "1", 0);
+    dcl_doworld      = ri.Cvar_Get("dcl_doworld", "1", 0);
+    dcl_doterrain    = ri.Cvar_Get("dcl_doterrain", "1", 0);
+    dcl_dobmodels    = ri.Cvar_Get("dcl_dobmodels", "1", 0);
+    dcl_dostring     = ri.Cvar_Get("dcl_dostring", "apply to all", 0);
+    dcl_pathmode     = ri.Cvar_Get("dcl_pathmode", "0", 0);
+    dcl_maxsegment   = ri.Cvar_Get("dcl_maxsegment", "512", 0);
+    dcl_minsegment   = ri.Cvar_Get("dcl_minsegment", "24", 0);
+    dcl_maxoffset    = ri.Cvar_Get("dcl_maxoffset", "10", 0);
+    dcl_texturescale = ri.Cvar_Get("dcl_texturescale", "32", 0);
+
+    if (dcl_editmode->integer) {
+        ri.Cmd_AddCommand("dclc_make", DCLC_Make);
+        ri.Cmd_AddCommand("dclc_reapply", DCLC_Reapply);
+        ri.Cmd_AddCommand("dclc_delete", DCLC_Delete);
+        ri.Cmd_AddCommand("dclc_selectnext", DCLC_SelectNext);
+        ri.Cmd_AddCommand("dclc_selectprev", DCLC_SelectPrev);
+        ri.Cmd_AddCommand("dclc_selectch", DCLC_SelectCh);
+        ri.Cmd_AddCommand("dclc_selectchnxt", DCLC_SelectChNxt);
+        ri.Cmd_AddCommand("dclc_getinfo", DCLC_GetInfo);
+        ri.Cmd_AddCommand("dclc_shiftup", DCLC_ShiftUp);
+        ri.Cmd_AddCommand("dclc_shiftdown", DCLC_ShiftDown);
+        ri.Cmd_AddCommand("dclc_shiftleft", DCLC_ShiftLeft);
+        ri.Cmd_AddCommand("dclc_shiftright", DCLC_ShiftRight);
+        ri.Cmd_AddCommand("dclc_randomroll", DCLC_RandomRoll);
+        ri.Cmd_AddCommand("dclc_save", DCLC_Save);
+
+        lm.activeMarkDefs.pNextMark = &lm.activeMarkDefs;
+        lm.activeMarkDefs.pPrevMark = &lm.activeMarkDefs;
+    }
+}
+
+/*
+=============
+R_LevelMarksFree
+
+Remove level marks commands and deallocate all memory
+=============
+*/
+void R_LevelMarksFree()
+{
+    int i;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    ri.Cmd_RemoveCommand("dclc_make");
+    ri.Cmd_RemoveCommand("dclc_reapply");
+    ri.Cmd_RemoveCommand("dclc_delete");
+    ri.Cmd_RemoveCommand("dclc_selectnext");
+    ri.Cmd_RemoveCommand("dclc_selectprev");
+    ri.Cmd_RemoveCommand("dclc_selectch");
+    ri.Cmd_RemoveCommand("dclc_selectchnxt");
+    ri.Cmd_RemoveCommand("dclc_getinfo");
+    ri.Cmd_RemoveCommand("dclc_shiftup");
+    ri.Cmd_RemoveCommand("dclc_shiftdown");
+    ri.Cmd_RemoveCommand("dclc_shiftleft");
+    ri.Cmd_RemoveCommand("dclc_shiftright");
+    ri.Cmd_RemoveCommand("dclc_randomroll");
+    ri.Cmd_RemoveCommand("dclc_save");
+
+    if (tr.world) {
+        for (i = 0; i < tr.world->numBModels; i++) {
+            bmodel_t *pBmodel = &tr.world->bmodels[i];
+
+            if (pBmodel->iNumMarkFragment && pBmodel->pFirstMarkFragment) {
+                ri.Free(pBmodel->pFirstMarkFragment);
+                pBmodel->pFirstMarkFragment = NULL;
+                pBmodel->iNumMarkFragment   = 0;
+            }
+        }
+
+        for (i = tr.world->numDecisionNodes; i < tr.world->numnodes; i++) {
+            mnode_t *pLeaf = &tr.world->nodes[i];
+
+            if (pLeaf->iNumMarkFragment && pLeaf->pFirstMarkFragment) {
+                ri.Free(pLeaf->pFirstMarkFragment);
+                pLeaf->pFirstMarkFragment = NULL;
+                pLeaf->iNumMarkFragment   = 0;
+            }
+        }
+    }
+}
+
+/*
+=============
+R_InitTreadMark
+
+=============
+*/
+static void R_InitTreadMark(treadMark_t *treadMark)
+{
+    treadMark->iReferenceNumber = 0;
+    treadMark->iLastTime        = 0;
+    treadMark->hTreadShader     = 0;
+    treadMark->iState           = 0;
+    treadMark->fWidth           = 0;
+
+    VectorClear(treadMark->vStartDir);
+    VectorClear(treadMark->vStartVerts[0]);
+    VectorClear(treadMark->vStartVerts[1]);
+    treadMark->fStartTexCoord = 0;
+    treadMark->fStartAlpha    = 0;
+
+    VectorClear(treadMark->vMidPos);
+    VectorClear(treadMark->vMidVerts[0]);
+    VectorClear(treadMark->vMidVerts[1]);
+    treadMark->fMidTexCoord = 0;
+    treadMark->fMidAlpha    = 0;
+
+    VectorClear(treadMark->vEndPos);
+    VectorClear(treadMark->vEndVerts[0]);
+    VectorClear(treadMark->vEndVerts[1]);
+    treadMark->fEndTexCoord = 0;
+    treadMark->fEndAlpha    = 0;
+}
+
+/*
+=============
+R_UpdateLevelMarksSystem
+
+Draw lines for editing
+=============
+*/
+void R_UpdateLevelMarksSystem()
+{
+    int   iReturn;
+    float fAlpha;
+    float fTexScale;
+
+    if (!dcl_editmode->integer) {
+        return;
+    }
+
+    if (dcl_pathmode->integer) {
+        if (!lm.bPathLayingMode) {
+            R_InitTreadMark(&lm.treadMark);
+            lm.treadMark.iLastTime  = -1000;
+            lm.pTreadMarkStartDecal = NULL;
+            lm.pTreadMarkEndDecal   = NULL;
+            lm.bPathLayingMode      = qtrue;
+        }
+
+        lm.treadMark.hTreadShader = RE_RegisterShader(dcl_shader->string);
+        lm.treadMark.fWidth       = Q_clamp_float(dcl_radius->value * dcl_widthscale->value, 2, 1024);
+
+        fAlpha    = Q_clamp_float(dcl_alpha->value, 0, 1);
+        fTexScale = 1.0 / dcl_texturescale->value;
+        iReturn   = ri.CG_PermanentUpdateTreadMark(
+            &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+        );
+
+        if (iReturn == 1) {
+            lm.pTreadMarkStartDecal = lm.pTreadMarkEndDecal;
+            lm.pTreadMarkEndDecal   = NULL;
+
+            ri.CG_PermanentUpdateTreadMark(
+                &lm.treadMark, fAlpha, dcl_minsegment->value, dcl_maxsegment->value, dcl_maxoffset->value, fTexScale
+            );
+        }
+
+        if (iReturn != -1) {
+            if (!lm.pTreadMarkEndDecal) {
+                lm.pTreadMarkEndDecal = R_AllocateMarkDef();
+            }
+
+            if (lm.pTreadMarkEndDecal) {
+                lm.pCurrentMark = lm.pTreadMarkEndDecal;
+                lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 2);
+                if (!lm.pCurrentMark) {
+                    R_FreeMarkFragments(lm.pTreadMarkEndDecal);
+                }
+            }
+
+            if (lm.treadMark.iState == 3) {
+                if (!lm.pTreadMarkStartDecal) {
+                    lm.pTreadMarkStartDecal = R_AllocateMarkDef();
+                }
+
+                if (lm.pTreadMarkStartDecal) {
+                    lm.pCurrentMark = lm.pTreadMarkStartDecal;
+                    lm.pCurrentMark = R_ApplyLevelDecal(vec_upwards, vec_upwards, qtrue, qtrue, 1);
+                    if (!lm.pCurrentMark) {
+                        R_FreeMarkFragments(lm.pTreadMarkStartDecal);
+                    }
+                }
+            }
+        }
+
+        if (lm.pTreadMarkEndDecal) {
+            lm.pCurrentMark = lm.pTreadMarkEndDecal;
+        } else if (lm.pTreadMarkStartDecal) {
+            lm.pCurrentMark = lm.pTreadMarkStartDecal;
+        }
+
+    } else if (lm.bPathLayingMode) {
+        lm.bPathLayingMode = qfalse;
+    }
+
+    if (lm.bAutoApplySettings && lm.pCurrentMark && lm.pCurrentMark->fRotation != -1) {
+        qboolean bDoUpdate = qfalse;
+        float    f;
+
+        if (dcl_shader->modified) {
+            shader_t *shader;
+            qhandle_t hShader;
+
+            hShader = RE_RegisterShader(dcl_shader->string);
+            if (hShader) {
+                shader = R_GetShaderByHandle(hShader);
+                if (shader != tr.defaultShader && lm.pCurrentMark->markShader != shader) {
+                    lm.pCurrentMark->markShader = shader;
+                    // Set the decal radius
+                    ri.Cvar_SetValue("dcl_radius", 16.0);
+                    dcl_radius->modified = qfalse;
+
+                    // Set the decal scale
+                    ri.Cvar_SetValue(
+                        "dcl_heightscale", shader->stages[0]->bundle[0].image[0]->height / 16.0 * 0.5
+                    );
+                    ri.Cvar_SetValue("dcl_widthscale", shader->stages[0]->bundle[0].image[0]->width / 16.0 * 0.5);
+
+                    bDoUpdate = qtrue;
+                }
+            }
+            dcl_shader->modified = 0;
+        }
+
+        if (dcl_radius->modified) {
+            f = dcl_radius->value;
+            if (lm.pCurrentMark->fRadius != f) {
+                lm.pCurrentMark->fRadius = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_radius->modified = qfalse;
+        }
+
+        if (dcl_heightscale->modified) {
+            f = dcl_heightscale->value;
+            if (lm.pCurrentMark->fHeightScale != f) {
+                lm.pCurrentMark->fHeightScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_heightscale->modified = qfalse;
+        }
+        if (dcl_widthscale->modified) {
+            f = dcl_widthscale->value;
+            if (lm.pCurrentMark->fWidthScale != f) {
+                lm.pCurrentMark->fWidthScale = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_widthscale->modified = qfalse;
+        }
+
+        if (dcl_rotation->modified) {
+            f = anglemod(dcl_rotation->value);
+            if (lm.pCurrentMark->fRotation != f) {
+                lm.pCurrentMark->fRotation = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_rotation->modified = qfalse;
+        }
+
+        if (dcl_r->modified) {
+            f = Q_clamp_float(dcl_r->value, 0, 1);
+            if (lm.pCurrentMark->color[0] != f) {
+                lm.pCurrentMark->color[0] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_r->modified = qfalse;
+        }
+        if (dcl_g->modified) {
+            f = Q_clamp_float(dcl_g->value, 0, 1);
+            if (lm.pCurrentMark->color[1] != f) {
+                lm.pCurrentMark->color[1] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_g->modified = qfalse;
+        }
+        if (dcl_b->modified) {
+            f = Q_clamp_float(dcl_b->value, 0, 1);
+            if (lm.pCurrentMark->color[2] != f) {
+                lm.pCurrentMark->color[2] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_b->modified = qfalse;
+        }
+        if (dcl_alpha->modified) {
+            f = Q_clamp_float(dcl_alpha->value, 0, 1);
+            if (lm.pCurrentMark->color[3] != f) {
+                lm.pCurrentMark->color[3] = f;
+
+                bDoUpdate = qtrue;
+            }
+
+            dcl_alpha->modified = qfalse;
+        }
+
+        if (dcl_dolighting->modified) {
+            qboolean bDoLighting = dcl_dolighting->integer != 0;
+            if (lm.pCurrentMark->bDoLighting != bDoLighting) {
+                lm.pCurrentMark->bDoLighting = bDoLighting;
+                bDoUpdate                    = 1;
+            }
+            dcl_dolighting->modified = 0;
+        }
+
+        if (bDoUpdate) {
+            lm.pCurrentMark = R_ApplyLevelDecal(lm.pCurrentMark->vPos, lm.pCurrentMark->vProjection, qtrue, qtrue, 0);
+        }
+    }
+
+    if (dcl_showcurrent->integer && lm.pCurrentMark && lm.pCurrentMark->iNumEditPolys) {
+        float          fColor;
+        float          fLength;
+        int            j;
+        int            iEntNum;
+        lmEditPoly_t  *pPoly;
+        polyVert_t    *pVert, *pVert2;
+        polyVert_t     verts[8];
+        trRefEntity_t *ent;
+        bmodel_t      *bmodel, *lastbmodel;
+        model_t       *pModel;
+        vec3_t         vOrigin;
+        vec3_t         axis[3];
+        vec3_t         vPos, vPos2;
+        vec3_t         polyaxis[3];
+
+        iEntNum    = 0;
+        ent        = NULL;
+        lastbmodel = NULL;
+        vectoangles(lm.pCurrentMark->vProjection, vPos);
+
+        vPos[2] = anglemod(vPos[2] + lm.pCurrentMark->fRotation);
+        AngleVectorsLeft(vPos, polyaxis[0], polyaxis[1], polyaxis[2]);
+        VectorNormalize2(lm.pCurrentMark->vProjection, polyaxis[0]);
+        PerpendicularVector(polyaxis[1], polyaxis[0]);
+        RotatePointAroundVector(polyaxis[2], polyaxis[0], polyaxis[1], anglemod(lm.pCurrentMark->fRotation + 90.0));
+        CrossProduct(polyaxis[0], polyaxis[2], polyaxis[1]);
+
+        fColor = sin(tr.refdef.time / 500.0) / 4.0 + 0.6;
+
+        for (pPoly = lm.pCurrentMark->pMarkEditPolys; pPoly; pPoly = pPoly->pNextPoly) {
+            if (pPoly->surf.iIndex > 0) {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, 1.0 - fColor, 0.1, 1.0);
+                }
+            } else if (pPoly->surf.iIndex < 0) {
+                bmodel = &tr.world->bmodels[-pPoly->surf.iIndex];
+                if (bmodel != lastbmodel) {
+                    //
+                    // Find the matching entity
+                    //
+
+                    ent = &tr.refdef.entities[0];
+                    for (iEntNum = 0; iEntNum < tr.refdef.num_entities; iEntNum++) {
+                        ent = &tr.refdef.entities[iEntNum];
+
+                        pModel = R_GetModelByHandle(ent->e.hModel);
+                        if (pModel->type == MOD_BRUSH && pModel->bmodel == bmodel) {
+                            break;
+                        }
+                    }
+
+                    VectorCopy(ent->e.origin, vOrigin);
+                    AxisCopy(ent->e.axis, axis);
+                }
+
+                if (iEntNum != tr.refdef.num_entities) {
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        MatrixTransformVector(pPoly->verts[j].xyz, axis, pPoly->verts[j].xyz);
+                        VectorAdd(pPoly->verts[j].xyz, vOrigin, pPoly->verts[j].xyz);
+                    }
+
+                    for (j = 0; j < pPoly->surf.numVerts; j++) {
+                        VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                        VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                        VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                        R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                    }
+                }
+            } else {
+                for (j = 0; j < pPoly->surf.numVerts; j++) {
+                    VectorMA(pPoly->verts[j % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos);
+                    VectorMA(pPoly->verts[(j + 1) % pPoly->surf.numVerts].xyz, 0.1, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, fColor, fColor, fColor, 1.0);
+
+                    VectorMA(vPos, 8.0, polyaxis[0], vPos2);
+                    R_DebugLine(vPos, vPos2, 0.1, 1.0 - fColor, fColor, 1.0);
+                }
+            }
+        }
+
+        //
+        // Draw the front
+        //
+
+        fLength = (lm.pCurrentMark->fWidthScale + lm.pCurrentMark->fHeightScale) * lm.pCurrentMark->fRadius * 0.75;
+        if (fLength < 4) {
+            fLength = 4;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[0], vPos);
+
+        R_DebugLine(lm.pCurrentMark->vPos, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the right
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fWidthScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[1], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[1], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+
+        //
+        // Draw the up
+        //
+
+        fLength = lm.pCurrentMark->fRadius * lm.pCurrentMark->fHeightScale;
+        if (fLength < 1) {
+            fLength = 1;
+        }
+
+        VectorMA(lm.pCurrentMark->vPos, fLength, polyaxis[2], vOrigin);
+        VectorMA(lm.pCurrentMark->vPos, -fLength, polyaxis[2], vPos);
+        R_DebugLine(vOrigin, vPos, 0.1, fColor, 1.0 - fColor, 1.0);
+    }
+}
+
+/*
+=============
+R_AddPermanentMarkFragmentSurfaces
+
+=============
+*/
+void R_AddPermanentMarkFragmentSurfaces(void **pFirstMarkFragment, int iNumMarkFragment)
+{
+    int       i;
+    lmPoly_t *pPoly;
+
+    for (i = 0; i < iNumMarkFragment; i++) {
+        pPoly = (lmPoly_t *)pFirstMarkFragment[i];
+
+        if (pPoly->viewCount == tr.viewCount) {
+            continue;
+        }
+        pPoly->viewCount = tr.viewCount;
+
+        R_AddDrawSurf(&pPoly->surf.surfaceType, pPoly->shader, 0, 0, 0, 0);
+    }
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_mesh.c b/code/renderergl2/tr_mesh.c
index 4f2c6724..222b06d0 100644
--- a/code/renderergl2/tr_mesh.c
+++ b/code/renderergl2/tr_mesh.c
@@ -282,9 +282,10 @@ R_AddMD3Surfaces
 */
 void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 	int				i;
-	mdvModel_t		*model = NULL;
-	mdvSurface_t	*surface = NULL;
-	shader_t		*shader = NULL;
+	mdvModel_t		*model;
+	mdvSurface_t	*surface;
+	void			*drawSurf;
+	shader_t		*shader;
 	int				cull;
 	int				lod;
 	int				fogNum;
@@ -382,6 +383,12 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			shader = tr.shaders[ surface->shaderIndexes[ ent->e.skinNum % surface->numShaderIndexes ] ];
 		}
 
+		if ( model->numVaoSurfaces > 0 ) {
+			drawSurf = &model->vaoSurfaces[i];
+		} else {
+			drawSurf = surface;
+		}
+
 		// we will add shadows even if the main object isn't visible in the view
 
 		// stencil shadows can't do personal models unless I polyhedron clip
@@ -390,7 +397,7 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			&& fogNum == 0
 			&& !(ent->e.renderfx & ( RF_NOSHADOW | RF_DEPTHHACK ) ) 
 			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)&model->vaoSurfaces[i], tr.shadowShader, 0, qfalse, qfalse, 0 );
+			R_AddDrawSurf( drawSurf, tr.shadowShader, 0, qfalse, qfalse, 0 );
 		}
 
 		// projection shadows work fine with personal models
@@ -398,12 +405,12 @@ void R_AddMD3Surfaces( trRefEntity_t *ent ) {
 			&& fogNum == 0
 			&& (ent->e.renderfx & RF_SHADOW_PLANE )
 			&& shader->sort == SS_OPAQUE ) {
-			R_AddDrawSurf( (void *)&model->vaoSurfaces[i], tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
+			R_AddDrawSurf( drawSurf, tr.projectionShadowShader, 0, qfalse, qfalse, 0 );
 		}
 
 		// don't add third_person objects if not viewing through a portal
 		if ( !personalModel ) {
-			R_AddDrawSurf((void *)&model->vaoSurfaces[i], shader, fogNum, qfalse, qfalse, cubemapIndex );
+			R_AddDrawSurf( drawSurf, shader, fogNum, qfalse, qfalse, cubemapIndex );
 		}
 
 		surface++;
diff --git a/code/renderergl2/tr_model.c b/code/renderergl2/tr_model.c
index 0fdf60d8..7201be1b 100644
--- a/code/renderergl2/tr_model.c
+++ b/code/renderergl2/tr_model.c
@@ -664,6 +664,12 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
 		surf++;
 	}
 
+	if (mdvModel->numFrames > 1 && !glRefConfig.gpuVertexAnimation)
+	{
+		mdvModel->numVaoSurfaces = 0;
+		mdvModel->vaoSurfaces = NULL;
+	}
+	else
 	{
 		srfVaoMdvMesh_t *vaoSurf;
 
diff --git a/code/renderergl2/tr_model.cpp b/code/renderergl2/tr_model.cpp
new file mode 100644
index 00000000..b7586502
--- /dev/null
+++ b/code/renderergl2/tr_model.cpp
@@ -0,0 +1,1880 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_models.cpp -- model loading and caching
+
+#include "tr_local.h"
+#include "tiki.h"
+#include <vector.h>
+
+#define LL(x) x = LittleLong(x)
+
+qboolean   g_bInfoworldtris = qfalse;
+static int entityNumIndexes[MAX_ENTITIES];
+static int staticModelNumIndexes[4095];
+
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg);
+
+/*
+** R_GetModelByHandle
+*/
+model_t *R_GetModelByHandle(qhandle_t hModel)
+{
+    model_t *mod;
+
+    // out of range gets the default model
+    if (hModel < 1 || hModel >= tr.numModels) {
+        return tr.models[0];
+    }
+
+    mod = tr.models[hModel];
+
+    return mod;
+}
+
+/*
+** R_Model_GetHandle
+*/
+dtiki_t *R_Model_GetHandle(qhandle_t handle)
+{
+    model_t *model = R_GetModelByHandle(handle);
+
+    if (model->type == MOD_TIKI) {
+        return model->d.tiki;
+    }
+
+    return NULL;
+}
+
+//===============================================================================
+
+/*
+** R_FreeModel
+*/
+void R_FreeModel(model_t *mod)
+{
+    if (mod->type == MOD_TIKI) {
+        ri.CG_EndTiki(mod->d.tiki);
+    }
+
+    memset(mod, 0, sizeof(*mod));
+}
+
+/*
+** R_AllocModel
+*/
+model_t *R_AllocModel(void)
+{
+	model_t *mod;
+    int i;
+
+    for (i = 0; i < tr.numModels; i++) {
+        mod = tr.models[i];
+        if (!mod->name[0]) {
+            break;
+        }
+    }
+
+    if (i == tr.numModels) {
+        if (i == MAX_MOD_KNOWN) {
+            return NULL;
+        }
+
+        mod = (model_t*)ri.Hunk_Alloc(sizeof(*tr.models[tr.numModels]), h_low);
+        mod->index = tr.numModels;
+        tr.models[tr.numModels] = mod;
+        tr.numModels++;
+    } else {
+        mod = tr.models[i];
+    }
+
+    return mod;
+}
+
+/*
+** RE_FreeModels
+*/
+void RE_FreeModels(void)
+{
+    int hModel;
+
+    for (hModel = 0; hModel < tr.numModels; hModel++) {
+        if (!tr.models[hModel]->name[0]) {
+            continue;
+        }
+
+        R_FreeModel(tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterShaders
+*/
+void R_RegisterShaders(model_t *mod)
+{
+    dtiki_t        *tiki;
+    int             i, j;
+    dtikisurface_t *psurface;
+    shader_t       *sh;
+
+    tiki = mod->d.tiki;
+
+    for (i = 0; i < tiki->num_surfaces; i++) {
+        psurface = &tiki->surfaces[i];
+
+        assert(psurface->numskins <= MAX_TIKI_SHADER);
+        for (j = 0; j < psurface->numskins; j++) {
+            if (psurface->shader[j][0]) {
+                sh                   = R_FindShader(psurface->shader[j], LIGHTMAP_NONE, qtrue);
+                psurface->hShader[j] = sh->index;
+            } else {
+                psurface->hShader[j] = 0;
+            }
+        }
+    }
+}
+
+/*
+** RE_UnregisterServerModel
+*/
+void RE_UnregisterServerModel(qhandle_t hModel)
+{
+    if (hModel < 0 || hModel >= MAX_MOD_KNOWN) {
+        return;
+    }
+
+    if (tr.models[hModel]->serveronly) {
+        R_FreeModel(tr.models[hModel]);
+    }
+}
+
+/*
+** R_RegisterModelInternal
+*/
+static qhandle_t R_RegisterModelInternal(const char *name, qboolean bBeginTiki, qboolean use)
+{
+    model_t    *mod;
+    qhandle_t   hModel;
+    const char *ptr;
+
+    if (!name || !*name) {
+        ri.Printf(PRINT_ALL, "RE_RegisterModel: NULL name\n");
+        return 0;
+    }
+
+    if (strlen(name) >= 128) {
+        Com_Printf("Model name exceeds MAX_MODEL_NAME\n");
+        return 0;
+    }
+
+    //
+    // search the currently loaded models
+    //
+    for (hModel = 1; hModel < tr.numModels; hModel++) {
+        mod = tr.models[hModel];
+        if (!Q_stricmp(mod->name, name)) {
+            if (mod->type == MOD_BAD) {
+                return 0;
+            }
+            return hModel;
+        }
+    }
+
+    // allocate a new model_t
+
+    if ((mod = R_AllocModel()) == NULL) {
+        ri.Printf(PRINT_WARNING, "RE_RegisterModel: R_AllocModel() failed for '%s'\n", name);
+        return 0;
+    }
+
+    // only set the name after the model has been successfully loaded
+    Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+    // make sure the render thread is stopped
+    R_IssuePendingRenderCommands();
+
+    mod->serveronly = qtrue;
+
+    //
+    // load the files
+    //
+    ptr = strrchr(name, '.');
+
+    if (ptr) {
+        ptr++;
+
+        if (!stricmp(ptr, "spr")) {
+            mod->d.sprite = SPR_RegisterSprite(name);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.sprite) {
+                mod->type = MOD_SPRITE;
+                return mod->index;
+            }
+        } else if (!stricmp(ptr, "tik")) {
+            mod->d.tiki = ri.TIKI_RegisterTikiFlags(name, use);
+            Q_strncpyz(mod->name, name, sizeof(mod->name));
+
+            if (mod->d.tiki) {
+                mod->type = MOD_TIKI;
+                R_RegisterShaders(mod);
+
+                if (bBeginTiki) {
+                    ri.CG_ProcessInitCommands(mod->d.tiki, NULL);
+                }
+
+                return mod->index;
+            }
+        }
+    }
+
+    ri.Printf(PRINT_ERROR, "RE_RegisterModel: Registration failed for '%s'\n", name);
+    mod->type = MOD_BAD;
+
+    return 0;
+}
+
+/*
+** RE_RegisterServerModel
+*/
+qhandle_t RE_RegisterServerModel(const char *name)
+{
+    return R_RegisterModelInternal(name, qtrue, qfalse);
+}
+
+/*
+** RE_SpawnEffectModel
+*/
+qhandle_t RE_SpawnEffectModel(const char *szModel, vec3_t vPos, vec3_t *axis)
+{
+    refEntity_t new_entity;
+
+    memset(&new_entity, 0, sizeof(refEntity_t));
+    memset(&new_entity.shaderRGBA, 255, sizeof(byte) * 4);
+
+    VectorCopy(vPos, new_entity.origin);
+    new_entity.scale = 1.0;
+
+    if (axis) {
+        AxisCopy(axis, new_entity.axis);
+    }
+
+    new_entity.hModel = R_RegisterModelInternal(szModel, qfalse, qtrue);
+
+    if (new_entity.hModel) {
+        tr.models[new_entity.hModel]->serveronly = qfalse;
+        ri.CG_ProcessInitCommands(tr.models[new_entity.hModel]->d.tiki, &new_entity);
+    }
+
+    return new_entity.hModel;
+}
+
+/*
+** RE_RegisterModel
+*/
+qhandle_t RE_RegisterModel(const char *name)
+{
+    qhandle_t handle;
+
+    handle = R_RegisterModelInternal(name, qtrue, qtrue);
+
+    if (handle) {
+        tr.models[handle]->serveronly = qfalse;
+    }
+    return handle;
+}
+
+//=============================================================================
+
+/*
+===============
+R_ModelInit
+===============
+*/
+void R_ModelInit(void)
+{
+    model_t *mod;
+    int      i;
+
+    // leave a space for NULL model
+    tr.numModels = 0;
+
+    mod = R_AllocModel();
+    Q_strncpyz(mod->name, "** BAD MODEL **", sizeof(mod->name));
+    mod->type = MOD_BAD;
+
+    for (i = 0; i < ARRAY_LEN(tr.skel_index); i++) {
+        tr.skel_index[i] = -1;
+    }
+}
+
+/*
+================
+R_Modellist_f
+================
+*/
+void R_Modellist_f(void)
+{
+    int i;
+
+    for (i = 1; i < tr.numModels; i++) {
+        ri.Printf(PRINT_ALL, "%s\n", tr.models[i]->name);
+    }
+}
+
+/*
+====================
+R_ModelRadius
+====================
+*/
+float R_ModelRadius(qhandle_t handle)
+{
+    int      j;
+    vec3_t   bounds[2];
+    model_t *model;
+    float    radius, maxRadius;
+    vec3_t   tmpVec;
+    float    w;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    case MOD_BRUSH:
+        maxRadius = 0.0;
+
+        VectorCopy(model->bmodel->bounds[0], bounds[0]);
+        VectorCopy(model->bmodel->bounds[1], bounds[1]);
+
+        for (j = 0; j < 8; j++) {
+            tmpVec[0] = bounds[j & 1 ? 1 : 0][0];
+            tmpVec[1] = bounds[j & 2 ? 1 : 0][1];
+            tmpVec[2] = bounds[j & 4 ? 1 : 0][2];
+
+            radius = VectorLength(tmpVec);
+
+            if (maxRadius < radius) {
+                maxRadius = radius;
+            }
+        }
+        break;
+    case MOD_TIKI:
+        return ri.TIKI_GlobalRadius(model->d.tiki);
+    case MOD_SPRITE:
+        maxRadius = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        w         = model->d.sprite->height * model->d.sprite->scale * 0.5;
+
+        if (maxRadius <= w) {
+            maxRadius = w;
+        }
+        break;
+    default:
+        maxRadius = 0.0;
+    }
+
+    return maxRadius;
+}
+
+/*
+====================
+R_ModelBounds
+====================
+*/
+void R_ModelBounds(qhandle_t handle, vec3_t mins, vec3_t maxs)
+{
+    model_t *model;
+
+    model = R_GetModelByHandle(handle);
+
+    switch (model->type) {
+    default:
+    case MOD_BAD:
+        VectorClear(mins);
+        VectorClear(maxs);
+        break;
+    case MOD_BRUSH:
+        VectorCopy(model->bmodel->bounds[0], mins);
+        VectorCopy(model->bmodel->bounds[1], maxs);
+        break;
+    case MOD_TIKI:
+        ri.TIKI_CalculateBounds(model->d.tiki, 1.0, mins, maxs);
+        break;
+    case MOD_SPRITE:
+        mins[0] = -model->d.sprite->width * model->d.sprite->scale * 0.5;
+        mins[1] = -model->d.sprite->height * model->d.sprite->scale * 0.5;
+        mins[2] = -0.0;
+        maxs[0] = model->d.sprite->width * model->d.sprite->scale * 0.5;
+        maxs[1] = model->d.sprite->height * model->d.sprite->scale * 0.5;
+        maxs[2] = 0.0;
+        break;
+    }
+}
+
+#if 0
+// Replaced by TIKI_FindSkelByHeader
+/*
+====================
+GetModelPath
+====================
+*/
+const char *GetModelPath( skelHeaderGame_t *skelmodel ) {
+	int			i;
+	int			num;
+	skelcache_t	*cache;
+
+	num = cache_numskel;
+
+	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
+	{
+		cache = &skelcache[ i ];
+
+		if( cache->skel )
+		{
+			if( cache->skel == skelmodel ) {
+				return cache->path;
+			}
+
+			num--;
+			if( num < 0 ) {
+				break;
+			}
+		}
+	}
+
+	return NULL;
+}
+#endif
+
+/*
+====================
+GetLodCutoff
+====================
+*/
+int GetLodCutoff(skelHeaderGame_t *skelmodel, float lod_val, int renderfx)
+{
+    lodControl_t *LOD;
+    float         f;
+    float         fLODCap;
+
+    LOD = skelmodel->pLOD;
+
+    if (renderfx & RF_DEPTHHACK) {
+        fLODCap = LOD->maxMetric + (LOD->minMetric - LOD->maxMetric) * r_lodviewmodelcap->value;
+    } else {
+        f       = (LOD->minMetric - LOD->maxMetric) * r_lodcap->value + LOD->maxMetric;
+        fLODCap = (lod_val - LOD->maxMetric) * r_lodscale->value + LOD->maxMetric;
+
+        if (fLODCap > f) {
+            fLODCap = f;
+        }
+    }
+
+    if (fLODCap >= LOD->minMetric || !r_uselod->integer) {
+        return LOD->curve[0].val;
+    } else if (fLODCap <= LOD->maxMetric) {
+        return LOD->curve[4].val;
+    } else if (fLODCap <= LOD->consts[3].cutoff) {
+        return fLODCap * LOD->consts[3].scale + LOD->consts[3].base;
+    } else if (fLODCap <= LOD->consts[2].cutoff) {
+        return fLODCap * LOD->consts[2].scale + LOD->consts[2].base;
+    } else if (fLODCap <= LOD->consts[1].cutoff) {
+        return fLODCap * LOD->consts[1].scale + LOD->consts[1].base;
+    } else {
+        return fLODCap * LOD->consts[0].scale + LOD->consts[0].base;
+    }
+}
+
+/*
+===============
+R_SaveLODFile
+===============
+*/
+static void R_SaveLODFile(const char *path, lodControl_t *LOD)
+{
+    fileHandle_t file = ri.FS_OpenFileWrite(path);
+    if (!file) {
+        ri.Printf(PRINT_WARNING, "SaveLODFile: Failed to open file %s\n", path);
+        return;
+    }
+
+    ri.FS_Write(LOD, sizeof(lodControl_t), file);
+}
+
+/*
+====================
+GetToolLodCutoff
+====================
+*/
+int GetToolLodCutoff(skelHeaderGame_t *skelmodel, float lod_val)
+{
+    lodControl_t *LOD;
+    float         totalRange;
+    int           i;
+    char          lodPath[256];
+    char         *ext;
+
+    LOD        = skelmodel->pLOD;
+    totalRange = 0.0;
+    for (i = 0; i < 10; i++) {
+        if (skelmodel->lodIndex[i] > 0) {
+            totalRange = skelmodel->lodIndex[i];
+            break;
+        }
+    }
+
+    if (lod_save->integer == 1) {
+        ri.Cvar_Set("lod_save", "0");
+        Q_strncpyz(lodPath, ri.TIKI_FindSkelByHeader(skelmodel)->path, sizeof(lodPath));
+        ext = strstr(lodPath, "skd");
+        strcpy(ext, "lod");
+        R_SaveLODFile(lodPath, LOD);
+    }
+
+    if (lod_mesh->modified) {
+        lod_mesh->modified = qfalse;
+        ri.Cvar_Set("lod_minLOD", va("%f", LOD->minMetric));
+        ri.Cvar_Set("lod_maxLOD", va("%f", LOD->maxMetric));
+        ri.Cvar_Set("lod_LOD_slider", va("%f", 0.5));
+        ri.Cvar_Set("lod_curve_0_slider", va("%f", LOD->curve[0].val / totalRange));
+        ri.Cvar_Set("lod_curve_1_slider", va("%f", LOD->curve[1].val / totalRange));
+        ri.Cvar_Set("lod_curve_2_slider", va("%f", LOD->curve[2].val / totalRange));
+        ri.Cvar_Set("lod_curve_3_slider", va("%f", LOD->curve[3].val / totalRange));
+        ri.Cvar_Set("lod_curve_4_slider", va("%f", LOD->curve[4].val / totalRange));
+    }
+
+    ri.Cvar_Set("lod_curve_0_val", va("%f", lod_curve_0_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_1_val", va("%f", lod_curve_1_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_2_val", va("%f", lod_curve_2_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_3_val", va("%f", lod_curve_3_slider->value * totalRange));
+    ri.Cvar_Set("lod_curve_4_val", va("%f", lod_curve_4_slider->value * totalRange));
+
+    LOD->minMetric    = lod_minLOD->value;
+    LOD->maxMetric    = lod_maxLOD->value;
+    LOD->curve[0].val = lod_curve_0_val->value;
+    LOD->curve[1].val = lod_curve_1_val->value;
+    LOD->curve[2].val = lod_curve_2_val->value;
+    LOD->curve[3].val = lod_curve_3_val->value;
+    LOD->curve[4].val = lod_curve_4_val->value;
+
+    ri.TIKI_CalcLodConsts(LOD);
+    return GetLodCutoff(skelmodel, lod_val, 0);
+}
+
+/*
+==============
+R_GetTagPositionAndOrientation
+==============
+*/
+orientation_t R_GetTagPositionAndOrientation(refEntity_t *ent, int tagnum)
+{
+    int           i;
+    orientation_t tag_or, new_or;
+
+    tag_or = RE_TIKI_Orientation(ent, tagnum);
+
+    VectorCopy(ent->origin, new_or.origin);
+
+    for (i = 0; i < 3; i++) {
+        VectorMA(new_or.origin, tag_or.origin[i], ent->axis[i], new_or.origin);
+    }
+
+    MatrixMultiply(tag_or.axis, ent->axis, new_or.axis);
+    return new_or;
+}
+
+/*
+==============
+RB_DrawSkeletor
+==============
+*/
+void RB_DrawSkeletor(trRefEntity_t *ent)
+{
+    // FIXME: Unimplemented (GL2)
+}
+
+surfaceType_t skelSurface = SF_TIKI_SKEL;
+
+/*
+==============
+R_AddSkelSurfaces
+==============
+*/
+void R_AddSkelSurfaces(trRefEntity_t *ent)
+{
+    dtiki_t         *tiki;
+    qboolean         personalModel;
+    float            tiki_scale;
+    vec3_t           tiki_localorigin;
+    vec3_t           tiki_worldorigin;
+    skelBoneCache_t *outbones;
+    //int tikiSurfNumOffset;
+    static cvar_t   *vmEntity = NULL;
+    skeletor_c      *skeletor;
+    float            radius;
+    SkelVec3         centroid;
+    skelAnimFrame_t *newFrame;
+    int              added;
+    shader_t        *shader;
+    dtikisurface_t  *dsurf;
+    byte            *bsurf;
+    //float range;
+    //int render_count, total_tris;
+    skelSurfaceGame_t *surface;
+    //int skinnum;
+    //float target;
+    Vector newDistance;
+    //vec3_t org;
+    int i;
+    int mesh;
+    int iRadiusCull = 0;
+    int num_tags;
+
+    tiki = ent->e.tiki;
+
+    if (!vmEntity) {
+        vmEntity = ri.Cvar_Get("viewmodelentity", "", 0);
+    }
+
+    R_UpdatePoseInternal(&ent->e);
+
+    // don't add third_person objects if in a portal
+    personalModel = (ent->e.renderfx & RF_THIRD_PERSON) && !tr.viewParms.isPortal;
+
+    outbones = &TIKI_Skel_Bones[TIKI_Skel_Bones_Index];
+
+    num_tags = ri.TIKI_GetNumChannels(tiki);
+
+    if (num_tags + TIKI_Skel_Bones_Index > MAX_SKELBONES) {
+        ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: too many skeleton models visible on '%s'\n", tiki->a->name);
+        return;
+    }
+
+    tiki_scale = tiki->load_scale * ent->e.scale;
+    VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+    R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+    radius = R_GetRadius(&ent->e);
+
+    if (!lod_tool->integer) {
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, radius);
+        if (r_showcull->integer & 2) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_CLIP:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f, 0, 1, 0, 0.5f, qfalse);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, radius * 1.2f + 32.f, 1, 0.2f, 0.2f, 0.5f, qfalse);
+                break;
+            }
+        }
+
+        switch (iRadiusCull) {
+        case CULL_IN:
+            tr.pc.c_sphere_cull_md3_in++;
+            break;
+        case CULL_CLIP:
+            tr.pc.c_sphere_cull_md3_clip++;
+            break;
+        case CULL_OUT:
+            tr.pc.c_sphere_cull_md3_out++;
+            break;
+        }
+    }
+
+    if (tiki->a->bIsCharacter) {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, 92.f / ent->e.scale);
+        }
+    } else {
+        if (tr.viewParms.isPortal) {
+            ent->lodpercentage[1] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        } else {
+            ent->lodpercentage[0] = R_CalcLod(tiki_worldorigin, radius / ent->e.scale);
+        }
+    }
+
+    newFrame = (skelAnimFrame_t *)ri.Hunk_AllocateTempMemory(
+        sizeof(skelAnimFrame_t) + ri.TIKI_GetNumChannels(tiki) * sizeof(SkelMat4)
+    );
+    R_GetFrame(&ent->e, newFrame);
+
+    if (lod_tool->integer || iRadiusCull != CULL_CLIP
+        || R_CullSkelModel(tiki, &ent->e, newFrame, tiki_scale, tiki_localorigin) != CULL_OUT) {
+        //
+        // copy bones position and axis
+        //
+        for (i = 0; i < num_tags; i++) {
+            VectorCopy(newFrame->bones[i][3], outbones->offset);
+            outbones->matrix[0][0] = newFrame->bones[i][0][0];
+            outbones->matrix[0][1] = newFrame->bones[i][0][1];
+            outbones->matrix[0][2] = newFrame->bones[i][0][2];
+            outbones->matrix[0][3] = 0;
+            outbones->matrix[1][0] = newFrame->bones[i][1][0];
+            outbones->matrix[1][1] = newFrame->bones[i][1][1];
+            outbones->matrix[1][2] = newFrame->bones[i][1][2];
+            outbones->matrix[1][3] = 0;
+            outbones->matrix[2][0] = newFrame->bones[i][2][0];
+            outbones->matrix[2][1] = newFrame->bones[i][2][1];
+            outbones->matrix[2][2] = newFrame->bones[i][2][2];
+            outbones->matrix[2][3] = 0;
+            outbones++;
+        }
+    }
+
+    ri.Hunk_FreeTempMemory(newFrame);
+
+    ent->e.bonestart = TIKI_Skel_Bones_Index;
+    TIKI_Skel_Bones_Index += num_tags;
+
+    ent->e.hasMorph = qfalse;
+
+    //
+    // get the skeletor
+    //
+    skeletor = (skeletor_c *)ri.TIKI_GetSkeletor(tiki, ent->e.entityNumber);
+
+    //
+    // add morphs
+    //
+    added = ri.SKEL_GetMorphWeightFrame(
+        skeletor, ent->e.frameInfo[0].index, ent->e.frameInfo[0].time, &skeletorMorphCache[skeletorMorphCacheIndex]
+    );
+    ent->e.morphstart = skeletorMorphCacheIndex;
+
+    if (added) {
+        // found morphs
+        skeletorMorphCacheIndex += added;
+        ent->e.hasMorph = qtrue;
+    }
+
+    //
+    // draw all meshes
+    //
+    dsurf = tiki->surfaces;
+    bsurf = &ent->e.surfaces[0];
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+
+        if (!skelmodel) {
+            ri.Printf(PRINT_DEVELOPER, "R_AddSkelSurfaces: couldn't get skel model in '%s'\n", tiki->a->name);
+            return;
+        }
+
+        if (lod_tool->integer && !stricmp(ent->e.tiki->a->name, lod_tikiname->string)) {
+            if (lod_mesh->integer > tiki->numMeshes - 1) {
+                ri.Cvar_Set("lod_mesh", va("%d", tiki->numMeshes - 1));
+            }
+
+            if (mesh == lod_mesh->integer) {
+                if (skelmodel->pLOD) {
+                    break;
+                }
+            }
+        }
+
+        //
+        // draw all surfaces
+        //
+        surface = skelmodel->pSurfaces;
+        for (i = 0; i < skelmodel->numSurfaces; i++, dsurf++, bsurf++, surface = surface->pNext) {
+            if (*bsurf & 4) {
+                continue;
+            }
+
+            shader         = NULL;
+            surface->ident = SF_TIKI_SKEL;
+
+            // use a custom shader if specified
+            if (!(ent->e.customShader) || (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                int iShaderNum = ent->e.skinNum + (*bsurf & 3);
+
+                if (iShaderNum >= dsurf->numskins) {
+                    iShaderNum = 0;
+                }
+                shader = tr.shaders[dsurf->hShader[iShaderNum]];
+            } else {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+            }
+
+            if (!personalModel) {
+                if ((*bsurf & 0x40) && (dsurf->numskins > 1)) {
+                    int iShaderNum = ent->e.skinNum + (*bsurf & 2);
+
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum]], 0, 0, 0, 0);
+                    R_AddDrawSurf((surfaceType_t *)surface, tr.shaders[dsurf->hShader[iShaderNum + 1]], 0, 0, 0, 0);
+                } else {
+                    R_AddDrawSurf((surfaceType_t *)surface, shader, 0, 0, 0, 0);
+                }
+            }
+
+            if ((ent->e.customShader) && (ent->e.renderfx & RF_CUSTOMSHADERPASS)) {
+                shader = R_GetShaderByHandle(ent->e.customShader);
+                R_AddDrawSurf((surfaceType_t *)surface, shader, 0, 0, 0, 0);
+            }
+        }
+    }
+
+    // FIXME: setup LOD
+}
+
+/*
+=============
+SkelVertGetNormal
+=============
+*/
+inline static void SkelVertGetNormal(skeletorVertex_t *vert, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] = vert->normal[0] * bone->matrix[0][0] + vert->normal[1] * bone->matrix[1][0]
+           + vert->normal[2] * bone->matrix[2][0];
+
+    out[1] = vert->normal[0] * bone->matrix[0][1] + vert->normal[1] * bone->matrix[1][1]
+           + vert->normal[2] * bone->matrix[2][1];
+
+    out[2] = vert->normal[0] * bone->matrix[0][2] + vert->normal[1] * bone->matrix[1][2]
+           + vert->normal[2] * bone->matrix[2][2];
+}
+
+/*
+=============
+SkelMorphGetXyz
+=============
+*/
+inline static void SkelMorphGetXyz(skeletorMorph_t *morph, int *morphcache, vec3_t out)
+{
+    VectorMA(out, *morphcache, morph->offset, out);
+}
+
+/*
+=============
+SkelWeightGetXyz
+=============
+*/
+inline static void SkelWeightGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t out)
+{
+    out[0] += ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                + weight->offset[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                + weight->offset[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                + weight->offset[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+SkelWeightMorphGetXyz
+=============
+*/
+inline static void SkelWeightMorphGetXyz(skelWeight_t *weight, skelBoneCache_t *bone, vec3_t totalmorph, vec3_t out)
+{
+    vec3_t point;
+
+    VectorAdd(totalmorph, weight->offset, point);
+
+    out[0] += ((point[0] * bone->matrix[0][0] + point[1] * bone->matrix[1][0] + point[2] * bone->matrix[2][0])
+               + bone->offset[0])
+            * weight->boneWeight;
+
+    out[1] += ((point[0] * bone->matrix[0][1] + point[1] * bone->matrix[1][1] + point[2] * bone->matrix[2][1])
+               + bone->offset[1])
+            * weight->boneWeight;
+
+    out[2] += ((point[0] * bone->matrix[0][2] + point[1] * bone->matrix[1][2] + point[2] * bone->matrix[2][2])
+               + bone->offset[2])
+            * weight->boneWeight;
+}
+
+/*
+=============
+RB_SkelMesh
+=============
+*/
+void RB_SkelMesh(skelSurfaceGame_t *sf)
+{
+    unsigned int       baseIndex, baseVertex;
+    unsigned int       render_count;
+    unsigned int       indexes;
+    float             *outXyz;
+    int16_t           *outNormal;
+    skelIndex_t       *triangles;
+    skelIndex_t       *collapse_map;
+    skeletorVertex_t  *newVerts;
+    skeletorMorph_t   *morph;
+    skelWeight_t      *weight;
+    int                vertNum;
+    int                morphNum;
+    int                weightNum;
+    skelBoneCache_t   *bones;
+    skelBoneCache_t   *bone;
+    int               *morphs;
+    int               *morphcache;
+    float              scale;
+    dtiki_t           *tiki;
+    int                mesh;
+    int                surf;
+    int                i;
+    skelHeaderGame_t  *skelmodel;
+    skelSurfaceGame_t *psurface;
+    qboolean           bFound;
+    short              collapse[TIKI_MAX_VERTEXES];
+
+    if (!r_drawentitypoly->integer) {
+        return;
+    }
+
+    tiki = backEnd.currentEntity->e.tiki;
+
+    scale = tiki->load_scale * backEnd.currentEntity->e.scale;
+
+    //
+    // get the mesh associated with the surface
+    //
+    bFound = qfalse;
+    for (mesh = 0; mesh < tiki->numMeshes; mesh++) {
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+        psurface  = skelmodel->pSurfaces;
+
+        // find the surface
+        for (surf = 0; surf < skelmodel->numSurfaces; surf++) {
+            if (psurface == sf) {
+                bFound = qtrue;
+                break;
+            }
+            psurface = psurface->pNext;
+        }
+
+        if (bFound) {
+            break;
+        }
+    }
+
+    assert(bFound);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD) {
+        float lod_val;
+        int   renderfx;
+
+        lod_val  = backEnd.currentEntity->lodpercentage[0];
+        renderfx = backEnd.currentEntity->e.renderfx;
+
+        if (sf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentEntity->e.tiki->a->name, lod_tikiname->string)
+                && mesh == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentEntity->lodpercentage[0], renderfx);
+            }
+
+            collapseIndex = sf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = sf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = sf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = sf->numVerts;
+    }
+
+    indexes = sf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, indexes);
+
+    collapse_map = sf->pCollapse;
+    triangles    = sf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    outXyz    = tess.xyz[baseVertex];
+    outNormal = tess.normal[baseVertex];
+    newVerts  = sf->pVerts;
+
+    if (render_count == sf->numVerts) {
+        for (i = 0; i < indexes; i++) {
+            tess.indexes[baseIndex + i] = baseVertex + triangles[i];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        assert(sf->numVerts < TIKI_MAX_VERTEXES);
+
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+
+        for (i = render_count; i < sf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (i = 0; i < indexes; i += 3) {
+            assert(collapse[triangles[i]] < sf->numVerts);
+            assert(collapse[triangles[i + 1]] < sf->numVerts);
+            assert(collapse[triangles[i + 2]] < sf->numVerts);
+
+            if (collapse[triangles[i]] == collapse[triangles[i + 1]]
+                || collapse[triangles[i + 1]] == collapse[triangles[i + 2]]
+                || collapse[triangles[i + 2]] == collapse[triangles[i]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + i]     = baseVertex + collapse[triangles[i]];
+            tess.indexes[baseIndex + i + 1] = baseVertex + collapse[triangles[i + 1]];
+            tess.indexes[baseIndex + i + 2] = baseVertex + collapse[triangles[i + 2]];
+        }
+
+        entityNumIndexes[backEnd.currentEntity - backEnd.refdef.entities] += indexes;
+        tess.numIndexes += i;
+    }
+
+    //
+    // just copy the vertexes
+    //
+    bones  = &TIKI_Skel_Bones[backEnd.currentEntity->e.bonestart];
+    morphs = &skeletorMorphCache[backEnd.currentEntity->e.morphstart];
+
+    if (backEnd.currentEntity->e.hasMorph) {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    channelNum = skelmodel->pBones[morph->morphIndex].channel;
+                } else {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                }
+
+                boneNum = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone    = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                vec3_t totalmorph;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+                VectorClear(totalmorph);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+                morph  = (skeletorMorph_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+                for (morphNum = 0; morphNum < newVerts->numMorphs; morphNum++) {
+                    morphcache = &morphs[morph->morphIndex];
+
+                    if (*morphcache) {
+                        SkelMorphGetXyz(morph, morphcache, totalmorph);
+                    }
+
+                    morph++;
+                }
+
+                if (newVerts->numMorphs) {
+                    bone = &bones[morph->morphIndex];
+                } else {
+                    bone = &bones[weight->boneIndex];
+                }
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    if (!weightNum) {
+                        SkelWeightMorphGetXyz(weight, bone, totalmorph, out);
+                    } else {
+                        SkelWeightGetXyz(weight, bone, out);
+                    }
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        }
+    } else {
+        if (mesh > 0) {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+                int    channelNum;
+                int    boneNum;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                bone       = &bones[boneNum];
+
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    channelNum = skelmodel->pBones[weight->boneIndex].channel;
+                    boneNum    = ri.TIKI_GetLocalChannel(tiki, channelNum);
+                    bone       = &bones[boneNum];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        } else {
+            for (vertNum = 0; vertNum < render_count; vertNum++) {
+                vec3_t normal;
+                vec3_t out;
+
+                VectorClear(out);
+                VectorClear(outXyz);
+
+                weight = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                          + sizeof(skeletorMorph_t) * newVerts->numMorphs);
+
+                bone = &bones[weight->boneIndex];
+                SkelVertGetNormal(newVerts, bone, normal);
+
+                for (weightNum = 0; weightNum < newVerts->numWeights; weightNum++) {
+                    bone = &bones[weight->boneIndex];
+
+                    SkelWeightGetXyz(weight, bone, out);
+
+                    weight++;
+                }
+
+                R_VaoPackNormal(outNormal, normal);
+                VectorScale(out, scale, outXyz);
+
+                tess.texCoords[baseVertex + vertNum][0] = newVerts->texCoords[0];
+                tess.texCoords[baseVertex + vertNum][1] = newVerts->texCoords[1];
+                // FIXME: fill in lightmapST for completeness?
+
+                newVerts = (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * newVerts->numMorphs
+                                                + sizeof(skelWeight_t) * newVerts->numWeights);
+                outXyz += 4;
+                outNormal += 4;
+            }
+        }
+    }
+
+#if 0
+	if( backEnd.currentEntity->e.staticModelIndex ) {
+		mstaticModel_t *sm;
+		color4ub_t *out;
+		color3ub_t *in;
+		int cdofs;
+		skdSurface_t *sf2;
+
+		sm = &tr.world->staticModels[ backEnd.currentEntity->e.staticModelIndex - 1 ];
+
+		tess.useStaticModelVertexColors = qtrue;
+
+		cdofs = 0;
+		sf2 = tiki->surfs;
+		while( sf2 != sf ) {
+			cdofs += sf2->numVerts;
+			sf2 = ( skdSurface_t* )( ( ( byte* )sf2 ) + sf2->ofsEnd );
+		}
+
+		in = &tr.world->smColors[ sm->firstVert + cdofs ];
+		out = tess.vertexColors + baseVertex;
+		for( i = 0; i < sf->numVerts; i++, in++, out++ ) {
+#    if 1
+			( *out )[ 0 ] = ( *in )[ 0 ];
+			( *out )[ 1 ] = ( *in )[ 1 ];
+			( *out )[ 2 ] = ( *in )[ 2 ];
+			( *out )[ 3 ] = 255;
+#    elif 0
+			( ( int* )out ) = tr.identityLightByte;
+#    else		
+			// su44: set it to something special so
+			// I can debug vertex colors rendering
+			( *out )[ 0 ] = 255;
+			( *out )[ 1 ] = 0;
+			( *out )[ 2 ] = 0;
+			( *out )[ 3 ] = 255;
+#    endif
+		}
+	} //else
+#endif
+    //{
+    //	// an attemp to fix bizarre vertex colors bug
+    //	color4ub_t *col;
+    //
+    //	col = &tess.vertexColors[baseVertex];
+    //	for(i = 0; i < sf->numVerts; i++,col++) {
+    //		(*col)[0] = 255;
+    //		(*col)[1] = 255;
+    //		(*col)[2] = 255;
+    //		(*col)[3] = 255;
+    //	}
+    //}
+    //tess.numVertexes += sf->numVerts;
+}
+
+/*
+=============
+RB_StaticMesh
+=============
+*/
+void RB_StaticMesh(staticSurface_t *staticSurf)
+{
+    int                i, j;
+    dtiki_t           *tiki;
+    skelSurfaceGame_t *surf;
+    int                meshNum;
+    skelHeaderGame_t  *skelmodel;
+    int                render_count;
+    skelIndex_t       *collapse_map;
+    skelIndex_t       *triangles;
+    int                indexes;
+    int                baseIndex, baseVertex;
+    short              collapse[1000];
+
+    if (!r_drawstaticmodelpoly->integer) {
+        return;
+    }
+
+    assert(backEnd.currentStaticModel);
+    tiki = backEnd.currentStaticModel->tiki;
+    surf = staticSurf->surface;
+
+    assert(surf->pStaticXyz);
+    if (!surf->pStaticXyz) {
+        return;
+    }
+
+    meshNum   = staticSurf->meshNum;
+    skelmodel = ri.TIKI_GetSkel(tiki->mesh[meshNum]);
+
+    //
+    // Process LOD
+    //
+    if (skelmodel->pLOD && r_staticlod->integer) {
+        float lod_val;
+
+        lod_val = backEnd.currentStaticModel->lodpercentage[0];
+
+        if (surf->numVerts > 3) {
+            skelIndex_t *collapseIndex;
+            int          mid, low, high;
+            int          lod_cutoff;
+
+            if (lod_tool->integer && !strcmp(backEnd.currentStaticModel->tiki->a->name, lod_tikiname->string)
+                && meshNum == lod_mesh->integer) {
+                lod_cutoff = GetToolLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0]);
+            } else {
+                lod_cutoff = GetLodCutoff(skelmodel, backEnd.currentStaticModel->lodpercentage[0], 0);
+            }
+
+            collapseIndex = surf->pCollapseIndex;
+            if (collapseIndex[2] < lod_cutoff) {
+                return;
+            }
+
+            low = mid = 3;
+            high      = surf->numVerts;
+            while (high >= low) {
+                mid = (low + high) >> 1;
+                if (collapseIndex[mid] < lod_cutoff) {
+                    high = mid - 1;
+                    if (collapseIndex[mid - 1] >= lod_cutoff) {
+                        break;
+                    }
+                } else {
+                    mid++;
+                    low = mid;
+                    if (high == mid || collapseIndex[mid] < lod_cutoff) {
+                        break;
+                    }
+                }
+            }
+
+            render_count = mid;
+        } else {
+            render_count = surf->numVerts;
+        }
+
+        if (!render_count) {
+            return;
+        }
+    } else {
+        render_count = surf->numVerts;
+    }
+
+    indexes = surf->numTriangles * 3;
+    RB_CHECKOVERFLOW(render_count, surf->numTriangles);
+
+    collapse_map = surf->pCollapse;
+    triangles    = surf->pTriangles;
+    baseIndex    = tess.numIndexes;
+    baseVertex   = tess.numVertexes;
+    tess.numVertexes += render_count;
+
+    if (render_count == surf->numVerts) {
+        for (j = 0; j < indexes; j++) {
+            tess.indexes[baseIndex + j] = baseVertex + triangles[j];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += indexes;
+        tess.numIndexes += indexes;
+    } else {
+        for (i = 0; i < render_count; i++) {
+            collapse[i] = i;
+        }
+        for (i = render_count; i < surf->numVerts; i++) {
+            collapse[i] = collapse[collapse_map[i]];
+        }
+
+        for (j = 0; j < indexes; j += 3) {
+            if (collapse[triangles[j]] == collapse[triangles[j + 1]]
+                || collapse[triangles[j + 1]] == collapse[triangles[j + 2]]
+                || collapse[triangles[j + 2]] == collapse[triangles[j]]) {
+                break;
+            }
+
+            tess.indexes[baseIndex + j]     = baseVertex + collapse[triangles[j]];
+            tess.indexes[baseIndex + j + 1] = baseVertex + collapse[triangles[j + 1]];
+            tess.indexes[baseIndex + j + 2] = baseVertex + collapse[triangles[j + 2]];
+        }
+
+        staticModelNumIndexes[backEnd.currentStaticModel - backEnd.refdef.staticModels] += j;
+        tess.numIndexes += j;
+    }
+
+    for (j = 0; j < render_count; j++) {
+        Vector4Copy(surf->pStaticXyz[j], tess.xyz[baseVertex + j]);
+        Vector4Copy(surf->pStaticNormal[j], tess.normal[baseVertex + j]);
+        tess.texCoords[baseVertex + j][0]   = surf->pStaticTexCoords[j][0][0];
+        tess.texCoords[baseVertex + j][1]   = surf->pStaticTexCoords[j][0][1];
+        tess.lightCoords[baseVertex + j][0] = surf->pStaticTexCoords[j][1][0];
+        tess.lightCoords[baseVertex + j][1] = surf->pStaticTexCoords[j][1][1];
+    }
+
+    if (backEndData->staticModelData) {
+        const size_t offset =
+            backEnd.currentStaticModel->firstVertexData + staticSurf->ofsStaticData * sizeof(color4ub_t);
+        assert(offset < tr.world->numStaticModelData * sizeof(color4ub_t));
+        assert(offset + render_count * sizeof(color4ub_t) <= tr.world->numStaticModelData * sizeof(color4ub_t));
+
+        const color4ub_t *in = (const color4ub_t *)&backEndData->staticModelData[offset];
+
+        for (i = 0; i < render_count; i++) {
+            tess.color[baseVertex + i][0] = in[i][0] * 0xffff / 0xff;
+            tess.color[baseVertex + i][1] = in[i][1] * 0xffff / 0xff;
+            tess.color[baseVertex + i][2] = in[i][2] * 0xffff / 0xff;
+            tess.color[baseVertex + i][3] = in[i][3] * 0xffff / 0xff;
+        }
+    } else {
+        for (i = 0; i < render_count; i++) {
+            tess.color[baseVertex + i][0] = 0xffff;
+            tess.color[baseVertex + i][1] = 0xffff;
+            tess.color[baseVertex + i][2] = 0xffff;
+            tess.color[baseVertex + i][3] = 0xffff;
+        }
+    }
+}
+
+/*
+=============
+R_InfoWorldTris_f
+=============
+*/
+void R_InfoWorldTris_f(void)
+{
+    int i;
+
+    g_bInfoworldtris = qtrue;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        entityNumIndexes[i] = 0;
+    }
+    for (i = 0; i < ARRAY_LEN(staticModelNumIndexes); i++) {
+        staticModelNumIndexes[i] = 0;
+    }
+}
+
+/*
+=============
+R_PrintInfoWorldtris
+=============
+*/
+void R_PrintInfoWorldtris(void)
+{
+    int               i;
+    int               numTris;
+    int               totalNumTris;
+    dtiki_t          *tiki;
+    skelHeaderGame_t *skelmodel;
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = entityNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.entities[i].e.tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("ent: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total entity tris: %i\n\n", totalNumTris);
+
+    totalNumTris = 0;
+
+    for (i = 0; i < ARRAY_LEN(entityNumIndexes); i++) {
+        numTris = staticModelNumIndexes[i] / 3;
+        if (!numTris) {
+            continue;
+        }
+
+        totalNumTris += numTris;
+        tiki      = backEnd.refdef.staticModels[i].tiki;
+        skelmodel = ri.TIKI_GetSkel(tiki->mesh[0]);
+        Com_Printf("sm: %i, tris: %i, %s, version: %i\n", i, numTris, tiki->a->name, skelmodel->version);
+    }
+
+    Com_Printf("total static model tris: %i\n\n", totalNumTris);
+}
+
+/*
+=============
+RE_SetFrameNumber
+=============
+*/
+void RE_SetFrameNumber(int frameNumber)
+{
+    tr.frame_skel_index = frameNumber;
+}
+
+/*
+=============
+R_UpdatePoseInternal
+=============
+*/
+void R_UpdatePoseInternal(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        if (tr.skel_index[model->entityNumber] == tr.frame_skel_index) {
+            return;
+        }
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_ForceUpdatePose
+=============
+*/
+void RE_ForceUpdatePose(refEntity_t *model)
+{
+    if (model->entityNumber != ENTITYNUM_NONE) {
+        tr.skel_index[model->entityNumber] = tr.frame_skel_index;
+    }
+
+    ri.TIKI_SetPoseInternal(
+        ri.TIKI_GetSkeletor(model->tiki, model->entityNumber),
+        model->frameInfo,
+        model->bone_tag,
+        model->bone_quat,
+        model->actionWeight
+    );
+}
+
+/*
+=============
+RE_TIKI_Orientation
+=============
+*/
+orientation_t RE_TIKI_Orientation(refEntity_t *model, int tagnum)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_OrientationInternal(model->tiki, model->entityNumber, tagnum, model->scale);
+}
+
+/*
+=============
+RE_TIKI_IsOnGround
+=============
+*/
+qboolean RE_TIKI_IsOnGround(refEntity_t *model, int tagnum, float threshold)
+{
+    R_UpdatePoseInternal(model);
+    return ri.TIKI_IsOnGroundInternal(model->tiki, model->entityNumber, tagnum, threshold);
+}
+
+/*
+=============
+R_GetRadius
+=============
+*/
+float R_GetRadius(refEntity_t *model)
+{
+    R_UpdatePoseInternal(model);
+    return ri.GetRadiusInternal(model->tiki, model->entityNumber, model->scale);
+}
+
+/*
+=============
+R_GetFrame
+=============
+*/
+void R_GetFrame(refEntity_t *model, struct skelAnimFrame_s *newFrame)
+{
+    R_UpdatePoseInternal(model);
+    ri.GetFrameInternal(model->tiki, model->entityNumber, newFrame);
+}
+
+/*
+=============
+R_DebugSkeleton
+=============
+*/
+void R_DebugSkeleton(void)
+{
+    // FIXME: unimplemented (GL2)
+}
+
+/*
+=============
+ProjectRadius
+=============
+*/
+static float ProjectRadius(float r, const vec3_t location)
+{
+    Vector separation;
+    float  projectedRadius;
+
+    separation      = Vector(tr.viewParms.or.origin) - Vector(location);
+    projectedRadius = separation.length();
+
+    return fabs(r) * (100.0 / tr.viewParms.fovX) / projectedRadius;
+}
+
+/*
+=============
+R_CalcLod
+=============
+*/
+float R_CalcLod(const vec3_t origin, float radius)
+{
+    return ProjectRadius(radius, origin);
+}
+
+/*
+=============
+R_CullTIKI
+=============
+*/
+static int R_CullSkelModel(dtiki_t *tiki, refEntity_t *e, skelAnimFrame_t *newFrame, float fScale, float *vLocalOrg)
+{
+    vec3_t bounds[2];
+    vec3_t delta;
+    int    i;
+    int    cull;
+
+    // FIXME: not working properly
+    return CULL_IN;
+
+    if (tr.currentEntity->e.renderfx & RF_FRAMELERP) {
+        VectorSubtract(e->origin, e->oldorigin, delta);
+    } else {
+        VectorClear(delta);
+    }
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = newFrame->bounds[0][i] * fScale + vLocalOrg[i];
+        bounds[1][i] = newFrame->bounds[1][i] * fScale + vLocalOrg[i];
+
+        if (delta[i] > 0) {
+            bounds[1][i] += delta[i];
+        } else {
+            bounds[0][i] += delta[i];
+        }
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 1) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_IN:
+            fR = 0;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_CLIP:
+            fR = 1;
+            fG = 1;
+            fB = 0;
+            break;
+        case CULL_OUT:
+            fR = 1;
+            fG = 0.2f;
+            fB = 0.2f;
+
+            for (i = 0; i < 3; i++) {
+                bounds[0][i] -= 16;
+                bounds[1][i] += 16;
+            }
+            break;
+        }
+
+        MatrixToEulerAngles(tr.or.axis, vAngles);
+        R_DebugRotatedBBox(tr.or.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        return CULL_IN;
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        return CULL_CLIP;
+    case CULL_OUT:
+    default:
+        tr.pc.c_box_cull_md3_out++;
+        return CULL_OUT;
+    }
+}
+
+/*
+==================
+R_CountTikiLodTris
+
+Computes the number of triangles to be rendered for the given TIKI model
+based on the given LoD percentage, and passes it back with render_tris.
+The total number of triangles in the TIKI model are passed back with total_tris.
+Currently only used for debugging purposes.
+
+FIXME: Shares some code with RB_StaticMesh, common parts could be extracted.
+According to debug symbols, this was originally in tiki_mesh.cpp
+==================
+*/
+void R_CountTikiLodTris(dtiki_t *tiki, float lodpercentage, int *render_tris, int *total_tris)
+{
+    *render_tris = 0;
+    *total_tris  = 0;
+    int numtris = 0, totaltris = 0;
+
+    for (int i = 0; i < tiki->numMeshes; i++) {
+        skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[i]);
+        skelSurfaceGame_t *surface   = skelmodel->pSurfaces;
+
+        for (int j = 0; j < skelmodel->numSurfaces; j++) {
+            int render_count = 0;
+            if (skelmodel->pLOD) {
+                int          lod_cutoff    = GetLodCutoff(skelmodel, lodpercentage, 0);
+                skelIndex_t *collapseIndex = surface->pCollapseIndex;
+                render_count               = surface->numVerts;
+
+                // Determine the number of vertices to be rendered based on the LOD cutoff
+                while (render_count > 0 && collapseIndex[render_count - 1] < lod_cutoff) {
+                    render_count--;
+                }
+            } else {
+                // The surf mesh doesn't have a LOD model, so all vertices will be rendered
+                render_count = surface->numVerts;
+            }
+
+            skelIndex_t *triangles    = surface->pTriangles;
+            int          indexes      = surface->numTriangles * 3; // 3 vertex/index for each tri
+            skelIndex_t *collapse_map = surface->pCollapse;
+            totaltris += surface->numTriangles;
+            skelIndex_t collapse[4096] {};
+
+            // Initialize array for collapsed indices
+            int k;
+            for (k = 0; k < render_count; ++k) {
+                collapse[k] = k;
+            }
+
+            // Map remaining vertices to their collapsed indices using the collapse map
+            for (k = render_count; k < surface->numVerts; ++k) {
+                collapse[k] = collapse[collapse_map[k]];
+            }
+
+            // Check the first two collapsed indices of each triangle
+            for (k = 0; k < indexes; k += 3) {
+                if (collapse[triangles[k]] == collapse[triangles[k + 1]]) {
+                    // The collapsed indices of the two vertices are the same:
+                    // this, and any subsequent tris do not need to be rendered
+                    // because the collapsed vertices (for this surface) coincide from here.
+                    break;
+                }
+            }
+
+            surface = surface->pNext;
+            numtris += k / 3;
+        }
+    }
+
+    *render_tris = numtris;
+    *total_tris  = totaltris;
+}
+
+/*
+==================
+R_LerpTag
+==================
+*/
+int R_LerpTag(orientation_t *tag, qhandle_t handle, int startFrame, int endFrame, float frac, const char *tagName)
+{
+    // stub
+    return 0;
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_postprocess.c b/code/renderergl2/tr_postprocess.c
index 9931757b..ff9a25a1 100644
--- a/code/renderergl2/tr_postprocess.c
+++ b/code/renderergl2/tr_postprocess.c
@@ -290,6 +290,8 @@ static qboolean RB_UpdateSunFlareVis(void)
 		ri.Printf(PRINT_DEVELOPER, "Waited %d iterations\n", iter);
 	}
 	
+	// Note: On desktop OpenGL this is a sample count (glRefConfig.occlusionQueryTarget == GL_SAMPLES_PASSED)
+	// but on OpenGL ES this is a boolean (glRefConfig.occlusionQueryTarget == GL_ANY_SAMPLES_PASSED)
 	qglGetQueryObjectuiv(tr.sunFlareQuery[tr.sunFlareQueryIndex], GL_QUERY_RESULT, &sampleCount);
 	return sampleCount > 0;
 }
@@ -447,7 +449,7 @@ static void RB_VBlur(FBO_t *srcFbo, FBO_t *dstFbo, float strength)
 	RB_BlurAxis(srcFbo, dstFbo, strength, qfalse);
 }
 
-void RB_GaussianBlur(float blur)
+void RB_GaussianBlur(FBO_t *srcFbo, FBO_t *dstFbo, float blur)
 {
 	//float mul = 1.f;
 	float factor = Com_Clamp(0.f, 1.f, blur);
@@ -462,7 +464,7 @@ void RB_GaussianBlur(float blur)
 		VectorSet4(color, 1, 1, 1, 1);
 
 		// first, downsample the framebuffer
-		FBO_FastBlit(NULL, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
+		FBO_FastBlit(srcFbo, NULL, tr.quarterFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 		FBO_FastBlit(tr.quarterFbo[0], NULL, tr.textureScratchFbo[0], NULL, GL_COLOR_BUFFER_BIT, GL_LINEAR);
 
 		// set the alpha channel
@@ -478,6 +480,6 @@ void RB_GaussianBlur(float blur)
 		VectorSet4(srcBox, 0, 0, tr.textureScratchFbo[0]->width, tr.textureScratchFbo[0]->height);
 		VectorSet4(dstBox, 0, 0, glConfig.vidWidth,              glConfig.vidHeight);
 		color[3] = factor;
-		FBO_Blit(tr.textureScratchFbo[0], srcBox, NULL, NULL, dstBox, NULL, color, GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
+		FBO_Blit(tr.textureScratchFbo[0], srcBox, NULL, dstFbo, dstBox, NULL, color, GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA);
 	}
 }
diff --git a/code/renderergl2/tr_postprocess.h b/code/renderergl2/tr_postprocess.h
index 09daf134..a2d6d0b3 100644
--- a/code/renderergl2/tr_postprocess.h
+++ b/code/renderergl2/tr_postprocess.h
@@ -28,6 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 void RB_ToneMap(FBO_t *hdrFbo, ivec4_t hdrBox, FBO_t *ldrFbo, ivec4_t ldrBox, int autoExposure);
 void RB_BokehBlur(FBO_t *src, ivec4_t srcBox, FBO_t *dst, ivec4_t dstBox, float blur);
 void RB_SunRays(FBO_t *srcFbo, ivec4_t srcBox, FBO_t *dstFbo, ivec4_t dstBox);
-void RB_GaussianBlur(float blur);
+void RB_GaussianBlur(FBO_t *srcFbo, FBO_t *dstFbo, float blur);
 
 #endif
diff --git a/code/renderergl2/tr_scene.c b/code/renderergl2/tr_scene.c
index aea153e1..f2663dfd 100644
--- a/code/renderergl2/tr_scene.c
+++ b/code/renderergl2/tr_scene.c
@@ -35,6 +35,19 @@ int			r_firstScenePoly;
 
 int			r_numpolyverts;
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+int			r_firstSceneSpriteSurf;
+
+int			r_numsprites;
+int			r_firstSceneSprite;
+
+int			r_numtermarks;
+int			r_firstSceneTerMark;
+
+//=========================
 
 /*
 ====================
@@ -57,6 +70,18 @@ void R_InitNextFrame( void ) {
 	r_firstScenePoly = 0;
 
 	r_numpolyverts = 0;
+
+    //
+    // OPENMOHAA-specific stuff
+    //
+
+    r_firstSceneSpriteSurf = 0;
+
+	r_numsprites = 0;
+	r_firstSceneSprite = 0;
+
+	r_numtermarks = 0;
+	r_firstSceneTerMark = 0;
 }
 
 
@@ -432,6 +457,35 @@ void RE_BeginScene(const refdef_t *fd)
 	// each scene / view.
 	tr.frameSceneNum++;
 	tr.sceneCount++;
+
+	//
+	// OPENMOHAA-specific stuff
+    //=========================
+    TIKI_Reset_Caches();
+
+    // copy the sky data
+    tr.refdef.sky_alpha = fd->sky_alpha;
+    tr.refdef.sky_portal = fd->sky_portal;
+
+    VectorCopy(fd->sky_origin, tr.refdef.sky_origin);
+    VectorCopy(fd->sky_axis[0], tr.refdef.sky_axis[0]);
+    VectorCopy(fd->sky_axis[1], tr.refdef.sky_axis[1]);
+    VectorCopy(fd->sky_axis[2], tr.refdef.sky_axis[2]);
+
+    tr.refdef.numSpriteSurfs = r_firstSceneSpriteSurf;
+    tr.refdef.spriteSurfs = backEndData->spriteSurfs;
+
+    tr.refdef.num_sprites = r_numsprites - r_firstSceneSprite;
+    tr.refdef.sprites = &backEndData->sprites[r_firstSceneSprite];
+
+    tr.refdef.numTerMarks = r_numtermarks - r_firstSceneTerMark;
+    tr.refdef.terMarks = &backEndData->terMarks[r_firstSceneTerMark];
+
+    backEndData->staticModelData = tr.refdef.staticModelData;
+	
+    tr.skyRendered = qfalse;
+    tr.portalRendered = qfalse;
+	//=========================
 }
 
 
@@ -442,6 +496,14 @@ void RE_EndScene(void)
 	r_firstSceneEntity = r_numentities;
 	r_firstSceneDlight = r_numdlights;
 	r_firstScenePoly = r_numpolys;
+
+	//
+	// OPENMOHAA-specific stuff
+    //
+
+    r_firstSceneSpriteSurf = tr.refdef.numSpriteSurfs;
+    r_firstSceneSprite = r_numsprites;
+    r_firstSceneTerMark = r_numtermarks;
 }
 
 /*
@@ -562,6 +624,68 @@ void RE_RenderScene( const refdef_t *fd ) {
 		parms.flags = VPF_USESUNLIGHT;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+
+	// copy the farplane data
+	parms.farplane_distance = fd->farplane_distance;
+	parms.farplane_bias = fd->farplane_bias;
+	parms.farplane_color[0] = fd->farplane_color[0];
+	parms.farplane_color[1] = fd->farplane_color[1];
+	parms.farplane_color[2] = fd->farplane_color[2];
+	parms.farplane_cull = fd->farplane_cull;
+	parms.renderTerrain = fd->renderTerrain;
+
+	tr.refdef.skybox_farplane = fd->skybox_farplane;
+	tr.refdef.render_terrain = parms.renderTerrain;
+
+	if (fd->farclipOverride >= 15900 || fd->farclipOverride <= -0.99) {
+		tr.farclip = 0;
+	} else {
+		tr.farclip = r_farclip->integer;
+		if (!tr.farclip && (r_picmip->integer > 1 || r_colorbits->integer == 16)) {
+			tr.farclip = 2800;
+		}
+	}
+
+	if (tr.farclip) {
+        if (fd->farclipOverride != 0) {
+            parms.farplane_distance = fd->farclipOverride;
+		} else {
+			parms.farplane_distance = tr.farclip;
+		}
+
+		if (fd->farplane_color[0] >= 0 && fd->farplane_color[1] >= 0 && fd->farplane_color[2] >= 0) {
+            parms.farplane_color[0] = fd->farplane_color[0];
+            parms.farplane_color[1] = fd->farplane_color[1];
+            parms.farplane_color[2] = fd->farplane_color[2];
+		}
+
+		if (fd->farplaneColorOverride[0] >= 0 && fd->farplaneColorOverride[1] >= 0 && fd->farplaneColorOverride[2] >= 0) {
+			parms.farplane_color[0] = fd->farplaneColorOverride[0];
+			parms.farplane_color[1] = fd->farplaneColorOverride[1];
+			parms.farplane_color[2] = fd->farplaneColorOverride[2];
+		}
+
+		parms.farplane_cull = qtrue;
+
+        if (fd->farplane_distance > 0 && fd->farplane_distance < parms.farplane_distance) {
+            parms.farplane_distance = fd->farplane_distance;
+		} else {
+			if (fd->farplane_bias == 0) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else if (fd->farplane_distance <= 500.f) {
+				parms.farplane_bias = parms.farplane_distance * 0.18f;
+			} else {
+				parms.farplane_bias = parms.farplane_distance / fd->farplane_distance;
+			}
+		}
+	} else if (parms.farplane_bias == 0) {
+		parms.farplane_bias = parms.farplane_distance * 0.18f;
+	}
+	//=========================
+
 	R_RenderView( &parms );
 
 	if(!( fd->rdflags & RDF_NOWORLDMODEL ))
@@ -571,3 +695,155 @@ void RE_RenderScene( const refdef_t *fd ) {
 
 	tr.frontEndMsec += ri.Milliseconds() - startTime;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+/*
+=====================
+RE_AddLightToScene2
+
+=====================
+*/
+void RE_AddLightToScene2(const vec3_t org, float intensity, float r, float g, float b, int type) {
+    RE_AddDynamicLightToScene(org, intensity, r, g, b, qfalse);
+}
+
+
+/*
+=====================
+RE_AddRefEntityToScene2
+
+=====================
+*/
+void RE_AddRefEntityToScene2( const refEntity_t *ent, int parentEntityNumber ) {
+	RE_AddRefEntityToScene(ent);
+}
+
+void RE_AddRefSpriteToScene(const refEntity_t* ent) {
+	refSprite_t* spr;
+	int i;
+
+	if (!tr.registered) {
+		return;
+	}
+
+	if (r_numsprites >= MAX_SPRITES) {
+		return;
+	}
+
+	spr = &backEndData->sprites[r_numsprites];
+	VectorCopy(ent->origin, spr->origin);
+	spr->surftype = SF_SPRITE;
+    spr->hModel = ent->hModel;
+    spr->scale = ent->scale;
+    spr->renderfx = ent->renderfx;
+    spr->shaderTime = ent->shaderTime;
+	AxisCopy(ent->axis, spr->axis);
+
+	for (i = 0; i < 4; ++i) {
+		spr->shaderRGBA[i] = ent->shaderRGBA[i];
+	}
+
+    ++r_numsprites;
+}
+
+/*
+=====================
+RE_AddPolyToScene
+
+=====================
+*/
+qboolean RE_AddPolyToScene2(qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+	srfPoly_t	*poly;
+
+	if ( !tr.registered ) {
+		return qfalse;
+	}
+
+	if (numVerts + r_numpolyverts > max_polyverts || r_numpolys >= max_polys) {
+		ri.Printf(PRINT_WARNING, "Exceeded MAX POLYS\n");
+		return qfalse;
+	}
+
+	poly = &backEndData->polys[r_numpolys];
+	poly->surfaceType = SF_POLY;
+	poly->hShader = hShader;
+	poly->numVerts = numVerts;
+	poly->verts = &backEndData->polyVerts[r_numpolyverts];
+	poly->renderfx = renderfx;
+
+	Com_Memcpy(poly->verts, verts, sizeof(polyVert_t) * numVerts);
+	++r_numpolys;
+	r_numpolyverts += numVerts;
+
+	return qtrue;
+}
+
+/*
+=====================
+R_AddTerrainMarkSurfaces
+=====================
+*/
+void R_AddTerrainMarkSurfaces(void) {
+    srfMarkFragment_t* terMark;
+    int j;
+    shader_t* shader;
+
+    for (j = 0; j < tr.refdef.numTerMarks; j++)
+    {
+        terMark = &tr.refdef.terMarks[j];
+
+        shader = R_GetShaderByHandle(terMark->surfaceType);
+        terMark->surfaceType = SF_MARK_FRAG;
+        R_AddDrawSurf(&terMark->surfaceType, shader, 0, 0, 0, 0);
+    }
+}
+
+/*
+=====================
+RE_AddTerrainMarkToScene
+=====================
+*/
+void RE_AddTerrainMarkToScene(int iTerrainIndex, qhandle_t hShader, int numVerts, const polyVert_t* verts, int renderfx) {
+    srfMarkFragment_t* terMark;
+
+    if (!tr.registered) {
+        return;
+    }
+
+    if (numVerts + r_numpolyverts > max_polyverts || r_numtermarks >= max_termarks) {
+        ri.Printf(PRINT_WARNING, "Exceeded MAX TERRAIN MARKS\n");
+        return;
+    }
+
+    terMark = &backEndData->terMarks[r_numtermarks];
+    terMark->surfaceType = hShader;
+    terMark->iIndex = iTerrainIndex;
+    terMark->numVerts = numVerts;
+    terMark->verts = &backEndData->polyVerts[r_numpolyverts];
+    memcpy(terMark->verts, verts, sizeof(polyVert_t) * numVerts);
+
+    r_numtermarks++;
+    r_numpolyverts += numVerts;
+}
+
+//=================================================================================
+
+/*
+=====================
+RE_GetRenderEntity
+=====================
+*/
+refEntity_t* RE_GetRenderEntity(int entityNumber) {
+    int i;
+
+    for (i = 0; i < r_numentities; i++) {
+        if (backEndData->entities[i].e.entityNumber == entityNumber) {
+            return &backEndData->entities[i].e;
+        }
+    }
+
+    return NULL;
+}
diff --git a/code/renderergl2/tr_shade.c b/code/renderergl2/tr_shade.c
index 1395c905..484f4ae7 100644
--- a/code/renderergl2/tr_shade.c
+++ b/code/renderergl2/tr_shade.c
@@ -40,7 +40,14 @@ R_DrawElements
 
 void R_DrawElements( int numIndexes, int firstIndex )
 {
-	qglDrawElements(GL_TRIANGLES, numIndexes, GL_INDEX_TYPE, BUFFER_OFFSET(firstIndex * sizeof(glIndex_t)));
+	if (tess.useCacheVao)
+	{
+		VaoCache_DrawElements(numIndexes, firstIndex);
+	}
+	else
+	{
+		qglDrawElements(GL_TRIANGLES, numIndexes, GL_INDEX_TYPE, BUFFER_OFFSET(firstIndex * sizeof(glIndex_t)));
+	}
 }
 
 
@@ -181,33 +188,30 @@ extern float EvalWaveForm( const waveForm_t *wf );
 extern float EvalWaveFormClamped( const waveForm_t *wf );
 
 
-static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, float *outMatrix, float *outOffTurb)
+static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, vec4_t outMatrix[8])
 {
 	int tm;
-	float matrix[6], currentmatrix[6];
+	float matrix[6];
+	float tmpmatrix[6];
+	float currentmatrix[6];
+	float turb[2];
 	textureBundle_t *bundle = &pStage->bundle[bundleNum];
-
-	matrix[0] = 1.0f; matrix[2] = 0.0f; matrix[4] = 0.0f;
-	matrix[1] = 0.0f; matrix[3] = 1.0f; matrix[5] = 0.0f;
+	qboolean hasTurb = qfalse;
 
 	currentmatrix[0] = 1.0f; currentmatrix[2] = 0.0f; currentmatrix[4] = 0.0f;
 	currentmatrix[1] = 0.0f; currentmatrix[3] = 1.0f; currentmatrix[5] = 0.0f;
 
-	outMatrix[0] = 1.0f; outMatrix[2] = 0.0f;
-	outMatrix[1] = 0.0f; outMatrix[3] = 1.0f;
-
-	outOffTurb[0] = 0.0f; outOffTurb[1] = 0.0f; outOffTurb[2] = 0.0f; outOffTurb[3] = 0.0f;
-
 	for ( tm = 0; tm < bundle->numTexMods ; tm++ ) {
 		switch ( bundle->texMods[tm].type )
 		{
 			
 		case TMOD_NONE:
-			tm = TR_MAX_TEXMODS;		// break out of for loop
+			matrix[0] = 1.0f; matrix[2] = 0.0f; matrix[4] = 0.0f;
+			matrix[1] = 0.0f; matrix[3] = 1.0f; matrix[5] = 0.0f;
 			break;
 
 		case TMOD_TURBULENT:
-			RB_CalcTurbulentFactors(&bundle->texMods[tm].wave, &outOffTurb[2], &outOffTurb[3]);
+			RB_CalcTurbulentFactors(&bundle->texMods[tm].wave, &turb[0], &turb[1]);
 			break;
 
 		case TMOD_ENTITY_TRANSLATE:
@@ -246,35 +250,68 @@ static void ComputeTexMods( shaderStage_t *pStage, int bundleNum, float *outMatr
 
 		switch ( bundle->texMods[tm].type )
 		{	
-		case TMOD_NONE:
 		case TMOD_TURBULENT:
-		default:
+			outMatrix[tm*2+0][0] = 1; outMatrix[tm*2+0][1] = 0; outMatrix[tm*2+0][2] = 0;
+			outMatrix[tm*2+1][0] = 0; outMatrix[tm*2+1][1] = 1; outMatrix[tm*2+1][2] = 0;
+
+			outMatrix[tm*2+0][3] = turb[0];
+			outMatrix[tm*2+1][3] = turb[1];
+
+			hasTurb = qtrue;
 			break;
 
+		case TMOD_NONE:
 		case TMOD_ENTITY_TRANSLATE:
 		case TMOD_SCROLL:
 		case TMOD_SCALE:
 		case TMOD_STRETCH:
 		case TMOD_TRANSFORM:
 		case TMOD_ROTATE:
-			outMatrix[0] = matrix[0] * currentmatrix[0] + matrix[2] * currentmatrix[1];
-			outMatrix[1] = matrix[1] * currentmatrix[0] + matrix[3] * currentmatrix[1];
+		default:
+			outMatrix[tm*2+0][0] = matrix[0]; outMatrix[tm*2+0][1] = matrix[2]; outMatrix[tm*2+0][2] = matrix[4];
+			outMatrix[tm*2+1][0] = matrix[1]; outMatrix[tm*2+1][1] = matrix[3]; outMatrix[tm*2+1][2] = matrix[5];
 
-			outMatrix[2] = matrix[0] * currentmatrix[2] + matrix[2] * currentmatrix[3];
-			outMatrix[3] = matrix[1] * currentmatrix[2] + matrix[3] * currentmatrix[3];
+			outMatrix[tm*2+0][3] = 0;
+			outMatrix[tm*2+1][3] = 0;
 
-			outOffTurb[0] = matrix[0] * currentmatrix[4] + matrix[2] * currentmatrix[5] + matrix[4];
-			outOffTurb[1] = matrix[1] * currentmatrix[4] + matrix[3] * currentmatrix[5] + matrix[5];
+			tmpmatrix[0] = matrix[0] * currentmatrix[0] + matrix[2] * currentmatrix[1];
+			tmpmatrix[1] = matrix[1] * currentmatrix[0] + matrix[3] * currentmatrix[1];
 
-			currentmatrix[0] = outMatrix[0];
-			currentmatrix[1] = outMatrix[1];
-			currentmatrix[2] = outMatrix[2];
-			currentmatrix[3] = outMatrix[3];
-			currentmatrix[4] = outOffTurb[0];
-			currentmatrix[5] = outOffTurb[1];
+			tmpmatrix[2] = matrix[0] * currentmatrix[2] + matrix[2] * currentmatrix[3];
+			tmpmatrix[3] = matrix[1] * currentmatrix[2] + matrix[3] * currentmatrix[3];
+
+			tmpmatrix[4] = matrix[0] * currentmatrix[4] + matrix[2] * currentmatrix[5] + matrix[4];
+			tmpmatrix[5] = matrix[1] * currentmatrix[4] + matrix[3] * currentmatrix[5] + matrix[5];
+
+			currentmatrix[0] = tmpmatrix[0];
+			currentmatrix[1] = tmpmatrix[1];
+			currentmatrix[2] = tmpmatrix[2];
+			currentmatrix[3] = tmpmatrix[3];
+			currentmatrix[4] = tmpmatrix[4];
+			currentmatrix[5] = tmpmatrix[5];
 			break;
 		}
 	}
+
+	// if turb isn't used, only one matrix is needed
+	if ( !hasTurb ) {
+		tm = 0;
+
+		outMatrix[tm*2+0][0] = currentmatrix[0]; outMatrix[tm*2+0][1] = currentmatrix[2]; outMatrix[tm*2+0][2] = currentmatrix[4];
+		outMatrix[tm*2+1][0] = currentmatrix[1]; outMatrix[tm*2+1][1] = currentmatrix[3]; outMatrix[tm*2+1][2] = currentmatrix[5];
+
+		outMatrix[tm*2+0][3] = 0;
+		outMatrix[tm*2+1][3] = 0;
+		tm++;
+	}
+
+	for ( ; tm < TR_MAX_TEXMODS ; tm++ ) {
+		outMatrix[tm*2+0][0] = 1; outMatrix[tm*2+0][1] = 0; outMatrix[tm*2+0][2] = 0;
+		outMatrix[tm*2+1][0] = 0; outMatrix[tm*2+1][1] = 1; outMatrix[tm*2+1][2] = 0;
+
+		outMatrix[tm*2+0][3] = 0;
+		outMatrix[tm*2+1][3] = 0;
+	}
 }
 
 
@@ -500,13 +537,25 @@ static void ComputeShaderColors( shaderStage_t *pStage, vec4_t baseColor, vec4_t
 			baseColor[0] =
 			baseColor[1] =
 			baseColor[2] = overbright;
-            break;
-        case CGEN_GLOBAL_COLOR:
-            RB_CalcColorFromConstant((unsigned char*)tess.svars.colors, backEnd.color2D);
-            break;
+			break;
 		case CGEN_IDENTITY_LIGHTING:
 		case CGEN_BAD:
 			break;
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		case CGEN_STATIC:
+			baseColor[0] =
+			baseColor[1] =
+			baseColor[2] =
+			baseColor[3] = 0.0f;
+
+			vertColor[0] =
+			vertColor[1] =
+			vertColor[2] =
+			vertColor[3] = 1.0f;
+			break;
+		//=========================
 	}
 
 	//
@@ -668,8 +717,7 @@ static void ForwardDlight( void ) {
 		dlight_t	*dl;
 		shaderProgram_t *sp;
 		vec4_t vector;
-		vec4_t texMatrix;
-		vec4_t texOffTurb;
+		vec4_t texMatrix[8];
 
 		if ( !( tess.dlightBits & ( 1 << l ) ) ) {
 			continue;	// this surface definitely doesn't have any of this light
@@ -795,9 +843,15 @@ static void ForwardDlight( void ) {
 		if (r_dlightMode->integer >= 2)
 			GL_BindToTMU(tr.shadowCubemaps[l], TB_SHADOWMAP);
 
-		ComputeTexMods( pStage, TB_DIFFUSEMAP, texMatrix, texOffTurb );
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, texMatrix);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, texOffTurb);
+		ComputeTexMods( pStage, TB_DIFFUSEMAP, texMatrix );
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, texMatrix[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, texMatrix[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, texMatrix[2]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, texMatrix[3]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, texMatrix[4]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, texMatrix[5]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, texMatrix[6]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, texMatrix[7]);
 
 		GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, pStage->bundle[0].tcGen);
 
@@ -999,8 +1053,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 	{
 		shaderStage_t *pStage = input->xstages[stage];
 		shaderProgram_t *sp;
-		vec4_t texMatrix;
-		vec4_t texOffTurb;
+		vec4_t texMatrix[8];
 
 		if ( !pStage )
 		{
@@ -1187,19 +1240,31 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 
 		if (r_lightmap->integer)
 		{
-			vec4_t v;
-			VectorSet4(v, 1.0f, 0.0f, 0.0f, 1.0f);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, v);
-			VectorSet4(v, 0.0f, 0.0f, 0.0f, 0.0f);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, v);
+			vec4_t st[2];
+			VectorSet4(st[0], 1.0f, 0.0f, 0.0f, 0.0f);
+			VectorSet4(st[1], 0.0f, 1.0f, 0.0f, 0.0f);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, st[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, st[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, st[1]);
 
 			GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, TCGEN_LIGHTMAP);
 		}
 		else
 		{
-			ComputeTexMods(pStage, TB_DIFFUSEMAP, texMatrix, texOffTurb);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, texMatrix);
-			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, texOffTurb);
+			ComputeTexMods(pStage, TB_DIFFUSEMAP, texMatrix);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, texMatrix[0]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, texMatrix[1]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, texMatrix[2]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, texMatrix[3]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, texMatrix[4]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, texMatrix[5]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, texMatrix[6]);
+			GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, texMatrix[7]);
 
 			GLSL_SetUniformInt(sp, UNIFORM_TCGEN0, pStage->bundle[0].tcGen);
 			if (pStage->bundle[0].tcGen == TCGEN_VECTOR)
@@ -1677,6 +1742,8 @@ void RB_EndSurface( void ) {
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
 	tess.firstIndex = 0;
+	tess.useCacheVao = qfalse;
+	tess.useInternalVao = qfalse;
 
 	GLimp_LogComment( "----------\n" );
 }
diff --git a/code/renderergl2/tr_shade_calc.c b/code/renderergl2/tr_shade_calc.c
index 15cfb9c6..3f5c28d9 100644
--- a/code/renderergl2/tr_shade_calc.c
+++ b/code/renderergl2/tr_shade_calc.c
@@ -400,9 +400,19 @@ static void AutospriteDeform( void ) {
 		}
 
 	  // compensate for scale in the axes if necessary
-  	if ( backEnd.currentEntity->e.nonNormalizedAxes ) {
+  	if ( backEnd.currentStaticModel || backEnd.currentEntity->e.nonNormalizedAxes ) {
       float axisLength;
-		  axisLength = VectorLength( backEnd.currentEntity->e.axis[0] );
+
+          // OPENMOHAA-specific stuff
+	      //=========================
+          if (backEnd.currentStaticModel) {
+              axisLength = VectorLength(backEnd.currentStaticModel->axis[0]);
+          }
+          else
+          //=========================
+		  {
+              axisLength = VectorLength(backEnd.currentEntity->e.axis[0]);
+          }
   		if ( !axisLength ) {
 	  		axisLength = 0;
   		} else {
@@ -816,3 +826,41 @@ void RB_CalcRotateTexMatrix( float degsPerSecond, float *matrix )
 	matrix[0] = cosValue; matrix[2] = -sinValue; matrix[4] = 0.5 - 0.5 * cosValue + 0.5 * sinValue;
 	matrix[1] = sinValue; matrix[3] = cosValue;  matrix[5] = 0.5 - 0.5 * sinValue - 0.5 * cosValue;
 }
+
+//
+// OPENMOHAA-specific stuff
+//
+
+void RB_CalcLightGridColor(unsigned char* colors)
+{
+    int i;
+
+    if (!backEnd.currentEntity) {
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[0];
+            colors[i * 4 + 1] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[1];
+            colors[i * 4 + 2] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[2];
+            colors[i * 4 + 3] = ((byte*)&backEnd.currentStaticModel->iGridLighting)[3];
+        }
+    }
+    else if (backEnd.currentEntity != &tr.worldEntity) {
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = ((byte*)&backEnd.currentEntity->iGridLighting)[0];
+            colors[i * 4 + 1] = ((byte*)&backEnd.currentEntity->iGridLighting)[1];
+            colors[i * 4 + 2] = ((byte*)&backEnd.currentEntity->iGridLighting)[2];
+            colors[i * 4 + 3] = ((byte*)&backEnd.currentEntity->iGridLighting)[3];
+        }
+    }
+    else {
+        ri.Printf(PRINT_ALL,
+            "##### shader '%s' incorrectly uses rgbGen lightingGrid or lightingSpherical; was rgbGen vertex intended?\n",
+            tess.shader->name);
+
+        for (i = 0; i < tess.numVertexes; i++) {
+            colors[i * 4] = 0xFF;
+            colors[i * 4 + 1] = 0xFF;
+            colors[i * 4 + 2] = 0xFF;
+            colors[i * 4 + 3] = 0xFF;
+        }
+    }
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_shader.c b/code/renderergl2/tr_shader.c
index 0cd78a78..4ee311ed 100644
--- a/code/renderergl2/tr_shader.c
+++ b/code/renderergl2/tr_shader.c
@@ -30,6 +30,7 @@ static char *s_shaderText;
 static	shaderStage_t	stages[MAX_SHADER_STAGES];		
 static	shader_t		shader;
 static	texModInfo_t	texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
+static	int				shader_realLightmapIndex;
 
 #define FILE_HASH_SIZE		1024
 static	shader_t*		hashTable[FILE_HASH_SIZE];
@@ -37,6 +38,12 @@ static	shader_t*		hashTable[FILE_HASH_SIZE];
 #define MAX_SHADERTEXT_HASH		2048
 static char **shaderTextHashTable[MAX_SHADERTEXT_HASH];
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+static void CreateMultistageFromBundle();
+//=========================
+
 /*
 ================
 return a hash value for the filename
@@ -116,6 +123,7 @@ ParseVector
 ===============
 */
 static qboolean ParseVector( char **text, int count, float *v ) {
+#if 0
 	char	*token;
 	int		i;
 
@@ -142,6 +150,25 @@ static qboolean ParseVector( char **text, int count, float *v ) {
 	}
 
 	return qtrue;
+#endif
+
+	//
+	// OPENMOHAA-specific stuff
+	//
+	char	*token;
+	int		i;
+
+	for ( i = 0 ; i < count ; i++ ) {
+		token = COM_ParseExt( text, qfalse );
+		if ( !token[0] ) {
+			ri.Printf( PRINT_WARNING, "WARNING: missing vector element in shader '%s'\n", shader.name );
+			return qfalse;
+		}
+		v[i] = atof( token );
+	}
+
+	return qtrue;
+
 }
 
 
@@ -603,6 +630,15 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 	char *token;
 	int depthMaskBits = GLS_DEPTHMASK_TRUE, blendSrcBits = 0, blendDstBits = 0, atestBits = 0, depthFuncBits = 0;
 	qboolean depthMaskExplicit = qfalse;
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	int colorBits;
+	int cntBundle = 0;
+	int depthTestBits = 0;
+	int fogBits = 0;
+	qboolean shouldProcess = qtrue;
+	//=========================
 
 	stage->active = qtrue;
 
@@ -633,16 +669,16 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "$whiteimage" ) )
 			{
-				stage->bundle[0].image[0] = tr.whiteImage;
+				stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				continue;
 			}
 			else if ( !Q_stricmp( token, "$lightmap" ) )
 			{
-				stage->bundle[0].isLightmap = qtrue;
+				stage->bundle[cntBundle].isLightmap = qtrue;
 				if ( shader.lightmapIndex < 0 || !tr.lightmaps ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				} else {
-					stage->bundle[0].image[0] = tr.lightmaps[shader.lightmapIndex];
+					stage->bundle[cntBundle].image[0] = tr.lightmaps[shader.lightmapIndex];
 				}
 				continue;
 			}
@@ -654,11 +690,11 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					return qfalse;
 				}
 
-				stage->bundle[0].isLightmap = qtrue;
+				stage->bundle[cntBundle].isLightmap = qtrue;
 				if ( shader.lightmapIndex < 0 ) {
-					stage->bundle[0].image[0] = tr.whiteImage;
+					stage->bundle[cntBundle].image[0] = tr.whiteImage;
 				} else {
-					stage->bundle[0].image[0] = tr.deluxemaps[shader.lightmapIndex];
+					stage->bundle[cntBundle].image[0] = tr.deluxemaps[shader.lightmapIndex];
 				}
 				continue;
 			}
@@ -687,9 +723,9 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 						flags |= IMGFLAG_GENNORMALMAP;
 				}
 
-				stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
+				stage->bundle[cntBundle].image[0] = R_FindImageFile( token, type, flags );
 
-				if ( !stage->bundle[0].image[0] )
+				if ( !stage->bundle[cntBundle].image[0] )
 				{
 					ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 					return qfalse;
@@ -732,8 +768,8 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 
 
-			stage->bundle[0].image[0] = R_FindImageFile( token, type, flags );
-			if ( !stage->bundle[0].image[0] )
+			stage->bundle[cntBundle].image[0] = R_FindImageFile( token, type, flags );
+			if ( !stage->bundle[cntBundle].image[0] )
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 				return qfalse;
@@ -752,7 +788,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
 
 			// parse up to MAX_IMAGE_ANIMATIONS animations
 			while ( 1 ) {
@@ -762,7 +798,7 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				if ( !token[0] ) {
 					break;
 				}
-				num = stage->bundle[0].numImageAnimations;
+				num = stage->bundle[cntBundle].numImageAnimations;
 				if ( num < MAX_IMAGE_ANIMATIONS ) {
 					imgFlags_t flags = IMGFLAG_NONE;
 
@@ -772,13 +808,13 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					if (!shader.noPicMip)
 						flags |= IMGFLAG_PICMIP;
 
-					stage->bundle[0].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
-					if ( !stage->bundle[0].image[num] )
+					stage->bundle[cntBundle].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
+					if ( !stage->bundle[cntBundle].image[num] )
 					{
 						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
 						return qfalse;
 					}
-					stage->bundle[0].numImageAnimations++;
+					stage->bundle[cntBundle].numImageAnimations++;
 				}
 				totalImages++;
 			}
@@ -796,10 +832,10 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'videoMap' keyword in shader '%s'\n", shader.name );
 				return qfalse;
 			}
-			stage->bundle[0].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
-			if (stage->bundle[0].videoMapHandle != -1) {
-				stage->bundle[0].isVideoMap = qtrue;
-				stage->bundle[0].image[0] = tr.scratchImage[stage->bundle[0].videoMapHandle];
+			stage->bundle[cntBundle].videoMapHandle = ri.CIN_PlayCinematic( token, 0, 0, 256, 256, (CIN_loop | CIN_silent | CIN_shader));
+			if (stage->bundle[cntBundle].videoMapHandle != -1) {
+				stage->bundle[cntBundle].isVideoMap = qtrue;
+				stage->bundle[cntBundle].image[0] = tr.scratchImage[stage->bundle[cntBundle].videoMapHandle];
 			} else {
 				ri.Printf( PRINT_WARNING, "WARNING: could not load '%s' for 'videoMap' keyword in shader '%s'\n", token, shader.name );
 			}
@@ -874,6 +910,13 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			} else if ( !Q_stricmp( token, "blend" ) ) {
 				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
 				blendDstBits = GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			} else if ( !Q_stricmp( token, "alphaadd" ) ) {
+				blendSrcBits = GLS_SRCBLEND_SRC_ALPHA;
+                blendDstBits = GLS_DSTBLEND_ONE;
+			//=========================
 			} else {
 				// complex double blends
 				blendSrcBits = NameToSrcBlendMode( token );
@@ -1213,6 +1256,142 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			{
 				stage->rgbGen = CGEN_ONE_MINUS_VERTEX;
 			}
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			else if (!Q_stricmp(token, "colorwave"))
+			{
+				vec3_t v;
+
+				ParseVector(text, 3, v);
+				stage->colorConst[0] = v[0] * 255.0;
+				stage->colorConst[1] = v[1] * 255.0;
+				stage->colorConst[2] = v[2] * 255.0;
+				stage->rgbGen = CGEN_MULTIPLY_BY_WAVEFORM;
+			}
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->rgbGen = CGEN_GLOBAL_COLOR;
+            }
+            else if (!Q_stricmp(token, "fromentity"))
+            {
+                stage->rgbGen = CGEN_ENTITY;
+            }
+			else if (!Q_stricmp(token, "fromclient"))
+			{
+				stage->rgbGen = CGEN_VERTEX;
+				if (stage->alphaGen == 0) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "lightingGrid"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_GRID;
+			}
+			else if (!Q_stricmp(token, "lightingSpherical"))
+			{
+				stage->rgbGen = CGEN_LIGHTING_SPHERICAL;
+			}
+			else if (!Q_stricmp(token, "constant"))
+			{
+				vec3_t	color;
+
+				VectorClear( color );
+
+				ParseVector( text, 3, color );
+				stage->constantColor[0] = 255 * color[0];
+				stage->constantColor[1] = 255 * color[1];
+				stage->constantColor[2] = 255 * color[2];
+
+				stage->rgbGen = CGEN_CONST;
+			}
+			else if (!Q_stricmp(token, "static"))
+			{
+				stage->rgbGen = CGEN_STATIC;
+				if (stage->alphaGen == AGEN_IDENTITY) {
+					stage->alphaGen = AGEN_VERTEX;
+				}
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->rgbGen = CGEN_SCOORD;
+				}
+				else {
+					stage->rgbGen = CGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing rgbGen sCoord or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				stage->rgbGen = CGEN_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneminusdot"))
+			{
+				stage->rgbGen = CGEN_ONE_MINUS_DOT;
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+            }
+            //=========================
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown rgbGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -1260,7 +1439,21 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 			}
 			else if ( !Q_stricmp( token, "lightingSpecular" ) )
 			{
-				stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+                stage->alphaGen = AGEN_LIGHTING_SPECULAR;
+                //
+                // OPENMOHAA-specific stuff
+                //=========================
+				stage->alphaMax = 255;
+				stage->specOrigin[0] = -960;
+				stage->specOrigin[1] = 1980;
+				stage->specOrigin[2] = 96;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0]) {
+					stage->alphaMax = atof(token) * 255.0;
+					ParseVector(text, 3, stage->specOrigin);
+                }
+                //=========================
 			}
 			else if ( !Q_stricmp( token, "oneMinusVertex" ) )
 			{
@@ -1280,6 +1473,196 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 					shader.portalRange = atof( token );
 				}
 			}
+			//
+			// OPENMOHAA-specific stuff
+			//=========================
+			else if (!Q_stricmp(token, "global"))
+			{
+				stage->alphaGen = AGEN_GLOBAL_ALPHA;
+			}
+			else if (!Q_stricmp(token, "fromentity"))
+			{
+				stage->alphaGen = AGEN_ENTITY;
+			}
+			else if (!Q_stricmp(token, "fromclient"))
+			{
+				stage->alphaGen = AGEN_VERTEX;
+			}
+			else if (!Q_stricmp(token, "oneMinusFromClient"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_VERTEX;
+			}
+			else if (!Q_stricmp(token, "distFade") || !Q_stricmp(token, "oneMinusDistFade")
+				|| !Q_stricmp(token, "tikiDistFade") || !Q_stricmp(token, "oneMinusTikiDistFade"))
+			{
+				if (!Q_stricmp(token, "distFade")) {
+					stage->alphaGen = AGEN_DIST_FADE;
+				} else if (!Q_stricmp(token, "oneMinusDistFade")) {
+					stage->alphaGen = AGEN_ONE_MINUS_DIST_FADE;
+				} else if (!Q_stricmp(token, "tikiDistFade")) {
+                    stage->alphaGen = AGEN_TIKI_DIST_FADE;
+                } else {
+                    stage->alphaGen = AGEN_ONE_MINUS_TIKI_DIST_FADE;
+                }
+
+				shader.fDistNear = 256.0;
+				shader.fDistRange = 256.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistNear = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				shader.fDistRange = atof(token);
+			}
+			else if (!Q_stricmp(token, "dot"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "heightFade"))
+            {
+                stage->alphaMin = 256.0f;
+                stage->alphaMax = 512.0f;
+                stage->alphaGen = AGEN_HEIGHT_FADE;
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMin = atof(token);
+
+                token = COM_ParseExt(text, qfalse);
+                if (token[0] == 0) {
+                    continue;
+                }
+                stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDot"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "dotView"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "oneMinusDotView"))
+			{
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaGen = AGEN_ONE_MINUS_DOT_VIEW;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+			}
+			else if (!Q_stricmp(token, "constant"))
+			{
+				token = COM_ParseExt(text, qfalse);
+				stage->constantColor[3] = 255 * atof(token);
+				stage->alphaGen = AGEN_CONST;
+			}
+			else if (!Q_stricmp(token, "skyAlpha"))
+			{
+				stage->alphaGen = AGEN_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "oneMinusSkyAlpha"))
+			{
+				stage->alphaGen = AGEN_ONE_MINUS_SKYALPHA;
+			}
+			else if (!Q_stricmp(token, "sCoord") || !Q_stricmp(token, "tCoord"))
+			{
+				if (!Q_stricmp(token, "sCoord")) {
+					stage->alphaGen = AGEN_SCOORD;
+				} else {
+					stage->alphaGen = AGEN_TCOORD;
+				}
+
+				stage->alphaMin = 0.0;
+				stage->alphaMax = 1.0;
+				stage->alphaConstMin = 0;
+				stage->alphaConst = -1;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMin = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaMax = atof(token);
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					continue;
+				}
+				stage->alphaConstMin = atof(token) * 255.0;
+
+				token = COM_ParseExt(text, qfalse);
+				if (token[0] == 0) {
+					ri.Printf(PRINT_WARNING, "WARNING: missing alphaGen s or tCoord parm 'max' in shader '%s'\n", shader.name);
+					continue;
+				}
+				stage->alphaConst = atof(token) * 255.0;
+			}
+			//=========================
 			else
 			{
 				ri.Printf( PRINT_WARNING, "WARNING: unknown alphaGen parameter '%s' in shader '%s'\n", token, shader.name );
@@ -1300,22 +1683,22 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			if ( !Q_stricmp( token, "environment" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_ENVIRONMENT_MAPPED;
+				stage->bundle[cntBundle].tcGen = TCGEN_ENVIRONMENT_MAPPED;
 			}
 			else if ( !Q_stricmp( token, "lightmap" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_LIGHTMAP;
+				stage->bundle[cntBundle].tcGen = TCGEN_LIGHTMAP;
 			}
 			else if ( !Q_stricmp( token, "texture" ) || !Q_stricmp( token, "base" ) )
 			{
-				stage->bundle[0].tcGen = TCGEN_TEXTURE;
+				stage->bundle[cntBundle].tcGen = TCGEN_TEXTURE;
 			}
 			else if ( !Q_stricmp( token, "vector" ) )
 			{
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[0] );
-				ParseVector( text, 3, stage->bundle[0].tcGenVectors[1] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[0] );
+				ParseVector( text, 3, stage->bundle[cntBundle].tcGenVectors[1] );
 
-				stage->bundle[0].tcGen = TCGEN_VECTOR;
+				stage->bundle[cntBundle].tcGen = TCGEN_VECTOR;
 			}
 			else 
 			{
@@ -1352,6 +1735,156 @@ static qboolean ParseStage( shaderStage_t *stage, char **text )
 
 			continue;
 		}
+		//
+		// OPENMOHAA-specific stuff
+		//=========================
+		else if ( !Q_stricmp(token, "animMapOnce") || !Q_stricmp(token, "animMapPhase"))
+		{
+			qboolean phased;
+
+			if (!Q_stricmp(token, "animMapOnce")) {
+				stage->bundle[cntBundle].flags |= BUNDLE_ANIMATE_ONCE;
+			}
+
+			phased = !Q_stricmp(token, "animMapPhase");
+
+			token = COM_ParseExt( text, qfalse );
+			if ( !token[0] )
+			{
+				ri.Printf( PRINT_WARNING, "WARNING: missing parameter for 'animMmap' keyword in shader '%s'\n", shader.name );
+				return qfalse;
+			}
+			stage->bundle[cntBundle].imageAnimationSpeed = atof( token );
+			stage->bundle[cntBundle].imageAnimationPhase = 0;
+
+			if (phased)
+            {
+                token = COM_ParseExt(text, qfalse);
+                if (!token[0])
+                {
+                    ri.Printf(PRINT_WARNING, "WARNING: missing phase for 'animMapPhase' keyword in shader '%s'\n", shader.name);
+                    return qfalse;
+                }
+
+				stage->bundle[cntBundle].imageAnimationPhase = atof(token);
+			}
+			// parse up to MAX_IMAGE_ANIMATIONS animations
+			while ( 1 ) {
+				int		num;
+
+				token = COM_ParseExt( text, qfalse );
+				if ( !token[0] ) {
+					break;
+				}
+				num = stage->bundle[cntBundle].numImageAnimations;
+				if ( num < MAX_IMAGE_ANIMATIONS ) {
+					imgFlags_t flags = IMGFLAG_NONE;
+
+					if (!shader.noMipMaps)
+						flags |= IMGFLAG_MIPMAP;
+
+					if (!shader.noPicMip)
+						flags |= IMGFLAG_PICMIP;
+
+					stage->bundle[cntBundle].image[num] = R_FindImageFile( token, IMGTYPE_COLORALPHA, flags );
+					if ( !stage->bundle[cntBundle].image[num] )
+					{
+						ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
+						return qfalse;
+					}
+					stage->bundle[cntBundle].numImageAnimations++;
+				}
+			}
+		}
+		else if (!Q_stricmp(token, "nofog"))
+		{
+			// FIXME: unimplemented
+			continue;
+		}
+		else if (!Q_stricmp(token, "depthmask"))
+		{
+			depthMaskBits = GLS_DEPTHMASK_TRUE;
+			depthMaskExplicit = qtrue;
+
+			continue;
+        }
+        else if (!Q_stricmp(token, "nodepthwrite") || !Q_stricmp(token, "nodepthmask"))
+        {
+            depthMaskBits = 0;
+            depthMaskExplicit = qtrue;
+
+            continue;
+        }
+        else if (!Q_stricmp(token, "nocolorwrite") || !Q_stricmp(token, "nocolormask"))
+        {
+            colorBits = GLS_COLOR_NOMASK;
+
+            continue;
+        }
+		else if (!Q_stricmp(token, "noDepthTest"))
+		{
+			depthFuncBits = GLS_DEPTHTEST_DISABLE;
+			continue;
+        }
+        else if (!Q_stricmp(token, "nextBundle"))
+        {
+			//if (!qglActiveTextureARB) {
+			//	ri.Printf(PRINT_ALL, "WARNING: " PRODUCT_NAME " requires a video card with multitexturing capability\n");
+			//	return qfalse;
+			//}
+
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] && !Q_stricmp(token, "add")) {
+				//stage->multitextureEnv = GL_ADD;
+			} else {
+				//stage->multitextureEnv = GL_MODULATE;
+			}
+
+			cntBundle++;
+			if (cntBundle > NUM_TEXTURE_BUNDLES) {
+				ri.Printf(PRINT_WARNING, "WARNING: too many nextBundle commands in shader '%s'\n", shader.name);
+				return qfalse;
+			}
+            continue;
+        }
+		//
+		// Added in 2.0
+		//
+		else if (!Q_stricmp(token, "ifCvar") || !Q_stricmp(token, "ifCvarnot"))
+		{
+			cvar_t* var;
+			qboolean isNot = token[6] != 0;
+			qboolean evaluatedValue;
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar name in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			var = ri.Cvar_Get(token, "0", 0);
+
+			token = COM_ParseExt(text, qfalse);
+			if (!token[0]) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing cvar value in %s", isNot ? "ifCvarnot" : "ifCvar");
+				return qfalse;
+			}
+
+			if (atof(token) != var->value) {
+				evaluatedValue = qfalse;
+			} else if (var->value) {
+				evaluatedValue = qtrue;
+			} else if (token[0] == '0' || (token[0] == '.' && token[1] == '0')) {
+				evaluatedValue = qtrue;
+			} else if (!Q_stricmp(var->string, token)) {
+				evaluatedValue = qtrue;
+			} else {
+				return qfalse;
+			}
+
+			shouldProcess &= evaluatedValue ^ isNot;
+        }
+        //=========================
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown parameter '%s' in shader '%s'\n", token, shader.name );
@@ -1553,6 +2086,72 @@ static void ParseDeform( char **text ) {
 		return;
 	}
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+	if (!Q_stricmp(token, "lightglow")) {
+		ds->deformation = DEFORM_LIGHTGLOW;
+		return;
+	}
+
+	if (!Q_stricmp(token, "flap")) {
+		texDirection_t coordDirection;
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 's') {
+			coordDirection = USE_S_COORDS;
+		}
+		else if (token[0] == 't') {
+			coordDirection = USE_T_COORDS;
+		}
+		else {
+			ri.Printf(PRINT_WARNING, "WARNING: deformVertexes flap requires 's' or 't' in shader '%s'\n", shader.name);
+			return;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0) {
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes flap parm in shader '%s'\n", shader.name);
+			return;
+		}
+
+		if (!atof(token)) {
+			ds->deformationSpread = 100.0;
+			ri.Printf(PRINT_WARNING, "WARNING: illegal div value of 0 in deformVertexes command for shader '%s'\n", shader.name);
+		}
+		else {
+			ds->deformationSpread = 1.0 / atof(token);
+		}
+
+		ParseWaveForm(text, &ds->deformationWave);
+
+		if (coordDirection == USE_T_COORDS) {
+			ds->deformation = DEFORM_FLAP_T;
+		}
+		else {
+			ds->deformation = DEFORM_FLAP_S;
+		}
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ds->bulgeWidth = 0.0;
+			ds->bulgeHeight = 1.0;
+			return;
+		}
+		ds->bulgeWidth = atof(token);
+
+		token = COM_ParseExt(text, qfalse);
+		if (token[0] == 0)
+		{
+			ri.Printf(PRINT_WARNING, "WARNING: missing deformVertexes parm 'max' in shader '%s'\n\n", shader.name);
+			return;
+		}
+		ds->bulgeHeight = atof(token);
+		return;
+    }
+    //=========================
+
 	ri.Printf( PRINT_WARNING, "WARNING: unknown deformVertexes subtype '%s' found in shader '%s'\n", token, shader.name );
 }
 
@@ -1841,12 +2440,17 @@ static qboolean ParseShader( char **text )
 				tr.sunShadowScale = atof(token);
 
 				// parse twice, since older shaders may include mapLightScale before sunShadowScale
-				token = COM_ParseExt( text, qfalse );
-				if (token[0])
-					tr.sunShadowScale = atof(token);
+				if (token[0]) {
+					token = COM_ParseExt( text, qfalse );
+					if (token[0]) {
+						tr.sunShadowScale = atof(token);
+					}
+				}
 			}
 
-			SkipRestOfLine( text );
+			if (token[0]) {
+				SkipRestOfLine( text );
+			}
 			continue;
 		}
 		// tonemap parms
@@ -2003,6 +2607,53 @@ static qboolean ParseShader( char **text )
 			ParseSort( text );
 			continue;
 		}
+		//
+		// OPENMOHAA-specific stuff
+        //=========================
+        else if (!Q_stricmp(token, "noMerge"))
+        {
+			// FIXME: unimplemented
+            continue;
+		}
+		else if (!Q_stricmp(token, "spritegen"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritegen parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			if (!Q_stricmp(token, "parallel")) {
+				shader.sprite.type = SPRITE_PARALLEL;
+			} else if (!Q_stricmp(token, "parallel_oriented")) {
+				shader.sprite.type = SPRITE_PARALLEL_ORIENTED;
+			} else if (!Q_stricmp(token, "parallel_upright")) {
+				shader.sprite.type = SPRITE_PARALLEL_UPRIGHT;
+			} else if (!Q_stricmp(token, "oriented")) {
+				shader.sprite.type = SPRITE_ORIENTED;
+			}
+
+			shader.sprite.scale = 1.0;
+			continue;
+		}
+		else if (!Q_stricmp(token, "spritescale"))
+		{
+			token = COM_ParseExt(text, qfalse);
+			if (token[0] == 0) {
+				ri.Printf(PRINT_WARNING, "WARNING: missing spritescale parm in shader '%s'\n", shader.name);
+				continue;
+			}
+
+			shader.sprite.scale = atof(token);
+			continue;
+		}
+		// force 32 bit images
+		if (!Q_stricmp(token, "force32bit"))
+		{
+			shader.force32bit = qtrue;
+			continue;
+		}
+		//=========================
 		else
 		{
 			ri.Printf( PRINT_WARNING, "WARNING: unknown general shader parameter '%s' in '%s'\n", token, shader.name );
@@ -2580,13 +3231,15 @@ static int CollapseStagesToGLSL(void)
 		numStages++;
 	}
 
-	// convert any remaining lightmap stages to a lighting pass with a white texture
+	// convert any remaining lightmap stages with no blending or blendfunc filter
+	// to a lighting pass with a white texture
 	// only do this with r_sunlightMode non-zero, as it's only for correct shadows.
 	if (r_sunlightMode->integer && shader.numDeforms == 0)
 	{
 		for (i = 0; i < MAX_SHADER_STAGES; i++)
 		{
 			shaderStage_t *pStage = &stages[i];
+			int blendBits;
 
 			if (!pStage->active)
 				continue;
@@ -2594,15 +3247,23 @@ static int CollapseStagesToGLSL(void)
 			if (pStage->adjustColorsForFog)
 				continue;
 
-			if (pStage->bundle[TB_DIFFUSEMAP].tcGen == TCGEN_LIGHTMAP)
-			{
-				pStage->glslShaderGroup = tr.lightallShader;
-				pStage->glslShaderIndex = LIGHTDEF_USE_LIGHTMAP;
-				pStage->bundle[TB_LIGHTMAP] = pStage->bundle[TB_DIFFUSEMAP];
-				pStage->bundle[TB_DIFFUSEMAP].image[0] = tr.whiteImage;
-				pStage->bundle[TB_DIFFUSEMAP].isLightmap = qfalse;
-				pStage->bundle[TB_DIFFUSEMAP].tcGen = TCGEN_TEXTURE;
+			if (pStage->bundle[TB_DIFFUSEMAP].tcGen != TCGEN_LIGHTMAP)
+				continue;
+
+			blendBits = pStage->stateBits & (GLS_DSTBLEND_BITS | GLS_SRCBLEND_BITS);
+
+			if (blendBits != 0 &&
+				blendBits != (GLS_DSTBLEND_SRC_COLOR | GLS_SRCBLEND_ZERO) &&
+				blendBits != (GLS_DSTBLEND_ZERO | GLS_SRCBLEND_DST_COLOR)) {
+				continue;
 			}
+
+			pStage->glslShaderGroup = tr.lightallShader;
+			pStage->glslShaderIndex = LIGHTDEF_USE_LIGHTMAP;
+			pStage->bundle[TB_LIGHTMAP] = pStage->bundle[TB_DIFFUSEMAP];
+			pStage->bundle[TB_DIFFUSEMAP].image[0] = tr.whiteImage;
+			pStage->bundle[TB_DIFFUSEMAP].isLightmap = qfalse;
+			pStage->bundle[TB_DIFFUSEMAP].tcGen = TCGEN_TEXTURE;
 		}
 	}
 
@@ -2677,9 +3338,11 @@ static void FixRenderCommandList( int newShader ) {
 				int         pshadowMap;
 				int			sortedIndex;
 				const drawSurfsCommand_t *ds_cmd =  (const drawSurfsCommand_t *)curCmd;
+				qboolean	bStaticModel;
 
 				for( i = 0, drawSurf = ds_cmd->drawSurfs; i < ds_cmd->numDrawSurfs; i++, drawSurf++ ) {
-					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap, &pshadowMap );
+					R_DecomposeSort( drawSurf->sort, &entityNum, &shader, &fogNum, &dlightMap, &pshadowMap,
+						&bStaticModel );
                     sortedIndex = (( drawSurf->sort >> QSORT_SHADERNUM_SHIFT ) & (MAX_SHADERS-1));
 					if( sortedIndex >= newShader ) {
 						sortedIndex++;
@@ -2890,12 +3553,112 @@ static void VertexLightingCollapse( void ) {
 	}
 }
 
+/*
+=================
+FixFatLightmapTexCoords
+
+Handle edge cases of altering lightmap texcoords for fat lightmap atlas
+=================
+*/
+static void FixFatLightmapTexCoords(void)
+{
+	texModInfo_t *tmi;
+	int lightmapnum;
+	int stage;
+	int size;
+	int i;
+
+	if ( !r_mergeLightmaps->integer || tr.fatLightmapCols <= 0) {
+		return;
+	}
+
+	if ( shader.lightmapIndex < 0 ) {
+		// no internal lightmap, texcoords were not modified
+		return;
+	}
+
+	lightmapnum = shader_realLightmapIndex;
+
+	if (tr.worldDeluxeMapping)
+		lightmapnum >>= 1;
+
+	lightmapnum %= (tr.fatLightmapCols * tr.fatLightmapRows);
+
+	for ( stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t *pStage = &stages[stage];
+
+		if ( !pStage->active ) {
+			break;
+		}
+
+		if ( pStage->bundle[0].isLightmap ) {
+			// fix tcMod transform for internal lightmaps, it may be used by q3map2 lightstyles
+			if ( pStage->bundle[0].tcGen == TCGEN_LIGHTMAP ) {
+				for ( i = 0; i < pStage->bundle[0].numTexMods; i++ ) {
+					tmi = &pStage->bundle[0].texMods[i];
+
+					if ( tmi->type == TMOD_TRANSFORM ) {
+						tmi->translate[0] /= (float)tr.fatLightmapCols;
+						tmi->translate[1] /= (float)tr.fatLightmapRows;
+					}
+				}
+			}
+
+			// fix tcGen environment for internal lightmaps to be limited to the sub-image of the atlas
+			// this is done last so other tcMods are applied first in the 0.0 to 1.0 space
+			if ( pStage->bundle[0].tcGen == TCGEN_ENVIRONMENT_MAPPED ) {
+				if ( pStage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
+					ri.Printf( PRINT_DEVELOPER, "WARNING: too many tcmods to fix lightmap texcoords for r_mergeLightmaps in shader '%s'", shader.name );
+				} else {
+					tmi = &pStage->bundle[0].texMods[pStage->bundle[0].numTexMods];
+					pStage->bundle[0].numTexMods++;
+
+					tmi->matrix[0][0] = 1.0f / tr.fatLightmapCols;
+					tmi->matrix[0][1] = 0;
+					tmi->matrix[1][0] = 0;
+					tmi->matrix[1][1] = 1.0f / tr.fatLightmapRows;
+
+					tmi->translate[0] = ( lightmapnum % tr.fatLightmapCols ) / (float)tr.fatLightmapCols;
+					tmi->translate[1] = ( lightmapnum / tr.fatLightmapCols ) / (float)tr.fatLightmapRows;
+
+					tmi->type = TMOD_TRANSFORM;
+				}
+			}
+		}
+		// add a tcMod transform for external lightmaps to convert back to the original texcoords
+		else if ( pStage->bundle[0].tcGen == TCGEN_LIGHTMAP ) {
+			if ( pStage->bundle[0].numTexMods == TR_MAX_TEXMODS ) {
+				ri.Printf( PRINT_DEVELOPER, "WARNING: too many tcmods to fix lightmap texcoords for r_mergeLightmaps in shader '%s'", shader.name );
+			} else {
+				size = pStage->bundle[0].numTexMods * sizeof( texModInfo_t );
+
+				if ( size ) {
+					memmove( &pStage->bundle[0].texMods[1], &pStage->bundle[0].texMods[0], size );
+				}
+
+				tmi = &pStage->bundle[0].texMods[0];
+				pStage->bundle[0].numTexMods++;
+
+				tmi->matrix[0][0] = tr.fatLightmapCols;
+				tmi->matrix[0][1] = 0;
+				tmi->matrix[1][0] = 0;
+				tmi->matrix[1][1] = tr.fatLightmapRows;
+
+				tmi->translate[0] = -( lightmapnum % tr.fatLightmapCols );
+				tmi->translate[1] = -( lightmapnum / tr.fatLightmapCols );
+
+				tmi->type = TMOD_TRANSFORM;
+			}
+		}
+	}
+}
+
 /*
 ===============
 InitShader
 ===============
 */
-static void InitShader( const char *name, int lightmapIndex ) {
+static void InitShaderEx( const char *name, int lightmapIndex, int realLightmapIndex ) {
 	int i;
 
 	// clear the global shader
@@ -2904,6 +3667,7 @@ static void InitShader( const char *name, int lightmapIndex ) {
 
 	Q_strncpyz( shader.name, name, sizeof( shader.name ) );
 	shader.lightmapIndex = lightmapIndex;
+	shader_realLightmapIndex = realLightmapIndex;
 
 	for ( i = 0 ; i < MAX_SHADER_STAGES ; i++ ) {
 		stages[i].bundle[0].texMods = texMods[i];
@@ -2924,6 +3688,10 @@ static void InitShader( const char *name, int lightmapIndex ) {
 	}
 }
 
+static void InitShader( const char *name, int lightmapIndex ) {
+	InitShaderEx( name, lightmapIndex, lightmapIndex );
+}
+
 /*
 =========================
 FinishShader
@@ -2940,6 +3708,12 @@ static shader_t *FinishShader( void ) {
 	hasLightmapStage = qfalse;
 	vertexLightmap = qfalse;
 
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+    CreateMultistageFromBundle();
+    //=========================
+
 	//
 	// set sky stuff appropriate
 	//
@@ -3081,6 +3855,8 @@ static shader_t *FinishShader( void ) {
 		hasLightmapStage = qfalse;
 	}
 
+	FixFatLightmapTexCoords();
+
 	//
 	// look for multitexture potential
 	//
@@ -3243,6 +4019,10 @@ most world construction surfaces.
 ===============
 */
 shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImage ) {
+	return R_FindShaderEx( name, lightmapIndex, mipRawImage, lightmapIndex );
+}
+
+shader_t *R_FindShaderEx( const char *name, int lightmapIndex, qboolean mipRawImage, int realLightmapIndex ) {
 	char		strippedName[MAX_QPATH];
 	int			hash;
 	char		*shaderText;
@@ -3282,7 +4062,7 @@ shader_t *R_FindShader( const char *name, int lightmapIndex, qboolean mipRawImag
 		}
 	}
 
-	InitShader( strippedName, lightmapIndex );
+	InitShaderEx( strippedName, lightmapIndex, realLightmapIndex );
 
 	//
 	// attempt to define shader from an explicit parameter file
@@ -3898,3 +4678,78 @@ void R_InitShaders( void ) {
 
 	CreateExternalShaders();
 }
+
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+static void CreateMultistageFromBundle() {
+    int stage, bundle;
+	int i;
+
+	for (stage = 0; stage < MAX_SHADER_STAGES; stage++ ) {
+		shaderStage_t* pStage = &stages[stage];
+
+		if (!pStage->active) {
+			break;
+		}
+
+        if (pStage->bundle[TB_LIGHTMAP].isLightmap) {
+			shaderStage_t* newStage = NULL;
+
+			for (i = stage; i < MAX_SHADER_STAGES; i++) {
+				if (!stages[i].active) {
+					newStage = &stages[i];
+					break;
+				}
+			}
+
+			if (newStage) {
+				*newStage = *pStage;
+				newStage->stateBits = GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO | GLS_DEPTHFUNC_EQUAL;
+
+                newStage->bundle[TB_COLORMAP] = pStage->bundle[TB_LIGHTMAP];
+                memset(&newStage->bundle[TB_LIGHTMAP], 0, sizeof(textureBundle_t));
+				memset(&pStage->bundle[TB_LIGHTMAP], 0, sizeof(textureBundle_t));
+				stage = i;
+			}
+		}
+	}
+}
+
+//=========================
+
+qhandle_t RE_RefreshShaderNoMip(const char* name) {
+	shader_t* sh;
+	char strippedName[64];
+	int hash;
+
+	if (!name || !*name) {
+		return 0;
+	}
+
+    COM_StripExtension(name, strippedName, sizeof(strippedName));
+
+	hash = generateHashValue(strippedName, FILE_HASH_SIZE);
+	
+	for (sh = hashTable[hash]; sh; sh = sh->next) {
+		if (Q_stricmp(sh->name, strippedName) == 0) {
+			image_t* image;
+
+			image = sh->stages[0]->bundle[0].image[0];
+
+			if (image) {
+				sh->stages[0]->bundle[0].image[0] = R_RefreshImageFile(image->imgName, IMGTYPE_COLORALPHA, image->flags);
+			}
+
+			return sh->index;
+		}
+	}
+
+    sh = R_FindShader(name, -4, qfalse);
+	if (sh->defaultShader) {
+		return 0;
+	}
+
+    return sh->index;
+}
\ No newline at end of file
diff --git a/code/renderergl2/tr_sky.c b/code/renderergl2/tr_sky.c
index 94f68d26..c79f48f5 100644
--- a/code/renderergl2/tr_sky.c
+++ b/code/renderergl2/tr_sky.c
@@ -435,7 +435,7 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max
 */
 	{
 		shaderProgram_t *sp = &tr.lightallShader[0];
-		vec4_t vector;
+		vec4_t st[2];
 
 		GLSL_BindProgram(sp);
 		
@@ -453,11 +453,16 @@ static void DrawSkySide( struct image_s *image, const int mins[2], const int max
 		color[3] = 0.0f;
 		GLSL_SetUniformVec4(sp, UNIFORM_VERTCOLOR, color);
 
-		VectorSet4(vector, 1.0, 0.0, 0.0, 1.0);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX, vector);
-
-		VectorSet4(vector, 0.0, 0.0, 0.0, 0.0);
-		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXOFFTURB, vector);
+		VectorSet4(st[0], 1.0f, 0.0f, 0.0f, 0.0f);
+		VectorSet4(st[1], 0.0f, 1.0f, 0.0f, 0.0f);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX0, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX1, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX2, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX3, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX4, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX5, st[1]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX6, st[0]);
+		GLSL_SetUniformVec4(sp, UNIFORM_DIFFUSETEXMATRIX7, st[1]);
 
 		GLSL_SetUniformInt(sp, UNIFORM_ALPHATEST, 0);
 	}
diff --git a/code/renderergl2/tr_sky_portal.cpp b/code/renderergl2/tr_sky_portal.cpp
new file mode 100644
index 00000000..b2ce1a97
--- /dev/null
+++ b/code/renderergl2/tr_sky_portal.cpp
@@ -0,0 +1,254 @@
+/*
+===========================================================================
+Copyright (C) 2023 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sky_portal.cpp: sky portal
+
+#include "tr_local.h"
+
+/*
+=================
+R_Sky_Init
+
+=================
+*/
+void R_Sky_Init()
+{
+    tr.viewParms.isPortalSky = qfalse;
+    tr.portalsky.numSurfs    = 0;
+}
+
+/*
+=================
+R_Sky_Reset
+
+=================
+*/
+void R_Sky_Reset()
+{
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    tr.portalsky.mins[0]  = 8192.0;
+    tr.portalsky.mins[1]  = 8192.0;
+    tr.portalsky.mins[2]  = 8192.0;
+    tr.portalsky.maxs[0]  = -8192.0;
+    tr.portalsky.maxs[1]  = -8192.0;
+    tr.portalsky.maxs[2]  = -8192.0;
+    tr.portalsky.cntNode  = 0;
+    tr.portalsky.numSurfs = 0;
+}
+
+/*
+=================
+R_Sky_AddSurf
+
+=================
+*/
+void R_Sky_AddSurf(msurface_t *surf)
+{
+    if (tr.viewParms.isPortalSky) {
+        static int last_sky_warning = 0;
+
+        if (tr.refdef.time - 1000 > last_sky_warning) {
+            ri.Printf(3, "WARNING: sky being drawn in a sky portal!  Bad!  Bad!\n");
+            last_sky_warning = tr.refdef.time;
+        }
+
+        return;
+    }
+
+    if (tr.portalsky.numSurfs < 32) {
+        tr.portalsky.skySurfs[tr.portalsky.numSurfs++] = surf;
+    }
+
+    if (tr.portalsky.cntNode) {
+        int i;
+
+        for (i = 0; i < 3; i++) {
+            if (tr.portalsky.mins[i] >= tr.portalsky.cntNode->mins[i]) {
+                tr.portalsky.mins[i] = tr.portalsky.cntNode->mins[i];
+            }
+
+            if (tr.portalsky.maxs[i] >= tr.portalsky.cntNode->maxs[i]) {
+                tr.portalsky.maxs[i] = tr.portalsky.cntNode->maxs[i];
+            }
+        }
+    }
+}
+
+/*
+=================
+R_Sky_Render
+
+=================
+*/
+void R_Sky_Render()
+{
+    int         i;
+    viewParms_t newParms, oldParms;
+    mnode_t    *leaf;
+
+    if (!tr.portalsky.numSurfs) {
+        return;
+    }
+
+    if (!tr.refdef.sky_portal) {
+        return;
+    }
+
+    if (tr.skyRendered) {
+        // already rendered
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    for (i = 0; i < tr.portalsky.numSurfs; i++) {
+        if (!SurfIsOffscreen2(
+                (const srfBspSurface_t*)tr.portalsky.skySurfs[i]->data,
+                tr.portalsky.skySurfs[i]->shader,
+                ENTITYNUM_WORLD
+            )) {
+            break;
+        }
+    }
+
+    if (i == tr.portalsky.numSurfs) {
+        return;
+    }
+
+    oldParms = tr.viewParms;
+    newParms = tr.viewParms;
+
+    if (r_skyportal->integer) {
+        if (sscanf(
+                r_skyportal_origin->string,
+                "%f %f %f",
+                &newParms.or.origin[0],
+                &newParms.or.origin[1],
+                &newParms.or.origin[2]
+            )
+            != 3) {
+            ri.Printf(PRINT_WARNING, "WARNING: Invalid sky portal origin: %s\n", r_skyportal_origin->string);
+            return;
+        }
+    } else {
+        VectorCopy(tr.refdef.sky_origin, newParms.or.origin);
+        MatrixMultiply(newParms.or.axis, tr.refdef.sky_axis, newParms.or.axis);
+    }
+
+    VectorCopy(newParms.or.origin, newParms.pvsOrigin);
+    newParms.isPortalSky       = qtrue;
+    newParms.farplane_distance = tr.refdef.skybox_farplane;
+    newParms.renderTerrain     = tr.refdef.render_terrain;
+
+    if (oldParms.farplane_bias == 0.0 || oldParms.farplane_distance == 0.0) {
+        newParms.farplane_bias = 0.0;
+    } else {
+        newParms.farplane_bias = newParms.farplane_distance / oldParms.farplane_distance * oldParms.farplane_bias;
+    }
+
+    leaf = R_PointInLeaf(newParms.pvsOrigin);
+    if (leaf) {
+        R_RenderView(&newParms);
+    }
+
+    tr.viewParms = oldParms;
+
+    tr.portalsky.numSurfs = 0;
+    tr.skyRendered        = qtrue;
+
+    R_RotateForViewer();
+    R_SetupFrustum();
+}
+
+/*
+=================
+R_Sky_ChangeFrustum
+
+=================
+*/
+void R_Sky_ChangeFrustum()
+{
+    cplane_t *frust;
+    int       i;
+    vec3_t    bounds[2];
+    vec3_t    origin;
+    cplane_t  abouts[4];
+
+    VectorCopy(tr.portalsky.mins, bounds[0]);
+    VectorCopy(tr.portalsky.maxs, bounds[1]);
+    VectorCopy(tr.viewParms.or.origin, origin);
+
+    VectorCopy(tr.viewParms.or.axis[2], abouts[0].normal);
+    VectorNegate(tr.viewParms.or.axis[2], abouts[1].normal);
+    VectorCopy(tr.viewParms.or.axis[1], abouts[2].normal);
+    VectorNegate(tr.viewParms.or.axis[1], abouts[3].normal);
+
+    for (i = 0; i < 4; i++) {
+        cplane_t out;
+        int      i1;
+        float    leastfov = 99999;
+
+        frust = &tr.viewParms.frustum[i];
+
+        abouts[i].dist = DotProduct(tr.viewParms.or.origin, abouts[i].normal);
+        CrossProduct(frust->normal, abouts[i].normal, out.normal);
+
+        for (i1 = 0; i1 < 8; i1++) {
+            vec3_t point;
+            vec_t  distFromFrustum;
+            float  angle;
+            int    i2;
+
+            for (i2 = 0; i2 < 3; i2++) {
+                point[i2] = bounds[i1 % 3][i2];
+            }
+
+            VectorSubtract(point, origin, point);
+            distFromFrustum = DotProduct(point, frust->normal);
+            if (distFromFrustum <= 0) {
+                break;
+            }
+
+            angle = atan2(DotProduct(point, out.normal), distFromFrustum);
+            if (angle >= 0) {
+                angle = RAD2DEG(angle);
+                if (leastfov > angle) {
+                    leastfov = angle;
+                }
+            }
+        }
+
+        if (leastfov > 0 && leastfov < 180) {
+            RotatePointAroundVector(frust->normal, abouts[i].normal, frust->normal, leastfov);
+            VectorNormalize(frust->normal);
+
+            frust->type = PLANE_NON_AXIAL;
+            frust->dist = DotProduct(origin, frust->normal);
+            SetPlaneSignbits(frust);
+        }
+    }
+}
diff --git a/code/renderergl2/tr_sphere_shade.cpp b/code/renderergl2/tr_sphere_shade.cpp
new file mode 100644
index 00000000..3611d913
--- /dev/null
+++ b/code/renderergl2/tr_sphere_shade.cpp
@@ -0,0 +1,1465 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sphere_shade.cpp -- sphere shade
+
+#include "tr_local.h"
+
+typedef struct gatheredLight_s {
+    spherel_t       *pLight;
+    float            fIntensity;
+    gatheredLight_s *pPrev;
+    gatheredLight_s *pNext;
+} gatheredLight_t;
+
+// FIXME: unimplemlented (GL2)
+
+vec3_t          spheredef[6];
+suninfo_t       s_sun;
+static vec3_t   ambientlight;
+static qboolean bEntityOverbright;
+static int      iEntityLightingMax;
+static int      light_reference_count = 0;
+
+const float one_half_root  = 0.70710678118654752440084436210485f;
+const float one_third_root = 0.57735026918962576450914878050196f;
+
+static vec3_t offsets[26] = {
+    {1.0,             0.0,             0.0            },
+    {-1.0,            0.0,             0.0            },
+    {0.0,             1.0,             0.0            },
+    {0.0,             -1.0,            0.0            },
+    {0.0,             0.0,             1.0            },
+    {0.0,             0.0,             -1.0           },
+    {one_half_root,   one_half_root,   0.0            },
+    {one_half_root,   -one_half_root,  0.0            },
+    {-one_half_root,  one_half_root,   0.0            },
+    {-one_half_root,  -one_half_root,  0.0            },
+    {one_half_root,   0.0,             one_half_root  },
+    {one_half_root,   0.0,             -one_half_root },
+    {-one_half_root,  0.0,             one_half_root  },
+    {-one_half_root,  0.0,             -one_half_root },
+    {0.0,             one_half_root,   one_half_root  },
+    {0.0,             one_half_root,   -one_half_root },
+    {0.0,             -one_half_root,  one_half_root  },
+    {0.0,             -one_half_root,  -one_half_root },
+    {one_third_root,  one_third_root,  one_third_root },
+    {one_third_root,  one_third_root,  -one_third_root},
+    {one_third_root,  -one_third_root, one_third_root },
+    {one_third_root,  -one_third_root, -one_third_root},
+    {-one_third_root, one_third_root,  one_third_root },
+    {-one_third_root, one_third_root,  -one_third_root},
+    {-one_third_root, -one_third_root, one_third_root },
+    {-one_third_root, -one_third_root, -one_third_root}
+};
+
+int compare_light_intensities(const void *p1, const void *p2)
+{
+    return *(int *)&((const reallightinfo_t *)p2)->fIntensity - *(int *)&((const reallightinfo_t *)p1)->fIntensity;
+}
+
+static void RB_OptimizeLights()
+{
+    static int iCubeBuildInfo[24][9] = {
+        {0, 1, 2, 1,  1,  0, 6,  10, 18},
+        {0, 1, 2, 1,  -1, 0, 6,  11, 19},
+        {0, 1, 2, -1, 1,  0, 7,  10, 20},
+        {0, 1, 2, -1, -1, 0, 7,  11, 21},
+        {0, 1, 2, -1, -1, 1, 8,  12, 22},
+        {0, 1, 2, -1, 1,  1, 8,  13, 23},
+        {0, 1, 2, 1,  -1, 1, 9,  12, 24},
+        {0, 1, 2, 1,  1,  1, 9,  13, 25},
+        {1, 0, 2, 1,  1,  2, 6,  14, 18},
+        {1, 0, 2, 1,  -1, 2, 6,  15, 19},
+        {1, 0, 2, -1, -1, 3, 7,  16, 20},
+        {1, 0, 2, -1, 1,  3, 7,  17, 21},
+        {1, 0, 2, -1, 1,  2, 8,  14, 22},
+        {1, 0, 2, -1, -1, 2, 8,  15, 23},
+        {1, 0, 2, 1,  -1, 3, 9,  16, 24},
+        {1, 0, 2, 1,  1,  3, 9,  17, 25},
+        {2, 1, 0, 1,  1,  4, 14, 10, 18},
+        {2, 1, 0, -1, -1, 5, 15, 11, 19},
+        {2, 1, 0, -1, 1,  4, 16, 10, 20},
+        {2, 1, 0, 1,  -1, 5, 17, 11, 21},
+        {2, 1, 0, 1,  -1, 4, 14, 12, 22},
+        {2, 1, 0, -1, 1,  5, 15, 13, 23},
+        {2, 1, 0, -1, -1, 4, 16, 12, 24},
+        {2, 1, 0, 1,  1,  5, 17, 13, 25}
+    };
+    int    i, j;
+    int    nCubeMapLights;
+    float  fMaxIntensity;
+    vec3_t cubecolor[26];
+    vec3_t colorout;
+    float(*cube)[3][4];
+    reallightinfo_t *pLight;
+
+    nCubeMapLights = 0;
+
+    // FIXME: re-enable when cubemap light is fixed
+#if 0
+    if (backEnd.currentSphere->numRealLights > 2) {
+        qsort(
+            backEnd.currentSphere->light,
+            backEnd.currentSphere->numRealLights,
+            sizeof(reallightinfo_t),
+            compare_light_intensities
+        );
+
+        for (i = 0; i < backEnd.currentSphere->numRealLights && i < r_entlight_maxcalc->integer; i++) {
+            pLight = &backEnd.currentSphere->light[i];
+
+            if (pLight->fIntensity < r_entlight_cubelevel->value
+                || pLight->fIntensity * r_entlight_cubefraction->value > pLight->fIntensity) {
+                break;
+            }
+        }
+
+        nCubeMapLights = backEnd.currentSphere->numRealLights - i;
+        if (nCubeMapLights <= 1) {
+            nCubeMapLights = 0;
+        }
+    }
+#endif
+
+    backEnd.currentSphere->bUsesCubeMap = nCubeMapLights > 0;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        for (i = 0; i < 26; i++) {
+            float  fDot;
+            vec3_t v;
+
+            colorout[0] = backEnd.currentSphere->ambient.level[0];
+            colorout[1] = backEnd.currentSphere->ambient.level[1];
+            colorout[2] = backEnd.currentSphere->ambient.level[2];
+
+            for (j = backEnd.currentSphere->numRealLights - nCubeMapLights; j < backEnd.currentSphere->numRealLights;
+                 j++) {
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_SPOT:
+                    {
+                        fDot = DotProduct(pLight->vDirection, offsets[i]);
+                        if (fDot > 0) {
+                            float fProjSquared;
+                            float fDistSquared;
+
+                            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                            fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                            fDistSquared  = VectorLengthSquared(v);
+                            fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                            if (fMaxIntensity > 0) {
+                                fDot /= fDistSquared;
+                                if (fMaxIntensity < 1) {
+                                    fDot *= fMaxIntensity;
+                                }
+
+                                VectorMA(colorout, fDot, pLight->color, colorout);
+                            }
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        float fDistSquared;
+
+                        VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                        fDistSquared = VectorLengthSquared(v);
+
+                        fDot /= fDistSquared;
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, offsets[i]);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+                    fDot = DotProduct(v, offsets[i]);
+                    if (fDot > 0) {
+                        fDot /= VectorLengthSquared(v);
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                default:
+                    assert(!"unhandled light type");
+                    break;
+                }
+            }
+
+            cubecolor[i][0] = Q_min(colorout[0], 255);
+            cubecolor[i][1] = Q_min(colorout[1], 255);
+            cubecolor[i][2] = Q_min(colorout[2], 255);
+        }
+
+        cube = backEnd.currentSphere->cubemap;
+
+        for (i = 0; i < 24; i++) {
+            for (j = 0; j < 3; j++) {
+                vec4_t f;
+
+                f[0] = cubecolor[iCubeBuildInfo[i][5]][j];
+                f[1] = cubecolor[iCubeBuildInfo[i][6]][j];
+                f[2] = cubecolor[iCubeBuildInfo[i][7]][j];
+                f[3] = cubecolor[iCubeBuildInfo[i][8]][j];
+
+                cube[i][j][0] = f[0];
+                cube[i][j][1] = (f[1] - f[0]) * iCubeBuildInfo[i][3];
+                cube[i][j][2] = (f[2] - f[0]) * iCubeBuildInfo[i][4];
+                cube[i][j][3] = (f[0] - f[1] - f[2] + f[3]) * iCubeBuildInfo[i][3] * iCubeBuildInfo[i][4];
+            }
+        }
+
+        backEnd.currentSphere->numRealLights -= nCubeMapLights;
+    }
+
+    for (i = 0; i < backEnd.currentSphere->numRealLights; i++) {
+        float  fDistParallel;
+        float  fDistPerp;
+        float  fDistSquared;
+        float  fRadiusSquared;
+        float  fSlope;
+        vec3_t v;
+
+        pLight = &backEnd.currentSphere->light[i];
+
+        switch (pLight->eType) {
+        case LIGHT_SPOT:
+            VectorSubtract(pLight->vOrigin, backEnd.currentSphere->origin, v);
+            fDistSquared   = VectorLengthSquared(v);
+            fSlope         = DotProduct(v, pLight->vDirection);
+            fDistPerp      = sqrt(fDistSquared - Square(fSlope));
+            fRadiusSquared = Square(backEnd.currentSphere->radius);
+            fDistParallel  = fDistPerp + fSlope * (pLight->fSpotSlope * 0.9f);
+            if (Square(fDistParallel) >= fRadiusSquared + Square(pLight->fSpotSlope * 0.9f) * fRadiusSquared) {
+                pLight->eType = LIGHT_SPOT_FAST;
+            }
+            break;
+        case LIGHT_POINT:
+            if ((pLight->fDist - backEnd.currentSphere->radius) * r_entlight_errbound->value * pLight->fDist
+                > backEnd.currentSphere->radius * pLight->fIntensity) {
+                pLight->eType = LIGHT_DIRECTIONAL;
+
+                VectorScale(pLight->color, 1.0f / pLight->fDist, pLight->color);
+                VectorNormalize2(pLight->vOrigin, pLight->vDirection);
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static void RB_Light_CubeMap(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           colorout;
+    reallightinfo_t *pLight;
+
+    color  = colors;
+    normal = (float *)tess.normal;
+    xyz    = (float *)tess.xyz;
+
+    for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+        unsigned int components[3];
+
+        if (normal[1] == -1) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (normal[1] == 1 && !normal[0] && !normal[2]) {
+            components[0] = 1;
+            components[1] = 0;
+            components[2] = 2;
+        } else if (Q_fabs(normal[0]) >= Q_fabs(normal[2])) {
+            components[0] = 0;
+            components[1] = 1;
+            components[2] = 2;
+        } else {
+            components[0] = 2;
+            components[1] = 1;
+            components[2] = 0;
+        }
+
+        unsigned int cubeIndex =
+            (normal[2] < 0 ? 1 : 0) | (normal[1] < 0 ? 2 : 0) | (normal[0] < 0 ? 4 : 0) | (components[0] << 3);
+        float newnorms[3];
+        float mapping[3];
+        float(*cube)[3][4];
+
+        newnorms[0] = normal[components[0]];
+        newnorms[1] = normal[components[1]];
+        newnorms[2] = normal[components[2]];
+
+        mapping[0] = 1.f / newnorms[0] * newnorms[1];
+        mapping[1] = 1.f / newnorms[0] * newnorms[2];
+        mapping[2] = mapping[0] * mapping[1];
+
+        cube = &backEnd.currentSphere->cubemap[cubeIndex];
+        colorout[0] =
+            (*cube)[0][0] + (*cube)[0][1] * mapping[0] + (*cube)[0][2] * mapping[1] + (*cube)[0][3] * mapping[2];
+        colorout[1] =
+            (*cube)[1][0] + (*cube)[1][1] * mapping[0] + (*cube)[1][2] * mapping[1] + (*cube)[1][3] * mapping[2];
+        colorout[2] =
+            (*cube)[2][0] + (*cube)[2][1] * mapping[0] + (*cube)[2][2] * mapping[1] + (*cube)[2][3] * mapping[2];
+
+        for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+            float  fDistSquared;
+            float  fProjSquared;
+            float  fMaxIntensity;
+            float  fDot;
+            vec3_t v;
+
+            pLight = &backEnd.currentSphere->light[j];
+
+            switch (pLight->eType) {
+            case LIGHT_DIRECTIONAL:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorMA(colorout, fDot, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_SPOT:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = DotProduct(v, pLight->vDirection) * DotProduct(v, pLight->vDirection);
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                }
+                break;
+            case LIGHT_SPOT_FAST:
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            case LIGHT_POINT:
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                }
+                break;
+            }
+        }
+
+        color[0] = Q_min(colorout[0], 255);
+        color[1] = Q_min(colorout[1], 255);
+        color[2] = Q_min(colorout[2], 255);
+        color[3] = 0xff;
+    }
+}
+
+void RB_Light_Real(unsigned char *colors)
+{
+    int              i, j;
+    float           *normal;
+    float           *xyz;
+    unsigned char   *color;
+    vec3_t           v;
+    vec3_t           colorout;
+    float            fDot;
+    reallightinfo_t *pLight;
+
+    color = colors;
+    if (backEnd.currentSphere->bUsesCubeMap) {
+        RB_Light_CubeMap(colors);
+        return;
+    }
+
+    if (!backEnd.currentSphere->numRealLights) {
+        for (i = 0; i < tess.numVertexes; i++, color += 4) {
+            color[0] = backEnd.currentSphere->ambient.level[0];
+            color[1] = backEnd.currentSphere->ambient.level[1];
+            color[2] = backEnd.currentSphere->ambient.level[2];
+            color[3] = backEnd.currentSphere->ambient.level[3];
+        }
+        return;
+    }
+
+    if (backEnd.currentSphere->numRealLights != 1) {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+            colorout[0] = colorout[1] = colorout[2] = 0;
+
+            for (j = 0; j < backEnd.currentSphere->numRealLights; j++) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                pLight = &backEnd.currentSphere->light[j];
+
+                switch (pLight->eType) {
+                case LIGHT_DIRECTIONAL:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorMA(colorout, fDot, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_SPOT:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+
+                        fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                        fDistSquared  = VectorLengthSquared(v);
+                        fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                        if (fMaxIntensity > 0) {
+                            fDot /= fDistSquared;
+                            if (fMaxIntensity < 1) {
+                                fDot *= fMaxIntensity;
+                            }
+
+                            VectorMA(colorout, fDot, pLight->color, colorout);
+                        }
+                    }
+                    break;
+                case LIGHT_SPOT_FAST:
+                    fDot = DotProduct(pLight->vDirection, normal);
+                    if (fDot > 0) {
+                        VectorSubtract(pLight->vOrigin, xyz, v);
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                case LIGHT_POINT:
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDot = DotProduct(v, normal);
+                    if (fDot > 0) {
+                        fDistSquared = VectorLengthSquared(v);
+                        VectorMA(colorout, fDot / fDistSquared, pLight->color, colorout);
+                    }
+                    break;
+                }
+            }
+
+            color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+            color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+            color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+            color[3] = 0xff;
+        }
+    } else {
+        normal = (float *)tess.normal;
+        xyz    = (float *)tess.xyz;
+
+        pLight = &backEnd.currentSphere->light[0];
+
+        switch (backEnd.currentSphere->light[0].eType) {
+        case LIGHT_DIRECTIONAL:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorScale(pLight->color, fDot, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        case LIGHT_SPOT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                float fDistSquared;
+                float fProjSquared;
+                float fMaxIntensity;
+
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+
+                    fProjSquared  = Square(DotProduct(v, pLight->vDirection));
+                    fDistSquared  = VectorLengthSquared(v);
+                    fMaxIntensity = (pLight->fSpotConst - fDistSquared / fProjSquared) * pLight->fSpotScale;
+                    if (fMaxIntensity > 0) {
+                        fDot /= fDistSquared;
+                        if (fMaxIntensity < 1) {
+                            fDot *= fMaxIntensity;
+                        }
+
+                        VectorScale(pLight->color, fDot, colorout);
+
+                        color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                        color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                        color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                        color[3] = 0xff;
+                    }
+                }
+            }
+            break;
+        case LIGHT_SPOT_FAST:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                color[0] = backEnd.currentSphere->ambient.level[0];
+                color[1] = backEnd.currentSphere->ambient.level[1];
+                color[2] = backEnd.currentSphere->ambient.level[2];
+                color[3] = backEnd.currentSphere->ambient.level[3];
+
+                fDot = DotProduct(pLight->vDirection, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    VectorSubtract(pLight->vOrigin, xyz, v);
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                }
+            }
+            break;
+        case LIGHT_POINT:
+            for (i = 0; i < tess.numVertexes; i++, xyz += 4, normal += 4, color += 4) {
+                VectorSubtract(pLight->vOrigin, xyz, v);
+                fDot = DotProduct(v, normal);
+                if (fDot > 0) {
+                    float fDistSquared;
+
+                    fDistSquared = VectorLengthSquared(v);
+                    VectorScale(pLight->color, fDot / fDistSquared, colorout);
+
+                    color[0] = Q_clamp_int((int)colorout[0] + backEnd.currentSphere->ambient.level[0], 0, 255);
+                    color[1] = Q_clamp_int((int)colorout[1] + backEnd.currentSphere->ambient.level[1], 0, 255);
+                    color[2] = Q_clamp_int((int)colorout[2] + backEnd.currentSphere->ambient.level[2], 0, 255);
+                    color[3] = 0xff;
+                } else {
+                    color[0] = backEnd.currentSphere->ambient.level[0];
+                    color[1] = backEnd.currentSphere->ambient.level[1];
+                    color[2] = backEnd.currentSphere->ambient.level[2];
+                    color[3] = backEnd.currentSphere->ambient.level[3];
+                }
+            }
+            break;
+        }
+    }
+}
+
+static void RB_Sphere_Light_Sun()
+{
+    int      curleaf;
+    qboolean hitSun;
+    vec3_t   end;
+    mnode_t *leaf;
+    trace_t  trace;
+
+    if (!s_sun.exists) {
+        return;
+    }
+
+    if (tr.world->vis && backEnd.currentSphere->leaves[0] && tr.sSunLight.leaf == (struct mnode_s *)-1) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            if (leaf->numlights && leaf->lights[0] == &tr.sSunLight) {
+                break;
+            }
+        }
+
+        if (!leaf || (leaf->lights && leaf->lights[0] != &tr.sSunLight)) {
+            if (r_light_sun_line->integer) {
+                VectorMA(backEnd.currentSphere->worldOrigin, 16384.0, s_sun.direction, end);
+
+                VectorCopy(backEnd.currentEntity->e.origin, temppos);
+                MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+                GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+                // FIXME: unimplemented
+#if 0
+                qglPushMatrix();
+
+                qglLoadMatrixf(backEnd.or.modelMatrix);
+                // Clear the depth range
+                qglDepthRange(0.0, 0.0);
+
+                qglDisable(GL_TEXTURE_2D);
+
+                qglBegin(GL_LINES);
+                qglColor3f(0.0, 0.0, 0.0);
+                qglVertex3fv(backEnd.currentSphere->origin);
+                qglColor3f(0.5, 0.5, 0.5);
+                qglVertex3fv(transpos);
+                qglEnd();
+
+                qglEnable(GL_TEXTURE_2D);
+
+                // Bring the depth range back
+                qglDepthRange(0.0, 1.0);
+
+                qglPopMatrix();
+#endif
+            }
+
+            return;
+        }
+    }
+
+    VectorMA(backEnd.currentSphere->traceOrigin, 16384.0, s_sun.direction, end);
+    ri.CM_BoxTrace(
+        &trace, backEnd.currentSphere->traceOrigin, end, vec3_origin, vec3_origin, 0, CONTENTS_SOLID | CONTENTS_FENCE, 0
+    );
+
+    hitSun = (trace.surfaceFlags >> 2) & 1;
+    if (r_light_sun_line->integer) {
+        vec3_t transpos;
+        vec3_t temppos;
+
+        VectorSubtract(trace.endpos, backEnd.currentEntity->e.origin, temppos);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, temppos, transpos);
+
+        GL_State(GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE);
+
+        // FIXME: unimplemented
+#if 0
+        qglPushMatrix();
+
+        qglLoadMatrixf(backEnd.or.modelMatrix);
+        // Clear the depth range
+        qglDepthRange(0.0, 0.0);
+
+        qglDisable(GL_TEXTURE_2D);
+
+        qglBegin(GL_LINES);
+
+        if (hitSun) {
+            qglColor3f(1.0, 1.0, 0.0);
+        } else {
+            qglColor3f(0.0, 0.0, 0.0);
+        }
+
+        qglVertex3fv(backEnd.currentSphere->origin);
+        qglColor3f(0.5, 0.5, 0.5);
+        qglVertex3fv(transpos);
+        qglEnd();
+
+        qglEnable(GL_TEXTURE_2D);
+
+        // Bring the depth range back
+        qglDepthRange(0.0, 1.0);
+
+        qglPopMatrix();
+#endif
+    }
+
+    if (hitSun) {
+        vec3_t           sunnormal;
+        sphereor_t      *pSphere;
+        reallightinfo_t *pLight;
+
+        pSphere = backEnd.currentSphere;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, s_sun.direction, sunnormal);
+
+        pLight = &pSphere->light[pSphere->numRealLights];
+        VectorScale(s_sun.color, r_entlight_scale->value, pLight->color);
+        //VectorScale(s_sun.color, r_entlight_scale->value * tr.overbrightMult, pLight->color);
+
+        VectorCopy(sunnormal, pLight->vDirection);
+        pLight->eType      = LIGHT_DIRECTIONAL;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        pSphere->numRealLights++;
+    }
+}
+
+static qboolean RB_Sphere_CalculateSphereOrigin()
+{
+    vec3_t        *axis;
+    vec3_t         sphereOrigin;
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    axis = backEnd.currentEntity->e.axis;
+    if (!backEnd.currentEntity->e.tiki) {
+        return qfalse;
+    }
+
+    backEnd.currentSphere->radius = backEnd.currentEntity->e.radius;
+    VectorCopy(backEnd.currentEntity->e.lightingOrigin, backEnd.currentSphere->worldOrigin);
+
+    VectorSubtract(backEnd.currentSphere->worldOrigin, backEnd.currentEntity->e.origin, sphereOrigin);
+    MatrixTransformVectorRight(axis, sphereOrigin, backEnd.currentSphere->origin);
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+
+    return qtrue;
+}
+
+static bool RB_Sphere_SetupGlobals()
+{
+    int i;
+
+    if ((backEnd.refdef.rdflags & RDF_NOWORLDMODEL) && !(backEnd.refdef.rdflags & RDF_HUD)) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+        return false;
+    }
+
+    if (backEnd.refdef.rdflags & RDF_HUD) {
+        if (!backEnd.refdef.vieworg[0] && !backEnd.refdef.vieworg[1] && !backEnd.refdef.vieworg[2]) {
+            backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+            return false;
+        }
+
+        VectorCopy(backEnd.refdef.vieworg, backEnd.currentSphere->worldOrigin);
+        VectorClear(backEnd.currentSphere->origin);
+        backEnd.currentSphere->radius = 2.0;
+    } else if (!RB_Sphere_CalculateSphereOrigin()) {
+        backEnd.currentSphere->TessFunction = &RB_CalcLightGridColor;
+
+        if (!backEnd.currentEntity->lightingCalculated) {
+            RB_SetupEntityGridLighting();
+        }
+
+        return false;
+    }
+
+    light_reference_count++;
+    for (i = 0; i < 8; i++) {
+        backEnd.currentSphere->leaves[i] = 0;
+    }
+
+    R_SphereInLeafs(
+        backEnd.currentSphere->worldOrigin, backEnd.currentSphere->radius, backEnd.currentSphere->leaves, 8
+    );
+
+    backEnd.currentSphere->TessFunction = &RB_Light_Real;
+    return true;
+}
+
+static bool RB_Sphere_ResetPointColors()
+{
+    vec3_t light_offset, amb_light_offset, amb;
+
+    R_GetLightingGridValue(tr.world, backEnd.currentSphere->worldOrigin, light_offset, amb_light_offset);
+    light_offset[0] = ambientlight[0] + light_offset[0] * 0.18;
+    light_offset[1] = ambientlight[1] + light_offset[1] * 0.18;
+    light_offset[2] = ambientlight[2] + light_offset[2] * 0.18;
+    if (tr.refdef.rdflags & RDF_FULLBRIGHT) {
+        float fMin = tr.identityLight * 20.0;
+
+        if (fMin <= light_offset[0] || fMin <= light_offset[1] || fMin <= light_offset[2]) {
+            light_offset[0] += fMin;
+            light_offset[1] += fMin;
+            light_offset[2] += fMin;
+        }
+    }
+
+    VectorScale(amb_light_offset, tr.overbrightMult * r_entlight_scale->value, amb);
+    backEnd.currentSphere->ambient.level[0] = Q_min(amb[0], 0xff);
+    backEnd.currentSphere->ambient.level[1] = Q_min(amb[1], 0xff);
+    backEnd.currentSphere->ambient.level[2] = Q_min(amb[2], 0xff);
+    backEnd.currentSphere->ambient.level[3] = 0xff;
+
+    return true;
+}
+
+static void RB_Sphere_DrawDebugLine(const spherel_t *thislight, float falloff, const vec3_t origin)
+{
+    int    i;
+    vec3_t newColor;
+    vec3_t fakeLine, fakeLine2;
+
+    if (!r_light_lines->integer) {
+        return;
+    }
+
+    // FIXME: unimplemented
+#if 0
+    qglPushMatrix();
+
+    qglLoadMatrixf(backEnd.or.modelMatrix);
+    // Clear the depth range
+    qglDepthRange(0.0, 0.0);
+
+    qglDisable(GL_TEXTURE_2D);
+
+    if (r_light_lines->integer == 2) {
+        newColor[0] = thislight->color[0] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[1] = thislight->color[1] * (falloff * r_entlight_scale->value / 255.0);
+        newColor[2] = thislight->color[2] * (falloff * r_entlight_scale->value / 255.0);
+
+        if (newColor[0] > 1 || newColor[1] > 1 || newColor[2] > 1) {
+            NormalizeColor(newColor, newColor);
+        }
+    } else if (thislight->spot_light) {
+        newColor[0] = 1.0;
+        newColor[1] = 0.7;
+        newColor[2] = 0.7;
+    } else {
+        newColor[0] = 1.0;
+        newColor[1] = 1.0;
+        newColor[2] = 1.0;
+    }
+
+    qglColor3f(newColor[0], newColor[1], newColor[2]);
+
+    qglBegin(GL_LINES);
+    qglVertex3fv(origin);
+    qglVertex3fv(backEnd.currentSphere->origin);
+
+    for (i = 0; i < 5; i += 2) {
+        VectorMA(origin, 16.0, spheredef[i], fakeLine);
+        VectorMA(origin, -16.0, spheredef[i], fakeLine2);
+
+        qglVertex3fv(fakeLine);
+        qglVertex3fv(fakeLine2);
+    }
+
+    if (thislight->spot_light) {
+        qglColor3f(0.7, 1.0, 0.7);
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, fakeLine);
+        VectorMA(origin, 32.0, fakeLine, fakeLine);
+
+        qglVertex3fv(origin);
+        qglVertex3fv(fakeLine);
+    }
+
+    qglEnd();
+    qglEnable(GL_TEXTURE_2D);
+    // Restore depth
+    qglDepthRange(0.0, 1.0);
+    qglPopMatrix();
+#endif
+}
+
+static void RB_Sphere_AddSpotLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    vec3_t newdir;
+    float  falloff;
+    float  dot;
+    float  radiusByDistance;
+    float  radiusAtDist;
+    float  sampleRadius;
+    vec3_t pointAtDist;
+
+    radiusByDistance = thislight->spot_radiusbydistance;
+    if (radiusByDistance < 0) {
+        vec3_t proj;
+        vec3_t delta;
+        float  distfromcentroid;
+
+        dot =
+            -(DotProduct(backEnd.currentSphere->worldOrigin, thislight->spot_dir)
+              - DotProduct(thislight->origin, thislight->spot_dir));
+        VectorMA(thislight->origin, dot, thislight->spot_dir, proj);
+        VectorSubtract(proj, thislight->origin, delta);
+
+        distfromcentroid = VectorLengthSquared(delta);
+        if (distfromcentroid > radiusByDistance * radiusByDistance) {
+            VectorScale(delta, -radiusByDistance / sqrt(distfromcentroid), delta);
+        }
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        VectorAdd(lightorigin, delta, lightorigin);
+    } else {
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+    }
+
+    MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+    VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+    falloff = thislight->intensity * 7500.0 / VectorLengthSquared(newlight);
+    if (falloff >= 5.0) {
+        reallightinfo_t *pLight;
+        float            fMinDist;
+        float            fRadByDistSquared;
+
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, thislight->spot_dir, newdir);
+        dot = -DotProduct(newlight, newdir);
+        if (dot > 0) {
+            fMinDist = sqrt(
+                Square(newlight[0] + newdir[0] * dot) + Square(newlight[1] + newdir[1] * dot)
+                + Square(newlight[2] + newdir[2] * dot)
+            );
+
+            if (fMinDist < radiusByDistance * dot && backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                pLight->eType = LIGHT_SPOT;
+                VectorScale(thislight->color, thislight->intensity * 7500.0 * tr.overbrightMult, pLight->color);
+                pLight->fDist = VectorLength(newlight);
+                pLight->fIntensity =
+                    (thislight->color[0] * 0.299f + thislight->color[1] * 0.587f + thislight->color[2] * 0.114f)
+                    * (thislight->intensity * 7500.0 * tr.overbrightMult);
+
+                sampleRadius = pLight->fDist - backEnd.currentSphere->radius;
+                if (sampleRadius > 0) {
+                    pLight->fIntensity /= (sampleRadius * sampleRadius);
+                }
+
+                VectorCopy(lightline, pLight->vOrigin);
+                VectorNegate(newdir, pLight->vDirection);
+                fRadByDistSquared  = radiusByDistance * radiusByDistance;
+                pLight->fSpotConst = fRadByDistSquared + 1.0;
+                pLight->fSpotScale = 1.0 / (fRadByDistSquared * 0.19);
+                pLight->fSpotSlope = radiusByDistance;
+
+                backEnd.currentSphere->numRealLights++;
+            }
+
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+        }
+    }
+}
+
+static void RB_Sphere_AddLight(const spherel_t *thislight)
+{
+    vec3_t lightorigin;
+    vec3_t newlight;
+    vec3_t lightline;
+    float  intensity;
+    float  falloff;
+
+    if (thislight->intensity > 0 && (backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->intensity < 0 && !(backEnd.currentEntity->e.renderfx & RF_INVISIBLE)) {
+        return;
+    }
+
+    if (thislight->needs_trace) {
+        trace_t trace;
+        ri.CM_BoxTrace(
+            &trace,
+            backEnd.currentSphere->traceOrigin,
+            thislight->origin,
+            vec3_origin,
+            vec3_origin,
+            0,
+            CONTENTS_SOLID,
+            0
+        );
+
+        if (trace.fraction < 1) {
+            return;
+        }
+    }
+
+    if (!thislight->spot_light) {
+        reallightinfo_t *pLight;
+        float            fDist;
+        float            fRadius;
+
+        VectorSubtract(thislight->origin, backEnd.currentEntity->e.origin, lightorigin);
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, lightline);
+        VectorSubtract(lightline, backEnd.currentSphere->origin, newlight);
+
+        intensity = fabs(thislight->intensity) * 7500.0;
+        falloff   = 1.f / VectorLengthSquared(newlight) * intensity;
+        if (falloff >= 5.0) {
+            RB_Sphere_DrawDebugLine(thislight, falloff, lightline);
+
+            if (backEnd.currentSphere->numRealLights < MAX_REAL_LIGHTS) {
+                pLight = &backEnd.currentSphere->light[backEnd.currentSphere->numRealLights];
+
+                fDist = VectorLength(newlight);
+                VectorScale(
+                    thislight->color, falloff * tr.overbrightMult * r_entlight_scale->value * fDist, pLight->color
+                );
+
+                VectorCopy(lightline, pLight->vOrigin);
+                pLight->fDist      = fDist;
+                pLight->eType      = LIGHT_POINT;
+                pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+                fRadius = fDist - backEnd.currentSphere->radius;
+                if (fRadius > 0) {
+                    pLight->fIntensity /= fRadius;
+                }
+
+                backEnd.currentSphere->numRealLights++;
+            }
+        }
+    } else {
+        RB_Sphere_AddSpotLight(thislight);
+    }
+}
+
+static void RB_Sphere_BuildStaticLights()
+{
+    int      i;
+    int      curleaf;
+    mnode_t *leaf;
+
+    if (tr.world->vis) {
+        int cntarea;
+
+        for (curleaf = 0; curleaf < 8; curleaf++) {
+            leaf = backEnd.currentSphere->leaves[curleaf];
+            if (!leaf) {
+                break;
+            }
+
+            cntarea = leaf->numlights;
+
+            if (cntarea) {
+                for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < cntarea; i++) {
+                    spherel_t *pLight = leaf->lights[i];
+                    byte       mask   = backEnd.refdef.areamask[pLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pLight->leaf->area & 7))) && pLight->reference_count != light_reference_count) {
+                        RB_Sphere_AddLight(pLight);
+                        pLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            RB_Sphere_AddLight(&tr.sLights[i]);
+        }
+    }
+}
+
+void RB_Sphere_BuildDLights()
+{
+    int              i;
+    float            length;
+    vec3_t           lightorigin;
+    vec3_t           delta;
+    float            scale;
+    float            fRadius;
+    sphereor_t      *pSphere;
+    reallightinfo_t *pLight;
+
+    pSphere                             = backEnd.currentSphere;
+    backEnd.currentSphere->TessFunction = RB_Light_Real;
+
+    for (i = 0; i < backEnd.refdef.num_dlights && pSphere->numRealLights < MAX_REAL_LIGHTS; i++) {
+        VectorSubtract(backEnd.refdef.dlights[i].origin, pSphere->worldOrigin, delta);
+        length = VectorLength(delta);
+
+        fRadius = backEnd.refdef.dlights[i].radius + pSphere->radius;
+        if (fRadius < length) {
+            continue;
+        }
+
+        VectorSubtract(backEnd.refdef.dlights[i].origin, backEnd.currentEntity->e.origin, lightorigin);
+        scale  = r_entlight_scale->value * tr.overbrightMult * 7500.0 * backEnd.refdef.dlights[i].radius / length;
+        pLight = &pSphere->light[pSphere->numRealLights];
+        pLight->color[0] = scale * backEnd.refdef.dlights[i].color[0];
+        pLight->color[1] = scale * backEnd.refdef.dlights[i].color[1];
+        pLight->color[2] = scale * backEnd.refdef.dlights[i].color[2];
+        MatrixTransformVectorRight(backEnd.currentEntity->e.axis, lightorigin, pLight->vOrigin);
+
+        pLight->eType      = LIGHT_POINT;
+        pLight->fDist      = length;
+        pLight->fIntensity = pLight->color[0] * 0.299f + pLight->color[1] * 0.587f + pLight->color[2] * 0.114f;
+
+        if (pLight->fDist - backEnd.currentSphere->radius >= 0.f) {
+            pLight->fIntensity /= pLight->fDist - backEnd.currentSphere->radius;
+        }
+
+        backEnd.currentSphere->numRealLights++;
+    }
+}
+
+void RB_Sphere_SetupEntity()
+{
+    if (r_light_nolight->integer) {
+        backEnd.currentSphere->TessFunction = &RB_Light_Fullbright;
+    } else if (RB_Sphere_SetupGlobals() && RB_Sphere_ResetPointColors()) {
+        backEnd.currentSphere->numRealLights = 0;
+        RB_Sphere_Light_Sun();
+        RB_Sphere_BuildStaticLights();
+        RB_Sphere_BuildDLights();
+        backEnd.pc.c_characterlights += backEnd.currentSphere->numRealLights;
+        RB_OptimizeLights();
+    }
+}
+
+void RB_Grid_SetupEntity()
+{
+    trRefEntity_t *refent;
+    trRefEntity_t *newref;
+
+    for (refent = backEnd.currentEntity;; refent = newref) {
+        if (refent->e.parentEntity == ENTITYNUM_NONE) {
+            break;
+        }
+
+        newref = &backEnd.refdef.entities[refent->e.parentEntity];
+        if (refent == newref) {
+            break;
+        }
+    }
+
+    VectorCopy(refent->e.lightingOrigin, backEnd.currentSphere->traceOrigin);
+    RB_SetupEntityGridLighting();
+}
+
+void RB_Grid_SetupStaticModel()
+{
+    RB_SetupStaticModelGridLighting(&tr.refdef, backEnd.currentStaticModel, backEnd.currentStaticModel->origin);
+}
+
+void RB_Light_Fullbright(unsigned char *colors)
+{
+    int i;
+
+    for (i = 0; i < tess.numVertexes; i++) {
+        colors[i * 4]     = 0xFF;
+        colors[i * 4 + 1] = 0xFF;
+        colors[i * 4 + 2] = 0xFF;
+        colors[i * 4 + 3] = 0xFF;
+    }
+}
+
+void R_Sphere_InitLights()
+{
+    const char *ents;
+    const char *ret;
+    qboolean    bFlareDirSet;
+    qboolean    bIsWorld;
+    qboolean    bWorldProcessed;
+
+    ents            = ri.CM_EntityString();
+    bFlareDirSet    = qfalse;
+    bIsWorld        = qfalse;
+    bWorldProcessed = qfalse;
+
+    s_sun.szFlareName[0] = 0;
+    s_sun.exists         = qfalse;
+
+    for (int i = 0; i < MAX_SPHERE_LIGHTS; i++) {
+        backEnd.spheres[i].TessFunction = &RB_Light_Real;
+    }
+
+    VectorClear(ambientlight);
+    backEnd.spareSphere.TessFunction = &RB_Light_Real;
+    backEnd.currentSphere            = &backEnd.spareSphere;
+    bEntityOverbright                = qfalse;
+    iEntityLightingMax               = tr.identityLightByte;
+    s_sun.color[0] = s_sun.color[1] = s_sun.color[2] = tr.overbrightMult * 70;
+
+    while (ents) {
+        ret = COM_Parse((char **)&ents);
+        if (*ret == '{' || *ret == '}') {
+            continue;
+        }
+
+        if (!bWorldProcessed && !strcmp(ret, "classname")) {
+            //
+            // Added in 2.0
+            //  Make sure that the world's properties are not overridden
+            //  by some random entities
+            //
+            if (!strcmp(COM_Parse((char **)&ents), "worldspawn")) {
+                bIsWorld = qtrue;
+            } else {
+                bWorldProcessed = qtrue;
+            }
+
+            continue;
+        }
+
+        if (!strcmp(ret, "suncolor") || !strcmp(ret, "sunlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple suncolors defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &s_sun.color[0], &s_sun.color[1], &s_sun.color[2]);
+            s_sun.color[0] *= tr.overbrightMult;
+            s_sun.color[1] *= tr.overbrightMult;
+            s_sun.color[2] *= tr.overbrightMult;
+            s_sun.exists = qtrue;
+        } else if (!strcmp(ret, "sundirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple sundirections defined in map\n");
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.direction, 0, 0);
+
+            s_sun.exists = qtrue;
+            if (!bFlareDirSet) {
+                s_sun.flaredirection[0] = s_sun.direction[0];
+                s_sun.flaredirection[1] = s_sun.direction[1];
+                s_sun.flaredirection[2] = s_sun.direction[2];
+            }
+        } else if (!strcmp(ret, "sunflaredirection")) {
+            vec3_t dir;
+
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &dir[0], &dir[1], &dir[2]);
+            AngleVectorsLeft(dir, s_sun.flaredirection, 0, 0);
+            bFlareDirSet = qtrue;
+        } else if (!strcmp(ret, "sunflarename")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            Q_strncpyz(s_sun.szFlareName, COM_Parse((char **)&ents), sizeof(s_sun.szFlareName));
+        } else if (!strcmp(ret, "ambientlight")) {
+            if (bWorldProcessed) {
+                ri.Printf(PRINT_WARNING, "Multiple ambientlights defined in map\n");
+                continue;
+            }
+            sscanf(COM_Parse((char **)&ents), "%f %f %f", &ambientlight[0], &ambientlight[1], &ambientlight[2]);
+        } else if (!strcmp(ret, "overbright")) {
+            if (bWorldProcessed) {
+                continue;
+            }
+
+            ret = COM_Parse((char **)&ents);
+            if (strcmp(ret, "world") || strcmp(ret, "none")) {
+                bEntityOverbright  = qtrue;
+                iEntityLightingMax = 0xFF;
+            }
+        } else {
+            COM_Parse((char **)&ents);
+        }
+    }
+
+    if (s_sun.exists && !s_sun.szFlareName[0]) {
+        Q_strncpyz(s_sun.szFlareName, "sun", sizeof(s_sun.szFlareName));
+    }
+}
+
+static qboolean R_CheckAddLightToList(spherel_t *pLight, const vec3_t vPos, float *pfFalloff)
+{
+    vec3_t vDelta;
+
+    if (pLight->intensity < 0) {
+        return qfalse;
+    }
+
+    VectorSubtract(pLight->origin, vPos, vDelta);
+    *pfFalloff = pLight->intensity * 7500.0 / VectorLengthSquared(vDelta);
+
+    return *pfFalloff >= 5.0;
+}
+
+static void R_InsertLightIntoList(spherel_t *pLight, float fIntensity, gatheredLight_t **pLightsList)
+{
+    gatheredLight_t *pCurrLight;
+    gatheredLight_t *pLastLight;
+
+    if (pLightsList[0]->pPrev->fIntensity >= fIntensity) {
+        return;
+    }
+
+    if (fIntensity > pLightsList[0]->fIntensity) {
+        pLightsList[0]             = pLightsList[0]->pPrev;
+        pLightsList[0]->pLight     = pLight;
+        pLightsList[0]->fIntensity = fIntensity;
+        return;
+    }
+
+    pCurrLight = pLightsList[0]->pNext;
+    if (!pCurrLight) {
+        return;
+    }
+
+    while (pCurrLight->fIntensity >= fIntensity) {
+        pCurrLight = pCurrLight->pNext;
+        if (!pCurrLight) {
+            return;
+        }
+    }
+
+    pLastLight                   = pLightsList[0]->pPrev->pPrev;
+    pCurrLight->pPrev->pNext     = pLightsList[0]->pPrev;
+    pLightsList[0]->pPrev->pPrev = pCurrLight->pPrev;
+    pLightsList[0]->pPrev->pNext = pCurrLight;
+    pCurrLight->pPrev            = pLightsList[0]->pPrev;
+    pLastLight->pNext            = pLightsList[0];
+    pLightsList[0]->pPrev        = pLastLight;
+    pCurrLight                   = pCurrLight->pPrev;
+    pCurrLight->fIntensity       = fIntensity;
+    pCurrLight->pLight           = pLight;
+}
+
+#define MAX_GATHERED_LIGHTS 8
+
+int R_GatherLightSources(const vec3_t vPos, vec3_t *pvLightPos, vec3_t *pvLightIntensity, int iMaxLights)
+{
+    int              i, j;
+    int              iLightCount;
+    vec3_t           vEnd;
+    vec3_t           vDelta;
+    spherel_t       *pCurrLight;
+    gatheredLight_t  lights[MAX_GATHERED_LIGHTS];
+    gatheredLight_t *pLightsHead;
+    gatheredLight_t *pLightsCurr;
+    float            fFalloff;
+    trace_t          trace;
+    mnode_t         *leaf;
+
+    fFalloff = 0;
+    leaf     = NULL;
+
+    if (iMaxLights <= 0 || !r_drawspherelights->integer) {
+        return 0;
+    }
+
+    memset(lights, 0, sizeof(lights));
+
+    for (j = 0; j < MAX_GATHERED_LIGHTS - 2; j++) {
+        lights[j + 1].pNext = &lights[j + 2];
+        lights[j + 1].pPrev = &lights[j];
+    }
+
+    lights[0].pNext                       = &lights[1];
+    lights[0].pPrev                       = &lights[MAX_GATHERED_LIGHTS - 1];
+    lights[MAX_GATHERED_LIGHTS - 1].pNext = &lights[0];
+    lights[MAX_GATHERED_LIGHTS - 1].pPrev = &lights[MAX_GATHERED_LIGHTS - 2];
+    pLightsHead                           = &lights[0];
+
+    if (tr.world->vis) {
+        leaf = R_PointInLeaf(vPos);
+        if (leaf->area == -1 || !leaf->numlights) {
+            leaf = NULL;
+        }
+    }
+
+    if (leaf) {
+        if (leaf->numlights) {
+            light_reference_count++;
+
+            for (i = (leaf->lights[0] == &tr.sSunLight ? 1 : 0); i < leaf->numlights; i++) {
+                pCurrLight = leaf->lights[i];
+                if (pCurrLight->leaf != (mnode_t *)-1) {
+                    byte mask = backEnd.refdef.areamask[pCurrLight->leaf->area >> 3];
+
+                    if (!(mask & (1 << (pCurrLight->leaf->area & 7)))
+                        && pCurrLight->reference_count != light_reference_count) {
+                        if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                            R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+                        }
+
+                        pCurrLight->reference_count = light_reference_count;
+                    }
+                }
+            }
+        }
+    } else {
+        for (i = 0; i < tr.numSLights; i++) {
+            pCurrLight = &tr.sLights[i];
+
+            if (R_CheckAddLightToList(pCurrLight, vPos, &fFalloff)) {
+                R_InsertLightIntoList(pCurrLight, fFalloff, &pLightsHead);
+            }
+        }
+    }
+
+    iLightCount = 0;
+
+    if (s_sun.exists) {
+        if (leaf && leaf->lights[0] == &tr.sSunLight) {
+            VectorMA(vPos, 16384.0, s_sun.direction, vEnd);
+            ri.CM_BoxTrace(&trace, vPos, vEnd, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, 0);
+
+            if (trace.surfaceFlags & SURF_SKY) {
+                VectorMA(vPos, 16384.0, s_sun.direction, pvLightPos[0]);
+                pvLightIntensity[0][0] = s_sun.color[0] * (1.0 / 510.0);
+                pvLightIntensity[0][1] = s_sun.color[1] * (1.0 / 510.0);
+                pvLightIntensity[0][2] = s_sun.color[2] * (1.0 / 510.0);
+                iLightCount            = 1;
+            }
+        }
+    }
+
+    pLightsCurr = pLightsHead;
+
+    for (; iLightCount < iMaxLights && iLightCount < MAX_GATHERED_LIGHTS && pLightsCurr->pLight;
+         iLightCount++, pLightsCurr = pLightsCurr->pNext) {
+        VectorCopy(pLightsCurr->pLight->origin, pvLightPos[iLightCount]);
+        vDelta[0] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[0];
+        vDelta[1] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[1];
+        vDelta[2] = pLightsCurr->fIntensity / 200.0 * pLightsCurr->pLight->color[2];
+
+        if (vDelta[0] > 1.0 || vDelta[1] > 1.0 || vDelta[2] > 1.0) {
+            NormalizeColor(vDelta, vDelta);
+        }
+
+        VectorCopy(vDelta, pvLightIntensity[iLightCount]);
+        pLightsCurr = pLightsCurr->pNext;
+        if (pLightsCurr == pLightsHead) {
+            break;
+        }
+    }
+
+    return iLightCount;
+}
diff --git a/code/renderergl2/tr_sprite.c b/code/renderergl2/tr_sprite.c
new file mode 100644
index 00000000..3604fa8c
--- /dev/null
+++ b/code/renderergl2/tr_sprite.c
@@ -0,0 +1,218 @@
+/*
+===========================================================================
+Copyright (C) 2010 su44
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_sprite.c - MoHAA sprite system
+
+#include "tr_local.h"
+
+/*
+=====================
+SPR_RegisterSprite
+=====================
+*/
+sprite_t *SPR_RegisterSprite(const char *name)
+{
+	image_t *spriteImage;
+	shader_t *shader;
+	sprite_t *spr;
+	char shadername[256];
+	COM_StripExtension(name,shadername,sizeof(shadername));
+	shader = R_FindShader(shadername,-1,qfalse);
+	if(shader) {
+		spriteImage = 0;
+		if(shader->stages[0])
+			spriteImage = shader->stages[0]->bundle[0].image[0];
+		if ( !spriteImage ) {
+			ri.Printf(1, "Could not find image for sprite in shader %s\n", name);
+			return 0;
+		}
+		spr = ri.Hunk_Alloc(sizeof(sprite_t), h_dontcare);
+		spr->height = spriteImage->height;
+		spr->width = spriteImage->width;
+		spr->origin_x = spr->width * 0.5;
+		spr->origin_y = spr->height * 0.5;
+		spr->shader = shader;
+		spr->scale = spr->shader->sprite.scale;
+		return spr;
+	}
+	return 0;
+}
+
+static int CullSprite(const vec3_t* points) {
+	int i, j;
+
+	for (i = 0; i < backEnd.viewParms.fog.extrafrustums + 4; i++) {
+		for (j = 0; j < 4; j++) {
+			if (DotProduct(points[j], backEnd.viewParms.frustum[i].normal) - backEnd.viewParms.frustum[i].dist > 0.0f) {
+				break;
+			}
+		}
+
+		if (j == 4) {
+			return CULL_CLIP;
+		}
+	}
+
+	return CULL_IN;
+}
+
+/*
+=====================
+RB_DrawSprite
+=====================
+*/
+void RB_DrawSprite( const refSprite_t *spr ) {
+	model_t* model;
+	vec3_t norm;
+	vec3_t up, right;
+	vec3_t points[4];
+	float org_x, org_y;
+	float scale;
+	int i;
+
+	if (!spr->hModel)
+	{
+        ri.Printf(PRINT_WARNING, "No model found for Sprite\n");
+        return;
+	}
+
+    model = tr.models;
+	if (spr->hModel > 0 && spr->hModel < tr.numModels) {
+		model = tr.models[spr->hModel];
+	}
+
+	scale = spr->scale * model->d.sprite->scale;
+
+	switch (model->d.sprite->shader->sprite.type)
+    {
+    case SPRITE_PARALLEL_ORIENTED:
+		{
+			float invmag;
+			float cr, sr;
+			int i;
+
+			invmag = 1.0 / sqrt(spr->axis[1][2] * spr->axis[1][2] + spr->axis[1][1] * spr->axis[1][1]);
+
+			cr = invmag * spr->axis[1][1];
+			sr = invmag * spr->axis[1][2];
+
+			for (i = 0; i < 3; i++)
+			{
+				up[i] = backEnd.viewParms.or.axis[2][i] * cr - backEnd.viewParms.or.axis[1][i] * sr;
+				right[i] = backEnd.viewParms.or.axis[1][i] * cr + backEnd.viewParms.or.axis[2][i] * sr;
+			}
+		}
+        break;
+    case SPRITE_PARALLEL:
+		VectorCopy(backEnd.viewParms.or.axis[2], up);
+		if (!backEnd.viewParms.isMirror) {
+			VectorNegate(backEnd.viewParms.or.axis[1], right);
+		} else {
+			VectorCopy(backEnd.viewParms.or.axis[1], right);
+		}
+        break;
+    case SPRITE_ORIENTED:
+		VectorCopy(spr->axis[1], right);
+		VectorCopy(spr->axis[2], up);
+        break;
+    case SPRITE_PARALLEL_UPRIGHT:
+		VectorCopy(backEnd.viewParms.or.axis[0], norm);
+		VectorCopy(backEnd.viewParms.or.axis[1], right);
+		VectorCopy(backEnd.viewParms.or.axis[2], up);
+		if (backEnd.viewParms.or.axis[0][2] > 0.999) {
+			return;
+		} else if (backEnd.viewParms.or.axis[0][2] < -0.999) {
+			return;
+		}
+
+		VectorSet(up, 0.0f, 0.0f, 1.0f);
+		VectorSet(right, backEnd.viewParms.or.axis[0][1], -backEnd.viewParms.or.axis[0][0], 0.0f);
+		VectorNormalize(right);
+		VectorSet(norm, -right[1], right[0], 0.0f);
+		break;
+	}
+
+	org_x = model->d.sprite->origin_x * scale;
+	org_y = model->d.sprite->origin_y * scale;
+
+    VectorScale(up, org_y, up);
+    VectorScale(right, org_x, right);
+
+	points[0][0] = spr->origin[0] + up[0] - right[0];
+	points[1][0] = spr->origin[0] + up[0] + right[0];
+	points[2][0] = spr->origin[0] - up[0] - right[0];
+	points[3][0] = spr->origin[0] - up[0] + right[0];
+
+    points[0][1] = spr->origin[1] + up[1] - right[1];
+    points[1][1] = spr->origin[1] + up[1] + right[1];
+    points[2][1] = spr->origin[1] - up[1] - right[1];
+    points[3][1] = spr->origin[1] - up[1] + right[1];
+
+    points[0][2] = spr->origin[2] + up[2] - right[2];
+    points[1][2] = spr->origin[2] + up[2] + right[2];
+    points[2][2] = spr->origin[2] - up[2] - right[2];
+    points[3][2] = spr->origin[2] - up[2] + right[2];
+
+	if (CullSprite(points) == CULL_OUT) {
+		return;
+	}
+
+	RB_CHECKOVERFLOW(4, 6);
+
+	for (i = 0; i < 4; i++) {
+		tess.color[tess.numVertexes + i][0] = spr->shaderRGBA[0] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][1] = spr->shaderRGBA[1] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][2] = spr->shaderRGBA[2] * 0xffff / 0xff;
+		tess.color[tess.numVertexes + i][3] = spr->shaderRGBA[3] * 0xffff / 0xff;
+	}
+
+    tess.texCoords[tess.numVertexes][0] = 0.0f;
+    tess.texCoords[tess.numVertexes][1] = 0.0f;
+    tess.texCoords[tess.numVertexes + 1][0] = 1.0f;
+    tess.texCoords[tess.numVertexes + 1][1] = 0.0f;
+    tess.texCoords[tess.numVertexes + 2][0] = 0.0f;
+    tess.texCoords[tess.numVertexes + 2][1] = 1.0f;
+    tess.texCoords[tess.numVertexes + 3][0] = 1.0f;
+    tess.texCoords[tess.numVertexes + 3][1] = 1.0f;
+
+    tess.xyz[tess.numVertexes][0] = points[0][0];
+    tess.xyz[tess.numVertexes][1] = points[0][1];
+    tess.xyz[tess.numVertexes][2] = points[0][2];
+    tess.xyz[tess.numVertexes + 1][0] = points[1][0];
+    tess.xyz[tess.numVertexes + 1][1] = points[1][1];
+    tess.xyz[tess.numVertexes + 1][2] = points[1][2];
+    tess.xyz[tess.numVertexes + 2][0] = points[2][0];
+    tess.xyz[tess.numVertexes + 2][1] = points[2][1];
+    tess.xyz[tess.numVertexes + 2][2] = points[2][2];
+    tess.xyz[tess.numVertexes + 3][0] = points[3][0];
+    tess.xyz[tess.numVertexes + 3][1] = points[3][1];
+    tess.xyz[tess.numVertexes + 3][2] = points[3][2];
+
+    tess.indexes[tess.numIndexes] = tess.numVertexes + 2;
+    tess.indexes[tess.numIndexes + 1] = tess.numVertexes + 1;
+    tess.indexes[tess.numIndexes + 2] = tess.numVertexes;
+    tess.indexes[tess.numIndexes + 3] = tess.numVertexes + 2;
+    tess.indexes[tess.numIndexes + 4] = tess.numVertexes + 3;
+    tess.indexes[tess.numIndexes + 5] = tess.numVertexes + 1;
+
+    tess.numVertexes += 4;
+    tess.numIndexes += 6;
+}
diff --git a/code/renderergl2/tr_staticmodels.cpp b/code/renderergl2/tr_staticmodels.cpp
new file mode 100644
index 00000000..fdd3ca18
--- /dev/null
+++ b/code/renderergl2/tr_staticmodels.cpp
@@ -0,0 +1,586 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_staticmodels.cpp -- static model rendering
+
+#include "tr_local.h"
+#include "tiki.h"
+
+#define MAX_STATIC_MODELS_SURFS    8192
+#define MAX_DISTINCT_STATIC_MODELS 1000
+
+int             g_nStaticSurfaces;
+staticSurface_t g_staticSurfaces[MAX_STATIC_MODELS_SURFS];
+qboolean        g_bInfostaticmodels = qfalse;
+
+/*
+==============
+R_InitStaticModels
+==============
+*/
+void R_InitStaticModels(void)
+{
+    cStaticModelUnpacked_t *pSM;
+    char                    szTemp[1024];
+    skelBoneCache_t         bones[128];
+    float                   radius;
+    int                     i, j, k, l;
+
+    g_bInfostaticmodels = qfalse;
+
+    if (tr.overbrightShift) {
+        for (i = 0; i < tr.world->numStaticModelData; i++) {
+            int r, g, b;
+
+            r = (int)((float)tr.world->staticModelData[i * 4] * tr.overbrightMult);
+            g = (int)((float)tr.world->staticModelData[i * 4 + 1] * tr.overbrightMult);
+            b = (int)((float)tr.world->staticModelData[i * 4 + 2] * tr.overbrightMult);
+
+            if (r > 0xFF || g > 0xFF || b > 0xFF) {
+                float t;
+
+                t = 255.0 / (float)Q_max(r, Q_max(g, b));
+
+                r = (int)((float)r * t);
+                g = (int)((float)g * t);
+                b = (int)((float)b * t);
+            }
+
+            tr.world->staticModelData[i * 4]     = r;
+            tr.world->staticModelData[i * 4 + 1] = g;
+            tr.world->staticModelData[i * 4 + 2] = b;
+        }
+    }
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        vec3_t mins, maxs;
+
+        pSM = &tr.world->staticModels[i];
+
+        pSM->bRendered = qfalse;
+        AngleVectorsLeft(pSM->angles, pSM->axis[0], pSM->axis[1], pSM->axis[2]);
+
+        if (!strnicmp(pSM->model, "models", 6)) {
+            Q_strncpyz(szTemp, pSM->model, sizeof(szTemp));
+        } else {
+            Com_sprintf(szTemp, sizeof(szTemp), "models/%s", pSM->model);
+        }
+
+        ri.FS_CanonicalFilename(szTemp);
+        //const bool exists = ri.TIKI_FindTiki(szTemp) != NULL;
+        pSM->tiki = ri.TIKI_RegisterTikiFlags(szTemp, qfalse);
+
+        if (!pSM->tiki) {
+            ri.Printf(PRINT_WARNING, "^~^~^: Warning: Cannot Load Static Model %s\n", szTemp);
+            continue;
+        }
+
+        pSM->radius = ri.TIKI_GlobalRadius(pSM->tiki);
+
+        //
+        // register shaders
+        //
+        for (j = 0; j < pSM->tiki->num_surfaces; j++) {
+            dtikisurface_t *surf = &pSM->tiki->surfaces[j];
+
+            for (k = 0; k < surf->numskins; k++) {
+                if (surf->shader[k][0]) {
+                    shader_t *sh = R_FindShader(surf->shader[k], -1, !(surf->flags & TIKI_SURF_NOMIPMAPS));
+                    surf->hShader[k] = sh->index;
+                } else {
+                    surf->hShader[k] = 0;
+                }
+            }
+        }
+
+        // prepare the skeleton frame for the static model
+        ri.TIKI_GetSkelAnimFrame(pSM->tiki, bones, &radius, &mins, &maxs);
+        pSM->cull_radius = radius * pSM->tiki->load_scale * pSM->scale;
+
+        // Suggestion:
+        // It would be cool to have animated static model in the future
+
+        // Removed in 2.0
+        //  This only leads to issues where pStaticXyz is not initialized
+        //  and it can occurs if the TIKI model is registered before the static model
+        //if (exists) {
+        //    continue;
+        //}
+
+        for (j = 0; j < pSM->tiki->numMeshes; j++) {
+            skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(pSM->tiki->mesh[j]);
+            skelSurfaceGame_t *surf;
+
+            if (!skelmodel) {
+                ri.Printf(PRINT_WARNING, "^~^~^: Warning: Missing mesh in Static Model %s\n", skelmodel->name);
+                continue;
+            }
+
+            surf = skelmodel->pSurfaces;
+
+            for (k = 0; k < skelmodel->numSurfaces; k++, surf = surf->pNext) {
+                byte             *buf;
+                byte             *p;
+                skelWeight_t     *weight;
+                skeletorVertex_t *vert;
+
+                if (surf->pStaticXyz) {
+                    continue;
+                }
+
+                // allocate static vectors
+                p = buf =
+                    (byte *)ri.TIKI_Alloc((sizeof(vec4_t) + sizeof(vec4_t) + sizeof(vec2_t) * 2) * surf->numVerts);
+                surf->pStaticXyz = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticNormal = (vec4_t *)p;
+                p += sizeof(vec4_t) * surf->numVerts;
+                surf->pStaticTexCoords = (vec2_t(*)[2])p;
+
+                vert = surf->pVerts;
+
+                for (l = 0; l < surf->numVerts; l++) {
+                    int              channel;
+                    skelBoneCache_t *bone;
+
+                    weight = (skelWeight_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                              + vert->numMorphs * sizeof(skeletorMorph_t));
+
+                    if (j > 0) {
+                        channel = ri.TIKI_GetLocalChannel(pSM->tiki, skelmodel->pBones[weight->boneIndex].channel);
+                    } else {
+                        channel = weight->boneIndex;
+                    }
+
+                    bone = &bones[channel];
+
+                    surf->pStaticXyz[l][0] =
+                        ((weight->offset[0] * bone->matrix[0][0] + weight->offset[1] * bone->matrix[1][0]
+                          + weight->offset[2] * bone->matrix[2][0])
+                         + bone->offset[0])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][1] =
+                        ((weight->offset[0] * bone->matrix[0][1] + weight->offset[1] * bone->matrix[1][1]
+                          + weight->offset[2] * bone->matrix[2][1])
+                         + bone->offset[1])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][2] =
+                        ((weight->offset[0] * bone->matrix[0][2] + weight->offset[1] * bone->matrix[1][2]
+                          + weight->offset[2] * bone->matrix[2][2])
+                         + bone->offset[2])
+                        * weight->boneWeight;
+                    surf->pStaticXyz[l][3] = 0.f;
+
+                    surf->pStaticNormal[l][0] = vert->normal[0] * bone->matrix[0][0]
+                                              + vert->normal[1] * bone->matrix[1][0]
+                                              + vert->normal[2] * bone->matrix[2][0];
+                    surf->pStaticNormal[l][1] = vert->normal[0] * bone->matrix[0][1]
+                                              + vert->normal[1] * bone->matrix[1][1]
+                                              + vert->normal[2] * bone->matrix[2][1];
+                    surf->pStaticNormal[l][2] = vert->normal[0] * bone->matrix[0][2]
+                                              + vert->normal[1] * bone->matrix[1][2]
+                                              + vert->normal[2] * bone->matrix[2][2];
+                    surf->pStaticNormal[l][3] = 0.f;
+
+                    surf->pStaticTexCoords[l][0][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][0][1] = vert->texCoords[1];
+                    surf->pStaticTexCoords[l][1][0] = vert->texCoords[0];
+                    surf->pStaticTexCoords[l][1][1] = vert->texCoords[1];
+
+                    vert = (skeletorVertex_t *)((byte *)vert + sizeof(skeletorVertex_t)
+                                                + sizeof(skeletorMorph_t) * vert->numMorphs
+                                                + sizeof(skelWeight_t) * vert->numWeights);
+                }
+            }
+        }
+    }
+
+    tr.refdef.numStaticModels    = tr.world->numStaticModels;
+    tr.refdef.staticModels       = tr.world->staticModels;
+    tr.refdef.numStaticModelData = tr.world->numStaticModelData;
+    tr.refdef.staticModelData    = tr.world->staticModelData;
+}
+
+/*
+==============
+R_CullStaticModel
+==============
+*/
+static int R_CullStaticModel(dtiki_t *tiki, float fScale, const vec3_t vLocalOrg)
+{
+    vec3_t bounds[2];
+    int    i;
+    int    cull;
+
+    for (i = 0; i < 3; i++) {
+        bounds[0][i] = vLocalOrg[i] + tiki->a->mins[i] * fScale;
+        bounds[1][i] = vLocalOrg[i] + tiki->a->maxs[i] * fScale;
+    }
+
+    cull = R_CullLocalBox(bounds);
+
+    if (r_showcull->integer & 4) {
+        float  fR, fG, fB;
+        vec3_t vAngles;
+
+        switch (cull) {
+        case CULL_CLIP:
+            fR = 1.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_IN:
+            fR = 0.0f;
+            fG = 1.0f;
+            fB = 0.0f;
+            break;
+        case CULL_OUT:
+            fR = 1.0f;
+            fG = 0.2f;
+            fB = 0.2f;
+            for (i = 0; i < 2; i++) {
+                bounds[0][i] = bounds[0][i] - 16.0;
+                bounds[1][i] = bounds[1][i] + 16.0;
+            }
+            break;
+        default:
+            break;
+        }
+
+        MatrixToEulerAngles(tr.or.axis, vAngles);
+        R_DebugRotatedBBox(tr.or.origin, vAngles, bounds[0], bounds[1], fR, fG, fB, 0.5);
+    }
+
+    switch (cull) {
+    case CULL_CLIP:
+        tr.pc.c_box_cull_md3_clip++;
+        break;
+    case CULL_IN:
+        tr.pc.c_box_cull_md3_in++;
+        break;
+    case CULL_OUT:
+        tr.pc.c_box_cull_md3_out++;
+        break;
+    }
+
+    return cull;
+}
+
+/*
+==============
+R_AddStaticModelSurfaces
+==============
+*/
+void R_AddStaticModelSurfaces(void)
+{
+    cStaticModelUnpacked_t *SM;
+    int                     i, j, k;
+    int                     ofsStaticData;
+    int                     iRadiusCull;
+    dtiki_t                *tiki;
+    float                   tiki_scale;
+    vec3_t                  tiki_localorigin;
+    vec3_t                  tiki_worldorigin;
+
+    if (!tr.world->numStaticModels) {
+        return;
+    }
+
+    tr.shiftedIsStatic = (1 << QSORT_STATICMODEL_SHIFT);
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+
+        //if( SM->visCount != tr.visCounts[ tr.visIndex ] ) {
+        //	continue;
+        //}
+
+        tiki = SM->tiki;
+
+        if (!tiki) {
+            continue;
+        }
+
+        tr.currentEntityNum = i;
+        tr.shiftedEntityNum = i << QSORT_REFENTITYNUM_SHIFT;
+
+        R_RotateForStaticModel(SM, &tr.viewParms, &tr.or);
+
+        ofsStaticData = 0;
+
+        // get the world position
+        tiki_scale = tiki->load_scale * SM->scale;
+        VectorScale(tiki->load_origin, tiki_scale, tiki_localorigin);
+        R_LocalPointToWorld(tiki_localorigin, tiki_worldorigin);
+
+        iRadiusCull = R_CullPointAndRadius(tiki_worldorigin, SM->cull_radius);
+
+        if (r_showcull->integer & 8) {
+            switch (iRadiusCull) {
+            case CULL_IN:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.2, 0.0, 1.0, 0.0, 0.5, 0);
+                break;
+            case CULL_OUT:
+                R_DebugCircle(tiki_worldorigin, SM->cull_radius * 1.4 + 16.0, 1.0, 0.2, 0.2, 0.5, 0);
+                break;
+            }
+        }
+
+        if (iRadiusCull != CULL_OUT
+            && (iRadiusCull != CULL_CLIP || R_CullStaticModel(SM->tiki, tiki_scale, tiki_localorigin) != CULL_OUT)) {
+            dtikisurface_t *dsurf;
+
+            if (tr.viewParms.isPortal) {
+                SM->lodpercentage[1] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            } else {
+                SM->lodpercentage[0] = R_CalcLod(tiki_worldorigin, SM->cull_radius / SM->scale);
+            }
+
+            //
+            // draw all meshes
+            //
+            dsurf = tiki->surfaces;
+            for (int mesh = 0; mesh < tiki->numMeshes; mesh++) {
+                skelHeaderGame_t  *skelmodel = ri.TIKI_GetSkel(tiki->mesh[mesh]);
+                skelSurfaceGame_t *surface;
+                staticSurface_t   *s_surface;
+                shader_t          *shader;
+                float              fDist;
+                vec3_t             vDelta;
+
+                if (!skelmodel) {
+                    continue;
+                }
+
+                //
+                // draw all surfaces
+                //
+                surface = skelmodel->pSurfaces;
+                for (j = 0; j < skelmodel->numSurfaces;
+                     j++, ofsStaticData += surface->numVerts, surface = surface->pNext, dsurf++) {
+                    if (g_nStaticSurfaces >= MAX_STATIC_MODELS_SURFS) {
+                        ri.Printf(
+                            PRINT_DEVELOPER,
+                            "^~^~^ ERROR: MAX_STATIC_MODELS_SURFS exceeded - surface of '%s' skipped\n",
+                            tiki->a->name
+                        );
+                        continue;
+                    }
+
+                    s_surface                = &g_staticSurfaces[g_nStaticSurfaces++];
+                    s_surface->ident         = SF_TIKI_STATIC;
+                    s_surface->ofsStaticData = ofsStaticData;
+                    s_surface->surface       = surface;
+                    s_surface->meshNum       = mesh;
+
+                    shader = tr.shaders[dsurf->hShader[0]];
+
+                    if (shader->numUnfoggedPasses == 1 && !r_nocull->integer) {
+                        switch (shader->stages[0]->alphaGen) {
+                        case AGEN_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(
+                                    shader->fDistNear + shader->fDistRange, tiki_worldorigin, SM->cull_radius
+                                )
+                                == CULL_OUT) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_DIST_FADE:
+                            if (R_DistanceCullPointAndRadius(shader->fDistNear, tiki_worldorigin, SM->cull_radius)
+                                == CULL_IN) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.or.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) >= Square(fDist)) {
+                                continue;
+                            }
+                            break;
+                        case AGEN_ONE_MINUS_TIKI_DIST_FADE:
+                            fDist = (shader->fDistNear + shader->fDistRange);
+                            VectorSubtract(tiki_worldorigin, tr.viewParms.or.origin, vDelta);
+                            if (VectorLengthSquared(vDelta) <= Square(shader->fDistNear)) {
+                                continue;
+                            }
+                            break;
+                        }
+                    }
+
+                    SM->bRendered = qtrue;
+                    R_AddDrawSurf((surfaceType_t *)s_surface, shader, 0, 0, 0, 0);
+
+                    if (r_showstaticlod->integer) {
+                        vec3_t org;
+                        int    render_count, total_tris;
+
+                        VectorCopy(SM->origin, org);
+                        org[2] += 100.0;
+                        R_DrawDebugNumber(org, SM->lodpercentage[0], r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 3);
+
+                        org[2] += 125.0;
+                        R_CountTikiLodTris(tiki, SM->lodpercentage[0], &render_count, &total_tris);
+                        R_DrawDebugNumber(org, render_count, r_showstaticlod->value * 2, 1.0, 1.0, 0.0, 0);
+                    }
+
+                    if (r_showstaticbboxes->integer) {
+                        vec3_t vMins, vMaxs;
+
+                        for (k = 0; k < 3; k++) {
+                            vMins[k] = tiki->a->mins[k] * tiki->load_scale * SM->scale;
+                            vMaxs[k] = tiki->a->maxs[k] * tiki->load_scale * SM->scale;
+                        }
+
+                        R_DebugRotatedBBox(SM->origin, SM->angles, vMins, vMaxs, 1.0, 0.0, 1.0, 0.75);
+                    }
+                }
+            }
+        }
+    }
+
+    tr.shiftedIsStatic = 0;
+}
+
+/*
+==============
+RB_Static_BuildDLights
+==============
+*/
+void RB_Static_BuildDLights()
+{
+    int i;
+
+    backEnd.currentStaticModel->useSpecialLighting = backEnd.refdef.num_dlights > 0;
+    backEnd.currentStaticModel->numdlights         = 0;
+
+    if (!backEnd.currentStaticModel->useSpecialLighting) {
+        return;
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights && backEnd.currentStaticModel->numdlights != 32; i++) {
+        vec3_t lightorigin, delta;
+
+        VectorCopy(backEnd.refdef.dlights[i].origin, lightorigin);
+        VectorSubtract(lightorigin, backEnd.currentStaticModel->origin, delta);
+        if (backEnd.refdef.dlights[i].radius * 2.0 >= VectorLength(delta)) {
+            MatrixTransformVectorRight(
+                backEnd.currentStaticModel->axis,
+                delta,
+                backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights].transformed
+            );
+
+            backEnd.currentStaticModel->dlights[backEnd.currentStaticModel->numdlights++].index = i;
+        }
+    }
+
+    if (!backEnd.currentStaticModel->numdlights) {
+        backEnd.currentStaticModel->useSpecialLighting = qfalse;
+    }
+}
+
+/*
+==============
+R_InfoStaticModels_f
+==============
+*/
+void R_InfoStaticModels_f(void)
+{
+    g_bInfostaticmodels = qtrue;
+}
+
+/*
+==============
+R_PrintInfoStaticModels
+==============
+*/
+void R_PrintInfoStaticModels()
+{
+    int                     iRenderCount;
+    int                     i, j;
+    cStaticModelUnpacked_t *SM;
+    dtiki_t                *tikis[MAX_DISTINCT_STATIC_MODELS];
+    int                     tiki_count[MAX_DISTINCT_STATIC_MODELS];
+    cStaticModelUnpacked_t *pSM[MAX_DISTINCT_STATIC_MODELS];
+    int                     count;
+
+    ri.Printf(PRINT_ALL, "Static model info:\n");
+    ri.Printf(PRINT_ALL, "------------------\n");
+
+    count        = 0;
+    iRenderCount = 0;
+
+    for (i = 0; i < tr.world->numStaticModels; i++) {
+        SM = &tr.world->staticModels[i];
+        if (!SM->bRendered) {
+            continue;
+        }
+
+        SM->bRendered = qfalse;
+        iRenderCount++;
+
+        if (!SM->tiki) {
+            ri.Printf(PRINT_ALL, "ERROR: static model with no tiki\n");
+            continue;
+        }
+
+        for (j = 0; j < count; j++) {
+            if (SM->tiki == tikis[j]) {
+                tiki_count[j]++;
+                break;
+            }
+        }
+
+        if (count >= MAX_DISTINCT_STATIC_MODELS) {
+            ri.Printf(PRINT_ALL, "R_PrintInfoStaticModels: MAX_DISTINCT_STATIC_MODELS exceeded - increase and recompile\n");
+            break;
+        }
+
+        if (j == count) {
+            tikis[count]      = SM->tiki;
+            pSM[count]        = SM;
+            tiki_count[count] = 1;
+
+            count++;
+        }
+    }
+
+    ri.Printf(PRINT_ALL, "Total static models rendered: %d\n", iRenderCount);
+
+    for (i = 0; i < count; i++) {
+        skelHeaderGame_t *skelmodel = ri.TIKI_GetSkel(tikis[i]->mesh[0]);
+
+        ri.Printf(PRINT_ALL, 
+            "model: %s, version: %d, count: %d,\n culling min %.1f %.1f %.1f, max %.1f %.1f %.1f, radius %.1f\n",
+            tikis[i]->a->name,
+            skelmodel ? skelmodel->version : -1,
+            tiki_count[i],
+            tikis[i]->a->mins[0],
+            tikis[i]->a->mins[1],
+            tikis[i]->a->mins[2],
+            tikis[i]->a->maxs[0],
+            tikis[i]->a->maxs[1],
+            tikis[i]->a->maxs[2],
+            pSM[i]->cull_radius
+        );
+    }
+}
diff --git a/code/renderergl2/tr_sun_flare.cpp b/code/renderergl2/tr_sun_flare.cpp
new file mode 100644
index 00000000..c5ac29fe
--- /dev/null
+++ b/code/renderergl2/tr_sun_flare.cpp
@@ -0,0 +1,732 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_sun_flare.cpp: Sun flares
+
+#include "tr_local.h"
+
+#define MAX_FLARES 20
+
+class flare_s
+{
+public:
+    float     size;
+    float     where;
+    shader_t *shader;
+    float     alphascale;
+};
+
+class lens_flare
+{
+public:
+    static int max_flares;
+
+    float dot_min;
+    float fullscale;
+
+    // List of flares
+    int     num_flares;
+    flare_s flares[MAX_FLARES];
+
+    shader_t *fullscreen;
+    int       fullfade;
+    qboolean  blend_active;
+
+    // Flare location
+    vec3_t trace_v;
+    vec3_t v;
+
+    // Color and alpha
+    vec3_t color;
+    float  alpha;
+
+    // Screen projection
+    vec2_t screen;
+    float  dot;
+
+    int   lasttime;
+    float lastbright;
+
+    // Whether or not it's inside a portal sky
+    bool inportalsky;
+
+    qboolean initted;
+
+public:
+    lens_flare()
+    {
+        color[0] = 1.0;
+        color[1] = 1.0;
+        color[2] = 1.0;
+        alpha    = 1.0;
+        initted  = false;
+    }
+
+    bool         CheckRange();
+    bool         CheckRay();
+    bool         ScreenCalc();
+    virtual void Try();
+    virtual void Init(const char *which);
+    void         ScreenBlend();
+    void         InPortalSky();
+    void         NotInPortalSky();
+    void         SetVect(const float *vect);
+
+    void SetColor(const float *c) { VectorCopy(c, color); }
+
+    void SetAlpha(float a) { alpha = a; }
+};
+
+class dlight_lens_flare : public lens_flare
+{
+public:
+    shader_t *corona_shader;
+
+public:
+    dlight_lens_flare() { corona_shader = NULL; }
+
+    void Try() override;
+
+    void Init(const char *which) override
+    {
+        lens_flare::Init(which);
+        corona_shader = R_FindShader("textures/sprites/corona", -1, qfalse);
+    }
+};
+
+class sun_flare_class : public lens_flare
+{
+public:
+    bool SunCheckRay();
+    void SunScreenCalc();
+    void SunTry();
+};
+
+lens_flare        torches;
+dlight_lens_flare dlights;
+sun_flare_class   sunFlare;
+int               lens_flare::max_flares;
+
+void lens_flare::SetVect(const float *vect)
+{
+    if (inportalsky) {
+        vec3_t offset;
+        vec3_t rot_offset;
+
+        VectorSubtract(vect, tr.refdef.sky_origin, offset);
+        VectorRotate(offset, tr.refdef.sky_axis, rot_offset);
+        VectorAdd(tr.refdef.vieworg, rot_offset, v);
+
+        VectorNormalize(offset);
+        VectorMA(tr.refdef.vieworg, 16384, offset, trace_v);
+    } else {
+        VectorCopy(vect, v);
+        VectorCopy(vect, trace_v);
+    }
+}
+
+void lens_flare::InPortalSky()
+{
+    inportalsky = true;
+}
+
+void lens_flare::NotInPortalSky()
+{
+    inportalsky = false;
+}
+
+bool lens_flare::CheckRange()
+{
+    vec3_t diff;
+
+    VectorSubtract(v, backEnd.viewParms.or.origin, diff);
+    VectorNormalizeFast(diff);
+    dot = DotProduct(backEnd.viewParms.or.axis[0], diff);
+
+    return dot > dot_min;
+}
+
+bool lens_flare::CheckRay()
+{
+    trace_t trace;
+
+    ri.CM_BoxTrace(&trace, backEnd.viewParms.or.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse);
+    if (inportalsky) {
+        return (trace.surfaceFlags & 4) != 0;
+    }
+
+    return trace.fraction == 1.0;
+}
+
+bool lens_flare::ScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    bool   retval;
+    int    i, j;
+
+    retval = true;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.or.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        if (clip[i] >= clip[3] || clip[i] <= -clip[3]) {
+            retval = false;
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+
+    return retval;
+}
+
+void lens_flare::Try()
+{
+    vec2_t diff;
+    vec2_t point;
+    float  alpha;
+    int    i;
+
+    if (!ScreenCalc()) {
+        return;
+    }
+    if (!CheckRange()) {
+        return;
+    }
+    if (!CheckRay()) {
+        return;
+    }
+
+    VectorScale2D(screen, -2.0, diff);
+    alpha = (dot - dot_min) / (1.0 - dot_min);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    lasttime     = backEnd.refdef.time;
+    blend_active = true;
+    lastbright   = Square(alpha) * Square(alpha) * this->fullscale;
+}
+
+void dlight_lens_flare::Try()
+{
+    float size;
+
+    size = r_lightcoronasize->value;
+    lens_flare::Try();
+    lens_flare::CheckRange();
+
+    if (dot <= 0) {
+        return;
+    }
+
+    if (!CheckRay()) {
+        return;
+    }
+
+    RB_Color4f(color[0], color[1], color[2], alpha);
+    RB_StreamBegin(corona_shader);
+    RB_Texcoord2f(0.0, 0.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] + size);
+    RB_Texcoord2f(1.0, 0.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] + size);
+    RB_Texcoord2f(0.0, 1.0);
+
+    RB_Vertex2f(screen[0] - size, screen[1] - size);
+    RB_Texcoord2f(1.0, 1.0);
+
+    RB_Vertex2f(screen[0] + size, screen[1] - size);
+    RB_StreamEnd();
+}
+
+void lens_flare::ScreenBlend()
+{
+    float alpha;
+    int   timediff;
+
+    if (!fullscreen || !blend_active) {
+        return;
+    }
+
+    timediff = backEnd.refdef.time - lasttime;
+    if (timediff > fullfade) {
+        blend_active = false;
+        return;
+    }
+
+    alpha = (float)(fullfade - timediff) / fullfade * lastbright;
+    if (alpha <= 0.0001) {
+        blend_active = false;
+        return;
+    }
+
+    RB_Color4f(1.0, 1.0, 1.0, alpha);
+
+    RB_StreamBegin(fullscreen);
+    RB_Vertex2f(-1.0, -1.0);
+    RB_Vertex2f(1.0, -1.0);
+    RB_Vertex2f(-1.0, 1.0);
+    RB_Vertex2f(1.0, 1.0);
+
+    RB_StreamEnd();
+}
+
+class tmpRiFile
+{
+private:
+    bool  file_exists;
+    void *buf;
+
+public:
+    tmpRiFile()
+    {
+        file_exists = false;
+        buf         = NULL;
+    }
+
+    ~tmpRiFile() { close(); }
+
+    int open(const char *which, void **buffer)
+    {
+        close();
+
+        if (ri.FS_ReadFile(which, buffer) != -1) {
+            file_exists = true;
+            buf         = *buffer;
+        }
+
+        return file_exists;
+    }
+
+    bool exists() const { return file_exists; }
+
+    void close()
+    {
+        if (file_exists) {
+            ri.FS_FreeFile(buf);
+            file_exists = false;
+        }
+    }
+};
+
+void lens_flare::Init(const char *which)
+{
+    char       *file;
+    const char *token;
+    tmpRiFile   theFile;
+
+    initted = false;
+    theFile.open("global/lensflaredefs.txt", (void **)&file);
+
+    if (!theFile.exists()) {
+        ri.Printf(PRINT_WARNING, "WARNING: Could not open lens flare info file!\n");
+        return;
+    }
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find begin for section '%s' in lensflares\n", which);
+            return;
+        }
+
+        if (!Q_stricmp(token, "begin")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!Q_stricmp(token, which)) {
+                break;
+            }
+        }
+    }
+
+    dot_min      = 0.8f;
+    fullscale    = 0.7f;
+    num_flares   = 0;
+    fullscreen   = NULL;
+    initted      = true;
+    fullfade     = 0;
+    blend_active = false;
+
+    while ((token = COM_ParseExt(&file, qtrue))) {
+        if (!file) {
+            ri.Printf(PRINT_WARNING, "WARNING: could not find end for section '%s' in lensflares\n", which);
+            break;
+        }
+
+        if (!Q_stricmp(token, "dot_min")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: invalid dot_min in lensflares\n");
+                continue;
+            }
+            dot_min = atof(token);
+        } else if (!Q_stricmp(token, "flare")) {
+            assert(num_flares < MAX_FLARES);
+
+            flares[num_flares].alphascale = 1.0;
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 1 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].size = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 2 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].where = atof(token);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no flare arg 3 for flare '%d' in lensflares\n", num_flares);
+                continue;
+            }
+            flares[num_flares].shader = R_FindShader(token, -1, qfalse);
+
+            token = COM_ParseExt(&file, qfalse);
+            if (token[0]) {
+                flares[num_flares].alphascale = atof(token);
+            }
+
+            num_flares++;
+        } else if (!Q_stricmp(token, "fullscale")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullscale, assuming default (in lensflares)\n");
+                continue;
+            }
+            fullscale = atof(token);
+        } else if (!Q_stricmp(token, "fullscreen")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullsreen in lensflares\n");
+                continue;
+            }
+            fullscreen = R_FindShader(token, -1, qfalse);
+        } else if (!Q_stricmp(token, "fullfade")) {
+            token = COM_ParseExt(&file, qfalse);
+            if (!token[0]) {
+                ri.Printf(PRINT_WARNING, "WARNING: no arg for fullfade in lensflares\n");
+                continue;
+            }
+            fullfade = atof(token);
+        } else if (!Q_stricmp(token, "end")) {
+            break;
+        }
+    }
+
+    if (!num_flares) {
+        ri.Printf(PRINT_WARNING, "WARNING: no lensflares defined!\n");
+    }
+    lasttime = backEnd.refdef.time - fullfade;
+}
+
+static void R_DrawSunFlare()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        if (!s_sun.szFlareName[0]) {
+            return;
+        }
+        if (Q_stricmp(s_sun.szFlareName, "none")) {
+            sunFlare.Init(s_sun.szFlareName);
+        }
+    }
+
+    if (!sunFlare.initted) {
+        s_sun.szFlareName[0] = 0;
+        return;
+    }
+
+    if (!sunFlare.num_flares) {
+        return;
+    }
+
+    VectorMA(backEnd.viewParms.or.origin, 16384, s_sun.flaredirection, sunFlare.trace_v);
+    VectorMA(backEnd.viewParms.or.origin, 128, s_sun.flaredirection, sunFlare.v);
+
+    sunFlare.SunTry();
+}
+
+static void R_DrawSunFlareBlend()
+{
+    if (!s_sun.exists) {
+        return;
+    }
+    if (!sunFlare.initted) {
+        return;
+    }
+
+    sunFlare.ScreenBlend();
+}
+
+void R_DrawLensFlares()
+{
+    // FIXME: unimplemented (GL2)
+#if 0
+    int i;
+
+    R_RotateForViewer();
+
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglMatrixMode(GL_PROJECTION);
+    qglPushMatrix();
+    qglLoadIdentity();
+    qglOrtho(-1.0, 1.0, -1.0, 1.0, -99999.0, 99999.0);
+
+    tess.no_global_fog = true;
+    R_DrawSunFlare();
+
+    for (i = 0; i < backEnd.refdef.num_entities; i++) {
+        if ((backEnd.viewParms.isPortalSky && !(backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))
+            || (!backEnd.viewParms.isPortalSky && (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY))) {
+            continue;
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_LENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                dlights.InPortalSky();
+            } else {
+                dlights.NotInPortalSky();
+            }
+
+            dlights.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            //
+            // Set the dlight color from entity
+            //
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            dlights.SetColor(rgb);
+
+            dlights.Try();
+        }
+
+        if (backEnd.refdef.entities[i].e.renderfx & RF_VIEWLENSFLARE) {
+            vec3_t rgb;
+
+            if (backEnd.refdef.entities[i].e.renderfx & RF_SKYENTITY) {
+                torches.InPortalSky();
+            } else {
+                torches.NotInPortalSky();
+            }
+
+            torches.SetVect(backEnd.refdef.entities[i].e.origin);
+
+            rgb[0] = backEnd.refdef.entities[i].e.shaderRGBA[0] / 255.0;
+            rgb[1] = backEnd.refdef.entities[i].e.shaderRGBA[1] / 255.0;
+            rgb[2] = backEnd.refdef.entities[i].e.shaderRGBA[2] / 255.0;
+            torches.SetColor(rgb);
+
+            torches.Try();
+        }
+    }
+
+    for (i = 0; i < backEnd.refdef.num_dlights; i++) {
+        if ((backEnd.refdef.dlights[i].type & dlighttype_t::lensflare)
+            || (backEnd.refdef.dlights[i].type & dlighttype_t::additive)) {
+            dlights.NotInPortalSky();
+            dlights.SetVect(backEnd.refdef.dlights[i].origin);
+            dlights.SetColor(backEnd.refdef.dlights[i].color);
+
+            dlights.Try();
+        }
+    }
+
+    R_DrawSunFlareBlend();
+    tess.no_global_fog = qfalse;
+
+    qglPopMatrix();
+    qglMatrixMode(GL_MODELVIEW);
+    qglPopMatrix();
+#endif
+}
+
+void R_InitLensFlare()
+{
+    torches.Init("entity");
+    dlights.Init("dlight");
+    sunFlare.initted = false;
+}
+
+bool sun_flare_class::SunCheckRay()
+{
+    mnode_t *pViewLeaf;
+    trace_t  trace;
+
+    pViewLeaf = R_PointInLeaf(tr.refdef.vieworg);
+
+    if (pViewLeaf->area == -1 || !tr.world->vis || tr.sSunLight.leaf != (mnode_s *)-1
+        || pViewLeaf->numlights && pViewLeaf->lights[0] == &tr.sSunLight) {
+        ri.CM_BoxTrace(
+            &trace, backEnd.viewParms.or.origin, trace_v, vec3_origin, vec3_origin, 0, CONTENTS_SOLID, qfalse
+        );
+
+        if (trace.surfaceFlags & SURF_SKY) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void sun_flare_class::SunScreenCalc()
+{
+    vec4_t eye;
+    vec4_t clip;
+    vec4_t point;
+    int    i, j;
+
+    VectorCopy(v, point);
+    point[3] = 1.0;
+
+    VectorClear4(eye);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            eye[i] += point[j] * tr.or.modelMatrix[i + j * 4];
+        }
+    }
+
+    VectorClear4(clip);
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 4; j++) {
+            clip[i] += eye[j] * tr.viewParms.projectionMatrix[i + j * 4];
+        }
+    }
+
+    for (i = 0; i < 2; i++) {
+        screen[i] = clip[i] / clip[3];
+    }
+}
+
+void sun_flare_class::SunTry()
+{
+    vec2_t   diff;
+    vec2_t   point;
+    float    alpha;
+    int      i;
+    qboolean bDrawingFade = qfalse;
+
+    if (!CheckRange()) {
+        return;
+    }
+
+    if (SunCheckRay()) {
+        alpha = (dot - dot_min) / (1.0 - dot_min);
+    } else {
+        int timediff;
+
+        if (!fullscreen) {
+            return;
+        }
+        if (!blend_active) {
+            return;
+        }
+
+        timediff = backEnd.refdef.time - lasttime;
+        alpha    = (float)(fullfade - timediff) / fullfade * lastbright;
+
+        if (alpha <= 0.0001) {
+            return;
+        }
+
+        bDrawingFade = qtrue;
+    }
+
+    SunScreenCalc();
+    VectorScale2D(screen, -2.0, diff);
+
+    for (i = 0; i < num_flares; i++) {
+        flare_s *flare = &flares[i];
+
+        VectorMA2D(screen, flare->where, diff, point);
+
+        RB_Color4f(color[0], color[1], color[2], alpha * this->alpha * flare->alphascale);
+        RB_StreamBegin(flare->shader);
+        RB_Texcoord2f(0.0, 0.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] + flare->size);
+        RB_Texcoord2f(1.0, 0.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] + flare->size);
+        RB_Texcoord2f(0.0, 1.0);
+
+        RB_Vertex2f(point[0] - flare->size, point[1] - flare->size);
+        RB_Texcoord2f(1.0, 1.0);
+
+        RB_Vertex2f(point[0] + flare->size, point[1] - flare->size);
+        RB_StreamEnd();
+    }
+
+    if (!bDrawingFade) {
+        lasttime     = backEnd.refdef.time;
+        blend_active = true;
+        lastbright   = Square(alpha) * Square(alpha) * fullscale;
+    }
+}
diff --git a/code/renderergl2/tr_surface.c b/code/renderergl2/tr_surface.c
index 3151638a..72e3a585 100644
--- a/code/renderergl2/tr_surface.c
+++ b/code/renderergl2/tr_surface.c
@@ -1299,6 +1299,128 @@ void RB_SurfaceVaoMdvMesh(srfVaoMdvMesh_t * surface)
 static void RB_SurfaceSkip( void *surf ) {
 }
 
+//
+// OPENMOHAA-specific stuff
+//=========================
+
+/*
+=============
+RB_SurfaceMarkFragment
+=============
+*/
+void RB_SurfaceMarkFragment(srfMarkFragment_t* p) {
+	int i;
+	int numv;
+
+	RB_CHECKOVERFLOW( p->numVerts, 3*(p->numVerts - 2) );
+
+	if (p->iIndex <= 0 || R_TerrainHeightForPoly(&tr.world->terraPatches[p->iIndex - 1], p->verts, p->numVerts))
+	{
+		// FIXME: from here on out, it's mostly the same code as in RB_SurfacePolychain,
+		// common part could be extracted into an inline func
+
+		// fan triangles into the tess array
+		numv = tess.numVertexes;
+		for ( i = 0; i < p->numVerts; i++ )
+		{
+			VectorCopy( p->verts[i].xyz, tess.xyz[numv] );
+            tess.texCoords[numv][0] = p->verts[i].st[0];
+            tess.texCoords[numv][1] = p->verts[i].st[1];
+			tess.color[numv][0] = p->verts[i].modulate[0] * 65535 / 255;
+            tess.color[numv][1] = p->verts[i].modulate[1] * 65535 / 255;
+            tess.color[numv][2] = p->verts[i].modulate[2] * 65535 / 255;
+            tess.color[numv][3] = p->verts[i].modulate[3] * 65535 / 255;
+
+			numv++;
+		}
+
+		// generate fan indexes into the tess array
+		for ( i = 0; i < p->numVerts - 2; i++ ) {
+			tess.indexes[tess.numIndexes + 0] = tess.numVertexes;
+			tess.indexes[tess.numIndexes + 1] = tess.numVertexes + i + 1;
+			tess.indexes[tess.numIndexes + 2] = tess.numVertexes + i + 2;
+			tess.numIndexes += 3;
+		}
+
+		tess.numVertexes = numv;
+	}
+}
+
+void RB_DrawTerrainTris(srfTerrain_t* p) {
+	int i;
+	terraInt numv;
+	int dlightBits;
+
+	RB_CHECKOVERFLOW(p->nVerts, p->nTris * 3);
+
+	dlightBits = p->dlightBits[0];
+	tess.dlightBits |= dlightBits;
+	if (p->dlightMap[0])
+	{
+		float lmScale = (1.0 / LIGHTMAP_SIZE) / p->lmapStep;
+
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+            tess.texCoords[tess.numVertexes][0] = g_pVert[i].texCoords[0][0];
+            tess.texCoords[tess.numVertexes][1] = g_pVert[i].texCoords[0][1];
+            tess.lightCoords[tess.numVertexes][0] = g_pVert[i].xyz[0] * lmScale + p->lmapX;
+            tess.lightCoords[tess.numVertexes][1] = g_pVert[i].xyz[1] * lmScale + p->lmapY;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+			tess.color[tess.numVertexes][0] = 0xffff;
+			tess.color[tess.numVertexes][1] = 0xffff;
+			tess.color[tess.numVertexes][2] = 0xffff;
+			tess.color[tess.numVertexes][3] = 0xffff;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+	else
+	{
+		for (i = p->iVertHead; i; i = g_pVert[i].iNext) {
+			assert(tess.numVertexes < SHADER_MAX_VERTEXES);
+
+			VectorCopy(g_pVert[i].xyz, tess.xyz[tess.numVertexes]);
+            tess.texCoords[tess.numVertexes][0] = g_pVert[i].texCoords[0][0];
+            tess.texCoords[tess.numVertexes][1] = g_pVert[i].texCoords[0][1];
+            tess.lightCoords[tess.numVertexes][0] = g_pVert[i].texCoords[1][0];
+            tess.lightCoords[tess.numVertexes][1] = g_pVert[i].texCoords[1][1];
+			//tess.vertexDlightBits[tess.numVertexes] = dlightBits;
+			tess.normal[tess.numVertexes][0] = 0;
+			tess.normal[tess.numVertexes][1] = 0;
+			tess.normal[tess.numVertexes][2] = 1.0;
+            tess.color[tess.numVertexes][0] = 0xffff;
+            tess.color[tess.numVertexes][1] = 0xffff;
+            tess.color[tess.numVertexes][2] = 0xffff;
+            tess.color[tess.numVertexes][3] = 0xffff;
+
+			g_pVert[i].iVertArray = tess.numVertexes;
+			tess.numVertexes++;
+		}
+	}
+
+	for (i = p->iTriHead; i; i = g_pTris[i].iNext)
+	{
+		assert(tess.numVertexes < SHADER_MAX_INDEXES);
+
+		//
+		// Make sure these can be drawn
+		//
+		if (g_pTris[i].byConstChecks & 4)
+		{
+			tess.indexes[tess.numIndexes] = g_pVert[g_pTris[i].iPt[0]].iVertArray;
+			tess.indexes[tess.numIndexes + 1] = g_pVert[g_pTris[i].iPt[1]].iVertArray;
+			tess.indexes[tess.numIndexes + 2] = g_pVert[g_pTris[i].iPt[2]].iVertArray;
+			tess.numIndexes += 3;
+		}
+	}
+}
+
+//=========================
 
 void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceBad,			// SF_BAD, 
@@ -1313,5 +1435,15 @@ void (*rb_surfaceTable[SF_NUM_SURFACE_TYPES])( void *) = {
 	(void(*)(void*))RB_SurfaceFlare,		// SF_FLARE,
 	(void(*)(void*))RB_SurfaceEntity,		// SF_ENTITY
 	(void(*)(void*))RB_SurfaceVaoMdvMesh,   // SF_VAO_MDVMESH
-	(void(*)(void*))RB_IQMSurfaceAnimVao,   // SF_VAO_IQM
+    (void(*)(void*))RB_IQMSurfaceAnimVao,   // SF_VAO_IQM
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+    (void(*)(void*))RB_SurfaceMarkFragment, // SF_MARK_FRAG
+	(void(*)(void*))RB_SkelMesh,			// SF_TIKI_SKEL
+	(void(*)(void*))RB_StaticMesh,			// SF_TIKI_STATIC
+	(void(*)(void*))RB_DrawSwipeSurface,	// SF_SWIPE
+	(void(*)(void*))RB_DrawSprite,			// SF_SPRITE
+    (void(*)(void*))RB_DrawTerrainTris,		// SF_TERRAIN_PATCH
+    //=========================
 };
diff --git a/code/renderergl2/tr_swipe.cpp b/code/renderergl2/tr_swipe.cpp
new file mode 100644
index 00000000..90081678
--- /dev/null
+++ b/code/renderergl2/tr_swipe.cpp
@@ -0,0 +1,183 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_swipe.cpp -- swipe rendering
+
+#include "tr_local.h"
+
+#define MAX_SWIPE_POINTS 1024
+#define MAX_SWIPES       32
+
+typedef struct {
+    vec3_t points[2];
+    float  time;
+} rswipepoint_t;
+
+typedef struct {
+    surfaceType_t surftype;
+    float         life;
+    float         time;
+    int           lastrendtime;
+    qhandle_t     shader;
+    int           numswipes;
+    rswipepoint_t swipes[MAX_SWIPE_POINTS];
+} rendswipe_t;
+
+static int         lastswipeframe;
+static int         numswipes;
+static rendswipe_t swipes[MAX_SWIPES];
+
+/*
+======================
+RE_SwipeBegin
+======================
+*/
+void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
+{
+    rendswipe_t *swipe;
+
+    if (tr.frameCount != lastswipeframe) {
+        swipe     = &swipes[0];
+        numswipes = 0;
+    }
+
+    if (numswipes >= MAX_SWIPES) {
+        return;
+    }
+
+    swipe = &swipes[numswipes++];
+
+    swipe->life         = life;
+    swipe->time         = thistime;
+    swipe->surftype     = SF_SWIPE;
+    swipe->numswipes    = 0;
+    swipe->lastrendtime = 0;
+    swipe->shader       = shader;
+
+    if (shader < 0 && life) {
+        ri.Printf(PRINT_DEVELOPER, "RE_SwipeBegin: Invalid shader handle\n");
+    }
+
+    lastswipeframe = tr.frameCount;
+}
+
+/*
+======================
+RE_SwipePoint
+======================
+*/
+void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
+{
+    rendswipe_t *swipe = &swipes[numswipes - 1];
+
+    if (swipe->numswipes >= MAX_SWIPE_POINTS) {
+        return;
+    }
+
+    VectorCopy(point1, swipe->swipes[swipe->numswipes - 1].points[0]);
+    VectorCopy(point2, swipe->swipes[swipe->numswipes - 1].points[1]);
+}
+
+/*
+======================
+RE_SwipeEnd
+======================
+*/
+void RE_SwipeEnd() {}
+
+/*
+======================
+R_AddSwipeSurfaces
+======================
+*/
+void R_AddSwipeSurfaces()
+{
+    shader_t *shader;
+    int       at;
+
+    if (!numswipes) {
+        return;
+    }
+
+    tr.currentEntityNum = ENTITYNUM_WORLD;
+    tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
+
+    for (at = 0; at < numswipes; at++) {
+        rendswipe_t *swipe     = &swipes[at];
+        int          timedelta = 0;
+
+        if (!swipe->numswipes) {
+            continue;
+        }
+
+        if (swipe->lastrendtime) {
+            timedelta = tr.refdef.time - swipe->lastrendtime;
+        }
+        swipe->lastrendtime = tr.refdef.time;
+
+        if (timedelta) {
+            swipe->time += timedelta;
+        }
+
+        shader = R_GetShaderByHandle(swipe->shader);
+        R_AddDrawSurf(&swipe->surftype, shader, 0, 0, 0, 0);
+    }
+}
+
+/*
+======================
+RB_DrawSwipeSurface
+======================
+*/
+void RB_DrawSwipeSurface(surfaceType_t *pswipe)
+{
+    int          i;
+    float        oolife;
+    rendswipe_t *swipe = (rendswipe_t *)pswipe;
+
+    oolife = 1.0 / swipe->life;
+
+    RB_CHECKOVERFLOW(swipe->numswipes * 2, swipe->numswipes * 6);
+
+    RB_StreamBeginDrawSurf();
+
+    for (i = 0; i < swipe->numswipes; i++) {
+        rswipepoint_t *swipepoint = &swipe->swipes[i];
+        float          alpha;
+        float          f;
+
+        f = 1.0 - (swipe->time - swipepoint->time) * oolife;
+        if (f > 0 && swipe->time >= swipepoint->time) {
+            alpha = f - Q_max(f - 1.0, 0);
+
+            RB_Color4f(alpha, alpha, alpha, alpha);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[0]);
+            RB_Texcoord2f(i / (float)swipe->numswipes, 1.0);
+            RB_Vertex3fv(swipepoint->points[1]);
+        } else if (i == swipe->numswipes - 1) {
+            swipe->numswipes = 0;
+        }
+    }
+
+    RB_StreamEndDrawSurf();
+}
diff --git a/code/renderergl2/tr_terrain.c b/code/renderergl2/tr_terrain.c
new file mode 100644
index 00000000..94c5fff2
--- /dev/null
+++ b/code/renderergl2/tr_terrain.c
@@ -0,0 +1,1713 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_terrain.c : Terrain rendering
+
+#include "tr_local.h"
+
+cvar_t *ter_maxlod;
+cvar_t *ter_maxtris;
+cvar_t *ter_cull;
+cvar_t *ter_lock;
+cvar_t *ter_error;
+cvar_t *ter_cautiousframes;
+cvar_t *ter_count;
+
+#define TERRAIN_TABLE_SIZE 180
+
+static float g_fDistanceTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotProductTable[TERRAIN_TABLE_SIZE];
+static float g_fClipDotSquaredTable[TERRAIN_TABLE_SIZE];
+static float g_fFogDistance;
+static float g_fClipDotProduct;
+static float g_fClipDotSquared;
+
+static vec3_t g_vClipOrigin;
+static vec3_t g_vClipVector;
+static vec3_t g_vViewOrigin;
+static vec3_t g_vViewVector;
+
+static int    g_terVisCount;
+static float  g_fCheck;
+static size_t g_nTris;
+static size_t g_nVerts;
+static int    g_nMerge;
+static int    g_nSplit;
+unsigned int  g_uiTerDist;
+vec2_t        g_vTerOrg;
+vec3_t        g_vTerFwd;
+
+static const unsigned int MAX_TERRAIN_LOD       = 6;
+static const float        TERRAIN_LIGHTMAP_SIZE = 128.0f;
+
+typedef struct poolInfo_s {
+    terraInt iFreeHead;
+    terraInt iCur;
+    size_t   nFree;
+} poolInfo_t;
+
+static int modeTable[8];
+
+terraTri_t    *g_pTris;
+terrainVert_t *g_pVert;
+
+poolInfo_t g_tri;
+poolInfo_t g_vert;
+
+/*
+================
+R_ValidateHeightmapForVertex
+================
+*/
+static void R_ValidateHeightmapForVertex(terraTri_t *pTri)
+{
+    for (terraInt i = 0; i < 3; i++) {
+        terrainVert_t *pVert = &g_pVert[pTri->iPt[i]];
+        if (pVert->pHgt < pTri->patch->heightmap || pVert->pHgt > &pTri->patch->heightmap[80]) {
+            pVert->pHgt = pTri->patch->heightmap;
+        }
+    }
+}
+
+/*
+================
+R_AllocateVert
+================
+*/
+static terraInt R_AllocateVert(cTerraPatchUnpacked_t *patch)
+{
+    terraInt iVert = g_vert.iFreeHead;
+
+    g_vert.iFreeHead                = g_pVert[g_vert.iFreeHead].iNext;
+    g_pVert[g_vert.iFreeHead].iPrev = 0;
+
+    g_pVert[iVert].iPrev                     = 0;
+    g_pVert[iVert].iNext                     = patch->drawinfo.iVertHead;
+    g_pVert[patch->drawinfo.iVertHead].iPrev = iVert;
+
+    patch->drawinfo.iVertHead = iVert;
+    patch->drawinfo.nVerts++;
+
+    assert(g_vert.nFree > 0);
+    g_vert.nFree--;
+
+    g_pVert[iVert].nRef         = 0;
+    g_pVert[iVert].uiDistRecalc = 0;
+
+    return iVert;
+}
+
+/*
+================
+R_InterpolateVert
+================
+*/
+static void R_InterpolateVert(terraTri_t *pTri, terrainVert_t *pVert)
+{
+    const terrainVert_t         *pVert0 = &g_pVert[pTri->iPt[0]];
+    const terrainVert_t         *pVert1 = &g_pVert[pTri->iPt[1]];
+    const cTerraPatchUnpacked_t *pPatch = pTri->patch;
+    const byte                  *pMinHeight, *pMaxHeight;
+
+    // Interpolate texture coordinates
+    pVert->texCoords[0][0] = (pVert0->texCoords[0][0] + pVert1->texCoords[0][0]) * 0.5f;
+    pVert->texCoords[0][1] = (pVert0->texCoords[0][1] + pVert1->texCoords[0][1]) * 0.5f;
+    pVert->texCoords[1][0] = (pVert0->texCoords[1][0] + pVert1->texCoords[1][0]) * 0.5f;
+    pVert->texCoords[1][1] = (pVert0->texCoords[1][1] + pVert1->texCoords[1][1]) * 0.5f;
+
+    // Fixed in OPM
+    //  Use the delta of the two pointers instead of adding them + divide to get the average height,
+    //  otherwise the resulting integer would overflow/warp and cause a segmentation fault.
+    //  Although rare, the overflow issue can occur in the original game
+    pMinHeight  = (byte *)Q_min((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pMaxHeight  = (byte *)Q_max((uintptr_t)pVert0->pHgt, (uintptr_t)pVert1->pHgt);
+    pVert->pHgt = (byte *)(pMinHeight + ((pMaxHeight - pMinHeight) >> 1));
+    assert(pVert->pHgt >= pMinHeight && pVert->pHgt < pMaxHeight || pMinHeight == pMaxHeight);
+
+    // Calculate the average Z
+    pVert->fHgtAvg = (float)(*pVert0->pHgt + *pVert1->pHgt);
+    pVert->fHgtAdd = (float)(*pVert->pHgt * 2) - pVert->fHgtAvg;
+    pVert->fHgtAvg += pPatch->z0;
+    // Calculate the average position
+    pVert->xyz[0] = (pVert0->xyz[0] + pVert1->xyz[0]) * 0.5f;
+    pVert->xyz[1] = (pVert0->xyz[1] + pVert1->xyz[1]) * 0.5f;
+    pVert->xyz[2] = pVert->fHgtAvg;
+}
+
+/*
+================
+R_ReleaseVert
+================
+*/
+static void R_ReleaseVert(cTerraPatchUnpacked_t *patch, int iVert)
+{
+    terrainVert_t *pVert = &g_pVert[iVert];
+
+    terraInt iPrev       = pVert->iPrev;
+    terraInt iNext       = pVert->iNext;
+    g_pVert[iPrev].iNext = iNext;
+    g_pVert[iNext].iPrev = iPrev;
+
+    assert(patch->drawinfo.nVerts > 0);
+    patch->drawinfo.nVerts--;
+
+    if (patch->drawinfo.iVertHead == iVert) {
+        patch->drawinfo.iVertHead = iNext;
+    }
+
+    pVert->iPrev                    = 0;
+    pVert->iNext                    = g_vert.iFreeHead;
+    g_pVert[g_vert.iFreeHead].iPrev = iVert;
+    g_vert.iFreeHead                = iVert;
+    g_vert.nFree++;
+}
+
+/*
+================
+R_AllocateTri
+================
+*/
+terraInt R_AllocateTri(cTerraPatchUnpacked_t *patch, qboolean check)
+{
+    terraInt iTri = g_tri.iFreeHead;
+
+    g_tri.iFreeHead                = g_pTris[iTri].iNext;
+    g_pTris[g_tri.iFreeHead].iPrev = 0;
+
+    g_pTris[iTri].iPrev                     = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext                     = 0;
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+    patch->drawinfo.iTriTail                = iTri;
+
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+
+    patch->drawinfo.nTris++;
+    assert(g_tri.nFree > 0);
+    g_tri.nFree--;
+
+    g_pTris[iTri].byConstChecks = check ? 0 : 4;
+    g_pTris[iTri].uiDistRecalc  = 0;
+    patch->uiDistRecalc         = 0;
+
+    return iTri;
+}
+
+/*
+================
+R_ReleaseTri
+================
+*/
+static void R_ReleaseTri(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraTri_t *pTri = &g_pTris[iTri];
+
+    terraInt iPrev       = pTri->iPrev;
+    terraInt iNext       = pTri->iNext;
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->uiDistRecalc = 0;
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    pTri->iPrev                    = 0;
+    pTri->iNext                    = g_tri.iFreeHead;
+    g_pTris[g_tri.iFreeHead].iPrev = iTri;
+    g_tri.iFreeHead                = iTri;
+    g_tri.nFree++;
+
+    for (int i = 0; i < 3; i++) {
+        terraInt ptNum = pTri->iPt[i];
+
+        g_pVert[ptNum].nRef--;
+        if (!g_pVert[ptNum].nRef) {
+            R_ReleaseVert(patch, ptNum);
+        }
+    }
+}
+
+/*
+================
+R_ConstChecksForTri
+================
+*/
+static int R_ConstChecksForTri(terraTri_t *pTri)
+{
+    varnodeUnpacked_t vn;
+
+    if (pTri->lod == MAX_TERRAIN_LOD) {
+        return 2;
+    }
+
+    vn = *pTri->varnode;
+    //vn.s.flags &= 0xF0;
+    vn.flags &= 0xFFFFFFF0;
+
+    if (vn.fVariance == 0.0 && !(pTri->varnode->flags & 8)) {
+        return 2;
+    } else if (pTri->varnode->flags & 8) {
+        return 3;
+    } else if ((pTri->byConstChecks & 4) && !(pTri->varnode->flags & 4) && pTri->lod < ter_maxlod->integer) {
+        return 0;
+    }
+
+    return 2;
+}
+
+/*
+================
+R_DemoteInAncestry
+================
+*/
+static void R_DemoteInAncestry(cTerraPatchUnpacked_t *patch, terraInt iTri)
+{
+    terraInt iPrev = g_pTris[iTri].iPrev;
+    terraInt iNext = g_pTris[iTri].iNext;
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    assert(patch->drawinfo.nTris > 0);
+    patch->drawinfo.nTris--;
+
+    if (patch->drawinfo.iTriHead == iTri) {
+        patch->drawinfo.iTriHead = iNext;
+    }
+
+    if (patch->drawinfo.iTriTail == iTri) {
+        patch->drawinfo.iTriTail = iPrev;
+    }
+
+    g_pTris[iTri].iPrev                       = 0;
+    g_pTris[iTri].iNext                       = patch->drawinfo.iMergeHead;
+    g_pTris[patch->drawinfo.iMergeHead].iPrev = iTri;
+    patch->drawinfo.iMergeHead                = iTri;
+}
+
+/*
+================
+R_TerrainHeapInit
+================
+*/
+static void R_TerrainHeapInit()
+{
+    g_tri.iFreeHead  = 1;
+    g_tri.nFree      = g_nTris - 1;
+    g_vert.iFreeHead = 1;
+    g_vert.nFree     = g_nVerts - 1;
+
+    for (size_t i = 0; i < g_nTris; i++) {
+        g_pTris[i].iPrev = (terraInt)i - 1;
+        g_pTris[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pTris[0].iPrev           = 0;
+    g_pTris[g_nTris - 1].iNext = 0;
+
+    for (size_t i = 0; i < g_nVerts; i++) {
+        g_pVert[i].iPrev = (terraInt)i - 1;
+        g_pVert[i].iNext = (terraInt)i + 1;
+    }
+
+    g_pVert[0].iPrev            = 0;
+    g_pVert[g_nVerts - 1].iNext = 0;
+}
+
+/*
+================
+R_TerrainPatchesInit
+================
+*/
+static void R_TerrainPatchesInit()
+{
+    int i;
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+        patch->drawinfo.iTriHead     = 0;
+        patch->drawinfo.iTriTail     = 0;
+        patch->drawinfo.iMergeHead   = 0;
+        patch->drawinfo.iVertHead    = 0;
+        patch->drawinfo.nTris        = 0;
+        patch->drawinfo.nVerts       = 0;
+    }
+}
+
+/*
+================
+R_SplitTri
+================
+*/
+
+void R_SplitTri(
+    terraInt iSplit, terraInt iNewPt, terraInt iLeft, terraInt iRight, terraInt iRightOfLeft, terraInt iLeftOfRight
+)
+{
+    terraTri_t *pSplit = &g_pTris[iSplit];
+
+    terraTri_t *pLeft;
+    if (iLeft) {
+        pLeft = &g_pTris[iLeft];
+    } else {
+        pLeft = NULL;
+    }
+
+    terraTri_t *pRight;
+    if (iRight) {
+        pRight = &g_pTris[iRight];
+    } else {
+        pRight = NULL;
+    }
+
+    int                iNextLod = pSplit->lod + 1;
+    int                index    = pSplit->index;
+    varnodeUnpacked_t *varnode  = &pSplit->varnode[index];
+
+    if (pLeft) {
+        pLeft->patch   = pSplit->patch;
+        pLeft->index   = index * 2;
+        pLeft->varnode = varnode;
+        pLeft->lod     = iNextLod;
+        pLeft->iLeft   = iRight;
+        pLeft->iRight  = iRightOfLeft;
+        pLeft->iBase   = pSplit->iLeft;
+        pLeft->iPt[0]  = pSplit->iPt[1];
+        pLeft->iPt[1]  = pSplit->iPt[2];
+        pLeft->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pLeft);
+        pLeft->byConstChecks |= R_ConstChecksForTri(pLeft);
+
+        g_pVert[pLeft->iPt[0]].nRef++;
+        g_pVert[pLeft->iPt[1]].nRef++;
+        g_pVert[pLeft->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pLeft->nSplit = 0;
+    }
+
+    if (pSplit->iLeft) {
+        if (g_pTris[pSplit->iLeft].lod == iNextLod) {
+            g_pTris[pSplit->iLeft].iBase = iLeft;
+        } else {
+            g_pTris[pSplit->iLeft].iRight = iLeft;
+        }
+    }
+
+    if (pRight) {
+        pRight->patch   = pSplit->patch;
+        pRight->index   = index * 2 + 1;
+        pRight->varnode = varnode + 1;
+        pRight->lod     = iNextLod;
+        pRight->iLeft   = iLeftOfRight;
+        pRight->iRight  = iLeft;
+        pRight->iBase   = pSplit->iRight;
+        pRight->iPt[0]  = pSplit->iPt[2];
+        pRight->iPt[1]  = pSplit->iPt[0];
+        pRight->iPt[2]  = iNewPt;
+
+        R_ValidateHeightmapForVertex(pRight);
+        pRight->byConstChecks |= R_ConstChecksForTri(pRight);
+
+        g_pVert[pRight->iPt[0]].nRef++;
+        g_pVert[pRight->iPt[1]].nRef++;
+        g_pVert[pRight->iPt[2]].nRef++;
+        g_pTris[pSplit->iParent].nSplit++;
+        pRight->nSplit = 0;
+    }
+
+    if (pSplit->iRight) {
+        if (g_pTris[pSplit->iRight].lod == iNextLod) {
+            g_pTris[pSplit->iRight].iBase = iRight;
+        } else {
+            g_pTris[pSplit->iRight].iLeft = iRight;
+        }
+    }
+}
+
+/*
+================
+R_ForceSplit
+================
+*/
+static void R_ForceSplit(terraInt iTri)
+{
+    terraTri_t    *pTri = &g_pTris[iTri];
+    terraTri_t    *pBase;
+    terrainVert_t *pVert;
+    terraInt       iBase;
+    terraInt       iTriLeft, iTriRight;
+    terraInt       iNewPt;
+    terraInt       iBaseLeft = 0, iBaseRight = 0;
+    terraInt       iNewBasePt;
+    uint32_t       flags, flags2;
+
+    g_nSplit++;
+
+    iBase = pTri->iBase;
+    pBase = &g_pTris[iBase];
+    if (iBase && pBase->lod != pTri->lod) {
+        assert(g_pTris[pTri->iBase].iBase != iTri);
+        assert(g_tri.nFree >= 8);
+
+        R_ForceSplit(iBase);
+
+        assert(g_tri.nFree >= 4);
+
+        iBase = pTri->iBase;
+        pBase = &g_pTris[iBase];
+    }
+
+    flags = pTri->varnode->flags;
+
+    iTriLeft  = R_AllocateTri(pTri->patch, (flags & 2));
+    iTriRight = R_AllocateTri(pTri->patch, (flags & 1));
+
+    iNewPt = R_AllocateVert(pTri->patch);
+    R_InterpolateVert(pTri, &g_pVert[iNewPt]);
+
+    g_pVert[iNewPt].fVariance = pTri->varnode->fVariance;
+
+    iBaseLeft  = 0;
+    iBaseRight = 0;
+
+    if (iBase) {
+        flags2 = pBase->varnode->flags;
+        flags |= flags2;
+
+        iBaseLeft  = R_AllocateTri(pBase->patch, (flags2 & 2));
+        iBaseRight = R_AllocateTri(pBase->patch, (flags2 & 1));
+
+        iNewBasePt = iNewPt;
+        if (pBase->patch != pTri->patch) {
+            iNewBasePt = R_AllocateVert(pBase->patch);
+            pVert      = &g_pVert[iNewBasePt];
+            R_InterpolateVert(pBase, pVert);
+
+            pVert->fVariance = g_pVert[iNewPt].fVariance;
+            if (flags & 8) {
+                pVert->fHgtAvg += pVert->fHgtAdd;
+                pVert->fHgtAdd   = 0.0;
+                pVert->fVariance = 0.0;
+                pVert->xyz[2]    = pVert->fHgtAvg;
+            }
+        }
+
+        R_SplitTri(iBase, iNewBasePt, iBaseLeft, iBaseRight, iTriRight, iTriLeft);
+
+        pBase->iLeftChild           = iBaseLeft;
+        pBase->iRightChild          = iBaseRight;
+        g_pTris[iBaseLeft].iParent  = iBase;
+        g_pTris[iBaseRight].iParent = iBase;
+        R_DemoteInAncestry(pBase->patch, iBase);
+    }
+
+    if (flags & 8) {
+        pVert = &g_pVert[iNewPt];
+        pVert->fHgtAvg += pVert->fHgtAdd;
+        pVert->fHgtAdd   = 0.0;
+        pVert->fVariance = 0.0;
+        pVert->xyz[2]    = pVert->fHgtAvg;
+    }
+
+    R_SplitTri(iTri, iNewPt, iTriLeft, iTriRight, iBaseRight, iBaseLeft);
+
+    pTri->iLeftChild           = iTriLeft;
+    pTri->iRightChild          = iTriRight;
+    g_pTris[iTriLeft].iParent  = iTri;
+    g_pTris[iTriRight].iParent = iTri;
+    R_DemoteInAncestry(pTri->patch, iTri);
+}
+
+/*
+================
+R_ForceMerge
+================
+*/
+static void R_ForceMerge(terraInt iTri)
+{
+    terraTri_t            *pTri  = &g_pTris[iTri];
+    cTerraPatchUnpacked_t *patch = pTri->patch;
+    terraInt               iPrev = pTri->iPrev;
+    terraInt               iNext = pTri->iNext;
+
+    g_nMerge++;
+
+    if (pTri->iLeftChild) {
+        terraInt iLeft = g_pTris[pTri->iLeftChild].iBase;
+
+        pTri->iLeft = iLeft;
+        if (iLeft) {
+            if (g_pTris[iLeft].lod == pTri->lod) {
+                g_pTris[iLeft].iRight = iTri;
+            } else {
+                g_pTris[iLeft].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iLeftChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    if (pTri->iRightChild) {
+        terraInt iRight = g_pTris[pTri->iRightChild].iBase;
+
+        pTri->iRight = iRight;
+        if (iRight) {
+            if (g_pTris[iRight].lod == pTri->lod) {
+                g_pTris[iRight].iLeft = iTri;
+            } else {
+                g_pTris[iRight].iBase = iTri;
+            }
+        }
+
+        R_ReleaseTri(pTri->patch, pTri->iRightChild);
+
+        pTri->iLeftChild = 0;
+        g_pTris[pTri->iParent].nSplit--;
+    }
+
+    g_pTris[iPrev].iNext = iNext;
+    g_pTris[iNext].iPrev = iPrev;
+
+    if (g_tri.iCur == iTri) {
+        g_tri.iCur = iNext;
+    }
+
+    patch->drawinfo.nTris++;
+    if (patch->drawinfo.iMergeHead == iTri) {
+        patch->drawinfo.iMergeHead = iNext;
+    }
+
+    g_pTris[iTri].iPrev = patch->drawinfo.iTriTail;
+    g_pTris[iTri].iNext = 0;
+
+    g_pTris[patch->drawinfo.iTriTail].iNext = iTri;
+
+    patch->drawinfo.iTriTail = iTri;
+    if (!patch->drawinfo.iTriHead) {
+        patch->drawinfo.iTriHead = iTri;
+    }
+}
+
+/*
+================
+R_TerraTriNeighbor
+================
+*/
+static int R_TerraTriNeighbor(cTerraPatchUnpacked_t *terraPatches, int iPatch, int dir)
+{
+    int iNeighbor;
+
+    if (iPatch < 0) {
+        return 0;
+    }
+
+    iNeighbor = 2 * iPatch + 1;
+
+    switch (dir) {
+    case 0:
+        return iNeighbor;
+    case 1:
+        if (terraPatches[iPatch].flags & 0x80) {
+            return iNeighbor;
+        } else {
+            return iNeighbor + 1;
+        }
+        break;
+    case 2:
+        return iNeighbor + 1;
+    case 3:
+        if (terraPatches[iPatch].flags & 0x80) {
+            return iNeighbor + 1;
+        } else {
+            return iNeighbor;
+        }
+        break;
+    }
+
+    return 0;
+}
+
+/*
+================
+R_PreTessellateTerrain
+================
+*/
+static void R_PreTessellateTerrain()
+{
+    size_t numTerrainPatches = tr.world->numTerraPatches;
+
+    if (!numTerrainPatches) {
+        return;
+    }
+
+    R_IssuePendingRenderCommands();
+
+    if (ter_maxtris->integer < 4 * numTerrainPatches) {
+        ri.Cvar_SetValue("ter_maxtris", 4 * numTerrainPatches);
+    } else if (ter_maxtris->integer > 65535) {
+        ri.Cvar_SetValue("ter_maxtris", 65535);
+    }
+
+    ri.Printf(PRINT_DEVELOPER, "Using ter_maxtris = %d\n", ter_maxtris->integer);
+
+    g_nTris  = ter_maxtris->integer * 2 + 1;
+    g_nVerts = ter_maxtris->integer + 1;
+    g_pTris  = ri.Hunk_Alloc(g_nTris * sizeof(terraTri_t), h_dontcare);
+    g_pVert  = ri.Hunk_Alloc(g_nVerts * sizeof(terrainVert_t), h_dontcare);
+
+    // Init triangles & vertices
+    R_TerrainHeapInit();
+    R_TerrainPatchesInit();
+
+    for (size_t i = 0; i < numTerrainPatches; i++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[i];
+
+        patch->drawinfo.surfaceType = SF_TERRAIN_PATCH;
+        patch->drawinfo.nTris       = 0;
+        patch->drawinfo.nVerts      = 0;
+        patch->drawinfo.iTriHead    = 0;
+        patch->drawinfo.iTriTail    = 0;
+        patch->drawinfo.iVertHead   = 0;
+
+        float sMin, tMin;
+
+        if (patch->texCoord[0][0][0] < patch->texCoord[0][1][0]) {
+            sMin = patch->texCoord[0][0][0];
+        } else {
+            sMin = patch->texCoord[0][1][0];
+        }
+
+        float sMin2;
+        if (patch->texCoord[1][0][0] < patch->texCoord[1][1][0]) {
+            sMin2 = patch->texCoord[1][0][0];
+        } else {
+            sMin2 = patch->texCoord[1][1][0];
+        }
+
+        if (sMin >= sMin2) {
+            if (patch->texCoord[1][0][0] >= patch->texCoord[1][1][0]) {
+                sMin = floor(patch->texCoord[1][1][0]);
+            } else {
+                sMin = floor(patch->texCoord[1][0][0]);
+            }
+        } else if (patch->texCoord[0][0][0] >= patch->texCoord[0][1][0]) {
+            sMin = floor(patch->texCoord[0][1][0]);
+        } else {
+            sMin = floor(patch->texCoord[0][0][0]);
+        }
+
+        if (patch->texCoord[0][0][1] < patch->texCoord[0][1][1]) {
+            tMin = patch->texCoord[0][0][1];
+        } else {
+            tMin = patch->texCoord[0][1][1];
+        }
+
+        float tMin2;
+        if (patch->texCoord[1][0][1] < patch->texCoord[1][1][1]) {
+            tMin2 = patch->texCoord[1][0][1];
+        } else {
+            tMin2 = patch->texCoord[1][1][1];
+        }
+
+        if (tMin >= tMin2) {
+            if (patch->texCoord[1][0][1] >= patch->texCoord[1][1][1]) {
+                tMin = floor(patch->texCoord[1][1][1]);
+            } else {
+                tMin = floor(patch->texCoord[1][0][1]);
+            }
+        } else if (patch->texCoord[0][0][1] >= patch->texCoord[0][1][1]) {
+            tMin = floor(patch->texCoord[0][1][1]);
+        } else {
+            tMin = floor(patch->texCoord[0][0][1]);
+        }
+
+        const float s00 = patch->texCoord[0][0][0] - sMin;
+        const float s01 = patch->texCoord[0][1][0] - sMin;
+        const float s10 = patch->texCoord[1][0][0] - sMin;
+        const float s11 = patch->texCoord[1][1][0] - sMin;
+
+        const float t00 = patch->texCoord[0][0][1] - tMin;
+        const float t01 = patch->texCoord[0][1][1] - tMin;
+        const float t10 = patch->texCoord[1][0][1] - tMin;
+        const float t11 = patch->texCoord[1][1][1] - tMin;
+
+        const float lmapSize = (float)(patch->drawinfo.lmapSize - 1) / TERRAIN_LIGHTMAP_SIZE;
+        const float ls       = patch->s + lmapSize;
+        const float lt       = patch->t + lmapSize;
+
+        terraInt iTri0 = R_AllocateTri(patch, qfalse);
+        terraInt iTri1 = R_AllocateTri(patch, qfalse);
+        terraInt i00   = R_AllocateVert(patch);
+        terraInt i01   = R_AllocateVert(patch);
+        terraInt i10   = R_AllocateVert(patch);
+        terraInt i11   = R_AllocateVert(patch);
+
+        terrainVert_t *pVert;
+        pVert                  = &g_pVert[i00];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[0] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[0];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s00;
+        pVert->texCoords[0][1] = t00;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i01];
+        pVert->xyz[0]          = patch->x0;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[72] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[72];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s01;
+        pVert->texCoords[0][1] = t01;
+        pVert->texCoords[1][0] = patch->s;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i10];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0;
+        pVert->xyz[2]          = (float)(patch->heightmap[8] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[8];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s10;
+        pVert->texCoords[0][1] = t10;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = patch->t;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        pVert                  = &g_pVert[i11];
+        pVert->xyz[0]          = patch->x0 + 512.0f;
+        pVert->xyz[1]          = patch->y0 + 512.0f;
+        pVert->xyz[2]          = (float)(patch->heightmap[80] * 2) + patch->z0;
+        pVert->pHgt            = &patch->heightmap[80];
+        pVert->fHgtAvg         = pVert->xyz[2];
+        pVert->texCoords[0][0] = s11;
+        pVert->texCoords[0][1] = t11;
+        pVert->texCoords[1][0] = ls;
+        pVert->texCoords[1][1] = lt;
+        pVert->fVariance       = 0.0f;
+        pVert->nRef            = 4;
+
+        terraTri_t *pTri = &g_pTris[iTri0];
+        pTri->patch      = patch;
+        pTri->varnode    = &patch->varTree[0][0];
+        pTri->index      = 1;
+        pTri->lod        = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri1;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            } else {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            }
+            pTri->iPt[2] = i01;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iNorth, 2);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            } else {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            }
+            pTri->iPt[2] = i11;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+
+        pTri          = &g_pTris[iTri1];
+        pTri->patch   = patch;
+        pTri->varnode = &patch->varTree[1][0];
+        pTri->index   = 1;
+        pTri->lod     = 0;
+        pTri->byConstChecks |= R_ConstChecksForTri(pTri);
+
+        pTri->iBase = iTri0;
+        if ((patch->flags & 0x80u) == 0) {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iEast, 3);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i11;
+                pTri->iPt[1] = i00;
+            } else {
+                pTri->iPt[0] = i00;
+                pTri->iPt[1] = i11;
+            }
+            pTri->iPt[2] = i10;
+        } else {
+            pTri->iLeft  = R_TerraTriNeighbor(tr.world->terraPatches, patch->iSouth, 0);
+            pTri->iRight = R_TerraTriNeighbor(tr.world->terraPatches, patch->iWest, 1);
+            if (patch->flags & 0x40) {
+                pTri->iPt[0] = i10;
+                pTri->iPt[1] = i01;
+            } else {
+                pTri->iPt[0] = i01;
+                pTri->iPt[1] = i10;
+            }
+            pTri->iPt[2] = i00;
+        }
+
+        R_ValidateHeightmapForVertex(pTri);
+    }
+}
+
+/*
+================
+R_NeedSplitTri
+================
+*/
+static qboolean R_NeedSplitTri(terraTri_t *pTri)
+{
+    uint8_t byConstChecks = pTri->byConstChecks;
+    if (byConstChecks & 2) {
+        return byConstChecks & 1;
+    }
+
+    if (pTri->uiDistRecalc > g_uiTerDist) {
+        return qfalse;
+    }
+
+    float fRatio = ((g_pVert[pTri->iPt[0]].xyz[0] + g_pVert[pTri->iPt[1]].xyz[0]) * g_vViewVector[0]
+                    + (g_pVert[pTri->iPt[0]].xyz[1] + g_pVert[pTri->iPt[1]].xyz[1]) * g_vViewVector[1])
+                     * 0.5
+                 + g_vViewVector[2] - pTri->varnode->fVariance * g_fCheck;
+
+    if (fRatio > 0) {
+        pTri->uiDistRecalc = floor(fRatio) + g_uiTerDist;
+        return qfalse;
+    }
+
+    return qtrue;
+}
+
+/*
+================
+R_CalcVertMorphHeight
+================
+*/
+static void R_CalcVertMorphHeight(terrainVert_t *pVert)
+{
+    float dot;
+
+    pVert->xyz[2]       = pVert->fHgtAvg;
+    pVert->uiDistRecalc = g_uiTerDist + 1;
+    dot                 = (pVert->fVariance * g_fCheck)
+        - (g_vViewVector[0] * pVert->xyz[0] + g_vViewVector[1] * pVert->xyz[1] + g_vViewVector[2]);
+
+    if (dot > 0.0) {
+        float calc = dot / 400.0;
+
+        if (calc > 1.0) {
+            pVert->uiDistRecalc = (unsigned int)((g_uiTerDist - 400) + floor(dot));
+            calc                = 1.0;
+        }
+
+        pVert->xyz[2] += pVert->fHgtAdd * calc;
+    } else {
+        pVert->uiDistRecalc = g_uiTerDist - (int)ceil(dot);
+    }
+}
+
+/*
+================
+R_UpdateVertMorphHeight
+================
+*/
+static void R_UpdateVertMorphHeight(terrainVert_t *pVert)
+{
+    if (pVert->uiDistRecalc <= g_uiTerDist) {
+        R_CalcVertMorphHeight(pVert);
+    }
+}
+
+/*
+================
+R_DoTriSplitting
+================
+*/
+static void R_DoTriSplitting()
+{
+    cTerraPatchUnpacked_t *patch;
+
+    for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+        if (patch->uiDistRecalc > g_uiTerDist) {
+            continue;
+        }
+
+        patch->uiDistRecalc = -1;
+        g_tri.iCur          = patch->drawinfo.iTriHead;
+        while (g_tri.iCur != 0) {
+            terraTri_t *pTri = &g_pTris[g_tri.iCur];
+
+            if (R_NeedSplitTri(pTri)) {
+                //
+                // make sure there are sufficient number of tris
+                //
+                if (g_tri.nFree < 14*2 || g_vert.nFree < 14) {
+                    ri.Printf(PRINT_DEVELOPER, "WARNING: aborting terrain tessellation -- insufficient tris\n");
+                    return;
+                }
+
+                patch->uiDistRecalc = 0;
+                R_ForceSplit(g_tri.iCur);
+
+                if (&g_pTris[g_tri.iCur] == pTri) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            } else {
+                if ((pTri->byConstChecks & 3) != 2) {
+                    if (patch->uiDistRecalc > pTri->uiDistRecalc) {
+                        patch->uiDistRecalc = pTri->uiDistRecalc;
+                    }
+                }
+
+                g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+            }
+        }
+    }
+}
+
+/*
+================
+R_DoGeomorphs
+================
+*/
+static void R_DoGeomorphs()
+{
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_vert.iCur = patch->drawinfo.iVertHead;
+
+        if (patch->visCountDraw == g_terVisCount) {
+            if (patch->byDirty) {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_CalcVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+
+                patch->byDirty = qfalse;
+            } else {
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    R_UpdateVertMorphHeight(pVert);
+                    g_vert.iCur = pVert->iNext;
+                }
+            }
+        } else {
+            if (!patch->byDirty) {
+                patch->byDirty = qtrue;
+                while (g_vert.iCur) {
+                    terrainVert_t *pVert = &g_pVert[g_vert.iCur];
+                    pVert->xyz[2]        = pVert->fHgtAvg;
+                    g_vert.iCur          = pVert->iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_MergeInternalAggressive
+================
+*/
+static qboolean R_MergeInternalAggressive()
+{
+    terraTri_t *pTri = &g_pTris[g_tri.iCur];
+    terraTri_t *pBase;
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_MergeInternalCautious
+================
+*/
+static qboolean R_MergeInternalCautious()
+{
+    terraTri_t *pTri;
+    terraTri_t *pBase;
+
+    pTri = &g_pTris[g_tri.iCur];
+
+    if (pTri->nSplit) {
+        return qfalse;
+    }
+
+    if (pTri->varnode->flags & 8) {
+        return qfalse;
+    }
+
+    if (g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].xyz[2] != g_pVert[g_pTris[pTri->iLeftChild].iPt[2]].fHgtAvg) {
+        return qfalse;
+    }
+
+    if (pTri->iBase) {
+        pBase = &g_pTris[pTri->iBase];
+        if (pBase->nSplit || (pBase->varnode->flags & 8)) {
+            return qfalse;
+        }
+
+        R_ForceMerge(pTri->iBase);
+    }
+
+    R_ForceMerge(g_tri.iCur);
+    return qtrue;
+}
+
+/*
+================
+R_DoTriMerging
+================
+*/
+static void R_DoTriMerging()
+{
+    int iCautiousFrame = g_terVisCount - ter_cautiousframes->integer;
+
+    for (size_t n = 0; n < tr.world->numTerraPatches; n++) {
+        const cTerraPatchUnpacked_t *patch = &tr.world->terraPatches[n];
+
+        g_tri.iCur = patch->drawinfo.iMergeHead;
+        if (patch->visCountDraw >= iCautiousFrame) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalCautious()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        } else if (patch->visCountDraw > iCautiousFrame - 10) {
+            while (g_tri.iCur) {
+                if (!R_MergeInternalAggressive()) {
+                    g_tri.iCur = g_pTris[g_tri.iCur].iNext;
+                }
+            }
+        }
+    }
+}
+
+/*
+================
+R_TessellateTerrain
+================
+*/
+void R_TessellateTerrain()
+{
+    R_DoTriSplitting();
+    // Morph geometry according to the view
+    R_DoGeomorphs();
+    // Merge vertices
+    R_DoTriMerging();
+}
+
+/*
+================
+R_TerrainPrepareFrame
+================
+*/
+void R_TerrainPrepareFrame()
+{
+    float distance;
+    int   index;
+    float fFov;
+    float fCheck;
+    float fDistBound;
+
+    if (ter_lock->integer) {
+        return;
+    }
+
+    if (tr.viewParms.isPortalSky) {
+        return;
+    }
+
+    g_terVisCount++;
+    tr.world->activeTerraPatches = NULL;
+
+    if (ter_error->value < 0.1) {
+        ri.Cvar_Set("ter_error", "0.1");
+    }
+
+    distance = 1.0;
+    fFov     = tr.refdef.fov_x;
+    if (fFov < 1.0) {
+        fFov = 1.0;
+    }
+
+    fCheck = 1.0 / (tan(fFov / 114.0) * ter_error->value / 320.0);
+    if (g_terVisCount) {
+        float fFarPlane = tr.viewParms.farplane_distance;
+        if (fFarPlane == 0.0) {
+            fFarPlane = 4096.0;
+        }
+
+        fDistBound = fabs((fCheck - g_fCheck) * 510.0) + fabs((tr.refdef.vieworg[0] - g_vTerOrg[0]) * g_vTerFwd[0])
+                   + fabs((tr.refdef.vieworg[1] - g_vTerOrg[1]) * g_vTerFwd[1])
+                   + fabs((tr.refdef.viewaxis[0][0] - g_vTerFwd[0]) * fFarPlane)
+                   + fabs((tr.refdef.viewaxis[0][1] - g_vTerFwd[1]) * fFarPlane);
+
+        g_uiTerDist = (ceil(fDistBound) + (float)g_uiTerDist);
+        if (g_uiTerDist > 0xF0000000) {
+            for (index = 0; index < tr.world->numTerraPatches; index++) {
+                tr.world->terraPatches[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nTris; index++) {
+                g_pTris[index].uiDistRecalc = 0;
+            }
+
+            for (index = 0; index < g_nVerts; index++) {
+                g_pVert[index].uiDistRecalc = 0;
+            }
+
+            g_uiTerDist = 0;
+        }
+    } else {
+        fDistBound  = 0.0;
+        g_uiTerDist = 0;
+    }
+
+    VectorCopy2D(tr.refdef.vieworg, g_vTerOrg);
+    VectorCopy(tr.refdef.viewaxis[0], g_vTerFwd);
+    g_fCheck = fCheck;
+
+    if (fDistBound != 0.0) {
+        index    = (int)tr.refdef.fov_x;
+        distance = g_fDistanceTable[index];
+
+        g_fClipDotSquared = g_fClipDotSquaredTable[index];
+        g_fClipDotProduct = g_fClipDotProductTable[index];
+        VectorCopy(tr.refdef.viewaxis[0], g_vClipVector);
+        g_vClipOrigin[0] = tr.refdef.vieworg[0] - distance * tr.refdef.viewaxis[0][0] - 256.0;
+        g_vClipOrigin[1] = tr.refdef.vieworg[1] - distance * tr.refdef.viewaxis[0][1] - 256.0;
+        g_vClipOrigin[2] = tr.refdef.vieworg[2] - distance * tr.refdef.viewaxis[0][2] - 255.0;
+        g_vViewVector[0] = tr.refdef.viewaxis[0][0];
+        g_vViewVector[1] = tr.refdef.viewaxis[0][1];
+        g_vViewVector[2] =
+            -(tr.refdef.viewaxis[0][0] * tr.refdef.vieworg[0] + tr.refdef.viewaxis[0][1] * tr.refdef.vieworg[1]);
+        VectorCopy(tr.refdef.vieworg, g_vViewOrigin);
+
+        if (tr.viewParms.farplane_distance > 0) {
+            g_fFogDistance = distance + tr.viewParms.farplane_distance + 768.0;
+        } else {
+            g_fFogDistance = 999999.0;
+        }
+    }
+}
+
+/*
+================
+R_MarkTerrainPatch
+================
+*/
+void R_MarkTerrainPatch(cTerraPatchUnpacked_t *pPatch)
+{
+    if (pPatch->visCountCheck == g_terVisCount) {
+        return;
+    }
+
+    pPatch->visCountCheck = g_terVisCount;
+    if (ter_cull->integer) {
+        vec3_t v;
+        float  dot;
+
+        v[0] = pPatch->x0 - g_vClipOrigin[0];
+        v[1] = pPatch->y0 - g_vClipOrigin[1];
+        v[2] = pPatch->z0 - g_vClipOrigin[2];
+
+        dot = DotProduct(v, g_vClipVector);
+        if (dot > g_fFogDistance) {
+            return;
+        }
+
+        if (VectorLengthSquared(v) * g_fClipDotSquared > dot * dot) {
+            return;
+        }
+    }
+
+    pPatch->visCountDraw         = g_terVisCount;
+    pPatch->pNextActive          = tr.world->activeTerraPatches;
+    tr.world->activeTerraPatches = pPatch;
+}
+
+/*
+================
+R_AddTerrainSurfaces
+================
+*/
+void R_AddTerrainSurfaces()
+{
+    int                    i;
+    int                    dlight;
+    cTerraPatchUnpacked_t *patch;
+
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+
+    if (!ter_lock->integer) {
+        R_TessellateTerrain();
+    }
+
+    if (ter_count->integer || ter_lock->integer == 2) {
+        for (i = 0; i < tr.world->numTerraPatches; i++) {
+            patch = &tr.world->terraPatches[i];
+
+            if (ter_lock->integer == 2 || patch->visCountDraw == g_terVisCount) {
+                assert(patch->shader);
+
+                dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+                R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, 0, dlight, 0, 0);
+            }
+
+            if (ter_count->integer && (g_nSplit || g_nMerge)) {
+                if (ter_count->integer == 1 || g_nSplit * 2 != g_nMerge) {
+                    ri.Printf(
+                        PRINT_DEVELOPER,
+                        "%5zu tris / %5zu verts / %4d splits / %4d merges\n",
+                        g_nTris - g_tri.nFree,
+                        g_nVerts - g_vert.nFree,
+                        g_nSplit,
+                        g_nMerge
+                    );
+                }
+
+                g_nSplit = 0;
+                g_nMerge = 0;
+            }
+        }
+    } else {
+        for (patch = tr.world->activeTerraPatches; patch; patch = patch->pNextActive) {
+            assert(patch->shader);
+
+            dlight = R_CheckDlightTerrain(patch, (1 << (tr.refdef.num_dlights)) - 1);
+            R_AddDrawSurf((surfaceType_t *)&patch->drawinfo, patch->shader, 0, dlight, 0, 0);
+        }
+    }
+}
+
+/*
+================
+R_TerrainHeightForPoly
+
+Calculates the height of a terrain polygon by interpolating the heights of its vertices.
+The function finds the triangle containing the given point (x, y) within the terrain patch,
+and then computes the height at each vertex of the polygon using barycentric interpolation.
+Finally, it updates the z-coordinate of each vertex to store the calculated height.
+Returns qtrue if the triangle was found and the height could be calculated and saved into its vertices.
+
+ToDo: try to use the Vector*(?) macros for the math operations below from q_shared.h and q_math.h, not sure which ones would be a good fit
+================
+*/
+qboolean R_TerrainHeightForPoly(cTerraPatchUnpacked_t *pPatch, polyVert_t *pVerts, int nVerts)
+{
+    float x0     = 0;
+    float y0     = 0;
+    float x1     = 0;
+    float y1     = 0;
+    float x2     = 0;
+    float y2     = 0;
+    float fKx[3] = {0}, fKy[3] = {0}, fKz[3] = {0}, fArea[3] = {0};
+    float fAreaTotal = 0;
+
+    float    x = pVerts->xyz[0];
+    float    y = pVerts->xyz[1];
+    terraInt iTri;
+
+    // Calculate the average of the x and y coordinates of all vertices
+    if (nVerts > 1) {
+        for (int i = 1; i < nVerts; i++) {
+            x += pVerts[i].xyz[0];
+            y += pVerts[i].xyz[1];
+        }
+
+        // Use the averaged values from this point onwards
+        x = x / nVerts;
+        y = y / nVerts;
+    }
+
+    // Get the first valid triangle in the patch
+    iTri = pPatch->drawinfo.iTriHead;
+
+    // Find a triangle that contains the point (x, y)
+    for (iTri = pPatch->drawinfo.iTriHead; iTri; iTri = g_pTris[iTri].iNext) {
+        if (g_pTris[iTri].byConstChecks & 4) {
+            // Get all three x-y coordinates of the current triangle's vertices
+            x0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[0];
+            y0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[1];
+            x1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[0];
+            y1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[1];
+            x2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[0];
+            y2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[1];
+
+            // Calculate the signed areas of the three sub-triangles
+            fArea[0] = (x - x1) * (y2 - y1) - (y - y1) * (x2 - x1);
+            if (fArea[0] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[1] = (x - x2) * (y0 - y2) - (y - y2) * (x0 - x2);
+            if (fArea[1] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fArea[2] = (x - x0) * (y1 - y0) - (y - y0) * (x1 - x0);
+            if (fArea[2] < -0.1) {
+                // The point is outside the triangle
+                continue;
+            }
+
+            fAreaTotal = fArea[0] + fArea[1] + fArea[2];
+            if (fAreaTotal > 0.0) {
+                //
+                // Found it - the point is inside the triangle
+                // Calculate the barycentric coordinates (fKx, fKy, fKz) of the triangle
+                //
+
+                float z0 = g_pVert[g_pTris[iTri].iPt[0]].xyz[2] / fAreaTotal;
+                float z1 = g_pVert[g_pTris[iTri].iPt[1]].xyz[2] / fAreaTotal;
+                float z2 = g_pVert[g_pTris[iTri].iPt[2]].xyz[2] / fAreaTotal;
+
+                fKy[0] = z0 * (x2 - x1);
+                fKy[1] = z1 * (x0 - x2);
+                fKy[2] = z2 * (x1 - x0);
+
+                fKx[0] = z0 * (y2 - y1);
+                fKx[1] = z1 * (y0 - y2);
+                fKx[2] = z2 * (y1 - y0);
+
+                // Note: this could be done with the CrossProduct macro if everything were in a vector
+                fKz[0] = fKx[0] * x1 - y1 * fKy[0];
+                fKz[1] = fKx[1] * x2 - y2 * fKy[1];
+                fKz[2] = fKx[2] * x0 - y0 * fKy[2];
+
+                // Calculate the height for each vertex
+                for (int i = 0; i < nVerts; i++) {
+                    float fScaleX = pVerts[i].xyz[0] * (fKx[0] + fKx[1] + fKx[2]);
+                    float fScaleY = pVerts[i].xyz[1] * (fKy[0] + fKy[1] + fKy[2]);
+                    float fConstZ = fKz[0] + fKz[1] + fKz[2];
+
+                    // Write back the calculated height into the vertex
+                    pVerts[i].xyz[2] = fScaleX - fScaleY - fConstZ;
+                }
+
+                return qtrue;
+            }
+        }
+    }
+
+    assert(
+        !pPatch->drawinfo.iTriHead
+        && va("R_TerrainHeightForPoly: point(%f %f) not in patch(%f %f %f)\n", x, y, pPatch->x0, pPatch->y0, pPatch->z0)
+    );
+    return qfalse;
+}
+
+/*
+================
+R_TerrainRestart_f
+================
+*/
+void R_TerrainRestart_f(void)
+{
+    if (tr.world->numTerraPatches < 0) {
+        return;
+    }
+    
+    R_TerrainFree();
+
+    R_PreTessellateTerrain();
+}
+
+/*
+================
+R_CraterTerrain
+================
+*/
+void R_CraterTerrain(const vec3_t pos, const vec3_t dir, float fDepth, float fRadius)
+{
+    int                    i, j, k;
+    int                    index;
+    qboolean               bMorphed;
+    cTerraPatchUnpacked_t *pPatch;
+    float                  x, y, z;
+    float                  dzSquared;
+    float                  heightmap[81];
+    float                  fMinHeight, fMaxHeight;
+    float                  fMaxOrig;
+    vec3_t                 vArcCenter;
+    float                  fArcRadius;
+    float                  fArcSquared;
+
+    fArcRadius  = (fRadius * fRadius / fDepth + fDepth) * 0.5;
+    fArcSquared = Square(fArcRadius);
+    VectorMA(pos, fDepth - fArcRadius, dir, vArcCenter);
+
+    for (i = 0; i < tr.world->numTerraPatches; i++) {
+        pPatch = &tr.world->terraPatches[i];
+
+        bMorphed = qfalse;
+
+        fMaxOrig   = pPatch->z0;
+        fMaxHeight = pPatch->z0;
+        fMinHeight = pPatch->z0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                x = pPatch->x0 + (k << 6);
+                y = pPatch->y0 + (j << 6);
+                z = pPatch->z0 + (pPatch->heightmap[index] * 2);
+
+                heightmap[index] = z;
+
+                if (fMaxHeight < z) {
+                    fMaxHeight = z;
+                }
+                if (fMaxOrig < z) {
+                    fMaxOrig = z;
+                }
+
+                dzSquared = fArcSquared - (Square(x - vArcCenter[0]) + Square(y - vArcCenter[1]));
+
+                if (Square(z - vArcCenter[2]) > dzSquared) {
+                    continue;
+                }
+
+                if (pPatch->flags & 0x40) {
+                    heightmap[index] = vArcCenter[2] + sqrt(dzSquared);
+                    if (fMaxHeight < heightmap[index]) {
+                        fMaxHeight = heightmap[index];
+                    }
+                } else {
+                    heightmap[index] = vArcCenter[2] - sqrt(dzSquared);
+                    if (fMinHeight > heightmap[index]) {
+                        fMinHeight = heightmap[index];
+                    }
+                }
+
+                bMorphed = qtrue;
+            }
+        }
+
+        if (!bMorphed) {
+            continue;
+        }
+
+        if (fMinHeight < fMaxOrig - 510.0) {
+            fMinHeight = fMaxOrig - 510.0;
+        }
+
+        pPatch->z0 = floor((fMinHeight + 1.0) * 0.5) * 2.0;
+
+        for (j = 0; j < 9; j++) {
+            for (k = 0; k < 9; k++) {
+                index = k + j * 9;
+
+                pPatch->heightmap[index] = Q_clamp_float(floor((heightmap[index] - pPatch->z0 + 1.0) * 0.5), 0, 255);
+            }
+        }
+    }
+}
+
+/*
+================
+R_TerrainCrater_f
+================
+*/
+void R_TerrainCrater_f(void)
+{
+    vec3_t dir;
+
+    if (!ri.Cvar_VariableIntegerValue("cheats")) {
+        //
+        // Added in OPM
+        //  This command may be used for debugging purposes.
+        //  It also prevents executing this command accidentally
+        //
+        return;
+    }
+
+    VectorNegate(tr.refdef.viewaxis[2], dir);
+
+    R_CraterTerrain(tr.refdef.vieworg, dir, 256.0, 256.0);
+    R_TerrainRestart_f();
+}
+
+/*
+================
+R_InitTerrain
+================
+*/
+void R_InitTerrain()
+{
+    int i;
+
+    ter_maxlod = ri.Cvar_Get("ter_maxlod", "6", CVAR_ARCHIVE | CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxlod, 3, 6, qtrue);
+
+    ter_cull = ri.Cvar_Get("ter_cull", "1", 0);
+    ter_lock = ri.Cvar_Get("ter_lock", "0", CVAR_CHEAT);
+
+    ter_error = ri.Cvar_Get("ter_error", "4", CVAR_ARCHIVE);
+    ri.Cvar_CheckRange(ter_error, 0, 16, qtrue);
+
+    ter_cautiousframes = ri.Cvar_Get("ter_cautiousframes", "1", CVAR_ARCHIVE);
+
+    ter_maxtris = ri.Cvar_Get("ter_maxtris", "24576", CVAR_TERRAIN_LATCH);
+    ri.Cvar_CheckRange(ter_maxtris, 16384, 65536, qtrue);
+
+    ter_count = ri.Cvar_Get("ter_count", "0", 0);
+
+    ri.Cmd_AddCommand("ter_restart", R_TerrainRestart_f);
+    R_PreTessellateTerrain();
+
+    for (i = 0; i < TERRAIN_TABLE_SIZE; i++) {
+        float dot                 = (1.0 / (0.82 - cos((float)i / 57.29) * 0.18) - 1.0) * (16.0 / 9.0);
+        g_fClipDotSquaredTable[i] = dot;
+        g_fClipDotProductTable[i] = sqrt(dot);
+        g_fDistanceTable[i]       = 443.5 / sqrt(1.0 - dot);
+    }
+}
+
+/*
+================
+R_ShutdownTerrain
+================
+*/
+void R_ShutdownTerrain()
+{
+    ri.Cmd_RemoveCommand("ter_restart");
+
+    R_TerrainFree();
+}
+/*
+================
+R_TerrainFree
+
+Frees terrain memory
+================
+*/
+void R_TerrainFree()
+{
+    if (g_pVert) {
+        ri.Free(g_pVert);
+        g_pVert = NULL;
+    }
+    if (g_pTris) {
+        ri.Free(g_pTris);
+        g_pTris = NULL;
+    }
+}
+
+/*
+====================
+R_SwapTerraPatch
+
+Swaps the patch on big-endian
+====================
+*/
+void R_SwapTerraPatch(cTerraPatch_t *pPatch)
+{
+#ifdef Q3_BIG_ENDIAN
+    int i;
+
+    pPatch->texCoord[0][0][0] = LittleFloat(pPatch->texCoord[0][0][0]);
+    pPatch->texCoord[0][0][1] = LittleFloat(pPatch->texCoord[0][0][1]);
+    pPatch->texCoord[0][1][0] = LittleFloat(pPatch->texCoord[0][1][0]);
+    pPatch->texCoord[0][1][1] = LittleFloat(pPatch->texCoord[0][1][1]);
+    pPatch->texCoord[1][0][0] = LittleFloat(pPatch->texCoord[1][0][0]);
+    pPatch->texCoord[1][0][1] = LittleFloat(pPatch->texCoord[1][0][1]);
+    pPatch->texCoord[1][1][0] = LittleFloat(pPatch->texCoord[1][1][0]);
+    pPatch->texCoord[1][1][1] = LittleFloat(pPatch->texCoord[1][1][1]);
+    pPatch->iBaseHeight       = LittleShort(pPatch->iBaseHeight);
+    pPatch->iShader           = LittleUnsignedShort(pPatch->iShader);
+    pPatch->iLightMap         = LittleUnsignedShort(pPatch->iLightMap);
+    pPatch->iNorth            = LittleShort(pPatch->iNorth);
+    pPatch->iEast             = LittleShort(pPatch->iEast);
+    pPatch->iSouth            = LittleShort(pPatch->iSouth);
+    pPatch->iWest             = LittleShort(pPatch->iWest);
+
+    for (i = 0; i < MAX_TERRAIN_VARNODES; i++) {
+        pPatch->varTree[0][i].flags = LittleUnsignedShort(pPatch->varTree[0][i].flags);
+        pPatch->varTree[1][i].flags = LittleUnsignedShort(pPatch->varTree[1][i].flags);
+    }
+#endif
+}
diff --git a/code/renderergl2/tr_util.cpp b/code/renderergl2/tr_util.cpp
new file mode 100644
index 00000000..34f1a207
--- /dev/null
+++ b/code/renderergl2/tr_util.cpp
@@ -0,0 +1,402 @@
+/*
+===========================================================================
+Copyright (C) 1999-2005 Id Software, Inc.
+
+This file is part of Quake III Arena source code.
+
+Quake III Arena source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+Quake III Arena source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Quake III Arena source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+// tr_util.c -- renderer utility
+
+#include "tr_local.h"
+#include "../qcommon/str.h"
+
+static byte  cntColor[4];
+static float cntSt[2];
+
+static int Numbers[12][8] = {
+    {1, 3,  4,  5,  6, 7, 0, 0},
+    {4, 5,  0,  0,  0, 0, 0, 0},
+    {1, 4,  2,  7,  3, 0, 0, 0},
+    {1, 4,  2,  5,  3, 0, 0, 0},
+    {6, 4,  2,  5,  0, 0, 0, 0},
+    {1, 6,  2,  5,  3, 0, 0, 0},
+    {1, 6,  2,  5,  7, 3, 0, 0},
+    {1, 8,  0,  0,  0, 0, 0, 0},
+    {1, 2,  3,  4,  5, 6, 7, 0},
+    {1, 6,  4,  2,  5, 3, 0, 0},
+    {9, 10, 11, 12, 0, 0, 0, 0},
+    {2, 0,  0,  0,  0, 0, 0, 0}
+};
+
+static float Lines[13][4] = {
+    {0.0,  0.0, 0.0,  0.0},
+    {-4.0, 8.0, 4.0,  8.0},
+    {-4.0, 4.0, 4.0,  4.0},
+    {-4.0, 0.0, 4.0,  0.0},
+    {4.0,  8.0, 4.0,  4.0},
+    {4.0,  4.0, 4.0,  0.0},
+    {-4.0, 8.0, -4.0, 4.0},
+    {-4.0, 4.0, -4.0, 0.0},
+    {4.0,  8.0, -4.0, 0.0},
+    {-1.0, 2.0, 1.0,  2.0},
+    {1.0,  2.0, 1.0,  0.0},
+    {-1.0, 0.0, 1.0,  0.0},
+    {-1.0, 0.0, -1.0, 2.0}
+};
+
+/*
+===============
+RB_StreamBegin
+===============
+*/
+void RB_StreamBegin(shader_t *shader)
+{
+    RB_BeginSurface(shader, 0, 0);
+}
+
+/*
+===============
+RB_StreamEnd
+===============
+*/
+void RB_StreamEnd(void)
+{
+    int i;
+
+    if (tess.numVertexes <= 2) {
+        RB_EndSurface();
+        return;
+    }
+
+    tess.indexes[0] = 0;
+    tess.indexes[1] = 1;
+    tess.indexes[2] = 2;
+
+    for (i = 0; i < tess.numVertexes - 2; i++) {
+        tess.indexes[i * 3 + 0] = (i & 1) + i;
+        tess.indexes[i * 3 + 1] = i - ((i & 1) - 1);
+        tess.indexes[i * 3 + 2] = i + 2;
+        tess.numIndexes += 3;
+    }
+
+    RB_EndSurface();
+}
+
+/*
+===============
+RB_StreamBeginDrawSurf
+===============
+*/
+void RB_StreamBeginDrawSurf(void)
+{
+    backEnd.dsStreamVert = tess.numVertexes;
+}
+
+/*
+===============
+RB_StreamEndDrawSurf
+===============
+*/
+void RB_StreamEndDrawSurf(void)
+{
+    int numverts;
+    int i;
+
+    if (tess.numVertexes - backEnd.dsStreamVert <= 2) {
+        tess.numVertexes = backEnd.dsStreamVert;
+        return;
+    }
+
+    numverts = tess.numVertexes - backEnd.dsStreamVert - 2;
+    for (i = 0; i < numverts; i++) {
+        tess.indexes[i + tess.numIndexes]     = (i & 1) + i + backEnd.dsStreamVert;
+        tess.indexes[i + tess.numIndexes + 1] = i + backEnd.dsStreamVert - ((i & 1) - 1);
+        tess.indexes[i + tess.numIndexes + 2] = i + backEnd.dsStreamVert + 2;
+        tess.numIndexes += 3;
+    }
+}
+
+/*
+===============
+addTriangle
+===============
+*/
+static void addTriangle(void)
+{
+    tess.texCoords[tess.numVertexes][0] = cntSt[0];
+    tess.texCoords[tess.numVertexes][1] = cntSt[1];
+    tess.color[tess.numVertexes][0] = cntColor[0] * 65535 / 255;
+    tess.color[tess.numVertexes][1] = cntColor[1] * 65535 / 255;
+    tess.color[tess.numVertexes][2] = cntColor[2] * 65535 / 255;
+    tess.color[tess.numVertexes][3] = cntColor[3] * 65535 / 255;
+    tess.numVertexes++;
+}
+
+/*
+===============
+RB_Vertex3fv
+===============
+*/
+void RB_Vertex3fv(vec3_t v)
+{
+    VectorCopy(v, tess.xyz[tess.numVertexes]);
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex3f
+===============
+*/
+void RB_Vertex3f(vec_t x, vec_t y, vec_t z)
+{
+    tess.xyz[tess.numVertexes][0] = x;
+    tess.xyz[tess.numVertexes][1] = y;
+    tess.xyz[tess.numVertexes][2] = z;
+    addTriangle();
+}
+
+/*
+===============
+RB_Vertex2f
+===============
+*/
+void RB_Vertex2f(vec_t x, vec_t y)
+{
+    RB_Vertex3f(x, y, 0);
+}
+
+/*
+===============
+RB_Color4f
+===============
+*/
+void RB_Color4f(vec_t r, vec_t g, vec_t b, vec_t a)
+{
+    cntColor[0] = r * tr.identityLightByte;
+    cntColor[1] = g * tr.identityLightByte;
+    cntColor[2] = b * tr.identityLightByte;
+    cntColor[3] = a * 255.0;
+}
+
+/*
+===============
+RB_Color3f
+===============
+*/
+void RB_Color3f(vec_t r, vec_t g, vec_t b)
+{
+    RB_Color4f(r, g, b, 1.0);
+}
+
+/*
+===============
+RB_Color3fv
+===============
+*/
+void RB_Color3fv(vec3_t col)
+{
+    RB_Color3f(col[0], col[1], col[2]);
+}
+
+/*
+===============
+RB_Color4bv
+===============
+*/
+void RB_Color4bv(unsigned char *colors)
+{
+    cntColor[0] = colors[0];
+    cntColor[1] = colors[1];
+    cntColor[2] = colors[2];
+    cntColor[3] = colors[3];
+}
+
+/*
+===============
+RB_Texcoord2f
+===============
+*/
+void RB_Texcoord2f(float s, float t)
+{
+    cntSt[0] = s;
+    cntSt[1] = t;
+}
+
+/*
+===============
+RB_Texcoord2fv
+===============
+*/
+void RB_Texcoord2fv(vec2_t st)
+{
+    cntSt[0] = st[0];
+    cntSt[1] = st[1];
+}
+
+/*
+===============
+R_DrawDebugNumber
+===============
+*/
+void R_DrawDebugNumber(const vec3_t org, float number, float scale, float r, float g, float b, int precision)
+{
+    vec3_t up, right;
+    vec3_t pos1, pos2;
+    vec3_t start;
+    str    text;
+    char   format[20];
+    int    i;
+    int    j;
+    int    l;
+    int    num;
+
+    VectorCopy(tr.viewParms.or.axis[2], up);
+    VectorCopy(tr.viewParms.or.axis[1], right);
+    VectorNegate(right, right);
+
+    VectorNormalize(up);
+    VectorNormalize(right);
+
+    VectorScale(up, scale, up);
+    VectorScale(right, scale, right);
+
+    if (precision > 0) {
+        Com_sprintf(format, sizeof(format), "%%.%df", precision);
+        text = va(format, number);
+    } else {
+        text = va("%d", (int)number);
+    }
+
+    // NOTE: this cast here is needed!
+    // Otherwise the compiler will do very nasty implicit casting of negative
+    // numbers to unsigned numbers, resulting in incorrect values.
+    // -------------------v
+    VectorMA(org, 5 - 5 * (int)text.length(), right, start);
+
+    // Draw each character/digit of the text
+    for (i = 0; i < text.length(); i++) {
+        if (text[i] == '.') {
+            num = 10;
+        } else if (text[i] == '-') {
+            num = 11;
+        } else {
+            num = text[i] - '0';
+        }
+
+        // Get the first line index for the number to be drawn
+        l = Numbers[num][0];
+
+        // Draw each line of the character/digit
+        for (j = 0; j < 8 && l; ++j, l = Numbers[num][j]) {
+            pos1[0] = start[0] + Lines[l][0] * right[0] + Lines[l][1] * up[0];
+            pos1[1] = start[1] + Lines[l][0] * right[1] + Lines[l][1] * up[1];
+            pos1[2] = start[2] + Lines[l][0] * right[2] + Lines[l][1] * up[2];
+
+            pos2[0] = start[0] + Lines[l][2] * right[0] + Lines[l][3] * up[0];
+            pos2[1] = start[1] + Lines[l][2] * right[1] + Lines[l][3] * up[1];
+            pos2[2] = start[2] + Lines[l][2] * right[2] + Lines[l][3] * up[2];
+
+            R_DebugLine(pos1, pos2, r, g, b, 1.0);
+        }
+
+        VectorMA(start, 10.0, right, start);
+    }
+}
+
+/*
+===============
+R_DebugRotatedBBox
+===============
+*/
+void R_DebugRotatedBBox(
+    const vec3_t org, const vec3_t ang, const vec3_t mins, const vec3_t maxs, float r, float g, float b, float alpha
+)
+{
+}
+
+/*
+===============
+RE_GetShaderWidth
+===============
+*/
+int RE_GetShaderWidth(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->stages[0]->bundle[0].image[0]->uploadWidth;
+}
+
+/*
+===============
+RE_GetShaderHeight
+===============
+*/
+int RE_GetShaderHeight(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->stages[0]->bundle[0].image[0]->uploadHeight;
+}
+
+/*
+===============
+RE_GetShaderName
+===============
+*/
+const char *RE_GetShaderName(qhandle_t hShader)
+{
+    shader_t *shader;
+
+    if (hShader) {
+        shader = R_GetShaderByHandle(hShader);
+    } else {
+        shader = tr.defaultShader;
+    }
+
+    return shader->name;
+}
+
+/*
+===============
+RE_GetModelName
+===============
+*/
+const char *RE_GetModelName(qhandle_t hModel)
+{
+    model_t *model;
+
+    if (!hModel) {
+        return "";
+    }
+
+    model = R_GetModelByHandle(hModel);
+
+    return model->name;
+}
diff --git a/code/renderergl2/tr_vbo.c b/code/renderergl2/tr_vbo.c
index df64f8bc..5094df18 100644
--- a/code/renderergl2/tr_vbo.c
+++ b/code/renderergl2/tr_vbo.c
@@ -676,7 +676,7 @@ static struct
 	srfVert_t vertexes[VAOCACHE_QUEUE_MAX_VERTEXES];
 	int vertexCommitSize;
 
-	glIndex_t indexes[VAOCACHE_QUEUE_MAX_INDEXES];
+	vaoCacheGlIndex_t indexes[VAOCACHE_QUEUE_MAX_INDEXES];
 	int indexCommitSize;
 }
 vcq;
@@ -687,18 +687,13 @@ vcq;
 // srfVert_t is 60 bytes
 // assuming each vert is referenced 4 times, need 16 bytes (4 glIndex_t) per vert
 // -> need about 4/15ths the space for indexes as vertexes
-#if GL_INDEX_TYPE == GL_UNSIGNED_SHORT
-#define VAOCACHE_VERTEX_BUFFER_SIZE (sizeof(srfVert_t) * USHRT_MAX)
-#define VAOCACHE_INDEX_BUFFER_SIZE (sizeof(glIndex_t) * USHRT_MAX * 4)
-#else // GL_UNSIGNED_INT
 #define VAOCACHE_VERTEX_BUFFER_SIZE (16 * 1024 * 1024)
 #define VAOCACHE_INDEX_BUFFER_SIZE (5 * 1024 * 1024)
-#endif
 
 typedef struct buffered_s
 {
-	void *data;
-	int size;
+	glIndex_t *indexes;
+	int numIndexes;
 	int bufferOffset;
 }
 buffered_t;
@@ -736,7 +731,7 @@ void VaoCache_Commit(void)
 			buffered_t *indexSet2 = indexSet;
 			for (surf = vcq.surfaces; surf < end; surf++, indexSet2++)
 			{
-				if (surf->indexes != indexSet2->data || (surf->numIndexes * sizeof(glIndex_t)) != indexSet2->size)
+				if (surf->indexes != indexSet2->indexes || surf->numIndexes != indexSet2->numIndexes)
 					break;
 			}
 
@@ -750,7 +745,7 @@ void VaoCache_Commit(void)
 	// If found, use it
 	if (indexSet < vc.surfaceIndexSets + vc.numSurfaces)
 	{
-		tess.firstIndex = indexSet->bufferOffset / sizeof(glIndex_t);
+		tess.firstIndex = indexSet->bufferOffset / glRefConfig.vaoCacheGlIndexSize;
 		//ri.Printf(PRINT_ALL, "firstIndex %d numIndexes %d as %d\n", tess.firstIndex, tess.numIndexes, (int)(batchLength - vc.batchLengths));
 		//ri.Printf(PRINT_ALL, "vc.numSurfaces %d vc.numBatches %d\n", vc.numSurfaces, vc.numBatches);
 	}
@@ -759,20 +754,21 @@ void VaoCache_Commit(void)
 	else
 	{
 		srfVert_t *dstVertex = vcq.vertexes;
-		glIndex_t *dstIndex = vcq.indexes;
+		vaoCacheGlIndex_t *dstIndex = vcq.indexes;
+		unsigned short *dstIndexUshort = (unsigned short *)vcq.indexes;
 
 		batchLength = vc.batchLengths + vc.numBatches;
 		*batchLength = vcq.numSurfaces;
 		vc.numBatches++;
 
-		tess.firstIndex = vc.indexOffset / sizeof(glIndex_t);
+		tess.firstIndex = vc.indexOffset / glRefConfig.vaoCacheGlIndexSize;
 		vcq.vertexCommitSize = 0;
 		vcq.indexCommitSize = 0;
 		for (surf = vcq.surfaces; surf < end; surf++)
 		{
 			glIndex_t *srcIndex = surf->indexes;
 			int vertexesSize = surf->numVerts * sizeof(srfVert_t);
-			int indexesSize = surf->numIndexes * sizeof(glIndex_t);
+			int indexesSize = surf->numIndexes * glRefConfig.vaoCacheGlIndexSize;
 			int i, indexOffset = (vc.vertexOffset + vcq.vertexCommitSize) / sizeof(srfVert_t);
 
 			Com_Memcpy(dstVertex, surf->vertexes, vertexesSize);
@@ -781,13 +777,21 @@ void VaoCache_Commit(void)
 			vcq.vertexCommitSize += vertexesSize;
 
 			indexSet = vc.surfaceIndexSets + vc.numSurfaces;
-			indexSet->data = surf->indexes;
-			indexSet->size = indexesSize;
+			indexSet->indexes = surf->indexes;
+			indexSet->numIndexes = surf->numIndexes;
 			indexSet->bufferOffset = vc.indexOffset + vcq.indexCommitSize;
 			vc.numSurfaces++;
 
-			for (i = 0; i < surf->numIndexes; i++)
-				*dstIndex++ = *srcIndex++ + indexOffset;
+			if (glRefConfig.vaoCacheGlIndexType == GL_UNSIGNED_SHORT)
+			{
+				for (i = 0; i < surf->numIndexes; i++)
+					*dstIndexUshort++ = *srcIndex++ + indexOffset;
+			}
+			else
+			{
+				for (i = 0; i < surf->numIndexes; i++)
+					*dstIndex++ = *srcIndex++ + indexOffset;
+			}
 
 			vcq.indexCommitSize += indexesSize;
 		}
@@ -810,9 +814,30 @@ void VaoCache_Commit(void)
 	}
 }
 
+void VaoCache_DrawElements(int numIndexes, int firstIndex)
+{
+	assert( glState.currentVao == vc.vao );
+
+	qglDrawElements(GL_TRIANGLES, numIndexes, glRefConfig.vaoCacheGlIndexType, BUFFER_OFFSET(firstIndex * glRefConfig.vaoCacheGlIndexSize));
+}
+
 void VaoCache_Init(void)
 {
-	vc.vao = R_CreateVao("VaoCache", NULL, VAOCACHE_VERTEX_BUFFER_SIZE, NULL, VAOCACHE_INDEX_BUFFER_SIZE, VAO_USAGE_DYNAMIC);
+	int vertexBufferSize;
+	int indexBufferSize;
+
+	if (glRefConfig.vaoCacheGlIndexType == GL_UNSIGNED_SHORT)
+	{
+		vertexBufferSize = sizeof(srfVert_t) * USHRT_MAX;
+		indexBufferSize = sizeof(unsigned short) * USHRT_MAX * 4;
+	}
+	else
+	{
+		vertexBufferSize = VAOCACHE_VERTEX_BUFFER_SIZE;
+		indexBufferSize = VAOCACHE_INDEX_BUFFER_SIZE;
+	}
+
+	vc.vao = R_CreateVao("VaoCache", NULL, vertexBufferSize, NULL, indexBufferSize, VAO_USAGE_DYNAMIC);
 
 	vc.vao->attribs[ATTR_INDEX_POSITION].enabled       = 1;
 	vc.vao->attribs[ATTR_INDEX_TEXCOORD].enabled       = 1;
@@ -881,7 +906,7 @@ void VaoCache_BindVao(void)
 void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboolean *recycleIndexBuffer, int numVerts, int numIndexes)
 {
 	int vertexesSize = sizeof(srfVert_t) * numVerts;
-	int indexesSize = sizeof(glIndex_t) * numIndexes;
+	int indexesSize = glRefConfig.vaoCacheGlIndexSize * numIndexes;
 
 	if (vc.vao->vertexesSize < vc.vertexOffset + vcq.vertexCommitSize + vertexesSize)
 	{
@@ -924,7 +949,7 @@ void VaoCache_CheckAdd(qboolean *endSurface, qboolean *recycleVertexBuffer, qboo
 		*endSurface = qtrue;
 	}
 
-	if (VAOCACHE_QUEUE_MAX_INDEXES * sizeof(glIndex_t) < vcq.indexCommitSize + indexesSize)
+	if (VAOCACHE_QUEUE_MAX_INDEXES * glRefConfig.vaoCacheGlIndexSize < vcq.indexCommitSize + indexesSize)
 	{
 		//ri.Printf(PRINT_ALL, "out of queued indexes\n");
 		*endSurface = qtrue;
@@ -964,5 +989,5 @@ void VaoCache_AddSurface(srfVert_t *verts, int numVerts, glIndex_t *indexes, int
 	vcq.numSurfaces++;
 
 	vcq.vertexCommitSize += sizeof(srfVert_t) * numVerts;
-	vcq.indexCommitSize += sizeof(glIndex_t) * numIndexes;
+	vcq.indexCommitSize += glRefConfig.vaoCacheGlIndexSize * numIndexes;
 }
diff --git a/code/renderergl2/tr_vis.cpp b/code/renderergl2/tr_vis.cpp
new file mode 100644
index 00000000..b4dbf0de
--- /dev/null
+++ b/code/renderergl2/tr_vis.cpp
@@ -0,0 +1,361 @@
+/*
+===========================================================================
+Copyright (C) 2023-2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// tr_vis.cpp: visibility culling
+
+#include "tr_local.h"
+#include "tr_vis.h"
+
+#define MAX_POINTS_ON_WINDING 128
+#define MAX_MAP_VISIBILITY    0x200000
+#define MAX_VPORTALS          1024
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[24];
+} viswinding_t;
+
+typedef struct {
+    int    numpoints;
+    vec3_t p[4];
+} winding_t;
+
+typedef struct {
+    vec3_t normal;
+    float  dist;
+} plane_t;
+
+typedef struct {
+    int           num;
+    qboolean      hint;
+    plane_t       plane;
+    int           leaf;
+    vec3_t        origin;
+    float         radius;
+    viswinding_t *winding;
+} vportal_t;
+
+typedef struct leaf_s {
+    int        numportals;
+    vportal_t *portals[MAX_VPORTALS];
+} leaf_t;
+
+int             portalclusters;
+int             numportals;
+int             numfaces;
+int             leafbytes;
+int             leaflongs;
+int             portalbytes;
+int             portallongs;
+vportal_t      *portals;
+leaf_t         *leafs;
+int             numVisBytes;
+static char     mapname[256];
+static qboolean prev_showportal = qfalse;
+
+winding_t *AllocWinding(int points)
+{
+    winding_t *w;
+    int        s;
+
+    if (points > MAX_POINTS_ON_WINDING) {
+        ri.Error(ERR_DROP, "Exceeded MAX_POINTS_ON_WINDING");
+        return NULL;
+    }
+    s = sizeof(vec_t) * 4 * points + sizeof(int) * 4;
+
+    w = (winding_t *)malloc(s);
+    if (!w) {
+        ri.Error(ERR_DROP, "Couldn't allocate winding");
+        return NULL;
+    }
+
+    if (s < 0) {
+        s = sizeof(vec_t) * 4 * points + sizeof(int) * 4 + 3;
+    }
+
+    memset(w, 0, s);
+
+    return w;
+}
+
+viswinding_t *AllocVisWinding(int points)
+{
+    return (viswinding_t *)AllocWinding(points);
+}
+
+void PlaneFromWinding(viswinding_t *w, plane_t *plane)
+{
+    vec3_t v1, v2;
+
+    VectorSubtract(w->p[2], w->p[1], v1);
+    VectorSubtract(w->p[2], w->p[1], v1);
+    CrossProduct(v2, v1, plane->normal);
+    VectorNormalize(plane->normal);
+
+    plane->dist = DotProduct(w->p[0], plane->normal);
+}
+
+void SetPortalSphere(vportal_t *p)
+{
+    int           i;
+    vec3_t        total;
+    vec3_t        dist;
+    viswinding_t *w;
+    float         r;
+    float         bestr;
+
+    w = p->winding;
+    VectorCopy(vec3_origin, total);
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorAdd(total, w->p[i], total);
+    }
+
+    for (i = 0; i < 3; i++) {
+        total[i] /= w->numpoints;
+    }
+
+    bestr = 0;
+
+    for (i = 0; i < w->numpoints; i++) {
+        VectorSubtract(w->p[i], total, dist);
+        r = VectorLength(dist);
+        if (bestr < r) {
+            bestr = r;
+        }
+    }
+
+    VectorCopy(total, p->origin);
+    p->radius = bestr;
+}
+
+void LoadPortals(const char *name)
+{
+    int         i, j;
+    vportal_t  *p;
+    leaf_t     *l;
+    const char *magic;
+    int         leafnums[2];
+    plane_t     plane;
+    char       *data;
+    char       *f;
+    int         numpoints;
+    qboolean    bHint;
+
+    if (ri.FS_ReadFile(name, (void **)&f) == -1) {
+        ri.Error(ERR_DROP, "LoadPortals: couldn't read %s\n", name);
+        return;
+    }
+
+    data  = f;
+    magic = COM_Parse(&data);
+
+    if (strcmp(magic, "PRT1")) {
+        ri.Error(1, "LoadPortals: not a portal file");
+    }
+
+    portalclusters = atoi(COM_Parse(&data));
+    numportals     = atoi(COM_Parse(&data));
+    numfaces       = atoi(COM_Parse(&data));
+
+    ri.Printf(PRINT_DEVELOPER, "%6i portalclusters\n", portalclusters);
+    ri.Printf(PRINT_DEVELOPER, "%6i numportals\n", numportals);
+    ri.Printf(PRINT_DEVELOPER, "%6i numfaces\n", numfaces);
+
+    leafbytes   = ((portalclusters + 63) & 0xC0) >> 3;
+    leaflongs   = leafbytes >> 2;
+    portalbytes = ((numportals * 2 + 63) & 0xC0) >> 3;
+    portallongs = portalbytes >> 2;
+
+    //
+    // Initialize portals
+    //
+    portals = (vportal_t *)malloc(numportals * sizeof(vportal_t));
+    if (!portals) {
+        ri.Error(ERR_DROP, "LoadPortals: portals allocation failed\n");
+        return;
+    }
+    memset(portals, 0, numportals * sizeof(vportal_t));
+
+    //
+    // Initialize leafs
+    //
+    leafs = (leaf_t *)malloc(portalclusters * sizeof(leaf_t));
+    if (!leafs) {
+        ri.Error(ERR_DROP, "LoadPortals: leafs allocation failed\n");
+        return;
+    }
+    memset(leafs, 0, portalclusters * sizeof(leaf_t));
+
+    assert(leafbytes * portalclusters + sizeof(leafnums) <= MAX_MAP_VISIBILITY);
+    if (numVisBytes > MAX_MAP_VISIBILITY) {
+        ri.Error(ERR_DROP, "LoadPortals: NumVisBytes %d exceeds %d\n", numVisBytes, 0x200000);
+    }
+
+    for (i = 0; i < numportals; i++) {
+        viswinding_t *w;
+
+        p = &portals[i];
+
+        numpoints   = atoi(COM_Parse(&data));
+        leafnums[0] = atoi(COM_Parse(&data));
+        leafnums[1] = atoi(COM_Parse(&data));
+
+        if (numpoints > MAX_POINTS_ON_WINDING) {
+            ri.Error(ERR_DROP, "LoadPortals: portal %i has too many points", i);
+            return;
+        }
+
+        if (leafnums[0] > portalclusters || leafnums[1] > portalclusters) {
+            ri.Error(ERR_DROP, "LoadPortals: reading portal %i", i);
+            return;
+        }
+
+        bHint        = atoi(COM_Parse(&data));
+        w            = AllocVisWinding(numpoints);
+        w->numpoints = numpoints;
+        p->winding   = w;
+
+        for (j = 0; j < numpoints; j++) {
+            magic = COM_Parse(&data);
+            if (magic[0] != '(') {
+                ri.Error(ERR_DROP, "LoadPortals: expecting '(' not '%s'", magic);
+                return;
+            }
+
+            if (magic[1]) {
+                w->p[j][0] = atof(magic + 1);
+            } else {
+                w->p[j][0] = atof(COM_Parse(&data));
+            }
+
+            w->p[j][1] = atof(COM_Parse(&data));
+            w->p[j][2] = atof(COM_Parse(&data));
+
+            magic = COM_Parse(&data);
+            if (strcmp(")", magic)) {
+                ri.Error(ERR_DROP, "LoadPortals: expecting ')' not '%s'", magic);
+            }
+        }
+
+        PlaneFromWinding(w, &plane);
+
+        //
+        // Leafs
+        //
+
+        // First leaf
+
+        l = &leafs[leafnums[0]];
+
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = w;
+        VectorSubtract(vec3_origin, plane.normal, p->plane.normal);
+        p->plane.dist = -plane.dist;
+        p->leaf = leafnums[1];
+        SetPortalSphere(p);
+
+        // Second leaf
+
+        p++;
+
+        l = &leafs[leafnums[1]];
+        if (l->numportals == ARRAY_LEN(l->portals)) {
+            ri.Error(ERR_DROP, "Leaf with too many portals");
+            return;
+        }
+
+        l->portals[l->numportals++] = p;
+        p->num                      = i + 1;
+        p->hint                     = bHint;
+        p->winding                  = (viswinding_t *)AllocVisWinding(w->numpoints);
+        p->winding->numpoints       = w->numpoints;
+
+        for (j = 0; j < w->numpoints; j++) {
+            VectorCopy(w->p[numpoints - (j + 1)], p->winding->p[j]);
+        }
+
+        p->plane = plane;
+        p->leaf  = leafnums[0];
+        SetPortalSphere(p);
+    }
+
+    ri.FS_FreeFile(f);
+}
+
+void R_VisDebug()
+{
+    int           leafnum;
+    int           cluster;
+    int           numportals;
+    leaf_t       *leaf;
+    vportal_t    *p;
+    int           pnum;
+    viswinding_t *w;
+    int           numpoints;
+    int           i;
+
+    if (!r_showportal->integer) {
+        return;
+    }
+
+    if (!prev_showportal) {
+        char buffer[256];
+
+        prev_showportal = qtrue;
+        COM_StripExtension(mapname, buffer, sizeof(buffer));
+        Q_strcat(buffer, sizeof(buffer), ".prt");
+        LoadPortals(buffer);
+    }
+
+    leafnum = ri.CM_PointLeafnum(tr.refdef.vieworg);
+    cluster = ri.CM_LeafCluster(leafnum);
+    if (cluster < 0) {
+        return;
+    }
+
+    leaf       = &leafs[cluster];
+    numportals = leaf->numportals;
+    for (pnum = 0; pnum < numportals; pnum++) {
+        p = leaf->portals[pnum];
+        w = p->winding;
+
+        numpoints = w->numpoints;
+        for (i = 0; i < numpoints; i++) {
+            R_DebugLine(w->p[i], w->p[(i + 1) % numpoints], 0.0, 1.0, 0.0, 1.0);
+        }
+    }
+}
+
+void R_VisDebugLoad(const char *szBSPName)
+{
+    prev_showportal = qfalse;
+    return Q_strncpyz(mapname, szBSPName, sizeof(mapname));
+}
diff --git a/code/renderer/tr_sun_flare.cpp b/code/renderergl2/tr_vis.h
similarity index 83%
rename from code/renderer/tr_sun_flare.cpp
rename to code/renderergl2/tr_vis.h
index 1854a9ed..e31cb444 100644
--- a/code/renderer/tr_sun_flare.cpp
+++ b/code/renderergl2/tr_vis.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2023-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,16 +20,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_sun_flare.cpp: Sun flares
+#pragma once
 
 #include "tr_local.h"
 
-void R_InitLensFlare()
-{
-    // FIXME: unimplemented
-}
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-void R_DrawLensFlares()
-{
-	// FIXME: unimplemented
+void R_VisDebugLoad(const char* szBSPName);
+void R_VisDebug();
+
+#ifdef __cplusplus
 }
+#endif
diff --git a/code/renderergl2/tr_world.c b/code/renderergl2/tr_world.c
index f9a24424..4f3931b8 100644
--- a/code/renderergl2/tr_world.c
+++ b/code/renderergl2/tr_world.c
@@ -581,6 +581,35 @@ static void R_RecursiveWorldNode( mnode_t *node, uint32_t planeBits, uint32_t dl
 		}
 	}
 
+
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky)
+	{
+		int i;
+
+		for (i = 0; i < node->numTerraPatches; i++) {
+			R_MarkTerrainPatch(tr.world->visTerraPatches[node->firstTerraPatch + i]);
+		}
+	}
+
+	if (r_drawstaticdecals->integer) {
+		if (node->pFirstMarkFragment) {
+			R_AddPermanentMarkFragmentSurfaces(node->pFirstMarkFragment, node->iNumMarkFragment);
+		}
+	}
+
+	if (r_drawstaticmodels->integer) {
+		int i;
+
+		for (i = 0; i < node->numStaticModels; i++) {
+			tr.world->visStaticModels[node->firstStaticModel + i]->visCount = tr.visCounts[tr.visIndex];
+		}
+    }
+
+    //=========================
 }
 
 
@@ -589,7 +618,7 @@ static void R_RecursiveWorldNode( mnode_t *node, uint32_t planeBits, uint32_t dl
 R_PointInLeaf
 ===============
 */
-static mnode_t *R_PointInLeaf( const vec3_t p ) {
+mnode_t *R_PointInLeaf( const vec3_t p ) {
 	mnode_t		*node;
 	float		d;
 	cplane_t	*plane;
@@ -752,6 +781,14 @@ void R_AddWorldSurfaces (void) {
 	tr.currentEntityNum = REFENTITYNUM_WORLD;
 	tr.shiftedEntityNum = tr.currentEntityNum << QSORT_REFENTITYNUM_SHIFT;
 
+	//
+	// OPENMOHAA-specific stuff
+	//=========================
+    if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+        R_TerrainPrepareFrame();
+    }
+    //=========================
+
 	// determine which leaves are in the PVS / areamask
 	if (!(tr.viewParms.flags & VPF_DEPTHSHADOW))
 		R_MarkLeaves ();
@@ -806,4 +843,159 @@ void R_AddWorldSurfaces (void) {
 
 		tr.refdef.dlightMask = ~tr.refdef.dlightMask;
 	}
+
+    //
+    // OPENMOHAA-specific stuff
+    //=========================
+
+	if (r_drawterrain->integer && tr.refdef.render_terrain && !tr.viewParms.isPortalSky) {
+		R_AddTerrainSurfaces();
+	}
+	if (r_drawstaticmodels->integer) {
+		R_AddStaticModelSurfaces();
+	}
+
+	if (g_bInfostaticmodels) {
+		g_bInfostaticmodels = 0;
+		R_PrintInfoStaticModels();
+	}
+
+    R_UpdateLevelMarksSystem();
+
+    //=========================
+}
+
+//
+// OPENMOHAA-specific stuff
+//
+
+int R_SphereInLeafs(const vec3_t p, float r, mnode_t** nodes, int nMaxNodes) {
+	mnode_t* nodestack[1024];
+	int iNodeStackPos;
+	mnode_t* pCurNode;
+	int nFoundNodes;
+
+	iNodeStackPos = 0;
+	pCurNode = tr.world->nodes;
+	nFoundNodes = 0;
+
+	while (1)
+    {
+        cplane_t* plane;
+		float d;
+
+		while (pCurNode->contents == -1)
+		{
+			plane = pCurNode->plane;
+			if (plane->type >= PLANE_NON_AXIAL) {
+				d = DotProduct(p, plane->normal) - plane->dist;
+			} else {
+				d = p[plane->type] - plane->dist;
+			}
+
+            if (d < r) {
+                if (d > -r) {
+                    nodestack[iNodeStackPos++] = pCurNode->children[0];
+                }
+                pCurNode = pCurNode->children[1];
+            } else {
+                pCurNode = pCurNode->children[0];
+			}
+		}
+
+		nodes[nFoundNodes++] = pCurNode;
+		if (!iNodeStackPos || nFoundNodes == nMaxNodes) {
+			break;
+		}
+
+		iNodeStackPos--;
+        pCurNode = nodestack[iNodeStackPos];
+	}
+
+	return nFoundNodes;
+}
+
+void R_GetInlineModelBounds(int iIndex, vec3_t vMins, vec3_t vMaxs)
+{
+    bmodel_t* bmodel;
+
+    bmodel = &tr.world->bmodels[iIndex];
+    VectorCopy(bmodel->bounds[0], vMins);
+    VectorCopy(bmodel->bounds[1], vMaxs);
+}
+
+/*
+======================
+R_FastDlightTerrain
+======================
+*/
+static int R_FastDlightTerrain(cTerraPatchUnpacked_t* srf, int dlightBits) {
+    dlight_t* dl;
+    float* origin;
+    int i;
+
+    for (i = 0; i < tr.refdef.num_dlights; i++) {
+        dl = &tr.refdef.dlights[i];
+        origin = dl->transformed;
+
+        if (srf->x0 - origin[0] > dl->radius
+            || srf->x0 - origin[0] < -512.0 - dl->radius
+            || srf->y0 - origin[1] > dl->radius
+            || srf->y0 - origin[1] < -512.0 - dl->radius
+            || srf->z0 - origin[2] > dl->radius
+            || srf->z0 - origin[2] < -srf->zmax - dl->radius
+            ) {
+            // dlight doesn't reach the bounds
+            dlightBits &= ~(1 << i);
+        }
+    }
+
+    if (!dlightBits) {
+        tr.pc.c_dlightSurfacesCulled++;
+    }
+
+    srf->drawinfo.dlightBits[0] = dlightBits;
+    return dlightBits;
+}
+
+/*
+======================
+R_DlightTerrain
+======================
+*/
+int R_DlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	int dlightMap = 0;
+
+	// FIXME: unimplemented
+	// Fast Dlight only
+
+	if (R_FastDlightTerrain(surf, dlightBits)) {
+		++tr.pc.c_dlightSurfaces;
+		dlightMap = 1;
+	}
+
+    return dlightMap;
+}
+
+
+/*
+======================
+R_CheckDlightTerrain
+======================
+*/
+int R_CheckDlightTerrain(cTerraPatchUnpacked_t* surf, int dlightBits)
+{
+	if (surf->frameCount == tr.frameCount) {
+		return surf->drawinfo.dlightMap[0];
+	}
+
+	surf->frameCount = tr.frameCount;
+	if (dlightBits) {
+		return R_DlightTerrain(surf, dlightBits);
+	}
+
+	surf->drawinfo.dlightMap[0] = 0;
+	surf->drawinfo.dlightBits[0] = 0;
+	return 0;
 }
diff --git a/code/script/scriptclass.cpp b/code/script/scriptclass.cpp
index 85aa0431..3ace7aaf 100644
--- a/code/script/scriptclass.cpp
+++ b/code/script/scriptclass.cpp
@@ -1,3 +1,27 @@
+/*
+===========================================================================
+Copyright (C) 2024 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+// scriptclass.h: Script class.
+
 #include "scriptclass.h"
 #include "../fgame/scriptmaster.h"
 #include "../fgame/scriptthread.h"
@@ -65,7 +89,8 @@ ScriptClass::ScriptClass()
 ScriptClass::~ScriptClass()
 {
     if (m_Script == NULL) {
-        throw ScriptException("Attempting to delete dead class.");
+        //throw ScriptException("Attempting to delete dead class.");
+        gi.Error(ERR_DROP, "Attempting to delete a dead thread.");
     }
 
     KillThreads();
@@ -76,6 +101,16 @@ ScriptClass::~ScriptClass()
     }
 }
 
+/*
+====================
+StoppedNotify
+====================
+*/
+void ScriptClass::StoppedNotify()
+{
+    delete this;
+}
+
 /*
 ====================
 Archive
@@ -160,13 +195,10 @@ ScriptThread *ScriptClass::CreateThreadInternal(const ScriptVariable& label)
     ScriptThread *thread = NULL;
 
     if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
-        ScriptClass *scriptClass = Director.CurrentScriptClass();
-        scr                      = scriptClass->GetScript();
-
         if (label.GetType() == VARIABLE_CONSTSTRING) {
-            thread = Director.CreateScriptThread(scr, m_Self, label.constStringValue());
+            thread = Director.CreateScriptThread(this, label.constStringValue());
         } else {
-            thread = Director.CreateScriptThread(scr, m_Self, label.stringValue());
+            thread = Director.CreateScriptThread(this, label.stringValue());
         }
     } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
         ScriptVariable *script    = label[1];
@@ -179,9 +211,9 @@ ScriptThread *ScriptClass::CreateThreadInternal(const ScriptVariable& label)
         }
 
         if (labelname->GetType() == VARIABLE_CONSTSTRING) {
-            thread = Director.CreateScriptThread(scr, m_Self, labelname->constStringValue());
+            thread = Director.CreateScriptThread(scr, GetSelf(), labelname->constStringValue());
         } else {
-            thread = Director.CreateScriptThread(scr, m_Self, labelname->stringValue());
+            thread = Director.CreateScriptThread(scr, GetSelf(), labelname->stringValue());
         }
     } else {
         ScriptError("ScriptClass::CreateThreadInternal: bad argument format");
@@ -202,10 +234,11 @@ ScriptThread *ScriptClass::CreateScriptInternal(const ScriptVariable& label)
 
     if (label.GetType() == VARIABLE_STRING || label.GetType() == VARIABLE_CONSTSTRING) {
         if (label.GetType() == VARIABLE_CONSTSTRING) {
-            thread = Director.CreateScriptThread(Director.GetGameScript(label.stringValue()), m_Self, "");
+            scr = Director.GetGameScript(label.constStringValue());
         } else {
-            thread = Director.CreateScriptThread(Director.GetGameScript(label.constStringValue()), m_Self, "");
+            scr = Director.GetGameScript(label.stringValue());
         }
+        thread = Director.CreateScriptThread(scr, GetSelf(), "");
     } else if (label.GetType() == VARIABLE_CONSTARRAY && label.arraysize() > 1) {
         ScriptVariable *script    = label[1];
         ScriptVariable *labelname = label[2];
@@ -217,9 +250,9 @@ ScriptThread *ScriptClass::CreateScriptInternal(const ScriptVariable& label)
         }
 
         if (labelname->GetType() == VARIABLE_CONSTSTRING) {
-            thread = Director.CreateScriptThread(scr, m_Self, labelname->constStringValue());
+            thread = Director.CreateScriptThread(scr, GetSelf(), labelname->constStringValue());
         } else {
-            thread = Director.CreateScriptThread(scr, m_Self, labelname->stringValue());
+            thread = Director.CreateScriptThread(scr, GetSelf(), labelname->stringValue());
         }
     } else {
         ScriptError("ScriptClass::CreateScriptInternal: bad label type '%s'", label.GetTypeName());
@@ -233,10 +266,10 @@ ScriptThread *ScriptClass::CreateScriptInternal(const ScriptVariable& label)
 AddThread
 ====================
 */
-void ScriptClass::AddThread(ScriptVM *m_ScriptVM)
+void ScriptClass::AddThread(ScriptVM *thread)
 {
-    m_ScriptVM->next = m_Threads;
-    m_Threads        = m_ScriptVM;
+    thread->next = m_Threads;
+    m_Threads    = thread;
 }
 
 /*
@@ -246,22 +279,22 @@ KillThreads
 */
 void ScriptClass::KillThreads()
 {
+    ScriptVM *thread;
+    ScriptVM *next;
+
     if (!m_Threads) {
         return;
     }
 
-    ScriptVM *m_current;
-    ScriptVM *m_next;
+    for (thread = m_Threads; thread; thread = next) {
+        if (g_scripttrace->integer && thread->CanScriptTracePrint()) {
+            gi.DPrintf2("---KILLTHREADS THREAD: %p\n", thread);
+        }
 
-    m_current = m_Threads;
-
-    do {
-        m_current->m_ScriptClass = NULL;
-
-        m_next = m_current->next;
-        delete m_current->m_Thread;
-
-    } while ((m_current = m_next) != nullptr);
+        thread->m_ScriptClass = NULL;
+        next                  = thread->next;
+        delete thread->m_Thread;
+    }
 
     m_Threads = NULL;
 }
@@ -271,23 +304,24 @@ void ScriptClass::KillThreads()
 RemoveThread
 ====================
 */
-void ScriptClass::RemoveThread(ScriptVM *m_ScriptVM)
+void ScriptClass::RemoveThread(ScriptVM *thread)
 {
-    if (m_Threads == m_ScriptVM) {
-        m_Threads = m_ScriptVM->next;
+    ScriptVM *current;
+    ScriptVM *next;
 
-        if (m_Threads == NULL) {
+    if (m_Threads == thread) {
+        m_Threads = thread->next;
+
+        if (!m_Threads) {
             delete this;
         }
     } else {
-        ScriptVM *m_current = m_Threads;
-        ScriptVM *i;
-
-        for (i = m_Threads->next; i != m_ScriptVM; i = i->next) {
-            m_current = i;
+        next = m_Threads;
+        for (current = m_Threads->next; current != thread; current = current->next) {
+            next = current;
         }
 
-        m_current->next = i->next;
+        next->next = current->next;
     }
 }
 
diff --git a/code/script/scriptclass.h b/code/script/scriptclass.h
index 33e45be5..d1aa8952 100644
--- a/code/script/scriptclass.h
+++ b/code/script/scriptclass.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -56,6 +56,7 @@ public:
     ScriptClass();
     ~ScriptClass();
 
+    void        StoppedNotify() override;
     void        Archive(Archiver       &arc) override;
     void        ArchiveInternal(Archiver       &arc);
     static void ArchiveScript(Archiver& arc, ScriptClass **obj);
@@ -64,9 +65,9 @@ public:
     ScriptThread *CreateThreadInternal(const ScriptVariable& label) override;
     ScriptThread *CreateScriptInternal(const ScriptVariable& label) override;
 
-    void AddThread(ScriptVM *m_ScriptVM);
+    void AddThread(ScriptVM *thread);
     void KillThreads(void);
-    void RemoveThread(ScriptVM *m_ScriptVM);
+    void RemoveThread(ScriptVM *thread);
 
     str            Filename();
     unsigned char *FindLabel(str label);
diff --git a/code/script/scriptcompiler.cpp b/code/script/scriptcompiler.cpp
index 276d83f6..75508375 100644
--- a/code/script/scriptcompiler.cpp
+++ b/code/script/scriptcompiler.cpp
@@ -77,7 +77,7 @@ unsigned char ScriptCompiler::PrevOpcode()
     return prev_opcodes[prev_opcode_pos].opcode;
 }
 
-char ScriptCompiler::PrevVarStackOffset()
+signed char ScriptCompiler::PrevVarStackOffset()
 {
     return prev_opcodes[prev_opcode_pos].VarStackOffset;
 }
@@ -102,16 +102,16 @@ void ScriptCompiler::ClearPrevOpcode()
 
 void ScriptCompiler::AccumulatePrevOpcode(int opcode, int iVarStackOffset)
 {
-	if (showopcodes->integer) {
-		glbs.DPrintf("\t\t%08d: %s (%d)\n", code_pos - code_ptr, OpcodeName(OP_BOOL_TO_VAR), m_iVarStackOffset);
-	}
+    if (showopcodes->integer) {
+        glbs.DPrintf("\t\t%08d: %s (%d)\n", code_pos - code_ptr, OpcodeName(OP_BOOL_TO_VAR), m_iVarStackOffset);
+    }
 
-	int pos = (prev_opcode_pos + 1) % 100;
+    int pos = (prev_opcode_pos + 1) % 100;
 
-	prev_opcode_pos = pos;
-	prev_opcodes[pos].opcode = OP_BOOL_TO_VAR;
-	prev_opcodes[pos].VarStackOffset = 0;
-	prev_opcodes[(pos + 1) % 100].opcode = OP_PREVIOUS;
+    prev_opcode_pos                      = pos;
+    prev_opcodes[pos].opcode             = OP_BOOL_TO_VAR;
+    prev_opcodes[pos].VarStackOffset     = 0;
+    prev_opcodes[(pos + 1) % 100].opcode = OP_PREVIOUS;
 }
 
 void ScriptCompiler::AddBreakJumpLocation(unsigned char *pos)
@@ -146,7 +146,7 @@ void ScriptCompiler::AddJumpBackLocation(unsigned char *pos)
 {
     int offset = (code_pos - pos);
 
-    EmitOpcodeValue(offset, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)offset, sizeof(unsigned int));
     ClearPrevOpcode();
 }
 
@@ -154,7 +154,7 @@ void ScriptCompiler::AddJumpToLocation(unsigned char *pos)
 {
     int offset = (pos - code_pos - 1);
 
-    EmitOpcodeValue(offset, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)offset, sizeof(unsigned int));
     ClearPrevOpcode();
 }
 
@@ -251,7 +251,8 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
     int          eventnum;
     unsigned int index;
     sval_t       listener_val;
-    const char   *name  = lhs.node[2].stringValue;
+    const char  *name = lhs.node[2].stringValue;
+    //str name_lowered;
 
     if (lhs.node[0].type != ENUM_field) {
         if (lhs.node[0].type == ENUM_array_expr) {
@@ -264,20 +265,22 @@ void ScriptCompiler::EmitAssignmentStatement(sval_t lhs, unsigned int sourcePos)
         return;
     }
 
-    index = Director.AddString(name);
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index    = Director.AddString(name);
     eventnum = Event::FindSetterEventNum(name);
 
     listener_val = lhs.node[1];
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         EmitValue(listener_val);
         EmitOpcode(OP_LOAD_FIELD_VAR, sourcePos);
     } else {
-        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].intValue, sourcePos);
     }
 
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitBoolJumpFalse(unsigned int sourcePos)
@@ -391,7 +394,7 @@ void ScriptCompiler::EmitConstArrayOpcode(int iCount)
     SetOpcodeVarStackOffset(OP_LOAD_CONST_ARRAY1, 1 - iCount);
     EmitOpcode(OP_LOAD_CONST_ARRAY1, -1);
 
-    EmitOpcodeValue(iCount, sizeof(short));
+    EmitOpcodeValue((short)iCount, sizeof(short));
 }
 
 void ScriptCompiler::EmitContinue(unsigned int sourcePos)
@@ -474,6 +477,8 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     unsigned int eventnum = 0;
     unsigned int index    = -1;
     unsigned int prev_index;
+    const  char* name;
+    //str name_lowered;
 
     /*
     if (field_val.node[0].stringValue) {
@@ -490,22 +495,25 @@ void ScriptCompiler::EmitField(sval_t listener_val, sval_t field_val, unsigned i
     }
     */
 
-    index = Director.AddString(field_val.stringValue);
-    eventnum = Event::FindGetterEventNum(field_val.stringValue);
+    name = field_val.stringValue;
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index    = Director.AddString(name);
+    eventnum = Event::FindGetterEventNum(name);
 
     prev_index = GetOpcodeValue<unsigned int>(sizeof(unsigned int), sizeof(unsigned int));
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinReadVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinReadVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         EmitValue(listener_val);
         EmitOpcode(OP_STORE_FIELD, sourcePos);
-        EmitOpcodeValue(index, sizeof(unsigned int));
-    } else if (PrevOpcode() != (OP_LOAD_GAME_VAR + listener_val.node[1].byteValue) || prev_index != index) {
-        EmitOpcode(OP_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
-        EmitOpcodeValue(index, sizeof(unsigned int));
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
+    } else if (PrevOpcode() != (OP_LOAD_GAME_VAR + listener_val.node[1].intValue) || prev_index != index) {
+        EmitOpcode(OP_STORE_GAME_VAR + listener_val.node[1].intValue, sourcePos);
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     } else {
         AbsorbPrevOpcode();
-        EmitOpcode(OP_LOAD_STORE_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_STORE_GAME_VAR + listener_val.node[1].intValue, sourcePos);
         code_pos += sizeof(unsigned int);
     }
 }
@@ -637,16 +645,16 @@ void ScriptCompiler::EmitInteger(unsigned int value, unsigned int sourcePos)
         EmitOpcode(OP_STORE_INT0, sourcePos);
     } else if (value < 127) {
         EmitOpcode(OP_STORE_INT1, sourcePos);
-        EmitOpcodeValue(value, sizeof(byte));
+        EmitOpcodeValue((byte)value, sizeof(byte));
     } else if (value < 32767) {
         EmitOpcode(OP_STORE_INT2, sourcePos);
-        EmitOpcodeValue(value, sizeof(short));
+        EmitOpcodeValue((short)value, sizeof(short));
     } else if (value < 8388607) {
         EmitOpcode(OP_STORE_INT3, sourcePos);
-        EmitOpcodeValue(value, sizeof(short3));
+        EmitOpcodeValue((short3)value, sizeof(short3));
     } else {
         EmitOpcode(OP_STORE_INT4, sourcePos);
-        EmitOpcodeValue(value, sizeof(int));
+        EmitOpcodeValue((int)value, sizeof(int));
     }
 }
 
@@ -662,7 +670,7 @@ void ScriptCompiler::EmitJumpBack(unsigned char *pos, unsigned int sourcePos)
     AddJumpBackLocation(pos);
 }
 
-void ScriptCompiler::EmitLabel(const char* name, unsigned int sourcePos)
+void ScriptCompiler::EmitLabel(const char *name, unsigned int sourcePos)
 {
     if (showopcodes->integer) {
         glbs.DPrintf("<%s>:\n", name);
@@ -678,16 +686,16 @@ void ScriptCompiler::EmitLabel(const char* name, unsigned int sourcePos)
 
 void ScriptCompiler::EmitLabel(int name, unsigned int sourcePos)
 {
-	if (showopcodes->integer) {
-		glbs.DPrintf("<%d>:\n", name);
-	}
+    if (showopcodes->integer) {
+        glbs.DPrintf("<%d>:\n", name);
+    }
 
-	if (!stateScript->AddLabel(str(name), code_pos)) {
-		CompileError(sourcePos, "Duplicate label '%d'", name);
-	}
+    if (!stateScript->AddLabel(str(name), code_pos)) {
+        CompileError(sourcePos, "Duplicate label '%d'", name);
+    }
 
-	// Make sure to clear the previous opcode since it's a new context
-	ClearPrevOpcode();
+    // Make sure to clear the previous opcode since it's a new context
+    ClearPrevOpcode();
 }
 
 void ScriptCompiler::EmitLabelParameterList(sval_t parameter_list, unsigned int sourcePos)
@@ -703,7 +711,7 @@ void ScriptCompiler::EmitLabelParameterList(sval_t parameter_list, unsigned int
     }
 }
 
-void ScriptCompiler::EmitLabelPrivate(const char* name, unsigned int sourcePos)
+void ScriptCompiler::EmitLabelPrivate(const char *name, unsigned int sourcePos)
 {
     if (showopcodes->integer) {
         glbs.DPrintf("<%s>:\n", name);
@@ -711,15 +719,15 @@ void ScriptCompiler::EmitLabelPrivate(const char* name, unsigned int sourcePos)
 
     if (!stateScript->AddLabel(name, code_pos, true)) {
         CompileError(sourcePos, "Duplicate label '%s'", name);
-	}
+    }
 
-	// Make sure to clear the previous opcode since it's a new context
-	ClearPrevOpcode();
+    // Make sure to clear the previous opcode since it's a new context
+    ClearPrevOpcode();
 }
 
 void ScriptCompiler::EmitAndJump(sval_t logic_stmt, unsigned int sourcePos)
 {
-    unsigned char* jmp;
+    unsigned char *jmp;
     int            label;
 
     if (showopcodes->integer) {
@@ -741,8 +749,8 @@ void ScriptCompiler::EmitAndJump(sval_t logic_stmt, unsigned int sourcePos)
         glbs.DPrintf("<LABEL%d>:\n", label);
     }
 
-	AddJumpLocation(jmp);
-	AccumulatePrevOpcode(OP_BOOL_LOGICAL_AND, 0);
+    AddJumpLocation(jmp);
+    AccumulatePrevOpcode(OP_BOOL_LOGICAL_AND, 0);
 }
 
 void ScriptCompiler::EmitOrJump(sval_t logic_stmt, unsigned int sourcePos)
@@ -753,7 +761,7 @@ void ScriptCompiler::EmitOrJump(sval_t logic_stmt, unsigned int sourcePos)
     if (showopcodes->integer) {
         label = current_label++;
 
-		glbs.DPrintf("BOOL_LOGICAL_OR <LABEL%d>\n", label);
+        glbs.DPrintf("BOOL_LOGICAL_OR <LABEL%d>\n", label);
     }
 
     EmitOpcode(OP_BOOL_LOGICAL_OR, sourcePos);
@@ -769,8 +777,8 @@ void ScriptCompiler::EmitOrJump(sval_t logic_stmt, unsigned int sourcePos)
         glbs.DPrintf("<LABEL%d>:\n", label);
     }
 
-	AddJumpLocation(jmp);
-	AccumulatePrevOpcode(OP_BOOL_LOGICAL_OR, 0);
+    AddJumpLocation(jmp);
+    AccumulatePrevOpcode(OP_BOOL_LOGICAL_OR, 0);
 }
 
 void ScriptCompiler::EmitMakeArray(sval_t val)
@@ -791,12 +799,12 @@ void ScriptCompiler::EmitMethodExpression(int iParamCount, int eventnum, unsigne
         SetOpcodeVarStackOffset(OP_EXEC_METHOD_COUNT1, -iParamCount);
         EmitOpcode(OP_EXEC_METHOD_COUNT1, sourcePos);
 
-        EmitOpcodeValue(iParamCount, sizeof(byte));
+        EmitOpcodeValue((byte)iParamCount, sizeof(byte));
     } else {
         EmitOpcode(OP_EXEC_METHOD0 + iParamCount, sourcePos);
     }
 
-    EmitOpcodeValue(eventnum, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)eventnum, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitNil(unsigned int sourcePos)
@@ -899,29 +907,33 @@ void ScriptCompiler::EmitOpcode(int opcode, unsigned int sourcePos)
     prev_opcodes[prev_opcode_pos].VarStackOffset     = iVarStackOffset;
     prev_opcodes[(prev_opcode_pos + 1) % 100].opcode = OP_PREVIOUS;
 
-    EmitOpcodeValue(opcode, sizeof(byte));
+    EmitOpcodeValue((byte)opcode, sizeof(byte));
 }
 
 void ScriptCompiler::EmitParameter(sval_t lhs, unsigned int sourcePos)
 {
+    str name_lowered;
+
     if (lhs.node[0].type != ENUM_field) {
         CompileError(sourcePos, "bad parameter lvalue: %d (expecting field)", lhs.node[0].type);
     }
 
     sval_u      listener_val = lhs.node[1];
     const char *name         = lhs.node[2].stringValue;
+    //name_lowered = name;
+    //name_lowered.tolower();
 
     int eventnum = Event::FindSetterEventNum(name);
 
     if (listener_val.node[0].type != ENUM_listener
-        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].byteValue, eventnum))) {
+        || (eventnum && BuiltinWriteVariable(sourcePos, listener_val.node[1].intValue, eventnum))) {
         CompileError(sourcePos, "built-in field '%s' not allowed", name);
     } else {
         EmitOpcode(OP_STORE_PARAM, sourcePos);
-        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].byteValue, sourcePos);
+        EmitOpcode(OP_LOAD_GAME_VAR + listener_val.node[1].intValue, sourcePos);
 
         unsigned int index = Director.AddString(name);
-        EmitOpcodeValue(index, sizeof(unsigned int));
+        EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
     }
 }
 
@@ -946,6 +958,8 @@ int ScriptCompiler::EmitParameterList(sval_t event_parameter_list)
 void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
 {
     unsigned int index;
+    const char* name;
+    //str name_lowered;
 
     if (val.node[0].type != ENUM_field) {
         if (val.node[0].type == ENUM_array_expr) {
@@ -958,11 +972,14 @@ void ScriptCompiler::EmitRef(sval_t val, unsigned int sourcePos)
         return;
     }
 
-    index = Director.AddString(val.node[2].stringValue);
+    name = val.node[2].stringValue;
+    //name_lowered = name;
+    //name_lowered.tolower();
+    index = Director.AddString(name);
 
     EmitValue(val.node[1]);
     EmitOpcode(OP_STORE_FIELD_REF, sourcePos);
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitStatementList(sval_t val)
@@ -983,7 +1000,7 @@ void ScriptCompiler::EmitString(str value, unsigned int sourcePos)
     }
 
     EmitOpcode(OP_STORE_STRING, sourcePos);
-    EmitOpcodeValue(index, sizeof(unsigned int));
+    EmitOpcodeValue((unsigned int)index, sizeof(unsigned int));
 }
 
 void ScriptCompiler::EmitSwitch(sval_t val, unsigned int sourcePos)
@@ -1031,11 +1048,11 @@ __emit:
     case ENUM_NOP:
         break;
 
-	case ENUM_logical_and:
-		EmitValue(val.node[1]);
-		EmitVarToBool(val.node[3].sourcePosValue);
-		EmitAndJump(val.node[2], val.node[3].sourcePosValue);
-		break;
+    case ENUM_logical_and:
+        EmitValue(val.node[1]);
+        EmitVarToBool(val.node[3].sourcePosValue);
+        EmitAndJump(val.node[2], val.node[3].sourcePosValue);
+        break;
 
     case ENUM_logical_or:
         EmitValue(val.node[1]);
@@ -1113,12 +1130,12 @@ __emit:
                 SetOpcodeVarStackOffset(OP_EXEC_CMD_COUNT1, -(int32_t)iParamCount);
                 EmitOpcode(OP_EXEC_CMD_COUNT1, val.node[3].sourcePosValue);
 
-                EmitOpcodeValue(iParamCount, sizeof(byte));
+                EmitOpcodeValue((byte)iParamCount, sizeof(byte));
             } else {
                 EmitOpcode(OP_EXEC_CMD0 + iParamCount, val.node[3].sourcePosValue);
             }
 
-            EmitOpcodeValue((op_ev_t)eventnum, sizeof(unsigned int));
+            EmitOpcodeValue((op_ev_t)eventnum, sizeof(op_ev_t));
             break;
         }
 
@@ -1132,7 +1149,7 @@ __emit:
                 CompileError(val.node[3].sourcePosValue, "unknown command: %s", val.node[1].stringValue);
             }
 
-			EmitOpcode(OP_STORE_LOCAL, val.node[3].sourcePosValue);
+            EmitOpcode(OP_STORE_LOCAL, val.node[3].sourcePosValue);
             EmitMethodExpression(iParamCount, eventnum, val.node[3].sourcePosValue);
             break;
         }
@@ -1153,12 +1170,12 @@ __emit:
                 SetOpcodeVarStackOffset(OP_EXEC_CMD_COUNT1, -(int32_t)iParamCount);
                 EmitOpcode(OP_EXEC_CMD_METHOD_COUNT1, val.node[4].sourcePosValue);
 
-                EmitOpcodeValue(iParamCount, sizeof(byte));
+                EmitOpcodeValue((byte)iParamCount, sizeof(byte));
             } else {
                 EmitOpcode(OP_EXEC_CMD_METHOD0 + iParamCount, val.node[4].sourcePosValue);
             }
 
-            EmitOpcodeValue(eventnum, sizeof(unsigned int));
+            EmitOpcodeValue((op_ev_t)eventnum, sizeof(op_ev_t));
             break;
         }
 
@@ -1178,20 +1195,20 @@ __emit:
         }
 
     case ENUM_const_array_expr:
-		EmitConstArray(val.node[1], val.node[2], val.node[3].sourcePosValue);
-		break;
+        EmitConstArray(val.node[1], val.node[2], val.node[3].sourcePosValue);
+        break;
 
     case ENUM_continue:
-		EmitContinue(val.node[1].sourcePosValue);
-		break;
+        EmitContinue(val.node[1].sourcePosValue);
+        break;
 
     case ENUM_do:
-		EmitDoWhileJump(val.node[1], val.node[2], val.node[3].sourcePosValue);
-		break;
+        EmitDoWhileJump(val.node[1], val.node[2], val.node[3].sourcePosValue);
+        break;
 
     case ENUM_field:
-		EmitField(val.node[1], val.node[2], val.node[3].sourcePosValue);
-		break;
+        EmitField(val.node[1], val.node[2], val.node[3].sourcePosValue);
+        break;
 
     case ENUM_func1_expr:
         EmitValue(val.node[2]);
@@ -1200,7 +1217,7 @@ __emit:
 
     case ENUM_if_statement:
         EmitValue(val.node[1]);
-        EmitVarToBool(val.node[4].sourcePosValue);
+        EmitVarToBool(val.node[3].sourcePosValue);
         EmitIfJump(val.node[2], val.node[3].sourcePosValue);
         break;
 
@@ -1249,7 +1266,7 @@ __emit:
         break;
 
     case ENUM_listener:
-        EmitOpcode(OP_STORE_GAME + val.node[1].byteValue, val.node[2].sourcePosValue);
+        EmitOpcode(OP_STORE_GAME + val.node[1].intValue, val.node[2].sourcePosValue);
         break;
 
     case ENUM_NIL:
@@ -1438,7 +1455,7 @@ void ScriptCompiler::CompileError(unsigned int sourcePos, const char *format, ..
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
     compileSuccess = false;
@@ -1484,7 +1501,7 @@ int yyerror(const char *msg)
     return 1;
 }
 
-size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const char *type)
+bool ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const char *type, size_t& outLength)
 {
     parsedata = yyparsedata();
 
@@ -1502,6 +1519,8 @@ size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const c
     script      = gameScript;
     stateScript = &gameScript->m_State;
 
+    outLength = 0;
+
     yy_init_script();
     parsetree_init();
 
@@ -1518,22 +1537,23 @@ size_t ScriptCompiler::Parse(GameScript *gameScript, char *sourceBuffer, const c
             }
 
             yylex_destroy();
-            return 0;
+            return false;
         }
     } catch (ScriptException& exc) {
         yylex_destroy();
         exc;
-        return 0;
+        return false;
     }
 
     yylex_destroy();
 
-    return parsedata.total_length;
+    outLength = parsedata.total_length;
+    return true;
 }
 
-size_t ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer)
+bool ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer, size_t& outLength)
 {
-    size_t length;
+    bool success = false;
 
     if (progBuffer == NULL) {
         glbs.DPrintf("Invalid program buffer\n");
@@ -1544,7 +1564,7 @@ size_t ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer
     code_ptr = progBuffer;
     prog_ptr = progBuffer;
 
-    gameScript->m_ProgToSource = new con_set<unsigned char *, sourceinfo_t>;
+    gameScript->m_ProgToSource = new con_set<const unsigned char *, sourceinfo_t>;
 
     compileSuccess = true;
 
@@ -1557,21 +1577,22 @@ size_t ScriptCompiler::Compile(GameScript *gameScript, unsigned char *progBuffer
         if (compileSuccess) {
             stateScript->AddLabel("", code_ptr);
 
-            length = code_pos - code_ptr;
+            outLength = code_pos - code_ptr;
+            success = true;
         } else {
-            length = 0;
+            outLength = 0;
         }
 
         prog_end_ptr = code_pos;
     } catch (ScriptException& exc) {
         exc;
-        length       = 0;
+        outLength = 0;
         prog_end_ptr = code_pos;
     }
 
     parsetree_freeall();
 
-    return length;
+    return success;
 }
 
 str ScriptCompiler::GetLine(str content, int line)
@@ -1605,6 +1626,13 @@ void ScriptCompiler::EmitOpcodeValue(const Value& value, size_t size)
     code_pos += size;
 }
 
+template<typename Value>
+void ScriptCompiler::EmitOpcodeValue(const Value& value)
+{
+    Com_Memcpy(code_pos, &value, sizeof(value));
+    code_pos += sizeof(value);
+}
+
 template<typename Value>
 void ScriptCompiler::EmitAt(unsigned char *location, const Value& value, size_t size)
 {
@@ -1658,6 +1686,7 @@ void CompileAssemble(const char *filename, const char *outputfile)
 
 bool GetCompiledScript(GameScript *scr)
 {
+    /*
     Archiver arc;
 
     arc.SetSilent(true);
@@ -1674,4 +1703,7 @@ bool GetCompiledScript(GameScript *scr)
     arc.Close();
 
     return true;
+    */
+    // FIXME: not used?
+    return false;
 }
diff --git a/code/script/scriptcompiler.h b/code/script/scriptcompiler.h
index 41896f9b..42203b01 100644
--- a/code/script/scriptcompiler.h
+++ b/code/script/scriptcompiler.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // compiler.h: Script Compiler
 
-#ifndef __COMPILER_H__
-#define __COMPILER_H__
+#pragma once
 
 #include "../script/scriptopcodes.h"
 #include "../fgame/gamescript.h"
@@ -33,18 +32,6 @@ class ScriptVariable;
 
 typedef void (*ScriptDisplayTokenFunc)(const char *type, const char *name);
 
-enum {
-    method_game,
-    method_level,
-    method_local,
-    method_parm,
-    method_self,
-    method_group,
-    method_owner,
-    method_field,
-    method_array,
-};
-
 typedef struct scriptmacro {
     str name;
     str parameters;
@@ -90,7 +77,7 @@ public:
     void Reset();
 
     unsigned char PrevOpcode();
-    char          PrevVarStackOffset();
+    signed char   PrevVarStackOffset();
     void          AbsorbPrevOpcode();
     void          ClearPrevOpcode();
     void          AccumulatePrevOpcode(int opcode, int iVarStackOffset);
@@ -127,10 +114,10 @@ public:
     void EmitInteger(unsigned int value, unsigned int sourcePos);
     void EmitJump(unsigned char *pos, unsigned int sourcePos);
     void EmitJumpBack(unsigned char *pos, unsigned int sourcePos);
-    void EmitLabel(const char* name, unsigned int sourcePos);
+    void EmitLabel(const char *name, unsigned int sourcePos);
     void EmitLabel(int name, unsigned int sourcePos);
     void EmitLabelParameterList(sval_t parameter_list, unsigned int sourcePos);
-    void EmitLabelPrivate(const char* name, unsigned int sourcePos);
+    void EmitLabelPrivate(const char *name, unsigned int sourcePos);
     void EmitAndJump(sval_t logic_stmt, unsigned int sourcePos);
     void EmitOrJump(sval_t logic_stmt, unsigned int sourcePos);
     void EmitMakeArray(sval_t val);
@@ -164,8 +151,8 @@ public:
 
     char  *Preprocess(char *sourceBuffer);
     void   Preclean(char *processedBuffer);
-    size_t Parse(GameScript *m_GameScript, char *sourceBuffer, const char *type);
-    size_t Compile(GameScript *m_GameScript, unsigned char *progBuffer);
+    bool Parse(GameScript *m_GameScript, char *sourceBuffer, const char *type, size_t& outLength);
+    bool Compile(GameScript *m_GameScript, unsigned char *progBuffer, size_t& outLength);
 
     static str GetLine(str content, int line);
 
@@ -173,6 +160,9 @@ private:
     template<typename Value>
     void EmitOpcodeValue(const Value& value, size_t size);
 
+    template<typename Value>
+    void EmitOpcodeValue(const Value& value);
+
     template<typename Value>
     void EmitAt(unsigned char *location, const Value& value, size_t size);
 
@@ -190,5 +180,3 @@ extern ScriptCompiler Compiler;
 
 void CompileAssemble(const char *filename, const char *outputfile);
 bool GetCompiledScript(GameScript *scr);
-
-#endif
diff --git a/code/script/scriptexception.cpp b/code/script/scriptexception.cpp
index cdd58e4b..6fb8b5ee 100644
--- a/code/script/scriptexception.cpp
+++ b/code/script/scriptexception.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // scriptexception.cpp : Script Exception
 
 #include "scriptexception.h"
+#include "q_shared.h"
 
 #include <cstdarg>
 
@@ -50,7 +51,7 @@ ScriptException::ScriptException(const char *format, ...)
     char    data[4100];
 
     va_start(va, format);
-    vsprintf(data, format, va);
+    Q_vsnprintf(data, sizeof(data), format, va);
     va_end(va);
 
     CreateException(data);
@@ -67,7 +68,7 @@ void Error(const char *format, ...)
     char    data[4100];
 
     va_start(va, format);
-    vsprintf(data, format, va);
+    Q_vsnprintf(data, sizeof(data), format, va);
     va_end(va);
 
     throw ScriptException((const char *)data);
diff --git a/code/script/scriptexception.h b/code/script/scriptexception.h
index 9bd442d8..b48aa931 100644
--- a/code/script/scriptexception.h
+++ b/code/script/scriptexception.h
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // scriptexception.h: Script Exception
 
-#ifndef __EXCEPT_H__
-#define __EXCEPT_H__
+#pragma once
 
 #include "../qcommon/str.h"
 
@@ -49,6 +48,6 @@ public:
 void Error(const char *format, ...);
 
 #define ScriptDeprecated(function) throw ScriptException(function ": DEPRECATED. DON'T USE IT ANYMORE")
+#define ScriptDeprecatedAltMethod(alternative_name) gi.DPrintf("WARNING: %s: is deprecated and has been superseded by the " alternative_name " method\n", __FUNCTION__)
+#define ScriptDeprecatedAltVariable(alternative_name) gi.DPrintf("WARNING: %s: is deprecated and has been superseded by the " alternative_name " variable\n", __FUNCTION__)
 #define ScriptError                throw ScriptException
-
-#endif /* __EXCEPT_H__ */
diff --git a/code/script/scriptopcodes.h b/code/script/scriptopcodes.h
index 62ade8fd..ddddfb43 100644
--- a/code/script/scriptopcodes.h
+++ b/code/script/scriptopcodes.h
@@ -50,7 +50,7 @@ typedef struct {
 
 typedef struct {
     unsigned char opcode;
-    char          VarStackOffset;
+    signed char   VarStackOffset;
 } opcode_info_t;
 
 typedef enum {
diff --git a/code/script/scriptvariable.cpp b/code/script/scriptvariable.cpp
index 0a7e342e..943f2832 100644
--- a/code/script/scriptvariable.cpp
+++ b/code/script/scriptvariable.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "scriptvariable.h"
 #include "scriptexception.h"
 #include "../qcommon/str.h"
+#include "../qcommon/con_set.h"
 
 #ifdef GAME_DLL
 #    include "../fgame/archive.h"
@@ -33,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 
 #ifdef WITH_SCRIPT_ENGINE
-#    include "../fgame/world.h"
+#    include "../fgame/worldspawn.h"
 #    include "../fgame/scriptmaster.h"
 #    include "../fgame/simpleentity.h"
 #endif
@@ -77,19 +78,6 @@ void con_set<ScriptVariable, ScriptVariable>::Entry::Archive(Archiver& arc)
     value.ArchiveInternal(arc);
 }
 
-template<>
-void con_set<short3, ScriptVariable>::Entry::Archive(Archiver& arc)
-{
-    if (arc.Loading()) {
-        value.Archive(arc);
-#    ifdef WITH_SCRIPT_ENGINE
-        key = value.GetKey();
-#    endif
-    } else {
-        value.Archive(arc);
-    }
-}
-
 void ScriptArrayHolder::Archive(Archiver& arc)
 {
     arc.ArchiveUnsigned(&refCount);
@@ -116,7 +104,7 @@ void ScriptArrayHolder::Archive(Archiver& arc, ScriptArrayHolder *& arrayValue)
         arrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&arrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&arrayValue);
     }
 }
 
@@ -126,10 +114,10 @@ void ScriptConstArrayHolder::Archive(Archiver& arc)
     arc.ArchiveUnsigned(&size);
 
     if (arc.Loading()) {
-        constArrayValue = new ScriptVariable[size + 1] - 1;
+        constArrayValue = new ScriptVariable[size + 1];
     }
 
-    for (unsigned int i = 1; i <= size; i++) {
+    for (unsigned int i = 0; i < size; i++) {
         constArrayValue[i].ArchiveInternal(arc);
     }
 }
@@ -154,7 +142,7 @@ void ScriptConstArrayHolder::Archive(Archiver& arc, ScriptConstArrayHolder *& co
         constArrayValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&constArrayValue);
+        arc.ArchiveObjectPointer((LightClass **)&constArrayValue);
     }
 }
 
@@ -183,7 +171,7 @@ void ScriptPointer::Archive(Archiver& arc, ScriptPointer *& pointerValue)
         pointerValue->Archive(arc);
         return;
     } else {
-        arc.ArchiveObjectPointer((Class **)&pointerValue);
+        arc.ArchiveObjectPointer((LightClass **)&pointerValue);
     }
 }
 
@@ -206,7 +194,7 @@ void ScriptVariable::Archive(Archiver& arc)
 
 void ScriptVariable::Archive(Archiver& arc, ScriptVariable **obj)
 {
-    arc.ArchiveObjectPointer((Class **)obj);
+    arc.ArchiveObjectPointer((LightClass **)obj);
 }
 
 void ScriptVariable::ArchiveInternal(Archiver& arc)
@@ -217,7 +205,7 @@ void ScriptVariable::ArchiveInternal(Archiver& arc)
     switch (type) {
     case VARIABLE_STRING:
         if (arc.Loading()) {
-            m_data.stringValue = new str(4);
+            m_data.stringValue = new str;
         }
 
         arc.ArchiveString(m_data.stringValue);
@@ -266,7 +254,7 @@ void ScriptVariable::ArchiveInternal(Archiver& arc)
 
     case VARIABLE_REF:
     case VARIABLE_CONTAINER:
-        arc.ArchiveObjectPointer((Class **)&m_data.refValue);
+        arc.ArchiveObjectPointer((LightClass **)&m_data.refValue);
         break;
 
     case VARIABLE_SAFECONTAINER:
@@ -293,21 +281,35 @@ void ScriptVariable::ArchiveInternal(Archiver& arc)
         break;
     }
 }
+
+void ScriptVariable::MakePrimitive()
+{
+    switch (type) {
+    case VARIABLE_LISTENER:
+    case VARIABLE_REF:
+    case VARIABLE_CONTAINER:
+    case VARIABLE_SAFECONTAINER:
+        Com_Error(
+            ERR_DROP, "^~^~^ game.%s cannot be archived since it is of type '%s'.", getName().c_str(), GetTypeName()
+        );
+        Clear();
+        break;
+    }
+}
 #endif
 
 ScriptArrayHolder::ScriptArrayHolder()
-	: refCount(0)
-{
-}
+    : refCount(0)
+{}
 
 ScriptConstArrayHolder::ScriptConstArrayHolder(ScriptVariable *pVar, unsigned int size)
 {
     refCount   = 0;
     this->size = size;
 
-    constArrayValue = new ScriptVariable[size + 1] - 1;
+    constArrayValue = new ScriptVariable[size + 1];
 
-    for (unsigned int i = 1; i <= size; i++) {
+    for (unsigned int i = 0; i < size; i++) {
         constArrayValue[i] = pVar[i];
     }
 }
@@ -317,7 +319,7 @@ ScriptConstArrayHolder::ScriptConstArrayHolder(unsigned int size)
     refCount   = 0;
     this->size = size;
 
-    constArrayValue = new ScriptVariable[size + 1] - 1;
+    constArrayValue = new ScriptVariable[size + 1];
 }
 
 ScriptConstArrayHolder::ScriptConstArrayHolder()
@@ -330,8 +332,7 @@ ScriptConstArrayHolder::ScriptConstArrayHolder()
 ScriptConstArrayHolder::~ScriptConstArrayHolder()
 {
     if (constArrayValue) {
-        ScriptVariable *const offset = constArrayValue + 1;
-        delete[] offset;
+        delete[] constArrayValue;
     }
 }
 
@@ -365,22 +366,19 @@ void ScriptPointer::setValue(const ScriptVariable& var)
     int             i;
     ScriptVariable *pVar;
 
-    if (var.type == VARIABLE_POINTER)
-    {
+    if (var.type == VARIABLE_POINTER) {
         for (i = list.NumObjects(); i > 0; i--) {
             pVar = list.ObjectAt(i);
 
             pVar->m_data.pointerValue = var.m_data.pointerValue;
             var.m_data.pointerValue->add(pVar);
         }
-    }
-    else
-    {
+    } else {
         for (i = list.NumObjects(); i > 0; i--) {
             pVar = list.ObjectAt(i);
 
             pVar->type = 0;
-            *pVar = var;
+            *pVar      = var;
         }
     }
 
@@ -452,11 +450,10 @@ void ScriptVariable::CastConstArrayValue(void)
 
         en = m_data.arrayValue->arrayValue;
 
-        i = 0;
+        i = 1;
 
-        for (value = en.NextValue(); value != NULL; value = en.NextValue()) {
-            i++;
-            constArrayValue->constArrayValue[i] = *value;
+        for (value = en.NextValue(); value != NULL; value = en.NextValue(), i++) {
+            constArrayValue->constArrayValue[i - 1] = *value;
         }
 
         break;
@@ -465,7 +462,7 @@ void ScriptVariable::CastConstArrayValue(void)
         constArrayValue = new ScriptConstArrayHolder(m_data.containerValue->NumObjects());
 
         for (int i = m_data.containerValue->NumObjects(); i > 0; i--) {
-            constArrayValue->constArrayValue[i].setListenerValue(m_data.containerValue->ObjectAt(i));
+            constArrayValue->constArrayValue[i - 1].setListenerValue(m_data.containerValue->ObjectAt(i));
         }
         break;
 
@@ -476,7 +473,7 @@ void ScriptVariable::CastConstArrayValue(void)
             constArrayValue = new ScriptConstArrayHolder(listeners->NumObjects());
 
             for (int i = listeners->NumObjects(); i > 0; i--) {
-                constArrayValue->constArrayValue[i].setListenerValue(listeners->ObjectAt(i));
+                constArrayValue->constArrayValue[i - 1].setListenerValue(listeners->ObjectAt(i));
             }
         } else {
             constArrayValue = new ScriptConstArrayHolder(0);
@@ -485,7 +482,7 @@ void ScriptVariable::CastConstArrayValue(void)
 
     default:
         constArrayValue                     = new ScriptConstArrayHolder(1);
-        constArrayValue->constArrayValue[1] = *this;
+        constArrayValue->constArrayValue[0] = *this;
 
         break;
     }
@@ -552,13 +549,13 @@ void ScriptVariable::ClearInternal()
         m_data.constArrayValue = NULL;
         break;
 
-	case VARIABLE_LISTENER:
-		if (m_data.listenerValue) {
-			delete m_data.listenerValue;
-			m_data.listenerValue = NULL;
-		}
+    case VARIABLE_LISTENER:
+        if (m_data.listenerValue) {
+            delete m_data.listenerValue;
+            m_data.listenerValue = NULL;
+        }
 
-		break;
+        break;
 
     case VARIABLE_SAFECONTAINER:
         if (m_data.safeContainerValue) {
@@ -597,7 +594,7 @@ void ScriptVariable::ClearPointerInternal() const
 
 const char *ScriptVariable::GetTypeName() const
 {
-    return typenames[type];
+    return typenames[GetType()];
 }
 
 variabletype ScriptVariable::GetType() const
@@ -607,17 +604,22 @@ variabletype ScriptVariable::GetType() const
 
 qboolean ScriptVariable::IsEntity(void)
 {
-    if (type == VARIABLE_LISTENER) {
-        if (!m_data.listenerValue->Pointer()
-#if defined(GAME_DLL)
-            || checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())
-#endif
-        ) {
-            return true;
-        }
+    if (type != VARIABLE_LISTENER) {
+        return false;
     }
 
-    return false;
+    if (!m_data.listenerValue->Pointer()) {
+        // Fixed in OPM
+        //  Not sure why OG returns true
+        return false;
+    }
+#if defined(GAME_DLL)
+    if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
+        return false;
+    }
+#endif
+
+    return true;
 }
 
 qboolean ScriptVariable::IsListener(void)
@@ -639,14 +641,22 @@ qboolean ScriptVariable::IsConstArray() const
 
 qboolean ScriptVariable::IsSimpleEntity(void)
 {
-    if (type == VARIABLE_LISTENER) {
-        if (!m_data.listenerValue->Pointer()
-            || checkInheritance(&SimpleEntity::ClassInfo, m_data.listenerValue->Pointer()->classinfo())) {
-            return true;
-        }
+    if (type != VARIABLE_LISTENER) {
+        return false;
     }
 
-    return false;
+    if (!m_data.listenerValue->Pointer()) {
+        // Fixed in OPM
+        //  Not sure why OG returns true
+        return false;
+    }
+#if defined(GAME_DLL)
+    if (!checkInheritance(Entity::classinfostatic(), m_data.listenerValue->Pointer()->classinfo())) {
+        return false;
+    }
+#endif
+
+    return true;
 }
 
 #endif
@@ -725,7 +735,6 @@ void ScriptVariable::SetTrue(void)
 int ScriptVariable::arraysize(void) const
 {
     switch (GetType()) {
-
     case VARIABLE_NONE:
         return -1;
 
@@ -743,11 +752,11 @@ int ScriptVariable::arraysize(void) const
             return (*m_data.safeContainerValue)->NumObjects();
         } else {
             return 0;
-		}
+        }
 
-	case VARIABLE_POINTER:
+    case VARIABLE_POINTER:
         ClearPointerInternal();
-		return -1;
+        return -1;
 
     default:
         return 1;
@@ -783,11 +792,11 @@ size_t ScriptVariable::size(void) const
             return (*m_data.safeContainerValue)->NumObjects();
         } else {
             return 0;
-		}
+        }
 
-	case VARIABLE_POINTER:
+    case VARIABLE_POINTER:
         ClearPointerInternal();
-		return -1;
+        return -1;
 
     default:
         return 1;
@@ -907,7 +916,27 @@ void ScriptVariable::SetKey(const short3& key)
 Entity *ScriptVariable::entityValue(void)
 {
 #if defined(GAME_DLL)
-    return (Entity *)listenerValue();
+    Entity *ent;
+
+    switch (type) {
+    case VARIABLE_CONSTSTRING:
+        ent = static_cast<Entity *>(world->GetScriptTarget(Director.GetString(m_data.intValue)));
+        break;
+    case VARIABLE_STRING:
+        ent = static_cast<Entity *>(world->GetScriptTarget(stringValue()));
+        break;
+    case VARIABLE_LISTENER:
+        ent = static_cast<Entity *>(m_data.listenerValue->Pointer());
+        break;
+    default:
+        throw ScriptException("Cannot cast '%s' to entity", typenames[GetType()]);
+    }
+
+    if (ent && !ent->isSubclassOf(Entity)) {
+        ScriptError("Cannot cast '%s' to entity", ent->getClassname());
+    }
+
+    return ent;
 #else
     return NULL;
 #endif
@@ -969,11 +998,11 @@ void ScriptVariable::evalArrayAt(ScriptVariable& var)
     case VARIABLE_CONSTARRAY:
         index = var.intValue();
 
-        if (!index || index > m_data.constArrayValue->size) {
+        if (index == 0 || index > m_data.constArrayValue->size) {
             throw ScriptException("array index %d out of range", index);
         }
 
-        *this = m_data.constArrayValue->constArrayValue[index];
+        *this = m_data.constArrayValue->constArrayValue[index - 1];
         break;
 
     case VARIABLE_CONTAINER:
@@ -1024,7 +1053,7 @@ float ScriptVariable::floatValue(void) const
         return val;
 
     default:
-        throw ScriptException("Cannot cast '%s' to float", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to float", typenames[GetType()]);
     }
 }
 
@@ -1048,7 +1077,7 @@ int ScriptVariable::intValue(void) const
         return val;
 
     default:
-        throw ScriptException("Cannot cast '%s' to int", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to int", typenames[GetType()]);
     }
 }
 
@@ -1067,7 +1096,7 @@ Listener *ScriptVariable::listenerValue(void) const
         return (Listener *)m_data.listenerValue->Pointer();
 
     default:
-        throw ScriptException("Cannot cast '%s' to listener", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to listener", typenames[GetType()]);
     }
 
     return NULL;
@@ -1077,7 +1106,7 @@ Listener *ScriptVariable::listenerAt(uintptr_t index) const
 {
     switch (type) {
     case VARIABLE_CONSTARRAY:
-        return m_data.constArrayValue->constArrayValue[index].listenerValue();
+        return m_data.constArrayValue->constArrayValue[index - 1].listenerValue();
 
     case VARIABLE_CONTAINER:
         return m_data.containerValue->ObjectAt(index);
@@ -1087,7 +1116,7 @@ Listener *ScriptVariable::listenerAt(uintptr_t index) const
         return (*m_data.safeContainerValue)->ObjectAt(index);
 
     default:
-        throw ScriptException("Cannot cast '%s' to listener", typenames[type]);
+        throw ScriptException("Cannot cast '%s' to listener", typenames[GetType()]);
     }
 }
 
@@ -1314,14 +1343,14 @@ void ScriptVariable::setArrayAtRef(ScriptVariable& index, ScriptVariable& value)
     case VARIABLE_CONSTARRAY:
         intValue = index.intValue();
 
-        if (!intValue || intValue > m_data.constArrayValue->size) {
+        if (intValue == 0 || intValue > m_data.constArrayValue->size) {
             throw ScriptException("array index %d out of range", intValue);
         }
 
         if (value.GetType()) {
-            m_data.constArrayValue->constArrayValue[intValue] = value;
+            m_data.constArrayValue->constArrayValue[intValue - 1] = value;
         } else {
-            m_data.constArrayValue->constArrayValue[intValue].Clear();
+            m_data.constArrayValue->constArrayValue[intValue - 1].Clear();
         }
 
         break;
@@ -1367,7 +1396,7 @@ void ScriptVariable::setSafeContainerValue(ConList *newvalue)
 
 void ScriptVariable::setConstArrayValue(ScriptVariable *pVar, unsigned int size)
 {
-    ScriptConstArrayHolder *constArray = new ScriptConstArrayHolder(pVar - 1, size);
+    ScriptConstArrayHolder *constArray = new ScriptConstArrayHolder(pVar, size);
 
     ClearInternal();
     type = VARIABLE_CONSTARRAY;
@@ -1456,14 +1485,14 @@ void ScriptVariable::setVectorValue(const Vector& newvector)
 
 void ScriptVariable::operator+=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '+' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '+' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1513,8 +1542,9 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
     case VARIABLE_LISTENER
         + VARIABLE_CONSTSTRING *VARIABLE_MAX: // ( listener )			+		( const string )
     case VARIABLE_VECTOR
-        + VARIABLE_CONSTSTRING               *VARIABLE_MAX: // ( vector )			+		( const string )
-    case VARIABLE_STRING + VARIABLE_LISTENER *VARIABLE_MAX: // ( string )			+		( listener )
+        + VARIABLE_CONSTSTRING *VARIABLE_MAX: // ( vector )			+		( const string )
+    case VARIABLE_STRING
+        + VARIABLE_LISTENER *VARIABLE_MAX: // ( string )			+		( listener )
     case VARIABLE_CONSTSTRING
         + VARIABLE_LISTENER                *VARIABLE_MAX: // ( const string )		+		( listener )
     case VARIABLE_STRING + VARIABLE_VECTOR *VARIABLE_MAX: // ( string )			+		( vector )
@@ -1531,12 +1561,14 @@ void ScriptVariable::operator+=(const ScriptVariable& value)
 
 void ScriptVariable::operator-=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '-' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '-' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1565,12 +1597,14 @@ void ScriptVariable::operator-=(const ScriptVariable& value)
 
 void ScriptVariable::operator*=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '*' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '*' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1615,12 +1649,14 @@ void ScriptVariable::operator*=(const ScriptVariable& value)
 
 void ScriptVariable::operator/=(const ScriptVariable& value)
 {
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '/' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '/' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1711,14 +1747,15 @@ void ScriptVariable::operator/=(const ScriptVariable& value)
 
 void ScriptVariable::operator%=(const ScriptVariable& value)
 {
-    float mult = 0.0f;
+    float mult        = 0.0f;
+    int   currentType = GetType();
 
-    switch (GetType() + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '%%' applied to incompatible types '%s' and '%s'", typenames[GetType()], typenames[value.GetType()]
+            "binary '%%' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1824,14 +1861,14 @@ void ScriptVariable::operator%=(const ScriptVariable& value)
 
 void ScriptVariable::operator&=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '&' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '&' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1844,14 +1881,14 @@ void ScriptVariable::operator&=(const ScriptVariable& value)
 
 void ScriptVariable::operator^=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '^' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '^' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1864,14 +1901,14 @@ void ScriptVariable::operator^=(const ScriptVariable& value)
 
 void ScriptVariable::operator|=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '|' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '|' applied to incompatible types '%s' and '%s'", typenames[currentType], typenames[value.GetType()]
         );
 
         break;
@@ -1884,14 +1921,16 @@ void ScriptVariable::operator|=(const ScriptVariable& value)
 
 void ScriptVariable::operator<<=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '<<' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '<<' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[value.GetType()]
         );
 
         break;
@@ -1904,14 +1943,16 @@ void ScriptVariable::operator<<=(const ScriptVariable& value)
 
 void ScriptVariable::operator>>=(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
-            "binary '>>' applied to incompatible types '%s' and '%s'", typenames[type], typenames[value.GetType()]
+            "binary '>>' applied to incompatible types '%s' and '%s'",
+            typenames[currentType],
+            typenames[value.GetType()]
         );
 
         break;
@@ -1929,9 +1970,9 @@ bool ScriptVariable::operator!=(const ScriptVariable& value)
 
 bool ScriptVariable::operator==(const ScriptVariable& value)
 {
-    int type = GetType();
+    int currentType = GetType();
 
-    switch (type + value.GetType() * VARIABLE_MAX) {
+    switch (currentType + value.GetType() * VARIABLE_MAX) {
     default: // ( lval )	==	( nil )
              // ( nil )	==	( rval )
         Clear();
@@ -1960,13 +2001,13 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
         return m_data.intValue == value.m_data.intValue;
 
     case VARIABLE_INTEGER + VARIABLE_FLOAT *VARIABLE_MAX: // ( int ) == ( float )
-        return m_data.intValue == value.m_data.floatValue;
+        return fabs(m_data.intValue - value.m_data.floatValue) < 0.0001f;
 
     case VARIABLE_FLOAT + VARIABLE_FLOAT *VARIABLE_MAX: // ( float ) == ( float )
-        return m_data.floatValue == value.m_data.floatValue;
+        return fabs(m_data.floatValue - value.m_data.floatValue) < 0.0001f;
 
     case VARIABLE_FLOAT + VARIABLE_INTEGER *VARIABLE_MAX: // ( float ) == ( int )
-        return m_data.floatValue == value.m_data.intValue;
+        return fabs(m_data.floatValue - value.m_data.intValue) < 0.0001f;
 
     case VARIABLE_CONSTSTRING
         + VARIABLE_CONSTSTRING *VARIABLE_MAX: // ( const string )		==		( const string )
@@ -1979,9 +2020,10 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
     case VARIABLE_CHAR
         + VARIABLE_STRING *VARIABLE_MAX: // ( char )				==		( string )
     case VARIABLE_CONSTSTRING
-        + VARIABLE_STRING                    *VARIABLE_MAX: // ( const string )		==		( string )
-    case VARIABLE_LISTENER + VARIABLE_STRING *VARIABLE_MAX: // ( listener )			==		( string )
-    case VARIABLE_VECTOR + VARIABLE_STRING   *VARIABLE_MAX: // ( vector )			==		( string )
+        + VARIABLE_STRING *VARIABLE_MAX: // ( const string )		==		( string )
+    case VARIABLE_LISTENER
+        + VARIABLE_STRING                  *VARIABLE_MAX: // ( listener )			==		( string )
+    case VARIABLE_VECTOR + VARIABLE_STRING *VARIABLE_MAX: // ( vector )			==		( string )
     case VARIABLE_STRING
         + VARIABLE_CONSTSTRING *VARIABLE_MAX: // ( string )			==		( const string )
     case VARIABLE_INTEGER
@@ -2013,11 +2055,11 @@ bool ScriptVariable::operator==(const ScriptVariable& value)
             return (!lval.length() && !rval.length()) || (lval == rval);
         }
 
-    case VARIABLE_CHAR + VARIABLE_CHAR * VARIABLE_MAX: // ( char ) == ( char )
+    case VARIABLE_CHAR + VARIABLE_CHAR *VARIABLE_MAX: // ( char ) == ( char )
         return m_data.charValue == value.m_data.charValue;
 
     case VARIABLE_VECTOR + VARIABLE_VECTOR *VARIABLE_MAX: // ( vector ) == ( vector )
-        return VectorCompare(m_data.vectorValue, value.m_data.vectorValue) ? true : false;
+        return VectorCompareEpsilon(m_data.vectorValue, value.m_data.vectorValue, 0.0001f) ? true : false;
     }
 }
 
@@ -2041,7 +2083,7 @@ ScriptVariable& ScriptVariable::operator=(const ScriptVariable& variable)
             break;
 
         case VARIABLE_STRING:
-            m_data.stringValue = new str(variable.stringValue());
+            m_data.stringValue = new str(*variable.m_data.stringValue);
             break;
 
         case VARIABLE_FLOAT:
@@ -2084,7 +2126,7 @@ ScriptVariable& ScriptVariable::operator=(const ScriptVariable& variable)
             break;
 
         case VARIABLE_VECTOR:
-            m_data.vectorValue = (float*)new float[3];
+            m_data.vectorValue = (float *)new float[3];
             VectorCopy(variable.m_data.vectorValue, m_data.vectorValue);
             break;
         }
@@ -2100,7 +2142,7 @@ ScriptVariable& ScriptVariable::operator=(const ScriptVariable& variable)
             break;
 
         case VARIABLE_STRING:
-            m_data.stringValue = new str(variable.stringValue());
+            *m_data.stringValue = *variable.m_data.stringValue;
             break;
 
         case VARIABLE_FLOAT:
@@ -2169,8 +2211,7 @@ ScriptVariable& ScriptVariable::operator=(ScriptVariable&& variable)
     m_data        = variable.m_data;
     variable.type = VARIABLE_NONE;
 
-    if (type == VARIABLE_POINTER)
-    {
+    if (type == VARIABLE_POINTER) {
         // if it's a pointer, make sure to properly point
         m_data.pointerValue->add(this);
         m_data.pointerValue->remove(&variable);
@@ -2200,7 +2241,7 @@ ScriptVariable& ScriptVariable::operator[](ScriptVariable& index)
             throw ScriptException("array index %d out of range", i);
         }
 
-        return m_data.constArrayValue->constArrayValue[i];
+        return m_data.constArrayValue->constArrayValue[i - 1];
 
     default:
         throw ScriptException("[] applied to invalid type '%s'", typenames[GetType()]);
@@ -2209,7 +2250,7 @@ ScriptVariable& ScriptVariable::operator[](ScriptVariable& index)
 
 ScriptVariable *ScriptVariable::operator[](unsigned index) const
 {
-    return &m_data.constArrayValue->constArrayValue[index];
+    return &m_data.constArrayValue->constArrayValue[index - 1];
 }
 
 ScriptVariable *ScriptVariable::operator*()
@@ -2231,13 +2272,15 @@ void ScriptVariable::complement(void)
 
 void ScriptVariable::greaterthan(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
             "binary '>' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
+            typenames[currentType],
             typenames[variable.GetType()]
         );
 
@@ -2261,22 +2304,24 @@ void ScriptVariable::greaterthan(ScriptVariable& variable)
         m_data.intValue = m_data.floatValue > variable.m_data.intValue;
         break;
 
-    case VARIABLE_CHAR + VARIABLE_CHAR *VARIABLE_MAX: // ( char ) >= ( char )
+    case VARIABLE_CHAR + VARIABLE_CHAR *VARIABLE_MAX: // ( char ) > ( char )
         type            = VARIABLE_INTEGER;
-        m_data.intValue = m_data.charValue >= variable.m_data.charValue;
+        m_data.intValue = m_data.charValue > variable.m_data.charValue;
         break;
     }
 }
 
 void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
             "binary '>=' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
+            typenames[currentType],
             typenames[variable.GetType()]
         );
 
@@ -2309,13 +2354,15 @@ void ScriptVariable::greaterthanorequal(ScriptVariable& variable)
 
 void ScriptVariable::lessthan(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
             "binary '<' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
+            typenames[currentType],
             typenames[variable.GetType()]
         );
 
@@ -2348,13 +2395,15 @@ void ScriptVariable::lessthan(ScriptVariable& variable)
 
 void ScriptVariable::lessthanorequal(ScriptVariable& variable)
 {
-    switch (GetType() + variable.GetType() * VARIABLE_MAX) {
+    int currentType = GetType();
+
+    switch (currentType + variable.GetType() * VARIABLE_MAX) {
     default:
         Clear();
 
         throw ScriptException(
             "binary '<=' applied to incompatible types '%s' and '%s'",
-            typenames[GetType()],
+            typenames[currentType],
             typenames[variable.GetType()]
         );
 
@@ -2587,6 +2636,15 @@ void ScriptVariableList::Archive(Archiver& arc)
     list.Archive(arc);
 }
 
+void ScriptVariableList::MakePrimitive()
+{
+    con_set_enum<short3, ScriptVariable> en = list;
+
+    for (con_set_enum<short3, ScriptVariable>::Entry *entry = en.NextElement(); entry; entry = en.NextElement()) {
+        entry->value.MakePrimitive();
+    }
+}
+
 CLASS_DECLARATION(Class, ScriptVariableList, NULL) {
     {NULL, NULL}
 };
diff --git a/code/script/scriptvariable.h b/code/script/scriptvariable.h
index e3f28cc4..49056942 100644
--- a/code/script/scriptvariable.h
+++ b/code/script/scriptvariable.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // scriptvariable.h: Dynamic variables for scripts.
 
-#ifndef __SCRIPTVARIABLE_H__
-#define __SCRIPTVARIABLE_H__
+#pragma once
 
 #include "../qcommon/listener.h"
 #include "../qcommon/short3.h"
@@ -65,13 +64,14 @@ static const char *typenames[] = {
     "array",
     "pointer",
     "vector",
-    "double"};
+    "double"
+};
 
 class ScriptArrayHolder;
 class ScriptConstArrayHolder;
 class ScriptPointer;
 
-class ScriptVariable
+class ScriptVariable : public LightClass
 {
 public:
 #ifdef GAME_DLL
@@ -79,7 +79,7 @@ public:
 #endif
     unsigned char type; // variable type
 
-    union anon393 {
+    union {
     public:
         char               charValue;
         float              floatValue;
@@ -111,10 +111,6 @@ public:
 
     ~ScriptVariable();
 
-    void        Archive(Archiver       &arc);
-    static void Archive(Archiver& arc, ScriptVariable **obj);
-    void        ArchiveInternal(Archiver       &arc);
-
     void CastBoolean(void);
     void CastConstArrayValue(void);
     void CastEntity(void);
@@ -153,7 +149,7 @@ public:
     str& getName(void);
 
     short3& GetKey();
-    void    SetKey(const short3   &key);
+    void    SetKey(const short3& key);
 #endif
 
     Entity *entityValue(void);
@@ -202,7 +198,7 @@ public:
 #endif
 
     Vector vectorValue(void) const;
-    void   setVectorValue(const Vector  &newvector);
+    void   setVectorValue(const Vector& newvector);
 
     class PathNode *pathNodeValue(void) const;
     class Waypoint *waypointValue(void) const;
@@ -219,25 +215,31 @@ public:
     ScriptVariable& operator[](ScriptVariable& index);
     ScriptVariable *operator[](unsigned index) const;
     ScriptVariable *operator*();
-    void            operator+=(const ScriptVariable           &value);
-    void            operator-=(const ScriptVariable           &value);
-    void            operator*=(const ScriptVariable           &value);
-    void            operator/=(const ScriptVariable           &value);
-    void            operator%=(const ScriptVariable           &value);
-    void            operator&=(const ScriptVariable           &value);
-    void            operator^=(const ScriptVariable           &value);
-    void            operator|=(const ScriptVariable           &value);
-    void            operator<<=(const ScriptVariable           &value);
-    void            operator>>=(const ScriptVariable           &value);
+    void            operator+=(const ScriptVariable& value);
+    void            operator-=(const ScriptVariable& value);
+    void            operator*=(const ScriptVariable& value);
+    void            operator/=(const ScriptVariable& value);
+    void            operator%=(const ScriptVariable& value);
+    void            operator&=(const ScriptVariable& value);
+    void            operator^=(const ScriptVariable& value);
+    void            operator|=(const ScriptVariable& value);
+    void            operator<<=(const ScriptVariable& value);
+    void            operator>>=(const ScriptVariable& value);
 
     bool operator!=(const ScriptVariable& value);
     bool operator==(const ScriptVariable& value);
 
     ScriptVariable operator++(int);
     ScriptVariable operator--(int);
+
+    void        Archive(Archiver& arc);
+    static void Archive(Archiver& arc, ScriptVariable** obj);
+    void        ArchiveInternal(Archiver& arc);
+
+    void MakePrimitive();
 };
 
-class ScriptArrayHolder
+class ScriptArrayHolder : public LightClass
 {
 public:
     con_map<ScriptVariable, ScriptVariable> arrayValue;
@@ -246,11 +248,11 @@ public:
 public:
     ScriptArrayHolder();
 
-    void        Archive(Archiver       &arc);
+    void        Archive(Archiver& arc);
     static void Archive(Archiver& arc, ScriptArrayHolder *& arrayValue);
 };
 
-class ScriptConstArrayHolder
+class ScriptConstArrayHolder : public LightClass
 {
 public:
     ScriptVariable *constArrayValue;
@@ -258,7 +260,7 @@ public:
     unsigned int    size;
 
 public:
-    void        Archive(Archiver       &arc);
+    void        Archive(Archiver& arc);
     static void Archive(Archiver& arc, ScriptConstArrayHolder *& constArrayValue);
 
     ScriptConstArrayHolder(ScriptVariable *pVar, unsigned int size);
@@ -267,13 +269,13 @@ public:
     ~ScriptConstArrayHolder();
 };
 
-class ScriptPointer
+class ScriptPointer : public LightClass
 {
 public:
     Container<ScriptVariable *> list;
 
 public:
-    void        Archive(Archiver       &arc);
+    void        Archive(Archiver& arc);
     static void Archive(Archiver& arc, ScriptPointer *& pointerValue);
 
     void Clear();
@@ -285,6 +287,31 @@ public:
 
 #ifdef WITH_SCRIPT_ENGINE
 
+template<>
+class con_set_Entry<short3, ScriptVariable>
+{
+    friend con_set<short3, ScriptVariable>;
+    friend con_set_enum<short3, ScriptVariable>;
+
+private:
+    con_set_Entry *next;
+
+public:
+    ScriptVariable value;
+
+public:
+    void *operator new(size_t size) { return con_set<short3, ScriptVariable>::NewEntry(size); }
+
+    void operator delete(void *ptr) { con_set<short3, ScriptVariable>::DeleteEntry(ptr); }
+
+#    ifdef ARCHIVE_SUPPORTED
+    void Archive(Archiver& arc) { value.Archive(arc); }
+#    endif
+    short3& GetKey() { return value.GetKey(); }
+
+    void SetKey(const short3& newKey) { value.SetKey(newKey); }
+};
+
 class ScriptVariableList : public Class
 {
 private:
@@ -295,8 +322,6 @@ public:
 
     ScriptVariableList();
 
-    void Archive(Archiver& arc) override;
-
     void ClearList(void);
 
     ScriptVariable *GetOrCreateVariable(str name);
@@ -304,7 +329,7 @@ public:
 
     ScriptVariable *GetVariable(str name) const;
     ScriptVariable *GetVariable(unsigned int name) const;
-    bool VariableExists(str name) const;
+    bool            VariableExists(str name) const;
 
     ScriptVariable *SetVariable(const char *name, int value);
     ScriptVariable *SetVariable(const char *name, float value);
@@ -315,8 +340,9 @@ public:
     ScriptVariable *SetVariable(const char *name, ScriptVariable& value);
     ScriptVariable *SetVariable(unsigned int name, ScriptVariable& value);
     ScriptVariable *SetVariable(unsigned int name, ScriptVariable&& value);
+
+    void Archive(Archiver& arc) override;
+    void MakePrimitive();
 };
 
 #endif
-
-#endif /* __SCRIPTVARIABLE_H__ */
diff --git a/code/script/scriptvm.cpp b/code/script/scriptvm.cpp
index 96d49276..4d923640 100644
--- a/code/script/scriptvm.cpp
+++ b/code/script/scriptvm.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../fgame/game.h"
 #include "../fgame/level.h"
 #include "../fgame/parm.h"
-#include "../fgame/world.h"
+#include "../fgame/worldspawn.h"
 
 #include <utility>
 
@@ -53,11 +53,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #endif
 
+static const ScriptVM *currentScriptFile;
+static unsigned int    currentScriptLine;
+
 class ScriptCommandEvent : public Event
 {
 public:
     ScriptCommandEvent(unsigned int eventNum);
-    ScriptCommandEvent(unsigned int eventNum, size_t numArgs);
+    ScriptCommandEvent(unsigned int eventNum, int numArgs);
 };
 
 ScriptCommandEvent::ScriptCommandEvent(unsigned int eventNum)
@@ -66,31 +69,23 @@ ScriptCommandEvent::ScriptCommandEvent(unsigned int eventNum)
     fromScript = true;
 }
 
-ScriptCommandEvent::ScriptCommandEvent(unsigned int eventNum, size_t numArgs)
-	: Event(eventNum)
+ScriptCommandEvent::ScriptCommandEvent(unsigned int eventNum, int numArgs)
+    : Event(eventNum, numArgs)
 {
-	fromScript = true;
+    fromScript = true;
 }
 
 ScriptVMStack::ScriptVMStack()
     : localStack(nullptr)
     , stackBottom(nullptr)
     , pTop(nullptr)
+    , m_bMarkStack(false)
 {}
 
 ScriptVMStack::ScriptVMStack(size_t stackSize)
+    : ScriptVMStack()
 {
-    if (!stackSize) {
-        stackSize = 1;
-    }
-
-    // allocate at once
-    uint8_t *data = (uint8_t *)gi.Malloc((sizeof(ScriptVariable) + sizeof(ScriptVariable *)) * stackSize);
-    localStack    = new (data) ScriptVariable[stackSize];
-    data += sizeof(ScriptVariable) * stackSize;
-
-    pTop        = localStack;
-    stackBottom = localStack + stackSize;
+    Allocate(stackSize);
 }
 
 ScriptVMStack::ScriptVMStack(ScriptVMStack&& other)
@@ -114,6 +109,31 @@ ScriptVMStack& ScriptVMStack::operator=(ScriptVMStack&& other)
 }
 
 ScriptVMStack::~ScriptVMStack()
+{
+    Free();
+}
+
+void ScriptVMStack::Allocate(size_t stackSize)
+{
+    if (localStack) {
+        // free the current local stack
+        Free();
+    }
+
+    if (!stackSize) {
+        stackSize = 1;
+    }
+
+    // allocate at once
+    uint8_t *data = (uint8_t *)gi.Malloc((sizeof(ScriptVariable) + sizeof(ScriptVariable *)) * stackSize);
+    localStack    = new (data) ScriptVariable[stackSize];
+    data += sizeof(ScriptVariable) * stackSize;
+
+    pTop        = localStack;
+    stackBottom = localStack + stackSize;
+}
+
+void ScriptVMStack::Free()
 {
     const size_t localStackSize = GetStackSize();
     for (uintptr_t i = 0; i < localStackSize; ++i) {
@@ -138,11 +158,13 @@ ScriptVariable& ScriptVMStack::SetTop(ScriptVariable& newTop)
 
 ScriptVariable& ScriptVMStack::GetTop() const
 {
+    assert(m_bMarkStack || pTop < stackBottom);
     return *pTop;
 }
 
 ScriptVariable& ScriptVMStack::GetTop(size_t offset) const
 {
+    assert(m_bMarkStack || (pTop + offset) < stackBottom);
     return *(pTop + offset);
 }
 
@@ -191,27 +213,61 @@ ScriptVariable& ScriptVMStack::PopAndGet(size_t offset)
 
 ScriptVariable& ScriptVMStack::Push()
 {
+    assert(!m_bMarkStack && (pTop + 1) < stackBottom);
     return *(pTop++);
 }
 
 ScriptVariable& ScriptVMStack::Push(size_t offset)
 {
     ScriptVariable& old = *pTop;
+    assert(!m_bMarkStack && (pTop + offset) < stackBottom);
     pTop += offset;
     return old;
 }
 
 ScriptVariable& ScriptVMStack::PushAndGet()
 {
+    assert(!m_bMarkStack && (pTop + 1) < stackBottom);
     return *++pTop;
 }
 
 ScriptVariable& ScriptVMStack::PushAndGet(size_t offset)
 {
+    assert(!m_bMarkStack && (pTop + offset) < stackBottom);
     pTop += offset;
     return *pTop;
 }
 
+void ScriptVMStack::Archive(Archiver& arc)
+{
+    unsigned int size;
+    unsigned int offset;
+    unsigned int numVars;
+    unsigned int i;
+
+    if (arc.Saving()) {
+        size   = stackBottom - localStack;
+        offset = pTop - localStack;
+        numVars = offset + 1;
+
+        arc.ArchiveUnsigned(&size);
+        arc.ArchiveUnsigned(&offset);
+    } else {
+        arc.ArchiveUnsigned(&size);
+        arc.ArchiveUnsigned(&offset);
+        numVars = offset + 1;
+
+        Allocate(size);
+        pTop = localStack + offset;
+    }
+
+    if (localStack) {
+        for (i = 0; i < numVars; i++) {
+            localStack[i].ArchiveInternal(arc);
+        }
+    }
+}
+
 void ScriptVMStack::MoveTop(ScriptVariable&& other)
 {
     *pTop = std::move(other);
@@ -243,6 +299,22 @@ void ScriptVM::operator delete(void *ptr)
     ScriptVM_allocator.Free(ptr);
 }
 
+/*
+====================
+ScriptVM
+====================
+*/
+ScriptVM::ScriptVM()
+{
+    m_Stack = NULL;
+
+    m_PrevCodePos = NULL;
+    m_pOldData    = NULL;
+    m_OldDataSize = 0;
+
+    m_StackPos   = NULL;
+}
+
 /*
 ====================
 ScriptVM
@@ -261,16 +333,19 @@ ScriptVM::ScriptVM(ScriptClass *scriptClass, unsigned char *pCodePos, ScriptThre
     m_PrevCodePos = NULL;
     m_CodePos     = pCodePos;
 
-    state         = STATE_RUNNING;
+    state         = STATE_EXECUTION;
     m_ThreadState = THREAD_RUNNING;
 
     m_pOldData    = NULL;
     m_OldDataSize = 0;
 
-    m_bMarkStack = false;
     m_StackPos   = NULL;
 
     m_ScriptClass->AddThread(this);
+
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2("+++THREAD: %p %p\n", this, m_ScriptClass);
+    }
 }
 
 /*
@@ -311,6 +386,8 @@ void ScriptVM::Archive(Archiver& arc)
             m_Stack          = new ScriptStack;
             m_Stack->m_Array = new ScriptVariable[stack];
             m_Stack->m_Count = stack;
+        } else {
+            m_Stack = NULL;
         }
     }
 
@@ -323,6 +400,8 @@ void ScriptVM::Archive(Archiver& arc)
     m_ScriptClass->ArchiveCodePos(arc, &m_CodePos);
     arc.ArchiveByte(&state);
     arc.ArchiveByte(&m_ThreadState);
+
+    m_VMStack.Archive(arc);
 }
 
 /*
@@ -338,55 +417,51 @@ void ScriptVM::error(const char *format, ...)
     va_list va;
 
     va_start(va, format);
-    vsprintf(buffer, format, va);
+    Q_vsnprintf(buffer, sizeof(buffer), format, va);
     va_end(va);
 
-    glbs.Printf("----------------------------------------------------------\n%s\n", buffer);
+    gi.Printf("----------------------------------------------------------\n%s\n", buffer);
     m_ReturnValue.setStringValue("$.INTERRUPTED");
 }
 
 void ScriptVM::jump(unsigned int offset)
 {
-	m_CodePos += offset;
+    m_CodePos += offset;
 }
 
 void ScriptVM::jumpBack(unsigned int offset)
 {
-	m_CodePos -= offset;
+    m_CodePos -= offset;
 }
 
 void ScriptVM::jumpBool(unsigned int offset, bool booleanValue)
 {
-	if (booleanValue)
-	{
-		jump(offset);
-	}
+    if (booleanValue) {
+        jump(offset);
+    }
 }
 
 bool ScriptVM::jumpVar(unsigned int offset, bool booleanValue)
 {
-	if (booleanValue)
-	{
-		jump(offset);
-		return true;
-	}
-	else
-	{
+    if (booleanValue) {
+        jump(offset);
+        return true;
+    } else {
         m_VMStack.Pop();
-		return false;
-	}
+        return false;
+    }
 }
 
 void ScriptVM::doJumpIf(bool booleanValue)
 {
-	const unsigned int offset = fetchOpcodeValue<unsigned int>();
-	jumpBool(offset, booleanValue);
+    const unsigned int offset = fetchOpcodeValue<unsigned int>();
+    jumpBool(offset, booleanValue);
 }
 
 bool ScriptVM::doJumpVarIf(bool booleanValue)
 {
-	const unsigned int offset = fetchOpcodeValue<unsigned int>();
-	return jumpVar(offset, booleanValue);
+    const unsigned int offset = fetchOpcodeValue<unsigned int>();
+    return jumpVar(offset, booleanValue);
 }
 
 void ScriptVM::loadTopInternal(Listener *listener)
@@ -395,7 +470,7 @@ void ScriptVM::loadTopInternal(Listener *listener)
 
     if (!executeSetter(listener, variable)) {
         // just set the variable
-        ScriptVariable& pTop     = m_VMStack.GetTop();
+        ScriptVariable& pTop = m_VMStack.GetTop();
         listener->Vars()->SetVariable(variable, std::move(pTop));
     }
 }
@@ -406,8 +481,8 @@ ScriptVariable *ScriptVM::storeTopInternal(Listener *listener)
     ScriptVariable *listenerVar;
 
     if (!executeGetter(listener, variable)) {
-        ScriptVariable& pTop     = m_VMStack.GetTop();
-        listenerVar              = listener->Vars()->GetOrCreateVariable(variable);
+        ScriptVariable& pTop = m_VMStack.GetTop();
+        listenerVar          = listener->Vars()->GetOrCreateVariable(variable);
 
         pTop = *listenerVar;
     } else {
@@ -417,7 +492,7 @@ ScriptVariable *ScriptVM::storeTopInternal(Listener *listener)
     return listenerVar;
 }
 
-void ScriptVM::loadStoreTop(Listener* listener)
+void ScriptVM::loadStoreTop(Listener *listener)
 {
     const const_str variable = fetchOpcodeValue<op_name_t>();
 
@@ -466,6 +541,8 @@ void ScriptVM::executeCommandInternal<false>(
 )
 {
     transferVarsToEvent(ev, fromVar, iParamCount);
+
+    checkValidEvent(ev, listener);
     listener->ProcessScriptEvent(ev);
 }
 
@@ -477,6 +554,7 @@ void ScriptVM::executeCommandInternal<true>(
     transferVarsToEvent(ev, fromVar, iParamCount);
 
     try {
+        checkValidEvent(ev, listener);
         listener->ProcessScriptEvent(ev);
     } catch (...) {
         m_VMStack.GetTop().Clear();
@@ -484,11 +562,7 @@ void ScriptVM::executeCommandInternal<true>(
     }
 
     ScriptVariable& pTop = m_VMStack.GetTop();
-    if (ev.NumArgs() > iParamCount) {
-        pTop = std::move(ev.GetLastValue());
-    } else {
-        pTop.Clear();
-    }
+    pTop                 = std::move(ev.GetValue());
 }
 
 template<>
@@ -508,23 +582,33 @@ void ScriptVM::executeCommand<true, false>(Listener *listener, op_parmNum_t iPar
 template<>
 void ScriptVM::executeCommand<false, true>(Listener *listener, op_parmNum_t iParamCount, op_evName_t eventnum)
 {
-    ScriptCommandEvent ev =
-        iParamCount ? ScriptCommandEvent(eventnum, iParamCount + 1) : ScriptCommandEvent(eventnum, 1);
+    ScriptCommandEvent ev = iParamCount ? ScriptCommandEvent(eventnum, iParamCount) : ScriptCommandEvent(eventnum);
     return executeCommandInternal<true>(ev, listener, m_VMStack.GetTopArray(), iParamCount);
 }
 
 template<>
 void ScriptVM::executeCommand<true, true>(Listener *listener, op_parmNum_t iParamCount, op_evName_t eventnum)
 {
-    ScriptCommandEvent ev =
-        iParamCount ? ScriptCommandEvent(eventnum, iParamCount + 1) : ScriptCommandEvent(eventnum, 1);
+    ScriptCommandEvent ev = iParamCount ? ScriptCommandEvent(eventnum, iParamCount) : ScriptCommandEvent(eventnum);
     return executeCommandInternal<true>(ev, listener, m_VMStack.GetTopArray(), iParamCount);
 }
 
 void ScriptVM::transferVarsToEvent(Event& ev, ScriptVariable *fromVar, op_parmNum_t count)
 {
-    for (uint16_t i = 0; i < count; i++) {
-        ev.AddValue(fromVar[i]);
+    ev.CopyValues(fromVar, count);
+}
+
+void ScriptVM::checkValidEvent(Event& ev, Listener* listener) {
+    ClassDef *c = listener->classinfo();
+
+    if (!c->GetDef(&ev)) {
+        if (listener == m_Thread) {
+            ScriptError("Failed execution of command '%s'", ev.getName());
+        } else if (listener->isSubclassOf(SimpleEntity)) {
+            ScriptError("Failed execution of command '%s' for class '%s' Targetname '%s'", ev.getName(), c->classname, static_cast<SimpleEntity*>(listener)->targetname.c_str());
+        } else {
+            ScriptError("Failed execution of command '%s' for class '%s'", ev.getName(), c->classname);
+        }
     }
 }
 
@@ -538,11 +622,7 @@ bool ScriptVM::executeGetter(Listener *listener, op_evName_t eventName)
         listener->ProcessScriptEvent(ev);
 
         ScriptVariable& pTop = m_VMStack.GetTop();
-        if (ev.NumArgs() > 0) {
-            pTop = std::move(ev.GetLastValue());
-        } else {
-            pTop.Clear();
-        }
+        pTop                 = std::move(ev.GetValue());
 
         return true;
     } else {
@@ -564,7 +644,7 @@ bool ScriptVM::executeSetter(Listener *listener, op_evName_t eventName)
         ScriptCommandEvent ev(eventNum, 1);
 
         ScriptVariable& pTop = m_VMStack.GetTop();
-        ev.AddValue(pTop);
+        ev.CopyValues(&pTop, 1);
 
         listener->ProcessScriptEvent(ev);
 
@@ -591,23 +671,23 @@ void ScriptVM::execCmdCommon(op_parmNum_t param)
 
 void ScriptVM::execCmdMethodCommon(op_parmNum_t param)
 {
-	const ScriptVariable& a = m_VMStack.Pop();
-	const op_ev_t         eventNum = fetchOpcodeValue<op_ev_t>();
+    const ScriptVariable& a        = m_VMStack.Pop();
+    const op_ev_t         eventNum = fetchOpcodeValue<op_ev_t>();
 
     m_VMStack.Pop(param);
 
     const size_t arraysize = a.arraysize();
     if (arraysize == (size_t)-1) {
-        throw ScriptException("command '%s' applied to NIL", Event::GetEventName(eventNum).c_str());
+        throw ScriptException("command '%s' applied to NIL", Event::GetEventName(eventNum));
     }
 
     if (arraysize > 1) {
-		if (a.IsConstArray()) {
+        if (a.IsConstArray()) {
             // copy the variable
             // because if it's a targetlist, the container object can be modified
             // while iterating
-			ScriptVariable array = a;
-			array.CastConstArrayValue();
+            ScriptVariable array = a;
+            array.CastConstArrayValue();
 
             for (uintptr_t i = arraysize; i > 0; i--) {
                 Listener *const listener = array.listenerAt(i);
@@ -624,7 +704,7 @@ void ScriptVM::execCmdMethodCommon(op_parmNum_t param)
             array.CastConstArrayValue();
 
             for (uintptr_t i = array.arraysize(); i > 0; i--) {
-                Listener *const listener = array[i]->listenerAt(i);
+                Listener *const listener = array.listenerAt(i);
                 if (listener) {
                     executeCommand<true>(listener, param, eventNum);
                 }
@@ -634,7 +714,7 @@ void ScriptVM::execCmdMethodCommon(op_parmNum_t param)
         // avoid useless allocations of const array
         Listener *const listener = a.listenerValue();
         if (!listener) {
-            throw ScriptException("command '%s' applied to NULL listener", Event::GetEventName(eventNum).c_str());
+            throw ScriptException("command '%s' applied to NULL listener", Event::GetEventName(eventNum));
         }
 
         executeCommand<true>(listener, param, eventNum);
@@ -652,7 +732,8 @@ void ScriptVM::execMethodCommon(op_parmNum_t param)
 
     Listener *const listener = a.listenerValue();
     if (!listener) {
-        throw ScriptException("command '%s' applied to NULL listener", Event::GetEventName(eventNum).c_str());
+        m_VMStack.GetTop().Clear();
+        throw ScriptException("command '%s' applied to NULL listener", Event::GetEventName(eventNum));
     }
 
     executeCommand<true, true>(listener, param, eventNum);
@@ -752,6 +833,67 @@ unsigned char *ScriptVM::ProgBuffer(void)
     return m_CodePos;
 }
 
+/*
+====================
+ScriptTrace1
+====================
+*/
+void ScriptVM::ScriptTrace1() const
+{
+    GameScript *scr;
+    str         sourceLine;
+    int         column;
+    int         line;
+
+    scr = GetScript();
+
+    if (!scr->GetSourceAt(m_CodePos, &sourceLine, column, line)) {
+        return;
+    }
+
+    if (currentScriptFile == this && line == currentScriptLine) {
+        return;
+    }
+
+    currentScriptFile = this;
+    currentScriptLine = line;
+
+    gi.DPrintf2("%s (%s, %d, %p, %d)\n", sourceLine.c_str(), Filename().c_str(), line, this, m_VMStack.GetIndex());
+}
+
+/*
+====================
+ScriptTrace2
+====================
+*/
+void ScriptVM::ScriptTrace2() const
+{
+    gi.DPrintf2("%s, %p, %d\n", OpcodeName(*m_CodePos), this, m_VMStack.GetIndex());
+    GetScript()->PrintSourcePos(m_CodePos, true);
+}
+
+/*
+====================
+GetSourcePos
+====================
+*/
+const char *ScriptVM::GetSourcePos() const
+{
+    static str debugLine;
+    str        sourceLine;
+    int        column;
+    int        line;
+
+    debugLine =
+        str(OpcodeName(*m_CodePos)) + " @" + str(m_CodePos - GetScript()->m_ProgBuffer) + " in " + Filename() + "\n";
+
+    if (GetScript()->GetSourceAt(m_CodePos, &sourceLine, column, line)) {
+        debugLine += str(" (") + str(line) + str(")\n");
+    }
+
+    return debugLine.c_str();
+}
+
 /*
 ====================
 EnterFunction
@@ -870,40 +1012,41 @@ Executes a program
 void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 {
     unsigned char *opcode;
-    bool           doneProcessing = false;
-    bool           deleteThread   = false;
-    bool           eventCalled    = false;
 
     ScriptVariable *a;
     ScriptVariable *b;
     ScriptVariable *c;
 
-    int index;
+    op_name_t fieldNameIndex;
 
     Listener *listener;
 
     Event           ev;
     ScriptVariable *var = NULL;
 
-    static str str_null = "";
-    str      & value    = str_null;
-
-    ConSimple *targetList;
-
-    if (label != "") {
-        // Throw if label is not found
-        if (!(m_CodePos = m_ScriptClass->FindLabel(label))) {
-            ScriptError("ScriptVM::Execute: label '%s' does not exist in '%s'.", label.c_str(), Filename().c_str());
-        }
-    }
+    TargetList *targetList;
 
     if (Director.stackCount >= MAX_STACK_DEPTH) {
         state = STATE_EXECUTION;
 
         ScriptException::next_abort = -1;
-        ScriptException exc("stack overflow");
+        throw ScriptException("stack overflow");
+    }
 
-        throw exc;
+    if (label.length()) {
+        // Throw if label is not found
+        m_CodePos = m_ScriptClass->FindLabel(label);
+        if (!m_CodePos) {
+            ScriptError("ScriptVM::Execute: label '%s' does not exist in '%s'.", label.c_str(), Filename().c_str());
+        }
+    }
+
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2(
+            "+++FRAME: %i (%p) +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n",
+            Director.stackCount,
+            this
+        );
     }
 
     Director.stackCount++;
@@ -914,38 +1057,24 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
     state = STATE_RUNNING;
 
-    Director.cmdTime  = glbs.Milliseconds();
-    Director.cmdCount = 0;
+    while (state == STATE_RUNNING) {
+        if (g_scripttrace->integer && CanScriptTracePrint()) {
+            switch (g_scripttrace->integer) {
+            case 1:
+            case 3:
+                ScriptTrace1();
+                break;
+            case 2:
+            case 4:
+                ScriptTrace2();
+                break;
+            }
+        }
 
-    while (!doneProcessing && state == STATE_RUNNING) {
         m_PrevCodePos = m_CodePos;
 
-        Director.cmdCount++;
-
         try {
-            if (Director.cmdCount > 9999 && glbs.Milliseconds() - Director.cmdTime > Director.maxTime) {
-                if (level.m_LoopProtection) {
-                    Director.cmdTime = glbs.Milliseconds();
-
-                    deleteThread = true;
-                    state        = STATE_EXECUTION;
-
-                    if (level.m_LoopDrop) {
-                        ScriptException::next_abort = -1;
-                    }
-
-                    ScriptError("Command overflow. Possible infinite loop in thread.\n");
-                }
-
-                VM_DPrintf("Update of script position - This is not an error.\n");
-                VM_DPrintf("=================================================\n");
-                m_ScriptClass->GetScript()->PrintSourcePos(opcode, true);
-                VM_DPrintf("=================================================\n");
-
-                Director.cmdCount = 0;
-            }
-
-            if (!m_bMarkStack) {
+            if (!m_VMStack.m_bMarkStack) {
                 /*
 				assert(pTop >= localStack && pTop < localStack + localStackSize);
 				if (pTop < localStack)
@@ -966,9 +1095,6 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 				}
 				*/
             }
-            
-            index       = 0;
-            eventCalled = false;
 
             opcode = m_CodePos++;
             switch (*opcode) {
@@ -1085,42 +1211,40 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 break;
 
             case OP_BOOL_JUMP_FALSE4:
-				doJumpIf(!m_VMStack.Pop().m_data.intValue);
-				break;
-
-			case OP_BOOL_JUMP_TRUE4:
-				doJumpIf(m_VMStack.Pop().m_data.intValue);
-				break;
-
-			case OP_VAR_JUMP_FALSE4:
-				doJumpIf(!m_VMStack.Pop().booleanValue());
+                doJumpIf(!m_VMStack.Pop().m_data.intValue);
                 break;
 
-			case OP_VAR_JUMP_TRUE4:
-				doJumpIf(m_VMStack.Pop().booleanValue());
+            case OP_BOOL_JUMP_TRUE4:
+                doJumpIf(m_VMStack.Pop().m_data.intValue);
+                break;
+
+            case OP_VAR_JUMP_FALSE4:
+                doJumpIf(!m_VMStack.Pop().booleanValue());
+                break;
+
+            case OP_VAR_JUMP_TRUE4:
+                doJumpIf(m_VMStack.Pop().booleanValue());
                 break;
 
             case OP_BOOL_LOGICAL_AND:
-				doJumpVarIf(!m_VMStack.GetTop().m_data.intValue);
-				break;
+                doJumpVarIf(!m_VMStack.GetTop().m_data.intValue);
+                break;
 
             case OP_BOOL_LOGICAL_OR:
-				doJumpVarIf(m_VMStack.GetTop().m_data.intValue);
-				break;
+                doJumpVarIf(m_VMStack.GetTop().m_data.intValue);
+                break;
 
             case OP_VAR_LOGICAL_AND:
-				if (!doJumpVarIf(m_VMStack.GetTop().booleanValue()))
-				{
+                if (!doJumpVarIf(m_VMStack.GetTop().booleanValue())) {
                     m_VMStack.GetTop().SetFalse();
-				}
-				break;
+                }
+                break;
 
             case OP_VAR_LOGICAL_OR:
-				if (!doJumpVarIf(!m_VMStack.GetTop().booleanValue()))
-				{
+                if (!doJumpVarIf(!m_VMStack.GetTop().booleanValue())) {
                     m_VMStack.GetTop().SetTrue();
-				}
-				break;
+                }
+                break;
 
             case OP_BOOL_STORE_FALSE:
                 m_VMStack.PushAndGet().SetFalse();
@@ -1277,12 +1401,12 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                     break;
                 }
 
-			case OP_JUMP4:
-				jump(fetchOpcodeValue<unsigned int>());
+            case OP_JUMP4:
+                jump(fetchOpcodeValue<unsigned int>());
                 break;
 
-			case OP_JUMP_BACK4:
-				jumpBack(fetchActualOpcodeValue<unsigned int>());
+            case OP_JUMP_BACK4:
+                jumpBack(fetchActualOpcodeValue<unsigned int>());
                 break;
 
             case OP_LOAD_ARRAY_VAR:
@@ -1297,23 +1421,24 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 a = &m_VMStack.Pop();
 
                 try {
-                    listener = a->listenerValue();
+                    try {
+                        listener = a->listenerValue();
 
-                    if (listener == NULL) {
-                        value = Director.GetString(*reinterpret_cast<int *>(m_CodePos));
-                        ScriptError("Field '%s' applied to NULL listener", value.c_str());
-                    } else {
-                        eventCalled = true;
-                        loadTop(listener);
+                        if (listener == NULL) {
+                            fieldNameIndex = fetchActualOpcodeValue<op_name_t>();
+                            ScriptError(
+                                "Field '%s' applied to NULL listener", Director.GetString(fieldNameIndex).c_str()
+                            );
+                        }
+                    } catch (...) {
+                        skipField();
+                        throw;
                     }
-                } catch (ScriptException& exc) {
+
+                    loadTop(listener);
+                } catch (...) {
                     m_VMStack.Pop();
-
-                    if (!eventCalled) {
-                        m_CodePos += sizeof(unsigned int);
-                    }
-
-                    throw exc;
+                    throw;
                 }
 
                 break;
@@ -1409,6 +1534,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_LOAD_STORE_SELF_VAR:
                 if (!m_ScriptClass->m_Self) {
+                    m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
 
@@ -1417,7 +1543,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_MARK_STACK_POS:
                 m_StackPos   = &m_VMStack.GetTop();
-                m_bMarkStack = true;
+                m_VMStack.m_bMarkStack = true;
                 break;
 
             case OP_STORE_PARAM:
@@ -1432,7 +1558,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_RESTORE_STACK_POS:
                 m_VMStack.SetTop(*m_StackPos);
-                m_bMarkStack = false;
+                m_VMStack.m_bMarkStack = false;
                 break;
 
             case OP_STORE_ARRAY:
@@ -1446,100 +1572,80 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 break;
 
             case OP_STORE_FIELD_REF:
-            {
-                try
-                {
-                    Listener* listener = m_VMStack.GetTop().listenerValue();
+                try {
+                    try {
+                        listener = m_VMStack.GetTop().listenerValue();
 
-                    if (listener == nullptr)
-                    {
-                        const op_name_t fieldName = fetchActualOpcodeValue<op_name_t>();
-						skipField();
-						ScriptError("Field '%s' applied to NULL listener", value.c_str());
-                    }
-                    else
-                    {
-                        ScriptVariable* const listenerVar = storeTop<true>(listener);
-
-                        if (listenerVar)
-                        {
-                            // having a listener variable means the variable was just created
-                            m_VMStack.GetTop().setRefValue(listenerVar);
+                        if (listener == nullptr) {
+                            fieldNameIndex = fetchActualOpcodeValue<op_name_t>();
+                            ScriptError(
+                                "Field '%s' applied to NULL listener", Director.GetString(fieldNameIndex).c_str()
+                            );
                         }
+                    } catch (...) {
+                        skipField();
+                        m_VMStack.GetTop().Clear();
+                        throw;
                     }
-                }
-                catch (...)
-                {
-                    ScriptVariable* const pTop = m_VMStack.GetTopPtr();
+
+                    ScriptVariable *const listenerVar = storeTop<true>(listener);
+
+                    if (listenerVar) {
+                        // having a listener variable means the variable was just created
+                        m_VMStack.GetTop().setRefValue(listenerVar);
+                    }
+                    break;
+                } catch (...) {
+                    ScriptVariable *const pTop = m_VMStack.GetTopPtr();
                     pTop->setRefValue(pTop);
                     throw;
                 }
-                break;
-            }
 
             case OP_STORE_FIELD:
-                try
-                {
-                    Listener* listener = m_VMStack.GetTop().listenerValue();
+                try {
+                    listener = m_VMStack.GetTop().listenerValue();
 
-                    if (listener == nullptr)
-					{
-						ScriptError("Field '%s' applied to NULL listener", value.c_str());
+                    if (listener == nullptr) {
+                        fieldNameIndex = fetchActualOpcodeValue<op_name_t>();
+                        ScriptError("Field '%s' applied to NULL listener", Director.GetString(fieldNameIndex).c_str());
                     }
-                    else
-                    {
-                        storeTop<true>(listener);
-                    }
-                    break;
-                }
-                catch (...)
-                {
+                } catch (...) {
                     skipField();
+                    m_VMStack.GetTop().Clear();
                     throw;
                 }
+
+                storeTop<true>(listener);
                 break;
 
             case OP_STORE_FLOAT:
                 m_VMStack.Push();
-                m_VMStack.GetTop().setFloatValue(*reinterpret_cast<float *>(m_CodePos));
-
-                m_CodePos += sizeof(float);
-
+                m_VMStack.GetTop().setFloatValue(fetchOpcodeValue<float>());
                 break;
 
             case OP_STORE_INT0:
                 m_VMStack.Push();
                 m_VMStack.GetTop().setIntValue(0);
-
                 break;
 
             case OP_STORE_INT1:
                 m_VMStack.Push();
-                m_VMStack.GetTop().setIntValue(*m_CodePos++);
-
+                m_VMStack.GetTop().setIntValue(fetchOpcodeValue<byte>());
                 break;
 
             case OP_STORE_INT2:
                 m_VMStack.Push();
-                m_VMStack.GetTop().setIntValue(*reinterpret_cast<short *>(m_CodePos));
-
-                m_CodePos += sizeof(short);
-
+                m_VMStack.GetTop().setIntValue(fetchOpcodeValue<short>());
                 break;
 
             case OP_STORE_INT3:
                 m_VMStack.Push();
-                m_VMStack.GetTop().setIntValue(*reinterpret_cast<short3 *>(m_CodePos));
-
-                m_CodePos += sizeof(short3);
+                m_VMStack.GetTop().setIntValue(fetchOpcodeValue<short3>());
                 break;
 
             case OP_STORE_INT4:
                 m_VMStack.Push();
-                m_VMStack.GetTop().setIntValue(*reinterpret_cast<int *>(m_CodePos));
-
-                m_CodePos += sizeof(int);
-
+                m_VMStack.GetTop().setIntValue(fetchOpcodeValue<int>());
                 break;
 
             case OP_STORE_GAME_VAR:
@@ -1560,13 +1666,13 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_STORE_OWNER_VAR:
                 if (!m_ScriptClass->m_Self) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
 
                 if (!m_ScriptClass->m_Self->GetScriptOwner()) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self.owner is NULL");
                 }
@@ -1580,7 +1686,7 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
             case OP_STORE_SELF_VAR:
                 if (!m_ScriptClass->m_Self) {
-                    m_VMStack.Push();
+                    m_VMStack.PushAndGet().Clear();
                     m_CodePos += sizeof(unsigned int);
                     ScriptError("self is NULL");
                 }
@@ -1609,10 +1715,10 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 break;
 
             case OP_STORE_OWNER:
-                m_VMStack.Push();
-
-                if (!m_ScriptClass->m_Self) {
+                if (m_ScriptClass->m_Self) {
                     m_VMStack.Push();
+                } else {
+                    m_VMStack.PushAndGet().Clear();
                     ScriptError("self is NULL");
                 }
 
@@ -1680,38 +1786,31 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
                 break;
 
             case OP_UN_TARGETNAME:
-                targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
-
-                if (!targetList) {
-                    value = m_VMStack.GetTop().stringValue();
-
-                    m_VMStack.GetTop().setListenerValue(NULL);
-
-                    if ((*m_CodePos >= OP_BIN_EQUALITY && *m_CodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
-                        || (*m_CodePos >= OP_BOOL_UN_NOT && *m_CodePos <= OP_UN_CAST_BOOLEAN)) {
-                        ScriptError("Targetname '%s' does not exist.", value.c_str());
-                    }
-
-                    break;
-                }
-
-                if (targetList->NumObjects() == 1) {
-                    m_VMStack.GetTop().setListenerValue(targetList->ObjectAt(1));
-                } else if (targetList->NumObjects() > 1) {
-                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)targetList);
+                // retrieve the target name
+                if (world) {
+                    targetList = world->GetExistingTargetList(m_VMStack.GetTop().stringValue());
                 } else {
-                    value = m_VMStack.GetTop().stringValue();
-
-                    m_VMStack.GetTop().setListenerValue(NULL);
-
-                    if ((*m_CodePos >= OP_BIN_EQUALITY && *m_CodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
-                        || (*m_CodePos >= OP_BOOL_UN_NOT && *m_CodePos <= OP_UN_CAST_BOOLEAN)) {
-                        ScriptError("Targetname '%s' does not exist.", value.c_str());
-                    }
-
-                    break;
+                    // Added in OPM
+                    //  don't use the target list if the world is NULL
+                    targetList = NULL;
                 }
 
+                if (!targetList || !targetList->list.NumObjects()) {
+                    str targetname = m_VMStack.GetTop().stringValue();
+                    // the target name was not found
+                    m_VMStack.GetTop().setListenerValue(NULL);
+
+                    if ((*m_PrevCodePos >= OP_BIN_EQUALITY && *m_PrevCodePos <= OP_BIN_GREATER_THAN_OR_EQUAL)
+                        || (*m_PrevCodePos >= OP_BOOL_UN_NOT && *m_PrevCodePos <= OP_UN_CAST_BOOLEAN)) {
+                        ScriptError("Targetname '%s' does not exist.", targetname.c_str());
+                    }
+                } else if (targetList->list.NumObjects() == 1) {
+                    // single listener
+                    m_VMStack.GetTop().setListenerValue(targetList->list.ObjectAt(1));
+                } else if (targetList->list.NumObjects() > 1) {
+                    // multiple listeners
+                    m_VMStack.GetTop().setContainerValue((Container<SafePtr<Listener>> *)&targetList->list);
+                }
                 break;
 
             case OP_VAR_UN_NOT:
@@ -1728,12 +1827,51 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
             default:
                 assert(!"Invalid opcode");
                 if (*opcode < OP_MAX) {
-                    glbs.DPrintf("unknown opcode %d ('%s')\n", *opcode, OpcodeName(*opcode));
+                    gi.DPrintf("unknown opcode %d ('%s')\n", *opcode, OpcodeName(*opcode));
                 } else {
-                    glbs.DPrintf("unknown opcode %d\n", *opcode);
+                    gi.DPrintf("unknown opcode %d\n", *opcode);
                 }
                 break;
             }
+
+            Director.cmdCount++;
+
+            if (Director.cmdCount >= 15000) {
+                if (!Director.cmdTime) {
+                    Director.cmdTime = gi.Milliseconds();
+                    Director.cmdCount = 0;
+                    continue;
+                }
+
+                if (gi.Milliseconds() - Director.cmdTime < Director.maxTime) {
+                    Director.cmdCount = 0;
+                    continue;
+                }
+
+                // The maximum execution time was reached
+                if (level.m_LoopProtection) {
+                    Director.cmdTime = gi.Milliseconds();
+
+                    GetScript()->PrintSourcePos(m_CodePos, true);
+                    gi.DPrintf2("\n");
+
+                    state = STATE_EXECUTION;
+
+                    if (level.m_LoopDrop) {
+                        ScriptException::next_abort = -1;
+                    }
+
+                    ScriptError("Command overflow. Possible infinite loop in thread.\n");
+                    break;
+                }
+
+                VM_DPrintf("Update of script position - This is not an error.\n");
+                VM_DPrintf("=================================================\n");
+                m_ScriptClass->GetScript()->PrintSourcePos(opcode, true);
+                VM_DPrintf("=================================================\n");
+
+                Director.cmdCount = 0;
+            }
         } catch (ScriptException& exc) {
             HandleScriptException(exc);
         }
@@ -1741,14 +1879,25 @@ void ScriptVM::Execute(ScriptVariable *data, int dataSize, str label)
 
     Director.stackCount--;
 
-    if (deleteThread || state == STATE_WAITING) {
-        delete m_Thread;
-    } else if (state == STATE_SUSPENDED) {
-        state = STATE_EXECUTION;
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2(
+            "---FRAME: %i (%p) -------------------------------------------------------------------\n",
+            Director.stackCount,
+            this
+        );
     }
 
-    if (state == STATE_DESTROYED) {
+    switch (state) {
+    case STATE_WAITING:
+        delete m_Thread;
         delete this;
+        break;
+    case STATE_SUSPENDED:
+        state = STATE_EXECUTION;
+        break;
+    case STATE_DESTROYED:
+        delete this;
+        break;
     }
 }
 
@@ -1762,7 +1911,7 @@ void ScriptVM::HandleScriptException(ScriptException& exc)
     if (m_ScriptClass) {
         m_ScriptClass->GetScript()->PrintSourcePos(m_PrevCodePos, true);
     } else {
-        glbs.DPrintf("unknown source pos");
+        gi.DPrintf("unknown source pos");
     }
 
     if (exc.bAbort) {
@@ -1830,11 +1979,11 @@ NotifyDelete
 */
 void ScriptVM::NotifyDelete(void)
 {
-    switch (state) {
-    case STATE_DESTROYED:
-        ScriptError("Attempting to delete a dead thread.");
-        break;
+    if (g_scripttrace->integer && CanScriptTracePrint()) {
+        gi.DPrintf2("---THREAD: %p\n", this);
+    }
 
+    switch (state) {
     case STATE_RUNNING:
     case STATE_SUSPENDED:
     case STATE_WAITING:
@@ -1856,6 +2005,16 @@ void ScriptVM::NotifyDelete(void)
         delete this;
 
         break;
+
+    case STATE_DESTROYED:
+        ScriptError("Attempting to delete a dead thread.");
+
+        state = STATE_DESTROYED;
+
+        if (m_ScriptClass) {
+            m_ScriptClass->RemoveThread(this);
+        }
+        break;
     }
 }
 
@@ -1880,7 +2039,7 @@ void ScriptVM::Suspend()
 {
     if (state == STATE_DESTROYED) {
         ScriptError("Cannot suspend a dead thread.");
-    } else if (!state) {
+    } else if (state == STATE_RUNNING) {
         state = STATE_SUSPENDED;
     }
 }
@@ -1918,7 +2077,7 @@ bool ScriptVM::Switch(StateScript *stateScript, ScriptVariable& var)
 Filename
 ====================
 */
-str ScriptVM::Filename(void)
+str ScriptVM::Filename(void) const
 {
     return m_ScriptClass->Filename();
 }
@@ -1928,7 +2087,7 @@ str ScriptVM::Filename(void)
 Label
 ====================
 */
-str ScriptVM::Label(void)
+str ScriptVM::Label(void) const
 {
     const_str label = m_ScriptClass->NearestLabel(m_CodePos);
 
@@ -1944,11 +2103,21 @@ str ScriptVM::Label(void)
 GetScriptClass
 ====================
 */
-ScriptClass *ScriptVM::GetScriptClass(void)
+ScriptClass *ScriptVM::GetScriptClass(void) const
 {
     return m_ScriptClass;
 }
 
+/*
+====================
+GetScript
+====================
+*/
+GameScript *ScriptVM::GetScript() const
+{
+    return m_ScriptClass->GetScript();
+}
+
 /*
 ====================
 IsSuspended
@@ -1956,7 +2125,7 @@ IsSuspended
 */
 bool ScriptVM::IsSuspended(void)
 {
-    return state == STATE_SUSPENDED;
+    return state == STATE_EXECUTION;
 }
 
 /*
@@ -1986,26 +2155,27 @@ EventGoto
 */
 void ScriptVM::EventGoto(Event *ev)
 {
-    unsigned char* codePos;
+    unsigned char        *codePos;
     const ScriptVariable& value = ev->GetValue(1);
-    if (value.type == VARIABLE_CONSTSTRING)
-    {
+    if (value.type == VARIABLE_CONSTSTRING) {
         const_str label = value.constStringValue();
-		codePos = m_ScriptClass->FindLabel(label);
+        codePos         = m_ScriptClass->FindLabel(label);
 
-		if (!codePos) {
-			ScriptError("ScriptVM::EventGoto: label '%s' does not exist in '%s'.", value.stringValue().c_str(), Filename().c_str());
-		}
+        if (!codePos) {
+            ScriptError(
+                "ScriptVM::EventGoto: label '%s' does not exist in '%s'.",
+                value.stringValue().c_str(),
+                Filename().c_str()
+            );
+        }
 
-    }
-    else
-    {
+    } else {
         str label = value.stringValue();
-		codePos = m_ScriptClass->FindLabel(label);
+        codePos   = m_ScriptClass->FindLabel(label);
 
-		if (!codePos) {
-			ScriptError("ScriptVM::EventGoto: label '%s' does not exist in '%s'.", label.c_str(), Filename().c_str());
-		}
+        if (!codePos) {
+            ScriptError("ScriptVM::EventGoto: label '%s' does not exist in '%s'.", label.c_str(), Filename().c_str());
+        }
     }
 
     SetFastData(ev->data + 1, ev->dataSize - 1);
diff --git a/code/script/scriptvm.h b/code/script/scriptvm.h
index 2950310b..ece0af2f 100644
--- a/code/script/scriptvm.h
+++ b/code/script/scriptvm.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // scriptvm.h: Script virtual machine interpreter.
 
-#ifndef __SCRIPTVM_H__
-#define __SCRIPTVM_H__
+#pragma once
 
 #include "listener.h"
 
@@ -35,17 +34,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define MAX_STACK_DEPTH 20 // 9 in mohaa
 //#define	LOCALSTACK_SIZE		255		// pre-allocated localstack size for each VM
-#define MAX_SCRIPTCYCLES      9999 // max cmds
+#define MAX_SCRIPTCYCLES 9999 // max cmds
 
-#define STATE_RUNNING         0 // Running
-#define STATE_SUSPENDED       1 // Suspended
-#define STATE_WAITING         2 // Waiting for something
-#define STATE_EXECUTION       3 // Resume to execution
-#define STATE_DESTROYED       4 // Pending deletion
+enum eVMState {
+    STATE_RUNNING,   // Running
+    STATE_SUSPENDED, // Suspended
+    STATE_WAITING,   // Waiting for something
+    STATE_EXECUTION, // Resume to execution
+    STATE_DESTROYED  // Pending deletion
+};
 
-#define THREAD_RUNNING        0 // Running
-#define THREAD_WAITING        1 // Waiting
-#define THREAD_SUSPENDED      2 // Suspended
+enum eThreadState {
+    THREAD_RUNNING,
+    THREAD_WAITING,
+    THREAD_SUSPENDED
+};
 
 class ScriptException;
 class ScriptThread;
@@ -95,7 +98,7 @@ public:
     ScriptVariable *GetTopPtr(size_t offset) const;
     ScriptVariable *GetTopArray(size_t offset = 0) const;
     uintptr_t       GetIndex() const;
-    void            MoveTop(ScriptVariable           &&other);
+    void            MoveTop(ScriptVariable&& other);
 
     /** Pop and return the previous value. */
     ScriptVariable& Pop();
@@ -108,13 +111,24 @@ public:
     ScriptVariable& PushAndGet();
     ScriptVariable& PushAndGet(size_t offset);
 
+    void Archive(Archiver& arc);
+
+private:
+    void Allocate(size_t stackSize);
+    void Free();
+
 private:
     /** The VM's local stack. */
     ScriptVariable *localStack;
     /** The local stack size. */
     ScriptVariable *stackBottom;
     /** Variable from the top stack of the local stack. */
-    ScriptVariable  *pTop;
+    ScriptVariable* pTop;
+
+public:
+    /** Whether or not the stack is marked. */
+    /** changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS */
+    bool m_bMarkStack;
 };
 
 class ScriptVM
@@ -150,7 +164,7 @@ public:
     // parameters variables
     ScriptVariable *m_pOldData; // old fastEvent data, to cleanup
     int             m_OldDataSize;
-    bool            m_bMarkStack; // changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS
+    //bool            m_bMarkStack; // changed by OP_MARK_STACK_POS and OP_RESTORE_STACK_POS
     Event           fastEvent;    // parameter list, set when the VM is executed
 
 private:
@@ -163,27 +177,29 @@ private:
     bool executeGetter(Listener *listener, op_evName_t eventName);
     bool executeSetter(Listener *listener, op_evName_t eventName);
     void transferVarsToEvent(Event& ev, ScriptVariable *fromVar, op_parmNum_t count);
+    void checkValidEvent(Event& ev, Listener *listener);
 
     void            loadTopInternal(Listener *listener);
     ScriptVariable *storeTopInternal(Listener *listener);
     template<bool noTop = false>
     void loadTop(Listener *listener);
     template<bool noTop = false>
-	ScriptVariable* storeTop(Listener* listener);
-	void loadStoreTop(Listener* listener);
-    void skipField();
+    ScriptVariable *storeTop(Listener *listener);
+    void            loadStoreTop(Listener *listener);
+    void            skipField();
 
     void SetFastData(ScriptVariable *data, int dataSize);
 
     bool Switch(StateScript *stateScript, ScriptVariable& var);
 
     unsigned char *ProgBuffer();
-    void           HandleScriptException(ScriptException          &exc);
+    void           HandleScriptException(ScriptException& exc);
 
 public:
     void *operator new(size_t size);
     void  operator delete(void *ptr);
 
+    ScriptVM();
     ScriptVM(ScriptClass *scriptClass, unsigned char *pCodePos, ScriptThread *thread);
     ~ScriptVM();
 
@@ -200,9 +216,10 @@ public:
     void Resume(qboolean bForce = false);
     void Suspend(void);
 
-    str          Filename(void);
-    str          Label(void);
-    ScriptClass *GetScriptClass(void);
+    str          Filename(void) const;
+    str          Label(void) const;
+    ScriptClass *GetScriptClass(void) const;
+    GameScript  *GetScript() const;
 
     bool IsSuspended(void);
     int  State(void);
@@ -211,49 +228,50 @@ public:
     void EventGoto(Event *ev);
     bool EventThrow(Event *ev);
 
-    bool CanScriptTracePrint(void);
+    bool        CanScriptTracePrint(void);
+    void        ScriptTrace1() const;
+    void        ScriptTrace2() const;
+    const char *GetSourcePos() const;
 
 private:
-	void jump(unsigned int offset);
-	void jumpBack(unsigned int offset);
-	void jumpBool(unsigned int offset, bool booleanValue);
-	bool jumpVar(unsigned int offset, bool booleanValue);
-	void doJumpIf(bool booleanValue);
-	bool doJumpVarIf(bool booleanValue);
+    void jump(unsigned int offset);
+    void jumpBack(unsigned int offset);
+    void jumpBool(unsigned int offset, bool booleanValue);
+    bool jumpVar(unsigned int offset, bool booleanValue);
+    void doJumpIf(bool booleanValue);
+    bool doJumpVarIf(bool booleanValue);
 
-	void fetchOpcodeValue(void* outValue, size_t size);
-	void fetchActualOpcodeValue(void* outValue, size_t size);
+    void fetchOpcodeValue(void *outValue, size_t size);
+    void fetchActualOpcodeValue(void *outValue, size_t size);
 
-	template<typename T>
-	T fetchOpcodeValue()
-	{
-		T value;
-		fetchOpcodeValue(&value, sizeof(T));
-		return value;
-	}
+    template<typename T>
+    T fetchOpcodeValue()
+    {
+        T value;
+        fetchOpcodeValue(&value, sizeof(T));
+        return value;
+    }
 
-	template<typename T>
-	T fetchOpcodeValue(size_t offset)
-	{
-		T value;
-		fetchOpcodeValue(&value, sizeof(T));
-		return value;
-	}
+    template<typename T>
+    T fetchOpcodeValue(size_t offset)
+    {
+        T value;
+        fetchOpcodeValue(&value, sizeof(T));
+        return value;
+    }
 
-	template<typename T>
-	T fetchActualOpcodeValue()
-	{
-		T value;
-		fetchActualOpcodeValue(&value, sizeof(T));
-		return value;
-	}
+    template<typename T>
+    T fetchActualOpcodeValue()
+    {
+        T value;
+        fetchActualOpcodeValue(&value, sizeof(T));
+        return value;
+    }
 
-	void execCmdCommon(op_parmNum_t param);
-	void execCmdMethodCommon(op_parmNum_t param);
-	void execMethodCommon(op_parmNum_t param);
-	void execFunction(ScriptMaster& Director);
+    void execCmdCommon(op_parmNum_t param);
+    void execCmdMethodCommon(op_parmNum_t param);
+    void execMethodCommon(op_parmNum_t param);
+    void execFunction(ScriptMaster& Director);
 };
 
 extern MEM_BlockAlloc<ScriptClass> ScriptClass_allocator;
-
-#endif
diff --git a/code/sdl/CMakeLists.txt b/code/sdl/CMakeLists.txt
index 27c9e804..25f29f73 100644
--- a/code/sdl/CMakeLists.txt
+++ b/code/sdl/CMakeLists.txt
@@ -1,28 +1,48 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohsdl)
 
-file(GLOB_RECURSE SOURCES_SDL "./*.c")
+set(SOURCES_SDL_CLIENT
+"./sdl_input.c"
+)
 
-add_library(omohsdl STATIC ${SOURCES_SDL})
-target_compile_features(omohsdl PUBLIC c_variadic_macros)
-target_link_libraries(omohsdl PRIVATE qcommon qcommon_standalone)
+set(SOURCES_SDL_GL
+"./sdl_gamma.c"
+"./sdl_glimp.c"
+)
 
+if (NO_MODERN_DMA)
+	list(APPEND SOURCES_SDL "./sdl_snd.c")
+endif()
+
+add_library(omohsdl_client STATIC ${SOURCES_SDL_CLIENT})
+target_compile_features(omohsdl_client PUBLIC c_variadic_macros)
+target_link_libraries(omohsdl_client PRIVATE qcommon qcommon_standalone)
+
+if (NO_MODERN_DMA)
+	target_compile_definitions(omohsdl_client PRIVATE NO_MODERN_DMA=1)
+endif()
+
+add_library(omohsdl_gl STATIC ${SOURCES_SDL_GL})
+target_link_libraries(omohsdl_gl PRIVATE qcommon)
 
 if(${CMAKE_VERSION} VERSION_GREATER "3.11")
 	cmake_policy(SET CMP0074 NEW)
 endif()
 
+add_library(sdllib INTERFACE)
+
 if(WIN32)
 	find_package(SDL2)
 
 	if (SDL2_FOUND)
 		string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
-		target_include_directories(omohsdl PUBLIC ${SDL2_INCLUDE_DIRS})
-		target_link_libraries(omohsdl PRIVATE ${SDL2_LIBRARIES})
+		target_include_directories(sdllib INTERFACE ${SDL2_INCLUDE_DIRS})
+		target_link_libraries(sdllib INTERFACE ${SDL2_LIBRARIES})
 	else()
 		message(WARNING "SDL2 not found, falling back to using SDL2 from the source tree")
 
-		target_include_directories(omohsdl PUBLIC "../SDL2/include-2.0.22")
+		target_include_directories(sdllib INTERFACE "../SDL2/include-2.0.22")
 
 		if (MSVC)
 			if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -47,7 +67,7 @@ if(WIN32)
 				)
 			endif()
 
-			target_link_libraries(omohsdl PRIVATE sdl2 sdl2main)
+			target_link_libraries(sdllib INTERFACE sdl2 sdl2main)
 		endif()
 	endif()
 
@@ -56,7 +76,10 @@ elseif(UNIX)
 	
 	if (SDL2_FOUND)
 		string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
-		target_include_directories(omohsdl PUBLIC ${SDL2_INCLUDE_DIRS})
-		target_link_libraries(omohsdl PRIVATE ${SDL2_LIBRARIES})
+		target_include_directories(sdllib INTERFACE ${SDL2_INCLUDE_DIRS})
+		target_link_libraries(sdllib INTERFACE ${SDL2_LIBRARIES})
 	endif()
 endif()
+
+target_link_libraries(omohsdl_client PUBLIC sdllib)
+target_link_libraries(omohsdl_gl PUBLIC sdllib)
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
index 30986ab1..93e0f7cd 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -52,6 +52,7 @@ cvar_t *r_allowSoftwareGL; // Don't abort out if a hardware visual can't be obta
 cvar_t *r_allowResize; // make window resizable
 cvar_t *r_centerWindow;
 cvar_t *r_sdlDriver;
+cvar_t *r_preferOpenGLES;
 
 int qglMajorVersion, qglMinorVersion;
 int qglesMajorVersion, qglesMinorVersion;
@@ -230,6 +231,27 @@ static void GLimp_DetectAvailableModes(void)
 	SDL_free( modes );
 }
 
+/*
+===============
+OpenGL ES compatibility
+===============
+*/
+static void APIENTRY GLimp_GLES_ClearDepth( GLclampd depth ) {
+	qglClearDepthf( depth );
+}
+
+static void APIENTRY GLimp_GLES_DepthRange( GLclampd near_val, GLclampd far_val ) {
+	qglDepthRangef( near_val, far_val );
+}
+
+static void APIENTRY GLimp_GLES_DrawBuffer( GLenum mode ) {
+	// unsupported
+}
+
+static void APIENTRY GLimp_GLES_PolygonMode( GLenum face, GLenum mode ) {
+	// unsupported
+}
+
 /*
 ===============
 GLimp_GetProcAddresses
@@ -293,6 +315,11 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 1.1 is required", version );
 		}
+		// Added in OPM
+		//  Add compression-related GL functions for the renderer
+		if ( QGL_VERSION_ATLEAST( 1, 3 ) ) {
+			QGL_1_3_PROCS;
+		}
 	} else {
 		if ( QGL_VERSION_ATLEAST( 2, 0 ) ) {
 			QGL_1_1_PROCS;
@@ -306,8 +333,11 @@ static qboolean GLimp_GetProcAddresses( qboolean fixedFunction ) {
 			QGL_1_3_PROCS;
 			QGL_1_5_PROCS;
 			QGL_2_0_PROCS;
-			// error so this doesn't segfault due to NULL desktop GL functions being used
-			Com_Error( ERR_FATAL, "Unsupported OpenGL Version: %s", version );
+
+			qglClearDepth = GLimp_GLES_ClearDepth;
+			qglDepthRange = GLimp_GLES_DepthRange;
+			qglDrawBuffer = GLimp_GLES_DrawBuffer;
+			qglPolygonMode = GLimp_GLES_PolygonMode;
 		} else {
 			Com_Error( ERR_FATAL, "Unsupported OpenGL Version (%s), OpenGL 2.0 is required", version );
 		}
@@ -369,6 +399,12 @@ GLimp_SetMode
 */
 static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qboolean fixedFunction)
 {
+	struct GLimp_ContextType {
+		int profileMask;
+		int majorVersion;
+		int minorVersion;
+	} contexts[4];
+	int numContexts, type;
 	const char *glstring;
 	int perChannelColorBits;
 	int colorBits, depthBits, stencilBits;
@@ -407,10 +443,11 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 		if( display < 0 )
 		{
 			ri.Printf( PRINT_DEVELOPER, "SDL_GetWindowDisplayIndex() failed: %s\n", SDL_GetError() );
+			display = 0;
 		}
 	}
 
-	if( display >= 0 && SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
+	if( SDL_GetDesktopDisplayMode( display, &desktopMode ) == 0 )
 	{
 		displayAspect = (float)desktopMode.w / (float)desktopMode.h;
 
@@ -499,6 +536,63 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 	stencilBits = r_stencilbits->value;
 	samples = r_ext_multisample->value;
 
+	numContexts = 0;
+
+	if ( !fixedFunction ) {
+		int profileMask;
+		qboolean preferOpenGLES;
+
+		SDL_GL_ResetAttributes();
+		SDL_GL_GetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, &profileMask );
+
+		preferOpenGLES = ( r_preferOpenGLES->integer == 1 ||
+		                 ( r_preferOpenGLES->integer == -1 && profileMask == SDL_GL_CONTEXT_PROFILE_ES ) );
+
+		if ( preferOpenGLES ) {
+#ifdef __EMSCRIPTEN__
+			// WebGL 2.0 isn't fully backward compatible so you have to ask for it specifically
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 3;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+#endif
+
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 2;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+		}
+
+		contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_CORE;
+		contexts[numContexts].majorVersion = 3;
+		contexts[numContexts].minorVersion = 2;
+		numContexts++;
+
+		contexts[numContexts].profileMask = 0;
+		contexts[numContexts].majorVersion = 2;
+		contexts[numContexts].minorVersion = 0;
+		numContexts++;
+
+		if ( !preferOpenGLES ) {
+#ifdef __EMSCRIPTEN__
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 3;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+#endif
+
+			contexts[numContexts].profileMask = SDL_GL_CONTEXT_PROFILE_ES;
+			contexts[numContexts].majorVersion = 2;
+			contexts[numContexts].minorVersion = 0;
+			numContexts++;
+		}
+	} else {
+		contexts[numContexts].profileMask = 0;
+		contexts[numContexts].majorVersion = 1;
+		contexts[numContexts].minorVersion = 1;
+		numContexts++;
+	}
+
 	for (i = 0; i < 16; i++)
 	{
 		int testColorBits, testDepthBits, testStencilBits;
@@ -631,82 +725,68 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
 
 		SDL_SetWindowIcon( SDL_window, icon );
 
-		if (!fixedFunction)
-		{
-			int profileMask, majorVersion, minorVersion;
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, &profileMask);
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &majorVersion);
-			SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion);
+		for ( type = 0; type < numContexts; type++ ) {
+			char contextName[32];
 
-			ri.Printf(PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n");
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
-			SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
-			if ((SDL_glContext = SDL_GL_CreateContext(SDL_window)) == NULL)
-			{
-				ri.Printf(PRINT_ALL, "SDL_GL_CreateContext failed: %s\n", SDL_GetError());
-				ri.Printf(PRINT_ALL, "Reverting to default context\n");
-
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
-				SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
+			switch ( contexts[type].profileMask ) {
+				default:
+				case 0:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL %d.%d",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
+				case SDL_GL_CONTEXT_PROFILE_CORE:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL %d.%d Core",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
+				case SDL_GL_CONTEXT_PROFILE_ES:
+					Com_sprintf( contextName, sizeof( contextName ), "OpenGL ES %d.%d",
+					             contexts[type].majorVersion, contexts[type].minorVersion );
+					break;
 			}
-			else
+
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_PROFILE_MASK, contexts[type].profileMask );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MAJOR_VERSION, contexts[type].majorVersion );
+			SDL_GL_SetAttribute( SDL_GL_CONTEXT_MINOR_VERSION, contexts[type].minorVersion );
+
+			SDL_glContext = SDL_GL_CreateContext( SDL_window );
+			if ( !SDL_glContext )
 			{
-				const char *renderer;
-
-				ri.Printf(PRINT_ALL, "SDL_GL_CreateContext succeeded.\n");
-
-				if ( GLimp_GetProcAddresses( fixedFunction ) )
-				{
-					renderer = (const char *)qglGetString(GL_RENDERER);
-				}
-				else
-				{
-					ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed for OpenGL 3.2 core context\n" );
-					renderer = NULL;
-				}
-
-				if (!renderer || (strstr(renderer, "Software Renderer") || strstr(renderer, "Software Rasterizer")))
-				{
-					if ( renderer )
-						ri.Printf(PRINT_ALL, "GL_RENDERER is %s, rejecting context\n", renderer);
-
-					GLimp_ClearProcAddresses();
-					SDL_GL_DeleteContext(SDL_glContext);
-					SDL_glContext = NULL;
-
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, profileMask);
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion);
-					SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, minorVersion);
-				}
-			}
-		}
-		else
-		{
-			SDL_glContext = NULL;
-		}
-
-		if ( !SDL_glContext )
-		{
-			if( ( SDL_glContext = SDL_GL_CreateContext( SDL_window ) ) == NULL )
-			{
-				ri.Printf( PRINT_DEVELOPER, "SDL_GL_CreateContext failed: %s\n", SDL_GetError( ) );
-				SDL_DestroyWindow( SDL_window );
-				SDL_window = NULL;
+				ri.Printf( PRINT_ALL, "SDL_GL_CreateContext() for %s context failed: %s\n", contextName, SDL_GetError() );
 				continue;
 			}
 
 			if ( !GLimp_GetProcAddresses( fixedFunction ) )
 			{
-				ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() failed\n" );
+				ri.Printf( PRINT_ALL, "GLimp_GetProcAddresses() for %s context failed\n", contextName );
 				GLimp_ClearProcAddresses();
 				SDL_GL_DeleteContext( SDL_glContext );
 				SDL_glContext = NULL;
-				SDL_DestroyWindow( SDL_window );
-				SDL_window = NULL;
 				continue;
 			}
+
+			if ( contexts[type].profileMask == SDL_GL_CONTEXT_PROFILE_CORE ) {
+				const char *renderer;
+
+				renderer = (const char *)qglGetString( GL_RENDERER );
+
+				if ( !renderer || strstr( renderer, "Software Renderer" ) || strstr( renderer, "Software Rasterizer" ) )
+				{
+					ri.Printf( PRINT_ALL, "GL_RENDERER is %s, rejecting %s context\n", renderer, contextName );
+
+					GLimp_ClearProcAddresses();
+					SDL_GL_DeleteContext( SDL_glContext );
+					SDL_glContext = NULL;
+					continue;
+				}
+			}
+
+			break;
+		}
+
+		if ( !SDL_glContext ) {
+			SDL_DestroyWindow( SDL_window );
+			SDL_window = NULL;
+			continue;
 		}
 
 		qglClearColor( 0, 0, 0, 1 );
@@ -815,7 +895,7 @@ static void GLimp_InitExtensions( qboolean fixedFunction )
 	glConfig.textureCompression = TC_NONE;
 
 	// GL_EXT_texture_compression_s3tc
-	if ( SDL_GL_ExtensionSupported( "GL_ARB_texture_compression" ) &&
+	if ( ( QGLES_VERSION_ATLEAST( 2, 0 ) || SDL_GL_ExtensionSupported( "GL_ARB_texture_compression" ) ) &&
 	     SDL_GL_ExtensionSupported( "GL_EXT_texture_compression_s3tc" ) )
 	{
 		if ( r_ext_compressed_textures->value )
@@ -996,6 +1076,7 @@ void GLimp_Init( qboolean fixedFunction )
 	r_sdlDriver = ri.Cvar_Get( "r_sdlDriver", "", CVAR_ROM );
 	r_allowResize = ri.Cvar_Get( "r_allowResize", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_centerWindow = ri.Cvar_Get( "r_centerWindow", "0", CVAR_ARCHIVE | CVAR_LATCH );
+	r_preferOpenGLES = ri.Cvar_Get( "r_preferOpenGLES", "-1", CVAR_ARCHIVE | CVAR_LATCH );
 
 	if( ri.Cvar_VariableIntegerValue( "com_abnormalExit" ) )
 	{
diff --git a/code/sdl/sdl_input.c b/code/sdl/sdl_input.c
index 33979c2d..7059e6ce 100644
--- a/code/sdl/sdl_input.c
+++ b/code/sdl/sdl_input.c
@@ -215,6 +215,8 @@ static keyNum_t IN_TranslateSDLToQ3Key( SDL_Keysym *keysym, qboolean down )
 	}
 	else if (keysym->scancode == SDL_SCANCODE_GRAVE)
 	{
+		// Added in OPM
+		// so the console can be toggled properly
 		key = '`';
 	}
 	else
@@ -1018,6 +1020,8 @@ static void IN_ProcessEvents( void )
 
 				if( key == K_BACKSPACE )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL('h'), 0, 0, NULL );
+				else if (key == K_ENTER || key == K_TAB || key == K_ESCAPE) // Added in OPM: mostly used by UINotepad
+					Com_QueueEvent( in_eventTime, SE_CHAR, key, 0, 0, NULL);
 				else if( keys[K_CTRL].down && key >= 'a' && key <= 'z' )
 					Com_QueueEvent( in_eventTime, SE_CHAR, CTRL(key), 0, 0, NULL );
 
@@ -1212,7 +1216,7 @@ void IN_Frame( void )
 	IN_JoyMove( );
 
 	// If not DISCONNECTED (main menu) or ACTIVE (in game), we're loading
-	loading = (clc.state != CA_DISCONNECTED && clc.state != CA_ACTIVE && clc.state != CA_CONNECTING );
+	loading = (clc.state == CA_LOADING || clc.state == CA_PRIMED);
 
 	// update isFullscreen since it might of changed since the last vid_restart
 	cls.glconfig.isFullscreen = Cvar_VariableIntegerValue( "r_fullscreen" ) != 0;
diff --git a/code/server/CMakeLists.txt b/code/server/CMakeLists.txt
index 1e00e964..7c06edb1 100644
--- a/code/server/CMakeLists.txt
+++ b/code/server/CMakeLists.txt
@@ -1,10 +1,17 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohserver)
 
 add_subdirectory("../fgame" "./fgame")
 
 file(GLOB_RECURSE SOURCES_SERVER "./*.c*")
 
+set(SOURCES_SERVER ${SOURCES_SERVER}
+	# Gamespy
+	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gamespy.c"
+	"${CMAKE_SOURCE_DIR}/code/gamespy/sv_gqueryreporting.c"
+)
+
 add_library(omohserver INTERFACE)
 target_sources(omohserver INTERFACE ${SOURCES_SERVER})
 target_compile_features(omohserver INTERFACE cxx_nullptr)
diff --git a/code/server/server.h b/code/server/server.h
index fccef6f4..0dba4254 100644
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -21,8 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 // server.h
 
-#ifndef __SERVER_H__
-#define __SERVER_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -43,6 +42,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
+#ifdef USE_VOIP
+#define VOIP_QUEUE_LENGTH 64
+
+typedef struct voipServerPacket_s
+{
+	int generation;
+	int sequence;
+	int frames;
+	int len;
+	int sender;
+	int flags;
+	byte data[4000];
+} voipServerPacket_t;
+#endif
+
 typedef struct svEntity_s {
 	struct worldSector_s *worldSector;
 	struct svEntity_s *nextEntityInWorldSector;
@@ -93,6 +107,10 @@ typedef struct {
 	int				gameClientSize;		// will be > sizeof(playerState_t) due to game private data
 } server_t;
 
+
+
+
+
 typedef struct {
 	int				areabytes;
 	byte			areabits[MAX_MAP_AREA_BYTES];		// portalarea visibility bits
@@ -103,7 +121,7 @@ typedef struct {
 										// order, otherwise the delta compression will fail
 	int				messageSent;		// time the message was transmitted
 	int				messageAcked;		// time the message was acked
-	size_t			messageSize;		// used to rate drop packets
+	int				messageSize;		// used to rate drop packets
 } clientSnapshot_t;
 
 typedef enum {
@@ -129,13 +147,14 @@ typedef struct client_s {
 	char			userinfo[MAX_INFO_STRING];		// name, etc
 
 	char			reliableCommands[MAX_RELIABLE_COMMANDS][MAX_STRING_CHARS];
-	int				reliableSequence;		// last added reliable message, not necesarily sent or acknowledged yet
+	int				reliableSequence;		// last added reliable message, not necessarily sent or acknowledged yet
 	int				reliableAcknowledge;	// last acknowledged reliable message
-	int				reliableSent;			// last sent reliable message, not necesarily acknowledged yet
+	int				reliableSent;			// last sent reliable message, not necessarily acknowledged yet
 	int				messageAcknowledge;
 
 	int				gamestateMessageNum;	// netchan->outgoingSequence of gamestate
 	int				challenge;
+    int				serverIdAcknowledge;
 
 	usercmd_t		lastUsercmd;
 
@@ -150,22 +169,21 @@ typedef struct client_s {
 	// downloading
 	char			downloadName[MAX_QPATH]; // if not empty string, we are downloading
 	fileHandle_t	download;			// file being downloaded
-	size_t			downloadSize;		// total bytes (can't use EOF because of paks)
-	size_t			downloadCount;		// bytes sent
+ 	int				downloadSize;		// total bytes (can't use EOF because of paks)
+ 	int				downloadCount;		// bytes sent
 	int				downloadClientBlock;	// last block we sent to the client, awaiting ack
 	int				downloadCurrentBlock;	// current block number
 	int				downloadXmitBlock;	// last block we xmited
 	unsigned char	*downloadBlocks[MAX_DOWNLOAD_WINDOW];	// the buffers for the download blocks
-	size_t			downloadBlockSize[MAX_DOWNLOAD_WINDOW];
+	int				downloadBlockSize[MAX_DOWNLOAD_WINDOW];
 	qboolean		downloadEOF;		// We have sent the EOF block
 	int				downloadSendTime;	// time we last got an ack from the client
 
 	int				deltaMessage;		// frame last client usercmd message
 	int				nextReliableTime;	// svs.time when another reliable command will be allowed
 	int				lastPacketTime;		// svs.time when packet was last received
-    int				lastConnectTime;	// svs.time when connection started
-    int				lastSnapshotTime;	// svs.time of last sent snapshot
-	int				nextSnapshotTime;	// send another snapshot when svs.time >= nextSnapshotTime
+	int				lastConnectTime;	// svs.time when connection started
+	int				lastSnapshotTime;	// svs.time of last sent snapshot
 	qboolean		rateDelayed;		// true if nextSnapshotTime was set based on rate instead of snapshotMsec
 	int				timeoutCount;		// must timeout a few frames in a row so debugging doesn't break
 	clientSnapshot_t	frames[PACKET_BACKUP];	// updates can be delta'd from here
@@ -174,7 +192,9 @@ typedef struct client_s {
 	int				snapshotMsec;		// requests a snapshot every snapshotMsec unless rate choked
 	int				pureAuthentic;
 	qboolean  gotCP; // TTimo - additional flag to distinguish between a bad pure checksum, and no cp command at all
-	netchan_t		netchan;
+    netchan_t		netchan;
+	// Added in 2.0
+    netprofclient_t netprofile;
 	// TTimo
 	// queuing outgoing fragmented messages to send them properly, without udp packet bursts
 	// in case large fragmented messages are stacking up
@@ -182,20 +202,32 @@ typedef struct client_s {
 	netchan_buffer_t *netchan_start_queue;
 	netchan_buffer_t **netchan_end_queue;
 
+#ifdef USE_VOIP
+	qboolean hasVoip;
+	qboolean muteAllVoip;
+	qboolean ignoreVoipFromClient[MAX_CLIENTS];
+	voipServerPacket_t *voipPacket[VOIP_QUEUE_LENGTH];
+	int queuedVoipPackets;
+	int queuedVoipIndex;
+#endif
+
 	int				oldServerTime;
-	qboolean			csUpdated[MAX_CONFIGSTRINGS+1];	
+	qboolean		csUpdated[MAX_CONFIGSTRINGS];
 
 	server_sound_t server_sounds[ MAX_SERVER_SOUNDS ];
 	int number_of_server_sounds;
 	qboolean locprint;
 	int XOffset;
-	int YOffset;
+    int YOffset;
+    qboolean isPure;
+    int gamespyId;
     char stringToPrint[256];
 	int radarInfo;
-	int lastRadarTime[128];
+    int lastRadarTime[MAX_CLIENTS];
+    int lastVisCheckTime[MAX_CLIENTS];
 
 #ifdef LEGACY_PROTOCOL
-    qboolean		compat;
+	qboolean		compat;
 #endif
 } client_t;
 
@@ -205,10 +237,27 @@ typedef struct client_s {
 // MAX_CHALLENGES is made large to prevent a denial
 // of service attack that could cycle all of them
 // out before legitimate users connected
-#define	MAX_CHALLENGES	1024
+#define	MAX_CHALLENGES	2048
+// Allow a certain amount of challenges to have the same IP address
+// to make it a bit harder to DOS one single IP address from connecting
+// while not allowing a single ip to grab all challenge resources
+#define MAX_CHALLENGES_MULTI (MAX_CHALLENGES / 2)
 
 #define	AUTHORIZE_TIMEOUT	5000
 
+typedef enum {
+    CDKS_NONE,
+    CDKS_AUTHENTICATING,
+    CDKS_AUTHENTICATED,
+    CDKS_FAILED
+} cdKeyState_e;
+
+typedef enum {
+	NETO_NONE,
+	NETO_CULLED,
+	NETO_ALWAYS
+} netoptimize_e;
+
 typedef struct {
 	netadr_t	adr;
 	int			challenge;
@@ -218,97 +267,136 @@ typedef struct {
 	int			firstTime;			// time the adr was first used, for authorize timeout checks
 	qboolean	wasrefused;
 	qboolean	connected;
+
+    //
+    // gamespy stuff
+    //
+	unsigned int	gamespyId;
+	char			gsChallenge[12];
+	cdKeyState_e	cdkeyState;
 } challenge_t;
 
-
-#define	MAX_MASTERS	8				// max recipients for heartbeat packets
+// Added in OPM
+typedef struct {
+	qboolean inUse;
+	int deleteTime;
+} nonpvs_sound_cache_t;
 
 // this structure will be cleared only when the game dll changes
 typedef struct {
-	qboolean		initialized;				// sv_init has completed
+	qboolean	initialized;				// sv_init has completed
 
-	int				snapFlagServerBit;			// ^= SNAPFLAG_SERVERCOUNT every SV_SpawnServer()
+	int			time;						// will be strictly increasing across level changes
 
-	int				time;						// will be strictly increasing across level changes
-	int				startTime;
-	int				lastTime;
-	int				serverLagTime;
-	qboolean		autosave;
-	int				mapTime;
+	int			snapFlagServerBit;			// ^= SNAPFLAG_SERVERCOUNT every SV_SpawnServer()
 
-	client_t		*clients;					// [sv_maxclients->integer];
-	int				iNumClients;
-	int				numSnapshotEntities;		// sv_maxclients->integer*PACKET_BACKUP*MAX_PACKET_ENTITIES
-	int				nextSnapshotEntities;		// next snapshotEntities to use
+	int			startTime;
+	int			lastTime;
+	int			serverLagTime;
+	qboolean	autosave;
+	int			mapTime;
+
+	client_t	*clients;					// [sv_maxclients->integer];
+	int			iNumClients;
+	int			numSnapshotEntities;		// sv_maxclients->integer*PACKET_BACKUP*MAX_SNAPSHOT_ENTITIES
+	int			nextSnapshotEntities;		// next snapshotEntities to use
 	entityState_t	*snapshotEntities;		// [numSnapshotEntities]
-	int				nextHeartbeatTime;
-	challenge_t		challenges[MAX_CHALLENGES];	// to prevent invalid IPs from connecting
-	netadr_t		redirectAddress;			// for rcon return messages
-	netadr_t		authorizeAddress;			// for rcon return messages
+	int			nextHeartbeatTime;
+	challenge_t	challenges[MAX_CHALLENGES];	// to prevent invalid IPs from connecting
+	netadr_t	redirectAddress;			// for rcon return messages
+#ifndef STANDALONE
+	netadr_t	authorizeAddress;			// authorize server address
+#endif
 	char			gameName[ MAX_QPATH ];
 	char			mapName[ MAX_QPATH ];
 	char			rawServerName[ MAX_QPATH ];
 	int				areabits_warning_time;
+
 	qboolean		soundsNeedLoad;
 	char			tm_filename[ MAX_QPATH ];
 	int				tm_loopcount;
 	int				tm_offset;
 
+	nonpvs_sound_cache_t nonpvs_sound_cache[MAX_SOUNDS]; // Added in OPM
 #ifndef DEDICATED
 	soundsystemsavegame_t	soundSystem;
 #endif
+	// Added in 2.0
+	netprofclient_t netprofile;
 } serverStatic_t;
 
+#define SERVER_MAXBANS	1024
+#define MAX_REASON_LENGTH 128
+
+// Structure for managing bans
+typedef struct serverBan_s {
+	netadr_t ip;
+	// For a CIDR-Notation type suffix
+	int subnet;
+	qboolean isexception;
+	char reason[MAX_REASON_LENGTH];
+} serverBan_t;
+
 //=============================================================================
 
-extern cvar_t	*sv_mapname;
-extern serverStatic_t	svs;			// persistant server info across maps
-extern server_t		sv;					// cleared each map
-extern game_export_t	*ge;				// game exports
+extern	serverStatic_t	svs;				// persistant server info across maps
+extern	server_t		sv;					// cleared each map
+extern	game_export_t	*ge;				// game exports
 
-#define	MAX_MASTER_SERVERS	5
+extern	cvar_t	*sv_fps;
+extern	cvar_t	*sv_timeout;
+extern	cvar_t	*sv_zombietime;
+extern	cvar_t	*sv_rconPassword;
+extern	cvar_t	*sv_privatePassword;
+extern	cvar_t	*sv_allowDownload;
+extern	cvar_t	*sv_maxclients;
 
-extern cvar_t	*sv_fps;
-extern cvar_t	*sv_timeout;
-extern cvar_t	*sv_zombietime;
-extern cvar_t	*sv_rconPassword;
-extern cvar_t	*sv_privatePassword;
-extern cvar_t	*sv_allowDownload;
-extern cvar_t	*sv_maxclients;
+extern	cvar_t	*sv_privateClients;
+extern	cvar_t	*sv_hostname;
+extern	cvar_t	*sv_master[MAX_MASTER_SERVERS];
+extern	cvar_t	*sv_reconnectlimit;
+extern	cvar_t	*sv_showloss;
+extern	cvar_t	*sv_padPackets;
+extern	cvar_t	*sv_killserver;
+extern	cvar_t	*sv_mapname;
+extern	cvar_t	*sv_mapChecksum;
+extern	cvar_t	*sv_serverid;
+extern	cvar_t	*sv_minRate;
+extern	cvar_t	*sv_maxRate;
+extern	cvar_t	*sv_dlRate;
+extern	cvar_t	*sv_minPing;
+extern	cvar_t	*sv_maxPing;
+extern	cvar_t	*g_gametype;
+extern	cvar_t	*g_gametypestring;
+extern	cvar_t	*sv_pure;
+extern	cvar_t	*sv_floodProtect;
+extern	cvar_t	*sv_lanForceRate;
+extern	cvar_t	*sv_maplist;
+extern	cvar_t	*sv_drawentities;
+extern	cvar_t	*sv_deeptracedebug;
+extern	cvar_t	*sv_netprofile;
+extern	cvar_t	*sv_netprofileoverlay;
+extern	cvar_t	*sv_netoptimize;
+extern	cvar_t	*sv_netoptimize_vistime;
+extern	cvar_t	*g_netoptimize;
+extern	cvar_t	*sv_chatter;
+extern	cvar_t	*sv_gamename;
+extern	cvar_t	*sv_location;
+extern	cvar_t	*sv_debug_gamespy;
+extern	cvar_t	*sv_gamespy;
+#ifndef STANDALONE
+extern	cvar_t	*sv_strictAuth;
+#endif
+extern	cvar_t	*sv_banFile;
 
-extern cvar_t	*sv_privateClients;
-extern cvar_t	*sv_hostname;
-extern cvar_t	*sv_master[ MAX_MASTER_SERVERS ];
-extern cvar_t	*sv_reconnectlimit;
-extern cvar_t	*sv_showloss;
-extern cvar_t	*sv_padPackets;
-extern cvar_t	*sv_killserver;
-extern cvar_t	*sv_mapChecksum;
-extern cvar_t	*sv_serverid;
-extern cvar_t	*sv_minRate;
-extern cvar_t	*sv_maxRate;
-extern cvar_t	*sv_dlRate;
-extern cvar_t	*sv_minPing;
-extern cvar_t	*sv_maxPing;
-extern cvar_t	*sv_pure;
-extern cvar_t	*sv_floodProtect;
-extern cvar_t	*sv_maplist;
-extern cvar_t	*sv_drawentities;
-extern cvar_t	*sv_deeptracedebug;
-extern cvar_t	*g_gametype;
-extern cvar_t	*g_gametypestring;
-extern cvar_t	*sv_chatter;
-extern cvar_t	*sv_gamename;
-extern cvar_t	*sv_location;
-extern cvar_t	*sv_debug_gamespy;
-extern cvar_t	*sv_gamespy;
-extern cvar_t	*sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
-extern cvar_t	*sv_strictAuth;
+extern	serverBan_t serverBans[SERVER_MAXBANS];
+extern	int serverBansCount;
+
+#ifdef USE_VOIP
+extern	cvar_t	*sv_voip;
+extern	cvar_t	*sv_voipProtocol;
+#endif
 
-extern debugline_t *DebugLines;
-extern int numDebugLines;
-extern debugstring_t *DebugStrings;
-extern int numDebugStrings;
 
 //===========================================================
 
@@ -337,8 +425,8 @@ extern leakyBucket_t outboundLeakyBucket;
 qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period );
 qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period );
 
-void SV_FinalMessage( const char *message );
-void QDECL SV_SendServerCommand( client_t *cl, const char *fmt, ...);
+void SV_FinalMessage (const char *message);
+void QDECL SV_SendServerCommand( client_t *cl, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
 
 
 void SV_AddOperatorCommands (void);
@@ -350,7 +438,7 @@ void SV_MasterShutdown (void);
 int SV_RateMsec(client_t *client);
 
 void SV_ArchiveHudDrawElements( qboolean loading );
-void SV_HudDrawShader( int iInfo, char *name );
+void SV_HudDrawShader( int iInfo, const char *name );
 void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign );
 void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight );
 void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen );
@@ -398,12 +486,18 @@ int SV_NumClients(void);
 void SV_ChangeMaxClients( void );
 void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qboolean bTransition );
 
+// Added in OPM
+int SV_PVSSoundIndex(const char* name, qboolean streamed);
+void SV_HandleNonPVSSound();
+
+void SV_ApplyOriginalConfigTweaks();
 
 
 //
 // sv_client.c
 //
-void SV_GetChallenge( netadr_t from );
+challenge_t* FindChallenge(netadr_t from, qboolean connecting); 
+void SV_GetChallenge(netadr_t from);
 
 void SV_DirectConnect( netadr_t from );
 
@@ -413,15 +507,17 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg );
 void SV_UserinfoChanged( client_t *cl );
 
 void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd );
+void SV_FreeClient(client_t *client);
 void SV_DropClient( client_t *drop, const char *reason );
 
 void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK );
-void SV_ClientThink( client_t *cl, usercmd_t *cmd );
+void SV_ClientThink (client_t *cl, usercmd_t *cmd);
 
-int SV_WriteDownloadToClient( client_t *cl , msg_t *msg );
+int SV_WriteDownloadToClient(client_t *cl , msg_t *msg);
 int SV_SendDownloadMessages(void);
 int SV_SendQueuedMessages(void);
 
+
 //
 // sv_ccmds.c
 //
@@ -430,16 +526,23 @@ void SV_Heartbeat_f( void );
 //
 // sv_snapshot.c
 //
+void SV_InitRadar();
 void SV_AddServerCommand( client_t *client, const char *cmd );
 void SV_UpdateServerCommandsToClient( client_t *client, msg_t *msg );
 void SV_WriteFrameToClient (client_t *client, msg_t *msg);
 void SV_SendMessageToClient( msg_t *msg, client_t *client );
 void SV_SendClientMessages( void );
 void SV_SendClientSnapshot( client_t *client );
+qboolean SV_IsValidSnapshotClient(client_t* client);
 
 //
 // sv_game.c
 //
+extern debugline_t* DebugLines;
+extern int numDebugLines;
+extern debugstring_t* DebugStrings;
+extern int numDebugStrings;
+
 void SV_ClearModelUserCounts( void );
 int	SV_NumForGentity( gentity_t *ent );
 gentity_t *SV_GentityNum( int num );
@@ -456,6 +559,7 @@ void SV_InitAllCGMessages ();
 //
 // sv_snd.c
 //
+void SV_ClientSound(client_t* client, vec3_t* org, int entnum, int channel, int sound_index, float volume, float mindist, float pitch, float maxdist, qboolean streamed);
 void SV_Sound( vec3_t *org, int entnum, int channel, const char *sound_name, float volume, float mindist, float pitch, float maxdist, qboolean streamed );
 void SV_ClearSounds( client_t *client );
 void SV_StopSound( int entnum, int channel );
@@ -475,7 +579,7 @@ void SV_UnlinkEntity( gentity_t *ent );
 void SV_LinkEntity( gentity_t *ent );
 // Needs to be called any time an entity changes origin, mins, maxs,
 // or solid.  Automatically unlinks if needed.
-// sets ent->v.absmin and ent->v.absmax
+// sets ent->r.absmin and ent->r.absmax
 // sets ent->leafnums[] for pvs determination even if the entity
 // is not solid
 
@@ -524,16 +628,11 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg);
 int SV_Netchan_TransmitNextFragment( client_t *client );
 qboolean SV_Netchan_Process( client_t *client, msg_t *msg );
 void SV_Netchan_FreeQueue(client_t *client);
-
-//
-// sv_gamespy.c
-//
-void SV_GamespyHeartbeat();
-qboolean SV_InitGamespy();
-void SV_ShutdownGamespy();
+void SV_NET_OutOfBandPrint(netprofclient_t* netprof, netadr_t adr, const char* format, ...);
+void SV_NET_UpdateClientNetProfileInfo(netprofclient_t* netprofile, int rate);
+void SV_NET_UpdateAllNetProfileInfo();
+void SV_NET_CalcTotalNetProfile(netprofclient_t* netprofile, qboolean server);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __SERVER_H__
diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
index a42c0565..a5f978f2 100644
--- a/code/server/sv_ccmds.c
+++ b/code/server/sv_ccmds.c
@@ -20,10 +20,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "../client/client.h"
-#include "../client/snd_local.h"
 #include "server.h"
 
+#ifndef DEDICATED
+#    include "../client/client.h"
+#    include "../client/snd_local.h"
+#    include "../uilib/ui_public.h"
+#endif
+
+#include "../sys/win_localization.h"
+
 /*
 ===============================================================================
 
@@ -182,12 +188,17 @@ static void SV_Map_f( void ) {
 	}
 	else
 	{
-		strcpy( map, mapname );
+		Q_strncpyz( map, mapname, sizeof( map ) );
 	}
 
 	// make sure the level exists before trying to change, so that
 	// a typo at the server console won't end the game
-	Com_sprintf( expanded, sizeof( expanded ), "maps/%s.bsp", map );
+	// Added in 2.0
+	if ( CL_UseLargeLightmap( mapname ) ) {
+		Com_sprintf( expanded, sizeof( expanded ), "maps/%s.bsp", map );
+	} else {
+		Com_sprintf( expanded, sizeof( expanded ), "maps/%s_sml.bsp", map );
+	}
 	if( FS_ReadFile( expanded, NULL ) == -1 ) {
 		Com_Printf( "Can't find map %s\n", expanded );
 		return;
@@ -202,7 +213,10 @@ static void SV_Map_f( void ) {
 	}
 
 	Cvar_Get( "g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO );
-	Cvar_Get( "sv_maxclients", "1", CVAR_LATCH | CVAR_SERVERINFO );
+	// FIXME
+	// Commenting out this line below as this sets sv_maxclients
+	//  before actually allocating clients
+	//Cvar_Get( "sv_maxclients", "1", CVAR_LATCH | CVAR_SERVERINFO );
 
 	if( !Q_stricmpn( map, "dm/", 3 ) && g_gametype->integer == GT_OBJECTIVE )
 	{
@@ -228,10 +242,32 @@ static void SV_Map_f( void ) {
 
 	Cvar_SaveGameRestart_f();
 
+	//
+	// in 2.0 and above, ignore training / mohaa mission maps
+	//
+	// FIXME: is this really necessary?
+	/*
+	if (com_target_game->integer != TG_MOH && g_gametype->integer == GT_SINGLE_PLAYER) {
+		if (mapname[0] == 'm' && mapname[1] - '1' <= 5) {
+			return;
+		}
+
+		if (!Q_stricmp(mapname, "training")) {
+			return;
+		} else if (!Q_stricmp(mapname, "training.bsp")) {
+			return;
+		} else if (!Q_stricmp(mapname, "void")) {
+			return;
+		} else if (!Q_stricmp(mapname, "void.bsp")) {
+			return;
+		}
+	}
+	*/
+
 	// start up the map
 	SV_SpawnServer( mapname, qfalse, qfalse, qfalse );
 
-	if( !g_gametype->integer ) {
+	if( g_gametype->integer == GT_SINGLE_PLAYER ) {
 		svs.autosave = qtrue;
 	}
 }
@@ -255,7 +291,7 @@ static void SV_GameMap_f( void ) {
 	map = Cmd_Argv( 1 );
 	Com_DPrintf( "SV_GameMap(%s)\n", map );
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz( svs.gameName, "current", sizeof( svs.gameName ) );
 	Cvar_SaveGameRestart_f();
 
 	bTransition = sv.state == SS_GAME;
@@ -267,7 +303,7 @@ static void SV_GameMap_f( void ) {
 
 	SV_SpawnServer( map, qfalse, qfalse, bTransition );
 
-	if( !g_gametype->integer ) {
+	if( g_gametype->integer == GT_SINGLE_PLAYER ) {
 		svs.autosave = qtrue;
 	}
 }
@@ -306,6 +342,7 @@ Kick a user off of the server  FIXME: move to game
 static void SV_Kick_f( void ) {
 	client_t	*cl;
 	int			i;
+	char        *reason = NULL;
 
 	// make sure server is running
 	if ( !com_sv_running->integer ) {
@@ -313,11 +350,16 @@ static void SV_Kick_f( void ) {
 		return;
 	}
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("Usage: kick <player name>\nkick all = kick everyone\nkick allbots = kick all bots\n");
+	if ( Cmd_Argc() < 2 ) {
+		Com_Printf ("Usage: kick <player name> [reason]\nkick all = kick everyone\nkick allbots = kick all bots\n");
 		return;
 	}
 
+	// Check if there's a reason provided
+	if ( Cmd_Argc() >= 3 ) {
+		reason = Cmd_ArgsFrom(2);
+	}
+
 	cl = SV_GetPlayerByHandle();
 	if ( !cl ) {
 		if ( !Q_stricmp(Cmd_Argv(1), "all") ) {
@@ -351,9 +393,118 @@ static void SV_Kick_f( void ) {
 		return;
 	}
 
-	SV_DropClient( cl, "was kicked" );
+	// Check if there's a reason provided
+	if ( reason ) {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server for:\n%s", reason);
+		
+		// Print the kick to all clients
+		SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked for %s\n\"", cl->name, reason);
+		
+		SV_DropClient( cl, va("was kicked for %s", reason) );
+	} else {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server");
+		
+		// Print the kick to all clients
+		SV_SendServerCommand( NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked\n\"", cl->name );
+		
+		SV_DropClient( cl, "was kicked" );
+	}
+	
 	cl->lastPacketTime = svs.time;	// in case there is a funny zombie
 }
+/*
+==================
+SV_KickAll_f
+
+Kick all users off of the server
+==================
+*/
+static void SV_KickAll_f( void ) {
+	client_t *cl;
+	int i;
+
+	// make sure server is running
+	if( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+
+	for( i = 0, cl = svs.clients; i < sv_maxclients->integer; i++, cl++ ) {
+		if( !cl->state ) {
+			continue;
+		}
+
+		if( cl->netchan.remoteAddress.type == NA_LOOPBACK ) {
+			continue;
+		}
+
+		SV_DropClient( cl, "was kicked" );
+		cl->lastPacketTime = svs.time; // in case there is a funny zombie
+	}
+}
+
+/*
+==================
+SV_KickNum_f
+
+Kick a user off of the server, optionally with a reason
+==================
+*/
+static void SV_KickNum_f( void ) {
+	client_t	*cl;
+	char        *reason = NULL;
+
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+
+	if ( Cmd_Argc() < 2 ) {
+		Com_Printf ("Usage: %s <client number> [reason]\n", Cmd_Argv(0));
+		return;
+	}
+
+	cl = SV_GetPlayerByNum();
+	if ( !cl ) {
+		return;
+	}
+	if( cl->netchan.remoteAddress.type == NA_LOOPBACK ) {
+		Com_Printf("Cannot kick host player\n");
+		return;
+	}
+
+	// Check if there's a reason provided
+	if ( Cmd_Argc() >= 3 ) {
+		reason = Cmd_ArgsFrom(2);
+	}
+
+	// Check if there's a reason provided
+	if ( reason ) {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server for:\n%s", reason);
+		
+		// Print the kick to all clients
+		SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked for %s\n\"", cl->name, reason);
+		
+		SV_DropClient( cl, va("was kicked for %s", reason) );
+	} else {
+		// Send the kick message to the client
+		SV_NET_OutOfBandPrint(&svs.netprofile, cl->netchan.remoteAddress, "droperror\nKicked from server");
+		
+		// Print the kick to all clients
+		SV_SendServerCommand( NULL, "print \"" HUD_MESSAGE_WHITE "%s was kicked\n\"", cl->name );
+		
+		SV_DropClient( cl, "was kicked" );
+	}
+	
+	cl->lastPacketTime = svs.time;	// in case there is a funny zombie
+}
+
+#ifndef STANDALONE
+// these functions require the auth server which of course is not available anymore for stand-alone games.
 
 /*
 ==================
@@ -384,7 +535,7 @@ static void SV_Ban_f( void ) {
 	}
 
 	if( cl->netchan.remoteAddress.type == NA_LOOPBACK ) {
-		SV_SendServerCommand(NULL, "print \"%s\"", "Cannot kick host player\n");
+		Com_Printf("Cannot kick host player\n");
 		return;
 	}
 
@@ -404,7 +555,7 @@ static void SV_Ban_f( void ) {
 
 	// otherwise send their ip to the authorize server
 	if ( svs.authorizeAddress.type != NA_BAD ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.authorizeAddress,
+		SV_NET_OutOfBandPrint( &svs.netprofile, svs.authorizeAddress,
 			"banUser %i.%i.%i.%i", cl->netchan.remoteAddress.ip[0], cl->netchan.remoteAddress.ip[1], 
 								   cl->netchan.remoteAddress.ip[2], cl->netchan.remoteAddress.ip[3] );
 		Com_Printf("%s was banned from coming back\n", cl->name);
@@ -438,7 +589,7 @@ static void SV_BanNum_f( void ) {
 		return;
 	}
 	if( cl->netchan.remoteAddress.type == NA_LOOPBACK ) {
-		SV_SendServerCommand(NULL, "print \"%s\"", "Cannot kick host player\n");
+		Com_Printf("Cannot kick host player\n");
 		return;
 	}
 
@@ -458,45 +609,643 @@ static void SV_BanNum_f( void ) {
 
 	// otherwise send their ip to the authorize server
 	if ( svs.authorizeAddress.type != NA_BAD ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.authorizeAddress,
+		SV_NET_OutOfBandPrint( &svs.netprofile, svs.authorizeAddress,
 			"banUser %i.%i.%i.%i", cl->netchan.remoteAddress.ip[0], cl->netchan.remoteAddress.ip[1], 
 								   cl->netchan.remoteAddress.ip[2], cl->netchan.remoteAddress.ip[3] );
 		Com_Printf("%s was banned from coming back\n", cl->name);
 	}
 }
+#endif
 
 /*
 ==================
-SV_KickNum_f
+SV_RehashBans_f
 
-Kick a user off of the server  FIXME: move to game
+Load saved bans from file.
 ==================
 */
-static void SV_KickNum_f( void ) {
-	client_t	*cl;
+static void SV_RehashBans_f(void)
+{
+	int index, filelen;
+	fileHandle_t readfrom;
+	char *textbuf, *curpos, *maskpos, *newlinepos, *endpos, *reasonpos;
+	char filepath[MAX_QPATH];
+	
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		return;
+	}
+	
+	serverBansCount = 0;
+	
+	if(!sv_banFile->string || !*sv_banFile->string)
+		return;
 
+	Com_sprintf(filepath, sizeof(filepath), "%s/%s", FS_GetCurrentGameDir(), sv_banFile->string);
+
+	if((filelen = FS_SV_FOpenFileRead(filepath, &readfrom)) >= 0)
+	{
+		if(filelen < 2)
+		{
+			// Don't bother if file is too short.
+			FS_FCloseFile(readfrom);
+			return;
+		}
+
+		curpos = textbuf = Z_Malloc(filelen);
+		
+		filelen = FS_Read(textbuf, filelen, readfrom);
+		FS_FCloseFile(readfrom);
+		
+		endpos = textbuf + filelen;
+		
+		for(index = 0; index < SERVER_MAXBANS && curpos + 2 < endpos; index++)
+		{
+			// find the end of the address string
+			for(maskpos = curpos + 2; maskpos < endpos && *maskpos != ' '; maskpos++);
+			
+			if(maskpos + 1 >= endpos)
+				break;
+
+			*maskpos = '\0';
+			maskpos++;
+			
+			// find the end of the subnet specifier
+			for(newlinepos = maskpos; newlinepos < endpos && *newlinepos != '\n' && *newlinepos != ':'; newlinepos++);
+			
+			if(newlinepos >= endpos)
+				break;
+			
+			if(*newlinepos == ':') {
+				// We have a reason
+				*newlinepos = '\0';
+				reasonpos = newlinepos + 1;
+				
+				// Find the end of the reason string
+				for(newlinepos = reasonpos; newlinepos < endpos && *newlinepos != '\n'; newlinepos++);
+				
+				if(newlinepos >= endpos)
+					break;
+				
+				*newlinepos = '\0';
+				Q_strncpyz(serverBans[index].reason, reasonpos, sizeof(serverBans[index].reason));
+			} else {
+				// No reason
+				*newlinepos = '\0';
+				serverBans[index].reason[0] = '\0';
+			}
+			
+			if(NET_StringToAdr(curpos + 2, &serverBans[index].ip, NA_UNSPEC))
+			{
+				serverBans[index].isexception = (curpos[0] != '0');
+				serverBans[index].subnet = atoi(maskpos);
+				
+				if(serverBans[index].ip.type == NA_IP &&
+				   (serverBans[index].subnet < 1 || serverBans[index].subnet > 32))
+				{
+					serverBans[index].subnet = 32;
+				}
+				else if(serverBans[index].ip.type == NA_IP6 &&
+					(serverBans[index].subnet < 1 || serverBans[index].subnet > 128))
+				{
+					serverBans[index].subnet = 128;
+				}
+			}
+			
+			curpos = newlinepos + 1;
+		}
+			
+		serverBansCount = index;
+		
+		Z_Free(textbuf);
+	}
+}
+
+/*
+==================
+SV_WriteBans
+
+Save bans to file.
+==================
+*/
+static void SV_WriteBans(void)
+{
+	int index;
+	fileHandle_t writeto;
+	char filepath[MAX_QPATH];
+	
+	if(!sv_banFile->string || !*sv_banFile->string)
+		return;
+	
+	Com_sprintf(filepath, sizeof(filepath), "%s/%s", FS_GetCurrentGameDir(), sv_banFile->string);
+
+	if((writeto = FS_SV_FOpenFileWrite(filepath)))
+	{
+		char writebuf[128 + MAX_REASON_LENGTH];
+		serverBan_t *curban;
+		
+		for(index = 0; index < serverBansCount; index++)
+		{
+			curban = &serverBans[index];
+			
+			if(curban->reason[0]) {
+				Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d:%s\n",
+						curban->isexception, NET_AdrToString(curban->ip), curban->subnet, curban->reason);
+			} else {
+				Com_sprintf(writebuf, sizeof(writebuf), "%d %s %d\n",
+						curban->isexception, NET_AdrToString(curban->ip), curban->subnet);
+			}
+			
+			FS_Write(writebuf, strlen(writebuf), writeto);
+		}
+
+		FS_FCloseFile(writeto);
+	}
+}
+
+/*
+==================
+SV_DelBanEntryFromList
+
+Remove a ban or an exception from the list.
+==================
+*/
+
+static qboolean SV_DelBanEntryFromList(int index)
+{
+	if(index == serverBansCount - 1)
+		serverBansCount--;
+	else if(index < ARRAY_LEN(serverBans) - 1)
+	{
+		memmove(serverBans + index, serverBans + index + 1, (serverBansCount - index - 1) * sizeof(*serverBans));
+		serverBansCount--;
+	}
+	else
+		return qtrue;
+
+	return qfalse;
+}
+
+/*
+==================
+SV_ParseCIDRNotation
+
+Parse a CIDR notation type string and return a netadr_t and suffix by reference
+==================
+*/
+
+static qboolean SV_ParseCIDRNotation(netadr_t *dest, int *mask, char *adrstr)
+{
+	char *suffix;
+	
+	suffix = strchr(adrstr, '/');
+	if(suffix)
+	{
+		*suffix = '\0';
+		suffix++;
+	}
+
+	if(!NET_StringToAdr(adrstr, dest, NA_UNSPEC))
+		return qtrue;
+
+	if(suffix)
+	{
+		*mask = atoi(suffix);
+		
+		if(dest->type == NA_IP)
+		{
+			if(*mask < 1 || *mask > 32)
+				*mask = 32;
+		}
+		else
+		{
+			if(*mask < 1 || *mask > 128)
+				*mask = 128;
+		}
+	}
+	else if(dest->type == NA_IP)
+		*mask = 32;
+	else
+		*mask = 128;
+	
+	return qfalse;
+}
+
+/*
+==================
+SV_AddBanToList
+
+Ban a user from being able to play on this server based on his ip address.
+==================
+*/
+
+static void SV_AddBanToList(qboolean isexception)
+{
+	char *banstring;
+	char *reason = NULL;
+	char addy2[NET_ADDRSTRMAXLEN];
+	netadr_t ip;
+	int index, argc, mask;
+	serverBan_t *curban;
+	client_t *cl = NULL;
+	qboolean isdigit_only;
+	
 	// make sure server is running
 	if ( !com_sv_running->integer ) {
 		Com_Printf( "Server is not running.\n" );
 		return;
 	}
 
-	if ( Cmd_Argc() != 2 ) {
-		Com_Printf ("Usage: kicknum <client number>\n");
+	argc = Cmd_Argc();
+	
+	if ( argc < 2 )
+	{
+		Com_Printf ("Usage: %s (ip[/subnet] | clientnum [subnet] [reason])\n", Cmd_Argv(0));
 		return;
 	}
 
-	cl = SV_GetPlayerByNum();
-	if ( !cl ) {
-		return;
-	}
-	if( cl->netchan.remoteAddress.type == NA_LOOPBACK ) {
-		SV_SendServerCommand(NULL, "print \"%s\"", "Cannot kick host player\n");
+	if(serverBansCount >= ARRAY_LEN(serverBans))
+	{
+		Com_Printf ("Error: Maximum number of bans/exceptions exceeded.\n");
 		return;
 	}
 
-	SV_DropClient( cl, "was kicked" );
-	cl->lastPacketTime = svs.time;	// in case there is a funny zombie
+	banstring = Cmd_Argv(1);
+	
+	// Get optional reason - can be at arg 2 for IP bans or arg 3 for client num bans
+	if(strchr(banstring, '.') || strchr(banstring, ':'))
+	{
+		// IP address ban 
+		if(argc >= 3) {
+			reason = Cmd_ArgsFrom(2);
+		}
+
+		if(SV_ParseCIDRNotation(&ip, &mask, banstring))
+		{
+			Com_Printf("Error: Invalid address %s\n", banstring);
+			return;
+		}
+	}
+	else
+	{
+		// client num ban
+		cl = SV_GetPlayerByNum();
+
+		if ( !cl )
+		{
+			Com_Printf("Error: Playernum %s does not exist.\n", Cmd_Argv(1));
+			return;
+		}
+		
+		ip = cl->netchan.remoteAddress;
+		
+		if(argc >= 3)
+		{
+			// Check if second argument is all digits (CIDR notation)
+			isdigit_only = qtrue;
+			for(index = 0; Cmd_Argv(2)[index]; index++) {
+				if(Cmd_Argv(2)[index] < '0' || Cmd_Argv(2)[index] > '9') {
+					isdigit_only = qfalse;
+					break;
+				}
+			}
+			
+			if(isdigit_only) {
+				// Second arg is CIDR mask
+				mask = atoi(Cmd_Argv(2));
+			
+				if(ip.type == NA_IP)
+				{
+					if(mask < 1 || mask > 32)
+						mask = 32;
+				}
+				else
+				{
+					if(mask < 1 || mask > 128)
+						mask = 128;
+				}
+
+				// Get optional reason after subnet
+				if(argc >= 4) {
+					reason = Cmd_ArgsFrom(3);
+				}
+			} else {
+				// Second arg is start of reason
+				reason = Cmd_ArgsFrom(2);
+				mask = (ip.type == NA_IP6) ? 128 : 32;
+			}
+		}
+		else {
+			mask = (ip.type == NA_IP6) ? 128 : 32;
+		}
+	}
+
+	if(ip.type != NA_IP && ip.type != NA_IP6)
+	{
+		Com_Printf("Error: Can ban players connected via the internet only.\n");
+		return;
+	}
+
+	// first check whether a conflicting ban exists that would supersede the new one.
+	for(index = 0; index < serverBansCount; index++)
+	{
+		curban = &serverBans[index];
+		
+		if(curban->subnet <= mask)
+		{
+			if((curban->isexception || !isexception) && NET_CompareBaseAdrMask(curban->ip, ip, curban->subnet))
+			{
+				Q_strncpyz(addy2, NET_AdrToString(ip), sizeof(addy2));
+				
+				Com_Printf("Error: %s %s/%d supersedes %s %s/%d\n", curban->isexception ? "Exception" : "Ban",
+					   NET_AdrToString(curban->ip), curban->subnet,
+					   isexception ? "exception" : "ban", addy2, mask);
+				return;
+			}
+		}
+		if(curban->subnet >= mask)
+		{
+			if(!curban->isexception && isexception && NET_CompareBaseAdrMask(curban->ip, ip, mask))
+			{
+				Q_strncpyz(addy2, NET_AdrToString(curban->ip), sizeof(addy2));
+			
+				Com_Printf("Error: %s %s/%d supersedes already existing %s %s/%d\n", isexception ? "Exception" : "Ban",
+					   NET_AdrToString(ip), mask,
+					   curban->isexception ? "exception" : "ban", addy2, curban->subnet);
+				return;
+			}
+		}
+	}
+
+	// now delete bans that are superseded by the new one
+	index = 0;
+	while(index < serverBansCount)
+	{
+		curban = &serverBans[index];
+		
+		if(curban->subnet > mask && (!curban->isexception || isexception) && NET_CompareBaseAdrMask(curban->ip, ip, mask))
+			SV_DelBanEntryFromList(index);
+		else
+			index++;
+	}
+
+	serverBans[serverBansCount].ip = ip;
+	serverBans[serverBansCount].subnet = mask;
+	serverBans[serverBansCount].isexception = isexception;
+	
+	if(reason) {
+		Q_strncpyz(serverBans[serverBansCount].reason, reason, sizeof(serverBans[serverBansCount].reason));
+	} else {
+		serverBans[serverBansCount].reason[0] = '\0';
+	}
+	
+	serverBansCount++;
+	
+	SV_WriteBans();
+
+	// Find and kick any connected clients matching the banned IP
+	for(index = 0; index < sv_maxclients->integer; index++) {
+		client_t *kickcl = &svs.clients[index];
+		
+		if(!kickcl->state)
+			continue;
+
+		if ( NET_CompareBaseAdrMask(kickcl->netchan.remoteAddress, ip, mask) ) {
+			if ( reason ) {
+				SV_NET_OutOfBandPrint(&svs.netprofile, kickcl->netchan.remoteAddress,
+					"droperror\nYou have been banned from this server for:\n%s", reason);
+				
+				SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was banned for %s\n\"", kickcl->name, reason);
+				
+				SV_DropClient(kickcl, va("was banned for %s", reason));
+			} else {
+				SV_NET_OutOfBandPrint(&svs.netprofile, kickcl->netchan.remoteAddress,
+					"droperror\nYou have been banned from this server");
+
+				SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_WHITE "%s was banned\n\"", kickcl->name);
+				
+				SV_DropClient(kickcl, "was banned");
+			}
+			kickcl->lastPacketTime = svs.time;
+		}
+	}
+
+	Com_Printf("Added %s: %s/%d%s%s\n", isexception ? "ban exception" : "ban",
+			NET_AdrToString(ip), mask,
+			reason ? " with reason: " : "",
+			reason ? reason : "");
+}
+
+/*
+==================
+SV_DelBanFromList
+
+Remove a ban or an exception from the list.
+==================
+*/
+
+static void SV_DelBanFromList(qboolean isexception)
+{
+	int index, count = 0, todel, mask;
+	netadr_t ip;
+	char *banstring;
+	
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+	
+	if(Cmd_Argc() != 2)
+	{
+		Com_Printf ("Usage: %s (ip[/subnet] | num)\n", Cmd_Argv(0));
+		return;
+	}
+
+	banstring = Cmd_Argv(1);
+	
+	if(strchr(banstring, '.') || strchr(banstring, ':'))
+	{
+		serverBan_t *curban;
+		
+		if(SV_ParseCIDRNotation(&ip, &mask, banstring))
+		{
+			Com_Printf("Error: Invalid address %s\n", banstring);
+			return;
+		}
+		
+		index = 0;
+		
+		while(index < serverBansCount)
+		{
+			curban = &serverBans[index];
+			
+			if(curban->isexception == isexception		&&
+			   curban->subnet >= mask 			&&
+			   NET_CompareBaseAdrMask(curban->ip, ip, mask))
+			{
+				Com_Printf("Deleting %s %s/%d\n",
+					   isexception ? "exception" : "ban",
+					   NET_AdrToString(curban->ip), curban->subnet);
+					   
+				SV_DelBanEntryFromList(index);
+			}
+			else
+				index++;
+		}
+	}
+	else
+	{
+		todel = atoi(Cmd_Argv(1));
+
+		if(todel < 1 || todel > serverBansCount)
+		{
+			Com_Printf("Error: Invalid ban number given\n");
+			return;
+		}
+	
+		for(index = 0; index < serverBansCount; index++)
+		{
+			if(serverBans[index].isexception == isexception)
+			{
+				count++;
+			
+				if(count == todel)
+				{
+					Com_Printf("Deleting %s %s/%d\n",
+					   isexception ? "exception" : "ban",
+					   NET_AdrToString(serverBans[index].ip), serverBans[index].subnet);
+
+					SV_DelBanEntryFromList(index);
+
+					break;
+				}
+			}
+		}
+	}
+	
+	SV_WriteBans();
+}
+
+
+/*
+==================
+SV_ListBans_f
+
+List all bans and exceptions on console
+==================
+*/
+
+static void SV_ListBans_f(void)
+{
+	int index, count;
+	serverBan_t *ban;
+
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+	
+	// List all bans
+	for(index = count = 0; index < serverBansCount; index++)
+	{
+		ban = &serverBans[index];
+		if(!ban->isexception)
+		{
+			count++;
+
+			Com_Printf("Ban #%d: %s/%d", count,
+					NET_AdrToString(ban->ip), ban->subnet);
+					
+			if(ban->reason[0]) {
+				Com_Printf(" - Reason: %s", ban->reason);
+			}
+			
+			Com_Printf("\n");
+		}
+	}
+	// List all exceptions
+	for(index = count = 0; index < serverBansCount; index++)
+	{
+		ban = &serverBans[index];
+		if(ban->isexception)
+		{
+			count++;
+
+			Com_Printf("Except #%d: %s/%d", count,
+					NET_AdrToString(ban->ip), ban->subnet);
+					
+			if(ban->reason[0]) {
+				Com_Printf(" - Reason: %s", ban->reason);
+			}
+			
+			Com_Printf("\n");
+		}
+	}
+}
+
+/*
+==================
+SV_FlushBans_f
+
+Delete all bans and exceptions.
+==================
+*/
+
+static void SV_FlushBans_f(void)
+{
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+
+	serverBansCount = 0;
+	
+	// empty the ban file.
+	SV_WriteBans();
+	
+	Com_Printf("All bans and exceptions have been deleted.\n");
+}
+
+static void SV_BanAddr_f(void)
+{
+	SV_AddBanToList(qfalse);
+}
+
+static void SV_ExceptAddr_f(void)
+{
+	SV_AddBanToList(qtrue);
+}
+
+static void SV_BanDel_f(void)
+{
+	SV_DelBanFromList(qfalse);
+}
+
+static void SV_ExceptDel_f(void)
+{
+	SV_DelBanFromList(qtrue);
+}
+
+/*
+** SV_Strlen -- skips color escape codes
+*/
+static int SV_Strlen( const char *str ) {
+	const char *s = str;
+	int count = 0;
+
+	while ( *s ) {
+		//if ( Q_IsColorString( s ) ) {
+		//	s += 2;
+		//} else {
+			count++;
+			s++;
+		//}
+	}
+
+	return count;
 }
 
 /*
@@ -504,67 +1253,157 @@ static void SV_KickNum_f( void ) {
 SV_Status_f
 ================
 */
-static void SV_Status_f( void ) {
-	int			i;
-	size_t		j, l;
-	client_t	*cl;
+static void SV_Status_f(void) {
+	int				i;
+	size_t			j, l;
+	client_t		*cl;
 	playerState_t	*ps;
-	const char		*s;
-	int			ping;
+	const char*		s;
+	const char		*colName[8];
+	size_t			len;
+	unsigned int	colSize[8];
+	int				ping;
+	char			padding[64];
 
 	// make sure server is running
-	if ( !com_sv_running->integer ) {
-		Com_Printf( "Server is not running.\n" );
+	if (!com_sv_running->integer) {
+		Com_Printf("Server is not running.\n");
 		return;
 	}
 
-	Com_Printf ("map: %s\n", sv_mapname->string );
+	//
+	// Added in OPM
+	//  Dynamic column size.
+	//
+	//  Some programs use fixed-size columns
+	//  and may not parse information correctly
+	//
 
-	Com_Printf ("num score ping name            lastmsg address               qport rate\n");
-	Com_Printf ("--- ----- ---- --------------- ------- --------------------- ----- -----\n");
-	for (i=0,cl=svs.clients ; i < sv_maxclients->integer ; i++,cl++)
+	colName[0] = "num";
+	colSize[0] = strlen(colName[0]);
+	colName[1] = "score";
+	colSize[1] = strlen(colName[1]);
+	colName[2] = "ping";
+	colSize[2] = strlen(colName[2]);
+	colName[3] = "name";
+	colSize[3] = 15;
+	colName[4] = "lastmsg";
+	colSize[4] = 7;
+	colName[5] = "address";
+	colSize[5] = 21;
+	colName[6] = "qport";
+	colSize[6] = 5;
+	colName[7] = "rate";
+	colSize[7] = 5;
+
+	//
+	// Find IPv6 clients and adjust the IP address column size
+	//
+
+	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
 	{
-		if (!cl->state)
+		if (cl->state == CS_FREE) {
 			continue;
-		Com_Printf ("%3i ", i);
-		ps = SV_GameClientNum( i );
+		}
+
+		if (cl->netchan.remoteAddress.type == NA_IP6) {
+			colSize[5] = 38;
+			break;
+		}
+	}
+
+	Com_Printf("map: %s\n", sv_mapname->string);
+
+	//
+	// Print column header name
+	//
+
+	for (i = 0; i < 8; i++) {
+		// Column name
+		len = strlen(colName[i]);
+		Com_Printf("%s", colName[i]);
+
+		// Padding
+		for (j = 0; j < (ARRAY_LEN(padding) - 1) && (colSize[i] - j >= len); j++) {
+			padding[j] = ' ';
+		}
+		padding[j] = 0;
+
+		if (j > 0) {
+			Com_Printf("%s", padding);
+		}
+	}
+	Com_Printf("\n");
+
+	//
+	// Print column header padding
+	//
+
+	for (i = 0; i < 8; i++) {
+		for (j = 0; j < (ARRAY_LEN(padding) - 1) && (j < colSize[i]); j++) {
+			padding[j] = '-';
+		}
+		padding[j] = 0;
+
+		Com_Printf("%s ", padding);
+	}
+	Com_Printf("\n");
+
+	//
+	// Print values
+	//
+
+	for (i = 0, cl = svs.clients; i < svs.iNumClients; i++, cl++)
+	{
+		if (cl->state == CS_FREE) {
+			continue;
+		}
+
+		Com_Printf("%*u ", colSize[0], i);
+		ps = SV_GameClientNum(i);
 		// su44: ps->persistant is not avaible in mohaa
 		//Com_Printf ("%5i ", ps->persistant[PERS_SCORE]);
-		Com_Printf ("%5i ", 0);
+		Com_Printf("%*i ", colSize[1], ps->stats[STAT_KILLS]);
 
 		if (cl->state == CS_CONNECTED)
-			Com_Printf ("CNCT ");
+			Com_Printf("CNCT ");
 		else if (cl->state == CS_ZOMBIE)
-			Com_Printf ("ZMBI ");
+			Com_Printf("ZMBI ");
 		else
 		{
 			ping = cl->ping < 9999 ? cl->ping : 9999;
-			Com_Printf ("%4i ", ping);
+			Com_Printf("%*u ", colSize[2], ping);
 		}
 
-		Com_Printf ("%s", cl->name);
-    // TTimo adding a ^7 to reset the color
-    // NOTE: colored names in status breaks the padding (WONTFIX)
-    Com_Printf ("^7");
-		l = 16 - strlen(cl->name);
-		for (j=0 ; j<l ; j++)
-			Com_Printf (" ");
+		Com_Printf("%s ", cl->name);
+		l = SV_Strlen(cl->name);
+		if (l < colSize[3]) {
+			l = colSize[3] - l;
+			for (j = 0; j < l; j++) {
+				Com_Printf(" ");
+			}
+		}
 
-		Com_Printf ("%7i ", svs.time - cl->lastPacketTime );
+		Com_Printf("%*u ", colSize[4], svs.time - cl->lastPacketTime);
 
-		s = NET_AdrToString( cl->netchan.remoteAddress );
-		Com_Printf ("%s", s);
-		l = 22 - strlen(s);
-		for (j=0 ; j<l ; j++)
-			Com_Printf (" ");
-		
-		Com_Printf ("%5i", cl->netchan.qport);
+		s = NET_AdrToStringwPort(cl->netchan.remoteAddress);
+		Com_Printf("%s ", s);
 
-		Com_Printf (" %5i", cl->rate);
+		len = strlen(s);
+		if (len < colSize[5]) {
+			l = colSize[5] - strlen(s);
+			for (j = 0; j < l; j++) {
+				Com_Printf(" ");
+			}
+		}
 
-		Com_Printf ("\n");
+		Com_Printf( "%*u", colSize[6], cl->netchan.qport );
+
+		Com_Printf(" %*u", colSize[7], cl->rate);
+
+		Com_Printf("\n");
 	}
-	Com_Printf ("\n");
+	Com_Printf("\n");
 }
 
 /*
@@ -586,7 +1425,7 @@ static void SV_ConSay_f(void) {
 		return;
 	}
 
-	strcpy (text, "console: ");
+	Q_strncpyz (text, "console: ", sizeof(text));
 	p = Cmd_Args();
 
 	if ( *p == '"' ) {
@@ -596,7 +1435,114 @@ static void SV_ConSay_f(void) {
 
 	strcat(text, p);
 
-	SV_SendServerCommand(NULL, "chat \"%s\n\"", text);
+	Com_Printf("%s\n", text);
+	SV_SendServerCommand(NULL, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
+}
+
+/*
+==================
+SV_ConTell_f
+==================
+*/
+static void SV_ConTell_f(void) {
+	char	*p;
+	char	text[1024];
+	client_t	*cl;
+
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("Usage: tell <client number> <text>\n");
+		return;
+	}
+
+	cl = SV_GetPlayerByNum();
+	if ( !cl ) {
+		return;
+	}
+
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
+	p = Cmd_ArgsFrom(2);
+
+	if ( *p == '"' ) {
+		p++;
+		p[strlen(p)-1] = 0;
+	}
+
+	strcat(text, p);
+
+	Com_Printf("%s\n", text);
+	SV_SendServerCommand(cl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
+}
+
+
+/*
+==================
+SV_ConSayto_f
+==================
+*/
+static void SV_ConSayto_f(void) {
+	char		*p;
+	char		text[1024];
+	client_t	*cl;
+	char		*rawname;
+	char		name[MAX_NAME_LENGTH];
+	char		cleanName[MAX_NAME_LENGTH];
+	client_t	*saytocl;
+	int			i;
+
+	// make sure server is running
+	if ( !com_sv_running->integer ) {
+		Com_Printf( "Server is not running.\n" );
+		return;
+	}
+
+	if ( Cmd_Argc() < 3 ) {
+		Com_Printf ("Usage: sayto <player name> <text>\n");
+		return;
+	}
+
+	rawname = Cmd_Argv(1);
+	
+	//allowing special characters in the console 
+	//with hex strings for player names
+	Com_FieldStringToPlayerName( name, MAX_NAME_LENGTH, rawname );
+
+	saytocl = NULL;
+	for ( i=0, cl=svs.clients ; i < sv_maxclients->integer ; i++,cl++ ) {
+		if ( !cl->state ) {
+			continue;
+		}
+		Q_strncpyz( cleanName, cl->name, sizeof(cleanName) );
+		Q_CleanStr( cleanName );
+
+		if ( !Q_stricmp( cleanName, name ) ) {
+			saytocl = cl;
+			break;
+		}
+	}
+	if( !saytocl )
+	{
+		Com_Printf ("No such player name: %s.\n", name);
+		return;
+	}
+
+	Q_strncpyz(text, "(private) console: ", sizeof(text));
+	p = Cmd_ArgsFrom(2);
+
+	if ( *p == '"' ) {
+		p++;
+		p[strlen(p)-1] = 0;
+	}
+
+	strcat(text, p);
+
+	Com_Printf("%s\n", text);
+	SV_SendServerCommand(saytocl, "print \"" HUD_MESSAGE_CHAT_WHITE "%s\n\"", text);
 }
 
 
@@ -669,7 +1615,6 @@ static void SV_DumpUser_f( void ) {
 	Info_Print( cl->userinfo );
 }
 
-
 /*
 =================
 SV_KillServer
@@ -679,6 +1624,58 @@ static void SV_KillServer_f( void ) {
 	SV_Shutdown( "killserver" );
 }
 
+
+
+//===========================================================
+
+/*
+==================
+SV_CompleteMapName
+==================
+*/
+static void SV_CompleteMapName( char *args, int argNum ) {
+	if( argNum == 2 ) {
+		Field_CompleteFilename( "maps", "bsp", qtrue, qfalse );
+	}
+}
+
+/*
+==================
+SV_CompletePlayerName
+==================
+*/
+static void SV_CompletePlayerName( char *args, int argNum ) {
+	if( argNum == 2 ) {
+		char		names[MAX_CLIENTS][MAX_NAME_LENGTH];
+		const char	*namesPtr[MAX_CLIENTS];
+		client_t	*cl;
+		int			i;
+		int			nameCount;
+		int			clientCount;
+
+		nameCount = 0;
+		clientCount = sv_maxclients->integer;
+
+		for ( i=0, cl=svs.clients ; i < clientCount; i++,cl++ ) {
+			if ( !cl->state ) {
+				continue;
+			}
+			if( i >= MAX_CLIENTS ) {
+				break;
+			}
+			Q_strncpyz( names[nameCount], cl->name, sizeof(names[nameCount]) );
+			Q_CleanStr( names[nameCount] );
+
+			namesPtr[nameCount] = names[nameCount];
+
+			nameCount++;
+		}
+		qsort( (void*)namesPtr, nameCount, sizeof( namesPtr[0] ), Com_strCompare );
+
+		Field_CompletePlayerName( namesPtr, nameCount );
+	}
+}
+
 /*
 =================
 SV_EasyMode_f
@@ -725,6 +1722,159 @@ void SV_LoadLastGame_f( void )
 	Cbuf_AddText( va( "loadgame %s\n", Cvar_Get( "g_lastsave", "", 0 )->string ) );
 }
 
+/*
+=================
+SV_NetProfileDump_PrintProf
+=================
+*/
+void SV_NetProfileDump_PrintProf(fileHandle_t file, netprofclient_t* netprofile)
+{
+    size_t totalProcessed;
+    char buffer[2048];
+
+	totalProcessed = netprofile->outPackets.totalProcessed + netprofile->inPackets.totalProcessed;
+
+    Com_sprintf(
+        buffer,
+        sizeof(buffer),
+        "%4i %4i %4i | %3i %3i %3i | %3i %3i %3i | %3i %3i %3i | %7i %7i %7i\n",
+        netprofile->inPackets.packetsPerSec,
+        netprofile->outPackets.packetsPerSec,
+        netprofile->outPackets.packetsPerSec + netprofile->inPackets.packetsPerSec,
+        netprofile->inPackets.percentFragmented,
+        netprofile->outPackets.percentFragmented,
+        (unsigned int)((float)(netprofile->outPackets.numFragmented + netprofile->inPackets.numFragmented) / totalProcessed),
+        netprofile->inPackets.percentDropped,
+        netprofile->outPackets.percentDropped,
+        (unsigned int)((float)(netprofile->outPackets.numDropped + netprofile->inPackets.numDropped) / totalProcessed),
+        netprofile->inPackets.percentDropped,
+        netprofile->outPackets.percentDropped,
+        (unsigned int)((float)(netprofile->outPackets.totalLengthConnectionLess + netprofile->inPackets.totalLengthConnectionLess) / (float)(netprofile->outPackets.totalSize + netprofile->inPackets.totalSize)),
+        netprofile->inPackets.bytesPerSec,
+        netprofile->outPackets.bytesPerSec,
+        netprofile->outPackets.bytesPerSec + netprofile->inPackets.bytesPerSec
+	);
+
+    FS_Write(buffer, strlen(buffer), file);
+}
+
+/*
+=================
+SV_NetProfileDump_f
+=================
+*/
+void SV_NetProfileDump_f(void)
+{
+	static fileHandle_t hFile = 0;
+	client_t *client;
+	int i;
+	char buffer[2048];
+	netprofclient_t netproftotal;
+
+	if (!hFile) {
+		hFile = FS_FOpenTextFileWrite("netprofile.log");
+        FS_ForceFlush(hFile);
+        
+		Com_sprintf(buffer, sizeof(buffer), "NetProfile.log\n\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+		
+		Com_sprintf(buffer, sizeof(buffer), "Log Format:\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+		
+		Com_sprintf(
+            buffer,
+			sizeof(buffer),
+            "Source: Packets per Second In/Out/Total | %%Fragments In/Out/Total | %%Dropped In/Out/Total | %%OOB Data In/Out/Total"
+            " | Data per Second In/Out/Total\n"
+            "\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+	}
+
+	if (!sv_netprofile->integer) {
+		return;
+	}
+
+#ifndef DEDICATED
+    if (!com_cl_running->integer || com_sv_running->integer) {
+#else
+    if (com_sv_running->integer) {
+#endif
+		Com_sprintf(buffer, sizeof(buffer), "------------------\nServer Net Profile\n");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NET_CalcTotalNetProfile(&netproftotal, 1);
+
+		Com_sprintf(buffer, sizeof(buffer), "Total:        ");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NetProfileDump_PrintProf(hFile, &netproftotal);
+
+		Com_sprintf(buffer, sizeof(buffer), "Clientless:   ");
+		FS_Write(buffer, strlen(buffer), hFile);
+		SV_NetProfileDump_PrintProf(hFile, &svs.netprofile);
+
+		for (i = 0; i < svs.iNumClients; i++) {
+            client = &svs.clients[i];
+            if (client->state != CS_ACTIVE || !client->gentity) {
+                continue;
+            }
+
+			if (client->netchan.remoteAddress.type == NA_LOOPBACK) {
+				Com_sprintf(buffer, sizeof(buffer), "#%2i-Loopback: ", i);
+			} else {
+				Com_sprintf(buffer, sizeof(buffer), "Client #%2i:   ", i);
+			}
+
+			FS_Write(buffer, strlen(buffer), hFile);
+			SV_NetProfileDump_PrintProf(hFile, &client->netprofile);
+		}
+	}
+#ifndef DEDICATED
+	else if (com_cl_running->integer && cl_netprofile->integer) {
+        Com_sprintf(buffer, sizeof(buffer), "------------------\nClient Net Profile\n");
+        FS_Write(buffer, strlen(buffer), hFile);
+        SV_NetProfileDump_PrintProf(hFile, &cls.netprofile);
+	}
+#endif
+}
+
+/*
+=================
+SV_ReloadMap_f
+
+Added in 2.30
+Reload the whole map.
+=================
+*/
+void SV_ReloadMap_f(void)
+{
+	qboolean bTransition;
+
+	if (!com_sv_running->integer) {
+		// Fixed in OPM
+		Com_Printf("Server is not running.\n");
+		return;
+	}
+
+	Com_DPrintf("SV_ReloadMap\n");
+
+	if (!svs.mapName[0]) {
+		return;
+	}
+
+    Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName));
+	Cvar_SaveGameRestart_f();
+
+	bTransition = sv.state == SS_GAME;
+	if (bTransition) {
+		SV_ArchivePersistantFile(qfalse);
+	}
+
+	SV_SpawnServer(svs.mapName, qfalse, qfalse, bTransition);
+
+	if (g_gametype->integer == GT_SINGLE_PLAYER) {
+		svs.autosave = qtrue;
+	}
+}
+
 #if 0
 
 /*
@@ -738,8 +1888,8 @@ static void SV_TIKI_f( void ) {
 	if(TIKI_RegisterModel(fname)==0)
 	{
 		char tmp[128];
-		strcpy(tmp,"models/");
-		strcat(tmp,fname);
+		Q_strncpyz(tmp,"models/",sizeof(tmp));
+		Q_strcat(tmp,sizeof(tmp),fname);
 		TIKI_RegisterModel(tmp);
 	}
 }
@@ -760,8 +1910,8 @@ static void SV_TIKI_DumpBones_f( void ) {
 	if(tiki==0)
 	{
 		char tmp[128];
-		strcpy(tmp,"models/");
-		strcat(tmp,fname);
+		Q_strncpyz(tmp,"models/",sizeof(tmp));
+		Q_strcat(tmp,sizeof(tmp),fname);
 		tiki = TIKI_RegisterModel(tmp);
 		if(!tiki)
 			return;
@@ -790,49 +1940,75 @@ static void SV_TIKI_DumpBones_f( void ) {
 SV_AddOperatorCommands
 ==================
 */
-void SV_AddOperatorCommands( void ) {
+void SV_AddOperatorCommands(void) {
 	static qboolean	initialized;
 
-	if( initialized ) {
+	if (initialized) {
 		return;
 	}
 	initialized = qtrue;
 
-	Cmd_AddCommand( "heartbeat", SV_Heartbeat_f );
-	Cmd_AddCommand( "kick", SV_Kick_f );
-	Cmd_AddCommand( "clientkick", SV_KickNum_f );
-	Cmd_AddCommand( "banUser", SV_Ban_f );
-	Cmd_AddCommand( "banClient", SV_BanNum_f );
-	Cmd_AddCommand( "status", SV_Status_f );
-	Cmd_AddCommand( "serverinfo", SV_Serverinfo_f );
-	Cmd_AddCommand( "systeminfo", SV_Systeminfo_f );
-	Cmd_AddCommand( "dumpuser", SV_DumpUser_f );
-	Cmd_AddCommand( "restart", SV_MapRestart_f );
-	Cmd_AddCommand( "sectorlist", SV_SectorList_f );
-	Cmd_AddCommand( "spmap", SV_Map_f );
-	Cmd_AddCommand( "spdevmap", SV_Map_f );
-	Cmd_AddCommand( "map", SV_Map_f );
-	Cmd_AddCommand( "devmap", SV_Map_f );
-	Cmd_AddCommand( "gamemap", SV_GameMap_f );
+	Cmd_AddCommand("heartbeat", SV_Heartbeat_f);
+	Cmd_AddCommand("kick", SV_Kick_f);
+#ifndef STANDALONE
+	if (!com_standalone->integer)
+	{
+		Cmd_AddCommand("banUser", SV_Ban_f);
+		Cmd_AddCommand("banClient", SV_BanNum_f);
+	}
+#endif
+	Cmd_AddCommand("kickall", SV_KickAll_f);
+	Cmd_AddCommand("kicknum", SV_KickNum_f);
+	Cmd_AddCommand("clientkick", SV_KickNum_f); // Legacy command
+	Cmd_AddCommand("clientkickr", SV_KickNum_f); // Legacy command with reason
+	Cmd_AddCommand("kickr", SV_KickNum_f); // Legacy command with reason
+	Cmd_AddCommand("status", SV_Status_f);
+	Cmd_AddCommand("serverinfo", SV_Serverinfo_f);
+	Cmd_AddCommand("systeminfo", SV_Systeminfo_f);
+	Cmd_AddCommand("dumpuser", SV_DumpUser_f);
+	Cmd_AddCommand("restart", SV_MapRestart_f);
+	Cmd_AddCommand("sectorlist", SV_SectorList_f);
+	Cmd_AddCommand("spmap", SV_Map_f);
+	Cmd_AddCommand("spdevmap", SV_Map_f);
+	Cmd_AddCommand("map", SV_Map_f);
+	Cmd_AddCommand("devmap", SV_Map_f);
+	Cmd_AddCommand("gamemap", SV_GameMap_f);
 
-	Cmd_AddCommand( "killserver", SV_KillServer_f );
-	Cmd_AddCommand( "savegame", SV_Savegame_f );
-	Cmd_AddCommand( "autosavegame", SV_Autosavegame_f );
-	Cmd_AddCommand( "loadgame", SV_Loadgame_f );
-	Cmd_AddCommand( "loadlastgame", SV_LoadLastGame_f );
-	Cmd_AddCommand( "difficultyEasy", SV_EasyMode_f );
-	Cmd_AddCommand( "difficultyMedium", SV_MediumMode_f );
-	Cmd_AddCommand( "difficultyHard", SV_HardMode_f );
+	Cmd_AddCommand("killserver", SV_KillServer_f);
+#ifndef DEDICATED
+	Cmd_AddCommand("savegame", SV_Savegame_f);
+	Cmd_AddCommand("autosavegame", SV_Autosavegame_f);
+	Cmd_AddCommand("loadgame", SV_Loadgame_f);
+	Cmd_AddCommand("loadlastgame", SV_LoadLastGame_f);
+#endif
 
-	if( com_dedicated->integer ) {
-		Cmd_AddCommand( "say", SV_ConSay_f );
+	if (com_dedicated->integer) {
+		Cmd_AddCommand("say", SV_ConSay_f);
+		Cmd_AddCommand("tell", SV_ConTell_f);
+		Cmd_AddCommand("sayto", SV_ConSayto_f);
+		Cmd_SetCommandCompletionFunc("sayto", (completionFunc_t)SV_CompletePlayerName);
 	}
 
-	if( developer->integer ) {
-		SV_MediumMode_f();
-	} else {
-		SV_EasyMode_f();
-	}
+	Cmd_AddCommand("rehashbans", SV_RehashBans_f);
+	Cmd_AddCommand("listbans", SV_ListBans_f);
+	Cmd_AddCommand("banaddr", SV_BanAddr_f);
+	Cmd_AddCommand("exceptaddr", SV_ExceptAddr_f);
+	Cmd_AddCommand("bandel", SV_BanDel_f);
+	Cmd_AddCommand("exceptdel", SV_ExceptDel_f);
+	Cmd_AddCommand("flushbans", SV_FlushBans_f);
+	
+	Cmd_AddCommand("difficultyEasy", SV_EasyMode_f);
+	Cmd_AddCommand("difficultyMedium", SV_MediumMode_f);
+	Cmd_AddCommand("difficultyHard", SV_HardMode_f);
+
+	// Added in 2.0
+    Cmd_AddCommand("netprofiledump", SV_NetProfileDump_f);
+	// Added in 2.30
+    Cmd_AddCommand("reloadmap", SV_ReloadMap_f);
+
+	// Changed in 2.0
+	//  Set medium mode regardless of if the developer mode is set
+	SV_MediumMode_f();
 }
 
 /*
@@ -840,20 +2016,20 @@ void SV_AddOperatorCommands( void ) {
 SV_RemoveOperatorCommands
 ==================
 */
-void SV_RemoveOperatorCommands( void ) {
+void SV_RemoveOperatorCommands(void) {
 #if 0
 	// removing these won't let the server start again
-	Cmd_RemoveCommand ("heartbeat");
-	Cmd_RemoveCommand ("kick");
-	Cmd_RemoveCommand ("banUser");
-	Cmd_RemoveCommand ("banClient");
-	Cmd_RemoveCommand ("status");
-	Cmd_RemoveCommand ("serverinfo");
-	Cmd_RemoveCommand ("systeminfo");
-	Cmd_RemoveCommand ("dumpuser");
-	Cmd_RemoveCommand ("map_restart");
-	Cmd_RemoveCommand ("sectorlist");
-	Cmd_RemoveCommand ("say");
+	Cmd_RemoveCommand("heartbeat");
+	Cmd_RemoveCommand("kick");
+	Cmd_RemoveCommand("banUser");
+	Cmd_RemoveCommand("banClient");
+	Cmd_RemoveCommand("status");
+	Cmd_RemoveCommand("serverinfo");
+	Cmd_RemoveCommand("systeminfo");
+	Cmd_RemoveCommand("dumpuser");
+	Cmd_RemoveCommand("map_restart");
+	Cmd_RemoveCommand("sectorlist");
+	Cmd_RemoveCommand("say");
 #endif
 }
 
@@ -862,33 +2038,34 @@ void SV_RemoveOperatorCommands( void ) {
 SV_ArchiveHudDrawElements
 ==================
 */
-void SV_ArchiveHudDrawElements( qboolean loading )
+void SV_ArchiveHudDrawElements(qboolean loading)
 {
+#ifndef DEDICATED
 	int i;
 
-	for( i = 0; i < MAX_HUDDRAW_ELEMENTS; i++ )
-	{
-		ge->ArchiveString( cls.HudDrawElements[ i ].shaderName );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iX );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iY );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iWidth );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iVerticalAlign );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 0 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 1 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 2 ] );
-		ge->ArchiveFloat( &cls.HudDrawElements[ i ].vColor[ 3 ] );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iHorizontalAlign );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].iVerticalAlign );
-		ge->ArchiveInteger( &cls.HudDrawElements[ i ].bVirtualScreen );
-		ge->ArchiveString( cls.HudDrawElements[ i ].fontName );
-		ge->ArchiveString( cls.HudDrawElements[ i ].string );
+	for (i = 0; i < MAX_HUDDRAW_ELEMENTS; i++) {
+		ge->ArchiveString(cls.HudDrawElements[i].shaderName);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iX);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iY);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iWidth);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iHeight);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[0]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[1]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[2]);
+		ge->ArchiveFloat(&cls.HudDrawElements[i].vColor[3]);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iHorizontalAlign);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].iVerticalAlign);
+		ge->ArchiveInteger(&cls.HudDrawElements[i].bVirtualScreen);
+		ge->ArchiveString(cls.HudDrawElements[i].fontName);
+		ge->ArchiveString(cls.HudDrawElements[i].string);
 	}
 
-	if( loading ) {
-		if( cge ) {
+	if (loading) {
+		if (cge) {
 			cge->CG_RefreshHudDrawElements();
 		}
 	}
+#endif
 }
 
 /*
@@ -896,16 +2073,18 @@ void SV_ArchiveHudDrawElements( qboolean loading )
 SV_HudDrawShader
 ==================
 */
-void SV_HudDrawShader( int iInfo, char *name )
+void SV_HudDrawShader(int iInfo, const char *name)
 {
-	strcpy( cls.HudDrawElements[ iInfo ].shaderName, name );
-	cls.HudDrawElements[ iInfo ].string[ 0 ] = 0;
-	cls.HudDrawElements[ iInfo ].pFont = NULL;
-	cls.HudDrawElements[ iInfo ].fontName[ 0 ] = 0;
+#ifndef DEDICATED
+	Q_strncpyz(cls.HudDrawElements[iInfo].shaderName, name, sizeof(cls.HudDrawElements[iInfo].shaderName));
+	cls.HudDrawElements[iInfo].string[0]   = 0;
+	cls.HudDrawElements[iInfo].pFont       = NULL;
+	cls.HudDrawElements[iInfo].fontName[0] = 0;
 
-	if( cge ) {
-		cge->CG_HudDrawShader( iInfo );
+	if (cge) {
+		cge->CG_HudDrawShader(iInfo);
 	}
+#endif
 }
 
 /*
@@ -913,10 +2092,12 @@ void SV_HudDrawShader( int iInfo, char *name )
 SV_HudDrawAlign
 ==================
 */
-void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign )
+void SV_HudDrawAlign(int iInfo, int iHorizontalAlign, int iVerticalAlign)
 {
-	cls.HudDrawElements[ iInfo ].iHorizontalAlign = iHorizontalAlign;
-	cls.HudDrawElements[ iInfo ].iVerticalAlign = iVerticalAlign;
+#ifndef DEDICATED
+	cls.HudDrawElements[iInfo].iHorizontalAlign = iHorizontalAlign;
+	cls.HudDrawElements[iInfo].iVerticalAlign   = iVerticalAlign;
+#endif
 }
 
 /*
@@ -924,12 +2105,14 @@ void SV_HudDrawAlign( int iInfo, int iHorizontalAlign, int iVerticalAlign )
 SV_HudDrawRect
 ==================
 */
-void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight )
+void SV_HudDrawRect(int iInfo, int iX, int iY, int iWidth, int iHeight)
 {
-	cls.HudDrawElements[ iInfo ].iX = iX;
-	cls.HudDrawElements[ iInfo ].iY = iY;
-	cls.HudDrawElements[ iInfo ].iWidth = iWidth;
-	cls.HudDrawElements[ iInfo ].iHeight = iHeight;
+#ifndef DEDICATED
+	cls.HudDrawElements[iInfo].iX      = iX;
+	cls.HudDrawElements[iInfo].iY      = iY;
+	cls.HudDrawElements[iInfo].iWidth  = iWidth;
+	cls.HudDrawElements[iInfo].iHeight = iHeight;
+#endif
 }
 
 /*
@@ -937,9 +2120,11 @@ void SV_HudDrawRect( int iInfo, int iX, int iY, int iWidth, int iHeight )
 SV_HudDrawVirtualSize
 ==================
 */
-void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen )
+void SV_HudDrawVirtualSize(int iInfo, qboolean bVirtualScreen)
 {
-	cls.HudDrawElements[ iInfo ].bVirtualScreen = bVirtualScreen;
+#ifndef DEDICATED
+	cls.HudDrawElements[iInfo].bVirtualScreen = bVirtualScreen;
+#endif
 }
 
 /*
@@ -947,9 +2132,11 @@ void SV_HudDrawVirtualSize( int iInfo, qboolean bVirtualScreen )
 SV_HudDrawColor
 ==================
 */
-void SV_HudDrawColor( int iInfo, vec3_t vColor )
+void SV_HudDrawColor(int iInfo, vec3_t vColor)
 {
-	VectorCopy( vColor, cls.HudDrawElements[ iInfo ].vColor );
+#ifndef DEDICATED
+	VectorCopy(vColor, cls.HudDrawElements[iInfo].vColor);
+#endif
 }
 
 /*
@@ -957,9 +2144,11 @@ void SV_HudDrawColor( int iInfo, vec3_t vColor )
 SV_HudDrawAlpha
 ==================
 */
-void SV_HudDrawAlpha( int iInfo, float alpha )
+void SV_HudDrawAlpha(int iInfo, float alpha)
 {
-	cls.HudDrawElements[ iInfo ].vColor[ 3 ] = alpha;
+#ifndef DEDICATED
+	cls.HudDrawElements[iInfo].vColor[3] = alpha;
+#endif
 }
 
 /*
@@ -967,10 +2156,12 @@ void SV_HudDrawAlpha( int iInfo, float alpha )
 SV_HudDrawString
 ==================
 */
-void SV_HudDrawString( int iInfo, const char *string )
+void SV_HudDrawString(int iInfo, const char *string)
 {
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	strcpy( cls.HudDrawElements[ iInfo ].string, string );
+#ifndef DEDICATED
+	cls.HudDrawElements[iInfo].hShader = 0;
+	Q_strncpyz(cls.HudDrawElements[iInfo].string, string, sizeof(cls.HudDrawElements[iInfo].string));
+#endif
 }
 
 /*
@@ -978,15 +2169,17 @@ void SV_HudDrawString( int iInfo, const char *string )
 SV_HudDrawFont
 ==================
 */
-void SV_HudDrawFont( int iInfo, const char *name )
+void SV_HudDrawFont(int iInfo, const char *name)
 {
-	strcpy( cls.HudDrawElements[ iInfo ].fontName, name );
-	cls.HudDrawElements[ iInfo ].hShader = 0;
-	cls.HudDrawElements[ iInfo ].shaderName[ 0 ] = 0;
+#ifndef DEDICATED
+	Q_strncpyz(cls.HudDrawElements[iInfo].fontName, name, sizeof(cls.HudDrawElements[iInfo].fontName));
+	cls.HudDrawElements[iInfo].hShader       = 0;
+	cls.HudDrawElements[iInfo].shaderName[0] = 0;
 
-	if( cge ) {
-		cge->CG_HudDrawFont( iInfo );
+	if (cge) {
+		cge->CG_HudDrawFont(iInfo);
 	}
+#endif
 }
 
 /*
@@ -994,29 +2187,28 @@ void SV_HudDrawFont( int iInfo, const char *name )
 SV_ArchiveViewModelAnimation
 ==================
 */
-void SV_ArchiveViewModelAnimation( qboolean loading )
+void SV_ArchiveViewModelAnimation(qboolean loading)
 {
-#ifdef CLIENT
+#ifndef DEDICATED
 	int i;
 
-	for( i = 0; i < MAX_FRAMEINFOS; i++ )
-	{
-		ge->ArchiveInteger( &cls.anim.vmFrameInfo[ i ].index );
-		ge->ArchiveFloat( &cls.anim.vmFrameInfo[ i ].time );
-		ge->ArchiveFloat( &cls.anim.vmFrameInfo[ i ].weight );
+	for (i = 0; i < MAX_FRAMEINFOS; i++) {
+		ge->ArchiveInteger(&cls.anim.g_VMFrameInfo[i].index);
+		ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].time);
+		ge->ArchiveFloat(&cls.anim.g_VMFrameInfo[i].weight);
 	}
 
-	ge->ArchiveInteger( &cls.anim.lastVMAnim );
-	ge->ArchiveInteger( &cls.anim.lastVMAnimChanged );
-	ge->ArchiveInteger( &cls.anim.currentVMAnimSlot );
-	ge->ArchiveInteger( &cls.anim.currentVMDuration );
-	ge->ArchiveInteger( &cls.anim.crossBlending );
-	ge->ArchiveInteger( &cls.anim.lastEquippedWeaponStat );
-	ge->ArchiveString( cls.anim.lastActiveItem );
-	ge->ArchiveInteger( &cls.anim.lastAnimPrefixIndex );
-	ge->ArchiveFloat( &cls.anim.currentVMPosOffset[ 0 ] );
-	ge->ArchiveFloat( &cls.anim.currentVMPosOffset[ 1 ] );
-	ge->ArchiveFloat( &cls.anim.currentVMPosOffset[ 2 ] );
+	ge->ArchiveInteger(&cls.anim.g_iLastVMAnim);
+	ge->ArchiveInteger(&cls.anim.g_iLastVMAnimChanged);
+	ge->ArchiveInteger(&cls.anim.g_iCurrentVMAnimSlot);
+	ge->ArchiveInteger(&cls.anim.g_iCurrentVMDuration);
+	ge->ArchiveInteger(&cls.anim.g_bCrossblending);
+	ge->ArchiveInteger(&cls.anim.g_iLastEquippedWeaponStat);
+	ge->ArchiveString(cls.anim.g_szLastActiveItem);
+	ge->ArchiveInteger(&cls.anim.g_iLastAnimPrefixIndex);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[0]);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[1]);
+	ge->ArchiveFloat(&cls.anim.g_vCurrentVMPosOffset[2]);
 #endif
 }
 
@@ -1025,11 +2217,11 @@ void SV_ArchiveViewModelAnimation( qboolean loading )
 SV_ArchiveStopwatch
 ==================
 */
-void SV_ArchiveStopwatch( qboolean loading )
+void SV_ArchiveStopwatch(qboolean loading)
 {
-#ifdef CLIENT
-	ge->ArchiveSvsTime( &cls.stopwatch.iStartTime );
-	ge->ArchiveSvsTime( &cls.stopwatch.iEndTime );
+#ifndef DEDICATED
+	ge->ArchiveSvsTime(&cls.stopwatch.iStartTime);
+	ge->ArchiveSvsTime(&cls.stopwatch.iEndTime);
 #endif
 }
 
@@ -1038,13 +2230,15 @@ void SV_ArchiveStopwatch( qboolean loading )
 SV_ArchivePersistantFile
 ==================
 */
-void SV_ArchivePersistantFile( qboolean loading )
+void SV_ArchivePersistantFile(qboolean loading)
 {
+#ifndef DEDICATED
 	const char *name;
 
-	Com_DPrintf( "SV_ArchivePersistantFile()\n" );
-	name = Com_GetArchiveFileName( svs.gameName, "spv" );
-	ge->ArchivePersistant( name, loading );
+	Com_DPrintf("SV_ArchivePersistantFile()\n");
+	name = Com_GetArchiveFileName(svs.gameName, "spv");
+	ge->ArchivePersistant(name, loading);
+#endif
 }
 
 /*
@@ -1052,11 +2246,13 @@ void SV_ArchivePersistantFile( qboolean loading )
 SV_ArchiveLevel
 ==================
 */
-void SV_ArchiveLevel( qboolean loading )
+void SV_ArchiveLevel(qboolean loading)
 {
-	SV_ArchiveHudDrawElements( loading );
-	SV_ArchiveViewModelAnimation( loading );
-	SV_ArchiveStopwatch( loading );
+#ifndef DEDICATED
+	SV_ArchiveHudDrawElements(loading);
+	SV_ArchiveViewModelAnimation(loading);
+	SV_ArchiveStopwatch(loading);
+#endif
 }
 
 /*
@@ -1064,49 +2260,46 @@ void SV_ArchiveLevel( qboolean loading )
 SV_ArchiveLevelFile
 ==================
 */
-qboolean SV_ArchiveLevelFile( qboolean loading, qboolean autosave )
+qboolean SV_ArchiveLevelFile(qboolean loading, qboolean autosave)
 {
-	const char *name;
-	qboolean success;
-	fileHandle_t f;
-	savegamestruct_t save;
-#ifdef CLIENT
+#ifndef DEDICATED
+	const char           *name;
+	fileHandle_t          f;
+	savegamestruct_t      save;
 	soundsystemsavegame_t SSsave;
-#endif
 
-	Com_DPrintf( "SV_ArchiveLevelFile()\n" );
-	name = Com_GetArchiveFileName( svs.gameName, "sav" );
-	if( loading )
-	{
-		success = ge->ReadLevel( name );
-		if( success )
-		{
-			name = Com_GetArchiveFileName( svs.gameName, "ssv" );
-			FS_FOpenFileRead( name, &f, qfalse, qtrue );
-			if( f )
-			{
-				FS_Read( &save, sizeof( savegamestruct_t ), f );
-				if( save.version != 3 )
-				{
-					FS_FCloseFile( f );
-					return 0;
-				}
-
-#ifdef CLIENT
-				FS_Read( &SSsave, sizeof( soundsystemsavegame_t ), f );
-#endif
-				CM_ReadPortalState( f );
-				FS_FCloseFile( f );
-			}
+	Com_DPrintf("SV_ArchiveLevelFile()\n");
+	name = Com_GetArchiveFileName(svs.gameName, "sav");
+	if (loading) {
+		if (!ge->ReadLevel(name, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize)) {
+			return qfalse;
 		}
-	}
-	else
-	{
-		ge->WriteLevel( name, autosave );
-		success = qtrue;
+
+		name = Com_GetArchiveFileName(svs.gameName, "ssv");
+		FS_FOpenFileRead(name, &f, qfalse, qtrue);
+		if (f) {
+			FS_Read(&save, sizeof(savegamestruct_t), f);
+			Com_SwapSaveStruct(&save);
+			if (save.version != SAVEGAME_STRUCT_VERSION) {
+				FS_FCloseFile(f);
+				return qfalse;
+			}
+
+			FS_Read(&SSsave, sizeof(soundsystemsavegame_t), f);
+			CM_ReadPortalState(f);
+			FS_FCloseFile(f);
+		}
+	} else {
+		cls.savedCgameStateSize = cge->CG_SaveStateToBuffer(&cls.savedCgameState, svs.time);
+		ge->WriteLevel(name, autosave, (byte **)&cls.savedCgameState, &cls.savedCgameStateSize);
+		Z_Free(cls.savedCgameState);
+		cls.savedCgameState = NULL;
 	}
 
-	return success;
+	return qtrue;
+#else
+	return qfalse;
+#endif
 }
 
 /*
@@ -1114,12 +2307,12 @@ qboolean SV_ArchiveLevelFile( qboolean loading, qboolean autosave )
 S_Save
 ==================
 */
-void S_Save( fileHandle_t f )
+void S_Save(fileHandle_t f)
 {
-#ifdef CLIENT
+#ifndef DEDICATED
 	soundsystemsavegame_t save;
-	S_SaveData( &save );
-	FS_Write( &save, sizeof( soundsystemsavegame_t ), f );
+	S_SaveData(&save);
+	FS_Write(&save, sizeof(soundsystemsavegame_t), f);
 #endif
 }
 
@@ -1128,10 +2321,10 @@ void S_Save( fileHandle_t f )
 S_Load
 ==================
 */
-void S_Load( fileHandle_t f )
+void S_Load(fileHandle_t f)
 {
 #ifndef DEDICATED
-	FS_Read( &svs.soundSystem, sizeof( svs.soundSystem ), f );
+	FS_Read(&svs.soundSystem, sizeof(svs.soundSystem), f);
 	S_LoadData(&svs.soundSystem);
 #endif
 }
@@ -1141,95 +2334,109 @@ void S_Load( fileHandle_t f )
 SV_ArchiveServerFile
 ==================
 */
-qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
+qboolean SV_ArchiveServerFile(qboolean loading, qboolean autosave)
 {
-	fileHandle_t f;
-	const char *name;
-	char comment[ 64 ];
+#ifndef DEDICATED
+	fileHandle_t     f;
+	const char      *name;
+	char             comment[64];
 	savegamestruct_t save;
-	char cmdString[ 256 ];
-	time_t aclock;
+	char             cmdString[256];
+	time_t           aclock;
 
-	Com_DPrintf( "SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false" );
-	name = Com_GetArchiveFileName( svs.gameName, "ssv" );
+	Com_DPrintf("SV_ArchiveServerFile(%s)\n", autosave ? "true" : "false");
+	memset(&save, 0, sizeof(save));
+	name = Com_GetArchiveFileName(svs.gameName, "ssv");
 
-	if( !loading )
-	{
-		f = FS_FOpenFileWrite( name );
-		if( !f )
-		{
-			Com_Printf( "Couldn't write %s\n", name );
+	if (!loading) {
+		f = FS_FOpenFileWrite(name);
+		if (!f) {
+			Com_Printf("Couldn't write %s\n", name);
 			return qfalse;
 		}
 
-		time( &aclock );
+		time(&aclock);
 
-		if( autosave )
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s - Starting", sv.configstrings[ CS_MESSAGE ] );
-		}
-		else if( sv.configstrings[ CS_SAVENAME ] && *sv.configstrings[ CS_SAVENAME ] )
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s - %s", sv.configstrings[ CS_MESSAGE ], sv.configstrings[ CS_SAVENAME ] );
-		}
-		else
-		{
-			Com_sprintf( comment, sizeof( comment ), "%s", sv.configstrings[ CS_MESSAGE ] );
-		}
-
-		if( strstr( name, "quick.ssv" ) ) {
-			Com_sprintf( save.comment, sizeof( save.comment ), "QuickSave - %s", comment );
+		if (autosave) {
+			Com_sprintf(comment, sizeof(comment), "%s - %s", sv.configstrings[CS_MESSAGE], Sys_LV_CL_ConvertString("Starting"));
+		} else if (sv.configstrings[CS_SAVENAME] && *sv.configstrings[CS_SAVENAME]) {
+			if (com_target_game->integer >= TG_MOHTA) {
+				// Fixed in 2.0
+				//  In 2.0 and above, the full save name is set by the level
+				Com_sprintf(comment, sizeof(comment), "%s", Sys_LV_CL_ConvertString(sv.configstrings[CS_SAVENAME]));
+			} else {
+				Com_sprintf(comment, sizeof(comment), "%s - %s", Sys_LV_CL_ConvertString(sv.configstrings[CS_MESSAGE]), Sys_LV_CL_ConvertString(sv.configstrings[CS_SAVENAME]));
+			}
 		} else {
-			strcpy( save.comment, name );
+			Com_sprintf(comment, sizeof(comment), "%s", Sys_LV_CL_ConvertString(sv.configstrings[CS_MESSAGE]));
 		}
 
-		SV_SetConfigstring( CS_SAVENAME, "" );
+		if (strstr(name, "quick.ssv")) {
+			Com_sprintf(save.comment, sizeof(save.comment), "%s - %s", Sys_LV_CL_ConvertString("QuickSave"), comment);
+		} else {
+			Q_strncpyz(save.comment, comment, sizeof(save.comment));
+		}
+
+		SV_SetConfigstring(CS_SAVENAME, "");
+
+		save.version = SAVEGAME_STRUCT_VERSION;
+		save.type    = com_target_game->integer;
+		save.flags   = 0;
 
-		save.version = 3;
 		save.time = aclock;
-		strncpy( save.mapName, svs.mapName, sizeof( save.mapName ) );
-		strncpy( save.saveName, svs.gameName, sizeof( save.saveName ) );
+		Q_strncpyz(save.mapName, svs.mapName, sizeof(save.mapName));
+		Q_strncpyz(save.saveName, svs.gameName, sizeof(save.saveName));
 		save.mapTime = svs.time - svs.startTime;
 
-		FS_Write( &save, sizeof( savegamestruct_t ), f );
-		S_Save( f );
-		CM_WritePortalState( f );
-		FS_FCloseFile( f );
+		name = S_GetMusicFilename();
+		if (name) {
+			Q_strncpyz(save.tm_filename, name, sizeof(save.tm_filename));
+			save.tm_offset    = S_GetMusicOffset();
+			save.tm_loopcount = S_GetMusicLoopCount();
+		} else {
+			save.tm_filename[0] = 0;
+			save.tm_offset      = 0;
+			save.tm_loopcount   = 0;
+		}
 
-		name = Com_GetArchiveFileName( svs.gameName, "tga" );
-		Com_sprintf( cmdString, sizeof( cmdString ), "saveshot %s 256 256\n", name );
-		Cbuf_ExecuteText( svs.autosave != qfalse, name );
-	}
-	else
-	{
-		FS_FOpenFileRead( name, &f, qfalse, qtrue );
-		if( !f )
-		{
-			Com_Printf( "Couldn't read %s\n", name );
+		Com_SwapSaveStruct(&save);
+		FS_Write(&save, sizeof(savegamestruct_t), f);
+		S_Save(f);
+		CM_WritePortalState(f);
+		FS_FCloseFile(f);
+
+		name = Com_GetArchiveFileName(svs.gameName, "tga");
+		Com_sprintf(cmdString, sizeof(cmdString), "saveshot %s 256 256\n", name);
+		Cbuf_ExecuteText(svs.autosave ? EXEC_INSERT : EXEC_NOW, cmdString);
+	} else {
+		FS_FOpenFileRead(name, &f, qfalse, qtrue);
+		if (!f) {
+			Com_Printf("Couldn't read %s\n", name);
 			return qfalse;
 		}
 
-		FS_Read( &save, sizeof( savegamestruct_t ), f );
-		if( save.version != 3 )
-		{
+		FS_Read(&save, sizeof(savegamestruct_t), f);
+		Com_SwapSaveStruct(&save);
+		if (save.version != SAVEGAME_STRUCT_VERSION) {
 			Com_Printf("Invalid or Old Server SaveGame Version\n");
 			return qfalse;
 		}
 
-#ifdef CLIENT
-		S_StopAllSounds( qtrue );
-#endif
-		S_Load( f );
-		strncpy( svs.mapName, save.mapName, sizeof( svs.mapName ) );
-		svs.mapTime = save.mapTime;
+		S_StopAllSounds2(qtrue);
+		S_Load(f);
+		Q_strncpyz(svs.mapName, save.mapName, sizeof(svs.mapName));
+		svs.mapTime               = save.mapTime;
 		svs.areabits_warning_time = 0;
-		strcpy( svs.tm_filename, save.tm_filename );
+		Q_strncpyz(svs.tm_filename, save.tm_filename, sizeof(svs.tm_filename));
 		svs.tm_loopcount = save.tm_loopcount;
-		svs.tm_offset = save.tm_offset;
-		FS_FCloseFile( f );
+		svs.tm_offset    = save.tm_offset;
+		FS_FCloseFile(f);
 	}
 
 	return qtrue;
+#else
+	return qfalse;
+#endif
 }
 
 /*
@@ -1237,84 +2444,73 @@ qboolean SV_ArchiveServerFile( qboolean loading, qboolean autosave )
 SV_Loadgame_f
 ==================
 */
-void SV_Loadgame_f( void )
+void SV_Loadgame_f(void)
 {
-	int length;
+#ifndef DEDICATED
+	int         length;
 	const char *name;
 	const char *archive_name;
-	qboolean bStartedGame;
+	qboolean    bStartedGame;
 
-	if( com_cl_running && com_cl_running->integer &&
-#ifdef CLIENT
-		clc.state != CA_DISCONNECTED && cg_gametype->integer ||
-#endif
-		com_sv_running && com_sv_running->integer && g_gametype->integer )
-	{
-		Com_Printf( "Can't loadgame in a multiplayer game\n" );
+	if (com_cl_running && com_cl_running->integer && clc.state != CA_DISCONNECTED && cg_gametype->integer
+		|| com_sv_running && com_sv_running->integer && g_gametype->integer) {
+		Com_Printf("Can't loadgame in a multiplayer game\n");
 		return;
 	}
 
-	Cvar_Set( "g_gametype", "0" );
-	Cvar_Set( "sv_maxclients", "1" );
-	Cvar_Get( "g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO );
-	Cvar_Get( "sv_maxclients", "0", CVAR_LATCH | CVAR_SERVERINFO );
+	Cvar_Set("g_gametype", "0");
+	Cvar_Set("sv_maxclients", "1");
+	Cvar_Get("g_gametype", "0", CVAR_LATCH | CVAR_SERVERINFO);
+	Cvar_Get("sv_maxclients", "0", CVAR_LATCH | CVAR_SERVERINFO);
 
-	if( developer->integer )
-	{
-		if( svs.iNumClients == 1 )
-		{
-			Cvar_Set( "cheats", "1" );
-		}
-		else
-		{
-			Cvar_Set( "cheats", "0" );
+	if (!developer->integer) {
+		if (svs.iNumClients == 1) {
+			Cvar_Set("cheats", "1");
+		} else {
+			Cvar_Set("cheats", "0");
 		}
 	}
 
-	if( sv.state == SS_LOADING || sv.state == SS_LOADING2 )
-	{
-		Com_Printf( "Can't load game when loading\n" );
+	if (sv.state == SS_LOADING || sv.state == SS_LOADING2) {
+		Com_Printf("Can't load game when loading\n");
 		return;
 	}
 
-	if( Cmd_Argc() != 2 )
-	{
-		Com_Printf( "USAGE: loadgame <name>\n" );
+	if (Cmd_Argc() != 2) {
+		Com_Printf("USAGE: loadgame <name>\n");
 		return;
 	}
 
-	name = Cmd_Argv( 1 );
-	Com_Printf( "Loading game...%s\n", name );
-	if( strstr( name, ".." ) || strchr( name, '/' ) || strchr( name, '\\' ) ) {
-		Com_Printf( "Bad savedir.\n" );
+	name = Cmd_Argv(1);
+	Com_Printf("Loading game...%s\n", name);
+	if (strstr(name, "..") || strchr(name, '/') || strchr(name, '\\')) {
+		Com_Printf("Bad savedir.\n");
 	}
 
-	strcpy( svs.gameName, name );
-	archive_name = Com_GetArchiveFileName( name, "sav" );
+	Q_strncpyz(svs.gameName, name, sizeof(svs.gameName));
+	archive_name = Com_GetArchiveFileName(name, "sav");
 	Cvar_SaveGameRestart_f();
 
-	length = FS_ReadFileEx( archive_name, NULL, qtrue );
-	if( length == -1 )
-	{
-		Com_Printf( "Savegame not found.\n" );
+	length = FS_ReadFileEx(archive_name, NULL, qtrue);
+	if (length == -1) {
+		Com_Printf("Savegame not found.\n");
 		return;
 	}
 
-	if( !ge )
-	{
+	bStartedGame = qfalse;
+
+	if (!ge) {
 		SV_InitGameProgs();
 		bStartedGame = qtrue;
 	}
 
-	if( ge->LevelArchiveValid( archive_name ) && SV_ArchiveServerFile( qtrue, qfalse ) )
-	{
-		SV_SpawnServer( svs.mapName, qtrue, qfalse, qfalse );
+	if (ge->LevelArchiveValid(archive_name) && SV_ArchiveServerFile(qtrue, qfalse)) {
+		SV_SpawnServer(svs.mapName, qtrue, qfalse, qfalse);
 		svs.soundsNeedLoad = qtrue;
-	}
-	else if( bStartedGame )
-	{
+	} else if (bStartedGame) {
 		SV_ShutdownGameProgs();
 	}
+#endif
 }
 
 /*
@@ -1322,29 +2518,30 @@ void SV_Loadgame_f( void )
 SV_SavegameFilename
 ==================
 */
-void SV_SavegameFilename( const char *name, char *fileName, int length )
+void SV_SavegameFilename(const char *name, char *fileName, int length)
 {
-	int num;
+#ifndef DEDICATED
+	int         num;
 	const char *fname;
-	int lastNumber;
-	int len;
-	int a;
-	int b;
-	int c;
+	int         lastNumber;
+	int         len;
+	int         a;
+	int         b;
+	int         c;
 
-	for( num = 0; num < 10000; num++ )
-	{
-		a = num / 1000;
-		b = num % 1000 / 100;
-		c = num % 1000 % 100 / 10;
+	for (num = 0; num < 10000; num++) {
+		a          = num / 1000;
+		b          = num % 1000 / 100;
+		c          = num % 1000 % 100 / 10;
 		lastNumber = num % 1000 % 100 % 10;
-		Com_sprintf( fileName, length, "%s%i%i%i%i", name, a, b, c, lastNumber );
-		fname = Com_GetArchiveFileName( fileName, "ssv" );
-		len = FS_ReadFileEx( fname, NULL, qtrue );
-		if( len <= 0 ) {
+		Com_sprintf(fileName, length, "%s%i%i%i%i", name, a, b, c, lastNumber);
+		fname = Com_GetArchiveFileName(fileName, "ssv");
+		len   = FS_ReadFileEx(fname, NULL, qtrue);
+		if (len <= 0) {
 			break;
 		}
 	}
+#endif
 }
 
 /*
@@ -1352,47 +2549,37 @@ void SV_SavegameFilename( const char *name, char *fileName, int length )
 SV_AllowSaveGame
 ==================
 */
-qboolean SV_AllowSaveGame( void )
+qboolean SV_AllowSaveGame(void)
 {
-	if( !com_sv_running || !com_sv_running->integer )
-	{
-		Com_DPrintf( "You must be in a game with a server to save.\n" );
+#ifndef DEDICATED
+	if (!com_sv_running || !com_sv_running->integer) {
+		Com_DPrintf("You must be in a game with a server to save.\n");
 		return qfalse;
-	}
-	else if( !com_cl_running || !com_cl_running->integer )
-	{
-		Com_DPrintf( "You must be in a game with a client to save.\n" );
+	} else if (!com_cl_running || !com_cl_running->integer) {
+		Com_DPrintf("You must be in a game with a client to save.\n");
 		return qfalse;
-	}
-	else if( sv.state != SS_GAME )
-	{
-		Com_DPrintf( "You must be in game to save.\n" );
+	} else if (sv.state != SS_GAME) {
+		Com_DPrintf("You must be in game to save.\n");
 		return qfalse;
-	}
-#ifdef CLIENT
-	else if( clc.state != CA_DISCONNECTED && cg_gametype->integer )
-	{
-		Com_DPrintf( "Can't savegame in a multiplayer game\n" );
+	} else if (clc.state != CA_DISCONNECTED && cg_gametype->integer) {
+		Com_DPrintf("Can't savegame in a multiplayer game\n");
 		return qfalse;
-	}
-#endif
-	else if( g_gametype->integer )
-	{
-		Com_DPrintf( "Can't savegame in a multiplayer game\n" );
+	} else if (g_gametype->integer) {
+		Com_DPrintf("Can't savegame in a multiplayer game\n");
 		return qfalse;
-	}
-	else if( !svs.clients || svs.clients->gentity == NULL || svs.clients->gentity->client == NULL || !svs.clients->gentity->client->ps.stats[ 0 ] )
-	{
-		Com_DPrintf( "Can't savegame when dead\n" );
+	} else if (!svs.clients || svs.clients->gentity == NULL || svs.clients->gentity->client == NULL
+			   || !svs.clients->gentity->client->ps.stats[0]) {
+		Com_DPrintf("Can't savegame when dead\n");
 		return qfalse;
-	}
-	else if( sv.state == SS_LOADING || sv.state == SS_LOADING2 )
-	{
-		Com_DPrintf( "Can't save game when loading\n" );
+	} else if (sv.state == SS_LOADING || sv.state == SS_LOADING2) {
+		Com_DPrintf("Can't save game when loading\n");
 		return qfalse;
 	}
 
 	return qtrue;
+#else
+	return qfalse;
+#endif
 }
 
 /*
@@ -1404,14 +2591,17 @@ static qboolean bSavegame;
 
 qboolean SV_DoSaveGame()
 {
-	if( bSavegame )
-	{
-		if( SV_AllowSaveGame() ) {
+#ifndef DEDICATED
+	if (bSavegame) {
+		if (SV_AllowSaveGame()) {
 			return qtrue;
 		}
 		bSavegame = qfalse;
 	}
 	return qfalse;
+#else
+	return qfalse;
+#endif
 }
 
 /*
@@ -1419,51 +2609,53 @@ qboolean SV_DoSaveGame()
 SV_SaveGame
 ==================
 */
-void SV_SaveGame( const char *gamename, qboolean autosave )
+void SV_SaveGame(const char *gamename, qboolean autosave)
 {
+#ifndef DEDICATED
 	char *ptr;
-	char name[ 64 ];
-	char mname[ 64 ];
+	char  name[64];
+	char  mname[64];
 
-	if( !SV_AllowSaveGame() ) {
+	if (!SV_AllowSaveGame()) {
 		return;
 	}
 
-	if( gamename )
-	{
-		strcpy( name, gamename );
-	}
-	else
-	{
-		strcpy( mname, svs.mapName );
-		for( ptr = strchr( mname, '/' ); ptr != NULL; ptr = strchr( mname, '/' ) )
-		{
+	if (gamename) {
+		Q_strncpyz(name, gamename, sizeof(name));
+	} else {
+		Q_strncpyz(mname, svs.mapName, sizeof(mname));
+		for (ptr = strchr(mname, '/'); ptr != NULL; ptr = strchr(mname, '/')) {
 			*ptr = '_';
 		}
-		SV_SavegameFilename( mname, name, sizeof( name ) );
+		SV_SavegameFilename(mname, name, sizeof(name));
 	}
 
-	if( strstr( name, ".." ) || strchr( name, '/' ) || strchr( name, '\\' ) )
-	{
-		Com_DPrintf( "Bad savedir.\n" );
+	if (strstr(name, "..") || strchr(name, '/') || strchr(name, '\\')) {
+		Com_DPrintf("Bad savedir.\n");
 		return;
 	}
 
-	Com_Printf( "Saving to %s", name );
-	if( autosave ) {
-		Com_DPrintf( " (autosave)...\n" );
+	Com_Printf("Saving to %s", name);
+	if (autosave) {
+		Com_Printf(" (autosave)...\n");
 	} else {
-		Com_DPrintf( "...\n" );
+		Com_Printf("...\n");
 	}
 
-	strcpy( svs.gameName, name );
-	SV_ArchiveLevelFile( qfalse, autosave );
-	SV_ArchiveServerFile( qfalse, autosave );
-	Com_Printf( "Done.\n" );
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz(svs.gameName, name, sizeof(svs.gameName));
 
-#ifdef CLIENT
-	IN_MouseCancel();
+	if (!SV_ArchiveLevelFile(qfalse, autosave)) {
+		if (cls.savedCgameState) {
+			Z_Free(cls.savedCgameState);
+			cls.savedCgameState = 0;
+		}
+	}
+
+	SV_ArchiveServerFile(qfalse, autosave);
+
+	Com_Printf("Done.\n");
+
+	Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName));
 #endif
 }
 
@@ -1472,32 +2664,30 @@ void SV_SaveGame( const char *gamename, qboolean autosave )
 SV_Savegame_f
 ==================
 */
-static char savegame_name[ 64 ];
+static char savegame_name[64];
 
-void SV_Savegame_f( void )
+void SV_Savegame_f(void)
 {
+#ifndef DEDICATED
 	char *s;
 
-	if( !SV_AllowSaveGame() ) {
+	if (!SV_AllowSaveGame()) {
 		return;
 	}
 
-	if( Cmd_Argc() == 2 )
-	{
-
-		s = Cmd_Argv( 1 );
-		if( strlen( s ) >= sizeof( savegame_name ) ) {
+	if (Cmd_Argc() == 2) {
+		s = Cmd_Argv(1);
+		if (strlen(s) >= sizeof(savegame_name)) {
 			return;
 		}
 
-		strcpy( savegame_name, s );
-	}
-	else
-	{
-		savegame_name[ 0 ] = 0;
+		Q_strncpyz(savegame_name, s, sizeof(savegame_name));
+	} else {
+		savegame_name[0] = 0;
 	}
 
 	bSavegame = qtrue;
+#endif
 }
 
 /*
@@ -1505,23 +2695,24 @@ void SV_Savegame_f( void )
 SV_CheckSaveGame
 ==================
 */
-void SV_CheckSaveGame( void )
+void SV_CheckSaveGame(void)
 {
-	if( !SV_DoSaveGame() ) {
+#ifndef DEDICATED
+	if (!SV_DoSaveGame()) {
 		return;
 	}
 
-	if( cl.serverTime >= svs.time )
-	{
+	if (cl.serverTime >= svs.time) {
 		bSavegame = qfalse;
-		SV_SaveGame( savegame_name[ 0 ] ? savegame_name : NULL, qfalse );
-#ifdef CLIENT
+		SV_SaveGame(savegame_name[0] ? savegame_name : NULL, qfalse);
 		UI_SetupFiles();
-#endif
 	}
+#endif
 }
 
-void SV_Autosavegame_f( void )
+void SV_Autosavegame_f(void)
 {
-	SV_SaveGame( NULL, qtrue );
+#ifndef DEDICATED
+	SV_SaveGame(NULL, qtrue);
+#endif
 }
diff --git a/code/server/sv_client.c b/code/server/sv_client.c
index 5417f489..d56484f2 100644
--- a/code/server/sv_client.c
+++ b/code/server/sv_client.c
@@ -22,6 +22,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // sv_client.c -- server code for dealing with clients
 
 #include "server.h"
+#include "../gamespy/sv_gamespy.h"
+#include "../qcommon/bg_compat.h"
+
+static const unsigned int MAX_GAMESPY_IDS = (1 << 16);
+static unsigned int g_gamespyId = 1;
 
 static void SV_CloseDownload( client_t *cl );
 
@@ -41,103 +46,76 @@ to be sent to the authorize server.
 
 When an authorizeip is returned, a challenge response will be
 sent to that ip.
+
+ioquake3: we added a possibility for clients to add a challenge
+to their packets, to make it more difficult for malicious servers
+to hi-jack client connections.
+Also, the auth stuff is completely disabled for com_standalone games
+as well as IPv6 connections, since there is no way to use the
+v4-only auth server for these new types of connections.
 =================
 */
-void SV_GetChallenge( netadr_t from ) {
-	int		i;
-	int		oldest;
-	int		oldestTime;
+void SV_GetChallenge(netadr_t from)
+{
 	challenge_t	*challenge;
+	qboolean wasfound = qfalse;
 
 	// ignore if we are in single player
-	if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive")) {
+	// Removed in OPM
+	//  Allow servers to accept players in a single-player game
+	//if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER ) {
+	//	return;
+	//}
+
+	// Prevent using getchallenge as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
 		return;
 	}
 
-	oldest = 0;
-	oldestTime = 0x7fffffff;
-
-	// see if we already have a challenge for this ip
-	challenge = &svs.challenges[0];
-	for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++) {
-		if ( !challenge->connected && NET_CompareAdr( from, challenge->adr ) ) {
-			break;
-		}
-		if ( challenge->time < oldestTime ) {
-			oldestTime = challenge->time;
-			oldest = i;
-		}
+	// Allow getchallenge to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SV_GetChallenge: rate limit exceeded, dropping request\n" );
+		return;
 	}
 
-	if (i == MAX_CHALLENGES) {
-		// this is the first time this client has asked for a challenge
-		challenge = &svs.challenges[oldest];
+    challenge = FindChallenge(from, qtrue);
 
-		challenge->challenge = ( (rand() << 16) ^ rand() ) ^ svs.time;
-		challenge->adr = from;
-		challenge->firstTime = svs.time;
-		challenge->time = svs.time;
-		challenge->connected = qfalse;
-		i = oldest;
-	}
-
-	// if they are on a lan address, send the challengeResponse immediately
+    // if they are on a lan address, send the challengeResponse immediately
 
 	// we send the challengeResponse immediately as there is no AUTH server for us
 	// it's also way more cool this way :)
-//	if ( Sys_IsLANAddress( from ) ) {
+	if ( Sys_IsLANAddress( from ) ) {
 		challenge->pingTime = svs.time;
-		NET_OutOfBandPrint( NS_SERVER, from, "challengeResponse %i", challenge->challenge );
-		return;
-//	}
-
-	// look up the authorize server's IP
-	if ( !svs.authorizeAddress.ip[0] && svs.authorizeAddress.type != NA_BAD ) {
-		Com_Printf( "Resolving %s\n", AUTHORIZE_SERVER_NAME );
-		if ( !NET_StringToAdr( AUTHORIZE_SERVER_NAME, &svs.authorizeAddress, NA_IP ) ) {
-			Com_Printf( "Couldn't resolve address\n" );
-			return;
-		}
-		svs.authorizeAddress.port = BigShort( PORT_AUTHORIZE );
-		Com_Printf( "%s resolved to %i.%i.%i.%i:%i\n", AUTHORIZE_SERVER_NAME,
-			svs.authorizeAddress.ip[0], svs.authorizeAddress.ip[1],
-			svs.authorizeAddress.ip[2], svs.authorizeAddress.ip[3],
-			BigShort( svs.authorizeAddress.port ) );
-	}
-
-	// if they have been challenging for a long time and we
-	// haven't heard anything from the authorize server, go ahead and
-	// let them in, assuming the id server is down
-	if ( svs.time - challenge->firstTime > AUTHORIZE_TIMEOUT ) {
-		Com_DPrintf( "authorize server timed out\n" );
-
-		challenge->pingTime = svs.time;
-		NET_OutOfBandPrint( NS_SERVER, challenge->adr, 
-			"challengeResponse %i", challenge->challenge );
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge );
 		return;
 	}
 
-	// otherwise send their ip to the authorize server
-	if ( svs.authorizeAddress.type != NA_BAD ) {
-		cvar_t	*fs;
-		char	game[1024];
-
-		Com_DPrintf( "sending getIpAuthorize for %s\n", NET_AdrToString( from ));
-		
-		strcpy(game, BASEGAME);
-		fs = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
-		if (fs && fs->string[0] != 0) {
-			strcpy(game, fs->string);
-		}
-		
-		// the 0 is for backwards compatibility with obsolete sv_allowanonymous flags
-		// getIpAuthorize <challenge> <IP> <game> 0 <auth-flag>
-		NET_OutOfBandPrint( NS_SERVER, svs.authorizeAddress,
-			"getIpAuthorize %i %i.%i.%i.%i %s 0 %s",  svs.challenges[i].challenge,
-			from.ip[0], from.ip[1], from.ip[2], from.ip[3], game, sv_strictAuth->string );
+	if (com_protocol->integer < PROTOCOL_MOHTA_MIN) {
+		// mohaa below 2.0 doesn't handle gamespy key
+        // so send the challenge response directly
+        challenge->pingTime = svs.time;
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
+        return;
 	}
+
+    if (qtrue) {
+		// cdkey authorization is currently useless because gamespy as shut down
+		// however, it could be an useful feature for a far future
+		// where players could be authenticated
+        challenge->pingTime = svs.time;
+        SV_NET_OutOfBandPrint( &svs.netprofile, from, "challengeResponse %i", challenge->challenge);
+        return;
+	}
+
+	// check client's cd key
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "getKey %s", challenge->gsChallenge);
+	challenge->pingTime = svs.time;
 }
 
+#ifndef STANDALONE
 /*
 ====================
 SV_AuthorizeIpPacket
@@ -152,6 +130,7 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 	int		i;
 	char	*s;
 	char	*r;
+	challenge_t *challengeptr;
 
 	if ( !NET_CompareBaseAdr( from, svs.authorizeAddress ) ) {
 		Com_Printf( "SV_AuthorizeIpPacket: not from authorize server\n" );
@@ -169,44 +148,172 @@ void SV_AuthorizeIpPacket( netadr_t from ) {
 		Com_Printf( "SV_AuthorizeIpPacket: challenge not found\n" );
 		return;
 	}
+	
+	challengeptr = &svs.challenges[i];
 
 	// send a packet back to the original client
-	svs.challenges[i].pingTime = svs.time;
+	challengeptr->pingTime = svs.time;
 	s = Cmd_Argv( 2 );
 	r = Cmd_Argv( 3 );			// reason
 
 	if ( !Q_stricmp( s, "demo" ) ) {
 		// they are a demo client trying to connect to a real server
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nServer is not a demo server\n" );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nServer is not a demo server\n" );
 		// clear the challenge record so it won't timeout and let them through
-		Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
 		return;
 	}
 	if ( !Q_stricmp( s, "accept" ) ) {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, 
-			"challengeResponse %i", svs.challenges[i].challenge );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr,
+			"challengeResponse %d %d %d", challengeptr->challenge, challengeptr->clientChallenge, com_protocol->integer);
 		return;
 	}
 	if ( !Q_stricmp( s, "unknown" ) ) {
 		if (!r) {
-			NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nAwaiting CD key authorization\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nAwaiting CD key authorization\n" );
 		} else {
-			NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r);
+			SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\n%s\n", r);
 		}
 		// clear the challenge record so it won't timeout and let them through
-		Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+		Com_Memset( challengeptr, 0, sizeof( *challengeptr ) );
 		return;
 	}
 
 	// authorization failed
 	if (!r) {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\nSomeone is using this CD Key\n" );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\nSomeone is using this CD Key\n" );
 	} else {
-		NET_OutOfBandPrint( NS_SERVER, svs.challenges[i].adr, "print\n%s\n", r );
+		SV_NET_OutOfBandPrint( &svs.netprofile, challengeptr->adr, "print\n%s\n", r );
 	}
 
 	// clear the challenge record so it won't timeout and let them through
-	Com_Memset( &svs.challenges[i], 0, sizeof( svs.challenges[i] ) );
+	Com_Memset( challengeptr, 0, sizeof(*challengeptr) );
+}
+#endif
+
+/*
+==================
+SV_IsBanned
+
+Check whether a certain address is banned
+Returns the reason string if available
+==================
+*/
+
+static qboolean SV_IsBanned(netadr_t *from, qboolean isexception, char *reason, int reason_size)
+{
+	int index;
+	serverBan_t *curban;
+	
+	if(reason && reason_size > 0) {
+		reason[0] = '\0';
+	}
+	
+	if(!isexception)
+	{
+		// If this is a query for a ban, first check whether the client is excepted
+		if(SV_IsBanned(from, qtrue, NULL, 0))
+			return qfalse;
+	}
+	
+	for(index = 0; index < serverBansCount; index++)
+	{
+		curban = &serverBans[index];
+		
+		if(curban->isexception == isexception)
+		{
+			if(NET_CompareBaseAdrMask(curban->ip, *from, curban->subnet)) {
+				// Copy the ban reason if available and a buffer was provided
+				if(reason && reason_size > 0 && curban->reason[0]) {
+					Q_strncpyz(reason, curban->reason, reason_size);
+				}
+				return qtrue;
+			}
+		}
+	}
+	
+	return qfalse;
+}
+
+/*
+==================
+FindChallenge
+
+Find or create challenge, from the specified ip address
+==================
+*/
+challenge_t* FindChallenge(netadr_t from, qboolean connecting) {
+	int		i;
+	int		oldest;
+	int		oldestTime;
+	challenge_t	*challenge;
+
+	oldest = 0;
+	oldestTime = 0x7fffffff;
+
+	// see if we already have a challenge for this ip
+	challenge = &svs.challenges[0];
+	if (connecting) {
+		for (i = 0; i < MAX_CHALLENGES; i++, challenge++) {
+			if (!challenge->connected && NET_CompareAdr(from, challenge->adr)) {
+				break;
+			}
+			if (challenge->time < oldestTime) {
+				oldestTime = challenge->time;
+				oldest = i;
+			}
+		}
+	} else {
+		for (i = 0; i < MAX_CHALLENGES; i++, challenge++) {
+			if (NET_CompareAdr(from, challenge->adr)) {
+				break;
+			}
+			if (challenge->time < oldestTime) {
+				oldestTime = challenge->time;
+				oldest = i;
+			}
+		}
+	}
+
+	if (i == MAX_CHALLENGES) {
+		// this is the first time this client has asked for a challenge
+		challenge = &svs.challenges[oldest];
+
+		challenge->challenge = ( (rand() << 16) ^ rand() ) ^ svs.time;
+		challenge->adr = from;
+		challenge->firstTime = svs.time;
+		challenge->time = svs.time;
+		challenge->connected = qfalse;
+		challenge->cdkeyState = 0;
+
+		g_gamespyId = (g_gamespyId + 1) % MAX_GAMESPY_IDS;
+		challenge->gamespyId = g_gamespyId;
+		SV_CreateGamespyChallenge(challenge->gsChallenge);
+	}
+
+	return challenge;
+}
+
+/*
+==================
+SV_IsDemoClient
+
+Returns whether or not the client is using the demo version of the game
+==================
+*/
+
+qboolean SV_IsDemoClient(const char *userinfo)
+{
+	int version;
+
+	if (protocol_version_demo == protocol_version_full) {
+		// Older versions don't check for network demo
+		return qfalse;
+	}
+
+    version = atoi(Info_ValueForKey(userinfo, "protocol"));
+
+	return version == protocol_version_demo;
 }
 
 /*
@@ -217,16 +324,11 @@ A "connect" OOB command has been received
 ==================
 */
 
-#define PB_MESSAGE "PunkBuster Anti-Cheat software must be installed " \
-				"and Enabled in order to join this server. An updated game patch can be downloaded from " \
-				"www.idsoftware.com"
-
 void SV_DirectConnect( netadr_t from ) {
 	char		userinfo[MAX_INFO_STRING];
 	int			i;
 	client_t	*cl, *newcl;
-	// Make this a temp variable to avoid stack overflow issues
-	static client_t temp;
+	static client_t	temp; // static variable, otherwise it causes a stack overflow
 	gentity_t	*ent;
 	int			clientNum;
 	int			version;
@@ -240,12 +342,50 @@ void SV_DirectConnect( netadr_t from ) {
 #ifdef LEGACY_PROTOCOL
 	qboolean	compat = qfalse;
 #endif
+	challenge_t* ch;
+	char        banReason[MAX_REASON_LENGTH];
 
-	Com_DPrintf( "SVC_DirectConnect ()\n" );
+	Com_DPrintf ("SVC_DirectConnect ()\n");
+	
+	// Check whether this client is banned.
+	if(SV_IsBanned(&from, qfalse, banReason, sizeof(banReason)))
+	{
+		if(banReason[0]) {
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\nReason: %s\n", banReason);
+		} else {
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nYou are banned from this server.\n");
+		}
+		return;
+	}
 
-	Q_strncpyz( userinfo, Cmd_Argv( 1 ), sizeof( userinfo ) );
+	Q_strncpyz( userinfo, Cmd_Argv(1), sizeof(userinfo) );
 
-	version = atoi( Info_ValueForKey( userinfo, "protocol" ) );
+	if (com_target_game->integer >= TG_MOHTT) {
+		const char* clientType;
+
+		clientType = Info_ValueForKey(userinfo, "clientType");
+		// Added in 2.30
+		//  Only allow breakthrough clients when targeting mohaab
+		if (strcmp(clientType, "Breakthrough")) {
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nRequires Medal of Honor Allied Assault Breakthrough\n");
+			Com_DPrintf("    rejected connect - only Breakthrough clients allowed.\n");
+			return;
+		}
+    }
+
+    version = atoi(Info_ValueForKey(userinfo, "protocol"));
+
+	if (!com_target_demo->integer && SV_IsDemoClient(userinfo)) {
+        SV_NET_OutOfBandPrint(&svs.netprofile, from, "print\nThe Multiplayer Demo can not connect to full version games.\n");
+		Com_DPrintf("    rejected connect from version %i\n", version);
+		return;
+    }
+
+    if (com_target_demo->integer && version == protocol_version_full) {
+		// Make sure to make the full game compatible with the demo game protocol
+        version = com_protocol->integer;
+    }
+	
 #ifdef LEGACY_PROTOCOL
 	if(version > 0 && com_legacyprotocol->integer == version)
 		compat = qtrue;
@@ -254,7 +394,7 @@ void SV_DirectConnect( netadr_t from ) {
 	{
 		if(version != com_protocol->integer)
 		{
-			NET_OutOfBandPrint(NS_SERVER, from, "print\nServer uses protocol version %i "
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nServer uses protocol version %i "
 					   "(yours is %i).\n", com_protocol->integer, version);
 			Com_DPrintf("    rejected connect from version %i\n", version);
 			return;
@@ -287,50 +427,62 @@ void SV_DirectConnect( netadr_t from ) {
 	else
 		ip = (char *)NET_AdrToString( from );
 	if( ( strlen( ip ) + strlen( userinfo ) + 4 ) >= MAX_INFO_STRING ) {
-		NET_OutOfBandPrint( NS_SERVER, from,
-			"print\nUserinfo string length exceeded.  "
+		SV_NET_OutOfBandPrint( &svs.netprofile, from,
+			"droperror\nUserinfo string length exceeded.  "
 			"Try removing setu cvars from your config.\n" );
 		return;
 	}
 	Info_SetValueForKey( userinfo, "ip", ip );
 
 	// see if the challenge is valid (LAN clients don't need to challenge)
-	if ( !NET_IsLocalAddress (from) ) {
-		int		ping;
+	if (!NET_IsLocalAddress(from))
+	{
+		int ping;
+		challenge_t *challengeptr;
 
-		for (i=0 ; i<MAX_CHALLENGES ; i++) {
-			if (NET_CompareAdr(from, svs.challenges[i].adr)) {
-				if ( challenge == svs.challenges[i].challenge ) {
-					break;		// good
-				}
+		for (i=0; i<MAX_CHALLENGES; i++)
+		{
+			if (NET_CompareAdr(from, svs.challenges[i].adr))
+			{
+				if(challenge == svs.challenges[i].challenge)
+					break;
 			}
 		}
-		if (i == MAX_CHALLENGES) {
-			NET_OutOfBandPrint( NS_SERVER, from, "print\nNo or bad challenge for address.\n" );
+
+		if (i == MAX_CHALLENGES)
+		{
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nNo or bad challenge for your address.\n" );
+			return;
+		}
+	
+		challengeptr = &svs.challenges[i];
+		
+		if(challengeptr->wasrefused)
+		{
+			// Return silently, so that error messages written by the server keep being displayed.
 			return;
 		}
 
-		ping = svs.time - svs.challenges[i].pingTime;
-		Com_Printf( "Client %i connecting with %i challenge ping\n", i, ping );
-		svs.challenges[i].connected = qtrue;
+		ping = svs.time - challengeptr->pingTime;
 
 		// never reject a LAN client based on ping
 		if ( !Sys_IsLANAddress( from ) ) {
 			if ( sv_minPing->value && ping < sv_minPing->value ) {
-				// don't let them keep trying until they get a big delay
-				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for high pings only\n" );
+				SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nServer is for high pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too low ping\n", i);
-				// reset the address otherwise their ping will keep increasing
-				// with each connect message and they'd eventually be able to connect
-				svs.challenges[i].adr.port = 0;
+				challengeptr->wasrefused = qtrue;
 				return;
 			}
 			if ( sv_maxPing->value && ping > sv_maxPing->value ) {
-				NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is for low pings only\n" );
+				SV_NET_OutOfBandPrint( &svs.netprofile, from, "print\nServer is for low pings only\n" );
 				Com_DPrintf ("Client %i rejected on a too high ping\n", i);
+				challengeptr->wasrefused = qtrue;
 				return;
 			}
 		}
+
+		Com_Printf("Client %i connecting with %i challenge ping\n", i, ping);
+		challengeptr->connected = qtrue;
 	}
 
 	newcl = &temp;
@@ -369,7 +521,7 @@ void SV_DirectConnect( netadr_t from ) {
 
 	// check for privateClient password
 	password = Info_ValueForKey( userinfo, "password" );
-	if ( !strcmp( password, sv_privatePassword->string ) ) {
+	if ( *password && !strcmp( password, sv_privatePassword->string ) ) {
 		startIndex = 0;
 	} else {
 		// skip past the reserved slots
@@ -405,7 +557,7 @@ void SV_DirectConnect( netadr_t from ) {
 			}
 		}
 		else {
-			NET_OutOfBandPrint( NS_SERVER, from, "print\nServer is full.\n" );
+			SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\nServer is full.\n" );
 			Com_DPrintf ("Rejected a connection.\n");
 			return;
 		}
@@ -423,6 +575,7 @@ gotnewcl:
 	clientNum = newcl - svs.clients;
 	ent = SV_GentityNum( clientNum );
 	newcl->gentity = ent;
+	newcl->number_of_server_sounds = 0;
 
 	// save the challenge
 	newcl->challenge = challenge;
@@ -441,28 +594,36 @@ gotnewcl:
 	Q_strncpyz( newcl->userinfo, userinfo, sizeof( newcl->userinfo ) );
 
 	// get the game a chance to reject this connection or modify the userinfo
-	denied = ge->ClientConnect( clientNum, qtrue );
-
+	denied = ge->ClientConnect( clientNum, qtrue, qfalse );
 	if ( denied ) {
-		NET_OutOfBandPrint( NS_SERVER, from, "print\n%s\n", denied );
-		Com_DPrintf( "Game rejected a connection: %s.\n", denied );
+		SV_NET_OutOfBandPrint( &svs.netprofile, from, "droperror\n%s\n", denied );
+		Com_DPrintf ( "Game rejected a connection: %s.\n", denied );
 		return;
 	}
 
+	ch = FindChallenge(from, qfalse);
+	if (ch) {
+		newcl->gamespyId = ch->gamespyId;
+	}
+
 	SV_UserinfoChanged( newcl );
 
+	if (sv_netprofile->integer) {
+		SV_NET_UpdateClientNetProfileInfo(&newcl->netprofile, newcl->rate);
+	}
+
 	// send the connect packet to the client
-	NET_OutOfBandPrint( NS_SERVER, from, "connectResponse" );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "connectResponse %d", challenge);
 
 	Com_DPrintf( "Going from CS_FREE to CS_CONNECTED for %s\n", newcl->name );
 
 	newcl->state = CS_CONNECTED;
-	if (sv_maxclients->integer > 1) {
-		newcl->nextSnapshotTime = svs.time + 800;
+	if (svs.iNumClients > 1) {
+		newcl->lastSnapshotTime = 0;
 		newcl->lastPacketTime = svs.time + 800;
 		newcl->lastConnectTime = svs.time + 800;
 	} else {
-		newcl->nextSnapshotTime = svs.time + 300;
+		newcl->lastSnapshotTime = 0;
 		newcl->lastPacketTime = svs.time + 300;
 		newcl->lastConnectTime = svs.time + 300;
 	}
@@ -492,23 +653,23 @@ SV_FreeClient
 Destructor for data allocated in a client structure
 =====================
 */
-void SV_FreeClient(client_t* client)
+void SV_FreeClient(client_t *client)
 {
 #ifdef USE_VOIP
-    int index;
-
-    for (index = client->queuedVoipIndex; index < client->queuedVoipPackets; index++)
-    {
-        index %= ARRAY_LEN(client->voipPacket);
-
-        Z_Free(client->voipPacket[index]);
-    }
-
-    client->queuedVoipPackets = 0;
+	int index;
+	
+	for(index = client->queuedVoipIndex; index < client->queuedVoipPackets; index++)
+	{
+		index %= ARRAY_LEN(client->voipPacket);
+		
+		Z_Free(client->voipPacket[index]);
+	}
+	
+	client->queuedVoipPackets = 0;
 #endif
 
-    SV_Netchan_FreeQueue(client);
-    SV_CloseDownload(client);
+	SV_Netchan_FreeQueue(client);
+	SV_CloseDownload(client);
 }
 
 /*
@@ -523,35 +684,42 @@ or crashing -- SV_FinalMessage() will handle that
 void SV_DropClient( client_t *drop, const char *reason ) {
 	int		i;
 	challenge_t	*challenge;
+	const qboolean isBot = drop->netchan.remoteAddress.type == NA_BOT;
 
 	if ( drop->state == CS_ZOMBIE ) {
 		return;		// already dropped
 	}
 
-	if (drop->netchan.remoteAddress.type != NA_BOT) {
+	if ( !isBot ) {
 		// see if we already have a challenge for this ip
 		challenge = &svs.challenges[0];
 
-		for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++) {
-			if ( NET_CompareAdr( drop->netchan.remoteAddress, challenge->adr ) ) {
-				challenge->connected = qfalse;
+		for (i = 0 ; i < MAX_CHALLENGES ; i++, challenge++)
+		{
+			if(NET_CompareAdr(drop->netchan.remoteAddress, challenge->adr))
+			{
+				Com_Memset(challenge, 0, sizeof(*challenge));
 				break;
 			}
 		}
-    }
+	}
 
-    // Free all allocated data on the client structure
-    SV_FreeClient(drop);
+	// Free all allocated data on the client structure
+	SV_FreeClient(drop);
+
+	// Reset the reliable sequence to the currently acknowledged command
+	// This prevents SV_AddServerCommand() from making another recursive call to SV_DropClient()
+	// if the client lacks sufficient space for another reliable command
+	// it also guarantees that the client receives both the print and disconnect commands
+	drop->reliableSequence = drop->reliableAcknowledge;
+	// Setting the gamestate message number to -1 ensures that SV_AddServerCommand()
+	// will not call SV_DropClient() again, even though it is unlikely the client
+	// will receive many server commands during the drop
+	drop->gamestateMessageNum = -1;
 
 	// tell everyone why they got dropped
 	SV_SendServerCommand( NULL, "print \"%s %s\n\"", drop->name, reason );
 
-
-	if (drop->download)	{
-		FS_FCloseFile( drop->download );
-		drop->download = 0;
-	}
-
 	// call the prog function for removing a client
 	// this will remove the body, among other things
 	ge->ClientDisconnect( ( gentity_t * )SV_GentityNum( drop - svs.clients ) );
@@ -559,11 +727,18 @@ void SV_DropClient( client_t *drop, const char *reason ) {
 	// add the disconnect command
 	SV_SendServerCommand( drop, "disconnect \"%s\"", reason);
 
+	if ( isBot ) {
+		//SV_BotFreeClient( drop - svs.clients );
+
+		// bots shouldn't go zombie, as there's no real net connection.
+		drop->state = CS_FREE;
+	} else {
+		Com_DPrintf( "Going to CS_ZOMBIE for %s\n", drop->name );
+		drop->state = CS_ZOMBIE;		// become free in a few seconds
+	}
+
 	// nuke user info
 	SV_SetUserinfo( drop - svs.clients, "" );
-	
-	Com_DPrintf( "Going to CS_ZOMBIE for %s\n", drop->name );
-	drop->state = CS_ZOMBIE;		// become free in a few seconds
 
 	// if this was the last client on the server, send a heartbeat
 	// to the master so it is known the server is empty
@@ -590,12 +765,16 @@ It will be resent if the client acknowledges a later message but has
 the wrong gamestate.
 ================
 */
-void SV_SendClientGameState( client_t *client ) {
+static void SV_SendClientGameState( client_t *client ) {
 	int			start;
 	entityState_t	*base, nullstate;
 	msg_t		msg;
 	byte		msgBuffer[MAX_MSGLEN];
 
+    if (sv_serverid->integer != sv.serverId) {
+        Cvar_Set("sv_serverid", va("%i", sv.serverId));
+    }
+
 	if ( client->state != CS_CONNECTED && g_gametype->integer == GT_SINGLE_PLAYER ) {
 		Com_Printf( "SV_SendClientGameState: Aborting\n" );
 		return;
@@ -624,7 +803,7 @@ void SV_SendClientGameState( client_t *client ) {
 	SV_UpdateServerCommandsToClient( client, &msg );
 
 	// send the gamestate
-	MSG_WriteSVC( &msg, svc_gamestate );
+    MSG_WriteSVC( &msg, svc_gamestate );
 	MSG_WriteLong( &msg, client->reliableSequence );
 
 	// write the configstrings
@@ -653,7 +832,7 @@ void SV_SendClientGameState( client_t *client ) {
 	MSG_WriteLong( &msg, client - svs.clients);
 
 	// write the checksum feed
-	MSG_WriteLong( &msg, 0);
+	MSG_WriteLong( &msg, sv.checksumFeed);
 
 	// write the server frametime to the client (only on TA/TT)
 	MSG_WriteServerFrameTime(&msg, sv.frameTime);
@@ -686,11 +865,22 @@ void SV_ClientEnterWorld( client_t *client, usercmd_t *cmd ) {
 	client->gentity = ent;
 
 	client->deltaMessage = -1;
-	client->nextSnapshotTime = svs.time;	// generate a snapshot immediately
-	client->lastUsercmd = *cmd;
+	client->lastSnapshotTime = 0;	// generate a snapshot immediately
+
+	if(cmd)
+		memcpy(&client->lastUsercmd, cmd, sizeof(client->lastUsercmd));
+	else
+		memset(&client->lastUsercmd, '\0', sizeof(client->lastUsercmd));
 
 	// call the game begin function
 	ge->ClientBegin( ( gentity_t * )ent, cmd );
+
+	//
+	// Added in OPM
+	//  In a dedicated server, start the game when the first client enters the game
+	if (com_dedicated->integer) {
+		SV_ServerLoaded();
+	}
 }
 
 /*
@@ -721,7 +911,7 @@ static void SV_CloseDownload( client_t *cl ) {
 	// Free the temporary buffer space
 	for (i = 0; i < MAX_DOWNLOAD_WINDOW; i++) {
 		if (cl->downloadBlocks[i]) {
-			Z_Free( cl->downloadBlocks[i] );
+			Z_Free(cl->downloadBlocks[i]);
 			cl->downloadBlocks[i] = NULL;
 		}
 	}
@@ -735,7 +925,7 @@ SV_StopDownload_f
 Abort a download if in progress
 ==================
 */
-void SV_StopDownload_f( client_t *cl ) {
+static void SV_StopDownload_f( client_t *cl ) {
 	if (*cl->downloadName)
 		Com_DPrintf( "clientDownload: %d : file \"%s\" aborted\n", (int) (cl - svs.clients), cl->downloadName );
 
@@ -749,7 +939,10 @@ SV_DoneDownload_f
 Downloads are finished
 ==================
 */
-void SV_DoneDownload_f( client_t *cl ) {
+static void SV_DoneDownload_f( client_t *cl ) {
+	if ( cl->state == CS_ACTIVE )
+		return;
+
 	Com_DPrintf( "clientDownload: %s Done\n", cl->name);
 	// resend the game state to update any clients that entered during the download
 	SV_SendClientGameState(cl);
@@ -763,7 +956,7 @@ The argument will be the last acknowledged block from the client, it should be
 the same as cl->downloadClientBlock
 ==================
 */
-void SV_NextDownload_f( client_t *cl )
+static void SV_NextDownload_f( client_t *cl )
 {
 	int block = atoi( Cmd_Argv(1) );
 
@@ -792,7 +985,7 @@ void SV_NextDownload_f( client_t *cl )
 SV_BeginDownload_f
 ==================
 */
-void SV_BeginDownload_f( client_t *cl ) {
+static void SV_BeginDownload_f( client_t *cl ) {
 
 	// Kill any existing download
 	SV_CloseDownload( cl );
@@ -807,15 +1000,13 @@ void SV_BeginDownload_f( client_t *cl ) {
 SV_WriteDownloadToClient
 
 Check to see if the client wants a file, open it if needed and start pumping the client
-Fill up msg with data 
+Fill up msg with data, return number of download blocks added
 ==================
 */
-int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
+int SV_WriteDownloadToClient(client_t *cl, msg_t *msg)
 {
 	int curindex;
-	int rate;
-	int blockspersnap;
-	int idPack = 0, missionPack = 0, unreferenced = 1;
+	int unreferenced = 1;
 	char errorMessage[1024];
 	char pakbuf[MAX_QPATH], *pakptr;
 	int numRefPaks;
@@ -823,10 +1014,16 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 	if (!*cl->downloadName)
 		return 0;	// Nothing being downloaded
 
-	if (!cl->download) {
+	if(!cl->download)
+	{
+		qboolean idPack = qfalse;
+		#ifndef STANDALONE
+		qboolean missionPack = qfalse;
+		#endif
+	
  		// Chop off filename extension.
 		Com_sprintf(pakbuf, sizeof(pakbuf), "%s", cl->downloadName);
-		pakptr = Q_strrchr(pakbuf, '.');
+		pakptr = strrchr(pakbuf, '.');
 		
 		if(pakptr)
 		{
@@ -850,8 +1047,11 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 
 						// now that we know the file is referenced,
 						// check whether it's legal to download it.
-						missionPack = FS_idPak(pakbuf, "missionpack");
-						idPack = missionPack || FS_idPak(pakbuf, BASEGAME);
+#ifndef STANDALONE
+						//missionPack = FS_idPak(pakbuf, BASETA, NUM_TA_PAKS);
+						//idPack = missionPack;
+#endif
+						//idPack = idPack || FS_idPak(pakbuf, BASEGAME, NUM_ID_PAKS);
 
 						break;
 					}
@@ -859,11 +1059,13 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			}
 		}
 
+		cl->download = 0;
+
 		// We open the file here
 		if ( !(sv_allowDownload->integer & DLF_ENABLE) ||
 			(sv_allowDownload->integer & DLF_NO_UDP) ||
 			idPack || unreferenced ||
-			( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) <= 0 ) {
+			( cl->downloadSize = FS_SV_FOpenFileRead( cl->downloadName, &cl->download ) ) < 0 ) {
 			// cannot auto-download file
 			if(unreferenced)
 			{
@@ -872,18 +1074,22 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			}
 			else if (idPack) {
 				Com_Printf("clientDownload: %d : \"%s\" cannot download id pk3 files\n", (int) (cl - svs.clients), cl->downloadName);
-				if (missionPack) {
+#ifndef STANDALONE
+				if(missionPack)
+				{
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload Team Arena file \"%s\"\n"
 									"The Team Arena mission pack can be found in your local game store.", cl->downloadName);
 				}
-				else {
+				else
+#endif
+				{
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Cannot autodownload id pk3 file \"%s\"", cl->downloadName);
 				}
 			}
 			else if ( !(sv_allowDownload->integer & DLF_ENABLE) ||
 				(sv_allowDownload->integer & DLF_NO_UDP) ) {
 
-				Com_Printf("clientDownload: %d : \"%s\" download disabled", (int) (cl - svs.clients), cl->downloadName);
+				Com_Printf("clientDownload: %d : \"%s\" download disabled\n", (int) (cl - svs.clients), cl->downloadName);
 				if (sv_pure->integer) {
 					Com_sprintf(errorMessage, sizeof(errorMessage), "Could not download \"%s\" because autodownloading is disabled on the server.\n\n"
 										"You will need to get this file elsewhere before you "
@@ -906,6 +1112,10 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 			MSG_WriteString( msg, errorMessage );
 
 			*cl->downloadName = 0;
+			
+			if(cl->download)
+				FS_FCloseFile(cl->download);
+			
 			return 1;
 		}
  
@@ -924,7 +1134,7 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 		curindex = (cl->downloadCurrentBlock % MAX_DOWNLOAD_WINDOW);
 
 		if (!cl->downloadBlocks[curindex])
-			cl->downloadBlocks[curindex] = Z_Malloc( MAX_DOWNLOAD_BLKSIZE );
+			cl->downloadBlocks[curindex] = Z_Malloc(MAX_DOWNLOAD_BLKSIZE);
 
 		cl->downloadBlockSize[curindex] = FS_Read( cl->downloadBlocks[curindex], MAX_DOWNLOAD_BLKSIZE, cl->download );
 
@@ -951,75 +1161,42 @@ int SV_WriteDownloadToClient( client_t *cl , msg_t *msg )
 		cl->downloadEOF = qtrue;  // We have added the EOF block
 	}
 
-	// Loop up to window size times based on how many blocks we can fit in the
-	// client snapMsec and rate
+	if (cl->downloadClientBlock == cl->downloadCurrentBlock)
+		return 0; // Nothing to transmit
 
-	// based on the rate, how many bytes can we fit in the snapMsec time of the client
-	// normal rate / snapshotMsec calculation
-	rate = cl->rate;
-	if ( sv_maxRate->integer ) {
-		if ( sv_maxRate->integer < 1000 ) {
-			Cvar_Set( "sv_MaxRate", "1000" );
-		}
-		if ( sv_maxRate->integer < rate ) {
-			rate = sv_maxRate->integer;
-		}
+	// Write out the next section of the file, if we have already reached our window,
+	// automatically start retransmitting
+	if (cl->downloadXmitBlock == cl->downloadCurrentBlock)
+	{
+		// We have transmitted the complete window, should we start resending?
+		if (svs.time - cl->downloadSendTime > 1000)
+			cl->downloadXmitBlock = cl->downloadClientBlock;
+		else
+			return 0;
 	}
 
-	if (!rate) {
-		blockspersnap = 1;
-	} else {
-		blockspersnap = ( (rate * cl->snapshotMsec) / 1000 + MAX_DOWNLOAD_BLKSIZE ) /
-			MAX_DOWNLOAD_BLKSIZE;
-	}
+	// Send current block
+	curindex = (cl->downloadXmitBlock % MAX_DOWNLOAD_WINDOW);
 
-	if (blockspersnap < 0)
-		blockspersnap = 1;
+	MSG_WriteByte( msg, svc_download );
+	MSG_WriteShort( msg, cl->downloadXmitBlock );
 
-	while (blockspersnap--) {
+	// block zero is special, contains file size
+	if ( cl->downloadXmitBlock == 0 )
+		MSG_WriteLong( msg, cl->downloadSize );
 
-		// Write out the next section of the file, if we have already reached our window,
-		// automatically start retransmitting
+	MSG_WriteShort( msg, cl->downloadBlockSize[curindex] );
 
-		if (cl->downloadClientBlock == cl->downloadCurrentBlock)
-			return 0; // Nothing to transmit
+	// Write the block
+	if(cl->downloadBlockSize[curindex])
+		MSG_WriteData(msg, cl->downloadBlocks[curindex], cl->downloadBlockSize[curindex]);
 
-		if (cl->downloadXmitBlock == cl->downloadCurrentBlock) {
-			// We have transmitted the complete window, should we start resending?
+	Com_DPrintf( "clientDownload: %d : writing block %d\n", (int) (cl - svs.clients), cl->downloadXmitBlock );
 
-			//FIXME:  This uses a hardcoded one second timeout for lost blocks
-			//the timeout should be based on client rate somehow
-			if (svs.time - cl->downloadSendTime > 1000)
-				cl->downloadXmitBlock = cl->downloadClientBlock;
-			else
-				return 0;
-		}
-
-		// Send current block
-		curindex = (cl->downloadXmitBlock % MAX_DOWNLOAD_WINDOW);
-
-		MSG_WriteByte( msg, svc_download );
-		MSG_WriteShort( msg, cl->downloadXmitBlock );
-
-		// block zero is special, contains file size
-		if ( cl->downloadXmitBlock == 0 )
-			MSG_WriteLong( msg, (int)cl->downloadSize );
- 
-		MSG_WriteShort( msg, ( short )cl->downloadBlockSize[curindex] );
-
-		// Write the block
-		if ( cl->downloadBlockSize[curindex] ) {
-			MSG_WriteData( msg, cl->downloadBlocks[curindex], cl->downloadBlockSize[curindex] );
-		}
-
-		Com_DPrintf( "clientDownload: %d : writing block %d\n", (int) (cl - svs.clients), cl->downloadXmitBlock );
-
-		// Move on to the next block
-		// It will get sent with next snap shot.  The rate will keep us in line.
-		cl->downloadXmitBlock++;
-
-		cl->downloadSendTime = svs.time;
-	}
+	// Move on to the next block
+	// It will get sent with next snap shot.  The rate will keep us in line.
+	cl->downloadXmitBlock++;
+	cl->downloadSendTime = svs.time;
 
 	return 1;
 }
@@ -1133,15 +1310,18 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 	//
 	if ( sv_pure->integer != 0 ) {
 
-		bGood = qtrue;
 		nChkSum1 = nChkSum2 = 0;
+		/*
 		// we run the game, so determine which cgame and ui the client "should" be running
 		bGood = (FS_FileIsInPAK("vm/cgame.qvm", &nChkSum1) == 1);
 		if (bGood)
 			bGood = (FS_FileIsInPAK("vm/ui.qvm", &nChkSum2) == 1);
+			*/
 
 		nClientPaks = Cmd_Argc();
 
+		nCurArg = 1;
+		/*
 		// start at arg 2 ( skip serverId cl_paks )
 		nCurArg = 1;
 
@@ -1160,10 +1340,12 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 				return;
 			}
 		}
+		*/
 	
 		// we basically use this while loop to avoid using 'goto' :)
 		while (bGood) {
 
+			/*
 			// must be at least 6: "cl_paks cgame ui @ firstref ... numChecksums"
 			// numChecksums is encoded
 			if (nClientPaks < 6) {
@@ -1188,6 +1370,7 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 				bGood = qfalse;
 				break;
 			}
+			*/
 			// store checksums since tokenization is not re-entrant
 			for (i = 0; nCurArg < nClientPaks; i++) {
 				nClientChkSum[i] = atoi(Cmd_Argv(nCurArg++));
@@ -1262,7 +1445,7 @@ static void SV_VerifyPaks_f( client_t *cl ) {
 		} 
 		else {
 			cl->pureAuthentic = 0;
-			cl->nextSnapshotTime = -1;
+			cl->lastSnapshotTime = 0;
 			cl->state = CS_ACTIVE;
 			SV_SendClientSnapshot( cl );
 			SV_DropClient( cl, "Unpure client detected. Invalid .PK3 files referenced!" );
@@ -1292,7 +1475,7 @@ void SV_UserinfoChanged( client_t *cl ) {
 	char	*val;
 	char	*ip;
 	int		i;
-	size_t len;
+	int	len;
 
 	// name for C code
 	Q_strncpyz( cl->name, Info_ValueForKey (cl->userinfo, "name"), sizeof(cl->name) );
@@ -1327,17 +1510,39 @@ void SV_UserinfoChanged( client_t *cl ) {
 
 	// snaps command
 	val = Info_ValueForKey (cl->userinfo, "snaps");
-	if (strlen(val)) {
+
+	if(strlen(val))
+	{
 		i = atoi(val);
-		if ( i < 1 ) {
+		
+		if(i < 1)
 			i = 1;
-		} else if ( i > sv_fps->integer ) {
+		else if(i > sv_fps->integer)
 			i = sv_fps->integer;
-		}
-		cl->snapshotMsec = 1000/i;
-	} else {
-		cl->snapshotMsec = 50;
+
+		i = 1000 / i;
 	}
+	else
+		i = 50;
+
+	if(i != cl->snapshotMsec)
+	{
+		// Reset last sent snapshot so we avoid desync between server frame time and snapshot send time
+		cl->lastSnapshotTime = 0;
+		cl->snapshotMsec = i;		
+	}
+	
+#ifdef USE_VOIP
+#ifdef LEGACY_PROTOCOL
+	if(cl->compat)
+		cl->hasVoip = qfalse;
+	else
+#endif
+	{
+		val = Info_ValueForKey(cl->userinfo, "cl_voipProtocol");
+		cl->hasVoip = !Q_stricmp( val, "opus" );
+	}
+#endif
 	
 	// TTimo
 	// maintain the IP information
@@ -1367,17 +1572,49 @@ SV_UpdateUserinfo_f
 ==================
 */
 static void SV_UpdateUserinfo_f( client_t *cl ) {
-	Q_strncpyz( cl->userinfo, Cmd_Argv( 1 ), sizeof( cl->userinfo ) );
+	Q_strncpyz( cl->userinfo, Cmd_Argv(1), sizeof(cl->userinfo) );
 
 	SV_UserinfoChanged( cl );
-
 	// call prog code to allow overrides
 	ge->ClientUserinfoChanged( ( gentity_t * )SV_GentityNum( cl - svs.clients ), cl->userinfo );
 }
 
+
+#ifdef USE_VOIP
+static
+void SV_UpdateVoipIgnore(client_t *cl, const char *idstr, qboolean ignore)
+{
+	if ((*idstr >= '0') && (*idstr <= '9')) {
+		const int id = atoi(idstr);
+		if ((id >= 0) && (id < MAX_CLIENTS)) {
+			cl->ignoreVoipFromClient[id] = ignore;
+		}
+	}
+}
+
+/*
+==================
+SV_Voip_f
+==================
+*/
+static void SV_Voip_f( client_t *cl ) {
+	const char *cmd = Cmd_Argv(1);
+	if (strcmp(cmd, "ignore") == 0) {
+		SV_UpdateVoipIgnore(cl, Cmd_Argv(2), qtrue);
+	} else if (strcmp(cmd, "unignore") == 0) {
+		SV_UpdateVoipIgnore(cl, Cmd_Argv(2), qfalse);
+	} else if (strcmp(cmd, "muteall") == 0) {
+		cl->muteAllVoip = qtrue;
+	} else if (strcmp(cmd, "unmuteall") == 0) {
+		cl->muteAllVoip = qfalse;
+	}
+}
+#endif
+
+
 typedef struct {
 	char	*name;
-	void	( *func )( client_t *cl );
+	void	(*func)( client_t *cl );
 } ucmd_t;
 
 static ucmd_t ucmds[] = {
@@ -1390,6 +1627,10 @@ static ucmd_t ucmds[] = {
 	{"stopdl", SV_StopDownload_f},
 	{"donedl", SV_DoneDownload_f},
 
+#ifdef USE_VOIP
+	{"voip", SV_Voip_f},
+#endif
+
 	{NULL, NULL}
 };
 
@@ -1415,26 +1656,25 @@ void SV_ExecuteClientCommand( client_t *cl, const char *s, qboolean clientOK ) {
 		}
 	}
 
-	//if (!Q_stricmp(s, "dmmessage")) {
-	// 2.0 has it wrong, it uses Q_stricmp, but it never works
-	// because `s` is the full command string with arguments
-	if (!Q_stricmpn(s, "dmmessage ", 10)) {
-		//
-		// Since 2.0, displays chat messages
-		// NOTE: this should be handled by fgame, not server
-		//
-		Com_Printf("%s (%d): %s", cl->name, cl - svs.clients, s);
-	}
+	// Removed in OPM
+	//  Message printing is now handled by fgame
+    //// Added in 1.11 MAC server
+    ////  Display chat messages
+    ////  NOTE: this should be handled by fgame, not server
+    ////if (!Q_stricmp(Cmd_Argv(0), "dmmessage")) {
+    ////	Com_Printf("%s (%zu): %s", cl->name, (size_t)(cl - svs.clients), s);
+    ////}
 
 	if (clientOK) {
 		// pass unknown strings to the game
-		if (!u->name && sv.state == SS_GAME) {
+		if (!u->name && sv.state == SS_GAME && (cl->state == CS_ACTIVE || cl->state == CS_PRIMED)) {
+			Cmd_Args_Sanitize();
 			ge->ClientCommand( ( gentity_t * )SV_GentityNum( cl - svs.clients ) );
 
 			if (ge->errorMessage)
 			{
 				// if an error has occured while processing the command, halt the server
-				Com_Error(ERR_DROP, ge->errorMessage);
+				Com_Error(ERR_DROP, "%s", ge->errorMessage);
 			}
 		}
 	}
@@ -1461,6 +1701,7 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	}
 
 	if( developer->integer == 2 ) {
+        // don't spam the console with client commands in production
 		Com_DPrintf( "clientCommand: %s : %i : %s\n", cl->name, seq, s );
 	}
 
@@ -1477,9 +1718,10 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	// the command, we will stop processing the rest of the packet,
 	// including the usercmd.  This causes flooders to lag themselves
 	// but not other people
-	// We don't do this when the client hasn't been active yet since its
+	// We don't do this when the client hasn't been active yet since it's
 	// normal to spam a lot of commands when downloading
-	if ( cl->state >= CS_ACTIVE &&
+	if ( !com_cl_running->integer && 
+		cl->state >= CS_ACTIVE &&
 		sv_floodProtect->integer && 
 		svs.time < cl->nextReliableTime ) {
 		// ignore any other text messages from this client but let them keep playing
@@ -1504,8 +1746,7 @@ static qboolean SV_ClientCommand( client_t *cl, msg_t *msg ) {
 	// Actual execution of the command
 	SV_ExecuteClientCommand( cl, s, clientOk );
 
-	// continue procesing
-	return qtrue;
+	return qtrue;		// continue procesing
 }
 
 
@@ -1519,8 +1760,7 @@ SV_ClientThink
 Also called by bot code
 ==================
 */
-void SV_ClientThink( client_t *cl, usercmd_t *cmd )
-{
+void SV_ClientThink (client_t *cl, usercmd_t *cmd) {
 	const char *err;
 
 	cl->lastUsercmd = *cmd;
@@ -1581,7 +1821,7 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 	// also use the message acknowledge
 	key ^= cl->messageAcknowledge;
 	// also use the last acknowledged server command in the key
-	key ^= Com_HashKey(cl->reliableCommands[ cl->reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ], 32);
+	key ^= MSG_HashKey(cl->reliableCommands[ cl->reliableAcknowledge & (MAX_RELIABLE_COMMANDS-1) ], 32);
 
 	MSG_ReadDeltaEyeInfo( msg, &cl->lastEyeinfo, &cl->lastEyeinfo );
 
@@ -1595,6 +1835,20 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 
 	// save time for ping calculation
 	cl->frames[ cl->messageAcknowledge & PACKET_MASK ].messageAcked = svs.time;
+
+	// TTimo
+	// catch the no-cp-yet situation before SV_ClientEnterWorld
+	// if CS_ACTIVE, then it's time to trigger a new gamestate emission
+	// if not, then we are getting remaining parasite usermove commands, which we should ignore
+	if (sv_pure->integer != 0 && cl->pureAuthentic == 0 && !cl->gotCP) {
+		if (cl->state == CS_ACTIVE)
+		{
+			// we didn't get a cp yet, don't assume anything and just send the gamestate all over again
+			Com_DPrintf( "%s: didn't get cp command, resending gamestate\n", cl->name);
+			SV_SendClientGameState( cl );
+		}
+		return;
+	}			
 	
 	// if this is the first usercmd we have received
 	// this gamestate, put the client into the world
@@ -1602,6 +1856,12 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 		SV_ClientEnterWorld( cl, &cmds[0] );
 		// the moves can be processed normaly
 	}
+	
+	// a bad cp command was sent, drop the client
+	if (sv_pure->integer != 0 && cl->pureAuthentic == 0) {		
+		SV_DropClient( cl, "Cannot validate pure client!");
+		return;
+	}
 
 	if ( cl->state != CS_ACTIVE ) {
 		cl->deltaMessage = -1;
@@ -1625,12 +1885,122 @@ static void SV_UserMove( client_t *cl, msg_t *msg, qboolean delta ) {
 		if ( cmds[i].serverTime <= cl->lastUsercmd.serverTime ) {
 			continue;
 		}
-
-		SV_ClientThink( cl, &cmds[ i ] );
+		SV_ClientThink (cl, &cmds[ i ]);
 	}
 }
 
 
+#ifdef USE_VOIP
+/*
+==================
+SV_ShouldIgnoreVoipSender
+
+Blocking of voip packets based on source client
+==================
+*/
+
+static qboolean SV_ShouldIgnoreVoipSender(const client_t *cl)
+{
+	if (!sv_voip->integer)
+		return qtrue;  // VoIP disabled on this server.
+	else if (!cl->hasVoip)  // client doesn't have VoIP support?!
+		return qtrue;
+    
+	// !!! FIXME: implement player blacklist.
+
+	return qfalse;  // don't ignore.
+}
+
+static
+void SV_UserVoip(client_t *cl, msg_t *msg, qboolean ignoreData)
+{
+	int sender, generation, sequence, frames, packetsize;
+	uint8_t recips[(MAX_CLIENTS + 7) / 8];
+	int flags;
+	byte encoded[sizeof(cl->voipPacket[0]->data)];
+	client_t *client = NULL;
+	voipServerPacket_t *packet = NULL;
+	int i;
+
+	sender = cl - svs.clients;
+	generation = MSG_ReadByte(msg);
+	sequence = MSG_ReadLong(msg);
+	frames = MSG_ReadByte(msg);
+	MSG_ReadData(msg, recips, sizeof(recips));
+	flags = MSG_ReadByte(msg);
+	packetsize = MSG_ReadShort(msg);
+
+	if (msg->readcount > msg->cursize)
+		return;   // short/invalid packet, bail.
+
+	if (packetsize > sizeof (encoded)) {  // overlarge packet?
+		int bytesleft = packetsize;
+		while (bytesleft) {
+			int br = bytesleft;
+			if (br > sizeof (encoded))
+				br = sizeof (encoded);
+			MSG_ReadData(msg, encoded, br);
+			bytesleft -= br;
+		}
+		return;   // overlarge packet, bail.
+	}
+
+	MSG_ReadData(msg, encoded, packetsize);
+
+	if (ignoreData || SV_ShouldIgnoreVoipSender(cl))
+		return;   // Blacklisted, disabled, etc.
+
+	// !!! FIXME: see if we read past end of msg...
+
+	// !!! FIXME: reject if not opus data.
+	// !!! FIXME: decide if this is bogus data?
+
+	// decide who needs this VoIP packet sent to them...
+	for (i = 0, client = svs.clients; i < sv_maxclients->integer ; i++, client++) {
+		if (client->state != CS_ACTIVE)
+			continue;  // not in the game yet, don't send to this guy.
+		else if (i == sender)
+			continue;  // don't send voice packet back to original author.
+		else if (!client->hasVoip)
+			continue;  // no VoIP support, or unsupported protocol
+		else if (client->muteAllVoip)
+			continue;  // client is ignoring everyone.
+		else if (client->ignoreVoipFromClient[sender])
+			continue;  // client is ignoring this talker.
+		else if (*cl->downloadName)   // !!! FIXME: possible to DoS?
+			continue;  // no VoIP allowed if downloading, to save bandwidth.
+
+		if(Com_IsVoipTarget(recips, sizeof(recips), i))
+			flags |= VOIP_DIRECT;
+		else
+			flags &= ~VOIP_DIRECT;
+
+		if (!(flags & (VOIP_SPATIAL | VOIP_DIRECT)))
+			continue;  // not addressed to this player.
+
+		// Transmit this packet to the client.
+		if (client->queuedVoipPackets >= ARRAY_LEN(client->voipPacket)) {
+			Com_Printf("Too many VoIP packets queued for client #%d\n", i);
+			continue;  // no room for another packet right now.
+		}
+
+		packet = Z_Malloc(sizeof(*packet));
+		packet->sender = sender;
+		packet->frames = frames;
+		packet->len = packetsize;
+		packet->generation = generation;
+		packet->sequence = sequence;
+		packet->flags = flags;
+		memcpy(packet->data, encoded, packetsize);
+
+		client->voipPacket[(client->queuedVoipIndex + client->queuedVoipPackets) % ARRAY_LEN(client->voipPacket)] = packet;
+		client->queuedVoipPackets++;
+	}
+}
+#endif
+
+
+
 /*
 ===========================================================================
 
@@ -1653,6 +2023,7 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 	MSG_Bitstream(msg);
 
 	serverId = MSG_ReadLong( msg );
+	cl->serverIdAcknowledge = serverId;
 	cl->messageAcknowledge = MSG_ReadLong( msg );
 
 	if (cl->messageAcknowledge < 0) {
@@ -1669,7 +2040,7 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 	// NOTE: when the client message is fux0red the acknowledgement numbers
 	// can be out of range, this could cause the server to send thousands of server
 	// commands which the server thinks are not yet acknowledged in SV_UpdateServerCommandsToClient
-	if (cl->reliableAcknowledge < cl->reliableSequence - MAX_RELIABLE_COMMANDS) {
+	if ((cl->reliableSequence - cl->reliableAcknowledge >= MAX_RELIABLE_COMMANDS) || (cl->reliableSequence - cl->reliableAcknowledge < 0)) {
 		// usually only hackers create messages like this
 		// it is more annoying for them to let them hanging
 #ifndef NDEBUG
@@ -1690,24 +2061,36 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 	// don't drop as long as previous command was a nextdl, after a dl is done, downloadName is set back to ""
 	// but we still need to read the next message to move to next download or send gamestate
 	// I don't like this hack though, it must have been working fine at some point, suspecting the fix is somewhere else
-	if ( serverId != sv.serverId && !*cl->downloadName ) {
+	if ( serverId != sv.serverId && !*cl->downloadName && !strstr(cl->lastClientCommandString, "nextdl") ) {
+		if ( serverId >= sv.restartedServerId && serverId < sv.serverId ) { // TTimo - use a comparison here to catch multiple map_restart
+			// they just haven't caught the map_restart yet
+			//Com_DPrintf("%s : ignoring pre map_restart / outdated client message\n", cl->name);
+			return;
+		}
 		// if we can tell that the client has dropped the last
 		// gamestate we sent them, resend it
-		// also, don't resend the gamestate if the server just restarted
-		if ( serverId != sv.restartedServerId && cl->messageAcknowledge > cl->gamestateMessageNum ) {
+		if ( cl->state != CS_ACTIVE && cl->messageAcknowledge > cl->gamestateMessageNum ) {
 			Com_DPrintf( "%s : dropped gamestate, resending\n", cl->name );
 			SV_SendClientGameState( cl );
 		}
 		return;
 	}
 
+	// this client has acknowledged the new gamestate so it's
+	// safe to start sending it the real time again
+	if( cl->oldServerTime && serverId == sv.serverId ){
+		Com_DPrintf( "%s acknowledged gamestate\n", cl->name );
+		cl->oldServerTime = 0;
+	}
+
 	// read optional clientCommand strings
 	do {
 		c = MSG_ReadByte( msg );
-		//Com_DPrintf( "SV_ExecuteClientMessage: %i\n", c );
+
 		if ( c == clc_EOF ) {
 			break;
 		}
+
 		if ( c != clc_clientCommand ) {
 			break;
 		}
@@ -1719,6 +2102,22 @@ void SV_ExecuteClientMessage( client_t *cl, msg_t *msg ) {
 		}
 	} while ( 1 );
 
+	// skip legacy speex voip data
+	if ( c == clc_voipSpeex ) {
+#ifdef USE_VOIP
+		SV_UserVoip( cl, msg, qtrue );
+		c = MSG_ReadByte( msg );
+#endif
+	}
+
+	// read optional voip data
+	if ( c == clc_voipOpus ) {
+#ifdef USE_VOIP
+		SV_UserVoip( cl, msg, qfalse );
+		c = MSG_ReadByte( msg );
+#endif
+	}
+
 	// read the usercmd_t
 	if ( c == clc_move ) {
 		SV_UserMove( cl, msg, qtrue );
diff --git a/code/server/sv_game.c b/code/server/sv_game.c
index 831c868f..a87df2ad 100644
--- a/code/server/sv_game.c
+++ b/code/server/sv_game.c
@@ -110,7 +110,8 @@ void SV_ClearCGMessage (int iClient)
 		g_CGMessages[iClient].datatypes = 0;
 	}
 	g_CGMRecieve[iClient] = 0;
-} 
+}
+
 void SV_ClearAllCGMessages ()
 {
 	cgm_t *pCGM;
@@ -130,8 +131,10 @@ void SV_ClearAllCGMessages ()
 		g_CGMRecieve[i] = 0;
 	}
 }
+
 #define CGM_DATA_SIZE 4096
 #define CGM_DATATYPES_SIZE 8192
+
 void SV_InitCGMessage (int iClient)
 {
 	cgm_t *pCGM;
@@ -197,17 +200,18 @@ static void MSG_WriteCGMBits (cgm_t *pCGM, int value, int bits)
 		pCGM->cursize++;
 	} else if(bits <= 16) {
 		// append short (two bytes)
-		*((short*)(&pCGM->data[pCGM->cursize])) = LittleShort(value);
+		*((short*)(&pCGM->data[pCGM->cursize])) = value;
 		pCGM->cursize+=2;
 	} else if(bits <= 32) {
 		// append integer (4 bytes)
-		*((int*)(&pCGM->data[pCGM->cursize])) = LittleLong(value);	
+		*((int*)(&pCGM->data[pCGM->cursize])) = value;	
 		pCGM->cursize+=4;
 	}
 	// save datatype
 	pCGM->datatypes[pCGM->dtindex] = bits;
 	pCGM->dtindex++;
 }
+
 void PF_MSG_WriteBits (int value, int bits)
 {
 	cgm_t *pCGM;
@@ -231,7 +235,8 @@ void PF_MSG_WriteChar (int c)
 		// write 8 bit character
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
-} 
+}
+
 void PF_MSG_WriteByte (int c)
 {
 	cgm_t *pCGM;
@@ -244,6 +249,7 @@ void PF_MSG_WriteByte (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteSVC (int c)
 {
 	cgm_t *pCGM;
@@ -255,6 +261,7 @@ void PF_MSG_WriteSVC (int c)
 		MSG_WriteCGMBits(pCGM,c,8);
 	}
 }
+
 void PF_MSG_WriteShort (int c)
 {
 	cgm_t *pCGM;
@@ -266,6 +273,7 @@ void PF_MSG_WriteShort (int c)
 		MSG_WriteCGMBits(pCGM,c,16);
 	}
 }
+
 void PF_MSG_WriteLong (int c)
 {
  	cgm_t *pCGM;
@@ -277,6 +285,7 @@ void PF_MSG_WriteLong (int c)
 		MSG_WriteCGMBits(pCGM,c,32);
 	}
 }
+
 void PF_MSG_WriteFloat (float f)
 {
 	union {
@@ -293,6 +302,7 @@ void PF_MSG_WriteFloat (float f)
 		MSG_WriteCGMBits(pCGM,dat.l,32);
 	}
 }
+
 void PF_MSG_WriteString (const char *s)
 {
  	cgm_t *pCGM;
@@ -309,6 +319,7 @@ void PF_MSG_WriteString (const char *s)
 		}
 	}
 }
+
 void PF_MSG_WriteAngle8 (float f)
 {
  	cgm_t *pCGM;
@@ -320,6 +331,7 @@ void PF_MSG_WriteAngle8 (float f)
 		MSG_WriteCGMBits(pCGM,f * 256.0 / 360.0,8);
 	}
 }
+
 void PF_MSG_WriteAngle16 (float f)
 {
  	cgm_t *pCGM;
@@ -331,6 +343,7 @@ void PF_MSG_WriteAngle16 (float f)
 		MSG_WriteCGMBits(pCGM,ANGLE2SHORT(f),16);
 	}
 }
+
 void PF_MSG_WriteCoord (float f)
 {
  	cgm_t *pCGM;
@@ -351,6 +364,7 @@ void PF_MSG_WriteCoord (float f)
 		MSG_WriteCGMBits(pCGM, write, 19);
 	}
 }
+
 void PF_MSG_WriteDir (vec_t *dir)
 {
  	cgm_t *pCGM;
@@ -364,6 +378,7 @@ void PF_MSG_WriteDir (vec_t *dir)
 		MSG_WriteCGMBits(pCGM,b,8);
 	}
 }
+
 void PF_MSG_StartCGM (int type)
 {
     cgm_t *pCGM;
@@ -384,10 +399,12 @@ void PF_MSG_StartCGM (int type)
 		MSG_WriteCGMBits(pCGM, type, 6);
 	}
 }
+
 void PF_MSG_EndCGM ()
 {
 	memset(g_CGMRecieve,0,sizeof(g_CGMRecieve));
 }
+
 void PF_MSG_SetClient (int iClient)
 {
 	memset(g_CGMRecieve,0,sizeof(g_CGMRecieve));
@@ -397,7 +414,7 @@ void PF_MSG_SetClient (int iClient)
 	}
 }
 
-void MSG_SetBroadcastAll ()
+void MSG_SetBroadcastAll()
 {
 	cgm_t *pCGM;
 	client_t* client;
@@ -407,16 +424,24 @@ void MSG_SetBroadcastAll ()
 	for(i = 0; i < svs.iNumClients; i++,pCGM++) {
 		client = &svs.clients[i];
 
-		if (client->gentity && client->gentity->inuse && client->state != CS_FREE) {
-			if (pCGM->data && pCGM->cursize < 3968) {
-				g_CGMRecieve[i] = qtrue;
-			} else {
-				MSG_HandleCGMBufferOverflow(pCGM, 0);
-			}
+		if (!client->gentity || !client->gentity->inuse) {
+			continue;
 		}
+
+		if (client->state == CS_FREE) {
+			continue;
+		}
+
+		if (!pCGM->data || pCGM->cursize >= 3968) {
+			MSG_HandleCGMBufferOverflow(pCGM, qfalse);
+			continue;
+		}
+
+		g_CGMRecieve[i] = qtrue;
 	}
 }
-void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
+
+void MSG_SetBroadcastVisible(const vec_t* vPos, const vec_t* vPosB)
 {
     byte *clientpvs;
     int posBcluster;
@@ -432,51 +457,52 @@ void MSG_SetBroadcastVisible( const vec_t *vPos, const vec_t *vPosB)
     int i;
 	cgm_t *pCGM;
 
-#if 0
-	MSG_SetBroadcastAll();
-#else
-	// dont check the same pos twice
-	if(vPosB && VectorCompare(vPos,vPosB)) {
-		vPosB = 0;
+	posleaf = CM_PointLeafnum(vPos);
+	posarea = CM_LeafArea(posleaf);
+	poscluster = CM_LeafCluster(posleaf);
+
+	if (vPosB) {
+		posBleaf = CM_PointLeafnum(vPosB);
+		posBarea = CM_LeafArea(posBleaf);
+		posBcluster = CM_LeafCluster(posBleaf);
+	} else {
+		posBarea = 0;
+		posBcluster = 0;
 	}
 
 	pCGM = g_CGMessages;
 	pClient = svs.clients;
+
 	for(i = 0; i < svs.iNumClients; i++,pCGM++,pClient++) {
-		if(pClient->state != CS_ACTIVE) {
-			g_CGMRecieve[i] = qfalse;
+		if (!pClient->gentity || !pClient->gentity->inuse) {
+			// The entity can be null on map load
 			continue;
 		}
+
+		if(pClient->state == CS_FREE) {
+			continue;
+		}
+
 		leafnum = CM_PointLeafnum(pClient->gentity->s.origin);
-		clientcluster = CM_LeafCluster(leafnum);
 		clientarea = CM_LeafArea(leafnum);
+		clientcluster = CM_LeafCluster(leafnum);
 		clientpvs = CM_ClusterPVS(clientcluster);
 
-		posleaf = CM_PointLeafnum(vPos);
-		poscluster = CM_LeafCluster(posleaf);
-		posarea = CM_LeafArea(posleaf);
-
-		if ( clientpvs[poscluster >> 3] & (1 << (poscluster&7) ) ) {
-			// visible.
-			g_CGMRecieve[i] = qtrue;
+		if (!CM_AreasConnected(clientarea, posarea) && (!vPosB || !CM_AreasConnected(clientarea, posBarea))) {
 			continue;
 		}
-	
-		if(vPosB) {
-			posBleaf = CM_PointLeafnum(vPosB);
-			posBcluster = CM_LeafCluster(posBleaf);
-			posBarea = CM_LeafArea(posBleaf);
 
-			if ( clientpvs[posBcluster >> 3] & (1 << (posBcluster&7) ) ) {
-				// visible.
-				g_CGMRecieve[i] = qtrue;
-				continue;
-			}
+		if (!(clientpvs[poscluster >> 3] & (1 << (poscluster & 7))) && (!vPosB || !(clientpvs[posBcluster >> 3] & (1 << (posBcluster & 7))))) {
+			continue;
 		}
-		// not visible
-		g_CGMRecieve[i] = qfalse;
+
+		if (!pCGM->data || pCGM->cursize >= 3968) {
+			MSG_HandleCGMBufferOverflow(pCGM, qfalse);
+			continue;
+		}
+
+		g_CGMRecieve[i] = qtrue;
 	}
-#endif
 }
 void MSG_SetBroadcastHearable ( const vec_t *vPos, const vec_t *vPosB)
 {
@@ -590,6 +616,10 @@ PF_NumAnims
 */
 int PF_NumAnims( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumAnims( tiki );
 }
 
@@ -600,6 +630,10 @@ PF_NumSurfaces
 */
 int PF_NumSurfaces( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumSurfaces( tiki );
 }
 
@@ -610,6 +644,10 @@ PF_NumTags
 */
 int PF_NumTags( dtiki_t *tiki )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_NumTags( tiki );
 }
 
@@ -620,6 +658,10 @@ PF_Cross_Time
 */
 float PF_Cross_Time( dtiki_t *tiki, int anim )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_CrossblendTime( tiki, anim );
 }
 
@@ -630,6 +672,10 @@ PF_CalculateBounds
 */
 void PF_CalculateBounds( dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs )
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_CalculateBounds( tiki, scale, mins, maxs );
 }
 
@@ -640,6 +686,10 @@ PF_Anim_NameForNum
 */
 const char *PF_Anim_NameForNum( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_NameForNum( tiki, animnum );
 }
 
@@ -650,6 +700,10 @@ PF_Anim_NumForName
 */
 int PF_Anim_NumForName( dtiki_t *tiki, const char *name )
 {
+    if (!tiki) {
+        return -1;
+    }
+
 	return TIKI_Anim_NumForName( tiki, name );
 }
 
@@ -660,6 +714,10 @@ PF_Anim_Random
 */
 int PF_Anim_Random( dtiki_t *tiki, const char *name )
 {
+    if (!tiki) {
+        return -1;
+    }
+
 	return TIKI_Anim_Random( tiki, name );
 }
 
@@ -670,6 +728,10 @@ PF_Anim_NumFrames
 */
 int PF_Anim_NumFrames( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_NumFrames( tiki, animnum );
 }
 
@@ -680,6 +742,10 @@ PF_Anim_Time
 */
 float PF_Anim_Time( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_Time( tiki, animnum );
 }
 
@@ -690,6 +756,10 @@ PF_Anim_Frametime
 */
 float PF_Anim_Frametime( dtiki_t *tiki, int animnum )
 {
+	if (!tiki) {
+		return 0;
+	}
+
 	return TIKI_Anim_Frametime( tiki, animnum );
 }
 
@@ -700,9 +770,27 @@ PF_Anim_Delta
 */
 void PF_Anim_Delta( dtiki_t *tiki, int animnum, vec3_t delta )
 {
+	if (!tiki) {
+		return;
+	}
+
 	TIKI_Anim_Delta( tiki, animnum, delta );
 }
 
+/*
+===============
+PF_Anim_AngularDelta
+===============
+*/
+void PF_Anim_AngularDelta(dtiki_t* tiki, int animnum, vec3_t delta)
+{
+    if (!tiki) {
+        return;
+    }
+
+	TIKI_Anim_AngularDelta(tiki, animnum, delta);
+}
+
 /*
 ===============
 PF_Anim_HasDelta
@@ -710,6 +798,10 @@ PF_Anim_HasDelta
 */
 qboolean PF_Anim_HasDelta( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Anim_HasDelta( tiki, animnum );
 }
 
@@ -720,6 +812,10 @@ PF_Anim_DeltaOverTime
 */
 void PF_Anim_DeltaOverTime( dtiki_t *tiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta )
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_Anim_DeltaOverTime( tiki, iAnimnum, fTime1, fTime2, vDelta );
 }
 
@@ -730,6 +826,10 @@ PF_Anim_AngularDeltaOverTime
 */
 void PF_Anim_AngularDeltaOverTime(dtiki_t* tiki, int iAnimnum, float fTime1, float fTime2, float * fDelta)
 {
+    if (!tiki) {
+        return;
+    }
+
 	TIKI_Anim_AngularDeltaOverTime(tiki, iAnimnum, fTime1, fTime2, fDelta);
 }
 
@@ -740,6 +840,10 @@ PF_Anim_Flags
 */
 int PF_Anim_Flags( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_Flags( tiki, animnum );
 }
 
@@ -750,6 +854,10 @@ PF_Anim_FlagsSkel
 */
 int PF_Anim_FlagsSkel( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return 0;
+    }
+
 	return TIKI_Anim_FlagsSkel( tiki, animnum );
 }
 
@@ -760,9 +868,27 @@ PF_Anim_HasCommands
 */
 qboolean PF_Anim_HasCommands( dtiki_t *tiki, int animnum )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Anim_HasServerCommands( tiki, animnum );
 }
 
+/*
+===============
+PF_Anim_HasCommands
+===============
+*/
+qboolean PF_Anim_HasCommands_Client(dtiki_t* tiki, int animnum)
+{
+    if (!tiki) {
+        return qfalse;
+    }
+
+    return TIKI_Anim_HasClientCommands(tiki, animnum);
+}
+
 /*
 ===============
 PF_ModelTiki
@@ -790,8 +916,12 @@ PF_NumHeadModels
 */
 int PF_NumHeadModels( const char *model )
 {
-	dtikianim_t *tiki = PF_ModelTikiAnim( model );
-	return TIKI_NumHeadModels( tiki );
+    dtikianim_t* tiki = PF_ModelTikiAnim(model);
+    if (!tiki) {
+        return 0;
+    }
+
+    return TIKI_NumHeadModels(tiki);
 }
 
 /*
@@ -802,7 +932,11 @@ PF_GetHeadModel
 void PF_GetHeadModel( const char *model, int num, char *name )
 {
 	dtikianim_t *tiki = PF_ModelTikiAnim( model );
-	TIKI_GetHeadModel( tiki, num, name );
+    if (!tiki) {
+		return;
+    }
+
+    TIKI_GetHeadModel(tiki, num, name);
 }
 
 /*
@@ -813,6 +947,10 @@ PF_NumHeadSkins
 int PF_NumHeadSkins( const char *model )
 {
 	dtikianim_t *tiki = PF_ModelTikiAnim( model );
+	if (!tiki) {
+		return 0;
+	}
+
 	return TIKI_NumHeadSkins( tiki );
 }
 
@@ -824,6 +962,10 @@ PF_GetHeadSkin
 void PF_GetHeadSkin( const char *model, int num, char *name )
 {
 	dtikianim_t *tiki = PF_ModelTikiAnim( model );
+	if (!tiki) {
+		return;
+	}
+
 	TIKI_GetHeadSkin( tiki, num, name );
 }
 
@@ -834,6 +976,10 @@ PF_Anim_HasClientCommands
 */
 qboolean PF_Anim_HasClientCommands( dtiki_t *tiki, int animnum )
 {
+	if (!tiki) {
+		return qfalse;
+	}
+
 	return TIKI_Anim_HasClientCommands( tiki, animnum );
 }
 
@@ -844,9 +990,27 @@ PF_Frame_Commands
 */
 qboolean PF_Frame_Commands( dtiki_t *tiki, int animnum, int framenum, tiki_cmd_t *tiki_cmds )
 {
+    if (!tiki) {
+        return qfalse;
+    }
+
 	return TIKI_Frame_Commands_Server( tiki, animnum, framenum, tiki_cmds );
 }
 
+/*
+===============
+PF_Frame_Commands
+===============
+*/
+qboolean PF_Frame_Commands_Client( dtiki_t *tiki, int animnum, int framenum, tiki_cmd_t *tiki_cmds )
+{
+    if (!tiki) {
+        return qfalse;
+    }
+
+	return TIKI_Frame_Commands_Client( tiki, animnum, framenum, tiki_cmds );
+}
+
 /*
 ===============
 PF_Surface_NameToNum
@@ -854,6 +1018,10 @@ PF_Surface_NameToNum
 */
 int PF_Surface_NameToNum( dtiki_t *tiki, const char *name )
 {
+    if (!tiki) {
+        return -1;
+    }
+
 	return TIKI_Surface_NameToNum( tiki, name );
 }
 
@@ -864,6 +1032,10 @@ PF_Surface_NumToName
 */
 const char *PF_Surface_NumToName( dtiki_t *tiki, int num )
 {
+    if (!tiki) {
+        return NULL;
+    }
+
 	return TIKI_Surface_NumToName( tiki, num );
 }
 
@@ -874,6 +1046,10 @@ PF_Tag_NameToNum
 */
 int PF_Tag_NameToNum( dtiki_t *tiki, const char *name )
 {
+	if (!tiki) {
+		return -1;
+	}
+
 	return TIKI_Tag_NameToNum( tiki, name );
 }
 
@@ -884,6 +1060,10 @@ PF_Tag_NumToName
 */
 const char *PF_Tag_NumToName( dtiki_t *tiki, int num )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_Tag_NumToName( tiki, num );
 }
 
@@ -924,6 +1104,7 @@ PF_SetPoseInternal
 */
 void PF_SetPoseInternal( dtiki_t *tiki, int entnum, const frameInfo_t *frameInfo, int *bone_tag, vec4_t *bone_quat, float actionWeight )
 {
+	assert(tiki);
 	TIKI_SetPoseInternal( TIKI_GetSkeletor( tiki, entnum ), frameInfo, bone_tag, bone_quat, actionWeight );
 }
 
@@ -947,15 +1128,15 @@ PF_Alias_FindRandom
 */
 const char *PF_Alias_FindRandom( dtiki_t *tiki, const char *alias, AliasListNode_t **ret )
 {
-	AliasList_t *alias_list = tiki->a->alias_list;
+	AliasList_t* alias_list = NULL;
 
-	alias_list = ( AliasList_t * )tiki->a->alias_list;
-	if( alias_list )
-	{
-		return Alias_ListFindRandom( alias_list, alias, ret );
+	if (tiki) {
+		alias_list = tiki->a->alias_list;
 	}
-	else
-	{
+
+	if (alias_list) {
+		return Alias_ListFindRandom(alias_list, alias, ret);
+	} else {
 		return NULL;
 	}
 }
@@ -968,12 +1149,15 @@ PF_Alias_UpdateDialog
 */
 void PF_Alias_UpdateDialog( dtikianim_t *tiki, const char *alias )
 {
-	AliasList_t *alias_list = tiki->alias_list;
-
-	if( alias_list )
-	{
-		Alias_ListUpdateDialog( alias_list, alias );
+	AliasList_t* alias_list = NULL;
+	
+	if (tiki) {
+		alias_list = tiki->alias_list;
 	}
+
+    if (alias_list) {
+        Alias_ListUpdateDialog(alias_list, alias);
+    }
 }
 
 /*
@@ -984,12 +1168,15 @@ PF_Alias_Dump
 */
 void PF_Alias_Dump( dtiki_t *tiki )
 {
-	AliasList_t *alias_list = tiki->a->alias_list;
+    AliasList_t* alias_list = NULL;
 
-	if( alias_list )
-	{
-		Alias_ListDump( tiki->a->alias_list );
-	}
+    if (tiki) {
+        alias_list = tiki->a->alias_list;
+    }
+
+    if (alias_list) {
+        Alias_ListDump(tiki->a->alias_list);
+    }
 }
 
 /*
@@ -1010,6 +1197,10 @@ PF_NameForNum
 */
 const char *PF_NameForNum( dtiki_t *tiki )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_Name( tiki );
 }
 
@@ -1114,6 +1305,10 @@ PF_GetSkeletor
 */
 void *PF_GetSkeletor( dtiki_t *tiki, int entnum )
 {
+	if (!tiki) {
+		return NULL;
+	}
+
 	return TIKI_GetSkeletor( tiki, entnum );
 }
 
@@ -1126,21 +1321,36 @@ Sends a command string to a client
 */
 void SV_GameSendServerCommand( int clientNum, const char *text, ... )
 {
-	va_list va;
-	char buffer[ 500 ];
+	char tmp[1] = { 0 };
+	char* buffer;
+    size_t length = 1;
+    va_list va;
 
-	va_start( va, text );
-	vsprintf( buffer, text, va );
-	va_end( va );
+    va_start(va, text);
+    length = vsnprintf(tmp, 0, text, va);
+    va_end(va);
 
-	if ( clientNum == -1 ) {
-		SV_SendServerCommand( NULL, "%s", buffer );
-	} else {
-		if ( clientNum < 0 || clientNum >= sv_maxclients->integer ) {
-			return;
-		}
-		SV_SendServerCommand( svs.clients + clientNum, "%s", buffer );
-	}
+    if (!length || length == -1) {
+        return;
+    }
+
+	//
+	// allocate variadic arguments on stack
+	//
+	buffer = (char*)alloca(length + 1);
+
+    va_start(va, text);
+    vsnprintf(buffer, length + 1, text, va);
+    va_end(va);
+
+    if (clientNum == -1) {
+        SV_SendServerCommand(NULL, "%s", buffer);
+    } else {
+        if (clientNum < 0 || clientNum >= sv_maxclients->integer) {
+            return;
+        }
+        SV_SendServerCommand(svs.clients + clientNum, "%s", buffer);
+    }
 }
 
 /*
@@ -1304,7 +1514,7 @@ void PF_centerprintf( gentity_t *ent, const char *fmt, ... )
 	}
 
 	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
+	Q_vsnprintf( msg, sizeof( msg ), fmt, va );
 	va_end( va );
 
 	if( strlen( msg ) > 256 ) {
@@ -1330,7 +1540,7 @@ void PF_locationprintf( gentity_t *ent, int x, int y, const char *fmt, ... )
 	}
 
 	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
+	Q_vsnprintf( msg, sizeof( msg ), fmt, va );
 	va_end( va );
 
 	if( strlen( msg ) > 256 ) {
@@ -1504,7 +1714,8 @@ void SV_InitGameProgs( void ) {
 
 	import.Printf						= Com_Printf;
 	import.DPrintf						= Com_DPrintf;
-	import.DPrintf2						= Com_DPrintf;
+	import.DPrintf2						= Com_DPrintf2;
+	import.DebugPrintf					= Com_DebugPrintf;
 	import.Error						= Com_Error;
 	import.GetArchiveFileName			= Com_GetArchiveFileName;
 	import.Milliseconds					= Sys_Milliseconds;
@@ -1541,6 +1752,7 @@ void SV_InitGameProgs( void ) {
 	import.SightTraceEntity				= SV_SightTraceEntity;
 	import.SightTrace					= SV_SightTrace;
 	import.trace						= SV_Trace;
+	import.CM_VisualObfuscation			= CM_VisualObfuscation;
 	import.GetShader					= SV_GetShaderPointer;
 	import.pointcontents				= SV_PointContents;
 	import.PointBrushnum				= CM_PointBrushNum;
@@ -1560,6 +1772,7 @@ void SV_InitGameProgs( void ) {
 	import.cvar_set						= Cvar_Set;
 	import.cvar_set2					= Cvar_Set2;
 	import.NextCvar						= Cvar_Next;
+	import.Cvar_CheckRange				= Cvar_CheckRange;
 
 	import.Argc							= Cmd_Argc;
 	import.Args							= Cmd_Args;
@@ -1567,12 +1780,14 @@ void SV_InitGameProgs( void ) {
 
 	import.AddCommand					= SV_AddGameCommand;
 	import.SendConsoleCommand			= Cbuf_AddText;
+	import.ExecuteConsoleCommand		= Cbuf_ExecuteText;
 
 	import.FS_ReadFile					= FS_ReadFileEx;
 	import.FS_FreeFile					= FS_FreeFile;
 	import.FS_WriteFile					= FS_WriteFile;
 	import.FS_FOpenFileWrite			= FS_FOpenFileWrite;
 	import.FS_FOpenFileAppend			= FS_FOpenFileAppend;
+	import.FS_FOpenFile					= FS_FOpenFileRead;
 	import.FS_PrepFileWrite				= FS_PrepFileWrite;
 	import.FS_Write						= FS_Write;
 	import.FS_Read						= FS_Read;
@@ -1595,9 +1810,9 @@ void SV_InitGameProgs( void ) {
 	import.setmodel						= PF_setmodel;
 	import.clearmodel					= PF_clearmodel;
 	import.TIKI_NumAnims				= PF_NumAnims;
-	import.NumSurfaces					= PF_NumSurfaces;
-	import.NumTags						= PF_NumTags;
-	import.CalculateBounds				= PF_CalculateBounds;
+	import.TIKI_NumSurfaces				= PF_NumSurfaces;
+	import.TIKI_NumTags					= PF_NumTags;
+	import.TIKI_CalculateBounds			= PF_CalculateBounds;
 	import.TIKI_GetSkeletor				= PF_GetSkeletor;
 	import.Anim_NameForNum				= PF_Anim_NameForNum;
 	import.Anim_NumForName				= PF_Anim_NumForName;
@@ -1607,17 +1822,20 @@ void SV_InitGameProgs( void ) {
 	import.Anim_Frametime				= PF_Anim_Frametime;
 	import.Anim_CrossTime				= PF_Cross_Time;
 	import.Anim_Delta					= PF_Anim_Delta;
+	import.Anim_AngularDelta			= PF_Anim_AngularDelta;
 	import.Anim_HasDelta				= PF_Anim_HasDelta;
 	import.Anim_DeltaOverTime			= PF_Anim_DeltaOverTime;
 	import.Anim_AngularDeltaOverTime	= PF_Anim_AngularDeltaOverTime;
 	import.Anim_Flags					= PF_Anim_Flags;
 	import.Anim_FlagsSkel				= PF_Anim_FlagsSkel;
 	import.Anim_HasCommands				= PF_Anim_HasCommands;
+	import.Anim_HasCommands_Client		= PF_Anim_HasCommands_Client;
 	import.NumHeadModels				= PF_NumHeadModels;
 	import.GetHeadModel					= PF_GetHeadModel;
 	import.NumHeadSkins					= PF_NumHeadSkins;
 	import.GetHeadSkin					= PF_GetHeadSkin;
 	import.Frame_Commands				= PF_Frame_Commands;
+	import.Frame_Commands_Client		= PF_Frame_Commands_Client;
 	import.Surface_NameToNum			= PF_Surface_NameToNum;
 	import.Surface_NumToName			= PF_Surface_NumToName;
 	import.Tag_NumForName				= PF_Tag_NameToNum;
@@ -1691,6 +1909,9 @@ void SV_InitGameProgs( void ) {
 	import.SanitizeName					= Com_SanitizeName;
 	import.fsDebug						= fs_debug;
 
+	// Added in OPM
+	import.pvssoundindex				= SV_PVSSoundIndex;
+
 	ge = Sys_GetGameAPI( &import );
 
 	if( !ge ) {
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index a5694a71..fb45591a 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../client/client.h"
 #include "../qcommon/tiki.h"
 #include "../qcommon/bg_compat.h"
+#include "../gamespy/sv_gamespy.h"
 
 static char last_mapname[ MAX_QPATH ];
 static int g_iSvsTimeFixupCount;
@@ -73,12 +74,11 @@ SV_SetConfigstring
 ===============
 */
 void SV_SetConfigstring (int index, const char *val) {
-	int i;
-	size_t len;
+	int		i;
 	client_t	*client;
 
 	if ( index < 0 || index >= MAX_CONFIGSTRINGS ) {
-		Com_Error( ERR_DROP, "SV_SetConfigstring: bad index %i\n", index );
+		Com_Error (ERR_DROP, "SV_SetConfigstring: bad index %i\n", index);
 	}
 
 	if ( !val ) {
@@ -98,7 +98,7 @@ void SV_SetConfigstring (int index, const char *val) {
 	// spawning a new server
 	if (sv.state == SS_LOADING2 || sv.state == SS_GAME || sv.restarting ) {
 
-		// send the data to all relevent clients
+		// send the data to all relevant clients
 		for (i = 0, client = svs.clients; i < svs.iNumClients ; i++, client++) {
 			if ( client->state < CS_ACTIVE ) {
 				if ( client->state == CS_PRIMED )
@@ -111,7 +111,6 @@ void SV_SetConfigstring (int index, const char *val) {
 			}
 		
 
-			len = strlen( val );
 			SV_SendConfigstring(client, index);
 		}
 	}
@@ -168,7 +167,7 @@ int SV_FindIndex( const char *name, int start, int max, qboolean create ) {
 		if( !s || !s[ 0 ] ) {
 			break;
 		}
-		if( !strcmp( s, name ) ) {
+		if( !Q_stricmp( s, name ) ) {
 			return i;
 		}
 	}
@@ -214,8 +213,8 @@ int SV_SoundIndex( const char *name, qboolean streamed )
 {
 	char buf[ 1024 ];
 
-	strcpy( buf, name );
-	strcat( buf, va( "%d", streamed ) );
+	Q_strncpyz( buf, name, sizeof(buf) );
+	Q_strcat( buf, sizeof(buf), va( "%d", streamed ) );
 
 	return SV_FindIndex( buf, CS_SOUNDS, MAX_SOUNDS, qtrue );
 }
@@ -290,7 +289,12 @@ void SV_SendConfigstring(client_t *client, int index)
 				denormalized, buf );
 
 			sent += (maxChunkSize - 1);
-			remaining -= (maxChunkSize - 1);
+			if (remaining > maxChunkSize - 1) {
+				remaining -= (maxChunkSize - 1);
+			} else {
+				// Make sure to not go negative
+				remaining = 0;
+			}
 		}
 	} else {
 		// standard cs, just send it
@@ -311,7 +315,7 @@ void SV_UpdateConfigstrings(client_t *client)
 {
 	int index;
 
-	for( index = 0; index <= MAX_CONFIGSTRINGS; index++ ) {
+	for( index = 0; index < MAX_CONFIGSTRINGS; index++ ) {
 		// if the CS hasn't changed since we went to CS_PRIMED, ignore
 		if(!client->csUpdated[index])
 			continue;
@@ -415,10 +419,10 @@ void SV_ClientsAlloc( void )
 	svs.iNumClients = sv_maxclients->integer;
 	svs.clients = Z_Malloc( svs.iNumClients * sizeof( client_t ) );
 	Com_Memset( svs.clients, 0, svs.iNumClients * sizeof( client_t ) );
-	if( g_gametype->integer ) {
-		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * 64;
+	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
 	} else {
-		svs.numSnapshotEntities = 1 * 32 * 64;
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
 	}
 
 	SV_InitAllCGMessages();
@@ -447,6 +451,9 @@ void SV_Startup( void ) {
 
 	SV_InitGamespy();
 	Cvar_Set( "sv_running", "1" );
+	
+	// Join the ipv6 multicast group now that a map is running so clients can scan for us on the local network.
+	NET_JoinMulticast6();
 }
 
 /*
@@ -473,10 +480,10 @@ SV_ChangeMaxClients
 ==================
 */
 void SV_ChangeMaxClients( void ) {
-	int			oldMaxClients;
-	int			i;
+	int		oldMaxClients;
+	int		i;
 	client_t	*oldClients;
-	int			count;
+	int		count;
 
 	// get the highest client number in use
 	count = 0;
@@ -508,6 +515,12 @@ void SV_ChangeMaxClients( void ) {
 
 	// free old clients arrays
 	Z_Free( oldClients );
+
+	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
+		svs.numSnapshotEntities = svs.iNumClients * PACKET_BACKUP * MAX_CLIENTS;
+	} else {
+		svs.numSnapshotEntities = 1 * PACKET_BACKUP * MAX_CLIENTS;
+	}
 }
 
 /*
@@ -529,16 +542,12 @@ void SV_ClearServer(void) {
 
 /*
 ================
-SV_TouchCGame
-
-  touch the cgame.vm so that a pure client can load it if it's in a seperate pk3
+SV_TouchFile
 ================
 */
-void SV_TouchCGame(void) {
+static void SV_TouchFile( const char *filename ) {
 	fileHandle_t	f;
-	char filename[MAX_QPATH];
 
-	Com_sprintf( filename, sizeof(filename), "vm/%s.qvm", "cgame" );
 	FS_FOpenFileRead( filename, &f, qfalse, qtrue );
 	if ( f ) {
 		FS_FCloseFile( f );
@@ -580,7 +589,14 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 	
 	differentmap = qtrue;
 
-	strncpy( svs.rawServerName, server, sizeof( svs.rawServerName ) );
+	if (svs.rawServerName != server) {
+		// Fixed in OPM
+		//  Make sure to not copy from the same string...
+		strncpy( svs.rawServerName, server, sizeof( svs.rawServerName ) );
+	}
+
+	// Added in 2.30
+	Cvar_Set("g_netoptimize", "1");
 
 	// check for a spawn position
 	spawnpos = strchr( server, '$' );
@@ -590,7 +606,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 	}
 	else
 	{
-		strcpy( mapname, server );
+		Q_strncpyz( mapname, server, sizeof(mapname) );
 	}
 
 	strncpy( svs.mapName, mapname, sizeof( svs.mapName ) );
@@ -601,7 +617,11 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 			differentmap = qfalse;
 		}
 
-		if( sv_maxclients->modified ) {
+		if( sv_maxclients->modified
+			&& differentmap // Fixed in OPM
+			//  OG  doesn't check for different map when changing the max clients
+			//  which means the snapshot entities memory isn't reallocated
+			) {
 			SV_ChangeMaxClients();
 		}
 	}
@@ -611,6 +631,9 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		SV_Startup();
 	}
 
+	// Added in 2.0
+	SV_InitRadar();
+
 	sv.restarting = ( keep_scripts || !differentmap );
 	strncpy( last_mapname, mapname, sizeof( last_mapname ) );
 
@@ -675,7 +698,12 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		char filename[ MAX_QPATH ];
 
 		TIKI_FreeAll();
-		Com_sprintf( filename, sizeof( filename ), "maps/%s.bsp", mapname );
+		if ( CL_UseLargeLightmap( mapname ) ) {
+			Com_sprintf( filename, sizeof( filename ), "maps/%s.bsp", mapname );
+		} else {
+			// Added in 2.0
+			Com_sprintf( filename, sizeof( filename ), "maps/%s_sml.bsp", mapname );
+		}
 		CM_LoadMap( filename, qfalse, &checksum );
 
 		// set checksum
@@ -782,8 +810,8 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		// run a few frames to allow everything to settle
 		for( i = 0; i < 3; i++ )
 		{
-			ge->RunFrame( svs.time, 100 );
 			svs.time += 100;
+			ge->RunFrame( svs.time, 100 );
 
 			p = ge->errorMessage;
 			if( p )
@@ -812,7 +840,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 					|| Cvar_VariableIntegerValue( "g_gametype" ) == 0 )
 				{
 					// connect the client again
-					denied = ge->ClientConnect( i, qfalse );
+					denied = ge->ClientConnect( i, qfalse, qtrue );
 
 					p = ge->errorMessage;
 					if( p )
@@ -838,16 +866,40 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 			}
 		}
 
-		// the server sends these to the clients so they can figure
-		// out which pk3s should be auto-downloaded
-		Cvar_Set( "sv_paks", "" );
-		p = FS_ReferencedPakChecksums();
-		Cvar_Set( "sv_referencedPaks", p );
-		p = FS_ReferencedPakNames();
-		Cvar_Set( "sv_referencedPakNames", p );
+		if ( sv_pure->integer ) {
+			// the server sends these to the clients so they will only
+			// load pk3s also loaded at the server
+			p = FS_LoadedPakChecksums();
+			Cvar_Set( "sv_paks", p );
+			if (strlen(p) == 0) {
+				Com_Printf( "WARNING: sv_pure set but no PK3 files loaded\n" );
+			}
+			p = FS_LoadedPakNames();
+			Cvar_Set( "sv_pakNames", p );
+		}
+		else {
+			Cvar_Set( "sv_paks", "" );
+			Cvar_Set( "sv_pakNames", "" );
+		}
+
+		if (sv_allowDownload->integer) {
+			// the server sends these to the clients so they can figure
+			// out which pk3s should be auto-downloaded
+			p = FS_ReferencedPakChecksums();
+			Cvar_Set("sv_referencedPaks", p);
+			p = FS_ReferencedPakNames();
+			Cvar_Set("sv_referencedPakNames", p);
+        }
+        else {
+            // Changed in OPM
+            //  Don't export the pak list if download is disabled
+
+			Cvar_Set("sv_referencedPaks", "");
+			Cvar_Set("sv_referencedPakNames", "");
+		}
 
 		// save systeminfo and serverinfo strings
-		Q_strncpyz( systemInfo, Cvar_InfoString( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );
+		Q_strncpyz( systemInfo, Cvar_InfoString_Big( CVAR_SYSTEMINFO ), sizeof( systemInfo ) );
 		cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
 		SV_SetConfigstring( CS_SYSTEMINFO, systemInfo );
 
@@ -865,7 +917,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 
 		Hunk_SetMark();
 
-		if( com_dedicated->integer ) {
+		if( g_gametype->integer != GT_SINGLE_PLAYER ) {
 			ge->RegisterSounds();
 		}
 	}
@@ -880,7 +932,7 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 				const char	*denied;
 
 				// connect the client again
-				denied = ge->ClientConnect( i, qfalse );
+				denied = ge->ClientConnect( i, qfalse, qfalse );
 
 				p = ge->errorMessage;
 				if( p )
@@ -901,14 +953,14 @@ void SV_SpawnServer( const char *server, qboolean loadgame, qboolean restart, qb
 		}
 	}
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz(svs.gameName, "current", sizeof(svs.gameName) );
 
 	iEnd = Sys_Milliseconds();
 	Com_Printf( "------ Server Initialization Complete ------ %5.2f seconds\n", ( float )iEnd / 1000.0f );
 
 	UI_LoadResource( "*143" );
 
-	if( g_gametype->integer ) {
+	if( g_gametype->integer != GT_SINGLE_PLAYER ) {
 		SV_ServerLoaded();
 	}
 }
@@ -932,9 +984,9 @@ void SV_ServerLoaded( void ) {
 	sv.state = SS_GAME;
 	sv.timeResidual = 0;
 	svs.startTime = svs.time - svs.mapTime;
-	if( svs.time - svs.mapTime < 0 )
+	if( svs.startTime < 0 )
 	{
-		svs.time -= svs.time - svs.mapTime;
+		svs.time -= svs.startTime;
 		svs.startTime = 0;
 	}
 
@@ -969,51 +1021,67 @@ SV_Init
 Only called at main exe startup, not for each game
 ===============
 */
-void SV_Init( void ) {
+void SV_Init (void)
+{
+	int index;
+
 	SV_AddOperatorCommands();
 
 	// serverinfo vars
-	Cvar_Get( "dmflags", "0", CVAR_SERVERINFO );
-	Cvar_Get( "fraglimit", "20", CVAR_SERVERINFO );
-	Cvar_Get( "timelimit", "0", CVAR_SERVERINFO );
+	Cvar_Get ("dmflags", "0", CVAR_SERVERINFO);
+	Cvar_Get ("fraglimit", "20", CVAR_SERVERINFO);
+	Cvar_Get ("timelimit", "0", CVAR_SERVERINFO);
+	g_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH );
+	g_gametypestring = Cvar_Get( "g_gametypestring", "0", CVAR_SERVERINFO | CVAR_LATCH );
 	Cvar_Get( "sv_keywords", "", CVAR_SERVERINFO );
 	Cvar_Get( "protocol", va( "%i", PROTOCOL_VERSION ), CVAR_SERVERINFO | CVAR_ROM );
 	sv_mapname = Cvar_Get( "mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM );
 	sv_privateClients = Cvar_Get( "sv_privateClients", "0", CVAR_SERVERINFO );
 	sv_hostname = Cvar_Get( "sv_hostname", "Nameless OpenMoHAA Battle", CVAR_SERVERINFO | CVAR_ARCHIVE );
-	sv_maxclients = Cvar_Get( "sv_maxclients", "8", CVAR_SERVERINFO | CVAR_LATCH );
+	sv_maxclients = Cvar_Get( "sv_maxclients", "1", CVAR_SERVERINFO | CVAR_LATCH );
+
 	sv_minRate = Cvar_Get ("sv_minRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maxRate = Cvar_Get( "sv_maxRate", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_dlRate = Cvar_Get("sv_dlRate", "100", CVAR_ARCHIVE | CVAR_SERVERINFO);
 	sv_minPing = Cvar_Get( "sv_minPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maxPing = Cvar_Get( "sv_maxPing", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
-	sv_floodProtect = Cvar_Get( "sv_floodProtect", "1", CVAR_ARCHIVE | CVAR_SERVERINFO );
+	// Flood protect causes some annoyance like when trying to reload the weapon while checking scores
+	// so it's disabled by default.
+	// Since 2.0, flood protect only protect against "dmmessage" flood.
+	sv_floodProtect = Cvar_Get( "sv_floodProtect", "0", CVAR_ARCHIVE | CVAR_SERVERINFO );
 	sv_maplist = Cvar_Get( "sv_maplist", "", CVAR_ARCHIVE | CVAR_SERVERINFO );
-	g_gametype = Cvar_Get ("g_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH );
-	g_gametypestring = Cvar_Get( "g_gametypestring", "0", CVAR_SERVERINFO | CVAR_LATCH );
 
 	// systeminfo
-	Cvar_Get( "cheats", "1", CVAR_INIT | CVAR_LATCH );
+	Cvar_Get( "cheats", "1", CVAR_LATCH | CVAR_SYSTEMINFO );
 	sv_serverid = Cvar_Get ("sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM );
-	// wombat: pure only makes problems at current stage
+    // wombat: pure only makes problems at current stage
+    // sv_pure is disabled by default in mohaa
+	// the problem is because of difference in pak files between languages
 	sv_pure = Cvar_Get ("sv_pure", "0", CVAR_SYSTEMINFO );
+#ifdef USE_VOIP
+	sv_voip = Cvar_Get("sv_voip", "1", CVAR_LATCH);
+	Cvar_CheckRange(sv_voip, 0, 1, qtrue);
+	sv_voipProtocol = Cvar_Get("sv_voipProtocol", sv_voip->integer ? "opus" : "", CVAR_SYSTEMINFO | CVAR_ROM );
+#endif
 	Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_referencedPaks", "", CVAR_SYSTEMINFO | CVAR_ROM );
+	Cvar_Get ("sv_referencedPakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );
 
 	// server vars
 	sv_rconPassword = Cvar_Get ("rconPassword", "", CVAR_TEMP );
 	sv_privatePassword = Cvar_Get ("sv_privatePassword", "", CVAR_TEMP );
-	sv_fps = Cvar_Get ("sv_fps", "20", CVAR_SAVEGAME | CVAR_SERVERINFO );
+	sv_fps = Cvar_Get ("sv_fps", "20", CVAR_SAVEGAME | CVAR_SERVERINFO | CVAR_NORESTART );
 	sv_timeout = Cvar_Get ("sv_timeout", "120", CVAR_TEMP );
 	sv_zombietime = Cvar_Get ("sv_zombietime", "2", CVAR_TEMP );
 	Cvar_Get ("nextmap", "", CVAR_TEMP );
 
-	sv_allowDownload = Cvar_Get ("sv_allowDownload", "1", CVAR_SERVERINFO);
+	sv_allowDownload = Cvar_Get ("sv_allowDownload", "0", CVAR_SERVERINFO);
 	Cvar_Get ("sv_dlURL", "", CVAR_SERVERINFO | CVAR_ARCHIVE);
 	sv_master[ 0 ] = Cvar_Get( "sv_master1", MASTER_SERVER_NAME, 0 );
-	sv_master[ 1 ] = Cvar_Get( "sv_master2", "", CVAR_ARCHIVE );
-	sv_master[ 2 ] = Cvar_Get( "sv_master3", "", CVAR_ARCHIVE );
-	sv_master[ 3 ] = Cvar_Get( "sv_master4", "", CVAR_ARCHIVE );
-	sv_master[ 4 ] = Cvar_Get( "sv_master5", "", CVAR_ARCHIVE );
+	for(index = 1; index < MAX_MASTER_SERVERS; index++)
+		sv_master[index] = Cvar_Get(va("sv_master%d", index + 1), "", CVAR_ARCHIVE);
+
 	sv_reconnectlimit = Cvar_Get ("sv_reconnectlimit", "3", 0);
 	sv_showloss = Cvar_Get ("sv_showloss", "0", 0);
 	sv_padPackets = Cvar_Get ("sv_padPackets", "0", 0);
@@ -1021,16 +1089,33 @@ void SV_Init( void ) {
 	sv_mapChecksum = Cvar_Get ("sv_mapChecksum", "", CVAR_ROM | CVAR_SERVERINFO);
 	sv_drawentities = Cvar_Get( "sv_drawentities", "1", 0 );
 	sv_deeptracedebug = Cvar_Get( "sv_deeptracedebug", "0", 0 );
+    sv_netprofile = Cvar_Get("sv_netprofile", "0", 0);
+    sv_netprofileoverlay = Cvar_Get("sv_netprofileoverlay", "0", 0);
+    sv_netoptimize = Cvar_Get("sv_netoptimize", "0", 0);
+	sv_netoptimize_vistime = Cvar_Get("sv_netoptimize_vistime", "200", 0);
+    g_netoptimize = Cvar_Get("g_netoptimize", "1", 0);
 	sv_chatter = Cvar_Get( "sv_chatter", "0", 0 );
 	sv_lanForceRate = Cvar_Get ("sv_lanForceRate", "1", CVAR_ARCHIVE );
+#ifndef STANDALONE
 	sv_strictAuth = Cvar_Get ("sv_strictAuth", "1", CVAR_ARCHIVE );
+#endif
+	sv_banFile = Cvar_Get("sv_banFile", "serverbans.dat", CVAR_ARCHIVE);
 
-	strcpy( svs.gameName, "current" );
+	Q_strncpyz( svs.gameName, "current", sizeof(svs.gameName) );
 
 	// dday vars
 	Cvar_Get( "g_ddayfodderguys", "0", CVAR_ARCHIVE );
 	Cvar_Get( "g_ddayfog", "2", CVAR_ARCHIVE );
 	Cvar_Get( "g_ddayshingleguys", "0", CVAR_ARCHIVE );
+	
+	// Load saved bans
+	Cbuf_AddText("rehashbans\n");
+
+    if (com_gotOriginalConfig) {
+        // Added in OPM
+        //  Apply config tweaks after loading the original config
+		SV_ApplyOriginalConfigTweaks();
+	}
 }
 
 
@@ -1058,7 +1143,7 @@ void SV_FinalMessage( const char *message ) {
 					SV_SendServerCommand( cl, "disconnect \"%s\"", message );
 				}
 				// force a snapshot to be sent
-				cl->nextSnapshotTime = -1;
+				cl->lastSnapshotTime = 0;
 				SV_SendClientSnapshot( cl );
 			}
 		}
@@ -1094,8 +1179,14 @@ void SV_Shutdown( const char *finalmsg ) {
 	SV_ClearServer();
 
 	// free server static data
-	if ( svs.clients ) {
-		Z_Free( svs.clients );
+	if(svs.clients)
+	{
+		int index;
+		
+		for(index = 0; index < sv_maxclients->integer; index++)
+			SV_FreeClient(&svs.clients[index]);
+		
+		Z_Free(svs.clients);
 	}
 	Com_Memset( &svs, 0, sizeof( svs ) );
 
@@ -1109,3 +1200,143 @@ void SV_Shutdown( const char *finalmsg ) {
 		CL_Disconnect();
 }
 
+//
+// Added in OPM
+//
+
+/*
+===============
+SV_PVSSoundIndex
+===============
+*/
+int SV_PVSSoundIndex( const char *name, qboolean streamed )
+{
+	int		i;
+	int		max = MAX_SOUNDS;
+	char	*s;
+
+	if( !name || !name[ 0 ] ) {
+		return 0;
+	}
+
+	for( i = 1; i<max; i++ ) {
+		s = sv.configstrings[CS_SOUNDS + i ];
+
+		if( !s || !s[ 0 ] ) {
+			SV_SetConfigstring(CS_SOUNDS + i, name);
+			break;
+		}
+		if( !strcmp( s, name ) ) {
+			break;
+		}
+	}
+
+	if( i == max ) {
+		int found = 0;
+
+		// Remove existing sound indexes
+		for (i = 1; i < max; i++) {
+			if (svs.nonpvs_sound_cache[i].inUse) {
+				if (!found) {
+					found = i;
+				}
+
+				svs.nonpvs_sound_cache[i].inUse = qfalse;
+				SV_SetConfigstring(CS_SOUNDS + i, NULL);
+			}
+		}
+
+		if (!found) {
+			return 0;
+		}
+
+		i = found;
+	}
+
+	svs.nonpvs_sound_cache[i].inUse = qtrue;
+	svs.nonpvs_sound_cache[i].deleteTime = svs.time + 200;
+
+	return i;
+}
+
+/*
+=======================
+SV_CacheNonPVSSound
+=======================
+*/
+void SV_CacheNonPVSSound(void)
+{
+	gentity_t* ent;
+	nonpvs_sound_t* npvs;
+	int i, j;
+
+	for (i = 0; i < sv.num_entities; i++) {
+		ent = SV_GentityNum(i);
+
+		for (j = 0; j < ent->r.num_nonpvs_sounds; j++) {
+			npvs = &ent->r.nonpvs_sounds[j];
+			if (npvs->index) {
+				svs.nonpvs_sound_cache[npvs->index].inUse = qtrue;
+				svs.nonpvs_sound_cache[npvs->index].deleteTime = svs.time + 200;
+			}
+		}
+	}
+}
+
+/*
+=======================
+SV_CleanupNonPVSSound
+=======================
+*/
+void SV_CleanupNonPVSSound(void)
+{
+	nonpvs_sound_cache_t* cache;
+	int i, j, k, l;
+
+	for (i = 1; i < MAX_SOUNDS; i++) {
+		cache = &svs.nonpvs_sound_cache[i];
+
+		if (!sv.configstrings[CS_SOUNDS + i]) {
+			continue;
+		}
+
+		if (!cache->inUse) {
+			continue;
+		}
+
+		if (svs.time >= cache->deleteTime) {
+			SV_SetConfigstring(CS_SOUNDS + i, NULL);
+			cache->inUse = qfalse;
+		}
+	}
+}
+
+/*
+===============
+SV_HandleNonPVSSound
+===============
+*/
+void SV_HandleNonPVSSound()
+{
+	gentity_t *ent;
+	int i;
+
+	SV_CacheNonPVSSound();
+
+	for (i = 0; i < sv.num_entities; i++) {
+		ent = SV_GentityNum(i);
+		ent->r.num_nonpvs_sounds = 0;
+	}
+
+	// Free up sound indices
+	SV_CleanupNonPVSSound();
+}
+
+/*
+===============
+SV_ApplyOriginalConfigTweaks
+===============
+*/
+void SV_ApplyOriginalConfigTweaks()
+{
+}
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index a9c3950a..c2ffbbd7 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -21,8 +21,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "server.h"
+#include "../gamespy/sv_gamespy.h"
+#include "../gamespy/sv_gqueryreporting.h"
+
+#ifdef USE_VOIP
+cvar_t *sv_voip;
+cvar_t *sv_voipProtocol;
+#endif
 
-cvar_t			*sv_mapname;
 serverStatic_t	svs;				// persistant server info
 server_t		sv;					// local server
 //vm_t			*gvm = NULL;				// game virtual machine
@@ -43,6 +49,7 @@ cvar_t	*sv_reconnectlimit;		// minimum seconds between connect messages
 cvar_t	*sv_showloss;			// report when usercmds are lost
 cvar_t	*sv_padPackets;			// add nop bytes to messages
 cvar_t	*sv_killserver;			// menu system can set to 1 to shut server down
+cvar_t	*sv_mapname;
 cvar_t	*sv_mapChecksum;
 cvar_t	*sv_serverid;
 cvar_t	*sv_minRate;
@@ -55,6 +62,11 @@ cvar_t	*sv_floodProtect;
 cvar_t	*sv_maplist;
 cvar_t	*sv_drawentities;
 cvar_t	*sv_deeptracedebug;
+cvar_t	*sv_netprofile;
+cvar_t	*sv_netprofileoverlay;
+cvar_t	*sv_netoptimize;
+cvar_t	*sv_netoptimize_vistime;
+cvar_t	*g_netoptimize;
 cvar_t	*g_gametype;
 cvar_t	*g_gametypestring;
 cvar_t	*sv_chatter;
@@ -62,12 +74,14 @@ cvar_t	*sv_gamename;
 cvar_t	*sv_location;
 cvar_t	*sv_debug_gamespy;
 cvar_t	*sv_gamespy;
-
-// FIXME: use another global network ?
-//cvar_t	*sv_debug_gamepsy;
-//cvar_t	*sv_gamespy;
 cvar_t	*sv_lanForceRate; // dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
+#ifndef STANDALONE
 cvar_t	*sv_strictAuth;
+#endif
+cvar_t	*sv_banFile;
+
+serverBan_t serverBans[SERVER_MAXBANS];
+int serverBansCount = 0;
 
 /*
 =============================================================================
@@ -146,9 +160,9 @@ void SV_AddServerCommand( client_t *client, const char *cmd ) {
 
 	// this is very ugly but it's also a waste to for instance send multiple config string updates
 	// for the same config string index in one snapshot
-//	if ( SV_ReplacePendingServerCommands( client, cmd ) ) {
-//		return;
-//	}
+	if ( !strncmp(cmd, "cs ", 3) && SV_ReplacePendingServerCommands(client, cmd) ) {
+		return;
+	}
 
 	// do not send commands until the gamestate has been sent
 	if( client->state < CS_PRIMED )
@@ -160,6 +174,12 @@ void SV_AddServerCommand( client_t *client, const char *cmd ) {
 	// we check == instead of >= so a broadcast print added by SV_DropClient()
 	// doesn't cause a recursive drop client
 	if ( client->reliableSequence - client->reliableAcknowledge == MAX_RELIABLE_COMMANDS + 1 ) {
+		if ( client->gamestateMessageNum == -1 )  {
+			// invalid game state message 
+			// this can occur in SV_DropClient() to avoid calling it more than once
+			return;
+		}
+
 		Com_Printf( "===== pending server commands =====\n" );
 		for ( i = client->reliableAcknowledge + 1 ; i <= client->reliableSequence ; i++ ) {
 			Com_Printf( "cmd %5d: %s\n", i, client->reliableCommands[ i & (MAX_RELIABLE_COMMANDS-1) ] );
@@ -187,6 +207,10 @@ void QDECL SV_SendServerCommand(client_t *cl, const char *fmt, ...) {
 	byte		message[MAX_MSGLEN];
 	client_t	*client;
 	int			j;
+
+	if (!svs.clients) {
+		return;
+	}
 	
 	va_start (argptr,fmt);
 	Q_vsnprintf ((char *)message, sizeof(message), fmt,argptr);
@@ -196,7 +220,7 @@ void QDECL SV_SendServerCommand(client_t *cl, const char *fmt, ...) {
 	// The actual cause of the bug is probably further downstream
 	// and should maybe be addressed later, but this certainly
 	// fixes the problem for now
-	if ( strlen ((char *)message) > 1022 ) {
+	if ( strlen ((char *)message) + 1 >= MAX_STRING_CHARS ) {
 		return;
 	}
 
@@ -210,7 +234,7 @@ void QDECL SV_SendServerCommand(client_t *cl, const char *fmt, ...) {
 		Com_Printf ("broadcast: %s\n", SV_ExpandNewlines((char *)message) );
 	}
 
-	// send the data to all relevent clients
+	// send the data to all relevant clients
 	for (j = 0, client = svs.clients; j < sv_maxclients->integer ; j++, client++) {
 		SV_AddServerCommand( client, (char *)message );
 	}
@@ -243,7 +267,7 @@ void SV_MasterHeartbeat( void ) {
 
 	if (svs.time >= svs.nextHeartbeatTime)
 	{
-		svs.nextHeartbeatTime = svs.time + 300000;
+		svs.nextHeartbeatTime = svs.time + HB_TIME;
 		SV_GamespyHeartbeat();
 	}
 }
@@ -277,6 +301,167 @@ CONNECTIONLESS COMMANDS
 ==============================================================================
 */
 
+// This is deliberately quite large to make it more of an effort to DoS
+#define MAX_BUCKETS			16384
+#define MAX_HASHES			1024
+
+static leakyBucket_t buckets[ MAX_BUCKETS ];
+static leakyBucket_t *bucketHashes[ MAX_HASHES ];
+leakyBucket_t outboundLeakyBucket;
+
+/*
+================
+SVC_HashForAddress
+================
+*/
+static long SVC_HashForAddress( netadr_t address ) {
+	byte 		*ip = NULL;
+	size_t	size = 0;
+	int			i;
+	long		hash = 0;
+
+	switch ( address.type ) {
+		case NA_IP:  ip = address.ip;  size = 4; break;
+		case NA_IP6: ip = address.ip6; size = 16; break;
+		default: break;
+	}
+
+	for ( i = 0; i < size; i++ ) {
+		hash += (long)( ip[ i ] ) * ( i + 119 );
+	}
+
+	hash = ( hash ^ ( hash >> 10 ) ^ ( hash >> 20 ) );
+	hash &= ( MAX_HASHES - 1 );
+
+	return hash;
+}
+
+/*
+================
+SVC_BucketForAddress
+
+Find or allocate a bucket for an address
+================
+*/
+static leakyBucket_t *SVC_BucketForAddress( netadr_t address, int burst, int period ) {
+	leakyBucket_t	*bucket = NULL;
+	int						i;
+	long					hash = SVC_HashForAddress( address );
+	int						now = Sys_Milliseconds();
+
+	for ( bucket = bucketHashes[ hash ]; bucket; bucket = bucket->next ) {
+		switch ( bucket->type ) {
+			case NA_IP:
+				if ( memcmp( bucket->ipv._4, address.ip, 4 ) == 0 ) {
+					return bucket;
+				}
+				break;
+
+			case NA_IP6:
+				if ( memcmp( bucket->ipv._6, address.ip6, 16 ) == 0 ) {
+					return bucket;
+				}
+				break;
+
+			default:
+				break;
+		}
+	}
+
+	for ( i = 0; i < MAX_BUCKETS; i++ ) {
+		int interval;
+
+		bucket = &buckets[ i ];
+		interval = now - bucket->lastTime;
+
+		// Reclaim expired buckets
+		if ( bucket->lastTime > 0 && ( interval > ( burst * period ) ||
+					interval < 0 ) ) {
+			if ( bucket->prev != NULL ) {
+				bucket->prev->next = bucket->next;
+			} else {
+				bucketHashes[ bucket->hash ] = bucket->next;
+			}
+			
+			if ( bucket->next != NULL ) {
+				bucket->next->prev = bucket->prev;
+			}
+
+			Com_Memset( bucket, 0, sizeof( leakyBucket_t ) );
+		}
+
+		if ( bucket->type == NA_BAD ) {
+			bucket->type = address.type;
+			switch ( address.type ) {
+				case NA_IP:  Com_Memcpy( bucket->ipv._4, address.ip, 4 );   break;
+				case NA_IP6: Com_Memcpy( bucket->ipv._6, address.ip6, 16 ); break;
+				default: break;
+			}
+
+			bucket->lastTime = now;
+			bucket->burst = 0;
+			bucket->hash = hash;
+
+			// Add to the head of the relevant hash chain
+			bucket->next = bucketHashes[ hash ];
+			if ( bucketHashes[ hash ] != NULL ) {
+				bucketHashes[ hash ]->prev = bucket;
+			}
+
+			bucket->prev = NULL;
+			bucketHashes[ hash ] = bucket;
+
+			return bucket;
+		}
+	}
+
+	// Couldn't allocate a bucket for this address
+	return NULL;
+}
+
+/*
+================
+SVC_RateLimit
+================
+*/
+qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
+	if ( bucket != NULL ) {
+		int now = Sys_Milliseconds();
+		int interval = now - bucket->lastTime;
+		int expired = interval / period;
+		int expiredRemainder = interval % period;
+
+		if ( expired > bucket->burst || interval < 0 ) {
+			bucket->burst = 0;
+			bucket->lastTime = now;
+		} else {
+			bucket->burst -= expired;
+			bucket->lastTime = now - expiredRemainder;
+		}
+
+		if ( bucket->burst < burst ) {
+			bucket->burst++;
+
+			return qfalse;
+		}
+	}
+
+	return qtrue;
+}
+
+/*
+================
+SVC_RateLimitAddress
+
+Rate limit for a particular address
+================
+*/
+qboolean SVC_RateLimitAddress( netadr_t from, int burst, int period ) {
+	leakyBucket_t *bucket = SVC_BucketForAddress( from, burst, period );
+
+	return SVC_RateLimit( bucket, burst, period );
+}
+
 /*
 ================
 SVC_Status
@@ -301,12 +486,38 @@ void SVC_Status( netadr_t from ) {
 		return;
 	}
 
-	strcpy( infostring, Cvar_InfoString( CVAR_SERVERINFO ) );
+	// Prevent using getstatus as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_Status: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
+
+	// Allow getstatus to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SVC_Status: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
+	// A maximum challenge length of 128 should be more than plenty.
+	if(strlen(Cmd_Argv(1)) > 128)
+		return;
+
+	Q_strncpyz( infostring, Cvar_InfoString( CVAR_SERVERINFO ), sizeof( infostring ) );
 
 	// echo back the parameter to status. so master servers can use it as a challenge
 	// to prevent timed spoofed reply packets that add ghost servers
 	Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
 
+	if (Cvar_VariableIntegerValue("fs_restrict")) {
+		char keywords[MAX_INFO_STRING];
+
+		// Append "demo" at the beginning of the keywords
+		Com_sprintf(keywords, sizeof(keywords), "demo %s", Info_ValueForKey(infostring, "sv_keywords"));
+		Info_SetValueForKey(infostring, "sv_keywords", keywords);
+	}
+
 	status[0] = 0;
 	statusLength = 0;
 
@@ -314,20 +525,20 @@ void SVC_Status( netadr_t from ) {
 		cl = &svs.clients[i];
 		if ( cl->state >= CS_CONNECTED ) {
 			ps = SV_GameClientNum( i );
-			Com_sprintf (player, sizeof(player), "%i %i \"%s\"\n", 
+			Com_sprintf (player, sizeof(player), "%i \"%s\"\n", 
 			// su44: ps->persistant is not avaible in MoHAA
 			//	ps->persistant[PERS_SCORE], cl->ping, cl->name);
-				0, cl->ping, cl->name);
+				cl->ping, cl->name);
 			playerLength = strlen(player);
 			if (statusLength + playerLength >= sizeof(status) ) {
 				break;		// can't hold any more
 			}
-			strcpy (status + statusLength, player);
+			Q_strncpyz (status + statusLength, player, sizeof(status) - statusLength);
 			statusLength += playerLength;
 		}
 	}
 
-	NET_OutOfBandPrint( NS_SERVER, from, "statusResponse\n%s\n%s", infostring, status );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "statusResponse\n%s\n%s", infostring, status );
 }
 
 /*
@@ -348,6 +559,20 @@ void SVC_Info( netadr_t from ) {
 		return;
 	}
 
+	// Prevent using getinfo as an amplifier
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_Info: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
+		return;
+	}
+
+	// Allow getinfo to be DoSed relatively easily, but prevent
+	// excess outbound bandwidth usage when being flooded inbound
+	if ( SVC_RateLimit( &outboundLeakyBucket, 10, 100 ) ) {
+		Com_DPrintf( "SVC_Info: rate limit exceeded, dropping request\n" );
+		return;
+	}
+
 	/*
 	 * Check whether Cmd_Argv(1) has a sane length. This was not done in the original Quake3 version which led
 	 * to the Infostring bug discovered by Luigi Auriemma. See http://aluigi.altervista.org/ for the advisory.
@@ -371,7 +596,7 @@ void SVC_Info( netadr_t from ) {
 	// to prevent timed spoofed reply packets that add ghost servers
 	Info_SetValueForKey( infostring, "challenge", Cmd_Argv(1) );
 
-	Info_SetValueForKey( infostring, "protocol", va("%i", PROTOCOL_VERSION) );
+	Info_SetValueForKey( infostring, "protocol", va("%i", com_protocol->integer) );
 	Info_SetValueForKey( infostring, "hostname", sv_hostname->string );
 	Info_SetValueForKey( infostring, "mapname", sv_mapname->string );
 	Info_SetValueForKey( infostring, "clients", va("%i", count) );
@@ -381,6 +606,12 @@ void SVC_Info( netadr_t from ) {
 	Info_SetValueForKey( infostring, "gametypestring", g_gametypestring->string );
 	Info_SetValueForKey( infostring, "pure", va("%i", sv_pure->integer ) );
 
+#ifdef USE_VOIP
+	if (sv_voipProtocol->string && *sv_voipProtocol->string) {
+		Info_SetValueForKey( infostring, "voip", sv_voipProtocol->string );
+	}
+#endif
+
 	if( sv_minPing->integer ) {
 		Info_SetValueForKey( infostring, "minPing", va("%i", sv_minPing->integer) );
 	}
@@ -392,10 +623,17 @@ void SVC_Info( netadr_t from ) {
 		Info_SetValueForKey( infostring, "game", gamedir );
 	}
 
-	Info_SetValueForKey(infostring, "gamever", com_target_version->string);
-	Info_SetValueForKey(infostring, "serverType", com_target_game->string);
+    if (!com_target_demo->integer || com_target_game->integer <= TG_MOH) {
+        Info_SetValueForKey(infostring, "gamever", com_target_version->string);
+	} else {
+		Info_SetValueForKey(infostring, "gamever", va("d%s", com_target_version->string));
+	}
 
-	NET_OutOfBandPrint( NS_SERVER, from, "infoResponse\n%s", infostring );
+	if (com_target_game->integer >= TG_MOHTT) {
+		Info_SetValueForKey(infostring, "serverType", va("%i", com_target_game->integer));
+	}
+
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "infoResponse\n%s", infostring );
 }
 
 /*
@@ -404,8 +642,8 @@ SVC_FlushRedirect
 
 ================
 */
-void SV_FlushRedirect( char *outputbuf ) {
-	NET_OutOfBandPrint( NS_SERVER, svs.redirectAddress, "print\n%s", outputbuf );
+static void SV_FlushRedirect( char *outputbuf ) {
+	SV_NET_OutOfBandPrint( &svs.netprofile, svs.redirectAddress, "print\n%s", outputbuf );
 }
 
 /*
@@ -417,26 +655,32 @@ Shift down the remaining args
 Redirect all printfs
 ===============
 */
-void SVC_RemoteCommand( netadr_t from, msg_t *msg ) {
+static void SVC_RemoteCommand( netadr_t from, msg_t *msg ) {
 	qboolean	valid;
-	unsigned int time;
 	char		remaining[1024];
 	// TTimo - scaled down to accumulate, but not overflow anything network wise, print wise etc.
 	// (OOB messages are the bottleneck here)
 #define SV_OUTPUTBUF_LENGTH (1024 - 16)
 	char		sv_outputbuf[SV_OUTPUTBUF_LENGTH];
-	static unsigned int lasttime = 0;
 	char *cmd_aux;
 
-	// TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=534
-	time = Com_Milliseconds();
-	if ( (unsigned)( time - lasttime ) < 500u ) {
+	// Prevent using rcon as an amplifier and make dictionary attacks impractical
+	if ( SVC_RateLimitAddress( from, 10, 1000 ) ) {
+		Com_DPrintf( "SVC_RemoteCommand: rate limit from %s exceeded, dropping request\n",
+			NET_AdrToString( from ) );
 		return;
 	}
-	lasttime = time;
 
 	if ( !strlen( sv_rconPassword->string ) ||
 		strcmp (Cmd_Argv(1), sv_rconPassword->string) ) {
+		static leakyBucket_t bucket;
+
+		// Make DoS via rcon impractical
+		if ( SVC_RateLimit( &bucket, 10, 1000 ) ) {
+			Com_DPrintf( "SVC_RemoteCommand: rate limit exceeded, dropping request\n" );
+			return;
+		}
+
 		valid = qfalse;
 		Com_Printf ("Bad rcon from %s:\n%s\n", NET_AdrToString (from), Cmd_Argv(2) );
 	} else {
@@ -491,6 +735,10 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	char	*s;
 	char	*c;
 
+	if (sv_netprofile->integer) {
+		NetProfileAddPacket(&svs.netprofile.inPackets, msg->cursize, NETPROF_PACKET_MESSAGE);
+	}
+
 	MSG_BeginReadingOOB( msg );
 	MSG_ReadLong( msg );		// skip the -1 marker
 
@@ -507,15 +755,15 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 	Com_DPrintf ("SV packet %s : %s\n", NET_AdrToString(from), c);
 
 	if (!Q_stricmp(c, "getstatus")) {
-		SVC_Status( from  );
+		SVC_Status( from );
   } else if (!Q_stricmp(c, "getinfo")) {
 		SVC_Info( from );
 	} else if (!Q_stricmp(c, "getchallenge")) {
-		SV_GetChallenge( from );
+		SV_GetChallenge(from);
 	} else if (!Q_stricmp(c, "connect")) {
 		SV_DirectConnect( from );
-	} else if (!Q_stricmp(c, "ipAuthorize")) {
-		SV_AuthorizeIpPacket( from );
+	} else if (!Q_stricmp(c, "authorizeThis")) {
+		SV_GamespyAuthorize( from, Cmd_Argv(1) );
 	} else if (!Q_stricmp(c, "rcon")) {
 		SVC_RemoteCommand( from, msg );
 	} else if (!Q_stricmp(c, "disconnect")) {
@@ -523,8 +771,8 @@ void SV_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
 		// server disconnect messages when their new server sees our final
 		// sequenced messages to the old client
 	} else {
-		Com_DPrintf ("bad connectionless packet from %s:\n%s\n"
-		, NET_AdrToString (from), s);
+		Com_DPrintf ("bad connectionless packet from %s:\n%s\n",
+			NET_AdrToString (from), s);
 	}
 }
 
@@ -549,7 +797,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 	// read the qport out of the message so we can fix up
 	// stupid address translating routers
 	MSG_BeginReadingOOB( msg );
-	i=MSG_ReadLong( msg );				// sequence number
+	MSG_ReadLong( msg );				// sequence number
 	qport = MSG_ReadShort( msg ) & 0xffff;
 
 	// find which client the message is from
@@ -580,7 +828,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 			// to make sure they don't need to retransmit the final
 			// reliable message, but they don't do any other processing
 			if (cl->state != CS_ZOMBIE) {
-				cl->lastPacketTime = svs.lastTime;	// don't timeout
+				cl->lastPacketTime = svs.time;	// don't timeout
 				SV_ExecuteClientMessage( cl, msg );
 			}
 		}
@@ -589,7 +837,7 @@ void SV_PacketEvent( netadr_t from, msg_t *msg ) {
 	
 	// if we received a sequenced packet from an address we don't recognize,
 	// send an out of band disconnect packet to it
-	NET_OutOfBandPrint( NS_SERVER, from, "disconnect" );
+	SV_NET_OutOfBandPrint( &svs.netprofile, from, "disconnect" );
 }
 
 
@@ -600,7 +848,7 @@ SV_CalcPings
 Updates the cl->ping variables
 ===================
 */
-void SV_CalcPings( void ) {
+static void SV_CalcPings( void ) {
 	int			i, j;
 	client_t	*cl;
 	int			total, count;
@@ -660,7 +908,7 @@ for a few seconds to make sure any final reliable message gets resent
 if necessary
 ==================
 */
-void SV_CheckTimeouts( void ) {
+static void SV_CheckTimeouts( void ) {
 	int		i;
 	client_t	*cl;
 	int			droppoint;
@@ -711,6 +959,7 @@ qboolean SV_CheckPaused( void ) {
 	}
 
 	if( !ge->AllowPaused() ) {
+		Com_Unpause();
 		return qfalse;
 	}
 
@@ -785,9 +1034,16 @@ void SV_Frame( int msec ) {
 	if( !com_sv_running->integer )
 	{
 		// Running as a server, but no map loaded
+#ifdef DEDICATED
+		// Block until something interesting happens
+		Sys_Sleep(-1);
+#endif
+
 		return;
 	}
 
+	SV_NET_UpdateAllNetProfileInfo();
+
 	// allow pause if only the local client is connected
 	if ( SV_CheckPaused() ) {
 		return;
@@ -797,17 +1053,17 @@ void SV_Frame( int msec ) {
 	if ( sv_fps->integer < 1 ) {
 		Cvar_Set( "sv_fps", "20" );
 	}
-
+    
 	frameMsec = 1000 / sv_fps->integer;
-	sv.timeResidual += msec;
-
-	if ( com_dedicated->integer && sv.timeResidual < frameMsec ) {
-		// NET_Sleep will give the OS time slices until either get a packet
-		// or time enough for a server frame has gone by
-		NET_Sleep( frameMsec - sv.timeResidual );
-		return;
+	// don't let it scale below 1ms
+	if(frameMsec < 1)
+	{
+		Cvar_Set("timescale", va("%f", sv_fps->integer / 1000.0f));
+		frameMsec = 1;
 	}
 
+	sv.timeResidual += msec;
+
 	// if time is about to hit the 32nd bit, kick all clients
 	// and clear sv.time, rather
 	// than checking for negative time wraparound everywhere.
@@ -830,7 +1086,7 @@ void SV_Frame( int msec ) {
 		cvar_modifiedFlags &= ~CVAR_SERVERINFO;
 	}
 	if ( cvar_modifiedFlags & CVAR_SYSTEMINFO ) {
-		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString( CVAR_SYSTEMINFO ) );
+		SV_SetConfigstring( CS_SYSTEMINFO, Cvar_InfoString_Big( CVAR_SYSTEMINFO ) );
 		cvar_modifiedFlags &= ~CVAR_SYSTEMINFO;
 	}
 
@@ -883,6 +1139,13 @@ void SV_Frame( int msec ) {
 	// send a heartbeat to the master if needed
 	SV_MasterHeartbeat();
 
+	// process all gamespy queries
+	SV_ProcessGamespyQueries();
+
+	// Added in OPM
+	//  Handle non-pvs sounds
+	SV_HandleNonPVSSound();
+
 	svs.lastTime = svs.time;
 }
 
@@ -905,7 +1168,7 @@ void Com_Pause()
 		return;
 	}
 
-	if( paused->integer ) {
+	if( paused->integer == 1 ) {
 		return;
 	}
 
@@ -999,42 +1262,42 @@ a client based on its rate settings
 #define UDPIP_HEADER_SIZE 28
 #define UDPIP6_HEADER_SIZE 48
 
-int SV_RateMsec(client_t* client)
+int SV_RateMsec(client_t *client)
 {
-    int rate, rateMsec;
-    int messageSize;
+	int rate, rateMsec;
+	int messageSize;
+	
+	messageSize = client->netchan.lastSentSize;
+	rate = client->rate;
 
-    messageSize = client->netchan.lastSentSize;
-    rate = client->rate;
+	if(sv_maxRate->integer)
+	{
+		if(sv_maxRate->integer < 1000)
+			Cvar_Set( "sv_MaxRate", "1000" );
+		if(sv_maxRate->integer < rate)
+			rate = sv_maxRate->integer;
+	}
 
-    if (sv_maxRate->integer)
-    {
-        if (sv_maxRate->integer < 1000)
-            Cvar_Set("sv_MaxRate", "1000");
-        if (sv_maxRate->integer < rate)
-            rate = sv_maxRate->integer;
-    }
+	if(sv_minRate->integer)
+	{
+		if(sv_minRate->integer < 1000)
+			Cvar_Set("sv_minRate", "1000");
+		if(sv_minRate->integer > rate)
+			rate = sv_minRate->integer;
+	}
 
-    if (sv_minRate->integer)
-    {
-        if (sv_minRate->integer < 1000)
-            Cvar_Set("sv_minRate", "1000");
-        if (sv_minRate->integer > rate)
-            rate = sv_minRate->integer;
-    }
-
-    if (client->netchan.remoteAddress.type == NA_IP6)
-        messageSize += UDPIP6_HEADER_SIZE;
-    else
-        messageSize += UDPIP_HEADER_SIZE;
-
-    rateMsec = messageSize * 1000 / ((int)(rate * com_timescale->value));
-    rate = Sys_Milliseconds() - client->netchan.lastSentTime;
-
-    if (rate > rateMsec)
-        return 0;
-    else
-        return rateMsec - rate;
+	if(client->netchan.remoteAddress.type == NA_IP6)
+		messageSize += UDPIP6_HEADER_SIZE;
+	else
+		messageSize += UDPIP_HEADER_SIZE;
+		
+	rateMsec = messageSize * 1000 / ((int) (rate * com_timescale->value));
+	rate = Sys_Milliseconds() - client->netchan.lastSentTime;
+	
+	if(rate > rateMsec)
+		return 0;
+	else
+		return rateMsec - rate;
 }
 
 /*
@@ -1049,70 +1312,70 @@ Return the time in msec until we expect to be called next
 
 int SV_SendQueuedPackets()
 {
-    int numBlocks;
-    int dlStart, deltaT, delayT;
-    static int dlNextRound = 0;
-    int timeVal = INT_MAX;
+	int numBlocks;
+	int dlStart, deltaT, delayT;
+	static int dlNextRound = 0;
+	int timeVal = INT_MAX;
 
-    // Send out fragmented packets now that we're idle
-    delayT = SV_SendQueuedMessages();
-    if (delayT >= 0)
-        timeVal = delayT;
+	// Send out fragmented packets now that we're idle
+	delayT = SV_SendQueuedMessages();
+	if(delayT >= 0)
+		timeVal = delayT;
 
-    if (sv_dlRate->integer)
-    {
-        // Rate limiting. This is very imprecise for high
-        // download rates due to millisecond timedelta resolution
-        dlStart = Sys_Milliseconds();
-        deltaT = dlNextRound - dlStart;
+	if(sv_dlRate->integer)
+	{
+		// Rate limiting. This is very imprecise for high
+		// download rates due to millisecond timedelta resolution
+		dlStart = Sys_Milliseconds();
+		deltaT = dlNextRound - dlStart;
 
-        if (deltaT > 0)
-        {
-            if (deltaT < timeVal)
-                timeVal = deltaT + 1;
-        }
-        else
-        {
-            numBlocks = SV_SendDownloadMessages();
+		if(deltaT > 0)
+		{
+			if(deltaT < timeVal)
+				timeVal = deltaT + 1;
+		}
+		else
+		{
+			numBlocks = SV_SendDownloadMessages();
 
-            if (numBlocks)
-            {
-                // There are active downloads
-                deltaT = Sys_Milliseconds() - dlStart;
+			if(numBlocks)
+			{
+				// There are active downloads
+				deltaT = Sys_Milliseconds() - dlStart;
 
-                delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
-                delayT /= sv_dlRate->integer * 1024;
+				delayT = 1000 * numBlocks * MAX_DOWNLOAD_BLKSIZE;
+				delayT /= sv_dlRate->integer * 1024;
 
-                if (delayT <= deltaT + 1)
-                {
-                    // Sending the last round of download messages
-                    // took too long for given rate, don't wait for
-                    // next round, but always enforce a 1ms delay
-                    // between DL message rounds so we don't hog
-                    // all of the bandwidth. This will result in an
-                    // effective maximum rate of 1MB/s per user, but the
-                    // low download window size limits this anyways.
-                    if (timeVal > 2)
-                        timeVal = 2;
+				if(delayT <= deltaT + 1)
+				{
+					// Sending the last round of download messages
+					// took too long for given rate, don't wait for
+					// next round, but always enforce a 1ms delay
+					// between DL message rounds so we don't hog
+					// all of the bandwidth. This will result in an
+					// effective maximum rate of 1MB/s per user, but the
+					// low download window size limits this anyways.
+					if(timeVal > 2)
+						timeVal = 2;
 
-                    dlNextRound = dlStart + deltaT + 1;
-                }
-                else
-                {
-                    dlNextRound = dlStart + delayT;
-                    delayT -= deltaT;
+					dlNextRound = dlStart + deltaT + 1;
+				}
+				else
+				{
+					dlNextRound = dlStart + delayT;
+					delayT -= deltaT;
 
-                    if (delayT < timeVal)
-                        timeVal = delayT;
-                }
-            }
-        }
-    }
-    else
-    {
-        if (SV_SendDownloadMessages())
-            timeVal = 0;
-    }
+					if(delayT < timeVal)
+						timeVal = delayT;
+				}
+			}
+		}
+	}
+	else
+	{
+		if(SV_SendDownloadMessages())
+			timeVal = 0;
+	}
 
-    return timeVal;
+	return timeVal;
 }
diff --git a/code/server/sv_net_chan.c b/code/server/sv_net_chan.c
index 1aa5a266..6b93be9c 100644
--- a/code/server/sv_net_chan.c
+++ b/code/server/sv_net_chan.c
@@ -169,7 +169,7 @@ void SV_Netchan_TransmitNextInQueue(client_t *client)
 		SV_Netchan_Encode(client, &netbuf->msg, netbuf->clientCommandString);
 #endif
 
-	Netchan_Transmit(&client->netchan, netbuf->msg.cursize, netbuf->msg.data);
+    Netchan_Transmit(&client->netchan, netbuf->msg.cursize, netbuf->msg.data, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 
 	// pop from queue
 	client->netchan_start_queue = netbuf->next;
@@ -197,7 +197,7 @@ int SV_Netchan_TransmitNextFragment(client_t *client)
 {
 	if(client->netchan.unsentFragments)
 	{
-		Netchan_TransmitNextFragment(&client->netchan);
+		Netchan_TransmitNextFragment(&client->netchan, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 		return SV_RateMsec(client);
 	}
 	else if(client->netchan_start_queue)
@@ -250,7 +250,7 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg)
 		if(client->compat)
 			SV_Netchan_Encode(client, msg, client->lastClientCommandString);
 #endif
-		Netchan_Transmit( &client->netchan, msg->cursize, msg->data );
+        Netchan_Transmit(&client->netchan, msg->cursize, msg->data, sv_netprofile->integer ? &client->netprofile.outPackets : NULL);
 	}
 }
 
@@ -259,17 +259,184 @@ void SV_Netchan_Transmit( client_t *client, msg_t *msg)
 Netchan_SV_Process
 =================
 */
-qboolean SV_Netchan_Process(client_t* client, msg_t* msg) {
-    int ret;
-    ret = Netchan_Process(&client->netchan, msg);
-    if (!ret)
-        return qfalse;
+qboolean SV_Netchan_Process( client_t *client, msg_t *msg ) {
+	int ret;
+	ret = Netchan_Process( &client->netchan, msg, sv_netprofile->integer ? &client->netprofile.inPackets : NULL );
+	if (!ret)
+		return qfalse;
 
 #ifdef LEGACY_PROTOCOL
-    if (client->compat)
-        SV_Netchan_Decode(client, msg);
+	if(client->compat)
+		SV_Netchan_Decode(client, msg);
 #endif
 
-    return qtrue;
+	return qtrue;
+}
+
+/*
+=================
+SV_NET_OutOfBandPrint
+=================
+*/
+void SV_NET_OutOfBandPrint(netprofclient_t* netprof, netadr_t adr, const char* format, ...) {
+    va_list	argptr;
+    char	string[MAX_MSGLEN];
+
+    va_start(argptr, format);
+    Q_vsnprintf(string, sizeof(string), format, argptr);
+    va_end(argptr);
+
+	NET_OutOfBandPrint(NS_SERVER, adr, "%s", string);
+
+	if (sv_netprofile->integer && netprof) {
+		NetProfileAddPacket(&netprof->outPackets, strlen(string), NETPROF_PACKET_MESSAGE);
+	}
+}
+
+/*
+=================
+SV_NET_UpdateClientNetProfileInfo
+=================
+*/
+void SV_NET_UpdateClientNetProfileInfo(netprofclient_t* netprofile, int rate) {
+	int time;
+
+	if (!netprofile->initialized) {
+		memset(netprofile, 0, sizeof(*netprofile));
+		netprofile->initialized = qtrue;
+	}
+
+	if (netprofile->rate != rate) {
+		netprofile->rate = rate;
+	}
+
+	// set the update time
+    time = Com_Milliseconds();
+
+    netprofile->outPackets.updateTime = time;
+    netprofile->inPackets.updateTime = time;
+}
+
+/*
+=================
+SV_NET_UpdateAllNetProfileInfo
+=================
+*/
+void SV_NET_UpdateAllNetProfileInfo() {
+	client_t *client;
+	int i;
+
+	if (!sv_netprofile->integer) {
+		//
+		// Clear all netprofile fields
+		//
+
+		svs.netprofile.initialized = qfalse;
+
+		for (i = 0; i < svs.iNumClients; i++) {
+			svs.clients[i].netprofile.initialized = qfalse;
+		}
+
+		return;
+	}
+
+	SV_NET_UpdateClientNetProfileInfo(&svs.netprofile, sv_maxRate->integer);
+
+    for (i = 0; i < svs.iNumClients; i++) {
+		client = &svs.clients[i];
+		if (client->state != CS_ACTIVE || !client->gentity) {
+			client->netprofile.initialized = qfalse;
+			continue;
+		}
+
+		SV_NET_UpdateClientNetProfileInfo(&client->netprofile, client->rate);
+    }
+}
+
+/*
+=================
+SV_NET_CalcTotalNetProfile
+=================
+*/
+void SV_NET_CalcTotalNetProfile(netprofclient_t* netprofile, qboolean server) {
+	client_t *client;
+	int i;
+	int numValidClients;
+
+	numValidClients = 0;
+	memset(netprofile, 0, sizeof(*netprofile));
+
+    if (server) {
+        NetProfileCalcStats(&svs.netprofile.outPackets, 0);
+        NetProfileCalcStats(&svs.netprofile.inPackets, 0);
+    } else {
+        NetProfileCalcStats(&svs.netprofile.outPackets, 500);
+        NetProfileCalcStats(&svs.netprofile.inPackets, 500);
+    }
+
+	for (i = 0; i < svs.iNumClients; i++) {
+		client = &svs.clients[i];
+		if (client->state != CS_ACTIVE || !client->gentity) {
+			client->netprofile.initialized = qfalse;
+			continue;
+		}
+
+		if (server) {
+			NetProfileCalcStats(&client->netprofile.outPackets, 0);
+			NetProfileCalcStats(&client->netprofile.inPackets, 0);
+		} else {
+			NetProfileCalcStats(&client->netprofile.outPackets, 500);
+			NetProfileCalcStats(&client->netprofile.inPackets, 500);
+		}
+
+		numValidClients++;
+
+		netprofile->rate += client->netprofile.rate;
+		netprofile->outPackets.totalSize += client->netprofile.outPackets.totalSize;
+		netprofile->outPackets.bytesPerSec += client->netprofile.outPackets.bytesPerSec;
+		netprofile->outPackets.numDropped += client->netprofile.outPackets.numDropped;
+		netprofile->outPackets.percentDropped += client->netprofile.outPackets.percentDropped;
+		netprofile->outPackets.percentFragmented += client->netprofile.outPackets.percentFragmented;
+		netprofile->outPackets.numFragmented += client->netprofile.outPackets.numFragmented;
+		netprofile->outPackets.totalLengthConnectionLess += client->netprofile.outPackets.totalLengthConnectionLess;
+		netprofile->outPackets.percentConnectionLess += client->netprofile.outPackets.percentConnectionLess;
+		netprofile->outPackets.totalProcessed += client->netprofile.outPackets.totalProcessed;
+		netprofile->outPackets.packetsPerSec += client->netprofile.outPackets.packetsPerSec;
+		netprofile->inPackets.totalSize += client->netprofile.inPackets.totalSize;
+		netprofile->inPackets.bytesPerSec += client->netprofile.inPackets.bytesPerSec;
+		netprofile->inPackets.numDropped += client->netprofile.inPackets.numDropped;
+		netprofile->inPackets.percentDropped += client->netprofile.inPackets.percentDropped;
+		netprofile->inPackets.percentFragmented += client->netprofile.inPackets.percentFragmented;
+		netprofile->inPackets.numFragmented += client->netprofile.inPackets.numFragmented;
+		netprofile->inPackets.totalLengthConnectionLess += client->netprofile.inPackets.totalLengthConnectionLess;
+		netprofile->inPackets.percentConnectionLess += client->netprofile.inPackets.percentConnectionLess;
+		netprofile->inPackets.totalProcessed += client->netprofile.inPackets.totalProcessed;
+		netprofile->inPackets.packetsPerSec += client->netprofile.inPackets.packetsPerSec;
+	}
+
+	if (numValidClients && netprofile->rate) {
+		netprofile->rate /= numValidClients;
+	}
+
+    netprofile->outPackets.totalSize += svs.netprofile.outPackets.totalSize;
+    netprofile->outPackets.bytesPerSec += svs.netprofile.outPackets.bytesPerSec;
+    netprofile->outPackets.numDropped += svs.netprofile.outPackets.numDropped;
+    netprofile->outPackets.percentDropped += svs.netprofile.outPackets.percentDropped;
+    netprofile->outPackets.percentFragmented += svs.netprofile.outPackets.percentFragmented;
+    netprofile->outPackets.numFragmented += svs.netprofile.outPackets.numFragmented;
+    netprofile->outPackets.totalLengthConnectionLess += svs.netprofile.outPackets.totalLengthConnectionLess;
+    netprofile->outPackets.percentConnectionLess += svs.netprofile.outPackets.percentConnectionLess;
+    netprofile->outPackets.totalProcessed += svs.netprofile.outPackets.totalProcessed;
+    netprofile->outPackets.packetsPerSec += svs.netprofile.outPackets.packetsPerSec;
+    netprofile->inPackets.totalSize += svs.netprofile.inPackets.totalSize;
+    netprofile->inPackets.bytesPerSec += svs.netprofile.inPackets.bytesPerSec;
+    netprofile->inPackets.numDropped += svs.netprofile.inPackets.numDropped;
+    netprofile->inPackets.percentDropped += svs.netprofile.inPackets.percentDropped;
+    netprofile->inPackets.percentFragmented += svs.netprofile.inPackets.percentFragmented;
+    netprofile->inPackets.numFragmented += svs.netprofile.inPackets.numFragmented;
+    netprofile->inPackets.totalLengthConnectionLess += svs.netprofile.inPackets.totalLengthConnectionLess;
+    netprofile->inPackets.percentConnectionLess += svs.netprofile.inPackets.percentConnectionLess;
+    netprofile->inPackets.totalProcessed += svs.netprofile.inPackets.totalProcessed;
+    netprofile->inPackets.packetsPerSec += svs.netprofile.inPackets.packetsPerSec;
 }
 
diff --git a/code/server/sv_snapshot.c b/code/server/sv_snapshot.c
index 1aea3e39..d87c689e 100644
--- a/code/server/sv_snapshot.c
+++ b/code/server/sv_snapshot.c
@@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "server.h"
 #include "../qcommon/bg_compat.h"
 
+#define	CULL_IN		0		// completely unclipped
+#define	CULL_CLIP	1		// clipped by one or more planes
+#define	CULL_OUT	2		// completely outside the clipping planes
 
 /*
 =============================================================================
@@ -88,7 +91,7 @@ static void SV_EmitPacketEntities( clientSnapshot_t *from, clientSnapshot_t *to,
 		if ( newnum == oldnum ) {
 			// delta update from old position
 			// because the force parm is qfalse, this will not result
-			// in any bytes being emited if the entity has not changed at all
+			// in any bytes being emitted if the entity has not changed at all
 			MSG_WriteDeltaEntity (msg, oldent, newent, qfalse, sv.frameTime);
 			oldindex++;
 			newindex++;
@@ -219,6 +222,7 @@ static void SV_WriteSnapshotToClient( client_t *client, msg_t *msg ) {
 			MSG_WriteShort( msg, client->XOffset );
 			MSG_WriteShort( msg, client->YOffset );
 			MSG_WriteScrambledString( msg, client->stringToPrint );
+			client->locprint = qfalse;
 		}
 		else {
 			MSG_WriteSVC( msg, svc_centerprint );
@@ -290,6 +294,215 @@ static int QDECL SV_QsortEntityNumbers( const void *a, const void *b ) {
 	return 1;
 }
 
+/*
+===============
+SV_AddNonPVSSound
+===============
+*/
+static void SV_AddNonPVSSound(client_t* client, gentity_t* ent) {
+	int i;
+
+    for (i = 0; i < ent->r.num_nonpvs_sounds; i++) {
+		nonpvs_sound_t *npvs = &ent->r.nonpvs_sounds[i];
+
+        SV_ClientSound(
+            client,
+            &ent->s.origin,
+            ENTITYNUM_NONE,
+            1,
+            npvs->index,
+            npvs->volume,
+            npvs->minDist,
+            npvs->pitch,
+            npvs->maxDist,
+            qfalse
+        );
+	}
+}
+
+/*
+====================
+SV_ClipMoveToBSPEntities
+
+====================
+*/
+static qboolean SV_ClipMoveToBSPEntities(const vec3_t start, const vec3_t end, int mask) {
+	int				i, num;
+	int				touchlist[MAX_GENTITIES];
+	gentity_t		*touch;
+	trace_t			trace;
+	clipHandle_t	clipHandle;
+	vec3_t			boxmins, boxmaxs;
+
+	for (i = 0; i < 3; i++) {
+		if (end[i] > start[i]) {
+			boxmins[i] = start[i] - 1;
+			boxmaxs[i] = end[i] + 1;
+		}
+		else {
+			boxmins[i] = end[i] - 1;
+			boxmaxs[i] = start[i] + 1;
+		}
+	}
+
+	num = SV_AreaEntities(boxmins, boxmaxs, touchlist, MAX_GENTITIES);
+
+	for (i = 0; i < num; i++) {
+		touch = SV_GentityNum(touchlist[i]);
+
+		// skip non-solids and triggers
+		if (touch->solid != SOLID_BSP) {
+			continue;
+		}
+
+		// if it doesn't have any brushes of a type we
+		// are looking for, ignore it
+		if (!(mask & touch->r.contents)) {
+			continue;
+		}
+
+		// might intersect, so do an exact clip
+		clipHandle = SV_ClipHandleForEntity(touch);
+
+		CM_TransformedBoxTrace(&trace, start, end,
+			vec3_origin, vec3_origin, clipHandle, mask,
+			touch->s.origin, touch->r.currentAngles, qfalse);
+
+		if (trace.allsolid || trace.startsolid || trace.fraction != 1) {
+			return qfalse;
+		}
+	}
+
+	return qtrue;
+}
+
+/*
+===============
+SV_WorldTrace
+===============
+*/
+qboolean SV_WorldTrace(const vec3_t start, const vec3_t end, int mask)
+{
+	trace_t trace = { 0 };
+
+    CM_BoxTrace(&trace, start, end, vec3_origin, vec3_origin, 0, mask, qfalse);
+	if (trace.fraction != 1) {
+		return qfalse;
+	}
+
+	// Also test against brush models
+	return SV_ClipMoveToBSPEntities(start, end, mask);
+}
+
+/*
+===============
+SV_ClientIsVisibleTrace
+===============
+*/
+qboolean SV_ClientIsVisibleTrace(const vec3_t fromOrigin, const vec3_t toOrigin, float height, float dot) {
+	vec3_t dir;
+	vec3_t end;
+
+	VectorSubtract(toOrigin, fromOrigin, dir);
+    VectorNormalize(dir);
+    //VectorMA(toOrigin, -height, dir, end);
+	VectorCopy(toOrigin, end);
+
+	if (SV_WorldTrace(fromOrigin, end, (CONTENTS_SLIME | CONTENTS_LAVA | CONTENTS_SOLID))) {
+		return qtrue;
+	}
+
+	if (dot < 0) {
+		return qfalse;
+    }
+
+	end[2] -= height;
+	return SV_WorldTrace(fromOrigin, end, (CONTENTS_SLIME | CONTENTS_LAVA | CONTENTS_SOLID));
+}
+
+/*
+===============
+SV_ClientIsVisible
+===============
+*/
+qboolean SV_ClientIsVisible(int toNum, int fromNum, int distCheck, const vec3_t forward, const vec3_t right) {
+	client_t* fromClient;
+	playerState_t *fromPs, *toPs;
+	vec3_t dir;
+	vec3_t fromOrigin, toOrigin;
+	vec3_t toRight;
+	float dot;
+	float speed;
+	
+	if (!g_netoptimize->integer || !sv_netoptimize->integer) {
+		return qtrue;
+	}
+
+	if (toNum >= svs.iNumClients) {
+		return qtrue;
+	}
+
+	fromClient = &svs.clients[fromNum];
+	if (sv_netoptimize->integer == NETO_CULLED && distCheck == CULL_IN) {
+		fromClient->lastVisCheckTime[toNum] = svs.time + sv_netoptimize_vistime->integer;
+		return qtrue;
+	}
+
+	if (fromClient->lastVisCheckTime[toNum] > svs.time) {
+		return qtrue;
+	}
+
+    fromPs = SV_GameClientNum(fromNum);
+    toPs = SV_GameClientNum(toNum);
+
+	if (fromPs->fLeanAngle == 0) {
+		VectorCopy(fromPs->vEyePos, fromOrigin);
+	} else if (fromPs->fLeanAngle >= 0) {
+		VectorMA(fromPs->vEyePos, 30, right, fromOrigin);
+	} else {
+		VectorMA(fromPs->vEyePos, -30, right, fromOrigin);
+    }
+    VectorCopy(fromPs->vEyePos, fromOrigin);
+
+	if (toPs->fLeanAngle == 0) {
+		VectorCopy(toPs->vEyePos, toOrigin);
+	} else if (toPs->fLeanAngle >= 0) {
+		AngleVectors(toPs->viewangles, toRight, NULL, NULL);
+		VectorMA(toPs->vEyePos, 30, toRight, toOrigin);
+	} else {
+		AngleVectors(toPs->viewangles, toRight, NULL, NULL);
+		VectorMA(toPs->vEyePos, -30, toRight, toOrigin);
+    }
+    VectorCopy(toPs->vEyePos, toOrigin);
+
+	VectorSubtract(toOrigin, fromOrigin, dir);
+	VectorNormalize(dir);
+
+	dot = DotProduct(forward, dir);
+	if (SV_ClientIsVisibleTrace(fromOrigin, toOrigin, toPs->viewheight / 2, dot)) {
+		fromClient->lastVisCheckTime[toNum] = svs.time + sv_netoptimize_vistime->integer;
+		return qtrue;
+	}
+
+	speed = VectorLength(toPs->velocity);
+	if (speed <= 0) {
+		return qfalse;
+	}
+
+	//
+	// check with velocity prediction
+	//
+	VectorMA(fromOrigin, sv.frameTime * 3, fromPs->velocity, fromOrigin);
+	VectorMA(toOrigin, sv.frameTime * 3, toPs->velocity, toOrigin);
+
+	if (SV_ClientIsVisibleTrace(fromOrigin, toOrigin, toPs->viewheight / 2, dot)) {
+        fromClient->lastVisCheckTime[toNum] = svs.time + sv_netoptimize_vistime->integer;
+        return qtrue;
+	}
+
+	// not visible
+	return qfalse;
+}
 
 /*
 ===============
@@ -299,6 +512,8 @@ SV_AddEntToSnapshot
 static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEntityNumbers_t *eNums, svEntity_t* portalEnt, qboolean portalsky) {
 	// if we have already added this entity to this snapshot, don't add again
 	if ( svEnt->snapshotCounter == sv.snapshotCounter ) {
+		gEnt->s.renderfx &= ~(RF_SHADOW_PLANE | RF_WRAP_FRAMES);
+		gEnt->s.renderfx |= RF_WRAP_FRAMES;
 		return;
 	}
 	svEnt->snapshotCounter = sv.snapshotCounter;
@@ -308,26 +523,83 @@ static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEnt
 		return;
 	}
 
+	gEnt->s.renderfx &= ~(RF_SHADOW_PLANE | RF_WRAP_FRAMES | RF_SKYENTITY);
+
+	if ( portalEnt ) {
+		gEnt->s.renderfx |= RF_SHADOW_PLANE;
+	} else if ( portalsky ) {
+		gEnt->s.renderfx |= RF_SKYENTITY;
+	}
+
+	gEnt->r.lastNetTime = svs.time - svs.startTime;
 	eNums->snapshotEntities[ eNums->numSnapshotEntities ] = gEnt->s.number;
 	eNums->numSnapshotEntities++;
 }
 
+/*
+===============
+EntityDistCheck
+===============
+*/
+int EntityDistCheck(const vec3_t origin, const vec3_t forward, const gentity_t* ent, float farplane, float fov) {
+	vec3_t dir;
+	float farplaneMax;
+	float length;
+	float fovCheck;
+	float dot;
+
+	VectorSubtract(origin, ent->r.centroid, dir);
+	length = VectorNormalize(dir) - ent->r.radius;
+
+	farplaneMax = farplane + 128;
+	if (length >= farplaneMax) {
+		return CULL_OUT;
+	}
+
+	fovCheck = fov / 80 * length;
+
+	if (ent->s.number < svs.iNumClients && VectorLength(ent->s.pos.trDelta) < 5) {
+		fovCheck *= 0.25f;
+	}
+
+	if (fovCheck <= 640) {
+		return CULL_IN;
+	}
+
+	dot = DotProduct(forward, dir) + 0.5f;
+	if (dot < 0) {
+		dot = 0;
+	}
+
+	if (fovCheck * (dot * 2.f + 1.f) >= farplaneMax) {
+		// outside the farplane
+		return CULL_OUT;
+	}
+
+	return CULL_CLIP;
+}
+
 /*
 ===============
 SV_AddEntitiesVisibleFromPoint
 ===============
 */
-static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *frame, 
-									snapshotEntityNumbers_t *eNums, qboolean portal ) {
+static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t* frame, snapshotEntityNumbers_t* eNums, svEntity_t* portalEnt, qboolean portalsky, client_t* client, const vec3_t angles ) {
 	int		e, i;
 	gentity_t *ent;
-	svEntity_t	*svEnt;
+	gentity_t *parentEnt;
+	playerState_t *ps;
+	svEntity_t	*svEnt, *svCheckEnt;
 	int		l;
 	int		clientarea, clientcluster;
 	int		leafnum;
 	int		c_fullsend;
 	byte	*clientpvs;
 	byte	*bitvector;
+	gentity_t* skyorigin = NULL;
+	int		num;
+	int		check = 0;
+	vec3_t	forward, right;
 
 	// during an error shutdown message we may need to transmit
 	// the shutdown message after the server has shutdown, so
@@ -336,6 +608,13 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 		return;
 	}
 
+	ps = SV_GameClientNum(client - svs.clients);
+
+	num = 1;
+	if (sv_drawentities->integer) {
+		num = sv.num_entities;
+	}
+
 	leafnum = CM_PointLeafnum (origin);
 	clientarea = CM_LeafArea (leafnum);
 	clientcluster = CM_LeafCluster (leafnum);
@@ -345,26 +624,29 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 
 	clientpvs = CM_ClusterPVS (clientcluster);
 
+	AngleVectors(angles, forward, right, NULL);
+
 	c_fullsend = 0;
 
 	for ( e = 0 ; e < sv.num_entities ; e++ ) {
 		ent = SV_GentityNum(e);
 
+		// never send unused entities
+		if (!ent->inuse) {
+			continue;
+		}
+
+		// mark the entity as sent
+		ent->r.svFlags |= SVF_SENT;
+
 		// never send entities that aren't linked in
 		if ( !ent->r.linked ) {
 			continue;
 		}
-
-		if (ent->s.number != e) {
-			Com_DPrintf ("FIXING ENT->S.NUMBER!!!\n");
-			ent->s.number = e;
-		}
-
 		// entities can be flagged to explicitly not be sent to the client
 		if ( ent->r.svFlags & SVF_NOCLIENT ) {
 			continue;
 		}
-
 		// entities can be flagged to be sent to only one client
 		if ( ent->r.svFlags & SVF_SINGLECLIENT ) {
 			if ( ent->r.singleClient != frame->ps.clientNum ) {
@@ -378,12 +660,25 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 			}
 		}
 		// entities can be flagged to be sent to a given mask of clients
+		// Removed in OPM
+		//  This doesn't make sense it it only supports half of the client
+		/*
 		if ( ent->r.svFlags & SVF_CLIENTMASK ) {
 			if (frame->ps.clientNum >= 32)
 				Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum > 32\n" );
 			if (~ent->r.singleClient & (1 << frame->ps.clientNum))
 				continue;
 		}
+		*/
+
+		parentEnt = NULL;
+		if (ent->s.parent != ENTITYNUM_NONE) {
+			parentEnt = SV_GentityNum(ent->s.parent);
+			// parents that will not send to clients will be skipped
+			if (parentEnt && parentEnt->r.svFlags & SVF_NOCLIENT) {
+				continue;
+			}
+		}
 
 		svEnt = SV_SvEntityForGentity( ent );
 
@@ -392,35 +687,82 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 			continue;
 		}
 
-		// broadcast entities are always sent
-		if ( ent->r.svFlags & SVF_BROADCAST ) {
-			SV_AddEntToSnapshot( svEnt, ent, eNums, NULL, qfalse);
+		if (ent->s.renderfx & RF_SKYORIGIN) {
+			if (sv.skyportal && !portalsky && !portalEnt) {
+				if (skyorigin) {
+					Com_Error(ERR_DROP, "SV_AddEntitiesVisibleFromPoint: duplicate sky origin");
+				}
+				skyorigin = ent;
+				SV_AddEntToSnapshot(svEnt, ent, eNums, NULL, qfalse);
+			}
 			continue;
 		}
 
-		// FIXME: entities won't show sometimes
-#if 0
+		// broadcast entities are always sent
+		// or broadcast entities that are sent once
+		if ( (ent->r.svFlags & SVF_BROADCAST) || (ent->r.svFlags & SVF_SENDONCE)  ) {
+			SV_AddEntToSnapshot( svEnt, ent, eNums, portalEnt, portalsky);
+			continue;
+		}
+
+		if (parentEnt) {
+			svEntity_t* parentSvEnt = SV_SvEntityForGentity(parentEnt);
+			if (parentSvEnt->snapshotCounter == sv.snapshotCounter) {
+				SV_AddEntToSnapshot(svEnt, ent, eNums, portalEnt, portalsky);
+				continue;
+			} else if (g_gametype->integer != GT_SINGLE_PLAYER && ent->s.parent < svs.iNumClients) {
+				SV_AddNonPVSSound(client, ent);
+				continue;
+			}
+
+			svCheckEnt = parentSvEnt;
+		} else {
+			svCheckEnt = svEnt;
+		}
+
+		if (!(ent->r.svFlags & SVF_SENDPVS) && !ent->s.modelindex && !ent->s.loopSound) {
+			// don't send entities that have nothing to draw
+			continue;
+		}
+
+		if ((ent->s.loopSound && ent->s.loopSoundMinDist == LEVEL_WIDE_MIN_DIST) || ent->s.renderfx & RF_VIEWMODEL) {
+            // loopsound entities should be sent regardless
+			SV_AddEntToSnapshot(svEnt, ent, eNums, portalEnt, portalsky);
+            continue;
+		}
+
 		// ignore if not touching a PV leaf
 		// check area
-		if ( !CM_AreasConnected( clientarea, svEnt->areanum ) ) {
+		if ( !CM_AreasConnected( clientarea, svCheckEnt->areanum ) ) {
 			// doors can legally straddle two areas, so
 			// we may need to check another one
-			if ( !CM_AreasConnected( clientarea, svEnt->areanum2 ) ) {
+			if ( !CM_AreasConnected( clientarea, svCheckEnt->areanum2 ) ) {
 				continue;		// blocked by a door
 			}
 		}
 
+		if (g_gametype->integer != GT_SINGLE_PLAYER && !(ent->r.svFlags & SVF_NOFARPLANE)) {
+			float farplane = sv.farplane;
+
+			if (farplane < 1) farplane = 12000;
+			if (farplane > 12000) farplane = 12000;
+
+			check = EntityDistCheck(origin, forward, parentEnt ? parentEnt : ent, farplane, ps->fov);
+			if (check == CULL_OUT) {
+				continue;
+			}
+		}
+
 		// check individual leafs
 		if( !svEnt->numClusters ) {
 			continue;
 		}
-#endif
 
 		bitvector = clientpvs;
 
 		l = 0;
-		for ( i=0 ; i < svEnt->numClusters ; i++ ) {
-			l = svEnt->clusternums[i];
+		for ( i=0 ; i < svCheckEnt->numClusters ; i++ ) {
+			l = svCheckEnt->clusternums[i];
 			if ( bitvector[l >> 3] & (1 << (l&7) ) ) {
 				break;
 			}
@@ -428,38 +770,45 @@ static void SV_AddEntitiesVisibleFromPoint( vec3_t origin, clientSnapshot_t *fra
 
 		// if we haven't found it to be visible,
 		// check overflow clusters that coudln't be stored
-		if ( i == svEnt->numClusters ) {
-			if ( svEnt->lastCluster ) {
-				for ( ; l <= svEnt->lastCluster ; l++ ) {
+		if ( i == svCheckEnt->numClusters ) {
+			if ( svCheckEnt->lastCluster ) {
+				for ( ; l <= svCheckEnt->lastCluster ; l++ ) {
 					if ( bitvector[l >> 3] & (1 << (l&7) ) ) {
 						break;
 					}
 				}
-				if ( l == svEnt->lastCluster ) {
+				if ( l == svCheckEnt->lastCluster ) {
 					continue;	// not visible
 				}
 			} else {
-				// FIXME (ley0k) : this seems to hide the entity at random places
-				//continue;
+				continue;
+			}
+		}
+
+		if (svEnt->snapshotCounter == sv.snapshotCounter) {
+			ent->s.renderfx &= ~(RF_WRAP_FRAMES | RF_SHADOW_PLANE);
+			ent->s.renderfx |= RF_WRAP_FRAMES;
+			continue;
+		}
+
+		if (g_gametype->integer != GT_SINGLE_PLAYER && ent->s.number < svs.iNumClients) {
+			if (!SV_ClientIsVisible(ent->s.number, client - svs.clients, check, forward, right)) {
+				SV_AddNonPVSSound(client, ent);
+				continue;
 			}
 		}
 
 		// add it
-		SV_AddEntToSnapshot( svEnt, ent, eNums, NULL, qfalse);
+		SV_AddEntToSnapshot( svEnt, ent, eNums, portalEnt, portalsky);
 
 		// if its a portal entity, add everything visible from its camera position
-		if ( ent->r.svFlags & SVF_PORTAL ) {
-			// entityState_t::generic1 is not present in MoHAA
-			//if ( ent->s.generic1 ) {
-			//	vec3_t dir;
-			//	VectorSubtract(ent->s.origin, origin, dir);
-			//	if ( VectorLengthSquared(dir) > (float) ent->s.generic1 * ent->s.generic1 ) {
-			//		continue;
-			//	}
-			//}
-			SV_AddEntitiesVisibleFromPoint( ent->s.origin2, frame, eNums, qtrue );
+		if ( ent->r.svFlags & SVF_PORTAL && svEnt != portalEnt ) {
+			SV_AddEntitiesVisibleFromPoint( ent->s.origin2, frame, eNums, svEnt, qfalse, client, angles  );
 		}
+	}
 
+	if (!portalsky && skyorigin && !portalEnt) {
+		SV_AddEntitiesVisibleFromPoint(skyorigin->s.origin, frame, eNums, NULL, qtrue, client, angles);
 	}
 }
 
@@ -679,6 +1028,7 @@ For viewing through other player's eyes, clent can be something other than clien
 */
 static void SV_BuildClientSnapshot( client_t *client ) {
 	vec3_t						org;
+	vec3_t						ang;
 	clientSnapshot_t			*frame;
 	snapshotEntityNumbers_t		entityNumbers;
 	int							i;
@@ -729,18 +1079,19 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 	if (ps->pm_flags & PMF_CAMERA_VIEW)
 	{
 		VectorCopy(ps->camera_origin, org);
+		VectorCopy(ps->camera_angles, ang);
 	}
 	else
 	{
-		VectorCopy(ps->origin, org);
-		org[2] += ps->viewheight;
+		VectorCopy(ps->vEyePos, org);
+		VectorCopy(ps->viewangles, ang);
 	}
 
 	SV_AddEntToSnapshot(svEnt, SV_GentityNum(client - svs.clients), &entityNumbers, NULL, qfalse);
 
 	// add all the entities directly visible to the eye, which
 	// may include portal entities that merge other viewpoints
-	SV_AddEntitiesVisibleFromPoint( org, frame, &entityNumbers, qfalse );
+	SV_AddEntitiesVisibleFromPoint( org, frame, &entityNumbers, NULL, qfalse, client, ang );
 
 	// if there were portals visible, there may be out of order entities
 	// in the list which will need to be resorted for the delta compression
@@ -761,6 +1112,11 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 	frame->first_entity = svs.nextSnapshotEntities;
 	for ( i = 0 ; i < entityNumbers.numSnapshotEntities ; i++ ) {
 		ent = SV_GentityNum(entityNumbers.snapshotEntities[i]);
+		if (ent->client && ent->s.number < svs.iNumClients) {
+			assert(ent->s.number < MAX_CLIENTS);
+			client->lastRadarTime[ent->s.number] = svs.time;
+		}
+
 		state = &svs.snapshotEntities[svs.nextSnapshotEntities % svs.numSnapshotEntities];
 		*state = ent->s;
 		svs.nextSnapshotEntities++;
@@ -772,9 +1128,56 @@ static void SV_BuildClientSnapshot( client_t *client ) {
 	}
 
 	SV_UpdateRadar(client);
-	frame->ps.radarInfo = client->radarInfo;
+    frame->ps.radarInfo = client->radarInfo;
 }
 
+#ifdef USE_VOIP
+/*
+==================
+SV_WriteVoipToClient
+
+Check to see if there is any VoIP queued for a client, and send if there is.
+==================
+*/
+static void SV_WriteVoipToClient(client_t *cl, msg_t *msg)
+{
+	int totalbytes = 0;
+	int i;
+	voipServerPacket_t *packet;
+
+	if(cl->queuedVoipPackets)
+	{
+		// Write as many VoIP packets as we reasonably can...
+		for(i = 0; i < cl->queuedVoipPackets; i++)
+		{
+			packet = cl->voipPacket[(i + cl->queuedVoipIndex) % ARRAY_LEN(cl->voipPacket)];
+
+			if(!*cl->downloadName)
+			{
+        			totalbytes += packet->len;
+	        		if (totalbytes > (msg->maxsize - msg->cursize) / 2)
+		        		break;
+
+        			MSG_WriteByte(msg, svc_voipOpus);
+        			MSG_WriteShort(msg, packet->sender);
+	        		MSG_WriteByte(msg, (byte) packet->generation);
+		        	MSG_WriteLong(msg, packet->sequence);
+		        	MSG_WriteByte(msg, packet->frames);
+        			MSG_WriteShort(msg, packet->len);
+        			MSG_WriteBits(msg, packet->flags, VOIP_FLAGCNT);
+	        		MSG_WriteData(msg, packet->data, packet->len);
+                        }
+
+			Z_Free(packet);
+		}
+
+		cl->queuedVoipPackets -= i;
+		cl->queuedVoipIndex += i;
+		cl->queuedVoipIndex %= ARRAY_LEN(cl->voipPacket);
+	}
+}
+#endif
+
 /*
 =======================
 SV_SendMessageToClient
@@ -782,7 +1185,8 @@ SV_SendMessageToClient
 Called by SV_SendClientSnapshot and SV_SendClientGameState
 =======================
 */
-void SV_SendMessageToClient( msg_t *msg, client_t *client ) {
+void SV_SendMessageToClient(msg_t *msg, client_t *client)
+{
 	// record information about the message
 	client->frames[client->netchan.outgoingSequence & PACKET_MASK].messageSize = msg->cursize;
 	client->frames[client->netchan.outgoingSequence & PACKET_MASK].messageSent = svs.time;
@@ -814,31 +1218,39 @@ void SV_SendClientSnapshot( client_t *client ) {
 		return;
 	}
 
-	MSG_Init (&msg, msg_buf, sizeof(msg_buf));
-	msg.allowoverflow = qtrue;
+    MSG_Init(&msg, msg_buf, sizeof(msg_buf));
+    msg.allowoverflow = qtrue;
 
-	// NOTE, MRE: all server->client messages now acknowledge
-	// let the client know which reliable clientCommands we have received
-	MSG_WriteLong( &msg, client->lastClientCommand );
+    // NOTE, MRE: all server->client messages now acknowledge
+    // let the client know which reliable clientCommands we have received
+    MSG_WriteLong(&msg, client->lastClientCommand);
 
-	// (re)send any reliable server commands
-	SV_UpdateServerCommandsToClient( client, &msg );
+	if (g_gametype->integer <= GT_SINGLE_PLAYER || client->serverIdAcknowledge == sv.serverId || client->serverIdAcknowledge == sv.restartedServerId) {
+		// (re)send any reliable server commands
+		SV_UpdateServerCommandsToClient( client, &msg );
 
-	// send over all the relevant entityState_t
-	// and the playerState_t
-	SV_WriteSnapshotToClient( client, &msg );
+		// send over all the relevant entityState_t
+		// and the playerState_t
+		SV_WriteSnapshotToClient( client, &msg );
 
-	// clear the sounds on the client, preventing them to be sent each at packet
-	SV_ClearSounds( client );
+		// clear the sounds on the client, preventing them to be sent each at packet
+		SV_ClearSounds( client );
 
-	// clear center print, preventing it to be sent at each packet
-	client->stringToPrint[ 0 ] = 0;
+		// clear center print, preventing it to be sent at each packet
+		client->stringToPrint[ 0 ] = 0;
 
-	// su44: write any pending MoHAA cg messages
-	SV_WriteCGMToClient( client, &msg );
+		// su44: write any pending MoHAA cg messages
+		SV_WriteCGMToClient( client, &msg );
 
-	// Add any download data if the client is downloading
-	SV_WriteDownloadToClient( client, &msg );
+#ifdef USE_VOIP
+		SV_WriteVoipToClient(client, &msg);
+#endif
+	} else {
+		// Fixed in 2.0
+		//  Don't send snapshots until the player has acknowledged the server id (which happens when the client enters the world).
+		//  This also prevent sending CG messages while the client connects, as the cgame module is loaded when parsing the gamestate
+		MSG_WriteSVC(&msg, svc_nop);
+	}
 
 	// check for overflow
 	if ( msg.overflowed ) {
@@ -849,25 +1261,30 @@ void SV_SendClientSnapshot( client_t *client ) {
 	SV_SendMessageToClient( &msg, client );
 }
 
-
 /*
 =======================
 SV_SendClientMessages
 =======================
 */
-void SV_SendClientMessages( void ) {
-	int			i;
-	client_t	*c;
+void SV_SendClientMessages(void)
+{
+	int				i;
+	int				rate;
+	client_t		*c;
 
 	// send a message to each connected client
-	for (i=0, c = svs.clients ; i < sv_maxclients->integer ; i++, c++) {
-		if (!c->state) {
+	for(i=0; i < sv_maxclients->integer; i++)
+	{
+		c = &svs.clients[i];
+		
+		if(!c->state)
 			continue;		// not connected
-		}
 
-		if ( svs.time < c->nextSnapshotTime ) {
-			continue;		// not time yet
-		}
+		if(svs.time - c->lastSnapshotTime < c->snapshotMsec * com_timescale->value)
+			continue;		// It's not time yet
+
+		if (!SV_IsValidSnapshotClient(c))
+			continue; // not valid snapshot
 
 		if(*c->downloadName)
 			continue;		// Client is downloading, don't send snapshots
@@ -878,11 +1295,13 @@ void SV_SendClientMessages( void ) {
 			continue;		// Drop this snapshot if the packet queue is still full or delta compression will break
 		}
 
+		rate = SV_RateMsec(c);
+
 		if(!(c->netchan.remoteAddress.type == NA_LOOPBACK ||
 		     (sv_lanForceRate->integer && Sys_IsLANAddress(c->netchan.remoteAddress))))
 		{
 			// rate control for clients not on LAN 
-			if(SV_RateMsec(c) > 0)
+			if(rate > 0)
 			{
 				// Not enough time since last packet passed through the line
 				c->rateDelayed = qtrue;
@@ -894,6 +1313,25 @@ void SV_SendClientMessages( void ) {
 		SV_SendClientSnapshot(c);
 		c->lastSnapshotTime = svs.time;
 		c->rateDelayed = qfalse;
-	}
+    }
 }
 
+qboolean SV_IsValidSnapshotClient(client_t* client) {
+	if (client->deltaMessage <= 0) {
+		return qtrue;
+	}
+
+	if (client->state != CS_ACTIVE) {
+		return qtrue;
+	}
+
+	if (client->lastPacketTime >= svs.lastTime) {
+		return qtrue;
+	}
+
+	if (client->netchan.outgoingSequence - client->deltaMessage < 29) {
+		return qtrue;
+	}
+
+	return qfalse;
+}
diff --git a/code/server/sv_snd.c b/code/server/sv_snd.c
index 94afa90f..e51060f2 100644
--- a/code/server/sv_snd.c
+++ b/code/server/sv_snd.c
@@ -24,6 +24,43 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "server.h"
 
+/*
+===============
+SV_ClientSound
+===============
+*/
+void SV_ClientSound(client_t* client, vec3_t* org, int entnum, int channel, int sound_index, float volume, float mindist, float pitch, float maxdist, qboolean streamed) {
+	server_sound_t* sound;
+
+	if (client->state != CS_ACTIVE)
+		return;
+
+    if (client->number_of_server_sounds >= MAX_SERVER_SOUNDS)
+        return;
+
+	sound = &client->server_sounds[client->number_of_server_sounds];
+	sound->stop_flag = 0;
+	sound->entity_number = entnum;
+
+	if (org)
+	{
+		VectorCopy(*org, sound->origin);
+	}
+	else
+	{
+		VectorClear(sound->origin);
+	}
+
+	sound->channel = channel;
+	sound->volume = volume;
+	sound->min_dist = mindist;
+	sound->pitch = pitch;
+	sound->maxDist = maxdist;
+	sound->sound_index = sound_index;
+	sound->streamed = streamed;
+	client->number_of_server_sounds++;
+}
+
 /*
 ===============
 SV_Sound
@@ -31,41 +68,21 @@ SV_Sound
 */
 void SV_Sound( vec3_t *org, int entnum, int channel, const char *sound_name, float volume, float mindist, float pitch, float maxdist, qboolean streamed )
 {
-	int i;
+    int i;
 
-	for( i = 0; i < sv_maxclients->integer; i++ )
-	{
-		client_t *client = &svs.clients[ i ];
-		server_sound_t *sound;
-
-		if( client->state != CS_ACTIVE )
+    for (i = 0; i < svs.iNumClients; i++)
+    {
+        client_t* client = &svs.clients[i];
+		if (client->state != CS_ACTIVE) {
 			continue;
+        }
 
-		if( client->number_of_server_sounds >= MAX_SERVER_SOUNDS )
+		if (client->number_of_server_sounds >= MAX_SERVER_SOUNDS) {
 			continue;
-
-		sound = &client->server_sounds[ client->number_of_server_sounds ];
-		sound->stop_flag = 0;
-		sound->entity_number = entnum;
-
-		if( org )
-		{
-			VectorCopy( *org, sound->origin );
-		}
-		else
-		{
-			VectorClear( sound->origin );
 		}
 
-		sound->channel = channel;
-		sound->volume = volume;
-		sound->min_dist = mindist;
-		sound->pitch = pitch;
-		sound->maxDist = maxdist;
-		sound->sound_index = SV_SoundIndex( sound_name, streamed );
-		sound->streamed = streamed;
-		client->number_of_server_sounds++;
-	}
+        SV_ClientSound(client, org, entnum, channel, SV_SoundIndex(sound_name, streamed), volume, mindist, pitch, maxdist, streamed);
+    }
 }
 
 /*
diff --git a/code/server/sv_world.c b/code/server/sv_world.c
index e56ee318..d334f3b1 100644
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -100,7 +100,7 @@ SV_CreateworldSector
 Builds a uniformly subdivided tree for the given world size
 ===============
 */
-worldSector_t *SV_CreateworldSector( int depth, vec3_t mins, vec3_t maxs ) {
+static worldSector_t *SV_CreateworldSector( int depth, vec3_t mins, vec3_t maxs ) {
 	worldSector_t	*anode;
 	vec3_t		size;
 	vec3_t		mins1, maxs1, mins2, maxs2;
@@ -146,7 +146,7 @@ void SV_ClearWorld( void ) {
 	vec3_t			mins, maxs;
 	int				i;
 	int				num;
-	char			name[ 10 ];
+	char			name[ 16 ];
 
 	Com_Memset( sv_worldSectors, 0, sizeof(sv_worldSectors) );
 	sv_numworldSectors = 0;
@@ -160,7 +160,7 @@ void SV_ClearWorld( void ) {
 	num = CM_NumInlineModels();
 	for( i = 1; i < num; i++ )
 	{
-		sprintf( name, "*%i", i );
+		Com_sprintf( name, sizeof( name ), "*%i", i );
 		SV_ModelIndex( name );
 	}
 }
@@ -388,8 +388,8 @@ SV_AreaEntities_r
 
 ====================
 */
-void SV_AreaEntities_r( worldSector_t *node, areaParms_t *ap ) {
-	svEntity_t		*check, *next;
+static void SV_AreaEntities_r( worldSector_t *node, areaParms_t *ap ) {
+	svEntity_t	*check, *next;
 	gentity_t		*gcheck;
 	worldSector_t	*nodestack[ 8 ];
 	int				iStackPos;
@@ -499,7 +499,7 @@ void SV_ClipToEntity( trace_t *trace, const vec3_t start, const vec3_t mins, con
 
 	touch = SV_GentityNum( entityNum );
 
-	Com_Memset( trace, 0, sizeof( trace_t ) );
+	Com_Memset(trace, 0, sizeof(trace_t));
 
 	// if it doesn't have any brushes of a type we
 	// are looking for, ignore it
@@ -527,7 +527,7 @@ SV_ClipMoveToEntities
 
 ====================
 */
-void SV_ClipMoveToEntities( moveclip_t *clip ) {
+static void SV_ClipMoveToEntities( moveclip_t *clip ) {
 	int			i, num;
 	int			touchlist[MAX_GENTITIES];
 	gentity_t	*touch;
@@ -669,9 +669,12 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == clip->passEntityNum ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == clip->passEntityNum ) {
+			if( touchlist[ i ] == passOwnerNum ) {
 				continue;	// don't clip against own missiles
 			}
+			if( touch->r.ownerNum == clip->passEntityNum ) {
+				continue;	// don't clip against the pass entity
+			}
 			if( touch->r.ownerNum == passOwnerNum ) {
 				continue;	// don't clip against other missiles from our owner
 			}
@@ -681,11 +684,11 @@ qboolean SV_ClipSightToEntities( moveclip_t *clip, int passEntityNum2 )
 			if( touchlist[ i ] == passEntityNum2 ) {
 				continue;	// don't clip against the pass entity
 			}
-			if( touch->r.ownerNum == passEntityNum2 ) {
+			if( touchlist[ i ] == passOwnerNum2 ) {
 				continue;	// don't clip against own missiles
 			}
-			if( touch->r.ownerNum == passOwnerNum2 ) {
-				continue;	// don't clip against other missiles from our owner
+			if( touch->r.ownerNum == passEntityNum2 ) {
+				continue;	// don't clip against own missiles
 			}
 		}
 
@@ -772,7 +775,7 @@ qboolean SV_HitEntity(gentity_t* pEnt, gentity_t* pOther)
 {
 	clipHandle_t handle = SV_ClipHandleForEntity(pOther);
 
-	return CM_TransformedBoxSightTrace(
+	return !CM_TransformedBoxSightTrace(
 		pEnt->s.origin,
 		pEnt->s.origin,
 		pEnt->r.mins,
@@ -797,7 +800,7 @@ void SV_Trace( trace_t *results, const vec3_t start, const vec3_t mins, const ve
 	moveclip_t	clip;
 	int			i;
 
-	Com_Memset( &clip, 0, sizeof( moveclip_t ) );
+	Com_Memset ( &clip, 0, sizeof ( moveclip_t ) );
 
 	// clip to world
 	CM_BoxTrace( &clip.trace, start, end, mins, maxs, 0, contentmask, cylinder );
diff --git a/code/skeletor/CMakeLists.txt b/code/skeletor/CMakeLists.txt
index 1c1da0c3..313afc44 100644
--- a/code/skeletor/CMakeLists.txt
+++ b/code/skeletor/CMakeLists.txt
@@ -1,4 +1,5 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohskeletor)
 
 file(GLOB_RECURSE SOURCES_SKEL "./*.c" "./*.cpp")
diff --git a/code/skeletor/SkelMat3.h b/code/skeletor/SkelMat3.h
index ad5f53b3..c8e85e66 100644
--- a/code/skeletor/SkelMat3.h
+++ b/code/skeletor/SkelMat3.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,199 +22,175 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SkelMat3.h : Skeletor
 
-#ifndef __SKELMAT3_H__
-#define __SKELMAT3_H__
+#pragma once
 
 #ifdef __cplusplus
 
-class SkelMat3 {
+class SkelMat3
+{
 public:
-	float val[ 3 ][ 3 ];
+    float val[3][3];
 
 protected:
-	void			copy( const SkelMat3& m );
+    void copy(const SkelMat3& m);
 
 public:
-	void			MakeZero();
-	void			MakeIdentity();
+    void MakeZero();
+    void MakeIdentity();
 
-	SkelMat3( const SkelVec3& x, const SkelVec3& y, const SkelVec3& z );
-	SkelMat3( const float *mat[ 3 ] );
-	SkelMat3();
+    SkelMat3(const SkelVec3& x, const SkelVec3& y, const SkelVec3& z);
+    SkelMat3(const float *mat[3]);
+    SkelMat3();
 
-	SkelVec3			*XAxis();
-	SkelVec3			*YAxis();
-	SkelVec3			*ZAxis();
+    SkelVec3 *XAxis();
+    SkelVec3 *YAxis();
+    SkelVec3 *ZAxis();
 
-	operator float *( );
-	operator float *( ) const;
+    operator float *();
+    operator float *() const;
 
-	float		*operator[]( int index );
-	float		*operator[]( int index ) const;
+    float *operator[](int index);
+    float *operator[](int index) const;
 
-	void			GetEulerAngles( float *vec ) const;
-	void			GetScale( float *vec ) const;
-	bool			IsOrthonormal() const;
-	bool			IsValid() const;
+    void GetEulerAngles(float *vec) const;
+    void GetScale(float *vec) const;
+    bool IsOrthonormal() const;
+    bool IsValid() const;
 
-	void			Multiply( const float mat1[ 3 ][ 3 ], const float mat2[ 3 ][ 3 ] );
-	float			det() const;
-	float			trace() const;
-	SkelVec3		TransformVector( const SkelVec3 *skel );
-	void			Transpose();
+    void     Multiply(const float mat1[3][3], const float mat2[3][3]);
+    float    det() const;
+    float    trace() const;
+    SkelVec3 TransformVector(const SkelVec3 *skel);
+    void     Transpose();
 };
 
-inline
-SkelMat3::SkelMat3( const SkelVec3& x, const SkelVec3& y, const SkelVec3& z )
+inline SkelMat3::SkelMat3(const SkelVec3& x, const SkelVec3& y, const SkelVec3& z)
 {
-	VectorCopy( x, val[ 0 ] );
-	VectorCopy( y, val[ 1 ] );
-	VectorCopy( z, val[ 2 ] );
+    VectorCopy(x, val[0]);
+    VectorCopy(y, val[1]);
+    VectorCopy(z, val[2]);
 }
 
-inline
-SkelMat3::SkelMat3( const float *mat[ 3 ] )
+inline SkelMat3::SkelMat3(const float *mat[3])
 {
-	memcpy( &val, mat, sizeof( val ) );
+    memcpy(&val, mat, sizeof(val));
 }
 
-inline
-SkelMat3::SkelMat3()
+inline SkelMat3::SkelMat3()
 {
-	MakeIdentity();
+    MakeIdentity();
 }
 
-inline
-void SkelMat3::copy( const SkelMat3& m )
+inline void SkelMat3::copy(const SkelMat3& m)
 {
-	AxisCopy( m.val, val );
+    AxisCopy(m.val, val);
 }
 
-inline
-void SkelMat3::MakeZero()
+inline void SkelMat3::MakeZero()
 {
-	AxisClear( val );
+    AxisClear(val);
 }
 
-inline
-void SkelMat3::MakeIdentity()
+inline void SkelMat3::MakeIdentity()
 {
-	MakeZero();
-	val[ 0 ][ 0 ] = 1.0f;
-	val[ 1 ][ 1 ] = 1.0f;
-	val[ 2 ][ 2 ] = 1.0f;
+    MakeZero();
+    val[0][0] = 1.0f;
+    val[1][1] = 1.0f;
+    val[2][2] = 1.0f;
 }
 
-inline
-SkelVec3 *SkelMat3::XAxis()
+inline SkelVec3 *SkelMat3::XAxis()
 {
-	return ( SkelVec3 * )&val[ 0 ];
+    return (SkelVec3 *)&val[0];
 }
 
-inline
-SkelVec3 *SkelMat3::YAxis()
+inline SkelVec3 *SkelMat3::YAxis()
 {
-	return ( SkelVec3 * )&val[ 1 ];
+    return (SkelVec3 *)&val[1];
 }
 
-inline
-SkelVec3 *SkelMat3::ZAxis()
+inline SkelVec3 *SkelMat3::ZAxis()
 {
-	return ( SkelVec3 * )&val[ 2 ];
+    return (SkelVec3 *)&val[2];
 }
 
-inline
-SkelMat3::operator float *( )
+inline SkelMat3::operator float *()
 {
-	return &val[ 0 ][ 0 ];
+    return &val[0][0];
 }
 
-inline
-SkelMat3::operator float *( ) const
+inline SkelMat3::operator float *() const
 {
-	return ( float * )&val[ 0 ][ 0 ];
+    return (float *)&val[0][0];
 }
 
-inline
-float *SkelMat3::operator[]( int index )
+inline float *SkelMat3::operator[](int index)
 {
-	return val[ index ];
+    return val[index];
 }
 
-inline
-float *SkelMat3::operator[]( int index ) const
+inline float *SkelMat3::operator[](int index) const
 {
-	return ( float * )val[ index ];
+    return (float *)val[index];
 }
 
-inline
-void SkelMat3::GetEulerAngles( float *vec ) const
+inline void SkelMat3::GetEulerAngles(float *vec) const
 {
-	MatrixToEulerAngles( val, vec );
+    MatrixToEulerAngles(val, vec);
 }
 
-inline
-void SkelMat3::GetScale( float *vec ) const
+inline void SkelMat3::GetScale(float *vec) const
 {
-	// FIXME: stub
+    // FIXME: stub
 }
 
-inline
-bool SkelMat3::IsOrthonormal() const
+inline bool SkelMat3::IsOrthonormal() const
 {
-	// FIXME: stub
-	return false;
+    // FIXME: stub
+    return false;
 }
 
-inline
-bool SkelMat3::IsValid() const
+inline bool SkelMat3::IsValid() const
 {
-	// FIXME: stub
-	return false;
+    // FIXME: stub
+    return false;
 }
 
-inline
-void SkelMat3::Multiply( const float mat1[ 3 ][ 3 ], const float mat2[ 3 ][ 3 ] )
+inline void SkelMat3::Multiply(const float mat1[3][3], const float mat2[3][3])
 {
-	MatrixMultiply( mat1, mat2, val );
+    MatrixMultiply(mat1, mat2, val);
 }
 
-inline
-float SkelMat3::det() const
+inline float SkelMat3::det() const
 {
-	return	( val[ 2 ][ 1 ] * val[ 1 ][ 0 ] - val[ 2 ][ 0 ] * val[ 1 ][ 1 ] ) * val[ 0 ][ 2 ]
-		  + ( val[ 1 ][ 1 ] * val[ 2 ][ 2 ] - val[ 1 ][ 2 ] * val[ 2 ][ 1 ] ) * val[ 0 ][ 0 ]
-		  - ( val[ 2 ][ 2 ] * val[ 1 ][ 0 ] - val[ 1 ][ 2 ] * val[ 2 ][ 0 ] ) * val[ 0 ][ 1 ];
+    return (val[2][1] * val[1][0] - val[2][0] * val[1][1]) * val[0][2]
+         + (val[1][1] * val[2][2] - val[1][2] * val[2][1]) * val[0][0]
+         - (val[2][2] * val[1][0] - val[1][2] * val[2][0]) * val[0][1];
 }
 
-inline
-float SkelMat3::trace() const
+inline float SkelMat3::trace() const
 {
-	return val[ 0 ][ 0 ] + val[ 1 ][ 1 ] + val[ 2 ][ 2 ];
+    return val[0][0] + val[1][1] + val[2][2];
 }
 
-inline
-SkelVec3 SkelMat3::TransformVector( const SkelVec3 *skel )
+inline SkelVec3 SkelMat3::TransformVector(const SkelVec3 *skel)
 {
-	SkelVec3 out;
-	MatrixTransformVector( *skel, val, out );
-	return out;
+    SkelVec3 out;
+    MatrixTransformVector(*skel, val, out);
+    return out;
 }
 
-inline
-void SkelMat3::Transpose()
+inline void SkelMat3::Transpose()
 {
-	SkelMat3 out;
-	TransposeMatrix( val, out.val );
-	memcpy( val, out, sizeof( SkelMat3 ) );
+    SkelMat3 out;
+    TransposeMatrix(val, out.val);
+    memcpy(val, out, sizeof(SkelMat3));
 }
 
 #else
 
 typedef struct {
-	float val[ 3 ][ 3 ];
+    float val[3][3];
 } SkelMat3;
 
 #endif
-
-#endif // __SKELMAT3_H__
diff --git a/code/skeletor/SkelMat4.h b/code/skeletor/SkelMat4.h
index 16956c0d..e2c9fbba 100644
--- a/code/skeletor/SkelMat4.h
+++ b/code/skeletor/SkelMat4.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,371 +22,338 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SkelMat4.h : Skeletor
 
-#ifndef __SKELMAT4_H__
-#define __SKELMAT4_H__
+#pragma once
 
 #ifdef __cplusplus
 
 class SkelQuat;
 
-class SkelMat4 {
+class SkelMat4
+{
 public:
-	float val[ 4 ][ 3 ];
+    float val[4][3];
 
 protected:
-	void copy( const SkelMat4& );
+    void copy(const SkelMat4&);
 
 public:
-	void		MakeIdentity();
-	void		MakeTranslate( float, float, float );
-	void		MakeXRotation( float );
-	void		MakeYRotation( float );
-	void		MakeZRotation( float );
+    void MakeIdentity();
+    void MakeTranslate(float, float, float);
+    void MakeXRotation(float);
+    void MakeYRotation(float);
+    void MakeZRotation(float);
 
-	SkelMat4( const float mat[ 3 ][ 3 ] );
-	SkelMat4();
+    SkelMat4(const float mat[3][3]);
+    SkelMat4();
 
-	SkelVec3	*XAxis();
-	SkelVec3	*YAxis();
-	SkelVec3	*ZAxis();
-	SkelVec3	*XAxis() const;
-	SkelVec3	*YAxis() const;
-	SkelVec3	*ZAxis() const;
+    SkelVec3 *XAxis();
+    SkelVec3 *YAxis();
+    SkelVec3 *ZAxis();
+    SkelVec3 *XAxis() const;
+    SkelVec3 *YAxis() const;
+    SkelVec3 *ZAxis() const;
 
-	operator float *( );
-	operator float *( ) const;
+    operator float *();
+    operator float *() const;
 
-	bool		IsOrthonormal() const;
-	bool		IsValid() const;
+    bool IsOrthonormal() const;
+    bool IsValid() const;
 
-	float		*operator[]( int index );
-	float		*operator[]( int index ) const;
+    float *operator[](int index);
+    float *operator[](int index) const;
 
-	int			CompareExact( const SkelMat4& skel ) const;
+    int CompareExact(const SkelMat4& skel) const;
 
-	void		Sum( const SkelMat4& m1, const SkelMat4& m2 );
-	void		Difference( const SkelMat4& m1, const SkelMat4& m2 );
-	void		Multiply( const SkelMat4& m1, const SkelMat4& m2 );
-	void		InvertAxis( int );
-	void		RotateBy( const SkelMat3& m );
-	void		RotateByInverse( const SkelMat3& m );
-	void		RotateXAxis( float x );
-	void		RotateYAxis( float y );
-	void		RotateZAxis( float z );
-	void		RotateXAxis( float, float );
-	void		RotateYAxis( float, float );
-	void		RotateZAxis( float, float );
-	void		MoveOnXAxis( float x );
-	void		MoveOnYAxis( float y );
-	void		MoveOnZAxis( float z );
-	void		TransformVector( float * ) const;
-	void		TransposeRot();
-	void		TransposeOf( const SkelMat4& m );
-	void		TransposeRotOf( const SkelMat4& m );
-	void		InverseRotOf( const SkelMat4& m );
-	float		Determinant( void );
-	void		Inverse( void );
-	void		GetRotationMatrix( float( *)[ 3 ] ) const;
-	void		GetRotationMatrix( float( *)[ 4 ] ) const;
-	void		ReplacePos( const float * );
-	void		ReplaceRot( const SkelMat3& m );
-	void		ReplaceRot( const SkelMat4& m );
-	void		GetPos( float *pos ) const;
-	void		GetScale( float *scale ) const;
-	void		DeltaPos( const SkelMat4& m, float *delta ) const;
-	void		RotateYaw( float, float );
+    void  Sum(const SkelMat4 &m1, const SkelMat4 &m2);
+    void  Difference(const SkelMat4 &m1, const SkelMat4 &m2);
+    void  Multiply(const SkelMat4 &m1, const SkelMat4 &m2);
+    void  InvertAxis(int);
+    void  RotateBy(const SkelMat3 &m);
+    void  RotateByInverse(const SkelMat3 &m);
+    void  RotateXAxis(float x);
+    void  RotateYAxis(float y);
+    void  RotateZAxis(float z);
+    void  RotateXAxis(float, float);
+    void  RotateYAxis(float, float);
+    void  RotateZAxis(float, float);
+    void  MoveOnXAxis(float x);
+    void  MoveOnYAxis(float y);
+    void  MoveOnZAxis(float z);
+    void  TransformVector(float *) const;
+    void  TransposeRot();
+    void  TransposeOf(const SkelMat4 &m);
+    void  TransposeRotOf(const SkelMat4 &m);
+    void  InverseRotOf(const SkelMat4 &m);
+    float Determinant(void);
+    void  Inverse(void);
+    void  GetRotationMatrix(float (*)[3]) const;
+    void  GetRotationMatrix(float (*)[4]) const;
+    void  ReplacePos(const float *);
+    void  ReplaceRot(const SkelMat3 &m);
+    void  ReplaceRot(const SkelMat4 &m);
+    void  GetPos(float *pos) const;
+    void  GetScale(float *scale) const;
+    void  DeltaPos(const SkelMat4 &m, float *delta) const;
+    void  RotateYaw(float, float);
 
-	void		GetQuat( SkelQuat& quat );
+    void GetQuat(SkelQuat& quat);
 };
 
-inline
-SkelMat4::SkelMat4( const float mat[ 3 ][ 3 ] )
+inline SkelMat4::SkelMat4(const float mat[3][3])
 {
-	VectorCopy(mat[0], val[0]);
-	VectorCopy(mat[1], val[1]);
-	VectorCopy(mat[2], val[2]);
-	val[3][0] = 0.0f;
-	val[3][1] = 0.0f;
-	val[3][2] = 0.0f;
+    VectorCopy(mat[0], val[0]);
+    VectorCopy(mat[1], val[1]);
+    VectorCopy(mat[2], val[2]);
+    val[3][0] = 0.0f;
+    val[3][1] = 0.0f;
+    val[3][2] = 0.0f;
 }
 
-inline
-SkelMat4::SkelMat4()
+inline SkelMat4::SkelMat4()
 {
-	MakeIdentity();
+    MakeIdentity();
 }
 
-inline
-void SkelMat4::copy( const SkelMat4& m )
+inline void SkelMat4::copy(const SkelMat4& m)
 {
-	MatrixCopy( *m.val, *val );
+    MatrixCopy(*m.val, *val);
 }
 
-inline
-void SkelMat4::MakeIdentity()
+inline void SkelMat4::MakeIdentity()
 {
-	memset( val, 0, sizeof( val ) );
-	val[ 0 ][ 0 ] = 1.0f;
-	val[ 1 ][ 1 ] = 1.0f;
-	val[ 2 ][ 2 ] = 1.0f;
+    memset(val, 0, sizeof(val));
+    val[0][0] = 1.0f;
+    val[1][1] = 1.0f;
+    val[2][2] = 1.0f;
 }
 
-inline
-SkelVec3 *SkelMat4::XAxis()
+inline SkelVec3 *SkelMat4::XAxis()
 {
-	return ( SkelVec3 * )&val[ 0 ];
+    return (SkelVec3 *)&val[0];
 }
 
-inline
-SkelVec3 *SkelMat4::YAxis()
+inline SkelVec3 *SkelMat4::YAxis()
 {
-	return ( SkelVec3 * )&val[ 1 ];
+    return (SkelVec3 *)&val[1];
 }
 
-inline
-SkelVec3 *SkelMat4::ZAxis()
+inline SkelVec3 *SkelMat4::ZAxis()
 {
-	return ( SkelVec3 * )&val[ 2 ];
+    return (SkelVec3 *)&val[2];
 }
 
-inline
-SkelVec3 *SkelMat4::XAxis() const
+inline SkelVec3 *SkelMat4::XAxis() const
 {
-	return ( SkelVec3 * )&val[ 0 ];
+    return (SkelVec3 *)&val[0];
 }
 
-inline
-SkelVec3 *SkelMat4::YAxis() const
+inline SkelVec3 *SkelMat4::YAxis() const
 {
-	return ( SkelVec3 * )&val[ 1 ];
+    return (SkelVec3 *)&val[1];
 }
 
-inline
-SkelVec3 *SkelMat4::ZAxis() const
+inline SkelVec3 *SkelMat4::ZAxis() const
 {
-	return ( SkelVec3 * )&val[ 2 ];
+    return (SkelVec3 *)&val[2];
 }
 
-inline
-SkelMat4::operator float *( )
+inline SkelMat4::operator float *()
 {
-	return &val[ 0 ][ 0 ];
+    return &val[0][0];
 }
 
-inline
-SkelMat4::operator float *( ) const
+inline SkelMat4::operator float *() const
 {
-	return ( float * )&val[ 0 ][ 0 ];
+    return (float *)&val[0][0];
 }
 
-inline
-float *SkelMat4::operator[]( int index )
+inline float *SkelMat4::operator[](int index)
 {
-	return val[ index ];
+    return val[index];
 }
 
-inline
-float *SkelMat4::operator[]( int index ) const
+inline float *SkelMat4::operator[](int index) const
 {
-	return ( float * )val[ index ];
+    return (float *)val[index];
 }
 
-inline
-bool SkelMat4::IsOrthonormal() const
+inline bool SkelMat4::IsOrthonormal() const
 {
-	// FIXME: stub
-	return false;
+    // FIXME: stub
+    return false;
 }
 
-inline
-bool SkelMat4::IsValid() const
+inline bool SkelMat4::IsValid() const
 {
-	// FIXME: stub
-	return false;
+    // FIXME: stub
+    return false;
 }
 
-inline
-void SkelMat4::Sum( const SkelMat4& m1, const SkelMat4& m2 )
+inline void SkelMat4::Sum(const SkelMat4& m1, const SkelMat4& m2)
 {
-	VectorAdd( m1.val[ 0 ], m2.val[ 0 ], val[ 0 ] );
-	VectorAdd( m1.val[ 1 ], m2.val[ 1 ], val[ 1 ] );
-	VectorAdd( m1.val[ 2 ], m2.val[ 2 ], val[ 2 ] );
+    VectorAdd(m1.val[0], m2.val[0], val[0]);
+    VectorAdd(m1.val[1], m2.val[1], val[1]);
+    VectorAdd(m1.val[2], m2.val[2], val[2]);
 }
 
-inline
-void SkelMat4::Difference( const SkelMat4& m1, const SkelMat4& m2 )
+inline void SkelMat4::Difference(const SkelMat4& m1, const SkelMat4& m2)
 {
-	VectorSubtract( m1.val[ 0 ], m2.val[ 0 ], val[ 0 ] );
-	VectorSubtract( m1.val[ 1 ], m2.val[ 1 ], val[ 1 ] );
-	VectorSubtract( m1.val[ 2 ], m2.val[ 2 ], val[ 2 ] );
+    VectorSubtract(m1.val[0], m2.val[0], val[0]);
+    VectorSubtract(m1.val[1], m2.val[1], val[1]);
+    VectorSubtract(m1.val[2], m2.val[2], val[2]);
 }
 
-inline
-void SkelMat4::Multiply( const SkelMat4& m1, const SkelMat4& m2 )
+inline void SkelMat4::Multiply(const SkelMat4& m1, const SkelMat4& m2)
 {
-	val[ 0 ][ 0 ] = m1[ 0 ][ 0 ] * m2[ 0 ][ 0 ] + m1[ 0 ][ 1 ] * m2[ 1 ][ 0 ] + m1[ 0 ][ 2 ] * m2[ 2 ][ 0 ];
-	val[ 1 ][ 0 ] = m1[ 1 ][ 0 ] * m2[ 0 ][ 0 ] + m1[ 1 ][ 1 ] * m2[ 1 ][ 0 ] + m1[ 1 ][ 2 ] * m2[ 2 ][ 0 ];
-	val[ 2 ][ 0 ] = m1[ 2 ][ 0 ] * m2[ 0 ][ 0 ] + m1[ 2 ][ 1 ] * m2[ 1 ][ 0 ] + m1[ 2 ][ 2 ] * m2[ 2 ][ 0 ];
-	val[ 3 ][ 0 ] = m1[ 3 ][ 0 ] * m2[ 0 ][ 0 ] + m1[ 3 ][ 1 ] * m2[ 1 ][ 0 ] + m1[ 3 ][ 2 ] * m2[ 2 ][ 0 ] + m2[ 3 ][ 0 ];
+    val[0][0] = m1[0][0] * m2[0][0] + m1[0][1] * m2[1][0] + m1[0][2] * m2[2][0];
+    val[1][0] = m1[1][0] * m2[0][0] + m1[1][1] * m2[1][0] + m1[1][2] * m2[2][0];
+    val[2][0] = m1[2][0] * m2[0][0] + m1[2][1] * m2[1][0] + m1[2][2] * m2[2][0];
+    val[3][0] = m1[3][0] * m2[0][0] + m1[3][1] * m2[1][0] + m1[3][2] * m2[2][0] + m2[3][0];
 
-	val[ 0 ][ 1 ] = m1[ 0 ][ 0 ] * m2[ 0 ][ 1 ] + m1[ 0 ][ 1 ] * m2[ 1 ][ 1 ] + m1[ 0 ][ 2 ] * m2[ 2 ][ 1 ];
-	val[ 1 ][ 1 ] = m1[ 1 ][ 0 ] * m2[ 0 ][ 1 ] + m1[ 1 ][ 1 ] * m2[ 1 ][ 1 ] + m1[ 1 ][ 2 ] * m2[ 2 ][ 1 ];
-	val[ 2 ][ 1 ] = m1[ 2 ][ 0 ] * m2[ 0 ][ 1 ] + m1[ 2 ][ 1 ] * m2[ 1 ][ 1 ] + m1[ 2 ][ 2 ] * m2[ 2 ][ 1 ];
-	val[ 3 ][ 1 ] = m1[ 3 ][ 0 ] * m2[ 0 ][ 1 ] + m1[ 3 ][ 1 ] * m2[ 1 ][ 1 ] + m1[ 3 ][ 2 ] * m2[ 2 ][ 1 ] + m2[ 3 ][ 1 ];
+    val[0][1] = m1[0][0] * m2[0][1] + m1[0][1] * m2[1][1] + m1[0][2] * m2[2][1];
+    val[1][1] = m1[1][0] * m2[0][1] + m1[1][1] * m2[1][1] + m1[1][2] * m2[2][1];
+    val[2][1] = m1[2][0] * m2[0][1] + m1[2][1] * m2[1][1] + m1[2][2] * m2[2][1];
+    val[3][1] = m1[3][0] * m2[0][1] + m1[3][1] * m2[1][1] + m1[3][2] * m2[2][1] + m2[3][1];
 
-	val[ 0 ][ 2 ] = m1[ 0 ][ 0 ] * m2[ 0 ][ 2 ] + m1[ 0 ][ 1 ] * m2[ 1 ][ 2 ] + m1[ 0 ][ 2 ] * m2[ 2 ][ 2 ];
-	val[ 1 ][ 2 ] = m1[ 1 ][ 0 ] * m2[ 0 ][ 2 ] + m1[ 1 ][ 1 ] * m2[ 1 ][ 2 ] + m1[ 1 ][ 2 ] * m2[ 2 ][ 2 ];
-	val[ 2 ][ 2 ] = m1[ 2 ][ 0 ] * m2[ 0 ][ 2 ] + m1[ 2 ][ 1 ] * m2[ 1 ][ 2 ] + m1[ 2 ][ 2 ] * m2[ 2 ][ 2 ];
-	val[ 3 ][ 2 ] = m1[ 3 ][ 0 ] * m2[ 0 ][ 2 ] + m1[ 3 ][ 1 ] * m2[ 1 ][ 2 ] + m1[ 3 ][ 2 ] * m2[ 2 ][ 2 ] + m2[ 3 ][ 2 ];
+    val[0][2] = m1[0][0] * m2[0][2] + m1[0][1] * m2[1][2] + m1[0][2] * m2[2][2];
+    val[1][2] = m1[1][0] * m2[0][2] + m1[1][1] * m2[1][2] + m1[1][2] * m2[2][2];
+    val[2][2] = m1[2][0] * m2[0][2] + m1[2][1] * m2[1][2] + m1[2][2] * m2[2][2];
+    val[3][2] = m1[3][0] * m2[0][2] + m1[3][1] * m2[1][2] + m1[3][2] * m2[2][2] + m2[3][2];
 }
 
-inline
-void SkelMat4::InvertAxis( int a )
+inline void SkelMat4::InvertAxis(int a)
 {
-	val[ a ][ 0 ] = -val[ a ][ 0 ];	val[ a ][ 1 ] = -val[ a ][ 1 ];	val[ a ][ 2 ] = -val[ a ][ 2 ];
+    val[a][0] = -val[a][0];
+    val[a][1] = -val[a][1];
+    val[a][2] = -val[a][2];
 }
 
-inline
-float SkelMat4::Determinant( void )
+inline float SkelMat4::Determinant(void)
 {
-	float mat4x4[ 4 ][ 4 ];
+    float mat4x4[4][4];
 
-	mat4x4[ 0 ][ 0 ] = val[ 0 ][ 0 ];
-	mat4x4[ 0 ][ 1 ] = val[ 0 ][ 1 ];
-	mat4x4[ 0 ][ 2 ] = val[ 0 ][ 2 ];
-	mat4x4[ 0 ][ 3 ] = 0;
-	mat4x4[ 1 ][ 0 ] = val[ 1 ][ 0 ];
-	mat4x4[ 1 ][ 1 ] = val[ 1 ][ 1 ];
-	mat4x4[ 1 ][ 2 ] = val[ 1 ][ 2 ];
-	mat4x4[ 1 ][ 3 ] = 0;
-	mat4x4[ 2 ][ 0 ] = val[ 2 ][ 0 ];
-	mat4x4[ 2 ][ 1 ] = val[ 2 ][ 1 ];
-	mat4x4[ 2 ][ 2 ] = val[ 2 ][ 2 ];
-	mat4x4[ 2 ][ 3 ] = 0;
-	mat4x4[ 3 ][ 0 ] = val[ 3 ][ 0 ];
-	mat4x4[ 3 ][ 1 ] = val[ 3 ][ 1 ];
-	mat4x4[ 3 ][ 2 ] = val[ 3 ][ 2 ];
-	mat4x4[ 3 ][ 3 ] = 1;
+    mat4x4[0][0] = val[0][0];
+    mat4x4[0][1] = val[0][1];
+    mat4x4[0][2] = val[0][2];
+    mat4x4[0][3] = 0;
+    mat4x4[1][0] = val[1][0];
+    mat4x4[1][1] = val[1][1];
+    mat4x4[1][2] = val[1][2];
+    mat4x4[1][3] = 0;
+    mat4x4[2][0] = val[2][0];
+    mat4x4[2][1] = val[2][1];
+    mat4x4[2][2] = val[2][2];
+    mat4x4[2][3] = 0;
+    mat4x4[3][0] = val[3][0];
+    mat4x4[3][1] = val[3][1];
+    mat4x4[3][2] = val[3][2];
+    mat4x4[3][3] = 1;
 
-	return	mat4x4[ 0 ][ 0 ] * (
-		mat4x4[ 1 ][ 1 ] * ( mat4x4[ 2 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 2 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) -
-		mat4x4[ 2 ][ 1 ] * ( mat4x4[ 1 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 1 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) +
-		mat4x4[ 3 ][ 1 ] * ( mat4x4[ 1 ][ 2 ] * mat4x4[ 2 ][ 3 ] - mat4x4[ 1 ][ 3 ] * mat4x4[ 2 ][ 2 ] )
-		) -
-		mat4x4[ 1 ][ 0 ] * (
-			mat4x4[ 0 ][ 1 ] * ( mat4x4[ 2 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 2 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) -
-			mat4x4[ 2 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) +
-			mat4x4[ 3 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 2 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 2 ][ 2 ] )
-			) +
-		mat4x4[ 2 ][ 0 ] * (
-			mat4x4[ 0 ][ 1 ] * ( mat4x4[ 1 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 1 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) -
-			mat4x4[ 1 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 3 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 3 ][ 2 ] ) +
-			mat4x4[ 3 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 1 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 1 ][ 2 ] )
-			) -
-		mat4x4[ 3 ][ 0 ] * (
-			mat4x4[ 0 ][ 1 ] * ( mat4x4[ 1 ][ 2 ] * mat4x4[ 2 ][ 3 ] - mat4x4[ 1 ][ 3 ] * mat4x4[ 2 ][ 2 ] ) -
-			mat4x4[ 1 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 2 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 2 ][ 2 ] ) +
-			mat4x4[ 2 ][ 1 ] * ( mat4x4[ 0 ][ 2 ] * mat4x4[ 1 ][ 3 ] - mat4x4[ 0 ][ 3 ] * mat4x4[ 1 ][ 2 ] )
-			);
+    return mat4x4[0][0]
+             * (mat4x4[1][1] * (mat4x4[2][2] * mat4x4[3][3] - mat4x4[2][3] * mat4x4[3][2])
+                - mat4x4[2][1] * (mat4x4[1][2] * mat4x4[3][3] - mat4x4[1][3] * mat4x4[3][2])
+                + mat4x4[3][1] * (mat4x4[1][2] * mat4x4[2][3] - mat4x4[1][3] * mat4x4[2][2]))
+         - mat4x4[1][0]
+               * (mat4x4[0][1] * (mat4x4[2][2] * mat4x4[3][3] - mat4x4[2][3] * mat4x4[3][2])
+                  - mat4x4[2][1] * (mat4x4[0][2] * mat4x4[3][3] - mat4x4[0][3] * mat4x4[3][2])
+                  + mat4x4[3][1] * (mat4x4[0][2] * mat4x4[2][3] - mat4x4[0][3] * mat4x4[2][2]))
+         + mat4x4[2][0]
+               * (mat4x4[0][1] * (mat4x4[1][2] * mat4x4[3][3] - mat4x4[1][3] * mat4x4[3][2])
+                  - mat4x4[1][1] * (mat4x4[0][2] * mat4x4[3][3] - mat4x4[0][3] * mat4x4[3][2])
+                  + mat4x4[3][1] * (mat4x4[0][2] * mat4x4[1][3] - mat4x4[0][3] * mat4x4[1][2]))
+         - mat4x4[3][0]
+               * (mat4x4[0][1] * (mat4x4[1][2] * mat4x4[2][3] - mat4x4[1][3] * mat4x4[2][2])
+                  - mat4x4[1][1] * (mat4x4[0][2] * mat4x4[2][3] - mat4x4[0][3] * mat4x4[2][2])
+                  + mat4x4[2][1] * (mat4x4[0][2] * mat4x4[1][3] - mat4x4[0][3] * mat4x4[1][2]));
 }
 
-inline
-void SkelMat4::Inverse( void )
+inline void SkelMat4::Inverse(void)
 {
-	float mat4x4[ 4 ][ 4 ];
-	float outmat4x4[ 4 ][ 4 ];
-	const float	Det = Determinant();
+    float       mat4x4[4][4];
+    float       outmat4x4[4][4];
+    const float Det = Determinant();
 
-	mat4x4[ 0 ][ 0 ] = val[ 0 ][ 0 ];
-	mat4x4[ 0 ][ 1 ] = val[ 0 ][ 1 ];
-	mat4x4[ 0 ][ 2 ] = val[ 0 ][ 2 ];
-	mat4x4[ 0 ][ 3 ] = 0;
-	mat4x4[ 1 ][ 0 ] = val[ 1 ][ 0 ];
-	mat4x4[ 1 ][ 1 ] = val[ 1 ][ 1 ];
-	mat4x4[ 1 ][ 2 ] = val[ 1 ][ 2 ];
-	mat4x4[ 1 ][ 3 ] = 0;
-	mat4x4[ 2 ][ 0 ] = val[ 2 ][ 0 ];
-	mat4x4[ 2 ][ 1 ] = val[ 2 ][ 1 ];
-	mat4x4[ 2 ][ 2 ] = val[ 2 ][ 2 ];
-	mat4x4[ 2 ][ 3 ] = 0;
-	mat4x4[ 3 ][ 0 ] = val[ 3 ][ 0 ];
-	mat4x4[ 3 ][ 1 ] = val[ 3 ][ 1 ];
-	mat4x4[ 3 ][ 2 ] = val[ 3 ][ 2 ];
-	mat4x4[ 3 ][ 3 ] = 1;
+    mat4x4[0][0] = val[0][0];
+    mat4x4[0][1] = val[0][1];
+    mat4x4[0][2] = val[0][2];
+    mat4x4[0][3] = 0;
+    mat4x4[1][0] = val[1][0];
+    mat4x4[1][1] = val[1][1];
+    mat4x4[1][2] = val[1][2];
+    mat4x4[1][3] = 0;
+    mat4x4[2][0] = val[2][0];
+    mat4x4[2][1] = val[2][1];
+    mat4x4[2][2] = val[2][2];
+    mat4x4[2][3] = 0;
+    mat4x4[3][0] = val[3][0];
+    mat4x4[3][1] = val[3][1];
+    mat4x4[3][2] = val[3][2];
+    mat4x4[3][3] = 1;
 
-	if( Det == 0.0f )
-	{
-		MakeIdentity();
-	}
-	else
-	{
-		VectorMatrixInverse( outmat4x4, mat4x4 );
+    if (Det == 0.0f) {
+        MakeIdentity();
+    } else {
+        VectorMatrixInverse(outmat4x4, mat4x4);
 
-		val[ 0 ][ 0 ] = outmat4x4[ 0 ][ 0 ];
-		val[ 0 ][ 1 ] = outmat4x4[ 0 ][ 1 ];
-		val[ 0 ][ 2 ] = outmat4x4[ 0 ][ 2 ];
-		val[ 1 ][ 0 ] = outmat4x4[ 1 ][ 0 ];
-		val[ 1 ][ 1 ] = outmat4x4[ 1 ][ 1 ];
-		val[ 1 ][ 2 ] = outmat4x4[ 1 ][ 2 ];
-		val[ 2 ][ 0 ] = outmat4x4[ 2 ][ 0 ];
-		val[ 2 ][ 1 ] = outmat4x4[ 2 ][ 1 ];
-		val[ 2 ][ 2 ] = outmat4x4[ 2 ][ 2 ];
-		val[ 3 ][ 0 ] = outmat4x4[ 3 ][ 0 ];
-		val[ 3 ][ 1 ] = outmat4x4[ 3 ][ 1 ];
-		val[ 3 ][ 2 ] = outmat4x4[ 3 ][ 2 ];
-	}
+        val[0][0] = outmat4x4[0][0];
+        val[0][1] = outmat4x4[0][1];
+        val[0][2] = outmat4x4[0][2];
+        val[1][0] = outmat4x4[1][0];
+        val[1][1] = outmat4x4[1][1];
+        val[1][2] = outmat4x4[1][2];
+        val[2][0] = outmat4x4[2][0];
+        val[2][1] = outmat4x4[2][1];
+        val[2][2] = outmat4x4[2][2];
+        val[3][0] = outmat4x4[3][0];
+        val[3][1] = outmat4x4[3][1];
+        val[3][2] = outmat4x4[3][2];
+    }
 }
 
-inline
-void SkelMat4::RotateBy( const SkelMat3& m )
+inline void SkelMat4::RotateBy(const SkelMat3& m)
 {
-	SkelMat4 temp = *this;
+    SkelMat4 temp = *this;
 
-	val[ 0 ][ 0 ] = temp[ 0 ][ 0 ] * m[ 0 ][ 0 ] + temp[ 0 ][ 1 ] * m[ 1 ][ 0 ] + temp[ 0 ][ 2 ] * m[ 2 ][ 0 ];
-	val[ 0 ][ 1 ] = temp[ 0 ][ 0 ] * m[ 0 ][ 1 ] + temp[ 0 ][ 1 ] * m[ 1 ][ 1 ] + temp[ 0 ][ 2 ] * m[ 2 ][ 1 ];
-	val[ 0 ][ 2 ] = temp[ 0 ][ 0 ] * m[ 0 ][ 2 ] + temp[ 0 ][ 1 ] * m[ 1 ][ 2 ] + temp[ 0 ][ 2 ] * m[ 2 ][ 2 ];
+    val[0][0] = temp[0][0] * m[0][0] + temp[0][1] * m[1][0] + temp[0][2] * m[2][0];
+    val[0][1] = temp[0][0] * m[0][1] + temp[0][1] * m[1][1] + temp[0][2] * m[2][1];
+    val[0][2] = temp[0][0] * m[0][2] + temp[0][1] * m[1][2] + temp[0][2] * m[2][2];
 
-	val[ 1 ][ 0 ] = temp[ 1 ][ 0 ] * m[ 0 ][ 0 ] + temp[ 1 ][ 1 ] * m[ 1 ][ 0 ] + temp[ 1 ][ 2 ] * m[ 2 ][ 0 ];
-	val[ 1 ][ 1 ] = temp[ 1 ][ 0 ] * m[ 0 ][ 1 ] + temp[ 1 ][ 1 ] * m[ 1 ][ 1 ] + temp[ 1 ][ 2 ] * m[ 2 ][ 1 ];
-	val[ 1 ][ 2 ] = temp[ 1 ][ 0 ] * m[ 0 ][ 2 ] + temp[ 1 ][ 1 ] * m[ 1 ][ 2 ] + temp[ 1 ][ 2 ] * m[ 2 ][ 2 ];
+    val[1][0] = temp[1][0] * m[0][0] + temp[1][1] * m[1][0] + temp[1][2] * m[2][0];
+    val[1][1] = temp[1][0] * m[0][1] + temp[1][1] * m[1][1] + temp[1][2] * m[2][1];
+    val[1][2] = temp[1][0] * m[0][2] + temp[1][1] * m[1][2] + temp[1][2] * m[2][2];
 
-	val[ 2 ][ 0 ] = temp[ 2 ][ 0 ] * m[ 0 ][ 0 ] + temp[ 2 ][ 1 ] * m[ 1 ][ 0 ] + temp[ 2 ][ 2 ] * m[ 2 ][ 0 ];
-	val[ 2 ][ 1 ] = temp[ 2 ][ 0 ] * m[ 0 ][ 1 ] + temp[ 2 ][ 1 ] * m[ 1 ][ 1 ] + temp[ 2 ][ 2 ] * m[ 2 ][ 1 ];
-	val[ 2 ][ 2 ] = temp[ 2 ][ 0 ] * m[ 0 ][ 2 ] + temp[ 2 ][ 1 ] * m[ 1 ][ 2 ] + temp[ 2 ][ 2 ] * m[ 2 ][ 2 ];
+    val[2][0] = temp[2][0] * m[0][0] + temp[2][1] * m[1][0] + temp[2][2] * m[2][0];
+    val[2][1] = temp[2][0] * m[0][1] + temp[2][1] * m[1][1] + temp[2][2] * m[2][1];
+    val[2][2] = temp[2][0] * m[0][2] + temp[2][1] * m[1][2] + temp[2][2] * m[2][2];
 }
 
-inline
-void SkelMat4::RotateByInverse( const SkelMat3& m )
+inline void SkelMat4::RotateByInverse(const SkelMat3& m)
 {
-	// FIXME: stub
+    // FIXME: stub
 }
 
-inline
-void SkelMat4::TransposeRotOf( const SkelMat4& m )
+inline void SkelMat4::TransposeRotOf(const SkelMat4& m)
 {
-	val[ 0 ][ 0 ] = m.val[ 0 ][ 0 ];
-	val[ 0 ][ 1 ] = m.val[ 1 ][ 0 ];
-	val[ 0 ][ 2 ] = m.val[ 2 ][ 0 ];
-	val[ 1 ][ 0 ] = m.val[ 0 ][ 1 ];
-	val[ 1 ][ 1 ] = m.val[ 1 ][ 1 ];
-	val[ 1 ][ 2 ] = m.val[ 2 ][ 1 ];
-	val[ 2 ][ 0 ] = m.val[ 0 ][ 2 ];
-	val[ 2 ][ 1 ] = m.val[ 1 ][ 2 ];
-	val[ 2 ][ 2 ] = m.val[ 2 ][ 2 ];
+    val[0][0] = m.val[0][0];
+    val[0][1] = m.val[1][0];
+    val[0][2] = m.val[2][0];
+    val[1][0] = m.val[0][1];
+    val[1][1] = m.val[1][1];
+    val[1][2] = m.val[2][1];
+    val[2][0] = m.val[0][2];
+    val[2][1] = m.val[1][2];
+    val[2][2] = m.val[2][2];
 }
 
-inline
-void SkelMat4::GetQuat( SkelQuat& quat )
+inline void SkelMat4::GetQuat(SkelQuat& quat)
 {
-	MatToQuat( val, ( float * )&quat );
+    MatToQuat(val, (float *)&quat);
 }
 
 #else
 
 typedef struct {
-	float val[ 4 ][ 3 ];
+    float val[4][3];
 } SkelMat4;
 
 #endif
-
-#endif // __SKELMAT4_H__
diff --git a/code/skeletor/SkelQuat.h b/code/skeletor/SkelQuat.h
index d4f718fb..1daa1ca9 100644
--- a/code/skeletor/SkelQuat.h
+++ b/code/skeletor/SkelQuat.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,295 +22,266 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SkelQuat.h : Skeletor Quat
 
-#ifndef __SKELQUAT_H__
-#define __SKELQUAT_H__
+#pragma once
 
 #ifdef __cplusplus
 
-#include "SkelVec3.h"
-#include "SkelVec4.h"
-#include "SkelMat3.h"
-#include "SkelMat4.h"
+#    include "SkelVec3.h"
+#    include "SkelVec4.h"
+#    include "SkelMat3.h"
+#    include "SkelMat4.h"
 
-class SkelQuat {
+class SkelQuat
+{
 public:
-	union {
-		float val[ 4 ];
-		struct {
-			float x;
-			float y;
-			float z;
-			float w;
-		};
-	};
+    union {
+        float val[4];
 
-	SkelQuat();
-	SkelQuat( SkelVec3 vec );
-	SkelQuat( SkelMat3 mat3 );
-	SkelQuat( SkelMat4 mat4 );
-	SkelQuat( float x, float y, float z, float w );
-	SkelQuat( float *quat );
-	SkelQuat( const float *quat );
-	SkelQuat( float w, const SkelVec3 *vec );
+        struct {
+            float x;
+            float y;
+            float z;
+            float w;
+        };
+    };
 
-	float&		operator[] ( int index );
-	float		operator[] ( int index ) const;
+    SkelQuat();
+    SkelQuat(SkelVec3 vec);
+    SkelQuat(SkelMat3 mat3);
+    SkelQuat(SkelMat4 mat4);
+    SkelQuat(float x, float y, float z, float w);
+    SkelQuat(float *quat);
+    SkelQuat(const float *quat);
+    SkelQuat(float w, const SkelVec3 *vec);
 
-	operator float *( );
-	operator float *( ) const;
+    float& operator[](int index);
+    float  operator[](int index) const;
 
-	void	Set( float x, float y, float z, float w );
-	void	Set( SkelVec4 vec4 );
-	void	Set( float *quat );
-	void	SetAngle( float a );
-	void	SetAxis( SkelVec3 vec );
+    operator float *();
+    operator float *() const;
 
-	void	Invert();
-	float	Length() const;
-	float	LengthSquared() const;
-	void	Normalize();
+    void Set(float x, float y, float z, float w);
+    void Set(SkelVec4 vec4);
+    void Set(float *quat);
+    void SetAngle(float a);
+    void SetAxis(SkelVec3 vec);
 
-	void	GetMat3( SkelMat3& mat3 ) const;
-	void	GetMat4( SkelMat4& mat4 ) const;
-	void	GetEulerAngles( float *angles ) const;
-	bool	IsUnit() const;
-	void	MakeIdentity();
-	bool	IsIdentity();
-	bool	IsValid() const;
+    void  Invert();
+    float Length() const;
+    float LengthSquared() const;
+    void  Normalize();
+
+    void GetMat3(SkelMat3& mat3) const;
+    void GetMat4(SkelMat4& mat4) const;
+    void GetEulerAngles(float *angles) const;
+    bool IsUnit() const;
+    void MakeIdentity();
+    bool IsIdentity();
+    bool IsValid() const;
 };
 
-inline
-SkelQuat::SkelQuat()
+inline SkelQuat::SkelQuat()
 {
-	QuatClear( val );
+    QuatClear(val);
 }
 
-inline
-SkelQuat::SkelQuat( SkelVec3 vec )
+inline SkelQuat::SkelQuat(SkelVec3 vec)
 {
-	EulerToQuat( vec.val, val );
+    EulerToQuat(vec.val, val);
 }
 
-inline
-SkelQuat::SkelQuat( SkelMat3 mat3 )
+inline SkelQuat::SkelQuat(SkelMat3 mat3)
 {
-	MatToQuat( mat3.val, val );
+    MatToQuat(mat3.val, val);
 }
 
-inline
-SkelQuat::SkelQuat( SkelMat4 mat4 )
+inline SkelQuat::SkelQuat(SkelMat4 mat4)
 {
-	MatToQuat( mat4.val, val );
+    MatToQuat(mat4.val, val);
 }
 
-inline
-SkelQuat::SkelQuat( float x, float y, float z, float w )
+inline SkelQuat::SkelQuat(float x, float y, float z, float w)
 {
-	Set( x, y, z, w );
+    Set(x, y, z, w);
 }
 
-inline
-SkelQuat::SkelQuat( float *quat )
+inline SkelQuat::SkelQuat(float *quat)
 {
-	val[ 0 ] = quat[ 0 ];
-	val[ 1 ] = quat[ 1 ];
-	val[ 2 ] = quat[ 2 ];
-	val[ 3 ] = quat[ 3 ];
+    val[0] = quat[0];
+    val[1] = quat[1];
+    val[2] = quat[2];
+    val[3] = quat[3];
 }
 
-inline
-SkelQuat::SkelQuat( const float *quat )
+inline SkelQuat::SkelQuat(const float *quat)
 {
-	val[ 0 ] = quat[ 0 ];
-	val[ 1 ] = quat[ 1 ];
-	val[ 2 ] = quat[ 2 ];
-	val[ 3 ] = quat[ 3 ];
+    val[0] = quat[0];
+    val[1] = quat[1];
+    val[2] = quat[2];
+    val[3] = quat[3];
 }
 
-inline
-SkelQuat::SkelQuat( float w, const SkelVec3 *vec )
+inline SkelQuat::SkelQuat(float w, const SkelVec3 *vec)
 {
-	val[ 0 ] = vec->x;
-	val[ 1 ] = vec->y;
-	val[ 2 ] = vec->z;
-	val[ 3 ] = w;
+    val[0] = vec->x;
+    val[1] = vec->y;
+    val[2] = vec->z;
+    val[3] = w;
 }
 
-inline
-void SkelQuat::Set( float x, float y, float z, float w )
+inline void SkelQuat::Set(float x, float y, float z, float w)
 {
-	this->x = x;
-	this->y = y;
-	this->z = z;
-	this->w = w;
+    this->x = x;
+    this->y = y;
+    this->z = z;
+    this->w = w;
 }
 
-inline
-void SkelQuat::Set( SkelVec4 vec4 )
+inline void SkelQuat::Set(SkelVec4 vec4)
 {
-	val[ 0 ] = vec4.val[ 0 ];
-	val[ 1 ] = vec4.val[ 1 ];
-	val[ 2 ] = vec4.val[ 2 ];
-	val[ 3 ] = vec4.val[ 3 ];
+    val[0] = vec4.val[0];
+    val[1] = vec4.val[1];
+    val[2] = vec4.val[2];
+    val[3] = vec4.val[3];
 }
 
-inline
-void SkelQuat::Set( float *quat )
+inline void SkelQuat::Set(float *quat)
 {
-	val[ 0 ] = quat[ 0 ];
-	val[ 1 ] = quat[ 1 ];
-	val[ 2 ] = quat[ 2 ];
-	val[ 3 ] = quat[ 3 ];
+    val[0] = quat[0];
+    val[1] = quat[1];
+    val[2] = quat[2];
+    val[3] = quat[3];
 }
 
-inline
-void SkelQuat::SetAngle( float a )
+inline void SkelQuat::SetAngle(float a)
 {
-	SkelVec3 vec;
-	vec.y = a;
-	EulerToQuat( vec.val, val );
+    SkelVec3 vec;
+    vec.y = a;
+    EulerToQuat(vec.val, val);
 }
 
-inline
-void SkelQuat::SetAxis( SkelVec3 vec )
+inline void SkelQuat::SetAxis(SkelVec3 vec)
 {
-	EulerToQuat( vec.val, val );
+    EulerToQuat(vec.val, val);
 }
 
-inline
-void SkelQuat::Invert()
+inline void SkelQuat::Invert()
 {
-	QuatInverse( val );
+    QuatInverse(val);
 }
 
-inline
-float SkelQuat::Length() const
+inline float SkelQuat::Length() const
 {
-	return ( float )sqrt( val[ 0 ] * val[ 0 ] + val[ 1 ] * val[ 1 ] + val[ 2 ] * val[ 2 ] + val[ 3 ] * val[ 3 ] );
+    return (float)sqrt(val[0] * val[0] + val[1] * val[1] + val[2] * val[2] + val[3] * val[3]);
 }
 
-inline
-float SkelQuat::LengthSquared() const
+inline float SkelQuat::LengthSquared() const
 {
-	return val[ 0 ] * val[ 0 ] + val[ 1 ] * val[ 1 ] + val[ 2 ] * val[ 2 ] + val[ 3 ] * val[ 3 ];
+    return val[0] * val[0] + val[1] * val[1] + val[2] * val[2] + val[3] * val[3];
 }
 
-inline
-void SkelQuat::Normalize()
+inline void SkelQuat::Normalize()
 {
-	VectorNormalize( val );
+    VectorNormalize(val);
 }
 
-inline
-void SkelQuat::GetMat3( SkelMat3& mat3 ) const
+inline void SkelQuat::GetMat3(SkelMat3& mat3) const
 {
-	QuatToMat( val, mat3.val );
+    QuatToMat(val, mat3.val);
 }
 
-inline
-void SkelQuat::GetMat4( SkelMat4& mat4 ) const
+inline void SkelQuat::GetMat4(SkelMat4& mat4) const
 {
-	QuatToMat( val, mat4.val );
+    QuatToMat(val, mat4.val);
 }
 
-inline
-void SkelQuat::GetEulerAngles( float *angles ) const
+inline void SkelQuat::GetEulerAngles(float *angles) const
 {
-	QuatToAngles( val, angles );
+    QuatToAngles(val, angles);
 }
 
-inline
-bool SkelQuat::IsUnit() const
+inline bool SkelQuat::IsUnit() const
 {
-	// FIXME: stub
-	return false;
+    // FIXME: stub
+    return false;
 }
 
-inline
-void SkelQuat::MakeIdentity()
+inline void SkelQuat::MakeIdentity()
 {
-	x = 0.0f;
-	y = 0.0f;
-	z = 0.0f;
-	w = 1.0f;
+    x = 0.0f;
+    y = 0.0f;
+    z = 0.0f;
+    w = 1.0f;
 }
 
-inline
-bool SkelQuat::IsIdentity()
+inline bool SkelQuat::IsIdentity()
 {
-	return ( x == 0.0f ) && ( y == 0.0f ) && ( z == 0.0f ) && ( w == 1.0f );
+    return (x == 0.0f) && (y == 0.0f) && (z == 0.0f) && (w == 1.0f);
 }
 
-inline
-bool SkelQuat::IsValid() const
+inline bool SkelQuat::IsValid() const
 {
-	// FIXME: stub
-	return true;
+    // FIXME: stub
+    return true;
 }
 
-inline
-void Slerp( SkelQuat &from, SkelQuat &to, float t, SkelQuat *out )
+inline void Slerp(SkelQuat& from, SkelQuat& to, float t, SkelQuat *out)
 {
-	static_assert(sizeof(float) == sizeof(int), "Float must be the same size as Int");
-	float f;
-	float f2;
+    static_assert(sizeof(float) == sizeof(int), "Float must be the same size as Int");
+    float f;
+    float f2;
 
-	f = from.x * to.x + from.y * to.y + from.z * to.z + from.w * to.w;
-	f2 = 1.0 - t;
+    f  = from.x * to.x + from.y * to.y + from.z * to.z + from.w * to.w;
+    f2 = 1.0 - t;
 
-	// little hack because I don't know how can this operation be converted to float...
-	*(int*)&f = (*(int*)&f & 0x80000000) ^ *(int*)&f2;
+    // little hack because I don't know how can this operation be converted to float...
+    *(int *)&f = (*(int *)&f & 0x80000000) ^ *(int *)&f2;
 
-	out->x = to.x * t + from.x * f;
-	out->y = to.y * t + from.y * f;
-	out->z = to.z * t + from.z * f;
-	out->w = to.w * t + from.w * f;
+    out->x = to.x * t + from.x * f;
+    out->y = to.y * t + from.y * f;
+    out->z = to.z * t + from.z * f;
+    out->w = to.w * t + from.w * f;
 
-	f = 1.0 / out->Length();
-	out->x = out->x * f;
-	out->y = out->y * f;
-	out->z = out->z * f;
-	out->w = out->w * f;
+    f      = 1.0 / out->Length();
+    out->x = out->x * f;
+    out->y = out->y * f;
+    out->z = out->z * f;
+    out->w = out->w * f;
 }
 
-inline
-SkelQuat::operator float *( )
+inline SkelQuat::operator float *()
 {
-	return val;
+    return val;
 }
 
-inline
-SkelQuat::operator float *( ) const
+inline SkelQuat::operator float *() const
 {
-	return ( float * )val;
+    return (float *)val;
 }
 
-inline
-float& SkelQuat::operator[]( int index )
+inline float& SkelQuat::operator[](int index)
 {
-	return val[ index ];
+    return val[index];
 }
 
-inline
-float SkelQuat::operator[]( int index ) const
+inline float SkelQuat::operator[](int index) const
 {
-	return val[ index ];
+    return val[index];
 }
 
 #else
 
 typedef struct {
-	union {
-		float val[ 4 ];
-		struct {
-			float x;
-			float y;
-			float z;
-			float w;
-		};
-	};
+    union {
+        float val[4];
+
+        struct {
+            float x;
+            float y;
+            float z;
+            float w;
+        };
+    };
 } SkelQuat;
 
 #endif
-
-#endif // __SKELQUAT_H__
diff --git a/code/skeletor/SkelVec3.h b/code/skeletor/SkelVec3.h
index c19439a1..2755de97 100644
--- a/code/skeletor/SkelVec3.h
+++ b/code/skeletor/SkelVec3.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,198 +22,188 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SkelVec3.h : Skeletor
 
-#ifndef __SKELVEC3_H__
-#define __SKELVEC3_H__
+#pragma once
 
-typedef enum { svX, svY, svZ, svW } SkelVec_Axis;
-typedef enum { Vec3YAW, Vec3PITCH, Vec3ROLL } YPR_Axes;
+typedef enum {
+    svX,
+    svY,
+    svZ,
+    svW
+} SkelVec_Axis;
+
+typedef enum {
+    Vec3YAW,
+    Vec3PITCH,
+    Vec3ROLL
+} YPR_Axes;
 
 #ifdef __cplusplus
 
-class SkelVec3 {
+class SkelVec3
+{
 public:
-	union {
-		float val[ 3 ];
-		struct {
-			float x;
-			float y;
-			float z;
-		};
-	};
+    union {
+        float val[3];
+
+        struct {
+            float x;
+            float y;
+            float z;
+        };
+    };
+
 protected:
-	void		copy( const SkelVec3& skel );
+    void copy(const SkelVec3& skel);
 
 public:
+    SkelVec3(float x, float y, float z);
+    SkelVec3(vec3_t vec);
+    SkelVec3();
 
-	SkelVec3( float x, float y, float z );
-	SkelVec3( vec3_t vec );
-	SkelVec3();
+    operator float *();
+    operator float *() const;
 
-	operator float *( );
-	operator float *( ) const;
+    float& operator[](int index);
+    float  operator[](int index) const;
 
-	float&		operator[] ( int index );
-	float		operator[] ( int index ) const;
+    const SkelVec3& operator+=(const SkelVec3& a);
+    const SkelVec3& operator+=(vec3_t a);
 
-	const SkelVec3&		operator+=( const SkelVec3 &a );
-	const SkelVec3&		operator+=( vec3_t a );
+    bool IsZero() const;
+    bool IsUnit() const;
+    void set(float x, float y, float z);
 
-	bool		IsZero() const;
-	bool		IsUnit() const;
-	void		set( float x, float y, float z );
+    float Normalize();
+    void  NormalizeFast();
 
-	float		Normalize();
-	void		NormalizeFast();
-
-	void		SetZero();
-	void		SetXAxis();
-	void		SetYAxis();
-	void		SetZAxis();
-	void		RotateYaw( float yaw, float deg );
+    void SetZero();
+    void SetXAxis();
+    void SetYAxis();
+    void SetZAxis();
+    void RotateYaw(float yaw, float deg);
 };
 
-inline
-SkelVec3::SkelVec3( float x, float y, float z )
+inline SkelVec3::SkelVec3(float x, float y, float z)
 {
-	set( x, y, z );
+    set(x, y, z);
 }
 
-inline
-SkelVec3::SkelVec3( vec3_t vec )
+inline SkelVec3::SkelVec3(vec3_t vec)
 {
-	this->x = vec[ 0 ];
-	this->y = vec[ 1 ];
-	this->z = vec[ 2 ];
+    this->x = vec[0];
+    this->y = vec[1];
+    this->z = vec[2];
 }
 
-inline
-SkelVec3::SkelVec3()
+inline SkelVec3::SkelVec3()
 {
-	SetZero();
+    SetZero();
 }
 
-inline
-SkelVec3::operator float *( )
+inline SkelVec3::operator float *()
 {
-	return val;
+    return val;
 }
 
-inline
-SkelVec3::operator float *( ) const
+inline SkelVec3::operator float *() const
 {
-	return ( float * )val;
+    return (float *)val;
 }
 
-inline
-bool SkelVec3::IsZero() const
+inline bool SkelVec3::IsZero() const
 {
-	return ( x == 0.0f ) && ( y == 0.0f ) && ( z == 0.0f );
+    return (x == 0.0f) && (y == 0.0f) && (z == 0.0f);
 }
 
-inline
-bool SkelVec3::IsUnit() const
+inline bool SkelVec3::IsUnit() const
 {
-	// FIXME: stub
-	return false;
+    return VectorLength(*this) == 1;
 }
 
-inline
-void SkelVec3::set( float x, float y, float z )
+inline void SkelVec3::set(float x, float y, float z)
 {
-	this->x = x;
-	this->y = y;
-	this->z = z;
+    this->x = x;
+    this->y = y;
+    this->z = z;
 }
 
-inline
-float SkelVec3::Normalize()
+inline float SkelVec3::Normalize()
 {
-	return VectorNormalize( val );
+    return VectorNormalize(val);
 }
 
-inline
-void SkelVec3::NormalizeFast()
+inline void SkelVec3::NormalizeFast()
 {
-	VectorNormalizeFast( val );
+    VectorNormalizeFast(val);
 }
 
-inline
-void SkelVec3::SetZero()
+inline void SkelVec3::SetZero()
 {
-	this->x = 0.0f;
-	this->y = 0.0f;
-	this->z = 0.0f;
+    this->x = 0.0f;
+    this->y = 0.0f;
+    this->z = 0.0f;
 }
 
-inline
-void SkelVec3::SetXAxis()
+inline void SkelVec3::SetXAxis()
 {
-	x = 0.0f;
+    x = 0.0f;
 }
 
-inline
-void SkelVec3::SetYAxis()
+inline void SkelVec3::SetYAxis()
 {
-	y = 0.0f;
+    y = 0.0f;
 }
 
-inline
-void SkelVec3::SetZAxis()
+inline void SkelVec3::SetZAxis()
 {
-	z = 0.0f;
+    z = 0.0f;
 }
 
-inline
-void SkelVec3::RotateYaw( float yaw, float deg )
+inline void SkelVec3::RotateYaw(float yaw, float deg)
 {
-	// FIXME: stub
+    // FIXME: stub
 }
 
-inline
-float& SkelVec3::operator[]( int index )
+inline float& SkelVec3::operator[](int index)
 {
-	return val[ index ];
+    return val[index];
 }
 
-inline
-float SkelVec3::operator[]( int index ) const
+inline float SkelVec3::operator[](int index) const
 {
-	return val[ index ];
+    return val[index];
 }
 
-inline
-const SkelVec3& SkelVec3::operator+=( const SkelVec3 &a )
+inline const SkelVec3& SkelVec3::operator+=(const SkelVec3& a)
 {
-	x += a.x;
-	y += a.y;
-	z += a.z;
+    x += a.x;
+    y += a.y;
+    z += a.z;
 
-	return *this;
+    return *this;
 }
 
-inline
-const SkelVec3& SkelVec3::operator+=( vec3_t a )
+inline const SkelVec3& SkelVec3::operator+=(vec3_t a)
 {
-	x += a[ 0 ];
-	y += a[ 1 ];
-	z += a[ 2 ];
+    x += a[0];
+    y += a[1];
+    z += a[2];
 
-	return *this;
+    return *this;
 }
 
 #else
 
 typedef struct {
-	union {
-		float val[ 3 ];
-		struct {
-			float x;
-			float y;
-			float z;
-		};
-	};
+    union {
+        float val[3];
+
+        struct {
+            float x;
+            float y;
+            float z;
+        };
+    };
 } SkelVec3;
 
 #endif
-
-#endif // __SKELVEC3_H__
diff --git a/code/skeletor/SkelVec4.h b/code/skeletor/SkelVec4.h
index bdf41f3f..a4b7fcc5 100644
--- a/code/skeletor/SkelVec4.h
+++ b/code/skeletor/SkelVec4.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,51 +22,51 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // SkelVec4.h : Skeletor Vec4
 
-#ifndef __SKELVEC4_H__
-#define __SKELVEC4_H__
+#pragma once
 
 #ifdef __cplusplus
 
-class SkelVec4 {
+class SkelVec4
+{
 public:
-	union {
-		float val[ 4 ];
-		struct {
-			float x;
-			float y;
-			float z;
-			float w;
-		} xyzw;
-	};
+    union {
+        float val[4];
+
+        struct {
+            float x;
+            float y;
+            float z;
+            float w;
+        } xyzw;
+    };
 
 protected:
-	void copy( class SkelVec4 const & );
+    void copy(const SkelVec4&);
 
 public:
-	SkelVec4( float x, float y, float z, float w );
-	SkelVec4( const SkelVec3& vec3, float w );
-	SkelVec4( const float *vec4 );
+    SkelVec4(float x, float y, float z, float w);
+    SkelVec4(const SkelVec3& vec3, float w);
+    SkelVec4(const float *vec4);
 
-	operator float *( );
-	operator float *( ) const;
+    operator float *();
+    operator float *() const;
 
-	void set( float x, float y, float z, float w );
+    void set(float x, float y, float z, float w);
 };
 
 #else
 
 typedef struct {
-	union {
-		float val[ 4 ];
-		struct {
-			float x;
-			float y;
-			float z;
-			float w;
-		};
-	};
+    union {
+        float val[4];
+
+        struct {
+            float x;
+            float y;
+            float z;
+            float w;
+        };
+    };
 } SkelVec4;
 
 #endif
-
-#endif // __SKELVEC4_H__
diff --git a/code/skeletor/bonetable.cpp b/code/skeletor/bonetable.cpp
index 942fc73d..0b9b7a50 100644
--- a/code/skeletor/bonetable.cpp
+++ b/code/skeletor/bonetable.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,342 +25,290 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "tiki.h"
 
-void ChannelNameTable::CopyChannel( ChannelName_t *dest, const ChannelName_t *source )
+void ChannelNameTable::CopyChannel(ChannelName_t *dest, const ChannelName_t *source)
 {
-	memcpy( dest, source, sizeof( ChannelName_t ) );
+    memcpy(dest, source, sizeof(ChannelName_t));
 }
 
-void ChannelNameTable::SetChannelName( ChannelName_t *channel, const char *newName )
+void ChannelNameTable::SetChannelName(ChannelName_t *channel, const char *newName)
 {
-	strcpy( channel->name, newName );
+    Q_strncpyz(channel->name, newName, sizeof(channel->name));
 }
 
 ChannelNameTable::ChannelNameTable()
 {
-	memset( this, 0, sizeof( ChannelNameTable ) );
-	m_iNumChannels = 0;
+    memset(this, 0, sizeof(ChannelNameTable));
+    m_iNumChannels = 0;
 }
 
 void ChannelNameTable::PrintContents()
 {
-	str channelList;
-	int i;
+    str channelList;
+    int i;
 
-	for( i = 0; i < m_iNumChannels; i++ )
-	{
-		if( !m_Channels[ i ].name[ 0 ] )
-		{
-			continue;
-		}
+    for (i = 0; i < m_iNumChannels; i++) {
+        if (!m_Channels[i].name[0]) {
+            continue;
+        }
 
-		channelList += str( "c" ) + m_Channels[ i ].channelNum + ":" + str( m_Channels[ i ].name ) + "\n";
-	}
+        channelList += str("c") + m_Channels[i].channelNum + ":" + str(m_Channels[i].name) + "\n";
+    }
 
-	SKEL_Message( "ChannelNameTable contents:\n%s", channelList.c_str() );
+    SKEL_Message("ChannelNameTable contents:\n%s", channelList.c_str());
 }
 
-bool ChannelNameTable::FindIndexFromName( const char *name, int *indexPtr )
+bool ChannelNameTable::FindIndexFromName(const char *name, int *indexPtr)
 {
-	int sortValue;
-	int lowerBound;
-	int upperBound;
-	int index;
+    int sortValue;
+    int lowerBound;
+    int upperBound;
+    int index;
 
-	lowerBound = 0;
-	upperBound = m_iNumChannels - 1;
-	while( lowerBound <= upperBound )
-	{
-		index = ( lowerBound + upperBound ) / 2;
-		sortValue = stricmp( name, m_Channels[ index ].name );
-		if( !sortValue )
-		{
-			if( indexPtr )
-				*indexPtr = index;
-			return true;
-		}
-		if( sortValue <= 0 )
-		{
-			upperBound = index - 1;
-		}
-		else
-		{
-			lowerBound = index + 1;
-		}
-	}
+    lowerBound = 0;
+    upperBound = m_iNumChannels - 1;
+    while (lowerBound <= upperBound) {
+        index     = (lowerBound + upperBound) / 2;
+        sortValue = stricmp(name, m_Channels[index].name);
+        if (!sortValue) {
+            if (indexPtr) {
+                *indexPtr = index;
+            }
+            return true;
+        }
+        if (sortValue <= 0) {
+            upperBound = index - 1;
+        } else {
+            lowerBound = index + 1;
+        }
+    }
 
-	if( indexPtr )
-		*indexPtr = lowerBound;
-	return false;
+    if (indexPtr) {
+        *indexPtr = lowerBound;
+    }
+    return false;
 }
 
-int ChannelNameTable::FindNameLookup( const char *name )
+int ChannelNameTable::FindNameLookup(const char *name)
 {
-	int index;
+    int index;
 
-	if( FindIndexFromName( name, &index ) )
-	{
-		return m_Channels[ index ].channelNum;
-	}
-	else
-	{
-		return -1;
-	}
+    if (FindIndexFromName(name, &index)) {
+        return m_Channels[index].channelNum;
+    } else {
+        return -1;
+    }
 }
 
-
-const char *ChannelNameTable::FindName( int index )
+const char *ChannelNameTable::FindName(int index)
 {
-	return FindNameFromLookup( m_lookup[ index ] );
+    return FindNameFromLookup(m_lookup[index]);
 }
 
-
-void ChannelNameTable::SortIntoTable( int index )
+void ChannelNameTable::SortIntoTable(int index)
 {
-	int i;
-	ChannelName_t tempName;
+    int           i;
+    ChannelName_t tempName;
 
-	CopyChannel( &tempName, &m_Channels[ m_iNumChannels ] );
+    CopyChannel(&tempName, &m_Channels[m_iNumChannels]);
 
-	for( i = m_iNumChannels - 1; i >= index; i-- )
-	{
-		m_lookup[ m_Channels[ i ].channelNum ] = i + 1;
-		CopyChannel( &m_Channels[ i + 1 ], &m_Channels[ i ] );
-	}
+    for (i = m_iNumChannels - 1; i >= index; i--) {
+        m_lookup[m_Channels[i].channelNum] = i + 1;
+        CopyChannel(&m_Channels[i + 1], &m_Channels[i]);
+    }
 
-	m_lookup[ tempName.channelNum ] = index;
-	CopyChannel( &m_Channels[ index ], &tempName );
+    m_lookup[tempName.channelNum] = index;
+    CopyChannel(&m_Channels[index], &tempName);
 }
 
-static const char *bogusNameTable[] =
+static const char *bogusNameTable[] = {
+    "Bip01 Spine pos",
+    "Bip01 Spine1 pos",
+    "Bip01 Spine2 pos",
+    "Bip01 Neck pos",
+    "Bip01 Head pos",
+    "helmet bone pos",
+    "helmet bone rot",
+    "Bip01 R Clavicle pos",
+    "Bip01 R UpperArm pos",
+    "Bip01 R Forearm pos",
+    "Bip01 R Hand pos",
+    "Bip01 R Finger0 pos",
+    "Bip01 R Finger01 pos",
+    "Bip01 R Finger02 pos",
+    "Bip01 R Finger1 pos",
+    "Bip01 R Finger11 pos",
+    "Bip01 R Finger12 pos",
+    "Bip01 R Finger2 pos",
+    "Bip01 R Finger21 pos",
+    "Bip01 R Finger22 pos",
+    "Bip01 R Finger3 pos",
+    "Bip01 R Finger31 pos",
+    "Bip01 R Finger32 pos",
+    "Bip01 R Finger4 pos",
+    "Bip01 R Finger41 pos",
+    "Bip01 R Finger42 pos",
+    "Bip01 L Clavicle pos",
+    "Bip01 L UpperArm pos",
+    "Bip01 L Forearm pos",
+    "Bip01 L Hand pos",
+    "Bip01 L Finger0 pos",
+    "Bip01 L Finger01 pos",
+    "Bip01 L Finger02 pos",
+    "Bip01 L Finger1 pos",
+    "Bip01 L Finger11 pos",
+    "Bip01 L Finger12 pos",
+    "Bip01 L Finger2 pos",
+    "Bip01 L Finger21 pos",
+    "Bip01 L Finger22 pos",
+    "Bip01 L Finger3 pos",
+    "Bip01 L Finger31 pos",
+    "Bip01 L Finger32 pos",
+    "Bip01 L Finger4 pos",
+    "Bip01 L Finger41 pos",
+    "Bip01 L Finger42 pos",
+    "Bip01 L Toe0 pos",
+    "Bip01 R Toe0 pos",
+    "buckle bone pos",
+    "buckle bone rot",
+    "belt attachments bone pos",
+    "belt attachments bone rot",
+    "backpack bone pos",
+    "backpack bone rot",
+    "helper Lelbow pos",
+    "helper Lelbow rot",
+    "helper Lshoulder pos",
+    "helper Lshoulder rot",
+    "helper Lshoulder01 pos",
+    "helper Lshoulder01 rot",
+    "helper Rshoulder pos",
+    "helper Rshoulder rot",
+    "helper Lshoulder02 pos",
+    "helper Lshoulder02 rot",
+    "helper Relbow pos",
+    "helper Relbow rot",
+    "helper Lankle pos",
+    "helper Lankle rot",
+    "helper Lknee pos",
+    "helper Lknee rot",
+    "helper Rankle pos",
+    "helper Rankle rot",
+    "helper Rknee pos",
+    "helper Rknee rot",
+    "helper Lhip pos",
+    "helper Lhip rot",
+    "helper Lhip01 pos",
+    "helper Lhip01 rot",
+    "helper Rhip pos",
+    "helper Rhip rot",
+    "helper Rhip01 pos",
+    "helper Rhip01 rot",
+    "target_left_hand pos",
+    "target_left_hand rot",
+    "target_right_hand pos",
+    "target_right_hand rot",
+    "JAW open-closed pos",
+    "JAW open-closed rot",
+    "BROW_worry$",
+    "EYES_down$",
+    "EYES_Excited_$",
+    "EYES_L_squint$",
+    "EYES_left$",
+    "EYES_right$",
+    "EYES_smile$",
+    "EYES_up_$",
+    "JAW_open-open$",
+    "MOUTH_L_smile_open$",
+    "VISEME_Eat$",
+    "right foot placeholder pos"
+    "right foot placeholder rot"
+    "left foot placeholder pos"
+    "left foot placeholder rot"};
+
+bool IsBogusChannelName(const char *name)
 {
-	"Bip01 Spine pos",
-	"Bip01 Spine1 pos",
-	"Bip01 Spine2 pos",
-	"Bip01 Neck pos",
-	"Bip01 Head pos",
-	"helmet bone pos",
-	"helmet bone rot",
-	"Bip01 R Clavicle pos",
-	"Bip01 R UpperArm pos",
-	"Bip01 R Forearm pos",
-	"Bip01 R Hand pos",
-	"Bip01 R Finger0 pos",
-	"Bip01 R Finger01 pos",
-	"Bip01 R Finger02 pos",
-	"Bip01 R Finger1 pos",
-	"Bip01 R Finger11 pos",
-	"Bip01 R Finger12 pos",
-	"Bip01 R Finger2 pos",
-	"Bip01 R Finger21 pos",
-	"Bip01 R Finger22 pos",
-	"Bip01 R Finger3 pos",
-	"Bip01 R Finger31 pos",
-	"Bip01 R Finger32 pos",
-	"Bip01 R Finger4 pos",
-	"Bip01 R Finger41 pos",
-	"Bip01 R Finger42 pos",
-	"Bip01 L Clavicle pos",
-	"Bip01 L UpperArm pos",
-	"Bip01 L Forearm pos",
-	"Bip01 L Hand pos",
-	"Bip01 L Finger0 pos",
-	"Bip01 L Finger01 pos",
-	"Bip01 L Finger02 pos",
-	"Bip01 L Finger1 pos",
-	"Bip01 L Finger11 pos",
-	"Bip01 L Finger12 pos",
-	"Bip01 L Finger2 pos",
-	"Bip01 L Finger21 pos",
-	"Bip01 L Finger22 pos",
-	"Bip01 L Finger3 pos",
-	"Bip01 L Finger31 pos",
-	"Bip01 L Finger32 pos",
-	"Bip01 L Finger4 pos",
-	"Bip01 L Finger41 pos",
-	"Bip01 L Finger42 pos",
-	"Bip01 L Toe0 pos",
-	"Bip01 R Toe0 pos",
-	"buckle bone pos",
-	"buckle bone rot",
-	"belt attachments bone pos",
-	"belt attachments bone rot",
-	"backpack bone pos",
-	"backpack bone rot",
-	"helper Lelbow pos",
-	"helper Lelbow rot",
-	"helper Lshoulder pos",
-	"helper Lshoulder rot",
-	"helper Lshoulder01 pos",
-	"helper Lshoulder01 rot",
-	"helper Rshoulder pos",
-	"helper Rshoulder rot",
-	"helper Lshoulder02 pos",
-	"helper Lshoulder02 rot",
-	"helper Relbow pos",
-	"helper Relbow rot",
-	"helper Lankle pos",
-	"helper Lankle rot",
-	"helper Lknee pos",
-	"helper Lknee rot",
-	"helper Rankle pos",
-	"helper Rankle rot",
-	"helper Rknee pos",
-	"helper Rknee rot",
-	"helper Lhip pos",
-	"helper Lhip rot",
-	"helper Lhip01 pos",
-	"helper Lhip01 rot",
-	"helper Rhip pos",
-	"helper Rhip rot",
-	"helper Rhip01 pos",
-	"helper Rhip01 rot",
-	"target_left_hand pos",
-	"target_left_hand rot",
-	"target_right_hand pos",
-	"target_right_hand rot",
-	"JAW open-closed pos",
-	"JAW open-closed rot",
-	"BROW_worry$",
-	"EYES_down$",
-	"EYES_Excited_$",
-	"EYES_L_squint$",
-	"EYES_left$",
-	"EYES_right$",
-	"EYES_smile$",
-	"EYES_up_$",
-	"JAW_open-open$",
-	"MOUTH_L_smile_open$",
-	"VISEME_Eat$",
-	"right foot placeholder pos"
-	"right foot placeholder rot"
-	"left foot placeholder pos"
-	"left foot placeholder rot"
-};
+    int i;
 
-bool IsBogusChannelName( const char *name )
-{
-	int i;
+    for (i = 0; i < sizeof(bogusNameTable) / sizeof(bogusNameTable[0]); i++) {
+        if (!Q_stricmp(name, bogusNameTable[i])) {
+            return true;
+        }
+    }
 
-	for( i = 0; i < sizeof( bogusNameTable  )/ sizeof( bogusNameTable[ 0 ] ); i++ )
-	{
-		if( !Q_stricmp( name, bogusNameTable[ i ] ) )
-		{
-			return true;
-		}
-	}
+    if (strstr(name, "Bip0") && !strstr(name, "Bip01") && !strstr(name, "Footsteps")) {
+        return true;
+    }
 
-	if( strstr( name, "Bip0" ) && !strstr( name, "Bip01" ) && !strstr( name, "Footsteps" ) )
-	{
-		return true;
-	}
-
-	return false;
+    return false;
 }
 
-int GetChannelTypeFromName( const char *name )
+channelType_t GetBoneChannelType(const char* name)
 {
-	int i;
-	size_t len;
+    size_t len;
 
-	if( !name )
-	{
-		return 2;
-	}
+    if (!name) {
+        return CHANNEL_NONE;
+    }
 
-	for( i = 0; i < sizeof( bogusNameTable ) / sizeof( bogusNameTable[ 0 ] ); i++ )
-	{
-		if( !Q_stricmp( name, bogusNameTable[ i ] ) )
-		{
-			return 2;
-		}
-	}
+    if (IsBogusChannelName(name)) {
+        return CHANNEL_NONE;
+    }
 
-	if( strstr( name, "Bip0" ) && !strstr( name, "Bip01" ) && !strstr( name, "Footsteps" ) )
-	{
-		return 2;
-	}
+    len = strlen(name);
+    if (len < 4) {
+        return CHANNEL_VALUE;
+    }
 
-	len = strlen( name );
+    if (!strcmp(name + len - 4, " rot")) {
+        return CHANNEL_ROTATION;
+    }
 
-	if( len >= 4 )
-	{
-		if( !memcmp( name + len - 4, " rot", 5 ) )
-		{
-			return 0;
-		}
-		else if( !memcmp( name + len - 4, " pos", 5 ) )
-		{
-			return 1;
-		}
-		else if( len >= 6 )
-		{
-			if( !memcmp( name + len - 4, " rotFK", 7 ) )
-			{
-				return 2;
-			}
-			else
-			{
-				return 3;
-			}
-		}
-		else
-		{
-			return 3;
-		}
-	}
-	else
-	{
-		return 3;
-	}
+    if (!strcmp(name + len - 4, " pos")) {
+        return CHANNEL_POSITION;
+    }
 
-	return false;
+    if (len >= 6 && !strcmp(name + len - 6, " rotFK")) {
+        return CHANNEL_NONE;
+    }
+
+    return CHANNEL_VALUE;
 }
 
-int ChannelNameTable::RegisterChannel( const char *name )
+int ChannelNameTable::RegisterChannel(const char *name)
 {
-	int index;
+    int index;
 
-	if( IsBogusChannelName( name ) )
-	{
-		return -1;
-	}
+    if (IsBogusChannelName(name)) {
+        return -1;
+    }
 
-	if( FindIndexFromName( name, &index ) )
-	{
-		return m_Channels[ index ].channelNum;
-	}
+    if (FindIndexFromName(name, &index)) {
+        return m_Channels[index].channelNum;
+    }
 
-	if( m_iNumChannels >= MAX_SKELETOR_CHANNELS)
-	{
-		Com_Printf( "==========================================================================\n" );
-		Com_Printf( "Skeletor channel name table, contents (in order of addition):\n" );
+    if (m_iNumChannels >= MAX_SKELETOR_CHANNELS) {
+        Com_Printf("==========================================================================\n");
+        Com_Printf("Skeletor channel name table, contents (in order of addition):\n");
 
-		for( index = 0; index < MAX_SKELETOR_CHANNELS; index++ )
-		{
-			Com_Printf( "%s\n", m_Channels[ m_lookup [ index ] ].name );
-		}
+        for (index = 0; index < MAX_SKELETOR_CHANNELS; index++) {
+            Com_Printf("%s\n", m_Channels[m_lookup[index]].name);
+        }
 
-		Com_Printf( "==========================================================================\n" );
-		SKEL_Error( "Channel name table already has %i channels, can't add any more.", MAX_SKELETOR_CHANNELS );
-		return -1;
-	}
-	else
-	{
-		SetChannelName( &m_Channels[ m_iNumChannels ], name );
-		m_Channels[ m_iNumChannels ].channelNum = m_iNumChannels;
-		SortIntoTable( index );
-		return m_iNumChannels++;
-	}
+        Com_Printf("==========================================================================\n");
+        SKEL_Error("Channel name table already has %i channels, can't add any more.", MAX_SKELETOR_CHANNELS);
+        return -1;
+    } else {
+        SetChannelName(&m_Channels[m_iNumChannels], name);
+        m_Channels[m_iNumChannels].channelNum = m_iNumChannels;
+        SortIntoTable(index);
+        return m_iNumChannels++;
+    }
 }
 
-const char *ChannelNameTable::FindNameFromLookup( int index )
+const char *ChannelNameTable::FindNameFromLookup(int index)
 {
-	if( index < m_iNumChannels )
-	{
-		return m_Channels[ index ].name;
-	}
-	else
-	{
-		return NULL;
-	}
+    if (index >= m_iNumChannels) {
+        return NULL;
+    }
+
+    return m_Channels[index].name;
 }
diff --git a/code/skeletor/skeletor.cpp b/code/skeletor/skeletor.cpp
index 9aaffb8a..c2dea715 100644
--- a/code/skeletor/skeletor.cpp
+++ b/code/skeletor/skeletor.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,800 +27,804 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "skeletor.h"
 #include <tiki.h>
 
-#define EPSILON		0.000000000001f
+#define EPSILON 0.000000000001f
 
-
-int skelAnimDataGameHeader_s::GetFrameNums( float timeSeconds, float timeTolerance, int *beforeFrame, int *afterFrame, float *beforeWeight, float *afterWeight )
+ChannelNameTable* skeletor_c::ChannelNames()
 {
-	int frameNum1;
-	int frameNum2;
-
-	frameNum1 = ( int )( timeSeconds / frameTime );
-	frameNum2 = frameNum1 + 1;
-
-	*afterWeight = ( timeSeconds / frameTime ) - ( float )frameNum1;
-
-	if( ( 1.0 - *afterWeight ) * frameTime < timeTolerance ||
-		*afterWeight * frameTime < timeTolerance )
-	{
-		if( *afterWeight > 0.5 )
-			frameNum1++;
-
-		if( frameNum1 >= numFrames )
-		{
-			if( ( flags & TAF_DELTADRIVEN ) ) {
-				frameNum1 %= numFrames;
-			} else {
-				frameNum1 = numFrames - 1;
-			}
-		}
-
-		*beforeFrame = frameNum1;
-		*beforeWeight = 1.0;
-		*afterFrame = 0;
-		*afterWeight = 0.0;
-
-		return 1;
-	}
-	else if( frameNum2 >= numFrames )
-	{
-		if( ( flags & TAF_DELTADRIVEN ) ) {
-			frameNum2 %= numFrames;
-		} else {
-			frameNum2 = numFrames - 1;
-		}
-
-		if( frameNum1 >= numFrames )
-		{
-			if( ( flags & TAF_DELTADRIVEN ) )
-			{
-				frameNum1 %= numFrames;
-			}
-			else
-			{
-				*beforeFrame = numFrames - 1;
-				*beforeWeight = 1.0;
-				return 1;
-			}
-		}
-	}
-
-	*beforeFrame = frameNum1;
-	*afterFrame = frameNum2;
-	*beforeWeight = 1.0 - *afterWeight;
-
-	return 2;
+    return &m_channelNames;
 }
 
-SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime( float time1, float time2 )
+int skelAnimDataGameHeader_s::GetFrameNums(
+    float timeSeconds, float timeTolerance, int *beforeFrame, int *afterFrame, float *beforeWeight, float *afterWeight
+)
 {
-	float deltaWeight1;
-	int frameNum1;
-	float deltaWeight2;
-	int frameNum2;
-	SkelVec3 delta;
-	int currFrame;
-	float s, d;
+    int frameNum1;
+    int frameNum2;
 
-	deltaWeight1 = time1 / frameTime;
-	deltaWeight2 = time2 / frameTime;
-	frameNum1 = ( int )( deltaWeight1 + 1.0 );
-	frameNum2 = ( int )( deltaWeight2 + 1.0 );
-	
-	d = frameNum1 - deltaWeight1;
-	s = 1.0 - (frameNum2 - deltaWeight2);
+    frameNum1 = (int)(timeSeconds / frameTime);
+    frameNum2 = frameNum1 + 1;
 
-	if( frameNum1 < frameNum2 )
-	{
-		delta = m_frame[ frameNum1 % numFrames ].delta;
+    *afterWeight = (timeSeconds / frameTime) - (float)frameNum1;
 
-		for( currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++ )
-		{
-			delta += m_frame[ currFrame % numFrames ].delta;
-		}
-	}
-	else
-	{
-		s = s - ( 1.0 - d );
-	}
+    if ((1.0 - *afterWeight) * frameTime < timeTolerance || *afterWeight * frameTime < timeTolerance) {
+        if (*afterWeight > 0.5) {
+            frameNum1++;
+        }
 
-	delta.x += m_frame[ frameNum2 % numFrames ].delta.x * s;
-	delta.y += m_frame[ frameNum2 % numFrames ].delta.y * s;
-	delta.z += m_frame[ frameNum2 % numFrames ].delta.z * s;
+        if (frameNum1 >= numFrames) {
+            if ((flags & TAF_DELTADRIVEN)) {
+                frameNum1 %= numFrames;
+            } else {
+                frameNum1 = numFrames - 1;
+            }
+        }
 
-	if( delta.x > -0.001f && delta.x < 0.001f ) {
-		delta.x = 0;
-	}
-	if( delta.y > -0.001f && delta.y < 0.001f ) {
-		delta.y = 0;
-	}
-	if( delta.z > -0.001f && delta.z < 0.001f ) {
-		delta.z = 0;
-	}
+        *beforeFrame  = frameNum1;
+        *beforeWeight = 1.0;
+        *afterFrame   = 0;
+        *afterWeight  = 0.0;
 
-	return delta;
+        return 1;
+    } else if (frameNum2 >= numFrames) {
+        if ((flags & TAF_DELTADRIVEN)) {
+            frameNum2 %= numFrames;
+        } else {
+            frameNum2 = numFrames - 1;
+        }
+
+        if (frameNum1 >= numFrames) {
+            if ((flags & TAF_DELTADRIVEN)) {
+                frameNum1 %= numFrames;
+            } else {
+                *beforeFrame  = numFrames - 1;
+                *beforeWeight = 1.0;
+                return 1;
+            }
+        }
+    }
+
+    *beforeFrame  = frameNum1;
+    *afterFrame   = frameNum2;
+    *beforeWeight = 1.0 - *afterWeight;
+
+    return 2;
+}
+
+SkelVec3 skelAnimDataGameHeader_s::GetDeltaOverTime(float time1, float time2)
+{
+    float    deltaWeight1;
+    int      frameNum1;
+    float    deltaWeight2;
+    int      frameNum2;
+    SkelVec3 delta;
+    int      currFrame;
+    float    s, d;
+
+    deltaWeight1 = time1 / frameTime;
+    deltaWeight2 = time2 / frameTime;
+    frameNum1    = ceil(deltaWeight1);
+    frameNum2    = ceil(deltaWeight2);
+
+    d = frameNum1 - deltaWeight1;
+    s = 1.0 - (frameNum2 - deltaWeight2);
+
+    if (frameNum1 < frameNum2) {
+        delta = m_frame[frameNum1 % numFrames].delta;
+        VectorScale(delta, d, delta);
+
+        for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
+            delta += m_frame[currFrame % numFrames].delta;
+        }
+
+        delta.x += m_frame[frameNum2 % numFrames].delta.x * s;
+        delta.y += m_frame[frameNum2 % numFrames].delta.y * s;
+        delta.z += m_frame[frameNum2 % numFrames].delta.z * s;
+    } else {
+        s = s - (1.0 - d);
+        delta.x = m_frame[frameNum2 % numFrames].delta.x * s;
+        delta.y = m_frame[frameNum2 % numFrames].delta.y * s;
+        delta.z = m_frame[frameNum2 % numFrames].delta.z * s;
+    }
+
+    if (delta.x > -0.001f && delta.x < 0.001f) {
+        delta.x = 0;
+    }
+    if (delta.y > -0.001f && delta.y < 0.001f) {
+        delta.y = 0;
+    }
+    if (delta.z > -0.001f && delta.z < 0.001f) {
+        delta.z = 0;
+    }
+
+    return delta;
 }
 
 float skelAnimDataGameHeader_s::GetAngularDeltaOverTime(float time1, float time2)
 {
-	float deltaWeight1;
-	int frameNum1;
-	float deltaWeight2;
-	int frameNum2;
-	float delta;
-	int currFrame;
-	float s, d;
+    float deltaWeight1;
+    int   frameNum1;
+    float deltaWeight2;
+    int   frameNum2;
+    float delta;
+    int   currFrame;
+    float s, d;
 
-	deltaWeight1 = time1 / frameTime;
-	deltaWeight2 = time2 / frameTime;
-	frameNum1 = (int)(deltaWeight1 + 1.0);
-	frameNum2 = (int)(deltaWeight2 + 1.0);
+    deltaWeight1 = time1 / frameTime;
+    deltaWeight2 = time2 / frameTime;
+    frameNum1    = ceil(deltaWeight1);
+    frameNum2    = ceil(deltaWeight2);
 
-	d = frameNum1 - deltaWeight1;
-	s = 1.0 - (frameNum2 - deltaWeight2);
-	delta = 0;
+    d     = frameNum1 - deltaWeight1;
+    s     = 1.0 - (frameNum2 - deltaWeight2);
+    delta = 0;
 
-	if (frameNum2 > frameNum1) {
-		delta = m_frame[frameNum1 % numFrames].angleDelta;
+    if (frameNum1 < frameNum2) {
+        delta = m_frame[frameNum1 % numFrames].angleDelta * d;
 
-		for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++)
-		{
-			delta += m_frame[currFrame % numFrames].angleDelta;
-		}
-	}
-	else
-	{
-		s = s - (1.0 - d);
-	}
+        for (currFrame = frameNum1 + 1; currFrame < frameNum2; currFrame++) {
+            delta += m_frame[currFrame % numFrames].angleDelta;
+        }
 
-	delta += m_frame[frameNum2 % numFrames].angleDelta * s;
+        delta += m_frame[frameNum2 % numFrames].angleDelta * s;
+    } else {
+        s = s - (1.0 - d);
+        delta = m_frame[frameNum2 % numFrames].angleDelta;
+    }
 
-	if (delta > -0.001f && delta < 0.001f) {
-		delta = 0;
-	}
+    if (delta > -0.001f && delta < 0.001f) {
+        delta = 0;
+    }
 
-	return delta;
+    return delta;
 }
 
-skelAnimDataGameHeader_t *skelAnimDataGameHeader_s::AllocAnimData( size_t numFrames, size_t numChannels )
+skelAnimDataGameHeader_t *skelAnimDataGameHeader_s::AllocAnimData(size_t numFrames, size_t numChannels)
 {
-	skelAnimDataGameHeader_t *data;
-	
-	const size_t animSize = sizeof( skelAnimDataGameHeader_t ) + ( 16 * ( 3 * numFrames - 3 ) ) + 16 * numChannels * numFrames;
+    skelAnimDataGameHeader_t *data;
 
-	data = ( skelAnimDataGameHeader_t * )Skel_Alloc( animSize );
-	data->flags = 0;
-	data->channelList.InitChannels();
-	data->nBytesUsed = animSize;
-	data->numFrames = numFrames;
-	return data;
+    const size_t animSize =
+        sizeof(skelAnimDataGameHeader_t) + (16 * (3 * numFrames - 3)) + 16 * numChannels * numFrames;
+
+    data        = (skelAnimDataGameHeader_t *)Skel_Alloc(animSize);
+    data->flags = 0;
+    data->channelList.InitChannels();
+    data->nBytesUsed = animSize;
+    data->numFrames  = numFrames;
+    return data;
 }
 
-
 skelAnimDataGameHeader_s *skelAnimDataGameHeader_s::AllocRLEChannelData(size_t numChannels)
 {
-	int animSize;
-	skelAnimDataGameHeader_t *data;
+    int                       animSize;
+    skelAnimDataGameHeader_t *data;
 
-	animSize = sizeof( skelAnimDataGameHeader_t ) + ( numChannels - 1 ) * sizeof( skanChannelHdr );
-	data = ( skelAnimDataGameHeader_t * )Skel_Alloc( animSize );
-	data->flags = 0;
-	data->nTotalChannels = numChannels;
-	data->channelList.InitChannels();
-	data->nBytesUsed = animSize;
-	return data;
+    animSize             = sizeof(skelAnimDataGameHeader_t) + (numChannels - 1) * sizeof(skanChannelHdr);
+    data                 = (skelAnimDataGameHeader_t *)Skel_Alloc(animSize);
+    data->flags          = 0;
+    data->nTotalChannels = numChannels;
+    data->channelList.InitChannels();
+    data->nBytesUsed = animSize;
+    return data;
 }
 
-skeletor_c::skeletor_c( dtiki_t *tiki )
+skeletor_c::skeletor_c(dtiki_t *tiki)
 {
-	int numBones;
-	int mesh;
-	skelHeaderGame_t *skelmodel;
+    int               numBones;
+    int               mesh;
+    skelHeaderGame_t *skelmodel;
 
-	m_Tiki = tiki;
+    m_Tiki = tiki;
 
-	m_morphTargetList.InitChannels();
-	m_morphTargetList.ZeroChannels();
+    m_morphTargetList.InitChannels();
+    m_morphTargetList.ZeroChannels();
 
-	m_frameBounds[ 0 ].set( -32, -32, 0 );
-	m_frameBounds[ 1 ].set( 32, 32, 28 );
-	m_frameRadius = 64;
-	m_frameList.numActionFrames = 0;
-	m_frameList.numMovementFrames = 0;
-	m_targetLookLeft = 0;
-	m_targetLookRight = 0;
-	m_targetLookUp = 0;
-	m_targetLookDown = 0;
-	m_targetLookCrossed = 0;
-	m_targetBlink = 0;
+    m_frameBounds[0].set(-32, -32, 0);
+    m_frameBounds[1].set(32, 32, 28);
+    m_frameRadius                 = 64;
+    m_frameList.numActionFrames   = 0;
+    m_frameList.numMovementFrames = 0;
+    m_targetLookLeft              = 0;
+    m_targetLookRight             = 0;
+    m_targetLookUp                = 0;
+    m_targetLookDown              = 0;
+    m_targetLookCrossed           = 0;
+    m_targetBlink                 = 0;
 
-	VectorClear( m_eyeTargetPos );
-	VectorClear( m_eyePrevTargetPos );
+    VectorClear(m_eyeTargetPos);
+    VectorClear(m_eyePrevTargetPos);
 
-	m_timeNextBlink = Sys_Milliseconds();
-	numBones = m_Tiki->m_boneList.NumChannels();
-	m_bone = ( skelBone_Base ** )Skel_Alloc( numBones * sizeof( skelBone_Base * ) );
-	memset( m_bone, 0, numBones * sizeof( skelBone_Base * ) );
+    m_timeNextBlink = Sys_Milliseconds();
+    numBones        = m_Tiki->m_boneList.NumChannels();
+    m_bone          = (skelBone_Base **)Skel_Alloc(numBones * sizeof(skelBone_Base *));
+    memset(m_bone, 0, numBones * sizeof(skelBone_Base *));
 
-	for( mesh = 0; mesh < m_Tiki->numMeshes; mesh++ )
-	{
-		skelmodel = TIKI_GetSkel( m_Tiki->mesh[ mesh ] );
-		SkeletorLoadBonesFromBuffer( &m_Tiki->m_boneList, skelmodel, m_bone );
-		LoadMorphTargetNames( skelmodel );
-	}
+    for (mesh = 0; mesh < m_Tiki->numMeshes; mesh++) {
+        skelmodel = TIKI_GetSkel(m_Tiki->mesh[mesh]);
+        SkeletorLoadBonesFromBuffer(&m_Tiki->m_boneList, skelmodel, m_bone);
+        LoadMorphTargetNames(skelmodel);
+    }
 
-	m_morphTargetList.PackChannels();
-	m_headBoneIndex = m_Tiki->GetBoneNumFromName( "Bip01 Head" );
+    m_morphTargetList.PackChannels();
+    m_headBoneIndex = m_Tiki->GetBoneNumFromName("Bip01 Head");
 }
 
 skeletor_c::~skeletor_c()
 {
-	int i;
+    int i;
 
-	for( i = 0; i < m_Tiki->m_boneList.m_numChannels; i++ ) {
-		delete m_bone[ i ];
-	}
+    for (i = 0; i < m_Tiki->m_boneList.m_numChannels; i++) {
+        delete m_bone[i];
+    }
 
-	m_morphTargetList.CleanUpChannels();
-	Skel_Free( m_bone );
-	m_bone = NULL;
+    m_morphTargetList.CleanUpChannels();
+    Skel_Free(m_bone);
+    m_bone = NULL;
 }
 
-void skelAnimDataGameHeader_s::DeallocAnimData( skelAnimDataGameHeader_t *data )
+void skelAnimDataGameHeader_s::DeallocAnimData(skelAnimDataGameHeader_t *data)
 {
-	skanChannelHdr *pChannel;
-	int i;
+    skanChannelHdr *pChannel;
+    int             i;
+    int             channelType;
 
-	if( !data || data == ( skelAnimDataGameHeader_t * )-476 )
-	{
-		return;
-	}
+    if (!data) {
+        return;
+    }
 
-	for( i = 0; i < data->nTotalChannels; i++ )
-	{
-		pChannel = &data->ary_channels[ i ];
+    for (i = 0; i < data->nTotalChannels; i++) {
+        pChannel = &data->ary_channels[i];
+        channelType = GetBoneChannelType(data->channelList.ChannelName(skeletor_c::ChannelNames(), i));
 
-		if( pChannel->ary_frames )
-		{
-			Skel_Free( pChannel->ary_frames );
-		}
-	}
+        if (channelType != 2) {
+            Skel_Free(pChannel->ary_frames);
+        }
+    }
 
-	data->channelList.CleanUpChannels();
+    data->channelList.CleanUpChannels();
 
-	if( data->m_frame ) {
-		Skel_Free( data->m_frame );
-	}
+    if (data->m_frame) {
+        Skel_Free(data->m_frame);
+    }
 
-	Skel_Free( data );
+    Skel_Free(data);
 }
 
-void ConvertToRotationName( const char *boneName, char *rotChannelName )
+void ConvertToRotationName(const char *boneName, char *rotChannelName)
 {
-	strcpy( rotChannelName, boneName );
-	strcat( rotChannelName, " rot" );
+    strcpy(rotChannelName, boneName);
+    strcat(rotChannelName, " rot");
 }
 
-void ConvertToPositionName( const char *boneName, char *posChannelName )
+void ConvertToPositionName(const char *boneName, char *posChannelName)
 {
-	strcpy( posChannelName, boneName );
-	strcat( posChannelName, " rot" );
+    strcpy(posChannelName, boneName);
+    strcat(posChannelName, " rot");
 }
 
-void ConvertToFKRotationName( const char *boneName, char *rotChannelName )
+void ConvertToFKRotationName(const char *boneName, char *rotChannelName)
 {
-	strcpy( rotChannelName, boneName );
-	strcat( rotChannelName, " rot" );
-	strcat( rotChannelName, "FK" );
+    strcpy(rotChannelName, boneName);
+    strcat(rotChannelName, " rot");
+    strcat(rotChannelName, "FK");
 }
 
-void ConvertToFKPositionName( const char *boneName, char *rotChannelName )
+void ConvertToFKPositionName(const char *boneName, char *rotChannelName)
 {
-	strcpy( rotChannelName, boneName );
-	strcat( rotChannelName, " pos" );
-	strcat( rotChannelName, "FK" );
+    strcpy(rotChannelName, boneName);
+    strcat(rotChannelName, " pos");
+    strcat(rotChannelName, "FK");
 }
 
-int GetHighestFloat( float *selection )
+int GetHighestFloat(float *selection)
 {
-	float currentHighest;
-	int currentHighestIndex;
-	int i;
+    float currentHighest;
+    int   currentHighestIndex;
+    int   i;
 
-	currentHighest = selection[ 0 ];
-	currentHighestIndex = 0;
+    currentHighest      = selection[0];
+    currentHighestIndex = 0;
 
-	for( i = 0; i < 8; i++ )
-	{
-		if( selection[ i ] > currentHighest )
-		{
-			currentHighest = selection[ i ];
-			currentHighestIndex = i;
-		}
-	}
+    for (i = 0; i < 8; i++) {
+        if (selection[i] > currentHighest) {
+            currentHighest      = selection[i];
+            currentHighestIndex = i;
+        }
+    }
 
-	return currentHighestIndex;
-}
-void AddToBounds( SkelVec3 *bounds, SkelVec3 *newBounds )
-{
-	int i;
-
-	for( i = 0; i < 3; i++ )
-	{
-		if( bounds[ 0 ][ i ] > newBounds[ 0 ][ i ] )
-		{
-			bounds[ 0 ][ i ] = newBounds[ 0 ][ i ];
-		}
-
-		if( bounds[ 1 ][ i ] > newBounds[ 1 ][ i ] )
-		{
-			bounds[ 1 ][ i ] = newBounds[ 1 ][ i ];
-		}
-	}
+    return currentHighestIndex;
 }
 
-void skeletor_c::SetPose( const frameInfo_t *frameInfo, const int *contIndices, const vec4_t *contValues, float actionWeight )
+void AddToBounds(SkelVec3 *bounds, SkelVec3 *newBounds)
 {
-	skelAnimDataGameHeader_t *animData;
-	short int *aliases;
-	//int boneNum;
-	int blendNum;
-	int i;
-	int blendFrame;
-	int movementBlendFrame;
-	int actionBlendFrame;
-	//int realAnimIndex;
-	int beforeFrame;
-	int afterFrame;
-	float beforeWeight;
-	float afterWeight;
-	int numFramesAdded;
-	float cutoff_weight;
-	int contNum;
-	float animWeight;
-	skanBlendInfo *frame1, *frame2;
+    int i;
 
-	for( i = 0; i < m_Tiki->m_boneList.NumChannels(); i++ )
-	{
-		m_bone[ i ]->m_controller = NULL;
-		m_bone[ i ]->m_isDirty = true;
-	}
+    for (i = 0; i < 3; i++) {
+        if (bounds[0][i] > newBounds[0][i]) {
+            bounds[0][i] = newBounds[0][i];
+        }
 
-	if( contIndices && contValues )
-	{
-		for( i = 0; i < 5; i++ )
-		{
-			contNum = contIndices[ i ];
-			if( contNum != -1 )
-			{
-				cutoff_weight = ( contValues[ i ][ 3 ] - 1.0 ) * ( contValues[ i ][ 3 ] - 1.0 );
-				if( cutoff_weight >= EPSILON )
-				{
-					m_bone[ contNum ]->m_controller = ( float * )contValues[ i ];
-				}
-			}
-		}
-	}
-
-	for( i = 0; i < 3; i++ )
-	{
-		m_frameBounds[ 0 ][ i ] = -2.0f;
-		m_frameBounds[ 1 ][ i ] = 2.0f;
-	}
-
-	m_frameRadius = 2.0f;
-	animWeight = 0.0f;
-	movementBlendFrame = 0;
-	actionBlendFrame = 32;
-	aliases = m_Tiki->a->m_aliases;
-
-	for( i = 0; i < MAX_FRAMEINFOS; i++ )
-	{
-		if( animWeight < frameInfo[ i ].weight ) {
-			animWeight = frameInfo[ i ].weight;
-		}
-	}
-
-	cutoff_weight = animWeight * 0.01f;
-
-	for( i = 0; i < MAX_FRAMEINFOS; i++ )
-	{
-		if( frameInfo[ i ].weight > cutoff_weight )
-		{
-			animData = SkeletorCacheGetData( aliases[ frameInfo[ i ].index ] );
-			if( animData->bHasDelta ) {
-				blendFrame = movementBlendFrame;
-			} else {
-				blendFrame = actionBlendFrame;
-			}
-
-			beforeWeight = 0.0;
-			afterWeight = 0.0;
-			beforeFrame = 0.0;
-			afterFrame = 0.0;
-			
-			numFramesAdded = animData->GetFrameNums( frameInfo[ i ].time, 0.01f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight );
-
-			frame1 = &m_frameList.m_blendInfo[ blendFrame ];
-			frame1->frame = beforeFrame;
-			frame1->pAnimationData = animData;
-			frame1->weight = beforeWeight * frameInfo[ i ].weight;
-
-			AddToBounds( m_frameBounds, animData->bounds );
-
-			if( frame1->pAnimationData->m_frame[ frame1->frame ].radius > m_frameRadius )
-				m_frameRadius = frame1->pAnimationData->m_frame[ frame1->frame ].radius;
-
-			if( numFramesAdded == 2 )
-			{
-				frame2 = &m_frameList.m_blendInfo[ blendFrame + 1 ];
-				frame2->frame = afterFrame;
-				frame2->pAnimationData = animData;
-				frame2->weight = afterWeight * frameInfo[ i ].weight;
-				AddToBounds( m_frameBounds, animData->bounds );
-
-				if( frame2->pAnimationData->m_frame[ frame2->frame ].radius > m_frameRadius )
-					m_frameRadius = frame2->pAnimationData->m_frame[ frame2->frame ].radius;
-
-			}
-
-			blendNum = blendFrame + numFramesAdded;
-
-			if( animData->bHasDelta ) {
-				movementBlendFrame = blendNum;
-			} else {
-				actionBlendFrame = blendNum;
-			}
-		}
-	}
-
-	for( i = 0; i < 3; i++ )
-	{
-		m_frameBounds[ 0 ][ i ] += -7.0f;
-		m_frameBounds[ 1 ][ i ] += 7.0f;
-	}
-
-	m_frameList.numMovementFrames = movementBlendFrame;
-	m_frameList.numActionFrames = actionBlendFrame - 32;
-	m_frameList.actionWeight = actionWeight;
+        if (bounds[1][i] < newBounds[1][i]) {
+            bounds[1][i] = newBounds[1][i];
+        }
+    }
 }
 
-static SkelMat4 GetGlobalDefaultPosition( skelBone_Base *bone )
+void skeletor_c::SetPose(
+    const frameInfo_t *frameInfo, const int *contIndices, const vec4_t *contValues, float actionWeight
+)
 {
-	SkelMat4 lLocalPosition;
-	SkelMat4 lGlobalPosition;
-	SkelMat4 lParentGlobalPosition;
+    skelAnimDataGameHeader_t *animData;
+    short int                *aliases;
+    int                       boneNum;
+    int                       blendNum;
+    int                       i;
+    int                       blendFrame;
+    int                       movementBlendFrame;
+    int                       actionBlendFrame;
+    int                       realAnimIndex;
+    int                       beforeFrame;
+    int                       afterFrame;
+    float                     beforeWeight;
+    float                     afterWeight;
+    int                       numFramesAdded;
+    float                     cutoff_weight;
+    int                       contNum;
+    float                     animWeight;
+    skanBlendInfo            *frame1, *frame2;
 
-	lLocalPosition = bone->GetTransform( NULL );
+    for (i = 0; i < m_Tiki->m_boneList.NumChannels(); i++) {
+        m_bone[i]->m_controller = NULL;
+        m_bone[i]->m_isDirty    = true;
+    }
 
-	if( bone->Parent() )
-	{
-		//lParentGlobalPosition = GetGlobalDefaultPosition( bone->Parent() );
-		//lGlobalPosition.Multiply( lParentGlobalPosition, lLocalPosition );
-		lGlobalPosition = lLocalPosition;
-	}
-	else
-	{
-		lGlobalPosition = lLocalPosition;
-	}
+    if (contIndices && contValues) {
+        for (contNum = 0; contNum < 5; contNum++) {
+            boneNum = contIndices[contNum];
+            // Added in 2.0.
+            //  Make sure the bone is a valid channel
+            if (boneNum < 0 || boneNum >= m_Tiki->m_boneList.NumChannels()) {
+                continue;
+            }
 
-	return lGlobalPosition;
+            cutoff_weight = (contValues[contNum][3] - 1.0) * (contValues[contNum][3] - 1.0);
+            if (cutoff_weight >= EPSILON) {
+                m_bone[boneNum]->m_controller = (float *)contValues[contNum];
+            }
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        m_frameBounds[0][i] = -2.0f;
+        m_frameBounds[1][i] = 2.0f;
+    }
+
+    m_frameRadius      = 2.0f;
+    animWeight         = 0.0f;
+    movementBlendFrame = 0;
+    actionBlendFrame   = MAX_SKEL_BLEND_MOVEMENT_FRAMES;
+    aliases            = m_Tiki->a->m_aliases;
+
+    for (blendNum = 0; blendNum < MAX_FRAMEINFOS; blendNum++) {
+        const frameInfo_t& currentFrame = frameInfo[blendNum];
+
+        if (animWeight < currentFrame.weight) {
+            animWeight = currentFrame.weight;
+        }
+    }
+
+    cutoff_weight = animWeight * 0.01f;
+
+    for (blendNum = 0; blendNum < MAX_FRAMEINFOS; blendNum++) {
+        const frameInfo_t& currentFrame = frameInfo[blendNum];
+
+        if (currentFrame.weight <= cutoff_weight) {
+            continue;
+        }
+
+        // Added in 2.0.
+        //  Validate the index number
+        if (currentFrame.index < 0 || currentFrame.index > m_Tiki->a->num_anims) {
+            continue;
+        }
+
+        realAnimIndex = aliases[currentFrame.index];
+        // Added in 2.0.
+        //  Check if the alias is within bounds
+        if (realAnimIndex < 0 || realAnimIndex >= MAX_TIKI_ALIASES) {
+            continue;
+        }
+
+        animData = SkeletorCacheGetData(realAnimIndex);
+        // Added in 2.0.
+        //  Make sure the anim data is valid
+        if (!animData) {
+            continue;
+        }
+
+        if (animData->bHasDelta) {
+            blendFrame = movementBlendFrame;
+        } else {
+            blendFrame = actionBlendFrame;
+        }
+
+        beforeWeight = 0.0;
+        afterWeight  = 0.0;
+        beforeFrame  = 0.0;
+        afterFrame   = 0.0;
+
+        numFramesAdded =
+            animData->GetFrameNums(currentFrame.time, 0.001f, &beforeFrame, &afterFrame, &beforeWeight, &afterWeight);
+
+        frame1                 = &m_frameList.m_blendInfo[blendFrame];
+        frame1->frame          = beforeFrame;
+        frame1->pAnimationData = animData;
+        frame1->weight         = beforeWeight * currentFrame.weight;
+
+        AddToBounds(m_frameBounds, animData->bounds);
+
+        if (frame1->pAnimationData->m_frame[frame1->frame].radius > m_frameRadius) {
+            m_frameRadius = frame1->pAnimationData->m_frame[frame1->frame].radius;
+        }
+
+        if (numFramesAdded == 2) {
+            frame2                 = &m_frameList.m_blendInfo[blendFrame + 1];
+            frame2->frame          = afterFrame;
+            frame2->pAnimationData = animData;
+            frame2->weight         = afterWeight * currentFrame.weight;
+            AddToBounds(m_frameBounds, animData->bounds);
+
+            if (frame2->pAnimationData->m_frame[frame2->frame].radius > m_frameRadius) {
+                m_frameRadius = frame2->pAnimationData->m_frame[frame2->frame].radius;
+            }
+        }
+
+        if (animData->bHasDelta) {
+            movementBlendFrame = blendFrame + numFramesAdded;
+        } else {
+            actionBlendFrame = blendFrame + numFramesAdded;
+        }
+    }
+
+    for (i = 0; i < 3; i++) {
+        m_frameBounds[0][i] += -7.0f;
+        m_frameBounds[1][i] += 7.0f;
+    }
+
+    m_frameList.numMovementFrames = movementBlendFrame;
+    m_frameList.numActionFrames   = actionBlendFrame - MAX_SKEL_BLEND_MOVEMENT_FRAMES;
+    m_frameList.actionWeight      = actionWeight;
+
+    assert(m_frameList.numMovementFrames < MAX_SKEL_BLEND_MOVEMENT_FRAMES);
+    assert(m_frameList.numActionFrames < MAX_SKEL_BLEND_ACTION_FRAMES);
 }
 
-SkelMat4 GlobalToLocal( skelBone_Base *bone, SkelMat4 pGlobalPosition )
+static SkelMat4 GetGlobalDefaultPosition(skelBone_Base *bone)
 {
-	SkelMat4 lLocalPosition;
-	SkelMat4 lParentGlobalPosition;
+    SkelMat4 lLocalPosition;
+    SkelMat4 lGlobalPosition;
+    SkelMat4 lParentGlobalPosition;
 
-	if( bone->Parent() )
-	{
-		lParentGlobalPosition = GetGlobalDefaultPosition( bone->Parent() );
-		lParentGlobalPosition.Inverse();
-		lLocalPosition.Multiply( lParentGlobalPosition, pGlobalPosition );
-	}
-	else
-	{
-		lLocalPosition = pGlobalPosition;
-	}
+    lLocalPosition = bone->GetTransform(NULL);
 
-	return lLocalPosition;
+    if (bone->Parent()) {
+        //lParentGlobalPosition = GetGlobalDefaultPosition( bone->Parent() );
+        //lGlobalPosition.Multiply( lParentGlobalPosition, lLocalPosition );
+        lGlobalPosition = lLocalPosition;
+    } else {
+        lGlobalPosition = lLocalPosition;
+    }
+
+    return lGlobalPosition;
 }
 
-void BoneGetFrames( skelHeaderGame_t *skelmodel, skelAnimDataGameHeader_t *animData, skelChannelList_c *boneList, int boneNum, Container< skanAnimFrame >& outFrames )
+SkelMat4 GlobalToLocal(skelBone_Base *bone, SkelMat4 pGlobalPosition)
 {
-	int numBones;
-	skelBone_Base **bone;
-	int i;
-	skanAnimFrame frame;
-	int localChannelNum;
+    SkelMat4 lLocalPosition;
+    SkelMat4 lParentGlobalPosition;
 
-	outFrames.FreeObjectList();
+    if (bone->Parent()) {
+        lParentGlobalPosition = GetGlobalDefaultPosition(bone->Parent());
+        lParentGlobalPosition.Inverse();
+        lLocalPosition.Multiply(lParentGlobalPosition, pGlobalPosition);
+    } else {
+        lLocalPosition = pGlobalPosition;
+    }
 
-	numBones = boneList->NumChannels();
-
-	bone = ( skelBone_Base ** )Skel_Alloc( sizeof( skelBone_Base * ) * numBones );
-	memset( bone, 0, sizeof( skelBone_Base * ) * numBones );
-
-	SkeletorLoadBonesFromBuffer( boneList, skelmodel, bone );
-
-	for( i = 0; i < numBones; i++ )
-	{
-		bone[ i ]->m_controller = NULL;
-		bone[ i ]->m_isDirty = true;
-	}
-
-	// process the rot channel
-	localChannelNum = animData->channelList.GetLocalFromGlobal( bone[ boneNum ]->GetChannelIndex( 1 ) );
-	if( localChannelNum >= 0 )
-	{
-		skanChannelHdr *channel = &animData->ary_channels[ localChannelNum ];
-
-		for( i = 0; i < channel->nFramesInChannel; i++ )
-		{
-			skanGameFrame *pFrame = &channel->ary_frames[ i ];
-
-			frame.nFrameNum = pFrame->nFrameNum;
-			VectorClear( frame.pos );
-			QuatToAngles( pFrame->pChannelData, frame.rot );
-
-			outFrames.AddObject( frame );
-		}
-	}
-
-	if( bone[ i ]->GetChannelIndex( 0 ) != bone[ i ]->GetChannelIndex( 1 ) )
-	{
-		// process the pos channel
-		localChannelNum = animData->channelList.GetLocalFromGlobal( bone[ boneNum ]->GetChannelIndex( 0 ) );
-		if( localChannelNum >= 0 )
-		{
-			skanChannelHdr *channel = &animData->ary_channels[ localChannelNum ];
-
-			for( i = 0; i < channel->nFramesInChannel; i++ )
-			{
-				skanGameFrame *pFrame = &channel->ary_frames[ i ];
-				skanAnimFrame *pOutFrame = &outFrames[ i ];
-
-				VectorCopy( pFrame->pChannelData, pOutFrame->pos );
-			}
-		}
-	}
+    return lLocalPosition;
 }
 
-void SkeletorGetAnimFrame2(skelHeaderGame_t *skelmodel, skelChannelList_c *boneList, skelBoneCache_t *bones, skelAnimStoreFrameList_c *frameList, float *radius, vec3_t *mins, vec3_t *maxes)
+void BoneGetFrames(
+    skelHeaderGame_t         *skelmodel,
+    skelAnimDataGameHeader_t *animData,
+    skelChannelList_c        *boneList,
+    int                       boneNum,
+    Container<skanAnimFrame>& outFrames
+)
 {
-	int numBones;
-	skelBone_Base **bone;
-	int i;
-	skelAnimFrame_t *newFrame;
+    int             numBones;
+    skelBone_Base **bone;
+    int             i;
+    skanAnimFrame   frame;
+    int             localChannelNum;
 
-	numBones = skelmodel->numBones;
+    outFrames.FreeObjectList();
 
-	bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
-	memset(bone, 0, sizeof(skelBone_Base *) * numBones);
+    numBones = boneList->NumChannels();
 
-	SkeletorLoadBonesFromBuffer(boneList, skelmodel, bone);
+    bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
+    memset(bone, 0, sizeof(skelBone_Base *) * numBones);
 
-	for (i = 0; i < numBones; i++)
-	{
-		bone[i]->m_controller = NULL;
-		bone[i]->m_isDirty = true;
-	}
+    SkeletorLoadBonesFromBuffer(boneList, skelmodel, bone);
 
-	newFrame = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
-	newFrame->radius = 0;
-	newFrame->bounds[0] = SkelVec3();
-	newFrame->bounds[1] = SkelVec3();
+    for (i = 0; i < numBones; i++) {
+        bone[i]->m_controller = NULL;
+        bone[i]->m_isDirty    = true;
+    }
 
-	for (i = 0; i < numBones; i++)
-	{
-		//skelBone_Base *Parent = bone[ i ]->Parent();
-		//bone[ i ]->SetParent( &skeletor_c::m_worldBone );
-		newFrame->bones[i] = bone[i]->GetTransform(frameList);
-		//bone[ i ]->SetParent( Parent );
-	}
+    // process the rot channel
+    localChannelNum = animData->channelList.GetLocalFromGlobal(bone[boneNum]->GetChannelIndex(1));
+    if (localChannelNum >= 0) {
+        skanChannelHdr *channel = &animData->ary_channels[localChannelNum];
 
-	for (i = 0; i < numBones; i++)
-	{
-		VectorCopy(newFrame->bones[i][3], bones[i].offset);
-		bones[i].matrix[0][0] = newFrame->bones[i][0][0];
-		bones[i].matrix[0][1] = newFrame->bones[i][0][1];
-		bones[i].matrix[0][2] = newFrame->bones[i][0][2];
-		bones[i].matrix[0][3] = 0;
-		bones[i].matrix[1][0] = newFrame->bones[i][1][0];
-		bones[i].matrix[1][1] = newFrame->bones[i][1][1];
-		bones[i].matrix[1][2] = newFrame->bones[i][1][2];
-		bones[i].matrix[1][3] = 0;
-		bones[i].matrix[2][0] = newFrame->bones[i][2][0];
-		bones[i].matrix[2][1] = newFrame->bones[i][2][1];
-		bones[i].matrix[2][2] = newFrame->bones[i][2][2];
-		bones[i].matrix[2][3] = 0;
-	}
+        for (i = 0; i < channel->nFramesInChannel; i++) {
+            skanGameFrame *pFrame = &channel->ary_frames[i];
 
-	for (i = 0; i < numBones; i++)
-	{
-		delete bone[i];
-	}
+            frame.nFrameNum = pFrame->nFrameNum;
+            VectorClear(frame.pos);
+            QuatToAngles(pFrame->pChannelData, frame.rot);
 
-	Skel_Free(bone);
+            outFrames.AddObject(frame);
+        }
+    }
 
-	if (radius) {
-		*radius = newFrame->radius;
-	}
+    if (bone[i]->GetChannelIndex(0) != bone[i]->GetChannelIndex(1)) {
+        // process the pos channel
+        localChannelNum = animData->channelList.GetLocalFromGlobal(bone[boneNum]->GetChannelIndex(0));
+        if (localChannelNum >= 0) {
+            skanChannelHdr *channel = &animData->ary_channels[localChannelNum];
 
-	if (mins || maxes)
-	{
-		for (i = 0; i < 3; i++)
-		{
-			if (mins) {
-				(*mins)[i] = newFrame->bounds[0][i];
-			}
-			if (maxes) {
-				(*maxes)[i] = newFrame->bounds[1][i];
-			}
-		}
-	}
+            for (i = 0; i < channel->nFramesInChannel; i++) {
+                skanGameFrame *pFrame    = &channel->ary_frames[i];
+                skanAnimFrame *pOutFrame = &outFrames[i];
 
-	Skel_Free(newFrame);
+                VectorCopy(pFrame->pChannelData, pOutFrame->pos);
+            }
+        }
+    }
 }
 
-void SkeletorGetAnimFrame( skelHeaderGame_t *skelmodel, skelAnimDataGameHeader_t *animData, skelChannelList_c *boneList, skelBoneCache_t *bones, int frame, float *radius, vec3_t *mins, vec3_t *maxes )
+void SkeletorGetAnimFrame2(
+    skelHeaderGame_t         *skelmodel,
+    skelChannelList_c        *boneList,
+    skelBoneCache_t          *bones,
+    skelAnimStoreFrameList_c *frameList,
+    float                    *radius,
+    vec3_t                   *mins,
+    vec3_t                   *maxes
+)
 {
-	int numBones;
-	skelBone_Base **bone;
-	int i;
-	skelAnimStoreFrameList_c frameList;
-	skelAnimFrame_t *newFrame;
+    int              numBones;
+    skelBone_Base  **bone;
+    int              i;
+    skelAnimFrame_t *newFrame;
 
-	frameList.actionWeight = animData ? 1.0 : 0;
+    numBones = skelmodel->numBones;
 
-	if (animData)
-	{
-		if (!animData->bHasDelta)
-		{
-			frameList.numMovementFrames = 0;
-			frameList.numActionFrames = 1;
-			frameList.m_blendInfo[32].weight = 1.0;
-			frameList.m_blendInfo[32].pAnimationData = animData;
-			frameList.m_blendInfo[32].frame = frame;
-		}
-		else
-		{
-			frameList.numMovementFrames = 1;
-			frameList.numActionFrames = 0;
-			frameList.m_blendInfo[0].weight = 1.0;
-			frameList.m_blendInfo[0].pAnimationData = animData;
-			frameList.m_blendInfo[0].frame = frame;
-		}
-	}
-	numBones = skelmodel->numBones;
+    bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
+    memset(bone, 0, sizeof(skelBone_Base *) * numBones);
 
-	bone = ( skelBone_Base ** )Skel_Alloc( sizeof( skelBone_Base * ) * numBones );
-	memset( bone, 0, sizeof( skelBone_Base * ) * numBones );
+    SkeletorLoadBonesFromBuffer(boneList, skelmodel, bone);
 
-	SkeletorLoadBonesFromBuffer( boneList, skelmodel, bone );
+    for (i = 0; i < numBones; i++) {
+        bone[i]->m_controller = NULL;
+        bone[i]->m_isDirty    = true;
+    }
 
-	for( i = 0; i < numBones; i++ )
-	{
-		bone[ i ]->m_controller = NULL;
-		bone[ i ]->m_isDirty = true;
-	}
+    newFrame            = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
+    newFrame->radius    = 0;
+    newFrame->bounds[0] = SkelVec3();
+    newFrame->bounds[1] = SkelVec3();
 
-	newFrame = ( skelAnimFrame_t * )Skel_Alloc( sizeof( skelAnimFrame_t ) + sizeof( SkelMat4 ) * numBones );
+    for (i = 0; i < numBones; i++) {
+        //skelBone_Base *Parent = bone[ i ]->Parent();
+        //bone[ i ]->SetParent( &skeletor_c::m_worldBone );
+        newFrame->bones[i] = bone[i]->GetTransform(frameList);
+        //bone[ i ]->SetParent( Parent );
+    }
 
-	if( animData )
-	{
-		if( animData->m_frame )
-		{
-			newFrame->radius = animData->m_frame->radius;
-		}
-		else
-		{
-			newFrame->radius = 0;
-		}
+    for (i = 0; i < numBones; i++) {
+        VectorCopy(newFrame->bones[i][3], bones[i].offset);
+        bones[i].matrix[0][0] = newFrame->bones[i][0][0];
+        bones[i].matrix[0][1] = newFrame->bones[i][0][1];
+        bones[i].matrix[0][2] = newFrame->bones[i][0][2];
+        bones[i].matrix[0][3] = 0;
+        bones[i].matrix[1][0] = newFrame->bones[i][1][0];
+        bones[i].matrix[1][1] = newFrame->bones[i][1][1];
+        bones[i].matrix[1][2] = newFrame->bones[i][1][2];
+        bones[i].matrix[1][3] = 0;
+        bones[i].matrix[2][0] = newFrame->bones[i][2][0];
+        bones[i].matrix[2][1] = newFrame->bones[i][2][1];
+        bones[i].matrix[2][2] = newFrame->bones[i][2][2];
+        bones[i].matrix[2][3] = 0;
+    }
 
-		newFrame->bounds[ 0 ] = animData->bounds[ 0 ];
-		newFrame->bounds[ 1 ] = animData->bounds[ 1 ];
-	}
-	else
-	{
-		newFrame->radius = 0;
-		newFrame->bounds[ 0 ] = SkelVec3();
-		newFrame->bounds[ 1 ] = SkelVec3();
-	}
+    for (i = 0; i < numBones; i++) {
+        delete bone[i];
+    }
 
-	if (animData)
-	{
-		for (i = 0; i < numBones; i++)
-		{
-			//skelBone_Base *Parent = bone[ i ]->Parent();
-			//bone[ i ]->SetParent( &skeletor_c::m_worldBone );
-			newFrame->bones[i] = bone[i]->GetTransform(&frameList);
-			//bone[ i ]->SetParent( Parent );
-		}
-	}
-	else
-	{
-		for (i = 0; i < numBones; i++)
-		{
-			newFrame->bones[i] = SkelMat4();
-		}
-	}
+    Skel_Free(bone);
 
-	for( i = 0; i < numBones; i++ )
-	{
-		VectorCopy( newFrame->bones[ i ][ 3 ], bones[ i ].offset );
-		bones[ i ].matrix[ 0 ][ 0 ] = newFrame->bones[ i ][ 0 ][ 0 ];
-		bones[ i ].matrix[ 0 ][ 1 ] = newFrame->bones[ i ][ 0 ][ 1 ];
-		bones[ i ].matrix[ 0 ][ 2 ] = newFrame->bones[ i ][ 0 ][ 2 ];
-		bones[ i ].matrix[ 0 ][ 3 ] = 0;
-		bones[ i ].matrix[ 1 ][ 0 ] = newFrame->bones[ i ][ 1 ][ 0 ];
-		bones[ i ].matrix[ 1 ][ 1 ] = newFrame->bones[ i ][ 1 ][ 1 ];
-		bones[ i ].matrix[ 1 ][ 2 ] = newFrame->bones[ i ][ 1 ][ 2 ];
-		bones[ i ].matrix[ 1 ][ 3 ] = 0;
-		bones[ i ].matrix[ 2 ][ 0 ] = newFrame->bones[ i ][ 2 ][ 0 ];
-		bones[ i ].matrix[ 2 ][ 1 ] = newFrame->bones[ i ][ 2 ][ 1 ];
-		bones[ i ].matrix[ 2 ][ 2 ] = newFrame->bones[ i ][ 2 ][ 2 ];
-		bones[ i ].matrix[ 2 ][ 3 ] = 0;
-	}
+    if (radius) {
+        *radius = newFrame->radius;
+    }
 
-	for( i = 0; i < numBones; i++ )
-	{
-		delete bone[ i ];
-	}
+    if (mins || maxes) {
+        for (i = 0; i < 3; i++) {
+            if (mins) {
+                (*mins)[i] = newFrame->bounds[0][i];
+            }
+            if (maxes) {
+                (*maxes)[i] = newFrame->bounds[1][i];
+            }
+        }
+    }
 
-	Skel_Free( bone );
-
-	if( radius ) {
-		*radius = newFrame->radius;
-	}
-
-	if( mins || maxes )
-	{
-		for( i = 0; i < 3; i++ )
-		{
-			if( mins ) {
-				( *mins )[ i ] = newFrame->bounds[ 0 ][ i ];
-			}
-			if( maxes ) {
-				( *maxes )[ i ] = newFrame->bounds[ 1 ][ i ];
-			}
-		}
-	}
-
-	Skel_Free( newFrame );
+    Skel_Free(newFrame);
 }
 
-void TIKI_GetSkelAnimFrameInternal2(dtiki_t *tiki, skelBoneCache_t *bones, skelAnimStoreFrameList_c* frameList, float *radius, vec3_t *mins, vec3_t *maxes)
+void SkeletorGetAnimFrame(
+    skelHeaderGame_t         *skelmodel,
+    skelAnimDataGameHeader_t *animData,
+    skelChannelList_c        *boneList,
+    skelBoneCache_t          *bones,
+    int                       frame,
+    float                    *radius,
+    vec3_t                   *mins,
+    vec3_t                   *maxes
+)
 {
-	//int boneNum;
-	int numBones;
-	skelBone_Base **bone;
-	int i;
-	skelAnimFrame_t *newFrame;
-	//int realAnimIndex;
-	//skanBlendInfo *frame;
-	skelHeaderGame_t *skelmodel;
+    int                      numBones;
+    skelBone_Base          **bone;
+    int                      i;
+    skelAnimStoreFrameList_c frameList;
+    skelAnimFrame_t         *newFrame;
 
-	numBones = tiki->m_boneList.NumChannels();
+    frameList.actionWeight = animData ? 1.0 : 0;
 
-	bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
-	memset(bone, 0, sizeof(skelBone_Base *) * numBones);
+    if (animData) {
+        if (!animData->bHasDelta) {
+            frameList.numMovementFrames              = 0;
+            frameList.numActionFrames                = 1;
 
-	for (i = 0; i < tiki->numMeshes; i++)
-	{
-		skelmodel = TIKI_GetSkel(tiki->mesh[i]);
-		SkeletorLoadBonesFromBuffer(&tiki->m_boneList, skelmodel, bone);
-	}
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].weight         = 1.0;
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].pAnimationData = animData;
+            frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].frame          = frame;
+        } else {
+            frameList.numMovementFrames             = 1;
+            frameList.numActionFrames               = 0;
+            frameList.m_blendInfo[0].weight         = 1.0;
+            frameList.m_blendInfo[0].pAnimationData = animData;
+            frameList.m_blendInfo[0].frame          = frame;
+        }
+    }
+    numBones = skelmodel->numBones;
 
-	for (i = 0; i < numBones; i++)
-	{
-		bone[i]->m_controller = NULL;
-		bone[i]->m_isDirty = true;
-	}
+    bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
+    memset(bone, 0, sizeof(skelBone_Base *) * numBones);
 
-	newFrame = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
+    SkeletorLoadBonesFromBuffer(boneList, skelmodel, bone);
 
-	/*
+    for (i = 0; i < numBones; i++) {
+        bone[i]->m_controller = NULL;
+        bone[i]->m_isDirty    = true;
+    }
+
+    newFrame = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
+
+    if (animData) {
+        if (animData->m_frame) {
+            newFrame->radius = animData->m_frame->radius;
+        } else {
+            newFrame->radius = 0;
+        }
+
+        newFrame->bounds[0] = animData->bounds[0];
+        newFrame->bounds[1] = animData->bounds[1];
+    } else {
+        newFrame->radius    = 0;
+        newFrame->bounds[0] = SkelVec3();
+        newFrame->bounds[1] = SkelVec3();
+    }
+
+    if (animData) {
+        for (i = 0; i < numBones; i++) {
+            //skelBone_Base *Parent = bone[ i ]->Parent();
+            //bone[ i ]->SetParent( &skeletor_c::m_worldBone );
+            newFrame->bones[i] = bone[i]->GetTransform(&frameList);
+            //bone[ i ]->SetParent( Parent );
+        }
+    } else {
+        for (i = 0; i < numBones; i++) {
+            newFrame->bones[i] = SkelMat4();
+        }
+    }
+
+    for (i = 0; i < numBones; i++) {
+        VectorCopy(newFrame->bones[i][3], bones[i].offset);
+        bones[i].matrix[0][0] = newFrame->bones[i][0][0];
+        bones[i].matrix[0][1] = newFrame->bones[i][0][1];
+        bones[i].matrix[0][2] = newFrame->bones[i][0][2];
+        bones[i].matrix[0][3] = 0;
+        bones[i].matrix[1][0] = newFrame->bones[i][1][0];
+        bones[i].matrix[1][1] = newFrame->bones[i][1][1];
+        bones[i].matrix[1][2] = newFrame->bones[i][1][2];
+        bones[i].matrix[1][3] = 0;
+        bones[i].matrix[2][0] = newFrame->bones[i][2][0];
+        bones[i].matrix[2][1] = newFrame->bones[i][2][1];
+        bones[i].matrix[2][2] = newFrame->bones[i][2][2];
+        bones[i].matrix[2][3] = 0;
+    }
+
+    for (i = 0; i < numBones; i++) {
+        delete bone[i];
+    }
+
+    Skel_Free(bone);
+
+    if (radius) {
+        *radius = newFrame->radius;
+    }
+
+    if (mins || maxes) {
+        for (i = 0; i < 3; i++) {
+            if (mins) {
+                (*mins)[i] = newFrame->bounds[0][i];
+            }
+            if (maxes) {
+                (*maxes)[i] = newFrame->bounds[1][i];
+            }
+        }
+    }
+
+    Skel_Free(newFrame);
+}
+
+void TIKI_GetSkelAnimFrameInternal2(
+    dtiki_t                  *tiki,
+    skelBoneCache_t          *bones,
+    skelAnimStoreFrameList_c *frameList,
+    float                    *radius,
+    vec3_t                   *mins,
+    vec3_t                   *maxes
+)
+{
+    //int boneNum;
+    int              numBones;
+    skelBone_Base  **bone;
+    int              i;
+    skelAnimFrame_t *newFrame;
+    //int realAnimIndex;
+    //skanBlendInfo *frame;
+    skelHeaderGame_t *skelmodel;
+
+    numBones = tiki->m_boneList.NumChannels();
+
+    bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
+    memset(bone, 0, sizeof(skelBone_Base *) * numBones);
+
+    for (i = 0; i < tiki->numMeshes; i++) {
+        skelmodel = TIKI_GetSkel(tiki->mesh[i]);
+        SkeletorLoadBonesFromBuffer(&tiki->m_boneList, skelmodel, bone);
+    }
+
+    for (i = 0; i < numBones; i++) {
+        bone[i]->m_controller = NULL;
+        bone[i]->m_isDirty    = true;
+    }
+
+    newFrame = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
+
+    /*
 	if (animData)
 	{
 		if (animData->m_frame)
@@ -837,459 +841,427 @@ void TIKI_GetSkelAnimFrameInternal2(dtiki_t *tiki, skelBoneCache_t *bones, skelA
 	}
 	else
 	*/
-	{
-		newFrame->radius = 0;
-		newFrame->bounds[0] = SkelVec3();
-		newFrame->bounds[1] = SkelVec3();
-	}
+    {
+        newFrame->radius    = 0;
+        newFrame->bounds[0] = SkelVec3();
+        newFrame->bounds[1] = SkelVec3();
+    }
 
-	for (i = 0; i < numBones; i++)
-	{
-		newFrame->bones[i] = bone[i]->GetTransform(frameList);
-	}
+    for (i = 0; i < numBones; i++) {
+        newFrame->bones[i] = bone[i]->GetTransform(frameList);
+    }
 
-	for (i = 0; i < numBones; i++)
-	{
-		delete bone[i];
-	}
+    for (i = 0; i < numBones; i++) {
+        delete bone[i];
+    }
 
-	Skel_Free(bone);
+    Skel_Free(bone);
 
-	for (i = 0; i < numBones; i++)
-	{
-		VectorCopy(newFrame->bones[i][3], bones[i].offset);
-		bones[i].matrix[0][0] = newFrame->bones[i][0][0];
-		bones[i].matrix[0][1] = newFrame->bones[i][0][1];
-		bones[i].matrix[0][2] = newFrame->bones[i][0][2];
-		bones[i].matrix[0][3] = 0;
-		bones[i].matrix[1][0] = newFrame->bones[i][1][0];
-		bones[i].matrix[1][1] = newFrame->bones[i][1][1];
-		bones[i].matrix[1][2] = newFrame->bones[i][1][2];
-		bones[i].matrix[1][3] = 0;
-		bones[i].matrix[2][0] = newFrame->bones[i][2][0];
-		bones[i].matrix[2][1] = newFrame->bones[i][2][1];
-		bones[i].matrix[2][2] = newFrame->bones[i][2][2];
-		bones[i].matrix[2][3] = 0;
-	}
+    for (i = 0; i < numBones; i++) {
+        VectorCopy(newFrame->bones[i][3], bones[i].offset);
+        bones[i].matrix[0][0] = newFrame->bones[i][0][0];
+        bones[i].matrix[0][1] = newFrame->bones[i][0][1];
+        bones[i].matrix[0][2] = newFrame->bones[i][0][2];
+        bones[i].matrix[0][3] = 0;
+        bones[i].matrix[1][0] = newFrame->bones[i][1][0];
+        bones[i].matrix[1][1] = newFrame->bones[i][1][1];
+        bones[i].matrix[1][2] = newFrame->bones[i][1][2];
+        bones[i].matrix[1][3] = 0;
+        bones[i].matrix[2][0] = newFrame->bones[i][2][0];
+        bones[i].matrix[2][1] = newFrame->bones[i][2][1];
+        bones[i].matrix[2][2] = newFrame->bones[i][2][2];
+        bones[i].matrix[2][3] = 0;
+    }
 
-	if (radius) {
-		*radius = newFrame->radius;
-	}
+    if (radius) {
+        *radius = newFrame->radius;
+    }
 
-	if (mins && maxes)
-	{
-		for (i = 0; i < 3; i++)
-		{
-			(*mins)[i] = newFrame->bounds[0][i];
-			(*maxes)[i] = newFrame->bounds[1][i];
-		}
-	}
+    if (mins && maxes) {
+        for (i = 0; i < 3; i++) {
+            (*mins)[i]  = newFrame->bounds[0][i];
+            (*maxes)[i] = newFrame->bounds[1][i];
+        }
+    }
 
-	Skel_Free(newFrame);
+    Skel_Free(newFrame);
 }
 
-void TIKI_GetSkelAnimFrameInternal( dtiki_t *tiki, skelBoneCache_t *bones, skelAnimDataGameHeader_t *animData, int frame, float *radius, vec3_t *mins, vec3_t *maxes )
+void TIKI_GetSkelAnimFrameInternal(
+    dtiki_t                  *tiki,
+    skelBoneCache_t          *bones,
+    skelAnimDataGameHeader_t *animData,
+    int                       frame,
+    float                    *radius,
+    vec3_t                   *mins,
+    vec3_t                   *maxes
+)
 {
-	//int boneNum;
-	int numBones;
-	skelBone_Base **bone;
-	int i;
-	skelAnimStoreFrameList_c frameList;
-	skelAnimFrame_t *newFrame;
-	//int realAnimIndex;
-	//skanBlendInfo *frame;
-	skelHeaderGame_t *skelmodel;
+    //int boneNum;
+    int                      numBones;
+    skelBone_Base          **bone;
+    int                      i;
+    skelAnimStoreFrameList_c frameList;
+    skelAnimFrame_t         *newFrame;
+    //int realAnimIndex;
+    //skanBlendInfo *frame;
+    skelHeaderGame_t *skelmodel;
 
-	frameList.actionWeight = animData ? 1.0 : 0;
-	if (!animData || !animData->bHasDelta)
-	{
-		frameList.numMovementFrames = 0;
-		frameList.numActionFrames = 1;
-		frameList.m_blendInfo[32].weight = 1.0;
-		frameList.m_blendInfo[32].pAnimationData = animData;
-		frameList.m_blendInfo[32].frame = frame;
-	}
-	else
-	{
-		frameList.numMovementFrames = 1;
-		frameList.numActionFrames = 0;
-		frameList.m_blendInfo[0].weight = 1.0;
-		frameList.m_blendInfo[0].pAnimationData = animData;
-		frameList.m_blendInfo[0].frame = frame;
-	}
-	numBones = tiki->m_boneList.NumChannels();
+    frameList.actionWeight = animData ? 1.0 : 0;
+    if (!animData || !animData->bHasDelta) {
+        frameList.numMovementFrames              = 0;
+        frameList.numActionFrames                = 1;
 
-	bone = ( skelBone_Base ** )Skel_Alloc( sizeof( skelBone_Base * ) * numBones );
-	memset( bone, 0, sizeof( skelBone_Base * ) * numBones );
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].weight         = 1.0;
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].pAnimationData = animData;
+        frameList.m_blendInfo[MAX_SKEL_BLEND_MOVEMENT_FRAMES].frame          = frame;
+    } else {
+        frameList.numMovementFrames             = 1;
+        frameList.numActionFrames               = 0;
+        frameList.m_blendInfo[0].weight         = 1.0;
+        frameList.m_blendInfo[0].pAnimationData = animData;
+        frameList.m_blendInfo[0].frame          = frame;
+    }
+    numBones = tiki->m_boneList.NumChannels();
 
-	for( i = 0; i < tiki->numMeshes; i++ )
-	{
-		skelmodel = TIKI_GetSkel( tiki->mesh[ i ] );
-		SkeletorLoadBonesFromBuffer( &tiki->m_boneList, skelmodel, bone );
-	}
+    bone = (skelBone_Base **)Skel_Alloc(sizeof(skelBone_Base *) * numBones);
+    memset(bone, 0, sizeof(skelBone_Base *) * numBones);
 
-	for( i = 0; i < numBones; i++ )
-	{
-		bone[ i ]->m_controller = NULL;
-		bone[ i ]->m_isDirty = true;
-	}
+    for (i = 0; i < tiki->numMeshes; i++) {
+        skelmodel = TIKI_GetSkel(tiki->mesh[i]);
+        SkeletorLoadBonesFromBuffer(&tiki->m_boneList, skelmodel, bone);
+    }
 
-	newFrame = ( skelAnimFrame_t * )Skel_Alloc( sizeof( skelAnimFrame_t ) + sizeof( SkelMat4 ) * numBones );
+    for (i = 0; i < numBones; i++) {
+        bone[i]->m_controller = NULL;
+        bone[i]->m_isDirty    = true;
+    }
 
-	if( animData )
-	{
-		if( animData->m_frame )
-		{
-			newFrame->radius = animData->m_frame->radius;
-		}
-		else
-		{
-			newFrame->radius = 0;
-		}
+    newFrame = (skelAnimFrame_t *)Skel_Alloc(sizeof(skelAnimFrame_t) + sizeof(SkelMat4) * numBones);
 
-		newFrame->bounds[ 0 ] = animData->bounds[ 0 ];
-		newFrame->bounds[ 1 ] = animData->bounds[ 1 ];
-	}
-	else
-	{
-		newFrame->radius = 0;
-		newFrame->bounds[ 0 ] = SkelVec3();
-		newFrame->bounds[ 1 ] = SkelVec3();
-	}
+    if (animData) {
+        if (animData->m_frame) {
+            newFrame->radius = animData->m_frame->radius;
+        } else {
+            newFrame->radius = 0;
+        }
 
-	for( i = 0; i < numBones; i++ )
-	{
-		newFrame->bones[ i ] = bone[ i ]->GetTransform( &frameList );
-	}
+        newFrame->bounds[0] = animData->bounds[0];
+        newFrame->bounds[1] = animData->bounds[1];
+    } else {
+        newFrame->radius    = 0;
+        newFrame->bounds[0] = SkelVec3();
+        newFrame->bounds[1] = SkelVec3();
+    }
 
-	for( i = 0; i < numBones; i++ )
-	{
-		delete bone[ i ];
-	}
+    for (i = 0; i < numBones; i++) {
+        newFrame->bones[i] = bone[i]->GetTransform(&frameList);
+    }
 
-	Skel_Free( bone );
+    for (i = 0; i < numBones; i++) {
+        delete bone[i];
+    }
 
-	for( i = 0; i < numBones; i++ )
-	{
-		VectorCopy( newFrame->bones[ i ][ 3 ], bones[ i ].offset );
-		bones[ i ].matrix[ 0 ][ 0 ] = newFrame->bones[ i ][ 0 ][ 0 ];
-		bones[ i ].matrix[ 0 ][ 1 ] = newFrame->bones[ i ][ 0 ][ 1 ];
-		bones[ i ].matrix[ 0 ][ 2 ] = newFrame->bones[ i ][ 0 ][ 2 ];
-		bones[ i ].matrix[ 0 ][ 3 ] = 0;
-		bones[ i ].matrix[ 1 ][ 0 ] = newFrame->bones[ i ][ 1 ][ 0 ];
-		bones[ i ].matrix[ 1 ][ 1 ] = newFrame->bones[ i ][ 1 ][ 1 ];
-		bones[ i ].matrix[ 1 ][ 2 ] = newFrame->bones[ i ][ 1 ][ 2 ];
-		bones[ i ].matrix[ 1 ][ 3 ] = 0;
-		bones[ i ].matrix[ 2 ][ 0 ] = newFrame->bones[ i ][ 2 ][ 0 ];
-		bones[ i ].matrix[ 2 ][ 1 ] = newFrame->bones[ i ][ 2 ][ 1 ];
-		bones[ i ].matrix[ 2 ][ 2 ] = newFrame->bones[ i ][ 2 ][ 2 ];
-		bones[ i ].matrix[ 2 ][ 3 ] = 0;
-	}
+    Skel_Free(bone);
 
-	if( radius ) {
-		*radius = newFrame->radius;
-	}
+    for (i = 0; i < numBones; i++) {
+        VectorCopy(newFrame->bones[i][3], bones[i].offset);
+        bones[i].matrix[0][0] = newFrame->bones[i][0][0];
+        bones[i].matrix[0][1] = newFrame->bones[i][0][1];
+        bones[i].matrix[0][2] = newFrame->bones[i][0][2];
+        bones[i].matrix[0][3] = 0;
+        bones[i].matrix[1][0] = newFrame->bones[i][1][0];
+        bones[i].matrix[1][1] = newFrame->bones[i][1][1];
+        bones[i].matrix[1][2] = newFrame->bones[i][1][2];
+        bones[i].matrix[1][3] = 0;
+        bones[i].matrix[2][0] = newFrame->bones[i][2][0];
+        bones[i].matrix[2][1] = newFrame->bones[i][2][1];
+        bones[i].matrix[2][2] = newFrame->bones[i][2][2];
+        bones[i].matrix[2][3] = 0;
+    }
 
-	if( mins && maxes )
-	{
-		for( i = 0; i < 3; i++ )
-		{
-			( *mins )[ i ] = newFrame->bounds[ 0 ][ i ];
-			( *maxes )[ i ] = newFrame->bounds[ 1 ][ i ];
-		}
-	}
+    if (radius) {
+        *radius = newFrame->radius;
+    }
 
-	Skel_Free( newFrame );
+    if (mins && maxes) {
+        for (i = 0; i < 3; i++) {
+            (*mins)[i]  = newFrame->bounds[0][i];
+            (*maxes)[i] = newFrame->bounds[1][i];
+        }
+    }
+
+    Skel_Free(newFrame);
 }
 
-void TIKI_GetSkelAnimFrame2( dtiki_t *tiki, skelBoneCache_t *bones, int anim, int frame, float *radius, vec3_t *mins, vec3_t *maxes )
+void TIKI_GetSkelAnimFrame2(
+    dtiki_t *tiki, skelBoneCache_t *bones, int anim, int frame, float *radius, vec3_t *mins, vec3_t *maxes
+)
 {
-	short *aliases;
-	skelAnimDataGameHeader_t *animData;
+    short                    *aliases;
+    skelAnimDataGameHeader_t *animData;
 
-	aliases = tiki->a->m_aliases;
-	if( *aliases == -1 )
-	{
-		SKEL_Warning( "TIKI_GetSkelAnimFrame: Bad anim in static model %s, couldn't generate pose properly.\n", tiki->name );
-		return;
-	}
+    aliases = tiki->a->m_aliases;
+    if (*aliases == -1) {
+        SKEL_Warning(
+            "TIKI_GetSkelAnimFrame: Bad anim in static model %s, couldn't generate pose properly.\n", tiki->name
+        );
+        return;
+    }
 
-	animData = SkeletorCacheGetData( aliases[ anim ] );
+    animData = SkeletorCacheGetData(aliases[anim]);
 
-	TIKI_GetSkelAnimFrameInternal( tiki, bones, animData, frame, radius, mins, maxes);
+    TIKI_GetSkelAnimFrameInternal(tiki, bones, animData, frame, radius, mins, maxes);
 }
 
-void TIKI_GetSkelAnimFrame( dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes )
+void TIKI_GetSkelAnimFrame(dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes)
 {
-	TIKI_GetSkelAnimFrame2( tiki, bones, 0, 0, radius, mins, maxes );
+    TIKI_GetSkelAnimFrame2(tiki, bones, 0, 0, radius, mins, maxes);
 }
 
-void skeletor_c::GetFrame( skelAnimFrame_t *newFrame )
+void skeletor_c::GetFrame(skelAnimFrame_t *newFrame)
 {
-	int boneNum;
-	int numBones;
+    int boneNum;
+    int numBones;
 
-	numBones = m_Tiki->m_boneList.NumChannels();
+    numBones = m_Tiki->m_boneList.NumChannels();
 
-	for( boneNum = 0; boneNum < numBones; boneNum++ )
-	{
-		newFrame->bones[ boneNum ] = GetBoneFrame( boneNum );
-	}
+    for (boneNum = 0; boneNum < numBones; boneNum++) {
+        newFrame->bones[boneNum] = GetBoneFrame(boneNum);
+    }
 
-	newFrame->bounds[ 0 ] = m_frameBounds[ 0 ];
-	newFrame->bounds[ 1 ] = m_frameBounds[ 1 ];
-	newFrame->radius = m_frameRadius;
+    newFrame->bounds[0] = m_frameBounds[0];
+    newFrame->bounds[1] = m_frameBounds[1];
+    newFrame->radius    = m_frameRadius;
 }
 
-
-SkelMat4 &skeletor_c::GetBoneFrame( int boneIndex ) const
+SkelMat4& skeletor_c::GetBoneFrame(int boneIndex) const
 {
-	return m_bone[ boneIndex ]->GetTransform( &m_frameList );
+    return m_bone[boneIndex]->GetTransform(&m_frameList);
 }
 
-bool skeletor_c::IsBoneOnGround( int boneIndex, float threshold )
+bool skeletor_c::IsBoneOnGround(int boneIndex, float threshold)
 {
-	return GetBoneFrame( boneIndex ).val[ 3 ][ 2 ] < threshold;
+    return GetBoneFrame(boneIndex).val[3][2] < threshold;
 }
 
 float skeletor_c::GetRadius()
 {
-	return m_frameRadius;
+    return m_frameRadius;
 }
 
-
-float skeletor_c::GetCentroidRadius( float *centroid )
+float skeletor_c::GetCentroidRadius(float *centroid)
 {
-	centroid[ 0 ] = ( m_frameBounds[ 0 ][ 0 ] + m_frameBounds[ 1 ][ 0 ] ) * 0.5f;
-	centroid[ 1 ] = ( m_frameBounds[ 0 ][ 1 ] + m_frameBounds[ 1 ][ 1 ] ) * 0.5f;
-	centroid[ 2 ] = ( m_frameBounds[ 0 ][ 2 ] + m_frameBounds[ 1 ][ 2 ] ) * 0.5f;
-	return m_frameRadius;
+    centroid[0] = (m_frameBounds[0][0] + m_frameBounds[1][0]) * 0.5f;
+    centroid[1] = (m_frameBounds[0][1] + m_frameBounds[1][1]) * 0.5f;
+    centroid[2] = (m_frameBounds[0][2] + m_frameBounds[1][2]) * 0.5f;
+    return m_frameRadius;
 }
 
-
-int skeletor_c::GetMorphWeightFrame( int index, float time, int *data )
+int skeletor_c::GetMorphWeightFrame(int index, float time, int *data)
 {
-	return GetMorphWeightFrame( data );
+    return GetMorphWeightFrame(data);
 }
 
-vec4_t *DecodeFrameValue( skanChannelHdr *channelFrames, int desiredFrameNum )
+float DecodeFrameValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
-	skanGameFrame *foundFrame;
-	int i;
+    skanGameFrame *foundFrame;
+    size_t         frameSize;
+    int            i;
 
-	foundFrame = channelFrames->ary_frames;
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
 
-	for( i = 0; i < channelFrames->nFramesInChannel; i++ )
-	{
-		if( channelFrames->ary_frames[ i ].nFrameNum >= desiredFrameNum )
-		{
-			foundFrame = &channelFrames->ary_frames[ i ];
-			break;
-		}
-	}
+    foundFrame = channelFrames->ary_frames;
 
-	return &foundFrame->pChannelData;
+    for (i = 0; i < channelFrames->nFramesInChannel; i++) {
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
+            break;
+        }
+
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
+    }
+
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData[0];
 }
 
-
-int skeletor_c::GetMorphWeightFrame( int *data )
+int skeletor_c::GetMorphWeightFrame(int *data)
 {
-	int numTargets;
-	int animChannelNum;
-	int blendNum;
-	float weight;
-	int modelChannelNum;
-	vec4_t *channelData;
+    int    numTargets;
+    int    animChannelNum;
+    int    blendNum;
+    float  weight;
+    int    modelChannelNum;
+    float  channelData;
 
-	numTargets = m_morphTargetList.NumChannels();
+    numTargets = m_morphTargetList.NumChannels();
 
-	if( !numTargets ) {
-		return 0;
-	}
+    if (!numTargets) {
+        return 0;
+    }
 
-	memset( data, 0, sizeof( *data ) * numTargets );
+    memset(data, 0, sizeof(*data) * numTargets);
 
-	for( blendNum = 0; blendNum < m_frameList.numMovementFrames; blendNum++ )
-	{
-		weight = m_frameList.m_blendInfo[ blendNum ].weight;
+    for (blendNum = 0; blendNum < m_frameList.numMovementFrames; blendNum++) {
+        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum];
+        weight                         = blendInfo.weight;
 
-		if( weight > 0.001 )
-		{
-			for( modelChannelNum = 0; modelChannelNum < m_morphTargetList.NumChannels(); modelChannelNum++ )
-			{
-				animChannelNum = m_morphTargetList.m_chanGlobalFromLocal[ modelChannelNum ];
-				animChannelNum = m_morphTargetList.GetLocalFromGlobal( animChannelNum );
+        if (weight > 0.001) {
+            for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
+                animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.LocalChannel(animChannelNum);
 
-				if( animChannelNum >= 0 )
-				{
-					channelData = DecodeFrameValue( &m_frameList.m_blendInfo[ blendNum ].pAnimationData->ary_channels[ animChannelNum ], m_frameList.m_blendInfo[ blendNum ].frame );
-					data[ modelChannelNum ] += ( int )( ( *channelData )[ 0 ] * weight );
-				}
-			}
-		}
-	}
+                if (animChannelNum >= 0) {
+                    channelData = DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData * weight);
+                }
+            }
+        }
+    }
 
-	for( blendNum = 32; blendNum < m_frameList.numActionFrames + 32; blendNum++ )
-	{
-		weight = m_frameList.m_blendInfo[ blendNum ].weight;
+    for (blendNum = 0; blendNum < m_frameList.numActionFrames; blendNum++) {
+        const skanBlendInfo& blendInfo = m_frameList.m_blendInfo[blendNum + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
+        weight                         = blendInfo.weight;
 
-		if( weight > 0.001 )
-		{
-			for( modelChannelNum = 0; modelChannelNum < m_morphTargetList.NumChannels(); modelChannelNum++ )
-			{
-				animChannelNum = m_morphTargetList.m_chanGlobalFromLocal[ modelChannelNum ];
-				animChannelNum = m_morphTargetList.GetLocalFromGlobal( animChannelNum );
+        if (weight > 0.001) {
+            for (modelChannelNum = 0; modelChannelNum < numTargets; modelChannelNum++) {
+                animChannelNum = m_morphTargetList.GlobalChannel(modelChannelNum);
+                animChannelNum = blendInfo.pAnimationData->channelList.LocalChannel(animChannelNum);
 
-				if( animChannelNum >= 0 )
-				{
-					channelData = DecodeFrameValue( &m_frameList.m_blendInfo[ blendNum ].pAnimationData->ary_channels[ animChannelNum ], m_frameList.m_blendInfo[ blendNum ].frame );
-					data[ modelChannelNum ] += ( int )( ( *channelData )[ 0 ] * weight );
-				}
-			}
-		}
-	}
+                if (animChannelNum >= 0) {
+                    channelData = DecodeFrameValue(&blendInfo.pAnimationData->ary_channels[animChannelNum], blendInfo.frame);
+                    data[modelChannelNum] += (int)(channelData * weight);
+                }
+            }
+        }
+    }
 
-	if( m_headBoneIndex >= 0 && !VectorCompareEpsilon( m_eyeTargetPos, vec3_origin, EPSILON ) )
-	{
-		SkelVec3 lookPos = m_eyeTargetPos;
-		const SkelMat4& headOrient = GetBoneFrame(m_headBoneIndex);
-		SkelMat4 invHeadOrient;
-		invHeadOrient.TransposeRotOf( headOrient );
+    if (m_headBoneIndex >= 0 && !VectorCompareEpsilon(m_eyeTargetPos, vec3_origin, EPSILON)) {
+        SkelVec3        lookPos    = m_eyeTargetPos;
+        const SkelMat4& headOrient = GetBoneFrame(m_headBoneIndex);
+        SkelMat4        invHeadOrient;
+        invHeadOrient.TransposeRotOf(headOrient);
 
-		SkelVec3 temp = lookPos;
-		lookPos[ 0 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 0 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 0 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 0 ];
-		lookPos[ 1 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 1 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 1 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 1 ];
-		lookPos[ 2 ] = temp[ 0 ] * invHeadOrient[ 0 ][ 2 ] * temp[ 1 ] * invHeadOrient[ 1 ][ 2 ] + temp[ 2 ] * invHeadOrient[ 2 ][ 2 ];
+        SkelVec3 temp = lookPos;
+        lookPos[0]    = temp[0] * invHeadOrient[0][0] * temp[1] * invHeadOrient[1][0] + temp[2] * invHeadOrient[2][0];
+        lookPos[1]    = temp[0] * invHeadOrient[0][1] * temp[1] * invHeadOrient[1][1] + temp[2] * invHeadOrient[2][1];
+        lookPos[2]    = temp[0] * invHeadOrient[0][2] * temp[1] * invHeadOrient[1][2] + temp[2] * invHeadOrient[2][2];
 
-		float lookLeftAmount = lookPos[2] * 100 + data[m_targetLookLeft] - data[m_targetLookRight];
-		float lookUpAmount = lookPos[0] * 100 + data[m_targetLookUp] - data[m_targetLookDown];
+        float lookLeftAmount = lookPos[2] * 100 + data[m_targetLookLeft] - data[m_targetLookRight];
+        float lookUpAmount   = lookPos[0] * 100 + data[m_targetLookUp] - data[m_targetLookDown];
 
-		const float s = VectorLengthSquared( lookPos );
+        const float s = VectorLengthSquared(lookPos);
 
-		if( s == 0.0 ) {
-			lookPos[0] = 1.0;
-		} else if( s != 1.0 ) {
-			float l = 1.0 / sqrt( s );
-			VectorScale( lookPos, l, lookPos );
-		}
+        if (s == 0.0) {
+            lookPos[0] = 1.0;
+        } else if (s != 1.0) {
+            float l = 1.0 / sqrt(s);
+            VectorScale(lookPos, l, lookPos);
+        }
 
-		if( m_targetLookLeft >= 0 && m_targetLookRight >= 0
-			&& m_targetLookUp >= 0 && m_targetLookDown >= 0 )
-		{
-			if( lookLeftAmount > 0.0 )
-			{
-				if( lookLeftAmount > 100.0 ) {
-					lookLeftAmount = 100.0;
-				}
+        if (m_targetLookLeft >= 0 && m_targetLookRight >= 0 && m_targetLookUp >= 0 && m_targetLookDown >= 0) {
+            if (lookLeftAmount > 0.0) {
+                if (lookLeftAmount > 100.0) {
+                    lookLeftAmount = 100.0;
+                }
 
-				data[ m_targetLookLeft ] = lookLeftAmount;
-				data[ m_targetLookRight ] = 0;
-			}
-			else
-			{
-				if( lookLeftAmount < -100.0 ) {
-					lookLeftAmount = -100.0;
-				}
+                data[m_targetLookLeft]  = lookLeftAmount;
+                data[m_targetLookRight] = 0;
+            } else {
+                if (lookLeftAmount < -100.0) {
+                    lookLeftAmount = -100.0;
+                }
 
-				data[ m_targetLookLeft ] = 0;
-				data[ m_targetLookRight ] = -lookLeftAmount;
-			}
+                data[m_targetLookLeft]  = 0;
+                data[m_targetLookRight] = -lookLeftAmount;
+            }
 
-			if( m_targetLookUp > 0.0 )
-			{
-				if( lookUpAmount > 100.0 ) {
-					lookUpAmount = 100.0;
-				}
+            if (m_targetLookUp > 0.0) {
+                if (lookUpAmount > 100.0) {
+                    lookUpAmount = 100.0;
+                }
 
-				data[ m_targetLookUp ] = lookUpAmount;
-				data[ m_targetLookDown ] = 0;
-			}
-			else
-			{
-				if( lookUpAmount < -133.0 ) {
-					lookUpAmount = -133.0;
-				}
+                data[m_targetLookUp]   = lookUpAmount;
+                data[m_targetLookDown] = 0;
+            } else {
+                if (lookUpAmount < -133.0) {
+                    lookUpAmount = -133.0;
+                }
 
-				data[ m_targetLookUp ] = 0.0;
-				data[ m_targetLookDown ] = ( -lookUpAmount * 0.75 );
-			}
-		}
-	}
+                data[m_targetLookUp]   = 0.0;
+                data[m_targetLookDown] = (-lookUpAmount * 0.75);
+            }
+        }
+    }
 
-	// check for blink
-	if( m_targetBlink >= 0 )
-	{
-		int sysMilliseconds;
-		int blinkAmount;
+    // check for blink
+    if (m_targetBlink >= 0) {
+        int sysMilliseconds;
+        int blinkAmount;
 
-		sysMilliseconds = Sys_Milliseconds();
+        sysMilliseconds = Sys_Milliseconds();
 
-		if( sysMilliseconds > m_timeNextBlink )
-		{
-			if( sysMilliseconds <= m_timeNextBlink + 250 )
-			{
-				blinkAmount = sysMilliseconds - m_timeNextBlink;
+        if (sysMilliseconds > m_timeNextBlink) {
+            if (sysMilliseconds <= m_timeNextBlink + 250) {
+                blinkAmount = sysMilliseconds - m_timeNextBlink;
 
-				if( blinkAmount > 100 )
-				{
-					blinkAmount = 250 - blinkAmount;
+                if (blinkAmount > 100) {
+                    blinkAmount = 250 - blinkAmount;
 
-					if( blinkAmount > 100 ) {
-						blinkAmount = 100;
-					}
-				}
+                    if (blinkAmount > 100) {
+                        blinkAmount = 100;
+                    }
+                }
 
-				if( data[ m_targetBlink ] < blinkAmount ) {
-					data[ m_targetBlink ] = blinkAmount;
-				}
-			}
-			else
-			{
-				m_timeNextBlink = rand() / 5 + sysMilliseconds - 1000;
-			}
-		}
-	}
+                if (data[m_targetBlink] < blinkAmount) {
+                    data[m_targetBlink] = blinkAmount;
+                }
+            } else {
+                m_timeNextBlink = rand() / 5 + sysMilliseconds - 1000;
+            }
+        }
+    }
 
-	return numTargets;
+    return numTargets;
 }
 
-void skeletor_c::SetEyeTargetPos( const float *pEyeTargetPos )
+void skeletor_c::SetEyeTargetPos(const float *pEyeTargetPos)
 {
-	VectorCopy( pEyeTargetPos, m_eyeTargetPos );
+    VectorCopy(pEyeTargetPos, m_eyeTargetPos);
 }
 
-
-int skeletor_c::GetBoneParent( int boneIndex ) {
-	int iBoneNum;
-	skelBone_Base *pBoneParent = m_bone[ boneIndex ]->Parent();
-
-	for( iBoneNum = 0; iBoneNum < m_Tiki->m_boneList.NumChannels(); iBoneNum++ )
-	{
-		if( m_bone[ iBoneNum ] == pBoneParent ) {
-			return iBoneNum;
-		}
-	}
-
-	return -1;
-	//return m_bone[ boneIndex ] - m_bone[ boneIndex ]->Parent();
-}
-
-const char *dtiki_s::GetBoneNameFromNum( int num ) const
+int skeletor_c::GetBoneParent(int boneIndex)
 {
-	return m_boneList.ChannelName( &skeletor_c::m_boneNames, num );
+    int            iBoneNum;
+    skelBone_Base *pBoneParent = m_bone[boneIndex]->Parent();
+
+    for (iBoneNum = 0; iBoneNum < m_Tiki->m_boneList.NumChannels(); iBoneNum++) {
+        if (m_bone[iBoneNum] == pBoneParent) {
+            return iBoneNum;
+        }
+    }
+
+    return -1;
+    //return m_bone[ boneIndex ] - m_bone[ boneIndex ]->Parent();
 }
 
-
-int dtiki_s::GetBoneNumFromName( const char *name )
+const char *dtiki_s::GetBoneNameFromNum(int num) const
 {
-	int iGlobalChannel;
-
-	iGlobalChannel = skeletor_c::m_boneNames.FindNameLookup( name );
-
-	if( iGlobalChannel < 0 )
-	{
-		return -1;
-	}
-
-	return m_boneList.GetLocalFromGlobal( iGlobalChannel );
+    return m_boneList.ChannelName(&skeletor_c::m_boneNames, num);
+}
+
+int dtiki_s::GetBoneNumFromName(const char *name)
+{
+    int iGlobalChannel;
+
+    iGlobalChannel = skeletor_c::m_boneNames.FindNameLookup(name);
+
+    if (iGlobalChannel < 0) {
+        return -1;
+    }
+
+    return m_boneList.LocalChannel(iGlobalChannel);
 }
diff --git a/code/skeletor/skeletor.h b/code/skeletor/skeletor.h
index 8805ce38..a126df25 100644
--- a/code/skeletor/skeletor.h
+++ b/code/skeletor/skeletor.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // skeletor.h : General skeletor structures
 
-#ifndef __SKELETOR__
-#define __SKELETOR__
+#pragma once
 
 #include "../tiki/tiki_shared.h"
 #include "SkelVec3.h"
@@ -36,26 +35,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "skeletor_name_lists.h"
 #include "skeletor_internal.h"
 
+#define MAX_SKEL_BLEND_MOVEMENT_FRAMES 32
+#define MAX_SKEL_BLEND_ACTION_FRAMES 32
+#define MAX_SKEL_BLEND_FRAMES (MAX_SKEL_BLEND_MOVEMENT_FRAMES + MAX_SKEL_BLEND_ACTION_FRAMES)
+
 typedef struct skelAnimFrame_s {
-	float radius;
-	SkelVec3 bounds[ 2 ];
-	SkelMat4 bones[ 1 ];
+    float    radius;
+    SkelVec3 bounds[2];
+    SkelMat4 bones[1];
 } skelAnimFrame_t;
 
 typedef struct {
-	float seconds;
+    float seconds;
 } skelAnimTime_t;
 
 typedef struct {
-	float weight;
-	skelAnimDataGameHeader_t *pAnimationData;
-	skelAnimGameFrame_t *frame;
+    float                     weight;
+    skelAnimDataGameHeader_t *pAnimationData;
+    skelAnimGameFrame_t      *frame;
 } skelAnimBlendFrame_t;
 
 typedef struct {
-	float weight;
-	skelAnimDataGameHeader_t *pAnimationData;
-	int frame;
+    float                     weight;
+    skelAnimDataGameHeader_t *pAnimationData;
+    int                       frame;
 } skanBlendInfo;
 
 #ifdef __cplusplus
@@ -63,75 +66,79 @@ typedef struct {
 template<typename T>
 class Container;
 
-#include "container.h"
+#    include "container.h"
 
-class skelAnimStoreFrameList_c {
+class skelAnimStoreFrameList_c
+{
 public:
-	short int numMovementFrames;
-	short int numActionFrames;
-	float actionWeight;
-	skanBlendInfo m_blendInfo[ 64 ];
+    short int     numMovementFrames;
+    short int     numActionFrames;
+    float         actionWeight;
+    skanBlendInfo m_blendInfo[MAX_SKEL_BLEND_FRAMES];
 
 public:
-	SkelQuat	GetSlerpValue( int globalChannelNum ) const;
-	void		GetLerpValue3( int globalChannelNum, SkelVec3 *outVec ) const;
+    SkelQuat GetSlerpValue(int globalChannelNum) const;
+    void     GetLerpValue3(int globalChannelNum, SkelVec3 *outVec) const;
 };
 
-class skeletor_c {
+class skeletor_c
+{
 public:
-	dtiki_t						*m_Tiki;
-	static ChannelNameTable		m_boneNames;
-	static ChannelNameTable		m_channelNames;
-	static skelBone_World		m_worldBone;
+    dtiki_t                *m_Tiki;
+    static ChannelNameTable m_boneNames;
+    static ChannelNameTable m_channelNames;
+    static skelBone_World   m_worldBone;
 
 private:
-	SkelVec3 m_frameBounds[ 2 ];
-	float m_frameRadius;
-	skelAnimStoreFrameList_c m_frameList;
-	short int m_targetLookLeft;
-	short int m_targetLookRight;
-	short int m_targetLookUp;
-	short int m_targetLookDown;
-	short int m_targetLookCrossed;
-	short int m_targetBlink;
-	short int m_timeNextBlink;
-	short int m_headBoneIndex;
-	vec3_t m_eyeTargetPos;
-	vec3_t m_eyePrevTargetPos;
-	class skelBone_Base *m_leftFoot;
-	class skelBone_Base *m_rightFoot;
-	skelChannelList_c m_morphTargetList;
-	class skelBone_Base **m_bone;
+    SkelVec3                 m_frameBounds[2];
+    float                    m_frameRadius;
+    skelAnimStoreFrameList_c m_frameList;
+    short int                m_targetLookLeft;
+    short int                m_targetLookRight;
+    short int                m_targetLookUp;
+    short int                m_targetLookDown;
+    short int                m_targetLookCrossed;
+    short int                m_targetBlink;
+    short int                m_timeNextBlink;
+    short int                m_headBoneIndex;
+    vec3_t                   m_eyeTargetPos;
+    vec3_t                   m_eyePrevTargetPos;
+    class skelBone_Base     *m_leftFoot;
+    class skelBone_Base     *m_rightFoot;
+    skelChannelList_c        m_morphTargetList;
+    class skelBone_Base    **m_bone;
 
 public:
-	skeletor_c( dtiki_t *tiki );
-	~skeletor_c();
+    skeletor_c(dtiki_t *tiki);
+    ~skeletor_c();
 
-	static skelAnimDataGameHeader_t		*ConvertSkelFileToGame( skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path );
-	static void							SaveProcessedAnim( skelAnimDataGameHeader_t *enAnim, const char *path, skelAnimDataFileHeader_t *pHeader );
-	static skelAnimDataGameHeader_t		*LoadProcessedAnim( const char *path, void *buffer, int len, const char *name );
-	static skelAnimDataGameHeader_t		*LoadProcessedAnimEx( const char *path, void *buffer, int len, const char *name );
-	void								PrintBoneCacheList();
-	void								PrintBoneList();
-	void								LoadMorphTargetNames( skelHeaderGame_t *modelHeader );
-	void								GetFrame( skelAnimFrame_t *newFrame );
-	int									GetMorphWeightFrame( int *data );
-	SkelMat4							&GetBoneFrame( int boneIndex ) const;
-	void								GetFrameBounds( SkelVec3 *, SkelVec3 * );
-	float								GetModelLODRadius();
-	bool								IsBoneOnGround( int boneIndex, float threshold );
-	int									GetMorphWeightFrame( int index, float time, int *data );
-	qboolean							LoadSKB( const char * );
-	float								GetRadius();
-	float								GetCentroidRadius( float *centroid );
-	void								SetPose( const frameInfo_t *frameInfo, const int *contIndices, const vec4_t *contValues, float actionWeight );
-	void								SetEyeTargetPos( const float *pEyeTargetPos );
-	int									GetBoneParent( int boneIndex );
+    static skelAnimDataGameHeader_t *
+    ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path);
+    static void
+    SaveProcessedAnim(skelAnimDataGameHeader_t *enAnim, const char *path, skelAnimDataFileHeader_t *pHeader);
+    static skelAnimDataGameHeader_t *LoadProcessedAnim(const char *path, void *buffer, int len, const char *name);
+    static skelAnimDataGameHeader_t *LoadProcessedAnimEx(const char *path, void *buffer, int len, const char *name);
+    void                             PrintBoneCacheList();
+    void                             PrintBoneList();
+    void                             LoadMorphTargetNames(skelHeaderGame_t *modelHeader);
+    void                             GetFrame(skelAnimFrame_t *newFrame);
+    int                              GetMorphWeightFrame(int *data);
+    SkelMat4                       & GetBoneFrame(int boneIndex) const;
+    void                             GetFrameBounds(SkelVec3 *, SkelVec3 *);
+    float                            GetModelLODRadius();
+    bool                             IsBoneOnGround(int boneIndex, float threshold);
+    int                              GetMorphWeightFrame(int index, float time, int *data);
+    qboolean                         LoadSKB(const char *);
+    float                            GetRadius();
+    float                            GetCentroidRadius(float *centroid);
+    void SetPose(const frameInfo_t *frameInfo, const int *contIndices, const vec4_t *contValues, float actionWeight);
+    void SetEyeTargetPos(const float *pEyeTargetPos);
+    int  GetBoneParent(int boneIndex);
+    static class ChannelNameTable* ChannelNames();
 
 private:
-	void Init();
-	static class ChannelNameTable *ChannelNames();
-	SkelMat4 *BoneTransformation( int, int *, float( *)[ 4 ] );
+    void                           Init();
+    SkelMat4                      *BoneTransformation(int, int *, float (*)[4]);
 };
 
 #endif
@@ -140,65 +147,103 @@ private:
 extern "C" {
 #endif
 
-//
-// skeletor.cpp
-//
+    //
+    // skeletor.cpp
+    //
 
-void ConvertToRotationName( const char *boneName, char *rotChannelName );
-void ConvertToPositionName( const char *boneName, char *posChannelName );
-void ConvertToFKRotationName( const char *boneName, char *rotChannelName );
-void ConvertToFKPositionName( const char *boneName, char *rotChannelName );
-void AddToBounds( SkelVec3 *bounds, SkelVec3 *newBounds );
+    void ConvertToRotationName(const char *boneName, char *rotChannelName);
+    void ConvertToPositionName(const char *boneName, char *posChannelName);
+    void ConvertToFKRotationName(const char *boneName, char *rotChannelName);
+    void ConvertToFKPositionName(const char *boneName, char *rotChannelName);
+    void AddToBounds(SkelVec3 *bounds, SkelVec3 *newBounds);
 #ifdef __cplusplus
-void BoneGetFrames( skelHeaderGame_t *skelmodel, skelAnimDataGameHeader_t *animData, skelChannelList_c *boneList, int boneNum, Container< skanAnimFrame >& outFrames );
-void TIKI_GetSkelAnimFrameInternal2(dtiki_t *tiki, skelBoneCache_t *bones, skelAnimStoreFrameList_c *frameList, float *radius, vec3_t *mins, vec3_t *maxes);
-void SkeletorGetAnimFrame2(skelHeaderGame_t *skelmodel, skelChannelList_c *boneList, skelBoneCache_t *bones, skelAnimStoreFrameList_c *frameList, float *radius, vec3_t *mins, vec3_t *maxes);
+    void BoneGetFrames(
+        skelHeaderGame_t         *skelmodel,
+        skelAnimDataGameHeader_t *animData,
+        skelChannelList_c        *boneList,
+        int                       boneNum,
+        Container<skanAnimFrame>& outFrames
+    );
+    void TIKI_GetSkelAnimFrameInternal2(
+        dtiki_t                  *tiki,
+        skelBoneCache_t          *bones,
+        skelAnimStoreFrameList_c *frameList,
+        float                    *radius,
+        vec3_t                   *mins,
+        vec3_t                   *maxes
+    );
+    void SkeletorGetAnimFrame2(
+        skelHeaderGame_t         *skelmodel,
+        skelChannelList_c        *boneList,
+        skelBoneCache_t          *bones,
+        skelAnimStoreFrameList_c *frameList,
+        float                    *radius,
+        vec3_t                   *mins,
+        vec3_t                   *maxes
+    );
 #endif
-void SkeletorGetAnimFrame( skelHeaderGame_t *skelmodel, skelAnimDataGameHeader_t *animData, skelChannelList_c *boneList, skelBoneCache_t *bones, int frame, float *radius, vec3_t *mins, vec3_t *maxes );
-void TIKI_GetSkelAnimFrame( dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes );
-void TIKI_GetSkelAnimFrame2( dtiki_t *tiki, skelBoneCache_t *bones, int anim, int frame, float *radius, vec3_t *mins, vec3_t *maxes );
-void TIKI_GetSkelAnimFrameInternal( dtiki_t *tiki, skelBoneCache_t *bones, skelAnimDataGameHeader_t *animData, int frame, float *radius, vec3_t *mins, vec3_t *maxes );
+    void SkeletorGetAnimFrame(
+        skelHeaderGame_t         *skelmodel,
+        skelAnimDataGameHeader_t *animData,
+        skelChannelList_c        *boneList,
+        skelBoneCache_t          *bones,
+        int                       frame,
+        float                    *radius,
+        vec3_t                   *mins,
+        vec3_t                   *maxes
+    );
+    void TIKI_GetSkelAnimFrame(dtiki_t *tiki, skelBoneCache_t *bones, float *radius, vec3_t *mins, vec3_t *maxes);
+    void TIKI_GetSkelAnimFrame2(
+        dtiki_t *tiki, skelBoneCache_t *bones, int anim, int frame, float *radius, vec3_t *mins, vec3_t *maxes
+    );
+    void TIKI_GetSkelAnimFrameInternal(
+        dtiki_t                  *tiki,
+        skelBoneCache_t          *bones,
+        skelAnimDataGameHeader_t *animData,
+        int                       frame,
+        float                    *radius,
+        vec3_t                   *mins,
+        vec3_t                   *maxes
+    );
 
-//
-// skeletor_imports.cpp
-//
+    //
+    // skeletor_imports.cpp
+    //
 
-void Skel_DPrintf( const char *fmt, ... );
+    void Skel_DPrintf(const char *fmt, ...);
 
 #ifndef _DEBUG_MEM
-  void Skel_Free( void *ptr );
-  void *Skel_Alloc( size_t size );
+    void  Skel_Free(void *ptr);
+    void *Skel_Alloc(size_t size);
 #else
-#  define Skel_Free(ptr) free(ptr)
-#  define Skel_Alloc(size) malloc(size)
+#    define Skel_Free(ptr)   free(ptr)
+#    define Skel_Alloc(size) malloc(size)
 #endif
 
-void Skel_FreeFile( void *buffer );
-int Skel_ReadFileEx( const char *qpath, void **buffer, qboolean quiet );
+    void Skel_FreeFile(void *buffer);
+    int  Skel_ReadFileEx(const char *qpath, void **buffer, qboolean quiet);
 
-//
-// skeletor_utilities.cpp
-//
+    //
+    // skeletor_utilities.cpp
+    //
 
-void SKEL_Message( const char *fmt, ... );
-void SKEL_Warning( const char *fmt, ... );
-void SKEL_Error( const char *fmt, ... );
-void Skel_ExtractFilePath( const char *path, char *dest );
-void Skel_ExtractFileBase( const char *path, char *dest );
-void Skel_ExtractFileExtension( const char *path, char *dest );
-//const char *Skel_ExtractFileExtension( const char *in );
-void Skel_ExtractFileName( const char *path, char *dest );
-int FileLength( FILE *pFile );
+    void SKEL_Message(const char *fmt, ...);
+    void SKEL_Warning(const char *fmt, ...);
+    void SKEL_Error(const char *fmt, ...);
+    void Skel_ExtractFilePath(const char *path, char *dest);
+    void Skel_ExtractFileBase(const char *path, char *dest);
+    void Skel_ExtractFileExtension(const char *path, char *dest);
+    //const char *Skel_ExtractFileExtension( const char *in );
+    void Skel_ExtractFileName(const char *path, char *dest);
+    int  FileLength(FILE *pFile);
 
-//
-// skeletorbones.cpp
-//
+    //
+    // skeletorbones.cpp
+    //
 
-void SkeletorLoadBoneFromBuffer( skelChannelList_c *boneList, boneData_t *boneData, skelBone_Base **bone );
-void SkeletorLoadBonesFromBuffer( skelChannelList_c *boneList, skelHeaderGame_t *buffer, skelBone_Base **bone );
+    void SkeletorLoadBoneFromBuffer(skelChannelList_c *boneList, boneData_t *boneData, skelBone_Base **bone);
+    void SkeletorLoadBonesFromBuffer(skelChannelList_c *boneList, skelHeaderGame_t *buffer, skelBone_Base **bone);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __SKELETOR__
diff --git a/code/skeletor/skeletor_animation_file_format.h b/code/skeletor/skeletor_animation_file_format.h
index ce2a04cb..5a679f50 100644
--- a/code/skeletor/skeletor_animation_file_format.h
+++ b/code/skeletor/skeletor_animation_file_format.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,56 +22,55 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // skeletor_animation_file_format.h : Skeletor animation file format
 
-#ifndef __SKELETOR_ANIMATION_FILE_FORMAT_H__
-#define __SKELETOR_ANIMATION_FILE_FORMAT_H__
+#pragma once
 
-typedef float skelAnimChannel_t[ 4 ];
+typedef float skelAnimChannel_t[4];
 
 typedef struct {
-	SkelVec3 bounds[ 2 ];
-	float radius;
-	SkelVec3 delta;
-	float angleDelta;
-	int iOfsChannels; 
+    SkelVec3 bounds[2];
+    float    radius;
+    SkelVec3 delta;
+    float    angleDelta;
+    int      iOfsChannels;
 } skelAnimFileFrame_t;
 
 typedef struct {
-	int ident;
-	int version;
-	int flags;
-	int nBytesUsed;
-	float frameTime;
-	SkelVec3 totalDelta;
-	float totalAngleDelta;
-	int numChannels;
-	int ofsChannelNames;
-	int numFrames;
-	skelAnimFileFrame_t frame[ 1 ];
+    int                 ident;
+    int                 version;
+    int                 flags;
+    int                 nBytesUsed;
+    float               frameTime;
+    SkelVec3            totalDelta;
+    float               totalAngleDelta;
+    int                 numChannels;
+    int                 ofsChannelNames;
+    int                 numFrames;
+    skelAnimFileFrame_t frame[1];
 } skelAnimDataFileHeader_t;
 
 typedef struct {
-	SkelVec3 bounds[ 2 ];
-	float radius;
-	SkelVec3 delta;
-	float angleDelta;
-	vec4_t *pChannels;
+    SkelVec3 bounds[2];
+    float    radius;
+    SkelVec3 delta;
+    float    angleDelta;
+    vec4_t  *pChannels; // FIXME: must delete
 } skelAnimGameFrame_t;
 
 typedef struct {
-	short int nFrameNum;
-	short int nPrevFrameIndex;
-	vec4_t pChannelData;
+    short int nFrameNum;
+    short int nPrevFrameIndex;
+    float     pChannelData[1];
 } skanGameFrame;
 
 typedef struct {
-	short int nFramesInChannel;
-	skanGameFrame *ary_frames;
+    short int      nFramesInChannel;
+    skanGameFrame *ary_frames;
 } skanChannelHdr;
 
 typedef struct {
-	short	nFrameNum;
-	vec3_t	pos;
-	vec3_t	rot;
+    short  nFrameNum;
+    vec3_t pos;
+    vec3_t rot;
 } skanAnimFrame;
 
 typedef struct skelAnimDataGameHeader_s skelAnimDataGameHeader_t;
@@ -79,32 +78,37 @@ typedef struct skelAnimDataGameHeader_s skelAnimDataGameHeader_t;
 #ifdef __cplusplus
 
 typedef struct skelAnimDataGameHeader_s {
-	int flags;
-	int nBytesUsed;
-	bool bHasDelta;
-	bool bHasMorph;
-	bool bHasUpper;
-	int numFrames;
-	SkelVec3 totalDelta;
-	float totalAngleDelta;
-	float frameTime;
-	skelChannelList_c channelList;
-	SkelVec3 bounds[ 2 ];
-	skelAnimGameFrame_t *m_frame;
-	short int nTotalChannels;
-	skanChannelHdr ary_channels[ 1 ];
+    int                  flags;
+    size_t               nBytesUsed;
+    bool                 bHasDelta;
+    bool                 bHasMorph;
+    bool                 bHasUpper;
+    int                  numFrames;
+    SkelVec3             totalDelta;
+    float                totalAngleDelta;
+    float                frameTime;
+    skelChannelList_c    channelList;
+    SkelVec3             bounds[2];
+    skelAnimGameFrame_t *m_frame;
+    short int            nTotalChannels;
+    skanChannelHdr       ary_channels[1];
 
-	skelAnimDataGameHeader_s( const skelAnimDataGameHeader_t& );
-	skelAnimDataGameHeader_s();
+    skelAnimDataGameHeader_s(const skelAnimDataGameHeader_t&);
+    skelAnimDataGameHeader_s();
 
-	static skelAnimDataGameHeader_t		*AllocRLEChannelData(size_t numChannels);
-	int									GetFrameNums( float timeSeconds, float timeTolerance, int *beforeFrame, int *afterFrame, float *beforeWeight, float *afterWeight );
-	SkelVec3							GetDeltaOverTime( float time1, float time2 );
-	float								GetAngularDeltaOverTime( float time1, float time2 );
-	static skelAnimDataGameHeader_t		*AllocAnimData(size_t numFrames, size_t numChannels );
-	static void							DeallocAnimData( skelAnimDataGameHeader_t *data );
+    static skelAnimDataGameHeader_t *AllocRLEChannelData(size_t numChannels);
+    int                              GetFrameNums(
+                                     float  timeSeconds,
+                                     float  timeTolerance,
+                                     int   *beforeFrame,
+                                     int   *afterFrame,
+                                     float *beforeWeight,
+                                     float *afterWeight
+                                 );
+    SkelVec3                         GetDeltaOverTime(float time1, float time2);
+    float                            GetAngularDeltaOverTime(float time1, float time2);
+    static skelAnimDataGameHeader_t *AllocAnimData(size_t numFrames, size_t numChannels);
+    static void                      DeallocAnimData(skelAnimDataGameHeader_t *data);
 } skelAnimDataGameHeader_t;
 
 #endif
-
-#endif // __SKELETOR_ANIMATION_FILE_FORMAT_H__
diff --git a/code/skeletor/skeletor_imports.cpp b/code/skeletor/skeletor_imports.cpp
index 5f6ddeb0..a415b713 100644
--- a/code/skeletor/skeletor_imports.cpp
+++ b/code/skeletor/skeletor_imports.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,38 +26,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "skeletor.h"
 
-void Skel_DPrintf( const char *fmt, ... )
+void Skel_DPrintf(const char *fmt, ...)
 {
-	char msg[ 4096 ];
-	va_list va;
+    char    msg[4096];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
 
-	Com_DPrintf( "%s", msg );
+    Com_DPrintf("%s", msg);
 }
 
 #ifndef _DEBUG_MEM
 
-void Skel_Free( void *ptr )
+void Skel_Free(void *ptr)
 {
-	Z_Free( ptr );
+    Z_Free(ptr);
 }
 
-void *Skel_Alloc( size_t size )
+void *Skel_Alloc(size_t size)
 {
-	return Z_TagMalloc( size, TAG_SKEL );
+    return Z_TagMalloc(size, TAG_SKEL);
 }
 
 #endif
 
-void Skel_FreeFile( void *buffer )
+void Skel_FreeFile(void *buffer)
 {
-	FS_FreeFile( buffer );
+    FS_FreeFile(buffer);
 }
 
-int Skel_ReadFileEx( const char *qpath, void **buffer, qboolean quiet )
+int Skel_ReadFileEx(const char *qpath, void **buffer, qboolean quiet)
 {
-	return FS_ReadFileEx( qpath, buffer, quiet );
+    return FS_ReadFileEx(qpath, buffer, quiet);
 }
diff --git a/code/skeletor/skeletor_internal.h b/code/skeletor/skeletor_internal.h
index 0ccad12f..efc7eec6 100644
--- a/code/skeletor/skeletor_internal.h
+++ b/code/skeletor/skeletor_internal.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,190 +22,204 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // skeletor_internal.h : General skeletor internal structures
 
-#ifndef __SKELETOR_INTERNAL__
-#define __SKELETOR_INTERNAL__
+#pragma once
 
 #ifdef __cplusplus
 
 class skelAnimStoreFrameList_c;
 
-class skelBone_Base {
+class skelBone_Base
+{
 public:
-	qboolean		m_isDirty;
+    qboolean m_isDirty;
 
 protected:
-	skelBone_Base	*m_parent;
-	SkelMat4		m_cachedValue;
+    skelBone_Base *m_parent;
+    SkelMat4       m_cachedValue;
 
 public:
-	float			*m_controller;
+    float *m_controller;
 
 public:
-	skelBone_Base();
-	virtual ~skelBone_Base();
+    skelBone_Base();
+    virtual ~skelBone_Base();
 
-	SkelMat4				&GetTransform( const skelAnimStoreFrameList_c *frames );
-	virtual SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) = 0;
-	void					SetParent( skelBone_Base *parent );
-	virtual void			SetBaseValue( boneData_t *boneData );
-	virtual int				GetChannelIndex( int num );
-	virtual skelBone_Base	*GetBoneRef( int num );
-	static int				GetNumChannels( boneType_t boneType );
-	static int				GetNumBoneRefs( boneType_t boneType );
-	skelBone_Base			*Parent() const;
-	bool					OnGround( const skelAnimStoreFrameList_c *frames, float threshold );
+    SkelMat4             & GetTransform(const skelAnimStoreFrameList_c *frames);
+    virtual SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) = 0;
+    void                   SetParent(skelBone_Base *parent);
+    virtual void           SetBaseValue(boneData_t *boneData);
+    virtual int            GetChannelIndex(int num);
+    virtual skelBone_Base *GetBoneRef(int num);
+    static int             GetNumChannels(boneType_t boneType);
+    static int             GetNumBoneRefs(boneType_t boneType);
+    skelBone_Base         *Parent() const;
+    bool                   OnGround(const skelAnimStoreFrameList_c *frames, float threshold);
 };
 
-class skelBone_World : public skelBone_Base {
+class skelBone_World : public skelBone_Base
+{
 public:
-	skelBone_World();
+    skelBone_World();
 
 private:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_Zero : public skelBone_Base {
+class skelBone_Zero : public skelBone_Base
+{
 private:
-	SkelMat4			&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void				SetBaseValue( boneData_t *boneData ) override;
-	int					GetChannelIndex( int num ) override;
-	skelBone_Base		*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_Rotation : public skelBone_Base {
+class skelBone_Rotation : public skelBone_Base
+{
 protected:
-	SkelVec3 m_baseValue;
-	int m_quatChannel;
+    SkelVec3 m_baseValue;
+    int      m_quatChannel;
 
 protected:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
+    SkelMat4& GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
 
 public:
-	void			SetChannels( int num );
-	void			SetBaseValue( boneData_t *data ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    void           SetChannels(int num);
+    void           SetBaseValue(boneData_t *data) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_PosRot : public skelBone_Base {
+class skelBone_PosRot : public skelBone_Base
+{
 protected:
-	int m_quatChannel;
-	int m_offsetChannel;
+    int m_quatChannel;
+    int m_offsetChannel;
 
 public:
+
 protected:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
+    SkelMat4& GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+
 public:
-	void			SetChannels( int quatChannel, int offsetChannel );
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    void           SetChannels(int quatChannel, int offsetChannel);
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_Root : public skelBone_PosRot {
+class skelBone_Root : public skelBone_PosRot
+{
 public:
-	SkelMat4	&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
+    SkelMat4& GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
 };
 
-class skelBone_IKshoulder : public skelBone_Base {
+class skelBone_IKshoulder : public skelBone_Base
+{
 public:
-	class skelBone_IKwrist *m_wrist;
-	float m_upperLength;
-	float m_lowerLength;
-	SkelVec3 m_baseValue;
-	float m_cosElbowAngle;
-	SkelVec3 m_wristPos;
-	SkelQuat m_wristAngle;
+    class skelBone_IKwrist *m_wrist;
+    float                   m_upperLength;
+    float                   m_lowerLength;
+    SkelVec3                m_baseValue;
+    float                   m_cosElbowAngle;
+    SkelVec3                m_wristPos;
+    SkelQuat                m_wristAngle;
 
-	skelBone_IKshoulder();
+    skelBone_IKshoulder();
 
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
-	void			SetElbowValue( float elbowOffset );
-	void			SetWristValue( float wristOffset );
-	void			SetWristBone( skelBone_IKwrist *wrist );
-	float			GetUpperLength();
-	float			GetLowerLength();
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
+    void           SetElbowValue(float elbowOffset);
+    void           SetWristValue(float wristOffset);
+    void           SetWristBone(skelBone_IKwrist *wrist);
+    float          GetUpperLength();
+    float          GetLowerLength();
 };
 
-class skelBone_IKelbow : public skelBone_Base {
+class skelBone_IKelbow : public skelBone_Base
+{
 public:
-	skelBone_IKshoulder *m_shoulder;
+    skelBone_IKshoulder *m_shoulder;
 
 public:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void			SetBoneRefs( skelBone_IKshoulder *shoulder );
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void           SetBoneRefs(skelBone_IKshoulder *shoulder);
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_IKwrist : public skelBone_Base {
+class skelBone_IKwrist : public skelBone_Base
+{
 public:
-	skelBone_IKshoulder *m_shoulder;
-	int m_quatChannel;
-	int m_offsetChannel;
+    skelBone_IKshoulder *m_shoulder;
+    int                  m_quatChannel;
+    int                  m_offsetChannel;
 
 public:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frame ) override;
-	void			SetChannels( int quatChannel, int offsetChannel );
-	void			SetBoneRefs( skelBone_IKshoulder *shoulder );
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frame) override;
+    void           SetChannels(int quatChannel, int offsetChannel);
+    void           SetBoneRefs(skelBone_IKshoulder *shoulder);
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_AvRot : public skelBone_Base {
+class skelBone_AvRot : public skelBone_Base
+{
 public:
-	SkelVec3 m_basePos;
-	SkelQuat m_cachedQuat;
-	skelBone_Base *m_reference1;
-	skelBone_Base *m_reference2;
-	float m_bone2weight;
+    SkelVec3       m_basePos;
+    SkelQuat       m_cachedQuat;
+    skelBone_Base *m_reference1;
+    skelBone_Base *m_reference2;
+    float          m_bone2weight;
 
 public:
-	skelBone_AvRot();
+    skelBone_AvRot();
 
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void			SetBoneRefs( skelBone_Base *ref1, skelBone_Base *ref2 );
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void           SetBoneRefs(skelBone_Base *ref1, skelBone_Base *ref2);
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_HoseRot : public skelBone_Base {
+class skelBone_HoseRot : public skelBone_Base
+{
 public:
-	SkelVec3 m_basePos;
-	SkelQuat m_cachedQuat;
-	skelBone_Base *m_target;
-	float m_bendRatio;
-	float m_bendMax;
-	float m_spinRatio;
+    SkelVec3       m_basePos;
+    SkelQuat       m_cachedQuat;
+    skelBone_Base *m_target;
+    float          m_bendRatio;
+    float          m_bendMax;
+    float          m_spinRatio;
 
 public:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	SkelMat4		&GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM );
-	void			SetBoneRefs( skelBone_Base *ref );
-	void			SetBaseValue( boneData_t *boneData ) override;
-	int				GetChannelIndex( int num ) override;
-	skelBone_Base	*GetBoneRef( int num ) override;
+    SkelMat4     & GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    SkelMat4     & GetDirtyTransform(SkelMat4     &myParentTM, SkelMat4     &targetTM);
+    void           SetBoneRefs(skelBone_Base *ref);
+    void           SetBaseValue(boneData_t *boneData) override;
+    int            GetChannelIndex(int num) override;
+    skelBone_Base *GetBoneRef(int num) override;
 };
 
-class skelBone_HoseRotBoth : public skelBone_HoseRot {
+class skelBone_HoseRotBoth : public skelBone_HoseRot
+{
 public:
-	SkelMat4		&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void			SetBaseValue( boneData_t *boneData ) override;
+    SkelMat4& GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void      SetBaseValue(boneData_t *boneData) override;
 };
 
-class skelBone_HoseRotParent : public skelBone_HoseRot {
+class skelBone_HoseRotParent : public skelBone_HoseRot
+{
 public:
-	SkelMat4	&GetDirtyTransform( const skelAnimStoreFrameList_c *frames ) override;
-	void		SetBaseValue( boneData_t *boneData ) override;
+    SkelMat4& GetDirtyTransform(const skelAnimStoreFrameList_c *frames) override;
+    void      SetBaseValue(boneData_t *boneData) override;
 };
 
 #else
@@ -214,6 +228,4 @@ typedef void *skelBone_Base;
 
 #endif
 
-typedef char skelChannelName_t[ 32 ];
-
-#endif // __SKELETOR_INTERNAL__
+typedef char skelChannelName_t[32];
diff --git a/code/skeletor/skeletor_loadanimation.cpp b/code/skeletor/skeletor_loadanimation.cpp
index 1fd780b5..d2bdfe59 100644
--- a/code/skeletor/skeletor_loadanimation.cpp
+++ b/code/skeletor/skeletor_loadanimation.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,307 +26,395 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "skeletor.h"
 
-qboolean Compress( skelAnimGameFrame_t *current, skelAnimGameFrame_t *last, int channelIndex, skelChannelList_c *channelList, ChannelNameTable *channelNames )
+qboolean Compress(skelAnimGameFrame_t *current, skelAnimGameFrame_t *last, int channelIndex, int numChannels)
 {
-	float tolerance;
-	float difference;
+    float tolerance;
+    float difference;
+    int   i;
 
-	// high-end PC don't need to compress...
-	return false;
+    // high-end PC don't need to compress...
+    return false;
 
-	tolerance = current->pChannels[ channelIndex ][ 0 ];
-	if( tolerance > -0.000001 && tolerance < 0.000001 )
-	{
-		current->pChannels[ channelIndex ][ 0 ] = 0.0f;
-	}
+    for (i = 0; i < numChannels; i++) {
+        tolerance = current->pChannels[channelIndex][i];
+        if (tolerance > -0.000001 && tolerance < 0.000001) {
+            current->pChannels[channelIndex][i] = 0.0f;
+        }
+    }
 
-	tolerance = current->pChannels[ channelIndex ][ 1 ];
-	if( tolerance > -0.000001 && tolerance < 0.000001 )
-	{
-		current->pChannels[ channelIndex ][ 1 ] = 0.0f;
-	}
+    if (last) {
+        for (i = 0; i < numChannels; i++) {
+            difference = last->pChannels[channelIndex][i] - current->pChannels[channelIndex][i];
+            if (difference < -0.001f || difference >= 0.001f) {
+                return false;
+            }
+        }
+    }
 
-	tolerance = current->pChannels[ channelIndex ][ 2 ];
-	if( tolerance > -0.000001 && tolerance < 0.000001 )
-	{
-		current->pChannels[ channelIndex ][ 2 ] = 0.0f;
-	}
-
-	if( !last )
-	{
-		return false;
-	}
-
-	difference = last->pChannels[ channelIndex ][ 0 ] - current->pChannels[ channelIndex ][ 0 ];
-	if( difference < -0.001f || difference >= 0.001f )
-	{
-		return false;
-	}
-
-	difference = last->pChannels[ channelIndex ][ 1 ] - current->pChannels[ channelIndex ][ 1 ];
-	if( difference < -0.001f || difference >= 0.001f )
-	{
-		return false;
-	}
-
-	difference = last->pChannels[ channelIndex ][ 2 ] - current->pChannels[ channelIndex ][ 2 ];
-	if( difference < -0.001f || difference >= 0.001f )
-	{
-		return false;
-	}
-
-	return true;
+    return true;
 }
 
-skelAnimDataGameHeader_t *EncodeFrames( skelAnimDataGameHeader_t *enAnim, skelAnimGameFrame_t *m_frame, qboolean bLog, skelChannelList_c *channelList, ChannelNameTable *channelNames )
+skelAnimDataGameHeader_t *EncodeFrames(
+    skelAnimDataGameHeader_t *enAnim,
+    skelAnimGameFrame_t      *m_frame,
+    qboolean                  bLog,
+    skelChannelList_c        *channelList,
+    ChannelNameTable         *channelNames
+)
 {
-	int endFrameCap;
-	skanChannelHdr *pChannel;
-	int i, j;
-	int frameCnt;
-	skelAnimGameFrame_t *pCurrFrame;
-	skelAnimGameFrame_t *pLastFrame;
-	skanGameFrame *pFrame;
-	int indexLastFrameAdded;
+    int                  endFrameCap;
+    skanChannelHdr      *pChannel;
+    int                  i, j;
+    int                  frameCnt;
+    skelAnimGameFrame_t *pCurrFrame;
+    skelAnimGameFrame_t *pLastFrame;
+    skanGameFrame       *pFrame;
+    size_t               frameSize;
+    int                  indexLastFrameAdded;
+    channelType_t        channelType;
 
-	pChannel = enAnim->ary_channels;
-	endFrameCap = enAnim->numFrames - 2;
+    pChannel    = enAnim->ary_channels;
+    endFrameCap = enAnim->numFrames - 2;
 
-	for( i = 0; i < enAnim->nTotalChannels; i++, pChannel++ )
-	{
-		pLastFrame = NULL;
-		pCurrFrame = m_frame;
+    for (i = 0; i < enAnim->nTotalChannels; i++, pChannel++) {
+        pLastFrame = NULL;
+        pCurrFrame = m_frame;
 
-		frameCnt = 0;
-		for( j = 0; j < enAnim->numFrames; j++ )
-		{
-			if( !Compress( pCurrFrame, pLastFrame, i, channelList, channelNames ) || j >= endFrameCap )
-			{
-				frameCnt++;
-				pLastFrame = pCurrFrame;
-			}
+        channelType = GetBoneChannelType(enAnim->channelList.ChannelName(channelNames, i));
+        switch (channelType) {
+        case CHANNEL_ROTATION:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 4) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
+                }
 
-			pCurrFrame++;
-		}
+                pCurrFrame++;
+            }
 
-		pChannel->ary_frames = ( skanGameFrame * )Skel_Alloc( frameCnt * sizeof( skanGameFrame ) );
-		pChannel->nFramesInChannel = frameCnt;
-		enAnim->nBytesUsed += frameCnt * sizeof( skanGameFrame );
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
 
-		pLastFrame = NULL;
-		indexLastFrameAdded = 0;
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
 
-		pCurrFrame = m_frame;
-		pFrame = pChannel->ary_frames;
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
 
-		for( j = 0; j < enAnim->numFrames; j++ )
-		{
-			if( !Compress( pCurrFrame, pLastFrame, i, channelList, channelNames ) || j >= endFrameCap )
-			{
-				pFrame->nFrameNum = j;
-				pFrame->nPrevFrameIndex = indexLastFrameAdded;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 4) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
 
-				if( j > 0 )
-					indexLastFrameAdded++;
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
 
-				pFrame->pChannelData[ 0 ] = pCurrFrame->pChannels[ i ][ 0 ];
-				pFrame->pChannelData[ 1 ] = pCurrFrame->pChannels[ i ][ 1 ];
-				pFrame->pChannelData[ 2 ] = pCurrFrame->pChannels[ i ][ 2 ];
-				pFrame->pChannelData[ 3 ] = pCurrFrame->pChannels[ i ][ 3 ];
-				pFrame++;
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+                    pFrame->pChannelData[1] = pCurrFrame->pChannels[i][1];
+                    pFrame->pChannelData[2] = pCurrFrame->pChannels[i][2];
+                    pFrame->pChannelData[3] = pCurrFrame->pChannels[i][3];
 
-				pLastFrame = pCurrFrame;
-			}
+                    pLastFrame = pCurrFrame;
+                }
 
-			pCurrFrame++;
-		}
-	}
+                pCurrFrame++;
+            }
+            break;
+        case CHANNEL_POSITION:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 3) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
+                }
 
-	return enAnim;
+                pCurrFrame++;
+            }
+
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
+
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
+
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
+
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 1) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
+
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
+
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+                    pFrame->pChannelData[1] = pCurrFrame->pChannels[i][1];
+                    pFrame->pChannelData[2] = pCurrFrame->pChannels[i][2];
+
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+            break;
+        case CHANNEL_NONE:
+            pChannel->ary_frames       = NULL;
+            pChannel->nFramesInChannel = 0;
+            break;
+        case CHANNEL_VALUE:
+        default:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+            frameCnt  = 0;
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 1) || j >= endFrameCap) {
+                    frameCnt++;
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+
+            pChannel->ary_frames       = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->nFramesInChannel = frameCnt;
+            enAnim->nBytesUsed += frameSize * frameCnt;
+
+            pLastFrame          = NULL;
+            indexLastFrameAdded = 0;
+
+            pCurrFrame = m_frame;
+            pFrame     = pChannel->ary_frames;
+
+            for (j = 0; j < enAnim->numFrames; j++) {
+                if (!Compress(pCurrFrame, pLastFrame, i, 3) || j >= endFrameCap) {
+                    pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                    pFrame->nFrameNum       = j;
+                    pFrame->nPrevFrameIndex = indexLastFrameAdded;
+
+                    if (j > 0) {
+                        indexLastFrameAdded++;
+                    }
+
+                    pFrame->pChannelData[0] = pCurrFrame->pChannels[i][0];
+
+                    pLastFrame = pCurrFrame;
+                }
+
+                pCurrFrame++;
+            }
+            break;
+        }
+    }
+
+    return enAnim;
 }
 
-skelAnimDataGameHeader_t *skeletor_c::ConvertSkelFileToGame( skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path )
+skelAnimDataGameHeader_t *
+skeletor_c::ConvertSkelFileToGame(skelAnimDataFileHeader_t *pHeader, int iBuffLength, const char *path)
 {
-	int i;
-	skelAnimFileFrame_t *pFileFrame;
-	skelAnimGameFrame_t *pGameFrame;
-	skelChannelName_t *pChannelNames;
-	skelAnimDataGameHeader_t *enAnim;
-	skelAnimGameFrame_t *oldFrame;
-	skelAnimGameFrame_t *newFrame;
-	int channelIndex;
+    int                       i, j;
+    skelAnimFileFrame_t      *pFileFrame;
+    skelAnimGameFrame_t      *pGameFrame;
+    skelChannelName_t        *pChannelNames;
+    skelAnimDataGameHeader_t *enAnim;
+    skelAnimGameFrame_t      *oldFrame;
+    skelAnimGameFrame_t      *newFrame;
+    int                       channelIndex;
 
-	if( pHeader->numFrames <= 0 )
-	{
-		return NULL;
-	}
+    static_assert(sizeof(skelAnimDataFileHeader_t) == 96, "Skeletor anim header size doesn't match!");
+    static_assert(sizeof(skelAnimFileFrame_t) == 48, "Skeletor anim file frame size doesn't match!");
 
-	pGameFrame = new skelAnimGameFrame_t[ pHeader->numFrames ];
-	pFileFrame = pHeader->frame;
-	newFrame = pGameFrame;
+    if (pHeader->numFrames <= 0) {
+        return NULL;
+    }
 
-	for( i = 0; i < pHeader->numFrames; i++ )
-	{
-		newFrame->bounds[ 0 ] = pFileFrame->bounds[ 0 ];
-		newFrame->bounds[ 1 ] = pFileFrame->bounds[ 1 ];
-		newFrame->delta = pFileFrame->delta;
-		newFrame->angleDelta = pFileFrame->angleDelta;
-		newFrame->pChannels = new vec4_t[ pHeader->numChannels ];
-		memcpy( newFrame->pChannels, 
-			( char * )pHeader + ( sizeof( vec4_t ) * ( 3 * pHeader->numFrames - 3 ) + sizeof( vec4_t ) * pHeader->numChannels * i + 96 ),
-			pHeader->numChannels * sizeof( vec4_t ) );
-		AddToBounds( newFrame->bounds, pFileFrame->bounds );
+    pGameFrame = new skelAnimGameFrame_t[pHeader->numFrames];
+    pFileFrame = pHeader->frame;
+    newFrame   = pGameFrame;
 
-		pFileFrame++;
-		newFrame++;
-	}
+    for (i = 0; i < pHeader->numFrames; i++) {
+        vec4_t* pChannels;
 
-	enAnim = skelAnimDataGameHeader_t::AllocRLEChannelData( pHeader->numChannels );
-	enAnim->flags = pHeader->flags;
-	enAnim->frameTime = pHeader->frameTime;
-	enAnim->totalDelta = pHeader->totalDelta;
-	enAnim->totalAngleDelta = pHeader->totalAngleDelta;
-	enAnim->numFrames = pHeader->numFrames;
-	enAnim->nTotalChannels = pHeader->numChannels;
-	ClearBounds( enAnim->bounds[ 0 ], enAnim->bounds[ 1 ] );
-	enAnim->m_frame = ( skelAnimGameFrame_t * )Skel_Alloc( pHeader->numFrames * sizeof( skelAnimGameFrame_t ) );
+        newFrame->bounds[0][0] = LittleFloat(pFileFrame->bounds[0][0]);
+        newFrame->bounds[0][1] = LittleFloat(pFileFrame->bounds[0][1]);
+        newFrame->bounds[0][2] = LittleFloat(pFileFrame->bounds[0][2]);
+        newFrame->bounds[1][0] = LittleFloat(pFileFrame->bounds[1][0]);
+        newFrame->bounds[1][1] = LittleFloat(pFileFrame->bounds[1][1]);
+        newFrame->bounds[1][2] = LittleFloat(pFileFrame->bounds[1][2]);
+        newFrame->radius = LittleFloat(pFileFrame->radius);
+        newFrame->delta[0] = LittleFloat(pFileFrame->delta[0]);
+        newFrame->delta[1] = LittleFloat(pFileFrame->delta[1]);
+        newFrame->delta[2] = LittleFloat(pFileFrame->delta[2]);
+        newFrame->angleDelta = LittleFloat(pFileFrame->angleDelta);
+        //
+        // Load channels
+        //
+        newFrame->pChannels  = new vec4_t[pHeader->numChannels];
+        pChannels = (vec4_t*)((byte*)pHeader + (sizeof(skelAnimDataFileHeader_t) + sizeof(skelAnimFileFrame_t) * (pHeader->numFrames - 1) + sizeof(vec4_t) * pHeader->numChannels * i));
+        for (j = 0; j < pHeader->numChannels; j++) {
+            newFrame->pChannels[j][0] = LittleFloat(pChannels[j][0]);
+            newFrame->pChannels[j][1] = LittleFloat(pChannels[j][1]);
+            newFrame->pChannels[j][2] = LittleFloat(pChannels[j][2]);
+            newFrame->pChannels[j][3] = LittleFloat(pChannels[j][3]);
+        }
 
-	oldFrame = pGameFrame;
-	newFrame = enAnim->m_frame;
+        AddToBounds(newFrame->bounds, pFileFrame->bounds);
 
-	for( i = 0; i < pHeader->numFrames; i++ )
-	{
-		newFrame->bounds[ 0 ] = oldFrame->bounds[ 0 ];
-		newFrame->bounds[ 1 ] = oldFrame->bounds[ 1 ];
-		newFrame->radius = oldFrame->radius;
-		newFrame->delta = oldFrame->delta;
-		newFrame->angleDelta = oldFrame->angleDelta;
-		newFrame->pChannels = NULL;
-		AddToBounds( enAnim->bounds, oldFrame->bounds );
+        pFileFrame++;
+        newFrame++;
+    }
 
-		oldFrame++;
-		newFrame++;
-	}
+    enAnim                  = skelAnimDataGameHeader_t::AllocRLEChannelData(pHeader->numChannels);
+    enAnim->flags           = pHeader->flags;
+    enAnim->frameTime       = pHeader->frameTime;
+    enAnim->totalDelta      = pHeader->totalDelta;
+    enAnim->totalAngleDelta = pHeader->totalAngleDelta;
+    enAnim->numFrames       = pHeader->numFrames;
+    enAnim->nTotalChannels  = pHeader->numChannels;
+    ClearBounds(enAnim->bounds[0], enAnim->bounds[1]);
+    enAnim->m_frame = (skelAnimGameFrame_t *)Skel_Alloc(pHeader->numFrames * sizeof(skelAnimGameFrame_t));
 
-	enAnim->channelList.ZeroChannels();
+    oldFrame = pGameFrame;
+    newFrame = enAnim->m_frame;
 
-	pChannelNames = ( skelChannelName_t * )( ( char * )pHeader + pHeader->ofsChannelNames );
+    for (i = 0; i < pHeader->numFrames; i++) {
+        newFrame->bounds[0]  = oldFrame->bounds[0];
+        newFrame->bounds[1]  = oldFrame->bounds[1];
+        newFrame->radius     = oldFrame->radius;
+        newFrame->delta      = oldFrame->delta;
+        newFrame->angleDelta = oldFrame->angleDelta;
+        newFrame->pChannels  = NULL;
+        AddToBounds(enAnim->bounds, oldFrame->bounds);
 
-	for( i = 0; i < pHeader->numChannels; i++ )
-	{
-		channelIndex = m_channelNames.RegisterChannel( *pChannelNames );
-		enAnim->channelList.AddChannel( channelIndex );
-		pChannelNames++;
-	}
+        oldFrame++;
+        newFrame++;
+    }
 
-	enAnim->channelList.PackChannels();
-	EncodeFrames( enAnim, pGameFrame, qfalse, &enAnim->channelList, &m_channelNames );
+    enAnim->channelList.ZeroChannels();
 
-	if( enAnim->channelList.HasChannel( &m_channelNames, "Bip01 pos" ) && 
-		enAnim->channelList.HasChannel( &m_channelNames, "Bip01 R Foot pos" ) &&
-		enAnim->channelList.HasChannel( &m_channelNames, "Bip01 L Foot pos" ) )
-	{
-		enAnim->bHasDelta = true;
-	}
-	else
-	{
-		enAnim->bHasDelta = false;
-	}
+    pChannelNames = (skelChannelName_t *)((char *)pHeader + pHeader->ofsChannelNames);
 
-	if( enAnim->channelList.HasChannel( &m_channelNames, "Bip01 Spine rot" ) &&
-		enAnim->channelList.HasChannel( &m_channelNames, "Bip01 Spine1 rot" ) )
-	{
-		enAnim->bHasUpper = true;
-	}
-	else
-	{
-		enAnim->bHasUpper = false;
-	}
+    for (i = 0; i < pHeader->numChannels; i++) {
+        channelIndex = m_channelNames.RegisterChannel(*pChannelNames);
+        enAnim->channelList.AddChannel(channelIndex);
+        pChannelNames++;
+    }
 
-	if( enAnim->channelList.HasChannel( &m_channelNames, "VISEME_Bump" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Cage_" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Earth" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Fave" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_If" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_New" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Ox" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Roar" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Size" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Though" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Told" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "VISME_Wet" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "BROW_frown" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "BROW_R_lift" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "BROW_lift" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "BROW_worry" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYE_blink" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_Excited__" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_L_squint" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_narrow__" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_down" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_left" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_right" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_smile" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "EYES_up__" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "JAW_open-closed" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "JAW_open-open" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "LIPS_compressed" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_L_smile_closed" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_L_smile_open" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_L_snarl_closed_" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_L_snarl_open" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_grimace" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_smile_closed" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_smile_open" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_Snarl_closed" )
-		|| enAnim->channelList.HasChannel( &m_channelNames, "MOUTH_Snarl_open" ) )
-	{
-		enAnim->bHasMorph = true;
-	}
-	else
-	{
-		enAnim->bHasMorph = false;
-	}
+    enAnim->channelList.PackChannels();
+    EncodeFrames(enAnim, pGameFrame, qfalse, &enAnim->channelList, &m_channelNames);
 
-	for( i = 0; i < pHeader->numFrames; i++ )
-	{
-		if( pGameFrame[ i ].pChannels )
-			delete[] pGameFrame[ i ].pChannels;
-	}
+    if (enAnim->channelList.HasChannel(&m_channelNames, "Bip01 pos")
+        && enAnim->channelList.HasChannel(&m_channelNames, "Bip01 R Foot pos")
+        && enAnim->channelList.HasChannel(&m_channelNames, "Bip01 L Foot pos")) {
+        enAnim->bHasDelta = true;
+    } else {
+        enAnim->bHasDelta = false;
+    }
 
-	delete[] pGameFrame;
-	return enAnim;
+    if (enAnim->channelList.HasChannel(&m_channelNames, "Bip01 Spine rot")
+        && enAnim->channelList.HasChannel(&m_channelNames, "Bip01 Spine1 rot")) {
+        enAnim->bHasUpper = true;
+    } else {
+        enAnim->bHasUpper = false;
+    }
+
+    if (enAnim->channelList.HasChannel(&m_channelNames, "VISEME_Bump")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Cage_")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Earth")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Fave")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_If")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_New")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Ox")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Roar")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Size")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Though")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Told")
+        || enAnim->channelList.HasChannel(&m_channelNames, "VISME_Wet")
+        || enAnim->channelList.HasChannel(&m_channelNames, "BROW_frown")
+        || enAnim->channelList.HasChannel(&m_channelNames, "BROW_R_lift")
+        || enAnim->channelList.HasChannel(&m_channelNames, "BROW_lift")
+        || enAnim->channelList.HasChannel(&m_channelNames, "BROW_worry")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYE_blink")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_Excited__")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_L_squint")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_narrow__")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_down")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_left")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_right")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_smile")
+        || enAnim->channelList.HasChannel(&m_channelNames, "EYES_up__")
+        || enAnim->channelList.HasChannel(&m_channelNames, "JAW_open-closed")
+        || enAnim->channelList.HasChannel(&m_channelNames, "JAW_open-open")
+        || enAnim->channelList.HasChannel(&m_channelNames, "LIPS_compressed")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_L_smile_closed")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_L_smile_open")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_L_snarl_closed_")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_L_snarl_open")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_grimace")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_smile_closed")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_smile_open")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_Snarl_closed")
+        || enAnim->channelList.HasChannel(&m_channelNames, "MOUTH_Snarl_open")) {
+        enAnim->bHasMorph = true;
+    } else {
+        enAnim->bHasMorph = false;
+    }
+
+    for (i = 0; i < pHeader->numFrames; i++) {
+        if (pGameFrame[i].pChannels) {
+            delete[] pGameFrame[i].pChannels;
+        }
+    }
+
+    delete[] pGameFrame;
+    return enAnim;
 }
 
-void WriteEncodedFrames( msg_t *msg, skelAnimDataGameHeader_t *enAnim )
+void WriteEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
-	skanChannelHdr *pChannel;
-	skanGameFrame *pFrame;
-	int i, j;
+    skanChannelHdr *pChannel;
+    skanGameFrame  *pFrame;
+    int             i, j;
 
-	MSG_WriteLong( msg, enAnim->numFrames );
-	MSG_WriteShort( msg, enAnim->nTotalChannels );
+    MSG_WriteLong(msg, enAnim->numFrames);
+    MSG_WriteShort(msg, enAnim->nTotalChannels);
 
-	for( i = 0; i < enAnim->nTotalChannels; i++ )
-	{
-		pChannel = &enAnim->ary_channels[ i ];
-		MSG_WriteShort( msg, pChannel->nFramesInChannel );
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        pChannel = &enAnim->ary_channels[i];
+        MSG_WriteShort(msg, pChannel->nFramesInChannel);
 
-		for( j = 0; j < pChannel->nFramesInChannel; j++ )
-		{
-			pFrame = &pChannel->ary_frames[ i ];
-			MSG_WriteShort( msg, pFrame->nFrameNum );
-			MSG_WriteShort( msg, pFrame->nPrevFrameIndex );
-			MSG_WriteData( msg, pFrame->pChannelData, sizeof( vec4_t ) );
-		}
-	}
+        for (j = 0; j < pChannel->nFramesInChannel; j++) {
+            vec4_t channelData;
 
-	MSG_WriteLong( msg, enAnim->nBytesUsed );
+            pFrame = &pChannel->ary_frames[i];
+            MSG_WriteShort(msg, pFrame->nFrameNum);
+            MSG_WriteShort(msg, pFrame->nPrevFrameIndex);
+
+            channelData[0] = LittleFloat(pFrame->pChannelData[0]);
+            channelData[1] = LittleFloat(pFrame->pChannelData[1]);
+            channelData[2] = LittleFloat(pFrame->pChannelData[2]);
+            channelData[3] = LittleFloat(pFrame->pChannelData[3]);
+            MSG_WriteData(msg, channelData, sizeof(vec4_t));
+        }
+    }
+
+    MSG_WriteLong(msg, enAnim->nBytesUsed);
 }
 
-void skeletor_c::SaveProcessedAnim( skelAnimDataGameHeader_t *enAnim, const char *path, skelAnimDataFileHeader_t *pHeader )
+void skeletor_c::SaveProcessedAnim(
+    skelAnimDataGameHeader_t *enAnim, const char *path, skelAnimDataFileHeader_t *pHeader
+)
 {
-/*
+    /*
 	int i;
 	skelChannelName_t *pChannelNames;
 	msg_t msg;
@@ -339,228 +427,313 @@ void skeletor_c::SaveProcessedAnim( skelAnimDataGameHeader_t *enAnim, const char
 */
 }
 
-void ReadEncodedFrames( msg_t *msg, skelAnimDataGameHeader_t *enAnim )
+void ReadEncodedFrames(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
-	skanChannelHdr *pChannel;
-	skanGameFrame *pFrame;
-	int frameCnt;
-	int i, j;
+    skanChannelHdr *pChannel;
+    skanGameFrame  *pFrame;
+    size_t          frameSize;
+    int             frameCnt;
+    int             i, j;
+    channelType_t   channelType;
+    vec4_t          channelData;
 
-	enAnim->numFrames = MSG_ReadLong( msg );
-	enAnim->nTotalChannels = MSG_ReadShort( msg );
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        pChannel = &enAnim->ary_channels[i];
 
-	for( i = 0; i < enAnim->nTotalChannels; i++ )
-	{
-		pChannel = &enAnim->ary_channels[ i ];
-		frameCnt = MSG_ReadShort( msg );
+        channelType = GetBoneChannelType(enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i));
+        frameCnt    = MSG_ReadShort(msg);
 
-		pFrame = ( skanGameFrame * )Skel_Alloc( frameCnt * sizeof( skanGameFrame ) );
-		pChannel->ary_frames = pFrame;
-		pChannel->nFramesInChannel = frameCnt;
+        switch (channelType) {
+        case CHANNEL_ROTATION:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
 
-		for( j = 0; j < pChannel->nFramesInChannel; j++ )
-		{
-			pFrame = &pChannel->ary_frames[ j ];
-			pFrame->nFrameNum = MSG_ReadShort( msg );
-			pFrame->nPrevFrameIndex = MSG_ReadShort( msg );
-			MSG_ReadData( msg, pFrame->pChannelData, sizeof( vec4_t ) );
-		}
-	}
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
 
-	enAnim->nBytesUsed = MSG_ReadLong( msg );
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
+                pFrame->pChannelData[1] = LittleFloat(channelData[1]);
+                pFrame->pChannelData[2] = LittleFloat(channelData[2]);
+                pFrame->pChannelData[3] = LittleFloat(channelData[3]);
+            }
+            break;
+        case CHANNEL_POSITION:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
+                pFrame->pChannelData[1] = LittleFloat(channelData[1]);
+                pFrame->pChannelData[2] = LittleFloat(channelData[2]);
+            }
+            break;
+        case CHANNEL_NONE:
+            pChannel->ary_frames       = NULL;
+            pChannel->nFramesInChannel = 0;
+
+            for (j = 0; j < frameCnt; j++) {
+                MSG_ReadShort(msg);
+                MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+            }
+            break;
+        case CHANNEL_VALUE:
+        default:
+            frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float));
+
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < frameCnt; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                MSG_ReadData(msg, channelData, sizeof(vec4_t));
+
+                pFrame->pChannelData[0] = LittleFloat(channelData[0]);
+            }
+            break;
+        }
+    }
+
+    enAnim->nBytesUsed = MSG_ReadLong(msg);
 }
 
-void ReadEncodedFramesEx( msg_t *msg, skelAnimDataGameHeader_t *enAnim )
+void ReadEncodedFramesEx(msg_t *msg, skelAnimDataGameHeader_t *enAnim)
 {
-	skanChannelHdr *pChannel;
-	skanGameFrame *pFrame;
-	int frameCnt;
-	int i, j;
-	const char *name;
-	int type;
+    skanChannelHdr *pChannel;
+    skanGameFrame  *pFrame;
+    size_t          frameSize;
+    int             frameCnt;
+    int             i, j;
+    const char     *name;
+    channelType_t   type;
 
-	for( i = 0; i < enAnim->nTotalChannels; i++ )
-	{
-		pChannel = &enAnim->ary_channels[ i ];
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        pChannel = &enAnim->ary_channels[i];
 
-		name = enAnim->channelList.ChannelName( &skeletor_c::m_channelNames, i );
-		type = GetChannelTypeFromName( name );
-		frameCnt = MSG_ReadShort( msg );
+        name     = enAnim->channelList.ChannelName(&skeletor_c::m_channelNames, i);
+        type     = GetBoneChannelType(name);
+        frameCnt = MSG_ReadShort(msg);
 
-		pFrame = ( skanGameFrame * )Skel_Alloc( frameCnt * sizeof( skanGameFrame ) );
-		pChannel->ary_frames = pFrame;
-		pChannel->nFramesInChannel = frameCnt;
+        switch (type) {
+        //
+        // 4 channels (Quat)
+        //
+        case CHANNEL_ROTATION:
+            frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
 
-		if( type )
-		{
-			if( type == 1 )
-			{
-				for( j = 0; j < pChannel->nFramesInChannel; j++ )
-				{
-					pFrame = &pChannel->ary_frames[ j ];
-					pFrame->nFrameNum = MSG_ReadShort( msg );
-					pFrame->nPrevFrameIndex = MSG_ReadShort( msg );
-					pFrame->pChannelData[ 0 ] = MSG_ReadFloat( msg );
-					pFrame->pChannelData[ 1 ] = MSG_ReadFloat( msg );
-					pFrame->pChannelData[ 2 ] = MSG_ReadFloat( msg );
-					pFrame->pChannelData[ 3 ] = 0;
-				}
-			}
-			else if( type == 3 )
-			{
-				for( j = 0; j < pChannel->nFramesInChannel; j++ )
-				{
-					pFrame = &pChannel->ary_frames[ j ];
-					pFrame->nFrameNum = MSG_ReadShort( msg );
-					pFrame->nPrevFrameIndex = MSG_ReadShort( msg );
-					pFrame->pChannelData[ 0 ] = MSG_ReadFloat( msg );
-					pFrame->pChannelData[ 1 ] = 0;
-					pFrame->pChannelData[ 2 ] = 0;
-					pFrame->pChannelData[ 3 ] = 0;
-				}
-			}
-		}
-		else
-		{
-			for( j = 0; j < pChannel->nFramesInChannel; j++ )
-			{
-				pFrame = &pChannel->ary_frames[ j ];
-				pFrame->nFrameNum = MSG_ReadShort( msg );
-				pFrame->nPrevFrameIndex = MSG_ReadShort( msg );
-				pFrame->pChannelData[ 0 ] = MSG_ReadFloat( msg );
-				pFrame->pChannelData[ 1 ] = MSG_ReadFloat( msg );
-				pFrame->pChannelData[ 2 ] = MSG_ReadFloat( msg );
-				pFrame->pChannelData[ 3 ] = MSG_ReadFloat( msg );
-			}
-		}
-	}
+            for (j = 0; j < pChannel->nFramesInChannel; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                pFrame->pChannelData[0] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[1] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[2] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[3] = MSG_ReadFloat(msg);
+            }
+            break;
+        //
+        // 3 channels (Position)
+        //
+        case CHANNEL_POSITION:
+            frameSize                  = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
+            pFrame                     = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames       = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < pChannel->nFramesInChannel; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                pFrame->pChannelData[0] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[1] = MSG_ReadFloat(msg);
+                pFrame->pChannelData[2] = MSG_ReadFloat(msg);
+            }
+            break;
+        //
+        // 1 channel (frame)
+        //
+        case CHANNEL_VALUE:
+            frameSize            = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(float) * 1);
+            pFrame               = (skanGameFrame *)Skel_Alloc(frameSize * frameCnt);
+            pChannel->ary_frames = pFrame;
+            pChannel->nFramesInChannel = frameCnt;
+
+            for (j = 0; j < pChannel->nFramesInChannel; j++) {
+                pFrame                  = (skanGameFrame *)((byte *)pChannel->ary_frames + j * frameSize);
+                pFrame->nFrameNum       = MSG_ReadShort(msg);
+                pFrame->nPrevFrameIndex = MSG_ReadShort(msg);
+                pFrame->pChannelData[0] = MSG_ReadFloat(msg);
+            }
+            break;
+        case CHANNEL_NONE:
+            // Nothing to do
+            break;
+        }
+    }
 }
 
-skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim( const char *path, void *buffer, int len, const char *name )
+skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnim(const char *path, void *buffer, int len, const char *name)
 {
-	skelAnimDataGameHeader_t *enAnim;
-	int i;
-	msg_t msg;
-	int numChannels;
-	skelAnimGameFrame_t *newFrame;
+    skelAnimDataGameHeader_t *enAnim;
+    int                       i, j;
+    msg_t                     msg;
+    msg_t                     msgForAnim;
+    int                       numChannels;
+    skelAnimGameFrame_t      *newFrame;
 
-	MSG_Init( &msg, ( byte * )buffer, len );
-	msg.cursize = len;
-	MSG_BeginReading( &msg );
+    MSG_Init(&msg, (byte *)buffer, len);
+    msg.cursize = len;
+    MSG_BeginReading(&msg);
 
-	numChannels = MSG_ReadLong( &msg );
-	enAnim = skelAnimDataGameHeader_t::AllocRLEChannelData( numChannels );
-	enAnim->flags = MSG_ReadLong( &msg );
-	enAnim->frameTime = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 2 ] = MSG_ReadFloat( &msg );
-	enAnim->totalAngleDelta = MSG_ReadFloat( &msg );
-	enAnim->numFrames = MSG_ReadLong( &msg );
-	enAnim->nTotalChannels = MSG_ReadShort( &msg );
-	enAnim->bHasDelta = MSG_ReadByte( &msg ) != 0;
-	enAnim->bHasUpper = MSG_ReadByte( &msg ) != 0;
-	enAnim->bHasMorph = MSG_ReadByte( &msg ) != 0;
+    numChannels             = MSG_ReadLong(&msg);
+    enAnim                  = skelAnimDataGameHeader_t::AllocRLEChannelData(numChannels);
+    enAnim->flags           = MSG_ReadLong(&msg);
+    enAnim->frameTime       = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[0]   = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[1]   = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[2]   = MSG_ReadFloat(&msg);
+    enAnim->totalAngleDelta = MSG_ReadFloat(&msg);
+    enAnim->numFrames       = MSG_ReadLong(&msg);
+    enAnim->nTotalChannels  = MSG_ReadShort(&msg);
+    enAnim->bHasDelta       = MSG_ReadByte(&msg) != 0;
+    enAnim->bHasUpper       = MSG_ReadByte(&msg) != 0;
+    enAnim->bHasMorph       = MSG_ReadByte(&msg) != 0;
 
-	newFrame = ( skelAnimGameFrame_t * )Skel_Alloc( enAnim->numFrames * sizeof( skelAnimGameFrame_t ) );
-	enAnim->m_frame = newFrame;
+    newFrame        = (skelAnimGameFrame_t *)Skel_Alloc(enAnim->numFrames * sizeof(skelAnimGameFrame_t));
+    enAnim->m_frame = newFrame;
 
-	for( i = 0; i < enAnim->numFrames; i++ )
-	{
-		newFrame->bounds[ 0 ][ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 0 ][ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 0 ][ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->radius = MSG_ReadFloat( &msg );
-		newFrame->delta[ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->delta[ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->delta[ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->angleDelta = MSG_ReadFloat( &msg );
-		newFrame->pChannels = NULL;
-		newFrame++;
-	}
+    for (i = 0; i < enAnim->numFrames; i++) {
+        newFrame->bounds[0][0] = MSG_ReadFloat(&msg);
+        newFrame->bounds[0][1] = MSG_ReadFloat(&msg);
+        newFrame->bounds[0][2] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][0] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][1] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][2] = MSG_ReadFloat(&msg);
+        newFrame->radius       = MSG_ReadFloat(&msg);
+        newFrame->delta[0]     = MSG_ReadFloat(&msg);
+        newFrame->delta[1]     = MSG_ReadFloat(&msg);
+        newFrame->delta[2]     = MSG_ReadFloat(&msg);
+        newFrame->angleDelta   = MSG_ReadFloat(&msg);
+        newFrame->pChannels    = NULL;
+        newFrame++;
+    }
 
-	enAnim->bounds[ 0 ][ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 0 ][ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 0 ][ 2 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 2 ] = MSG_ReadFloat( &msg );
-	ReadEncodedFrames( &msg, enAnim );
-	numChannels = MSG_ReadLong( &msg );
-	enAnim->channelList.ZeroChannels();
+    enAnim->bounds[0][0] = MSG_ReadFloat(&msg);
+    enAnim->bounds[0][1] = MSG_ReadFloat(&msg);
+    enAnim->bounds[0][2] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][0] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][1] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][2] = MSG_ReadFloat(&msg);
 
-	for( i = 0; i < numChannels; i++ )
-	{
-		enAnim->channelList.AddChannel( m_channelNames.RegisterChannel( MSG_ReadString( &msg ) ) );
-	}
+    enAnim->numFrames      = MSG_ReadLong(&msg);
+    enAnim->nTotalChannels = MSG_ReadShort(&msg);
 
-	enAnim->channelList.PackChannels();
-	return enAnim;
+    msgForAnim = msg;
+
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        int    frameCnt = MSG_ReadShort(&msgForAnim);
+        vec4_t channelData;
+
+        for (j = 0; j < frameCnt; j++) {
+            MSG_ReadShort(&msgForAnim);
+            MSG_ReadShort(&msgForAnim);
+            MSG_ReadData(&msgForAnim, channelData, sizeof(vec4_t));
+        }
+    }
+
+    enAnim->nBytesUsed = MSG_ReadLong(&msgForAnim);
+
+    numChannels = MSG_ReadLong(&msgForAnim);
+    enAnim->channelList.ZeroChannels();
+
+    for (i = 0; i < numChannels; i++) {
+        const char *name = MSG_ReadString(&msgForAnim);
+
+        if (enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(name)) != i) {
+            Com_Printf("^~^~^ Animation '%s' has duplicate channel '%s'\n", path, name);
+        }
+    }
+
+    ReadEncodedFrames(&msg, enAnim);
+    return enAnim;
 }
 
-skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnimEx( const char *path, void *buffer, int len, const char *name )
+skelAnimDataGameHeader_t *skeletor_c::LoadProcessedAnimEx(const char *path, void *buffer, int len, const char *name)
 {
-	skelAnimDataGameHeader_t *enAnim;
-	int i;
-	msg_t msg;
-	int numChannels;
-	skelAnimGameFrame_t *newFrame;
+    skelAnimDataGameHeader_t *enAnim;
+    int                       i;
+    msg_t                     msg;
+    int                       numChannels;
+    skelAnimGameFrame_t      *newFrame;
 
-	MSG_Init( &msg, ( byte * )buffer, len );
-	msg.cursize = len;
-	MSG_BeginReading( &msg );
+    MSG_Init(&msg, (byte *)buffer, len);
+    msg.cursize = len;
+    MSG_BeginReading(&msg);
 
-	numChannels = MSG_ReadShort( &msg );
-	enAnim = skelAnimDataGameHeader_t::AllocRLEChannelData( numChannels );
-	enAnim->channelList.ZeroChannels();
-	enAnim->flags = MSG_ReadLong( &msg );
-	enAnim->frameTime = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->totalDelta[ 2 ] = MSG_ReadFloat( &msg );
-	enAnim->totalAngleDelta = MSG_ReadFloat( &msg );
-	enAnim->numFrames = MSG_ReadLong( &msg );
-	enAnim->bHasDelta = MSG_ReadByte( &msg ) != 0;
-	enAnim->bHasUpper = MSG_ReadByte( &msg ) != 0;
-	enAnim->bHasMorph = MSG_ReadByte( &msg ) != 0;
+    numChannels = MSG_ReadShort(&msg);
+    enAnim      = skelAnimDataGameHeader_t::AllocRLEChannelData(numChannels);
+    enAnim->channelList.ZeroChannels();
+    enAnim->flags           = MSG_ReadLong(&msg);
+    enAnim->frameTime       = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[0]   = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[1]   = MSG_ReadFloat(&msg);
+    enAnim->totalDelta[2]   = MSG_ReadFloat(&msg);
+    enAnim->totalAngleDelta = MSG_ReadFloat(&msg);
+    enAnim->numFrames       = MSG_ReadLong(&msg);
+    enAnim->bHasDelta       = MSG_ReadByte(&msg) != 0;
+    enAnim->bHasUpper       = MSG_ReadByte(&msg) != 0;
+    enAnim->bHasMorph       = MSG_ReadByte(&msg) != 0;
 
-	for( i = 0; i < enAnim->nTotalChannels; i++ )
-	{
-		enAnim->channelList.AddChannel( m_channelNames.RegisterChannel( MSG_ReadString( &msg ) ) );
-	}
+    for (i = 0; i < enAnim->nTotalChannels; i++) {
+        enAnim->channelList.AddChannel(m_channelNames.RegisterChannel(MSG_ReadString(&msg)));
+    }
 
-	enAnim->channelList.PackChannels();
+    newFrame        = (skelAnimGameFrame_t *)Skel_Alloc(enAnim->numFrames * sizeof(skelAnimGameFrame_t));
+    enAnim->m_frame = newFrame;
 
-	newFrame = ( skelAnimGameFrame_t * )Skel_Alloc( enAnim->numFrames * sizeof( skelAnimGameFrame_t ) );
-	enAnim->m_frame = newFrame;
+    for (i = 0; i < enAnim->numFrames; i++) {
+        newFrame->bounds[0][0] = MSG_ReadFloat(&msg);
+        newFrame->bounds[0][1] = MSG_ReadFloat(&msg);
+        newFrame->bounds[0][2] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][0] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][1] = MSG_ReadFloat(&msg);
+        newFrame->bounds[1][2] = MSG_ReadFloat(&msg);
+        newFrame->radius       = MSG_ReadFloat(&msg);
+        newFrame->delta[0]     = MSG_ReadFloat(&msg);
+        newFrame->delta[1]     = MSG_ReadFloat(&msg);
+        newFrame->delta[2]     = MSG_ReadFloat(&msg);
+        newFrame->angleDelta   = MSG_ReadFloat(&msg);
+        newFrame->pChannels    = NULL;
+        newFrame++;
+    }
 
-	for( i = 0; i < enAnim->numFrames; i++ )
-	{
-		newFrame->bounds[ 0 ][ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 0 ][ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 0 ][ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->bounds[ 1 ][ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->radius = MSG_ReadFloat( &msg );
-		newFrame->delta[ 0 ] = MSG_ReadFloat( &msg );
-		newFrame->delta[ 1 ] = MSG_ReadFloat( &msg );
-		newFrame->delta[ 2 ] = MSG_ReadFloat( &msg );
-		newFrame->angleDelta = MSG_ReadFloat( &msg );
-		newFrame->pChannels = NULL;
-		newFrame++;
-	}
+    enAnim->bounds[0][0] = MSG_ReadFloat(&msg);
+    enAnim->bounds[0][1] = MSG_ReadFloat(&msg);
+    enAnim->bounds[0][2] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][0] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][1] = MSG_ReadFloat(&msg);
+    enAnim->bounds[1][2] = MSG_ReadFloat(&msg);
+    ReadEncodedFramesEx(&msg, enAnim);
 
-	enAnim->bounds[ 0 ][ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 0 ][ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 0 ][ 2 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 0 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 1 ] = MSG_ReadFloat( &msg );
-	enAnim->bounds[ 1 ][ 2 ] = MSG_ReadFloat( &msg );
-	ReadEncodedFramesEx( &msg, enAnim );
-
-	return enAnim;
+    return enAnim;
 }
diff --git a/code/skeletor/skeletor_model_file_format.h b/code/skeletor/skeletor_model_file_format.h
index 0babad7b..b2bf54ed 100644
--- a/code/skeletor/skeletor_model_file_format.h
+++ b/code/skeletor/skeletor_model_file_format.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -27,72 +27,100 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 static const char *SKEL_BONENAME_WORLD = "worldbone";
 
 typedef enum boneType_e {
-	SKELBONE_ROTATION,
-	SKELBONE_POSROT,
-	SKELBONE_IKSHOULDER,
-	SKELBONE_IKELBOW,
-	SKELBONE_IKWRIST,
-	SKELBONE_HOSEROT,
-	SKELBONE_AVROT,
-	SKELBONE_ZERO,
-	SKELBONE_NUMBONETYPES,
-	SKELBONE_WORLD,
-	SKELBONE_HOSEROTBOTH,
-	SKELBONE_HOSEROTPARENT
+    SKELBONE_ROTATION,
+    SKELBONE_POSROT,
+    SKELBONE_IKSHOULDER,
+    SKELBONE_IKELBOW,
+    SKELBONE_IKWRIST,
+    SKELBONE_HOSEROT,
+    SKELBONE_AVROT,
+    SKELBONE_ZERO,
+    SKELBONE_NUMBONETYPES,
+    SKELBONE_WORLD,
+    SKELBONE_HOSEROTBOTH,
+    SKELBONE_HOSEROTPARENT
 } boneType_t;
 
 typedef enum {
-	HRTYPE_PLAIN,
-	HRTYPE_ROTATEPARENT180Y,
-	HRTYPE_ROTATEBOTH180Y
+    HRTYPE_PLAIN,
+    HRTYPE_ROTATEPARENT180Y,
+    HRTYPE_ROTATEBOTH180Y
 } hoseRotType_t;
 
 typedef struct boneFileData_s {
-	char name[ 32 ];
-	char parent[ 32 ];
-	boneType_t boneType;
-	int ofsBaseData;
-	int ofsChannelNames;
-	int ofsBoneNames;
-	int ofsEnd;
+    char       name[32];
+    char       parent[32];
+    boneType_t boneType;
+    int        ofsBaseData;
+    int        ofsChannelNames;
+    int        ofsBoneNames;
+    int        ofsEnd;
 } boneFileData_t;
 
 typedef struct skelHitBox_s {
-	int boneIndex;
+    int boneIndex;
 } skelHitBox_t;
 
 typedef struct {
-	int ident;
-	int version;
-	char name[ 64 ];
-	int numSurfaces;
-	int numBones;
-	int ofsBones;
-	int ofsSurfaces;
-	int ofsEnd;
-	int lodIndex[ 10 ];
-	int numBoxes;
-	int ofsBoxes;
-	int numMorphTargets;
-	int ofsMorphTargets;
+    int  ident;
+    int  version;
+    char name[64];
+    int  numSurfaces;
+    int  numBones;
+    int  ofsBones;
+    int  ofsSurfaces;
+    int  ofsEnd;
+    int  lodIndex[10];
+    int  numBoxes;
+    int  ofsBoxes;
+    int  numMorphTargets;
+    int  ofsMorphTargets;
 } skelBaseHeader_t;
 
 #if __cplusplus
 
-#include "SkelVec3.h"
-#include "SkelQuat.h"
+#    include "SkelVec3.h"
+#    include "SkelQuat.h"
 
 struct boneData_s;
 
-int CreateRotationBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneFileData_t *fileData );
-int CreatePosRotBoneFileData( char *newBoneName, char *newBoneParentName, boneFileData_t *fileData );
-void CreatePosRotBoneData( const char *newBoneName, const char *newBoneParentName, boneData_s *boneData );
-int CreateIKShoulderBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelQuat baseOrient, SkelVec3 basePos, boneData_s *boneData );
-int CreateIKElbowBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneData_s *boneData );
-int CreateIKWristBoneFileData( const char *newBoneName, const char *newBoneParentName, const char *shoulderBoneName, SkelVec3 basePos, boneFileData_t *fileData );
-int CreateHoseRotBoneFileData( char *newBoneName, char *newBoneParentName, char *targetBoneName, float bendRatio, float bendMax, float spinRatio,
-	hoseRotType_t hoseRotType, SkelVec3 basePos, boneFileData_t *fileData );
-int CreateAvRotBoneFileData( char *newBoneName, char *newBoneParentName, char *baseBoneName, char *targetBoneName, float rotRatio,
-	SkelVec3 basePos, boneFileData_t *fileData );
+int CreateRotationBoneFileData(
+    const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneFileData_t *fileData
+);
+int  CreatePosRotBoneFileData(char *newBoneName, char *newBoneParentName, boneFileData_t *fileData);
+void CreatePosRotBoneData(const char *newBoneName, const char *newBoneParentName, boneData_s *boneData);
+int  CreateIKShoulderBoneFileData(
+     const char *newBoneName, const char *newBoneParentName, SkelQuat baseOrient, SkelVec3 basePos, boneData_s *boneData
+ );
+int CreateIKElbowBoneFileData(
+    const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneData_s *boneData
+);
+int CreateIKWristBoneFileData(
+    const char     *newBoneName,
+    const char     *newBoneParentName,
+    const char     *shoulderBoneName,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+);
+int CreateHoseRotBoneFileData(
+    char           *newBoneName,
+    char           *newBoneParentName,
+    char           *targetBoneName,
+    float           bendRatio,
+    float           bendMax,
+    float           spinRatio,
+    hoseRotType_t   hoseRotType,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+);
+int CreateAvRotBoneFileData(
+    char           *newBoneName,
+    char           *newBoneParentName,
+    char           *baseBoneName,
+    char           *targetBoneName,
+    float           rotRatio,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+);
 
 #endif
diff --git a/code/skeletor/skeletor_model_files.cpp b/code/skeletor/skeletor_model_files.cpp
index e3659664..db5a359a 100644
--- a/code/skeletor/skeletor_model_files.cpp
+++ b/code/skeletor/skeletor_model_files.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,184 +26,197 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "skeletor.h"
 
-int CreateRotationBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneFileData_t *fileData )
+int CreateRotationBoneFileData(
+    const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneFileData_t *fileData
+)
 {
-	char *saveChannelName;
-	char *rotChannelName;
-	boneData_t *boneData;
+    char       *saveChannelName;
+    char       *rotChannelName;
+    boneData_t *boneData;
 
-	strncpy( fileData->name, newBoneName, sizeof( fileData->name ) );
-	strncpy( fileData->parent, newBoneParentName, sizeof( fileData->parent ) );
-	fileData->boneType = SKELBONE_ROTATION;
-	fileData->ofsBaseData = sizeof( boneFileData_t );
-	boneData = ( boneData_t * )( ( char * )fileData + fileData->ofsBaseData );
-	boneData->offset[ 0 ] = basePos[ 0 ];
-	boneData->offset[ 1 ] = basePos[ 1 ];
-	boneData->offset[ 2 ] = basePos[ 2 ];
-	boneData->length = 1.0f;
-	boneData->weight = 1.0f;
-	boneData->bendRatio = 1.0f;
-	fileData->ofsChannelNames = fileData->ofsBaseData + 24;
-	saveChannelName = ( char * )( ( char * )fileData + fileData->ofsChannelNames );
+    strncpy(fileData->name, newBoneName, sizeof(fileData->name));
+    strncpy(fileData->parent, newBoneParentName, sizeof(fileData->parent));
+    fileData->boneType        = SKELBONE_ROTATION;
+    fileData->ofsBaseData     = sizeof(boneFileData_t);
+    boneData                  = (boneData_t *)((char *)fileData + fileData->ofsBaseData);
+    boneData->offset[0]       = basePos[0];
+    boneData->offset[1]       = basePos[1];
+    boneData->offset[2]       = basePos[2];
+    boneData->length          = 1.0f;
+    boneData->weight          = 1.0f;
+    boneData->bendRatio       = 1.0f;
+    fileData->ofsChannelNames = fileData->ofsBaseData + 24;
+    saveChannelName           = (char *)((char *)fileData + fileData->ofsChannelNames);
 
-	rotChannelName = ( char * )Skel_Alloc( strlen( newBoneName ) + 5 );
-	ConvertToRotationName( newBoneName, rotChannelName );
-	strcpy( saveChannelName, rotChannelName );
-	fileData->ofsBoneNames = fileData->ofsChannelNames + ( int )strlen( rotChannelName ) + 1;
-	fileData->ofsEnd = fileData->ofsBoneNames;
-	return fileData->ofsEnd;
+    rotChannelName = (char *)Skel_Alloc(strlen(newBoneName) + 5);
+    ConvertToRotationName(newBoneName, rotChannelName);
+    strcpy(saveChannelName, rotChannelName);
+    fileData->ofsBoneNames = fileData->ofsChannelNames + (int)strlen(rotChannelName) + 1;
+    fileData->ofsEnd       = fileData->ofsBoneNames;
+    return fileData->ofsEnd;
 }
 
-int CreatePosRotBoneFileData( char *newBoneName, char *newBoneParentName, boneFileData_t *fileData )
+int CreatePosRotBoneFileData(char *newBoneName, char *newBoneParentName, boneFileData_t *fileData)
 {
-	int channelNamesLength;
-	char *saveChannelName;
-	char *rotChannelName;
-	char *posChannelName;
-	boneData_t *boneData;
+    int         channelNamesLength;
+    char       *saveChannelName;
+    char       *rotChannelName;
+    char       *posChannelName;
+    boneData_t *boneData;
 
-	strncpy( fileData->name, newBoneName, sizeof( fileData->name ) );
-	strncpy( fileData->parent, newBoneParentName, sizeof( fileData->parent ) );
-	fileData->boneType = SKELBONE_POSROT;
-	fileData->ofsBaseData = sizeof( boneFileData_t );
-	boneData = ( boneData_t * )( ( char * )fileData + fileData->ofsBaseData );
-	boneData->offset[ 0 ] = 1.0f;
-	boneData->offset[ 1 ] = 1.0f;
-	boneData->offset[ 2 ] = 1.0f;
-	fileData->ofsChannelNames = fileData->ofsBaseData + 12;
-	saveChannelName = ( char * )( ( char * )fileData + fileData->ofsChannelNames );
+    strncpy(fileData->name, newBoneName, sizeof(fileData->name));
+    strncpy(fileData->parent, newBoneParentName, sizeof(fileData->parent));
+    fileData->boneType        = SKELBONE_POSROT;
+    fileData->ofsBaseData     = sizeof(boneFileData_t);
+    boneData                  = (boneData_t *)((char *)fileData + fileData->ofsBaseData);
+    boneData->offset[0]       = 1.0f;
+    boneData->offset[1]       = 1.0f;
+    boneData->offset[2]       = 1.0f;
+    fileData->ofsChannelNames = fileData->ofsBaseData + 12;
+    saveChannelName           = (char *)((char *)fileData + fileData->ofsChannelNames);
 
-	rotChannelName = ( char * )Skel_Alloc( strlen( newBoneName ) + 5 );
-	ConvertToRotationName( newBoneName, rotChannelName );
-	strcpy( saveChannelName, rotChannelName );
-	Skel_Free( rotChannelName );
+    rotChannelName = (char *)Skel_Alloc(strlen(newBoneName) + 5);
+    ConvertToRotationName(newBoneName, rotChannelName);
+    strcpy(saveChannelName, rotChannelName);
+    Skel_Free(rotChannelName);
 
-	channelNamesLength = ( int )strlen( saveChannelName );
-	saveChannelName = ( char * )( ( char * )fileData + fileData->ofsChannelNames + channelNamesLength );
-	posChannelName = ( char * )Skel_Alloc( strlen( newBoneName ) + 5 );
-	ConvertToPositionName( newBoneName, posChannelName );
-	strcpy( saveChannelName, posChannelName );
-	Skel_Free( posChannelName );
+    channelNamesLength = (int)strlen(saveChannelName);
+    saveChannelName    = (char *)((char *)fileData + fileData->ofsChannelNames + channelNamesLength);
+    posChannelName     = (char *)Skel_Alloc(strlen(newBoneName) + 5);
+    ConvertToPositionName(newBoneName, posChannelName);
+    strcpy(saveChannelName, posChannelName);
+    Skel_Free(posChannelName);
 
-	channelNamesLength += ( int )strlen( saveChannelName );
+    channelNamesLength += (int)strlen(saveChannelName);
 
-	fileData->ofsBoneNames = fileData->ofsChannelNames + channelNamesLength + 2;
-	fileData->ofsEnd = fileData->ofsBoneNames;
-	return fileData->ofsEnd;
+    fileData->ofsBoneNames = fileData->ofsChannelNames + channelNamesLength + 2;
+    fileData->ofsEnd       = fileData->ofsBoneNames;
+    return fileData->ofsEnd;
 }
 
-void CreatePosRotBoneData( const char *newBoneName, const char *newBoneParentName, boneData_t *boneData )
+void CreatePosRotBoneData(const char *newBoneName, const char *newBoneParentName, boneData_t *boneData)
 {
-	char *rotChannelName;
-	char *posChannelName;
+    char *rotChannelName;
+    char *posChannelName;
 
-	boneData->channel = skeletor_c::m_boneNames.RegisterChannel( newBoneName );
+    boneData->channel = skeletor_c::m_boneNames.RegisterChannel(newBoneName);
 
-	if( !strcmp( newBoneParentName, "worldbone" ) )
-	{
-		boneData->parent = -1;
-	}
-	else
-	{
-		boneData->parent = skeletor_c::m_boneNames.RegisterChannel( newBoneParentName );
-		assert( boneData->parent >= 0 );
-	}
+    if (!strcmp(newBoneParentName, "worldbone")) {
+        boneData->parent = -1;
+    } else {
+        boneData->parent = skeletor_c::m_boneNames.RegisterChannel(newBoneParentName);
+        assert(boneData->parent >= 0);
+    }
 
-	boneData->boneType = SKELBONE_POSROT;
+    boneData->boneType = SKELBONE_POSROT;
 
-	rotChannelName = ( char * )Skel_Alloc( strlen( newBoneName ) + 5 );
-	ConvertToRotationName( newBoneName, rotChannelName );
-	boneData->channelIndex[ 0 ] = skeletor_c::m_channelNames.RegisterChannel( rotChannelName );
-	if( boneData->channelIndex[ 0 ] < 0 )
-	{
-		SKEL_Warning( "Channel named %s not added. (Bone will not work without it)\n", rotChannelName );
-		boneData->boneType = SKELBONE_ZERO;
-	}
-	Skel_Free( rotChannelName );
+    rotChannelName = (char *)Skel_Alloc(strlen(newBoneName) + 5);
+    ConvertToRotationName(newBoneName, rotChannelName);
+    boneData->channelIndex[0] = skeletor_c::m_channelNames.RegisterChannel(rotChannelName);
+    if (boneData->channelIndex[0] < 0) {
+        SKEL_Warning("Channel named %s not added. (Bone will not work without it)\n", rotChannelName);
+        boneData->boneType = SKELBONE_ZERO;
+    }
+    Skel_Free(rotChannelName);
 
-	posChannelName = ( char * )Skel_Alloc( strlen( newBoneName ) + 5 );
-	ConvertToPositionName( newBoneName, posChannelName );
-	boneData->channelIndex[ 1 ] = skeletor_c::m_channelNames.RegisterChannel( posChannelName );
-	if( boneData->channelIndex[ 1 ] < 0 )
-	{
-		SKEL_Warning( "Channel named %s not added. (Bone will not work without it)\n", posChannelName );
-		boneData->boneType = SKELBONE_ZERO;
-	}
-	Skel_Free( posChannelName );
+    posChannelName = (char *)Skel_Alloc(strlen(newBoneName) + 5);
+    ConvertToPositionName(newBoneName, posChannelName);
+    boneData->channelIndex[1] = skeletor_c::m_channelNames.RegisterChannel(posChannelName);
+    if (boneData->channelIndex[1] < 0) {
+        SKEL_Warning("Channel named %s not added. (Bone will not work without it)\n", posChannelName);
+        boneData->boneType = SKELBONE_ZERO;
+    }
+    Skel_Free(posChannelName);
 
-	boneData->numChannels = 2;
-	boneData->numRefs = 0;
+    boneData->numChannels = 2;
+    boneData->numRefs     = 0;
 }
 
-int CreateIKShoulderBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelQuat baseOrient, SkelVec3 basePos, boneData_t *boneData )
+int CreateIKShoulderBoneFileData(
+    const char *newBoneName, const char *newBoneParentName, SkelQuat baseOrient, SkelVec3 basePos, boneData_t *boneData
+)
 {
-	// FIXME: stub
-	return 0;
+    // FIXME: stub
+    return 0;
 }
 
-int CreateIKElbowBoneFileData( const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneData_t *boneData )
+int CreateIKElbowBoneFileData(
+    const char *newBoneName, const char *newBoneParentName, SkelVec3 basePos, boneData_t *boneData
+)
 {
-	// FIXME: stub
-	return 0;
+    // FIXME: stub
+    return 0;
 }
 
-int CreateIKWristBoneFileData( const char *newBoneName, const char *newBoneParentName, const char *shoulderBoneName, SkelVec3 basePos, boneFileData_t *fileData )
+int CreateIKWristBoneFileData(
+    const char     *newBoneName,
+    const char     *newBoneParentName,
+    const char     *shoulderBoneName,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+)
 {
-	// FIXME: stub
-	return 0;
+    // FIXME: stub
+    return 0;
 }
 
-int CreateHoseRotBoneFileData( char *newBoneName, char *newBoneParentName, char *targetBoneName, float bendRatio, float bendMax, float spinRatio,
-	hoseRotType_t hoseRotType, SkelVec3 basePos, boneFileData_t *fileData )
+int CreateHoseRotBoneFileData(
+    char           *newBoneName,
+    char           *newBoneParentName,
+    char           *targetBoneName,
+    float           bendRatio,
+    float           bendMax,
+    float           spinRatio,
+    hoseRotType_t   hoseRotType,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+)
 {
-	// FIXME: stub
-	return 0;
+    // FIXME: stub
+    return 0;
 }
 
-int CreateAvRotBoneFileData( char *newBoneName, char *newBoneParentName, char *baseBoneName, char *targetBoneName, float rotRatio,
-	SkelVec3 basePos, boneFileData_t *fileData )
+int CreateAvRotBoneFileData(
+    char           *newBoneName,
+    char           *newBoneParentName,
+    char           *baseBoneName,
+    char           *targetBoneName,
+    float           rotRatio,
+    SkelVec3        basePos,
+    boneFileData_t *fileData
+)
 {
-	// FIXME: stub
-	return 0;
+    // FIXME: stub
+    return 0;
 }
 
-void skeletor_c::LoadMorphTargetNames( skelHeaderGame_t *modelHeader )
+void skeletor_c::LoadMorphTargetNames(skelHeaderGame_t *modelHeader)
 {
-	int numTargets;
-	char *newTargetName;
-	int i;
-	int newChannel;
-	int morphTargetIndex;
+    int   numTargets;
+    char *newTargetName;
+    int   i;
+    int   newChannel;
+    int   morphTargetIndex;
 
-	numTargets = modelHeader->numMorphTargets;
-	newTargetName = modelHeader->pMorphTargets;
+    numTargets    = modelHeader->numMorphTargets;
+    newTargetName = modelHeader->pMorphTargets;
 
-	for( i = 0; i < numTargets; i++ )
-	{
-		newChannel = m_channelNames.RegisterChannel( newTargetName );
-		morphTargetIndex = m_morphTargetList.AddChannel( newChannel );
+    for (i = 0; i < numTargets; i++) {
+        newChannel       = m_channelNames.RegisterChannel(newTargetName);
+        morphTargetIndex = m_morphTargetList.AddChannel(newChannel);
 
-		if( !strncmp( newTargetName, "EYES_left", 9 ) )
-		{
-			m_targetLookLeft = morphTargetIndex;
-		}
-		else if( !strncmp( newTargetName, "EYES_right", 10 ) )
-		{
-			m_targetLookRight = morphTargetIndex;
-		}
-		else if( !strncmp( newTargetName, "EYES_up",70 ) )
-		{
-			m_targetLookUp = morphTargetIndex;
-		}
-		else if( !strncmp( newTargetName, "EYES_down", 9 ) )
-		{
-			m_targetLookDown = morphTargetIndex;
-		}
-		else if( !strncmp( newTargetName, "EYES_blink", 9 ) )
-		{
-			m_targetBlink = morphTargetIndex;
-		}
+        if (!strncmp(newTargetName, "EYES_left", 9)) {
+            m_targetLookLeft = morphTargetIndex;
+        } else if (!strncmp(newTargetName, "EYES_right", 10)) {
+            m_targetLookRight = morphTargetIndex;
+        } else if (!strncmp(newTargetName, "EYES_up", 7)) {
+            m_targetLookUp = morphTargetIndex;
+        } else if (!strncmp(newTargetName, "EYES_down", 9)) {
+            m_targetLookDown = morphTargetIndex;
+        } else if (!strncmp(newTargetName, "EYES_blink", 9)) {
+            m_targetBlink = morphTargetIndex;
+        }
 
-		newTargetName += strlen( newTargetName + 1 );
-	}
+        newTargetName += strlen(newTargetName) + 1;
+    }
 }
diff --git a/code/skeletor/skeletor_name_lists.h b/code/skeletor/skeletor_name_lists.h
index c19b3577..71d2fdd7 100644
--- a/code/skeletor/skeletor_name_lists.h
+++ b/code/skeletor/skeletor_name_lists.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -24,46 +24,54 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
-#define MAX_SKELETOR_CHANNELS 16384
+#define MAX_SKELETOR_CHANNELS 2560 // Limit was 2048 before 2.30
 #define MAX_CHANNEL_NAME      32
 
 typedef struct ChannelName_s {
-	char		name[ MAX_CHANNEL_NAME ];
-	short		channelNum;
+    char  name[MAX_CHANNEL_NAME];
+    short channelNum;
 } ChannelName_t;
 
 #ifdef __cplusplus
 
-class ChannelNameTable {
-	short int m_iNumChannels;
-	ChannelName_t m_Channels[MAX_SKELETOR_CHANNELS];
-	short int m_lookup[MAX_SKELETOR_CHANNELS];
+class ChannelNameTable
+{
+    short int     m_iNumChannels;
+    ChannelName_t m_Channels[MAX_SKELETOR_CHANNELS];
+    short int     m_lookup[MAX_SKELETOR_CHANNELS];
 
 public:
-	ChannelNameTable();
+    ChannelNameTable();
 
-	int				RegisterChannel( const char *name );
-	int				FindNameLookup( const char *name );
-	void			PrintContents();
-	const char		*FindName( int index );
-	int				NumChannels() const;
+    int         RegisterChannel(const char *name);
+    int         FindNameLookup(const char *name);
+    void        PrintContents();
+    const char *FindName(int index);
+    int         NumChannels() const;
 
 private:
-	const char		*FindNameFromLookup( int index );
-	bool			FindIndexFromName( const char *name, int *indexPtr );
-	void			SortIntoTable( int index );
-	void			CopyChannel( ChannelName_t *dest, const ChannelName_t *source );
-	void			SetChannelName( ChannelName_t *channel, const char *newName );
+    const char *FindNameFromLookup(int index);
+    bool        FindIndexFromName(const char *name, int *indexPtr);
+    void        SortIntoTable(int index);
+    void        CopyChannel(ChannelName_t *dest, const ChannelName_t *source);
+    void        SetChannelName(ChannelName_t *channel, const char *newName);
 };
 
-int GetChannelTypeFromName( const char *name );
+typedef enum channelType_e {
+    CHANNEL_ROTATION,
+    CHANNEL_POSITION,
+    CHANNEL_NONE,
+    CHANNEL_VALUE
+} channelType_t;
+
+channelType_t GetBoneChannelType(const char* name);
 
 #else
 
 typedef struct {
-	short int m_iNumChannels;
-	ChannelName_t m_Channels[MAX_SKELETOR_CHANNELS];
-	short int m_lookup[MAX_SKELETOR_CHANNELS];
+    short int     m_iNumChannels;
+    ChannelName_t m_Channels[MAX_SKELETOR_CHANNELS];
+    short int     m_lookup[MAX_SKELETOR_CHANNELS];
 } ChannelNameTable;
 
 #endif
diff --git a/code/skeletor/skeletor_utilities.cpp b/code/skeletor/skeletor_utilities.cpp
index 7a8876ad..173694cf 100644
--- a/code/skeletor/skeletor_utilities.cpp
+++ b/code/skeletor/skeletor_utilities.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,313 +25,300 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "q_shared.h"
 #include "skeletor.h"
 
-void SKEL_Message( const char *fmt, ... )
+void SKEL_Message(const char *fmt, ...)
 {
-	static char msg[ 32000 ];
-	va_list va;
+    static char msg[32000];
+    va_list     va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    Skel_DPrintf(msg);
 }
 
-void SKEL_Warning( const char *fmt, ... )
+void SKEL_Warning(const char *fmt, ...)
 {
-	char msg[ 1024 ];
-	va_list va;
+    char    msg[1024];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    Skel_DPrintf(msg);
 }
 
-void SKEL_Error( const char *fmt, ... )
+void SKEL_Error(const char *fmt, ...)
 {
-	char msg[ 1024 ];
-	va_list va;
+    char    msg[1024];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
-	Skel_DPrintf( msg );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
+    Skel_DPrintf(msg);
 }
 
-int FileLength( FILE *pFile )
+int FileLength(FILE *pFile)
 {
-	int iPos;
-	int iEnd;
+    int iPos;
+    int iEnd;
 
-	iPos = ftell( pFile );
-	fseek( pFile, 0, SEEK_END );
-	iEnd = ftell( pFile );
-	fseek( pFile, iPos, SEEK_SET );
+    iPos = ftell(pFile);
+    fseek(pFile, 0, SEEK_END);
+    iEnd = ftell(pFile);
+    fseek(pFile, iPos, SEEK_SET);
 
-	return iEnd;
+    return iEnd;
 }
 
-int skelChannelList_s::GetLocalFromGlobal( int globalChannel ) const
+
+int skelChannelList_s::GlobalChannel(int localchannel) const
 {
-	if( m_chanLocalFromGlobal && globalChannel < m_numLocalFromGlobal )
-	{
-		return m_chanLocalFromGlobal[ globalChannel ];
-	}
-	else
-	{
-		return -1;
-	}
+    assert(localchannel < MAX_GLOBAL_FROM_LOCAL);
+    return m_chanGlobalFromLocal[localchannel];
 }
 
-int skelChannelList_s::NumChannels( void ) const
+int skelChannelList_s::LocalChannel(int channel) const
 {
-	return m_numChannels;
+    return GetLocalFromGlobal(channel);
+}
+
+int skelChannelList_s::GetLocalFromGlobal(int globalChannel) const
+{
+    if (!m_chanLocalFromGlobal) {
+        return -1;
+    }
+
+    if (globalChannel >= m_numLocalFromGlobal) {
+        return -1;
+    }
+
+    return m_chanLocalFromGlobal[globalChannel];
+}
+
+
+void skelChannelList_s::SetLocalFromGlobal(int channel, int localchannel)
+{
+    m_chanLocalFromGlobal[channel] = localchannel;
+}
+
+int skelChannelList_s::NumChannels(void) const
+{
+    return m_numChannels;
 }
 
 void skelChannelList_s::ZeroChannels()
 {
-	int i;
+    int i;
 
-	m_numChannels = 0;
-	m_chanLocalFromGlobal = ( short * )Skel_Alloc( MAX_SKELETOR_CHANNELS * sizeof( short ) );
-	m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS;
+    m_numChannels         = 0;
+    m_chanLocalFromGlobal = (short *)Skel_Alloc(MAX_SKELETOR_CHANNELS * sizeof(short));
+    m_numLocalFromGlobal  = MAX_SKELETOR_CHANNELS;
 
-	for( i = 0; i < MAX_SKELETOR_CHANNELS; i++ )
-	{
-		m_chanLocalFromGlobal[ i ] = -1;
-	}
+    for (i = 0; i < MAX_SKELETOR_CHANNELS; i++) {
+        m_chanLocalFromGlobal[i] = -1;
+    }
 }
 
 void skelChannelList_s::PackChannels()
 {
-	m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1;
+    m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1;
+    for (m_numLocalFromGlobal = MAX_SKELETOR_CHANNELS - 1; m_numLocalFromGlobal >= 0; m_numLocalFromGlobal--) {
+        if (m_chanLocalFromGlobal[m_numLocalFromGlobal] != -1) {
+            break;
+        }
+    }
 
-	if( m_chanLocalFromGlobal[ m_numLocalFromGlobal ] == -1 )
-	{
-		do
-		{
-			m_numLocalFromGlobal--;
-		} while( m_chanLocalFromGlobal[ m_numLocalFromGlobal ] == -1 && m_numLocalFromGlobal >= 0 );
-	}
+    if (m_numLocalFromGlobal < MAX_SKELETOR_CHANNELS) {
+        m_numLocalFromGlobal++;
+    }
 
-	if( m_numLocalFromGlobal < MAX_SKELETOR_CHANNELS )
-	{
-		m_numLocalFromGlobal++;
-	}
+    if (m_numLocalFromGlobal > 0) {
+        short *old_array      = m_chanLocalFromGlobal;
+        int    i;
 
-	if( m_numLocalFromGlobal <= 0 )
-	{
-		Skel_Free( m_chanLocalFromGlobal );
-		m_chanLocalFromGlobal = NULL;
-		m_numLocalFromGlobal = -1;
-	}
-	else
-	{
-		short *old_array = m_chanLocalFromGlobal;
-		m_chanLocalFromGlobal = ( short * )Skel_Alloc( m_numLocalFromGlobal * sizeof( m_chanLocalFromGlobal[ 0 ] ) );
-		memcpy( m_chanLocalFromGlobal, old_array, m_numLocalFromGlobal * sizeof( m_chanLocalFromGlobal[ 0 ] ) );
-		Skel_Free( old_array );
-	}
+        m_chanLocalFromGlobal = (short *)Skel_Alloc(m_numLocalFromGlobal * sizeof(m_chanLocalFromGlobal[0]));
+
+        for (i = 0; i < m_numLocalFromGlobal; i++) {
+            m_chanLocalFromGlobal[i] = old_array[i];
+        }
+
+        Skel_Free(old_array);
+    } else {
+        Skel_Free(m_chanLocalFromGlobal);
+        m_chanLocalFromGlobal = NULL;
+        m_numLocalFromGlobal  = -1;
+    }
 }
 
 void skelChannelList_s::CleanUpChannels()
 {
-	if( m_chanLocalFromGlobal )
-	{
-		Skel_Free( m_chanLocalFromGlobal );
-		m_chanLocalFromGlobal = NULL;
-	}
+    if (m_chanLocalFromGlobal) {
+        Skel_Free(m_chanLocalFromGlobal);
+        m_chanLocalFromGlobal = NULL;
+    }
 
-	m_numLocalFromGlobal = 0;
+    m_numLocalFromGlobal = 0;
 }
 
 void skelChannelList_s::InitChannels()
 {
-	m_chanLocalFromGlobal = NULL;
-	m_numLocalFromGlobal = 0;
+    m_chanLocalFromGlobal = NULL;
+    m_numLocalFromGlobal  = 0;
 }
 
-int skelChannelList_s::AddChannel( int newGlobalChannelNum )
+int skelChannelList_s::AddChannel(int newGlobalChannelNum)
 {
-	short int iLocalChannel;
+    short int iLocalChannel;
 
-	if( newGlobalChannelNum == -1 )
-	{
-		// Fixed in 2.0
-		// Set the global from local to -1
-		m_chanGlobalFromLocal[m_numChannels] = -1;
-		return m_numChannels++;
-	}
+    if (newGlobalChannelNum == -1) {
+        // Fixed in 2.0
+        // Set the global from local to -1
+        m_chanGlobalFromLocal[m_numChannels] = -1;
+        return m_numChannels++;
+    }
 
-	iLocalChannel = GetLocalFromGlobal( newGlobalChannelNum );
+    iLocalChannel = GetLocalFromGlobal(newGlobalChannelNum);
 
-	if( iLocalChannel < 0 )
-	{
-		iLocalChannel = m_numChannels++;
-		m_chanGlobalFromLocal[ iLocalChannel ] = newGlobalChannelNum;
-		m_chanLocalFromGlobal[ newGlobalChannelNum ] = iLocalChannel;
-	}
+    if (iLocalChannel < 0) {
+        iLocalChannel = m_numChannels++;
 
-	return iLocalChannel;
+        m_chanGlobalFromLocal[iLocalChannel] = newGlobalChannelNum;
+        SetLocalFromGlobal(newGlobalChannelNum, iLocalChannel);
+    }
+
+    return iLocalChannel;
 }
 
-qboolean skelChannelList_s::HasChannel( ChannelNameTable *nameTable, const char *channelName ) const
+qboolean skelChannelList_s::HasChannel(ChannelNameTable *nameTable, const char *channelName) const
 {
-	short int iGlobalChannel = nameTable->FindNameLookup( channelName );
+    short int iGlobalChannel = nameTable->FindNameLookup(channelName);
 
-	if( iGlobalChannel >= 0 )
-	{
-		if( m_chanLocalFromGlobal && iGlobalChannel < m_numLocalFromGlobal )
-			return ( unsigned int )~m_chanLocalFromGlobal[ iGlobalChannel ] >> 31;
-		else
-			return qtrue;
-	}
-	else
-	{
-		return qfalse;
-	}
+    return iGlobalChannel >= 0 && LocalChannel(iGlobalChannel) >= 0;
 }
 
-
-const char *skelChannelList_s::ChannelName( ChannelNameTable *nameTable, int localChannelNum ) const
+const char *skelChannelList_s::ChannelName(ChannelNameTable *nameTable, int localChannelNum) const
 {
-	if( localChannelNum >= 0 && localChannelNum < m_numChannels )
-	{
-		return nameTable->FindName( m_chanGlobalFromLocal[ localChannelNum ] );
-	}
-	else
-	{
-		return NULL;
-	}
+    if (localChannelNum >= this->m_numChannels || localChannelNum < 0) {
+        return NULL;
+    }
+
+    if (m_chanGlobalFromLocal[localChannelNum] < 0) {
+        return 0;
+    }
+
+    return nameTable->FindName(m_chanGlobalFromLocal[localChannelNum]);
 }
 
-void Skel_ExtractFilePath( const char *path, char *dest )
+void Skel_ExtractFilePath(const char *path, char *dest)
 {
-	const char *src = path + strlen( path );
+    const char *src = path + strlen(path);
 
-	while( src != path )
-	{
-		if( *( src - 1 ) == '\\' )
-		{
-			break;
-		}
+    while (src != path) {
+        if (*(src - 1) == '\\') {
+            break;
+        }
 
-		if( *( src - 1 ) == '/' )
-		{
-			break;
-		}
+        if (*(src - 1) == '/') {
+            break;
+        }
 
-		src--;
-	}
+        src--;
+    }
 
-	memcpy( dest, src, src - path );
-	dest[ src - path ] = 0;
+    memcpy(dest, src, src - path);
+    dest[src - path] = 0;
 }
 
-void Skel_ExtractFileBase( const char *path, char *dest )
+void Skel_ExtractFileBase(const char *path, char *dest)
 {
-	const char *src = path + strlen( path );
-	const char *dot = src;
+    const char *src = path + strlen(path);
+    const char *dot = src;
 
-	while( src != path )
-	{
-		if( *( src - 1 ) == '\\' )
-		{
-			break;
-		}
+    while (src != path) {
+        if (*(src - 1) == '\\') {
+            break;
+        }
 
-		if( *( src - 1 ) == '/' )
-		{
-			break;
-		}
+        if (*(src - 1) == '/') {
+            break;
+        }
 
-		src--;
-	}
+        src--;
+    }
 
-	while( dot != src )
-	{
-		if( *( dot - 1 ) != '.' )
-		{
-			break;
-		}
+    while (dot != src) {
+        if (*(dot - 1) != '.') {
+            break;
+        }
 
-		dot--;
-	}
+        dot--;
+    }
 
-	if( dot == src )
-	{
-		*dest = 0;
-		return;
-	}
+    if (dot == src) {
+        *dest = 0;
+        return;
+    }
 
-	memcpy( dest, src, dot - src );
-	dest[ dot - src ] = 0;
+    memcpy(dest, src, dot - src);
+    dest[dot - src] = 0;
 }
 
-void Skel_ExtractFileExtension( const char *path, char *dest )
+void Skel_ExtractFileExtension(const char *path, char *dest)
 {
-	const char *src = path + strlen( path );
+    const char *src = path + strlen(path);
 
-	while( src != path )
-	{
-		if( *( src - 1 ) == '.' )
-		{
-			break;
-		}
+    while (src != path) {
+        if (*(src - 1) == '.') {
+            break;
+        }
 
-		src--;
-	}
+        src--;
+    }
 
-	if( src == path )
-	{
-		*dest = 0;
-		return;
-	}
+    if (src == path) {
+        *dest = 0;
+        return;
+    }
 
-	strcpy( dest, src );
+    strcpy(dest, src);
 }
 
-const char *Skel_ExtractFileExtension( const char *in )
+const char *Skel_ExtractFileExtension(const char *in)
 {
-	static char exten[ 8 ];
-	int i;
+    static char exten[8];
+    int         i;
 
-	for( i = 0; in[ i ] != 0; i++ )
-	{
-		if( in[ i ] == '.' )
-		{
-			i++;
-			break;
-		}
-	}
+    for (i = 0; in[i] != 0; i++) {
+        if (in[i] == '.') {
+            i++;
+            break;
+        }
+    }
 
-	if( !in[ i ] )
-	{
-		return "";
-	}
+    if (!in[i]) {
+        return "";
+    }
 
-	strncpy( exten, &in[ i ], sizeof( exten ) );
-	return exten;
+    strncpy(exten, &in[i], sizeof(exten));
+    return exten;
 }
 
-void Skel_ExtractFileName( const char *path, char *dest )
+void Skel_ExtractFileName(const char *path, char *dest)
 {
-	const char *src = path + strlen( path );
+    const char *src = path + strlen(path);
 
-	while( src != path )
-	{
-		if( *( src - 1 ) == '\\' )
-		{
-			break;
-		}
+    while (src != path) {
+        if (*(src - 1) == '\\') {
+            break;
+        }
 
-		if( *( src - 1 ) == '/' )
-		{
-			break;
-		}
+        if (*(src - 1) == '/') {
+            break;
+        }
 
-		src--;
-	}
+        src--;
+    }
 
-	strcpy( dest, src );
+    strcpy(dest, src);
 }
diff --git a/code/skeletor/skeletorbones.cpp b/code/skeletor/skeletorbones.cpp
index 8c2e17e9..a3b8d25d 100644
--- a/code/skeletor/skeletorbones.cpp
+++ b/code/skeletor/skeletorbones.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,1185 +26,1135 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "skeletor.h"
 
-char *skelBone_Names[ 8 ];
+char            *skelBone_Names[8];
 ChannelNameTable skeletor_c::m_channelNames;
 ChannelNameTable skeletor_c::m_boneNames;
-skelBone_World skeletor_c::m_worldBone;
+skelBone_World   skeletor_c::m_worldBone;
 
 skelBone_World::skelBone_World()
 {
-	m_isDirty = false;
+    m_isDirty = false;
 }
 
-void SkeletorLoadBoneFromBuffer( skelChannelList_c *boneList, boneData_t *boneData, skelBone_Base **bone )
+void SkeletorLoadBoneFromBuffer(skelChannelList_c *boneList, boneData_t *boneData, skelBone_Base **bone)
 {
-	int newBoneIndex;
-	const char *boneName;
-	int newBoneParent;
-	skelBone_Base *parentBone;
+    int            newBoneIndex;
+    const char    *boneName;
+    int            newBoneParent;
+    skelBone_Base *parentBone;
 
-	newBoneIndex = boneList->GetLocalFromGlobal( boneData->channel );
+    newBoneIndex = boneList->GetLocalFromGlobal(boneData->channel);
 
-	if( !bone[ newBoneIndex ] )
-	{
-		boneName = skeletor_c::m_boneNames.FindName( boneData->channel );
+    if (!bone[newBoneIndex]) {
+        boneName = skeletor_c::m_boneNames.FindName(boneData->channel);
 
-		if( boneData->parent < 0 )
-		{
-			newBoneParent = -1;
-		}
-		else
-		{
-			newBoneParent = boneList->GetLocalFromGlobal( boneData->parent );
-		}
+        if (boneData->parent < 0) {
+            newBoneParent = -1;
+        } else {
+            newBoneParent = boneList->GetLocalFromGlobal(boneData->parent);
+        }
 
-		switch( boneData->boneType )
-		{
-		case SKELBONE_ZERO:
-		{
-			skelBone_Zero *newBone = new skelBone_Zero;
-			bone[ newBoneIndex ] = newBone;
-			break;
-		}
-		case SKELBONE_ROTATION:
-		{
-			skelBone_Rotation *newBone = new skelBone_Rotation;
-			bone[ newBoneIndex ] = newBone;
-			newBone->SetChannels( boneData->channelIndex[ 0 ] );
-			break;
-		}
-		case SKELBONE_POSROT:
-		{
-			skelBone_PosRot *newBone;
+        switch (boneData->boneType) {
+        case SKELBONE_ZERO:
+            {
+                skelBone_Zero *newBone = new skelBone_Zero;
+                bone[newBoneIndex]     = newBone;
+                break;
+            }
+        case SKELBONE_ROTATION:
+            {
+                skelBone_Rotation *newBone = new skelBone_Rotation;
+                bone[newBoneIndex]         = newBone;
+                newBone->SetChannels(boneData->channelIndex[0]);
+                break;
+            }
+        case SKELBONE_POSROT:
+            {
+                skelBone_PosRot *newBone;
 
-			if( !strncmp( boneName, "Bip01", 5 ) )
-			{
-				newBone = new skelBone_Root;
-				bone[ newBoneIndex ] = newBone;
-			}
-			else
-			{
-				newBone = new skelBone_PosRot;
-				bone[ newBoneIndex ] = newBone;
-			}
+                if (!strncmp(boneName, "Bip01", 5)) {
+                    newBone            = new skelBone_Root;
+                    bone[newBoneIndex] = newBone;
+                } else {
+                    newBone            = new skelBone_PosRot;
+                    bone[newBoneIndex] = newBone;
+                }
 
-			newBone->SetChannels( boneData->channelIndex[ 0 ], boneData->channelIndex[ 1 ] );
-			break;
-		}
-		case SKELBONE_IKSHOULDER:
-		{
-			skelBone_IKshoulder *newBone = new skelBone_IKshoulder;
-			bone[ newBoneIndex ] = newBone;
-			break;
-		}
-		case SKELBONE_IKELBOW:
-		{
-			skelBone_IKelbow *newBone = new skelBone_IKelbow;
-			bone[ newBoneIndex ] = newBone;
-			newBone->SetBoneRefs( ( skelBone_IKshoulder * )bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ] );
-			break;
-		}
-		case SKELBONE_IKWRIST:
-		{
-			skelBone_IKwrist *newBone = new skelBone_IKwrist;
-			skelBone_IKshoulder *shoulder;
-			bone[ newBoneIndex ] = newBone;
-			shoulder = ( skelBone_IKshoulder * )bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ];
-			newBone->SetChannels( boneData->channelIndex[ 0 ], boneData->channelIndex[ 1 ] );
-			newBone->SetBoneRefs( shoulder );
-			shoulder->SetWristBone( newBone );
-			break;
-		}
-		case SKELBONE_AVROT:
-		{
-			skelBone_AvRot *newBone = new skelBone_AvRot;
-			skelBone_AvRot *ref1, *ref2;
-			bone[ newBoneIndex ] = newBone;
-			ref1 = ( skelBone_AvRot * )bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ];
-			ref2 = ( skelBone_AvRot * )bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 1 ] ) ];
-			newBone->SetBoneRefs( ref1, ref2 );
-			break;
-		}
-		case SKELBONE_HOSEROT:
-		{
-			skelBone_HoseRot *newBone = new skelBone_HoseRot;
-			bone[ newBoneIndex ] = newBone;
-			newBone->SetBoneRefs( bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ] );
-			break;
-		}
-		case SKELBONE_HOSEROTBOTH:
-		{
-			skelBone_HoseRotBoth *newBone = new skelBone_HoseRotBoth;
-			bone[ newBoneIndex ] = newBone;
-			newBone->SetBoneRefs( bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ] );
-			break;
-		}
-		case SKELBONE_HOSEROTPARENT:
-		{
-			skelBone_HoseRotParent *newBone = new skelBone_HoseRotParent;
-			bone[ newBoneIndex ] = newBone;
-			newBone->SetBoneRefs( bone[ boneList->GetLocalFromGlobal( boneData->refIndex[ 0 ] ) ] );
-			break;
-		}
-		default:
-			break;
-		}
+                newBone->SetChannels(boneData->channelIndex[0], boneData->channelIndex[1]);
+                break;
+            }
+        case SKELBONE_IKSHOULDER:
+            {
+                skelBone_IKshoulder *newBone = new skelBone_IKshoulder;
+                bone[newBoneIndex]           = newBone;
+                break;
+            }
+        case SKELBONE_IKELBOW:
+            {
+                skelBone_IKelbow *newBone = new skelBone_IKelbow;
+                bone[newBoneIndex]        = newBone;
+                newBone->SetBoneRefs((skelBone_IKshoulder *)bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])]);
+                break;
+            }
+        case SKELBONE_IKWRIST:
+            {
+                skelBone_IKwrist    *newBone = new skelBone_IKwrist;
+                skelBone_IKshoulder *shoulder;
+                bone[newBoneIndex] = newBone;
+                shoulder           = (skelBone_IKshoulder *)bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])];
+                newBone->SetChannels(boneData->channelIndex[0], boneData->channelIndex[1]);
+                newBone->SetBoneRefs(shoulder);
+                shoulder->SetWristBone(newBone);
+                break;
+            }
+        case SKELBONE_AVROT:
+            {
+                skelBone_AvRot *newBone = new skelBone_AvRot;
+                skelBone_AvRot *ref1, *ref2;
+                bone[newBoneIndex] = newBone;
+                ref1               = (skelBone_AvRot *)bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])];
+                ref2               = (skelBone_AvRot *)bone[boneList->GetLocalFromGlobal(boneData->refIndex[1])];
+                newBone->SetBoneRefs(ref1, ref2);
+                break;
+            }
+        case SKELBONE_HOSEROT:
+            {
+                skelBone_HoseRot *newBone = new skelBone_HoseRot;
+                bone[newBoneIndex]        = newBone;
+                newBone->SetBoneRefs(bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])]);
+                break;
+            }
+        case SKELBONE_HOSEROTBOTH:
+            {
+                skelBone_HoseRotBoth *newBone = new skelBone_HoseRotBoth;
+                bone[newBoneIndex]            = newBone;
+                newBone->SetBoneRefs(bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])]);
+                break;
+            }
+        case SKELBONE_HOSEROTPARENT:
+            {
+                skelBone_HoseRotParent *newBone = new skelBone_HoseRotParent;
+                bone[newBoneIndex]              = newBone;
+                newBone->SetBoneRefs(bone[boneList->GetLocalFromGlobal(boneData->refIndex[0])]);
+                break;
+            }
+        default:
+            break;
+        }
 
-		bone[ newBoneIndex ]->SetBaseValue( boneData );
+        bone[newBoneIndex]->SetBaseValue(boneData);
 
-		if( newBoneParent < 0 )
-		{
-			parentBone = &skeletor_c::m_worldBone;
-		}
-		else
-		{
-			parentBone = bone[ newBoneParent ];
-		}
+        if (newBoneParent < 0) {
+            parentBone = &skeletor_c::m_worldBone;
+        } else {
+            parentBone = bone[newBoneParent];
+        }
 
-		bone[ newBoneIndex ]->SetParent( parentBone );
-	}
+        bone[newBoneIndex]->SetParent(parentBone);
+    }
 }
 
-
-void SkeletorLoadBonesFromBuffer( skelChannelList_c *boneList, skelHeaderGame_t *buffer, skelBone_Base **bone )
+void SkeletorLoadBonesFromBuffer(skelChannelList_c *boneList, skelHeaderGame_t *buffer, skelBone_Base **bone)
 {
-	int boneNum;
+    int boneNum;
 
-	for( boneNum = 0; boneNum < buffer->numBones; boneNum++ )
-	{
-		SkeletorLoadBoneFromBuffer( boneList, &buffer->pBones[ boneNum ], bone );
-	}
+    for (boneNum = 0; boneNum < buffer->numBones; boneNum++) {
+        SkeletorLoadBoneFromBuffer(boneList, &buffer->pBones[boneNum], bone);
+    }
 }
 
-
-float *DecodeRLEValue( skanChannelHdr *channelFrames, int desiredFrameNum )
+float *DecodeRLEPosValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
-	skanGameFrame *foundFrame = channelFrames->ary_frames;
-	int i;
+    skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
+    int            i;
 
-	for( i = 0; i < channelFrames->nFramesInChannel; i++ )
-	{
-		if( foundFrame->nFrameNum >= desiredFrameNum )
-		{
-			break;
-		}
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec3_t));
 
-		foundFrame++;
-	}
+    for (i = 0; i < channelFrames->nFramesInChannel; i++) {
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
+            break;
+        }
 
-	if( foundFrame->nFrameNum > desiredFrameNum )
-	{
-		foundFrame = &channelFrames->ary_frames[ foundFrame->nPrevFrameIndex ];
-	}
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
+    }
 
-	return foundFrame->pChannelData;
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
+
+    return foundFrame->pChannelData;
 }
 
-SkelQuat skelAnimStoreFrameList_c::GetSlerpValue( int globalChannelNum ) const
+float *DecodeRLERotValue(skanChannelHdr *channelFrames, int desiredFrameNum)
 {
-	SkelQuat actionQuat, movementQuat;
-	SkelQuat outQuat;
-	float totalWeight;
-	SkelQuat *pIncomingQuat;
-	float incomingWeight;
-	int localChannelNum;
-	float channelActionWeight;
-	//float movementWeight;
-	int nTotal;
-	int i;
-	const skanBlendInfo *pFrame;
-	float t;
+    skanGameFrame *foundFrame = channelFrames->ary_frames;
+    size_t         frameSize;
+    int            i;
 
-	actionQuat.Set( 0, 0, 0, 0 );
-	movementQuat.Set( 0, 0, 0, 0 );
+    frameSize = (sizeof(skanGameFrame) - sizeof(skanGameFrame::pChannelData) + sizeof(vec4_t));
 
-	nTotal = 0;
-	totalWeight = 0.0;
+    for (i = 0; i < channelFrames->nFramesInChannel; i++) {
+        if (foundFrame->nFrameNum >= desiredFrameNum) {
+            break;
+        }
 
-	if( actionWeight > 0.001 )
-	{
-		for( i = 0; i < numActionFrames; i++ )
-		{
-			pFrame = &m_blendInfo[ i + 32 ];
+        foundFrame = (skanGameFrame *)((byte *)foundFrame + frameSize);
+    }
 
-			localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal( globalChannelNum );
-			if( localChannelNum >= 0 )
-			{
-				incomingWeight = pFrame->weight;
-				if( incomingWeight == 0.0 ) {
-					continue;
-				}
-				pIncomingQuat = ( SkelQuat * )DecodeRLEValue( &pFrame->pAnimationData->ary_channels[ localChannelNum ], pFrame->frame );
-				totalWeight += incomingWeight;
-				nTotal++;
+    if (foundFrame->nFrameNum > desiredFrameNum) {
+        foundFrame = (skanGameFrame *)((byte *)channelFrames->ary_frames + foundFrame->nPrevFrameIndex * frameSize);
+    }
 
-				if( DotProduct4( *pIncomingQuat, actionQuat ) >= 0.0 )
-				{
-					actionQuat.x += pIncomingQuat->x * incomingWeight;
-					actionQuat.y += pIncomingQuat->y * incomingWeight;
-					actionQuat.z += pIncomingQuat->z * incomingWeight;
-					actionQuat.w += pIncomingQuat->w * incomingWeight;
-				}
-				else
-				{
-					actionQuat.x -= pIncomingQuat->x * incomingWeight;
-					actionQuat.y -= pIncomingQuat->y * incomingWeight;
-					actionQuat.z -= pIncomingQuat->z * incomingWeight;
-					actionQuat.w -= pIncomingQuat->w * incomingWeight;
-				}
-			}
-		}
-	}
-
-	if( nTotal )
-	{
-		channelActionWeight = actionWeight;
-		if( nTotal > 1 ) {
-			t = 1.0 / actionQuat.Length();
-		} else {
-			t = 1.0 / totalWeight;
-		}
-
-		actionQuat.x = actionQuat.x * t;
-		actionQuat.y = actionQuat.y * t;
-		actionQuat.z = actionQuat.z * t;
-		actionQuat.w = actionQuat.w * t;
-	} else {
-		channelActionWeight = 0.0;
-	}
-
-	nTotal = 0;
-	totalWeight = 0.0;
-
-	if( channelActionWeight < 0.999 )
-	{
-		for( i = 0; i < numMovementFrames; i++ )
-		{
-			pFrame = &m_blendInfo[ i ];
-
-			localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal( globalChannelNum );
-			if( localChannelNum >= 0 )
-			{
-				incomingWeight = pFrame->weight;
-				if( incomingWeight == 0.0 ) {
-					continue;
-				}
-				pIncomingQuat = ( SkelQuat * )DecodeRLEValue( &pFrame->pAnimationData->ary_channels[ localChannelNum ], pFrame->frame );
-				totalWeight += incomingWeight;
-				nTotal++;
-
-				if( DotProduct4( *pIncomingQuat, movementQuat ) >= 0.0 )
-				{
-					movementQuat.x += pIncomingQuat->x * incomingWeight;
-					movementQuat.y += pIncomingQuat->y * incomingWeight;
-					movementQuat.z += pIncomingQuat->z * incomingWeight;
-					movementQuat.w += pIncomingQuat->w * incomingWeight;
-				}
-				else
-				{
-					movementQuat.x -= pIncomingQuat->x * incomingWeight;
-					movementQuat.y -= pIncomingQuat->y * incomingWeight;
-					movementQuat.z -= pIncomingQuat->z * incomingWeight;
-					movementQuat.w -= pIncomingQuat->w * incomingWeight;
-				}
-			}
-		}
-	}
-
-	if( nTotal )
-	{
-		if( nTotal > 1 ) {
-			t = 1.0 / movementQuat.Length();
-		} else {
-			t = 1.0 / totalWeight;
-		}
-
-		movementQuat.x = movementQuat.x * t;
-		movementQuat.y = movementQuat.y * t;
-		movementQuat.z = movementQuat.z * t;
-		movementQuat.w = movementQuat.w * t;
-	}
-	else {
-		movementQuat.w = 1.0;
-	}
-
-	if( channelActionWeight < 0.001 )
-	{
-		outQuat.x = movementQuat.x;
-		outQuat.y = movementQuat.y;
-		outQuat.z = movementQuat.z;
-		outQuat.w = movementQuat.w;
-		return outQuat;
-	}
-	else if( channelActionWeight >= 0.999 )
-	{
-		outQuat.x = actionQuat.x;
-		outQuat.y = actionQuat.y;
-		outQuat.z = actionQuat.z;
-		outQuat.w = actionQuat.w;
-		return outQuat;
-	}
-
-	t = 1.0 - channelActionWeight;
-
-	if( DotProduct4( actionQuat, movementQuat ) >= 0.0 )
-	{
-		outQuat.x = movementQuat.x * t + actionQuat.x * channelActionWeight;
-		outQuat.y = movementQuat.y * t + actionQuat.y * channelActionWeight;
-		outQuat.z = movementQuat.z * t + actionQuat.z * channelActionWeight;
-		outQuat.w = movementQuat.w * t + actionQuat.w * channelActionWeight;
-	}
-	else
-	{
-		outQuat.x = movementQuat.x * t - actionQuat.x * channelActionWeight;
-		outQuat.y = movementQuat.y * t - actionQuat.y * channelActionWeight;
-		outQuat.z = movementQuat.z * t - actionQuat.z * channelActionWeight;
-		outQuat.w = movementQuat.w * t - actionQuat.w * channelActionWeight;
-	}
-
-	t = 1.0 / outQuat.Length();
-	outQuat.x = outQuat.x * t;
-	outQuat.y = outQuat.y * t;
-	outQuat.z = outQuat.z * t;
-	outQuat.w = outQuat.w * t;
-
-	return outQuat;
+    return foundFrame->pChannelData;
 }
 
-void skelAnimStoreFrameList_c::GetLerpValue3( int globalChannelNum, SkelVec3 *outVec ) const
+SkelQuat skelAnimStoreFrameList_c::GetSlerpValue(int globalChannelNum) const
 {
-	float totalWeight;
-	SkelVec3 incomingVec;
-	float incomingWeight;
-	int localChannelNum;
-	vec3_t result;
-	float t;
-	float channelActionWeight;
-	int i;
-	const skanBlendInfo *pFrame;
+    SkelQuat  actionQuat, movementQuat;
+    SkelQuat  outQuat;
+    float     totalWeight;
+    SkelQuat *pIncomingQuat;
+    float     incomingWeight;
+    int       localChannelNum;
+    float     channelActionWeight;
+    //float movementWeight;
+    int                  nTotal;
+    int                  i;
+    const skanBlendInfo *pFrame;
+    float                t;
 
-	totalWeight = 0.0;
+    actionQuat.Set(0, 0, 0, 0);
+    movementQuat.Set(0, 0, 0, 0);
 
-	if( actionWeight > 0.001 )
-	{
-		VectorClear( result );
+    nTotal      = 0;
+    totalWeight = 0.0;
 
-		for( i = 0; i < numActionFrames; i++ )
-		{
-			pFrame = &m_blendInfo[ i + 32 ];
+    if (actionWeight > 0.001) {
+        for (i = 0; i < numActionFrames; i++) {
+            pFrame = &m_blendInfo[i + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
 
-			localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal( globalChannelNum );
-			if( localChannelNum >= 0 )
-			{
-				incomingWeight = pFrame->weight;
-				incomingVec = DecodeRLEValue( &pFrame->pAnimationData->ary_channels[ localChannelNum ], pFrame->frame );
-				totalWeight += incomingWeight;
-				result[ 0 ] += incomingVec[ 0 ] * incomingWeight;
-				result[ 1 ] += incomingVec[ 1 ] * incomingWeight;
-				result[ 2 ] += incomingVec[ 2 ] * incomingWeight;
-			}
-		}
-	}
+            localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
+            if (localChannelNum >= 0) {
+                incomingWeight = pFrame->weight;
+                if (incomingWeight == 0.0) {
+                    continue;
+                }
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
+                totalWeight += incomingWeight;
+                nTotal++;
 
-	if( totalWeight != 0.0 )
-	{
-		t = 1.0 / totalWeight;
-		VectorScale( result, t, *outVec );
-		channelActionWeight = actionWeight;
-	}
-	else
-	{
-		VectorClear( *outVec );
-		channelActionWeight = 0.0;
-	}
+                if (DotProduct4(*pIncomingQuat, actionQuat) >= 0.0) {
+                    actionQuat.x += pIncomingQuat->x * incomingWeight;
+                    actionQuat.y += pIncomingQuat->y * incomingWeight;
+                    actionQuat.z += pIncomingQuat->z * incomingWeight;
+                    actionQuat.w += pIncomingQuat->w * incomingWeight;
+                } else {
+                    actionQuat.x -= pIncomingQuat->x * incomingWeight;
+                    actionQuat.y -= pIncomingQuat->y * incomingWeight;
+                    actionQuat.z -= pIncomingQuat->z * incomingWeight;
+                    actionQuat.w -= pIncomingQuat->w * incomingWeight;
+                }
+            }
+        }
+    }
 
-	if( channelActionWeight >= 0.999 || !numMovementFrames ) {
-		return;
-	}
+    if (nTotal) {
+        channelActionWeight = actionWeight;
+        if (nTotal > 1) {
+            t = 1.0 / actionQuat.Length();
+        } else {
+            t = 1.0 / totalWeight;
+        }
 
-	totalWeight = 0.0;
-	VectorClear( result );
+        actionQuat.x = actionQuat.x * t;
+        actionQuat.y = actionQuat.y * t;
+        actionQuat.z = actionQuat.z * t;
+        actionQuat.w = actionQuat.w * t;
+    } else {
+        channelActionWeight = 0.0;
+    }
 
-	for( i = 0; i < numMovementFrames; i++ )
-	{
-		pFrame = &m_blendInfo[ i ];
+    nTotal      = 0;
+    totalWeight = 0.0;
 
-		localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal( globalChannelNum );
-		if( localChannelNum >= 0 )
-		{
-			incomingWeight = pFrame->weight;
-			incomingVec = DecodeRLEValue( &pFrame->pAnimationData->ary_channels[ localChannelNum ], pFrame->frame );
-			totalWeight += incomingWeight;
-			result[ 0 ] += incomingVec[ 0 ] * incomingWeight;
-			result[ 1 ] += incomingVec[ 1 ] * incomingWeight;
-			result[ 2 ] += incomingVec[ 2 ] * incomingWeight;
-		}
-	}
+    if (channelActionWeight < 0.999) {
+        for (i = 0; i < numMovementFrames; i++) {
+            pFrame = &m_blendInfo[i];
 
-	if( totalWeight != 0.0 )
-	{
-		t = 1.0 / totalWeight * ( 1.0 - channelActionWeight );
-		outVec->x = outVec->x * channelActionWeight + result[ 0 ] * t;
-		outVec->y = outVec->y * channelActionWeight + result[ 1 ] * t;
-		outVec->z = outVec->z * channelActionWeight + result[ 2 ] * t;
-	}
+            localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
+            if (localChannelNum >= 0) {
+                incomingWeight = pFrame->weight;
+                if (incomingWeight == 0.0) {
+                    continue;
+                }
+                pIncomingQuat = (SkelQuat *)DecodeRLERotValue(
+                    &pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame
+                );
+                totalWeight += incomingWeight;
+                nTotal++;
+
+                if (DotProduct4(*pIncomingQuat, movementQuat) >= 0.0) {
+                    movementQuat.x += pIncomingQuat->x * incomingWeight;
+                    movementQuat.y += pIncomingQuat->y * incomingWeight;
+                    movementQuat.z += pIncomingQuat->z * incomingWeight;
+                    movementQuat.w += pIncomingQuat->w * incomingWeight;
+                } else {
+                    movementQuat.x -= pIncomingQuat->x * incomingWeight;
+                    movementQuat.y -= pIncomingQuat->y * incomingWeight;
+                    movementQuat.z -= pIncomingQuat->z * incomingWeight;
+                    movementQuat.w -= pIncomingQuat->w * incomingWeight;
+                }
+            }
+        }
+    }
+
+    if (nTotal) {
+        if (nTotal > 1) {
+            t = 1.0 / movementQuat.Length();
+        } else {
+            t = 1.0 / totalWeight;
+        }
+
+        movementQuat.x = movementQuat.x * t;
+        movementQuat.y = movementQuat.y * t;
+        movementQuat.z = movementQuat.z * t;
+        movementQuat.w = movementQuat.w * t;
+    } else {
+        movementQuat.w = 1.0;
+    }
+
+    if (channelActionWeight < 0.001) {
+        outQuat.x = movementQuat.x;
+        outQuat.y = movementQuat.y;
+        outQuat.z = movementQuat.z;
+        outQuat.w = movementQuat.w;
+        return outQuat;
+    } else if (channelActionWeight >= 0.999) {
+        outQuat.x = actionQuat.x;
+        outQuat.y = actionQuat.y;
+        outQuat.z = actionQuat.z;
+        outQuat.w = actionQuat.w;
+        return outQuat;
+    }
+
+    t = 1.0 - channelActionWeight;
+
+    if (DotProduct4(actionQuat, movementQuat) >= 0.0) {
+        outQuat.x = movementQuat.x * t + actionQuat.x * channelActionWeight;
+        outQuat.y = movementQuat.y * t + actionQuat.y * channelActionWeight;
+        outQuat.z = movementQuat.z * t + actionQuat.z * channelActionWeight;
+        outQuat.w = movementQuat.w * t + actionQuat.w * channelActionWeight;
+    } else {
+        outQuat.x = movementQuat.x * t - actionQuat.x * channelActionWeight;
+        outQuat.y = movementQuat.y * t - actionQuat.y * channelActionWeight;
+        outQuat.z = movementQuat.z * t - actionQuat.z * channelActionWeight;
+        outQuat.w = movementQuat.w * t - actionQuat.w * channelActionWeight;
+    }
+
+    t         = 1.0 / outQuat.Length();
+    outQuat.x = outQuat.x * t;
+    outQuat.y = outQuat.y * t;
+    outQuat.z = outQuat.z * t;
+    outQuat.w = outQuat.w * t;
+
+    return outQuat;
+}
+
+void skelAnimStoreFrameList_c::GetLerpValue3(int globalChannelNum, SkelVec3 *outVec) const
+{
+    float                totalWeight;
+    SkelVec3             incomingVec;
+    float                incomingWeight;
+    int                  localChannelNum;
+    vec3_t               result;
+    float                t;
+    float                channelActionWeight;
+    int                  i;
+    const skanBlendInfo *pFrame;
+
+    totalWeight = 0.0;
+
+    if (actionWeight > 0.001) {
+        VectorClear(result);
+
+        for (i = 0; i < numActionFrames; i++) {
+            pFrame = &m_blendInfo[i + MAX_SKEL_BLEND_MOVEMENT_FRAMES];
+
+            localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
+            if (localChannelNum >= 0) {
+                incomingWeight = pFrame->weight;
+                incomingVec = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+                totalWeight += incomingWeight;
+                result[0] += incomingVec[0] * incomingWeight;
+                result[1] += incomingVec[1] * incomingWeight;
+                result[2] += incomingVec[2] * incomingWeight;
+            }
+        }
+    }
+
+    if (totalWeight != 0.0) {
+        t = 1.0 / totalWeight;
+        VectorScale(result, t, *outVec);
+        channelActionWeight = actionWeight;
+    } else {
+        VectorClear(*outVec);
+        channelActionWeight = 0.0;
+    }
+
+    if (channelActionWeight >= 0.999 || !numMovementFrames) {
+        return;
+    }
+
+    totalWeight = 0.0;
+    VectorClear(result);
+
+    for (i = 0; i < numMovementFrames; i++) {
+        pFrame = &m_blendInfo[i];
+
+        localChannelNum = pFrame->pAnimationData->channelList.GetLocalFromGlobal(globalChannelNum);
+        if (localChannelNum >= 0) {
+            incomingWeight = pFrame->weight;
+            incomingVec    = DecodeRLEPosValue(&pFrame->pAnimationData->ary_channels[localChannelNum], pFrame->frame);
+            totalWeight += incomingWeight;
+            result[0] += incomingVec[0] * incomingWeight;
+            result[1] += incomingVec[1] * incomingWeight;
+            result[2] += incomingVec[2] * incomingWeight;
+        }
+    }
+
+    if (totalWeight != 0.0) {
+        t         = 1.0 / totalWeight * (1.0 - channelActionWeight);
+        outVec->x = outVec->x * channelActionWeight + result[0] * t;
+        outVec->y = outVec->y * channelActionWeight + result[1] * t;
+        outVec->z = outVec->z * channelActionWeight + result[2] * t;
+    }
 }
 
 skelBone_Base::skelBone_Base()
 {
-	m_parent = NULL;
-	m_isDirty = true;
-	m_controller = NULL;
+    m_parent     = NULL;
+    m_isDirty    = true;
+    m_controller = NULL;
 }
 
-skelBone_Base::~skelBone_Base()
+skelBone_Base::~skelBone_Base() {}
+
+int skelBone_Base::GetNumChannels(boneType_t boneType)
 {
+    switch (boneType) {
+    case SKELBONE_ROTATION:
+        return 1;
+    case SKELBONE_POSROT:
+    case SKELBONE_IKWRIST:
+        return 2;
+    default:
+        return 0;
+    }
 }
 
-int skelBone_Base::GetNumChannels( boneType_t boneType )
+int skelBone_Base::GetNumBoneRefs(boneType_t boneType)
 {
-	switch( boneType )
-	{
-	case SKELBONE_ROTATION:
-		return 1;
-	case SKELBONE_POSROT:
-	case SKELBONE_IKWRIST:
-		return 2;
-	default:
-		return 0;
-	}
+    switch (boneType) {
+    case SKELBONE_AVROT:
+        return 2;
+    case SKELBONE_IKELBOW:
+    case SKELBONE_IKWRIST:
+    case SKELBONE_HOSEROT:
+    case SKELBONE_HOSEROTBOTH:
+    case SKELBONE_HOSEROTPARENT:
+        return 1;
+    default:
+        return 0;
+    }
 }
 
-int skelBone_Base::GetNumBoneRefs( boneType_t boneType )
+SkelMat4& skelBone_Base::GetTransform(const skelAnimStoreFrameList_c *frames)
 {
-	switch( boneType )
-	{
-	case SKELBONE_AVROT:
-		return 2;
-	case SKELBONE_IKELBOW:
-	case SKELBONE_IKWRIST:
-	case SKELBONE_HOSEROT:
-	case SKELBONE_HOSEROTBOTH:
-	case SKELBONE_HOSEROTPARENT:
-		return 1;
-	default:
-		return 0;
-	}
+    if (m_isDirty) {
+        return GetDirtyTransform(frames);
+    } else {
+        return m_cachedValue;
+    }
 }
 
-SkelMat4 &skelBone_Base::GetTransform( const skelAnimStoreFrameList_c *frames )
+void skelBone_Base::SetParent(skelBone_Base *parent)
 {
-	if( m_isDirty )
-	{
-		return GetDirtyTransform( frames );
-	}
-	else
-	{
-		return m_cachedValue;
-	}
+    m_parent = parent;
 }
 
-void skelBone_Base::SetParent( skelBone_Base *parent )
+void skelBone_Base::SetBaseValue(boneData_t *boneData) {}
+
+int skelBone_Base::GetChannelIndex(int num)
 {
-	m_parent = parent;
+    return 0;
 }
 
-void skelBone_Base::SetBaseValue( boneData_t *boneData )
+skelBone_Base *skelBone_Base::GetBoneRef(int num)
 {
-}
-
-int skelBone_Base::GetChannelIndex( int num )
-{
-	return 0;
-}
-
-skelBone_Base *skelBone_Base::GetBoneRef( int num )
-{
-	return NULL;
+    return NULL;
 }
 
 skelBone_Base *skelBone_Base::Parent() const
 {
-	return m_parent;
+    return m_parent;
 }
 
-SkelMat4 &skelBone_Zero::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_Zero::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	if( m_parent )
-	{
-		m_cachedValue = m_parent->GetTransform( frames );
-	}
+    if (m_parent) {
+        m_cachedValue = m_parent->GetTransform(frames);
+    }
 
-	m_isDirty = false;
-	return m_cachedValue;
+    m_isDirty = false;
+    return m_cachedValue;
 }
 
-void skelBone_Zero::SetBaseValue( boneData_t *boneData )
+void skelBone_Zero::SetBaseValue(boneData_t *boneData) {}
+
+int skelBone_Zero::GetChannelIndex(int num)
 {
+    return 0;
 }
 
-int skelBone_Zero::GetChannelIndex( int num )
+skelBone_Base *skelBone_Zero::GetBoneRef(int num)
 {
-	return 0;
+    return NULL;
 }
 
-skelBone_Base *skelBone_Zero::GetBoneRef( int num )
+SkelMat4& skelBone_Rotation::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	return NULL;
+    SkelMat4 incomingValue;
+    SkelQuat incomingQuat;
+
+    incomingQuat = frames->GetSlerpValue(m_quatChannel);
+    incomingQuat.GetMat4(incomingValue);
+    VectorCopy(m_baseValue, incomingValue[3]);
+
+    if (m_parent) {
+        m_cachedValue.Multiply(incomingValue, m_parent->GetTransform(frames));
+    } else {
+        m_cachedValue = incomingValue;
+    }
+
+    if (m_controller) {
+        SkelMat3 m;
+
+        incomingQuat.Set(m_controller);
+        incomingQuat.GetMat3(m);
+        m_cachedValue.RotateBy(m);
+    }
+
+    m_isDirty = false;
+
+    return m_cachedValue;
 }
 
-SkelMat4 &skelBone_Rotation::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+void skelBone_Rotation::SetChannels(int num)
 {
-	SkelMat4 incomingValue;
-	SkelQuat incomingQuat;
-
-	incomingQuat = frames->GetSlerpValue( m_quatChannel );
-	incomingQuat.GetMat4( incomingValue );
-	VectorCopy( m_baseValue, incomingValue[ 3 ] );
-
-	if( m_parent )
-	{
-		m_cachedValue.Multiply( incomingValue, m_parent->GetTransform( frames ) );
-	}
-	else
-	{
-		m_cachedValue = incomingValue;
-	}
-
-	if( m_controller )
-	{
-		SkelMat3 m;
-
-		incomingQuat.Set( m_controller );
-		incomingQuat.GetMat3( m );
-		m_cachedValue.RotateBy( m );
-	}
-
-	m_isDirty = false;
-
-	return m_cachedValue;
+    m_quatChannel = num;
 }
 
-
-void skelBone_Rotation::SetChannels( int num )
+void skelBone_Rotation::SetBaseValue(boneData_t *data)
 {
-	m_quatChannel = num;
+    m_baseValue = data->offset;
 }
 
-void skelBone_Rotation::SetBaseValue( boneData_t *data )
+int skelBone_Rotation::GetChannelIndex(int num)
 {
-	m_baseValue = data->offset;
+    return m_quatChannel;
 }
 
-int skelBone_Rotation::GetChannelIndex( int num )
+skelBone_Base *skelBone_Rotation::GetBoneRef(int bone)
 {
-	return m_quatChannel;
+    return 0;
 }
 
-skelBone_Base *skelBone_Rotation::GetBoneRef( int bone )
+SkelMat4& skelBone_PosRot::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	return 0;
+    SkelVec3 incomingOffset;
+    SkelMat4 incomingValue;
+    SkelQuat incomingQuat;
+
+    incomingQuat = frames->GetSlerpValue(m_quatChannel);
+    frames->GetLerpValue3(m_offsetChannel, &incomingOffset);
+    incomingQuat.GetMat4(incomingValue);
+    VectorCopy(incomingOffset, incomingValue[3]);
+
+    if (m_parent) {
+        m_cachedValue.Multiply(incomingValue, m_parent->GetTransform(frames));
+    } else {
+        m_cachedValue = incomingValue;
+    }
+
+    if (m_controller) {
+        SkelMat3 m;
+
+        incomingQuat.Set(m_controller);
+        incomingQuat.GetMat3(m);
+        m_cachedValue.RotateBy(m);
+    }
+
+    m_isDirty = false;
+
+    return m_cachedValue;
 }
 
-SkelMat4 &skelBone_PosRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+void skelBone_PosRot::SetChannels(int quatChannel, int offsetChannel)
 {
-	SkelVec3 incomingOffset;
-	SkelMat4 incomingValue;
-	SkelQuat incomingQuat;
-
-	incomingQuat = frames->GetSlerpValue( m_quatChannel );
-	frames->GetLerpValue3( m_offsetChannel, &incomingOffset );
-	incomingQuat.GetMat4( incomingValue );
-	VectorCopy( incomingOffset, incomingValue[ 3 ] );
-
-	if( m_parent )
-	{
-		m_cachedValue.Multiply( incomingValue, m_parent->GetTransform( frames ) );
-	}
-	else
-	{
-		m_cachedValue = incomingValue;
-	}
-
-	if( m_controller )
-	{
-		SkelMat3 m;
-
-		incomingQuat.Set( m_controller );
-		incomingQuat.GetMat3( m );
-		m_cachedValue.RotateBy( m );
-	}
-
-	m_isDirty = false;
-
-	return m_cachedValue;
+    m_quatChannel   = quatChannel;
+    m_offsetChannel = offsetChannel;
 }
 
-void skelBone_PosRot::SetChannels( int quatChannel, int offsetChannel )
+void skelBone_PosRot::SetBaseValue(boneData_t *boneData) {}
+
+int skelBone_PosRot::GetChannelIndex(int num)
 {
-	m_quatChannel = quatChannel;
-	m_offsetChannel = offsetChannel;
+    if (num) {
+        return m_quatChannel;
+    } else {
+        return m_offsetChannel;
+    }
 }
 
-void skelBone_PosRot::SetBaseValue( boneData_t *boneData )
+skelBone_Base *skelBone_PosRot::GetBoneRef(int num)
 {
+    return NULL;
 }
 
-int skelBone_PosRot::GetChannelIndex( int num )
+SkelMat4& skelBone_Root::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	if( num )
-	{
-		return m_quatChannel;
-	}
-	else
-	{
-		return m_offsetChannel;
-	}
-}
+    SkelVec3 incomingOffset;
+    SkelMat4 incomingValue;
+    SkelQuat incomingQuat;
 
-skelBone_Base *skelBone_PosRot::GetBoneRef( int num )
-{
-	return NULL;
-}
+    incomingQuat = frames->GetSlerpValue(m_quatChannel);
+    frames->GetLerpValue3(m_offsetChannel, &incomingOffset);
+    incomingQuat.GetMat4(incomingValue);
+    VectorCopy(incomingOffset, incomingValue[3]);
 
-SkelMat4 &skelBone_Root::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
-{
-	SkelVec3 incomingOffset;
-	SkelMat4 incomingValue;
-	SkelQuat incomingQuat;
+    if (m_parent) {
+        m_cachedValue.Multiply(incomingValue, m_parent->GetTransform(frames));
+    } else {
+        m_cachedValue = incomingValue;
+    }
 
-	incomingQuat = frames->GetSlerpValue( m_quatChannel );
-	frames->GetLerpValue3( m_offsetChannel, &incomingOffset );
-	incomingQuat.GetMat4( incomingValue );
-	VectorCopy( incomingOffset, incomingValue[ 3 ] );
+    if (m_controller) {
+        SkelMat3 m;
 
-	if( m_parent )
-	{
-		m_cachedValue.Multiply( incomingValue, m_parent->GetTransform( frames ) );
-	}
-	else
-	{
-		m_cachedValue = incomingValue;
-	}
+        incomingQuat.Set(m_controller);
+        incomingQuat.GetMat3(m);
+        m_cachedValue.RotateBy(m);
+    }
 
-	if( m_controller )
-	{
-		SkelMat3 m;
+    m_isDirty = false;
 
-		incomingQuat.Set( m_controller );
-		incomingQuat.GetMat3( m );
-		m_cachedValue.RotateBy( m );
-	}
-
-	m_isDirty = false;
-
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
 skelBone_IKshoulder::skelBone_IKshoulder()
 {
-	m_wrist = NULL;
+    m_wrist = NULL;
 }
 
-SkelMat4 &skelBone_IKshoulder::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_IKshoulder::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	SkelMat4 baseMatrix, targetMatrix;
-	float desiredLength;
-	SkelVec3 newBaseY;
-	SkelVec3 newBaseZ;
-	SkelVec3 cross;
-	float cosUpperAngle;
-	float sinUpperAngle;
-	float maxLength;
-	float length;
-	float cosA;
-	float sinA;
+    SkelMat4 baseMatrix, targetMatrix;
+    float    desiredLength;
+    SkelVec3 newBaseY;
+    SkelVec3 newBaseZ;
+    SkelVec3 cross;
+    float    cosUpperAngle;
+    float    sinUpperAngle;
+    float    maxLength;
+    float    length;
+    float    cosA;
+    float    sinA;
 
-	if( !m_wrist )
-	{
-		m_cachedValue.MakeIdentity();
-		return m_cachedValue;
-	}
+    if (!m_wrist) {
+        m_cachedValue.MakeIdentity();
+        return m_cachedValue;
+    }
 
-	if( m_parent )
-	{
-		baseMatrix = m_parent->GetTransform( frames );
-	}
+    if (m_parent) {
+        baseMatrix = m_parent->GetTransform(frames);
+    }
 
-	baseMatrix[ 3 ][ 0 ] += m_baseValue[ 0 ] * baseMatrix[ 0 ][ 0 ] + m_baseValue[ 1 ] * baseMatrix[ 1 ][ 0 ] + m_baseValue[ 2 ] * baseMatrix[ 2 ][ 0 ];
-	baseMatrix[ 3 ][ 1 ] += m_baseValue[ 0 ] * baseMatrix[ 0 ][ 1 ] + m_baseValue[ 1 ] * baseMatrix[ 1 ][ 1 ] + m_baseValue[ 2 ] * baseMatrix[ 2 ][ 1 ];
-	baseMatrix[ 3 ][ 2 ] += m_baseValue[ 0 ] * baseMatrix[ 0 ][ 2 ] + m_baseValue[ 1 ] * baseMatrix[ 1 ][ 2 ] + m_baseValue[ 2 ] * baseMatrix[ 2 ][ 2 ];
-	baseMatrix.InvertAxis( 0 );
-	baseMatrix.InvertAxis( 2 );
+    baseMatrix[3][0] +=
+        m_baseValue[0] * baseMatrix[0][0] + m_baseValue[1] * baseMatrix[1][0] + m_baseValue[2] * baseMatrix[2][0];
+    baseMatrix[3][1] +=
+        m_baseValue[0] * baseMatrix[0][1] + m_baseValue[1] * baseMatrix[1][1] + m_baseValue[2] * baseMatrix[2][1];
+    baseMatrix[3][2] +=
+        m_baseValue[0] * baseMatrix[0][2] + m_baseValue[1] * baseMatrix[1][2] + m_baseValue[2] * baseMatrix[2][2];
+    baseMatrix.InvertAxis(0);
+    baseMatrix.InvertAxis(2);
 
-	m_wristAngle = frames->GetSlerpValue( m_wrist->m_quatChannel );
-	m_wristAngle.GetMat4( targetMatrix );
+    m_wristAngle = frames->GetSlerpValue(m_wrist->m_quatChannel);
+    m_wristAngle.GetMat4(targetMatrix);
 
-	frames->GetLerpValue3( m_wrist->m_offsetChannel, &m_wristPos );
-	m_cachedValue = baseMatrix;
-	VectorCopy( m_wristPos, targetMatrix[ 3 ] );
-	VectorSubtract( targetMatrix[ 3 ], baseMatrix[ 3 ], m_cachedValue[ 0 ] );
+    frames->GetLerpValue3(m_wrist->m_offsetChannel, &m_wristPos);
+    m_cachedValue = baseMatrix;
+    VectorCopy(m_wristPos, targetMatrix[3]);
+    VectorSubtract(targetMatrix[3], baseMatrix[3], m_cachedValue[0]);
 
-	sinUpperAngle = VectorNormalize( m_cachedValue[ 0 ] );
+    sinUpperAngle = VectorNormalize(m_cachedValue[0]);
 
-	newBaseY = baseMatrix[ 2 ];
-	newBaseZ = m_cachedValue[ 0 ];
+    newBaseY = baseMatrix[2];
+    newBaseZ = m_cachedValue[0];
 
-	CrossProduct( newBaseY, newBaseZ, cross );
-	VectorCopy( cross, m_cachedValue[ 1 ] );
+    CrossProduct(newBaseY, newBaseZ, cross);
+    VectorCopy(cross, m_cachedValue[1]);
 
-	newBaseY = targetMatrix[ 2 ];
-	newBaseZ = m_cachedValue[ 0 ];
+    newBaseY = targetMatrix[2];
+    newBaseZ = m_cachedValue[0];
 
-	CrossProduct( newBaseY, newBaseZ, cross );
-	VectorAdd( m_cachedValue[ 1 ], cross, m_cachedValue[ 1 ] );
+    CrossProduct(newBaseY, newBaseZ, cross);
+    VectorAdd(m_cachedValue[1], cross, m_cachedValue[1]);
 
-	desiredLength = VectorNormalize( m_cachedValue[ 1 ] );
+    desiredLength = VectorNormalize(m_cachedValue[1]);
 
-	if( !desiredLength ) {
-		m_cachedValue[ 1 ][ 1 ] = 1.0;
-	}
+    if (!desiredLength) {
+        m_cachedValue[1][1] = 1.0;
+    }
 
-	newBaseY = m_cachedValue[ 0 ];
-	newBaseZ = m_cachedValue[ 1 ];
+    newBaseY = m_cachedValue[0];
+    newBaseZ = m_cachedValue[1];
 
-	CrossProduct( newBaseY, newBaseZ, cross );
-	VectorCopy( cross, m_cachedValue[ 2 ] );
+    CrossProduct(newBaseY, newBaseZ, cross);
+    VectorCopy(cross, m_cachedValue[2]);
 
-	cosUpperAngle = m_upperLength + m_lowerLength - 0.001;
+    cosUpperAngle = m_upperLength + m_lowerLength - 0.001;
 
-	if( sinUpperAngle > cosUpperAngle )
-	{
-		sinUpperAngle = cosUpperAngle;
+    if (sinUpperAngle > cosUpperAngle) {
+        sinUpperAngle = cosUpperAngle;
 
-		m_wristPos = m_cachedValue[ 3 ];
+        m_wristPos = m_cachedValue[3];
 
-		m_wristPos[ 0 ] += m_cachedValue[ 0 ][ 0 ] * cosUpperAngle;
-		m_wristPos[ 1 ] += m_cachedValue[ 0 ][ 1 ] * cosUpperAngle;
-		m_wristPos[ 2 ] += m_cachedValue[ 0 ][ 2 ] * cosUpperAngle;
-	}
+        m_wristPos[0] += m_cachedValue[0][0] * cosUpperAngle;
+        m_wristPos[1] += m_cachedValue[0][1] * cosUpperAngle;
+        m_wristPos[2] += m_cachedValue[0][2] * cosUpperAngle;
+    }
 
-	maxLength = ( sinUpperAngle * sinUpperAngle + m_upperLength * m_upperLength - m_lowerLength * m_lowerLength )
-		/ ( sinUpperAngle * m_upperLength + sinUpperAngle * m_upperLength );
+    maxLength = (sinUpperAngle * sinUpperAngle + m_upperLength * m_upperLength - m_lowerLength * m_lowerLength)
+              / (sinUpperAngle * m_upperLength + sinUpperAngle * m_upperLength);
 
-	if( maxLength > 1.0 ) {
-		maxLength = 1.0;
-	}
+    if (maxLength > 1.0) {
+        maxLength = 1.0;
+    }
 
-	m_cosElbowAngle = -( ( m_lowerLength * m_lowerLength + m_upperLength * m_upperLength - sinUpperAngle * sinUpperAngle ) /
-		( m_upperLength * m_lowerLength + m_upperLength * m_lowerLength ) );
+    m_cosElbowAngle =
+        -((m_lowerLength * m_lowerLength + m_upperLength * m_upperLength - sinUpperAngle * sinUpperAngle)
+          / (m_upperLength * m_lowerLength + m_upperLength * m_lowerLength));
 
-	length = -sqrt( 1.0 - maxLength * maxLength );
+    length = -sqrt(1.0 - maxLength * maxLength);
 
-	cosA = m_cachedValue[ 0 ][ 0 ];
-	sinA = m_cachedValue[ 1 ][ 0 ];
-	m_cachedValue[ 0 ][ 0 ] = cosA * maxLength - sinA * length;
-	m_cachedValue[ 1 ][ 0 ] = sinA * maxLength + cosA * length;
+    cosA                = m_cachedValue[0][0];
+    sinA                = m_cachedValue[1][0];
+    m_cachedValue[0][0] = cosA * maxLength - sinA * length;
+    m_cachedValue[1][0] = sinA * maxLength + cosA * length;
 
-	cosA = m_cachedValue[ 0 ][ 1 ];
-	sinA = m_cachedValue[ 1 ][ 1 ];
-	m_cachedValue[ 0 ][ 1 ] = cosA * maxLength - sinA * length;
-	m_cachedValue[ 1 ][ 1 ] = sinA * maxLength + cosA * length;
+    cosA                = m_cachedValue[0][1];
+    sinA                = m_cachedValue[1][1];
+    m_cachedValue[0][1] = cosA * maxLength - sinA * length;
+    m_cachedValue[1][1] = sinA * maxLength + cosA * length;
 
-	cosA = m_cachedValue[ 0 ][ 2 ];
-	sinA = m_cachedValue[ 1 ][ 2 ];
-	m_cachedValue[ 0 ][ 2 ] = cosA * maxLength - sinA * length;
-	m_cachedValue[ 1 ][ 2 ] = sinA * maxLength + cosA * length;
+    cosA                = m_cachedValue[0][2];
+    sinA                = m_cachedValue[1][2];
+    m_cachedValue[0][2] = cosA * maxLength - sinA * length;
+    m_cachedValue[1][2] = sinA * maxLength + cosA * length;
 
-	m_isDirty = false;
+    m_isDirty = false;
 
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
-void skelBone_IKshoulder::SetBaseValue( boneData_t *boneData )
+void skelBone_IKshoulder::SetBaseValue(boneData_t *boneData)
 {
-	m_baseValue = boneData->offset;
+    m_baseValue = boneData->offset;
 }
 
-int skelBone_IKshoulder::GetChannelIndex( int num )
+int skelBone_IKshoulder::GetChannelIndex(int num)
 {
-	return -1;
+    return -1;
 }
 
-skelBone_Base *skelBone_IKshoulder::GetBoneRef( int num )
+skelBone_Base *skelBone_IKshoulder::GetBoneRef(int num)
 {
-	return m_wrist;
+    return m_wrist;
 }
 
-void skelBone_IKshoulder::SetElbowValue( float elbowOffset )
+void skelBone_IKshoulder::SetElbowValue(float elbowOffset)
 {
-	m_upperLength = elbowOffset;
+    m_upperLength = elbowOffset;
 }
 
-void skelBone_IKshoulder::SetWristValue( float wristOffset )
+void skelBone_IKshoulder::SetWristValue(float wristOffset)
 {
-	m_lowerLength = wristOffset;
+    m_lowerLength = wristOffset;
 }
 
-void skelBone_IKshoulder::SetWristBone( skelBone_IKwrist *wrist )
+void skelBone_IKshoulder::SetWristBone(skelBone_IKwrist *wrist)
 {
-	this->m_wrist = wrist;
+    this->m_wrist = wrist;
 }
 
 float skelBone_IKshoulder::GetUpperLength()
 {
-	return m_upperLength;
+    return m_upperLength;
 }
 
 float skelBone_IKshoulder::GetLowerLength()
 {
-	return m_lowerLength;
+    return m_lowerLength;
 }
 
-SkelMat4 &skelBone_IKwrist::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_IKwrist::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	if( m_shoulder->m_isDirty ) {
-		m_shoulder->GetDirtyTransform( frames );
-	}
+    if (m_shoulder->m_isDirty) {
+        m_shoulder->GetDirtyTransform(frames);
+    }
 
-	m_shoulder->m_wristAngle.GetMat4( m_cachedValue );
-	VectorCopy( m_shoulder->m_wristPos, m_cachedValue[ 3 ] );
-	m_isDirty = false;
+    m_shoulder->m_wristAngle.GetMat4(m_cachedValue);
+    VectorCopy(m_shoulder->m_wristPos, m_cachedValue[3]);
+    m_isDirty = false;
 
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
-void skelBone_IKwrist::SetChannels( int quatChannel, int offsetChannel )
+void skelBone_IKwrist::SetChannels(int quatChannel, int offsetChannel)
 {
-	m_quatChannel = quatChannel;
-	m_offsetChannel = offsetChannel;
+    m_quatChannel   = quatChannel;
+    m_offsetChannel = offsetChannel;
 }
 
-void skelBone_IKwrist::SetBoneRefs( skelBone_IKshoulder *shoulder )
+void skelBone_IKwrist::SetBoneRefs(skelBone_IKshoulder *shoulder)
 {
-	m_shoulder = shoulder;
+    m_shoulder = shoulder;
 }
 
-void skelBone_IKwrist::SetBaseValue( boneData_t *boneData )
+void skelBone_IKwrist::SetBaseValue(boneData_t *boneData)
 {
-	m_shoulder->SetWristValue( boneData->length );
+    m_shoulder->SetWristValue(boneData->length);
 }
 
-int skelBone_IKwrist::GetChannelIndex( int num )
+int skelBone_IKwrist::GetChannelIndex(int num)
 {
-	return -1;
+    return -1;
 }
 
-skelBone_Base *skelBone_IKwrist::GetBoneRef( int num )
+skelBone_Base *skelBone_IKwrist::GetBoneRef(int num)
 {
-	return m_shoulder;
+    return m_shoulder;
 }
 
-SkelMat4 &skelBone_IKelbow::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_IKelbow::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	float fLength;
-	float cosA, sinA;
+    float fLength;
+    float cosA, sinA;
 
-	m_cachedValue = m_shoulder->GetTransform( frames );
+    m_cachedValue = m_shoulder->GetTransform(frames);
 
-	m_cachedValue[ 3 ][ 0 ] += m_cachedValue[ 0 ][ 0 ] * m_shoulder->m_upperLength;
-	m_cachedValue[ 3 ][ 1 ] += m_cachedValue[ 0 ][ 1 ] * m_shoulder->m_upperLength;
-	m_cachedValue[ 3 ][ 2 ] += m_cachedValue[ 0 ][ 2 ] * m_shoulder->m_upperLength;
+    m_cachedValue[3][0] += m_cachedValue[0][0] * m_shoulder->m_upperLength;
+    m_cachedValue[3][1] += m_cachedValue[0][1] * m_shoulder->m_upperLength;
+    m_cachedValue[3][2] += m_cachedValue[0][2] * m_shoulder->m_upperLength;
 
-	fLength = sqrt( 1.0 - m_shoulder->m_cosElbowAngle * m_shoulder->m_cosElbowAngle );
+    fLength = sqrt(1.0 - m_shoulder->m_cosElbowAngle * m_shoulder->m_cosElbowAngle);
 
-	cosA = m_cachedValue[ 0 ][ 0 ];
-	sinA = m_cachedValue[ 1 ][ 0 ];
-	m_cachedValue[ 0 ][ 0 ] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
-	m_cachedValue[ 1 ][ 0 ] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
+    cosA                = m_cachedValue[0][0];
+    sinA                = m_cachedValue[1][0];
+    m_cachedValue[0][0] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
+    m_cachedValue[1][0] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
 
-	cosA = m_cachedValue[ 0 ][ 1 ];
-	sinA = m_cachedValue[ 1 ][ 1 ];
-	m_cachedValue[ 0 ][ 1 ] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
-	m_cachedValue[ 1 ][ 1 ] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
+    cosA                = m_cachedValue[0][1];
+    sinA                = m_cachedValue[1][1];
+    m_cachedValue[0][1] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
+    m_cachedValue[1][1] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
 
-	cosA = m_cachedValue[ 0 ][ 2 ];
-	sinA = m_cachedValue[ 1 ][ 2 ];
-	m_cachedValue[ 0 ][ 2 ] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
-	m_cachedValue[ 1 ][ 2 ] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
+    cosA                = m_cachedValue[0][2];
+    sinA                = m_cachedValue[1][2];
+    m_cachedValue[0][2] = cosA * m_shoulder->m_cosElbowAngle - sinA * fLength;
+    m_cachedValue[1][2] = sinA * m_shoulder->m_cosElbowAngle + cosA * fLength;
 
-	m_isDirty = false;
+    m_isDirty = false;
 
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
-void skelBone_IKelbow::SetBoneRefs( skelBone_IKshoulder *shoulder )
+void skelBone_IKelbow::SetBoneRefs(skelBone_IKshoulder *shoulder)
 {
-	m_shoulder = shoulder;
+    m_shoulder = shoulder;
 }
 
-void skelBone_IKelbow::SetBaseValue( boneData_t *boneData )
+void skelBone_IKelbow::SetBaseValue(boneData_t *boneData)
 {
-	m_shoulder->SetElbowValue( boneData->length );
+    m_shoulder->SetElbowValue(boneData->length);
 }
 
-int skelBone_IKelbow::GetChannelIndex( int num )
+int skelBone_IKelbow::GetChannelIndex(int num)
 {
-	return -1;
+    return -1;
 }
 
-skelBone_Base *skelBone_IKelbow::GetBoneRef( int num )
+skelBone_Base *skelBone_IKelbow::GetBoneRef(int num)
 {
-	return m_shoulder;
+    return m_shoulder;
 }
 
 skelBone_AvRot::skelBone_AvRot()
 {
-	m_reference1 = NULL;
-	m_reference2 = NULL;
+    m_reference1 = NULL;
+    m_reference2 = NULL;
 }
 
-SkelMat4 &skelBone_AvRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_AvRot::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	SkelQuat temp1, temp2;
-	SkelMat4 temp;
+    SkelQuat temp1, temp2;
+    SkelMat4 temp;
 
-	temp1 = m_reference1->GetTransform( frames );
-	temp2 = m_reference2->GetTransform( frames );
+    temp1 = m_reference1->GetTransform(frames);
+    temp2 = m_reference2->GetTransform(frames);
 
-	// lerp values
-	Slerp( temp1, temp2, m_bone2weight, &m_cachedQuat );
+    // lerp values
+    Slerp(temp1, temp2, m_bone2weight, &m_cachedQuat);
 
-	VectorCopy( m_basePos, m_cachedValue[ 3 ] );
+    VectorCopy(m_basePos, m_cachedValue[3]);
 
-	if( m_parent )
-	{
-		temp.Multiply( m_cachedValue, m_parent->GetTransform( frames ) );
-		m_cachedValue = temp;
-	}
+    if (m_parent) {
+        temp.Multiply(m_cachedValue, m_parent->GetTransform(frames));
+        m_cachedValue = temp;
+    }
 
-	m_cachedQuat.GetMat4( m_cachedValue );
+    m_cachedQuat.GetMat4(m_cachedValue);
 
-	m_isDirty = false;
+    m_isDirty = false;
 
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
-void skelBone_AvRot::SetBoneRefs( skelBone_Base *ref1, skelBone_Base *ref2 )
+void skelBone_AvRot::SetBoneRefs(skelBone_Base *ref1, skelBone_Base *ref2)
 {
-	m_reference1 = ref1;
-	m_reference2 = ref2;
+    m_reference1 = ref1;
+    m_reference2 = ref2;
 }
 
-void skelBone_AvRot::SetBaseValue( boneData_t *boneData )
+void skelBone_AvRot::SetBaseValue(boneData_t *boneData)
 {
-	m_basePos = boneData->offset;
-	m_bone2weight = boneData->weight;
+    m_basePos     = boneData->offset;
+    m_bone2weight = boneData->weight;
 }
 
-int skelBone_AvRot::GetChannelIndex( int num )
+int skelBone_AvRot::GetChannelIndex(int num)
 {
-	return -1;
+    return -1;
 }
 
-skelBone_Base *skelBone_AvRot::GetBoneRef( int num )
+skelBone_Base *skelBone_AvRot::GetBoneRef(int num)
 {
-	if( num )
-	{
-		return m_reference2;
-	}
-	else
-	{
-		return m_reference1;
-	}
+    if (num) {
+        return m_reference2;
+    } else {
+        return m_reference1;
+    }
 }
 
-SkelMat4 &skelBone_HoseRot::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_HoseRot::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	SkelMat4 mat;
+    SkelMat4 mat;
 
-	if( m_parent )
-	{
-		mat = m_parent->GetTransform( frames );
-	}
+    if (m_parent) {
+        mat = m_parent->GetTransform(frames);
+    }
 
-	return GetDirtyTransform( mat, m_target->GetTransform( frames ) );
+    return GetDirtyTransform(mat, m_target->GetTransform(frames));
 }
 
-SkelMat4 &skelBone_HoseRot::GetDirtyTransform( SkelMat4& myParentTM, SkelMat4& targetTM )
+SkelMat4& skelBone_HoseRot::GetDirtyTransform(SkelMat4& myParentTM, SkelMat4& targetTM)
 {
-	SkelMat4 m;
-	SkelMat4 invParentTM;
-	SkelMat4 temp;
-	SkelVec3 rotaxis;
-	SkelVec3 targetup, targetaim;
-	SkelVec3 upaxis, aimaxis;
-	SkelVec3 tmp;
-	SkelQuat targetQuat;
-	float l, s, c;
-	float angle, vScale;
+    SkelMat4 m;
+    SkelMat4 invParentTM;
+    SkelMat4 temp;
+    SkelVec3 rotaxis;
+    SkelVec3 targetup, targetaim;
+    SkelVec3 upaxis, aimaxis;
+    SkelVec3 tmp;
+    SkelQuat targetQuat;
+    float    l, s, c;
+    float    angle, vScale;
 
-	aimaxis = myParentTM[ 0 ];
-	targetaim = targetTM[ 0 ];
+    aimaxis   = myParentTM[0];
+    targetaim = targetTM[0];
 
-	CrossProduct( targetaim, aimaxis, rotaxis );
+    CrossProduct(targetaim, aimaxis, rotaxis);
 
-	s = VectorLengthSquared( rotaxis );
+    s = VectorLengthSquared(rotaxis);
 
-	if( s == 0.0 ) {
-		rotaxis.x = 1.0;
-	} else if( s != 1.0 ) {
-		l = 1.0 / sqrt( s );
-		VectorScale( rotaxis, l, rotaxis );
-	}
+    if (s == 0.0) {
+        rotaxis.x = 1.0;
+    } else if (s != 1.0) {
+        l = 1.0 / sqrt(s);
+        VectorScale(rotaxis, l, rotaxis);
+    }
 
-	s = DotProduct( aimaxis, targetaim );
-	if( s < 1.0 ) {
-		if( s > -0.999 ) {
-			angle = acos( s );
-		} else {
-			angle = 6.2831855f;
-		}
-	} else {
-		angle = 0.0;
-	}
+    s = DotProduct(aimaxis, targetaim);
+    if (s < 1.0) {
+        if (s > -0.999) {
+            angle = acos(s);
+        } else {
+            angle = 6.2831855f;
+        }
+    } else {
+        angle = 0.0;
+    }
 
-	vScale = angle * m_bendRatio;
-	if( vScale > m_bendMax ) {
-		vScale = m_bendMax;
-	}
+    vScale = angle * m_bendRatio;
+    if (vScale > m_bendMax) {
+        vScale = m_bendMax;
+    }
 
-	temp[ 0 ][ 0 ] = myParentTM[ 0 ][ 0 ];
-	temp[ 0 ][ 1 ] = myParentTM[ 1 ][ 0 ];
-	temp[ 0 ][ 2 ] = myParentTM[ 2 ][ 0 ];
-	temp[ 1 ][ 0 ] = myParentTM[ 0 ][ 1 ];
-	temp[ 1 ][ 1 ] = myParentTM[ 1 ][ 1 ];
-	temp[ 1 ][ 2 ] = myParentTM[ 2 ][ 1 ];
-	temp[ 2 ][ 0 ] = myParentTM[ 0 ][ 2 ];
-	temp[ 2 ][ 1 ] = myParentTM[ 1 ][ 2 ];
-	temp[ 2 ][ 2 ] = myParentTM[ 2 ][ 2 ];
-	temp[ 3 ][ 0 ] = -( myParentTM[ 0 ][ 0 ] * myParentTM[ 3 ][ 0 ] + myParentTM[ 0 ][ 1 ] * myParentTM[ 3 ][ 1 ] + myParentTM[ 0 ][ 2 ] * myParentTM[ 3 ][ 2 ] );
-	temp[ 3 ][ 1 ] = -( myParentTM[ 1 ][ 0 ] * myParentTM[ 3 ][ 0 ] + myParentTM[ 1 ][ 1 ] * myParentTM[ 3 ][ 1 ] + myParentTM[ 1 ][ 2 ] * myParentTM[ 3 ][ 2 ] );
-	temp[ 3 ][ 2 ] = -( myParentTM[ 2 ][ 0 ] * myParentTM[ 3 ][ 0 ] + myParentTM[ 2 ][ 1 ] * myParentTM[ 3 ][ 1 ] + myParentTM[ 2 ][ 2 ] * myParentTM[ 3 ][ 2 ] );
+    temp[0][0] = myParentTM[0][0];
+    temp[0][1] = myParentTM[1][0];
+    temp[0][2] = myParentTM[2][0];
+    temp[1][0] = myParentTM[0][1];
+    temp[1][1] = myParentTM[1][1];
+    temp[1][2] = myParentTM[2][1];
+    temp[2][0] = myParentTM[0][2];
+    temp[2][1] = myParentTM[1][2];
+    temp[2][2] = myParentTM[2][2];
+    temp[3][0] =
+        -(myParentTM[0][0] * myParentTM[3][0] + myParentTM[0][1] * myParentTM[3][1]
+          + myParentTM[0][2] * myParentTM[3][2]);
+    temp[3][1] =
+        -(myParentTM[1][0] * myParentTM[3][0] + myParentTM[1][1] * myParentTM[3][1]
+          + myParentTM[1][2] * myParentTM[3][2]);
+    temp[3][2] =
+        -(myParentTM[2][0] * myParentTM[3][0] + myParentTM[2][1] * myParentTM[3][1]
+          + myParentTM[2][2] * myParentTM[3][2]);
 
-	m.Multiply( temp, myParentTM );
+    m.Multiply(temp, myParentTM);
 
-	VectorCopy( rotaxis, tmp );
-	rotaxis[ 0 ] = tmp[ 0 ] * temp[ 0 ][ 0 ] + tmp[ 1 ] * temp[ 1 ][ 0 ] + tmp[ 2 ] * temp[ 2 ][ 0 ];
-	rotaxis[ 1 ] = tmp[ 0 ] * temp[ 0 ][ 1 ] + tmp[ 1 ] * temp[ 1 ][ 1 ] + tmp[ 2 ] * temp[ 2 ][ 1 ];
-	rotaxis[ 2 ] = tmp[ 0 ] * temp[ 0 ][ 2 ] + tmp[ 1 ] * temp[ 1 ][ 2 ] + tmp[ 2 ] * temp[ 2 ][ 2 ];
+    VectorCopy(rotaxis, tmp);
+    rotaxis[0] = tmp[0] * temp[0][0] + tmp[1] * temp[1][0] + tmp[2] * temp[2][0];
+    rotaxis[1] = tmp[0] * temp[0][1] + tmp[1] * temp[1][1] + tmp[2] * temp[2][1];
+    rotaxis[2] = tmp[0] * temp[0][2] + tmp[1] * temp[1][2] + tmp[2] * temp[2][2];
 
-	targetaim.y = cos( vScale * 0.5 );
-	targetup.y = rotaxis.x * targetaim.y;
-	targetup.z = rotaxis.y * targetaim.y;
-	targetaim.x = rotaxis.z * targetaim.y;
+    targetaim.y = cos(vScale * 0.5);
+    targetup.y  = rotaxis.x * targetaim.y;
+    targetup.z  = rotaxis.y * targetaim.y;
+    targetaim.x = rotaxis.z * targetaim.y;
 
-	c = cos( vScale * 0.5 );
-	l = sqrt( 1.0 - c * c );
+    c = cos(vScale * 0.5);
+    l = sqrt(1.0 - c * c);
 
-	m_cachedQuat[ 0 ] = rotaxis[ 0 ] * l;
-	m_cachedQuat[ 1 ] = rotaxis[ 1 ] * l;
-	m_cachedQuat[ 2 ] = rotaxis[ 2 ] * l;
-	m_cachedQuat[ 3 ] = c;
+    m_cachedQuat[0] = rotaxis[0] * l;
+    m_cachedQuat[1] = rotaxis[1] * l;
+    m_cachedQuat[2] = rotaxis[2] * l;
+    m_cachedQuat[3] = c;
 
-	if( m_spinRatio < 1.0 )
-	{
-		m.Multiply( targetTM, temp );
-		MatToQuat( m.val, targetQuat.val );
-		Slerp( targetQuat, m_cachedQuat, m_spinRatio, &m_cachedQuat );
-	}
+    if (m_spinRatio < 1.0) {
+        m.Multiply(targetTM, temp);
+        MatToQuat(m.val, targetQuat.val);
+        Slerp(targetQuat, m_cachedQuat, m_spinRatio, &m_cachedQuat);
+    }
 
-	m_cachedQuat.GetMat4( m_cachedValue );
-	VectorCopy( m_basePos, m_cachedValue[ 3 ] );
+    m_cachedQuat.GetMat4(m_cachedValue);
+    VectorCopy(m_basePos, m_cachedValue[3]);
 
-	m.Multiply( m_cachedValue, myParentTM );
-	m_cachedValue = m;
+    m.Multiply(m_cachedValue, myParentTM);
+    m_cachedValue = m;
 
-	m_isDirty = false;
+    m_isDirty = false;
 
-	return m_cachedValue;
+    return m_cachedValue;
 }
 
-void skelBone_HoseRot::SetBoneRefs( skelBone_Base *ref )
+void skelBone_HoseRot::SetBoneRefs(skelBone_Base *ref)
 {
-	m_target = ref;
+    m_target = ref;
 }
 
-void skelBone_HoseRot::SetBaseValue( boneData_t *boneData )
+void skelBone_HoseRot::SetBaseValue(boneData_t *boneData)
 {
-	m_bendRatio = boneData->bendRatio;
-	m_bendMax = boneData->bendMax;
-	m_spinRatio = boneData->spinRatio;
-	m_basePos = boneData->offset;
+    m_bendRatio = boneData->bendRatio;
+    m_bendMax   = boneData->bendMax;
+    m_spinRatio = boneData->spinRatio;
+    m_basePos   = boneData->offset;
 }
 
-int skelBone_HoseRot::GetChannelIndex( int num )
+int skelBone_HoseRot::GetChannelIndex(int num)
 {
-	return -1;
+    return -1;
 }
 
-skelBone_Base *skelBone_HoseRot::GetBoneRef( int num )
+skelBone_Base *skelBone_HoseRot::GetBoneRef(int num)
 {
-	return m_target;
+    return m_target;
 }
 
-SkelMat4 &skelBone_HoseRotBoth::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_HoseRotBoth::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	SkelMat4 myParentTM;
-	SkelMat4 targetTM;
+    SkelMat4 myParentTM;
+    SkelMat4 targetTM;
 
-	if( m_parent )
-	{
-		myParentTM = m_parent->GetTransform( frames );
-		targetTM = m_target->GetTransform( frames );
-	}
+    if (m_parent) {
+        myParentTM = m_parent->GetTransform(frames);
+        targetTM   = m_target->GetTransform(frames);
+    }
 
-	VectorInverse( targetTM[ 0 ] );
-	VectorInverse( targetTM[ 2 ] );
-	VectorInverse( myParentTM[ 0 ] );
-	VectorInverse( myParentTM[ 2 ] );
+    VectorInverse(targetTM[0]);
+    VectorInverse(targetTM[2]);
+    VectorInverse(myParentTM[0]);
+    VectorInverse(myParentTM[2]);
 
-	return skelBone_HoseRot::GetDirtyTransform( myParentTM, targetTM );
+    return skelBone_HoseRot::GetDirtyTransform(myParentTM, targetTM);
 }
 
-void skelBone_HoseRotBoth::SetBaseValue( boneData_t *boneData )
+void skelBone_HoseRotBoth::SetBaseValue(boneData_t *boneData)
 {
-	skelBone_HoseRot::SetBaseValue( boneData );
-	m_basePos.x = -m_basePos.x;
-	m_basePos.z = -m_basePos.z;
+    skelBone_HoseRot::SetBaseValue(boneData);
+    m_basePos.x = -m_basePos.x;
+    m_basePos.z = -m_basePos.z;
 }
 
-SkelMat4 &skelBone_HoseRotParent::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_HoseRotParent::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	SkelMat4 myParentTM;
-	SkelMat4 targetTM;
+    SkelMat4 myParentTM;
+    SkelMat4 targetTM;
 
-	if( m_parent )
-	{
-		myParentTM = m_parent->GetTransform( frames );
-		targetTM = m_target->GetTransform( frames );
-	}
+    if (m_parent) {
+        myParentTM = m_parent->GetTransform(frames);
+        targetTM   = m_target->GetTransform(frames);
+    }
 
-	VectorInverse( myParentTM[ 0 ] );
-	VectorInverse( myParentTM[ 2 ] );
+    VectorInverse(myParentTM[0]);
+    VectorInverse(myParentTM[2]);
 
-	return skelBone_HoseRot::GetDirtyTransform( myParentTM, targetTM );
+    return skelBone_HoseRot::GetDirtyTransform(myParentTM, targetTM);
 }
 
-void skelBone_HoseRotParent::SetBaseValue( boneData_t *boneData )
+void skelBone_HoseRotParent::SetBaseValue(boneData_t *boneData)
 {
-	skelBone_HoseRot::SetBaseValue( boneData );
-	m_basePos.x = -m_basePos.x;
-	m_basePos.z = -m_basePos.z;
+    skelBone_HoseRot::SetBaseValue(boneData);
+    m_basePos.x = -m_basePos.x;
+    m_basePos.z = -m_basePos.z;
 }
 
-SkelMat4 &skelBone_World::GetDirtyTransform( const skelAnimStoreFrameList_c *frames )
+SkelMat4& skelBone_World::GetDirtyTransform(const skelAnimStoreFrameList_c *frames)
 {
-	m_cachedValue.MakeIdentity();
-	m_isDirty = false;
-	return m_cachedValue;
+    m_cachedValue.MakeIdentity();
+    m_isDirty = false;
+    return m_cachedValue;
 }
 
-void skelBone_World::SetBaseValue( boneData_t *boneData )
+void skelBone_World::SetBaseValue(boneData_t *boneData) {}
+
+int skelBone_World::GetChannelIndex(int num)
 {
+    return 0;
 }
 
-int skelBone_World::GetChannelIndex( int num )
+skelBone_Base *skelBone_World::GetBoneRef(int num)
 {
-	return 0;
-}
-
-skelBone_Base *skelBone_World::GetBoneRef( int num )
-{
-	return NULL;
+    return NULL;
 }
diff --git a/code/skeletor/tokenizer.cpp b/code/skeletor/tokenizer.cpp
index 68c6b6f1..ea3e394e 100644
--- a/code/skeletor/tokenizer.cpp
+++ b/code/skeletor/tokenizer.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
diff --git a/code/skeletor/tokenizer.h b/code/skeletor/tokenizer.h
index 97cd6926..ff1e9018 100644
--- a/code/skeletor/tokenizer.h
+++ b/code/skeletor/tokenizer.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,47 +22,46 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tokenizer.h : Tokenizer
 
-#ifndef __TOKENIZER_H__
-#define __TOKENIZER_H__
+#pragma once
+
+class Tokenizer
+{
+    char *pBuffer;
+    char *pEnd;
+    int   iLength;
+    char *pCurrent;
+    int   iLine;
+    int   iError;
+    bool  fTokenReady;
+    char  szToken[256];
 
-class Tokenizer {
-	char *pBuffer;
-	char *pEnd;
-	int iLength;
-	char *pCurrent;
-	int iLine;
-	int iError;
-	bool fTokenReady;
-	char szToken[ 256 ];
 public:
-	Tokenizer();
-	Tokenizer( const char *pInputBuffer , int iBufferLength );
+    Tokenizer();
+    Tokenizer(const char *pInputBuffer, int iBufferLength);
 
-	void	SetBuffer( const char *pInputBuffer, int iBufferLength);
-	void	Reset();
-	int		GetLineNumber();
-	bool	HasError();
-	int		GetError();
-	bool	SkipToEOL();
-	bool	CheckOverflow();
-	bool	SkipWhiteSpace( bool fCrossLine );
-	bool	AtComment();
-	void	SkipNonToken( bool fCrossLine );
-	bool	TokenAvailable( bool fCrossLine );
-	bool	CommentAvailable( bool fCrossLine );
-	void	UnGetToken();
-	bool	AtString( bool fCrossLine );
-	char	*GetToken( bool fCrossLine );
-	char	*GetLine( bool fCrossLine );
-	char	*GetRaw();
-	char	*GetString( bool fCrossLine );
-	bool	GetSpecific( const char *szString );
-	int		GetInteger( bool fCrossLine );
-	double	GetDouble( bool fCrossLine );
-	float	GetFloat( bool fCrossLine );
-	int		LinesInFile();
-	char	*Token();
-	char	*GetCurrentPointer();
+    void   SetBuffer(const char *pInputBuffer, int iBufferLength);
+    void   Reset();
+    int    GetLineNumber();
+    bool   HasError();
+    int    GetError();
+    bool   SkipToEOL();
+    bool   CheckOverflow();
+    bool   SkipWhiteSpace(bool fCrossLine);
+    bool   AtComment();
+    void   SkipNonToken(bool fCrossLine);
+    bool   TokenAvailable(bool fCrossLine);
+    bool   CommentAvailable(bool fCrossLine);
+    void   UnGetToken();
+    bool   AtString(bool fCrossLine);
+    char  *GetToken(bool fCrossLine);
+    char  *GetLine(bool fCrossLine);
+    char  *GetRaw();
+    char  *GetString(bool fCrossLine);
+    bool   GetSpecific(const char *szString);
+    int    GetInteger(bool fCrossLine);
+    double GetDouble(bool fCrossLine);
+    float  GetFloat(bool fCrossLine);
+    int    LinesInFile();
+    char  *Token();
+    char  *GetCurrentPointer();
 };
-
-#endif // __TOKENIZER_H__
diff --git a/code/sys/CMakeLists.txt b/code/sys/CMakeLists.txt
index 47199537..96419859 100644
--- a/code/sys/CMakeLists.txt
+++ b/code/sys/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(platform)
 
 ### Platform-specific code
@@ -31,18 +31,60 @@ else()
 	)
 endif()
 
+if (APPLE)
+	set(SOURCES_PLATFORM_SPECIFIC ${SOURCES_PLATFORM_SPECIFIC} "${CMAKE_SOURCE_DIR}/code/sys/sys_osx.m")
+endif()
+
+set(SOURCES_PLATFORM_COMMON
+    "${CMAKE_SOURCE_DIR}/code/sys/sys_update_checker.cpp"
+)
+
 add_library(syslib INTERFACE)
-target_sources(syslib INTERFACE ${SOURCES_PLATFORM_SPECIFIC})
-target_compile_features(syslib INTERFACE cxx_nullptr)
+target_sources(syslib INTERFACE ${SOURCES_PLATFORM_SPECIFIC} ${SOURCES_PLATFORM_COMMON})
+target_compile_features(syslib INTERFACE cxx_nullptr cxx_std_17)
 target_compile_features(syslib INTERFACE c_variadic_macros)
 target_link_libraries(syslib INTERFACE qcommon)
 
+find_package(CURL)
+
+if (CURL_FOUND)
+    target_link_libraries(syslib INTERFACE CURL::libcurl)
+    target_compile_definitions(syslib INTERFACE HAS_LIBCURL=1)
+else()
+    message(WARNING "CURL is not available, update checking will not work")
+endif()
+
 if(WIN32)
 	target_link_libraries(syslib INTERFACE wsock32 ws2_32)
 	target_link_libraries(syslib INTERFACE winmm)
+	target_link_libraries(syslib INTERFACE dbghelp)
 elseif(UNIX)
 	find_package(Threads)
 	target_link_libraries(syslib INTERFACE ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-	target_link_libraries(syslib INTERFACE m rt)
+	# Check for libc
+	if(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang")
+		execute_process(COMMAND ${CMAKE_C_COMPILER} -v
+						OUTPUT_VARIABLE COMPILER_OUTPUT
+						ERROR_VARIABLE COMPILER_OUTPUT
+						OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		if(COMPILER_OUTPUT MATCHES "musl|freebsd|openbsd|netbsd")
+			target_link_libraries(syslib INTERFACE execinfo m)
+		else()
+			target_link_libraries(syslib INTERFACE m)
+			if (NOT APPLE)
+				# For when using GLIBC versions older than 2.34
+				target_link_libraries(syslib INTERFACE rt)
+			endif()
+		endif()
+	endif()
 	target_link_libraries(syslib INTERFACE stdc++)
+endif()
+
+if (APPLE)
+	find_library(COCOA_LIBRARY Cocoa)
+	target_link_libraries(syslib INTERFACE ${COCOA_LIBRARY})
+	target_link_libraries(syslib INTERFACE "-framework Foundation")
+	target_link_libraries(syslib INTERFACE objc)
+	set_target_properties(syslib PROPERTIES LINK_FLAGS "-Wl,-F/Library/Frameworks")
 endif()
\ No newline at end of file
diff --git a/code/sys/new/sys_local_new.h b/code/sys/new/sys_local_new.h
index 581496f4..efb717f4 100644
--- a/code/sys/new/sys_local_new.h
+++ b/code/sys/new/sys_local_new.h
@@ -22,13 +22,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "../qcommon/q_version.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Setting DEFAULT_BASEDIR to an empty string will make
 // Sys_DefaultInstallPath() return the current directory instead
 // This was the usual behavior in Quake III Arena.
 #define DEFAULT_BASEDIR ""
 
 void Sys_InitEx();
+void Sys_ShutdownEx();
 
 void Sys_PrepareBackTrace();
 void Sys_PrintBackTrace();
-void Sys_PlatformInit_New();
\ No newline at end of file
+void Sys_PlatformInit_New();
+
+void Sys_UpdateChecker_Init();
+void Sys_UpdateChecker_Process();
+void Sys_UpdateChecker_Shutdown();
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/code/sys/new/sys_main_new.c b/code/sys/new/sys_main_new.c
index fd1f6549..1d3fe413 100644
--- a/code/sys/new/sys_main_new.c
+++ b/code/sys/new/sys_main_new.c
@@ -23,6 +23,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../sys_local.h"
 #include "../win_localization.h"
 #include "../sys_loadlib.h"
+#include "../sys_update_checker.h"
+
+// a pointer to the last piece of data retrieved from the clipboard is stored here,
+// so that it can be cleaned up when new data is retrieved, preventing memory leaks
+static void* clipboard_text = NULL;
 
 static void* game_library = NULL;
 static void* cgame_library = NULL;
@@ -33,6 +38,7 @@ qboolean	GLimp_SpawnRenderThread(void (*function)(void))
 
 void* GLimp_RendererSleep(void)
 {
+    return NULL;
 }
 
 void		GLimp_FrontEndSleep(void)
@@ -55,55 +61,65 @@ void Sys_ShowConsole(int visLevel, qboolean quitOnClose)
 /*
 ==============
 SaveRegistryInfo
+
+Used to save product info stuff into the registry.
+Not useful anymore, so no need to implement.
 ==============
 */
 qboolean SaveRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long lSize)
 {
-    STUB_DESC("not implemented");
     return qfalse;
 }
 
 /*
 ==============
 LoadRegistryInfo
+
+Used to load product info stuff from the registry.
+Not useful anymore, so no need to implement.
 ==============
 */
 qboolean LoadRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long* plSize)
 {
-    STUB_DESC("not implemented");
     return qfalse;
 }
 
 /*
 ==============
 IsFirstRun
+
+Returns whether or not this is the first time the game is started.
+Not used anymore.
 ==============
 */
 qboolean IsFirstRun(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
 /*
 ==============
 IsNewConfig
+
+Returns whether or not a new hardware change is detected.
+Not used anymore.
 ==============
 */
 qboolean IsNewConfig(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
 /*
 ==============
 IsSafeMode
+
+Returns whether or not the game was started in safe mode.
+Not used anymore.
 ==============
 */
 qboolean IsSafeMode(void)
 {
-    STUB_DESC("wtf");
     return qfalse;
 }
 
@@ -123,7 +139,36 @@ Sys_GetWholeClipboard
 */
 const char* Sys_GetWholeClipboard(void)
 {
+#ifndef DEDICATED
+    char *data = NULL;
+    char *cliptext;
+
+    if ((cliptext = SDL_GetClipboardText()) != NULL) {
+        if (cliptext[0] != 0) {
+            // It's necessary to limit buffersize to 4096 as each character
+            // is pasted via CharEvent, which is very-very slow and jams up the EventQueue.
+            // A smaller buffer doesn't jam the EventQueue up as much and avoids dropping
+            // characters that otherwise happens when the EventQueue is overloaded.
+            // FIXME: speed up paste logic so this restriction can be removed
+            size_t bufsize = Q_min(strlen(cliptext) + 1, 4096);
+
+            if (clipboard_text != NULL) {
+                // clean up previously allocated clipboard buffer
+                Z_Free(clipboard_text);
+                clipboard_text = NULL;
+            }
+
+            data = clipboard_text = Z_Malloc(bufsize);
+            // Changed in OPM:
+            // original game skips the Windows-specific '\r' (carriage return) char here!
+            Q_strncpyz(data, cliptext, bufsize);
+        }
+        SDL_free(cliptext);
+    }
+    return data;
+#else
     return NULL;
+#endif
 }
 
 /*
@@ -131,28 +176,41 @@ const char* Sys_GetWholeClipboard(void)
 Sys_SetClipboard
 ==============
 */
-void Sys_SetClipboard(const char* contents)
+void Sys_SetClipboard(const char *contents)
 {
+#ifndef DEDICATED
+    if (!contents || !contents[0]) {
+        return;
+    }
+
+    SDL_SetClipboardText(contents);
+#endif
 }
 
 /*
 ================
 RecoverLostAutodialData
+
+This functions changes the current user setting so the modem
+automatically dials up whenever an attempt to connect is detected.
+
+There is no need to implement this anymore nowadays.
 ================
 */
 void RecoverLostAutodialData(void)
 {
-    // FIXME: stub
 }
 
 /*
 ==============
 Sys_CloseMutex
+
+Closes the global mutex used to check if another instance is already running.
+Not used anymore, as multiple instances could be useful for testing.
 ==============
 */
 void Sys_CloseMutex(void)
 {
-    // FIXME: stub
 }
 
 /*
@@ -179,95 +237,20 @@ Sys_GetGameAPI
 void* Sys_GetGameAPI(void* parms)
 {
     void* (*GetGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-#ifdef MACOS_X
-    const char* apppath;
-#endif
-    const char* fn;
-    const char* gamename = "game" ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "game" ARCH_SUFFIX DLL_SUFFIX DLL_EXT;
 
     if (game_library)
         Com_Error(ERR_FATAL, "Sys_GetGameAPI without calling Sys_UnloadGame");
 
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-#ifdef MACOS_X
-    apppath = Cvar_VariableString("fs_apppath");
-#endif
-
-    fn = FS_BuildOSPath(basepath, com_basegame->string, gamename);
-
-    game_library = Sys_LoadLibrary(fn);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
-#ifdef MACOS_X
-    if (!game_library) {
-        if (apppath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(apppath, gamedir, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
-#endif
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        game_library = Sys_LoadLibrary(fn);
-    }
-
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
-#ifdef MACOS_X
-    if (!game_library) {
-        if (apppath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(apppath, OPENJKGAME, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
-#endif
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            game_library = Sys_LoadLibrary(fn);
-        }
-    }
+    game_library = Sys_LoadDll(gamename, qfalse);
 
     //Still couldn't find it.
     if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
+        Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", gamename, Sys_LibraryError());
         Com_Error(ERR_FATAL, "Couldn't load game");
     }
 
-    Com_Printf("Sys_GetGameAPI(%s): succeeded ...\n", fn);
+    Com_Printf("Sys_GetGameAPI(%s): succeeded ...\n", gamename);
     GetGameAPI = (void* (*)(void*))Sys_LoadFunction(game_library, "GetGameAPI");
 
     if (!GetGameAPI)
@@ -303,95 +286,20 @@ Sys_GetCGameAPI
 void* Sys_GetCGameAPI(void* parms)
 {
     void* (*GetCGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-#ifdef MACOS_X
-    const char* apppath;
-#endif
-    const char* fn;
-    const char* gamename = "cgame" ARCH_STRING DLL_SUFFIX DLL_EXT;
+    const char* gamename = "cgame" ARCH_SUFFIX DLL_SUFFIX DLL_EXT;
 
     if (cgame_library)
         Com_Error(ERR_FATAL, "Sys_GetCGameAPI without calling Sys_UnloadCGame");
 
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-#ifdef MACOS_X
-    apppath = Cvar_VariableString("fs_apppath");
-#endif
-
-    fn = FS_BuildOSPath(basepath, com_basegame->string, gamename);
-
-    cgame_library = Sys_LoadLibrary(fn);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
-#ifdef MACOS_X
-    if (!cgame_library) {
-        if (apppath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(apppath, gamedir, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
-#endif
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        cgame_library = Sys_LoadLibrary(fn);
-    }
-
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
-#ifdef MACOS_X
-    if (!cgame_library) {
-        if (apppath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(apppath, OPENJKGAME, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
-#endif
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            cgame_library = Sys_LoadLibrary(fn);
-        }
-    }
+    cgame_library = Sys_LoadDll(gamename, qfalse);
 
     //Still couldn't find it.
     if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, Sys_LibraryError());
+        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", gamename, Sys_LibraryError());
         Com_Error(ERR_FATAL, "Couldn't load game");
     }
 
-    Com_Printf("Sys_GetCGameAPI(%s): succeeded ...\n", fn);
+    Com_Printf("Sys_GetCGameAPI(%s): succeeded ...\n", gamename);
     GetCGameAPI = (void* (*)(void*))Sys_LoadFunction(cgame_library, "GetCGameAPI");
 
     if (!GetCGameAPI)
@@ -404,14 +312,23 @@ void* Sys_GetCGameAPI(void* parms)
 }
 
 void VM_Forced_Unload_Start(void) {
-    Sys_PrepareBackTrace();
 }
 
 void VM_Forced_Unload_Done(void) {
-    Sys_PrintBackTrace();
 }
 
 void Sys_InitEx()
 {
     Sys_InitLocalization();
+    Sys_UpdateChecker_Init();
+}
+
+void Sys_ShutdownEx()
+{
+    Sys_UpdateChecker_Shutdown();
+}
+
+void Sys_ProcessBackgroundTasks()
+{
+    Sys_UpdateChecker_Process();
 }
diff --git a/code/sys/new/sys_unix_new.c b/code/sys/new/sys_unix_new.c
index 35e26570..3939fd30 100644
--- a/code/sys/new/sys_unix_new.c
+++ b/code/sys/new/sys_unix_new.c
@@ -26,9 +26,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <unistd.h>
 #include <execinfo.h>
 
-static void* backtrace_arr[20];
-static size_t backtrace_size;
-
 /*
 ==================
 Sys_PlatformInit_New
@@ -44,10 +41,6 @@ Sys_PrepareBackTrace
 ==================
 */
 void Sys_PrepareBackTrace() {
-    void* backtrace_arr[20];
-
-    // get void*'s for all entries on the stack
-    backtrace_size = backtrace(backtrace_arr, sizeof(backtrace_arr) / sizeof(backtrace_arr[0]));
 }
 
 /*
@@ -56,7 +49,27 @@ Sys_PrintBackTrace
 ==================
 */
 void Sys_PrintBackTrace() {
-    backtrace_symbols_fd(backtrace_arr, backtrace_size, STDERR_FILENO);
+    void* backtrace_arr[128];
+    char** backtrace_symbols_arr;
+    size_t backtrace_size;
+    size_t i;
+
+    // Fetch the backtrace starting from the current function
+    backtrace_size = backtrace(backtrace_arr, ARRAY_LEN(backtrace_arr));
+    backtrace_symbols_arr = backtrace_symbols(backtrace_arr, ARRAY_LEN(backtrace_arr));
+
+    for (i = 0; i < backtrace_size; i++) {
+        fprintf(stderr, "=> %s\n", backtrace_symbols_arr[i]);
+    }
+}
+
+/*
+==============
+Sys_DebugPrint
+==============
+*/
+void Sys_DebugPrint(const char* message) {
+    fprintf(stderr, "%s", message);
 }
 
 /*
diff --git a/code/sys/new/sys_win32_new.c b/code/sys/new/sys_win32_new.c
index 0beeab14..ea581328 100644
--- a/code/sys/new/sys_win32_new.c
+++ b/code/sys/new/sys_win32_new.c
@@ -23,6 +23,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../sys_local.h"
 
 #include <Windows.h>
+#include <dbghelp.h>
+
 #ifdef _MSC_VER
 #  ifdef _DEBUG_MEM
 #    include <crtdbg.h>
@@ -51,6 +53,43 @@ Sys_PrintBackTrace
 ==============
 */
 void Sys_PrintBackTrace() {
+    void* backtrace[128];
+    SYMBOL_INFO* symbol;
+    HANDLE hProcess;
+    unsigned int i;
+    unsigned short frames;
+
+    hProcess = GetCurrentProcess();
+
+    // Initialize the symbol handler
+    SymInitialize(hProcess, NULL, TRUE);
+
+    // Gather the list of frames
+    frames = CaptureStackBackTrace(0, ARRAY_LEN(backtrace), backtrace, NULL);
+    // Allocate a symbol structure to get the name of each symbol
+    // with a maximum of 127 characters per symbol
+    symbol = (SYMBOL_INFO*)malloc(sizeof(SYMBOL_INFO) + 128 * sizeof(char));
+    symbol->MaxNameLen = 127;
+    symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
+
+    for (i = 0; i < frames; i++)
+    {
+        // Try to translate the address to a symbol with a name
+        SymFromAddr(hProcess, (DWORD64)(backtrace[i]), 0, symbol);
+
+        fprintf(stderr, "=> %s[0x%p]\n", symbol->Name, (void*)symbol->Address);
+    }
+
+    free(symbol);
+}
+
+/*
+==============
+Sys_DebugPrint
+==============
+*/
+void Sys_DebugPrint(const char* message) {
+    OutputDebugStringA(message);
 }
 
 /*
diff --git a/code/sys/sys_autoupdater.c b/code/sys/sys_autoupdater.c
index 2f59e071..9a6b6a66 100644
--- a/code/sys/sys_autoupdater.c
+++ b/code/sys/sys_autoupdater.c
@@ -31,7 +31,7 @@ void Sys_LaunchAutoupdater(int argc, char **argv)
 		memset(&procinfo, '\0', sizeof (procinfo));
 		memset(&startinfo, '\0', sizeof (startinfo));
 		startinfo.cb = sizeof (startinfo);
-		sprintf(cmdline, "" AUTOUPDATER_BIN " --waitpid %u", (unsigned int) GetCurrentProcessId());
+		Com_sprintf(cmdline, sizeof(cmdline), "" AUTOUPDATER_BIN " --waitpid %u", (unsigned int) GetCurrentProcessId());
 
 		if (CreateProcessA(AUTOUPDATER_BIN, cmdline, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &startinfo, &procinfo))
 		{
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index ca3d1afd..e70649fa 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -31,6 +31,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <ctype.h>
 #include <errno.h>
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten/emscripten.h>
+#endif
+
 #ifndef DEDICATED
 #ifdef USE_LOCAL_HEADERS
 #	include "SDL.h"
@@ -142,26 +146,8 @@ Sys_GetClipboardData
 */
 char *Sys_GetClipboardData(void)
 {
-#ifdef DEDICATED
-	return NULL;
-#else
-	char *data = NULL;
-	char *cliptext;
-
-	if ( ( cliptext = SDL_GetClipboardText() ) != NULL ) {
-		if ( cliptext[0] != '\0' ) {
-			size_t bufsize = strlen( cliptext ) + 1;
-
-			data = Z_Malloc( bufsize );
-			Q_strncpyz( data, cliptext, bufsize );
-
-			// find first listed char and set to '\0'
-			strtok( data, "\n\r\b" );
-		}
-		SDL_free( cliptext );
-	}
-	return data;
-#endif
+    // unused - actual function is implemented in sys_main_new.c
+    return NULL;
 }
 
 #ifdef DEDICATED
@@ -282,6 +268,8 @@ Single exit point (regular exit or in case of error)
 */
 static __attribute__ ((noreturn)) void Sys_Exit( int exitCode )
 {
+    Sys_ShutdownEx();
+
 	CON_Shutdown( );
 
 #ifndef DEDICATED
@@ -729,27 +717,40 @@ char *Sys_ParseProtocolUri( const char *uri )
 Sys_SigHandler
 =================
 */
-void Sys_SigHandler( int signal )
+void Sys_SigHandler( int signum )
 {
 	static qboolean signalcaught = qfalse;
 
 	if( signalcaught )
 	{
 		fprintf( stderr, "DOUBLE SIGNAL FAULT: Received signal %d, exiting...\n",
-			signal );
+			signum );
 	}
 	else
 	{
 		signalcaught = qtrue;
+
+        fprintf(stderr, "----\nBacktrace:\n");
+        Sys_PrintBackTrace();
+		fprintf(stderr, "----\n");
+
+		if (signum != SIGTERM && signum != SIGINT) {
+			//
+			// Abort to generate a core dump and exit
+			//
+			signal(SIGABRT, SIG_DFL);
+			abort();
+		}
+
 		VM_Forced_Unload_Start();
 #ifndef DEDICATED
-		CL_Shutdown(va("Received signal %d", signal), qtrue, qtrue);
+		CL_Shutdown(va("Received signal %d", signum), qtrue, qtrue);
 #endif
-		SV_Shutdown(va("Received signal %d", signal) );
+		SV_Shutdown(va("Received signal %d", signum) );
 		VM_Forced_Unload_Done();
 	}
 
-	if( signal == SIGTERM || signal == SIGINT )
+	if( signum == SIGTERM || signum == SIGINT )
 		Sys_Exit( 1 );
 	else
 		Sys_Exit( 2 );
@@ -833,16 +834,13 @@ int main( int argc, char **argv )
 		}
 
 		containsSpaces = strchr(argv[i], ' ') != NULL;
-		//
-		// Seriously ioquake3, why? Why??
-		//
-		//if (containsSpaces)
-		//	Q_strcat( commandLine, sizeof( commandLine ), "\"" );
+		if (containsSpaces)
+			Q_strcat( commandLine, sizeof( commandLine ), "\"" );
 
 		Q_strcat( commandLine, sizeof( commandLine ), argv[ i ] );
 
-		//if (containsSpaces)
-		//	Q_strcat( commandLine, sizeof( commandLine ), "\"" );
+		if (containsSpaces)
+			Q_strcat( commandLine, sizeof( commandLine ), "\"" );
 
 		Q_strcat( commandLine, sizeof( commandLine ), " " );
 	}
@@ -858,7 +856,7 @@ int main( int argc, char **argv )
 
 	CON_Init( );
 	Com_Init( commandLine );
-	Sys_InitEx();
+	Sys_InitEx(); // Added in OPM
 	NET_Init( );
 
 	signal( SIGILL, Sys_SigHandler );
@@ -867,10 +865,14 @@ int main( int argc, char **argv )
 	signal( SIGTERM, Sys_SigHandler );
 	signal( SIGINT, Sys_SigHandler );
 
+#ifdef __EMSCRIPTEN__
+	emscripten_set_main_loop( Com_Frame, 0, 1 );
+#else
 	while( 1 )
 	{
 		Com_Frame( );
 	}
+#endif
 
 	return 0;
 }
diff --git a/code/sys/sys_unix.c b/code/sys/sys_unix.c
index 63a29644..f090508a 100644
--- a/code/sys/sys_unix.c
+++ b/code/sys/sys_unix.c
@@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#define _FILE_OFFSET_BITS 64
+
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 #include "sys_local.h"
@@ -38,6 +40,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <fcntl.h>
 #include <fenv.h>
 #include <sys/wait.h>
+#include <time.h>
 
 qboolean stdinIsATTY;
 
@@ -64,10 +67,11 @@ char *Sys_DefaultHomePath(void)
 
 	if( !*homePath && com_homepath != NULL )
 	{
+#ifdef __APPLE__
 		if( ( p = getenv( "HOME" ) ) != NULL )
 		{
 			Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
-#ifdef __APPLE__
+
 			Q_strcat(homePath, sizeof(homePath),
 				"Library/Application Support/");
 
@@ -75,13 +79,44 @@ char *Sys_DefaultHomePath(void)
 				Q_strcat(homePath, sizeof(homePath), com_homepath->string);
 			else
 				Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_MACOSX);
+		}
 #else
+		if( ( p = getenv( "FLATPAK_ID" ) ) != NULL && *p != '\0' )
+		{
+			if( ( p = getenv( "XDG_DATA_HOME" ) ) != NULL && *p != '\0' )
+			{
+				Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
+			}
+			else if( ( p = getenv( "HOME" ) ) != NULL && *p != '\0' )
+			{
+				Com_sprintf(homePath, sizeof(homePath), "%s%c.local%cshare%c", p, PATH_SEP, PATH_SEP, PATH_SEP);
+			}
+
+			if( *homePath )
+			{
+				char *dir;
+
+				if(com_homepath->string[0])
+					dir = com_homepath->string;
+				else
+					dir = HOMEPATH_NAME_UNIX;
+
+				if(dir[0] == '.' && dir[1] != '\0')
+					dir++;
+
+				Q_strcat(homePath, sizeof(homePath), dir);
+			}
+		}
+		else if( ( p = getenv( "HOME" ) ) != NULL )
+		{
+			Com_sprintf(homePath, sizeof(homePath), "%s%c", p, PATH_SEP);
+
 			if(com_homepath->string[0])
 				Q_strcat(homePath, sizeof(homePath), com_homepath->string);
 			else
 				Q_strcat(homePath, sizeof(homePath), HOMEPATH_NAME_UNIX);
-#endif
 		}
+#endif
 	}
 
 	return homePath;
@@ -147,7 +182,7 @@ unsigned long sys_timeBase = 0;
 /* current time in ms, using sys_timeBase as origin
    NOTE: sys_timeBase*1000 + curtime -> ms since the Epoch
      0x7fffffff ms - ~24 days
-   although timeval:tv_usec is an int, I'm not sure wether it is actually used as an unsigned int
+   although timeval:tv_usec is an int, I'm not sure whether it is actually used as an unsigned int
      (which would affect the wrap period) */
 int curtime;
 int Sys_Milliseconds (void)
@@ -334,60 +369,76 @@ DIRECTORY SCANNING
 Sys_ListFilteredFiles
 ==================
 */
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, char **list, int *numfiles )
+void Sys_ListFilteredFiles(
+    const char *basedir, char *subdirs, char *filter, qboolean wantsubs, char **list, int *numfiles
+)
 {
-	char          search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char          filename[MAX_OSPATH];
-	DIR           *fdir;
-	struct dirent *d;
-	struct stat   st;
+    char           search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
+    char           filename[MAX_OSPATH];
+    DIR           *fdir;
+    struct dirent *d;
+    struct stat    st;
 
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
+    if (*numfiles >= MAX_FOUND_FILES - 1) {
+        return;
+    }
 
-	if ( basedir[0] == '\0' ) {
-		return;
-	}
+    if (basedir[0] == '\0') {
+        return;
+    }
 
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s/%s", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s", basedir );
-	}
+    if (strlen(subdirs)) {
+        Com_sprintf(search, sizeof(search), "%s/%s", basedir, subdirs);
+    } else {
+        Com_sprintf(search, sizeof(search), "%s", basedir);
+    }
 
-	if ((fdir = opendir(search)) == NULL) {
-		return;
-	}
+    if ((fdir = opendir(search)) == NULL) {
+        return;
+    }
 
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(filename, sizeof(filename), "%s/%s", search, d->d_name);
-		if (stat(filename, &st) == -1)
-			continue;
+    while ((d = readdir(fdir)) != NULL) {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..")) && Q_stricmp(d->d_name, "cvs")) {
+            continue;
+        }
 
-		if (st.st_mode & S_IFDIR) {
-			if (Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s/%s", subdirs, d->d_name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", d->d_name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s/%s", subdirs, d->d_name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	}
+        Com_sprintf(filename, sizeof(filename), "%s/%s", search, d->d_name);
+        if (stat(filename, &st) == -1) {
+            continue;
+        }
 
-	closedir(fdir);
+        if ((st.st_mode & S_IFDIR) != 0 && wantsubs) {
+            if (strlen(subdirs)) {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s/%s", subdirs, d->d_name);
+            } else {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s", d->d_name);
+            }
+
+            // recursively iterate into subdirectory
+            Sys_ListFilteredFiles(basedir, newsubdirs, filter, wantsubs, list, numfiles);
+        }
+
+        if (*numfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
+
+        if (strlen(subdirs)) {
+            Com_sprintf(filename, sizeof(filename), "%s/%s", subdirs, d->d_name);
+        } else {
+            Q_strncpyz(filename, d->d_name, sizeof(filename));
+        }
+
+        if (!Com_FilterPath(filter, filename, qfalse)) {
+            continue;
+        }
+
+        list[*numfiles] = CopyString(filename);
+        (*numfiles)++;
+    }
+
+    closedir(fdir);
 }
 
 /*
@@ -395,104 +446,105 @@ void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, ch
 Sys_ListFiles
 ==================
 */
-char **Sys_ListFiles( const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs )
+char **Sys_ListFiles(const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs)
 {
-	struct dirent *d;
-	DIR           *fdir;
-	qboolean      dironly = wantsubs;
-	char          search[MAX_OSPATH];
-	int           nfiles;
-	char          **listCopy;
-	char          *list[MAX_FOUND_FILES];
-	int           i;
-	struct stat   st;
+    struct dirent *d;
+    DIR           *fdir;
+    char           search[MAX_OSPATH];
+    int            nfiles;
+    char         **listCopy;
+    char          *list[MAX_FOUND_FILES];
+    int            i;
+    struct stat    st;
+    char           buffer[64];
 
-	int           extLen;
+    if (directory[0] == '\0') {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	if (filter) {
+    if (!extension) {
+        extension = "";
+    }
 
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
+    // passing a slash as extension will find directories,
+    // anything else looks only for files with that extension
+    if (!filter && (extension[0] != '/' || extension[1])) {
+        Q_snprintf(buffer, sizeof(buffer), "*%s", extension);
+        filter = buffer;
+    }
 
-		list[ nfiles ] = NULL;
-		*numfiles = nfiles;
+    if (filter) {
+        nfiles = 0;
+        Sys_ListFilteredFiles(directory, "", filter, wantsubs, list, &nfiles);
 
-		if (!nfiles)
-			return NULL;
+        list[nfiles] = NULL;
+        *numfiles    = nfiles;
+        if (!nfiles) {
+            return NULL;
+        }
 
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
+        listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+        for (i = 0; i < nfiles; i++) {
+            listCopy[i] = list[i];
+        }
+        listCopy[i] = NULL;
 
-		return listCopy;
-	}
+        return listCopy;
+    }
 
-	if ( directory[0] == '\0' ) {
-		*numfiles = 0;
-		return NULL;
-	}
+    // only enumerate directories from this point onward
 
-	if ( !extension)
-		extension = "";
+    // search
+    nfiles = 0;
 
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		dironly = qtrue;
-	}
+    if ((fdir = opendir(directory)) == NULL) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	extLen = strlen( extension );
+    while ((d = readdir(fdir)) != NULL) {
+        Com_sprintf(search, sizeof(search), "%s/%s", directory, d->d_name);
+        if (stat(search, &st) == -1) {
+            continue;
+        }
 
-	// search
-	nfiles = 0;
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..") && Q_stricmp(d->d_name, "cvs"))) {
+            continue;
+        }
 
-	if ((fdir = opendir(directory)) == NULL) {
-		*numfiles = 0;
-		return NULL;
-	}
+        if ((st.st_mode & S_IFDIR) == 0) {
+            continue;
+        }
 
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(search, sizeof(search), "%s/%s", directory, d->d_name);
-		if (stat(search, &st) == -1)
-			continue;
-		if ((dironly && !(st.st_mode & S_IFDIR)) ||
-			(!dironly && (st.st_mode & S_IFDIR)))
-			continue;
+        if (nfiles == MAX_FOUND_FILES - 1) {
+            break;
+        }
 
-		if (*extension) {
-			if ( strlen( d->d_name ) < extLen ||
-				Q_stricmp(
-					d->d_name + strlen( d->d_name ) - extLen,
-					extension ) ) {
-				continue; // didn't match
-			}
-		}
+        list[nfiles] = CopyString(d->d_name);
+        nfiles++;
+    }
 
-		if ( nfiles == MAX_FOUND_FILES - 1 )
-			break;
-		list[ nfiles ] = CopyString( d->d_name );
-		nfiles++;
-	}
+    list[nfiles] = NULL;
 
-	list[ nfiles ] = NULL;
+    closedir(fdir);
 
-	closedir(fdir);
+    // return a copy of the list
+    *numfiles = nfiles;
 
-	// return a copy of the list
-	*numfiles = nfiles;
+    if (!nfiles) {
+        return NULL;
+    }
 
-	if ( !nfiles ) {
-		return NULL;
-	}
+    listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+    for (i = 0; i < nfiles; i++) {
+        listCopy[i] = list[i];
+    }
+    listCopy[i] = NULL;
 
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
-
-	return listCopy;
+    return listCopy;
 }
 
 /*
@@ -548,11 +600,15 @@ void Sys_Sleep( int msec )
 	}
 	else
 	{
+		struct timespec req;
+
 		// With nothing to select() on, we can't wait indefinitely
 		if( msec < 0 )
 			msec = 10;
 
-		usleep( msec * 1000 );
+		req.tv_sec = msec/1000;
+		req.tv_nsec = (msec%1000)*1000000;
+		nanosleep(&req, NULL);
 	}
 }
 
diff --git a/code/sys/sys_update_checker.cpp b/code/sys/sys_update_checker.cpp
new file mode 100644
index 00000000..849df6be
--- /dev/null
+++ b/code/sys/sys_update_checker.cpp
@@ -0,0 +1,414 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "sys_update_checker.h"
+#include "../qcommon/q_version.h"
+
+#ifdef HAS_LIBCURL
+#    include <curl/curl.h>
+#endif
+
+//#include <httplib.h>
+#include "../qcommon/json.hpp"
+using json = nlohmann::json;
+
+#include <chrono>
+
+UpdateChecker updateChecker;
+
+void Sys_UpdateChecker_Init()
+{
+    updateChecker.Init();
+}
+
+void Sys_UpdateChecker_Process()
+{
+    updateChecker.Process();
+}
+
+void Sys_UpdateChecker_Shutdown()
+{
+    updateChecker.Shutdown();
+}
+
+UpdateChecker::UpdateChecker()
+{
+    lastMajor = lastMinor = lastPatch = 0;
+    versionChecked                    = false;
+}
+
+UpdateChecker::~UpdateChecker() {}
+
+void UpdateChecker::Init()
+{
+    CheckInitClientThread();
+}
+
+void UpdateChecker::CheckInitClientThread()
+{
+    if (!thread) {
+        if (CanHaveRequestThread()) {
+            thread = new UpdateCheckerThread();
+            thread->Init();
+        }
+    } else {
+        if (!CanHaveRequestThread()) {
+            Com_DPrintf("Shutting down the update checker thread\n");
+
+            delete thread;
+            thread = NULL;
+        }
+    }
+}
+
+bool UpdateChecker::CanHaveRequestThread() const
+{
+    if (!Cvar_VariableIntegerValue("net_enabled")) {
+        // Network has been disabled by a cvar
+        return false;
+    }
+
+    if (!com_updatecheck_enabled->integer) {
+        // Update checking has been disabled
+        return false;
+    }
+
+#ifdef HAS_LIBCURL
+    return true;
+#else
+    return false;
+#endif
+}
+
+void UpdateChecker::SetLatestVersion(int major, int minor, int patch)
+{
+    lastMajor = major;
+    lastMinor = minor;
+    lastPatch = patch;
+
+    versionChecked = true;
+}
+
+void UpdateChecker::Process()
+{
+    // Initialize the client thread when necessary
+    CheckInitClientThread();
+
+    std::chrono::time_point<std::chrono::steady_clock> currentTime = std::chrono::steady_clock::now();
+    if (currentTime < nextMessageTime) {
+        return;
+    }
+
+    if (!CheckNewVersion()) {
+        return;
+    }
+
+    Com_Printf(
+        "New release v%d.%d.%d published *\\(^ o ^)/*. Your current version is v%s. See www.openmohaa.org\n",
+        lastMajor,
+        lastMinor,
+        lastPatch,
+        PRODUCT_VERSION_NUMBER_STRING
+    );
+
+    nextMessageTime = currentTime + std::chrono::milliseconds(Q_max(1, com_updatecheck_interval->integer) * 60 * 1000);
+}
+
+void UpdateChecker::Shutdown()
+{
+    if (thread) {
+        delete thread;
+        thread = NULL;
+    }
+}
+
+bool UpdateChecker::CheckNewVersion() const
+{
+    if (!versionChecked) {
+        return false;
+    }
+
+    if (lastMajor > PRODUCT_VERSION_MAJOR) {
+        return true;
+    } else if (lastMajor < PRODUCT_VERSION_MAJOR) {
+        return false;
+    }
+
+    if (lastMinor > PRODUCT_VERSION_MINOR) {
+        return true;
+    } else if (lastMinor < PRODUCT_VERSION_MINOR) {
+        return false;
+    }
+
+    if (lastPatch > PRODUCT_VERSION_PATCH) {
+        return true;
+    }
+
+    return false;
+}
+
+bool UpdateChecker::CheckNewVersion(int& major, int& minor, int& patch) const
+{
+    if (!CheckNewVersion()) {
+        return false;
+    }
+
+    major = lastMajor;
+    minor = lastMinor;
+    patch = lastPatch;
+
+    return true;
+}
+
+UpdateCheckerThread::UpdateCheckerThread()
+{
+    handle                = NULL;
+    osThread              = NULL;
+    requestThreadIsActive = qfalse;
+    shouldBeActive        = qfalse;
+}
+
+UpdateCheckerThread::~UpdateCheckerThread()
+{
+    Shutdown();
+}
+
+void UpdateCheckerThread::Init()
+{
+    shouldBeActive        = qtrue;
+    requestThreadIsActive = qtrue;
+
+    osThread = new std::thread(&UpdateCheckerThread::RequestThread, this);
+}
+
+void UpdateCheckerThread::Shutdown()
+{
+    if (!shouldBeActive) {
+        return;
+    }
+
+    shouldBeActive = qfalse;
+
+    if (osThread) {
+        // Notify and shutdown the thread
+        {
+            // Wait until the request thread is ready
+            std::lock_guard<std::mutex> l(clientWakeMutex);
+            clientWake.notify_all();
+        }
+
+        // Wait for the thread to exit
+        osThread->join();
+
+        delete osThread;
+        osThread = NULL;
+    }
+}
+
+bool UpdateCheckerThread::IsRoutineActive() const
+{
+    return requestThreadIsActive;
+}
+
+void UpdateCheckerThread::InitClient()
+{
+#ifdef HAS_LIBCURL
+    CURLcode result;
+
+    assert(!handle);
+
+    handle = curl_easy_init();
+    if (!handle) {
+        Com_DPrintf("Failed to create curl client\n");
+        return;
+    }
+
+    result = curl_easy_setopt(handle, CURLOPT_URL, "https://api.github.com/repos/openmoh/openmohaa/releases/latest");
+
+    if (result != CURLE_OK) {
+        Com_DPrintf("Failed to set curl URL: %s\n", curl_easy_strerror(result));
+        curl_easy_cleanup(handle);
+        handle = NULL;
+        return;
+    }
+
+    curl_easy_setopt(handle, CURLOPT_USERAGENT, "curl");
+    curl_easy_setopt(handle, CURLOPT_TIMEOUT, 15);
+#else
+    Com_DPrintf("Project was compiled without libcurl, will not check for updates\n");
+#endif
+}
+
+void UpdateCheckerThread::ShutdownClient()
+{
+#ifdef HAS_LIBCURL
+    if (!handle) {
+        return;
+    }
+
+    curl_easy_cleanup(handle);
+    handle = NULL;
+#endif
+}
+
+bool UpdateCheckerThread::ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const
+{
+    const char *p  = value;
+    const char *pn = value;
+
+    if (*p != 'v') {
+        return false;
+    }
+
+    //
+    // Parse the major number
+    //
+    p++;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn != '.') {
+        return false;
+    }
+
+    major = std::stoi(std::string(p, pn - p));
+
+    //
+    // Parse the minor number
+    //
+    p = pn + 1;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn != '.') {
+        return false;
+    }
+
+    minor = std::stoi(std::string(p, pn - p));
+
+    //
+    // Parse the patch number
+    //
+    p = pn + 1;
+    for (pn = p; *pn && *pn != '.'; pn++) {};
+
+    if (*pn) {
+        return false;
+    }
+
+    patch = std::stoi(std::string(p, pn - p));
+
+    return true;
+}
+
+// It shouldn't be possible to receive responses that high from the API
+// 4MB
+static constexpr unsigned int MAX_BUFFER_SIZE = 4 * 1024 * 1024;
+
+struct WriteCallbackData {
+    WriteCallbackData()
+    {
+        // Reserve a buffer of 64KB
+        buffer.reserve(64 * 1024);
+    }
+
+    const char *GetData() const { return buffer.data(); }
+
+    size_t GetSize() const { return buffer.size(); }
+
+    std::string buffer;
+};
+
+#ifdef HAS_LIBCURL
+size_t WriteCallback(char *contents, size_t size, size_t nmemb, void *userp)
+{
+    WriteCallbackData *callbackData = (WriteCallbackData *)userp;
+
+    size_t responseSize = size * nmemb;
+    if (callbackData->GetSize() + responseSize + 1 > MAX_BUFFER_SIZE) {
+        return CURL_WRITEFUNC_ERROR;
+    }
+
+    callbackData->buffer.append(contents, responseSize);
+
+    return responseSize;
+}
+#endif
+
+void UpdateCheckerThread::DoRequest()
+{
+#ifdef HAS_LIBCURL
+    CURLcode          result;
+    WriteCallbackData callbackData;
+
+    curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, &WriteCallback);
+    curl_easy_setopt(handle, CURLOPT_WRITEDATA, &callbackData);
+    curl_easy_setopt(handle, CURLOPT_MAXFILESIZE, MAX_BUFFER_SIZE);
+
+    struct curl_slist *list = NULL;
+
+    list = curl_slist_append(list, "Accept: application/vnd.github+json");
+    list = curl_slist_append(list, "X-GitHub-Api-Version: 2022-11-28");
+    curl_easy_setopt(handle, CURLOPT_HTTPHEADER, list);
+
+    result = curl_easy_perform(handle);
+    curl_slist_free_all(list);
+
+    if (result != CURLE_OK) {
+        return;
+    }
+
+    nlohmann::json data;
+
+    try {
+        data = nlohmann::json::parse(callbackData.GetData());
+    } catch (const std::exception& e) {
+        return;
+    }
+
+    try {
+        const nlohmann::json::string_t& tagName = data.at("tag_name");
+
+        int major, minor, patch;
+        ParseVersionNumber(tagName.c_str(), major, minor, patch);
+
+        updateChecker.SetLatestVersion(major, minor, patch);
+    } catch (std::out_of_range&) {}
+#endif
+}
+
+void UpdateCheckerThread::RequestThread()
+{
+    // Initialize the curl client
+    InitClient();
+
+    while (handle && shouldBeActive) {
+        std::unique_lock<std::mutex> l(clientWakeMutex);
+        DoRequest();
+
+        const std::chrono::seconds interval = std::chrono::seconds(Q_max(1, com_updatecheck_interval->integer) * 60);
+
+        clientWake.wait_for(l, interval);
+    }
+
+    ShutdownClient();
+
+    requestThreadIsActive = qfalse;
+}
diff --git a/code/sys/sys_update_checker.h b/code/sys/sys_update_checker.h
new file mode 100644
index 00000000..ac5e8748
--- /dev/null
+++ b/code/sys/sys_update_checker.h
@@ -0,0 +1,109 @@
+/*
+===========================================================================
+Copyright (C) 2025 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#pragma once
+
+#include "sys_local.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    void Sys_UpdateChecker_Init();
+    void Sys_UpdateChecker_Process();
+    void Sys_UpdateChecker_Shutdown();
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifdef __cplusplus
+
+#    include <thread>
+#    include <shared_mutex>
+#    include <chrono>
+#    include <condition_variable>
+
+class UpdateCheckerThread
+{
+public:
+    UpdateCheckerThread();
+    ~UpdateCheckerThread();
+
+    void Init();
+    void Shutdown();
+    bool IsRoutineActive() const;
+
+private:
+    void ShutdownThread();
+
+    void InitClient();
+    void ShutdownClient();
+
+    bool ParseVersionNumber(const char *value, int& major, int& minor, int& patch) const;
+    void RequestThread();
+    void DoRequest();
+
+private:
+    void                   *handle;
+    std::mutex              clientWakeMutex;
+    std::condition_variable clientWake;
+    std::thread            *osThread;
+    qboolean                requestThreadIsActive;
+    qboolean                shouldBeActive;
+};
+
+class UpdateChecker
+{
+public:
+    UpdateChecker();
+    ~UpdateChecker();
+
+    void Init();
+    void Process();
+    void Shutdown();
+
+    bool CheckNewVersion() const;
+    bool CheckNewVersion(int& major, int& minor, int& patch) const;
+    void SetLatestVersion(int major, int minor, int patch);
+
+private:
+    void CheckInitClientThread();
+    bool CanHaveRequestThread() const;
+
+private:
+    //
+    // Version information
+    //
+    int  lastMajor;
+    int  lastMinor;
+    int  lastPatch;
+    bool versionChecked;
+
+    std::chrono::time_point<std::chrono::steady_clock> nextMessageTime;
+
+    UpdateCheckerThread *thread;
+};
+
+extern UpdateChecker updateChecker;
+
+#endif
diff --git a/code/sys/sys_win32.c b/code/sys/sys_win32.c
index c2832a36..0e060e94 100644
--- a/code/sys/sys_win32.c
+++ b/code/sys/sys_win32.c
@@ -20,6 +20,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#ifdef _WIN32_WINNT_WINXP
+  // Use EnumProcesses() with Windows XP compatibility
+#  define PSAPI_VERSION 1
+#endif
+
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
 #include "sys_local.h"
@@ -472,56 +477,78 @@ DIRECTORY SCANNING
 Sys_ListFilteredFiles
 ==============
 */
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, char **list, int *numfiles )
+void Sys_ListFilteredFiles(
+    const char *basedir, const char *subdirs, char *filter, qboolean wantsubs, char **list, int *numfiles
+)
 {
-	char		search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char		filename[MAX_OSPATH];
-	intptr_t	findhandle;
-	struct _finddata_t findinfo;
+    char               search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
+    char               filename[MAX_OSPATH];
+    intptr_t           findhandle;
+    struct _finddata_t findinfo;
 
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
+    if (*numfiles >= MAX_FOUND_FILES - 1) {
+        return;
+    }
 
-	if ( basedir[0] == '\0' ) {
-		return;
-	}
+    if (basedir[0] == '\0') {
+        return;
+    }
 
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s\\%s\\*", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s\\*", basedir );
-	}
+    if (strlen(subdirs)) {
+        Com_sprintf(search, sizeof(search), "%s\\%s\\*", basedir, subdirs);
+    } else {
+        Com_sprintf(search, sizeof(search), "%s\\*", basedir);
+    }
 
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		return;
-	}
+    findhandle = _findfirst(search, &findinfo);
+    if (findhandle == -1) {
+        return;
+    }
 
-	do {
-		if (findinfo.attrib & _A_SUBDIR) {
-			if (Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s\\%s", subdirs, findinfo.name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", findinfo.name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s\\%s", subdirs, findinfo.name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	} while ( _findnext (findhandle, &findinfo) != -1 );
+    do {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..") && Q_stricmp(findinfo.name, "cvs"))) {
+            continue;
+        }
 
-	_findclose (findhandle);
+        if ((findinfo.attrib & _A_SUBDIR) != 0 && wantsubs) {
+            if (strlen(subdirs)) {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s\\%s\\*", subdirs, findinfo.name);
+            } else {
+                Com_sprintf(newsubdirs, sizeof(newsubdirs), "%s", findinfo.name);
+            }
+
+            // recursively iterate into subdirectory
+            Sys_ListFilteredFiles(basedir, newsubdirs, filter, wantsubs, list, numfiles);
+        }
+
+        if (*numfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
+
+        if (strlen(subdirs)) {
+            Com_sprintf(filename, sizeof(filename), "%s\\%s", subdirs, findinfo.name);
+        } else {
+            Q_strncpyz(filename, findinfo.name, sizeof(filename));
+        }
+
+        if (!Com_FilterPath(filter, filename, qfalse)) {
+            continue;
+        }
+
+        list[*numfiles] = CopyString(filename);
+
+        // replace backslashes with forward slashes, if any
+        // FS_ReplaceSeparators would be nice but it does the opposite
+        for (char *c = strchr(list[*numfiles], '\\'); c; c = strchr(list[*numfiles], '\\')) {
+            *c = '/';
+        }
+
+        (*numfiles)++;
+    } while (_findnext(findhandle, &findinfo) != -1);
+
+    _findclose(findhandle);
 }
 
 /*
@@ -531,24 +558,24 @@ strgtr
 */
 static qboolean strgtr(const char *s0, const char *s1)
 {
-	int l0, l1, i;
+    int l0, l1, i;
 
-	l0 = strlen(s0);
-	l1 = strlen(s1);
+    l0 = strlen(s0);
+    l1 = strlen(s1);
 
-	if (l1<l0) {
-		l0 = l1;
-	}
+    if (l1 < l0) {
+        l0 = l1;
+    }
 
-	for(i=0;i<l0;i++) {
-		if (s1[i] > s0[i]) {
-			return qtrue;
-		}
-		if (s1[i] < s0[i]) {
-			return qfalse;
-		}
-	}
-	return qfalse;
+    for (i = 0; i < l0; i++) {
+        if (s1[i] > s0[i]) {
+            return qtrue;
+        }
+        if (s1[i] < s0[i]) {
+            return qfalse;
+        }
+    }
+    return qfalse;
 }
 
 /*
@@ -556,116 +583,121 @@ static qboolean strgtr(const char *s0, const char *s1)
 Sys_ListFiles
 ==============
 */
-char **Sys_ListFiles( const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs )
+char **Sys_ListFiles(const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs)
 {
-	char		search[MAX_OSPATH];
-	int			nfiles;
-	char		**listCopy;
-	char		*list[MAX_FOUND_FILES];
-	struct _finddata_t findinfo;
-	intptr_t		findhandle;
-	int			flag;
-	int			i;
-	int			extLen;
+    char               search[MAX_OSPATH];
+    int                nfiles;
+    char             **listCopy;
+    char              *list[MAX_FOUND_FILES] = {NULL};
+    struct _finddata_t findinfo;
+    intptr_t           findhandle;
+    qboolean           swapped;
+    int                i;
+    char               buffer[64];
 
-	if (filter) {
+    if (directory[0] == NULL) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
+    if (!extension) {
+        extension = "";
+    }
 
-		list[ nfiles ] = 0;
-		*numfiles = nfiles;
+    // passing a slash as extension will find directories,
+    // anything else looks only for files with that extension
+    if (!filter && (extension[0] != '/' || extension[1])) {
+        Q_snprintf(buffer, sizeof(buffer), "*%s", extension);
+        filter = buffer;
+    }
 
-		if (!nfiles)
-			return NULL;
+    if (filter) {
+        nfiles = 0;
+        Sys_ListFilteredFiles(directory, "", filter, wantsubs, list, &nfiles);
 
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
+        list[nfiles] = NULL;
+        *numfiles    = nfiles;
+        if (!nfiles) {
+            return NULL;
+        }
 
-		return listCopy;
-	}
+        listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+        for (i = 0; i < nfiles; i++) {
+            listCopy[i] = list[i];
+        }
+        listCopy[i] = NULL;
 
-	if ( directory[0] == '\0' ) {
-		*numfiles = 0;
-		return NULL;
-	}
+        return listCopy;
+    }
 
-	if ( !extension) {
-		extension = "";
-	}
+    // only enumerate directories from this point onward
+    Com_sprintf(search, 256, "%s\\*", directory);
 
-	// passing a slash as extension will find directories
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		flag = 0;
-	} else {
-		flag = _A_SUBDIR;
-	}
+    // search
+    nfiles     = 0;
+    findhandle = _findfirst(search, &findinfo);
+    if (findhandle == -1) {
+        *numfiles = 0;
+        return NULL;
+    }
 
-	extLen = strlen( extension );
+    do {
+        // Fixed in OPM:
+        // don't show current and parent dir entries twice
+        if (!(Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..") && Q_stricmp(findinfo.name, "cvs"))) {
+            continue;
+        }
 
-	Com_sprintf( search, sizeof(search), "%s\\*%s", directory, extension );
+        if ((findinfo.attrib & _A_SUBDIR) == 0) {
+            continue;
+        }
 
-	// search
-	nfiles = 0;
+        if (nfiles >= MAX_FOUND_FILES - 1) {
+            break;
+        }
 
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		*numfiles = 0;
-		return NULL;
-	}
+        list[nfiles] = CopyString(findinfo.name);
 
-	do {
-		if ( (!wantsubs && flag ^ ( findinfo.attrib & _A_SUBDIR )) || (wantsubs && findinfo.attrib & _A_SUBDIR) ) {
-			if (*extension) {
-				if ( strlen( findinfo.name ) < extLen ||
-					Q_stricmp(
-						findinfo.name + strlen( findinfo.name ) - extLen,
-						extension ) ) {
-					continue; // didn't match
-				}
-			}
-			if ( nfiles == MAX_FOUND_FILES - 1 ) {
-				break;
-			}
-			list[ nfiles ] = CopyString( findinfo.name );
-			nfiles++;
-		}
-	} while ( _findnext (findhandle, &findinfo) != -1 );
+        // replace backslashes with forward slashes
+        // FS_ReplaceSeparators would be nice but it does the opposite
+        for (char *c = strchr(list[nfiles], '\\'); c; c = strchr(list[nfiles], '\\')) {
+            *c = '/';
+        }
 
-	list[ nfiles ] = 0;
+        ++nfiles;
+    } while (_findnext(findhandle, &findinfo) != -1);
 
-	_findclose (findhandle);
+    list[nfiles] = NULL;
 
-	// return a copy of the list
-	*numfiles = nfiles;
+    _findclose(findhandle);
 
-	if ( !nfiles ) {
-		return NULL;
-	}
+    // return a copy of the list
+    *numfiles = nfiles;
 
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
+    if (!nfiles) {
+        return NULL;
+    }
 
-	do {
-		flag = 0;
-		for(i=1; i<nfiles; i++) {
-			if (strgtr(listCopy[i-1], listCopy[i])) {
-				char *temp = listCopy[i];
-				listCopy[i] = listCopy[i-1];
-				listCopy[i-1] = temp;
-				flag = 1;
-			}
-		}
-	} while(flag);
+    listCopy = Z_Malloc((nfiles + 1) * sizeof(*listCopy));
+    for (i = 0; i < nfiles; i++) {
+        listCopy[i] = list[i];
+    }
+    listCopy[i] = NULL;
 
-	return listCopy;
+    // bubble-sort name entries alphabetically, in ascending order
+    do {
+        swapped = qfalse;
+        for (i = 1; i < nfiles; i++) {
+            if (strgtr(listCopy[i - 1], listCopy[i])) {
+                char *temp      = listCopy[i];
+                listCopy[i]     = listCopy[i - 1];
+                listCopy[i - 1] = temp;
+                swapped         = qtrue;
+            }
+        }
+    } while (swapped);
+
+    return listCopy;
 }
 
 /*
@@ -724,6 +756,8 @@ Display an error message
 */
 void Sys_ErrorDialog( const char *error )
 {
+	Sys_Print( va( "%s\n", error ) );
+
 	if( Sys_Dialog( DT_YES_NO, va( "%s. Copy console log to clipboard?", error ),
 			"Error" ) == DR_YES )
 	{
diff --git a/code/sys/win_bounds.cpp b/code/sys/win_bounds.cpp
index 7d8029cb..70e1c9a4 100644
--- a/code/sys/win_bounds.cpp
+++ b/code/sys/win_bounds.cpp
@@ -64,7 +64,7 @@ extern "C"
 
 #ifdef DISABLE_BOUNDS
 
-#include <malloc.h>
+#include <stdlib.h>
 
 void* b_malloc(unsigned int size)
 {
diff --git a/code/sys/win_localization.cpp b/code/sys/win_localization.cpp
index 808993c3..ce46ba75 100644
--- a/code/sys/win_localization.cpp
+++ b/code/sys/win_localization.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,542 +25,534 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "win_localization.h"
 #include <tiki.h>
 
-#define MAX_BUFFERS				3
+#define MAX_BUFFERS             6
 #define MAX_LOCALIZATION_LENGTH 1024
 
 cLocalization *g_localization;
-static char global_buf[MAX_BUFFERS][MAX_LOCALIZATION_LENGTH];
-static char szTemp[ 100 ];
-static size_t buf_index = 0;
+static char    global_buf[MAX_BUFFERS][MAX_LOCALIZATION_LENGTH];
+static char    szTemp[100];
+static size_t  buf_index = 0;
 
 void Sys_InitLocalization()
 {
-	g_localization = new cLocalization;
+    g_localization = new cLocalization;
 }
 
 void Sys_ShutLocalization()
 {
-	delete g_localization;
-	g_localization = NULL;
+    delete g_localization;
+    g_localization = NULL;
 }
 
-const char *Sys_LV_ConvertString( const char *var )
+const char *Sys_LV_ConvertString(const char *var)
 {
-	//
-	// Since 2.0, don't localize messages from fgame.
-	// The client already localize messages it receives
-	//
-	return var;
+    //
+    // Since 2.0, don't localize messages from fgame.
+    // The client already localize messages it receives
+    //
+    return var;
 }
 
-const char *Sys_LV_CL_ConvertString( const char *var )
+const char *Sys_LV_CL_ConvertString(const char *var)
 {
-	return g_localization->ConvertString( var );
+    if (!g_localization) {
+        return var;
+    }
+
+    return g_localization->ConvertString(var);
 }
 
 typedef char *charstar;
-int compare_strings( const void *pe1, const void *pe2 )
+
+int compare_strings(const void *pe1, const void *pe2)
 {
-	const char *psz1 = ( const char * )pe1;
-	const char *psz2 = ( const char * )pe2;
-	return strcmp( psz1, psz2 );
+    const char *psz1 = (const char *)pe1;
+    const char *psz2 = (const char *)pe2;
+    return Q_stricmp(psz1, psz2);
 }
 
 cLocalization::cLocalization()
 {
-	int i;
-	int iFileCount;
-	char **ppszFiles;
-	char szFilename[ MAX_QPATH ];
-	size_t iBasePos;
+    int    i;
+    int    iFileCount;
+    char **ppszFiles;
+    char   szFilename[MAX_QPATH];
+    size_t iBasePos;
 
-	ppszFiles = FS_ListFilteredFiles( "global", "txt", "localization*.txt", qfalse, &iFileCount, qtrue );
-	strcpy( szFilename, "global/" );
-	memset( szFilename + 8, 0, sizeof( szFilename ) - 8 );
-	iBasePos = strlen( szFilename );
+    ppszFiles = FS_ListFilteredFiles("global", "txt", "localization*.txt", qfalse, &iFileCount, qtrue);
+    Q_strncpyz(szFilename, "global/", sizeof(szFilename));
+    memset(szFilename + 8, 0, sizeof(szFilename) - 8);
+    iBasePos = strlen(szFilename);
 
-	Com_Printf( "-- Localization: I see %d localization files\n", iFileCount );
-	qsort( ppszFiles, iFileCount, sizeof( char * ), compare_strings );
-	for( i = 0; i < iFileCount; i++ )
-	{
-		strcpy( szFilename + iBasePos, ppszFiles[ i ] );
-		Com_Printf( "--- Localization: reading file %s\n", szFilename );
-		LoadFile( szFilename );
-	}
+    Com_Printf("-- Localization: I see %d localization files\n", iFileCount);
+    qsort(ppszFiles, iFileCount, sizeof(char *), compare_strings);
+    for (i = 0; i < iFileCount; i++) {
+        Q_strncpyz(szFilename + iBasePos, ppszFiles[i], sizeof(szFilename) - iBasePos);
+        Com_Printf("--- Localization: reading file %s\n", szFilename);
+        LoadFile(szFilename);
+    }
 
-	memcpy( szFilename + iBasePos, "localization.txt", 17 );
-	Com_Printf( "--- Localization: reading file %s\n", szFilename );
-	LoadFile( szFilename );
-
-	FS_FreeFileList( ppszFiles );
+    FS_FreeFileList(ppszFiles);
 }
 
-void cLocalization::LoadFile( const char *name )
+void cLocalization::LoadFile(const char *name)
 {
-	TikiScript tiki;
-	const char *token;
-	loc_entry_t new_entry;
-	const char *p, *p2;
-	size_t rl;
-	size_t ll;
+    TikiScript  tiki;
+    const char *token;
+    loc_entry_t new_entry;
+    const char *p, *p2;
+    size_t      rl;
+    size_t      ll;
+    size_t      i;
 
-	Com_Printf( "Loading Localization File %s\n", name );
+    Com_Printf("Loading Localization File %s\n", name);
 
-	if( !tiki.LoadFile( name, qtrue ) )
-	{
-		Com_Printf( "--- Error: File Not Found\n" );
-		return;
-	}
+    if (!tiki.LoadFile(name, qtrue)) {
+        Com_Printf("--- Error: File Not Found\n");
+        return;
+    }
 
-	while( tiki.TokenAvailable( qtrue ) )
-	{
-		token = tiki.GetToken( qtrue );
+    while (tiki.TokenAvailable(qtrue)) {
+        token = tiki.GetToken(qtrue);
 
-		if( !Q_stricmp( token, "{" ) )
-		{
-			if( !tiki.TokenAvailable( qtrue ) ) {
-				break;
-			}
+        if (!Q_stricmp(token, "{")) {
+            if (!tiki.TokenAvailable(qtrue)) {
+                break;
+            }
 
-			token = tiki.GetToken( qtrue );
-			new_entry.m_refName = token;
+            token               = tiki.GetToken(qtrue);
+            new_entry.m_refName = token;
 
-			rl = strlen( token );
-			p = strstr( token, "&&&" );
+            rl = strlen(token);
+            p  = strstr(token, "&&&");
 
-			if( p )
-			{
-				new_entry.m_r1_rep = p - token;
-				p2 = p + 3;
-				p = strstr( p2, "&&&" );
+            if (p) {
+                new_entry.m_r1_rep = p - token;
+                p2                 = p + 3;
+                p                  = strstr(p2, "&&&");
 
-				if( p )
-				{
-					new_entry.m_r2_rep = p - p2;
-					new_entry.m_r3_rep = strlen( p + 3 );
-				}
-				else
-				{
-					new_entry.m_r2_rep = strlen( p2 );
-					new_entry.m_r3_rep = -1;
-				}
-			}
-			else
-			{
-				new_entry.m_r1_rep = rl;
-				new_entry.m_r2_rep = -1;
-				new_entry.m_r3_rep = -1;
-				new_entry.m_l1_rep = -1;
-				new_entry.m_l2_rep = -1;
-				new_entry.m_l3_rep = -1;
-			}
+                if (p) {
+                    new_entry.m_r2_rep = p - p2;
+                    new_entry.m_r3_rep = strlen(p + 3);
+                } else {
+                    new_entry.m_r2_rep = strlen(p2);
+                    new_entry.m_r3_rep = -1;
+                }
+            } else {
+                new_entry.m_r1_rep = rl;
+                new_entry.m_r2_rep = -1;
+                new_entry.m_r3_rep = -1;
+                new_entry.m_l1_rep = -1;
+                new_entry.m_l2_rep = -1;
+                new_entry.m_l3_rep = -1;
+            }
 
-			if( !tiki.TokenAvailable( qtrue ) )
-			{
-				Com_Printf( "--- Error: EOF Found without LocName. Last RefName was %s. (Misspelling/Unused)\n", new_entry.m_refName.c_str() );
-				break;
-			}
+            if (!tiki.TokenAvailable(qtrue)) {
+                Com_Printf(
+                    "--- Error: EOF Found without LocName. Last RefName was %s. (Misspelling/Unused)\n",
+                    new_entry.m_refName.c_str()
+                );
+                break;
+            }
 
-			token = tiki.GetToken( qtrue );
-			new_entry.m_locName = token;
+            token               = tiki.GetToken(qtrue);
+            new_entry.m_locName = token;
 
-			ll = strlen( token );
-			p = strstr( token, "&&&" );
+            ll = strlen(token);
+            p  = strstr(token, "&&&");
 
-			if( p )
-			{
-				new_entry.m_l1_rep = p - token;
-				p2 = p + 3;
-				p = strstr( p2, "&&&" );
+            if (p) {
+                new_entry.m_l1_rep = p - token;
+                p2                 = p + 3;
+                p                  = strstr(p2, "&&&");
 
-				if( p )
-				{
-					new_entry.m_l2_rep = p - p2;
-					new_entry.m_l3_rep = strlen( p + 3 );
-				}
-				else
-				{
-					new_entry.m_l2_rep = strlen( p2 );
-					new_entry.m_l3_rep = -1;
-				}
-			}
-			else
-			{
-				new_entry.m_r1_rep = rl;
-				new_entry.m_r2_rep = -1;
-				new_entry.m_r3_rep = -1;
-				new_entry.m_l1_rep = ll;
-				new_entry.m_l2_rep = -1;
-				new_entry.m_l3_rep = -1;
-			}
+                if (p) {
+                    new_entry.m_l2_rep = p - p2;
+                    new_entry.m_l3_rep = strlen(p + 3);
+                } else {
+                    new_entry.m_l2_rep = strlen(p2);
+                    new_entry.m_l3_rep = -1;
+                }
+            } else {
+                new_entry.m_r1_rep = rl;
+                new_entry.m_r2_rep = -1;
+                new_entry.m_r3_rep = -1;
+                new_entry.m_l1_rep = ll;
+                new_entry.m_l2_rep = -1;
+                new_entry.m_l3_rep = -1;
+            }
 
-			m_entries.AddObject( new_entry );
+            for (i = 1; i <= m_entries.NumObjects(); i++) {
+                if (new_entry.m_refName == m_entries.ObjectAt(i).m_refName) {
+                    break;
+                }
+            }
 
-			if( !tiki.TokenAvailable( qtrue ) ) {
-				break;
-			}
+            if (i == m_entries.NumObjects() + 1) {
+                m_entries.AddObject(new_entry);
+            }
 
-			token = tiki.GetToken( qtrue );
+            if (!tiki.TokenAvailable(qtrue)) {
+                break;
+            }
 
-			if( Q_stricmp( token, "}" ) )
-			{
-				Com_Printf( "--- Error: Invalid Entry... RefName: %s\t\tLocName: %s  Attempting to Recover.\n", new_entry.m_refName.c_str(), new_entry.m_locName.c_str() );
-				do
-				{
-					if( !tiki.TokenAvailable( qtrue ) )
-					{
-						Com_Printf( "--- Error: EOF Found. Unable to Recover from Error. \n" );
-						break;
-					}
+            token = tiki.GetToken(qtrue);
 
-					token = tiki.GetToken( qtrue );
-				} while( Q_stricmp( token, "}" ) );
+            if (Q_stricmp(token, "}")) {
+                Com_Printf(
+                    "--- Error: Invalid Entry... RefName: %s\t\tLocName: %s  Attempting to Recover.\n",
+                    new_entry.m_refName.c_str(),
+                    new_entry.m_locName.c_str()
+                );
+                do {
+                    if (!tiki.TokenAvailable(qtrue)) {
+                        Com_Printf("--- Error: EOF Found. Unable to Recover from Error. \n");
+                        break;
+                    }
 
-				Com_Printf( "--- Warning: Recovered From Error, Data May have been lost.\n" );
-			}
-		}
-	}
+                    token = tiki.GetToken(qtrue);
+                } while (Q_stricmp(token, "}"));
 
-	Com_Printf( "Loaded %d localization entries\n", m_entries.NumObjects() );
+                Com_Printf("--- Warning: Recovered From Error, Data May have been lost.\n");
+            }
+        }
+    }
+
+    Com_Printf("Loaded %d localization entries\n", m_entries.NumObjects());
 }
 
-static int bjb_strnscmp( const char *a, const char *b, size_t n )
+static int bjb_strnscmp(const char *a, const char *b, size_t n)
 {
-	while( 1 )
-	{
-		while( isspace( *a ) )
-			a++;
-		while( isspace( *b ) )
-			b++;
-		while( *a && *a == *b )
-			a++, b++;
-		if( isspace( *a ) )
-		{
-			if( isalnum( a[ -1 ] ) && isalnum( *b ) )
-				break;
-		}
-		else if( isspace( *b ) )
-		{
-			if( isalnum( b[ -1 ] ) && isalnum( *a ) )
-				break;
-		}
-		else
-			break;
-	}
-	return *a - *b;
+    int i;
+
+    while (n > 0 && *a && *b) {
+        if (*a == *b) {
+            a++;
+            b++;
+            n--;
+            continue;
+        }
+
+        if (!isspace((unsigned char)*a) || !isspace((unsigned char)*b)) {
+            return *a - *b;
+        }
+
+        while (n > 0 && *a && isspace(*a)) {
+            a++;
+            n--;
+        }
+
+        while (*b && isspace(*b)) {
+            b++;
+        }
+    }
+
+    while (n > 0 && *a && isspace(*a)) {
+        a++;
+        n--;
+    }
+
+    while (*b && isspace(*b)) {
+        b++;
+    }
+
+    if (n <= 0) {
+        return 0;
+    }
+
+    return *a - *b;
 }
 
-static void bjb_rebreak( const char *var, char *buf, size_t max )
+static void bjb_rebreak(const char *var, char *buf, size_t max)
 {
-	const char *nl;
-	char *rb, *rb1, *rb2;
+#if 0
+    const char *nl;
+    char       *rb, *rb1, *rb2;
 
-	nl = strchr( var, '\n' );
-	if( !nl || nl >= &var[ max ] ) {
-		return;
-	}
+    nl = strchr(var, '\n');
+    if (!nl || nl >= &var[max]) {
+        return;
+    }
 
-	while( 1 )
-	{
-		rb = &buf[ nl - var ];
-		rb1 = &buf[ nl - var ];
-		rb2 = &buf[ nl - var ];
+    while (1) {
+        rb  = &buf[nl - var];
+        rb1 = &buf[nl - var];
+        rb2 = &buf[nl - var];
 
-		if( strlen( buf ) < nl - var ) {
-			return;
-		}
+        if (strlen(buf) < nl - var) {
+            return;
+        }
 
-		while( rb1 > var && !isspace( *rb1 ) )
-			rb1--;
-		while( *rb2 && rb2 < &var[ max ] && !isspace( *rb2 ) )
-			rb2++;
+        while (rb1 > var && !isspace(*rb1)) {
+            rb1--;
+        }
+        while (*rb2 && rb2 < &var[max] && !isspace(*rb2)) {
+            rb2++;
+        }
 
-		if( rb1 < var )
-		{
-			if( !*rb2 || !isspace( *rb2 ) ) {
-				return;
-			}
+        if (rb1 < var) {
+            if (!*rb2 || !isspace(*rb2)) {
+                return;
+            }
 
-			goto _set_new_line;
-		}
+            goto _set_new_line;
+        }
 
-		if( !*rb2 || !isspace( *rb1 ) || !isspace( *rb2 ) )
-		{
-			if( rb1 >= var && isspace( *rb1 ) ) {
-				*rb1 = '\n';
-				goto _new_line_set;
-			} else if( !*rb2 || !isspace( *rb2 ) ) {
-				return;
-			}
+        if (!*rb2 || !isspace(*rb1) || !isspace(*rb2)) {
+            if (rb1 >= var && isspace(*rb1)) {
+                *rb1 = '\n';
+                goto _new_line_set;
+            } else if (!*rb2 || !isspace(*rb2)) {
+                return;
+            }
 
-			goto _set_new_line;
-		}
+            goto _set_new_line;
+        }
 
-		if( rb - rb1 - 4 <= rb2 - rb )
-		{
-			*rb1 = '\n';
-			goto _new_line_set;
-		}
+        if (rb - rb1 - 4 <= rb2 - rb) {
+            *rb1 = '\n';
+            goto _new_line_set;
+        }
 
-_set_new_line:
-		*rb2 = '\n';
-_new_line_set:
-		nl = strchr( nl + 1, '\n' );
-		if( !nl || nl >= &var[ max ] ) {
-			return;
-		}
-	}
+    _set_new_line:
+        *rb2 = '\n';
+    _new_line_set:
+        nl = strchr(nl + 1, '\n');
+        if (!nl || nl >= &var[max]) {
+            return;
+        }
+    }
+#endif
 }
 
-const char *cLocalization::ConvertString( const char *var )
+const char *cLocalization::ConvertString(const char *var)
 {
-	size_t l;
-	intptr_t i, m, n, o;
-	intptr_t nArg1;
-	const char *pArg1, *pArg2;
-	const char *pRef;
-	const char *pVar;
-	const char *pAfter;
-	const char *pSrc;
-	intptr_t nAfter, nBefore;
-	intptr_t n1, n2;
-	loc_entry_t *entry;
-	str s1, s2;
+    size_t       l;
+    intptr_t     i, m, n, o;
+    intptr_t     nArg1;
+    const char  *pArg1, *pArg2;
+    const char  *pRef;
+    const char  *pVar;
+    const char  *pAfter;
+    const char  *pSrc;
+    intptr_t     nAfter, nBefore;
+    intptr_t     n1, n2;
+    loc_entry_t *entry;
+    str          s1, s2;
 
-	l = strlen( var );
+    if (!*var) {
+        return var;
+    }
 
-	for( o = l; o > 0; o-- )
-	{
-		if( var[ o - 1 ] >= ' ' ) {
-			break;
-		}
-	}
+    l = strlen(var);
+    o = l;
 
-	pRef = &var[ o ];
-	m = l - o;
-	n = 0;
+    while (o && var[o - 1] < ' ') {
+        o--;
+    }
 
-	for( pVar = var; o > 0; o-- )
-	{
-		if( *pVar >= ' ' ) {
-			break;
-		}
+    pRef = &var[o];
+    pVar = var;
+    m    = l - o;
+    n    = 0;
 
-		pVar++;
-		n++;
-	}
+    while (o && (unsigned char)*pVar < ' ') {
+        o--;
+        pVar++;
+        n++;
+    }
 
-	char* buf = global_buf[(buf_index++) % MAX_BUFFERS];
-	for( i = 1; i <= m_entries.NumObjects(); i++ )
-	{
-		entry = &m_entries.ObjectAt( i );
+    char *buf = global_buf[(buf_index++) % MAX_BUFFERS];
+    for (i = 1; i <= m_entries.NumObjects(); i++) {
+        entry = &m_entries.ObjectAt(i);
 
-		if( entry->m_r2_rep < 0 )
-		{
-			if( entry->m_r1_rep != o || bjb_strnscmp( pVar, entry->m_refName.c_str(), o ) ) {
-				continue;
-			}
+        if (entry->m_r2_rep < 0) {
+            if (entry->m_r1_rep != o || bjb_strnscmp(pVar, entry->m_refName.c_str(), o)) {
+                continue;
+            }
 
-			if( !( m + n ) )
-			{
-				strncpy( buf, entry->m_locName, MAX_LOCALIZATION_LENGTH );
-				bjb_rebreak( var, buf, MAX_LOCALIZATION_LENGTH );
-				return buf;
-			}
+            if (!(m + n)) {
+                strncpy(buf, entry->m_locName, MAX_LOCALIZATION_LENGTH);
+                bjb_rebreak(var, buf, MAX_LOCALIZATION_LENGTH);
+                return buf;
+            }
 
-			if( entry->m_l1_rep + m + n < MAX_LOCALIZATION_LENGTH )
-			{
-				memcpy( buf, var, n );
-				memcpy( &buf[ n ], entry->m_locName.c_str(), entry->m_l1_rep );
-				memcpy( &buf[ entry->m_l1_rep + n ], pRef, m );
-				buf[ entry->m_l1_rep + m + n ] = 0;
-				bjb_rebreak( var, buf, entry->m_l1_rep );
-				return buf;
-			} else {
-				return var;
-			}
-		}
+            if (entry->m_l1_rep + m + n < MAX_LOCALIZATION_LENGTH) {
+                memcpy(buf, var, n);
+                memcpy(&buf[n], entry->m_locName.c_str(), entry->m_l1_rep);
+                memcpy(&buf[entry->m_l1_rep + n], pRef, m);
+                buf[entry->m_l1_rep + m + n] = 0;
+                bjb_rebreak(var, buf, entry->m_l1_rep);
+                return buf;
+            } else {
+                return var;
+            }
+        }
 
-		nArg1 = entry->m_r1_rep + entry->m_r2_rep;
-		if( entry->m_r3_rep >= 0 ) {
-			nArg1 += entry->m_r3_rep;
-		}
+        nArg1 = entry->m_r1_rep + entry->m_r2_rep;
+        if (entry->m_r3_rep >= 0) {
+            nArg1 += entry->m_r3_rep;
+        }
 
-		if( nArg1 > o ) {
-			continue;
-		}
+        if (nArg1 > o) {
+            continue;
+        }
 
-		if( bjb_strnscmp( pVar, entry->m_refName.c_str(), entry->m_r1_rep ) ) {
-			continue;
-		}
+        if (bjb_strnscmp(pVar, entry->m_refName.c_str(), entry->m_r1_rep)) {
+            continue;
+        }
 
-		pSrc = &pVar[ entry->m_r1_rep ];
+        pSrc = &pVar[entry->m_r1_rep];
 
-		if( entry->m_r3_rep >= 0 )
-		{
-			pAfter = &entry->m_refName[ entry->m_r1_rep + 3 ];
+        if (entry->m_r3_rep >= 0) {
+            pAfter = &entry->m_refName[entry->m_r1_rep + 3];
 
-			if( entry->m_r2_rep > 100 ) {
-				continue;
-			}
+            if (entry->m_r2_rep > 100) {
+                continue;
+            }
 
-			strncpy( szTemp, pAfter, entry->m_r2_rep );
-			szTemp[ entry->m_r2_rep ] = 0;
+            strncpy(szTemp, pAfter, entry->m_r2_rep);
+            szTemp[entry->m_r2_rep] = 0;
 
-			pArg1 = strstr( pSrc, szTemp );
+            pArg1 = strstr(pSrc, szTemp);
 
-			if( !pArg1 ) {
-				continue;
-			}
+            if (!pArg1) {
+                continue;
+            }
 
-			nAfter = pArg1 - pSrc;
-			pArg2 = &pArg1[ entry->m_r2_rep ];
+            nAfter = pArg1 - pSrc;
+            pArg2  = &pArg1[entry->m_r2_rep];
 
-			if( entry->m_r3_rep > 0 )
-			{
-				if( strlen( pArg2 ) < entry->m_r3_rep ) {
-					continue;
-				}
+            if (entry->m_r3_rep > 0) {
+                if (strlen(pArg2) < entry->m_r3_rep) {
+                    continue;
+                }
 
-				if( bjb_strnscmp( &pVar[ o - entry->m_r3_rep ], &pAfter[ entry->m_r2_rep + 3 ], entry->m_r3_rep ) ) {
-					continue;
-				}
+                if (bjb_strnscmp(&pVar[o - entry->m_r3_rep], &pAfter[entry->m_r2_rep + 3], entry->m_r3_rep)) {
+                    continue;
+                }
 
-				nBefore = &pVar[ o - entry->m_r3_rep ] - pArg2;
-			} else {
-				nBefore = o - ( pArg2 - pVar );
-			}
-		}
-		else
-		{
-			if( entry->m_r2_rep > 0 )
-			{
-				if( bjb_strnscmp( &pVar[ o - entry->m_r2_rep ], &entry->m_refName[ entry->m_r1_rep + 3 ], entry->m_r2_rep ) ) {
-					continue;
-				}
+                nBefore = &pVar[o - entry->m_r3_rep] - pArg2;
+            } else {
+                nBefore = o - (pArg2 - pVar);
+            }
+        } else {
+            if (entry->m_r2_rep > 0) {
+                if (bjb_strnscmp(&pVar[o - entry->m_r2_rep], &entry->m_refName[entry->m_r1_rep + 3], entry->m_r2_rep)) {
+                    continue;
+                }
 
-				nAfter = &pVar[ o - entry->m_r2_rep ] - pSrc;
-			}
-			else
-			{
-				nAfter = o - entry->m_r1_rep;
-			}
+                nAfter = &pVar[o - entry->m_r2_rep] - pSrc;
+            } else {
+                nAfter = o - entry->m_r1_rep;
+            }
 
-			pArg2 = NULL;
-			nBefore = -1;
-		}
+            pArg2   = NULL;
+            nBefore = -1;
+        }
 
-		n1 = 0;
-		n2 = 0;
-		if( n > 0 )
-		{
-			if( n >= 1024 ) {
-				continue;
-			}
+        n1 = 0;
+        n2 = 0;
+        if (n > 0) {
+            if (n >= 1024) {
+                continue;
+            }
 
-			memcpy( buf, var, n );
-			n2 = n;
-		}
+            memcpy(buf, var, n);
+            n2 = n;
+        }
 
-		if( entry->m_l1_rep >= 0 )
-		{
-			if( entry->m_l1_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l1_rep >= 0) {
+            if (entry->m_l1_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l1_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ 0 ], entry->m_l1_rep );
-			}
+            if (entry->m_l1_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[0], entry->m_l1_rep);
+            }
 
-			n2 += entry->m_l1_rep;
-			n1 = entry->m_l1_rep + 3;
-		}
+            n2 += entry->m_l1_rep;
+            n1 = entry->m_l1_rep + 3;
+        }
 
-		if( nAfter >= 0 )
-		{
-			if( nAfter + n2 >= 1024 ) {
-				continue;
-			}
+        if (nAfter >= 0) {
+            if (nAfter + n2 >= 1024) {
+                continue;
+            }
 
-			if( nAfter > 0 ) {
-				memcpy( &buf[ n2 ], pSrc, nAfter );
-			}
+            if (nAfter > 0) {
+                memcpy(&buf[n2], pSrc, nAfter);
+            }
 
-			n2 += nAfter;
-		}
+            n2 += nAfter;
+        }
 
-		if( entry->m_l2_rep >= 0 )
-		{
-			if( entry->m_l2_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l2_rep >= 0) {
+            if (entry->m_l2_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l2_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ n1 ], entry->m_l2_rep );
-			}
+            if (entry->m_l2_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[n1], entry->m_l2_rep);
+            }
 
-			n2 += entry->m_l2_rep;
-			n1 += entry->m_l2_rep + 3;
-		}
+            n2 += entry->m_l2_rep;
+            n1 += entry->m_l2_rep + 3;
+        }
 
-		if( nBefore >= 0 )
-		{
-			if( nBefore + n2 >= 1024 ) {
-				continue;
-			}
+        if (nBefore >= 0) {
+            if (nBefore + n2 >= 1024) {
+                continue;
+            }
 
-			if( nBefore > 0 ) {
-				memcpy( &buf[ n2 ], pArg2, nBefore );
-			}
+            if (nBefore > 0) {
+                memcpy(&buf[n2], pArg2, nBefore);
+            }
 
-			n2 += nBefore;
-		}
+            n2 += nBefore;
+        }
 
-		if( entry->m_l3_rep >= 0 )
-		{
-			if( entry->m_l3_rep + n2 >= 1024 ) {
-				continue;
-			}
+        if (entry->m_l3_rep >= 0) {
+            if (entry->m_l3_rep + n2 >= 1024) {
+                continue;
+            }
 
-			if( entry->m_l3_rep > 0 ) {
-				memcpy( &buf[ n2 ], &entry->m_locName[ n1 ], entry->m_l3_rep );
-			}
+            if (entry->m_l3_rep > 0) {
+                memcpy(&buf[n2], &entry->m_locName[n1], entry->m_l3_rep);
+            }
 
-			n2 += entry->m_l3_rep;
-		}
+            n2 += entry->m_l3_rep;
+        }
 
-		if( m <= 0 || m + n2 < 1024 )
-		{
-			if( m + n2 < 1024 ) {
-				memcpy( &buf[ n2 ], pRef, m );
-				n2 += m;
-			}
+        if (m <= 0 || m + n2 < 1024) {
+            if (m + n2 < 1024) {
+                memcpy(&buf[n2], pRef, m);
+                n2 += m;
+            }
 
-			buf[ n2 ] = 0;
-			bjb_rebreak( var, buf, n2 );
-			return buf;
-		}
-	}
+            buf[n2] = 0;
+            bjb_rebreak(var, buf, n2);
+            return buf;
+        }
+    }
 
-	if( !developer->integer || !var[ 0 ] || !var[ 1 ] ) {
-		return var;
-	}
+    if (!developer->integer || !var[0] || !var[1]) {
+        return var;
+    }
 
-	i = 0;
+    i = 0;
 
-	while( !isspace( var[ i ] ) )
-	{
-		i++;
-		if( !var[ i ] ) {
-			return var;
-		}
-	}
+    while (var[i] < 0 || !isspace(var[i])) {
+        i++;
+        if (!var[i]) {
+            return var;
+        }
+    }
 
-	if( !missing.ObjectInList( var ) )
-	{
-		missing.AddUniqueObject( var );
-		Com_DPrintf( "LOCALIZATION ERROR: '%s' does not have a localization entry\n", var );
-	}
+    if (!missing.ObjectInList(var)) {
+        missing.AddUniqueObject(var);
+        Com_DPrintf("LOCALIZATION ERROR: '%s' does not have a localization entry\n", var);
+    }
 
-	return var;
+    return var;
 }
diff --git a/code/sys/win_localization.h b/code/sys/win_localization.h
index ac65c14b..c49c5cff 100644
--- a/code/sys/win_localization.h
+++ b/code/sys/win_localization.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2025 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -30,32 +30,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 
 #ifdef __cplusplus
-#include "str.h"
-#include "container.h"
+#    include "str.h"
+#    include "container.h"
 
 typedef struct {
-	str			m_refName;
-	str			m_locName;
-	intptr_t	m_r1_rep;
-	intptr_t	m_r2_rep;
-	intptr_t	m_r3_rep;
-	intptr_t	m_l1_rep;
-	intptr_t	m_l2_rep;
-	intptr_t	m_l3_rep;
+    str      m_refName;
+    str      m_locName;
+    intptr_t m_r1_rep;
+    intptr_t m_r2_rep;
+    intptr_t m_r3_rep;
+    intptr_t m_l1_rep;
+    intptr_t m_l2_rep;
+    intptr_t m_l3_rep;
 } loc_entry_t;
 
-class cLocalization {
-	Container< loc_entry_t > m_entries;
-	Container< str > missing;
+class cLocalization
+{
+    Container<loc_entry_t> m_entries;
+    Container<str>         missing;
 
 public:
-	cLocalization();
+    cLocalization();
 
-	const char		*ConvertString( const char *var );
+    const char *ConvertString(const char *var);
 
 private:
-	void			LoadFile( const char *name );
-	void			GenerateMissing( const char *file_name );
+    void LoadFile(const char *name);
+    void GenerateMissing(const char *file_name);
 };
 #endif
-
diff --git a/code/sys/win_resource.rc b/code/sys/win_resource.rc
index 455a6d7d..2b15dcea 100644
--- a/code/sys/win_resource.rc
+++ b/code/sys/win_resource.rc
@@ -70,11 +70,13 @@ BEGIN
     IDS_STRING1             "OpenMoHAA"
 END
 
+#ifndef NO_RC_MANIFEST
 /////////////////////////////////////////////////////////////////////////////
 //
 // Application Manifest
 //
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "win_manifest.xml"
+#endif
 
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
diff --git a/code/tiki/CMakeLists.txt b/code/tiki/CMakeLists.txt
index 9eeaba4c..cb9ebff0 100644
--- a/code/tiki/CMakeLists.txt
+++ b/code/tiki/CMakeLists.txt
@@ -1,14 +1,28 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
+
 project(omohtiki)
 
-file(GLOB_RECURSE SOURCES_TIKI "./*.c" "./*.cpp")
+set(SOURCES_TIKI
+	"./tiki_anim.cpp"
+	"./tiki_cache.cpp"
+	"./tiki_commands.cpp"
+	"./tiki_files.cpp"
+	"./tiki_frame.cpp"
+	"./tiki_imports.cpp"
+	"./tiki_parse.cpp"
+	"./tiki_skel.cpp"
+	"./tiki_surface.cpp"
+	"./tiki_tag.cpp"
+	"./tiki_utility.cpp"
+)
 
-set(COMMON_TIKI_SRCS
+
+set(SOURCES_TIKI_COMMON
 	"../qcommon/tiki_main.cpp"
 	"../qcommon/tiki_script.cpp"
 )
 
-add_library(omohtiki STATIC ${SOURCES_TIKI} ${COMMON_TIKI_SRCS})
+add_library(omohtiki STATIC ${SOURCES_TIKI} ${SOURCES_TIKI_COMMON})
 target_compile_features(omohtiki PRIVATE cxx_nullptr)
 target_compile_features(omohtiki PRIVATE c_variadic_macros)
 target_link_libraries(omohtiki PUBLIC qcommon)
\ No newline at end of file
diff --git a/code/tiki/tiki_anim.cpp b/code/tiki/tiki_anim.cpp
index b6870b6c..42f2c20a 100644
--- a/code/tiki/tiki_anim.cpp
+++ b/code/tiki/tiki_anim.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -34,11 +34,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 AnimCompareFunc
 ===============
 */
-static void* context;
-static int AnimCompareFunc(const void *a, const void *b )
+static void *context;
+
+static int AnimCompareFunc(const void *a, const void *b)
 {
-	dloaddef_t *ld = (dloaddef_t*)context;
-	return stricmp( ld->loadanims[ *( int * )a ]->alias, ld->loadanims[ *( int * )b ]->alias );
+    dloaddef_t *ld = (dloaddef_t *)context;
+    return stricmp(ld->loadanims[*(int *)a]->alias, ld->loadanims[*(int *)b]->alias);
 }
 
 /*
@@ -46,14 +47,15 @@ static int AnimCompareFunc(const void *a, const void *b )
 TIKI_GetAnimOrder
 ===============
 */
-void TIKI_GetAnimOrder( dloaddef_t *ld, int *order )
+void TIKI_GetAnimOrder(dloaddef_t *ld, int *order)
 {
-	int i;
+    int i;
 
-	for( i = 0; i < ld->numanims; i++ )
-		order[ i ] = i;
-	context = ld;
-	qsort( order, ld->numanims, sizeof( int ), AnimCompareFunc);
+    for (i = 0; i < ld->numanims; i++) {
+        order[i] = i;
+    }
+    context = ld;
+    qsort(order, ld->numanims, sizeof(int), AnimCompareFunc);
 }
 
 /*
@@ -61,10 +63,20 @@ void TIKI_GetAnimOrder( dloaddef_t *ld, int *order )
 TIKI_Anim_NameForNum
 ===============
 */
-const char *TIKI_Anim_NameForNum( dtiki_t *pmdl, int animnum )
-{ 
-	dtikianimdef_t *panimdef = pmdl->a->animdefs[ animnum ];
-	return panimdef->alias;
+const char *TIKI_Anim_NameForNum(dtiki_t *pmdl, int animnum)
+{
+    dtikianimdef_t *panimdef;
+
+    if (!pmdl || !pmdl->a) {
+        return NULL;
+    }
+
+    if (animnum < 0 || animnum >= pmdl->a->num_anims) {
+        return NULL;
+    }
+
+    panimdef = pmdl->a->animdefs[animnum];
+    return panimdef->alias;
 }
 
 /*
@@ -72,121 +84,97 @@ const char *TIKI_Anim_NameForNum( dtiki_t *pmdl, int animnum )
 TIKI_Anim_NumForName
 ===============
 */
-int TIKI_Anim_NumForName( dtiki_t *pmdl, const char *name )
+int TIKI_Anim_NumForName(dtiki_t *pmdl, const char *name)
 {
-	int iTop;
-	int iBottom;
-	int iMiddle;
-	int iComp;
-	dtikianimdef_t *panimdef;
-	float fAnimWeights[ MAX_FRAMEINFOS ];
-	float fWeight;
-	float fTotalWeight;
-	int iAnimCount;
-	int i, k;
+    int             iTop;
+    int             iBottom;
+    int             iMiddle;
+    int             iComp;
+    dtikianimdef_t *panimdef;
+    float           fAnimWeights[MAX_FRAMEINFOS];
+    float           fWeight;
+    float           fTotalWeight;
+    int             iAnimCount;
+    int             i, k;
 
-	if( !pmdl )
-	{
-		return -1;
-	}
+    if (!pmdl) {
+        return -1;
+    }
 
-	iBottom = 0;
-	iTop = pmdl->a->num_anims - 1;
+    iBottom = 0;
+    iTop    = pmdl->a->num_anims - 1;
 
-	while( iBottom <= iTop )
-	{
-		iMiddle = ( iBottom + iTop ) / 2;
+    while (iBottom <= iTop) {
+        iMiddle = (iBottom + iTop) / 2;
 
-		panimdef = pmdl->a->animdefs[ iMiddle ];
-		if( !panimdef )
-		{
-			iComp = -1;
-		}
-		else
-		{
-			iComp = stricmp( panimdef->alias, name );
-		}
+        panimdef = pmdl->a->animdefs[iMiddle];
+        iComp = stricmp(panimdef->alias, name);
 
-		if( !iComp )
-		{
-			if( !( panimdef->flags & TAF_RANDOM ) )
-			{
-				return iMiddle;
-			}
+        if (!iComp) {
+            if (!(panimdef->flags & TAF_RANDOM)) {
+                return iMiddle;
+            }
 
-			for( i = iMiddle; i > 0; i-- )
-			{
-				if( !pmdl->a->animdefs[ i - 1 ] || stricmp( panimdef->alias, pmdl->a->animdefs[ i - 1 ]->alias ) ) {
-					break;
-				}
-			}
+            for (i = iMiddle; i > 0; i--) {
+                if (!pmdl->a->animdefs[i - 1] || stricmp(panimdef->alias, pmdl->a->animdefs[i - 1]->alias)) {
+                    break;
+                }
+            }
 
-			k = i;
+            k = i;
 
-			for( iMiddle++; iMiddle < pmdl->a->num_anims; iMiddle++ )
-			{
-				if( !pmdl->a->animdefs[ iMiddle ] || stricmp( panimdef->alias, pmdl->a->animdefs[ iMiddle ]->alias ) ) {
-					break;
-				}
-			}
+            for (iMiddle++; iMiddle < pmdl->a->num_anims; iMiddle++) {
+                if (!pmdl->a->animdefs[iMiddle] || stricmp(panimdef->alias, pmdl->a->animdefs[iMiddle]->alias)) {
+                    break;
+                }
+            }
 
-			fTotalWeight = 0.0f;
-			iAnimCount = 0;
+            fTotalWeight = 0.0f;
+            iAnimCount   = 0;
 
-			for( ; i < iMiddle; i++ )
-			{
-				panimdef = pmdl->a->animdefs[ i ];
-				if( !panimdef )
-				{
-					continue;
-				}
+            for (; i < iMiddle; i++) {
+                panimdef = pmdl->a->animdefs[i];
+                if (!panimdef) {
+                    continue;
+                }
 
-				if( panimdef->flags & TAF_AUTOSTEPS )
-				{
-					fAnimWeights[ iAnimCount ] = 0.0f;
-					panimdef->flags &= ~TAF_AUTOSTEPS;
-				}
-				else
-				{
-					fAnimWeights[ iAnimCount ] = panimdef->weight;
-					fTotalWeight += panimdef->weight;
-				}
+                if (panimdef->flags & TAF_AUTOSTEPS) {
+                    fAnimWeights[iAnimCount] = 0.0f;
+                    panimdef->flags &= ~TAF_AUTOSTEPS;
+                } else {
+                    fAnimWeights[iAnimCount] = panimdef->weight;
+                    fTotalWeight += panimdef->weight;
+                }
 
-				iAnimCount++;
-			}
+                iAnimCount++;
+            }
 
-			fWeight = randweight() * fTotalWeight;
-			for( i = 0; i < iAnimCount; i++ )
-			{
-				if( fWeight < fAnimWeights[ i ] ) {
-					break;
-				}
+            fWeight = randweight() * fTotalWeight;
+            for (i = 0; i < iAnimCount; i++) {
+                if (fWeight < fAnimWeights[i]) {
+                    break;
+                }
 
-				fWeight -= fAnimWeights[ i ];
-			}
+                fWeight -= fAnimWeights[i];
+            }
 
+            iMiddle  = i + k;
+            panimdef = pmdl->a->animdefs[iMiddle];
+            if (panimdef && panimdef->flags & TAF_NOREPEAT) {
+                panimdef->flags |= TAF_AUTOSTEPS;
+            }
 
-			iMiddle = i + k;
-			panimdef = pmdl->a->animdefs[ iMiddle ];
-			if( panimdef && panimdef->flags & TAF_NOREPEAT )
-			{
-				panimdef->flags |= TAF_AUTOSTEPS;
-			}
+            return iMiddle;
+        }
 
-			return iMiddle;
-		}
+        if (iComp > 0) {
+            iTop = iMiddle - 1;
+        } else {
+            iBottom = iMiddle + 1;
+        }
+    }
 
-		if( iComp > 0 )
-		{
-			iTop = iMiddle - 1;
-		}
-		else
-		{
-			iBottom = iMiddle + 1;
-		}
-	}
-
-	return -1;
+    return -1;
 }
 
 /*
@@ -194,66 +182,61 @@ int TIKI_Anim_NumForName( dtiki_t *pmdl, const char *name )
 TIKI_Anim_Random
 ===============
 */
-int TIKI_Anim_Random( dtiki_t *pmdl, const char *name )
+int TIKI_Anim_Random(dtiki_t *pmdl, const char *name)
 {
-	dtikianimdef_t *panimdef;
-	int i;
-	float totalweight;
-	float weights[ MAX_FRAMEINFOS ];
-	int anim[ MAX_FRAMEINFOS ];
-	int num;
-	size_t len;
-	int diff;
-	float weight;
+    dtikianimdef_t *panimdef;
+    int             i;
+    float           totalweight;
+    float           weights[MAX_FRAMEINFOS];
+    int             anim[MAX_FRAMEINFOS];
+    int             num;
+    size_t          len;
+    int             diff;
+    float           weight;
 
-	len = strlen( name );
-	if( !len || !pmdl )
-	{
-		return -1;
-	}
+    len = strlen(name);
+    if (!len || !pmdl) {
+        return -1;
+    }
 
-	num = 0;
-	totalweight = 0.0f;
-	for( i = 0; i < pmdl->a->num_anims; i++ )
-	{
-		panimdef = pmdl->a->animdefs[ i ];
-		diff = strnicmp( panimdef->alias, name, len );
-		if( diff || panimdef->alias[ len ] == '_' )
-		{
-			if( diff > 0 )
-				break;
-		}
-		else
-		{
-			if( num >= MAX_FRAMEINFOS )
-				break;
+    num         = 0;
+    totalweight = 0.0f;
+    for (i = 0; i < pmdl->a->num_anims; i++) {
+        panimdef = pmdl->a->animdefs[i];
+        diff     = strnicmp(panimdef->alias, name, len);
+        if (diff || panimdef->alias[len] == '_') {
+            if (diff > 0) {
+                break;
+            }
+        } else {
+            if (num >= MAX_FRAMEINFOS) {
+                break;
+            }
 
-			totalweight += panimdef->weight;
-			anim[ num ] = i;
-			weights[ num ] = panimdef->weight;
+            totalweight += panimdef->weight;
+            anim[num]    = i;
+            weights[num] = panimdef->weight;
 
-			num++;
-		}
-	}
+            num++;
+        }
+    }
 
-	// animation name not found
-	if( !num )
-	{
-		return -1;
-	}
+    // animation name not found
+    if (!num) {
+        return -1;
+    }
 
-	// find a random animation based on the weight
-	weight = randweight() * totalweight;
-	for( i = 0; i < num; i++ )
-	{
-		if( weight < weights[ i ] ) {
-			break;
-		}
+    // find a random animation based on the weight
+    weight = randweight() * totalweight;
+    for (i = 0; i < num; i++) {
+        if (weight < weights[i]) {
+            break;
+        }
 
-		weight -= weights[ i ];
-	}
+        weight -= weights[i];
+    }
 
-	return anim[ i ];
+    return anim[i];
 }
 
 /*
@@ -261,18 +244,18 @@ int TIKI_Anim_Random( dtiki_t *pmdl, const char *name )
 TIKI_Anim_NumFrames
 ===============
 */
-int TIKI_Anim_NumFrames( dtiki_t *pmdl, int animnum )
+int TIKI_Anim_NumFrames(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return 0;
+        return 0;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return 0;
     }
 
-	skelAnimDataGameHeader_t *animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
-	return animData->numFrames;
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    return animData->numFrames;
 }
 
 /*
@@ -280,21 +263,20 @@ int TIKI_Anim_NumFrames( dtiki_t *pmdl, int animnum )
 TIKI_Anim_Time
 ===============
 */
-float TIKI_Anim_Time( dtiki_t *pmdl, int animnum )
+float TIKI_Anim_Time(dtiki_t *pmdl, int animnum)
 {
-	if (!pmdl) {
-		return 0.0;
-	}
+    if (!pmdl) {
+        return 0.0;
+    }
 
-	if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
-		return 0.0;
-	}
+    if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        return 0.0;
+    }
 
-	skelAnimDataGameHeader_t *animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
 
-	return animData->flags & TAF_DELTADRIVEN
-		? animData->frameTime * animData->numFrames
-		: animData->frameTime * ( animData->numFrames - 1 );
+    return animData->flags & TAF_DELTADRIVEN ? animData->frameTime * animData->numFrames
+                                             : animData->frameTime * (animData->numFrames - 1);
 }
 
 /*
@@ -302,18 +284,18 @@ float TIKI_Anim_Time( dtiki_t *pmdl, int animnum )
 TIKI_Anim_Frametime
 ===============
 */
-float TIKI_Anim_Frametime( dtiki_t *pmdl, int animnum )
+float TIKI_Anim_Frametime(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return 0.0;
+        return 0.0;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return 0.0;
     }
 
-	skelAnimDataGameHeader_t *animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
-	return animData->frameTime;
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    return animData->frameTime;
 }
 
 /*
@@ -321,18 +303,43 @@ float TIKI_Anim_Frametime( dtiki_t *pmdl, int animnum )
 TIKI_Anim_Delta
 ===============
 */
-void TIKI_Anim_Delta( dtiki_t *pmdl, int animnum, float *delta )
+void TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta)
 {
     if (!pmdl) {
-		return;
-    }
-
-    if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        VectorClear(delta);
         return;
     }
 
-	skelAnimDataGameHeader_t *animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
-	VectorScale( animData->totalDelta, pmdl->load_scale, delta );
+    if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        VectorClear(delta);
+        return;
+    }
+
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    VectorScale(animData->totalDelta, pmdl->load_scale, delta);
+}
+
+/*
+===============
+TIKI_Anim_AngularDelta
+
+Added in 2.0
+===============
+*/
+void TIKI_Anim_AngularDelta(dtiki_t *pmdl, int animnum, float *delta)
+{
+    if (!pmdl) {
+        *delta = 0;
+        return;
+    }
+
+    if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
+        *delta = 0;
+        return;
+    }
+
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    *delta = animData->totalAngleDelta;
 }
 
 /*
@@ -340,18 +347,18 @@ void TIKI_Anim_Delta( dtiki_t *pmdl, int animnum, float *delta )
 TIKI_Anim_HasDelta
 ===============
 */
-qboolean TIKI_Anim_HasDelta( dtiki_t *pmdl, int animnum )
+qboolean TIKI_Anim_HasDelta(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return qfalse;
+        return qfalse;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return qfalse;
     }
 
-	skelAnimDataGameHeader_t *animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
-	return animData->bHasDelta;
+    skelAnimDataGameHeader_t *animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    return animData->bHasDelta;
 }
 
 /*
@@ -359,36 +366,33 @@ qboolean TIKI_Anim_HasDelta( dtiki_t *pmdl, int animnum )
 TIKI_Anim_DeltaOverTime
 ===============
 */
-void TIKI_Anim_DeltaOverTime( dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta )
+void TIKI_Anim_DeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta)
 {
-	int realAnimIndex;
-	skelAnimDataGameHeader_t *animData;
-	SkelVec3 absDelta;
+    int                       realAnimIndex;
+    skelAnimDataGameHeader_t *animData;
+    SkelVec3                  absDelta;
 
-	if (!pTiki || !pTiki->a) {
-		return;
-	}
+    if (!pTiki || !pTiki->a) {
+        return;
+    }
 
-	if (iAnimnum >= pTiki->a->num_anims || iAnimnum < 0) {
-		return;
-	}
+    if (iAnimnum >= pTiki->a->num_anims || iAnimnum < 0) {
+        return;
+    }
 
-	if (fTime2 < fTime1) {
-		return;
-	}
+    if (fTime2 < fTime1) {
+        return;
+    }
 
-	realAnimIndex = pTiki->a->m_aliases[ iAnimnum ];
-	if( realAnimIndex != -1 )
-	{
-		animData = SkeletorCacheGetData( realAnimIndex );
-		absDelta = animData->GetDeltaOverTime( fTime1, fTime2 );
-		VectorScale( absDelta, pTiki->load_scale, vDelta );
-	}
-	else
-	{
-		TIKI_Error( "Skeletor GetDeltaOverTime: Couldn't find animation with index %i\n", iAnimnum );
-		VectorClear( vDelta );
-	}
+    realAnimIndex = pTiki->a->m_aliases[iAnimnum];
+    if (realAnimIndex != -1) {
+        animData = SkeletorCacheGetData(realAnimIndex);
+        absDelta = animData->GetDeltaOverTime(fTime1, fTime2);
+        VectorScale(absDelta, pTiki->load_scale, vDelta);
+    } else {
+        TIKI_Error("Skeletor GetDeltaOverTime: Couldn't find animation with index %i\n", iAnimnum);
+        VectorClear(vDelta);
+    }
 }
 
 /*
@@ -396,36 +400,33 @@ void TIKI_Anim_DeltaOverTime( dtiki_t *pTiki, int iAnimnum, float fTime1, float
 TIKI_Anim_AngularDeltaOverTime
 ===============
 */
-void TIKI_Anim_AngularDeltaOverTime(dtiki_t* pTiki, int iAnimnum, float fTime1, float fTime2, float* fDelta)
+void TIKI_Anim_AngularDeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, float *fDelta)
 {
-	int realAnimIndex;
-	skelAnimDataGameHeader_t* animData;
+    int                       realAnimIndex;
+    skelAnimDataGameHeader_t *animData;
 
-	*fDelta = 0;
+    *fDelta = 0;
 
-	if (!pTiki || !pTiki->a) {
-		return;
-	}
+    if (!pTiki || !pTiki->a) {
+        return;
+    }
 
-	if (iAnimnum >= pTiki->a->num_anims || iAnimnum < 0) {
-		return;
-	}
+    if (iAnimnum >= pTiki->a->num_anims || iAnimnum < 0) {
+        return;
+    }
 
-	if (fTime2 < fTime1) {
-		return;
-	}
+    if (fTime2 < fTime1) {
+        return;
+    }
 
-	realAnimIndex = pTiki->a->m_aliases[iAnimnum];
-	if (realAnimIndex != -1)
-	{
-		animData = SkeletorCacheGetData(realAnimIndex);
-		*fDelta = animData->GetAngularDeltaOverTime(fTime1, fTime2);
-	}
-	else
-	{
-		TIKI_Error("Skeletor GetAngularDeltaOverTime: Couldn't find animation with index %i\n", iAnimnum);
-		*fDelta = 0;
-	}
+    realAnimIndex = pTiki->a->m_aliases[iAnimnum];
+    if (realAnimIndex != -1) {
+        animData = SkeletorCacheGetData(realAnimIndex);
+        *fDelta  = animData->GetAngularDeltaOverTime(fTime1, fTime2);
+    } else {
+        TIKI_Error("Skeletor GetAngularDeltaOverTime: Couldn't find animation with index %i\n", iAnimnum);
+        *fDelta = 0;
+    }
 }
 
 /*
@@ -433,18 +434,18 @@ void TIKI_Anim_AngularDeltaOverTime(dtiki_t* pTiki, int iAnimnum, float fTime1,
 TIKI_Anim_Flags
 ===============
 */
-int TIKI_Anim_Flags( dtiki_t *pmdl, int animnum )
+int TIKI_Anim_Flags(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return 0;
+        return 0;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return 0;
     }
 
-	dtikianimdef_t *panimdef = pmdl->a->animdefs[ animnum ];
-	return panimdef->flags;
+    dtikianimdef_t *panimdef = pmdl->a->animdefs[animnum];
+    return panimdef->flags;
 }
 
 /*
@@ -452,32 +453,35 @@ int TIKI_Anim_Flags( dtiki_t *pmdl, int animnum )
 TIKI_Anim_FlagsSkel
 ===============
 */
-int TIKI_Anim_FlagsSkel( dtiki_t *pmdl, int animnum )
+int TIKI_Anim_FlagsSkel(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return 0;
+        return 0;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return 0;
     }
 
-	skelAnimDataGameHeader_t *animData;
-	int flags;
+    skelAnimDataGameHeader_t *animData;
+    int                       flags;
 
-	animData = SkeletorCacheGetData( pmdl->a->m_aliases[ animnum ] );
-	flags = animData->flags;
+    animData = SkeletorCacheGetData(pmdl->a->m_aliases[animnum]);
+    flags    = animData->flags;
 
-	if( animData->bHasDelta )
-		flags |= TAF_HASDELTA;
+    if (animData->bHasDelta) {
+        flags |= TAF_HASDELTA;
+    }
 
-	if( animData->bHasMorph )
-		flags |= TAF_HASMORPH;
+    if (animData->bHasMorph) {
+        flags |= TAF_HASMORPH;
+    }
 
-	if (animData->bHasUpper)
-		flags |= TAF_HASUPPER;
+    if (animData->bHasUpper) {
+        flags |= TAF_HASUPPER;
+    }
 
-	return flags;
+    return flags;
 }
 
 /*
@@ -485,18 +489,18 @@ int TIKI_Anim_FlagsSkel( dtiki_t *pmdl, int animnum )
 TIKI_Anim_HasServerCommands
 ===============
 */
-qboolean TIKI_Anim_HasServerCommands( dtiki_t *pmdl, int animnum )
+qboolean TIKI_Anim_HasServerCommands(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return qfalse;
+        return qfalse;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return qfalse;
     }
 
-	dtikianimdef_t *panimdef = pmdl->a->animdefs[ animnum ];
-	return panimdef->num_server_cmds > 0;
+    dtikianimdef_t *panimdef = pmdl->a->animdefs[animnum];
+    return panimdef->num_server_cmds > 0;
 }
 
 /*
@@ -504,18 +508,18 @@ qboolean TIKI_Anim_HasServerCommands( dtiki_t *pmdl, int animnum )
 TIKI_Anim_HasClientCommands
 ===============
 */
-qboolean TIKI_Anim_HasClientCommands( dtiki_t *pmdl, int animnum )
+qboolean TIKI_Anim_HasClientCommands(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return qfalse;
+        return qfalse;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return qfalse;
     }
 
-	dtikianimdef_t *panimdef = pmdl->a->animdefs[ animnum ];
-	return panimdef->num_client_cmds > 0;
+    dtikianimdef_t *panimdef = pmdl->a->animdefs[animnum];
+    return panimdef->num_client_cmds > 0;
 }
 
 /*
@@ -523,16 +527,16 @@ qboolean TIKI_Anim_HasClientCommands( dtiki_t *pmdl, int animnum )
 TIKI_Anim_CrossblendTime
 ===============
 */
-float TIKI_Anim_CrossblendTime( dtiki_t *pmdl, int animnum )
+float TIKI_Anim_CrossblendTime(dtiki_t *pmdl, int animnum)
 {
     if (!pmdl) {
-		return 0.0;
+        return 0.0;
     }
 
     if (!pmdl->a || animnum < 0 || animnum >= pmdl->a->num_anims) {
         return 0.0;
     }
 
-	dtikianimdef_t *panimdef = pmdl->a->animdefs[ animnum ];
-	return panimdef->blendtime;
+    dtikianimdef_t *panimdef = pmdl->a->animdefs[animnum];
+    return panimdef->blendtime;
 }
diff --git a/code/tiki/tiki_anim.h b/code/tiki/tiki_anim.h
index 95a49681..7c10c0e5 100644
--- a/code/tiki/tiki_anim.h
+++ b/code/tiki/tiki_anim.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,32 +22,30 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_anim.h : TIKI Anim
 
-#ifndef __TIKI_ANIM_H__
-#define __TIKI_ANIM_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void TIKI_GetAnimOrder( dloaddef_t *ld, int *order );
-const char *TIKI_Anim_NameForNum( dtiki_t *pmdl, int animnum );
-int TIKI_Anim_NumForName( dtiki_t *pmdl, const char *name );
-int TIKI_Anim_Random( dtiki_t *pmdl, const char *name );
-int TIKI_Anim_NumFrames( dtiki_t *pmdl, int animnum );
-float TIKI_Anim_Time( dtiki_t *pmdl, int animnum );
-float TIKI_Anim_Frametime( dtiki_t *pmdl, int animnum );
-void TIKI_Anim_Delta( dtiki_t *pmdl, int animnum, float *delta );
-qboolean TIKI_Anim_HasDelta( dtiki_t *pmdl, int animnum );
-void TIKI_Anim_DeltaOverTime( dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta );
-void TIKI_Anim_AngularDeltaOverTime( dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, float *fDelta );
-int TIKI_Anim_Flags( dtiki_t *pmdl, int animnum );
-int TIKI_Anim_FlagsSkel( dtiki_t *pmdl, int animnum );
-qboolean TIKI_Anim_HasServerCommands( dtiki_t *pmdl, int animnum );
-qboolean TIKI_Anim_HasClientCommands( dtiki_t *pmdl, int animnum );
-float TIKI_Anim_CrossblendTime( dtiki_t *pmdl, int animnum );
+    void        TIKI_GetAnimOrder(dloaddef_t *ld, int *order);
+    const char *TIKI_Anim_NameForNum(dtiki_t *pmdl, int animnum);
+    int         TIKI_Anim_NumForName(dtiki_t *pmdl, const char *name);
+    int         TIKI_Anim_Random(dtiki_t *pmdl, const char *name);
+    int         TIKI_Anim_NumFrames(dtiki_t *pmdl, int animnum);
+    float       TIKI_Anim_Time(dtiki_t *pmdl, int animnum);
+    float       TIKI_Anim_Frametime(dtiki_t *pmdl, int animnum);
+    void        TIKI_Anim_Delta(dtiki_t *pmdl, int animnum, float *delta);
+    void        TIKI_Anim_AngularDelta(dtiki_t *pmdl, int animnum, float *delta);
+    qboolean    TIKI_Anim_HasDelta(dtiki_t *pmdl, int animnum);
+    void        TIKI_Anim_DeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, vec3_t vDelta);
+    void        TIKI_Anim_AngularDeltaOverTime(dtiki_t *pTiki, int iAnimnum, float fTime1, float fTime2, float *fDelta);
+    int         TIKI_Anim_Flags(dtiki_t *pmdl, int animnum);
+    int         TIKI_Anim_FlagsSkel(dtiki_t *pmdl, int animnum);
+    qboolean    TIKI_Anim_HasServerCommands(dtiki_t *pmdl, int animnum);
+    qboolean    TIKI_Anim_HasClientCommands(dtiki_t *pmdl, int animnum);
+    float       TIKI_Anim_CrossblendTime(dtiki_t *pmdl, int animnum);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_ANIM_H__
diff --git a/code/tiki/tiki_cache.cpp b/code/tiki/tiki_cache.cpp
index d9d28a5b..34ba05a2 100644
--- a/code/tiki/tiki_cache.cpp
+++ b/code/tiki/tiki_cache.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,21 +31,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "tiki_skel.h"
 
 struct pchar {
-	const char *m_Value;
+    const char *m_Value;
 
-	pchar() { m_Value = NULL; }
-	pchar( const char *value ) { m_Value = value; }
-	friend bool operator==( const pchar& l, const pchar& r ) { return !strcmp( l.m_Value, r.m_Value ); }
+    pchar() { m_Value = NULL; }
+
+    pchar(const char *value) { m_Value = value; }
+
+    friend bool operator==(const pchar& l, const pchar& r) { return !strcmp(l.m_Value, r.m_Value); }
 };
 
-con_map< pchar, dtikianim_t * >	*tikianimcache;
-con_map< pchar, dtiki_t * >		*tikicache;
-static skeletor_c				*skel_entity_cache[ 1024 ];
+con_map<pchar, dtikianim_t *> *tikianimcache;
+con_map<pchar, dtiki_t *>     *tikicache;
+static skeletor_c             *skel_entity_cache[TIKI_MAX_ENTITY_CACHE];
 
 template<>
-int HashCode< pchar >( const pchar& key )
+int HashCode<pchar>(const pchar& key)
 {
-	return HashCode< const char * >( key.m_Value );
+    return HashCode<const char *>(key.m_Value);
 }
 
 /*
@@ -53,21 +55,20 @@ int HashCode< pchar >( const pchar& key )
 TIKI_FindTikiAnim
 ===============
 */
-dtikianim_t *TIKI_FindTikiAnim( const char *path )
+dtikianim_t *TIKI_FindTikiAnim(const char *path)
 {
-	char filename[ 1024 ];
+    char filename[1024];
 
-	if( tikianimcache )
-	{
-		dtikianim_t **t;
+    if (tikianimcache) {
+        dtikianim_t **t;
 
-		t = tikianimcache->find( filename );
-		if( t ) {
-			return *t;
-		}
-	}
+        t = tikianimcache->find(filename);
+        if (t) {
+            return *t;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -75,21 +76,23 @@ dtikianim_t *TIKI_FindTikiAnim( const char *path )
 TIKI_FindTiki
 ===============
 */
-dtiki_t *TIKI_FindTiki( const char *path )
+dtiki_t *TIKI_FindTiki(const char *path)
 {
-	char filename[ 1024 ];
+    char filename[1024];
 
-	if( tikicache )
-	{
-		dtiki_t **t;
+    if (tikicache) {
+        dtiki_t **t;
 
-		t = tikicache->find( filename );
-		if( t ) {
-			return *t;
-		}
-	}
+        Q_strncpyz(filename, path, sizeof(filename));
+        FS_CanonicalFilename(filename);
 
-	return NULL;
+        t = tikicache->find(filename);
+        if (t) {
+            return *t;
+        }
+    }
+
+    return NULL;
 }
 
 /*
@@ -97,41 +100,36 @@ dtiki_t *TIKI_FindTiki( const char *path )
 TIKI_RegisterTikiAnimFlags
 ===============
 */
-dtikianim_t *TIKI_RegisterTikiAnimFlags( const char *path, qboolean use )
+dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use)
 {
-	dtikianim_t *tiki;
-	char filename[ 1024 ];
+    dtikianim_t *tiki;
+    char         filename[1024];
 
-	strcpy( filename, path );
-	FS_CanonicalFilename( filename );
+    Q_strncpyz(filename, path, sizeof(filename));
+    FS_CanonicalFilename(filename);
 
-	if( tikianimcache )
-	{
-		dtikianim_t **t;
+    if (tikianimcache) {
+        dtikianim_t **t;
 
-		t = tikianimcache->find( filename );
-		if( t ) {
-			return *t;
-		}
-	}
-	else
-	{
-		tikianimcache = new con_map < pchar, dtikianim_t * > ;
-	}
+        t = tikianimcache->find(filename);
+        if (t) {
+            return *t;
+        }
+    } else {
+        tikianimcache = new con_map<pchar, dtikianim_t *>;
+    }
 
-	tiki = TIKI_LoadTikiAnim( filename );
-	if( tiki )
-	{
-		if( use )
-		{
-			Com_Printf( "^~^~^ Add the following line to the *_precache.scr map script:\n" );
-			Com_Printf( "cache %s\n", filename );
-		}
+    tiki = TIKI_LoadTikiAnim(filename);
+    if (tiki) {
+        if (use) {
+            Com_DPrintf("^~^~^ Add the following line to the *_precache.scr map script:\n");
+            Com_DPrintf("cache %s\n", filename);
+        }
 
-		( *tikianimcache )[ tiki->name ] = tiki;
-	}
+        (*tikianimcache)[tiki->name] = tiki;
+    }
 
-	return tiki;
+    return tiki;
 }
 
 /*
@@ -139,9 +137,9 @@ dtikianim_t *TIKI_RegisterTikiAnimFlags( const char *path, qboolean use )
 TIKI_RegisterTikiAnim
 ===============
 */
-dtikianim_t *TIKI_RegisterTikiAnim( const char *path )
+dtikianim_t *TIKI_RegisterTikiAnim(const char *path)
 {
-	return TIKI_RegisterTikiAnimFlags( path, qfalse );
+    return TIKI_RegisterTikiAnimFlags(path, qfalse);
 }
 
 /*
@@ -149,75 +147,69 @@ dtikianim_t *TIKI_RegisterTikiAnim( const char *path )
 TIKI_RegisterTikiFlags
 ===============
 */
-dtiki_t *TIKI_RegisterTikiFlags( const char *path, qboolean use )
+dtiki_t *TIKI_RegisterTikiFlags(const char *path, qboolean use)
 {
-	dtiki_t *tiki = NULL;
-	dtikianim_t* tikianim = NULL;
-	con_map< str, str > keyValues;
-	const char *next_path;
-	str key;
-	str value;
-	const char *name;
-	char filename[ 1024 ];
-	char full_filename[ 1024 ];
+    dtiki_t          *tiki     = NULL;
+    dtikianim_t      *tikianim = NULL;
+    con_map<str, str> keyValues;
+    const char       *next_path;
+    str               key;
+    str               value;
+    const char       *name;
+    char              filename[1024];
+    char              full_filename[1024];
 
-	full_filename[ 0 ] = 0;
+    full_filename[0] = 0;
 
-	name = path;
-	for(next_path = strstr(name, "|"); next_path; next_path = strstr(name, "|"))
-	{
-		key = name;
-		key[next_path - name] = 0;
+    name = path;
+    for (next_path = strstr(name, "|"); next_path; next_path = strstr(name, "|")) {
+        key                   = name;
+        key[next_path - name] = 0;
 
-		name = next_path + 1;
-		next_path = strstr(name, "|" );
-		if( !next_path ) {
-			break;
-		}
+        name      = next_path + 1;
+        next_path = strstr(name, "|");
+        if (!next_path) {
+            break;
+        }
 
-		value = name;
-		value[next_path - name] = 0;
-		name = next_path + 1;
+        value                   = name;
+        value[next_path - name] = 0;
+        name                    = next_path + 1;
 
-		// add it to the entry
-		keyValues[key] = value;
+        // add it to the entry
+        keyValues[key] = value;
 
-		strcat(full_filename, key.c_str());
-		strcat(full_filename, "|");
-		strcat(full_filename, value.c_str());
-		strcat(full_filename, "|");
-	}
+        strcat(full_filename, key.c_str());
+        strcat(full_filename, "|");
+        strcat(full_filename, value.c_str());
+        strcat(full_filename, "|");
+    }
 
-	strcpy(filename, name);
-	FS_CanonicalFilename(filename);
-	strcat(full_filename, filename);
+    Q_strncpyz(filename, name, sizeof(filename));
+    FS_CanonicalFilename(filename);
+    Q_strcat(full_filename, sizeof(full_filename), filename);
 
-	if (!tikicache)
-	{
-		tikicache = new con_map<pchar, dtiki_t*>;
-	}
-	else
-	{
-		dtiki_t **t;
+    if (!tikicache) {
+        tikicache = new con_map<pchar, dtiki_t *>;
+    } else {
+        dtiki_t **t;
 
-		t = tikicache->find(full_filename);
-		if (t) {
-			return *t;
-		}
-	}
+        t = tikicache->find(full_filename);
+        if (t) {
+            return *t;
+        }
+    }
 
-	tikianim = TIKI_RegisterTikiAnimFlags(filename, use);
-	if (tikianim)
-	{
-		tiki = TIKI_LoadTikiModel(tikianim, full_filename, &keyValues);
-		if (tiki)
-		{
-			// cache the tiki
-			(*tikicache)[tiki->name] = tiki;
-		}
-	}
+    tikianim = TIKI_RegisterTikiAnimFlags(filename, use);
+    if (tikianim) {
+        tiki = TIKI_LoadTikiModel(tikianim, full_filename, &keyValues);
+        if (tiki) {
+            // cache the tiki
+            (*tikicache)[tiki->name] = tiki;
+        }
+    }
 
-	return tiki;
+    return tiki;
 }
 
 /*
@@ -225,9 +217,9 @@ dtiki_t *TIKI_RegisterTikiFlags( const char *path, qboolean use )
 TIKI_RegisterTiki
 ===============
 */
-dtiki_t *TIKI_RegisterTiki( const char *path )
+dtiki_t *TIKI_RegisterTiki(const char *path)
 {
-	return TIKI_RegisterTikiFlags( path, qfalse );
+    return TIKI_RegisterTikiFlags(path, qfalse);
 }
 
 /*
@@ -237,76 +229,70 @@ TIKI_FreeAll
 */
 void TIKI_FreeAll()
 {
-	dtiki_t **entry;
-	dtikianim_t **entryanim;
-	dtiki_t *tiki;
-	dtikianim_t *tikianim;
-	int i;
+    dtiki_t     **entry;
+    dtikianim_t **entryanim;
+    dtiki_t      *tiki;
+    dtikianim_t  *tikianim;
+    int           i;
 
-	if( tikicache )
-	{
-		con_map_enum< pchar, dtiki_t * > en = *tikicache;
+    if (tikicache) {
+        con_map_enum<pchar, dtiki_t *> en = *tikicache;
 
-		for( entry = en.NextValue(); entry != NULL; entry = en.NextValue() )
-		{
-			skeletor_c *skeletor;
+        for (entry = en.NextValue(); entry != NULL; entry = en.NextValue()) {
+            skeletor_c *skeletor;
 
-			tiki = *entry;
-			skeletor = ( skeletor_c * )tiki->skeletor;
-			if( skeletor ) {
-				delete skeletor;
-			}
+            tiki     = *entry;
+            skeletor = (skeletor_c *)tiki->skeletor;
+            if (skeletor) {
+                delete skeletor;
+            }
 
-			tiki->m_boneList.CleanUpChannels();
-			/*
-			if( tiki->a->m_aliases )
-			{
-				TIKI_Free( tiki->a->m_aliases );
-				tiki->a->m_aliases = NULL;
-				tiki->a->num_anims = 0;
-			}
-			*/
+            tiki->m_boneList.CleanUpChannels();
+            // Fixed in OPM
+            //  It's better to free aliases when actually clearing the anim cache
+            /*
+            if (tiki->a->m_aliases) {
+                TIKI_Free(tiki->a->m_aliases);
+                tiki->a->m_aliases = NULL;
+                tiki->a->num_anims = 0;
+            }
+            */
 
-			TIKI_Free( tiki );
-		}
+            TIKI_Free(tiki);
+        }
 
-		tikicache->clear();
-	}
+        tikicache->clear();
+    }
 
-	if( tikianimcache )
-	{
-		con_map_enum< pchar, dtikianim_t * > en = *tikianimcache;
+    if (tikianimcache) {
+        con_map_enum<pchar, dtikianim_t *> en = *tikianimcache;
 
-		for( entryanim = en.NextValue(); entryanim != NULL; entryanim = en.NextValue() )
-		{
-			tikianim = *entryanim;
+        for (entryanim = en.NextValue(); entryanim != NULL; entryanim = en.NextValue()) {
+            tikianim = *entryanim;
 
-			TIKI_RemoveTiki( tikianim );
+            TIKI_RemoveTiki(tikianim);
 
-			if( tikianim->m_aliases )
-			{
-				TIKI_Free( tikianim->m_aliases );
-				tikianim->m_aliases = NULL;
-				tikianim->num_anims = 0;
-			}
+            // Fixed in OPM
+            //  Each tikianim should free their aliases
+            if (tikianim->m_aliases) {
+                TIKI_Free(tikianim->m_aliases);
+                tikianim->m_aliases = NULL;
+                tikianim->num_anims = 0;
+            }
 
-			TIKI_Free( tikianim );
-		}
+            TIKI_Free(tikianim);
+        }
 
-		tikianimcache->clear();
-	}
+        tikianimcache->clear();
+    }
 
-	tiki_loading = true;
-	if( skelcache )
-	{
-		for( i = 0; i < cache_maxskel; i++ )
-		{
-			if (skelcache->skel)
-			{
-				TIKI_FreeSkel(i);
-			}
-		}
-	}
+    tiki_loading = true;
+
+    for (i = 0; i < cache_maxskel; i++) {
+        if (skelcache[i].skel) {
+            TIKI_FreeSkel(i);
+        }
+    }
 }
 
 /*
@@ -315,32 +301,50 @@ TIKI_GetSkeletor
 ===============
 */
 static qboolean tiki_started;
-void *TIKI_GetSkeletor( dtiki_t *tiki, int entnum )
+
+void *TIKI_GetSkeletor(dtiki_t *tiki, int entnum)
 {
-	skeletor_c *skel;
+    skeletor_c *skel;
+    int         i;
+    int         index;
 
-	if( entnum == ENTITYNUM_NONE )
-	{
-		if( !tiki->skeletor ) tiki->skeletor = new skeletor_c( tiki );
-		skel = ( skeletor_c * )tiki->skeletor;
-	}
-	else
-	{
-		skel = skel_entity_cache[ entnum ];
-		if( skel )
-		{
-			if( skel->m_Tiki == tiki ) {
-				return skel_entity_cache[ entnum ];
-			}
+    if (entnum == ENTITYNUM_NONE) {
+        if (!tiki->skeletor) {
+            tiki->skeletor = new skeletor_c(tiki);
+        }
+        skel = (skeletor_c *)tiki->skeletor;
+    } else {
+        // Added in 2.30
+        //  Multiple caches per entity
+        for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
+            index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
 
-			delete skel;
-		}
+            skel = skel_entity_cache[index];
+            if (!skel) {
+                break;
+            }
 
-		skel = new skeletor_c( tiki );
-		skel_entity_cache[ entnum ] = skel;
-	}
+            if (skel->m_Tiki == tiki) {
+                return skel;
+            }
+        }
 
-	return skel;
+        if (i == TIKI_MAX_ENTITY_CACHE_PER_ENT) {
+            i = 0;
+        }
+
+        index = ((entnum % TIKI_MAX_ENTITIES) * TIKI_MAX_ENTITY_CACHE_PER_ENT) + i;
+        skel  = skel_entity_cache[index];
+
+        if (skel) {
+            delete skel;
+        }
+
+        skel                     = new skeletor_c(tiki);
+        skel_entity_cache[index] = skel;
+    }
+
+    return skel;
 }
 
 /*
@@ -348,21 +352,21 @@ void *TIKI_GetSkeletor( dtiki_t *tiki, int entnum )
 TIKI_DeleteSkeletor
 ===============
 */
-static void TIKI_DeleteSkeletor( int entnum )
+static void TIKI_DeleteSkeletor(int entnum)
 {
-	skeletor_c *skel;
+    skeletor_c *skel;
+    int         i;
 
-	if( entnum == ENTITYNUM_NONE )
-	{
-		return;
-	}
+    if (entnum == ENTITYNUM_NONE) {
+        return;
+    }
 
-	skel = skel_entity_cache[ entnum ];
-	if( skel )
-	{
-		delete skel;
-		skel_entity_cache[ entnum ] = 0;
-	}
+    for (i = 0; i < TIKI_MAX_ENTITY_CACHE_PER_ENT; i++) {
+        skel = skel_entity_cache[entnum * TIKI_MAX_ENTITY_CACHE_PER_ENT + i];
+        if (skel) {
+            delete skel;
+        }
+    }
 }
 
 /*
@@ -370,14 +374,15 @@ static void TIKI_DeleteSkeletor( int entnum )
 TIKI_Begin
 ===============
 */
-void TIKI_Begin( void )
+void TIKI_Begin(void)
 {
-	int i;
+    int i;
 
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-		skel_entity_cache[ i ] = 0;
+    for (i = 0; i < TIKI_MAX_ENTITY_CACHE; i++) {
+        skel_entity_cache[i] = 0;
+    }
 
-	tiki_started = true;
+    tiki_started = true;
 }
 
 /*
@@ -385,14 +390,15 @@ void TIKI_Begin( void )
 TIKI_End
 ===============
 */
-void TIKI_End( void )
+void TIKI_End(void)
 {
-	int i;
+    int i;
 
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-		TIKI_DeleteSkeletor( i );
+    for (i = 0; i < MAX_GENTITIES; i++) {
+        TIKI_DeleteSkeletor(i);
+    }
 
-	tiki_started = false;
+    tiki_started = false;
 }
 
 /*
@@ -400,32 +406,28 @@ void TIKI_End( void )
 TIKI_FinishLoad
 ===============
 */
-void TIKI_FinishLoad( void )
+void TIKI_FinishLoad(void)
 {
-	con_map_enum< pchar, dtikianim_t * > en;
-	dtikianim_t **entry;
+    con_map_enum<pchar, dtikianim_t *> en;
+    dtikianim_t                      **entry;
 
-	if( !tiki_loading )
-	{
-		return;
-	}
+    if (!tiki_loading) {
+        return;
+    }
 
-	tiki_loading = false;
-	SkeletorCacheCleanCache();
+    tiki_loading = false;
+    SkeletorCacheCleanCache();
 
-	if( !low_anim_memory || !low_anim_memory->integer )
-	{
-		return;
-	}
+    if (!low_anim_memory || !low_anim_memory->integer) {
+        return;
+    }
 
-	if( tikianimcache )
-	{
-		en = *tikianimcache;
-		for( entry = en.NextValue(); entry != NULL; entry = en.NextValue() )
-		{
-			TIKI_LoadAnim( *entry );
-		}
-	}
+    if (tikianimcache) {
+        en = *tikianimcache;
+        for (entry = en.NextValue(); entry != NULL; entry = en.NextValue()) {
+            TIKI_LoadAnim(*entry);
+        }
+    }
 }
 
 /*
@@ -433,33 +435,29 @@ void TIKI_FinishLoad( void )
 TIKI_FreeImages
 ===============
 */
-void TIKI_FreeImages( void )
+void TIKI_FreeImages(void)
 {
-	dtikisurface_t *dsurf;
-	dtiki_t *tiki;
-	int j, k;
-	dtiki_t **entry;
-	con_map_enum< pchar, dtiki_t * > en;
+    dtikisurface_t                *dsurf;
+    dtiki_t                       *tiki;
+    int                            j, k;
+    dtiki_t                      **entry;
+    con_map_enum<pchar, dtiki_t *> en;
 
-	if( !tikicache )
-	{
-		return;
-	}
+    if (!tikicache) {
+        return;
+    }
 
-	en = *tikicache;
-	for( entry = en.NextValue(); entry != NULL; entry = en.NextValue() )
-	{
-		tiki = *entry;
-		for( k = 0; k < tiki->num_surfaces; k++ )
-		{
-			dsurf = &tiki->surfaces[ k ];
+    en = *tikicache;
+    for (entry = en.NextValue(); entry != NULL; entry = en.NextValue()) {
+        tiki = *entry;
+        for (k = 0; k < tiki->num_surfaces; k++) {
+            dsurf = &tiki->surfaces[k];
 
-			for( j = 0; j < dsurf->numskins; j++ )
-			{
-				dsurf->hShader[ j ] = 0;
-			}
-		}
-	}
+            for (j = 0; j < dsurf->numskins; j++) {
+                dsurf->hShader[j] = 0;
+            }
+        }
+    }
 }
 
 /*
@@ -467,20 +465,18 @@ void TIKI_FreeImages( void )
 TIKI_TikiAnimList_f
 ===============
 */
-void TIKI_TikiAnimList_f( void )
+void TIKI_TikiAnimList_f(void)
 {
-	con_map_enum< pchar, dtikianim_t * > en;
-	dtikianim_t **entry;
+    con_map_enum<pchar, dtikianim_t *> en;
+    dtikianim_t                      **entry;
 
-	Com_Printf( "\ntikianimlist:\n" );
-	if( tikicache )
-	{
-		en = *tikianimcache;
-		for( entry = en.NextValue(); entry != NULL; entry = en.NextValue() )
-		{
-			Com_Printf( "%s\n", ( *entry )->name );
-		}
-	}
+    Com_Printf("\ntikianimlist:\n");
+    if (tikicache) {
+        en = *tikianimcache;
+        for (entry = en.NextValue(); entry != NULL; entry = en.NextValue()) {
+            Com_Printf("%s\n", (*entry)->name);
+        }
+    }
 }
 
 /*
@@ -488,18 +484,16 @@ void TIKI_TikiAnimList_f( void )
 TIKI_TikiList_f
 ===============
 */
-void TIKI_TikiList_f( void )
+void TIKI_TikiList_f(void)
 {
-	con_map_enum< pchar, dtiki_t * > en;
-	dtiki_t **entry;
+    con_map_enum<pchar, dtiki_t *> en;
+    dtiki_t                      **entry;
 
-	Com_Printf( "\ntikilist:\n" );
-	if( tikicache )
-	{
-		en = *tikicache;
-		for( entry = en.NextValue(); entry != NULL; entry = en.NextValue() )
-		{
-			Com_Printf( "%s\n", ( *entry )->name );
-		}
-	}
+    Com_Printf("\ntikilist:\n");
+    if (tikicache) {
+        en = *tikicache;
+        for (entry = en.NextValue(); entry != NULL; entry = en.NextValue()) {
+            Com_Printf("%s\n", (*entry)->name);
+        }
+    }
 }
diff --git a/code/tiki/tiki_cache.h b/code/tiki/tiki_cache.h
index 8a30560c..4760b6ea 100644
--- a/code/tiki/tiki_cache.h
+++ b/code/tiki/tiki_cache.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,31 +22,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_cache.h : TIKI Cache
 
-#ifndef __TIKI_CACHE_H__
-#define __TIKI_CACHE_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-dtikianim_t *TIKI_FindTikiAnim( const char *path );
-dtiki_t *TIKI_FindTiki( const char *path );
-dtikianim_t *TIKI_RegisterTikiAnimFlags( const char *path, qboolean use );
-dtikianim_t *TIKI_RegisterTikiAnim( const char *path );
-dtiki_t *TIKI_RegisterTikiFlags( const char *path, qboolean use );
-dtiki_t *TIKI_RegisterTiki( const char *path );
-void TIKI_FreeAll();
-void *TIKI_GetSkeletor( dtiki_t *tiki, int entnum );
-static void TIKI_DeleteSkeletor( int entnum );
-void TIKI_Begin( void );
-void TIKI_End( void );
-void TIKI_FinishLoad( void );
-void TIKI_FreeImages( void );
-void TIKI_TikiAnimList_f( void );
-void TIKI_TikiList_f( void );
+    dtikianim_t *TIKI_FindTikiAnim(const char *path);
+    dtiki_t     *TIKI_FindTiki(const char *path);
+    dtikianim_t *TIKI_RegisterTikiAnimFlags(const char *path, qboolean use);
+    dtikianim_t *TIKI_RegisterTikiAnim(const char *path);
+    dtiki_t     *TIKI_RegisterTikiFlags(const char *path, qboolean use);
+    dtiki_t     *TIKI_RegisterTiki(const char *path);
+    void         TIKI_FreeAll();
+    void        *TIKI_GetSkeletor(dtiki_t *tiki, int entnum);
+    static void  TIKI_DeleteSkeletor(int entnum);
+    void         TIKI_Begin(void);
+    void         TIKI_End(void);
+    void         TIKI_FinishLoad(void);
+    void         TIKI_FreeImages(void);
+    void         TIKI_TikiAnimList_f(void);
+    void         TIKI_TikiList_f(void);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_CACHE_H__
diff --git a/code/tiki/tiki_commands.cpp b/code/tiki/tiki_commands.cpp
index 3eb0358f..0d8bd953 100644
--- a/code/tiki/tiki_commands.cpp
+++ b/code/tiki/tiki_commands.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 TIKI_ModelInfo
 ===============
 */
-void TIKI_ModelInfo( dtiki_t *tiki )
+void TIKI_ModelInfo(dtiki_t *tiki)
 {
-	// fixme: wtf ? what should it do
-	Com_Printf( "This function is broken. So sorry... KDT\n" );
+    // fixme: wtf ? what should it do
+    Com_Printf("This function is broken. So sorry... KDT\n");
 }
diff --git a/code/tiki/tiki_commands.h b/code/tiki/tiki_commands.h
index 745ce167..f7cf0752 100644
--- a/code/tiki/tiki_commands.h
+++ b/code/tiki/tiki_commands.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,17 +22,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_commands.h : TIKI Commands
 
-#ifndef __TIKI_COMMANDS_H__
-#define __TIKI_COMMANDS_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void TIKI_ModelInfo( dtiki_t *tiki );
+    void TIKI_ModelInfo(dtiki_t *tiki);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_COMMANDS_H__
diff --git a/code/tiki/tiki_files.cpp b/code/tiki/tiki_files.cpp
index 973ae90e..8e217113 100644
--- a/code/tiki/tiki_files.cpp
+++ b/code/tiki/tiki_files.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -30,31 +30,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <tiki.h>
 #include <mem_tempalloc.h>
 
-qboolean	tiki_loading;
-cvar_t* dumploadedanims;
-cvar_t* low_anim_memory;
-cvar_t* showLoad;
-cvar_t* convertAnims;
+qboolean tiki_loading;
+cvar_t  *dumploadedanims;
+cvar_t  *low_anim_memory;
+cvar_t  *showLoad;
+cvar_t  *convertAnims;
 
 typedef struct {
-	char path[100];
-	skelAnimDataGameHeader_t* data;
-	int numusers;
-	int lookup;
+    char                      path[100];
+    skelAnimDataGameHeader_t *data;
+    int                       numusers;
+    int                       lookup;
 } skeletorCacheEntry_t;
 
 static int m_numInCache;
-class InitSkelCache {
-public:
-	static class InitSkelCache init;
 
-	InitSkelCache();
+class InitSkelCache
+{
+public:
+    static class InitSkelCache init;
+
+    InitSkelCache();
 };
 
-static int m_cachedDataLookup[4095];
-static skeletorCacheEntry_t m_cachedData[4095];
-InitSkelCache InitSkelCache::init;
-MEM_TempAlloc TIKI_allocator;
+static int                  m_cachedDataLookup[MAX_TIKI_ALIASES];
+static skeletorCacheEntry_t m_cachedData[MAX_TIKI_ALIASES];
+InitSkelCache               InitSkelCache::init;
+MEM_TempAlloc               TIKI_allocator;
 
 /*
 ===============
@@ -63,12 +65,11 @@ InitSkelCache::InitSkelCache
 */
 InitSkelCache::InitSkelCache()
 {
-	int i;
+    int i;
 
-	for (i = 0; i < 4095; i++)
-	{
-		m_cachedData[i].lookup = -1;
-	}
+    for (i = 0; i < MAX_TIKI_ALIASES; i++) {
+        m_cachedData[i].lookup = -1;
+    }
 }
 
 /*
@@ -76,10 +77,10 @@ InitSkelCache::InitSkelCache()
 TIKI_FreeStorage
 ===============
 */
-void TIKI_FreeStorage(dloaddef_t* ld)
+void TIKI_FreeStorage(dloaddef_t *ld)
 {
-	TIKI_allocator.FreeAll();
-	ld->tikiFile.Close();
+    TIKI_allocator.FreeAll();
+    ld->tikiFile.Close();
 }
 
 /*
@@ -87,9 +88,57 @@ void TIKI_FreeStorage(dloaddef_t* ld)
 TIKI_AllocateLoadData
 ===============
 */
-void* TIKI_AllocateLoadData(size_t length)
+void *TIKI_AllocateLoadData(size_t length)
 {
-	return TIKI_allocator.Alloc(length);
+    return TIKI_allocator.Alloc(length);
+}
+
+/*
+===============
+TIKI_AliasExists
+===============
+*/
+qboolean TIKI_AliasExists(dloaddef_t *ld, const char *name)
+{
+    int i;
+
+    for (i = 0; i < ld->numanims; i++) {
+        if (!Q_stricmp(ld->loadanims[i]->alias, name)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/*
+===============
+TIKI_AddDefaultIdleAnim
+===============
+*/
+void TIKI_AddDefaultIdleAnim(dloaddef_t *ld)
+{
+    const char  *ext;
+    dloadanim_t *panim;
+
+    if (ld->numskels != 1) {
+        return;
+    }
+
+    ext = strstr(ld->idleSkel, ".");
+    if (!ext) {
+        return;
+    }
+
+    if (TIKI_AliasExists(ld, "idle")) {
+        return;
+    }
+
+    panim        = TIKI_AllocAnim(ld);
+    panim->alias = TIKI_CopyString("idle");
+    Q_strncpyz(panim->name, ld->idleSkel, ext - ld->idleSkel + 1);
+    panim->name[ext - ld->idleSkel] = 0;
+    Q_strcat(panim->name, sizeof(panim->name), ".skc");
 }
 
 /*
@@ -97,11 +146,11 @@ void* TIKI_AllocateLoadData(size_t length)
 TIKI_CopyString
 ===============
 */
-char* TIKI_CopyString(const char* s)
+char *TIKI_CopyString(const char *s)
 {
-	char* result = (char*)TIKI_AllocateLoadData(strlen(s) + 1);
-	strcpy(result, s);
-	return result;
+    char *result = (char *)TIKI_AllocateLoadData(strlen(s) + 1);
+    strcpy(result, s);
+    return result;
 }
 
 /*
@@ -110,133 +159,131 @@ TIKI_LoadTikiAnim
 ===============
 */
 qboolean loadtikicommands = true;
-dtikianim_t* TIKI_LoadTikiAnim(const char* path)
+
+dtikianim_t *TIKI_LoadTikiAnim(const char *path)
 {
-	dloaddef_t loaddef;
-	dtikianim_t* tiki = NULL;
-	const char* token;
-	float tempVec[3];
-	msg_t modelBuf;
-	str s;
-	char tempName[257];
+    dloaddef_t   loaddef;
+    dtikianim_t *tiki = NULL;
+    const char  *token;
+    float        tempVec[3];
+    msg_t        modelBuf;
+    str          s;
+    char         tempName[257];
+    const char  *ext;
 
-	memset(&loaddef, 0, sizeof(dloaddef_t));
-	loaddef.modelBuf = &modelBuf;
+    memset(&loaddef, 0, sizeof(dloaddef_t));
+    loaddef.modelBuf = &modelBuf;
 
-	TIKI_InitSetup(&loaddef);
+    TIKI_InitSetup(&loaddef);
 
-	if (loaddef.tikiFile.LoadFile(path, qfalse))
-	{
-		loaddef.path = path;
+    loaddef.path              = path;
+    loaddef.numanims          = 0;
+    loaddef.numserverinitcmds = 0;
+    loaddef.numclientinitcmds = 0;
 
-		token = loaddef.tikiFile.GetToken(true);
-		if (strcmp(token, "TIKI"))
-		{
-			TIKI_Error("TIKI_LoadTIKIfile: def file %s has wrong header (%s should be TIKI)\n", loaddef.tikiFile.Filename(), token);
-			loaddef.tikiFile.Close();
-			return NULL;
-		}
+    if (loaddef.tikiFile.LoadFile(path, qfalse)) {
+        loaddef.bInIncludesSection = false;
 
-		loaddef.numanims = 0;
-		loaddef.numserverinitcmds = 0;
-		loaddef.numclientinitcmds = 0;
-		loaddef.bInIncludesSection = false;
+        token = loaddef.tikiFile.GetToken(true);
+        if (strcmp(token, "TIKI")) {
+            TIKI_Error(
+                "TIKI_LoadTIKIfile: def file %s has wrong header (%s should be TIKI)\n",
+                loaddef.tikiFile.Filename(),
+                token
+            );
+            loaddef.tikiFile.Close();
+            return NULL;
+        }
 
-		while (loaddef.tikiFile.TokenAvailable(true))
-		{
-			token = loaddef.tikiFile.GetToken(true);
+        while (loaddef.tikiFile.TokenAvailable(true)) {
+            token = loaddef.tikiFile.GetToken(true);
 
-			if (!stricmp(token, "setup"))
-			{
-				if (!TIKI_ParseSetup(&loaddef))
-				{
-					TIKI_FreeStorage(&loaddef);
-					return NULL;
-				}
-			}
-			else if (!stricmp(token, "init"))
-			{
-				TIKI_ParseInit(&loaddef);
-			}
-			else if (!stricmp(token, "animations"))
-			{
-				TIKI_ParseAnimations(&loaddef);
-			}
-			else if (!stricmp(token, "includes"))
-			{
-				if (!loaddef.bInIncludesSection)
-				{
-					loaddef.bInIncludesSection = TIKI_ParseIncludes(&loaddef);
-				}
-				else
-				{
-					TIKI_Error("TIKI_LoadTIKIfile: Nested Includes section in %s on line %d, the animations will be fubar\n",
-						token,
-						loaddef.tikiFile.GetLineNumber(),
-						loaddef.tikiFile.Filename());
-				}
-			}
-			else if (!stricmp(token, "}") && loaddef.bInIncludesSection)
-			{
-				loaddef.bInIncludesSection = false;
-			}
-			else
-			{
-				TIKI_Error("TIKI_LoadTIKIfile: unknown section %s in %s online %d, skipping line.\n", token, loaddef.tikiFile.Filename(), loaddef.tikiFile.GetLineNumber());
+            if (!Q_stricmp(token, "setup")) {
+                if (!TIKI_ParseSetup(&loaddef)) {
+                    TIKI_FreeStorage(&loaddef);
+                    return NULL;
+                }
+            } else if (!Q_stricmp(token, "init")) {
+                TIKI_ParseInit(&loaddef);
+            } else if (!Q_stricmp(token, "animations")) {
+                TIKI_ParseAnimations(&loaddef);
+            } else if (!Q_stricmp(token, "includes")) {
+                if (!loaddef.bInIncludesSection) {
+                    loaddef.bInIncludesSection = TIKI_ParseIncludes(&loaddef);
+                } else {
+                    TIKI_Error(
+                        "TIKI_LoadTIKIfile: Nested Includes section in %s on line %d, the animations will be fubar\n",
+                        token,
+                        loaddef.tikiFile.GetLineNumber(),
+                        loaddef.tikiFile.Filename()
+                    );
+                }
+            } else if (!Q_stricmp(token, "}") && loaddef.bInIncludesSection) {
+                loaddef.bInIncludesSection = false;
+            } else {
+                TIKI_Error(
+                    "TIKI_LoadTIKIfile: unknown section %s in %s online %d, skipping line.\n",
+                    token,
+                    loaddef.tikiFile.Filename(),
+                    loaddef.tikiFile.GetLineNumber()
+                );
 
-				// skip the current line
-				while (loaddef.tikiFile.TokenAvailable(false)) {
-					loaddef.tikiFile.GetToken(false);
-				}
-			}
-		}
+                // skip the current line
+                while (loaddef.tikiFile.TokenAvailable(false)) {
+                    loaddef.tikiFile.GetToken(false);
+                }
+            }
+        }
 
-		if (loaddef.bInIncludesSection)
-		{
-			TIKI_Error("TIKI_LoadTIKIfile: Include section in %s did not terminate\n", loaddef.tikiFile.Filename());
-		}
+        if (loaddef.bInIncludesSection) {
+            TIKI_Error("TIKI_LoadTIKIfile: Include section in %s did not terminate\n", loaddef.tikiFile.Filename());
+        }
+    } else {
+        loaddef.tikiFile.Close();
 
-		if (loaddef.numanims)
-		{
-			sprintf(tempName, "a%s", path);
-			UI_LoadResource(tempName);
+        ext = strstr(path, ".");
+        if (!ext) {
+            return NULL;
+        }
 
-			tiki = TIKI_FillTIKIStructureSkel(&loaddef);
-			if (tiki)
-			{
-				sprintf(tempName, "b%s", path);
-				UI_LoadResource(tempName);
-				sprintf(tempName, "c%s", path);
-				UI_LoadResource(tempName);
+        Q_strncpyz(tempName, path, ext - path + 1);
+        tempName[ext - path] = 0;
+        Q_strcat(tempName, sizeof(tempName), ".skd");
+        WriteSkelmodel(&loaddef, tempName);
 
-				VectorSubtract(tiki->maxs, tiki->mins, tempVec);
-				if (VectorLength(tempVec) > 100000.0f)
-				{
-					VectorSet(tiki->mins, -4.0f, -4.0f, -4.0f);
-					VectorSet(tiki->maxs, 4.0f, 4.0f, 4.0f);
-				}
+        loaddef.hasSkel = true;
+    }
 
-				TIKI_FreeStorage(&loaddef);
-				sprintf(tempName, "d%s", path);
-				UI_LoadResource(tempName);
-			}
-			else
-			{
-				TIKI_FreeStorage(&loaddef);
-			}
-		}
-		else
-		{
-			TIKI_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
-			TIKI_FreeStorage(&loaddef);
-		}
-	}
-	else
-	{
-		loaddef.tikiFile.Close();
-	}
+    TIKI_AddDefaultIdleAnim(&loaddef);
+    if (loaddef.numanims) {
+        Com_sprintf(tempName, sizeof(tempName), "a%s", path);
+        UI_LoadResource(tempName);
 
-	return tiki;
+        tiki = TIKI_FillTIKIStructureSkel(&loaddef);
+        if (tiki) {
+            Com_sprintf(tempName, sizeof(tempName), "b%s", path);
+            UI_LoadResource(tempName);
+            Com_sprintf(tempName, sizeof(tempName), "c%s", path);
+            UI_LoadResource(tempName);
+
+            VectorSubtract(tiki->maxs, tiki->mins, tempVec);
+            if (VectorLength(tempVec) > 100000.0f) {
+                VectorSet(tiki->mins, -4.0f, -4.0f, -4.0f);
+                VectorSet(tiki->maxs, 4.0f, 4.0f, 4.0f);
+            }
+
+            TIKI_FreeStorage(&loaddef);
+            Com_sprintf(tempName, sizeof(tempName), "d%s", path);
+            UI_LoadResource(tempName);
+        } else {
+            TIKI_FreeStorage(&loaddef);
+        }
+    } else {
+        TIKI_Error("TIKI_LoadTIKIfile: No valid animations found in %s.\n", loaddef.tikiFile.Filename());
+        TIKI_FreeStorage(&loaddef);
+    }
+
+    return tiki;
 }
 
 /*
@@ -244,163 +291,199 @@ dtikianim_t* TIKI_LoadTikiAnim(const char* path)
 TIKI_LoadTikiModel
 ===============
 */
-dtiki_t* TIKI_LoadTikiModel(dtikianim_t* tikianim, const char* name, con_map<str, str>* keyValues)
+dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str, str> *keyValues)
 {
-	dtiki_t* tiki;
-	//byte *start_ptr;
-	//byte *ptr;
-	int i, j, k;
-	char* strptr;
-	size_t defsize;
-	struct {
-		dtiki_t tiki;
-		short int buffer[1000];
-	} temp;
-	//int skel;
-	dloadsurface_t loadsurfaces[24];
-	int numSurfacesSetUp;
-	dtikisurface_t* tikiSurf;
-	dloadsurface_t* loadsurf;
-	int mesh;
-	skelHeaderGame_t* skelmodel;
-	skelSurfaceGame_t* surf;
-	int surfOffset;
-	qboolean found;
-	byte* start_ptr, *max_ptr, *ptr;
+    dtiki_t *tiki;
+    //byte *start_ptr;
+    //byte *ptr;
+    int    i, j, k;
+    char  *strptr;
+    size_t defsize;
 
-	TIKI_LoadSetup(&temp.tiki, tikianim->name, loadsurfaces, &numSurfacesSetUp, tikianim->modelData, tikianim->modelDataSize, keyValues);
-	if (!temp.tiki.numMeshes)
-	{
-		Com_Printf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
-		return NULL;
-	}
+    struct {
+        dtiki_t   tiki;
+        short int buffer[32];
+    } temp;
+    dtiki_t* temp_tiki;
 
-	defsize = sizeof(dtiki_t) - sizeof(tiki->mesh);
-	defsize += temp.tiki.numMeshes * sizeof(short);
-	defsize += strlen(name) + 1;
-	defsize = PAD(defsize, sizeof(void*));
-	defsize += temp.tiki.num_surfaces * sizeof(dtikisurface_t);
+    //int skel;
+    dloadsurface_t     loadsurfaces[24];
+    int                numSurfacesSetUp;
+    dtikisurface_t    *tikiSurf;
+    dloadsurface_t    *loadsurf;
+    int                mesh;
+    skelHeaderGame_t  *skelmodel;
+    skelSurfaceGame_t *surf;
+    int                surfOffset;
+    qboolean           found;
+    byte              *start_ptr, *max_ptr, *ptr;
 
-	tiki = (dtiki_t*)TIKI_Alloc(defsize);
-	memset(tiki, 0, defsize);
+    // Use a pointer directly to avoid compiler wrongly optimizing out loops
+    // as the mesh field of the tiki is an array of 1 element
+    temp_tiki = &temp.tiki;
 
-	start_ptr = (byte*)tiki;
-	max_ptr = start_ptr + defsize;
-	ptr = start_ptr + sizeof(dtiki_t) - sizeof(tiki->mesh) + temp.tiki.numMeshes * sizeof(tiki->mesh[0]);
+    TIKI_LoadSetup(
+        temp_tiki,
+        tikianim->name,
+        loadsurfaces,
+        &numSurfacesSetUp,
+        tikianim->modelData,
+        tikianim->modelDataSize,
+        keyValues
+    );
+    if (!temp_tiki->numMeshes) {
+        Com_DPrintf("^~^~^ Model '%s' has no skelmodel\n", tikianim->name);
+        return NULL;
+    }
 
-	tiki->a = tikianim;
-	tiki->m_boneList.InitChannels();
-	tiki->skeletor = NULL;
-	tiki->load_scale = temp.tiki.load_scale;
-	tiki->lod_scale = temp.tiki.lod_scale;
-	tiki->lod_bias = temp.tiki.lod_bias;
-	tiki->num_surfaces = temp.tiki.num_surfaces;
-	tiki->numMeshes = temp.tiki.numMeshes;
-	tiki->radius = temp.tiki.radius;
-	tiki->name = (char*)ptr;
-	strcpy(tiki->name, name);
-	ptr += strlen(tiki->name) + 1;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	tikiSurf = (dtikisurface_t*)ptr;
-	tiki->m_boneList.ZeroChannels();
+    defsize = sizeof(dtiki_t) - sizeof(tiki->mesh);
+    defsize += temp_tiki->numMeshes * sizeof(short);
+    defsize += strlen(name) + 1;
+    defsize = PAD(defsize, sizeof(void *));
+    defsize += temp_tiki->num_surfaces * sizeof(dtikisurface_t);
 
-	assert((byte*)(tikiSurf + temp.tiki.num_surfaces) <= max_ptr);
+    tiki = (dtiki_t *)TIKI_Alloc(defsize);
+    memset(tiki, 0, defsize);
 
-	for (i = 0; i < temp.tiki.numMeshes; i++)
-	{
-		mesh = temp.tiki.mesh[i];
-		tiki->mesh[i] = mesh;
-		skelmodel = skelcache[mesh].skel;
-		skelcache[mesh].numuses++;
+    start_ptr = (byte *)tiki;
+    max_ptr   = start_ptr + defsize;
+    ptr       = start_ptr + sizeof(dtiki_t) - sizeof(tiki->mesh) + temp_tiki->numMeshes * sizeof(tiki->mesh[0]);
 
-		for (j = 0; j < skelmodel->numBones; j++)
-		{
-			tiki->m_boneList.AddChannel(skelmodel->pBones[j].channel);
-		}
-	}
+    tiki->a = tikianim;
+    tiki->m_boneList.InitChannels();
+    tiki->skeletor     = NULL;
+    tiki->load_scale   = temp_tiki->load_scale;
+    tiki->lod_scale    = temp_tiki->lod_scale;
+    tiki->lod_bias     = temp_tiki->lod_bias;
+    tiki->num_surfaces = temp_tiki->num_surfaces;
+    tiki->numMeshes    = temp_tiki->numMeshes;
+    tiki->radius       = temp_tiki->radius;
+    tiki->name         = (char *)ptr;
+    strcpy(tiki->name, name);
+    ptr += strlen(tiki->name) + 1;
+    ptr      = (byte *)PADP(ptr, sizeof(void *));
+    tikiSurf = (dtikisurface_t *)ptr;
+    tiki->m_boneList.ZeroChannels();
 
-	tiki->m_boneList.PackChannels();
-	VectorCopy(temp.tiki.light_offset, tiki->light_offset);
-	VectorCopy(temp.tiki.load_origin, tiki->load_origin);
-	tiki->surfaces = tikiSurf;
+    assert((byte *)(tikiSurf + temp_tiki->num_surfaces) <= max_ptr);
 
-	for (i = 0; i < numSurfacesSetUp; i++)
-	{
-		loadsurf = &loadsurfaces[i];
-		found = false;
-		strptr = strchr(loadsurf->name, '*');
+    for (i = 0; i < temp_tiki->numMeshes; i++) {
+        mesh          = temp_tiki->mesh[i];
+        tiki->mesh[i] = mesh;
 
-		surfOffset = 0;
+        skelmodel = skelcache[mesh].skel;
+        skelcache[mesh].numuses++;
 
-		if (strptr || !stricmp(loadsurf->name, "all"))
-		{
-			for (j = 0; j < temp.tiki.numMeshes; j++)
-			{
-				mesh = temp.tiki.mesh[j];
-				skelmodel = TIKI_GetSkel(mesh);
-				surf = skelmodel->pSurfaces;
+        for (j = 0; j < skelmodel->numBones; j++) {
+            tiki->m_boneList.AddChannel(skelmodel->pBones[j].channel);
+        }
+    }
 
-				for (k = 0; k < skelmodel->numSurfaces; k++)
-				{
-					tikiSurf = &tiki->surfaces[surfOffset + k];
+    tiki->m_boneList.PackChannels();
+    VectorCopy(temp_tiki->light_offset, tiki->light_offset);
+    VectorCopy(temp_tiki->load_origin, tiki->load_origin);
+    tiki->surfaces = tikiSurf;
 
-					if ((strptr
-						&& strptr != loadsurf->name
-						&& !strnicmp(loadsurf->name, surf->name, strptr - loadsurf->name))
-						|| !stricmp(loadsurf->name, "all"))
-					{
-						TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
-						found = true;
-					}
+    for (i = 0; i < numSurfacesSetUp; i++) {
+        loadsurf = &loadsurfaces[i];
+        found    = false;
+        strptr   = strchr(loadsurf->name, '*');
 
-					surf = surf->pNext;
-				}
+        surfOffset = 0;
 
-				surfOffset += skelmodel->numSurfaces;
-			}
-		}
-		else
-		{
-			for (j = 0; j < temp.tiki.numMeshes; j++)
-			{
-				mesh = temp.tiki.mesh[j];
-				skelmodel = TIKI_GetSkel(mesh);
-				surf = skelmodel->pSurfaces;
+        if (strptr || !Q_stricmp(loadsurf->name, "all")) {
+            for (j = 0; j < temp_tiki->numMeshes; j++) {
+                mesh      = temp_tiki->mesh[j];
+                skelmodel = TIKI_GetSkel(mesh);
+                surf      = skelmodel->pSurfaces;
 
-				tikiSurf = &tiki->surfaces[surfOffset];
+                for (k = 0; k < skelmodel->numSurfaces; k++) {
+                    tikiSurf = &tiki->surfaces[surfOffset + k];
 
-				for (k = 0; k < skelmodel->numSurfaces; k++)
-				{
-					if (!stricmp(loadsurf->name, surf->name))
-					{
-						TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
-						if (!tikiSurf->name[0])
-						{
-							TIKI_Warning("TIKI_InitTiki: Surface %i in %s(referenced in %s) has no name!  Please investigate and fix\n", k, skelmodel->name, name);
-						}
-						found = true;
-					}
+                    if ((strptr && strptr != loadsurf->name
+                         && !strnicmp(loadsurf->name, surf->name, strptr - loadsurf->name))
+                        || !Q_stricmp(loadsurf->name, "all")) {
+                        TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
+                        found = true;
+                    }
 
-					surf = surf->pNext;
-					tikiSurf++;
-				}
+                    surf = surf->pNext;
+                }
 
-				surfOffset += skelmodel->numSurfaces;
-			}
-		}
+                surfOffset += skelmodel->numSurfaces;
+            }
+        } else {
+            for (j = 0; j < temp_tiki->numMeshes; j++) {
+                mesh      = temp_tiki->mesh[j];
+                skelmodel = TIKI_GetSkel(mesh);
+                surf      = skelmodel->pSurfaces;
 
-		if (!found)
-		{
-			TIKI_Warning("TIKI_InitTiki: could not find surface '%s' in '%s' (check referenced skb/skd files).\n", loadsurf->name, tikianim->name);
-		}
-	}
+                tikiSurf = &tiki->surfaces[surfOffset];
 
-	if (tiki->radius != 0.0f)
-	{
-		TIKI_CalcRadius(tiki);
-	}
+                for (k = 0; k < skelmodel->numSurfaces; k++) {
+                    if (!Q_stricmp(loadsurf->name, surf->name)) {
+                        TIKI_SetupIndividualSurface(tikianim->name, tikiSurf, surf->name, loadsurf);
+                        if (!tikiSurf->name[0]) {
+                            TIKI_Warning(
+                                "TIKI_InitTiki: Surface %i in %s(referenced in %s) has no name!  Please investigate "
+                                "and fix\n",
+                                k,
+                                skelmodel->name,
+                                name
+                            );
+                        }
+                        found = true;
+                    }
 
-	return tiki;
+                    surf = surf->pNext;
+                    tikiSurf++;
+                }
+
+                surfOffset += skelmodel->numSurfaces;
+            }
+        }
+
+        if (!found) {
+            TIKI_Warning(
+                "TIKI_InitTiki: could not find surface '%s' in '%s' (check referenced skb/skd files).\n",
+                loadsurf->name,
+                tikianim->name
+            );
+        }
+    }
+
+    // Added in 2.0
+    //  For surfaces without shader
+    //  assign them the shader with the same name
+    surfOffset = 0;
+    for (i = 0; i < temp_tiki->numMeshes; i++, surfOffset += skelmodel->numSurfaces) {
+        skelmodel = TIKI_GetSkel(temp_tiki->mesh[i]);
+
+        surf = skelmodel->pSurfaces;
+
+        for (j = 0; j < skelmodel->numSurfaces; j++, surf = surf->pNext) {
+            tikiSurf = &tiki->surfaces[surfOffset + j];
+
+            if (tikiSurf->numskins) {
+                // Skip surfaces with skins
+                continue;
+            }
+
+            Q_strncpyz(tikiSurf->name, surf->name, sizeof(tikiSurf->name));
+
+            if (strlen(surf->name) != 9 || Q_strncmp(surf->name, "material", 8)) {
+                Q_strncpyz(tikiSurf->shader[0], surf->name, sizeof(tikiSurf->shader[0]));
+            }
+
+            tikiSurf->numskins = 1;
+        }
+    }
+
+    if (!tiki->radius) {
+        TIKI_CalcRadius(tiki);
+    }
+
+    return tiki;
 }
 
 /*
@@ -408,32 +491,31 @@ dtiki_t* TIKI_LoadTikiModel(dtikianim_t* tikianim, const char* name, con_map<str
 TIKI_CalcRadius
 ===============
 */
-void TIKI_CalcRadius(dtiki_t* tiki)
+void TIKI_CalcRadius(dtiki_t *tiki)
 {
-	int j;
-	float radius;
-	float tmpVec[3];
-	float* bounds[2];
+    int    j;
+    float  radius;
+    float  tmpVec[3];
+    float *bounds[2];
 
-	tiki->radius = 0.0f;
+    tiki->radius = 0.0f;
 
-	bounds[0] = &tiki->a->mins[0];
-	bounds[1] = &tiki->a->maxs[0];
+    bounds[0] = &tiki->a->mins[0];
+    bounds[1] = &tiki->a->maxs[0];
 
-	for (j = 0; j < 4; j++)
-	{
-		tmpVec[0] = bounds[j & 1][0];
-		tmpVec[1] = bounds[j & 1][1];
-		tmpVec[2] = bounds[j & 1][2];
+    for (j = 0; j < 4; j++) {
+        tmpVec[0] = bounds[j & 1][0];
+        tmpVec[1] = bounds[j & 1][1];
+        tmpVec[2] = bounds[j & 1][2];
 
-		radius = VectorLength(tmpVec);
-		if (radius > tiki->radius) {
-			tiki->radius = radius;
-		}
-	}
+        radius = VectorLength(tmpVec);
+        if (radius > tiki->radius) {
+            tiki->radius = radius;
+        }
+    }
 
-	radius = tiki->radius * 0.7f;
-	tiki->radius = radius * tiki->lod_scale;
+    radius       = tiki->radius * 0.7f;
+    tiki->radius = radius * tiki->lod_scale;
 }
 
 /*
@@ -441,85 +523,95 @@ void TIKI_CalcRadius(dtiki_t* tiki)
 SkeletorCacheFileCallback
 ===============
 */
-skelAnimDataGameHeader_t* SkeletorCacheFileCallback(const char* path)
+skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path)
 {
-	skelAnimDataFileHeader_t* pHeader;
-	int iBuffLength;
-	char tempName[100];
-	char extension[100];
-	skelAnimDataGameHeader_t* finishedHeader;
-	char* buffer;
-	char npath[256];
+    skelAnimDataFileHeader_t *pHeader;
+    int                       iBuffLength;
+    char                      tempName[100];
+    char                      extension[100];
+    skelAnimDataGameHeader_t *finishedHeader;
+    char                     *buffer;
+    char                      npath[256];
 
-	Skel_ExtractFileExtension(path, extension);
+    Skel_ExtractFileExtension(path, extension);
 
-	if (strcmp(extension, "skc"))
-	{
-		Com_Printf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
-	}
+    if (strcmp(extension, "skc")) {
+        Com_DPrintf("Skeletor CacheAnimSkel: %s: File extension unknown.  Attempting to open as skc file\n", path);
+    }
 
-	strcpy(npath, "newanim/");
-	strcat(npath, path);
+    Q_strncpyz(npath, "newanim/", sizeof(npath));
+    Q_strcat(npath, sizeof(npath), path);
 
-	iBuffLength = TIKI_ReadFileEx(npath, (void**)&buffer, qtrue);
-	if (iBuffLength > 0)
-	{
-		finishedHeader = skeletor_c::LoadProcessedAnim(npath, buffer, iBuffLength, path);
-		TIKI_FreeFile(buffer);
-	}
-	else
-	{
-		iBuffLength = TIKI_ReadFileEx(path, (void**)&pHeader, qtrue);
-		if (iBuffLength <= 0)
-		{
-			Com_Printf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
-			return NULL;
-		}
+    iBuffLength = TIKI_ReadFileEx(npath, (void **)&buffer, qtrue);
+    if (iBuffLength > 0) {
+        finishedHeader = skeletor_c::LoadProcessedAnim(npath, buffer, iBuffLength, path);
+        TIKI_FreeFile(buffer);
+    } else {
+        iBuffLength = TIKI_ReadFileEx(path, (void **)&pHeader, qtrue);
+        if (iBuffLength <= 0) {
+            Com_DPrintf("Skeletor CacheAnimSkel: Could not open binary file %s\n", path);
+            return NULL;
+        }
 
-		int ident = LittleLong(pHeader->ident);
-		int version = LittleLong(pHeader->version);
-		if (LittleLong(ident) != TIKI_SKC_HEADER_IDENT || (version != TIKI_SKC_HEADER_OLD_VERSION && version != TIKI_SKC_HEADER_VERSION))
-		{
-			Com_Printf("Skeletor CacheAnimSkel: anim %s has wrong header ([ident,version] = [%i,%i] should be [%i,%i])\n", path,
-				ident, version,
-				TIKI_SKC_HEADER_IDENT, TIKI_SKC_HEADER_VERSION);
-			TIKI_FreeFile(pHeader);
-			return NULL;
-		}
+        int ident   = LittleLong(pHeader->ident);
+        int version = LittleLong(pHeader->version);
+        if (LittleLong(ident) != TIKI_SKC_HEADER_IDENT
+            || (version != TIKI_SKC_HEADER_OLD_VERSION && version != TIKI_SKC_HEADER_VERSION)) {
+            Com_DPrintf(
+                "Skeletor CacheAnimSkel: anim %s has wrong header ([ident,version] = [%i,%i] should be [%i,%i])\n",
+                path,
+                ident,
+                version,
+                TIKI_SKC_HEADER_IDENT,
+                TIKI_SKC_HEADER_VERSION
+            );
+            TIKI_FreeFile(pHeader);
+            return NULL;
+        }
 
-		if (version == TIKI_SKC_HEADER_OLD_VERSION)
-		{
-			Com_Printf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
-			finishedHeader = skeletor_c::ConvertSkelFileToGame(pHeader, iBuffLength, path);
-			if (convertAnims && convertAnims->integer)
-			{
-				skeletor_c::SaveProcessedAnim(finishedHeader, path, pHeader);
-			}
-		}
-		else
-		{
-			// looks like SKC version 14 and above are processed animations
+        if (version == TIKI_SKC_HEADER_OLD_VERSION) {
+            Com_DPrintf("WARNING- DOWNGRADING TO OLD ANIMATION FORMAT FOR FILE: %s\n", path);
 
-			// points the buffer to the animation data
-			buffer = (char*)pHeader + sizeof(int) + sizeof(int);
-			iBuffLength -= sizeof(int) + sizeof(int);
+            //
+            // Handle the endianness
+            //
+            pHeader->flags = LittleLong(pHeader->flags);
+            pHeader->nBytesUsed = LittleLong(pHeader->nBytesUsed);
+            pHeader->frameTime = LittleFloat(pHeader->frameTime);
+            pHeader->totalDelta.x = LittleFloat(pHeader->totalDelta.x);
+            pHeader->totalDelta.y = LittleFloat(pHeader->totalDelta.y);
+            pHeader->totalDelta.z = LittleFloat(pHeader->totalDelta.z);
+            pHeader->totalAngleDelta = LittleFloat(pHeader->totalAngleDelta);
+            pHeader->numChannels = LittleLong(pHeader->numChannels);
+            pHeader->ofsChannelNames = LittleLong(pHeader->ofsChannelNames);
+            pHeader->numFrames = LittleLong(pHeader->numFrames);
 
-			// loads the processed animation
-			finishedHeader = skeletor_c::LoadProcessedAnimEx(path, buffer, iBuffLength, path);
-		}
+            finishedHeader = skeletor_c::ConvertSkelFileToGame(pHeader, iBuffLength, path);
+            if (convertAnims && convertAnims->integer) {
+                skeletor_c::SaveProcessedAnim(finishedHeader, path, pHeader);
+            }
+        } else {
+            // looks like SKC version 14 and above are processed animations
 
-		TIKI_FreeFile(pHeader);
-	}
+            // points the buffer to the animation data
+            buffer = (char *)pHeader + sizeof(int) + sizeof(int);
+            iBuffLength -= sizeof(int) + sizeof(int);
 
-	if (dumploadedanims && dumploadedanims->integer)
-	{
-		Com_Printf("+loadanim: %s\n", path);
-	}
+            // loads the processed animation
+            finishedHeader = skeletor_c::LoadProcessedAnimEx(path, buffer, iBuffLength, path);
+        }
 
-	Com_sprintf(tempName, sizeof(tempName), "g%s", path);
-	UI_LoadResource(tempName);
+        TIKI_FreeFile(pHeader);
+    }
 
-	return finishedHeader;
+    if (dumploadedanims && dumploadedanims->integer) {
+        Com_Printf("+loadanim: %s\n", path);
+    }
+
+    Com_sprintf(tempName, sizeof(tempName), "g%s", path);
+    UI_LoadResource(tempName);
+
+    return finishedHeader;
 }
 
 /*
@@ -527,21 +619,19 @@ skelAnimDataGameHeader_t* SkeletorCacheFileCallback(const char* path)
 SkeletorCacheGetData
 ===============
 */
-skelAnimDataGameHeader_t* SkeletorCacheGetData(int index)
+skelAnimDataGameHeader_t *SkeletorCacheGetData(int index)
 {
-	if (index < 0)
-	{
-		return NULL;
-	}
+    if (index < 0) {
+        return NULL;
+    }
 
-	skelAnimDataGameHeader_t* data = m_cachedData[index].data;
-	if (!data)
-	{
-		data = SkeletorCacheFileCallback(m_cachedData[index].path);
-		m_cachedData[index].data = data;
-	}
+    skelAnimDataGameHeader_t *data = m_cachedData[index].data;
+    if (!data) {
+        data                     = SkeletorCacheFileCallback(m_cachedData[index].path);
+        m_cachedData[index].data = data;
+    }
 
-	return data;
+    return data;
 }
 
 /*
@@ -549,38 +639,35 @@ skelAnimDataGameHeader_t* SkeletorCacheGetData(int index)
 SkeletorCacheFindFilename
 ===============
 */
-bool SkeletorCacheFindFilename(const char* path, int* indexPtr)
+bool SkeletorCacheFindFilename(const char *path, int *indexPtr)
 {
-	int sortValue;
-	int lowerBound;
-	int upperBound;
-	int index;
+    int sortValue;
+    int lowerBound;
+    int upperBound;
+    int index;
 
-	lowerBound = 0;
-	upperBound = m_numInCache - 1;
-	while (lowerBound <= upperBound)
-	{
-		index = (lowerBound + upperBound) / 2;
-		sortValue = stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
-		if (!sortValue)
-		{
-			if (indexPtr)
-				*indexPtr = index;
-			return true;
-		}
-		if (sortValue < 0)
-		{
-			upperBound = index - 1;
-		}
-		else
-		{
-			lowerBound = index + 1;
-		}
-	}
+    lowerBound = 0;
+    upperBound = m_numInCache - 1;
+    while (lowerBound <= upperBound) {
+        index     = (lowerBound + upperBound) / 2;
+        sortValue = Q_stricmp(path, m_cachedData[m_cachedDataLookup[index]].path);
+        if (!sortValue) {
+            if (indexPtr) {
+                *indexPtr = index;
+            }
+            return true;
+        }
+        if (sortValue < 0) {
+            upperBound = index - 1;
+        } else {
+            lowerBound = index + 1;
+        }
+    }
 
-	if (indexPtr)
-		*indexPtr = lowerBound;
-	return false;
+    if (indexPtr) {
+        *indexPtr = lowerBound;
+    }
+    return false;
 }
 
 /*
@@ -588,57 +675,50 @@ bool SkeletorCacheFindFilename(const char* path, int* indexPtr)
 SkeletorCacheLoadData
 ===============
 */
-bool SkeletorCacheLoadData(const char* path, bool precache, int newIndex)
+bool SkeletorCacheLoadData(const char *path, bool precache, int newIndex)
 {
-	int i;
-	skelAnimDataGameHeader_t* data;
-	int lookup;
+    int                       i;
+    skelAnimDataGameHeader_t *data;
+    int                       lookup;
 
-	if (m_numInCache >= 4095)
-	{
-		Com_Printf("Skeletor CacheData, Cache full, can't load %s\n", path);
-		return false;
-	}
+    if (m_numInCache >= MAX_TIKI_ALIASES) {
+        Com_Printf("Skeletor CacheData, Cache full, can't load %s\n", path);
+        return false;
+    }
 
-	if (strlen(path) >= 100)
-	{
-		Com_Printf("^~^~^ SkeletorCache: File name over %i characters will be ignored.\n(%s)\n", 99, path);
-		return false;
-	}
+    if (strlen(path) >= 100) {
+        Com_Printf("^~^~^ SkeletorCache: File name over %i characters will be ignored.\n(%s)\n", 99, path);
+        return false;
+    }
 
-	if (precache)
-	{
-		data = SkeletorCacheFileCallback(path);
-		if (!data) {
-			return false;
-		}
-	}
-	else
-	{
-		data = 0;
-	}
+    if (precache) {
+        data = SkeletorCacheFileCallback(path);
+        if (!data) {
+            return false;
+        }
+    } else {
+        data = 0;
+    }
 
-	for (lookup = 0; lookup < 4095; lookup++)
-	{
-		if (m_cachedData[lookup].lookup == -1) {
-			break;
-		}
-	}
+    for (lookup = 0; lookup < MAX_TIKI_ALIASES; lookup++) {
+        if (m_cachedData[lookup].lookup == -1) {
+            break;
+        }
+    }
 
-	for (i = m_numInCache - 1; i >= newIndex; i--)
-	{
-		m_cachedData[m_cachedDataLookup[i]].lookup = i + 1;
-		m_cachedDataLookup[i + 1] = m_cachedDataLookup[i];
-	}
+    for (i = m_numInCache - 1; i >= newIndex; i--) {
+        m_cachedData[m_cachedDataLookup[i]].lookup = i + 1;
+        m_cachedDataLookup[i + 1]                  = m_cachedDataLookup[i];
+    }
 
-	m_cachedDataLookup[newIndex] = lookup;
-	m_cachedData[lookup].lookup = newIndex;
-	m_cachedData[lookup].data = data;
-	strcpy(m_cachedData[lookup].path, path);
-	m_cachedData[lookup].numusers = 0;
-	m_numInCache++;
+    m_cachedDataLookup[newIndex] = lookup;
+    m_cachedData[lookup].lookup  = newIndex;
+    m_cachedData[lookup].data    = data;
+    Q_strncpyz(m_cachedData[lookup].path, path, sizeof(m_cachedData[lookup].path));
+    m_cachedData[lookup].numusers = 0;
+    m_numInCache++;
 
-	return true;
+    return true;
 }
 
 /*
@@ -648,26 +728,25 @@ SkeletorCacheUnloadData
 */
 void SkeletorCacheUnloadData(int index)
 {
-	int i;
+    int i;
 
-	m_numInCache--;
+    m_numInCache--;
 
-	if (dumploadedanims && dumploadedanims->integer)
-	{
-		Com_Printf("-loadanim: %s\n", m_cachedData[m_cachedDataLookup[index]].path);
-	}
+    if (dumploadedanims && dumploadedanims->integer) {
+        Com_Printf("-loadanim: %s\n", m_cachedData[m_cachedDataLookup[index]].path);
+    }
 
-	if (m_cachedData[m_cachedDataLookup[index]].data) {
-		skelAnimDataGameHeader_s::DeallocAnimData(m_cachedData[m_cachedDataLookup[index]].data);
-		m_cachedData[m_cachedDataLookup[index]].data = NULL;
-	}
+    if (m_cachedData[m_cachedDataLookup[index]].data) {
+        skelAnimDataGameHeader_s::DeallocAnimData(m_cachedData[m_cachedDataLookup[index]].data);
+        m_cachedData[m_cachedDataLookup[index]].data = NULL;
+    }
 
-	m_cachedData[m_cachedDataLookup[index]].lookup = -1;
-	for (i = index + 1; i < m_numInCache; i++)
-	{
-		m_cachedDataLookup[i - 1] = m_cachedDataLookup[i];
-		m_cachedData[m_cachedDataLookup[i]].lookup = i - 1;
-	}
+    m_cachedData[m_cachedDataLookup[index]].lookup = -1;
+
+    for (i = index; i < m_numInCache; i++) {
+        m_cachedDataLookup[i] = m_cachedDataLookup[i + 1];
+        m_cachedData[m_cachedDataLookup[i]].lookup = i;
+    }
 }
 
 /*
@@ -677,14 +756,16 @@ SkeletorCacheCleanCache
 */
 void SkeletorCacheCleanCache()
 {
-	int i;
+    int i;
 
-	for (i = m_numInCache - 1; i >= 0; i--)
-	{
-		if (!m_cachedData[m_cachedDataLookup[i]].numusers) {
-			SkeletorCacheUnloadData(i);
-		}
-	}
+    // Fixed in OPM
+    //  In original, i starts from 0 up to m_numInCache
+    //  the problem is that m_numInCache can decrement
+    for (i = m_numInCache; i > 0; i--) {
+        if (!m_cachedData[m_cachedDataLookup[i - 1]].numusers) {
+            SkeletorCacheUnloadData(i - 1);
+        }
+    }
 }
 
 /*
@@ -692,20 +773,19 @@ void SkeletorCacheCleanCache()
 TikiAddToBounds
 ===============
 */
-void TikiAddToBounds(dtikianim_t* tiki, SkelVec3* newBounds)
+void TikiAddToBounds(dtikianim_t *tiki, SkelVec3 *newBounds)
 {
-	int i;
+    int i;
 
-	for (i = 0; i < 3; i++)
-	{
-		if (newBounds[0].val[i] < tiki->mins[i]) {
-			tiki->mins[i] = newBounds[0].val[i];
-		}
+    for (i = 0; i < 3; i++) {
+        if (newBounds[0].val[i] < tiki->mins[i]) {
+            tiki->mins[i] = newBounds[0].val[i];
+        }
 
-		if (newBounds[1].val[i] > tiki->maxs[i]) {
-			tiki->maxs[i] = newBounds[1].val[i];
-		}
-	}
+        if (newBounds[1].val[i] > tiki->maxs[i]) {
+            tiki->maxs[i] = newBounds[1].val[i];
+        }
+    }
 }
 
 /*
@@ -715,33 +795,28 @@ TIKI_AnimList_f
 */
 void TIKI_AnimList_f()
 {
-	skeletorCacheEntry_t* entry;
-	int i;
+    skeletorCacheEntry_t *entry;
+    int                   i;
 
-	Com_Printf("\nanimlist:\n");
-	for (i = 0; i < m_numInCache; i++)
-	{
-		entry = &m_cachedData[m_cachedDataLookup[i]];
-		if (!entry) {
-			Com_Printf("*** NOT CACHED: ");
-		}
+    Com_Printf("\nanimlist:\n");
+    for (i = 0; i < m_numInCache; i++) {
+        entry = &m_cachedData[m_cachedDataLookup[i]];
+        if (!entry) {
+            Com_Printf("*** NOT CACHED: ");
+        }
 
-		if (m_cachedData[i].path[0])
-		{
-			Com_Printf("%s\n", m_cachedData[i].path);
-		}
-		else
-		{
-			Com_Printf("*** EMPTY PATH ERROR\n");
-		}
-	}
+        if (m_cachedData[i].path[0]) {
+            Com_Printf("%s\n", m_cachedData[i].path);
+        } else {
+            Com_Printf("*** EMPTY PATH ERROR\n");
+        }
+    }
 
-	for (; i < 4095; i++)
-	{
-		if (m_cachedData[m_cachedDataLookup[i]].path[0]) {
-			Com_Printf("*** CORRUPTED ENTRY\n");
-		}
-	}
+    for (; i < MAX_TIKI_ALIASES; i++) {
+        if (m_cachedData[m_cachedDataLookup[i]].path[0]) {
+            Com_Printf("*** CORRUPTED ENTRY\n");
+        }
+    }
 }
 
 /*
@@ -749,19 +824,22 @@ void TIKI_AnimList_f()
 TIKI_FixFrameNum
 ===============
 */
-void TIKI_FixFrameNum(dtikianim_t* ptiki, skelAnimDataGameHeader_t* animData, dtikicmd_t* cmd, const char* alias)
+void TIKI_FixFrameNum(dtikianim_t *ptiki, skelAnimDataGameHeader_t *animData, dtikicmd_t *cmd, const char *alias)
 {
-	if (cmd->frame_num >= TIKI_FRAME_LAST && cmd->frame_num < animData->numFrames)
-	{
-		if (cmd->frame_num <= TIKI_FRAME_END) {
-			cmd->frame_num = animData->numFrames - 1;
-		}
-	}
-	else
-	{
-		TIKI_Error("TIKI_FixFrameNum: illegal frame number %d (total: %d) in anim '%s' in '%s'\n", cmd->frame_num, animData->numFrames, alias, ptiki->name);
-		cmd->frame_num = 0;
-	}
+    if (cmd->frame_num >= TIKI_FRAME_LAST && cmd->frame_num < animData->numFrames) {
+        if (cmd->frame_num <= TIKI_FRAME_END) {
+            cmd->frame_num = animData->numFrames - 1;
+        }
+    } else {
+        TIKI_Error(
+            "TIKI_FixFrameNum: illegal frame number %d (total: %d) in anim '%s' in '%s'\n",
+            cmd->frame_num,
+            animData->numFrames,
+            alias,
+            ptiki->name
+        );
+        cmd->frame_num = 0;
+    }
 }
 
 /*
@@ -769,29 +847,25 @@ void TIKI_FixFrameNum(dtikianim_t* ptiki, skelAnimDataGameHeader_t* animData, dt
 TIKI_LoadAnim
 ===============
 */
-void TIKI_LoadAnim(dtikianim_t* ptiki)
+void TIKI_LoadAnim(dtikianim_t *ptiki)
 {
-	int i, j;
-	dtikianimdef_t* panim;
-	skelAnimDataGameHeader_t* animData;
+    int                       i, j;
+    dtikianimdef_t           *panim;
+    skelAnimDataGameHeader_t *animData;
 
-	for (i = 0; i < ptiki->num_anims; i++)
-	{
-		animData = SkeletorCacheGetData(ptiki->m_aliases[i]);
-		if (animData)
-		{
-			panim = ptiki->animdefs[i];
-			for (j = 0; j < panim->num_server_cmds; j++)
-			{
-				TIKI_FixFrameNum(ptiki, animData, &ptiki->animdefs[i]->server_cmds[j], ptiki->animdefs[i]->alias);
-			}
+    for (i = 0; i < ptiki->num_anims; i++) {
+        animData = SkeletorCacheGetData(ptiki->m_aliases[i]);
+        if (animData) {
+            panim = ptiki->animdefs[i];
+            for (j = 0; j < panim->num_server_cmds; j++) {
+                TIKI_FixFrameNum(ptiki, animData, &ptiki->animdefs[i]->server_cmds[j], ptiki->animdefs[i]->alias);
+            }
 
-			for (j = 0; j < panim->num_client_cmds; j++)
-			{
-				TIKI_FixFrameNum(ptiki, animData, &ptiki->animdefs[i]->client_cmds[j], ptiki->animdefs[i]->alias);
-			}
-		}
-	}
+            for (j = 0; j < panim->num_client_cmds; j++) {
+                TIKI_FixFrameNum(ptiki, animData, &ptiki->animdefs[i]->client_cmds[j], ptiki->animdefs[i]->alias);
+            }
+        }
+    }
 }
 
 /*
@@ -799,271 +873,257 @@ void TIKI_LoadAnim(dtikianim_t* ptiki)
 TIKI_InitTiki
 ===============
 */
-dtikianim_t* TIKI_InitTiki(dloaddef_t* ld, size_t defsize)
+dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize)
 {
-	byte* ptr;
-	byte* start_ptr;
-	byte* max_ptr;
-	dtikicmd_t* pcmds;
-	int i, k;
-	size_t j;
-	size_t size;
-	//int anim_index;
-	int alias_index;
-	dtikianim_t* panim;
-	dtikianimdef_t* panimdef;
-	dloadanim_t* anim;
-	skelAnimDataGameHeader_t* data;
-	qboolean bModelBoundsSet = false;
-	bool bPrecache;
-	int index;
-	char tempName[257];
-	int order[4095];
-	short temp_aliases[4095];
+    byte       *ptr;
+    byte       *start_ptr;
+    byte       *max_ptr;
+    dtikicmd_t *pcmds;
+    int         i, k;
+    int         numLoadedAnims;
+    size_t      j;
+    size_t      size;
+    //int anim_index;
+    int                       alias_index;
+    dtikianim_t              *panim;
+    dtikianimdef_t           *panimdef;
+    dloadanim_t              *anim;
+    skelAnimDataGameHeader_t *data;
+    qboolean                  bModelBoundsSet = false;
+    bool                      bPrecache;
+    int                       index;
+    char                      tempName[257];
+    int                       order[MAX_TIKI_ALIASES];
+    short                     temp_aliases[MAX_TIKI_ALIASES];
 
-	panim = (dtikianim_t*)TIKI_Alloc(defsize);
+    panim = (dtikianim_t *)TIKI_Alloc(defsize);
 
-	start_ptr = (byte*)panim;
-	max_ptr = start_ptr + defsize;
-	ptr = start_ptr;
+    start_ptr = (byte *)panim;
+    max_ptr   = start_ptr + defsize;
+    ptr       = start_ptr;
 
-	memset(panim, 0, defsize);
-	ClearBounds(panim->mins, panim->maxs);
-	panim->num_client_initcmds = ld->numclientinitcmds;
-	panim->num_server_initcmds = ld->numserverinitcmds;
-	panim->bIsCharacter = ld->bIsCharacter;
+    memset(panim, 0, defsize);
+    ClearBounds(panim->mins, panim->maxs);
+    panim->num_client_initcmds = ld->numclientinitcmds;
+    panim->num_server_initcmds = ld->numserverinitcmds;
+    panim->bIsCharacter        = ld->bIsCharacter;
 
-	ptr += sizeof(dtikianim_t) - sizeof(dtikianimdef_t*) + sizeof(dtikianimdef_t*) * ld->numanims;
-	panim->name = (char*)ptr;
-	strcpy(panim->name, ld->path);
+    ptr += sizeof(dtikianim_t) - sizeof(dtikianimdef_t *) + sizeof(dtikianimdef_t *) * ld->numanims;
+    panim->name = (char *)ptr;
+    strcpy(panim->name, ld->path);
 
-	ptr += strlen(ld->path) + 1;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	panim->server_initcmds = (dtikicmd_t*)ptr;
+    ptr += strlen(ld->path) + 1;
+    ptr                    = (byte *)PADP(ptr, sizeof(void *));
+    panim->server_initcmds = (dtikicmd_t *)ptr;
 
-	ptr += sizeof(*panim->server_initcmds) * panim->num_server_initcmds;
+    ptr += sizeof(*panim->server_initcmds) * panim->num_server_initcmds;
 
-	// Process server init commands
-	for (i = 0; i < ld->numserverinitcmds; i++)
-	{
-		pcmds = &panim->server_initcmds[i];
-		pcmds->num_args = ld->loadserverinitcmds[i]->num_args;
-		pcmds->args = (char**)ptr;
+    // Process server init commands
+    for (i = 0; i < ld->numserverinitcmds; i++) {
+        pcmds           = &panim->server_initcmds[i];
+        pcmds->num_args = ld->loadserverinitcmds[i]->num_args;
+        pcmds->args     = (char **)ptr;
 
-		ptr += sizeof(*pcmds->args) * pcmds->num_args;
+        ptr += sizeof(*pcmds->args) * pcmds->num_args;
 
-		for (j = 0; j < ld->loadserverinitcmds[i]->num_args; j++)
-		{
-			pcmds->args[j] = (char*)ptr;
-			size = strlen(ld->loadserverinitcmds[i]->args[j]) + 1;
-			memcpy(pcmds->args[j], ld->loadserverinitcmds[i]->args[j], size);
+        for (j = 0; j < ld->loadserverinitcmds[i]->num_args; j++) {
+            pcmds->args[j] = (char *)ptr;
+            size           = strlen(ld->loadserverinitcmds[i]->args[j]) + 1;
+            memcpy(pcmds->args[j], ld->loadserverinitcmds[i]->args[j], size);
 
-			ptr += size;
-		}
+            ptr += size;
+        }
 
-		ptr = (byte*)PADP(ptr, sizeof(void*));
-	}
+        ptr = (byte *)PADP(ptr, sizeof(void *));
+    }
 
-	panim->client_initcmds = (dtikicmd_t*)ptr;
+    panim->client_initcmds = (dtikicmd_t *)ptr;
 
-	ptr += sizeof(*panim->client_initcmds) * ld->numclientinitcmds;
+    ptr += sizeof(*panim->client_initcmds) * ld->numclientinitcmds;
 
-	// Process client init commands
-	for (i = 0; i < ld->numclientinitcmds; i++)
-	{
-		pcmds = &panim->client_initcmds[i];
-		pcmds->num_args = ld->loadclientinitcmds[i]->num_args;
-		pcmds->args = (char**)ptr;
+    // Process client init commands
+    for (i = 0; i < ld->numclientinitcmds; i++) {
+        pcmds           = &panim->client_initcmds[i];
+        pcmds->num_args = ld->loadclientinitcmds[i]->num_args;
+        pcmds->args     = (char **)ptr;
 
-		ptr += sizeof(*pcmds->args) * pcmds->num_args;
+        ptr += sizeof(*pcmds->args) * pcmds->num_args;
 
-		for (j = 0; j < ld->loadclientinitcmds[i]->num_args; j++)
-		{
-			pcmds->args[j] = (char*)ptr;
-			size = strlen(ld->loadclientinitcmds[i]->args[j]) + 1;
-			memcpy(pcmds->args[j], ld->loadclientinitcmds[i]->args[j], size);
+        for (j = 0; j < ld->loadclientinitcmds[i]->num_args; j++) {
+            pcmds->args[j] = (char *)ptr;
+            size           = strlen(ld->loadclientinitcmds[i]->args[j]) + 1;
+            memcpy(pcmds->args[j], ld->loadclientinitcmds[i]->args[j], size);
 
-			ptr += size;
-		}
+            ptr += size;
+        }
 
-		ptr = (byte*)PADP(ptr, sizeof(void*));
-	}
+        ptr = (byte *)PADP(ptr, sizeof(void *));
+    }
 
-	TIKI_GetAnimOrder(ld, order);
-	Com_sprintf(tempName, sizeof(tempName), "e%s", ld->path);
-	UI_LoadResource(tempName);
+    TIKI_GetAnimOrder(ld, order);
+    Com_sprintf(tempName, sizeof(tempName), "e%s", ld->path);
+    UI_LoadResource(tempName);
 
-	panim->m_aliases = temp_aliases;
-	assert(ptr <= max_ptr);
+    panim->m_aliases = temp_aliases;
+    assert(ptr <= max_ptr);
 
-	// Process anim commands
-	for (i = 0; i < ld->numanims; i++)
-	{
-		anim = ld->loadanims[order[i]];
-		if (!SkeletorCacheFindFilename(anim->name, &index))
-		{
-			bPrecache = false;
+    // Process anim commands
+    numLoadedAnims = 0;
+    for (i = 0; i < ld->numanims; i++) {
+        anim = ld->loadanims[order[i]];
+        if (!SkeletorCacheFindFilename(anim->name, &index)) {
+            bPrecache = false;
 
-			if ((!low_anim_memory && ld->numanims <= 49) || !low_anim_memory || !low_anim_memory->integer)
-			{
-				bPrecache = true;
-			}
+            if ((!low_anim_memory && ld->numanims <= 49) || !low_anim_memory || !low_anim_memory->integer) {
+                bPrecache = true;
+            }
 
-			if (!SkeletorCacheLoadData(anim->name, bPrecache, index))
-			{
-				TIKI_Error("TIKI_InitTiki: Failed to load animation '%s' at %s\n", anim->name, anim->location);
-				panim->m_aliases[i] = -1;
-				continue;
-			}
-		}
+            if (!SkeletorCacheLoadData(anim->name, bPrecache, index)) {
+                if (ld->hasSkel) {
+                    TIKI_DPrintf("^~^~^ TIKI_InitTiki: Couldn't load %s\n", ld->path);
+                    // Fixed in OPM
+                    //  The original game doesn't free the animation on error
+                    TIKI_Free(panim);
+                    return NULL;
+                }
 
-		alias_index = m_cachedDataLookup[index];
-		m_cachedData[alias_index].numusers++;
-		panimdef = (dtikianimdef_t*)ptr;
-		ptr += sizeof(dtikianimdef_t);
-		panim->animdefs[i] = panimdef;
-		panim->m_aliases[i] = alias_index;
-		strcpy(panimdef->alias, anim->alias);
-		panimdef->weight = anim->weight;
-		panimdef->flags = anim->flags;
+                TIKI_Error("TIKI_InitTiki: Failed to load animation '%s' at %s\n", anim->name, anim->location);
+                continue;
+            }
+        }
 
-		if (!Q_stricmp(panimdef->alias, "idle"))
-		{
-			data = SkeletorCacheGetData(alias_index);
-			if (data)
-			{
-				VectorCopy(data->bounds[0].val, panim->mins);
-				VectorCopy(data->bounds[1].val, panim->maxs);
-				bModelBoundsSet = true;
-			}
-		}
+        alias_index = m_cachedDataLookup[index];
+        m_cachedData[alias_index].numusers++;
+        panimdef = (dtikianimdef_t *)ptr;
+        ptr += sizeof(dtikianimdef_t);
+        panim->animdefs[numLoadedAnims]  = panimdef;
+        panim->m_aliases[numLoadedAnims] = alias_index;
+        Q_strncpyz(panimdef->alias, anim->alias, sizeof(panimdef->alias));
+        panimdef->weight = anim->weight;
+        panimdef->flags  = anim->flags;
 
+        if (!Q_stricmp(panimdef->alias, "idle")) {
+            data = SkeletorCacheGetData(alias_index);
+            if (data) {
+                VectorCopy(data->bounds[0].val, panim->mins);
+                VectorCopy(data->bounds[1].val, panim->maxs);
+                bModelBoundsSet = true;
+            }
+        }
 
-		if (anim->flags & TAF_RANDOM)
-		{
-			j = strlen(panimdef->alias);
-			if (isdigit(panimdef->alias[j - 1]))
-			{
-				do
-				{
-					j--;
-				} while (isdigit(panimdef->alias[j - 1]));
+        if (anim->flags & TAF_RANDOM) {
+            j = strlen(panimdef->alias);
+            if (isdigit(panimdef->alias[j - 1])) {
+                do {
+                    j--;
+                } while (isdigit(panimdef->alias[j - 1]));
 
-				panimdef->alias[j] = 0;
-			}
-			else
-			{
-				TIKI_DPrintf("TIKI_InitTiki: Random animation name '%s' should end with a number\n", panimdef->alias);
-			}
-		}
+                panimdef->alias[j] = 0;
+            } else {
+                TIKI_DPrintf("TIKI_InitTiki: Random animation name '%s' should end with a number\n", panimdef->alias);
+            }
+        }
 
-		panimdef->blendtime = anim->blendtime;
-		if (loadtikicommands)
-		{
-			panimdef->num_server_cmds = anim->num_server_cmds;
-			panimdef->num_client_cmds = anim->num_client_cmds;
-		}
-		else
-		{
-			panimdef->num_server_cmds = 0;
-			panimdef->num_client_cmds = 0;
-		}
+        panimdef->blendtime = anim->blendtime;
+        if (loadtikicommands) {
+            panimdef->num_server_cmds = anim->num_server_cmds;
+            panimdef->num_client_cmds = anim->num_client_cmds;
+        } else {
+            panimdef->num_server_cmds = 0;
+            panimdef->num_client_cmds = 0;
+        }
 
-		panimdef->server_cmds = (dtikicmd_t*)ptr;
-		ptr = (byte*)(panimdef->server_cmds + anim->num_server_cmds);
+        panimdef->server_cmds = (dtikicmd_t *)ptr;
+        ptr                   = (byte *)(panimdef->server_cmds + anim->num_server_cmds);
 
-		// Process server anim commands
-		for (j = 0; j < anim->num_server_cmds; j++)
-		{
-			pcmds = &panimdef->server_cmds[j];
-			pcmds->num_args = anim->loadservercmds[j]->num_args;
-			pcmds->frame_num = anim->loadservercmds[j]->frame_num;
-			pcmds->args = (char**)ptr;
+        // Process server anim commands
+        for (j = 0; j < anim->num_server_cmds; j++) {
+            pcmds            = &panimdef->server_cmds[j];
+            pcmds->num_args  = anim->loadservercmds[j]->num_args;
+            pcmds->frame_num = anim->loadservercmds[j]->frame_num;
+            pcmds->args      = (char **)ptr;
 
-			ptr += pcmds->num_args * sizeof(*pcmds->args);
+            ptr += pcmds->num_args * sizeof(*pcmds->args);
 
-			for (k = 0; k < anim->loadservercmds[j]->num_args; k++)
-			{
-				pcmds->args[k] = (char*)ptr;
-				size = strlen(anim->loadservercmds[j]->args[k]) + 1;
-				memcpy(pcmds->args[k], anim->loadservercmds[j]->args[k], size);
+            for (k = 0; k < anim->loadservercmds[j]->num_args; k++) {
+                pcmds->args[k] = (char *)ptr;
+                size           = strlen(anim->loadservercmds[j]->args[k]) + 1;
+                memcpy(pcmds->args[k], anim->loadservercmds[j]->args[k], size);
 
-				ptr += size;
-			}
+                ptr += size;
+            }
 
-			ptr = (byte*)PADP(ptr, sizeof(void*));
-		}
+            ptr = (byte *)PADP(ptr, sizeof(void *));
+        }
 
-		panimdef->client_cmds = (dtikicmd_t*)ptr;
-		ptr += anim->num_client_cmds * sizeof(dtikicmd_t);
+        panimdef->client_cmds = (dtikicmd_t *)ptr;
+        ptr += anim->num_client_cmds * sizeof(dtikicmd_t);
 
-		// Process client anim commands
-		for (j = 0; j < anim->num_client_cmds; j++)
-		{
-			pcmds = &panimdef->client_cmds[j];
-			pcmds->num_args = anim->loadclientcmds[j]->num_args;
-			pcmds->frame_num = anim->loadclientcmds[j]->frame_num;
-			pcmds->args = (char**)ptr;
+        // Process client anim commands
+        for (j = 0; j < anim->num_client_cmds; j++) {
+            pcmds            = &panimdef->client_cmds[j];
+            pcmds->num_args  = anim->loadclientcmds[j]->num_args;
+            pcmds->frame_num = anim->loadclientcmds[j]->frame_num;
+            pcmds->args      = (char **)ptr;
 
-			ptr += pcmds->num_args * sizeof(*pcmds->args);
+            ptr += pcmds->num_args * sizeof(*pcmds->args);
 
-			for (k = 0; k < anim->loadclientcmds[j]->num_args; k++)
-			{
-				pcmds->args[k] = (char*)ptr;
-				size = strlen(anim->loadclientcmds[j]->args[k]) + 1;
-				memcpy(pcmds->args[k], anim->loadclientcmds[j]->args[k], size);
+            for (k = 0; k < anim->loadclientcmds[j]->num_args; k++) {
+                pcmds->args[k] = (char *)ptr;
+                size           = strlen(anim->loadclientcmds[j]->args[k]) + 1;
+                memcpy(pcmds->args[k], anim->loadclientcmds[j]->args[k], size);
 
-				ptr += size;
-			}
+                ptr += size;
+            }
 
-			ptr = (byte*)PADP(ptr, sizeof(void*));
-		}
+            ptr = (byte *)PADP(ptr, sizeof(void *));
+        }
 
-		assert(ptr <= max_ptr);
-	}
+        assert(ptr <= max_ptr);
 
-	panim->m_aliases = NULL;
-	if (i)
-	{
-		if (!bModelBoundsSet)
-		{
-			TIKI_DPrintf("TIKI_InitTiki: no 'idle' animation found, model bounds not set for %s\n", ld->path);
-		}
+        numLoadedAnims++;
+    }
 
-		panim->num_anims = i;
-		panim->m_aliases = (short*)TIKI_Alloc(panim->num_anims * sizeof(short));
-		memcpy(panim->m_aliases, temp_aliases, panim->num_anims * sizeof(short));
-		panim->modelData = ptr;
-		panim->modelDataSize = ld->modelBuf->cursize;
-		memcpy(panim->modelData, ld->modelData, panim->modelDataSize);
-		ptr += panim->modelDataSize;
+    panim->m_aliases = NULL;
+    if (numLoadedAnims) {
+        if (!bModelBoundsSet) {
+            TIKI_DPrintf("TIKI_InitTiki: no 'idle' animation found, model bounds not set for %s\n", ld->path);
+        }
 
-		size = strlen(ld->headmodels) + 1;
-		panim->headmodels = (char*)ptr;
-		memcpy(panim->headmodels, ld->headmodels, size);
-		ptr += size;
+        panim->num_anims = numLoadedAnims;
+        panim->m_aliases = (short *)TIKI_Alloc(panim->num_anims * sizeof(short));
+        memcpy(panim->m_aliases, temp_aliases, panim->num_anims * sizeof(short));
+        panim->modelData     = ptr;
+        panim->modelDataSize = ld->modelBuf->cursize;
+        memcpy(panim->modelData, ld->modelData, panim->modelDataSize);
+        ptr += panim->modelDataSize;
 
-		size = strlen(ld->headskins) + 1;
-		panim->headskins = (char*)ptr;
-		memcpy(panim->headskins, ld->headskins, size);
-		ptr += size;
+        size              = strlen(ld->headmodels) + 1;
+        panim->headmodels = (char *)ptr;
+        memcpy(panim->headmodels, ld->headmodels, size);
+        ptr += size;
 
-		sprintf(tempName, "h%s", ld->path);
-		UI_LoadResource(tempName);
+        size             = strlen(ld->headskins) + 1;
+        panim->headskins = (char *)ptr;
+        memcpy(panim->headskins, ld->headskins, size);
+        ptr += size;
 
-		if (low_anim_memory && (!low_anim_memory->integer || !tiki_loading))
-		{
-			TIKI_LoadAnim(panim);
-		}
-	}
-	else
-	{
-		TIKI_Error("TIKI_InitTiki: No valid animations found in %s.\n", ld->path);
-		panim = NULL;
-	}
+        Com_sprintf(tempName, sizeof(tempName), "h%s", ld->path);
+        UI_LoadResource(tempName);
 
-	assert(ptr <= max_ptr);
-	return panim;
+        if (low_anim_memory && (!low_anim_memory->integer || !tiki_loading)) {
+            TIKI_LoadAnim(panim);
+        }
+    } else {
+        TIKI_Error("TIKI_InitTiki: No valid animations found in %s.\n", ld->path);
+        // Fixed in OPM
+        //  The original game doesn't free the animation on error
+        TIKI_Free(panim);
+        panim = NULL;
+    }
+
+    assert(ptr <= max_ptr);
+    return panim;
 }
 
 /*
@@ -1071,14 +1131,13 @@ dtikianim_t* TIKI_InitTiki(dloaddef_t* ld, size_t defsize)
 TIKI_RemoveTiki
 ===============
 */
-void TIKI_RemoveTiki(dtikianim_t* ptiki)
+void TIKI_RemoveTiki(dtikianim_t *ptiki)
 {
-	int i;
-	int alias_index;
+    int i;
+    int alias_index;
 
-	for (i = 0; i < ptiki->num_anims; i++)
-	{
-		alias_index = ptiki->m_aliases[i];
-		m_cachedData[alias_index].numusers--;
-	}
+    for (i = 0; i < ptiki->num_anims; i++) {
+        alias_index = ptiki->m_aliases[i];
+        m_cachedData[alias_index].numusers--;
+    }
 }
diff --git a/code/tiki/tiki_files.h b/code/tiki/tiki_files.h
index d58e9978..518d0f88 100644
--- a/code/tiki/tiki_files.h
+++ b/code/tiki/tiki_files.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,8 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_files.h : TIKI Files
 
-#ifndef __TIKI_FILES_H__
-#define __TIKI_FILES_H__
+#pragma once
 
 #include "../qcommon/tiki.h"
 
@@ -31,44 +30,44 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
-extern qboolean tiki_loading;
+    extern qboolean tiki_loading;
 
-extern cvar_t	*dumploadedanims;
-extern cvar_t	*low_anim_memory;
-extern cvar_t	*showLoad;
-extern cvar_t	*convertAnims;
+    extern cvar_t *dumploadedanims;
+    extern cvar_t *low_anim_memory;
+    extern cvar_t *showLoad;
+    extern cvar_t *convertAnims;
 
-extern dloaddef_t loaddef;
+    extern dloaddef_t loaddef;
 
-void TIKI_FreeStorage( dloaddef_t *ld );
-void *TIKI_AllocateLoadData( size_t length );
-char *TIKI_CopyString( const char *s );
-dtikianim_t *TIKI_LoadTikiAnim( const char *path );
+    void         TIKI_FreeStorage(dloaddef_t *ld);
+    void        *TIKI_AllocateLoadData(size_t length);
+    qboolean     TIKI_AliasExists(dloaddef_t* ld, const char* name);
+    void         TIKI_AddDefaultIdleAnim(dloaddef_t* ld);
+    char        *TIKI_CopyString(const char *s);
+    dtikianim_t *TIKI_LoadTikiAnim(const char *path);
 
 #ifdef __cplusplus
-dtiki_t *TIKI_LoadTikiModel( dtikianim_t *tikianim, const char *name, con_map<str, str> *keyValues );
+    dtiki_t *TIKI_LoadTikiModel(dtikianim_t *tikianim, const char *name, con_map<str, str> *keyValues);
 #endif
 
-void TIKI_CalcRadius( dtiki_t *tiki );
-skelAnimDataGameHeader_t *SkeletorCacheFileCallback( const char *path );
-skelAnimDataGameHeader_t *SkeletorCacheGetData( int index );
+    void                      TIKI_CalcRadius(dtiki_t *tiki);
+    skelAnimDataGameHeader_t *SkeletorCacheFileCallback(const char *path);
+    skelAnimDataGameHeader_t *SkeletorCacheGetData(int index);
 
 #ifdef __cplusplus
-bool SkeletorCacheFindFilename( const char *path, int *indexPtr );
-bool SkeletorCacheLoadData( const char *path, bool precache, int newIndex );
-void SkeletorCacheUnloadData( int index );
-void SkeletorCacheCleanCache();
-void TikiAddToBounds( dtikianim_t *tiki, SkelVec3 *newBounds );
+    bool SkeletorCacheFindFilename(const char *path, int *indexPtr);
+    bool SkeletorCacheLoadData(const char *path, bool precache, int newIndex);
+    void SkeletorCacheUnloadData(int index);
+    void SkeletorCacheCleanCache();
+    void TikiAddToBounds(dtikianim_t *tiki, SkelVec3 *newBounds);
 #endif
 
-void TIKI_AnimList_f();
-void TIKI_FixFrameNum( dtikianim_t *ptiki, skelAnimDataGameHeader_t *animData, dtikicmd_t *cmd, const char *alias );
-void TIKI_LoadAnim( dtikianim_t *ptiki );
-dtikianim_t *TIKI_InitTiki( dloaddef_t *ld, size_t defsize );
-void TIKI_RemoveTiki( dtikianim_t *ptiki );
+    void TIKI_AnimList_f();
+    void TIKI_FixFrameNum(dtikianim_t *ptiki, skelAnimDataGameHeader_t *animData, dtikicmd_t *cmd, const char *alias);
+    void TIKI_LoadAnim(dtikianim_t *ptiki);
+    dtikianim_t *TIKI_InitTiki(dloaddef_t *ld, size_t defsize);
+    void         TIKI_RemoveTiki(dtikianim_t *ptiki);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_FILES_H__
\ No newline at end of file
diff --git a/code/tiki/tiki_frame.cpp b/code/tiki/tiki_frame.cpp
index 8a3058e2..bf8634c6 100644
--- a/code/tiki/tiki_frame.cpp
+++ b/code/tiki/tiki_frame.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -34,38 +34,48 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 TIKI_Frame_Commands_Server
 ===============
 */
-qboolean TIKI_Frame_Commands_Server( dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd )
+qboolean TIKI_Frame_Commands_Server(dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd)
 {
-	dtikicmd_t *pcmd;
-	dtikianimdef_t *panimdef;
-	qboolean found;
-	int i;
+    dtikicmd_t     *pcmd;
+    dtikianimdef_t *panimdef;
+    qboolean        found;
+    int             i;
 
-	tiki_cmd->num_cmds = 0;
-	panimdef = pmdl->a->animdefs[ animnum ];
-	found = false;
+    if (!pmdl || !pmdl->a) {
+        return qfalse;
+    }
 
-	for( i = 0; i < panimdef->num_server_cmds; i++ )
-	{
-		pcmd = &panimdef->server_cmds[ i ];
+    if (animnum >= pmdl->a->num_anims || animnum < 0) {
+        return qfalse;
+    }
 
-		if( ( pcmd->frame_num == framenum ) || ( pcmd->frame_num == TIKI_FRAME_EVERY && framenum >= 0 ) )
-		{
-			if( tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS )
-			{
-				TIKI_Error( "TIKI_Frame_Commands_Client: Too many cmds for anim %d frame %d for %s.\n", animnum, framenum, pmdl->a->name );
-				return false;
-			}
+    tiki_cmd->num_cmds = 0;
+    panimdef           = pmdl->a->animdefs[animnum];
+    found              = false;
 
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].num_args = pcmd->num_args;
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].args = pcmd->args;
-			tiki_cmd->num_cmds++;
+    for (i = 0; i < panimdef->num_server_cmds; i++) {
+        pcmd = &panimdef->server_cmds[i];
 
-			found = true;
-		}
-	}
+        if ((pcmd->frame_num == framenum) || (pcmd->frame_num == TIKI_FRAME_EVERY && framenum >= 0)) {
+            if (tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS) {
+                TIKI_Error(
+                    "TIKI_Frame_Commands_Client: Too many cmds for anim %d frame %d for %s.\n",
+                    animnum,
+                    framenum,
+                    pmdl->a->name
+                );
+                return false;
+            }
 
-	return found;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].num_args = pcmd->num_args;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].args     = pcmd->args;
+            tiki_cmd->num_cmds++;
+
+            found = true;
+        }
+    }
+
+    return found;
 }
 
 /*
@@ -73,38 +83,48 @@ qboolean TIKI_Frame_Commands_Server( dtiki_t *pmdl, int animnum, int framenum, t
 TIKI_Frame_Commands_Client
 ===============
 */
-qboolean TIKI_Frame_Commands_Client( dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd )
+qboolean TIKI_Frame_Commands_Client(dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd)
 {
-	dtikicmd_t *pcmd;
-	dtikianimdef_t *panimdef;
-	qboolean found;
-	int i;
+    dtikicmd_t     *pcmd;
+    dtikianimdef_t *panimdef;
+    qboolean        found;
+    int             i;
 
-	tiki_cmd->num_cmds = 0;
-	panimdef = pmdl->a->animdefs[ animnum ];
-	found = false;
+    if (!pmdl || !pmdl->a) {
+        return qfalse;
+    }
 
-	for( i = 0; i < panimdef->num_client_cmds; i++ )
-	{
-		pcmd = &panimdef->client_cmds[ i ];
+    if (animnum >= pmdl->a->num_anims || animnum < 0) {
+        return qfalse;
+    }
 
-		if( ( pcmd->frame_num == framenum ) || ( pcmd->frame_num == TIKI_FRAME_EVERY && framenum >= 0 ) )
-		{
-			if( tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS )
-			{
-				TIKI_Error( "TIKI_Frame_Commands_Client: Too many cmds for anim %d frame %d for %s.\n", animnum, framenum, pmdl->a->name );
-				return false;
-			}
+    tiki_cmd->num_cmds = 0;
+    panimdef           = pmdl->a->animdefs[animnum];
+    found              = false;
 
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].num_args = pcmd->num_args;
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].args = pcmd->args;
-			tiki_cmd->num_cmds++;
+    for (i = 0; i < panimdef->num_client_cmds; i++) {
+        pcmd = &panimdef->client_cmds[i];
 
-			found = true;
-		}
-	}
+        if ((pcmd->frame_num == framenum) || (pcmd->frame_num == TIKI_FRAME_EVERY && framenum >= 0)) {
+            if (tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS) {
+                TIKI_Error(
+                    "TIKI_Frame_Commands_Client: Too many cmds for anim %d frame %d for %s.\n",
+                    animnum,
+                    framenum,
+                    pmdl->a->name
+                );
+                return false;
+            }
 
-	return found;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].num_args = pcmd->num_args;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].args     = pcmd->args;
+            tiki_cmd->num_cmds++;
+
+            found = true;
+        }
+    }
+
+    return found;
 }
 
 /*
@@ -112,38 +132,49 @@ qboolean TIKI_Frame_Commands_Client( dtiki_t *pmdl, int animnum, int framenum, t
 TIKI_Frame_Commands_ClientTime
 ===============
 */
-qboolean TIKI_Frame_Commands_ClientTime( dtiki_t *pmdl, int animnum, float start, float end, tiki_cmd_t *tiki_cmd )
+qboolean TIKI_Frame_Commands_ClientTime(dtiki_t *pmdl, int animnum, float start, float end, tiki_cmd_t *tiki_cmd)
 {
-	dtikicmd_t *pcmd;
-	dtikianimdef_t *panimdef;
-	qboolean found;
-	int i;
-	float cmdTime;
+    dtikicmd_t     *pcmd;
+    dtikianimdef_t *panimdef;
+    qboolean        found;
+    int             i;
+    float           cmdTime;
 
-	tiki_cmd->num_cmds = 0;
-	panimdef = pmdl->a->animdefs[ animnum ];
-	found = false;
+    if (!pmdl || !pmdl->a) {
+        return qfalse;
+    }
 
-	for( i = 0; i < panimdef->num_client_cmds; i++ )
-	{
-		pcmd = &panimdef->client_cmds[ i ];
-		cmdTime = pcmd->frame_num / 1000.0f;
+    if (animnum >= pmdl->a->num_anims || animnum < 0) {
+        return qfalse;
+    }
 
-		if( cmdTime >= start && cmdTime <= end )
-		{
-			if( tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS )
-			{
-				TIKI_Error( "TIKI_Frame_Commands_Client: Too many cmds for anim %d times %f %f for %s.\n", animnum, start, end, pmdl->a->name );
-				return false;
-			}
+    tiki_cmd->num_cmds = 0;
+    panimdef           = pmdl->a->animdefs[animnum];
+    found              = false;
 
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].num_args = pcmd->num_args;
-			tiki_cmd->cmds[ tiki_cmd->num_cmds ].args = pcmd->args;
-			tiki_cmd->num_cmds++;
+    for (i = 0; i < panimdef->num_client_cmds; i++) {
+        pcmd    = &panimdef->client_cmds[i];
+        cmdTime = pcmd->frame_num / 1000.0f;
 
-			found = true;
-		}
-	}
+        if (cmdTime >= start && cmdTime <= end) {
+            if (tiki_cmd->num_cmds >= TIKI_MAX_COMMANDS) {
+                TIKI_Error(
+                    "TIKI_Frame_Commands_Client: Too many cmds for anim %d times %f %f for %s.\n",
+                    animnum,
+                    start,
+                    end,
+                    pmdl->a->name
+                );
+                return false;
+            }
 
-	return true;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].num_args = pcmd->num_args;
+            tiki_cmd->cmds[tiki_cmd->num_cmds].args     = pcmd->args;
+            tiki_cmd->num_cmds++;
+
+            found = true;
+        }
+    }
+
+    return true;
 }
diff --git a/code/tiki/tiki_frame.h b/code/tiki/tiki_frame.h
index 2cb9431e..e6c1ead7 100644
--- a/code/tiki/tiki_frame.h
+++ b/code/tiki/tiki_frame.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,19 +22,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_frames.h : TIKI Frame
 
-#ifndef __TIKI_FRAME_H__
-#define __TIKI_FRAME_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-qboolean TIKI_Frame_Commands_Server( dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd );
-qboolean TIKI_Frame_Commands_Client( dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd );
-qboolean TIKI_Frame_Commands_ClientTime( dtiki_t *pmdl, int animnum, float start, float end, tiki_cmd_t *tiki_cmd );
+    qboolean TIKI_Frame_Commands_Server(dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd);
+    qboolean TIKI_Frame_Commands_Client(dtiki_t *pmdl, int animnum, int framenum, tiki_cmd_t *tiki_cmd);
+    qboolean TIKI_Frame_Commands_ClientTime(dtiki_t *pmdl, int animnum, float start, float end, tiki_cmd_t *tiki_cmd);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_FRAME_H__
\ No newline at end of file
diff --git a/code/tiki/tiki_imports.cpp b/code/tiki/tiki_imports.cpp
index 837f6762..2a7b975f 100644
--- a/code/tiki/tiki_imports.cpp
+++ b/code/tiki/tiki_imports.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,38 +26,34 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qcommon.h"
 #include "tiki_imports.h"
 
-void TIKI_DPrintf( const char *fmt, ... )
+void TIKI_DPrintf(const char *fmt, ...)
 {
-	char msg[ 4096 ];
-	va_list va;
+    char    msg[4096];
+    va_list va;
 
-	va_start( va, fmt );
-	vsprintf( msg, fmt, va );
-	va_end( va );
+    va_start(va, fmt);
+    Q_vsnprintf(msg, sizeof(msg), fmt, va);
+    va_end(va);
 
-	Com_DPrintf( "%s", msg );
+    Com_DPrintf("%s", msg);
 }
 
-#ifndef _DEBUG_MEM
-
-void TIKI_Free( void *ptr )
+void TIKI_Free(void *ptr)
 {
-	Z_Free( ptr );
+    Z_Free(ptr);
 }
 
-void *TIKI_Alloc( size_t size )
+void *TIKI_Alloc(size_t size)
 {
-	return Z_TagMalloc( size, TAG_TIKI );
+    return Z_TagMalloc(size, TAG_TIKI);
 }
 
-#endif
-
-void TIKI_FreeFile( void *buffer )
+void TIKI_FreeFile(void *buffer)
 {
-	FS_FreeFile( buffer );
+    FS_FreeFile(buffer);
 }
 
-int TIKI_ReadFileEx( const char *qpath, void **buffer, qboolean quiet )
+int TIKI_ReadFileEx(const char *qpath, void **buffer, qboolean quiet)
 {
-	return FS_ReadFileEx( qpath, buffer, quiet );
+    return FS_ReadFileEx(qpath, buffer, quiet);
 }
diff --git a/code/tiki/tiki_imports.h b/code/tiki/tiki_imports.h
index 50f5208c..f7db21a0 100644
--- a/code/tiki/tiki_imports.h
+++ b/code/tiki/tiki_imports.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,18 +28,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
-void TIKI_DPrintf( const char *fmt, ... );
+    void TIKI_DPrintf(const char *fmt, ...);
 
-#ifndef _DEBUG_MEM
-void TIKI_Free( void *ptr );
-void *TIKI_Alloc( size_t size );
-#else
-#define TIKI_Free(ptr) free(ptr)
-#define TIKI_Alloc(size) malloc(size)
-#endif
+    void  TIKI_Free(void *ptr);
+    void *TIKI_Alloc(size_t size);
 
-void TIKI_FreeFile( void *buffer );
-int TIKI_ReadFileEx( const char *qpath, void **buffer, qboolean quiet );
+    void TIKI_FreeFile(void *buffer);
+    int  TIKI_ReadFileEx(const char *qpath, void **buffer, qboolean quiet);
 
 #ifdef __cplusplus
 }
diff --git a/code/tiki/tiki_mesh.cpp b/code/tiki/tiki_mesh.cpp
index 922f5b0d..5f4d3d2f 100644
--- a/code/tiki/tiki_mesh.cpp
+++ b/code/tiki/tiki_mesh.cpp
@@ -24,13 +24,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "tiki.h"
 
-int TIKI_Skel_Bones_Index;
-int skeletorMorphCacheIndex;
+int             TIKI_Skel_Bones_Index;
+int             skeletorMorphCacheIndex;
 skelBoneCache_t TIKI_Skel_Bones[MAX_SKELBONES];
-int skeletorMorphCache[MAX_SKELMORPH];
+int             skeletorMorphCache[MAX_SKELMORPH];
 
 void TIKI_Reset_Caches()
 {
-    TIKI_Skel_Bones_Index = 0;
+    TIKI_Skel_Bones_Index   = 0;
     skeletorMorphCacheIndex = 0;
 }
diff --git a/code/tiki/tiki_mesh.h b/code/tiki/tiki_mesh.h
index fcce59b9..c5a30c96 100644
--- a/code/tiki/tiki_mesh.h
+++ b/code/tiki/tiki_mesh.h
@@ -26,15 +26,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 extern "C" {
 #endif
 
-#define MAX_SKELBONES		20000
-#define MAX_SKELMORPH		12800
+#define MAX_SKELBONES 20000
+#define MAX_SKELMORPH 12800
 
-extern int TIKI_Skel_Bones_Index;
-extern int skeletorMorphCacheIndex;
-extern skelBoneCache_t TIKI_Skel_Bones[];
-extern int skeletorMorphCache[];
+    extern int             TIKI_Skel_Bones_Index;
+    extern int             skeletorMorphCacheIndex;
+    extern skelBoneCache_t TIKI_Skel_Bones[];
+    extern int             skeletorMorphCache[];
 
-void TIKI_Reset_Caches();
+    void TIKI_Reset_Caches();
 
 #ifdef __cplusplus
 }
diff --git a/code/tiki/tiki_parse.cpp b/code/tiki/tiki_parse.cpp
index 0ecfd1e2..1b977811 100644
--- a/code/tiki/tiki_parse.cpp
+++ b/code/tiki/tiki_parse.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -28,32 +28,49 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../skeletor/skeletor.h"
 #include <tiki.h>
 
+typedef enum tiki_setupcase_e {
+    SETUP_END_MESSAGE = -1,
+    SETUP_LOAD_SCALE,
+    SETUP_LOD_SCALE,
+    SETUP_LOD_BIAS,
+    SETUP_SKELMODEL,
+    SETUP_LOAD_ORIGIN,
+    SETUP_LIGHT_OFFSET,
+    SETUP_RADIUS,
+    SETUP_SURFACE,
+    SETUP_FLAGS,
+    SETUP_DAMAGE,
+    SETUP_SHADER,
+    SETUP_CASE_KEY,
+    SETUP_CASE_VALUE,
+    SETUP_BEGIN_CASE,
+    SETUP_BEGIN_CASE_BODY,
+    SETUP_END_CASE
+} tiki_setupcase_t;
+
 /*
 ===============
 TIKI_FileExtension
 ===============
 */
-const char *TIKI_FileExtension( const char *in )
+const char *TIKI_FileExtension(const char *in)
 {
-	static char exten[ 8 ];
-	int i;
+    static char exten[8];
+    int         i;
 
-	for( i = 0; in[ i ] != 0; i++ )
-	{
-		if( in[ i ] == '.' )
-		{
-			i++;
-			break;
-		}
-	}
+    for (i = 0; in[i] != 0; i++) {
+        if (in[i] == '.') {
+            i++;
+            break;
+        }
+    }
 
-	if( !in[ i ] )
-	{
-		return "";
-	}
+    if (!in[i]) {
+        return "";
+    }
 
-	strncpy( exten, &in[ i ], sizeof( exten ) );
-	return exten;
+    strncpy(exten, &in[i], sizeof(exten));
+    return exten;
 }
 
 /*
@@ -61,121 +78,110 @@ const char *TIKI_FileExtension( const char *in )
 TIKI_ParseFrameCommands
 ===============
 */
-void TIKI_ParseFrameCommands( dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds )
+void TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds)
 {
-	qboolean usecurrentframe = false;
-	const char *token;
-	dloadframecmd_t *cmds;
-	int framenum = 0;
-	int i;
-	char *pszArgs[ 256 ];
+    qboolean         usecurrentframe = false;
+    const char      *token;
+    dloadframecmd_t *cmds;
+    int              framenum = 0;
+    int              i;
+    char            *pszArgs[256];
 
-	ld->tikiFile.GetToken( true );
+    ld->tikiFile.GetToken(true);
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "}" ) )
-		{
-			break;
-		}
-	
-		if( *numcmds < maxcmds )
-		{
-			cmds = ( dloadframecmd_t * )TIKI_AllocateLoadData( sizeof( dloadframecmd_t ) );
-			cmdlist[ *numcmds ] = cmds;
-			if( !cmds )
-			{
-				TIKI_Error( "TIKI_ParseFrameCommands: could not allocate storage for dloadframecmd_t in %s on line %d.\n", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-				continue;
-			}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "}")) {
+            break;
+        }
 
-			cmds->num_args = 0;
-			( *numcmds )++;
+        if (*numcmds < maxcmds) {
+            cmds              = (dloadframecmd_t *)TIKI_AllocateLoadData(sizeof(dloadframecmd_t));
+            cmdlist[*numcmds] = cmds;
+            if (!cmds) {
+                TIKI_Error(
+                    "TIKI_ParseFrameCommands: could not allocate storage for dloadframecmd_t in %s on line %d.\n",
+                    ld->tikiFile.Filename(),
+                    ld->tikiFile.GetLineNumber()
+                );
+                continue;
+            }
 
-			if( !stricmp( token, "start" ) || !stricmp( token, "first" ) )
-			{
-				framenum = TIKI_FRAME_FIRST;
-			}
-			else if( !stricmp( token, "end" ) )
-			{
-				framenum = TIKI_FRAME_END;
-			}
-			else if( !stricmp( token, "last" ) )
-			{
-				framenum = TIKI_FRAME_LAST;
-			}
-			else if( !stricmp( token, "every" ) )
-			{
-				framenum = TIKI_FRAME_EVERY;
-			}
-			else if( !stricmp( token, "exit" ) )
-			{
-				framenum = TIKI_FRAME_EXIT;
-			}
-			else if( !stricmp( token, "entry" ) || !stricmp( token, "enter" ) )
-			{
-				framenum = TIKI_FRAME_ENTRY;
-			}
-			else if( !stricmp( token, "(" ) )
-			{
-				usecurrentframe = true;
-				ld->tikiFile.UnGetToken();
-			}
-			else if( !stricmp( token, ")" ) )
-			{
-				usecurrentframe = false;
-				ld->tikiFile.UnGetToken();
-			}
-			else if( !usecurrentframe )
-			{
-				framenum = atoi( token );
-			}
-			else
-			{
-				ld->tikiFile.UnGetToken();
-			}
+            cmds->num_args = 0;
+            (*numcmds)++;
 
-			if( framenum < TIKI_FRAME_LAST )
-			{
-				TIKI_Error( "TIKI_ParseFrameCommands: illegal frame number %d on line %d in %s\n", framenum, ld->tikiFile.GetLineNumber(), ld->tikiFile.Filename());
-				while( ld->tikiFile.TokenAvailable( false ) )
-					ld->tikiFile.GetToken( false );
-				( *numcmds )--;
-				continue;
-			}
+            if (!Q_stricmp(token, "start") || !Q_stricmp(token, "first")) {
+                framenum = TIKI_FRAME_FIRST;
+            } else if (!Q_stricmp(token, "end")) {
+                framenum = TIKI_FRAME_END;
+            } else if (!Q_stricmp(token, "last")) {
+                framenum = TIKI_FRAME_LAST;
+            } else if (!Q_stricmp(token, "every")) {
+                framenum = TIKI_FRAME_EVERY;
+            } else if (!Q_stricmp(token, "exit")) {
+                framenum = TIKI_FRAME_EXIT;
+            } else if (!Q_stricmp(token, "entry") || !Q_stricmp(token, "enter")) {
+                framenum = TIKI_FRAME_ENTRY;
+            } else if (!Q_stricmp(token, "(")) {
+                usecurrentframe = true;
+                ld->tikiFile.UnGetToken();
+            } else if (!Q_stricmp(token, ")")) {
+                usecurrentframe = false;
+                ld->tikiFile.UnGetToken();
+            } else if (!usecurrentframe) {
+                framenum = atoi(token);
+            } else {
+                ld->tikiFile.UnGetToken();
+            }
 
-			cmds->frame_num = framenum;
-			if( ld->tikiFile.currentScript )
-			{
-				sprintf( cmds->location, "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-			}
+            if (framenum < TIKI_FRAME_LAST) {
+                TIKI_Error(
+                    "TIKI_ParseFrameCommands: illegal frame number %d on line %d in %s\n",
+                    framenum,
+                    ld->tikiFile.GetLineNumber(),
+                    ld->tikiFile.Filename()
+                );
+                while (ld->tikiFile.TokenAvailable(false)) {
+                    ld->tikiFile.GetToken(false);
+                }
+                (*numcmds)--;
+                continue;
+            }
 
-			while( ld->tikiFile.TokenAvailable( false ) )
-			{
-				token = ld->tikiFile.GetToken( false );
+            cmds->frame_num = framenum;
+            if (ld->tikiFile.currentScript) {
+                Com_sprintf(cmds->location, sizeof(cmds->location), "%s, line: %d", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber());
+            }
 
-				if( cmds->num_args > 255 )
-				{
-					TIKI_Error( "TIKI_ParseFrameCommands: too many args in anim commands in %s.\n", ld->tikiFile.Filename() );
-					continue;
-				}
+            while (ld->tikiFile.TokenAvailable(false)) {
+                token = ld->tikiFile.GetToken(false);
 
-				pszArgs[ cmds->num_args ] = TIKI_CopyString( token );
-				cmds->num_args++;
-			}
+                if (cmds->num_args > 255) {
+                    TIKI_Error(
+                        "TIKI_ParseFrameCommands: too many args in anim commands in %s.\n", ld->tikiFile.Filename()
+                    );
+                    continue;
+                }
 
-			cmds->args = ( char ** )TIKI_AllocateLoadData( cmds->num_args * sizeof( char * ) );
-			for( i = 0; i < cmds->num_args; i++ )
-				cmds->args[ i ] = pszArgs[ i ];
-		}
-		else
-		{
-			TIKI_Error( "TIKI_ParseFrameCommands: too many anim commands in %s starting on line %i.\n", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-			while( ld->tikiFile.TokenAvailable( false ) )
-				ld->tikiFile.GetToken( false );
-		}
-	}
+                pszArgs[cmds->num_args] = TIKI_CopyString(token);
+                cmds->num_args++;
+            }
+
+            cmds->args = (char **)TIKI_AllocateLoadData(cmds->num_args * sizeof(char *));
+            for (i = 0; i < cmds->num_args; i++) {
+                cmds->args[i] = pszArgs[i];
+            }
+        } else {
+            TIKI_Error(
+                "TIKI_ParseFrameCommands: too many anim commands in %s starting on line %i.\n",
+                ld->tikiFile.Filename(),
+                ld->tikiFile.GetLineNumber()
+            );
+            while (ld->tikiFile.TokenAvailable(false)) {
+                ld->tikiFile.GetToken(false);
+            }
+        }
+    }
 }
 
 /*
@@ -183,32 +189,40 @@ void TIKI_ParseFrameCommands( dloaddef_t *ld, dloadframecmd_t **cmdlist, int max
 TIKI_ParseAnimationCommands
 ===============
 */
-void TIKI_ParseAnimationCommands( dloaddef_t *ld, dloadanim_t *anim )
+void TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim)
 {
-	const char *token;
+    const char *token;
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "client" ) )
-		{
-			TIKI_ParseFrameCommands( ld, anim->loadclientcmds, sizeof( anim->loadclientcmds ) / sizeof( anim->loadclientcmds[ 0 ] ), &anim->num_client_cmds );
-		}
-		else if( !stricmp( token, "server" ) )
-		{
-			TIKI_ParseFrameCommands( ld, anim->loadservercmds, sizeof( anim->loadservercmds ) / sizeof( anim->loadservercmds[ 0 ] ), &anim->num_server_cmds );
-		}
-		else if( !stricmp( token, "}" ) )
-		{
-			break;
-		}
-		else
-		{
-			TIKI_Error( "TIKI_ParseAnimationCommands: unknown anim command '%s' in '%s' on line %d, skipping line.\n", token, ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-			while( ld->tikiFile.TokenAvailable( false ) )
-				token = ld->tikiFile.GetToken( false );
-		}
-	}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "client")) {
+            TIKI_ParseFrameCommands(
+                ld,
+                anim->loadclientcmds,
+                sizeof(anim->loadclientcmds) / sizeof(anim->loadclientcmds[0]),
+                &anim->num_client_cmds
+            );
+        } else if (!Q_stricmp(token, "server")) {
+            TIKI_ParseFrameCommands(
+                ld,
+                anim->loadservercmds,
+                sizeof(anim->loadservercmds) / sizeof(anim->loadservercmds[0]),
+                &anim->num_server_cmds
+            );
+        } else if (!Q_stricmp(token, "}")) {
+            break;
+        } else {
+            TIKI_Error(
+                "TIKI_ParseAnimationCommands: unknown anim command '%s' in '%s' on line %d, skipping line.\n",
+                token,
+                ld->tikiFile.Filename(),
+                ld->tikiFile.GetLineNumber()
+            );
+            while (ld->tikiFile.TokenAvailable(false)) {
+                token = ld->tikiFile.GetToken(false);
+            }
+        }
+    }
 }
 
 /*
@@ -216,64 +230,47 @@ void TIKI_ParseAnimationCommands( dloaddef_t *ld, dloadanim_t *anim )
 TIKI_ParseAnimationFlags
 ===============
 */
-void TIKI_ParseAnimationFlags( dloaddef_t *ld, dloadanim_t *anim )
+void TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim)
 {
-	const char *token;
+    const char *token;
 
-	anim->weight = 1.0f;
-	anim->blendtime = 0.2f;
-	anim->flags = 0;
+    anim->weight    = 1.0f;
+    anim->blendtime = 0.2f;
+    anim->flags     = 0;
 
-	while( ld->tikiFile.TokenAvailable( false ) )
-	{
-		token = ld->tikiFile.GetToken( false );
+    while (ld->tikiFile.TokenAvailable(false)) {
+        token = ld->tikiFile.GetToken(false);
 
-		if( !stricmp( token, "weight" ) )
-		{
-			anim->weight = ld->tikiFile.GetFloat( false );
-			anim->flags |= TAF_RANDOM;
-		}
-		else if( !stricmp( token, "deltadriven" ) )
-		{
-			anim->flags |= TAF_DELTADRIVEN;
-		}
-		else if( !stricmp( token, "default_angles" ) )
-		{
-			anim->flags |= TAF_DEFAULT_ANGLES;
-		}
-		else if( !stricmp( token, "notimecheck" ) )
-		{
-			anim->flags |= TAF_NOTIMECHECK;
-		}
-		else if( !stricmp( token, "crossblend" ) )
-		{
-			anim->blendtime = ld->tikiFile.GetFloat( false );
-		}
-		else if( !stricmp( token, "dontrepeate" ) )
-		{
-			anim->flags |= TAF_NOREPEAT;
-		}
-		else if( !stricmp( token, "random" ) )
-		{
-			anim->flags |= TAF_RANDOM;
-		}
-		else if( !stricmp( token, "autosteps_run" ) )
-		{
-			anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING | TAF_AUTOSTEPS_EQUIPMENT;
-		}
-		else if( !stricmp( token, "autosteps_walk" ) )
-		{
-			anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_EQUIPMENT;
-		}
-		else if( !stricmp( token, "autosteps_dog" ) )
-		{
-			anim->flags |= TAF_AUTOSTEPS;
-		}
-		else
-		{
-			TIKI_Error( "Unknown Animation flag %s for anim '%s' in %s\n", token, anim->alias, TikiScript::currentScript->Filename() );
-		}
-	}
+        if (!Q_stricmp(token, "weight")) {
+            anim->weight = ld->tikiFile.GetFloat(false);
+            anim->flags |= TAF_RANDOM;
+        } else if (!Q_stricmp(token, "deltadriven")) {
+            anim->flags |= TAF_DELTADRIVEN;
+        } else if (!Q_stricmp(token, "default_angles")) {
+            anim->flags |= TAF_DEFAULT_ANGLES;
+        } else if (!Q_stricmp(token, "notimecheck")) {
+            anim->flags |= TAF_NOTIMECHECK;
+        } else if (!Q_stricmp(token, "crossblend")) {
+            anim->blendtime = ld->tikiFile.GetFloat(false);
+        } else if (!Q_stricmp(token, "dontrepeate")) {
+            anim->flags |= TAF_NOREPEAT;
+        } else if (!Q_stricmp(token, "random")) {
+            anim->flags |= TAF_RANDOM;
+        } else if (!Q_stricmp(token, "autosteps_run")) {
+            anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_RUNNING | TAF_AUTOSTEPS_EQUIPMENT;
+        } else if (!Q_stricmp(token, "autosteps_walk")) {
+            anim->flags |= TAF_AUTOSTEPS | TAF_AUTOSTEPS_EQUIPMENT;
+        } else if (!Q_stricmp(token, "autosteps_dog")) {
+            anim->flags |= TAF_AUTOSTEPS;
+        } else {
+            TIKI_Error(
+                "Unknown Animation flag %s for anim '%s' in %s\n",
+                token,
+                anim->alias,
+                TikiScript::currentScript->Filename()
+            );
+        }
+    }
 }
 
 /*
@@ -281,44 +278,38 @@ void TIKI_ParseAnimationFlags( dloaddef_t *ld, dloadanim_t *anim )
 TIKI_ParseAnimationsFail
 ===============
 */
-void TIKI_ParseAnimationsFail( dloaddef_t *ld )
+void TIKI_ParseAnimationsFail(dloaddef_t *ld)
 {
-	int nestcount = 0;
-	const char *token;
+    int         nestcount = 0;
+    const char *token;
 
-	while( ld->tikiFile.TokenAvailable( false ) )
-	{
-		ld->tikiFile.GetToken( false );
-	}
+    while (ld->tikiFile.TokenAvailable(false)) {
+        ld->tikiFile.GetToken(false);
+    }
 
-	if( !ld->tikiFile.TokenAvailable( true ) )
-	{
-		return;
-	}
+    if (!ld->tikiFile.TokenAvailable(true)) {
+        return;
+    }
 
-	token = ld->tikiFile.GetToken( true );
-	if( stricmp( token, "{" ) )
-	{
-		ld->tikiFile.UnGetToken();
-		return;
-	}
+    token = ld->tikiFile.GetToken(true);
+    if (Q_stricmp(token, "{")) {
+        ld->tikiFile.UnGetToken();
+        return;
+    }
 
-	ld->tikiFile.UnGetToken();
+    ld->tikiFile.UnGetToken();
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "{" ) )
-		{
-			nestcount++;
-		}
-		else if( !stricmp( token, "}" ) )
-		{
-			nestcount--;
-			if( !nestcount )
-				break;
-		}
-	}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "{")) {
+            nestcount++;
+        } else if (!Q_stricmp(token, "}")) {
+            nestcount--;
+            if (!nestcount) {
+                break;
+            }
+        }
+    }
 }
 
 /*
@@ -326,73 +317,76 @@ void TIKI_ParseAnimationsFail( dloaddef_t *ld )
 TIKI_ParseIncludes
 ===============
 */
-qboolean TIKI_ParseIncludes( dloaddef_t *ld )
+qboolean TIKI_ParseIncludes(dloaddef_t *ld)
 {
-	const char* token;
-	qboolean b_incl = false;
-	const char* mapname;
-	const char* servertype;
-	int depth = 0;
+    const char *token;
+    qboolean    b_incl = false;
+    const char *mapname;
+    const char *servertype;
+    int         depth = 0;
 
-	static cvar_t* pServerType = Cvar_Get("g_servertype", "2", 0);
-	static cvar_t* pGameType = Cvar_Get("cg_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH);
+    static cvar_t *pServerType = Cvar_Get("g_servertype", "2", 0);
+    static cvar_t *pGameType   = Cvar_Get("cg_gametype", "0", CVAR_SERVERINFO | CVAR_LATCH);
 
-	if (pGameType->integer != GT_SINGLE_PLAYER && pServerType->integer == 1) {
-		servertype = "spearheadserver";
-	} else {
-		servertype = "breakthroughserver";
-	}
+    if (pGameType->integer != GT_SINGLE_PLAYER && pServerType->integer == 1) {
+        servertype = "spearheadserver";
+    } else {
+        servertype = "breakthroughserver";
+    }
 
-	token = ld->tikiFile.GetToken(true);
-	if (sv_mapname)
-	{
-		mapname = sv_mapname->string;
-	}
-	else
-	{
-		mapname = "utils";
-	}
+    token = ld->tikiFile.GetToken(true);
+    if (sv_mapname) {
+        mapname = sv_mapname->string;
+    } else {
+        mapname = "utils";
+    }
 
-	while (1)
-	{
-		if (!strncmp(token, mapname, strlen(token))
-			|| !strncmp(token, servertype, strlen(token)))
-		{
-			b_incl = true;
-		}
-		else if ((!stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)))
-		{
-			break;
-		}
+    while (1) {
+        if (!Q_stricmpn(token, mapname, strlen(token)) || !Q_stricmpn(token, servertype, strlen(token))) {
+            b_incl = true;
+        } else if (!Q_stricmp(token, "{") || !ld->tikiFile.TokenAvailable(true)) {
+            break;
+        }
 
-		token = ld->tikiFile.GetToken(true);
-	}
+        token = ld->tikiFile.GetToken(true);
+    }
 
-	if (b_incl)
-	{
-		return true;
-	}
+    if (b_incl) {
+        return true;
+    }
 
-	while (ld->tikiFile.TokenAvailable(true))
-	{
-		token = ld->tikiFile.GetAndIgnoreLine(false);
-		if (strstr(token, "{"))
-		{
-			depth++;
-		}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetAndIgnoreLine(false);
+        if (strstr(token, "{")) {
+            depth++;
+        }
 
-		if (strstr(token, "}"))
-		{
-			if (!depth)
-			{
-				break;
-			}
+        if (strstr(token, "}")) {
+            if (!depth) {
+                break;
+            }
 
-			depth--;
-		}
-	}
+            depth--;
+        }
+    }
 
-	return false;
+    return false;
+}
+
+dloadanim_t *TIKI_AllocAnim(dloaddef_t *ld)
+{
+    dloadanim_t *panim;
+
+    panim                         = static_cast<dloadanim_t *>(TIKI_AllocateLoadData(sizeof(dloadanim_t)));
+    panim->weight                 = 1.f;
+    panim->location[0]            = 0;
+    panim->num_client_cmds        = 0;
+    panim->num_server_cmds        = 0;
+    panim->flags                  = 0;
+    panim->blendtime              = 0.2f;
+    ld->loadanims[ld->numanims++] = panim;
+
+    return panim;
 }
 
 /*
@@ -400,130 +394,115 @@ qboolean TIKI_ParseIncludes( dloaddef_t *ld )
 TIKI_ParseAnimations
 ===============
 */
-void TIKI_ParseAnimations( dloaddef_t *ld )
+void TIKI_ParseAnimations(dloaddef_t *ld)
 {
-	const char *token;
-	dloadanim_t *anim;
-	qboolean b_mapspec = false;
-	const char *mapname;
-	size_t depth = 0;
+    const char  *token;
+    dloadanim_t *anim;
+    qboolean     b_mapspec = false;
+    const char  *mapname;
+    size_t       depth = 0;
 
-	ld->tikiFile.GetToken( true );
+    ld->tikiFile.GetToken(true);
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "}" ) )
-		{
-			return;
-		}
-		else if( !stricmp( token, "$mapspec" ) )
-		{
-			token = ld->tikiFile.GetToken( true );
-			if( sv_mapname )
-			{
-				mapname = sv_mapname->string;
-			}
-			else
-			{
-				mapname = "utils";
-			}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "}")) {
+            if (!b_mapspec) {
+                // Return when there is no mapspec
+                return;
+            }
+            b_mapspec = false;
+        } else if (!Q_stricmp(token, "$mapspec")) {
+            token = ld->tikiFile.GetToken(true);
+            if (sv_mapname) {
+                mapname = sv_mapname->string;
+            } else {
+                mapname = "utils";
+            }
 
-			while( ld->tikiFile.TokenAvailable( true ) )
-			{
-				if( !strncmp( token, mapname, strlen( token ) ) )
-				{
-					b_mapspec = true;
-				}
-				else if( !stricmp(token, "{" ) )
-				{
-					break;
-				}
+            while (ld->tikiFile.TokenAvailable(true)) {
+                if (!Q_stricmpn(token, mapname, strlen(token))) {
+                    b_mapspec = true;
+                } else if (!Q_stricmp(token, "{")) {
+                    break;
+                }
 
-				token = ld->tikiFile.GetToken( true );
-			}
+                token = ld->tikiFile.GetToken(true);
+            }
 
-			if( !b_mapspec )
-			{
-				while( ld->tikiFile.TokenAvailable( true ) )
-				{
-					token = ld->tikiFile.GetToken( true );
-					if( strstr( token, "{" ) )
-					{
-						depth++;
-					}
+            if (!b_mapspec) {
+                while (ld->tikiFile.TokenAvailable(true)) {
+                    token = ld->tikiFile.GetToken(true);
+                    if (strstr(token, "{")) {
+                        depth++;
+                    }
 
-					if( strstr( token, "}" ) )
-					{
-						if( !depth )
-						{
-							continue;
-						}
+                    if (strstr(token, "}")) {
+                        if (!depth) {
+                            break;
+                        }
 
-						depth--;
-					}
-				}
+                        depth--;
+                    }
+                }
+            }
+        } else {
+            if (ld->numanims >= MAX_TIKI_LOAD_ANIMS) {
+                TIKI_Error("TIKI_ParseAnimations: Too many animations in '%s'.\n", ld->path);
+                continue;
+            }
 
-				return;
-			}
-		}
-		else
-		{
-			if( ld->numanims > 4094 )
-			{
-				TIKI_Error( "TIKI_ParseAnimations: Too many animations in '%s'.\n", ld->path );
-				continue;
-			}
+            anim                        = (dloadanim_t *)TIKI_AllocateLoadData(sizeof(dloadanim_t));
+            ld->loadanims[ld->numanims] = anim;
+            if (!anim) {
+                TIKI_Error(
+                    "TIKI_ParseAnimations: Could not allocate storage for anim alias name %s in %s.\n",
+                    token,
+                    ld->tikiFile.Filename()
+                );
+                TIKI_ParseAnimationsFail(ld);
+                continue;
+            }
 
-			anim = ( dloadanim_t * )TIKI_AllocateLoadData( sizeof( dloadanim_t ) );
-			ld->loadanims[ ld->numanims ] = anim;
-			if( !anim )
-			{
-				TIKI_Error( "TIKI_ParseAnimations: Could not allocate storage for anim alias name %s in %s.\n", token, ld->tikiFile.Filename() );
-				TIKI_ParseAnimationsFail( ld );
-				continue;
-			}
+            if (strlen(token) < 48) {
+                anim->alias = (char *)TIKI_CopyString(token);
 
-			depth = strlen( token );
-			if( depth < 48 )
-			{
-				anim->alias = ( char * )TIKI_CopyString( token );
+                token = ld->tikiFile.GetToken(false);
+                Q_strncpyz(anim->name, TikiScript::currentScript->path, sizeof(anim->name));
+                Q_strcat(anim->name, sizeof(anim->name), token);
 
-				token = ld->tikiFile.GetToken( false );
-				strcpy( anim->name, TikiScript::currentScript->path );
-				strcat( anim->name, token );
+                anim->location[0] = 0;
+                if (ld->tikiFile.currentScript) {
+                    Com_sprintf(
+                        anim->location,
+                        sizeof(anim->location),
+                        "%s, line: %d",
+                        ld->tikiFile.currentScript->Filename(),
+                        ld->tikiFile.currentScript->GetLineNumber()
+                    );
+                }
 
-				anim->location[ 0 ] = 0;
-				if( ld->tikiFile.currentScript )
-				{
-					sprintf( anim->location, "%s, line: %d", ld->tikiFile.currentScript->Filename(), ld->tikiFile.currentScript->GetLineNumber() );
-				}
+                anim->num_client_cmds = 0;
+                anim->num_server_cmds = 0;
+                TIKI_ParseAnimationFlags(ld, anim);
+                ld->numanims++;
 
-				anim->num_client_cmds = 0;
-				anim->num_server_cmds = 0;
-				TIKI_ParseAnimationFlags( ld, anim );
-				ld->numanims++;
-
-				if( ld->tikiFile.TokenAvailable( true ) )
-				{
-					token = ld->tikiFile.GetToken( true );
-					if( !stricmp( token, "{" ) )
-					{
-						TIKI_ParseAnimationCommands( ld, anim );
-					}
-					else
-					{
-						ld->tikiFile.UnGetToken();
-					}
-				}
-			}
-			else
-			{
-				TIKI_Error( "TIKI_ParseAnimations: Anim alias name %s is too long in %s.\n", token, ld->tikiFile.Filename() );
-				TIKI_ParseAnimationsFail( ld );
-			}
-		}
-	}
+                if (ld->tikiFile.TokenAvailable(true)) {
+                    token = ld->tikiFile.GetToken(true);
+                    if (!Q_stricmp(token, "{")) {
+                        TIKI_ParseAnimationCommands(ld, anim);
+                    } else {
+                        ld->tikiFile.UnGetToken();
+                    }
+                }
+            } else {
+                TIKI_Error(
+                    "TIKI_ParseAnimations: Anim alias name %s is too long in %s.\n", token, ld->tikiFile.Filename()
+                );
+                TIKI_ParseAnimationsFail(ld);
+            }
+        }
+    }
 }
 
 /*
@@ -531,48 +510,31 @@ void TIKI_ParseAnimations( dloaddef_t *ld )
 TIKI_ParseSurfaceFlag
 ===============
 */
-int TIKI_ParseSurfaceFlag( const char *token )
+int TIKI_ParseSurfaceFlag(const char *token)
 {
-	int flags = 0;
+    int flags = 0;
 
-	if( !stricmp( token, "skin1" ) )
-	{
-		flags = TIKI_SURF_SKIN1;
-	}
-	else if( !stricmp( token, "skin2" ) )
-	{
-		flags = TIKI_SURF_SKIN2;
-	}
-	else if( !stricmp( token, "skin3" ) )
-	{
-		flags = TIKI_SURF_SKIN3;
-	}
-	else if( !stricmp( token, "nodraw" ) )
-	{
-		flags = TIKI_SURF_NODRAW;
-	}
-	else if( !stricmp( token, "nodamage" ) )
-	{
-		flags = TIKI_SURF_NODAMAGE;
-	}
-	else if( !stricmp( token, "crossfade" ) )
-	{
-		flags = TIKI_SURF_CROSSFADE;
-	}
-	else if( !stricmp( token, "nomipmaps" ) )
-	{
-		flags = TIKI_SURF_NOMIPMAPS;
-	}
-	else if( !stricmp( token, "nopicmip" ) )
-	{
-		flags = TIKI_SURF_NOPICMIP;
-	}
-	else
-	{
-		TIKI_Error( "Unknown surface flag %s\n", token );
-	}
+    if (!Q_stricmp(token, "skin1")) {
+        flags = TIKI_SURF_SKIN1;
+    } else if (!Q_stricmp(token, "skin2")) {
+        flags = TIKI_SURF_SKIN2;
+    } else if (!Q_stricmp(token, "skin3")) {
+        flags = TIKI_SURF_SKIN3;
+    } else if (!Q_stricmp(token, "nodraw")) {
+        flags = TIKI_SURF_NODRAW;
+    } else if (!Q_stricmp(token, "nodamage")) {
+        flags = TIKI_SURF_NODAMAGE;
+    } else if (!Q_stricmp(token, "crossfade")) {
+        flags = TIKI_SURF_CROSSFADE;
+    } else if (!Q_stricmp(token, "nomipmaps")) {
+        flags = TIKI_SURF_NOMIPMAPS;
+    } else if (!Q_stricmp(token, "nopicmip")) {
+        flags = TIKI_SURF_NOPICMIP;
+    } else {
+        TIKI_Error("Unknown surface flag %s\n", token);
+    }
 
-	return flags;
+    return flags;
 }
 
 /*
@@ -580,10 +542,10 @@ int TIKI_ParseSurfaceFlag( const char *token )
 WriteScale
 ===============
 */
-static void WriteScale( dloaddef_t *ld, float scale )
+static void WriteScale(dloaddef_t *ld, float scale)
 {
-	MSG_WriteByte( ld->modelBuf, 0 );
-	MSG_WriteFloat( ld->modelBuf, scale );
+    MSG_WriteByte(ld->modelBuf, SETUP_LOAD_SCALE);
+    MSG_WriteFloat(ld->modelBuf, scale);
 }
 
 /*
@@ -591,10 +553,10 @@ static void WriteScale( dloaddef_t *ld, float scale )
 WriteLoadScale
 ===============
 */
-static void WriteLoadScale( dloaddef_t *ld, float lod_scale )
+static void WriteLoadScale(dloaddef_t *ld, float lod_scale)
 {
-	MSG_WriteByte( ld->modelBuf, 1 );
-	MSG_WriteFloat( ld->modelBuf, lod_scale );
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_SCALE);
+    MSG_WriteFloat(ld->modelBuf, lod_scale);
 }
 
 /*
@@ -602,10 +564,10 @@ static void WriteLoadScale( dloaddef_t *ld, float lod_scale )
 WriteLodBias
 ===============
 */
-static void WriteLodBias( dloaddef_t *ld, float lod_bias )
+static void WriteLodBias(dloaddef_t *ld, float lod_bias)
 {
-	MSG_WriteByte( ld->modelBuf, 2 );
-	MSG_WriteFloat( ld->modelBuf, lod_bias );
+    MSG_WriteByte(ld->modelBuf, SETUP_LOD_BIAS);
+    MSG_WriteFloat(ld->modelBuf, lod_bias);
 }
 
 /*
@@ -613,10 +575,13 @@ static void WriteLodBias( dloaddef_t *ld, float lod_bias )
 WriteSkelmodel
 ===============
 */
-static void WriteSkelmodel( dloaddef_t *ld, const char *name )
+void WriteSkelmodel(dloaddef_t *ld, const char *name)
 {
-	MSG_WriteByte( ld->modelBuf, 3 );
-	MSG_WriteString( ld->modelBuf, name );
+    MSG_WriteByte(ld->modelBuf, SETUP_SKELMODEL);
+    MSG_WriteString(ld->modelBuf, name);
+
+    Q_strncpyz(ld->idleSkel, name, sizeof(ld->idleSkel));
+    ld->numskels++;
 }
 
 /*
@@ -624,12 +589,12 @@ static void WriteSkelmodel( dloaddef_t *ld, const char *name )
 WriteOrigin
 ===============
 */
-static void WriteOrigin( dloaddef_t *ld, float origin_x, float origin_y, float origin_z )
+static void WriteOrigin(dloaddef_t *ld, float origin_x, float origin_y, float origin_z)
 {
-	MSG_WriteByte( ld->modelBuf, 4 );
-	MSG_WriteFloat( ld->modelBuf, origin_x );
-	MSG_WriteFloat( ld->modelBuf, origin_y );
-	MSG_WriteFloat( ld->modelBuf, origin_z );
+    MSG_WriteByte(ld->modelBuf, SETUP_LOAD_ORIGIN);
+    MSG_WriteFloat(ld->modelBuf, origin_x);
+    MSG_WriteFloat(ld->modelBuf, origin_y);
+    MSG_WriteFloat(ld->modelBuf, origin_z);
 }
 
 /*
@@ -637,12 +602,12 @@ static void WriteOrigin( dloaddef_t *ld, float origin_x, float origin_y, float o
 WriteLightOffset
 ===============
 */
-static void WriteLightOffset( dloaddef_t *ld, float light_offset_x, float light_offset_y, float light_offset_z )
+static void WriteLightOffset(dloaddef_t *ld, float light_offset_x, float light_offset_y, float light_offset_z)
 {
-	MSG_WriteByte( ld->modelBuf, 5 );
-	MSG_WriteFloat( ld->modelBuf, light_offset_x );
-	MSG_WriteFloat( ld->modelBuf, light_offset_y );
-	MSG_WriteFloat( ld->modelBuf, light_offset_z );
+    MSG_WriteByte(ld->modelBuf, SETUP_LIGHT_OFFSET);
+    MSG_WriteFloat(ld->modelBuf, light_offset_x);
+    MSG_WriteFloat(ld->modelBuf, light_offset_y);
+    MSG_WriteFloat(ld->modelBuf, light_offset_z);
 }
 
 /*
@@ -650,10 +615,10 @@ static void WriteLightOffset( dloaddef_t *ld, float light_offset_x, float light_
 WriteRadius
 ===============
 */
-static void WriteRadius( dloaddef_t *ld, float radius )
+static void WriteRadius(dloaddef_t *ld, float radius)
 {
-	MSG_WriteByte( ld->modelBuf, 6 );
-	MSG_WriteFloat( ld->modelBuf, radius );
+    MSG_WriteByte(ld->modelBuf, SETUP_RADIUS);
+    MSG_WriteFloat(ld->modelBuf, radius);
 }
 
 /*
@@ -661,10 +626,10 @@ static void WriteRadius( dloaddef_t *ld, float radius )
 WriteSurface
 ===============
 */
-static void WriteSurface( dloaddef_t *ld, const char *surface )
+static void WriteSurface(dloaddef_t *ld, const char *surface)
 {
-	MSG_WriteByte( ld->modelBuf, 7 );
-	MSG_WriteString( ld->modelBuf, surface );
+    MSG_WriteByte(ld->modelBuf, SETUP_SURFACE);
+    MSG_WriteString(ld->modelBuf, surface);
 }
 
 /*
@@ -672,10 +637,10 @@ static void WriteSurface( dloaddef_t *ld, const char *surface )
 WriteFlags
 ===============
 */
-static void WriteFlags( dloaddef_t *ld, int flags )
+static void WriteFlags(dloaddef_t *ld, int flags)
 {
-	MSG_WriteByte( ld->modelBuf, 8 );
-	MSG_WriteLong( ld->modelBuf, flags );
+    MSG_WriteByte(ld->modelBuf, SETUP_FLAGS);
+    MSG_WriteLong(ld->modelBuf, flags);
 }
 
 /*
@@ -683,10 +648,10 @@ static void WriteFlags( dloaddef_t *ld, int flags )
 WriteDamage
 ===============
 */
-static void WriteDamage( dloaddef_t *ld, float damage )
+static void WriteDamage(dloaddef_t *ld, float damage)
 {
-	MSG_WriteByte( ld->modelBuf, 9 );
-	MSG_WriteFloat( ld->modelBuf, damage );
+    MSG_WriteByte(ld->modelBuf, SETUP_DAMAGE);
+    MSG_WriteFloat(ld->modelBuf, damage);
 }
 
 /*
@@ -694,10 +659,10 @@ static void WriteDamage( dloaddef_t *ld, float damage )
 WriteShader
 ===============
 */
-static void WriteShader( dloaddef_t *ld, const char *shader )
+static void WriteShader(dloaddef_t *ld, const char *shader)
 {
-	MSG_WriteByte( ld->modelBuf, 10 );
-	MSG_WriteString( ld->modelBuf, shader );
+    MSG_WriteByte(ld->modelBuf, SETUP_SHADER);
+    MSG_WriteString(ld->modelBuf, shader);
 }
 
 /*
@@ -705,9 +670,9 @@ static void WriteShader( dloaddef_t *ld, const char *shader )
 WriteBeginCase
 ===============
 */
-static void WriteBeginCase( dloaddef_t *ld )
+static void WriteBeginCase(dloaddef_t *ld)
 {
-	MSG_WriteByte( ld->modelBuf, 13 );
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE);
 }
 
 /*
@@ -715,10 +680,10 @@ static void WriteBeginCase( dloaddef_t *ld )
 WriteCaseKey
 ===============
 */
-static void WriteCaseKey( dloaddef_t *ld, const char *key )
+static void WriteCaseKey(dloaddef_t *ld, const char *key)
 {
-	MSG_WriteByte( ld->modelBuf, 11 );
-	MSG_WriteString( ld->modelBuf, key );
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_KEY);
+    MSG_WriteString(ld->modelBuf, key);
 }
 
 /*
@@ -726,10 +691,10 @@ static void WriteCaseKey( dloaddef_t *ld, const char *key )
 WriteCaseValue
 ===============
 */
-static void WriteCaseValue( dloaddef_t *ld, const char *value )
+static void WriteCaseValue(dloaddef_t *ld, const char *value)
 {
-	MSG_WriteByte( ld->modelBuf, 12 );
-	MSG_WriteString( ld->modelBuf, value );
+    MSG_WriteByte(ld->modelBuf, SETUP_CASE_VALUE);
+    MSG_WriteString(ld->modelBuf, value);
 }
 
 /*
@@ -737,9 +702,9 @@ static void WriteCaseValue( dloaddef_t *ld, const char *value )
 WriteBeginCaseBody
 ===============
 */
-static void WriteBeginCaseBody( dloaddef_t *ld )
+static void WriteBeginCaseBody(dloaddef_t *ld)
 {
-	MSG_WriteByte( ld->modelBuf, 14 );
+    MSG_WriteByte(ld->modelBuf, SETUP_BEGIN_CASE_BODY);
 }
 
 /*
@@ -747,9 +712,9 @@ static void WriteBeginCaseBody( dloaddef_t *ld )
 WriteEndCase
 ===============
 */
-static void WriteEndCase( dloaddef_t *ld )
+static void WriteEndCase(dloaddef_t *ld)
 {
-	MSG_WriteByte( ld->modelBuf, 15 );
+    MSG_WriteByte(ld->modelBuf, SETUP_END_CASE);
 }
 
 /*
@@ -757,9 +722,9 @@ static void WriteEndCase( dloaddef_t *ld )
 TIKI_InitSetup
 ===============
 */
-void TIKI_InitSetup( dloaddef_t *ld )
+void TIKI_InitSetup(dloaddef_t *ld)
 {
-	MSG_Init( ld->modelBuf, ld->modelData, 8192 );
+    MSG_Init(ld->modelBuf, ld->modelData, 8192);
 }
 
 /*
@@ -767,41 +732,46 @@ void TIKI_InitSetup( dloaddef_t *ld )
 TIKI_LoadSetupCaseHeader
 ===============
 */
-qboolean TIKI_LoadSetupCaseHeader( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, msg_t *msg, qboolean skip, con_map<str, str> *keyValues )
+qboolean TIKI_LoadSetupCaseHeader(
+    dtiki_t           *tiki,
+    const char        *filename,
+    dloadsurface_t    *loadsurfaces,
+    int               *numSurfacesSetUp,
+    msg_t             *msg,
+    qboolean           skip,
+    con_map<str, str> *keyValues
+)
 {
-	int c = 0;
-	str key;
-	str *val;
-	const char *value;
-	qboolean match = false;
+    int         c = 0;
+    str         key;
+    str        *val;
+    const char *value;
+    qboolean    match = false;
 
-	while( c != 14 )
-	{
-		c = MSG_ReadByte( msg );
-		switch( c )
-		{
-		case 11:
-			value = MSG_ReadString( msg );
-			key = value;
-			break;
-		case 12:
-			value = MSG_ReadString( msg );
-			if( skip || match || !keyValues )
-				break;
+    while (c != SETUP_BEGIN_CASE_BODY) {
+        c = MSG_ReadByte(msg);
+        switch (c) {
+        case SETUP_CASE_KEY:
+            value = MSG_ReadString(msg);
+            key   = value;
+            break;
+        case SETUP_CASE_VALUE:
+            value = MSG_ReadString(msg);
+            if (skip || match || !keyValues) {
+                break;
+            }
 
-			val = keyValues->find( key );
-			if( val && !stricmp( key.c_str(), val->c_str() ) )
-			{
-				match = true;
-			}
-			break;
-		case 14:
-		default:
-			break;
-		}
-	}
+            val = keyValues->find(key);
+            if (val && !Q_stricmp(val->c_str(), value)) {
+                match = true;
+            }
+            break;
+        default:
+            break;
+        }
+    }
 
-	return TIKI_LoadSetupCase( tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip || !match, keyValues );
+    return TIKI_LoadSetupCase(tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip || !match, keyValues);
 }
 
 /*
@@ -809,142 +779,166 @@ qboolean TIKI_LoadSetupCaseHeader( dtiki_t *tiki, const char *filename, dloadsur
 TIKI_LoadSetupCase
 ===============
 */
-qboolean TIKI_LoadSetupCase( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, msg_t *msg, qboolean skip, con_map<str, str> *keyValues )
+qboolean TIKI_LoadSetupCase(
+    dtiki_t           *tiki,
+    const char        *filename,
+    dloadsurface_t    *loadsurfaces,
+    int               *numSurfacesSetUp,
+    msg_t             *msg,
+    qboolean           skip,
+    con_map<str, str> *keyValues
+)
 {
-	int c;
-	const char *name;
-	int currentSurface = -1;
-	int mesh;
-	skelHeaderGame_t *skelmodel;
-	float load_scale;
-	float lod_scale;
-	float lod_bias;
-	float load_origin[ 3 ];
-	float light_offset[ 3 ];
-	float radius;
-	int flags;
-	float damage_multiplier;
+    int               c;
+    const char       *name;
+    int               currentSurface = -1;
+    int               mesh;
+    skelHeaderGame_t *skelmodel;
+    float             load_scale;
+    float             lod_scale;
+    float             lod_bias;
+    float             load_origin[3];
+    float             light_offset[3];
+    float             radius;
+    int               flags;
+    float             damage_multiplier;
 
-	while( 1 )
-	{
-		c = MSG_ReadByte( msg ) + 1;
-		switch( c )
-		{
-		default:
-			break;
-		case 1:
-			load_scale = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			tiki->load_scale = load_scale;
-			break;
-		case 2:
-			lod_scale = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			tiki->lod_scale = lod_scale;
-			break;
-		case 3:
-			lod_bias = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			tiki->lod_bias = lod_bias;
-			break;
-		case 4:
-			name = MSG_ReadString( msg );
-			if( skip )
-				break;
+    while (1) {
+        c = MSG_ReadByte(msg);
+        switch (c) {
+        default:
+            break;
+        case SETUP_LOAD_SCALE:
+            load_scale = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            tiki->load_scale = load_scale;
+            break;
+        case SETUP_LOD_SCALE:
+            lod_scale = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            tiki->lod_scale = lod_scale;
+            break;
+        case SETUP_LOD_BIAS:
+            lod_bias = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            tiki->lod_bias = lod_bias;
+            break;
+        case SETUP_SKELMODEL:
+            name = MSG_ReadString(msg);
+            if (skip) {
+                break;
+            }
 
-			if( tiki->numMeshes >= 12 )
-			{
-				TIKI_Error( "^~^~^ TIKI_LoadSetup: too many skelmodels in %s.\n", filename );
-				return false;
-			}
+            if (tiki->numMeshes >= MAX_SKELMODELS) {
+                TIKI_Error("^~^~^ TIKI_LoadSetup: too many skelmodels in %s.\n", filename);
+                return false;
+            }
 
-			mesh = TIKI_RegisterSkel( name, tiki );
-			if( mesh < 0 )
-				return false;
+            mesh = TIKI_RegisterSkel(name, tiki);
+            if (mesh < 0) {
+                return false;
+            }
 
-			tiki->mesh[ tiki->numMeshes ] = mesh;
-			skelmodel = TIKI_GetSkel( mesh );
-			tiki->num_surfaces += skelmodel->numSurfaces;
-			tiki->numMeshes++;
-			break;
-		case 5:
-			load_origin[ 0 ] = MSG_ReadFloat( msg );
-			load_origin[ 1 ] = MSG_ReadFloat( msg );
-			load_origin[ 2 ] = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			VectorCopy( load_origin, tiki->load_origin );
-			break;
-		case 6:
-			light_offset[ 0 ] = MSG_ReadFloat( msg );
-			light_offset[ 1 ] = MSG_ReadFloat( msg );
-			light_offset[ 2 ] = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			VectorCopy( light_offset, tiki->load_origin );
-			break;
-		case 7:
-			radius = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			tiki->radius = radius;
-			break;
-		case 8:
-			name = MSG_ReadString( msg );
-			if( skip )
-				break;
+            tiki->mesh[tiki->numMeshes] = mesh;
+            skelmodel                   = TIKI_GetSkel(mesh);
+            tiki->num_surfaces += skelmodel->numSurfaces;
+            tiki->numMeshes++;
+            break;
+        case SETUP_LOAD_ORIGIN:
+            load_origin[0] = MSG_ReadFloat(msg);
+            load_origin[1] = MSG_ReadFloat(msg);
+            load_origin[2] = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            VectorCopy(load_origin, tiki->load_origin);
+            break;
+        case SETUP_LIGHT_OFFSET:
+            light_offset[0] = MSG_ReadFloat(msg);
+            light_offset[1] = MSG_ReadFloat(msg);
+            light_offset[2] = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            VectorCopy(light_offset, tiki->load_origin);
+            break;
+        case SETUP_RADIUS:
+            radius = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            tiki->radius = radius;
+            break;
+        case SETUP_SURFACE:
+            name = MSG_ReadString(msg);
+            if (skip) {
+                break;
+            }
 
-			for( currentSurface = 0; currentSurface < *numSurfacesSetUp; currentSurface++ )
-			{
-				if( !stricmp( loadsurfaces[ currentSurface ].name, name ) )
-					break;
-			}
+            for (currentSurface = 0; currentSurface < *numSurfacesSetUp; currentSurface++) {
+                if (!Q_stricmp(loadsurfaces[currentSurface].name, name)) {
+                    break;
+                }
+            }
 
-			if( currentSurface == *numSurfacesSetUp )
-			{
-				loadsurfaces[ currentSurface ].flags = 0;
-				( *numSurfacesSetUp )++;
-			}
-			strcpy( loadsurfaces[ currentSurface ].name, name );
-			break;
-		case 9:
-			flags = MSG_ReadLong( msg );
-			if( skip )
-				break;
-			loadsurfaces[ currentSurface ].flags |= flags;
-			break;
-		case 10:
-			damage_multiplier = MSG_ReadFloat( msg );
-			if( skip )
-				break;
-			loadsurfaces[ currentSurface ].damage_multiplier = damage_multiplier;
-			break;
-		case 11:
-			name = MSG_ReadString( msg );
-			if( skip )
-				break;
+            if (currentSurface == *numSurfacesSetUp) {
+                loadsurfaces[currentSurface].flags = 0;
+                (*numSurfacesSetUp)++;
+            }
+            Q_strncpyz(loadsurfaces[currentSurface].name, name, sizeof(loadsurfaces[currentSurface].name));
+            break;
+        case SETUP_FLAGS:
+            flags = MSG_ReadLong(msg);
+            if (skip) {
+                break;
+            }
+            loadsurfaces[currentSurface].flags |= flags;
+            break;
+        case SETUP_DAMAGE:
+            damage_multiplier = MSG_ReadFloat(msg);
+            if (skip) {
+                break;
+            }
+            loadsurfaces[currentSurface].damage_multiplier = damage_multiplier;
+            break;
+        case SETUP_SHADER:
+            name = MSG_ReadString(msg);
+            if (skip) {
+                break;
+            }
 
-			if( loadsurfaces[ currentSurface ].numskins > 3 )
-			{
-				TIKI_Error( "TIKI_ParseSetup: Too many skins defined for surface %s in %s.\n", loadsurfaces[ currentSurface ].name, filename );
-				break;
-			}
+            if (loadsurfaces[currentSurface].numskins > 3) {
+                TIKI_Error(
+                    "TIKI_ParseSetup: Too many skins defined for surface %s in %s.\n",
+                    loadsurfaces[currentSurface].name,
+                    filename
+                );
+                break;
+            }
 
-			strncpy( loadsurfaces[ currentSurface ].shader[ loadsurfaces[ currentSurface ].numskins ], name, sizeof( loadsurfaces[ currentSurface ].shader[ loadsurfaces[ currentSurface ].numskins ] ) );
-			loadsurfaces[ currentSurface ].numskins++;
-			break;
-		case 14:
-			if( !TIKI_LoadSetupCaseHeader( tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip, keyValues ) )
-				return false;
-			break;
-		case 0:
-		case 16:
-			return true;
-		}
-	}
+            strncpy(
+                loadsurfaces[currentSurface].shader[loadsurfaces[currentSurface].numskins],
+                name,
+                sizeof(loadsurfaces[currentSurface].shader[loadsurfaces[currentSurface].numskins])
+            );
+            loadsurfaces[currentSurface].numskins++;
+            break;
+        case SETUP_BEGIN_CASE:
+            if (!TIKI_LoadSetupCaseHeader(tiki, filename, loadsurfaces, numSurfacesSetUp, msg, skip, keyValues)) {
+                return false;
+            }
+            break;
+        case SETUP_END_MESSAGE:
+        case SETUP_END_CASE:
+            return true;
+        }
+    }
 }
 
 /*
@@ -952,26 +946,34 @@ qboolean TIKI_LoadSetupCase( dtiki_t *tiki, const char *filename, dloadsurface_t
 TIKI_LoadSetup
 ===============
 */
-qboolean TIKI_LoadSetup( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, byte *modelData, size_t modelDataSize, con_map<str, str> *keyValues )
+qboolean TIKI_LoadSetup(
+    dtiki_t           *tiki,
+    const char        *filename,
+    dloadsurface_t    *loadsurfaces,
+    int               *numSurfacesSetUp,
+    byte              *modelData,
+    size_t             modelDataSize,
+    con_map<str, str> *keyValues
+)
 {
-	msg_t msg;
+    msg_t msg;
 
-	MSG_Init( &msg, modelData, modelDataSize );
-	msg.cursize = modelDataSize;
-	MSG_BeginReading( &msg );
+    MSG_Init(&msg, modelData, modelDataSize);
+    msg.cursize = modelDataSize;
+    MSG_BeginReading(&msg);
 
-	memset( tiki, 0, sizeof( dtiki_t ) );
-	memset( loadsurfaces, 0, sizeof( dloadsurface_t ) * 24 );
-	*numSurfacesSetUp = 0;
+    memset(tiki, 0, sizeof(dtiki_t));
+    memset(loadsurfaces, 0, sizeof(dloadsurface_t) * 24);
+    *numSurfacesSetUp = 0;
 
-	VectorCopy( vec3_origin, tiki->load_origin );
-	VectorCopy( vec3_origin, tiki->light_offset );
-	tiki->load_scale = 1.0f;
-	tiki->lod_scale = 1.0f;
-	tiki->lod_bias = 0.0f;
-	tiki->numMeshes = 0;
+    VectorCopy(vec3_origin, tiki->load_origin);
+    VectorCopy(vec3_origin, tiki->light_offset);
+    tiki->load_scale = 1.0f;
+    tiki->lod_scale  = 1.0f;
+    tiki->lod_bias   = 0.0f;
+    tiki->numMeshes  = 0;
 
-	return TIKI_LoadSetupCase( tiki, filename, loadsurfaces, numSurfacesSetUp, &msg, false, keyValues );
+    return TIKI_LoadSetupCase(tiki, filename, loadsurfaces, numSurfacesSetUp, &msg, false, keyValues);
 }
 
 /*
@@ -979,23 +981,21 @@ qboolean TIKI_LoadSetup( dtiki_t *tiki, const char *filename, dloadsurface_t *lo
 TIKI_strstr
 ===============
 */
-bool TIKI_strstr( const char *s, const char *substring )
+bool TIKI_strstr(const char *s, const char *substring)
 {
-	const char *t = strstr( s, substring );
-	const char *w;
+    const char *t = strstr(s, substring);
+    const char *w;
 
-	if( !t || ( t != s && *( t - 1 ) != '\n' ) )
-	{
-		return false;
-	}
+    if (!t || (t != s && *(t - 1) != '\n')) {
+        return false;
+    }
 
-	w = strstr( t, "\n" );
-	if( w != ( t + strlen( substring ) ) )
-	{
-		return false;
-	}
+    w = strstr(t, "\n");
+    if (w != (t + strlen(substring))) {
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -1003,134 +1003,105 @@ bool TIKI_strstr( const char *s, const char *substring )
 TIKI_ParseSetup
 ===============
 */
-qboolean TIKI_ParseSetup( dloaddef_t *ld )
+qboolean TIKI_ParseSetup(dloaddef_t *ld)
 {
-	const char *token;
-	float load_scale;
-	float lod_scale;
-	float lod_bias;
-	float tmpFloat;
-	float tmpVec[ 3 ];
-	int tmpInt;
-	size_t length;
-	char name[ 128 ];
+    const char *token;
+    float       load_scale;
+    float       lod_scale;
+    float       lod_bias;
+    float       tmpFloat;
+    float       tmpVec[3];
+    int         tmpInt;
+    size_t      length;
+    char        name[128];
 
-	// Skip the setup token
-	ld->tikiFile.GetToken( true );
+    // Skip the setup token
+    ld->tikiFile.GetToken(true);
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
 
-		if( !stricmp( token, "scale" ) )
-		{
-			load_scale = ld->tikiFile.GetFloat( false );
-			WriteScale( ld, load_scale );
-		}
-		else if( !stricmp( token, "lod_scale" ) )
-		{
-			lod_scale = ld->tikiFile.GetFloat( false ) / 5.0f;
-			WriteLoadScale( ld, lod_scale );
-		}
-		else if( !stricmp( token, "lod_bias" ) )
-		{
-			lod_bias = ld->tikiFile.GetFloat( false );
-			WriteLodBias( ld, lod_bias );
-		}
-		else if( !stricmp( token, "skelmodel" ) )
-		{
-			token = ld->tikiFile.GetToken( false );
-			strcpy( name, ld->tikiFile.currentScript->path );
-			strcat( name, token );
-			WriteSkelmodel( ld, name );
-		}
-		else if( !stricmp( token, "path" ) )
-		{
-			token = ld->tikiFile.GetToken( false );
-			strcpy( ld->tikiFile.currentScript->path, token );
-			length = strlen( ld->tikiFile.currentScript->path );
-			token = ld->tikiFile.currentScript->path + length - 1;
+        if (!Q_stricmp(token, "scale")) {
+            load_scale = ld->tikiFile.GetFloat(false);
+            WriteScale(ld, load_scale);
+        } else if (!Q_stricmp(token, "lod_scale")) {
+            lod_scale = ld->tikiFile.GetFloat(false) / 5.0f;
+            WriteLoadScale(ld, lod_scale);
+        } else if (!Q_stricmp(token, "lod_bias")) {
+            lod_bias = ld->tikiFile.GetFloat(false);
+            WriteLodBias(ld, lod_bias);
+        } else if (!Q_stricmp(token, "skelmodel")) {
+            token = ld->tikiFile.GetToken(false);
+            Q_strncpyz(name, ld->tikiFile.currentScript->path, sizeof(name));
+            Q_strcat(name, sizeof(name), token);
+            WriteSkelmodel(ld, name);
+        } else if (!Q_stricmp(token, "path")) {
+            token = ld->tikiFile.GetToken(false);
+            Q_strncpyz(ld->tikiFile.currentScript->path, token, sizeof(ld->tikiFile.currentScript->path));
+            length = strlen(ld->tikiFile.currentScript->path);
+            token  = ld->tikiFile.currentScript->path + length - 1;
 
-			if( *token != '/' && *token != '\\' )
-			{
-				strcat( ld->tikiFile.currentScript->path, "/" );
-			}
-		}
-		else if( !stricmp( token, "orgin" ) )
-		{
-			tmpVec[ 0 ] = ld->tikiFile.GetFloat( false );
-			tmpVec[ 1 ] = ld->tikiFile.GetFloat( false );
-			tmpVec[ 2 ] = ld->tikiFile.GetFloat( false );
-			WriteOrigin( ld, tmpVec[ 0 ], tmpVec[ 1 ], tmpVec[ 2 ] );
-		}
-		else if( !stricmp( token, "lightoffset" ) )
-		{
-			tmpVec[ 0 ] = ld->tikiFile.GetFloat( false );
-			tmpVec[ 1 ] = ld->tikiFile.GetFloat( false );
-			tmpVec[ 2 ] = ld->tikiFile.GetFloat( false );
-			WriteLightOffset( ld, tmpVec[ 0 ], tmpVec[ 1 ], tmpVec[ 2 ] );
-		}
-		else if( !stricmp( token, "radius" ) )
-		{
-			tmpFloat = ld->tikiFile.GetFloat( false );
-			WriteRadius( ld, tmpFloat );
-		}
-		else if( !stricmp( token, "surface" ) )
-		{
-			token = ld->tikiFile.GetToken( false );
-			WriteSurface( ld, token );
-			while( ld->tikiFile.TokenAvailable( false ) )
-			{
-				token = ld->tikiFile.GetToken( false );
-				if( !stricmp( token, "flags" ) )
-				{
-					token = ld->tikiFile.GetToken( false );
-					tmpInt = TIKI_ParseSurfaceFlag( token );
-					WriteFlags( ld, tmpInt );
-				}
-				else if( !stricmp( token, "damage" ) )
-				{
-					tmpFloat = ld->tikiFile.GetFloat( false );
-					WriteDamage( ld, tmpFloat );
-				}
-				else if( !stricmp( token, "shader" ) )
-				{
-					token = ld->tikiFile.GetToken( false );
-					if( strstr( token, "." ) )
-					{
-						strcpy( name, ld->tikiFile.currentScript->path );
-						strcat( name, token );
-						WriteShader( ld, name );
-					}
-					else
-					{
-						WriteShader( ld, token );
-					}
-				}
-			}
-		}
-		else if( !stricmp( token, "ischaracter" ) )
-		{
-			ld->bIsCharacter = true;
-		}
-		else if( !stricmp( token, "case" ) )
-		{
-			if( !TIKI_ParseCase( ld ) )
-				return false;
-		}
-		else if( !stricmp( token, "}" ) )
-		{
-			return true;
-		}
-		else
-		{
-			TIKI_Error( "TIKI_ParseSetup: unknown setup command '%s' in '%s' on line %d, skipping line.\n", token, ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-			while( ld->tikiFile.TokenAvailable( false ) )
-				ld->tikiFile.GetToken( false );
-		}
-	}
+            if (*token != '/' && *token != '\\') {
+                Q_strcat(ld->tikiFile.currentScript->path, sizeof(ld->tikiFile.currentScript->path), "/");
+            }
+        } else if (!Q_stricmp(token, "origin")) {
+            tmpVec[0] = ld->tikiFile.GetFloat(false);
+            tmpVec[1] = ld->tikiFile.GetFloat(false);
+            tmpVec[2] = ld->tikiFile.GetFloat(false);
+            WriteOrigin(ld, tmpVec[0], tmpVec[1], tmpVec[2]);
+        } else if (!Q_stricmp(token, "lightoffset")) {
+            tmpVec[0] = ld->tikiFile.GetFloat(false);
+            tmpVec[1] = ld->tikiFile.GetFloat(false);
+            tmpVec[2] = ld->tikiFile.GetFloat(false);
+            WriteLightOffset(ld, tmpVec[0], tmpVec[1], tmpVec[2]);
+        } else if (!Q_stricmp(token, "radius")) {
+            tmpFloat = ld->tikiFile.GetFloat(false);
+            WriteRadius(ld, tmpFloat);
+        } else if (!Q_stricmp(token, "surface")) {
+            token = ld->tikiFile.GetToken(false);
+            WriteSurface(ld, token);
+            while (ld->tikiFile.TokenAvailable(false)) {
+                token = ld->tikiFile.GetToken(false);
+                if (!Q_stricmp(token, "flags")) {
+                    token  = ld->tikiFile.GetToken(false);
+                    tmpInt = TIKI_ParseSurfaceFlag(token);
+                    WriteFlags(ld, tmpInt);
+                } else if (!Q_stricmp(token, "damage")) {
+                    tmpFloat = ld->tikiFile.GetFloat(false);
+                    WriteDamage(ld, tmpFloat);
+                } else if (!Q_stricmp(token, "shader")) {
+                    token = ld->tikiFile.GetToken(false);
+                    if (strstr(token, ".")) {
+                        Q_strncpyz(name, ld->tikiFile.currentScript->path, sizeof(name));
+                        Q_strcat(name, sizeof(name), token);
+                        WriteShader(ld, name);
+                    } else {
+                        WriteShader(ld, token);
+                    }
+                }
+            }
+        } else if (!Q_stricmp(token, "ischaracter")) {
+            ld->bIsCharacter = true;
+        } else if (!Q_stricmp(token, "case")) {
+            if (!TIKI_ParseCase(ld)) {
+                return false;
+            }
+        } else if (!Q_stricmp(token, "}")) {
+            return true;
+        } else {
+            TIKI_Error(
+                "TIKI_ParseSetup: unknown setup command '%s' in '%s' on line %d, skipping line.\n",
+                token,
+                ld->tikiFile.Filename(),
+                ld->tikiFile.GetLineNumber()
+            );
+            while (ld->tikiFile.TokenAvailable(false)) {
+                ld->tikiFile.GetToken(false);
+            }
+        }
+    }
 
-	return true;
+    return true;
 }
 
 /*
@@ -1138,63 +1109,58 @@ qboolean TIKI_ParseSetup( dloaddef_t *ld )
 TIKI_ParseInitCommands
 ===============
 */
-void TIKI_ParseInitCommands( dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmds, int *numcmds )
+void TIKI_ParseInitCommands(dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmds, int *numcmds)
 {
-	int i;
-	const char *token;
-	char *pszArgs[ 256 ];
-	dloadinitcmd_t *cmd;
+    int             i;
+    const char     *token;
+    char           *pszArgs[256];
+    dloadinitcmd_t *cmd;
 
-	// Skip current token
-	ld->tikiFile.GetToken( true );
+    // Skip current token
+    ld->tikiFile.GetToken(true);
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
 
-		if( !stricmp( token, "}" ) )
-		{
-			break;
-		}
+        if (!Q_stricmp(token, "}")) {
+            break;
+        }
 
-		if( *numcmds < maxcmds )
-		{
-			cmd = ( dloadinitcmd_t * )TIKI_AllocateLoadData( sizeof( dloadinitcmd_t ) );
-			cmdlist[ *numcmds ] = cmd;
-			if( cmd )
-			{
-				( *numcmds )++;
+        if (*numcmds < maxcmds) {
+            cmd               = (dloadinitcmd_t *)TIKI_AllocateLoadData(sizeof(dloadinitcmd_t));
+            cmdlist[*numcmds] = cmd;
+            if (cmd) {
+                (*numcmds)++;
 
-				cmd->num_args = 0;
-				cmd->args = NULL;
+                cmd->num_args = 0;
+                cmd->args     = NULL;
 
-				ld->tikiFile.UnGetToken();
-				while( ld->tikiFile.TokenAvailable( false ) )
-				{
-					token = ld->tikiFile.GetToken( false );
-					if( cmd->num_args < 255 )
-					{
-						pszArgs[ cmd->num_args ] = TIKI_CopyString( token );
-						cmd->num_args++;
-					}
-					else
-					{
-						TIKI_Error( "TIKI_ParseInitCommands: too many args in anim commands in %s.\n", ld->tikiFile.Filename() );
-					}
-				}
+                ld->tikiFile.UnGetToken();
+                while (ld->tikiFile.TokenAvailable(false)) {
+                    token = ld->tikiFile.GetToken(false);
+                    if (cmd->num_args < 255) {
+                        pszArgs[cmd->num_args] = TIKI_CopyString(token);
+                        cmd->num_args++;
+                    } else {
+                        TIKI_Error(
+                            "TIKI_ParseInitCommands: too many args in anim commands in %s.\n", ld->tikiFile.Filename()
+                        );
+                    }
+                }
 
-				cmd->args = ( char ** )TIKI_AllocateLoadData( cmd->num_args * sizeof( char * ) );
-				for( i = 0; i < cmd->num_args; i++ )
-				{
-					cmd->args[ i ] = pszArgs[ i ];
-				}
-			}
-			else
-			{
-				TIKI_Error( "TIKI_ParseInitCommands: could not allocate storage for dloadinitcmd_t in %s on line %d.\n", ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-			}
-		}
-	}
+                cmd->args = (char **)TIKI_AllocateLoadData(cmd->num_args * sizeof(char *));
+                for (i = 0; i < cmd->num_args; i++) {
+                    cmd->args[i] = pszArgs[i];
+                }
+            } else {
+                TIKI_Error(
+                    "TIKI_ParseInitCommands: could not allocate storage for dloadinitcmd_t in %s on line %d.\n",
+                    ld->tikiFile.Filename(),
+                    ld->tikiFile.GetLineNumber()
+                );
+            }
+        }
+    }
 }
 
 /*
@@ -1202,38 +1168,35 @@ void TIKI_ParseInitCommands( dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcm
 TIKI_ParseInit
 ===============
 */
-void TIKI_ParseInit( dloaddef_t *ld )
+void TIKI_ParseInit(dloaddef_t *ld)
 {
-	const char *token;
+    const char *token;
 
-	// Skip the init token
-	ld->tikiFile.GetToken( true );
+    // Skip the init token
+    ld->tikiFile.GetToken(true);
 
-	while( ld->tikiFile.TokenAvailable( true ) )
-	{
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "client" ) )
-		{
-			TIKI_ParseInitCommands( ld, ld->loadclientinitcmds, 160, &ld->numclientinitcmds );
-		}
-		else if( !stricmp( token, "server" ) )
-		{
-			TIKI_ParseInitCommands( ld, ld->loadserverinitcmds, 160, &ld->numserverinitcmds );
-		}
-		else if( !stricmp( token, "}" ) )
-		{
-			break;
-		}
-		else
-		{
-			TIKI_Error( "TIKI_ParseInit: unknown init command %s in %s on line %d, skipping line.\n", token, ld->tikiFile.Filename(), ld->tikiFile.GetLineNumber() );
-
-			// Skip the current line
-			while( ld->tikiFile.TokenAvailable( false ) )
-				ld->tikiFile.GetToken( false );
-		}
-	}
+    while (ld->tikiFile.TokenAvailable(true)) {
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "client")) {
+            TIKI_ParseInitCommands(ld, ld->loadclientinitcmds, 160, &ld->numclientinitcmds);
+        } else if (!Q_stricmp(token, "server")) {
+            TIKI_ParseInitCommands(ld, ld->loadserverinitcmds, 160, &ld->numserverinitcmds);
+        } else if (!Q_stricmp(token, "}")) {
+            break;
+        } else {
+            TIKI_Error(
+                "TIKI_ParseInit: unknown init command %s in %s on line %d, skipping line.\n",
+                token,
+                ld->tikiFile.Filename(),
+                ld->tikiFile.GetLineNumber()
+            );
 
+            // Skip the current line
+            while (ld->tikiFile.TokenAvailable(false)) {
+                ld->tikiFile.GetToken(false);
+            }
+        }
+    }
 }
 
 /*
@@ -1241,60 +1204,56 @@ void TIKI_ParseInit( dloaddef_t *ld )
 TIKI_ParseCase
 ===============
 */
-qboolean TIKI_ParseCase( dloaddef_t *ld )
+qboolean TIKI_ParseCase(dloaddef_t *ld)
 {
-	const char *token;
-	bool isheadmodel;
-	bool isheadskin;
+    const char *token;
+    bool        isheadmodel;
+    bool        isheadskin;
 
-	WriteBeginCase( ld );
+    WriteBeginCase(ld);
 
 __newcase:
-	token = ld->tikiFile.GetToken( false );
-	WriteCaseKey( ld, token );
-	isheadmodel = ( !stricmp( token, "headmodel" ) ) ? true : false;
-	isheadskin = ( !stricmp( token, "headskin" ) ) ? true : false;
+    token = ld->tikiFile.GetToken(false);
+    WriteCaseKey(ld, token);
+    isheadmodel = !Q_stricmp(token, "headmodel");
+    isheadskin  = !Q_stricmp(token, "headskin");
 
-	while( 1 )
-	{
-		if( !ld->tikiFile.TokenAvailable( true ) )
-		{
-			TIKI_Error( "TIKI_ParseSetup: unexpected end of file while parsing 'case' switch in %s on line %d.\n", ld->tikiFile.Filename() , ld->tikiFile.GetLineNumber() );
-			return 0;
-		}
+    while (1) {
+        if (!ld->tikiFile.TokenAvailable(true)) {
+            TIKI_Error(
+                "TIKI_ParseSetup: unexpected end of file while parsing 'case' switch in %s on line %d.\n",
+                ld->tikiFile.Filename(),
+                ld->tikiFile.GetLineNumber()
+            );
+            return 0;
+        }
 
-		token = ld->tikiFile.GetToken( true );
-		if( !stricmp( token, "case" ) )
-		{
-			goto __newcase;
-		}
-		else if( !stricmp( token, "{" ) )
-		{
-			break;
-		}
+        token = ld->tikiFile.GetToken(true);
+        if (!Q_stricmp(token, "case")) {
+            goto __newcase;
+        } else if (!Q_stricmp(token, "{")) {
+            break;
+        }
 
-		WriteCaseValue( ld, token );
+        WriteCaseValue(ld, token);
 
-		if( isheadmodel && TIKI_strstr( ld->headmodels, token ) )
-		{
-			strcat( ld->headmodels, token );
-			strcat( ld->headmodels, "\n" );
-		}
-	
-		if( isheadskin && TIKI_strstr( ld->headskins, token ) )
-		{
-			strcat( ld->headskins, token );
-			strcat( ld->headskins, "\n" );
-		}
-	}
+        if (isheadmodel && !TIKI_strstr(ld->headmodels, token)) {
+            strcat(ld->headmodels, token);
+            strcat(ld->headmodels, "\n");
+        }
 
-	WriteBeginCaseBody( ld );
-	ld->tikiFile.UnGetToken();
-	if( !TIKI_ParseSetup( ld ) )
-	{
-		return false;
-	}
+        if (isheadskin && !TIKI_strstr(ld->headskins, token)) {
+            strcat(ld->headskins, token);
+            strcat(ld->headskins, "\n");
+        }
+    }
 
-	WriteEndCase( ld );
-	return true;
+    WriteBeginCaseBody(ld);
+    ld->tikiFile.UnGetToken();
+    if (!TIKI_ParseSetup(ld)) {
+        return false;
+    }
+
+    WriteEndCase(ld);
+    return true;
 }
diff --git a/code/tiki/tiki_parse.h b/code/tiki/tiki_parse.h
index dadb0a55..1db2634f 100644
--- a/code/tiki/tiki_parse.h
+++ b/code/tiki/tiki_parse.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,38 +20,61 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef TIKI_PARSE_H
-#define TIKI_PARSE_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-const char *TIKI_FileExtension( const char *in );
-void TIKI_ParseFrameCommands( dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds );
-void TIKI_ParseAnimationCommands( dloaddef_t *ld, dloadanim_t *anim );
-void TIKI_ParseAnimationFlags( dloaddef_t *ld, dloadanim_t *anim );
-void TIKI_ParseAnimationsFail( dloaddef_t *ld );
-qboolean TIKI_ParseIncludes( dloaddef_t *ld );
-void TIKI_ParseAnimations( dloaddef_t *ld );
-int TIKI_ParseSurfaceFlag( const char *token );
-void TIKI_InitSetup( dloaddef_t *ld );
+    const char  *TIKI_FileExtension(const char *in);
+    void         TIKI_ParseFrameCommands(dloaddef_t *ld, dloadframecmd_t **cmdlist, int maxcmds, int *numcmds);
+    void         TIKI_ParseAnimationCommands(dloaddef_t *ld, dloadanim_t *anim);
+    void         TIKI_ParseAnimationFlags(dloaddef_t *ld, dloadanim_t *anim);
+    void         TIKI_ParseAnimationsFail(dloaddef_t *ld);
+    qboolean     TIKI_ParseIncludes(dloaddef_t *ld);
+    void         TIKI_ParseAnimations(dloaddef_t *ld);
+    int          TIKI_ParseSurfaceFlag(const char *token);
+    void         TIKI_InitSetup(dloaddef_t *ld);
+    dloadanim_t *TIKI_AllocAnim(dloaddef_t *ld);
 
 #ifdef __cplusplus
-qboolean TIKI_LoadSetupCaseHeader( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, msg_t *msg, qboolean skip, con_map<str, str> *keyValues );
-qboolean TIKI_LoadSetupCase( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, msg_t *msg, qboolean skip, con_map<str, str> *keyValues );
-qboolean TIKI_LoadSetup( dtiki_t *tiki, const char *filename, dloadsurface_t *loadsurfaces, int *numSurfacesSetUp, byte *modelData, size_t modelDataSize, con_map<str, str> *keyValues );
-bool TIKI_strstr( const char *s, const char *substring );
+    qboolean TIKI_LoadSetupCaseHeader(
+        dtiki_t           *tiki,
+        const char        *filename,
+        dloadsurface_t    *loadsurfaces,
+        int               *numSurfacesSetUp,
+        msg_t             *msg,
+        qboolean           skip,
+        con_map<str, str> *keyValues
+    );
+    qboolean TIKI_LoadSetupCase(
+        dtiki_t           *tiki,
+        const char        *filename,
+        dloadsurface_t    *loadsurfaces,
+        int               *numSurfacesSetUp,
+        msg_t             *msg,
+        qboolean           skip,
+        con_map<str, str> *keyValues
+    );
+    qboolean TIKI_LoadSetup(
+        dtiki_t           *tiki,
+        const char        *filename,
+        dloadsurface_t    *loadsurfaces,
+        int               *numSurfacesSetUp,
+        byte              *modelData,
+        size_t             modelDataSize,
+        con_map<str, str> *keyValues
+    );
+    bool TIKI_strstr(const char *s, const char *substring);
 #endif
 
-qboolean TIKI_ParseSetup( dloaddef_t *ld );
-void TIKI_ParseInitCommands( dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmds, int *numcmds );
-void TIKI_ParseInit( dloaddef_t *ld );
-qboolean TIKI_ParseCase( dloaddef_t *ld );
+    qboolean TIKI_ParseSetup(dloaddef_t *ld);
+    void     TIKI_ParseInitCommands(dloaddef_t *ld, dloadinitcmd_t **cmdlist, int maxcmds, int *numcmds);
+    void     TIKI_ParseInit(dloaddef_t *ld);
+    qboolean TIKI_ParseCase(dloaddef_t *ld);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // TIKI_PARSE_H
-
+void WriteSkelmodel(dloaddef_t* ld, const char* name);
diff --git a/code/tiki/tiki_shared.h b/code/tiki/tiki_shared.h
index 2f35c188..ca9126db 100644
--- a/code/tiki/tiki_shared.h
+++ b/code/tiki/tiki_shared.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -25,272 +25,288 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #pragma once
 
 #ifdef __cplusplus
-#include "../skeletor/skeletor_name_lists.h"
+#    include "../skeletor/skeletor_name_lists.h"
 #endif
 
 #include "../skeletor/skeletor_model_file_format.h"
 
 // animation flags
-#define TAF_RANDOM						0x1		// random
-#define TAF_NOREPEAT					0x2		// no loop
-#define TAF_DONTREPEAT					( TAF_RANDOM | TAF_NOREPEAT )	// don't repeat
-#define TAF_DEFAULT_ANGLES				0x8		// ?
-#define TAF_NOTIMECHECK					0x10	// don't check for timing
-#define TAF_DELTADRIVEN					0x20	// animation is based on skeletor animation's delta
-#define TAF_AUTOSTEPS					0x400	// footsteps for dogs
-#define TAF_AUTOSTEPS_RUNNING			0x800	// footsteps for dogs
-#define TAF_AUTOSTEPS_EQUIPMENT			0x1000
+#define TAF_RANDOM              0x1                         // random
+#define TAF_NOREPEAT            0x2                         // no loop
+#define TAF_DONTREPEAT          (TAF_RANDOM | TAF_NOREPEAT) // don't repeat
+#define TAF_DEFAULT_ANGLES      0x8                         // ?
+#define TAF_NOTIMECHECK         0x10                        // don't check for timing
+#define TAF_DELTADRIVEN         0x20                        // animation is based on skeletor animation's delta
+#define TAF_AUTOSTEPS           0x400                       // footsteps for dogs
+#define TAF_AUTOSTEPS_RUNNING   0x800                       // footsteps for dogs
+#define TAF_AUTOSTEPS_EQUIPMENT 0x1000
 
 // skeletor animation flags
-#define TAF_HASDELTA			0x40
-#define TAF_HASMORPH			0x80
-#define TAF_HASUPPER			0x100
+#define TAF_HASDELTA 0x40
+#define TAF_HASMORPH 0x80
+#define TAF_HASUPPER 0x100
 
 // tiki anim command frames
-#define TIKI_FRAME_LAST				-5			// exec at last
-#define TIKI_FRAME_END				-4			// exec at end
-#define TIKI_FRAME_ENTRY			-3			// exec at entry
-#define TIKI_FRAME_EXIT				-2			// exec at exit
-#define TIKI_FRAME_EVERY			-1			// exec each frame
-#define TIKI_FRAME_FIRST			0			// exec at first frame
-#define TIKI_FRAME_MAXFRAMERATE		60
+#define TIKI_FRAME_LAST         -5 // exec at last
+#define TIKI_FRAME_END          -4 // exec at end
+#define TIKI_FRAME_ENTRY        -3 // exec at entry
+#define TIKI_FRAME_EXIT         -2 // exec at exit
+#define TIKI_FRAME_EVERY        -1 // exec each frame
+#define TIKI_FRAME_FIRST        0  // exec at first frame
+#define TIKI_FRAME_MAXFRAMERATE 60
+
+#define TIKI_SKEL_LOD_INDEXES 10
 
 // skb skeletor
-#define TIKI_SKB_HEADER_IDENT		( *( int * )"SKL " )
-#define TIKI_SKB_HEADER_VER_3		3
-#define TIKI_SKB_HEADER_VERSION		4
+#define TIKI_SKB_HEADER_IDENT   (*(int *)"SKL ")
+#define TIKI_SKB_HEADER_VER_3   3
+#define TIKI_SKB_HEADER_VERSION 4
 
 // skd skeletor
-#define TIKI_SKD_HEADER_IDENT		( *( int * )"SKMD" )
-#define TIKI_SKD_HEADER_OLD_VERSION	5
-#define TIKI_SKD_HEADER_VERSION		6
+#define TIKI_SKD_HEADER_IDENT       (*(int *)"SKMD")
+#define TIKI_SKD_HEADER_OLD_VERSION 5
+#define TIKI_SKD_HEADER_VERSION     6
 
 // skc skeletor animations
-#define TIKI_SKC_HEADER_IDENT		( *( int * )"SKAN" )
-#define TIKI_SKC_HEADER_OLD_VERSION	13
-#define TIKI_SKC_HEADER_VERSION		14
+#define TIKI_SKC_HEADER_IDENT       (*(int *)"SKAN")
+#define TIKI_SKC_HEADER_OLD_VERSION 13
+#define TIKI_SKC_HEADER_VERSION     14
 
 // tiki limitations
-#define TIKI_MAX_BONES				100
-#define TIKI_MAX_VERTEXES			1000
-#define TIKI_MAX_TRIANGLES			2000
-#define TIKI_MAX_SKELCACHE			1024
-#define TIKI_MAX_COMMANDS			128
+#define TIKI_MAX_BONES       100
+#define TIKI_MAX_VERTEXES    1000
+#define TIKI_MAX_TRIANGLES   2000
+#define TIKI_MAX_SKELCACHE   1024
+#define TIKI_MAX_COMMANDS    128
+
+#define TIKI_MAX_ENTITIES              2048
+#define TIKI_MAX_ENTITY_CACHE_PER_ENT  2
+#define TIKI_MAX_ENTITY_CACHE          (TIKI_MAX_ENTITIES*TIKI_MAX_ENTITY_CACHE_PER_ENT)
 
 // tiki surface flags
-#define TIKI_SURF_SKIN1				( 1 << 0 )
-#define TIKI_SURF_SKIN2				( 1 << 1 )
-#define TIKI_SURF_SKIN3				( TIKI_SURF_SKIN1 | TIKI_SURF_SKIN2 )
-#define TIKI_SURF_NODRAW			( 1 << 2 )
-#define TIKI_SURF_CROSSFADE			( 1 << 6 )
-#define TIKI_SURF_NODAMAGE			( 1 << 7 )
-#define TIKI_SURF_NOMIPMAPS			( 1 << 8 )
-#define TIKI_SURF_NOPICMIP			( 1 << 9 )
+#define TIKI_SURF_SKIN1     (1 << 0)
+#define TIKI_SURF_SKIN2     (1 << 1)
+#define TIKI_SURF_SKIN3     (TIKI_SURF_SKIN1 | TIKI_SURF_SKIN2)
+#define TIKI_SURF_NODRAW    (1 << 2)
+#define TIKI_SURF_CROSSFADE (1 << 6)
+#define TIKI_SURF_NODAMAGE  (1 << 7)
+#define TIKI_SURF_NOMIPMAPS (1 << 8)
+#define TIKI_SURF_NOPICMIP  (1 << 9)
 
-typedef struct AliasList_s AliasList_t;
+#define MAX_SKELMODELS        12
+#define MAX_TIKI_SHADER       4
+#define MAX_TIKI_ALIASES      4095
+#define MAX_GLOBAL_FROM_LOCAL 200
+
+#define MAX_LOD_CURVE_POINTS  5
+#define MAX_LOD_CURVE_CONSTS  4
+
+typedef struct AliasList_s     AliasList_t;
 typedef struct AliasListNode_s AliasListNode_t;
 
 typedef struct tiki_singlecmd_s {
-	int num_args;
-	char **args;
+    int    num_args;
+    char **args;
 } tiki_singlecmd_t;
 
 typedef struct tiki_cmd_s {
-	int num_cmds;
-	tiki_singlecmd_t cmds[ TIKI_MAX_COMMANDS ];
+    int              num_cmds;
+    tiki_singlecmd_t cmds[TIKI_MAX_COMMANDS];
 } tiki_cmd_t;
 
 #ifdef __cplusplus
 
-typedef class skelChannelList_s {
+typedef class skelChannelList_s
+{
 public:
-	short int	m_numChannels;
+    short int m_numChannels;
 
 private:
-	short int	m_numLocalFromGlobal;
-	short int	*m_chanLocalFromGlobal;
+    short int  m_numLocalFromGlobal;
+    short int *m_chanLocalFromGlobal;
 
 public:
-	short int	m_chanGlobalFromLocal[ 200 ];
+    short int m_chanGlobalFromLocal[MAX_GLOBAL_FROM_LOCAL];
 
-	int					NumChannels( void ) const;
-	void				ZeroChannels( void );
-	void				PackChannels( void );
-	void				InitChannels( void );
-	void				CleanUpChannels();
-	int					GlobalChannel( int localchannel ) const;
-	int					LocalChannel( int channel ) const;
-	int					GetLocalFromGlobal( int globalChannel ) const;
-	void				SetLocalFromGlobal( int channel, int localchannel );
-	qboolean			HasChannel( ChannelNameTable *nameTable, const char *channelName ) const;
-	qboolean			HasChannel( int channel ) const;
-	int					AddChannel( int newGlobalChannelNum );
-	const char			*ChannelName( ChannelNameTable *nameTable, int localChannelNum ) const;
+    int         NumChannels(void) const;
+    void        ZeroChannels(void);
+    void        PackChannels(void);
+    void        InitChannels(void);
+    void        CleanUpChannels();
+    int         GlobalChannel(int localchannel) const;
+    int         LocalChannel(int channel) const;
+    int         GetLocalFromGlobal(int globalChannel) const;
+    void        SetLocalFromGlobal(int channel, int localchannel);
+    qboolean    HasChannel(ChannelNameTable *nameTable, const char *channelName) const;
+    qboolean    HasChannel(int channel) const;
+    int         AddChannel(int newGlobalChannelNum);
+    const char *ChannelName(ChannelNameTable *nameTable, int localChannelNum) const;
 } skelChannelList_c;
 
 #else
 
 typedef struct skelChannelList_s {
-	short int	m_numChannels;
-	short int	m_numLocalFromGlobal;
-	short int	*m_chanLocalFromGlobal;
-	short int	m_chanGlobalFromLocal[ 200 ];
+    short int  m_numChannels;
+    short int  m_numLocalFromGlobal;
+    short int *m_chanLocalFromGlobal;
+    short int  m_chanGlobalFromLocal[MAX_GLOBAL_FROM_LOCAL];
 } skelChannelList_c;
 
 #endif
 
 typedef struct dtikianim_s {
-	char *name;
-	int num_anims;
-	void *alias_list;
-	int num_client_initcmds;
-	struct dtikicmd_s *client_initcmds;
-	int num_server_initcmds;
-	struct dtikicmd_s *server_initcmds;
-	byte *modelData;
-	size_t modelDataSize;
-	float mins[ 3 ];
-	float maxs[ 3 ];
-	short int *m_aliases;
-	char *headmodels;
-	char *headskins;
-	qboolean bIsCharacter;
-	struct dtikianimdef_s *animdefs[ 1 ];
+    char                  *name;
+    int                    num_anims;
+    void                  *alias_list;
+    int                    num_client_initcmds;
+    struct dtikicmd_s     *client_initcmds;
+    int                    num_server_initcmds;
+    struct dtikicmd_s     *server_initcmds;
+    byte                  *modelData;
+    size_t                 modelDataSize;
+    vec3_t                 mins;
+    vec3_t                 maxs;
+    short int             *m_aliases;
+    char                  *headmodels;
+    char                  *headskins;
+    qboolean               bIsCharacter;
+    struct dtikianimdef_s *animdefs[1];
 } dtikianim_t;
 
 typedef struct dtiki_s {
-	char *name;
-	dtikianim_t *a;
-	void *skeletor;
-	int num_surfaces;
-	struct dtikisurface_s *surfaces;
-	float load_scale;
-	float lod_scale;
-	float lod_bias;
-	float light_offset[ 3 ];
-	float load_origin[ 3 ];
-	float radius;
-	skelChannelList_c m_boneList;
-	int numMeshes;
-	short int mesh[ 1 ];
+    char                  *name;
+    dtikianim_t           *a;
+    void                  *skeletor;
+    int                    num_surfaces;
+    struct dtikisurface_s *surfaces;
+    float                  load_scale;
+    float                  lod_scale;
+    float                  lod_bias;
+    vec3_t                 light_offset;
+    vec3_t                 load_origin;
+    float                  radius;
+    skelChannelList_c      m_boneList;
+    int                    numMeshes;
+    short int              mesh[1];
 
 #ifdef __cplusplus
-	int			GetBoneNumFromName( const char *name );
-	const char	*GetBoneNameFromNum( int num ) const;
+    int         GetBoneNumFromName(const char *name);
+    const char *GetBoneNameFromNum(int num) const;
 #endif
 } dtiki_t;
 
 typedef struct {
-	int ident;
-	int version;
-	char name[ 64 ];
-	int numSurfaces;
-	int numBones;
-	int ofsBones;
-	int ofsSurfaces;
-	int ofsEnd;
-	int lodIndex[ 10 ];
-	int numBoxes;
-	int ofsBoxes;
-	int numMorphTargets;
-	int ofsMorphTargets;
+    int   ident;
+    int   version;
+    char  name[64];
+    int   numSurfaces;
+    int   numBones;
+    int   ofsBones;
+    int   ofsSurfaces;
+    int   ofsEnd;
+    int   lodIndex[TIKI_SKEL_LOD_INDEXES];
+    int   numBoxes;
+    int   ofsBoxes;
+    int   numMorphTargets;
+    int   ofsMorphTargets;
+    // Added in 2.0 (SKD version 6)
+    float scale;
 } skelHeader_t;
 
 typedef struct {
-	short int parent;
-	short int boxIndex;
-	int flags;
-	char name[ 64 ];
+    short int parent;
+    short int boxIndex;
+    int       flags;
+    char      name[64];
 } skelBoneName_t;
 
 typedef struct {
-	int ident;
-	char name[ 64 ];
-	int numTriangles;
-	int numVerts;
-	int staticSurfProcessed;
-	int ofsTriangles;
-	int ofsVerts;
-	int ofsCollapse;
-	int ofsEnd;
-	int ofsCollapseIndex;
+    int  ident;
+    char name[64];
+    int  numTriangles;
+    int  numVerts;
+    int  staticSurfProcessed;
+    int  ofsTriangles;
+    int  ofsVerts;
+    int  ofsCollapse;
+    int  ofsEnd;
+    int  ofsCollapseIndex;
 } skelSurface_t;
 
 typedef short int skelIndex_t;
 
-typedef struct  skelSurfaceGame_s {
-	int ident;
-	char name[ MAX_QPATH ];
-	int numTriangles;
-	int numVerts;
-	vec4_t *pStaticXyz;
-	vec4_t *pStaticNormal;
-	vec2_t ( *pStaticTexCoords )[ 2 ];
-	skelIndex_t *pTriangles;
-	struct skeletorVertex_s *pVerts;
-	skelIndex_t *pCollapse;
-	struct skelSurfaceGame_s *pNext;
-	skelIndex_t *pCollapseIndex;
+typedef struct skelSurfaceGame_s {
+    int     ident;
+    char    name[MAX_QPATH];
+    int     numTriangles;
+    int     numVerts;
+    vec4_t *pStaticXyz;
+    vec4_t *pStaticNormal;
+    vec2_t (*pStaticTexCoords)[2];
+    skelIndex_t              *pTriangles;
+    struct skeletorVertex_s  *pVerts;
+    skelIndex_t              *pCollapse;
+    struct skelSurfaceGame_s *pNext;
+    skelIndex_t              *pCollapseIndex;
 
 #ifdef __cplusplus
-	skelSurfaceGame_s();
+    skelSurfaceGame_s();
 #endif
 } skelSurfaceGame_t;
 
 typedef struct skelHeaderGame_s {
-	int version;
-	char name[ 64 ];
-	int numSurfaces;
-	int numBones;
-	struct boneData_s *pBones;
-	skelSurfaceGame_t *pSurfaces;
-	int lodIndex[ 10 ];
-	int numBoxes;
-	struct skelHitBox_s *pBoxes;
-	struct lodControl_s *pLOD;
-	int numMorphTargets;
-	char *pMorphTargets;
+    int                  version;
+    char                 name[64];
+    int                  numSurfaces;
+    int                  numBones;
+    struct boneData_s   *pBones;
+    skelSurfaceGame_t   *pSurfaces;
+    int                  lodIndex[TIKI_SKEL_LOD_INDEXES];
+    int                  numBoxes;
+    struct skelHitBox_s *pBoxes;
+    struct lodControl_s *pLOD;
+    int                  numMorphTargets;
+    char                *pMorphTargets;
+    float                scale;
 } skelHeaderGame_t;
 
 typedef struct boneData_s {
-	short int channel;
-	boneType_t boneType;
-	short int parent;
-	short int numChannels;
-	short int numRefs;
-	short int channelIndex[ 2 ];
-	short int refIndex[ 2 ];
-	vec3_t offset;
-	float length;
-	float weight;
-	float bendRatio;
-	float bendMax;
-	float spinRatio;
+    short int  channel;
+    boneType_t boneType;
+    short int  parent;
+    short int  numChannels;
+    short int  numRefs;
+    short int  channelIndex[2];
+    short int  refIndex[2];
+    vec3_t     offset;
+    float      length;
+    float      weight;
+    float      bendRatio;
+    float      bendMax;
+    float      spinRatio;
 } boneData_t;
 
 typedef struct tikiSurface_s {
-	int ident;
-	char name[ 64 ];
-	int numFrames;
-	int numVerts;
-	int minLod;
-	int numTriangles;
-	int ofsTriangles;
-	int ofsCollapseMap;
-	int ofsSt;
-	int ofsXyzNormals;
-	int ofsEnd;
+    int  ident;
+    char name[64];
+    int  numFrames;
+    int  numVerts;
+    int  minLod;
+    int  numTriangles;
+    int  ofsTriangles;
+    int  ofsCollapseMap;
+    int  ofsSt;
+    int  ofsXyzNormals;
+    int  ofsEnd;
 } tikiSurface_t;
 
-#define MAX_TIKI_SHADER		4
-
 typedef struct dtikisurface_s {
-	char name[ MAX_QPATH ];
-	char shader[ MAX_TIKI_SHADER ][ MAX_QPATH ];
-	int hShader[ MAX_TIKI_SHADER ];
-	int numskins;
-	int flags;
-	float damage_multiplier;
+    char  name[MAX_QPATH];
+    char  shader[MAX_TIKI_SHADER][MAX_QPATH];
+    int   hShader[MAX_TIKI_SHADER];
+    int   numskins;
+    int   flags;
+    float damage_multiplier;
 } dtikisurface_t;
 
 /*typedef struct tikiFrame_s {
@@ -303,113 +319,115 @@ typedef struct dtikisurface_s {
 } tikiFrame_t;*/
 
 typedef struct tiki_tess_data_s {
-	int ident;
-	tikiSurface_t *newsurface;
-	tikiSurface_t *oldsurface;
+    int            ident;
+    tikiSurface_t *newsurface;
+    tikiSurface_t *oldsurface;
 } tiki_tess_data_t;
 
 typedef struct skelWeight_s {
-	int boneIndex;
-	float boneWeight;
-	vec3_t offset;
+    int    boneIndex;
+    float  boneWeight;
+    vec3_t offset;
 } skelWeight_t;
 
 typedef struct skelVertex_s {
-	vec3_t normal;
-	vec2_t texCoords;
-	int numWeights;
-	skelWeight_t weights[ 1 ];
+    vec3_t       normal;
+    vec2_t       texCoords;
+    int          numWeights;
+    skelWeight_t weights[1];
 } skelVertex_t;
 
 typedef struct skeletorVertex_s {
-	vec3_t normal;
-	vec2_t texCoords;
-	int numWeights;
-	int numMorphs;
+    vec3_t normal;
+    vec2_t texCoords;
+    int    numWeights;
+    int    numMorphs;
 } skeletorVertex_t;
 
 typedef struct skeletorVertexGame_s {
-	vec3_t normal;
-	vec2_t texCoords;
-	int numWeights;
-	int numMorphs;
+    vec3_t normal;
+    vec2_t texCoords;
+    int    numWeights;
+    int    numMorphs;
 } skeletorVertexGame_t;
 
 typedef struct staticSurface_s {
-	int ident;
-	int ofsStaticData;
-	skelSurfaceGame_t *surface;
-	int meshNum;
+    int                ident;
+    int                ofsStaticData;
+    skelSurfaceGame_t *surface;
+    int                meshNum;
 } staticSurface_t;
 
 typedef struct {
-	int morphIndex;
-	vec3_t offset;
+    int    morphIndex;
+    vec3_t offset;
 } skeletorMorph_t;
 
 typedef struct dtikianimdef_s {
-	char alias[ 48 ];
-	float weight;
-	float blendtime;
-	int flags;
-	int num_client_cmds;
-	struct dtikicmd_s *client_cmds;
-	int num_server_cmds;
-	struct dtikicmd_s *server_cmds;
+    char               alias[48];
+    float              weight;
+    float              blendtime;
+    int                flags;
+    int                num_client_cmds;
+    struct dtikicmd_s *client_cmds;
+    int                num_server_cmds;
+    struct dtikicmd_s *server_cmds;
 } dtikianimdef_t;
 
 typedef struct {
-	short int shortQuat[ 4 ];
-	short int shortOffset[ 3 ];
-	short int pad;
+    short int shortQuat[4];
+    short int shortOffset[3];
+    short int pad;
 } skelBone_t;
 
 typedef struct {
-	float bounds[ 2 ][ 3 ];
-	float radius;
-	float delta[ 3 ];
-	skelBone_t bones[ 1 ];
+    vec3_t     bounds[2];
+    float      radius;
+    vec3_t     delta;
+    skelBone_t bones[1];
 } skelFrame_t;
 
 typedef struct {
-	int ident;
-	int version;
-	char name[ 64 ];
-	int type;
-	int numFrames;
-	int numbones;
-	float totaltime;
-	float frametime;
-	float totaldelta[ 3 ];
-	int ofsFrames;
+    int    ident;
+    int    version;
+    char   name[64];
+    int    type;
+    int    numFrames;
+    int    numbones;
+    float  totaltime;
+    float  frametime;
+    vec3_t totaldelta;
+    int    ofsFrames;
 } skelAnimHeader_t;
 
 typedef struct {
-	float offset[ 4 ];
-	float matrix[ 3 ][ 4 ];
+    float offset[4];
+    float matrix[3][4];
 } skelBoneCache_t;
 
 typedef struct {
-	float pos;
-	float val;
+    float pos;
+    float val;
 } lodCurvePoint_t;
 
 typedef struct {
-	float base;
-	float scale;
-	float cutoff;
+    float base;
+    float scale;
+    float cutoff;
 } lodCurvePointConstants_t;
 
 typedef struct lodControl_s {
-	float minMetric;
-	float maxMetric;
-	lodCurvePoint_t curve[ 5 ];
-	lodCurvePointConstants_t consts[ 4 ];
+    float                    minMetric;
+    float                    maxMetric;
+    lodCurvePoint_t          curve[MAX_LOD_CURVE_POINTS];
+    lodCurvePointConstants_t consts[MAX_LOD_CURVE_CONSTS];
 } lodControl_t;
 
 typedef struct {
-	char path[ 96 ];
-	skelHeaderGame_t *skel;
-	size_t size;
-	int numuses;
+    char              path[96];
+    skelHeaderGame_t *skel;
+    size_t            size;
+    int               numuses;
 } skelcache_t;
+
+typedef int skeletorMorphCache_t;
diff --git a/code/tiki/tiki_skel.cpp b/code/tiki/tiki_skel.cpp
index bab96860..3da54637 100644
--- a/code/tiki/tiki_skel.cpp
+++ b/code/tiki/tiki_skel.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 // tiki_skel.cpp : TIKI skeletor loader
+//
+// Some part of the code uses CopyLittleLong / LongNoSwapPtr, etc. because some CPUs can't read misaligned memory
+//
 
 #include "q_shared.h"
 #include "qcommon.h"
@@ -33,117 +36,106 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 LoadBoneFromBuffer2
 ===============
 */
-void LoadBoneFromBuffer2( boneFileData_t *fileData, boneData_t *boneData )
+void LoadBoneFromBuffer2(boneFileData_t *fileData, boneData_t *boneData)
 {
-	char *newChannelName;
-	char *newBoneRefName;
-	int i;
+    char *newChannelName;
+    char *newBoneRefName;
+    int   i;
 
-	memset(boneData, 0, sizeof(boneData_t));
-	boneData->channel = skeletor_c::m_boneNames.RegisterChannel(fileData->name);
-	boneData->boneType = fileData->boneType;
+    memset(boneData, 0, sizeof(boneData_t));
+    boneData->channel  = skeletor_c::m_boneNames.RegisterChannel(fileData->name);
+    boneData->boneType = fileData->boneType;
 
-	if( boneData->boneType == SKELBONE_HOSEROT )
-	{
-		i = *( int * )&fileData->parent[ fileData->ofsBaseData + 4 ];
+    if (boneData->boneType == SKELBONE_HOSEROT) {
+        i = LittleLongPtr(fileData->parent[fileData->ofsBaseData + 4]);
 
-		if( i == 1 )
-		{
-			boneData->boneType = SKELBONE_HOSEROTPARENT;
-		}
-		else if( i == 2 )
-		{
-			boneData->boneType = SKELBONE_HOSEROTBOTH;
-		}
-	}
+        if (i == 1) {
+            boneData->boneType = SKELBONE_HOSEROTPARENT;
+        } else if (i == 2) {
+            boneData->boneType = SKELBONE_HOSEROTBOTH;
+        }
+    }
 
-	newChannelName = (char*)fileData + fileData->ofsChannelNames;
-	boneData->numChannels = skelBone_Base::GetNumChannels(boneData->boneType);
+    newChannelName        = (char *)fileData + fileData->ofsChannelNames;
+    boneData->numChannels = skelBone_Base::GetNumChannels(boneData->boneType);
 
-	for( i = 0; i < boneData->numChannels; i++ )
-	{
-		boneData->channelIndex[i] = skeletor_c::m_channelNames.RegisterChannel(newChannelName);
-		if (boneData->channelIndex[i] < 0)
-		{
-			SKEL_Warning( "Channel named %s not added. (Bone will not work without it)\n", newChannelName );
-			boneData->boneType = SKELBONE_ZERO;
-		}
+    for (i = 0; i < boneData->numChannels; i++) {
+        boneData->channelIndex[i] = skeletor_c::m_channelNames.RegisterChannel(newChannelName);
+        if (boneData->channelIndex[i] < 0) {
+            SKEL_Warning("Channel named %s not added. (Bone will not work without it)\n", newChannelName);
+            boneData->boneType = SKELBONE_ZERO;
+        }
 
-		newChannelName += strlen(newChannelName) + 1;
-	}
+        newChannelName += strlen(newChannelName) + 1;
+    }
 
-	newBoneRefName = (char*)fileData + fileData->ofsBoneNames;
-	boneData->numRefs = skelBone_Base::GetNumBoneRefs(boneData->boneType);
+    newBoneRefName    = (char *)fileData + fileData->ofsBoneNames;
+    boneData->numRefs = skelBone_Base::GetNumBoneRefs(boneData->boneType);
 
-	for( i = 0; i < boneData->numRefs; i++ )
-	{
-		boneData->refIndex[i] = skeletor_c::m_boneNames.RegisterChannel(newBoneRefName);
-		newBoneRefName += strlen(newBoneRefName) + 1;
-	}
+    for (i = 0; i < boneData->numRefs; i++) {
+        boneData->refIndex[i] = skeletor_c::m_boneNames.RegisterChannel(newBoneRefName);
+        newBoneRefName += strlen(newBoneRefName) + 1;
+    }
 
-	if( !strcmp( fileData->parent, SKEL_BONENAME_WORLD ) )
-	{
-		boneData->parent = -1;
-	}
-	else
-	{
-		boneData->parent = skeletor_c::m_boneNames.RegisterChannel( fileData->parent );
-	}
+    if (!strcmp(fileData->parent, SKEL_BONENAME_WORLD)) {
+        boneData->parent = -1;
+    } else {
+        boneData->parent = skeletor_c::m_boneNames.RegisterChannel(fileData->parent);
+    }
 
-	switch( boneData->boneType )
-	{
-	case SKELBONE_ROTATION:
-	{
-		float *baseData = ( float * )( ( char * )fileData + fileData->ofsBaseData );
-		CopyLittleLong(&boneData->offset[0], &baseData[0]);
-		CopyLittleLong(&boneData->offset[1], &baseData[1]);
-		CopyLittleLong(&boneData->offset[2], &baseData[2]);
-		break;
-	}
-	case SKELBONE_IKSHOULDER:
-	{
-		float* baseData = (float*)((char*)fileData + fileData->ofsBaseData);
-		CopyLittleLong(&boneData->offset[0], &baseData[4]);
-		CopyLittleLong(&boneData->offset[1], &baseData[5]);
-		CopyLittleLong(&boneData->offset[2], &baseData[6]);
-		break;
-	}
-	case SKELBONE_IKELBOW:
-	case SKELBONE_IKWRIST:
-	{
-		float* pBaseData = (float*)((char*)fileData + fileData->ofsBaseData);
-		vec3_t baseData;
-		CopyLittleLong(&baseData[0], &pBaseData[0]);
-		CopyLittleLong(&baseData[1], &pBaseData[1]);
-		CopyLittleLong(&baseData[2], &pBaseData[2]);
-		boneData->length = VectorLength(baseData);
-		break;
-	}
-	case SKELBONE_AVROT:
-	{
-		float* baseData = (float*)((char*)fileData + fileData->ofsBaseData);
-		CopyLittleLong(&boneData->length, &baseData[0]);
-		CopyLittleLong(&boneData->offset[0], &baseData[1]);
-		CopyLittleLong(&boneData->offset[1], &baseData[2]);
-		CopyLittleLong(&boneData->offset[2], &baseData[3]);
-		break;
-	}
-	case SKELBONE_HOSEROT:
-	case SKELBONE_HOSEROTBOTH:
-	case SKELBONE_HOSEROTPARENT:
-	{
-		float* baseData = (float*)((char*)fileData + fileData->ofsBaseData);
-		CopyLittleLong(&boneData->offset[0], &baseData[3]);
-		CopyLittleLong(&boneData->offset[1], &baseData[4]);
-		CopyLittleLong(&boneData->offset[2], &baseData[5]);
-		CopyLittleLong(&boneData->bendRatio, &baseData[0]);
-		CopyLittleLong(&boneData->bendMax, &baseData[1]);
-		CopyLittleLong(&boneData->spinRatio, &baseData[2]);
-		break;
-	}
-	default:
-		break;
-	}
+    switch (boneData->boneType) {
+    case SKELBONE_ROTATION:
+        {
+            float *baseData = (float *)((char *)fileData + fileData->ofsBaseData);
+            CopyLittleLong(&boneData->offset[0], &baseData[0]);
+            CopyLittleLong(&boneData->offset[1], &baseData[1]);
+            CopyLittleLong(&boneData->offset[2], &baseData[2]);
+            break;
+        }
+    case SKELBONE_IKSHOULDER:
+        {
+            float *baseData = (float *)((char *)fileData + fileData->ofsBaseData);
+            CopyLittleLong(&boneData->offset[0], &baseData[4]);
+            CopyLittleLong(&boneData->offset[1], &baseData[5]);
+            CopyLittleLong(&boneData->offset[2], &baseData[6]);
+            break;
+        }
+    case SKELBONE_IKELBOW:
+    case SKELBONE_IKWRIST:
+        {
+            float *pBaseData = (float *)((char *)fileData + fileData->ofsBaseData);
+            vec3_t baseData;
+            CopyLittleLong(&baseData[0], &pBaseData[0]);
+            CopyLittleLong(&baseData[1], &pBaseData[1]);
+            CopyLittleLong(&baseData[2], &pBaseData[2]);
+            boneData->length = VectorLength(baseData);
+            break;
+        }
+    case SKELBONE_AVROT:
+        {
+            float *baseData = (float *)((char *)fileData + fileData->ofsBaseData);
+            CopyLittleLong(&boneData->length, &baseData[0]);
+            CopyLittleLong(&boneData->offset[0], &baseData[1]);
+            CopyLittleLong(&boneData->offset[1], &baseData[2]);
+            CopyLittleLong(&boneData->offset[2], &baseData[3]);
+            break;
+        }
+    case SKELBONE_HOSEROT:
+    case SKELBONE_HOSEROTBOTH:
+    case SKELBONE_HOSEROTPARENT:
+        {
+            float *baseData = (float *)((char *)fileData + fileData->ofsBaseData);
+            CopyLittleLong(&boneData->offset[0], &baseData[3]);
+            CopyLittleLong(&boneData->offset[1], &baseData[4]);
+            CopyLittleLong(&boneData->offset[2], &baseData[5]);
+            CopyLittleLong(&boneData->bendRatio, &baseData[0]);
+            CopyLittleLong(&boneData->bendMax, &baseData[1]);
+            CopyLittleLong(&boneData->spinRatio, &baseData[2]);
+            break;
+        }
+    default:
+        break;
+    }
 }
 
 /*
@@ -151,395 +143,347 @@ void LoadBoneFromBuffer2( boneFileData_t *fileData, boneData_t *boneData )
 TIKI_CacheFileSkel
 ===============
 */
-void TIKI_CacheFileSkel( skelHeader_t *pHeader, skelcache_t *cache, int length )
+void TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length)
 {
-	skelHeaderGame_t* pSkel;
-	skelSurfaceGame_t* pGameSurf;
-	skelSurface_t* pSurf;
-	int i, j, k;
-	size_t nSurfBytes;
-	size_t nBoneBytes;
-	size_t nBoxBytes;
-	size_t nMorphBytes;
-    size_t nVertBytes;
-    size_t nTriBytes;
-	byte* start_gs_ptr;
-	byte* max_gs_ptr;
-	byte* gs_ptr = NULL;
+    skelHeaderGame_t  *pSkel;
+    skelSurfaceGame_t *pGameSurf;
+    skelSurface_t     *pSurf;
+    int                i, j, k;
+    size_t             nSurfBytes;
+    size_t             nBoneBytes;
+    size_t             nBoxBytes;
+    size_t             nMorphBytes;
+    size_t             nVertBytes;
+    size_t             nTriBytes;
+    byte              *start_gs_ptr;
+    byte              *max_gs_ptr;
+    byte              *gs_ptr = NULL;
 
-	pSurf = (skelSurface_t*)((byte*)pHeader + LittleLong(pHeader->ofsSurfaces));
-	nSurfBytes = 0;
+    pSurf      = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
+    nSurfBytes = 0;
 
-	int numSurfaces = 0, version;
-	CopyLittleLong(&numSurfaces, &pHeader->numSurfaces);
-	CopyLittleLong(&version, &pHeader->version);
+    for (i = 0; i < pHeader->numSurfaces; i++) {
+        skeletorVertex_t *pVert    = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
+        const int         numVerts = LongNoSwapPtr(&pSurf->numVerts);
 
-	for (i = 0; i < numSurfaces; i++)
-	{
-		skeletorVertex_t* pVert = (skeletorVertex_t*)((byte*)pSurf + LittleLongPtr(pSurf->ofsVerts));
-		const int numVerts = LittleLongPtr(pSurf->numVerts);
+        nVertBytes = 0;
+        for (j = 0; j < numVerts; j++) {
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
-		nVertBytes = 0;
-		for (j = 0; j < numVerts; j++)
-		{
-			const int numMorphs = LittleLongPtr(pVert->numMorphs);
-			const int numWeights = LittleLongPtr(pVert->numWeights);
+            int iOffset = sizeof(skeletorMorph_t) * numMorphs;
+            iOffset += sizeof(skelWeight_t) * numWeights;
+            iOffset += sizeof(skeletorVertex_t);
 
-			int iOffset = sizeof(skeletorMorph_t) * numMorphs;
-			iOffset += sizeof(skelWeight_t) * numWeights;
-			iOffset += sizeof(skeletorVertex_t);
+            nVertBytes += iOffset;
+            pVert = (skeletorVertex_t *)((byte *)pVert + iOffset);
+        }
 
-			nVertBytes += iOffset;
-			pVert = (skeletorVertex_t*)((byte*)pVert + iOffset);
-		}
+        nSurfBytes += sizeof(skelSurfaceGame_t);
+        // triangles
+        nSurfBytes += LongNoSwapPtr(&pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
+        nSurfBytes = PAD(nSurfBytes, sizeof(void *));
+        // vertices
+        nSurfBytes += nVertBytes;
+        nSurfBytes = PAD(nSurfBytes, sizeof(void *));
+        // collapse
+        nSurfBytes += numVerts * sizeof(skelIndex_t);
 
-		nSurfBytes += sizeof(skelSurfaceGame_t);
-		// triangles
-		nSurfBytes += LittleLongPtr(pSurf->numTriangles) * sizeof(skelIndex_t) * 3;
-		nSurfBytes = PAD(nSurfBytes, sizeof(void*));
-		// vertices
-		nSurfBytes += nVertBytes;
-		nSurfBytes = PAD(nSurfBytes, sizeof(void*));
-		// collapse
-		nSurfBytes += numVerts * sizeof(skelIndex_t);
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+            // collapse indices
+            nSurfBytes += numVerts * sizeof(skelIndex_t);
+        }
 
-		if (version > TIKI_SKB_HEADER_VER_3)
-		{
-			// collapse indices
-			nSurfBytes += numVerts * sizeof(skelIndex_t);
-		}
+        pSurf = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
+    }
 
-		pSurf = (skelSurface_t*)((byte*)pSurf + LittleLongPtr(pSurf->ofsEnd));
-	}
+    nBoneBytes  = pHeader->numBones * sizeof(boneData_t);
+    nBoxBytes   = 0;
+    nMorphBytes = 0;
 
-	nBoneBytes = LittleLong(pHeader->numBones) * sizeof(boneData_t);
-	nBoxBytes = 0;
-	nMorphBytes = 0;
+    if (pHeader->version > TIKI_SKB_HEADER_VERSION) {
+        char    *pMorphTargets;
+        intptr_t nLen;
 
-	if (version > TIKI_SKB_HEADER_VERSION)
-	{
-		char* pMorphTargets;
-		intptr_t nLen;
+        nBoxBytes     = pHeader->numBoxes * sizeof(skelHitBox_t);
+        pMorphTargets = (char *)((byte *)pHeader + pHeader->ofsMorphTargets);
 
-		nBoxBytes = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
-		const int ofsMorphTargets = LittleLongPtr(pHeader->ofsMorphTargets);
-		const int numMorphTargets = LittleLongPtr(pHeader->numMorphTargets);
-		pMorphTargets = (char*)((byte*)pHeader + ofsMorphTargets);
+        if (pHeader->ofsMorphTargets > 0 || (pHeader->ofsMorphTargets + pHeader->numMorphTargets) < length) {
+            for (i = 0; i < pHeader->numMorphTargets; i++) {
+                nLen = strlen(pMorphTargets) + 1;
+                nMorphBytes += nLen;
+                pMorphTargets += nLen;
+            }
+        } else {
+            nMorphBytes = pHeader->numMorphTargets;
+        }
+    } else if (pHeader->version == TIKI_SKB_HEADER_VERSION) {
+        nBoxBytes = pHeader->numBoxes * sizeof(skelHitBox_t);
+    }
 
-		if (ofsMorphTargets > 0 || (ofsMorphTargets + numMorphTargets) < length)
-		{
-			for (i = 0; i < numMorphTargets; i++)
-			{
-				nLen = strlen(pMorphTargets) + 1;
-				nMorphBytes += nLen;
-				pMorphTargets += nLen;
-			}
-		}
-		else
-		{
-			nMorphBytes = numMorphTargets;
-		}
-	}
-	else if (version == TIKI_SKB_HEADER_VERSION)
-	{
-		nBoxBytes = LittleLong(pHeader->numBoxes) * sizeof(skelHitBox_t);
-	}
+    cache->size = sizeof(skelHeaderGame_t);
+    cache->size += nSurfBytes;
+    cache->size = PAD(cache->size, sizeof(void *));
+    cache->size += nBoneBytes;
+    cache->size = PAD(cache->size, sizeof(void *));
+    cache->size += nBoxBytes;
+    cache->size = PAD(cache->size, sizeof(void *));
+    cache->size += nMorphBytes;
 
-	cache->size = sizeof(skelHeaderGame_t);
-	cache->size += nSurfBytes;
-	cache->size = PAD(cache->size, sizeof(void*));
-	cache->size += nBoneBytes;
-	cache->size = PAD(cache->size, sizeof(void*));
-	cache->size += nBoxBytes;
-	cache->size = PAD(cache->size, sizeof(void*));
-	cache->size += nMorphBytes;
+    cache->skel = pSkel = (skelHeaderGame_t *)TIKI_Alloc(cache->size);
+    byte *start_ptr     = (byte *)pSkel;
+    byte *max_ptr       = start_ptr + cache->size;
+    byte *ptr           = start_ptr + sizeof(skelHeaderGame_t);
 
-	cache->skel = pSkel = (skelHeaderGame_t*)TIKI_Alloc(cache->size);
-	byte* start_ptr = (byte*)pSkel;
-	byte* max_ptr = start_ptr + cache->size;
-	byte* ptr = start_ptr + sizeof(skelHeaderGame_t);
+    pSkel->version     = pHeader->version;
 
-	pSkel->version = version;
-	pSkel->numSurfaces = numSurfaces;
-	pSkel->numBones = LittleLong(pHeader->numBones);
-	pSkel->pSurfaces = (skelSurfaceGame_t*)ptr;
-	ptr += nSurfBytes;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	pSkel->pBones = (boneData_t*)ptr;
-	ptr += nBoneBytes;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	pSkel->numBoxes = LittleLong(pHeader->numBoxes);
-	pSkel->pBoxes = (skelHitBox_t*)ptr;
-	ptr += nBoxBytes;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	pSkel->pLOD = NULL;
-	pSkel->numMorphTargets = LittleLong(pHeader->numMorphTargets);
-	pSkel->pMorphTargets = (char*)ptr;
-	ptr += nMorphBytes;
-	ptr = (byte*)PADP(ptr, sizeof(void*));
-	memcpy(pSkel->name, pHeader->name, sizeof(pSkel->name));
+    //
+    // Added in 2.0
+    //
+    if (pHeader->version >= TIKI_SKD_HEADER_VERSION) {
+        pSkel->scale = pHeader->scale * 0.52;
+    } else {
+        pSkel->scale = 0.52;
+    }
 
-	for (i = 0; i < sizeof(pSkel->lodIndex) / sizeof(pSkel->lodIndex[0]); i++) {
-		CopyLittleLong(&pSkel->lodIndex[0], &pHeader->lodIndex[0]);
-	}
+    pSkel->numSurfaces = pHeader->numSurfaces;
+    pSkel->numBones    = pHeader->numBones;
+    pSkel->pSurfaces   = (skelSurfaceGame_t *)ptr;
+    ptr += nSurfBytes;
+    ptr           = (byte *)PADP(ptr, sizeof(void *));
+    pSkel->pBones = (boneData_t *)ptr;
+    ptr += nBoneBytes;
+    ptr             = (byte *)PADP(ptr, sizeof(void *));
+    pSkel->numBoxes = pHeader->numBoxes;
+    pSkel->pBoxes   = (skelHitBox_t *)ptr;
+    ptr += nBoxBytes;
+    ptr                    = (byte *)PADP(ptr, sizeof(void *));
+    pSkel->pLOD            = NULL;
+    pSkel->numMorphTargets = pHeader->numMorphTargets;
+    pSkel->pMorphTargets   = (char *)ptr;
+    ptr += nMorphBytes;
+    ptr = (byte *)PADP(ptr, sizeof(void *));
+    memcpy(pSkel->name, pHeader->name, sizeof(pSkel->name));
 
-	pSurf = (skelSurface_t*)((byte*)pHeader + LittleLongPtr(pHeader->ofsSurfaces));
-	pGameSurf = pSkel->pSurfaces;
+    for (i = 0; i < sizeof(pSkel->lodIndex) / sizeof(pSkel->lodIndex[0]); i++) {
+        pSkel->lodIndex[i] = LongNoSwapPtr(&pHeader->lodIndex[i]);
+    }
 
-	for(i = 0; i < numSurfaces; i++)
-	{
-		size_t nBytesUsed;
-		skeletorVertex_t* pVert;
-		const int numTriangles = LittleLongPtr(pSurf->numTriangles);
-		const int numVerts = LittleLongPtr(pSurf->numVerts);
+    pSurf     = (skelSurface_t *)((byte *)pHeader + pHeader->ofsSurfaces);
+    pGameSurf = pSkel->pSurfaces;
 
-		nTriBytes = numTriangles * sizeof(skelIndex_t) * 3;
-		nSurfBytes = 0;
-		if (version > TIKI_SKB_HEADER_VER_3) {
-			nSurfBytes = numVerts * sizeof(skelIndex_t);
-		}
+    for (i = 0; i < pHeader->numSurfaces; i++) {
+        size_t            nBytesUsed;
+        skeletorVertex_t *pVert;
+        const int         numTriangles = LongNoSwapPtr(&pSurf->numTriangles);
+        const int         numVerts     = LongNoSwapPtr(&pSurf->numVerts);
 
-		pVert = (skeletorVertex_t*)((byte*)pSurf + LittleLongPtr(pSurf->ofsVerts));
+        nTriBytes  = numTriangles * sizeof(skelIndex_t) * 3;
+        nSurfBytes = 0;
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+            nSurfBytes = numVerts * sizeof(skelIndex_t);
+        }
 
-		nVertBytes = 0;
-		for (j = 0; j < numVerts; j++)
-		{
-			const int numMorphs = LittleLongPtr(pVert->numMorphs);
-			const int numWeights = LittleLongPtr(pVert->numWeights);
+        pVert = (skeletorVertex_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
-			int iOffset = sizeof(skeletorMorph_t) * numMorphs;
-			iOffset += sizeof(skelWeight_t) * numWeights;
-			iOffset += sizeof(skeletorVertex_t);
+        nVertBytes = 0;
+        for (j = 0; j < numVerts; j++) {
+            const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+            const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
-			nVertBytes += iOffset;
-			pVert = (skeletorVertex_t*)((byte*)pVert + iOffset);
-		}
+            int iOffset = sizeof(skeletorMorph_t) * numMorphs;
+            iOffset += sizeof(skelWeight_t) * numWeights;
+            iOffset += sizeof(skeletorVertex_t);
 
-		nBytesUsed = sizeof(skelSurfaceGame_t);
-		nBytesUsed += nTriBytes;
-		nBytesUsed = PAD(nBytesUsed, sizeof(void*));
-		nBytesUsed += nVertBytes;
-		nBytesUsed = PAD(nBytesUsed, sizeof(void*));
-		nBytesUsed += nSurfBytes;
+            nVertBytes += iOffset;
+            pVert = (skeletorVertex_t *)((byte *)pVert + iOffset);
+        }
 
-		start_gs_ptr = (byte*)pGameSurf;
-		max_gs_ptr = (byte*)pGameSurf + nBytesUsed;
-		gs_ptr = start_gs_ptr + sizeof(skelSurfaceGame_t);
+        nBytesUsed = sizeof(skelSurfaceGame_t);
+        nBytesUsed += nTriBytes;
+        nBytesUsed = PAD(nBytesUsed, sizeof(void *));
+        nBytesUsed += nVertBytes;
+        nBytesUsed = PAD(nBytesUsed, sizeof(void *));
+        nBytesUsed += nSurfBytes;
 
-		pGameSurf->ident = LittleLongPtr(pSurf->ident);
-		pGameSurf->numTriangles = numTriangles;
-		pGameSurf->numVerts = numVerts;
-		pGameSurf->pStaticXyz = NULL;
-		pGameSurf->pStaticNormal = NULL;
-		pGameSurf->pStaticTexCoords = NULL;
-		pGameSurf->pTriangles = (skelIndex_t*)gs_ptr;
-		gs_ptr += nTriBytes;
-		gs_ptr = (byte*)PADP(gs_ptr, sizeof(void*));
-		pGameSurf->pVerts = (skeletorVertex_t*)gs_ptr;
-		gs_ptr += nVertBytes;
-		gs_ptr = (byte*)PADP(gs_ptr, sizeof(void*));
-		pGameSurf->pCollapse = (skelIndex_t*)gs_ptr;
-		gs_ptr += sizeof(*pGameSurf->pCollapse) * numVerts;
-		pGameSurf->pCollapseIndex = (skelIndex_t*)gs_ptr;
-		gs_ptr += sizeof(*pGameSurf->pCollapseIndex) * numVerts;
-		memcpy(pGameSurf->name, pSurf->name, sizeof(pGameSurf->name));
+        start_gs_ptr = (byte *)pGameSurf;
+        max_gs_ptr   = (byte *)pGameSurf + nBytesUsed;
+        gs_ptr       = start_gs_ptr + sizeof(skelSurfaceGame_t);
 
-		if (pGameSurf->numTriangles)
-		{
-			const int* pTriangles = (const int*)((byte*)pSurf + LittleLongPtr(pSurf->ofsTriangles));
-			for (j = 0; j < numTriangles * 3; j++)
-			{
-				CopyLittleLong(&pGameSurf->pTriangles[j], &pTriangles[j]);
-			}
-		}
-		else
-		{
-			pGameSurf->pTriangles = NULL;
-		}
+        pGameSurf->ident            = LongNoSwapPtr(&pSurf->ident);
+        pGameSurf->numTriangles     = numTriangles;
+        pGameSurf->numVerts         = numVerts;
+        pGameSurf->pStaticXyz       = NULL;
+        pGameSurf->pStaticNormal    = NULL;
+        pGameSurf->pStaticTexCoords = NULL;
+        pGameSurf->pTriangles       = (skelIndex_t *)gs_ptr;
+        gs_ptr += nTriBytes;
+        gs_ptr            = (byte *)PADP(gs_ptr, sizeof(void *));
+        pGameSurf->pVerts = (skeletorVertex_t *)gs_ptr;
+        gs_ptr += nVertBytes;
+        gs_ptr               = (byte *)PADP(gs_ptr, sizeof(void *));
+        pGameSurf->pCollapse = (skelIndex_t *)gs_ptr;
+        gs_ptr += sizeof(*pGameSurf->pCollapse) * numVerts;
+        if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+            pGameSurf->pCollapseIndex = (skelIndex_t *)gs_ptr;
+            gs_ptr += sizeof(*pGameSurf->pCollapseIndex) * numVerts;
+        }
 
-		if (pGameSurf->numVerts)
-        {
-			skeletorVertex_t* skelVert = pGameSurf->pVerts;
-			pVert = (skeletorVertex_t*)((char*)pSurf + LittleLongPtr(pSurf->ofsVerts));
+        memcpy(pGameSurf->name, pSurf->name, sizeof(pGameSurf->name));
 
-			for (j = 0; j < pGameSurf->numVerts; j++)
-			{
-				const int numMorphs = LittleLongPtr(pVert->numMorphs);
-				const int numWeights = LittleLongPtr(pVert->numWeights);
+        if (pGameSurf->numTriangles) {
+            const int *pTriangles = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsTriangles));
+            for (j = 0; j < numTriangles; j++) {
+                pGameSurf->pTriangles[j * 3 + 0] = LongNoSwapPtr(&pTriangles[j * 3 + 0]);
+                pGameSurf->pTriangles[j * 3 + 1] = LongNoSwapPtr(&pTriangles[j * 3 + 1]);
+                pGameSurf->pTriangles[j * 3 + 2] = LongNoSwapPtr(&pTriangles[j * 3 + 2]);
+            }
+        } else {
+            pGameSurf->pTriangles = NULL;
+        }
 
-				int iOffset = sizeof(skeletorMorph_t) * numMorphs;
-				iOffset += sizeof(skelWeight_t) * numWeights;
-				iOffset += sizeof(skeletorVertex_t);
+        if (pGameSurf->numVerts) {
+            skeletorVertex_t *skelVert = pGameSurf->pVerts;
+            pVert                      = (skeletorVertex_t *)((char *)pSurf + LongNoSwapPtr(&pSurf->ofsVerts));
 
-				skelVert->normal[0] = LittleFloatPtr(pVert->normal[0]);
-				skelVert->normal[1] = LittleFloatPtr(pVert->normal[1]);
-				skelVert->normal[2] = LittleFloatPtr(pVert->normal[2]);
-                skelVert->texCoords[0] = LittleFloatPtr(pVert->texCoords[0]);
-                skelVert->texCoords[1] = LittleFloatPtr(pVert->texCoords[1]);
-				skelVert->numWeights = numWeights;
-                skelVert->numMorphs = numMorphs;
+            for (j = 0; j < pGameSurf->numVerts; j++) {
+                const int numMorphs  = LongNoSwapPtr(&pVert->numMorphs);
+                const int numWeights = LongNoSwapPtr(&pVert->numWeights);
 
-				// copy morphs
-                skeletorMorph_t* pMorph = (skeletorMorph_t*)((byte*)pVert + sizeof(skeletorVertex_t));
-                skeletorMorph_t* skelMorph = (skeletorMorph_t*)((byte*)skelVert + sizeof(skeletorVertex_t));
-                for (k = 0; k < pVert->numMorphs; k++, pMorph++, skelMorph++)
-                {
-					skelMorph->morphIndex = LittleLongPtr(pMorph->morphIndex);
-					skelMorph->offset[0] = LittleFloatPtr(pMorph->offset[0]);
-					skelMorph->offset[1] = LittleFloatPtr(pMorph->offset[1]);
-					skelMorph->offset[2] = LittleFloatPtr(pMorph->offset[2]);
+                int iOffset = sizeof(skeletorMorph_t) * numMorphs;
+                iOffset += sizeof(skelWeight_t) * numWeights;
+                iOffset += sizeof(skeletorVertex_t);
+
+                skelVert->normal[0]    = FloatNoSwapPtr(&pVert->normal[0]);
+                skelVert->normal[1]    = FloatNoSwapPtr(&pVert->normal[1]);
+                skelVert->normal[2]    = FloatNoSwapPtr(&pVert->normal[2]);
+                skelVert->texCoords[0] = FloatNoSwapPtr(&pVert->texCoords[0]);
+                skelVert->texCoords[1] = FloatNoSwapPtr(&pVert->texCoords[1]);
+                skelVert->numWeights   = numWeights;
+                skelVert->numMorphs    = numMorphs;
+
+                // copy morphs
+                skeletorMorph_t *pMorph    = (skeletorMorph_t *)((byte *)pVert + sizeof(skeletorVertex_t));
+                skeletorMorph_t *skelMorph = (skeletorMorph_t *)((byte *)skelVert + sizeof(skeletorVertex_t));
+                for (k = 0; k < numMorphs; k++, pMorph++, skelMorph++) {
+                    skelMorph->morphIndex = LongNoSwapPtr(&pMorph->morphIndex);
+                    skelMorph->offset[0]  = FloatNoSwapPtr(&pMorph->offset[0]);
+                    skelMorph->offset[1]  = FloatNoSwapPtr(&pMorph->offset[1]);
+                    skelMorph->offset[2]  = FloatNoSwapPtr(&pMorph->offset[2]);
                 }
 
-				skelWeight_t* pWeight = (skelWeight_t * )((byte*)pMorph);
-				skelWeight_t* skelWeight = (skelWeight_t*)((byte*)skelMorph);
-				for (k = 0; k < pVert->numWeights; k++, skelWeight++, pWeight++)
-				{
-                    skelWeight->boneIndex = LittleLongPtr(pWeight->boneIndex);
-                    skelWeight->boneWeight = LittleFloatPtr(pWeight->boneWeight);
-                    skelWeight->offset[0] = LittleFloatPtr(pWeight->offset[0]);
-                    skelWeight->offset[1] = LittleFloatPtr(pWeight->offset[1]);
-                    skelWeight->offset[2] = LittleFloatPtr(pWeight->offset[2]);
-				}
+                skelWeight_t *pWeight    = (skelWeight_t *)((byte *)pMorph);
+                skelWeight_t *skelWeight = (skelWeight_t *)((byte *)skelMorph);
+                for (k = 0; k < numWeights; k++, skelWeight++, pWeight++) {
+                    skelWeight->boneIndex  = LongNoSwapPtr(&pWeight->boneIndex);
+                    skelWeight->boneWeight = FloatNoSwapPtr(&pWeight->boneWeight);
+                    skelWeight->offset[0]  = FloatNoSwapPtr(&pWeight->offset[0]);
+                    skelWeight->offset[1]  = FloatNoSwapPtr(&pWeight->offset[1]);
+                    skelWeight->offset[2]  = FloatNoSwapPtr(&pWeight->offset[2]);
+                }
 
-                pVert = (skeletorVertex_t*)((byte*)pVert + iOffset);
-				skelVert = (skeletorVertex_t*)((byte*)skelVert + iOffset);
-			}
+                pVert    = (skeletorVertex_t *)((byte *)pVert + iOffset);
+                skelVert = (skeletorVertex_t *)((byte *)skelVert + iOffset);
+            }
 
-			assert((byte*)skelVert - (byte*)pGameSurf <= (byte*)pGameSurf->pCollapse - (byte*)pGameSurf);
+            assert((byte *)skelVert - (byte *)pGameSurf <= (byte *)pGameSurf->pCollapse - (byte *)pGameSurf);
 
-			const int* pCollapse = (const int*)((byte*)pSurf + LittleLongPtr(pSurf->ofsCollapse));
-			for (j = 0; j < numVerts; j++)
-			{
-				pGameSurf->pCollapse[j] = LittleLongPtr(pCollapse[j]);
-			}
+            const int *pCollapse = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapse));
+            for (j = 0; j < numVerts; j++) {
+                pGameSurf->pCollapse[j] = LongNoSwapPtr(&pCollapse[j]);
+            }
 
-			if (version > TIKI_SKB_HEADER_VER_3)
-			{
-				const int* pCollapseIndex = (const int*)((byte*)pSurf + LittleLongPtr(pSurf->ofsCollapseIndex));
-				for (j = 0; j < numVerts; j++)
-				{
-					pGameSurf->pCollapseIndex[j] = LittleLongPtr(pCollapseIndex[j]);
-				}
-			}
-			else
-			{
-				pGameSurf->pCollapseIndex = NULL;
-			}
-		}
-		else
-		{
-			pGameSurf->pVerts = NULL;
-			pGameSurf->pCollapse = NULL;
-			pGameSurf->pCollapseIndex = NULL;
-		}
+            if (pHeader->version > TIKI_SKB_HEADER_VER_3) {
+                const int *pCollapseIndex = (const int *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsCollapseIndex));
+                for (j = 0; j < numVerts; j++) {
+                    pGameSurf->pCollapseIndex[j] = LongNoSwapPtr(&pCollapseIndex[j]);
+                }
+            } else {
+                pGameSurf->pCollapseIndex = NULL;
+            }
+        } else {
+            pGameSurf->pVerts         = NULL;
+            pGameSurf->pCollapse      = NULL;
+            pGameSurf->pCollapseIndex = NULL;
+        }
 
-		if (i != numSurfaces - 1)
-		{
-			pGameSurf->pNext = (skelSurfaceGame_t*)gs_ptr;
-			pGameSurf = pGameSurf->pNext;
-			pSurf = (skelSurface_t*)((byte*)pSurf + LittleLongPtr(pSurf->ofsEnd));
-		}
-	}
+        if (i != pHeader->numSurfaces - 1) {
+            pGameSurf->pNext = (skelSurfaceGame_t *)gs_ptr;
+            pGameSurf        = pGameSurf->pNext;
+            pSurf            = (skelSurface_t *)((byte *)pSurf + LongNoSwapPtr(&pSurf->ofsEnd));
+        }
+    }
 
     pGameSurf->pNext = NULL;
 
-    assert(((byte*)pGameSurf - (byte*)pSkel) <= cache->size);
+    assert(((byte *)pGameSurf - (byte *)pSkel) <= cache->size);
 
-	if (nBoneBytes)
-	{
-		if (version <= TIKI_SKB_HEADER_VERSION)
-		{
-			skelBoneName_t* TIKI_bones = (skelBoneName_t*)((byte*)pHeader + LittleLongPtr(pHeader->ofsBones));
-			for (i = 0; i < pSkel->numBones; i++)
-			{
-				const char* boneName;
+    if (nBoneBytes) {
+        if (pHeader->version <= TIKI_SKB_HEADER_VERSION) {
+            skelBoneName_t *TIKI_bones = (skelBoneName_t *)((byte *)pHeader + LongNoSwapPtr(&pHeader->ofsBones));
+            for (i = 0; i < pSkel->numBones; i++) {
+                const char *boneName;
 
-				if (TIKI_bones->parent == -1)
-				{
-					boneName = SKEL_BONENAME_WORLD;
-				}
-				else
-				{
-					boneName = TIKI_bones[TIKI_bones->parent].name;
-				}
+                if (TIKI_bones->parent == -1) {
+                    boneName = SKEL_BONENAME_WORLD;
+                } else {
+                    boneName = TIKI_bones[TIKI_bones->parent].name;
+                }
 
-				CreatePosRotBoneData(TIKI_bones->name, boneName, &pSkel->pBones[i]);
-				TIKI_bones++;
-			}
-		}
-		else
-		{
-			boneFileData_t* boneBuffer = (boneFileData_t*)((byte*)pHeader + LittleLongPtr(pHeader->ofsBones));
-			for (i = 0; i < pSkel->numBones; i++)
-			{
-				LoadBoneFromBuffer2(boneBuffer, &pSkel->pBones[i]);
-				boneBuffer = (boneFileData_t*)((byte*)boneBuffer + LittleLongPtr(boneBuffer->ofsEnd));
-			}
-		}
-	}
-	else
-	{
-		pSkel->numBones = 0;
-		pSkel->pBones = NULL;
-	}
+                CreatePosRotBoneData(TIKI_bones->name, boneName, &pSkel->pBones[i]);
+                TIKI_bones++;
+            }
+        } else {
+            boneFileData_t *boneBuffer = (boneFileData_t *)((byte *)pHeader + LongNoSwapPtr(&pHeader->ofsBones));
+            for (i = 0; i < pSkel->numBones; i++) {
+                LoadBoneFromBuffer2(boneBuffer, &pSkel->pBones[i]);
+                boneBuffer = (boneFileData_t *)((byte *)boneBuffer + LongNoSwapPtr(&boneBuffer->ofsEnd));
+            }
+        }
+    } else {
+        pSkel->numBones = 0;
+        pSkel->pBones   = NULL;
+    }
 
-	if (version <= TIKI_SKB_HEADER_VER_3)
-	{
-		pSkel->numBoxes = 0;
-		pSkel->pBoxes = NULL;
-		pSkel->numMorphTargets = 0;
-		pSkel->pMorphTargets = NULL;
-		return;
-	}
+    if (pHeader->version <= TIKI_SKB_HEADER_VER_3) {
+        pSkel->numBoxes        = 0;
+        pSkel->pBoxes          = NULL;
+        pSkel->numMorphTargets = 0;
+        pSkel->pMorphTargets   = NULL;
+        return;
+    }
 
-	if (nBoxBytes)
-	{
-		const int ofsBoxes = LittleLongPtr(pHeader->ofsBoxes);
+    if (nBoxBytes) {
+        if (pHeader->ofsBoxes <= 0 || (nBoxBytes + pHeader->ofsBoxes) > length) {
+            Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
+            pSkel->numBoxes = 0;
+            pSkel->pBoxes   = NULL;
+        } else {
+            memcpy(pSkel->pBoxes, ((byte *)pHeader + pHeader->ofsBoxes), nBoxBytes);
+        }
+    } else {
+        pSkel->numBoxes = 0;
+        pSkel->pBoxes   = NULL;
+    }
 
-		if (ofsBoxes <= 0 || (nBoxBytes + ofsBoxes) >= length)
-		{
-			Com_Printf("^~^~^ Box data is corrupted for '%s'\n", cache->path);
-			pSkel->numMorphTargets = 0;
-			pSkel->pMorphTargets = NULL;
-		}
-		else
-		{
-			memcpy(pSkel->pBoxes, ((byte*)pHeader + ofsBoxes), nBoxBytes);
-		}
-	}
-	else
-	{
-		pSkel->numBoxes = 0;
-		pSkel->pBoxes = NULL;
-	}
+    if (pHeader->version <= TIKI_SKB_HEADER_VERSION) {
+        pSkel->numMorphTargets = 0;
+        pSkel->pMorphTargets   = NULL;
+        return;
+    }
 
-	if (version <= TIKI_SKB_HEADER_VERSION)
-	{
-		pSkel->numMorphTargets = 0;
-		pSkel->pMorphTargets = NULL;
-		return;
-	}
-
-	if (nMorphBytes)
-	{
-		const int ofsMorphTargets = LittleLongPtr(pHeader->ofsBoxes);
-
-		if (ofsMorphTargets <= 0 || (nMorphBytes + ofsMorphTargets) >= length)
-		{
-			Com_Printf("^~^~^ Morph targets data is corrupted for '%s'\n", cache->path);
-			pSkel->numMorphTargets = 0;
-			pSkel->pMorphTargets = NULL;
-		}
-		else
-		{
-			memcpy(pSkel->pMorphTargets, ((byte*)pHeader + ofsMorphTargets), nMorphBytes);
-		}
-	}
-	else
-	{
-		pSkel->numMorphTargets = 0;
-		pSkel->pMorphTargets = NULL;
-	}
+    if (nMorphBytes) {
+        if (pHeader->ofsMorphTargets <= 0 || (nMorphBytes + pHeader->ofsMorphTargets) > length) {
+            Com_Printf("^~^~^ Morph targets data is corrupted for '%s'\n", cache->path);
+            pSkel->numMorphTargets = 0;
+            pSkel->pMorphTargets   = NULL;
+        } else {
+            memcpy(pSkel->pMorphTargets, ((byte *)pHeader + pHeader->ofsMorphTargets), nMorphBytes);
+        }
+    } else {
+        pSkel->numMorphTargets = 0;
+        pSkel->pMorphTargets   = NULL;
+    }
 }
 
 /*
@@ -547,67 +491,59 @@ void TIKI_CacheFileSkel( skelHeader_t *pHeader, skelcache_t *cache, int length )
 TIKI_SortLOD
 ===============
 */
-void TIKI_SortLOD( skelHeaderGame_t *skelmodel )
+void TIKI_SortLOD(skelHeaderGame_t *skelmodel)
 {
-	skelSurfaceGame_t* surf;
-	int render_count;
-	int nTriVerts;
-	int i;
-	int collapse[TIKI_MAX_VERTEXES];
-	int iTemp;
+    skelSurfaceGame_t *surf;
+    int                render_count;
+    int                nTriVerts;
+    int                i;
+    int                collapse[TIKI_MAX_VERTEXES];
+    int                iTemp;
 
-	for (surf = skelmodel->pSurfaces; surf != NULL; surf = surf->pNext)
-	{
-		for (i = 0; i < surf->numVerts; i++) {
-			collapse[i] = i;
-		}
+    for (surf = skelmodel->pSurfaces; surf != NULL; surf = surf->pNext) {
+        for (i = 0; i < surf->numVerts; i++) {
+            collapse[i] = i;
+        }
 
-		render_count = surf->numTriangles * 3;
+        render_count = surf->numTriangles * 3;
 
-		nTriVerts = surf->numVerts - 1;
-		while (nTriVerts > 1)
-		{
-			for (i = nTriVerts; i > 1; i--)
-			{
-				if (surf->pCollapseIndex[i - 1] != surf->pCollapseIndex[i]) {
-					break;
-				}
-			}
+        nTriVerts = surf->numVerts - 1;
+        while (nTriVerts > 1) {
+            for (i = nTriVerts; i > 1; i--) {
+                if (surf->pCollapseIndex[i - 1] != surf->pCollapseIndex[i]) {
+                    break;
+                }
+            }
 
-			nTriVerts = i - 1;
-			for (; i < surf->numVerts; i++)
-			{
-				collapse[i] = collapse[surf->pCollapse[i]];
-			}
+            nTriVerts = i - 1;
+            for (; i < surf->numVerts; i++) {
+                collapse[i] = collapse[surf->pCollapse[i]];
+            }
 
-			i = 0;
-			while (i < render_count)
-			{
-				if (collapse[surf->pTriangles[i]] != collapse[surf->pTriangles[i + 1]] &&
-					collapse[surf->pTriangles[i + 1]] != collapse[surf->pTriangles[i + 2]] &&
-					collapse[surf->pTriangles[i + 2]] != collapse[surf->pTriangles[i]])
-				{
-					i += 3;
-				}
-				else
-				{
-					render_count -= 3;
+            i = 0;
+            while (i < render_count) {
+                if (collapse[surf->pTriangles[i]] != collapse[surf->pTriangles[i + 1]]
+                    && collapse[surf->pTriangles[i + 1]] != collapse[surf->pTriangles[i + 2]]
+                    && collapse[surf->pTriangles[i + 2]] != collapse[surf->pTriangles[i]]) {
+                    i += 3;
+                } else {
+                    render_count -= 3;
 
-					iTemp = surf->pTriangles[i];
-					surf->pTriangles[i] = surf->pTriangles[render_count];
-					surf->pTriangles[render_count] = iTemp;
+                    iTemp                          = surf->pTriangles[i];
+                    surf->pTriangles[i]            = surf->pTriangles[render_count];
+                    surf->pTriangles[render_count] = iTemp;
 
-					iTemp = surf->pTriangles[i + 1];
-					surf->pTriangles[i + 1] = surf->pTriangles[render_count + 1];
-					surf->pTriangles[render_count + 1] = iTemp;
+                    iTemp                              = surf->pTriangles[i + 1];
+                    surf->pTriangles[i + 1]            = surf->pTriangles[render_count + 1];
+                    surf->pTriangles[render_count + 1] = iTemp;
 
-					iTemp = surf->pTriangles[i + 2];
-					surf->pTriangles[i + 2] = surf->pTriangles[render_count + 2];
-					surf->pTriangles[render_count + 2] = iTemp;
-				}
-			}
-		}
-	}
+                    iTemp                              = surf->pTriangles[i + 2];
+                    surf->pTriangles[i + 2]            = surf->pTriangles[render_count + 2];
+                    surf->pTriangles[render_count + 2] = iTemp;
+                }
+            }
+        }
+    }
 }
 
 /*
@@ -615,142 +551,180 @@ void TIKI_SortLOD( skelHeaderGame_t *skelmodel )
 TIKI_LoadSKB
 ===============
 */
-qboolean TIKI_LoadSKB( const char *path, skelcache_t *cache )
+qboolean TIKI_LoadSKB(const char *path, skelcache_t *cache)
 {
-	int i, j, k;
-	skelHeader_t *pheader;
-	skelSurface_t *surf;
-	int version;
-	unsigned int header;
-	int length;
-	char *buf;
-	int totalVerts;
-	int newLength;
-	skelHeader_t *newHeader;
-	skelSurface_t *oldSurf;
-	skelSurface_t *newSurf;
+    int            i, j, k;
+    skelHeader_t  *pheader;
+    skelSurface_t *surf;
+    int            version;
+    unsigned int   header;
+    int            length;
+    char          *buf;
+    int            totalVerts;
+    int            newLength;
+    skelHeader_t  *newHeader;
+    skelSurface_t *oldSurf;
+    skelSurface_t *newSurf;
 
-	length = TIKI_ReadFileEx( path, ( void ** )&buf, true );
-	if( length < 0 )
-	{
-		TIKI_DPrintf( "Tiki:LoadAnim Couldn't load %s\n", path );
-		return qfalse;
-	}
+    length = TIKI_ReadFileEx(path, (void **)&buf, true);
+    if (length < 0) {
+        TIKI_DPrintf("Tiki:LoadAnim Couldn't load %s\n", path);
+        return qfalse;
+    }
 
-	pheader = ( skelHeader_t * )TIKI_Alloc( length );
-	memcpy( pheader, buf, length );
-	TIKI_FreeFile( buf );
-	memset( cache, 0, sizeof( skelcache_t ) );
-	strncpy( cache->path, path, sizeof( cache->path ) );
+    pheader = (skelHeader_t *)TIKI_Alloc(length);
+    memcpy(pheader, buf, length);
+    TIKI_FreeFile(buf);
+    memset(cache, 0, sizeof(skelcache_t));
+    strncpy(cache->path, path, sizeof(cache->path));
 
-	header = LittleLong( pheader->ident );
-	if( header != TIKI_SKB_HEADER_IDENT )
-	{
-		TIKI_Error( "TIKI_LoadSKB: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path );
-		TIKI_Free( pheader );
-		return qfalse;
-	}
+    header = pheader->ident;
+    if (header != TIKI_SKB_HEADER_IDENT) {
+        TIKI_Error("TIKI_LoadSKB: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path);
+        TIKI_Free(pheader);
+        return qfalse;
+    }
 
-	version = LittleLong( pheader->version );
-	if( version != TIKI_SKB_HEADER_VER_3 && version != TIKI_SKB_HEADER_VERSION )
-	{
-		TIKI_Error( "TIKI_LoadSKB: %s has wrong version (%i should be %i or %i)\n", path, version, TIKI_SKB_HEADER_VER_3, TIKI_SKB_HEADER_VERSION );
-		TIKI_Free( pheader );
-		return qfalse;
-	}
+    version = LittleLong(pheader->version);
+    if (version != TIKI_SKB_HEADER_VER_3 && version != TIKI_SKB_HEADER_VERSION) {
+        TIKI_Error(
+            "TIKI_LoadSKB: %s has wrong version (%i should be %i or %i)\n",
+            path,
+            version,
+            TIKI_SKB_HEADER_VER_3,
+            TIKI_SKB_HEADER_VERSION
+        );
+        TIKI_Free(pheader);
+        return qfalse;
+    }
 
-	surf = ( skelSurface_t * )( ( char * )pheader + pheader->ofsSurfaces );
-	for( i = 0; i < pheader->numSurfaces; i++ )
-	{
-		if( surf->numVerts > TIKI_MAX_VERTEXES )
-		{
-			TIKI_Error( "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts );
-			TIKI_Free( pheader );
-			return qfalse;
-		}
+    TIKI_SwapSkel(pheader);
 
-		if( surf->numTriangles > TIKI_MAX_TRIANGLES )
-		{
-			TIKI_Error( "TIKI_LoadSKB: %s has more than %i triangles on a surface (%i)", path, TIKI_MAX_TRIANGLES, surf->numTriangles );
-			TIKI_Free( pheader );
-			return qfalse;
-		}
+    surf = (skelSurface_t *)((char *)pheader + pheader->ofsSurfaces);
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        int numSurfVerts, numSurfTriangles;
 
-		surf = ( skelSurface_t * )( ( char * )surf + surf->ofsEnd );
-	}
+        numSurfVerts     = LongNoSwapPtr(&surf->numVerts);
+        numSurfTriangles = LongNoSwapPtr(&surf->numTriangles);
 
-	if( pheader->numBones > TIKI_MAX_BONES )
-	{
-		TIKI_Error( "TIKI_LoadSKB: %s has more than %i bones (%i)\n", path, TIKI_MAX_BONES, pheader->numBones );
-		TIKI_Free( pheader );
-		return qfalse;
-	}
+        if (numSurfVerts > TIKI_MAX_VERTEXES) {
+            TIKI_Error(
+                "TIKI_LoadSKB: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, numSurfVerts
+            );
+            TIKI_Free(pheader);
+            return qfalse;
+        }
 
-	totalVerts = 0;
-	surf = ( skelSurface_t * )( ( byte * )pheader + pheader->ofsSurfaces );
-	for( i = 0; i < pheader->numSurfaces; i++ )
-	{
-		totalVerts += surf->numVerts;
-		surf = ( skelSurface_t * )( ( byte * )surf + surf->ofsEnd );
-	}
+        if (numSurfTriangles > TIKI_MAX_TRIANGLES) {
+            TIKI_Error(
+                "TIKI_LoadSKB: %s has more than %i triangles on a surface (%i)",
+                path,
+                TIKI_MAX_TRIANGLES,
+                numSurfTriangles
+            );
+            TIKI_Free(pheader);
+            return qfalse;
+        }
 
-	newLength = totalVerts * sizeof( unsigned int );
-	newHeader = ( skelHeader_t * )TIKI_Alloc( length + newLength );
-	memcpy( newHeader, pheader, pheader->ofsSurfaces );
+        surf = (skelSurface_t *)((char *)surf + LongNoSwapPtr(&surf->ofsEnd));
+    }
 
-	if( newHeader->ofsBones > newHeader->ofsSurfaces ) newHeader->ofsBones += newLength;
-	if( newHeader->ofsBoxes > newHeader->ofsSurfaces ) newHeader->ofsBoxes += newLength;
-	if( newHeader->ofsEnd > newHeader->ofsSurfaces ) newHeader->ofsEnd += newLength;
+    if (pheader->numBones > TIKI_MAX_BONES) {
+        TIKI_Error("TIKI_LoadSKB: %s has more than %i bones (%i)\n", path, TIKI_MAX_BONES, pheader->numBones);
+        TIKI_Free(pheader);
+        return qfalse;
+    }
 
-	oldSurf = ( skelSurface_t * )( ( byte * )pheader + pheader->ofsSurfaces );
-	newSurf = ( skelSurface_t * )( ( byte * )newHeader + newHeader->ofsSurfaces );
+    totalVerts = 0;
+    surf       = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        totalVerts += LongNoSwapPtr(&surf->numVerts);
+        surf = (skelSurface_t *)((byte *)surf + LongNoSwapPtr(&surf->ofsEnd));
+    }
 
-	for( i = 0; i < pheader->numSurfaces; i++ )
-	{
-		skeletorVertex_t *newVerts;
-		skelVertex_t *oldVerts;
+    newLength = totalVerts * sizeof(unsigned int);
+    newHeader = (skelHeader_t *)TIKI_Alloc(length + newLength);
+    memcpy(newHeader, pheader, pheader->ofsSurfaces);
 
-		memcpy( newSurf, oldSurf, oldSurf->ofsVerts );
-		if( newSurf->ofsCollapse > newSurf->ofsVerts ) newSurf->ofsCollapse += sizeof( unsigned int ) * newSurf->numVerts;
-		if( newSurf->ofsCollapseIndex > newSurf->ofsVerts ) newSurf->ofsCollapse += sizeof( unsigned int ) * newSurf->numVerts;
-		if( newSurf->ofsTriangles > newSurf->ofsVerts ) newSurf->ofsTriangles += sizeof( unsigned int ) * newSurf->numVerts;
-		if( newSurf->ofsEnd > newSurf->ofsVerts ) newSurf->ofsEnd += sizeof( unsigned int ) * newSurf->numVerts;
+    if (newHeader->ofsBones > newHeader->ofsSurfaces) {
+        newHeader->ofsBones += newLength;
+    }
+    if (newHeader->ofsBoxes > newHeader->ofsSurfaces) {
+        newHeader->ofsBoxes += newLength;
+    }
+    if (newHeader->ofsEnd > newHeader->ofsSurfaces) {
+        newHeader->ofsEnd += newLength;
+    }
 
-		oldVerts = ( skelVertex_t * )( ( byte * )oldSurf + oldSurf->ofsVerts );
-		newVerts = ( skeletorVertex_t * )( ( byte * )newSurf + newSurf->ofsVerts );
+    oldSurf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
+    newSurf = (skelSurface_t *)((byte *)newHeader + newHeader->ofsSurfaces);
 
-		for( j = 0; j < oldSurf->numVerts; j++ )
-		{
-			VectorCopy( oldVerts->normal, newVerts->normal );
-			newVerts->texCoords[ 0 ] = oldVerts->texCoords[ 0 ];
-			newVerts->texCoords[ 1 ] = oldVerts->texCoords[ 1 ];
-			newVerts->numMorphs = 0;
-			newVerts->numWeights = oldVerts->numWeights;
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        skeletorVertex_t *newVerts;
+        skelVertex_t     *oldVerts;
+        int               numVerts;
 
-			skelWeight_t *newWeights = ( skelWeight_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) );
+        memcpy(newSurf, oldSurf, oldSurf->ofsVerts);
+        if (newSurf->ofsCollapse > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsCollapse) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapse, &newOffset, sizeof(newSurf->ofsCollapse));
+        }
+        if (newSurf->ofsCollapseIndex > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsCollapseIndex) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsCollapseIndex, &newOffset, sizeof(newSurf->ofsCollapseIndex));
+        }
+        if (newSurf->ofsTriangles > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset =
+                LongNoSwapPtr(&newSurf->ofsTriangles) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsTriangles, &newOffset, sizeof(newSurf->ofsTriangles));
+        }
+        if (newSurf->ofsEnd > LongNoSwapPtr(&newSurf->ofsVerts)) {
+            int newOffset = LongNoSwapPtr(&newSurf->ofsEnd) + sizeof(unsigned int) * LongNoSwapPtr(&newSurf->numVerts);
+            memcpy(&newSurf->ofsEnd, &newOffset, sizeof(newSurf->ofsEnd));
+        }
 
-			for( k = 0; k < oldVerts->numWeights; k++ )
-			{
-				memcpy( newWeights, &oldVerts->weights[ k ], sizeof( skelWeight_t ) );
-				newWeights++;
-			}
+        oldVerts = (skelVertex_t *)((byte *)oldSurf + oldSurf->ofsVerts);
+        newVerts = (skeletorVertex_t *)((byte *)newSurf + newSurf->ofsVerts);
 
-			oldVerts = ( skelVertex_t * )( ( byte * )oldVerts + sizeof( skelWeight_t ) * oldVerts->numWeights + ( sizeof( skelVertex_t ) - sizeof( skelWeight_t ) ) );
-			newVerts = ( skeletorVertex_t * )( ( byte * )newVerts + sizeof( skeletorVertex_t ) + sizeof( skelWeight_t ) * newVerts->numWeights );
-		}
+        numVerts = LongNoSwapPtr(&oldSurf->numVerts);
+        for (j = 0; j < numVerts; j++) {
+            int numMorphs, numWeights;
 
-		memcpy( newVerts, oldVerts, oldSurf->ofsEnd - ( ( byte * )oldVerts - ( byte * )oldSurf ) );
-		oldSurf = ( skelSurface_t * )( ( byte * )oldSurf + oldSurf->ofsEnd );
-		newSurf = ( skelSurface_t * )( ( byte * )newSurf + newSurf->ofsEnd );
-	}
+            memcpy(newVerts->normal, oldVerts->normal, sizeof(newVerts->normal));
+            memcpy(newVerts->texCoords, oldVerts->texCoords, sizeof(newVerts->texCoords));
 
-	memcpy( newSurf, oldSurf, pheader->ofsEnd - ( ( char * )oldSurf - ( char * )pheader ) );
-	TIKI_Free( pheader );
-	TIKI_CacheFileSkel( newHeader, cache, length );
-	TIKI_Free( newHeader );
-	cache_numskel++;
+            numMorphs  = 0;
+            numWeights = LongNoSwapPtr(&oldVerts->numWeights);
+            memcpy(&newVerts->numMorphs, &numMorphs, sizeof(newVerts->numMorphs));
+            memcpy(&newVerts->numWeights, &numWeights, sizeof(newVerts->numWeights));
 
-	return qtrue;
+            skelWeight_t *newWeights = (skelWeight_t *)((byte *)newVerts + sizeof(skeletorVertex_t));
+
+            for (k = 0; k < numWeights; k++) {
+                memcpy(newWeights, &oldVerts->weights[k], sizeof(skelWeight_t));
+                newWeights++;
+            }
+
+            oldVerts = (skelVertex_t *)((byte *)oldVerts + sizeof(skelWeight_t) * numWeights
+                                        + (sizeof(skelVertex_t) - sizeof(skelWeight_t)));
+            newVerts =
+                (skeletorVertex_t *)((byte *)newVerts + sizeof(skeletorVertex_t) + sizeof(skelWeight_t) * numWeights);
+        }
+
+        memcpy(newVerts, oldVerts, LongNoSwapPtr(&oldSurf->ofsEnd) - ((byte *)oldVerts - (byte *)oldSurf));
+        oldSurf = (skelSurface_t *)((byte *)oldSurf + LongNoSwapPtr(&oldSurf->ofsEnd));
+        newSurf = (skelSurface_t *)((byte *)newSurf + LongNoSwapPtr(&newSurf->ofsEnd));
+    }
+
+    memcpy(newSurf, oldSurf, pheader->ofsEnd - ((char *)oldSurf - (char *)pheader));
+    TIKI_Free(pheader);
+    TIKI_CacheFileSkel(newHeader, cache, length);
+    TIKI_Free(newHeader);
+    cache_numskel++;
+
+    return qtrue;
 }
 
 /*
@@ -758,16 +732,15 @@ qboolean TIKI_LoadSKB( const char *path, skelcache_t *cache )
 SaveLODFile
 ===============
 */
-void SaveLODFile( const char *path, lodControl_t *LOD )
+void SaveLODFile(const char *path, lodControl_t *LOD)
 {
-	fileHandle_t file = FS_FOpenFileWrite( path );
-	if( !file )
-	{
-		TIKI_Warning( "SaveLODFile: Failed to open file %s\n", path );
-		return;
-	}
+    fileHandle_t file = FS_FOpenFileWrite(path);
+    if (!file) {
+        TIKI_Warning("SaveLODFile: Failed to open file %s\n", path);
+        return;
+    }
 
-	FS_Write( LOD, sizeof( lodControl_t ), file );
+    FS_Write(LOD, sizeof(lodControl_t), file);
 }
 
 /*
@@ -775,78 +748,86 @@ void SaveLODFile( const char *path, lodControl_t *LOD )
 GetLODFile
 ===============
 */
-void GetLODFile( skelcache_t *cache )
+void GetLODFile(skelcache_t *cache)
 {
-	lodControl_t *LOD;
-	char pathLOD[ 256 ];
-	char *buf;
-	int i;
-	skelSurfaceGame_t *pSurf;
-	bool bCanLod = false;
-	char *ext;
-	int length;
+    lodControl_t      *LOD;
+    char               pathLOD[256];
+    char              *buf;
+    int                i;
+    skelSurfaceGame_t *pSurf;
+    bool               bCanLod = false;
+    char              *ext;
+    int                length;
 
-	pSurf = cache->skel->pSurfaces;
+    pSurf = cache->skel->pSurfaces;
 
-	for( i = 0; i < cache->skel->numSurfaces; i++ )
-	{
-		if( pSurf->pCollapseIndex[ 0 ] != pSurf->pCollapseIndex[ pSurf->numVerts - 1 ] )
-		{
-			bCanLod = true;
-			break;
-		}
+    for (i = 0; i < cache->skel->numSurfaces; i++) {
+        if (pSurf->pCollapseIndex[0] != pSurf->pCollapseIndex[pSurf->numVerts - 1]) {
+            bCanLod = true;
+            break;
+        }
 
-		pSurf = pSurf->pNext;
-	}
+        pSurf = pSurf->pNext;
+    }
 
-	if( !bCanLod )
-	{
-		return;
-	}
+    if (!bCanLod) {
+        return;
+    }
 
-	strcpy( pathLOD, cache->path );
-	ext = strstr( pathLOD, "skd" );
-	strcpy( ext, "lod" );
+    Q_strncpyz(pathLOD, cache->path, sizeof(pathLOD));
+    ext = strstr(pathLOD, "skd");
+    strcpy(ext, "lod");
 
-	length = TIKI_ReadFileEx( pathLOD, ( void ** )&buf, true );
-	if( length >= 0 )
-	{
-		LOD = ( lodControl_t * )TIKI_Alloc( sizeof( lodControl_t ) );
-		memcpy( LOD, buf, length );
-		TIKI_FreeFile( buf );
-	}
-	else
-	{
-		LOD = ( lodControl_t * )TIKI_Alloc( sizeof( lodControl_t ) );
-		LOD->minMetric = 1.0f;
-		LOD->maxMetric = 0.2f;
-		LOD->curve[ 0 ].pos = 0.0f;
-		LOD->curve[ 0 ].val = 0.0f;
-		LOD->curve[ 1 ].pos = 0.5f;
-		LOD->curve[ 1 ].val = ( float )cache->skel->lodIndex[ 1 ];
-		LOD->curve[ 2 ].pos = 0.8f;
-		LOD->curve[ 2 ].val = ( float )cache->skel->lodIndex[ 1 ];
-		LOD->curve[ 3 ].pos = 0.95f;
-		LOD->curve[ 3 ].val = ( float )cache->skel->lodIndex[ 1 ];
-		LOD->curve[ 4 ].pos = 1.0f;
+    length = TIKI_ReadFileEx(pathLOD, (void **)&buf, true);
+    if (length >= 0) {
+        LOD = (lodControl_t *)TIKI_Alloc(sizeof(lodControl_t));
+        memcpy(LOD, buf, length);
+        TIKI_FreeFile(buf);
 
-		for( i = 9; cache->skel->lodIndex[ i ] > cache->skel->lodIndex[ 3 ]; i-- )
-		{
-			if( i <= 2 )
-				break;
-		}
+        LOD->minMetric = LittleFloat(LOD->minMetric);
+        LOD->maxMetric = LittleFloat(LOD->maxMetric);
 
-		LOD->curve[ 4 ].val = ( float )cache->skel->lodIndex[ i ];
+        for (i = 0; i < MAX_LOD_CURVE_POINTS; i++) {
+            LOD->curve[i].pos = LittleFloat(LOD->curve[i].pos);
+            LOD->curve[i].val = LittleFloat(LOD->curve[i].val);
+        }
 
-		for( i = 8; i >= 0; i-- )
-		{
-			if( LOD->curve[ i - 1 ].pos > LOD->curve[ i ].pos )
-				LOD->curve[ i ].val = LOD->curve[ i - 1 ].pos;
-		}
-	}
+        for (i = 0; i < MAX_LOD_CURVE_CONSTS; i++) {
+            LOD->consts[i].base   = LittleFloat(LOD->consts[i].base);
+            LOD->consts[i].scale  = LittleFloat(LOD->consts[i].scale);
+            LOD->consts[i].cutoff = LittleFloat(LOD->consts[i].cutoff);
+        }
+    } else {
+        LOD               = (lodControl_t *)TIKI_Alloc(sizeof(lodControl_t));
+        LOD->minMetric    = 1.0f;
+        LOD->maxMetric    = 0.2f;
+        LOD->curve[0].pos = 0.0f;
+        LOD->curve[0].val = 0.0f;
+        LOD->curve[1].pos = 0.5f;
+        LOD->curve[1].val = (float)cache->skel->lodIndex[1];
+        LOD->curve[2].pos = 0.8f;
+        LOD->curve[2].val = (float)cache->skel->lodIndex[1];
+        LOD->curve[3].pos = 0.95f;
+        LOD->curve[3].val = (float)cache->skel->lodIndex[1];
+        LOD->curve[4].pos = 1.0f;
 
-	TIKI_CalcLodConsts( LOD );
-	cache->skel->pLOD = LOD;
+        for (i = TIKI_SKEL_LOD_INDEXES; cache->skel->lodIndex[i] > cache->skel->lodIndex[3]; i--) {
+            if (i <= 2) {
+                break;
+            }
+        }
+
+        LOD->curve[4].val = (float)cache->skel->lodIndex[i];
+
+        for (i = 1; i < MAX_LOD_CURVE_POINTS - 1; i++) {
+            if (LOD->curve[i].pos < LOD->curve[i - 1].pos) {
+                LOD->curve[i].val = LOD->curve[i - 1].pos;
+            }
+        }
+    }
+
+    TIKI_CalcLodConsts(LOD);
+    cache->skel->pLOD = LOD;
 }
 
 /*
@@ -854,18 +835,19 @@ void GetLODFile( skelcache_t *cache )
 TIKI_CalcLodConsts
 ===============
 */
-void TIKI_CalcLodConsts( lodControl_t *LOD )
+void TIKI_CalcLodConsts(lodControl_t *LOD)
 {
-	int i;
+    int i;
 
-	for( i = 0; i < 4; i++ )
-	{
-		float common = ( LOD->curve[ i + 1 ].val - LOD->curve[ i + 0 ].val ) / ( LOD->curve[ i + 1 ].pos - LOD->curve[ i + 0 ].pos );
+    for (i = 0; i < 4; i++) {
+        float common =
+            (LOD->curve[i + 1].val - LOD->curve[i + 0].val) / (LOD->curve[i + 1].pos - LOD->curve[i + 0].pos);
 
-		LOD->consts[ i ].base = LOD->curve[ i + 0 ].val + ( LOD->minMetric / ( LOD->minMetric - LOD->maxMetric ) - LOD->curve[ i + 0 ].pos ) * common;
-		LOD->consts[ i ].scale = common / ( LOD->maxMetric - LOD->minMetric );
-		LOD->consts[ i ].cutoff = LOD->minMetric + ( LOD->maxMetric - LOD->minMetric ) * LOD->curve[ i + 0 ].pos;
-	}
+        LOD->consts[i].base = LOD->curve[i + 0].val
+                            + (LOD->minMetric / (LOD->minMetric - LOD->maxMetric) - LOD->curve[i + 0].pos) * common;
+        LOD->consts[i].scale  = common / (LOD->maxMetric - LOD->minMetric);
+        LOD->consts[i].cutoff = LOD->minMetric + (LOD->maxMetric - LOD->minMetric) * LOD->curve[i + 0].pos;
+    }
 }
 
 /*
@@ -873,88 +855,90 @@ void TIKI_CalcLodConsts( lodControl_t *LOD )
 TIKI_LoadSKD
 ===============
 */
-qboolean TIKI_LoadSKD( const char *path, skelcache_t *cache )
+qboolean TIKI_LoadSKD(const char *path, skelcache_t *cache)
 {
-	int i;
-	skelHeader_t *pheader;
-	skelSurface_t *surf;
-	int version;
-	unsigned int header;
-	int length;
+    int            i;
+    skelHeader_t  *pheader;
+    skelSurface_t *surf;
+    int            version;
+    unsigned int   header;
+    int            length;
 
-	length = TIKI_ReadFileEx( path, ( void ** )&pheader, qtrue );
-	if( length < 0 )
-	{
-		TIKI_DPrintf( "Tiki:LoadAnim Couldn't load %s\n", path );
-		return qfalse;
-	}
+    length = TIKI_ReadFileEx(path, (void **)&pheader, qtrue);
+    if (length < 0) {
+        TIKI_DPrintf("Tiki:LoadAnim Couldn't load %s\n", path);
+        return qfalse;
+    }
 
-	// The SKD must have at least one surface
-	if( pheader->numSurfaces <= 0 )
-	{
-		TIKI_Error( "^~^~^ TIKI_LoadSKD: %s has no surfaces\n", path );
-		TIKI_FreeFile( pheader );
-		return qfalse;
-	}
+    // The SKD must have at least one surface
+    if (LittleLong(pheader->numSurfaces) <= 0) {
+        TIKI_Error("^~^~^ TIKI_LoadSKD: %s has no surfaces\n", path);
+        TIKI_FreeFile(pheader);
+        return qfalse;
+    }
 
-	memset( cache, 0, sizeof( skelcache_t ) );
-	strncpy( cache->path, path, sizeof( cache->path ) );
+    memset(cache, 0, sizeof(skelcache_t));
+    strncpy(cache->path, path, sizeof(cache->path));
 
-	// Check the signature
-	header = LittleLong( pheader->ident );
-	if( header != TIKI_SKD_HEADER_IDENT )
-	{
-		TIKI_Error( "TIKI_LoadSKD: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path );
-		TIKI_FreeFile( pheader );
-		return qfalse;
-	}
+    // Check the signature
+    header = pheader->ident;
+    if (header != TIKI_SKD_HEADER_IDENT) {
+        TIKI_Error("TIKI_LoadSKD: Tried to load '%s' as a skeletal base frame (File has invalid header)\n", path);
+        TIKI_FreeFile(pheader);
+        return qfalse;
+    }
 
-	// Check the version
-	version = LittleLong( pheader->version );
-	if( version != TIKI_SKD_HEADER_OLD_VERSION && version != TIKI_SKD_HEADER_VERSION )
-	{
-		TIKI_Error( "TIKI_LoadSKD: %s has wrong version (%i should be %i)\n", path, version, TIKI_SKD_HEADER_VERSION );
-		TIKI_FreeFile( pheader );
-		return qfalse;
-	}
+    // Check the version
+    version = LittleLong(pheader->version);
+    if (version != TIKI_SKD_HEADER_OLD_VERSION && version != TIKI_SKD_HEADER_VERSION) {
+        TIKI_Error("TIKI_LoadSKD: %s has wrong version (%i should be %i)\n", path, version, TIKI_SKD_HEADER_VERSION);
+        TIKI_FreeFile(pheader);
+        return qfalse;
+    }
 
-	surf = ( skelSurface_t * )( ( byte * )pheader + pheader->ofsSurfaces );
+    TIKI_SwapSkel(pheader);
 
-	for( i = 0; i < pheader->numSurfaces; i++ )
-	{
-		if( surf->numVerts > TIKI_MAX_VERTEXES )
-		{
-			TIKI_Error( "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts );
-			TIKI_FreeFile( pheader );
-			return qfalse;
-		}
+    surf = (skelSurface_t *)((byte *)pheader + pheader->ofsSurfaces);
 
-		if( surf->numTriangles > TIKI_MAX_TRIANGLES )
-		{
-			TIKI_Error( "TIKI_LoadSKD: %s has more than %i triangles on a surface (%i)", path, TIKI_MAX_TRIANGLES, surf->numTriangles );
-			TIKI_FreeFile( pheader );
-			return qfalse;
-		}
+    for (i = 0; i < pheader->numSurfaces; i++) {
+        if (surf->numVerts > TIKI_MAX_VERTEXES) {
+            TIKI_Error(
+                "TIKI_LoadSKD: %s has more than %i verts on a surface (%i)", path, TIKI_MAX_VERTEXES, surf->numVerts
+            );
+            TIKI_FreeFile(pheader);
+            return qfalse;
+        }
 
-		surf = ( skelSurface_t * )( ( byte * )surf + surf->ofsEnd );
-	}
+        if (surf->numTriangles > TIKI_MAX_TRIANGLES) {
+            TIKI_Error(
+                "TIKI_LoadSKD: %s has more than %i triangles on a surface (%i)",
+                path,
+                TIKI_MAX_TRIANGLES,
+                surf->numTriangles
+            );
+            TIKI_FreeFile(pheader);
+            return qfalse;
+        }
 
-	if( pheader->numBones > TIKI_MAX_BONES )
-	{
-		TIKI_FreeFile( pheader );
-		TIKI_Error( "TIKI_LoadSKD: %s has more than %i bones (%i)\n", path, TIKI_MAX_BONES, pheader->numBones );
-		return qfalse;
-	}
+        surf = (skelSurface_t *)((byte *)surf + surf->ofsEnd);
+    }
 
-	// Cache the skeleton
-	TIKI_CacheFileSkel( pheader, cache, length );
-	TIKI_FreeFile( pheader );
-	cache_numskel++;
+    if (pheader->numBones > TIKI_MAX_BONES) {
+        TIKI_FreeFile(pheader);
+        TIKI_Error("TIKI_LoadSKD: %s has more than %i bones (%i)\n", path, TIKI_MAX_BONES, pheader->numBones);
+        return qfalse;
+    }
 
-	// Get the lod file associated with the skeleton
-	GetLODFile( cache );
-	TIKI_SortLOD( cache->skel );
-	return 1;
+    // Cache the skeleton
+    TIKI_CacheFileSkel(pheader, cache, length);
+    TIKI_FreeFile(pheader);
+    cache_numskel++;
+
+    // Get the lod file associated with the skeleton
+    GetLODFile(cache);
+    TIKI_SortLOD(cache->skel);
+
+    return true;
 }
 
 /*
@@ -962,9 +946,9 @@ qboolean TIKI_LoadSKD( const char *path, skelcache_t *cache )
 TIKI_GetSkel
 ===============
 */
-skelHeaderGame_t *TIKI_GetSkel( int index )
+skelHeaderGame_t *TIKI_GetSkel(int index)
 {
-	return skelcache[ index ].skel;
+    return skelcache[index].skel;
 }
 
 /*
@@ -972,17 +956,15 @@ skelHeaderGame_t *TIKI_GetSkel( int index )
 TIKI_GetSkelCache
 ===============
 */
-int TIKI_GetSkelCache( skelHeaderGame_t *pSkel )
+int TIKI_GetSkelCache(skelHeaderGame_t *pSkel)
 {
-	for( int index = 0; index < cache_maxskel; index++ )
-	{
-		if( skelcache[ index ].skel == pSkel )
-		{
-			return index;
-		}
-	}
+    for (int index = 0; index < cache_maxskel; index++) {
+        if (skelcache[index].skel == pSkel) {
+            return index;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -990,22 +972,20 @@ int TIKI_GetSkelCache( skelHeaderGame_t *pSkel )
 TIKI_FreeSkel
 ===============
 */
-void TIKI_FreeSkel( int index )
+void TIKI_FreeSkel(int index)
 {
-	if( index < 0 || index > cache_maxskel )
-	{
-		TIKI_Error( "TIKI_FreeSkel: handle %d out of range\n", index );
-		return;
-	}
+    if (index < 0 || index > cache_maxskel) {
+        TIKI_Error("TIKI_FreeSkel: handle %d out of range\n", index);
+        return;
+    }
 
-	if( !skelcache[ index ].skel )
-	{
-		TIKI_Error( "TIKI_FreeSkel: NULL pointer for %s\n", skelcache[ index ].path );
-		return;
-	}
+    if (!skelcache[index].skel) {
+        TIKI_Error("TIKI_FreeSkel: NULL pointer for %s\n", skelcache[index].path);
+        return;
+    }
 
-	TIKI_FreeSkelCache( &skelcache[ index ] );
-	cache_numskel--;
+    TIKI_FreeSkelCache(&skelcache[index]);
+    cache_numskel--;
 }
 
 /*
@@ -1013,30 +993,29 @@ void TIKI_FreeSkel( int index )
 TIKI_FreeSkelCache
 ===============
 */
-void TIKI_FreeSkelCache( skelcache_t *cache )
+void TIKI_FreeSkelCache(skelcache_t *cache)
 {
-	skelSurfaceGame_t *pSurf;
+    skelSurfaceGame_t *pSurf;
 
-	if( cache->skel == NULL ) {
-		return;
-	}
+    if (cache->skel == NULL) {
+        return;
+    }
 
-	for( pSurf = cache->skel->pSurfaces; pSurf != NULL; pSurf = pSurf->pNext )
-	{
-		if( pSurf->pStaticXyz ) {
-			TIKI_Free( pSurf->pStaticXyz );
-		}
-	}
+    for (pSurf = cache->skel->pSurfaces; pSurf != NULL; pSurf = pSurf->pNext) {
+        if (pSurf->pStaticXyz) {
+            TIKI_Free(pSurf->pStaticXyz);
+        }
+    }
 
-	if( cache->skel->pLOD ) {
-		TIKI_Free( cache->skel->pLOD );
-	}
+    if (cache->skel->pLOD) {
+        TIKI_Free(cache->skel->pLOD);
+    }
 
-	TIKI_Free( cache->skel );
-	cache->skel = NULL;
-	cache->size = 0;
-	cache->path[0] = 0;
-	cache->numuses = 0;
+    TIKI_Free(cache->skel);
+    cache->skel    = NULL;
+    cache->size    = 0;
+    cache->path[0] = 0;
+    cache->numuses = 0;
 }
 
 /*
@@ -1044,23 +1023,68 @@ void TIKI_FreeSkelCache( skelcache_t *cache )
 TIKI_FindSkel
 ===============
 */
-skelcache_t *TIKI_FindSkel( const char *path )
+skelcache_t *TIKI_FindSkel(const char *path)
 {
-	int i;
-	skelcache_t *cache;
+    int          i;
+    int          num;
+    skelcache_t *cache;
 
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-	{
-		cache = &skelcache[ i ];
+    num = cache_numskel;
 
-		if( !cache->skel )
-			continue;
+    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+        cache = &skelcache[i];
 
-		if( !strcmp( path, cache->path ) )
-			return cache;
-	}
+        if (!cache->skel) {
+            continue;
+        }
 
-	return NULL;
+        if (!strcmp(path, cache->path)) {
+            return cache;
+        }
+
+        if (num == 0) {
+            break;
+        }
+        num--;
+    }
+
+    return NULL;
+}
+
+/*
+===============
+TIKI_FindSkelByHeader
+
+Added in OPM
+Return the skelcache associated with the specified skelmodel
+===============
+*/
+skelcache_t *TIKI_FindSkelByHeader(skelHeaderGame_t *skelmodel)
+{
+    int          i;
+    int          num;
+    skelcache_t *cache;
+
+    num = cache_numskel;
+
+    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+        cache = &skelcache[i];
+
+        if (!cache->skel) {
+            continue;
+        }
+
+        if (cache->skel == skelmodel) {
+            return cache;
+        }
+
+        if (num == 0) {
+            break;
+        }
+        num--;
+    }
+
+    return NULL;
 }
 
 /*
@@ -1068,20 +1092,20 @@ skelcache_t *TIKI_FindSkel( const char *path )
 TIKI_FindFreeSkel
 ===============
 */
-skelcache_t *TIKI_FindFreeSkel( void )
+skelcache_t *TIKI_FindFreeSkel(void)
 {
-	int i;
-	skelcache_t *cache;
+    int          i;
+    skelcache_t *cache;
 
-	for( i = 0; i < TIKI_MAX_SKELCACHE; i++ )
-	{
-		cache = &skelcache[ i ];
+    for (i = 0; i < TIKI_MAX_SKELCACHE; i++) {
+        cache = &skelcache[i];
 
-		if( !cache->skel )
-			return cache;
-	}
+        if (!cache->skel) {
+            return cache;
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /*
@@ -1089,46 +1113,47 @@ skelcache_t *TIKI_FindFreeSkel( void )
 TIKI_RegisterSkel
 ===============
 */
-int TIKI_RegisterSkel( const char *path, dtiki_t *tiki )
+int TIKI_RegisterSkel(const char *path, dtiki_t *tiki)
 {
-	char tempName[ 257 ];
-	skelcache_t *cache;
-	const char *extension;
+    char         tempName[257];
+    skelcache_t *cache;
+    const char  *extension;
 
-	// Find a skel with the same name
-	cache = TIKI_FindSkel( path );
-	if( cache )
-	{
-		return cache - skelcache;
-	}
+    // Find a skel with the same name
+    cache = TIKI_FindSkel(path);
+    if (cache) {
+        return cache - skelcache;
+    }
 
-	// Find a free skel
-	cache = TIKI_FindFreeSkel();
-	if( !cache )
-	{
-		TIKI_Error( "TIKI_RegisterSkel: No free spots open in skel cache for %s\n", path );
-		return -1;
-	}
+    // Find a free skel
+    cache = TIKI_FindFreeSkel();
+    if (!cache) {
+        TIKI_Error("TIKI_RegisterSkel: No free spots open in skel cache for %s\n", path);
+        return -1;
+    }
+    
+    cache->numuses = 0;
 
-	if( cache - skelcache + 1 > cache_maxskel )
-	{
-		cache_maxskel = cache - skelcache + 1;
-	}
+    if (cache - skelcache + 1 > cache_maxskel) {
+        cache_maxskel = cache - skelcache + 1;
+    }
 
-	extension = TIKI_FileExtension( path );
-	if( !strcmp( extension, "skb" ) )
-	{
-		if( !TIKI_LoadSKB( path, cache ) )
-			return -1;
-	}
-	else if( !strcmp( extension, "skd" ) )
-	{
-		if( !TIKI_LoadSKD( path, cache ) )
-			return -1;
-	}
+    extension = TIKI_FileExtension(path);
+    if (!strcmp(extension, "skb")) {
+        if (!TIKI_LoadSKB(path, cache)) {
+            return -1;
+        }
+    } else if (!strcmp(extension, "skd")) {
+        if (!TIKI_LoadSKD(path, cache)) {
+            return -1;
+        }
+    } else {
+        TIKI_Error("TIKI_RegisterSkel: Unknown extension %s\n", extension);
+        return -1;
+    }
 
-	sprintf( tempName, "l%s", path );
-	UI_LoadResource( tempName );
+    Com_sprintf(tempName, sizeof(tempName), "l%s", path);
+    UI_LoadResource(tempName);
 
-	return cache - skelcache;
+    return cache - skelcache;
 }
diff --git a/code/tiki/tiki_skel.h b/code/tiki/tiki_skel.h
index a4acfca9..210e06e8 100644
--- a/code/tiki/tiki_skel.h
+++ b/code/tiki/tiki_skel.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,30 +22,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_skel.h : TIKI Skeletor
 
-#ifndef __TIKI_SKEL_H__
-#define __TIKI_SKEL_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void TIKI_CacheFileSkel( skelHeader_t *pHeader, skelcache_t *cache, int length );
-void TIKI_CalcLodConsts( lodControl_t *LOD );
-qboolean TIKI_LoadSKB( const char *path, skelcache_t *cache );
-qboolean TIKI_LoadSKD( const char *path, skelcache_t *cache );
-skelHeaderGame_t *TIKI_GetSkel( int index );
-int TIKI_GetSkelCache( skelHeaderGame_t *pSkel );
-void TIKI_FreeSkel( int index );
-void TIKI_FreeSkelCache( skelcache_t *cache );
-skelcache_t *TIKI_FindSkel( const char *path );
-skelcache_t *TIKI_FindFreeSkel( void );
-int TIKI_RegisterSkel( const char *path, dtiki_t *tiki );
+    void              TIKI_CacheFileSkel(skelHeader_t *pHeader, skelcache_t *cache, int length);
+    void              TIKI_CalcLodConsts(lodControl_t *LOD);
+    qboolean          TIKI_LoadSKB(const char *path, skelcache_t *cache);
+    qboolean          TIKI_LoadSKD(const char *path, skelcache_t *cache);
+    skelHeaderGame_t *TIKI_GetSkel(int index);
+    int               TIKI_GetSkelCache(skelHeaderGame_t *pSkel);
+    void              TIKI_FreeSkel(int index);
+    void              TIKI_FreeSkelCache(skelcache_t *cache);
+    skelcache_t      *TIKI_FindSkel(const char *path);
+    skelcache_t      *TIKI_FindSkelByHeader(skelHeaderGame_t *skelmodel);
+    skelcache_t      *TIKI_FindFreeSkel(void);
+    int               TIKI_RegisterSkel(const char *path, dtiki_t *tiki);
 
-void SaveLODFile( const char *path, lodControl_t *LOD );
-void GetLODFile( skelcache_t *cache );
+    void SaveLODFile(const char *path, lodControl_t *LOD);
+    void GetLODFile(skelcache_t *cache);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_SKEL_H__
diff --git a/code/tiki/tiki_surface.cpp b/code/tiki/tiki_surface.cpp
index ce5a4de3..e542f689 100644
--- a/code/tiki/tiki_surface.cpp
+++ b/code/tiki/tiki_surface.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -31,20 +31,20 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 TIKI_Surface_NameToNum
 ===============
 */
-int TIKI_Surface_NameToNum( dtiki_t *pmdl, const char *name )
+int TIKI_Surface_NameToNum(dtiki_t *pmdl, const char *name)
 {
-	int i;
-	dtikisurface_t *psurface;
+    int             i;
+    dtikisurface_t *psurface;
 
-	for( i = 0; i < pmdl->num_surfaces; i++ )
-	{
-		psurface = &pmdl->surfaces[ i ];
+    for (i = 0; i < pmdl->num_surfaces; i++) {
+        psurface = &pmdl->surfaces[i];
 
-		if( !stricmp( psurface->name, name ) )
-			return i;
-	}
+        if (!stricmp(psurface->name, name)) {
+            return i;
+        }
+    }
 
-	return -1;
+    return -1;
 }
 
 /*
@@ -52,14 +52,13 @@ int TIKI_Surface_NameToNum( dtiki_t *pmdl, const char *name )
 TIKI_Surface_NumToName
 ===============
 */
-const char *TIKI_Surface_NumToName( dtiki_t *pmdl, int num )
+const char *TIKI_Surface_NumToName(dtiki_t *pmdl, int num)
 {
-	if( num < 0 || num >= pmdl->num_surfaces )
-	{
-		TIKI_Error( "TIKI_Surface_NumToName: Surface %d out of range for %s.\n", num, pmdl->a->name );
-		return NULL;
-	}
+    if (num < 0 || num >= pmdl->num_surfaces) {
+        TIKI_Error("TIKI_Surface_NumToName: Surface %d out of range for %s.\n", num, pmdl->a->name);
+        return NULL;
+    }
 
-	assert( pmdl->surfaces[ num ].name[ 0 ] );
-	return pmdl->surfaces[ num ].name;
+    assert(pmdl->surfaces[num].name[0]);
+    return pmdl->surfaces[num].name;
 }
diff --git a/code/tiki/tiki_surface.h b/code/tiki/tiki_surface.h
index 19d8a1c3..e61518d4 100644
--- a/code/tiki/tiki_surface.h
+++ b/code/tiki/tiki_surface.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,18 +22,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_surface.h : TIKI Surface
 
-#ifndef __TIKI_SURFACE_H__
-#define __TIKI_SURFACE_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int TIKI_Surface_NameToNum( dtiki_t *pmdl, const char *name );
-const char *TIKI_Surface_NumToName( dtiki_t *pmdl, int num );
+    int         TIKI_Surface_NameToNum(dtiki_t *pmdl, const char *name);
+    const char *TIKI_Surface_NumToName(dtiki_t *pmdl, int num);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_IMPORTS_H__
diff --git a/code/tiki/tiki_tag.cpp b/code/tiki/tiki_tag.cpp
index 81caa024..a67bd0d7 100644
--- a/code/tiki/tiki_tag.cpp
+++ b/code/tiki/tiki_tag.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 TIKI_Tag_NameToNum
 ===============
 */
-int TIKI_Tag_NameToNum(dtiki_t* pmdl, const char* name)
+int TIKI_Tag_NameToNum(dtiki_t *pmdl, const char *name)
 {
-	return pmdl->GetBoneNumFromName(name);
+    return pmdl->GetBoneNumFromName(name);
 }
 
 /*
@@ -43,9 +43,9 @@ int TIKI_Tag_NameToNum(dtiki_t* pmdl, const char* name)
 TIKI_Tag_NumToName
 ===============
 */
-const char* TIKI_Tag_NumToName(dtiki_t* pmdl, int iTagNum)
+const char *TIKI_Tag_NumToName(dtiki_t *pmdl, int iTagNum)
 {
-	return pmdl->GetBoneNameFromNum(iTagNum);
+    return pmdl->GetBoneNameFromNum(iTagNum);
 }
 
 /*
@@ -53,10 +53,20 @@ const char* TIKI_Tag_NumToName(dtiki_t* pmdl, int iTagNum)
 TIKI_TransformInternal
 ===============
 */
-SkelMat4* TIKI_TransformInternal(dtiki_t* tiki, int entnum, int tagnum)
+SkelMat4 *TIKI_TransformInternal(dtiki_t *tiki, int entnum, int tagnum)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	return &skeletor->GetBoneFrame(tagnum);
+    skeletor_c *skeletor;
+
+    if (tagnum < 0 || !tiki || tagnum >= tiki->m_boneList.NumChannels()) {
+        return NULL;
+    }
+
+    skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return NULL;
+    }
+
+    return &skeletor->GetBoneFrame(tagnum);
 }
 
 /*
@@ -64,10 +74,16 @@ SkelMat4* TIKI_TransformInternal(dtiki_t* tiki, int entnum, int tagnum)
 TIKI_IsOnGroundInternal
 ===============
 */
-qboolean TIKI_IsOnGroundInternal(dtiki_t* tiki, int entnum, int tagnum, float threshold)
+qboolean TIKI_IsOnGroundInternal(dtiki_t *tiki, int entnum, int tagnum, float threshold)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	return skeletor->IsBoneOnGround(tagnum, threshold);
+    skeletor_c *skeletor;
+
+    if (tagnum < 0 || !tiki || tagnum >= tiki->m_boneList.NumChannels()) {
+        return qfalse;
+    }
+
+    skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    return skeletor->IsBoneOnGround(tagnum, threshold);
 }
 
 /*
@@ -75,18 +91,26 @@ qboolean TIKI_IsOnGroundInternal(dtiki_t* tiki, int entnum, int tagnum, float th
 TIKI_OrientationInternal
 ===============
 */
-orientation_t TIKI_OrientationInternal(dtiki_t* tiki, int entnum, int tagnum, float scale)
+orientation_t TIKI_OrientationInternal(dtiki_t *tiki, int entnum, int tagnum, float scale)
 {
-	const skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	const SkelMat4& pTransform = skeletor->GetBoneFrame(tagnum);
+    if (tagnum < 0 || !tiki || tagnum >= tiki->m_boneList.NumChannels()) {
+        return orientation_t {};
+    }
 
-	orientation_t orient;
-	orient.origin[0] = (pTransform.val[3][0] + tiki->load_origin[0]) * (scale * tiki->load_scale);
-	orient.origin[1] = (pTransform.val[3][1] + tiki->load_origin[1]) * (scale * tiki->load_scale);
-	orient.origin[2] = (pTransform.val[3][2] + tiki->load_origin[2]) * (scale * tiki->load_scale);
-	memcpy(orient.axis, pTransform.val, sizeof(orient.axis));
+    const skeletor_c *skeletor   = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    if (!skeletor) {
+        return orientation_t {};
+    }
 
-	return orient;
+    const SkelMat4  & pTransform = skeletor->GetBoneFrame(tagnum);
+
+    orientation_t orient;
+    orient.origin[0] = (pTransform.val[3][0] + tiki->load_origin[0]) * (scale * tiki->load_scale);
+    orient.origin[1] = (pTransform.val[3][1] + tiki->load_origin[1]) * (scale * tiki->load_scale);
+    orient.origin[2] = (pTransform.val[3][2] + tiki->load_origin[2]) * (scale * tiki->load_scale);
+    memcpy(orient.axis, pTransform.val, sizeof(orient.axis));
+
+    return orient;
 }
 
 /*
@@ -94,10 +118,12 @@ orientation_t TIKI_OrientationInternal(dtiki_t* tiki, int entnum, int tagnum, fl
 TIKI_SetPoseInternal
 ===============
 */
-void TIKI_SetPoseInternal(void* skeletor, const frameInfo_t* frameInfo, const int* bone_tag, const vec4_t* bone_quat, float actionWeight)
+void TIKI_SetPoseInternal(
+    void *skeletor, const frameInfo_t *frameInfo, const int *bone_tag, const vec4_t *bone_quat, float actionWeight
+)
 {
-	skeletor_c* skel = (skeletor_c*)skeletor;
-	skel->SetPose(frameInfo, bone_tag, bone_quat, actionWeight);
+    skeletor_c *skel = (skeletor_c *)skeletor;
+    skel->SetPose(frameInfo, bone_tag, bone_quat, actionWeight);
 }
 
 /*
@@ -105,10 +131,10 @@ void TIKI_SetPoseInternal(void* skeletor, const frameInfo_t* frameInfo, const in
 TIKI_GetRadiusInternal
 ===============
 */
-float TIKI_GetRadiusInternal(dtiki_t* tiki, int entnum, float scale)
+float TIKI_GetRadiusInternal(dtiki_t *tiki, int entnum, float scale)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	return skeletor->GetRadius() * tiki->load_scale * scale;
+    skeletor_c *skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    return skeletor->GetRadius() * tiki->load_scale * scale;
 }
 
 /*
@@ -116,10 +142,10 @@ float TIKI_GetRadiusInternal(dtiki_t* tiki, int entnum, float scale)
 TIKI_GetCentroidRadiusInternal
 ===============
 */
-float TIKI_GetCentroidRadiusInternal(dtiki_t* tiki, int entnum, float scale, float* centroid)
+float TIKI_GetCentroidRadiusInternal(dtiki_t *tiki, int entnum, float scale, float *centroid)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	return skeletor->GetCentroidRadius(centroid) * tiki->load_scale * scale;
+    skeletor_c *skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    return skeletor->GetCentroidRadius(centroid) * tiki->load_scale * scale;
 }
 
 /*
@@ -127,10 +153,10 @@ float TIKI_GetCentroidRadiusInternal(dtiki_t* tiki, int entnum, float scale, flo
 TIKI_GetFrameInternal
 ===============
 */
-void TIKI_GetFrameInternal(dtiki_t* tiki, int entnum, skelAnimFrame_t* newFrame)
+void TIKI_GetFrameInternal(dtiki_t *tiki, int entnum, skelAnimFrame_t *newFrame)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	skeletor->GetFrame(newFrame);
+    skeletor_c *skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    skeletor->GetFrame(newFrame);
 }
 
 /*
@@ -138,8 +164,8 @@ void TIKI_GetFrameInternal(dtiki_t* tiki, int entnum, skelAnimFrame_t* newFrame)
 TIKI_SetEyeTargetPos
 ===============
 */
-void TIKI_SetEyeTargetPos(dtiki_t* tiki, int entnum, vec3_t pos)
+void TIKI_SetEyeTargetPos(dtiki_t *tiki, int entnum, vec3_t pos)
 {
-	skeletor_c* skeletor = (skeletor_c*)TIKI_GetSkeletor(tiki, entnum);
-	skeletor->SetEyeTargetPos(pos);
+    skeletor_c *skeletor = (skeletor_c *)TIKI_GetSkeletor(tiki, entnum);
+    skeletor->SetEyeTargetPos(pos);
 }
diff --git a/code/tiki/tiki_tag.h b/code/tiki/tiki_tag.h
index 75726504..c61074ba 100644
--- a/code/tiki/tiki_tag.h
+++ b/code/tiki/tiki_tag.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,26 +22,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_tag.h : TIKI Tag
 
-#ifndef __TIKI_TAG_H__
-#define __TIKI_TAG_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int TIKI_Tag_NameToNum( dtiki_t *pmdl, const char *name );
-const char *TIKI_Tag_NumToName( dtiki_t *pmdl, int iTagNum );
-SkelMat4 *TIKI_TransformInternal( dtiki_t *tiki, int entnum, int tagnum );
-qboolean TIKI_IsOnGroundInternal( dtiki_t *tiki, int entnum, int tagnum, float threshold );
-orientation_t TIKI_OrientationInternal( dtiki_t *tiki, int entnum, int tagnum, float scale );
-void TIKI_SetPoseInternal( void *skeletor, const frameInfo_t *frameInfo, const int *bone_tag, const vec4_t *bone_quat, float actionWeight );
-float TIKI_GetRadiusInternal( dtiki_t *tiki, int entnum, float scale );
-float TIKI_GetCentroidRadiusInternal( dtiki_t *tiki, int entnum, float scale, float *centroid );
-void TIKI_GetFrameInternal( dtiki_t *tiki, int entnum, skelAnimFrame_t *newFrame );
-void TIKI_SetEyeTargetPos( dtiki_t *tiki, int entnum, vec3_t pos );
+    int           TIKI_Tag_NameToNum(dtiki_t *pmdl, const char *name);
+    const char   *TIKI_Tag_NumToName(dtiki_t *pmdl, int iTagNum);
+    SkelMat4     *TIKI_TransformInternal(dtiki_t *tiki, int entnum, int tagnum);
+    qboolean      TIKI_IsOnGroundInternal(dtiki_t *tiki, int entnum, int tagnum, float threshold);
+    orientation_t TIKI_OrientationInternal(dtiki_t *tiki, int entnum, int tagnum, float scale);
+    void          TIKI_SetPoseInternal(
+                 void *skeletor, const frameInfo_t *frameInfo, const int *bone_tag, const vec4_t *bone_quat, float actionWeight
+             );
+    float TIKI_GetRadiusInternal(dtiki_t *tiki, int entnum, float scale);
+    float TIKI_GetCentroidRadiusInternal(dtiki_t *tiki, int entnum, float scale, float *centroid);
+    void  TIKI_GetFrameInternal(dtiki_t *tiki, int entnum, skelAnimFrame_t *newFrame);
+    void  TIKI_SetEyeTargetPos(dtiki_t *tiki, int entnum, vec3_t pos);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_TAG_H__
diff --git a/code/tiki/tiki_utility.cpp b/code/tiki/tiki_utility.cpp
index eb828d68..92ad65c9 100644
--- a/code/tiki/tiki_utility.cpp
+++ b/code/tiki/tiki_utility.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -32,16 +32,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 TIKI_Name
 ===============
 */
-const char *TIKI_Name( dtiki_t *pmdl )
+const char *TIKI_Name(dtiki_t *pmdl)
 {
-	if( pmdl )
-	{
-		return pmdl->a->name;
-	}
-	else
-	{
-		return 0;
-	}
+    if (pmdl) {
+        return pmdl->a->name;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -49,16 +46,13 @@ const char *TIKI_Name( dtiki_t *pmdl )
 TIKI_NumAnims
 ===============
 */
-int TIKI_NumAnims( dtiki_t *pmdl )
+int TIKI_NumAnims(dtiki_t *pmdl)
 {
-	if( pmdl )
-	{
-		return pmdl->a->num_anims;
-	}
-	else
-	{
-		return 0;
-	}
+    if (pmdl) {
+        return pmdl->a->num_anims;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -66,16 +60,13 @@ int TIKI_NumAnims( dtiki_t *pmdl )
 TIKI_NumSurfaces
 ===============
 */
-int TIKI_NumSurfaces( dtiki_t *pmdl )
+int TIKI_NumSurfaces(dtiki_t *pmdl)
 {
-	if( pmdl )
-	{
-		return pmdl->num_surfaces;
-	}
-	else
-	{
-		return 0;
-	}
+    if (pmdl) {
+        return pmdl->num_surfaces;
+    } else {
+        return 0;
+    }
 }
 
 /*
@@ -83,9 +74,9 @@ int TIKI_NumSurfaces( dtiki_t *pmdl )
 TIKI_NumTags
 ===============
 */
-int TIKI_NumTags( dtiki_t *pmdl )
+int TIKI_NumTags(dtiki_t *pmdl)
 {
-	return pmdl->m_boneList.NumChannels();
+    return pmdl->m_boneList.NumChannels();
 }
 
 /*
@@ -93,15 +84,14 @@ int TIKI_NumTags( dtiki_t *pmdl )
 TIKI_CalculateBounds
 ===============
 */
-void TIKI_CalculateBounds( dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs )
+void TIKI_CalculateBounds(dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs)
 {
-	int j;
+    int j;
 
-	for( j = 0; j < 3; j++ )
-	{
-		mins[ j ] = pmdl->a->mins[ j ] * pmdl->load_scale * scale;
-		maxs[ j ] = pmdl->a->maxs[ j ] * pmdl->load_scale * scale;
-	}
+    for (j = 0; j < 3; j++) {
+        mins[j] = pmdl->a->mins[j] * pmdl->load_scale * scale;
+        maxs[j] = pmdl->a->maxs[j] * pmdl->load_scale * scale;
+    }
 }
 
 /*
@@ -109,9 +99,9 @@ void TIKI_CalculateBounds( dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs
 TIKI_GlobalRadius
 ===============
 */
-float TIKI_GlobalRadius( dtiki_t *pmdl )
+float TIKI_GlobalRadius(dtiki_t *pmdl)
 {
-	return pmdl->radius;
+    return pmdl->radius;
 }
 
 /*
@@ -119,22 +109,21 @@ float TIKI_GlobalRadius( dtiki_t *pmdl )
 TIKI_NumHeadModels
 ===============
 */
-int TIKI_NumHeadModels( dtikianim_t *tiki )
+int TIKI_NumHeadModels(dtikianim_t *tiki)
 {
-	int numheadmodels = 0;
-	const char *s = tiki->headmodels;
+    int         numheadmodels = 0;
+    const char *s             = tiki->headmodels;
 
-	while( 1 )
-	{
-		s = strstr( s, "\n" );
-		if( !s ) {
-			break;
-		}
-		numheadmodels++;
-		s++;
-	}
+    while (1) {
+        s = strstr(s, "\n");
+        if (!s) {
+            break;
+        }
+        numheadmodels++;
+        s++;
+    }
 
-	return numheadmodels;
+    return numheadmodels;
 }
 
 /*
@@ -142,38 +131,32 @@ int TIKI_NumHeadModels( dtikianim_t *tiki )
 TIKI_GetHeadModel
 ===============
 */
-void TIKI_GetHeadModel( dtikianim_t *tiki, int num, char *name )
+void TIKI_GetHeadModel(dtikianim_t *tiki, int num, char *name)
 {
-	const char *s, *t;
+    const char *s, *t;
 
-	if( tiki->headmodels == ( char * )1 )
-	{
-		*name = 0;
-		return;
-	}
+    if (tiki->headmodels == (char *)1) {
+        *name = 0;
+        return;
+    }
 
-	s = tiki->headmodels;
-	for( num = num - 1; num >= 0; num-- )
-	{
-		s = strstr( s, "\n" );
-		if( !s )
-		{
-			*name = 0;
-			return;
-		}
-		s++;
-	}
+    s = tiki->headmodels;
+    for (num = num - 1; num >= 0; num--) {
+        s = strstr(s, "\n");
+        if (!s) {
+            *name = 0;
+            return;
+        }
+        s++;
+    }
 
-	t = strstr( s, "\n" );
-	if( t )
-	{
-		strncpy( name, s, t - s );
-		name[ t - s ] = 0;
-	}
-	else
-	{
-		*name = 0;
-	}
+    t = strstr(s, "\n");
+    if (t) {
+        strncpy(name, s, t - s);
+        name[t - s] = 0;
+    } else {
+        *name = 0;
+    }
 }
 
 /*
@@ -181,22 +164,21 @@ void TIKI_GetHeadModel( dtikianim_t *tiki, int num, char *name )
 TIKI_NumHeadSkins
 ===============
 */
-int TIKI_NumHeadSkins( dtikianim_t *tiki )
+int TIKI_NumHeadSkins(dtikianim_t *tiki)
 {
-	int numheadskins = 0;
-	const char *s = tiki->headskins;
+    int         numheadskins = 0;
+    const char *s            = tiki->headskins;
 
-	while( 1 )
-	{
-		s = strstr( s, "\n" );
-		if( !s ) {
-			break;
-		}
-		numheadskins++;
-		s++;
-	}
+    while (1) {
+        s = strstr(s, "\n");
+        if (!s) {
+            break;
+        }
+        numheadskins++;
+        s++;
+    }
 
-	return numheadskins;
+    return numheadskins;
 }
 
 /*
@@ -204,36 +186,30 @@ int TIKI_NumHeadSkins( dtikianim_t *tiki )
 TIKI_GetHeadSkin
 ===============
 */
-void TIKI_GetHeadSkin( dtikianim_t *tiki, int num, char *name )
+void TIKI_GetHeadSkin(dtikianim_t *tiki, int num, char *name)
 {
-	const char *s, *t;
+    const char *s, *t;
 
-	if( tiki->headskins == ( char * )1 )
-	{
-		*name = 0;
-		return;
-	}
+    if (tiki->headskins == (char *)1) {
+        *name = 0;
+        return;
+    }
 
-	s = tiki->headmodels;
-	for( num = num - 1; num >= 0; num-- )
-	{
-		s = strstr( s, "\n" );
-		if( !s )
-		{
-			*name = 0;
-			return;
-		}
-		s++;
-	}
+    s = tiki->headskins;
+    for (num = num - 1; num >= 0; num--) {
+        s = strstr(s, "\n");
+        if (!s) {
+            *name = 0;
+            return;
+        }
+        s++;
+    }
 
-	t = strstr( s, "\n" );
-	if( t )
-	{
-		strncpy( name, s, t - s );
-		name[ t - s ] = 0;
-	}
-	else
-	{
-		*name = 0;
-	}
+    t = strstr(s, "\n");
+    if (t) {
+        strncpy(name, s, t - s);
+        name[t - s] = 0;
+    } else {
+        *name = 0;
+    }
 }
diff --git a/code/tiki/tiki_utility.h b/code/tiki/tiki_utility.h
index 4d99eee9..260ff183 100644
--- a/code/tiki/tiki_utility.h
+++ b/code/tiki/tiki_utility.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,26 +22,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // tiki_utility.h : TIKI Utility
 
-#ifndef __TIKI_UTILITY_H__
-#define __TIKI_UTILITY_H__
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-const char *TIKI_Name( dtiki_t *pmdl );
-int TIKI_NumAnims( dtiki_t *pmdl );
-int TIKI_NumSurfaces( dtiki_t *pmdl );
-int TIKI_NumTags( dtiki_t *pmdl );
-void TIKI_CalculateBounds( dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs );
-float TIKI_GlobalRadius( dtiki_t *pmdl );
-int TIKI_NumHeadModels( dtikianim_t *tiki );
-void TIKI_GetHeadModel( dtikianim_t *tiki, int num, char *name );
-int TIKI_NumHeadSkins( dtikianim_t *tiki );
-void TIKI_GetHeadSkin( dtikianim_t *tiki, int num, char *name );
+    const char *TIKI_Name(dtiki_t *pmdl);
+    int         TIKI_NumAnims(dtiki_t *pmdl);
+    int         TIKI_NumSurfaces(dtiki_t *pmdl);
+    int         TIKI_NumTags(dtiki_t *pmdl);
+    void        TIKI_CalculateBounds(dtiki_t *pmdl, float scale, vec3_t mins, vec3_t maxs);
+    float       TIKI_GlobalRadius(dtiki_t *pmdl);
+    int         TIKI_NumHeadModels(dtikianim_t *tiki);
+    void        TIKI_GetHeadModel(dtikianim_t *tiki, int num, char *name);
+    int         TIKI_NumHeadSkins(dtikianim_t *tiki);
+    void        TIKI_GetHeadSkin(dtikianim_t *tiki, int num, char *name);
 
 #ifdef __cplusplus
 }
 #endif
-
-#endif // __TIKI_TIKI_H__
diff --git a/code/uilib/editfield.h b/code/uilib/editfield.h
index 4bea6a0d..d59da86b 100644
--- a/code/uilib/editfield.h
+++ b/code/uilib/editfield.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,23 +20,21 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __EDITFIELD_H__
-#define __EDITFIELD_H__
+#pragma once
 
-class EditField {
+#define EDITFIELD_BUFSIZE 256
+
+class EditField
+{
 public:
-	char m_buffer[ 256 ];
-	int m_cursor;
+    char m_buffer[EDITFIELD_BUFSIZE];
+    int  m_cursor;
 
-	EditField();
+    EditField();
 };
 
-inline
-EditField::EditField()
+inline EditField::EditField()
 {
-	m_buffer[ 0 ] = 0;
-	m_cursor = 0;
+    m_buffer[0] = 0;
+    m_cursor    = 0;
 }
-
-#endif
-
diff --git a/code/uilib/ucolor.cpp b/code/uilib/ucolor.cpp
index 623fcb02..3a62c5fa 100644
--- a/code/uilib/ucolor.cpp
+++ b/code/uilib/ucolor.cpp
@@ -23,19 +23,19 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "ucolor.h"
 #include <cmath>
 
-UColor UClear( 0, 0, 0, 0 );
-UColor UWhite( 1, 1, 1, 1 );
-UColor UBlack( 0, 0, 0, 1 );
-UColor ULightGrey( 0.875, 0.875, 0.875, 1.0 );
-UColor UGrey( 0.75, 0.75, 0.75, 1.0 );
-UColor UDarkGrey( 0.5, 0.5, 0.5, 1.0 );
-UColor ULightRed( 1.0, 0.5, 0.5, 1.0 );
-UColor URed( 1.0, 0.0, 0.0, 1.0 );
-UColor UGreen( 0.0, 1.0, 0.0, 1.0 );
-UColor ULightGreen( 0.5, 1.0, 0.5, 1.0 );
-UColor UBlue( 0.0, 0.0, 1.0, 1.0 );
-UColor UYellow( 1.0, 1.0, 0.0, 1.0 );
-UColor UHudColor( 0.7f, 0.6f, 0.05f, 1.0f );
+const UColor UClear( 0, 0, 0, 0 );
+const UColor UWhite( 1, 1, 1, 1 );
+const UColor UBlack( 0, 0, 0, 1 );
+const UColor ULightGrey( 0.875, 0.875, 0.875, 1.0 );
+const UColor UGrey( 0.75, 0.75, 0.75, 1.0 );
+const UColor UDarkGrey( 0.5, 0.5, 0.5, 1.0 );
+const UColor ULightRed( 1.0, 0.5, 0.5, 1.0 );
+const UColor URed( 1.0, 0.0, 0.0, 1.0 );
+const UColor UGreen( 0.0, 1.0, 0.0, 1.0 );
+const UColor ULightGreen( 0.5, 1.0, 0.5, 1.0 );
+const UColor UBlue( 0.0, 0.0, 1.0, 1.0 );
+const UColor UYellow( 1.0, 1.0, 0.0, 1.0 );
+const UColor UHudColor( 0.7f, 0.6f, 0.05f, 1.0f );
 
 UColor::UColor
 	(
@@ -121,6 +121,14 @@ UColor::UColor
 	}
 }
 
+UColor::UColor(const UColor& color)
+	: r(color.r)
+	, g(color.g)
+	, b(color.b)
+	, a(color.a)
+{
+}
+
 UColor::operator float *( )
 {
 	return ( float * )this;
diff --git a/code/uilib/ucolor.h b/code/uilib/ucolor.h
index f3272cc8..29e3345e 100644
--- a/code/uilib/ucolor.h
+++ b/code/uilib/ucolor.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UCOLOR_H__
-#define __UCOLOR_H__
+#pragma once
 
 class UColor {
 public:
@@ -33,6 +32,7 @@ public:
 	UColor();
 	UColor( float r, float g, float b, float a = 1.0 );
 	UColor( class UColorHSV hsv );
+	UColor( const UColor& color );
 
 	operator float *( );
 	operator float *( ) const;
@@ -72,18 +72,16 @@ public:
 	void CreateSolidBorder( const UColor& color, colorType_t type );
 };
 
-extern UColor UClear;
-extern UColor UWhite;
-extern UColor UBlack;
-extern UColor ULightGrey;
-extern UColor UGrey;
-extern UColor UDarkGrey;
-extern UColor ULightRed;
-extern UColor URed;
-extern UColor UGreen;
-extern UColor ULightGreen;
-extern UColor UBlue;
-extern UColor UYellow;
-extern UColor UHudColor;
-
-#endif /* __UCOLOR_H__ */
+extern const UColor UClear;
+extern const UColor UWhite;
+extern const UColor UBlack;
+extern const UColor ULightGrey;
+extern const UColor UGrey;
+extern const UColor UDarkGrey;
+extern const UColor ULightRed;
+extern const UColor URed;
+extern const UColor UGreen;
+extern const UColor ULightGreen;
+extern const UColor UBlue;
+extern const UColor UYellow;
+extern const UColor UHudColor;
diff --git a/code/uilib/ui_extern.h b/code/uilib/ui_extern.h
index 3067bd23..22883147 100644
--- a/code/uilib/ui_extern.h
+++ b/code/uilib/ui_extern.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_EXTERN_H__
-#define __UI_EXTERN_H__
+#pragma once
 
 #include "../qcommon/q_shared.h"
 #include "../qcommon/qcommon.h"
@@ -83,6 +82,3 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../client/cl_invrender.h"
 #include "../client/cl_uistd.h"
 #include "../client/cl_uiloadsave.h"
-
-#endif /* __UI_EXTERN_H__ */
-
diff --git a/code/uilib/ui_init.cpp b/code/uilib/ui_init.cpp
index 3bf89cd5..b8f7ea30 100644
--- a/code/uilib/ui_init.cpp
+++ b/code/uilib/ui_init.cpp
@@ -61,11 +61,14 @@ int UI_GetCvarInt( const char *name, int def )
 {
 	cvar_t *cvar = uii.Cvar_Find( name );
 
-	if( !cvar )
-	{
+	if( !cvar ) {
 		return def;
 	}
 
+	if (cvar->latchedString) {
+		return atoi(cvar->latchedString);
+	}
+
 	return cvar->integer;
 }
 
@@ -73,11 +76,14 @@ float UI_GetCvarFloat( const char *name, float def )
 {
 	cvar_t *cvar = uii.Cvar_Find( name );
 
-	if( !cvar )
-	{
+	if( !cvar ) {
 		return def;
 	}
 
+	if (cvar->latchedString) {
+		return atof(cvar->latchedString);
+	}
+
 	return cvar->value;
 }
 
@@ -95,7 +101,7 @@ void UI_SetCvarInt( const char *cvar, int value )
 {
 	char s[ 16 ];
 
-	sprintf( s, "%d", value );
+	Com_sprintf( s, sizeof( s ), "%d", value );
 	uii.Cvar_Set( cvar, s );
 }
 
@@ -103,7 +109,7 @@ void UI_SetCvarFloat( const char *cvar, float value )
 {
 	char s[ 16 ];
 
-	sprintf( s, "%f", value );
+	Com_sprintf( s, sizeof( s ), "%f", value );
 	uii.Cvar_Set( cvar, s );
 }
 
diff --git a/code/uilib/ui_local.h b/code/uilib/ui_local.h
index a0f1b28d..d7e2487d 100644
--- a/code/uilib/ui_local.h
+++ b/code/uilib/ui_local.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_LOCAL_H__
-#define __UI_LOCAL_H__
+#pragma once
 
 #include "../client/cl_ui.h"
 
@@ -32,6 +31,3 @@ typedef struct uiGlobals_s {
 } uiGlobals_t;
 
 extern uiGlobals_t ui;
-
-#endif /* __UI_LOCAL_H__ */
-
diff --git a/code/uilib/ui_public.h b/code/uilib/ui_public.h
index 1cd4dd1b..bb86d51a 100644
--- a/code/uilib/ui_public.h
+++ b/code/uilib/ui_public.h
@@ -22,8 +22,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #pragma once
 
-class Event;
-class Listener;
+#ifdef __cplusplus
+  class Event;
+  class Listener;
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef int uihandle_t;
 typedef struct tiki_s tiki_t;
@@ -59,6 +65,11 @@ typedef enum {
 #define SORT_GAME			3
 #define SORT_PING			4
 
+#ifndef __cplusplus
+struct Event;
+struct Listener;
+#endif
+
 typedef struct uiimport_s {
 	uihandle_t( *Rend_RegisterMaterial )( const char *name );
 	uihandle_t( *Rend_RefreshMaterial )( const char *name );
@@ -69,17 +80,25 @@ typedef struct uiimport_s {
 	void( *Rend_DrawPicStretched2 )( float x, float y, float w, float h, float s1, float t1, float s2, float t2, float sx, float sy, qhandle_t hShader );
 	void( *Rend_DrawPicTiled )( float x, float y, float w, float h, qhandle_t hShader );
 	fontheader_t *( *Rend_LoadFont )( const char *name );
-	void( *Rend_DrawString )( fontheader_t *font, const char *text, float x, float y, int maxlen, qboolean bVirtualScreen );
+	void( *Rend_DrawString )( fontheader_t *font, const char *text, float x, float y, int maxlen, const float *pvVirtualScreen );
 	void( *Rend_DrawBox )( float x, float y, float w, float h );
 	int( *Rend_GetShaderWidth )( qhandle_t hShader );
 	int( *Rend_GetShaderHeight )( qhandle_t hShader );
+    qboolean ( *Rend_ImageExists )( const char* name );
+#ifdef __cplusplus
 	void ( *File_PickFile )( const char *name, Listener *obj, Event& event );
+#else
+	void (*File_PickFile)(const char* name, struct Listener* obj, struct Event* event);
+#endif
 	void ( *File_ListFiles )( const char *filespec );
 	long ( *File_OpenFile )( const char *qpath, void **buffer );
 	void ( *File_FreeFile )( void *buffer );
 	void ( *File_WriteFile )( const char *qpath, const void *buffer, int size );
 	uihandle_t ( *Snd_RegisterSound )( const char *sample, qboolean streamed );
 	void ( *Snd_PlaySound )( const char *sound_name );
+	void ( *Snd_PlaySoundDialog )( const char *sound_name );
+	void ( *Snd_FadeSound )( float fTime );
+	void ( *Snd_StopAllSound )();
 	qboolean ( *Alias_Add )( const char *alias, const char *name, const char *parameters );
 	const char *( *Alias_FindRandom )( const char *alias, AliasListNode_t **ret );
 	const char *( *Cvar_GetString )( const char *name, const char *defval );
@@ -98,7 +117,7 @@ typedef struct uiimport_s {
 	const char *( *Cvar_CompleteCvarByNumber )( const char *partial, int number );
 	void( *UI_WantsKeyboard )( void );
 	const char *( *Client_TranslateWidgetName )( const char *widget );
-	void( *Connect )( const char *server );
+	void( *Connect )( const char *server, netadrtype_t family );
 	const char *( *Key_GetKeynameForCommand )( const char *command );
 	const char *( *Key_GetCommandForKey )( int keynum );
 	void ( *Key_SetBinding )( int keynum, const char *binding );
@@ -106,6 +125,13 @@ typedef struct uiimport_s {
 	const char *( *Key_KeynumToString )( int keynum );
 	const char *( *GetConfigstring )( int index );
 	void ( *UI_CloseDMConsole )( void );
+	void ( *GetClipboardData )( char *buf, int buflen );
+
+	//
+	// Added in OPM
+	//
+	int (*GetRefSequence)(void);
+	qboolean (*IsRendererLoaded)(void);
 } uiimport_t;
 
 #if 1
@@ -143,7 +169,9 @@ typedef struct uidef_s {
 	int mouseX;
 	int mouseY;
 	unsigned int mouseFlags;
-	int uiHasMouse;
+    qboolean uiHasMouse;
+    qboolean bHighResScaling;
+    vec2_t scaleRes;
 } uidef_t;
 
 extern uidef_t uid;
@@ -165,3 +193,10 @@ void UI_ListFiles( const char *filespec );
 const char *UI_ConfigString( int index );
 void UI_UpdateCenterPrint(const char* s, float alpha);
 void UI_UpdateLocationPrint(int x, int y, const char* s, float alpha);
+void UI_SetupFiles(void);
+void UI_PrintConsole(const char* msg);
+void UI_PrintDeveloperConsole(const char* msg);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/code/uilib/uibind.cpp b/code/uilib/uibind.cpp
index c89a8da7..c617cc4e 100644
--- a/code/uilib/uibind.cpp
+++ b/code/uilib/uibind.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,107 +21,180 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "uibindlist.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIButton, UIBindButton, NULL )
-{
-	{ NULL, NULL }
+Event EV_UIBindButton_Command("bindcommand", EV_DEFAULT, "s", "cmd", "Command to bind");
+
+CLASS_DECLARATION(UIButton, UIBindButton, NULL) {
+    {&W_AnyMouseDown,          &UIBindButton::Pressed   },
+    {&EV_UIBindButton_Command, &UIBindButton::SetCommand},
+    {NULL,                     NULL                     }
 };
 
 UIBindButton::UIBindButton()
-{
+    : m_getkey(qfalse)
+    , m_bindindex(-1)
+    , m_alternate(qfalse)
+    , m_mat(NULL)
+{}
 
+UIBindButton::UIBindButton(str entersound, str activesound)
+    : m_getkey(qfalse)
+    , m_bindindex(-1)
+    , m_alternate(qfalse)
+    , m_mat(NULL)
+{
+    m_entersound  = entersound;
+    m_activesound = activesound;
+
+    m_mat      = uWinMan.RegisterShader("textures/bind/emptykey");
+    m_material = m_mat;
 }
 
-UIBindButton::UIBindButton
-	(
-	str entersound,
-	str activesound
-	)
-
+void UIBindButton::SetAlternate(qboolean a)
 {
-	// FIXME: stub
+    m_alternate = a;
 }
 
-void UIBindButton::Pressed
-	(
-	Event *ev
-	)
-
+void UIBindButton::SetCommand(Event *ev)
 {
-	// FIXME: stub
+    SetCommand(ev->GetString(1));
 }
 
-void UIBindButton::Pressed
-	(
-	void
-	)
-
+void UIBindButton::SetCommand(str s)
 {
-	// FIXME: stub
+    m_bindcommand = s;
+    m_bindindex   = uWinMan.AddBinding(m_bindcommand);
 }
 
-void UIBindButton::SetCommand
-	(
-	Event *ev
-	)
-
+void UIBindButton::Pressed(void)
 {
-	// FIXME: stub
+    m_getkey = qtrue;
+    uWinMan.SetBindActive(this);
 }
 
-void UIBindButton::SetCommand
-	(
-	str s
-	)
-
+void UIBindButton::Pressed(Event *ev)
 {
-	// FIXME: stub
+    int i, j;
+    int buttons;
+
+    buttons = ev->GetInteger(3);
+
+    if (m_getkey) {
+        for (i = K_MOUSE1, j = 0; i <= K_MOUSE5; i++, j++) {
+            if (buttons & (1 << j)) {
+                KeyEvent(i, 0);
+            }
+        }
+        return;
+    }
+
+    if (!(buttons & 1)) {
+        // Left mouse button is not held
+        return;
+    }
+
+    if (m_parent->isSubclassOf(UIFakkBindList)) {
+        UIFakkBindList *fbl = static_cast<UIFakkBindList *>(m_parent);
+
+        if (!fbl->SetActiveRow(this)) {
+            return;
+        }
+    }
+
+    m_getkey = true;
+    uWinMan.SetBindActive(this);
+    uii.Snd_PlaySound(m_activesound);
 }
 
-void UIBindButton::DrawUnpressed
-	(
-	void
-	)
-
+qboolean UIBindButton::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    if (!m_getkey) {
+        if (m_parent) {
+            return m_parent->KeyEvent(key, 0);
+        }
+
+        return qfalse;
+    }
+
+    if (key != K_ESCAPE && key != K_PAUSE && key != 0) {
+        uWinMan.BindKeyToCommand(m_bindcommand, key, m_bindindex, m_alternate);
+    }
+
+    m_getkey = false;
+    uWinMan.SetBindActive(NULL);
+    uii.Snd_PlaySound(m_entersound);
+
+    return qtrue;
 }
 
-void UIBindButton::DrawPressed
-	(
-	void
-	)
-
+void UIBindButton::DrawPressed(void)
 {
-	// FIXME: stub
+    DrawUnpressed();
 }
 
-void UIBindButton::Clear
-	(
-	void
-	)
-
+void UIBindButton::Clear(void)
 {
-	// FIXME: stub
+    int key1 = -1, key2 = -1;
+    str s;
+
+    s = uWinMan.GetKeyStringForCommand(m_bindcommand, m_bindindex, m_alternate, &key1, &key2);
+    if (m_alternate) {
+        if (key2 > 0) {
+            uWinMan.BindKeyToCommand(str(), key2, m_bindindex, m_alternate);
+        }
+    } else {
+        if (key1 > 0) {
+            uWinMan.BindKeyToCommand(str(), key1, m_bindindex, m_alternate);
+        }
+    }
 }
 
-qboolean UIBindButton::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+void UIBindButton::DrawUnpressed(void)
 {
-	// FIXME: stub
-	return qfalse;
+    str      keyname;
+    UIRect2D clientFrame;
+
+    clientFrame = getClientFrame();
+    if (uWinMan.BindActive() == this) {
+        DrawBoxWithSolidBorder(clientFrame, m_background_color, m_border_color.original, 2, 2, 1.f);
+    }
+
+    if (m_bindindex <= 0) {
+        return;
+    }
+
+    str s = uWinMan.GetKeyStringForCommand(m_bindcommand, m_bindindex, m_alternate, NULL, NULL);
+
+    m_font->setColor(m_background_color);
+
+    if (str::cmp(s, m_last_keyname)) {
+        m_mat = uWinMan.RegisterShader("textures/bind/" + s);
+        if (m_mat) {
+            if (m_mat->GetMaterial()) {
+                m_material = m_mat;
+            } else {
+                m_material = uWinMan.RegisterShader("textures/bind/emptykey");
+            }
+        } else {
+            m_material = uWinMan.RegisterShader("textures/bind/emptykey");
+        }
+
+        m_last_keyname = s;
+    }
+
+    if (m_mat) {
+        if (m_mat->GetMaterial()) {
+            return;
+        }
+    }
+
+    m_font->PrintJustified(
+        UIRect2D(clientFrame.pos.x + 1, clientFrame.pos.y + 1, clientFrame.size.width, clientFrame.size.height),
+        m_iFontAlignmentHorizontal,
+        m_iFontAlignmentVertical,
+        Sys_LV_CL_ConvertString(s),
+        m_bVirtual ? m_vVirtualScale : NULL
+    );
 }
-
-void UIBindButton::SetAlternate
-	(
-	qboolean a
-	)
-
-{
-	// FIXME: stub
-}
-
diff --git a/code/uilib/uibind.h b/code/uilib/uibind.h
index c36f426a..9a807f17 100644
--- a/code/uilib/uibind.h
+++ b/code/uilib/uibind.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,36 +20,33 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIBIND_H__
-#define __UIBIND_H__
+#pragma once
 
-class UIBindButton : public UIButton {
-	str m_bindcommand;
-	int m_bindindex;
-	qboolean m_getkey;
-	qboolean m_alternate;
-	str m_entersound;
-	str m_activesound;
-	str m_last_keyname;
-	UIReggedMaterial *m_mat;
+class UIBindButton : public UIButton
+{
+    str               m_bindcommand;
+    int               m_bindindex;
+    qboolean          m_getkey;
+    qboolean          m_alternate;
+    str               m_entersound;
+    str               m_activesound;
+    str               m_last_keyname;
+    UIReggedMaterial *m_mat;
 
 public:
-	CLASS_PROTOTYPE( UIBindButton );
+    CLASS_PROTOTYPE(UIBindButton);
 
 public:
-	UIBindButton();
-	UIBindButton( str entersound, str activesound );
+    UIBindButton();
+    UIBindButton(str entersound, str activesound);
 
-	void		Pressed( Event *ev );
-	void		Pressed( void );
-	void		SetCommand( Event *ev );
-	void		SetCommand( str s );
-	void		DrawUnpressed( void ) override;
-	void		DrawPressed( void ) override;
-	void		Clear( void );
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		SetAlternate( qboolean a );
+    void     Pressed(Event *ev);
+    void     Pressed(void);
+    void     SetCommand(Event *ev);
+    void     SetCommand(str s);
+    void     DrawUnpressed(void) override;
+    void     DrawPressed(void) override;
+    void     Clear(void);
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     SetAlternate(qboolean a);
 };
-
-#endif
-
diff --git a/code/uilib/uibindlist.cpp b/code/uilib/uibindlist.cpp
index 6d000851..f094a799 100644
--- a/code/uilib/uibindlist.cpp
+++ b/code/uilib/uibindlist.cpp
@@ -21,210 +21,800 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "../qcommon/localization.h"
 
 Event EV_UIFakkBindList_Filename
-	(
-	"filename",
-	EV_DEFAULT,
-	"s",
-	"filename",
-	"Filename that holds bind definitions"
-	);
+(
+    "filename",
+    EV_DEFAULT,
+    "s",
+    "filename",
+    "Filename that holds bind definitions"
+);
 
 Event EV_UIFakkBindList_StopBind
-	(
-	"stopbind",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"stops trying to bind a key to a command"
-	);
+(
+    "stopbind",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "stops trying to bind a key to a command"
+);
 
-CLASS_DECLARATION( UIWidget, UIFakkBindList, NULL )
-{
-	{ &EV_UIFakkBindList_Filename,		&UIFakkBindList::Filename },
-	{ &EV_UIFakkBindList_StopBind,		&UIFakkBindList::StopBind },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIFakkBindList, NULL) {
+    {&EV_UIFakkBindList_Filename, &UIFakkBindList::Filename},
+    {&EV_UIFakkBindList_StopBind, &UIFakkBindList::StopBind},
+    {NULL,                        NULL                     }
 };
 
-
 UIFakkBindList::UIFakkBindList()
 {
-	// FIXME: stub
+    m_scroll  = new UIVertScroll();
+    m_bind    = NULL;
+    m_created = false;
+    AllowActivate(true);
+    m_activerow    = 0;
+    m_activeitem   = 2;
+    m_presskey_wid = NULL;
+    m_presskey_mat = uWinMan.RegisterShader("textures/menu/presskey");
 }
 
-void UIFakkBindList::CreateBindWidgets
-	(
-	void
-	)
-
+UIFakkBindList::~UIFakkBindList()
 {
-	// FIXME: stub
+    m_dying = true;
+    if (m_bind) {
+        delete m_bind;
+    }
 }
 
-void UIFakkBindList::DestroyBindWidgets
-	(
-	void
-	)
-
+void UIFakkBindList::Filename(Event *ev)
 {
-	// FIXME: stub
+    m_bind = new bind_t();
+    CL_LoadBind(ev->GetString(1), m_bind);
+
+    m_scroll->setPageHeight((getSize().height - m_bind->commandheight) / m_bind->commandheight);
+    m_scroll->setNumItems(m_bind->binds.NumObjects());
+    m_scroll->InitFrameAlignRight(this, 0, 0);
+
+    CreateBindWidgets();
 }
 
-void UIFakkBindList::RepositionBindWidgets
-	(
-	void
-	)
-
+void UIFakkBindList::StopBind(Event *ev)
 {
-	// FIXME: stub
+    if (uWinMan.BindActive()) {
+        uWinMan.BindActive()->KeyEvent(K_ESCAPE, 0);
+    }
+
+    m_presskey_wid->setShow(false);
 }
 
-void UIFakkBindList::DrawPressKey
-	(
-	UIRect2D frame
-	)
+void UIFakkBindList::FrameInitialized(void) {}
 
+void UIFakkBindList::CreateBindWidgets(void)
 {
-	// FIXME: stub
+    UIFakkBindListLabel *listlabel;
+    UILabel             *label;
+    int                  i;
+
+    if (m_created || !m_bind) {
+        return;
+    }
+
+    Event evVirtualRes(EV_Layout_VirtualRes);
+    evVirtualRes.AddInteger(1);
+
+    //
+    // List label 1
+    //
+    listlabel = new UIFakkBindListLabel(NULL);
+    m_miscwidgets.AddObject(listlabel);
+    if (m_bVirtual) {
+        listlabel->ProcessEvent(evVirtualRes);
+    }
+
+    listlabel->InitFrame(
+        this, 0, 0, m_bind->commandwidth * m_vVirtualScale[0], m_bind->commandheight * m_vVirtualScale[1], 1
+    );
+    listlabel->setName(m_bind->headers[0]);
+    listlabel->setMaterial(uWinMan.RegisterShader("textures/bind/emptylabel"));
+    listlabel->setTitle(m_bind->headers[0]);
+    listlabel->setForegroundColor(m_bind->titlefgcolor);
+    listlabel->setBackgroundColor(m_bind->titlebgcolor, true);
+
+    //
+    // List label 2
+    //
+    listlabel = new UIFakkBindListLabel(NULL);
+    m_miscwidgets.AddObject(listlabel);
+    if (m_bVirtual) {
+        listlabel->ProcessEvent(evVirtualRes);
+    }
+
+    listlabel->InitFrame(
+        this,
+        m_bind->primarykeywidth * m_vVirtualScale[0],
+        0,
+        m_bind->primarykeywidth * m_vVirtualScale[0],
+        m_bind->commandheight * m_vVirtualScale[1],
+        1
+    );
+    listlabel->setName(m_bind->headers[1]);
+    listlabel->setMaterial(uWinMan.RegisterShader("textures/bind/emptykey"));
+    listlabel->setTitle(m_bind->headers[1]);
+    listlabel->setForegroundColor(m_bind->titlefgcolor);
+    listlabel->setBackgroundColor(m_bind->titlebgcolor, true);
+
+    //
+    // List label 3
+    //
+    listlabel = new UIFakkBindListLabel(NULL);
+    m_miscwidgets.AddObject(listlabel);
+    if (m_bVirtual) {
+        listlabel->ProcessEvent(evVirtualRes);
+    }
+
+    listlabel->InitFrame(
+        this,
+        (m_bind->fillwidth * 2 + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+        0,
+        m_bind->alternatekeywidth * m_vVirtualScale[0],
+        m_bind->commandheight * m_vVirtualScale[1],
+        1
+    );
+    listlabel->setName(m_bind->headers[2]);
+    listlabel->setMaterial(uWinMan.RegisterShader("textures/bind/emptykey"));
+    listlabel->setTitle(m_bind->headers[2]);
+    listlabel->setForegroundColor(m_bind->titlefgcolor);
+    listlabel->setBackgroundColor(m_bind->titlebgcolor, true);
+
+    if (m_bind->fillwidth) {
+        //
+        // Fill label 1
+        //
+        label = new UILabel();
+        m_miscwidgets.AddObject(label);
+
+        if (m_bVirtual) {
+            label->ProcessEvent(evVirtualRes);
+        }
+
+        label->InitFrame(
+            this,
+            (m_bind->commandwidth) * m_vVirtualScale[0],
+            0,
+            m_bind->fillwidth * m_vVirtualScale[0],
+            m_frame.size.height * m_vVirtualScale[1],
+            0
+        );
+        label->setMaterial(m_bind->fillmaterial);
+        label->setShow(true);
+
+        //
+        // Fill label 2
+        //
+        label = new UILabel();
+        m_miscwidgets.AddObject(label);
+
+        if (m_bVirtual) {
+            label->ProcessEvent(evVirtualRes);
+        }
+
+        label->InitFrame(
+            this,
+            (m_bind->fillwidth + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+            0,
+            m_bind->fillwidth * m_vVirtualScale[0],
+            m_frame.size.height * m_vVirtualScale[1],
+            0
+        );
+        label->setMaterial(m_bind->fillmaterial);
+        label->setShow(true);
+
+        //
+        // Fill label 3
+        //
+        label = new UILabel();
+        m_miscwidgets.AddObject(label);
+
+        if (m_bVirtual) {
+            label->ProcessEvent(evVirtualRes);
+        }
+
+        label->InitFrame(
+            this,
+            (m_bind->fillwidth * 2 + m_bind->alternatekeywidth + m_bind->commandwidth + m_bind->primarykeywidth)
+                * m_vVirtualScale[0],
+            0,
+            m_bind->fillwidth * m_vVirtualScale[0],
+            m_frame.size.height * m_vVirtualScale[1],
+            0
+        );
+        label->setMaterial(m_bind->fillmaterial);
+        label->setShow(true);
+    }
+
+    for (i = 1; i <= m_bind->binds.NumObjects(); i++) {
+        UIBindButton *button;
+        bind_item_t  *bi;
+
+        //
+        // Label
+        //
+        listlabel = new UIFakkBindListLabel(this);
+        bi        = m_bind->binds.ObjectAt(i);
+
+        if (m_bVirtual) {
+            listlabel->ProcessEvent(evVirtualRes);
+        }
+
+        listlabel->InitFrame(
+            this,
+            0,
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->commandwidth * m_vVirtualScale[0],
+            m_bind->commandheight * m_vVirtualScale[1],
+            0
+        );
+        listlabel->setName(bi->name);
+        listlabel->setForegroundColor(m_bind->inactivefgcolor);
+        listlabel->setBackgroundColor(m_bind->inactivebgcolor, true);
+        listlabel->setMaterial(uWinMan.RegisterShader("textures/bind/emptylabel"));
+        listlabel->setTitle(bi->name);
+        m_widgetlist.AddObject(listlabel);
+
+        //
+        // Button - bind
+        //
+        button = new UIBindButton(m_bind->entersound, m_bind->activesound);
+        if (m_bVirtual) {
+            button->ProcessEvent(evVirtualRes);
+        }
+        button->SetCommand(bi->command);
+
+        button->InitFrame(
+            this,
+            (m_bind->commandwidth + m_bind->fillwidth) * m_vVirtualScale[0],
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->primarykeywidth * m_vVirtualScale[0],
+            m_bind->primarykeyheight * m_vVirtualScale[1],
+            0
+        );
+        button->setForegroundColor(m_bind->inactivefgcolor);
+        button->setBackgroundColor(m_bind->inactivebgcolor, true);
+        m_widgetlist.AddObject(button);
+
+        //
+        // Button - alternate bind
+        //
+        button = new UIBindButton(m_bind->entersound, m_bind->activesound);
+        if (m_bVirtual) {
+            button->ProcessEvent(evVirtualRes);
+        }
+        button->SetCommand(bi->command);
+        button->SetAlternate(true);
+
+        button->InitFrame(
+            this,
+            (m_bind->fillwidth * 2 + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->alternatekeywidth * m_vVirtualScale[0],
+            m_bind->alternatekeyheight * m_vVirtualScale[1],
+            0
+        );
+        button->setForegroundColor(m_bind->inactivefgcolor);
+        button->setBackgroundColor(m_bind->inactivebgcolor, true);
+        m_widgetlist.AddObject(button);
+    }
+
+    m_presskey_wid = new UILabel();
+    m_miscwidgets.AddObject(m_presskey_wid);
+    if (m_bVirtual) {
+        m_presskey_wid->ProcessEvent(evVirtualRes);
+    }
+
+    m_presskey_wid->setMaterial(m_presskey_mat);
+    m_presskey_wid->InitFrame(NULL, 0, 0, 100, 100, 0);
+    m_presskey_wid->setShow(false);
+
+    // Finished creation
+    m_created = true;
 }
 
-void UIFakkBindList::FrameInitialized
-	(
-	void
-	)
-
+void UIFakkBindList::DestroyBindWidgets(void)
 {
-	// FIXME: stub
+    int       i;
+    UIWidget *pWidget;
+
+    if (!m_created) {
+        return;
+    }
+
+    for (i = 1; i <= m_widgetlist.NumObjects(); i++) {
+        pWidget = m_widgetlist.ObjectAt(i);
+        if (pWidget) {
+            delete pWidget;
+        }
+    }
+
+    m_widgetlist.ClearObjectList();
+
+    for (i = 1; i <= m_miscwidgets.NumObjects(); i++) {
+        pWidget = m_miscwidgets.ObjectAt(i);
+        if (pWidget) {
+            delete pWidget;
+        }
+    }
+
+    m_miscwidgets.ClearObjectList();
+
+    m_presskey_wid = NULL;
+    m_created      = false;
 }
 
-void UIFakkBindList::Filename
-	(
-	Event *ev
-	)
-
+void UIFakkBindList::RepositionBindWidgets(void)
 {
-	// FIXME: stub
+    int       i;
+    UIWidget *pWidget;
+
+    Event evVirtualRes(EV_Layout_VirtualRes);
+    evVirtualRes.AddInteger(1);
+
+    //
+    // Index 1
+    //
+    pWidget = m_miscwidgets.ObjectAt(1);
+    if (m_bVirtual) {
+        pWidget->ProcessEvent(evVirtualRes);
+        pWidget->Realign();
+    }
+
+    pWidget->setFrame(
+        UIRect2D(0, 0, m_bind->commandwidth * m_vVirtualScale[0], m_bind->commandheight * m_vVirtualScale[1])
+    );
+
+    //
+    // Index 2
+    //
+    pWidget = m_miscwidgets.ObjectAt(2);
+    if (m_bVirtual) {
+        pWidget->ProcessEvent(evVirtualRes);
+        pWidget->Realign();
+    }
+
+    pWidget->setFrame(UIRect2D(
+        (m_bind->commandwidth + m_bind->fillwidth) * m_vVirtualScale[0],
+        0,
+        m_bind->primarykeywidth * m_vVirtualScale[0],
+        m_bind->commandheight * m_vVirtualScale[1]
+    ));
+
+    //
+    // Index 3
+    //
+    pWidget = m_miscwidgets.ObjectAt(3);
+    if (m_bVirtual) {
+        pWidget->ProcessEvent(evVirtualRes);
+        pWidget->Realign();
+    }
+    pWidget->setFrame(UIRect2D(
+        (m_bind->fillwidth * 2 + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+        0,
+        m_bind->alternatekeywidth * m_vVirtualScale[0],
+        m_bind->commandheight * m_vVirtualScale[1]
+    ));
+
+    if (m_bind->fillwidth) {
+        //
+        // Index 4
+        //
+        pWidget = m_miscwidgets.ObjectAt(4);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            m_bind->commandwidth * m_vVirtualScale[0], 0, m_bind->fillwidth * m_vVirtualScale[0], m_frame.size.height
+        ));
+
+        //
+        // Index 5
+        //
+        pWidget = m_miscwidgets.ObjectAt(5);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            (m_bind->fillwidth + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+            0,
+            m_bind->fillwidth * m_vVirtualScale[0],
+            m_frame.size.height
+        ));
+
+        //
+        // Index 6
+        //
+        pWidget = m_miscwidgets.ObjectAt(6);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            (m_bind->fillwidth * 2 + m_bind->alternatekeywidth + m_bind->commandwidth + m_bind->primarykeywidth)
+                * m_vVirtualScale[0],
+            0,
+            m_bind->fillwidth * m_vVirtualScale[0],
+            m_frame.size.height
+        ));
+    }
+
+    for (i = 0; i < m_bind->binds.NumObjects(); i++) {
+        //
+        // Subindex 1
+        //
+        pWidget = m_widgetlist.ObjectAt(i * 3 + 1);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            0,
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->commandwidth * m_vVirtualScale[0],
+            m_bind->commandheight * m_vVirtualScale[1]
+        ));
+
+        //
+        // Subindex 2
+        //
+        pWidget = m_widgetlist.ObjectAt(i * 3 + 2);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            (m_bind->commandwidth + m_bind->fillwidth) * m_vVirtualScale[0],
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->primarykeywidth * m_vVirtualScale[0],
+            m_bind->primarykeyheight * m_vVirtualScale[1]
+        ));
+
+        //
+        // Subindex 3
+        //
+        pWidget = m_widgetlist.ObjectAt(i * 3 + 3);
+        if (m_bVirtual) {
+            pWidget->ProcessEvent(evVirtualRes);
+            pWidget->Realign();
+        }
+
+        pWidget->setFrame(UIRect2D(
+            (m_bind->fillwidth * 2 + m_bind->commandwidth + m_bind->primarykeywidth) * m_vVirtualScale[0],
+            (m_bind->commandheight * i) * m_vVirtualScale[1],
+            m_bind->alternatekeywidth * m_vVirtualScale[0],
+            m_bind->alternatekeyheight * m_vVirtualScale[1]
+        ));
+    }
 }
 
-void UIFakkBindList::StopBind
-	(
-	Event *ev
-	)
-
+qboolean UIFakkBindList::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    UIWidget *wid;
+
+    switch (key) {
+    case K_ENTER:
+    case K_KP_ENTER:
+        wid = m_widgetlist.ObjectAt(m_activeitem + m_activerow * 3);
+        if (wid->isSubclassOf(UIBindButton)) {
+            static_cast<UIBindButton *>(wid)->Pressed();
+            uii.Snd_PlaySound(m_bind->activesound);
+        }
+        return true;
+    case K_BACKSPACE:
+    case K_DEL:
+        wid = m_widgetlist.ObjectAt(m_activeitem + m_activerow * 3);
+        if (wid->isSubclassOf(UIBindButton)) {
+            static_cast<UIBindButton *>(wid)->Clear();
+            uii.Snd_PlaySound(m_bind->activesound);
+        }
+        return true;
+    case K_MWHEELUP:
+        m_scroll->AttemptScrollTo(m_scroll->getTopItem() - 1);
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    case K_MWHEELDOWN:
+        m_scroll->AttemptScrollTo(m_scroll->getTopItem() + 1);
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    case K_RIGHTARROW:
+        m_activeitem++;
+        if (m_activeitem > 3) {
+            m_activeitem = 3;
+        }
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    case K_LEFTARROW:
+        m_activeitem--;
+        if (m_activeitem < 2) {
+            m_activeitem = 2;
+        }
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    case K_UPARROW:
+        if (!m_activerow) {
+            return true;
+        }
+        if (m_activerow == m_scroll->getTopItem()) {
+            m_scroll->AttemptScrollTo(m_activerow - 1);
+            m_activerow = m_scroll->getTopItem();
+        } else {
+            m_activerow--;
+        }
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    case K_DOWNARROW:
+        if (m_activerow + 1 >= m_scroll->getNumItems()) {
+            return true;
+        }
+
+        if (m_activerow - m_scroll->getTopItem() + 1 >= m_scroll->getPageHeight()) {
+            if (m_scroll->AttemptScrollTo(m_activerow + 1)) {
+                m_activerow++;
+            }
+            return true;
+        }
+
+        if (m_activerow == m_scroll->getPageHeight() + m_scroll->getTopItem()) {
+            m_scroll->AttemptScrollTo(m_scroll->getTopItem() + 1);
+            m_activerow = m_scroll->getTopItem() + m_scroll->getPageHeight();
+        } else {
+            m_activerow++;
+        }
+
+        uii.Snd_PlaySound(m_bind->changesound);
+        return true;
+    }
+
+    return false;
 }
 
-void UIFakkBindList::setBind
-	(
-	bind_t *b
-	)
-
+void UIFakkBindList::DrawPressKey(UIRect2D frame)
 {
-	// FIXME: stub
+    float x;
+    float w, h;
+
+    if (!m_presskey_mat) {
+        return;
+    }
+
+    w = uii.Rend_GetShaderWidth(m_presskey_mat->GetMaterial()) * m_vVirtualScale[0];
+    h = uii.Rend_GetShaderHeight(m_presskey_mat->GetMaterial()) * m_vVirtualScale[1];
+
+    UIRect2D newFrame    = uWinMan.getFrame();
+    x                    = (newFrame.pos.x + newFrame.size.width - w) * 0.5;
+    newFrame.pos.x       = x;
+    newFrame.pos.y       = (newFrame.pos.y + newFrame.size.height - h) * 0.5;
+    newFrame.size.width  = w;
+    newFrame.size.height = h;
+
+    m_presskey_wid->setFrame(newFrame);
+    m_presskey_wid->setShow(true);
+    m_presskey_wid->BringToFrontPropogated();
 }
 
-void UIFakkBindList::Draw
-	(
-	void
-	)
-
+void UIFakkBindList::Highlight(UIWidget *wid)
 {
-	// FIXME: stub
+    int i, j;
+    int row = 0;
+
+    for (i = 0; i < m_bind->binds.NumObjects(); i++, row++) {
+        for (j = 1; j <= 3; j++) {
+            if (m_widgetlist.ObjectAt(j + i * 3) == wid) {
+                m_activerow  = row;
+                m_activeitem = j;
+            }
+        }
+    }
+
+    uii.Snd_PlaySound(m_bind->changesound);
 }
 
-bool UIFakkBindList::isDying
-	(
-	void
-	)
-
+qboolean UIFakkBindList::SetActiveRow(UIWidget *w)
 {
-	// FIXME: stub
-	return false;
+    int      i, k;
+    int      row = 0;
+    qboolean ret1, ret2;
+    int      new_activerow = -1, new_activeitem = -1;
+
+    for (i = 0; i < m_bind->binds.NumObjects(); i++, row++) {
+        for (k = 1; k <= 3; k++) {
+            if (m_widgetlist.ObjectAt(k + i * 3) == w) {
+                new_activerow  = row;
+                new_activeitem = k;
+            }
+        }
+    }
+
+    ret1 = new_activerow == m_activerow;
+    ret2 = new_activeitem == m_activeitem;
+
+    if (new_activerow != -1) {
+        m_activerow = new_activerow;
+    }
+    if (new_activeitem != -1) {
+        m_activeitem = new_activeitem;
+    }
+
+    if (ret1) {
+        return ret2;
+    }
+
+    return qfalse;
 }
 
-qboolean UIFakkBindList::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+void UIFakkBindList::Draw(void)
 {
-	// FIXME: stub
-	return qfalse;
+    UIWidget *wid;
+    UIWidget *bindwid;
+    int       i, j, k;
+    int       row = 0, topRow;
+
+    if (!m_bind) {
+        return;
+    }
+
+    topRow = m_scroll->getTopItem();
+    if (m_presskey_wid) {
+        m_presskey_wid->setShow(false);
+    }
+
+    bindwid = uWinMan.BindActive();
+    if (bindwid) {
+        for (i = 0; i < m_bind->binds.NumObjects(); i++, row++) {
+            for (k = 1; k <= 3; k++) {
+                if (m_widgetlist.ObjectAt(k + i * 3) == bindwid) {
+                    m_activerow  = row;
+                    m_activeitem = k;
+                    DrawPressKey(bindwid->getFrame());
+                }
+            }
+        }
+    }
+
+    for (i = 0, row = 0; i < m_bind->binds.NumObjects(); i++, row++) {
+        if (m_activerow == row) {
+            for (k = 1; k <= 3; k++) {
+                UIWidget *hwid = m_widgetlist.ObjectAt(k + m_activerow * 3);
+
+                hwid->setForegroundColor(m_bind->highlightfgcolor);
+                hwid->setBackgroundColor(m_bind->highlightbgcolor, true);
+
+                if (m_activeitem != k) {
+                    hwid->setBorderColor(m_bind->inactivebgcolor);
+                } else if (!uWinMan.BindActive()) {
+                    hwid->setForegroundColor(m_bind->selectfgcolor);
+                    hwid->setBackgroundColor(m_bind->selectbgcolor, true);
+                } else {
+                    hwid->setForegroundColor(m_bind->activefgcolor);
+                    hwid->setBackgroundColor(m_bind->activebgcolor, true);
+                    hwid->setBorderColor(m_bind->activebordercolor);
+                }
+            }
+        }
+
+        for (j = 1; j <= 3; j++) {
+            wid = m_widgetlist.ObjectAt(j + i * 3);
+
+            UIRect2D rect = wid->getFrame();
+
+            if (m_activerow != row) {
+                wid->setForegroundColor(m_bind->inactivefgcolor);
+                wid->setBackgroundColor(m_bind->inactivebgcolor, true);
+            }
+
+            if (row < topRow) {
+                wid->setShow(false);
+            } else {
+                rect.pos.y = m_bind->commandheight * (row - topRow);
+                rect.pos.y = (rect.pos.y + m_bind->commandheight) * m_vVirtualScale[1];
+                wid->setShow(true);
+            }
+
+            if (rect.pos.y >= getSize().height) {
+                wid->setShow(false);
+            }
+
+            wid->setFrame(rect);
+        }
+    }
 }
 
-void UIFakkBindList::Highlight
-	(
-	UIWidget *wid
-	)
-
+void UIFakkBindList::Realign(void)
 {
-	// FIXME: stub
+    qboolean bVirtualChanged = qfalse;
+
+    if (m_bVirtual) {
+        float vNewVirtualScale[2];
+
+        vNewVirtualScale[0] = uid.vidWidth / 640.f;
+        vNewVirtualScale[1] = uid.vidHeight / 480.f;
+        bVirtualChanged     = VectorCompare2D(m_vVirtualScale, vNewVirtualScale) == 0;
+    }
+
+    UIWidget::Realign();
+
+    if (m_bVirtual) {
+        Event *event = new Event(EV_Layout_VirtualRes);
+        event->AddInteger(1);
+        m_scroll->ProcessEvent(event);
+    }
+
+    if (bVirtualChanged) {
+        m_scroll->Realign();
+    }
+
+    m_scroll->setPageHeight((getSize().height / m_vVirtualScale[1] - m_bind->commandheight) / m_bind->commandheight);
+
+    m_scroll->InitFrameAlignRight(this, 0, 0);
+    RepositionBindWidgets();
 }
 
-void UIFakkBindList::PlayEnterSound
-	(
-	void
-	)
-
+void UIFakkBindList::setBind(bind_t *b)
 {
-	// FIXME: stub
+    m_bind = b;
 }
 
-qboolean UIFakkBindList::SetActiveRow
-	(
-	UIWidget *w
-	)
-
+bool UIFakkBindList::isDying(void)
 {
-	// FIXME: stub
-	return qfalse;
+    return m_dying;
 }
 
-void UIFakkBindList::Realign
-	(
-	void
-	)
-
+void UIFakkBindList::PlayEnterSound(void)
 {
-	// FIXME: stub
+    uii.Snd_PlaySound(m_bind->entersound);
 }
 
-CLASS_DECLARATION( UILabel, UIFakkBindListLabel, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UILabel, UIFakkBindListLabel, NULL) {
+    {&W_LeftMouseDown, &UIFakkBindListLabel::Pressed},
+    {NULL,             NULL                         }
 };
 
 UIFakkBindListLabel::UIFakkBindListLabel()
 {
-	// FIXME: stub
+    m_list = NULL;
 }
 
-UIFakkBindListLabel::UIFakkBindListLabel
-	(
-	UIFakkBindList *list
-	)
-
+UIFakkBindListLabel::UIFakkBindListLabel(UIFakkBindList *list)
 {
-	// FIXME: stub
+    m_list = list;
 }
 
-void UIFakkBindListLabel::Pressed
-	(
-	Event *ev
-	)
-
+void UIFakkBindListLabel::Pressed(Event *ev)
 {
-	// FIXME: stub
+    if (m_list) {
+        m_list->Highlight(this);
+    }
 }
 
-void UIFakkBindListLabel::Draw
-	(
-	void
-	)
-
+void UIFakkBindListLabel::Draw(void)
 {
-	// FIXME: stub
+    if (!m_title.length()) {
+        return;
+    }
+
+    m_font->setColor(m_background_color);
+
+    UIRect2D frame = getClientFrame();
+    m_font->PrintJustified(
+        getClientFrame(),
+        m_iFontAlignmentHorizontal,
+        m_iFontAlignmentVertical,
+        Sys_LV_CL_ConvertString(m_title),
+        m_bVirtual ? m_vVirtualScale : NULL
+    );
 }
diff --git a/code/uilib/uibindlist.h b/code/uilib/uibindlist.h
index 7f171da3..ea1679ad 100644
--- a/code/uilib/uibindlist.h
+++ b/code/uilib/uibindlist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,63 +20,62 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIBINDLIST_H__
-#define __UIBINDLIST_H__
+#pragma once
 
-class UIFakkBindList : public UIWidget {
-	bool m_created;
-	UIVertScroll *m_scroll;
-	UIReggedMaterial *m_presskey_mat;
-	UILabel *m_presskey_wid;
-	Container<UIWidget *> m_widgetlist;
-	Container<UIWidget *> m_miscwidgets;
-	int m_activerow;
-	int m_activeitem;
-	bind_t *m_bind;
+class UIFakkBindList : public UIWidget
+{
+    bool                  m_created;
+    UIVertScroll         *m_scroll;
+    UIReggedMaterial     *m_presskey_mat;
+    UILabel              *m_presskey_wid;
+    Container<UIWidget *> m_widgetlist;
+    Container<UIWidget *> m_miscwidgets;
+    int                   m_activerow;
+    int                   m_activeitem;
+    bind_t               *m_bind;
 
 public:
-	CLASS_PROTOTYPE( UIFakkBindList );
+    CLASS_PROTOTYPE(UIFakkBindList);
 
 private:
-	void		CreateBindWidgets( void );
-	void		DestroyBindWidgets( void );
-	void		RepositionBindWidgets( void );
-	void		DrawPressKey( UIRect2D frame );
+    void CreateBindWidgets(void);
+    void DestroyBindWidgets(void);
+    void RepositionBindWidgets(void);
+    void DrawPressKey(UIRect2D frame);
 
 protected:
-	void		FrameInitialized( void ) override;
-	void		Filename( Event *ev );
-	void		StopBind( Event *ev );
+    void FrameInitialized(void) override;
+    void Filename(Event *ev);
+    void StopBind(Event *ev);
 
 public:
-	UIFakkBindList();
+    UIFakkBindList();
+    ~UIFakkBindList();
 
-	void		setBind( bind_t *b );
-	void		Draw( void ) override;
-	bool		isDying( void );
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		Highlight( UIWidget *wid );
-	void		PlayEnterSound( void );
-	qboolean	SetActiveRow( UIWidget *w );
-	void		Realign( void ) override;
+    void     setBind(bind_t *b);
+    void     Draw(void) override;
+    bool     isDying(void);
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     Highlight(UIWidget *wid);
+    void     PlayEnterSound(void);
+    qboolean SetActiveRow(UIWidget *w);
+    void     Realign(void) override;
 };
 
-class UIFakkBindListLabel : public UILabel {
-	UIFakkBindList *m_list;
+class UIFakkBindListLabel : public UILabel
+{
+    UIFakkBindList *m_list;
 
 public:
-	CLASS_PROTOTYPE( UIFakkBindListLabel );
+    CLASS_PROTOTYPE(UIFakkBindListLabel);
 
 public:
-	UIFakkBindListLabel();
-	UIFakkBindListLabel( UIFakkBindList *list );
+    UIFakkBindListLabel();
+    UIFakkBindListLabel(UIFakkBindList *list);
 
-	void	Pressed( Event *ev );
-	void	Draw( void ) override;
+    void Pressed(Event *ev);
+    void Draw(void) override;
 };
 
 extern Event EV_UIFakkBindList_Filename;
 extern Event EV_UIFakkBindList_StopBind;
-
-#endif
-
diff --git a/code/uilib/uibutton.cpp b/code/uilib/uibutton.cpp
index 9d8877fa..eeb29f45 100644
--- a/code/uilib/uibutton.cpp
+++ b/code/uilib/uibutton.cpp
@@ -258,7 +258,7 @@ void UIButton::DrawPressed
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
@@ -278,7 +278,7 @@ void UIButton::DrawUnpressed
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
diff --git a/code/uilib/uibutton.h b/code/uilib/uibutton.h
index 9b215866..3daab294 100644
--- a/code/uilib/uibutton.h
+++ b/code/uilib/uibutton.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIBUTTON_H__
-#define __UIBUTTON_H__
+#pragma once
 
 extern Event W_Button_Pressed;
 
@@ -102,5 +101,3 @@ public:
 	void	setCommand( const char *cmd );
 	void	setButton( UIButton *button );
 };
-
-#endif
diff --git a/code/uilib/uicheckbox.cpp b/code/uilib/uicheckbox.cpp
index ab2e3466..77e1c76d 100644
--- a/code/uilib/uicheckbox.cpp
+++ b/code/uilib/uicheckbox.cpp
@@ -22,129 +22,196 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
+Event EV_UICheckBox_SetCheckedCommand
+(
+	"checked_command",
+	EV_DEFAULT,
+	"s",
+	"command",
+	"Command to execute when checkbox is checked"
+);
+
+Event EV_UICheckBox_SetUncheckedCommand
+(
+	"unchecked_command",
+	EV_DEFAULT,
+	"s",
+	"command",
+	"Command to execute when checkbox is unchecked" // text not present in original executable
+);
+
+Event EV_UICheckBox_SetCheckedShader
+(
+	"checked_shader",
+	EV_DEFAULT,
+	"s",
+	"shader",
+	"Set the shader of the small button when it is checked"
+);
+
+Event EV_UICheckBox_SetUncheckedShader
+(
+	"unchecked_shader",
+	EV_DEFAULT,
+	"s",
+	"shader",
+	"Set the shader of the small button when it is unchecked"
+);
+
 CLASS_DECLARATION( UIWidget, UICheckBox, NULL )
 {
-	{ NULL, NULL }
+	{&W_LeftMouseDown,						&UICheckBox::Pressed			},
+	{&W_LeftMouseUp,						&UICheckBox::Released			},
+	{&W_MouseEntered,						&UICheckBox::MouseEntered		},
+	{&W_MouseExited,						&UICheckBox::MouseExited		},
+	{&EV_UICheckBox_SetCheckedCommand,		&UICheckBox::SetCheckedCommand	},
+	{&EV_UICheckBox_SetUncheckedCommand,	&UICheckBox::SetUncheckedCommand},
+	{&EV_UICheckBox_SetCheckedShader,		&UICheckBox::SetCheckedShader	},
+	{&EV_UICheckBox_SetUncheckedShader,		&UICheckBox::SetUncheckedShader	},
+	{NULL,									NULL							}
 };
 
 UICheckBox::UICheckBox()
 {
-	// FIXME: stub
+	AllowActivate(qtrue);
+	m_check_height = 14.0;
+	m_check_width = 14.0;
+	m_indent = 8.0;
+	m_depressed = qfalse;
+	m_checked_material = NULL;
+	m_unchecked_material = NULL;
 }
 
-void UICheckBox::Draw
-	(
-	void
-	)
-
+void UICheckBox::Draw()
 {
-	// FIXME: stub
+	UpdateData();
+
+	if (!m_depressed)
+	{
+		Draw3DBox(0.0f, 0.0f, m_frame.size.width, m_frame.size.height, 0, m_border_color, m_local_alpha);
+	}
+
+	SetColor(m_foreground_color, m_local_alpha);
+
+	UColor color = m_checked ? UBlue : UBlack;
+	UIReggedMaterial* material = m_checked ? m_checked_material : m_unchecked_material;
+
+	float width = m_check_width * m_vVirtualScale[0];
+	float height = m_check_height * m_vVirtualScale[1];
+	float x = m_vVirtualScale[0] * m_indent;
+	float y = (m_frame.size.height - height) * 0.5f;
+	if (material)
+	{
+		uii.Rend_DrawPicStretched(x, y, width, height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
+	}
+	else
+	{
+		DrawBox(x, y, width, height, color, m_local_alpha);
+	}
+
+	float titleX = m_indent * 1.5f + m_check_width;
+	float titleY = (m_frame.size.height / m_vVirtualScale[1] - getTitleHeight()) * 0.5f - 1.0f;
+	return DrawTitle(titleX, titleY);
 }
 
-void UICheckBox::CharEvent
-	(
-	int ch
-	)
-
+void UICheckBox::CharEvent(int ch)
 {
-	// FIXME: stub
+	// Support ticking checkboxes with spacebar
+	if (ch == ' ')
+	{
+		m_checked = !m_checked;
+		UpdateCvar();
+	}
 }
 
-void UICheckBox::Pressed
-	(
-	Event *ev
-	)
-
+void UICheckBox::Pressed(Event *ev)
 {
-	// FIXME: stub
+	m_depressed = qtrue;
 }
 
-void UICheckBox::Released
-	(
-	Event *ev
-	)
-
+void UICheckBox::Released(Event *ev)
 {
-	// FIXME: stub
+	m_checked = !m_checked;
+
+	// Handle additional commands:
+	// this is for checkboxes that either change multiple cvars,
+	// or that set a cvar with a non-bool value.
+	// e.g.: the Invert Mouse checkbox originally flips cvar m_invert_pitch,
+	// but also does ("set m_pitch -0.022" : "set m_pitch 0.022") commands using this
+	str command = m_checked ? m_checked_command : m_unchecked_command;
+	Cbuf_AddText(command.c_str());
+
+	m_depressed = qfalse;
+	UpdateCvar();
 }
 
-void UICheckBox::UpdateCvar
-	(
-	void
-	)
+void UICheckBox::UpdateCvar()
 {
-	// FIXME: stub
+	if (m_cvarname.length())
+	{
+		UI_SetCvarInt(m_cvarname, m_checked);
+	}
+
+	if (m_command.length()) // always seems to be NULL, could be remnant code
+	{
+		const char* text_to_append = m_checked ? " 1\n" : " 0\n";
+		m_command.append(text_to_append);
+		Cbuf_AddText(m_command.c_str());
+	}
+
+	if (m_commandhandler) // always seems to be NULL, could be remnant code
+	{
+		const char *checkedInt = va("%d", m_checked);
+		m_commandhandler(checkedInt, NULL);
+	}
 }
 
-void UICheckBox::MouseEntered
-	(
-	Event *ev
-	)
-
+void UICheckBox::MouseEntered(Event *ev)
 {
-	// FIXME: stub
+	auto num = ev->GetInteger(3);
+	uWinMan.ActivateControl(this);
+	if (num)
+	{
+		m_depressed = qtrue;
+	}
 }
 
-void UICheckBox::MouseExited
-	(
-	Event *ev
-	)
-
+void UICheckBox::MouseExited(Event *ev)
 {
-	// FIXME: stub
+	m_depressed = qfalse;
 }
 
-void UICheckBox::SetCheckedCommand
-	(
-	Event *ev
-	)
-
+void UICheckBox::SetCheckedCommand(Event *ev)
 {
-	// FIXME: stub
+	m_checked_command = ev->GetString(1);
 }
 
-void UICheckBox::SetUncheckedCommand
-	(
-	Event *ev
-	)
-
+void UICheckBox::SetUncheckedCommand(Event *ev)
 {
-	// FIXME: stub
+	m_unchecked_command = ev->GetString(1);
 }
 
-void UICheckBox::SetCheckedShader
-	(
-	Event *ev
-	)
-
+void UICheckBox::SetCheckedShader(Event *ev)
 {
-	// FIXME: stub
+	str shader = ev->GetString(1);
+	m_checked_material = uWinMan.RegisterShader(shader);
 }
 
-void UICheckBox::SetUncheckedShader
-	(
-	Event *ev
-	)
-
+void UICheckBox::SetUncheckedShader(Event *ev)
 {
-	// FIXME: stub
+	str shader = ev->GetString(1);
+	m_unchecked_material = uWinMan.RegisterShader(shader);
 }
 
-void UICheckBox::UpdateData
-	(
-	void
-	)
-
+void UICheckBox::UpdateData(void)
 {
-	// FIXME: stub
+	if (m_cvarname.length())
+	{
+		m_checked = UI_GetCvarInt(m_cvarname.c_str(), 0);
+	}
 }
 
-bool UICheckBox::isChecked
-	(
-	void
-	)
-
+bool UICheckBox::isChecked()
 {
-	// FIXME: stub
-	return false;
+	return m_checked;
 }
diff --git a/code/uilib/uicheckbox.h b/code/uilib/uicheckbox.h
index 871897b8..7e8dd134 100644
--- a/code/uilib/uicheckbox.h
+++ b/code/uilib/uicheckbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UICHECKBOX_H__
-#define __UICHECKBOX_H__
+#pragma once
 
 class UICheckBox : public UIWidget {
 	str m_checked_command;
@@ -56,5 +55,7 @@ public:
 	bool		isChecked( void );
 };
 
-#endif
-
+extern Event EV_UICheckBox_SetCheckedCommand;
+extern Event EV_UICheckBox_SetUncheckedCommand;
+extern Event EV_UICheckBox_SetCheckedShader;
+extern Event EV_UICheckBox_SetUncheckedShader;
diff --git a/code/uilib/uiconsole.cpp b/code/uilib/uiconsole.cpp
index ae2e150a..c77f1b73 100644
--- a/code/uilib/uiconsole.cpp
+++ b/code/uilib/uiconsole.cpp
@@ -155,13 +155,15 @@ void UIConsole::DrawBottomLine
 	int promptwidth;
 	static str prompt = ">";
 	int top;
+	float topScaled;
 	int iXPos;
 	int iMaxStringWidth;
 	int widthbeforecaret;
 
 	promptwidth = m_font->getWidth(prompt.c_str(), -1);
-	top = m_frame.size.height - m_font->getHeight(qfalse);
-	m_font->Print(0.0, top, prompt.c_str(), -1, qfalse);
+	top = m_frame.size.height - m_font->getHeight(getHighResScale());
+	topScaled = top / getHighResScale()[1];
+	m_font->Print(0.0, topScaled, prompt.c_str(), -1, getHighResScale());
 
 	iXPos = promptwidth + 1;
 	iMaxStringWidth = m_frame.size.width - iXPos - m_scroll->getSize().width;
@@ -187,12 +189,12 @@ void UIConsole::DrawBottomLine
 
 		if (widthbeforecaret < iMaxStringWidth)
 		{
-			m_font->Print(iXPos, top, m_currentline.c_str(), -1, qfalse);
+			m_font->Print(iXPos, topScaled, m_currentline.c_str(), -1, getHighResScale());
 		}
 		else
 		{
 			indicatorwidth = m_font->getWidth(indicator.c_str(), -1);
-			m_font->Print(iXPos, top, indicator.c_str(), -1, 0);
+			m_font->Print(iXPos, topScaled, indicator.c_str(), -1, getHighResScale());
 
 			iXPos += indicatorwidth;
 			iMaxStringWidth -= indicatorwidth;
@@ -207,7 +209,7 @@ void UIConsole::DrawBottomLine
 				iCharLength = m_font->getCharWidth(pString[iChar - 1]);
 			}
 
-			m_font->Print(iXPos, top, pString + 1, -1, qfalse);
+			m_font->Print(iXPos, topScaled, pString + 1, -1, getHighResScale());
 			widthbeforecaret = iXPos + m_font->getWidth(pString + 1, m_caret - iChar);
 		}
 	}
@@ -218,19 +220,19 @@ void UIConsole::DrawBottomLine
 
 		completewidth = m_font->getWidth(m_completionbuffer.c_str(), -1);
 		linewidth = m_font->getWidth(&m_currentline[m_completionbuffer.length()], -1);
-		m_font->Print(iXPos, top, m_completionbuffer.c_str(), -1, qfalse);
+		m_font->Print(iXPos, topScaled, m_completionbuffer.c_str(), -1, getHighResScale());
 
 		iXPos += completewidth;
-		m_font->Print(iXPos, top, &m_currentline[m_completionbuffer.length()], -1, 0);
+		m_font->Print(iXPos, topScaled, &m_currentline[m_completionbuffer.length()], -1, getHighResScale());
 
-		DrawBoxWithSolidBorder(UIRect2D(iXPos, top, linewidth, m_font->getHeight(qfalse)), UBlack, URed, 1, 2, 1.0);
+		DrawBoxWithSolidBorder(UIRect2D(iXPos * getHighResScale()[0], top, linewidth * getHighResScale()[0], m_font->getHeight(getHighResScale())), UBlack, URed, 1, 2, 1.0);
 	}
 
 	//
 	// Make the caret blink
 	//
 	if ((uid.time % 750) > 375 && IsActive()) {
-		DrawBox(UIRect2D(widthbeforecaret, top, 1.0, m_font->getHeight(qfalse)), m_foreground_color, 1.0);
+		DrawBox(UIRect2D(widthbeforecaret * getHighResScale()[0], top, 1.0, m_font->getHeight(getHighResScale())), m_foreground_color, 1.0);
 	}
 }
 
@@ -257,7 +259,7 @@ void UIConsole::AddHistory
 		m_history.RemoveCurrentSetNext();
 	}
 
-	m_historyposition = 0;
+	m_historyposition = NULL;
 }
 
 void UIConsole::Print
@@ -275,6 +277,7 @@ void UIConsole::KeyEnter
 	)
 
 {
+	AddHistory();
 	AddText(str(">") + m_currentline + "\n", NULL);
 
 	if (m_consolehandler)
@@ -302,7 +305,7 @@ void UIConsole::setConsoleHandler
 void UIConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -485,7 +488,7 @@ void UIConsole::Draw
 	)
 
 {
-	UColor* pCurrColor;
+	const UColor* pCurrColor;
 
 	m_font->setColor(m_foreground_color);
 	pCurrColor = &m_foreground_color;
@@ -502,7 +505,7 @@ void UIConsole::Draw
 		int lines_drawn, at_line;
 		int topitem;
 
-		top = (int)(m_frame.size.height - m_font->getHeight(false) * (m_scroll->getPageHeight() + 2));
+		top = (int)(m_frame.size.height - m_font->getHeight(getHighResScale()) * (m_scroll->getPageHeight() + 2));
 		item = m_firstitem;
 		topitem = m_scroll->getTopItem() - 1;
 
@@ -510,14 +513,11 @@ void UIConsole::Draw
 			return;
 		}
 
-		i = m_items[item].lines;
-		while (i < topitem) {
+		for (i = m_items[item].lines; i < topitem; i += m_items[item].lines) {
 			item = getNextItem(item);
 			if (item == -1) {
-				break;
+				return;
 			}
-
-			i += m_items[item].lines;
 		}
 
 		if (item == -1) {
@@ -529,21 +529,20 @@ void UIConsole::Draw
 		lines_drawn = 0;
 		while (lines_drawn < m_scroll->getPageHeight() + 1)
 		{
-			if (item != -1 && at_line >= m_items[item].lines)
-			{
+			while (at_line >= m_items[item].lines) {
+				item = getNextItem(item);
 				at_line = 0;
-				do {
-					item = getNextItem(item);
+				if (item == -1) {
+					break;
 				}
-				while (item != -1 && m_items[item].lines <= 0);
+			}
+
+			if (item == -1) {
+				break;
 			}
 
 			if (at_line >= 0)
 			{
-				if (item == -1) {
-					break;
-				}
-
 				if (at_line >= m_items[item].lines) {
 					break;
 				}
@@ -556,10 +555,10 @@ void UIConsole::Draw
 				}
 
 				m_font->setAlpha(m_alpha);
-				m_font->Print(0.0, top, &theItem->string.c_str()[theItem->begins[at_line]], theItem->breaks[at_line], 0);
+				m_font->Print(0.0, top / getHighResScale()[1], &theItem->string.c_str()[theItem->begins[at_line]], theItem->breaks[at_line], getHighResScale());
 			}
 
-			top += m_font->getHeight(false);
+			top += m_font->getHeight(getHighResScale());
 			lines_drawn++;
 			at_line++;
 		}
@@ -593,7 +592,7 @@ void UIConsole::CharEvent
 		m_caret = 0;
 	}
 
-	if (m_currentline == m_caret)
+	if (m_currentline.length() == m_caret)
 	{
 		m_currentline.append(str(char(ch)));
 		m_caret++;
@@ -617,7 +616,7 @@ qboolean UIConsole::KeyEvent
 	)
 
 {
-	// FIXME: Partially implemented
+	const char* command;
 
 	if (key != K_TAB && key != K_BACKSPACE) {
 		m_refreshcompletionbuffer = true;
@@ -626,6 +625,30 @@ qboolean UIConsole::KeyEvent
 	switch (key)
 	{
 	case K_TAB:
+		if (m_refreshcompletionbuffer)
+		{
+			m_completionbuffer = m_currentline;
+			m_refreshcompletionbuffer = false;
+			m_cntcvarnumber = 0;
+			m_cntcmdnumber = 0;
+		}
+
+		command = uii.Cmd_CompleteCommandByNumber(m_completionbuffer.c_str(), m_cntcmdnumber++);
+		if (!command)
+		{
+			command = uii.Cvar_CompleteCvarByNumber(m_completionbuffer.c_str(), m_cntcvarnumber++);
+			if (!command)
+			{
+				m_currentline = m_completionbuffer;
+                m_refreshcompletionbuffer = true;
+                m_caret = m_currentline.length();
+				break;
+			}
+		}
+
+		m_currentline = command;
+		m_currentline += ' ';
+		m_caret = m_currentline.length();
 		break;
 
 	case K_ENTER:
@@ -657,9 +680,52 @@ qboolean UIConsole::KeyEvent
 		break;
 
 	case K_UPARROW:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			// scroll up using the arrow key
+			if (m_scroll->getTopItem() > 0) {
+				m_scroll->setTopItem(m_scroll->getTopItem() - 1);
+			}
+		} else {
+			if (m_history.getCount()) {
+				if (m_historyposition) {
+					m_history.setPosition(m_historyposition);
+
+					if (!m_history.IteratePrev()) {
+						break;
+					}
+				} else {
+					m_history.IterateFromTail();
+				}
+
+				m_historyposition = m_history.getPosition();
+				m_currentline = m_history.getCurrent();
+				m_caret = m_currentline.length();
+			}
+		}
 		break;
 
 	case K_DOWNARROW:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			// scroll down using the arrow key
+			if (m_scroll->getTopItem() + m_scroll->getPageHeight() < m_scroll->getNumItems()) {
+				m_scroll->setTopItem(m_scroll->getTopItem() + 1);
+			}
+		} else {
+            if (m_history.getCount() && m_historyposition) {
+                m_history.setPosition(m_historyposition);
+
+                if (!m_history.IterateNext()) {
+					m_currentline = str();
+					m_caret = 0;
+					m_historyposition = NULL;
+                    break;
+                }
+
+                m_historyposition = m_history.getPosition();
+                m_currentline = m_history.getCurrent();
+                m_caret = m_currentline.length();
+			}
+		}
 		break;
 
 	case K_LEFTARROW:
@@ -683,21 +749,44 @@ qboolean UIConsole::KeyEvent
 		break;
 
 	case K_PGDN:
+		if (m_scroll->getNumItems() >= m_scroll->getPageHeight())
+		{
+			unsigned int top = m_scroll->getNumItems() - m_scroll->getPageHeight();
+			if (m_scroll->getPageHeight() + m_scroll->getTopItem() < top) {
+				top = m_scroll->getPageHeight() + m_scroll->getTopItem();
+			}
+			m_scroll->setTopItem(top);
+		}
 		break;
 
 	case K_PGUP:
+		if (m_scroll->getNumItems() >= m_scroll->getPageHeight()) {
+			m_scroll->setTopItem(m_scroll->getTopItem() - m_scroll->getPageHeight());
+		}
 		break;
 
 	case K_HOME:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			m_scroll->setTopItem(0);
+		} else {
+			m_caret = 0;
+		}
 		break;
 
 	case K_END:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			m_scroll->setTopItem(m_scroll->getNumItems());
+		} else {
+			m_caret = m_currentline.length();
+		}
 		break;
 
 	case K_MWHEELDOWN:
+		m_scroll->AttemptScrollTo(m_scroll->getTopItem() + 2);
 		break;
 
-	case K_MWHEELUP:
+    case K_MWHEELUP:
+        m_scroll->AttemptScrollTo(m_scroll->getTopItem() - 2);
 		break;
 	}
 
@@ -726,7 +815,7 @@ void UIConsole::OnSizeChanged
 	attop = false;
 	atbottom = false;
 
-	linesperpage = (m_frame.size.height / (float)m_font->getHeight(qfalse));
+	linesperpage = (m_frame.size.height / (float)m_font->getHeight(getHighResScale()));
 	m_scroll->InitFrameAlignRight(this, 0, 0);
 
 	if (ev)
@@ -819,13 +908,13 @@ void UIFloatingConsole::FrameInitialized
 	// call the parent initialisation
 	UIFloatingWindow::FrameInitialized();
 
-	m_status = new UIStatusBar(alignment_t::WND_ALIGN_BOTTOM, 20.0);
-	m_status->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-12");
+	m_status = new UIStatusBar(alignment_t::WND_ALIGN_BOTTOM, 20.0 * getHighResScale()[1]);
+	m_status->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "verdana-12");
 	m_status->EnableSizeBox(this);
 	m_status->setTitle(str());
 
 	m_console = new UIConsole();
-	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-14");
+	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "verdana-14");
 	setConsoleColor(m_consoleColor);
 	setConsoleBackground(m_consoleBackground, m_consoleAlpha);
 	m_console->setConsoleHandler(m_handler);
@@ -856,7 +945,7 @@ void UIFloatingConsole::OnChildSizeChanged
 void UIFloatingConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1043,12 +1132,17 @@ void UIDMConsole::KeyEnter
 void UIDMConsole::AddDMMessageText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
 	AddText(text, NULL);
-	uii.Snd_PlaySound("objective_text");
+
+	if (com_target_game->integer >= TG_MOHTA) {
+		uii.Snd_PlaySound("radio_click");
+	} else {
+		uii.Snd_PlaySound("objective_text");
+	}
 }
 
 void UIDMConsole::Draw
@@ -1077,7 +1171,7 @@ qboolean UIDMConsole::KeyEvent
 	)
 
 {
-	// FIXME: Partially implemented
+	const char* command;
 
 	if (key != K_TAB && key != K_BACKSPACE) {
 		m_refreshcompletionbuffer = true;
@@ -1086,12 +1180,39 @@ qboolean UIDMConsole::KeyEvent
 	switch (key)
 	{
 	case K_TAB:
+		if (m_refreshcompletionbuffer)
+		{
+			m_completionbuffer = m_currentline;
+			m_refreshcompletionbuffer = false;
+			m_cntcvarnumber = 0;
+			m_cntcmdnumber = 0;
+		}
+
+		command = uii.Cmd_CompleteCommandByNumber(m_completionbuffer.c_str(), m_cntcmdnumber++);
+		if (!command)
+		{
+			command = uii.Cvar_CompleteCvarByNumber(m_completionbuffer.c_str(), m_cntcvarnumber++);
+			if (!command)
+			{
+				m_currentline = m_completionbuffer;
+                m_refreshcompletionbuffer = true;
+                m_caret = m_currentline.length();
+				break;
+			}
+		}
+
+		m_currentline = command;
+		m_currentline += ' ';
+		m_caret = m_currentline.length();
 		break;
 
 	case K_ENTER:
 	case K_KP_ENTER:
 		if (m_currentline.length()) {
 			KeyEnter();
+		} else {
+			// nothing, close the dm console
+			uii.UI_CloseDMConsole();
 		}
 		break;
 
@@ -1117,9 +1238,52 @@ qboolean UIDMConsole::KeyEvent
 		break;
 
 	case K_UPARROW:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			// scroll up using the arrow key
+			if (m_scroll->getTopItem() > 0) {
+				m_scroll->setTopItem(m_scroll->getTopItem() - 1);
+			}
+		} else {
+			if (m_history.getCount()) {
+				if (m_historyposition) {
+					m_history.setPosition(m_historyposition);
+
+					if (!m_history.IteratePrev()) {
+						break;
+					}
+				} else {
+					m_history.IterateFromTail();
+				}
+
+				m_historyposition = m_history.getPosition();
+				m_currentline = m_history.getCurrent();
+				m_caret = m_currentline.length();
+			}
+		}
 		break;
 
 	case K_DOWNARROW:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			// scroll down using the arrow key
+			if (m_scroll->getTopItem() + m_scroll->getPageHeight() < m_scroll->getNumItems()) {
+				m_scroll->setTopItem(m_scroll->getTopItem() + 1);
+			}
+		} else {
+            if (m_history.getCount() && m_historyposition) {
+                m_history.setPosition(m_historyposition);
+
+                if (!m_history.IterateNext()) {
+					m_currentline = str();
+					m_caret = 0;
+					m_historyposition = NULL;
+                    break;
+                }
+
+                m_historyposition = m_history.getPosition();
+                m_currentline = m_history.getCurrent();
+                m_caret = m_currentline.length();
+			}
+		}
 		break;
 
 	case K_LEFTARROW:
@@ -1143,21 +1307,44 @@ qboolean UIDMConsole::KeyEvent
 		break;
 
 	case K_PGDN:
+		if (m_scroll->getNumItems() >= m_scroll->getPageHeight())
+		{
+			unsigned int top = m_scroll->getNumItems() - m_scroll->getPageHeight();
+			if (m_scroll->getPageHeight() + m_scroll->getTopItem() < top) {
+				top = m_scroll->getPageHeight() + m_scroll->getTopItem();
+			}
+			m_scroll->setTopItem(top);
+		}
 		break;
 
 	case K_PGUP:
+		if (m_scroll->getNumItems() >= m_scroll->getPageHeight()) {
+			m_scroll->setTopItem(m_scroll->getTopItem() - m_scroll->getPageHeight());
+		}
 		break;
 
 	case K_HOME:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			m_scroll->setTopItem(0);
+		} else {
+			m_caret = 0;
+		}
 		break;
 
 	case K_END:
+		if (uii.Sys_IsKeyDown(K_CTRL)) {
+			m_scroll->setTopItem(m_scroll->getNumItems());
+		} else {
+			m_caret = m_currentline.length();
+		}
 		break;
 
 	case K_MWHEELDOWN:
+		m_scroll->AttemptScrollTo(m_scroll->getTopItem() + 2);
 		break;
 
-	case K_MWHEELUP:
+    case K_MWHEELUP:
+        m_scroll->AttemptScrollTo(m_scroll->getTopItem() - 2);
 		break;
 	}
 
@@ -1238,7 +1425,7 @@ void UIFloatingDMConsole::FrameInitialized
 	UIFloatingWindow::FrameInitialized();
 
 	m_console = new UIDMConsole();
-	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0, 20.0), 0, "verdana-12");
+	m_console->InitFrame(getChildSpace(), UIRect2D(0, 0, 20.0 * getHighResScale()[0], 20.0 * getHighResScale()[1]), 0, "facfont-20");
 
 	m_console->Connect(this, W_Deactivated, W_Deactivated);
 	setConsoleColor(m_consoleColor);
@@ -1271,7 +1458,6 @@ void UIFloatingDMConsole::OnChildSizeChanged
 	}
 	else
 	{
-
 		m_console->setFrame(UIRect2D(UIPoint2D(0, 0), childSpaceSize));
 	}
 }
@@ -1279,7 +1465,7 @@ void UIFloatingDMConsole::OnChildSizeChanged
 void UIFloatingDMConsole::AddText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
@@ -1291,7 +1477,7 @@ void UIFloatingDMConsole::AddText
 void UIFloatingDMConsole::AddDMMessageText
 	(
 	const char *text,
-	UColor *pColor
+	const UColor *pColor
 	)
 
 {
diff --git a/code/uilib/uiconsole.h b/code/uilib/uiconsole.h
index cddacd1e..41d3393c 100644
--- a/code/uilib/uiconsole.h
+++ b/code/uilib/uiconsole.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_CONSOLE_H__
-#define __UI_CONSOLE_H__
+#pragma once
 
 typedef void ( *consoleHandler_t )( const char *text );
 
@@ -31,7 +30,7 @@ public:
 	int lines;
 	int begins[ 10 ];
 	int breaks[ 10 ];
-	UColor *pColor;
+	const UColor *pColor;
 
 	item();
 };
@@ -61,7 +60,7 @@ protected:
 	UIVertScroll *m_scroll;
 	int m_firstitem;
 	int m_numitems;
-	int m_caret;
+	size_t m_caret;
 	str m_completionbuffer;
 	bool m_refreshcompletionbuffer;
 	int m_cntcmdnumber;
@@ -86,7 +85,7 @@ public:
 	UIConsole();
 
 	void		setConsoleHandler( consoleHandler_t handler );
-	void		AddText( const char *text, UColor *pColor );
+	void		AddText( const char *text, const UColor *pColor );
 	void		CalcLineBreaks( item& theItem );
 	void		Clear( void );
 	void		FrameInitialized( void ) override;
@@ -113,7 +112,7 @@ public:
 
 	void		FrameInitialized( void ) override;
 	void		OnChildSizeChanged( Event *ev );
-	void		AddText( const char *text, UColor *pColor );
+	void		AddText( const char *text, const UColor *pColor );
 	void		setConsoleHandler( consoleHandler_t handler );
 	void		Clear( void );
 	void		OnClosePressed( Event *ev );
@@ -134,7 +133,7 @@ private:
 public:
 	UIDMConsole();
 
-	void			AddDMMessageText( const char *text, UColor *pColor );
+	void			AddDMMessageText( const char *text, const UColor *pColor );
 	void			Draw( void ) override;
 	qboolean		KeyEvent( int key, unsigned int time ) override;
 	qboolean		GetQuickMessageMode( void );
@@ -160,8 +159,8 @@ public:
 
 	void			FrameInitialized( void ) override;
 	void			OnChildSizeChanged( Event *ev );
-	void			AddText( const char *text, UColor *pColor );
-	void			AddDMMessageText( const char *text, UColor *pColor );
+	void			AddText( const char *text, const UColor *pColor );
+	void			AddDMMessageText( const char *text, const UColor *pColor );
 	void			setConsoleHandler( consoleHandler_t handler );
 	void			Clear( void );
 	void			OnClosePressed( Event *ev );
@@ -172,5 +171,3 @@ public:
 	int				GetMessageMode( void );
 	void			SetMessageMode( int iMode );
 };
-
-#endif
diff --git a/code/uilib/uidialog.cpp b/code/uilib/uidialog.cpp
index 63b59d9f..06c0edc5 100644
--- a/code/uilib/uidialog.cpp
+++ b/code/uilib/uidialog.cpp
@@ -22,75 +22,127 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UIFloatingWindow, UIDialog, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UIFloatingWindow, UIDialog, NULL) {
+    {NULL, NULL}
 };
 
 UIDialog::UIDialog()
 {
-	// FIXME: stub
+    m_label  = NULL;
+    m_ok     = NULL;
+    m_cancel = NULL;
 }
 
-void UIDialog::FrameInitialized
-	(
-	void
-	)
-
+UIDialog::~UIDialog()
 {
-	// FIXME: stub
+    if (m_label) {
+        delete m_label;
+    }
+    if (m_ok) {
+        delete m_ok;
+    }
+    if (m_cancel) {
+        delete m_cancel;
+    }
 }
 
-void UIDialog::LinkCvar
-	(
-	str cvarname
-	)
-
+void UIDialog::FrameInitialized(void)
 {
-	// FIXME: stub
+    UIRect2D rect;
+
+    UIFloatingWindow::FrameInitialized();
+
+    rect = getChildSpace()->getClientFrame();
+
+    m_label = new UILabel();
+    m_label->InitFrame(getChildSpace(), rect, 0);
+
+    m_cancel = new UIButton();
+    m_cancel->setTitle("Cancel");
+    m_cancel->setBackgroundAlpha(0);
+    m_cancel->InitFrame(getChildSpace(), rect.size.width - 60 - 48, rect.size.height - 24 - 6, 60, 24, 0);
+    m_cancel->Connect(this, W_Button_Pressed, UIFloatingWindow::W_ClosePressed);
+
+    m_ok = new UIButton();
+    m_ok->setTitle("Ok");
+    m_ok->setBackgroundAlpha(0);
+    m_ok->InitFrame(getChildSpace(), 48, rect.size.height - 24 - 6, 60, 24, 0);
+    m_ok->Connect(this, W_Button_Pressed, UIFloatingWindow::W_ClosePressed);
+
+    m_minimizeButton->ProcessEvent(new Event("hide"));
+    m_closeButton->ProcessEvent(new Event("hide"));
 }
 
-void UIDialog::SetOKCommand
-	(
-	str cvarname
-	)
-
+void UIDialog::LinkCvar(str cvarname)
 {
-	// FIXME: stub
+    cvar_t *cvar;
+    str     formatted;
+    char   *ptr;
+    char   *nextptr;
+    char    dialog[256];
+
+    if (!m_label) {
+        return;
+    }
+
+    cvar = UI_FindCvar(cvarname);
+    if (!cvar) {
+        return;
+    }
+
+    Q_strncpyz(dialog, cvar->string, sizeof(dialog));
+    ptr = dialog;
+
+    for (ptr = dialog; ptr; ptr = nextptr + 1) {
+        nextptr = strchr(ptr, '$');
+        if (nextptr) {
+            *nextptr = 0;
+        }
+
+        if (strlen(ptr)) {
+            formatted += ptr;
+        }
+
+        formatted += '\n';
+
+        if (!nextptr) {
+            break;
+        }
+
+        *nextptr = '$';
+    }
+
+    m_label->SetLabel(formatted);
 }
 
-void UIDialog::SetCancelCommand
-	(
-	str cvarname
-	)
-
+void UIDialog::SetOKCommand(str cvarname)
 {
-	// FIXME: stub
+    if (m_ok) {
+        m_ok->LinkCommand(cvarname);
+    }
 }
 
-void UIDialog::SetLabelMaterial
-	(
-	UIReggedMaterial *mat
-	)
-
+void UIDialog::SetCancelCommand(str cvarname)
 {
-	// FIXME: stub
+    if (m_cancel) {
+        m_cancel->LinkCommand(cvarname);
+    }
 }
 
-void UIDialog::SetOkMaterial
-	(
-	UIReggedMaterial *mat
-	)
-
+void UIDialog::SetLabelMaterial(UIReggedMaterial *mat)
 {
-	// FIXME: stub
+    m_label->setMaterial(mat);
+    m_label->setTitle(str());
 }
 
-void UIDialog::SetCancelMaterial
-	(
-	UIReggedMaterial *mat
-	)
-
+void UIDialog::SetOkMaterial(UIReggedMaterial *mat)
 {
-	// FIXME: stub
+    m_ok->setMaterial(mat);
+    m_ok->setTitle(str());
+}
+
+void UIDialog::SetCancelMaterial(UIReggedMaterial *mat)
+{
+    m_cancel->setMaterial(mat);
+    m_cancel->setTitle(str());
 }
diff --git a/code/uilib/uidialog.h b/code/uilib/uidialog.h
index 6fcc0fe4..0cf7d94e 100644
--- a/code/uilib/uidialog.h
+++ b/code/uilib/uidialog.h
@@ -20,28 +20,26 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIDIALOG_H__
-#define __UIDIALOG_H__
+#pragma once
 
-class UIDialog : public UIFloatingWindow {
+class UIDialog : public UIFloatingWindow
+{
 public:
-	UILabel *m_label;
-	UIButton *m_ok;
-	UIButton *m_cancel;
+    UILabel  *m_label;
+    UIButton *m_ok;
+    UIButton *m_cancel;
 
 public:
-	CLASS_PROTOTYPE( UIDialog );
+    CLASS_PROTOTYPE(UIDialog);
 
-	UIDialog();
+    UIDialog();
+    ~UIDialog();
 
-	void	FrameInitialized( void ) override;
-	void	LinkCvar( str cvarname ) override;
-	void	SetOKCommand( str command );
-	void	SetCancelCommand( str command );
-	void	SetLabelMaterial( UIReggedMaterial *mat );
-	void	SetOkMaterial( UIReggedMaterial *mat );
-	void	SetCancelMaterial( UIReggedMaterial *mat );
+    void FrameInitialized(void) override;
+    void LinkCvar(str cvarname) override;
+    void SetOKCommand(str command);
+    void SetCancelCommand(str command);
+    void SetLabelMaterial(UIReggedMaterial *mat);
+    void SetOkMaterial(UIReggedMaterial *mat);
+    void SetCancelMaterial(UIReggedMaterial *mat);
 };
-
-#endif
-
diff --git a/code/uilib/uifield.cpp b/code/uilib/uifield.cpp
index 1249305a..51a4a744 100644
--- a/code/uilib/uifield.cpp
+++ b/code/uilib/uifield.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,59 +22,305 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UIWidget, UIField, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIField, NULL) {
+    {&W_LeftMouseDown, &UIField::Pressed},
+    {NULL,             NULL             }
 };
 
 UIField::UIField()
 {
-	// FIXME: stub
+    AllowActivate(qtrue);
+    m_iPreStep = 0;
 }
 
-void UIField::Draw
-	(
-	void
-	)
-
+void UIField::Draw(void)
 {
-	// FIXME: stub
+    UpdateData();
+
+    // the width of the widget that can be filled with valid text
+    float fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(" ..", -1);
+    float indentLength  = m_indent;
+    float cursorSize    = m_font->getCharWidth('_');
+
+    // The total pixel length of the entire string in the editfield buffer
+    float totalDrawLength = m_font->getWidth(m_edit.m_buffer, -1) + indentLength;
+
+    // The index of the character that has to be shown first
+    // when viewing the end of the string to properly fill out the field
+    int iMaxPreStep;
+
+    float fEndLen = totalDrawLength + cursorSize;
+    int   buflen  = strlen(m_edit.m_buffer);
+
+    // Calculate the max prestep
+    for (iMaxPreStep = 0; fEndLen > fVirtualWidth && iMaxPreStep < buflen; iMaxPreStep++) {
+        float fCharWidth = m_font->getCharWidth(m_edit.m_buffer[iMaxPreStep]);
+        fEndLen -= fCharWidth;
+    } // fEndLen is discarded
+
+    // Index of the last currently visible character in the textfield
+    int iLastChar;
+
+    fEndLen = indentLength + cursorSize;
+    for (iLastChar = m_iPreStep; fEndLen < fVirtualWidth; iLastChar++) {
+        if (char c = m_edit.m_buffer[iLastChar]) {
+            float fCharWidth = m_font->getCharWidth(c);
+            fEndLen += fCharWidth;
+        } else {
+            // important to quit early!
+            // otherwise iLastChar would get incremented one extra time
+            break;
+        }
+    }
+
+    if (IsActive()) {
+        if (m_edit.m_cursor >= m_iPreStep) {
+            // Fixed in OPM
+            // m_iPreStep < iLastChar check added to avoid passing negative size to Q_strncpyz and crashing the game
+            while (iLastChar <= m_edit.m_cursor && m_iPreStep < iMaxPreStep && m_iPreStep < iLastChar
+            ) { // is text too long to fit?
+                fEndLen -= m_font->getCharWidth(m_edit.m_buffer[m_iPreStep]);
+                m_iPreStep++;
+
+                // FIXME: repetitive logic
+                if (char c = m_edit.m_buffer[iLastChar]) {
+                    float fCharWidth = m_font->getCharWidth(c);
+                    fEndLen += fCharWidth;
+                } else {
+                    break;
+                }
+
+                while (fEndLen < fVirtualWidth) {
+                    iLastChar++;
+
+                    if (char c = m_edit.m_buffer[iLastChar]) {
+                        float fCharWidth = m_font->getCharWidth(c);
+                        fEndLen += fCharWidth;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        } else {
+            m_iPreStep = m_edit.m_cursor;
+        }
+
+        m_iPreStep = Q_min(m_iPreStep, iMaxPreStep);
+    }
+
+    // Put the portion of the text intended for display into the temptext buffer
+    char temptext[EDITFIELD_BUFSIZE];
+    Q_strncpyz(temptext, &m_edit.m_buffer[m_iPreStep], iLastChar - m_iPreStep + 1);
+
+    // Calculate cursor position
+    float cursorPos = indentLength - 1.0f;
+
+    // Added in OPM
+    // new i < EDITFIELD_BUFSIZE check for extra safety
+    for (int i = m_iPreStep; i < m_edit.m_cursor && i < EDITFIELD_BUFSIZE; i++) {
+        float fCharWidth = m_font->getCharWidth(m_edit.m_buffer[i]);
+        cursorPos += fCharWidth;
+    }
+
+    cursorPos = Q_min(cursorPos, fVirtualWidth);
+
+    // Calculate text height
+    float y = m_frame.size.height / getVirtualScale()[1] - m_font->getHeight();
+    if (m_bottomindent * 2 <= y) // upper and lower margin
+    {
+        y -= m_bottomindent;
+    } else {
+        y /= 2;
+    }
+
+    // Show text
+    m_font->setColor(m_foreground_color);
+    m_font->Print(m_indent, y, temptext, -1, getVirtualScale());
+
+    // Display blinking cursor if field is in focus
+    if (IsActive()) {
+        const char *cursorChar = (uid.time / 250) & 1 ? "|" : "_";
+        m_font->Print(cursorPos, y, cursorChar, -1, getVirtualScale());
+    }
+
+    Q_strncpyz(temptext, "..", EDITFIELD_BUFSIZE);
+
+    if (m_iPreStep) {
+        // Display leading dots if not starting from the beginning
+        m_font->Print(2.0f, y, temptext, -1, getVirtualScale());
+    }
+
+    // Added in OPM
+    // new iLastChar < EDITFIELD_BUFSIZE check for extra safety
+    if (iLastChar < EDITFIELD_BUFSIZE && m_edit.m_buffer[iLastChar]) {
+        // Display trailing dots if not ending at the end
+        fVirtualWidth = m_frame.size.width / getVirtualScale()[0] - m_font->getWidth(temptext, -1) - 2.0f;
+        m_font->Print(fVirtualWidth, y, temptext, -1, getVirtualScale());
+    }
 }
 
-qboolean UIField::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+qboolean UIField::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
-	return qfalse;
+    if (key == 'l' && uii.Sys_IsKeyDown(K_CTRL)) {
+        return qtrue;
+    }
+
+    if (key == K_ENTER || key == K_KP_ENTER) {
+        if (m_cvarname.length()) {
+            uii.Cvar_Set(m_cvarname, m_edit.m_buffer);
+        }
+
+        if (m_commandhandler) {
+            m_commandhandler(str(m_edit.m_buffer) + '\n', NULL);
+        }
+
+        if (m_command.length()) {
+            str result = m_command + ' ' + m_edit.m_buffer + '\n';
+            Cbuf_AddText(result);
+        }
+        return qtrue;
+    }
+
+    if ((key == K_INS || key == K_KP_INS) && uii.Sys_IsKeyDown(K_SHIFT)) {
+        return qtrue;
+    }
+
+    int len = strlen(m_edit.m_buffer);
+    switch (key) {
+    case K_DEL: // DELETE key, backspace is handled in CharEvent
+        if (m_edit.m_cursor < len) {
+            memmove(&m_edit.m_buffer[m_edit.m_cursor], &m_edit.m_buffer[m_edit.m_cursor + 1], len - m_edit.m_cursor);
+
+            if (m_cvarname.length()) {
+                uii.Cvar_Set(m_cvarname, m_edit.m_buffer);
+            }
+        }
+        return qtrue;
+    case K_RIGHTARROW:
+        if (m_edit.m_cursor < len) {
+            m_edit.m_cursor++;
+        }
+        return qtrue;
+    case K_LEFTARROW:
+        if (m_edit.m_cursor > 0) {
+            m_edit.m_cursor--;
+        }
+        return qtrue;
+    }
+
+    // HOME or Ctrl + A
+    if (key == K_HOME || (tolower(key) == 'a' && uii.Sys_IsKeyDown(K_CTRL))) {
+        m_edit.m_cursor = 0;
+        return qtrue;
+    }
+
+    // END or Ctrl + E
+    if (key == K_END || (tolower(key) == 'e' && uii.Sys_IsKeyDown(K_CTRL))) {
+        m_edit.m_cursor = len;
+        return qtrue;
+    }
+
+    return key == K_INS;
 }
 
-void UIField::CharEvent
-	(
-	int ch
-	)
-
+void UIField::CharEvent(int ch)
 {
-	// FIXME: stub
+    uii.Snd_PlaySound("sound/menu/typekey.wav");
+
+    if (ch == 3 || ch == 22) // Ctrl + C (^C) or Ctrl + V (^V)
+    {
+        return;
+    }
+
+    int len = strlen(m_edit.m_buffer);
+    switch (ch) {
+    case '\b': // backspace or Ctrl + H (^H) - DEL is handled in KeyEvent
+        if (m_edit.m_cursor <= 0) {
+            // already at beginning of field
+            return;
+        }
+
+        // Move all text after the cursor one position back
+        memmove(&m_edit.m_buffer[m_edit.m_cursor - 1], &m_edit.m_buffer[m_edit.m_cursor], len + 1 - m_edit.m_cursor);
+
+        // move back cursor by one
+        m_edit.m_cursor--;
+
+        if (m_cvarname.length()) {
+            uii.Cvar_Set(m_cvarname, m_edit.m_buffer);
+        }
+
+        return;
+    case 1: // Home (^A)
+        m_edit.m_cursor = 0;
+        return;
+    case 5: // End (^E)
+        m_edit.m_cursor = len;
+        return;
+    }
+
+    // original check only does ch < 32,
+    // this one excludes DEL too but it shouldn't be a problem,
+    // DEL is handled in KeyEvent
+    if (iscntrl(ch)) {
+        return;
+    }
+
+    len++; // new printable character was typed
+
+    // Fixed in OPM
+    // originally this was len == EDITFIELD_BUFSIZE, just being extra safe
+    if (len >= EDITFIELD_BUFSIZE) // is it out of bounds?
+    {
+        return;
+    }
+
+    // make room for the character in the buffer
+    memmove(&m_edit.m_buffer[m_edit.m_cursor + 1], &m_edit.m_buffer[m_edit.m_cursor], len - m_edit.m_cursor);
+
+    // insert the new character at the cursor's location
+    m_edit.m_buffer[m_edit.m_cursor] = ch;
+
+    // advance the cursor
+    m_edit.m_cursor++;
+
+    // if the character was inserted at the end of the string,
+    // make sure it remains NULL-terminated
+    if (m_edit.m_cursor == len) {
+        m_edit.m_buffer[m_edit.m_cursor] = 0;
+    }
+
+    if (m_cvarname.length()) {
+        uii.Cvar_Set(m_cvarname, m_edit.m_buffer);
+    }
 }
 
-void UIField::UpdateData
-	(
-	void
-	)
-
+void UIField::UpdateData(void)
 {
-	// FIXME: stub
+    if (m_cvarname.length()) {
+        str::snprintf(m_edit.m_buffer, EDITFIELD_BUFSIZE, "%s", CvarGetForUI(m_cvarname, ""));
+        m_edit.m_cursor = Q_min(m_edit.m_cursor, strlen(m_edit.m_buffer));
+    }
 }
 
-void UIField::Pressed
-	(
-	Event *ev
-	)
-
+void UIField::Pressed(Event *ev)
 {
-	// FIXME: stub
+    float xpos  = ev->GetFloat(1);
+    float point = (xpos - m_frame.pos.x) / getVirtualScale()[0];
+    point       = Q_max(point, 0.0f); // added in 2.15
+
+    int   iStep        = m_iPreStep;
+    float fStringWidth = m_indent;
+    while (char c = m_edit.m_buffer[iStep]) {
+        iStep++;
+        fStringWidth += m_font->getCharWidth(c);
+        if (point <= fStringWidth) {
+            if (iStep > 0) {
+                iStep--; // put the cursor BEFORE the clicked character
+            }
+            break;
+        }
+    }
+
+    m_edit.m_cursor = iStep;
 }
diff --git a/code/uilib/uifield.h b/code/uilib/uifield.h
index 02c65f78..04903273 100644
--- a/code/uilib/uifield.h
+++ b/code/uilib/uifield.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,27 +20,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIFIELD_H__
-#define __UIFIELD_H__
+#pragma once
 
-class UIField : public UIWidget {
-	EditField m_edit;
-	int m_iPreStep;
+class UIField : public UIWidget
+{
+    EditField m_edit;
+    // Index of the first currently visible character in the textfield
+    int m_iPreStep;
 
 public:
-	CLASS_PROTOTYPE( UIField );
+    CLASS_PROTOTYPE(UIField);
 
 private:
-	void		Draw( void ) override;
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		CharEvent( int ch ) override;
+    void     Draw(void) override;
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     CharEvent(int ch) override;
 
 public:
-	UIField();
+    UIField();
 
-	void		UpdateData( void ) override;
-	void		Pressed( Event *ev );
+    void UpdateData(void) override;
+    void Pressed(Event *ev);
 };
-
-#endif
-
diff --git a/code/uilib/uifloatwnd.cpp b/code/uilib/uifloatwnd.cpp
index d4805684..21f698ac 100644
--- a/code/uilib/uifloatwnd.cpp
+++ b/code/uilib/uifloatwnd.cpp
@@ -115,10 +115,10 @@ void UIFloatingWindow::FrameInitialized
 	//
 	m_closeButton->InitFrame(
 		this,
-		m_frame.size.width - 18.0,
+		m_frame.size.width - 18.0 * getHighResScale()[0],
 		2.0,
-		16.0,
-		16.0,
+		16.0 * getHighResScale()[0],
+		16.0 * getHighResScale()[1],
 		-1,
 		"marlett"
 	);
@@ -131,10 +131,10 @@ void UIFloatingWindow::FrameInitialized
 	//
 	m_minimizeButton->InitFrame(
 		this,
-		m_frame.size.width - 36.0,
+		m_frame.size.width - 36.0 * getHighResScale()[0],
 		2.0,
-		16.0,
-		16.0,
+		16.0 * getHighResScale()[0],
+		16.0 * getHighResScale()[1],
 		-1,
 		"marlett"
 	);
@@ -156,7 +156,7 @@ void UIFloatingWindow::FrameInitialized
 	{
 		m_childspace->InitFrame(
 			this,
-			UIRect2D(2.0, 20.0, m_frame.size.width - 4.0, m_frame.size.height - 22.0),
+			UIRect2D(2.0, 20.0 * getHighResScale()[1], m_frame.size.width - 4.0, m_frame.size.height - 22.0 * getHighResScale()[1]),
 			0,
 			"verdana-12"
 		);
@@ -198,7 +198,7 @@ void UIFloatingWindow::MinimizePressed
 		// save the hold height
 		// so the window can be restored later
 		m_restoredHeight = size.height;
-		size.height = 20.0;
+		size.height = 20.0 * getHighResScale()[1];
 		m_minimizeButton->setTitle("1");
 	}
 	else
@@ -288,17 +288,17 @@ void UIFloatingWindow::SizeChanged
 {
 	UIRect2D childRect;
 	childRect.pos.x = 2.0;
-	childRect.pos.y = 20.0;
-	childRect.size.width = m_frame.size.width - 4.0;
-	childRect.size.height = m_frame.size.height - 22.0;
+	childRect.pos.y = 20.0 * getHighResScale()[1];
+	childRect.size.width = m_frame.size.width - 4.0 * getHighResScale()[0];
+	childRect.size.height = m_frame.size.height - 22.0 * getHighResScale()[1];
 
 	if (childRect.size.width <= 0.0 || childRect.size.height <= 0.0) {
 		return;
 	}
 
 	m_childspace->setFrame(childRect);
-	m_closeButton->setFrame(UIRect2D(m_frame.size.width - 18.0, 2.0, 16.0, 16.0));
-	m_minimizeButton->setFrame(UIRect2D(m_frame.size.width - 36.0, 2.0, 16.0, 16.0));
+	m_closeButton->setFrame(UIRect2D(m_frame.size.width - 18.0 * getHighResScale()[0], 2.0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1]));
+	m_minimizeButton->setFrame(UIRect2D(m_frame.size.width - 36.0 * getHighResScale()[0], 2.0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1]));
 }
 
 void UIFloatingWindow::OnActivated
@@ -414,11 +414,13 @@ void UIFloatingWindow::Draw
 		);
 	}
 
+	const float maxTitleBarHeight = 20 * getHighResScale()[1];
+
 	DrawBox(
 		0.0,
 		0.0,
 		m_frame.size.width,
-		m_frame.size.height > 20.0 ? 20.0 : m_frame.size.height,
+		m_frame.size.height > maxTitleBarHeight ? maxTitleBarHeight : m_frame.size.height,
 		titleBar,
 		1.0
 	);
@@ -427,7 +429,7 @@ void UIFloatingWindow::Draw
 		0.0,
 		0.0,
 		m_frame.size.width,
-		m_frame.size.height > 20.0 ? 20.0 : m_frame.size.height,
+		m_frame.size.height > maxTitleBarHeight ? maxTitleBarHeight : m_frame.size.height,
 		false,
 		titleBorder,
 		1.0
diff --git a/code/uilib/uifloatwnd.h b/code/uilib/uifloatwnd.h
index 570bbda1..d1735dc8 100644
--- a/code/uilib/uifloatwnd.h
+++ b/code/uilib/uifloatwnd.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UI_FLOATWND_H__
-#define __UI_FLOATWND_H__
+#pragma once
 
 class UIChildSpaceWidget : public UIWidget {
 public:
@@ -78,5 +77,3 @@ public:
 };
 
 static UColor UWindowColor(0.15f, 0.195f, 0.278f, 1);
-
-#endif
diff --git a/code/uilib/uifont.cpp b/code/uilib/uifont.cpp
index 1ac04a85..ca19df92 100644
--- a/code/uilib/uifont.cpp
+++ b/code/uilib/uifont.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,302 +22,619 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-qboolean UI_FontDBCSIsLeadByte(fontheader_t* font, unsigned short uch);
-int UI_FontCodeSearch(const fontheader_t* font, unsigned short uch);
+qboolean UI_FontDBCSIsLeadByte(fontheader_t *font, unsigned short uch);
+int      UI_FontCodeSearch(const fontheader_t *font, unsigned short uch);
+int      UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLen);
 
-UIFont::UIFont()
-{
-	m_font = uii.Rend_LoadFont( "verdana-14" );
-	if( !m_font ) {
-		uii.Sys_Error( ERR_DROP, "Couldn't load font Verdana\n" );
-	}
+const unsigned char DBCS_Maekin_TraditionalChinese[] = {
+    0x0A1, 0x0E3, 0x0A1, 0x0CA, 0x0A1, 0x5B,  0x0A2, 0x4E,  0x0A2, 0x0B1, 0x0A1, 0x0CC, 0x0A2, 0x0B2, 0x0A2, 0x43,
+    0x0A2, 0x4C,  0x0A1, 0x0EC, 0x0A2, 0x4D,  0x0A2, 0x0B4, 0x0A1, 0x73,  0x0A1, 0x6F,  0x0A3, 0x4E,  0x0F9, 0x0DE,
+    0x0A2, 0x73,  0x0F9, 0x0F0, 0x0A2, 0x0B5, 0x0A1, 0x0CD, 0x0A2, 0x0B6, 0x0A1, 0x0B0, 0x0A1, 0x0B8, 0x0A2, 0x0B7,
+    0x0A1, 0x5D,  0x0A1, 0x5F,  0x0A1, 0x0B3, 0x0A1, 0x0B4, 0x0A2, 0x0B8, 0x0A1, 0x5E,  0x0A1, 0x60,  0x0A2, 0x0AF,
+    0x0A1, 0x0C5, 0x0A1, 0x0DE, 0x0A1, 0x0F0, 0x0A1, 0x0F1, 0x0A1, 0x0F2, 0x0A1, 0x0D3, 0x0A2, 0x71,  0x0A2, 0x0A6,
+    0x0F9, 0x0E1, 0x0F9, 0x0EA, 0x0F9, 0x0F3, 0x0A1, 0x0A1, 0x57,  0x0A1, 0x59,  0x0A2, 0x78,  0x0F9, 0x0F8, 0x0A2,
+    0x79,  0x0A1, 0x49,  0x0A2, 0x49,  0x0A1, 0x0AD, 0x0A2, 0x43,  0x0A2, 0x48,  0x0A1, 0x0F4, 0x0A1, 0x0AE, 0x0A1,
+    0x0AF, 0x0A1, 0x7D,  0x0A1, 0x7E,  0x0A1, 0x0C4, 0x0A1, 0x0CF, 0x0A1, 0x0FC, 0x0A1, 0x61,  0x0A1, 0x63,  0x0A1,
+    0x0A1, 0x0A1, 0x62,  0x0A1, 0x64,  0x0A1, 0x0A2, 0x0A1, 0x0A7, 0x0A1, 0x0A8, 0x0A1, 0x0A9, 0x0A1, 0x0B2, 0x0A1,
+    0x46,  0x0A1, 0x51,  0x0A3, 0x0B5, 0x0A1, 0x41,  0x0A1, 0x4D,  0x0A1, 0x42,  0x0A1, 0x4E,  0x0A3, 0x0AE, 0x0A1,
+    0x0D5, 0x0A1, 0x0E0, 0x0A1, 0x71,  0x0A1, 0x0D8, 0x0A1, 0x0F6, 0x0A1, 0x0E7, 0x0A1, 0x6D,  0x0A1, 0x6F,  0x0A1,
+    0x73,  0x0A1, 0x0F8, 0x0A2, 0x0A9, 0x0A2, 0x0AB, 0x0A3, 0x47,  0x0A2, 0x7A,  0x0A2, 0x7E,  0x0F9, 0x0DD, 0x0F9,
+    0x0E6, 0x0F9, 0x0EF, 0x0F9, 0x0FA, 0x0A1, 0x0E8, 0x0A1, 0x0FA, 0x0A2, 0x7C,  0x0A2, 0x0A2, 0x0F9, 0x0E3, 0x0F9,
+    0x0EC, 0x0F9, 0x0F5, 0x0F9, 0x0FC, 0x0A1, 0x44,  0x0A1, 0x43,  0x0A1, 0x4F,  0x0A1, 0x45,  0x0A1, 0x50,  0x0A3,
+    0x0B2, 0x0A1, 0x0D2, 0x0A1, 0x0DC, 0x0A1, 0x0EE, 0x0A1, 0x0EF, 0x0A1, 0x0F3, 0x0A1, 0x4B,  0x0A1, 0x4C,  0x0A1,
+    0x0D6, 0x0A1, 0x0E1, 0x0A1, 0x72,  0x0A1, 0x0D9, 0x0A1, 0x0F7, 0x0A1, 0x6E,  0x0A1, 0x70,  0x0A2, 0x7D,  0x0A2,
+    0x0A3, 0x0F9, 0x0E5, 0x0F9, 0x0EE, 0x0F9, 0x0F7, 0x0A1, 0x0FB, 0x0A1, 0x0F9, 0x0A1, 0x74,  0x0A1, 0x0E9, 0x0A2,
+    0x74,  0x0A2, 0x0A7, 0x0F9, 0x0E2, 0x0F9, 0x0EB, 0x0F9, 0x0F4, 0x0A2, 0x0A8, 0x0A2, 0x0AA, 0x0A1, 0x48,  0x0A1,
+    0x53,  0x0,   0x0};
 
-	color = UBlack;
-	setColor( color );
-}
+const unsigned char DBCS_Maekin_Korean[] = {
+    0x0A1, 0x0C6, 0x0A1, 0x0AF, 0x0A1, 0x0B1, 0x0A1, 0x0C7, 0x0A1, 0x0C8, 0x0A1, 0x0C9, 0x0A1,
+    0x0B5, 0x0A1, 0x0B7, 0x0A1, 0x0B9, 0x0A1, 0x0BB, 0x0A1, 0x0BD, 0x0A1, 0x0B3, 0x0A3, 0x0A1,
+    0x0A3, 0x0A5, 0x0A3, 0x0A9, 0x0A3, 0x0AC, 0x0A3, 0x0AE, 0x0A3, 0x0BA, 0x0A3, 0x0BB, 0x0A3,
+    0x0BF, 0x0A3, 0x0DD, 0x0A3, 0x0FD, 0x0A1, 0x0CB, 0x0,   0x0,   0x0,   0x0,   0x0,
+};
 
-UIFont::UIFont
-	(
-	const char *fn
-	)
+const unsigned char DBCS_Maekin_SimplifiedChinese[] = {
+    0x0A1, 0x0A7, 0x0A1, 0x0A4, 0x0A1, 0x0A6, 0x0A1, 0x0A5, 0x0A8, 0x44,  0x0A1, 0x0AC, 0x0A1, 0x0AF, 0x0A1,
+    0x0B1, 0x0A1, 0x0AD, 0x0A1, 0x0C3, 0x0A1, 0x0A2, 0x0A1, 0x0A3, 0x0A1, 0x0A8, 0x0A1, 0x0A9, 0x0A1, 0x0B5,
+    0x0A1, 0x0B7, 0x0A1, 0x0B9, 0x0A1, 0x0BB, 0x0A1, 0x0BF, 0x0A1, 0x0B3, 0x0A1, 0x0BD, 0x0A3, 0x0A1, 0x0A3,
+    0x0A2, 0x0A3, 0x0A7, 0x0A3, 0x0A9, 0x0A3, 0x0AC, 0x0A3, 0x0AE, 0x0A3, 0x0BA, 0x0A3, 0x0BB, 0x0A3, 0x0BF,
+    0x0A3, 0x0DD, 0x0A3, 0x0E0, 0x0A3, 0x0FC, 0x0A3, 0x0A1, 0x0AB, 0x0A1, 0x0,   0x0,
+};
+const unsigned char DBCS_Maekin_Japanese[] = {
+    0x81,  0x8B,  0x81, 0x66,  0x81, 0x68,  0x81, 0x0F1, 0x81, 0x8C,  0x81, 0x8D,  0x81, 0x8E,  0x81, 0x41,  0x81,
+    0x42,  0x81,  0x58, 0x81,  0x72, 0x81,  0x74, 0x81,  0x76, 0x81,  0x78, 0x81,  0x7A, 0x81,  0x6C, 0x82,  0x9F,
+    0x82,  0x0A1, 0x82, 0x0A3, 0x82, 0x0A5, 0x82, 0x0A7, 0x82, 0x0C1, 0x82, 0x0E1, 0x82, 0x0E3, 0x82, 0x0E5, 0x82,
+    0x0EC, 0x81,  0x4A, 0x81,  0x4B, 0x81,  0x54, 0x81,  0x55, 0x83,  0x40, 0x83,  0x42, 0x83,  0x44, 0x83,  0x46,
+    0x83,  0x48,  0x83, 0x62,  0x83, 0x83,  0x83, 0x85,  0x83, 0x87,  0x83, 0x8E,  0x83, 0x95,  0x83, 0x96,  0x81,
+    0x45,  0x81,  0x5B, 0x81,  0x52, 0x81,  0x53, 0x81,  0x49, 0x81,  0x93, 0x81,  0x6A, 0x81,  0x43, 0x81,  0x44,
+    0x81,  0x46,  0x81, 0x47,  0x81, 0x48,  0x81, 0x6E,  0x81, 0x70,  0x0,  0x0,   0x0,  0x0,
+};
 
-{
-	setFont( fn );
-}
+const unsigned char DBCS_Tokin_Japanese[] = {
+    0x81, 0x92, 0x81, 0x65, 0x81, 0x67, 0x81, 0x71, 0x81, 0x73, 0x81, 0x75, 0x81, 0x77, 0x81, 0x79,
+    0x81, 0x6B, 0x81, 0x90, 0x81, 0x69, 0x81, 0x6D, 0x81, 0x6F, 0x81, 0x92, 0x81, 0x8F, 0x0,
+};
 
-void UIFont::Print
-	(
-	float x,
-	float y,
-	const char *text,
-	size_t maxlen,
-	qboolean bVirtualScreen
-	)
-
-{
-	uii.Rend_SetColor( color );
-	uii.Rend_DrawString( m_font, text, x, y, maxlen, bVirtualScreen );
-}
-
-void UIFont::PrintJustified
-	(
-	const UIRect2D& rect,
-	fonthorzjustify_t horz,
-	fontvertjustify_t vert,
-	const char *text,
-	float *vVirtualScale
-	)
-
-{
-	float newx, newy;
-	int textwidth, textheight;
-	UIRect2D sizedRect;
-	const char* source;
-	char* dest;
-	char string[2048];
-
-	if (vVirtualScale)
-	{
-		sizedRect.pos.x = rect.pos.x / vVirtualScale[0];
-		sizedRect.pos.y = rect.pos.y / vVirtualScale[1];
-		sizedRect.size.width = rect.size.width / vVirtualScale[0];
-		sizedRect.size.height = rect.size.height / vVirtualScale[1];
-	}
-	else
-	{
-		sizedRect = rect;
-	}
-
-	if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP)
-	{
-		// no need to justify
-		Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale != NULL);
-		return;
-	}
-
-	textheight = getHeight(text, -1, qfalse);
-
-	switch (vert)
-	{
-	case FONT_JUSTVERT_TOP:
-		newy = sizedRect.pos.y;
-		break;
-	case FONT_JUSTVERT_CENTER:
-		newy = sizedRect.pos.y + (sizedRect.size.height - textheight) * 0.5;
-		break;
-	case FONT_JUSTVERT_BOTTOM:
-		newy = sizedRect.pos.y + sizedRect.size.height - textheight;
-		break;
-	default:
-		newy = 0;
-		break;
-	}
-
-	source = text;
-	while (*source)
-	{
-		// skip new lines
-		while (*source == '\n') {
-			source++;
-		}
-
-		if (!*source) {
-			// don't print an empty string
-			return;
-		}
-
-		dest = string;
-
-		do
-			*dest++ = *source++;
-		while (*source && *source != '\n');
-
-		*dest = 0;
-
-		textwidth = getWidth(string, -1);
-
-		switch (horz)
-		{
-		case FONT_JUSTHORZ_CENTER:
-			newx = sizedRect.pos.x + (sizedRect.size.width - textwidth) * 0.5;
-			break;
-		case FONT_JUSTHORZ_LEFT:
-			newx = sizedRect.pos.x;
-			break;
-		case FONT_JUSTHORZ_RIGHT:
-			newx = sizedRect.pos.x + sizedRect.size.width - textwidth;
-			break;
-		default:
-			newx = 0.0;
-			break;
-		}
-
-		Print(newx, newy, string, -1, vVirtualScale != NULL);
-
-		// expand for newline
-		newy += getHeight(" ", -1, qfalse);
-	}
-}
-
-void UIFont::setColor
-	(
-	UColor col
-	)
-
-{
-	color = col;
-}
-
-void UIFont::setAlpha
-	(
-	float alpha
-	)
-
-{
-	color.a = alpha;
-}
-
-void UIFont::setFont
-	(
-	const char *fontname
-	)
-
-{
-	m_font = uii.Rend_LoadFont( fontname );
-	if( !m_font ) {
-		uii.Sys_Error( ERR_DROP, "Couldn't load font %s\n", fontname );
-	}
-}
-
-int UIFont::getWidth
-	(
-	const char *text,
-	int maxlen
-	)
-
-{
-	return UI_FontStringWidth( m_font, text, maxlen );
-}
-
-int UIFont::getCharWidth
-	(
-	unsigned short ch
-	)
-
-{
-	int index;
-	int indirected;
-
-	if (!m_font) {
-		return 0;
-	}
-
-	if (ch == '\t') {
-		ch = ' ';
-	}
-
-	if (m_font->numPages)
-	{
-		int code = CodeSearch(ch);
-		if (code < 0) {
-			return 0;
-		}
-
-		index = m_font->charTable[code].index;
-		indirected = m_font->charTable[code].loc;
-	}
-	else
-	{
-		indirected = m_font->sgl[0]->indirection[ch];
-		if (indirected < 0 || indirected > 255) {
-			return 0;
-		}
-
-		index = 0;
-	}
-
-    if (ch == '\t') {
-        return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * 3.0;
-	} else {
-		return m_font->sgl[index]->locations[indirected].size[0] * 256.0;
-	}
-}
-
-int UIFont::getHeight
-	(
-	const char *text,
-	int maxlen,
-	qboolean bVirtual
-	)
-
-{
-	float height;
-	int i;
-
-	if( !m_font ) {
-		return 0;
-	}
-
-	height = getHeight( bVirtual );
-
-	for(i = 0; text[i]; i++)
-	{
-		if( maxlen != -1 && i > maxlen ) {
-			break;
-		}
-
-		if( text[ i ] == '\n' )
-		{
-			height += getHeight( bVirtual );
-		}
-	}
-
-	return height;
-}
-
-int UIFont::getHeight
-	(
-	qboolean bVirtual
-	)
-
-{
-	if( bVirtual )
-	{
-		if( m_font )
-		{
-			return ( m_font->sgl[0]->height * uid.vidHeight / 480.0 );
-		}
-		else
-		{
-			return ( 16.0 * uid.vidHeight / 480.0 );
-		}
-	}
-	else
-	{
-		if( m_font )
-		{
-			return m_font->sgl[0]->height;
-		}
-		else
-		{
-			return 16;
-		}
-	}
-}
+const unsigned char DBCS_Tokin_Korean[] = {
+    0x0A1, 0x0AE, 0x0A1, 0x0B0, 0x0A1, 0x0B4, 0x0A1, 0x0B6, 0x0A1, 0x0B8, 0x0A1, 0x0BA, 0x0A1, 0x0BC,
+    0x0A1, 0x0B2, 0x0A3, 0x0A4, 0x0A3, 0x0A8, 0x0A3, 0x0DB, 0x0A3, 0x0FB, 0x0A3, 0x0DC, 0x0,   0x0,
+};
 
 int UIFont::CodeSearch(unsigned short uch)
 {
-	return UI_FontCodeSearch(m_font, uch);
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return -1;
+    }
+
+    return UI_FontCodeSearch(m_font, uch);
 }
 
-qboolean UI_FontDBCSIsLeadByte(fontheader_t* font, unsigned short uch)
+bool UIFont::DBCSIsLeadByte(unsigned short uch)
+{
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
+    return UI_FontDBCSIsLeadByte(m_font, uch);
+}
+
+bool UIFont::DBCSIsMaekin(unsigned short uch)
+{
+    const unsigned char   *tokinList;
+    const unsigned char   *p;
+    unsigned char ch;
+
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
+    if (uch < 0x100) {
+        return false;
+    }
+
+    ch = (uch >> 8) & 0xFF;
+
+    switch (m_font->codePage) {
+    case 932:
+        tokinList = DBCS_Maekin_Japanese;
+        break;
+    case 936:
+        tokinList = DBCS_Maekin_SimplifiedChinese;
+        break;
+    case 949:
+        tokinList = DBCS_Maekin_Korean;
+        break;
+    case 950:
+        tokinList = DBCS_Maekin_TraditionalChinese;
+        break;
+    default:
+        return false;
+    }
+
+    for (p = tokinList; *p; p += 2) {
+        if (p[0] == ch && p[1] == uch) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool UIFont::DBCSIsAtokin(unsigned short uch)
+{
+    const unsigned char   *tokinList;
+    const unsigned char   *p;
+    unsigned char ch;
+
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return false;
+    }
+
+    if (uch < 0x100) {
+        return false;
+    }
+
+    ch = (uch >> 8) & 0xFF;
+
+    switch (m_font->codePage) {
+    case 932:
+        tokinList = DBCS_Tokin_Japanese;
+        break;
+    case 936:
+    case 950:
+        tokinList = (const unsigned char*)"";
+        break;
+    case 949:
+        tokinList = DBCS_Tokin_Korean;
+        break;
+    default:
+        return false;
+    }
+
+    for (p = tokinList; *p; p += 2) {
+        if (p[0] == ch && p[1] == uch) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+int UIFont::DBCSGetWordBlockCount(const char *text, int maxlen)
+{
+    unsigned char *p;
+    unsigned short uch, uch2;
+    unsigned int   DBCSLen;
+    bool           isATokin;
+    bool           isControl;
+    bool           hasDBCS;
+
+    if (maxlen < 0) {
+        maxlen = strlen(text);
+    }
+
+    if (maxlen == 0) {
+        return 0;
+    }
+
+    uch = (unsigned char)text[0];
+    p   = (unsigned char *)(text + 1);
+
+    if (!text[0]) {
+        return uch;
+    }
+
+    if (DBCSIsLeadByte(uch)) {
+        DBCSLen = 2;
+        uch     = *p | (uch << 8);
+        p++;
+    } else {
+        DBCSLen = 1;
+    }
+
+    DBCSIsMaekin(uch);
+    isATokin  = DBCSIsAtokin(uch);
+    hasDBCS   = DBCSLen > 1;
+    isControl = uch < ' ';
+    uch2 = (unsigned char)*p;
+
+    for (;;) {
+        unsigned int subDBCSLen;
+        bool         subIsATokin;
+
+        uch = *p++;
+
+        if (!uch || DBCSLen >= maxlen) {
+            break;
+        }
+
+        if (DBCSIsLeadByte(uch)) {
+            subDBCSLen = 2;
+            uch2       = *p++ | (uch2 << 8);
+        }
+
+        subIsATokin = DBCSIsAtokin(uch);
+
+        if (isControl || uch2 < ' ' || !DBCSIsMaekin(uch)) {
+            break;
+        }
+
+        if (!isATokin && (hasDBCS || subDBCSLen > 1 || (uch == ' ' || uch == '-') && uch2 != ' ' && uch2 != '-')) {
+            break;
+        }
+
+        isATokin  = subIsATokin;
+        isControl = false;
+        DBCSLen += subDBCSLen;
+    }
+
+    if (DBCSLen > maxlen) {
+        DBCSLen = maxlen;
+    }
+
+    return DBCSLen;
+}
+
+UIFont::UIFont()
+{
+    m_font = uii.Rend_LoadFont("verdana-14");
+    if (!m_font) {
+        uii.Sys_Error(ERR_DROP, "Couldn't load font Verdana\n");
+    }
+
+    color = UBlack;
+    setColor(color);
+
+    refHandle = uii.GetRefSequence();
+    name = "verdana-14";
+}
+
+UIFont::UIFont(const char *fn)
+{
+    setFont(fn);
+}
+
+void UIFont::setColor(UColor col)
+{
+    color = col;
+}
+
+void UIFont::setAlpha(float alpha)
+{
+    color.a = alpha;
+}
+
+void UIFont::setFont(const char *fontname)
+{
+    m_font = uii.Rend_LoadFont(fontname);
+    if (!m_font) {
+        uii.Sys_Error(ERR_DROP, "Couldn't load font %s\n", fontname);
+    }
+
+    refHandle = uii.GetRefSequence();
+    name = fontname;
+}
+
+void UIFont::Print(float x, float y, const char *text, size_t maxlen, const float *virtualScreen)
+{
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return;
+    }
+
+    uii.Rend_SetColor(color);
+    // Round to integer to avoid blurry text
+    uii.Rend_DrawString(m_font, text, (int)x, (int)y, maxlen, virtualScreen);
+}
+
+void UIFont::PrintJustified(
+    const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, const float *vVirtualScale
+)
+{
+    float       newx, newy;
+    int         textwidth, textheight;
+    UIRect2D    sizedRect;
+    const char *source;
+    char       *dest;
+    char        string[2048];
+
+    if (vVirtualScale) {
+        sizedRect.pos.x       = rect.pos.x / vVirtualScale[0];
+        sizedRect.pos.y       = rect.pos.y / vVirtualScale[1];
+        sizedRect.size.width  = rect.size.width / vVirtualScale[0];
+        sizedRect.size.height = rect.size.height / vVirtualScale[1];
+    } else {
+        sizedRect = rect;
+    }
+
+    if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
+        // no need to justify
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
+        return;
+    }
+
+    textheight = getHeight(text, -1);
+
+    switch (vert) {
+    case FONT_JUSTVERT_TOP:
+        newy = sizedRect.pos.y;
+        break;
+    case FONT_JUSTVERT_CENTER:
+        newy = sizedRect.pos.y + (sizedRect.size.height - textheight) * 0.5;
+        break;
+    case FONT_JUSTVERT_BOTTOM:
+        newy = sizedRect.pos.y + sizedRect.size.height - textheight;
+        break;
+    default:
+        newy = 0;
+        break;
+    }
+
+    source = text;
+    while (*source) {
+        // skip new lines
+        while (*source == '\n') {
+            source++;
+        }
+
+        if (!*source) {
+            // don't print an empty string
+            return;
+        }
+
+        dest = string;
+
+        do {
+            *dest++ = *source++;
+        } while (*source && *source != '\n');
+
+        *dest = 0;
+
+        switch (horz) {
+        case FONT_JUSTHORZ_CENTER:
+            textwidth = getWidth(string, -1);
+            newx      = sizedRect.pos.x + (sizedRect.size.width - textwidth) * 0.5;
+            break;
+        case FONT_JUSTHORZ_LEFT:
+            newx = sizedRect.pos.x;
+            break;
+        case FONT_JUSTHORZ_RIGHT:
+            textwidth = getWidth(string, -1);
+            newx      = sizedRect.pos.x + sizedRect.size.width - textwidth;
+            break;
+        default:
+            newx = 0.0;
+            break;
+        }
+
+        Print(newx, newy, string, -1, vVirtualScale);
+
+        // expand for newline
+        newy += getHeight(" ", -1);
+    }
+}
+
+void UIFont::PrintOutlinedJustified(
+    const UIRect2D  & rect,
+    fonthorzjustify_t horz,
+    fontvertjustify_t vert,
+    const char       *text,
+    const UColor    & outlineColor,
+    const float      *vVirtualScale
+)
+{
+    float       newx, newy;
+    int         textwidth, textheight;
+    UIRect2D    sizedRect;
+    const char *source;
+    char       *dest;
+    char        string[2048];
+    UColor      originalColor;
+    bool        bVirtual;
+
+    textwidth = 0;
+
+    if (vVirtualScale) {
+        sizedRect.pos.x       = rect.pos.x / vVirtualScale[0];
+        sizedRect.pos.y       = rect.pos.y / vVirtualScale[1];
+        sizedRect.size.width  = rect.size.width / vVirtualScale[0];
+        sizedRect.size.height = rect.size.height / vVirtualScale[1];
+    } else {
+        sizedRect = rect;
+    }
+
+    if (horz == FONT_JUSTHORZ_LEFT && vert == FONT_JUSTVERT_TOP) {
+        // no need to justify
+        Print(sizedRect.pos.x, sizedRect.pos.y, text, -1, vVirtualScale);
+        return;
+    }
+
+    textheight = getHeight(text, -1);
+
+    switch (vert) {
+    case FONT_JUSTVERT_TOP:
+        newy = sizedRect.pos.y + 2.0;
+        break;
+    case FONT_JUSTVERT_CENTER:
+        newy = sizedRect.pos.y + (sizedRect.size.height - textheight) * 0.5;
+        break;
+    case FONT_JUSTVERT_BOTTOM:
+        newy = sizedRect.pos.y + sizedRect.size.height - textheight - 2.0;
+        break;
+    default:
+        newy = 0;
+        break;
+    }
+
+    originalColor = color;
+    bVirtual      = vVirtualScale != NULL;
+    source        = text;
+    while (*source) {
+        // skip new lines
+        while (*source == '\n') {
+            source++;
+        }
+
+        if (!*source) {
+            // don't print an empty string
+            return;
+        }
+
+        dest = string;
+
+        do {
+            *dest++ = *source++;
+        } while (*source && *source != '\n');
+
+        *dest = 0;
+
+        if (textwidth != FONT_JUSTHORZ_LEFT) {
+            textwidth = getWidth(string, -1);
+        }
+
+        switch (horz) {
+        case FONT_JUSTHORZ_CENTER:
+            newx = sizedRect.pos.x + (sizedRect.size.width - textwidth) * 0.5;
+            break;
+        case FONT_JUSTHORZ_LEFT:
+            newx = sizedRect.pos.x + 2.0;
+            break;
+        case FONT_JUSTHORZ_RIGHT:
+            newx = sizedRect.pos.x + sizedRect.size.width - textwidth - 2.0;
+            break;
+        default:
+            newx = 0;
+            break;
+        }
+
+        //
+        // draw the outline
+        //
+        setColor(outlineColor);
+        Print(newx + 1, newy + 2, string, -1, vVirtualScale);
+        Print(newx + 2, newy + 1, string, -1, vVirtualScale);
+        Print(newx - 1, newy + 2, string, -1, vVirtualScale);
+        Print(newx - 2, newy + 1, string, -1, vVirtualScale);
+        Print(newx - 1, newy - 2, string, -1, vVirtualScale);
+        Print(newx - 2, newy - 1, string, -1, vVirtualScale);
+        Print(newx + 1, newy - 2, string, -1, vVirtualScale);
+        Print(newx + 2, newy - 1, string, -1, vVirtualScale);
+        Print(newx + 2, newy, string, -1, vVirtualScale);
+        Print(newx - 2, newy, string, -1, vVirtualScale);
+        Print(newx, newy + 2, string, -1, vVirtualScale);
+        Print(newx, newy - 2, string, -1, vVirtualScale);
+        //
+        // draw the text
+        //
+        setColor(originalColor);
+        Print(newx, newy, string, -1, vVirtualScale);
+
+        // expand for newline
+        newy += getHeight(" ", -1);
+    }
+}
+
+int UIFont::getMaxWidthIndex(const char *text, int maxlen)
+{
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 0;
+    }
+
+    return UI_FontStringMaxWidth(m_font, text, maxlen);
+}
+
+int UIFont::getWidth(const char *text, int maxlen)
+{
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 0;
+    }
+
+    return UI_FontStringWidth(m_font, text, maxlen);
+}
+
+int UIFont::getCharWidth(unsigned short ch)
+{
+    int index;
+    int indirected;
+    float widthMul = 1.0f; // Added in OPM for easier readability
+
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 4;
+    }
+
+    if (ch == '\t') {
+        ch = ' ';
+        widthMul = 3.0f;
+    }
+
+    if (m_font->numPages) {
+        int code = CodeSearch(ch);
+        if (code < 0) {
+            return 0;
+        }
+
+        index      = m_font->charTable[code].index;
+        indirected = m_font->charTable[code].loc;
+    } else {
+        indirected = m_font->sgl[0]->indirection[ch];
+        if (indirected < 0 || indirected > 255) {
+            return 0;
+        }
+
+        index = 0;
+    }
+
+    return m_font->sgl[index]->locations[indirected].size[0] * 256.0 * widthMul;
+}
+
+int UIFont::getHeight(const char *text, int maxlen, const float* virtualScale)
+{
+    float height;
+    int   i;
+
+    CheckRefreshFont();
+
+    if (!m_font) {
+        return 0;
+    }
+
+    height = getHeight(virtualScale);
+
+    for (i = 0; text[i]; i++) {
+        if (maxlen != -1 && i > maxlen) {
+            break;
+        }
+
+        if (text[i] == '\n') {
+            height += getHeight(virtualScale);
+        }
+    }
+
+    return height;
+}
+
+int UIFont::getHeight(const float* virtualScale)
+{
+    CheckRefreshFont();
+
+    if (virtualScale) {
+        if (m_font) {
+            return (m_font->sgl[0]->height * virtualScale[0]);
+        } else {
+            return (16.0 * virtualScale[1]);
+        }
+    } else {
+        if (m_font) {
+            return m_font->sgl[0]->height;
+        } else {
+            return 16;
+        }
+    }
+}
+
+qboolean UI_FontDBCSIsLeadByte(fontheader_t *font, unsigned short uch)
 {
     // Byte ranges found in Wikipedia articles with relevant search strings in each case
     switch (font->codePage) {
     case 932:
         // Shift_jis
-        return ((uch >= 0x81) && (uch <= 0x9F)) ||
-            ((uch >= 0xE0) && (uch <= 0xFC));
+        return ((uch >= 0x81) && (uch <= 0x9F)) || ((uch >= 0xE0) && (uch <= 0xFC));
         // Lead bytes F0 to FC may be a Microsoft addition.
     case 936:
         // GBK
@@ -330,15 +647,13 @@ qboolean UI_FontDBCSIsLeadByte(fontheader_t* font, unsigned short uch)
         return (uch >= 0x81) && (uch <= 0xFE);
     case 1361:
         // Korean Johab KS C-5601-1992
-        return
-            ((uch >= 0x84) && (uch <= 0xD3)) ||
-            ((uch >= 0xD8) && (uch <= 0xDE)) ||
-            ((uch >= 0xE0) && (uch <= 0xF9));
+        return ((uch >= 0x84) && (uch <= 0xD3)) || ((uch >= 0xD8) && (uch <= 0xDE)) || ((uch >= 0xE0) && (uch <= 0xF9));
     }
     return false;
 }
 
-int UI_FontCodeSearch(const fontheader_t* font, unsigned short uch) {
+int UI_FontCodeSearch(const fontheader_t *font, unsigned short uch)
+{
     int mid;
     int l, r;
 
@@ -366,88 +681,66 @@ int UI_FontCodeSearch(const fontheader_t* font, unsigned short uch) {
     return l;
 }
 
-float UI_FontgetCharWidthf(fontheader_t* font, unsigned short uch)
+float UI_FontgetCharWidthf(fontheader_t *font, unsigned short uch)
 {
-	int index;
-	int indirected;
+    int index;
+    int indirected;
+    float widthMul = 1.0f; // Added in OPM for easier readability
 
-	if (!font) {
-		return 0.f;
-	}
+    if (!font) {
+        return 0.f;
+    }
 
-	if (uch == '\t') {
-		uch = ' ';
-	}
+    if (uch == '\t') {
+        uch = ' ';
+        widthMul = 3.0f;
+    }
 
-	if (font->numPages)
-	{
-		int code = UI_FontCodeSearch(font, uch);
-		if (code < 0) {
-			return 0.f;
-		}
+    if (font->numPages) {
+        int code = UI_FontCodeSearch(font, uch);
+        if (code < 0) {
+            return 0.f;
+        }
 
-		index = font->charTable[code].index;
-		indirected = font->charTable[code].loc;
-	}
-	else
-	{
-		indirected = font->sgl[0]->indirection[uch];
-		if (indirected < 0 || indirected > 255) {
-			return 0.f;
-		}
+        index      = font->charTable[code].index;
+        indirected = font->charTable[code].loc;
+    } else {
+        indirected = font->sgl[0]->indirection[uch];
+        if (indirected < 0 || indirected > 255) {
+            return 0.f;
+        }
 
-		index = 0;
-	}
+        index = 0;
+    }
 
-	if (uch == '\t') {
-		return font->sgl[index]->locations[indirected].size[0] * 3.0;
-	} else {
-		return font->sgl[index]->locations[indirected].size[0];
-	}
+    return font->sgl[index]->locations[indirected].size[0] * widthMul;
 }
 
-int UI_FontStringMaxWidth
-	(
-	fontheader_t *pFont,
-	const char *pszString,
-	int iMaxLen
-	)
-
+int UI_FontStringMaxWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 {
-    float widths = 0.0;
+    float widths    = 0.0;
     float maxwidths = iMaxLen / 256.0f;
-    int i;
+    int   i;
 
     if (!pFont) {
         return 0;
     }
 
-	i = 0;
-    for(;;)
-    {
-        unsigned short uch = pszString[i++];
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = (unsigned char)pszString[i];
 
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen))
-        {
-            break;
+        if (UI_FontDBCSIsLeadByte(pFont, uch)) {
+            uch = (uch << 8) | pszString[i];
+            if (!pszString[i]) {
+                break;
+            }
+
+            i++;
         }
 
-		if (UI_FontDBCSIsLeadByte(pFont, uch))
-		{
-			uch = (uch << 8) | pszString[i];
-			if (!pszString[i]) {
-				break;
-			}
-
-			i++;
-		}
-
-        if (uch == '\n')
-        {
+        if (uch == '\n') {
             widths = 0.0;
-        }
-        else
-        {
+        } else {
             widths += UI_FontgetCharWidthf(pFont, uch);
 
             if (maxwidths < widths) {
@@ -459,48 +752,30 @@ int UI_FontStringMaxWidth
     return -1;
 }
 
-int UI_FontStringWidth
-	(
-	fontheader_t *pFont,
-	const char *pszString,
-	int iMaxLen
-	)
-
+int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen)
 {
-    float widths = 0.0;
+    float widths    = 0.0;
     float maxwidths = 0.0;
-    int i;
 
     if (!pFont) {
         return 0;
     }
 
-	i = 0;
-    for(;;)
-    {
-        unsigned short uch = pszString[i++];
+    for (int i = 0; pszString[i] && (iMaxLen == -1 || i < iMaxLen); i++) {
+        unsigned short uch = (unsigned char)pszString[i];
 
-        if (uch == 0 || (iMaxLen != -1 && i > iMaxLen))
-        {
-            break;
+        if (UI_FontDBCSIsLeadByte(pFont, uch)) {
+            uch = (uch << 8) | pszString[i];
+            if (!pszString[i]) {
+                break;
+            }
+
+            i++;
         }
 
-		if (UI_FontDBCSIsLeadByte(pFont, uch))
-		{
-			uch = (uch << 8) | pszString[i];
-			if (!pszString[i]) {
-				break;
-			}
-
-			i++;
-		}
-
-        if (uch == '\n')
-        {
+        if (uch == '\n') {
             widths = 0.0;
-        }
-        else
-        {
+        } else {
             widths += UI_FontgetCharWidthf(pFont, uch);
 
             if (maxwidths < widths) {
@@ -511,3 +786,11 @@ int UI_FontStringWidth
 
     return maxwidths * 256.0;
 }
+
+void UIFont::CheckRefreshFont() {
+    if (refHandle != uii.GetRefSequence()) {
+        setFont(name);
+    } else if (!uii.IsRendererLoaded()) {
+        m_font = NULL;
+    }
+}
\ No newline at end of file
diff --git a/code/uilib/uifont.h b/code/uilib/uifont.h
index 86b94a62..786fee3b 100644
--- a/code/uilib/uifont.h
+++ b/code/uilib/uifont.h
@@ -20,36 +20,62 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIFONT_H__
-#define __UIFONT_H__
+#pragma once
 
 class UIRect2D;
 
-typedef enum { FONT_JUSTHORZ_CENTER, FONT_JUSTHORZ_LEFT, FONT_JUSTHORZ_RIGHT } fonthorzjustify_t;
-typedef enum { FONT_JUSTVERT_TOP, FONT_JUSTVERT_CENTER, FONT_JUSTVERT_BOTTOM } fontvertjustify_t;
+typedef enum {
+    FONT_JUSTHORZ_CENTER,
+    FONT_JUSTHORZ_LEFT,
+    FONT_JUSTHORZ_RIGHT
+} fonthorzjustify_t;
 
-class UIFont {
+typedef enum {
+    FONT_JUSTVERT_TOP,
+    FONT_JUSTVERT_CENTER,
+    FONT_JUSTVERT_BOTTOM
+} fontvertjustify_t;
+
+class UIFont
+{
 protected:
-	unsigned int m_listbase;
-	UColor color;
-	fontheader_t *m_font;
+    unsigned int  m_listbase;
+    UColor        color;
+    fontheader_t *m_font;
+
+    //
+    // Added in OPM
+    //
+    str           name;
+    int           refHandle;
 
 public:
-	UIFont();
-	UIFont( const char *fn );
+    UIFont();
+    UIFont(const char *fn);
 
-	void		Print( float x, float y, const char *text, size_t maxlen, qboolean bVirtualScreen );
-	void		PrintJustified( const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, float *vVirtualScale );
-	void		setColor( UColor col );
-	void		setAlpha( float alpha );
-	void		setFont( const char *fontname );
-	int			getWidth( const char *text, int maxlen );
-	int			getCharWidth( unsigned short ch );
-	int			getHeight( const char *text, int maxlen, qboolean bVirtual );
-	int			getHeight( qboolean bVirtual );
-	int			CodeSearch(unsigned short uch);
+    void Print(float x, float y, const char *text, size_t maxlen = -1, const float *virtualScreen = NULL);
+    void PrintJustified(
+        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char *text, const float *vVirtualScale
+    );
+    void PrintOutlinedJustified(
+        const UIRect2D& rect, fonthorzjustify_t horz, fontvertjustify_t vert, const char* text, const UColor& outlineColor, const float* vVirtualScale
+    );
+    void setColor(UColor col);
+    void setAlpha(float alpha);
+    void setFont(const char *fontname);
+    int  getMaxWidthIndex(const char* text, int maxlen);
+    int  getWidth(const char *text, int maxlen);
+    int  getCharWidth(unsigned short ch);
+    int  getHeight(const char *text, int maxlen, const float* virtualScale = NULL);
+    int  getHeight(const float* virtualScale = NULL);
+    int  CodeSearch(unsigned short uch);
+    bool DBCSIsLeadByte(unsigned short uch);
+    bool DBCSIsMaekin(unsigned short uch);
+    bool DBCSIsAtokin(unsigned short uch);
+    int DBCSGetWordBlockCount(const char* text, int maxlen);
+
+private:
+    void CheckRefreshFont();
 };
 
-int UI_FontStringWidth( fontheader_t *pFont, const char *pszString, int iMaxLen );
-
-#endif
+int UI_FontStringWidth(fontheader_t *pFont, const char *pszString, int iMaxLen);
diff --git a/code/uilib/uiglobalgamelist.cpp b/code/uilib/uiglobalgamelist.cpp
index e8f6be00..da0c32be 100644
--- a/code/uilib/uiglobalgamelist.cpp
+++ b/code/uilib/uiglobalgamelist.cpp
@@ -22,16 +22,37 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UILanGameList, UIGlobalGameList, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UILanGameList, UIGlobalGameList, NULL) {
+    {NULL, NULL}
 };
 
-void UIGlobalGameList::UpdateServers
-	(
-	void
-	)
-
+void UIGlobalGameList::UpdateServers(void)
 {
-	// FIXME: stub
+    int i;
+
+    if (!m_noservers_wid) {
+        AddNoServer();
+    }
+
+    setShow(false);
+
+    if (m_iPrevNumServers != cls.numglobalservers && cls.numglobalservers >= 0) {
+        m_iPrevNumServers = cls.numglobalservers;
+        DestroyServerWidgets();
+
+        for (i = 0; i < cls.numglobalservers; i++) {
+            m_servers.AddUniqueObject(&cls.globalServers[i]);
+        }
+
+        m_Vscroll->setPageHeight((getSize().height - 16) / 16.f);
+        m_Vscroll->setNumItems(m_servers.NumObjects());
+        m_Vscroll->InitFrameAlignRight(this, 0, 0);
+        CreateServerWidgets();
+
+        m_Hscroll->setPageWidth(1);
+        m_Hscroll->setNumItems(m_iNumColumns);
+        m_Hscroll->InitFrameAlignRight(this);
+    } else if (!cls.numlocalservers) {
+        DrawNoServers(getFrame());
+    }
 }
diff --git a/code/uilib/uiglobalgamelist.h b/code/uilib/uiglobalgamelist.h
index 29853eee..efb8fd72 100644
--- a/code/uilib/uiglobalgamelist.h
+++ b/code/uilib/uiglobalgamelist.h
@@ -20,18 +20,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIGLOBALGAMELIST_H__
-#define __UIGLOBALGAMELIST_H__
+#pragma once
 
 #include "uilangamelist.h"
 
-class UIGlobalGameList : public UILanGameList {
+class UIGlobalGameList : public UILanGameList
+{
 public:
-	CLASS_PROTOTYPE( UIGlobalGameList );
+    CLASS_PROTOTYPE(UIGlobalGameList);
 
 public:
-	virtual void UpdateServers() override;
+    virtual void UpdateServers() override;
 };
-
-#endif
-
diff --git a/code/uilib/uihorizscroll.cpp b/code/uilib/uihorizscroll.cpp
index 01d8e60c..14730727 100644
--- a/code/uilib/uihorizscroll.cpp
+++ b/code/uilib/uihorizscroll.cpp
@@ -22,209 +22,364 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UIWidget, UIHorizScroll, NULL )
-{
-	{ NULL, NULL }
+Event W_HScrollbar_Positioned
+(
+	"hscrollbar_positioned",
+	EV_DEFAULT,
+	"i",
+	"new_position",
+	"Signaled when the user scrolls the view"
+);
+Event EV_HScrollbar_Scroll
+(
+	"_hscrollbar_scroll",
+	EV_DEFAULT,
+	"ii",
+	"scrollrate autorepeat",
+	"scroll the scrollbar, at the specified rate.\n"
+	"The autorepeat is used for autoscrolling with the mouse button held down"
+);
+
+CLASS_DECLARATION(UIWidget, UIHorizScroll, NULL) {
+    {&W_LeftMouseDown,      &UIHorizScroll::MouseDown   },
+    {&W_LeftMouseUp,        &UIHorizScroll::MouseUp     },
+    {&W_LeftMouseDragged,   &UIHorizScroll::MouseDragged},
+    {&W_MouseEntered,       &UIHorizScroll::MouseEnter  },
+    {&W_MouseExited,        &UIHorizScroll::MouseLeave  },
+    {&EV_HScrollbar_Scroll, &UIHorizScroll::Scroll      },
+    {NULL,                  NULL                        }
 };
 
 UIHorizScroll::UIHorizScroll()
+    : m_numitems(0)
+    , m_pagewidth(0)
+    , m_topitem(0)
+    , m_marlett("marlett")
+    , thumbRect(0, 0, 0, 0)
+    , m_pressed(VS_NONE)
+    , m_frameinitted(false)
+    , m_thumbcolor(UDarkGrey)
+    , m_solidbordercolor(UBlack)
+{}
+
+void UIHorizScroll::DrawArrow(float top, const char *text, bool pressed)
 {
-	// FIXME: stub
+    UIRect2D arrowRect(top, 0, m_frame.size.height, m_vVirtualScale[1] * 16.f);
+    UColor   innerColor(m_background_color);
+
+    m_marlett.setColor(m_foreground_color);
+
+    if (pressed) {
+        if (!m_background_color.r && !m_background_color.g && !m_background_color.b) {
+            m_marlett.setColor(UGrey);
+        } else {
+            m_marlett.setColor(m_border_color.light);
+        }
+    }
+
+    DrawBoxWithSolidBorder(arrowRect, innerColor, m_solidbordercolor, 1, 3, m_local_alpha);
+    if (m_numitems > m_pagewidth) {
+        DrawMac3DBox(arrowRect, pressed, m_border_color, 1, m_local_alpha);
+    }
+
+    m_marlett.PrintJustified(
+        arrowRect, m_iFontAlignmentHorizontal, m_iFontAlignmentVertical, text, m_bVirtual ? m_vVirtualScale : NULL
+    );
 }
 
-int UIHorizScroll::getItemFromWidth
-	(
-	float height
-	)
-
+void UIHorizScroll::DrawThumb(void)
 {
-	// FIXME: stub
-	return 0;
+    UIRect2D inbarrect;
+    float    thumbWidth;
+    float    thumbdiff;
+    UColor   thumbInside;
+
+    thumbdiff             = m_frame.size.width - m_vVirtualScale[1] * 32.f;
+    inbarrect.pos.x       = m_vVirtualScale[1] * 16.0;
+    inbarrect.pos.y       = 0;
+    inbarrect.size.width  = thumbdiff;
+    inbarrect.size.height = m_frame.size.height;
+
+    thumbRect.pos.x      = m_topitem * thumbdiff / m_numitems;
+    thumbRect.pos.y      = 0.0;
+    thumbRect.size.width = m_pagewidth * thumbdiff / m_numitems;
+    if (thumbRect.size.width < 6.f) {
+        thumbRect.size.width = 6.f;
+    }
+    thumbRect.size.height = m_frame.size.height;
+
+    thumbInside = UDarkGrey;
+    thumbWidth  = thumbRect.pos.x + thumbRect.size.width - thumbdiff;
+
+    if (m_pressed == VS_THUMB) {
+        thumbInside = UColor(-0.5f, -0.5f, -0.5f, thumbInside.a + 1.f);
+
+        if (thumbInside.r >= 0) {
+            thumbInside.r = 0;
+        }
+
+        thumbInside.g = Q_max(thumbInside.g, 0);
+        thumbInside.b = Q_max(thumbInside.b, 0);
+    }
+
+    if (thumbWidth > 0) {
+        thumbRect.pos.x -= thumbWidth;
+    }
+    thumbRect.pos.x += inbarrect.pos.x;
+
+    DrawBoxWithSolidBorder(thumbRect, thumbInside, m_solidbordercolor, 1, 3, m_local_alpha);
+    DrawMac3DBox(thumbRect, false, UBorderColor(thumbInside), true, m_local_alpha);
+
+    inbarrect.pos.x += 1;
+    inbarrect.pos.y += 1;
+    inbarrect.size.width += -2;
+    inbarrect.size.height += -2;
+
+    thumbRect.pos.x += -1;
+    thumbRect.pos.y += -1;
+    thumbRect.size.width += -2;
+    thumbRect.size.height += 2;
+
+    switch (m_pressed) {
+    case VS_PAGE_UP:
+        DrawBox(
+            inbarrect.pos.x,
+            0,
+            thumbRect.pos.x - inbarrect.pos.x,
+            m_frame.size.height,
+            m_border_color.dark,
+            m_local_alpha
+        );
+        break;
+    case VS_PAGE_DOWN:
+        DrawBox(
+            thumbRect.pos.x + thumbRect.size.width,
+            0,
+            inbarrect.pos.x + inbarrect.size.width - (thumbRect.pos.x + thumbRect.size.width),
+            m_frame.size.height,
+            m_border_color.dark,
+            m_local_alpha
+        );
+        break;
+    default:
+        break;
+    }
 }
 
-bool UIHorizScroll::isEnoughItems
-	(
-	void
-	)
-
+void UIHorizScroll::Draw(void)
 {
-	// FIXME: stub
-	return false;
+    UIRect2D arrowRect;
+    UColor   innerColor(0, 0, 0, 1);
+
+    arrowRect = getClientFrame();
+    DrawBoxWithSolidBorder(arrowRect, m_background_color, m_solidbordercolor, 1, 3, m_local_alpha);
+
+    DrawArrow(0, "3", m_pressed == VS_UP_ARROW);
+    DrawArrow(m_frame.size.width - m_vVirtualScale[1] * 16.f, "4", m_pressed = VS_DOWN_ARROW);
+    if (m_numitems > m_pagewidth) {
+        DrawThumb();
+    }
 }
 
-void UIHorizScroll::Draw
-	(
-	void
-	)
-
+void UIHorizScroll::Scroll(Event *ev)
 {
-	// FIXME: stub
+    if (!AttemptScrollTo(m_topitem + ev->GetInteger(1))) {
+        return;
+    }
+
+    float delay = 0.2f;
+    if (ev->GetInteger(2)) {
+        delay = 0.1f;
+    }
+
+    Event event(EV_HScrollbar_Scroll);
+    event.AddInteger(ev->GetInteger(1));
+    event.AddInteger(0);
+    PostEvent(event, delay);
 }
 
-void UIHorizScroll::DrawArrow
-	(
-	float top,
-	const char *text,
-	bool pressed
-	)
-
+bool UIHorizScroll::AttemptScrollTo(int to)
 {
-	// FIXME: stub
+    int besttopitem;
+
+    if (to < 0) {
+        to = 0;
+    }
+
+    besttopitem = m_numitems - m_pagewidth;
+    if (besttopitem < 0) {
+        besttopitem = 0;
+    }
+
+    if (to > besttopitem) {
+        to = besttopitem;
+    }
+
+    if (to == m_topitem) {
+        return false;
+    }
+
+    Event ev(W_HScrollbar_Positioned);
+    ev.AddInteger(m_topitem);
+    SendSignal(ev);
+
+    return true;
 }
 
-void UIHorizScroll::DrawThumb
-	(
-	void
-	)
-
+void UIHorizScroll::MouseDown(Event *ev)
 {
-	// FIXME: stub
+    UIPoint2D p;
+    int       scrollrate = 0;
+
+    p.x = ev->GetFloat(1);
+    p.y = ev->GetFloat(2);
+    p.x -= m_screenframe.pos.x;
+    p.y -= m_screenframe.pos.y;
+
+    if (p.x < 0 || p.y < 0) {
+        // out of bounds
+        return;
+    }
+
+    if (p.x > m_frame.size.width || p.y > m_frame.size.height) {
+        // out of bounds
+        return;
+    }
+
+    if (m_numitems <= m_pagewidth) {
+        return;
+    }
+
+    if (p.x < 16.f) {
+        scrollrate = -1;
+        m_pressed  = VS_UP_ARROW;
+    } else if (p.x > m_frame.size.width - 16.f) {
+        scrollrate = 1;
+        m_pressed  = VS_DOWN_ARROW;
+    } else if (p.x < thumbRect.pos.x) {
+        m_pressed  = VS_PAGE_UP;
+        scrollrate = -m_pagewidth;
+    } else if (p.x >= (thumbRect.pos.x + thumbRect.size.width)) {
+        m_pressed  = VS_PAGE_DOWN;
+        scrollrate = m_pagewidth;
+    } else {
+        m_pressed                   = VS_THUMB;
+        m_dragThumbState.itemOffset = m_topitem - getItemFromWidth(p.x);
+        m_dragThumbState.orgItem    = m_topitem;
+        uWinMan.setFirstResponder(this);
+    }
+
+    if (scrollrate) {
+        Event *event = new Event(EV_HScrollbar_Scroll);
+        event->AddInteger(scrollrate);
+        event->AddInteger(0);
+        CancelEventsOfType(EV_HScrollbar_Scroll);
+        PostEvent(event, 0);
+
+        uWinMan.setFirstResponder(this);
+    }
 }
 
-void UIHorizScroll::MouseDown
-	(
-	Event *ev
-	)
-
+int UIHorizScroll::getItemFromWidth(float height)
 {
-	// FIXME: stub
+    return (int)((height - 16.0) * m_numitems / (m_frame.size.width - 32.0));
 }
 
-void UIHorizScroll::MouseUp
-	(
-	Event *ev
-	)
-
+void UIHorizScroll::MouseUp(Event *ev)
 {
-	// FIXME: stub
+    CancelEventsOfType(EV_HScrollbar_Scroll);
+
+    if (uWinMan.getFirstResponder() == this) {
+        uWinMan.setFirstResponder(NULL);
+    }
+
+    m_pressed = VS_NONE;
 }
 
-void UIHorizScroll::MouseDragged
-	(
-	Event *ev
-	)
-
+void UIHorizScroll::MouseDragged(Event *ev)
 {
-	// FIXME: stub
+    UIPoint2D p;
+
+    if (m_pressed != VS_THUMB) {
+        return;
+    }
+
+    p.x = ev->GetFloat(1);
+    p.y = ev->GetFloat(2);
+
+    if (p.y - m_screenframe.pos.y < -24 || m_frame.size.height + 24.0 < p.y - m_screenframe.pos.y) {
+        AttemptScrollTo(m_dragThumbState.orgItem);
+    } else {
+        AttemptScrollTo(m_dragThumbState.itemOffset + getItemFromWidth(p.x - m_screenframe.pos.x));
+    }
 }
 
-void UIHorizScroll::MouseEnter
-	(
-	Event *ev
-	)
-
+void UIHorizScroll::InitFrameAlignRight(UIWidget *parent)
 {
-	// FIXME: stub
+    UIRect2D frame, frameOut;
+
+    frame                = parent->getClientFrame();
+    frameOut.pos.x       = 0;
+    frameOut.pos.y       = frame.pos.y + frame.size.height - m_vVirtualScale[0] * 16.f;
+    frameOut.size.width  = frame.size.width - m_vVirtualScale[0] * 16.f;
+    frameOut.size.height = m_vVirtualScale[0] * 16.f;
+
+    if (m_frameinitted) {
+        setFrame(frameOut);
+        return;
+    }
+
+    InitFrame(parent, frameOut, -1);
 }
 
-void UIHorizScroll::MouseLeave
-	(
-	Event *ev
-	)
-
+void UIHorizScroll::MouseEnter(Event *ev)
 {
-	// FIXME: stub
+    uWinMan.ActivateControl(this);
 }
 
-void UIHorizScroll::Scroll
-	(
-	Event *ev
-	)
+void UIHorizScroll::MouseLeave(Event *ev) {}
 
+bool UIHorizScroll::isEnoughItems(void)
 {
-	// FIXME: stub
+    return m_numitems > m_pagewidth;
 }
 
-bool UIHorizScroll::AttemptScrollTo
-	(
-	int to
-	)
-
+void UIHorizScroll::setNumItems(int i)
 {
-	// FIXME: stub
-	return false;
+    m_numitems = i;
 }
 
-void UIHorizScroll::setNumItems
-	(
-	int i
-	)
-
+void UIHorizScroll::setPageWidth(int i)
 {
-	// FIXME: stub
+    m_pagewidth = i;
 }
 
-void UIHorizScroll::setPageWidth
-	(
-	int i
-	)
-
+void UIHorizScroll::setTopItem(int i)
 {
-	// FIXME: stub
+    m_topitem = i;
 }
 
-void UIHorizScroll::setTopItem
-	(
-	int i
-	)
-
+int UIHorizScroll::getTopItem(void)
 {
-	// FIXME: stub
+    return m_topitem;
 }
 
-int UIHorizScroll::getTopItem
-	(
-	void
-	)
-
+int UIHorizScroll::getPageWidth(void)
 {
-	// FIXME: stub
-	return 0;
+    return m_pagewidth;
 }
 
-int UIHorizScroll::getPageWidth
-	(
-	void
-	)
-
+int UIHorizScroll::getNumItems(void)
 {
-	// FIXME: stub
-	return 0;
+    return m_numitems;
 }
 
-int UIHorizScroll::getNumItems
-	(
-	void
-	)
-
+void UIHorizScroll::setThumbColor(const UColor& thumb)
 {
-	// FIXME: stub
-	return 0;
+    m_thumbcolor = thumb;
 }
 
-void UIHorizScroll::setThumbColor
-	(
-	const UColor& thumb
-	)
-
+void UIHorizScroll::setSolidBorderColor(const UColor& col)
 {
-	// FIXME: stub
-}
-
-void UIHorizScroll::setSolidBorderColor
-	(
-	const UColor& col
-	)
-
-{
-	// FIXME: stub
-}
-
-void UIHorizScroll::InitFrameAlignRight
-	(
-	UIWidget *parent
-	)
-
-{
-	// FIXME: stub
+    m_solidbordercolor = col;
 }
diff --git a/code/uilib/uihorizscroll.h b/code/uilib/uihorizscroll.h
index dc386a69..be1bd9c3 100644
--- a/code/uilib/uihorizscroll.h
+++ b/code/uilib/uihorizscroll.h
@@ -20,58 +20,63 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIHORIZSCROLL_H__
-#define __UIHORIZSCROLL_H__
+#pragma once
 
-typedef enum { VS_NONE, VS_UP_ARROW, VS_DOWN_ARROW, VS_THUMB, VS_PAGE_DOWN, VS_PAGE_UP } whatspressed;
+typedef enum {
+    VS_NONE,
+    VS_UP_ARROW,
+    VS_DOWN_ARROW,
+    VS_THUMB,
+    VS_PAGE_DOWN,
+    VS_PAGE_UP
+} whatspressed;
 
-class UIHorizScroll : public UIWidget {
+class UIHorizScroll : public UIWidget
+{
 protected:
-	int m_numitems;
-	int m_pagewidth;
-	int m_topitem;
-	UIFont m_marlett;
-	whatspressed m_pressed;
-	UIRect2D thumbRect;
+    int          m_numitems;
+    int          m_pagewidth;
+    int          m_topitem;
+    UIFont       m_marlett;
+    whatspressed m_pressed;
+    UIRect2D     thumbRect;
 
-	struct {
-		int itemOffset;
-		int orgItem;
-	} m_dragThumbState;
+    struct {
+        int itemOffset;
+        int orgItem;
+    } m_dragThumbState;
 
-	bool m_frameinitted;
-	UColor m_thumbcolor;
-	UColor m_solidbordercolor;
-public:
-	CLASS_PROTOTYPE( UIHorizScroll );
-
-protected:
-	int			getItemFromWidth( float height );
-	bool		isEnoughItems( void );
+    bool   m_frameinitted;
+    UColor m_thumbcolor;
+    UColor m_solidbordercolor;
 
 public:
-	UIHorizScroll();
+    CLASS_PROTOTYPE(UIHorizScroll);
 
-	void		Draw( void ) override;
-	void		DrawArrow( float top, const char *text, bool pressed );
-	void		DrawThumb();
-	void		MouseDown( Event *ev );
-	void		MouseUp( Event *ev );
-	void		MouseDragged( Event *ev );
-	void		MouseEnter( Event *ev );
-	void		MouseLeave( Event *ev );
-	void		Scroll( Event *ev );
-	bool		AttemptScrollTo( int to );
-	void		setNumItems( int i );
-	void		setPageWidth( int i );
-	void		setTopItem( int i );
-	int			getTopItem( void );
-	int			getPageWidth( void );
-	int			getNumItems( void );
-	void		setThumbColor( const UColor& thumb );
-	void		setSolidBorderColor( const UColor& col );
-	void		InitFrameAlignRight( UIWidget *parent );
+protected:
+    int  getItemFromWidth(float height);
+    bool isEnoughItems(void);
+
+public:
+    UIHorizScroll();
+
+    void Draw(void) override;
+    void DrawArrow(float top, const char *text, bool pressed);
+    void DrawThumb();
+    void MouseDown(Event *ev);
+    void MouseUp(Event *ev);
+    void MouseDragged(Event *ev);
+    void MouseEnter(Event *ev);
+    void MouseLeave(Event *ev);
+    void Scroll(Event *ev);
+    bool AttemptScrollTo(int to);
+    void setNumItems(int i);
+    void setPageWidth(int i);
+    void setTopItem(int i);
+    int  getTopItem(void);
+    int  getPageWidth(void);
+    int  getNumItems(void);
+    void setThumbColor(const UColor& thumb);
+    void setSolidBorderColor(const UColor& col);
+    void InitFrameAlignRight(UIWidget *parent);
 };
-
-#endif
-
diff --git a/code/uilib/uilabel.cpp b/code/uilib/uilabel.cpp
index 1d13381c..642dc49d 100644
--- a/code/uilib/uilabel.cpp
+++ b/code/uilib/uilabel.cpp
@@ -24,230 +24,404 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../qcommon/localization.h"
 
 Event EV_UILabel_LinkString
-	(
-	"linkstring",
-	EV_DEFAULT,
-	"is",
-	"value string",
-	"Creates a link from the specified value to a string. "
-	"Use this if you want the label to display a string different from the value of the cvar"
-	);
+(
+    "linkstring",
+    EV_DEFAULT,
+    "is",
+    "value string",
+    "Creates a link from the specified value to a string. "
+    "Use this if you want the label to display a string different from the value of the cvar"
 
+);
 Event EV_UILabel_LinkCvarToShader
-	(
-	"linkcvartoshader",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Links the label's cvar to its shader"
-	);
+(
+    "linkcvartoshader",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Links the label's cvar to its shader"
+);
+// Added in 2.0
+//====
+Event EV_UILabel_OneShotSound
+(
+    "oneshotsound",
+    EV_DEFAULT,
+    "sf",
+    "soundName soundTime",
+    "Set the sound to play"
+);
+Event EV_UILabel_LoopingSound
+(
+    "loopingsound",
+    EV_DEFAULT,
+    "sffff",
+    "soundName start_volume hold_start_time ending_volume ramp_time",
+    "Set the sound to play"
 
-CLASS_DECLARATION( UIWidget, UILabel, NULL )
-{
-	{ &W_MouseEntered,					&UILabel::MouseEntered },
-	{ &W_MouseExited,					&UILabel::MouseExited },
-	{ &EV_UILabel_LinkString,			&UILabel::LinkString },
-	{ &EV_UILabel_LinkCvarToShader,		&UILabel::SetLinkCvarToShader },
-	{ &EV_Layout_Shader,				&UILabel::LabelLayoutShader },
-	{ &EV_Layout_TileShader,			&UILabel::LabelLayoutTileShader },
-	{ NULL, NULL }
+);
+Event EV_UILabel_OutlinedText
+(
+    "outlinedtext",
+    EV_DEFAULT,
+    "i",
+    "outlined",
+    "Set/clear outline text"
+);
+//====
+
+static const char *localizableVars[] = {
+    "cl_langamerefreshstatus",
+    "ui_timemessage",
+    "cg_obj_axistext1",
+    "cg_obj_axistext2",
+    "cg_obj_axistext3",
+    "cg_obj_axistext4",
+    "cg_obj_axistext5"
+    "cg_obj_alliedtext1",
+    "cg_obj_alliedtext2",
+    "cg_obj_alliedtext3",
+    "cg_obj_alliedtext4",
+    "cg_obj_alliedtext5",
+    "g_gametypestring",
+    "dm_serverstatus",
+    "com_errormessage",
+    NULL};
+
+CLASS_DECLARATION(UIWidget, UILabel, NULL) {
+    {&W_MouseEntered,              &UILabel::MouseEntered         },
+    {&W_MouseExited,               &UILabel::MouseExited          },
+    {&EV_UILabel_LinkString,       &UILabel::LinkString           },
+    {&EV_UILabel_LinkCvarToShader, &UILabel::SetLinkCvarToShader  },
+    {&EV_UILabel_OneShotSound,     &UILabel::OneShotSound         },
+    {&EV_UILabel_LoopingSound,     &UILabel::LoopingSound         },
+    {&EV_Layout_Shader,            &UILabel::LabelLayoutShader    },
+    {&EV_Layout_TileShader,        &UILabel::LabelLayoutTileShader},
+    {&EV_UILabel_OutlinedText,     &UILabel::EventSetOutlinedText },
+    {NULL,                         NULL                           }
 };
 
 UILabel::UILabel()
 {
-	AllowActivate( false );
-	m_bLinkCvarToShader = false;
+    AllowActivate(false);
+    m_bLinkCvarToShader = false;
+    m_bOneShotTriggered = false;
+    m_iNextOneShotTime  = 0;
+    m_iNextStateTime    = 0;
+    m_iLastDrawTime     = 0;
+    m_bOutlinedText     = false;
 }
 
-void UILabel::MouseEntered
-	(
-	Event *ev
-	)
-
+void UILabel::MouseEntered(Event *ev)
 {
-	SetHovermaterialActive( true );
+    SetHovermaterialActive(true);
 }
 
-void UILabel::MouseExited
-	(
-	Event *ev
-	)
-
+void UILabel::MouseExited(Event *ev)
 {
-	SetHovermaterialActive( false );
-	SetPressedmaterialActive( false );
+    SetHovermaterialActive(false);
+    SetPressedmaterialActive(false);
 }
 
-void UILabel::LinkString
-	(
-	Event *ev
-	)
-
+void UILabel::LinkString(Event *ev)
 {
-	linkstring *ls;
-	str value;
-	str string;
+    linkstring *ls;
+    str         value;
+    str         string;
 
-	value = ev->GetString( 1 );
-	string = ev->GetString( 2 );
+    value  = ev->GetString(1);
+    string = ev->GetString(2);
 
-	ls = new linkstring( value, string );
+    ls = new linkstring(value, string);
 
-	m_linkstrings.AddObject( ls );
+    m_linkstrings.AddObject(ls);
 }
 
-int UILabel::FindLinkString
-	(
-	str val
-	)
-
+void UILabel::SetLabel(str lab)
 {
-	int i;
-
-	for( i = 1; i <= m_linkstrings.NumObjects(); i++ )
-	{
-		if( val == m_linkstrings.ObjectAt( i )->value )
-			return i;
-	}
-
-	return 0;
+    label = lab;
 }
 
-void UILabel::LabelLayoutShader
-	(
-	Event *ev
-	)
-
+int UILabel::FindLinkString(str val)
 {
-	m_sCurrentShaderName = ev->GetString( 1 );
-	setMaterial( uWinMan.RegisterShader( m_sCurrentShaderName ) );
+    int i;
 
-	m_flags &= ~WF_TILESHADER;
+    for (i = 1; i <= m_linkstrings.NumObjects(); i++) {
+        if (val == m_linkstrings.ObjectAt(i)->value) {
+            return i;
+        }
+    }
+
+    return 0;
 }
 
-void UILabel::LabelLayoutTileShader
-	(
-	Event *ev
-	)
-
+void UILabel::LabelLayoutShader(Event *ev)
 {
-	m_sCurrentShaderName = ev->GetString( 1 );
-	setMaterial( uWinMan.RegisterShader( m_sCurrentShaderName ) );
+    m_sCurrentShaderName = ev->GetString(1);
+    setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
 
-	m_flags |= WF_TILESHADER;
+    m_flags &= ~WF_TILESHADER;
 }
 
-void UILabel::SetLinkCvarToShader
-	(
-	Event *ev
-	)
-
+void UILabel::LabelLayoutTileShader(Event *ev)
 {
-	m_bLinkCvarToShader = true;
+    m_sCurrentShaderName = ev->GetString(1);
+    if (m_sCurrentShaderName.length() > 1) {
+        setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
+    } else {
+        // Added in 2.0
+        //  Don't set the material if the shader name is considered empty
+        m_sCurrentShaderName = "";
+    }
+
+    m_flags |= WF_TILESHADER;
 }
 
-void UILabel::SetLabel
-	(
-	str lab
-	)
-
+void UILabel::SetLinkCvarToShader(Event *ev)
 {
-	label = lab;
+    m_bLinkCvarToShader = true;
 }
 
-void UILabel::Draw
-	(
-	void
-	)
-
+void UILabel::OneShotSound(Event *ev)
 {
-	const char *string;
-	str val;
-
-	if( m_cvarname.length() )
-	{
-		string = uii.Cvar_GetString( m_cvarname, "" );
-
-		if( m_linkstrings.NumObjects() )
-		{
-			cvar_t *cvar = UI_FindCvar( m_cvarname );
-			if( cvar )
-			{
-				int ret;
-
-				if( cvar->latchedString )
-					val = cvar->latchedString;
-				else
-					val = cvar->string;
-
-				ret = FindLinkString( val );
-				if( ret )
-				{
-					string = m_linkstrings.ObjectAt( ret )->value;
-				}
-			}
-		}
-
-		if( m_bLinkCvarToShader )
-		{
-			if( str::icmp( m_sCurrentShaderName, string ) )
-			{
-				m_sCurrentShaderName = string;
-
-				setMaterial( uWinMan.RegisterShader( m_sCurrentShaderName ) );
-				m_material->ReregisterMaterial();
-
-				if( !m_material->GetMaterial() )
-				{
-					setMaterial( NULL );
-				}
-			}
-
-			if( label.length() )
-			{
-				string = label;
-			}
-			else if( m_title.length() )
-			{
-				string = m_title;
-			}
-			else
-			{
-				string = "";
-			}
-		}
-	}
-	else
-	{
-		if( label.length() )
-		{
-			string = label;
-		}
-		else if( m_title.length() )
-		{
-			string = m_title;
-		}
-		else
-		{
-			string = "";
-		}
-	}
-
-	if( *string )
-	{
-		float nr, ng, nb;
-
-		nr = m_foreground_color.r;
-		ng = m_foreground_color.g;
-		nb = m_foreground_color.b;
-
-		m_font->setColor( UColor( nr, ng, nb, m_foreground_color.a * m_local_alpha ) );
-
-		// print the text
-		m_font->PrintJustified( getClientFrame(),
-			m_iFontAlignmentHorizontal,
-			m_iFontAlignmentVertical,
-			Sys_LV_CL_ConvertString( string ),
-			m_bVirtual ? m_vVirtualScale : NULL );
-	}
+    m_sOneShotSoundName = ev->GetString(1);
+    m_fOneShotSoundTime = ev->GetFloat(2);
+}
+
+void UILabel::LoopingSound(Event *ev)
+{
+    m_sLoopingSoundName = ev->GetString(1);
+
+    switch (ev->NumArgs()) {
+    case 1:
+        m_fLoopingSoundHoldStartTime = 0.0;
+        m_fLoopingSoundStartVolume   = 1.0;
+        m_fLoopingSoundEndVolume     = 1.0;
+        m_fLoopingSoundRampTime      = 0.0;
+        break;
+    case 2:
+    case 3:
+        m_fLoopingSoundStartVolume   = ev->GetFloat(2);
+        m_fLoopingSoundHoldStartTime = 0.0;
+        m_fLoopingSoundEndVolume     = ev->GetFloat(2);
+        m_fLoopingSoundRampTime      = 0.0;
+        break;
+    case 4:
+        m_fLoopingSoundStartVolume   = ev->GetFloat(2);
+        m_fLoopingSoundHoldStartTime = ev->GetFloat(3);
+        m_fLoopingSoundEndVolume     = ev->GetFloat(4);
+        m_fLoopingSoundRampTime      = 4.0;
+        break;
+    case 5:
+        m_fLoopingSoundStartVolume   = ev->GetFloat(2);
+        m_fLoopingSoundHoldStartTime = ev->GetFloat(3);
+        m_fLoopingSoundEndVolume     = ev->GetFloat(4);
+        m_fLoopingSoundRampTime      = ev->GetFloat(5);
+        break;
+    default:
+        break;
+    }
+}
+
+void UILabel::EventSetOutlinedText(Event *ev)
+{
+    if (ev->NumArgs() > 0) {
+        m_bOutlinedText = ev->GetInteger(1) ? true : false;
+    } else {
+        m_bOutlinedText = true;
+    }
+}
+
+void UILabel::Draw(void)
+{
+    const char *string;
+    str         val;
+
+    ProcessSounds();
+
+    m_iLastDrawTime = uii.Sys_Milliseconds();
+
+    if (m_cvarname.length()) {
+        string = uii.Cvar_GetString(m_cvarname, "");
+
+        //
+        // localize the cvar value when possible
+        //
+        for (int i = 0; localizableVars[i]; i++) {
+            if (!strcmp(localizableVars[i], string)) {
+                string = Sys_LV_CL_ConvertString(localizableVars[i]);
+            }
+        }
+
+        if (m_linkstrings.NumObjects()) {
+            cvar_t *cvar = UI_FindCvar(m_cvarname);
+            if (cvar) {
+                int ret;
+
+                if (cvar->latchedString) {
+                    val = cvar->latchedString;
+                } else {
+                    val = cvar->string;
+                }
+
+                ret = FindLinkString(val);
+                if (ret) {
+                    string = m_linkstrings.ObjectAt(ret)->string;
+                }
+            }
+        }
+
+        if (m_bLinkCvarToShader) {
+            if (str::icmp(m_sCurrentShaderName, string)) {
+                m_sCurrentShaderName = string;
+
+                setMaterial(uWinMan.RegisterShader(m_sCurrentShaderName));
+
+                if (!m_material->GetMaterial()) {
+                    setMaterial(NULL);
+                }
+            }
+
+            if (label.length()) {
+                string = label;
+            } else if (m_title.length()) {
+                string = m_title;
+            } else {
+                string = "";
+            }
+        }
+    } else {
+        if (label.length()) {
+            string = label;
+        } else if (m_title.length()) {
+            string = m_title;
+        } else {
+            string = "";
+        }
+    }
+
+    if (*string) {
+        float nr, ng, nb;
+        float alpha;
+
+        nr = m_foreground_color.r;
+        ng = m_foreground_color.g;
+        nb = m_foreground_color.b;
+
+        m_font->setColor(UColor(nr, ng, nb, m_foreground_color.a * m_local_alpha));
+
+        if (m_bOutlinedText) {
+            // print the text
+            m_font->PrintOutlinedJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                string,
+                UBlack,
+                getVirtualScale()
+            );
+        } else {
+            // print the text
+            m_font->PrintJustified(
+                getClientFrame(),
+                m_iFontAlignmentHorizontal,
+                m_iFontAlignmentVertical,
+                string,
+                getVirtualScale()
+            );
+        }
+    }
+}
+
+void UILabel::FrameInitialized()
+{
+    if (m_sOneShotSoundName.length() || m_sLoopingSoundName.length()) {
+        uii.Cmd_Stuff("tmstop\n");
+        m_bOneShotTriggered = false;
+        m_iNextOneShotTime  = uii.Sys_Milliseconds() + 2000;
+        m_iNextStateTime    = 0;
+    }
+
+    m_iLastDrawTime = 0;
+
+    UIWidget::FrameInitialized();
+}
+
+void UILabel::ProcessSounds()
+{
+    char  buffer[64];
+    float frac;
+
+    if (paused->integer) {
+        if (m_iNextOneShotTime) {
+            m_iNextOneShotTime += uii.Sys_Milliseconds() - m_iLastDrawTime;
+        }
+
+        if (m_iNextStateTime) {
+            m_iNextStateTime += uii.Sys_Milliseconds() - m_iLastDrawTime;
+        }
+    }
+
+    if (m_iNextOneShotTime && uii.Sys_Milliseconds() > m_iNextOneShotTime) {
+        if (m_sOneShotSoundName.length() && !m_bOneShotTriggered) {
+            //
+            // use the looping sound if the oneshot sound was triggered is non-existent
+            //
+            uii.Snd_StopAllSound();
+            uii.Snd_FadeSound(0);
+            uii.Snd_PlaySoundDialog(m_sOneShotSoundName);
+
+            m_bOneShotTriggered = true;
+            m_iNextOneShotTime  = Sys_Milliseconds() + m_fOneShotSoundTime * 1000.0f;
+        } else if (m_sLoopingSoundName.length()) {
+            uii.Cmd_Stuff("tmstartloop " + m_sLoopingSoundName + '\n');
+
+            m_iNextOneShotTime = 0;
+            m_iSoundState      = 0;
+            m_iNextStateTime   = uii.Sys_Milliseconds();
+        } else {
+            m_iNextOneShotTime = 0;
+        }
+    }
+
+    if (m_iNextStateTime && uii.Sys_Milliseconds() >= m_iNextStateTime) {
+        switch (m_iSoundState) {
+        case 0:
+            Com_sprintf(buffer, sizeof(buffer), "tmvolume %4.2f\n", m_fLoopingSoundStartVolume);
+            uii.Cmd_Stuff(buffer);
+            m_iNextStateTime = uii.Sys_Milliseconds() + m_fLoopingSoundHoldStartTime * 1000;
+            m_iSoundState    = 1;
+            break;
+        case 1:
+            m_iLastEnterTime = m_iNextStateTime;
+            m_iSoundState    = 2;
+            m_iNextStateTime = uii.Sys_Milliseconds() + 10;
+            break;
+        case 2:
+            if (m_fLoopingSoundRampTime > 0) {
+                frac = (uii.Sys_Milliseconds() - m_iLastEnterTime) / (m_fLoopingSoundRampTime * 1000);
+            } else {
+                frac = 1.0;
+            }
+
+            Com_sprintf(
+                buffer,
+                sizeof(buffer),
+                "tmvolume %4.2f\n",
+                frac * (m_fLoopingSoundEndVolume - m_fLoopingSoundStartVolume) + m_fLoopingSoundStartVolume
+            );
+            uii.Cmd_Stuff(buffer);
+
+            m_iNextStateTime = uii.Sys_Milliseconds() + 10;
+            if (frac > 1.0) {
+                m_iSoundState = 3;
+            }
+            break;
+        case 3:
+            m_iNextStateTime = 0;
+            break;
+        default:
+            break;
+        }
+    }
 }
diff --git a/code/uilib/uilabel.h b/code/uilib/uilabel.h
index 444c8222..f65e2ca0 100644
--- a/code/uilib/uilabel.h
+++ b/code/uilib/uilabel.h
@@ -20,53 +20,70 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILABEL_H__
-#define __UILABEL_H__
+#pragma once
 
-class linkstring {
+class linkstring
+{
 public:
-	str value;
-	str string;
+    str value;
+    str string;
 
-	linkstring( str value, str string );
+    linkstring(str value, str string);
 };
 
-inline
-linkstring::linkstring
-	(
-	str value,
-	str string
-	)
+inline linkstring::linkstring(str value, str string)
 
 {
-	this->value = value;
-	this->string = string;
+    this->value  = value;
+    this->string = string;
 }
 
-class UILabel : public UIWidget {
-	str label;
-	Container<linkstring *> m_linkstrings;
-	qboolean m_bLinkCvarToShader;
-	str m_sCurrentShaderName;
+class UILabel : public UIWidget
+{
+    str                     label;
+    Container<linkstring *> m_linkstrings;
+    qboolean                m_bLinkCvarToShader;
+    str                     m_sCurrentShaderName;
+    str                     m_sOneShotSoundName;
+    str                     m_sLoopingSoundName;
+    qboolean                m_bOneShotTriggered;
+    float                   m_fOneShotSoundTime;
+    int                     m_iNextOneShotTime;
+    float                   m_fLoopingSoundStartVolume;
+    float                   m_fLoopingSoundHoldStartTime;
+    float                   m_fLoopingSoundEndVolume;
+    float                   m_fLoopingSoundRampTime;
+    int                     m_iNextStateTime;
+    int                     m_iSoundState;
+    int                     m_iLastEnterTime;
+    int                     m_iLastDrawTime;
+
+protected:
+    qboolean                m_bOutlinedText;
 
 public:
-	CLASS_PROTOTYPE( UILabel );
+    CLASS_PROTOTYPE(UILabel);
 
 private:
-	void		MouseEntered( Event *ev );
-	void		MouseExited( Event *ev );
-	void		LinkString( Event *ev );
-	int			FindLinkString( str val );
-	void		LabelLayoutShader( Event *ev );
-	void		LabelLayoutTileShader( Event *ev );
-	void		SetLinkCvarToShader( Event *ev );
+    void MouseEntered(Event *ev);
+    void MouseExited(Event *ev);
+    void LinkString(Event *ev);
+    int  FindLinkString(str val);
+    void LabelLayoutShader(Event *ev);
+    void LabelLayoutTileShader(Event *ev);
+    // Added in 2.0
+    //====
+    void OneShotSound(Event *ev);
+    void LoopingSound(Event *ev);
+    void EventSetOutlinedText(Event *ev);
+    //====
+    void SetLinkCvarToShader(Event *ev);
+    void FrameInitialized() override; // Added in 2.0
+    void ProcessSounds();             // Added in 2.0
 
 public:
-	UILabel();
+    UILabel();
 
-	void		SetLabel( str lab );
-	void		Draw( void ) override;
+    void SetLabel(str lab);
+    void Draw(void) override;
 };
-
-#endif
-
diff --git a/code/uilib/uilangamelist.cpp b/code/uilib/uilangamelist.cpp
index a01e2e2b..0dd99184 100644
--- a/code/uilib/uilangamelist.cpp
+++ b/code/uilib/uilangamelist.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,229 +21,519 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIWidget, UILanGameList, NULL )
-{
-	{ NULL, NULL }
+Event EV_UILGL_ConnectToSelected
+(
+    "connecttoselected",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Makes the lan game list connect to the selected server"
+);
+
+CLASS_DECLARATION(UIWidget, UILanGameList, NULL) {
+    {&EV_UILGL_ConnectToSelected, &UILanGameList::EventConnect},
+    {NULL,                        NULL                        }
 };
 
 UILanGameList::UILanGameList()
 {
-	// FIXME: stub
+    m_Vscroll = new UIVertScroll();
+    m_created = false;
+
+    AllowActivate(true);
+    m_activerow  = 0;
+    m_activeitem = 0;
+
+    m_noservers_wid = NULL;
+    m_noservers_mat = uWinMan.RegisterShader("textures/menu/noservers");
+    m_fill_mat      = NULL;
+
+    m_iPrevNumServers = 0;
+    m_iCurrNumServers = 0;
 }
 
-void UILanGameList::CreateServerWidgets
-	(
-	void
-	)
-
+UILanGameList::~UILanGameList()
 {
-	// FIXME: stub
+    m_dying = true;
 }
 
-void UILanGameList::DestroyServerWidgets
-	(
-	void
-	)
+void UILanGameList::FrameInitialized(void) {}
 
+void UILanGameList::AddColumn(str sName, UIReggedMaterial *pMaterial, int iWidth, Container<str> *csEntries)
 {
-	// FIXME: stub
+    Event    evVirtualRes(EV_Layout_VirtualRes);
+    int      i;
+    qboolean iColorToggle = qfalse;
+    UILabel *label;
+
+    evVirtualRes.AddInteger(true);
+
+    label = new UILabel();
+    m_titlewidgets.AddObject(label);
+
+    if (m_bVirtual) {
+        label->ProcessEvent(evVirtualRes);
+    }
+
+    label->InitFrame(this, m_fCurColumnWidth, 4, iWidth, 24, 1);
+    label->setFont("facfont-20");
+    label->setFontHorizontalAlignment(FONT_JUSTHORZ_LEFT);
+    label->setFontVerticalAlignment(FONT_JUSTVERT_CENTER);
+    label->setName(sName);
+
+    if (pMaterial) {
+        label->setMaterial(pMaterial);
+    } else {
+        label->setTitle(sName);
+    }
+
+    label->Realign();
+    label->setForegroundColor(UColor(0.7f, 0.6f, 0.05f, 1.f));
+    label->setBackgroundColor(UColor(0, 0, 0, 0), true);
+
+    for (i = 0; i < csEntries->NumObjects(); i++) {
+        UILanGameListLabel *listLabel = new UILanGameListLabel(this);
+        const str&          sEntry    = csEntries->ObjectAt(i);
+
+        if (m_bVirtual) {
+            listLabel->ProcessEvent(evVirtualRes);
+        }
+
+        listLabel->InitFrame(this, m_fCurColumnWidth, i * 16 + 28, iWidth, 16, 0);
+        listLabel->setName(sEntry);
+        listLabel->setTitle(sEntry);
+        listLabel->setFontHorizontalAlignment(FONT_JUSTHORZ_LEFT);
+        listLabel->setFontVerticalAlignment(FONT_JUSTVERT_CENTER);
+        listLabel->setShow(true);
+
+        iColorToggle ^= 1;
+        if (iColorToggle) {
+            listLabel->setForegroundColor(UColor(0.07f, 0.06f, 0.005f));
+            listLabel->setBackgroundColor(UColor(0.07f, 0.06f, 0.005f), true);
+        } else {
+            listLabel->setForegroundColor(UColor(0.21f, 0.18f, 0.015f));
+            listLabel->setBackgroundColor(UColor(0.21f, 0.18f, 0.015f), true);
+        }
+
+        m_widgetlist.AddObject(listLabel);
+    }
+
+    m_iNumColumns++;
+    m_fCurColumnWidth += iWidth;
 }
 
-void UILanGameList::RepositionServerWidgets
-	(
-	void
-	)
-
+void UILanGameList::AddNoServer(void)
 {
-	// FIXME: stub
+    if (!m_noservers_wid) {
+        m_noservers_wid = new UILabel();
+        m_miscwidgets.AddObject(m_noservers_wid);
+        if (m_bVirtual) {
+            Event event(EV_Layout_VirtualRes);
+            event.AddInteger(1);
+            m_noservers_wid->ProcessEvent(event);
+        }
+
+        m_noservers_wid->setBackgroundColor(UColor(0, 0, 0, 0), true);
+        m_noservers_wid->setMaterial(m_noservers_mat);
+        m_noservers_wid->InitFrame(this, 0, 0, 100, 100, 0);
+    } else {
+        m_noservers_wid->setFrame(UIRect2D(0, 0, 100, 100));
+    }
+
+    m_noservers_wid->setShow(false);
 }
 
-void UILanGameList::DrawNoServers
-	(
-	UIRect2D frame
-	)
-
+void UILanGameList::CreateServerWidgets(void)
 {
-	// FIXME: stub
+    int i;
+
+    Event evVirtualRes(EV_Layout_VirtualRes);
+    evVirtualRes.AddInteger(true);
+
+    if (m_created) {
+        return;
+    }
+
+    Container<str> cServerNums;
+    Container<str> cHostNames;
+    Container<str> cMapNames;
+    Container<str> cClients;
+    Container<str> cPing;
+    Container<str> cNetType;
+    Container<str> cGameTypeString;
+    float          fFrameWidth;
+
+    for (i = 1; i <= m_iCurrNumServers; i++) {
+        const serverInfo_t *info = m_servers.ObjectAt(i);
+
+        cServerNums.AddObject(str(i));
+        cHostNames.AddObject(info->hostName);
+        cMapNames.AddObject(info->mapName);
+        cClients.AddObject(info->clients);
+        cPing.AddObject(info->ping);
+        cNetType.AddObject(info->netType);
+        cGameTypeString.AddObject(info->gameTypeString);
+    }
+
+    m_fCurColumnWidth = 4;
+    m_iNumColumns     = 0;
+    fFrameWidth       = m_frame.size.width / m_vVirtualScale[0] - 16.0 - 12.0;
+
+    AddColumn(Sys_LV_CL_ConvertString("Server Name"), NULL, fFrameWidth * 0.4f, &cHostNames);
+    AddColumn(Sys_LV_CL_ConvertString("Map"), NULL, fFrameWidth * 0.15f, &cMapNames);
+    AddColumn(Sys_LV_CL_ConvertString("Players"), NULL, fFrameWidth * 0.165f, &cClients);
+    AddColumn(Sys_LV_CL_ConvertString("GameType"), NULL, fFrameWidth * 0.22f, &cGameTypeString);
+    AddColumn(Sys_LV_CL_ConvertString("Ping"), NULL, fFrameWidth * 0.064f, &cPing);
+    AddNoServer();
+
+    m_created = true;
 }
 
-void UILanGameList::AddColumn
-	(
-	str sName,
-	UIReggedMaterial *pMaterial,
-	int iWidth,
-	Container<str> *csEntries
-	)
-
+void UILanGameList::DestroyServerWidgets(void)
 {
-	// FIXME: stub
+    int i;
+
+    if (!m_created) {
+        return;
+    }
+
+    for (i = 1; i <= m_titlewidgets.NumObjects(); i++) {
+        delete m_titlewidgets.ObjectAt(i);
+    }
+    m_titlewidgets.ClearObjectList();
+
+    for (i = 1; i <= m_widgetlist.NumObjects(); i++) {
+        delete m_widgetlist.ObjectAt(i);
+    }
+    m_widgetlist.ClearObjectList();
+
+    for (i = 1; i <= m_miscwidgets.NumObjects(); i++) {
+        delete m_miscwidgets.ObjectAt(i);
+    }
+    m_miscwidgets.ClearObjectList();
+
+    m_noservers_wid = NULL;
+    m_created       = false;
 }
 
-void UILanGameList::AddNoServer
-	(
-	void
-	)
-
+void UILanGameList::RepositionServerWidgets(void)
 {
-	// FIXME: stub
+    DestroyServerWidgets();
+
+    m_Vscroll->setPageHeight((getSize().height - 24) / 16.f);
+    m_Vscroll->setNumItems(m_iCurrNumServers);
+    m_Vscroll->InitFrameAlignRight(this, 4, 4);
+    CreateServerWidgets();
 }
 
-void UILanGameList::UpdateServers
-	(
-	void
-	)
-
+qboolean UILanGameList::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    switch (key) {
+    case K_ENTER:
+    case K_KP_END:
+        Connect();
+        return qtrue;
+    case K_MWHEELUP:
+        m_Vscroll->AttemptScrollTo(m_Vscroll->getTopItem() - 1);
+        return qtrue;
+    case K_MWHEELDOWN:
+        m_Vscroll->AttemptScrollTo(m_Vscroll->getTopItem() + 1);
+        return qtrue;
+    case K_UPARROW:
+        if (m_activerow != 0) {
+            if (m_activerow == m_Vscroll->getTopItem()) {
+                m_Vscroll->AttemptScrollTo(m_activerow - 1);
+                m_activerow = m_Vscroll->getTopItem();
+            } else {
+                m_activerow--;
+            }
+        }
+        return qtrue;
+    case K_DOWNARROW:
+        if (m_activerow + 1 < m_Vscroll->getNumItems()) {
+            if (m_activerow - m_Vscroll->getTopItem() + 1 < m_Vscroll->getPageHeight()) {
+                if (m_activerow == m_Vscroll->getPageHeight() + m_Vscroll->getTopItem()) {
+                    m_Vscroll->AttemptScrollTo(m_Vscroll->getTopItem() + 1);
+                    m_activerow = m_Vscroll->getTopItem() + m_Vscroll->getPageHeight();
+                } else {
+                    m_activerow++;
+                }
+                m_Vscroll->AttemptScrollTo(m_activerow - 1);
+                m_activerow = m_Vscroll->getTopItem();
+            } else if (m_Vscroll->AttemptScrollTo(m_activerow + 1)) {
+                m_activerow++;
+            }
+        }
+        return qtrue;
+    default:
+        break;
+    }
+
+    return qfalse;
 }
 
-
-void UILanGameList::FrameInitialized
-	(
-	void
-	)
-
+void UILanGameList::DrawNoServers(UIRect2D frame)
 {
-	// FIXME: stub
+    float x;
+    float w, h;
+
+    if (!m_noservers_mat) {
+        return;
+    }
+
+    if (!m_noservers_wid) {
+        AddNoServer();
+    }
+
+    w = uii.Rend_GetShaderWidth(m_noservers_mat->GetMaterial() * m_vVirtualScale[0]);
+    h = uii.Rend_GetShaderHeight(m_noservers_mat->GetMaterial() * m_vVirtualScale[1]);
+
+    UIRect2D newFrame    = uWinMan.getFrame();
+    x                    = (newFrame.pos.x + newFrame.size.width - w) * 0.5f;
+    newFrame.pos.x       = x;
+    newFrame.pos.y       = (newFrame.pos.y + newFrame.size.height - h) * 0.5f;
+    newFrame.size.width  = w;
+    newFrame.size.height = h;
+
+    m_noservers_wid->setFrame(newFrame);
+    m_noservers_wid->setShow(true);
+    m_noservers_wid->BringToFrontPropogated();
 }
 
-void UILanGameList::EventScanNetwork
-	(
-	Event *ev
-	)
-
+void UILanGameList::Highlight(UIWidget *wid)
 {
-	// FIXME: stub
+    int i, j;
+    int row = 0;
+
+    for (i = 0; i < m_iCurrNumServers; i++, row++) {
+        for (j = 0; j < m_iNumColumns; j++) {
+            if (m_widgetlist.ObjectAt(i + j * m_iCurrNumServers + 1) == wid) {
+                m_activerow  = row;
+                m_activeitem = j;
+            }
+        }
+    }
 }
 
-void UILanGameList::EventScaningNetwork
-	(
-	Event *ev
-	)
-
+void UILanGameList::Connect(void)
 {
-	// FIXME: stub
+    if (m_activerow < 0 || m_activerow >= m_iCurrNumServers) {
+        return;
+    }
+
+    // FIXME: add IPv6 support
+    uii.Connect(NET_AdrToString(m_servers.ObjectAt(m_activerow + 1)->adr), netadrtype_t::NA_IP);
 }
 
-bool UILanGameList::isDying
-	(
-	void
-	)
-
+void UILanGameList::EventConnect(Event *ev)
 {
-	// FIXME: stub
-	return false;
+    Connect();
 }
 
-void UILanGameList::Draw
-	(
-	void
-	)
-
+qboolean UILanGameList::SetActiveRow(UIWidget *w)
 {
-	// FIXME: stub
+    int      i, k;
+    int      row = 0;
+    qboolean ret1, ret2;
+    int      new_activerow  = -1;
+    int      new_activeitem = -1;
+
+    for (i = 0; i < m_iCurrNumServers; i++, row++) {
+        for (k = 0; k < m_iNumColumns; k++) {
+            if (m_widgetlist.ObjectAt(i + k * m_iCurrNumServers + 1) == w) {
+                new_activerow  = row;
+                new_activeitem = k;
+            }
+        }
+    }
+
+    ret1 = new_activerow == m_activerow;
+    ret2 = new_activeitem == m_activeitem;
+
+    if (new_activerow != -1) {
+        m_activerow = new_activerow;
+    }
+    if (new_activeitem != -1) {
+        m_activeitem = new_activeitem;
+    }
+
+    if (ret1) {
+        return ret2;
+    }
+    return qfalse;
 }
 
-qboolean UILanGameList::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+void UILanGameList::UpdateServers(void)
 {
-	// FIXME: stub
-	return qfalse;
+    int i;
+
+    if (!m_noservers_wid) {
+        AddNoServer();
+    }
+
+    setShow(false);
+
+    if (m_iPrevNumServers != cls.numlocalservers) {
+        m_iPrevNumServers = cls.numlocalservers;
+        DestroyServerWidgets();
+        m_iCurrNumServers = 0;
+
+        for (i = 0; i < cls.numlocalservers; i++, m_iCurrNumServers++) {
+            m_servers.AddUniqueObject(&cls.localServers[i]);
+        }
+
+        m_Vscroll->setPageHeight((getSize().height - 16) / 16.f);
+        m_Vscroll->setNumItems(m_iCurrNumServers);
+        m_Vscroll->InitFrameAlignRight(this, 0, 0);
+        CreateServerWidgets();
+    } else if (!m_iPrevNumServers) {
+        DrawNoServers(getFrame());
+    }
 }
 
-void UILanGameList::Highlight
-	(
-	UIWidget *wid
-	)
-
+void UILanGameList::Draw(void)
 {
-	// FIXME: stub
+    UIWidget *wid;
+    int       i, j, k;
+    int       row          = 0;
+    qboolean  iColorToggle = qfalse;
+    int       topRow;
+
+    UpdateServers();
+
+    if (!m_iCurrNumServers) {
+        // nothing to draw
+        return;
+    }
+
+    topRow = m_Vscroll->getTopItem();
+    DrawNoServers(getFrame());
+
+    for (i = 0; i < m_iCurrNumServers; i++, row++) {
+        iColorToggle ^= 1;
+
+        if (m_activerow == row) {
+            for (k = 0; k < m_iNumColumns; k++) {
+                wid = m_widgetlist.ObjectAt(m_activerow + k * m_iCurrNumServers + 1);
+
+                wid->setForegroundColor(UColor(0.9f, 0.8f, 0.6f, 1.f));
+                wid->setBackgroundColor(UColor(0.21f, 0.18f, 0.015f, 0.6f), true);
+
+                if (iColorToggle) {
+                    wid->setBorderColor(UColor(0, 0, 0, 0));
+                } else {
+                    wid->setBorderColor(UColor(0, 0, 0, 1));
+                }
+            }
+        }
+
+        for (j = 0; j < m_iNumColumns; j++) {
+            UIRect2D frame;
+
+            wid = m_widgetlist.ObjectAt(i + j * m_iCurrNumServers + 1);
+
+            frame = wid->getFrame();
+
+            if (m_activerow != row) {
+                if (iColorToggle) {
+                    wid->setForegroundColor(UColor(0.07f, 0.06f, 0.005f, 1));
+                    wid->setBackgroundColor(UColor(0.07f, 0.06f, 0.005f, 1), true);
+                } else {
+                    wid->setForegroundColor(UColor(0.21f, 0.18f, 0.015f, 1));
+                    wid->setBackgroundColor(UColor(0.21f, 0.18f, 0.015f, 1), true);
+                }
+            }
+
+            if (row < topRow) {
+                wid->setShow(false);
+            } else {
+                frame.pos.y = ((row - topRow) * 16 + 28) * m_vVirtualScale[1];
+                wid->setShow(true);
+            }
+
+            if (getSize().height - m_vVirtualScale[1] * 12 <= frame.pos.y) {
+                wid->setShow(false);
+            }
+            wid->setFrame(frame);
+            wid->Realign();
+        }
+    }
 }
 
-void UILanGameList::Connect
-	(
-	void
-	)
-
+void UILanGameList::Realign(void)
 {
-	// FIXME: stub
+    qboolean bVirtualChanged = qfalse;
+
+    if (m_bVirtual) {
+        vec2_t vNewVirtualScale;
+
+        vNewVirtualScale[0] = uid.vidWidth / 640.0;
+        vNewVirtualScale[1] = uid.vidHeight / 480.0;
+        bVirtualChanged     = VectorCompare2D(m_vVirtualScale, vNewVirtualScale) == 0;
+    }
+
+    UIWidget::Realign();
+
+    if (m_bVirtual) {
+        Event *event = new Event(EV_Layout_VirtualRes);
+        event->AddInteger(1);
+        m_Vscroll->ProcessEvent(event);
+    }
+
+    if (bVirtualChanged) {
+        m_Vscroll->Realign();
+
+        m_Vscroll->setPageHeight((getSize().height / m_vVirtualScale[1] - 24) / 16);
+        m_Vscroll->InitFrameAlignRight(this, 4, 4);
+        RepositionServerWidgets();
+    }
 }
 
-void UILanGameList::EventConnect
-	(
-	Event *ev
-	)
+void UILanGameList::EventScanNetwork(Event *ev) {}
 
+void UILanGameList::EventScaningNetwork(Event *ev) {}
+
+bool UILanGameList::isDying(void)
 {
-	// FIXME: stub
+    return m_dying;
 }
 
-void UILanGameList::PlayEnterSound
-	(
-	void
-	)
+void UILanGameList::PlayEnterSound(void) {}
 
-{
-	// FIXME: stub
-}
-
-qboolean UILanGameList::SetActiveRow
-	(
-	UIWidget *w
-	)
-
-{
-	// FIXME: stub
-	return qfalse;
-}
-
-void UILanGameList::Realign
-	(
-	void
-	)
-
-{
-	// FIXME: stub
-}
-
-CLASS_DECLARATION( UILabel, UILanGameListLabel, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UILabel, UILanGameListLabel, NULL) {
+    {&W_LeftMouseDown, &UILanGameListLabel::Pressed  },
+    {&W_LeftMouseUp,   &UILanGameListLabel::Unpressed},
+    {NULL,             NULL                          }
 };
 
 UILanGameListLabel::UILanGameListLabel()
 {
-
+    m_list             = NULL;
+    m_iLastPressedTime = 0;
 }
 
-UILanGameListLabel::UILanGameListLabel
-	(
-	UILanGameList *list
-	)
-
+UILanGameListLabel::UILanGameListLabel(UILanGameList *list)
 {
-
+    m_list             = list;
+    m_iLastPressedTime = 0;
 }
 
-void UILanGameListLabel::Pressed
-	(
-	Event *ev
-	)
-
+void UILanGameListLabel::Pressed(Event *ev)
 {
+    if (m_list) {
+        m_list->Highlight(this);
 
+        if (uii.Sys_Milliseconds() - m_iLastPressedTime < 200) {
+            m_list->Connect();
+        }
+    }
 }
 
-void UILanGameListLabel::Unpressed
-	(
-	Event *ev
-	)
-
+void UILanGameListLabel::Unpressed(Event *ev)
 {
-
+    if (m_list) {
+        m_iLastPressedTime = uii.Sys_Milliseconds();
+    }
 }
diff --git a/code/uilib/uilangamelist.h b/code/uilib/uilangamelist.h
index 80a46c2d..4d02c4d2 100644
--- a/code/uilib/uilangamelist.h
+++ b/code/uilib/uilangamelist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,71 +20,71 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILANGAMELIST_H__
-#define __UILANGAMELIST_H__
+#pragma once
 
-class UILanGameList : public UIWidget {
-	bool m_created;
-	UIVertScroll *m_Vscroll;
-	class UIHorizScroll *m_Hscroll;
-	UIReggedMaterial *m_noservers_mat;
-	UILabel *m_noservers_wid;
-	UIReggedMaterial *m_fill_mat;
-	Container<UIWidget *> m_widgetlist;
-	Container<UIWidget *> m_titlewidgets;
-	Container<UIWidget *> m_miscwidgets;
-	int m_activerow;
-	int m_activeitem;
-	Container<serverInfo_t *> m_servers;
-	int m_iNumColumns;
-	int m_iPrevNumServers;
-	int m_iCurrNumServers;
-	float m_fCurColumnWidth;
+class UILanGameList : public UIWidget
+{
+protected:
+    bool                      m_created;
+    UIVertScroll             *m_Vscroll;
+    class UIHorizScroll      *m_Hscroll;
+    UIReggedMaterial         *m_noservers_mat;
+    UILabel                  *m_noservers_wid;
+    UIReggedMaterial         *m_fill_mat;
+    Container<UIWidget *>     m_widgetlist;
+    Container<UIWidget *>     m_titlewidgets;
+    Container<UIWidget *>     m_miscwidgets;
+    int                       m_activerow;
+    int                       m_activeitem;
+    Container<serverInfo_t *> m_servers;
+    int                       m_iNumColumns;
+    int                       m_iPrevNumServers;
+    int                       m_iCurrNumServers;
+    float                     m_fCurColumnWidth;
 
 public:
-	CLASS_PROTOTYPE( UILanGameList );
-
-private:
-	void				CreateServerWidgets( void );
-	void				DestroyServerWidgets( void );
-	void				RepositionServerWidgets( void );
-	void				DrawNoServers( UIRect2D frame );
-	void				AddColumn( str sName, UIReggedMaterial *pMaterial, int iWidth, Container<str> *csEntries );
-	void				AddNoServer( void );
-	virtual void		UpdateServers( void );
+    CLASS_PROTOTYPE(UILanGameList);
 
 protected:
-	void	FrameInitialized( void ) override;
-	void	EventScanNetwork( Event *ev );
-	void	EventScaningNetwork( Event *ev );
+    void         CreateServerWidgets(void);
+    void         DestroyServerWidgets(void);
+    void         RepositionServerWidgets(void);
+    void         DrawNoServers(UIRect2D frame);
+    void         AddColumn(str sName, UIReggedMaterial *pMaterial, int iWidth, Container<str> *csEntries);
+    void         AddNoServer(void);
+    virtual void UpdateServers(void);
+
+protected:
+    void FrameInitialized(void) override;
+    void EventScanNetwork(Event *ev);
+    void EventScaningNetwork(Event *ev);
 
 public:
-	UILanGameList();
+    UILanGameList();
+    ~UILanGameList();
 
-	bool		isDying( void );
-	void		Draw() override;
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		Highlight( UIWidget *wid );
-	void		Connect( void );
-	void		EventConnect( Event *ev );
-	void		PlayEnterSound( void );
-	qboolean	SetActiveRow( UIWidget *w );
-	void		Realign( void ) override;
+    bool     isDying(void);
+    void     Draw() override;
+    qboolean KeyEvent(int key, unsigned int time) override;
+    void     Highlight(UIWidget *wid);
+    void     Connect(void);
+    void     EventConnect(Event *ev);
+    void     PlayEnterSound(void);
+    qboolean SetActiveRow(UIWidget *w);
+    void     Realign(void) override;
 };
 
-class UILanGameListLabel : public UILabel {
-	int m_iLastPressedTime;
-	UILanGameList *m_list;
+class UILanGameListLabel : public UILabel
+{
+    int            m_iLastPressedTime;
+    UILanGameList *m_list;
 
 public:
-	CLASS_PROTOTYPE( UILanGameListLabel );
+    CLASS_PROTOTYPE(UILanGameListLabel);
 
-	UILanGameListLabel();
-	UILanGameListLabel( UILanGameList *list );
+    UILanGameListLabel();
+    UILanGameListLabel(UILanGameList *list);
 
-	void	Pressed( Event *ev );
-	void	Unpressed( Event *ev );
+    void Pressed(Event *ev);
+    void Unpressed(Event *ev);
 };
-
-#endif
-
diff --git a/code/uilib/uilayout.h b/code/uilib/uilayout.h
index 5affc03e..a7c2a02d 100644
--- a/code/uilib/uilayout.h
+++ b/code/uilib/uilayout.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILAYOUT_H__
-#define __UILAYOUT_H__
+#pragma once
 
 class Script;
 
@@ -48,5 +47,3 @@ public:
 	void	Load( const char *filename, bool bFullLoad );
 	int		ForceLoad( void );
 };
-
-#endif
diff --git a/code/uilib/uilist.cpp b/code/uilib/uilist.cpp
index 9d947a3f..107571e1 100644
--- a/code/uilib/uilist.cpp
+++ b/code/uilib/uilist.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "localization.h"
 
 CLASS_DECLARATION( UIWidget, UIList, NULL )
 {
@@ -74,7 +75,74 @@ void UIList::Draw
 	)
 
 {
-	// FIXME: stub
+	UpdateUIElement();
+
+	// draw the item text
+	if (m_currentItem)
+	{
+		str itemText;
+		UIListItem *item = m_itemlist.ObjectAt(m_currentItem);
+		if (item->itemalias)
+		{
+			itemText = item->itemalias;
+		}
+		else if (item->itemname)
+		{
+			itemText = item->itemname;
+		}
+
+		float textX = 0.5f * m_frame.size.width - 0.5f * m_font->getWidth(itemText, -1);
+		float textY = 0.5f * (m_frame.size.height - m_font->getHeight(m_bVirtual ? m_vVirtualScale : uid.scaleRes)) - 1.0f;
+		m_font->setColor(m_foreground_color);
+		const char *text = Sys_LV_CL_ConvertString(itemText);
+		m_font->Print(textX, textY, text, -1, m_bVirtual ? m_vVirtualScale : NULL);
+	}
+
+	// draw the previous arrow
+	Draw3DBox(
+		0.0f,
+		0.0f,
+		m_arrow_width,
+		m_frame.size.height,
+		m_prev_arrow_depressed,
+		m_border_color,
+		m_local_alpha);
+
+	float height = m_frame.size.height - 4.0;
+	float width = m_arrow_width - 4.0;
+	uii.Rend_DrawPicStretched(
+		2.0f,
+		2.0f,
+		width,
+		height,
+		0.0f,
+		0.0f,
+		1.0f,
+		1.0f,
+		m_prev_arrow->GetMaterial());
+
+	// draw the next arrow
+	float x = m_frame.size.width - m_arrow_width;
+	float y = 0.0f;
+	Draw3DBox(
+		x,
+		y,
+		m_arrow_width,
+		m_frame.size.height,
+		m_next_arrow_depressed,
+		m_border_color,
+		m_local_alpha);
+
+	uii.Rend_DrawPicStretched(
+		x + 2.0f,
+		y + 2.0f,
+		width,
+		height,
+		0.0f,
+		0.0f,
+		1.0f,
+		1.0f,
+		m_next_arrow->GetMaterial());
 }
 
 qboolean UIList::KeyEvent
@@ -120,7 +188,31 @@ void UIList::Pressed
 	)
 
 {
-	// FIXME: stub
+	m_held = qtrue;
+	m_depressed = qtrue;
+
+	float mouse_xpos = ev->GetFloat(1);
+	float mouse_ypos = ev->GetFloat(2);
+	int buttons = ev->GetInteger(3); // unused
+
+	FrameInitialized();
+
+	// previous arrow is clicked
+	if (m_prev_arrow_region->contains(mouse_xpos, mouse_ypos))
+	{
+		m_prev_arrow_depressed = qtrue;
+		ScrollPrev();
+		UpdateData();
+		return;
+	}
+
+	// next arrow is clicked
+	if (m_next_arrow_region->contains(mouse_xpos, mouse_ypos))
+	{
+		m_next_arrow_depressed = qtrue;
+		ScrollNext();
+		UpdateData();
+	}
 }
 
 void UIList::Released
@@ -129,7 +221,10 @@ void UIList::Released
 	)
 
 {
-	// FIXME: stub
+	m_held = qfalse;
+	m_depressed = qfalse;
+	m_prev_arrow_depressed = qfalse;
+	m_next_arrow_depressed = qfalse;
 }
 
 void UIList::ScrollNext
@@ -172,7 +267,14 @@ void UIList::LayoutAddListItem
 	)
 
 {
-	// FIXME: stub
+	str item = ev->GetString(1);
+	str alias;
+	if (ev->NumArgs() > 1)
+	{
+		alias = ev->GetString(2);
+	}
+
+	AddItem(item, alias);
 }
 
 void UIList::AddItem
@@ -182,7 +284,12 @@ str alias
 )
 
 {
-	// FIXME: stub
+	UIListItem *listItem = new UIListItem();
+	listItem->itemname = item;
+	listItem->itemalias = alias;
+
+	m_itemlist.AddObject(listItem);
+	m_currentItem = 1;
 }
 
 void UIList::UpdateUIElement
@@ -191,7 +298,28 @@ void UIList::UpdateUIElement
 	)
 
 {
-	// FIXME: stub
+	if (!m_cvarname)
+	{
+		return;
+	}
+
+	const char *cvarstring = UI_GetCvarString(m_cvarname, NULL);
+	if (!cvarstring)
+	{
+		m_currentItem = 1;
+		UpdateData();
+		return;
+	}
+
+	for (int i = 1; i <= m_itemlist.NumObjects(); i++)
+	{
+		UIListItem *obj = m_itemlist.ObjectAt(i);
+		if (obj->itemname == cvarstring)
+		{
+			m_currentItem = i;
+			break;
+		}
+	}
 }
 
 void UIList::UpdateData
@@ -200,7 +328,28 @@ void UIList::UpdateData
 	)
 
 {
-	// FIXME: stub
+	if (!m_currentItem)
+	{
+		return;
+	}
+
+	if (m_cvarname)
+	{
+		UIListItem *item = m_itemlist.ObjectAt(m_currentItem);
+		if (item->itemname)
+		{
+			uii.Cvar_Set(m_cvarname, item->itemname);
+		}
+	}
+
+	if (m_command)
+	{
+		UIListItem *item = m_itemlist.ObjectAt(m_currentItem);
+		m_command.append(' ');
+		m_command.append(item->itemname);
+		m_command.append('\n');
+		Cbuf_AddText(m_command.c_str());
+	}
 }
 
 CLASS_DECLARATION( UIList, UIListIndex, NULL )
diff --git a/code/uilib/uilist.h b/code/uilib/uilist.h
index 2f3e0115..e76638f7 100644
--- a/code/uilib/uilist.h
+++ b/code/uilib/uilist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILIST_H__
-#define __UILIST_H__
+#pragma once
 
 class UIListItem {
 public:
@@ -71,5 +70,3 @@ public:
 
 	qboolean	KeyEvent( int key, unsigned int time ) override;
 };
-
-#endif /* __UILIST_H__ */
diff --git a/code/uilib/uilistbox.cpp b/code/uilib/uilistbox.cpp
index 218c9086..df6840ce 100644
--- a/code/uilib/uilistbox.cpp
+++ b/code/uilib/uilistbox.cpp
@@ -21,134 +21,120 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIWidget, UIListBase, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIListBase, NULL) {
+    {NULL, NULL}
 };
 
 UIListBase::UIListBase()
 {
-	m_currentItem = 0;
-	m_vertscroll = 0;
-	m_bUseVertScroll = 1;
-	AllowActivate(true);
+    m_currentItem    = 0;
+    m_vertscroll     = 0;
+    m_bUseVertScroll = true;
+    AllowActivate(true);
 }
 
-void UIListBase::TrySelectItem
-	(
-	int which
-	)
-
+void UIListBase::TrySelectItem(int which)
 {
-	int numitems;
+    int numitems;
 
-	numitems = getNumItems();
-	if (!numitems) {
-		m_currentItem = 0;
-		return;
-	}
+    numitems = getNumItems();
+    if (!numitems) {
+        m_currentItem = 0;
+        return;
+    }
 
-	if (m_currentItem != which)
-	{
-		int previous = m_currentItem;
+    if (m_currentItem != which) {
+        int previous = m_currentItem;
 
-		m_currentItem = which;
-		if (which > numitems) {
-			m_currentItem = numitems;
-		}
+        m_currentItem = which;
+        if (which > numitems) {
+            m_currentItem = numitems;
+        }
 
-		if (m_currentItem <= 0) {
-			m_currentItem = 1;
-		}
+        if (m_currentItem <= 0) {
+            m_currentItem = 1;
+        }
 
-		if (previous != m_currentItem) {
-			Event ev(EV_UIListBase_ItemSelected);
-			ev.AddInteger(m_currentItem);
-			SendSignal(ev);
-		}
-	}
+        if (previous != m_currentItem) {
+            Event ev(EV_UIListBase_ItemSelected);
+            ev.AddInteger(m_currentItem);
+            SendSignal(ev);
+        }
+    }
 
-	if (m_vertscroll)
-	{
-		if (m_currentItem < m_vertscroll->getTopItem() + 1) {
-			if (m_currentItem - 1 >= 0) {
-				m_vertscroll->setTopItem(m_currentItem - 1);
-			} else {
-				m_vertscroll->setTopItem(0);
-			}
-		}
+    if (m_vertscroll) {
+        if (m_currentItem < m_vertscroll->getTopItem() + 1) {
+            if (m_currentItem - 1 >= 0) {
+                m_vertscroll->setTopItem(m_currentItem - 1);
+            } else {
+                m_vertscroll->setTopItem(0);
+            }
+        }
 
-		if (m_currentItem >= m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() + 1) {
-			if (m_currentItem - m_vertscroll->getPageHeight() >= 0) {
+        if (m_currentItem >= m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() + 1) {
+            if (m_currentItem - m_vertscroll->getPageHeight() >= 0) {
                 m_vertscroll->setTopItem(m_currentItem - m_vertscroll->getPageHeight());
-			} else {
-				m_vertscroll->setTopItem(0);
-			}
-		}
-	}
+            } else {
+                m_vertscroll->setTopItem(0);
+            }
+        }
+    }
 }
 
-qboolean UIListBase::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+qboolean UIListBase::KeyEvent(int key, unsigned int time)
 {
-	int offsetitem;
-	qboolean key_rec;
-	int itemindex;
+    int      offsetitem;
+    qboolean key_rec;
+    int      itemindex;
 
-	offsetitem = 0;
-	key_rec = qfalse;
+    offsetitem = 0;
+    key_rec    = qfalse;
 
-	switch (key)
-	{
-	case K_UPARROW:
-	case K_LEFTARROW:
+    switch (key) {
+    case K_UPARROW:
+    case K_LEFTARROW:
         offsetitem = -1;
-        key_rec = qtrue;
-		break;
-	case K_DOWNARROW:
-	case K_RIGHTARROW:
+        key_rec    = qtrue;
+        break;
+    case K_DOWNARROW:
+    case K_RIGHTARROW:
         offsetitem = 1;
-        key_rec = qtrue;
-		break;
-	case K_PGDN:
-		if (GetScrollBar())
-		{
-			itemindex = GetScrollBar()->getTopItem() + GetScrollBar()->getPageHeight();
-			if (getCurrentItem() == itemindex) {
+        key_rec    = qtrue;
+        break;
+    case K_PGDN:
+        if (GetScrollBar()) {
+            itemindex = GetScrollBar()->getTopItem() + GetScrollBar()->getPageHeight();
+            if (getCurrentItem() == itemindex) {
                 offsetitem = GetScrollBar()->getPageHeight();
-			} else {
-				TrySelectItem(itemindex);
-			}
+            } else {
+                TrySelectItem(itemindex);
+            }
         }
         key_rec = qtrue;
-		break;
-	case K_PGUP:
-		if (GetScrollBar())
-		{
-			if (getCurrentItem() - 1 == GetScrollBar()->getTopItem()) {
-				offsetitem = -GetScrollBar()->getPageHeight();
-			} else {
-				TrySelectItem(GetScrollBar()->getTopItem() + 1);
-			}
+        break;
+    case K_PGUP:
+        if (GetScrollBar()) {
+            if (getCurrentItem() - 1 == GetScrollBar()->getTopItem()) {
+                offsetitem = -GetScrollBar()->getPageHeight();
+            } else {
+                TrySelectItem(GetScrollBar()->getTopItem() + 1);
+            }
         }
         key_rec = qtrue;
-		break;
-	case K_HOME:
-		TrySelectItem(1);
-		key_rec = qtrue;
-		break;
-	case K_END:
-		TrySelectItem(getNumItems());
-		key_rec = qtrue;
-		break;
-	case K_MWHEELDOWN:
-		if (GetScrollBar()) {
-			GetScrollBar()->AttemptScrollTo(GetScrollBar()->getTopItem() + 2);
+        break;
+    case K_HOME:
+        TrySelectItem(1);
+        key_rec = qtrue;
+        break;
+    case K_END:
+        TrySelectItem(getNumItems());
+        key_rec = qtrue;
+        break;
+    case K_MWHEELDOWN:
+        if (GetScrollBar()) {
+            GetScrollBar()->AttemptScrollTo(GetScrollBar()->getTopItem() + 2);
         }
         key_rec = qtrue;
         break;
@@ -158,404 +144,446 @@ qboolean UIListBase::KeyEvent
         }
         key_rec = qtrue;
         break;
-	default:
-		break;
-	}
+    default:
+        break;
+    }
 
-	if (offsetitem) {
-		TrySelectItem(getCurrentItem() + offsetitem);
-	}
+    if (offsetitem) {
+        TrySelectItem(getCurrentItem() + offsetitem);
+    }
 
-	return key_rec;
+    return key_rec;
 }
 
-void UIListBase::FrameInitialized
-	(
-	void
-	)
-
+void UIListBase::FrameInitialized(void)
 {
-	if (m_vertscroll) {
-		delete m_vertscroll;
-	}
+    if (m_vertscroll) {
+        delete m_vertscroll;
+    }
 
-	m_vertscroll = new UIVertScroll();
-	m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
-	m_vertscroll->setTopItem(0);
+    m_vertscroll = new UIVertScroll();
+    m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
+    m_vertscroll->setTopItem(0);
 }
 
-int UIListBase::getCurrentItem
-	(
-	void
-	)
-
+int UIListBase::getCurrentItem(void)
 {
-	return m_currentItem;
+    return m_currentItem;
 }
 
-int UIListBase::getNumItems
-	(
-	void
-	)
-
+int UIListBase::getNumItems(void)
 {
-	return -1;
+    return -1;
 }
 
-void  UIListBase::DeleteAllItems
-	(
-	void
-	)
+void UIListBase::DeleteAllItems(void) {}
 
+void UIListBase::DeleteItem(int which) {}
+
+UIVertScroll *UIListBase::GetScrollBar(void)
 {
+    return m_vertscroll;
 }
 
-void UIListBase::DeleteItem
-	(
-	int which
-	)
-
+void UIListBase::SetUseScrollBar(qboolean bUse)
 {
-}
+    m_bUseVertScroll = bUse;
 
-UIVertScroll *UIListBase::GetScrollBar
-	(
-	void
-	)
+    if (bUse) {
+        if (!m_vertscroll) {
+            m_vertscroll = new UIVertScroll();
+        }
 
-{
-	return m_vertscroll;
-}
-
-void UIListBase::SetUseScrollBar
-	(
-	qboolean bUse
-	)
-
-{
-	m_bUseVertScroll = bUse;
-
-	if (bUse)
-	{
-		if (!m_vertscroll) {
-			m_vertscroll = new UIVertScroll();
-		}
-
-		m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
-	}
-	else
-	{
-		if (m_vertscroll) {
-			delete m_vertscroll;
-			m_vertscroll = NULL;
-		}
-	}
+        m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
+    } else {
+        if (m_vertscroll) {
+            delete m_vertscroll;
+            m_vertscroll = NULL;
+        }
+    }
 }
 
 ListItem::ListItem()
 {
-	index = -1;
+    index = -1;
 }
 
-ListItem::ListItem
-	(
-	str string,
-	int index,
-	str command
-	)
-
+ListItem::ListItem(str string, int index, str command)
 {
-	this->string = string;
-	this->index = index;
-	this->command = command;
+    this->string  = string;
+    this->index   = index;
+    this->command = command;
 }
 
 Event EV_UIListBase_ItemSelected
 (
-	"listbase_item_selected",
-	EV_DEFAULT,
-	"i",
-	"index",
-	"Signaled when an item is selected"
+    "listbase_item_selected",
+    EV_DEFAULT,
+    "i",
+    "index",
+    "Signaled when an item is selected"
 );
-
 Event EV_UIListBase_ItemDoubleClicked
 (
-	"listbase_item_doubleclicked",
-	EV_DEFAULT,
-	"i",
-	"index",
-	"Signaled when an item is double clicked"
-);
+    "listbase_item_doubleclicked",
+    EV_DEFAULT,
+    "i",
+    "index",
+    "Signaled when an item is double clicked"
 
+);
 Event EV_Layout_AddListItem
 (
-	"additem",
-	EV_DEFAULT,
-	"sS",
-	"itemname command",
-	"Add an item to the list"
+    "additem",
+    EV_DEFAULT,
+    "sS",
+    "itemname command",
+    "Add an item to the list"
 );
-
 Event EV_Layout_AddConfigstringListItem
 (
-	"addconfigstringitem",
-	EV_DEFAULT,
-	"iS",
-	"index command",
-	"Add an item to the list that uses a configstring"
-);
+    "addconfigstringitem",
+    EV_DEFAULT,
+    "iS",
+    "index command",
+    "Add an item to the list that uses a configstring"
 
+);
 Event EV_UIListBox_DeleteAllItems
 (
-	"deleteallitems",
-	EV_DEFAULT,
-	NULL,
-	NULL,
-	"Delete all the items from the widget"
+    "deleteallitems",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Delete all the items from the widget"
 );
 
-CLASS_DECLARATION( UIListBase, UIListBox, NULL )
-{
-	{ &W_LeftMouseDown,							&UIListBox::MousePressed },
-	{ &W_LeftMouseUp,							&UIListBox::MouseReleased },
-	{ &EV_Layout_AddListItem,					&UIListBox::LayoutAddListItem },
-	{ &EV_Layout_AddConfigstringListItem,		&UIListBox::LayoutAddConfigstringListItem },
-	{ &EV_UIListBox_DeleteAllItems,				&UIListBox::DeleteAllItems },
-	{ &EV_Layout_Font,							&UIListBox::SetListFont },
-	{ NULL, NULL }
+CLASS_DECLARATION(UIListBase, UIListBox, NULL) {
+    {&W_LeftMouseDown,                   &UIListBox::MousePressed                 },
+    {&W_LeftMouseUp,                     &UIListBox::MouseReleased                },
+    {&EV_Layout_AddListItem,             &UIListBox::LayoutAddListItem            },
+    {&EV_Layout_AddConfigstringListItem, &UIListBox::LayoutAddConfigstringListItem},
+    {&EV_UIListBox_DeleteAllItems,       &UIListBox::DeleteAllItems               },
+    {&EV_Layout_Font,                    &UIListBox::SetListFont                  },
+    {NULL,                               NULL                                     }
 };
 
 UIListBox::UIListBox()
 {
-	m_clickState.point.x = 0.0;
-	m_clickState.point.y = 0.0;
+    m_clickState.point.x = 0.0;
+    m_clickState.point.y = 0.0;
 }
 
-void UIListBox::Draw
-	(
-	void
-	)
-
+void UIListBox::Draw(void)
 {
-	// FIXME: stub
+    float       aty;
+    int         i;
+    const char *str;
+    //UColor      selectedBG(0, 1, 1, 1);
+    //UColor      selectedColor  = UBlack;
+    //UColor      selectedBorder = UWhite;
+    // Changed in 2.0
+    UColor      selectedBG(0.2, 0.18, 0.015);
+    UColor      selectedColor(0.9, 0.8, 0.6);
+    UColor      selectedBorder(0.315, 0.27, 0.0225);
+
+    aty = 0;
+
+    if (m_vertscroll) {
+        i = m_vertscroll->getTopItem() + 1;
+    } else {
+        i = 1;
+    }
+
+    while (1) {
+        ListItem *li;
+
+        if (aty >= m_frame.size.height || i > m_itemlist.NumObjects()) {
+            break;
+        }
+
+        if (i == m_currentItem) {
+            DrawBox(
+                0,
+                aty * m_vVirtualScale[1],
+                m_frame.size.width - m_vVirtualScale[0] * 16,
+                m_font->getHeight(getVirtualScale()),
+                selectedBG,
+                1.f
+            );
+            m_font->setColor(selectedColor);
+        } else {
+            m_font->setColor(m_foreground_color);
+        }
+
+        li = m_itemlist.ObjectAt(i);
+        if (li->index > 0) {
+            str = Sys_LV_CL_ConvertString(uii.GetConfigstring(li->index));
+        } else {
+            str = li->string;
+        }
+        m_font->Print(m_indent, aty, str, -1, m_bVirtual ? m_vVirtualScale : NULL);
+
+        if (i == m_currentItem) {
+            DrawBoxWithSolidBorder(
+                UIRect2D(
+                    0,
+                    aty * m_vVirtualScale[1],
+                    m_frame.size.width - m_vVirtualScale[0] * 16,
+                    m_font->getHeight(getVirtualScale())
+                ),
+                UWhite,
+                selectedBorder,
+                1,
+                2,
+                0.5f
+            );
+        }
+
+        aty += m_font->getHeight(getHighResScale());
+        i++;
+    }
 }
 
-void UIListBox::MousePressed
-	(
-	Event *ev
-	)
-
+void UIListBox::MousePressed(Event *ev)
 {
-	// FIXME: stub
+    UIPoint2D p;
+
+    p.x = ev->GetFloat(1) - m_screenframe.pos.x;
+    p.y = ev->GetFloat(2) - m_screenframe.pos.y;
+
+    if (m_vertscroll) {
+        TrySelectItem((m_vertscroll->getTopItem() + 1) + p.y / m_font->getHeight(getVirtualScale()));
+    } else {
+        TrySelectItem(p.y / m_font->getHeight(getVirtualScale()) + 1);
+    }
+
+    if (m_clickState.time + 500 > uid.time && m_currentItem == m_clickState.selected) {
+        UIPoint2D p2;
+
+        p2.x = m_clickState.point.x - p.x;
+        if (fabs(p2.x <= 2)) {
+            p2.y = m_clickState.point.y - p.y;
+            if (fabs(p2.y) <= 2.f) {
+                Event event(EV_UIListBase_ItemDoubleClicked);
+                event.AddInteger(m_currentItem);
+                SendSignal(event);
+
+                ListItem *li = m_itemlist.ObjectAt(m_currentItem);
+
+                if (!m_currentItem || !li) {
+                    return;
+                }
+
+                if (m_commandhandler) {
+                    (*m_commandhandler)(li->string, NULL);
+                }
+
+                if (li->command.length()) {
+                    uii.Cmd_Stuff(va("%s \"%s\"\n", li->command.c_str(), li->string.c_str()));
+                } else {
+                    uii.Cmd_Stuff(va("%s \"%s\"\n", m_command.c_str(), li->string.c_str()));
+                }
+                m_clickState.time = 0;
+                return;
+            }
+        }
+    }
+
+    m_clickState.time     = uid.time;
+    m_clickState.selected = m_currentItem;
+    m_clickState.point    = p;
 }
 
-void UIListBox::MouseReleased
-	(
-	Event *ev
-	)
+void UIListBox::MouseReleased(Event *ev) {}
 
+void UIListBox::DeleteAllItems(Event *ev)
 {
+    m_itemlist.ClearObjectList();
+    m_currentItem = 0;
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(0);
+        m_vertscroll->setTopItem(0);
+    }
 }
 
-void UIListBox::DeleteAllItems
-	(
-	Event *ev
-	)
-
+void UIListBox::SetListFont(Event *ev)
 {
-	m_itemlist.ClearObjectList();
-	m_currentItem = 0;
+    LayoutFont(ev);
 
-	if (m_vertscroll)
-	{
-		m_vertscroll->setNumItems(0);
-		m_vertscroll->setTopItem(0);
-	}
+    if (m_vertscroll) {
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
+    }
+
+    FrameInitialized();
 }
 
-void UIListBox::SetListFont
-	(
-	Event *ev
-	)
-
+void UIListBox::TrySelectItem(int which)
 {
-	LayoutFont(ev);
+    UIListBase::TrySelectItem(which);
 
-	if (m_vertscroll) {
-		m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
-	}
+    if (!getNumItems()) {
+        return;
+    }
 
-	FrameInitialized();
+    if (m_cvarname.length()) {
+        uii.Cvar_Set(m_cvarname.c_str(), m_itemlist.ObjectAt(m_currentItem)->string.c_str());
+    }
 }
 
-void UIListBox::TrySelectItem
-	(
-	int which
-	)
-
+void UIListBox::AddItem(const char *item, const char *command)
 {
-	UIListBase::TrySelectItem(which);
+    ListItem *li;
 
-	if (!getNumItems()) {
-		return;
-	}
+    li = new ListItem();
+    if (!li) {
+        uii.Sys_Error(ERR_DROP, "Couldn't create list item\n");
+    }
 
-	if (m_cvarname.length())
-	{
-		uii.Cvar_Set(m_cvarname.c_str(), m_itemlist.ObjectAt(m_currentItem)->string.c_str());
-	}
+    li->string = item;
+    if (command) {
+        li->command = command;
+    }
+
+    m_itemlist.AddObject(li);
+
+    if (!m_currentItem) {
+        m_currentItem = 1;
+    }
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(m_itemlist.NumObjects());
+    }
 }
 
-void UIListBox::AddItem
-	(
-	const char *item,
-	const char *command
-	)
-
+void UIListBox::AddItem(int index, const char *command)
 {
-	ListItem* li;
+    ListItem *li;
 
-	li = new ListItem();
-	if (!li) {
-		uii.Sys_Error(ERR_DROP, "Couldn't create list item\n");
-	}
+    li = new ListItem();
+    if (!li) {
+        uii.Sys_Error(ERR_DROP, "Couldn't create list item\n");
+    }
 
-	li->string = item;
-	if (command) {
-		li->command = command;
-	}
+    li->index = index;
+    if (command) {
+        li->command = command;
+    }
 
-	m_itemlist.AddObject(li);
+    m_itemlist.AddObject(li);
 
-	if (!m_currentItem) {
-		m_currentItem = 1;
-	}
+    if (!m_currentItem) {
+        m_currentItem = 1;
+    }
 
-	if (m_vertscroll) {
-		m_vertscroll->setNumItems(m_itemlist.NumObjects());
-	}
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(m_itemlist.NumObjects());
+    }
 }
 
-void UIListBox::AddItem
-	(
-	int index,
-	const char *command
-	)
-
+void UIListBox::FrameInitialized(void)
 {
-	ListItem* li;
+    UIListBase::FrameInitialized();
 
-	li = new ListItem();
-	if (!li) {
-		uii.Sys_Error(ERR_DROP, "Couldn't create list item\n");
-	}
-
-	li->index = index;
-	if (command) {
-		li->command = command;
-	}
-
-	m_itemlist.AddObject(li);
-
-	if (!m_currentItem) {
-		m_currentItem = 1;
-	}
-
-	if (m_vertscroll) {
-		m_vertscroll->setNumItems(m_itemlist.NumObjects());
-	}
+    if (m_vertscroll) {
+        m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
+        m_vertscroll->setNumItems(m_itemlist.NumObjects());
+    }
 }
 
-void UIListBox::FrameInitialized
-	(
-	void
-	)
-
+void UIListBox::LayoutAddListItem(Event *ev)
 {
-	UIListBase::FrameInitialized();
+    if (ev->NumArgs() != 2) {
+        AddItem(ev->GetString(1), NULL);
+        return;
+    }
 
-	if (m_vertscroll) {
-		m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(m_bVirtual));
-		m_vertscroll->setNumItems(m_itemlist.NumObjects());
-	}
+    AddItem(ev->GetString(1), ev->GetString(2).c_str());
 }
 
-void UIListBox::LayoutAddListItem
-	(
-	Event *ev
-	)
-
+void UIListBox::LayoutAddConfigstringListItem(Event *ev)
 {
-	if (ev->NumArgs() != 2) {
-		AddItem(ev->GetString(1), NULL);
-		return;
-	}
+    if (ev->NumArgs() != 2) {
+        AddItem(ev->GetInteger(1), NULL);
+        return;
+    }
 
-	AddItem(ev->GetString(1), ev->GetString(2).c_str());
+    AddItem(ev->GetInteger(1), ev->GetString(2).c_str());
 }
 
-void UIListBox::LayoutAddConfigstringListItem
-	(
-	Event *ev
-	)
-
+str UIListBox::getItemText(int which)
 {
-	if (ev->NumArgs() != 2) {
-		AddItem(ev->GetInteger(1), NULL);
-		return;
-	}
-
-	AddItem(ev->GetInteger(1), ev->GetString(2).c_str());
+    return m_itemlist.ObjectAt(which)->string;
 }
 
-str UIListBox::getItemText
-	(
-	int which
-	)
-
+int UIListBox::getNumItems(void)
 {
-	return m_itemlist.ObjectAt(which)->string;
+    return m_itemlist.NumObjects();
 }
 
-int UIListBox::getNumItems
-	(
-	void
-	)
-
+void UIListBox::DeleteAllItems(void)
 {
-	return m_itemlist.NumObjects();
+    m_itemlist.ClearObjectList();
+    m_currentItem = 0;
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(0);
+        m_vertscroll->setTopItem(0);
+    }
 }
 
-void UIListBox::DeleteAllItems
-	(
-	void
-	)
-
+void UIListBox::DeleteItem(int which)
 {
-	m_itemlist.ClearObjectList();
-	m_currentItem = 0;
+    m_itemlist.RemoveObjectAt(which);
 
-	if (m_vertscroll)
-	{
-		m_vertscroll->setNumItems(0);
-		m_vertscroll->setTopItem(0);
-	}
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(m_itemlist.NumObjects());
+    }
+
+    if (m_currentItem > getNumItems()) {
+        TrySelectItem(getNumItems());
+    }
 }
 
-void UIListBox::DeleteItem
-	(
-	int which
-	)
-
+void UIListBox::InsertItem(const char *string, int which, const char *command)
 {
-	m_itemlist.RemoveObjectAt(which);
+    ListItem *item;
+    int       i;
 
-	if (m_vertscroll) {
-		m_vertscroll->setNumItems(m_itemlist.NumObjects());
-	}
+    item = new ListItem();
+    if (!item) {
+        Com_Error(ERR_DROP, "Couldn't create list item\n");
+    }
 
-	if (m_currentItem > getNumItems()) {
-		TrySelectItem(getNumItems());
-	}
+    item->string = string;
+    if (command) {
+        item->command = command;
+    }
+
+    if (which >= 1 && which <= m_itemlist.NumObjects()) {
+        m_itemlist.AddObject({});
+        for (i = m_itemlist.NumObjects(); i > which; i--) {
+            m_itemlist.SetObjectAt(i, m_itemlist.ObjectAt(i - 1));
+        }
+
+        m_itemlist.SetObjectAt(which, item);
+    } else {
+        m_itemlist.AddObject(item);
+    }
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(m_itemlist.NumObjects());
+    }
+}
+
+void UIListBox::setCurrentItem(int which)
+{
+    if (which < 1) {
+        m_currentItem = 0;
+    } else if (which > m_itemlist.NumObjects()) {
+        m_currentItem = m_itemlist.NumObjects();
+    } else {
+        m_currentItem = which;
+    }
 }
diff --git a/code/uilib/uilistbox.h b/code/uilib/uilistbox.h
index d5b7668c..d0b0b19f 100644
--- a/code/uilib/uilistbox.h
+++ b/code/uilib/uilistbox.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -26,71 +26,79 @@ extern Event EV_Layout_AddListItem;
 extern Event EV_UIListBase_ItemDoubleClicked;
 extern Event EV_UIListBase_ItemSelected;
 
-class UIListBase : public UIWidget {
+class UIListBase : public UIWidget
+{
 protected:
-	int m_currentItem;
-	class UIVertScroll *m_vertscroll;
-	qboolean m_bUseVertScroll;
-public:
-	CLASS_PROTOTYPE( UIListBase );
-
-protected:
-	virtual void		TrySelectItem( int which );
-	qboolean			KeyEvent( int key, unsigned int time ) override;
+    int                 m_currentItem;
+    class UIVertScroll *m_vertscroll;
+    qboolean            m_bUseVertScroll;
 
 public:
-	UIListBase();
+    CLASS_PROTOTYPE(UIListBase);
 
-	void			FrameInitialized( void ) override;
-	int				getCurrentItem( void );
-	virtual int		getNumItems( void );
-	virtual void	DeleteAllItems( void );
-	virtual void	DeleteItem( int which );
-	UIVertScroll	*GetScrollBar( void );
-	void			SetUseScrollBar( qboolean bUse );
+protected:
+    virtual void TrySelectItem(int which);
+    qboolean     KeyEvent(int key, unsigned int time) override;
+
+public:
+    UIListBase();
+
+    void          FrameInitialized(void) override;
+    int           getCurrentItem(void);
+    virtual int   getNumItems(void);
+    virtual void  DeleteAllItems(void);
+    virtual void  DeleteItem(int which);
+    UIVertScroll *GetScrollBar(void);
+    void          SetUseScrollBar(qboolean bUse);
 };
 typedef class UIListBase UIListBase;
-class ListItem : public Class {
+
+class ListItem : public Class
+{
 public:
-	str string;
-	str command;
-	int index;
+    str string;
+    str command;
+    int index;
 
 public:
-	ListItem();
-	ListItem( str string, int index, str command );
+    ListItem();
+    ListItem(str string, int index, str command);
 };
 
-class UIListBox : public UIListBase {
+class UIListBox : public UIListBase
+{
 protected:
-	Container<ListItem *> m_itemlist;
-	struct {
-		int time;
-		int selected;
-		UIPoint2D point;
-	} m_clickState;
+    Container<ListItem *> m_itemlist;
+
+    struct {
+        int       time;
+        int       selected;
+        UIPoint2D point;
+    } m_clickState;
 
 public:
-	CLASS_PROTOTYPE( UIListBox );
+    CLASS_PROTOTYPE(UIListBox);
 
 protected:
-	void			Draw( void ) override;
-	void			MousePressed( Event *ev );
-	void			MouseReleased( Event *ev );
-	void			DeleteAllItems( Event *ev );
-	void			SetListFont( Event *ev );
-	void			TrySelectItem( int which ) override;
+    void Draw(void) override;
+    void MousePressed(Event *ev);
+    void MouseReleased(Event *ev);
+    void DeleteAllItems(Event *ev);
+    void SetListFont(Event *ev);
+    void TrySelectItem(int which) override;
 
 public:
-	UIListBox();
+    UIListBox();
 
-	void			AddItem( const char *item, const char *command );
-	void			AddItem( int index, const char *command );
-	void			FrameInitialized( void ) override;
-	void			LayoutAddListItem( Event *ev );
-	void			LayoutAddConfigstringListItem( Event *ev );
-	str				getItemText( int which );
-	int				getNumItems( void ) override;
-	void			DeleteAllItems( void ) override;
-	void			DeleteItem( int which ) override;
+    void AddItem(const char *item, const char *command);
+    void AddItem(int index, const char *command);
+    void FrameInitialized(void) override;
+    void LayoutAddListItem(Event *ev);
+    void LayoutAddConfigstringListItem(Event *ev);
+    str  getItemText(int which);
+    int  getNumItems(void) override;
+    void DeleteAllItems(void) override;
+    void DeleteItem(int which) override;
+    void InsertItem(const char *string, int which, const char *command = NULL);
+    void setCurrentItem(int which);
 };
diff --git a/code/uilib/uilistctrl.cpp b/code/uilib/uilistctrl.cpp
index 45fe12a4..fd470fce 100644
--- a/code/uilib/uilistctrl.cpp
+++ b/code/uilib/uilistctrl.cpp
@@ -155,14 +155,14 @@ int UIListCtrl::getHeaderHeight
 	}
 
 	if (m_headerfont) {
-		return (int)(m_headerfont->getHeight(m_bVirtual) + (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+		return (int)(m_headerfont->getHeight(getVirtualScale()) + (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 	}
 
 	if (m_font) {
-		return (int)(m_font->getHeight(m_bVirtual) + (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+		return (int)(m_font->getHeight(getVirtualScale()) + (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 	}
 
-	return (int)((s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1]);
+	return (int)((s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1]);
 }
 
 void UIListCtrl::MousePressed
@@ -208,16 +208,16 @@ void UIListCtrl::MousePressed
 			m_sizestate.column = closesep;
 			m_sizestate.min = closeatleft - m_columnlist.ObjectAt(closesep).width;
 			uWinMan.setFirstResponder(this);
-		} else {
+		} else if (insep) {
 			SortByColumn(m_columnlist.ObjectAt(insep).name);
 		}
 	}
 	else
 	{
 		if (m_vertscroll) {
-			TrySelectItem((m_vertscroll->getTopItem() + 1) + (p.y - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+			TrySelectItem((m_vertscroll->getTopItem() + 1) + (p.y - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 		} else {
-			TrySelectItem(1.0 + (p.y - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+			TrySelectItem(1.0 + (p.y - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 		}
 
 		if (m_clickState.time + 500 > uid.time
@@ -298,7 +298,7 @@ void UIListCtrl::OnSizeChanged
 	}
 
 	m_vertscroll->InitFrame(this, m_frame.size.width - 16.0, 0.0, 16.0, m_frame.size.height, -1);
-	m_vertscroll->setPageHeight((m_frame.size.height - getHeaderHeight()) / m_font->getHeight(m_bVirtual));
+	m_vertscroll->setPageHeight((m_frame.size.height - getHeaderHeight()) / m_font->getHeight(getVirtualScale()));
 	m_vertscroll->setNumItems(m_itemlist.NumObjects());
 }
 
@@ -321,7 +321,7 @@ void UIListCtrl::DrawColumns
 	pFont = m_headerfont;
 	if (!pFont) pFont = m_font;
 
-	height = (s_columnpadding.height + s_columnpadding.height) * m_vVirtualScale[1] + pFont->getHeight(m_bVirtual);
+	height = (s_columnpadding.height + s_columnpadding.height) * getVirtualScale()[1] + pFont->getHeight(getVirtualScale());
 	pFont->setColor(textColor);
 
 	for (i = 1; i <= m_columnlist.NumObjects(); i++)
@@ -329,7 +329,7 @@ void UIListCtrl::DrawColumns
 		const columndef_t& column = m_columnlist.ObjectAt(i);
 
 		DrawBoxWithSolidBorder(
-			UIRect2D(atleft, 0, column.width + m_vVirtualScale[1], height),
+			UIRect2D(atleft, 0, column.width + getVirtualScale()[1], height),
 			columnColor,
 			textColor,
 			1,
@@ -338,11 +338,11 @@ void UIListCtrl::DrawColumns
 		);
 
 		pFont->Print(
-			atleft / m_vVirtualScale[0] + s_columnpadding.width,
+			atleft / getVirtualScale()[0] + s_columnpadding.width,
 			s_columnpadding.height,
 			Sys_LV_CL_ConvertString(column.title.c_str()),
 			-1,
-			m_bVirtual
+			getVirtualScale()
 		);
 
 		atleft += column.width;
@@ -374,14 +374,14 @@ void UIListCtrl::DrawContent
 	UColor selColor, selText;
 	UColor backColor, textColor;
 
-	height = m_font->getHeight(m_bVirtual);
+	height = m_font->getHeight(getVirtualScale());
 	selColor = UColor(0.21f, 0.18f, 0.015f, 1.0f);
 	selText = UColor(0.9f, 0.8f, 0.6f, 1.0f);
 	backColor = m_background_color;
 	textColor = m_foreground_color;
 
 	if (m_headerfont) {
-		headerheight = m_headerfont->getHeight(m_bVirtual);
+		headerheight = m_headerfont->getHeight(getVirtualScale());
 	} else {
 		headerheight = 0;
 	}
@@ -439,11 +439,11 @@ void UIListCtrl::DrawContent
 			case TYPE_STRING:
 				DrawBox(drawRect, *itemBg, m_local_alpha);
 				pFont->Print(
-					drawRect.pos.x / m_vVirtualScale[0] + 1.0,
-					drawRect.pos.y / m_vVirtualScale[1],
+					drawRect.pos.x / getVirtualScale()[0] + 1.0,
+					drawRect.pos.y / getVirtualScale()[1],
 					Sys_LV_CL_ConvertString(theitem->getListItemString(column.name)),
 					-1,
-					m_bVirtual
+					getVirtualScale()
 				);
 				break;
 			case TYPE_OWNERDRAW:
@@ -644,7 +644,7 @@ void UIListCtrl::SortByColumn
 	for (i = 1; i <= m_columnlist.NumObjects(); i++) {
 		columndef_t& def = m_columnlist.ObjectAt(i);
 
-		if (def.name == i) {
+		if (def.name == column) {
 			numeric = def.numeric;
 			reverse = def.reverse_sort;
 			exists = true;
diff --git a/code/uilib/uilistctrl.h b/code/uilib/uilistctrl.h
index 6db528e8..77ffd9d1 100644
--- a/code/uilib/uilistctrl.h
+++ b/code/uilib/uilistctrl.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UILISTCTRL_H__
-#define __UILISTCTRL_H__
+#pragma once
 
 typedef enum { TYPE_STRING, TYPE_OWNERDRAW } griditemtype_t;
 
@@ -105,5 +104,3 @@ public:
 	void				setCompareFunction( int( *func ) ( const UIListCtrlItem *i1, const UIListCtrlItem *i2, int columnname ) );
 	void				setHeaderFont( const char *name );
 };
-
-#endif
diff --git a/code/uilib/uimenu.cpp b/code/uilib/uimenu.cpp
index b7cde182..64f6cf71 100644
--- a/code/uilib/uimenu.cpp
+++ b/code/uilib/uimenu.cpp
@@ -157,8 +157,8 @@ void Menu::ShowMenu
 		{
 			wid->setShow( true );
 			wid->ResetMotion( MOTION_IN );
-			wid->UpdateData();
 			wid->UpdateUIElement();
+			wid->UpdateData();
 			wid->ExecuteShowCommands();
 		}
 	}
@@ -291,7 +291,7 @@ UIWidget *Menu::GetNamedWidget
 		}
 	}
 
-	return pWidget;
+	return NULL;
 }
 
 void Menu::Update
@@ -456,7 +456,7 @@ void Menu::RestoreCVars
 
 		if( wid->m_cvarname.length() )
 		{
-			uii.Cvar_Set( wid->m_cvarvalue, "" );
+			uii.Cvar_Set( wid->m_cvarname, wid->m_cvarvalue );
 		}
 	}
 }
@@ -639,6 +639,14 @@ void MenuManager::DeleteAllMenus
 		Menu *menu = m_menulist.ObjectAt( i );
 		delete menu;
 	}
+
+	//
+	// Added in OPM
+	//  Make sure to clear the menu list and stack
+	m_menulist.FreeObjectList();
+
+	m_menustack.Clear();
+	m_showmenustack.Clear();
 }
 
 Menu *MenuManager::FindMenu
@@ -697,7 +705,7 @@ bool MenuManager::PushMenu
 
 	if( head )
 	{
-		maxouttime = m->GetMaxMotionTime();
+		maxouttime = head->GetMaxMotionTime();
 		head->ProcessEvent( Event( "hidemenu" ) );
 	}
 
diff --git a/code/uilib/uimenu.h b/code/uilib/uimenu.h
index 43333e09..99dedeb3 100644
--- a/code/uilib/uimenu.h
+++ b/code/uilib/uimenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIMENU_H__
-#define __UIMENU_H__
+#pragma once
 
 #include "../qcommon/listener.h"
 #include "../qcommon/stack.h"
@@ -108,6 +107,3 @@ extern Event EV_LockMenus;
 extern Event EV_UnlockMenus;
 extern Event EV_ShowMenu;
 extern Event EV_HideMenu;
-
-#endif
-
diff --git a/code/uilib/uimessage.cpp b/code/uilib/uimessage.cpp
new file mode 100644
index 00000000..d2cdddee
--- /dev/null
+++ b/code/uilib/uimessage.cpp
@@ -0,0 +1,112 @@
+/*
+===========================================================================
+Copyright (C) 2015 the OpenMoHAA team
+
+This file is part of OpenMoHAA source code.
+
+OpenMoHAA source code is free software; you can redistribute it
+and/or modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of the License,
+or (at your option) any later version.
+
+OpenMoHAA source code is distributed in the hope that it will be
+useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with OpenMoHAA source code; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+===========================================================================
+*/
+
+#include "uimessage.h"
+
+CLASS_DECLARATION(UIFloatingWindow, UIMessageDialog, NULL) {
+    {&W_Deactivated, &UIFloatingWindow::ClosePressed},
+    {NULL,           NULL                           }
+};
+
+UIMessageDialog::UIMessageDialog()
+    : m_label(NULL)
+    , m_ok(NULL)
+{}
+
+UIMessageDialog::~UIMessageDialog()
+{
+    if (m_label) {
+        delete m_label;
+    }
+
+    if (m_ok) {
+        delete m_ok;
+    }
+}
+
+void UIMessageDialog::FrameInitialized(void)
+{
+    UIFloatingWindow::FrameInitialized();
+
+    m_label = new UILabel();
+
+    m_label->InitFrame(getChildSpace(), getChildSpace()->getClientFrame(), 0);
+    m_label->setForegroundColor(UHudColor);
+
+    m_ok = new UIButton();
+    m_ok->InitFrame(getChildSpace(), UIRect2D(100, 150, 100, 30), 0);
+    m_ok->setTitle("OK");
+    m_ok->setBackgroundColor(UColor(0.25f, 0.295f, 0.378f), false);
+    m_ok->AllowActivate(true);
+    m_ok->Connect(this, W_Button_Pressed, W_Deactivated);
+
+    m_minimizeButton->ProcessEvent(EV_Widget_Hide);
+}
+
+void UIMessageDialog::setText(const char *text)
+{
+    int maxWidth = m_label->getFont()->getWidth(text, -1);
+    int maxHeight = m_label->getFont()->getHeight(text, -1);
+
+    m_label->setTitle(text);
+
+    UIRect2D rect;
+    rect.pos.x = (uid.vidWidth - Q_max(maxWidth, 100)) / 2.0;
+    rect.pos.y = (uid.vidHeight - Q_max(maxHeight, 32)) / 2.0;
+    rect.size.width = maxWidth + 32;
+    rect.size.height = 8 + maxHeight + 16 + 24 + 32;
+
+    setFrame(rect);
+
+    const UIRect2D clientFrame = getChildSpace()->getClientFrame();
+
+    UIRect2D labelRect;
+    labelRect.pos.x = 8;
+    labelRect.pos.y = 8;
+    labelRect.size.width = maxWidth;
+    labelRect.size.height = maxHeight;
+    m_label->setFrame(labelRect);
+
+    UIRect2D buttonRect;
+    buttonRect.pos.x = (clientFrame.size.width - 64) / 2;
+    buttonRect.pos.y = labelRect.pos.y + labelRect.size.height + 16;
+    buttonRect.size.width = 64;
+    buttonRect.size.height = 24;
+    m_ok->setFrame(buttonRect);
+}
+
+void UIMessageDialog::ShowMessageBox(const char *title, const char *text)
+{
+    UIMessageDialog *dialog;
+
+    dialog = new UIMessageDialog();
+
+    dialog->Create(
+        NULL, UIRect2D(uid.vidWidth / 2, uid.vidHeight / 2, 100, 200), title, UColor(0.15f, 0.195f, 0.278f), UHudColor
+    );
+
+    dialog->setText(text);
+
+    uWinMan.ActivateControl(dialog);
+
+    dialog->Connect(dialog, W_Deactivated, W_Deactivated);
+}
diff --git a/code/renderergl2/new/tr_swipe.cpp b/code/uilib/uimessage.h
similarity index 67%
rename from code/renderergl2/new/tr_swipe.cpp
rename to code/uilib/uimessage.h
index dc6ad9f2..4b178101 100644
--- a/code/renderergl2/new/tr_swipe.cpp
+++ b/code/uilib/uimessage.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2023 the OpenMoHAA team
+Copyright (C) 2015 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,25 +20,27 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-// tr_swipe.cpp -- swipe rendering
+#pragma once
 
-#include "../tr_local.h"
+#include "cl_ui.h"
 
-void RB_DrawSwipeSurface(surfaceType_t* pswipe) {
-    // FIXME: unimplemented
-}
-
-void RE_SwipeBegin(float thistime, float life, qhandle_t shader)
+class UIMessageDialog : public UIFloatingWindow
 {
-    // FIXME: unimplemented
-}
+public:
+    CLASS_PROTOTYPE(UIMessageDialog);
 
-void RE_SwipePoint(vec3_t point1, vec3_t point2, float time)
-{
-    // FIXME: unimplemented
-}
+public:
+    UIMessageDialog();
+    ~UIMessageDialog();
 
-void RE_SwipeEnd()
-{
-    // FIXME: unimplemented
-}
+    void setText(const char *text);
+
+    static void ShowMessageBox(const char *title, const char *text);
+
+protected:
+    void FrameInitialized(void) override;
+
+private:
+    UILabel  *m_label;
+    UIButton *m_ok;
+};
diff --git a/code/uilib/uimledit.cpp b/code/uilib/uimledit.cpp
index 86eb5edc..c8fbedb7 100644
--- a/code/uilib/uimledit.cpp
+++ b/code/uilib/uimledit.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,268 +21,794 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "../qcommon/localization.h"
 
-CLASS_DECLARATION( UIWidget, UIMultiLineEdit, NULL )
-{
-	{ NULL, NULL }
+Event EV_Time_Dragged
+(
+	"_umledit_drag_timer",
+	EV_DEFAULT,
+	NULL,
+	NULL,
+	"Used to time mouse drag events"
+);
+Event EV_UIMultiLineEdit_UpdateCvarEvent
+(
+	"updatecvar",
+	EV_DEFAULT,
+	NULL,
+	NULL,
+	"Causes text box to update itself using the assigned cvar"
+);
+Event EV_UIMultiLineEdit_SetEdit
+(
+	"edit",
+	EV_DEFAULT,
+	"b",
+	"bool",
+	"Set whether or not the text is editable"
+);
+
+CLASS_DECLARATION(UIWidget, UIMultiLineEdit, NULL) {
+    {&W_LeftMouseDown,                    &UIMultiLineEdit::MouseDown      },
+    {&W_LeftMouseUp,                      &UIMultiLineEdit::MouseUp        },
+    {&W_LeftMouseDragged,                 &UIMultiLineEdit::MouseDragged   },
+    {&EV_Time_Dragged,                    &UIMultiLineEdit::DragTimer      },
+    {&W_SizeChanged,                      &UIMultiLineEdit::SizeChanged    },
+    {&EV_UIMultiLineEdit_UpdateCvarEvent, &UIMultiLineEdit::UpdateCvarEvent},
+    {&EV_UIMultiLineEdit_SetEdit,         &UIMultiLineEdit::SetEdit        },
+    {NULL,                                NULL                             }
 };
 
 UIMultiLineEdit::UIMultiLineEdit()
 {
-	// FIXME: stub
+    m_vertscroll      = NULL;
+    m_mouseState      = M_NONE;
+    m_shiftForcedDown = 0;
+    m_edit            = true;
+    Empty();
 }
 
-void UIMultiLineEdit::FrameInitialized
-	(
-	void
-	)
-
+void UIMultiLineEdit::Empty(void)
 {
-	// FIXME: stub
+    m_lines.RemoveAllItems();
+    m_lines.AddTail(str());
+
+    m_selection.begin = {};
+    m_selection.end   = {};
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(1);
+        m_vertscroll->setTopItem(0);
+    }
+
+    m_changed = false;
 }
 
-void UIMultiLineEdit::PointToSelectionPoint
-	(
-	UIPoint2D& p,
-	selectionpoint_t& sel
-	)
-
+void UIMultiLineEdit::SetEdit(Event *ev)
 {
-	// FIXME: stub
+    m_edit = ev->GetBoolean(1);
 }
 
-static str str_null = "";
-
-str& UIMultiLineEdit::LineFromLineNumber
-	(
-	int num,
-	bool resetpos
-	)
-
+void UIMultiLineEdit::setData(const char *data)
 {
-	// FIXME: stub
-	return str_null;
+    str         toadd;
+    char        s[2] {};
+    const char *p;
+
+    m_lines.RemoveAllItems();
+
+    for (p = data; *p; p++) {
+        if (*p == '\n') {
+            m_lines.AddTail(toadd);
+            toadd = "";
+        } else if (*p == '\r') {
+            continue;
+        } else {
+            s[0] = *p;
+            toadd += s;
+        }
+    }
+
+    m_lines.AddTail(toadd);
+    m_selection.begin = {};
+    m_selection.end   = {};
+
+    if (m_vertscroll) {
+        m_vertscroll->setNumItems(m_lines.getCount());
+        m_vertscroll->setTopItem(0);
+    }
+
+    m_changed = false;
 }
 
-void UIMultiLineEdit::EnsureSelectionPointVisible
-	(
-	selectionpoint_t& point
-	)
-
+void UIMultiLineEdit::getData(str& data)
 {
-	// FIXME: stub
+    int i;
+
+    data = "";
+
+    for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid(); i++, m_lines.IterateNext()) {
+        str text = m_lines.getCurrent();
+        if (i == 0 && !text.length() && m_lines.getCount() <= 1) {
+            // file is empty
+            return;
+        }
+
+        data += text;
+
+        if (i != m_lines.getCount() - 1) {
+            data += "\n";
+        }
+    }
 }
 
-void UIMultiLineEdit::BoundSelectionPoint
-	(
-	selectionpoint_t& point
-	)
-
+void UIMultiLineEdit::FrameInitialized(void)
 {
-	// FIXME: stub
+    delete m_vertscroll;
+    m_vertscroll = new UIVertScroll();
+    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getHighResScale()));
+    m_vertscroll->setTopItem(0);
+    m_vertscroll->setNumItems(m_lines.getCount());
+    m_vertscroll->InitFrameAlignRight(this, 0, 0);
+
+    Connect(this, W_SizeChanged, W_SizeChanged);
+    AllowActivate(true);
 }
 
-void UIMultiLineEdit::SortSelection
-	(
-	selectionpoint_t **topsel,
-	selectionpoint_t **botsel
-	)
-
+void UIMultiLineEdit::SizeChanged(Event *ev)
 {
-	// FIXME: stub
+    m_vertscroll->setPageHeight(m_frame.size.height / m_font->getHeight(getVirtualScale()));
+    m_vertscroll->InitFrameAlignRight(this, 0, 0);
 }
 
-void UIMultiLineEdit::UpdateCvarEvent
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::SortSelection(selectionpoint_t **topsel, selectionpoint_t **botsel)
 {
-	// FIXME: stub
+    if (m_selection.begin.line < m_selection.end.line) {
+        *topsel = &m_selection.begin;
+        *botsel = &m_selection.end;
+    } else if (m_selection.begin.line <= m_selection.end.line && m_selection.begin.column <= m_selection.end.column) {
+        *topsel = &m_selection.begin;
+        *botsel = &m_selection.end;
+    } else {
+        *topsel = &m_selection.end;
+        *botsel = &m_selection.begin;
+    }
 }
 
-void UIMultiLineEdit::SetEdit
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::UpdateCvarEvent(Event *ev)
 {
-	// FIXME: stub
+    if (m_cvarname.length()) {
+        const char *s = uii.Cvar_GetString(m_cvarname, "");
+        if (s) {
+            setData(s);
+        }
+    }
 }
 
-bool UIMultiLineEdit::IsSelectionEmpty
-	(
-	void
-	)
-
+void UIMultiLineEdit::Draw(void)
 {
-	// FIXME: stub
-	return false;
+    float             aty;
+    int               i;
+    UColor            selectionColor(UWhite);
+    UColor            selectionBG(0, 0, 0.5f, 1);
+    selectionpoint_t *topsel = NULL;
+    selectionpoint_t *botsel = NULL;
+
+    SortSelection(&topsel, &botsel);
+
+    m_lines.IterateFromHead();
+    for (i = 0; i < m_vertscroll->getTopItem(); i++) {
+        m_lines.IterateNext();
+    }
+
+    for (i = m_vertscroll->getTopItem(), aty = 0; m_lines.IsCurrentValid() && aty < m_frame.size.height;
+         m_lines.IterateNext(), i++) {
+        str& cur   = m_lines.getCurrent();
+        int  caret = 0;
+
+        if (i < topsel->line || i > botsel->line) {
+            // Print regular line without any selection or cursor present
+            m_font->setColor(m_foreground_color);
+            m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
+        } else {
+            // Current line contains cursor and/or selected text
+            float linewidth = m_font->getWidth(cur, -1);
+
+            if (i > topsel->line && i < botsel->line) {
+                // all text in current line is selected, it's part of a larger selection,
+                // print entire line with the selection highlight box around it
+                DrawBox(0.0f, aty, linewidth * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                m_font->setColor(selectionColor);
+                // Fixed in OPM:
+                // don't spam LOCALIZATION ERROR messages to console
+                // for clicking lines in the opened text document
+                //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
+            } else if (i != topsel->line) {
+                // part of this line is selected, and selection continues/began above
+                if (i == botsel->line) { // sanity check, should always be true
+                    int toplen = m_font->getWidth(cur, botsel->column); // X coord of highlighting end
+                    if (toplen) {
+                        // selection contains text from the beginning of the line,
+                        // print it with the selection highlight box around it
+                        m_font->setColor(selectionColor);
+                        DrawBox(0, aty, toplen * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                        m_font->Print(0, aty / getVirtualScale()[1], cur, botsel->column, getVirtualScale());
+                    }
+
+                    if (toplen < linewidth) { // is there still text on this line after the selection?
+                        m_font->setColor(m_foreground_color);
+                        m_font->Print(toplen, aty / getVirtualScale()[1], &cur[botsel->column], -1, getVirtualScale());
+                    }
+
+                    if (botsel == &m_selection.end) {
+                        // Place cursor at the end of the selection if it was started from above
+                        caret = toplen;
+                    }
+                }
+            } else if (i != botsel->line) {
+                // part of this line is selected, and selection continues/began below
+                int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
+                if (topsel->column) { // is there any text on this line before the selection?
+                    m_font->setColor(m_foreground_color);
+                    m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
+                }
+
+                if (toplen < linewidth) { // is there any selected text before the end of the line?
+                    // print the selected text with the selection highlight box around it
+                    m_font->setColor(selectionColor);
+                    DrawBox(toplen * getVirtualScale()[0], aty, (linewidth - toplen) * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                    m_font->Print(toplen, aty / getVirtualScale()[1], &cur[topsel->column], -1, getVirtualScale());
+                }
+
+                if (topsel == &m_selection.end) {
+                    // Place cursor before the highlight box if selection was made from the bottom up
+                    caret = toplen;
+                }
+            } else {
+                // current line contains the cursor
+                if (topsel->column == botsel->column) {
+                    // no selection or highlighted text
+                    caret = m_font->getWidth(cur, topsel->column);
+                    m_font->setColor(m_foreground_color);
+                    // Fixed in OPM:
+                    // don't spam LOCALIZATION ERROR messages to console
+                    // for clicking lines in the opened text document
+                    //m_font->Print(0, aty, Sys_LV_CL_ConvertString(cur), -1, m_bVirtual);
+                    m_font->Print(0, aty / getVirtualScale()[1], cur, -1, getVirtualScale());
+                } else {
+                    // selection starts and ends on this line
+                    int toplen = m_font->getWidth(cur, topsel->column); // X coord of highlighting start
+                    int botlen = toplen + m_font->getWidth(&cur[topsel->column], botsel->column - topsel->column); // X coord of selection end
+
+                    if (toplen) { // is there any text on this line before the selection?
+                        m_font->setColor(m_foreground_color);
+                        m_font->Print(0, aty / getVirtualScale()[1], cur, topsel->column, getVirtualScale());
+                    }
+
+                    if (botlen != toplen) { // is the selection wider than 0 pixels? (sanity check, always true)
+                        // print the selected text with the selection highlight box around it
+                        DrawBox(toplen * getVirtualScale()[0], aty, (botlen - toplen) * getVirtualScale()[0], m_font->getHeight(getVirtualScale()), selectionBG, 1.f);
+                        m_font->setColor(selectionColor);
+                        m_font->Print(toplen, aty / getVirtualScale()[1], &cur[topsel->column], botsel->column - topsel->column, getVirtualScale());
+                    }
+
+                    if (cur.length() != botsel->column) { // is there still text on this line after the selection?
+                        // print the leftover text
+                        m_font->setColor(m_foreground_color);
+
+                        // Fixed in OPM:
+                        // highlighting text made the rest of the text after the selection on the line disappear.
+                        // Cause: the last two arguments were incorrectly passed in originally,
+                        // always specifying maxlen as m_bVirtual (which is usually zero).
+                        // m_font->Print(botlen, aty, &cur[botsel->column], m_bVirtual, false);
+                        m_font->Print(botlen, aty / getVirtualScale()[1], &cur[botsel->column], -1, getVirtualScale());
+                    }
+
+                    // Place the cursor at the end of the selection...
+                    caret = botlen;
+                    if (topsel == &m_selection.end) {
+                        // ... except if selection was made from the bottom up
+                        caret = toplen;
+                    }
+                }
+
+                m_font->getWidth(cur, botsel->column);
+                m_font->getWidth(cur, topsel->column);
+            }
+        }
+
+        if (m_selection.end.line == i && (uid.time % 750) >= 375 && IsActive()) {
+            // draw cursor caret
+            DrawBox(caret * getVirtualScale()[0], aty, 2.f, m_font->getHeight(getVirtualScale()), UBlack, 1.f);
+        }
+
+        aty += m_font->getHeight(getVirtualScale());
+    }
 }
 
-void UIMultiLineEdit::Draw
-	(
-	void
-	)
-
+// num is the ZERO-BASED index of the sought line!
+str& UIMultiLineEdit::LineFromLineNumber(int num, bool resetpos)
 {
-	// FIXME: stub
+    static str emptyLine;
+    void      *pos;
+    int        i;
+
+    pos = m_lines.getPosition();
+
+    for (i = 0, m_lines.IterateFromHead(); i < num && m_lines.IsCurrentValid(); i++) {
+        m_lines.IterateNext();
+    }
+
+    if (m_lines.IsCurrentValid()) {
+        str& ret = m_lines.getCurrent();
+        if (resetpos) {
+            m_lines.setPosition(pos);
+        }
+
+        return ret;
+    }
+
+    if (resetpos) {
+        m_lines.setPosition(pos);
+    }
+
+    return emptyLine;
 }
 
-qboolean UIMultiLineEdit::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+void UIMultiLineEdit::PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t& sel)
 {
-	// FIXME: stub
-	return qfalse;
+    int   clickedLine;
+    int   i;
+    float totalWidth = 0;
+    float lastWidth  = 0;
+
+    clickedLine = m_vertscroll->getTopItem() + p.y / m_font->getHeight(getVirtualScale());
+    clickedLine = Q_min(clickedLine, m_lines.getCount() - 1);
+
+    if (clickedLine < 0) {
+        sel.line   = 0;
+        sel.column = 0;
+        return;
+    }
+
+    const char *line = LineFromLineNumber(clickedLine, true).c_str();
+    for (i = 0; line[i] && totalWidth < p.x; i++) {
+        lastWidth = m_font->getCharWidth(line[i]) * getVirtualScale()[0];
+        totalWidth += lastWidth;
+    }
+
+    if (line[i] && i) {
+        lastWidth *= 0.5f;
+        if (totalWidth - lastWidth >= p.x) {
+            i--;
+        }
+    }
+
+    sel.line   = clickedLine;
+    sel.column = i;
 }
 
-void UIMultiLineEdit::CharEvent
-	(
-	int ch
-	)
-
+void UIMultiLineEdit::MouseDown(Event *ev)
 {
-	// FIXME: stub
+    PointToSelectionPoint(MouseEventToClientPoint(ev), m_selection.begin);
+    m_selection.end = m_selection.begin;
+    EnsureSelectionPointVisible(m_selection.end);
+    m_mouseState = M_DRAGGING;
+    uWinMan.setFirstResponder(this);
 }
 
-UIPoint2D UIMultiLineEdit::getEndSelPoint
-	(
-	void
-	)
-
+void UIMultiLineEdit::MouseUp(Event *ev)
 {
-	// FIXME: stub
-	return UIPoint2D();
+    CancelEventsOfType(EV_Time_Dragged);
+
+    if (uWinMan.getFirstResponder() == this) {
+        uWinMan.setFirstResponder(NULL);
+    }
+
+    if (m_mouseState == M_DRAGGING) {
+        EnsureSelectionPointVisible(m_selection.end);
+    }
+
+    m_mouseState = M_NONE;
 }
 
-void UIMultiLineEdit::MouseDown
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::MouseDragged(Event *ev)
 {
-	// FIXME: stub
+    m_dragState.lastPos = MouseEventToClientPoint(ev);
+    PointToSelectionPoint(m_dragState.lastPos, m_selection.end);
+
+    if (!EventPending(EV_Time_Dragged)) {
+        PostEvent(new Event(EV_Time_Dragged), 0);
+    }
 }
 
-void UIMultiLineEdit::MouseUp
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::DragTimer(Event *ev)
 {
-	// FIXME: stub
+    int oldtop;
+
+    PointToSelectionPoint(m_dragState.lastPos, m_selection.end);
+
+    oldtop = m_vertscroll->getTopItem();
+    EnsureSelectionPointVisible(m_selection.end);
+
+    if (m_vertscroll->getTopItem() != oldtop) {
+        PostEvent(new Event(EV_Time_Dragged), 0.25f);
+    }
 }
 
-void UIMultiLineEdit::MouseDragged
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::EnsureSelectionPointVisible(selectionpoint_t& point)
 {
-	// FIXME: stub
+    int newtop;
+
+    if (point.line > m_vertscroll->getTopItem()
+        && point.line < m_vertscroll->getPageHeight() + m_vertscroll->getTopItem()) {
+        return;
+    }
+
+    if (m_vertscroll->getTopItem() > point.line) {
+        newtop = point.line;
+    } else {
+        newtop = point.line - m_vertscroll->getPageHeight() + 1;
+    }
+
+    if (newtop < 0) {
+        newtop = 0;
+    }
+
+    m_vertscroll->setTopItem(newtop);
 }
 
-void UIMultiLineEdit::Scroll
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::BoundSelectionPoint(selectionpoint_t& point)
 {
-	// FIXME: stub
+    // since LineFromLineNumber expects a zero-based line index,
+    // clamp it to one less than the number of lines if the selection point
+    // is right at the end of the text document
+    point.line = Q_clamp_int(point.line, 0, m_lines.getCount() - 1);
+
+    str& line    = LineFromLineNumber(point.line, true);
+    point.column = Q_clamp_int(point.column, 0, line.length());
 }
 
-void UIMultiLineEdit::DragTimer
-	(
-	Event *ev
-	)
-
+qboolean UIMultiLineEdit::KeyEvent(int key, unsigned int time)
 {
-	// FIXME: stub
+    bool     caret_moved = false;
+    qboolean key_rec     = false;
+
+    switch (key) {
+    case K_UPARROW:
+        m_selection.end.line--;
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_DOWNARROW:
+        m_selection.end.line++;
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_LEFTARROW:
+        m_selection.end.column--;
+        if (m_selection.end.column < 0) {
+            m_selection.end.column = 999999;
+            m_selection.end.line--;
+        }
+        if (m_selection.end.line < 0) {
+            m_selection.end.column = 0;
+        }
+
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_RIGHTARROW:
+        {
+            int oldcol = m_selection.end.column;
+
+            m_selection.end.column++;
+            BoundSelectionPoint(m_selection.end);
+            if (m_selection.end.column == oldcol) {
+                m_selection.end.column = 0;
+                m_selection.end.line++;
+                if (m_selection.end.line >= m_lines.getCount()) {
+                    m_selection.end.line--;
+                    m_selection.end.column = 999999;
+                }
+            }
+
+            caret_moved = true;
+            key_rec     = true;
+            break;
+        }
+    case K_INS:
+        if (!IsSelectionEmpty()) {
+            if (uii.Sys_IsKeyDown(K_CTRL)) {
+                CopySelection();
+            } else if (uii.Sys_IsKeyDown(K_SHIFT)) {
+                PasteSelection();
+            }
+        }
+        break;
+    case K_DEL:
+        // Fixed in OPM:
+        // DEL key needed to be pressed twice to delete a single character,
+        // as the first hit would only create an "internal" selection,
+        // but wouldn't actually delete the character after the cursor.
+        // The DeleteSelection() method should ALWAYS be called,
+        // not only when there's an active selection.
+        if (IsSelectionEmpty()) {
+            m_shiftForcedDown = true;
+            KeyEvent(K_RIGHTARROW, 0);
+            m_shiftForcedDown = false;
+        } else if (uii.Sys_IsKeyDown(K_SHIFT)) {
+            CopySelection();
+        }
+
+        DeleteSelection();
+        break;
+    case K_PGDN:
+        if (m_selection.end.line == (m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() - 1)) {
+            m_selection.end.line = m_vertscroll->getPageHeight() + m_selection.end.line;
+        } else {
+            m_selection.end.line = m_vertscroll->getTopItem() + m_vertscroll->getPageHeight() - 1;
+        }
+
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_PGUP:
+        if (m_selection.end.line == m_vertscroll->getTopItem()) {
+            m_selection.end.line -= m_vertscroll->getPageHeight();
+        } else {
+            m_selection.end.line = m_vertscroll->getTopItem();
+        }
+
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_HOME:
+        if (uii.Sys_IsKeyDown(K_CTRL)) {
+            m_selection.end.column = 0;
+            m_selection.end.line   = 0;
+        } else {
+            m_selection.end.column = 0;
+        }
+
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_END:
+        if (uii.Sys_IsKeyDown(K_CTRL)) {
+            m_selection.end.column = 999999;
+            m_selection.end.line   = m_lines.getCount();
+        } else {
+            m_selection.end.column = 999999;
+        }
+
+        caret_moved = true;
+        key_rec     = true;
+        break;
+    case K_MWHEELDOWN:
+        m_vertscroll->AttemptScrollTo(m_vertscroll->getTopItem() + 2);
+        key_rec = true;
+        break;
+    case K_MWHEELUP:
+        m_vertscroll->AttemptScrollTo(m_vertscroll->getTopItem() - 2);
+        key_rec = true;
+        break;
+    }
+
+    if (caret_moved) {
+        BoundSelectionPoint(m_selection.end);
+        if (!uii.Sys_IsKeyDown(K_SHIFT) && !m_shiftForcedDown) {
+            m_selection.begin.line   = m_selection.end.line;
+            m_selection.begin.column = m_selection.end.column;
+        }
+        EnsureSelectionPointVisible(m_selection.end);
+    }
+
+    return key_rec;
 }
 
-void UIMultiLineEdit::SizeChanged
-	(
-	Event *ev
-	)
-
+void UIMultiLineEdit::DeleteSelection(void)
 {
-	// FIXME: stub
+    selectionpoint_t *topsel;
+    selectionpoint_t *botsel;
+    int               i;
+
+    if (IsSelectionEmpty()) {
+        return;
+    }
+
+    m_changed = true;
+    SortSelection(&topsel, &botsel);
+
+    if (topsel->line == botsel->line) {
+        str&     line   = LineFromLineNumber(topsel->line, true);
+        intptr_t newlen = line.length() - (botsel->column - topsel->column);
+
+        for (i = topsel->column; i < newlen; i++) {
+            line[i] = line[i + botsel->column - topsel->column];
+        }
+
+        line.CapLength(newlen);
+        *botsel = *topsel;
+        EnsureSelectionPointVisible(*topsel);
+        return;
+    } else if (botsel->line - topsel->line > 1) {
+        for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < botsel->line;
+             i++, m_lines.IterateNext()) {
+            if (i > topsel->line) {
+                m_lines.RemoveCurrentSetPrev();
+                i--;
+                botsel->line--;
+            }
+        }
+    }
+
+    for (i = 0, m_lines.IterateFromHead(); m_lines.IsCurrentValid() && i < topsel->line; i++, m_lines.IterateNext()) {}
+
+    // delete topmost line of the selection, but only up to topsel->column
+    str& topline = m_lines.getCurrent();
+    if (topline.length() > topsel->column) {
+        topline.CapLength(topsel->column);
+    }
+    m_lines.IterateNext();
+    str line = m_lines.getCurrent();
+
+    // merge remainder of topmost line with the remainder after the end of selection
+    if (line.length() > botsel->column) {
+        topline += &line[botsel->column];
+    }
+
+    m_lines.RemoveCurrentSetPrev();
+    *botsel = *topsel;
+    m_vertscroll->setNumItems(m_lines.getCount());
+    EnsureSelectionPointVisible(*topsel);
 }
 
-void UIMultiLineEdit::setData
-	(
-	const char *data
-	)
-
+void UIMultiLineEdit::CharEvent(int ch)
 {
-	// FIXME: stub
+    intptr_t i;
+
+    if (!m_edit) {
+        return;
+    }
+
+    if (ch >= ' ' || ch == '\t') {
+        DeleteSelection();
+        m_changed = true;
+
+        str& line = LineFromLineNumber(m_selection.begin.line, true);
+        line += " ";
+
+        for (i = line.length() - 1; i > m_selection.begin.column; i--) {
+            line[i] = line[i - 1];
+        }
+        line[m_selection.begin.column] = ch;
+        m_selection.begin.column++;
+        m_selection.end.column++;
+    } else if (ch == '\b') {
+        if (IsSelectionEmpty()) {
+            m_shiftForcedDown = true;
+            KeyEvent(K_LEFTARROW, 0);
+            m_shiftForcedDown = false;
+        }
+        DeleteSelection();
+    } else if (ch == '\r') {
+        DeleteSelection();
+        m_changed = true;
+
+        str& line      = LineFromLineNumber(m_selection.begin.line, false);
+        str otherline = "";
+        if (line.length() > m_selection.begin.column) {
+            otherline = &line[m_selection.begin.column];
+            line.CapLength(m_selection.begin.column);
+        }
+
+        if (m_lines.IsCurrentValid()) {
+            m_lines.InsertAfterCurrent(otherline);
+        } else {
+            m_lines.AddTail(otherline);
+        }
+
+        m_selection.begin.column = 0;
+        m_selection.begin.line++;
+        m_selection.end.column = m_selection.begin.column;
+        m_selection.end.line   = m_selection.begin.line;
+        m_vertscroll->setNumItems(m_lines.getCount());
+
+        EnsureSelectionPointVisible(m_selection.end);
+    }
 }
 
-void UIMultiLineEdit::getData
-	(
-	str& data
-	)
-
+bool UIMultiLineEdit::IsSelectionEmpty(void)
 {
-	// FIXME: stub
+    return m_selection.begin.column == m_selection.end.column && m_selection.begin.line == m_selection.end.line;
 }
 
-void UIMultiLineEdit::Empty
-	(
-	void
-	)
-
+void UIMultiLineEdit::CopySelection(void)
 {
-	// FIXME: stub
+    selectionpoint_t *topsel;
+    selectionpoint_t *botsel;
+    str               line;
+    str               clipText;
+
+    if (IsSelectionEmpty()) {
+        return;
+    }
+
+    SortSelection(&topsel, &botsel);
+
+    line = LineFromLineNumber(topsel->line, true);
+
+    if (line.length() > topsel->column) {
+        clipText += &line[topsel->column];
+    }
+
+    if (topsel->line == botsel->line) {
+        clipText.CapLength(botsel->column - topsel->column);
+    } else {
+        for (int i = topsel->line + 1; i < botsel->line; ++i) {
+            clipText += "\n" + LineFromLineNumber(i, 1);
+        }
+
+        line = LineFromLineNumber(botsel->line, true);
+        if (line.length() > botsel->column) {
+            line.CapLength(botsel->column);
+        }
+        clipText += "\n" + line;
+    }
+
+    uii.Sys_SetClipboard(clipText);
 }
 
-void UIMultiLineEdit::CopySelection
-	(
-	void
-	)
-
+void UIMultiLineEdit::PasteSelection(void)
 {
-	// FIXME: stub
+    str sel;
+    int i;
+
+    // variable added in OPM as str cannot handle NULL assignment
+    // we can get NULL here if clipboard is empty/couldn't be retrieved
+    const char *clipboardData = uii.Sys_GetClipboard();
+    if (clipboardData == NULL)
+    {
+        return;
+    }
+
+    sel = clipboardData;
+
+    DeleteSelection();
+
+    for (i = 0; i < sel.length(); i++) {
+        if (sel[i] == '\n') {
+            CharEvent('\r');
+        } else if (sel[i] == '\r') {
+            // Changed in OPM:
+            // NOP, drop CR characters.
+            // On Linux/Mac they aren't present anyway,
+            // on Windows we already have LF chars next to them.
+            // The filtering for CR on the Windows side was originally done
+            // in Sys_GetWholeClipboard with a "manual" selective strcpy,
+            // but here we iterate over all characters of the clipboard anyways,
+            // so this feels like a better place to do the filtering.
+        } else {
+            CharEvent(sel[i]); // FIXME: this is VERY slow and jams up the EventQueue!
+        }
+    }
 }
 
-void UIMultiLineEdit::PasteSelection
-	(
-	void
-	)
-
+UIPoint2D UIMultiLineEdit::getEndSelPoint(void)
 {
-	// FIXME: stub
+    return UIPoint2D(m_selection.end.column, m_selection.end.line);
 }
 
-void UIMultiLineEdit::DeleteSelection
-	(
-	void
-	)
-
+void UIMultiLineEdit::setChanged(bool b)
 {
-	// FIXME: stub
+    m_changed = b;
 }
 
-void UIMultiLineEdit::setChanged
-	(
-	bool b
-	)
-
+bool UIMultiLineEdit::IsChanged(void)
 {
-	// FIXME: stub
-}
-
-bool UIMultiLineEdit::IsChanged
-	(
-	void
-	)
-
-{
-	// FIXME: stub
-	return false;
+    return m_changed;
 }
 
+void UIMultiLineEdit::Scroll(Event *ev) {}
diff --git a/code/uilib/uimledit.h b/code/uilib/uimledit.h
index d98552d8..36eaff7e 100644
--- a/code/uilib/uimledit.h
+++ b/code/uilib/uimledit.h
@@ -20,71 +20,67 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIMLEDIT_H__
-#define __UIMLEDIT_H__
+#pragma once
 
 typedef struct selectionpoint_s {
-	int line;
-	int column;
+    int line;
+    int column;
 } selectionpoint_t;
 
 typedef struct selection_s {
-	selectionpoint_s begin;
-	selectionpoint_s end;
+    selectionpoint_s begin;
+    selectionpoint_s end;
 } selection_t;
 
 typedef struct dragState_s {
-	UIPoint2D lastPos;
+    UIPoint2D lastPos;
 } dragState_t;
 
-
-class UIMultiLineEdit : public UIWidget {
+class UIMultiLineEdit : public UIWidget
+{
 protected:
-	selection_s m_selection;
-	dragState_s m_dragState;
-	UList<str> m_lines;
-	UIVertScroll *m_vertscroll;
-	mouseState_t m_mouseState;
-	bool m_shiftForcedDown;
-	bool m_edit;
-	bool m_changed;
+    selection_s   m_selection;
+    dragState_s   m_dragState;
+    UList<str>    m_lines;
+    UIVertScroll *m_vertscroll;
+    mouseState_t  m_mouseState;
+    bool          m_shiftForcedDown;
+    bool          m_edit;
+    bool          m_changed;
 
 public:
-	CLASS_PROTOTYPE( UIMultiLineEdit );
+    CLASS_PROTOTYPE(UIMultiLineEdit);
 
 protected:
-	void	FrameInitialized( void ) override;
-	void	PointToSelectionPoint( UIPoint2D& p, selectionpoint_t& sel );
-	str&	LineFromLineNumber( int num, bool resetpos );
-	void	EnsureSelectionPointVisible( selectionpoint_t& point );
-	void	BoundSelectionPoint( selectionpoint_t& point );
-	void	SortSelection( selectionpoint_t **topsel, selectionpoint_t **botsel );
-	void	UpdateCvarEvent( Event *ev );
-	void	SetEdit( Event *ev );
-	bool	IsSelectionEmpty( void );
+    void FrameInitialized(void) override;
+    void PointToSelectionPoint(const UIPoint2D& p, selectionpoint_t& sel);
+    str& LineFromLineNumber(int num, bool resetpos);
+    void EnsureSelectionPointVisible(selectionpoint_t& point);
+    void BoundSelectionPoint(selectionpoint_t& point);
+    void SortSelection(selectionpoint_t **topsel, selectionpoint_t **botsel);
+    void UpdateCvarEvent(Event *ev);
+    void SetEdit(Event *ev);
+    bool IsSelectionEmpty(void);
 
 public:
-	UIMultiLineEdit();
+    UIMultiLineEdit();
 
-	void		Draw( void ) override;
-	qboolean	KeyEvent( int key, unsigned int time ) override;
-	void		CharEvent( int ch ) override;
-	UIPoint2D	getEndSelPoint( void );
-	void		MouseDown( Event *ev );
-	void		MouseUp( Event *ev );
-	void		MouseDragged( Event *ev );
-	void		Scroll( Event *ev );
-	void		DragTimer( Event *ev );
-	void		SizeChanged( Event *ev );
-	void		setData( const char *data );
-	void		getData( str& data );
-	void		Empty( void );
-	void		CopySelection( void );
-	void		PasteSelection( void );
-	void		DeleteSelection( void );
-	void		setChanged( bool b );
-	bool		IsChanged( void );
+    void      Draw(void) override;
+    qboolean  KeyEvent(int key, unsigned int time) override;
+    void      CharEvent(int ch) override;
+    UIPoint2D getEndSelPoint(void);
+    void      MouseDown(Event *ev);
+    void      MouseUp(Event *ev);
+    void      MouseDragged(Event *ev);
+    void      Scroll(Event *ev);
+    void      DragTimer(Event *ev);
+    void      SizeChanged(Event *ev);
+    void      setData(const char *data);
+    void      getData(str& data);
+    void      Empty(void);
+    void      CopySelection(void);
+    void      PasteSelection(void);
+    void      DeleteSelection(void);
+    void      setChanged(bool b);
+    bool      IsChanged(void);
 };
-
-#endif
-
diff --git a/code/uilib/uinotepad.cpp b/code/uilib/uinotepad.cpp
index 22abf163..8450c152 100644
--- a/code/uilib/uinotepad.cpp
+++ b/code/uilib/uinotepad.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -22,245 +22,664 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
-CLASS_DECLARATION( UIMultiLineEdit, UINotepadEdit, NULL )
-{
-	{ NULL, NULL }
+Event EV_Notepad_SaveAs
+(
+    "_notepad_saveas",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Save As..."
+);
+
+Event EV_Notepad_Save
+(
+    "_notepad_save",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Save"
+);
+
+Event EV_Notepad_Open
+(
+    "_notepad_open",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Open"
+);
+
+Event EV_Notepad_OpenFile
+(
+    "openfile",
+    EV_DEFAULT,
+    "s",
+    "nameOfFile",
+    "called to open a file in the notepad"
+);
+
+Event EV_Notepad_Find
+(
+    "_notepad_find",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Find"
+);
+
+Event EV_Notepad_Goto
+(
+    "_notepad_goto",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Go to line"
+);
+
+Event EV_Notepad_Copy
+(
+    "_notepad_copy",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Copy"
+);
+
+Event EV_Notepad_Cut
+(
+    "_notepad_cut",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Cut"
+);
+
+Event EV_Notepad_Paste
+(
+    "_notepad_paste",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Event sent when user selected Paste"
+);
+
+Event W_Notepad_ChildSizeChanged
+(
+    "_notepad_childsizechanged",
+    EV_DEFAULT,
+    NULL,
+    NULL,
+    "Signal that the child area of the floating window has changed"
+);
+
+CLASS_DECLARATION(UIMultiLineEdit, UINotepadEdit, NULL) {
+    {&W_LeftMouseDown, &UINotepadEdit::MousePressed},
+    {NULL,             NULL                        }
 };
 
-bool UI_LoadNotepadFile( const char *filename )
+CLASS_DECLARATION(UIFloatingWindow, UINotepad, NULL) {
+    {&W_Notepad_ChildSizeChanged,       &UINotepad::ChildSizeChanged},
+    {&EV_Notepad_SaveAs,                &UINotepad::SaveAs          },
+    {&EV_Notepad_Save,                  &UINotepad::Save            },
+    {&EV_Notepad_Open,                  &UINotepad::Open            },
+    {&EV_Notepad_OpenFile,              &UINotepad::OpenFile        },
+    {&UIFloatingWindow::W_ClosePressed, &UINotepad::ClosePressed    },
+    {&EV_Notepad_Find,                  &UINotepad::OnFind          },
+    {&EV_Notepad_Goto,                  &UINotepad::OnGoto          },
+    {&EV_Notepad_Copy,                  &UINotepad::OnCopy          },
+    {&EV_Notepad_Paste,                 &UINotepad::OnPaste         },
+    {&EV_Notepad_Cut,                   &UINotepad::OnCut           },
+    {NULL,                              NULL                        }
+};
+
+#define CTRL_EVENT_COUNT 10
+static ctrlevent_s controlEvents[CTRL_EVENT_COUNT] = {
+    {'o',  &EV_Notepad_Open                 },
+    {'s',  &EV_Notepad_Save                 },
+    {'a',  &EV_Notepad_SaveAs               },
+    {'w',  &UIFloatingWindow::W_ClosePressed},
+    {'f',  &EV_Notepad_Find                 },
+    {'g',  &EV_Notepad_Goto                 },
+    {'c',  &EV_Notepad_Copy                 },
+    {'x',  &EV_Notepad_Cut                  },
+    {'v',  &EV_Notepad_Paste                },
+    {0,    NULL                             },
+};
+
+bool UI_LoadNotepadFile(const char *filename)
 {
-	return false;
+    UINotepad *uinp = new UINotepad();
+    UIRect2D  rect  = UIRect2D(100.0f, 100.0f, 450.0f, 300.0f);
+    if (uinp->Create(NULL, rect, filename)) {
+        uWinMan.ActivateControl(uinp);
+        return true;
+    }
+
+    if (uinp) {
+        delete uinp;
+    }
+
+    return false;
 }
 
 UINotepadEdit::UINotepadEdit()
 {
-	// FIXME: stub
+    m_notepad = NULL;
 }
 
-void UINotepadEdit::CharEvent
-	(
-	int ch
-	)
-
+void UINotepadEdit::CharEvent(int ch)
 {
-	// FIXME: stub
+    if (!m_notepad->ProcessCharEvent(ch)) {
+        UIMultiLineEdit::CharEvent(ch);
+    }
 }
 
-void UINotepadEdit::setNotepad
-	(
-	UINotepad *notepad
-	)
-
+void UINotepadEdit::setNotepad(UINotepad *notepad)
 {
-	// FIXME: stub
+    m_notepad = notepad;
 }
 
-bool UINotepadEdit::GotoLine
-	(
-	int line
-	)
-
+bool UINotepadEdit::GotoLine(int line)
 {
-	// FIXME: stub
-	return false;
+    if (line < 1 || line - 1 >= m_lines.getCount()) {
+        return false;
+    }
+
+    m_selection.begin.line = m_selection.end.line = line - 1;
+    m_selection.begin.column                      = 0;
+    m_selection.end.column                        = 999999;
+    BoundSelectionPoint(m_selection.end);
+    EnsureSelectionPointVisible(m_selection.end);
+    return true;
 }
 
-bool UINotepadEdit::FindText
-	(
-	const char *text,
-	int offsetFromSel
-	)
-
+bool UINotepadEdit::FindText(const char *text, int offsetFromSel)
 {
-	// FIXME: stub
-	return false;
+    if (!text) {
+        return false;
+    }
+
+    str lowersearch = text;
+    lowersearch.tolower();
+
+    selectionpoint_s *topsel, *botsel;
+    SortSelection(&topsel, &botsel);
+
+    int  foundat       = -1;
+    bool searchfromtop = false;
+
+    // This loop runs at most twice:
+    //  - once for searchfromtop == false,
+    //  - optionally for searchfromtop == true,
+    // but only if text couldn't be found between the cursor and the end of the file
+    while (true) {
+        int i = 0;
+        m_lines.IterateFromHead();
+        for (; m_lines.IsCurrentValid(); i++, m_lines.IterateNext()) {
+            if (i < topsel->line && !searchfromtop) {
+                // skip lines before the cursor if not searching from the top
+                continue;
+            }
+            if (i > topsel->line && searchfromtop) {
+                // no need to continue if we've looped back to the cursor
+                return false;
+            }
+
+            str findin = m_lines.getCurrent();
+            findin.tolower();
+            const char *where = findin.c_str();
+
+            // Added in OPM to avoid code repetition
+            bool searchLineFromCursor = i == topsel->line && !searchfromtop;
+            if (searchLineFromCursor) {
+                // Start searching on the current line, BUT ONLY from the cursor position.
+                // Offset it with the selection offset:
+                // the purpose of this is to prevent matching
+                // on a string that was just found and is still selected,
+                // by offsetting it
+                if (findin.length() <= topsel->column + offsetFromSel) {
+                    // cursor is at the end of the line, nothing left to search in this one
+                    continue;
+                }
+
+                where = &where[topsel->column + offsetFromSel];
+            }
+
+            const char *found = strstr(where, lowersearch);
+
+            if (found) {
+                // use the beginning of the line to calculate where the matched text is
+                foundat = found - where;
+                if (searchLineFromCursor) {
+                    // take cursor pos. into account if a match is found on the same line as the cursor
+                    foundat += topsel->column + offsetFromSel;
+                }
+                break;
+            }
+        }
+
+        if (foundat == -1) {
+            // couldn't find text in current search iteration
+            if (!searchfromtop) {
+                // try searching from the beginning of the document
+                searchfromtop = true;
+                continue;
+            }
+
+            // text not found
+            return false;
+        } else {
+            // jump to found text and select it
+            m_selection.begin.column = foundat;
+            m_selection.end.column   = foundat + strlen(text);
+            m_selection.begin.line = m_selection.end.line = i;
+            EnsureSelectionPointVisible(m_selection.end);
+            return true;
+        }
+    }
 }
 
-void UINotepadEdit::MousePressed
-	(
-	Event *ev
-	)
-
+void UINotepadEdit::MousePressed(Event *ev)
 {
-	// FIXME: stub
+    if (m_notepad->m_state != STATE_TIMED_MESSAGE) {
+        m_notepad->m_state = STATE_NONE;
+    }
+
+    UIMultiLineEdit::MouseDown(ev);
 }
 
-CLASS_DECLARATION( UIFloatingWindow, UINotepad, NULL )
-{
-	{ NULL, NULL }
-};
-
-
 UINotepad::UINotepad()
 {
-	// FIXME: stub
+    m_state  = STATE_NONE;
+    m_edit   = NULL;
+    m_menu   = NULL;
+    m_status = NULL;
 }
 
-void UINotepad::TimeMessage
-	(
-	const char *message,
-	int howlong
-	)
-
+UINotepad::~UINotepad()
 {
-	// FIXME: stub
+    for (int i = m_popups.NumObjects(); i > 0; i--) {
+        Container<uipopup_describe *> *inner = m_popups.ObjectAt(i);
+        for (int j = inner->NumObjects(); j > 0; j--) {
+            uipopup_describe *uipd = inner->ObjectAt(j);
+            inner->RemoveObjectAt(j);
+            delete uipd;
+        }
+    }
 }
 
-bool UINotepad::OpenFile
-	(
-	const char *filename
-	)
-
+void UINotepad::TimeMessage(const char *message, int howlong)
 {
-	// FIXME: stub
-	return false;
+    m_state             = STATE_TIMED_MESSAGE;
+    m_timedmessage.die  = uid.time + howlong;
+    m_timedmessage.text = message;
 }
 
-bool UINotepad::Create
-	(
-	UIWidget *parent,
-	UIRect2D& rect,
-	const char *filename
-	)
-
+bool UINotepad::OpenFile(const char *filename)
 {
-	// FIXME: stub
-	return false;
+    char *data = NULL;
+    if (!filename || FS_ReadFile(filename, (void **)&data) == -1) {
+        return false;
+    }
+
+    setFileName(filename);
+    if (m_edit) {
+        m_edit->Empty();
+        m_edit->setData(data);
+    }
+
+    FS_FreeFile(data);
+    return true;
 }
 
-void UINotepad::ChildSizeChanged
-	(
-	Event *ev
-	)
-
+bool UINotepad::Create(UIWidget *parent, UIRect2D& rect, const char *filename)
 {
-	// FIXME: stub
+    UIFloatingWindow::Create(parent, rect, "", UColor(0.15f, 0.196f, 0.278f), UHudColor);
+
+    m_edit = new UINotepadEdit();
+    m_edit->setNotepad(this);
+
+    m_edit->InitFrame(getChildSpace(), 0.0f, 0.0f, 20.0f, 20.0f, 0, "verdana-12");
+    m_edit->setBackgroundColor(UWhite, true);
+    m_edit->setForegroundColor(UBlack);
+    m_edit->setFont("verdana-14");
+
+    m_status = new UIStatusBar(WND_ALIGN_BOTTOM, 20.0f);
+    m_status->InitFrame(getChildSpace(), 0.0f, 0.0f, 20.0f, 20.0f, 0, "verdana-12");
+    m_status->EnableSizeBox(this);
+
+    m_menu = new UIPulldownMenu();
+    m_menu->CreateAligned(getChildSpace(), this);
+    // Fixed in OPM: menu text was hard to read when notepad is active
+    //m_menu->setForegroundColor(UBlack);
+    m_menu->setForegroundColor(UHudColor);
+
+    Container<uipopup_describe *> *pops = new Container<uipopup_describe *>();
+
+    uipopup_describe *uipd = new uipopup_describe("Open (Ctrl-O)", UIP_EVENT, &EV_Notepad_Open, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Save (Ctrl-S)", UIP_EVENT, &EV_Notepad_Save, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Save As...(Ctrl-A)", UIP_EVENT, &EV_Notepad_SaveAs, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe(str(), UIP_SEPARATOR, NULL, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe("Close (Ctrl-W)", UIP_EVENT, &UIFloatingWindow::W_ClosePressed, NULL);
+    pops->AddObject(uipd);
+
+    m_popups.AddObject(pops);
+    for (int i = 1; i <= pops->NumObjects(); i++) {
+        m_menu->AddUIPopupDescribe("File", pops->ObjectAt(i));
+    }
+
+    pops = new Container<uipopup_describe *>();
+    uipd = new uipopup_describe("Copy (Ctrl-C)", UIP_EVENT, &EV_Notepad_Copy, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Cut (Ctrl-X)", UIP_EVENT, &EV_Notepad_Cut, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Paste (Ctrl-V)", UIP_EVENT, &EV_Notepad_Paste, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe(str(), UIP_SEPARATOR, NULL, NULL);
+    pops->AddObject(uipd);
+
+    uipd = new uipopup_describe("Find (Ctrl-F)", UIP_EVENT, &EV_Notepad_Find, NULL);
+    pops->AddObject(uipd);
+    uipd = new uipopup_describe("Go to line... (Ctrl-G)", UIP_EVENT, &EV_Notepad_Goto, NULL);
+    pops->AddObject(uipd);
+
+    m_popups.AddObject(pops);
+    for (int i = 1; i <= pops->NumObjects(); i++) {
+        m_menu->AddUIPopupDescribe("Edit", pops->ObjectAt(i));
+    }
+
+    setFileName("");
+    OpenFile(filename);
+    getChildSpace()->Connect(this, W_SizeChanged, W_Notepad_ChildSizeChanged);
+    getChildSpace()->SendSignal(W_SizeChanged);
+    getChildSpace()->AllowActivate(false);
+    return true;
 }
 
-void UINotepad::SaveAs
-	(
-	Event *ev
-	)
-
+void UINotepad::ChildSizeChanged(Event *ev)
 {
-	// FIXME: stub
+    m_menu->Realign();
+    UISize2D menuSize       = m_menu->getSize();
+    UISize2D childSpaceSize = getChildSpace()->getSize();
+
+    UIRect2D frame(0.0f, menuSize.height, childSpaceSize.width, childSpaceSize.height - 20.0f - menuSize.height);
+
+    m_edit->setFrame(frame);
 }
 
-void UINotepad::Save
-	(
-	Event *ev
-	)
-
+void UINotepad::SaveAs(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_SAVE_AS;
+    m_textinput.text = "";
 }
 
-void UINotepad::Open
-	(
-	Event *ev
-	)
-
+void UINotepad::Save(Event *ev)
 {
-	// FIXME: stub
+    if (!m_filename.length()) {
+        SaveAs(NULL);
+        // Fixed in OPM:
+        // devs probably forgot to return here - saving was attempted,
+        // even though there was no filename to save the file with
+        return;
+    }
+
+    str filecontents;
+    m_edit->getData(filecontents);
+    m_edit->setChanged(false);
+
+    FS_WriteTextFile(m_filename, filecontents, filecontents.length());
+
+    str result = "Saved " + m_filename;
+    TimeMessage(result, 3000);
 }
 
-void UINotepad::OpenFile
-	(
-	Event *ev
-	)
-
+void UINotepad::Open(Event *ev)
 {
-	// FIXME: stub
+    PickFile(m_filename, this, EV_Notepad_OpenFile);
 }
 
-void UINotepad::ClosePressed
-	(
-	Event *ev
-	)
-
+void UINotepad::OpenFile(Event *ev)
 {
-	// FIXME: stub
+    OpenFile(ev->GetString(1));
 }
 
-void UINotepad::OnFind
-	(
-	Event *ev
-	)
-
+void UINotepad::ClosePressed(Event *ev)
 {
-	// FIXME: stub
+    uWinMan.ActivateControl(this);
+    if (m_edit->IsChanged()) {
+        m_state          = STATE_CONFIRMCLOSE;
+        m_textinput.text = "y";
+    } else {
+        PostEvent(EV_Remove, 0.0f);
+
+        // Fixed in OPM:
+        // in the original game, the control is not deactivated after removal,
+        // so the already heap-freed UINotepad instance still "reacts" to
+        // KeyEvents and CharEvents, creating a use-after-free scenario
+        // that causes crashes when debug heap is enabled
+        uWinMan.DeactivateCurrentControl();
+    }
 }
 
-void UINotepad::OnGoto
-	(
-	Event *ev
-	)
-
+void UINotepad::OnFind(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_FIND_TEXT;
+    m_textinput.text = m_lastfind;
 }
 
-void UINotepad::OnCopy
-	(
-	Event *ev
-	)
-
+void UINotepad::OnGoto(Event *ev)
 {
-	// FIXME: stub
+    m_state          = STATE_GOTO_LINE;
+    m_textinput.text = "";
 }
 
-void UINotepad::OnPaste
-	(
-	Event *ev
-	)
-
+void UINotepad::OnCopy(Event *ev)
 {
-	// FIXME: stub
+    m_edit->CopySelection();
 }
 
-void UINotepad::OnCut
-	(
-	Event *ev
-	)
-
+void UINotepad::OnPaste(Event *ev)
 {
-	// FIXME: stub
+    m_edit->PasteSelection();
 }
 
-bool UINotepad::ProcessControlEvents
-	(
-	int ch
-	)
-
+void UINotepad::OnCut(Event *ev)
 {
-	// FIXME: stub
-	return false;
+    m_edit->CopySelection();
+    m_edit->DeleteSelection();
 }
 
-bool UINotepad::ProcessCharEvent
-	(
-	int ch
-	)
-
+bool UINotepad::ProcessControlEvents(int ch)
 {
-	// FIXME: stub
-	return false;
+    if (ch < CTRL('a') || ch > CTRL('z')) {
+        // not a control character
+        return false;
+    }
+
+    // Fixed in OPM:
+    // Original code didn't bounds-check controlEvents
+    for (int i = 0; i < CTRL_EVENT_COUNT; i++) {
+        ctrlevent_s *event = &controlEvents[i];
+        if (!event->ev) {
+            // no event assigned
+            return false;
+        }
+
+        if (ch == CTRL(event->ch)) {
+            // found it
+            PostEvent(
+                new Event(*event->ev), 0.0f
+            ); // create a new Event as it will be deleted by ProcessEvent in L_ProcessPendingEvents
+            return true;
+        }
+    }
+
+    return false;
 }
 
-void UINotepad::Draw
-	(
-	void
-	)
-
+bool UINotepad::ProcessCharEvent(int ch)
 {
-	// FIXME: stub
+    if (ProcessControlEvents(ch)) {
+        return true;
+    }
+
+    if (m_state == STATE_NONE || m_state == STATE_TIMED_MESSAGE) {
+        return false;
+    }
+
+    str text;
+    switch (ch) {
+    case '\b': // Backspace
+        m_textinput.text.CapLength(m_textinput.text.length() - 1);
+        break;
+    case K_ENTER:
+        switch (m_state) {
+        case STATE_GOTO_LINE:
+            {
+                if (!m_textinput.text.length()) {
+                    m_state = STATE_NONE;
+                    return true;
+                }
+
+                int line = atoi(m_textinput.text);
+                if (m_edit->GotoLine(line)) {
+                    m_state = STATE_NONE;
+                    return true;
+                }
+
+                text = "Line '" + m_textinput.text + "' doesn't exist.";
+                TimeMessage(text, 3000);
+                break;
+            }
+        case STATE_FIND_TEXT:
+            if (!m_textinput.text.length()) {
+                m_state = STATE_NONE;
+                return true;
+            }
+
+            if (!m_edit->FindText(m_textinput.text, 1)) {
+                text = "Text: '" + m_textinput.text + "' could not be found.";
+                TimeMessage(text, 3000);
+            }
+
+            m_lastfind = m_textinput.text;
+            return true;
+        case STATE_SAVE_AS:
+            m_state = STATE_NONE;
+
+            if (!m_textinput.text.length()) {
+                return true;
+            }
+
+            setFileName(m_textinput.text);
+            Save(NULL);
+            return true;
+        case STATE_CONFIRMCLOSE:
+            {
+                m_state = STATE_NONE;
+
+                if (!m_textinput.text.length()) {
+                    return true;
+                }
+
+                char choice = tolower(m_textinput.text[0]);
+                if (choice != 'n' && choice != 'y') {
+                    return true;
+                }
+
+                if (choice == 'y') {
+                    Save(NULL);
+                }
+
+                // close window
+                PostEvent(new Event(EV_Remove), 0.0f);
+
+                // Fixed in OPM:
+                // in the original game, the control is not deactivated after removal,
+                // so the already heap-freed UINotepad instance still "reacts" to
+                // KeyEvents and CharEvents, creating a use-after-free scenario,
+                // causing crashes when debug heap is enabled
+                uWinMan.DeactivateCurrentControl();
+
+                return true;
+            }
+        default:
+            m_state = STATE_NONE;
+            return true;
+        }
+        return true;
+    case K_ESCAPE:
+    case K_TAB:
+        m_state = STATE_NONE;
+        return true;
+    }
+
+    if (!isprint(ch)) {
+        return true;
+    }
+
+    if (m_state == STATE_CONFIRMCLOSE) {
+        m_textinput.text = "";
+    }
+
+    m_textinput.text += (char)ch;
+    return true;
 }
 
-void UINotepad::setFileName
-	(
-	const char *filename
-	)
-
+void UINotepad::Draw(void)
 {
-	// FIXME: stub
+    UColor out = URed;
+    out.ScaleColor(0.5f);
+    out.ScaleAlpha(0.5f);
+
+    m_status->setBackgroundColor(out, true);
+    m_status->setForegroundColor(UHudColor);
+
+    str text;
+    switch (m_state) {
+    case STATE_GOTO_LINE:
+        text = "Goto line (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_FIND_TEXT:
+        text = "Find text (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_SAVE_AS:
+        text = "Save As (tab cancels): " + m_textinput.text;
+        break;
+    case STATE_CONFIRMCLOSE:
+        text = "Save " + m_filename + "? (yes/no/cancel) " + m_textinput.text;
+        break;
+    case STATE_TIMED_MESSAGE:
+        if (uid.time > m_timedmessage.die) {
+            m_state = STATE_NONE;
+        default:
+            m_status->setBackgroundColor(getBackgroundColor(), true);
+            m_status->setForegroundColor(getForegroundColor()); // Fixed in OPM
+            m_menu->setForegroundColor(getForegroundColor());   // Fixed in OPM
+            UIPoint2D selpoint = m_edit->getEndSelPoint();
+            text               = va("Line %d, column %d", (int)selpoint.y + 1, (int)selpoint.x + 1);
+        } else {
+            m_status->setBackgroundColor(getBackgroundColor(), true);
+            m_status->setForegroundColor(URed);
+            text = m_timedmessage.text;
+        }
+        break;
+    }
+
+    m_status->setTitle(text);
+    UIFloatingWindow::Draw();
+}
+
+void UINotepad::setFileName(const char *filename)
+{
+    str text = str(filename) + " - Notepad";
+    setTitle(text);
+    m_filename = filename;
 }
diff --git a/code/uilib/uinotepad.h b/code/uilib/uinotepad.h
index 7075130d..e3dc07a3 100644
--- a/code/uilib/uinotepad.h
+++ b/code/uilib/uinotepad.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UINOTEPAD_H__
-#define __UINOTEPAD_H__
+#pragma once
 
 class UINotepad;
 
@@ -59,6 +58,7 @@ typedef struct ctrlevent_s {
 } ctrlevent_t;
 
 class UINotepad : public UIFloatingWindow {
+	friend class UINotepadEdit; // UINotepadEdit needs m_state
 private:
 	Container<Container<uipopup_describe *> *> m_popups;
 
@@ -80,6 +80,7 @@ protected:
 
 public:
 	UINotepad();
+	~UINotepad();
 
 	bool	OpenFile( const char *filename );
 	bool	Create( UIWidget *parent, UIRect2D& rect, const char *filename );
@@ -101,6 +102,3 @@ public:
 };
 
 bool UI_LoadNotepadFile( const char *filename );
-
-#endif
-
diff --git a/code/uilib/uipoint2d.h b/code/uilib/uipoint2d.h
index fdfe4504..aa4cd073 100644
--- a/code/uilib/uipoint2d.h
+++ b/code/uilib/uipoint2d.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPOINT2D_H__
-#define __UIPOINT2D_H__
+#pragma once
 
 class UIPoint2D {
 public:
@@ -64,5 +63,3 @@ bool UIPoint2D::operator!=( const UIPoint2D& pos ) const
 {
 	return ( x != pos.x || y != pos.y );
 }
-
-#endif /* __UIPOINT2D_H__ */
diff --git a/code/uilib/uipopupmenu.cpp b/code/uilib/uipopupmenu.cpp
index 3a8372d3..b119100b 100644
--- a/code/uilib/uipopupmenu.cpp
+++ b/code/uilib/uipopupmenu.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,15 +21,71 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include "localization.h"
 
 CLASS_DECLARATION( UIWidget, UIPopupMenu, NULL )
 {
-	{ NULL, NULL }
+	{ &W_LeftMouseUp,	&UIPopupMenu::MouseReleased	},
+	{ &W_MouseMoved,	&UIPopupMenu::MouseMoved	},
+	{ &W_MouseExited,	&UIPopupMenu::MouseExited	},
+	{ &W_Deactivated,	&UIPopupMenu::DismissEvent	},
+	{ NULL,				NULL						}
 };
 
+uipopup_type UI_PopupTypeStringToInt(str type)
+{
+	if (type == "event_string")
+	{
+		return UIP_EVENT_STRING;
+	}
+	else if (type == "command")
+	{
+		return UIP_CMD;
+	}
+	else if (type == "cvar")
+	{
+		return UIP_CVAR;
+	}
+	else if (type == "separator")
+	{
+		return UIP_SEPARATOR;
+	}
+
+	return UIP_NONE;
+}
+
 UIPopupMenu::UIPopupMenu()
 {
-	// FIXME: stub
+	m_selected = -1;
+	m_listener = NULL;
+	m_parentMenu = NULL;
+	m_submenu = -1;
+	m_marlett = UIFont("marlett");
+	m_autodismiss = qtrue;
+	m_describe = NULL;
+	m_submenuptr = NULL;
+
+	m_highlightFGColor = UColor(0.9f, 0.8f, 0.6f, 1.0f);
+	m_highlightBGColor = UColor(0.21f, 0.18f, 0.015f, 1.0f);
+	m_background_color = UColor(0.02f, 0.07f, 0.005f, 1.0f);
+	m_foreground_color = UHudColor;
+
+	m_iFontAlignmentHorizontal = FONT_JUSTHORZ_RIGHT;
+
+}
+
+UIPopupMenu::~UIPopupMenu()
+{
+	if (m_parentMenu)
+	{
+		m_submenu = -1;
+	}
+
+	if (m_submenu != -1 && m_submenuptr)
+	{
+		m_submenuptr->m_parentMenu = NULL;
+		delete m_submenuptr;
+	}
 }
 
 uipopup_describe *UIPopupMenu::getDescribeFromPoint
@@ -38,7 +94,25 @@ uipopup_describe *UIPopupMenu::getDescribeFromPoint
 	)
 
 {
-	// FIXME: stub
+	// FIXME: macro or inline for this somewhere?
+	if (p.y < 4.0f || p.x < 2.0f || m_frame.size.width - 2.0f <= p.x)
+	{
+		return NULL;
+	}
+
+	float top = getVirtualScale()[1] * 4.0f;
+	for (int i = 1; i <= m_describe->NumObjects(); i++)
+	{
+		uipopup_describe* desc = m_describe->ObjectAt(i);
+		float height = getDescribeHeight(desc);
+		if (p.y >= top && p.y < top + height)
+		{
+			return desc;
+		}
+
+		top += height;
+	}
+
 	return NULL;
 }
 
@@ -48,7 +122,37 @@ void UIPopupMenu::MakeSubMenu
 	)
 
 {
-	// FIXME: stub
+	UIRect2D place;
+	for (int i = 1; i <= m_submenu; i++)
+	{
+		place.pos.y += getDescribeHeight(m_describe->ObjectAt(i));
+	}
+
+	place.size.height = getDescribeHeight(m_describe->ObjectAt(m_submenu)) + 8.0f;
+	place.size.width = m_frame.size.width - 40.0f;
+
+	place.pos.x = 20.0f;
+	if (place.size.width < 0.0f)
+	{
+		place.pos.x -= place.size.width * 0.5f;
+		place.size.width = 0.0f;
+	}
+
+	place.pos.x += m_screenframe.pos.x;
+	place.pos.y += m_screenframe.pos.y;
+
+	UIPopupMenu *me = new UIPopupMenu();
+	me->Create(
+		(Container<uipopup_describe*> *)m_describe->ObjectAt(m_submenu)->data,
+		m_listener,
+		place,
+		UIP_WHERE_RIGHT,
+		qfalse,
+		-1.0f
+	);
+
+	me->m_parentMenu = this;
+	m_submenuptr = me;
 }
 
 float UIPopupMenu::getDescribeHeight
@@ -57,8 +161,12 @@ float UIPopupMenu::getDescribeHeight
 	)
 
 {
-	// FIXME: stub
-	return 0.0f;
+	if (d->type == UIP_SEPARATOR)
+	{
+		return 8.0f * getVirtualScale()[0];
+	}
+	
+	return m_font->getHeight(getVirtualScale());
 }
 
 float UIPopupMenu::getDescribeWidth
@@ -67,8 +175,7 @@ float UIPopupMenu::getDescribeWidth
 	)
 
 {
-	// FIXME: stub
-	return 0.0f;
+	return m_font->getWidth(d->title, -1) * getVirtualScale()[0];
 }
 
 bool UIPopupMenu::MouseInSubmenus
@@ -77,8 +184,17 @@ bool UIPopupMenu::MouseInSubmenus
 	)
 
 {
-	// FIXME: stub
-	return false;
+	if (m_submenu == -1)
+	{
+		return false;
+	}
+	
+	if (m_submenuptr->m_screenframe.contains(uid.mouseX, uid.mouseY))
+	{
+		return true;
+	}
+
+	return m_submenuptr->MouseInSubmenus();
 }
 
 
@@ -90,7 +206,7 @@ void UIPopupMenu::Create
 	)
 
 {
-	// FIXME: stub
+	Create(describe, listener, UIRect2D(where.x, where.y, 0.0f, 0.0f), UIP_WHERE_RIGHT, qfalse, -1.0f);
 }
 
 void UIPopupMenu::Create
@@ -104,7 +220,95 @@ void UIPopupMenu::Create
 	)
 
 {
-	// FIXME: stub
+	m_describe = describe;
+	m_listener = listener;
+	setFont("verdana-12");
+
+	if (bVirtualSize)
+	{
+		m_bVirtual = qtrue;
+		m_vVirtualScale[0] = (float)uid.vidWidth / SCREEN_WIDTH;
+		m_vVirtualScale[1] = (float)uid.vidHeight / SCREEN_HEIGHT;
+	}
+
+	if (!(m_describe && m_listener))
+	{
+		return;
+	}
+
+	UISize2D totalSize;
+	for (int i = 1; i <= m_describe->NumObjects(); i++)
+	{
+		uipopup_describe* desc = m_describe->ObjectAt(i);
+		totalSize.height += getDescribeHeight(desc);
+		if (desc->type != UIP_SEPARATOR)
+		{
+			float newWidth = getDescribeWidth(desc);
+			if (newWidth > totalSize.width)
+			{
+				totalSize.width = newWidth;
+			}
+		}
+	}
+
+	totalSize.height /= getVirtualScale()[1];
+
+	if (width != -1.0f)
+	{
+		totalSize.width = width;
+	}
+
+	if (totalSize.width == 0.0f || totalSize.height == 0.0f)
+	{
+		return;
+	}
+
+	totalSize.width += 24.0f;
+	totalSize.height += 8.0f;
+
+	//if (m_bVirtual)
+	//{
+		totalSize.width *= getVirtualScale()[0];
+		totalSize.height *= getVirtualScale()[1];
+	//}
+
+	UIPoint2D place;
+	place.x = (where) ? createRect.pos.x : createRect.size.width + createRect.pos.x;
+	place.y = (where) ? createRect.size.height + createRect.pos.y : createRect.pos.y;
+
+	// FIXME: avoid code repetition, extract these checks below to an inline func
+
+	// Adjust position of menu rect if it goes beyond the screen width
+	if (place.x + totalSize.width > uid.vidWidth)
+	{
+		place.x = (where) ? createRect.size.width + createRect.pos.x : createRect.pos.x;
+
+		if (place.x < totalSize.width)
+		{
+			place.x = std::fmax(0.0f, uid.vidWidth - totalSize.width);
+		}
+		else
+		{
+			place.x -= totalSize.width;
+		}
+	}
+
+	// Adjust position of menu rect if it goes beyond the screen height
+	if (place.y + totalSize.height > uid.vidHeight)
+	{
+		place.y = (where) ? createRect.pos.y : createRect.size.height + createRect.pos.y;
+
+		if (place.y < totalSize.height)
+		{
+			place.y = std::fmax(0.0f, uid.vidHeight - totalSize.height);
+		}
+		else
+		{
+			place.y -= totalSize.height;
+		}
+	}
+
+	InitFrame(NULL, place.x, place.y, totalSize.width, totalSize.height, 1);
 }
 
 void UIPopupMenu::YouAreASubmenu
@@ -113,7 +317,7 @@ void UIPopupMenu::YouAreASubmenu
 	)
 
 {
-	// FIXME: stub
+	m_parentMenu = me;
 }
 
 void UIPopupMenu::Draw
@@ -122,7 +326,65 @@ void UIPopupMenu::Draw
 	)
 
 {
-	// FIXME: stub
+	const float originX = getVirtualScale()[0] * 4.0f;
+	const float originY = getVirtualScale()[1] * 4.0f;
+
+	float fFontHeight = m_font->getHeight(getVirtualScale());
+	float top = originY;
+	for (int i = 1; i <= m_describe->NumObjects(); i++)
+	{
+		uipopup_describe* desc = m_describe->ObjectAt(i);
+		if (desc->type == UIP_SEPARATOR)
+		{
+			DrawBox(
+				originX * 2.0f,
+				originY + top,
+				m_frame.size.width - (originX * 4.0f),
+				1.0f,
+				m_foreground_color,
+				1.0f
+			);
+		}
+		else
+		{
+			UColor textColor;
+			if (m_selected == i || m_submenu == i)
+			{
+				DrawBox(
+					originX / 2.0f,
+					top,
+					m_frame.size.width - originX,
+					fFontHeight,
+					m_highlightBGColor,
+					m_local_alpha
+				);
+
+				textColor = m_highlightFGColor;
+			}
+			else
+			{
+				textColor = m_foreground_color;
+			}
+
+			m_font->setColor(textColor);
+			m_marlett.setColor(textColor);
+			const char *text = Sys_LV_CL_ConvertString(desc->title);
+			m_font->Print(4.0f, top / getVirtualScale()[1], text, -1, getVirtualScale());
+
+			if (desc->type == UIP_SUBMENU)
+			{
+				m_marlett.PrintJustified(
+					UIRect2D(0.0f, top, m_frame.size.width - originX, getDescribeHeight(desc)),
+					m_iFontAlignmentHorizontal,
+					m_iFontAlignmentVertical,
+					"4",
+					getVirtualScale()
+				);
+			}
+		}
+
+		top += getDescribeHeight(desc);
+	}
 }
 
 void UIPopupMenu::MouseReleased
@@ -131,7 +393,44 @@ void UIPopupMenu::MouseReleased
 	)
 
 {
-	// FIXME: stub
+	UIPoint2D p = MouseEventToClientPoint(ev); // unused
+	if (m_selected == -1 || m_selected > m_describe->NumObjects())
+	{
+		return;
+	}
+
+	uipopup_describe *desc = m_describe->ObjectAt(m_selected);
+	if (!desc || desc->type == UIP_SEPARATOR || desc->type == UIP_SUBMENU)
+	{
+		return;
+	}
+
+	// NOTE: Dismiss() below can delete this entire instance!
+	// Save the m_listener pointer for later, as `this->m_listener`
+	// cannot be used after the instance was freed.
+	Listener* listener = m_listener;
+
+	if (m_autodismiss)
+	{
+		Dismiss();
+	}
+
+	switch (desc->type)
+	{
+	case UIP_EVENT:
+		// make sure it's passed in as an Event&, as ProcessEvent(Event*) would try to delete the static event!
+		listener->ProcessEvent(*(Event*)desc->data);
+		break;
+	case UIP_EVENT_STRING:
+		listener->ProcessEvent(new Event((const char*)desc->data));
+		break;
+	case UIP_CMD:
+	case UIP_CVAR:
+		Cbuf_AddText((const char*)desc->data);
+		break;
+	default:
+		return;
+	}
 }
 
 void UIPopupMenu::MouseMoved
@@ -140,7 +439,17 @@ void UIPopupMenu::MouseMoved
 	)
 
 {
-	// FIXME: stub
+	UIPoint2D point = MouseEventToClientPoint(ev);
+	uipopup_describe* describe = getDescribeFromPoint(point);
+	if (describe)
+	{
+		int index = m_describe->IndexOfObject(describe);
+		setSelection(index);
+	}
+	else
+	{
+		setSelection(-1);
+	}
 }
 
 void UIPopupMenu::MouseExited
@@ -149,7 +458,7 @@ void UIPopupMenu::MouseExited
 	)
 
 {
-	// FIXME: stub
+	MouseMoved(ev);
 }
 
 void UIPopupMenu::Dismiss
@@ -158,7 +467,12 @@ void UIPopupMenu::Dismiss
 	)
 
 {
-	// FIXME: stub
+	// navigate to the topmost menu
+	if (m_parentMenu) {
+		m_parentMenu->Dismiss();
+	} else {
+		delete this;
+	}
 }
 
 void UIPopupMenu::DismissEvent
@@ -167,7 +481,7 @@ void UIPopupMenu::DismissEvent
 	)
 
 {
-	// FIXME: stub
+	Dismiss();
 }
 
 void UIPopupMenu::setAutoDismiss
@@ -176,7 +490,7 @@ void UIPopupMenu::setAutoDismiss
 	)
 
 {
-	// FIXME: stub
+	m_autodismiss = b;
 }
 
 void UIPopupMenu::setNextSelection
@@ -185,7 +499,25 @@ void UIPopupMenu::setNextSelection
 	)
 
 {
-	// FIXME: stub
+	if (!m_describe->NumObjects())
+	{
+		return;
+	}
+
+	if (m_selected == -1)
+	{
+		setSelection(0);
+		return;
+	}
+
+	int sel = m_selected + 1;
+	if (sel > m_describe->NumObjects())
+	{
+		// wrap around
+		sel = 0;
+	}
+	
+	setSelection(sel);
 }
 
 void UIPopupMenu::setPrevSelection
@@ -194,7 +526,29 @@ void UIPopupMenu::setPrevSelection
 	)
 
 {
-	// FIXME: stub
+	if (!m_describe->NumObjects())
+	{
+		return;
+	}
+
+	if (m_selected == -1)
+	{
+		setSelection(0);
+		return;
+	}
+
+	int sel;
+	if (m_selected != 0)
+	{
+		sel = m_selected - 1;
+	}
+	else
+	{
+		// wrap around
+		sel = m_describe->NumObjects();
+	}
+
+	setSelection(sel);
 }
 
 uipopup_describe *UIPopupMenu::getSelectedDescribe
@@ -203,8 +557,12 @@ uipopup_describe *UIPopupMenu::getSelectedDescribe
 	)
 
 {
-	// FIXME: stub
-	return NULL;
+	if (m_selected == -1)
+	{
+		return NULL;
+	}
+
+	return m_describe->ObjectAt(m_selected);
 }
 
 void UIPopupMenu::setSelection
@@ -213,7 +571,49 @@ void UIPopupMenu::setSelection
 	)
 
 {
-	// FIXME: stub
+	int maxSel = m_describe->NumObjects();
+	if (sel > maxSel)
+	{
+		m_selected = maxSel;
+		return;
+	}
+
+	int newSubMenu = -1;
+	if (sel != -1)
+	{
+		uipopup_describe* desc = m_describe->ObjectAt(sel);
+		if (desc && desc->type == UIP_SUBMENU)
+		{
+			newSubMenu = sel;
+		}
+	}
+
+	m_selected = sel;
+
+	if (newSubMenu == m_submenu)
+	{
+		return;
+	}
+
+	if (newSubMenu == -1)
+	{
+		if (m_submenuptr)
+		{
+			delete m_submenuptr;
+		}
+
+		m_submenu = -1;
+	}
+	else
+	{
+		if (m_submenu != -1 && m_submenuptr)
+		{
+			delete m_submenuptr;
+		}
+
+		m_submenu = newSubMenu;
+		MakeSubMenu();
+	}
 }
 
 void UIPopupMenu::setHighlightFGColor
@@ -222,7 +622,7 @@ void UIPopupMenu::setHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightFGColor = c;
 }
 
 void UIPopupMenu::setHighlightBGColor
@@ -231,7 +631,7 @@ void UIPopupMenu::setHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightBGColor = c;
 }
 
 void UIPopupMenu::setPopupHighlightBGColor
@@ -241,7 +641,7 @@ void UIPopupMenu::setPopupHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	// not present in disassembly
 }
 
 void UIPopupMenu::setPopupHighlightFGColor
@@ -251,7 +651,7 @@ void UIPopupMenu::setPopupHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	// not present in disassembly
 }
 
 void UIPopupMenu::getPulldown
@@ -260,6 +660,6 @@ void UIPopupMenu::getPulldown
 	)
 
 {
-	// FIXME: stub
+	// not present in disassembly
 }
 
diff --git a/code/uilib/uipopupmenu.h b/code/uilib/uipopupmenu.h
index 756247d4..927ea29c 100644
--- a/code/uilib/uipopupmenu.h
+++ b/code/uilib/uipopupmenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPOPUPMENU_H__
-#define __UIPOPUPMENU_H__
+#pragma once
 
 typedef enum { UIP_NONE, UIP_EVENT, UIP_EVENT_STRING, UIP_SUBMENU, UIP_CMD, UIP_CVAR, UIP_SEPARATOR } uipopup_type;
 typedef enum { UIP_WHERE_RIGHT, UIP_WHERE_DOWN } uipopup_where;
@@ -35,6 +34,7 @@ public:
 
 	uipopup_describe();
 	uipopup_describe( str title, uipopup_type type, void *data, UIReggedMaterial *material );
+	~uipopup_describe();
 };
 
 inline
@@ -62,7 +62,28 @@ uipopup_describe::uipopup_describe
 	this->material = material;
 }
 
+// NOTE: this is not part of the original game!
+// Added in OPM to properly clean up memory.
+inline
+uipopup_describe::~uipopup_describe()
+{
+    if (this->data == NULL) {
+        // nothing to clean up
+        return;
+    }
+
+    // only clean up these types of uipds, because:
+    //  - UIP_EVENT types point to static Event instances,
+    //  - UIP_EVENT_STRING types point to already freed Event instances
+    if (this->type == UIP_CMD || this->type == UIP_CVAR) {
+        // clean up strdup'd C-string from memory
+        free(this->data);
+        this->data = NULL;
+    }
+}
+
 class UIPopupMenu : public UIWidget {
+	friend class UIPulldownMenu; // so that m_submenuptr, m_submenu and m_parentMenu can be accessed
 protected:
 	Container<uipopup_describe *> *m_describe;
 	int m_selected;
@@ -87,6 +108,7 @@ protected:
 
 public:
 	UIPopupMenu();
+	~UIPopupMenu();
 
 	void				Create( Container<uipopup_describe*> *describe, Listener *listener, const UIPoint2D& where );
 	void				Create( Container<uipopup_describe*> *describe, Listener *listener, const UIRect2D& createRect, uipopup_where where, qboolean bVirtualSize, float width );
@@ -109,5 +131,4 @@ public:
 	void				getPulldown( str title );
 };
 
-#endif
-
+uipopup_type UI_PopupTypeStringToInt(str type);
diff --git a/code/uilib/uipulldownmenu.cpp b/code/uilib/uipulldownmenu.cpp
index d5188f94..9f2e4fb0 100644
--- a/code/uilib/uipulldownmenu.cpp
+++ b/code/uilib/uipulldownmenu.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,16 +20,86 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
+#include "../qcommon/localization.h"
 #include "ui_local.h"
 
+Event EV_Pulldown_ChildKilled
+(
+	"_ev_pulldown_child_killed",
+	EV_DEFAULT,
+	NULL,
+	NULL,
+	"Signaled when the sub menu is killed for one reason or another"
+);
+
+Event EV_Pulldown_HighlightBGColor
+(
+	"highlight_bgcolor",
+	EV_DEFAULT,
+	"fff",
+	"r g b",
+	"Set the background color of the highlighted text when a pulldown is used"
+);
+
+Event EV_Pulldown_HighlightFGColor
+(
+	"highlight_fgcolor",
+	EV_DEFAULT,
+	"fff",
+	"r g b",
+	"Set the foreground color of the highlighted text when a pulldown is used"
+);
+
 CLASS_DECLARATION( UIWidget, UIPulldownMenu, NULL )
 {
+	{ &W_LeftMouseDown,					&UIPulldownMenu::MousePressed		},
+	{ &W_LeftMouseUp,					&UIPulldownMenu::MouseReleased		},
+	{ &W_LeftMouseDragged,				&UIPulldownMenu::MouseDragged		},
+	{ &EV_Pulldown_ChildKilled,			&UIPulldownMenu::ChildKilled		},
+	{ &EV_Pulldown_HighlightBGColor,	&UIPulldownMenu::HighlightBGColor	},
+	{ &EV_Pulldown_HighlightFGColor,	&UIPulldownMenu::HighlightFGColor	},
 	{ NULL, NULL }
 };
 
+static UIPopupMenu* MenuFromPoint(UIPoint2D& p)
+{
+	UIWidget *res = uWinMan.FindResponder(p);
+	if (res && res->isSubclassOf(UIPopupMenu))
+	{
+		return (UIPopupMenu*)res;
+	}
+
+	return NULL;
+}
+
 UIPulldownMenu::UIPulldownMenu()
 {
-	// FIXME: stub
+	m_listener = NULL;
+	m_submenu = -1;
+	m_highlightBGColor.r = 0.02f;
+	m_highlightBGColor.g = 0.07f;
+	m_highlightBGColor.b = 0.005f;
+	m_highlightBGColor.a = 1.0f;
+	m_highlightFGColor = (UColor)UHudColor;
+
+	// uninitialized in original game
+	m_submenuptr = NULL;
+
+	// Added in OPM
+	//  This is so the window manager knows it can be activated
+	//  and appropriately handle this as the first responder
+	m_canactivate = true;
+}
+
+UIPulldownMenu::~UIPulldownMenu()
+{
+	for (int i = m_desc.NumObjects(); i > 0; i--)
+	{
+		uipull_describe* updb = m_desc.ObjectAt(i);
+		// FIXME: possible OG bug, memory leak? updb->desc is not cleared
+		m_desc.RemoveObjectAt(i);
+		delete updb;
+	}
 }
 
 UIRect2D UIPulldownMenu::getAlignmentRect
@@ -38,8 +108,38 @@ UIRect2D UIPulldownMenu::getAlignmentRect
 	)
 
 {
-	// FIXME: stub
-	return UIRect2D();
+	if (!parent)
+	{
+		parent = (m_parent == NULL) ? &uWinMan : m_parent;
+	}
+
+	UIRect2D parentRect = parent->getClientFrame();
+	if (m_bVirtual)
+	{
+		m_vVirtualScale[0] = (float)uid.vidWidth / SCREEN_WIDTH;
+		m_vVirtualScale[1] = (float)uid.vidHeight / SCREEN_HEIGHT;
+	}
+
+	int maxheight = m_font->getHeight(m_bVirtual ? m_vVirtualScale : NULL);
+	for (int i = 1; i <= m_desc.NumObjects(); i++)
+	{
+		uipull_describe *uipd = m_desc.ObjectAt(i);
+		if (uipd && uipd->material)
+		{
+			int h = uii.Rend_GetShaderHeight(uipd->material->GetMaterial());
+			if (h > maxheight)
+			{
+				maxheight = h;
+			}
+		}
+	}
+
+	return UIRect2D(
+		parentRect.pos.x,
+		parentRect.pos.y,
+		parentRect.size.width,
+		(maxheight + 4) * m_vVirtualScale[1]
+	);
 }
 
 float UIPulldownMenu::getDescWidth
@@ -48,8 +148,13 @@ float UIPulldownMenu::getDescWidth
 	)
 
 {
-	// FIXME: stub
-	return 0.0f;
+	UIReggedMaterial* mat = desc->material;
+	if (mat)
+	{
+		return uii.Rend_GetShaderWidth(mat->GetMaterial());
+	}
+
+	return m_font->getWidth(desc->title, -1) + 8.0f;
 }
 
 float UIPulldownMenu::getDescHeight
@@ -58,8 +163,13 @@ float UIPulldownMenu::getDescHeight
 	)
 
 {
-	// FIXME: stub
-	return 0.0f;
+	UIReggedMaterial* mat = desc->material;
+	if (mat)
+	{
+		return uii.Rend_GetShaderHeight(mat->GetMaterial());
+	}
+
+	return m_font->getHeight(m_bVirtual ? m_vVirtualScale : NULL);
 }
 
 uipull_describe *UIPulldownMenu::getPulldown
@@ -68,7 +178,15 @@ uipull_describe *UIPulldownMenu::getPulldown
 	)
 
 {
-	// FIXME: stub
+	for (int i = 1; i <= m_desc.NumObjects(); i++)
+	{
+		uipull_describe *pd = m_desc.ObjectAt(i);
+		if (pd->title == title)
+		{
+			return pd;
+		}
+	}
+
 	return NULL;
 }
 
@@ -78,7 +196,10 @@ void UIPulldownMenu::HighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightBGColor.r = ev->GetFloat(1);
+	m_highlightBGColor.g = ev->GetFloat(2);
+	m_highlightBGColor.b = ev->GetFloat(3);
+	m_highlightBGColor.a = 1.0f;
 }
 
 void UIPulldownMenu::HighlightFGColor
@@ -87,7 +208,10 @@ void UIPulldownMenu::HighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightFGColor.r = ev->GetFloat(1);
+	m_highlightFGColor.g = ev->GetFloat(2);
+	m_highlightFGColor.b = ev->GetFloat(3);
+	m_highlightFGColor.a = 1.0f;
 }
 
 
@@ -99,7 +223,8 @@ void UIPulldownMenu::Create
 	)
 
 {
-	// FIXME: stub
+	m_listener = listener;
+	InitFrame(parent, rect.pos.x, rect.pos.y, rect.size.width, rect.size.height, 0);
 }
 
 void UIPulldownMenu::CreateAligned
@@ -109,7 +234,9 @@ void UIPulldownMenu::CreateAligned
 	)
 
 {
-	// FIXME: stub
+	setFont("verdana-12");
+	UIRect2D rect = getAlignmentRect(parent);
+	Create(parent, listener, rect);
 }
 
 void UIPulldownMenu::MousePressed
@@ -118,7 +245,8 @@ void UIPulldownMenu::MousePressed
 	)
 
 {
-	// FIXME: stub
+	uWinMan.setFirstResponder(this);
+	MouseDragged(ev);
 }
 
 void UIPulldownMenu::MouseDragged
@@ -127,7 +255,85 @@ void UIPulldownMenu::MouseDragged
 	)
 
 {
-	// FIXME: stub
+	int newSubMenu = -1;
+	UIRect2D subRect;
+	uipull_describe* subdesc = NULL;
+
+	UIPoint2D point = MouseEventToClientPoint(ev);
+	if (getClientFrame().contains(point))
+	{
+		float atx = m_vVirtualScale[0] * 2;
+		for (int i = 1; i <= m_desc.NumObjects(); i++)
+		{
+			uipull_describe *desc = m_desc.ObjectAt(i);
+			float width = getDescWidth(desc) * m_vVirtualScale[0];
+			if (atx <= point.x && atx + width > point.x)
+			{
+				newSubMenu = i;
+				subdesc = desc;
+				subRect.pos.x = atx;
+				subRect.pos.y = 0.0f;
+				subRect.size.width = width;
+				subRect.size.height = m_frame.size.height;
+				break;
+			}
+			atx += width;
+		}
+	}
+
+	if (newSubMenu == m_submenu || newSubMenu == -1)
+	{
+		if (m_submenu == -1)
+		{
+			return;
+		}
+
+		UIPoint2D cursorLocation(
+			point.x + m_screenframe.pos.x,
+			point.y + m_screenframe.pos.y
+		);
+
+		UIPopupMenu* menu = MenuFromPoint(cursorLocation);
+		if (!menu)
+		{
+			UIPopupMenu* submenu = m_submenuptr;
+			while (submenu->m_submenu != -1)
+			{
+				submenu = submenu->m_submenuptr;
+			}
+
+			submenu->MouseMoved(ev);
+		}
+		else
+		{
+			while (menu->m_parentMenu)
+			{
+				menu = menu->m_parentMenu;
+			}
+			if (menu == m_submenuptr)
+			{
+				menu->MouseMoved(ev);
+			}
+		}
+
+		return;
+	}
+
+	if (m_submenu != -1)
+	{
+		m_submenuptr->Disconnect(this, W_Destroyed);
+		if (m_submenuptr)
+		{
+			delete m_submenuptr;
+		}
+	}
+
+	m_submenu = newSubMenu;
+	m_submenuptr = new UIPopupMenu();
+	subRect.pos.x += m_screenframe.pos.x;
+	subRect.pos.y += m_screenframe.pos.y;
+	m_submenuptr->Create(&subdesc->desc, m_listener, subRect, UIP_WHERE_DOWN, m_bVirtual, -1.0f);
+	m_submenuptr->Connect(this, W_Destroyed, EV_Pulldown_ChildKilled);
 }
 
 void UIPulldownMenu::MouseReleased
@@ -136,7 +342,23 @@ void UIPulldownMenu::MouseReleased
 	)
 
 {
-	// FIXME: stub
+	if (uWinMan.getFirstResponder() == this)
+	{
+		uWinMan.setFirstResponder(NULL);
+		UIPoint2D point(ev->GetFloat(1), ev->GetFloat(2));
+		UIPopupMenu *menu = MenuFromPoint(point);
+		if (menu)
+		{
+			menu->MouseReleased(ev);
+		}
+	}
+
+	if (m_submenu != -1)
+	{
+		m_submenuptr->Disconnect(this, W_Destroyed);
+		delete m_submenuptr;
+		m_submenu = -1;
+	}
 }
 
 void UIPulldownMenu::ChildKilled
@@ -145,7 +367,15 @@ void UIPulldownMenu::ChildKilled
 	)
 
 {
-	// FIXME: stub
+	if (m_submenu != -1)
+	{
+		m_submenu = -1;
+	}
+
+	if (uWinMan.getFirstResponder() == this)
+	{
+		uWinMan.setFirstResponder(NULL);
+	}
 }
 
 void UIPulldownMenu::AddUIPopupDescribe
@@ -155,7 +385,19 @@ void UIPulldownMenu::AddUIPopupDescribe
 	)
 
 {
-	// FIXME: stub
+	if (!title)
+	{
+		return;
+	}
+
+	uipull_describe *pd = getPulldown(title);
+	if (!pd)
+	{
+		pd = new uipull_describe(title, NULL, NULL);
+		m_desc.AddObject(pd);
+	}
+
+	pd->desc.AddObject(d);
 }
 
 void UIPulldownMenu::setHighlightFGColor
@@ -164,7 +406,7 @@ void UIPulldownMenu::setHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightFGColor = c;
 }
 
 void UIPulldownMenu::setHighlightBGColor
@@ -173,7 +415,7 @@ void UIPulldownMenu::setHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	m_highlightBGColor = c;
 }
 
 void UIPulldownMenu::setPopupHighlightFGColor
@@ -183,7 +425,11 @@ void UIPulldownMenu::setPopupHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	uipull_describe* up = getPulldown(menu);
+	if (up)
+	{
+		up->highlightFGColor = c;
+	}
 }
 
 void UIPulldownMenu::setPopupHighlightBGColor
@@ -193,7 +439,11 @@ void UIPulldownMenu::setPopupHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	uipull_describe* up = getPulldown(menu);
+	if (up)
+	{
+		up->highlightBGColor = c;
+	}
 }
 
 void UIPulldownMenu::setPopupFGColor
@@ -203,7 +453,11 @@ void UIPulldownMenu::setPopupFGColor
 	)
 
 {
-	// FIXME: stub
+	uipull_describe* up = getPulldown(menu);
+	if (up)
+	{
+		up->FGColor = c;
+	}
 }
 
 void UIPulldownMenu::setPopupBGColor
@@ -213,7 +467,11 @@ void UIPulldownMenu::setPopupBGColor
 	)
 
 {
-	// FIXME: stub
+	uipull_describe* up = getPulldown(menu);
+	if (up)
+	{
+		up->BGColor = c;
+	}
 }
 
 void UIPulldownMenu::setPulldownShader
@@ -223,7 +481,20 @@ void UIPulldownMenu::setPulldownShader
 	)
 
 {
-	// FIXME: stub
+	if (!title)
+	{
+		return;
+	}
+
+	uipull_describe *pd = getPulldown(title);
+	if (!pd)
+	{
+		pd = new uipull_describe(title, NULL, NULL);
+		m_desc.AddObject(pd);
+	}
+
+	pd->material = mat;
+	Realign();
 }
 
 void UIPulldownMenu::setSelectedPulldownShader
@@ -233,7 +504,20 @@ void UIPulldownMenu::setSelectedPulldownShader
 	)
 
 {
-	// FIXME: stub
+	if (!title)
+	{
+		return;
+	}
+
+	uipull_describe *pd = getPulldown(title);
+	if (!pd)
+	{
+		pd = new uipull_describe(title, NULL, NULL);
+		m_desc.AddObject(pd);
+	}
+
+	pd->selected_material = mat;
+	Realign();
 }
 
 void UIPulldownMenu::Realign
@@ -242,7 +526,8 @@ void UIPulldownMenu::Realign
 	)
 
 {
-	// FIXME: stub
+	UIRect2D rect = getAlignmentRect(NULL);
+	setFrame(rect);
 }
 
 void UIPulldownMenu::Draw
@@ -251,5 +536,68 @@ void UIPulldownMenu::Draw
 	)
 
 {
-	// FIXME: stub
+	float atx = 0.0f;
+	for (int i = 1; i <= m_desc.NumObjects(); i++)
+	{
+		uipull_describe* desc = m_desc.ObjectAt(i);
+		float width = getDescWidth(desc) * m_vVirtualScale[0];
+		float height = getDescHeight(desc) * m_vVirtualScale[1];
+
+		// Set font color based on whether the current item is selected
+		if (m_submenu == i)
+		{
+			// Selected item
+			m_font->setColor(m_highlightFGColor);
+			if (desc->selected_material)
+			{
+				uii.Rend_DrawPicStretched(
+					atx,
+					0.0f,
+					width,
+					height,
+					0.0f,
+					0.0f,
+					1.0f,
+					1.0f,
+					desc->selected_material->GetMaterial()
+				);
+			}
+			else
+			{
+				DrawBox(atx, 0.0f, width, m_frame.size.height, m_highlightBGColor, 1.0f);
+			}
+		}
+		else
+		{
+			// Unselected item
+			m_font->setColor(m_foreground_color);
+		}
+
+		if (desc->material)
+		{
+			if (m_submenu != i)
+			{
+				uii.Rend_DrawPicStretched(
+					atx,
+					0.0f,
+					width,
+					height,
+					0.0f,
+					0.0f,
+					1.0f,
+					1.0f,
+					desc->material->GetMaterial()
+				);
+			}
+		}
+		else
+		{
+			const char *text = Sys_LV_CL_ConvertString(desc->title);
+			float text_xpos = m_vVirtualScale[0] * 4.0f + atx;
+			float text_ypos = m_vVirtualScale[1] * 2.0f;
+			m_font->Print(text_xpos, text_ypos, text, -1, m_bVirtual ? m_vVirtualScale : NULL);
+		}
+
+		atx += width;
+	}
 }
diff --git a/code/uilib/uipulldownmenu.h b/code/uilib/uipulldownmenu.h
index 17754bbb..c9cbbbd3 100644
--- a/code/uilib/uipulldownmenu.h
+++ b/code/uilib/uipulldownmenu.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPULLDOWNMENU_H__
-#define __UIPULLDOWNMENU_H__
+#pragma once
 
 class uipull_describe {
 public:
@@ -82,6 +81,7 @@ protected:
 
 public:
 	UIPulldownMenu();
+	~UIPulldownMenu();
 
 	void	Create( UIWidget *parent, Listener *listener, const UIRect2D& rect );
 	void	CreateAligned( UIWidget *parent, Listener *listener );
@@ -101,6 +101,3 @@ public:
 	void	Realign( void ) override;
 	void	Draw( void ) override;
 };
-
-#endif
-
diff --git a/code/uilib/uipulldownmenucontainer.cpp b/code/uilib/uipulldownmenucontainer.cpp
index 8adb2b83..4d105266 100644
--- a/code/uilib/uipulldownmenucontainer.cpp
+++ b/code/uilib/uipulldownmenucontainer.cpp
@@ -22,14 +22,140 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "ui_local.h"
 
+Event EV_UIPulldownMenuContainer_AddPopup
+(
+	"addpopup",
+	EV_DEFAULT,
+	"ssss",
+	"menuname title type string",
+	"Adds a popup to the list box.\n"
+	"menuname - the name of the menu to add this to\n"
+	"title - the string to display\n"
+	"type - type of item this is (command,cvar,event_name)\n"
+	"string - the data that corresponds to the correct type\n"
+);
+
+Event EV_UIPulldownMenuContainer_MenuShader
+(
+	"menushader",
+	EV_DEFAULT,
+	"ss",
+	"menuname shader",
+	"Adds a menu to the container and sets the shader.\n"
+	"menuname - the name of the menu to add this to\n"
+	"shader - the string to display"
+);
+
+Event EV_UIPulldownMenuContainer_SelectedMenuShader
+(
+	"selmenushader",
+	EV_DEFAULT,
+	"ss",
+	"menuname shader",
+	"Adds a menu to the container and sets the shader when it's selected.\n"
+	"menuname - the name of the menu to add this to\n"
+	"shader - the string to display"
+);
+
+Event EV_UIPulldownMenuContainer_PopupHighlightFGColor
+(
+	"popup_highlight_fgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the highlight background color of the popup menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
+Event EV_UIPulldownMenuContainer_HighlightBGColor
+(
+	"highlight_bgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the highlight foreground color of the pulldown menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
+Event EV_UIPulldownMenuContainer_HighlightFGColor
+(
+	"highlight_fgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the highlight background color of the pulldown menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
+Event EV_UIPulldownMenuContainer_PopupHighlightBGColor
+(
+	"popup_highlight_bgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the highlight foreground color of the popup menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
+Event EV_UIPulldownMenuContainer_PopupFGColor
+(
+	"popup_fgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the background color of the popup menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
+Event EV_UIPulldownMenuContainer_PopupBGColor
+(
+	"popup_bgcolor",
+	EV_DEFAULT,
+	"sffff",
+	"menu r g b a",
+	"Set the foreground color of the popup menu\n"
+	"menu - the name of the popup menu to color\n"
+);
+
 CLASS_DECLARATION( UIWidget, UIPulldownMenuContainer, NULL )
 {
+	{ &EV_UIPulldownMenuContainer_AddPopup,					&UIPulldownMenuContainer::AddPopup					},
+	{ &EV_UIPulldownMenuContainer_MenuShader,				&UIPulldownMenuContainer::SetMenuShader				},
+	{ &EV_UIPulldownMenuContainer_SelectedMenuShader,		&UIPulldownMenuContainer::SetSelectedMenuShader		},
+	{ &EV_UIPulldownMenuContainer_PopupHighlightFGColor,	&UIPulldownMenuContainer::SetPopupHighlightFGColor	},
+	{ &EV_UIPulldownMenuContainer_PopupHighlightBGColor,	&UIPulldownMenuContainer::SetPopupHighlightBGColor	},
+	{ &EV_UIPulldownMenuContainer_PopupFGColor,				&UIPulldownMenuContainer::SetPopupFGColor			},
+	{ &EV_UIPulldownMenuContainer_PopupBGColor,				&UIPulldownMenuContainer::SetPopupBGColor			},
+	{ &EV_UIPulldownMenuContainer_HighlightFGColor,			&UIPulldownMenuContainer::SetHighlightFGColor		},
+	{ &EV_UIPulldownMenuContainer_HighlightBGColor,			&UIPulldownMenuContainer::SetHighlightBGColor		},
+	{ &EV_Layout_VirtualRes,								&UIPulldownMenuContainer::PulldownVirtualRes		},
 	{ NULL, NULL }
 };
 
 UIPulldownMenuContainer::UIPulldownMenuContainer()
 {
-	// FIXME: stub
+	m_menu = new UIPulldownMenu();
+	m_menu->CreateAligned(this, this);
+}
+
+
+UIPulldownMenuContainer::~UIPulldownMenuContainer()
+{
+	for (int i = m_popups.NumObjects(); i > 0; i--)
+	{
+		uipopup_describe* uipd = m_popups.ObjectAt(i);
+		m_popups.RemoveObjectAt(i);
+		delete uipd;
+	}
+
+	for (int i = m_dataContainer.NumObjects(); i > 0; i--)
+	{
+		char* data = m_dataContainer.ObjectAt(i);
+		m_dataContainer.RemoveObjectAt(i);
+		delete data;
+	}
+
+	// FIXME: m_menu isn't deleted, possible memory leak!
 }
 
 void UIPulldownMenuContainer::FrameInitialized
@@ -38,7 +164,9 @@ void UIPulldownMenuContainer::FrameInitialized
 	)
 	
 {
-	// FIXME: stub
+	AllowActivate(qfalse);
+	m_menu->setBackgroundColor(m_background_color, qtrue);
+	m_menu->setForegroundColor(m_foreground_color);
 }
 
 void UIPulldownMenuContainer::setBackgroundAlpha
@@ -47,7 +175,8 @@ void UIPulldownMenuContainer::setBackgroundAlpha
 	)
 
 {
-	// FIXME: stub
+	m_alpha = f;
+	m_menu->setBackgroundAlpha(f);
 }
 
 void UIPulldownMenuContainer::setBackgroundColor
@@ -57,7 +186,8 @@ void UIPulldownMenuContainer::setBackgroundColor
 	)
 
 {
-	// FIXME: stub
+	UIWidget::setBackgroundColor(color, setbordercolor);
+	m_menu->setBackgroundColor(color, setbordercolor);
 }
 
 void UIPulldownMenuContainer::setForegroundColor
@@ -66,7 +196,8 @@ void UIPulldownMenuContainer::setForegroundColor
 	)
 
 {
-	// FIXME: stub
+	UIWidget::setForegroundColor(color);
+	m_menu->setForegroundColor(color);
 }
 
 void UIPulldownMenuContainer::SetPopupHighlightFGColor
@@ -75,7 +206,13 @@ void UIPulldownMenuContainer::SetPopupHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setPopupHighlightFGColor(menu, UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetPopupHighlightBGColor
@@ -84,7 +221,13 @@ void UIPulldownMenuContainer::SetPopupHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setPopupHighlightBGColor(menu, UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetPopupFGColor
@@ -93,7 +236,13 @@ void UIPulldownMenuContainer::SetPopupFGColor
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setPopupFGColor(menu, UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetPopupBGColor
@@ -102,7 +251,13 @@ void UIPulldownMenuContainer::SetPopupBGColor
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setPopupBGColor(menu, UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetHighlightFGColor
@@ -111,7 +266,13 @@ void UIPulldownMenuContainer::SetHighlightFGColor
 	)
 
 {
-	// FIXME: stub
+	// original game goes 1-4 for some reason
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setHighlightFGColor(UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetHighlightBGColor
@@ -120,7 +281,13 @@ void UIPulldownMenuContainer::SetHighlightBGColor
 	)
 
 {
-	// FIXME: stub
+	// original game goes 1-4 for some reason
+	float r = ev->GetFloat(2);
+	float g = ev->GetFloat(3);
+	float b = ev->GetFloat(4);
+	float a = ev->GetFloat(5);
+
+	m_menu->setHighlightBGColor(UColor(r, g, b, a));
 }
 
 void UIPulldownMenuContainer::SetMenuShader
@@ -129,7 +296,10 @@ void UIPulldownMenuContainer::SetMenuShader
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	str shader = ev->GetString(2);
+	UIReggedMaterial *mat = uWinMan.RegisterShader(shader);
+	m_menu->setPulldownShader(menu, mat);
 }
 
 void UIPulldownMenuContainer::SetSelectedMenuShader
@@ -138,7 +308,10 @@ void UIPulldownMenuContainer::SetSelectedMenuShader
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	str shader = ev->GetString(2);
+	UIReggedMaterial *mat = uWinMan.RegisterShader(shader);
+	m_menu->setSelectedPulldownShader(menu, mat);
 }
 
 void UIPulldownMenuContainer::Realign
@@ -147,7 +320,8 @@ void UIPulldownMenuContainer::Realign
 	)
 
 {
-	// FIXME: stub
+	UIWidget::Realign();
+	m_menu->Realign();
 }
 
 void UIPulldownMenuContainer::PulldownVirtualRes
@@ -156,7 +330,14 @@ void UIPulldownMenuContainer::PulldownVirtualRes
 	)
 
 {
-	// FIXME: stub
+	LayoutVirtualRes(ev);
+
+	if (m_bVirtual)
+	{
+		Event *newEv = new Event(EV_Layout_VirtualRes);
+		newEv->AddInteger(1);
+		m_menu->ProcessEvent(newEv);
+	}
 }
 
 void UIPulldownMenuContainer::AddPopup
@@ -165,6 +346,22 @@ void UIPulldownMenuContainer::AddPopup
 	)
 
 {
-	// FIXME: stub
+	str menu = ev->GetString(1);
+	str title = ev->GetString(2);
+	str t = ev->GetString(3);
+	str d = ev->GetString(4);
+
+	uipopup_type type = UI_PopupTypeStringToInt(t);
+
+	// Make sure to create a duplicate of the original string,
+	// otherwise `data` will point to junk when `d` is destroyed.
+	// This only seems to run for each popup menu during game startup,
+	// so it doesn't appear to leak memory continuously,
+	// but it's being cleaned up in uipopup_describe's dtor anyway.
+	void* data = strdup(d);
+
+	uipopup_describe* uipd = new uipopup_describe(title, type, data, NULL);
+	m_popups.AddObject(uipd);
+	m_menu->AddUIPopupDescribe(menu, uipd);
 }
 
diff --git a/code/uilib/uipulldownmenucontainer.h b/code/uilib/uipulldownmenucontainer.h
index c04bbf5e..291a1b93 100644
--- a/code/uilib/uipulldownmenucontainer.h
+++ b/code/uilib/uipulldownmenucontainer.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIPULLDOWNMENUCONTAINER_H__
-#define __UIPULLDOWNMENUCONTAINER_H__
+#pragma once
 
 class UIPulldownMenuContainer : public UIWidget {
 protected:
@@ -33,6 +32,7 @@ public:
 	CLASS_PROTOTYPE( UIPulldownMenuContainer );
 
 	UIPulldownMenuContainer();
+	~UIPulldownMenuContainer();
 
 protected:
 	void	FrameInitialized( void ) override;
@@ -53,6 +53,3 @@ protected:
 public:
 	void	AddPopup( Event *ev );
 };
-
-#endif
-
diff --git a/code/uilib/uisize2d.h b/code/uilib/uisize2d.h
index 2140147c..4f114e20 100644
--- a/code/uilib/uisize2d.h
+++ b/code/uilib/uisize2d.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISIZE2D_H__
-#define __UISIZE2D_H__
+#pragma once
 
 class UISize2D {
 public:
@@ -65,5 +64,3 @@ bool UISize2D::operator!=( const UISize2D& pos ) const
 {
 	return ( width != pos.width || height != pos.height );
 }
-
-#endif /* __UISIZE2D_H__ */
diff --git a/code/uilib/uislider.cpp b/code/uilib/uislider.cpp
index b9d54f43..b2403e78 100644
--- a/code/uilib/uislider.cpp
+++ b/code/uilib/uislider.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2023 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -21,15 +21,128 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "ui_local.h"
+#include <string.h>
+
+Event EV_AutoIncrement
+(
+	"autoinc",
+	EV_DEFAULT,
+	NULL,
+	NULL,
+	"Used to auto increment the slider"
+);
+
+Event EV_AutoDecrement
+(
+	"autodec",
+	EV_DEFAULT,
+	NULL,
+	NULL,
+	"Used to auto decrement the slider"
+);
+
+Event EV_Layout_Range
+(
+	"setrange",
+	EV_DEFAULT,
+	"ff",
+	"min max",
+	"Used to set the range of a slider"
+);
+
+Event EV_Layout_SliderType
+(
+	"slidertype",
+	EV_DEFAULT,
+	"s",
+	"sliderType(float|integer)",
+	"Set the slider type to be floating point or integral"
+);
+
+Event EV_Layout_SliderStep
+(
+	"stepsize",
+	EV_DEFAULT,
+	"f",
+	"stepsize",
+	"Set the step size of the slider"
+);
+
+Event EV_Layout_SliderThumbShader
+(
+	"thumbshader",
+	EV_DEFAULT,
+	"sS",
+	"shader depressed_shader",
+	"Set the shader of the slider's thumb"
+);
+
+Event EV_Layout_SliderLeftShader
+(
+	"leftshader",
+	EV_DEFAULT,
+	"sS",
+	"shader depressed_shader",
+	"Set the shader of the slider's left arrow"
+);
+
+Event EV_Layout_SliderRightShader
+(
+	"rightshader",
+	EV_DEFAULT,
+	"sS",
+	"shader depressed_shader",
+	"Set the shader of the slider's right arrow"
+);
 
 CLASS_DECLARATION( UIWidget, UISlider, NULL )
 {
-	{ NULL, NULL }
+	{&W_LeftMouseDown,				&UISlider::Pressed		    		},
+	{&W_LeftMouseDragged,			&UISlider::MouseDragged	    		},
+	{&W_LeftMouseUp,				&UISlider::Released		    		},
+	{&W_MouseExited,				&UISlider::MouseExited	    		},
+	{&W_MouseEntered,				&UISlider::MouseEntered	    		},
+	{&EV_AutoIncrement,				&UISlider::AutoIncrement    		},
+	{&EV_AutoDecrement,				&UISlider::AutoDecrement    		},
+	{&EV_Layout_Range,				&UISlider::LayoutSetRange			},
+	{&EV_Layout_SliderType,			&UISlider::LayoutSetType    		},
+	{&EV_Layout_SliderStep,			&UISlider::LayoutSetStep    		},
+	// possible FAKK2 remnants below, not used currently
+	{&EV_Layout_SliderThumbShader,	&UISlider::LayoutSliderThumbShader	},
+	{&EV_Layout_SliderLeftShader,	&UISlider::LayoutSliderLeftShader	},
+	{&EV_Layout_SliderRightShader,	&UISlider::LayoutSliderRightShader	},
+	{NULL,							NULL								}
 };
 
 UISlider::UISlider()
 {
-	// FIXME: stub
+	m_sliderregion = {};
+	m_prev_arrow_region = {};
+	m_next_arrow_region = {};
+	m_minvalue = 0.0f;
+	m_maxvalue = 100.0f;
+	m_value = 0.0f;
+	m_oldvalue = 0.0f;
+	m_sliderwidth = 10.0f;
+	m_stepsize = 1.0f;
+	m_slidertype = SLIDER_INTEGER;
+	m_arrow_width = 15;
+	m_prev_arrow_depressed = qfalse;
+	m_next_arrow_depressed = qfalse;
+	m_thumb_depressed = qfalse;
+	m_initialized = qfalse;
+
+	m_prev_arrow_material = uWinMan.RegisterShader("textures/menu/arrow_left");
+	m_prev_arrow_material_pressed = uWinMan.RegisterShader("textures/menu/arrow_left_sel");
+	m_next_arrow_material = uWinMan.RegisterShader("textures/menu/arrow_right");
+	m_next_arrow_material_pressed = uWinMan.RegisterShader("textures/menu/arrow_right_sel");
+	m_thumbmaterial = uWinMan.RegisterShader("textures/menu/slider_thumb");
+	m_thumbmaterial_pressed = uWinMan.RegisterShader("textures/menu/slider_thumb_sel");
+
+	// these are not initialized in the original game
+	m_bar_material = NULL; // seems to be unused
+	m_maxx = 0;
+	m_minx = 0;
 }
 
 void UISlider::setThumb
@@ -38,7 +151,7 @@ void UISlider::setThumb
 	)
 
 {
-	// FIXME: stub
+	// not present in disassembly
 }
 
 void UISlider::Pressed
@@ -47,7 +160,47 @@ void UISlider::Pressed
 	)
 
 {
-	// FIXME: stub
+	float xpos = ev->GetFloat(1);
+	float ypos = ev->GetFloat(2);
+
+	if (m_prev_arrow_region.contains(xpos, ypos)) // click left arrow
+	{
+		Decrement();
+		m_prev_arrow_depressed = qtrue;
+		CancelEventsOfType(&EV_AutoDecrement);
+		Event* newEv = new Event(EV_AutoDecrement);
+		PostEvent(newEv, 0.2f);
+		return;
+	}
+	else if (m_next_arrow_region.contains(xpos, ypos)) // click right arrow
+	{
+		Increment();
+		m_next_arrow_depressed = qtrue;
+		CancelEventsOfType(&EV_AutoIncrement);
+		Event* newEv = new Event(EV_AutoIncrement);
+		PostEvent(newEv, 0.2f);
+		return;
+	}
+
+	// click thumb
+	m_oldvalue = m_value;
+	m_thumb_depressed = qtrue;
+
+	if (xpos <= m_minx)
+	{
+		m_value = m_minvalue;
+	}
+	else if (xpos >= m_maxx)
+	{
+		m_value = m_maxvalue;
+	}
+	else
+	{
+		// calculate value based on thumb position
+		m_value = (xpos - m_minx) / (m_maxx - m_minx) * (m_maxvalue - m_minvalue) + m_minvalue;
+	}
+
+	UpdateData();
 }
 
 void UISlider::Released
@@ -56,7 +209,9 @@ void UISlider::Released
 	)
 
 {
-	// FIXME: stub
+	m_prev_arrow_depressed = qfalse;
+	m_next_arrow_depressed = qfalse;
+	m_thumb_depressed = qfalse;
 }
 
 void UISlider::Increment
@@ -65,7 +220,8 @@ void UISlider::Increment
 	)
 
 {
-	// FIXME: stub
+	m_value = Q_clamp_float(m_value + m_stepsize, m_minvalue, m_maxvalue);
+	UpdateData();
 }
 
 void UISlider::Decrement
@@ -74,7 +230,8 @@ void UISlider::Decrement
 	)
 
 {
-	// FIXME: stub
+	m_value = Q_clamp_float(m_value - m_stepsize, m_minvalue, m_maxvalue);
+	UpdateData();
 }
 
 void UISlider::AutoIncrement
@@ -83,7 +240,19 @@ void UISlider::AutoIncrement
 	)
 
 {
-	// FIXME: stub
+	if (m_next_arrow_depressed)
+	{
+		if (m_next_arrow_region.contains(uid.mouseX, uid.mouseY))
+		{
+			Increment();
+			Event *event = new Event(EV_AutoIncrement);
+			PostEvent(event, 0.1f);
+		}
+		else
+		{
+			Released(NULL);
+		}
+	}
 }
 
 void UISlider::AutoDecrement
@@ -92,7 +261,19 @@ void UISlider::AutoDecrement
 	)
 
 {
-	// FIXME: stub
+	if (m_prev_arrow_depressed)
+	{
+		if (m_prev_arrow_region.contains(uid.mouseX, uid.mouseY))
+		{
+			Decrement();
+			Event *event = new Event(EV_AutoDecrement);
+			PostEvent(event, 0.1f);
+		}
+		else
+		{
+			Released(NULL);
+		}
+	}
 }
 
 void UISlider::MouseExited
@@ -101,7 +282,15 @@ void UISlider::MouseExited
 	)
 
 {
-	// FIXME: stub
+	if (m_thumb_depressed)
+	{
+		m_value = m_oldvalue;
+		UpdateData();
+	}
+
+	m_thumb_depressed = qfalse;
+	m_prev_arrow_depressed = qfalse;
+	m_next_arrow_depressed = qfalse;
 }
 
 void UISlider::MouseDragged
@@ -110,7 +299,34 @@ void UISlider::MouseDragged
 	)
 
 {
-	// FIXME: stub
+	float xpos = ev->GetFloat(1);
+	float ypos = ev->GetFloat(2);
+
+	if (m_thumb_depressed)
+	{
+		if (xpos <= m_minx)
+		{
+			m_value = m_minvalue;
+		}
+		else if (xpos >= m_maxx)
+		{
+			m_value = m_maxvalue;
+		}
+		else
+		{
+			// calculate value based on position
+			m_value = (xpos - m_minx) / (m_maxx - m_minx) * (m_maxvalue - m_minvalue) + m_minvalue;
+		}
+
+		UpdateData();
+		return;
+	}
+
+	if ((!m_prev_arrow_depressed && m_prev_arrow_region.contains(xpos, ypos))
+	 || (!m_next_arrow_depressed && m_next_arrow_region.contains(xpos, ypos)))
+	{
+		Pressed(ev);
+	}
 }
 
 void UISlider::MouseEntered
@@ -119,7 +335,12 @@ void UISlider::MouseEntered
 	)
 
 {
-	// FIXME: stub
+	int buttons = ev->GetInteger(3);
+	uWinMan.ActivateControl(this);
+	if (buttons & 1) // left mouse button
+	{
+		Pressed(ev);
+	}
 }
 
 void UISlider::UpdateData
@@ -128,7 +349,35 @@ void UISlider::UpdateData
 	)
 
 {
-	// FIXME: stub
+	if (m_cvarname.length())
+	{
+		if (m_slidertype == SLIDER_INTEGER)
+		{
+			UI_SetCvarInt(m_cvarname, m_value);
+		}
+		else
+		{
+			UI_SetCvarFloat(m_cvarname, m_value);
+		}
+	}
+
+	if (m_command.length())
+	{
+		char text[32];
+		if (m_slidertype == SLIDER_INTEGER)
+		{
+			Q_snprintf(text, 32, "%d", (int)m_value);
+		}
+		else
+		{
+			Q_snprintf(text, 32, "%.3f", m_value);
+		}
+
+		m_command.append(' ');
+		m_command.append(text);
+		m_command.append('\n');
+		Cbuf_AddText(m_command);
+	}
 }
 
 void UISlider::UpdateUIElement
@@ -137,7 +386,7 @@ void UISlider::UpdateUIElement
 	)
 
 {
-	// FIXME: stub
+	m_value = UI_GetCvarFloat(m_cvarname, 0.0f);
 }
 
 void UISlider::LayoutSetRange
@@ -146,7 +395,9 @@ void UISlider::LayoutSetRange
 	)
 
 {
-	// FIXME: stub
+	float min = ev->GetFloat(1);
+	float max = ev->GetFloat(2);
+	setRange(min, max);
 }
 
 void UISlider::LayoutSetType
@@ -155,7 +406,15 @@ void UISlider::LayoutSetType
 	)
 
 {
-	// FIXME: stub
+	str type = ev->GetString(1);
+	if (!Q_stricmp(type, "float"))
+	{
+		setType(SLIDER_FLOAT);
+	}
+	else if (!Q_stricmp(type, "integer"))
+	{
+		setType(SLIDER_INTEGER);
+	}
 }
 
 void UISlider::LayoutSetStep
@@ -164,7 +423,7 @@ void UISlider::LayoutSetStep
 	)
 
 {
-	// FIXME: stub
+	m_stepsize = ev->GetFloat(1);
 }
 
 void UISlider::LayoutSliderBGShader
@@ -173,7 +432,7 @@ void UISlider::LayoutSliderBGShader
 	)
 
 {
-	// FIXME: stub
+	// not present in disassembly
 }
 
 void UISlider::LayoutSliderThumbShader
@@ -182,7 +441,21 @@ void UISlider::LayoutSliderThumbShader
 	)
 
 {
-	// FIXME: stub
+	str shader = ev->GetString(1);
+	m_thumbmaterial = uWinMan.RegisterShader(shader);
+
+	if (ev->NumArgs() <= 1)
+	{
+		m_thumbmaterial_pressed = m_thumbmaterial;
+	}
+	else
+	{
+		str pressedShader = ev->GetString(2);
+		m_thumbmaterial_pressed = uWinMan.RegisterShader(pressedShader);
+	}
+
+	m_sliderwidth = uii.Rend_GetShaderWidth(m_thumbmaterial->GetMaterial());
+	m_initialized = qfalse;
 }
 
 void UISlider::LayoutSliderLeftShader
@@ -191,7 +464,21 @@ void UISlider::LayoutSliderLeftShader
 	)
 
 {
-	// FIXME: stub
+	str shader = ev->GetString(1);
+	m_prev_arrow_material = uWinMan.RegisterShader(shader);
+
+	if (ev->NumArgs() <= 1)
+	{
+		m_prev_arrow_material_pressed = m_prev_arrow_material;
+	}
+	else
+	{
+		str pressedShader = ev->GetString(2);
+		m_prev_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
+	}
+
+	m_arrow_width = uii.Rend_GetShaderWidth(m_prev_arrow_material->GetMaterial());
+	m_initialized = qfalse;
 }
 
 void UISlider::LayoutSliderRightShader
@@ -200,7 +487,21 @@ void UISlider::LayoutSliderRightShader
 	)
 
 {
-	// FIXME: stub
+	str shader = ev->GetString(1);
+	m_next_arrow_material = uWinMan.RegisterShader(shader);
+
+	if (ev->NumArgs() <= 1)
+	{
+		m_next_arrow_material_pressed = m_next_arrow_material;
+	}
+	else
+	{
+		str pressedShader = ev->GetString(2);
+		m_next_arrow_material_pressed = uWinMan.RegisterShader(pressedShader);
+	}
+
+	m_arrow_width = uii.Rend_GetShaderWidth(m_next_arrow_material->GetMaterial());
+	m_initialized = qfalse;
 }
 
 void UISlider::FrameInitialized
@@ -209,7 +510,35 @@ void UISlider::FrameInitialized
 	)
 
 {
-	// FIXME: stub
+	float cframeX = m_clippedframe.pos.x;
+	float cframeY = m_clippedframe.pos.y;
+	float cframeWidth = m_clippedframe.size.width;
+	float frameHeight = m_frame.size.height;
+	float scaledArrowWidth = m_arrow_width * m_vVirtualScale[0];
+	float scaledThumbWidth = m_sliderwidth * m_vVirtualScale[0];
+
+	m_prev_arrow_region.pos.x = cframeX;
+	m_prev_arrow_region.pos.y = cframeY;
+	m_prev_arrow_region.size.height = frameHeight;
+	m_prev_arrow_region.size.width = scaledArrowWidth;
+
+	m_next_arrow_region.pos.x = cframeX + cframeWidth - scaledArrowWidth;
+	m_next_arrow_region.pos.y = cframeY;
+	m_next_arrow_region.size.height = frameHeight;
+	m_next_arrow_region.size.width = scaledArrowWidth;
+
+	m_sliderregion.pos.x = cframeX + scaledArrowWidth;
+	m_sliderregion.pos.y = cframeY;
+	m_sliderregion.size.height = frameHeight;
+	// Bug in original game, width calculation was wrong:
+	//m_sliderregion.size.width = scaledThumbWidth - scaledArrowWidth;
+	m_sliderregion.size.width = cframeWidth - scaledArrowWidth * 2;
+
+	// width of the "dead zone" of the slider where the thumb cannot reach
+	float unreachableEdgeWidth = scaledArrowWidth + scaledThumbWidth * 0.5f;
+
+	m_minx = cframeX + unreachableEdgeWidth;
+	m_maxx = cframeX + m_frame.size.width - unreachableEdgeWidth;
 }
 
 void UISlider::Draw
@@ -218,7 +547,103 @@ void UISlider::Draw
 	)
 
 {
-	// FIXME: stub
+	if (!m_initialized)
+	{
+		m_initialized = qtrue;
+		FrameInitialized();
+	}
+
+	UpdateUIElement();
+
+	// current horizontal position of the thumb
+	float sliderpos = (m_value - m_minvalue) / (m_maxvalue - m_minvalue);
+	sliderpos = Q_clamp_float(sliderpos, 0.0f, 1.0f);
+	float scaledArrowWidth = m_arrow_width * m_vVirtualScale[0];
+	float scaledThumbWidth = m_sliderwidth * m_vVirtualScale[0];
+	float x = (m_maxx - m_minx) * sliderpos + scaledArrowWidth;
+
+	// draw the thumb
+	if (m_thumbmaterial)
+	{
+		UIReggedMaterial* material = m_thumb_depressed ? m_thumbmaterial_pressed : m_thumbmaterial;
+		uii.Rend_DrawPicStretched(x, 0.0f, scaledThumbWidth, m_frame.size.height, 0.0f, 0.0f, 1.0f, 1.0f, material->GetMaterial());
+	}
+	else
+	{
+		Draw3DBox(x, 0.0f, scaledThumbWidth, m_frame.size.height, qfalse, m_border_color, m_local_alpha);
+	}
+
+	if (m_prev_arrow_material == m_prev_arrow_material_pressed)
+	{
+		Draw3DBox(0.0f, 0.0f, scaledArrowWidth, m_frame.size.height, m_prev_arrow_depressed, m_border_color, m_local_alpha);
+
+		uii.Rend_DrawPicStretched(
+			2.0f,
+			2.0f,
+			scaledArrowWidth - 4.0f,
+			m_frame.size.height - 4.0f,
+			0.0f,
+			0.0f,
+			1.0f,
+			1.0f,
+			m_prev_arrow_material->GetMaterial()
+		);
+	}
+	else
+	{
+		uihandle_t material;
+		if (m_prev_arrow_depressed)
+		{
+			material = m_prev_arrow_material_pressed->GetMaterial();
+		}
+		else
+		{
+			material = m_prev_arrow_material->GetMaterial();
+		}
+
+		uii.Rend_DrawPicStretched(0.0f, 0.0f, scaledArrowWidth, m_frame.size.height, 0.0f, 0.0f, 1.0f, 1.0f, material);
+	}
+
+	if (m_next_arrow_material == m_next_arrow_material_pressed)
+	{
+		Draw3DBox(m_frame.size.width - scaledArrowWidth, 0.0f, scaledArrowWidth, m_frame.size.height, m_next_arrow_depressed, m_border_color, m_local_alpha);
+
+		uii.Rend_DrawPicStretched(
+			m_frame.size.width - scaledArrowWidth + 2.0f,
+			2.0f,
+			scaledArrowWidth - 4.0f,
+			m_frame.size.height - 4.0f,
+			0.0f,
+			0.0f,
+			1.0f,
+			1.0f,
+			m_next_arrow_material->GetMaterial()
+		);
+	}
+	else
+	{
+		uihandle_t material;
+		if (m_next_arrow_depressed)
+		{
+			material = m_next_arrow_material_pressed->GetMaterial();
+		}
+		else
+		{
+			material = m_next_arrow_material->GetMaterial();
+		}
+
+		uii.Rend_DrawPicStretched(
+			m_frame.size.width - scaledArrowWidth,
+			0.0f,
+			scaledArrowWidth,
+			m_frame.size.height,
+			0.0f,
+			0.0f,
+			1.0f,
+			1.0f,
+			material
+		);
+	}
 }
 
 void UISlider::setType
@@ -227,7 +652,7 @@ void UISlider::setType
 	)
 
 {
-	// FIXME: stub
+	m_slidertype = type;
 }
 
 qboolean UISlider::KeyEvent
@@ -237,8 +662,20 @@ qboolean UISlider::KeyEvent
 	)
 
 {
-	// FIXME: stub
-	return qfalse;
+	if (key == K_RIGHTARROW)
+	{
+		Increment();
+	}
+	else if (key == K_LEFTARROW)
+	{
+		Decrement();
+	}
+	else
+	{
+		return qfalse;
+	}
+
+	return qtrue;
 }
 
 void UISlider::setRange
@@ -248,7 +685,8 @@ void UISlider::setRange
 	)
 
 {
-	// FIXME: stub
+	m_minvalue = min;
+	m_maxvalue = max;
 }
 
 void UISlider::setStep
@@ -257,6 +695,6 @@ void UISlider::setStep
 	)
 
 {
-	// FIXME: stub
+	m_stepsize = value;
 }
 
diff --git a/code/uilib/uislider.h b/code/uilib/uislider.h
index eab63c37..0808dea9 100644
--- a/code/uilib/uislider.h
+++ b/code/uilib/uislider.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISLIDER_H__
-#define __UISLIDER_H__
+#pragma once
 
 typedef enum { SLIDER_FLOAT, SLIDER_INTEGER } slidertype_t;
 
@@ -34,7 +33,7 @@ class UISlider : public UIWidget {
 	int m_arrow_width;
 	float m_value;
 	float m_oldvalue;
-	float m_sliderwidth;
+	float m_sliderwidth; // Note: this is actually the width of only the thumb, not the whole slider
 	UIRect2D m_sliderregion;
 	UIRect2D m_prev_arrow_region;
 	UIRect2D m_next_arrow_region;
@@ -63,10 +62,8 @@ private:
 	void	AutoIncrement( Event *ev );
 	void	AutoDecrement( Event *ev );
 	void	MouseExited( Event *ev );
-	void	MouseDragged( Event *ev );
 	void	MouseEntered( Event *ev );
-	void	UpdateData( void ) override;
-	void	UpdateUIElement() override;
+	void	MouseDragged( Event *ev );
 	void	LayoutSetRange( Event *ev );
 	void	LayoutSetType( Event *ev );
 	void	LayoutSetStep( Event *ev );
@@ -78,13 +75,12 @@ private:
 public:
 	UISlider();
 
-	void		FrameInitialized( void ) override;
 	void		Draw( void ) override;
-	void		setType( slidertype_t type );
+	void		FrameInitialized( void ) override;
 	qboolean	KeyEvent( int key, unsigned int time ) override;
+	void		UpdateData( void ) override;
+	void		UpdateUIElement( void ) override;
+	void		setType( slidertype_t type );
 	void		setRange( float min, float max );
 	void		setStep( float value );
 };
-
-#endif
-
diff --git a/code/uilib/uistatus.cpp b/code/uilib/uistatus.cpp
index 92dd1238..0487db8c 100644
--- a/code/uilib/uistatus.cpp
+++ b/code/uilib/uistatus.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -35,6 +35,10 @@ UIWindowSizer::UIWindowSizer()
 {
 	m_draggingwidget = NULL;
 	m_mouseState = M_NONE;
+
+	// Added in OPM
+	//  So this can be made as the first responder
+	m_canactivate = true;
 }
 
 
@@ -51,10 +55,10 @@ void UIWindowSizer::Draw
 
 {
 	m_font->setColor(UWhite);
-	m_font->Print(0, 0, "o", -1, m_bVirtual);
+	m_font->Print(0, 0, "o", -1, getVirtualScale());
 
 	m_font->setColor(UBlack);
-	m_font->Print(0, 0, "p", -1, m_bVirtual);
+	m_font->Print(0, 0, "p", -1, getVirtualScale());
 }
 
 void UIWindowSizer::FrameInitialized
@@ -161,7 +165,10 @@ UIStatusBar::UIStatusBar
 	alignment_t align,
 	float height
 	)
-	: UIStatusBar()
+	: UIStatusBar() // Fixed in OPM:
+					// original builds didn't call this ctor,
+					// so statusbar text got center-justified due to
+					// m_iFontAlignmentHorizontal defaulting to FONT_JUSTHORZ_CENTER (0)
 
 {
 	AlignBar(align, height);
@@ -199,7 +206,7 @@ void UIStatusBar::Draw
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(m_title.c_str()),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 
 	if (m_sizer)
@@ -264,16 +271,13 @@ void UIStatusBar::SelfSized
 {
 	if (m_sizeenabled)
 	{
-		if (m_sizer) {
-			if (m_sizer->getDraggingWidget() != m_sizeenabled) {
-				m_sizer->setDraggingWidget(m_sizeenabled);
-			}
-		}
-		else {
-			m_sizer = new UIWindowSizer(m_sizeenabled);
-			m_sizer->InitFrame(this, 0, 0, 16.0, 16.0, 0);
-		}
-
+        if (!m_sizer) {
+            m_sizer = new UIWindowSizer(m_sizeenabled);
+            m_sizer->InitFrame(this, 0, 0, 16.0 * getHighResScale()[0], 16.0 * getHighResScale()[1], 0);
+			
+		} else if (m_sizer->getDraggingWidget() != m_sizeenabled) {
+            m_sizer->setDraggingWidget(m_sizeenabled);
+        }
 
 		UISize2D sizerFrame = m_sizer->getSize();
 
diff --git a/code/uilib/uistatus.h b/code/uilib/uistatus.h
index bc6b74be..706ae8ec 100644
--- a/code/uilib/uistatus.h
+++ b/code/uilib/uistatus.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UISTATUS_H__
-#define __UISTATUS_H__
+#pragma once
 
 typedef enum { M_NONE, M_DRAGGING } mouseState_t;
 
@@ -79,6 +78,3 @@ public:
 	void				ParentSized( Event *ev );
 	void				SelfSized( Event *ev );
 };
-
-#endif
-
diff --git a/code/uilib/uivertscroll.cpp b/code/uilib/uivertscroll.cpp
index fb84485b..0c196b7b 100644
--- a/code/uilib/uivertscroll.cpp
+++ b/code/uilib/uivertscroll.cpp
@@ -74,7 +74,7 @@ int UIVertScroll::getItemFromHeight
 	)
 
 {
-	return (int)((height - 16.0) * (float)this->m_numitems / (m_frame.size.height - 32.0));
+	return (int)((height - 16.0 * uid.scaleRes[1]) * (float)this->m_numitems / (m_frame.size.height - 32.0 * uid.scaleRes[1]));
 }
 
 bool UIVertScroll::isEnoughItems
@@ -102,7 +102,7 @@ void UIVertScroll::Draw
 	);
 
 	DrawArrow(0.0, "5", m_pressed == VS_UP_ARROW);
-	DrawArrow(m_frame.size.height - m_vVirtualScale[1] * 16.0, "6", m_pressed == VS_DOWN_ARROW);
+	DrawArrow(m_frame.size.height - getVirtualScale()[1] * 16.0, "6", m_pressed == VS_DOWN_ARROW);
 
 	if (m_numitems > m_pageheight) {
 		DrawThumb();
@@ -123,7 +123,7 @@ void UIVertScroll::DrawArrow
 	arrowRect.pos.x = 0.0;
 	arrowRect.pos.y = top;
 	arrowRect.size.width = m_frame.size.width;
-	arrowRect.size.height = m_vVirtualScale[1] * 16.0;
+	arrowRect.size.height = getVirtualScale()[1] * 16.0;
 
 	innerColor = getBackgroundColor();
 	m_marlett.setColor(getForegroundColor());
@@ -150,7 +150,7 @@ void UIVertScroll::DrawArrow
 		m_iFontAlignmentHorizontal,
 		m_iFontAlignmentVertical,
 		Sys_LV_CL_ConvertString(text),
-		m_bVirtual ? m_vVirtualScale : NULL
+		getVirtualScale()
 	);
 }
 
@@ -164,10 +164,10 @@ void UIVertScroll::DrawThumb
 	float thumbHeight, thumbdiff;
 	UColor thumbInside;
 
-	thumbdiff = m_frame.size.height - m_vVirtualScale[1] * 32.0;
+	thumbdiff = m_frame.size.height - getVirtualScale()[1] * 32.0;
 
 	inbarrect.pos.x = 0.0;
-	inbarrect.pos.y = m_vVirtualScale[1] * 16.0;
+	inbarrect.pos.y = getVirtualScale()[1] * 16.0;
 	inbarrect.size.width = m_frame.size.width;
 	inbarrect.size.height = m_frame.size.height - thumbdiff;
 
@@ -344,7 +344,11 @@ void UIVertScroll::MouseEnter
 	)
 
 {
-	uWinMan.ActivateControl(this);
+	// Fixed in OPM
+	// Why should hovering over the scrollbar activate the control it's on?
+	// This is more disorienting than useful, also no sane window manager
+	// works like this. Simply clicking into it should be sufficient.
+	//uWinMan.ActivateControl(this);
 }
 
 void UIVertScroll::MouseLeave
@@ -433,7 +437,11 @@ void UIVertScroll::setTopItem
 	)
 
 {
-	m_topitem = i;
+	if (i >= 0) {
+		m_topitem = i;
+	} else {
+		m_topitem = 0;
+	}
 }
 
 int UIVertScroll::getTopItem
@@ -492,10 +500,10 @@ void UIVertScroll::InitFrameAlignRight
 	UIRect2D frame, frameOut;
 
 	frame = parent->getClientFrame();
-	frameOut.pos.x = frame.pos.x + frame.size.width - (fWidthPadding + 16.0) * m_vVirtualScale[0];
-	frameOut.pos.y = fHeightPadding * m_vVirtualScale[1];
-	frameOut.size.width = m_vVirtualScale[0] * 16.0;
-	frameOut.size.height = frame.size.height - (fHeightPadding * 2) * m_vVirtualScale[1];
+	frameOut.pos.x = frame.pos.x + frame.size.width - (fWidthPadding + 16.0) * getVirtualScale()[0];
+	frameOut.pos.y = fHeightPadding * getVirtualScale()[1];
+	frameOut.size.width = getVirtualScale()[0] * 16.0;
+	frameOut.size.height = frame.size.height - (fHeightPadding * 2) * getVirtualScale()[1];
 
 	if (!m_frameinitted)
 	{
@@ -506,3 +514,8 @@ void UIVertScroll::InitFrameAlignRight
 		setFrame(frameOut);
 	}
 }
+
+void UIVertScroll::FrameInitialized()
+{
+	UIWidget::FrameInitialized();
+}
diff --git a/code/uilib/uivertscroll.h b/code/uilib/uivertscroll.h
index 7efc2a04..dd245167 100644
--- a/code/uilib/uivertscroll.h
+++ b/code/uilib/uivertscroll.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIVERTSCROLL_H__
-#define __UIVERTSCROLL_H__
+#pragma once
 
 class unnamed_struct {
 public:
@@ -71,7 +70,6 @@ public:
 	void			setThumbColor( const UColor& thumb );
 	void			setSolidBorderColor( const UColor& col );
 	void			InitFrameAlignRight( UIWidget *parent, float fWidthPadding, float fHeightPadding );
+	void			FrameInitialized() override;
 };
 
-#endif
-
diff --git a/code/uilib/uiwidget.cpp b/code/uilib/uiwidget.cpp
index 57da7145..64cc2a17 100644
--- a/code/uilib/uiwidget.cpp
+++ b/code/uilib/uiwidget.cpp
@@ -428,6 +428,7 @@ Event EV_Layout_DontLocalize
 	"Disables localization for this widget"
 	);
 
+// Added in 2.0
 Event EV_Layout_FadeSequence
 	(
 	"fadesequence",
@@ -502,6 +503,11 @@ CLASS_DECLARATION( USignal, UIWidget, NULL )
 	{ &EV_Widget_Disable,				&UIWidget::DisableEvent },
 	{ &EV_Widget_EnabledCvar,			&UIWidget::SetEnabledCvar },
 	{ &EV_Widget_ScaleCvar,				&UIWidget::SetScaleCvar },
+
+	//
+	// Added in 2.0
+	//
+
 	{ &EV_Layout_DontLocalize,			&UIWidget::SetDontLocalize },
 	{ &EV_Layout_FadeSequence,			&UIWidget::EventFadeSequence },
 
@@ -601,6 +607,23 @@ void DrawBoxWithSolidBorder( const UIRect2D& rect, const UColor& inside, const U
 	}
 }
 
+static bool scaleFrameVirtualRes(UIRect2D& frame, vec3_t outScale, const vec3_t newScale)
+{
+	if (!VectorCompare2D(outScale, newScale))
+	{
+        frame.pos.x = frame.pos.x / outScale[0] * newScale[0];
+        frame.pos.y = frame.pos.y / outScale[1] * newScale[1];
+        frame.size.width = frame.size.width / outScale[0] * newScale[0];
+        frame.size.height = frame.size.height / outScale[1] * newScale[1];
+		outScale[0] = newScale[0];
+		outScale[1] = newScale[1];
+
+		return true;
+	}
+
+	return false;
+}
+
 UIReggedMaterial::UIReggedMaterial()
 {
 	hMat = 0;
@@ -610,6 +633,11 @@ UIReggedMaterial::UIReggedMaterial()
 
 uihandle_t UIReggedMaterial::GetMaterial()
 {
+	if ( !isGot )
+	{
+		isGot = true;
+		this->hMat = uii.Rend_RegisterMaterial(name.c_str());
+	}
 	return hMat;
 }
 
@@ -619,9 +647,7 @@ void UIReggedMaterial::ReregisterMaterial
 	)
 
 {
-	if( !isGot )
-	{
-		isGot = true;
+	if( isGot ) {
 		this->hMat = uii.Rend_RegisterMaterial( name.c_str() );
 	}
 }
@@ -650,9 +676,8 @@ void UIReggedMaterial::RefreshMaterial
 	)
 
 {
-	if( !isGot )
+	if( isGot )
 	{
-		isGot = true;
 		this->hMat = uii.Rend_RefreshMaterial( name.c_str() );
 	}
 }
@@ -668,7 +693,7 @@ str UIReggedMaterial::GetName
 
 UIWidget::UIWidget()
 {
-	VectorSet2D( m_vVirtualScale, 1.0f, 1.0f );
+	VectorSet2D( m_vVirtualScale, 1, 1 );
 	m_parent = NULL;
 	m_background_color.set( 0.075f, 0.097f, 0.139f, 1.0f );
 	m_foreground_color = UColor(UHudColor);
@@ -679,6 +704,7 @@ UIWidget::UIWidget()
 	m_visible = true;
 	m_enabled = true;
 	m_canactivate = false;
+	m_commandhandler = NULL;
 	m_font = NULL;
 	m_material = NULL;
 	m_hovermaterial = NULL;
@@ -700,8 +726,16 @@ UIWidget::UIWidget()
 	m_iFontAlignmentHorizontal = FONT_JUSTHORZ_CENTER;
 	m_iFontAlignmentVertical = FONT_JUSTVERT_CENTER;
 	m_bVirtual = false;
+	m_scaleCvar = NULL;
 	m_enabledCvar = "";
 
+	m_fadeSequenceDelay = 0;
+	m_fadeSequenceFadeIn = 0;
+	m_fadeSequenceHold = 0;
+	m_fadeSequenceFadeOut = 0;
+	m_fadeSequenceState = fadesequence_t::SEQUENCE_NONE;
+	m_fadeSequenceLastTime = 0;
+
 	UIRect2D frame( 6.0f, 6.0f, 100.0f, 13.0f );
 	setFrame( frame );
 }
@@ -712,16 +746,18 @@ UIWidget::~UIWidget()
 
 	m_dying = true;
 
-	if( IsActive() )
+	if( IsActive() ) {
 		uWinMan.DeactivateCurrentSmart();
+	}
 
 	//for( i = m_children.NumObjects(); i > 0; i-- ) {
 	//
 	//}
 
 	// remove this child from our parent
-	if( m_parent )
+	if( m_parent ) {
 		m_parent->removeChild( this );
+	}
 
 	// delete font
 	if (m_font)
@@ -891,9 +927,9 @@ void UIWidget::FrameInitialized
 	)
 
 {
-	if (m_fadeSequenceDelayStart || m_fadeSequenceFadeIn || m_fadeSequenceHold || m_fadeSequenceFadeOut) {
-		m_fadeSequenceDelayEnd = m_fadeSequenceDelayStart;
-		m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
+	if (m_fadeSequenceDelay || m_fadeSequenceFadeIn || m_fadeSequenceHold || m_fadeSequenceFadeOut) {
+		m_fadeSequenceRemainingTime = m_fadeSequenceDelay;
+		m_fadeSequenceState = fadesequence_t::SEQUENCE_STARTING;
 	}
 }
 
@@ -905,7 +941,7 @@ void UIWidget::DrawTitle
 
 {
 	m_font->setColor( m_foreground_color );
-	m_font->Print( x, y, Sys_LV_CL_ConvertString( m_title ), -1, m_bVirtual );
+	m_font->Print( x, y, Sys_LV_CL_ConvertString( m_title ), -1, getVirtualScale() );
 }
 
 void UIWidget::Motion
@@ -923,59 +959,54 @@ void UIWidget::Motion
 
 	if (m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE)
 	{
+		// Added in 2.0
+		//  Process fade sequence
 		if (!paused->integer) {
 			switch (m_fadeSequenceState)
 			{
 			case fadesequence_t::SEQUENCE_STARTING:
-				m_alpha = 0.f;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 0.0;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceFadeIn;
+					m_fadeSequenceRemainingTime = m_fadeSequenceFadeIn;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_FADEIN:
-				m_alpha = 1.f - m_fadeSequenceDelayEnd / m_fadeSequenceFadeIn;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 1.0 - m_fadeSequenceRemainingTime / m_fadeSequenceFadeIn;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_HOLD;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceHold;
+					m_fadeSequenceRemainingTime = m_fadeSequenceHold;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_HOLD:
-				m_alpha = 1.f;
-				m_fadeSequenceDelayEnd -= t - m_fadeSequenceAlpha;
-				if (m_fadeSequenceDelayEnd >= 0.f) {
-					m_fadeSequenceAlpha = t;
-				} else {
+				m_alpha = 1.0;
+
+				m_fadeSequenceRemainingTime -= t - m_fadeSequenceLastTime;
+				if (m_fadeSequenceRemainingTime < 0) {
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEOUT;
-					m_fadeSequenceAlpha = t;
-					m_fadeSequenceDelayEnd = m_fadeSequenceFadeOut;
+					m_fadeSequenceRemainingTime = m_fadeSequenceFadeOut;
 				}
 				break;
 			case fadesequence_t::SEQUENCE_FADEOUT:
-				m_alpha = m_fadeSequenceDelayEnd / m_fadeSequenceFadeOut;
-				m_fadeSequenceDelayEnd -= (t - m_fadeSequenceAlpha);
-                if (m_fadeSequenceDelayEnd >= 0.f) {
-                    m_fadeSequenceAlpha = t;
-				} else {
-					m_alpha = 0.f;
+				m_alpha = m_fadeSequenceRemainingTime / m_fadeSequenceFadeOut;
+
+				m_fadeSequenceRemainingTime -= (t - m_fadeSequenceLastTime);
+                if (m_fadeSequenceRemainingTime < 0) {
+					// Fade sequence has finished fading
+					m_alpha = 0;
 					m_fadeSequenceState = fadesequence_t::SEQUENCE_NONE;
-				}
+                }
 				break;
             default:
-                m_fadeSequenceAlpha = t;
 				break;
 			}
-		} else {
-			m_fadeSequenceAlpha = t;
 		}
+
+        m_fadeSequenceLastTime = t;
 	} else if( m_fadetime >= 0.0 ) {
 		frac = ( t - m_starttime ) / m_fadetime;
 
@@ -1094,16 +1125,17 @@ void UIWidget::AlignPosition
 
         SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+	}
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_flags & WF_STRETCH_VERTICAL)
 	{
@@ -1316,7 +1348,7 @@ void UIWidget::InitFrame
 		setParent( parentview );
 	}
 	else if( this != &uWinMan )
-	{
+    {
 		setParent( &uWinMan );
 	}
 
@@ -1955,11 +1987,23 @@ bool UIWidget::isEnabled
 	)
 
 {
-	if( !strcmp( m_enabledCvar, "" ) || UI_GetCvarInt( m_enabledCvar, 0 ) )
-	{
+	if (!strcmp(m_enabledCvar.c_str(), "")) {
 		return m_enabled;
 	}
 
+	if (m_enabledCvar[0] == '!') {
+		//
+		// Added in 2.30
+		//  True if the cvar is 0
+		if (m_enabled) {
+			return !UI_GetCvarInt(m_enabledCvar.c_str() + 1, 0);
+		}
+	} else {
+		if (m_enabled) {
+			return UI_GetCvarInt(m_enabledCvar.c_str(), 0) != 0;
+		}
+	}
+
 	return false;
 }
 
@@ -2403,80 +2447,80 @@ void UIWidget::Display
 {
 	int i;
 	int n;
-	vec4_t col;
+	vec4_t col = { 1, 1, 1, 1 };
 
-	VectorSet( col, 1, 1, 1 );
+	if ( !isEnabled() ) {
+		return;
+	}
 
-	if( !m_enabledCvar.length() || UI_GetCvarInt( m_enabledCvar, 0 ) )
+	if( !m_enabledCvar.length() && !IsVisible() ) {
+		return;
+	}
+
+	if (m_direction || m_fadetime || m_fadeSequenceState != fadesequence_t::SEQUENCE_NONE) {
+		Motion();
+	}
+
+	m_local_alpha = m_alpha * parent_alpha;
+	set2D();
+
+	col[ 3 ] = m_local_alpha;
+	uii.Rend_SetColor( col );
+
+	if( m_background_color.a != 0.0 )
 	{
-		if( !m_enabledCvar.length() && !IsVisible() )
-			return;
+		DrawBox( 0, 0, m_frame.size.width, m_frame.size.height, m_background_color, m_background_color.a * m_local_alpha );
+	}
 
-		if (m_direction || m_fadetime > 0.0) {
-			Motion();
-		}
+	if( m_borderStyle == border_outline )
+	{
+		DrawBoxWithSolidBorder( UIRect2D( 0, 0, m_frame.size.width, m_frame.size.height ), UWhite, m_border_color.original, 2, 2, m_local_alpha );
+	}
+	else if( m_borderStyle )
+	{
+		Draw3DBox( 0, 0, m_frame.size.width, m_frame.size.height, m_borderStyle == border_indent, m_border_color, m_local_alpha );
+	}
 
-		m_local_alpha = m_alpha * parent_alpha;
-		set2D();
-
-		col[ 3 ] = m_local_alpha;
+	if( m_material )
+	{
+		col[0] = m_foreground_color.r;
+		col[1] = m_foreground_color.g;
+		col[2] = m_foreground_color.b;
+		col[3] = m_foreground_color.a * m_local_alpha;
 		uii.Rend_SetColor( col );
 
-		if( m_background_color.a != 0.0 )
+		if( m_flags & WF_TILESHADER )
 		{
-			DrawBox( 0, 0, m_frame.size.width, m_frame.size.height, m_background_color, m_background_color.a * m_local_alpha );
-		}
-
-		if( m_borderStyle == border_outline )
-		{
-			DrawBoxWithSolidBorder( UIRect2D( 0, 0, m_frame.size.width, m_frame.size.height ), UWhite, m_border_color.original, 2, 2, m_local_alpha );
-		}
-		else if( m_borderStyle )
-		{
-			Draw3DBox( 0, 0, m_frame.size.width, m_frame.size.height, m_borderStyle == border_indent, m_border_color, m_local_alpha );
-		}
-
-		if( m_material )
-		{
-			uii.Rend_SetColor( m_foreground_color );
-
-			m_material->ReregisterMaterial();
-
-			if( m_flags & WF_TILESHADER )
-			{
-                if (m_bVirtual) {
-					float fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_material->GetMaterial());
-					float fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_material->GetMaterial());
-                    
-					uii.Rend_DrawPicStretched(0, 0, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_material->GetMaterial());
-				} else {
-					uii.Rend_DrawPicTiled(0, 0, m_frame.size.width, m_frame.size.height, m_material->GetMaterial());
-				}
-			}
-			else
-			{
-				uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_material->GetMaterial() );
+            if (m_bVirtual) {
+				float fvWidth = m_frame.size.width / m_vVirtualScale[0] / uii.Rend_GetShaderWidth(m_material->GetMaterial());
+				float fvHeight = m_frame.size.height / m_vVirtualScale[1] / uii.Rend_GetShaderHeight(m_material->GetMaterial());
+                   
+				uii.Rend_DrawPicStretched(0, 0, m_frame.size.width, m_frame.size.height, 0, 0, fvWidth, fvHeight, m_material->GetMaterial());
+			} else {
+				uii.Rend_DrawPicTiled(0, 0, m_frame.size.width, m_frame.size.height, m_material->GetMaterial());
 			}
 		}
-
-		if( m_pressedmaterial_active && m_pressedmaterial != NULL )
+		else
 		{
-			m_pressedmaterial->ReregisterMaterial();
-			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_pressedmaterial->GetMaterial() );
-		}
-		else if( m_hovermaterial_active && m_hovermaterial != NULL )
-		{
-			m_hovermaterial->ReregisterMaterial();
-			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_hovermaterial->GetMaterial() );
+			uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_material->GetMaterial() );
 		}
+	}
 
-		Draw();
+	if( m_pressedmaterial_active && m_pressedmaterial != NULL )
+	{
+		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_pressedmaterial->GetMaterial() );
+	}
+	else if( m_hovermaterial_active && m_hovermaterial != NULL )
+	{
+		uii.Rend_DrawPicStretched( 0, 0, m_frame.size.width, m_frame.size.height, 0, 0, 1, 1, m_hovermaterial->GetMaterial() );
+	}
 
-		n = m_children.NumObjects();
-		for( i = 1; i <= m_children.NumObjects(); i++ )
-		{
-			m_children.ObjectAt( i )->Display( m_frame, m_local_alpha );
-		}
+	Draw();
+
+	n = m_children.NumObjects();
+	for( i = 1; i <= m_children.NumObjects(); i++ )
+	{
+		m_children.ObjectAt( i )->Display( m_frame, m_local_alpha );
 	}
 }
 
@@ -2529,7 +2573,7 @@ float UIWidget::getTitleHeight
 	)
 
 {
-	return m_font->getHeight( m_bVirtual );
+	return m_font->getHeight(getVirtualScale());
 }
 
 bool UIWidget::CanActivate
@@ -2605,7 +2649,10 @@ void UIWidget::ExecuteShowCommands
 {
 	for( int i = 1; i <= m_showcommands.NumObjects(); i++ )
 	{
-		uii.Cmd_Stuff( m_showcommands.ObjectAt( i )->c_str() );
+		//uii.Cmd_Stuff( m_showcommands.ObjectAt( i )->c_str() );
+		// Fixed in 2.0
+		Event event(m_showcommands.ObjectAt(i)->c_str());
+		ProcessEvent(event);
 	}
 }
 
@@ -2617,7 +2664,10 @@ void UIWidget::ExecuteHideCommands
 {
 	for( int i = 1; i <= m_hidecommands.NumObjects(); i++ )
 	{
-		uii.Cmd_Stuff( m_hidecommands.ObjectAt( i )->c_str() );
+		//uii.Cmd_Stuff( m_hidecommands.ObjectAt( i )->c_str() );
+		// Fixed in 2.0
+		Event event(m_hidecommands.ObjectAt(i)->c_str());
+		ProcessEvent(event);
 	}
 }
 
@@ -2699,6 +2749,8 @@ void UIWidget::ResetMotion
 	}
 
 	m_starttime = uid.time / 1000.0;
+	// Added in 2.0
+	m_fadeSequenceLastTime = uid.time / 1000.0;
 }
 
 void UIWidget::Realign
@@ -2707,22 +2759,27 @@ void UIWidget::Realign
 	)
 
 {
+	bool bScaled = false;
+
 	if (m_bVirtual)
 	{
 		vec2_t vNewVirtualScale;
 
-		SetVirtualScale(vNewVirtualScale);
+        SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+		bScaled = true;
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+        bScaled = true;
+    }
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		bScaled = scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_flags & WF_STRETCH_VERTICAL)
 	{
@@ -2763,7 +2820,7 @@ void UIWidget::Realign
 		m_frame.pos.y = 0;
 	}
 
-	if ((m_align & WA_FULL) || (m_flags & (WF_STRETCH_HORIZONTAL | WF_STRETCH_VERTICAL)) || (m_bVirtual))
+	if ((m_align & WA_FULL) || (m_flags & (WF_STRETCH_HORIZONTAL | WF_STRETCH_VERTICAL)) || bScaled)
 	{
 		setFrame(m_frame);
 		m_startingpos = m_frame.pos;
@@ -3058,25 +3115,48 @@ bool UIWidget::PassEventToWidget
 	int i;
 	int n;
 
-	if( m_enabledCvar.length() )
-	{
-		if( !UI_GetCvarInt( m_cvarname, 0 ) )
-			return false;
+	if (!isEnabled()) {
+		return false;
 	}
 
-	if( name.length() )
+	if (!str::cmp(name, m_name)) {
+		ProcessEvent(ev);
+		return true;
+	}
+
+	n = m_children.NumObjects();
+	for (i = 1; i <= n; i++)
 	{
-		n = m_children.NumObjects();
-		for( i = 1; i <= n; i++ )
-		{
-			if( m_children.ObjectAt( i )->PassEventToWidget( name, ev ) )
-				return true;
+		if (m_children.ObjectAt(i)->PassEventToWidget(name, ev)) {
+			return true;
 		}
 	}
 
-	ProcessEvent( ev );
+	return false;
+}
 
-	return true;
+UIFont *UIWidget::getFont() const
+{
+    return m_font;
+}
+
+bool UIWidget::isVirtual() const
+{
+	return m_bVirtual;
+}
+
+const vec2_t& UIWidget::getVirtualScale() const
+{
+	if (m_bVirtual) {
+		return m_vVirtualScale;
+	} else {
+		return uid.scaleRes;
+	}
+}
+
+const vec2_t& UIWidget::getHighResScale() const
+{
+	return uid.scaleRes;
 }
 
 void UIWidget::SetEnabledCvar
@@ -3098,14 +3178,20 @@ void UIWidget::SetScaleCvar
 
 void UIWidget::SetVirtualScale(vec2_t out)
 {
-    out[0] = uid.vidWidth / 640.0;
-    out[1] = uid.vidHeight / 480.0;
-
     if (m_scaleCvar)
     {
-        out[0] *= m_scaleCvar->value;
-        out[1] *= m_scaleCvar->value;
+        const float vidRatio = (float)uid.vidWidth / (float)uid.vidHeight;
+        const float minHeight = 480;
+        const float minWidth = minHeight * vidRatio;
+
+        out[0] = uid.vidWidth / minWidth * m_scaleCvar->value;
+        out[1] = uid.vidHeight / minHeight * m_scaleCvar->value;
     }
+	else
+    {
+        out[0] = uid.vidWidth / 640.0;
+        out[1] = uid.vidHeight / 480.0;
+	}
 }
 
 void UIWidget::SetDontLocalize(Event* ev)
@@ -3115,12 +3201,12 @@ void UIWidget::SetDontLocalize(Event* ev)
 
 void UIWidget::EventFadeSequence(Event* ev)
 {
-	m_fadeSequenceDelayStart = ev->GetFloat(1);
+	m_fadeSequenceDelay = ev->GetFloat(1);
 	m_fadeSequenceFadeIn = ev->GetFloat(2);
 	m_fadeSequenceHold = ev->GetFloat(3);
 	m_fadeSequenceFadeOut = ev->GetFloat(4);
-	m_fadeSequenceDelayEnd = m_fadeSequenceDelayStart;
-	m_fadeSequenceState = fadesequence_t::SEQUENCE_FADEIN;
+	m_fadeSequenceRemainingTime = m_fadeSequenceDelay;
+	m_fadeSequenceState = fadesequence_t::SEQUENCE_STARTING;
 }
 
 void UIWidget::SetDontLocalize()
@@ -3159,16 +3245,17 @@ void UIWidgetContainer::AlignPosition
 
         SetVirtualScale(vNewVirtualScale);
 
-		if (!VectorCompare2D(m_vVirtualScale, vNewVirtualScale))
-		{
-			m_frame.pos.x = m_frame.pos.x / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.pos.y = m_frame.pos.y / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_frame.size.width = m_frame.size.width / m_vVirtualScale[0] * vNewVirtualScale[0];
-			m_frame.size.height = m_frame.size.height / m_vVirtualScale[1] * vNewVirtualScale[1];
-			m_vVirtualScale[0] = vNewVirtualScale[0];
-			m_vVirtualScale[1] = vNewVirtualScale[1];
-		}
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
 	}
+	else if (uid.bHighResScaling)
+    {
+        scaleFrameVirtualRes(m_frame, m_vVirtualScale, uid.scaleRes);
+    }
+    else
+    {
+		vec2_t vNewVirtualScale = { 1.0, 1.0 };
+		scaleFrameVirtualRes(m_frame, m_vVirtualScale, vNewVirtualScale);
+    }
 
 	if (m_align & WA_LEFT)
 	{
diff --git a/code/uilib/uiwidget.h b/code/uilib/uiwidget.h
index 50a29627..787e0c19 100644
--- a/code/uilib/uiwidget.h
+++ b/code/uilib/uiwidget.h
@@ -143,12 +143,12 @@ protected:
 	float m_alpha;
 	float m_local_alpha;
 	float m_motiontime;
-    float m_fadeSequenceDelayStart;
+    float m_fadeSequenceDelay;
     float m_fadeSequenceFadeIn;
     float m_fadeSequenceHold;
     float m_fadeSequenceFadeOut;
-    float m_fadeSequenceDelayEnd;
-    float m_fadeSequenceAlpha;
+    float m_fadeSequenceRemainingTime;
+    float m_fadeSequenceLastTime;
     int m_fadeSequenceState;
 	str m_stopsound;
 	str m_clicksound;
@@ -195,7 +195,7 @@ public:
 
 	virtual void		Shutdown( void );
 	virtual void		InitFrame( UIWidget *parentview, float x, float y, float width, float height, int border = -1, const char *fontname = "verdana-12" );
-	void				InitFrame( UIWidget *parentview, const UIRect2D& r, int border, const char *fontname );
+	void				InitFrame( UIWidget *parentview, const UIRect2D& r, int border, const char *fontname = "verdana-12" );
 	void				LayoutSize( Event *ev );
 	void				LayoutRect( Event *ev );
 	void				LayoutName( Event *ev );
@@ -226,8 +226,12 @@ public:
 	void				LayoutAliasCache( Event *ev );
 	void				SetEnabledCvar( Event *ev );
 	void				SetScaleCvar( Event *ev );
+
+	// Added in 2.0
+	//====
 	void				SetDontLocalize( Event *ev );
 	void				EventFadeSequence( Event *ev );
+	//====
 
 	void				SetVirtualScale(vec2_t out);
 	void				SetDontLocalize();
@@ -326,6 +330,12 @@ public:
 	void				setConfigstringIndex( int cs );
 	int					getConfigstringIndex( void );
 	bool				PassEventToWidget( str name, Event *ev );
+
+	// Added in OPM
+    UIFont              *getFont() const;
+	bool				isVirtual() const;
+	const vec2_t&		getVirtualScale() const;
+	const vec2_t&		getHighResScale() const;
 };
 
 class UIWidgetContainer : public UIWidget {
diff --git a/code/uilib/uiwinman.cpp b/code/uilib/uiwinman.cpp
index 88a55aa9..701210f6 100644
--- a/code/uilib/uiwinman.cpp
+++ b/code/uilib/uiwinman.cpp
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2015-2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -137,1094 +137,829 @@ Event W_AnyMouseUp
 
 UIWindowManager uWinMan;
 
-CLASS_DECLARATION( UIWidget, UIWindowManager, NULL )
-{
-	{ NULL, NULL }
+CLASS_DECLARATION(UIWidget, UIWindowManager, NULL) {
+    {NULL, NULL}
 };
 
 UIWindowManager::UIWindowManager()
 {
-	m_amidead = false;
-	m_lastbuttons = 0;
-	m_oldview = NULL;
-	m_firstResponder = NULL;
-	m_backgroundwidget = NULL;
-	m_cursor = NULL;
-	m_showcursor = true;
-	m_font = NULL;
-	m_bindactive = NULL;
-	setBorderStyle( border_none );
+    m_amidead          = false;
+    m_lastbuttons      = 0;
+    m_oldview          = NULL;
+    m_firstResponder   = NULL;
+    m_backgroundwidget = NULL;
+    m_cursor           = NULL;
+    m_showcursor       = true;
+    m_font             = NULL;
+    m_bindactive       = NULL;
+    setBorderStyle(border_none);
 }
 
 UIWindowManager::~UIWindowManager()
 {
-	m_amidead = true;
+    m_amidead = true;
 }
 
-void UIWindowManager::ViewEvent
-	(
-	UIWidget *view,
-	Event& event,
-	UIPoint2D& pos,
-	int buttons
-	)
-
+void UIWindowManager::ViewEvent(UIWidget *view, Event& event, UIPoint2D& pos, int buttons)
 {
-	if (!view) {
-		// use the first responder instead
-		view = m_firstResponder;
-	}
+    if (!view) {
+        // use the first responder instead
+        view = m_firstResponder;
+        if (!view) {
+            return;
+        }
+    }
 
-	if (!view->isEnabled()) {
-		return;
-	}
+    if (!view->isEnabled()) {
+        return;
+    }
 
-	Event *ev = new Event( event );
-	ev->AddFloat( pos.x );
-	ev->AddFloat( pos.y );
-	ev->AddInteger( buttons );
-	// send the event to the view
-	view->ProcessEvent( ev );
+    Event *ev = new Event(event);
+    ev->AddFloat(pos.x);
+    ev->AddFloat(pos.y);
+    ev->AddInteger(buttons);
+    // send the event to the view
+    view->ProcessEvent(ev);
 }
 
-UIWidget *UIWindowManager::getResponder
-	(
-	UIPoint2D& pos
-	)
-
+UIWidget *UIWindowManager::getResponder(UIPoint2D& pos)
 {
-	UIWidget *subview;
-	UIWidget *responder;
-	int i;
+    UIWidget *subview;
+    UIWidget *responder;
+    int       i;
 
-	if( !m_firstResponder )
-	{
-		m_firstResponder = this;
-	}
+    if (!m_firstResponder) {
+        m_firstResponder = this;
+    }
 
-	responder = m_firstResponder;
+    responder = m_firstResponder;
 
-	if( responder != this )
-	{
-		return responder;
-	}
+    if (responder != this &&
+        // Fixed in OPM
+        //  Ignore the first responder if it's disabled
+        //  this prevents the UI system from being blocked
+        //  trying to activate the control
+        responder->CanActivate() && responder->isEnabled()
+        ) {
+        return responder;
+    }
 
-	for( i = m_children.NumObjects(); i > 0; i-- )
-	{
-		subview = m_children.ObjectAt( i );
-		if( subview != m_backgroundwidget )
-		{
-			responder = subview->FindResponder( pos );
-			if (responder) {
-				return responder;
-			}
-		}
-	}
+    for (i = m_children.NumObjects(); i > 0; i--) {
+        subview = m_children.ObjectAt(i);
+        if (subview != m_backgroundwidget) {
+            responder = subview->FindResponder(pos);
+            if (responder) {
+                return responder;
+            }
+        }
+    }
 
-	if( m_backgroundwidget )
-	{
-		return m_backgroundwidget->FindResponder( pos );
-	}
+    if (m_backgroundwidget) {
+        return m_backgroundwidget->FindResponder(pos);
+    }
 
-	return this;
+    return this;
 }
 
-void UIWindowManager::Init
-	(
-	const UIRect2D& frame,
-	const char *fontname
-	)
-
+void UIWindowManager::Init(const UIRect2D& frame, const char *fontname)
 {
-	setFrame( frame );
-	m_font = new UIFont( fontname );
+    setFrame(frame);
+    m_font = new UIFont(fontname);
 }
 
-void UIWindowManager::setBackgroundWidget
-	(
-	UIWidget *widget
-	)
-
+void UIWindowManager::setBackgroundWidget(UIWidget *widget)
 {
-	m_backgroundwidget = widget;
-	if( widget )
-	{
-		widget->setParent( this );
-		widget->setFrame( m_frame );
-	}
+    m_backgroundwidget = widget;
+    if (widget) {
+        widget->setParent(this);
+        widget->setFrame(m_frame);
+    }
 }
 
-void UIWindowManager::UpdateViews
-	(
-	void
-	)
-
+void UIWindowManager::UpdateViews(void)
 {
-	int i;
-	int n;
-	int x, y;
+    int i;
+    int n;
+    int x, y;
 
-	if( m_backgroundwidget )
-	{
-		m_backgroundwidget->Display( m_frame, 1.0 );
+    if (m_backgroundwidget) {
+        m_backgroundwidget->Display(m_frame, 1.0);
 
-		n = m_children.NumObjects();
-		for( i = 1; i <= n; i++ )
-		{
-			if( m_children.ObjectAt( i ) != m_backgroundwidget )
-			{
-				m_children.ObjectAt( i )->Display( m_frame, 1.0 );
-			}
-		}
-	}
-	else
-	{
-		Display( m_frame, 1.0 );
-	}
+        n = m_children.NumObjects();
+        for (i = 1; i <= n; i++) {
+            if (m_children.ObjectAt(i) != m_backgroundwidget) {
+                m_children.ObjectAt(i)->Display(m_frame, 1.0);
+            }
+        }
+    } else {
+        Display(m_frame, 1.0);
+    }
 
-	if( m_cursor && m_showcursor && uid.uiHasMouse )
-	{
-		vec4_t col;
+    if (m_cursor && m_showcursor && uid.uiHasMouse) {
+        vec4_t col;
 
-		VectorSet4( col, 1, 1, 1, 1 );
-		set2D();
-		uii.Rend_SetColor( col );
+        VectorSet4(col, 1, 1, 1, 1);
+        set2D();
+        uii.Rend_SetColor(col);
 
-		m_cursor->ReregisterMaterial();
+        uii.Rend_DrawPicStretched(uid.mouseX, uid.mouseY, 0, 0, 0, 0, 1, 1, m_cursor->GetMaterial());
 
-		uii.Rend_DrawPicStretched( uid.mouseX, uid.mouseY, 0, 0, 0, 0, 1, 1, m_cursor->GetMaterial() );
+        m_font->setColor(UWhite);
 
-		m_font->setColor( UWhite );
-
-		if( UI_GetCvarInt( "ui_drawcoords", 0 ) )
-		{
-			x = uid.mouseX + 10;
-			y = uid.mouseY - 10;
-			m_font->Print( x, y, va( "%d:%d", uid.mouseX, uid.mouseY ), -1, m_bVirtual );
-		}
-	}
+        if (UI_GetCvarInt("ui_drawcoords", 0)) {
+            x = uid.mouseX + 10;
+            y = uid.mouseY - 10;
+            m_font->Print(x, y, va("%d:%d", uid.mouseX, uid.mouseY), -1, m_bVirtual ? m_vVirtualScale : NULL);
+        }
+    }
 }
 
-void UIWindowManager::ServiceEvents
-	(
-	void
-	)
-
+void UIWindowManager::ServiceEvents(void)
 {
-	UIPoint2D pos;
-	unsigned int buttons;
-	SafePtr<UIWidget> view;
+    UIPoint2D         pos;
+    unsigned int      buttons;
+    SafePtr<UIWidget> view;
 
-	pos.x = uid.mouseX;
-	pos.y = uid.mouseY;
-	buttons = uid.mouseFlags;
+    pos.x   = uid.mouseX;
+    pos.y   = uid.mouseY;
+    buttons = uid.mouseFlags;
 
-	if( m_bindactive )
-	{
-		view = m_bindactive;
-	}
-	else
-	{
-		view = getResponder( pos );
-	}
+    if (m_bindactive) {
+        view = m_bindactive;
+    } else {
+        view = getResponder(pos);
+    }
 
-	SafePtr<UIWidget> b = m_oldview;
+    SafePtr<UIWidget> b = m_oldview;
 
-	if( b != view )
-	{
-		ViewEvent( m_oldview, W_MouseExited, pos, buttons );
-		ViewEvent( view, W_MouseEntered, pos, buttons );
-	}
+    if (b != view) {
+        ViewEvent(m_oldview, W_MouseExited, pos, buttons);
+        ViewEvent(view, W_MouseEntered, pos, buttons);
+    }
 
-	if( m_oldpos != pos )
-	{
-		if( ( buttons & 1 ) && ( m_lastbuttons & 1 ) )
-		{
-			ViewEvent( view, W_LeftMouseDragged, pos, buttons );
-		}
-		if( ( buttons & 2 ) && ( m_lastbuttons & 2 ) )
-		{
-			ViewEvent( view, W_RightMouseDragged, pos, buttons );
-		}
-		if( ( buttons & 4 ) && ( m_lastbuttons & 4 ) )
-		{
-			ViewEvent( view, W_CenterMouseDragged, pos, buttons );
-		}
-		if( !buttons )
-		{
-			ViewEvent( view, W_MouseMoved, pos, 0 );
-		}
-	}
+    if (m_oldpos != pos) {
+        if ((buttons & 1) && (m_lastbuttons & 1)) {
+            ViewEvent(view, W_LeftMouseDragged, pos, buttons);
+        }
+        if ((buttons & 2) && (m_lastbuttons & 2)) {
+            ViewEvent(view, W_RightMouseDragged, pos, buttons);
+        }
+        if ((buttons & 4) && (m_lastbuttons & 4)) {
+            ViewEvent(view, W_CenterMouseDragged, pos, buttons);
+        }
+        if (!buttons) {
+            ViewEvent(view, W_MouseMoved, pos, 0);
+        }
+    }
 
-	if( ( buttons & 1 ) != ( m_lastbuttons & 1 ) )
-	{
-		if( buttons & 1 )
-		{
-			uii.UI_WantsKeyboard();
-			ActivateControl( view );
-			ViewEvent( view, W_LeftMouseDown, pos, buttons );
-		}
-		else
-		{
-			ViewEvent( view, W_LeftMouseUp, pos, buttons );
-		}
-	}
-	if( ( buttons & 2 ) != ( m_lastbuttons & 2 ) )
-	{
-		if( buttons & 2 )
-		{
-			ViewEvent( view, W_RightMouseDown, pos, buttons );
-		}
-		else
-		{
-			ViewEvent( view, W_RightMouseUp, pos, buttons );
-		}
-	}
-	if( ( buttons & 4 ) != ( m_lastbuttons & 4 ) )
-	{
-		if( buttons & 4 )
-		{
-			ViewEvent( view, W_CenterMouseDown, pos, buttons );
-		}
-		else
-		{
-			ViewEvent( view, W_CenterMouseUp, pos, buttons );
-		}
-	}
-	if( buttons != m_lastbuttons )
-	{
-		ViewEvent( view, W_AnyMouseDown, pos, buttons );
-		ViewEvent( view, W_AnyMouseUp, pos, buttons );
-	}
+    if ((buttons & 1) != (m_lastbuttons & 1)) {
+        if (buttons & 1) {
+            uii.UI_WantsKeyboard();
+            ActivateControl(view);
+            ViewEvent(view, W_LeftMouseDown, pos, buttons);
+        } else {
+            ViewEvent(view, W_LeftMouseUp, pos, buttons);
+        }
+    }
+    if ((buttons & 2) != (m_lastbuttons & 2)) {
+        if (buttons & 2) {
+            ViewEvent(view, W_RightMouseDown, pos, buttons);
+        } else {
+            ViewEvent(view, W_RightMouseUp, pos, buttons);
+        }
+    }
+    if ((buttons & 4) != (m_lastbuttons & 4)) {
+        if (buttons & 4) {
+            ViewEvent(view, W_CenterMouseDown, pos, buttons);
+        } else {
+            ViewEvent(view, W_CenterMouseUp, pos, buttons);
+        }
+    }
+    if (buttons != m_lastbuttons) {
+        ViewEvent(view, W_AnyMouseDown, pos, buttons);
+        ViewEvent(view, W_AnyMouseUp, pos, buttons);
+    }
 
-	m_lastbuttons = buttons;
-	m_oldpos = pos;
-	m_oldview = view;
+    m_lastbuttons = buttons;
+    m_oldpos      = pos;
+    m_oldview     = view;
 
-	if( !m_cursor )
-	{
-		// initialize the cursor
-		setCursor( "gfx/2d/mouse_cursor" );
-	}
+    if (!m_cursor) {
+        // initialize the cursor
+        setCursor("gfx/2d/mouse_cursor");
+    }
 }
 
-void UIWindowManager::setFirstResponder
-	(
-	UIWidget *responder
-	)
-
+void UIWindowManager::setFirstResponder(UIWidget *responder)
 {
-	if( !responder )
-	{
-		m_firstResponder = this;
-	}
-	else
-	{
-		m_firstResponder = responder;
-	}
+    if (!responder) {
+        m_firstResponder = this;
+    } else {
+        m_firstResponder = responder;
+    }
 }
 
-UIWidget *UIWindowManager::getFirstResponder
-	(
-	void
-	)
-
+UIWidget *UIWindowManager::getFirstResponder(void)
 {
-	SafePtr<UIWidget> b = m_firstResponder;
-	m_firstResponder = NULL;
-
-	if( b == this )
-	{
-		return NULL;
-	}
-	else
-	{
-		return b;
-	}
+    if (m_firstResponder != this) {
+        return m_firstResponder;
+    }
+    return NULL;
 }
 
-UIWidget *UIWindowManager::ActiveControl
-	(
-	void
-	)
-
+UIWidget *UIWindowManager::ActiveControl(void)
 {
-	return m_activeControl;
+    return m_activeControl;
 }
 
-void UIWindowManager::ActivateControl
-	(
-	UIWidget *control
-	)
-
+void UIWindowManager::ActivateControl(UIWidget *control)
 {
-	UIWidget* wid;
+    UIWidget *wid;
 
-	for(wid = control; wid && wid != this; wid = wid->getParent() )
-	{
-		if(wid->CanActivate() && wid->isEnabled() ) {
-			break;
-		}
-	}
+    for (wid = control; wid && wid != this; wid = wid->getParent()) {
+        if (wid->CanActivate() && wid->isEnabled()) {
+            break;
+        }
+    }
 
-	if (!wid || wid == this) {
-		return;
-	}
+    if (!wid || wid == this) {
+        return;
+    }
 
-	if (wid->CanActivate() && wid->isEnabled())
-	{
-		UIWidget* active = ActiveControl();
+    if (wid->CanActivate() && wid->isEnabled()) {
+        UIWidget *active = ActiveControl();
 
-		if (wid != active)
-		{
-			if (active)
-			{
-				m_activeControl = NULL;
-				active->SendSignal(W_Deactivated);
-				active->SetHovermaterialActive(false);
-				active->SetPressedmaterialActive(false);
-			}
+        if (wid != active) {
+            if (active) {
+                m_activeControl = NULL;
+                active->SendSignal(W_Deactivated);
+                active->SetHovermaterialActive(false);
+                active->SetPressedmaterialActive(false);
+            }
 
-			if (!active || !ActiveControl())
-			{
-				m_activeControl = wid;
-				wid->SetHovermaterialActive(true);
-				wid->ActivateOrder();
-				wid->BringToFrontPropogated();
-				wid->SendSignal(W_Activated);
-			}
-		}
-	}
+            if (!active || !ActiveControl()) {
+                m_activeControl = wid;
+                wid->SetHovermaterialActive(true);
+                wid->ActivateOrder();
+                wid->BringToFrontPropogated();
+                wid->SendSignal(W_Activated);
+            }
+        }
+    }
 }
 
-void UIWindowManager::DeactivateCurrentControl
-	(
-	void
-	)
-
+void UIWindowManager::DeactivateCurrentControl(void)
 {
-	UIWidget *wid = m_activeControl;
+    UIWidget *wid = m_activeControl;
 
-	if( wid )
-	{
-		m_activeControl = NULL;
-		wid->SendSignal( W_Deactivated );
-	}
+    if (wid) {
+        m_activeControl = NULL;
+        wid->SendSignal(W_Deactivated);
+    }
 }
 
-UIWidget *UIWindowManager::FindNextControl
-	(
-	UIWidget *control
-	)
-
+UIWidget *UIWindowManager::FindNextControl(UIWidget *control)
 {
-	UIWidget *widget;
-	bool back_up;
+    UIWidget *widget;
+    bool      back_up;
 
-	if( !control )
-	{
-		control = this;
-	}
+    if (!control) {
+        control = this;
+    }
 
-	while( control )
-	{
-		widget = control->getFirstChild();
-		if( widget )
-		{
-			if( widget->isEnabled() && widget->CanActivate() )
-				return widget;
+    while (control) {
+        widget = control->getFirstChild();
+        if (widget) {
+            if (widget->isEnabled() && widget->CanActivate()) {
+                return widget;
+            }
 
-			control = widget;
-		}
-		else
-		{
-			widget = control->getNextSibling();
-			if( widget )
-			{
-				if( widget->isEnabled() && widget->CanActivate() )
-					return widget;
+            control = widget;
+        } else {
+            widget = control->getNextSibling();
+            if (widget) {
+                if (widget->isEnabled() && widget->CanActivate()) {
+                    return widget;
+                }
 
-				control = widget;
-			}
-			else
-			{
-				back_up = true;
+                control = widget;
+            } else {
+                back_up = true;
 
-				while( control->getParent() && back_up )
-				{
-					control = control->getParent();
-					if( control->getNextSibling() )
-					{
-						control = control->getNextSibling();
+                while (control->getParent() && back_up) {
+                    control = control->getParent();
+                    if (control->getNextSibling()) {
+                        control = control->getNextSibling();
 
-						// there is an error in the fakk2 code where the second check if the control is enabled
-						// while the second should check if the control can activate
-						// this especially affects MOHAA
-						if( control->isEnabled() && control->CanActivate() )
-							return control;
+                        // there is an error in the fakk2 code where the second check if the control is enabled
+                        // while the second should check if the control can activate
+                        // this especially affects MOHAA
+                        if (control->isEnabled() && control->CanActivate()) {
+                            return control;
+                        }
 
-						back_up = false;
-					}
-				}
+                        back_up = false;
+                    }
+                }
 
-				if( control == this )
-					break;
-			}
-		}
-	}
+                if (control == this) {
+                    break;
+                }
+            }
+        }
+    }
 
-	return NULL;
+    return NULL;
 }
 
-UIWidget *UIWindowManager::FindPrevControl
-	(
-	UIWidget *control
-	)
-
+UIWidget *UIWindowManager::FindPrevControl(UIWidget *control)
 {
-	UIWidget *tmp_control;
-	UIWidget *next_control;
+    UIWidget *tmp_control;
+    UIWidget *next_control;
 
-	if( control )
-	{
-		tmp_control = this;
-		do
-		{
-			next_control = tmp_control;
-			tmp_control = FindNextControl( tmp_control );
+    if (control) {
+        tmp_control = this;
+        do {
+            next_control = tmp_control;
+            tmp_control  = FindNextControl(tmp_control);
 
-			if( !tmp_control )
-				return NULL;
-		} while( tmp_control != control );
-	}
-	else
-	{
-		tmp_control = this;
-		do
-		{
-			next_control = tmp_control;
-			tmp_control = FindNextControl( tmp_control );
-		} while( tmp_control );
-	}
+            if (!tmp_control) {
+                return NULL;
+            }
+        } while (tmp_control != control);
+    } else {
+        tmp_control = this;
+        do {
+            next_control = tmp_control;
+            tmp_control  = FindNextControl(tmp_control);
+        } while (tmp_control);
+    }
 
-	if( next_control != this )
-		return next_control;
+    if (next_control != this) {
+        return next_control;
+    }
 
-	return NULL;
+    return NULL;
 }
 
-void UIWindowManager::setCursor
-	(
-	const char *string
-	)
-
+void UIWindowManager::setCursor(const char *string)
 {
-	m_cursor = RegisterShader( string );
+    m_cursor = RegisterShader(string);
 
-	if( m_cursor )
-	{
-		m_cursorname = string;
-	}
-	else
-	{
-		uii.Sys_Printf( "Could not register shader '%s'\n", string );
-	}
+    if (m_cursor) {
+        m_cursorname = string;
+    } else {
+        uii.Sys_Printf("Could not register shader '%s'\n", string);
+    }
 }
 
-void UIWindowManager::showCursor
-	(
-	bool show
-	)
-
+void UIWindowManager::showCursor(bool show)
 {
-	m_showcursor = show;
+    m_showcursor = show;
 }
 
-void UIWindowManager::CharEvent
-	(
-	int ch
-	)
-
+void UIWindowManager::CharEvent(int ch)
 {
-	if( m_activeControl )
-	{
-		m_activeControl->CharEvent( ch );
-	}
+    if (m_activeControl) {
+        m_activeControl->CharEvent(ch);
+    }
 }
 
-qboolean UIWindowManager::KeyEvent
-	(
-	int key,
-	unsigned int time
-	)
-
+qboolean UIWindowManager::KeyEvent(int key, unsigned int time)
 {
-	UIWidget *selwidget = NULL;
+    UIWidget *selwidget = NULL;
 
-	if( key == K_TAB && ( uii.Sys_IsKeyDown( K_CTRL ) || uii.Sys_IsKeyDown( K_DEL ) ) )
-	{
-		UIWidget *wid;
+    if (key == K_TAB && uii.Sys_IsKeyDown(K_CTRL)) {
+        UIWidget *wid;
 
-		if( m_activeControl && m_activeControl != this )
-		{
-			for( selwidget = m_activeControl; selwidget != NULL; selwidget = selwidget->getParent() )
-			{
-				if( selwidget->getParent() == this )
-					break;
-			}
-		}
+        if (m_activeControl && m_activeControl != this) {
+            for (selwidget = m_activeControl; selwidget != NULL; selwidget = selwidget->getParent()) {
+                if (selwidget->getParent() == this) {
+                    break;
+                }
+            }
+        }
 
-		if( !selwidget )
-		{
-			selwidget = getFirstChild();
-		}
+        if (!selwidget) {
+            selwidget = getFirstChild();
+        }
 
-		for( wid = selwidget->getNextChild( selwidget ); wid != NULL; wid = wid->getNextChild( wid ) )
-		{
-			if( !( selwidget->m_flags & WF_ALWAYS_BOTTOM ) && selwidget->CanActivate() )
-			{
-				ActivateControl( wid );
-				return true;
-			}
-		}
-		for( wid = getFirstChild(); wid != selwidget && wid != NULL; wid = wid->getNextChild( wid ) )
-		{
-			if( !( selwidget->m_flags & WF_ALWAYS_BOTTOM ) && selwidget->CanActivate() )
-			{
-				ActivateControl( wid );
-				return true;
-			}
-		}
-	}
-	else
-	{
-		if( m_bindactive )
-		{
-			m_bindactive->KeyEvent( key, time );
-		}
-		else if( !m_activeControl || !m_activeControl->KeyEvent( key, time ) && ( key != K_UPARROW || key != K_DOWNARROW ) )
-		{
-			selwidget = m_activeControl;
-			if( selwidget && selwidget != this )
-			{
-				for( selwidget = m_activeControl; selwidget != NULL; selwidget = selwidget->getParent() )
-				{
-					if( selwidget->getParent() == this )
-						break;
-				}
-			}
+        for (wid = getNextChild(selwidget); wid != NULL; wid = getNextChild(wid)) {
+            if (!(selwidget->m_flags & WF_ALWAYS_BOTTOM) && selwidget->CanActivate()) {
+                ActivateControl(wid);
+                return true;
+            }
+        }
+        for (wid = getFirstChild(); wid != selwidget && wid != NULL; wid = getNextChild(wid)) {
+            if (!(selwidget->m_flags & WF_ALWAYS_BOTTOM) && selwidget->CanActivate()) {
+                ActivateControl(wid);
+                return true;
+            }
+        }
+    } else {
+        if (m_bindactive) {
+            m_bindactive->KeyEvent(key, time);
+        } else if (!(m_activeControl && m_activeControl->KeyEvent(key, time)) && (key == K_DOWNARROW || key == K_UPARROW)) {
+            selwidget = m_activeControl;
+            if (selwidget && selwidget != this) {
+                for (selwidget = m_activeControl; selwidget != NULL; selwidget = selwidget->getParent()) {
+                    if (selwidget->getParent() == this) {
+                        break;
+                    }
+                }
+            }
 
-			if( selwidget != NULL )
-			{
-				if( selwidget->isSubclassOf( UIWidgetContainer ) )
-				{
-					UIWidgetContainer *widcon = ( UIWidgetContainer * )selwidget;
+            if (selwidget != NULL) {
+                if (selwidget->isSubclassOf(UIWidgetContainer)) {
+                    UIWidgetContainer *widcon = (UIWidgetContainer *)selwidget;
 
-					if( key == K_DOWNARROW )
-					{
-						selwidget = widcon->GetNextWidgetInOrder();
-					}
-					else if( key == K_UPARROW )
-					{
-						selwidget = widcon->GetPrevWidgetInOrder();
-					}
+                    if (key == K_DOWNARROW) {
+                        selwidget = widcon->GetNextWidgetInOrder();
+                    } else if (key == K_UPARROW) {
+                        selwidget = widcon->GetPrevWidgetInOrder();
+                    }
 
-					if( selwidget )
-						ActivateControl( selwidget );
-				}
-			}
-		}
-	}
+                    if (selwidget) {
+                        ActivateControl(selwidget);
+                    }
+                }
+            }
+        }
+    }
 
-	return true;
+    return true;
 }
 
-void UIWindowManager::CreateMenus
-	(
-	void
-	)
-
+void UIWindowManager::CreateMenus(void)
 {
-	int i;
-	int n;
+    int i;
+    int n;
 
-	menuManager.DeleteAllMenus();
+    menuManager.DeleteAllMenus();
 
-	n = uWinMan.m_children.NumObjects();
-	for( i = 1; i <= n; i++ )
-	{
-		UIWidget *w = uWinMan.m_children.ObjectAt( i );
-		if( w->isSubclassOf( UIWidgetContainer ) )
-		{
-			UIWidgetContainer *wid = ( UIWidgetContainer * )w;
-			Menu *m = new Menu( w->getName() );
+    n = uWinMan.m_children.NumObjects();
+    for (i = 1; i <= n; i++) {
+        UIWidget *w = uWinMan.m_children.ObjectAt(i);
+        if (w->isSubclassOf(UIWidgetContainer)) {
+            UIWidgetContainer *wid = (UIWidgetContainer *)w;
+            Menu              *m   = new Menu(w->getName());
 
-			m->setFullscreen( wid->isFullscreen() );
-			m->setVidMode( wid->getVidMode() );
-			m->AddMenuItem( w );
-			m->ForceHide();
-		}
-	}
+            m->setFullscreen(wid->isFullscreen());
+            m->setVidMode(wid->getVidMode());
+            m->AddMenuItem(w);
+            m->ForceHide();
+        }
+    }
 }
 
-UIReggedMaterial *UIWindowManager::RegisterShader
-	(
-	const str& name
-	)
-
+UIReggedMaterial *UIWindowManager::RegisterShader(const str& name)
 {
-	int i;
-	UIReggedMaterial *regged;
+    int               i;
+    UIReggedMaterial *regged;
 
-	for( i = 1; i <= m_materiallist.NumObjects(); i++ )
-	{
-		regged = m_materiallist.ObjectAt( i );
-		if( regged->GetName() == name )
-		{
-			return regged;
-		}
-	}
+    for (i = 1; i <= m_materiallist.NumObjects(); i++) {
+        regged = m_materiallist.ObjectAt(i);
+        if (regged->GetName() == name) {
+            return regged;
+        }
+    }
 
-	regged = new UIReggedMaterial;
-	regged->SetMaterial( name );
+    regged = new UIReggedMaterial;
+    regged->SetMaterial(name);
 
-	m_materiallist.AddObject( regged );
-	return regged;
+    m_materiallist.AddObject(regged);
+    return regged;
 }
 
-UIReggedMaterial *UIWindowManager::RefreshShader
-	(
-	const str& name
-	)
-
+UIReggedMaterial *UIWindowManager::RefreshShader(const str& name)
 {
-	int i;
-	UIReggedMaterial *regged;
+    int               i;
+    UIReggedMaterial *regged;
 
-	for( i = 1; i <= m_materiallist.NumObjects(); i++ )
-	{
-		regged = m_materiallist.ObjectAt( i );
-		if( regged->GetName() == name )
-		{
-			regged->ReregisterMaterial();
-			return regged;
-		}
-	}
+    for (i = 1; i <= m_materiallist.NumObjects(); i++) {
+        regged = m_materiallist.ObjectAt(i);
+        if (regged->GetName() == name) {
+            regged->RefreshMaterial();
+            return regged;
+        }
+    }
 
-	regged = new UIReggedMaterial;
-	regged->SetMaterial( name );
+    regged = new UIReggedMaterial;
+    regged->SetMaterial(name);
 
-	m_materiallist.AddObject( regged );
-	return regged;
+    m_materiallist.AddObject(regged);
+    return regged;
 }
 
-void UIWindowManager::CleanupShadersFromList
-	(
-	void
-	)
-
+void UIWindowManager::CleanupShadersFromList(void)
 {
-	int i;
-	int num;
+    int i;
+    int num;
 
-	num = m_materiallist.NumObjects();
-	for( i = 1; i <= num; i++ )
-	{
-		UIReggedMaterial *regged = m_materiallist.ObjectAt( i );
-		regged->CleanupMaterial();
-	}
+    num = m_materiallist.NumObjects();
+    for (i = 1; i <= num; i++) {
+        UIReggedMaterial *regged = m_materiallist.ObjectAt(i);
+        regged->CleanupMaterial();
+    }
 }
 
-void UIWindowManager::RefreshShadersFromList
-	(
-	void
-	)
-
+void UIWindowManager::RefreshShadersFromList(void)
 {
-	int i;
-	int num;
+    int i;
+    int num;
 
-	num = m_materiallist.NumObjects();
-	for( i = 1; i <= num; i++ )
-	{
-		UIReggedMaterial *regged = m_materiallist.ObjectAt( i );
-		regged->ReregisterMaterial();
-	}
+    num = m_materiallist.NumObjects();
+    for (i = 1; i <= num; i++) {
+        UIReggedMaterial *regged = m_materiallist.ObjectAt(i);
+        regged->ReregisterMaterial();
+    }
 }
 
-void UIWindowManager::DeactivateCurrentSmart
-	(
-	void
-	)
-
+void UIWindowManager::DeactivateCurrentSmart(void)
 {
-	UIWidget *toset;
-	UIWidget *checking;
+    UIWidget *toset;
+    UIWidget *checking;
+    UIWidget *sibling;
 
-	toset = NULL;
+    toset = NULL;
 
-	if (!m_activeControl) {
-		return;
-	}
+    if (!m_activeControl) {
+        return;
+    }
 
-	checking = m_activeControl;
-	while( 1 )
-	{
-		if( checking->getParent()
-			&& ( !checking->getParent() || !checking->getParent()->IsDying() ) )
-		{
-			UIWidget *sib = checking->getPrevSibling();
-			while( sib && !toset )
-			{
-				if( sib->CanActivate() )
-					toset = sib;
-				sib = sib->getPrevSibling();
-			}
+    for (checking = m_activeControl; checking; checking = checking->getParent()) {
+        if (!checking->getParent() || (checking->getParent() && checking->getParent()->IsDying())) {
+            continue;
+        }
+        
+        for (sibling = checking->getPrevSibling(); sibling && !toset; sibling = sibling->getPrevSibling()) {
+            if (sibling->CanActivate()) {
+                toset = sibling;
+            }
+        }
 
-			if( toset )
-				break;
+        if (toset) {
+            break;
+        }
 
-			sib = checking->getLastSibling();
-			while( sib && sib != checking && !toset )
-			{
-				if( sib->CanActivate() )
-					toset = sib;
-				sib = sib->getPrevSibling();
-			}
+        for (sibling = checking->getLastSibling(); sibling && sibling != checking && !toset;
+             sibling = sibling->getPrevSibling()) {
+            if (sibling->CanActivate()) {
+                toset = sibling;
+            }
+        }
 
-			if( toset )
-				break;
-		}
+        if (toset) {
+            break;
+        }
+    }
 
-		checking = checking->getParent();
-		if( !checking )
-		{
-			uWinMan.DeactivateCurrentControl();
-			return;
-		}
-	}
+    if (!toset) {
+        uWinMan.DeactivateCurrentControl();
+        return;
+    }
 
-	if( toset == &uWinMan )
-	{
-		Menu *menu;
-		UIWidget *newWid = NULL;
+    if (toset == &uWinMan) {
+        Menu     *menu;
+        UIWidget *newWid = NULL;
 
-		menu = menuManager.CurrentMenu();
+        menu = menuManager.CurrentMenu();
 
-		if( menu )
-			newWid = menu->GetContainerWidget();
+        if (menu) {
+            newWid = menu->GetContainerWidget();
+        }
 
-		if( newWid )
-			toset = newWid;
-	}
+        if (newWid) {
+            toset = newWid;
+        }
+    }
 
-	uWinMan.ActivateControl( toset );
+    uWinMan.ActivateControl(toset);
 }
 
-bool UIWindowManager::IsDead
-	(
-	void
-	)
-
+bool UIWindowManager::IsDead(void)
 {
-	return m_amidead;
+    return m_amidead;
 }
 
-int UIWindowManager::AddBinding
-	(
-	str binding
-	)
-
+int UIWindowManager::AddBinding(str binding)
 {
-	int i;
-	Binding *bind;
+    int      i;
+    Binding *bind;
 
-	for( i = 1; i <= bindings.NumObjects(); i++ )
-	{
-		Binding *b = bindings.ObjectAt( i );
+    for (i = 1; i <= bindings.NumObjects(); i++) {
+        Binding *b = bindings.ObjectAt(i);
 
-		if( b->binding == binding )
-			return i;
-	}
+        if (b->binding == binding) {
+            return i;
+        }
+    }
 
-	bind = new Binding;
-	bind->binding = binding;
-	uii.Key_GetKeysForCommand( binding, &bind->key1, &bind->key2 );
-	bindings.AddObject( bind );
+    bind          = new Binding;
+    bind->binding = binding;
+    uii.Key_GetKeysForCommand(binding, &bind->key1, &bind->key2);
+    bindings.AddObject(bind);
 
-	return bindings.IndexOfObject( bind );
+    return bindings.IndexOfObject(bind);
 }
 
-str UIWindowManager::GetKeyStringForCommand
-	(
-	str command,
-	int index,
-	qboolean alternate,
-	int *key1,
-	int *key2
-	)
-
+str UIWindowManager::GetKeyStringForCommand(str command, int index, qboolean alternate, int *key1, int *key2)
 {
-	str s;
-	str cmd;
-	Binding *bind;
+    str      s;
+    str      cmd;
+    Binding *bind;
 
-	if( index > bindings.NumObjects() )
-	{
-		return "Invalid Command";
-	}
+    if (index > bindings.NumObjects()) {
+        return "Invalid Command";
+    }
 
-	bind = bindings.ObjectAt( index );
+    bind = bindings.ObjectAt(index);
 
-	if( command == bind->binding )
-	{
-		if( bind->key1 < 0 || bind->key2 < 0 )
-		{
-			uii.Key_GetKeysForCommand( command, &bind->key1, &bind->key2 );
-		}
+    if (command == bind->binding) {
+        if (bind->key1 < 0 || bind->key2 < 0) {
+            uii.Key_GetKeysForCommand(command, &bind->key1, &bind->key2);
+        }
 
-		if( bind->key2 >= 0 )
-		{
-			cmd = uii.Key_GetCommandForKey( bind->key2 );
-			if( cmd != bind->binding )
-			{
-				bind->key2 = -1;
-			}
-		}
-		if( bind->key1 >= 0 )
-		{
-			cmd = uii.Key_GetCommandForKey( bind->key1 );
-			if( cmd != bind->binding )
-			{
-				if( bind->key2 < 0 )
-				{
-					bind->key1 = -1;
-				}
-				else
-				{
-					bind->key1 = bind->key2;
-					bind->key2 = -1;
-				}
-			}
-		}
+        if (bind->key2 >= 0) {
+            cmd = uii.Key_GetCommandForKey(bind->key2);
+            if (cmd != bind->binding) {
+                bind->key2 = -1;
+            }
+        }
+        if (bind->key1 >= 0) {
+            cmd = uii.Key_GetCommandForKey(bind->key1);
+            if (cmd != bind->binding) {
+                if (bind->key2 < 0) {
+                    bind->key1 = -1;
+                } else {
+                    bind->key1 = bind->key2;
+                    bind->key2 = -1;
+                }
+            }
+        }
 
-		if( alternate )
-		{
-			if( bind->key2 >= 0 )
-			{
-				s = uii.Key_KeynumToString( bind->key2 );
-			}
-			else
-			{
-				s = "None";
-			}
-		}
-		else
-		{
-			if( bind->key1 >= 0 )
-			{
-				s = uii.Key_KeynumToString( bind->key1 );
-			}
-			else
-			{
-				s = "None";
-			}
-		}
+        if (alternate) {
+            if (bind->key2 >= 0) {
+                s = uii.Key_KeynumToString(bind->key2);
+            } else {
+                s = "None";
+            }
+        } else {
+            if (bind->key1 >= 0) {
+                s = uii.Key_KeynumToString(bind->key1);
+            } else {
+                s = "None";
+            }
+        }
 
-		if( key1 )
-			*key1 = bind->key1;
-		if( key2 )
-			*key2 = bind->key2;
-	}
-	else
-	{
-		s = "Invalid Command";
-	}
+        if (key1) {
+            *key1 = bind->key1;
+        }
+        if (key2) {
+            *key2 = bind->key2;
+        }
+    } else {
+        s = "Invalid Command";
+    }
 
-	return s;
+    return s;
 }
 
-void UIWindowManager::BindKeyToCommand
-	(
-	str command,
-	int key,
-	int index,
-	qboolean alternate
-	)
-
+void UIWindowManager::BindKeyToCommand(str command, int key, int index, qboolean alternate)
 {
-	Binding *bind = bindings.ObjectAt( index );
+    Binding *bind = bindings.ObjectAt(index);
 
-	if( bind->binding == command || !bind->binding.length() )
-	{
-		if( !command.length() )
-		{
-			uii.Key_SetBinding( key, "" );
-			return;
-		}
+    if (bind->binding == command || !bind->binding.length()) {
+        if (!command.length()) {
+            uii.Key_SetBinding(key, "");
+            return;
+        }
 
-		if( !alternate )
-		{
-			if( bind->key1 == key )
-				return;
+        if (!alternate) {
+            if (bind->key1 == key) {
+                return;
+            }
 
-			if( bind->key2 == key )
-			{
-				uii.Key_SetBinding( key, "" );
-				uii.Key_SetBinding( bind->key2, "" );
-				bind->key1 = key;
-				bind->key2 = -1;
-			}
-			else
-			{
-				uii.Key_SetBinding( bind->key1, "" );
-			}
+            if (bind->key2 == key) {
+                uii.Key_SetBinding(bind->key1, "");
+                uii.Key_SetBinding(bind->key2, "");
+                bind->key1 = key;
+                bind->key2 = -1;
+            } else {
+                uii.Key_SetBinding(bind->key1, "");
+            }
 
-			if( !command.length() )
-			{
-				uii.Key_SetBinding( key, "" );
-			}
-			else
-			{
-				uii.Key_SetBinding( key, command.c_str() );
-			}
-		}
-		else
-		{
-			if( bind->key2 == key )
-				return;
+            if (!command.length()) {
+                uii.Key_SetBinding(key, "");
+            } else {
+                uii.Key_SetBinding(key, command.c_str());
+            }
+        } else {
+            if (bind->key2 == key) {
+                return;
+            }
 
-			if( bind->key1 == key )
-			{
-				uii.Key_SetBinding( key, "" );
-			}
-			else
-			{
-				uii.Key_SetBinding( bind->key1, "" );
-				bind->key2 = key;
+            if (bind->key1 == key) {
+                uii.Key_SetBinding(bind->key2, "");
+            } else {
+                uii.Key_SetBinding(bind->key2, "");
+                bind->key2 = key;
 
-				if( !command.length() )
-				{
-					uii.Key_SetBinding( key, "" );
-				}
-				else
-				{
-					uii.Key_SetBinding( key, command.c_str() );
-				}
-			}
-		}
-	}
-	else
-	{
-		warning( "UIWindowManager::BindKeyToCommand", "Invalid bind command '%s' for widget command '%s'\n", command.c_str(), bind->binding.c_str() );
-	}
+                if (!command.length()) {
+                    uii.Key_SetBinding(key, "");
+                } else {
+                    uii.Key_SetBinding(key, command.c_str());
+                }
+            }
+        }
+    } else {
+        warning(
+            "UIWindowManager::BindKeyToCommand",
+            "Invalid bind command '%s' for widget command '%s'\n",
+            command.c_str(),
+            bind->binding.c_str()
+        );
+    }
 }
 
-UIWidget *UIWindowManager::BindActive
-	(
-	void
-	)
-
+UIWidget *UIWindowManager::BindActive(void)
 {
-	return m_bindactive;
+    return m_bindactive;
 }
 
-void UIWindowManager::SetBindActive
-	(
-	UIWidget *w
-	)
-
+void UIWindowManager::SetBindActive(UIWidget *w)
 {
-	m_bindactive = w;
+    m_bindactive = w;
 }
 
-void UIWindowManager::Shutdown
-	(
-	void
-	)
-
+void UIWindowManager::Shutdown(void)
 {
-	int i;
+    int i;
 
-	for( i = m_materiallist.NumObjects(); i > 0; i-- )
-	{
-		UIReggedMaterial *mat = m_materiallist.ObjectAt( i );
-		m_materiallist.RemoveObjectAt( i );
+    for (i = m_materiallist.NumObjects(); i > 0; i--) {
+        UIReggedMaterial *mat = m_materiallist.ObjectAt(i);
+        m_materiallist.RemoveObjectAt(i);
 
-		delete mat;
-	}
+        delete mat;
+    }
 
-	for( i = bindings.NumObjects(); i > 0; i-- )
-	{
-		Binding *b = bindings.ObjectAt( i );
-		bindings.RemoveObjectAt( i );
+    for (i = bindings.NumObjects(); i > 0; i--) {
+        Binding *b = bindings.ObjectAt(i);
+        bindings.RemoveObjectAt(i);
 
-		delete b;
-	}
+        delete b;
+    }
 
-	UIWidget::Shutdown();
+    m_cursor = NULL;
+
+    UIWidget::Shutdown();
 }
 
-void UIWindowManager::DeactiveFloatingWindows
-	(
-	void
-	)
-
+void UIWindowManager::DeactiveFloatingWindows(void)
 {
-	int i;
-	UIWidget *pWidg;
+    int       i;
+    UIWidget *pWidg;
 
-	for( i = m_children.NumObjects(); i > 0; i-- )
-	{
-		pWidg = m_children.ObjectAt( i );
+    for (i = m_children.NumObjects(); i > 0; i--) {
+        pWidg = m_children.ObjectAt(i);
 
-		if( pWidg->isSubclassOf( UIFloatingWindow ) )
-			pWidg->SendSignal( W_Deactivated );
+        if (pWidg->isSubclassOf(UIFloatingWindow)) {
+            pWidg->SendSignal(W_Deactivated);
+        }
 
-		if( pWidg->isSubclassOf( UIPopupMenu ) )
-			pWidg->ProcessEvent( W_Deactivated );
-	}
+        if (pWidg->isSubclassOf(UIPopupMenu)) {
+            pWidg->ProcessEvent(W_Deactivated);
+        }
+    }
 }
 
-bool UIWindowManager::DialogExists
-	(
-	void
-	)
-
+bool UIWindowManager::DialogExists(void)
 {
-	int i;
-	UIWidget *pWidg;
+    int       i;
+    UIWidget *pWidg;
 
-	for( i = 1; i <= m_children.NumObjects(); i++ )
-	{
-		pWidg = m_children.ObjectAt( i );
-		if( pWidg->isSubclassOf( UIDialog ) )
-		{
-			return true;
-		}
-	}
+    for (i = 1; i <= m_children.NumObjects(); i++) {
+        pWidg = m_children.ObjectAt(i);
+        if (pWidg->isSubclassOf(UIDialog)) {
+            return true;
+        }
+    }
 
-	return false;
+    return false;
 }
 
-void UIWindowManager::RemoveAllDialogBoxes
-	(
-	void
-	)
-
+void UIWindowManager::RemoveAllDialogBoxes(void)
 {
-	int i;
-	UIWidget *pWidg;
+    int       i;
+    UIWidget *pWidg;
 
-	for( i = m_children.NumObjects(); i > 0; i-- )
-	{
-		pWidg = m_children.ObjectAt( i );
-		if( pWidg->isSubclassOf( UIDialog ) )
-		{
-			UIDialog *pDlg = ( UIDialog * )pWidg;
+    for (i = m_children.NumObjects(); i > 0; i--) {
+        pWidg = m_children.ObjectAt(i);
+        if (pWidg->isSubclassOf(UIDialog)) {
+            UIDialog *pDlg = (UIDialog *)pWidg;
 
-			pDlg->m_cancel->m_command += "\n";
-			uii.Cmd_Stuff( pDlg->m_cancel->m_command );
-		}
-	}
+            pDlg->m_cancel->m_command += "\n";
+            uii.Cmd_Stuff(pDlg->m_cancel->m_command);
+        }
+    }
 }
diff --git a/code/uilib/uiwinman.h b/code/uilib/uiwinman.h
index 6e0f94a2..2fdd0a16 100644
--- a/code/uilib/uiwinman.h
+++ b/code/uilib/uiwinman.h
@@ -20,73 +20,74 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __UIWINMAN_H__
-#define __UIWINMAN_H__
+#pragma once
 
-class Binding {
+class Binding
+{
 public:
-	str binding;
-	int key1;
-	int key2;
+    str binding;
+    int key1;
+    int key2;
 };
 
-class UIWindowManager : public UIWidget {
-	unsigned int m_lastbuttons;
-	UIPoint2D m_oldpos;
-	SafePtr<UIWidget> m_oldview;
-	SafePtr<UIWidget> m_firstResponder;
-	class UIWidget *m_activeControl;
-	class UIWidget *m_backgroundwidget;
-	class UIReggedMaterial *m_cursor;
-	str m_cursorname;
-	bool m_showcursor;
-	Container<UIReggedMaterial *> m_materiallist;
-	bool m_amidead;
-	class UIWidget *m_bindactive;
-	Container<Binding *> bindings;
+class UIWindowManager : public UIWidget
+{
+    unsigned int                  m_lastbuttons;
+    UIPoint2D                     m_oldpos;
+    SafePtr<UIWidget>             m_oldview;
+    SafePtr<UIWidget>             m_firstResponder;
+    class UIWidget               *m_activeControl;
+    class UIWidget               *m_backgroundwidget;
+    class UIReggedMaterial       *m_cursor;
+    str                           m_cursorname;
+    bool                          m_showcursor;
+    Container<UIReggedMaterial *> m_materiallist;
+    bool                          m_amidead;
+    class UIWidget               *m_bindactive;
+    Container<Binding *>          bindings;
 
 public:
-	CLASS_PROTOTYPE( UIWindowManager );
+    CLASS_PROTOTYPE(UIWindowManager);
 
 private:
-	void			ViewEvent( UIWidget *view, Event& event, UIPoint2D& pos, int buttons );
-	UIWidget		*getResponder( UIPoint2D& pos );
+    void      ViewEvent(UIWidget *view, Event& event, UIPoint2D& pos, int buttons);
+    UIWidget *getResponder(UIPoint2D& pos);
 
 public:
-	UIWindowManager();
-	~UIWindowManager();
+    UIWindowManager();
+    ~UIWindowManager();
 
-	void				Init( const UIRect2D& frame, const char *fontname );
-	void				setBackgroundWidget( UIWidget *widget );
-	void				UpdateViews( void );
-	void				ServiceEvents( void );
-	void				setFirstResponder( UIWidget *responder );
-	UIWidget			*getFirstResponder( void );
-	UIWidget			*ActiveControl( void );
-	void				ActivateControl( UIWidget *control );
-	void				DeactivateCurrentControl( void );
-	UIWidget			*FindNextControl( UIWidget *control );
-	UIWidget			*FindPrevControl( UIWidget *control );
-	void				setCursor( const char *string );
-	void				showCursor( bool show );
-	virtual void		CharEvent( int ch ) override;
-	virtual qboolean	KeyEvent( int key, unsigned int time ) override;
-	void				CreateMenus( void );
-	UIReggedMaterial	*RegisterShader( const str& name );
-	UIReggedMaterial	*RefreshShader( const str& name );
-	void				CleanupShadersFromList( void );
-	void				RefreshShadersFromList( void );
-	void				DeactivateCurrentSmart( void );
-	bool				IsDead( void );
-	int					AddBinding( str binding );
-	str					GetKeyStringForCommand( str command, int index, qboolean alternate, int *key1, int *key2 );
-	void				BindKeyToCommand( str command, int key, int index, qboolean alternate );
-	UIWidget			*BindActive( void );
-	void				SetBindActive( UIWidget *w );
-	virtual void		Shutdown( void ) override;
-	void				DeactiveFloatingWindows( void );
-	bool				DialogExists( void );
-	void				RemoveAllDialogBoxes( void );
+    void              Init(const UIRect2D& frame, const char *fontname);
+    void              setBackgroundWidget(UIWidget *widget);
+    void              UpdateViews(void);
+    void              ServiceEvents(void);
+    void              setFirstResponder(UIWidget *responder);
+    UIWidget         *getFirstResponder(void);
+    UIWidget         *ActiveControl(void);
+    void              ActivateControl(UIWidget *control);
+    void              DeactivateCurrentControl(void);
+    UIWidget         *FindNextControl(UIWidget *control);
+    UIWidget         *FindPrevControl(UIWidget *control);
+    void              setCursor(const char *string);
+    void              showCursor(bool show);
+    virtual void      CharEvent(int ch) override;
+    virtual qboolean  KeyEvent(int key, unsigned int time) override;
+    void              CreateMenus(void);
+    UIReggedMaterial *RegisterShader(const str& name);
+    UIReggedMaterial *RefreshShader(const str& name);
+    void              CleanupShadersFromList(void);
+    void              RefreshShadersFromList(void);
+    void              DeactivateCurrentSmart(void);
+    bool              IsDead(void);
+    int               AddBinding(str binding);
+    str               GetKeyStringForCommand(str command, int index, qboolean alternate, int *key1, int *key2);
+    void              BindKeyToCommand(str command, int key, int index, qboolean alternate);
+    UIWidget         *BindActive(void);
+    void              SetBindActive(UIWidget *w);
+    virtual void      Shutdown(void) override;
+    void              DeactiveFloatingWindows(void);
+    bool              DialogExists(void);
+    void              RemoveAllDialogBoxes(void);
 };
 
 extern Event W_MouseExited;
@@ -105,5 +106,3 @@ extern Event W_AnyMouseDown;
 extern Event W_AnyMouseUp;
 
 extern UIWindowManager uWinMan;
-
-#endif
diff --git a/code/uilib/ulist.h b/code/uilib/ulist.h
index a728193a..cf2a3636 100644
--- a/code/uilib/ulist.h
+++ b/code/uilib/ulist.h
@@ -1,6 +1,6 @@
 /*
 ===========================================================================
-Copyright (C) 2015 the OpenMoHAA team
+Copyright (C) 2024 the OpenMoHAA team
 
 This file is part of OpenMoHAA source code.
 
@@ -20,8 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#ifndef __ULIST_H__
-#define __ULIST_H__
+#pragma once
 
 template< typename type >
 class UListItem {
@@ -179,7 +178,7 @@ bool UList< type >::IteratePrev
 {
 	m_at = m_at->prev;
 
-	if( m_at == this )
+	if( m_at == &m_top )
 	{
 		m_at = NULL;
 		return false;
@@ -306,8 +305,7 @@ int UList< type >::getCount
 	)
 
 {
-	// FIXME: stub
-	return 0;
+	return m_count;
 }
 
 template< typename type >
@@ -338,8 +336,7 @@ void *UList< type >::getPosition
 	)
 
 {
-	// FIXME: stub
-	return NULL;
+	return (void*)m_at;
 }
 
 template< typename type >
@@ -349,7 +346,5 @@ void UList< type >::setPosition
 	)
 
 {
-	// FIXME: stub
+	m_at = static_cast<UListItem<type>*>(pos);
 }
-
-#endif /* __ULIST_H__ */
diff --git a/code/unix/ChangeLog b/code/unix/ChangeLog
deleted file mode 100644
index 5a5592bf..00000000
--- a/code/unix/ChangeLog
+++ /dev/null
@@ -1,2981 +0,0 @@
-TODO: the Mac port seems stable, but outputs a bunch of warnings..
-	
-2004-05-22
-- updated the xcode project from Apple's version
-  now with the latest vm_ppc code
-	
-2004-05-21 Timothee Besset <ttimo@idsoftware.com>
-- fixed the Linux build to compile again on sid (glext.h and gcc3 warnings)
-- 2 weeks ago, hacked up the source to compile on panther / xcode 1.1
-  several cleanups were needed, and VM support seems broke (hangs or crashes)
-- got altivec optimisations from Apple (Kenneth Dyke)
-  merged back in
-- looks like with the new code merge the VM support is back in and working
-	
-2003-09-15 Timothee Besset <ttimo@idsoftware.com>
-- import Q3 java master code, cleanups on monster
-
-2003-08-31 Timothee Besset <ttimo@idsoftware.com>
-+ loki_setup hell
-  https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=626
-  http://zerowing.idsoftware.com/linux/q3a/index.html#glibc
-  text mode installer in loki_setup image built on Mandrake 7.2 crashes on some glibc 2.3 systems such as RH9 etc.
-  need to move to a different version of the installer, and update old installers to keep them still 'installing'
-  moving to build the setup binaries on Debian Woody systems (glibc 2.2, text mode installer will no longer work on 2.1 systems)
-  hacked together a new setup, using setup tree from RTCW. would need a complete revamp if a new full setup with new binaries is needed
-
-2003-07-17 Timothee Besset <ttimo@idsoftware.com>
-	+ new cvsreport, testing per-module config
-
-2003-01-19 Timothee Besset <ttimo@idsoftware.com>
-	+ building on both gcc 2.x and 3.x
-		added conf modules to check gcc version
-		ccache support
-
-2003-01-13 Timothee Besset <ttimo@idsoftware.com>
-	+ tweaking around for gcc 3.x build
-		edit Conscript to change the compiler
-
-2002-12-16 Timothee Besset <ttimo@idsoftware.com>
-	+ added pbEmit class to auth code, emit CD keys to local PB master
-
-2002-11-14 Timothee Besset <ttimo@idsoftware.com>
-  + up to latest makeself.sh
-	+ add both quake3.x86 and quake3-smp.x86 to setup
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=573
-	  console setup crash / glibc 2.3 (Debian Sid)
-		investigated, put together a workaround		
-
-2002-11-5 Timothee Besset <ttimo@idsoftware.com>
-	+ Linux building both smp and non-smp again. Will have to put both in setup
-	+ added in_subframe to toggle X subframe event handling
-	+ reworked the timing code to be more reliable
-	+ cleaned up dgamouse/in_mouse code, removed unnecessary dgamouse var
-	+ made the mouse grabbing an in_nograb cvar, no longer a compile time option
-	  in_nograb 1 force in_dgamouse 0 and r_fullscreen 0 (any of those two will b0rk)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=565
-	  mouse issues on Suze 8.1 - related to subframe event timing
-		added code chunk to detect broken X timing and disable subframe
-	+ tweaked the subframe/X bug workaround to be less paranoid	
-
-2002-10-28 Timothee Besset <ttimo@idsoftware.com>
-	+ no longer blocking demo recording if g_synchronous clients != 0
-		only sending out a warning (everyone does g_sync 1 ; record ; g_sync 0)
-
-2002-10-21 Timothee Besset <ttimo@idsoftware.com>
-	+ building final mod sdk setups (added lcc bins, added link to q3asm-turbo in readme)
-
-2002-10-8 Timothee Besset <ttimo@idsoftware.com>
-	+ quickfix cl_maxpackets > 125 brings back to 100
-
-1.32 release ---
-
-2002-10-7 Timothee Besset <ttimo@idsoftware.com>
-	+ made the 'demo' command case-insensitive on extension match (it was confused by demo FOUR.DM_68)
-	+ mouse wheel scrolling with in_mouse 1 + window mode was not working, fixed (DI didn't catch)
-	+ removing on-the-fly pk3 build from Linux setup, using the finalized ones now
-		added 'pk3' option to cons for toggle of pk3 building
-
-2002-10-5 Timothee Besset <ttimo@idsoftware.com>
-  + updated win32 mod sdk (in win32/mod-sdk-setup)
-    added q3asm and lcc source
-    updated the .bat to build VMs
-
-2002-10-3 Timothee Besset <ttimo@idsoftware.com>
-	+ linux mod sdk, wrote the bulk of the scripts
-
-2002-9-30 Timothee Besset <ttimo@idsoftware.com>
-	+ ATVI Quake 3 1.32 Patch #9
-		rolling back to the way it was before, leaving 1v1 force vote exploit, the fix was worse than the bug
-		from comment on bug #9 in tracker:
-		
-		actually the fix is worse than the original bug
-
-     after the fix, voting when you are alone on the server was no longer working
-     it was kinda intended in the fix, that you would have to be at least two to pass a vote .. but
-     it is an oversight.
-
-     calling a vote in a 1v1 game against a bot fails immediately
-     (calling a vote in any situation where there's only 1 live player fails)
-
-     Say a server's running some lame custom map that you have but a friend doesn't. You can't go
-     on the server and change it to the map you want to play, so he ends up having to auto-dl it at
-     8K a second just so you can switch from it.
-
-     This particular 2 clients, vote / quit exploit would involve too many changes to fix properly.
-     I am reverting back to the old version, and leaving as WNF 
-
-2002-9-29 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=50
-		added Wheel support to the DirectInput code IN_DIMouse (in_mouse 1)
-		tweaked the Wheel mouse reading for in_mouse -1 (old win32 input code)
-			handle correctly when zDelta is > 120
-			provide a in_logitechbug cvar to handle buggy Logitech MouseWare driver sending wheel events twice
-
-2002-9-26 Timothee Besset <ttimo@idsoftware.com>
-	+ ATVI Quake 3 1.32 Patch #38
-		adding trap_SetPbClStatus, reliably checks for PB presence before enabling PB in UI
-
-2002-9-25 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
-		SVF_CLIENTMASK, fixed a typo
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=555
-		pushed cl_maxpackets upper limit to 125 (from 100) per CPMA Arqon's request
-
-2002-9-24 Timothee Besset <ttimo@idsoftware.com>
-	+ ATVI Quake 3 1.32 Patch #33
-		PB reporting sv_paused cvar hacked, fixed SV_CheckPaused to use a Cvar_Set
-	+ ATVI Quake 3 1.32 Patch #24
-		added [skipnotify] from RTCW, use to display in the console only, but not on client screen
-		(also fixes pb_msgprefix and pb_sv_msgprefix)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=553
-		using correct error message if listen server starting as cl_punkbuster 0 sv_punkbuster 1
-	+ ATVI Quake 3 1.32 Patch #35
-		text auto wrap in UI code was eating the last word if it was wrapping
-		fixed in Q3 and TA UI (this bug could have affected the server print message also)
-	+ some updates to the win32 cons post-build process	
-
-2002-9-21 Timothee Besset <ttimo@idsoftware.com>
-	+ adding bspc cons build script
-
-2002-9-19 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=552
-		disconnect reason is transmitted in the disconnect command and processed into com_errorMessage
-		(similar to RTCW behaviour)
-		added UI for com_errorMessage cvar in baseq3/, if client is kicked/dropped/disconnected for whatever reason
-		(this is already functional in TA)
-	+ ATVI Quake 3 1.32 Patch #9
-		failing vote if there's only one voting client (fixes exploit on 2-player server where one player votes then disconnects, forcing vote to pass)
-	+ ATVI Quake 3 1.32 Patch #5
-		removed the userInfoChanged message (was a debugging leftover)
-	+ ATVI Quake 3 1.32 Patch #18
-		rcon was not properly fixed yet, this only showed up for PB commands
-		changed the rcon parsing again to be more reliable
-	
-2002-9-18 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=549
-		the demo command has a list of compatible protocols, it will loop through 66 67 68
-		you can do '/demo four' and it will try four.dm_66 four.dm_67 four.dm_68
-		or you can explicitely give a '/demo demoname.dm_??'
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
-		added SVF_CLIENTMASK (0x00000002), works only with <= 32 players
-		set bitmask of players to which send entity
-
-2002-9-17 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=550
-		rcon bug fix
-	+ some scons updates for win32 (post build)
-	+ 1.32rc2
-
-2002-9-06 Timothee Besset <ttimo@idsoftware.com>
-	+ updated completely the setup system:
-		fixed cons stuff to build setup with cons -- release setup
-		working from new setup codebase with some custom patches:
-			https://bugzilla.icculus.org/show_bug.cgi?id=52
-			https://bugzilla.icculus.org/show_bug.cgi?id=53
-			checked that BSD support was still in (brandelfing and symlinks) .. will have to get tester feedback
-		bumped version to 1.32rc1	
-		TODO: update the windows .VCT (standalone setup and auto-update)
-
-2002-9-04 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=543
-		backport from RTCW 1.4 code
-		rcon commands where sent after being tokenized and rebuilt
-		that was breaking any quoting, for instance 'rcon g_motd "hooka pooka"'
-		added Cmd_Cmd() to retrieve the un-tokenized command and transmit as is on both ends
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=542
-		b0rked text wrapping in connect screen
-		was a missing sizeScale in q3_ui/, and a bad param in ui/
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=540
-		backport fix to pk3 reordering, happens when clearing the references, bad order from connection may break stuff		
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=527
-		TA ui/, quickfix to netSource (mod stuff, doesn't affect TA)
-	+ cleaned up broken old DO_WIN32 stuff in cons scripts
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=526
-		typo in models2.shader
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=443
-		Linux client: sub-frame timing of key/mouse events
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=453
-		added mousewheel support: wheel to scroll, ctrl+wheel to scroll faster, shift+wheel to scroll history
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=545
-		bumped server count to 4096
-	+ keep around: __asm__ __volatile__ ("int $0x03");		
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=516
-		moved screenshots to backend with a new RC_SCREENSHOT render command
-		fixes the r_smp 1 garbled screenshots
-
-2002-8-29 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=539
-		new VM code from Raven's Sof2
-	+ cons / qvmtools build system fixes	
-	+ had to get a new qe3.ico again (resource compiler error)
-		http://vasin.hypermart.net/eei.htm
-	+ updated, basic testing on win32, merging back in trunk
-	+ merged bug-539 branch back into trunk, officialize the new VM code
-
-2002-8-26 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=472
-		linux client: handle ctrl+space situations (could leave space locked on + space not working with ctrl on)
-	+ update the build system, build q3lcc and q3asm etc. on demand
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=62
-		fixed invisible players/entities
-
-2002-8-23 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=536
-		fixing donedl being ignored after autodl if map_restart'ed (propagate from RTCW)
-		ignoring multiple map_restart (propagated from RTCW)
-	+ reworked the server 'client text ignored' message to only trigger	when there's actually a message that doesn't get to the game VM
-
-2002-8-18 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=528
-		ydnar: reorg bits in the drawsurf sort index, push MAX_SHADERS to 2^12
-	+ commented out some debug stuff in java auth server
-	+ added FAQ item with Linux & BSD patch to handle broadcast on multiple interfaces
-
-2002-8-15 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=534
-		fixing rcon being broken on NT/XP with > 23 days uptime (or so)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=525
-		changed the rcon buffer size to avoid overflows and dropping part of the message
-
-2002-8-14 Timothee Besset <ttimo@idsoftware.com>
-	+ hacked in some experimental win32 stuff to the cons files
-		(win32 recognition and pk3 installs .. very very experimental but I needed it for win32 dev)
-	+	https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=521
-		ui/ and q3_ui/ : added text auto wrapping in the connection screen drawing (server message)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=531
-		removed the MPlayer stuff from the server browsers
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=505
-		enabled back the ignore if protocol is != (fixes Wolf servers showing in browser)
-
-2002-8-10 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=500
-    propagated IP banning fix from RTCW
-
-2002-8-08 Timothee Besset <ttimo@idsoftware.com>
-	+ propagate additional sv_lanForceRate fix from RTCW
-
-2002-8-07 Timothee Besset <ttimo@idsoftware.com>
-	+ added trap_FS_Seek
-
-2002-8-05 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=50
-    fixed the DI mouse init procedure
-		
-2002-8-05 Timothee Besset <ttimo@idsoftware.com>
-	+ removed sv_allowanonymous, was dummy and polluting the serverinfo
-		(sv_allowanonymous was designed to flag wether server was public or not, but that's replaced by g_needpass)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=514
-		sv_strictAuth (default 1): server variable to control wether strict CDKEY auth should be performed
-			this is required if you want reliable cl_guid on the server
-		extended the getIpAuthorize (server->auth message) syntax
-		sending the fs_game at all times (default 'baseq3'), dummy sv_allowAnonymous 0, strict auth flag
-		NOTE: 1.31 server on baseq3 sends a getIpAuthorize packet like:
-			processing packet: getIpAuthorize -1230824753 217.128.77.195  0
-			the auth server will mistakenly read fs_game as '0'
-	+ TAGGED the master / auth source as pre-1_32
-		will need to go back to this to comment out all my debugging crap
-
-2002-8-04 Timothee Besset <ttimo@idsoftware.com>
-	+ cleaned master server stuff, client was prompting master.quake3arena.com, 
-		server was sending heartbeats to master3.idsoftware.com
-		both point to 192.246.40.56, unified to master.quake3arena.com
-		the MPlayer master, master.quake3world.com doesn't exist anymore, switched it to master.quake3arena.com
-
-2002-8-02 Timothee Besset <ttimo@idsoftware.com>
-	+ added auth server source, reorganized
-	+ auth server name / master key optionally set on command line for master and auth servers
-	+ auth and master config in build system
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=524
-		changed default GL driver from libGL.so to libGL.so.1
-		see LSB 1.2 spec: http://www.linuxbase.org/spec/refspecs/LSB_1.2.0/gLSB/libgl.html
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=480
-		applying the 'no cp command' experimental fix for beta phase
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=462
-		backported from RTCW, fix to packet fragmenting emission
-		FIXME: there is some verbose code that we have to take out in the final version (grep for #462)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=475
-		backported from RTCW, don't get dropped if the server changes map while connecting (ignore outdated cp)
-	+ PROTOCOL BUMPED TO 68	
-
-2002-8-01 Timothee Besset <ttimo@idsoftware.com>
-	+ Linux: dedicated build was not setting up signal handler like the full client does
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=522
-		SplashDamage bugfix, now clearing client gentity before GAME_INIT call (instead of after)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=498
-		fixed NET_AdrToString to print the port as unsigned int (for ports > 1^^15, was showing negative)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=501
-		maintain IP in userinfo sent to game
-	+ checking in master server source	
-
-2002-7-31 Timothee Besset <ttimo@idsoftware.com>
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=513
-		https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=506
-		porting fix from RTCW codebase. client re-orders it's pk3s to scan in the same order than the server
-		this eliminates several 'Invalid .PK3 file referenced' situations (caused by client not referencing the same thing as server)
-	+ fixed border remnants in ta ui
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=517
-		ERR_DROP if PB client off / server on conflict when starting local server
-	+ quickfix to q3 ui / punkbuster detect in server browser
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=458
-		code fix, no more taunt spam
-	+ cons install of PB .so files
-	+ correct MOD_KAMIKAZE and MOD_JUICED in TA games.log
-
-2002-7-29 Timothee Besset <ttimo@idsoftware.com>
-	+ q3 ui: completed confirmation prompts and messages (added UI_ConfirmMenu_Style & UI_Message)
-	+ ta ui: backported 'conditionalopen' from RTCW (conditionalopen <cvar> <menu1> <menu2>)
-	+ ta ui: confirmation prompt for punkbuster enable/disable etc.
-	+ added the win32 DLLs to pb/win32/
-	
-2002-7-28 Timothee Besset <ttimo@idsoftware.com>
-	+ ta ui: sv_punkbuster in StartServer menu
-	+ ta ui: added cl_punkbuster in server browser
-	+ view filters are in a modal dialog
-	+ new files: filter.menu menus.txt (pak3.pk3 updated)
-	+ fix broken link in Linux FAQ	
-
-2002-7-27 Timothee Besset <ttimo@idsoftware.com>
-	+ ta ui: PB display in the browser, in it's additional tab, with sorting
-
-2002-7-26 Timothee Besset <ttimo@idsoftware.com>
-	+ PB UI: for baseq3/ AND missionpack/
-		q3_ui: Punkbuster: Enable/Disable in server broswer (cl_punkbuster)
-		q3_ui: PB logo, PB Yes/No in browser (TODO: validate this to be working)
-		q3_ui: added sv_punkbuster toggle in start server menu
-	+ automated building of the new PK3s, unix/Conscript-pk3
-
-2002-7-25 Timothee Besset <ttimo@idsoftware.com>
-	+ added PB build scripts on Linux, fixed the Linux build
-
-2002-7-12 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=511
-    fixing re.SetColor crash for widescreen displays (q3dm11)
-    was calling to the renderer while not registered
-
-2002-6-19 Timothee Besset <ttimo@idsoftware.com>
-  + r_roundImagesDown 0 + map q3dm16 -> tr_image.c ResampleTexture crash
-	  buffer overflow because of resample to 2048x..
-		xian_q3dm12_leftwall4fin.jpg 1152x384
-		bumped one buffer byte p1[1024] -> byte p1[2048], added a safe check
-
-2002-6-14 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=493
-	  propagate a renderer fix from RTCW. fixes a one-frame visual glitch when mod code 
-		registers a shader after drawsurfaces are generated but before the frame is rendered
-
-2002-6-12 Timothee Besset <ttimo@idsoftware.com>
-  + added cons and pcons to unix/, updated the build script
-
-2002-5-24 Timothee Besset <ttimo@idsoftware.com>
-	towards a new Q3 release?
-		some bug fixes require protocol change, or mod code/mod interface change to be fixed properly
-		this is a biz decision, dunno yet if we are going to want a new protocol (probably not)
-	-> have to create a branch for the 1.31b, i.e. backwards compatible with 1.31 'Stable-1_31'
-	  and put the 1.32 specific / protocol changes on trunk
-	no telling what will go in SOS in the end .. probably 1.32	
-
-2002-5-5 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=491
-	  adding a sv_lanForceRate (defaults to 1) to turn on/off server forcing rate of LAN clients
-		(only affects LAN dedicated clients - dedicated 1, default behaviour forces LAN clients to 99999 rate)
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=470
-	  fixing potential overflows with cl_cdkey (propagated from RTCW)
-	+ cons-based build system (imported from Wolf, was partly written for mod tools release already)
-	  building with SMP on by default
-	+ better #ifdef SMP handling ('disabled at compile time' message)	
-	+ https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=494	  
-		Q_vsnprintf for vsprintf calls in the core
-		not putting this in game code as we'd need a vsnprintf implementation in bg_lib.c
-
-2002-4-5 Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=462
-    taking out the fix which was found broken and incomplete  
-
-2002-8-4  Timothee Besset <ttimo@idsoftware.com>
-  + adding NO_MOUSEGRAB define (select in the Makefile)
-
-2002-2-4  Timothee Besset <ttimo@idsoftware.com>
-  + applying Gareth's SMP patch
-  + count number of CPUs (Sys_ProcessorCount in unix_shared.c), default r_smp appropriately
-  + bumping version to 1.32
-  + if XInitThreads fails, set r_smp to zero
-
-2002-28-2  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=462
-    send potential remaining fragmented packets before sending a gamestate
-    
-2002-26-2  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=455
-  removed old libMesaVoodooGL.so loading code
-  Voodoo cards should use XF4/DRI, that load code was outdated and confusing people with broken OpenGL
-
-2002-16-1  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=441
-  adding brandelf calls to the setup building process so that our binaries run on BSD
-
-2002-1-1  Timothee Besset <ttimo@idsoftware.com>
-  + updated FAQ with BSD info (bug #441)
-  + FAQ update on CLIENT_UNKNOWN_TO_AUTH
-  + FAQ update for proper strace usage
-
-2001-12-12  Timothee Besset <ttimo@idsoftware.com>
-  + Q3 1.31 point release
-    updating build_setup.sh to new pk3 files
-    (baseq3/pak7.pk3 missionpack/pak2.pk3)
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=395
-    adding quake3.xpm icon, and modified the setup accordingly to put symlinks
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=390
-    ignoring SIGTTIN SIGTTOU
-
-2001-06-12  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=402
-    bug with full scene
-
-2001-04-12  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=398
-    cg_bobup cheat protect
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=399
-    fixed Setup > System > Driver info crash
-  + checked in code/spank.sh script, perform checksuming  
-	
-2001-18-09  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371
-    propagating sound code fixes from Wolf to Q3
-	
-2001-11-08  Timothee Besset <ttimo@idsoftware.com>
-  + setup script was still broken, damn shell expansion
-    the exit code for Q3 was always zero instead of $?
-    propagating the fix to Wolf
-
-2001-11-04  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=382
-    modified challenge code for motd to be truly random
-	
-2001-10-31  Timothee Besset <ttimo@idsoftware.com>
-  Moved updated q3asm and lcc source at the toplevel, MissionPack/q3asm
-  and MissionPack/lcc
-
-2001-10-29  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=381
-    build system is now functional
-
-2001-10-21  Timothee Besset <ttimo@idsoftware.com>
-  + updated Sys_LoadDll code on linux to search in the following order:
-    #1 current directory
-    #2 fs_homepath
-    #3 fs_basepath
-    this was needed to make mod developement easier
-
-2001-10-09  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=51
-    the code to buffer the redirection was in there but disabled? (Com_Printf)
-    enabled it back
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=52
-    connection issues / userinfo
-    client side fix, instead of sending 'connect <userinfo>' packet
-    we now send 'connect "<userinfo>"'
-
-2001-10-08  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371
-    added a PROT_READ to the mmap call
-    this was needed to go around a bug in glibc i586 i686, memset doing read access
-    since the audio_fd is opened O_RDWD this is harmless to Q3
-
-2001-10-07  Timothee Besset <ttimo@idsoftware.com>
-  + updating from SOS
-    S_WriteLinearBlastStereo16 C/asm is back in snd_mix.c (Graeme)
-    r_showtris r_shownormal cheat protections
-  + Sys_LoadDll changes:
-    removing -debug search when loading native dlls
-    changing the fatal aborts when not finding native from release only to debug only (was a misfeature)
-    used to search in cd_path which is bogus, now searching in pwd if basepath fails
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=275
-    fixed r_fullbright not being cheat protected / was a CVAR_LATCHED|CVAR_CHEAT issue
-
-2001-09-06  Timothee Besset <ttimo@idsoftware.com>
-  + updated from SOS, some changes to qcommon/unzip.c (statics)
-
-2001-08-27  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=3
-  Added some code in CL_InitDownloads to use FS_ComparePaks and print out information about server-referenced paks that are missing on the client. It is a first step, allows to get precise information about what can cause a connection to fail (typically when the user is sent back to the main screen).
-
-2001-08-22  Timothee Besset <ttimo@idsoftware.com>
-  + https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=86
-  fixed sound bug (with Graeme hints)
-
-2001-08-20  Timothee Besset <ttimo@idsoftware.com>
-  + made sure Sys_Printf doesn't get into an endless loop if logfile is on
-    fixed qconsole.log issues, +set logfile 1 +set fs_debug 1 was crashing (any OS)
-    fixed logfile 1 / ttycon 1 issue, didn't exit properly (same endless looping)
-    also fixes an issue reported by q3f team
-  + changed rcon commands from Com_DPrintf to Com_Printf so that they show up in the console
-  (with IP information)
-
-2001-08-19  Timothee Besset <ttimo@idsoftware.com>
-  + fixed https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=91
-  (autodownload toggle in q3 ui)
-  + fixed https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=76
-  g_password issue
-  + fixed https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=93
-  cheat protecting r_lodCurveError
-  + wontfix https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=92
-
-2001-08-18  Timothee Besset <ttimo@idsoftware.com>
-  + more fixes to the 7-button mouse code (linux only)
-  + updated faq about gamma slider
-  + added "servers don't show up in ingame browser" to faq
-  + added Alt+Enter toggle for fullscreen/windowed (linux)
-
-2001-08-16  Timothee Besset <ttimo@idsoftware.com>
-  reconfiguring CVS repository to give access to Gareth
-  + testin gareth's access
-
-2001-08-03  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=85
-  fixes in the setup code for older bash versions
-  
-2001-08-02  Timothee Besset <ttimo@idsoftware.com>
-  * commented out assembly implementation of S_WriteLinearBlastStereo16, using modified C implementation from Zaphod
-    need to check performance: https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=88
-  * finished const declarations in CG_Trace calls, was needed in pmove_t declaration and some other functions
-    cgame/cg_local.h : CG_trace trap_CM_BoxTrace
-    game/bg_public.h : using const in pmove_t trace functions prototypes
-    (fixes gcc warnings: assignment from incompatible pointer type)
-
-2001-07-26  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=78
-  mapped K_MOUSE4 K_MOUSE5
-
-2001-07-23  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=5
-  more fixes, handling meta characters and various kinds of backspace
-
-2001-07-22  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=5
-  after testing feedback, fixed more stuff:
-    better backspace, works with putty and potentially more terminals
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=51
-  band aid fix to rcon status, incresed MAX_PUSHED_EVENTS from 256 to 1024
-  (adds 28kb of mem requirements)
-
-2001-07-21  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=2
-  using XF86 Gamma extension to set the gamma in game from the menus
-  (previous behaviour was to set /r_gamma and restart, renderer relying on s_gammatable)
-  restoring initial gamma on GLimp_ShutDown
-
-2001-07-19  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=5
-  first usable version of dedicated console
-  added history and completion functionality
-  ready for some testing
-  still some TODOs and FIXMEs:
-    keep the currently edited line when going back from history exploration
-    edit the current line with cursor, insert mode etc.
-
-2001-07-18  Timothee Besset <ttimo@idsoftware.com>
-  * starting TAB completion and history for the dedicated server (tty console)
-  removed Sys_ConsoleOutput (unused)
-  removing bogus nostdout variable
-  cleanup of a big chunk of code that Bernd commented out and scheduled for deletion
-  moved completion code from client/cl_keys.c stuff into qcommon/common.c, Field_CompleteCommand(field_t*)
-
-2001-07-13  Timothee Besset <ttimo@idsoftware.com>
-  * fixed https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=8
-  screenshots overwrites
-  * fixed https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=31
-  DOUBLE SIGNAL FAULT
-
-2001-07-11  Timothee Besset <ttimo@idsoftware.com>
-  * fix for french keybards / console toggle / bound to XK_twosuperior
-
-2001-07-10  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=19
-  cleanup of the keyboard code, adding com_developer message in case XLookupString would fail
-
-2001-07-10  Timothee Besset <ttimo@idsoftware.com>
-  * https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=33
-  using our custom handlers for X errors, should make things more robust
-  (X docs say some X errors are not fatal, but the default X handler exits the app anyway)
-
-2001-07-08  Timothee Besset <ttimo@idsoftware.com>
-	* https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=19
-	keyboard state issues, fixed the sticking with ctrl key (thks relnev)
-
-2001-07-07  Timothee Besset <ttimo@idsoftware.com>
-	* closing https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=13
-	the fixes to bug #9 solved this one too
-	* checking in to SOS
-
-2001-07-05  Timothee Besset <ttimo@idsoftware.com>
-	* work on https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=9
-	filesystem code changes:
-	updated the documentation in files.c to the current system
-	added correct fs_homepath fs_basepath fs_cdpath scanning to FS_SV_FOpenFileRead
-	  (fixes description.txt not found, and probably a few other linux issues)
-
-2001-06-29  Timothee Besset <ttimo@idsoftware.com>
-	* fixed setup issues (graphical/console)
-	https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=6
-
-2001-06-26  Timothee Besset <ttimo@idsoftware.com>
-	* bug tracker is online at https://zerowing.idsoftware.com/bugzilla
-	  authentication, use login: bugs password: b00gies
-	  for now, using it as the linux bug tracker, possible use for more OSes and programs if anyone is interested.
-	* tweaked the graphical setup to send to bugs@idsoftware.com on errors instead of support@lokigames.com
-	  
-2001-06-19  Timothee Besset <ttimo@idsoftware.com>
-        * fixed generated launch script /usr/local/bin/quake3, exit $* should be exit
-
-2001-06-18  Timothee Besset <ttimo@idsoftware.com>
-        * rebuilt 1.29f setups, released as 1.29f-beta1 'Q3 1.29f linux-i386 Jun 19 2001'
-
-2001-06-10  Timothee Besset <ttimo@idsoftware.com>
-	* rebuilt against PR source, packaged 1.29b setups
-
-2001-05-25  Timothee Besset <ttimo@idsoftware.com>
-	* graphical setup, based on Loki's setup tool (GPL)
-
-2001-05-22  Timothee Besset <ttimo@idsoftware.com>
-	* changed fs_basepath to fs_homepath, according to Graeme's changes (probably missed this change?)
-	  this fixes the q3key prompting at each game startup
-
-2001-05-20  Timothee Besset <ttimo@idsoftware.com>
-	* rebuilding 1.28b, various fixes on linux build:
-	  - SetProgramPath was renamed to Sys_SetDefaultCDPath in unix_shared.c
-	    updated unix_main.c accordingly
-	  - some prototypes in qgl.h are guarded by #ifndef GL_VERSION_1_2 (ARB extentions)
-	    those prototypes are needed by linux_glimp for importing functions and casting, added a #ifdef __linux__
-	    (not a clean solution)
-	  - game/q_shared.h
-	    little endian / big endian functions have been added
-	    gcc generates warnings about functions being unused .. inlined them
-	   - cgame/cg_marks.c
-	     // TTimo
-	     // gcc warning: might be used uninitialized
-	     float sInc = 0.0;
-             float s = 0.0;
-
-2001-05-15  Timothee Besset <ttimo@idsoftware.com>
-	* fixes to linux Makefile for bspc 2.1h
-	* various updates to 1.28b on linux
-
-2001-05-09  Timothee Besset <ttimo@idsoftware.com>
-
-	* R. Duffy reverted game/bg_pmove.c PM_CheckDuck, was a merging screup on my side
-	* updated setup to 1.27z, removed the .so from the setup distribution (they were in 1.27g because of issues)
-	  FIXME: gotta get pk3's first
-
-2001-05-04  Timothee Besset <ttimo@idsoftware.com>
-
-	* fixes to gcc, building RC for 1.27s
-
-2001-05-01  Timothee Besset <ttimo@idsoftware.com>
-
-	* added qcommon/huffman.c to the Makefile
-	* gcc -Wall:
-	commenting out 
-	  CL_Netchan_Encode CL_Netchan_Decode (cl_net_chan.c)
-	  Netchan_ScramblePacket Netchan_UnScramblePacket (net_chan.c)
-	  SV_Netchan_Encode SV_Netchan_Decode (sv_net_chan.c)
-
-2001-04-26  Timothee Besset <ttimo@idsoftware.com>
-
-	* fixed dedicated server crash when entering the VM_COMPILED qagame on a mod (some statics lacked initialization)
-
-2001-04-25  Timothee Besset <ttimo@idsoftware.com>
-
-	* added $(Q3POBJ) to clean target (cleanup of platform-dependent objects)
-	* more make clean improvements
-
-2001-04-23  Timothee Besset <ttimo@idsoftware.com>
-
-	* cleanup the mod selection code, remove duplicates
-	* some issues with release builds, my main developement box doesn't build stable binaries with release settings
-	  removing -fomit-frame-pointer seems to fix (there's probably a performance hit)
-	  see OMIT-FRAME-POINTER.txt
-
-2001-04-13  Timothee Besset <ttimo@idsoftware.com>
-
-	* checked in a first set of merged files
-
-2001-04-06  Timothee Besset <ttimo@idsoftware.com>
-
-	* merged back the core linux parts to make 1.27g linux build from the Source Safe tree again
-
-2001-02-27  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: tag with changes as of today
-	  cvs tag id1-27j-loki01027
-
-	* code/qcommon/msg.c: numFields loop (SOS).
-	* code/qcommon/files.c: ue Q_stricmp (SOS uses stricmp, was strcmp).
-	* code/game/q_shared.h (Q3_VERSION): 1.27j. Also
-	MAX_STRING_TOKENS upped from 256 to 1024 (SOS).
-
-	* code/server/sv_snapshot.c (SV_AddEntitiesVisibleFromPoint): see below.
-	* code/game/g_public.h (SVF_NOTSINGLECLIENT): added (SOS).
-
-	* code/server/sv_ccmds.c: see below.
-	* code/game/g_main.c: g_gametype cvar now userinfo (SOS).
-
-	* code/game/g_active.c (SendPendingPredictableEvents): new (SOS).
-	* code/game/bg_misc.c: new SOS (sos010227)
-
-	* SOS: new update sos010227.
-	
-2001-02-22  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: now in sync with last SOS and cleanup up
- 	  cvs tag id1-27i-loki01022
-	
-	* code/ui/ui_shared.c: below.
-	* code/ui/ui_main.c: leftover code!
-	* code/server/sv_world.c: below.
-	* code/server/sv_snapshot.c: below.
-	* code/server/sv_init.c: below.
-	* code/server/sv_game.c: below.
-	* code/server/sv_client.c: below.
-	* code/server/sv_ccmds.c: below.
-	* code/server/sv_bot.c: below.
-	* code/server/server.h: below.
-	* code/renderer/tr_surface.c: below. 
-	* code/renderer/tr_shader.c: changed assert to early return.
-	* code/renderer/tr_shade_calc.c: below.
-	* code/renderer/tr_shade.c: below.
-	* code/renderer/tr_scene.c: below.
-	* code/renderer/tr_mesh.c: below.
-	* code/renderer/tr_local.h: below.
-	* code/qcommon/vm_x86.c: cleanup.
-	* code/qcommon/vm.c: below.
-	* code/qcommon/unzip.c: below.
-	* code/qcommon/qcommon.h: below.
-	* code/qcommon/files.c: below.
-	* code/qcommon/cvar.c: cleanup.
-
-2001-02-21  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/qcommon/common.c: cleanup.
-	* code/qcommon/cm_trace.c: cleanup.
-	* code/qcommon/cm_patch.c: cleanup.
-	* code/qcommon/cm_public.h: cleanup.
-	* code/game/q_shared.h: cleanup.
-	* code/game/q_shared.c: cleanup.
-	* code/game/q_math.c: cleanup.
-	* code/game/g_syscalls.asm: changed (once more) floor,ceil etc.
-	* code/game/g_spawn.c: cleanup.
-	* code/game/g_session.c: cleanup.
-	* code/game/g_cmds.c: cleanup.
-	* code/game/g_client.c: cleanup.
-	* code/game/g_arenas.c: cleanup.
-	* code/game/bg_slidemove.c: cleanup.
-	* code/game/bg_pmove.c (PM_CheckDuck): old call to trace?
-	* code/game/bg_misc.c: cleanup.
-	* code/game/be_aas.h: dead code.
-	* code/game/ai_dmq3.c: cleanup. One clear/copy switched?
-	* code/game/ai_dmnet.c: more //*/. Why oh why not DEBUG....
-
-	* code/client/snd_mix.c: below.
-	* code/client/snd_dma.c: below.
-	* code/client/keys.h: cleanup.
-	TODO: #error in q3_ui/keycodes.h ?
-
-	* code/client/client.h: cleanup.
-	* code/client/cl_main.c: misplaced bracket. Cleanup.
-	* code/client/cl_keys.c: below.
-	* code/client/cl_cin.c: below.
-	* code/client/cl_cgame.c: cleanup.
-	TODO: define assert for Win32 or guard my assertions.
-
-	* code/cgame/cg_syscalls.c: below.
-	* code/cgame/cg_servercmds.c: below.
-	* code/cgame/cg_players.c: cleanup.
-
-	* code/cgame/cg_newdraw.c: remember to diff against cg_newDraw.c
-	in SOS (mixed case).
-	TODO: get id to use cg_newdraw.c, and to remove cg_newDraw.c/cpp.
-
-	* code/cgame/cg_main.c: below.
-	* code/cgame/cg_local.h: below.
-	* code/cgame/cg_event.c: below.
-	* code/cgame/cg_drawtools.c: below.
-	* code/cgame/cg_draw.c: cleanup.
-	* code/cgame/cg_consolecmds.c: dead code.
-	* code/bspc/qbsp.h: below.
-	* code/bspc/l_poly.c: below. 
-	* code/bspc/l_math.c: cleanup.
-	* code/bspc/bspc.c: cleanup.
-	* code/bspc/be_aas_bspc.c: cleanup. 
-	* code/bspc/aas_map.c: kept comments - merge loss at their end?
-	* code/bspc/aas_file.c: cleanup. 
-
-	* code/botlib/be_interface.c: this file is plain impossible. There
-	are layers of code made dead with /* */ and the resurrected by
-	//* or // /* or variations of this. I reverted to exact mirror
-	image of SOS to be sure - short of removing it's too easy to mistake 
-	live code for dead one.
-	Later: have to change 5 occurences to avoid gcc complaints about
-	nested comment tokens.
-	TODO: somebody please get rid of the cruft in here.
-
-	* code/botlib/be_ai_move.c: redundant typedef.
-	* code/botlib/be_ai_chat.c: assertions on signed string index.
-	Note: this is not in my ChangeLog - ouch.
-	TODO: use  gcc -fsigned-char on all platsforms to enforce Win32
-	TODO  behavior (PPC has a default unsigned char, Intel has not).
-	* code/botlib/be_aas_sample.c (AAS_TraceClientBBox): one code block
-	was placed in different location, and one FPE hack not used. I would
-	expect that divide by zero will still occur here.
-
-	* code/botlib/be_aas_reach.c: below. 
-	* code/botlib/be_aas_cluster.c: cleanup. 
-	* CVS: the last tag (below) marks the version with a lot of history
-	and additional comments. I am now bringing the codebase in sync with
-	SOS as of yesterday, cleaning out comments, dead code and other
-	differences to minimize a diff - in a valiant if futile attempt to
-	roll back changes into the id codebase.
-	Note: I ignore the $SOS$ - these are unfortunate but will change
-	in the same awkward way at their end.
-	Note: I stick to #if 0 instead of C comments around dead code id
-	kept (nested comments issue). The commentary is changed to sosYYMMDD
-	and includes the token DEAD.
-
-2001-02-20  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: update, then tag current version as
-	 cvs tag id1-27i-loki010219
-
-	* SOS: patched up to sos010219.
-
-	* code/qcommon/cm_trace.c (CM_Trace): fabs on sphere offsets (SOS).
-	* code/game/bg_slidemove.c (PM_StepSlideMove): stepSize vs. STEPSIZE (SOS).
-	* code/game/bg_pmove.c (PM_CheckDuck): fix in stand up check (SOS).
-	* code/bspc/bspc.c (main): -capsule (SOS).
-	* code/bspc/qbsp.h: below (SOS).
-	* code/bspc/be_aas_bspc.c (capsule_collision): added (SOS).
-	* code/bspc/aas_map.c (CapsuleOriginDistanceFromPlane): added and used (SOS).
-	* code/bspc/aas_file.c (AAS_WriteAASFile): removed diagnostics recently
-	added. No matter how long you wait, they'll always get you ;-).
-	* code/botlib/be_aas_cluster.c: enabled LogWrites, different flood (SOS).
-
-	* SOS: patching up to snapshot sos010219. 
-	Note: For brevity, I use as marker sosYYMMDD now instead of bkYYMMDD, to 
-	distinguish from changes not in SOS.
-
-	*  CVS: tagged current version before patching up with SOS.
-         cvs tag id1-27i-loki010216-bsd
-
-2001-02-16  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/server/sv_init.c: DLL_ONLY sets sv_pure to 0 and ROM.
-	TODO: determine good sv_pure policy for DLL-only servers.
-
-	* code/renderer/tr_shade_calc.c: my_ftol implementation (BSD).
-
-	* code/unix/Makefile: FreeBSD sections.
-	TODO: include target-specific Make-freebsd etc.,
-	include a Make-local not in CVS for build preferences,
-	and generally clean up this mess.
-	* code/unix/unix_glw.h: guard #error
-	* code/unix/linux_snd.c: soundcard.h location (BSD).
-	* code/unix/linux_glimp.c: guard system headers.
-	Later: added Joystick stubs.
-	Note: linux_ etc. prefixes start to loose meaning as we
-	re-use most of this on UNIXes anyway. I didn't use Raf's
-	freebsd_joystick.c but instead put generic stubs here.
-	TODO: introduce generic -DNO_JOYSTICK flag.
-	* code/renderer/tr_local.h: my_ftol guard.
-	* code/renderer/qgl.h: FreeBSD guards.
-	* code/qcommon/vm_x86.c: sys/types include on FreeBSD.
-	* code/qcommon/md4.c: Win32 pragma guard.
-	* code/qcommon/common.c: Com_Memcpy/Memset external.
-	* code/game/q_shared.h: added FreeBSD defines. 
-	* code/game/q_math.c (BoxOnPlaneSide): FreeBSD conditional.
-	TODO: check whether we have/need the assembly version anyway.
-	* code/client/snd_mix.c: use C fallback on FreeBSD.
-	Note: all of the above changes from the original port by Rafael Barrero.
-
-	* CVS: tagged current version before merging FreeBSD related changes.
-         cvs tag id1-27i-loki010215-ppc
-
-2001-02-15  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/Makefile: BSD related changes.
-	* code/cgame/cg_draw.c: hacked phone jack rendering check for Debug.
-	TODO: finish Debug, fix CG_DrawDisconnect !!!
-
-	* code/unix/vm_x86.c: error on compile attempts. Fight redundancy!
-	* code/qcommon/vm_x86.c (VM_CallCompiled): dummy for linkage on PPC.
-	Note: DLL_ONLY is the global Makefile option for DLL-only builts.
-	Currently only executed on Linux.
-	* code/unix/unix_main.c: *ppc postfix for DLLs. Ignored the changes
-	to redundant code (have to remove the unused Un/LoadDll/API calls).
-	* code/server/sv_game.c (VMA): changed macro (see below). PPC.
-	* code/qcommon/vm.c (VM_DllSyscall): see lengthy commentary by Ryan.
-	The existing VM code makes certain assumptions about the layout of
-	varargs on the stack, which fall apart with call conventions that
-	don't even put all parameters on the stack (gcc on PPC, register-rich).
-	Using a dedicated memory area as our own stack. This should actually
-	be the default behavior.
-	Later: make vm_* cvars INIT/ROM for DLL_ONLY target.
-
-	* code/qcommon/common.c: PPC change (from Ryan Gordon).
-
-2001-02-07  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/unix_main.c: disabled FPE for debug for the time
-	being (that is, until I can figure out
-          Program received signal SIGFPE, Arithmetic exception.
-          RB_BeginSurface (shader=0x449572e0, fogNum=0) at ..//renderer/tr_shade.c:307
-          307 tess.shaderTime = backEnd.refdef.floatTime - tess.shader->timeOffset;
-        without any NaN's involved.
-	TODO: unmask other FPE's selectively (see Mike's Tribes2, no getenv though).
-
-2001-02-06  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: up to date with todays snapshot.
-	Note: got the date wrong, comment used was bk010205. Duh.
-
-	* code/server/sv_snapshot.c (SV_UpdateServerCommandsToClient): below. 
-	* code/server/sv_main.c (SV_ReplacePendingServerCommands): new (SOS).
-	* code/server/server.h: reliableSent (SOS).
-
-	* code/renderer/tr_shade.c (ProjectDlightTexture): see below.
-	* code/renderer/tr_scene.c: see below.
-	* code/renderer/tr_public.h: see below (SOS).
-	* code/renderer/tr_local.h: additive light support (SOS).
-
-	* code/qcommon/cm_trace.c (CM_Trace): new tw.sphere.use branch (SOS).
-
-	* code/game/g_spawn.c: notta, notq3a entities (SOS).
-	* code/game/ai_dmq3.c: MAX_ACTIVATEAREAS search (SOS).
-	
-	* code/client/cl_cgame.c: see below.
-	* code/cgame/cg_syscalls.c (trap_R_AddAdditiveLightToScene): below.
-	* code/cgame/cg_syscalls.asm: see below (trap_R_AddAdditiveLightToScene).
-	* code/cgame/cg_public.h: CG_R_ADDADDITIVELIGHTTOSCENE (SOS).
-	
-	* code/bspc/l_math.c: new VectorLengthSquared, removed rotate/matrix (SOS).
-	* code/bspc/bspc.c (BSPC_VERSION): was 2.1e, now?
-	* code/bspc/be_aas_bspc.c (BotImport_Trace): CM_BoxTrace sig. (SOS).
-	* code/bspc/aas_file.c (AAS_WriteAASFile): SOS.
-	* code/botlib/be_aas_sample.c (AAS_DeAllocAASLink): SOS.
-
-	* code/unix/unix_main.c (Sys_LoadDll): do not load from installdir
-	in NDEBUG (confusing relic from old Makefile). Postfix -debug.so
-	for debug binaries to let both builds coexist.
-
-	* code/unix/Makefile: updated install targets and VERSION.
-
-	* Win32: build from SOS snapshot.
-	Note: Unix CR/LF in *.dsw/*.dsp fucks up MSVC++.
-
-2001-02-02  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: all changes up to today.
-
-	* code/server/sv_init.c (SV_TouchCGame): added. Also memset
-	on reallocated client data (SOS).
-	* code/qcommon/qcommon.h: see below.
-	* code/qcommon/cvar.c (Cvar_SetLatched): new (SOS).
-	* code/qcommon/cm_trace.c: more sphere test fixes (SOS).
-	Note: SOS encryption key expired and updated by MrElusive.
-
-	* code/qcommon/cm_patch.c (CM_TraceThroughPatchCollide): 
-	fix from MrElusive, fall through curved corner floors (q3dm17).
-	Later: also in SOS (so is shadow FPE fix).
-
-	* Win32: can't get an unadulterated SOS snapshot to build.
-	First, fix CR/LF back again (Linux client converts all).
-	 find . -name '*.ds*' -print
-	 alias dos2unix='recode ibmpc..lat1' 
-	 alias unix2dos='recode lat1..ibmpc'
-        Next, find a *.dws that works? Nope, no cigar.
-	
-2001-02-01  Bernd Kreimeier  <bk@lokigames.com>
-
-	* Win32: have to update dsp/dsw/etc. files in CVS, too.
-
-	* CVS: tag previous version before update
-         cvs tag id1-27h-loki010131-beta3
-
-	* code/game/q_math.c (Q_rsqrt): guard, #ifndef __linux__ 
-	for assert (for Win32 build).
-	TODO: assert replacement for Win32?
-	* code/q3_ui/ui_qmenu.c: see below.
-	* code/q3_ui/ui_players.c: see below.
-	* code/q3_ui/ui_controls2.c: float const with f postfix
-	Note: Win32 C4305 warning. Somebody at id has been doing
-	a lot of these recently as well...
-
-	* code/cgame/cg_players.c (CG_PlayerShadow): applied fix by 
-	MrElusive, removed FPE hack (player shadows on zero mormals).
-	Prolly in this evenings' CVS.
-
-	* code/server/sv_game.c: new signatures (capsule again).
-	* code/server/server.h: new signatures (SV_Trace,ClipToEntity).
-	* code/server/sv_bot.c: new signatures (above).
-	* code/qcommon/cm_trace.c: a truckload of changes. Math
-	code added before moved upwards. Capsule traces added all
-	over the place, old box traces moved in conditional
-	branches, functions renamed and wrapped. Eliminated some
-	of the previous' versions deadcode to keep diffs smaller.
-	TODO: once a point release is out and reasonably bug
-	TODO  free, remove // bkYYMMDD annotations where SOS related.
-
-	* code/qcommon/cm_public.h: new signatures in prototypes.
-	* code/qcommon/cm_patch.c: dead code re-enabled, new
-	sections (conditional branches for spheres) added to 
-	several trace functions.
-	* code/qcommon/cm_local.h (CAPSULE_MODEL_HANDLE): added.
-	* code/qcommon/cm_load.c (CM_TempBoxModel): capsules.
-
-	* code/game/q_shared.h (Q3_VERSION): 1.27i now (new QVM traps).
-
-	* code/game/g_syscalls.asm: see below.
-	* code/game/g_public.h (SVF_CAPSULE): added (SOS). Also
-	G_ entry poiints for capsule traces.
-
-	* code/client/cl_cgame.c: see below.
-	* code/cgame/cg_syscalls.c: see below.
-	* code/cgame/cg_syscalls.asm: see below.
-	* code/cgame/cg_public.h: new capsule trace code (SOS).
-
-2001-01-31  Bernd Kreimeier  <bk@lokigames.com>
-
-	* Win32: test compile (WinCVS, MSVC++). Have to guard isnan.
-	Note: too much shit going on....
-
-2001-01-30  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: update for patching up (pre-1.27i).
-
-	* SOS: new changes (new collision detection primitives).
-	Now Version 1.27i. 
-	TODO: start testing using DLL's (QVM code is out of sync).
-
-2001-01-25  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: caught up till today (below).
-	* code/qcommon/cm_trace.c: new functions added: RotatePoint,	
-	TransposeMatrix, CreateRotationMatrix (SOS).
-	(CM_TransformedBoxTrace): new rotation code used here.
-
-	* code/q3_ui/ui_demo2.c: sizeof(extension). SOS.
-	* code/game/g_cmds.c (G_SayTo): CON_CONNECTED.
-	* code/game/ai_main.c: HOOK added (SOS).
-	* code/botlib/be_aas_move.c (AAS_HorizontalVelocityForJump): 
-	correct fix for FPE occuring (SOS).
-	* code/game/ai_dmq3.c: initmove.viewoffset (SOS).
-
-	* code/game/q_math.c: guard asser/isnan with Q3_VM (q3asm).
-	TODO: define Com_Error based assert macro? NDEBUG?
-
-2001-01-24  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/server/sv_ccmds.c (SV_MapRestart_f): some debug.
-	TODO: map_restart 0 disconnects external client in 1.27h?
-
-	* code/renderer/tr_image.c (LoadTGA): added some commentary 
-	and dead code based on fixes from GtkRadiant (Leonardo found
-	flipped TGA's).
-
-2001-01-23  Bernd Kreimeier  <bk@lokigames.com>
-
-	* BETA3: finished testing, ready to upload to id FTP.
-	Later: neither the FreeBSD beta not the Linux Beta3
-	uloaded. Beta2 not yet released, and clients get
-	disconnected with Beta2 and Beta3 on SV_MapRestart_f.
-
-2001-01-22  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/client/cl_main.c (CL_InitDownloads): undid yesterday (SOS).
-	* code/botlib/be_aas_sample.c (AAS_DeAllocAASLink): guard print (SOS).
-	* code/server/sv_client.c (SV_DirectConnect): VM_Call disconnect (SOS).
-	* code/qcommon/files.c (FS_ListFilteredFiles): trailing slashes (SOS).
-	* code/game/g_cmds.c (SetTeam): print change (SOS).
-	Note: the above plus VectorClear(v1) (below) are todays SOS changes.
-
-	* code/cgame/cg_players.c (CG_PlayerShadow): ignore bogus 
-	(all zero) planes. This caused FPE in ProjectPointOnPlane.
-	TODO: why does trace return zero normal planes?
-	Note: gdb seems totally at loss with vec3_t arrays....
-
-	* code/botlib/be_aas_sample.c (AAS_TraceAreas): FPE.
-	NaN in uninitialized v1 that wasn't supposed to be referred 
-	to in this branch. 
-
-	* code/botlib/be_aas_move.c (AAS_HorizontalVelocityForJump): 
-	FPE divide by zero (zero zvel, zero t) for jump estimates.
-
-	* code/client/cl_main.c (CL_Frame):1856. uivm==NULL on
-	client after server crashed.
-	TODO: check that uivm always non-NULL for client.
-	TODO: do setenv(FX_NO_SIGNALS) to avoid exit errors...
-
-	* code/unix/linux_glimp.c (GLW_SetMode): added "Indirect"
-	Mesa token to software rendering detection. Reworded error
-	output and added drivername.
-	TODO: measure framerate instead?
-
-2001-01-21  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: caught up with changes up until today. 
-
-	* code/server/sv_init.c (SV_SetConfigstring): gentity != NULL 
-
-	* code/server/sv_client.c: connect to "{all bots" server.
-	* code/renderer/tr_init.c: JPEG extension on  screenshots
-	* code/qcommon/files.c: modes based on mods, fs_basegame
-
-	* code/q3_ui/ui_demo2.c: dm3 extension (demo names, protocol).
-
-	* code/game/g_client.c: savedEvents[] removed.
-	* code/game/bg_misc.c: event sequence fixes.
-	* code/client/snd_dma.c (S_StopBackgroundTrack): different use.	
-	* code/client/cl_main.c: demo file handling changed (names).
-	Also CL_InitDownloads: always next download.
-
-	* code/cgame/cg_servercmds.c: cg_thirdPerson.
-	* code/cgame/cg_weapons.c: see below.
-	Also CG_ShotgunPattern: different call (seed parameter).
-
-	* code/cgame/cg_main.c: see below.
-	* code/cgame/cg_local.h: new cg_noProjectileTrail Cvar.
-	* code/cgame/cg_effects.c (CG_BubbleTrail): early out (above).
-
-	* code/bspc/l_poly.c (BOGUS_RANGE): increased.
-	* code/bspc/bspc.c: applied patch up to "2.1e"
-
-2001-01-18  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/ui/ui_main.c: below.
-	* code/q3_ui/ui_main.c: UI_HASUNIQUECDKEY comment.
-	Note: mods have to return qfalse. See Bug #2890 in Fenris.
-
-2001-01-17  Bernd Kreimeier  <bk@lokigames.com>
-	
-	* BETA2: finished testing, uploaded to id's FTP for release.
-	
-2001-01-16  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: checking in preparation for Beta2.
-         cvs tag id1-27h-loki010116-beta2
-
-	* SOS: new bspc "2.1e". No change on 1.27h.
-
-	* TEST: patch-up seems to work fine. No new files have been added
-	to the linkage (i.e. the ft2/ files now added), so we might not be
-	feature complete.
-
-	* code/game/g_active.c (ClientThink_real): id MISSIONPACK
-	conditional in addition to the ones I added earlier.
-	* code/qcommon/files.c: REJECT. Linux hack for userdir threw it off.
-	* code/qcommon/unzip.c: REJECT. CRC-32 section removed.
-	Later: unused tempB
-
-	* code/q3_ui/ui_syscalls.asm: REJECT. Start/StopBackgroundTrack.
-	* code/ui/ui_syscalls.asm: REJECT. syscalls ids from 1.27h 
-	as of SOS (floor/ceil - will this ever get straightened out)
-	* code/win32/win_input.c: REJECT. g_pMouse edit.
-	* ui/menus.txt: REJECT. Replaced with 1.27h version.
-        Note: some more due to $SOS$.
-	
-	* ui/: new scripts.
-	cinematicmenu.menu, demo_quit.menu, ingame.txt, serverinfo_old.menu
-        vid_restart.menu
-
-	* code/ft2/ttconfig.h: below.
-	* code/ft2/sfconfig.h: below.
-	* code/ft2/pstables.h: below.
-	* code/ft2/psnames.c: below.
-	* code/ft2/psdriver.h/c: below. 
-	* code/ft2/keys.h: below. 
-	* code/ft2/ftbbox.c: new in 1.27h
-	
-	* code/cgame/cg_newdraw.c: beware: cg_newDraw.c gets lost in diff easily.
-
-	* code/cgame/cg_rankings.c: file removed from SOS.
-	
-2001-01-15  Bernd Kreimeier  <bk@lokigames.com>
-
-	* Patch-up: patching up from RC4 to 1.27h current.
-	No changes since 010112 snapshot.
-	ln -s sos010112/ work
- 	diff -urbB sos001204-rc4/ work > work.diff
- 	ln -s cvs-1.27g/ work
- 	patch -p0 < work.diff  > work.patch
- 	find cvs1.27g/ -name '*.rej' -print
-
-	* SOS: adding the remaining SOS snapshots to CVS.
-         cvs import Quake3_sos sos001211 pr1-27g-win32-001211
-	Note: at this point id warned about repository corruption.
-	Watch out for the syscall stuff in particular.
-	 cvs import Quake3_sos sos010104 pr1-27g-win32-010104
-	 cvs import Quake3_sos sos010108 pr1-27h-win32-010108
-         cvs import Quake3_sos sos010110 pr1-27h-win32-010110
-	 cvs import Quake3_sos sos010112 pr1-27h-win32-010112
-	Note: the first 1.27h might be the public (server only) 
-	beta released, the second one was post release. Beware
-	of source files added and removed (botlib headers, FT2).
-	Note: why so late? Don't ask...
-
-2001-01-08  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: id's working up to 1.27h (server side fix for
-	Guard exploit seems to force earlier release). Updating
-	CVS (most of the changes are debug code put in and
-	then disabled, plus some fixes as below). Next patching
-	up to current SOS.
-
-2001-01-07  Bernd Kreimeier  <bk@lokigames.com>
-
-	* Makefile: need to rework this for multiple platforms.
-	We also need null/null_vm.c for platforms where we don't
-	have JIT (assembly emit).
-
-2001-01-04  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/q3_ui/ui_connect.c (UI_DisplayDownloadInfo): time
-	information for current (vs. start of download) is wrong,
-	thus negative 1 "estimated time", as well as transfer
-	rate just negative downloadSize. Not fixed.
-	
-	* code/unix/unix_main.c (Sys_ParseArgs): added.
-	Note: for support/us, to identify builts. This is only
-	a skeleton right now - if I ever feel the need to support
-	more than "-v" and "--version" I'll have to flesh this out.
-
-	* code/unix/linux_glimp.c (signal_handler): see below.
-	* code/unix/unix_main.c (Sys_Exit): added an abstraction
-	layer for exit/_exit/assert/raise issues.
-	Note: need both a better debug/backtrace handling, and
-	have to find a way to determine why/where the alleged
-	startup/exit errors happen...
-
-2001-01-03  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/game/g_mem.c (G_Alloc): ERR_DROP initiated by
-	addbot commands for large sv_maxclients, allegedly
-	caused segfaults in 1.17. Not reproducible.
-	TODO: recover more gracefully from failure to add bot?
-
-	* code/renderer/tr_light.c (R_LightForPoint): Tim Angus
-	reports a crashbug with nolight maps. Also assertion in
-	R_SetupEntityLightingGrid, might want conditional there.
-	DONE: fixed crash on LightForPoint for nolight maps.
-
-	* code/qcommon/qcommon.h: NUM_SERVER_PORTS. A feature 
-	request to increase this, or make it more flexible
-	otherwise (Fenris).
-	TODO: id decision on more flexible NUM_SERVER_PORTS.
-
-2001-01-02  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/snapvector.nasm: fixed FPU bit (the current
-	one had reserved bits off, behavior should not change).
-	* code/qcommon/vm_x86.c: fixed symbols (below).
-	* code/unix/ftol.nasm: FPU bits weren't correct (duh).
-	DONE: shoot-though floor (q3dm5)
-	DONE: cursor-in-rect off  (TA/Player model selection)
-	Note: in gdb, "disassemble <funcname>" is your friend.
-
-	* code/cgame/cg_public.h:  CG_MEMSET is set to 100. In
-	cg_syscalls.asm it's 101. If I change it I get Bad trap 100
-	from the cgame VM code, so the 1.27g "official" VM code
-	uses it.
-
-	* code/unix/linux_common.c: have to fall back to C, the
-	current assembly is buggy...
-	* code/unix/Makefile (linux_common.o): added.
-	Later: also for dedicated. Less portable this way.
-	TODO: C_ONLY for dedicated on non-i386 only?
-
-	* code/qcommon/common.c: do not use memcpy/memset under Linux.
-	* code/unix/linux_common.c: added Andrew's assembly port.
-	TODO: C_ONLY for Com_Memset/Memcpy? Conditionals are fubared.
-
-	* code/qcommon/vm.c (VM_Init): use Win32 defaults (do not
-	use DLL's by default). This exposes DLL rounding errors
-	(damage through floors), and we don't want DLL's used by
-	default anyway.
-	TODO: why vm_ui default of 1?
-
-	* code/botlib/l_precomp.c (SourceWarning): removed assert.
-
-	* code/game/bg_lib.c (acos): defined, but we don't actually
-	use it except where the cg_syscalls.asm trap is used.
-
-	* code/game/g_public.h: missing lots of trap tokens.
-	* code/game/g_syscalls.c: missing lots of traps.
-	* code/game/g_syscalls.asm: more inconsistent hooks, were:
-	 equ floor					-111
-         equ ceil					-112
-	 equ testPrintInt			        -113
-         equ testPrintFloat			        -114
-	now changed to match cg_syscalls.
-	Note: fixed this in UI earlier, how did this slip through 
-	the diffs against SOS?
-	
-	* code/game/g_syscalls.c: no acos hook.
-	* code/cgame/cg_syscalls.c: no acos hook.
-	* code/cgame/cg_syscalls.asm: has acos hook as -112
-	Note: report from Tim Angus. The acos function is in bg_lib.c
-	which is linked only into ui (not q3_ui). That means we are
-	using libc acos right now?
-	Note: QVM traps are negative?
-
-	* BSD/Irix: tagged current CVS (not all of the below) as
-	 cvs tag id1-27g-loki010102-bsd1
-	for BSD work (Rafael Barrero). Also be used for Irix update.
-
-2001-01-01  Bernd Kreimeier  <bk@lokigames.com>
-
-	* SOS: adding the remaining SOS snapshots to CVS.
-         cvs import Quake3_sos sos001201-rc3 pr1-27f-win32-001201-rc3
-         cvs import Quake3_sos sos001202 pr1-27f-win32-001202
-         cvs import Quake3_sos sos001204 pr1-27g-win32-001204-rc4
-	This is the codebase to which the Linux branch has been patched
-	up. I can't verify whether this is identical to the RC4 codebase
-	as the tag doesn't work (but can check against the ZIP file..)
-	 cvs import Quake3_sos sos001211 pr1-27g-win32-001211
-	The above snapshot contains a (post-release?) fix to ui_syscalls
-	in ui/ and q3_ui/. This change has been used in Linux (Beta1 and
-	above). At this point, id discouraged further use of SOS due to
-	repository corruption on their end. No further snapshots were
-	taken since.
-
-	* Fenris: since the release of the Beta1 bugs have been
-	maintained at http://fenris.lokigames.com/. I am going to
-	list issues here as they get fixed.
-	
-2000-12-21  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/renderer/tr_font.c: graceful silence with old mods?
-	* code/botlib/l_precomp.c (SourceWarning): graceful exit if old mod?
-
-2000-12-20  Bernd Kreimeier  <bk@lokigames.com>
-	
-	* code/server/sv_ccmds.c (SV_MapRestart_f): see below.
-	* code/qcommon/vm.c: currentVM is 0x0 in VM_ArgPtr.
-	In VM_Call, oldVM was NULL - made conditional the
-	reset of currentVM to oldVM.
-
-2000-12-18  Bernd Kreimeier  <bk@lokigames.com>
-
-	* BETA1: closed Linux beta release. Stripped debug
-	and release binaries, DLL's, and pak4.pk3. CVS checkin,
-	will be tagged as 
-            cvs tag id1-27g-loki001218-beta1
-	Later: id added a pak5.pk3 to the Win32 point release,
-	added this to the BETA1 best.
-
-	* code/qcommon/vm_x86.c: C37F.
-	* code/unix/snapvector.nasm: C37F.
-	Note: short of any real evidence, I gamble and use max. 
-	precision (as well as default Linux precision, but NOT 
-	Win32 precision). It seems that precision change is not 
-	really an issue (despite Graeme's claim that the cursor
-	in the menu was/is off). I also pick the roundiung behavior
-	that is seemingly used by ANSI and gcc (but possibly not
-	Win32 _ftol depending on build).
-
-2000-12-15  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/Makefile: added snapvector.o
-	* code/unix/unix_shared.c: #if 0'ed the old snapvector code.
-	* code/unix/snapvector.nasm (Sys_SnapVectorCW): two new
-	assembly functions from AndrewH that explicitely set the 
-	FPU control word to convert vec3_t, to ensure cross-platform 
-	behavior for both DLL and QVM.
-
-	* code/unix/ftol.nasm (Q_ftolC37F): for globals. 
-
-	* code/unix/unix_main.c: took out global FPU manipulation.
-	For clarity this should be VM only.
-	* code/qcommon/vm_x86.c: added prototypes for the ftol
-	library. To select a specific behavior for the entire VM,
-	set ftolPtr accordingly.
-	Later: the GCC ftol function of course affect the stack
-	(there is no "declspec naked"). The problem seems to be 
-	that the VM never handles the stack in a way compatible 
-	to regular gcc C functions. For some odd reason _ftol seems 
-	to do the right thing under Win32. All 4 control words 
-	implemented at the moment work just fine with the menus.
-
-	* code/unix/ftol.nasm: added a small library of "safe" qftol
-	variations that explicitely set the control word to the
-	relevant (4) possibilities.
-
-2000-12-13  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/qcommon/vm_x86.c: an entire day spent trying to nail
-	the ftol issues. It breaks down like this: id used to use
-	an unsafe (no setting FPU control word) fistp. That seemingly
-	caused subtle physics bugs which nobody cared about in 1.17.
-	They then changed the UI code, and ran into the UI bugs:
-	menu entries shifted to the right, fonts vanishing. Then
-	they switched to using _ftol. Then they had to reproduce 
-	the old behavior for the physics code due to public outrage.
-	My original port used a simple (long)float cast, which gcc
-	seemingly compiles to code that does OR 0C00 on whatever
-	current control word (precision unchanged). This breaks the
-	menus. If I use the unprotected fistp instead, which should
-	(Linux 037F default) use "nearest/even", then my menus are
-	correct. That would mean Win32 _ftol in id's compile does
-	the same, only that would require /qifist or some equivalent
-	compile flag, which I can't find. Two disassemblies of _ftol
-	I got from others showed OR 0C00 as part of the default (ANSI)
-	behavior.
-
-2000-12-13  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/game/bg_pmove.c (PmoveSingle): trap_SnapVector.
-	The one true and single call to snap velocity.
-	Note: bspc/map.c:void SnapVector(vec3_t normal)
-        qcommon/cm_patch.c:void CM_SnapVector(vec3_t normal)
-	game/q_shared.h: #define SnapVector(v) {v[0]=((int)(v[0]));...
-
-	* code/client/cl_cgame.c: CG_SNAPVECTOR. 
-	* code/server/sv_game.c:  G_SNAPVECTOR.
-	Note: these go through trap_SnapVector in syscalls.
-
-	* code/unix/unix_shared.c (Sys_SnapVector): sticking to
-	old Linux version for now...
-	* code/win32/win_shared.c (Sys_SnapVector): changed.
-	Note: Graeme points out this was changed to fix ftol
-	artifacts?
-	TODO: calculate errors for various ftol variants...
-
-	* code/qcommon/vm_x86.c: both the old fistp code (1.17)
-	and the new qftol function apparatently work. Using the
-	ftol.nasm code for now.
-
-	* code/unix/Makefile: DO_NASM and ftol.o. 
-
-	* code/unix/ftol.nasm (qftol): created from Mike's SoF
-	replacements, with Andrew's help to satify the VM
-	stack/call requirements.
-	TODO: use Q_ftol herein to replace myftol elsewhere.
-
-	* code/unix/unix_main.c (Sys_ConfigureFPU): SIGFPE. 
-	TODO: divide by zero in botlib. Disable this for now.
-	Note: we can't introduce calculation differences between
-	versions, so fixing these will have to wait.
-
-	* code/qcommon/vm_x86.c: two new lines in Win32 branch 
-	missing from Linux assembly in AsmCall:
-	 mov eax, dword ptr [edi] 
-	 and eax, [callMask]      
-        Added, doesn't seem to affect UI etc. bugs.
-	Later: no FTOL_PTR, use fistp non-IEEE assembly as in old
-	version. This seems to work for Q3 and TA, while qftol 
-	(simple cast) does not - for Win32 Graeme says the reverse 
-	is true.
-
-	* code/qcommon/vm_x86_old.c: used the old cvs-1.17 version.
-	Two fixes (Hunk_Alloc, Com_Memcpy), and it works:
-	  +set vm_game 2 +set vm_ui 2 +set vm_cgame 2 
-        UI, cgame and game w/o apparent problems.
-
-2000-12-12  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/Makefile: cleanup of redundant flags.
-	Removed bogus MALLOC_CHECK (note to self: export MALLOC_CHECK_=2).  
-	Also DO_SHLIB_CC on all UI DLL's.
-	Added and removed DEBUG_VM flag.
-	TODO: figure out whether Zoid did UI this way intentionally.
-	Note: this seemingly fixed the botimport problem, although
-	most of the changes were just redundant CFLAGS removed. Given
-	our wanker toolchain, should have been more paranoid. All
-	DLL's can now be used w/o apparent problems.
-
-	* code/server/sv_main.c: gvm init.
-	* code/server/sv_game.c: gvm assertions.
-	* code/unix/unix_main.c (Sys_LoadDll): print vmMain
-	Note: top no avail. There is some odd ld/gdb problem here
-	that prevents examining globals and obfuscates part of
-	the stack between VM_Call and lower level code, through
-	G_InitGame. This is not just DLL's being loaded and unloaded.
-	Wromg flags during build? The vmCvar for "bot_developer"
-	ends up overlapping global botimport in memory, which
-	thus zero-fills part of the function pointer table.
-
-	* code/server/sv_bot.c (SV_BotInitBotLib): this (by way of
-	GetBotLibAPI) is responsible for setting botimport, which,
-	if using the game DLL, is not properly set up. Called in
-	SV_Init().
-
-	* code/game/q_shared.c: Q_strncpyz does zero padding (duh).
-	Note: calls strncpy, which does a zero fill up to destsize.
-	If destsize exceeds memory size, zero padding will overwrite
-	adjacent memory. Suspicion was this happend to botimport.
-
-	* code/qcommon/cvar.c: possible problem in Q_strncpyz call.
-
-	* code/botlib/be_ai_weap.c (weaponinfo_fields): made this static.
-	Note: it seems that the "number" string got replaced by
-	 p def.fields[0]
-         {name = 0x40000000 "\177ELF\001\001\001", offset = 2, type = 50, ..
-        Memory corruption?
-
-	* code/game/inv.h (WEAPONINDEX_GAUNTLET): defined here. 
-	* botfiles/weapons.c (Gauntlet): the baseq3/qagamei386.so parser
-	breaks here:
-	 number				WEAPONINDEX_GAUNTLET
-	* code/botlib/l_precomp.c (SourceWarning): added assertion to
-	trap botlib parsing problem..
-
-	* RC1: for beta test. Using my own vm/ui.qvm files in this case.
-	TODO: Setup with nouninstall.
-	TODO: fix game DLL/ botlib setup problem (so all DLL's work)
-	TODO: SIGFPE
-	TODO: profile?
-	
-	* code/unix/Makefile (ai_vcmd.o): added to game DLL linkage. 
-	How the fuck did this happen?
-	DONE: "qagamei386.so: undefined symbol: BotVoiceChat_Defend"
-
-	* TEST:  +set vm_ui 2 (vm_x86, not interpreter). Breaks!
-	Further: qagame had undefined, but seemingly gets reloaded 
-	second try (I hate the Linux linker).
-	* TODO: never reload fail DLL, abort engine
-
-
-2000-12-11  Bernd Kreimeier  <bk@lokigames.com>
-
-	* TEST: recompile QVM/DLL and executable to test new UI code.
-	The UI QVMs from the paks still do not work.
-
-	* SOS: changes in UI code!
-	* code/q3_ui/ui_public.h: this file is deprecated
-	Note: e.g. it does not contain the background track calls.
-	* code/ui/ui_public.h: the uiImport_t enum here determines
-	the values.
-	* code/ui/ui_syscalls.asm: same as q3_ui now, were:
-         equ floor					-111
-	 equ ceil					-112
-	* code/q3_ui/ui_syscalls.asm: these are now switched, were:
-	 equ trap_S_StartBackgroundTrack			-63
-         equ trap_S_StopBackgroundTrack				-64
-	The new values match the ui/ equivalent. Also, floor (-108) 
-	and ceil (-109) are different in ui/.
-	
-	* CVS: going to check in this snapshot and tag it as
-	    cvs tag id1-27g-loki001209-rc4
-	Presumed equivalent to SOS tag "1.27g RC4" (master). As I can't
-	obtain the tagged code using SOS (neither Win32 nor Linux client)
-	I can only guess.
-
-	* TEST: use my own VM code, ion baseq3/vm/*.qvm and missionpack/vm/.
-	This works - in other words, the menu bug seems in the UI code, and
-	is fixed in my codebase.
-
-	* TEST: make release. 
-	Note: I can postpone DLL specific problems. Bad performance is not
-	as important as outright bugs. Thus the UI QVM issue is the only
-	one that stops me from creating an RC.
-	TODO: Q3 UI QVM code from pak file does not work (neither does TA).
-	TODO: sound with video playback still awful. Threaded sound, I guess.
-	TODO: ERROR: couldn't open demos/DEMO002.dm3.dm_48 (same demo001.dm3.dm_48)
-	
-	TODO: do not show Q3 demos in TA menu?
-	TODO: new demos for Q3? Or at least error message?
-	
-	* code/game/bg_lib.c: itrinsics excluded by Q3_VM (another -O
-	compile). Uninitialized variable.
-	* code/unix/Makefile: -O for uninit on patched code. Also shortcuts. 
-	TODO: DC_ONLY seems an obsolete flag, used in Makefiles, not source.
-
-	* TEST: +set sv_pure 0 +set vm_game 1 +set vm_cgame 1 +set vm_ui 0
-	Turns out that the pak0.pk3 UI QVM code is seemingly broken in TA
-	and Q3, but my UI DLL is not. In reverse, the QVM game/cgame for
-	Q3 seems to work quite well (including bots). The TA game/cgame
-	also works, including botlib init.
-	TODO: BotLib Init using game DLL gives: 
-	TODO:  Error: file weapons.c, line 38: unknown structure field number
-        TODO:  Fatal: couldn't load the weapon config
-        TODO:  Error: BotLoadMap: bot library used before being setup
-	
-	* TEST: checked the rc4winstlr.zip CD tree against
-	my test install. baseq3/pak4.pl3 and missionpack/pak0.pk3
-	are identical, but I finally recognized that there was
-	a missionpack/pak1.pk3 not in the final install - left over 
-	from an earlier update from id. Doesn't seem to affect the
-	DLL based runs at all.
-	Note: I still do not have the final CD snapshot Robert
-	promised me mid last week, they haven't even fixed the
-	FTP account they took down. Communication with id is as
-	abyssmal as ever. 
-
-2000-12-08  Bernd Kreimeier  <bk@lokigames.com>
-
-	* TEST: running with RC4 data files.
-	TODO: "bot library used before setup" (Q3+TA)
-	TODO: Q3 old mods wreak havoc (graceful bounce)
-	TODO: supress "FreeType code not available" in renderer
-	TODO: can't move in Q3
-	TODO: items flicker in Q3
-	TODO: no decals in Q3
-	TODO: VM UI code still broken (Q3+TA)
-	TODO: sound code is awful
-	TODO: video playback inferior to earlier builds
-
-	* code/q3_ui/ui_local.h: prototype trap_VerifyCDKey(..)
-	* code/game/g_active.c ( StuckInOtherClient): TA only.
-	* code/cgame/cg_draw.c: 4x unbalanced `#endif' - from patch?
-	* code/null/null_client.c (CL_CDKeyValidate): dummy added.
-	* code/qcommon/common.c: Q_acos missing, changed conditionals
-	
-	* code/qcommon/vm_x86.c: unreacheable _asm instruction that
-	gcc doesn't quite like... #if 0'ed for now
- 	TODO: understand _asm { mov eax,[ebx] }, fix it for gcc
-
-	* TEST: compile...
-
-	* code/ui/ui_main.c: full REJECT. Manual merge.
-	Note: preserved debug_protocol lines, who knows what it's good for.
-
-	* code/qcommon/files.c: REJECT. SafeMode, demo server FS_Restart.
-
-	* code/client/snd_mem.c: REJECT: $SOS$.
-	* code/client/snd_dma.c: REJECT: $SOS$.
-	* code/client/cl_cin.c: REJECT. com_timescale, $SOS$.
-
-	* code/cgame/cg_draw.c: REJECT. Lots, but virtually all either
-	float postfix (on some, not all places), or #ifndef MISSIONPACK
-	that I had already put in during -Werror (conditional unused).
-
-	* code/cgame/cg_consolecmds.c: REJECT. id commented unused code
-	that I had #if 0'ed earlier.
-
-	* code/game/: three REJECT for $SOS$.
-	* code/botlib/: lots REJECT for $SOS$.
-
-	* Patch: patching up from demo source.
-	ln -s sos001204-rc4 work
- 	diff -urbB sos001122-demo/ work > work.diff
- 	ln -s cvs-1.27b/ work
- 	patch -p0 < work.diff  > work.patch
- 	find cvs1.27b/ -name '*.rej' -print
-
-	* CVS: going to check in this snapshot and tag it as
-	    cvs tag id1-27b-loki001208-demo
-	Then patching up to RC4, as of sos001204-rc4 (no changes since,
-	should be equivalent to SOS tag "1.27g RC4" (raduffy), i.e. master.
-
-	* TEST: installed demota/ from Win32 distribution. Binary
-	fails claiming "Corrupted pak0.pk3". Abandoned.
-	Note: a Linux demo for Q3TA has no priority. Most important is
-	the Q3A point release in time for Q3TA hitting shelves, followed
-	by testing for Q3TA. The source is in CVS and tagged (see above)
-	in case a demo matching the released files has to be provided
-	later.
-	
-
-2000-12-07  Bernd Kreimeier  <bk@lokigames.com>
-
-	* TEST: compile and link - succeeds.
-
-	* code/ui/ui_main.c: UI_StopServerRefresh now uaws. 
-	New unused variables.
-	
-	* code/unix/unix_main.c: added  Sys_LowPhysicalMemory() stub.
-	TODO: write Linux equivalent to GlobalMemoryStatus.
-
-	* code/qcommon/common.c: Com_Memset/Com_Memcpy. Neither assembly 
-	nor C versions included if not on Win32 i386. 
-	TODO: using/porting assembly?
-
-	* code/qcommon/files.c: unused variable.
-	TODO: fs_scrambledProductId unused if 0 for now.
-	Note: -DFS_MISSING for id's pak cleanup, not used.
-
-	* TEST: compile and link - fails.
-
-	* code/macosx/Client/Makefile.postamble: empty ORIG.
-	* code/macosx/Client/Makefile.preamble: ORIG. $(BOTLIB_OBJS) added.
-
-	* code/server/sv_client.c: ORIG. Com_Memset.
-	* code/renderer/tr_shader.c: ORIG. Com_Memset, CIN_Shader.
-	* code/qcommon/vm_x86.c:  ORIG. Com_Memcpy. 
-	* code/qcommon/unzip.c: REJECT. Com_Memcpy, $SOS$. 
-	* code/qcommon/qcommon.h: ORIG. PROTOCOL 47, plus Sys_LowPhysicalMemory.
-	* code/qcommon/md4.c: Com_Memset,Com_Memcpy (ORIG).
-	* code/qcommon/files.c (Sys_ConcatenateFileList): REJECT.
-	Our additons threw it off, plus $SOS$. 
-	* code/qcommon/common.c: they fixed same unused variables (REJECT).
-
-	* code/ui/ui_shared.c: additions (ORIG).
-	* code/ui/ui_gameinfo.c: COM_Compress added (ORIG).
-	* code/ui/ui_atoms.c: print statements removed (ORIG).
-	* code/ui/ui_main.c (UI_DoServerRefresh): REJECT on comment edit... 
-
-	* code/game/g_cmds.c (Cmd_VoiceTaunt_f): logic changed heavily. ORIG.
-	* code/game/q_shared.h: Q3_VERSION "Q3 Team Arena Demo 1.27b"
-	plus Com_Memset, Com_Memcpy, CIN_shader, COM_Compress.
-	* code/game/g_main.c: Cvar change only
-	* code/game/ai_dmq3.c: $SOS$.
-
-	* code/client/snd_mix.c: Com_Memset
-	* code/client/client.h: additions (ORIG).
-	* code/client/snd_mem.c: see below.
-	* code/client/snd_dma.c: $SOS$ (CVS keyword).
-
-	* code/client/cl_cin.c: they removed unused (REJECT).
-	* code/cgame/cg_servercmds.c: ORIG. compress, noTaunt etc.
-	* code/cgame/cg_main.c: ORIG. Conditonal branch, COM_Compress.
-	* code/cgame/cg_consolecmds.c: ORIG. Cvar values changed.
-	* code/cgame/cg_draw.c (CG_DrawTeamBackground): ORIG. 
-	no reject but *.orig file created. I just mark spots were 
-	code changed after verifying the patch succeeded.
-
-	* code/cgame/cg_event.c: fixed reject (REJECT).
-	* code/botlib/: all *.rej here due to SOS/CVS $Keyword$.
-	TODO: preserve SOS comments/rev history somehow.
-
-	* Patch: patching up to demo source.
-	ln -s sos001122-demo work
- 	diff -urbB sos001119/ work > work.diff
- 	ln -s cvs-1.26/ work
- 	patch -p0 < work.diff  > work.patch
- 	find cvs1.26/ -name '*.rej' -print           
-	
-	* CVS: going to check in this snapshot and tag it as
-	  cvs tag id1-26w-loki001207
-	to prepare for upgrading to RC4. I have already made
-	many more changes than I wanted to w/o getting any 
-	closer to pinpointing the problem, I might as well
-	patch up to id's more current sources.
-
-	* code/botlib/be_interface.c: initialize by memset. Turns
-	out that this fails in Export_BotLibSetup on BotSetupWeaponAI
-	loading "weapons.c" (from the pak, presumably) with an unknown
-	structure field number. Mismatch of datafiles vs. source again.
-	
-	TODO: id replaced memsets in later source.
-	TODO: have memsets on all exports and imports.
-
-	* SOS: RC4 source should be tagged "1.27g RC4" (raduffy).
-	Unfortunately the Linux client doesn't care a bit. Show
-	History does work if from/to date differ by at least a
-	day, and it shows the tag on code/ (only that subtree),
-	but recursive get aborts halfway.
-	Manual: http://www.sourcegear.com/SOS/Doc/
-
-2000-12-06  Bernd Kreimeier  <bk@lokigames.com>
-
-	* TEST: accepting missing shaders now. No bots, but I can
-	actually enter the game and play (more than can be said for
-	classic Q3 right now).
-	TODO: Error: BotStartFrame: bot library used before being setup
-
-	* code/renderer/tr_shader.c: took out assertion for now...
-	* TEST: now missiopack/cgame loads
-	TODO: tr_shader.c:2275: R_FindShaderByName: failed 
-	TODO: searches ui/assets/3_cursor2.TGA, has ui/assets/3_cursor3.tga
-	
-	* code/unix/Makefile (MPCGOBJ): ui_shared.o (duh).
-	DONE: /cgamei386.so: undefined symbol: PC_Float_Parse
-	
-	* code/botlib/be_ai_goal.c: initialize campspots etc. This
-	might or might not fix this one (didn't get back to gdb due
-	to mouse-only navigation).
-	DONE: 0x80d1d5b in BotFreeInfoEntities () at be_ai_goal.c:447	
-
-	* TEST: this time with missionpack/cgame loading... noy
-	TODO: TA menu blocked after end of intro movie
-	TODO: console in_mouse 1 doesn't grap pointer even on vid_start?
-
-	* code/cgame/cg_newdraw.c: -Werror.
-	* code/unix/Makefile (MPCGOBJ): cg_newdraw.o was missing (duh).
-	DONE: missionpack/cgamei386.so: undefined symbol: CG_OwnerDrawVisible"
-
-	* code/ui/ui_shared.c:1309 assign after bail on NULL.
-	DONE: segfault in Item_SetFocus (item=0x0, x=0, y=0)
-
-	* TEST: new set of DLL's (this time hopefully correct).
-	All baseq3/ DLL's load, as does the missionpack/ UI DLL.
-	The menus now work in both (TA seems mouse-only on everything 
-	but "Quit"). Segfault on delayed TA "Quit" (stack fubared):
-	#5  0x809fc28 in VM_Call (vm=0x88408a0, callnum=3) at ..//qcommon/vm.c:617
-	#6  0x805aafc in CL_KeyEvent (key=9, down=qtrue, time=128644) cl_keys.c:1194
-	TODO: TA menu's w/o mouse? 
-	TODO: Win32 goes submenus but does not unfold
-	TODO: Linux does not go submenus
-	
-	* code/ui/ui_main.c: see below. 
-	TODO: LCC gets fits -  operands of = have illegal types 
-	TODO: 'pointer to const unsigned char' and 'pointer to const char'
-	* code/ui/ui_shared.c: see below.
-	* code/ui/ui_gameinfo.c: see below.
-	* code/ui/ui_atoms.c: see below.
-	* code/game/g_bot.c: more cruft.
-	* code/cgame/cg_draw.c: loads of functions modified for
-	MISSIONPACK that aren't used at all for MISSIONPACK anymore.
-	Development relics.
-
-	* code/cgame/cg_consolecmds.c: -Werror.
-	Note: due to Makefile error never ever compiled...
-
-	* code/unix/Makefile: fixed various dependency errors
-	for game and ui library.
-	TODO: create a new Makefile with patsubst and rules.
-	TODO: why C_ONLY in the i386 dedicated server?
-
-	* code/unix/unix_main.c: use dlerror() excessively.
-	Littered more unused DLL related functions with assert(0).
-	TODO: clean up Sys_Load/UnloadDll (a real mess)
-	TODO: remove Zoid code cruft (unused per-DLL functions)
-	
-	* code/game/bg_misc.c: changed G_Printf for Com_Printf.
-	This was undefined in baseq3/uii386.so preventing loading.
-
-	* TEST: +set sv_pure 0 +set vm_game 0 +set vm_cgame 0 +set vm_ui 0
-	Note: so far I used only the game DLL..  duh.
-	UI DLL fails to load: missing G_Printf.
-
-	* code/unix/Makefile:  -DMALLOC_CHECK in addition to
-	the -DZONE_DEBUG I have used since switching to calloc.
-	Using MALLOC_CHECK=1 for now, might use 2 if something
-	comes up.
-
-	* code/renderer/tr_init.c (GL_SetDefaultState): it does get 
-	called, but does not show up in the log.
-	
-	* TEST: tried executing a script - get bounced.
-	TODO: is there any way to jump into a map?
-	TODO: cl_cinematics 0 (supress all fullscreen RoQ)
-	Next: used r_logfile 200 in Win32 (RC4) and Linux.
-	There is a buckload of setup code seemingly not done
-	at all in Linux? Either that, or logging is enabled
-	with a delay in Linux.
-
-	* code/unix/linux_glimp.c: fixed autorepeat (H2/Fakk2 way). 
-
-2000-12-05  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/renderer/tr_mesh.c: added assert there.
-	* TEST: menus and in-game drawing are just as they were with 
-	the initial SOS001119 port. In addition:
-	  R_AddMD3Surfaces: no such frame 0 to -2147483477 
-	     for 'models/players/xaero/upper.md3'
-          R_AddMD3Surfaces: no such frame -2147483477 to 171 
-	  R_AddMD3Surfaces: no such frame 171 to -2147483498
-        ad nauseam (used as my player model).
-	Triggered: haveing a trRefEntity_t *) 0x41dbbd00 with 
-	frame = -2147483477. Might be a red herring (PRINT_DEVELOPER), 
-	ignore for now.
-
-	* code/ui/ui_main.c: missing return.
-	* code/ui/ui_shared.c: excess byte in initializer (which gcc
-	did not caught, but LCC did). Also LCC complains about
-	missing returns, but gcc doesn't (neither says unreacheable
-	code though). If necessary (MsVC?) guard with Q3_VM.
-
-	* code/q3_ui/ui_ingame.c: see below.
-	* code/q3_ui/ui_atoms.c: voidfunc_f. LCC warns about conversion 
-	from `pointer to void' to `pointer to void function(void)' 
-	being compiler dependent. Casting NULL. Guess what, doesn't fix 
-	it either.
-	TODO: do not use these cursed scripts to generate VM code,
-	we do not have proper rules for LCC/q3asm, thus the files never
-	get updated.
-
-	* code/unix/Makefile: for paranoia's sake recreated the 1.17
-	compile for the UI DLL (where only q_shared/math were actually
-	compiled as DO_SHLIB_CC.
-	Later: switched to different gcc. 
-
-	* STATIC: remaining problems are vmMain (same entry point for all
-	DLL's), could use cgMain, uiMain and gMain here for HARD_LINKED. 
-	Note: I don't think id has used this in ages.
-	Plus all the collisions in *_syscalls.c, which simply can't be
-	fixed cheaply. None is the superset of 2 others, neither seems
-	w/o overlap to others. Full stop.
-
-	* code/botlib/be_aas_move.c: see below.
-	* code/game/ai_dmq3.c: VEC_UP/DOWN, MOVEDIR_UP/DOWN now static.
-	See also game/g_utils.c for existing static duplicates.
-
-	* code/game/q_shared.h: #define stricmp strcasecmp 
-	* code/unix/Makefile:  no mo'  -Dstricmp=strcasecmp, see q_shared.h
-	Also: no mo'  -I/usr/include/glide, no FX
-	TODO: are we building against system GL headers? ../Mesa/?
-
-	* code/q3_ui/ui_atoms.c: comment on duplication
-	* code/cgame/cg_drawtools.c: use UI/CGAME_HARD_LINKED on UI duplicates 
-	TODO: does this UI_ code in cg_drawtools/ui_atoms belong into ui_shared?
-
-	* code/unix/Makefile: use -DQ3_STATIC 
-	* code/game/q_shared.h (*_HARD_LINKED): trigger on Q3_STATIC 
-	Later: collision between UI and CGAME is still there. This fixed
-	the Com_Error, Com_Printf issues though
-
-	* code/unix/Makefile ($(B)/q3static/ai_vcmd.o): this file was
-	missing, hence undefined symbol.
-	($(B)/baseq3/game/ai_vcmd.o): same here.
-	($(B)/missionpack/game/ai_vcmd.o): same here.
-
-	* STATIC: cg_syscalls.c, g_syscalls.c and ui_syscalls.c alias.
-	Multiply defined symbols:
-	 Com_Error, Com_Printf
-         VEC_UP, VEC_DOWN
-	 MOVEDIR_UP, MOVEDIR_DOWN
-	 vmMain
-	 dllEntry
-	 PASSFLOAT
-	 trap_Error
-	 trap_Milliseconds
-	 trap_Argc
-	 trap_Argv
-         trap_FS_FOpenFile
-	 trap_FS_Read
-	 trap_FS_Write
-         trap_FS_FCloseFile
-         trap_FS_GetFileList
-	 trap_R_RegisterModel
-	 trap_R_RegisterSkin
-	 trap_R_RegisterFont
-	 trap_R_RegisterShaderNoMip
-	 trap_R_ClearScene
-	 trap_R_AddRefEntityToScene
-	 trap_R_AddPolyToScene
-         trap_R_AddLightToScene
-	 trap_R_RenderScene
-	 trap_R_SetColor
-         trap_R_DrawStretchPic
-	 trap_R_ModelBounds
-	 trap_UpdateScree
-         trap_S_StartLocalSound
-	 trap_S_RegisterSound
-	 trap_Key_IsDown
-	 trap_Key_GetCatcher
-	 trap_Key_SetCatcher
-	 trap_GetGlconfig
-         trap_PC_AddGlobalDefine
-	 trap_PC_LoadSource
-	 trap_PC_FreeSource
-	 trap_PC_FreeSource
-	 trap_PC_ReadToken
-	 trap_PC_SourceFileAndLine
-	 trap_S_StopBackgroundTrack
-	 trap_S_StartBackgroundTrack
-	 trap_RealTime
-	 trap_CIN_PlayCinematic
-	 trap_CIN_StopCinematic
-	 trap_CIN_RunCinematic
-	 trap_CIN_DrawCinematic
-         trap_CIN_SetExtents
-	 trap_MemoryRemaining
-         trap_SendConsoleCommand
-	 trap_Cvar_Register
-	 trap_Cvar_Update
-         trap_Cvar_Set
-  	 trap_Cvar_VariableValue
-         trap_Cvar_VariableStringBuffer
-	 trap_RealTime
-	 trap_SnapVector  // used in game/bg_*.c, needs conditional
-	More aliasing between ui_atoms.c and cg_drawtools.c:
-         UI_DrawBannerString
-         UI_ProportionalStringWidth
-	 UI_ProportionalSizeScale
-        Undefined symbol: ai_team.o: In function `FindHumanTeamLeader':
-         ai_team.c:1899: undefined reference to `BotVoiceChat_Defend'
-	Note: 
-	
-	* code/game/g_main.c: unused.
-	* code/game/g_arenas.c: unused.
-	* code/game/ai_team.c: init.
-	* code/game/ai_dmnet.c: /* in comment (odd).
-	Note: why do these come up now but not earlier?
-	TODO: the make dependencies might target wrong files.
-
-	* code/unix/Makefile (TARGETS): added q3static.
-	Note: this is baseq3/
-
-	* TEST: +set r_logfile 100. It seems that the addition of
-	code (add an assertion etc.) changes the behavio of the binary.
-	The intro cinematics code seems to suffer first - didn't play,
-	then played, then (another assert added) doesn't play. Watch
-	out for (missionpack):
-	  UI_CIN_PlayCinematic
-          SCR_PlayCinematic( mpintro.roq )
-          trFMV::play(), playing mpintro.roq
-	Also fails to exit cleanly: break gives
-	 #0  0x401919ee in __select ()
-         #1  0x400bbcb8 in __DTOR_END__ ()
-         #2  0x4004baa1 in _XSend ()
-         #3  0x452b009f in GLXRenderFlush ()
-         #4  0x804ce0c in _XRead ()
-         #5  0x40680813 in ?? ()
-	Stack is corrupted.
-        Note: ~/.q3a/gl.log
-	TODO: write per-frame files (see Heretic2)
-	TODO: add Heretic2 QGL (more detail)
-
-	* code/unix/linux_qgl.c (QGL_EnableLogging): fixed countdown
-	(i.e. propagated changes from win32/, see Fakk2).
-
-	* code/unix/linux_glimp.c: fixed QGL_EnableLogging argument
-	to avoid cast error (always qfalse).
-
-	* code/unix/Makefile (DEBUG_CFLAGS): use ZONE_DEBUG.
-
-	* code/qcommon/common.c: replaced malloc with calloc calls.
-
-	* code/q3_ui/ui_local.h: have to use ui/ui_public.h
-	* code/cgame/cg_servercmds.c: requires ../ui/menudef.h
-
-	* code/cgame/cg_consolecmds.c: ui/ui_shared.h is unique.
-	* code/q3_ui/ui_public.h: make sure this won't be compiled.	
-	* code/client/client.h: we have to include ui/ui_public.h.
-	Note: id is obviously maintaing only the ui/ headers, so the
-	headers in q3_ui/ are deprecated.
-
-	* code/renderer/tr_shader.c: added assertions (see Ryan's Fakk2
-	problems with missing shaders).
-
-	* code/game/g_cmds.c: below.
-	* code/game/ai_vcmd.c: below.
-	* code/game/ai_team.c: below.
-	* code/game/ai_dmnet.c: below.
-	* code/game/ai_dmq3.c: below.
-	* code/game/ai_chat.c: below.
-	* code/game/ai_cmd.c: ../../ui/menudef.h (new Q3TA script directory).
-
-	* code/cgame/cg_newdraw.c: make sure it won't compile w/o MISSIONPACK.
-
-	* code/cgame/cg_servercmds.c: below.
-	* code/cgame/cg_event.c: below.
-	* code/cgame/cg_consolecmds.c: below.
-	* code/client/keys.h: below.
-	* code/client/client.h: below.
-	* code/q3_ui/ui_local.h: include from ../q3_ui/ not ../ui/.
-	Note: id seems to intentionally use the header from the new ui/.
-
-	* Makefile: checked -I$(UIDIR), there is no such. That means all
-	files include directly, which means all (including Q3) are using
-	the new ui/ headers.
-
-2000-12-04  Bernd Kreimeier  <bk@lokigames.com> 
-
-	* RC4: released as 362101115 Dec  4 11:40 TA_Q3A_RC4.zip
-
-	* TEST: the corrupted menu problem is back :-(. Looks like I am in
-	for a static link next.
-	
-	* code/unix/Makefile (clean2): fixed (not all new OBJ covered).
-	* code/q3_ui/ui_teamorders.c: -Werror.
-	* code/q3_ui/ui_team.c: -Werror. 
-	* code/q3_ui/ui_qmenu.c (Bitmap_Draw): -Werror. 
-	* code/q3_ui/ui_mods.c (UI_Mods_LoadModsFromFile): unused. -Werror.
-	* code/q3_ui/ui_controls2.c: -Werror.
-	* code/q3_ui/ui_atoms.c: -Werror
-	* code/null/null_client.c: -Werror.
-	* code/unix/linux_joystick.c: -Werror.
-	* code/unix/linux_glimp.c: -Werror. 
-	* code/unix/linux_qgl.c: -Werror. 
-	* code/unix/unix_shared.c: -Werror. 
-	* code/unix/unix_net.c: -Werror.
-	* code/unix/linux_local.h: added missing prototypes.
-	* code/unix/unix_main.c: -Werror. Includes linux_local.h
-	* code/jpeg-6/jdmainct.c: see below.
-	* code/jpeg-6/jcmainct.c: variables called "main" (*moan*) 
-	* code/jpeg-6/jcdctmgr.c (forward_DCT): -Werror.
-	* code/botlib/l_script.c (PS_ReadLiteral): -Werror
-	* code/botlib/l_precomp.c (PC_AddBuiltinDefines): -Werror.
-	* code/botlib/be_interface.c: -Werror.
-	* code/botlib/be_aas_reach.c: -Werror
-	* code/botlib/be_aas_cluster.c: -Werror 
-	* code/game/be_aas.h: -Werror. 
-	Note: MrElusive accumulates a lot of code history in nested comments,
-	which gcc doesn't like at all. #if 0'ed to avoid.
-	* code/qcommon/vm_interpreted.c: -Werror.
-	* code/qcommon/unzip.c: -Werror.
-	* code/cgame/cg_servercmds.c: -Werror.
-	* code/cgame/cg_main.c: -Werror.
-	* code/cgame/cg_drawtools.c: -Werror.
-	* code/game/bg_misc.c: -Werror.
-	* code/game/be_ai_move.h (bot_avoidspot_s): added.
-	* code/botlib/be_ai_move.c: removed typedef struct bot_avoidspot_s
-	* code/client/snd_mix.c: -Werror.
-	* code/qcommon/md4.c: -Werror.
-	* code/qcommon/common.c: -Werror.
-	* code/client/cl_keys.c: -Werror.
-	* code/client/cl_cin.c: -Werror, init local variables.	
-	* code/unix/Makefile: -Werror. need -O for -Wall for uninitialized
-	Note: the above is the list of files that got touched during a pass
-	with -g -O -Werror -Wall flags (in the hope of finding uninitialized
-	memory and ambiguous statements). Most of the above are simply
-	unused variables (or even code).
-
-	TEST: RC3 data files, but DLL's.
-	TODO: TA gets stuck in initial sound, doesn't play cinematics (sometimes)
-	TODO: Q3 intro movie looses sound after Sarge gets teleported
-	TODO: Q3 ingame renders world, weapon, muzzleflash, hud, can shoot,
-	TODO:  but no movement, hud background is fubared. 
-
-	* code/cgame/cg_main.c: cg_singlePlayerActive
-
-	* code/q3_ui/ui_login.c: doesn't seem to be used?
-	* code/game/g_rankings.c (G_RankRunFrame): doesn't seem to be used.
-	* code/q3_ui/ui.sh: disabled this. 
-	* code/q3_ui/q3_ui.sh: changed include path to ../q3_ui/ (duh).
-
-	* code/game/game.sh: changed include path to ../q3_ui/ which 
-	is not in the Win32 batch file. 
-	* code/cgame/cg_rankings.c: this does not seem to be included. 
-	* code/cgame/cgame_ta.sh: added -DCGAME. Also added cg_syscalls.c
-	to build (also missing in Win32).
-
-	* code/cgame/cgame.sh: added -DCGAME (see cgame.bat). Also
-	changed include path to ../q3_ui/ which is not in the Win32
-	batch file.  Also added cg_syscalls.c to build (missing in 
-	Win32).
-
-2000-12-01  Bernd Kreimeier  <bk@lokigames.com>
-
-	* RC3: released as of sos001201 / Q3 1.27f
-
-	* code/unix/Makefile: more fixes with clean build. The
-	changes made fix the menu rendering for Q3 but not TA.
-	Ingame graphics still broken. 
-
-	* code/game/game_ta.sh: created. Use game_ta.q3asm here.
-	* code/game/game.sh: no -DMISSIONPACK 
-	* code/game/game_ta.q3asm: CR/LF, /.
-
-	* code/cgame/cgame_ta.sh: created. Use cgame_ta.q3asm here.
-	* code/cgame/cgame.sh:  no -DMISSIONPACK. No cg_newdraw, ui_shared.
-	* code/cgame/cgame.q3asm:  No cg_newdraw, ui_shared.
-	CR/LF, /, cg_newDraw, and the output path/name.
-	
-	* code/q3_ui/q3_ui.q3asm: output to ui not q3_ui...
-
-	* code/cgame/cg_event.c: cg_singlePlayerActive used here.
-	TODO: guard by MISSIONPACK
-	* code/cgame/cg_local.h: named q3print_t enum. Cvar
-	cg_singlePlayerActive for both Q3 and TA.
-
-
-	* code/unix/Makefile: cleanly separate B/baseq3/ and
-	B/missionpack/ subtrees during build. While new and old
-	UI are in separate directories, the cgame/ and game/
-	are shared, with conditional -DMISSIONPACK compile
-	and different files includeds (cd_draw, cg_newdraw).
-	That means twice the number of targets (3 DLL's, 3 QVM's,
-	times two), and different build rules.
-	TODO: carefully check Win32 build for (other) conditionals
-	TODO: carefully check Win32 build for link lists
-
-	* CVS:  ui/, code/ui, botfiles/ and subdirectories are added.
-	The code/macosx/ directory turned out to be a real pain that
-	had to be edited manually, throwing out CVS/ directories in
-	the tree that had been created by SOS as they are in id's
-	repository:
-	  code/macosx/Client/CVS
-	  code/macosx/Client/PBUserInfo/CVS 
-	  code/macosx/Client/Quake3.nib/CVS  
-	  code/macosx/Common/CVS
-	  code/macosx/DedicatedServer/CVS
-	  code/macosx/DedicatedServer/PBUserInfo/CVS  
-	Now tagged
-	  cvs tag id1-26y-loki001119
-	TODO: there are several new files not yet linked?
-
-	* ChangeLog: merged the Changelog from the bk00119 working
-	branch (initial Q3TA port) based on sos001119 snapshot. Also
-	merged the source tree with cvs-1.17.
-	In the ChangeLog below  *** MISSIONPACK *** indicates work
-	that was done on the branch (code-sos/ prefix in files).
-	The cvs update of this will be tagged with
-	 cvs tag id1-26y-loki001119
-	Use this tag to hunt for possible Linux fixes that got lost
-	(i.e. got dropped by id since id000516 and were thus not in
-	sos001119, but did not show in diff id000516 cvs1-17).
-	New directories in CVS: botfiles/, ui/.
-	Missing from SOS/Missionpack: SDK directories.
-	 common, lcc, libs, q3asm, q3data, q3map, q3radiant.
-
-
-	* ssreport.txt: below.
-        Note: watch for files called "ssreport.txt", that's id ChangeLog.
-	* ui/ui_syscalls.asm: below.
-	* q3_ui/ui_syscalls.asm: below.
-	* game/g_syscalls.asm: below.
-	* cgame/cg_syscalls.asm: below.
-	* bspc/linux-i386.mak: below.
-	* bspc/lcc.mak: below.
-	* botlib/linux-i386.mak: below.
-	* botlib/lcc.mak: below.
-	* A3D/a3d_console_variables.txt: CR/LF issue (minimize diffs).
-
-	* CVS: the checked bk001119 work copy of the sos001119 initial
-	checkout (completed with everything in the SOS "Missionpack"
-	tree, i.e. botfiles/ and botfiles.* added), copied over the
-	cvs-1.17 checkout.
-	Note: in these cases, BEWARE ui -> q3_ui/ links, and different
-	ChangeLogs. Also "make clean" helps.
-
-	* unix/unix_net.c: below. 
-	* unix/unix_main.c: below. 
-	* unix/matha.s: below.
-	* unix/linux_qgl.c: below.
-	* unix/linux_glimp.c: see also linux_joystick.c.
-	* server/sv_client.c: below.
-	* renderer/tr_surface.c: below.
-	* renderer/qgl.h: below.
-	* qcommon/qcommon.h: below.
-	* qcommon/files.c: below.
-	* qcommon/common.c: below.
-	* q3_ui/ui_demo2.c: below.
-	* mac/mac_net.c: below.
-	* mac/mac_glimp2.c: below.
-	* game/surfaceflags.h: below.
-	* game/bg_lib.c: checked against id00516/cvs-1.17a diff.
-	* bspc/bspc.c: TH_AASToTetrahedrons call removed since id000516.
-	Note: our final compare of id000516 against cvs-1.17a, making sure
-	that all these differences are in bk001119 (initial Q3TA port).
-	If id branched the Q3TA base off before id000516 we might be screwed.
-	Note: I do not diff against bk000520, which had some minor changes
-	against id000516 (check VectorArrayNormalize, OTConfiguration), which
-	seem consistent with me taking a pre-id000516 source snapshot for that
-	working branch.
-
-2000-11-30  Bernd Kreimeier  <bk@lokigames.com>
-
-	* TEST: compiled using the symbolic link ui/ -> q3_ui/.
-	Had to undo one CVS change, regarding
-	 code/cgame/cg_syscalls.asm
-	 code/game/g_syscalls.asm
-	 code/q3_ui/ui_syscalls.asm
-	These files are neither generated by Win32 cgame.bat
-	nor cgame.sh (etc.), thus seemingly maintained by hand.
-	 cvs tag pr1-17-loki001130b
-	should be used if somebody needs this 1.17 snapshot
-	(which, remember, is post-release, with additional fixes).
-	Later:
-	 cvs tag pr1-17-loki001130c
-        includes the full ChangeLog (duh).
-	
-	* CVS: up until cvs-1.17-001130, code/ui/ contained the
-	Q3 code for the UI QVM/DLL. In Q3TA, this code has been
-	moved to code/q3_ui/, while at the same time the new
-	(scripting driven) UI code for Q3TA was maintained in
-	code/ui/. To preserve the history of code/ui/, it has been
-	renamed to q3/ui/ in the CVSROOT.
-	Note: this will BREAK all cvs-1.17 and before checkouts.
-	To compile earlier versions, move or link q3_ui/ to ui/.
-	The code has been tagged
-	  cvs tag pr1-17-loki001130
-        after the change.
-	DONE: remove code/*/vm/*.asm from CVSROOT
-	Note: this includes code/*/*.asm files (from *_syscalls.c).
-	These were originally tracked in CVS, but if we need 
-	comparison of q3asm output or QVM files we can rely
-	on the Win32 and Linux SDK now. These files have been
-	physically removed from CVS now, followed by
-	  cvs tag pr1-17-loki001130a
-
-2000-11-30  Bernd Kreimeier  <bk@lokigames.com>      *** MISSIONPACK ***
-
-	* RC2: new ZIP file (another 360M for convenience).
-
-	* SOS: new CVS module, Quake3_sos. This will be used to track
-	the unchanged SOS checkouts from id. As their repository
-	is read-only, and there is no estimate on when changes might
-	be backpropagated there, I will track their changes in a
-	separate module, and update our local Quake3 module 
-	accordingly. This is effectively "tracking 3rd party"
-	w/o import and half-automated, forced mergers - in other
-	words, we now branch starting with our post-1.17 changes,
-	for the benefit of moving at all.
-	Baseline is a slightly changed PR-1.17 id000516 source dump
-	(essentially ui/ moved to q3_ui for continuity, and CR/LF etc.).
-	 cvs import Quake3_sos id000516 pr1-17-win32
-	 cvs import Quake3_sos sos001119 pr1-26-win32
-	 cvs import Quake3_sos sos001120 pr1-26-win32-001120
-         cvs import Quake3_sos sos001121 pr1-26-win32-001121
-         cvs import Quake3_sos sos001122 pr1-26-win32-001122
-         cvs import Quake3_sos sos001122-demo pr1-26-win32-demo
-        This is about the 1.26w Team Arena Win32 demo release, give or
-	take a couple of lines. Has Q3_VERSION "Q3 Team Arena Demo 1.27b".
-	 cvs import Quake3_sos sos001123 pr1-26-win32-001123
-         cvs import Quake3_sos sos001126 pr1-26-win32-001126
-        Now track id versions (see code/game/q_shared.h:Q3_VERSION)
-	 cvs import Quake3_sos sos001128 pr1-27c-win32-001128
-	With 1.27d they switched from Demo to full version (RC1).
-	 cvs import Quake3_sos sos001129 pr1-27d-win32-001129
-         cvs import Quake3_sos sos001130a pr1-27d-win32-001130a
-        Now switched to 1.27e. This import is done from the SOS
-	working directory.
-	 cvs import Quake3_sos sos001130b pr1-27e-win32-001130b
-	Note: SoS created rwx attributes which are luckily fixed
-	automagically during import. It is also seemingly incapable
-	to compare files, and leave files that have not changed the
-	hell alone. I can't do cvs update due to the $..$ tags in
-	the original files (which CVS can't be told to ignore), 
-	so I have to do import (creating a load of vendor tagged 
-	branches), but at least cvsweb and cvs get the revisions
-	right.
-
-	* code-sos/unix/Makefile: added linux_joystick
-	* code-sos/unix/linux_local.h: match mac/ and win32/, for prototypes.
-
-	* code-sos/unix/linux_joystick.c: new file, code from linux_glimp.c
-	Note: decided to separate this, as (a) we might edit/extend
-	a lot, (b), it's not in the id tree, (c) it's not GL, (d)
-	there might be even more oddball devices. Anything that
-	cuts down on diffs.
-
-	* code-sos/unix/linux_glimp.c (Q_stristr): const return (cvs1.17).
-	Also (XLateKey): added more keyboard mappings (ASCII on
-	upper row digits) (cvs1.17). Added in the minimal joystick
-	hooks (cvars, function calls). Fixed joystick cvar naming
-	to match win32 (kept joystick_threshold). 
-	TODO: joystick stubs for dedicated?
-
-	* CVS: I have to move up to 1.27d (data, Win32 networking).
-	With exception of linux_glimp.c (mostly joystick code), 
-	all cvs1.17 changes should now be in the work snapshot 
-	based on the first sos001119 we got from id. There are
-	also some additional changes in there already, thus I'll
-	move the (buggy) 1.26 snapshot into CVS before adding even
-	more differences.
-
-
-2000-11-29  Bernd Kreimeier  <bk@lokigames.com>     *** MISSIONPACK ***
-
-	* RC1: TeamArena_Q3A_RC1.zip. Source has moved from
-	Q3VERSION "Q3 Team Arena Demo 1.27c" to "Q3 1.27d" now.
-
-	* code-sos/qcommon/common.c: added Com_InitPushEvent(). Also
-	increased MAX_PUSHED_EVENTS to 256.
-	Note: this is another case of buffer memory not zero'ed.
-	Com_EventLoop, fixed evTime to evType in debug print.
-	
-	* TEST: baseq3/
-	 +set sv_pure 0 +set vm_game 0 +set in_mouse 0 +set developer 2
-        TODO: Team Arena in menu leads to RE_Shutdown(1) and locks
-	TODO: can't play game
-	TODO: shaders can't load *.tga, *.jpg files are there
-	TODO: DO_CC linking for DLL's, DO_SHLIB_CC only for export?
-	TODO: ERROR: Bad player movement angle
-        TODO: Warning: cvar "..." given initial values: "..." and "..."
- 	TODO: TA demo ERROR: CL_ParseServerMessage: Illegible server message
-        TODO: WARNING: Com_PushEvent overflow
-
-	* code-sos/qcommon/files.c: add NULL filter for our Sys_ListFiles calls.
-	* unix/unix_shared.c (Sys_ListFiles): signature has changed, 
-	additional Sys_ListFiles argument now.
-
-	* code-sos/unix/unix_net.c (Sys_GetPacket): see below (readcount=0).
-	* code-sos/unix/unix_main.c: see below (Mike's and my changes to DLL
-	loading, my event buffer clear fixes).
-	* code-sos/unix/linux_qgl.c (QGL_Init): see below (__FX__ guards).
-	TODO: abstract WGL/GLX and end unfortunate QGL duplication.
-	TODO: spice up QGL with Linux H2 full version.	
-	* code-sos/q3_ui/ui_demo2.c: fix on demo names  - no Q_strupr(demoname).
-	Note: in CVS this fix is in ui/ui_demo2.c. CVS is screwed by
-	id choosing the old name for new directory...
-	TODO: manual intervention on "ui goes q3_ui"  in CVSROOT?
-	* renderer/qgl.h: see below (__FX__ guards).
-	* qcommon/files.c: migrated in the 1.17cvs changes against the
-	id000516 code dump, i.e. the (not marked - boo hiss) mkv changes.
-	Note: all the above is based on a diff of the last id code dump
-	pre-1.17 against our CVS, with those fixes now migrated into the
-	sos1.26 snapshot.
-	TODO: move in joystick code.
-	TODO: replace XAutoRepeatOn/Off with filter (focus).
-	TODO: DGA 2.0 and such.
-	
-	* code-sos/game/q_shared.c: valid compare for NULL strings
-	* code-sos/unix/unix_main.c: QRTLD, and now using RTLD_NOW.
-	Note: it is a bad idea to load game DLL's that are missing symbols.
-
-	* code-sos/ui/ui_main.c: see below.
-	* code-sos/game/g_main.c: see below.
-	* code-sos/q3_ui/ui_main.c: see below.
-	* code-sos/cgame/cg_main.c: made cvarTable and cvarTableSize static. This resolved
-	a segfault related to traversing the UI table during Init.
-	Note: there is a segfault related to this variable being out of bounds. 
-	Different struct size in global variables possible aliasing between the 
-	DLL's.
-	
-	* code-sos/unix/unix_main.c (Sys_Error): assert(0), no exit in debug.
-	* code-sos/game/q_shared.c: now aborts on NULL destination. Also DPrintf's
-	on bogus excess copies.
-	TODO: make all those string functions safe, at least assert.
-	* code-sos/server/sv_init.c: comment in SV_Init
-	// init the botlib here because we need the pre-compiler in the UI
-	Called in qcommon/common.c:Com_Init, were CL_Init is called afterwards...
-	* code-sos/server/sv_bot.c: the botlib_import is filled here.
-	* code-sos/unix/unix_main.c (Sys_GetBotLibAPI): RTLD_NOW. Which is for naught,
-	as this code is not used and has never been used. assert(0)
-
-	* code-sos/botlib/be_interface.c: botimport supposed to be set here.
-	* code-sos/botlib/l_memory.c: segfault with q3_ui/ DLL.
-        #1  0x80e23ec in GetMemory (size=35) at ..//botlib/l_memory.c:331
-        331             ptr = botimport.GetMemory(size + sizeof(unsigned long int));
-	as botimport is completely NULL'ed.
-
-	* code-sos/q3_ui/q3_ui.sh: created from ui/ui.sh 1.17 
-
-	* code-sos/q3_ui/q3_ui.q3asm: unfubared (CR/LF, / path).
-
-	* code-sos/unix/Makefile: added q3_ui/ make targets (basically
-	ui/ targets from CVS 1.17 Makefile for starters).
-
-	* code-sos/q3_ui/: this is the old UI code, which does not use
-	../ui/menus.txt (see ui/ui_main.c). In other words,
-	the code in ui/ now has to be compiled or qvm'ed 
-	for missionpack/, but to create the necessary DLL or
-	QVM modules for baseq3/ we need to use q3_ui/. 
-	
-	
-2000-11-27  Bernd Kreimeier  <bk@lokigames.com>     *** MISSIONPACK ***
-
-	* code-sos/game/bg_lib.c: ld problem with a custom "tan(..)"
-	TODO: loooking forward to SIGFPE on this code base.
-	
-	* code-sos/ui/ui_util.c: this file is empty.
-
-	* code-sos/ui/ui.sh: new files:
-	  ui_shared.c
-	  ui_util.c
-	Replaced by the /ui/*.menu files:
-	 q3lcc: can't find `../ui_cdkey.c'
-	 q3lcc: can't find `../ui_ingame.c'
-	etc.
-
-	* code-sos/cgame/cgame.q3asm: added cg_newdraw entry.
-	Also added ui_shared entry.
-	* cgame/cgame.sh: added cg_newdraw.c entry.
-	Also added ../ui/ui_shared.c entry.
-
-	* code-sos/cgame/cg_newdraw.c: renamed (was cg_newDraw.c mixed case).
-	Note: the infidels have taken over.
-
-	* cgame/cgame.sh: added  -DMISSIONPACK.
-	Note: w/o, q3lcc complains
-	../cg_event.c:204: undeclared identifier `cg_singlePlayerActive'
-        ../cg_event.c:204: left operand of . has incompatible type `int'
-        which indicates that this source does not compile w/o MISSIONPACK
-	anymore. The baseq3/pak4.pk3 file in the Q3TA snapshot archives
-	are dated
-	     284464  11-10-00 14:02   vm/cgame.qvm
-             463940  11-14-00 14:47   vm/qagame.qvm
-             271596  11-14-00 14:48   vm/ui.qvm
-	the code dump is from 11-19. 
-	Note: Make does not abort on q3lcc complains
-
-	* code-sos/game/game.sh: also added ai_vcmd.c entry.
-
-	* code-sos/ui/ui.q3asm: fubared (below). In addition, this is 
-	the only one to have a 
-	 -o "/tmp/quake3/missionpack/vm/ui"
-	line in it. Given that the other 2 QVM modules are
-	also dependend on -DMISSIONPACK, this seems a real mess.
-	For now using the same path as the other 3.
-	* code-sos/cgame/cgame.q3asm: below.
-	* code-sos/game/game.q3asm: fubared. Fixed CR/LF and \ in paths
-	again (read by q3asm called by game.sh called by make).
-	* unix/Makefile: updated fpor DLL/QVM.
-	Note: also shell scripts to use q3lcc not lcc.
-
-	
-2000-11-27  Bernd Kreimeier  <bk@lokigames.com>
-
-	* code/unix/Makefile: now expects a run/ directory
-	relative (between this, the Loki standards, and the
-	utility code in the same repository, it's ever so
-	slightly less dorky).
-	TODO: fix broken copyfiles target etc.pp.
-
-	* code/game/bg_lib.c: turns out the changes I
-	undid 001120 were affecting original Zoid
-	Linux port related defines, which break VM
-	compile. Mike fixed those (which I unfixed
-	when referring to the latest id code that does
-	not contain these patches). However, they
-	duplicate ANSI libc symbols, so the guards might
-	be wrong. The symbols are missing when compiling
-	for VM, so I now use the existing lcc -DQ3_VM
-	flag:
-	  //#if !defined ( _MSC_VER ) && ! defined ( __linux__ )
-          #if defined ( Q3_VM )
-	This will break DLL compile on non-ANSI platforms,
-	which will have to be added to the conditional then.
-
-	* code/ui/ui.sh: below. 
-	* code/game/game.sh: below. 
-	* code/cgame/cgame.sh: Linux SDK installs q3lcc to
-	avoid collisions with regular lcc pre-installs. The
-	scripts fail with "lcc not found", but do not abort 
-	the Makefile.
-	Note: now that VM code gets actually built, there
-	are errors:
-	g_main:648 ERROR: symbol vsprintf undefined
-        bg_pmove:1221 ERROR: symbol abs undefined
-        q_math:4309 ERROR: symbol fabs undefined
-        q_shared:2801 ERROR: symbol tolower undefined
-        q_shared:2862 ERROR: symbol toupper undefined
-        ai_dmq3:208 ERROR: symbol atoi undefined
-        ai_cmd:4951 ERROR: symbol sscanf undefined
-
-
-2000-11-20  Bernd Kreimeier  <bk@lokigames.com>   
-	
-	* TEST: test compile of pr-1.17+cvs fixes segfaults due 
-	to new baseq3/pak4.pk3
-	Note: to self ... 1.17 is not compatible with new files.
-	Checking into CVS next.
-
-	* code/: changes applied by us that are not in id's code base
-	affect q_shared.c (NULL in Q_stricmp), files.c (FIXME fs_cdpath,
-	Sys_ConcatenateFileList, ui_demo2.c (demo no tolower on linux).
-	In unix/ linux_glimp.c (joystick code), qgl.h, linux_qgl.c (__FX__),
-        unix_main.c (dlopen bug and event buffers), unix_net.c (readcount),
-	matha.s (assembly warning).
-
-	* code/server/sv_client.c (SV_WriteDownloadToClient): 
-	No effective change  on FS_SV_FOpenFileRead call, they reworked 
-	autodownload some more seemingly.
-
-	* code/renderer/tr_surface.c: VectorArrayNormalize
-	
-	* code/qcommon/qcommon.h: see below.
-	* code/qcommon/files.c: Com_ReadConfigs removed.
-	* code/qcommon/common.c: removed Com_ReadConfigs, 
-	textual replacement of body in Com_Init.
-
-	* code/mac/mac_net.c: not applied (undone by id)
-	OTConfiguration *config <> OTConfigurationRef  config
-
-	* code/mac/mac_glimp2.c: r_colorbits->integer > 16
-	* code/game/surfaceflags.h (CONTENTS_BOTCLIP): added.
-
-	* code/game/q_shared.h: not applied (undone by id)
-	#if defined(ppc) || defined(__ppc) || defined(__ppc__) 
-        #define idppc 1 
-	#else 
-        #define idppc 0 
-        #endif 
-
-	* code/game/q_math.c: added another CPP line to guard
-	BoxOnPlaneSide, removed WIN32 guard. 
-	TODO: this could be broken code guarded in all current
-	compiles...
-
-	* code/game/bg_lib.c: left Q#_VM guard for typedef cmp_t
-	Added !defined( __linux__ ) for tolower and atoi.
-	Note: the changes above relate to the very last code update
-	from id prior to the 6 month blackout, which were not in
-	CVS when Michael made his updates. Needed to establish the
-	baseline for the new patch. Source dump 1.17.00520, against
-	SOS 1.26w-001119 version.
-	
-2000-11-20  Bernd Kreimeier  <bk@lokigames.com>       *** MISSIONPACK ***
-
-	* TEST: running against the data up to TeamArena_Q3A_001109.zip
-	Hunk_Clear: reset the hunk ok
-        Program received signal SIGBUS, Bus error.
-        "q3dm2", killBots==qtrue
-	#0  CM_ClearMap () at ..//qcommon/cm_load.c:644
-        #1  0x80884a7 in SV_Map_f () at ..//server/sv_ccmds.c:159
-        #2  0x8072579 in Cmd_ExecuteString (text=0xbffff4b0 "spmap q3dm2") at ..//qcommon/cmd.c:591
-        #3  0x8071dfe in Cbuf_Execute () at ..//qcommon/cmd.c:190
-        #4  0x80763f7 in Com_Frame () at ..//qcommon/common.c:2547
-        #5  0x8130d6b in main (argc=13, argv=0xbffff984) at ..//unix/unix_main.c:953
-        #6  0x40100cb3 in __libc_start_main (main=0x8130bc4 <main>
-	Not reproducible (screen stayed black).
-	
-	* TEST: +set developer 1, same for Win32 and Linux:
-	Can't find gfx/misc/flare.tga
-        Can't find gfx/misc/sun.tga
-        Can't find gfx/misc/console02.tga
-	Can't find vm/ui.map
-	Can't find textures/sfx/logo512.tga
-        Can't find gfx/colors/black.tga
-        Can't find models/mapobjects/banner/banner5_2.md3
-        Can't find models/mapobjects/banner/banner5_1.md3
-        Can't find textures/sfx/firegorre2.tga
-        Can't find textures/sfx/bolts.tga
-	Can't find menu/art/unknownmap.tga
-
-	* Q3TA: after nearly 6 months, a code update from id. SOS access 
-	even. Got it to compile, link and start, but its currently broken
-	(menu doesn't render in full, can't get into game etc.). Need
-	a baseline 1.17 to diff against. Last code dump was May 16, with 
-	bspc code updated May 19. Checking working directory of bk000520
-	against CVS next (Mike's fixes never made it into id's codebase
-	or a post 1.17 release, neither did my fixes as released in the
-	point release version 1.17).
-
-2000-11-19  Bernd Kreimeier  <bk@lokigames.com>       *** MISSIONPACK ***
-
-	* TEST: Win32 install as tested with 1.26w. quake3.x86 (Q3A game)	
-	Warning: cvar "r_uifullscreen" given initial values: "1" and "0"
-        Warning: cvar "r_inGameVideo" given initial values: "1" and "0"
-        ^3WARNING: sound/feedback/hit.wav is a 8 bit wav file
-	(on windows, sound/weapons/weapon_hover.wav is missing...)
-	Menu only partially displayed in TA and baseq3 play, menu itself
-	seems to work. Freetype?
-	WARNING: Com_PushEvent overflow
-
-	* code-sos/game/game.sh: not in SOS, moved in from CVS snapshot.
-
-	* code-sos/qcommon/common.c: conditional DEDICATED to get rid off 
-	CL_ShutdownCGame/CL_ShutdownUI/CIN_CloseAllVideos.
-	Same for UI_usesUniqueCDKey: dedicated server does not
-	write CD key file.
-	TODO: check whether there is an unneeded "read CD key"
-	for dedicated server.
-
-	* code-sos/null/null_client.c (CL_ShutdownAll): added dummy.
-
-	* code-sos/unix/Makefile:  server/sv_net_chan.o for dedicated server.
-
-	* code-sos/null/null_snddma.c: fixed  S_RegisterSound signature.
-
-	* code-sos/client/snd_mix.c: snd_p, snd_linear_count, snd_out
-	can't be static, as used by unix/snd_mixa.s.
-
-	* code-sos/unix/Makefile: added to the executable target:
-	   renderer/tr_font.c
-	   client/cl_net_chan.c
-	   server/sv_net_chan.c 
-	Also added a lot of jc*.c files to build, to fix unresolved
-	symbol errors.
-	TODO: is there unused jpeg-6/jd*.o code linked in now?
-
-	* code-sos/ft2/smooth.c: includes ftgrays.c, ftsmooth.c
-	
-	* code-sos/ft2/truetype.c: ttdriver.c, ttpload.c, ttgload.c, ttobjs.c.
-        Also (see ftoption.h) TT_CONFIG_OPTION_BYTECODE_INTERPRETER ttinterp.c
-	
-	* code-sos/ft2/sfnt.c: includes ttload.c, ttcmap.c, sfobjs.c,
-	sfdriver.c. lso (see ftoption.h)
-        TT_CONFIG_OPTION_EMBEDDED_BITMAPS     ttsbit.c
-        TT_CONFIG_OPTION_POSTSCRIPT_NAMES     ttpost.c
-
-	* code-sos/ft2/ftbase.c: includes ftcalc.c, ftobjs.c, ftstream.c,
-	ftlist.c, ftoutln.c, ftextend.c, ftnames.c.
-	
-	* code-sos/ft2/autohint.c: includes ahangles.c, ahglyph.c, ahglobal.c,
-	ahhint.c, ahmodule.c.
-
-	* code-sos/unix/Makefile: added ft2/ to client objects, took out
-	ftraster.c/ftrend1.c (see below), added -DFT_FLAT_COMPILE.
-	* ft2/ftsmooth.c: -DFT_FLAT_COMPILE required.
-	* ft2/raster1.c: -DFT_FLAT_COMPILE required.
-	Note: this includes ftraster.c/ftrend1.c.
-
-	* code-sos/qcommon/vm_x86.c: _ftol is missing, ftolPtr only defined
-	for Win32, but used in generic code. Workaround for now.
-	TODO: find good Linux ftol, or use old solution. 
-
-	* SoS checkout. chown -R a+w *  recode ibmpc:lat1 */*.h */*.c
-	
-2000-06-30  Michael Vance <briraeos@lokigames.com>
-
-	* misc: Spoke with Leonardo about qvm mess.
-
-	* ui/ui.sh: Created to build much like the ui.bat script.
-
-	* ui/ui.q3asm: Use linux style paths.
-
-	* game/game.sh: Created to build much like the game.bat script.
-
-	* game/game.q3asm: Use linux style paths.
-
-	* cgame/cgame.sh: Created to build much like the cgame.bat script.
-
-	* cgame/cgame.q3asm: Use linux systel paths.
-
-	* unix/Makefile: Use the new .sh scripts to build the QVM files.
-
-	* lcc/etc/linux.c: Build .asm files instead of .s files.
-
-	* misc: QVMs now load properly, with minor glitches that should
-	hopefully be solvable. The new build scripts conflict with the
-	.asm files already in CVS, as the generated byte code is slightly
-	different in some cases.
-	
-2000-06-29  Michael Vance <briareos@lokigames.com>
-
-	* lcc/makefile: Tweaked to automatically include the system
-	compiler's header location. Added an install directory.
-
-	* lcc/custom.mk: Added a build directory.
-
-	* lcc/etc/linux.c: Numerous small tweaks to make compiling the VM
-	code a much simpler task.
-
-	* q3asm/Makefile: Created.
-
-	* q3asm/q3asm.c: Fixed uninitialized variable in
-	HashString(). Fixed off by one in argument parsing.
-	
-	* misc: Had Brian remove the Xmd.h include from glx.h so that we can
-	build Quake3 on XFree86 4.0 systems.
-
-	* wine: Attempted to build with lcc.exe and q3asm.exe using wine,
-	also did not work. This is in contrast to MikeP's .qvms, which
-	seem to work.
-	
-2000-06-28  Michael Vance <briareos@lokigames.com>
-
-	* common/files.c: Fixed Mods menu behaviour.
-
-	* unix/linux_qgl.c: Guarded references to fxMesa.
-
-	* renderer/qgl.h: Guarded references to fxMesa.
-
-	* ui/ui_demo2.c: Don't convert filename to uppercase.
-	
-2000-05-07  Bernd Kreimeier  <bk@lokigames.com>
-
-	* common/cmdlib.c: windowism, not guarded. Added WIN32 around "ATOM a".
-
-	* q3map/Makefile: Linux Makefile. 
-
-	* q3map/Makefile.irix: "makefile" in original code, Irix-only Makefile. 
-	Just fixed some redundant TAB that GNU make despises about as much as I 
-	despise GNU Make, and changed to a relative path.
-
-2000-05-01  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3radiant/: updated with Q3Radiant198b3-src.zip. 
-	Tagged (globally) as q3radiant-198b3.
-	Kept the old files 
-	  3DFXCamWnd.h
-	  3DFXCamWnd.cpp
-          MainFrm2.cpp
-        New files
-          Shaders.h
-          misc/      (contributed special TGA resources, don't relly belong)
-        Removed:
-	  pName
-        Changed filenames to previous case:
-         UNNAMED.MAP           -> unnamed.map
-         RES/BMP0002.BMP       -> RES/bmp00002.bmp
-	Changed:
-         changelog.txt         -> ChangeLog
-	
-2000-04-28  Bernd Kreimeier  <bk@lokigames.com>
-
-	* CVS: bk000425 modified sources. This replaces the unix/ directory
-	which is not yet in id's SourceSafe. Two check-ins, due to minor
-	changes in an attempt to nail the Voodoo3 related crashes (driver
-	problems, not a Q3 issue). Undid some of the QFL changes for PI
-	and the log bug fix - put back in (TODO). Also includes:
-	* Quake3/code/botlib/be_aas_sample.c: single file update from Robert.
-	
-	* CVS: id000423 code dumps (two of them). Applying Loki patches.
-	Tagged for the final version (all patches).
-
-	* CVS: id000422 code dump. This did not include the 1.16n fixes
-	used for Linux, and was the first dump for the 1.17 security fix
-	release.
-	Note: forgot to check in the ft2/ headers themselves, but they
-	are not used in the current codebase anyway. Are added in next
-	dump. Also there is use of CVS/CVS-like $Keyword$ patterns in
-	some files, and between their revisions and ours we fuck this up.
-	Also, id ZIP files create write protected sources, have to do
-	chmod -R a+w Quake3/ to work and overwrite files.
-
-	* CVS: bk000315 modified source. This version was the 1.16n release.
-	Note: the changes applied here are not in the subsequent code dumps
-	of id. If you want to compile the Linux version as released you
-	have to use bk-tagged versions until the patches are merged in by
-	Robert Duffy.
-
-	* CVS: id000314 engine code dump, same procedure as below, tag.
-	Note: this version added vm/ sudirectories with assembly files
-	for cgame, game, ui. CVS tag id000314.
-
-	* CVS: id000304 engine code dump. Now there is a problem, as CVS
-	was used in the Mac sources. Do
-	  find . -name 'CVS' -exec rm -r {} \;
-        before cvs update, then tagged:
-	 cvs -d /loki/cvsroot/ tag id000304 Quake3/
-
-	* CVS: checked in a source snapshot of the id00303 engine code
-	and the id0003029 tools code. The tool sources are not fully in 
-	sync, and we have only partial source from earlier engine revisions.
-        The engine source marks where Loki took over from Dave Kirsch.
-        This snapshot (with all temporary and bogus files) is imported
-        and tagged using:
-          cvs -d /loki/cvsroot import Quake3 id000303 initial
-
-        Modules:
-          code:      the Q3 engine code, including a jpeg-6/ copy
-          common:    code shared by tools
-          libs:      code shared by tools, inlcuding a jpeg6/ copy
-          q3asm:     VM bytecode assembly 
-          q3data:    misc. Q3 data conversions
-          q3map:     BSP builder
-          q3radiant: Win32 editor, as is
-          lcc:       C compiler for q3asm
-
-        The sources have not been cleaned up, and binary files have not been
-	removed. The Q3Radiant code base might exhibit mixed case asmbiguities
-	in the future, and future source dumps might come from SourceForge
-	instead.
-
-2000-04-25  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code.id000425/unix/Makefile: relative path, relocatable.
-	Note: first code merge with id, finally :-).
-
-2000-04-24  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code.bk000422/unix/matha.s: in C(BoxOnPlaneSide)
-	the following line triggers assembler warning: 
-	"missing prefix `*' in absolute indirect address, maybe misassembled!"
-	  jmp Ljmptab(,%eax,4)  
-	
-
-	* q3code.bk000422/unix/Makefile (MOUNT_DIR): rember to change.
-	TODO: fix this bloody Makefile to be relocatable, damnit.
-
-	* q3code.bk000422/cgame/cg_event.c: applied JCash fix again
-	(see EV_EVENT_BITS below). Send e-mail to verify.
-
-	* q3code.bk000422/renderer/tr_image.c: "../jpeg-6/jpeglib.h" again.
-	
-	* q3code.bk000422/: created from the id dump of today, lacking
-	all but one of my changes (sigh). Swapped unix/ competely, takes
-	care of 90%. Submitted all changes again to Robert...
-
-2000-04-19  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code.bk000315/unix/linux_glimp.c (GLimp_EndFrame): 
-	QGL_EnableLogging( r_logFile->value ) doesn't work?
-
-	* q3code.bk000315/unix/linux_qgl.c:  GLimp_LogNewFrame() is 
-	obsolete. QGL_EnableLogging was out of sync with Win32 and
-	did not support the new framecounter decrement logic.
-
-2000-04-03  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code.bk000315/server/sv_snapshot.c: svs.nextSnapshotEntities
-	is a signed integer unconditionally incremented, which gets
-	negative and causes a segfaulting indexing an array. Added reset
-	to counter. Might fail if snapshot numbers are supposed to
-	monotonically increase.
-
-2000-04-02  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code.bk000315/client/cl_parse.c (CL_ParseServerMessage): 
-	assert(0) on Illegible message (remember to +set in_mouse 0).
-	TODO: have to add a dump message function, it's unreadable.
-
-	* botlib/be_ai_goal.c (InitLevelItemHeap): loop counter -2
-	left -2 with uninitialized next, and -1 disconnected. Removed
-	redundant memset. There is an item alloc leak I suspect, as
-	max_levelitems 1024 merely delayed the overflow error.
-
-2000-04-01  Bernd Kreimeier  <bk@lokigames.com>
-
-	* botlib/be_ai_goal.c (InitLevelItemHeap): still segfaults.
-	Not memsetting the entire item heap. As items are cleared
-	on return, that leaves only memory corruption?
-	Later: upped max_levelitems from 256 to 1024
-	Later: client dies on connect:
-	  Error: CL_ParseServerMessage: Illegible server message 255
-
-
-2000-03-31  Bernd Kreimeier  <bk@lokigames.com>
-
-	* botlib/be_ai_goal.c: initializing global vars.
-	Segfault in AllocLevelItem () 
-	  at /home/bk/Games/Quake3/q3code/botlib/be_ai_goal.c:364
-        I suspect that the initial freelevelitems setting is at
-	the end of the list and eventually exposed.
-
-	* cgame/cg_event.c: according to Johmn Cash: 
-	 itemNum = (es->event & ~EV_EVENT_BITS) - EV_USE_ITEM0
-        Quote: "This causes itemNum to be invalid about half the time, 
-	preventing any client side effect tied to the item from occurring."
-	
-2000-03-06  Bernd Kreimeier  <bk@lokigames.com>
-
-	* qcommon/common.c: set pushEvent buffer and indices
-	to zero in Com_Init().
-
-	* q3code/qcommon/qcommon.h: made SE_NONE (and for paranoia
-	also NA_BOT) explicitely set to zero.
-
-2000-02-27  Bernd Kreimeier  <bk@lokigames.com>
-
-	* unix/Makefile: added dmalloc in an attempt to get on
-	the Z_Free bug. Futile. Despite stripping dmalloc debug
-	token down to essentials, I get a (seemingly bogus or
-	unrelated):
-	  debug-malloc library: dumping program, fatal error
-          Error: possibly bad .c filename pointer (err 24)
-
-	
-2000-02-26  Bernd Kreimeier  <bk@lokigames.com>
-
-	* qcommon/common.c: various debug builts to isolate the
-	Z_Free bug. It reproducibly happens on some machines
-	with SE_PACKET, but the packets themselves look
-	thoroughly corrupted.
-
-2000-02-21  Bernd Kreimeier  <bk@lokigames.com>
-
-	* qcommon/common.c (Com_EventLoop): possible problem
-	here, pointer does not get cleared.
-
-	* unix/linux_glimp.c (InitSig): no signal handler.
-	* common/common.c: dump in Com_Error for debug.
-
-2000-02-17  Bernd Kreimeier  <bk@lokigames.com>
-
-	* q3code: new dump from Zoid. Repeat tr_image.c fix.
-
-	* unix/Makefile: added client/snd_adpcm.c (linkage errors).
-	Later: added entire JPDIR and rules, for tr_image.c. 
-	Later: had to fix fules for game/ai_*.c files.
-	Later: removed ui/ui_quit.o (n/a)
-	Later: took out -mpentiumpro -march=pentiumpro 
-
-	* renderer/tr_image.c: windowism in #include path (see below).
-         #include "..\jpeg-6\jpeglib.h"
-
-1999-12-27  Bernd Kreimeier  <bk@lokigames.com>
-
-	* Alpha: tried a dedicated server compile. Segfaults in
-	../qcommon/files.c:1682, a paksort function doing pointer
-	fiddling.
-
-	* Makefile.alpha: created.
-	Note: want to take the SDL/Setup autoconf ASAP.
-
-	* unix/unix_main.c: fixed __axp__ to __alpha__, guarded
-	_FPU_SETCW.
-
-	* qcommon/vm_alpha.c: dummy, created.
-	* qcommon/vm_null.c: dummy, created.
-
-1999-12-04  Bernd Kreimeier  <bk@lokigames.com>
-
-	* renderer/tr_image.c: windowism in #include path.
-         #include "..\jpeg-6\jpeglib.h"
-	
-	* Revision 1.11: from Zoid by e-mail.
-	Note: threw away my playground copy, starting with the
-	ZIP file. Zoid's using CVS now, but we can't remote
-	access it. Thus did the
-	 "find . -name 'CVS' -exec rm -rf {} \;"
-	and then track it as 3rd party source by
-	
-
-	* ChangeLog: created. Now starting to track Q3A source.
-
---------- q3code log ---------------------------------------------
diff --git a/code/unix/Cons_gcc.pm b/code/unix/Cons_gcc.pm
deleted file mode 100644
index 41df3fd1..00000000
--- a/code/unix/Cons_gcc.pm
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Some utilities to handle gcc compiler setup
-#
-
-package Cons_gcc;
-
-# pass the compiler name
-# returns an array, first element is 2 for 2.x 3 for 3.x, then full version, then machine info
-sub get_gcc_version
-{
-  my @ret;
-  my ($CC) = @_;
-  my $version=`$CC --version | head -1`;
-  chop($version);
-  my $machine=`$CC -dumpmachine`;
-  chop($machine);
-  if($version =~ '2\.[0-9]*\.[0-9]*')
-  {
-    push @ret, '2';
-  } else {
-    push @ret, '3';
-  }
-  push @ret, $version;
-  push @ret, $machine;
-  return @ret;
-}
-
-# http://ccache.samba.org/
-# check ccache existence and path
-# returns an array, first element 0 / 1, then path
-sub get_ccache
-{
-  my @ret;  
-  $ccache_path=`which ccache`;
-  chop($ccache_path);
-  if(-x $ccache_path)
-  {
-    push @ret, '1';
-    push @ret, $ccache_path;
-    return @ret;
-  }
-  push @ret, '0';
-  return @ret;
-}
-
-# close package
-1;
diff --git a/code/unix/Conscript-client b/code/unix/Conscript-client
deleted file mode 100644
index 59173afc..00000000
--- a/code/unix/Conscript-client
+++ /dev/null
@@ -1,265 +0,0 @@
-# full client build script
-
-Import qw( BASE_CFLAGS BASE_LDFLAGS INSTALL_DIR BUILD_DIR TARGETNAME CC CXX LINK );
-
-# splines
-$env_splines = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} }
-  );
-
-@SPLINES_FILES = qw(
-  ../splines/math_angles.cpp
-  ../splines/math_matrix.cpp
-  ../splines/math_quaternion.cpp
-  ../splines/math_vector.cpp
-  ../splines/q_parse.cpp
-  ../splines/q_shared.cpp
-  ../splines/splines.cpp
-  ../splines/util_str.cpp  
-  );
-$SPLINES_FILESREF = \@SPLINES_FILES;
-  
-Library $env_splines 'splines', @$SPLINES_FILESREF;  
-
-# botlib
-# FIXME TTimo
-# we already deal with botlib on dedicated target
-# the compilation options are a bit different but we could certainly rely on
-#   the same Conscript and make things cleaner
-
-$env_botlib = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} },
-  CFLAGS => $BASE_CFLAGS . '-DBOTLIB '
-);
-
-@BOTLIB_FILES = qw(
-  ../botlib/be_aas_bspq3.c
-  ../botlib/be_aas_cluster.c
-  ../botlib/be_aas_debug.c
-  ../botlib/be_aas_entity.c
-  ../botlib/be_aas_file.c
-  ../botlib/be_aas_main.c
-  ../botlib/be_aas_move.c
-  ../botlib/be_aas_optimize.c
-  ../botlib/be_aas_reach.c
-  ../botlib/be_aas_route.c
-  ../botlib/be_aas_routealt.c
-  ../botlib/be_aas_sample.c
-  ../botlib/be_ai_char.c
-  ../botlib/be_ai_chat.c
-  ../botlib/be_ai_gen.c
-  ../botlib/be_ai_goal.c
-  ../botlib/be_ai_move.c
-  ../botlib/be_ai_weap.c
-  ../botlib/be_ai_weight.c
-  ../botlib/be_ea.c
-  ../botlib/be_interface.c
-  ../botlib/l_crc.c
-  ../botlib/l_libvar.c
-  ../botlib/l_log.c
-  ../botlib/l_memory.c
-  ../botlib/l_precomp.c
-  ../botlib/l_script.c
-  ../botlib/l_struct.c
-);
-$BOTLIB_REF = \@BOTLIB_FILES;
-
-Library $env_botlib 'botlib', @$BOTLIB_REF;
-
-# jpeg
-# NOTE TTimo we might need this one on other targets
-$env_jpeglib = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} },
-  CFLAGS => $BASE_CFLAGS
-  );
-  
-@JPEGLIB_FILES = qw(
-  ../jpeg-6/jcapimin.c 
-  ../jpeg-6/jchuff.c 
-  ../jpeg-6/jcinit.c 
-  ../jpeg-6/jccoefct.c 
-  ../jpeg-6/jccolor.c 
-  ../jpeg-6/jfdctflt.c 
-  ../jpeg-6/jcdctmgr.c 
-  ../jpeg-6/jcphuff.c 
-  ../jpeg-6/jcmainct.c 
-  ../jpeg-6/jcmarker.c 
-  ../jpeg-6/jcmaster.c 
-  ../jpeg-6/jcomapi.c
-  ../jpeg-6/jcparam.c
-  ../jpeg-6/jcprepct.c
-  ../jpeg-6/jcsample.c 
-  ../jpeg-6/jdapimin.c 
-  ../jpeg-6/jdapistd.c 
-  ../jpeg-6/jdatasrc.c 
-  ../jpeg-6/jdcoefct.c 
-  ../jpeg-6/jdcolor.c 
-  ../jpeg-6/jddctmgr.c 
-  ../jpeg-6/jdhuff.c 
-  ../jpeg-6/jdinput.c 
-  ../jpeg-6/jdmainct.c 
-  ../jpeg-6/jdmarker.c 
-  ../jpeg-6/jdmaster.c 
-  ../jpeg-6/jdpostct.c 
-  ../jpeg-6/jdsample.c 
-  ../jpeg-6/jdtrans.c 
-  ../jpeg-6/jerror.c  
-  ../jpeg-6/jidctflt.c 
-  ../jpeg-6/jmemmgr.c 
-  ../jpeg-6/jmemnobs.c   
-  ../jpeg-6/jutils.c 
-  );
-$JPEGLIB_REF = \@JPEGLIB_FILES;  
-  
-Library $env_jpeglib 'jpeglib', @$JPEGLIB_REF;   
-
-# NOTE TTimo this requires patched cons version to work (see unix/cons)
-%nasm_hash = new cons()->copy(
-  CC => 'nasm',
-  CCCOM => '%CC -f elf -o %> %<'
-);
-$nasm_hash{SUFMAP}{'.nasm'} = 'build::command::cc';
-$nasm_env = new cons(%nasm_hash);
-
-Library $nasm_env 'asmlib', 'ftol.nasm', 'snapvector.nasm';
-
-# compiling files with inlined assembly
-$env_inlined = new cons(
-  CFLAGS => '-DELF -x assembler-with-cpp'
-  );
-
-Library $env_inlined 'inlinelib', '../unix/matha.s', '../unix/snd_mixa.s';
-
-# putting it all together
-
-$env = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} },
-  CFLAGS => $BASE_CFLAGS,
-  LIBS => ' ' . $BUILD_DIR . '/unix/splines.a ' 
-  . $BUILD_DIR . '/unix/botlib.a ' 
-  . $BUILD_DIR . '/unix/jpeglib.a '
-  . $BUILD_DIR . '/unix/asmlib.a '
-  . $BUILD_DIR . '/unix/inlinelib.a '
-	. $BASE_LDFLAGS
-  . '-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -ldl -lm'
-);
-
-@RENDERER_FILES = qw(
-  ../renderer/tr_animation.c   
-  ../renderer/tr_backend.c   
-  ../renderer/tr_bsp.c   
-  ../renderer/tr_cmds.c   
-  ../renderer/tr_curve.c   
-  ../renderer/tr_flares.c   
-  ../renderer/tr_font.c    
-  ../renderer/tr_image.c    
-  ../renderer/tr_init.c     
-  ../renderer/tr_light.c   
-  ../renderer/tr_main.c    
-  ../renderer/tr_marks.c    
-  ../renderer/tr_mesh.c    
-  ../renderer/tr_model.c    
-  ../renderer/tr_noise.c    
-  ../renderer/tr_scene.c    
-  ../renderer/tr_shade.c    
-  ../renderer/tr_shade_calc.c   
-  ../renderer/tr_shader.c    
-  ../renderer/tr_shadows.c    
-  ../renderer/tr_sky.c    
-  ../renderer/tr_surface.c   
-  ../renderer/tr_world.c    
-  );
-$RENDERER_REF = \@RENDERER_FILES;  
-
-@CLIENT_FILES = qw(
-  ../client/cl_cgame.c   
-  ../client/cl_cin.c       
-  ../client/cl_console.c  
-  ../client/cl_input.c   
-  ../client/cl_keys.c     
-  ../client/cl_main.c     
-  ../client/cl_net_chan.c  
-  ../client/cl_parse.c   
-  ../client/cl_scrn.c    
-  ../client/cl_ui.c         
-  );
-$CLIENT_REF = \@CLIENT_FILES;
-
-@COMMON_FILES = qw(
-  ../qcommon/cm_load.c        
-  ../qcommon/cm_patch.c       
-  ../qcommon/cm_polylib.c     
-  ../qcommon/cm_test.c        
-  ../qcommon/cm_trace.c       
-  ../qcommon/cmd.c                   
-  ../qcommon/common.c               
-  ../qcommon/cvar.c                
-  ../qcommon/files.c              
-  ../qcommon/md4.c                   
-  ../qcommon/msg.c                    
-  ../qcommon/net_chan.c
-  ../qcommon/huffman.c
-  ../qcommon/unzip.c
-  );
-$COMMON_REF = \@COMMON_FILES;  
-
-@SOUND_FILES = qw(
-  ../client/snd_adpcm.c
-  ../client/snd_dma.c
-  ../client/snd_mem.c
-  ../client/snd_mix.c
-  ../client/snd_wavelet.c
-  );
-$SOUND_REF = \@SOUND_FILES;
-
-@UNIX_FILES = qw(
-  ../unix/unix_main.c 
-  ../unix/unix_net.c 
-  ../unix/unix_shared.c 
-  ../unix/linux_common.c
-  ../unix/linux_qgl.c   
-  ../unix/linux_glimp.c   
-  ../unix/linux_joystick.c  
-  ../unix/linux_snd.c 
-	../unix/linux_signals.c
-  );
-$UNIX_REF = \@UNIX_FILES;
-
-@SERVER_FILES = qw(
-  ../server/sv_bot.c
-  ../server/sv_ccmds.c
-  ../server/sv_client.c
-  ../server/sv_game.c
-  ../server/sv_init.c
-  ../server/sv_main.c
-  ../server/sv_net_chan.c
-  ../server/sv_snapshot.c
-  ../server/sv_world.c
-  );
-$SERVER_REF = \@SERVER_FILES;
-
-# FIXME TTimo vm_<cpu>.c
-@VM_FILES = qw(
-  ../qcommon/vm.c
-  ../qcommon/vm_x86.c
-  ../qcommon/vm_interpreted.c
-  );
-$VM_REF = \@VM_FILES;
-
-# FIXME: import the CPU string to build the name of the target
-Program $env $TARGETNAME, '../game/q_shared.c', '../game/q_math.c',
-  @$RENDERER_REF, @$CLIENT_REF, @$COMMON_REF, @$SOUND_REF,
-  @$UNIX_REF, @$SERVER_REF, @$VM_REF;
-Install $env $INSTALL_DIR, $TARGETNAME;
diff --git a/code/unix/Conscript-dedicated b/code/unix/Conscript-dedicated
deleted file mode 100644
index 0c64f237..00000000
--- a/code/unix/Conscript-dedicated
+++ /dev/null
@@ -1,115 +0,0 @@
-# dedicated server build script
-
-Import qw( BASE_CFLAGS BUILD_DIR INSTALL_DIR CC CXX LINK );
-
-$DEDICATED_NAME = 'linuxq3ded';
-
-$env_botlib = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} },
-  CFLAGS => $BASE_CFLAGS . '-DBOTLIB '
-);
-
-@BOTLIB_FILES = qw(
-  ../botlib/be_aas_bspq3.c
-  ../botlib/be_aas_cluster.c
-  ../botlib/be_aas_debug.c
-  ../botlib/be_aas_entity.c
-  ../botlib/be_aas_file.c
-  ../botlib/be_aas_main.c
-  ../botlib/be_aas_move.c
-  ../botlib/be_aas_optimize.c
-  ../botlib/be_aas_reach.c
-  ../botlib/be_aas_route.c
-  ../botlib/be_aas_routealt.c
-  ../botlib/be_aas_sample.c
-  ../botlib/be_ai_char.c
-  ../botlib/be_ai_chat.c
-  ../botlib/be_ai_gen.c
-  ../botlib/be_ai_goal.c
-  ../botlib/be_ai_move.c
-  ../botlib/be_ai_weap.c
-  ../botlib/be_ai_weight.c
-  ../botlib/be_ea.c
-  ../botlib/be_interface.c
-  ../botlib/l_crc.c
-  ../botlib/l_libvar.c
-  ../botlib/l_log.c
-  ../botlib/l_memory.c
-  ../botlib/l_precomp.c
-  ../botlib/l_script.c
-  ../botlib/l_struct.c
-);
-$BOTLIB_REF = \@BOTLIB_FILES;
-
-Library $env_botlib 'botlib', @$BOTLIB_REF;
-
-# NOTE TTimo this requires patched cons version to work (see unix/cons)
-%nasm_hash = new cons()->copy(
-  CC => 'nasm',
-  CCCOM => '%CC -f elf -o %> %<'
-);
-$nasm_hash{SUFMAP}{'.nasm'} = 'build::command::cc';
-$nasm_env = new cons(%nasm_hash);
-
-Library $nasm_env 'asmlib', 'ftol.nasm', 'snapvector.nasm';
-
-$env = new cons(
-  CC => $CC,
-  CXX => $CXX,
-  LINK => $LINK,
-	ENV => { PATH => $ENV{PATH}, HOME => $ENV{HOME} },
-  # FIXME TTimo I'm not sure about what C_ONLY is for
-  CFLAGS => $BASE_CFLAGS . '-DC_ONLY',
-  LDFLAGS => '-ldl -lm',
-  LIBS => ' ' 
-  . $BUILD_DIR . '/unix/botlib.a '
-  . $BUILD_DIR . '/unix/asmlib.a '
-);
-
-# list the files for the dedicated server
-@FILES = qw( 
-  ../null/null_client.c
-  ../null/null_input.c
-  ../null/null_snddma.c
-  ../server/sv_bot.c
-  ../server/sv_ccmds.c
-  ../server/sv_client.c
-  ../server/sv_game.c
-  ../server/sv_init.c
-  ../server/sv_main.c
-  ../server/sv_net_chan.c
-  ../server/sv_snapshot.c
-  ../server/sv_world.c
-  ../qcommon/cm_load.c
-  ../qcommon/cm_patch.c
-  ../qcommon/cm_polylib.c
-  ../qcommon/cm_test.c
-  ../qcommon/cm_trace.c
-  ../qcommon/cmd.c
-  ../qcommon/common.c
-  ../qcommon/cvar.c
-  ../qcommon/files.c
-  ../qcommon/huffman.c
-  ../qcommon/md4.c
-  ../qcommon/msg.c
-  ../qcommon/net_chan.c
-  ../qcommon/unzip.c
-  ../qcommon/vm.c
-  ../qcommon/vm_interpreted.c
-  ../game/q_math.c
-  ../game/q_shared.c
-  ../unix/linux_common.c
-  ../unix/unix_main.c
-  ../unix/unix_net.c
-  ../unix/unix_shared.c
-	../unix/linux_signals.c
-   );
-$FILESREF = \@FILES;
-
-# DEDICATED_NAME is imported, holds the name of the target
-# wolfded.x86 usually
-Program $env $DEDICATED_NAME, '../qcommon/vm_x86.c', @$FILESREF;
-Install $env $INSTALL_DIR, $DEDICATED_NAME;
diff --git a/code/unix/Conscript-pk3 b/code/unix/Conscript-pk3
deleted file mode 100644
index 9232ae4d..00000000
--- a/code/unix/Conscript-pk3
+++ /dev/null
@@ -1,135 +0,0 @@
-# build pk3 on the fly
-
-Import qw( INSTALL_DIR BUILD_DIR CONFIG_DIR CC CXX LINK );
-
-use Data::Dumper;
-
-$env = new cons(); # the env on which we will be working for all pk3s (NOTE: maybe we need several ctually)
-
-$hcf_do_exec = 1;
-sub do_command($)
-{
-  printf("@_[0]\n");
-  if ($hcf_do_exec)
-  {
-    system("@_[0]");
-  }
-}
-
-sub build_pk3 {
-
-	sub launch {
-		#print "In launch\n";		
-		$Data::Dumper::Indent = 2;
-		#print Dumper(@_);
-		$tmpdir = "/tmp/pk3-builder$$";
-		do_command("rm -rf $tmpdir");
-		
-		($target, $sets) = @_;
-		$base=`basename $target`; chomp($base);
-		$dirname=`dirname $target`; chomp($dirname);
-		
-		foreach (@{$sets})
-		{
-			($sourcepath, $destpath, $file) = @{$_};
-			#print "source: $sourcepath dest: $destpath file: $file\n";
-			do_command("mkdir -p $tmpdir/$destpath");
-			if ($sourcepath =~ /#.*/)
-			{
-				#print "$sourcepath is absolute\n";
-				$sourcepath =~ s/#//;
-				if (ref($file))
-				{
-					foreach(@{$file})
-					{
-						do_command("cp $sourcepath/$_ $tmpdir/$destpath/$_");
-					}
-				}
-				else
-				{
-					do_command("cp $sourcepath/$file $tmpdir/$destpath/$file");
-				}
-			}
-			else
-			{
-				#print "$sourcepath in linked dir\n";
-				if (ref($file))
-				{
-					foreach(@{$file})
-					{
-						do_command("cp $BUILD_DIR/$sourcepath/$_ $tmpdir/$destpath/$_");
-					}
-				}
-				else
-				{
-					do_command("cp $BUILD_DIR/$sourcepath/$file $tmpdir/$destpath/$file");
-				}
-			}			
-		}
-		
-		do_command("cd $tmpdir ; zip -r $base *");
-		do_command("mkdir -p $BUILD_DIR/$dirname");
-		do_command("cp $tmpdir/$base $BUILD_DIR/$target");
-		do_command("rm -rf $tmpdir");
-		
-		return 1;
-	}
-	
-	# extract the parameters
-	($target, $sets) = @_;
-	
-	$base=`basename $target`; chomp($base);
-	$dirname=`dirname $target`; chomp($dirname);
-	
-	# the build command is stored and called later on by cons
-	# this makes it impossible to have several build_pk3 working together
-	# there is probably a cleaner solution than this hack, but this works
-	$target_uniquename="target_$base";
-	$target_uniquename=~s/\.//g;
-	eval("\$$target_uniquename=\$target");
-	$sets_uniquename="sets_$base";
-	$sets_uniquename=~s/\.//g;
-	eval("\$$sets_uniquename=\$sets");
-	#print "name: $target_uniquename after the hack: $target_pak8pk3";
-	
-	# don't pass @{@_} .. since this will be called during the process
-	$command = "[perl] &launch( \$$target_uniquename, [ \@{\$$sets_uniquename} ] )";
-	#print "$command\n";
-		
-	foreach(@{$sets})
-	{
-		($sourcepath, $destpath, $file) = @{$_};
-		if (ref($file))
-		{
-			foreach(@{$file})
-			{
-				Depends $env $target, $sourcepath . '/' . $_;
-			}
-		}
-		else
-		{
-			Depends $env $target, $sourcepath . '/' . $file;
-		}
-	}
-	Command $env $target, $command;
-	Install $env $INSTALL_DIR . "/$dirname", $target;
-}
-
-# quick rundown on the syntax:
-# <target file>, [ <fileset1>, <fileset2>, ... ]
-# where <fileset>: [ <source directory>, <directory in zip>, <file1>, <file2>, .. ]
-
-build_pk3('baseq3/pak8.pk3', 
-	[ [ '#../../../media/Q3Media-1.32/baseq3/menu/art', 'menu/art', 'pblogo.tga' ],
-	[ '../Q3/q3_ui/q3_ui', 'vm', 'ui.qvm' ],
-	[ '../Q3/cgame/cgame', 'vm', 'cgame.qvm' ],
-	[ '../Q3/game/game', 'vm', 'qagame.qvm' ] ]
-);
-
-build_pk3('missionpack/pak3.pk3',
-	[	[ '#../ui', 'ui', [ 'createserver.menu', 'joinserver.menu', 'filter.menu', 'punkbuster.menu', 'menus.txt' ] ],
-	[ '../TA/ui/ui', 'vm', 'ui.qvm' ],
-	[ '../TA/cgame/cgame', 'vm', 'cgame.qvm' ],
-	[ '../TA/game/game', 'vm', 'qagame.qvm' ],
-	[ '#../../../media/Q3Media-1.32/missionpack/scripts', 'scripts', 'models2.shader' ] ]
-);
diff --git a/code/unix/Conscript-sdk b/code/unix/Conscript-sdk
deleted file mode 100644
index d5450134..00000000
--- a/code/unix/Conscript-sdk
+++ /dev/null
@@ -1,122 +0,0 @@
-# sdk
-
-Import qw( SDK_NAME Q3_VER CC CXX LINK );
-
-# http://www.devdaily.com/perl/edu/articles/pl010005/pl010005.shtml
-#----------------------------(  promptUser  )-----------------------------#
-#                                                                         #
-#  FUNCTION:	promptUser                                                #
-#                                                                         #
-#  PURPOSE:	Prompt the user for some type of input, and return the    #
-#		input back to the calling program.                        #
-#                                                                         #
-#  ARGS:	$promptString - what you want to prompt the user with     #
-#		$defaultValue - (optional) a default value for the prompt #
-#                                                                         #
-#-------------------------------------------------------------------------#
-
-sub promptUser {
-
-   #-------------------------------------------------------------------#
-   #  two possible input arguments - $promptString, and $defaultValue  #
-   #  make the input arguments local variables.                        #
-   #-------------------------------------------------------------------#
-
-   local($promptString,$defaultValue) = @_;
-
-   #-------------------------------------------------------------------#
-   #  if there is a default value, use the first print statement; if   #
-   #  no default is provided, print the second string.                 #
-   #-------------------------------------------------------------------#
-
-   if ($defaultValue) {
-      print $promptString, "[", $defaultValue, "]: ";
-   } else {
-      print $promptString, ": ";
-   }
-
-   $| = 1;               # force a flush after our print
-   $_ = <STDIN>;         # get the input from STDIN (presumably the keyboard)
-
-
-   #------------------------------------------------------------------#
-   # remove the newline character from the end of the input the user  #
-   # gave us.                                                         #
-   #------------------------------------------------------------------#
-
-   chomp;
-
-   #-----------------------------------------------------------------#
-   #  if we had a $default value, and the user gave us input, then   #
-   #  return the input; if we had a default, and they gave us no     #
-   #  no input, return the $defaultValue.                            #
-   #                                                                 # 
-   #  if we did not have a default value, then just return whatever  #
-   #  the user gave us.  if they just hit the <enter> key,           #
-   #  the calling routine will have to deal with that.               #
-   #-----------------------------------------------------------------#
-
-   if ("$defaultValue") {
-      return $_ ? $_ : $defaultValue;    # return $_ if it has a value
-   } else {
-      return $_;
-   }
-}
-
-sub launch {
-
-  print("Building MOD SDK (version $Q3_VER)\n");
-  print("Before building the mod sdk, your CVS tree must be completely clean!\nIf there are some temporary files and binaries in the tree, they can get included in the distribution and cause problems.\n");
-  $ok = &promptUser("Ready to build mod sdk [y/n]? ");
-  if ($ok ne 'y')
-  {
-    print("aborting\n");
-    return 0;
-  }  
-  # create the dirs:
-  $RAW_DATA = "mod-sdk-$Q3_VER";
-  system("rm -rf $RAW_DATA ; mkdir -p $RAW_DATA/code");
-  # actual code
-  system("cp -R cgame game q3_ui ui $RAW_DATA/code");
-  # UI stuff
-  system("cp -R ../ui $RAW_DATA");
-  # tools
-  system("cp -R ../lcc ../q3asm $RAW_DATA");
-  # build scripts
-  system("cp Construct $RAW_DATA/code");
-  system("mkdir $RAW_DATA/code/unix ; cp unix/cons unix/pcons-2.3.1 unix/Conscript-pk3 $RAW_DATA/code/unix");
-  system("cp unix/mod-sdk-data/Makefile $RAW_DATA/code/");
-  # cleanup some stuff
-  system("find $RAW_DATA -name CVS -exec rm -rf {} \\; 2>/dev/null");
-  # test that the build works just fine
-  $host=`hostname`; chomp($host);
-  if ($host ne 'antares')
-  {
-    system("rm -rf /tmp/$RAW_DATA ; cp -R $RAW_DATA /tmp");
-    system("cd /tmp/$RAW_DATA/code ; make");
-    if ($? ne 0)
-    {
-      printf("ERROR: test build failed\n");
-      return 0;
-    }
-    printf("build test successful\n");
-  }
-  # make a setup out of this
-  system("cp -R unix/setup/setup.sh unix/setup/setup.data $RAW_DATA");
-  # TODO: splash!
-  system("cp unix/mod-sdk-data/setup.xml unix/mod-sdk-data/config.sh unix/mod-sdk-data/postinstall.sh $RAW_DATA/setup.data");
-  # mod-sdk-data/Q3A_EULA.txt is a copy of stuff that is usually in $Q3SETUPMEDIA .. can't be arsed
-  system("cp unix/mod-sdk-data/Q3A_EULA.txt $RAW_DATA");
-  # I love those dirty hacks
-  system("cd $RAW_DATA/setup.data/bin ; ln -s Linux FreeBSD ; ln -s Linux OpenBSD ; ln -s Linux NetBSD");
-  # cleanup some stuff
-  system("find $RAW_DATA -name CVS -exec rm -rf {} \\; 2>/dev/null");
-  # weeee
-  system("unix/mod-sdk-data/makeself/makeself.sh $RAW_DATA $SDK_NAME \"Quake III Arena mod SDK\" ./setup.sh $Q3_VER");
-  return 1;
-}
-
-print("in Conscript-sdk\n");
-
-$env = new cons();
-Command $env "$SDK_NAME", "[perl] &launch()";
diff --git a/code/unix/Conscript-setup b/code/unix/Conscript-setup
deleted file mode 100644
index 513d951a..00000000
--- a/code/unix/Conscript-setup
+++ /dev/null
@@ -1,33 +0,0 @@
-# setup
-
-Import qw( INSTALL_BASEDIR );
-
-$env = new cons(
-  # add this path so setup script finds brandelf
-  ENV => { PATH => $ENV{PATH} . ":" . $ENV{HOME} . "./usr/bin", },
-);
-
-sub launch {
-  # need to get the correct version (i.e. from SP source)
-  $version = `cat game/q_shared.h | grep Q3_VERSION`;
-  chomp $version;
-  $version =~ s/.*Q3\ (.*)\"/$1/;
-  print("version: $version\n");
-  system("cd unix ; ./build_setup.sh $version");
-
-  return 1;
-}
-
-# no dependency to PB, we get it directly from the tree and not in install/
-Depends $env "$INSTALL_BASEDIR/foo",
-  "$INSTALL_BASEDIR/linuxq3ded",
-  "$INSTALL_BASEDIR/linuxquake3-smp",
-  "$INSTALL_BASEDIR/linuxquake3";
-  # during developement phase, we generate and copy the pk3 on the fly
-  # then those should move to the media tree
-# those have been finalized and moved to the media tree
-#  "$INSTALL_BASEDIR/baseq3/pak8.pk3",
-#  "$INSTALL_BASEDIR/missionpack/pak3.pk3";
-  
-  
-Command $env "$INSTALL_BASEDIR/foo", "[perl] &launch()";
diff --git a/code/unix/LinuxSupport/CHANGES-1.32.txt b/code/unix/LinuxSupport/CHANGES-1.32.txt
deleted file mode 100644
index 0208b824..00000000
--- a/code/unix/LinuxSupport/CHANGES-1.32.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-CHANGES 1.32
-
-11/13/2002 - 1.32b
-
-Update to the Linux client, fixing a number of issues:
-
-
-- Text mode install broken on glibc 2.3 (Debian Sid)
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=165358
-Current Debian Sid's glibc package break backwards compatibility
-with binaries compiled on older glibc and statically linked.
-This will cause the text mode setup to segfault.
-
-For now you can either:
- - find a solution to run the graphical gtk-based setup
- - roll back to glibc 2.2
- - use an updated setup binary:
-   run the linux setup once, with the --keep option
-     (this will exand all the files to setup.tmp/)
-   get this updated setup file:
-     http://zerowing.idsoftware.com/linux/165358/setup
-   replace setup.tmp/setup.data/bin/Linux/x86/setup by the new one
-   cd to setup.tmp/ and run setup.sh 
-
-
-- Current NVidia drivers don't officially support glibc 2.3 systems
-This affects Debian Sid in particular, causing crashes during vid_restart
-The issue is related to the SMP build depending upon libpthreads
-1.32b has both SMP and non-SMP binary. Use quake3-smp to launch
-the SMP version if you want to use it.
-
-
-- SMP and non-SMP builds:
-Default quake3 shortcut will spawn a non-SMP build. Use quake3-smp
-for an SMP-enabled run. From the feedback we got after the 1.32 release, 
-the SMP support as designed in the Quake III Arena technology isn't so
-much relevant anymore. It was designed for much lower CPU frequencies
-and lower AGP throughputs. Modern systems won't benefit from SMP. Since
-it didn't make much sense to remove the SMP binary, we have both now.
-
-
-- Fixing broken mouse on Suse:
-Starting with XFree 4.2, the event timestamps returned by the X server 
-are no longer matching gettimeofday. And there is currently no API in X 
-to provide easy synchronisation. 1.32 introduced improved event timing 
-by correcting event time with X server event timestamp (sub-frame timing).
-This worked fine with XFree 4.1, and no longer does. 1.32b adds a safe
-check to work again with XFree 4.2, but basically the input timing is
-back to 1.31 quality.
-
-Some new cvars related to the mouse control:
-in_dgamouse - not new, but be sure to have it set to 1 on any recent system
-in_subframe - completely disables sub-frame timing. If XFree 4.2
-  in_subframe 1 won't hurt, but it won't do anything either.
-in_nograb   - for mod developers. Set to 1 and run windowed, Q3 won't be
-  grabbing your mouse pointer (useful for debug breaks)
-
-
-8/26/2002
-
-General:
-
-- new network protocol, 68
-
-- network code:
-  improved fragmented messages handling
-  map change while client loads map no longer causes an 'Invalid .PK3' error
-  map_restart while client loads map no longer causes a reload
-  fixing donedl being ignored after autodl if map_restart'ed
-- the demo command has a list of compatible protocols, it will loop through 66 67 68
-  you can do '/demo four' and it will try four.dm_66 four.dm_67 four.dm_68
-  or you can explicitely give a '/demo demoname.dm_??'
-
-- added mousewheel support in the console: 
-  wheel to scroll, ctrl+wheel to scroll faster, shift+wheel to scroll history
-
-- UI in baseq3/ and missionpack/ for PunkBuster configuration
-  punkbuster server in server creation dialog (sv_punkbuster)
-  punkbuster client in server browser (cl_punkbuster)
-  added PB Yes/No to the browsers
-- removed obsolete MPlayer UI stuff
-- bumped server browser to handle up to 4096 servers
-
-- IP maintained in userinfo
-- cl_guid in userinfo (as part of PB integration)
-- printing ports as unsigned ints, no longer printing negative port numbers
-- cleaned up the legacy IP banning code
-  use * for IP pattern matching now instead of 0 (fixes some confusion)
-    ex: 192.246.12.*
-  made it safe from overflowing and crashing
-  NOTE: using PunkBuster's banning system is advised instead though
-- rcon: some fixes to the buffering to avoid overflowing and dropping parts of the message 
-- rcon: now supports quoting /rcon g_motd "foo bar"
-- added SVF_CLIENTMASK (0x00000002), works only with <= 32 players
-	set bitmask of players to which send entity
-- pushed cl_maxpackets upper limit to 125
-- added [skipnotify] from RTCW, use to display in the console only, but not on client screen
-	(also fixes pb_msgprefix and pb_sv_msgprefix)
-
-- new cvar sv_lanForceRate (defaults 1):
-  forces LAN clients to the maximum rate instead of accepting client setting
-  (1 is the default behaviour, backward compatible)
-
-- new cvar sv_strictAuth (defaults 1):
-  server side variable to control wether strict CDKEY auth should be performed with the auth server
-  this is required if you want reliable cl_guid for the server (for users tracking)
-
-- filesystem:
-  client re-orders it's pk3s according to the order given by server
-  (fixes some 'Invalid .PK3 files referenced' situations
-
-- fixed invisible entities/players bug (thanks goes to Rick Johnson / Raven for this one!)
-- update x86 VM code (better and safer optimisations) (Richk Johnson / Raven too)
-- clearing client gentity before GAME_INIT call
-- failing vote if there's only one voting client (fixes exploit on 2-player server where one player votes then disconnects, forcing vote to pass)
-
-- added trap_FS_Seek
-
-- renderer fix:
-  if client game code registers a shader after drawsurfaces are generated but before frame is rendered
-  had a one-frame visual glitch (shader indexes messed up)
-- renderer fix:
-  r_roundImagesDown 0 + map q3dm1 -> crash (buffer overflow fix)
-- renderer fix:
-  fixed a crash in widescreen displays (q3dm11)
-- renderer fix:
-  MAX_SHADERS up to 2^12  
-- renderer fix:
-  moved screenshot from frontend to backend, fixes broken r_smp 1 screenshots
-
-- TA fixes:
-  MOD_KAMIKAZE MOD_JUICED logging properly to games.log
-  fixed bot taunt spamming
-- fixed typo in scripts/models2.shader (shader error Ursula head)
-
-Win32 specific:
-
-- fixed the DirectInput mouse init procedure
-- rcon:
-  fixed rcon not working on NT/2000/XP workstations that have a long uptime
-
-Linux specific:
-
-- no longer trying to load libMesaVoodooGL.so
-  obsolete code, was confusing when trying to setup correct OpenGL acceleration
-- SMP support in the renderer. Detects CPU count, r_smp 1 default if available. (thanks to Gareth Hughes for contributing this)
-- changed default GL driver from libGL.so to libGL.so.1
-  see LSB 1.2 spec: http://www.linuxbase.org/spec/refspecs/LSB_1.2.0/gLSB/libgl.html
-- Handle Ctrl and Space key together correctly (Ctrl was disabling Space)    
-- sub-frame timing of input events (key/mouse) (input timing quality now equivalent to win32)
diff --git a/code/unix/LinuxSupport/INSTALL b/code/unix/LinuxSupport/INSTALL
deleted file mode 100644
index d654d17c..00000000
--- a/code/unix/LinuxSupport/INSTALL
+++ /dev/null
@@ -1,52 +0,0 @@
-                      Quake III Arena
-                   Quake III: Team Arena
-                 Installation instructions
-                          ------
-
-What you need:                          
-
-- retail CD-ROM of Quake III Arena for Windows or linux
-- optionally, retail CD-ROM of Quake III: Team Arena 
-- a computer running linux (kernel >= 2.2 glibc >= 2.1)
-- running the client requires X11 and 3D hardware acceleration with OpenGL
-
-Installation:
-
-If you have the retail CD-ROM of Quake III Arena for linux:
-- install Quake III Arena from the CD-ROM
-- run the Point Release installer
-(to buy Quake III Arena for linux online, try http://www.tuxgames.com/)
-
-If you have the retail CD-ROM of Quake III Arena for Windows:
-- run the Point Release installer first
-- now you need to copy the main pak files from the CD-ROM
-  or from your win32 partition. Namely, you need to copy baseq3/pak0.pk3
-  and for Team Arena, missionpack/pak0.pk3
-  see below for more instructions on how to copy the files:
-
-WARNING: Those instructions are provided as a reference, 
-depending on your distribution the CD-ROM might not have the same 
-mount point. Please refer to your linux documentation for additional 
-information.
-
-- open a root shell and cd to the default installation path:
-  cd /usr/local/games/quake3
-- mount the Quake III Arena CD-ROM and install the game content
-  cp /mnt/cdrom/Quake3/baseq3/pak0.pk3 /usr/local/games/quake3/baseq3
-- optionally, mount the Quake III: Team Arena CD-ROM
-  cp /mnt/cdrom/Setup/missionpack/pak0.pk3 /usr/local/games/quake3/missionpack
-  
-NOTES:
-- If you are running Quake III Arena and Quake III: Team Arena on a 
-  Windows partition, you can save some space by symlinking the game 
-  assets to their windows installation:
-  ln -s /win/quake3/baseq3/pak0.pk3 /usr/local/games/quake3/baseq3/pak0.pk3
-  ln -s /win/quake3/missionpack/pak0.pk3 /usr/local/games/quake3/missionpack/pak0.pk3
-  (Windows partition is mounted as /win and Quake III Arena installation is C:\quake3)
-
-Getting Help:
-
-- consult the FAQ in Help/Q3A_FAQ.html
-- head over to the Quake3World forums http://www.quake3world.com/forums
-- consult the list of known issues and tips at 
-  http://zerowing.idsoftware.com/linux
diff --git a/code/unix/LinuxSupport/index.html b/code/unix/LinuxSupport/index.html
deleted file mode 100644
index e87ef29e..00000000
--- a/code/unix/LinuxSupport/index.html
+++ /dev/null
@@ -1,283 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>
-  <title>Linux Quake III Arena Known issues</title></head>
-
-<body text="#000000" bgcolor="#ffffff">
-<font size="+2"><b>Linux Quake III Arena Known issues</b></font><br>
-<i>Known issues and frequently asked questions - 1.32b</i><br>
-<br>
-<a href="mailto:ttimo@idsoftware.com">TTimo</a><br>
-<i>Changes history</i><br>
-2004.2.20 Last update<br>
-2001.6.18 Initial version
-<hr size="1"><br>
-<font size="+1">Current topics</font>
-<ul>
-  <li><a href="#install">Installation instructions</a></li>
-  <li><a href="#setupfiles">What do I do with a .x86.run file?</a></li>
-  <li><a href="#glibc">The setup crashes with <i>Segmentation fault "$setup" "$@" 2>/dev/null</i></a></li>
-  <li><a href="#bsd">Installation on BSD</a></li>
-  <li><a href="#auth">CLIENT_UNKNOWN_TO_AUTH</a></li>
-  <li><a href="#pk3">Sys_Error: Couldn't load default.cfg / Sys_Error: FS_FreeFile(
-NULL )</a></li>
-  <li><a href="#setupbug29h">I get <i>./setup.sh {: ==: binary operator expected</i>
-when running the setup?</a></li>
-  <li><a href="#hints">The game doesn't start, I have performance problems,
-etc.</a></li>
-  <li><a href="#aureal">Aureal sound drivers</a></li>
-  <li><a href="#nosound">The sound doesn't work / sound crashes</a></li>
-  <li><a href="#discuss">Where can I report bugs and discuss about linux
-Quake III Arena?</a></li>
-  <li><a href="#gameso">The *.so files are not in the setups? (<i>cgamei386.so
-qagamei386.so uii386.so</i>)</a></li>
-  <li><a href="#vm_game">I get <i>Sys_Error: Sys_LoadDll(..) failed dlopen()
-completely!</i> when running quake3?</a></li>
-  <li><a href="#3dnow">I have an AMD CPU and a kernel 2.4.*, Quake III Arena
-is slowing down to a complete stop after a while?</a></li>
-  <li><a href="#gamma">How do I set up the gamma correction?</a></li>
-  <li><a href="#browser">Servers don't show up in the ingame browser</a></li>
-  <li><a href="#libsafe">Detected an attempt to write across stack boundary</a></li>
-  <li><a href="#libmesa">libMesaVoodooGL.so</a></li>
-  <li><a href="#UDPwide">Running a LAN dedicated server with multiple network
-interfaces</a></li>
-  <li><a href="#64bits">Setup and execution on 64 bits CPUs</a></li>
-  <li><a href="#links">Links</a></li>
-</ul>
-<hr size="1"><font size="+1"><a name="install"><b>Installation instructions</b></a></font>
-<a name="install"><br>
-</a>
-<p><a name="install">Linux Quake III Arena is using a graphical installer
-(based on Loki software's </a><a href="http://www.icculus.org/loki_setup/">Setup Graphic Installer
-</a>). However, since it's a Point Release, you need a retail CD-ROM of  Quake
-III Arena to perform a complete installation (and optionally your Quake III:
-Team Arena CD-ROM). This process is documented in the <a href="http://zerowing.idsoftware.com/linux/q3a/INSTALL">INSTALL</a>file
-(this file is also in the setups, it's default location is /usr/local/games/quake3/INSTALL
-.. you can run the PR setup and read it to finish the installation afterwards).</p>
-<font size="+1"><a name="setupfiles"><b>What do I do with a .x86.run file?</b></a></font>
-<a name="setupfiles"><br>
-</a>
-<p>Those are setup files, meant to be executed. They
-come with graphical  installation UI or console installation, depending on
-what's available on your system. You may need to <i>chmod +x file.x86.run</i>
-to make them executable.</p>
-<font size="+1"><a name="glibc"><b>The setup crashes with <i>Segmentation fault "$setup" "$@" 2>/dev/null</i></b></a></font>
-<p>This is happening on glibc 2.3 systems such as RedHat 9 and Suze. The text mode installer will crash. If you can do a graphical installation, make sure you have Gtk1 installed and avoid the text installer altogether.
-If you are doing a remote installation (such as a dedicated server through ssh), you need to use a newer text mode installer. Run the installer with <i>--keep</i> to extract the files 
-(look for a <i>setup*</i> directory in the current directory for the extracted setup). 
-Then replace <i>setup.data/bin/Linux/x86/setup</i> by <a href="http://zerowing.idsoftware.com/linux/setup-RH9/setup">this newer version</a>. Run <i>setup.sh</i> at top level and things should work fine.</p>
-<p>
-<b>Update</b>: Turns out this solution is working for RTCW and ET, but not for Q3 (because the last q3 setup uses an older version of the installer). Will update a specific solution for Q3 'soon'.
-</p>
-<font size="+1"><a name="bsd"><b>Installation on
-BSD</b></a></font><a name="bsd"><br>
-</a>
-<p><a name="bsd">The linux binaries will run fine on the BSD family (FreeBSD,
-NetBSD and OpenBSD) with the linux binary compatibility software. However
-if you are getting the  error message <i>ELF binary type "0" not known</i>
-while installing or trying to run the binaries, that means you need to run
-<i>brandelf</i> on the files.</a></p>
-<p><a name="bsd">If it's a setup problem, proceed with the following steps:
-</a></p>
-<pre><a name="bsd">./linuxq3apoint-1.31.x86.run --keep<br>brandelf -t Linux setup.tmp/setup.data/bin/FreeBSD/x86/setup<br>cd setup.tmp<br>sh ./setup.sh<br></a></pre>
-<p><a name="bsd">The --keep option will extract the files and leave them
-somewhere below your current directory. Depending on the game (Q3 or RTCW)
-and the setup version, your mileage may vary (setup.tmp or another directory).</a></p>
-<p><a name="bsd">The game binaries might need to be brandelf'ed too, with
-a command such as</a></p>
-<pre><a name="bsd">brandelf -t Linux /usr/local/games/quake3/quake3.x86<br></a></pre>
-<a name="bsd"></a><font size="+1"><a name="auth"><b>CLIENT_UNKNOWN_TO_AUTH</b></a></font>
-<a name="auth"><br>
-</a>
-<p><a name="auth">Graeme Devine recently updated his <i>.plan</i> with very
-complete </a><a href="http://www.webdog.org/cgi-bin/finger.plm?id=279&amp;time=20011210020942" target="_new">information about CLIENT_UNKNOWN_TO_AUTH errors</a>.</p>
-<p>
-See some additional information from the <a href="http://www.gameadmins.com/modules.php?name=Mail_List">gameadmins.com mailing list</a>:
-</p> 
-<pre>If the server you are playing on and the auth server don't see you as the
-same IP (for instance you are trying to play on a public internet server
-that's on your LAN, and your internet access is using NAT), then it won't
-work.
-
-It used to work in 1.31, and it doesn't in 1.32. PunkBuster requires
-reliable auth of the players. What you can do:
-
-- run a server with sv_strictauth 0 and you'll be able to join your
-server. This will be the same behaviour as 1.31
-
-- connect to a server on the internet before you connect to your local
-server (this will trigger your IP into the cache of the auth server for
-15mn and let you in to your local server).
-
-- setup two NATs, one for your client one for your server and make sure
-your server and Id's auth see the same IP. (this one ain't for network
-setup newbies)
-</pre>
-<font size="+1"><a name="pk3"><b>Sys_Error: Couldn't load default.cfg / Sys_Error:
-FS_FreeFile( NULL )</b></a></font><br>
-<p>If you get one of these errors after installing Quake III Arena or Return
-To Castle Wolfenstein, it means that the engine didn't find all the required
-.pk3 files. Either you didn't copy them, or you copied them to the wrong
-place. Check the INSTALL instructions for the game for more details, make
-sure they are in baseq3/ for quake3 (missionpack/ for TA files) and main/
-for Return To Castle Wolfenstein.</p>
-<font size="+1"><a name="setupbug29h"><b>I get <i>./setup.sh {: ==: binary
-operator expected</i> when running the setup?</b></a></font><a name="setupbug29h"><br>
-</a>
-<p><a name="setupbug29h">This is a known issue to 1.29h setups and prior.
-It happens on systems with bash  version &lt; 2.*. There are several solutions:<br>
-- Upgrade bash to something more recent and run the setup again - Run the
-setup with the --keep option. It will fail but it will leave a <i>setup-full</i>
-directory. You can then copy the files manually from that dir. - Once you
-used the --keep option above, you can edit setup.sh and replace  occurences
-of == by =. Then run setup.sh and the installer will execute.</a></p>
-<a name="setupbug29h"></a><font size="+1"><a name="hints"><b>The game doesn't
-start, I have performance problems, etc.</b></a></font><br>
-<p>The first thing to do is to check on the forums and various FAQs (this
-one, but  there are others. See the <a href="#links">links</a>). The Quake3World
-forums have a great search function.</p>
-<p>Before reporting the problem to <a href="mailto:ttimo@idsoftware.com">me</a>
-make sure it's an issue with the game, and not an issue with your  OS/OpenGL/sound
-configuration. Common OS issues are listed in this FAQ. You should make sure
-you have OpenGL configured correctly (by checking if <i>gears</i>is running
-for instance, and how well it runs). And see if non-Id linux games are running
-fine too.</p>
-<p>When you are going to report a bug, first make sure you are using the
-latest version of the game. Include the game version in your report.</p>
-<p>Include general information about your OS:<br>
-</p>
-<ul>
-  <li>Motherboard brand, CPU type, RAM</li>
-  <li>distribution name and version</li>
-  <li>kernel / OS info (from <i>uname -a</i>)</li>
-  <li>libc version (<i>ls -l /lib/libc.so.*</i>)<br>
- please specify if you can if the libc is your distribution's standard
-version, or if you compiled yourself, and what binary target was used (x86,
-or AMD, i686 etc.)</li>
-</ul>
-<p>If it's a problem with the client, send the output of <i>glxinfo</i>.</p>
-<p>If you have an nvidia board, send the output of <i>cat /proc/nv/card0</i>
-</p>
-<p>Send output of the run:<br>
-run the game with <i>+set developer 1</i> option, and send the output. You
-can do something like <i>quake3 +set developer 1 &amp;&gt;q3run.log</i>.</p>
-<p>If it's a crash, you can send a backtrace of the game running  through
-<i>gdb</i>.</p>
-<p>You can also send a log of the game running with <i>strace</i>:</p>
-<pre>cd /usr/local/games/quake3<br>strace -o ~/strace.log ./quake3.x86<br></pre>
-<p>NOTE: please <b>avoid</b> sending me the <i>strace</i> of <i>/usr/local/games/quake3/quake3</i>,
-which is a shell script wrapper and probably no interest to your problem.
-</p>
-<font size="+1"><a name="aureal"><b>Aureal sound drivers</b></a></font><a name="aureal"><br>
-</a>
-<p><a name="aureal">It seems that some versions of the Aureal sound drivers
-don't work right with Q3. Last I heard, a kernel upgrade to 2.4.17 + Aureal
-1.1.3, and/or using the  old 1.1.1 drivers from </a><a href="http://aureal.sourceforge.net/" target="_new">Aureal's website</a>fixed
-the problem.</p>
-<p>If you need to know more about this, have a look at this <a href="http://www.quake3world.com/ubb/Forum15/HTML/001348.html" target="_new">Q3W forum thread</a>.</p>
-<font size="+1"><a name="nosound"><b>The sound doesn't work / sound crashes</b></a></font><br>
-<p>The first thing to check is that it is actually a sound related.  Run
-the game with <i>+set s_initsound 0</i> and see what happens.  All problems
-reported so far about sound turned out to be OS/drivers.  Listed below:</p>
-<p>On some Mandrake distributions:<br>
-Check if you are running the enlightenment sound daemon (esd). With <i>ps
-aux | grep esd</i>for instance. It is a multiplexer for /dev/dsp, and might
-block use of /dev/dsp by Quake III Arena. You can disable esd with <i>esdctl
-stop</i> (as root).</p>
-<p><b><a href="http://www.linux-mandrake.com/">Mandrake 8</a></b>'s default
-sound drivers seem broken, installing the <a href="http://www.alsa-project.org/" target="_new">Alsa drivers</a> or the
- <a href="http://www.opensound.com/">http://www.opensound.com</a>  drivers
-fixes the problem.</p>
-<p>Some beta <a href="http://www.alsa-project.org/" target="_new">Alsa drivers</a>
-have  been reported to crash with Q3. Non-beta ones are fine.</p>
-<p>VIA chipset and AC97 driver:<br>
-This combination is known to have various issues. They have been fixed in
-recent drivers (thanks to Arne Schmitz for the heads up):<br>
-</p>
-<pre>http://sourceforge.net/projects/gkernel has got the up to date version of <br>the AC97 kernel driver. The current version can be found here:<br><br>http://prdownloads.sourceforge.net/gkernel/via82cxxx-1.1.15.tar.gz<br><br>It has working mmap sound, so Q3 shouldn't be a problem any more.<br></pre>
-(thanks to Arne Schmitz for the heads up)<p></p>
-
-<font size="+1"><a name="discuss"><b>Where can I report bugs and discuss about linux Quake III
-Arena?</b></a></font><a name="discuss"><br>
-</a>
-<p><a name="discuss">Reports bugs to </a><a href="mailto:bugs@idsoftware.com">bugs@idsoftware.com</a>. If you are pretty
-sure this is a linux-only issue, you can shorten the loop by emailing <a href="mailto:ttimo@idsoftware.com">ttimo@idsoftware.com</a> directly.</p>
-<p>You will find the discussion forums for linux Quake III Arena on <a href="http://www.quake3world.com/cgi-bin/forumdisplay.cgi?action=topics&amp;forum=*nix+Discussion&amp;number=15&amp;DaysPrune=30&amp;LastLogin=">
-Quake3World forums</a>. There is for sure a lot of other places to talk about
-linux Quake III Arena, but this is the one we read regularly to track bugs
-and common issues.</p>
-<font size="+1"><a name="gameso"><b>The *.so files are not in the setups?
-(<i>cgamei386.so qagamei386.so uii386.so</i>)</b></a></font><a name="gameso"><br>
-</a>
-<p><a name="gameso">If you still have <i>baseq3/*.so</i> and <i>missionpack/*.so</i>
-files, then those come from the earlier 1.27g beta installation and you should
-REMOVE them. They were provided in 1.27g to go around a bug in the VM code,
-which made win32 VMs incompatible with linux. This problem has been fixed
-and the two files are no longer required.</a></p>
-<p><a name="gameso">If you are upgrading from 1.27g, it is likely that your
-<i>q3config.cfg</i> files are set to use the native libraries (*.so files)
-instead of the bytecode. Run quake3 with the following options to set things
-right:<br>
-<i>quake3 +set vm_game 2 +set vm_cgame 2 +set vm_ui 2</i></a></p>
-<a name="gameso"></a><font size="+1"><a name="vm_game"><b>I get <i>Sys_Error:
-Sys_LoadDll(..) failed dlopen() completely!</i>when running quake3?</b></a></font><a name="vm_game"><br>
-</a>
-<p><a name="vm_game">Try running quake3 with the following options:<br>
-<i>quake3 +set vm_game 2 +set vm_cgame 2 +set vm_ui 2</i><br>
-You should also read the </a><a href="#gameso">above answer</a>.</p>
-<font size="+1"><a name="3dnow"><b>I have an AMD CPU and a kernel 2.4.*,
-Quake III Arena is slowing down to a complete stop after a while?</b></a></font><br>
-<p>It seems the 3DNow! copy routines have issues with the southbridge chip
-in the KT133A, this results in performances degrading while playing for a
-while. Re-compile your kernel without 3DNow! instructions to avoid the problem,
-and wait for newer kernels with better support for 3DNow! / KT133A.</p>
-<font size="+1"><a name="gamma"><b>How do I set up the gamma correction?</b></a></font><br>
-<p>Starting with 1.29h, you can set the gamma correction with the brightness
-slider in the graphical menu (under setup). On some older systems which don't
-have the appropriate XFree86 extensions, you might have to set <b>r_gamma</b>
-manually from the console, and issue a <b>vid_restart</b> command.</p>
-<font size="+1"><a name="browser"><b>Servers don't show up in the ingame
-browser</b></a></font>
-<p>The reason for this has not been clearly identified yet, seems to be related
-to upgrade from older versions. Deleting ~/.q3a/baseq3/q3config.cfg fixes
-the problem (you will have to reconfigure your bindings)</p>
-<font size="+1"><a name="libsafe"><b>Detected an attempt to write across
-stack boundary</b></a></font>
-<p>If Quake III Arena exits with the error "Detected an attempt to write
-across stack boundary", this probably means that you are running libsafe
-on this system. Quake III Arena is compiled with some options that confuse
-libsafe, you should disable it before running. See <a href="http://www.mudos.org/?faq" target="_new">this page</a> for more details.
-</p>
-<font size="+1"><a name="libmesa"><b>libMesaVoodooGL.so</b></a></font>
-<p>The GL driver for Voodoo cards (libMesaVoodoGL.so) used to be distributed
-in older Q3 setups. <b>This is no longer the case.</b> If you have this .so
-in your Quake III Arena directory (<i>/usr/local/games/quake3</i>), you should
-remove it. Any recent/decent linux distribution should support your Voodoo
-card out of the box, otherwise it is recommended that you setup  XFree 4.*
-and the correct DRI infrastructure for it.</p>
-<font size="+1"><a name="UDPwide"><b>Running a LAN dedicated server with
-multiple network interfaces</b></a></font>
-<p>A LAN dedicated server will use the <i>net_ip</i> cvar to identify the
-NIC it is going to use (default is "localhost"). As it only opens one socket,
-it is not possible to have a server broadcast it's packets on all the NICs.
-This can be a problem if the server is serving games for a LAN and runs several
-NICs to access the various sub networks.<br>
-</p>
-<p>The following Linux kernel patch (2.4.19) was provided by Rogier Mulhujzen
-and John Tobin, it will force broadcasts to be emitted on all interfaces:<br>
-<a href="http://zerowing.idsoftware.com/linux/q3a/udp_wide_broadcast.patch">udp_wide_broadcast.patch</a><br>
-<a href="http://zerowing.idsoftware.com/linux/q3a/udp_wide_README.txt">udp_wide_README.txt</a><br>
-The equivalent <a href="http://www.bsdchicks.com/patches/">patch for FreeBSD</a>
-is available too.<br>
- </p>
-<font size="+1"><a name="64bits"><b>Setup and execution on 64 bits CPUs</b></a></font><br>
-<p>If you are running Linux on a 64 bit CPU (such as AMD's Opteron), and if your system is backwards compatible so that it can execute 32 bits x86 binaries, then the regular Quake III Arena binaries should work (your mileage may vary).</p>
-<p>It's likely that the installer scripts will get confused though, and will refuse to install giving you an error: "This installation doesn't support glibc-2.1 on Linux / unknown". You will have to extract the game files manually by passing --keep on the command line when running the setup script. Once the files are unpacked, you will need to copy them manually to /usr/local/games. You probably want to have a working installation to refer to while doing this. This also applies to RTCW and ET</p>
-<font size="+1"><a name="links"><b>Links</b></a></font><br>
-<p>The <a href="http://www.icculus.org/lgfaq" target="_new">Linux Gamer's
-faq</a> is a very good resource for general Linux Gaming topics.</p>
-<p>Also at <a href="http://www.icculus.org/" target="_new">icculus.org</a>,
-the <a href="http://www.icculus.org/lgfaq/loki/q3faq.html" target="_new">old
-Q3 FAQ from Loki Software</a>.</p>
-<p><a href="http://www.quake3world.com/ubb/Forum15/HTML/000529.html">Quake3World's
-linux FAQ</a></p>
-<br>
-</body></html>
diff --git a/code/unix/LinuxSupport/udp_wide_README.txt b/code/unix/LinuxSupport/udp_wide_README.txt
deleted file mode 100644
index ecd0b982..00000000
--- a/code/unix/LinuxSupport/udp_wide_README.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-UDP Wide Broadcast Patch for Kernel 2.4.19
-
-Main purpose is to allow Quake 3 servers, and all games powered by the
-engine, to be visible in the server browser when the servers are being run on
-aliased IP addresses and multiple NICs using the +set net_ip option.
-
-To apply the patch run "patch -p1 < udp_wide_broadcast.patch" from your
-source directory and recompile.
-
-Add "echo "1" > /proc/sys/net/ipv4/udp_wide_broadcast" to one of your startup
-scripts, i.e./etc/rc.d/rc.local, and run thousands of servers from your
-computer.
-
-
-Patch by:
-Rogier Mulhujzen <linux@bsdchicks.com>
-John Tobin <ogre@sirinet.net>
-
-A patch with the same functionality for FreeBSD is available from
-http://www.bsdchicks.com/patches
diff --git a/code/unix/LinuxSupport/udp_wide_broadcast.patch b/code/unix/LinuxSupport/udp_wide_broadcast.patch
deleted file mode 100644
index 2f1092e5..00000000
--- a/code/unix/LinuxSupport/udp_wide_broadcast.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- linux/include/linux/sysctl.h.orig	2002-08-17 19:52:27.000000000 -0500
-+++ linux/include/linux/sysctl.h	2002-08-17 19:53:00.000000000 -0500
-@@ -291,7 +291,8 @@
- 	NET_IPV4_NONLOCAL_BIND=88,
- 	NET_IPV4_ICMP_RATELIMIT=89,
- 	NET_IPV4_ICMP_RATEMASK=90,
--	NET_TCP_TW_REUSE=91
-+	NET_TCP_TW_REUSE=91,
-+	NET_UDP_WIDE_BROADCAST=92
- };
- 
- enum {
---- linux-modified/net/ipv4/sysctl_net_ipv4.c.orig	2002-08-17 19:48:19.000000000 -0500
-+++ linux-modified/net/ipv4/sysctl_net_ipv4.c	2002-08-17 19:52:03.000000000 -0500
-@@ -45,6 +45,9 @@
- extern int inet_peer_gc_mintime;
- extern int inet_peer_gc_maxtime;
- 
-+/* From udp.c */
-+extern int sysctl_udp_wide_broadcast;
-+
- #ifdef CONFIG_SYSCTL
- static int tcp_retr1_max = 255; 
- static int ip_local_port_range_min[] = { 1, 1 };
-@@ -221,6 +224,8 @@
- 	 &sysctl_icmp_ratemask, sizeof(int), 0644, NULL, &proc_dointvec},
- 	{NET_TCP_TW_REUSE, "tcp_tw_reuse",
- 	 &sysctl_tcp_tw_reuse, sizeof(int), 0644, NULL, &proc_dointvec},
-+	{NET_UDP_WIDE_BROADCAST, "udp_wide_broadcast",
-+	 &sysctl_udp_wide_broadcast, sizeof(int), 0644, NULL, &proc_dointvec},
- 	{0}
- };
- 
---- linux-modified/net/ipv4/udp.c.orig	2002-08-17 19:40:59.000000000 -0500
-+++ linux-modified/net/ipv4/udp.c	2002-08-17 23:37:47.000000000 -0500
-@@ -94,6 +94,8 @@
- #include <net/inet_common.h>
- #include <net/checksum.h>
- 
-+int sysctl_udp_wide_broadcast = 0;
-+
- /*
-  *	Snmp MIB for the UDP layer
-  */
-@@ -272,9 +274,10 @@
- 		if ((s->num != hnum)					||
- 		    (s->daddr && s->daddr!=rmt_addr)			||
- 		    (s->dport != rmt_port && s->dport != 0)			||
--		    (s->rcv_saddr  && s->rcv_saddr != loc_addr)		||
--		    (s->bound_dev_if && s->bound_dev_if != dif))
-+		    !(sysctl_udp_wide_broadcast || !(s->rcv_saddr  && s->rcv_saddr != loc_addr))	||
-+		    (s->bound_dev_if && s->bound_dev_if != dif)) {
- 			continue;
-+		}
- 		break;
-   	}
-   	return s;
diff --git a/code/unix/Makefile b/code/unix/Makefile
deleted file mode 100644
index 0595cd4e..00000000
--- a/code/unix/Makefile
+++ /dev/null
@@ -1,2119 +0,0 @@
-#
-# Quake3 Unix Makefile
-#
-# Currently build for the following:
-#	Linux i386 (full client)
-#	Linux Alpha (dedicated server only) (TTimo: dropped)
-#	FreeBSD i386 (dedicated server only) (TTimo: maybe worth updating)
-#	SGI IRIX (full client) (TTimo: who's in charge - dropped otherwise)
-#   Linux PPC (full client) (TTimo: dropped)
-#
-# Nov '98 by Zoid <zoid@idsoftware.com>
-#
-# Loki Hacking by Bernd Kreimeier 
-#  and a little more by Ryan C. Gordon.
-#  and a little more by Rafael Barrero
-#
-# GNU Make required
-#
-
-PLATFORM=$(shell uname|tr A-Z a-z)
-PLATFORM_RELEASE=$(shell uname -r)
-
-###
-### These paths are where you probably want to change things
-###
-
-# Where we are building from (where the source code should be!)
-MOUNT_DIR=../
-
-# Where we are building to, libMesaVoodooGL.so.3.3 should be here, etc.
-# the demo pk3 file should be here in demoq3/pak0.pk3 or baseq3/pak0.pk3
-BDIR=$(MOUNT_DIR)/../run
-
-
-# Build name
-# BUILD_NAME=$(BUILD_NAME)
-BUILD_NAME=quake3.x86
-
-
-
-#############################################################################
-##
-## You shouldn't have to touch anything below here
-##
-#############################################################################
-
-BASEQ3_DIR=$(BDIR)/baseq3
-
-BD=debug$(ARCH)$(GLIBC)
-BR=release$(ARCH)$(GLIBC)
-CDIR=$(MOUNT_DIR)/client
-SDIR=$(MOUNT_DIR)/server
-RDIR=$(MOUNT_DIR)/renderer
-CMDIR=$(MOUNT_DIR)/qcommon
-UDIR=$(MOUNT_DIR)/unix
-GDIR=$(MOUNT_DIR)/game
-CGDIR=$(MOUNT_DIR)/cgame
-BAIDIR=$(GDIR)
-BLIBDIR=$(MOUNT_DIR)/botlib
-NDIR=$(MOUNT_DIR)/null
-UIDIR=$(MOUNT_DIR)/ui
-Q3UIDIR=$(MOUNT_DIR)/q3_ui
-FTDIR=$(MOUNT_DIR)/ft2
-JPDIR=$(MOUNT_DIR)/jpeg-6
-SPLNDIR=$(MOUNT_DIR)/splines
-
-# extract version info
-VERSION=$(shell ./extract_ver.pl)
-RPM_RELEASE=1
-
-# NOTE: used by dcp rcp targets, not referenced
-#TESTDIR=/home/timo/Id/Quake3-loki/run
-
-#############################################################################
-# SETUP AND BUILD -- LINUX
-#############################################################################
-
-## Defaults
-DLL_ONLY=false
-# bk010215 - TODO - add all defaults / kill Ryan
-
-
-ifeq ($(PLATFORM),linux)
-
-  ifneq (,$(findstring libc6,$(shell if [ -e /lib/libc.so.6* ];then echo libc6;fi)))
-    GLIBC=-glibc
-  else
-    GLIBC=
-  endif #libc6 test
-
-  ifneq (,$(findstring alpha,$(shell uname -m)))
-    ARCH=axp
-    RPMARCH=alpha
-    VENDOR=dec
-  else
-    ifneq (,$(findstring ppc,$(shell uname -m)))
-      #used for linux builds
-      MESADIR=/usr/src/DRI-CVS/xc/xc/
-      ARCH=ppc
-      RPMARCH=ppc
-      VENDOR=unknown
-      DLL_ONLY=true
-    else #default to i386
-      MESADIR=../Mesa/
-      ARCH=i386
-      RPMARCH=i386
-      VENDOR=unknown
-      DLL_ONLY=false
-    endif
-  endif
-
-  # bk001205: no mo'  -I/usr/include/glide, no FX
-  # bk001205: no mo'  -Dstricmp=strcasecmp, see q_shared.h
-  BASE_CFLAGS =  -pipe -fsigned-char
-  # rcg010216: DLL_ONLY for PPC
-  ifeq ($(strip $(DLL_ONLY)),true)
-    BASE_CFLAGS += -DDLL_ONLY
-  endif
-
-
-  #GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
-  GL_CFAGS = -I/usr/X11R6/include
-
-  # bk001204 - need -O for -Wall for uninitialized
-  # bk001205 - took out -O to get assertions (NDEBUG)
-  # bk001206 - MALLOC_CHECK in addition to ZONE_DEBUG
-  # TTimo 03/30/2001 temporary took out -Werror for initial merge
-  DEBUG_CFLAGS = $(BASE_CFLAGS) -g  -Wall -Werror
-  DEBUG_CFLAGS += -DNO_MOUSEGRAB
-  DEBUG_CFLAGS += -O
-#  DEBUG_CFLAGS=$(BASE_CFLAGS) -g  -Wall -O
-  ifeq ($(ARCH),axp)
-    CC=pgcc
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-  else
-    ifeq ($(ARCH),ppc)
-      NEWPGCC=/loki/global/ppc/bin/gcc
-      CC=$(NEWPGCC)
-      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
-    else
-      #NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc # bk001205
-      #NEWPGCC=/loki/global/x86/bin/gcc
-      NEWPGCC=/usr/bin/gcc
-      CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )
-      CXX=/usr/bin/g++
-# TTimo: legacy RELEASE_CFLAGS
-# NOTE: the -fomit-frame-pointer option leads to an unstable binary on my test box if it was built on the main box
-#   but building on the Mdk 7.2 baseline seems to work
-      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
-# TTimo: use this for building on P3 gcc 2.95.3 libc2.2 for all targets (experimental! -fomit-fram-pointer removed)
-#      RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce
-    endif
-  endif
-
-  LIBEXT=a
-
-  SHLIBEXT=so
-  SHLIBCFLAGS=-fPIC
-  SHLIBLDFLAGS=-shared $(LDFLAGS)
-
-  ARFLAGS=ar rv
-  RANLIB=ranlib
-
-  THREAD_LDFLAGS=-lpthread
-  LDFLAGS=-ldl -lm
-  GLLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
-
-  ifeq ($(ARCH),axp)
-    TARGETS=\
-	  $(B)/$(PLATFORM)q3ded
-  else
-    TARGETS=\
-	  $(B)/$(PLATFORM)quake3 \
-	  $(B)/$(PLATFORM)quake3-smp \
-	  $(B)/$(PLATFORM)q3ded \
-	  $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
-	  $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
-	  $(B)/baseq3/ui$(ARCH).$(SHLIBEXT)     \
-	  $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
-	  $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
-	  $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) \
-#	  $(B)/baseq3/vm/qagame.qvm \
-#	  $(B)/baseq3/vm/cgame.qvm \
-#	  $(B)/baseq3/vm/ui.qvm \
-#	  $(B)/missionpack/vm/qagame.qvm \
-#	  $(B)/missionpack/vm/cgame.qvm \
-#	  $(B)/missionpack/vm/ui.qvm
-  endif
-
-## $(B)/$(PLATFORM)q3static   \
-
-else # ifeq Linux
-
-#############################################################################
-# SETUP AND BUILD -- FREEBSD
-#############################################################################
-
-ifeq ($(PLATFORM),freebsd)
-
-GLIBC= #libc is irrelevant
-
-ifneq (,$(findstring alpha,$(shell uname -m)))
-ARCH=axp
-RPMARCH=alpha
-VENDOR=dec
-else #default to i386
-ARCH=i386
-RPMARCH=i386
-VENDOR=unknown
-endif #alpha test
-
-
-BASE_CFLAGS =  -pipe
-
-GL_CFLAGS = -I$(MESADIR)/include -I/usr/X11R6/include
-
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g  -Wall -Werror
-ifeq ($(ARCH),axp)
-CC=pgcc
-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-else
-#NEWPGCC=/loki/global/x86/bin/gcc # raistlin012301
-#NEWPGCC=/usr/local/gcc-2.95.2/bin/gcc
-NEWPGCC=/home/raistllin/src/gcc/build/install/bin/gcc
-CC=$(shell if [ -f $(NEWPGCC) ]; then echo $(NEWPGCC); else echo pgcc; fi )
-RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -pipe -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing - fstrength-reduce
-endif
-
-LIBEXT=a
-
-SHLIBEXT=so
-SHLIBCFLAGS=-fPIC
-SHLIBLDFLAGS=-shared $(LDFLAGS)
-
-ARFLAGS=ar rv
-RANLIB=ranlib
-
-THREAD_LDFLAGS=-lpthread
-# don't need -ldl (FreeBSD)
-LDFLAGS=-lm
-#GLLDFLAGS=-L/usr/X11R6/lib -L$(MESADIR)/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-#GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
-GLLDFLAGS=-L/usr/X11R6/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm
-
-ifeq ($(ARCH),axp)
-TARGETS=\
-        $(B)/$(PLATFORM)q3ded
-else
-TARGETS=\
-	$(B)/$(PLATFORM)quake3 \
-	$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
-	$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
-	$(B)/baseq3/ui$(ARCH).$(SHLIBEXT)     \
-	$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
-	$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
-	$(B)/missionpack/ui$(ARCH).$(SHLIBEXT)
-endif
-
-else # ifeq freebsd
-
-#############################################################################
-# SETUP AND BUILD -- IRIX
-#############################################################################
-
-ifeq ($(PLATFORM),irix)
-
-ARCH=mips  #default to MIPS
-VENDOR=sgi
-GLIBC=  #libc is irrelevant
-
-CC=cc
-BASE_CFLAGS=-Dstricmp=strcasecmp -Xcpluscomm -woff 1185 -mips3 \
-	-nostdinc -I. -I$(ROOT)/usr/include
-RELEASE_CFLAGS=$(BASE_CFLAGS) -O3
-DEBUG_CFLAGS=$(BASE_CFLAGS) -g
-
-LIBEXT=a
-
-SHLIBEXT=so
-SHLIBCFLAGS=
-SHLIBLDFLAGS=-shared
-
-ARFLAGS=ar rv
-RANLIB=ranlib
-
-LDFLAGS=-ldl -lm
-GLLDFLAGS=-L/usr/X11/lib -lGL -lX11 -lXext -lm
-
-TARGETS=$(B)/sgiquake3 \
-	$(B)/q3ded
-
-else # ifeq IRIX
-
-#############################################################################
-# SETUP AND BUILD -- GENERIC
-#############################################################################
-
-#CC=egcs
-#BASE_CFLAGS=-Dstricmp=strcasecmp
-#DEBUG_CFLAGS=$(BASE_CFLAGS) -g 
-#RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3
-
-LIBEXT=a
-
-SHLIBEXT=so
-SHLIBCFLAGS=-fPIC
-SHLIBLDFLAGS=-shared
-
-ARFLAGS=ar rv
-RANLIB=ranlib
-
-ifeq ($(PLATFORM),freebsd)
-LDFLAGS=-lm
-else
-LDFLAGS=-ldl -lm
-endif # ifeq freebsd
-
-TARGETS=\
-	$(B)/$(PLATFORM)q3ded
-
-endif #Linux
-endif #FreeBSD
-endif #IRIX
-
-DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
-DO_CXX=$(CXX) $(CFLAGS) -o $@ -c $<
-DO_SMP_CC=$(CC) $(CFLAGS) -DSMP -o $@ -c $<
-DO_BOT_CC=$(CC) $(CFLAGS) -DBOTLIB  -o $@ -c $<   # $(SHLIBCFLAGS) # bk001212
-DO_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) -o $@ -c $<
-DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
-DO_SHLIB_DEBUG_CC=$(CC) $(DEBUG_CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
-DO_AS=$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-DO_NASM=nasm -f elf -o $@  $<
-DO_DED_CC=$(CC) -DDEDICATED -DC_ONLY $(CFLAGS) -o $@ -c $<
-
-#DO_LCC=$(LCC) -o $@ -S -Wf-target=bytecode -Wf-g -DQ3_VM -I$(CGDIR) -I$(GDIR)  -I$(UIDIR)  $< 
-
-#### DEFAULT TARGET
-default:build_debug
-
-debug: build_debug
-release: build_release
-
-build_debug:
-	$(MAKE)  targets B=$(BD) CFLAGS="$(DEBUG_CFLAGS)"
-
-build_release:
-	$(MAKE)  targets B=$(BR) CFLAGS="$(RELEASE_CFLAGS)"
-
-#Build both debug and release builds
-all:build_debug build_release
-
-targets:makedirs $(TARGETS)
-
-makedirs:
-	@if [ ! -d $(B) ];then mkdir $(B);fi
-	@if [ ! -d $(B)/client ];then mkdir $(B)/client;fi
-	@if [ ! -d $(B)/ded ];then mkdir $(B)/ded;fi
-	@if [ ! -d $(B)/ref ];then mkdir $(B)/ref;fi
-	@if [ ! -d $(B)/ft2 ];then mkdir $(B)/ft2;fi
-	@if [ ! -d $(B)/baseq3 ];then mkdir $(B)/baseq3;fi
-	@if [ ! -d $(B)/baseq3/cgame ];then mkdir $(B)/baseq3/cgame;fi
-	@if [ ! -d $(B)/baseq3/game ];then mkdir $(B)/baseq3/game;fi
-	@if [ ! -d $(B)/baseq3/ui ];then mkdir $(B)/baseq3/ui;fi
-	@if [ ! -d $(B)/baseq3/vm ];then mkdir $(B)/baseq3/vm;fi
-	@if [ ! -d $(B)/missionpack ];then mkdir $(B)/missionpack;fi
-	@if [ ! -d $(B)/missionpack/cgame ];then mkdir $(B)/missionpack/cgame;fi
-	@if [ ! -d $(B)/missionpack/game ];then mkdir $(B)/missionpack/game;fi
-	@if [ ! -d $(B)/missionpack/ui ];then mkdir $(B)/missionpack/ui;fi
-	@if [ ! -d $(B)/missionpack/vm ];then mkdir $(B)/missionpack/vm;fi
-	@if [ ! -d $(B)/q3static ];then mkdir $(B)/q3static;fi
-
-#############################################################################
-# CLIENT/SERVER
-#############################################################################
-
-Q3OBJ = \
-	$(B)/client/cl_cgame.o \
-	$(B)/client/cl_cin.o \
-	$(B)/client/cl_console.o \
-	$(B)/client/cl_input.o \
-	$(B)/client/cl_keys.o \
-	$(B)/client/cl_main.o \
-	$(B)/client/cl_net_chan.o \
-	$(B)/client/cl_parse.o \
-	$(B)/client/cl_scrn.o \
-	$(B)/client/cl_ui.o \
-	\
-	$(B)/client/cm_load.o \
-	$(B)/client/cm_patch.o \
-	$(B)/client/cm_polylib.o \
-	$(B)/client/cm_test.o \
-	$(B)/client/cm_trace.o \
-	\
-	$(B)/client/cmd.o \
-	$(B)/client/common.o \
-	$(B)/client/cvar.o \
-	$(B)/client/files.o \
-	$(B)/client/md4.o \
-	$(B)/client/msg.o \
-	$(B)/client/net_chan.o \
-	$(B)/client/huffman.o \
-	\
-	$(B)/client/snd_adpcm.o \
-	$(B)/client/snd_dma.o \
-	$(B)/client/snd_mem.o \
-	$(B)/client/snd_mix.o \
-	$(B)/client/snd_wavelet.o \
-	\
-	$(B)/client/sv_bot.o \
-	$(B)/client/sv_ccmds.o \
-	$(B)/client/sv_client.o \
-	$(B)/client/sv_game.o \
-	$(B)/client/sv_init.o \
-	$(B)/client/sv_main.o \
-	$(B)/client/sv_net_chan.o \
-	$(B)/client/sv_snapshot.o \
-	$(B)/client/sv_world.o \
-	\
-	$(B)/client/q_math.o \
-	$(B)/client/q_shared.o \
-	\
-	$(B)/client/unzip.o \
-	$(B)/client/vm.o \
-	$(B)/client/vm_interpreted.o \
-	\
-	$(B)/client/be_aas_bspq3.o \
-	$(B)/client/be_aas_cluster.o \
-	$(B)/client/be_aas_debug.o \
-	$(B)/client/be_aas_entity.o \
-	$(B)/client/be_aas_file.o \
-	$(B)/client/be_aas_main.o \
-	$(B)/client/be_aas_move.o \
-	$(B)/client/be_aas_optimize.o \
-	$(B)/client/be_aas_reach.o \
-	$(B)/client/be_aas_route.o \
-	$(B)/client/be_aas_routealt.o \
-	$(B)/client/be_aas_sample.o \
-	$(B)/client/be_ai_char.o \
-	$(B)/client/be_ai_chat.o \
-	$(B)/client/be_ai_gen.o \
-	$(B)/client/be_ai_goal.o \
-	$(B)/client/be_ai_move.o \
-	$(B)/client/be_ai_weap.o \
-	$(B)/client/be_ai_weight.o \
-	$(B)/client/be_ea.o \
-	$(B)/client/be_interface.o \
-	$(B)/client/l_crc.o \
-	$(B)/client/l_libvar.o \
-	$(B)/client/l_log.o \
-	$(B)/client/l_memory.o \
-	$(B)/client/l_precomp.o \
-	$(B)/client/l_script.o \
-	$(B)/client/l_struct.o \
-	\
-	$(B)/client/jcapimin.o \
-	$(B)/client/jchuff.o   \
-	$(B)/client/jcinit.o \
-	$(B)/client/jccoefct.o  \
-	$(B)/client/jccolor.o \
-	$(B)/client/jfdctflt.o \
-	$(B)/client/jcdctmgr.o \
-	$(B)/client/jcphuff.o \
-	$(B)/client/jcmainct.o \
-	$(B)/client/jcmarker.o \
-	$(B)/client/jcmaster.o \
-	$(B)/client/jcomapi.o \
-	$(B)/client/jcparam.o \
-	$(B)/client/jcprepct.o \
-	$(B)/client/jcsample.o \
-	$(B)/client/jdapimin.o \
-	$(B)/client/jdapistd.o \
-	$(B)/client/jdatasrc.o \
-	$(B)/client/jdcoefct.o \
-	$(B)/client/jdcolor.o \
-	$(B)/client/jddctmgr.o \
-	$(B)/client/jdhuff.o \
-	$(B)/client/jdinput.o \
-	$(B)/client/jdmainct.o \
-	$(B)/client/jdmarker.o \
-	$(B)/client/jdmaster.o \
-	$(B)/client/jdpostct.o \
-	$(B)/client/jdsample.o \
-	$(B)/client/jdtrans.o \
-	$(B)/client/jerror.o \
-	$(B)/client/jidctflt.o \
-	$(B)/client/jmemmgr.o \
-	$(B)/client/jmemnobs.o \
-	$(B)/client/jutils.o \
-	\
-	$(B)/client/tr_animation.o \
-	$(B)/client/tr_backend.o \
-	$(B)/client/tr_bsp.o \
-	$(B)/client/tr_cmds.o \
-	$(B)/client/tr_curve.o \
-	$(B)/client/tr_flares.o \
-	$(B)/client/tr_font.o \
-	$(B)/client/tr_image.o \
-	$(B)/client/tr_init.o \
-	$(B)/client/tr_light.o \
-	$(B)/client/tr_main.o \
-	$(B)/client/tr_marks.o \
-	$(B)/client/tr_mesh.o \
-	$(B)/client/tr_model.o \
-	$(B)/client/tr_noise.o \
-	$(B)/client/tr_scene.o \
-	$(B)/client/tr_shade.o \
-	$(B)/client/tr_shade_calc.o \
-	$(B)/client/tr_shader.o \
-	$(B)/client/tr_shadows.o \
-	$(B)/client/tr_sky.o \
-	$(B)/client/tr_surface.o \
-	$(B)/client/tr_world.o \
-	\
-	$(B)/client/unix_main.o \
-	$(B)/client/unix_net.o \
-	$(B)/client/unix_shared.o \
-	\
-	$(B)/client/ahoptim.o  \
-	$(B)/client/autohint.o \
-	$(B)/client/ftbase.o   \
-	$(B)/client/ftdebug.o  \
-	$(B)/client/ftglyph.o  \
-	$(B)/client/ftinit.o   \
-	$(B)/client/ftmm.o     \
-	$(B)/client/ftsystem.o \
-	$(B)/client/raster1.o  \
-	$(B)/client/sfnt.o     \
-	$(B)/client/sfobjs.o   \
-	$(B)/client/smooth.o   \
-	$(B)/client/truetype.o
-#	\
-#	$(B)/client/q_parse.o \
-#	$(B)/client/math_quaternion.o \
-#	$(B)/client/util_str.o \
-#	$(B)/client/math_angles.o \
-#	$(B)/client/math_vector.o \
-#	$(B)/client/splines.o \
-#	$(B)/client/math_matrix.o
-
-#	$(B)/client/q_shared.o \
-
-    ifeq ($(ARCH),i386)
-	  Q3OBJ += $(B)/client/vm_x86.o
-    endif
-
-    ifeq ($(ARCH),ppc)
-      ifeq ($(DLL_ONLY),false)
-        Q3OBJ += $(B)/client/vm_ppc.o
-      endif
-    endif
-
-#	$(B)/client/jctrans.o \
-
-#platform specific objects
-ifeq ($(PLATFORM),freebsd)
-	Q3POBJ=\
-		$(B)/client/linux_common.o \
-		$(B)/client/linux_qgl.o \
-		$(B)/client/linux_glimp.o \
-		$(B)/client/linux_snd.o \
-		$(B)/client/snd_mixa.o \
-		$(B)/client/matha.o   \
-		$(B)/client/ftol.o \
-		$(B)/client/snapvector.o
-else
-ifeq ($(PLATFORM),irix)
-	Q3POBJ=\
-		$(B)/client/irix_qgl.o \
-		$(B)/client/irix_glimp.o \
-		$(B)/client/irix_snd.o
-else
-ifeq ($(PLATFORM),linux)
-ifeq ($(ARCH),axp)
-	Q3POBJ=
-else
-	Q3POBJ=\
-		$(B)/client/linux_common.o \
-		$(B)/client/linux_qgl.o \
-		$(B)/client/linux_glimp.o \
-		$(B)/client/linux_joystick.o \
-		$(B)/client/linux_snd.o \
-		$(B)/client/snd_mixa.o \
-		$(B)/client/matha.o \
-
-	Q3POBJ_SMP=\
-		$(B)/client/linux_common.o \
-		$(B)/client/linux_qgl.o \
-		$(B)/client/linux_glimp_smp.o \
-		$(B)/client/linux_joystick.o \
-		$(B)/client/linux_snd.o \
-		$(B)/client/snd_mixa.o \
-		$(B)/client/matha.o
-
-    ifeq ($(ARCH),i386)
-		Q3POBJ += $(B)/client/ftol.o $(B)/client/snapvector.o
-		Q3POBJ_SMP += $(B)/client/ftol.o $(B)/client/snapvector.o
-    endif
-
-endif
-endif #Linux
-endif #FreeBSD
-endif #IRIX
-
-$(B)/$(PLATFORM)quake3 : $(Q3OBJ) $(Q3POBJ)
-	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) 
-# TTimo: splines code requires C++ linking, but splines have not been officially included in the codebase
-#	$(CXX)  -o $@ $(Q3OBJ) $(Q3POBJ) $(GLLDFLAGS) $(LDFLAGS) 
-
-$(B)/$(PLATFORM)quake3-smp : $(Q3OBJ) $(Q3POBJ_SMP)
-	$(CC)  -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(GLLDFLAGS) \
-		$(THREAD_LDFLAGS) $(LDFLAGS) 
-
-$(B)/client/cl_cgame.o : $(CDIR)/cl_cgame.c; $(DO_CC)   
-$(B)/client/cl_cin.o : $(CDIR)/cl_cin.c; $(DO_CC)       
-$(B)/client/cl_console.o : $(CDIR)/cl_console.c; $(DO_CC)  
-$(B)/client/cl_input.o : $(CDIR)/cl_input.c; $(DO_CC)   
-$(B)/client/cl_keys.o : $(CDIR)/cl_keys.c; $(DO_CC)     
-$(B)/client/cl_main.o : $(CDIR)/cl_main.c; $(DO_CC)     
-$(B)/client/cl_net_chan.o : $(CDIR)/cl_net_chan.c; $(DO_CC)  
-$(B)/client/cl_parse.o : $(CDIR)/cl_parse.c; $(DO_CC)   
-$(B)/client/cl_scrn.o : $(CDIR)/cl_scrn.c; $(DO_CC)    
-$(B)/client/cl_ui.o : $(CDIR)/cl_ui.c; $(DO_CC)         
-$(B)/client/snd_adpcm.o : $(CDIR)/snd_adpcm.c; $(DO_CC)   
-$(B)/client/snd_dma.o : $(CDIR)/snd_dma.c; $(DO_CC)       
-$(B)/client/snd_mem.o : $(CDIR)/snd_mem.c; $(DO_CC)        
-$(B)/client/snd_mix.o : $(CDIR)/snd_mix.c; $(DO_CC)       
-$(B)/client/snd_wavelet.o : $(CDIR)/snd_wavelet.c; $(DO_CC)     
-$(B)/client/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_CC)        
-$(B)/client/sv_client.o : $(SDIR)/sv_client.c; $(DO_CC)     
-$(B)/client/sv_ccmds.o : $(SDIR)/sv_ccmds.c; $(DO_CC)       
-$(B)/client/sv_game.o : $(SDIR)/sv_game.c; $(DO_CC)        
-$(B)/client/sv_init.o : $(SDIR)/sv_init.c; $(DO_CC)        
-$(B)/client/sv_main.o : $(SDIR)/sv_main.c; $(DO_CC)        
-$(B)/client/sv_net_chan.o : $(SDIR)/sv_net_chan.c; $(DO_CC)     
-$(B)/client/sv_snapshot.o : $(SDIR)/sv_snapshot.c; $(DO_CC)      
-$(B)/client/sv_world.o : $(SDIR)/sv_world.c; $(DO_CC)         
-$(B)/client/cm_trace.o : $(CMDIR)/cm_trace.c; $(DO_CC)       
-$(B)/client/cm_load.o : $(CMDIR)/cm_load.c; $(DO_CC)        
-$(B)/client/cm_test.o : $(CMDIR)/cm_test.c; $(DO_CC)        
-$(B)/client/cm_patch.o : $(CMDIR)/cm_patch.c; $(DO_CC)       
-$(B)/client/cm_polylib.o : $(CMDIR)/cm_polylib.c; $(DO_CC)     
-$(B)/client/cmd.o : $(CMDIR)/cmd.c; $(DO_CC)                   
-$(B)/client/common.o : $(CMDIR)/common.c; $(DO_CC)               
-$(B)/client/cvar.o : $(CMDIR)/cvar.c; $(DO_CC)                
-$(B)/client/files.o : $(CMDIR)/files.c; $(DO_CC)              
-$(B)/client/md4.o : $(CMDIR)/md4.c; $(DO_CC)                   
-$(B)/client/msg.o : $(CMDIR)/msg.c; $(DO_CC)                    
-$(B)/client/net_chan.o : $(CMDIR)/net_chan.c; $(DO_CC)
-$(B)/client/huffman.o : $(CMDIR)/huffman.c; $(DO_CC)
-$(B)/client/q_shared.o : $(GDIR)/q_shared.c; $(DO_CC)         
-$(B)/client/q_math.o : $(GDIR)/q_math.c; $(DO_CC)               
-
-$(B)/client/be_aas_bspq3.o : $(BLIBDIR)/be_aas_bspq3.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_cluster.o : $(BLIBDIR)/be_aas_cluster.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_debug.o : $(BLIBDIR)/be_aas_debug.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_entity.o : $(BLIBDIR)/be_aas_entity.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_file.o : $(BLIBDIR)/be_aas_file.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_main.o : $(BLIBDIR)/be_aas_main.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_move.o : $(BLIBDIR)/be_aas_move.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_optimize.o : $(BLIBDIR)/be_aas_optimize.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_reach.o : $(BLIBDIR)/be_aas_reach.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_route.o : $(BLIBDIR)/be_aas_route.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_routealt.o : $(BLIBDIR)/be_aas_routealt.c; $(DO_BOT_CC) 
-$(B)/client/be_aas_sample.o : $(BLIBDIR)/be_aas_sample.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_char.o : $(BLIBDIR)/be_ai_char.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_chat.o : $(BLIBDIR)/be_ai_chat.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_gen.o : $(BLIBDIR)/be_ai_gen.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_goal.o : $(BLIBDIR)/be_ai_goal.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_move.o : $(BLIBDIR)/be_ai_move.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_weap.o : $(BLIBDIR)/be_ai_weap.c; $(DO_BOT_CC) 
-$(B)/client/be_ai_weight.o : $(BLIBDIR)/be_ai_weight.c; $(DO_BOT_CC) 
-$(B)/client/be_ea.o : $(BLIBDIR)/be_ea.c; $(DO_BOT_CC) 
-$(B)/client/be_interface.o : $(BLIBDIR)/be_interface.c; $(DO_BOT_CC) 
-$(B)/client/l_crc.o : $(BLIBDIR)/l_crc.c; $(DO_BOT_CC) 
-$(B)/client/l_libvar.o : $(BLIBDIR)/l_libvar.c; $(DO_BOT_CC) 
-$(B)/client/l_log.o : $(BLIBDIR)/l_log.c; $(DO_BOT_CC) 
-$(B)/client/l_memory.o : $(BLIBDIR)/l_memory.c; $(DO_BOT_CC) 
-$(B)/client/l_precomp.o : $(BLIBDIR)/l_precomp.c; $(DO_BOT_CC) 
-$(B)/client/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC) 
-$(B)/client/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC) 
-
-$(B)/client/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC) 
-$(B)/client/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC) 
-$(B)/client/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC) 
-$(B)/client/jccoefct.o : $(JPDIR)/jccoefct.c; $(DO_CC) 
-$(B)/client/jccolor.o : $(JPDIR)/jccolor.c; $(DO_CC) 
-$(B)/client/jfdctflt.o : $(JPDIR)/jfdctflt.c; $(DO_CC) 
-$(B)/client/jcdctmgr.o : $(JPDIR)/jcdctmgr.c; $(DO_CC) 
-$(B)/client/jcmainct.o : $(JPDIR)/jcmainct.c; $(DO_CC) 
-$(B)/client/jcmarker.o : $(JPDIR)/jcmarker.c; $(DO_CC) 
-$(B)/client/jcmaster.o : $(JPDIR)/jcmaster.c; $(DO_CC) 
-$(B)/client/jcomapi.o : $(JPDIR)/jcomapi.c; $(DO_CC)
-$(B)/client/jcparam.o : $(JPDIR)/jcparam.c;  $(DO_CC)
-$(B)/client/jcprepct.o : $(JPDIR)/jcprepct.c; $(DO_CC)
-$(B)/client/jcsample.o : $(JPDIR)/jcsample.c; $(DO_CC) 
-
-$(B)/client/jdapimin.o : $(JPDIR)/jdapimin.c; $(DO_CC) 
-$(B)/client/jdapistd.o : $(JPDIR)/jdapistd.c; $(DO_CC) 
-$(B)/client/jdatasrc.o : $(JPDIR)/jdatasrc.c; $(DO_CC) 
-$(B)/client/jdcoefct.o : $(JPDIR)/jdcoefct.c; $(DO_CC) 
-$(B)/client/jdcolor.o : $(JPDIR)/jdcolor.c; $(DO_CC) 
-$(B)/client/jcphuff.o : $(JPDIR)/jcphuff.c; $(DO_CC) 
-$(B)/client/jddctmgr.o : $(JPDIR)/jddctmgr.c; $(DO_CC) 
-$(B)/client/jdhuff.o : $(JPDIR)/jdhuff.c; $(DO_CC) 
-$(B)/client/jdinput.o : $(JPDIR)/jdinput.c; $(DO_CC) 
-$(B)/client/jdmainct.o : $(JPDIR)/jdmainct.c; $(DO_CC) 
-$(B)/client/jdmarker.o : $(JPDIR)/jdmarker.c; $(DO_CC) 
-$(B)/client/jdmaster.o : $(JPDIR)/jdmaster.c; $(DO_CC) 
-$(B)/client/jdpostct.o : $(JPDIR)/jdpostct.c; $(DO_CC) 
-$(B)/client/jdsample.o : $(JPDIR)/jdsample.c; $(DO_CC) 
-$(B)/client/jdtrans.o : $(JPDIR)/jdtrans.c; $(DO_CC) 
-$(B)/client/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) $(GL_CFLAGS) 
-$(B)/client/jidctflt.o : $(JPDIR)/jidctflt.c; $(DO_CC) 
-$(B)/client/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC) 
-$(B)/client/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/jutils.o : $(JPDIR)/jutils.c; $(DO_CC) 
-
-$(B)/client/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_backend.o : $(RDIR)/tr_backend.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_cmds.o : $(RDIR)/tr_cmds.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_curve.o : $(RDIR)/tr_curve.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC)    $(GL_CFLAGS) 
-$(B)/client/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_marks.o : $(RDIR)/tr_marks.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_mesh.o : $(RDIR)/tr_mesh.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_model.o : $(RDIR)/tr_model.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_noise.o : $(RDIR)/tr_noise.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_scene.o : $(RDIR)/tr_scene.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_shade.o : $(RDIR)/tr_shade.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_shader.o : $(RDIR)/tr_shader.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_shade_calc.o : $(RDIR)/tr_shade_calc.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_shadows.o : $(RDIR)/tr_shadows.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_sky.o : $(RDIR)/tr_sky.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_smp.o : $(RDIR)/tr_smp.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_stripify.o : $(RDIR)/tr_stripify.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_subdivide.o : $(RDIR)/tr_subdivide.c; $(DO_CC)   $(GL_CFLAGS) 
-$(B)/client/tr_surface.o : $(RDIR)/tr_surface.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/tr_world.o : $(RDIR)/tr_world.c; $(DO_CC)   $(GL_CFLAGS) 
-
-$(B)/client/unix_qgl.o : $(UDIR)/unix_qgl.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/unix_main.o : $(UDIR)/unix_main.c; $(DO_CC) 
-$(B)/client/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) 
-$(B)/client/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) 
-$(B)/client/irix_glimp.o : $(UDIR)/irix_glimp.c; $(DO_CC) 
-$(B)/client/irix_glimp_smp.o : $(UDIR)/irix_glimp.c; $(DO_SMP_CC) 
-$(B)/client/irix_snd.o : $(UDIR)/irix_snd.c; $(DO_CC) 
-$(B)/client/irix_input.o : $(UDIR)/irix_input.c; $(DO_CC) 
-$(B)/client/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)
-$(B)/client/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/linux_glimp_smp.o : $(UDIR)/linux_glimp.c; $(DO_SMP_CC)  $(GL_CFLAGS) 
-$(B)/client/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC)  
-$(B)/client/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC)  $(GL_CFLAGS) 
-$(B)/client/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) 
-$(B)/client/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) 
-$(B)/client/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) 
-$(B)/client/matha.o : $(UDIR)/matha.s; $(DO_AS) 
-
-ifeq ($(ARCH),i386)
-$(B)/client/ftol.o : $(UDIR)/ftol.nasm; $(DO_NASM)
-$(B)/client/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM)
-$(B)/client/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) 
-endif
-
-ifeq ($(ARCH),ppc)
-ifeq ($(DLL_ONLY),false)
-$(B)/client/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC)
-endif
-endif
-
-$(B)/client/unzip.o : $(CMDIR)/unzip.c; $(DO_CC) 
-$(B)/client/vm.o : $(CMDIR)/vm.c; $(DO_CC) 
-$(B)/client/vm_interpreted.o : $(CMDIR)/vm_interpreted.c; $(DO_CC) 
-
-$(B)/client/ahoptim.o  : $(FTDIR)/ahoptim.c;   $(DO_CC)
-$(B)/client/autohint.o : $(FTDIR)/autohint.c;  $(DO_CC)
-$(B)/client/ftbase.o   : $(FTDIR)/ftbase.c;    $(DO_CC)
-$(B)/client/ftdebug.o  : $(FTDIR)/ftdebug.c;   $(DO_CC)
-$(B)/client/ftglyph.o  : $(FTDIR)/ftglyph.c;   $(DO_CC)
-$(B)/client/ftinit.o   : $(FTDIR)/ftinit.c;    $(DO_CC)
-$(B)/client/ftmm.o     : $(FTDIR)/ftmm.c;      $(DO_CC)
-$(B)/client/ftsystem.o : $(FTDIR)/ftsystem.c;  $(DO_CC)
-$(B)/client/raster1.o  : $(FTDIR)/raster1.c;   $(DO_CC) -DFT_FLAT_COMPILE
-$(B)/client/sfnt.o     : $(FTDIR)/sfnt.c;      $(DO_CC)
-$(B)/client/sfobjs.o   : $(FTDIR)/sfobjs.c;    $(DO_CC)
-$(B)/client/smooth.o   : $(FTDIR)/smooth.c;    $(DO_CC) -DFT_FLAT_COMPILE
-$(B)/client/truetype.o : $(FTDIR)/truetype.c;  $(DO_CC)
-
-# TTimo: took out splines code
-#$(B)/client/q_parse.o : $(SPLNDIR)/q_parse.cpp; $(DO_CXX)
-#$(B)/client/math_quaternion.o : $(SPLNDIR)/math_quaternion.cpp; $(DO_CXX)
-# TTimo: ignored
-#$(B)/client/q_shared.o : $(SPLNDIR)/q_shared.cpp; $(DO_CXX)
-#$(B)/client/util_str.o : $(SPLNDIR)/util_str.cpp; $(DO_CXX)
-#$(B)/client/math_angles.o : $(SPLNDIR)/math_angles.cpp; $(DO_CXX)
-#$(B)/client/math_vector.o : $(SPLNDIR)/math_vector.cpp; $(DO_CXX)
-#$(B)/client/splines.o : $(SPLNDIR)/splines.cpp; $(DO_CXX)
-#$(B)/client/math_matrix.o : $(SPLNDIR)/math_matrix.cpp; $(DO_CXX)
-
-## Included by raster1.c
-# $(B)/client/ftraster.o : $(FTDIR)/ftraster.c;  $(DO_CC)
-# $(B)/client/ftrend1.o  : $(FTDIR)/ftrend1.c;   $(DO_CC)
-
-## Included by autohint.c
-# $(B)/client/ahangles.o : $(FTDIR)/ahangles.c;  $(DO_CC)
-# $(B)/client/ahglyph.o  : $(FTDIR)/ahglyph.c;   $(DO_CC)
-# $(B)/client/ahglobal.o : $(FTDIR)/ahglobal.c;  $(DO_CC)
-# $(B)/client/ahhint.o   : $(FTDIR)/ahhint.c;    $(DO_CC)
-# $(B)/client/ahmodule.o : $(FTDIR)/ahmodule.c;  $(DO_CC)
-
-## Included by ftcalc.c
-# $(B)/client/ftcalc.o   : $(FTDIR)/ftcalc.c;    $(DO_CC)
-# $(B)/client/ftobjs.o   : $(FTDIR)/ftobjs.c;    $(DO_CC)
-# $(B)/client/ftstream.o : $(FTDIR)/ftstream.c;  $(DO_CC)
-# $(B)/client/ftlist.o   : $(FTDIR)/ftlist.c;    $(DO_CC)
-# $(B)/client/ftoutln.o  : $(FTDIR)/ftoutln.c;   $(DO_CC)
-# $(B)/client/ftextend.o : $(FTDIR)/ftextend.c;  $(DO_CC)
-# $(B)/client/ftnames.o  : $(FTDIR)/ftnames.c;   $(DO_CC)
-
-## Included by sfnt.c
-# $(B)/client/ttload.o   : $(FTDIR)/ttload.c;    $(DO_CC)
-# $(B)/client/ttcmap.o   : $(FTDIR)/ttcmap.c;    $(DO_CC)
-# $(B)/client/sfobjs.o   : $(FTDIR)/sfobjs.c;    $(DO_CC)
-# $(B)/client/sfdriver.o : $(FTDIR)/sfdriver.c;  $(DO_CC)
-## Unused in sfnt.c
-# $(B)/client/ttpost.o   : $(FTDIR)/ttpost.c;    $(DO_CC)
-# $(B)/client/ttsbit.o   : $(FTDIR)/ttsbit.c;    $(DO_CC)
-
-## Included by truetype.c
-# $(B)/client/ttdriver.o : $(FTDIR)/ttdriver.c;  $(DO_CC)
-# $(B)/client/ttgload.o  : $(FTDIR)/ttgload.c;   $(DO_CC)
-# $(B)/client/ttobjs.o   : $(FTDIR)/ttobjs.c;    $(DO_CC)
-# $(B)/client/ttpload.o  : $(FTDIR)/ttpload.c;   $(DO_CC)
-## Unused in truetype.c
-# $(B)/client/ttinterp.o : $(FTDIR)/ttinterp.c;  $(DO_CC)
-
-## Included by smooth.c
-# $(B)/client/ftsmooth.o : $(FTDIR)/ftsmooth.c;  $(DO_CC) -DFT_FLAT_COMPILE
-# $(B)/client/ftgrays.o  : $(FTDIR)/ftgrays.c;   $(DO_CC)
-
-#############################################################################
-# DEDICATED SERVER                        
-#############################################################################
-
-Q3DOBJ = \
-	$(B)/ded/sv_bot.o \
-	$(B)/ded/sv_client.o \
-	$(B)/ded/sv_ccmds.o \
-	$(B)/ded/sv_game.o \
-	$(B)/ded/sv_init.o \
-	$(B)/ded/sv_main.o \
-	$(B)/ded/sv_net_chan.o \
-	$(B)/ded/sv_snapshot.o \
-	$(B)/ded/sv_world.o \
-	\
-	$(B)/ded/cm_load.o \
-	$(B)/ded/cm_patch.o \
-	$(B)/ded/cm_polylib.o \
-	$(B)/ded/cm_test.o \
-	$(B)/ded/cm_trace.o \
-	$(B)/ded/cmd.o \
-	$(B)/ded/common.o \
-	$(B)/ded/cvar.o \
-	$(B)/ded/files.o \
-	$(B)/ded/md4.o \
-	$(B)/ded/msg.o \
-	$(B)/ded/net_chan.o \
-	$(B)/ded/huffman.o \
-	\
-	$(B)/ded/q_math.o \
-	$(B)/ded/q_shared.o \
-	\
-	$(B)/ded/unzip.o \
-	$(B)/ded/vm.o \
-	$(B)/ded/vm_interpreted.o \
-	\
-	$(B)/ded/be_aas_bspq3.o \
-	$(B)/ded/be_aas_cluster.o \
-	$(B)/ded/be_aas_debug.o \
-	$(B)/ded/be_aas_entity.o \
-	$(B)/ded/be_aas_file.o \
-	$(B)/ded/be_aas_main.o \
-	$(B)/ded/be_aas_move.o \
-	$(B)/ded/be_aas_optimize.o \
-	$(B)/ded/be_aas_reach.o \
-	$(B)/ded/be_aas_route.o \
-	$(B)/ded/be_aas_routealt.o \
-	$(B)/ded/be_aas_sample.o \
-	$(B)/ded/be_ai_char.o \
-	$(B)/ded/be_ai_chat.o \
-	$(B)/ded/be_ai_gen.o \
-	$(B)/ded/be_ai_goal.o \
-	$(B)/ded/be_ai_move.o \
-	$(B)/ded/be_ai_weap.o \
-	$(B)/ded/be_ai_weight.o \
-	$(B)/ded/be_ea.o \
-	$(B)/ded/be_interface.o \
-	$(B)/ded/l_crc.o \
-	$(B)/ded/l_libvar.o \
-	$(B)/ded/l_log.o \
-	$(B)/ded/l_memory.o \
-	$(B)/ded/l_precomp.o \
-	$(B)/ded/l_script.o \
-	$(B)/ded/l_struct.o \
-	\
-	$(B)/ded/linux_common.o \
-	$(B)/ded/unix_main.o \
-	$(B)/ded/unix_net.o \
-	$(B)/ded/unix_shared.o \
-	\
-	$(B)/ded/null_client.o \
-	$(B)/ded/null_input.o \
-	$(B)/ded/null_snddma.o
-
-ifeq ($(ARCH),i386)
-  Q3DOBJ += $(B)/ded/vm_x86.o $(B)/ded/ftol.o $(B)/ded/snapvector.o
-endif
-
-ifeq ($(ARCH),ppc)
-  ifeq ($(DLL_ONLY),false)
-    Q3DOBJ += $(B)/ded/vm_ppc.o
-  endif
-endif
-
-$(B)/$(PLATFORM)q3ded : $(Q3DOBJ)
-	$(CC)  -o $@ $(Q3DOBJ) $(LDFLAGS)
-
-$(B)/ded/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_DED_CC) 
-$(B)/ded/sv_client.o : $(SDIR)/sv_client.c; $(DO_DED_CC) 
-$(B)/ded/sv_ccmds.o : $(SDIR)/sv_ccmds.c; $(DO_DED_CC) 
-$(B)/ded/sv_game.o : $(SDIR)/sv_game.c; $(DO_DED_CC) 
-$(B)/ded/sv_init.o : $(SDIR)/sv_init.c; $(DO_DED_CC) 
-$(B)/ded/sv_main.o : $(SDIR)/sv_main.c; $(DO_DED_CC) 
-$(B)/ded/sv_net_chan.o : $(SDIR)/sv_net_chan.c; $(DO_DED_CC) 
-$(B)/ded/sv_snapshot.o : $(SDIR)/sv_snapshot.c; $(DO_DED_CC) 
-$(B)/ded/sv_world.o : $(SDIR)/sv_world.c; $(DO_DED_CC) 
-$(B)/ded/cm_load.o : $(CMDIR)/cm_load.c; $(DO_DED_CC) 
-$(B)/ded/cm_polylib.o : $(CMDIR)/cm_polylib.c; $(DO_DED_CC) 
-$(B)/ded/cm_test.o : $(CMDIR)/cm_test.c; $(DO_DED_CC) 
-$(B)/ded/cm_trace.o : $(CMDIR)/cm_trace.c; $(DO_DED_CC) 
-$(B)/ded/cm_patch.o : $(CMDIR)/cm_patch.c; $(DO_DED_CC) 
-$(B)/ded/cmd.o : $(CMDIR)/cmd.c; $(DO_DED_CC) 
-$(B)/ded/common.o : $(CMDIR)/common.c; $(DO_DED_CC) 
-$(B)/ded/cvar.o : $(CMDIR)/cvar.c; $(DO_DED_CC) 
-$(B)/ded/files.o : $(CMDIR)/files.c; $(DO_DED_CC) 
-$(B)/ded/md4.o : $(CMDIR)/md4.c; $(DO_DED_CC) 
-$(B)/ded/msg.o : $(CMDIR)/msg.c; $(DO_DED_CC) 
-$(B)/ded/net_chan.o : $(CMDIR)/net_chan.c; $(DO_DED_CC)
-$(B)/ded/huffman.o : $(CMDIR)/huffman.c; $(DO_DED_CC)
-$(B)/ded/q_shared.o : $(GDIR)/q_shared.c; $(DO_DED_CC) 
-$(B)/ded/q_math.o : $(GDIR)/q_math.c; $(DO_DED_CC) 
-
-$(B)/ded/be_aas_bspq3.o : $(BLIBDIR)/be_aas_bspq3.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_cluster.o : $(BLIBDIR)/be_aas_cluster.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_debug.o : $(BLIBDIR)/be_aas_debug.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_entity.o : $(BLIBDIR)/be_aas_entity.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_file.o : $(BLIBDIR)/be_aas_file.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_main.o : $(BLIBDIR)/be_aas_main.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_move.o : $(BLIBDIR)/be_aas_move.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_optimize.o : $(BLIBDIR)/be_aas_optimize.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_reach.o : $(BLIBDIR)/be_aas_reach.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_route.o : $(BLIBDIR)/be_aas_route.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_routealt.o : $(BLIBDIR)/be_aas_routealt.c; $(DO_BOT_CC) 
-$(B)/ded/be_aas_sample.o : $(BLIBDIR)/be_aas_sample.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_char.o : $(BLIBDIR)/be_ai_char.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_chat.o : $(BLIBDIR)/be_ai_chat.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_gen.o : $(BLIBDIR)/be_ai_gen.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_goal.o : $(BLIBDIR)/be_ai_goal.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_move.o : $(BLIBDIR)/be_ai_move.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_weap.o : $(BLIBDIR)/be_ai_weap.c; $(DO_BOT_CC) 
-$(B)/ded/be_ai_weight.o : $(BLIBDIR)/be_ai_weight.c; $(DO_BOT_CC) 
-$(B)/ded/be_ea.o : $(BLIBDIR)/be_ea.c; $(DO_BOT_CC) 
-$(B)/ded/be_interface.o : $(BLIBDIR)/be_interface.c; $(DO_BOT_CC) 
-$(B)/ded/l_crc.o : $(BLIBDIR)/l_crc.c; $(DO_BOT_CC) 
-$(B)/ded/l_libvar.o : $(BLIBDIR)/l_libvar.c; $(DO_BOT_CC) 
-$(B)/ded/l_log.o : $(BLIBDIR)/l_log.c; $(DO_BOT_CC) 
-$(B)/ded/l_memory.o : $(BLIBDIR)/l_memory.c; $(DO_BOT_CC) 
-$(B)/ded/l_precomp.o : $(BLIBDIR)/l_precomp.c; $(DO_BOT_CC) 
-$(B)/ded/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC) 
-$(B)/ded/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC) 
-
-$(B)/ded/linux_common.o : $(UDIR)/linux_common.c; $(DO_CC)
-$(B)/ded/unix_main.o : $(UDIR)/unix_main.c; $(DO_DED_CC) 
-$(B)/ded/unix_net.o : $(UDIR)/unix_net.c; $(DO_DED_CC) 
-$(B)/ded/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_DED_CC) 
-$(B)/ded/null_client.o : $(NDIR)/null_client.c; $(DO_DED_CC) 
-$(B)/ded/null_input.o : $(NDIR)/null_input.c; $(DO_DED_CC) 
-$(B)/ded/null_snddma.o : $(NDIR)/null_snddma.c; $(DO_DED_CC) 
-$(B)/ded/unzip.o : $(CMDIR)/unzip.c; $(DO_DED_CC) 
-$(B)/ded/vm.o : $(CMDIR)/vm.c; $(DO_DED_CC) 
-$(B)/ded/vm_interpreted.o : $(CMDIR)/vm_interpreted.c; $(DO_DED_CC) 
-
-ifeq ($(ARCH),i386)
-$(B)/ded/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_DED_CC) 
-$(B)/ded/ftol.o : $(UDIR)/ftol.nasm; $(DO_NASM)
-$(B)/ded/snapvector.o : $(UDIR)/snapvector.nasm; $(DO_NASM) 
-endif
-
-ifeq ($(ARCH),ppc)
-ifeq ($(DLL_ONLY),false)
-$(B)/ded/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_DED_CC)
-endif
-endif
-
-
-#############################################################################
-## QVM
-#############################################################################
-
-$(B)/baseq3/vm/cgame.qvm:
-	cd $(CGDIR) && ./cgame.sh
-	mv /tmp/quake3/baseq3/vm/cgame.qvm $@
-
-$(B)/baseq3/vm/ui.qvm:
-	cd $(Q3UIDIR) && ./q3_ui.sh
-	mv /tmp/quake3/baseq3/vm/ui.qvm $@
-
-$(B)/baseq3/vm/qagame.qvm:
-	cd $(GDIR) && ./game.sh
-	mv /tmp/quake3/baseq3/vm/qagame.qvm $@
-
-$(B)/missionpack/vm/cgame.qvm:
-	cd $(CGDIR) && ./cgame_ta.sh
-	mv /tmp/quake3/missionpack/vm/cgame.qvm $@
-
-$(B)/missionpack/vm/qagame.qvm:
-	cd $(GDIR) && ./game_ta.sh
-	mv /tmp/quake3/missionpack/vm/qagame.qvm $@
-
-$(B)/missionpack/vm/ui.qvm:
-	cd $(UIDIR) && ./ui.sh
-	mv /tmp/quake3/missionpack/vm/ui.qvm $@
-
-
-
-#############################################################################
-## BASEQ3 CGAME
-#############################################################################
-
-Q3CGOBJ = \
-	$(B)/baseq3/cgame/bg_misc.o \
-	$(B)/baseq3/cgame/bg_pmove.o \
-	$(B)/baseq3/cgame/bg_slidemove.o \
-	$(B)/baseq3/cgame/cg_consolecmds.o \
-	$(B)/baseq3/cgame/cg_draw.o \
-	$(B)/baseq3/cgame/cg_drawtools.o \
-	$(B)/baseq3/cgame/cg_effects.o \
-	$(B)/baseq3/cgame/cg_ents.o \
-	$(B)/baseq3/cgame/cg_event.o \
-	$(B)/baseq3/cgame/cg_info.o \
-	$(B)/baseq3/cgame/cg_localents.o \
-	$(B)/baseq3/cgame/cg_main.o \
-	$(B)/baseq3/cgame/cg_marks.o \
-	$(B)/baseq3/cgame/cg_players.o \
-	$(B)/baseq3/cgame/cg_playerstate.o \
-	$(B)/baseq3/cgame/cg_predict.o \
-	$(B)/baseq3/cgame/cg_scoreboard.o \
-	$(B)/baseq3/cgame/cg_servercmds.o \
-	$(B)/baseq3/cgame/cg_snapshot.o \
-	$(B)/baseq3/cgame/cg_syscalls.o \
-	$(B)/baseq3/cgame/cg_view.o \
-	$(B)/baseq3/cgame/cg_weapons.o \
-	$(B)/baseq3/cgame/q_math.o \
-	$(B)/baseq3/cgame/q_shared.o
-
-$(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) : $(Q3CGOBJ)
-	$(CC)  $(SHLIBLDFLAGS) -o $@ $(Q3CGOBJ)
-
-$(B)/baseq3/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)         
-$(B)/baseq3/cgame/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_consolecmds.o : $(CGDIR)/cg_consolecmds.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/cgame/cg_draw.o : $(CGDIR)/cg_draw.c; $(DO_SHLIB_CC)             
-$(B)/baseq3/cgame/cg_drawtools.o : $(CGDIR)/cg_drawtools.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_effects.o : $(CGDIR)/cg_effects.c; $(DO_SHLIB_CC)           
-$(B)/baseq3/cgame/cg_ents.o : $(CGDIR)/cg_ents.c; $(DO_SHLIB_CC)               
-$(B)/baseq3/cgame/cg_event.o : $(CGDIR)/cg_event.c; $(DO_SHLIB_CC)            
-$(B)/baseq3/cgame/cg_info.o : $(CGDIR)/cg_info.c; $(DO_SHLIB_CC)               
-$(B)/baseq3/cgame/cg_localents.o : $(CGDIR)/cg_localents.c; $(DO_SHLIB_CC)           
-$(B)/baseq3/cgame/cg_main.o : $(CGDIR)/cg_main.c; $(DO_SHLIB_CC)                   
-$(B)/baseq3/cgame/cg_marks.o : $(CGDIR)/cg_marks.c; $(DO_SHLIB_CC)                 
-$(B)/baseq3/cgame/cg_players.o : $(CGDIR)/cg_players.c; $(DO_SHLIB_CC)             
-$(B)/baseq3/cgame/cg_playerstate.o : $(CGDIR)/cg_playerstate.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_predict.o : $(CGDIR)/cg_predict.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_scoreboard.o : $(CGDIR)/cg_scoreboard.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_servercmds.o : $(CGDIR)/cg_servercmds.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_snapshot.o : $(CGDIR)/cg_snapshot.c; $(DO_SHLIB_CC)             
-$(B)/baseq3/cgame/cg_syscalls.o : $(CGDIR)/cg_syscalls.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/cgame/cg_view.o : $(CGDIR)/cg_view.c; $(DO_SHLIB_CC)                     
-$(B)/baseq3/cgame/cg_weapons.o : $(CGDIR)/cg_weapons.c; $(DO_SHLIB_CC)               
-$(B)/baseq3/cgame/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC)                       
-$(B)/baseq3/cgame/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC)                     
-
-#############################################################################
-## MISSIONPACK CGAME
-#############################################################################
-
-MPCGOBJ = \
-	$(B)/missionpack/cgame/bg_misc.o \
-	$(B)/missionpack/cgame/bg_pmove.o \
-	$(B)/missionpack/cgame/bg_slidemove.o \
-	$(B)/missionpack/cgame/cg_consolecmds.o \
-	$(B)/missionpack/cgame/cg_newdraw.o \
-	$(B)/missionpack/cgame/cg_draw.o \
-	$(B)/missionpack/cgame/cg_drawtools.o \
-	$(B)/missionpack/cgame/cg_effects.o \
-	$(B)/missionpack/cgame/cg_ents.o \
-	$(B)/missionpack/cgame/cg_event.o \
-	$(B)/missionpack/cgame/cg_info.o \
-	$(B)/missionpack/cgame/cg_localents.o \
-	$(B)/missionpack/cgame/cg_main.o \
-	$(B)/missionpack/cgame/cg_marks.o \
-	$(B)/missionpack/cgame/cg_players.o \
-	$(B)/missionpack/cgame/cg_playerstate.o \
-	$(B)/missionpack/cgame/cg_predict.o \
-	$(B)/missionpack/cgame/cg_scoreboard.o \
-	$(B)/missionpack/cgame/cg_servercmds.o \
-	$(B)/missionpack/cgame/cg_snapshot.o \
-	$(B)/missionpack/cgame/cg_syscalls.o \
-	$(B)/missionpack/cgame/cg_view.o \
-	$(B)/missionpack/cgame/cg_weapons.o \
-	$(B)/missionpack/cgame/q_math.o \
-	$(B)/missionpack/cgame/q_shared.o \
-	$(B)/missionpack/cgame/ui_shared.o
-
-$(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) : $(MPCGOBJ)
-	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPCGOBJ)
-
-$(B)/missionpack/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)     -DMISSIONPACK 
-$(B)/missionpack/cgame/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/cgame/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_SHLIB_CC)   -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_consolecmds.o : $(CGDIR)/cg_consolecmds.c; $(DO_SHLIB_CC)   -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_newdraw.o : $(CGDIR)/cg_newdraw.c; $(DO_SHLIB_CC)         -DMISSIONPACK
-$(B)/missionpack/cgame/cg_draw.o : $(CGDIR)/cg_draw.c; $(DO_SHLIB_CC)    -DMISSIONPACK  
-$(B)/missionpack/cgame/cg_drawtools.o : $(CGDIR)/cg_drawtools.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_effects.o : $(CGDIR)/cg_effects.c; $(DO_SHLIB_CC)       -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_ents.o : $(CGDIR)/cg_ents.c; $(DO_SHLIB_CC)           -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_event.o : $(CGDIR)/cg_event.c; $(DO_SHLIB_CC)        -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_info.o : $(CGDIR)/cg_info.c; $(DO_SHLIB_CC)           -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_localents.o : $(CGDIR)/cg_localents.c; $(DO_SHLIB_CC)   -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_main.o : $(CGDIR)/cg_main.c; $(DO_SHLIB_CC)             -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_marks.o : $(CGDIR)/cg_marks.c; $(DO_SHLIB_CC)          -DMISSIONPACK  
-$(B)/missionpack/cgame/cg_players.o : $(CGDIR)/cg_players.c; $(DO_SHLIB_CC)       -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_playerstate.o : $(CGDIR)/cg_playerstate.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_predict.o : $(CGDIR)/cg_predict.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_scoreboard.o : $(CGDIR)/cg_scoreboard.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_servercmds.o : $(CGDIR)/cg_servercmds.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_snapshot.o : $(CGDIR)/cg_snapshot.c; $(DO_SHLIB_CC)       -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_syscalls.o : $(CGDIR)/cg_syscalls.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_view.o : $(CGDIR)/cg_view.c; $(DO_SHLIB_CC)               -DMISSIONPACK 
-$(B)/missionpack/cgame/cg_weapons.o : $(CGDIR)/cg_weapons.c; $(DO_SHLIB_CC)        -DMISSIONPACK  
-$(B)/missionpack/cgame/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC)                 -DMISSIONPACK 
-$(B)/missionpack/cgame/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC)             -DMISSIONPACK 
-$(B)/missionpack/cgame/ui_shared.o : $(UIDIR)/ui_shared.c; $(DO_SHLIB_CC)             -DMISSIONPACK 
-
-
-
-#############################################################################
-## BASEQ3 GAME
-#############################################################################
-
-Q3GOBJ = \
-	$(B)/baseq3/game/ai_chat.o \
-	$(B)/baseq3/game/ai_cmd.o \
-	$(B)/baseq3/game/ai_dmnet.o \
-	$(B)/baseq3/game/ai_dmq3.o \
-	$(B)/baseq3/game/ai_main.o \
-	$(B)/baseq3/game/ai_team.o \
-	$(B)/baseq3/game/ai_vcmd.o \
-	$(B)/baseq3/game/bg_misc.o \
-	$(B)/baseq3/game/bg_pmove.o \
-	$(B)/baseq3/game/bg_slidemove.o \
-	$(B)/baseq3/game/g_active.o \
-	$(B)/baseq3/game/g_arenas.o \
-	$(B)/baseq3/game/g_bot.o \
-	$(B)/baseq3/game/g_client.o \
-	$(B)/baseq3/game/g_cmds.o \
-	$(B)/baseq3/game/g_combat.o \
-	$(B)/baseq3/game/g_items.o \
-	$(B)/baseq3/game/g_main.o \
-	$(B)/baseq3/game/g_mem.o \
-	$(B)/baseq3/game/g_misc.o \
-	$(B)/baseq3/game/g_missile.o \
-	$(B)/baseq3/game/g_mover.o \
-	$(B)/baseq3/game/g_session.o \
-	$(B)/baseq3/game/g_spawn.o \
-	$(B)/baseq3/game/g_svcmds.o \
-	$(B)/baseq3/game/g_syscalls.o \
-	$(B)/baseq3/game/g_target.o \
-	$(B)/baseq3/game/g_team.o \
-	$(B)/baseq3/game/g_trigger.o \
-	$(B)/baseq3/game/g_utils.o \
-	$(B)/baseq3/game/g_weapon.o \
-	\
-	$(B)/baseq3/game/q_math.o \
-	$(B)/baseq3/game/q_shared.o
-
-$(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) : $(Q3GOBJ)
-	$(CC)  $(SHLIBLDFLAGS) -o $@ $(Q3GOBJ)
-
-$(B)/baseq3/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)     
-$(B)/baseq3/game/ai_cmd.o : $(GDIR)/ai_cmd.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/ai_dmnet.o : $(GDIR)/ai_dmnet.c; $(DO_SHLIB_CC)   
-$(B)/baseq3/game/ai_dmq3.o : $(GDIR)/ai_dmq3.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/ai_main.o : $(GDIR)/ai_main.c; $(DO_SHLIB_CC)      
-$(B)/baseq3/game/ai_team.o : $(GDIR)/ai_team.c; $(DO_SHLIB_CC)  
-$(B)/baseq3/game/ai_vcmd.o : $(GDIR)/ai_vcmd.c; $(DO_SHLIB_CC)     
-$(B)/baseq3/game/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)     
-$(B)/baseq3/game/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_SHLIB_CC)     
-$(B)/baseq3/game/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_SHLIB_CC)    
-$(B)/baseq3/game/g_active.o : $(GDIR)/g_active.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/g_arenas.o : $(GDIR)/g_arenas.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/g_bot.o : $(GDIR)/g_bot.c; $(DO_SHLIB_CC)            
-$(B)/baseq3/game/g_client.o : $(GDIR)/g_client.c; $(DO_SHLIB_CC)      
-$(B)/baseq3/game/g_cmds.o : $(GDIR)/g_cmds.c; $(DO_SHLIB_CC)          
-$(B)/baseq3/game/g_combat.o : $(GDIR)/g_combat.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/g_items.o : $(GDIR)/g_items.c; $(DO_SHLIB_CC)          
-$(B)/baseq3/game/g_main.o : $(GDIR)/g_main.c; $(DO_SHLIB_CC)            
-$(B)/baseq3/game/g_mem.o : $(GDIR)/g_mem.c; $(DO_SHLIB_CC)               
-$(B)/baseq3/game/g_misc.o : $(GDIR)/g_misc.c; $(DO_SHLIB_CC)             
-$(B)/baseq3/game/g_missile.o : $(GDIR)/g_missile.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/game/g_mover.o : $(GDIR)/g_mover.c; $(DO_SHLIB_CC)          
-$(B)/baseq3/game/g_session.o : $(GDIR)/g_session.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/g_spawn.o : $(GDIR)/g_spawn.c; $(DO_SHLIB_CC)          
-$(B)/baseq3/game/g_svcmds.o : $(GDIR)/g_svcmds.c; $(DO_SHLIB_CC)         
-$(B)/baseq3/game/g_syscalls.o : $(GDIR)/g_syscalls.c; $(DO_SHLIB_CC)    
-$(B)/baseq3/game/g_target.o : $(GDIR)/g_target.c; $(DO_SHLIB_CC)        
-$(B)/baseq3/game/g_team.o : $(GDIR)/g_team.c; $(DO_SHLIB_CC)           
-$(B)/baseq3/game/g_trigger.o : $(GDIR)/g_trigger.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/g_utils.o : $(GDIR)/g_utils.c; $(DO_SHLIB_CC)          
-$(B)/baseq3/game/g_weapon.o : $(GDIR)/g_weapon.c; $(DO_SHLIB_CC)       
-$(B)/baseq3/game/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC)            
-$(B)/baseq3/game/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC)       
-
-
-#############################################################################
-## MISSIONPACK GAME
-#############################################################################
-
-MPGOBJ = \
-	$(B)/missionpack/game/ai_chat.o \
-	$(B)/missionpack/game/ai_cmd.o \
-	$(B)/missionpack/game/ai_dmnet.o \
-	$(B)/missionpack/game/ai_dmq3.o \
-	$(B)/missionpack/game/ai_main.o \
-	$(B)/missionpack/game/ai_team.o \
-	$(B)/missionpack/game/ai_vcmd.o \
-	$(B)/missionpack/game/bg_misc.o \
-	$(B)/missionpack/game/bg_pmove.o \
-	$(B)/missionpack/game/bg_slidemove.o \
-	$(B)/missionpack/game/g_active.o \
-	$(B)/missionpack/game/g_arenas.o \
-	$(B)/missionpack/game/g_bot.o \
-	$(B)/missionpack/game/g_client.o \
-	$(B)/missionpack/game/g_cmds.o \
-	$(B)/missionpack/game/g_combat.o \
-	$(B)/missionpack/game/g_items.o \
-	$(B)/missionpack/game/g_main.o \
-	$(B)/missionpack/game/g_mem.o \
-	$(B)/missionpack/game/g_misc.o \
-	$(B)/missionpack/game/g_missile.o \
-	$(B)/missionpack/game/g_mover.o \
-	$(B)/missionpack/game/g_session.o \
-	$(B)/missionpack/game/g_spawn.o \
-	$(B)/missionpack/game/g_svcmds.o \
-	$(B)/missionpack/game/g_syscalls.o \
-	$(B)/missionpack/game/g_target.o \
-	$(B)/missionpack/game/g_team.o \
-	$(B)/missionpack/game/g_trigger.o \
-	$(B)/missionpack/game/g_utils.o \
-	$(B)/missionpack/game/g_weapon.o \
-	\
-	$(B)/missionpack/game/q_math.o \
-	$(B)/missionpack/game/q_shared.o
-
-$(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) : $(MPGOBJ)
-	$(CC) $(SHLIBLDFLAGS) -o $@ $(MPGOBJ)
-
-$(B)/missionpack/game/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/game/ai_cmd.o : $(GDIR)/ai_cmd.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-$(B)/missionpack/game/ai_dmnet.o : $(GDIR)/ai_dmnet.c; $(DO_SHLIB_CC)  -DMISSIONPACK 
-$(B)/missionpack/game/ai_dmq3.o : $(GDIR)/ai_dmq3.c; $(DO_SHLIB_CC)    -DMISSIONPACK   
-$(B)/missionpack/game/ai_main.o : $(GDIR)/ai_main.c; $(DO_SHLIB_CC)    -DMISSIONPACK  
-$(B)/missionpack/game/ai_team.o : $(GDIR)/ai_team.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/game/ai_vcmd.o : $(GDIR)/ai_vcmd.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/game/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/game/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_SHLIB_CC)    -DMISSIONPACK 
-$(B)/missionpack/game/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/game/g_active.o : $(GDIR)/g_active.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-$(B)/missionpack/game/g_arenas.o : $(GDIR)/g_arenas.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-$(B)/missionpack/game/g_bot.o : $(GDIR)/g_bot.c; $(DO_SHLIB_CC)           -DMISSIONPACK 
-$(B)/missionpack/game/g_client.o : $(GDIR)/g_client.c; $(DO_SHLIB_CC)     -DMISSIONPACK 
-$(B)/missionpack/game/g_cmds.o : $(GDIR)/g_cmds.c; $(DO_SHLIB_CC)         -DMISSIONPACK 
-$(B)/missionpack/game/g_combat.o : $(GDIR)/g_combat.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-$(B)/missionpack/game/g_items.o : $(GDIR)/g_items.c; $(DO_SHLIB_CC)         -DMISSIONPACK 
-$(B)/missionpack/game/g_main.o : $(GDIR)/g_main.c; $(DO_SHLIB_CC)          -DMISSIONPACK  
-$(B)/missionpack/game/g_mem.o : $(GDIR)/g_mem.c; $(DO_SHLIB_CC)             -DMISSIONPACK  
-$(B)/missionpack/game/g_misc.o : $(GDIR)/g_misc.c; $(DO_SHLIB_CC)            -DMISSIONPACK 
-$(B)/missionpack/game/g_missile.o : $(GDIR)/g_missile.c; $(DO_SHLIB_CC)      -DMISSIONPACK  
-$(B)/missionpack/game/g_mover.o : $(GDIR)/g_mover.c; $(DO_SHLIB_CC)        -DMISSIONPACK  
-$(B)/missionpack/game/g_session.o : $(GDIR)/g_session.c; $(DO_SHLIB_CC)     -DMISSIONPACK  
-$(B)/missionpack/game/g_spawn.o : $(GDIR)/g_spawn.c; $(DO_SHLIB_CC)         -DMISSIONPACK 
-$(B)/missionpack/game/g_svcmds.o : $(GDIR)/g_svcmds.c; $(DO_SHLIB_CC)       -DMISSIONPACK  
-$(B)/missionpack/game/g_syscalls.o : $(GDIR)/g_syscalls.c; $(DO_SHLIB_CC)   -DMISSIONPACK 
-$(B)/missionpack/game/g_target.o : $(GDIR)/g_target.c; $(DO_SHLIB_CC)       -DMISSIONPACK 
-$(B)/missionpack/game/g_team.o : $(GDIR)/g_team.c; $(DO_SHLIB_CC)         -DMISSIONPACK  
-$(B)/missionpack/game/g_trigger.o : $(GDIR)/g_trigger.c; $(DO_SHLIB_CC)    -DMISSIONPACK   
-$(B)/missionpack/game/g_utils.o : $(GDIR)/g_utils.c; $(DO_SHLIB_CC)        -DMISSIONPACK  
-$(B)/missionpack/game/g_weapon.o : $(GDIR)/g_weapon.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-$(B)/missionpack/game/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC)          -DMISSIONPACK  
-$(B)/missionpack/game/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC)      -DMISSIONPACK 
-
-
-
-#############################################################################
-## BASEQ3 UI
-#############################################################################
-
-Q3UIOBJ = \
-        $(B)/baseq3/ui/bg_misc.o \
-        $(B)/baseq3/ui/ui_addbots.o \
-        $(B)/baseq3/ui/ui_atoms.o \
-        $(B)/baseq3/ui/ui_cdkey.o \
-        $(B)/baseq3/ui/ui_cinematics.o \
-        $(B)/baseq3/ui/ui_confirm.o \
-        $(B)/baseq3/ui/ui_connect.o \
-        $(B)/baseq3/ui/ui_controls2.o \
-        $(B)/baseq3/ui/ui_credits.o \
-        $(B)/baseq3/ui/ui_demo2.o \
-        $(B)/baseq3/ui/ui_display.o \
-        $(B)/baseq3/ui/ui_gameinfo.o \
-        $(B)/baseq3/ui/ui_ingame.o \
-        $(B)/baseq3/ui/ui_loadconfig.o \
-        $(B)/baseq3/ui/ui_main.o \
-        $(B)/baseq3/ui/ui_menu.o \
-        $(B)/baseq3/ui/ui_mfield.o \
-        $(B)/baseq3/ui/ui_mods.o \
-        $(B)/baseq3/ui/ui_network.o \
-        $(B)/baseq3/ui/ui_options.o \
-        $(B)/baseq3/ui/ui_playermodel.o \
-        $(B)/baseq3/ui/ui_players.o \
-        $(B)/baseq3/ui/ui_playersettings.o \
-        $(B)/baseq3/ui/ui_preferences.o \
-        $(B)/baseq3/ui/ui_qmenu.o \
-        $(B)/baseq3/ui/ui_removebots.o \
-        $(B)/baseq3/ui/ui_saveconfig.o \
-        $(B)/baseq3/ui/ui_serverinfo.o \
-        $(B)/baseq3/ui/ui_servers2.o \
-        $(B)/baseq3/ui/ui_setup.o \
-        $(B)/baseq3/ui/ui_sound.o \
-        $(B)/baseq3/ui/ui_sparena.o \
-        $(B)/baseq3/ui/ui_specifyserver.o \
-        $(B)/baseq3/ui/ui_splevel.o \
-        $(B)/baseq3/ui/ui_sppostgame.o \
-        $(B)/baseq3/ui/ui_spskill.o \
-        $(B)/baseq3/ui/ui_startserver.o \
-        $(B)/baseq3/ui/ui_syscalls.o \
-        $(B)/baseq3/ui/ui_team.o \
-        $(B)/baseq3/ui/ui_teamorders.o \
-        $(B)/baseq3/ui/ui_video.o \
-        \
-        $(B)/baseq3/ui/q_math.o \
-        $(B)/baseq3/ui/q_shared.o
-
-$(B)/baseq3/ui$(ARCH).$(SHLIBEXT) : $(Q3UIOBJ)
-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3UIOBJ)
-
-$(B)/baseq3/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_addbots.o : $(Q3UIDIR)/ui_addbots.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_atoms.o : $(Q3UIDIR)/ui_atoms.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_cinematics.o : $(Q3UIDIR)/ui_cinematics.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_cdkey.o : $(Q3UIDIR)/ui_cdkey.c; $(DO_SHLIB_CC)
-$(B)/baseq3/ui/ui_confirm.o : $(Q3UIDIR)/ui_confirm.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_connect.o : $(Q3UIDIR)/ui_connect.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_controls2.o : $(Q3UIDIR)/ui_controls2.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_credits.o : $(Q3UIDIR)/ui_credits.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_demo2.o : $(Q3UIDIR)/ui_demo2.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_display.o : $(Q3UIDIR)/ui_display.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_gameinfo.o : $(Q3UIDIR)/ui_gameinfo.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_ingame.o : $(Q3UIDIR)/ui_ingame.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_loadconfig.o : $(Q3UIDIR)/ui_loadconfig.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_main.o : $(Q3UIDIR)/ui_main.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_menu.o : $(Q3UIDIR)/ui_menu.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_mfield.o : $(Q3UIDIR)/ui_mfield.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_mods.o : $(Q3UIDIR)/ui_mods.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_network.o : $(Q3UIDIR)/ui_network.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_options.o : $(Q3UIDIR)/ui_options.c; $(DO_SHLIB_CC)
-$(B)/baseq3/ui/ui_playermodel.o : $(Q3UIDIR)/ui_playermodel.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_players.o : $(Q3UIDIR)/ui_players.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_playersettings.o : $(Q3UIDIR)/ui_playersettings.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_preferences.o : $(Q3UIDIR)/ui_preferences.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_qmenu.o : $(Q3UIDIR)/ui_qmenu.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_quit.o : $(Q3UIDIR)/ui_quit.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_removebots.o : $(Q3UIDIR)/ui_removebots.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_saveconfig.o : $(Q3UIDIR)/ui_saveconfig.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_serverinfo.o : $(Q3UIDIR)/ui_serverinfo.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_servers2.o : $(Q3UIDIR)/ui_servers2.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_setup.o : $(Q3UIDIR)/ui_setup.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_sound.o : $(Q3UIDIR)/ui_sound.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_sparena.o : $(Q3UIDIR)/ui_sparena.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_specifyserver.o : $(Q3UIDIR)/ui_specifyserver.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_splevel.o : $(Q3UIDIR)/ui_splevel.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_sppostgame.o : $(Q3UIDIR)/ui_sppostgame.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_spskill.o : $(Q3UIDIR)/ui_spskill.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_syscalls.o : $(Q3UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_SHLIB_CC) 
-
-# bk001205 - these wre the only SHLIB compiles in 1.17
-$(B)/baseq3/ui/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC) 
-$(B)/baseq3/ui/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC) 
-
-
-
-#############################################################################
-## MISSIONPACK UI
-#############################################################################
-
-MPUIOBJ = \
-	$(B)/missionpack/ui/ui_atoms.o \
-	$(B)/missionpack/ui/ui_gameinfo.o \
-	$(B)/missionpack/ui/ui_main.o \
-	$(B)/missionpack/ui/ui_players.o \
-	$(B)/missionpack/ui/ui_syscalls.o \
-	$(B)/missionpack/ui/ui_util.o \
-	$(B)/missionpack/ui/ui_shared.o \
-	\
-	$(B)/missionpack/ui/bg_misc.o \
-	\
-	$(B)/missionpack/ui/q_math.o \
-	$(B)/missionpack/ui/q_shared.o
-#	$(B)/missionpack/ui/ui_atoms.o \
-#	$(B)/missionpack/ui/ui_gameinfo.o \
-#	$(B)/missionpack/ui/ui_main.o \
-#	$(B)/missionpack/ui/ui_players.o \
-#	$(B)/missionpack/ui/ui_syscalls.o \
-#	$(B)/missionpack/ui/ui_util.o \
-#	$(B)/missionpack/ui/ui_shared.o \
-#	\
-#	$(B)/missionpack/ui/bg_misc.o \
-#	$(B)/missionpack/ui/bg_lib.o \
-#	\
-#	$(B)/missionpack/ui/q_math.o \
-#	$(B)/missionpack/ui/q_shared.o
-
-$(B)/missionpack/ui$(ARCH).$(SHLIBEXT) : $(MPUIOBJ)
-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(MPUIOBJ)
-
-$(B)/missionpack/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/ui_gameinfo.o : $(UIDIR)/ui_gameinfo.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/ui_main.o : $(UIDIR)/ui_main.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/ui_players.o : $(UIDIR)/ui_players.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/ui_syscalls.o : $(UIDIR)/ui_syscalls.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/ui_util.o : $(UIDIR)/ui_util.c; $(DO_SHLIB_CC)  -DMISSIONPACK
-$(B)/missionpack/ui/ui_shared.o : $(UIDIR)/ui_shared.c; $(DO_SHLIB_CC)  -DMISSIONPACK
-
-$(B)/missionpack/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-$(B)/missionpack/ui/bg_lib.o : $(GDIR)/bg_lib.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-
-$(B)/missionpack/ui/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC)     -DMISSIONPACK  
-$(B)/missionpack/ui/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC)  -DMISSIONPACK  
-
-
-
-
-
-#############################################################################
-## Q3 STATIC (DEBUG) BUILD
-#############################################################################
-
-Q3SOBJ = \
-	$(B)/q3static/cl_cgame.o \
-	$(B)/q3static/cl_cin.o \
-	$(B)/q3static/cl_console.o \
-	$(B)/q3static/cl_input.o \
-	$(B)/q3static/cl_keys.o \
-	$(B)/q3static/cl_main.o \
-	$(B)/q3static/cl_net_chan.o \
-	$(B)/q3static/cl_parse.o \
-	$(B)/q3static/cl_scrn.o \
-	$(B)/q3static/cl_ui.o \
-	\
-	$(B)/q3static/cm_load.o \
-	$(B)/q3static/cm_patch.o \
-	$(B)/q3static/cm_polylib.o \
-	$(B)/q3static/cm_test.o \
-	$(B)/q3static/cm_trace.o \
-	\
-	$(B)/q3static/cmd.o \
-	$(B)/q3static/common.o \
-	$(B)/q3static/cvar.o \
-	$(B)/q3static/files.o \
-	$(B)/q3static/md4.o \
-	$(B)/q3static/msg.o \
-	$(B)/q3static/net_chan.o \
-	\
-	$(B)/q3static/snd_adpcm.o \
-	$(B)/q3static/snd_dma.o \
-	$(B)/q3static/snd_mem.o \
-	$(B)/q3static/snd_mix.o \
-	$(B)/q3static/snd_wavelet.o \
-	\
-	$(B)/q3static/sv_bot.o \
-	$(B)/q3static/sv_ccmds.o \
-	$(B)/q3static/sv_client.o \
-	$(B)/q3static/sv_game.o \
-	$(B)/q3static/sv_init.o \
-	$(B)/q3static/sv_main.o \
-	$(B)/q3static/sv_net_chan.o \
-	$(B)/q3static/sv_snapshot.o \
-	$(B)/q3static/sv_world.o \
-	\
-	$(B)/q3static/unzip.o \
-	$(B)/q3static/vm.o \
-	$(B)/q3static/vm_interpreted.o \
-	\
-	$(B)/q3static/be_aas_bspq3.o \
-	$(B)/q3static/be_aas_cluster.o \
-	$(B)/q3static/be_aas_debug.o \
-	$(B)/q3static/be_aas_entity.o \
-	$(B)/q3static/be_aas_file.o \
-	$(B)/q3static/be_aas_main.o \
-	$(B)/q3static/be_aas_move.o \
-	$(B)/q3static/be_aas_optimize.o \
-	$(B)/q3static/be_aas_reach.o \
-	$(B)/q3static/be_aas_route.o \
-	$(B)/q3static/be_aas_routealt.o \
-	$(B)/q3static/be_aas_sample.o \
-	$(B)/q3static/be_ai_char.o \
-	$(B)/q3static/be_ai_chat.o \
-	$(B)/q3static/be_ai_gen.o \
-	$(B)/q3static/be_ai_goal.o \
-	$(B)/q3static/be_ai_move.o \
-	$(B)/q3static/be_ai_weap.o \
-	$(B)/q3static/be_ai_weight.o \
-	$(B)/q3static/be_ea.o \
-	$(B)/q3static/be_interface.o \
-	$(B)/q3static/l_crc.o \
-	$(B)/q3static/l_libvar.o \
-	$(B)/q3static/l_log.o \
-	$(B)/q3static/l_memory.o \
-	$(B)/q3static/l_precomp.o \
-	$(B)/q3static/l_script.o \
-	$(B)/q3static/l_struct.o \
-	\
-	$(B)/q3static/jcapimin.o \
-	$(B)/q3static/jchuff.o   \
-	$(B)/q3static/jcinit.o \
-	$(B)/q3static/jccoefct.o  \
-	$(B)/q3static/jccolor.o \
-	$(B)/q3static/jfdctflt.o \
-	$(B)/q3static/jcdctmgr.o \
-	$(B)/q3static/jcphuff.o \
-	$(B)/q3static/jcmainct.o \
-	$(B)/q3static/jcmarker.o \
-	$(B)/q3static/jcmaster.o \
-	$(B)/q3static/jcomapi.o \
-	$(B)/q3static/jcparam.o \
-	$(B)/q3static/jcprepct.o \
-	$(B)/q3static/jcsample.o \
-	$(B)/q3static/jdapimin.o \
-	$(B)/q3static/jdapistd.o \
-	$(B)/q3static/jdatasrc.o \
-	$(B)/q3static/jdcoefct.o \
-	$(B)/q3static/jdcolor.o \
-	$(B)/q3static/jddctmgr.o \
-	$(B)/q3static/jdhuff.o \
-	$(B)/q3static/jdinput.o \
-	$(B)/q3static/jdmainct.o \
-	$(B)/q3static/jdmarker.o \
-	$(B)/q3static/jdmaster.o \
-	$(B)/q3static/jdpostct.o \
-	$(B)/q3static/jdsample.o \
-	$(B)/q3static/jdtrans.o \
-	$(B)/q3static/jerror.o \
-	$(B)/q3static/jidctflt.o \
-	$(B)/q3static/jmemmgr.o \
-	$(B)/q3static/jmemnobs.o \
-	$(B)/q3static/jutils.o \
-	\
-	$(B)/q3static/tr_animation.o \
-	$(B)/q3static/tr_backend.o \
-	$(B)/q3static/tr_bsp.o \
-	$(B)/q3static/tr_cmds.o \
-	$(B)/q3static/tr_curve.o \
-	$(B)/q3static/tr_flares.o \
-	$(B)/q3static/tr_font.o \
-	$(B)/q3static/tr_image.o \
-	$(B)/q3static/tr_init.o \
-	$(B)/q3static/tr_light.o \
-	$(B)/q3static/tr_main.o \
-	$(B)/q3static/tr_marks.o \
-	$(B)/q3static/tr_mesh.o \
-	$(B)/q3static/tr_model.o \
-	$(B)/q3static/tr_noise.o \
-	$(B)/q3static/tr_scene.o \
-	$(B)/q3static/tr_shade.o \
-	$(B)/q3static/tr_shade_calc.o \
-	$(B)/q3static/tr_shader.o \
-	$(B)/q3static/tr_shadows.o \
-	$(B)/q3static/tr_sky.o \
-	$(B)/q3static/tr_surface.o \
-	$(B)/q3static/tr_world.o \
-	\
-	$(B)/q3static/unix_main.o \
-	$(B)/q3static/unix_net.o \
-	$(B)/q3static/unix_shared.o \
-	\
-	$(B)/q3static/ahoptim.o  \
-	$(B)/q3static/autohint.o \
-	$(B)/q3static/ftbase.o   \
-	$(B)/q3static/ftdebug.o  \
-	$(B)/q3static/ftglyph.o  \
-	$(B)/q3static/ftinit.o   \
-	$(B)/q3static/ftmm.o     \
-	$(B)/q3static/ftsystem.o \
-	$(B)/q3static/raster1.o  \
-	$(B)/q3static/sfnt.o     \
-	$(B)/q3static/sfobjs.o   \
-	$(B)/q3static/smooth.o   \
-	$(B)/q3static/truetype.o \
-	\
-	$(B)/q3static/linux_qgl.o \
-	$(B)/q3static/linux_glimp.o \
-	$(B)/q3static/linux_joystick.o \
-	$(B)/q3static/linux_snd.o \
-	$(B)/q3static/snd_mixa.o \
-	$(B)/q3static/matha.o
-
-ifeq ($(ARCH),i386)
-  Q3SOBJ += $(B)/q3static/vm_x86.o
-endif
-
-ifeq ($(ARCH),ppc)
-  ifeq ($(DLL_ONLY),false)
-    Q3SOBJ += $(B)/q3static/vm_ppc.o
-  endif
-endif
-
-
-$(B)/q3static/cl_cgame.o : $(CDIR)/cl_cgame.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_cin.o : $(CDIR)/cl_cin.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_console.o : $(CDIR)/cl_console.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_input.o : $(CDIR)/cl_input.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_keys.o : $(CDIR)/cl_keys.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_main.o : $(CDIR)/cl_main.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_net_chan.o : $(CDIR)/cl_net_chan.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_parse.o : $(CDIR)/cl_parse.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/cl_scrn.o : $(CDIR)/cl_scrn.c; $(DO_CC) -DQ3_STATIC    
-$(B)/q3static/cl_ui.o : $(CDIR)/cl_ui.c; $(DO_CC) -DQ3_STATIC         
-$(B)/q3static/snd_adpcm.o : $(CDIR)/snd_adpcm.c; $(DO_CC) -DQ3_STATIC   
-$(B)/q3static/snd_dma.o : $(CDIR)/snd_dma.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/snd_mem.o : $(CDIR)/snd_mem.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/snd_mix.o : $(CDIR)/snd_mix.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/snd_wavelet.o : $(CDIR)/snd_wavelet.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/sv_bot.o : $(SDIR)/sv_bot.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/sv_client.o : $(SDIR)/sv_client.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/sv_ccmds.o : $(SDIR)/sv_ccmds.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/sv_game.o : $(SDIR)/sv_game.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/sv_init.o : $(SDIR)/sv_init.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/sv_main.o : $(SDIR)/sv_main.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/sv_net_chan.o : $(SDIR)/sv_net_chan.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/sv_snapshot.o : $(SDIR)/sv_snapshot.c; $(DO_CC) -DQ3_STATIC      
-$(B)/q3static/sv_world.o : $(SDIR)/sv_world.c; $(DO_CC) -DQ3_STATIC         
-$(B)/q3static/cm_trace.o : $(CMDIR)/cm_trace.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/cm_load.o : $(CMDIR)/cm_load.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cm_test.o : $(CMDIR)/cm_test.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cm_patch.o : $(CMDIR)/cm_patch.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/cm_polylib.o : $(CMDIR)/cm_polylib.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/cmd.o : $(CMDIR)/cmd.c; $(DO_CC) -DQ3_STATIC                   
-$(B)/q3static/common.o : $(CMDIR)/common.c; $(DO_CC) -DQ3_STATIC               
-$(B)/q3static/cvar.o : $(CMDIR)/cvar.c; $(DO_CC) -DQ3_STATIC                
-$(B)/q3static/files.o : $(CMDIR)/files.c; $(DO_CC) -DQ3_STATIC              
-$(B)/q3static/md4.o : $(CMDIR)/md4.c; $(DO_CC) -DQ3_STATIC                   
-$(B)/q3static/msg.o : $(CMDIR)/msg.c; $(DO_CC) -DQ3_STATIC                    
-$(B)/q3static/net_chan.o : $(CMDIR)/net_chan.c; $(DO_CC) -DQ3_STATIC
-
-$(B)/q3static/be_aas_bspq3.o : $(BLIBDIR)/be_aas_bspq3.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_cluster.o : $(BLIBDIR)/be_aas_cluster.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_debug.o : $(BLIBDIR)/be_aas_debug.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_entity.o : $(BLIBDIR)/be_aas_entity.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_file.o : $(BLIBDIR)/be_aas_file.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_main.o : $(BLIBDIR)/be_aas_main.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_move.o : $(BLIBDIR)/be_aas_move.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_optimize.o : $(BLIBDIR)/be_aas_optimize.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_reach.o : $(BLIBDIR)/be_aas_reach.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_route.o : $(BLIBDIR)/be_aas_route.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_routealt.o : $(BLIBDIR)/be_aas_routealt.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_aas_sample.o : $(BLIBDIR)/be_aas_sample.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_char.o : $(BLIBDIR)/be_ai_char.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_chat.o : $(BLIBDIR)/be_ai_chat.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_gen.o : $(BLIBDIR)/be_ai_gen.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_goal.o : $(BLIBDIR)/be_ai_goal.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_move.o : $(BLIBDIR)/be_ai_move.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_weap.o : $(BLIBDIR)/be_ai_weap.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ai_weight.o : $(BLIBDIR)/be_ai_weight.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_ea.o : $(BLIBDIR)/be_ea.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/be_interface.o : $(BLIBDIR)/be_interface.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_crc.o : $(BLIBDIR)/l_crc.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_libvar.o : $(BLIBDIR)/l_libvar.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_log.o : $(BLIBDIR)/l_log.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_memory.o : $(BLIBDIR)/l_memory.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_precomp.o : $(BLIBDIR)/l_precomp.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_script.o : $(BLIBDIR)/l_script.c; $(DO_BOT_CC) -DQ3_STATIC 
-$(B)/q3static/l_struct.o : $(BLIBDIR)/l_struct.c; $(DO_BOT_CC) -DQ3_STATIC 
-
-$(B)/q3static/jcapimin.o : $(JPDIR)/jcapimin.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jchuff.o : $(JPDIR)/jchuff.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcinit.o : $(JPDIR)/jcinit.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jccoefct.o : $(JPDIR)/jccoefct.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jccolor.o : $(JPDIR)/jccolor.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jfdctflt.o : $(JPDIR)/jfdctflt.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcdctmgr.o : $(JPDIR)/jcdctmgr.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcmainct.o : $(JPDIR)/jcmainct.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcmarker.o : $(JPDIR)/jcmarker.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcmaster.o : $(JPDIR)/jcmaster.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcomapi.o : $(JPDIR)/jcomapi.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/jcparam.o : $(JPDIR)/jcparam.c;  $(DO_CC) -DQ3_STATIC
-$(B)/q3static/jcprepct.o : $(JPDIR)/jcprepct.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/jcsample.o : $(JPDIR)/jcsample.c; $(DO_CC) -DQ3_STATIC 
-
-$(B)/q3static/jdapimin.o : $(JPDIR)/jdapimin.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdapistd.o : $(JPDIR)/jdapistd.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdatasrc.o : $(JPDIR)/jdatasrc.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdcoefct.o : $(JPDIR)/jdcoefct.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdcolor.o : $(JPDIR)/jdcolor.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jcphuff.o : $(JPDIR)/jcphuff.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jddctmgr.o : $(JPDIR)/jddctmgr.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdhuff.o : $(JPDIR)/jdhuff.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdinput.o : $(JPDIR)/jdinput.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdmainct.o : $(JPDIR)/jdmainct.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdmarker.o : $(JPDIR)/jdmarker.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdmaster.o : $(JPDIR)/jdmaster.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdpostct.o : $(JPDIR)/jdpostct.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdsample.o : $(JPDIR)/jdsample.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jdtrans.o : $(JPDIR)/jdtrans.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jerror.o : $(JPDIR)/jerror.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jidctflt.o : $(JPDIR)/jidctflt.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jmemmgr.o : $(JPDIR)/jmemmgr.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jmemnobs.o : $(JPDIR)/jmemnobs.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/jutils.o : $(JPDIR)/jutils.c; $(DO_CC) -DQ3_STATIC 
-
-$(B)/q3static/tr_bsp.o : $(RDIR)/tr_bsp.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_animation.o : $(RDIR)/tr_animation.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_backend.o : $(RDIR)/tr_backend.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_cmds.o : $(RDIR)/tr_cmds.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_curve.o : $(RDIR)/tr_curve.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_flares.o : $(RDIR)/tr_flares.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/tr_font.o : $(RDIR)/tr_font.c; $(DO_CC) -DQ3_STATIC  
-$(B)/q3static/tr_image.o : $(RDIR)/tr_image.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_init.o : $(RDIR)/tr_init.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_light.o : $(RDIR)/tr_light.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_main.o : $(RDIR)/tr_main.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_marks.o : $(RDIR)/tr_marks.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_mesh.o : $(RDIR)/tr_mesh.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_model.o : $(RDIR)/tr_model.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_noise.o : $(RDIR)/tr_noise.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_scene.o : $(RDIR)/tr_scene.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_shade.o : $(RDIR)/tr_shade.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_shader.o : $(RDIR)/tr_shader.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_shade_calc.o : $(RDIR)/tr_shade_calc.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_shadows.o : $(RDIR)/tr_shadows.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_sky.o : $(RDIR)/tr_sky.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_smp.o : $(RDIR)/tr_smp.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_stripify.o : $(RDIR)/tr_stripify.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_subdivide.o : $(RDIR)/tr_subdivide.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_surface.o : $(RDIR)/tr_surface.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/tr_world.o : $(RDIR)/tr_world.c; $(DO_CC) -DQ3_STATIC 
-
-$(B)/q3static/unix_qgl.o : $(UDIR)/unix_qgl.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/unix_main.o : $(UDIR)/unix_main.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/unix_net.o : $(UDIR)/unix_net.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/unix_shared.o : $(UDIR)/unix_shared.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/linux_glimp.o : $(UDIR)/linux_glimp.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/linux_joystick.o : $(UDIR)/linux_joystick.c; $(DO_CC) -DQ3_STATIC  
-$(B)/q3static/linux_qgl.o : $(UDIR)/linux_qgl.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/linux_input.o : $(UDIR)/linux_input.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/linux_snd.o : $(UDIR)/linux_snd.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/snd_mixa.o : $(UDIR)/snd_mixa.s; $(DO_AS) 
-$(B)/q3static/matha.o : $(UDIR)/matha.s; $(DO_AS) 
-$(B)/q3static/unzip.o : $(CMDIR)/unzip.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/vm.o : $(CMDIR)/vm.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/vm_interpreted.o : $(CMDIR)/vm_interpreted.c; $(DO_CC) -DQ3_STATIC 
-
-ifeq ($(ARCH),i386)
-  $(B)/q3static/vm_x86.o : $(CMDIR)/vm_x86.c; $(DO_CC) -DQ3_STATIC
-endif
-
-ifeq ($(ARCH),ppc)
-ifeq ($(DLL_ONLY),false)
-$(B)/q3static/vm_ppc.o : $(CMDIR)/vm_ppc.c; $(DO_CC) -DQ3_STATIC
-endif
-endif
-
-$(B)/q3static/ahoptim.o  : $(FTDIR)/ahoptim.c;   $(DO_CC) -DQ3_STATIC
-$(B)/q3static/autohint.o : $(FTDIR)/autohint.c;  $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftbase.o   : $(FTDIR)/ftbase.c;    $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftdebug.o  : $(FTDIR)/ftdebug.c;   $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftglyph.o  : $(FTDIR)/ftglyph.c;   $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftinit.o   : $(FTDIR)/ftinit.c;    $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftmm.o     : $(FTDIR)/ftmm.c;      $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ftsystem.o : $(FTDIR)/ftsystem.c;  $(DO_CC) -DQ3_STATIC
-$(B)/q3static/raster1.o  : $(FTDIR)/raster1.c;   $(DO_CC) -DQ3_STATIC -DFT_FLAT_COMPILE
-$(B)/q3static/sfnt.o     : $(FTDIR)/sfnt.c;      $(DO_CC) -DQ3_STATIC
-$(B)/q3static/sfobjs.o   : $(FTDIR)/sfobjs.c;    $(DO_CC) -DQ3_STATIC
-$(B)/q3static/smooth.o   : $(FTDIR)/smooth.c;    $(DO_CC) -DQ3_STATIC -DFT_FLAT_COMPILE
-$(B)/q3static/truetype.o : $(FTDIR)/truetype.c;  $(DO_CC) -DQ3_STATIC
-
-## add BASEQ3 CGAME
-Q3SOBJ += \
-	$(B)/q3static/cg_consolecmds.o \
-	$(B)/q3static/cg_draw.o \
-	$(B)/q3static/cg_drawtools.o \
-	$(B)/q3static/cg_effects.o \
-	$(B)/q3static/cg_ents.o \
-	$(B)/q3static/cg_event.o \
-	$(B)/q3static/cg_info.o \
-	$(B)/q3static/cg_localents.o \
-	$(B)/q3static/cg_main.o \
-	$(B)/q3static/cg_marks.o \
-	$(B)/q3static/cg_players.o \
-	$(B)/q3static/cg_playerstate.o \
-	$(B)/q3static/cg_predict.o \
-	$(B)/q3static/cg_scoreboard.o \
-	$(B)/q3static/cg_servercmds.o \
-	$(B)/q3static/cg_snapshot.o \
-	$(B)/q3static/cg_syscalls.o \
-	$(B)/q3static/cg_view.o \
-	$(B)/q3static/cg_weapons.o
-
-$(B)/q3static/cg_consolecmds.o : $(CGDIR)/cg_consolecmds.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/cg_draw.o : $(CGDIR)/cg_draw.c; $(DO_CC) -DQ3_STATIC             
-$(B)/q3static/cg_drawtools.o : $(CGDIR)/cg_drawtools.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_effects.o : $(CGDIR)/cg_effects.c; $(DO_CC) -DQ3_STATIC           
-$(B)/q3static/cg_ents.o : $(CGDIR)/cg_ents.c; $(DO_CC) -DQ3_STATIC               
-$(B)/q3static/cg_event.o : $(CGDIR)/cg_event.c; $(DO_CC) -DQ3_STATIC            
-$(B)/q3static/cg_info.o : $(CGDIR)/cg_info.c; $(DO_CC) -DQ3_STATIC               
-$(B)/q3static/cg_localents.o : $(CGDIR)/cg_localents.c; $(DO_CC) -DQ3_STATIC           
-$(B)/q3static/cg_main.o : $(CGDIR)/cg_main.c; $(DO_CC) -DQ3_STATIC                   
-$(B)/q3static/cg_marks.o : $(CGDIR)/cg_marks.c; $(DO_CC) -DQ3_STATIC                 
-$(B)/q3static/cg_players.o : $(CGDIR)/cg_players.c; $(DO_CC) -DQ3_STATIC             
-$(B)/q3static/cg_playerstate.o : $(CGDIR)/cg_playerstate.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_predict.o : $(CGDIR)/cg_predict.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_scoreboard.o : $(CGDIR)/cg_scoreboard.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_servercmds.o : $(CGDIR)/cg_servercmds.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_snapshot.o : $(CGDIR)/cg_snapshot.c; $(DO_CC) -DQ3_STATIC             
-$(B)/q3static/cg_syscalls.o : $(CGDIR)/cg_syscalls.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/cg_view.o : $(CGDIR)/cg_view.c; $(DO_CC) -DQ3_STATIC                     
-$(B)/q3static/cg_weapons.o : $(CGDIR)/cg_weapons.c; $(DO_CC) -DQ3_STATIC 
-
-## add BASEQ3 GAME
-Q3SOBJ += \
-	$(B)/q3static/ai_chat.o \
-	$(B)/q3static/ai_cmd.o \
-	$(B)/q3static/ai_dmnet.o \
-	$(B)/q3static/ai_dmq3.o \
-	$(B)/q3static/ai_main.o \
-	$(B)/q3static/ai_team.o \
-	$(B)/q3static/ai_vcmd.o \
-	$(B)/q3static/g_active.o \
-	$(B)/q3static/g_arenas.o \
-	$(B)/q3static/g_bot.o \
-	$(B)/q3static/g_client.o \
-	$(B)/q3static/g_cmds.o \
-	$(B)/q3static/g_combat.o \
-	$(B)/q3static/g_items.o \
-	$(B)/q3static/g_main.o \
-	$(B)/q3static/g_mem.o \
-	$(B)/q3static/g_misc.o \
-	$(B)/q3static/g_missile.o \
-	$(B)/q3static/g_mover.o \
-	$(B)/q3static/g_session.o \
-	$(B)/q3static/g_spawn.o \
-	$(B)/q3static/g_svcmds.o \
-	$(B)/q3static/g_target.o \
-	$(B)/q3static/g_team.o \
-	$(B)/q3static/g_trigger.o \
-	$(B)/q3static/g_utils.o \
-	$(B)/q3static/g_weapon.o \
-	\
-	$(B)/q3static/g_syscalls.o
-
-$(B)/q3static/ai_chat.o : $(GDIR)/ai_chat.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/ai_cmd.o : $(GDIR)/ai_cmd.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/ai_dmnet.o : $(GDIR)/ai_dmnet.c; $(DO_CC) -DQ3_STATIC   
-$(B)/q3static/ai_dmq3.o : $(GDIR)/ai_dmq3.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/ai_main.o : $(GDIR)/ai_main.c; $(DO_CC) -DQ3_STATIC      
-$(B)/q3static/ai_team.o : $(GDIR)/ai_team.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/ai_vcmd.o : $(GDIR)/ai_vcmd.c; $(DO_CC) -DQ3_STATIC     
-$(B)/q3static/g_active.o : $(GDIR)/g_active.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/g_arenas.o : $(GDIR)/g_arenas.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/g_bot.o : $(GDIR)/g_bot.c; $(DO_CC) -DQ3_STATIC            
-$(B)/q3static/g_client.o : $(GDIR)/g_client.c; $(DO_CC) -DQ3_STATIC      
-$(B)/q3static/g_cmds.o : $(GDIR)/g_cmds.c; $(DO_CC) -DQ3_STATIC          
-$(B)/q3static/g_combat.o : $(GDIR)/g_combat.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/g_items.o : $(GDIR)/g_items.c; $(DO_CC) -DQ3_STATIC          
-$(B)/q3static/g_main.o : $(GDIR)/g_main.c; $(DO_CC) -DQ3_STATIC            
-$(B)/q3static/g_mem.o : $(GDIR)/g_mem.c; $(DO_CC) -DQ3_STATIC               
-$(B)/q3static/g_misc.o : $(GDIR)/g_misc.c; $(DO_CC) -DQ3_STATIC             
-$(B)/q3static/g_missile.o : $(GDIR)/g_missile.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/g_mover.o : $(GDIR)/g_mover.c; $(DO_CC) -DQ3_STATIC          
-$(B)/q3static/g_session.o : $(GDIR)/g_session.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/g_spawn.o : $(GDIR)/g_spawn.c; $(DO_CC) -DQ3_STATIC          
-$(B)/q3static/g_svcmds.o : $(GDIR)/g_svcmds.c; $(DO_CC) -DQ3_STATIC         
-$(B)/q3static/g_syscalls.o : $(GDIR)/g_syscalls.c; $(DO_CC) -DQ3_STATIC    
-$(B)/q3static/g_target.o : $(GDIR)/g_target.c; $(DO_CC) -DQ3_STATIC        
-$(B)/q3static/g_team.o : $(GDIR)/g_team.c; $(DO_CC) -DQ3_STATIC           
-$(B)/q3static/g_trigger.o : $(GDIR)/g_trigger.c; $(DO_CC) -DQ3_STATIC       
-$(B)/q3static/g_utils.o : $(GDIR)/g_utils.c; $(DO_CC) -DQ3_STATIC          
-$(B)/q3static/g_weapon.o : $(GDIR)/g_weapon.c; $(DO_CC) -DQ3_STATIC             
-
-## add BASEQ3 UI
-Q3SOBJ += \
-        $(B)/q3static/ui_addbots.o \
-        $(B)/q3static/ui_atoms.o \
-        $(B)/q3static/ui_cdkey.o \
-        $(B)/q3static/ui_cinematics.o \
-        $(B)/q3static/ui_confirm.o \
-        $(B)/q3static/ui_connect.o \
-        $(B)/q3static/ui_controls2.o \
-        $(B)/q3static/ui_credits.o \
-        $(B)/q3static/ui_demo2.o \
-        $(B)/q3static/ui_display.o \
-        $(B)/q3static/ui_gameinfo.o \
-        $(B)/q3static/ui_ingame.o \
-        $(B)/q3static/ui_loadconfig.o \
-        $(B)/q3static/ui_main.o \
-        $(B)/q3static/ui_menu.o \
-        $(B)/q3static/ui_mfield.o \
-        $(B)/q3static/ui_mods.o \
-        $(B)/q3static/ui_network.o \
-        $(B)/q3static/ui_options.o \
-        $(B)/q3static/ui_playermodel.o \
-        $(B)/q3static/ui_players.o \
-        $(B)/q3static/ui_playersettings.o \
-        $(B)/q3static/ui_preferences.o \
-        $(B)/q3static/ui_qmenu.o \
-        $(B)/q3static/ui_removebots.o \
-        $(B)/q3static/ui_saveconfig.o \
-        $(B)/q3static/ui_serverinfo.o \
-        $(B)/q3static/ui_servers2.o \
-        $(B)/q3static/ui_setup.o \
-        $(B)/q3static/ui_sound.o \
-        $(B)/q3static/ui_sparena.o \
-        $(B)/q3static/ui_specifyserver.o \
-        $(B)/q3static/ui_splevel.o \
-        $(B)/q3static/ui_sppostgame.o \
-        $(B)/q3static/ui_spskill.o \
-        $(B)/q3static/ui_startserver.o \
-        $(B)/q3static/ui_team.o \
-        $(B)/q3static/ui_teamorders.o \
-        $(B)/q3static/ui_video.o \
-	\
-	$(B)/q3static/ui_syscalls.o
-
-$(B)/q3static/ui_addbots.o : $(Q3UIDIR)/ui_addbots.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_atoms.o : $(Q3UIDIR)/ui_atoms.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_cinematics.o : $(Q3UIDIR)/ui_cinematics.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_cdkey.o : $(Q3UIDIR)/ui_cdkey.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ui_confirm.o : $(Q3UIDIR)/ui_confirm.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_connect.o : $(Q3UIDIR)/ui_connect.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_controls2.o : $(Q3UIDIR)/ui_controls2.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_credits.o : $(Q3UIDIR)/ui_credits.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_demo2.o : $(Q3UIDIR)/ui_demo2.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_display.o : $(Q3UIDIR)/ui_display.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_gameinfo.o : $(Q3UIDIR)/ui_gameinfo.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_ingame.o : $(Q3UIDIR)/ui_ingame.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_loadconfig.o : $(Q3UIDIR)/ui_loadconfig.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_main.o : $(Q3UIDIR)/ui_main.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_menu.o : $(Q3UIDIR)/ui_menu.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_mfield.o : $(Q3UIDIR)/ui_mfield.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_mods.o : $(Q3UIDIR)/ui_mods.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_network.o : $(Q3UIDIR)/ui_network.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_options.o : $(Q3UIDIR)/ui_options.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/ui_playermodel.o : $(Q3UIDIR)/ui_playermodel.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_players.o : $(Q3UIDIR)/ui_players.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_playersettings.o : $(Q3UIDIR)/ui_playersettings.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_preferences.o : $(Q3UIDIR)/ui_preferences.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_qmenu.o : $(Q3UIDIR)/ui_qmenu.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_quit.o : $(Q3UIDIR)/ui_quit.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_removebots.o : $(Q3UIDIR)/ui_removebots.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_saveconfig.o : $(Q3UIDIR)/ui_saveconfig.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_serverinfo.o : $(Q3UIDIR)/ui_serverinfo.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_servers2.o : $(Q3UIDIR)/ui_servers2.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_setup.o : $(Q3UIDIR)/ui_setup.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_sound.o : $(Q3UIDIR)/ui_sound.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_sparena.o : $(Q3UIDIR)/ui_sparena.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_specifyserver.o : $(Q3UIDIR)/ui_specifyserver.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_splevel.o : $(Q3UIDIR)/ui_splevel.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_sppostgame.o : $(Q3UIDIR)/ui_sppostgame.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_spskill.o : $(Q3UIDIR)/ui_spskill.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_startserver.o : $(Q3UIDIR)/ui_startserver.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_team.o : $(Q3UIDIR)/ui_team.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_teamorders.o : $(Q3UIDIR)/ui_teamorders.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_syscalls.o : $(Q3UIDIR)/ui_syscalls.c; $(DO_CC) -DQ3_STATIC 
-$(B)/q3static/ui_video.o : $(Q3UIDIR)/ui_video.c; $(DO_CC) -DQ3_STATIC 
-
-
-## add shared files
-Q3SOBJ += \
-	$(B)/q3static/bg_misc.o \
-	$(B)/q3static/bg_pmove.o \
-	$(B)/q3static/bg_slidemove.o \
-        $(B)/q3static/q_math.o \
-        $(B)/q3static/q_shared.o
-
-## shared files
-$(B)/q3static/q_math.o : $(GDIR)/q_math.c; $(DO_CC) -DQ3_STATIC               
-$(B)/q3static/q_shared.o : $(GDIR)/q_shared.c; $(DO_CC) -DQ3_STATIC      
-$(B)/q3static/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_CC) -DQ3_STATIC
-$(B)/q3static/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_CC) -DQ3_STATIC  
-$(B)/q3static/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_CC) -DQ3_STATIC    
-
-
-
-$(B)/$(PLATFORM)q3static : $(Q3SOBJ) 
-	$(CC) $(CFLAGS) -o $@ $(Q3SOBJ)  $(GLLDFLAGS) $(LDFLAGS) 
-
-
-#############################################################################
-# RPM
-#############################################################################
-
-TMPDIR=/var/tmp
-TARDIR=$(TMPDIR)/$(BUILD_NAME)
-TARFILE = $(BUILD_NAME)-$(VERSION)-$(RPM_RELEASE).$(ARCH).tar
-
-tar:
-	if [ ! -d archives ];then mkdir archives;chmod 755 archives;fi
-	$(MAKE) copyfiles COPYDIR=$(TARDIR)
-	cd $(TARDIR); tar cvf $(TARFILE) * && gzip -9 $(TARFILE)
-	mv $(TARDIR)/$(TARFILE).gz archives/.
-	rm -rf $(TARDIR)
-
-# Make RPMs.  You need to be root to make this work
-RPMROOT=/usr/src/redhat
-RPM = rpm
-RPMFLAGS = -bb
-INSTALLDIR = /usr/local/games/$(BUILD_NAME)
-RPMDIR = $(TMPDIR)/$(BUILD_NAME)-$(VERSION)
-DESTDIR= $(RPMDIR)/$(INSTALLDIR)
-
-rpm: $(BUILD_NAME).spec
-	touch $(RPMROOT)/SOURCES/$(BUILD_NAME)-$(VERSION).tar.gz
-	if [ ! -d archives ];then mkdir archives;fi
-	$(MAKE) copyfiles COPYDIR=$(DESTDIR)
-	cp $(UDIR)/quake3.gif $(RPMROOT)/SOURCES/.
-	cp $(BUILD_NAME).spec $(RPMROOT)/SPECS/.
-	cd $(RPMROOT)/SPECS; $(RPM) $(RPMFLAGS) $(BUILD_NAME).spec
-	rm -rf $(RPMDIR)
-	mv $(RPMROOT)/RPMS/$(RPMARCH)/$(BUILD_NAME)-$(VERSION)-$(RPM_RELEASE).$(RPMARCH).rpm archives/$(BUILD_NAME)-$(VERSION)-$(RPM_RELEASE).$(RPMARCH).rpm 
-
-copyfiles:
-	-mkdirhier $(COPYDIR)
-	cp $(BR)/linuxquake3 $(COPYDIR)/quake3.x86
-	strip $(COPYDIR)/quake3.x86
-	chmod 755 $(COPYDIR)/quake3.x86
-	cp $(BR)/linuxq3ded $(COPYDIR)/q3ded
-	strip $(COPYDIR)/q3ded
-	chmod 755 $(COPYDIR)/q3ded
-	cp $(BDIR)/libMesaVoodooGL.so.3.2 $(COPYDIR)/.
-	chmod 755 $(COPYDIR)/libMesaVoodooGL.so.3.2
-	( cd $(COPYDIR); ln -s libMesaVoodooGL.so.3.2 libMesaVoodooGL.so )
-	cp $(BDIR)/Quake_III_Arena_FAQ.html $(COPYDIR)/.
-	chmod 644 $(COPYDIR)/Quake_III_Arena_FAQ.html
-	mkdir $(COPYDIR)/baseq3
-	cp $(BASEQ3_DIR)/pak2.pk3 $(COPYDIR)/baseq3/.
-	chmod 644 $(COPYDIR)/baseq3/pak2.pk3
-
-$(BUILD_NAME).spec : $(UDIR)/$(BUILD_NAME).spec.sh Makefile
-	sh $< $(VERSION) $(RPM_RELEASE) $(ARCH) $(INSTALLDIR) > $@
-
-#############################################################################
-# MISC
-#############################################################################
-
-# TTimo: FIXME: doesn't clean the binary and .so
-
-clean:clean-debug clean-release
-
-clean2: clean-bins
-	rm -f $(Q3OBJ) $(Q3POBJ) $(Q3POBJ_SMP) $(Q3DOBJ) $(MPGOBJ) $(Q3GOBJ) $(Q3CGOBJ) $(MPCGOBJ) $(Q3UIOBJ) $(MPUIOBJ)
-	rm -f $(CGDIR)/vm/*.asm
-	rm -f $(GDIR)/vm/*.asm
-	rm -f $(UIDIR)/vm/*.asm
-	rm -f $(Q3UIDIR)/vm/*.asm
-
-# TTimo: linuxq3ded linuxquake3 linuxquake3-smp .. hardcoded the names .. maybe not such a good thing
-# FIXME: also, removing the *.so is crappy .. I just want to avoid rm -rf debugi386-glibc to save the symlinks to pk3's for testing
-clean-bins:
-	if [ -d $(B) ];then (find $(B) -name '*.so' -exec rm {} \;)fi
-	rm -f $(B)/linuxq3ded
-	rm -f $(B)/linuxquake3
-	rm -f $(B)/linuxquake3-smp
-	rm -f $(B)/baseq3/vm/cgame.qvm
-	rm -f $(B)/baseq3/vm/ui.qvm
-	rm -f $(B)/baseq3/vm/qagame.qvm
-	rm -f $(B)/missionpack/vm/cgame.qvm
-	rm -f $(B)/missionpack/vm/qagame.qvm
-	rm -f $(B)/missionpack/vm/ui.qvm
-
-clean-debug:
-	$(MAKE) clean2 B=$(BD) CFLAGS="$(DEBUG_CFLAGS)"
-
-clean-release:
-	$(MAKE) clean2 B=$(BR) CFLAGS="$(DEBUG_CFLAGS)"
-
-# TTimo: for the setups it's easier to shell out to a script
-
-setup: release
-	./build_setup.sh $(VERSION)
-
diff --git a/code/unix/Makefile.Game b/code/unix/Makefile.Game
deleted file mode 100644
index 8f460ec6..00000000
--- a/code/unix/Makefile.Game
+++ /dev/null
@@ -1,285 +0,0 @@
-#
-# Quake3 Unix Game Makefile
-#
-# GNU Make required
-#
-
-###
-### These paths are where you probably want to change things
-###
-
-#The main Quake3 directory
-BDIR=..
-
-#This is the game dir
-GAMEDIR=baseq3
-
-#Where the source is, assumed to be same directory as this Makefile
-SRCDIR=.
-
-#Location of binaries
-BINDIR=../bin
-LCC=$(BINDIR)/lcc # -lccdir=$(BINDIR)/
-Q3ASM=$(BINDIR)/q3asm
-
-
-#############################################################################
-##
-## You shouldn't have to touch anything below here
-##
-#############################################################################
-
-GDIR=$(SRCDIR)/game
-CGDIR=$(SRCDIR)/cgame
-UIDIR=$(SRCDIR)/ui
-
-LCCFLAGS=-DQ3_VM -S -Wf-target=bytecode -Wf-g -I..\cgame -I..\game -I..\ui
-
-DO_LCC=$(LCC) $(LCCFLAGS) -o $@ -c $<
-
-TARGETS=\
-	$(BDIR)/$(GAMEDIR)/vm/cgame.qvm \
-	$(BDIR)/$(GAMEDIR)/vm/qagame.qvm \
-	$(BDIR)/$(GAMEDIR)/vm/ui.qvm
-
-default: makedir $(TARGETS)
-
-makedir:
-	@-mkdir $(GDIR)/vm
-	@-mkdir $(CGDIR)/vm
-	@-mkdir $(UIDIR)/vm
-
-#############################################################################
-# GAME VM
-#############################################################################
-
-##NOTE:  g_main must be first.  Control passes to first function in the vm
-
-GVMASM = \
-	$(GDIR)/vm/g_main.asm \
-	$(GDIR)/vm/bg_misc.asm \
-	$(GDIR)/vm/bg_lib.asm \
-	$(GDIR)/vm/bg_pmove.asm \
-	$(GDIR)/vm/bg_slidemove.asm \
-	$(GDIR)/vm/q_math.asm \
-	$(GDIR)/vm/q_shared.asm \
-	$(GDIR)/vm/ai_dmnet.asm \
-	$(GDIR)/vm/ai_dmq3.asm \
-	$(GDIR)/vm/ai_team.asm \
-	$(GDIR)/vm/ai_main.asm \
-	$(GDIR)/vm/ai_chat.asm \
-	$(GDIR)/vm/ai_cmd.asm \
-	$(GDIR)/vm/g_active.asm \
-	$(GDIR)/vm/g_arenas.asm \
-	$(GDIR)/vm/g_bot.asm \
-	$(GDIR)/vm/g_client.asm \
-	$(GDIR)/vm/g_cmds.asm \
-	$(GDIR)/vm/g_combat.asm \
-	$(GDIR)/vm/g_items.asm \
-	$(GDIR)/vm/g_mem.asm \
-	$(GDIR)/vm/g_misc.asm \
-	$(GDIR)/vm/g_missile.asm \
-	$(GDIR)/vm/g_mover.asm \
-	$(GDIR)/vm/g_session.asm \
-	$(GDIR)/vm/g_spawn.asm \
-	$(GDIR)/vm/g_svcmds.asm \
-	$(GDIR)/vm/g_target.asm \
-	$(GDIR)/vm/g_team.asm \
-	$(GDIR)/vm/g_trigger.asm \
-	$(GDIR)/vm/g_utils.asm \
-	$(GDIR)/vm/g_weapon.asm
-
-$(BDIR)/$(GAMEDIR)/vm/qagame.qvm : $(GVMASM)
-	$(Q3ASM) -o $@ $(GVMASM) $(SRCDIR)/game/g_syscalls.asm
-
-$(GDIR)/vm/ai_chat.asm : $(GDIR)/ai_chat.c; $(DO_LCC) 
-$(GDIR)/vm/ai_cmd.asm : $(GDIR)/ai_cmd.c; $(DO_LCC) 
-$(GDIR)/vm/ai_dmnet.asm : $(GDIR)/ai_dmnet.c; $(DO_LCC) 
-$(GDIR)/vm/ai_dmq3.asm : $(GDIR)/ai_dmq3.c; $(DO_LCC) 
-$(GDIR)/vm/ai_main.asm : $(GDIR)/ai_main.c; $(DO_LCC) 
-$(GDIR)/vm/ai_team.asm : $(GDIR)/ai_team.c; $(DO_LCC) 
-$(GDIR)/vm/bg_lib.asm : $(GDIR)/bg_lib.c; $(DO_LCC) 
-$(GDIR)/vm/bg_misc.asm : $(GDIR)/bg_misc.c; $(DO_LCC) 
-$(GDIR)/vm/bg_pmove.asm : $(GDIR)/bg_pmove.c; $(DO_LCC) 
-$(GDIR)/vm/bg_slidemove.asm : $(GDIR)/bg_slidemove.c; $(DO_LCC) 
-$(GDIR)/vm/g_active.asm : $(GDIR)/g_active.c; $(DO_LCC) 
-$(GDIR)/vm/g_arenas.asm : $(GDIR)/g_arenas.c; $(DO_LCC) 
-$(GDIR)/vm/g_bot.asm : $(GDIR)/g_bot.c; $(DO_LCC) 
-$(GDIR)/vm/g_client.asm : $(GDIR)/g_client.c; $(DO_LCC) 
-$(GDIR)/vm/g_cmds.asm : $(GDIR)/g_cmds.c; $(DO_LCC) 
-$(GDIR)/vm/g_combat.asm : $(GDIR)/g_combat.c; $(DO_LCC) 
-$(GDIR)/vm/g_items.asm : $(GDIR)/g_items.c; $(DO_LCC) 
-$(GDIR)/vm/g_main.asm : $(GDIR)/g_main.c; $(DO_LCC) 
-$(GDIR)/vm/g_mem.asm : $(GDIR)/g_mem.c; $(DO_LCC) 
-$(GDIR)/vm/g_misc.asm : $(GDIR)/g_misc.c; $(DO_LCC) 
-$(GDIR)/vm/g_missile.asm : $(GDIR)/g_missile.c; $(DO_LCC) 
-$(GDIR)/vm/g_mover.asm : $(GDIR)/g_mover.c; $(DO_LCC) 
-$(GDIR)/vm/g_session.asm : $(GDIR)/g_session.c; $(DO_LCC) 
-$(GDIR)/vm/g_spawn.asm : $(GDIR)/g_spawn.c; $(DO_LCC) 
-$(GDIR)/vm/g_svcmds.asm : $(GDIR)/g_svcmds.c; $(DO_LCC) 
-$(GDIR)/vm/g_target.asm : $(GDIR)/g_target.c; $(DO_LCC) 
-$(GDIR)/vm/g_team.asm : $(GDIR)/g_team.c; $(DO_LCC) 
-$(GDIR)/vm/g_trigger.asm : $(GDIR)/g_trigger.c; $(DO_LCC) 
-$(GDIR)/vm/g_utils.asm : $(GDIR)/g_utils.c; $(DO_LCC) 
-$(GDIR)/vm/g_weapon.asm : $(GDIR)/g_weapon.c; $(DO_LCC) 
-$(GDIR)/vm/q_math.asm : $(GDIR)/q_math.c; $(DO_LCC) 
-$(GDIR)/vm/q_shared.asm : $(GDIR)/q_shared.c; $(DO_LCC) 
-
-$(BDIR)/$(GAMEDIR)/vm/cgame.qvm : 
-	echo cgame.qvm disabled
-
-$(BDIR)/$(GAMEDIR)/vm/ui.qvm : 
-	echo ui.qvm disabled
-
-#############################################################################
-# CGAME
-#############################################################################
-
-CGOBJ = \
-	$(SRCDIR)/cgame/bg_lib.o \
-	$(SRCDIR)/cgame/bg_misc.o \
-	$(SRCDIR)/cgame/bg_pmove.o \
-	$(SRCDIR)/cgame/bg_slidemove.o \
-	$(SRCDIR)/cgame/cg_consolecmds.o \
-	$(SRCDIR)/cgame/cg_draw.o \
-	$(SRCDIR)/cgame/cg_drawtools.o \
-	$(SRCDIR)/cgame/cg_effects.o \
-	$(SRCDIR)/cgame/cg_ents.o \
-	$(SRCDIR)/cgame/cg_event.o \
-	$(SRCDIR)/cgame/cg_info.o \
-	$(SRCDIR)/cgame/cg_localents.o \
-	$(SRCDIR)/cgame/cg_main.o \
-	$(SRCDIR)/cgame/cg_marks.o \
-	$(SRCDIR)/cgame/cg_players.o \
-	$(SRCDIR)/cgame/cg_playerstate.o \
-	$(SRCDIR)/cgame/cg_predict.o \
-	$(SRCDIR)/cgame/cg_scoreboard.o \
-	$(SRCDIR)/cgame/cg_servercmds.o \
-	$(SRCDIR)/cgame/cg_snapshot.o \
-	$(SRCDIR)/cgame/cg_view.o \
-	$(SRCDIR)/cgame/cg_weapons.o \
-	$(SRCDIR)/cgame/q_math.o \
-	$(SRCDIR)/cgame/q_shared.o
-
-$(SRCDIR)/cgame$(ARCH).$(SHLIBEXT) : $(CGOBJ)
-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CGOBJ)
-
-$(SRCDIR)/cgame/bg_lib.o : $(GDIR)/bg_lib.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/bg_pmove.o : $(GDIR)/bg_pmove.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/bg_slidemove.o : $(GDIR)/bg_slidemove.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_consolecmds.o : $(CGDIR)/cg_consolecmds.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_draw.o : $(CGDIR)/cg_draw.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_drawtools.o : $(CGDIR)/cg_drawtools.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_effects.o : $(CGDIR)/cg_effects.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_ents.o : $(CGDIR)/cg_ents.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_event.o : $(CGDIR)/cg_event.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_info.o : $(CGDIR)/cg_info.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_localents.o : $(CGDIR)/cg_localents.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_main.o : $(CGDIR)/cg_main.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_marks.o : $(CGDIR)/cg_marks.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_players.o : $(CGDIR)/cg_players.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_playerstate.o : $(CGDIR)/cg_playerstate.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_predict.o : $(CGDIR)/cg_predict.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_scoreboard.o : $(CGDIR)/cg_scoreboard.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_servercmds.o : $(CGDIR)/cg_servercmds.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_snapshot.o : $(CGDIR)/cg_snapshot.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_view.o : $(CGDIR)/cg_view.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/cg_weapons.o : $(CGDIR)/cg_weapons.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/cgame/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC) 
-
-#############################################################################
-# UI
-#############################################################################
-
-UIOBJ = \
-	$(SRCDIR)/ui/bg_lib.o \
-	$(SRCDIR)/ui/bg_misc.o \
-	$(SRCDIR)/ui/ui_addbots.o \
-	$(SRCDIR)/ui/ui_atoms.o \
-	$(SRCDIR)/ui/ui_cinematics.o \
-	$(SRCDIR)/ui/ui_confirm.o \
-	$(SRCDIR)/ui/ui_connect.o \
-	$(SRCDIR)/ui/ui_controls2.o \
-	$(SRCDIR)/ui/ui_credits.o \
-	$(SRCDIR)/ui/ui_demo2.o \
-	$(SRCDIR)/ui/ui_display.o \
-	$(SRCDIR)/ui/ui_gameinfo.o \
-	$(SRCDIR)/ui/ui_ingame.o \
-	$(SRCDIR)/ui/ui_loadconfig.o \
-	$(SRCDIR)/ui/ui_main.o \
-	$(SRCDIR)/ui/ui_menu.o \
-	$(SRCDIR)/ui/ui_mfield.o \
-	$(SRCDIR)/ui/ui_network.o \
-	$(SRCDIR)/ui/ui_playermodel.o \
-	$(SRCDIR)/ui/ui_players.o \
-	$(SRCDIR)/ui/ui_playersettings.o \
-	$(SRCDIR)/ui/ui_preferences.o \
-	$(SRCDIR)/ui/ui_qmenu.o \
-	$(SRCDIR)/ui/ui_saveconfig.o \
-	$(SRCDIR)/ui/ui_serverinfo.o \
-	$(SRCDIR)/ui/ui_servers2.o \
-	$(SRCDIR)/ui/ui_setup.o \
-	$(SRCDIR)/ui/ui_sound.o \
-	$(SRCDIR)/ui/ui_sparena.o \
-	$(SRCDIR)/ui/ui_specifyserver.o \
-	$(SRCDIR)/ui/ui_splevel.o \
-	$(SRCDIR)/ui/ui_sppostgame.o \
-	$(SRCDIR)/ui/ui_spskill.o \
-	$(SRCDIR)/ui/ui_startserver.o \
-	$(SRCDIR)/ui/ui_team.o \
-	$(SRCDIR)/ui/ui_video.o \
-	\
-	$(SRCDIR)/ui/q_math.o \
-	$(SRCDIR)/ui/q_shared.o
-
-$(SRCDIR)/ui$(ARCH).$(SHLIBEXT) : $(UIOBJ)
-	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(UIOBJ)
-
-$(SRCDIR)/ui/bg_lib.o : $(GDIR)/bg_lib.c; $(DO_CC) 
-$(SRCDIR)/ui/bg_misc.o : $(GDIR)/bg_misc.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_addbots.o : $(UIDIR)/ui_addbots.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_atoms.o : $(UIDIR)/ui_atoms.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_cinematics.o : $(UIDIR)/ui_cinematics.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_confirm.o : $(UIDIR)/ui_confirm.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_connect.o : $(UIDIR)/ui_connect.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_controls2.o : $(UIDIR)/ui_controls2.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_credits.o : $(UIDIR)/ui_credits.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_demo2.o : $(UIDIR)/ui_demo2.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_display.o : $(UIDIR)/ui_display.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_gameinfo.o : $(UIDIR)/ui_gameinfo.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_ingame.o : $(UIDIR)/ui_ingame.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_loadconfig.o : $(UIDIR)/ui_loadconfig.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_main.o : $(UIDIR)/ui_main.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_menu.o : $(UIDIR)/ui_menu.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_mfield.o : $(UIDIR)/ui_mfield.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_network.o : $(UIDIR)/ui_network.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_playermodel.o : $(UIDIR)/ui_playermodel.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_players.o : $(UIDIR)/ui_players.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_playersettings.o : $(UIDIR)/ui_playersettings.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_preferences.o : $(UIDIR)/ui_preferences.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_qmenu.o : $(UIDIR)/ui_qmenu.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_quit.o : $(UIDIR)/ui_quit.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_saveconfig.o : $(UIDIR)/ui_saveconfig.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_serverinfo.o : $(UIDIR)/ui_serverinfo.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_servers2.o : $(UIDIR)/ui_servers2.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_setup.o : $(UIDIR)/ui_setup.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_sound.o : $(UIDIR)/ui_sound.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_sparena.o : $(UIDIR)/ui_sparena.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_specifyserver.o : $(UIDIR)/ui_specifyserver.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_splevel.o : $(UIDIR)/ui_splevel.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_sppostgame.o : $(UIDIR)/ui_sppostgame.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_spskill.o : $(UIDIR)/ui_spskill.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_startserver.o : $(UIDIR)/ui_startserver.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_team.o : $(UIDIR)/ui_team.c; $(DO_CC) 
-$(SRCDIR)/ui/ui_video.o : $(UIDIR)/ui_video.c; $(DO_CC) 
-$(SRCDIR)/ui/q_math.o : $(GDIR)/q_math.c; $(DO_SHLIB_CC) 
-$(SRCDIR)/ui/q_shared.o : $(GDIR)/q_shared.c; $(DO_SHLIB_CC) 
-
-#############################################################################
-# MISC
-#############################################################################
-
-clean:
-	rm -f $(GVMASM)
diff --git a/code/unix/Quake3.kdelnk b/code/unix/Quake3.kdelnk
deleted file mode 100644
index 62a5f0e3..00000000
--- a/code/unix/Quake3.kdelnk
+++ /dev/null
@@ -1,12 +0,0 @@
-# KDE Config File
-[KDE Desktop Entry]
-Name=Quake3
-Name[C]=Quake3
-MimeType=
-Exec=/usr/local/games/quake3/linuxquake3
-Comment=Quake3: Arena by id Software
-Icon=quake3.xpm
-TerminalOptions=
-Path=
-Type=Application
-Terminal=0
diff --git a/code/unix/README.EULA b/code/unix/README.EULA
deleted file mode 100644
index 97c54a2d..00000000
--- a/code/unix/README.EULA
+++ /dev/null
@@ -1,184 +0,0 @@
-	LIMITED COMPATIBILITY TESTING AND RECREATIONAL
-	USE SOFTWARE TEST LICENSE AGREEMENT
-
-This Limited Compatibility Testing and Recreational Use Software Test
-License Agreement (the "Agreement") is a legal agreement between you, the
-end-user, and Id Software, Inc. ("ID").  BY CONTINUING THE INSTALLATION
-OF THIS TEST VERSION OF THE GAME PROGRAM ENTITLED QUAKE III: ARENA (THE
-"SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING
-THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR OTHER STORAGE,
-YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.
-
-1.	Grant of License.  Subject to the terms and provisions of this
-Agreement, ID grants to you the non-exclusive limited right to use this
-Software only in executable or object code form and only for the purpose
-of testing the compatibility of your computer system with the Software
-and for non-commercial, recreational purposes.	The term "Software"
-includes all elements of the Software such as data files and screen
-displays.  You are not receiving any ownership or proprietary right,
-title or interest in or to the Software or the copyright, trademarks, or
-other rights related thereto.  For purposes of this section, "use" means
-loading the Software into RAM and/or onto computer hard drive, as well
-as installation of the Software on a hard disk or other storage device.
-You agree that the Software will not be shipped, transferred or exported
-into any country in violation of the U.S. Export Administration Act (or
-any other law governing such matters) by you or anyone at your direction
-and that you will not utilize and will not authorize anyone to utilize,
-in any other manner, the Software in violation of any applicable law.
-The Software may not be downloaded or otherwise exported or reexported
-into (or to a national or resident of) any country to which the U.S. has
-embargoed goods or to anyone or into any country who/which are prohibited,
-by applicable law, from receiving such property.
-
-2.	Prohibitions. You, either directly or indirectly, shall not do
-any of the following acts:
-
-a.	rent the Software;
-
-b.	sell the Software;
-
-c.	lease or lend the Software;
-
-d.	offer the Software on a "pay-per-play" basis;
-
-e.	distribute the Software (except by electronic means, as permitted
-by section 3. hereinbelow) by any means, including, but not limited to
-direct mail, retail, mail order or other means;
-
-f.	in any other manner and through any medium whatsoever commercially
-exploit the Software or use the Software for any commercial purpose;
-
-g.	disassemble, reverse engineer, disassemble, decompile, modify
-or alter the Software;
-
-h.	translate the Software;
-
-i.	reproduce or copy the Software (except as permitted by section
-3. hereinbelow);
-
-j.	publicly display the Software; 
-
-k.	prepare or develop derivative works based upon the Software; 
-
-l.	remove or alter any legal notices, such as trademark and copyright
-notices, affixed on or within the Software; or
-
-m.	create or develop extra or add-on levels for the Software.
-
-3.	Permitted Electronic Distribution and Copying.	So long as this
-Agreement accompanies the Software at all times, ID grants to you the
-limited right to distribute, free of charge, and by electronic means
-only, the Software.  Anyone who receives the Software shall be limited to
-all the terms and conditions of this Agreement.  You may make only the
-following copies of the Software:   (i) you may download the Software
-from the Internet and onto your computer hard drive; (ii) you may copy
-the Software from your computer hard drive into your computer RAM; and
-(iii) you may make one (1) "back up" or archival copy of the Software
-on one (1) hard disk.
-
-4.	Copyright.  The Software and all copyrights, trademarks and all
-other conceivable intellectual property rights related to the Software
-are owned by ID and are protected by United States copyright laws,
-international treaty provisions and all applicable law, such as the
-Lanham Act.  You must treat the Software like any other copyrighted
-material, as required by 17 U.S.C., ¤101 et seq. and other applicable law.
-You agree to use your best efforts to see that any user of the Software
-licensed hereunder complies with this Agreement.  You agree that you
-are receiving a copy of the Software by license only and not by sale and
-that the "first sale" doctrine of 17 U.S.C. ¤109 does not apply to your
-receipt or use of the Software.
-
-5.	NO WARRANTIES.	ID DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECT TO
-THE SOFTWARE.  ID DOES NOT WARRANT THAT THE OPERATION OF THE SOFTWARE
-WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE WILL MEET YOUR
-SPECIFIC REQUIREMENTS.	ADDITIONAL STATEMENTS SUCH AS PRESENTATIONS,
-WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY ID AND SHOULD
-NOT BE RELIED UPON.
-
-6.	Governing Law, Venue and Liability Limitation.	This Agreement
-shall be construed in accordance with and governed by the applicable laws
-of the State of Texas and applicable United States federal law.  Copyright
-and other proprietary matters will be governed by United States laws and
-international treaties.  Exclusive venue for all litigation regarding
-this Agreement shall be in Dallas County, Texas and you agree to submit to
-the jurisdiction of the courts in Dallas, Texas for any such litigation.
-IN ANY CASE, NEITHER ID NOR ID'S OFFICERS, EMPLOYEES, DIRECTORS, AGENTS,
-LICENSEES, SUBLICENSEES, SUCCESSORS OR ASSIGNS SHALL BE LIABLE FOR LOSS OF
-DATA, LOSS OF PROFITS, LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL,
-INDIRECT, PUNITIVE OR OTHER SIMILAR DAMAGES ARISING FROM BREACH OF
-WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT PRODUCT  LIABILITY,
-OR OTHER LEGAL THEORY EVEN IF ID OR ITS AGENT HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES OR EVEN IF SUCH DAMAGES ARE FORESEEABLE,
-OR LIABLE FOR ANY CLAIM BY ANY OTHER PARTY.  Some jurisdictions do not
-allow the exclusion or limitation of incidental or consequential damages,
-so the above limitation or exclusion may not apply to you.
-
-7.	U.S. Government Restricted Rights. To the extent applicable,
-the United States Government shall only have those rights to use the
-Software as expressly stated and expressly limited and restricted in
-this Agreement, as provided in 48 C.F.R. ¤¤ 227.7202-1 through 227.7204,
-inclusive.
-
-8.	General Provisions.  A copy of all notices or other correspondence
-which you send to ID shall also be sent by you to ID's counsel:
-
-D. Wade Cloud, Jr.
-HIERSCHE, MARTENS, HAYWARD, DRAKELEY & URBACH, P.C.
-15303 Dallas Parkway, Suite 700
-Dallas, TX 75248
-(972) 701-7000
-Facsimile:   (972) 701-8765
-
-Neither this Agreement nor any part or portion hereof shall be assigned
-or sublicensed by you.  ID may assign its rights under this Agreement
-in ID's sole discretion.  Should any provision of this Agreement
-be held to be void, invalid, unenforceable or illegal by a court,
-the validity and enforceability of the other provisions shall not be
-affected thereby.  If any provision is determined to be unenforceable,
-you agree to a modification of such provision to provide for enforcement
-of the provision's intent, to the extent permitted by applicable law.
-Failure of ID to enforce any provision of this Agreement shall not
-constitute or be construed as a waiver of such provision or of the right
-to enforce such provision.  If you fail to comply with any term of this
-Agreement, YOUR LICENSE IS AUTOMATICALLY TERMINATED, WITHOUT NOTICE AND
-ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU WHICH ARE AVAILABLE
-UNDER APPLICABLE LAW AND/OR THIS AGREEMENT.  You agree that in the event
-of litigation relating to this Agreement, the prevailing litigant shall
-be entitled to recover the prevailing litigant's attorneys' fees and
-expenses and costs of court in addition to all other relief available
-under this Agreement and/or applicable law.  In the event this Agreement
-is terminated, you shall have no right to use the Software, in any manner
-and you shall immediately destroy all copies of the Software in your
-possession, custody or control.  You agree that your unauthorized use
-of any ID property, whether in whole or in part, would immediately and
-irreparably damage ID such that ID could not be adequately compensated
-by an award of monetary damages, and in the event of such threatened
-or actual unauthorized use ID shall be entitled to an injunctive order
-appropriately restraining and/or prohibiting such unauthorized use
-without the necessity of ID posting bond or other security.
-
-YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS
-AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE INSTALLATION OF THE
-SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR COPYING
-THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR RAM, YOU AGREE TO BE BOUND
-BY THE TERMS AND CONDITIONS OF THIS AGREEMENT.  YOU FURTHER AGREE THAT,
-EXCEPT FOR WRITTEN SEPARATE AGREEMENTS BETWEEN ID AND YOU, THIS AGREEMENT
-IS A COMPLETE AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF
-THE PARTIES HERETO.  THIS AGREEMENT SUPERSEDES ALL PRIOR ORAL AGREEMENTS,
-PROPOSALS OR UNDERSTANDINGS, AND ANY OTHER COMMUNICATIONS BETWEEN ID
-AND YOU RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT.
-
-
-
-April 23, 1999     5:11 p.m.
-
-
-
-
-
-LIMITED COMPATIBILITY TESTING AND RECREATIONAL USE SOFTWARE
-TEST LICENSE AGREEMENT	Page 4
-3406.0586\C:\DWC\DOC\2082.DOC
-
diff --git a/code/unix/README.Linux b/code/unix/README.Linux
deleted file mode 100644
index 05822e60..00000000
--- a/code/unix/README.Linux
+++ /dev/null
@@ -1,352 +0,0 @@
-+----------------------------------------+
-| Q3Test                                 |
-| The Official Quake 3: Arena TEST       |
-| Linux version                          |
-| Revision 1.08                          |
-| Released Aug 3, 1999                   |
-| Copyright (C) 1999 id Software, inc.   |
-+----------------------------------------+
-| Documentation: Paul Jaquays            |
-|                Dave Kirsch             |
-+----------------------------------------+
-
-Outline:
-
-1.  Introduction
-2.  Bug Reporting
-3.  Installing Q3Test
-4.  Running Q3Test.  Operating Instructions
-5.  Known Issues
-
-==================
-== Section 1.   ==
-== INTRODUCTION ==
-==================
-
-This is the Linux version of the test.
-
-Before proceeding onward, please read the README.EULA file. This is
-the End User License Agreement. It's the agreement between you and id
-regarding this test.  Read it. Understand that the acts of loading or
-running the software, or placing it on your computer hard drive, RAM,
-or other storage, you are agreeing to be bound by the terms of the End
-User License Agreement. So it's best to know what you are agreeing to.
-
-The operating instructions for the test are included in the 
-separate "README.Q3Test" file.  For the most part, the game functions
-are the same across all platforms.  Differences will be noted when necessary.
-
-+----------------+
-| THIS IS A TEST |
-+----------------+
-
-We want to set the record straight from the outset. This is neither a
-demo nor an ALPHA version of the final game and should not be expected
-to behave as such. Q3Test is a test of Quake3: Arena's network technology
-and graphics compatibility. While many of the game features that you will
-see in this test are in a highly polished state, do not confuse this with
-being anything other than what it is intended to be: a test. By running
-this test openly on the Internet and on a multitude of local networks,
-we hope to expose problems that could not otherwise be discovered on the
-limited number of in-house systems and computer. That's why we need your
-assistance for this test.
-
-Furthermore, it is anticipated that there may be revisions and additions
-made to the test that will make it incompatible with earlier versions.
-
-+---------------------+
-| SYSTEM REQUIREMENTS |
-+---------------------+
-
-There is no software-only version of the game. If your computer is not
-hardware accelerated with a game compatible graphics card, you will NOT be
-able to run Q3Test. Currently, 3DFX based cards are the only
-tested compatible cards. If your computer does not meet the 
-minimum requirements, you are unlikely to be able to run a satisfactory 
-game experience.
-
-A glibc compatible Linux installation is required.  An easy to determine
-if you have glibc support is to type this:
-
-	ls -l /lib/libc*
-
-If you get a report of libc6 (you may also have libc5), you have a
-glibc based system.
-
-The Linux version requires a supported hardware 3D acceleration card. The
-following are currently supported:
-
-        o 3Dfx Voodoo Graphics based cards
-        o 3Dfx Voodoo2 based cards
-
-Other cards of similar make and model may work, but are not supported.
-
-Other X11 OpenGL libraries may work with a supported hardware
-accelerator, but have not been extensively tested.  Performance on
-untested OpenGL configurations may not produce acceptable game
-speed.
-
-For 3Dfx based products, Linux Q3Test is distributed with a version of Mesa
-3-D specifically compiled for Voodoo support. You must have 3Dfx Linux Glide
-drivers installed however. These drivers are available from:
-
-		http://glide.xxedgexx.com/3DfxRPMS.html
-
-Make sure that you download and install the glibc versions of the drivers
-(found at the bottom of the page).
-
-Mirrors for this site are can be found at:
-
-		http://glide.mirrors.sonic.net 
-		http://glide.samiam.org 
-
-Please follow the installation instructions presented there for adding the
-correct drivers for your 3D-acceleration card. Note that there are two ways
-to install the 3DFX drivers-one with support for a /dev/3dfx device that
-does not require root permissions in order to use the card. If you choose to
-not use the /dev/3dfx method, you will have to run Q3Test as the root user.
-
-NOTE:  Linux Q3Test will try to load "libGL.so" before using 3Dfx drivers.
-This can cause problems if you have a software or third party OpenGL driver
-installed.  You can specifically target the included 3Dfx based Mesa driver
-by using the following command line:
-
-	./linuxquake3 +set r_glDriver libMesaVoodooGL.so.3.1
-
-For 3DFX users, you may disable the vertical sync refresh.  This can improve
-proformance at the cost of some visual tearing of the image.  Entering the
-following command into your shell before running Q3Test will turn off
-the vertical sync:
-
-	export FX_GLIDE_SWAPINTERVAL=0
-
-Then run Linux Q3Test from the same command line normally.
-
-+-----------+
-| X11 Setup |
-+-----------+
-
-Linux Q3Test requires X11 to run. There is no console-based version as in
-previous id products such as GLQuake and Quake2. XFree86 version 3.2 or
-later is required.
-
-There are two ways that mouse input is handled under XFree86:
-
-        o By default, Q3Test will attempt to use DGA mouse handling. DGA
-          support features direct reading of the mouse motion and provides
-          more accurate control while playing the game. By default this
-          support is enabled, but can be disabled by adding "+set
-          in_dgamouse 0" to the command line at startup.
-        o The non-DGA method of mouse input uses pointer grabbing and warps
-          the pointer to the middle of the window on each mouse update. On
-          systems with a slow frame rate and a lot of mouse user input, the
-          motion can get "clipped" to the window boundaries. This method of
-          input is more compatible however.
-
-Q3Test uses the XFree86 VidModeExtension facilities if available to provide
-fullscreen play. This does not apply to 3Dfx passthrough based cards, since
-the passthrough cable takes over the video display upon activation anyway.
-
-When configuring your X11 server, make sure that you include lower
-resolution modes such as 640x480 and 800x600. Q3Test will auto-switch to
-these modes using the VidModeExtension if you select fullscreen from the
-graphics options menu. If the lower resolution modes are not listed in the
-XFree86 configuration file, Q3Test will be unable to switch to the desired
-resolution for fullscreen play.
-
-+-------------------------+
-| Sound Support and Setup |
-+-------------------------+
-
-Q3Test uses the /dev/dsp sound device for sound support under Linux. This is
-the default device provided by the sound drivers included with the Linux
-kernel. Please note that at the time of this writing, PCI based sound cards
-such as the SoundBlaster Live and Diamond Monster MX series were not
-supported. They may be supported in the future. Check
-http://www.opensound.com/ for support in the future.
-
-If you do not run Q3Test as root (recommended), you may need to make sure
-the permissions for the /dev/dsp device are read and write by the user
-running Q3Test. The cheap and easy way to make this happen is to do "chmod
-o+rw /dev/dsp" as root. For the more security conscious, a special sound
-group could be created and Q3Test could be made setgid to the sound group to
-access the device.
-
-Q3Test uses mmap() to map the sound buffers on /dev/dsp directly in order to
-provide responsive sound needs. Sound cards must be able to support this
-feature in order to work. SoundBlaster 16, AWE32 and AWE64 cards are known
-to work.
-
-+----------------------+
-| WHAT'S IN THIS TEST? |
-+----------------------+
-
-We have included three maps with this test version of Quake3: Arena. They
-are q3test1, q3test2,  and q3tourney.
-
-q3test1    for 4-8 players    on Internet or LAN play   Best with 6 players
-q3test2    for 3-8 players    Primarily for LAN play    Best with 3 players 
-q3tourney is the tournament map
-
-===================
-== Section 2.    ==
-== BUG REPORTING ==
-===================
-
-What we would like from our testers are emails with descriptions of
-problems that are encountered, particularly those involving video or
-network bugs. Do NOT send reports to individual id employees.  All bug
-reports should go to the following e-mail address:
-
-q3feedback@idsoftware.com
-
-In your subject line, please describe the system the game is being played
-on (Mac, Linux, Win32) and the type of problem you are reporting: video,
-network, sound or game. Example Subject Line:  "Mac/video problem" or
-"Linux/network connection problem."
-
-In the body of your letter (no attached files please), briefly list and
-describe the problems.  Detailed descriptions of problems are good, but
-remember that brevity is best. Please do NOT send screen shots unless
-they are the ONLY way to show a problem.
-
-While we realize that you may have comments and suggestions regarding
-specific game play features, please refrain from submitting such along
-with bug reports. Comments on game play can be made on the official
-Quake 3: Arena message board at:
-
-http://www.quake3arena.com 
-
-========================
-== Section 3.         ==
-== INSTALLING Q3TEST  ==
-========================
-
-After you have installed the needed hardware drivers for your 3D
-acceleration and sound hardware, you need to install the Q3Test package.
-
-Q3Test is available as a Red Hat RPM file or as a tar file. To install the
-RPM file, enter the following when logged in as the root user:
-
-rpm -Uvh q3test-1.00-glibc-1.i386.rpm
-
-The rpm installs the game and data files in /usr/local/games/q3test.
-
-[ Note: If you have not installed (or do not wish to install) the Linux
-glide drivers, you may get an error message about not having libglide2x.so 
-installed.  This can be ignored and installation can be forced by adding 
-the --nodeps option to the rpm command line as follows: 
-rpm --nodeps -Uvh q3test-1.00-glibc-1.i386.rpm ]
-
-If you are going to install the tar version, make a directory for
-installation, untar the file as follows:
-
-tar xzvf q3test-1.00-glibc-i386.tar.gz
-
-This will untar the files into a q3test subdirectory under the current
-directory.
-
-====================
-== Section 4.     ==
-== RUNNING Q3TEST ==
-====================
-
-It is recommended that you do not run Q3Test using the root account or with
-root privileges. There are two exceptions to this:
-
-        o If you are using a 3Dfx based accelerator card and do not install
-          the /dev/3dfx configuration option. (You will have to run as root
-          in order to access the card).
-        o If you do not have access to the /dev/dsp device and do not wish
-          to change the mode of the device so that non-root accounts can
-          access it.
-
-You will have to be running under X11 or have the DISPLAY variable pointed
-to a OpenGL glX capable X Server.
-
-By default, Q3Test tries to find the following OpenGL libraries in this
-order:
-
-        o libGL.so.1
-        o libMesaVoodooGL.so.3.1
-
-You can override the library name by entering, "+set r_glDriver <libname>"
-on the command line. This may be needed if you are using a non-standard set
-up and have a different name for the OpenGL shared library.
-
-If everything proceeds successfully, you should have a Q3Test window on your
-desktop with a menu displayed (3DFX owners will get a full screen view). If
-you want to use full screen, go to the System Configuration, Graphics
-Options, Fullscreen, change the value to Yes, and hit enter to apply it.
-
-If you intend to connect to the Internet to play Q3Test, make certain
-that your net connection is open and working first.
-
-======================
-== Section 5.       ==
-== KNOWN ISSUES     ==
-======================
-
-Q. My mouse is erratic. My player is constantly looking up or down and
-I can't seem to move him.
-
-A. This happens with two issues. Some versions of XFree86 have a bug in
-DGA mouse handling that confuses Q3Test. You can try turning off DGA mouse
-support by entering "+set in_dgamouse 0" on the command line when you
-start Q3Test. This problem can also occur after a restart of the video
-system (such as after a graphic setting change). This is because some
-sort of event occurred to jam up the mouse. Restarting the video system
-another time and not moving the mouse during the restart should clear it.
-
-
-Q. When I do a video restart (for example, selecting Apply in the Graphics
-Options menu), Q3Test exits with a Sig11.
-
-A. This is a driver related problem.  
-On 3DFX hardware that is using the /dev/3dfx device and you are NOT running 
-as root, it seems that the restart doesn't clear some sort of permission. 
-Running Q3Test as root will fix this problem.  
-
-
-Q. Performance is so slow I can't play! The frame rate looks like one
-frame per second!
-
-A. Most of the current drivers for Linux do not support hardware
-acceleration at any bit depth other than 15 or 16 bit color. Make sure
-that you specify 16 bit color when you run your X11 Server, such as:
-
-	startx -- -bpp 16
-
-
-Q. I have a Voodoo3.  When I start the game, I send up at a low resolution
-version of my desktop.
-
-A. The current Voodoo3 X11 Servers have problems with DGA Mouse support.
-This is a known driver issue and will be fixed in newer revisions of the
-Voodoo3 X11 Server.  Run the game with the following to disable it:
-	./linuxquake3 +set in_dgamouse 0
-
-
-Q. I'm running Gnome with Englightenment and sound doesn't work.
-
-A. If you are using the Enlightenment Sound Daemon (esd), it will not release
-the sound hardware for Quake3 Test's usage.  You can disable it before running
-the test as follows:
-		esdctl off  # turn it off
-		start q3test the normal way
-		esdctl on   # turn it back on
-
-
-Q. I try to run Q3Test, but sound doesn't work.  The console says "Can't
-open /dev/dsp.  /dev/dsp:  Can't allocate memory."
-
-A. This can happen if the vmware kernel modules are loaded.  You can unload
-them by typing when logged as root:
-	/etc/rc.d/init.d/vmware stop
-Assuming you are using a RedHat system.
-
-
-Q. I was playing Q3Test and suddenly it quit and reported a signal error.
-
-A. This is probably a bug. Please report it.
-
diff --git a/code/unix/README.Q3Test b/code/unix/README.Q3Test
deleted file mode 100644
index 65ddef27..00000000
--- a/code/unix/README.Q3Test
+++ /dev/null
@@ -1,306 +0,0 @@
-+----------------------------------------+
-| Q3Test                                 |
-| The Official Quake 3: Arena TEST       |
-| Operating Instructions Readme	     |
-| Revision 2.1                           |
-| Released Friday July 16th, 1999      |
-| Copyright (C) 1999 id Software, inc.   |
-+----------------------------------------+
-| Documentation: Paul Jaquays            |
-+----------------------------------------+
-
-This game is not yet rated by the ESRB. It contains animated
-violence and blood.  A rating for mature audiences 17+ is 
-anticipated.
-
-1.  Introduction
-2.  Operating Instructions
-3.  Status Readouts
-4.  Player Actions
-5.  The Arena Environment
-6.  The Game Console
-7.  Problem Icons
-
-==================
-== Section 1.   ==
-== INTRODUCTION ==
-==================
-
-	These instructions for game play should work with the versions of the game that are targeted at different platforms.
-
-	Before proceeding onward, click on the EULA_Readme file icon. This is the End User License Agreement. It's the agreement between you and id regarding this test.  Read it. Understand that the acts of loading or running the software, or placing it on your computer hard drive, RAM, or other storage, you are agreeing to be bound by the terms of the End User License Agreement. So it's best to know what you are agreeing to.
-
-	If you agree to the conditions of the End User License Agreement, install the game on your computer's hard drive.
-	If you are using the Win32 version, open the readme file included for GLSetup.  This application will load the most recent versions of the GL drivers needed to play Quake3: Arena.
-
-	The platform-specific instructions for the test are included in a separate Readme file. Refer to the appropriate Readme for your hardware.
-
-+----------------+
-| THIS IS A TEST |
-+----------------+
-	We want to set the record straight from the outset. This is neither a demo nor an ALPHA version of the final game and should not be expected to behave as such. Q3Test is a test of Quake3: Arena's network technology and graphics compatibility. While many of the game features that you will see in this test are in a highly polished state, do not confuse this with being anything other than what it is intended to be: a test. By running this test openly on the Internet and on a multitude of local networks, we hope to expose problems that could not otherwise be discovered on the limited number of in-house systems and computers we have available. That's why we need your assistance for this test.
-
-	Furthermore, it is anticipated that there may be ongoing revisions and additions made to the test that will make it incompatible with earlier versions.
-
-============================
-== Section 2.             ==
-== OPERATING INSTRUCTIONS ==
-============================
-
-	When you start Q3Test, the game does not automatically load a map. Instead it displays the Main Menu screen.  At this point (or at any time during the game) you may adjust and customize the video and audio settings on your computer, change details regarding your game character, and if desired, change the default controls to ones more to your liking.
-
-At any time during the game, press the Escape key to bring up the Main menu and superimpose it over the game screen. Use the up and down arrow keys to navigate the menu, and press the Enter key to select a function. Press Escape to return to the main level menu (and set any selected choices). Each Main menu function brings up a list of secondary menu items. If you have problems using the secondary menu selections, please refer to the message banner at the bottom of the screen for technical details.
-
-If a menu selection appears in gray, you cannot select or modify it.  Choosing some options in the CONTROL CUSTOMIZATION and GRAPHICS OPTIONS menus will disallow other options. This is because they are either unnecessary (as is the case with MOUSE LOOK if you select the FREE LOOK option), or are not supported (as is the case with COLOR DEPTH if you chose the VOODOO OPENGL).
-
-+-----------+
-| MAIN MENU |
-+-----------+
-The first three Main Menu options, SEARCH FOR LAN GAME, CONNECT TO NETWORK GAME and START NETWORK GAME are only available if the player is not currently connected to an ongoing game.
-
-SEARCH FOR LAN GAME:
-If your computer is on a Local Area Network (LAN), this will show any currently active Q3Test servers on the network, along with the number of players currently in the game and the maximum number of players that can be in that game.  
-
-Example:  idserver   q3test1   1/8
-
-This indicates that the server on the LAN called "idserver" is currently playing the map "q3test1" and has one player in it out of the possible 8 that can be in the game at one time.
-
-Use the up/down arrow keys to select a server and hit ENTER to command your computer to connect to that game.
-
-CONNECT TO NETWORK GAME: 
-	SERVER: If your computer is connected to the Internet, you can enter the IP address of a server and hit ENTER to attempt to make a connection to that server. For server id's Q3Test server listings, go to http://www.quake3arena.com or check with your favorite 3D gaming web sites for other servers.
-	RATE:  Set the type of network connection you are using. Choices are: "<=28.8K", "33.6K", "56K", "ISDN", and "LAN/cable/xDSL".
-
-START NETWORK GAME:
-To start a network game, whether on a LAN or over the Internet, select this option.  The secondary menu screen has the following options:
-
-START: Launches the game using the parameters currently set on this menu.
-MAP:  This gives access to the list of maps located in the Quake3/Baseq3/Maps directory/folder.  For the purposes of this test, there are only two maps. Use the left and right arrow keys to toggle between the two maps.
-DEDICATED: This is either "no", "dedicated LAN," or "dedicated Internet."
-A dedicated server (set to YES) runs the game, but does not display a graphic version of the game on the screen of the computer running the game. The default value for this is no. This means that you are running the server and participating as a player at the same time.
-TIME LIMIT: entering a non-zero number here sets a time limit (in minutes) for the game duration.  If the game has not ended because a frag limit has been set, then it will end when time runs out.
-FRAG LIMIT: Entering a non-zero number here sets the number of "frags" or "kills" needed to win the game. If the game has not ended because a time limit has been set, then it will end when one player in the game reaches this number of frags.
-MAX PLAYERS: This is the total number of players that may be in the game at any one time.
-HOSTNAME:  This is the name of the server.  In the LAN example above, the hostname is "idserver."
-
-CUSTOMIZE PLAYER: 
-Allows the player to change information about his in-game persona.
-
-NAME: This is the player's name as it will appear on-screen during the game. It may be up to 33 characters long.
-
-SKIN: Visor is the only model in the test. Two skins (red and blue) are available for the model. Use the left and right arrow keys to select one.
-
-EFFECTS COLOR: You can choose an identifying color for your rail gun projectile trails.  Use the left and right arrow keys to select a color. 
-
-HANDICAP: Better players can choose to handicap themselves to balance a match against players of less skill by limiting the maximum amount of health and armor that they can have during the game. Use the left and right arrows to select a value from 25 to 100 points.  Certain items and power ups will temporarily raise this value, but will then count down to the preset value. The default is 100.
-
-CUSTOMIZE CONTROLS: 
-Allows the player to change the assignment of game controls to other keyboard and mouse buttons.  When you visit this menu for the first time, the default assignments for all controls are shown.  To change an assignment, use the up/down arrow keys to select a game function. Press ENTER to activate the change process. Press the keyboard key or mouse input that you want to use for that function.  Up to two keys/buttons may be assigned to each game function in this manner by repeating the process. If you inadvertently use a key assigned to another function, three question marks ("???") appear next to the function that previously used that key.
-
-ALWAYS RUN: setting this to YES causes your player to move faster, but make more noise as he moves. The RUN/WALK key allows the player to switch between fast/noisy and slow/silent movement modes.
-FREELOOK:  If YES, then you may look freely in all directions as if you were moving only your head by moving the mouse around.  If this is Set to NO you must bind a key to mouse look.
-INVERT MOUSE: Selecting YES inverts the up and down view movement directions.
-MOUSE SPEED: This is set on the menu with a slide control. The faster your mouse speed, the greater the on-screen response to small movements of the mouse.  Mouse speed can also be adjusted from the console.  Bring the console down and type in "sensitivity".  The game will respond by printing "sensitivity" is: "__" (the blank indicating the number value currently assigned to mouse speed) default is "5". Use the up arrow key to display sensitivity on the console again, enter a different number value and hit enter.  Higher numbers are more sensitive.  Lower numbers are less sensitive.
-
-SYSTEM CONFIGURATION:
-EFFECTS VOLUME: Use the slide control to adjust game sound playback volume to your liking.
-SOUND QUALITY: Select either Low (16 bit sound running at 11 megahertz) or High (32 bit sound running at 22 megahertz).
-BRIGHTNESS:  First, try running the game with the brightness set to 1.0 (the default level used by the designer when making the map).  If the map is too dark to see in dimly lighted areas or too light in sunny areas, use this slide control to compensate for differences in the way some monitors and video cards draw the game world.  Remember that the arenas are supposed to be dark and foreboding places.
-
-GRAPHICS OPTIONS: 
-This drops you down into another menu layer. The controls here are designed to help you optimize graphics and or/enhance the game's playability on your system. When you are satisfied with your selections, you must move the cursor to the bottom of the screen to the APPLY option to activate them.  Pressing Escape to return to the SYSTEM CONFIGURATION MENU does not activate changes in the graphics settings. Changing anything on this menu will cause the game to restart the video.
-
-GRAPHICS MODE: This is a global setting for the display of the game's screen graphics.  The settings are HIGH QUALITY, NORMAL, FAST, FASTEST, and CUSTOM. Selecting one of these choices affects most of the other settings on this page. If you make any adjustments to other settings on this page, the graphics mode changes to CUSTOM.
-DRIVER:  Consult the platform specific readme for the drivers that will work with your platform. 
-VIDEO MODE:  This is the screen resolution size.  Smaller resolutions can improve performance speed on slower machines.
-COLOR DEPTH: Determines whether you are using 16-bit textures or 32-bit textures. Default means you run with the color depth currently set for your computer's desktop.
-FULLSCREEN: A YES selection allows you to choose to run with the test filling the entire screen.  A NO selection will run the game in a window.  If run in a window, COLOR DEPTH is disabled because you are limited to whatever has been selected for the desktop.
-LIGHTING:  Allows you to chose either a LIGHTMAP or VERTEX lighting.  Using the LIGHTMAP is recommended for best appearance.  VERTEX lighting may improve game performance, but at a cost to appearance.
-GEOMETRIC DETAIL: Lets you adjust the number subdivisions used to define curves in the arena on both world geometry and items, weapons and characters.  HIGH is the normal setting. LOW greatly reduces curve complexity.
-SCREEN SIZE: The slide control changes the amount of screen area devoted to display of the game.  Reducing screen size can improve performance.
-TEXTURE DETAIL: This sliding control allows you to adjust the level of detail displayed. Unless you have an extremely fast computer, the normal setting gives the best balance of detail vs. game speed.
-TEXTURE QUALITY:  This determines whether you wish to use 32-bit textures, 16-bit textures, or compressed textures.  Many of the game's special effects will appear at their best only when defined by 32-bit textures.
-OPENGL EXTENSIONS: Allows you to enable or disable OPENGL extensions.
-DRIVER INFORMATION: Brings up a display of information regarding the drivers currently operating in your machine. It is not interactive. Hit ESC to return to the previous menu.
-
-
-PREFERENCES:  Hitting ENTER here will drop you into another menu that allows you to adjust other game features.
-CROSSHAIR: choose one of four options, none, cross, dot, or angle.
-MARKS ON WALLS: Enable or Disable weapons scars and blood smears.  Disabling this feature may improve performance.
-DYNAMIC LIGHTS:  Enable or Disable lights that move through the world (such as light generated by weapon projectile trails). Disabling this feature may improve performance.
-LIGHT FLARES: Enable or DISABLE glowing light halos around lights.  Disabling this feature may improve performance.
-IDENTIFY TARGET: Enable or Disable the ability to see the name of your foe when you put your crosshair on him (does not function if target is in fog).
-SKY: Set the sky for either HIGH SPEED or HIGH QUALITY.
-
-RESET DEFAULTS: Restore all game settings and controls to their default value by reloading the default configuration.
-
-APPLY:  You must select this and hit ENTER to lock in your choices.  Doing so will restart the game video.
-
-SCREENSHOT: 
-Makes a targa file screen shot of what is currently in view on the screen. Look for it in the Screenshot folder within your Quake 3/Baseq3/screenshots folder.
-
-LEAVE ARENA: 
-This disconnects you from the arena you are currently playing, but does not quit you out of the game.  From here you can connect to other servers or start your own. You can also leave an arena by typing "disconnect" on the command line of the console.
-
-QUIT GAME: 
-Returns you to the desktop.
-
-
-======================
-== Section 6.       ==
-== STATUS READOUTS  ==
-======================
-
-	Your player status is shown as numbers and icons floating in your view at the bottom of the screen.  There is an indicator for your ammo (far left) including the type of ammo currently in use, current health (left-center), your character portrait (center), armor (center-right), and Frag Count (far right). The digital timer in the upper right shows the amount of time you have been in this arena.  When you have a one-use item in your inventory (such as the personal teleporter), its icon will appear on the right side of your display.  When you are fragged, the character portrait and name of the foe who killed you appears in the upper right corner of the display.  When you change weapons, icons representing the ammo of the weapons in your inventory will appear above your character portrait. If you have a weapon, but no ammunition for it, a negation symbol will be superimposed over the ammo icon.
-
-+----------------------------+
-| INTERPRETING THE LAGOMETER |
-+----------------------------+
-     The Lagometer is the graph in the lower right corner of the status display. It is a test function and not a part of regular game play.  The upper graph (blue/yellow) slides one pixel for every rendered frame. Blue lines below the baseline mean that the frame is interpolating between two valid snapshots. Yellow lines above the baseline mean the frame is extrapolating beyond the latest valid time. The length of the line is proportional to the time. 
-The lower graph (green/yellow/red) slides one pixel for every received snapshot. By default, snapshots come 20 times a second, so if you are running >20 fps, the top graph will move faster, and vice versa. A red bar means the snapshot was dropped by the network. Green and yellow bars are properly received snapshots, with the height of the bar proportional to the ping. A yellow bar indicates that the previous snapshot was intentionally suppressed to stay under the rate limit. 
-The upper graph indicates the consistency of your connection. Ideally, you should always have blue bars of only a pixel or two in height. If you are commonly getting big triangles of yellow on the graph, your connection is inconsistent. 
-     In a heavy firefight, it is normal for modem players to see yellow bars in the bottom graph, which should return to green when the action quiets down. If you are getting several red bars visible, you may want to look for a server that drops less packets. 
-     There are a few tuning variables for people trying to optimize their connection: The most important one is "rate", which is what the connection speed option in the menu sets. We are fairly conservative with the values we set for the given modem speeds: 2500 for 28.8, 3000 for 33, and 3500 for 56k. You may actually be connecting faster than that, and modem compression may be buying you something, so you might get a better play experience by increasing the values slightly.  If you connect at 50000 bps, try a rate of 5000, etc. Quake 3 errs on the conservative side, because too low of a rate will only make the movement of other things in the world choppy, while too high of a rate can cause huge amounts of lag. 
-     Note that the optimal rate will be somewhat lower than a rate for QW or Q2, because Quake 3 now includes the UDP packet header length in the bandwidth estimate.  You can ask for a different number of snapshots by changing the "snaps" variable, but there isn't a lot of benefit to that. Dedicated servers run at 40hz, so stick to divisors of that: 40, 20 (default), 10. A "snaps" of 40 will usually just cause you to hit your rate limit a lot faster. It may be useful for tuning rate, if nothing else. 
-     You can adjust the local timing point with "cg_timenudge ", which effectively adds local lag to try to make sure you interpolate instead of extrapolate. If you really want to play on a server that is dropping a ton of packets, a timenudge of 100 or so might make the game smoother. 
-
-=====================
-== Section 7.      ==
-== PLAYER ACTIONS  ==
-=====================
-
-	The descriptions below are based on the preset default configurations for the game controls.  If you have played first person shooting games previously (such as Quake or Quake 2), you may want to reconfigure the controls to match your preferences.
-
-+----------+
-| ACTIONS  |
-+----------+
-WALKING:  Use the four arrow keys or the mouse to walk around.  To walk steadily forward, hold down the "forward" key (the up arrow or center button on a 3-button mouse).  Turn left or right with the left or right arrow keys, or by sliding your mouse in the desired direction.
-
-RUNNING:  To run, simply hold down the left Shift key to increase your 
-Speed (unless you have selected "Always Run", in which case it reverts you to a walk.  If you prefer to always run during the game, open the Main menu, then the Customize Controls menu, and select Always Run.
-
-SHOOTING:  Tap the Ctrl key or the left mouse button to fire. Hold the 
-fire key down to keep firing.
-
-LOOKING UP AND DOWN: The letters A and Z allow you to look up and down, 
-respectively.  Start walking forward and your line of vision will 
-automatically readjust to the center position.  You may also choose to 
-select Free Look under the Controls menu which will allow you to move the 
-mouse around as if it was your head movement.
-
-SWIMMING:  While underwater, aim yourself in the direction you wish to go 
-and press the forward key to go in that direction.  Unfortunately, as in 
-real life, you may lose your bearings while underwater.  Use the jump key, 
-(default is the Space Bar), to kick straight up towards the surface. Once on 
-the surface, tread water by holding down the jump key.  To get out of the 
-drink, swim toward the shore and you can either jump up onto the land or 
-walk straight out if it is shallow enough.  There is always a way out of 
-water, but you may have to submerge even deeper in order to find it.
-
-CROUCHING:  Press and hold down the C key to duck and move forward to "duck walk."  When you release the C key, you will return to an upright position.  It is also possible to avoid rockets in this manner.
-
-JUMPING:  Tap the space bar to jump.  You jump farther if you're moving 
-forward at the time.
-
-STRAFING:  Hold down the ALT key and the left or right arrow key and you will side-step in that particular direction. This is perfect for avoiding incoming weapon attacks.
-
-PICKING UP OBJECTS: To pick up items, weapons, and power-ups, simply walk 
-over them.  The weapon cross-hair will pulse larger briefly to indicate you have acquired a new weapon or supply. If you are unable to pick something up, it means you already have the maximum amount possible for that object.
-
-TALKING:  To communicate with other players, press the T key 
-and type in your message.  Press Enter when finished and your words will 
-appear at the top of the screen. You can also enter communications on the command line of the console.
-
-ATTACKING: Point your weapon at an opponent and press the fire button.  Default fire keys are the left mouse and the control key). If a weapon runs out of ammo, it switches to the next available weapon with ammo the next time you fire it.  If you have no ammo at all, you fight with the gauntlet.
-
-+--------+
-| DYING: |
-+--------+
-	When you die, the weapon you were using (except for the gauntlet and the machine gun), and any active power ups drop where you died.  Armor, ammo and one-use items like the teleporter are lost.  To respawn into the game, press the fire key. When you re-enter the game you are once again armed with only your starting equipment.
-
-===========================
-== Section 8.            ==
-== THE ARENA ENVIRONMENT ==
-===========================
-
-+-----------------------+
-| RAPID TRANSIT DEVICES |
-+-----------------------+
-TELEPORTERS: These devices instantaneously move you to a pre-selected destination.
-
-PORTALS:  These are devices that generate holes in space through which you can see your ultimate destination and move to it like walking through a doorway.
-
-JUMP PADS: Jump pads throw you upwards to land on higher portions of the arena.  You have some "air" control over your final landing point.
-
-ACCELERATION PADS: Acceleration pads turn you into a human cannon ball, launching you to distant locations in the arena. As with the jump pads, you have some "air" control over your final landing point.
-
-+-----------------------+
-| ENVIRONMENTAL HAZARDS |
-+-----------------------+
-LAVA:  Walking on lava is not instantly fatal, but even with good armor protection, it can be a relatively quick (and noisy) doom.
-
-THE VOID: Falling off into the infinite blackness of the void is a near inescapable death.
-
-+--------------+
-| TEST ARSENAL |
-+--------------+
-MACHINE GUN: This is your default weapon. It's an instant hit attack and reasonably accurate even at long range. It uses bullets.
-
-GAUNTLET:  This is either your weapon of last resort when you're out of ammo or a cool tool to humiliate other players. When it hits, it does damage and knocks a foe back. It does not require ammunition, but you have to be in direct contact with a foe and activating (firing) it to cause injury and knockback.
-
-SHOTGUN:  This uses shells for ammunition. The spread of the shotgun blast makes it deadly in close combat, but not the best choice for long-range attacks.
-
-ROCKET LAUNCHER: The rocket launcher delivers heavy fire power to your target, but travels slower compared to other attacks.  Be careful when you use this weapon in close combat.
-
-PLASMA GUN: Powered by Energy cells, this rapid-fire weapon delivers deadly gouts of glowing energy quickly and accurately.  
-
-RAIL GUN:  The Rail Gun fires depleted uranium slugs at super high velocities. It hits instantly and can pass through the bodies of multiple opponents. But be warned, it recharges slowly and can be a liability in close combat. Take note of the distinctive trail of atmospheric disturbance 
-caused by the projectile. The color of the rail gun's trail can be changed under the CUSTOMIZE PLAYER menu on the EFFECTS COLOR line. 
-
-LIGHTNING GUN: Zap them!
-
-+------------------+
-| COMBAT SUPPLIES: |
-+------------------+
-Pick up these helpful items whenever possible. Some items take effect when 
-picked up, others you must activate during play.
-
-AMMO:  With the exception of the gauntlet, each weapon has a corresponding ammo type. The color of the ammo boxes corresponds with the color of the graphic weapon icons displayed briefly in your heads up display. Each ammo type has a maximum you can carry. 
-
-ARMOR:  There are three armor types: Green armor shards, yellow combat armor and red body armor. Collecting them increases your armor protection.  The red armor and the green armor shards can increase your total armor protection above the maximum for short duration.  The points "decay" back to the normal maximum value.
-
-HEALTH:  There are three types of standard health kits: small (green), medium (yellow) and large (red) encased in crystalline shells. The green health can increase your total health value above the maximum.  Like armor, it "decays" back to your maximum possible health value.
-
-QUAD DAMAGE: The quad temporarily multiplies all your weapon's strengths. 
-
-MEGA HEALTH: This blue health power up provides a temporary but significant boost to your health, taking it above your maximum level.  Like armor, it "decays" back to your maximum possible health value.
-
-PERSONAL TELEPORTER: Grab this single-use power up and use it to escape from dangerous situations.  Activating it immediately teleports you to one of the arena's spawn spots.
-
-=======================
-== Section 9.        ==
-== THE GAME CONSOLE  ==
-=======================
-
-	The game console (or just the console) is a pull down window shade that shows recent game information, including the text of conversations and recently executed game commands.  The bottom line of the console is the command line. While playing Q3test, you can enter into console mode by pressing the tilde (~) key and exit by pressing it again. The console is where you enter all the commands to change the game state.
-
-	For example, one console command is "map <name>" which will load a map
-and start it up.  Starting up a map actually starts a local Server and a Client. For the purposes of this test, most of the console commands will be executed to optimize graphics. Pressing the up and down arrows in the console will change to the last command entered. You can backspace over the command and enter new values if you'd like. There is also a command-completion function.  Type in the first few letters of a command. By pressing the TAB key, you can have the console automatically finish the name of the command for you. 
-
-	When you are in console mode (or when you have selected to "talk" by typing in words to appear on the screen), a blue "voice balloon" will appear over your head. Common game courtesy is to NOT shoot players who are in this mode.
-
-=======================
-== Section 10.       ==
-== PROBLEM ICONS     ==
-=======================
-
-Q3Test has a Problem Icon that you may see on your screen from time to time. When you are disconnected from a Quake Server or the network packet flow is disturbed, you will see a Network Disconnect icon above the spot where your frag count is displayed.  Other players will see it displayed over your character's head (similar to the way the talk balloon is displayed). If you are not immediately reconnected to the server, you will need to disconnect (leave arena) and attempt to reconnect with the server by either using the menu commands or by typing "connect" <server IP address> in the console command line.
-	NOTE:  Courteous players will refrain from getting cheap points by fragging lagged out opponents.
-
-=======================
-== Section 11.       ==
-== MESSAGE OF THE DAY     ==
-=======================
-
-When Quake 3 Arena starts a map up, it sends the GL_RENDERER string to the Message Of The Day server at id.  This responds back with a message of the day to the client.  If you wish to switch this option off, set CL_MOTD to 0 (+set CL_MOTD 0 from the command line). 
-
diff --git a/code/unix/build_setup.sh b/code/unix/build_setup.sh
deleted file mode 100644
index 0d54687e..00000000
--- a/code/unix/build_setup.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# Build various setups..
-
-# inputs: 
-#   directory with the common media
-Q3SETUPMEDIA=/home/timo/Id/Q3SetupMedia/quake3
-#   directory with binaries tree
-Q3BINARIES=../install
-#   version: $1
-VERSION=$1
-#   temporary directory used to prepare the files
-#   NOTE: this dir is erased before a new setup is built
-TMPDIR=setup.tmp
-
-# location of the setup dir (for graphical installer and makeself)
-SETUPDIR=setup
-
-# cp setup phase
-# we need to copy the symlinked files, and not the symlinks themselves
-# on antares this is forced with a cp -L
-# on spoutnik, -L is not recognized, and dereference is the default behaviour
-# we need a robust way of checking
-TESTFILE=/tmp/foo$$
-touch $TESTFILE
-# see if option is supported
-cp -L $TESTFILE $TESTFILE.cp 2>/dev/null
-if [ $? -eq 1 ]
-then
-  # option not supported, should be on by default
-  echo "cp doesn't have -L option"
-  unset CPOPT
-else
-  # option supported, use it
-  echo "cp supports -L option"
-  CPOPT="-L"
-fi
-rm $TESTFILE
-
-
-# graphical installer (based on Loki Software's Setup tool)
-build_installer ()
-{
-TMPDIR=setup.tmp
-
-rm -rf $TMPDIR
-mkdir $TMPDIR
-
-# copy base setup files
-cp $CPOPT -R $SETUPDIR/setup.sh $SETUPDIR/setup.data $TMPDIR
-
-# copy media files
-cp $CPOPT -R $Q3SETUPMEDIA/* $TMPDIR
-
-# remove CVS entries
-find $TMPDIR -name CVS | xargs rm -rf
-
-# copy binaries
-mkdir -p $TMPDIR/bin/x86
-# smp
-cp $CPOPT $Q3BINARIES/linuxquake3-smp $TMPDIR/bin/x86/quake3-smp.x86
-strip $TMPDIR/bin/x86/quake3-smp.x86
-brandelf -t Linux $TMPDIR/bin/x86/quake3-smp.x86
-# old school
-cp $CPOPT $Q3BINARIES/linuxquake3 $TMPDIR/bin/x86/quake3.x86
-strip $TMPDIR/bin/x86/quake3.x86
-brandelf -t Linux $TMPDIR/bin/x86/quake3.x86
-# ded
-cp $CPOPT $Q3BINARIES/linuxq3ded $TMPDIR/bin/x86/q3ded
-strip $TMPDIR/bin/x86/q3ded
-brandelf -t Linux $TMPDIR/bin/x86/q3ded
-
-# PB files
-mkdir -p $TMPDIR/pb/htm
-cp $CPOPT ../pb/linux/*.so $TMPDIR/pb
-cp $CPOPT ../pb/htm/*.htm $TMPDIR/pb/htm
-
-# Linux FAQ
-mkdir -p $TMPDIR/Docs/LinuxFAQ
-cp $CPOPT LinuxSupport/* $TMPDIR/Docs/LinuxFAQ
-
-# generated .qvm pk3 files
-mkdir -p $TMPDIR/baseq3
-mkdir -p $TMPDIR/missionpack
-# not needed now
-#cp $CPOPT $Q3BINARIES/baseq3/pak8.pk3 $TMPDIR/baseq3/
-#cp $CPOPT $Q3BINARIES/missionpack/pak3.pk3 $TMPDIR/missionpack/
-
-# menu shortcut to the game
-# FIXME current setup doesn't have a way to set symlinks on arbitrary things
-# so we use a dummy quake3 script (which will be overwritten by postinstall.sh)
-echo -e "#!/bin/sh\necho \"If you read this, then the setup script failed miserably.\nPlease report to ttimo@idsoftware.com\n\"" > $TMPDIR/bin/x86/quake3
-echo -e "#!/bin/sh\necho \"If you read this, then the setup script failed miserably.\nPlease report to ttimo@idsoftware.com\n\"" > $TMPDIR/bin/x86/quake3-smp
-# create the auto-extractible archive
-# first step: on FreeBSD we would default to Linux binaries .. use a symlink
-(
-cd $TMPDIR/setup.data/bin
-ln -s Linux FreeBSD
-ln -s Linux NetBSD
-ln -s Linux OpenBSD
-)
-# NOTE: we used to pass the $VERSION, but it doesn't seem very usefull
-./$SETUPDIR/makeself/makeself.sh $TMPDIR linuxq3apoint-$VERSION.x86.run "Quake III Arena Point Release $VERSION " ./setup.sh
-
-chmod a+rx linuxq3apoint-$VERSION.x86.run
-
-#rm -rf $TMPDIR
-}
-
-check_brandelf()
-{
-  # make sure brandelf is installed to avoid any problem when building the setups
-  BRAND=`which brandelf`;
-  if [ -n "$BRAND" ] && [ -x "$BRAND" ]
-  then
-    echo "brandelf is present: $BRAND"
-  else
-    echo "brandelf not found"
-    exit
-  fi
-}
-
-# safe checks
-check_brandelf
-
-build_installer
diff --git a/code/unix/cons b/code/unix/cons
deleted file mode 100644
index e4f36eb2..00000000
--- a/code/unix/cons
+++ /dev/null
@@ -1,6828 +0,0 @@
-#!/usr/bin/env perl
-
-# NOTE:  Cons intentionally does not use the "perl -w" option or
-# "use strict."  Because Cons "configuration files" are actually
-# Perl scripts, enabling those restrictions here would force them
-# on every user's config files, wanted or not.  Would users write
-# "better" Construct and Conscript files if we forced "use strict"
-# on them?  Probably.  But we want people to use Cons to get work
-# done, not force everyone to become a Perl guru to use it, so we
-# don't insist.
-#
-# That said, Cons' code is both "perl -w" and "use strict" clean.
-# Regression tests keep the code honest by checking for warnings
-# and "use strict" failures.
-
-use vars qw( $CVS_id $CVS_ver $ver_num $ver_rev $version );
-
-$CVS_id = 'Id';
-$CVS_ver = (split(/\s+/, $CVS_id))[2];
-
-$ver_num = "2.3";
-$ver_rev = ".1";
-
-$version = "This is Cons $ver_num$ver_rev ($CVS_id)\n";
-
-# Cons: A Software Construction Tool.
-# Copyright (c) 1996-2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-require 5.003;
-# See the NOTE above about why Cons doesn't "use strict".
-use integer;
-use Cwd;
-use File::Copy;
-
-use vars qw( $_WIN32 $_a $_exe $_o $_so );
-
-#------------------------------------------------------------------
-# Determine if running on win32 platform - either Windows NT or 95
-#------------------------------------------------------------------
-
-use vars qw( $PATH_SEPARATOR $iswin32 $_WIN32 $usage $indent @targets );
-
-BEGIN {
-    use Config;
-
-    # if the version is 5.003, we can check $^O
-    if ($] <  5.003) {
-	eval("require Win32");
-	$_WIN32 = (!$@);
-    } else {
-	$_WIN32 = ($^O eq "MSWin32") ? 1 : 0;
-    }
-
-    # Fetch the PATH separator from Config;
-    # provide our old defaults in case it's not set.
-    $PATH_SEPARATOR = $Config{path_sep};
-    $PATH_SEPARATOR = $_WIN32 ? ';' : ':' if ! defined $PATH_SEPARATOR;
-
-    # Fetch file suffixes from Config,
-    # accomodating differences in the Config variables
-    # used by different Perl versions.
-    $_exe = $Config{_exe};
-    $_exe = $Config{exe_ext} if ! defined $_exe;
-    $_exe = $_WIN32 ? '.exe' : '' if ! defined $_exe;
-    $_o = $Config{_o};
-    $_o = $Config{obj_ext}  if ! defined $_o;
-    $_o = $_WIN32 ? '.obj' : '.o' if ! defined $_o;
-    $_a = $Config{_a};
-    $_a = $Config{lib_ext} if ! defined $_a;
-    $_a = $_WIN32 ? '.lib' : '.a' if ! defined $_a;
-    $_so = ".$Config{so}";
-    $_so = $_WIN32 ? '.dll' : '.so' if ! defined $_so;
-}
-
-# Flush stdout each time.
-$| = 1;
-
-# Seed random number generator.
-srand(time . $$); # this works better than time ^ $$ in perlfunc manpage.
-
-$usage = q(
-Usage: cons <arguments> -- <construct-args>
-
-Arguments can be any of the following, in any order:
-
-  <targets>	Build the specified targets. If <target> is a directory
-		recursively build everything within that directory.
-
-  +<pattern>	Limit the cons scripts considered to just those that
-		match <pattern>. Multiple + arguments are accepted.
-
-  <name>=<val>	Sets <name> to value <val> in the ARG hash passed to the
-		top-level Construct file.
-
-  -cc           Show command that would have been executed, when
-		retrieving from cache. No indication that the file
-		has been retrieved is given; this is useful for
-		generating build logs that can be compared with
-		real build logs.
-
-  -cd           Disable all caching. Do not retrieve from cache nor
-		flush to cache.
-
-  -cr           Build dependencies in random order. This is useful when
-		building multiple similar trees with caching enabled.
-
-  -cs           Synchronize existing build targets that are found to be
-		up-to-date with cache. This is useful if caching has
-		been disabled with -cc or just recently enabled with
-		UseCache.
-
-  -d            Enable dependency debugging.
-
-  -f <file>	Use the specified file instead of "Construct" (but first
-		change to containing directory of <file>).
-
-  -h            Show a help message local to the current build if
-		one such is defined,  and exit.
-
-  -k		Keep going as far as possible after errors.
-
-  -o <file>	Read override file <file>.
-
-  -p		Show construction products in specified trees.
-  -pa		Show construction products and associated actions.
-  -pw		Show products and where they are defined.
-
-  -q		Be quiet; multiple -q flags increase quietness level:
-		1: quiet about Installing and Removing targets
-		2: quiet about build commands, up-to-date targets
-
-  -r		Remove construction products associated with <targets>
-
-  -R <repos>	Search for files in <repos>.  Multiple -R <repos>
-		directories are searched in the order specified.
-
-  -S <pkg>	Use package sig::<pkg> to calculate file signatures.
-		Currently supported values are "md5" for MD5
-		signatures (the default) and "md5::debug" for MD5
-		signature debug information.
-
-  -t            Traverse up the directory hierarchy looking for a
-		Construct file, if none exists in the current directory.
-		(Targets will be modified to be relative to the
-		Construct file.)
-
-  -v		Show cons version and continue processing.
-  -V            Show cons version and exit.
-
-  -wf <file>    Write all filenames considered into <file>.
-
-  -x		Show this message and exit.
-
-
-   Please report any suggestions through the cons-discuss@gnu.org mailing
-   list.
-
-   To subscribe, send mail to cons-discuss-request@gnu.org with body
-   'subscribe'.
-
-   If you find a bug, please report it through the bug-cons@gnu.org
-   mailing list.
-
-   Information about CONS can be obtained from the official cons web site
-   http://www.dsmit.com/cons/ or its mirrors (listed there).
-
-   The cons maintainers can be contacted by email at cons-maintainers@gnu.org
-
-   User documentation of cons is contained in cons and can be obtained
-   by doing 'perldoc /path/to/cons'.
-
-);
-
-# Simplify program name, if it is a path.
-{
-    my ($vol, $dir, $file) = File::Spec->splitpath(File::Spec->canonpath($0));
-    $0 = $file;
-}
-
-# Default parameters.
-$param::topfile = 'Construct';	# Top-level construction file.
-$param::install = 1;		# Show installations
-$param::build = 1;		# Build targets
-### $param::show = 1;		# Show building of targets.
-$param::sigpro = 'md5';		# Signature protocol.
-$param::depfile = '';		# Write all deps out to this file
-$param::salt = '';		# Salt derived file signatures with this.
-$param::sourcesig = ['*' => 'content'];# Source file signature calculation
-$param::rep_sig_times_ok = 1;	# Repository .consign times are in sync
-				#   w/files.
-$param::conscript_chdir = 0;	# Change dir to Conscript directory
-$param::quiet = 0;		# should we show the command being executed.
-
-@param::defaults = ();
-
-#
-$indent = '';
-
-# Display a command while executing or otherwise. This
-# should be called by command builder action methods.
-sub showcom {
-    print($indent . $_[0] . "\n") if ($param::quiet < 2);
-}
-
-# Default environment.
-# This contains only the completely platform-independent information
-# we can figure out.  Platform-specific information (UNIX, Win32)
-# gets added below.
-@param::base = (
-     'SIGNATURE'    => [ '*' => 'build' ],
-     'SUFEXE'	    => $_exe,				# '' on UNIX systems
-     'SUFLIB'	    => $_a,				# '.a' on UNIX systems
-     'SUFLIBS'      => "$_so:$_a",			# '.so:.a' on UNIX
-     'SUFOBJ'	    => $_o,				# '.o' on UNIX systems
-     'SUFMAP'       => {
-	 '.c'  => 'build::command::cc',
-	 '.s'  => 'build::command::cc',
-	 '.S'  => 'build::command::cc',
-	 '.C'  => 'build::command::cxx',
-	 '.cc' => 'build::command::cxx',
-	 '.cxx'=> 'build::command::cxx',
-	 '.cpp'=> 'build::command::cxx',
-	 '.c++'=> 'build::command::cxx',
-	 '.C++'=> 'build::command::cxx',
-     },
-     'PERL'	    => $^X,
-);
-
-%param::rulesets =
-    (
-     # Defaults for Win32.
-     # Defined for VC++ 6.0 by Greg Spencer <greg_spencer@acm.org>
-     # Your mileage may vary.
-     'msvc' => [
-		'CC'             => 'cl',
-		'CFLAGS'         => '/nologo',
-		'CCCOM'          => '%CC %CFLAGS %_IFLAGS /c %< /Fo%>',
-		'CXX'            => '%CC',
-		'CXXFLAGS'       => '%CFLAGS',
-		'CXXCOM'         => '%CXX %CXXFLAGS %_IFLAGS /c %< /Fo%>',
-		'INCDIRPREFIX'   => '/I',
-		'INCDIRSUFFIX'   => '',
-		'LINK'           => 'link',
-		'LINKCOM'        => '%LINK %LDFLAGS /out:%> %< %_LDIRS %LIBS',
-		'LINKMODULECOM'  => '%LD /r /o %> %<',
-		'LIBDIRPREFIX'   => '/LIBPATH:',
-		'LIBDIRSUFFIX'   => '',
-		'AR'             => 'lib',
-		'ARFLAGS'        => '/nologo ',
-		'ARCOM'          => "%AR %ARFLAGS /out:%> %<",
-		'RANLIB'         => '',
-		'LD'             => 'link',
-		'LDFLAGS'        => '/nologo ',
-		'PREFLIB'        => '',
-		],
-     # Defaults for a typical (?) UNIX platform.
-     # Your mileage may vary.
-     'unix' => [
-		'CC'             => 'cc',
-		'CFLAGS'         => '',
-		'CCCOM'          => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-		'CXX'            => '%CC',
-		'CXXFLAGS'       => '%CFLAGS',
-		'CXXCOM'         => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
-		'INCDIRPREFIX'   => '-I',
-		'INCDIRSUFFIX'   => '',
-		'LINK'           => '%CXX',
-		'LINKCOM'        => '%LINK %LDFLAGS -o %> %< %_LDIRS %LIBS',
-		'LINKMODULECOM'  => '%LD -r -o %> %<',
-		'LIBDIRPREFIX'   => '-L',
-		'LIBDIRSUFFIX'   => '',
-		'AR'             => 'ar',
-		'ARFLAGS'        => 'r', # rs?
-		'ARCOM'          => ['%AR %ARFLAGS %> %<', '%RANLIB %>'],
-		'RANLIB'         => 'ranlib',
-		'AS'             => 'as',
-		'ASFLAGS'        => '',
-		'ASCOM'          => '%AS %ASFLAGS %< -o %>',
-		'LD'             => 'ld',
-		'LDFLAGS'        => '',
-		'PREFLIB'        => 'lib',
-		'ENV'            => { 'PATH' => '/bin:/usr/bin' },
-		],
-     );
-
-# Set the rules based on the platform.
-script::DefaultRules(script::RuleSet($_WIN32 ? 'msvc' : 'unix'));
-
-# Handle command line arguments.
-while (@ARGV) {
-    $_ = shift @ARGV;
-    last if /^--$/;		# Argument passing to Construct.
-    &option, next			if s/^-//;
-    push (@param::include, $_), next	if s/^\+//;
-    &equate, next			if /=/;
-    push (@targets, $_), next;
-}
-
-sub option {
-    my %opt = (
-		    'cc' =>   sub { $param::cachecom = 1; },
-		    'cd' =>   sub { $param::cachedisable = 1; },
-		    'cr' =>   sub { $param::random = 1; },
-		    'cs' =>   sub { $param::cachesync = 1; },
-		    'd' =>    sub { $param::depends = 1; },
-		    'h' =>    sub { $param::localhelp = 1; },
-		    'k' =>    sub { $param::kflag = 1; },
-		    'p' =>    sub { $param::pflag = 1;
-				    $param::build = 0; },
-		    'pa' =>   sub { $param::pflag = 1;
-				    $param::aflag = 1;
-				    $indent = "... ";
-				    $param::build = 0; },
-		    'pw' =>   sub { $param::pflag = 1;
-				    $param::wflag = 1;
-				    $param::build = 0; },
-		    'q' =>    sub { $param::quiet++; },
-		    'r' =>    sub { $param::rflag = 1;
-				    $param::build = 0; },
-		    't' =>    sub { $param::traverse = 1; },
-		    'v' =>    sub { print($version); },
-		    'V' =>    sub { print($version), exit(0); },
-		    'x' =>    sub { print($usage), exit 0; },
-		);
-
-    my %opt_arg = (
-		    'f' =>    sub { $param::topfile = $_[0]; },
-		    'o' =>    sub { $param::overfile = $_[0]; },
-		    'R' =>    sub { script::Repository($_[0]); },
-		    'S' =>    sub { $param::sigpro = $_[0]; },
-		    'wf' =>   sub { $param::depfile = $_[0]; },
-		);
-
-    if (defined $opt{$_}) {
-	&{$opt{$_}}();
-	return;
-    }
-    while ($_) {
-	$_  =~ m/(.)(.*)/;
-	if (defined $opt{$1}) {
-	    &{$opt{$1}}();
-	    $_ = $2;
-	    next;
-	}
-	if (defined $opt_arg{$1}) {
-	    if (! $2) {
-		$_ = shift @ARGV;
-		die("$0: -$1 option requires an argument.\n") if ! $_;
-	    }
-	    &{$opt_arg{$1}}($2 || $_);
-	    return;
-	}
-	$_  =~ m/(..)(.*)/;
-	if (defined $opt_arg{$1}) {
-	    if (! $2) {
-		$_ = shift @ARGV;
-		die("$0: -$1 option requires an argument.\n") if ! $_;
-	    }
-	    &{$opt_arg{$1}}($2 || $_);
-	    return;
-	}
-	if ($_) {
-	    die qq($0: unrecognized option "-$_".  Use -x for a usage message.\n);
-	}
-    }
-}
-
-# Process an equate argument (var=val).
-sub equate {
-    my($var, $val) = /([^=]*)=(.*)/;
-    $script::ARG{$var} = $val;
-}
-
-# Define file signature protocol.
-'sig'->select($param::sigpro);
-
-# Cleanup after an interrupt.
-$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
-    $SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'IGNORE';
-    $SIG{HUP} = $SIG{INT} if ! $main::_WIN32;
-    warn("\n$0: killed\n");
-    # Call this first, to make sure that this processing
-    # occurs even if a child process does not die (and we
-    # hang on the wait).
-    sig::hash::END();
-    wait();
-    exit(1);
-};
-$SIG{HUP} = $SIG{INT} if ! $main::_WIN32;
-
-# Cleanup after a broken pipe (someone piped our stdout?)
-$SIG{PIPE} = sub {
-    $SIG{PIPE} = $SIG{HUP} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'IGNORE';
-    warn("\n$0: broken pipe\n");
-    sig::hash::END();
-    wait();
-    exit(1);
-};
-
-if ($param::depfile) {
-  open (main::DEPFILE, ">".$param::depfile) ||
-    die ("$0: couldn't open $param::depfile ($!)\n");
-}
-
-# If the supplied top-level Conscript file is not in the
-# current directory, then change to that directory.
-{
-    my ($vol, $dir, $file) =
-      File::Spec->splitpath(File::Spec->canonpath($param::topfile));
-    if ($vol || $dir) {
-	my($cd) = File::Spec->catpath($vol, $dir, undef);
-	chdir($cd) || die("$0: couldn't change to directory $cd ($!)\n");
-	$param::topfile = $file;
-    }
-}
-
-# Walk up the directory hierarchy looking for a Conscript file (if -t set).
-my($target_top);
-my(@targetdir) = ();
-if ($param::traverse && ! -f $param::topfile) {
-    my($vol, $dirs, $file) = File::Spec->splitpath(cwd());
-    my(@dirs) = (File::Spec->splitdir($dirs), $file);
-    while (! -f File::Spec->catpath($vol, File::Spec->catdir(@dirs),
-				    $param::topfile)) {
-	die("$0: unable to find $param::topfile.\n") if ! @dirs;
-	unshift(@targetdir, pop(@dirs));
-    }
-    my($cwd) = File::Spec->catpath($vol, File::Spec->catdir(@dirs), '');
-    print "$0: Entering directory `$cwd'\n";
-    chdir($cwd);
-    @targets = map {File::Spec->catdir(@targetdir, $_)} @targets;
-}
-
-# Set up $dir::top and $dir::cwd, now that we are in the right directory.
-dir::init();
-
-#
-if (@targetdir) {
-    $target_top = $dir::top->lookupdir(File::Spec->catdir(@targetdir));
-}
-
-# Now handle override file.
-package override;
-if ($param::overfile) {
-    my($ov) = $param::overfile;
-    die qq($0: can\'t read override file "$ov" ($!)\n) if ! -f $ov; #'
-    do $ov;
-    if ($@) {
-	chop($@);
-	die qq($0: errors in override file "$ov" ($@)\n);
-    }
-}
-
-# Provide this to user to setup override patterns.
-sub Override {
-    my($re, @env) = @_;
-    return if $param::overrides{$re}; # if identical, first will win.
-    $param::overrides = 1;
-    $param::overrides{$re} = \@env;
-    push(@param::overrides, $re);
-}
-
-package main;
-
-use vars qw( %priority $errors );
-
-# Check script inclusion regexps
-my $re;
-for $re (@param::include) {
-    if (! defined eval {"" =~ /$re/}) {
-	my($err) = $@;
-	$err =~ s/in regexp at .*$//;
-	die("$0: error in regexp $err");
-    }
-}
-
-# Read the top-level construct file and its included scripts.
-doscripts($param::topfile);
-
-# Status priorities. This lets us aggregate status for directories
-# and print an appropriate message (at the top-level).
-%priority =
-    ('none' => 1, 'handled' => 2, 'built' => 3, 'unknown' => 4, 'errors' => 5);
-
-# If no targets were specified, supply default targets (if any).
-@targets = @param::default_targets if ! @targets;
-
-$errors = 0;
-
-# Build the supplied target patterns.
-my $tgt;
-for $tgt (map($dir::top->lookup($_), @targets)) {
-    if ($target_top && ! $tgt->is_under($target_top)) {
-	# A -t option was used, and this target is not underneath
-	# the directory where we were invoked via -t.
-	# If the target is a directory and the -t directory
-	# is underneath it, then build the -t directory.
-	if (ref $tgt ne "dir" || ! $target_top->is_under($tgt)) {
-	    next;
-	}
-	$tgt = $target_top;
-    }
-    buildtoptarget($tgt);
-}
-
-exit 0 + ($errors != 0);
-
-sub buildtoptarget {
-    my($tgt) = @_;
-    return if ! $tgt;
-    my($status) = buildtarget($tgt);
-    if ($status ne 'built') {
-	my($path) = $tgt->path;
-	if ($status eq "errors") {
-	    print qq($0: "$path" not remade because of errors.\n);
-	    $errors++;
-	} elsif ($status eq "handled") {
-	    print qq($0: "$path" is up-to-date.\n) if ($param::quiet < 2);
-	} elsif ($status eq "unknown") {
-	    # cons error already reported.
-	    $errors++;
-	} elsif ($status eq "none") {
-	    # search for targets that may be linked to the given path.
-	    my @linked = dir::linked_targets($tgt) if $target_top;
-	    if (@linked) {
-		my @names = map($_->path, @linked);
-		print "Linked targets: @names\n" if ($param::quiet < 1);
-		map(buildtoptarget($_), @linked);
-	    } else {
-		print qq($0: nothing to be built in "$path".\n)
-		      if $param::build && ($param::quiet < 2);
-	    }
-	} else {
-	    print qq($0: don\'t know how to construct "$path".\n); #'
-	    $errors++;
-	}
-    }
-}
-
-# Build the supplied target directory or files. Return aggregated status.
-sub buildtarget {
-    my($tgt) = @_;
-    if (ref($tgt) eq "dir") {
-	my($result) = "none";
-	my($priority) = $priority{$result};
-	if (exists $tgt->{member}) {
-	    my($members) = $tgt->{member};
-	    my $entry;
-	    for $entry (sort keys %$members) {
-		next if $entry eq $dir::CURDIR || $entry eq $dir::UPDIR;
-		my($tgt) = $members->{$entry};
-		next if ref($tgt) ne "dir" && !exists($tgt->{builder});
-		my($stat) = buildtarget($members->{$entry});
-		my($pri) = $priority{$stat};
-		if ($pri > $priority) {
-		    $priority = $pri;
-		    $result = $stat;
-		}
-	    }
-	}
-	return $result;
-    }
-    if ($param::depends) {
-	my($path) = $tgt->path;
-	if ($tgt->{builder}) {
-	    my(@dep) = (@{$tgt->{dep}}, @{$tgt->{sources}});
-	    my($dep) = join(' ',map($_->path, @dep));
-	    print("Target $path: $dep\n");
-	} else {
-	    print("Target $path: not a derived file\n");
-	}
-    }
-    if ($param::build) {
-	return build $tgt;
-    } elsif ($param::pflag || $param::wflag || $param::aflag) {
-	if ($tgt->{builder}) {
-	    if ($param::wflag) {
-		print qq(${\$tgt->path}: $tgt->{script}\n);
-	    } elsif ($param::pflag) {
-		print qq(${\$tgt->path}:\n) if $param::aflag;
-		print qq(${\$tgt->path}\n) if !$param::aflag;
-	    }
-	    if ($param::aflag) {
-		$tgt->{builder}->action($tgt);
-	    }
-	}
-    } elsif ($param::rflag && $tgt->{builder}) {
-	my($path) = $tgt->path;
-	if (-f $path) {
-	    if (unlink($path)) {
-		print("Removed $path\n") if ($param::quiet < 1);
-	    } else {
-		warn("$0: couldn't remove $path\n");
-	    }
-	}
-    }
-
-    return "none";
-}
-
-package NameSpace;
-
-# Return a hash that maps the name of symbols in a namespace to an
-# array of refs for all types for which the name has a defined value.
-# A list of symbols may be specified; default is all symbols in the
-# name space.
-sub save {
-    my $package = shift;
-    my(%namerefs, $var, $type);
-    no strict 'refs';
-    @_ = keys %{$package."::"} if ! @_;
-    foreach $var (@_) {
-	$namerefs{$var} = [];
-	my $fqvar = $package."::".$var;
-	# If the scalar for this variable name doesn't already
-	# exist, *foo{SCALAR} will autovivify the reference
-	# instead of returning undef, so unlike the other types,
-	# we have to dereference to find out if it exists.
-	push(@{$namerefs{$var}}, *{$fqvar}{SCALAR})
-		    if defined ${*{$fqvar}{SCALAR}};
-	foreach $type (qw(ARRAY HASH CODE IO)) {
-	    push(@{$namerefs{$var}}, *{$fqvar}{$type})
-			  if defined *{$fqvar}{$type};
-	}
-    }
-    return \%namerefs;
-}
-
-# Remove the specified symbols from the namespace.
-# Default is to remove all.
-sub remove {
-    my $package = shift;
-    my(%namerefs, $var);
-    no strict 'refs';
-    @_ = keys %{$package."::"} if ! @_;
-    foreach $var (@_) {
-	delete ${$package."::"}{$var};
-    }
-}
-
-# Restore values to symbols specified in a hash as returned
-# by NameSpace::save.
-sub restore {
-    my($package, $namerefs) = @_;
-    my($var, $ref);
-    no strict 'refs';
-    foreach $var (keys %$namerefs) {
-	my $fqvar = $package."::".$var;
-	foreach $ref (@{$namerefs->{$var}}) {
-	    *{$fqvar} = $ref;
-	}
-    }
-}
-
-# Support for "building" scripts, importing and exporting variables.
-# With the exception of the top-level routine here (invoked from the
-# main package by cons), these are all invoked by user scripts.
-package script;
-
-use vars qw( $ARG $caller_dir_path %special_var );
-
-BEGIN {
-    # We can't Export or Import the following variables because Perl always
-    # treats them as part of the "main::" package (see perlvar(1)).
-    %special_var = map {$_ => 1} qw(ENV INC ARGV ARGVOUT SIG
-				    STDIN STDOUT STDERR);
-}
-
-# This is called from main to interpret/run the top-level Construct
-# file, passed in as the single argument.
-sub main::doscripts {
-    my($script) = @_;
-    Build($script);
-    # Now set up the includes/excludes (after the Construct file is read).
-    $param::include = join('|', @param::include);
-
-    # Save the original variable names from the script package.
-    # These will stay intact, but any other "script::" variables
-    # defined in a Conscript file will get saved, deleted,
-    # and (when necessary) restored.
-    my(%orig_script_var) = map {$_ => 1} keys %script::;
-    $caller_dir_path = undef;
-    my $cwd = Cwd::cwd();
-    my(@scripts) = pop(@priv::scripts);
-    while ($priv::self = shift(@scripts)) {
-	my($path) = $priv::self->{script}->rsrcpath;
-	if (-f $path) {
-	    $dir::cwd = $priv::self->{script}->{dir};
-	    # Handle chdir to the Conscript file directory, if necessary.
-	    my ($vol, $dir, $file);
-	    if ($param::conscript_chdir) {
-		($vol, $dir, $file) =
-		  File::Spec->splitpath(File::Spec->canonpath($path));
-		if ($vol ne '' || $dir ne '') {
-		    $caller_dir_path = File::Spec->catpath($vol, $dir, undef);
-		    chdir($caller_dir_path) ||
-			die "Could not chdir to $caller_dir_path: $!\n";
-		}
-	    } else {
-		$file = $path;
-	    }
-	    # Actually process the Conscript file.
-	    do $file;
-	    # Save any variables defined by the Conscript file
-	    # so we can restore them later, if needed;
-	    # then delete them from the script:: namespace.
-	    my(@del) = grep(! $orig_script_var{$_}, keys %script::);
-	    if (@del) {
-		$priv::self->{script}->{pkgvars} = NameSpace::save('script',
-								   @del);
-		NameSpace::remove('script', @del);
-	    }
-	    if ($caller_dir_path) {
-		chdir($cwd);
-		$caller_dir_path = undef;
-	    }
-	    if ($@) {
-		chomp($@);
-		my $err = ($@ =~ /\n/ms) ? ":\n$@" : " ($@)";
-		print qq($0: error in file "$path"$err\n);
-		$run::errors++;
-	    } else {
-		# Only process subsidiary scripts if no errors in parent.
-		unshift(@scripts, @priv::scripts);
-	    }
-	    undef @priv::scripts;
-	} else {
-	    my $where = '';
-	    my $cref = $priv::self->{script}->creator;
-	    if (defined $cref) {
-		my($_foo, $script, $line, $sub) = @$cref;
-		$where = " ($sub in $script, line $line)";
-	    }
-	    warn qq(Ignoring missing script "$path"$where);
-	}
-    }
-    die("$0: script errors encountered: construction aborted\n")
-	if $run::errors;
-}
-
-# Return caller info about the method being invoked.
-# This is everything from the Perl "caller" builtin function,
-# including which Construct/Conscript file, line number,
-# subroutine name, etc.
-sub caller_info {
-    my($lev) = 1;
-    my(@frame);
-    do {
-	@frame = caller ++$lev;
-	if (defined($frame[3]) && $frame[3] eq '(eval)') {
-	    @frame = caller --$lev;
-	    if ($caller_dir_path) {
-		$frame[1] = File::Spec->catfile($caller_dir_path, $frame[1]);
-	    }
-	    return @frame;
-	}
-    } while ($frame[3]);
-    return;
-}
-
-# Link a directory to another. This simply means set up the *source*
-# for the directory to be the other directory.
-sub Link {
-    dir::link(@_);
-}
-
-# Add directories to the repository search path for files.
-# Strip our current directory from the list so Repository
-# (or -R options) can be used from within the repository.
-sub Repository {
-    my($my_dir) = Cwd::cwd();
-    my $dir;
-    foreach $dir (@_) {
-	# The following more direct call isn't available in
-	# Cwd.pm until some time after 5.003...
-	#	my($d) = Cwd::abs_path($dir);
-	chdir($dir);
-	my($d) = Cwd::cwd();
-	chdir($my_dir);
-	#
-	next if ! $d || ! -d $d || $d eq $my_dir;
-	# We know we can get away with passing undef to lookupdir
-	# as the directory because $dir is an absolute path.
-	push(@param::rpath, dir::lookupdir(undef, $dir));
-	push @INC, $d;
-    }
-}
-
-# Return the list of Repository directories specified.
-sub Repository_List {
-    map($_->path, @param::rpath);
-}
-
-# Specify whether the .consign signature times in repository files are,
-# in fact, consistent with the times on the files themselves.
-sub Repository_Sig_Times_OK {
-    $param::rep_sig_times_ok = shift;
-}
-
-sub SourceSignature {
-    $param::sourcesig = [@_];
-}
-
-# Specify whether we should chdir to the containing directories
-# of Conscript files.
-sub Conscript_chdir {
-    $param::conscript_chdir = shift;
-}
-
-# Specify files/targets that must be present and built locally,
-# even if they exist already-built in a Repository.
-sub Local {
-    my(@files) = map($dir::cwd->lookupfile($_), @_);
-    map($_->local(1), @files);
-}
-
-# Export variables to any scripts invoked from this one.
-sub Export {
-    my(@illegal) = grep($special_var{$_}, @_);
-    if (@illegal) {
-	die qq($0: cannot Export special Perl variables: @illegal\n);
-    }
-    @{$priv::self->{exports}} = grep(! defined $special_var{$_}, @_);
-}
-
-# Import variables from the export list of the caller
-# of the current script.
-sub Import {
-    my(@illegal) = grep($special_var{$_}, @_);
-    if (@illegal) {
-	die qq($0: cannot Import special Perl variables: @illegal\n);
-    }
-    my($parent) = $priv::self->{parent};
-    my($imports) = $priv::self->{imports};
-    @{$priv::self->{exports}} = keys %$imports;
-    my($var);
-    foreach $var (grep(! defined $special_var{$_}, @_)) {
-	if (!exists $imports->{$var}) {
-	    my($path) = $parent->{script}->path;
-	    die qq($0: variable "$var" not exported by file "$path"\n);
-	}
-	if (!defined $imports->{$var}) {
-	    my $path = $parent->{script}->path;
-	    my $err = "$0: variable \"$var\" exported but not " .
-		      "defined by file \"$path\"\n";
-	    die $err;
-	}
-	${"script::$var"} = $imports->{$var};
-    }
-}
-
-# Build an inferior script. That is, arrange to read and execute
-# the specified script, passing to it any exported variables from
-# the current script.
-sub Build {
-    my(@files) = map($dir::cwd->lookupfile($_), @_);
-    my(%imports) = map {$_ => ${"script::$_"}} @{$priv::self->{exports}};
-    my $file;
-    for $file (@files) {
-	next if $param::include && $file->path !~ /$param::include/o;
-	my($self) = {'script' => $file,
-		     'parent' => $priv::self,
-		     'imports' => \%imports};
-	bless $self;  # may want to bless into class of parent in future
-	push(@priv::scripts, $self);
-    }
-}
-
-# Set up regexps dependencies to ignore. Should only be called once.
-sub Ignore {
-    die("Ignore called more than once\n") if $param::ignore;
-    $param::ignore = join("|", map("($_)", @_)) if @_;
-}
-
-# Specification of default targets.
-sub Default {
-    push(@param::default_targets, map($dir::cwd->lookup($_)->path, @_));
-}
-
-# Local Help.  Should only be called once.
-sub Help {
-    if ($param::localhelp) {
-	print "@_\n";
-	exit 2;
-    }
-}
-
-# For windows platforms which use unix tool sets, the msvc defaults may
-# not be useful. Also, in the future, other platforms (Mac?) may have the
-# same problem.
-sub RuleSet {
-    my $style = shift;
-    my @rulesets = sort keys %param::rulesets;
-    die "Unknown style for rules: $style.\n" .
-	"Supported rules are: (" . join(" ", @rulesets) . ")"
-	    unless eval(join("||", map("\$style eq '$_'", @rulesets)));
-    return @param::base, @{$param::rulesets{$style}};
-}
-
-sub DefaultRules {
-    @param::defaults = ();
-    push @param::defaults, @_;
-}
-
-# Return the build name(s) of a file or file list.
-sub FilePath {
-    wantarray
-	? map($dir::cwd->lookupfile($_)->path, @_)
-	: $dir::cwd->lookupfile($_[0])->path;
-}
-
-# Return the build name(s) of a directory or directory list.
-sub DirPath {
-    wantarray
-	? map($dir::cwd->lookupdir($_)->path, @_)
-	: $dir::cwd->lookupdir($_[0])->path;
-}
-
-# Split the search path provided into components. Look each up
-# relative to the current directory.
-# The usual path separator problems abound; for now we'll use :
-sub SplitPath {
-    my($dirs) = @_;
-    if (ref($dirs) ne "ARRAY") {
-	$dirs = [ split(/$main::PATH_SEPARATOR/o, $dirs) ];
-    }
-    map { DirPath($_) } @$dirs;
-}
-
-# Return true if the supplied path is available as a source file
-# or is buildable (by rules seen to-date in the build).
-sub ConsPath {
-    my($path) = @_;
-    my($file) = $dir::cwd->lookup($path);
-    return $file->accessible;
-}
-
-# Return the source path of the supplied path.
-sub SourcePath {
-    wantarray
-	? map($dir::cwd->lookupfile($_)->rsrcpath, @_)
-	: $dir::cwd->lookupfile($_[0])->rsrcpath;
-}
-
-# Search up the tree for the specified cache directory, starting with
-# the current directory. Returns undef if not found, 1 otherwise.
-# If the directory is found, then caching is enabled. The directory
-# must be readable and writable. If the argument "mixtargets" is provided,
-# then targets may be mixed in the cache (two targets may share the same
-# cache file--not recommended).
-sub UseCache($@) {
-    my($dir, @args) = @_;
-    # NOTE: it's important to process arguments here regardless of whether
-    # the cache is disabled temporarily, since the mixtargets option affects
-    # the salt for derived signatures.
-    for (@args) {
-	if ($_ eq "mixtargets") {
-	    # When mixtargets is enabled, we salt the target signatures.
-	    # This is done purely to avoid a scenario whereby if
-	    # mixtargets is turned on or off after doing builds, and
-	    # if cache synchronization with -cs is used, then
-	    # cache files may be shared in the cache itself (linked
-	    # under more than one name in the cache). This is not bad,
-	    # per se, but simply would mean that a cache cleaning algorithm
-	    # that looked for a link count of 1 would never find those
-	    # particular files; they would always appear to be in use.
-	    $param::salt = 'M' . $param::salt;
-	    $param::mixtargets = 1;
-	} else {
-	    die qq($0: UseCache unrecognized option "$_"\n);
-	}
-    }
-    if ($param::cachedisable) {
-	warn("Note: caching disabled by -cd flag\n");
-	return 1;
-    }
-    my($depth) = 15;
-    while ($depth-- && ! -d $dir) {
-	$dir = File::Spec->catdir($dir::UPDIR, $dir);
-    }
-    if (-d $dir) {
-	$param::cache = $dir;
-	return 1;
-    }
-    return undef;
-}
-
-# Salt the signature generator. The salt (a number of string) is added
-# into the signature of each derived file. Changing the salt will
-# force recompilation of all derived files.
-sub Salt($) {
-    # We append the value, so that UseCache and Salt may be used
-    # in either order without changing the signature calculation.
-    $param::salt .= $_[0];
-}
-
-# Mark files (or directories) to not be removed before building.
-sub Precious {
-    map($_->{precious} = 1, map($dir::cwd->lookup($_), @_));
-}
-
-
-# These methods are callable from Conscript files, via a cons
-# object. Procs beginning with _ are intended for internal use.
-package cons;
-
-use vars qw( %envcache );
-
-# This is passed the name of the base environment to instantiate.
-# Overrides to the base environment may also be passed in
-# as key/value pairs.
-sub new {
-    my($package) = shift;
-    my ($env) = {@param::defaults, @_};
-    @{$env->{_envcopy}} = %$env; # Note: we never change PATH
-    $env->{_cwd} = $dir::cwd; # Save directory of environment for
-    bless $env, $package;	# any deferred name interpretation.
-}
-
-# Clone an environment.
-# Note that the working directory will be the initial directory
-# of the original environment.
-sub clone {
-    my($env) = shift;
-    my $clone = {@{$env->{_envcopy}}, @_};
-    @{$clone->{_envcopy}} = %$clone; # Note: we never change PATH
-    $clone->{_cwd} = $env->{_cwd};
-    bless $clone, ref $env;
-}
-
-# Create a flattened hash representing the environment.
-# It also contains a copy of the PATH, so that the path
-# may be modified if it is converted back to a hash.
-sub copy {
-    my($env) = shift;
-    (@{$env->{_envcopy}}, 'ENV' => {%{$env->{ENV}}}, @_)
-}
-
-# Resolve which environment to actually use for a given
-# target. This is just used for simple overrides.
-sub _resolve {
-    return $_[0] if !$param::overrides;
-    my($env, $tgt) = @_;
-    my($path) = $tgt->path;
-    my $re;
-    for $re (@param::overrides) {
-	next if $path !~ /$re/;
-	# Found one. Return a combination of the original environment
-	# and the override.
-	my($ovr) = $param::overrides{$re};
-	return $envcache{$env,$re} if $envcache{$env,$re};
-	my($newenv) = {@{$env->{_envcopy}}, @$ovr};
-	@{$newenv->{_envcopy}} = %$env;
-	$newenv->{_cwd} = $env->{_cwd};
-	return $envcache{$env,$re} = bless $newenv, ref $env;
-    }
-    return $env;
-}
-
-# Substitute construction environment variables into a string.
-# Internal function/method.
-sub _subst {
-    my($env, $str) = @_;
-    if (! defined $str) {
-	return undef;
-    } elsif (ref($str) eq "ARRAY") {
-	return [ map($env->_subst($_), @$str) ];
-    } else {
-	# % expansion.  %% gets converted to % later, so expand any
-	# %keyword construction that doesn't have a % in front of it,
-	# modulo multiple %% pairs in between.
-	# In Perl 5.005 and later, we could actually do this in one regex
-	# using a conditional expression as follows,
-	#	while ($str =~ s/($pre)\%(\{)?([_a-zA-Z]\w*)(?(2)\})/"$1".
-	#                      $env->{$3}/ge) {}
-	# The following two-step approach is backwards-compatible
-	# to (at least) Perl5.003.
-	my $pre = '^|[^\%](?:\%\%)*';
-	while (($str =~ s/($pre)\%([_a-zA-Z]\w*)/$1.($env->{$2}||'')/ge) ||
-	       ($str =~ s/($pre)\%\{([_a-zA-Z]\w*)\}/$1.($env->{$2}||'')/ge)) {
-	}
-	return $str;
-    }
-}
-
-sub AfterBuild {
-    my($env) = shift;
-    my($perl_eval_str) = pop(@_);
-    my $file;
-    for $file (map($dir::cwd->lookup($_), @_)) {
-	$file->{after_build_func} = $perl_eval_str;
-    }
-}
-
-sub Install {
-    my($env) = shift;
-    my($tgtdir) = $dir::cwd->lookupdir($env->_subst(shift));
-    my $file;
-    for $file (map($dir::cwd->lookupfile($env->_subst($_)), @_)) {
-	my($tgt) = $tgtdir->lookupfile($file->{entry});
-	$tgt->bind(find build::install($env), $file);
-    }
-}
-
-sub InstallAs {
-    my $env = shift;
-    my $tgt = shift;
-    my $src = shift;
-    my @sources = ();
-    my @targets = ();
-
-    if (ref $tgt) {
-	die "InstallAs: Source is a file and target is a list!\n"
-	    if (!ref($src));
-	@sources = @$src;
-	@targets = @$tgt;
-    } elsif (ref $src) {
-	die "InstallAs: Target is a file and source is a list!\n";
-    } else {
-	push @sources, $src;
-	push @targets, $tgt;
-    }
-
-    if ($#sources != $#targets) {
-	my $tn = $#targets+1;
-	my $sn = $#sources+1;
-	die "InstallAs: Source file list ($sn) and target file list ($tn) " .
-	    "are inconsistent in length!\n";
-    } else {
-	foreach (0..$#sources) {
-	    my $tfile = $dir::cwd->lookupfile($env->_subst($targets[$_]));
-	    my $sfile = $dir::cwd->lookupfile($env->_subst($sources[$_]));
-	    $tfile->bind(find build::install($env), $sfile);
-	}
-    }
-}
-
-# Installation in a local build directory,
-# copying from the repository if it's already built there.
-# Functionally equivalent to:
-#	Install $env $dir, $file;
-#	Local "$dir/$file";
-sub Install_Local {
-    my($env) = shift;
-    my($tgtdir) = $dir::cwd->lookupdir($env->_subst(shift));
-    my $file;
-    for $file (map($dir::cwd->lookupfile($env->_subst($_)), @_)) {
-	my($tgt) = $tgtdir->lookupfile($file->{entry});
-	$tgt->bind(find build::install($env), $file);
-	$tgt->local(1);
-    }
-}
-
-sub Objects {
-    my($env) = shift;
-    map($dir::cwd->relpath($_), $env->_Objects(@_));
-}
-
-# Called with multiple source file references (or object files).
-# Returns corresponding object files references.
-sub _Objects {
-    my($env) = shift;
-    my($suffix) = $env->{SUFOBJ};
-    map($env->_Object($_, $_->{dir}->lookupfile($_->base_suf($suffix))),
-	map { ref $_ ? $_ : $dir::cwd->lookupfile($env->_subst($_)) }
-		grep(defined $_, @_));
-}
-
-# Called with an object and source reference.  If no object reference
-# is supplied, then the object file is determined implicitly from the
-# source file's extension. Sets up the appropriate rules for creating
-# the object from the source.  Returns the object reference.
-sub _Object {
-    my($env, $src, $obj) = @_;
-    return $obj if $src eq $obj; # don't need to build self from self.
-    my($objenv) = $env->_resolve($obj);
-    my($suffix) = $src->suffix;
-
-    my($builder) = $env->{SUFMAP}{$suffix};
-
-    if ($builder) {
-	$obj->bind((find $builder($objenv)), $src);
-    } else {
-	die("don't know how to construct ${\$obj->path} from " .
-	    "${\$src->path}.\n");
-    }
-    $obj
-}
-
-sub Program {
-    my($env) = shift;
-    my($tgt) = $dir::cwd->lookupfile(file::addsuffix($env->_subst(shift),
-						 $env->{SUFEXE}));
-    my($progenv) = $env->_resolve($tgt);
-    $tgt->bind(find build::command::link($progenv, $progenv->{LINKCOM}),
-	       $env->_Objects(@_));
-}
-
-sub Module {
-    my($env) = shift;
-    my($tgt) = $dir::cwd->lookupfile($env->_subst(shift));
-    my($modenv) = $env->_resolve($tgt);
-    my($com) = pop(@_);
-    $tgt->bind(find build::command::link($modenv, $com), $env->_Objects(@_));
-}
-
-sub LinkedModule {
-    my($env) = shift;
-    my($tgt) = $dir::cwd->lookupfile($env->_subst(shift));
-    my($progenv) = $env->_resolve($tgt);
-    $tgt->bind(find build::command::linkedmodule
-	       ($progenv, $progenv->{LINKMODULECOM}),
-	       $env->_Objects(@_));
-}
-
-sub Library {
-    my($env) = shift;
-    my($lib) = $dir::cwd->lookupfile(file::addsuffix($env->_subst(shift),
-						 $env->{SUFLIB}));
-    my($libenv) = $env->_resolve($lib);
-    $lib->bind(find build::command::library($libenv), $env->_Objects(@_));
-}
-
-# Simple derivation: you provide target, source(s), command.
-# Special variables substitute into the rule.
-# Target may be a reference, in which case it is taken
-# to be a multiple target (all targets built at once).
-sub Command {
-    my($env) = shift;
-    my($tgt) = $env->_subst(shift);
-    my($builder) = find build::command::user($env, pop(@_), 'script');
-    my(@sources) = map($dir::cwd->lookupfile($env->_subst($_)), @_);
-    if (ref($tgt)) {
-	# A multi-target command.
-	my(@tgts) = map($dir::cwd->lookupfile($_), @$tgt);
-	die("empty target list in multi-target command\n") if !@tgts;
-	$env = $env->_resolve($tgts[0]);
-	my($multi) = build::multiple->new($builder, \@tgts);
-	for $tgt (@tgts) {
-	    $tgt->bind($multi, @sources);
-	}
-    } else {
-	$tgt = $dir::cwd->lookupfile($tgt);
-	$env = $env->_resolve($tgt);
-	$tgt->bind($builder, @sources);
-    }
-}
-
-sub Depends {
-    my($env) = shift;
-    my($tgt) = $env->_subst(shift);
-    my(@deps) = map($dir::cwd->lookup($env->_subst($_)), @_);
-    if (! ref($tgt)) {
-	$tgt = [ $tgt ];
-    }
-    my($t);
-    foreach $t (map($dir::cwd->lookupfile($_), @$tgt)) {
-	push(@{$t->{dep}}, @deps);
-    }
-}
-
-# Setup a quick scanner for the specified input file, for the
-# associated environment. Any use of the input file will cause the
-# scanner to be invoked, once only. The scanner sees just one line at
-# a time of the file, and is expected to return a list of
-# dependencies.
-sub QuickScan {
-    my($env, $code, $file, $path) = @_;
-    $dir::cwd->lookup($env->_subst($file))->{'srcscan',$env} =
-	find scan::quickscan($code, $env, $env->_subst($path));
-}
-
-# Generic builder module. Just a few default methods.  Every derivable
-# file must have a builder object of some sort attached.  Usually
-# builder objects are shared.
-package build;
-
-use vars qw( %builder );
-
-# Every builder must now have at least an associated environment,
-# so we can find its sigarray and calculate the proper signature.
-sub find {
-    my($class, $env) = @_;
-    $builder{$env} || do {
-	my $self = { env => $env };
-	$builder{$env} = bless $self, $class;
-    }
-}
-
-# Null signature for dynamic includes.
-sub includes { () }
-
-# Null signature for build script.
-sub scriptsig { () }
-
-# Not compatible with any other builder, by default.
-sub compatible { 0 }
-
-
-# Builder module for the Install command.
-package build::install;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build) }
-
-# Caching not supported for Install: generally install is trivial anyway,
-# and we don't want to clutter the cache.
-sub cachin { undef }
-sub cachout { }
-
-# Do the installation.
-sub action {
-    my($self, $tgt) = @_;
-    my($src) = $tgt->{sources}[0];
-    main::showcom("Install ${\$src->rpath} as ${\$tgt->path}")
-	if ($param::install && $param::quiet < 1);
-    return unless $param::build;
-    futil::install($src->rpath, $tgt);
-    return 1;
-}
-
-
-# Builder module for generic UNIX commands.
-package build::command;
-
-use vars qw( @ISA %com );
-
-BEGIN { @ISA = qw(build) }
-
-sub find {
-    my($class, $env, $cmd, $package) = @_;
-    my($act) = action::new($env, $cmd);
-    $package ||= '';
-    $com{$env,$act,$package} || do {
-	my $self = { env => $env, act => $act, 'package' => $package };
-	$com{$env,$act,$package} = bless $self, $class;
-    }
-}
-
-# Default cache in function.
-sub cachin {
-    my($self, $tgt, $sig) = @_;
-    if (cache::in($tgt, $sig)) {
-	if ($param::cachecom) {
-	    $self->{act}->show($self->{env}, $tgt);
-	} else {
-	    printf("Retrieved %s from cache\n", $tgt->path)
-		if ($param::quiet < 1);
-	}
-	return 1;
-    }
-    return undef;
-}
-
-# Default cache out function.
-sub cachout {
-    my($self, $tgt, $sig) = @_;
-    cache::out($tgt, $sig);
-}
-
-# Build the target using the previously specified commands.
-sub action {
-    my($self, $tgt) = @_;
-    $self->{act}->execute($self->{env}, $tgt, $self->{'package'});
-}
-
-# Return script signature.
-sub scriptsig {
-    $_[0]->{act}->scriptsig
-}
-
-
-# Create a linked module.
-package build::command::link;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-# Find an appropriate linker.
-sub find {
-    my($class, $env, $command) = @_;
-    if (!exists $env->{_LDIRS}) {
-	my($ldirs) = '';
-	my($wd) = $env->{_cwd};
-	my($pdirs) = $env->{LIBPATH};
-	if (! defined $pdirs) {
-	    $pdirs = [ ];
-	} elsif (ref($pdirs) ne 'ARRAY') {
-	    $pdirs = [ split(/$main::PATH_SEPARATOR/o, $pdirs) ];
-	}
-	my($dir, $dpath);
-	for $dir (map($wd->lookupdir($env->_subst($_)), @$pdirs)) {
-	    $dpath = $dir->path;
-	    # Add the (presumably local) directory to the -L flags
-	    # if we're not using repositories, the directory exists,
-	    # or it's Linked to a source directory (that is, it *will*
-	    # exist by the time the link occurs).
-	    $ldirs .= " ".$env->{LIBDIRPREFIX}.$dpath.$env->{LIBDIRSUFFIX}
-			if ! @param::rpath || -d $dpath || $dir->is_linked;
-	    next if File::Spec->file_name_is_absolute($dpath);
-	    if (@param::rpath) {
-		my $d;
-		if ($dpath eq $dir::CURDIR) {
-		    foreach $d (map($_->path, @param::rpath)) {
-			$ldirs .= " " . $env->{LIBDIRPREFIX} .
-				  $d . $env->{LIBDIRSUFFIX};
-		    }
-		} else {
-		    my($rpath);
-		    foreach $d (map($_->path, @param::rpath)) {
-			$rpath = File::Spec->catfile($d, $dpath);
-			$ldirs .= " ". $env->{LIBDIRPREFIX} .
-				  $rpath . $env->{LIBDIRSUFFIX} if -d $rpath;
-		    }
-		}
-	    }
-	}
-	$env->{_LDIRS} = "%($ldirs%)";
-    }
-
-    # Introduce a new magic _LIBS symbol which allows to use the
-    # Unix-style -lNAME syntax for Win32 only. -lNAME will be replaced
-    # with %{PREFLIB}NAME%{SUFLIB}. <schwarze@isa.de> 1998-06-18
-
-    if ($main::_WIN32 && !exists $env->{_LIBS}) {
-	my $libs;
-	my $name;
-	for $name (split(' ', $env->_subst($env->{LIBS} || ''))) {
-	    if ($name =~ /^-l(.*)/) {
-		$name = "$env->{PREFLIB}$1$env->{SUFLIB}";
-	    }
-	    $libs .= ' ' . $name;
-	}
-	$env->{_LIBS} = $libs ? "%($libs%)" : '';
-    }
-    bless find build::command($env, $command);
-}
-
-# Called from file::build. Make sure any libraries needed by the
-# environment are built, and return the collected signatures
-# of the libraries in the path.
-sub includes {
-    return $_[0]->{'bsig'} if exists $_[0]->{'bsig'};
-    my($self, $tgt) = @_;
-    my($env) = $self->{env};
-    my($ewd) = $env->{_cwd};
-    my $ldirs = $env->{LIBPATH};
-    if (! defined $ldirs) {
-	$ldirs = [ ];
-    } elsif (ref($ldirs) ne 'ARRAY') {
-	$ldirs = [ split(/$main::PATH_SEPARATOR/o, $ldirs) ];
-    }
-    my @lpath = map($ewd->lookupdir($_), @$ldirs);
-    my(@sigs);
-    my(@names);
-
-    # Pass %LIBS symbol through %-substituition
-    # <schwarze@isa.de> 1998-06-18
-    @names = split(' ', $env->_subst($env->{LIBS} || ''));
-    my $name;
-    for $name (@names) {
-	my ($lpath, @allnames);
-	if ($name =~ /^-l(.*)/) {
-	    # -l style names are looked up on LIBPATH, using all
-	    # possible lib suffixes in the same search order the
-	    # linker uses (according to SUFLIBS).
-	    # Recognize new PREFLIB symbol, which should be 'lib' on
-	    # Unix, and empty on Win32. TODO: What about shared
-	    # library suffixes?  <schwarze@isa.de> 1998-05-13
-	   @allnames = map("$env->{PREFLIB}$1$_",
-			   split(/:/, $env->{SUFLIBS}));
-	    $lpath = \@lpath;
-	} else {
-	    @allnames = ($name);
-	    # On Win32, all library names are looked up in LIBPATH
-	    # <schwarze@isa.de> 1998-05-13
-	    if ($main::_WIN32) {
-		$lpath = [$dir::top, @lpath];
-	    }
-	    else {
-		$lpath = [$dir::top];
-	    }
-	}
-	my $dir;
-	DIR: for $dir (@$lpath) {
-	    my $n;
-	    for $n (@allnames) {
-		my($lib) = $dir->lookup_accessible($n);
-		if ($lib) {
-		    last DIR if $lib->ignore;
-		    if ((build $lib) eq 'errors') {
-			$tgt->{status} = 'errors';
-			return undef;
-		    }
-		    push(@sigs, 'sig'->signature($lib));
-		    last DIR;
-		}
-	    }
-	}
-    }
-    $self->{'bsig'} = 'sig'->collect(@sigs);
-}
-
-# Always compatible with other such builders, so the user
-# can define a single program or module from multiple places.
-sub compatible {
-    my($self, $other) = @_;
-    ref($other) eq "build::command::link";
-}
-
-# Link a program.
-package build::command::linkedmodule;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-# Always compatible with other such builders, so the user
-# can define a single linked module from multiple places.
-sub compatible {
-    my($self, $other) = @_;
-    ref($other) eq "build::command::linkedmodule";
-}
-
-# Builder for a C module
-package build::command::cc;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find {
-    $_[1]->{_cc} || do {
-	my($class, $env) = @_;
-	my($cpppath) = $env->_subst($env->{CPPPATH});
-	my($cscanner) = find scan::cpp($env->{_cwd}, $cpppath);
-	$env->{_IFLAGS} = "%(" . $cscanner->iflags($env) . "%)";
-	my($self) = find build::command($env, $env->{CCCOM});
-	$self->{scanner} = $cscanner;
-	bless $env->{_cc} = $self;
-    }
-}
-
-# Invoke the associated	 C scanner to get signature of included files.
-sub includes {
-    my($self, $tgt) = @_;
-    $self->{scanner}->includes($tgt, $tgt->{sources}[0]);
-}
-
-# Builder for a C++ module
-package build::command::cxx;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find {
-    $_[1]->{_cxx} || do {
-	my($class, $env) = @_;
-	my($cpppath) = $env->_subst($env->{CPPPATH});
-	my($cscanner) = find scan::cpp($env->{_cwd}, $cpppath);
-	$env->{_IFLAGS} = "%(" . $cscanner->iflags($env) . "%)";
-	my($self) = find build::command($env, $env->{CXXCOM});
-	$self->{scanner} = $cscanner;
-	bless $env->{_cxx} = $self;
-    }
-}
-
-# Invoke the associated	 C scanner to get signature of included files.
-sub includes {
-    my($self, $tgt) = @_;
-    $self->{scanner}->includes($tgt, $tgt->{sources}[0]);
-}
-
-# Builder for a user command (cons::Command).  We assume that a user
-# command might be built and implement the appropriate dependencies on
-# the command itself (actually, just on the first word of the command
-# line).
-package build::command::user;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub includes {
-    my($self, $tgt) = @_;
-    my($sig) = '';
-
-    # Check for any quick scanners attached to source files.
-    my $dep;
-    for $dep (@{$tgt->{dep}}, @{$tgt->{sources}}) {
-	my($scanner) = $dep->{'srcscan',$self->{env}};
-	if ($scanner) {
-	    $sig .= $scanner->includes($tgt, $dep);
-	}
-    }
-
-    # XXX Optimize this to not use ignored paths.
-    if (! exists $self->{_comsig}) {
-	my($env) = $self->{env};
-	$self->{_comsig} = '';
-	my($com, $dir);
-      com:
-	for $com ($self->{act}->commands) {
-	    my($pdirs) = $env->{ENV}->{PATH};
-	    if (! defined $pdirs) {
-		$pdirs = [ ];
-	    } elsif (ref($pdirs) ne 'ARRAY') {
-		$pdirs = [ split(/$main::PATH_SEPARATOR/o, $pdirs) ];
-	    }
-	    for $dir (map($dir::top->lookupdir($_), @$pdirs)) {
-		my($prog) = $dir->lookup_accessible($com);
-		if ($prog) { # XXX Not checking execute permission.
-		    if ((build $prog) eq 'errors') {
-			$tgt->{status} = 'errors';
-			return $sig;
-		    }
-		    next com if $prog->ignore;
-		    $self->{_comsig} .= 'sig'->signature($prog);
-		    next com;
-		}
-	    }
-	}
-    }
-
-    return $self->{_comsig} . $sig
-}
-
-
-# Builder for a library module (archive).
-# We assume that a user command might be built and implement the
-# appropriate dependencies on the command itself.
-package build::command::library;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find {
-    my($class, $env) = @_;
-    bless find build::command($env, $env->{ARCOM})
-}
-
-# Always compatible with other library builders, so the user
-# can define a single library from multiple places.
-sub compatible {
-    my($self, $other) = @_;
-    ref($other) eq "build::command::library";
-}
-
-# A multi-target builder.
-# This allows multiple targets to be associated with a single build
-# script, without forcing all the code to be aware of multiple targets.
-package build::multiple;
-
-sub new {
-    my($class, $builder, $tgts) = @_;
-    bless { 'builder' => $builder, 'env' => $builder->{env}, 'tgts' => $tgts };
-}
-
-sub scriptsig {
-    my($self, $tgt) = @_;
-    $self->{builder}->scriptsig($tgt);
-}
-
-sub includes {
-    my($self, $tgt) = @_;
-    $self->{builder}->includes($tgt);
-}
-
-sub compatible {
-    my($self, $tgt) = @_;
-    $self->{builder}->compatible($tgt);
-}
-
-sub cachin {
-    my($self, $tgt, $sig) = @_;
-    $self->{builder}->cachin($tgt, $sig);
-}
-
-sub cachout {
-    my($self, $tgt, $sig) = @_;
-    $self->{builder}->cachout($tgt, $sig);
-}
-
-sub action {
-    my($self, $invoked_tgt) = @_;
-    return $self->{built} if exists $self->{built};
-
-    # Make sure all targets in the group are unlinked before building any.
-    my($tgts) = $self->{tgts};
-    my $tgt;
-    for $tgt (@$tgts) {
-	futil::mkdir($tgt->{dir});
-	unlink($tgt->path) if ! $tgt->precious;
-    }
-
-    # Now do the action to build all the targets. For consistency
-    # we always call the action on the first target, just so that
-    # $> is deterministic.
-    $self->{built} = $self->{builder}->action($tgts->[0]);
-
-    # Now "build" all the other targets (except for the one
-    # we were called with). This guarantees that the signature
-    # of each target is updated appropriately. We force the
-    # targets to be built even if they have been previously
-    # considered and found to be OK; the only effect this
-    # has is to make sure that signature files are updated
-    # correctly.
-    for $tgt (@$tgts) {
-	if ($tgt ne $invoked_tgt) {
-	    delete $tgt->{status};
-	    'sig'->invalidate($tgt);
-	    build $tgt;
-	}
-    }
-
-    # Status of action.
-    $self->{built};
-}
-
-package action;
-
-sub new {
-    my($env, $act) = @_;
-    if (ref($act) eq 'CODE') {
-	return action::perl->new($act);
-    } else {
-	return action::command->new($env, $act);
-    }
-}
-
-package action::command;
-
-use vars qw( @ISA %cmd %_varopts $_varletters );
-
-BEGIN {
-    @ISA = $main::_WIN32 ? 'action::command::win32' : 'action::command::unix';
-
-    # Internal hash for processing variable options.
-    # f: return file part
-    # d: return directory part
-    # F: return file part, but strip any suffix
-    # b: return full path, but strip any suffix (a.k.a. return basename)
-    # s: return only the suffix (or an empty string, if no suffix is there)
-    # a: return the absolute path to the file
-    # S: return the absolute path to a Linked source file
-    %_varopts = (
-	'f' => sub { return $_[0]->{entry}; },
-	'd' => sub { return $_[0]->{dir}->path; },
-	'F' => sub { my $subst = $_[0]->{entry};
-		     $subst =~ s/\.[^\.]+$//;
-		     return $subst; },
-	'b' => sub { my $subst =  $_[0]->path;
-		     $subst =~ s/\.[^\.]+$//;
-		     return $subst; },
-	's' => sub { my $subst = $_[0]->{entry};
-		     $subst =~ m/(\.[^\.]+)$/;
-		     return $1; },
-	'a' => sub { my $path = $_[0]->path;
-		     if (! File::Spec->file_name_is_absolute($path)) {
-			$path = File::Spec->catfile(Cwd::cwd(), $path);
-		     }
-		     return $path; },
-	'S' => sub { my $path = $_[0]->srcpath;
-		     if (! File::Spec->file_name_is_absolute($path)) {
-			my $cwd = File::Spec->canonpath(Cwd::cwd());
-			$path = File::Spec->catfile($cwd, $path);
-		     }
-		     return $path; },
-    );
-
-    $_varletters = join('', keys %_varopts);
-}
-
-# Internal routine for processing variable options.
-# Options are specified in hash in the BEGIN block above.
-# no option: return path to file (relative to top,
-# or absolute if it's outside)
-sub _variant {
-    my($opt, $file) = @_;
-    $opt = '' if ! defined $opt;
-    if (defined $_varopts{$opt}) {
-	return &{$_varopts{$opt}}($file);
-    }
-    return $file->path;
-}
-
-sub new {
-    my($class, $env, $cmd) = @_;
-    $cmd = $env->_subst($cmd);
-    $cmd{$env,$cmd} || do {
-	# Remove unwanted bits from signature -- those bracketed by %( ... %)
-	my $sigs = $cmd;
-	my $sig = '';
-	if (ref($sigs) eq 'ARRAY') {
-	    # This is an array of commands..
-	    my $f;
-	    foreach $f (@$sigs) {
-		$sig .= _strip($f);
-	    }
-	} else {
-	    $sig = _strip($sigs);
-	}
-	my $self = { cmd => $cmd, cmdsig => 'sig'->cmdsig($sig) };
-	$cmd{$env,$cmd} = bless $self, $class;
-    }
-}
-
-sub _strip {
-    my $sig = shift;
-    $sig =~ s/^\@\s*//mg;
-    while ($sig =~ s/%\(([^%]|%[^\(])*?%\)//g) { }
-    $sig;
-}
-
-sub scriptsig {
-    $_[0]->{cmdsig};
-}
-
-# Return an array of all the commands (first word on each line).
-sub commands {
-    my($self) = @_;
-    my(@cmds) = ();
-    my $com;
-    my $cmd = $self->{'cmd'};
-    my @allcoms;
-
-    push @allcoms, ref $cmd ? @{$cmd} : split(/\n/, $cmd);
-
-    for $com (@allcoms) {
-	$com =~ s/^\s*//;
-	$com =~ s/\s.*//;
-	next if ! $com; # blank line
-	push @cmds, $com;
-    }
-    @cmds;
-}
-
-# For the signature of a basic command, we don't bother
-# including the command itself. This is not strictly correct,
-# and if we wanted to be rigorous, we might want to insist
-# that the command was checked for all the basic commands
-# like gcc, etc. For this reason we don't have an includes
-# method.
-
-# Call this to get the command line script: an array of
-# fully substituted commands.
-sub getcoms {
-    my($self, $env, $tgt) = @_;
-    my(@coms);
-    my $com;
-    my @allcoms = ();
-    my $cmd = $self->{'cmd'};
-
-    push @allcoms, ref $cmd ? @{$cmd} : split(/\n/, $cmd);
-
-    for $com (@allcoms) {
-	my(@src) = (undef, @{$tgt->{sources}});
-	my(@src1) = @src;
-
-	next if $com =~ /^\s*$/;
-
-	# NOTE: we used to have a more elegant s//.../e solution
-	# for the items below, but this caused a bus error...
-
-	# Remove %( and %) -- those are only used to bracket parts
-	# of the command that we don't depend on.
-	$com =~ s/%[()]//g;
-
-	# Deal with %n, n=1,9 and variants.
-	while ($com =~ /%([1-9])(:([$_varletters]?))?/o) {
-	    my($match) = $&;
-	    my($src) = $src1[$1];
-	    my($subst) = _variant($3, $src1[$1]->rfile);
-	    undef $src[$1];
-	    $com =~ s/$match/$subst/;
-	}
-
-	# Deal with %0 aka %> and variants.
-	while ($com =~ /%[0>](:([$_varletters]?))?/o) {
-	    my($match) = $&;
-	    my($subst) = _variant($2, $tgt);
-	    $com =~ s/$match/$subst/;
-	}
-
-	# Deal with %< (all sources except %n's already used)
-	while ($com =~ /%<(:([$_varletters]?))?/o) {
-	    my($match) = $&;
-	    my @list = ();
-	    foreach (@src) {
-		push(@list, _variant($2, $_->rfile)) if $_;
-	    }
-	    my($subst) = join(' ', @list);
-	    $com =~ s/$match/$subst/;
-	}
-
-	# Deal with %[ %].
-	$com =~ s{%\[(.*?)%\]}{
-	    my($func, @args) = grep { $_ ne '' } split(/\s+/, $1);
-	    die("$0: \"$func\" is not defined.\n")
-		unless ($env->{$func});
-	    &{$env->{$func}}(@args);
-	}gex;
-
-	# Convert left-over %% into %.
-	$com =~ s/%%/%/g;
-
-	# White space cleanup. XXX NO WAY FOR USER TO HAVE QUOTED SPACES
-	$com = join(' ', split(' ', $com));
-	next if $com =~ /^:/ && $com !~ /^:\S/;
-	push(@coms, $com);
-    }
-    @coms
-}
-
-# Build the target using the previously specified commands.
-sub execute {
-    my($self, $env, $tgt, $package) = @_;
-
-    if ($param::build) {
-	futil::mkdir($tgt->{dir});
-	unlink($tgt->path) if ! $tgt->precious;
-    }
-
-    # Set environment.
-    map(delete $ENV{$_}, keys %ENV);
-    %ENV = %{$env->{ENV}};
-
-    # Handle multi-line commands.
-    my $com;
-    for $com ($self->getcoms($env, $tgt)) {
-	if ($com !~ s/^\@\s*//) {
-	    main::showcom($com);
-	}
-	next if ! $param::build;
-
-	if ($com =~ /^\[perl\]\s*/) {
-	    my $perlcmd = $';
-	    my $status;
-	    {
-		# Restore the script package variables that were defined
-		# in the Conscript file that defined this [perl] build,
-		# so the code executes with the expected variables.
-		# Then actually execute (eval) the [perl] command to build
-		# the target, followed by cleaning up the name space
-		# by deleting the package variables we just restored.
-		my($pkgvars) = $tgt->{conscript}->{pkgvars};
-		NameSpace::restore($package, $pkgvars) if $pkgvars;
-		$status = eval "package $package; $perlcmd";
-		NameSpace::remove($package, keys %$pkgvars) if $pkgvars;
-	    }
-	    if (!defined($status)) {
-		warn "$0: *** Error during perl command eval: $@.\n";
-		return undef;
-	    } elsif ($status == 0) {
-		warn "$0: *** Perl command returned $status "
-		   . "(this indicates an error).\n";
-		return undef;
-	    }
-	    next;
-	}
-	if (! $self->do_command($com, $tgt->path)) {
-		return undef;
-	}
-    }
-
-    # success.
-    return 1;
-}
-
-sub show {
-    my($self, $env, $tgt) = @_;
-    my $com;
-    for $com ($self->getcoms($env, $tgt)) {
-	if ($com !~ /^\@\s*/) {
-	    main::showcom($com);
-	}
-    }
-}
-
-package action::command::unix;
-
-sub do_command {
-    my($class, $com, $path) = @_;
-    my($pid) = fork();
-    die("$0: unable to fork child process ($!)\n") if !defined $pid;
-    if (!$pid) {
-	# This is the child.  We eval the command to suppress -w
-	# warnings about not reaching the statements afterwards.
-	eval 'exec($com)';
-	$com =~ s/\s.*//;
-	die qq($0: failed to execute "$com" ($!). )
-	  . qq(Is this an executable on path "$ENV{PATH}"?\n);
-    }
-    for (;;) {
-	do {} until wait() == $pid;
-	my ($b0, $b1) = ($? & 0xFF, $? >> 8);
-	# Don't actually see 0177 on stopped process; is this necessary?
-	next if $b0 == 0177; # process stopped; we can wait.
-	if ($b0) {
-	    my($core, $sig) = ($b0 & 0200, $b0 & 0177);
-	    my($coremsg) = $core ? "; core dumped" : "";
-	    $com =~ s/\s.*//;
-	    my $err = "$0: *** \[$path\] $com terminated by signal " .
-		  "$sig$coremsg\n";
-	    warn $err;
-	    return undef;
-	}
-	if ($b1) {
-	    warn qq($0: *** [$path] Error $b1\n); # trying to be like make.
-	    return undef;
-	}
-	last;
-    }
-    return 1;
-}
-
-package action::command::win32;
-
-sub do_command {
-    my($class, $com, $path) = @_;
-    system($com);
-    if ($?) {
-	my ($b0, $b1) = ($? & 0xFF, $? >> 8);
-	my $err = $b1 || $?;
-	my $warn = qq($0: *** [$path] Error $err);
-	$warn .= " (executable not found in path?)" if $b1 == 0xFF;
-	warn "$warn\n";
-	return undef;
-    }
-    return 1;
-}
-
-package action::perl;
-
-# THIS IS AN EXPERIMENTAL PACKAGE.  It's entirely possible that the
-# interface may change as this gets completed, so use at your own risk.
-#
-# There are (at least) two issues that need to be solved before blessing
-# this as a real, fully-supported feature:
-#
-#   --	We need to calculate a signature value for a Perl code ref, in
-#	order to rebuild the target if there's a change to the Perl code
-#	used to generate it.
-#
-#	This is not straightforward.  A B::Deparse package exists that
-#	decompiles a coderef into text.  It's reportedly not completely
-#	reliable for closures; it misses which variables are global, and
-#	the values of private lexicals.  Nevertheless, it'd probably
-#	be perfect for our purposes, except that it wasn't added until
-#	some time between Perl 5.00502 and 5.00554, and doesn't seem to
-#	really work until Perl 5.6.0, so by relying on it, we'd lose
-#	support for Perl versions back to 5.003*.
-#
-#   --	Ideally, a code ref should be able to use something like
-#	$env->_subst to fetch values from the construction environment
-#	to modify its behavior without having to cut-and-paste code.
-#	(Actually, since we pass the environment to the executed code
-#	ref, there's no reason you can't do this with the code as it
-#	stands today.)  But this REALLY complicates the signature
-#	calculation, because now the actual signature would depend not
-#	just on the code contents, but on the construction variables (or
-#	maybe just the environment).
-#
-# A potentially valid workaround would be to use the contents of the
-# Conscript file in which the code reference is defined as the code
-# ref's signature.  This has the drawback of causing a recompilation of
-# the target file even in response to unrelated changes in the Conscript
-# file, but it would ensure correct builds without having to solve the
-# messy issues of generating a signature directly from a code ref.
-#
-# Nevertheless, this seemed a useful enough skeleton of a feature that
-# it made sense to release it in hopes that some practical experience
-# will encourage someone to figure out how to solve the signature
-# issues.  Or maybe we'll discover these aren't big issues in practice
-# and end up blessing it as is.
-
-use vars qw( %code );
-
-sub new {
-    my($class, $cref) = @_;
-    $code{$cref} || do {
-	my $sig = '';
-	# Generating a code signature using B::Deparse doesn't really
-	# work for us until Perl 5.6.0.  Here's the code in case
-	# someone wants to use it.
-	#use B::Deparse;
-	#my $deparse = B::Deparse->new();
-	#my $body = $deparse->coderef2text($cref);
-	#$sig = $body;	# should be an MD5 sig
-	my($self) = { cref => $cref, crefsig => $sig };
-	$code{$cref} = bless $self, $class;
-    }
-}
-
-sub scriptsig {
-    $_[0]->{crefsig}
-}
-
-sub execute {
-    my($self, $env, $tgt) = @_;
-    if ($param::build) {
-	futil::mkdir($tgt->{dir});
-	unlink($tgt->path) if ! $tgt->precious;
-	my($cref) = $self->{cref};
-	&$cref($env, $tgt->path, map($_->rpath, @{$tgt->{sources}}));
-    }
-}
-
-sub commands {
-    return ();
-}
-
-
-# Generic scanning module.
-package scan;
-
-# Returns the signature of files included by the specified files on
-# behalf of the associated target. Any errors in handling the included
-# files are propagated to the target on whose behalf this processing
-# is being done. Signatures are cached for each unique file/scanner
-# pair.
-sub includes {
-    my($self, $tgt, @files) = @_;
-    my(%files, $file);
-    my($inc) = $self->{includes} || ($self->{includes} = {});
-    while ($file = pop @files) {
-	next if exists $files{$file};
-	if ($inc->{$file}) {
-	    push(@files, @{$inc->{$file}});
-	    $files{$file} = 'sig'->signature($file->rfile);
-	} else {
-	    if ((build $file) eq 'errors') {
-		$tgt->{status} = 'errors'; # tgt inherits build status
-		return ();
-	    }
-	    $files{$file} = 'sig'->signature($file->rfile);
-	    my(@includes) = $self->scan($file);
-	    $inc->{$file} = \@includes;
-	    push(@files, @includes);
-	}
-    }
-    'sig'->collect(sort values %files)
-}
-
-
-# A simple scanner. This is used by the QuickScanfunction, to setup
-# one-time target and environment-independent scanning for a source
-# file. Only used for commands run by the Command method.
-package scan::quickscan;
-
-use vars qw( @ISA %scanner );
-
-BEGIN { @ISA = qw(scan) }
-
-sub find {
-    my($class, $code, $env, $pdirs) = @_;
-    if (! defined $pdirs) {
-	$pdirs = [ ] ;
-    } elsif (ref($pdirs) ne 'ARRAY') {
-	$pdirs = [ split(/$main::PATH_SEPARATOR/o, $pdirs) ];
-    }
-    my(@path) = map { $dir::cwd->lookupdir($_) } @$pdirs;
-    my($spath) = "@path";
-    $scanner{$code,$env,$spath} || do {
-	my($self) = { code => $code, env => $env, path => \@path };
-	$scanner{$code,$env,$spath} = bless $self;
-    }
-}
-
-# Scan the specified file for included file names.
-sub scan {
-    my($self, $file) = @_;
-    my($code) = $self->{code};
-    my(@includes);
-    # File should have been built by now. If not, we'll ignore it.
-    return () unless open(SCAN, $file->rpath);
-    while(<SCAN>) {
-	push(@includes, grep($_ ne '', &$code));
-    }
-    close(SCAN);
-    my($wd) = $file->{dir};
-    my(@files);
-    my $name;
-    for $name (@includes) {
-	my $dir;
-	for $dir ($file->{dir}, @{$self->{path}}) {
-	    my($include) = $dir->lookup_accessible($name);
-	    if ($include) {
-		push(@files, $include) unless $include->ignore;
-		last;
-	    }
-	}
-    }
-    @files
-}
-
-
-# CPP (C preprocessor) scanning module
-package scan::cpp;
-
-use vars qw( @ISA %scanner );
-
-BEGIN { @ISA = qw(scan) }
-
-# For this constructor, provide the include path argument (colon
-# separated). Each path is taken relative to the provided directory.
-
-# Note: a particular scanning object is assumed to always return the
-# same result for the same input. This is why the search path is a
-# parameter to the constructor for a CPP scanning object. We go to
-# some pains to make sure that we return the same scanner object
-# for the same path: otherwise we will unecessarily scan files.
-sub find {
-    my($class, $dir, $pdirs) = @_;
-    if (! defined $pdirs) {
-	$pdirs = [ ];
-    } elsif (ref($pdirs) ne 'ARRAY') {
-	$pdirs = [ split(/$main::PATH_SEPARATOR/o, $pdirs) ];
-    }
-    my @path = map($dir->lookupdir($_), @$pdirs);
-    my($spath) = "@path";
-    $scanner{$spath} || do {
-	my($self) = {'path' => \@path};
-	$scanner{$spath} = bless $self;
-    }
-}
-
-# Scan the specified file for include lines.
-sub scan {
-    my($self, $file) = @_;
-    my($angles, $quotes);
-
-    if (exists $file->{angles}) {
-	$angles = $file->{angles};
-	$quotes = $file->{quotes};
-    } else {
-	my(@anglenames, @quotenames);
-	return () unless open(SCAN, $file->rpath);
-	while (<SCAN>) {
-	    next unless /^\s*#/;
-	    if (/^\s*#\s*include\s*([<"])(.*?)[>"]/) {
-		if ($1 eq "<") {
-		    push(@anglenames, $2);
-		} else {
-		    push(@quotenames, $2);
-		}
-	    }
-	}
-	close(SCAN);
-	$angles = $file->{angles} = \@anglenames;
-	$quotes = $file->{quotes} = \@quotenames;
-    }
-
-
-    my(@shortpath) = @{$self->{path}};	  # path for <> style includes
-    my(@longpath) = ($file->{dir}, @shortpath); # path for "" style includes
-
-    my(@includes);
-
-    my $name;
-    for $name (@$angles) {
-	my $dir;
-	for $dir (@shortpath) {
-	    my($include) = $dir->lookup_accessible($name);
-	    if ($include) {
-		push(@includes, $include) unless $include->ignore;
-		last;
-	    }
-	}
-    }
-
-    for $name (@$quotes) {
-	my $dir;
-	for $dir(@longpath) {
-	    my($include) = $dir->lookup_accessible($name);
-	    if ($include) {
-		push(@includes, $include) unless $include->ignore;
-		last;
-	    }
-	}
-    }
-
-    return @includes
-}
-
-# Return the include flags that would be used for a C Compile.
-sub iflags {
-    my($self, $env) = @_;
-    my($iflags) = '';
-    my($dir, $dpath);
-    for $dir (@{$self->{path}}) {
-	$dpath = $dir->path;
-	# Add the (presumably local) directory to the -I flags
-	# if we're not using repositories, the directory exists,
-	# or it's Linked to a source directory (that is, it *will*
-	# exist by the time the compilation occurs).
-	$iflags .= " ".$env->{INCDIRPREFIX}.$dpath.$env->{INCDIRSUFFIX}
-		if ! @param::rpath || -d $dpath || $dir->is_linked;
-	next if File::Spec->file_name_is_absolute($dpath);
-	if (@param::rpath) {
-	    my $d;
-	    if ($dpath eq $dir::CURDIR) {
-		foreach $d (map($_->path, @param::rpath)) {
-		    $iflags .= " ".$env->{INCDIRPREFIX}.$d.$env->{INCDIRSUFFIX};
-		}
-	    } else {
-		my($rpath);
-		foreach $d (map($_->path, @param::rpath)) {
-		    $rpath = File::Spec->catfile($d, $dpath);
-		    $iflags .= " ".$env->{INCDIRPREFIX}.$rpath.$env->{INCDIRSUFFIX}
-				if -d $rpath;
-		}
-	    }
-	}
-    }
-    $iflags
-}
-
-package File::Spec;
-
-use vars qw( $_SEP $_MATCH_SEP $_MATCH_VOL );
-
-# Cons is migrating to using File::Spec for portable path name
-# manipulation.  This is the right long-term direction, but there are
-# some problems with making the transition:
-#
-#	For multi-volume support, we need to use newer interfaces
-#	(splitpath, catpath, splitdir) that are only available in
-#	File::Spec 0.8.
-#
-#	File::Spec 0.8 doesn't work with Perl 5.00[34] due to
-#	regular expression incompatibilities (use of \z).
-#
-#	Forcing people to use a new version of a module is painful
-#	because (in the workplace) their administrators aren't
-#	always going to agree to install it everywhere.
-#
-# As a middle ground, we provide our own versions of all the File::Spec
-# methods we use, supporting both UNIX and Win32.  Some of these methods
-# are home brew, some are cut-and-pasted from the real File::Spec methods.
-# This way, we're not reinventing the whole wheel, at least.
-#
-# We can (and should) get rid of this class whenever 5.00[34] and
-# versions of File::Spec prior to 0.9 (?) have faded sufficiently.
-# We also may need to revisit whenever someone first wants to use
-# Cons on some platform other than UNIX or Win32.
-
-BEGIN {
-    if ($main::_WIN32) {
-	$_SEP = '\\';
-	$_MATCH_SEP = "[\Q/$_SEP\E]";
-	$_MATCH_VOL = "([a-z]:)?$_MATCH_SEP";
-    } else {
-	$_SEP = '/';
-	$_MATCH_SEP = "\Q$_SEP\E";
-	$_MATCH_VOL = $_MATCH_SEP;
-    }
-}
-
-sub canonpath {
-    my ($self, $path) = @_;
-    if ($main::_WIN32) {
-	$path =~ s/^([a-z]:)/\u$1/s;
-	$path =~ s|/|\\|g;
-	$path =~ s|([^\\])\\+|$1\\|g;                  # xx////xx  -> xx/xx
-	$path =~ s|(\\\.)+\\|\\|g;                     # xx/././xx -> xx/xx
-	$path =~ s|^(\.\\)+||s unless $path eq ".\\";  # ./xx      -> xx
-	$path =~ s|\\$||
-		 unless $path =~ m#^([A-Z]:)?\\$#s;   # xx/       -> xx
-    } else {
-	$path =~ s|/+|/|g unless($^O eq 'cygwin');     # xx////xx  -> xx/xx
-	$path =~ s|(/\.)+/|/|g;                        # xx/././xx -> xx/xx
-	$path =~ s|^(\./)+||s unless $path eq "./";    # ./xx      -> xx
-	$path =~ s|^/(\.\./)+|/|s;                     # /../../xx -> xx
-	$path =~ s|/$|| unless $path eq "/";          # xx/       -> xx
-    }
-    return $path;
-}
-
-sub catdir {
-    my $self = shift;
-    my @args = @_;
-    foreach (@args) {
-	# append a slash to each argument unless it has one there
-	$_ .= $_SEP if $_ eq '' || substr($_,-1) ne $_SEP;
-    }
-    return $self->canonpath(join('', @args));
-}
-
-sub catfile {
-    my $self = shift;
-    my $file = pop @_;
-    return $file unless @_;
-    my $dir = $self->catdir(@_);
-    $dir .= $_SEP unless substr($dir,-1) eq $_SEP;
-    $file = '' if ! defined($file);
-    return $dir.$file;
-}
-
-sub catpath {
-    my $path = $_[1] . $_[0]->catfile(@_[2..$#_]);
-    $path =~ s/(.)$_MATCH_SEP*$/$1/;
-    $path;
-}
-
-sub curdir {
-    '.'
-}
-
-sub file_name_is_absolute {
-    my ($self, $file) = @_;
-    return scalar($file =~ m{^$_MATCH_VOL}is);
-}
-
-sub splitdir {
-    my @dirs = split(/$_MATCH_SEP/, $_[1], -1);
-    push(@dirs, '') if $dirs[$#dirs];
-    @dirs;
-}
-
-sub splitpath {
-    my ($self, $path) = @_;
-    my $vol = '';
-    my $sep = $_SEP;
-    if ($main::_WIN32) {
-	if ($path =~ s#^([A-Za-z]:|(?:\\\\|//)[^\\/]+[\\/][^\\/]+)([\\/])#$2#) {
-	    $vol = $1;
-	    $sep = $2;
-	}
-    }
-    my(@path) = split(/$_MATCH_SEP/, $path, -1);
-    my $file = pop @path;
-    my $dirs = join($sep, @path, '');
-    return ($vol, $dirs, $file);
-}
-
-sub updir {
-    '..'
-}
-
-sub case_tolerant {
-    return $main::_WIN32;
-}
-
-# Directory and file handling. Files/dirs are represented by objects.
-# Other packages are welcome to add component-specific attributes.
-package dir;
-
-use vars qw( $SEPARATOR $MATCH_SEPARATOR $CURDIR $UPDIR
-	     $cwd_vol %root $top $cwd );
-
-BEGIN {
-    # A portable way of determing our directory separator.
-    $SEPARATOR = File::Spec->catdir('', '');
-    # A fast-path regular expression to match a directory separator
-    # anywhere in a path name.
-    if ($SEPARATOR eq '/') {
-	$MATCH_SEPARATOR = "\Q$SEPARATOR\E";
-    } else {
-	$MATCH_SEPARATOR = "[\Q/$SEPARATOR\E]";
-    }
-    # Cache these values so we don't have to make a method call
-    # every time we need them.
-    $CURDIR = File::Spec->curdir;	# '.' on UNIX
-    $UPDIR = File::Spec->updir;	# '..' on UNIX
-    #
-    $cwd_vol = '';
-}
-
-# Annotate a node (file or directory) with info about the
-# method that created it.
-sub creator {
-    my($self, @frame) = @_;
-    $self->{'creator'} = \@frame if @frame;
-    $self->{'creator'};
-}
-
-# Handle a file|dir type exception.  We only die if we find we were
-# invoked by something in a Conscript/Construct file, because
-# dependencies created directly by Cons' analysis shouldn't cause
-# an error.
-sub _type_exception {
-    my($e) = @_;
-    my($line, $sub);
-    (undef, undef, $line, $sub) = script::caller_info;
-    if (defined $line) {
-	my $err = "\"${\$e->path}\" already in use as a " . ref($e) . " before $sub on line $line";
-	if ($e->{'creator'}) {
-	    my $script;
-	    (undef, $script, $line, $sub) = @{$e->{'creator'}};
-	    $err = "\t" . $err . ",\n\t\tdefined by $sub in $script, line $line";
-	}
-	$err .= "\n";
-	die $err;
-    }
-}
-
-# This wraps up all the common File::Spec logic that we use for parsing
-# directory separators in a path and turning it into individual
-# subdirectories that we must create, as well as creation of root
-# nodes for any new file system volumes we find.  File::Spec doesn't have
-# intuitively obvious interfaces, so this is heavily commented.
-#
-# Note:  This is NOT an object or class method;
-# it's just a utility subroutine.
-sub _parse_path {
-    my($dir, $path) = @_;
-
-    # Convert all slashes to the native directory separator.
-    # This allows Construct files to always be written with good
-    # old POSIX path names, regardless of what we're running on.
-    $path = File::Spec->canonpath($path);
-
-    # File::Spec doesn't understand the Cons convention of
-    # an initial '#' for top-relative files.  Strip it.
-    my($toprel) = $path =~ s/^#//;
-
-    # Let File::Spec do the heavy lifting of parsing the path name.
-    my($vol, $directories, $entry) = File::Spec->splitpath($path);
-    my @dirs = File::Spec->splitdir($directories);
-
-    # If there was a file entry on the end of the path, then the
-    # last @dirs element is '' and we don't need it.  If there
-    # wasn't a file entry on the end (File::Spec->splitpath() knew
-    # the last component was a directory), then the last @dirs
-    # element becomes the entry we want to look up.
-    my($e) = pop @dirs;
-    $entry = $e if $entry eq '';
-
-    if (File::Spec->file_name_is_absolute($path)) {
-	# An absolute path name.  If no volume was supplied,
-	# use the volume of our current directory.
-	$vol = $cwd_vol if $vol eq '';
-	$vol = uc($vol) if File::Spec->case_tolerant;
-	if (! defined $root{$vol}) {
-	    # This is our first time looking up a path name
-	    # on this volume, so create a root node for it.
-	    # (On UNIX systems, $vol is always '', so '/'
-	    # always maps to the $root{''} node.)
-	    $root{$vol} = {path => $vol.$SEPARATOR,
-			prefix => $vol.$SEPARATOR,
-			srcpath => $vol.$SEPARATOR,
-			'exists' => 1 };
-	    $root{$vol}->{'srcdir'} = $root{$vol};
-	    bless $root{$vol};
-	}
-	# We're at the top, so strip the blank entry from the front of
-	# the @dirs array since the initial '/' it represents will now
-	# be supplied by the root node we return.
-	shift @dirs;
-	$dir = $root{$vol};
-    } elsif ($toprel) {
-	$dir = $dir::top;
-    }
-    ($dir, \@dirs, $entry);
-}
-
-# Common subroutine for creating directory nodes.
-sub _create_dirs {
-    my ($dir, @dirs) = @_;
-    my $e;
-    foreach $e (@dirs) {
-	my $d = $dir->{member}->{$e};
-	if (! defined $d) {
-	    bless $d = { 'entry' => $e, 'dir' => $dir, }, 'dir';
-	    $d->creator(script::caller_info);
-	    $d->{member}->{$dir::CURDIR} = $d;
-	    $d->{member}->{$dir::UPDIR} = $dir;
-	    $dir->{member}->{$e} = $d;
-	} elsif (ref $d eq 'entry') {
-	    bless $d, 'dir';
-	    $d->{member}->{$dir::CURDIR} = $d;
-	    $d->{member}->{$dir::UPDIR} = $dir;
-	} elsif (ref $d eq 'file') {
-	    # This clause is to supply backwards compatibility,
-	    # with a warning, for anyone that's used FilePath
-	    # to refer to a directory.  After people have using
-	    # 1.8 have had time to adjust (sometime in version
-	    # 1.9 or later), we should remove this entire clause.
-	    my($script, $line, $sub);
-	    (undef, $script, $line, $sub) = @{$d->{'creator'}};
-	    if ($sub eq 'script::FilePath') {
-		print STDERR "$0:  Warning:  $sub used to refer to a directory\n"
-			. "\tat line $line of $script.  Use DirPath instead.\n";
-		bless $d, 'dir';
-	    } else {
-		_type_exception($d);
-	    }
-	} elsif (ref $d ne 'dir') {
-	    _type_exception($d);
-	}
-	$dir = $d;
-    }
-    $dir;
-}
-
-# Look up an entry in a directory.  This method is for when we don't
-# care whether a file or directory is returned, so if the entry already
-# exists, it will simply be returned.  If not, we create it as a
-# generic "entry" which can be later turned into a file or directory
-# by a more-specific lookup.
-#
-# The file entry may be specified as relative, absolute (starts with /),
-# or top-relative (starts with #).
-sub lookup {
-    my($dir, $entry) = @_;
-
-    if ($entry !~ m#$MATCH_SEPARATOR#o) {
-	# Fast path: simple entry name in a known directory.
-	if ($entry =~ s/^#//) {
-	    # Top-relative names begin with #.
-	    $dir = $dir::top;
-	} elsif ($entry =~ s/^!//) {
-	    $dir = $dir::cwd->srcdir;
-	}
-    } else {
-	my $dirsref;
-	($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-	$dir = _create_dirs($dir, @$dirsref) if @$dirsref;
-	return if ! defined $dir;
-	return $dir if $entry eq '';
-    }
-
-    my $e = $dir->{member}->{$entry};
-    if (! defined $e) {
-	bless $e = { 'entry' => $entry, 'dir' => $dir, }, 'entry';
-	$e->creator(script::caller_info);
-	$dir->{member}->{$entry} = $e;
-    }
-
-    $e;
-}
-
-# Look up a file entry in a directory.
-#
-# The file entry may be specified as relative, absolute (starts with /),
-# or top-relative (starts with #).
-sub lookupfile {
-    my($dir, $entry) = @_;
-
-    if ($entry !~ m#$MATCH_SEPARATOR#o) {
-	# Fast path: simple entry name in a known directory.
-	if ($entry =~ s/^#//) {
-	    # Top-relative names begin with #.
-	    $dir = $dir::top;
-	} elsif ($entry =~ s/^!//) {
-	    $dir = $dir::cwd->srcdir;
-	}
-    } else {
-	my $dirsref;
-	($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-	$dir = _create_dirs($dir, @$dirsref) if @$dirsref;
-	return undef if $entry eq '';
-    }
-
-    my $f = $dir->{member}->{$entry};
-    if (! defined $f) {
-	bless $f = { 'entry' => $entry, 'dir' => $dir, }, 'file';
-	$f->creator(script::caller_info);
-	$dir->{member}->{$entry} = $f;
-    } elsif (ref $f eq 'entry') {
-	bless $f, 'file';
-    } elsif (ref $f ne 'file') {
-	_type_exception($f);
-    }
-
-    $f;
-}
-
-# Look up a (sub-)directory entry in a directory.
-#
-# The (sub-)directory entry may be specified as relative, absolute
-# (starts with /), or top-relative (starts with #).
-sub lookupdir {
-    my($dir, $entry) = @_;
-
-    my $dirsref;
-    if ($entry !~ m#$MATCH_SEPARATOR#o) {
-	# Fast path: simple entry name in a known directory.
-	if ($entry =~ s/^#//) {
-	    # Top-relative names begin with #.
-	    $dir = $dir::top;
-	} elsif ($entry =~ s/^!//) {
-	    $dir = $dir::cwd->srcdir;
-	}
-    } else {
-	($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-    }
-    push(@$dirsref, $entry) if $entry ne '';
-    _create_dirs($dir, @$dirsref);
-}
-
-# Look up a file entry and return it if it's accessible.
-sub lookup_accessible {
-    my $file = $_[0]->lookupfile($_[1]);
-    return ($file && $file->accessible) ? $file : undef;
-}
-
-# Return the parent directory without doing a lookupdir,
-# which would create a parent if it doesn't already exist.
-# A return value of undef (! $dir->up) indicates a root directory.
-sub up {
-    $_[0]->{member}->{$dir::UPDIR};
-}
-
-# Return whether this is an entry somewhere underneath the
-# specified directory.
-sub is_under {
-    my $dir = $_[0];
-    while ($dir) {
-	return 1 if $_[1] == $dir;
-	$dir = $dir->up;
-    }
-    return undef;
-}
-
-# Return the relative path from the calling directory ($_[1])
-# to the object.  If the object is not under the directory, then
-# we return it as a top-relative or absolute path name.
-sub relpath {
-    my ($dir, $obj) = @_;
-    my @dirs;
-    my $o = $obj;
-    while ($o) {
-	if ($dir == $o) {
-	    if (@dirs < 2) {
-		return $dirs[0] || '';
-	    } else {
-		return File::Spec->catdir(@dirs);
-	    }
-	}
-	unshift(@dirs, $o->{entry});
-	$o = $o->up;
-    }
-    # The object was not underneath the specified directory.
-    # Use the node's cached path, which is either top-relative
-    # (in which case we append '#' to the beginning) or
-    # absolute.
-    my $p = $obj->path;
-    $p = '#' . $p if ! File::Spec->file_name_is_absolute($p);
-    return $p;
-}
-
-# Return the path of the directory (file paths implemented
-# separately, below).
-sub path {
-    $_[0]->{path} ||
-	($_[0]->{path} = $_[0]->{dir}->prefix . $_[0]->{entry});
-}
-
-# Return the pathname as a prefix to be concatenated with an entry.
-sub prefix {
-    return $_[0]->{prefix} if exists $_[0]->{prefix};
-    $_[0]->{prefix} = $_[0]->path . $SEPARATOR;
-}
-
-# Return the related source path prefix.
-sub srcprefix {
-    return $_[0]->{srcprefix} if exists $_[0]->{srcprefix};
-    my($srcdir) = $_[0]->srcdir;
-    $srcdir->{srcprefix} = $srcdir eq $_[0] ? $srcdir->prefix
-					    : $srcdir->srcprefix;
-}
-
-# Return the related source directory.
-sub srcdir {
-    $_[0]->{'srcdir'} ||
-	($_[0]->{'srcdir'} = $_[0]->{dir}->srcdir->lookupdir($_[0]->{entry}))
-}
-
-# Return if the directory is linked to a separate source directory.
-sub is_linked {
-    return $_[0]->{is_linked} if defined $_[0]->{is_linked};
-    $_[0]->{is_linked} = $_[0]->path ne $_[0]->srcdir->path;
-}
-
-sub link {
-    my(@paths) = @_;
-    my($srcdir) = $dir::cwd->lookupdir(pop @paths)->srcdir;
-    map($dir::cwd->lookupdir($_)->{'srcdir'} = $srcdir, @paths);
-
-    # make a reverse lookup for the link.
-    $srcdir->{links} = [] if ! $srcdir->{links};
-    push @{$srcdir->{links}}, @paths;
-}
-
-use vars qw( @tail ); # TODO: Why global ????
-
-sub linked_targets {
-    my $tgt = shift;
-    my @targets = ();
-    my $dir;
-    if (ref $tgt eq 'dir') {
-	$dir = $tgt;
-    } else {
-	push @tail, $tgt;
-	$dir = $tgt->{dir};
-    }
-    while ($dir) {
-	if (defined $dir->{links} && @{$dir->{links}}) {
-	    push @targets,
-		 map(File::Spec->catdir($_, @tail), @{$dir->{links}});
-	    #print STDERR "Found Link: ${\$dir->path} -> @{\$dir->{links}}\n";
-	}
-	unshift @tail, $dir->{entry};
-	$dir = $dir->up;
-    }
-
-    return map($dir::top->lookupdir($_), @targets);
-}
-
-sub accessible {
-    my $path = $_[0]->path;
-    my $err = "$0: you have attempted to use path \"$path\" both as a file " .
-	      "and as a directory!\n";
-    die $err;
-}
-
-sub init {
-    my $path = Cwd::cwd();
-
-    # We know we can get away with passing undef to lookupdir
-    # as the directory because $dir is an absolute path.
-    $top = lookupdir(undef, $path);
-    $top->{'path'} = $top->{srcpath} = $dir::CURDIR;
-    $top->{'prefix'} = '';
-    $top->{'srcdir'} = $top;
-
-    $cwd = $top;
-
-    ($cwd_vol, undef, undef) = File::Spec->splitpath($path);
-    $cwd_vol = '' if ! defined $cwd_vol;
-    $cwd_vol = uc($cwd_vol) if File::Spec->case_tolerant;
-}
-
-package file;
-
-use vars qw( @ISA $level );
-
-BEGIN { @ISA = qw(dir); $level = 0 }
-
-# Return the pathname of the file.
-# Define this separately from dir::path because we don't want to
-# cache all file pathnames (just directory pathnames).
-sub path {
-    $_[0]->{dir}->prefix . $_[0]->{entry}
-}
-
-# Return the related source file path.
-sub srcpath {
-    $_[0]->{dir}->srcprefix . $_[0]->{entry}
-}
-
-# Return if the file is (should be) linked to a separate source file.
-sub is_linked {
-    $_[0]->{dir}->is_linked
-}
-
-# Repository file search.  If the local file exists, that wins.
-# Otherwise, return the first existing same-named file under a
-# Repository directory.  If there isn't anything with the same name
-# under a Repository directory, return the local file name anyway
-# so that some higher layer can try to construct it.
-sub rfile {
-    return $_[0]->{rfile} if exists $_[0]->{rfile};
-    my($self) = @_;
-    my($rfile) = $self;
-    if (@param::rpath) {
-	my($path) = $self->path;
-	if (! File::Spec->file_name_is_absolute($path) && ! -f $path) {
-	    my($dir);
-	    foreach $dir (@param::rpath) {
-		my($t) = $dir->prefix . $path;
-		if (-f $t) {
-		    $rfile = $_[0]->lookupfile($t);
-		    $rfile->{'lfile'} = $self;
-		    last;
-		}
-	    }
-	}
-    }
-    $self->{rfile} = $rfile;
-}
-
-# Returns the local file for a repository file;
-# returns self if it's already a local file.
-sub lfile {
-    $_[0]->{'lfile'} || $_[0]
-}
-
-# returns the "precious" status of this file.
-sub precious {
-    return $_[0]->{precious};
-}
-
-# "Erase" reference to a Repository file,
-# making this a completely local file object
-# by pointing it back to itself.
-sub no_rfile {
-    $_[0]->{'rfile'} = $_[0];
-}
-
-# Return a path to the first existing file under a Repository directory,
-# implicitly returning the current file's path if there isn't a
-# same-named file under a Repository directory.
-sub rpath {
-    $_[0]->{rpath} ||
-	($_[0]->{rpath} = $_[0]->rfile->path)
-}
-
-# Return a path to the first linked srcpath file under a Repositoy
-# directory, implicitly returning the current file's srcpath if there
-# isn't a same-named file under a Repository directory.
-sub rsrcpath {
-    return $_[0]->{rsrcpath} if exists $_[0]->{rsrcpath};
-    my($self) = @_;
-    my($path) = $self->{rsrcpath} = $self->srcpath;
-    if (@param::rpath && ! File::Spec->file_name_is_absolute($path) && ! -f $path) {
-	my($dir);
-	foreach $dir (@param::rpath) {
-	    my($t) = $dir->prefix . $path;
-	    if (-f $t) {
-		$self->{rsrcpath} = $t;
-		last;
-	    }
-	}
-    }
-    $self->{rsrcpath};
-}
-
-# Return if a same-named file source file exists.
-# This handles the interaction of Link and Repository logic.
-# As a side effect, it will link a source file from its Linked
-# directory (preferably local, but maybe in a repository)
-# into a build directory from its proper Linked directory.
-sub source_exists {
-    return $_[0]->{source_exists} if defined $_[0]->{source_exists};
-    my($self) = @_;
-    my($path) = $self->path;
-    my($mtime, $ctime) = (stat($path))[9,10];
-    if ($self->is_linked) {
-	# Linked directory, local logic.
-	my($srcpath) = $self->srcpath;
-	my($src_mtime, $src_ctime) = (stat($srcpath))[9,10];
-	if ($src_mtime) {
-	    if (! $mtime || $src_mtime != $mtime || $src_ctime != $ctime) {
-		futil::install($srcpath, $self);
-	    }
-	    return $self->{source_exists} = 1;
-	}
-	# Linked directory, repository logic.
-	if (@param::rpath) {
-	    if ($self != $self->rfile) {
-		return $self->{source_exists} = 1;
-	    }
-	    my($rsrcpath) = $self->rsrcpath;
-	    if ($path ne $rsrcpath) {
-		my($rsrc_mtime, $rsrc_ctime) = (stat($rsrcpath))[9,10];
-		if ($rsrc_mtime) {
-		    if (! $mtime || $rsrc_mtime != $mtime
-				 || $rsrc_ctime != $ctime) {
-			futil::install($rsrcpath, $self);
-		    }
-		    return $self->{source_exists} = 1;
-		}
-	    }
-	}
-	# There was no source file in any Linked directory
-	# under any Repository.  If there's one in the local
-	# build directory, it no longer belongs there.
-	if ($mtime) {
-	    unlink($path) || die("$0: couldn't unlink $path ($!)\n");
-	}
-	return $self->{source_exists} = '';
-    } else {
-	if ($mtime) {
-	    return $self->{source_exists} = 1;
-	}
-	if (@param::rpath && $self != $self->rfile) {
-	    return $self->{source_exists} = 1;
-	}
-	return $self->{source_exists} = '';
-    }
-}
-
-# Return if a same-named derived file exists under a Repository directory.
-sub derived_exists {
-    $_[0]->{derived_exists} ||
-	($_[0]->{derived_exists} = ($_[0] != $_[0]->rfile));
-}
-
-# Return if this file is somewhere under a Repository directory.
-sub is_on_rpath {
-    defined $_[0]->{'lfile'};
-}
-
-sub local {
-    my($self, $arg) = @_;
-    if (defined $arg) {
-	$self->{'local'} = $arg;
-    }
-    $self->{'local'};
-}
-
-# Return the entry name of the specified file with the specified
-# suffix appended.  Leave it untouched if the suffix is already there.
-# Differs from the addsuffix function, below, in that this strips
-# the existing suffix (if any) before appending the desired one.
-sub base_suf {
-    my($entry) = $_[0]->{entry};
-    if ($entry !~ m/$_[1]$/) {
-	$entry =~ s/\.[^\.]*$//;
-	$entry .= $_[1];
-    }
-    $entry;
-}
-
-# Return the suffix of the file; everything including and to the
-# right of the last dot.
-sub suffix {
-    my @pieces = split(/\./, $_[0]->{entry});
-    my $suffix = pop(@pieces);
-    return ".$suffix";
-}
-
-# Called as a simple function file::addsuffix(name, suffix)
-sub addsuffix {
-    my($name, $suffix) = @_;
-
-    if ($suffix && substr($name, -length($suffix)) ne $suffix) {
-	return $name .= $suffix;
-    }
-    $name;
-}
-
-# Return true if the file is (or will be) accessible.
-# That is, if we can build it, or if it is already present.
-sub accessible {
-    (exists $_[0]->{builder}) || ($_[0]->source_exists);
-}
-
-# Return true if the file should be ignored for the purpose
-# of computing dependency information (should not be considered
-# as a dependency and, further, should not be scanned for
-# dependencies).
-sub ignore {
-    return 0 if !$param::ignore;
-    return $_[0]->{ignore} if exists $_[0]->{ignore};
-    $_[0]->{ignore} = $_[0]->path =~ /$param::ignore/o;
-}
-
-# Build the file, if necessary.
-sub build {
-    return $_[0]->{status} if $_[0]->{status};
-    my($status) = &file::_build;
-    if ($_[0]->{after_build_func}) {
-	my($pkgvars) = $_[0]->{conscript}->{pkgvars};
-	NameSpace::restore('script', $pkgvars) if $pkgvars;
-	eval("package script; " . $_[0]->{after_build_func});
-	print "Error running AfterBuild for ${\$_[0]->path}: $@\n" if ($@);
-	NameSpace::remove('script', keys %$pkgvars) if $pkgvars;
-    }
-    return $status;
-}
-
-sub _build {
-    my($self) = @_;
-    print main::DEPFILE $self->path, "\n" if $param::depfile;
-    print((' ' x $level), "Checking ", $self->path, "\n") if $param::depends;
-    if (!exists $self->{builder}) {
-	# We don't know how to build the file. This is OK, if
-	# the file is present as a source file, under either the
-	# local tree or a Repository.
-	if ($self->source_exists) {
-	    return $self->{status} = 'handled';
-	} else {
-	    my($name) = $self->path;
-	    print("$0: don't know how to construct \"$name\"\n");
-	    exit(1) unless $param::kflag;
-	    return $self->{status} = 'errors'; # xxx used to be 'unknown'
-	}
-    }
-
-    # An associated build object exists, so we know how to build
-    # the file. We first compute the signature of the file, based
-    # on its dependendencies, then only rebuild the file if the
-    # signature has changed.
-    my($builder) = $self->{builder};
-    $level += 2;
-
-    my(@deps) = (@{$self->{dep}}, @{$self->{sources}});
-    my($rdeps) = \@deps;
-
-    if ($param::random) {
-	# If requested, build in a random order, instead of the
-	# order that the dependencies were listed.
-	my(%rdeps);
-	map { $rdeps{$_,'*' x int(rand 10)} = $_ } @deps;
-	$rdeps = [values(%rdeps)];
-    }
-
-    $self->{status} = '';
-
-    my $dep;
-    for $dep (@$rdeps) {
-	if ((build $dep) eq 'errors') {
-	    # Propagate dependent errors to target.
-	    # but try to build all dependents regardless of errors.
-	    $self->{status} = 'errors';
-	}
-    }
-
-    # If any dependents had errors, then we abort.
-    if ($self->{status} eq 'errors') {
-	$level -= 2;
-	return 'errors';
-    }
-
-    # Compute the final signature of the file, based on
-    # the static dependencies (in order), dynamic dependencies,
-    # output path name, and (non-substituted) build script.
-    my($sig) = 'sig'->collect(map('sig'->signature($_->rfile), @deps),
-			    $builder->includes($self),
-			    $builder->scriptsig);
-
-    # May have gotten errors during computation of dynamic
-    # dependency signature, above.
-    $level -= 2;
-    return 'errors' if $self->{status} eq 'errors';
-
-    if (@param::rpath && $self->derived_exists) {
-	# There is no local file of this name, but there is one
-	# under a Repository directory.
-
-	if ('sig'->current($self->rfile, $sig)) {
-	    # The Repository copy is current (its signature matches
-	    # our calculated signature).
-	    if ($self->local) {
-		# ...but they want a local copy, so provide it.
-		main::showcom("Local copy of ${\$self->path} from " .
-			      "${\$self->rpath}");
-		futil::install($self->rpath, $self);
-		'sig'->bsig($self, $sig);
-	    }
-	    return $self->{status} = 'handled';
-	}
-
-	# The signatures don't match, implicitly because something
-	# on which we depend exists locally.  Get rid of the reference
-	# to the Repository file; we'll build this (and anything that
-	# depends on it) locally.
-	$self->no_rfile;
-    }
-
-    # Then check for currency.
-    if (! 'sig'->current($self, $sig)) {
-	# We have to build/derive the file.
-	print((' ' x $level), "Rebuilding ", $self->path, ": out of date.\n")
-		if $param::depends;
-	# First check to see if the built file is cached.
-	if ($builder->cachin($self, $sig)) {
-	    'sig'->bsig($self, $sig);
-	    return $self->{status} = 'built';
-	} elsif ($builder->action($self)) {
-	    $builder->cachout($self, $sig);
-	    'sig'->bsig($self, $sig);
-	    return $self->{status} = 'built';
-	} else {
-	    die("$0: errors constructing ${\$self->path}\n")
-		unless $param::kflag;
-	    return $self->{status} = 'errors';
-	}
-    } else {
-	# Push this out to the cache if we've been asked to (-C option).
-	# Don't normally do this because it slows us down.
-	# In a fully built system, no accesses to the cache directory
-	# are required to check any files. This is a win if cache is
-	# heavily shared. Enabling this option puts the directory in the
-	# loop. Useful only when you wish to recreate a cache from a build.
-	if ($param::cachesync) {
-	    $builder->cachout($self, $sig);
-	    'sig'->bsig($self, $sig);
-	}
-	return $self->{status} = 'handled';
-    }
-}
-
-# Bind an action to a file, with the specified sources. No return value.
-sub bind {
-    my($self, $builder, @sources) = @_;
-    if ($self->{builder} && !$self->{builder}->compatible($builder)) {
-	# Even if not "compatible", we can still check to see if the
-	# derivation is identical. It should be identical if the builder is
-	# the same and the sources are the same.
-	if ("$self->{builder} @{$self->{sources}}" ne "$builder @sources") {
-	    $main::errors++;
-	    my($_foo1, $script1, $line1, $sub1) = @{$self->creator};
-	    my($_foo2, $script2, $line2, $sub2) = script::caller_info;
-	    my $err = "\t${\$self->path}\n" .
-		      "\tbuilt (at least) two different ways:\n" .
-		      "\t\t$script1, line $line1:  $sub1\n" .
-		      "\t\t$script2, line $line2:  $sub2\n";
-	    die $err;
-	}
-	return;
-    }
-    if ($param::wflag) {
-	my($script, $line, $sub);
-	(undef, $script, $line, $sub) = script::caller_info;
-	$self->{script} = '' if ! defined $self->{script};
-	$self->{script} .= "; " if $self->{script};
-	$self->{script} .= qq($sub in "$script", line $line);
-    }
-    $self->{builder} = $builder;
-    push(@{$self->{sources}}, @sources);
-    @{$self->{dep}} = () if ! defined $self->{dep};
-    $self->{conscript} = $priv::self->{script};
-}
-
-sub is_under {
-    $_[0]->{dir}->is_under($_[1]);
-}
-
-sub relpath {
-    my $dirpath = $_[0]->relpath($_[1]->{dir});
-    if (! $dirpath) {
-	return $_[1]->{entry};
-    } else {
-	File::Spec->catfile($dirpath, $_[1]->{entry});
-    }
-}
-
-# Return the signature array for this file.
-# This probably belongs in its own "sigarray" package,
-# which would make it easier to optimize performance.
-sub sigarray {
-    if ($_[0]->{sigaref}) {
-	return @{$_[0]->{sigaref}};
-    }
-    my $self = shift;
-    # glob2pat based on The Perl Cookbook, p. 180.
-    sub glob2pat {
-	my $globstr = shift;
-	my %patmap = (
-	    '*' => '.*',
-	    '?' => '.',
-	    '[' => '[',
-	    ']' => ']',
-	    '/' => "\Q$dir::SEPARATOR",	# Cons-specific modification
-	);
-	$globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
-	return '^' . $globstr . '$';
-    }
-    my @sigarray;
-    my $default;
-    my $builder = $self->lfile->{builder};
-    if (! $builder) {
-	@sigarray = @$param::sourcesig;
-	$default = [qw(content)];
-    } else {
-	if ($builder->{env} && $builder->{env}->{SIGNATURE}) {
-	    @sigarray = @{$builder->{env}->{SIGNATURE}};
-	} else {
-	    my $class = ref $builder;
-	    my $path = $self->path;
-	    warn qq($0: Warning:  Builder package $class did not record\n) .
-		 qq(\tthe calling environment for '$path'.\n) .
-		 qq(\tUnable to use any %SIGNATURE construction variable\n) .
-		 qq(\tfor signature configuration.\n);
-	}
-	$default = [qw(build)];
-    }
-    my $path = $self->path;
-    while (@sigarray) {
-	my($glob, $aref) = splice(@sigarray, 0, 2);
-	my $re = glob2pat($glob);
-	if ($path =~ /$re/) {
-	    $aref = [split(/\s+/, $aref)] if ! ref $aref;
-	    $self->{sigaref} = $aref;
-	    return @$aref;
-	}
-    }
-    $self->{sigaref} = $default;
-    return @{$self->{sigaref}}
-}
-
-# Decide if this file's signature should be the content or build signature.
-sub sigtype {
-    if ($_[0]->{sigtype}) {
-	return $_[0]->{sigtype};
-    }
-    my $self = shift;
-    my @sigarray = $self->sigarray;
-    my $sigtype;
-    if (grep($_ eq "build", @sigarray)) {
-	$sigtype = 'bsig';
-    } elsif (grep($_ =~ /content$/, @sigarray)) {
-	$sigtype = 'csig';
-    }
-    return $self->{sigtype} = $sigtype;
-}
-
-# Return whether this file is configured to use stored
-# signature values from the .consign file.
-sub stored {
-    if (! defined $_[0]->{stored}) {
-	$_[0]->{stored} = grep($_ eq "stored-content", $_[0]->sigarray);
-    }
-    return $_[0]->{stored};
-}
-
-# Generic entry (file or directory) handling.
-# This is an empty subclass for nodes that haven't
-# quite decided whether they're files or dirs.
-# Use file methods until someone blesses them one way or the other.
-package entry;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(file) }
-
-# File utilities
-package futil;
-
-# Install one file as another.
-# Links them if possible (hard link), otherwise copies.
-# Don't ask why, but the source is a path, the tgt is a file obj.
-sub install {
-    my($sp, $tgt) = @_;
-    my($tp) = $tgt->path;
-    return 1 if $tp eq $sp;
-    return 1 if eval { link($sp, $tp) };
-    unlink($tp);
-    if (! futil::mkdir($tgt->{dir})) {
-	return undef;
-    }
-    return 1 if eval { link($sp, $tp) };
-    futil::copy($sp, $tp);
-}
-
-# Copy one file to another. Arguments are actual file names.
-# Returns undef on failure. Preserves mtime and mode.
-sub copy {
-    my ($sp, $tp) = @_;
-    my ($mode, $length, $atime, $mtime) = (stat($sp))[2,7,8,9];
-
-    # Use Perl standard library module for file copying, which handles
-    # binary copies. <schwarze@isa.de> 1998-06-18
-    if (! File::Copy::copy($sp, $tp)) {
-	warn qq($0: can\'t install "$sp" to "$tp" ($!)\n); #'
-	return undef;
-    }
-    # The file has been created, so try both the chmod and utime,
-    # first making sure the copy is writable (because permissions
-    # affect the ability to modify file times on some operating
-    # systems), and then changing permissions back if necessary.
-    my $ret = 1;
-    my $wmode = $mode | 0700;
-    if (! chmod $wmode, $tp) {
-	warn qq($0: can\'t set mode $wmode on file "$tp" ($!)\n); #'
-	$ret = undef;
-    }
-    if (! utime $atime, $mtime, $tp) {
-	warn qq($0: can\'t set modification time for file "$tp" ($!)\n); #'
-	$ret = undef;
-    }
-    if ($mode !=  $wmode && ! chmod $mode, $tp) {
-	warn qq($0: can\'t set mode $mode on file "$tp" ($!)\n); #'
-	$ret = undef;
-    }
-    return $ret;
-}
-
-# Ensure that the specified directory exists.
-# Aborts on failure.
-sub mkdir {
-    return 1 if $_[0]->{'exists'};
-    if (! futil::mkdir($_[0]->{dir})) { # Recursively make parent.
-	return undef;
-    }
-    my($path) = $_[0]->path;
-    if (!-d $path && !mkdir($path, 0777)) {
-	warn qq($0: can't create directory $path ($!).\n); #'
-	return undef;
-    }
-    $_[0]->{'exists'} = 1;
-}
-
-
-# Signature package.
-package sig::hash;
-
-use vars qw( $called );
-
-sub init {
-    my($dir) = @_;
-    my($consign) = $dir->prefix . ".consign";
-    my($dhash) = $dir->{consign} = {};
-    if (-f $consign) {
-	open(CONSIGN, $consign) || die("$0: can't open $consign ($!)\n");
-	while(<CONSIGN>) {
-	    chop;
-	    my ($file, $sig) = split(/:/,$_);
-	    $dhash->{$file} = $sig;
-	}
-	close(CONSIGN);
-    }
-    $dhash
-}
-
-# Read the hash entry for a particular file.
-sub in {
-    my($dir) = $_[0]->{dir};
-    ($dir->{consign} || init($dir))->{$_[0]->{entry}}
-}
-
-# Write the hash entry for a particular file.
-sub out {
-    my($file, $sig) = @_;
-    my($dir) = $file->{dir};
-    ($dir->{consign} || init($dir))->{$file->{entry}} = $sig;
-    $sig::hash::dirty{$dir} = $dir;
-}
-
-# Eliminate the hash entry for a particular file.
-sub clear {
-    my($file) = @_;
-    my($dir) = $file->{dir};
-    delete $dir->{consign}->{$file->{entry}} if $dir->{consign};
-    $sig::hash::dirty{$dir} = $dir;
-}
-
-# Flush hash entries. Called at end or via ^C interrupt.
-sub END {
-    return if $called++; # May be called twice.
-    close(CONSIGN); # in case this came in via ^C.
-    my $dir;
-    for $dir (values %sig::hash::dirty) {
-	my($consign) = $dir->prefix . ".consign";
-	my($constemp) = $consign . ".$$";
-	if (! open(CONSIGN, ">$constemp")) {
-	    die("$0: can't create $constemp ($!)\n");
-	}
-	my($entry, $sig);
-	while (($entry, $sig) = each %{$dir->{consign}}) {
-	    if (! print CONSIGN "$entry:$sig\n") {
-		die("$0: error writing to $constemp ($!)\n");
-	    }
-	}
-	close(CONSIGN);
-	if (! rename($constemp, $consign)) {
-	    if (futil::copy($constemp, $consign)) {
-		unlink($constemp);
-	    } else {
-		die("$0: couldn't rename or copy $constemp to $consign " .
-		    "($!)\n");
-	    }
-	}
-    }
-}
-
-
-# Derived file caching.
-package cache;
-
-# Find a file in the cache. Return non-null if the file is in the cache.
-sub in {
-    return undef unless $param::cache;
-    my($file, $sig) = @_;
-    # Add the path to the signature, to make it unique.
-    $sig = 'sig'->collect($sig, $file->path) unless $param::mixtargets;
-    my($dir) = substr($sig, 0, 1);
-    my($cp) = File::Spec->catfile($param::cache, $dir, $sig);
-    return -f $cp && futil::install($cp, $file);
-}
-
-# Try to flush a file to the cache, if not already there.
-# If it doesn't make it out, due to an error, then that doesn't
-# really matter.
-sub out {
-    return unless $param::cache;
-    my($file, $sig) = @_;
-    # Add the path to the signature, to make it unique.
-    $sig = 'sig'->collect($sig, $file->path) unless $param::mixtargets;
-    my($dir) = substr($sig, 0, 1);
-    my($sp) = $file->path;
-    my($cp) = File::Spec->catfile($param::cache, $dir, $sig);
-    my($cdir) = File::Spec->catfile($param::cache, $dir);
-    if (! -d $cdir) {
-	mkdir($cdir, 0777) ||
-	    die("$0: can't create cache directory $cdir ($!).\n");
-    } elsif (-f $cp) {
-	# Already cached: try to use that instead, to save space.
-	# This can happen if the -cs option is used on a previously
-	# uncached build, or if two builds occur simultaneously.
-	my($lp) = ".$sig";
-	unlink($lp);
-	return if ! eval { link($cp, $lp) };
-	rename($lp, $sp);
-	# Unix98 says, "If the old argument and the new argument both
-	# [refer] to the same existing file, the rename() function
-	# returns successfully and performs no other action."  So, if
-	# $lp and $sp are links (i.e., $cp and $sp are links), $lp is
-	# left, and we must unlink it ourselves.  If the rename failed
-	# for any reason, it is also good form to unlink the temporary
-	# $lp.  Otherwise $lp no longer exists and, barring some race,
-	# the unlink fails silently.
-	unlink($lp);
-	return;
-    }
-
-    return if eval { link($sp, $cp) };
-    return if ! -f $sp; # if nothing to cache.
-    if (futil::copy($sp, "$cp.new")) {
-	rename("$cp.new", $cp);
-    }
-}
-
-
-# Generic signature handling package.
-# This handles the higher-layer distinction between content and build
-# signatures, relying on an underlying calculation package like
-# "sig::md5"" to provide the signature values themselves.
-package sig;
-
-use vars qw( @ISA );
-
-# Select the underlying package to be used for signature calculation.
-# We play a few namespace games here.  Specifically, we append
-# "sig::" to the beginning of the subclass we're passed.  Then,
-# if the package ends in "::debug", we actually subclass the
-# "sig::debug" package and as a wrapper around the underlying
-# (e.g.) "sig::md5" package that's doing the real calculation.
-sub select {
-    my($package, $subclass) = @_;
-    my $p = $package . "::" . $subclass;
-    my $sigpkg = $p;
-    if ($p =~ /(.*)::debug$/) {
-	$sigpkg = $1;
-	$p = 'sig::debug';
-    }
-    @ISA = ($p);
-    $p->init($sigpkg);
-};
-
-# Set or return the build signature of a file.
-# This is computed elsewhere and passed in to us.
-sub bsig {
-    my($self, $file, $sig) = @_;
-    if (defined $sig) {
-	$file->{'bsig'} = $sig;
-	$self->set($file);
-    } elsif (! defined $file->{'bsig'}) {
-	$file->{'bsig'} = '';
-    }
-    $file->{'bsig'}
-}
-
-# Determine the content signature of a file.
-# This also sets the .consign entry unless the file is in a
-# repository; we don't write into repositories, only read from them.
-sub csig {
-    my($self, $file) = @_;
-    if (! $file->{'csig'}) {
-	$file->{'csig'} = $self->srcsig($file->path);
-	$self->set($file) if ! $file->is_on_rpath;
-    }
-    $_[1]->{'csig'}
-}
-
-# Determine the current signature of an already-existing or
-# non-existant file.  Unless a specific signature type (bsig
-# or csig) is requested, this consults the file's signature
-# array to decide whether to return content or build signature,
-# and whether to use a cached value from a .consign file.
-sub signature {
-    my($self, $file, $sigtype) = @_;
-    $sigtype = $file->sigtype if ! $sigtype;
-    #open(TTY, ">/dev/tty");
-    #print TTY $file->path, ": $sigtype\n";
-    #close(TTY);
-    my($path) = $file->path;
-    my($time) = (stat($path))[9];
-    if ($time) {
-	if ($file->{$sigtype}) {
-	    return $file->{$sigtype};
-	}
-	if ($file->is_on_rpath || $file->stored) {
-	    if ('sig'->fetch($file) && $file->{$sigtype}) {
-		if ($file->{'sigtime'} == $time ||
-		    ! $param::rep_sig_times_ok
-		    && $file->is_on_rpath) {
-		    return $file->{$sigtype};
-		}
-	    }
-	    $file->{$sigtype} = undef;
-	}
-	if ($file->is_on_rpath || ! File::Spec->file_name_is_absolute($path)) {
-	    my $sig = '';
-	    if ($sigtype eq 'bsig') { $sig = $self->bsig($file); }
-	    elsif ($sigtype eq 'csig') { $sig = $self->csig($file); }
-	    return $sig;
-	}
-	# This file is not in a repository or under the local directory
-	# structure.  In the canonical case, it's a utility that will be
-	# executed by a command.  Historically, Cons has returned the
-	# name of the command concatenated with the modification time.
-	# Note that this is *not* the path ("cc" not "/bin/cc"), so it
-	# would lose in the unlikely event that a different copy of the
-	# utility was used that happened to have the same modification
-	# time (due to living in a different directory on the PATH, for
-	# example).  The obvious "fix" of using the path like so, however:
-	#	return $path . $time;
-	# is wrong.  In a multi-machine build environment, different
-	# systems may have the same utility in different locations (due
-	# to different NFS mount points, for example), which would
-	# cause a lot of unnecessary builds if we used the full path.
-	# A better solution to strengthen this signature would be to
-	# also concatenate the size of the file, but that would cause
-	# unnecessary rebuilds when coming from .consign files that used
-	# the old scheme.  All of which is to merely explain why we're
-	# leaving this as it has been, but documenting it here in case
-	# there's reason to change it in the future.
-	return $file->{entry} . $time;
-    }
-    return $file->{$sigtype} = '';
-}
-
-sub bsignature {
-    my($self, $file) = @_;
-    my($path) = $file->path;
-    my($time) = (stat($path))[9];
-    if ($time) {
-	if ($file->{'bsig'}) {
-	    return $file->{'bsig'};
-	}
-	if ('sig'->fetch($file, 'bsig') && $file->{'bsig'}) {
-		if ($file->{'sigtime'} == $time ||
-		    ! $param::rep_sig_times_ok
-		    && $file->is_on_rpath) {
-		    return $file->{'bsig'};
-		}
-	}
-	if ($file->is_on_rpath || ! File::Spec->file_name_is_absolute($path)) {
-	    return $self->bsig($file);
-	}
-	return $path . $time;
-    }
-    return $file->{'bsig'} = '';
-}
-
-# Invalidate a file's signature, also clearing its .consign entry.
-sub invalidate {
-    my($self, $file) = @_;
-    delete $file->{'sigtime'};
-    delete $file->{'bsig'};
-    delete $file->{'csig'};
-    sig::hash::clear($file);
-}
-
-# Store the signature for a file.
-sub set {
-    my($self, $file) = @_;
-    my $sig = (stat($file->path))[9];
-    $sig .= " " . ($file->{'bsig'} || '-');
-    $sig .= " " . $file->{'csig'} if $file->{'csig'};
-    sig::hash::out($file, $sig);
-}
-
-# Fetch the signature(s) for a file.
-# Returns whether there was a signature to fetch.
-sub fetch {
-    my($self, $file, @kw) = @_;
-    @kw = ('bsig', 'csig') if ! @kw;
-    my $sig = sig::hash::in($file) || '';
-    my($sigtime, $bsig, $csig) = split(/ /, $sig);
-    $file->{'sigtime'} = $sigtime;
-    $file->{'bsig'} = $bsig || '' if grep($_ eq 'bsig', @kw);
-    $file->{'csig'} = $csig || '' if grep($_ eq 'csig', @kw);
-    $file->{'bsig'} = '' if $file->{'bsig'} eq '-';
-    return $sig ne '';
-}
-
-# MD5-based signature package.
-package sig::md5;
-
-use vars qw( $md5 );
-
-# Initialize MD5 signature calculation by finding an appropriate
-# module and creating the proper object.
-sub init {
-    my $self = shift;
-    my @md5_modules = qw(Digest::MD5 MD5 Digest::Perl::MD5);
-    # We used to find the right module more simply, using $_ as the
-    # loop iterator and just doing:
-    #
-    #		eval "use $_";
-    #		$module = $_, $last if ! $@;
-    #
-    # in the loop.  Empirically, though, this doesn't pass back the
-    # right value in $module on some ActiveState versions.  (Maybe
-    # it's something to do with the eval in a for loop, I dunno.)
-    # Work around it by using $_ to pass the value out of the loop,
-    # which seems to work everywhere.
-    my $module;
-    for $module (@md5_modules) {
-	eval "use $module";
-	$_ = $module, last if ! $@;
-    }
-    $module = $_;
-    die "Cannot find any MD5 module from:  @md5_modules" if $@;
-
-    $md5 = new $module;
-}
-
-# Is the provided signature equal to the signature of the current
-# instantiation of the target (and does the target exist)?
-sub current {
-    my($self, $file, $sig, $sigtype) = @_;
-    $self->bsignature($file) eq $sig;
-}
-
-# Return an aggregate signature for a list of signature values.
-sub collect {
-    my($self, @sigs) = @_;
-    # The following sequence is faster than calling the hex interface.
-    $md5->reset();
-    $md5->add(join('', $param::salt, @sigs));
-    unpack("H*", $md5->digest());
-}
-
-# Directly compute a file signature as the MD5 checksum of the
-# bytes in the file.
-sub srcsig {
-    my($self, $path) = @_;
-    $md5->reset();
-    open(FILE, $path) || return '';
-    binmode(FILE);
-    $md5->addfile(\*FILE);
-    close(FILE);
-    unpack("H*", $md5->digest());
-}
-
-# Compute the signature of a command string.
-# For MD5, this is just the string itself, since MD5 will condense
-# the string contents into the ultimate signature.  Other signature
-# schemes may need to figure this out differently.
-sub cmdsig {
-    my($self, $sig) = @_;
-    return $sig
-}
-
-# Generic debug package for signature calculation.
-# Because of the way we're called by sig::select() and then use
-# the specified value to set up @ISA, this package is essentially a
-# factory that creates packages like sig::md5::debug, etc., on the fly.
-package sig::debug;
-
-use vars qw( @ISA $sigpkg $outfh );
-
-local *FH;
-
-sub init {
-    my $self = shift;
-    $sigpkg = shift;
-    @ISA = ($sigpkg);
-    $sigpkg->init();
-    my $file = $ENV{CONS_SIG_DEBUG};
-    if ($file) {
-	if (! open(FH, ">$file")) {
-	    die "Cannot open $file: $!";
-	}
-	$outfh = \*FH;
-    } else {
-	$outfh = \*STDOUT;
-    }
-}
-
-sub current {
-    my($self, $file, $sig, $sigtype) = @_;
-    my $fsig = $self->bsignature($file);
-    my $sub = "${sigpkg}::current";
-    my $sep = "\n" . ' ' x (length($sub) + 1 - 3);
-    print $outfh "$sub(|$fsig|${sep}eq |$sig|)\n";
-    return $fsig eq $sig;
-}
-
-sub collect {
-    my($self, @sigs) = @_;
-    my $sig = $sigpkg->collect(@sigs);
-    my $sub = "${sigpkg}::collect";
-    my $sep = ",\n" . ' ' x (length($sub) + 1);
-    my $buf = join($sep, @sigs);
-    $buf = $param::salt . $sep . $buf if $param::salt;
-    print $outfh "$sub($buf)\n\t=> |$sig|\n";
-    return $sig;
-}
-
-sub srcsig {
-    my($self, $path) = @_;
-    my $sig = $sigpkg->srcsig($path);
-    print $outfh "${sigpkg}::srcsig($path)\n\t=> |$sig|\n";
-    return $sig;
-}
-
-__END__;
-
-=head1 NAME
-
-Cons - A Software Construction System
-
-=head1 DESCRIPTION
-
-A guide and reference for version 2.3.1
-
-Copyright (c) 1996-2001 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-=head1 Introduction
-
-B<Cons> is a system for constructing, primarily, software, but is quite
-different from previous software construction systems. Cons was designed
-from the ground up to deal easily with the construction of software spread
-over multiple source directories. Cons makes it easy to create build scripts
-that are simple, understandable and maintainable. Cons ensures that complex
-software is easily and accurately reproducible.
-
-Cons uses a number of techniques to accomplish all of this. Construction
-scripts are just Perl scripts, making them both easy to comprehend and very
-flexible. Global scoping of variables is replaced with an import/export
-mechanism for sharing information between scripts, significantly improving
-the readability and maintainability of each script. B<Construction
-environments> are introduced: these are Perl objects that capture the
-information required for controlling the build process. Multiple
-environments are used when different semantics are required for generating
-products in the build tree. Cons implements automatic dependency analysis
-and uses this to globally sequence the entire build. Variant builds are
-easily produced from a single source tree. Intelligent build subsetting is
-possible, when working on localized changes. Overrides can be setup to
-easily override build instructions without modifying any scripts. MD5
-cryptographic B<signatures> are associated with derived files, and are used
-to accurately determine whether a given file needs to be rebuilt.
-
-While offering all of the above, and more, Cons remains simple and easy to
-use. This will, hopefully, become clear as you read the remainder of this
-document.
-
-
-=head1 Why Cons? Why not Make?
-
-Cons is a B<make> replacement. In the following paragraphs, we look at a few
-of the undesirable characteristics of make--and typical build environments
-based on make--that motivated the development of Cons.
-
-=head2 Build complexity
-
-Traditional make-based systems of any size tend to become quite complex. The
-original make utility and its derivatives have contributed to this tendency
-in a number of ways. Make is not good at dealing with systems that are
-spread over multiple directories. Various work-arounds are used to overcome
-this difficulty; the usual choice is for make to invoke itself recursively
-for each sub-directory of a build. This leads to complicated code, in which
-it is often unclear how a variable is set, or what effect the setting of a
-variable will have on the build as a whole. The make scripting language has
-gradually been extended to provide more possibilities, but these have
-largely served to clutter an already overextended language. Often, builds
-are done in multiple passes in order to provide appropriate products from
-one directory to another directory. This represents a further increase in
-build complexity.
-
-
-=head2 Build reproducibility
-
-The bane of all makes has always been the correct handling of
-dependencies. Most often, an attempt is made to do a reasonable job of
-dependencies within a single directory, but no serious attempt is made to do
-the job between directories. Even when dependencies are working correctly,
-make's reliance on a simple time stamp comparison to determine whether a
-file is out of date with respect to its dependents is not, in general,
-adequate for determining when a file should be rederived. If an external
-library, for example, is rebuilt and then ``snapped'' into place, the
-timestamps on its newly created files may well be earlier than the last
-local build, since it was built before it became visible.
-
-
-=head2 Variant builds
-
-Make provides only limited facilities for handling variant builds. With the
-proliferation of hardware platforms and the need for debuggable
-vs. optimized code, the ability to easily create these variants is
-essential. More importantly, if variants are created, it is important to
-either be able to separate the variants or to be able to reproduce the
-original or variant at will. With make it is very difficult to separate the
-builds into multiple build directories, separate from the source. And if
-this technique isn't used, it's also virtually impossible to guarantee at
-any given time which variant is present in the tree, without resorting to a
-complete rebuild.
-
-
-=head2 Repositories
-
-Make provides only limited support for building software from code that
-exists in a central repository directory structure.  The VPATH feature of
-GNU make (and some other make implementations) is intended to provide this,
-but doesn't work as expected: it changes the path of target file to the
-VPATH name too early in its analysis, and therefore searches for all
-dependencies in the VPATH directory.  To ensure correct development builds,
-it is important to be able to create a file in a local build directory and
-have any files in a code repository (a VPATH directory, in make terms) that
-depend on the local file get rebuilt properly.  This isn't possible with
-VPATH, without coding a lot of complex repository knowledge directly into
-the makefiles.
-
-
-=head1 Keeping it simple
-
-A few of the difficulties with make have been cited above. In this and
-subsequent sections, we shall introduce Cons and show how these issues are
-addressed.
-
-=head2 Perl scripts
-
-Cons is Perl-based. That is, Cons scripts--F<Conscript> and F<Construct>
-files, the equivalent to F<Makefile> or F<makefile>--are all written in
-Perl. This provides an immediate benefit: the language for writing scripts
-is a familiar one. Even if you don't happen to be a Perl programmer, it
-helps to know that Perl is basically just a simple declarative language,
-with a well-defined flow of control, and familiar semantics. It has
-variables that behave basically the way you would expect them to,
-subroutines, flow of control, and so on. There is no special syntax
-introduced for Cons. The use of Perl as a scripting language simplifies
-the task of expressing the appropriate solution to the often complex
-requirements of a build.
-
-
-=head2 Hello, World!
-
-To ground the following discussion, here's how you could build the B<Hello,
-World!> C application with Cons:
-
-
-
-  $env = new cons();
-  Program $env 'hello', 'hello.c';
-
-If you install this script in a directory, naming the script F<Construct>,
-and create the F<hello.c> source file in the same directory, then you can
-type C<cons hello> to build the application:
-
-
-
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-
-
-=head2 Construction environments
-
-A key simplification of Cons is the idea of a B<construction environment>. A
-construction environment is an B<object> characterized by a set of key/value
-pairs and a set of B<methods>. In order to tell Cons how to build something,
-you invoke the appropriate method via an appropriate construction
-environment. Consider the following example:
-
-
-
-  $env = new cons(
-	CC	=>	'gcc',
-	LIBS	=>	'libworld.a'
-  );
-
-  Program $env 'hello', 'hello.c';
-
-In this case, rather than using the default construction environment, as is,
-we have overridden the value of C<CC> so that the GNU C Compiler equivalent
-is used, instead. Since this version of B<Hello, World!> requires a library,
-F<libworld.a>, we have specified that any program linked in this environment
-should be linked with that library. If the library exists already, well and
-good, but if not, then we'll also have to include the statement:
-
-
-
-  Library $env 'libworld', 'world.c';
-
-Now if you type C<cons hello>, the library will be built before the program
-is linked, and, of course, C<gcc> will be used to compile both modules:
-
-
-
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-
-=head2 Automatic and complete dependency analysis
-
-With Cons, dependencies are handled automatically. Continuing the previous
-example, note that when we modify F<world.c>, F<world.o> is recompiled,
-F<libworld.a> recreated, and F<hello> relinked:
-
-
-
-  % vi world.c
-    [EDIT]
-  % cons hello
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-This is a relatively simple example: Cons ``knows'' F<world.o> depends upon
-F<world.c>, because the dependency is explicitly set up by the C<Library>
-method. It also knows that F<libworld.a> depends upon F<world.o> and that
-F<hello> depends upon F<libworld.a>, all for similar reasons.
-
-Now it turns out that F<hello.c> also includes the interface definition
-file, F<world.h>:
-
-
-
-  % emacs world.h
-    [EDIT]
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -o hello hello.o libworld.a
-
-How does Cons know that F<hello.c> includes F<world.h>, and that F<hello.o>
-must therefore be recompiled? For now, suffice it to say that when
-considering whether or not F<hello.o> is up-to-date, Cons invokes a scanner
-for its dependency, F<hello.c>. This scanner enumerates the files included
-by F<hello.c> to come up with a list of further dependencies, beyond those
-made explicit by the Cons script. This process is recursive: any files
-included by included files will also be scanned.
-
-Isn't this expensive? The answer is--it depends. If you do a full build of a
-large system, the scanning time is insignificant. If you do a rebuild of a
-large system, then Cons will spend a fair amount of time thinking about it
-before it decides that nothing has to be done (although not necessarily more
-time than make!). The good news is that Cons makes it very easy to
-intelligently subset your build, when you are working on localized changes.
-
-
-=head2 Automatic global build sequencing
-
-Because Cons does full and accurate dependency analysis, and does this
-globally, for the entire build, Cons is able to use this information to take
-full control of the B<sequencing> of the build. This sequencing is evident
-in the above examples, and is equivalent to what you would expect for make,
-given a full set of dependencies. With Cons, this extends trivially to
-larger, multi-directory builds. As a result, all of the complexity involved
-in making sure that a build is organized correctly--including multi-pass
-hierarchical builds--is eliminated. We'll discuss this further in the next
-sections.
-
-=head1 Building large trees--still just as simple
-
-
-=head2 A hierarchy of build scripts
-
-A larger build, in Cons, is organized by creating a hierarchy of B<build
-scripts>. At the top of the tree is a script called F<Construct>. The rest
-of the scripts, by convention, are each called F<Conscript>. These scripts
-are connected together, very simply, by the C<Build>, C<Export>, and
-C<Import> commands.
-
-
-=head2 The Build command
-
-The C<Build> command takes a list of F<Conscript> file names, and arranges
-for them to be included in the build. For example:
-
-  Build qw(
-	drivers/display/Conscript
-	drivers/mouse/Conscript
-	parser/Conscript
-	utilities/Conscript
-  );
-
-This is a simple two-level hierarchy of build scripts: all the subsidiary
-F<Conscript> files are mentioned in the top-level F<Construct> file. Notice
-that not all directories in the tree necessarily have build scripts
-associated with them.
-
-This could also be written as a multi-level script. For example, the
-F<Construct> file might contain this command:
-
-  Build qw(
-	parser/Conscript
-	drivers/Conscript
-	utilities/Conscript
-  );
-
-and the F<Conscript> file in the F<drivers> directory might contain this:
-
-  Build qw(
-	display/Conscript
-	mouse/Conscript
-  );
-
-Experience has shown that the former model is a little easier to understand,
-since the whole construction tree is laid out in front of you, at the
-top-level. Hybrid schemes are also possible. A separately maintained
-component that needs to be incorporated into a build tree, for example,
-might hook into the build tree in one place, but define its own construction
-hierarchy.
-
-By default, Cons does not change its working directory to the directory
-containing a subsidiary F<Conscript> file it is including.  This behavior
-can be enabled for a build by specifying, in the top-level F<Construct>
-file:
-
-  Conscript_chdir 1;
-
-When enabled, Cons will change to the subsidiary F<Conscript> file's
-containing directory while reading in that file, and then change back
-to the top-level directory once the file has been processed.
-
-It is expected that this behavior will become the default in some future
-version of Cons.  To prepare for this transition, builds that expect
-Cons to remain at the top of the build while it reads in a subsidiary
-F<Conscript> file should explicitly disable this feature as follows:
-
-  Conscript_chdir 0;
-
-
-=head2 Relative, top-relative, and absolute file names
-
-You may have noticed that the file names specified to the Build command are
-relative to the location of the script it is invoked from. This is generally
-true for other filename arguments to other commands, too, although we might
-as well mention here that if you begin a file name with a hash mark, ``#'',
-then that file is interpreted relative to the top-level directory (where the
-F<Construct> file resides). And, not surprisingly, if you begin it with ``/'',
-then it is considered to be an absolute pathname. This is true even on
-systems which use a back slash rather than a forward slash to name absolute
-paths.
-
-(There is another file prefix, ``!'', that is interpreted specially by
-Cons.  See discussion of the C<Link> command, below, for details.)
-
-
-=head2 Using modules in build scripts
-
-You may pull modules into each F<Conscript> file using the normal Perl
-C<use> or C<require> statements:
-
-  use English;
-  require My::Module;
-
-Each C<use> or C<require> only affects the one F<Conscript> file in which
-it appears.  To use a module in multiple F<Conscript> files, you must
-put a C<use> or C<require> statement in each one that needs the module.
-
-
-=head2 Scope of variables
-
-The top-level F<Construct> file and all F<Conscript> files begin life in
-a common, separate Perl package.  B<Cons> controls the symbol table for
-the package so that, the symbol table for each script is empty, except
-for the F<Construct> file, which gets some of the command line arguments.
-All of the variables that are set or used, therefore, are set by the
-script itself--not by some external script.
-
-Variables can be explicitly B<imported> by a script from its parent
-script. To import a variable, it must have been B<exported> by the parent
-and initialized (otherwise an error will occur).
-
-
-=head2 The Export command
-
-The C<Export> command is used as in the following example:
-
-  $env = new cons();
-  $INCLUDE = "#export/include";
-  $LIB = "#export/lib";
-  Export qw( env INCLUDE LIB );
-  Build qw( util/Conscript );
-
-The values of the simple variables mentioned in the C<Export> list will be
-squirreled away by any subsequent C<Build> commands. The C<Export> command
-will only export Perl B<scalar> variables, that is, variables whose name
-begins with C<$>. Other variables, objects, etc. can be exported by
-reference--but all scripts will refer to the same object, and this object
-should be considered to be read-only by the subsidiary scripts and by the
-original exporting script. It's acceptable, however, to assign a new value
-to the exported scalar variable--that won't change the underlying variable
-referenced. This sequence, for example, is OK:
-
-  $env = new cons();
-  Export qw( env INCLUDE LIB );
-  Build qw( util/Conscript );
-  $env = new cons(CFLAGS => '-O');
-  Build qw( other/Conscript );
-
-It doesn't matter whether the variable is set before or after the C<Export>
-command. The important thing is the value of the variable at the time the
-C<Build> command is executed. This is what gets squirreled away. Any
-subsequent C<Export> commands, by the way, invalidate the first: you must
-mention all the variables you wish to export on each C<Export> command.
-
-
-=head2 The Import command
-
-Variables exported by the C<Export> command can be imported into subsidiary
-scripts by the C<Import> command. The subsidiary script always imports
-variables directly from the superior script. Consider this example:
-
-  Import qw( env INCLUDE );
-
-This is only legal if the parent script exported both C<$env> and
-C<$INCLUDE>. It also must have given each of these variables values. It is
-OK for the subsidiary script to only import a subset of the exported
-variables (in this example, C<$LIB>, which was exported by the previous
-example, is not imported).
-
-All the imported variables are automatically re-exported, so the sequence:
-
-  Import qw ( env INCLUDE );
-  Build qw ( beneath-me/Conscript );
-
-will supply both C<$env> and C<$INCLUDE> to the subsidiary file. If only
-C<$env> is to be exported, then the following will suffice:
-
-  Import qw ( env INCLUDE );
-  Export qw ( env );
-  Build qw ( beneath-me/Conscript );
-
-Needless to say, the variables may be modified locally before invoking
-C<Build> on the subsidiary script.
-
-
-=head2 Build script evaluation order
-
-The only constraint on the ordering of build scripts is that superior
-scripts are evaluated before their inferior scripts. The top-level
-F<Construct> file, for instance, is evaluated first, followed by any
-inferior scripts. This is all you really need to know about the evaluation
-order, since order is generally irrelevant. Consider the following C<Build>
-command:
-
-  Build qw(
-	drivers/display/Conscript
-	drivers/mouse/Conscript
-	parser/Conscript
-	utilities/Conscript
-  );
-
-We've chosen to put the script names in alphabetical order, simply because
-that's the most convenient for maintenance purposes. Changing the order will
-make no difference to the build.
-
-
-=head1 A Model for sharing files
-
-
-=head2 Some simple conventions
-
-In any complex software system, a method for sharing build products needs to
-be established. We propose a simple set of conventions which are trivial to
-implement with Cons, but very effective.
-
-The basic rule is to require that all build products which need to be shared
-between directories are shared via an intermediate directory. We have
-typically called this F<export>, and, in a C environment, provided
-conventional sub-directories of this directory, such as F<include>, F<lib>,
-F<bin>, etc.
-
-These directories are defined by the top-level F<Construct> file. A simple
-F<Construct> file for a B<Hello, World!> application, organized using
-multiple directories, might look like this:
-
-  # Construct file for Hello, World!
-
-  # Where to put all our shared products.
-  $EXPORT = '#export';
-
-  Export qw( CONS INCLUDE LIB BIN );
-
-  # Standard directories for sharing products.
-  $INCLUDE = "$EXPORT/include";
-  $LIB = "$EXPORT/lib";
-  $BIN = "$EXPORT/bin";
-
-  # A standard construction environment.
-  $CONS = new cons (
-	CPPPATH => $INCLUDE,	# Include path for C Compilations
-	LIBPATH => $LIB,	# Library path for linking programs
-	LIBS => '-lworld',	# List of standard libraries
-  );
-
-  Build qw(
-	hello/Conscript
-	world/Conscript
-  );
-
-The F<world> directory's F<Conscript> file looks like this:
-
-  # Conscript file for directory world
-  Import qw( CONS INCLUDE LIB );
-
-  # Install the products of this directory
-  Install $CONS $LIB, 'libworld.a';
-  Install $CONS $INCLUDE, 'world.h';
-
-  # Internal products
-  Library $CONS 'libworld.a', 'world.c';
-
-and the F<hello> directory's F<Conscript> file looks like this:
-
-  # Conscript file for directory hello
-  Import qw( CONS BIN );
-
-  # Exported products
-  Install $CONS $BIN, 'hello';
-
-  # Internal products
-  Program $CONS 'hello', 'hello.c';
-
-To construct a B<Hello, World!> program with this directory structure, go to
-the top-level directory, and invoke C<cons> with the appropriate
-arguments. In the following example, we tell Cons to build the directory
-F<export>. To build a directory, Cons recursively builds all known products
-within that directory (only if they need rebuilding, of course). If any of
-those products depend upon other products in other directories, then those
-will be built, too.
-
-  % cons export
-  Install world/world.h as export/include/world.h
-  cc -Iexport/include -c hello/hello.c -o hello/hello.o
-  cc -Iexport/include -c world/world.c -o world/world.o
-  ar r world/libworld.a world/world.o
-  ar: creating world/libworld.a
-  ranlib world/libworld.a
-  Install world/libworld.a as export/lib/libworld.a
-  cc -o hello/hello hello/hello.o -Lexport/lib -lworld
-  Install hello/hello as export/bin/hello
-
-
-=head2 Clean, understandable, location-independent scripts
-
-You'll note that the two F<Conscript> files are very clean and
-to-the-point. They simply specify products of the directory and how to build
-those products. The build instructions are minimal: they specify which
-construction environment to use, the name of the product, and the name of
-the inputs. Note also that the scripts are location-independent: if you wish
-to reorganize your source tree, you are free to do so: you only have to
-change the F<Construct> file (in this example), to specify the new locations
-of the F<Conscript> files. The use of an export tree makes this goal easy.
-
-Note, too, how Cons takes care of little details for you. All the F<export>
-directories, for example, were made automatically. And the installed files
-were really hard-linked into the respective export directories, to save
-space and time. This attention to detail saves considerable work, and makes
-it even easier to produce simple, maintainable scripts.
-
-
-=head1 Separating source and build trees
-
-It's often desirable to keep any derived files from the build completely
-separate from the source files. This makes it much easier to keep track of
-just what is a source file, and also makes it simpler to handle B<variant>
-builds, especially if you want the variant builds to co-exist.
-
-
-=head2 Separating build and source directories using the Link command
-
-Cons provides a simple mechanism that handles all of these requirements. The
-C<Link> command is invoked as in this example:
-
-  Link 'build' => 'src';
-
-The specified directories are ``linked'' to the specified source
-directory. Let's suppose that you setup a source directory, F<src>, with the
-sub-directories F<world> and F<hello> below it, as in the previous
-example. You could then substitute for the original build lines the
-following:
-
-  Build qw(
-	build/world/Conscript
-	build/hello/Conscript
-  );
-
-Notice that you treat the F<Conscript> file as if it existed in the build
-directory. Now if you type the same command as before, you will get the
-following results:
-
-  % cons export
-  Install build/world/world.h as export/include/world.h
-  cc -Iexport/include -c build/hello/hello.c -o build/hello/hello.o
-  cc -Iexport/include -c build/world/world.c -o build/world/world.o
-  ar r build/world/libworld.a build/world/world.o
-  ar: creating build/world/libworld.a
-  ranlib build/world/libworld.a
-  Install build/world/libworld.a as export/lib/libworld.a
-  cc -o build/hello/hello build/hello/hello.o -Lexport/lib -lworld
-  Install build/hello/hello as export/bin/hello
-
-Again, Cons has taken care of the details for you. In particular, you will
-notice that all the builds are done using source files and object files from
-the build directory. For example, F<build/world/world.o> is compiled from
-F<build/world/world.c>, and F<export/include/world.h> is installed from
-F<build/world/world.h>. This is accomplished on most systems by the simple
-expedient of ``hard'' linking the required files from each source directory
-into the appropriate build directory.
-
-The links are maintained correctly by Cons, no matter what you do to the
-source directory. If you modify a source file, your editor may do this ``in
-place'' or it may rename it first and create a new file. In the latter case,
-any hard link will be lost. Cons will detect this condition the next time
-the source file is needed, and will relink it appropriately.
-
-You'll also notice, by the way, that B<no> changes were required to the
-underlying F<Conscript> files. And we can go further, as we shall see in the
-next section.
-
-=head2 Explicit references to the source directory
-
-When using the C<Link> command on some operating systems or with some
-tool chains, it's sometimes useful to have a command actually use
-the path name to the source directory, not the build directory.  For
-example, on systems that must copy, not "hard link," the F<src/> and
-F<build/> copies of C<Linked> files, using the F<src/> path of a file
-name might make an editor aware that a syntax error must be fixed in the
-source directory, not the build directory.
-
-You can tell Cons that you want to use the "source path" for a file by
-preceding the file name with a ``!'' (exclamation point).  For example,
-if we add a ``!'' to the beginning of a source file:
-
-  Program $env "foo", "!foo.c";	# Notice initial ! on foo.c
-
-Cons will compile the target as follows:
-
-  cc -c src/foo.c -o build/foo.o
-  cc -o build/foo build/foo.o
-
-Notice that Cons has compiled the program from the the F<src/foo.c>
-source file.  Without the initial ``!'', Cons would have compiled the
-program using the F<build/foo.c> path name.
-
-
-
-=head1 Variant builds
-
-
-=head2 Hello, World! for baNaNa and peAcH OS's
-
-Variant builds require just another simple extension. Let's take as an
-example a requirement to allow builds for both the baNaNa and peAcH
-operating systems. In this case, we are using a distributed file system,
-such as NFS to access the particular system, and only one or the other of
-the systems has to be compiled for any given invocation of C<cons>. Here's
-one way we could set up the F<Construct> file for our B<Hello, World!>
-application:
-
-  # Construct file for Hello, World!
-
-  die qq(OS must be specified) unless $OS = $ARG{OS};
-  die qq(OS must be "peach" or "banana")
-	if $OS ne "peach" && $OS ne "banana";
-
-  # Where to put all our shared products.
-  $EXPORT = "#export/$OS";
-
-  Export qw( CONS INCLUDE LIB BIN );
-
-  # Standard directories for sharing products.
-  $INCLUDE = "$EXPORT/include";
-  $LIB = "$EXPORT/lib";
-  $BIN = "$EXPORT/bin";
-
-  # A standard construction environment.
-  $CONS = new cons (
-	CPPPATH => $INCLUDE,	# Include path for C Compilations
-	LIBPATH => $LIB,	# Library path for linking programs
-	LIBS => '-lworld',	# List of standard libraries
-  );
-
-  # $BUILD is where we will derive everything.
-  $BUILD = "#build/$OS";
-
-  # Tell cons where the source files for $BUILD are.
-  Link $BUILD => 'src';
-
-  Build (
-	"$BUILD/hello/Conscript",
-	"$BUILD/world/Conscript",
-  );
-
-Now if we login to a peAcH system, we can build our B<Hello, World!>
-application for that platform:
-
-  % cons export OS=peach
-  Install build/peach/world/world.h as export/peach/include/world.h
-  cc -Iexport/peach/include -c build/peach/hello/hello.c -o build/peach/hello/hello.o
-  cc -Iexport/peach/include -c build/peach/world/world.c -o build/peach/world/world.o
-  ar r build/peach/world/libworld.a build/peach/world/world.o
-  ar: creating build/peach/world/libworld.a
-  ranlib build/peach/world/libworld.a
-  Install build/peach/world/libworld.a as export/peach/lib/libworld.a
-  cc -o build/peach/hello/hello build/peach/hello/hello.o -Lexport/peach/lib -lworld
-  Install build/peach/hello/hello as export/peach/bin/hello
-
-
-=head2 Variations on a theme
-
-Other variations of this model are possible. For example, you might decide
-that you want to separate out your include files into platform dependent and
-platform independent files. In this case, you'd have to define an
-alternative to C<$INCLUDE> for platform-dependent files. Most F<Conscript>
-files, generating purely platform-independent include files, would not have
-to change.
-
-You might also want to be able to compile your whole system with debugging
-or profiling, for example, enabled. You could do this with appropriate
-command line options, such as C<DEBUG=on>. This would then be translated
-into the appropriate platform-specific requirements to enable debugging
-(this might include turning off optimization, for example). You could
-optionally vary the name space for these different types of systems, but, as
-we'll see in the next section, it's not B<essential> to do this, since Cons
-is pretty smart about rebuilding things when you change options.
-
-
-=head1 Signatures
-
-Cons uses file B<signatures> to decide if a derived file is out-of-date
-and needs rebuilding.  In essence, if the contents of a file change,
-or the manner in which the file is built changes, the file's signature
-changes as well.  This allows Cons to decide with certainty when a file
-needs rebuilding, because Cons can detect, quickly and reliably, whether
-any of its dependency files have been changed.
-
-
-=head2 MD5 content and build signatures
-
-Cons uses the B<MD5> (B<Message Digest 5>) algorithm to compute file
-signatures.  The MD5 algorithm computes a strong cryptographic checksum
-for any given input string.  Cons can, based on configuration, use two
-different MD5 signatures for a given file:
-
-The B<content signature> of a file is an MD5 checksum of the file's
-contents.  Consequently, when the contents of a file change, its content
-signature changes as well.
-
-The B<build signature> of a file is a combined MD5 checksum of:
-
-=over 4
-
-the signatures of all the input files used to build the file
-
-the signatures of all dependency files discovered by source scanners
-(for example, C<.h> files)
-
-the signatures of all dependency files specified explicitly via the
-C<Depends> method)
-
-the command-line string used to build the file
-
-=back
-
-The build signature is, in effect, a digest of all the dependency
-information for the specified file.  Consequently, a file's build
-signature changes whenever any part of its dependency information
-changes: a new file is added, the contents of a file on which it depends
-change, there's a change to the command line used to build the file (or
-any of its dependency files), etc.
-
-For example, in the previous section, the build signature of the
-F<world.o> file will include:
-
-=over 4
-
-the signature of the F<world.c> file
-
-the signatures of any header files that Cons detects are included,
-directly or indirectly, by F<world.c>
-
-the text of the actual command line was used to generate F<world.o>
-
-=back
-
-Similarly, the build signature of the F<libworld.a> file will include
-all the signatures of its constituents (and hence, transitively, the
-signatures of B<their> constituents), as well as the command line that
-created the file.
-
-Note that there is no need for a derived file to depend upon any
-particular F<Construct> or F<Conscript> file.  If changes to these files
-affect a file, then this will be automatically reflected in its build
-signature, since relevant parts of the command line are included in the
-signature. Unrelated F<Construct> or F<Conscript> changes will have no
-effect.
-
-
-=head2 Storing signatures in .consign files
-
-Before Cons exits, it stores the calculated signatures for all of the
-files it built or examined in F<.consign> files, one per directory.
-Cons uses this stored information on later invocations to decide if
-derived files need to be rebuilt.
-
-After the previous example was compiled, the F<.consign> file in the
-F<build/peach/world> directory looked like this:
-
-  world.h:985533370 - d181712f2fdc07c1f05d97b16bfad904
-  world.o:985533372 2a0f71e0766927c0532977b0d2158981
-  world.c:985533370 - c712f77189307907f4189b5a7ab62ff3
-  libworld.a:985533374 69e568fc5241d7d25be86d581e1fb6aa
-
-After the file name and colon, the first number is a timestamp of the
-file's modification time (on UNIX systems, this is typically the number
-of seconds since January 1st, 1970).  The second value is the build
-signature of the file (or ``-'' in the case of files with no build
-signature--that is, source files).  The third value, if any, is the
-content signature of the file.
-
-
-=head2 Using build signatures to decide when to rebuild files
-
-When Cons is deciding whether to build or rebuild a derived file, it
-first computes the file's current build signature.  If the file doesn't
-exist, it must obviously be built.
-
-If, however, the file already exists, Cons next compares the
-modification timestamp of the file against the timestamp value in
-the F<.consign> file.  If the timestamps match, Cons compares the
-newly-computed build signature against the build signature in the
-F<.consign> file.  If the timestamps do not match or the build
-signatures do not match, the derived file is rebuilt.
-
-After the file is built or rebuilt, Cons arranges to store the
-newly-computed build signature in the F<.consign> file when it exits.
-
-
-=head2 Signature example
-
-The use of these signatures is an extremely simple, efficient, and
-effective method of improving--dramatically--the reproducibility of a
-system.
-
-We'll demonstrate this with a simple example:
-
-  # Simple "Hello, World!" Construct file
-  $CFLAGS = '-g' if $ARG{DEBUG} eq 'on';
-  $CONS = new cons(CFLAGS => $CFLAGS);
-  Program $CONS 'hello', 'hello.c';
-
-Notice how Cons recompiles at the appropriate times:
-
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons hello
-  cons: "hello" is up-to-date.
-  % cons DEBUG=on hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons DEBUG=on hello
-  cons: "hello" is up-to-date.
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-
-
-=head2 Source-file signature configuration
-
-Cons provides a C<SourceSignature> method that allows you to configure
-how the signature should be calculated for any source file when its
-signature is being used to decide if a dependent file is up-to-date.
-The arguments to the C<SourceSignature> method consist of one or more
-pairs of strings:
-
-  SourceSignature 'auto/*.c' => 'content',
-		  '*' => 'stored-content';
-
-The first string in each pair is a pattern to match against derived file
-path names. The pattern is a file-globbing pattern, not a Perl regular
-expression; the pattern <*.l> will match all Lex source files.  The C<*>
-wildcard will match across directory separators; the pattern C<foo/*.c>
-would match all C source files in any subdirectory underneath the C<foo>
-subdirectory.
-
-The second string in each pair contains one of the following keywords to
-specify how signatures should be calculated for source files that match
-the pattern.  The available keywords are:
-
-=over 4
-
-=item content
-
-Use the content signature of the source file when calculating signatures
-of files that depend on it.  This guarantees correct calculation of the
-file's signature for all builds, by telling Cons to read the contents of
-a source file to calculate its content signature each time it is run.
-
-=item stored-content
-
-Use the source file's content signature as stored in the F<.consign>
-file, provided the file's timestamp matches the cached timestamp value
-in the F<.consign> file.  This optimizes performance, with the slight
-risk of an incorrect build if a source file's contents have been changed
-so quickly after its previous update that the timestamp still matches
-the stored timestamp in the F<.consign> file even though the contents
-have changed.
-
-=back
-
-The Cons default behavior of always calculating a source file's
-signature from the file's contents is equivalent to specifying:
-
-  SourceSignature '*' => 'content';
-
-The C<*> will match all source files.  The C<content> keyword
-specifies that Cons will read the contents of a source file to calculate
-its signature each time it is run.
-
-A useful global performance optimization is:
-
-  SourceSignature '*' => 'stored-content';
-
-This specifies that Cons will use pre-computed content signatures
-from F<.consign> files, when available, rather than re-calculating a
-signature from the the source file's contents each time Cons is run.  In
-practice, this is safe for most build situations, and only a problem
-when source files are changed automatically (by scripts, for example).
-The Cons default, however, errs on the side of guaranteeing a correct
-build in all situations.
-
-Cons tries to match source file path names against the patterns in the
-order they are specified in the C<SourceSignature> arguments:
-
-  SourceSignature '/usr/repository/objects/*' => 'stored-content',
-		  '/usr/repository/*' => 'content',
-		  '*.y' => 'content',
-		  '*' => 'stored-content';
-
-In this example, all source files under the F</usr/repository/objects>
-directory will use F<.consign> file content signatures, source files
-anywhere else underneath F</usr/repository> will not use F<.consign>
-signature values, all Yacc source files (C<*.y>) anywhere else will not
-use F<.consign> signature values, and any other source file will use
-F<.consign> signature values.
-
-
-=head2 Derived-file signature configuration
-
-Cons provides a C<SIGNATURE> construction variable that allows you to
-configure how signatures are calculated for any derived file when its
-signature is being used to decide if a dependent file is up-to-date.
-The value of the C<SIGNATURE> construction variable is a Perl array
-reference that holds one or more pairs of strings, like the arguments to
-the C<SourceSignature> method.
-
-The first string in each pair is a pattern to match against derived file
-path names. The pattern is a file-globbing pattern, not a Perl regular
-expression; the pattern `*.obj' will match all (Win32) object files.
-The C<*> wildcard will match across directory separators; the pattern
-`foo/*.a' would match all (UNIX) library archives in any subdirectory
-underneath the foo subdirectory.
-
-The second string in each pair contains one of the following keywords
-to specify how signatures should be calculated for derived files that
-match the pattern.  The available keywords are the same as for the
-C<SourceSignature> method, with an additional keyword:
-
-=over 4
-
-=item build
-
-Use the build signature of the derived file when calculating signatures
-of files that depend on it.  This guarantees correct builds by forcing
-Cons to rebuild any and all files that depend on the derived file.
-
-=item content
-
-Use the content signature of the derived file when calculating signatures
-of files that depend on it.  This guarantees correct calculation of the
-file's signature for all builds, by telling Cons to read the contents of
-a derived file to calculate its content signature each time it is run.
-
-=item stored-content
-
-Use the derived file's content signature as stored in the F<.consign>
-file, provided the file's timestamp matches the cached timestamp value
-in the F<.consign> file.  This optimizes performance, with the slight
-risk of an incorrect build if a derived file's contents have been
-changed so quickly after a Cons build that the file's timestamp still
-matches the stored timestamp in the F<.consign> file.
-
-=back
-
-The Cons default behavior (as previously described) for using
-derived-file signatures is equivalent to:
-
-  $env = new cons(SIGNATURE => ['*' => 'build']);
-
-The C<*> will match all derived files.  The C<build> keyword specifies
-that all derived files' build signatures will be used when calculating
-whether a dependent file is up-to-date.
-
-A useful alternative default C<SIGNATURE> configuration for many sites:
-
-  $env = new cons(SIGNATURE => ['*' => 'content']);
-
-In this configuration, derived files have their signatures calculated
-from the file contents.  This adds slightly to Cons' workload, but has
-the useful effect of "stopping" further rebuilds if a derived file is
-rebuilt to exactly the same file contents as before, which usually
-outweighs the additional computation Cons must perform.
-
-For example, changing a comment in a C file and recompiling should
-generate the exact same object file (assuming the compiler doesn't
-insert a timestamp in the object file's header).  In that case,
-specifying C<content> or C<stored-content> for the signature calculation
-will cause Cons to recognize that the object file did not actually
-change as a result of being rebuilt, and libraries or programs that
-include the object file will not be rebuilt.  When C<build> is
-specified, however, Cons will only "know" that the object file was
-rebuilt, and proceed to rebuild any additional files that include the
-object file.
-
-Note that Cons tries to match derived file path names against the
-patterns in the order they are specified in the C<SIGNATURE> array
-reference:
-
-  $env = new cons(SIGNATURE => ['foo/*.o' => 'build',
-				'*.o' => 'content',
-				'*.a' => 'stored-content',
-				'*' => 'content']);
-
-In this example, all object files underneath the F<foo> subdirectory
-will use build signatures, all other object files (including object
-files underneath other subdirectories!) will use F<.consign> file
-content signatures, libraries will use F<.consign> file build
-signatures, and all other derived files will use content signatures.
-
-
-=head2 Debugging signature calculation
-
-Cons provides a C<-S> option that can be used to specify what internal
-Perl package Cons should use to calculate signatures.  The default Cons
-behavior is equivalent to specifying C<-S md5> on the command line.
-
-The only other package (currently) available is an C<md5::debug>
-package that prints out detailed information about the MD5 signature
-calculations performed by Cons:
-
-  % cons -S md5::debug hello
-  sig::md5::srcsig(hello.c)
-          => |52d891204c62fe93ecb95281e1571938|
-  sig::md5::collect(52d891204c62fe93ecb95281e1571938)
-          => |fb0660af4002c40461a2f01fbb5ffd03|
-  sig::md5::collect(52d891204c62fe93ecb95281e1571938,
-                    fb0660af4002c40461a2f01fbb5ffd03,
-                    cc   -c %< -o %>)
-          => |f7128da6c3fe3c377dc22ade70647b39|
-  sig::md5::current(||
-                 eq |f7128da6c3fe3c377dc22ade70647b39|)
-  cc -c hello.c -o hello.o
-  sig::md5::collect()
-          => |d41d8cd98f00b204e9800998ecf8427e|
-  sig::md5::collect(f7128da6c3fe3c377dc22ade70647b39,
-                    d41d8cd98f00b204e9800998ecf8427e,
-                    cc  -o %> %<  )
-          => |a0bdce7fd09e0350e7efbbdb043a00b0|
-  sig::md5::current(||
-                 eq |a0bdce7fd09e0350e7efbbdb043a00b0|)
-  cc -o hello, hello.o
-
-
-=head1 Code Repositories
-
-Many software development organizations will have one or more central
-repository directory trees containing the current source code for one or
-more projects, as well as the derived object files, libraries, and
-executables.  In order to reduce unnecessary recompilation, it is useful to
-use files from the repository to build development software--assuming, of
-course, that no newer dependency file exists in the local build tree.
-
-
-=head2 Repository
-
-Cons provides a mechanism to specify a list of code repositories that will
-be searched, in-order, for source files and derived files not found in the
-local build directory tree.
-
-The following lines in a F<Construct> file will instruct Cons to look first
-under the F</usr/experiment/repository> directory and then under the
-F</usr/product/repository> directory:
-
-  Repository qw (
-	/usr/experiment/repository
-	/usr/product/repository
-  );
-
-The repository directories specified may contain source files, derived files
-(objects, libraries and executables), or both.  If there is no local file
-(source or derived) under the directory in which Cons is executed, then the
-first copy of a same-named file found under a repository directory will be
-used to build any local derived files.
-
-Cons maintains one global list of repositories directories.  Cons will
-eliminate the current directory, and any non-existent directories, from the
-list.
-
-
-=head2 Finding the Construct file in a Repository
-
-Cons will also search for F<Construct> and F<Conscript> files in the
-repository tree or trees.  This leads to a chicken-and-egg situation,
-though: how do you look in a repository tree for a F<Construct> file if the
-F<Construct> file tells you where the repository is?  To get around this,
-repositories may be specified via C<-R> options on the command line:
-
-  % cons -R /usr/experiment/repository -R /usr/product/repository .
-
-Any repository directories specified in the F<Construct> or F<Conscript>
-files will be appended to the repository directories specified by
-command-line C<-R> options.
-
-=head2 Repository source files
-
-If the source code (include the F<Conscript> file) for the library version
-of the I<Hello, World!> C application is in a repository (with no derived
-files), Cons will use the repository source files to create the local object
-files and executable file:
-
-  % cons -R /usr/src_only/repository hello
-  gcc -c /usr/src_only/repository/hello.c -o hello.o
-  gcc -c /usr/src_only/repository/world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-Creating a local source file will cause Cons to rebuild the appropriate
-derived file or files:
-
-  % pico world.c
-    [EDIT]
-  % cons -R /usr/src_only/repository hello
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-And removing the local source file will cause Cons to revert back to
-building the derived files from the repository source:
-
-  % rm world.c
-  % cons -R /usr/src_only/repository hello
-  gcc -c /usr/src_only/repository/world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-
-=head2 Repository derived files
-
-If a repository tree contains derived files (usually object files,
-libraries, or executables), Cons will perform its normal signature
-calculation to decide whether the repository file is up-to-date or a derived
-file must be built locally.  This means that, in order to ensure correct
-signature calculation, a repository tree must also contain the F<.consign>
-files that were created by Cons when generating the derived files.
-
-This would usually be accomplished by building the software in the
-repository (or, alternatively, in a build directory, and then copying the
-result to the repository):
-
-  % cd /usr/all/repository
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-(This is safe even if the F<Construct> file lists the F</usr/all/repository>
-directory in a C<Repository> command because Cons will remove the current
-directory from the repository list.)
-
-Now if we want to build a copy of the application with our own F<hello.c>
-file, we only need to create the one necessary source file, and use the
-C<-R> option to have Cons use other files from the repository:
-
-  % mkdir $HOME/build1
-  % cd $HOME/build1
-  % ed hello.c
-    [EDIT]
-  % cons -R /usr/all/repository hello
-  gcc -c hello.c -o hello.o
-  gcc -o hello hello.o /usr/all/repository/libworld.a
-
-Notice that Cons has not bothered to recreate a local F<libworld.a> library
-(or recompile the F<world.o> module), but instead uses the already-compiled
-version from the repository.
-
-Because the MD5 signatures that Cons puts in the F<.consign> file contain
-timestamps for the derived files, the signature timestamps must match the
-file timestamps for a signature to be considered valid.
-
-Some software systems may alter the timestamps on repository files (by
-copying them, e.g.), in which case Cons will, by default, assume the
-repository signatures are invalid and rebuild files unnecessarily.  This
-behavior may be altered by specifying:
-
-  Repository_Sig_Times_OK 0;
-
-This tells Cons to ignore timestamps when deciding whether a signature is
-valid.  (Note that avoiding this sanity check means there must be proper
-control over the repository tree to ensure that the derived files cannot be
-modified without updating the F<.consign> signature.)
-
-
-=head2 Local copies of files
-
-If the repository tree contains the complete results of a build, and we try
-to build from the repository without any files in our local tree, something
-moderately surprising happens:
-
-  % mkdir $HOME/build2
-  % cd $HOME/build2
-  % cons -R /usr/all/repository hello
-  cons: "hello" is up-to-date.
-
-Why does Cons say that the F<hello> program is up-to-date when there is no
-F<hello> program in the local build directory?  Because the repository (not
-the local directory) contains the up-to-date F<hello> program, and Cons
-correctly determines that nothing needs to be done to rebuild this
-up-to-date copy of the file.
-
-There are, however, many times in which it is appropriate to ensure that a
-local copy of a file always exists.  A packaging or testing script, for
-example, may assume that certain generated files exist locally.  Instead of
-making these subsidiary scripts aware of the repository directory, the
-C<Local> command may be added to a F<Construct> or F<Conscript> file to
-specify that a certain file or files must appear in the local build
-directory:
-
-  Local qw(
-	hello
-  );
-
-Then, if we re-run the same command, Cons will make a local copy of the
-program from the repository copy (telling you that it is doing so):
-
-  % cons -R /usr/all/repository hello
-  Local copy of hello from /usr/all/repository/hello
-  cons: "hello" is up-to-date.
-
-Notice that, because the act of making the local copy is not considered a
-"build" of the F<hello> file, Cons still reports that it is up-to-date.
-
-Creating local copies is most useful for files that are being installed into
-an intermediate directory (for sharing with other directories) via the
-C<Install> command.  Accompanying the C<Install> command for a file with a
-companion C<Local> command is so common that Cons provides a
-C<Install_Local> command as a convenient way to do both:
-
-  Install_Local $env, '#export', 'hello';
-
-is exactly equivalent to:
-
-  Install $env '#export', 'hello';
-  Local '#export/hello';
-
-Both the C<Local> and C<Install_Local> commands update the local F<.consign>
-file with the appropriate file signatures, so that future builds are
-performed correctly.
-
-
-=head2 Repository dependency analysis
-
-Due to its built-in scanning, Cons will search the specified repository
-trees for included F<.h> files.  Unless the compiler also knows about the
-repository trees, though, it will be unable to find F<.h> files that only
-exist in a repository.  If, for example, the F<hello.c> file includes the
-F<hello.h> file in its current directory:
-
-  % cons -R /usr/all/repository hello
-  gcc -c /usr/all/repository/hello.c -o hello.o
-  /usr/all/repository/hello.c:1: hello.h: No such file or directory
-
-Solving this problem forces some requirements onto the way construction
-environments are defined and onto the way the C C<#include> preprocessor
-directive is used to include files.
-
-In order to inform the compiler about the repository trees, Cons will add
-appropriate C<-I> flags to the compilation commands.  This means that the
-C<CPPPATH> variable in the construction environment must explicitly specify
-all subdirectories which are to be searched for included files, including the
-current directory.  Consequently, we can fix the above example by changing
-the environment creation in the F<Construct> file as follows:
-
-  $env = new cons(
-	CC	=> 'gcc',
-	CPPPATH	=> '.',
-	LIBS	=> 'libworld.a',
-  );
-
-Due to the definition of the C<CPPPATH> variable, this yields, when we
-re-execute the command:
-
-  % cons -R /usr/all/repository hello
-  gcc -c -I. -I/usr/all/repository /usr/all/repository/hello.c -o hello.o
-  gcc -o hello hello.o /usr/all/repository/libworld.a
-
-The order of the C<-I> flags replicates, for the C preprocessor, the same
-repository-directory search path that Cons uses for its own dependency
-analysis.  If there are multiple repositories and multiple C<CPPPATH>
-directories, Cons will append the repository directories to the beginning of
-each C<CPPPATH> directory, rapidly multiplying the number of C<-I> flags.
-As an extreme example, a F<Construct> file containing:
-
-  Repository qw(
-	/u1
-	/u2
-  );
-
-  $env = new cons(
-	CPPPATH	=> 'a:b:c',
-  );
-
-Would yield a compilation command of:
-
-  cc -Ia -I/u1/a -I/u2/a -Ib -I/u1/b -I/u2/b -Ic -I/u1/c -I/u2/c -c hello.c -o hello.o
-
-In order to shorten the command lines as much as possible, Cons will
-remove C<-I> flags for any directories, locally or in the repositories,
-which do not actually exist.  (Note that the C<-I> flags are not included
-in the MD5 signature calculation for the target file, so the target will
-not be recompiled if the compilation command changes due to a directory
-coming into existence.)
-
-Because Cons relies on the compiler's C<-I> flags to communicate the
-order in which repository directories must be searched, Cons' handling
-of repository directories is fundamentally incompatible with using
-double-quotes on the C<#include> directives in any C source code that
-you plan to modify:
-
-  #include "file.h"	/* DON'T USE DOUBLE-QUOTES LIKE THIS */
-
-This is because most C preprocessors, when faced with such a directive, will
-always first search the directory containing the source file.  This
-undermines the elaborate C<-I> options that Cons constructs to make the
-preprocessor conform to its preferred search path.
-
-Consequently, when using repository trees in Cons, B<always> use
-angle-brackets for included files in any C source (.c or .h) files that
-you plan to modify locally:
-
-  #include <file.h>	/* USE ANGLE-BRACKETS INSTEAD */
-
-Code that will not change can still safely use double quotes on #include
-lines.
-
-
-=head2 Repository_List
-
-Cons provides a C<Repository_List> command to return a list of all
-repository directories in their current search order.  This can be used for
-debugging, or to do more complex Perl stuff:
-
-  @list = Repository_List;
-  print join(' ', @list), "\n";
-
-
-=head2 Repository interaction with other Cons features
-
-Cons' handling of repository trees interacts correctly with other Cons
-features--which is to say, it generally does what you would expect.
-
-Most notably, repository trees interact correctly, and rather powerfully,
-with the 'Link' command.  A repository tree may contain one or more
-subdirectories for version builds established via C<Link> to a source
-subdirectory.  Cons will search for derived files in the appropriate build
-subdirectories under the repository tree.
-
-
-=head1 Default targets
-
-Until now, we've demonstrated invoking Cons with an explicit target
-to build:
-
-  % cons hello
-
-Normally, Cons does not build anything unless a target is specified,
-but specifying '.' (the current directory) will build everything:
-
-  % cons		# does not build anything
-
-  % cons .		# builds everything under the top-level directory
-
-Adding the C<Default> method to any F<Construct> or F<Conscript> file will add
-the specified targets to a list of default targets.  Cons will build
-these defaults if there are no targets specified on the command line.
-So adding the following line to the top-level F<Construct> file will mimic
-Make's typical behavior of building everything by default:
-
-  Default '.';
-
-The following would add the F<hello> and F<goodbye> commands (in the
-same directory as the F<Construct> or F<Conscript> file) to the default list:
-
-  Default qw(
-	hello
-	goodbye
-  );
-
-The C<Default> method may be used more than once to add targets to the
-default list.
-
-=head1 Selective builds
-
-Cons provides two methods for reducing the size of given build. The first is
-by specifying targets on the command line, and the second is a method for
-pruning the build tree. We'll consider target specification first.
-
-
-=head2 Selective targeting
-
-Like make, Cons allows the specification of ``targets'' on the command
-line. Cons targets may be either files or directories. When a directory is
-specified, this is simply a short-hand notation for every derivable
-product--that Cons knows about--in the specified directory and below. For
-example:
-
-  % cons build/hello/hello.o
-
-means build F<hello.o> and everything that F<hello.o> might need. This is
-from a previous version of the B<Hello, World!> program in which F<hello.o>
-depended upon F<export/include/world.h>. If that file is not up-to-date
-(because someone modified F<src/world/world.h)>, then it will be rebuilt,
-even though it is in a directory remote from F<build/hello>.
-
-In this example:
-
-  % cons build
-
-Everything in the F<build> directory is built, if necessary. Again, this may
-cause more files to be built. In particular, both F<export/include/world.h>
-and F<export/lib/libworld.a> are required by the F<build/hello> directory,
-and so they will be built if they are out-of-date.
-
-If we do, instead:
-
-  % cons export
-
-then only the files that should be installed in the export directory will be
-rebuilt, if necessary, and then installed there. Note that C<cons build>
-might build files that C<cons export> doesn't build, and vice-versa.
-
-
-=head2 No ``special'' targets
-
-With Cons, make-style ``special'' targets are not required. The simplest
-analog with Cons is to use special F<export> directories, instead. Let's
-suppose, for example, that you have a whole series of unit tests that are
-associated with your code. The tests live in the source directory near the
-code. Normally, however, you don't want to build these tests. One solution
-is to provide all the build instructions for creating the tests, and then to
-install the tests into a separate part of the tree. If we install the tests
-in a top-level directory called F<tests>, then:
-
-  % cons tests
-
-will build all the tests.
-
-  % cons export
-
-will build the production version of the system (but not the tests), and:
-
-  % cons build
-
-should probably be avoided (since it will compile tests unnecessarily).
-
-If you want to build just a single test, then you could explicitly name the
-test (in either the F<tests> directory or the F<build> directory). You could
-also aggregate the tests into a convenient hierarchy within the tests
-directory. This hierarchy need not necessarily match the source hierarchy,
-in much the same manner that the include hierarchy probably doesn't match
-the source hierarchy (the include hierarchy is unlikely to be more than two
-levels deep, for C programs).
-
-If you want to build absolutely everything in the tree (subject to whatever
-options you select), you can use:
-
-  % cons .
-
-This is not particularly efficient, since it will redundantly walk all the
-trees, including the source tree. The source tree, of course, may have
-buildable objects in it--nothing stops you from doing this, even if you
-normally build in a separate build tree.
-
-
-=head1 Build Pruning
-
-In conjunction with target selection, B<build pruning> can be used to reduce
-the scope of the build. In the previous peAcH and baNaNa example, we have
-already seen how script-driven build pruning can be used to make only half
-of the potential build available for any given invocation of C<cons>. Cons
-also provides, as a convenience, a command line convention that allows you
-to specify which F<Conscript> files actually get ``built''--that is,
-incorporated into the build tree. For example:
-
-  % cons build +world
-
-The C<+> argument introduces a Perl regular expression. This must, of
-course, be quoted at the shell level if there are any shell meta-characters
-within the expression. The expression is matched against each F<Conscript>
-file which has been mentioned in a C<Build> statement, and only those
-scripts with matching names are actually incorporated into the build
-tree. Multiple such arguments are allowed, in which case a match against any
-of them is sufficient to cause a script to be included.
-
-In the example, above, the F<hello> program will not be built, since Cons
-will have no knowledge of the script F<hello/Conscript>. The F<libworld.a>
-archive will be built, however, if need be.
-
-There are a couple of uses for build pruning via the command line. Perhaps
-the most useful is the ability to make local changes, and then, with
-sufficient knowledge of the consequences of those changes, restrict the size
-of the build tree in order to speed up the rebuild time. A second use for
-build pruning is to actively prevent the recompilation of certain files that
-you know will recompile due to, for example, a modified header file. You may
-know that either the changes to the header file are immaterial, or that the
-changes may be safely ignored for most of the tree, for testing
-purposes.With Cons, the view is that it is pragmatic to admit this type of
-behavior, with the understanding that on the next full build everything that
-needs to be rebuilt will be. There is no equivalent to a ``make touch''
-command, to mark files as permanently up-to-date. So any risk that is
-incurred by build pruning is mitigated. For release quality work, obviously,
-we recommend that you do not use build pruning (it's perfectly OK to use
-during integration, however, for checking compilation, etc. Just be sure to
-do an unconstrained build before committing the integration).
-
-
-=head1 Temporary overrides
-
-Cons provides a very simple mechanism for overriding aspects of a build. The
-essence is that you write an override file containing one or more
-C<Override> commands, and you specify this on the command line, when you run
-C<cons>:
-
-  % cons -o over export
-
-will build the F<export> directory, with all derived files subject to the
-overrides present in the F<over> file. If you leave out the C<-o> option,
-then everything necessary to remove all overrides will be rebuilt.
-
-
-=head2 Overriding environment variables
-
-The override file can contain two types of overrides. The first is incoming
-environment variables. These are normally accessible by the F<Construct>
-file from the C<%ENV> hash variable. These can trivially be overridden in
-the override file by setting the appropriate elements of C<%ENV> (these
-could also be overridden in the user's environment, of course).
-
-
-=head2 The Override command
-
-The second type of override is accomplished with the C<Override> command,
-which looks like this:
-
-  Override <regexp>, <var1> => <value1>, <var2> => <value2>, ...;
-
-The regular expression I<regexp> is matched against every derived file that
-is a candidate for the build. If the derived file matches, then the
-variable/value pairs are used to override the values in the construction
-environment associated with the derived file.
-
-Let's suppose that we have a construction environment like this:
-
-  $CONS = new cons(
-	COPT => '',
-	CDBG => '-g',
-	CFLAGS => '%COPT %CDBG',
-  );
-
-Then if we have an override file F<over> containing this command:
-
-  Override '\.o$', COPT => '-O', CDBG => '';
-
-then any C<cons> invocation with C<-o over> that creates F<.o> files via
-this environment will cause them to be compiled with C<-O >and no C<-g>. The
-override could, of course, be restricted to a single directory by the
-appropriate selection of a regular expression.
-
-Here's the original version of the Hello, World! program, built with this
-environment. Note that Cons rebuilds the appropriate pieces when the
-override is applied or removed:
-
-  % cons hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons -o over hello
-  cc -O -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons -o over hello
-  cons: "hello" is up-to-date.
-  % cons hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-
-It's important that the C<Override> command only be used for temporary,
-on-the-fly overrides necessary for development because the overrides are not
-platform independent and because they rely too much on intimate knowledge of
-the workings of the scripts. For temporary use, however, they are exactly
-what you want.
-
-Note that it is still useful to provide, say, the ability to create a fully
-optimized version of a system for production use--from the F<Construct> and
-F<Conscript> files. This way you can tailor the optimized system to the
-platform. Where optimizer trade-offs need to be made (particular files may
-not be compiled with full optimization, for example), then these can be
-recorded for posterity (and reproducibility) directly in the scripts.
-
-
-=head1 More on construction environments
-
-As previously mentioned, a B<construction environment> is an object that
-has a set of keyword/value pairs and a set of methods, and which is used
-to tell Cons how target files should be built.  This section describes
-how Cons uses and expands construction environment values to control its
-build behavior.
-
-=head2 Construction variable expansion
-
-Construction variables from a construction environment are expanded
-by preceding the keyword with a C<%> (percent sign):
-
-  Construction variables:
-	XYZZY => 'abracadabra',
-
-  The string:  "The magic word is:  %XYZZY!"
-  expands to:  "The magic word is:  abracadabra!"
-
-A construction variable name may be surrounded by C<{> and C<}> (curly
-braces), which are stripped as part of the expansion.  This can
-sometimes be necessary to separate a variable expansion from trailing
-alphanumeric characters:
-
-  Construction variables:
-	OPT    => 'value1',
-	OPTION => 'value2',
-
-  The string:  "%OPT %{OPT}ION %OPTION %{OPTION}"
-  expands to:  "value1 value1ION value2 value2"
-
-Construction variable expansion is recursive--that is, a string
-containing C<%->expansions after substitution will be re-expanded until
-no further substitutions can be made:
-
-  Construction variables:
-	STRING => 'The result is:  %FOO',
-	FOO    => '%BAR',
-	BAR    => 'final value',
-
-  The string:  "The string says:  %STRING"
-  expands to:  "The string says:  The result is:  final value"
-
-If a construction variable is not defined in an environment, then the
-null string is substituted:
-
-  Construction variables:
-	FOO => 'value1',
-	BAR => 'value2',
-
-  The string:  "%FOO <%NO_VARIABLE> %BAR"
-  expands to:  "value1 <> value2"
-
-A doubled C<%%> will be replaced by a single C<%>:
-
-  The string:  "Here is a percent sign:  %%"
-  expands to:  "Here is a percent sign: %"
-
-=head2 Default construction variables
-
-When you specify no arguments when creating a new construction
-environment:
-
-  $env = new cons();
-
-Cons creates a reference to a new, default construction
-environment. This contains a number of construction variables and some
-methods. At the present writing, the default construction variables on a
-UNIX system are:
-
-  CC            => 'cc',
-  CFLAGS        => '',
-  CCCOM         => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-  CXX           => '%CC',
-  CXXFLAGS      => '%CFLAGS',
-  CXXCOM        => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
-  INCDIRPREFIX  => '-I',
-  INCDIRSUFFIX  => '',
-  LINK          => '%CXX',
-  LINKCOM       => '%LINK %LDFLAGS -o %> %< %_LDIRS %LIBS',
-  LINKMODULECOM => '%LD -r -o %> %<',
-  LIBDIRPREFIX  => '-L',
-  LIBDIRSUFFIX  => '',
-  AR		=> 'ar',
-  ARFLAGS	=> 'r',
-  ARCOM		=> ['%AR %ARFLAGS %> %<', '%RANLIB %>'],
-  RANLIB	=> 'ranlib',
-  AS		=> 'as',
-  ASFLAGS	=> '',
-  ASCOM		=> '%AS %ASFLAGS %< -o %>',
-  LD		=> 'ld',
-  LDFLAGS	=> '',
-  PREFLIB	=> 'lib',
-  SUFLIB	=> '.a',
-  SUFLIBS	=> '.so:.a',
-  SUFOBJ	=> '.o',
-  SIGNATURE     => [ '*' => 'build' ],
-  ENV		=> { 'PATH' => '/bin:/usr/bin' },
-
-
-And on a Win32 system (Windows NT), the default construction variables
-are (unless the default rule style is set using the B<DefaultRules>
-method):
-
-  CC		=> 'cl',
-  CFLAGS	=> '/nologo',
-  CCCOM		=> '%CC %CFLAGS %_IFLAGS /c %< /Fo%>',
-  CXXCOM        => '%CXX %CXXFLAGS %_IFLAGS /c %< /Fo%>',
-  INCDIRPREFIX  => '/I',
-  INCDIRSUFFIX  => '',
-  LINK          => 'link',
-  LINKCOM       => '%LINK %LDFLAGS /out:%> %< %_LDIRS %LIBS',
-  LINKMODULECOM => '%LD /r /o %> %<',
-  LIBDIRPREFIX  => '/LIBPATH:',
-  LIBDIRSUFFIX  => '',
-  AR            => 'lib',
-  ARFLAGS       => '/nologo ',
-  ARCOM         => "%AR %ARFLAGS /out:%> %<",
-  RANLIB        => '',
-  LD            => 'link',
-  LDFLAGS       => '/nologo ',
-  PREFLIB       => '',
-  SUFEXE	=> '.exe',
-  SUFLIB	=> '.lib',
-  SUFLIBS	=> '.dll:.lib',
-  SUFOBJ	=> '.obj',
-  SIGNATURE     => [ '*' => 'build' ],
-
-These variables are used by the various methods associated with the
-environment. In particular, any method that ultimately invokes an external
-command will substitute these variables into the final command, as
-appropriate. For example, the C<Objects> method takes a number of source
-files and arranges to derive, if necessary, the corresponding object
-files:
-
-  Objects $env 'foo.c', 'bar.c';
-
-This will arrange to produce, if necessary, F<foo.o> and F<bar.o>. The
-command invoked is simply C<%CCCOM>, which expands, through substitution,
-to the appropriate external command required to build each object. The
-substitution rules will be discussed in detail in the next section.
-
-The construction variables are also used for other purposes. For example,
-C<CPPPATH> is used to specify a colon-separated path of include
-directories. These are intended to be passed to the C preprocessor and are
-also used by the C-file scanning machinery to determine the dependencies
-involved in a C Compilation.
-
-Variables beginning with underscore are created by various methods,
-and should normally be considered ``internal'' variables. For example,
-when a method is called which calls for the creation of an object from
-a C source, the variable C<_IFLAGS> is created: this corresponds to the
-C<-I> switches required by the C compiler to represent the directories
-specified by C<CPPPATH>.
-
-Note that, for any particular environment, the value of a variable is set
-once, and then never reset (to change a variable, you must create a new
-environment. Methods are provided for copying existing environments for this
-purpose). Some internal variables, such as C<_IFLAGS> are created on demand,
-but once set, they remain fixed for the life of the environment.
-
-The C<CFLAGS>, C<LDFLAGS>, and C<ARFLAGS> variables all supply a place
-for passing options to the compiler, loader, and archiver, respectively.
-
-The C<INCDIRPREFIX> and C<INCDIRSUFFIX> variables specify option
-strings to be appended to the beginning and end, respectively, of each
-include directory so that the compiler knows where to find F<.h> files.
-Similarly, the C<LIBDIRPREFIX> and C<LIBDIRSUFFIX> variables specify the
-option string to be appended to the beginning of and end, respectively,
-of each directory that the linker should search for libraries.
-
-Another variable, C<ENV>, is used to determine the system environment during
-the execution of an external command. By default, the only environment
-variable that is set is C<PATH>, which is the execution path for a UNIX
-command. For the utmost reproducibility, you should really arrange to set
-your own execution path, in your top-level F<Construct> file (or perhaps by
-importing an appropriate construction package with the Perl C<use>
-command). The default variables are intended to get you off the ground.
-
-=head2 Expanding variables in construction commands
-
-Within a construction command, construction variables will be expanded
-according to the rules described above.  In addition to normal variable
-expansion from the construction environment, construction commands also
-expand the following pseudo-variables to insert the specific input and
-output files in the command line that will be executed:
-
-=over 10
-
-=item %>
-
-The target file name.  In a multi-target command, this expands to the
-first target mentioned.)
-
-=item %0
-
-Same as C<%E<gt>>.
-
-=item %1, %2, ..., %9
-
-These refer to the first through ninth input file, respectively.
-
-=item %E<lt>
-
-The full set of input file names. If any of these have been used
-anywhere else in the current command line (via C<%1>, C<%2>, etc.), then
-those will be deleted from the list provided by C<%E<lt>>. Consider the
-following command found in a F<Conscript> file in the F<test> directory:
-
-  Command $env 'tgt', qw(foo bar baz), qq(
-	echo %< -i %1 > %>
-	echo %< -i %2 >> %>
-	echo %< -i %3 >> %>
-  );
-
-If F<tgt> needed to be updated, then this would result in the execution of
-the following commands, assuming that no remapping has been established for
-the F<test> directory:
-
-  echo test/bar test/baz -i test/foo > test/tgt
-  echo test/foo test/baz -i test/bar >> test/tgt
-  echo test/foo test/bar -i test/baz >> test/tgt
-
-=back
-
-Any of the above pseudo-variables may be followed immediately by one of
-the following suffixes to select a portion of the expanded path name:
-
-  :a    the absolute path to the file name
-  :b    the directory plus the file name stripped of any suffix
-  :d    the directory
-  :f    the file name
-  :s    the file name suffix
-  :F    the file name stripped of any suffix
-  :S    the absolute path path to a Linked source file
-
-Continuing with the above example, C<%E<lt>:f> would expand to C<foo bar baz>,
-and C<%E<gt>:d> would expand to C<test>.
-
-There are additional C<%> elements which affect the command line(s):
-
-=over 10
-
-=item %[ %]
-
-It is possible to programmatically rewrite part of the command by
-enclosing part of it between C<%[> and C<%]>.  This will call the
-construction variable named as the first word enclosed in the brackets
-as a Perl code reference; the results of this call will be used to
-replace the contents of the brackets in the command line.  For example,
-given an existing input file named F<tgt.in>:
-
-  @keywords = qw(foo bar baz);
-  $env = new cons(X_COMMA => sub { join(",", @_) });
-  Command $env 'tgt', 'tgt.in', qq(
-	echo '# Keywords: %[X_COMMA @keywords %]' > %>
-	cat %< >> %>
-  );
-
-This will execute:
-
-  echo '# Keywords: foo,bar,baz' > tgt
-  cat tgt.in >> tgt
-
-=item %( %)
-
-Cons includes the text of the command line in the MD5 signature for a
-build, so that targets get rebuilt if you change the command line (to
-add or remove an option, for example).  Command-line text in between
-C<%(> and C<%)>, however, will be ignored for MD5 signature calculation.
-
-Internally, Cons uses C<%(> and C<%)> around include and library
-directory options (C<-I> and C<-L> on UNIX systems, C</I> and
-C</LIBPATH> on Windows NT) to avoid rebuilds just because the directory
-list changes.  Rebuilds occur only if the changed directory list causes
-any included I<files> to change, and a changed include file is detected
-by the MD5 signature calculation on the actual file contents.
-
-=back
-
-=head2 Expanding construction variables in file names
-
-Cons expands construction variables in the source and target file names
-passed to the various construction methods according to the expansion
-rules described above:
-
-  $env = new cons(
-	DESTDIR	=>	'programs',
-	SRCDIR	=>	'src',
-  );
-  Program $env '%DESTDIR/hello', '%SRCDIR/hello.c';
-
-This allows for flexible configuration, through the construction
-environment, of directory names, suffixes, etc.
-
-
-=head1 Build actions
-
-Cons supports several types of B<build actions> that can be performed
-to construct one or more target files.  Usually, a build action is
-a construction command--that is, a command-line string that invokes
-an external command.  Cons can also execute Perl code embedded in a
-command-line string, and even supports an experimental ability to build
-a target file by executing a Perl code reference directly.
-
-A build action is usually specified as the value of a construction
-variable:
-
-  $env = new cons(
-	CCCOM         => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-	LINKCOM       => '[perl] &link_executable("%>", "%<")',
-	ARCOM         => sub { my($env, $target, @sources) = @_;
-				 # code to create an archive
-				}
-  );
-
-A build action may be associated directly with one or more target files
-via the C<Command> method; see below.
-
-=head2 Construction commands
-
-A construction command goes through expansion of construction variables
-and C<%-> pseudo-variables, as described above, to create the actual
-command line that Cons will execute to generate the target file or
-files.
-
-After substitution occurs, strings of white space are converted into
-single blanks, and leading and trailing white space is eliminated. It
-is therefore currently not possible to introduce variable length white
-space in strings passed into a command.
-
-If a multi-line command string is provided, the commands are executed
-sequentially. If any of the commands fails, then none of the rest are
-executed, and the target is not marked as updated, i.e. a new signature is
-not stored for the target.
-
-Normally, if all the commands succeed, and return a zero status (or whatever
-platform-specific indication of success is required), then a new signature
-is stored for the target. If a command erroneously reports success even
-after a failure, then Cons will assume that the target file created by that
-command is accurate and up-to-date.
-
-The first word of each command string, after expansion, is assumed to be an
-executable command looked up on the C<PATH> environment variable (which is,
-in turn, specified by the C<ENV> construction variable). If this command is
-found on the path, then the target will depend upon it: the command will
-therefore be automatically built, as necessary. It's possible to write
-multi-part commands to some shells, separated by semi-colons. Only the first
-command word will be depended upon, however, so if you write your command
-strings this way, you must either explicitly set up a dependency (with the
-C<Depends> method), or be sure that the command you are using is a system
-command which is expected to be available. If it isn't available, you will,
-of course, get an error.
-
-Cons normally prints a command before executing it.  This behavior is
-suppressed if the first character of the command is C<@>.  Note that
-you may need to separate the C<@> from the command name or escape it to
-prevent C<@cmd> from looking like an array to Perl quote operators that
-perform interpolation:
-
-  # The first command line is incorrect,
-  # because "@cp" looks like an array
-  # to the Perl qq// function.
-  # Use the second form instead.
-  Command $env 'foo', 'foo.in', qq(
-	@cp %< tempfile
-	@ cp tempfile %>
-  );
-
-If there are shell meta characters anywhere in the expanded command line,
-such as C<E<lt>>, C<E<gt>>, quotes, or semi-colon, then the command
-will actually be executed by invoking a shell. This means that a command
-such as:
-
-  cd foo
-
-alone will typically fail, since there is no command C<cd> on the path. But
-the command string:
-
-  cd $<:d; tar cf $>:f $<:f
-
-when expanded will still contain the shell meta character semi-colon, and a
-shell will be invoked to interpret the command. Since C<cd> is interpreted
-by this sub-shell, the command will execute as expected.
-
-=head2 Perl expressions
-
-If any command (even one within a multi-line command) begins with
-C<[perl]>, the remainder of that command line will be evaluated by the
-running Perl instead of being forked by the shell.  If an error occurs
-in parsing the Perl code, or if the Perl expression returns 0 or undef,
-the command will be considered to have failed.  For example, here is a
-simple command which creates a file C<foo> directly from Perl:
-
-  $env = new cons();
-  Command $env 'foo',
-    qq([perl] open(FOO,'>foo');print FOO "hi\\n"; close(FOO); 1);
-
-Note that when the command is executed, you are in the same package as
-when the F<Construct> or F<Conscript> file was read, so you can call
-Perl functions you've defined in the same F<Construct> or F<Conscript>
-file in which the C<Command> appears:
-
-  $env = new cons();
-  sub create_file {
-	my $file = shift;
-	open(FILE, ">$file");
-	print FILE "hi\n";
-	close(FILE);
-	return 1;
-  }
-  Command $env 'foo', "[perl] &create_file('%>')";
-
-The Perl string will be used to generate the signature for the derived
-file, so if you change the string, the file will be rebuilt.  The contents
-of any subroutines you call, however, are not part of the signature,
-so if you modify a called subroutine such as C<create_file> above,
-the target will I<not> be rebuilt.  Caveat user.
-
-=head2 Perl code references [EXPERIMENTAL]
-
-Cons supports the ability to create a derived file by directly executing
-a Perl code reference.  This feature is considered EXPERIMENTAL and
-subject to change in the future.
-
-A code reference may either be a named subroutine referenced by the
-usual C<\&> syntax:
-
-  sub build_output {
-	my($env, $target, @sources) = @_;
-	print "build_output building $target\n";
-	open(OUT, ">$target");
-	foreach $src (@sources) {
-	    if (! open(IN, "<$src")) {
-		print STDERR "cannot open '$src': $!\n";
-		return undef;
-	    }
-	    print OUT, <IN>;
-	}
-	close(OUT);
-	return 1;
-  }
-  Command $env 'output', \&build_output;
-
-or the code reference may be an anonymous subroutine:
-
-  Command $env 'output', sub {
-	my($env, $target, @sources) = @_;
-	print "building $target\n";
-	open(FILE, ">$target");
-	print FILE "hello\n";
-	close(FILE);
-	return 1;
-  };
-
-To build the target file, the referenced subroutine is passed, in order:
-the construction environment used to generate the target; the path
-name of the target itself; and the path names of all the source files
-necessary to build the target file.
-
-The code reference is expected to generate the target file, of course,
-but may manipulate the source and target files in any way it chooses.
-The code reference must return a false value (C<undef> or C<0>) if
-the build of the file failed.  Any true value indicates a successful
-build of the target.
-
-Building target files using code references is considered EXPERIMENTAL
-due to the following current limitations:
-
-=over 4
-
-Cons does I<not> print anything to indicate the code reference is being
-called to build the file.  The only way to give the user any indication
-is to have the code reference explicitly print some sort of "building"
-message, as in the above examples.
-
-Cons does not generate any signatures for code references, so if the
-code in the reference changes, the target will I<not> be rebuilt.
-
-Cons has no public method to allow a code reference to extract
-construction variables.  This would be good to allow generalization of
-code references based on the current construction environment, but would
-also complicate the problem of generating meaningful signatures for code
-references.
-
-=back
-
-Support for building targets via code references has been released in
-this version to encourage experimentation and the seeking of possible
-solutions to the above limitations.
-
-
-=head1 Default construction methods
-
-The list of default construction methods includes the following:
-
-
-=head2 The C<new> constructor
-
-The C<new> method is a Perl object constructor. That is, it is not invoked
-via a reference to an existing construction environment B<reference>, but,
-rather statically, using the name of the Perl B<package> where the
-constructor is defined. The method is invoked like this:
-
-  $env = new cons(<overrides>);
-
-The environment you get back is blessed into the package C<cons>, which
-means that it will have associated with it the default methods described
-below. Individual construction variables can be overridden by providing
-name/value pairs in an override list. Note that to override any command
-environment variable (i.e. anything under C<ENV>), you will have to override
-all of them. You can get around this difficulty by using the C<copy> method
-on an existing construction environment.
-
-
-=head2 The C<clone> method
-
-The C<clone> method creates a clone of an existing construction environment,
-and can be called as in the following example:
-
-  $env2 = $env1->clone(<overrides>);
-
-You can provide overrides in the usual manner to create a different
-environment from the original. If you just want a new name for the same
-environment (which may be helpful when exporting environments to existing
-components), you can just use simple assignment.
-
-
-=head2 The C<copy> method
-
-The C<copy> method extracts the externally defined construction variables
-from an environment and returns them as a list of name/value
-pairs. Overrides can also be provided, in which case, the overridden values
-will be returned, as appropriate. The returned list can be assigned to a
-hash, as shown in the prototype, below, but it can also be manipulated in
-other ways:
-
-  %env = $env1->copy(<overrides>);
-
-The value of C<ENV>, which is itself a hash, is also copied to a new hash,
-so this may be changed without fear of affecting the original
-environment. So, for example, if you really want to override just the
-C<PATH> variable in the default environment, you could do the following:
-
-  %cons = new cons()->copy();
-  $cons{ENV}{PATH} = "<your path here>";
-  $cons = new cons(%cons);
-
-This will leave anything else that might be in the default execution
-environment undisturbed.
-
-
-=head2 The C<Install> method
-
-The C<Install> method arranges for the specified files to be installed in
-the specified directory. The installation is optimized: the file is not
-copied if it can be linked. If this is not the desired behavior, you will
-need to use a different method to install the file. It is called as follows:
-
-  Install $env <directory>, <names>;
-
-Note that, while the files to be installed may be arbitrarily named,
-only the last component of each name is used for the installed target
-name. So, for example, if you arrange to install F<foo/bar> in F<baz>,
-this will create a F<bar> file in the F<baz> directory (not F<foo/bar>).
-
-
-=head2 The C<InstallAs> method
-
-The C<InstallAs> method arranges for the specified source file(s) to be
-installed as the specified target file(s). Multiple files should be
-specified as a file list. The installation is optimized: the file is not
-copied if it can be linked. If this is not the desired behavior, you will
-need to use a different method to install the file. It is called as follows:
-
-C<InstallAs> works in two ways:
-
-Single file install:
-
-  InstallAs $env TgtFile, SrcFile;
-
-Multiple file install:
-
-  InstallAs $env ['tgt1', 'tgt2'], ['src1', 'src2'];
-
-Or, even as:
-
-  @srcs = qw(src1 src2 src3);
-  @tgts = qw(tgt1 tgt2 tgt3);
-  InstallAs $env [@tgts], [@srcs];
-
-Both the target and the sources lists should be of the same length.
-
-=head2 The C<Precious> method
-
-The C<Precious> method asks cons not to delete the specified file or
-list of files before building them again.  It is invoked as:
-
-  Precious <files>;
-
-This is especially useful for allowing incremental updates to libraries
-or debug information files which are updated rather than rebuilt anew each
-time.  Cons will still delete the files when the C<-r> flag is specified.
-
-=head2 The C<AfterBuild> method
-
-The C<AfterBuild> method evaluates the specified perl string after
-building the given file or files (or finding that they are up to date).
-The eval will happen once per specified file.  C<AfterBuild> is called
-as follows:
-
-  AfterBuild $env 'foo.o', qq(print "foo.o is up to date!\n");
-
-The perl string is evaluated in the C<script> package, and has access
-to all variables and subroutines defined in the F<Conscript> file in
-which the C<AfterBuild> method is called.
-
-=head2 The C<Command> method
-
-The C<Command> method is a catchall method which can be used to arrange for
-any build action to be executed to update the target. For this command, a
-target file and list of inputs is provided. In addition, a build action
-is specified as the last argument.  The build action is typically a
-command line or lines, but may also contain Perl code to be executed;
-see the section above on build actions for details.
-
-The C<Command> method is called as follows:
-
-  Command $env <target>, <inputs>, <build action>;
-
-The target is made dependent upon the list of input files specified, and the
-inputs must be built successfully or Cons will not attempt to build the
-target.
-
-To specify a command with multiple targets, you can specify a reference to a
-list of targets. In Perl, a list reference can be created by enclosing a
-list in square brackets. Hence the following command:
-
-  Command $env ['foo.h', 'foo.c'], 'foo.template', q(
-	gen %1
-  );
-
-could be used in a case where the command C<gen> creates two files, both
-F<foo.h> and F<foo.c>.
-
-
-=head2 The C<Objects> method
-
-The C<Objects> method arranges to create the object files that correspond to
-the specified source files. It is invoked as shown below:
-
-  @files = Objects $env <source or object files>;
-
-Under Unix, source files ending in F<.s> and F<.c> are currently
-supported, and will be compiled into a name of the same file ending
-in F<.o>. By default, all files are created by invoking the external
-command which results from expanding the C<CCCOM> construction variable,
-with C<%E<lt>> and C<%E<gt>> set to the source and object files,
-respectively. (See the section above on construction variable expansion
-for details).  The variable C<CPPPATH> is also used when scanning source
-files for dependencies. This is a colon separated list of pathnames, and
-is also used to create the construction variable C<_IFLAGS,> which will
-contain the appropriate list of -C<I> options for the compilation. Any
-relative pathnames in C<CPPPATH> is interpreted relative to the
-directory in which the associated construction environment was created
-(absolute and top-relative names may also be used). This variable is
-used by C<CCCOM>. The behavior of this command can be modified by
-changing any of the variables which are interpolated into C<CCCOM>, such
-as C<CC>, C<CFLAGS>, and, indirectly, C<CPPPATH>. It's also possible
-to replace the value of C<CCCOM>, itself. As a convenience, this file
-returns the list of object filenames.
-
-
-=head2 The C<Program> method
-
-The C<Program> method arranges to link the specified program with the
-specified object files. It is invoked in the following manner:
-
-  Program $env <program name>, <source or object files>;
-
-The program name will have the value of the C<SUFEXE> construction
-variable appended (by default, C<.exe> on Win32 systems, nothing on Unix
-systems) if the suffix is not already present.
-
-Source files may be specified in place of objects files--the C<Objects>
-method will be invoked to arrange the conversion of all the files into
-object files, and hence all the observations about the C<Objects> method,
-above, apply to this method also.
-
-The actual linking of the program will be handled by an external command
-which results from expanding the C<LINKCOM> construction variable, with
-C<%E<lt>> set to the object files to be linked (in the order presented),
-and C<%E<gt>> set to the target. (See the section above on construction
-variable expansion for details.)  The user may set additional variables
-in the construction environment, including C<LINK>, to define which
-program to use for linking, C<LIBPATH>, a colon-separated list of
-library search paths, for use with library specifications of the form
-I<-llib>, and C<LIBS>, specifying the list of libraries to link against
-(in either I<-llib> form or just as pathnames. Relative pathnames in
-both C<LIBPATH> and C<LIBS> are interpreted relative to the directory
-in which the associated construction environment is created (absolute
-and top-relative names may also be used). Cons automatically sets up
-dependencies on any libraries mentioned in C<LIBS>: those libraries will
-be built before the command is linked.
-
-
-=head2 The C<Library> method
-
-The C<Library> method arranges to create the specified library from the
-specified object files. It is invoked as follows:
-
-  Library $env <library name>, <source or object files>;
-
-The library name will have the value of the C<SUFLIB> construction
-variable appended (by default, C<.lib> on Win32 systems, C<.a> on Unix
-systems) if the suffix is not already present.
-
-Source files may be specified in place of objects files--the C<Objects>
-method will be invoked to arrange the conversion of all the files into
-object files, and hence all the observations about the C<Objects> method,
-above, apply to this method also.
-
-The actual creation of the library will be handled by an external
-command which results from expanding the C<ARCOM> construction variable,
-with C<%E<lt>> set to the library members (in the order presented),
-and C<%E<gt>> to the library to be created.  (See the section above
-on construction variable expansion for details.)  The user may set
-variables in the construction environment which will affect the
-operation of the command. These include C<AR>, the archive program
-to use, C<ARFLAGS>, which can be used to modify the flags given to
-the program specified by C<AR>, and C<RANLIB>, the name of a archive
-index generation program, if needed (if the particular need does not
-require the latter functionality, then C<ARCOM> must be redefined to not
-reference C<RANLIB>).
-
-The C<Library> method allows the same library to be specified in multiple
-method invocations. All of the contributing objects from all the invocations
-(which may be from different directories) are combined and generated by a
-single archive command. Note, however, that if you prune a build so that
-only part of a library is specified, then only that part of the library will
-be generated (the rest will disappear!).
-
-
-=head2 The C<Module> method
-
-The C<Module> method is a combination of the C<Program> and C<Command>
-methods. Rather than generating an executable program directly, this command
-allows you to specify your own command to actually generate a module. The
-method is invoked as follows:
-
-  Module $env <module name>, <source or object files>, <construction command>;
-
-This command is useful in instances where you wish to create, for example,
-dynamically loaded modules, or statically linked code libraries.
-
-
-=head2 The C<Depends> method
-
-The C<Depends> method allows you to specify additional dependencies for a
-target.  It is invoked as follows:
-
-  Depends $env <target>, <dependencies>;
-
-This may be occasionally useful, especially in cases where no scanner exists
-(or is writable) for particular types of files. Normally, dependencies are
-calculated automatically from a combination of the explicit dependencies set
-up by the method invocation or by scanning source files.
-
-A set of identical dependencies for multiple targets may be specified
-using a reference to a list of targets. In Perl, a list reference can
-be created by enclosing a list in square brackets. Hence the following
-command:
-
-  Depends $env ['foo', 'bar'], 'input_file_1', 'input_file_2';
-
-specifies that both the F<foo> and F<bar> files depend on the listed
-input files.
-
-
-=head2 The C<RuleSet> method
-
-The C<RuleSet> method returns the construction variables for building
-various components with one of the rule sets supported by Cons.  The
-currently supported rule sets are:
-
-=over 4
-
-=item msvc
-
-Rules for the Microsoft Visual C++ compiler suite.
-
-=item unix
-
-Generic rules for most UNIX-like compiler suites.
-
-=back
-
-On systems with more than one available compiler suite, this allows you
-to easily create side-by-side environments for building software with
-multiple tools:
-
-    $msvcenv = new cons(RuleSet("msvc"));
-    $cygnusenv = new cons(RuleSet("unix"));
-
-In the future, this could also be extended to other platforms that
-have different default rule sets.
-
-
-=head2 The C<DefaultRules> method
-
-The C<DefaultRules> method sets the default construction variables that
-will be returned by the C<new> method to the specified arguments:
-
-  DefaultRules(CC     => 'gcc',
-	       CFLAGS => '',
-	       CCCOM  => '%CC %CFLAGS %_IFLAGS -c %< -o %>');
-  $env = new cons();
-  # $env now contains *only* the CC, CFLAGS,
-  # and CCCOM construction variables
-
-Combined with the C<RuleSet> method, this also provides an easy way
-to set explicitly the default build environment to use some supported
-toolset other than the Cons defaults:
-
-    # use a UNIX-like tool suite (like cygwin) on Win32
-    DefaultRules(RuleSet('unix'));
-    $env = new cons();
-
-Note that the C<DefaultRules> method completely replaces the default
-construction environment with the specified arguments, it does not
-simply override the existing defaults.  To override one or more
-variables in a supported C<RuleSet>, append the variables and values:
-
-  DefaultRules(RuleSet('unix'), CFLAGS => '-O3');
-  $env1 = new cons();
-  $env2 = new cons();
-  # both $env1 and $env2 have 'unix' defaults
-  # with CFLAGS set to '-O3'
-
-
-=head2 The C<Ignore> method
-
-The C<Ignore> method allows you to ignore explicitly dependencies that
-Cons infers on its own.  It is invoked as follows:
-
-  Ignore <patterns>;
-
-This can be used to avoid recompilations due to changes in system header
-files or utilities that are known to not affect the generated targets.
-
-If, for example, a program is built in an NFS-mounted directory on
-multiple systems that have different copies of F<stdio.h>, the differences
-will affect the signatures of all derived targets built from source files
-that C<#include E<lt>stdio.hE<gt>>.  This will cause all those targets to
-be rebuilt when changing systems.  If this is not desirable behavior, then
-the following line will remove the dependencies on the F<stdio.h> file:
-
-  Ignore '^/usr/include/stdio\.h$';
-
-Note that the arguments to the C<Ignore> method are regular expressions,
-so special characters must be escaped and you may wish to anchor the
-beginning or end of the expression with C<^> or C<$> characters.
-
-
-=head2 The C<Salt> method
-
-The C<Salt> method adds a constant value to the signature calculation
-for every derived file.  It is invoked as follows:
-
-  Salt $string;
-
-Changing the Salt value will force a complete rebuild of every derived
-file.  This can be used to force rebuilds in certain desired
-circumstances.  For example,
-
-  Salt `uname -s`;
-
-Would force a complete rebuild of every derived file whenever the
-operating system on which the build is performed (as reported by C<uname
--s>) changes.
-
-
-=head2 The C<UseCache> method
-
-The C<UseCache> method instructs Cons to maintain a cache of derived
-files, to be shared among separate build trees of the same project.
-
-  UseCache("cache/<buildname>") || warn("cache directory not found");
-
-
-=head2 The C<SourcePath> method
-
-The C<SourcePath> mathod returns the real source path name of a file,
-as opposed to the path name within a build directory.  It is invoked
-as follows:
-
-  $path = SourcePath <buildpath>;
-
-
-=head2 The C<ConsPath> method
-
-The C<ConsPath> method returns true if the supplied path is a derivable
-file, and returns undef (false) otherwise.
-It is invoked as follows:
-
-  $result = ConsPath <path>;
-
-
-=head2 The C<SplitPath> method
-
-The C<SplitPath> method looks up multiple path names in a string separated
-by the default path separator for the operating system (':' on UNIX
-systems, ';' on Windows NT), and returns the fully-qualified names.
-It is invoked as follows:
-
-  @paths = SplitPath <pathlist>;
-
-The C<SplitPath> method will convert  names prefixed '#' to the
-appropriate top-level build name (without the '#') and will convert
-relative names to top-level names.
-
-
-=head2 The C<DirPath> method
-
-The C<DirPath> method returns the build path name(s) of a directory or
-list of directories.  It is invoked as follows:
-
-  $cwd = DirPath <paths>;
-
-The most common use for the C<DirPath> method is:
-
-  $cwd = DirPath '.';
-
-to fetch the path to the current directory of a subsidiary F<Conscript>
-file.
-
-
-=head2 The C<FilePath> method
-
-The C<FilePath> method returns the build path name(s) of a file or
-list of files.  It is invoked as follows:
-
-  $file = FilePath <path>;
-
-
-=head2 The C<Help> method
-
-The C<Help> method specifies help text that will be displayed when the
-user invokes C<cons -h>.  This can be used to provide documentation
-of specific targets, values, build options, etc. for the build tree.
-It is invoked as follows:
-
-  Help <helptext>;
-
-The C<Help> method may only be called once, and should typically be
-specified in the top-level F<Construct> file.
-
-
-=head1 Extending Cons
-
-
-=head2 Overriding construction variables
-
-There are several ways of extending Cons, which vary in degree of
-difficulty. The simplest method is to define your own construction
-environment, based on the default environment, but modified to reflect your
-particular needs. This will often suffice for C-based applications. You can
-use the C<new> constructor, and the C<clone> and C<copy> methods to create
-hybrid environments. These changes can be entirely transparent to the
-underlying F<Conscript> files.
-
-
-=head2 Adding new methods
-
-For slightly more demanding changes, you may wish to add new methods to the
-C<cons> package. Here's an example of a very simple extension,
-C<InstallScript>, which installs a tcl script in a requested location, but
-edits the script first to reflect a platform-dependent path that needs to be
-installed in the script:
-
-  # cons::InstallScript - Create a platform dependent version of a shell
-  # script by replacing string ``#!your-path-here'' with platform specific
-  # path $BIN_DIR.
-
-  sub cons::InstallScript {
-	my ($env, $dst, $src) = @_;
-	Command $env $dst, $src, qq(
-		sed s+your-path-here+$BIN_DIR+ %< > %>
-		chmod oug+x %>
-	);
-  }
-
-Notice that this method is defined directly in the C<cons> package (by
-prefixing the name with C<cons::>). A change made in this manner will be
-globally visible to all environments, and could be called as in the
-following example:
-
-  InstallScript $env "$BIN/foo", "foo.tcl";
-
-For a small improvement in generality, the C<BINDIR> variable could be
-passed in as an argument or taken from the construction environment--as
-C<%BINDIR>.
-
-
-=head2 Overriding methods
-
-Instead of adding the method to the C<cons> name space, you could define a
-new package which inherits existing methods from the C<cons> package and
-overrides or adds others. This can be done using Perl's inheritance
-mechanisms.
-
-The following example defines a new package C<cons::switch> which
-overrides the standard C<Library> method. The overridden method builds
-linked library modules, rather than library archives. A new
-constructor is provided. Environments created with this constructor
-will have the new library method; others won't.
-
-  package cons::switch;
-  BEGIN {@ISA = 'cons'}
-
-  sub new {
-	shift;
-	bless new cons(@_);
-  }
-
-  sub Library {
-	my($env) = shift;
-	my($lib) = shift;
-	my(@objs) = Objects $env @_;
-	Command $env $lib, @objs, q(
-		%LD -r %LDFLAGS %< -o %>
-	);
-  }
-
-This functionality could be invoked as in the following example:
-
-  $env = new cons::switch(@overrides);
-  ...
-  Library $env 'lib.o', 'foo.c', 'bar.c';
-
-
-=head1 Invoking Cons
-
-The C<cons> command is usually invoked from the root of the build tree. A
-F<Construct> file must exist in that directory. If the C<-f> argument is
-used, then an alternate F<Construct> file may be used (and, possibly, an
-alternate root, since C<cons> will cd to F<Construct> file's containing
-directory).
-
-If C<cons> is invoked from a child of the root of the build tree with
-the C<-t> argument, it will walk up the directory hierarchy looking for a
-F<Construct> file.  (An alternate name may still be specified with C<-f>.)
-The targets supplied on the command line will be modified to be relative
-to the discovered F<Construct> file.  For example, from a directory
-containing a top-level F<Construct> file, the following invocation:
-
-  % cd libfoo/subdir
-  % cons -t target
-
-is exactly equivalent to:
-
-  % cons libfoo/subdir/target
-
-If there are any C<Default> targets specified in the directory hierarchy's
-F<Construct> or F<Conscript> files, only the default targets at or below
-the directory from which C<cons -t> was invoked will be built.
-
-The command is invoked as follows:
-
-  cons <arguments> -- <construct-args>
-
-where I<arguments> can be any of the following, in any order:
-
-=over 10
-
-=item I<target>
-
-Build the specified target. If I<target> is a directory, then recursively
-build everything within that directory.
-
-=item I<+pattern>
-
-Limit the F<Conscript> files considered to just those that match I<pattern>,
-which is a Perl regular expression. Multiple C<+> arguments are accepted.
-
-=item I<name>=<val>
-
-Sets I<name> to value I<val> in the C<ARG> hash passed to the top-level
-F<Construct> file.
-
-=item C<-cc>
-
-Show command that would have been executed, when retrieving from cache. No
-indication that the file has been retrieved is given; this is useful for
-generating build logs that can be compared with real build logs.
-
-=item C<-cd>
-
-Disable all caching. Do not retrieve from cache nor flush to cache.
-
-=item C<-cr>
-
-Build dependencies in random order. This is useful when building multiple
-similar trees with caching enabled.
-
-=item C<-cs>
-
-Synchronize existing build targets that are found to be up-to-date with
-cache. This is useful if caching has been disabled with -cc or just recently
-enabled with UseCache.
-
-=item C<-d>
-
-Enable dependency debugging.
-
-=item C<-f> <file>
-
-Use the specified file instead of F<Construct> (but first change to
-containing directory of I<file>).
-
-=item C<-h>
-
-Show a help message local to the current build if one such is defined, and
-exit.
-
-=item C<-k>
-
-Keep going as far as possible after errors.
-
-=item C<-o> <file>
-
-Read override file I<file>.
-
-=item C<-p>
-
-Show construction products in specified trees. No build is attempted.
-
-=item C<-pa>
-
-Show construction products and associated actions. No build is attempted.
-
-=item C<-pw>
-
-Show products and where they are defined. No build is attempted.
-
-=item C<-q>
-
-Make the build quiet.  Multiple C<-q> options may be specified.
-
-A single C<-q> options suppress messages about Installing and Removing
-targets.
-
-Two C<-q> options suppress build command lines and target up-to-date
-messages.
-
-=item C<-r>
-
-Remove construction products associated with <targets>. No build is
-attempted.
-
-=item C<-R> <repos>
-
-Search for files in I<repos>.  Multiple B<-R> I<repos> directories are
-searched in the order specified.
-
-=item C<-S> <pkg>
-
-Use the sig::<pkg> package to calculate.  Supported <pkg> values
-include "md5" for MD5 signature calculation and "md5::debug" for debug
-information about MD5 signature calculation.
-
-If the specified package ends in <::debug>, signature debug information
-will be printed to the file name specified in the C<CONS_SIG_DEBUG>
-environment variable, or to standard output if the environment variable
-is not set.
-
-=item C<-t>
-
-Traverse up the directory hierarchy looking for a F<Construct> file,
-if none exists in the current directory.  Targets will be modified to
-be relative to the F<Construct> file.
-
-Internally, C<cons> will change its working directory to the directory
-which contains the top-level F<Construct> file and report:
-
-  cons: Entering directory `top-level-directory'
-
-This message indicates to an invoking editor (such as emacs) or build
-environment that Cons will now report all file names relative to the
-top-level directory.  This message can not be suppressed with the C<-q>
-option.
-
-=item C<-v>
-
-Show C<cons> version and continue processing.
-
-=item C<-V>
-
-Show C<cons> version and exit.
-
-=item C<-wf> <file>
-
-Write all filenames considered into I<file>.
-
-=item C<-x>
-
-Show a help message similar to this one, and exit.
-
-=back
-
-And I<construct-args> can be any arguments that you wish to process in the
-F<Construct> file. Note that there should be a B<--> separating the arguments
-to cons and the arguments that you wish to process in the F<Construct> file.
-
-Processing of I<construct-args> can be done by any standard package like
-B<Getopt> or its variants, or any user defined package. B<cons> will pass in
-the I<construct-args> as B<@ARGV> and will not attempt to interpret anything
-after the B<-->.
-
-  % cons -R /usr/local/repository -d os=solaris +driver -- -c test -f DEBUG
-
-would pass the following to cons
-
-  -R /usr/local/repository -d os=solaris +driver
-
-and the following, to the top level F<Construct> file as B<@ARGV>
-
-  -c test -f DEBUG
-
-Note that C<cons -r .> is equivalent to a full recursive C<make clean>,
-but requires no support in the F<Construct> file or any F<Conscript>
-files. This is most useful if you are compiling files into source
-directories (if you separate the F<build> and F<export> directories,
-then you can just remove the directories).
-
-The options C<-p>, C<-pa>, and C<-pw> are extremely useful for use as an aid
-in reading scripts or debugging them. If you want to know what script
-installs F<export/include/foo.h>, for example, just type:
-
-  % cons -pw export/include/foo.h
-
-
-=head1 Using and writing dependency scanners
-
-QuickScan allows simple target-independent scanners to be set up for
-source files. Only one QuickScan scanner may be associated with any given
-source file and environment, although the same scanner may (and should)
-be used for multiple files of a given type.
-
-A QuickScan scanner is only ever invoked once for a given source file,
-and it is only invoked if the file is used by some target in the tree
-(i.e., there is a dependency on the source file).
-
-QuickScan is invoked as follows:
-
-  QuickScan CONSENV CODEREF, FILENAME [, PATH]
-
-The subroutine referenced by CODEREF is expected to return a list of
-filenames included directly by FILE. These filenames will, in turn, be
-scanned. The optional PATH argument supplies a lookup path for finding
-FILENAME and/or files returned by the user-supplied subroutine.  The PATH
-may be a reference to an array of lookup-directory names, or a string of
-names separated by the system's separator character (':' on UNIX systems,
-';' on Windows NT).
-
-The subroutine is called once for each line in the file, with $_ set to the
-current line. If the subroutine needs to look at additional lines, or, for
-that matter, the entire file, then it may read them itself, from the
-filehandle SCAN. It may also terminate the loop, if it knows that no further
-include information is available, by closing the filehandle.
-
-Whether or not a lookup path is provided, QuickScan first tries to lookup
-the file relative to the current directory (for the top-level file
-supplied directly to QuickScan), or from the directory containing the
-file which referenced the file. This is not very general, but seems good
-enough--especially if you have the luxury of writing your own utilities
-and can control the use of the search path in a standard way.
-
-Here's a real example, taken from a F<Construct> file here:
-
-  sub cons::SMFgen {
-      my($env, @tables) = @_;
-      foreach $t (@tables) {
-	  $env->QuickScan(sub { /\b\S*?\.smf\b/g }, "$t.smf",
-			  $env->{SMF_INCLUDE_PATH});
-	  $env->Command(["$t.smdb.cc","$t.smdb.h","$t.snmp.cc",
-			 "$t.ami.cc", "$t.http.cc"], "$t.smf",
-			q(smfgen %( %SMF_INCLUDE_OPT %) %<));
-      }
-  }
-
-The subroutine above finds all names of the form <name>.smf in the
-file. It will return the names even if they're found within comments,
-but that's OK (the mechanism is forgiving of extra files; they're just
-ignored on the assumption that the missing file will be noticed when
-the program, in this example, smfgen, is actually invoked).
-
-[NOTE that the form C<$env-E<gt>QuickScan ...>  and C<$env-E<gt>Command
-...> should not be necessary, but, for some reason, is required
-for this particular invocation. This appears to be a bug in Perl or
-a misunderstanding on my part; this invocation style does not always
-appear to be necessary.]
-
-Here is another way to build the same scanner. This one uses an
-explicit code reference, and also (unnecessarily, in this case) reads
-the whole file itself:
-
-  sub myscan {
-      my(@includes);
-      do {
-	  push(@includes, /\b\S*?\.smf\b/g);
-      } while <SCAN>;
-      @includes
-  }
-
-Note that the order of the loop is reversed, with the loop test at the
-end. This is because the first line is already read for you. This scanner
-can be attached to a source file by:
-
-  QuickScan $env \&myscan, "$_.smf";
-
-This final example, which scans a different type of input file, takes
-over the file scanning rather than being called for each input line:
-
-  $env->QuickScan(
-      sub { my(@includes) = ();
-	  do {
-	     push(@includes, $3)
-		 if /^(#include|import)\s+(\")(.+)(\")/ && $3
-	  } while <SCAN>;
-	  @includes
-      },
-      "$idlFileName",
-      "$env->{CPPPATH};$BUILD/ActiveContext/ACSCLientInterfaces"
-  );
-
-=head1 SUPPORT AND SUGGESTIONS
-
-Cons is maintained by the user community.  To subscribe, send mail to
-B<cons-discuss-request@gnu.org> with body B<subscribe>.
-
-Please report any suggestions through the B<cons-discuss@gnu.org> mailing
-list.
-
-=head1 BUGS
-
-Sure to be some. Please report any bugs through the B<bug-cons@gnu.org>
-mailing list.
-
-=head1 INFORMATION ABOUT CONS
-
-Information about CONS can be obtained from the official cons web site
-B<http://www.dsmit.com/cons/> or its mirrors listed there.
-
-The cons maintainers can be contacted by email at
-B<cons-maintainers@gnu.org>
-
-=head1 AUTHORS
-
-Originally by Bob Sidebotham. Then significantly enriched by the members
-of the Cons community B<cons-discuss@gnu.org>.
-
-The Cons community would like to thank Ulrich Pfeifer for the original pod
-documentation derived from the F<cons.html> file. Cons documentation is now
-a part of the program itself.
-
-=cut
diff --git a/code/unix/extract_ver.pl b/code/unix/extract_ver.pl
deleted file mode 100644
index 10db30a0..00000000
--- a/code/unix/extract_ver.pl
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env perl
-# extracting version string from game/q_shared.h
-# hacked from Wolf build process
-
-# extract the wolf version from q_shared.h
-$line = `cat ../game/q_shared.h | grep Q3_VERSION`;
-chomp $line;
-$line =~ s/.*Q3\ (.*)\"/$1/;
-print "$line\n";
diff --git a/code/unix/ftol.nasm b/code/unix/ftol.nasm
deleted file mode 100644
index 131dfc6e..00000000
--- a/code/unix/ftol.nasm
+++ /dev/null
@@ -1,151 +0,0 @@
-;===========================================================================
-;Copyright (C) 1999-2005 Id Software, Inc.
-;
-;This file is part of Quake III Arena source code.
-;
-;Quake III Arena source code is free software; you can redistribute it
-;and/or modify it under the terms of the GNU General Public License as
-;published by the Free Software Foundation; either version 2 of the License,
-;or (at your option) any later version.
-;
-;Quake III Arena source code is distributed in the hope that it will be
-;useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;GNU General Public License for more details.
-;
-;You should have received a copy of the GNU General Public License
-;along with Foobar; if not, write to the Free Software
-;Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-;===========================================================================
-
-;
-; qftol -- fast floating point to long conversion.
-;
-
-segment .data
-
-temp    dd 0.0
-fpucw   dd 0
-
-; Precision Control Field , 2 bits / 0x0300 
-; PC24 0x0000   Single precision (24 bits). 
-; PC53 0x0200   Double precision (53 bits). 
-; PC64 0x0300   Extended precision (64 bits).
-
-; Rounding Control Field, 2 bits / 0x0C00
-; RCN  0x0000   Rounding to nearest (even). 
-; RCD  0x0400   Rounding down (directed, minus). 
-; RCU  0x0800   Rounding up (directed plus).
-; RC0  0x0C00   Rounding towards zero (chop mode).
-
-
-; rounding towards nearest (even)
-cw027F  dd 0x027F ; double precision
-cw037F  dd 0x037F ; extended precision
-
-; rounding towards zero (chop mode)
-cw0E7F  dd 0x0E7F ; double precision
-cw0F7F  dd 0x0F7F ; extended precision
-
-
-segment .text
-
-;
-; int qftol( void ) - default control word
-;
-
-global qftol
-
-qftol: 
-        fistp dword [temp]
-        mov eax, [temp]
-        ret
-
-
-;
-; int qftol027F( void ) - DirectX FPU 
-;
-
-global qftol027F
-
-qftol027F:
-	fnstcw [fpucw]
-	fldcw  [cw027F]  
-        fistp dword [temp]
-	fldcw  [fpucw]
-        mov eax, [temp]
-        ret
-
-;
-; int qftol037F( void ) - Linux FPU 
-;
-
-global qftol037F
-
-qftol037F:
-	fnstcw [fpucw]
-	fldcw  [cw037F]  
-        fistp dword [temp]
-	fldcw  [fpucw]
-        mov eax, [temp]
-        ret
-
-
-;
-; int qftol0F7F( void ) - ANSI
-;
-
-global qftol0F7F
-
-qftol0F7F:
-	fnstcw [fpucw]
-	fldcw  [cw0F7F]  
-        fistp dword [temp]
-	fldcw  [fpucw]
-        mov eax, [temp]
-        ret
-
-;
-; int qftol0E7F( void ) 
-;
-
-global qftol0E7F
-
-qftol0E7F:
-	fnstcw [fpucw]
-	fldcw  [cw0E7F]  
-        fistp dword [temp]
-	fldcw  [fpucw]
-        mov eax, [temp]
-        ret
-
-
-
-;
-; long Q_ftol( float q )
-;
-
-global Q_ftol
-
-Q_ftol:
-        fld dword [esp+4]  
-        fistp dword [temp]
-        mov eax, [temp]
-        ret
-
-
-;
-; long qftol0F7F( float q ) - Linux FPU 
-;
-
-global Q_ftol0F7F
-
-Q_ftol0F7F:
-	fnstcw [fpucw]
-	fld dword [esp+4]  
-	fldcw  [cw0F7F]  
-        fistp dword [temp]
-	fldcw  [fpucw]
-        mov eax, [temp]
-        ret
-
diff --git a/code/unix/linux_common.c b/code/unix/linux_common.c
deleted file mode 100644
index 9688b451..00000000
--- a/code/unix/linux_common.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/** 
- * GAS syntax equivalents of the MSVC asm memory calls in common.c
- *
- * The following changes have been made to the asm:
- * 1. Registers are loaded by the inline asm arguments when possible
- * 2. Labels have been changed to local label format (0,1,etc.) to allow inlining
- *
- * HISTORY:
- *	AH - Created on 08 Dec 2000
- */
-
-#include <unistd.h>   // AH - for size_t
-#include <string.h>
-
-// bk001207 - we need something under Linux, too. Mac?
-#if 1 // defined(C_ONLY) // bk010102 - dedicated?
-void Com_Memcpy (void* dest, const void* src, const size_t count) {
-  memcpy(dest, src, count);
-}
-
-void Com_Memset (void* dest, const int val, const size_t count) {
-  memset(dest, val, count);
-}
-
-#else
-
-typedef enum {
-  PRE_READ,         // prefetch assuming that buffer is used for reading only
-  PRE_WRITE,        // prefetch assuming that buffer is used for writing only
-  PRE_READ_WRITE    // prefetch assuming that buffer is used for both reading and writing
-} e_prefetch;
-
-void Com_Prefetch (const void *s, const unsigned int bytes, e_prefetch type);
-
-void _copyDWord (unsigned int* dest, const unsigned int constant, const unsigned int count) {
-	// MMX version not used on standard Pentium MMX
-	// because the dword version is faster (with
-	// proper destination prefetching)
-		__asm__ __volatile__ (" \
-			//mov			eax,constant		// eax = val \
-			//mov			edx,dest			// dest \
-			//mov			ecx,count \
-			movd		%%eax, %%mm0 \
-			punpckldq	%%mm0, %%mm0 \
-\
-			// ensure that destination is qword aligned \
-\
-			testl		$7, %%edx				// qword padding?\
-			jz		0f	\
-			movl		%%eax, (%%edx) \
-			decl		%%ecx \
-			addl		$4, %%edx \
-\
-0:			movl		%%ecx, %%ebx				\
-			andl		$0xfffffff0, %%ecx	\
-			jz		2f \
-			jmp		1f \
-			.align 		16 \
-\
-			// funny ordering here to avoid commands \
-			// that cross 32-byte boundaries (the \
-			// [edx+0] version has a special 3-byte opcode... \
-1:			movq		%%mm0, 8(%%edx) \
-			movq		%%mm0, 16(%%edx) \
-			movq		%%mm0, 24(%%edx) \
-			movq		%%mm0, 32(%%edx) \
-			movq		%%mm0, 40(%%edx) \
-			movq		%%mm0, 48(%%edx) \
-			movq		%%mm0, 56(%%edx) \
-			movq		%%mm0, (%%edx)\
-			addl		$64, %%edx \
-			subl		$16, %%ecx \
-			jnz		1b \
-2:	\
-			movl		%%ebx, %%ecx				// ebx = cnt \
-			andl		$0xfffffff0, %%ecx				// ecx = cnt&~15 \
-			subl		%%ecx, %%ebx \
-			jz		6f \
-			cmpl		$8, %%ebx \
-			jl		3f \
-\
-			movq		%%mm0, (%%edx) \
-			movq		%%mm0, 8(%%edx) \
-			movq		%%mm0, 16(%%edx) \
-			movq		%%mm0, 24(%%edx) \
-			addl		$32, %%edx \
-			subl		$8, %%ebx \
-			jz		6f \
-\
-3:			cmpl		$4, %%ebx \
-			jl		4f \
-			\
-			movq		%%mm0, (%%edx) \
-			movq		%%mm0, 8(%%edx) \
-			addl		$16, %%edx \
-			subl		$4, %%ebx \
-\
-4:			cmpl		$2, %%ebx \
-			jl		5f \
-			movq		%%mm0, (%%edx) \
-			addl		$8, %%edx \
-			subl		$2, %%ebx \
-\
-5:			cmpl		$1, %%ebx \
-			jl		6f \
-			movl		%%eax, (%%edx) \
-6: \
-			emms \
-	"
-	: : "a" (constant), "c" (count), "d" (dest)
-	: "%ebx", "%edi", "%esi", "cc", "memory");
-}
-
-// optimized memory copy routine that handles all alignment
-// cases and block sizes efficiently
-void Com_Memcpy (void* dest, const void* src, const size_t count) {
-	Com_Prefetch (src, count, PRE_READ);
-	__asm__ __volatile__ (" \
-		pushl		%%edi \
-		pushl		%%esi \
-		//mov		ecx,count \
-		cmpl		$0, %%ecx						// count = 0 check (just to be on the safe side) \
-		je		6f \
-		//mov		edx,dest \
-		movl		%0, %%ebx \
-		cmpl		$32, %%ecx						// padding only? \
-		jl		1f \
-\
-		movl		%%ecx, %%edi					\
-		andl		$0xfffffe00, %%edi					// edi = count&~31 \
-		subl		$32, %%edi \
-\
-		.align 16 \
-0: \
-		movl		(%%ebx, %%edi, 1), %%eax \
-		movl		4(%%ebx, %%edi, 1), %%esi \
-		movl		%%eax, (%%edx, %%edi, 1) \
-		movl		%%esi, 4(%%edx, %%edi, 1) \
-		movl		8(%%ebx, %%edi, 1), %%eax \
-		movl		12(%%ebx, %%edi, 1), %%esi \
-		movl		%%eax, 8(%%edx, %%edi, 1) \
-		movl		%%esi, 12(%%edx, %%edi, 1) \
-		movl		16(%%ebx, %%edi, 1), %%eax \
-		movl		20(%%ebx, %%edi, 1), %%esi \
-		movl		%%eax, 16(%%edx, %%edi, 1) \
-		movl		%%esi, 20(%%edx, %%edi, 1) \
-		movl		24(%%ebx, %%edi, 1), %%eax \
-		movl		28(%%ebx, %%edi, 1), %%esi \
-		movl		%%eax, 24(%%edx, %%edi, 1) \
-		movl		%%esi, 28(%%edx, %%edi, 1) \
-		subl		$32, %%edi \
-		jge		0b \
-		\
-		movl		%%ecx, %%edi \
-		andl		$0xfffffe00, %%edi \
-		addl		%%edi, %%ebx					// increase src pointer \
-		addl		%%edi, %%edx					// increase dst pointer \
-		andl		$31, %%ecx					// new count \
-		jz		6f					// if count = 0, get outta here \
-\
-1: \
-		cmpl		$16, %%ecx \
-		jl		2f \
-		movl		(%%ebx), %%eax \
-		movl		%%eax, (%%edx) \
-		movl		4(%%ebx), %%eax \
-		movl		%%eax, 4(%%edx) \
-		movl		8(%%ebx), %%eax \
-		movl		%%eax, 8(%%edx) \
-		movl		12(%%ebx), %%eax \
-		movl		%%eax, 12(%%edx) \
-		subl		$16, %%ecx \
-		addl		$16, %%ebx \
-		addl		$16, %%edx \
-2: \
-		cmpl		$8, %%ecx \
-		jl		3f \
-		movl		(%%ebx), %%eax \
-		movl		%%eax, (%%edx) \
-		movl		4(%%ebx), %%eax \
-		subl		$8, %%ecx \
-		movl		%%eax, 4(%%edx) \
-		addl		$8, %%ebx \
-		addl		$8, %%edx \
-3: \
-		cmpl		$4, %%ecx \
-		jl		4f \
-		movl		(%%ebx), %%eax	// here 4-7 bytes \
-		addl		$4, %%ebx \
-		subl		$4, %%ecx \
-		movl		%%eax, (%%edx) \
-		addl		$4, %%edx \
-4:							// 0-3 remaining bytes \
-		cmpl		$2, %%ecx \
-		jl		5f \
-		movw		(%%ebx), %%ax	// two bytes \
-		cmpl		$3, %%ecx				// less than 3? \
-		movw		%%ax, (%%edx) \
-		jl		6f \
-		movb		2(%%ebx), %%al	// last byte \
-		movb		%%al, 2(%%edx) \
-		jmp		6f \
-5: \
-		cmpl		$1, %%ecx \
-		jl		6f \
-		movb		(%%ebx), %%al \
-		movb		%%al, (%%edx) \
-6: \
-		popl		%%esi \
-		popl		%%edi \
-	"
-	: : "m" (src), "d" (dest), "c" (count)
-	: "%eax", "%ebx", "%edi", "%esi", "cc", "memory");
-}
-
-void Com_Memset (void* dest, const int val, const size_t count)
-{
-	unsigned int fillval;
-
-	if (count < 8)
-	{
-		__asm__ __volatile__ (" \
-			//mov		edx,dest \
-			//mov		eax, val \
-			movb		%%al, %%ah \
-			movl		%%eax, %%ebx \
-			andl		$0xffff, %%ebx \
-			shll		$16, %%eax \
-			addl		%%ebx, %%eax	// eax now contains pattern \
-			//mov		ecx,count \
-			cmpl		$4, %%ecx \
-			jl		0f \
-			movl		%%eax, (%%edx)	// copy first dword \
-			addl		$4, %%edx \
-			subl		$4, %%ecx \
-	0:		cmpl		$2, %%ecx \
-			jl		1f \
-			movw		%%ax, (%%edx)	// copy 2 bytes \
-			addl		$2, %%edx \
-			subl		$2, %%ecx \
-	1:		cmpl		$0, %%ecx \
-			je		2f \
-			movb		%%al, (%%edx)	// copy single byte \
-	2:		 \
-		"
-		: : "d" (dest), "a" (val), "c" (count)
-		: "%ebx", "%edi", "%esi", "cc", "memory");
-		
-		return;
-	}
-
-	fillval = val;
-	
-	fillval = fillval|(fillval<<8);
-	fillval = fillval|(fillval<<16);		// fill dword with 8-bit pattern
-
-	_copyDWord ((unsigned int*)(dest),fillval, count/4);
-	
-	__asm__ __volatile__ ("     		// padding of 0-3 bytes \
-		//mov		ecx,count \
-		movl		%%ecx, %%eax \
-		andl		$3, %%ecx \
-		jz		1f \
-		andl		$0xffffff00, %%eax \
-		//mov		ebx,dest \
-		addl		%%eax, %%edx \
-		movl		%0, %%eax \
-		cmpl		$2, %%ecx \
-		jl		0f \
-		movw		%%ax, (%%edx) \
-		cmpl		$2, %%ecx \
-		je		1f					\
-		movb		%%al, 2(%%edx)		\
-		jmp		1f \
-0:		\
-		cmpl		$0, %%ecx\
-		je		1f\
-		movb		%%al, (%%edx)\
-1:	\
-	"
-	: : "m" (fillval), "c" (count), "d" (dest)
-	: "%eax", "%ebx", "%edi", "%esi", "cc", "memory");	
-}
-
-void Com_Prefetch (const void *s, const unsigned int bytes, e_prefetch type)
-{
-	// write buffer prefetching is performed only if
-	// the processor benefits from it. Read and read/write
-	// prefetching is always performed.
-
-	switch (type)
-	{
-		case PRE_WRITE : break;
-		case PRE_READ:
-		case PRE_READ_WRITE:
-
-		__asm__ __volatile__ ("\
-			//mov		ebx,s\
-			//mov		ecx,bytes\
-			cmpl		$4096, %%ecx				// clamp to 4kB\
-			jle		0f\
-			movl		$4096, %%ecx\
-	0:\
-			addl		$0x1f, %%ecx\
-			shrl		$5, %%ecx					// number of cache lines\
-			jz		2f\
-			jmp		1f\
-\
-			.align 16\
-	1:		testb		%%al, (%%edx)\
-			addl		$32, %%edx\
-			decl		%%ecx\
-			jnz		1b\
-	2:\
-		"
-		: : "d" (s), "c" (bytes)
-		: "%eax", "%ebx", "%edi", "%esi", "memory", "cc");
-		
-		break;
-	}
-}
-
-#endif
diff --git a/code/unix/linux_glimp.c b/code/unix/linux_glimp.c
deleted file mode 100644
index f0b16198..00000000
--- a/code/unix/linux_glimp.c
+++ /dev/null
@@ -1,1756 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** GLW_IMP.C
-**
-** This file contains ALL Linux specific stuff having to do with the
-** OpenGL refresh.  When a port is being made the following functions
-** must be implemented by the port:
-**
-** GLimp_EndFrame
-** GLimp_Init
-** GLimp_Shutdown
-** GLimp_SwitchFullscreen
-** GLimp_SetGamma
-**
-*/
-
-#include <termios.h>
-#include <sys/ioctl.h>
-#ifdef __linux__
-  #include <sys/stat.h>
-  #include <sys/vt.h>
-#endif
-#include <stdarg.h>
-#include <stdio.h>
-#include <signal.h>
-#include <pthread.h>
-#include <semaphore.h>
-
-// bk001204
-#include <dlfcn.h>
-
-// bk001206 - from my Heretic2 by way of Ryan's Fakk2
-// Needed for the new X11_PendingInput() function.
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "../renderer/tr_local.h"
-#include "../client/client.h"
-#include "linux_local.h" // bk001130
-
-#include "unix_glw.h"
-
-#include <GL/glx.h>
-
-#include <X11/keysym.h>
-#include <X11/cursorfont.h>
-
-#include <X11/extensions/xf86dgaconst.h>
-#include <X11/extensions/xf86vmode.h>
-
-#define	WINDOW_CLASS_NAME	PRODUCT_NAME_FULL
-
-typedef enum
-{
-  RSERR_OK,
-
-  RSERR_INVALID_FULLSCREEN,
-  RSERR_INVALID_MODE,
-
-  RSERR_UNKNOWN
-} rserr_t;
-
-glwstate_t glw_state;
-
-static Display *dpy = NULL;
-static int scrnum;
-static Window win = 0;
-static GLXContext ctx = NULL;
-
-// bk001206 - not needed anymore
-// static qboolean autorepeaton = qtrue;
-
-#define KEY_MASK (KeyPressMask | KeyReleaseMask)
-#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
-		    PointerMotionMask | ButtonMotionMask )
-#define X_MASK (KEY_MASK | MOUSE_MASK | VisibilityChangeMask | StructureNotifyMask )
-
-static qboolean mouse_avail;
-static qboolean mouse_active = qfalse;
-static int mwx, mwy;
-static int mx = 0, my = 0;
-
-// Time mouse was reset, we ignore the first 50ms of the mouse to allow settling of events
-static int mouseResetTime = 0;
-#define MOUSE_RESET_DELAY 50
-
-static cvar_t *in_mouse;
-static cvar_t *in_dgamouse; // user pref for dga mouse
-cvar_t *in_subframe;
-cvar_t *in_nograb; // this is strictly for developers
-
-// bk001130 - from cvs1.17 (mkv), but not static
-cvar_t   *in_joystick      = NULL;
-cvar_t   *in_joystickDebug = NULL;
-cvar_t   *joy_threshold    = NULL;
-
-cvar_t  *r_allowSoftwareGL;   // don't abort out if the pixelformat claims software
-cvar_t  *r_previousglDriver;
-
-qboolean vidmode_ext = qfalse;
-static int vidmode_MajorVersion = 0, vidmode_MinorVersion = 0; // major and minor of XF86VidExtensions
-
-// gamma value of the X display before we start playing with it
-static XF86VidModeGamma vidmode_InitialGamma;
-
-static int win_x, win_y;
-
-static XF86VidModeModeInfo **vidmodes;
-//static int default_dotclock_vidmode; // bk001204 - unused
-static int num_vidmodes;
-static qboolean vidmode_active = qfalse;
-
-static int mouse_accel_numerator;
-static int mouse_accel_denominator;
-static int mouse_threshold;    
-
-/*****************************************************************************
-** KEYBOARD
-** NOTE TTimo the keyboard handling is done with KeySyms
-**   that means relying on the keyboard mapping provided by X
-**   in-game it would probably be better to use KeyCode (i.e. hardware key codes)
-**   you would still need the KeySyms in some cases, such as for the console and all entry textboxes
-**     (cause there's nothing worse than a qwerty mapping on a french keyboard)
-**
-** you can turn on some debugging and verbose of the keyboard code with #define KBD_DBG
-******************************************************************************/
-
-//#define KBD_DBG
-
-static char *XLateKey(XKeyEvent *ev, int *key)
-{
-  static char buf[64];
-  KeySym keysym;
-  int XLookupRet;
-
-  *key = 0;
-
-  XLookupRet = XLookupString(ev, buf, sizeof buf, &keysym, 0);
-#ifdef KBD_DBG
-  ri.Printf(PRINT_ALL, "XLookupString ret: %d buf: %s keysym: %x\n", XLookupRet, buf, keysym);
-#endif
-  
-  switch (keysym)
-  {
-  case XK_KP_Page_Up: 
-  case XK_KP_9:  *key = K_KP_PGUP; break;
-  case XK_Page_Up:   *key = K_PGUP; break;
-
-  case XK_KP_Page_Down: 
-  case XK_KP_3: *key = K_KP_PGDN; break;
-  case XK_Page_Down:   *key = K_PGDN; break;
-
-  case XK_KP_Home: *key = K_KP_HOME; break;
-  case XK_KP_7: *key = K_KP_HOME; break;
-  case XK_Home:  *key = K_HOME; break;
-
-  case XK_KP_End:
-  case XK_KP_1:   *key = K_KP_END; break;
-  case XK_End:   *key = K_END; break;
-
-  case XK_KP_Left: *key = K_KP_LEFTARROW; break;
-  case XK_KP_4: *key = K_KP_LEFTARROW; break;
-  case XK_Left:  *key = K_LEFTARROW; break;
-
-  case XK_KP_Right: *key = K_KP_RIGHTARROW; break;
-  case XK_KP_6: *key = K_KP_RIGHTARROW; break;
-  case XK_Right:  *key = K_RIGHTARROW;    break;
-
-  case XK_KP_Down:
-  case XK_KP_2:    *key = K_KP_DOWNARROW; break;
-  case XK_Down:  *key = K_DOWNARROW; break;
-
-  case XK_KP_Up:   
-  case XK_KP_8:    *key = K_KP_UPARROW; break;
-  case XK_Up:    *key = K_UPARROW;   break;
-
-  case XK_Escape: *key = K_ESCAPE;    break;
-
-  case XK_KP_Enter: *key = K_KP_ENTER;  break;
-  case XK_Return: *key = K_ENTER;    break;
-
-  case XK_Tab:    *key = K_TAB;      break;
-
-  case XK_F1:    *key = K_F1;       break;
-
-  case XK_F2:    *key = K_F2;       break;
-
-  case XK_F3:    *key = K_F3;       break;
-
-  case XK_F4:    *key = K_F4;       break;
-
-  case XK_F5:    *key = K_F5;       break;
-
-  case XK_F6:    *key = K_F6;       break;
-
-  case XK_F7:    *key = K_F7;       break;
-
-  case XK_F8:    *key = K_F8;       break;
-
-  case XK_F9:    *key = K_F9;       break;
-
-  case XK_F10:    *key = K_F10;      break;
-
-  case XK_F11:    *key = K_F11;      break;
-
-  case XK_F12:    *key = K_F12;      break;
-
-    // bk001206 - from Ryan's Fakk2 
-    //case XK_BackSpace: *key = 8; break; // ctrl-h
-  case XK_BackSpace: *key = K_BACKSPACE; break; // ctrl-h
-
-  case XK_KP_Delete:
-  case XK_KP_Decimal: *key = K_KP_DEL; break;
-  case XK_Delete: *key = K_DEL; break;
-
-  case XK_Pause:  *key = K_PAUSE;    break;
-
-  case XK_Shift_L:
-  case XK_Shift_R:  *key = K_LSHIFT;   break;
-
-  case XK_Execute: 
-  case XK_Control_L: 
-  case XK_Control_R:  *key = K_LCTRL;  break;
-
-  case XK_Alt_L:  
-  case XK_Meta_L: 
-  case XK_Alt_R:  
-  case XK_Meta_R: *key = K_LALT;     break;
-
-  case XK_KP_Begin: *key = K_KP_5;  break;
-
-  case XK_Insert:   *key = K_INS; break;
-  case XK_KP_Insert:
-  case XK_KP_0: *key = K_KP_INS; break;
-
-  case XK_KP_Multiply: *key = '*'; break;
-  case XK_KP_Add:  *key = K_KP_PLUS; break;
-  case XK_KP_Subtract: *key = K_KP_MINUS; break;
-  case XK_KP_Divide: *key = K_KP_SLASH; break;
-
-    // bk001130 - from cvs1.17 (mkv)
-  case XK_exclam: *key = '1'; break;
-  case XK_at: *key = '2'; break;
-  case XK_numbersign: *key = '3'; break;
-  case XK_dollar: *key = '4'; break;
-  case XK_percent: *key = '5'; break;
-  case XK_asciicircum: *key = '6'; break;
-  case XK_ampersand: *key = '7'; break;
-  case XK_asterisk: *key = '8'; break;
-  case XK_parenleft: *key = '9'; break;
-  case XK_parenright: *key = '0'; break;
-  
-  // weird french keyboards ..
-  // NOTE: console toggle is hardcoded in cl_keys.c, can't be unbound
-  //   cleaner would be .. using hardware key codes instead of the key syms
-  //   could also add a new K_KP_CONSOLE
-  case XK_twosuperior: *key = '~'; break;
-		
-	// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=472
-	case XK_space:
-	case XK_KP_Space: *key = K_SPACE; break;
-
-  default:
-    if (XLookupRet == 0)
-    {
-      if (developer->value)
-      {
-        ri.Printf(PRINT_ALL, "Warning: XLookupString failed on KeySym %d\n", keysym);
-      }
-      return NULL;
-    }
-    else
-    {
-      // XK_* tests failed, but XLookupString got a buffer, so let's try it
-      *key = *(unsigned char *)buf;
-      if (*key >= 'A' && *key <= 'Z')
-        *key = *key - 'A' + 'a';
-      // if ctrl is pressed, the keys are not between 'A' and 'Z', for instance ctrl-z == 26 ^Z ^C etc.
-      // see https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=19
-      else if (*key >= 1 && *key <= 26)
-     	  *key = *key + 'a' - 1;
-    }
-    break;
-  } 
-
-  return buf;
-}
-
-// ========================================================================
-// makes a null cursor
-// ========================================================================
-
-static Cursor CreateNullCursor(Display *display, Window root)
-{
-  Pixmap cursormask; 
-  XGCValues xgc;
-  GC gc;
-  XColor dummycolour;
-  Cursor cursor;
-
-  cursormask = XCreatePixmap(display, root, 1, 1, 1/*depth*/);
-  xgc.function = GXclear;
-  gc =  XCreateGC(display, cursormask, GCFunction, &xgc);
-  XFillRectangle(display, cursormask, gc, 0, 0, 1, 1);
-  dummycolour.pixel = 0;
-  dummycolour.red = 0;
-  dummycolour.flags = 04;
-  cursor = XCreatePixmapCursor(display, cursormask, cursormask,
-                               &dummycolour,&dummycolour, 0,0);
-  XFreePixmap(display,cursormask);
-  XFreeGC(display,gc);
-  return cursor;
-}
-
-static void install_grabs(void)
-{
-  // inviso cursor
-  XWarpPointer(dpy, None, win,
-               0, 0, 0, 0,
-               glConfig.vidWidth / 2, glConfig.vidHeight / 2);
-  XSync(dpy, False);
-
-  XDefineCursor(dpy, win, CreateNullCursor(dpy, win));
-
-  XGrabPointer(dpy, win, // bk010108 - do this earlier?
-               False,
-               MOUSE_MASK,
-               GrabModeAsync, GrabModeAsync,
-               win,
-               None,
-               CurrentTime);
-
-  XGetPointerControl(dpy, &mouse_accel_numerator, &mouse_accel_denominator,
-                     &mouse_threshold);
-
-  XChangePointerControl(dpy, True, True, 1, 1, 0);
-
-  XSync(dpy, False);
-
-  mouseResetTime = Sys_Milliseconds ();
-
-  if (in_dgamouse->value)
-  {
-    int MajorVersion, MinorVersion;
-
-    if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion))
-    {
-      // unable to query, probalby not supported, force the setting to 0
-      ri.Printf( PRINT_ALL, "Failed to detect XF86DGA Mouse\n" );
-      ri.Cvar_Set( "in_dgamouse", "0" );
-    } else
-    {
-      XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
-      XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
-    }
-  } else
-  {
-    mwx = glConfig.vidWidth / 2;
-    mwy = glConfig.vidHeight / 2;
-    mx = my = 0;
-  }
-
-  XGrabKeyboard(dpy, win,
-                False,
-                GrabModeAsync, GrabModeAsync,
-                CurrentTime);
-
-  XSync(dpy, False);
-}
-
-static void uninstall_grabs(void)
-{
-  if (in_dgamouse->value)
-  {
-		if (developer->value)
-			ri.Printf( PRINT_ALL, "DGA Mouse - Disabling DGA DirectVideo\n" );
-    XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
-  }
-
-  XChangePointerControl(dpy, qtrue, qtrue, mouse_accel_numerator, 
-                        mouse_accel_denominator, mouse_threshold);
-
-  XUngrabPointer(dpy, CurrentTime);
-  XUngrabKeyboard(dpy, CurrentTime);
-
-  XWarpPointer(dpy, None, win,
-               0, 0, 0, 0,
-               glConfig.vidWidth / 2, glConfig.vidHeight / 2);
-
-  // inviso cursor
-  XUndefineCursor(dpy, win);
-}
-
-// bk001206 - from Ryan's Fakk2
-/**
- * XPending() actually performs a blocking read 
- *  if no events available. From Fakk2, by way of
- *  Heretic2, by way of SDL, original idea GGI project.
- * The benefit of this approach over the quite
- *  badly behaved XAutoRepeatOn/Off is that you get
- *  focus handling for free, which is a major win
- *  with debug and windowed mode. It rests on the
- *  assumption that the X server will use the
- *  same timestamp on press/release event pairs 
- *  for key repeats. 
- */
-static qboolean X11_PendingInput(void) {
-
-  assert(dpy != NULL);
-
-  // Flush the display connection
-  //  and look to see if events are queued
-  XFlush( dpy );
-  if ( XEventsQueued( dpy, QueuedAlready) )
-  {
-    return qtrue;
-  }
-
-  // More drastic measures are required -- see if X is ready to talk
-  {
-    static struct timeval zero_time;
-    int x11_fd;
-    fd_set fdset;
-
-    x11_fd = ConnectionNumber( dpy );
-    FD_ZERO(&fdset);
-    FD_SET(x11_fd, &fdset);
-    if ( select(x11_fd+1, &fdset, NULL, NULL, &zero_time) == 1 )
-    {
-      return(XPending(dpy));
-    }
-  }
-
-  // Oh well, nothing is ready ..
-  return qfalse;
-}
-
-// bk001206 - from Ryan's Fakk2. See above.
-static qboolean repeated_press(XEvent *event)
-{
-  XEvent        peekevent;
-  qboolean      repeated = qfalse;
-
-  assert(dpy != NULL);
-
-  if (X11_PendingInput())
-  {
-    XPeekEvent(dpy, &peekevent);
-
-    if ((peekevent.type == KeyPress) &&
-        (peekevent.xkey.keycode == event->xkey.keycode) &&
-        (peekevent.xkey.time == event->xkey.time))
-    {
-      repeated = qtrue;
-      XNextEvent(dpy, &peekevent);  // skip event.
-    } // if
-  } // if
-
-  return(repeated);
-} // repeated_press
-
-int Sys_XTimeToSysTime (Time xtime);
-static void HandleEvents(void)
-{
-  int b;
-  int key;
-  XEvent event;
-  qboolean dowarp = qfalse;
-  char *p;
-  int dx, dy;
-  int t = 0; // default to 0 in case we don't set
-	
-  if (!dpy)
-    return;
-
-  while (XPending(dpy))
-  {
-    XNextEvent(dpy, &event);
-    switch (event.type)
-    {
-    case KeyPress:
-			t = Sys_XTimeToSysTime(event.xkey.time);
-      p = XLateKey(&event.xkey, &key);
-      if (key)
-      {
-        Sys_QueEvent( t, SE_KEY, key, qtrue, 0, NULL );
-      }
-      if (p)
-      {
-        while (*p)
-        {
-          Sys_QueEvent( t, SE_CHAR, *p++, 0, 0, NULL );
-        }
-      }
-      break;
-
-    case KeyRelease:
-			t = Sys_XTimeToSysTime(event.xkey.time);
-      // bk001206 - handle key repeat w/o XAutRepatOn/Off
-      //            also: not done if console/menu is active.
-      // From Ryan's Fakk2.
-      // see game/q_shared.h, KEYCATCH_* . 0 == in 3d game.  
-      if (cls.keyCatchers == 0)
-      {   // FIXME: KEYCATCH_NONE
-        if (repeated_press(&event) == qtrue)
-          continue;
-      } // if
-      XLateKey(&event.xkey, &key);
-
-      Sys_QueEvent( t, SE_KEY, key, qfalse, 0, NULL );
-      break;
-
-    case MotionNotify:
-			t = Sys_XTimeToSysTime(event.xkey.time);
-      if (mouse_active)
-      {
-        if (in_dgamouse->value)
-        {
-          if (abs(event.xmotion.x_root) > 1)
-            mx += event.xmotion.x_root * 2;
-          else
-            mx += event.xmotion.x_root;
-          if (abs(event.xmotion.y_root) > 1)
-            my += event.xmotion.y_root * 2;
-          else
-            my += event.xmotion.y_root;
-          if (t - mouseResetTime > MOUSE_RESET_DELAY )
-          {
-            Sys_QueEvent( t, SE_MOUSE, mx, my, 0, NULL );
-          }
-          mx = my = 0;
-        } else
-        {
-          // If it's a center motion, we've just returned from our warp
-          if (event.xmotion.x == glConfig.vidWidth/2 &&
-              event.xmotion.y == glConfig.vidHeight/2)
-          {
-            mwx = glConfig.vidWidth/2;
-            mwy = glConfig.vidHeight/2;
-            if (t - mouseResetTime > MOUSE_RESET_DELAY )
-            {
-              Sys_QueEvent( t, SE_MOUSE, mx, my, 0, NULL );
-            }
-            mx = my = 0;
-            break;
-          }
-
-          dx = ((int)event.xmotion.x - mwx);
-          dy = ((int)event.xmotion.y - mwy);
-          if (abs(dx) > 1)
-            mx += dx * 2;
-          else
-            mx += dx;
-          if (abs(dy) > 1)
-            my += dy * 2;
-          else
-            my += dy;
-
-          mwx = event.xmotion.x;
-          mwy = event.xmotion.y;
-          dowarp = qtrue;
-        }
-      }
-      break;
-
-    case ButtonPress:
-		  t = Sys_XTimeToSysTime(event.xkey.time);
-      if (event.xbutton.button == 4)
-      {
-        Sys_QueEvent( t, SE_KEY, K_MWHEELUP, qtrue, 0, NULL );
-      } else if (event.xbutton.button == 5)
-      {
-        Sys_QueEvent( t, SE_KEY, K_MWHEELDOWN, qtrue, 0, NULL );
-      } else
-      {
-        // NOTE TTimo there seems to be a weird mapping for K_MOUSE1 K_MOUSE2 K_MOUSE3 ..
-        b=-1;
-        if (event.xbutton.button == 1)
-        {
-          b = 0; // K_MOUSE1
-        } else if (event.xbutton.button == 2)
-        {
-          b = 2; // K_MOUSE3
-        } else if (event.xbutton.button == 3)
-        {
-          b = 1; // K_MOUSE2
-        } else if (event.xbutton.button == 6)
-        {
-          b = 3; // K_MOUSE4
-        } else if (event.xbutton.button == 7)
-        {
-          b = 4; // K_MOUSE5
-        };
-
-        Sys_QueEvent( t, SE_KEY, K_MOUSE1 + b, qtrue, 0, NULL );
-      }
-      break;
-
-    case ButtonRelease:
-		  t = Sys_XTimeToSysTime(event.xkey.time);
-      if (event.xbutton.button == 4)
-      {
-        Sys_QueEvent( t, SE_KEY, K_MWHEELUP, qfalse, 0, NULL );
-      } else if (event.xbutton.button == 5)
-      {
-        Sys_QueEvent( t, SE_KEY, K_MWHEELDOWN, qfalse, 0, NULL );
-      } else
-      {
-        b=-1;
-        if (event.xbutton.button == 1)
-        {
-          b = 0;
-        } else if (event.xbutton.button == 2)
-        {
-          b = 2;
-        } else if (event.xbutton.button == 3)
-        {
-          b = 1;
-        } else if (event.xbutton.button == 6)
-        {
-          b = 3; // K_MOUSE4
-        } else if (event.xbutton.button == 7)
-        {
-          b = 4; // K_MOUSE5
-        };
-        Sys_QueEvent( t, SE_KEY, K_MOUSE1 + b, qfalse, 0, NULL );
-      }
-      break;
-
-    case CreateNotify :
-      win_x = event.xcreatewindow.x;
-      win_y = event.xcreatewindow.y;
-      break;
-
-    case ConfigureNotify :
-      win_x = event.xconfigure.x;
-      win_y = event.xconfigure.y;
-      break;
-    }
-  }
-
-  if (dowarp)
-  {
-    XWarpPointer(dpy,None,win,0,0,0,0, 
-                 (glConfig.vidWidth/2),(glConfig.vidHeight/2));
-  }
-}
-
-// NOTE TTimo for the tty console input, we didn't rely on those .. 
-//   it's not very surprising actually cause they are not used otherwise
-void KBD_Init(void)
-{
-}
-
-void KBD_Close(void)
-{
-}
-
-void IN_ActivateMouse( void ) 
-{
-  if (!mouse_avail || !dpy || !win)
-    return;
-
-  if (!mouse_active)
-  {
-		if (!in_nograb->value)
-      install_grabs();
-		else if (in_dgamouse->value) // force dga mouse to 0 if using nograb
-			ri.Cvar_Set("in_dgamouse", "0");
-    mouse_active = qtrue;
-  }
-}
-
-void IN_DeactivateMouse( void ) 
-{
-  if (!mouse_avail || !dpy || !win)
-    return;
-
-  if (mouse_active)
-  {
-		if (!in_nograb->value)
-      uninstall_grabs();
-		else if (in_dgamouse->value) // force dga mouse to 0 if using nograb
-			ri.Cvar_Set("in_dgamouse", "0");
-    mouse_active = qfalse;
-  }
-}
-/*****************************************************************************/
-
-/*
-** GLimp_SetGamma
-**
-** This routine should only be called if glConfig.deviceSupportsGamma is TRUE
-*/
-void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned char blue[256] )
-{
-  // NOTE TTimo we get the gamma value from cvar, because we can't work with the s_gammatable
-  //   the API wasn't changed to avoid breaking other OSes
-  float g = Cvar_Get("r_gamma", "1.0", 0)->value;
-  XF86VidModeGamma gamma;
-  assert(glConfig.deviceSupportsGamma);
-  gamma.red = g;
-  gamma.green = g;
-  gamma.blue = g;
-  XF86VidModeSetGamma(dpy, scrnum, &gamma);
-}
-
-/*
-** GLimp_Shutdown
-**
-** This routine does all OS specific shutdown procedures for the OpenGL
-** subsystem.  Under OpenGL this means NULLing out the current DC and
-** HGLRC, deleting the rendering context, and releasing the DC acquired
-** for the window.  The state structure is also nulled out.
-**
-*/
-void GLimp_Shutdown( void )
-{
-  if (!ctx || !dpy)
-    return;
-  IN_DeactivateMouse();
-  // bk001206 - replaced with H2/Fakk2 solution
-  // XAutoRepeatOn(dpy);
-  // autorepeaton = qfalse; // bk001130 - from cvs1.17 (mkv)
-  if (dpy)
-  {
-    if (ctx)
-      qglXDestroyContext(dpy, ctx);
-    if (win)
-      XDestroyWindow(dpy, win);
-    if (vidmode_active)
-      XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[0]);
-    if (glConfig.deviceSupportsGamma)
-    {
-      XF86VidModeSetGamma(dpy, scrnum, &vidmode_InitialGamma);
-    }
-    // NOTE TTimo opening/closing the display should be necessary only once per run
-    //   but it seems QGL_Shutdown gets called in a lot of occasion
-    //   in some cases, this XCloseDisplay is known to raise some X errors
-    //   ( https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=33 )
-    XCloseDisplay(dpy);
-  }
-  vidmode_active = qfalse;
-  dpy = NULL;
-  win = 0;
-  ctx = NULL;
-
-  memset( &glConfig, 0, sizeof( glConfig ) );
-  memset( &glState, 0, sizeof( glState ) );
-
-  QGL_Shutdown();
-}
-
-/*
-** GLimp_LogComment
-*/
-void GLimp_LogComment( char *comment ) 
-{
-  if ( glw_state.log_fp )
-  {
-    fprintf( glw_state.log_fp, "%s", comment );
-  }
-}
-
-/*
-** GLW_StartDriverAndSetMode
-*/
-// bk001204 - prototype needed
-int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen );
-static qboolean GLW_StartDriverAndSetMode( const char *drivername, 
-                                           int mode, 
-                                           qboolean fullscreen )
-{
-  rserr_t err;
-
-  // don't ever bother going into fullscreen with a voodoo card
-#if 1	// JDC: I reenabled this
-  if ( Q_stristr( drivername, "Voodoo" ) )
-  {
-    ri.Cvar_Set( "r_fullscreen", "0" );
-    r_fullscreen->modified = qfalse;
-    fullscreen = qfalse;
-  }
-#endif
-	
-	if (fullscreen && in_nograb->value)
-	{
-		ri.Printf( PRINT_ALL, "Fullscreen not allowed with in_nograb 1\n");
-    ri.Cvar_Set( "r_fullscreen", "0" );
-    r_fullscreen->modified = qfalse;
-    fullscreen = qfalse;		
-	}
-
-  err = GLW_SetMode( drivername, mode, fullscreen );
-
-  switch ( err )
-  {
-  case RSERR_INVALID_FULLSCREEN:
-    ri.Printf( PRINT_ALL, "...WARNING: fullscreen unavailable in this mode\n" );
-    return qfalse;
-  case RSERR_INVALID_MODE:
-    ri.Printf( PRINT_ALL, "...WARNING: could not set the given mode (%d)\n", mode );
-    return qfalse;
-  default:
-    break;
-  }
-  return qtrue;
-}
-
-/*
-** GLW_SetMode
-*/
-int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
-{
-  int attrib[] = {
-    GLX_RGBA,         // 0
-    GLX_RED_SIZE, 4,      // 1, 2
-    GLX_GREEN_SIZE, 4,      // 3, 4
-    GLX_BLUE_SIZE, 4,     // 5, 6
-    GLX_DOUBLEBUFFER,     // 7
-    GLX_DEPTH_SIZE, 1,      // 8, 9
-    GLX_STENCIL_SIZE, 1,    // 10, 11
-    None
-  };
-  // these match in the array
-#define ATTR_RED_IDX 2
-#define ATTR_GREEN_IDX 4
-#define ATTR_BLUE_IDX 6
-#define ATTR_DEPTH_IDX 9
-#define ATTR_STENCIL_IDX 11
-  Window root;
-  XVisualInfo *visinfo;
-  XSetWindowAttributes attr;
-  XSizeHints sizehints;
-  unsigned long mask;
-  int colorbits, depthbits, stencilbits;
-  int tcolorbits, tdepthbits, tstencilbits;
-  int dga_MajorVersion, dga_MinorVersion;
-  int actualWidth, actualHeight;
-  int i;
-  const char*   glstring; // bk001130 - from cvs1.17 (mkv)
-
-  ri.Printf( PRINT_ALL, "Initializing OpenGL display\n");
-
-  ri.Printf (PRINT_ALL, "...setting mode %d:", mode );
-
-  if ( !R_GetModeInfo( &glConfig.vidWidth, &glConfig.vidHeight, &glConfig.windowAspect, mode ) )
-  {
-    ri.Printf( PRINT_ALL, " invalid mode\n" );
-    return RSERR_INVALID_MODE;
-  }
-  ri.Printf( PRINT_ALL, " %d %d\n", glConfig.vidWidth, glConfig.vidHeight);
-
-  if (!(dpy = XOpenDisplay(NULL)))
-  {
-    fprintf(stderr, "Error couldn't open the X display\n");
-    return RSERR_INVALID_MODE;
-  }
-  
-  scrnum = DefaultScreen(dpy);
-  root = RootWindow(dpy, scrnum);
-
-  actualWidth = glConfig.vidWidth;
-  actualHeight = glConfig.vidHeight;
-
-  // Get video mode list
-  if (!XF86VidModeQueryVersion(dpy, &vidmode_MajorVersion, &vidmode_MinorVersion))
-  {
-    vidmode_ext = qfalse;
-  } else
-  {
-    ri.Printf(PRINT_ALL, "Using XFree86-VidModeExtension Version %d.%d\n",
-              vidmode_MajorVersion, vidmode_MinorVersion);
-    vidmode_ext = qtrue;
-  }
-
-  // Check for DGA	
-  dga_MajorVersion = 0, dga_MinorVersion = 0;
-  if (in_dgamouse->value)
-  {
-    if (!XF86DGAQueryVersion(dpy, &dga_MajorVersion, &dga_MinorVersion))
-    {
-      // unable to query, probalby not supported
-      ri.Printf( PRINT_ALL, "Failed to detect XF86DGA Mouse\n" );
-      ri.Cvar_Set( "in_dgamouse", "0" );
-    } else
-    {
-      ri.Printf( PRINT_ALL, "XF86DGA Mouse (Version %d.%d) initialized\n",
-                 dga_MajorVersion, dga_MinorVersion);
-    }
-  }
-
-  if (vidmode_ext)
-  {
-    int best_fit, best_dist, dist, x, y;
-
-    XF86VidModeGetAllModeLines(dpy, scrnum, &num_vidmodes, &vidmodes);
-
-    // Are we going fullscreen?  If so, let's change video mode
-    if (fullscreen)
-    {
-      best_dist = 9999999;
-      best_fit = -1;
-
-      for (i = 0; i < num_vidmodes; i++)
-      {
-        if (glConfig.vidWidth > vidmodes[i]->hdisplay ||
-            glConfig.vidHeight > vidmodes[i]->vdisplay)
-          continue;
-
-        x = glConfig.vidWidth - vidmodes[i]->hdisplay;
-        y = glConfig.vidHeight - vidmodes[i]->vdisplay;
-        dist = (x * x) + (y * y);
-        if (dist < best_dist)
-        {
-          best_dist = dist;
-          best_fit = i;
-        }
-      }
-
-      if (best_fit != -1)
-      {
-        actualWidth = vidmodes[best_fit]->hdisplay;
-        actualHeight = vidmodes[best_fit]->vdisplay;
-
-        // change to the mode
-        XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
-        vidmode_active = qtrue;
-
-        // Move the viewport to top left
-        XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
-
-        ri.Printf(PRINT_ALL, "XFree86-VidModeExtension Activated at %dx%d\n",
-                  actualWidth, actualHeight);
-
-      } else
-      {
-        fullscreen = 0;
-        ri.Printf(PRINT_ALL, "XFree86-VidModeExtension: No acceptable modes found\n");
-      }
-    } else
-    {
-      ri.Printf(PRINT_ALL, "XFree86-VidModeExtension:  Ignored on non-fullscreen/Voodoo\n");
-    }
-  }
-
-
-  if (!r_colorbits->value)
-    colorbits = 24;
-  else
-    colorbits = r_colorbits->value;
-
-  if ( !Q_stricmp( r_glDriver->string, _3DFX_DRIVER_NAME ) )
-    colorbits = 16;
-
-  if (!r_depthbits->value)
-    depthbits = 24;
-  else
-    depthbits = r_depthbits->value;
-  stencilbits = r_stencilbits->value;
-
-  for (i = 0; i < 16; i++)
-  {
-    // 0 - default
-    // 1 - minus colorbits
-    // 2 - minus depthbits
-    // 3 - minus stencil
-    if ((i % 4) == 0 && i)
-    {
-      // one pass, reduce
-      switch (i / 4)
-      {
-      case 2 :
-        if (colorbits == 24)
-          colorbits = 16;
-        break;
-      case 1 :
-        if (depthbits == 24)
-          depthbits = 16;
-        else if (depthbits == 16)
-          depthbits = 8;
-      case 3 :
-        if (stencilbits == 24)
-          stencilbits = 16;
-        else if (stencilbits == 16)
-          stencilbits = 8;
-      }
-    }
-
-    tcolorbits = colorbits;
-    tdepthbits = depthbits;
-    tstencilbits = stencilbits;
-
-    if ((i % 4) == 3)
-    { // reduce colorbits
-      if (tcolorbits == 24)
-        tcolorbits = 16;
-    }
-
-    if ((i % 4) == 2)
-    { // reduce depthbits
-      if (tdepthbits == 24)
-        tdepthbits = 16;
-      else if (tdepthbits == 16)
-        tdepthbits = 8;
-    }
-
-    if ((i % 4) == 1)
-    { // reduce stencilbits
-      if (tstencilbits == 24)
-        tstencilbits = 16;
-      else if (tstencilbits == 16)
-        tstencilbits = 8;
-      else
-        tstencilbits = 0;
-    }
-
-    if (tcolorbits == 24)
-    {
-      attrib[ATTR_RED_IDX] = 8;
-      attrib[ATTR_GREEN_IDX] = 8;
-      attrib[ATTR_BLUE_IDX] = 8;
-    } else
-    {
-      // must be 16 bit
-      attrib[ATTR_RED_IDX] = 4;
-      attrib[ATTR_GREEN_IDX] = 4;
-      attrib[ATTR_BLUE_IDX] = 4;
-    }
-
-    attrib[ATTR_DEPTH_IDX] = tdepthbits; // default to 24 depth
-    attrib[ATTR_STENCIL_IDX] = tstencilbits;
-
-    visinfo = qglXChooseVisual(dpy, scrnum, attrib);
-    if (!visinfo)
-    {
-      continue;
-    }
-
-    ri.Printf( PRINT_ALL, "Using %d/%d/%d Color bits, %d depth, %d stencil display.\n", 
-               attrib[ATTR_RED_IDX], attrib[ATTR_GREEN_IDX], attrib[ATTR_BLUE_IDX],
-               attrib[ATTR_DEPTH_IDX], attrib[ATTR_STENCIL_IDX]);
-
-    glConfig.colorBits = tcolorbits;
-    glConfig.depthBits = tdepthbits;
-    glConfig.stencilBits = tstencilbits;
-    break;
-  }
-
-  if (!visinfo)
-  {
-    ri.Printf( PRINT_ALL, "Couldn't get a visual\n" );
-    return RSERR_INVALID_MODE;
-  }
-
-  /* window attributes */
-  attr.background_pixel = BlackPixel(dpy, scrnum);
-  attr.border_pixel = 0;
-  attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
-  attr.event_mask = X_MASK;
-  if (vidmode_active)
-  {
-    mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | 
-           CWEventMask | CWOverrideRedirect;
-    attr.override_redirect = True;
-    attr.backing_store = NotUseful;
-    attr.save_under = False;
-  } else
-    mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
-
-  win = XCreateWindow(dpy, root, 0, 0, 
-                      actualWidth, actualHeight, 
-                      0, visinfo->depth, InputOutput,
-                      visinfo->visual, mask, &attr);
-
-  XStoreName( dpy, win, WINDOW_CLASS_NAME );
-
-  /* GH: Don't let the window be resized */
-  sizehints.flags = PMinSize | PMaxSize;
-  sizehints.min_width = sizehints.max_width = actualWidth;
-  sizehints.min_height = sizehints.max_height = actualHeight;
-
-  XSetWMNormalHints( dpy, win, &sizehints );
-
-  XMapWindow( dpy, win );
-
-  if (vidmode_active)
-    XMoveWindow(dpy, win, 0, 0);
-
-  XFlush(dpy);
-  XSync(dpy,False); // bk001130 - from cvs1.17 (mkv)
-  ctx = qglXCreateContext(dpy, visinfo, NULL, True);
-  XSync(dpy,False); // bk001130 - from cvs1.17 (mkv)
-
-  /* GH: Free the visinfo after we're done with it */
-  XFree( visinfo );
-
-  qglXMakeCurrent(dpy, win, ctx);
-
-  // bk001130 - from cvs1.17 (mkv)
-  glstring = qglGetString (GL_RENDERER);
-  ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glstring );
-
-  // bk010122 - new software token (Indirect)
-  if ( !Q_stricmp( glstring, "Mesa X11")
-       || !Q_stricmp( glstring, "Mesa GLX Indirect") )
-  {
-    if ( !r_allowSoftwareGL->integer )
-    {
-      ri.Printf( PRINT_ALL, "\n\n***********************************************************\n" );
-      ri.Printf( PRINT_ALL, " You are using software Mesa (no hardware acceleration)!   \n" );
-      ri.Printf( PRINT_ALL, " Driver DLL used: %s\n", drivername ); 
-      ri.Printf( PRINT_ALL, " If this is intentional, add\n" );
-      ri.Printf( PRINT_ALL, "       \"+set r_allowSoftwareGL 1\"\n" );
-      ri.Printf( PRINT_ALL, " to the command line when starting the game.\n" );
-      ri.Printf( PRINT_ALL, "***********************************************************\n");
-      GLimp_Shutdown( );
-      return RSERR_INVALID_MODE;
-    } else
-    {
-      ri.Printf( PRINT_ALL, "...using software Mesa (r_allowSoftwareGL==1).\n" );
-    }
-  }
-
-  return RSERR_OK;
-}
-
-/*
-** GLW_InitExtensions
-*/
-static void GLW_InitExtensions( void )
-{
-  if ( !r_allowExtensions->integer )
-  {
-    ri.Printf( PRINT_ALL, "*** IGNORING OPENGL EXTENSIONS ***\n" );
-    return;
-  }
-
-  ri.Printf( PRINT_ALL, "Initializing OpenGL extensions\n" );
-
-  // GL_S3_s3tc
-  if (strstr(glConfig.extensions_string, "GL_EXT_texture_compression_s3tc") && strstr(glConfig.extensions_string, "GL_ARB_texture_compression"))
-  {
-	  if (r_ext_compressed_textures->integer)
-	  {
-		  qglCompressedTexImage2DARB = dlsym(glw_state.OpenGLLib, "glCompressedTexImage2DARB");
-		  glConfig.textureCompression = TC_S3TC;
-		  ri.Printf(PRINT_ALL, "...using GL_S3_s3tc\n");
-	  }
-	  else
-	  {
-		  glConfig.textureCompression = TC_NONE;
-		  ri.Printf(PRINT_ALL, "...ignoring GL_S3_s3tc\n");
-	  }
-  }
-  else if (!strstr(glConfig.extensions_string, "GL_EXT_texture_compression_s3tc"))
-  {
-	  ri.Printf(PRINT_ALL, "...GL_ARB_texture_compression not found\n");
-  }
-  else if (strstr(glConfig.extensions_string, "GL_ARB_texture_compression"))
-  {
-	  ri.Printf(PRINT_ALL, "...GL_EXT_texture_compression_s3tc not found\n");
-  }
-  else
-  {
-	  ri.Printf(PRINT_ALL, "...GL_EXT_texture_compression_s3tc not found\n");
-	  ri.Printf(PRINT_ALL, "...GL_ARB_texture_compression not found\n");
-  }
-  // GL_EXT_texture_env_add
-  glConfig.textureEnvAddAvailable = qfalse;
-  if ( Q_stristr( glConfig.extensions_string, "EXT_texture_env_add" ) )
-  {
-    if ( r_ext_texture_env_add->integer )
-    {
-      glConfig.textureEnvAddAvailable = qtrue;
-      ri.Printf( PRINT_ALL, "...using GL_EXT_texture_env_add\n" );
-    } else
-    {
-      glConfig.textureEnvAddAvailable = qfalse;
-      ri.Printf( PRINT_ALL, "...ignoring GL_EXT_texture_env_add\n" );
-    }
-  } else
-  {
-    ri.Printf( PRINT_ALL, "...GL_EXT_texture_env_add not found\n" );
-  }
-
-  // GL_ARB_multitexture
-  qglMultiTexCoord2fARB = NULL;
-  qglActiveTextureARB = NULL;
-  qglClientActiveTextureARB = NULL;
-  if ( Q_stristr( glConfig.extensions_string, "GL_ARB_multitexture" ) )
-  {
-    if ( r_ext_multitexture->value )
-    {
-      qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) dlsym( glw_state.OpenGLLib, "glMultiTexCoord2fARB" );
-      qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) dlsym( glw_state.OpenGLLib, "glActiveTextureARB" );
-      qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) dlsym( glw_state.OpenGLLib, "glClientActiveTextureARB" );
-
-      if ( qglActiveTextureARB )
-      {
-        qglGetIntegerv( GL_MAX_ACTIVE_TEXTURES_ARB, &glConfig.maxActiveTextures );
-
-        if ( glConfig.maxActiveTextures > 1 )
-        {
-          ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" );
-        } else
-        {
-          qglMultiTexCoord2fARB = NULL;
-          qglActiveTextureARB = NULL;
-          qglClientActiveTextureARB = NULL;
-          ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" );
-        }
-      }
-    } else
-    {
-      ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" );
-    }
-  } else
-  {
-    ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" );
-  }
-
-  // GL_EXT_compiled_vertex_array
-  if ( Q_stristr( glConfig.extensions_string, "GL_EXT_compiled_vertex_array" ) )
-  {
-    if ( r_ext_compiled_vertex_array->value )
-    {
-      ri.Printf( PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n" );
-      qglLockArraysEXT = ( void ( APIENTRY * )( int, int ) ) dlsym( glw_state.OpenGLLib, "glLockArraysEXT" );
-      qglUnlockArraysEXT = ( void ( APIENTRY * )( void ) ) dlsym( glw_state.OpenGLLib, "glUnlockArraysEXT" );
-      if (!qglLockArraysEXT || !qglUnlockArraysEXT)
-      {
-        ri.Error (ERR_FATAL, "bad getprocaddress");
-      }
-    } else
-    {
-      ri.Printf( PRINT_ALL, "...ignoring GL_EXT_compiled_vertex_array\n" );
-    }
-  } else
-  {
-    ri.Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" );
-  }
-
-}
-
-static void GLW_InitGamma()
-{
-  /* Minimum extension version required */
-  #define GAMMA_MINMAJOR 2
-  #define GAMMA_MINMINOR 0
-  
-  glConfig.deviceSupportsGamma = qfalse;
-
-  if (vidmode_ext)
-  {
-    if (vidmode_MajorVersion < GAMMA_MINMAJOR || 
-        (vidmode_MajorVersion == GAMMA_MINMAJOR && vidmode_MinorVersion < GAMMA_MINMINOR)) {
-      ri.Printf( PRINT_ALL, "XF86 Gamma extension not supported in this version\n");
-      return;
-    }
-    XF86VidModeGetGamma(dpy, scrnum, &vidmode_InitialGamma);
-    ri.Printf( PRINT_ALL, "XF86 Gamma extension initialized\n");
-    glConfig.deviceSupportsGamma = qtrue;
-  }
-}
-
-/*
-** GLW_LoadOpenGL
-**
-** GLimp_win.c internal function that that attempts to load and use 
-** a specific OpenGL DLL.
-*/
-static qboolean GLW_LoadOpenGL( const char *name )
-{
-  qboolean fullscreen;
-
-  ri.Printf( PRINT_ALL, "...loading %s: ", name );
-
-  // disable the 3Dfx splash screen and set gamma
-  // we do this all the time, but it shouldn't hurt anything
-  // on non-3Dfx stuff
-  putenv("FX_GLIDE_NO_SPLASH=0");
-
-  // Mesa VooDoo hacks
-  putenv("MESA_GLX_FX=fullscreen\n");
-
-  // load the QGL layer
-  if ( QGL_Init( name ) )
-  {
-    fullscreen = r_fullscreen->integer;
-
-    // create the window and set up the context
-    if ( !GLW_StartDriverAndSetMode( name, r_mode->integer, fullscreen ) )
-    {
-      if (r_mode->integer != 3)
-      {
-        if ( !GLW_StartDriverAndSetMode( name, 3, fullscreen ) )
-        {
-          goto fail;
-        }
-      } else
-        goto fail;
-    }
-
-    return qtrue;
-  } else
-  {
-    ri.Printf( PRINT_ALL, "failed\n" );
-  }
-  fail:
-
-  QGL_Shutdown();
-
-  return qfalse;
-}
-
-/*
-** XErrorHandler
-**   the default X error handler exits the application
-**   I found out that on some hosts some operations would raise X errors (GLXUnsupportedPrivateRequest)
-**   but those don't seem to be fatal .. so the default would be to just ignore them
-**   our implementation mimics the default handler behaviour (not completely cause I'm lazy)
-*/
-int qXErrorHandler(Display *dpy, XErrorEvent *ev)
-{
-  static char buf[1024];
-  XGetErrorText(dpy, ev->error_code, buf, 1024);
-  ri.Printf( PRINT_ALL, "X Error of failed request: %s\n", buf);
-  ri.Printf( PRINT_ALL, "  Major opcode of failed request: %d\n", ev->request_code, buf);
-  ri.Printf( PRINT_ALL, "  Minor opcode of failed request: %d\n", ev->minor_code);  
-  ri.Printf( PRINT_ALL, "  Serial number of failed request: %d\n", ev->serial);
-  return 0;
-}
-
-/*
-** GLimp_Init
-**
-** This routine is responsible for initializing the OS specific portions
-** of OpenGL.  
-*/
-void GLimp_Init( void )
-{
-  qboolean attemptedlibGL = qfalse;
-  qboolean attempted3Dfx = qfalse;
-  qboolean success = qfalse;
-  char  buf[1024];
-  cvar_t *lastValidRenderer = ri.Cvar_Get( "r_lastValidRenderer", "(uninitialized)", CVAR_ARCHIVE );
-
-  // guarded, as this is only relevant to SMP renderer thread
-#ifdef SMP
-  if (!XInitThreads())
-  {
-    Com_Printf("GLimp_Init() - XInitThreads() failed, disabling r_smp\n");
-    ri.Cvar_Set( "r_smp", "0" );
-  }
-#endif
-
-  r_allowSoftwareGL = ri.Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
-
-  r_previousglDriver = ri.Cvar_Get( "r_previousglDriver", "", CVAR_ROM );
-
-  InitSig();
-
-  // Hack here so that if the UI 
-  if ( *r_previousglDriver->string )
-  {
-    // The UI changed it on us, hack it back
-    // This means the renderer can't be changed on the fly
-    ri.Cvar_Set( "r_glDriver", r_previousglDriver->string );
-  }
-  
-  // set up our custom error handler for X failures
-  XSetErrorHandler(&qXErrorHandler);
-
-  //
-  // load and initialize the specific OpenGL driver
-  //
-  if ( !GLW_LoadOpenGL( r_glDriver->string ) )
-  {
-    if ( !Q_stricmp( r_glDriver->string, OPENGL_DRIVER_NAME ) )
-    {
-      attemptedlibGL = qtrue;
-    } else if ( !Q_stricmp( r_glDriver->string, _3DFX_DRIVER_NAME ) )
-    {
-      attempted3Dfx = qtrue;
-    }
-
-    #if 0
-    // TTimo
-    // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=455
-    // old legacy load code, was confusing people who had a bad OpenGL setup
-    if ( !attempted3Dfx && !success )
-    {
-      attempted3Dfx = qtrue;
-      if ( GLW_LoadOpenGL( _3DFX_DRIVER_NAME ) )
-      {
-        ri.Cvar_Set( "r_glDriver", _3DFX_DRIVER_NAME );
-        r_glDriver->modified = qfalse;
-        success = qtrue;
-      }
-    }
-    #endif
-
-    // try ICD before trying 3Dfx standalone driver
-    if ( !attemptedlibGL && !success )
-    {
-      attemptedlibGL = qtrue;
-      if ( GLW_LoadOpenGL( OPENGL_DRIVER_NAME ) )
-      {
-        ri.Cvar_Set( "r_glDriver", OPENGL_DRIVER_NAME );
-        r_glDriver->modified = qfalse;
-        success = qtrue;
-      }
-    }
-
-    if (!success)
-      ri.Error( ERR_FATAL, "GLimp_Init() - could not load OpenGL subsystem\n" );
-
-  }
-
-  // Save it in case the UI stomps it
-  ri.Cvar_Set( "r_previousglDriver", r_glDriver->string );
-
-  // This values force the UI to disable driver selection
-  glConfig.driverType = GLDRV_ICD;
-  glConfig.hardwareType = GLHW_GENERIC;
-
-  // get our config strings
-  Q_strncpyz( glConfig.vendor_string, qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) );
-  Q_strncpyz( glConfig.renderer_string, qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) );
-  if (*glConfig.renderer_string && glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] == '\n')
-    glConfig.renderer_string[strlen(glConfig.renderer_string) - 1] = 0;
-  Q_strncpyz( glConfig.version_string, qglGetString (GL_VERSION), sizeof( glConfig.version_string ) );
-  Q_strncpyz( glConfig.extensions_string, qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) );
-
-  //
-  // chipset specific configuration
-  //
-  strcpy( buf, glConfig.renderer_string );
-  strlwr( buf );
-
-  //
-  // NOTE: if changing cvars, do it within this block.  This allows them
-  // to be overridden when testing driver fixes, etc. but only sets
-  // them to their default state when the hardware is first installed/run.
-  //
-  if ( Q_stricmp( lastValidRenderer->string, glConfig.renderer_string ) )
-  {
-    glConfig.hardwareType = GLHW_GENERIC;
-
-    ri.Cvar_Set( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST" );
-
-    // VOODOO GRAPHICS w/ 2MB
-    if ( Q_stristr( buf, "voodoo graphics/1 tmu/2 mb" ) )
-    {
-      ri.Cvar_Set( "r_picmip", "2" );
-      ri.Cvar_Get( "r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
-    } else
-    {
-      ri.Cvar_Set( "r_picmip", "1" );
-
-      if ( Q_stristr( buf, "rage 128" ) || Q_stristr( buf, "rage128" ) )
-      {
-        ri.Cvar_Set( "r_finish", "0" );
-      }
-      // Savage3D and Savage4 should always have trilinear enabled
-      else if ( Q_stristr( buf, "savage3d" ) || Q_stristr( buf, "s3 savage4" ) )
-      {
-        ri.Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
-      }
-    }
-  }
-
-  //
-  // this is where hardware specific workarounds that should be
-  // detected/initialized every startup should go.
-  //
-  if ( Q_stristr( buf, "banshee" ) || Q_stristr( buf, "Voodoo_Graphics" ) )
-  {
-    glConfig.hardwareType = GLHW_3DFX_2D3D;
-  } else if ( Q_stristr( buf, "rage pro" ) || Q_stristr( buf, "RagePro" ) )
-  {
-    glConfig.hardwareType = GLHW_RAGEPRO;
-  } else if ( Q_stristr( buf, "permedia2" ) )
-  {
-    glConfig.hardwareType = GLHW_PERMEDIA2;
-  } else if ( Q_stristr( buf, "riva 128" ) )
-  {
-    glConfig.hardwareType = GLHW_RIVA128;
-  } else if ( Q_stristr( buf, "riva tnt " ) )
-  {
-  }
-
-  ri.Cvar_Set( "r_lastValidRenderer", glConfig.renderer_string );
-
-  // initialize extensions
-  GLW_InitExtensions();
-  GLW_InitGamma();
-
-  InitSig(); // not clear why this is at begin & end of function
-
-  return;
-}
-
-
-/*
-** GLimp_EndFrame
-** 
-** Responsible for doing a swapbuffers and possibly for other stuff
-** as yet to be determined.  Probably better not to make this a GLimp
-** function and instead do a call to GLimp_SwapBuffers.
-*/
-void GLimp_EndFrame (void)
-{
-  // don't flip if drawing to front buffer
-  if ( stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
-  {
-    qglXSwapBuffers(dpy, win);
-  }
-
-  // check logging
-  QGL_EnableLogging( (qboolean)r_logFile->integer ); // bk001205 - was ->value
-}
-
-#ifdef SMP
-/*
-===========================================================
-
-SMP acceleration
-
-===========================================================
-*/
-
-static pthread_mutex_t	smpMutex = PTHREAD_MUTEX_INITIALIZER;
-
-static pthread_cond_t		renderCommandsEvent = PTHREAD_COND_INITIALIZER;
-static pthread_cond_t		renderCompletedEvent = PTHREAD_COND_INITIALIZER;
-
-static void (*glimpRenderThread)( void );
-
-static void *GLimp_RenderThreadWrapper( void *arg )
-{
-	Com_Printf( "Render thread starting\n" );
-
-  glimpRenderThread();
-
-	qglXMakeCurrent( dpy, None, NULL );
-
-	Com_Printf( "Render thread terminating\n" );
-
-	return arg;
-}
-
-qboolean GLimp_SpawnRenderThread( void (*function)( void ) )
-{
-	pthread_t renderThread;
-	int ret;
-
-	pthread_mutex_init( &smpMutex, NULL );
-
-	pthread_cond_init( &renderCommandsEvent, NULL );
-	pthread_cond_init( &renderCompletedEvent, NULL );
-
-  glimpRenderThread = function;
-
-	ret = pthread_create( &renderThread,
-						  NULL,			// attributes
-						  GLimp_RenderThreadWrapper,
-						  NULL );		// argument
-	if ( ret ) {
-		ri.Printf( PRINT_ALL, "pthread_create returned %d: %s", ret, strerror( ret ) );
-    return qfalse;
-	} else {
-		ret = pthread_detach( renderThread );
-		if ( ret ) {
-			ri.Printf( PRINT_ALL, "pthread_detach returned %d: %s", ret, strerror( ret ) );
-		}
-  }
-
-  return qtrue;
-}
-
-static volatile void    *smpData = NULL;
-static volatile qboolean smpDataReady;
-
-void *GLimp_RendererSleep( void )
-{
-	void  *data;
-
-	qglXMakeCurrent( dpy, None, NULL );
-
-	pthread_mutex_lock( &smpMutex );
-	{
-		smpData = NULL;
-		smpDataReady = qfalse;
-
-		// after this, the front end can exit GLimp_FrontEndSleep
-		pthread_cond_signal( &renderCompletedEvent );
-
-		while ( !smpDataReady ) {
-			pthread_cond_wait( &renderCommandsEvent, &smpMutex );
-		}
-
-		data = (void *)smpData;
-	}
-	pthread_mutex_unlock( &smpMutex );
-
-	qglXMakeCurrent( dpy, win, ctx );
-
-  return data;
-}
-
-void GLimp_FrontEndSleep( void )
-{
-	pthread_mutex_lock( &smpMutex );
-	{
-		while ( smpData ) {
-			pthread_cond_wait( &renderCompletedEvent, &smpMutex );
-		}
-	}
-	pthread_mutex_unlock( &smpMutex );
-
-	qglXMakeCurrent( dpy, win, ctx );
-}
-
-void GLimp_WakeRenderer( void *data )
-{
-	qglXMakeCurrent( dpy, None, NULL );
-
-	pthread_mutex_lock( &smpMutex );
-	{
-		assert( smpData == NULL );
-		smpData = data;
-		smpDataReady = qtrue;
-
-		// after this, the renderer can continue through GLimp_RendererSleep
-		pthread_cond_signal( &renderCommandsEvent );
-	}
-	pthread_mutex_unlock( &smpMutex );
-}
-
-#else
-
-void GLimp_RenderThreadWrapper( void *stub ) {}
-qboolean GLimp_SpawnRenderThread( void (*function)( void ) ) {
-	ri.Printf( PRINT_WARNING, "ERROR: SMP support was disabled at compile time\n");
-  return qfalse;
-}
-void *GLimp_RendererSleep( void ) {
-  return NULL;
-}
-void GLimp_FrontEndSleep( void ) {}
-void GLimp_WakeRenderer( void *data ) {}
-
-#endif
-
-/*****************************************************************************/
-/* MOUSE                                                                     */
-/*****************************************************************************/
-
-void IN_Init(void) {
-	Com_Printf ("\n------- Input Initialization -------\n");
-  // mouse variables
-  in_mouse = Cvar_Get ("in_mouse", "1", CVAR_ARCHIVE);
-  in_dgamouse = Cvar_Get ("in_dgamouse", "1", CVAR_ARCHIVE);
-	
-	// turn on-off sub-frame timing of X events
-	in_subframe = Cvar_Get ("in_subframe", "1", CVAR_ARCHIVE);
-	
-	// developer feature, allows to break without loosing mouse pointer
-	in_nograb = Cvar_Get ("in_nograb", "0", 0);
-
-  // bk001130 - from cvs.17 (mkv), joystick variables
-  in_joystick = Cvar_Get ("in_joystick", "0", CVAR_ARCHIVE|CVAR_LATCH);
-  // bk001130 - changed this to match win32
-  in_joystickDebug = Cvar_Get ("in_debugjoystick", "0", CVAR_TEMP);
-  joy_threshold = Cvar_Get ("joy_threshold", "0.15", CVAR_ARCHIVE); // FIXME: in_joythreshold
-
-  if (in_mouse->value)
-    mouse_avail = qtrue;
-  else
-    mouse_avail = qfalse;
-
-  IN_StartupJoystick( ); // bk001130 - from cvs1.17 (mkv)
-	Com_Printf ("------------------------------------\n");
-}
-
-void IN_Shutdown(void)
-{
-  mouse_avail = qfalse;
-}
-
-void IN_Frame (void) {
-
-  // bk001130 - from cvs 1.17 (mkv)
-  IN_JoyMove(); // FIXME: disable if on desktop?
-
-  if ( cls.keyCatchers & KEYCATCH_CONSOLE )
-  {
-    // temporarily deactivate if not in the game and
-    // running on the desktop
-    // voodoo always counts as full screen
-    if (Cvar_VariableValue ("r_fullscreen") == 0
-        && strcmp( Cvar_VariableString("r_glDriver"), _3DFX_DRIVER_NAME ) )
-    {
-      IN_DeactivateMouse ();
-      return;
-    }
-  }
-
-  IN_ActivateMouse();
-}
-
-void IN_Activate(void)
-{
-}
-
-// bk001130 - cvs1.17 joystick code (mkv) was here, no linux_joystick.c
-
-void Sys_SendKeyEvents (void) {
-  // XEvent event; // bk001204 - unused
-
-  if (!dpy)
-    return;
-  HandleEvents();
-}
-
-
-// bk010216 - added stubs for non-Linux UNIXes here
-// FIXME - use NO_JOYSTICK or something else generic
-
-#if defined( __FreeBSD__ ) // rb010123
-void IN_StartupJoystick( void ) {}
-void IN_JoyMove( void ) {}
-#endif
diff --git a/code/unix/linux_joystick.c b/code/unix/linux_joystick.c
deleted file mode 100644
index 1debede9..00000000
--- a/code/unix/linux_joystick.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** linux_joystick.c
-**
-** This file contains ALL Linux specific stuff having to do with the
-** Joystick input.  When a port is being made the following functions
-** must be implemented by the port:
-**
-** Authors: mkv, bk
-**
-*/
-
-#include <linux/joystick.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>  // bk001204
-
-
-#include "../client/client.h"
-#include "linux_local.h"
-
-/* We translate axes movement into keypresses. */
-int joy_keys[16] = {
-     K_LEFTARROW, K_RIGHTARROW,
-     K_UPARROW, K_DOWNARROW,
-     K_JOY16, K_JOY17,
-     K_JOY18, K_JOY19,
-     K_JOY20, K_JOY21,
-     K_JOY22, K_JOY23,
-
-     K_JOY24, K_JOY25,
-     K_JOY26, K_JOY27
-};
-
-/* Our file descriptor for the joystick device. */
-static int             joy_fd = -1;
-
-
-// bk001130 - from linux_glimp.c
-extern cvar_t *  in_joystick;
-extern cvar_t *  in_joystickDebug;
-extern cvar_t *  joy_threshold;
-
-
-/**********************************************/
-/* Joystick routines.                         */
-/**********************************************/
-// bk001130 - from cvs1.17 (mkv), removed from linux_glimp.c
-void IN_StartupJoystick( void )
-{
-  int i = 0;
-
-  joy_fd = -1;
-
-  if( !in_joystick->integer ) {
-    Com_Printf( "Joystick is not active.\n" );
-    return;
-  }
-
-  for( i = 0; i < 4; i++ ) {
-    char filename[PATH_MAX];
-
-    snprintf( filename, PATH_MAX, "/dev/js%d", i );
-
-    joy_fd = open( filename, O_RDONLY | O_NONBLOCK );
-
-    if( joy_fd != -1 ) {
-      struct js_event event;
-      char axes = 0;
-      char buttons = 0;
-      char name[128];
-      int n = -1;
-
-      Com_Printf( "Joystick %s found\n", filename );
-
-      /* Get rid of initialization messages. */
-      do {
-	n = read( joy_fd, &event, sizeof( event ) );
-
-	if( n == -1 ) {
-	  break;
-	}
-
-      } while( ( event.type & JS_EVENT_INIT ) );
-
-      /* Get joystick statistics. */
-      ioctl( joy_fd, JSIOCGAXES, &axes );
-      ioctl( joy_fd, JSIOCGBUTTONS, &buttons );
-
-      if( ioctl( joy_fd, JSIOCGNAME( sizeof( name ) ), name ) < 0 ) {
-	strncpy( name, "Unknown", sizeof( name ) );
-      }
-
-      Com_Printf( "Name:    %s\n", name );
-      Com_Printf( "Axes:    %d\n", axes );
-      Com_Printf( "Buttons: %d\n", buttons );
-
-      /* Our work here is done. */
-      return;
-    }
-
-  }
-
-  /* No soup for you. */
-  if( joy_fd == -1 ) {
-    Com_Printf( "No joystick found.\n" );
-    return;
-  }
-
-}
-
-void IN_JoyMove( void )
-{
-  /* Store instantaneous joystick state. Hack to get around
-   * event model used in Linux joystick driver.
-	 */
-  static int axes_state[16];
-  /* Old bits for Quake-style input compares. */
-  static unsigned int old_axes = 0;
-  /* Our current goodies. */
-  unsigned int axes = 0;
-  int i = 0;
-
-  if( joy_fd == -1 ) {
-    return;
-  }
-
-  /* Empty the queue, dispatching button presses immediately
-	 * and updating the instantaneous state for the axes.
-	 */
-  do {
-    int n = -1;
-    struct js_event event;
-
-    n = read( joy_fd, &event, sizeof( event ) );
-
-    if( n == -1 ) {
-      /* No error, we're non-blocking. */
-      break;
-    }
-
-    if( event.type & JS_EVENT_BUTTON ) {
-      Sys_QueEvent( 0, SE_KEY, K_JOY1 + event.number, event.value, 0, NULL );
-    } else if( event.type & JS_EVENT_AXIS ) {
-
-      if( event.number >= 16 ) {
-	continue;
-      }
-
-      axes_state[event.number] = event.value;
-    } else {
-      Com_Printf( "Unknown joystick event type\n" );
-    }
-
-  } while( 1 );
-
-
-  /* Translate our instantaneous state to bits. */
-  for( i = 0; i < 16; i++ ) {
-    float f = ( (float) axes_state[i] ) / 32767.0f;
-
-    if( f < -joy_threshold->value ) {
-      axes |= ( 1 << ( i * 2 ) );
-    } else if( f > joy_threshold->value ) {
-      axes |= ( 1 << ( ( i * 2 ) + 1 ) );
-    }
-
-  }
-
-  /* Time to update axes state based on old vs. new. */
-  for( i = 0; i < 16; i++ ) {
-
-    if( ( axes & ( 1 << i ) ) && !( old_axes & ( 1 << i ) ) ) {
-      Sys_QueEvent( 0, SE_KEY, joy_keys[i], qtrue, 0, NULL );
-    }
-
-    if( !( axes & ( 1 << i ) ) && ( old_axes & ( 1 << i ) ) ) {
-      Sys_QueEvent( 0, SE_KEY, joy_keys[i], qfalse, 0, NULL );
-    }
-  }
-
-  /* Save for future generations. */
-  old_axes = axes;
-}
-
-
diff --git a/code/unix/linux_local.h b/code/unix/linux_local.h
deleted file mode 100644
index ccb7a0b5..00000000
--- a/code/unix/linux_local.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// linux_local.h: Linux-specific Quake3 header file
-
-void Sys_QueEvent( int time, sysEventType_t type, int value, int value2, int ptrLength, void *ptr );
-qboolean Sys_GetPacket ( netadr_t *net_from, msg_t *net_message );
-void Sys_SendKeyEvents (void);
-
-// Input subsystem
-
-void IN_Init (void);
-void IN_Frame (void);
-void IN_Shutdown (void);
-
-
-void IN_JoyMove( void );
-void IN_StartupJoystick( void );
-
-// GL subsystem
-qboolean QGL_Init( const char *dllname );
-void QGL_EnableLogging( qboolean enable );
-void QGL_Shutdown( void );
-
-// bk001130 - win32
-// void IN_JoystickCommands (void);
-
-char *strlwr (char *s);
-
-// signals.c
-void InitSig(void);
diff --git a/code/unix/linux_qgl.c b/code/unix/linux_qgl.c
deleted file mode 100644
index 35c3f76c..00000000
--- a/code/unix/linux_qgl.c
+++ /dev/null
@@ -1,4165 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** LINUX_QGL.C
-**
-** This file implements the operating system binding of GL to QGL function
-** pointers.  When doing a port of Quake2 you must implement the following
-** two functions:
-**
-** QGL_Init() - loads libraries, assigns function pointers, etc.
-** QGL_Shutdown() - unloads libraries, NULLs function pointers
-*/
-
-// bk001204
-#include <unistd.h>
-#include <sys/types.h>
-
-
-#include <float.h>
-#include "../renderer/tr_local.h"
-#include "unix_glw.h"
-
-// bk001129 - from cvs1.17 (mkv)
-//#if defined(__FX__)
-//#include <GL/fxmesa.h>
-//#endif
-//#include <GL/glx.h> // bk010216 - FIXME: all of the above redundant? renderer/qgl.h
-
-#include <dlfcn.h>
-
-
-// bk001129 - from cvs1.17 (mkv)
-#if defined(__FX__)
-//FX Mesa Functions
-fxMesaContext (*qfxMesaCreateContext)(GLuint win, GrScreenResolution_t, GrScreenRefresh_t, const GLint attribList[]);
-fxMesaContext (*qfxMesaCreateBestContext)(GLuint win, GLint width, GLint height, const GLint attribList[]);
-void (*qfxMesaDestroyContext)(fxMesaContext ctx);
-void (*qfxMesaMakeCurrent)(fxMesaContext ctx);
-fxMesaContext (*qfxMesaGetCurrentContext)(void);
-void (*qfxMesaSwapBuffers)(void);
-#endif
-
-//GLX Functions
-XVisualInfo * (*qglXChooseVisual)( Display *dpy, int screen, int *attribList );
-GLXContext (*qglXCreateContext)( Display *dpy, XVisualInfo *vis, GLXContext shareList, Bool direct );
-void (*qglXDestroyContext)( Display *dpy, GLXContext ctx );
-Bool (*qglXMakeCurrent)( Display *dpy, GLXDrawable drawable, GLXContext ctx);
-void (*qglXCopyContext)( Display *dpy, GLXContext src, GLXContext dst, GLuint mask );
-void (*qglXSwapBuffers)( Display *dpy, GLXDrawable drawable );
-
-void ( APIENTRY * qglAccum )(GLenum op, GLfloat value);
-void ( APIENTRY * qglAlphaFunc )(GLenum func, GLclampf ref);
-GLboolean ( APIENTRY * qglAreTexturesResident )(GLsizei n, const GLuint *textures, GLboolean *residences);
-void ( APIENTRY * qglArrayElement )(GLint i);
-void ( APIENTRY * qglBegin )(GLenum mode);
-void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
-void ( APIENTRY * qglBitmap )(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
-void ( APIENTRY * qglCallList )(GLuint list);
-void ( APIENTRY * qglCallLists )(GLsizei n, GLenum type, const GLvoid *lists);
-void ( APIENTRY * qglClear )(GLbitfield mask);
-void ( APIENTRY * qglClearAccum )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void ( APIENTRY * qglClearDepth )(GLclampd depth);
-void ( APIENTRY * qglClearIndex )(GLfloat c);
-void ( APIENTRY * qglClearStencil )(GLint s);
-void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation);
-void ( APIENTRY * qglColor3b )(GLbyte red, GLbyte green, GLbyte blue);
-void ( APIENTRY * qglColor3bv )(const GLbyte *v);
-void ( APIENTRY * qglColor3d )(GLdouble red, GLdouble green, GLdouble blue);
-void ( APIENTRY * qglColor3dv )(const GLdouble *v);
-void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue);
-void ( APIENTRY * qglColor3fv )(const GLfloat *v);
-void ( APIENTRY * qglColor3i )(GLint red, GLint green, GLint blue);
-void ( APIENTRY * qglColor3iv )(const GLint *v);
-void ( APIENTRY * qglColor3s )(GLshort red, GLshort green, GLshort blue);
-void ( APIENTRY * qglColor3sv )(const GLshort *v);
-void ( APIENTRY * qglColor3ub )(GLubyte red, GLubyte green, GLubyte blue);
-void ( APIENTRY * qglColor3ubv )(const GLubyte *v);
-void ( APIENTRY * qglColor3ui )(GLuint red, GLuint green, GLuint blue);
-void ( APIENTRY * qglColor3uiv )(const GLuint *v);
-void ( APIENTRY * qglColor3us )(GLushort red, GLushort green, GLushort blue);
-void ( APIENTRY * qglColor3usv )(const GLushort *v);
-void ( APIENTRY * qglColor4b )(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-void ( APIENTRY * qglColor4bv )(const GLbyte *v);
-void ( APIENTRY * qglColor4d )(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-void ( APIENTRY * qglColor4dv )(const GLdouble *v);
-void ( APIENTRY * qglColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void ( APIENTRY * qglColor4fv )(const GLfloat *v);
-void ( APIENTRY * qglColor4i )(GLint red, GLint green, GLint blue, GLint alpha);
-void ( APIENTRY * qglColor4iv )(const GLint *v);
-void ( APIENTRY * qglColor4s )(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-void ( APIENTRY * qglColor4sv )(const GLshort *v);
-void ( APIENTRY * qglColor4ub )(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-void ( APIENTRY * qglColor4ubv )(const GLubyte *v);
-void ( APIENTRY * qglColor4ui )(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-void ( APIENTRY * qglColor4uiv )(const GLuint *v);
-void ( APIENTRY * qglColor4us )(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-void ( APIENTRY * qglColor4usv )(const GLushort *v);
-void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-void ( APIENTRY * qglColorMaterial )(GLenum face, GLenum mode);
-void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglCopyPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-void ( APIENTRY * qglCopyTexImage1D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-void ( APIENTRY * qglCopyTexImage2D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void ( APIENTRY * qglCopyTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-void ( APIENTRY * qglCopyTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-void ( APIENTRY * qglCullFace )(GLenum mode);
-void ( APIENTRY * qglDeleteLists )(GLuint list, GLsizei range);
-void ( APIENTRY * qglDeleteTextures )(GLsizei n, const GLuint *textures);
-void ( APIENTRY * qglDepthFunc )(GLenum func);
-void ( APIENTRY * qglDepthMask )(GLboolean flag);
-void ( APIENTRY * qglDepthRange )(GLclampd zNear, GLclampd zFar);
-void ( APIENTRY * qglDisable )(GLenum cap);
-void ( APIENTRY * qglDisableClientState )(GLenum array);
-void ( APIENTRY * qglDrawArrays )(GLenum mode, GLint first, GLsizei count);
-void ( APIENTRY * qglDrawBuffer )(GLenum mode);
-void ( APIENTRY * qglDrawElements )(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-void ( APIENTRY * qglDrawPixels )(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglEdgeFlag )(GLboolean flag);
-void ( APIENTRY * qglEdgeFlagPointer )(GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglEdgeFlagv )(const GLboolean *flag);
-void ( APIENTRY * qglEnable )(GLenum cap);
-void ( APIENTRY * qglEnableClientState )(GLenum array);
-void ( APIENTRY * qglEnd )(void);
-void ( APIENTRY * qglEndList )(void);
-void ( APIENTRY * qglEvalCoord1d )(GLdouble u);
-void ( APIENTRY * qglEvalCoord1dv )(const GLdouble *u);
-void ( APIENTRY * qglEvalCoord1f )(GLfloat u);
-void ( APIENTRY * qglEvalCoord1fv )(const GLfloat *u);
-void ( APIENTRY * qglEvalCoord2d )(GLdouble u, GLdouble v);
-void ( APIENTRY * qglEvalCoord2dv )(const GLdouble *u);
-void ( APIENTRY * qglEvalCoord2f )(GLfloat u, GLfloat v);
-void ( APIENTRY * qglEvalCoord2fv )(const GLfloat *u);
-void ( APIENTRY * qglEvalMesh1 )(GLenum mode, GLint i1, GLint i2);
-void ( APIENTRY * qglEvalMesh2 )(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-void ( APIENTRY * qglEvalPoint1 )(GLint i);
-void ( APIENTRY * qglEvalPoint2 )(GLint i, GLint j);
-void ( APIENTRY * qglFeedbackBuffer )(GLsizei size, GLenum type, GLfloat *buffer);
-void ( APIENTRY * qglFinish )(void);
-void ( APIENTRY * qglFlush )(void);
-void ( APIENTRY * qglFogf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglFogfv )(GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglFogi )(GLenum pname, GLint param);
-void ( APIENTRY * qglFogiv )(GLenum pname, const GLint *params);
-void ( APIENTRY * qglFrontFace )(GLenum mode);
-void ( APIENTRY * qglFrustum )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLuint ( APIENTRY * qglGenLists )(GLsizei range);
-void ( APIENTRY * qglGenTextures )(GLsizei n, GLuint *textures);
-void ( APIENTRY * qglGetBooleanv )(GLenum pname, GLboolean *params);
-void ( APIENTRY * qglGetClipPlane )(GLenum plane, GLdouble *equation);
-void ( APIENTRY * qglGetDoublev )(GLenum pname, GLdouble *params);
-GLenum ( APIENTRY * qglGetError )(void);
-void ( APIENTRY * qglGetFloatv )(GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetIntegerv )(GLenum pname, GLint *params);
-void ( APIENTRY * qglGetLightfv )(GLenum light, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetLightiv )(GLenum light, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetMapdv )(GLenum target, GLenum query, GLdouble *v);
-void ( APIENTRY * qglGetMapfv )(GLenum target, GLenum query, GLfloat *v);
-void ( APIENTRY * qglGetMapiv )(GLenum target, GLenum query, GLint *v);
-void ( APIENTRY * qglGetMaterialfv )(GLenum face, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetMaterialiv )(GLenum face, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetPixelMapfv )(GLenum map, GLfloat *values);
-void ( APIENTRY * qglGetPixelMapuiv )(GLenum map, GLuint *values);
-void ( APIENTRY * qglGetPixelMapusv )(GLenum map, GLushort *values);
-void ( APIENTRY * qglGetPointerv )(GLenum pname, GLvoid* *params);
-void ( APIENTRY * qglGetPolygonStipple )(GLubyte *mask);
-const GLubyte * ( APIENTRY * qglGetString )(GLenum name);
-void ( APIENTRY * qglGetTexEnvfv )(GLenum target, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexEnviv )(GLenum target, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexGendv )(GLenum coord, GLenum pname, GLdouble *params);
-void ( APIENTRY * qglGetTexGenfv )(GLenum coord, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexGeniv )(GLenum coord, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexImage )(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-void ( APIENTRY * qglGetTexLevelParameterfv )(GLenum target, GLint level, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexLevelParameteriv )(GLenum target, GLint level, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexParameterfv )(GLenum target, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexParameteriv )(GLenum target, GLenum pname, GLint *params);
-void ( APIENTRY * qglHint )(GLenum target, GLenum mode);
-void ( APIENTRY * qglIndexMask )(GLuint mask);
-void ( APIENTRY * qglIndexPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglIndexd )(GLdouble c);
-void ( APIENTRY * qglIndexdv )(const GLdouble *c);
-void ( APIENTRY * qglIndexf )(GLfloat c);
-void ( APIENTRY * qglIndexfv )(const GLfloat *c);
-void ( APIENTRY * qglIndexi )(GLint c);
-void ( APIENTRY * qglIndexiv )(const GLint *c);
-void ( APIENTRY * qglIndexs )(GLshort c);
-void ( APIENTRY * qglIndexsv )(const GLshort *c);
-void ( APIENTRY * qglIndexub )(GLubyte c);
-void ( APIENTRY * qglIndexubv )(const GLubyte *c);
-void ( APIENTRY * qglInitNames )(void);
-void ( APIENTRY * qglInterleavedArrays )(GLenum format, GLsizei stride, const GLvoid *pointer);
-GLboolean ( APIENTRY * qglIsEnabled )(GLenum cap);
-GLboolean ( APIENTRY * qglIsList )(GLuint list);
-GLboolean ( APIENTRY * qglIsTexture )(GLuint texture);
-void ( APIENTRY * qglLightModelf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglLightModelfv )(GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglLightModeli )(GLenum pname, GLint param);
-void ( APIENTRY * qglLightModeliv )(GLenum pname, const GLint *params);
-void ( APIENTRY * qglLightf )(GLenum light, GLenum pname, GLfloat param);
-void ( APIENTRY * qglLightfv )(GLenum light, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglLighti )(GLenum light, GLenum pname, GLint param);
-void ( APIENTRY * qglLightiv )(GLenum light, GLenum pname, const GLint *params);
-void ( APIENTRY * qglLineStipple )(GLint factor, GLushort pattern);
-void ( APIENTRY * qglLineWidth )(GLfloat width);
-void ( APIENTRY * qglListBase )(GLuint base);
-void ( APIENTRY * qglLoadIdentity )(void);
-void ( APIENTRY * qglLoadMatrixd )(const GLdouble *m);
-void ( APIENTRY * qglLoadMatrixf )(const GLfloat *m);
-void ( APIENTRY * qglLoadName )(GLuint name);
-void ( APIENTRY * qglLogicOp )(GLenum opcode);
-void ( APIENTRY * qglMap1d )(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-void ( APIENTRY * qglMap1f )(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-void ( APIENTRY * qglMap2d )(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-void ( APIENTRY * qglMap2f )(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-void ( APIENTRY * qglMapGrid1d )(GLint un, GLdouble u1, GLdouble u2);
-void ( APIENTRY * qglMapGrid1f )(GLint un, GLfloat u1, GLfloat u2);
-void ( APIENTRY * qglMapGrid2d )(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-void ( APIENTRY * qglMapGrid2f )(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-void ( APIENTRY * qglMaterialf )(GLenum face, GLenum pname, GLfloat param);
-void ( APIENTRY * qglMaterialfv )(GLenum face, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglMateriali )(GLenum face, GLenum pname, GLint param);
-void ( APIENTRY * qglMaterialiv )(GLenum face, GLenum pname, const GLint *params);
-void ( APIENTRY * qglMatrixMode )(GLenum mode);
-void ( APIENTRY * qglMultMatrixd )(const GLdouble *m);
-void ( APIENTRY * qglMultMatrixf )(const GLfloat *m);
-void ( APIENTRY * qglNewList )(GLuint list, GLenum mode);
-void ( APIENTRY * qglNormal3b )(GLbyte nx, GLbyte ny, GLbyte nz);
-void ( APIENTRY * qglNormal3bv )(const GLbyte *v);
-void ( APIENTRY * qglNormal3d )(GLdouble nx, GLdouble ny, GLdouble nz);
-void ( APIENTRY * qglNormal3dv )(const GLdouble *v);
-void ( APIENTRY * qglNormal3f )(GLfloat nx, GLfloat ny, GLfloat nz);
-void ( APIENTRY * qglNormal3fv )(const GLfloat *v);
-void ( APIENTRY * qglNormal3i )(GLint nx, GLint ny, GLint nz);
-void ( APIENTRY * qglNormal3iv )(const GLint *v);
-void ( APIENTRY * qglNormal3s )(GLshort nx, GLshort ny, GLshort nz);
-void ( APIENTRY * qglNormal3sv )(const GLshort *v);
-void ( APIENTRY * qglNormalPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglOrtho )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-void ( APIENTRY * qglPassThrough )(GLfloat token);
-void ( APIENTRY * qglPixelMapfv )(GLenum map, GLsizei mapsize, const GLfloat *values);
-void ( APIENTRY * qglPixelMapuiv )(GLenum map, GLsizei mapsize, const GLuint *values);
-void ( APIENTRY * qglPixelMapusv )(GLenum map, GLsizei mapsize, const GLushort *values);
-void ( APIENTRY * qglPixelStoref )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglPixelStorei )(GLenum pname, GLint param);
-void ( APIENTRY * qglPixelTransferf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglPixelTransferi )(GLenum pname, GLint param);
-void ( APIENTRY * qglPixelZoom )(GLfloat xfactor, GLfloat yfactor);
-void ( APIENTRY * qglPointSize )(GLfloat size);
-void ( APIENTRY * qglPolygonMode )(GLenum face, GLenum mode);
-void ( APIENTRY * qglPolygonOffset )(GLfloat factor, GLfloat units);
-void ( APIENTRY * qglPolygonStipple )(const GLubyte *mask);
-void ( APIENTRY * qglPopAttrib )(void);
-void ( APIENTRY * qglPopClientAttrib )(void);
-void ( APIENTRY * qglPopMatrix )(void);
-void ( APIENTRY * qglPopName )(void);
-void ( APIENTRY * qglPrioritizeTextures )(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-void ( APIENTRY * qglPushAttrib )(GLbitfield mask);
-void ( APIENTRY * qglPushClientAttrib )(GLbitfield mask);
-void ( APIENTRY * qglPushMatrix )(void);
-void ( APIENTRY * qglPushName )(GLuint name);
-void ( APIENTRY * qglRasterPos2d )(GLdouble x, GLdouble y);
-void ( APIENTRY * qglRasterPos2dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos2f )(GLfloat x, GLfloat y);
-void ( APIENTRY * qglRasterPos2fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos2i )(GLint x, GLint y);
-void ( APIENTRY * qglRasterPos2iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos2s )(GLshort x, GLshort y);
-void ( APIENTRY * qglRasterPos2sv )(const GLshort *v);
-void ( APIENTRY * qglRasterPos3d )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglRasterPos3dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos3f )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglRasterPos3fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos3i )(GLint x, GLint y, GLint z);
-void ( APIENTRY * qglRasterPos3iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos3s )(GLshort x, GLshort y, GLshort z);
-void ( APIENTRY * qglRasterPos3sv )(const GLshort *v);
-void ( APIENTRY * qglRasterPos4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void ( APIENTRY * qglRasterPos4dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void ( APIENTRY * qglRasterPos4fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos4i )(GLint x, GLint y, GLint z, GLint w);
-void ( APIENTRY * qglRasterPos4iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-void ( APIENTRY * qglRasterPos4sv )(const GLshort *v);
-void ( APIENTRY * qglReadBuffer )(GLenum mode);
-void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-void ( APIENTRY * qglRectd )(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-void ( APIENTRY * qglRectdv )(const GLdouble *v1, const GLdouble *v2);
-void ( APIENTRY * qglRectf )(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-void ( APIENTRY * qglRectfv )(const GLfloat *v1, const GLfloat *v2);
-void ( APIENTRY * qglRecti )(GLint x1, GLint y1, GLint x2, GLint y2);
-void ( APIENTRY * qglRectiv )(const GLint *v1, const GLint *v2);
-void ( APIENTRY * qglRects )(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-void ( APIENTRY * qglRectsv )(const GLshort *v1, const GLshort *v2);
-GLint ( APIENTRY * qglRenderMode )(GLenum mode);
-void ( APIENTRY * qglRotated )(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglRotatef )(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglScaled )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglScalef )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
-void ( APIENTRY * qglSelectBuffer )(GLsizei size, GLuint *buffer);
-void ( APIENTRY * qglShadeModel )(GLenum mode);
-void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask);
-void ( APIENTRY * qglStencilMask )(GLuint mask);
-void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
-void ( APIENTRY * qglTexCoord1d )(GLdouble s);
-void ( APIENTRY * qglTexCoord1dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord1f )(GLfloat s);
-void ( APIENTRY * qglTexCoord1fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord1i )(GLint s);
-void ( APIENTRY * qglTexCoord1iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord1s )(GLshort s);
-void ( APIENTRY * qglTexCoord1sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord2d )(GLdouble s, GLdouble t);
-void ( APIENTRY * qglTexCoord2dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t);
-void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord2i )(GLint s, GLint t);
-void ( APIENTRY * qglTexCoord2iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord2s )(GLshort s, GLshort t);
-void ( APIENTRY * qglTexCoord2sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord3d )(GLdouble s, GLdouble t, GLdouble r);
-void ( APIENTRY * qglTexCoord3dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord3f )(GLfloat s, GLfloat t, GLfloat r);
-void ( APIENTRY * qglTexCoord3fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord3i )(GLint s, GLint t, GLint r);
-void ( APIENTRY * qglTexCoord3iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord3s )(GLshort s, GLshort t, GLshort r);
-void ( APIENTRY * qglTexCoord3sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord4d )(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-void ( APIENTRY * qglTexCoord4dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord4f )(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-void ( APIENTRY * qglTexCoord4fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord4i )(GLint s, GLint t, GLint r, GLint q);
-void ( APIENTRY * qglTexCoord4iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord4s )(GLshort s, GLshort t, GLshort r, GLshort q);
-void ( APIENTRY * qglTexCoord4sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoordPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglTexEnvf )(GLenum target, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexEnvfv )(GLenum target, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexEnvi )(GLenum target, GLenum pname, GLint param);
-void ( APIENTRY * qglTexEnviv )(GLenum target, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexGend )(GLenum coord, GLenum pname, GLdouble param);
-void ( APIENTRY * qglTexGendv )(GLenum coord, GLenum pname, const GLdouble *params);
-void ( APIENTRY * qglTexGenf )(GLenum coord, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexGenfv )(GLenum coord, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexGeni )(GLenum coord, GLenum pname, GLint param);
-void ( APIENTRY * qglTexGeniv )(GLenum coord, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexImage1D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexImage2D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexParameterf )(GLenum target, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexParameterfv )(GLenum target, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexParameteri )(GLenum target, GLenum pname, GLint param);
-void ( APIENTRY * qglTexParameteriv )(GLenum target, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTranslated )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglTranslatef )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglVertex2d )(GLdouble x, GLdouble y);
-void ( APIENTRY * qglVertex2dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex2f )(GLfloat x, GLfloat y);
-void ( APIENTRY * qglVertex2fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex2i )(GLint x, GLint y);
-void ( APIENTRY * qglVertex2iv )(const GLint *v);
-void ( APIENTRY * qglVertex2s )(GLshort x, GLshort y);
-void ( APIENTRY * qglVertex2sv )(const GLshort *v);
-void ( APIENTRY * qglVertex3d )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglVertex3dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex3f )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglVertex3fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex3i )(GLint x, GLint y, GLint z);
-void ( APIENTRY * qglVertex3iv )(const GLint *v);
-void ( APIENTRY * qglVertex3s )(GLshort x, GLshort y, GLshort z);
-void ( APIENTRY * qglVertex3sv )(const GLshort *v);
-void ( APIENTRY * qglVertex4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void ( APIENTRY * qglVertex4dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void ( APIENTRY * qglVertex4fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex4i )(GLint x, GLint y, GLint z, GLint w);
-void ( APIENTRY * qglVertex4iv )(const GLint *v);
-void ( APIENTRY * qglVertex4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-void ( APIENTRY * qglVertex4sv )(const GLshort *v);
-void ( APIENTRY * qglVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglViewport )(GLint x, GLint y, GLsizei width, GLsizei height);
-
-void (APIENTRY* qglCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* qglGetCompressedTexImageARB)(GLenum target, GLint lod, void* img);
-
-void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
-void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-
-void ( APIENTRY * qglLockArraysEXT)( int, int);
-void ( APIENTRY * qglUnlockArraysEXT) ( void );
-
-void ( APIENTRY * qglPointParameterfEXT)( GLenum param, GLfloat value );
-void ( APIENTRY * qglPointParameterfvEXT)( GLenum param, const GLfloat *value );
-void ( APIENTRY * qglColorTableEXT)( int, int, int, int, int, const void * );
-void ( APIENTRY * qgl3DfxSetPaletteEXT)( GLuint * );
-void ( APIENTRY * qglSelectTextureSGIS)( GLenum );
-void ( APIENTRY * qglMTexCoord2fSGIS)( GLenum, GLfloat, GLfloat );
-
-static void ( APIENTRY * dllAccum )(GLenum op, GLfloat value);
-static void ( APIENTRY * dllAlphaFunc )(GLenum func, GLclampf ref);
-GLboolean ( APIENTRY * dllAreTexturesResident )(GLsizei n, const GLuint *textures, GLboolean *residences);
-static void ( APIENTRY * dllArrayElement )(GLint i);
-static void ( APIENTRY * dllBegin )(GLenum mode);
-static void ( APIENTRY * dllBindTexture )(GLenum target, GLuint texture);
-static void ( APIENTRY * dllBitmap )(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-static void ( APIENTRY * dllBlendFunc )(GLenum sfactor, GLenum dfactor);
-static void ( APIENTRY * dllCallList )(GLuint list);
-static void ( APIENTRY * dllCallLists )(GLsizei n, GLenum type, const GLvoid *lists);
-static void ( APIENTRY * dllClear )(GLbitfield mask);
-static void ( APIENTRY * dllClearAccum )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-static void ( APIENTRY * dllClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-static void ( APIENTRY * dllClearDepth )(GLclampd depth);
-static void ( APIENTRY * dllClearIndex )(GLfloat c);
-static void ( APIENTRY * dllClearStencil )(GLint s);
-static void ( APIENTRY * dllClipPlane )(GLenum plane, const GLdouble *equation);
-static void ( APIENTRY * dllColor3b )(GLbyte red, GLbyte green, GLbyte blue);
-static void ( APIENTRY * dllColor3bv )(const GLbyte *v);
-static void ( APIENTRY * dllColor3d )(GLdouble red, GLdouble green, GLdouble blue);
-static void ( APIENTRY * dllColor3dv )(const GLdouble *v);
-static void ( APIENTRY * dllColor3f )(GLfloat red, GLfloat green, GLfloat blue);
-static void ( APIENTRY * dllColor3fv )(const GLfloat *v);
-static void ( APIENTRY * dllColor3i )(GLint red, GLint green, GLint blue);
-static void ( APIENTRY * dllColor3iv )(const GLint *v);
-static void ( APIENTRY * dllColor3s )(GLshort red, GLshort green, GLshort blue);
-static void ( APIENTRY * dllColor3sv )(const GLshort *v);
-static void ( APIENTRY * dllColor3ub )(GLubyte red, GLubyte green, GLubyte blue);
-static void ( APIENTRY * dllColor3ubv )(const GLubyte *v);
-static void ( APIENTRY * dllColor3ui )(GLuint red, GLuint green, GLuint blue);
-static void ( APIENTRY * dllColor3uiv )(const GLuint *v);
-static void ( APIENTRY * dllColor3us )(GLushort red, GLushort green, GLushort blue);
-static void ( APIENTRY * dllColor3usv )(const GLushort *v);
-static void ( APIENTRY * dllColor4b )(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-static void ( APIENTRY * dllColor4bv )(const GLbyte *v);
-static void ( APIENTRY * dllColor4d )(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-static void ( APIENTRY * dllColor4dv )(const GLdouble *v);
-static void ( APIENTRY * dllColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-static void ( APIENTRY * dllColor4fv )(const GLfloat *v);
-static void ( APIENTRY * dllColor4i )(GLint red, GLint green, GLint blue, GLint alpha);
-static void ( APIENTRY * dllColor4iv )(const GLint *v);
-static void ( APIENTRY * dllColor4s )(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-static void ( APIENTRY * dllColor4sv )(const GLshort *v);
-static void ( APIENTRY * dllColor4ub )(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-static void ( APIENTRY * dllColor4ubv )(const GLubyte *v);
-static void ( APIENTRY * dllColor4ui )(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-static void ( APIENTRY * dllColor4uiv )(const GLuint *v);
-static void ( APIENTRY * dllColor4us )(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-static void ( APIENTRY * dllColor4usv )(const GLushort *v);
-static void ( APIENTRY * dllColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-static void ( APIENTRY * dllColorMaterial )(GLenum face, GLenum mode);
-static void ( APIENTRY * dllColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllCopyPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-static void ( APIENTRY * dllCopyTexImage1D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-static void ( APIENTRY * dllCopyTexImage2D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-static void ( APIENTRY * dllCopyTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-static void ( APIENTRY * dllCopyTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-static void ( APIENTRY * dllCullFace )(GLenum mode);
-static void ( APIENTRY * dllDeleteLists )(GLuint list, GLsizei range);
-static void ( APIENTRY * dllDeleteTextures )(GLsizei n, const GLuint *textures);
-static void ( APIENTRY * dllDepthFunc )(GLenum func);
-static void ( APIENTRY * dllDepthMask )(GLboolean flag);
-static void ( APIENTRY * dllDepthRange )(GLclampd zNear, GLclampd zFar);
-static void ( APIENTRY * dllDisable )(GLenum cap);
-static void ( APIENTRY * dllDisableClientState )(GLenum array);
-static void ( APIENTRY * dllDrawArrays )(GLenum mode, GLint first, GLsizei count);
-static void ( APIENTRY * dllDrawBuffer )(GLenum mode);
-static void ( APIENTRY * dllDrawElements )(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-static void ( APIENTRY * dllDrawPixels )(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllEdgeFlag )(GLboolean flag);
-static void ( APIENTRY * dllEdgeFlagPointer )(GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllEdgeFlagv )(const GLboolean *flag);
-static void ( APIENTRY * dllEnable )(GLenum cap);
-static void ( APIENTRY * dllEnableClientState )(GLenum array);
-static void ( APIENTRY * dllEnd )(void);
-static void ( APIENTRY * dllEndList )(void);
-static void ( APIENTRY * dllEvalCoord1d )(GLdouble u);
-static void ( APIENTRY * dllEvalCoord1dv )(const GLdouble *u);
-static void ( APIENTRY * dllEvalCoord1f )(GLfloat u);
-static void ( APIENTRY * dllEvalCoord1fv )(const GLfloat *u);
-static void ( APIENTRY * dllEvalCoord2d )(GLdouble u, GLdouble v);
-static void ( APIENTRY * dllEvalCoord2dv )(const GLdouble *u);
-static void ( APIENTRY * dllEvalCoord2f )(GLfloat u, GLfloat v);
-static void ( APIENTRY * dllEvalCoord2fv )(const GLfloat *u);
-static void ( APIENTRY * dllEvalMesh1 )(GLenum mode, GLint i1, GLint i2);
-static void ( APIENTRY * dllEvalMesh2 )(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-static void ( APIENTRY * dllEvalPoint1 )(GLint i);
-static void ( APIENTRY * dllEvalPoint2 )(GLint i, GLint j);
-static void ( APIENTRY * dllFeedbackBuffer )(GLsizei size, GLenum type, GLfloat *buffer);
-static void ( APIENTRY * dllFinish )(void);
-static void ( APIENTRY * dllFlush )(void);
-static void ( APIENTRY * dllFogf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllFogfv )(GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllFogi )(GLenum pname, GLint param);
-static void ( APIENTRY * dllFogiv )(GLenum pname, const GLint *params);
-static void ( APIENTRY * dllFrontFace )(GLenum mode);
-static void ( APIENTRY * dllFrustum )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLuint ( APIENTRY * dllGenLists )(GLsizei range);
-static void ( APIENTRY * dllGenTextures )(GLsizei n, GLuint *textures);
-static void ( APIENTRY * dllGetBooleanv )(GLenum pname, GLboolean *params);
-static void ( APIENTRY * dllGetClipPlane )(GLenum plane, GLdouble *equation);
-static void ( APIENTRY * dllGetDoublev )(GLenum pname, GLdouble *params);
-GLenum ( APIENTRY * dllGetError )(void);
-static void ( APIENTRY * dllGetFloatv )(GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetIntegerv )(GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetLightfv )(GLenum light, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetLightiv )(GLenum light, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetMapdv )(GLenum target, GLenum query, GLdouble *v);
-static void ( APIENTRY * dllGetMapfv )(GLenum target, GLenum query, GLfloat *v);
-static void ( APIENTRY * dllGetMapiv )(GLenum target, GLenum query, GLint *v);
-static void ( APIENTRY * dllGetMaterialfv )(GLenum face, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetMaterialiv )(GLenum face, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetPixelMapfv )(GLenum map, GLfloat *values);
-static void ( APIENTRY * dllGetPixelMapuiv )(GLenum map, GLuint *values);
-static void ( APIENTRY * dllGetPixelMapusv )(GLenum map, GLushort *values);
-static void ( APIENTRY * dllGetPointerv )(GLenum pname, GLvoid* *params);
-static void ( APIENTRY * dllGetPolygonStipple )(GLubyte *mask);
-const GLubyte * ( APIENTRY * dllGetString )(GLenum name);
-static void ( APIENTRY * dllGetTexEnvfv )(GLenum target, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexEnviv )(GLenum target, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexGendv )(GLenum coord, GLenum pname, GLdouble *params);
-static void ( APIENTRY * dllGetTexGenfv )(GLenum coord, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexGeniv )(GLenum coord, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexImage )(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-static void ( APIENTRY * dllGetTexLevelParameterfv )(GLenum target, GLint level, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexLevelParameteriv )(GLenum target, GLint level, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexParameterfv )(GLenum target, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexParameteriv )(GLenum target, GLenum pname, GLint *params);
-static void ( APIENTRY * dllHint )(GLenum target, GLenum mode);
-static void ( APIENTRY * dllIndexMask )(GLuint mask);
-static void ( APIENTRY * dllIndexPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllIndexd )(GLdouble c);
-static void ( APIENTRY * dllIndexdv )(const GLdouble *c);
-static void ( APIENTRY * dllIndexf )(GLfloat c);
-static void ( APIENTRY * dllIndexfv )(const GLfloat *c);
-static void ( APIENTRY * dllIndexi )(GLint c);
-static void ( APIENTRY * dllIndexiv )(const GLint *c);
-static void ( APIENTRY * dllIndexs )(GLshort c);
-static void ( APIENTRY * dllIndexsv )(const GLshort *c);
-static void ( APIENTRY * dllIndexub )(GLubyte c);
-static void ( APIENTRY * dllIndexubv )(const GLubyte *c);
-static void ( APIENTRY * dllInitNames )(void);
-static void ( APIENTRY * dllInterleavedArrays )(GLenum format, GLsizei stride, const GLvoid *pointer);
-GLboolean ( APIENTRY * dllIsEnabled )(GLenum cap);
-GLboolean ( APIENTRY * dllIsList )(GLuint list);
-GLboolean ( APIENTRY * dllIsTexture )(GLuint texture);
-static void ( APIENTRY * dllLightModelf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllLightModelfv )(GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllLightModeli )(GLenum pname, GLint param);
-static void ( APIENTRY * dllLightModeliv )(GLenum pname, const GLint *params);
-static void ( APIENTRY * dllLightf )(GLenum light, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllLightfv )(GLenum light, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllLighti )(GLenum light, GLenum pname, GLint param);
-static void ( APIENTRY * dllLightiv )(GLenum light, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllLineStipple )(GLint factor, GLushort pattern);
-static void ( APIENTRY * dllLineWidth )(GLfloat width);
-static void ( APIENTRY * dllListBase )(GLuint base);
-static void ( APIENTRY * dllLoadIdentity )(void);
-static void ( APIENTRY * dllLoadMatrixd )(const GLdouble *m);
-static void ( APIENTRY * dllLoadMatrixf )(const GLfloat *m);
-static void ( APIENTRY * dllLoadName )(GLuint name);
-static void ( APIENTRY * dllLogicOp )(GLenum opcode);
-static void ( APIENTRY * dllMap1d )(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-static void ( APIENTRY * dllMap1f )(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-static void ( APIENTRY * dllMap2d )(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-static void ( APIENTRY * dllMap2f )(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-static void ( APIENTRY * dllMapGrid1d )(GLint un, GLdouble u1, GLdouble u2);
-static void ( APIENTRY * dllMapGrid1f )(GLint un, GLfloat u1, GLfloat u2);
-static void ( APIENTRY * dllMapGrid2d )(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-static void ( APIENTRY * dllMapGrid2f )(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-static void ( APIENTRY * dllMaterialf )(GLenum face, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllMaterialfv )(GLenum face, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllMateriali )(GLenum face, GLenum pname, GLint param);
-static void ( APIENTRY * dllMaterialiv )(GLenum face, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllMatrixMode )(GLenum mode);
-static void ( APIENTRY * dllMultMatrixd )(const GLdouble *m);
-static void ( APIENTRY * dllMultMatrixf )(const GLfloat *m);
-static void ( APIENTRY * dllNewList )(GLuint list, GLenum mode);
-static void ( APIENTRY * dllNormal3b )(GLbyte nx, GLbyte ny, GLbyte nz);
-static void ( APIENTRY * dllNormal3bv )(const GLbyte *v);
-static void ( APIENTRY * dllNormal3d )(GLdouble nx, GLdouble ny, GLdouble nz);
-static void ( APIENTRY * dllNormal3dv )(const GLdouble *v);
-static void ( APIENTRY * dllNormal3f )(GLfloat nx, GLfloat ny, GLfloat nz);
-static void ( APIENTRY * dllNormal3fv )(const GLfloat *v);
-static void ( APIENTRY * dllNormal3i )(GLint nx, GLint ny, GLint nz);
-static void ( APIENTRY * dllNormal3iv )(const GLint *v);
-static void ( APIENTRY * dllNormal3s )(GLshort nx, GLshort ny, GLshort nz);
-static void ( APIENTRY * dllNormal3sv )(const GLshort *v);
-static void ( APIENTRY * dllNormalPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllOrtho )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-static void ( APIENTRY * dllPassThrough )(GLfloat token);
-static void ( APIENTRY * dllPixelMapfv )(GLenum map, GLsizei mapsize, const GLfloat *values);
-static void ( APIENTRY * dllPixelMapuiv )(GLenum map, GLsizei mapsize, const GLuint *values);
-static void ( APIENTRY * dllPixelMapusv )(GLenum map, GLsizei mapsize, const GLushort *values);
-static void ( APIENTRY * dllPixelStoref )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllPixelStorei )(GLenum pname, GLint param);
-static void ( APIENTRY * dllPixelTransferf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllPixelTransferi )(GLenum pname, GLint param);
-static void ( APIENTRY * dllPixelZoom )(GLfloat xfactor, GLfloat yfactor);
-static void ( APIENTRY * dllPointSize )(GLfloat size);
-static void ( APIENTRY * dllPolygonMode )(GLenum face, GLenum mode);
-static void ( APIENTRY * dllPolygonOffset )(GLfloat factor, GLfloat units);
-static void ( APIENTRY * dllPolygonStipple )(const GLubyte *mask);
-static void ( APIENTRY * dllPopAttrib )(void);
-static void ( APIENTRY * dllPopClientAttrib )(void);
-static void ( APIENTRY * dllPopMatrix )(void);
-static void ( APIENTRY * dllPopName )(void);
-static void ( APIENTRY * dllPrioritizeTextures )(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-static void ( APIENTRY * dllPushAttrib )(GLbitfield mask);
-static void ( APIENTRY * dllPushClientAttrib )(GLbitfield mask);
-static void ( APIENTRY * dllPushMatrix )(void);
-static void ( APIENTRY * dllPushName )(GLuint name);
-static void ( APIENTRY * dllRasterPos2d )(GLdouble x, GLdouble y);
-static void ( APIENTRY * dllRasterPos2dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos2f )(GLfloat x, GLfloat y);
-static void ( APIENTRY * dllRasterPos2fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos2i )(GLint x, GLint y);
-static void ( APIENTRY * dllRasterPos2iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos2s )(GLshort x, GLshort y);
-static void ( APIENTRY * dllRasterPos2sv )(const GLshort *v);
-static void ( APIENTRY * dllRasterPos3d )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllRasterPos3dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos3f )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllRasterPos3fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos3i )(GLint x, GLint y, GLint z);
-static void ( APIENTRY * dllRasterPos3iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos3s )(GLshort x, GLshort y, GLshort z);
-static void ( APIENTRY * dllRasterPos3sv )(const GLshort *v);
-static void ( APIENTRY * dllRasterPos4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-static void ( APIENTRY * dllRasterPos4dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-static void ( APIENTRY * dllRasterPos4fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos4i )(GLint x, GLint y, GLint z, GLint w);
-static void ( APIENTRY * dllRasterPos4iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-static void ( APIENTRY * dllRasterPos4sv )(const GLshort *v);
-static void ( APIENTRY * dllReadBuffer )(GLenum mode);
-static void ( APIENTRY * dllReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-static void ( APIENTRY * dllRectd )(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-static void ( APIENTRY * dllRectdv )(const GLdouble *v1, const GLdouble *v2);
-static void ( APIENTRY * dllRectf )(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-static void ( APIENTRY * dllRectfv )(const GLfloat *v1, const GLfloat *v2);
-static void ( APIENTRY * dllRecti )(GLint x1, GLint y1, GLint x2, GLint y2);
-static void ( APIENTRY * dllRectiv )(const GLint *v1, const GLint *v2);
-static void ( APIENTRY * dllRects )(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-static void ( APIENTRY * dllRectsv )(const GLshort *v1, const GLshort *v2);
-GLint ( APIENTRY * dllRenderMode )(GLenum mode);
-static void ( APIENTRY * dllRotated )(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllRotatef )(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllScaled )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllScalef )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
-static void ( APIENTRY * dllSelectBuffer )(GLsizei size, GLuint *buffer);
-static void ( APIENTRY * dllShadeModel )(GLenum mode);
-static void ( APIENTRY * dllStencilFunc )(GLenum func, GLint ref, GLuint mask);
-static void ( APIENTRY * dllStencilMask )(GLuint mask);
-static void ( APIENTRY * dllStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
-static void ( APIENTRY * dllTexCoord1d )(GLdouble s);
-static void ( APIENTRY * dllTexCoord1dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord1f )(GLfloat s);
-static void ( APIENTRY * dllTexCoord1fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord1i )(GLint s);
-static void ( APIENTRY * dllTexCoord1iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord1s )(GLshort s);
-static void ( APIENTRY * dllTexCoord1sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord2d )(GLdouble s, GLdouble t);
-static void ( APIENTRY * dllTexCoord2dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord2f )(GLfloat s, GLfloat t);
-static void ( APIENTRY * dllTexCoord2fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord2i )(GLint s, GLint t);
-static void ( APIENTRY * dllTexCoord2iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord2s )(GLshort s, GLshort t);
-static void ( APIENTRY * dllTexCoord2sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord3d )(GLdouble s, GLdouble t, GLdouble r);
-static void ( APIENTRY * dllTexCoord3dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord3f )(GLfloat s, GLfloat t, GLfloat r);
-static void ( APIENTRY * dllTexCoord3fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord3i )(GLint s, GLint t, GLint r);
-static void ( APIENTRY * dllTexCoord3iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord3s )(GLshort s, GLshort t, GLshort r);
-static void ( APIENTRY * dllTexCoord3sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord4d )(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-static void ( APIENTRY * dllTexCoord4dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord4f )(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-static void ( APIENTRY * dllTexCoord4fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord4i )(GLint s, GLint t, GLint r, GLint q);
-static void ( APIENTRY * dllTexCoord4iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord4s )(GLshort s, GLshort t, GLshort r, GLshort q);
-static void ( APIENTRY * dllTexCoord4sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoordPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllTexEnvf )(GLenum target, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexEnvfv )(GLenum target, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexEnvi )(GLenum target, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexEnviv )(GLenum target, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexGend )(GLenum coord, GLenum pname, GLdouble param);
-static void ( APIENTRY * dllTexGendv )(GLenum coord, GLenum pname, const GLdouble *params);
-static void ( APIENTRY * dllTexGenf )(GLenum coord, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexGenfv )(GLenum coord, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexGeni )(GLenum coord, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexGeniv )(GLenum coord, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexImage1D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexImage2D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexParameterf )(GLenum target, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexParameterfv )(GLenum target, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexParameteri )(GLenum target, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexParameteriv )(GLenum target, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTranslated )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllTranslatef )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllVertex2d )(GLdouble x, GLdouble y);
-static void ( APIENTRY * dllVertex2dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex2f )(GLfloat x, GLfloat y);
-static void ( APIENTRY * dllVertex2fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex2i )(GLint x, GLint y);
-static void ( APIENTRY * dllVertex2iv )(const GLint *v);
-static void ( APIENTRY * dllVertex2s )(GLshort x, GLshort y);
-static void ( APIENTRY * dllVertex2sv )(const GLshort *v);
-static void ( APIENTRY * dllVertex3d )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllVertex3dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex3f )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllVertex3fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex3i )(GLint x, GLint y, GLint z);
-static void ( APIENTRY * dllVertex3iv )(const GLint *v);
-static void ( APIENTRY * dllVertex3s )(GLshort x, GLshort y, GLshort z);
-static void ( APIENTRY * dllVertex3sv )(const GLshort *v);
-static void ( APIENTRY * dllVertex4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-static void ( APIENTRY * dllVertex4dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-static void ( APIENTRY * dllVertex4fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex4i )(GLint x, GLint y, GLint z, GLint w);
-static void ( APIENTRY * dllVertex4iv )(const GLint *v);
-static void ( APIENTRY * dllVertex4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-static void ( APIENTRY * dllVertex4sv )(const GLshort *v);
-static void ( APIENTRY * dllVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllViewport )(GLint x, GLint y, GLsizei width, GLsizei height);
-
-void (APIENTRY* dllCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* dllGetCompressedTexImageARB)(GLenum target, GLint lod, void* img);
-
-static void APIENTRY logAccum(GLenum op, GLfloat value)
-{
-	fprintf( glw_state.log_fp, "glAccum\n" );
-	dllAccum( op, value );
-}
-
-static void APIENTRY logAlphaFunc(GLenum func, GLclampf ref)
-{
-	fprintf( glw_state.log_fp, "glAlphaFunc( 0x%x, %f )\n", func, ref );
-	dllAlphaFunc( func, ref );
-}
-
-static GLboolean APIENTRY logAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
-{
-	fprintf( glw_state.log_fp, "glAreTexturesResident\n" );
-	return dllAreTexturesResident( n, textures, residences );
-}
-
-static void APIENTRY logArrayElement(GLint i)
-{
-	fprintf( glw_state.log_fp, "glArrayElement\n" );
-	dllArrayElement( i );
-}
-
-static void APIENTRY logBegin(GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glBegin( 0x%x )\n", mode );
-	dllBegin( mode );
-}
-
-static void APIENTRY logBindTexture(GLenum target, GLuint texture)
-{
-	fprintf( glw_state.log_fp, "glBindTexture( 0x%x, %u )\n", target, texture );
-	dllBindTexture( target, texture );
-}
-
-static void APIENTRY logBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
-{
-	fprintf( glw_state.log_fp, "glBitmap\n" );
-	dllBitmap( width, height, xorig, yorig, xmove, ymove, bitmap );
-}
-
-static void APIENTRY logBlendFunc(GLenum sfactor, GLenum dfactor)
-{
-	fprintf( glw_state.log_fp, "glBlendFunc( 0x%x, 0x%x )\n", sfactor, dfactor );
-	dllBlendFunc( sfactor, dfactor );
-}
-
-static void APIENTRY logCallList(GLuint list)
-{
-	fprintf( glw_state.log_fp, "glCallList( %u )\n", list );
-	dllCallList( list );
-}
-
-static void APIENTRY logCallLists(GLsizei n, GLenum type, const void *lists)
-{
-	fprintf( glw_state.log_fp, "glCallLists\n" );
-	dllCallLists( n, type, lists );
-}
-
-static void APIENTRY logClear(GLbitfield mask)
-{
-	fprintf( glw_state.log_fp, "glClear\n" );
-	dllClear( mask );
-}
-
-static void APIENTRY logClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	fprintf( glw_state.log_fp, "glClearAccum\n" );
-	dllClearAccum( red, green, blue, alpha );
-}
-
-static void APIENTRY logClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-	fprintf( glw_state.log_fp, "glClearColor\n" );
-	dllClearColor( red, green, blue, alpha );
-}
-
-static void APIENTRY logClearDepth(GLclampd depth)
-{
-	fprintf( glw_state.log_fp, "glClearDepth\n" );
-	dllClearDepth( depth );
-}
-
-static void APIENTRY logClearIndex(GLfloat c)
-{
-	fprintf( glw_state.log_fp, "glClearIndex\n" );
-	dllClearIndex( c );
-}
-
-static void APIENTRY logClearStencil(GLint s)
-{
-	fprintf( glw_state.log_fp, "glClearStencil\n" );
-	dllClearStencil( s );
-}
-
-static void APIENTRY logClipPlane(GLenum plane, const GLdouble *equation)
-{
-	fprintf( glw_state.log_fp, "glClipPlane\n" );
-	dllClipPlane( plane, equation );
-}
-
-static void APIENTRY logColor3b(GLbyte red, GLbyte green, GLbyte blue)
-{
-	fprintf( glw_state.log_fp, "glColor3b\n" );
-	dllColor3b( red, green, blue );
-}
-
-static void APIENTRY logColor3bv(const GLbyte *v)
-{
-	fprintf( glw_state.log_fp, "glColor3bv\n" );
-	dllColor3bv( v );
-}
-
-static void APIENTRY logColor3d(GLdouble red, GLdouble green, GLdouble blue)
-{
-	fprintf( glw_state.log_fp, "glColor3d\n" );
-	dllColor3d( red, green, blue );
-}
-
-static void APIENTRY logColor3dv(const GLdouble *v)
-{
-	fprintf( glw_state.log_fp, "glColor3dv\n" );
-	dllColor3dv( v );
-}
-
-static void APIENTRY logColor3f(GLfloat red, GLfloat green, GLfloat blue)
-{
-	fprintf( glw_state.log_fp, "glColor3f\n" );
-	dllColor3f( red, green, blue );
-}
-
-static void APIENTRY logColor3fv(const GLfloat *v)
-{
-	fprintf( glw_state.log_fp, "glColor3fv\n" );
-	dllColor3fv( v );
-}
-
-static void APIENTRY logColor3i(GLint red, GLint green, GLint blue)
-{
-	fprintf( glw_state.log_fp, "glColor3i\n" );
-	dllColor3i( red, green, blue );
-}
-
-static void APIENTRY logColor3iv(const GLint *v)
-{
-	fprintf( glw_state.log_fp, "glColor3iv\n" );
-	dllColor3iv( v );
-}
-
-static void APIENTRY logColor3s(GLshort red, GLshort green, GLshort blue)
-{
-	fprintf( glw_state.log_fp, "glColor3s\n" );
-	dllColor3s( red, green, blue );
-}
-
-static void APIENTRY logColor3sv(const GLshort *v)
-{
-	fprintf( glw_state.log_fp, "glColor3sv\n" );
-	dllColor3sv( v );
-}
-
-static void APIENTRY logColor3ub(GLubyte red, GLubyte green, GLubyte blue)
-{
-	fprintf( glw_state.log_fp, "glColor3ub\n" );
-	dllColor3ub( red, green, blue );
-}
-
-static void APIENTRY logColor3ubv(const GLubyte *v)
-{
-	fprintf( glw_state.log_fp, "glColor3ubv\n" );
-	dllColor3ubv( v );
-}
-
-#define SIG( x ) fprintf( glw_state.log_fp, x "\n" )
-
-static void APIENTRY logColor3ui(GLuint red, GLuint green, GLuint blue)
-{
-	SIG( "glColor3ui" );
-	dllColor3ui( red, green, blue );
-}
-
-static void APIENTRY logColor3uiv(const GLuint *v)
-{
-	SIG( "glColor3uiv" );
-	dllColor3uiv( v );
-}
-
-static void APIENTRY logColor3us(GLushort red, GLushort green, GLushort blue)
-{
-	SIG( "glColor3us" );
-	dllColor3us( red, green, blue );
-}
-
-static void APIENTRY logColor3usv(const GLushort *v)
-{
-	SIG( "glColor3usv" );
-	dllColor3usv( v );
-}
-
-static void APIENTRY logColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
-{
-	SIG( "glColor4b" );
-	dllColor4b( red, green, blue, alpha );
-}
-
-static void APIENTRY logColor4bv(const GLbyte *v)
-{
-	SIG( "glColor4bv" );
-	dllColor4bv( v );
-}
-
-static void APIENTRY logColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
-{
-	SIG( "glColor4d" );
-	dllColor4d( red, green, blue, alpha );
-}
-static void APIENTRY logColor4dv(const GLdouble *v)
-{
-	SIG( "glColor4dv" );
-	dllColor4dv( v );
-}
-static void APIENTRY logColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	fprintf( glw_state.log_fp, "glColor4f( %f,%f,%f,%f )\n", red, green, blue, alpha );
-	dllColor4f( red, green, blue, alpha );
-}
-static void APIENTRY logColor4fv(const GLfloat *v)
-{
-	fprintf( glw_state.log_fp, "glColor4fv( %f,%f,%f,%f )\n", v[0], v[1], v[2], v[3] );
-	dllColor4fv( v );
-}
-static void APIENTRY logColor4i(GLint red, GLint green, GLint blue, GLint alpha)
-{
-	SIG( "glColor4i" );
-	dllColor4i( red, green, blue, alpha );
-}
-static void APIENTRY logColor4iv(const GLint *v)
-{
-	SIG( "glColor4iv" );
-	dllColor4iv( v );
-}
-static void APIENTRY logColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
-{
-	SIG( "glColor4s" );
-	dllColor4s( red, green, blue, alpha );
-}
-static void APIENTRY logColor4sv(const GLshort *v)
-{
-	SIG( "glColor4sv" );
-	dllColor4sv( v );
-}
-static void APIENTRY logColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
-{
-	SIG( "glColor4b" );
-	dllColor4b( red, green, blue, alpha );
-}
-static void APIENTRY logColor4ubv(const GLubyte *v)
-{
-	SIG( "glColor4ubv" );
-	dllColor4ubv( v );
-}
-static void APIENTRY logColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
-{
-	SIG( "glColor4ui" );
-	dllColor4ui( red, green, blue, alpha );
-}
-static void APIENTRY logColor4uiv(const GLuint *v)
-{
-	SIG( "glColor4uiv" );
-	dllColor4uiv( v );
-}
-static void APIENTRY logColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
-{
-	SIG( "glColor4us" );
-	dllColor4us( red, green, blue, alpha );
-}
-static void APIENTRY logColor4usv(const GLushort *v)
-{
-	SIG( "glColor4usv" );
-	dllColor4usv( v );
-}
-static void APIENTRY logColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
-{
-	SIG( "glColorMask" );
-	dllColorMask( red, green, blue, alpha );
-}
-static void APIENTRY logColorMaterial(GLenum face, GLenum mode)
-{
-	SIG( "glColorMaterial" );
-	dllColorMaterial( face, mode );
-}
-
-static void APIENTRY logColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glColorPointer" );
-	dllColorPointer( size, type, stride, pointer );
-}
-
-static void APIENTRY logCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
-{
-	SIG( "glCopyPixels" );
-	dllCopyPixels( x, y, width, height, type );
-}
-
-static void APIENTRY logCopyTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border)
-{
-	SIG( "glCopyTexImage1D" );
-	dllCopyTexImage1D( target, level, internalFormat, x, y, width, border );
-}
-
-static void APIENTRY logCopyTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
-{
-	SIG( "glCopyTexImage2D" );
-	dllCopyTexImage2D( target, level, internalFormat, x, y, width, height, border );
-}
-
-static void APIENTRY logCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
-{
-	SIG( "glCopyTexSubImage1D" );
-	dllCopyTexSubImage1D( target, level, xoffset, x, y, width );
-}
-
-static void APIENTRY logCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	SIG( "glCopyTexSubImage2D" );
-	dllCopyTexSubImage2D( target, level, xoffset, yoffset, x, y, width, height );
-}
-
-static void APIENTRY logCullFace(GLenum mode)
-{
-	SIG( "glCullFace" );
-	dllCullFace( mode );
-}
-
-static void APIENTRY logDeleteLists(GLuint list, GLsizei range)
-{
-	SIG( "glDeleteLists" );
-	dllDeleteLists( list, range );
-}
-
-static void APIENTRY logDeleteTextures(GLsizei n, const GLuint *textures)
-{
-	SIG( "glDeleteTextures" );
-	dllDeleteTextures( n, textures );
-}
-
-static void APIENTRY logDepthFunc(GLenum func)
-{
-	SIG( "glDepthFunc" );
-	dllDepthFunc( func );
-}
-
-static void APIENTRY logDepthMask(GLboolean flag)
-{
-	SIG( "glDepthMask" );
-	dllDepthMask( flag );
-}
-
-static void APIENTRY logDepthRange(GLclampd zNear, GLclampd zFar)
-{
-	SIG( "glDepthRange" );
-	dllDepthRange( zNear, zFar );
-}
-
-static void APIENTRY logDisable(GLenum cap)
-{
-	fprintf( glw_state.log_fp, "glDisable( 0x%x )\n", cap );
-	dllDisable( cap );
-}
-
-static void APIENTRY logDisableClientState(GLenum array)
-{
-	SIG( "glDisableClientState" );
-	dllDisableClientState( array );
-}
-
-static void APIENTRY logDrawArrays(GLenum mode, GLint first, GLsizei count)
-{
-	SIG( "glDrawArrays" );
-	dllDrawArrays( mode, first, count );
-}
-
-static void APIENTRY logDrawBuffer(GLenum mode)
-{
-	SIG( "glDrawBuffer" );
-	dllDrawBuffer( mode );
-}
-
-static void APIENTRY logDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
-{
-	SIG( "glDrawElements" );
-	dllDrawElements( mode, count, type, indices );
-}
-
-static void APIENTRY logDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glDrawPixels" );
-	dllDrawPixels( width, height, format, type, pixels );
-}
-
-static void APIENTRY logEdgeFlag(GLboolean flag)
-{
-	SIG( "glEdgeFlag" );
-	dllEdgeFlag( flag );
-}
-
-static void APIENTRY logEdgeFlagPointer(GLsizei stride, const void *pointer)
-{
-	SIG( "glEdgeFlagPointer" );
-	dllEdgeFlagPointer( stride, pointer );
-}
-
-static void APIENTRY logEdgeFlagv(const GLboolean *flag)
-{
-	SIG( "glEdgeFlagv" );
-	dllEdgeFlagv( flag );
-}
-
-static void APIENTRY logEnable(GLenum cap)
-{
-	fprintf( glw_state.log_fp, "glEnable( 0x%x )\n", cap );
-	dllEnable( cap );
-}
-
-static void APIENTRY logEnableClientState(GLenum array)
-{
-	SIG( "glEnableClientState" );
-	dllEnableClientState( array );
-}
-
-static void APIENTRY logEnd(void)
-{
-	SIG( "glEnd" );
-	dllEnd();
-}
-
-static void APIENTRY logEndList(void)
-{
-	SIG( "glEndList" );
-	dllEndList();
-}
-
-static void APIENTRY logEvalCoord1d(GLdouble u)
-{
-	SIG( "glEvalCoord1d" );
-	dllEvalCoord1d( u );
-}
-
-static void APIENTRY logEvalCoord1dv(const GLdouble *u)
-{
-	SIG( "glEvalCoord1dv" );
-	dllEvalCoord1dv( u );
-}
-
-static void APIENTRY logEvalCoord1f(GLfloat u)
-{
-	SIG( "glEvalCoord1f" );
-	dllEvalCoord1f( u );
-}
-
-static void APIENTRY logEvalCoord1fv(const GLfloat *u)
-{
-	SIG( "glEvalCoord1fv" );
-	dllEvalCoord1fv( u );
-}
-static void APIENTRY logEvalCoord2d(GLdouble u, GLdouble v)
-{
-	SIG( "glEvalCoord2d" );
-	dllEvalCoord2d( u, v );
-}
-static void APIENTRY logEvalCoord2dv(const GLdouble *u)
-{
-	SIG( "glEvalCoord2dv" );
-	dllEvalCoord2dv( u );
-}
-static void APIENTRY logEvalCoord2f(GLfloat u, GLfloat v)
-{
-	SIG( "glEvalCoord2f" );
-	dllEvalCoord2f( u, v );
-}
-static void APIENTRY logEvalCoord2fv(const GLfloat *u)
-{
-	SIG( "glEvalCoord2fv" );
-	dllEvalCoord2fv( u );
-}
-
-static void APIENTRY logEvalMesh1(GLenum mode, GLint i1, GLint i2)
-{
-	SIG( "glEvalMesh1" );
-	dllEvalMesh1( mode, i1, i2 );
-}
-static void APIENTRY logEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
-{
-	SIG( "glEvalMesh2" );
-	dllEvalMesh2( mode, i1, i2, j1, j2 );
-}
-static void APIENTRY logEvalPoint1(GLint i)
-{
-	SIG( "glEvalPoint1" );
-	dllEvalPoint1( i );
-}
-static void APIENTRY logEvalPoint2(GLint i, GLint j)
-{
-	SIG( "glEvalPoint2" );
-	dllEvalPoint2( i, j );
-}
-
-static void APIENTRY logFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
-{
-	SIG( "glFeedbackBuffer" );
-	dllFeedbackBuffer( size, type, buffer );
-}
-
-static void APIENTRY logFinish(void)
-{
-	SIG( "glFinish" );
-	dllFinish();
-}
-
-static void APIENTRY logFlush(void)
-{
-	SIG( "glFlush" );
-	dllFlush();
-}
-
-static void APIENTRY logFogf(GLenum pname, GLfloat param)
-{
-	SIG( "glFogf" );
-	dllFogf( pname, param );
-}
-
-static void APIENTRY logFogfv(GLenum pname, const GLfloat *params)
-{
-	SIG( "glFogfv" );
-	dllFogfv( pname, params );
-}
-
-static void APIENTRY logFogi(GLenum pname, GLint param)
-{
-	SIG( "glFogi" );
-	dllFogi( pname, param );
-}
-
-static void APIENTRY logFogiv(GLenum pname, const GLint *params)
-{
-	SIG( "glFogiv" );
-	dllFogiv( pname, params );
-}
-
-static void APIENTRY logFrontFace(GLenum mode)
-{
-	SIG( "glFrontFace" );
-	dllFrontFace( mode );
-}
-
-static void APIENTRY logFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	SIG( "glFrustum" );
-	dllFrustum( left, right, bottom, top, zNear, zFar );
-}
-
-static GLuint APIENTRY logGenLists(GLsizei range)
-{
-	SIG( "glGenLists" );
-	return dllGenLists( range );
-}
-
-static void APIENTRY logGenTextures(GLsizei n, GLuint *textures)
-{
-	SIG( "glGenTextures" );
-	dllGenTextures( n, textures );
-}
-
-static void APIENTRY logGetBooleanv(GLenum pname, GLboolean *params)
-{
-	SIG( "glGetBooleanv" );
-	dllGetBooleanv( pname, params );
-}
-
-static void APIENTRY logGetClipPlane(GLenum plane, GLdouble *equation)
-{
-	SIG( "glGetClipPlane" );
-	dllGetClipPlane( plane, equation );
-}
-
-static void APIENTRY logGetDoublev(GLenum pname, GLdouble *params)
-{
-	SIG( "glGetDoublev" );
-	dllGetDoublev( pname, params );
-}
-
-static GLenum APIENTRY logGetError(void)
-{
-	SIG( "glGetError" );
-	return dllGetError();
-}
-
-static void APIENTRY logGetFloatv(GLenum pname, GLfloat *params)
-{
-	SIG( "glGetFloatv" );
-	dllGetFloatv( pname, params );
-}
-
-static void APIENTRY logGetIntegerv(GLenum pname, GLint *params)
-{
-	SIG( "glGetIntegerv" );
-	dllGetIntegerv( pname, params );
-}
-
-static void APIENTRY logGetLightfv(GLenum light, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetLightfv" );
-	dllGetLightfv( light, pname, params );
-}
-
-static void APIENTRY logGetLightiv(GLenum light, GLenum pname, GLint *params)
-{
-	SIG( "glGetLightiv" );
-	dllGetLightiv( light, pname, params );
-}
-
-static void APIENTRY logGetMapdv(GLenum target, GLenum query, GLdouble *v)
-{
-	SIG( "glGetMapdv" );
-	dllGetMapdv( target, query, v );
-}
-
-static void APIENTRY logGetMapfv(GLenum target, GLenum query, GLfloat *v)
-{
-	SIG( "glGetMapfv" );
-	dllGetMapfv( target, query, v );
-}
-
-static void APIENTRY logGetMapiv(GLenum target, GLenum query, GLint *v)
-{
-	SIG( "glGetMapiv" );
-	dllGetMapiv( target, query, v );
-}
-
-static void APIENTRY logGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetMaterialfv" );
-	dllGetMaterialfv( face, pname, params );
-}
-
-static void APIENTRY logGetMaterialiv(GLenum face, GLenum pname, GLint *params)
-{
-	SIG( "glGetMaterialiv" );
-	dllGetMaterialiv( face, pname, params );
-}
-
-static void APIENTRY logGetPixelMapfv(GLenum map, GLfloat *values)
-{
-	SIG( "glGetPixelMapfv" );
-	dllGetPixelMapfv( map, values );
-}
-
-static void APIENTRY logGetPixelMapuiv(GLenum map, GLuint *values)
-{
-	SIG( "glGetPixelMapuiv" );
-	dllGetPixelMapuiv( map, values );
-}
-
-static void APIENTRY logGetPixelMapusv(GLenum map, GLushort *values)
-{
-	SIG( "glGetPixelMapusv" );
-	dllGetPixelMapusv( map, values );
-}
-
-static void APIENTRY logGetPointerv(GLenum pname, GLvoid* *params)
-{
-	SIG( "glGetPointerv" );
-	dllGetPointerv( pname, params );
-}
-
-static void APIENTRY logGetPolygonStipple(GLubyte *mask)
-{
-	SIG( "glGetPolygonStipple" );
-	dllGetPolygonStipple( mask );
-}
-
-static const GLubyte * APIENTRY logGetString(GLenum name)
-{
-	SIG( "glGetString" );
-	return dllGetString( name );
-}
-
-static void APIENTRY logGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexEnvfv" );
-	dllGetTexEnvfv( target, pname, params );
-}
-
-static void APIENTRY logGetTexEnviv(GLenum target, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexEnviv" );
-	dllGetTexEnviv( target, pname, params );
-}
-
-static void APIENTRY logGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
-{
-	SIG( "glGetTexGendv" );
-	dllGetTexGendv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexGenfv" );
-	dllGetTexGenfv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexGeniv" );
-	dllGetTexGeniv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
-{
-	SIG( "glGetTexImage" );
-	dllGetTexImage( target, level, format, type, pixels );
-}
-static void APIENTRY logGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params )
-{
-	SIG( "glGetTexLevelParameterfv" );
-	dllGetTexLevelParameterfv( target, level, pname, params );
-}
-
-static void APIENTRY logGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexLevelParameteriv" );
-	dllGetTexLevelParameteriv( target, level, pname, params );
-}
-
-static void APIENTRY logGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexParameterfv" );
-	dllGetTexParameterfv( target, pname, params );
-}
-
-static void APIENTRY logGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexParameteriv" );
-	dllGetTexParameteriv( target, pname, params );
-}
-
-static void APIENTRY logHint(GLenum target, GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glHint( 0x%x, 0x%x )\n", target, mode );
-	dllHint( target, mode );
-}
-
-static void APIENTRY logIndexMask(GLuint mask)
-{
-	SIG( "glIndexMask" );
-	dllIndexMask( mask );
-}
-
-static void APIENTRY logIndexPointer(GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glIndexPointer" );
-	dllIndexPointer( type, stride, pointer );
-}
-
-static void APIENTRY logIndexd(GLdouble c)
-{
-	SIG( "glIndexd" );
-	dllIndexd( c );
-}
-
-static void APIENTRY logIndexdv(const GLdouble *c)
-{
-	SIG( "glIndexdv" );
-	dllIndexdv( c );
-}
-
-static void APIENTRY logIndexf(GLfloat c)
-{
-	SIG( "glIndexf" );
-	dllIndexf( c );
-}
-
-static void APIENTRY logIndexfv(const GLfloat *c)
-{
-	SIG( "glIndexfv" );
-	dllIndexfv( c );
-}
-
-static void APIENTRY logIndexi(GLint c)
-{
-	SIG( "glIndexi" );
-	dllIndexi( c );
-}
-
-static void APIENTRY logIndexiv(const GLint *c)
-{
-	SIG( "glIndexiv" );
-	dllIndexiv( c );
-}
-
-static void APIENTRY logIndexs(GLshort c)
-{
-	SIG( "glIndexs" );
-	dllIndexs( c );
-}
-
-static void APIENTRY logIndexsv(const GLshort *c)
-{
-	SIG( "glIndexsv" );
-	dllIndexsv( c );
-}
-
-static void APIENTRY logIndexub(GLubyte c)
-{
-	SIG( "glIndexub" );
-	dllIndexub( c );
-}
-
-static void APIENTRY logIndexubv(const GLubyte *c)
-{
-	SIG( "glIndexubv" );
-	dllIndexubv( c );
-}
-
-static void APIENTRY logInitNames(void)
-{
-	SIG( "glInitNames" );
-	dllInitNames();
-}
-
-static void APIENTRY logInterleavedArrays(GLenum format, GLsizei stride, const void *pointer)
-{
-	SIG( "glInterleavedArrays" );
-	dllInterleavedArrays( format, stride, pointer );
-}
-
-static GLboolean APIENTRY logIsEnabled(GLenum cap)
-{
-	SIG( "glIsEnabled" );
-	return dllIsEnabled( cap );
-}
-static GLboolean APIENTRY logIsList(GLuint list)
-{
-	SIG( "glIsList" );
-	return dllIsList( list );
-}
-static GLboolean APIENTRY logIsTexture(GLuint texture)
-{
-	SIG( "glIsTexture" );
-	return dllIsTexture( texture );
-}
-
-static void APIENTRY logLightModelf(GLenum pname, GLfloat param)
-{
-	SIG( "glLightModelf" );
-	dllLightModelf( pname, param );
-}
-
-static void APIENTRY logLightModelfv(GLenum pname, const GLfloat *params)
-{
-	SIG( "glLightModelfv" );
-	dllLightModelfv( pname, params );
-}
-
-static void APIENTRY logLightModeli(GLenum pname, GLint param)
-{
-	SIG( "glLightModeli" );
-	dllLightModeli( pname, param );
-
-}
-
-static void APIENTRY logLightModeliv(GLenum pname, const GLint *params)
-{
-	SIG( "glLightModeliv" );
-	dllLightModeliv( pname, params );
-}
-
-static void APIENTRY logLightf(GLenum light, GLenum pname, GLfloat param)
-{
-	SIG( "glLightf" );
-	dllLightf( light, pname, param );
-}
-
-static void APIENTRY logLightfv(GLenum light, GLenum pname, const GLfloat *params)
-{
-	SIG( "glLightfv" );
-	dllLightfv( light, pname, params );
-}
-
-static void APIENTRY logLighti(GLenum light, GLenum pname, GLint param)
-{
-	SIG( "glLighti" );
-	dllLighti( light, pname, param );
-}
-
-static void APIENTRY logLightiv(GLenum light, GLenum pname, const GLint *params)
-{
-	SIG( "glLightiv" );
-	dllLightiv( light, pname, params );
-}
-
-static void APIENTRY logLineStipple(GLint factor, GLushort pattern)
-{
-	SIG( "glLineStipple" );
-	dllLineStipple( factor, pattern );
-}
-
-static void APIENTRY logLineWidth(GLfloat width)
-{
-	SIG( "glLineWidth" );
-	dllLineWidth( width );
-}
-
-static void APIENTRY logListBase(GLuint base)
-{
-	SIG( "glListBase" );
-	dllListBase( base );
-}
-
-static void APIENTRY logLoadIdentity(void)
-{
-	SIG( "glLoadIdentity" );
-	dllLoadIdentity();
-}
-
-static void APIENTRY logLoadMatrixd(const GLdouble *m)
-{
-	SIG( "glLoadMatrixd" );
-	dllLoadMatrixd( m );
-}
-
-static void APIENTRY logLoadMatrixf(const GLfloat *m)
-{
-	SIG( "glLoadMatrixf" );
-	dllLoadMatrixf( m );
-}
-
-static void APIENTRY logLoadName(GLuint name)
-{
-	SIG( "glLoadName" );
-	dllLoadName( name );
-}
-
-static void APIENTRY logLogicOp(GLenum opcode)
-{
-	SIG( "glLogicOp" );
-	dllLogicOp( opcode );
-}
-
-static void APIENTRY logMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
-{
-	SIG( "glMap1d" );
-	dllMap1d( target, u1, u2, stride, order, points );
-}
-
-static void APIENTRY logMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
-{
-	SIG( "glMap1f" );
-	dllMap1f( target, u1, u2, stride, order, points );
-}
-
-static void APIENTRY logMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
-{
-	SIG( "glMap2d" );
-	dllMap2d( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
-}
-
-static void APIENTRY logMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
-{
-	SIG( "glMap2f" );
-	dllMap2f( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
-}
-
-static void APIENTRY logMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
-{
-	SIG( "glMapGrid1d" );
-	dllMapGrid1d( un, u1, u2 );
-}
-
-static void APIENTRY logMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
-{
-	SIG( "glMapGrid1f" );
-	dllMapGrid1f( un, u1, u2 );
-}
-
-static void APIENTRY logMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
-{
-	SIG( "glMapGrid2d" );
-	dllMapGrid2d( un, u1, u2, vn, v1, v2 );
-}
-static void APIENTRY logMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
-{
-	SIG( "glMapGrid2f" );
-	dllMapGrid2f( un, u1, u2, vn, v1, v2 );
-}
-static void APIENTRY logMaterialf(GLenum face, GLenum pname, GLfloat param)
-{
-	SIG( "glMaterialf" );
-	dllMaterialf( face, pname, param );
-}
-static void APIENTRY logMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
-{
-	SIG( "glMaterialfv" );
-	dllMaterialfv( face, pname, params );
-}
-
-static void APIENTRY logMateriali(GLenum face, GLenum pname, GLint param)
-{
-	SIG( "glMateriali" );
-	dllMateriali( face, pname, param );
-}
-
-static void APIENTRY logMaterialiv(GLenum face, GLenum pname, const GLint *params)
-{
-	SIG( "glMaterialiv" );
-	dllMaterialiv( face, pname, params );
-}
-
-static void APIENTRY logMatrixMode(GLenum mode)
-{
-	SIG( "glMatrixMode" );
-	dllMatrixMode( mode );
-}
-
-static void APIENTRY logMultMatrixd(const GLdouble *m)
-{
-	SIG( "glMultMatrixd" );
-	dllMultMatrixd( m );
-}
-
-static void APIENTRY logMultMatrixf(const GLfloat *m)
-{
-	SIG( "glMultMatrixf" );
-	dllMultMatrixf( m );
-}
-
-static void APIENTRY logNewList(GLuint list, GLenum mode)
-{
-	SIG( "glNewList" );
-	dllNewList( list, mode );
-}
-
-static void APIENTRY logNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
-{
-	SIG ("glNormal3b" );
-	dllNormal3b( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3bv(const GLbyte *v)
-{
-	SIG( "glNormal3bv" );
-	dllNormal3bv( v );
-}
-
-static void APIENTRY logNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
-{
-	SIG( "glNormal3d" );
-	dllNormal3d( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3dv(const GLdouble *v)
-{
-	SIG( "glNormal3dv" );
-	dllNormal3dv( v );
-}
-
-static void APIENTRY logNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
-{
-	SIG( "glNormal3f" );
-	dllNormal3f( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3fv(const GLfloat *v)
-{
-	SIG( "glNormal3fv" );
-	dllNormal3fv( v );
-}
-static void APIENTRY logNormal3i(GLint nx, GLint ny, GLint nz)
-{
-	SIG( "glNormal3i" );
-	dllNormal3i( nx, ny, nz );
-}
-static void APIENTRY logNormal3iv(const GLint *v)
-{
-	SIG( "glNormal3iv" );
-	dllNormal3iv( v );
-}
-static void APIENTRY logNormal3s(GLshort nx, GLshort ny, GLshort nz)
-{
-	SIG( "glNormal3s" );
-	dllNormal3s( nx, ny, nz );
-}
-static void APIENTRY logNormal3sv(const GLshort *v)
-{
-	SIG( "glNormal3sv" );
-	dllNormal3sv( v );
-}
-static void APIENTRY logNormalPointer(GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glNormalPointer" );
-	dllNormalPointer( type, stride, pointer );
-}
-static void APIENTRY logOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	SIG( "glOrtho" );
-	dllOrtho( left, right, bottom, top, zNear, zFar );
-}
-
-static void APIENTRY logPassThrough(GLfloat token)
-{
-	SIG( "glPassThrough" );
-	dllPassThrough( token );
-}
-
-static void APIENTRY logPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat *values)
-{
-	SIG( "glPixelMapfv" );
-	dllPixelMapfv( map, mapsize, values );
-}
-
-static void APIENTRY logPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values)
-{
-	SIG( "glPixelMapuiv" );
-	dllPixelMapuiv( map, mapsize, values );
-}
-
-static void APIENTRY logPixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values)
-{
-	SIG( "glPixelMapusv" );
-	dllPixelMapusv( map, mapsize, values );
-}
-static void APIENTRY logPixelStoref(GLenum pname, GLfloat param)
-{
-	SIG( "glPixelStoref" );
-	dllPixelStoref( pname, param );
-}
-static void APIENTRY logPixelStorei(GLenum pname, GLint param)
-{
-	SIG( "glPixelStorei" );
-	dllPixelStorei( pname, param );
-}
-static void APIENTRY logPixelTransferf(GLenum pname, GLfloat param)
-{
-	SIG( "glPixelTransferf" );
-	dllPixelTransferf( pname, param );
-}
-
-static void APIENTRY logPixelTransferi(GLenum pname, GLint param)
-{
-	SIG( "glPixelTransferi" );
-	dllPixelTransferi( pname, param );
-}
-
-static void APIENTRY logPixelZoom(GLfloat xfactor, GLfloat yfactor)
-{
-	SIG( "glPixelZoom" );
-	dllPixelZoom( xfactor, yfactor );
-}
-
-static void APIENTRY logPointSize(GLfloat size)
-{
-	SIG( "glPointSize" );
-	dllPointSize( size );
-}
-
-static void APIENTRY logPolygonMode(GLenum face, GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glPolygonMode( 0x%x, 0x%x )\n", face, mode );
-	dllPolygonMode( face, mode );
-}
-
-static void APIENTRY logPolygonOffset(GLfloat factor, GLfloat units)
-{
-	SIG( "glPolygonOffset" );
-	dllPolygonOffset( factor, units );
-}
-static void APIENTRY logPolygonStipple(const GLubyte *mask )
-{
-	SIG( "glPolygonStipple" );
-	dllPolygonStipple( mask );
-}
-static void APIENTRY logPopAttrib(void)
-{
-	SIG( "glPopAttrib" );
-	dllPopAttrib();
-}
-
-static void APIENTRY logPopClientAttrib(void)
-{
-	SIG( "glPopClientAttrib" );
-	dllPopClientAttrib();
-}
-
-static void APIENTRY logPopMatrix(void)
-{
-	SIG( "glPopMatrix" );
-	dllPopMatrix();
-}
-
-static void APIENTRY logPopName(void)
-{
-	SIG( "glPopName" );
-	dllPopName();
-}
-
-static void APIENTRY logPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *priorities)
-{
-	SIG( "glPrioritizeTextures" );
-	dllPrioritizeTextures( n, textures, priorities );
-}
-
-static void APIENTRY logPushAttrib(GLbitfield mask)
-{
-	SIG( "glPushAttrib" );
-	dllPushAttrib( mask );
-}
-
-static void APIENTRY logPushClientAttrib(GLbitfield mask)
-{
-	SIG( "glPushClientAttrib" );
-	dllPushClientAttrib( mask );
-}
-
-static void APIENTRY logPushMatrix(void)
-{
-	SIG( "glPushMatrix" );
-	dllPushMatrix();
-}
-
-static void APIENTRY logPushName(GLuint name)
-{
-	SIG( "glPushName" );
-	dllPushName( name );
-}
-
-static void APIENTRY logRasterPos2d(GLdouble x, GLdouble y)
-{
-	SIG ("glRasterPot2d" );
-	dllRasterPos2d( x, y );
-}
-
-static void APIENTRY logRasterPos2dv(const GLdouble *v)
-{
-	SIG( "glRasterPos2dv" );
-	dllRasterPos2dv( v );
-}
-
-static void APIENTRY logRasterPos2f(GLfloat x, GLfloat y)
-{
-	SIG( "glRasterPos2f" );
-	dllRasterPos2f( x, y );
-}
-static void APIENTRY logRasterPos2fv(const GLfloat *v)
-{
-	SIG( "glRasterPos2dv" );
-	dllRasterPos2fv( v );
-}
-static void APIENTRY logRasterPos2i(GLint x, GLint y)
-{
-	SIG( "glRasterPos2if" );
-	dllRasterPos2i( x, y );
-}
-static void APIENTRY logRasterPos2iv(const GLint *v)
-{
-	SIG( "glRasterPos2iv" );
-	dllRasterPos2iv( v );
-}
-static void APIENTRY logRasterPos2s(GLshort x, GLshort y)
-{
-	SIG( "glRasterPos2s" );
-	dllRasterPos2s( x, y );
-}
-static void APIENTRY logRasterPos2sv(const GLshort *v)
-{
-	SIG( "glRasterPos2sv" );
-	dllRasterPos2sv( v );
-}
-static void APIENTRY logRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glRasterPos3d" );
-	dllRasterPos3d( x, y, z );
-}
-static void APIENTRY logRasterPos3dv(const GLdouble *v)
-{
-	SIG( "glRasterPos3dv" );
-	dllRasterPos3dv( v );
-}
-static void APIENTRY logRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glRasterPos3f" );
-	dllRasterPos3f( x, y, z );
-}
-static void APIENTRY logRasterPos3fv(const GLfloat *v)
-{
-	SIG( "glRasterPos3fv" );
-	dllRasterPos3fv( v );
-}
-static void APIENTRY logRasterPos3i(GLint x, GLint y, GLint z)
-{
-	SIG( "glRasterPos3i" );
-	dllRasterPos3i( x, y, z );
-}
-static void APIENTRY logRasterPos3iv(const GLint *v)
-{
-	SIG( "glRasterPos3iv" );
-	dllRasterPos3iv( v );
-}
-static void APIENTRY logRasterPos3s(GLshort x, GLshort y, GLshort z)
-{
-	SIG( "glRasterPos3s" );
-	dllRasterPos3s( x, y, z );
-}
-static void APIENTRY logRasterPos3sv(const GLshort *v)
-{
-	SIG( "glRasterPos3sv" );
-	dllRasterPos3sv( v );
-}
-static void APIENTRY logRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	SIG( "glRasterPos4d" );
-	dllRasterPos4d( x, y, z, w );
-}
-static void APIENTRY logRasterPos4dv(const GLdouble *v)
-{
-	SIG( "glRasterPos4dv" );
-	dllRasterPos4dv( v );
-}
-static void APIENTRY logRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	SIG( "glRasterPos4f" );
-	dllRasterPos4f( x, y, z, w );
-}
-static void APIENTRY logRasterPos4fv(const GLfloat *v)
-{
-	SIG( "glRasterPos4fv" );
-	dllRasterPos4fv( v );
-}
-static void APIENTRY logRasterPos4i(GLint x, GLint y, GLint z, GLint w)
-{
-	SIG( "glRasterPos4i" );
-	dllRasterPos4i( x, y, z, w );
-}
-static void APIENTRY logRasterPos4iv(const GLint *v)
-{
-	SIG( "glRasterPos4iv" );
-	dllRasterPos4iv( v );
-}
-static void APIENTRY logRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	SIG( "glRasterPos4s" );
-	dllRasterPos4s( x, y, z, w );
-}
-static void APIENTRY logRasterPos4sv(const GLshort *v)
-{
-	SIG( "glRasterPos4sv" );
-	dllRasterPos4sv( v );
-}
-static void APIENTRY logReadBuffer(GLenum mode)
-{
-	SIG( "glReadBuffer" );
-	dllReadBuffer( mode );
-}
-static void APIENTRY logReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
-{
-	SIG( "glReadPixels" );
-	dllReadPixels( x, y, width, height, format, type, pixels );
-}
-
-static void APIENTRY logRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-{
-	SIG( "glRectd" );
-	dllRectd( x1, y1, x2, y2 );
-}
-
-static void APIENTRY logRectdv(const GLdouble *v1, const GLdouble *v2)
-{
-	SIG( "glRectdv" );
-	dllRectdv( v1, v2 );
-}
-
-static void APIENTRY logRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
-{
-	SIG( "glRectf" );
-	dllRectf( x1, y1, x2, y2 );
-}
-
-static void APIENTRY logRectfv(const GLfloat *v1, const GLfloat *v2)
-{
-	SIG( "glRectfv" );
-	dllRectfv( v1, v2 );
-}
-static void APIENTRY logRecti(GLint x1, GLint y1, GLint x2, GLint y2)
-{
-	SIG( "glRecti" );
-	dllRecti( x1, y1, x2, y2 );
-}
-static void APIENTRY logRectiv(const GLint *v1, const GLint *v2)
-{
-	SIG( "glRectiv" );
-	dllRectiv( v1, v2 );
-}
-static void APIENTRY logRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
-{
-	SIG( "glRects" );
-	dllRects( x1, y1, x2, y2 );
-}
-static void APIENTRY logRectsv(const GLshort *v1, const GLshort *v2)
-{
-	SIG( "glRectsv" );
-	dllRectsv( v1, v2 );
-}
-static GLint APIENTRY logRenderMode(GLenum mode)
-{
-	SIG( "glRenderMode" );
-	return dllRenderMode( mode );
-}
-static void APIENTRY logRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glRotated" );
-	dllRotated( angle, x, y, z );
-}
-
-static void APIENTRY logRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glRotatef" );
-	dllRotatef( angle, x, y, z );
-}
-
-static void APIENTRY logScaled(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glScaled" );
-	dllScaled( x, y, z );
-}
-
-static void APIENTRY logScalef(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glScalef" );
-	dllScalef( x, y, z );
-}
-
-static void APIENTRY logScissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	SIG( "glScissor" );
-	dllScissor( x, y, width, height );
-}
-
-static void APIENTRY logSelectBuffer(GLsizei size, GLuint *buffer)
-{
-	SIG( "glSelectBuffer" );
-	dllSelectBuffer( size, buffer );
-}
-
-static void APIENTRY logShadeModel(GLenum mode)
-{
-	SIG( "glShadeModel" );
-	dllShadeModel( mode );
-}
-
-static void APIENTRY logStencilFunc(GLenum func, GLint ref, GLuint mask)
-{
-	SIG( "glStencilFunc" );
-	dllStencilFunc( func, ref, mask );
-}
-
-static void APIENTRY logStencilMask(GLuint mask)
-{
-	SIG( "glStencilMask" );
-	dllStencilMask( mask );
-}
-
-static void APIENTRY logStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-	SIG( "glStencilOp" );
-	dllStencilOp( fail, zfail, zpass );
-}
-
-static void APIENTRY logTexCoord1d(GLdouble s)
-{
-	SIG( "glTexCoord1d" );
-	dllTexCoord1d( s );
-}
-
-static void APIENTRY logTexCoord1dv(const GLdouble *v)
-{
-	SIG( "glTexCoord1dv" );
-	dllTexCoord1dv( v );
-}
-
-static void APIENTRY logTexCoord1f(GLfloat s)
-{
-	SIG( "glTexCoord1f" );
-	dllTexCoord1f( s );
-}
-static void APIENTRY logTexCoord1fv(const GLfloat *v)
-{
-	SIG( "glTexCoord1fv" );
-	dllTexCoord1fv( v );
-}
-static void APIENTRY logTexCoord1i(GLint s)
-{
-	SIG( "glTexCoord1i" );
-	dllTexCoord1i( s );
-}
-static void APIENTRY logTexCoord1iv(const GLint *v)
-{
-	SIG( "glTexCoord1iv" );
-	dllTexCoord1iv( v );
-}
-static void APIENTRY logTexCoord1s(GLshort s)
-{
-	SIG( "glTexCoord1s" );
-	dllTexCoord1s( s );
-}
-static void APIENTRY logTexCoord1sv(const GLshort *v)
-{
-	SIG( "glTexCoord1sv" );
-	dllTexCoord1sv( v );
-}
-static void APIENTRY logTexCoord2d(GLdouble s, GLdouble t)
-{
-	SIG( "glTexCoord2d" );
-	dllTexCoord2d( s, t );
-}
-
-static void APIENTRY logTexCoord2dv(const GLdouble *v)
-{
-	SIG( "glTexCoord2dv" );
-	dllTexCoord2dv( v );
-}
-static void APIENTRY logTexCoord2f(GLfloat s, GLfloat t)
-{
-	SIG( "glTexCoord2f" );
-	dllTexCoord2f( s, t );
-}
-static void APIENTRY logTexCoord2fv(const GLfloat *v)
-{
-	SIG( "glTexCoord2fv" );
-	dllTexCoord2fv( v );
-}
-static void APIENTRY logTexCoord2i(GLint s, GLint t)
-{
-	SIG( "glTexCoord2i" );
-	dllTexCoord2i( s, t );
-}
-static void APIENTRY logTexCoord2iv(const GLint *v)
-{
-	SIG( "glTexCoord2iv" );
-	dllTexCoord2iv( v );
-}
-static void APIENTRY logTexCoord2s(GLshort s, GLshort t)
-{
-	SIG( "glTexCoord2s" );
-	dllTexCoord2s( s, t );
-}
-static void APIENTRY logTexCoord2sv(const GLshort *v)
-{
-	SIG( "glTexCoord2sv" );
-	dllTexCoord2sv( v );
-}
-static void APIENTRY logTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
-{
-	SIG( "glTexCoord3d" );
-	dllTexCoord3d( s, t, r );
-}
-static void APIENTRY logTexCoord3dv(const GLdouble *v)
-{
-	SIG( "glTexCoord3dv" );
-	dllTexCoord3dv( v );
-}
-static void APIENTRY logTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
-{
-	SIG( "glTexCoord3f" );
-	dllTexCoord3f( s, t, r );
-}
-static void APIENTRY logTexCoord3fv(const GLfloat *v)
-{
-	SIG( "glTexCoord3fv" );
-	dllTexCoord3fv( v );
-}
-static void APIENTRY logTexCoord3i(GLint s, GLint t, GLint r)
-{
-	SIG( "glTexCoord3i" );
-	dllTexCoord3i( s, t, r );
-}
-static void APIENTRY logTexCoord3iv(const GLint *v)
-{
-	SIG( "glTexCoord3iv" );
-	dllTexCoord3iv( v );
-}
-static void APIENTRY logTexCoord3s(GLshort s, GLshort t, GLshort r)
-{
-	SIG( "glTexCoord3s" );
-	dllTexCoord3s( s, t, r );
-}
-static void APIENTRY logTexCoord3sv(const GLshort *v)
-{
-	SIG( "glTexCoord3sv" );
-	dllTexCoord3sv( v );
-}
-static void APIENTRY logTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-	SIG( "glTexCoord4d" );
-	dllTexCoord4d( s, t, r, q );
-}
-static void APIENTRY logTexCoord4dv(const GLdouble *v)
-{
-	SIG( "glTexCoord4dv" );
-	dllTexCoord4dv( v );
-}
-static void APIENTRY logTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-	SIG( "glTexCoord4f" );
-	dllTexCoord4f( s, t, r, q );
-}
-static void APIENTRY logTexCoord4fv(const GLfloat *v)
-{
-	SIG( "glTexCoord4fv" );
-	dllTexCoord4fv( v );
-}
-static void APIENTRY logTexCoord4i(GLint s, GLint t, GLint r, GLint q)
-{
-	SIG( "glTexCoord4i" );
-	dllTexCoord4i( s, t, r, q );
-}
-static void APIENTRY logTexCoord4iv(const GLint *v)
-{
-	SIG( "glTexCoord4iv" );
-	dllTexCoord4iv( v );
-}
-static void APIENTRY logTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
-{
-	SIG( "glTexCoord4s" );
-	dllTexCoord4s( s, t, r, q );
-}
-static void APIENTRY logTexCoord4sv(const GLshort *v)
-{
-	SIG( "glTexCoord4sv" );
-	dllTexCoord4sv( v );
-}
-static void APIENTRY logTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glTexCoordPointer" );
-	dllTexCoordPointer( size, type, stride, pointer );
-}
-
-static void APIENTRY logTexEnvf(GLenum target, GLenum pname, GLfloat param)
-{
-	fprintf( glw_state.log_fp, "glTexEnvf( 0x%x, 0x%x, %f )\n", target, pname, param );
-	dllTexEnvf( target, pname, param );
-}
-
-static void APIENTRY logTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexEnvfv" );
-	dllTexEnvfv( target, pname, params );
-}
-
-static void APIENTRY logTexEnvi(GLenum target, GLenum pname, GLint param)
-{
-	fprintf( glw_state.log_fp, "glTexEnvi( 0x%x, 0x%x, 0x%x )\n", target, pname, param );
-	dllTexEnvi( target, pname, param );
-}
-static void APIENTRY logTexEnviv(GLenum target, GLenum pname, const GLint *params)
-{
-	SIG( "glTexEnviv" );
-	dllTexEnviv( target, pname, params );
-}
-
-static void APIENTRY logTexGend(GLenum coord, GLenum pname, GLdouble param)
-{
-	SIG( "glTexGend" );
-	dllTexGend( coord, pname, param );
-}
-
-static void APIENTRY logTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
-{
-	SIG( "glTexGendv" );
-	dllTexGendv( coord, pname, params );
-}
-
-static void APIENTRY logTexGenf(GLenum coord, GLenum pname, GLfloat param)
-{
-	SIG( "glTexGenf" );
-	dllTexGenf( coord, pname, param );
-}
-static void APIENTRY logTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexGenfv" );
-	dllTexGenfv( coord, pname, params );
-}
-static void APIENTRY logTexGeni(GLenum coord, GLenum pname, GLint param)
-{
-	SIG( "glTexGeni" );
-	dllTexGeni( coord, pname, param );
-}
-static void APIENTRY logTexGeniv(GLenum coord, GLenum pname, const GLint *params)
-{
-	SIG( "glTexGeniv" );
-	dllTexGeniv( coord, pname, params );
-}
-static void APIENTRY logTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexImage1D" );
-	dllTexImage1D( target, level, internalformat, width, border, format, type, pixels );
-}
-static void APIENTRY logTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexImage2D" );
-	dllTexImage2D( target, level, internalformat, width, height, border, format, type, pixels );
-}
-
-static void APIENTRY logTexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-	fprintf( glw_state.log_fp, "glTexParameterf( 0x%x, 0x%x, %f )\n", target, pname, param );
-	dllTexParameterf( target, pname, param );
-}
-
-static void APIENTRY logTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexParameterfv" );
-	dllTexParameterfv( target, pname, params );
-}
-static void APIENTRY logTexParameteri(GLenum target, GLenum pname, GLint param)
-{
-	fprintf( glw_state.log_fp, "glTexParameteri( 0x%x, 0x%x, 0x%x )\n", target, pname, param );
-	dllTexParameteri( target, pname, param );
-}
-static void APIENTRY logTexParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-	SIG( "glTexParameteriv" );
-	dllTexParameteriv( target, pname, params );
-}
-static void APIENTRY logTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexSubImage1D" );
-	dllTexSubImage1D( target, level, xoffset, width, format, type, pixels );
-}
-static void APIENTRY logTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexSubImage2D" );
-	dllTexSubImage2D( target, level, xoffset, yoffset, width, height, format, type, pixels );
-}
-static void APIENTRY logTranslated(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glTranslated" );
-	dllTranslated( x, y, z );
-}
-
-static void APIENTRY logTranslatef(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glTranslatef" );
-	dllTranslatef( x, y, z );
-}
-
-static void APIENTRY logVertex2d(GLdouble x, GLdouble y)
-{
-	SIG( "glVertex2d" );
-	dllVertex2d( x, y );
-}
-
-static void APIENTRY logVertex2dv(const GLdouble *v)
-{
-	SIG( "glVertex2dv" );
-	dllVertex2dv( v );
-}
-static void APIENTRY logVertex2f(GLfloat x, GLfloat y)
-{
-	SIG( "glVertex2f" );
-	dllVertex2f( x, y );
-}
-static void APIENTRY logVertex2fv(const GLfloat *v)
-{
-	SIG( "glVertex2fv" );
-	dllVertex2fv( v );
-}
-static void APIENTRY logVertex2i(GLint x, GLint y)
-{
-	SIG( "glVertex2i" );
-	dllVertex2i( x, y );
-}
-static void APIENTRY logVertex2iv(const GLint *v)
-{
-	SIG( "glVertex2iv" );
-	dllVertex2iv( v );
-}
-static void APIENTRY logVertex2s(GLshort x, GLshort y)
-{
-	SIG( "glVertex2s" );
-	dllVertex2s( x, y );
-}
-static void APIENTRY logVertex2sv(const GLshort *v)
-{
-	SIG( "glVertex2sv" );
-	dllVertex2sv( v );
-}
-static void APIENTRY logVertex3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glVertex3d" );
-	dllVertex3d( x, y, z );
-}
-static void APIENTRY logVertex3dv(const GLdouble *v)
-{
-	SIG( "glVertex3dv" );
-	dllVertex3dv( v );
-}
-static void APIENTRY logVertex3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glVertex3f" );
-	dllVertex3f( x, y, z );
-}
-static void APIENTRY logVertex3fv(const GLfloat *v)
-{
-	SIG( "glVertex3fv" );
-	dllVertex3fv( v );
-}
-static void APIENTRY logVertex3i(GLint x, GLint y, GLint z)
-{
-	SIG( "glVertex3i" );
-	dllVertex3i( x, y, z );
-}
-static void APIENTRY logVertex3iv(const GLint *v)
-{
-	SIG( "glVertex3iv" );
-	dllVertex3iv( v );
-}
-static void APIENTRY logVertex3s(GLshort x, GLshort y, GLshort z)
-{
-	SIG( "glVertex3s" );
-	dllVertex3s( x, y, z );
-}
-static void APIENTRY logVertex3sv(const GLshort *v)
-{
-	SIG( "glVertex3sv" );
-	dllVertex3sv( v );
-}
-static void APIENTRY logVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	SIG( "glVertex4d" );
-	dllVertex4d( x, y, z, w );
-}
-static void APIENTRY logVertex4dv(const GLdouble *v)
-{
-	SIG( "glVertex4dv" );
-	dllVertex4dv( v );
-}
-static void APIENTRY logVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	SIG( "glVertex4f" );
-	dllVertex4f( x, y, z, w );
-}
-static void APIENTRY logVertex4fv(const GLfloat *v)
-{
-	SIG( "glVertex4fv" );
-	dllVertex4fv( v );
-}
-static void APIENTRY logVertex4i(GLint x, GLint y, GLint z, GLint w)
-{
-	SIG( "glVertex4i" );
-	dllVertex4i( x, y, z, w );
-}
-static void APIENTRY logVertex4iv(const GLint *v)
-{
-	SIG( "glVertex4iv" );
-	dllVertex4iv( v );
-}
-static void APIENTRY logVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	SIG( "glVertex4s" );
-	dllVertex4s( x, y, z, w );
-}
-static void APIENTRY logVertex4sv(const GLshort *v)
-{
-	SIG( "glVertex4sv" );
-	dllVertex4sv( v );
-}
-static void APIENTRY logVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glVertexPointer" );
-	dllVertexPointer( size, type, stride, pointer );
-}
-static void APIENTRY logViewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	SIG( "glViewport" );
-	dllViewport( x, y, width, height );
-}
-
-/*
-** QGL_Shutdown
-**
-** Unloads the specified DLL then nulls out all the proc pointers.
-*/
-void QGL_Shutdown( void )
-{
-	if ( glw_state.OpenGLLib )
-	{
-		dlclose ( glw_state.OpenGLLib );
-		glw_state.OpenGLLib = NULL;
-	}
-
-	glw_state.OpenGLLib = NULL;
-
-	qglAccum                     = NULL;
-	qglAlphaFunc                 = NULL;
-	qglAreTexturesResident       = NULL;
-	qglArrayElement              = NULL;
-	qglBegin                     = NULL;
-	qglBindTexture               = NULL;
-	qglBitmap                    = NULL;
-	qglBlendFunc                 = NULL;
-	qglCallList                  = NULL;
-	qglCallLists                 = NULL;
-	qglClear                     = NULL;
-	qglClearAccum                = NULL;
-	qglClearColor                = NULL;
-	qglClearDepth                = NULL;
-	qglClearIndex                = NULL;
-	qglClearStencil              = NULL;
-	qglClipPlane                 = NULL;
-	qglColor3b                   = NULL;
-	qglColor3bv                  = NULL;
-	qglColor3d                   = NULL;
-	qglColor3dv                  = NULL;
-	qglColor3f                   = NULL;
-	qglColor3fv                  = NULL;
-	qglColor3i                   = NULL;
-	qglColor3iv                  = NULL;
-	qglColor3s                   = NULL;
-	qglColor3sv                  = NULL;
-	qglColor3ub                  = NULL;
-	qglColor3ubv                 = NULL;
-	qglColor3ui                  = NULL;
-	qglColor3uiv                 = NULL;
-	qglColor3us                  = NULL;
-	qglColor3usv                 = NULL;
-	qglColor4b                   = NULL;
-	qglColor4bv                  = NULL;
-	qglColor4d                   = NULL;
-	qglColor4dv                  = NULL;
-	qglColor4f                   = NULL;
-	qglColor4fv                  = NULL;
-	qglColor4i                   = NULL;
-	qglColor4iv                  = NULL;
-	qglColor4s                   = NULL;
-	qglColor4sv                  = NULL;
-	qglColor4ub                  = NULL;
-	qglColor4ubv                 = NULL;
-	qglColor4ui                  = NULL;
-	qglColor4uiv                 = NULL;
-	qglColor4us                  = NULL;
-	qglColor4usv                 = NULL;
-	qglColorMask                 = NULL;
-	qglColorMaterial             = NULL;
-	qglColorPointer              = NULL;
-	qglCopyPixels                = NULL;
-	qglCopyTexImage1D            = NULL;
-	qglCopyTexImage2D            = NULL;
-	qglCopyTexSubImage1D         = NULL;
-	qglCopyTexSubImage2D         = NULL;
-	qglCullFace                  = NULL;
-	qglDeleteLists               = NULL;
-	qglDeleteTextures            = NULL;
-	qglDepthFunc                 = NULL;
-	qglDepthMask                 = NULL;
-	qglDepthRange                = NULL;
-	qglDisable                   = NULL;
-	qglDisableClientState        = NULL;
-	qglDrawArrays                = NULL;
-	qglDrawBuffer                = NULL;
-	qglDrawElements              = NULL;
-	qglDrawPixels                = NULL;
-	qglEdgeFlag                  = NULL;
-	qglEdgeFlagPointer           = NULL;
-	qglEdgeFlagv                 = NULL;
-	qglEnable                    = NULL;
-	qglEnableClientState         = NULL;
-	qglEnd                       = NULL;
-	qglEndList                   = NULL;
-	qglEvalCoord1d               = NULL;
-	qglEvalCoord1dv              = NULL;
-	qglEvalCoord1f               = NULL;
-	qglEvalCoord1fv              = NULL;
-	qglEvalCoord2d               = NULL;
-	qglEvalCoord2dv              = NULL;
-	qglEvalCoord2f               = NULL;
-	qglEvalCoord2fv              = NULL;
-	qglEvalMesh1                 = NULL;
-	qglEvalMesh2                 = NULL;
-	qglEvalPoint1                = NULL;
-	qglEvalPoint2                = NULL;
-	qglFeedbackBuffer            = NULL;
-	qglFinish                    = NULL;
-	qglFlush                     = NULL;
-	qglFogf                      = NULL;
-	qglFogfv                     = NULL;
-	qglFogi                      = NULL;
-	qglFogiv                     = NULL;
-	qglFrontFace                 = NULL;
-	qglFrustum                   = NULL;
-	qglGenLists                  = NULL;
-	qglGenTextures               = NULL;
-	qglGetBooleanv               = NULL;
-	qglGetClipPlane              = NULL;
-	qglGetDoublev                = NULL;
-	qglGetError                  = NULL;
-	qglGetFloatv                 = NULL;
-	qglGetIntegerv               = NULL;
-	qglGetLightfv                = NULL;
-	qglGetLightiv                = NULL;
-	qglGetMapdv                  = NULL;
-	qglGetMapfv                  = NULL;
-	qglGetMapiv                  = NULL;
-	qglGetMaterialfv             = NULL;
-	qglGetMaterialiv             = NULL;
-	qglGetPixelMapfv             = NULL;
-	qglGetPixelMapuiv            = NULL;
-	qglGetPixelMapusv            = NULL;
-	qglGetPointerv               = NULL;
-	qglGetPolygonStipple         = NULL;
-	qglGetString                 = NULL;
-	qglGetTexEnvfv               = NULL;
-	qglGetTexEnviv               = NULL;
-	qglGetTexGendv               = NULL;
-	qglGetTexGenfv               = NULL;
-	qglGetTexGeniv               = NULL;
-	qglGetTexImage               = NULL;
-	qglGetTexLevelParameterfv    = NULL;
-	qglGetTexLevelParameteriv    = NULL;
-	qglGetTexParameterfv         = NULL;
-	qglGetTexParameteriv         = NULL;
-	qglHint                      = NULL;
-	qglIndexMask                 = NULL;
-	qglIndexPointer              = NULL;
-	qglIndexd                    = NULL;
-	qglIndexdv                   = NULL;
-	qglIndexf                    = NULL;
-	qglIndexfv                   = NULL;
-	qglIndexi                    = NULL;
-	qglIndexiv                   = NULL;
-	qglIndexs                    = NULL;
-	qglIndexsv                   = NULL;
-	qglIndexub                   = NULL;
-	qglIndexubv                  = NULL;
-	qglInitNames                 = NULL;
-	qglInterleavedArrays         = NULL;
-	qglIsEnabled                 = NULL;
-	qglIsList                    = NULL;
-	qglIsTexture                 = NULL;
-	qglLightModelf               = NULL;
-	qglLightModelfv              = NULL;
-	qglLightModeli               = NULL;
-	qglLightModeliv              = NULL;
-	qglLightf                    = NULL;
-	qglLightfv                   = NULL;
-	qglLighti                    = NULL;
-	qglLightiv                   = NULL;
-	qglLineStipple               = NULL;
-	qglLineWidth                 = NULL;
-	qglListBase                  = NULL;
-	qglLoadIdentity              = NULL;
-	qglLoadMatrixd               = NULL;
-	qglLoadMatrixf               = NULL;
-	qglLoadName                  = NULL;
-	qglLogicOp                   = NULL;
-	qglMap1d                     = NULL;
-	qglMap1f                     = NULL;
-	qglMap2d                     = NULL;
-	qglMap2f                     = NULL;
-	qglMapGrid1d                 = NULL;
-	qglMapGrid1f                 = NULL;
-	qglMapGrid2d                 = NULL;
-	qglMapGrid2f                 = NULL;
-	qglMaterialf                 = NULL;
-	qglMaterialfv                = NULL;
-	qglMateriali                 = NULL;
-	qglMaterialiv                = NULL;
-	qglMatrixMode                = NULL;
-	qglMultMatrixd               = NULL;
-	qglMultMatrixf               = NULL;
-	qglNewList                   = NULL;
-	qglNormal3b                  = NULL;
-	qglNormal3bv                 = NULL;
-	qglNormal3d                  = NULL;
-	qglNormal3dv                 = NULL;
-	qglNormal3f                  = NULL;
-	qglNormal3fv                 = NULL;
-	qglNormal3i                  = NULL;
-	qglNormal3iv                 = NULL;
-	qglNormal3s                  = NULL;
-	qglNormal3sv                 = NULL;
-	qglNormalPointer             = NULL;
-	qglOrtho                     = NULL;
-	qglPassThrough               = NULL;
-	qglPixelMapfv                = NULL;
-	qglPixelMapuiv               = NULL;
-	qglPixelMapusv               = NULL;
-	qglPixelStoref               = NULL;
-	qglPixelStorei               = NULL;
-	qglPixelTransferf            = NULL;
-	qglPixelTransferi            = NULL;
-	qglPixelZoom                 = NULL;
-	qglPointSize                 = NULL;
-	qglPolygonMode               = NULL;
-	qglPolygonOffset             = NULL;
-	qglPolygonStipple            = NULL;
-	qglPopAttrib                 = NULL;
-	qglPopClientAttrib           = NULL;
-	qglPopMatrix                 = NULL;
-	qglPopName                   = NULL;
-	qglPrioritizeTextures        = NULL;
-	qglPushAttrib                = NULL;
-	qglPushClientAttrib          = NULL;
-	qglPushMatrix                = NULL;
-	qglPushName                  = NULL;
-	qglRasterPos2d               = NULL;
-	qglRasterPos2dv              = NULL;
-	qglRasterPos2f               = NULL;
-	qglRasterPos2fv              = NULL;
-	qglRasterPos2i               = NULL;
-	qglRasterPos2iv              = NULL;
-	qglRasterPos2s               = NULL;
-	qglRasterPos2sv              = NULL;
-	qglRasterPos3d               = NULL;
-	qglRasterPos3dv              = NULL;
-	qglRasterPos3f               = NULL;
-	qglRasterPos3fv              = NULL;
-	qglRasterPos3i               = NULL;
-	qglRasterPos3iv              = NULL;
-	qglRasterPos3s               = NULL;
-	qglRasterPos3sv              = NULL;
-	qglRasterPos4d               = NULL;
-	qglRasterPos4dv              = NULL;
-	qglRasterPos4f               = NULL;
-	qglRasterPos4fv              = NULL;
-	qglRasterPos4i               = NULL;
-	qglRasterPos4iv              = NULL;
-	qglRasterPos4s               = NULL;
-	qglRasterPos4sv              = NULL;
-	qglReadBuffer                = NULL;
-	qglReadPixels                = NULL;
-	qglRectd                     = NULL;
-	qglRectdv                    = NULL;
-	qglRectf                     = NULL;
-	qglRectfv                    = NULL;
-	qglRecti                     = NULL;
-	qglRectiv                    = NULL;
-	qglRects                     = NULL;
-	qglRectsv                    = NULL;
-	qglRenderMode                = NULL;
-	qglRotated                   = NULL;
-	qglRotatef                   = NULL;
-	qglScaled                    = NULL;
-	qglScalef                    = NULL;
-	qglScissor                   = NULL;
-	qglSelectBuffer              = NULL;
-	qglShadeModel                = NULL;
-	qglStencilFunc               = NULL;
-	qglStencilMask               = NULL;
-	qglStencilOp                 = NULL;
-	qglTexCoord1d                = NULL;
-	qglTexCoord1dv               = NULL;
-	qglTexCoord1f                = NULL;
-	qglTexCoord1fv               = NULL;
-	qglTexCoord1i                = NULL;
-	qglTexCoord1iv               = NULL;
-	qglTexCoord1s                = NULL;
-	qglTexCoord1sv               = NULL;
-	qglTexCoord2d                = NULL;
-	qglTexCoord2dv               = NULL;
-	qglTexCoord2f                = NULL;
-	qglTexCoord2fv               = NULL;
-	qglTexCoord2i                = NULL;
-	qglTexCoord2iv               = NULL;
-	qglTexCoord2s                = NULL;
-	qglTexCoord2sv               = NULL;
-	qglTexCoord3d                = NULL;
-	qglTexCoord3dv               = NULL;
-	qglTexCoord3f                = NULL;
-	qglTexCoord3fv               = NULL;
-	qglTexCoord3i                = NULL;
-	qglTexCoord3iv               = NULL;
-	qglTexCoord3s                = NULL;
-	qglTexCoord3sv               = NULL;
-	qglTexCoord4d                = NULL;
-	qglTexCoord4dv               = NULL;
-	qglTexCoord4f                = NULL;
-	qglTexCoord4fv               = NULL;
-	qglTexCoord4i                = NULL;
-	qglTexCoord4iv               = NULL;
-	qglTexCoord4s                = NULL;
-	qglTexCoord4sv               = NULL;
-	qglTexCoordPointer           = NULL;
-	qglTexEnvf                   = NULL;
-	qglTexEnvfv                  = NULL;
-	qglTexEnvi                   = NULL;
-	qglTexEnviv                  = NULL;
-	qglTexGend                   = NULL;
-	qglTexGendv                  = NULL;
-	qglTexGenf                   = NULL;
-	qglTexGenfv                  = NULL;
-	qglTexGeni                   = NULL;
-	qglTexGeniv                  = NULL;
-	qglTexImage1D                = NULL;
-	qglTexImage2D                = NULL;
-	qglTexParameterf             = NULL;
-	qglTexParameterfv            = NULL;
-	qglTexParameteri             = NULL;
-	qglTexParameteriv            = NULL;
-	qglTexSubImage1D             = NULL;
-	qglTexSubImage2D             = NULL;
-	qglTranslated                = NULL;
-	qglTranslatef                = NULL;
-	qglVertex2d                  = NULL;
-	qglVertex2dv                 = NULL;
-	qglVertex2f                  = NULL;
-	qglVertex2fv                 = NULL;
-	qglVertex2i                  = NULL;
-	qglVertex2iv                 = NULL;
-	qglVertex2s                  = NULL;
-	qglVertex2sv                 = NULL;
-	qglVertex3d                  = NULL;
-	qglVertex3dv                 = NULL;
-	qglVertex3f                  = NULL;
-	qglVertex3fv                 = NULL;
-	qglVertex3i                  = NULL;
-	qglVertex3iv                 = NULL;
-	qglVertex3s                  = NULL;
-	qglVertex3sv                 = NULL;
-	qglVertex4d                  = NULL;
-	qglVertex4dv                 = NULL;
-	qglVertex4f                  = NULL;
-	qglVertex4fv                 = NULL;
-	qglVertex4i                  = NULL;
-	qglVertex4iv                 = NULL;
-	qglVertex4s                  = NULL;
-	qglVertex4sv                 = NULL;
-	qglVertexPointer             = NULL;
-	qglViewport                  = NULL;
-
-// bk001129 - from cvs1.17 (mkv)
-#if defined(__FX__)
-	qfxMesaCreateContext         = NULL;
-	qfxMesaCreateBestContext     = NULL;
-	qfxMesaDestroyContext        = NULL;
-	qfxMesaMakeCurrent           = NULL;
-	qfxMesaGetCurrentContext     = NULL;
-	qfxMesaSwapBuffers           = NULL;
-#endif
-
-	qglXChooseVisual             = NULL;
-	qglXCreateContext            = NULL;
-	qglXDestroyContext           = NULL;
-	qglXMakeCurrent              = NULL;
-	qglXCopyContext              = NULL;
-	qglXSwapBuffers              = NULL;
-}
-
-#define GPA( a ) dlsym( glw_state.OpenGLLib, a )
-
-void *qwglGetProcAddress(char *symbol)
-{
-	if (glw_state.OpenGLLib)
-		return GPA ( symbol );
-	return NULL;
-}
-
-/*
-** QGL_Init
-**
-** This is responsible for binding our qgl function pointers to 
-** the appropriate GL stuff.  In Windows this means doing a 
-** LoadLibrary and a bunch of calls to GetProcAddress.  On other
-** operating systems we need to do the right thing, whatever that
-** might be.
-** 
-*/
-
-qboolean QGL_Init( const char *dllname )
-{
-	if ( ( glw_state.OpenGLLib = dlopen( dllname, RTLD_LAZY|RTLD_GLOBAL ) ) == 0 )
-	{
-		char	fn[1024];
-		// FILE *fp; // bk001204 - unused
-		extern uid_t saved_euid; // unix_main.c
-
-		// if we are not setuid, try current directory
-		if (getuid() == saved_euid) {
-			getcwd(fn, sizeof(fn));
-			Q_strcat(fn, sizeof(fn), "/");
-			Q_strcat(fn, sizeof(fn), dllname);
-
-			if ( ( glw_state.OpenGLLib = dlopen( fn, RTLD_LAZY ) ) == 0 ) {
-				ri.Printf(PRINT_ALL, "QGL_Init: Can't load %s from /etc/ld.so.conf or current dir: %s\n", dllname, dlerror());
-				return qfalse;
-			}
-		} else {
-			ri.Printf(PRINT_ALL, "QGL_Init: Can't load %s from /etc/ld.so.conf: %s\n", dllname, dlerror());
-			return qfalse;
-		}
-	}
-
-	qglAccum                     = dllAccum = GPA( "glAccum" );
-	qglAlphaFunc                 = dllAlphaFunc = GPA( "glAlphaFunc" );
-	qglAreTexturesResident       = dllAreTexturesResident = GPA( "glAreTexturesResident" );
-	qglArrayElement              = dllArrayElement = GPA( "glArrayElement" );
-	qglBegin                     = dllBegin = GPA( "glBegin" );
-	qglBindTexture               = dllBindTexture = GPA( "glBindTexture" );
-	qglBitmap                    = dllBitmap = GPA( "glBitmap" );
-	qglBlendFunc                 = dllBlendFunc = GPA( "glBlendFunc" );
-	qglCallList                  = dllCallList = GPA( "glCallList" );
-	qglCallLists                 = dllCallLists = GPA( "glCallLists" );
-	qglClear                     = dllClear = GPA( "glClear" );
-	qglClearAccum                = dllClearAccum = GPA( "glClearAccum" );
-	qglClearColor                = dllClearColor = GPA( "glClearColor" );
-	qglClearDepth                = dllClearDepth = GPA( "glClearDepth" );
-	qglClearIndex                = dllClearIndex = GPA( "glClearIndex" );
-	qglClearStencil              = dllClearStencil = GPA( "glClearStencil" );
-	qglClipPlane                 = dllClipPlane = GPA( "glClipPlane" );
-	qglColor3b                   = dllColor3b = GPA( "glColor3b" );
-	qglColor3bv                  = dllColor3bv = GPA( "glColor3bv" );
-	qglColor3d                   = dllColor3d = GPA( "glColor3d" );
-	qglColor3dv                  = dllColor3dv = GPA( "glColor3dv" );
-	qglColor3f                   = dllColor3f = GPA( "glColor3f" );
-	qglColor3fv                  = dllColor3fv = GPA( "glColor3fv" );
-	qglColor3i                   = dllColor3i = GPA( "glColor3i" );
-	qglColor3iv                  = dllColor3iv = GPA( "glColor3iv" );
-	qglColor3s                   = dllColor3s = GPA( "glColor3s" );
-	qglColor3sv                  = dllColor3sv = GPA( "glColor3sv" );
-	qglColor3ub                  = dllColor3ub = GPA( "glColor3ub" );
-	qglColor3ubv                 = dllColor3ubv = GPA( "glColor3ubv" );
-	qglColor3ui                  = dllColor3ui = GPA( "glColor3ui" );
-	qglColor3uiv                 = dllColor3uiv = GPA( "glColor3uiv" );
-	qglColor3us                  = dllColor3us = GPA( "glColor3us" );
-	qglColor3usv                 = dllColor3usv = GPA( "glColor3usv" );
-	qglColor4b                   = dllColor4b = GPA( "glColor4b" );
-	qglColor4bv                  = dllColor4bv = GPA( "glColor4bv" );
-	qglColor4d                   = dllColor4d = GPA( "glColor4d" );
-	qglColor4dv                  = dllColor4dv = GPA( "glColor4dv" );
-	qglColor4f                   = dllColor4f = GPA( "glColor4f" );
-	qglColor4fv                  = dllColor4fv = GPA( "glColor4fv" );
-	qglColor4i                   = dllColor4i = GPA( "glColor4i" );
-	qglColor4iv                  = dllColor4iv = GPA( "glColor4iv" );
-	qglColor4s                   = dllColor4s = GPA( "glColor4s" );
-	qglColor4sv                  = dllColor4sv = GPA( "glColor4sv" );
-	qglColor4ub                  = dllColor4ub = GPA( "glColor4ub" );
-	qglColor4ubv                 = dllColor4ubv = GPA( "glColor4ubv" );
-	qglColor4ui                  = dllColor4ui = GPA( "glColor4ui" );
-	qglColor4uiv                 = dllColor4uiv = GPA( "glColor4uiv" );
-	qglColor4us                  = dllColor4us = GPA( "glColor4us" );
-	qglColor4usv                 = dllColor4usv = GPA( "glColor4usv" );
-	qglColorMask                 = dllColorMask = GPA( "glColorMask" );
-	qglColorMaterial             = dllColorMaterial = GPA( "glColorMaterial" );
-	qglColorPointer              = dllColorPointer = GPA( "glColorPointer" );
-	qglCopyPixels                = dllCopyPixels = GPA( "glCopyPixels" );
-	qglCopyTexImage1D            = dllCopyTexImage1D = GPA( "glCopyTexImage1D" );
-	qglCopyTexImage2D            = dllCopyTexImage2D = GPA( "glCopyTexImage2D" );
-	qglCopyTexSubImage1D         = dllCopyTexSubImage1D = GPA( "glCopyTexSubImage1D" );
-	qglCopyTexSubImage2D         = dllCopyTexSubImage2D = GPA( "glCopyTexSubImage2D" );
-	qglCullFace                  = dllCullFace = GPA( "glCullFace" );
-	qglDeleteLists               = dllDeleteLists = GPA( "glDeleteLists" );
-	qglDeleteTextures            = dllDeleteTextures = GPA( "glDeleteTextures" );
-	qglDepthFunc                 = dllDepthFunc = GPA( "glDepthFunc" );
-	qglDepthMask                 = dllDepthMask = GPA( "glDepthMask" );
-	qglDepthRange                = dllDepthRange = GPA( "glDepthRange" );
-	qglDisable                   = dllDisable = GPA( "glDisable" );
-	qglDisableClientState        = dllDisableClientState = GPA( "glDisableClientState" );
-	qglDrawArrays                = dllDrawArrays = GPA( "glDrawArrays" );
-	qglDrawBuffer                = dllDrawBuffer = GPA( "glDrawBuffer" );
-	qglDrawElements              = dllDrawElements = GPA( "glDrawElements" );
-	qglDrawPixels                = dllDrawPixels = GPA( "glDrawPixels" );
-	qglEdgeFlag                  = dllEdgeFlag = GPA( "glEdgeFlag" );
-	qglEdgeFlagPointer           = dllEdgeFlagPointer = GPA( "glEdgeFlagPointer" );
-	qglEdgeFlagv                 = dllEdgeFlagv = GPA( "glEdgeFlagv" );
-	qglEnable                    = 	dllEnable                    = GPA( "glEnable" );
-	qglEnableClientState         = 	dllEnableClientState         = GPA( "glEnableClientState" );
-	qglEnd                       = 	dllEnd                       = GPA( "glEnd" );
-	qglEndList                   = 	dllEndList                   = GPA( "glEndList" );
-	qglEvalCoord1d				 = 	dllEvalCoord1d				 = GPA( "glEvalCoord1d" );
-	qglEvalCoord1dv              = 	dllEvalCoord1dv              = GPA( "glEvalCoord1dv" );
-	qglEvalCoord1f               = 	dllEvalCoord1f               = GPA( "glEvalCoord1f" );
-	qglEvalCoord1fv              = 	dllEvalCoord1fv              = GPA( "glEvalCoord1fv" );
-	qglEvalCoord2d               = 	dllEvalCoord2d               = GPA( "glEvalCoord2d" );
-	qglEvalCoord2dv              = 	dllEvalCoord2dv              = GPA( "glEvalCoord2dv" );
-	qglEvalCoord2f               = 	dllEvalCoord2f               = GPA( "glEvalCoord2f" );
-	qglEvalCoord2fv              = 	dllEvalCoord2fv              = GPA( "glEvalCoord2fv" );
-	qglEvalMesh1                 = 	dllEvalMesh1                 = GPA( "glEvalMesh1" );
-	qglEvalMesh2                 = 	dllEvalMesh2                 = GPA( "glEvalMesh2" );
-	qglEvalPoint1                = 	dllEvalPoint1                = GPA( "glEvalPoint1" );
-	qglEvalPoint2                = 	dllEvalPoint2                = GPA( "glEvalPoint2" );
-	qglFeedbackBuffer            = 	dllFeedbackBuffer            = GPA( "glFeedbackBuffer" );
-	qglFinish                    = 	dllFinish                    = GPA( "glFinish" );
-	qglFlush                     = 	dllFlush                     = GPA( "glFlush" );
-	qglFogf                      = 	dllFogf                      = GPA( "glFogf" );
-	qglFogfv                     = 	dllFogfv                     = GPA( "glFogfv" );
-	qglFogi                      = 	dllFogi                      = GPA( "glFogi" );
-	qglFogiv                     = 	dllFogiv                     = GPA( "glFogiv" );
-	qglFrontFace                 = 	dllFrontFace                 = GPA( "glFrontFace" );
-	qglFrustum                   = 	dllFrustum                   = GPA( "glFrustum" );
-	qglGenLists                  = 	dllGenLists                  = GPA( "glGenLists" );
-	qglGenTextures               = 	dllGenTextures               = GPA( "glGenTextures" );
-	qglGetBooleanv               = 	dllGetBooleanv               = GPA( "glGetBooleanv" );
-	qglGetClipPlane              = 	dllGetClipPlane              = GPA( "glGetClipPlane" );
-	qglGetDoublev                = 	dllGetDoublev                = GPA( "glGetDoublev" );
-	qglGetError                  = 	dllGetError                  = GPA( "glGetError" );
-	qglGetFloatv                 = 	dllGetFloatv                 = GPA( "glGetFloatv" );
-	qglGetIntegerv               = 	dllGetIntegerv               = GPA( "glGetIntegerv" );
-	qglGetLightfv                = 	dllGetLightfv                = GPA( "glGetLightfv" );
-	qglGetLightiv                = 	dllGetLightiv                = GPA( "glGetLightiv" );
-	qglGetMapdv                  = 	dllGetMapdv                  = GPA( "glGetMapdv" );
-	qglGetMapfv                  = 	dllGetMapfv                  = GPA( "glGetMapfv" );
-	qglGetMapiv                  = 	dllGetMapiv                  = GPA( "glGetMapiv" );
-	qglGetMaterialfv             = 	dllGetMaterialfv             = GPA( "glGetMaterialfv" );
-	qglGetMaterialiv             = 	dllGetMaterialiv             = GPA( "glGetMaterialiv" );
-	qglGetPixelMapfv             = 	dllGetPixelMapfv             = GPA( "glGetPixelMapfv" );
-	qglGetPixelMapuiv            = 	dllGetPixelMapuiv            = GPA( "glGetPixelMapuiv" );
-	qglGetPixelMapusv            = 	dllGetPixelMapusv            = GPA( "glGetPixelMapusv" );
-	qglGetPointerv               = 	dllGetPointerv               = GPA( "glGetPointerv" );
-	qglGetPolygonStipple         = 	dllGetPolygonStipple         = GPA( "glGetPolygonStipple" );
-	qglGetString                 = 	dllGetString                 = GPA( "glGetString" );
-	qglGetTexEnvfv               = 	dllGetTexEnvfv               = GPA( "glGetTexEnvfv" );
-	qglGetTexEnviv               = 	dllGetTexEnviv               = GPA( "glGetTexEnviv" );
-	qglGetTexGendv               = 	dllGetTexGendv               = GPA( "glGetTexGendv" );
-	qglGetTexGenfv               = 	dllGetTexGenfv               = GPA( "glGetTexGenfv" );
-	qglGetTexGeniv               = 	dllGetTexGeniv               = GPA( "glGetTexGeniv" );
-	qglGetTexImage               = 	dllGetTexImage               = GPA( "glGetTexImage" );
-	qglGetTexParameterfv         = 	dllGetTexParameterfv         = GPA( "glGetTexParameterfv" );
-	qglGetTexParameteriv         = 	dllGetTexParameteriv         = GPA( "glGetTexParameteriv" );
-	qglHint                      = 	dllHint                      = GPA( "glHint" );
-	qglIndexMask                 = 	dllIndexMask                 = GPA( "glIndexMask" );
-	qglIndexPointer              = 	dllIndexPointer              = GPA( "glIndexPointer" );
-	qglIndexd                    = 	dllIndexd                    = GPA( "glIndexd" );
-	qglIndexdv                   = 	dllIndexdv                   = GPA( "glIndexdv" );
-	qglIndexf                    = 	dllIndexf                    = GPA( "glIndexf" );
-	qglIndexfv                   = 	dllIndexfv                   = GPA( "glIndexfv" );
-	qglIndexi                    = 	dllIndexi                    = GPA( "glIndexi" );
-	qglIndexiv                   = 	dllIndexiv                   = GPA( "glIndexiv" );
-	qglIndexs                    = 	dllIndexs                    = GPA( "glIndexs" );
-	qglIndexsv                   = 	dllIndexsv                   = GPA( "glIndexsv" );
-	qglIndexub                   = 	dllIndexub                   = GPA( "glIndexub" );
-	qglIndexubv                  = 	dllIndexubv                  = GPA( "glIndexubv" );
-	qglInitNames                 = 	dllInitNames                 = GPA( "glInitNames" );
-	qglInterleavedArrays         = 	dllInterleavedArrays         = GPA( "glInterleavedArrays" );
-	qglIsEnabled                 = 	dllIsEnabled                 = GPA( "glIsEnabled" );
-	qglIsList                    = 	dllIsList                    = GPA( "glIsList" );
-	qglIsTexture                 = 	dllIsTexture                 = GPA( "glIsTexture" );
-	qglLightModelf               = 	dllLightModelf               = GPA( "glLightModelf" );
-	qglLightModelfv              = 	dllLightModelfv              = GPA( "glLightModelfv" );
-	qglLightModeli               = 	dllLightModeli               = GPA( "glLightModeli" );
-	qglLightModeliv              = 	dllLightModeliv              = GPA( "glLightModeliv" );
-	qglLightf                    = 	dllLightf                    = GPA( "glLightf" );
-	qglLightfv                   = 	dllLightfv                   = GPA( "glLightfv" );
-	qglLighti                    = 	dllLighti                    = GPA( "glLighti" );
-	qglLightiv                   = 	dllLightiv                   = GPA( "glLightiv" );
-	qglLineStipple               = 	dllLineStipple               = GPA( "glLineStipple" );
-	qglLineWidth                 = 	dllLineWidth                 = GPA( "glLineWidth" );
-	qglListBase                  = 	dllListBase                  = GPA( "glListBase" );
-	qglLoadIdentity              = 	dllLoadIdentity              = GPA( "glLoadIdentity" );
-	qglLoadMatrixd               = 	dllLoadMatrixd               = GPA( "glLoadMatrixd" );
-	qglLoadMatrixf               = 	dllLoadMatrixf               = GPA( "glLoadMatrixf" );
-	qglLoadName                  = 	dllLoadName                  = GPA( "glLoadName" );
-	qglLogicOp                   = 	dllLogicOp                   = GPA( "glLogicOp" );
-	qglMap1d                     = 	dllMap1d                     = GPA( "glMap1d" );
-	qglMap1f                     = 	dllMap1f                     = GPA( "glMap1f" );
-	qglMap2d                     = 	dllMap2d                     = GPA( "glMap2d" );
-	qglMap2f                     = 	dllMap2f                     = GPA( "glMap2f" );
-	qglMapGrid1d                 = 	dllMapGrid1d                 = GPA( "glMapGrid1d" );
-	qglMapGrid1f                 = 	dllMapGrid1f                 = GPA( "glMapGrid1f" );
-	qglMapGrid2d                 = 	dllMapGrid2d                 = GPA( "glMapGrid2d" );
-	qglMapGrid2f                 = 	dllMapGrid2f                 = GPA( "glMapGrid2f" );
-	qglMaterialf                 = 	dllMaterialf                 = GPA( "glMaterialf" );
-	qglMaterialfv                = 	dllMaterialfv                = GPA( "glMaterialfv" );
-	qglMateriali                 = 	dllMateriali                 = GPA( "glMateriali" );
-	qglMaterialiv                = 	dllMaterialiv                = GPA( "glMaterialiv" );
-	qglMatrixMode                = 	dllMatrixMode                = GPA( "glMatrixMode" );
-	qglMultMatrixd               = 	dllMultMatrixd               = GPA( "glMultMatrixd" );
-	qglMultMatrixf               = 	dllMultMatrixf               = GPA( "glMultMatrixf" );
-	qglNewList                   = 	dllNewList                   = GPA( "glNewList" );
-	qglNormal3b                  = 	dllNormal3b                  = GPA( "glNormal3b" );
-	qglNormal3bv                 = 	dllNormal3bv                 = GPA( "glNormal3bv" );
-	qglNormal3d                  = 	dllNormal3d                  = GPA( "glNormal3d" );
-	qglNormal3dv                 = 	dllNormal3dv                 = GPA( "glNormal3dv" );
-	qglNormal3f                  = 	dllNormal3f                  = GPA( "glNormal3f" );
-	qglNormal3fv                 = 	dllNormal3fv                 = GPA( "glNormal3fv" );
-	qglNormal3i                  = 	dllNormal3i                  = GPA( "glNormal3i" );
-	qglNormal3iv                 = 	dllNormal3iv                 = GPA( "glNormal3iv" );
-	qglNormal3s                  = 	dllNormal3s                  = GPA( "glNormal3s" );
-	qglNormal3sv                 = 	dllNormal3sv                 = GPA( "glNormal3sv" );
-	qglNormalPointer             = 	dllNormalPointer             = GPA( "glNormalPointer" );
-	qglOrtho                     = 	dllOrtho                     = GPA( "glOrtho" );
-	qglPassThrough               = 	dllPassThrough               = GPA( "glPassThrough" );
-	qglPixelMapfv                = 	dllPixelMapfv                = GPA( "glPixelMapfv" );
-	qglPixelMapuiv               = 	dllPixelMapuiv               = GPA( "glPixelMapuiv" );
-	qglPixelMapusv               = 	dllPixelMapusv               = GPA( "glPixelMapusv" );
-	qglPixelStoref               = 	dllPixelStoref               = GPA( "glPixelStoref" );
-	qglPixelStorei               = 	dllPixelStorei               = GPA( "glPixelStorei" );
-	qglPixelTransferf            = 	dllPixelTransferf            = GPA( "glPixelTransferf" );
-	qglPixelTransferi            = 	dllPixelTransferi            = GPA( "glPixelTransferi" );
-	qglPixelZoom                 = 	dllPixelZoom                 = GPA( "glPixelZoom" );
-	qglPointSize                 = 	dllPointSize                 = GPA( "glPointSize" );
-	qglPolygonMode               = 	dllPolygonMode               = GPA( "glPolygonMode" );
-	qglPolygonOffset             = 	dllPolygonOffset             = GPA( "glPolygonOffset" );
-	qglPolygonStipple            = 	dllPolygonStipple            = GPA( "glPolygonStipple" );
-	qglPopAttrib                 = 	dllPopAttrib                 = GPA( "glPopAttrib" );
-	qglPopClientAttrib           = 	dllPopClientAttrib           = GPA( "glPopClientAttrib" );
-	qglPopMatrix                 = 	dllPopMatrix                 = GPA( "glPopMatrix" );
-	qglPopName                   = 	dllPopName                   = GPA( "glPopName" );
-	qglPrioritizeTextures        = 	dllPrioritizeTextures        = GPA( "glPrioritizeTextures" );
-	qglPushAttrib                = 	dllPushAttrib                = GPA( "glPushAttrib" );
-	qglPushClientAttrib          = 	dllPushClientAttrib          = GPA( "glPushClientAttrib" );
-	qglPushMatrix                = 	dllPushMatrix                = GPA( "glPushMatrix" );
-	qglPushName                  = 	dllPushName                  = GPA( "glPushName" );
-	qglRasterPos2d               = 	dllRasterPos2d               = GPA( "glRasterPos2d" );
-	qglRasterPos2dv              = 	dllRasterPos2dv              = GPA( "glRasterPos2dv" );
-	qglRasterPos2f               = 	dllRasterPos2f               = GPA( "glRasterPos2f" );
-	qglRasterPos2fv              = 	dllRasterPos2fv              = GPA( "glRasterPos2fv" );
-	qglRasterPos2i               = 	dllRasterPos2i               = GPA( "glRasterPos2i" );
-	qglRasterPos2iv              = 	dllRasterPos2iv              = GPA( "glRasterPos2iv" );
-	qglRasterPos2s               = 	dllRasterPos2s               = GPA( "glRasterPos2s" );
-	qglRasterPos2sv              = 	dllRasterPos2sv              = GPA( "glRasterPos2sv" );
-	qglRasterPos3d               = 	dllRasterPos3d               = GPA( "glRasterPos3d" );
-	qglRasterPos3dv              = 	dllRasterPos3dv              = GPA( "glRasterPos3dv" );
-	qglRasterPos3f               = 	dllRasterPos3f               = GPA( "glRasterPos3f" );
-	qglRasterPos3fv              = 	dllRasterPos3fv              = GPA( "glRasterPos3fv" );
-	qglRasterPos3i               = 	dllRasterPos3i               = GPA( "glRasterPos3i" );
-	qglRasterPos3iv              = 	dllRasterPos3iv              = GPA( "glRasterPos3iv" );
-	qglRasterPos3s               = 	dllRasterPos3s               = GPA( "glRasterPos3s" );
-	qglRasterPos3sv              = 	dllRasterPos3sv              = GPA( "glRasterPos3sv" );
-	qglRasterPos4d               = 	dllRasterPos4d               = GPA( "glRasterPos4d" );
-	qglRasterPos4dv              = 	dllRasterPos4dv              = GPA( "glRasterPos4dv" );
-	qglRasterPos4f               = 	dllRasterPos4f               = GPA( "glRasterPos4f" );
-	qglRasterPos4fv              = 	dllRasterPos4fv              = GPA( "glRasterPos4fv" );
-	qglRasterPos4i               = 	dllRasterPos4i               = GPA( "glRasterPos4i" );
-	qglRasterPos4iv              = 	dllRasterPos4iv              = GPA( "glRasterPos4iv" );
-	qglRasterPos4s               = 	dllRasterPos4s               = GPA( "glRasterPos4s" );
-	qglRasterPos4sv              = 	dllRasterPos4sv              = GPA( "glRasterPos4sv" );
-	qglReadBuffer                = 	dllReadBuffer                = GPA( "glReadBuffer" );
-	qglReadPixels                = 	dllReadPixels                = GPA( "glReadPixels" );
-	qglRectd                     = 	dllRectd                     = GPA( "glRectd" );
-	qglRectdv                    = 	dllRectdv                    = GPA( "glRectdv" );
-	qglRectf                     = 	dllRectf                     = GPA( "glRectf" );
-	qglRectfv                    = 	dllRectfv                    = GPA( "glRectfv" );
-	qglRecti                     = 	dllRecti                     = GPA( "glRecti" );
-	qglRectiv                    = 	dllRectiv                    = GPA( "glRectiv" );
-	qglRects                     = 	dllRects                     = GPA( "glRects" );
-	qglRectsv                    = 	dllRectsv                    = GPA( "glRectsv" );
-	qglRenderMode                = 	dllRenderMode                = GPA( "glRenderMode" );
-	qglRotated                   = 	dllRotated                   = GPA( "glRotated" );
-	qglRotatef                   = 	dllRotatef                   = GPA( "glRotatef" );
-	qglScaled                    = 	dllScaled                    = GPA( "glScaled" );
-	qglScalef                    = 	dllScalef                    = GPA( "glScalef" );
-	qglScissor                   = 	dllScissor                   = GPA( "glScissor" );
-	qglSelectBuffer              = 	dllSelectBuffer              = GPA( "glSelectBuffer" );
-	qglShadeModel                = 	dllShadeModel                = GPA( "glShadeModel" );
-	qglStencilFunc               = 	dllStencilFunc               = GPA( "glStencilFunc" );
-	qglStencilMask               = 	dllStencilMask               = GPA( "glStencilMask" );
-	qglStencilOp                 = 	dllStencilOp                 = GPA( "glStencilOp" );
-	qglTexCoord1d                = 	dllTexCoord1d                = GPA( "glTexCoord1d" );
-	qglTexCoord1dv               = 	dllTexCoord1dv               = GPA( "glTexCoord1dv" );
-	qglTexCoord1f                = 	dllTexCoord1f                = GPA( "glTexCoord1f" );
-	qglTexCoord1fv               = 	dllTexCoord1fv               = GPA( "glTexCoord1fv" );
-	qglTexCoord1i                = 	dllTexCoord1i                = GPA( "glTexCoord1i" );
-	qglTexCoord1iv               = 	dllTexCoord1iv               = GPA( "glTexCoord1iv" );
-	qglTexCoord1s                = 	dllTexCoord1s                = GPA( "glTexCoord1s" );
-	qglTexCoord1sv               = 	dllTexCoord1sv               = GPA( "glTexCoord1sv" );
-	qglTexCoord2d                = 	dllTexCoord2d                = GPA( "glTexCoord2d" );
-	qglTexCoord2dv               = 	dllTexCoord2dv               = GPA( "glTexCoord2dv" );
-	qglTexCoord2f                = 	dllTexCoord2f                = GPA( "glTexCoord2f" );
-	qglTexCoord2fv               = 	dllTexCoord2fv               = GPA( "glTexCoord2fv" );
-	qglTexCoord2i                = 	dllTexCoord2i                = GPA( "glTexCoord2i" );
-	qglTexCoord2iv               = 	dllTexCoord2iv               = GPA( "glTexCoord2iv" );
-	qglTexCoord2s                = 	dllTexCoord2s                = GPA( "glTexCoord2s" );
-	qglTexCoord2sv               = 	dllTexCoord2sv               = GPA( "glTexCoord2sv" );
-	qglTexCoord3d                = 	dllTexCoord3d                = GPA( "glTexCoord3d" );
-	qglTexCoord3dv               = 	dllTexCoord3dv               = GPA( "glTexCoord3dv" );
-	qglTexCoord3f                = 	dllTexCoord3f                = GPA( "glTexCoord3f" );
-	qglTexCoord3fv               = 	dllTexCoord3fv               = GPA( "glTexCoord3fv" );
-	qglTexCoord3i                = 	dllTexCoord3i                = GPA( "glTexCoord3i" );
-	qglTexCoord3iv               = 	dllTexCoord3iv               = GPA( "glTexCoord3iv" );
-	qglTexCoord3s                = 	dllTexCoord3s                = GPA( "glTexCoord3s" );
-	qglTexCoord3sv               = 	dllTexCoord3sv               = GPA( "glTexCoord3sv" );
-	qglTexCoord4d                = 	dllTexCoord4d                = GPA( "glTexCoord4d" );
-	qglTexCoord4dv               = 	dllTexCoord4dv               = GPA( "glTexCoord4dv" );
-	qglTexCoord4f                = 	dllTexCoord4f                = GPA( "glTexCoord4f" );
-	qglTexCoord4fv               = 	dllTexCoord4fv               = GPA( "glTexCoord4fv" );
-	qglTexCoord4i                = 	dllTexCoord4i                = GPA( "glTexCoord4i" );
-	qglTexCoord4iv               = 	dllTexCoord4iv               = GPA( "glTexCoord4iv" );
-	qglTexCoord4s                = 	dllTexCoord4s                = GPA( "glTexCoord4s" );
-	qglTexCoord4sv               = 	dllTexCoord4sv               = GPA( "glTexCoord4sv" );
-	qglTexCoordPointer           = 	dllTexCoordPointer           = GPA( "glTexCoordPointer" );
-	qglTexEnvf                   = 	dllTexEnvf                   = GPA( "glTexEnvf" );
-	qglTexEnvfv                  = 	dllTexEnvfv                  = GPA( "glTexEnvfv" );
-	qglTexEnvi                   = 	dllTexEnvi                   = GPA( "glTexEnvi" );
-	qglTexEnviv                  = 	dllTexEnviv                  = GPA( "glTexEnviv" );
-	qglTexGend                   = 	dllTexGend                   = GPA( "glTexGend" );
-	qglTexGendv                  = 	dllTexGendv                  = GPA( "glTexGendv" );
-	qglTexGenf                   = 	dllTexGenf                   = GPA( "glTexGenf" );
-	qglTexGenfv                  = 	dllTexGenfv                  = GPA( "glTexGenfv" );
-	qglTexGeni                   = 	dllTexGeni                   = GPA( "glTexGeni" );
-	qglTexGeniv                  = 	dllTexGeniv                  = GPA( "glTexGeniv" );
-	qglTexImage1D                = 	dllTexImage1D                = GPA( "glTexImage1D" );
-	qglTexImage2D                = 	dllTexImage2D                = GPA( "glTexImage2D" );
-	qglTexParameterf             = 	dllTexParameterf             = GPA( "glTexParameterf" );
-	qglTexParameterfv            = 	dllTexParameterfv            = GPA( "glTexParameterfv" );
-	qglTexParameteri             = 	dllTexParameteri             = GPA( "glTexParameteri" );
-	qglTexParameteriv            = 	dllTexParameteriv            = GPA( "glTexParameteriv" );
-	qglTexSubImage1D             = 	dllTexSubImage1D             = GPA( "glTexSubImage1D" );
-	qglTexSubImage2D             = 	dllTexSubImage2D             = GPA( "glTexSubImage2D" );
-	qglTranslated                = 	dllTranslated                = GPA( "glTranslated" );
-	qglTranslatef                = 	dllTranslatef                = GPA( "glTranslatef" );
-	qglVertex2d                  = 	dllVertex2d                  = GPA( "glVertex2d" );
-	qglVertex2dv                 = 	dllVertex2dv                 = GPA( "glVertex2dv" );
-	qglVertex2f                  = 	dllVertex2f                  = GPA( "glVertex2f" );
-	qglVertex2fv                 = 	dllVertex2fv                 = GPA( "glVertex2fv" );
-	qglVertex2i                  = 	dllVertex2i                  = GPA( "glVertex2i" );
-	qglVertex2iv                 = 	dllVertex2iv                 = GPA( "glVertex2iv" );
-	qglVertex2s                  = 	dllVertex2s                  = GPA( "glVertex2s" );
-	qglVertex2sv                 = 	dllVertex2sv                 = GPA( "glVertex2sv" );
-	qglVertex3d                  = 	dllVertex3d                  = GPA( "glVertex3d" );
-	qglVertex3dv                 = 	dllVertex3dv                 = GPA( "glVertex3dv" );
-	qglVertex3f                  = 	dllVertex3f                  = GPA( "glVertex3f" );
-	qglVertex3fv                 = 	dllVertex3fv                 = GPA( "glVertex3fv" );
-	qglVertex3i                  = 	dllVertex3i                  = GPA( "glVertex3i" );
-	qglVertex3iv                 = 	dllVertex3iv                 = GPA( "glVertex3iv" );
-	qglVertex3s                  = 	dllVertex3s                  = GPA( "glVertex3s" );
-	qglVertex3sv                 = 	dllVertex3sv                 = GPA( "glVertex3sv" );
-	qglVertex4d                  = 	dllVertex4d                  = GPA( "glVertex4d" );
-	qglVertex4dv                 = 	dllVertex4dv                 = GPA( "glVertex4dv" );
-	qglVertex4f                  = 	dllVertex4f                  = GPA( "glVertex4f" );
-	qglVertex4fv                 = 	dllVertex4fv                 = GPA( "glVertex4fv" );
-	qglVertex4i                  = 	dllVertex4i                  = GPA( "glVertex4i" );
-	qglVertex4iv                 = 	dllVertex4iv                 = GPA( "glVertex4iv" );
-	qglVertex4s                  = 	dllVertex4s                  = GPA( "glVertex4s" );
-	qglVertex4sv                 = 	dllVertex4sv                 = GPA( "glVertex4sv" );
-	qglVertexPointer             = 	dllVertexPointer             = GPA( "glVertexPointer" );
-	qglViewport                  = 	dllViewport                  = GPA( "glViewport" );
-
-// bk001129 - from cvs1.17 (mkv)
-#if defined(__FX__)
-	qfxMesaCreateContext         =  GPA("fxMesaCreateContext");
-	qfxMesaCreateBestContext     =  GPA("fxMesaCreateBestContext");
-	qfxMesaDestroyContext        =  GPA("fxMesaDestroyContext");
-	qfxMesaMakeCurrent           =  GPA("fxMesaMakeCurrent");
-	qfxMesaGetCurrentContext     =  GPA("fxMesaGetCurrentContext");
-	qfxMesaSwapBuffers           =  GPA("fxMesaSwapBuffers");
-#endif
-
-	qglXChooseVisual             =  GPA("glXChooseVisual");
-	qglXCreateContext            =  GPA("glXCreateContext");
-	qglXDestroyContext           =  GPA("glXDestroyContext");
-	qglXMakeCurrent              =  GPA("glXMakeCurrent");
-	qglXCopyContext              =  GPA("glXCopyContext");
-	qglXSwapBuffers              =  GPA("glXSwapBuffers");
-
-	qglLockArraysEXT = 0;
-	qglUnlockArraysEXT = 0;
-	qglPointParameterfEXT = 0;
-	qglPointParameterfvEXT = 0;
-	qglColorTableEXT = 0;
-	qgl3DfxSetPaletteEXT = 0;
-	qglSelectTextureSGIS = 0;
-	qglMTexCoord2fSGIS = 0;
-	qglActiveTextureARB = 0;
-	qglClientActiveTextureARB = 0;
-	qglMultiTexCoord2fARB = 0;
-
-	return qtrue;
-}
-
-void QGL_EnableLogging( qboolean enable ) {
-  // bk001205 - fixed for new countdown
-  static qboolean isEnabled = qfalse; // init
-  
-  // return if we're already active
-  if ( isEnabled && enable ) {
-    // decrement log counter and stop if it has reached 0
-    ri.Cvar_Set( "r_logFile", va("%d", r_logFile->integer - 1 ) );
-    if ( r_logFile->integer ) {
-      return;
-    }
-    enable = qfalse;
-  }
-
-  // return if we're already disabled
-  if ( !enable && !isEnabled )
-    return;
-
-  isEnabled = enable;
-
-  // bk001205 - old code starts here
-  if ( enable ) {
-    if ( !glw_state.log_fp ) {
-      struct tm *newtime;
-      time_t aclock;
-      char buffer[1024];
-      cvar_t	*basedir;
-      
-      time( &aclock );
-      newtime = localtime( &aclock );
-      
-      asctime( newtime );
-      
-      basedir = ri.Cvar_Get( "fs_basepath", "", 0 ); // FIXME: userdir?
-      assert(basedir);
-      Com_sprintf( buffer, sizeof(buffer), "%s/gl.log", basedir->string ); 
-      glw_state.log_fp = fopen( buffer, "wt" );
-      assert(glw_state.log_fp);
-      ri.Printf(PRINT_ALL, "QGL_EnableLogging(%d): writing %s\n", r_logFile->integer, buffer );
-
-      fprintf( glw_state.log_fp, "%s\n", asctime( newtime ) );
-    }
-
-                qglAccum                     = logAccum;
-                qglAlphaFunc                 = logAlphaFunc;
-                qglAreTexturesResident       = logAreTexturesResident;
-		qglArrayElement              = logArrayElement;
-		qglBegin                     = logBegin;
-		qglBindTexture               = logBindTexture;
-		qglBitmap                    = logBitmap;
-		qglBlendFunc                 = logBlendFunc;
-		qglCallList                  = logCallList;
-		qglCallLists                 = logCallLists;
-		qglClear                     = logClear;
-		qglClearAccum                = logClearAccum;
-		qglClearColor                = logClearColor;
-		qglClearDepth                = logClearDepth;
-		qglClearIndex                = logClearIndex;
-		qglClearStencil              = logClearStencil;
-		qglClipPlane                 = logClipPlane;
-		qglColor3b                   = logColor3b;
-		qglColor3bv                  = logColor3bv;
-		qglColor3d                   = logColor3d;
-		qglColor3dv                  = logColor3dv;
-		qglColor3f                   = logColor3f;
-		qglColor3fv                  = logColor3fv;
-		qglColor3i                   = logColor3i;
-		qglColor3iv                  = logColor3iv;
-		qglColor3s                   = logColor3s;
-		qglColor3sv                  = logColor3sv;
-		qglColor3ub                  = logColor3ub;
-		qglColor3ubv                 = logColor3ubv;
-		qglColor3ui                  = logColor3ui;
-		qglColor3uiv                 = logColor3uiv;
-		qglColor3us                  = logColor3us;
-		qglColor3usv                 = logColor3usv;
-		qglColor4b                   = logColor4b;
-		qglColor4bv                  = logColor4bv;
-		qglColor4d                   = logColor4d;
-		qglColor4dv                  = logColor4dv;
-		qglColor4f                   = logColor4f;
-		qglColor4fv                  = logColor4fv;
-		qglColor4i                   = logColor4i;
-		qglColor4iv                  = logColor4iv;
-		qglColor4s                   = logColor4s;
-		qglColor4sv                  = logColor4sv;
-		qglColor4ub                  = logColor4ub;
-		qglColor4ubv                 = logColor4ubv;
-		qglColor4ui                  = logColor4ui;
-		qglColor4uiv                 = logColor4uiv;
-		qglColor4us                  = logColor4us;
-		qglColor4usv                 = logColor4usv;
-		qglColorMask                 = logColorMask;
-		qglColorMaterial             = logColorMaterial;
-		qglColorPointer              = logColorPointer;
-		qglCopyPixels                = logCopyPixels;
-		qglCopyTexImage1D            = logCopyTexImage1D;
-		qglCopyTexImage2D            = logCopyTexImage2D;
-		qglCopyTexSubImage1D         = logCopyTexSubImage1D;
-		qglCopyTexSubImage2D         = logCopyTexSubImage2D;
-		qglCullFace                  = logCullFace;
-		qglDeleteLists               = logDeleteLists ;
-		qglDeleteTextures            = logDeleteTextures ;
-		qglDepthFunc                 = logDepthFunc ;
-		qglDepthMask                 = logDepthMask ;
-		qglDepthRange                = logDepthRange ;
-		qglDisable                   = logDisable ;
-		qglDisableClientState        = logDisableClientState ;
-		qglDrawArrays                = logDrawArrays ;
-		qglDrawBuffer                = logDrawBuffer ;
-		qglDrawElements              = logDrawElements ;
-		qglDrawPixels                = logDrawPixels ;
-		qglEdgeFlag                  = logEdgeFlag ;
-		qglEdgeFlagPointer           = logEdgeFlagPointer ;
-		qglEdgeFlagv                 = logEdgeFlagv ;
-		qglEnable                    = 	logEnable                    ;
-		qglEnableClientState         = 	logEnableClientState         ;
-		qglEnd                       = 	logEnd                       ;
-		qglEndList                   = 	logEndList                   ;
-		qglEvalCoord1d				 = 	logEvalCoord1d				 ;
-		qglEvalCoord1dv              = 	logEvalCoord1dv              ;
-		qglEvalCoord1f               = 	logEvalCoord1f               ;
-		qglEvalCoord1fv              = 	logEvalCoord1fv              ;
-		qglEvalCoord2d               = 	logEvalCoord2d               ;
-		qglEvalCoord2dv              = 	logEvalCoord2dv              ;
-		qglEvalCoord2f               = 	logEvalCoord2f               ;
-		qglEvalCoord2fv              = 	logEvalCoord2fv              ;
-		qglEvalMesh1                 = 	logEvalMesh1                 ;
-		qglEvalMesh2                 = 	logEvalMesh2                 ;
-		qglEvalPoint1                = 	logEvalPoint1                ;
-		qglEvalPoint2                = 	logEvalPoint2                ;
-		qglFeedbackBuffer            = 	logFeedbackBuffer            ;
-		qglFinish                    = 	logFinish                    ;
-		qglFlush                     = 	logFlush                     ;
-		qglFogf                      = 	logFogf                      ;
-		qglFogfv                     = 	logFogfv                     ;
-		qglFogi                      = 	logFogi                      ;
-		qglFogiv                     = 	logFogiv                     ;
-		qglFrontFace                 = 	logFrontFace                 ;
-		qglFrustum                   = 	logFrustum                   ;
-		qglGenLists                  = 	logGenLists                  ;
-		qglGenTextures               = 	logGenTextures               ;
-		qglGetBooleanv               = 	logGetBooleanv               ;
-		qglGetClipPlane              = 	logGetClipPlane              ;
-		qglGetDoublev                = 	logGetDoublev                ;
-		qglGetError                  = 	logGetError                  ;
-		qglGetFloatv                 = 	logGetFloatv                 ;
-		qglGetIntegerv               = 	logGetIntegerv               ;
-		qglGetLightfv                = 	logGetLightfv                ;
-		qglGetLightiv                = 	logGetLightiv                ;
-		qglGetMapdv                  = 	logGetMapdv                  ;
-		qglGetMapfv                  = 	logGetMapfv                  ;
-		qglGetMapiv                  = 	logGetMapiv                  ;
-		qglGetMaterialfv             = 	logGetMaterialfv             ;
-		qglGetMaterialiv             = 	logGetMaterialiv             ;
-		qglGetPixelMapfv             = 	logGetPixelMapfv             ;
-		qglGetPixelMapuiv            = 	logGetPixelMapuiv            ;
-		qglGetPixelMapusv            = 	logGetPixelMapusv            ;
-		qglGetPointerv               = 	logGetPointerv               ;
-		qglGetPolygonStipple         = 	logGetPolygonStipple         ;
-		qglGetString                 = 	logGetString                 ;
-		qglGetTexEnvfv               = 	logGetTexEnvfv               ;
-		qglGetTexEnviv               = 	logGetTexEnviv               ;
-		qglGetTexGendv               = 	logGetTexGendv               ;
-		qglGetTexGenfv               = 	logGetTexGenfv               ;
-		qglGetTexGeniv               = 	logGetTexGeniv               ;
-		qglGetTexImage               = 	logGetTexImage               ;
-		qglGetTexLevelParameterfv    = 	logGetTexLevelParameterfv    ;
-		qglGetTexLevelParameteriv    = 	logGetTexLevelParameteriv    ;
-		qglGetTexParameterfv         = 	logGetTexParameterfv         ;
-		qglGetTexParameteriv         = 	logGetTexParameteriv         ;
-		qglHint                      = 	logHint                      ;
-		qglIndexMask                 = 	logIndexMask                 ;
-		qglIndexPointer              = 	logIndexPointer              ;
-		qglIndexd                    = 	logIndexd                    ;
-		qglIndexdv                   = 	logIndexdv                   ;
-		qglIndexf                    = 	logIndexf                    ;
-		qglIndexfv                   = 	logIndexfv                   ;
-		qglIndexi                    = 	logIndexi                    ;
-		qglIndexiv                   = 	logIndexiv                   ;
-		qglIndexs                    = 	logIndexs                    ;
-		qglIndexsv                   = 	logIndexsv                   ;
-		qglIndexub                   = 	logIndexub                   ;
-		qglIndexubv                  = 	logIndexubv                  ;
-		qglInitNames                 = 	logInitNames                 ;
-		qglInterleavedArrays         = 	logInterleavedArrays         ;
-		qglIsEnabled                 = 	logIsEnabled                 ;
-		qglIsList                    = 	logIsList                    ;
-		qglIsTexture                 = 	logIsTexture                 ;
-		qglLightModelf               = 	logLightModelf               ;
-		qglLightModelfv              = 	logLightModelfv              ;
-		qglLightModeli               = 	logLightModeli               ;
-		qglLightModeliv              = 	logLightModeliv              ;
-		qglLightf                    = 	logLightf                    ;
-		qglLightfv                   = 	logLightfv                   ;
-		qglLighti                    = 	logLighti                    ;
-		qglLightiv                   = 	logLightiv                   ;
-		qglLineStipple               = 	logLineStipple               ;
-		qglLineWidth                 = 	logLineWidth                 ;
-		qglListBase                  = 	logListBase                  ;
-		qglLoadIdentity              = 	logLoadIdentity              ;
-		qglLoadMatrixd               = 	logLoadMatrixd               ;
-		qglLoadMatrixf               = 	logLoadMatrixf               ;
-		qglLoadName                  = 	logLoadName                  ;
-		qglLogicOp                   = 	logLogicOp                   ;
-		qglMap1d                     = 	logMap1d                     ;
-		qglMap1f                     = 	logMap1f                     ;
-		qglMap2d                     = 	logMap2d                     ;
-		qglMap2f                     = 	logMap2f                     ;
-		qglMapGrid1d                 = 	logMapGrid1d                 ;
-		qglMapGrid1f                 = 	logMapGrid1f                 ;
-		qglMapGrid2d                 = 	logMapGrid2d                 ;
-		qglMapGrid2f                 = 	logMapGrid2f                 ;
-		qglMaterialf                 = 	logMaterialf                 ;
-		qglMaterialfv                = 	logMaterialfv                ;
-		qglMateriali                 = 	logMateriali                 ;
-		qglMaterialiv                = 	logMaterialiv                ;
-		qglMatrixMode                = 	logMatrixMode                ;
-		qglMultMatrixd               = 	logMultMatrixd               ;
-		qglMultMatrixf               = 	logMultMatrixf               ;
-		qglNewList                   = 	logNewList                   ;
-		qglNormal3b                  = 	logNormal3b                  ;
-		qglNormal3bv                 = 	logNormal3bv                 ;
-		qglNormal3d                  = 	logNormal3d                  ;
-		qglNormal3dv                 = 	logNormal3dv                 ;
-		qglNormal3f                  = 	logNormal3f                  ;
-		qglNormal3fv                 = 	logNormal3fv                 ;
-		qglNormal3i                  = 	logNormal3i                  ;
-		qglNormal3iv                 = 	logNormal3iv                 ;
-		qglNormal3s                  = 	logNormal3s                  ;
-		qglNormal3sv                 = 	logNormal3sv                 ;
-		qglNormalPointer             = 	logNormalPointer             ;
-		qglOrtho                     = 	logOrtho                     ;
-		qglPassThrough               = 	logPassThrough               ;
-		qglPixelMapfv                = 	logPixelMapfv                ;
-		qglPixelMapuiv               = 	logPixelMapuiv               ;
-		qglPixelMapusv               = 	logPixelMapusv               ;
-		qglPixelStoref               = 	logPixelStoref               ;
-		qglPixelStorei               = 	logPixelStorei               ;
-		qglPixelTransferf            = 	logPixelTransferf            ;
-		qglPixelTransferi            = 	logPixelTransferi            ;
-		qglPixelZoom                 = 	logPixelZoom                 ;
-		qglPointSize                 = 	logPointSize                 ;
-		qglPolygonMode               = 	logPolygonMode               ;
-		qglPolygonOffset             = 	logPolygonOffset             ;
-		qglPolygonStipple            = 	logPolygonStipple            ;
-		qglPopAttrib                 = 	logPopAttrib                 ;
-		qglPopClientAttrib           = 	logPopClientAttrib           ;
-		qglPopMatrix                 = 	logPopMatrix                 ;
-		qglPopName                   = 	logPopName                   ;
-		qglPrioritizeTextures        = 	logPrioritizeTextures        ;
-		qglPushAttrib                = 	logPushAttrib                ;
-		qglPushClientAttrib          = 	logPushClientAttrib          ;
-		qglPushMatrix                = 	logPushMatrix                ;
-		qglPushName                  = 	logPushName                  ;
-		qglRasterPos2d               = 	logRasterPos2d               ;
-		qglRasterPos2dv              = 	logRasterPos2dv              ;
-		qglRasterPos2f               = 	logRasterPos2f               ;
-		qglRasterPos2fv              = 	logRasterPos2fv              ;
-		qglRasterPos2i               = 	logRasterPos2i               ;
-		qglRasterPos2iv              = 	logRasterPos2iv              ;
-		qglRasterPos2s               = 	logRasterPos2s               ;
-		qglRasterPos2sv              = 	logRasterPos2sv              ;
-		qglRasterPos3d               = 	logRasterPos3d               ;
-		qglRasterPos3dv              = 	logRasterPos3dv              ;
-		qglRasterPos3f               = 	logRasterPos3f               ;
-		qglRasterPos3fv              = 	logRasterPos3fv              ;
-		qglRasterPos3i               = 	logRasterPos3i               ;
-		qglRasterPos3iv              = 	logRasterPos3iv              ;
-		qglRasterPos3s               = 	logRasterPos3s               ;
-		qglRasterPos3sv              = 	logRasterPos3sv              ;
-		qglRasterPos4d               = 	logRasterPos4d               ;
-		qglRasterPos4dv              = 	logRasterPos4dv              ;
-		qglRasterPos4f               = 	logRasterPos4f               ;
-		qglRasterPos4fv              = 	logRasterPos4fv              ;
-		qglRasterPos4i               = 	logRasterPos4i               ;
-		qglRasterPos4iv              = 	logRasterPos4iv              ;
-		qglRasterPos4s               = 	logRasterPos4s               ;
-		qglRasterPos4sv              = 	logRasterPos4sv              ;
-		qglReadBuffer                = 	logReadBuffer                ;
-		qglReadPixels                = 	logReadPixels                ;
-		qglRectd                     = 	logRectd                     ;
-		qglRectdv                    = 	logRectdv                    ;
-		qglRectf                     = 	logRectf                     ;
-		qglRectfv                    = 	logRectfv                    ;
-		qglRecti                     = 	logRecti                     ;
-		qglRectiv                    = 	logRectiv                    ;
-		qglRects                     = 	logRects                     ;
-		qglRectsv                    = 	logRectsv                    ;
-		qglRenderMode                = 	logRenderMode                ;
-		qglRotated                   = 	logRotated                   ;
-		qglRotatef                   = 	logRotatef                   ;
-		qglScaled                    = 	logScaled                    ;
-		qglScalef                    = 	logScalef                    ;
-		qglScissor                   = 	logScissor                   ;
-		qglSelectBuffer              = 	logSelectBuffer              ;
-		qglShadeModel                = 	logShadeModel                ;
-		qglStencilFunc               = 	logStencilFunc               ;
-		qglStencilMask               = 	logStencilMask               ;
-		qglStencilOp                 = 	logStencilOp                 ;
-		qglTexCoord1d                = 	logTexCoord1d                ;
-		qglTexCoord1dv               = 	logTexCoord1dv               ;
-		qglTexCoord1f                = 	logTexCoord1f                ;
-		qglTexCoord1fv               = 	logTexCoord1fv               ;
-		qglTexCoord1i                = 	logTexCoord1i                ;
-		qglTexCoord1iv               = 	logTexCoord1iv               ;
-		qglTexCoord1s                = 	logTexCoord1s                ;
-		qglTexCoord1sv               = 	logTexCoord1sv               ;
-		qglTexCoord2d                = 	logTexCoord2d                ;
-		qglTexCoord2dv               = 	logTexCoord2dv               ;
-		qglTexCoord2f                = 	logTexCoord2f                ;
-		qglTexCoord2fv               = 	logTexCoord2fv               ;
-		qglTexCoord2i                = 	logTexCoord2i                ;
-		qglTexCoord2iv               = 	logTexCoord2iv               ;
-		qglTexCoord2s                = 	logTexCoord2s                ;
-		qglTexCoord2sv               = 	logTexCoord2sv               ;
-		qglTexCoord3d                = 	logTexCoord3d                ;
-		qglTexCoord3dv               = 	logTexCoord3dv               ;
-		qglTexCoord3f                = 	logTexCoord3f                ;
-		qglTexCoord3fv               = 	logTexCoord3fv               ;
-		qglTexCoord3i                = 	logTexCoord3i                ;
-		qglTexCoord3iv               = 	logTexCoord3iv               ;
-		qglTexCoord3s                = 	logTexCoord3s                ;
-		qglTexCoord3sv               = 	logTexCoord3sv               ;
-		qglTexCoord4d                = 	logTexCoord4d                ;
-		qglTexCoord4dv               = 	logTexCoord4dv               ;
-		qglTexCoord4f                = 	logTexCoord4f                ;
-		qglTexCoord4fv               = 	logTexCoord4fv               ;
-		qglTexCoord4i                = 	logTexCoord4i                ;
-		qglTexCoord4iv               = 	logTexCoord4iv               ;
-		qglTexCoord4s                = 	logTexCoord4s                ;
-		qglTexCoord4sv               = 	logTexCoord4sv               ;
-		qglTexCoordPointer           = 	logTexCoordPointer           ;
-		qglTexEnvf                   = 	logTexEnvf                   ;
-		qglTexEnvfv                  = 	logTexEnvfv                  ;
-		qglTexEnvi                   = 	logTexEnvi                   ;
-		qglTexEnviv                  = 	logTexEnviv                  ;
-		qglTexGend                   = 	logTexGend                   ;
-		qglTexGendv                  = 	logTexGendv                  ;
-		qglTexGenf                   = 	logTexGenf                   ;
-		qglTexGenfv                  = 	logTexGenfv                  ;
-		qglTexGeni                   = 	logTexGeni                   ;
-		qglTexGeniv                  = 	logTexGeniv                  ;
-		qglTexImage1D                = 	logTexImage1D                ;
-		qglTexImage2D                = 	logTexImage2D                ;
-		qglTexParameterf             = 	logTexParameterf             ;
-		qglTexParameterfv            = 	logTexParameterfv            ;
-		qglTexParameteri             = 	logTexParameteri             ;
-		qglTexParameteriv            = 	logTexParameteriv            ;
-		qglTexSubImage1D             = 	logTexSubImage1D             ;
-		qglTexSubImage2D             = 	logTexSubImage2D             ;
-		qglTranslated                = 	logTranslated                ;
-		qglTranslatef                = 	logTranslatef                ;
-		qglVertex2d                  = 	logVertex2d                  ;
-		qglVertex2dv                 = 	logVertex2dv                 ;
-		qglVertex2f                  = 	logVertex2f                  ;
-		qglVertex2fv                 = 	logVertex2fv                 ;
-		qglVertex2i                  = 	logVertex2i                  ;
-		qglVertex2iv                 = 	logVertex2iv                 ;
-		qglVertex2s                  = 	logVertex2s                  ;
-		qglVertex2sv                 = 	logVertex2sv                 ;
-		qglVertex3d                  = 	logVertex3d                  ;
-		qglVertex3dv                 = 	logVertex3dv                 ;
-		qglVertex3f                  = 	logVertex3f                  ;
-		qglVertex3fv                 = 	logVertex3fv                 ;
-		qglVertex3i                  = 	logVertex3i                  ;
-		qglVertex3iv                 = 	logVertex3iv                 ;
-		qglVertex3s                  = 	logVertex3s                  ;
-		qglVertex3sv                 = 	logVertex3sv                 ;
-		qglVertex4d                  = 	logVertex4d                  ;
-		qglVertex4dv                 = 	logVertex4dv                 ;
-		qglVertex4f                  = 	logVertex4f                  ;
-		qglVertex4fv                 = 	logVertex4fv                 ;
-		qglVertex4i                  = 	logVertex4i                  ;
-		qglVertex4iv                 = 	logVertex4iv                 ;
-		qglVertex4s                  = 	logVertex4s                  ;
-		qglVertex4sv                 = 	logVertex4sv                 ;
-		qglVertexPointer             = 	logVertexPointer             ;
-		qglViewport                  = 	logViewport                  ;
-	}
-	else
-	{
-		qglAccum                     = dllAccum;
-		qglAlphaFunc                 = dllAlphaFunc;
-		qglAreTexturesResident       = dllAreTexturesResident;
-		qglArrayElement              = dllArrayElement;
-		qglBegin                     = dllBegin;
-		qglBindTexture               = dllBindTexture;
-		qglBitmap                    = dllBitmap;
-		qglBlendFunc                 = dllBlendFunc;
-		qglCallList                  = dllCallList;
-		qglCallLists                 = dllCallLists;
-		qglClear                     = dllClear;
-		qglClearAccum                = dllClearAccum;
-		qglClearColor                = dllClearColor;
-		qglClearDepth                = dllClearDepth;
-		qglClearIndex                = dllClearIndex;
-		qglClearStencil              = dllClearStencil;
-		qglClipPlane                 = dllClipPlane;
-		qglColor3b                   = dllColor3b;
-		qglColor3bv                  = dllColor3bv;
-		qglColor3d                   = dllColor3d;
-		qglColor3dv                  = dllColor3dv;
-		qglColor3f                   = dllColor3f;
-		qglColor3fv                  = dllColor3fv;
-		qglColor3i                   = dllColor3i;
-		qglColor3iv                  = dllColor3iv;
-		qglColor3s                   = dllColor3s;
-		qglColor3sv                  = dllColor3sv;
-		qglColor3ub                  = dllColor3ub;
-		qglColor3ubv                 = dllColor3ubv;
-		qglColor3ui                  = dllColor3ui;
-		qglColor3uiv                 = dllColor3uiv;
-		qglColor3us                  = dllColor3us;
-		qglColor3usv                 = dllColor3usv;
-		qglColor4b                   = dllColor4b;
-		qglColor4bv                  = dllColor4bv;
-		qglColor4d                   = dllColor4d;
-		qglColor4dv                  = dllColor4dv;
-		qglColor4f                   = dllColor4f;
-		qglColor4fv                  = dllColor4fv;
-		qglColor4i                   = dllColor4i;
-		qglColor4iv                  = dllColor4iv;
-		qglColor4s                   = dllColor4s;
-		qglColor4sv                  = dllColor4sv;
-		qglColor4ub                  = dllColor4ub;
-		qglColor4ubv                 = dllColor4ubv;
-		qglColor4ui                  = dllColor4ui;
-		qglColor4uiv                 = dllColor4uiv;
-		qglColor4us                  = dllColor4us;
-		qglColor4usv                 = dllColor4usv;
-		qglColorMask                 = dllColorMask;
-		qglColorMaterial             = dllColorMaterial;
-		qglColorPointer              = dllColorPointer;
-		qglCopyPixels                = dllCopyPixels;
-		qglCopyTexImage1D            = dllCopyTexImage1D;
-		qglCopyTexImage2D            = dllCopyTexImage2D;
-		qglCopyTexSubImage1D         = dllCopyTexSubImage1D;
-		qglCopyTexSubImage2D         = dllCopyTexSubImage2D;
-		qglCullFace                  = dllCullFace;
-		qglDeleteLists               = dllDeleteLists ;
-		qglDeleteTextures            = dllDeleteTextures ;
-		qglDepthFunc                 = dllDepthFunc ;
-		qglDepthMask                 = dllDepthMask ;
-		qglDepthRange                = dllDepthRange ;
-		qglDisable                   = dllDisable ;
-		qglDisableClientState        = dllDisableClientState ;
-		qglDrawArrays                = dllDrawArrays ;
-		qglDrawBuffer                = dllDrawBuffer ;
-		qglDrawElements              = dllDrawElements ;
-		qglDrawPixels                = dllDrawPixels ;
-		qglEdgeFlag                  = dllEdgeFlag ;
-		qglEdgeFlagPointer           = dllEdgeFlagPointer ;
-		qglEdgeFlagv                 = dllEdgeFlagv ;
-		qglEnable                    = 	dllEnable                    ;
-		qglEnableClientState         = 	dllEnableClientState         ;
-		qglEnd                       = 	dllEnd                       ;
-		qglEndList                   = 	dllEndList                   ;
-		qglEvalCoord1d				 = 	dllEvalCoord1d				 ;
-		qglEvalCoord1dv              = 	dllEvalCoord1dv              ;
-		qglEvalCoord1f               = 	dllEvalCoord1f               ;
-		qglEvalCoord1fv              = 	dllEvalCoord1fv              ;
-		qglEvalCoord2d               = 	dllEvalCoord2d               ;
-		qglEvalCoord2dv              = 	dllEvalCoord2dv              ;
-		qglEvalCoord2f               = 	dllEvalCoord2f               ;
-		qglEvalCoord2fv              = 	dllEvalCoord2fv              ;
-		qglEvalMesh1                 = 	dllEvalMesh1                 ;
-		qglEvalMesh2                 = 	dllEvalMesh2                 ;
-		qglEvalPoint1                = 	dllEvalPoint1                ;
-		qglEvalPoint2                = 	dllEvalPoint2                ;
-		qglFeedbackBuffer            = 	dllFeedbackBuffer            ;
-		qglFinish                    = 	dllFinish                    ;
-		qglFlush                     = 	dllFlush                     ;
-		qglFogf                      = 	dllFogf                      ;
-		qglFogfv                     = 	dllFogfv                     ;
-		qglFogi                      = 	dllFogi                      ;
-		qglFogiv                     = 	dllFogiv                     ;
-		qglFrontFace                 = 	dllFrontFace                 ;
-		qglFrustum                   = 	dllFrustum                   ;
-		qglGenLists                  = 	dllGenLists                  ;
-		qglGenTextures               = 	dllGenTextures               ;
-		qglGetBooleanv               = 	dllGetBooleanv               ;
-		qglGetClipPlane              = 	dllGetClipPlane              ;
-		qglGetDoublev                = 	dllGetDoublev                ;
-		qglGetError                  = 	dllGetError                  ;
-		qglGetFloatv                 = 	dllGetFloatv                 ;
-		qglGetIntegerv               = 	dllGetIntegerv               ;
-		qglGetLightfv                = 	dllGetLightfv                ;
-		qglGetLightiv                = 	dllGetLightiv                ;
-		qglGetMapdv                  = 	dllGetMapdv                  ;
-		qglGetMapfv                  = 	dllGetMapfv                  ;
-		qglGetMapiv                  = 	dllGetMapiv                  ;
-		qglGetMaterialfv             = 	dllGetMaterialfv             ;
-		qglGetMaterialiv             = 	dllGetMaterialiv             ;
-		qglGetPixelMapfv             = 	dllGetPixelMapfv             ;
-		qglGetPixelMapuiv            = 	dllGetPixelMapuiv            ;
-		qglGetPixelMapusv            = 	dllGetPixelMapusv            ;
-		qglGetPointerv               = 	dllGetPointerv               ;
-		qglGetPolygonStipple         = 	dllGetPolygonStipple         ;
-		qglGetString                 = 	dllGetString                 ;
-		qglGetTexEnvfv               = 	dllGetTexEnvfv               ;
-		qglGetTexEnviv               = 	dllGetTexEnviv               ;
-		qglGetTexGendv               = 	dllGetTexGendv               ;
-		qglGetTexGenfv               = 	dllGetTexGenfv               ;
-		qglGetTexGeniv               = 	dllGetTexGeniv               ;
-		qglGetTexImage               = 	dllGetTexImage               ;
-		qglGetTexLevelParameterfv    = 	dllGetTexLevelParameterfv    ;
-		qglGetTexLevelParameteriv    = 	dllGetTexLevelParameteriv    ;
-		qglGetTexParameterfv         = 	dllGetTexParameterfv         ;
-		qglGetTexParameteriv         = 	dllGetTexParameteriv         ;
-		qglHint                      = 	dllHint                      ;
-		qglIndexMask                 = 	dllIndexMask                 ;
-		qglIndexPointer              = 	dllIndexPointer              ;
-		qglIndexd                    = 	dllIndexd                    ;
-		qglIndexdv                   = 	dllIndexdv                   ;
-		qglIndexf                    = 	dllIndexf                    ;
-		qglIndexfv                   = 	dllIndexfv                   ;
-		qglIndexi                    = 	dllIndexi                    ;
-		qglIndexiv                   = 	dllIndexiv                   ;
-		qglIndexs                    = 	dllIndexs                    ;
-		qglIndexsv                   = 	dllIndexsv                   ;
-		qglIndexub                   = 	dllIndexub                   ;
-		qglIndexubv                  = 	dllIndexubv                  ;
-		qglInitNames                 = 	dllInitNames                 ;
-		qglInterleavedArrays         = 	dllInterleavedArrays         ;
-		qglIsEnabled                 = 	dllIsEnabled                 ;
-		qglIsList                    = 	dllIsList                    ;
-		qglIsTexture                 = 	dllIsTexture                 ;
-		qglLightModelf               = 	dllLightModelf               ;
-		qglLightModelfv              = 	dllLightModelfv              ;
-		qglLightModeli               = 	dllLightModeli               ;
-		qglLightModeliv              = 	dllLightModeliv              ;
-		qglLightf                    = 	dllLightf                    ;
-		qglLightfv                   = 	dllLightfv                   ;
-		qglLighti                    = 	dllLighti                    ;
-		qglLightiv                   = 	dllLightiv                   ;
-		qglLineStipple               = 	dllLineStipple               ;
-		qglLineWidth                 = 	dllLineWidth                 ;
-		qglListBase                  = 	dllListBase                  ;
-		qglLoadIdentity              = 	dllLoadIdentity              ;
-		qglLoadMatrixd               = 	dllLoadMatrixd               ;
-		qglLoadMatrixf               = 	dllLoadMatrixf               ;
-		qglLoadName                  = 	dllLoadName                  ;
-		qglLogicOp                   = 	dllLogicOp                   ;
-		qglMap1d                     = 	dllMap1d                     ;
-		qglMap1f                     = 	dllMap1f                     ;
-		qglMap2d                     = 	dllMap2d                     ;
-		qglMap2f                     = 	dllMap2f                     ;
-		qglMapGrid1d                 = 	dllMapGrid1d                 ;
-		qglMapGrid1f                 = 	dllMapGrid1f                 ;
-		qglMapGrid2d                 = 	dllMapGrid2d                 ;
-		qglMapGrid2f                 = 	dllMapGrid2f                 ;
-		qglMaterialf                 = 	dllMaterialf                 ;
-		qglMaterialfv                = 	dllMaterialfv                ;
-		qglMateriali                 = 	dllMateriali                 ;
-		qglMaterialiv                = 	dllMaterialiv                ;
-		qglMatrixMode                = 	dllMatrixMode                ;
-		qglMultMatrixd               = 	dllMultMatrixd               ;
-		qglMultMatrixf               = 	dllMultMatrixf               ;
-		qglNewList                   = 	dllNewList                   ;
-		qglNormal3b                  = 	dllNormal3b                  ;
-		qglNormal3bv                 = 	dllNormal3bv                 ;
-		qglNormal3d                  = 	dllNormal3d                  ;
-		qglNormal3dv                 = 	dllNormal3dv                 ;
-		qglNormal3f                  = 	dllNormal3f                  ;
-		qglNormal3fv                 = 	dllNormal3fv                 ;
-		qglNormal3i                  = 	dllNormal3i                  ;
-		qglNormal3iv                 = 	dllNormal3iv                 ;
-		qglNormal3s                  = 	dllNormal3s                  ;
-		qglNormal3sv                 = 	dllNormal3sv                 ;
-		qglNormalPointer             = 	dllNormalPointer             ;
-		qglOrtho                     = 	dllOrtho                     ;
-		qglPassThrough               = 	dllPassThrough               ;
-		qglPixelMapfv                = 	dllPixelMapfv                ;
-		qglPixelMapuiv               = 	dllPixelMapuiv               ;
-		qglPixelMapusv               = 	dllPixelMapusv               ;
-		qglPixelStoref               = 	dllPixelStoref               ;
-		qglPixelStorei               = 	dllPixelStorei               ;
-		qglPixelTransferf            = 	dllPixelTransferf            ;
-		qglPixelTransferi            = 	dllPixelTransferi            ;
-		qglPixelZoom                 = 	dllPixelZoom                 ;
-		qglPointSize                 = 	dllPointSize                 ;
-		qglPolygonMode               = 	dllPolygonMode               ;
-		qglPolygonOffset             = 	dllPolygonOffset             ;
-		qglPolygonStipple            = 	dllPolygonStipple            ;
-		qglPopAttrib                 = 	dllPopAttrib                 ;
-		qglPopClientAttrib           = 	dllPopClientAttrib           ;
-		qglPopMatrix                 = 	dllPopMatrix                 ;
-		qglPopName                   = 	dllPopName                   ;
-		qglPrioritizeTextures        = 	dllPrioritizeTextures        ;
-		qglPushAttrib                = 	dllPushAttrib                ;
-		qglPushClientAttrib          = 	dllPushClientAttrib          ;
-		qglPushMatrix                = 	dllPushMatrix                ;
-		qglPushName                  = 	dllPushName                  ;
-		qglRasterPos2d               = 	dllRasterPos2d               ;
-		qglRasterPos2dv              = 	dllRasterPos2dv              ;
-		qglRasterPos2f               = 	dllRasterPos2f               ;
-		qglRasterPos2fv              = 	dllRasterPos2fv              ;
-		qglRasterPos2i               = 	dllRasterPos2i               ;
-		qglRasterPos2iv              = 	dllRasterPos2iv              ;
-		qglRasterPos2s               = 	dllRasterPos2s               ;
-		qglRasterPos2sv              = 	dllRasterPos2sv              ;
-		qglRasterPos3d               = 	dllRasterPos3d               ;
-		qglRasterPos3dv              = 	dllRasterPos3dv              ;
-		qglRasterPos3f               = 	dllRasterPos3f               ;
-		qglRasterPos3fv              = 	dllRasterPos3fv              ;
-		qglRasterPos3i               = 	dllRasterPos3i               ;
-		qglRasterPos3iv              = 	dllRasterPos3iv              ;
-		qglRasterPos3s               = 	dllRasterPos3s               ;
-		qglRasterPos3sv              = 	dllRasterPos3sv              ;
-		qglRasterPos4d               = 	dllRasterPos4d               ;
-		qglRasterPos4dv              = 	dllRasterPos4dv              ;
-		qglRasterPos4f               = 	dllRasterPos4f               ;
-		qglRasterPos4fv              = 	dllRasterPos4fv              ;
-		qglRasterPos4i               = 	dllRasterPos4i               ;
-		qglRasterPos4iv              = 	dllRasterPos4iv              ;
-		qglRasterPos4s               = 	dllRasterPos4s               ;
-		qglRasterPos4sv              = 	dllRasterPos4sv              ;
-		qglReadBuffer                = 	dllReadBuffer                ;
-		qglReadPixels                = 	dllReadPixels                ;
-		qglRectd                     = 	dllRectd                     ;
-		qglRectdv                    = 	dllRectdv                    ;
-		qglRectf                     = 	dllRectf                     ;
-		qglRectfv                    = 	dllRectfv                    ;
-		qglRecti                     = 	dllRecti                     ;
-		qglRectiv                    = 	dllRectiv                    ;
-		qglRects                     = 	dllRects                     ;
-		qglRectsv                    = 	dllRectsv                    ;
-		qglRenderMode                = 	dllRenderMode                ;
-		qglRotated                   = 	dllRotated                   ;
-		qglRotatef                   = 	dllRotatef                   ;
-		qglScaled                    = 	dllScaled                    ;
-		qglScalef                    = 	dllScalef                    ;
-		qglScissor                   = 	dllScissor                   ;
-		qglSelectBuffer              = 	dllSelectBuffer              ;
-		qglShadeModel                = 	dllShadeModel                ;
-		qglStencilFunc               = 	dllStencilFunc               ;
-		qglStencilMask               = 	dllStencilMask               ;
-		qglStencilOp                 = 	dllStencilOp                 ;
-		qglTexCoord1d                = 	dllTexCoord1d                ;
-		qglTexCoord1dv               = 	dllTexCoord1dv               ;
-		qglTexCoord1f                = 	dllTexCoord1f                ;
-		qglTexCoord1fv               = 	dllTexCoord1fv               ;
-		qglTexCoord1i                = 	dllTexCoord1i                ;
-		qglTexCoord1iv               = 	dllTexCoord1iv               ;
-		qglTexCoord1s                = 	dllTexCoord1s                ;
-		qglTexCoord1sv               = 	dllTexCoord1sv               ;
-		qglTexCoord2d                = 	dllTexCoord2d                ;
-		qglTexCoord2dv               = 	dllTexCoord2dv               ;
-		qglTexCoord2f                = 	dllTexCoord2f                ;
-		qglTexCoord2fv               = 	dllTexCoord2fv               ;
-		qglTexCoord2i                = 	dllTexCoord2i                ;
-		qglTexCoord2iv               = 	dllTexCoord2iv               ;
-		qglTexCoord2s                = 	dllTexCoord2s                ;
-		qglTexCoord2sv               = 	dllTexCoord2sv               ;
-		qglTexCoord3d                = 	dllTexCoord3d                ;
-		qglTexCoord3dv               = 	dllTexCoord3dv               ;
-		qglTexCoord3f                = 	dllTexCoord3f                ;
-		qglTexCoord3fv               = 	dllTexCoord3fv               ;
-		qglTexCoord3i                = 	dllTexCoord3i                ;
-		qglTexCoord3iv               = 	dllTexCoord3iv               ;
-		qglTexCoord3s                = 	dllTexCoord3s                ;
-		qglTexCoord3sv               = 	dllTexCoord3sv               ;
-		qglTexCoord4d                = 	dllTexCoord4d                ;
-		qglTexCoord4dv               = 	dllTexCoord4dv               ;
-		qglTexCoord4f                = 	dllTexCoord4f                ;
-		qglTexCoord4fv               = 	dllTexCoord4fv               ;
-		qglTexCoord4i                = 	dllTexCoord4i                ;
-		qglTexCoord4iv               = 	dllTexCoord4iv               ;
-		qglTexCoord4s                = 	dllTexCoord4s                ;
-		qglTexCoord4sv               = 	dllTexCoord4sv               ;
-		qglTexCoordPointer           = 	dllTexCoordPointer           ;
-		qglTexEnvf                   = 	dllTexEnvf                   ;
-		qglTexEnvfv                  = 	dllTexEnvfv                  ;
-		qglTexEnvi                   = 	dllTexEnvi                   ;
-		qglTexEnviv                  = 	dllTexEnviv                  ;
-		qglTexGend                   = 	dllTexGend                   ;
-		qglTexGendv                  = 	dllTexGendv                  ;
-		qglTexGenf                   = 	dllTexGenf                   ;
-		qglTexGenfv                  = 	dllTexGenfv                  ;
-		qglTexGeni                   = 	dllTexGeni                   ;
-		qglTexGeniv                  = 	dllTexGeniv                  ;
-		qglTexImage1D                = 	dllTexImage1D                ;
-		qglTexImage2D                = 	dllTexImage2D                ;
-		qglTexParameterf             = 	dllTexParameterf             ;
-		qglTexParameterfv            = 	dllTexParameterfv            ;
-		qglTexParameteri             = 	dllTexParameteri             ;
-		qglTexParameteriv            = 	dllTexParameteriv            ;
-		qglTexSubImage1D             = 	dllTexSubImage1D             ;
-		qglTexSubImage2D             = 	dllTexSubImage2D             ;
-		qglTranslated                = 	dllTranslated                ;
-		qglTranslatef                = 	dllTranslatef                ;
-		qglVertex2d                  = 	dllVertex2d                  ;
-		qglVertex2dv                 = 	dllVertex2dv                 ;
-		qglVertex2f                  = 	dllVertex2f                  ;
-		qglVertex2fv                 = 	dllVertex2fv                 ;
-		qglVertex2i                  = 	dllVertex2i                  ;
-		qglVertex2iv                 = 	dllVertex2iv                 ;
-		qglVertex2s                  = 	dllVertex2s                  ;
-		qglVertex2sv                 = 	dllVertex2sv                 ;
-		qglVertex3d                  = 	dllVertex3d                  ;
-		qglVertex3dv                 = 	dllVertex3dv                 ;
-		qglVertex3f                  = 	dllVertex3f                  ;
-		qglVertex3fv                 = 	dllVertex3fv                 ;
-		qglVertex3i                  = 	dllVertex3i                  ;
-		qglVertex3iv                 = 	dllVertex3iv                 ;
-		qglVertex3s                  = 	dllVertex3s                  ;
-		qglVertex3sv                 = 	dllVertex3sv                 ;
-		qglVertex4d                  = 	dllVertex4d                  ;
-		qglVertex4dv                 = 	dllVertex4dv                 ;
-		qglVertex4f                  = 	dllVertex4f                  ;
-		qglVertex4fv                 = 	dllVertex4fv                 ;
-		qglVertex4i                  = 	dllVertex4i                  ;
-		qglVertex4iv                 = 	dllVertex4iv                 ;
-		qglVertex4s                  = 	dllVertex4s                  ;
-		qglVertex4sv                 = 	dllVertex4sv                 ;
-		qglVertexPointer             = 	dllVertexPointer             ;
-		qglViewport                  = 	dllViewport                  ;
-	}
-}
-
-
-void GLimp_LogNewFrame( void )
-{
-	fprintf( glw_state.log_fp, "*** R_BeginFrame ***\n" );
-}
-
-
diff --git a/code/unix/linux_signals.c b/code/unix/linux_signals.c
deleted file mode 100644
index dc895302..00000000
--- a/code/unix/linux_signals.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include <signal.h>
-#include <execinfo.h>
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-#ifndef DEDICATED
-#include "../renderer/tr_local.h"
-#endif
-
-static qboolean signalcaught = qfalse;;
-
-void Sys_Exit(int); // bk010104 - abstraction
-
-static void signal_handler(int sig) // bk010104 - replace this... (NOTE TTimo huh?)
-{
-	void* arr[20];
-	size_t size;
-
-	// get void*'s for all entries on the stack
-	size = backtrace(arr, sizeof(arr) / sizeof(arr[0]));
-
-	if (signalcaught)
-	{
-		printf("DOUBLE SIGNAL FAULT: Received signal %d, exiting...\n", sig);
-		Sys_Exit(1); // bk010104 - abstraction
-	}
-
-	signalcaught = qtrue;
-	printf("Received signal %d, exiting...\n", sig);
-	backtrace_symbols_fd(arr, size, STDERR_FILENO);
-#ifndef DEDICATED
-	GLimp_Shutdown(); // bk010104 - shouldn't this be CL_Shutdown
-#endif
-	Sys_Exit(0); // bk010104 - abstraction NOTE TTimo send a 0 to avoid DOUBLE SIGNAL FAULT
-}
-
-void InitSig(void)
-{
-	signal(SIGHUP, signal_handler);
-	signal(SIGQUIT, signal_handler);
-	signal(SIGILL, signal_handler);
-	signal(SIGTRAP, signal_handler);
-	signal(SIGIOT, signal_handler);
-	signal(SIGBUS, signal_handler);
-	signal(SIGFPE, signal_handler);
-	signal(SIGSEGV, signal_handler);
-	signal(SIGTERM, signal_handler);
-}
diff --git a/code/unix/linux_snd.c b/code/unix/linux_snd.c
deleted file mode 100644
index 2d3c6733..00000000
--- a/code/unix/linux_snd.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/shm.h>
-#include <sys/wait.h>
-#ifdef __linux__ // rb0101023 - guard this
-#include <linux/soundcard.h>
-#endif
-#ifdef __FreeBSD__ // rb0101023 - added
-#include <sys/soundcard.h>
-#endif
-#include <stdio.h>
-
-#include "../qcommon/q_shared.h"
-#include "../client/snd_local.h"
-
-int audio_fd;
-int snd_inited=0;
-
-cvar_t *sndbits;
-cvar_t *sndspeed;
-cvar_t *sndchannels;
-
-cvar_t *snddevice;
-
-/* Some devices may work only with 48000 */
-static int tryrates[] = { 22050, 11025, 44100, 48000, 8000 };
-
-static qboolean use_custom_memset = qfalse;
-// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371 
-void Snd_Memset (void* dest, const int val, const size_t count)
-{
-  int *pDest;
-  int i, iterate;
-
-  if (!use_custom_memset)
-  {
-    Com_Memset(dest,val,count);
-    return;
-  }
-  iterate = count / sizeof(int);
-  pDest = (int*)dest;
-  for(i=0; i<iterate; i++)
-  {
-    pDest[i] = val;
-  }
-}
-
-qboolean SNDDMA_Init(void)
-{
-	int rc;
-    int fmt;
-	int tmp;
-    int i;
-    // char *s; // bk001204 - unused
-	struct audio_buf_info info;
-	int caps;
-	extern uid_t saved_euid;
-
-	if (snd_inited)
-		return 1;
-
-	if (!snddevice) {
-		sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE);
-		sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE);
-		sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE);
-		snddevice = Cvar_Get("snddevice", "/dev/dsp", CVAR_ARCHIVE);
-	}
-
-	// open /dev/dsp, confirm capability to mmap, and get size of dma buffer
-	if (!audio_fd) {
-		seteuid(saved_euid);
-
-		audio_fd = open(snddevice->string, O_RDWR);
-
-		seteuid(getuid());
-
-		if (audio_fd < 0) {
-			perror(snddevice->string);
-			Com_Printf("Could not open %s\n", snddevice->string);
-			return 0;
-			}
-	}
-
-	if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps) == -1) {
-		perror(snddevice->string);
-        Com_Printf("Sound driver too old\n");
-		close(audio_fd);
-		return 0;
-	}
-
-	if (!(caps & DSP_CAP_TRIGGER) || !(caps & DSP_CAP_MMAP)) {
-		Com_Printf("Sorry but your soundcard can't do this\n");
-		close(audio_fd);
-		return 0;
-	}
-
-
-	/* SNDCTL_DSP_GETOSPACE moved to be called later */
-    
-	// set sample bits & speed
-  dma.samplebits = (int)sndbits->value;
-	if (dma.samplebits != 16 && dma.samplebits != 8) {
-        ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
-        if (fmt & AFMT_S16_LE) 
-			dma.samplebits = 16;
-        else if (fmt & AFMT_U8) 
-			dma.samplebits = 8;
-    }
-
-	dma.speed = (int)sndspeed->value;
-	if (!dma.speed) {
-        for (i=0 ; i<sizeof(tryrates)/4 ; i++)
-            if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i])) 
-				break;
-        dma.speed = tryrates[i];
-    }
-
-	dma.channels = (int)sndchannels->value;
-	if (dma.channels < 1 || dma.channels > 2)
-		dma.channels = 2;
-        
-/*  mmap() call moved forward */
-
-	tmp = 0;
-	if (dma.channels == 2)
-		tmp = 1;
-    rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp);
-    if (rc < 0) {
-		perror(snddevice->string);
-        Com_Printf("Could not set %s to stereo=%d", snddevice->string, dma.channels);
-		close(audio_fd);
-        return 0;
-    }
-
-	if (tmp)
-		dma.channels = 2;
-	else
-		dma.channels = 1;
-
-    rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &dma.speed);
-    if (rc < 0) {
-		perror(snddevice->string);
-        Com_Printf("Could not set %s speed to %d", snddevice->string, dma.speed);
-		close(audio_fd);
-        return 0;
-    }
-
-    if (dma.samplebits == 16) {
-        rc = AFMT_S16_LE;
-        rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
-        if (rc < 0) {
-			perror(snddevice->string);
-			Com_Printf("Could not support 16-bit data.  Try 8-bit.\n");
-			close(audio_fd);
-			return 0;
-		}
-    } else if (dma.samplebits == 8) {
-        rc = AFMT_U8;
-        rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc);
-        if (rc < 0) {
-			perror(snddevice->string);
-			Com_Printf("Could not support 8-bit data.\n");
-			close(audio_fd);
-			return 0;
-		}
-    } else {
-		perror(snddevice->string);
-		Com_Printf("%d-bit sound not supported.", dma.samplebits);
-		close(audio_fd);
-		return 0;
-	}
-
-    if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1) {   
-        perror("GETOSPACE");
-		Com_Printf("Um, can't do GETOSPACE?\n");
-		close(audio_fd);
-		return 0;
-    }
-
-	dma.samples = info.fragstotal * info.fragsize / (dma.samplebits/8);
-	dma.submission_chunk = 1;
-
-	// memory map the dma buffer
-
-  // TTimo 2001/10/08 added PROT_READ to the mmap
-  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=371
-  // checking Alsa bug, doesn't allow dma alloc with PROT_READ?
-
-	if (!dma.buffer)
-		dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal
-			* info.fragsize, PROT_WRITE|PROT_READ, MAP_FILE|MAP_SHARED, audio_fd, 0);
-
-  if (dma.buffer == MAP_FAILED)
-  {
-    Com_Printf("Could not mmap dma buffer PROT_WRITE|PROT_READ\n");
-    Com_Printf("trying mmap PROT_WRITE (with associated better compatibility / less performance code)\n");
-		dma.buffer = (unsigned char *) mmap(NULL, info.fragstotal
-			* info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
-    // NOTE TTimo could add a variable to force using regular memset on systems that are known to be safe
-    use_custom_memset = qtrue;
-  }
-
-	if (dma.buffer == MAP_FAILED) {
-		perror(snddevice->string);
-		Com_Printf("Could not mmap %s\n", snddevice->string);
-		close(audio_fd);
-		return 0;
-	}
-
-	// toggle the trigger & start her up
-
-  tmp = 0;
-  rc  = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
-	if (rc < 0) {
-		perror(snddevice->string);
-		Com_Printf("Could not toggle.\n");
-		close(audio_fd);
-		return 0;
-	}
-
-  tmp = PCM_ENABLE_OUTPUT;
-  rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
-	if (rc < 0) {
-		perror(snddevice->string);
-		Com_Printf("Could not toggle.\n");
-		close(audio_fd);
-
-		return 0;
-	}
-
-	snd_inited = 1;
-	return 1;
-}
-
-int SNDDMA_GetDMAPos(void)
-{
-	struct count_info count;
-
-	if (!snd_inited) return 0;
-
-	if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count) == -1) {
-		perror(snddevice->string);
-		Com_Printf("Uh, sound dead.\n");
-		close(audio_fd);
-		snd_inited = 0;
-		return 0;
-	}
-	return count.ptr / (dma.samplebits / 8);
-}
-
-void SNDDMA_Shutdown(void)
-{
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-}
-
-void SNDDMA_BeginPainting (void)
-{
-}
diff --git a/code/unix/matha.s b/code/unix/matha.s
deleted file mode 100644
index 2f7b31c7..00000000
--- a/code/unix/matha.s
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//
-// math.s
-// x86 assembly-language math routines.
-
-#define GLQUAKE	1	// don't include unneeded defs
-#include "qasm.h"
-
-
-#if	id386
-
-	.data
-
-	.align	4
-Ljmptab:	.long	Lcase0, Lcase1, Lcase2, Lcase3
-			.long	Lcase4, Lcase5, Lcase6, Lcase7
-
-	.text
-
-// TODO: rounding needed?
-// stack parameter offset
-#define	val	4
-
-.globl C(Invert24To16)
-C(Invert24To16):
-
-	movl	val(%esp),%ecx
-	movl	$0x100,%edx		// 0x10000000000 as dividend
-	cmpl	%edx,%ecx
-	jle		LOutOfRange
-
-	subl	%eax,%eax
-	divl	%ecx
-
-	ret
-
-LOutOfRange:
-	movl	$0xFFFFFFFF,%eax
-	ret
-
-#if 0
-
-#define	in	4
-#define out	8
-
-	.align 2
-.globl C(TransformVector)
-C(TransformVector):
-	movl	in(%esp),%eax
-	movl	out(%esp),%edx
-
-	flds	(%eax)		// in[0]
-	fmuls	C(vright)		// in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vright[0]
-	fmuls	C(vup)		// in[0]*vup[0] | in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vup[0] | in[0]*vright[0]
-	fmuls	C(vpn)		// in[0]*vpn[0] | in[0]*vup[0] | in[0]*vright[0]
-
-	flds	4(%eax)		// in[1] | ...
-	fmuls	C(vright)+4	// in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vright[1] | ...
-	fmuls	C(vup)+4		// in[1]*vup[1] | in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fmuls	C(vpn)+4		// in[1]*vpn[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fxch	%st(2)		// in[1]*vright[1] | in[1]*vup[1] | in[1]*vpn[1] | ...
-
-	faddp	%st(0),%st(5)	// in[1]*vup[1] | in[1]*vpn[1] | ...
-	faddp	%st(0),%st(3)	// in[1]*vpn[1] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	flds	8(%eax)		// in[2] | ...
-	fmuls	C(vright)+8	// in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vright[2] | ...
-	fmuls	C(vup)+8		// in[2]*vup[2] | in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fmuls	C(vpn)+8		// in[2]*vpn[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fxch	%st(2)		// in[2]*vright[2] | in[2]*vup[2] | in[2]*vpn[2] | ...
-
-	faddp	%st(0),%st(5)	// in[2]*vup[2] | in[2]*vpn[2] | ...
-	faddp	%st(0),%st(3)	// in[2]*vpn[2] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	fstps	8(%edx)		// out[2]
-	fstps	4(%edx)		// out[1]
-	fstps	(%edx)		// out[0]
-
-	ret
-
-#endif
-
-#define EMINS	4+4
-#define EMAXS	4+8
-#define P		4+12
-
-	.align 2
-.globl C(BoxOnPlaneSide)
-C(BoxOnPlaneSide):
-	pushl	%ebx
-
-	movl	P(%esp),%edx
-	movl	EMINS(%esp),%ecx
-	xorl	%eax,%eax
-	movl	EMAXS(%esp),%ebx
-	movb	pl_signbits(%edx),%al
-	cmpb	$8,%al
-	jge		Lerror
-	flds	pl_normal(%edx)		// p->normal[0]
-	fld		%st(0)				// p->normal[0] | p->normal[0]
-	// bk000422 - warning: missing prefix `*' in absolute indirect address, maybe misassembled!
-	// bk001129 - fix from Andrew Henderson, was: Ljmptab(,%eax,4) 
-	jmp		*Ljmptab(,%eax,4)
-
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase0:
-	fmuls	(%ebx)				// p->normal[0]*emaxs[0] | p->normal[0]
-	flds	pl_normal+4(%edx)	// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]
-	fxch	%st(2)				// p->normal[0] | p->normal[0]*emaxs[0] |
-								//  p->normal[1]
-	fmuls	(%ecx)				// p->normal[0]*emins[0] |
-								//  p->normal[0]*emaxs[0] | p->normal[1]
-	fxch	%st(2)				// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ebx)				// p->normal[1]*emaxs[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	flds	pl_normal+8(%edx)	// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[1] | p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ecx)				// p->normal[1]*emins[1] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[2] | p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	8(%ebx)				// p->normal[2]*emaxs[2] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(5)				// p->normal[0]*emins[0] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fmuls	8(%ecx)				//p->normal[2]*emins[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fxch	%st(1)				//p->normal[1]*emaxs[1] |
-								// p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emaxs[2]
-	fxch	%st(3)				//p->normal[2]*emaxs[2] +
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emins[2]
-	faddp	%st(0),%st(2)		//p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// dist1 | p->normal[2]*emins[2]
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase1:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase2:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase3:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase4:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase5:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase6:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase7:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-LSetSides:
-
-//	sides = 0;
-//	if (dist1 >= p->dist)
-//		sides = 1;
-//	if (dist2 < p->dist)
-//		sides |= 2;
-
-	faddp	%st(0),%st(2)		// dist1 | dist2
-	fcomps	pl_dist(%edx)
-	xorl	%ecx,%ecx
-	fnstsw	%ax
-	fcomps	pl_dist(%edx)
-	andb	$1,%ah
-	xorb	$1,%ah
-	addb	%ah,%cl
-
-	fnstsw	%ax
-	andb	$1,%ah
-	addb	%ah,%ah
-	addb	%ah,%cl
-
-//	return sides;
-
-	popl	%ebx
-	movl	%ecx,%eax	// return status
-
-	ret
-
-
-Lerror:
-	movl	1, %eax
-	ret
-
-#endif	// id386
diff --git a/code/unix/pcons-2.3.1 b/code/unix/pcons-2.3.1
deleted file mode 100644
index 550297fb..00000000
--- a/code/unix/pcons-2.3.1
+++ /dev/null
@@ -1,7911 +0,0 @@
-#!/usr/bin/env perl
-
-#
-# Revision history:
-# -----------------
-# July 2001, Thomas Gleerup <tgl@oticon.dk>
-#   1) pcons-1.6 (John Erickson, August 1999) merged into cons-2.3.0.
-#   2) Added automatic insertion of && for multi-line commands.
-#
-# September 2001, Thomas Gleerup <tgl@oticon.dk>
-#   1) Updated with Kevin Nolish's multi-line improvement.
-#   2) Improved this so that single [perl] commands can still be used.
-#
-
-# NOTE:  Cons intentionally does not use the "perl -w" option or
-# "use strict."  Because Cons "configuration files" are actually
-# Perl scripts, enabling those restrictions here would force them
-# on every user's config files, wanted or not.  Would users write
-# "better" Construct and Conscript files if we forced "use strict"
-# on them?  Probably.  But we want people to use Cons to get work
-# done, not force everyone to become a Perl guru to use it, so we
-# don't insist.
-#
-# That said, Cons' code is both "perl -w" and "use strict" clean.
-# Regression tests keep the code honest by checking for warnings
-# and "use strict" failures.
-
-use vars qw( $CVS_id $CVS_ver $ver_num $ver_rev $version );
-
-# I hate those CVS tags
-$CVS_id  = 'pcons-2.3.1';
-$CVS_ver = (split (/\s+/, $CVS_id))[2];
-
-$ver_num = "__VERSION__";
-$ver_rev = "__REVISION__";
-
-#$version = "This is Cons $ver_num$ver_rev ($CVS_id)\n";
-$version = "This is parallel Cons (pcons) $ver_num$ver_rev ($CVS_id)\n";
-
-# Cons: A Software Construction Tool.
-# Copyright (c) 1996-2001 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-require 5.003;
-
-# See the NOTE above about why Cons doesn't "use strict".
-use integer;
-use Cwd;
-use File::Copy;
-
-use vars qw( $_WIN32 $_a $_exe $_o $_so );
-
-#------------------------------------------------------------------
-# Determine if running on win32 platform - either Windows NT or 95
-#------------------------------------------------------------------
-
-use vars qw( $PATH_SEPARATOR $iswin32 $_WIN32 $usage $indent @targets );
-
-BEGIN
-{
-    use Config;
-
-    # if the version is 5.003, we can check $^O
-    if ($] < 5.003)
-    {
-        eval("require Win32");
-        $_WIN32 = (!$@);
-    }
-    else
-    {
-        $_WIN32 = ($^O eq "MSWin32") ? 1 : 0;
-    }
-
-    # Fetch the PATH separator from Config;
-    # provide our old defaults in case it's not set.
-    $PATH_SEPARATOR = $Config{path_sep};
-    $PATH_SEPARATOR = $_WIN32 ? ';' : ':' if !defined $PATH_SEPARATOR;
-
-    # Fetch file suffixes from Config,
-    # accomodating differences in the Config variables
-    # used by different Perl versions.
-    $_exe = $Config{_exe};
-    $_exe = $Config{exe_ext} if !defined $_exe;
-    $_exe = $_WIN32 ? '.exe' : '' if !defined $_exe;
-    $_o   = $Config{_o};
-    $_o = $Config{obj_ext} if !defined $_o;
-    $_o = $_WIN32 ? '.obj' : '.o' if !defined $_o;
-    $_a  = $Config{_a};
-    $_a  = $Config{lib_ext} if !defined $_a;
-    $_a  = $_WIN32 ? '.lib' : '.a' if !defined $_a;
-    $_so = ".$Config{so}";
-    $_so = $_WIN32 ? '.dll' : '.so' if !defined $_so;
-}
-
-# Flush stdout each time.
-$| = 1;
-
-# Seed random number generator.
-srand(time . $$);    # this works better than time ^ $$ in perlfunc manpage.
-
-$usage = q(
-Usage: cons <arguments> -- <construct-args>
-
-Arguments can be any of the following, in any order:
-
-  <targets>	Build the specified targets. If <target> is a directory
-		recursively build everything within that directory.
-
-  +<pattern>	Limit the cons scripts considered to just those that
-		match <pattern>. Multiple + arguments are accepted.
-
-  <name>=<val>	Sets <name> to value <val> in the ARG hash passed to the
-		top-level Construct file.
-
-  -cc           Show command that would have been executed, when
-		retrieving from cache. No indication that the file
-		has been retrieved is given; this is useful for
-		generating build logs that can be compared with
-		real build logs.
-
-  -cd           Disable all caching. Do not retrieve from cache nor
-		flush to cache.
-
-  -cr           Build dependencies in random order. This is useful when
-		building multiple similar trees with caching enabled.
-
-  -cs           Synchronize existing build targets that are found to be
-		up-to-date with cache. This is useful if caching has
-		been disabled with -cc or just recently enabled with
-		UseCache.
-
-  -d            Enable dependency debugging.
-
-  -f <file>	Use the specified file instead of "Construct" (but first
-		change to containing directory of <file>).
-
-  -h            Show a help message local to the current build if
-		one such is defined,  and exit.
-
-  -k		Keep going as far as possible after errors.
-
-  -o <file>	Read override file <file>.
-
-  -p		Show construction products in specified trees.
-  -pa		Show construction products and associated actions.
-  -pw		Show products and where they are defined.
-
-  -q		Be quiet; multiple -q flags increase quietness level:
-		1: quiet about Installing and Removing targets
-		2: quiet about build commands, up-to-date targets
-
-  -r		Remove construction products associated with <targets>
-
-  -R <repos>	Search for files in <repos>.  Multiple -R <repos>
-		directories are searched in the order specified.
-
-  -S <pkg>	Use package sig::<pkg> to calculate file signatures.
-		Currently supported values are "md5" for MD5
-		signatures (the default) and "md5::debug" for MD5
-		signature debug information.
-
-  -t            Traverse up the directory hierarchy looking for a
-		Construct file, if none exists in the current directory.
-		(Targets will be modified to be relative to the
-		Construct file.)
-
-  -v		Show cons version and continue processing.
-  -V            Show cons version and exit.
-
-  -wf <file>    Write all filenames considered into <file>.
-
-  -x		Show this message and exit.
-
-
-   Please report any suggestions through the cons-discuss@gnu.org mailing
-   list.
-
-   To subscribe, send mail to cons-discuss-request@gnu.org with body
-   'subscribe'.
-
-   If you find a bug, please report it through the bug-cons@gnu.org
-   mailing list.
-
-   Information about CONS can be obtained from the official cons web site
-   http://www.dsmit.com/cons/ or its mirrors (listed there).
-
-   The cons maintainers can be contacted by email at cons-maintainers@gnu.org
-
-   User documentation of cons is contained in cons and can be obtained
-   by doing 'perldoc /path/to/cons'.
-
-);
-my $pcons = 1;
-
-# Simplify program name, if it is a path.
-{
-    my ($vol, $dir, $file) = File::Spec->splitpath(File::Spec->canonpath($0));
-    $0 = $file;
-}
-
-# Default parameters.
-$param::topfile = 'Construct';    # Top-level construction file.
-$param::install = 1;              # Show installations
-$param::build   = 1;              # Build targets
-     ### $param::show = 1;		# Show building of targets.
-$param::sigpro  = 'md5';    # Signature protocol.
-$param::depfile = '';       # Write all deps out to this file
-$param::salt    = '';       # Salt derived file signatures with this.
-$param::sourcesig = ['*' => 'content'];    # Source file signature calculation
-$param::rep_sig_times_ok = 1;    # Repository .consign times are in sync
-                                 #   w/files.
-$param::conscript_chdir  = 0;    # Change dir to Conscript directory
-$param::quiet            = 0;    # should we show the command being executed.
-$param::max_jobs         = 1;    # pcons
-
-@param::defaults = ();
-
-#
-$indent = '';
-
-# Display a command while executing or otherwise. This
-# should be called by command builder action methods.
-sub showcom
-{
-    print($indent . $_[0] . "\n") if ($param::quiet < 2);
-}
-
-# Default environment.
-# This contains only the completely platform-independent information
-# we can figure out.  Platform-specific information (UNIX, Win32)
-# gets added below.
-@param::base = (
-    'SIGNATURE' => ['*' => 'build'],
-    'SUFEXE'  => $_exe,         # '' on UNIX systems
-    'SUFLIB'  => $_a,           # '.a' on UNIX systems
-    'SUFLIBS' => "$_so:$_a",    # '.so:.a' on UNIX
-    'SUFOBJ'  => $_o,           # '.o' on UNIX systems
-    'SUFMAP' => {
-                  '.c'   => 'build::command::cc',
-                  '.s'   => 'build::command::cc',
-                  '.S'   => 'build::command::cc',
-                  '.C'   => 'build::command::cxx',
-                  '.cc'  => 'build::command::cxx',
-                  '.cxx' => 'build::command::cxx',
-                  '.cpp' => 'build::command::cxx',
-                  '.c++' => 'build::command::cxx',
-                  '.C++' => 'build::command::cxx',
-    },
-    'PERL' => $^X,
-    );
-
-# pcons does not allow multi-line commands
-my $ar_command = ($param::max_jobs <= 1)
-  ?    # pcons
-  ['%AR %ARFLAGS %> %<', '%RANLIB %>']
-  :                                          # cons
-  '%AR %ARFLAGS %> %<   &&   %RANLIB %>';    # pcons
-
-%param::rulesets = (
-
-    # Defaults for Win32.
-    # Defined for VC++ 6.0 by Greg Spencer <greg_spencer@acm.org>
-    # Your mileage may vary.
-    'msvc' => [
-                'CC'            => 'cl',
-                'CFLAGS'        => '/nologo',
-                'CCCOM'         => '%CC %CFLAGS %_IFLAGS /c %< /Fo%>',
-                'CXX'           => '%CC',
-                'CXXFLAGS'      => '%CFLAGS',
-                'CXXCOM'        => '%CXX %CXXFLAGS %_IFLAGS /c %< /Fo%>',
-                'INCDIRPREFIX'  => '/I',
-                'INCDIRSUFFIX'  => '',
-                'LINK'          => 'link',
-                'LINKCOM'       => '%LINK %LDFLAGS /out:%> %< %_LDIRS %LIBS',
-                'LINKMODULECOM' => '%LD /r /o %> %<',
-                'LIBDIRPREFIX'  => '/LIBPATH:',
-                'LIBDIRSUFFIX'  => '',
-                'AR'            => 'lib',
-                'ARFLAGS'       => '/nologo ',
-                'ARCOM'         => "%AR %ARFLAGS /out:%> %<",
-                'RANLIB'        => '',
-                'LD'            => 'link',
-                'LDFLAGS'       => '/nologo ',
-                'PREFLIB'       => '',
-    ],
-
-    # Defaults for a typical (?) UNIX platform.
-    # Your mileage may vary.
-    'unix' => [
-           'CC'            => 'cc',
-           'CFLAGS'        => '',
-           'CCCOM'         => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-           'CXX'           => '%CC',
-           'CXXFLAGS'      => '%CFLAGS',
-           'CXXCOM'        => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
-           'INCDIRPREFIX'  => '-I',
-           'INCDIRSUFFIX'  => '',
-           'LINK'          => '%CXX',
-           'LINKCOM'       => '%LINK %LDFLAGS -o %> %< %_LDIRS %LIBS',
-           'LINKMODULECOM' => '%LD -r -o %> %<',
-           'LIBDIRPREFIX'  => '-L',
-           'LIBDIRSUFFIX'  => '',
-           'AR'            => 'ar',
-           'ARFLAGS'       => 'r',                                       # rs?
-           'ARCOM'         => $ar_command,                               # pcons
-           'RANLIB'        => 'ranlib',
-           'AS'            => 'as',
-           'ASFLAGS'       => '',
-           'ASCOM'         => '%AS %ASFLAGS %< -o %>',
-           'LD'            => 'ld',
-           'LDFLAGS'       => '',
-           'PREFLIB'       => 'lib',
-           'ENV'           => {'PATH' => '/bin:/usr/bin'},
-    ],
-    );
-
-# Set the rules based on the platform.
-script::DefaultRules(script::RuleSet($_WIN32 ? 'msvc' : 'unix'));
-
-# Handle command line arguments.
-while (@ARGV)
-{
-    $_ = shift @ARGV;
-    last if /^--$/;    # Argument passing to Construct.
-    &option, next if s/^-//;
-    push (@param::include, $_), next if s/^\+//;
-    &equate, next if /=/;
-    push (@targets, $_), next;
-}
-
-sub option
-{
-    my %opt = (
-        'cc' => sub { $param::cachecom     = 1; },
-        'cd' => sub { $param::cachedisable = 1; },
-        'cr' => sub { $param::random       = 1; },
-        'cs' => sub { $param::cachesync    = 1; },
-        'd'  => sub { $param::depends      = 1; },
-        'h'  => sub { $param::localhelp    = 1; },
-        'k'  => sub { $param::kflag        = 1; },
-        'p'  => sub {
-            $param::pflag = 1;
-            $param::build = 0;
-        },
-        'pa' => sub {
-            $param::pflag = 1;
-            $param::aflag = 1;
-            $indent       = "... ";
-            $param::build = 0;
-        },
-        'pw' => sub {
-            $param::pflag = 1;
-            $param::wflag = 1;
-            $param::build = 0;
-        },
-        'q' => sub { $param::quiet++; },
-        'r' => sub {
-            $param::rflag = 1;
-            $param::build = 0;
-        },
-        't' => sub { $param::traverse = 1; },
-        'v' => sub { print($version); },
-        'V' => sub { print($version), exit(0); },
-        'x' => sub { print($usage), exit 0; },
-        );
-
-    my %opt_arg = (
-        'f' => sub { $param::topfile  = $_[0]; },
-        'o' => sub { $param::overfile = $_[0]; },
-        'R'  => sub { script::Repository($_[0]); },
-        'S'  => sub { $param::sigpro = $_[0]; },
-        'wf' => sub { $param::depfile = $_[0]; },
-        'j'  => sub { $param::max_jobs = $_[0]; },    # pcons
-        );
-
-    if (defined $opt{$_})
-    {
-        &{$opt{$_}} ();
-        return;
-    }
-    while ($_)
-    {
-        $_ =~ m/(.)(.*)/;
-        if (defined $opt{$1})
-        {
-            &{$opt{$1}} ();
-            $_ = $2;
-            next;
-        }
-        if (defined $opt_arg{$1})
-        {
-            if (!$2)
-            {
-                $_ = shift @ARGV;
-                die ("$0: -$1 option requires an argument.\n") if !$_;
-            }
-            &{$opt_arg{$1}} ($2 || $_);
-            return;
-        }
-        $_ =~ m/(..)(.*)/;
-        if (defined $opt_arg{$1})
-        {
-            if (!$2)
-            {
-                $_ = shift @ARGV;
-                die ("$0: -$1 option requires an argument.\n") if !$_;
-            }
-            &{$opt_arg{$1}} ($2 || $_);
-            return;
-        }
-        if ($_)
-        {
-            die
-              qq($0: unrecognized option "-$_".  Use -x for a usage message.\n);
-        }
-    }
-}
-
-# Process an equate argument (var=val).
-sub equate
-{
-    my ($var, $val) = /([^=]*)=(.*)/;
-    $script::ARG{$var} = $val;
-}
-
-# Define file signature protocol.
-'sig'->select($param::sigpro);
-
-# Cleanup after an interrupt.
-$SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
-    $SIG{PIPE} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'IGNORE';
-    $SIG{HUP} = $SIG{INT} if !$main::_WIN32;
-    warn("\n$0: killed\n");
-
-    # Call this first, to make sure that this processing
-    # occurs even if a child process does not die (and we
-    # hang on the wait).
-    sig::hash::END();
-    wait();
-    exit(1);
-};
-$SIG{HUP} = $SIG{INT} if !$main::_WIN32;
-
-# Cleanup after a broken pipe (someone piped our stdout?)
-$SIG{PIPE} = sub {
-    $SIG{PIPE} = $SIG{HUP} = $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = 'IGNORE';
-    warn("\n$0: broken pipe\n");
-    sig::hash::END();
-    wait();
-    exit(1);
-};
-
-if ($param::depfile)
-{
-    open(main::DEPFILE, ">" . $param::depfile)
-      || die ("$0: couldn't open $param::depfile ($!)\n");
-}
-
-# If the supplied top-level Conscript file is not in the
-# current directory, then change to that directory.
-{
-    my ($vol, $dir, $file) =
-      File::Spec->splitpath(File::Spec->canonpath($param::topfile));
-    if ($vol || $dir)
-    {
-        my ($cd) = File::Spec->catpath($vol, $dir, undef);
-        chdir($cd) || die ("$0: couldn't change to directory $cd ($!)\n");
-        $param::topfile = $file;
-    }
-}
-
-# Walk up the directory hierarchy looking for a Conscript file (if -t set).
-my ($target_top);
-my (@targetdir) = ();
-if ($param::traverse && !-f $param::topfile)
-{
-    my ($vol, $dirs, $file) = File::Spec->splitpath(cwd());
-    my (@dirs) = (File::Spec->splitdir($dirs), $file);
-    while (
-        !-f File::Spec->catpath($vol, File::Spec->catdir(@dirs),
-                                $param::topfile))
-    {
-        die ("$0: unable to find $param::topfile.\n") if !@dirs;
-        unshift (@targetdir, pop (@dirs));
-    }
-    my ($cwd) = File::Spec->catpath($vol, File::Spec->catdir(@dirs), '');
-    print "$0: Entering directory `$cwd'\n";
-    chdir($cwd);
-    @targets = map { File::Spec->catdir(@targetdir, $_) } @targets;
-}
-
-# Set up $dir::top and $dir::cwd, now that we are in the right directory.
-dir::init();
-
-#
-if (@targetdir)
-{
-    $target_top = $dir::top->lookupdir(File::Spec->catdir(@targetdir));
-}
-
-# Now handle override file.
-package override;
-if ($param::overfile)
-{
-    my ($ov) = $param::overfile;
-    die qq($0: can\'t read override file "$ov" ($!)\n) if !-f $ov;    #'
-    do $ov;
-    if ($@)
-    {
-        chop($@);
-        die qq($0: errors in override file "$ov" ($@)\n);
-    }
-}
-
-# Provide this to user to setup override patterns.
-sub Override
-{
-    my ($re, @env) = @_;
-    return if $param::overrides{$re};    # if identical, first will win.
-    $param::overrides = 1;
-    $param::overrides{$re} = \@env;
-    push (@param::overrides, $re);
-}
-
-package main;
-
-use vars qw( %priority $errors );
-
-# Check script inclusion regexps
-my $re;
-for $re (@param::include)
-{
-    if (!defined eval { "" =~ /$re/ })
-    {
-        my ($err) = $@;
-        $err =~ s/in regexp at .*$//;
-        die ("$0: error in regexp $err");
-    }
-}
-
-# Read the top-level construct file and its included scripts.
-doscripts($param::topfile);
-
-# Status priorities. This lets us aggregate status for directories
-# and print an appropriate message (at the top-level).
-%priority =
-  ('none' => 1, 'handled' => 2, 'built' => 3, 'unknown' => 4, 'errors' => 5);
-
-# If no targets were specified, supply default targets (if any).
-@targets = @param::default_targets if !@targets;
-
-$errors = 0;
-
-# Build the supplied target patterns.
-my $tgt;
-for $tgt (map($dir::top->lookup($_), @targets))
-{
-    if ($target_top && !$tgt->is_under($target_top))
-    {
-
-        # A -t option was used, and this target is not underneath
-        # the directory where we were invoked via -t.
-        # If the target is a directory and the -t directory
-        # is underneath it, then build the -t directory.
-        if (ref $tgt ne "dir" || !$target_top->is_under($tgt))
-        {
-            next;
-        }
-        $tgt = $target_top;
-    }
-    buildtoptarget($tgt);
-}
-
-exit 0 + ($errors != 0);
-
-sub buildtoptarget
-{
-    my ($tgt) = @_;
-    return if !$tgt;
-    my ($status) = buildtarget($tgt);
-    if ($status ne 'built')
-    {
-        my ($path) = $tgt->path;
-        if ($status eq "errors")
-        {
-            print qq($0: "$path" not remade because of errors.\n);
-            $errors++;
-        }
-        elsif ($status eq "handled")
-        {
-            print qq($0: "$path" is up-to-date.\n) if ($param::quiet < 2);
-        }
-        elsif ($status eq "unknown")
-        {
-
-            # cons error already reported.
-            $errors++;
-        }
-        elsif ($status eq "none")
-        {
-
-            # search for targets that may be linked to the given path.
-            my @linked = dir::linked_targets($tgt) if $target_top;
-            if (@linked)
-            {
-                my @names = map($_->path, @linked);
-                print "Linked targets: @names\n" if ($param::quiet < 1);
-                map(buildtoptarget($_), @linked);
-            }
-            else
-            {
-                print qq($0: nothing to be built in "$path".\n)
-                  if $param::build && ($param::quiet < 2);
-            }
-        }
-        else
-        {
-            print qq($0: don\'t know how to construct "$path".\n);    #'
-            $errors++;
-        }
-    }
-}
-
-# Build the supplied target directory or files. Return aggregated status.
-sub buildtarget
-{
-    my ($tgt) = @_;
-    if (ref($tgt) eq "dir")
-    {
-        my ($result)   = "none";
-        my ($priority) = $priority{$result};
-        if (exists $tgt->{member})
-        {
-            my ($members) = $tgt->{member};
-            my $entry;
-            for $entry (sort keys %$members)
-            {
-                next if $entry eq $dir::CURDIR || $entry eq $dir::UPDIR;
-                my ($tgt) = $members->{$entry};
-                next if ref($tgt) ne "dir" && !exists($tgt->{builder});
-                my ($stat) = buildtarget($members->{$entry});
-                my ($pri)  = $priority{$stat};
-                if ($pri > $priority)
-                {
-                    $priority = $pri;
-                    $result   = $stat;
-                }
-            }
-        }
-        return $result;
-    }
-    if ($param::depends)
-    {
-        my ($path) = $tgt->path;
-        if ($tgt->{builder})
-        {
-            my (@dep) = (@{$tgt->{dep}}, @{$tgt->{sources}});
-            my ($dep) = join (' ', map($_->path, @dep));
-            print("Target $path: $dep\n");
-        }
-        else
-        {
-            print("Target $path: not a derived file\n");
-        }
-    }
-    if ($param::build)
-    {
-        return build $tgt;
-    }
-    elsif ($param::pflag || $param::wflag || $param::aflag)
-    {
-        if ($tgt->{builder})
-        {
-            if ($param::wflag)
-            {
-                print qq(${\$tgt->path}: $tgt->{script}\n);
-            }
-            elsif ($param::pflag)
-            {
-                print qq(${\$tgt->path}:\n) if $param::aflag;
-                print qq(${\$tgt->path}\n)  if !$param::aflag;
-            }
-            if ($param::aflag)
-            {
-                $tgt->{builder}->action($tgt);
-            }
-        }
-    }
-    elsif ($param::rflag && $tgt->{builder})
-    {
-        my ($path) = $tgt->path;
-        if (-f $path)
-        {
-            if (unlink($path))
-            {
-                print("Removed $path\n") if ($param::quiet < 1);
-            }
-            else
-            {
-                warn("$0: couldn't remove $path\n");
-            }
-        }
-    }
-
-    return "none";
-}
-
-package NameSpace;
-
-# Return a hash that maps the name of symbols in a namespace to an
-# array of refs for all types for which the name has a defined value.
-# A list of symbols may be specified; default is all symbols in the
-# name space.
-sub save
-{
-    my $package = shift;
-    my (%namerefs, $var, $type);
-    no strict 'refs';
-    @_ = keys %{$package . "::"} if !@_;
-    foreach $var (@_)
-    {
-        $namerefs{$var} = [];
-        my $fqvar = $package . "::" . $var;
-
-        # If the scalar for this variable name doesn't already
-        # exist, *foo{SCALAR} will autovivify the reference
-        # instead of returning undef, so unlike the other types,
-        # we have to dereference to find out if it exists.
-        push (@{$namerefs{$var}}, *{$fqvar}{SCALAR})
-          if defined ${*{$fqvar}{SCALAR}};
-        foreach $type (qw(ARRAY HASH CODE IO))
-        {
-            push (@{$namerefs{$var}}, *{$fqvar}{$type})
-              if defined *{$fqvar}{$type};
-        }
-    }
-    return \%namerefs;
-}
-
-# Remove the specified symbols from the namespace.
-# Default is to remove all.
-sub remove
-{
-    my $package = shift;
-    my (%namerefs, $var);
-    no strict 'refs';
-    @_ = keys %{$package . "::"} if !@_;
-    foreach $var (@_)
-    {
-        delete ${$package . "::"}{$var};
-    }
-}
-
-# Restore values to symbols specified in a hash as returned
-# by NameSpace::save.
-sub restore
-{
-    my ($package, $namerefs) = @_;
-    my ($var, $ref);
-    no strict 'refs';
-    foreach $var (keys %$namerefs)
-    {
-        my $fqvar = $package . "::" . $var;
-        foreach $ref (@{$namerefs->{$var}})
-        {
-            *{$fqvar} = $ref;
-        }
-    }
-}
-
-# Support for "building" scripts, importing and exporting variables.
-# With the exception of the top-level routine here (invoked from the
-# main package by cons), these are all invoked by user scripts.
-package script;
-
-use vars qw( $ARG $caller_dir_path %special_var );
-
-BEGIN
-{
-
-    # We can't Export or Import the following variables because Perl always
-    # treats them as part of the "main::" package (see perlvar(1)).
-    %special_var = map { $_ => 1 } qw(ENV INC ARGV ARGVOUT SIG
-      STDIN STDOUT STDERR);
-}
-
-# This is called from main to interpret/run the top-level Construct
-# file, passed in as the single argument.
-sub main::doscripts
-{
-    my ($script) = @_;
-    Build($script);
-
-    # Now set up the includes/excludes (after the Construct file is read).
-    $param::include = join ('|', @param::include);
-
-    # Save the original variable names from the script package.
-    # These will stay intact, but any other "script::" variables
-    # defined in a Conscript file will get saved, deleted,
-    # and (when necessary) restored.
-    my (%orig_script_var) = map { $_ => 1 } keys %script::;
-    $caller_dir_path = undef;
-    my $cwd = Cwd::cwd();
-    my (@scripts) = pop (@priv::scripts);
-    while ($priv::self = shift (@scripts))
-    {
-        my ($path) = $priv::self->{script}->rsrcpath;
-        if (-f $path)
-        {
-            $dir::cwd = $priv::self->{script}->{dir};
-
-            # Handle chdir to the Conscript file directory, if necessary.
-            my ($vol, $dir, $file);
-            if ($param::conscript_chdir)
-            {
-                ($vol, $dir, $file) =
-                  File::Spec->splitpath(File::Spec->canonpath($path));
-                if ($vol ne '' || $dir ne '')
-                {
-                    $caller_dir_path = File::Spec->catpath($vol, $dir, undef);
-                    chdir($caller_dir_path)
-                      || die "Could not chdir to $caller_dir_path: $!\n";
-                }
-            }
-            else
-            {
-                $file = $path;
-            }
-
-            # Actually process the Conscript file.
-            do $file;
-
-            # Save any variables defined by the Conscript file
-            # so we can restore them later, if needed;
-            # then delete them from the script:: namespace.
-            my (@del) = grep(!$orig_script_var{$_}, keys %script::);
-            if (@del)
-            {
-                $priv::self->{script}->{pkgvars} =
-                  NameSpace::save('script', @del);
-                NameSpace::remove('script', @del);
-            }
-            if ($caller_dir_path)
-            {
-                chdir($cwd);
-                $caller_dir_path = undef;
-            }
-            if ($@)
-            {
-                chomp($@);
-                my $err = ($@ =~ /\n/ms) ? ":\n$@" : " ($@)";
-                print qq($0: error in file "$path"$err\n);
-                $run::errors++;
-            }
-            else
-            {
-
-                # Only process subsidiary scripts if no errors in parent.
-                unshift (@scripts, @priv::scripts);
-            }
-            undef @priv::scripts;
-        }
-        else
-        {
-            my $where = '';
-            my $cref  = $priv::self->{script}->creator;
-            if (defined $cref)
-            {
-                my ($_foo, $script, $line, $sub) = @$cref;
-                $where = " ($sub in $script, line $line)";
-            }
-            warn qq(Ignoring missing script "$path"$where);
-        }
-    }
-    die ("$0: script errors encountered: construction aborted\n")
-      if $run::errors;
-}
-
-# Return caller info about the method being invoked.
-# This is everything from the Perl "caller" builtin function,
-# including which Construct/Conscript file, line number,
-# subroutine name, etc.
-sub caller_info
-{
-    my ($lev) = 1;
-    my (@frame);
-    do
-    {
-        @frame = caller ++$lev;
-        if (defined($frame[3]) && $frame[3] eq '(eval)')
-        {
-            @frame = caller --$lev;
-            if ($caller_dir_path)
-            {
-                $frame[1] = File::Spec->catfile($caller_dir_path, $frame[1]);
-            }
-            return @frame;
-        }
-    } while ($frame[3]);
-    return;
-}
-
-# Link a directory to another. This simply means set up the *source*
-# for the directory to be the other directory.
-sub Link
-{
-    dir::link(@_);
-}
-
-# Add directories to the repository search path for files.
-# Strip our current directory from the list so Repository
-# (or -R options) can be used from within the repository.
-sub Repository
-{
-    my ($my_dir) = Cwd::cwd();
-    my $dir;
-    foreach $dir (@_)
-    {
-
-        # The following more direct call isn't available in
-        # Cwd.pm until some time after 5.003...
-        #	my($d) = Cwd::abs_path($dir);
-        chdir($dir);
-        my ($d) = Cwd::cwd();
-        chdir($my_dir);
-
-        #
-        next if !$d || !-d $d || $d eq $my_dir;
-
-        # We know we can get away with passing undef to lookupdir
-        # as the directory because $dir is an absolute path.
-        push (@param::rpath, dir::lookupdir(undef, $dir));
-        push @INC, $d;
-    }
-}
-
-# Return the list of Repository directories specified.
-sub Repository_List
-{
-    map($_->path, @param::rpath);
-}
-
-# Specify whether the .consign signature times in repository files are,
-# in fact, consistent with the times on the files themselves.
-sub Repository_Sig_Times_OK
-{
-    $param::rep_sig_times_ok = shift;
-}
-
-sub SourceSignature
-{
-    $param::sourcesig = [@_];
-}
-
-# Specify whether we should chdir to the containing directories
-# of Conscript files.
-sub Conscript_chdir
-{
-    $param::conscript_chdir = shift;
-}
-
-# Specify files/targets that must be present and built locally,
-# even if they exist already-built in a Repository.
-sub Local
-{
-    my (@files) = map($dir::cwd->lookupfile($_), @_);
-    map($_->local(1), @files);
-}
-
-# Export variables to any scripts invoked from this one.
-sub Export
-{
-    my (@illegal) = grep($special_var{$_}, @_);
-    if (@illegal)
-    {
-        die qq($0: cannot Export special Perl variables: @illegal\n);
-    }
-    @{$priv::self->{exports}} = grep(!defined $special_var{$_}, @_);
-}
-
-# Import variables from the export list of the caller
-# of the current script.
-sub Import
-{
-    my (@illegal) = grep($special_var{$_}, @_);
-    if (@illegal)
-    {
-        die qq($0: cannot Import special Perl variables: @illegal\n);
-    }
-    my ($parent)  = $priv::self->{parent};
-    my ($imports) = $priv::self->{imports};
-    @{$priv::self->{exports}} = keys %$imports;
-    my ($var);
-    foreach $var (grep(!defined $special_var{$_}, @_))
-    {
-        if (!exists $imports->{$var})
-        {
-            my ($path) = $parent->{script}->path;
-            die qq($0: variable "$var" not exported by file "$path"\n);
-        }
-        if (!defined $imports->{$var})
-        {
-            my $path = $parent->{script}->path;
-            my $err  =
-              "$0: variable \"$var\" exported but not "
-              . "defined by file \"$path\"\n";
-            die $err;
-        }
-        ${"script::$var"} = $imports->{$var};
-    }
-}
-
-# Build an inferior script. That is, arrange to read and execute
-# the specified script, passing to it any exported variables from
-# the current script.
-sub Build
-{
-    my (@files) = map($dir::cwd->lookupfile($_), @_);
-    my (%imports) = map { $_ => ${"script::$_"} } @{$priv::self->{exports}};
-    my $file;
-    for $file (@files)
-    {
-        next if $param::include && $file->path !~ /$param::include/o;
-        my ($self) = {
-                       'script'  => $file,
-                       'parent'  => $priv::self,
-                       'imports' => \%imports
-                       };
-        bless $self;    # may want to bless into class of parent in future
-        push (@priv::scripts, $self);
-    }
-}
-
-# Set up regexps dependencies to ignore. Should only be called once.
-sub Ignore
-{
-    die ("Ignore called more than once\n") if $param::ignore;
-    $param::ignore = join ("|", map("($_)", @_)) if @_;
-}
-
-# Specification of default targets.
-sub Default
-{
-    push (@param::default_targets, map($dir::cwd->lookup($_)->path, @_));
-}
-
-# Local Help.  Should only be called once.
-sub Help
-{
-    if ($param::localhelp)
-    {
-        print "@_\n";
-        exit 2;
-    }
-}
-
-# For windows platforms which use unix tool sets, the msvc defaults may
-# not be useful. Also, in the future, other platforms (Mac?) may have the
-# same problem.
-sub RuleSet
-{
-    my $style    = shift;
-    my @rulesets = sort keys %param::rulesets;
-    die "Unknown style for rules: $style.\n"
-      . "Supported rules are: ("
-      . join (" ", @rulesets) . ")"
-      unless eval(join ("||", map("\$style eq '$_'", @rulesets)));
-    return @param::base, @{$param::rulesets{$style}};
-}
-
-sub DefaultRules
-{
-    @param::defaults = ();
-    push @param::defaults, @_;
-}
-
-# Return the build name(s) of a file or file list.
-sub FilePath
-{
-    wantarray 
-      ? map($dir::cwd->lookupfile($_)->path, @_)
-      : $dir::cwd->lookupfile($_[0])->path;
-}
-
-# Return the build name(s) of a directory or directory list.
-sub DirPath
-{
-    wantarray 
-      ? map($dir::cwd->lookupdir($_)->path, @_)
-      : $dir::cwd->lookupdir($_[0])->path;
-}
-
-# Split the search path provided into components. Look each up
-# relative to the current directory.
-# The usual path separator problems abound; for now we'll use :
-sub SplitPath
-{
-    my ($dirs) = @_;
-    if (ref($dirs) ne "ARRAY")
-    {
-        $dirs = [split (/$main::PATH_SEPARATOR/o, $dirs)];
-    }
-    map { DirPath($_) } @$dirs;
-}
-
-# Return true if the supplied path is available as a source file
-# or is buildable (by rules seen to-date in the build).
-sub ConsPath
-{
-    my ($path) = @_;
-    my ($file) = $dir::cwd->lookup($path);
-    return $file->accessible;
-}
-
-# Return the source path of the supplied path.
-sub SourcePath
-{
-    wantarray 
-      ? map($dir::cwd->lookupfile($_)->rsrcpath, @_)
-      : $dir::cwd->lookupfile($_[0])->rsrcpath;
-}
-
-# Search up the tree for the specified cache directory, starting with
-# the current directory. Returns undef if not found, 1 otherwise.
-# If the directory is found, then caching is enabled. The directory
-# must be readable and writable. If the argument "mixtargets" is provided,
-# then targets may be mixed in the cache (two targets may share the same
-# cache file--not recommended).
-sub UseCache($@)
-{
-    my ($dir, @args) = @_;
-
-    # NOTE: it's important to process arguments here regardless of whether
-    # the cache is disabled temporarily, since the mixtargets option affects
-    # the salt for derived signatures.
-    for (@args)
-    {
-        if ($_ eq "mixtargets")
-        {
-
-            # When mixtargets is enabled, we salt the target signatures.
-            # This is done purely to avoid a scenario whereby if
-            # mixtargets is turned on or off after doing builds, and
-            # if cache synchronization with -cs is used, then
-            # cache files may be shared in the cache itself (linked
-            # under more than one name in the cache). This is not bad,
-            # per se, but simply would mean that a cache cleaning algorithm
-            # that looked for a link count of 1 would never find those
-            # particular files; they would always appear to be in use.
-            $param::salt       = 'M' . $param::salt;
-            $param::mixtargets = 1;
-        }
-        else
-        {
-            die qq($0: UseCache unrecognized option "$_"\n);
-        }
-    }
-    if ($param::cachedisable)
-    {
-        warn("Note: caching disabled by -cd flag\n");
-        return 1;
-    }
-    my ($depth) = 15;
-    while ($depth-- && !-d $dir)
-    {
-        $dir = File::Spec->catdir($dir::UPDIR, $dir);
-    }
-    if (-d $dir)
-    {
-        $param::cache = $dir;
-        return 1;
-    }
-    return undef;
-}
-
-# Salt the signature generator. The salt (a number of string) is added
-# into the signature of each derived file. Changing the salt will
-# force recompilation of all derived files.
-sub Salt($)
-{
-
-    # We append the value, so that UseCache and Salt may be used
-    # in either order without changing the signature calculation.
-    $param::salt .= $_[0];
-}
-
-# Mark files (or directories) to not be removed before building.
-sub Precious
-{
-    map($_->{precious} = 1, map($dir::cwd->lookup($_), @_));
-}
-
-# These methods are callable from Conscript files, via a cons
-# object. Procs beginning with _ are intended for internal use.
-package cons;
-
-use vars qw( %envcache );
-
-# This is passed the name of the base environment to instantiate.
-# Overrides to the base environment may also be passed in
-# as key/value pairs.
-sub new
-{
-    my ($package) = shift;
-    my ($env) = {@param::defaults, @_};
-    @{$env->{_envcopy}} = %$env;    # Note: we never change PATH
-    $env->{_cwd} = $dir::cwd;       # Save directory of environment for
-    bless $env, $package;           # any deferred name interpretation.
-}
-
-# Clone an environment.
-# Note that the working directory will be the initial directory
-# of the original environment.
-sub clone
-{
-    my ($env) = shift;
-    my $clone = {@{$env->{_envcopy}}, @_};
-    @{$clone->{_envcopy}} = %$clone;    # Note: we never change PATH
-    $clone->{_cwd} = $env->{_cwd};
-    bless $clone, ref $env;
-}
-
-# Create a flattened hash representing the environment.
-# It also contains a copy of the PATH, so that the path
-# may be modified if it is converted back to a hash.
-sub copy
-{
-    my ($env) = shift;
-    (@{$env->{_envcopy}}, 'ENV' => {%{$env->{ENV}}}, @_);
-}
-
-# Resolve which environment to actually use for a given
-# target. This is just used for simple overrides.
-sub _resolve
-{
-    return $_[0] if !$param::overrides;
-    my ($env, $tgt) = @_;
-    my ($path) = $tgt->path;
-    my $re;
-    for $re (@param::overrides)
-    {
-        next if $path !~ /$re/;
-
-        # Found one. Return a combination of the original environment
-        # and the override.
-        my ($ovr) = $param::overrides{$re};
-        return $envcache{$env, $re} if $envcache{$env, $re};
-        my ($newenv) = {@{$env->{_envcopy}}, @$ovr};
-        @{$newenv->{_envcopy}} = %$env;
-        $newenv->{_cwd} = $env->{_cwd};
-        return $envcache{$env, $re} = bless $newenv, ref $env;
-    }
-    return $env;
-}
-
-# Substitute construction environment variables into a string.
-# Internal function/method.
-sub _subst
-{
-    my ($env, $str) = @_;
-    if (!defined $str)
-    {
-        return undef;
-    }
-    elsif (ref($str) eq "ARRAY")
-    {
-        return [map($env->_subst($_), @$str)];
-    }
-    else
-    {
-
-        # % expansion.  %% gets converted to % later, so expand any
-        # %keyword construction that doesn't have a % in front of it,
-        # modulo multiple %% pairs in between.
-        # In Perl 5.005 and later, we could actually do this in one regex
-        # using a conditional expression as follows,
-        #	while ($str =~ s/($pre)\%(\{)?([_a-zA-Z]\w*)(?(2)\})/"$1".
-        #                      $env->{$3}/ge) {}
-        # The following two-step approach is backwards-compatible
-        # to (at least) Perl5.003.
-        my $pre = '^|[^\%](?:\%\%)*';
-        while (($str =~ s/($pre)\%([_a-zA-Z]\w*)/$1.($env->{$2}||'')/ge)
-               || ($str =~ s/($pre)\%\{([_a-zA-Z]\w*)\}/$1.($env->{$2}||'')/ge))
-        {
-        }
-        return $str;
-    }
-}
-
-sub AfterBuild
-{
-    my ($env)           = shift;
-    my ($perl_eval_str) = pop (@_);
-    my $file;
-    for $file (map($dir::cwd->lookup($_), @_))
-    {
-        $file->{after_build_func} = $perl_eval_str;
-
-    }
-}
-
-sub Install
-{
-    my ($env)    = shift;
-    my ($tgtdir) = $dir::cwd->lookupdir($env->_subst(shift));
-    my $file;
-    for $file (map($dir::cwd->lookupfile($env->_subst($_)), @_))
-    {
-        my ($tgt) = $tgtdir->lookupfile($file->{entry});
-        $tgt->bind(find build::install($env), $file);
-    }
-}
-
-sub InstallAs
-{
-    my $env     = shift;
-    my $tgt     = shift;
-    my $src     = shift;
-    my @sources = ();
-    my @targets = ();
-
-    if (ref $tgt)
-    {
-        die "InstallAs: Source is a file and target is a list!\n"
-          if (!ref($src));
-        @sources = @$src;
-        @targets = @$tgt;
-    }
-    elsif (ref $src)
-    {
-        die "InstallAs: Target is a file and source is a list!\n";
-    }
-    else
-    {
-        push @sources, $src;
-        push @targets, $tgt;
-    }
-
-    if ($#sources != $#targets)
-    {
-        my $tn = $#targets + 1;
-        my $sn = $#sources + 1;
-        die "InstallAs: Source file list ($sn) and target file list ($tn) "
-          . "are inconsistent in length!\n";
-    }
-    else
-    {
-        foreach (0 .. $#sources)
-        {
-            my $tfile = $dir::cwd->lookupfile($env->_subst($targets[$_]));
-            my $sfile = $dir::cwd->lookupfile($env->_subst($sources[$_]));
-            $tfile->bind(find build::install($env), $sfile);
-        }
-    }
-}
-
-# Installation in a local build directory,
-# copying from the repository if it's already built there.
-# Functionally equivalent to:
-#	Install $env $dir, $file;
-#	Local "$dir/$file";
-sub Install_Local
-{
-    my ($env)    = shift;
-    my ($tgtdir) = $dir::cwd->lookupdir($env->_subst(shift));
-    my $file;
-    for $file (map($dir::cwd->lookupfile($env->_subst($_)), @_))
-    {
-        my ($tgt) = $tgtdir->lookupfile($file->{entry});
-        $tgt->bind(find build::install($env), $file);
-        $tgt->local(1);
-    }
-}
-
-sub Objects
-{
-    my ($env) = shift;
-    map($dir::cwd->relpath($_), $env->_Objects(@_));
-}
-
-# Called with multiple source file references (or object files).
-# Returns corresponding object files references.
-sub _Objects
-{
-    my ($env)    = shift;
-    my ($suffix) = $env->{SUFOBJ};
-    map($env->_Object($_, $_->{dir}->lookupfile($_->base_suf($suffix))),
-      map { ref $_ ? $_ : $dir::cwd->lookupfile($env->_subst($_)) }
-      grep(defined $_, @_));
-}
-
-# Called with an object and source reference.  If no object reference
-# is supplied, then the object file is determined implicitly from the
-# source file's extension. Sets up the appropriate rules for creating
-# the object from the source.  Returns the object reference.
-sub _Object
-{
-    my ($env, $src, $obj) = @_;
-    return $obj if $src eq $obj;    # don't need to build self from self.
-    my ($objenv) = $env->_resolve($obj);
-    my ($suffix) = $src->suffix;
-
-    my ($builder) = $env->{SUFMAP}{$suffix};
-
-    if ($builder)
-    {
-        $obj->bind((find $builder($objenv)), $src);
-    }
-    else
-    {
-        die ("don't know how to construct ${\$obj->path} from "
-             . "${\$src->path}.\n");
-    }
-    $obj;
-}
-
-sub Program
-{
-    my ($env) = shift;
-    my ($tgt) =
-      $dir::cwd->lookupfile(
-                          file::addsuffix($env->_subst(shift), $env->{SUFEXE}));
-    my ($progenv) = $env->_resolve($tgt);
-    $tgt->bind(find build::command::link($progenv, $progenv->{LINKCOM}),
-               $env->_Objects(@_));
-}
-
-sub Module
-{
-    my ($env)    = shift;
-    my ($tgt)    = $dir::cwd->lookupfile($env->_subst(shift));
-    my ($modenv) = $env->_resolve($tgt);
-    my ($com)    = pop (@_);
-    $tgt->bind(find build::command::link($modenv, $com), $env->_Objects(@_));
-}
-
-sub LinkedModule
-{
-    my ($env)     = shift;
-    my ($tgt)     = $dir::cwd->lookupfile($env->_subst(shift));
-    my ($progenv) = $env->_resolve($tgt);
-    $tgt->bind(
-               find build::command::linkedmodule($progenv,
-                                                 $progenv->{LINKMODULECOM}),
-               $env->_Objects(@_));
-}
-
-sub Library
-{
-    my ($env) = shift;
-    my ($lib) =
-      $dir::cwd->lookupfile(
-                          file::addsuffix($env->_subst(shift), $env->{SUFLIB}));
-    my ($libenv) = $env->_resolve($lib);
-    $lib->bind(find build::command::library($libenv), $env->_Objects(@_));
-}
-
-# Simple derivation: you provide target, source(s), command.
-# Special variables substitute into the rule.
-# Target may be a reference, in which case it is taken
-# to be a multiple target (all targets built at once).
-sub Command
-{
-    my ($env)     = shift;
-    my ($tgt)     = $env->_subst(shift);
-    my ($builder) = find build::command::user($env, pop (@_), 'script');
-    my (@sources) = map($dir::cwd->lookupfile($env->_subst($_)), @_);
-    if (ref($tgt))
-    {
-
-        # A multi-target command.
-        my (@tgts) = map($dir::cwd->lookupfile($_), @$tgt);
-        die ("empty target list in multi-target command\n") if !@tgts;
-        $env = $env->_resolve($tgts[0]);
-        my ($multi) = build::multiple->new($builder, \@tgts);
-        for $tgt (@tgts)
-        {
-            $tgt->bind($multi, @sources);
-        }
-    }
-    else
-    {
-        $tgt = $dir::cwd->lookupfile($tgt);
-        $env = $env->_resolve($tgt);
-        $tgt->bind($builder, @sources);
-    }
-}
-
-sub Depends
-{
-    my ($env)  = shift;
-    my ($tgt)  = $env->_subst(shift);
-    my (@deps) = map($dir::cwd->lookup($env->_subst($_)), @_);
-    if (!ref($tgt))
-    {
-        $tgt = [$tgt];
-    }
-    my ($t);
-    foreach $t (map($dir::cwd->lookupfile($_), @$tgt))
-    {
-        push (@{$t->{dep}}, @deps);
-    }
-}
-
-# Setup a quick scanner for the specified input file, for the
-# associated environment. Any use of the input file will cause the
-# scanner to be invoked, once only. The scanner sees just one line at
-# a time of the file, and is expected to return a list of
-# dependencies.
-sub QuickScan
-{
-    my ($env, $code, $file, $path) = @_;
-    $dir::cwd->lookup($env->_subst($file))->{'srcscan', $env} =
-      find scan::quickscan($code, $env, $env->_subst($path));
-}
-
-# Generic builder module. Just a few default methods.  Every derivable
-# file must have a builder object of some sort attached.  Usually
-# builder objects are shared.
-package build;
-
-use vars qw( %builder );
-
-# Every builder must now have at least an associated environment,
-# so we can find its sigarray and calculate the proper signature.
-sub find
-{
-    my ($class, $env) = @_;
-    $builder{$env} || do
-    {
-        my $self = {env => $env};
-        $builder{$env} = bless $self, $class;
-      }
-}
-
-# Null signature for dynamic includes.
-sub includes { () }
-
-# Null signature for build script.
-sub scriptsig { () }
-
-# Not compatible with any other builder, by default.
-sub compatible { 0 }
-
-# Builder module for the Install command.
-package build::install;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build) }
-
-# Caching not supported for Install: generally install is trivial anyway,
-# and we don't want to clutter the cache.
-sub cachin  { undef }
-sub cachout { }
-
-# Do the installation.
-sub action
-{
-    my ($self, $tgt) = @_;
-    my ($src) = $tgt->{sources}[0];
-    main::showcom("Install ${\$src->rpath} as ${\$tgt->path}")
-      if ($param::install && $param::quiet < 1);
-    return unless $param::build;
-    futil::install($src->rpath, $tgt);
-    return 1;
-}
-
-# Builder module for generic UNIX commands.
-package build::command;
-
-use vars qw( @ISA %com );
-
-BEGIN { @ISA = qw(build) }
-
-sub find
-{
-    my ($class, $env, $cmd, $package) = @_;
-    my ($act) = action::new($env, $cmd);
-    $package ||= '';
-    $com{$env, $act, $package} || do
-    {
-        my $self = {env => $env, act => $act, 'package' => $package};
-        $com{$env, $act, $package} = bless $self, $class;
-      }
-}
-
-# Default cache in function.
-sub cachin
-{
-    my ($self, $tgt, $sig) = @_;
-    if (cache::in($tgt, $sig))
-    {
-        if ($param::cachecom)
-        {
-            $self->{act}->show($self->{env}, $tgt);
-        }
-        else
-        {
-            printf("Retrieved %s from cache\n", $tgt->path)
-              if ($param::quiet < 1);
-        }
-        return 1;
-    }
-    return undef;
-}
-
-# Default cache out function.
-sub cachout
-{
-    my ($self, $tgt, $sig) = @_;
-    cache::out($tgt, $sig);
-}
-
-# Build the target using the previously specified commands.
-sub action
-{
-    my ($self, $tgt) = @_;
-    $self->{act}->execute($self->{env}, $tgt, $self->{'package'});
-}
-
-# Return script signature.
-sub scriptsig
-{
-    $_[0]->{act}->scriptsig;
-}
-
-# Create a linked module.
-package build::command::link;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-# Find an appropriate linker.
-sub find
-{
-    my ($class, $env, $command) = @_;
-    if (!exists $env->{_LDIRS})
-    {
-        my ($ldirs) = '';
-        my ($wd)    = $env->{_cwd};
-        my ($pdirs) = $env->{LIBPATH};
-        if (!defined $pdirs)
-        {
-            $pdirs = [];
-        }
-        elsif (ref($pdirs) ne 'ARRAY')
-        {
-            $pdirs = [split (/$main::PATH_SEPARATOR/o, $pdirs)];
-        }
-        my ($dir, $dpath);
-        for $dir (map($wd->lookupdir($env->_subst($_)), @$pdirs))
-        {
-            $dpath = $dir->path;
-
-            # Add the (presumably local) directory to the -L flags
-            # if we're not using repositories, the directory exists,
-            # or it's Linked to a source directory (that is, it *will*
-            # exist by the time the link occurs).
-            $ldirs .= " " . $env->{LIBDIRPREFIX} . $dpath . $env->{LIBDIRSUFFIX}
-              if !@param::rpath || -d $dpath || $dir->is_linked;
-            next if File::Spec->file_name_is_absolute($dpath);
-            if (@param::rpath)
-            {
-                my $d;
-                if ($dpath eq $dir::CURDIR)
-                {
-                    foreach $d (map($_->path, @param::rpath))
-                    {
-                        $ldirs .= " "
-                          . $env->{LIBDIRPREFIX} . $d
-                          . $env->{LIBDIRSUFFIX};
-                    }
-                }
-                else
-                {
-                    my ($rpath);
-                    foreach $d (map($_->path, @param::rpath))
-                    {
-                        $rpath = File::Spec->catfile($d, $dpath);
-                        $ldirs .= " "
-                          . $env->{LIBDIRPREFIX} . $rpath
-                          . $env->{LIBDIRSUFFIX}
-                          if -d $rpath;
-                    }
-                }
-            }
-        }
-        $env->{_LDIRS} = "%($ldirs%)";
-    }
-
-    # Introduce a new magic _LIBS symbol which allows to use the
-    # Unix-style -lNAME syntax for Win32 only. -lNAME will be replaced
-    # with %{PREFLIB}NAME%{SUFLIB}. <schwarze@isa.de> 1998-06-18
-
-    if ($main::_WIN32 && !exists $env->{_LIBS})
-    {
-        my $libs;
-        my $name;
-        for $name (split (' ', $env->_subst($env->{LIBS} || '')))
-        {
-            if ($name =~ /^-l(.*)/)
-            {
-                $name = "$env->{PREFLIB}$1$env->{SUFLIB}";
-            }
-            $libs .= ' ' . $name;
-        }
-        $env->{_LIBS} = $libs ? "%($libs%)" : '';
-    }
-    bless find build::command($env, $command);
-}
-
-# Called from file::build. Make sure any libraries needed by the
-# environment are built, and return the collected signatures
-# of the libraries in the path.
-sub includes
-{
-    return $_[0]->{'bsig'} if exists $_[0]->{'bsig'};
-    my ($self, $tgt) = @_;
-    my ($env) = $self->{env};
-    my ($ewd) = $env->{_cwd};
-    my $ldirs = $env->{LIBPATH};
-    if (!defined $ldirs)
-    {
-        $ldirs = [];
-    }
-    elsif (ref($ldirs) ne 'ARRAY')
-    {
-        $ldirs = [split (/$main::PATH_SEPARATOR/o, $ldirs)];
-    }
-    my @lpath = map($ewd->lookupdir($_), @$ldirs);
-    my (@sigs);
-    my (@names);
-
-    # Pass %LIBS symbol through %-substituition
-    # <schwarze@isa.de> 1998-06-18
-    @names = split (' ', $env->_subst($env->{LIBS} || ''));
-    my $name;
-    for $name (@names)
-    {
-        my ($lpath, @allnames);
-        if ($name =~ /^-l(.*)/)
-        {
-
-            # -l style names are looked up on LIBPATH, using all
-            # possible lib suffixes in the same search order the
-            # linker uses (according to SUFLIBS).
-            # Recognize new PREFLIB symbol, which should be 'lib' on
-            # Unix, and empty on Win32. TODO: What about shared
-            # library suffixes?  <schwarze@isa.de> 1998-05-13
-            @allnames =
-              map("$env->{PREFLIB}$1$_", split (/:/, $env->{SUFLIBS}));
-            $lpath = \@lpath;
-        }
-        else
-        {
-            @allnames = ($name);
-
-            # On Win32, all library names are looked up in LIBPATH
-            # <schwarze@isa.de> 1998-05-13
-            if ($main::_WIN32)
-            {
-                $lpath = [$dir::top, @lpath];
-            }
-            else
-            {
-                $lpath = [$dir::top];
-            }
-        }
-        my $dir;
-        DIR: for $dir (@$lpath)
-        {
-            my $n;
-            for $n (@allnames)
-            {
-                my ($lib) = $dir->lookup_accessible($n);
-                if ($lib)
-                {
-                    last DIR if $lib->ignore;
-                    if ((build $lib) eq 'errors')
-                    {
-                        $tgt->{status} = 'errors';
-                        return undef;
-                    }
-                    push (@sigs, 'sig'->signature($lib));
-                    last DIR;
-                }
-            }
-        }
-    }
-    $self->{'bsig'} = 'sig'->collect(@sigs);
-}
-
-# Always compatible with other such builders, so the user
-# can define a single program or module from multiple places.
-sub compatible
-{
-    my ($self, $other) = @_;
-    ref($other) eq "build::command::link";
-}
-
-# Link a program.
-package build::command::linkedmodule;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-# Always compatible with other such builders, so the user
-# can define a single linked module from multiple places.
-sub compatible
-{
-    my ($self, $other) = @_;
-    ref($other) eq "build::command::linkedmodule";
-}
-
-# Builder for a C module
-package build::command::cc;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find
-{
-    $_[1]->{_cc} || do
-    {
-        my ($class, $env) = @_;
-        my ($cpppath) = $env->_subst($env->{CPPPATH});
-        my ($cscanner) = find scan::cpp($env->{_cwd}, $cpppath);
-        $env->{_IFLAGS} = "%(" . $cscanner->iflags($env) . "%)";
-        my ($self) = find build::command($env, $env->{CCCOM});
-        $self->{scanner} = $cscanner;
-        bless $env->{_cc} = $self;
-      }
-}
-
-# Invoke the associated	 C scanner to get signature of included files.
-sub includes
-{
-    my ($self, $tgt) = @_;
-    $self->{scanner}->includes($tgt, $tgt->{sources}[0]);
-}
-
-# Builder for a C++ module
-package build::command::cxx;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find
-{
-    $_[1]->{_cxx} || do
-    {
-        my ($class, $env) = @_;
-        my ($cpppath) = $env->_subst($env->{CPPPATH});
-        my ($cscanner) = find scan::cpp($env->{_cwd}, $cpppath);
-        $env->{_IFLAGS} = "%(" . $cscanner->iflags($env) . "%)";
-        my ($self) = find build::command($env, $env->{CXXCOM});
-        $self->{scanner} = $cscanner;
-        bless $env->{_cxx} = $self;
-      }
-}
-
-# Invoke the associated	 C scanner to get signature of included files.
-sub includes
-{
-    my ($self, $tgt) = @_;
-    $self->{scanner}->includes($tgt, $tgt->{sources}[0]);
-}
-
-# Builder for a user command (cons::Command).  We assume that a user
-# command might be built and implement the appropriate dependencies on
-# the command itself (actually, just on the first word of the command
-# line).
-package build::command::user;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub includes
-{
-    my ($self, $tgt) = @_;
-    my ($sig) = '';
-
-    # Check for any quick scanners attached to source files.
-    my $dep;
-    for $dep (@{$tgt->{dep}}, @{$tgt->{sources}})
-    {
-        my ($scanner) = $dep->{'srcscan', $self->{env}};
-        if ($scanner)
-        {
-            $sig .= $scanner->includes($tgt, $dep);
-        }
-    }
-
-    # XXX Optimize this to not use ignored paths.
-    if (!exists $self->{_comsig})
-    {
-        my ($env) = $self->{env};
-        $self->{_comsig} = '';
-        my ($com, $dir);
-        com:
-        for $com ($self->{act}->commands)
-        {
-            my ($pdirs) = $env->{ENV}->{PATH};
-            if (!defined $pdirs)
-            {
-                $pdirs = [];
-            }
-            elsif (ref($pdirs) ne 'ARRAY')
-            {
-                $pdirs = [split (/$main::PATH_SEPARATOR/o, $pdirs)];
-            }
-            for $dir (map($dir::top->lookupdir($_), @$pdirs))
-            {
-                my ($prog) = $dir->lookup_accessible($com);
-                if ($prog)
-                {    # XXX Not checking execute permission.
-                    if ((build $prog) eq 'errors')
-                    {
-                        $tgt->{status} = 'errors';
-                        return $sig;
-                    }
-                    next com if $prog->ignore;
-                    $self->{_comsig} .= 'sig'->signature($prog);
-                    next com;
-                }
-            }
-        }
-    }
-
-    return $self->{_comsig} . $sig;
-}
-
-# Builder for a library module (archive).
-# We assume that a user command might be built and implement the
-# appropriate dependencies on the command itself.
-package build::command::library;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(build::command) }
-
-sub find
-{
-    my ($class, $env) = @_;
-    bless find build::command($env, $env->{ARCOM});
-}
-
-# Always compatible with other library builders, so the user
-# can define a single library from multiple places.
-sub compatible
-{
-    my ($self, $other) = @_;
-    ref($other) eq "build::command::library";
-}
-
-# A multi-target builder.
-# This allows multiple targets to be associated with a single build
-# script, without forcing all the code to be aware of multiple targets.
-package build::multiple;
-
-sub new
-{
-    my ($class, $builder, $tgts) = @_;
-    bless {'builder' => $builder, 'env' => $builder->{env}, 'tgts' => $tgts};
-}
-
-sub scriptsig
-{
-    my ($self, $tgt) = @_;
-    $self->{builder}->scriptsig($tgt);
-}
-
-sub includes
-{
-    my ($self, $tgt) = @_;
-    $self->{builder}->includes($tgt);
-}
-
-sub compatible
-{
-    my ($self, $tgt) = @_;
-    $self->{builder}->compatible($tgt);
-}
-
-sub cachin
-{
-    my ($self, $tgt, $sig) = @_;
-    $self->{builder}->cachin($tgt, $sig);
-}
-
-sub cachout
-{
-    my ($self, $tgt, $sig) = @_;
-    $self->{builder}->cachout($tgt, $sig);
-}
-
-sub action
-{
-    my ($self, $invoked_tgt) = @_;
-    return $self->{built} if exists $self->{built};
-
-    # Make sure all targets in the group are unlinked before building any.
-    my ($tgts) = $self->{tgts};
-    my $tgt;
-    for $tgt (@$tgts)
-    {
-        futil::mkdir($tgt->{dir});
-        unlink($tgt->path) if !$tgt->precious;
-    }
-
-    # Now do the action to build all the targets. For consistency
-    # we always call the action on the first target, just so that
-    # $> is deterministic.
-    if ($param::max_jobs <= 1)
-    {    # pcons
-        $self->{built} = $self->{builder}->action($tgts->[0]);
-    }
-    else
-    {
-        {
-
-            # action now is non-blocking, so we must kludge blocking for this
-            # explicit call
-            local ($file::child_queue) = {parent => $tgts->[0]};    # pcons
-            $self->{built} = $self->{builder}->action($tgts->[0]);  # pcons
-            &file::wait_on_all_children();                          # pcons
-        }
-    }
-
-    # Now "build" all the other targets (except for the one
-    # we were called with). This guarantees that the signature
-    # of each target is updated appropriately. We force the
-    # targets to be built even if they have been previously
-    # considered and found to be OK; the only effect this
-    # has is to make sure that signature files are updated
-    # correctly.
-    for $tgt (@$tgts)
-    {
-        if ($tgt ne $invoked_tgt)
-        {
-            delete $tgt->{status};
-            'sig'->invalidate($tgt);
-            build $tgt;
-        }
-    }
-
-    # Status of action.
-    $self->{built};
-}
-
-package action;
-
-sub new
-{
-    my ($env, $act) = @_;
-    if (ref($act) eq 'CODE')
-    {
-        return action::perl->new($act);
-    }
-    else
-    {
-        return action::command->new($env, $act);
-    }
-}
-
-package action::command;
-
-use vars qw( @ISA %cmd %_varopts $_varletters );
-
-BEGIN
-{
-    @ISA = $main::_WIN32 ? 'action::command::win32' : 'action::command::unix';
-
-    # Internal hash for processing variable options.
-    # f: return file part
-    # d: return directory part
-    # F: return file part, but strip any suffix
-    # b: return full path, but strip any suffix (a.k.a. return basename)
-    # s: return only the suffix (or an empty string, if no suffix is there)
-    # a: return the absolute path to the file
-    # S: return the absolute path to a Linked source file
-    %_varopts = (
-        'f' => sub { return $_[0]->{entry}; },
-        'd' => sub { return $_[0]->{dir}->path; },
-        'F' => sub {
-            my $subst = $_[0]->{entry};
-            $subst =~ s/\.[^\.]+$//;
-            return $subst;
-        },
-        'b' => sub {
-            my $subst = $_[0]->path;
-            $subst =~ s/\.[^\.]+$//;
-            return $subst;
-        },
-        's' => sub {
-            my $subst = $_[0]->{entry};
-            $subst =~ m/(\.[^\.]+)$/;
-            return $1;
-        },
-        'a' => sub {
-            my $path = $_[0]->path;
-            if (!File::Spec->file_name_is_absolute($path))
-            {
-                $path = File::Spec->catfile(Cwd::cwd(), $path);
-            }
-            return $path;
-        },
-        'S' => sub {
-            my $path = $_[0]->srcpath;
-            if (!File::Spec->file_name_is_absolute($path))
-            {
-                my $cwd = File::Spec->canonpath(Cwd::cwd());
-                $path = File::Spec->catfile($cwd, $path);
-            }
-            return $path;
-        },
-        );
-
-    $_varletters = join ('', keys %_varopts);
-}
-
-# Internal routine for processing variable options.
-# Options are specified in hash in the BEGIN block above.
-# no option: return path to file (relative to top,
-# or absolute if it's outside)
-sub _variant
-{
-    my ($opt, $file) = @_;
-    $opt = '' if !defined $opt;
-    if (defined $_varopts{$opt})
-    {
-        return &{$_varopts{$opt}} ($file);
-    }
-    return $file->path;
-}
-
-sub new
-{
-    my ($class, $env, $cmd) = @_;
-    $cmd = $env->_subst($cmd);
-    $cmd{$env, $cmd} || do
-    {
-
-        # Remove unwanted bits from signature -- those bracketed by %( ... %)
-        my $sigs = $cmd;
-        my $sig  = '';
-        if (ref($sigs) eq 'ARRAY')
-        {
-
-            # This is an array of commands..
-            my $f;
-            foreach $f (@$sigs)
-            {
-                $sig .= _strip($f);
-            }
-        }
-        else
-        {
-            $sig = _strip($sigs);
-        }
-        my $self = {cmd => $cmd, cmdsig => 'sig'->cmdsig($sig)};
-        $cmd{$env, $cmd} = bless $self, $class;
-    };
-}
-
-sub _strip
-{
-    my $sig = shift;
-    $sig =~ s/^\@\s*//mg;
-    while ($sig =~ s/%\(([^%]|%[^\(])*?%\)//g) { }
-    $sig;
-}
-
-sub scriptsig
-{
-    $_[0]->{cmdsig};
-}
-
-# Return an array of all the commands (first word on each line).
-sub commands
-{
-    my ($self) = @_;
-    my (@cmds) = ();
-    my $com;
-    my $cmd = $self->{'cmd'};
-    my @allcoms;
-
-    push @allcoms, ref $cmd ? @{$cmd} : split (/\n/, $cmd);
-
-    for $com (@allcoms)
-    {
-        $com =~ s/^\s*//;
-        $com =~ s/\s.*//;
-        next if !$com;    # blank line
-        push @cmds, $com;
-    }
-    @cmds;
-}
-
-# For the signature of a basic command, we don't bother
-# including the command itself. This is not strictly correct,
-# and if we wanted to be rigorous, we might want to insist
-# that the command was checked for all the basic commands
-# like gcc, etc. For this reason we don't have an includes
-# method.
-
-# Call this to get the command line script: an array of
-# fully substituted commands.
-sub getcoms
-{
-    my ($self, $env, $tgt) = @_;
-    my (@coms);
-    my $com;
-    my @allcoms = ();
-    my $cmd     = $self->{'cmd'};
-
-    push @allcoms, ref $cmd ? @{$cmd} : split (/\n/, $cmd);
-
-    for $com (@allcoms)
-    {
-        my (@src) = (undef, @{$tgt->{sources}});
-        my (@src1) = @src;
-
-        next if $com =~ /^\s*$/;
-
-        # NOTE: we used to have a more elegant s//.../e solution
-        # for the items below, but this caused a bus error...
-
-        # Remove %( and %) -- those are only used to bracket parts
-        # of the command that we don't depend on.
-        $com =~ s/%[()]//g;
-
-        # Deal with %n, n=1,9 and variants.
-        while ($com =~ /%([1-9])(:([$_varletters]?))?/o)
-        {
-            my ($match) = $&;
-            my ($src)   = $src1[$1];
-            my ($subst) = _variant($3, $src1[$1]->rfile);
-            undef $src[$1];
-            $com =~ s/$match/$subst/;
-        }
-
-        # Deal with %0 aka %> and variants.
-        while ($com =~ /%[0>](:([$_varletters]?))?/o)
-        {
-            my ($match) = $&;
-            my ($subst) = _variant($2, $tgt);
-            $com =~ s/$match/$subst/;
-        }
-
-        # Deal with %< (all sources except %n's already used)
-        while ($com =~ /%<(:([$_varletters]?))?/o)
-        {
-            my ($match) = $&;
-            my @list = ();
-            foreach (@src)
-            {
-                push (@list, _variant($2, $_->rfile)) if $_;
-            }
-            my ($subst) = join (' ', @list);
-            $com =~ s/$match/$subst/;
-        }
-
-        # Deal with %[ %].
-        $com =~ s{%\[(.*?)%\]}{
-	    my($func, @args) = grep { $_ ne '' } split(/\s+/, $1);
-	    die("$0: \"$func\" is not defined.\n")
-		unless ($env->{$func});
-	    &{$env->{$func}}(@args);
-	}gex;
-
-        # Convert left-over %% into %.
-        $com =~ s/%%/%/g;
-
-        # White space cleanup. XXX NO WAY FOR USER TO HAVE QUOTED SPACES
-        $com = join (' ', split (' ', $com));
-        next if $com =~ /^:/ && $com !~ /^:\S/;
-        push (@coms, $com);
-    }
-    @coms;
-}
-
-# Build the target using the previously specified commands.
-sub execute
-{
-    my ($self, $env, $tgt, $package) = @_;
-
-    if ($param::build)
-    {
-        futil::mkdir($tgt->{dir});
-        unlink($tgt->path) if !$tgt->precious;
-    }
-
-    # Set environment.
-    map(delete $ENV{$_}, keys %ENV);
-    %ENV = %{$env->{ENV}};
-
-    # Handle multi-line commands.
-
-    my @cmds = $self->getcoms($env, $tgt);    # pcons
-    if ($param::max_jobs > 1)
-    {    # pcons
-        if ($#cmds > 0)
-        {
-            for ($i = 0 ; $i < @cmds ; $i++)
-            {    #pcons -kn
-                $cmds[$i] = "( " . $cmds[$i] . " )";    #pcons -kn
-            }    #pcons -kn
-            @cmds = join (" && ", @cmds);    # pcons
-        }    # pcons
-    }    # pcons
-
-    my $com;    # pcons
-    for $com (@cmds)
-    {           # pcons
-        if ($com !~ s/^\@\s*//)
-        {
-            main::showcom($com);
-        }
-        next if !$param::build;
-
-        if ($com =~ /^\[perl\]\s*/)
-        {
-            my $perlcmd = $';
-            my $status;
-            {
-
-                # Restore the script package variables that were defined
-                # in the Conscript file that defined this [perl] build,
-                # so the code executes with the expected variables.
-                # Then actually execute (eval) the [perl] command to build
-                # the target, followed by cleaning up the name space
-                # by deleting the package variables we just restored.
-                my ($pkgvars) = $tgt->{conscript}->{pkgvars};
-                NameSpace::restore($package, $pkgvars) if $pkgvars;
-                $status = eval "package $package; $perlcmd";
-                NameSpace::remove($package, keys %$pkgvars) if $pkgvars;
-            }
-            if (!defined($status))
-            {
-                warn "$0: *** Error during perl command eval: $@.\n";
-                return undef;
-            }
-            elsif ($status == 0)
-            {
-                warn "$0: *** Perl command returned $status "
-                  . "(this indicates an error).\n";
-                return undef;
-            }
-            next;
-        }
-        if (!$self->do_command($com, $tgt->path, $tgt))
-        {
-            return undef;
-        }
-    }
-
-    # success.
-    return 1;
-}
-
-sub show
-{
-    my ($self, $env, $tgt) = @_;
-    my $com;
-    for $com ($self->getcoms($env, $tgt))
-    {
-        if ($com !~ /^\@\s*/)
-        {
-            main::showcom($com);
-        }
-    }
-}
-
-package action::command::unix;
-
-sub do_command
-{
-    my ($class, $com, $path) = @_;    # cons
-    my ($class, $com, $path, $tgt) = @_;    # pcons
-
-    if ($param::max_jobs > 1)
-    {    # pcons
-        &file::wait_on_max_jobs();    # pcons
-    }    # pcons
-    my ($pid) = fork();
-    die ("$0: unable to fork child process ($!)\n") if !defined $pid;
-    if (!$pid)
-    {
-
-        # This is the child.  We eval the command to suppress -w
-        # warnings about not reaching the statements afterwards.
-        eval 'exec($com)';
-        $com =~ s/\s.*//;
-        die qq($0: failed to execute "$com" ($!). )
-          . qq(Is this an executable on path "$ENV{PATH}"?\n);
-    }
-    if ($param::max_jobs <= 1)
-    {    # pcons
-        for (; ;)
-        {
-            do { } until wait() == $pid;
-            my ($b0, $b1) = ($? & 0xFF, $? >> 8);
-
-            # Don't actually see 0177 on stopped process; is this necessary?
-            next if $b0 == 0177;    # process stopped; we can wait.
-            if ($b0)
-            {
-                my ($core, $sig) = ($b0 & 0200, $b0 & 0177);
-                my ($coremsg) = $core ? "; core dumped" : "";
-                $com =~ s/\s.*//;
-                my $err =
-                  "$0: *** \[$path\] $com terminated by signal "
-                  . "$sig$coremsg\n";
-                warn $err;
-                return undef;
-            }
-            if ($b1)
-            {
-                warn qq($0: *** [$path] Error $b1\n);  # trying to be like make.
-                return undef;
-            }
-            last;
-        }
-    }
-    else
-    {    # pcons
-        $file::child_queue->{$pid}->{com} = $com;    # pcons
-        $file::child_queue->{$pid}->{tgt} = $tgt;    # pcons
-
-    }    # pcons
-
-    return 1;
-}
-
-package action::command::win32;
-
-sub do_command
-{
-    my ($class, $com, $path, $tgt) = @_;
-    system($com);
-    if ($?)
-    {
-        my ($b0, $b1) = ($? & 0xFF, $? >> 8);
-        my $err = $b1 || $?;
-        my $warn = qq($0: *** [$path] Error $err);
-        $warn .= " (executable not found in path?)" if $b1 == 0xFF;
-        warn "$warn\n";
-        return undef;
-    }
-    return 1;
-}
-
-package action::perl;
-
-# THIS IS AN EXPERIMENTAL PACKAGE.  It's entirely possible that the
-# interface may change as this gets completed, so use at your own risk.
-#
-# There are (at least) two issues that need to be solved before blessing
-# this as a real, fully-supported feature:
-#
-#   --	We need to calculate a signature value for a Perl code ref, in
-#	order to rebuild the target if there's a change to the Perl code
-#	used to generate it.
-#
-#	This is not straightforward.  A B::Deparse package exists that
-#	decompiles a coderef into text.  It's reportedly not completely
-#	reliable for closures; it misses which variables are global, and
-#	the values of private lexicals.  Nevertheless, it'd probably
-#	be perfect for our purposes, except that it wasn't added until
-#	some time between Perl 5.00502 and 5.00554, and doesn't seem to
-#	really work until Perl 5.6.0, so by relying on it, we'd lose
-#	support for Perl versions back to 5.003*.
-#
-#   --	Ideally, a code ref should be able to use something like
-#	$env->_subst to fetch values from the construction environment
-#	to modify its behavior without having to cut-and-paste code.
-#	(Actually, since we pass the environment to the executed code
-#	ref, there's no reason you can't do this with the code as it
-#	stands today.)  But this REALLY complicates the signature
-#	calculation, because now the actual signature would depend not
-#	just on the code contents, but on the construction variables (or
-#	maybe just the environment).
-#
-# A potentially valid workaround would be to use the contents of the
-# Conscript file in which the code reference is defined as the code
-# ref's signature.  This has the drawback of causing a recompilation of
-# the target file even in response to unrelated changes in the Conscript
-# file, but it would ensure correct builds without having to solve the
-# messy issues of generating a signature directly from a code ref.
-#
-# Nevertheless, this seemed a useful enough skeleton of a feature that
-# it made sense to release it in hopes that some practical experience
-# will encourage someone to figure out how to solve the signature
-# issues.  Or maybe we'll discover these aren't big issues in practice
-# and end up blessing it as is.
-
-use vars qw( %code );
-
-sub new
-{
-    my ($class, $cref) = @_;
-    $code{$cref} || do
-    {
-        my $sig = '';
-
-        # Generating a code signature using B::Deparse doesn't really
-        # work for us until Perl 5.6.0.  Here's the code in case
-        # someone wants to use it.
-        #use B::Deparse;
-        #my $deparse = B::Deparse->new();
-        #my $body = $deparse->coderef2text($cref);
-        #$sig = $body;	# should be an MD5 sig
-        my ($self) = {cref => $cref, crefsig => $sig};
-        $code{$cref} = bless $self, $class;
-      }
-}
-
-sub scriptsig
-{
-    $_[0]->{crefsig};
-}
-
-sub execute
-{
-    my ($self, $env, $tgt) = @_;
-    if ($param::build)
-    {
-        futil::mkdir($tgt->{dir});
-        unlink($tgt->path) if !$tgt->precious;
-        my ($cref) = $self->{cref};
-        &$cref($env, $tgt->path, map($_->rpath, @{$tgt->{sources}}));
-    }
-}
-
-sub commands
-{
-    return ();
-}
-
-# Generic scanning module.
-package scan;
-
-# Returns the signature of files included by the specified files on
-# behalf of the associated target. Any errors in handling the included
-# files are propagated to the target on whose behalf this processing
-# is being done. Signatures are cached for each unique file/scanner
-# pair.
-sub includes
-{
-    my ($self, $tgt, @files) = @_;
-    my (%files, $file);
-    my ($inc) = $self->{includes} || ($self->{includes} = {});
-    while ($file = pop @files)
-    {
-        next if exists $files{$file};
-        if ($inc->{$file})
-        {
-            push (@files, @{$inc->{$file}});
-            $files{$file} = 'sig'->signature($file->rfile);
-        }
-        else
-        {
-            if ((build $file) eq 'errors')
-            {
-                $tgt->{status} = 'errors';    # tgt inherits build status
-                return ();
-            }
-            $files{$file} = 'sig'->signature($file->rfile);
-            my (@includes) = $self->scan($file);
-            $inc->{$file} = \@includes;
-            push (@files, @includes);
-        }
-    }
-    'sig'->collect(sort values %files);
-}
-
-# A simple scanner. This is used by the QuickScanfunction, to setup
-# one-time target and environment-independent scanning for a source
-# file. Only used for commands run by the Command method.
-package scan::quickscan;
-
-use vars qw( @ISA %scanner );
-
-BEGIN { @ISA = qw(scan) }
-
-sub find
-{
-    my ($class, $code, $env, $pdirs) = @_;
-    if (!defined $pdirs)
-    {
-        $pdirs = [];
-    }
-    elsif (ref($pdirs) ne 'ARRAY')
-    {
-        $pdirs = [split (/$main::PATH_SEPARATOR/o, $pdirs)];
-    }
-    my (@path) = map { $dir::cwd->lookupdir($_) } @$pdirs;
-    my ($spath) = "@path";
-    $scanner{$code, $env, $spath} || do
-    {
-        my ($self) = {code => $code, env => $env, path => \@path};
-        $scanner{$code, $env, $spath} = bless $self;
-      }
-}
-
-# Scan the specified file for included file names.
-sub scan
-{
-    my ($self, $file) = @_;
-    my ($code) = $self->{code};
-    my (@includes);
-
-    # File should have been built by now. If not, we'll ignore it.
-    return () unless open(SCAN, $file->rpath);
-    while (<SCAN>)
-    {
-        push (@includes, grep($_ ne '', &$code));
-    }
-    close(SCAN);
-    my ($wd) = $file->{dir};
-    my (@files);
-    my $name;
-    for $name (@includes)
-    {
-        my $dir;
-        for $dir ($file->{dir}, @{$self->{path}})
-        {
-            my ($include) = $dir->lookup_accessible($name);
-            if ($include)
-            {
-                push (@files, $include) unless $include->ignore;
-                last;
-            }
-        }
-    }
-    @files;
-}
-
-# CPP (C preprocessor) scanning module
-package scan::cpp;
-
-use vars qw( @ISA %scanner );
-
-BEGIN { @ISA = qw(scan) }
-
-# For this constructor, provide the include path argument (colon
-# separated). Each path is taken relative to the provided directory.
-
-# Note: a particular scanning object is assumed to always return the
-# same result for the same input. This is why the search path is a
-# parameter to the constructor for a CPP scanning object. We go to
-# some pains to make sure that we return the same scanner object
-# for the same path: otherwise we will unecessarily scan files.
-sub find
-{
-    my ($class, $dir, $pdirs) = @_;
-    if (!defined $pdirs)
-    {
-        $pdirs = [];
-    }
-    elsif (ref($pdirs) ne 'ARRAY')
-    {
-        $pdirs = [split (/$main::PATH_SEPARATOR/o, $pdirs)];
-    }
-    my @path = map($dir->lookupdir($_), @$pdirs);
-    my ($spath) = "@path";
-    $scanner{$spath} || do
-    {
-        my ($self) = {'path' => \@path};
-        $scanner{$spath} = bless $self;
-      }
-}
-
-# Scan the specified file for include lines.
-sub scan
-{
-    my ($self, $file) = @_;
-    my ($angles, $quotes);
-
-    if (exists $file->{angles})
-    {
-        $angles = $file->{angles};
-        $quotes = $file->{quotes};
-    }
-    else
-    {
-        my (@anglenames, @quotenames);
-        return () unless open(SCAN, $file->rpath);
-        while (<SCAN>)
-        {
-            next unless /^\s*#/;
-            if (/^\s*#\s*include\s*([<"])(.*?)[>"]/)
-            {
-                if ($1 eq "<")
-                {
-                    push (@anglenames, $2);
-                }
-                else
-                {
-                    push (@quotenames, $2);
-                }
-            }
-        }
-        close(SCAN);
-        $angles = $file->{angles} = \@anglenames;
-        $quotes = $file->{quotes} = \@quotenames;
-    }
-
-    my (@shortpath) = @{$self->{path}};             # path for <> style includes
-    my (@longpath)  = ($file->{dir}, @shortpath);   # path for "" style includes
-
-    my (@includes);
-
-    my $name;
-    for $name (@$angles)
-    {
-        my $dir;
-        for $dir (@shortpath)
-        {
-            my ($include) = $dir->lookup_accessible($name);
-            if ($include)
-            {
-                push (@includes, $include) unless $include->ignore;
-                last;
-            }
-        }
-    }
-
-    for $name (@$quotes)
-    {
-        my $dir;
-        for $dir (@longpath)
-        {
-            my ($include) = $dir->lookup_accessible($name);
-            if ($include)
-            {
-                push (@includes, $include) unless $include->ignore;
-                last;
-            }
-        }
-    }
-
-    return @includes;
-}
-
-# Return the include flags that would be used for a C Compile.
-sub iflags
-{
-    my ($self, $env) = @_;
-    my ($iflags) = '';
-    my ($dir, $dpath);
-    for $dir (@{$self->{path}})
-    {
-        $dpath = $dir->path;
-
-        # Add the (presumably local) directory to the -I flags
-        # if we're not using repositories, the directory exists,
-        # or it's Linked to a source directory (that is, it *will*
-        # exist by the time the compilation occurs).
-        $iflags .= " " . $env->{INCDIRPREFIX} . $dpath . $env->{INCDIRSUFFIX}
-          if !@param::rpath || -d $dpath || $dir->is_linked;
-        next if File::Spec->file_name_is_absolute($dpath);
-        if (@param::rpath)
-        {
-            my $d;
-            if ($dpath eq $dir::CURDIR)
-            {
-                foreach $d (map($_->path, @param::rpath))
-                {
-                    $iflags .=
-                      " " . $env->{INCDIRPREFIX} . $d . $env->{INCDIRSUFFIX};
-                }
-            }
-            else
-            {
-                my ($rpath);
-                foreach $d (map($_->path, @param::rpath))
-                {
-                    $rpath = File::Spec->catfile($d, $dpath);
-                    $iflags .=
-                      " " . $env->{INCDIRPREFIX} . $rpath . $env->{INCDIRSUFFIX}
-                      if -d $rpath;
-                }
-            }
-        }
-    }
-    $iflags;
-}
-
-package File::Spec;
-
-use vars qw( $_SEP $_MATCH_SEP $_MATCH_VOL );
-
-# Cons is migrating to using File::Spec for portable path name
-# manipulation.  This is the right long-term direction, but there are
-# some problems with making the transition:
-#
-#	For multi-volume support, we need to use newer interfaces
-#	(splitpath, catpath, splitdir) that are only available in
-#	File::Spec 0.8.
-#
-#	File::Spec 0.8 doesn't work with Perl 5.00[34] due to
-#	regular expression incompatibilities (use of \z).
-#
-#	Forcing people to use a new version of a module is painful
-#	because (in the workplace) their administrators aren't
-#	always going to agree to install it everywhere.
-#
-# As a middle ground, we provide our own versions of all the File::Spec
-# methods we use, supporting both UNIX and Win32.  Some of these methods
-# are home brew, some are cut-and-pasted from the real File::Spec methods.
-# This way, we're not reinventing the whole wheel, at least.
-#
-# We can (and should) get rid of this class whenever 5.00[34] and
-# versions of File::Spec prior to 0.9 (?) have faded sufficiently.
-# We also may need to revisit whenever someone first wants to use
-# Cons on some platform other than UNIX or Win32.
-
-BEGIN
-{
-    if ($main::_WIN32)
-    {
-        $_SEP       = '\\';
-        $_MATCH_SEP = "[\Q/$_SEP\E]";
-        $_MATCH_VOL = "([a-z]:)?$_MATCH_SEP";
-    }
-    else
-    {
-        $_SEP       = '/';
-        $_MATCH_SEP = "\Q$_SEP\E";
-        $_MATCH_VOL = $_MATCH_SEP;
-    }
-}
-
-sub canonpath
-{
-    my ($self, $path) = @_;
-    if ($main::_WIN32)
-    {
-        $path =~ s/^([a-z]:)/\u$1/s;
-        $path =~ s|/|\\|g;
-        $path =~ s|([^\\])\\+|$1\\|g;                       # xx////xx  -> xx/xx
-        $path =~ s|(\\\.)+\\|\\|g;                          # xx/././xx -> xx/xx
-        $path =~ s|^(\.\\)+||s unless $path eq ".\\";       # ./xx      -> xx
-        $path =~ s|\\$|| unless $path =~ m#^([A-Z]:)?\\$#s; # xx/       -> xx
-    }
-    else
-    {
-        $path =~ s|/+|/|g unless ($^O eq 'cygwin');    # xx////xx  -> xx/xx
-        $path =~ s|(/\.)+/|/|g;                        # xx/././xx -> xx/xx
-        $path =~ s|^(\./)+||s unless $path eq "./";    # ./xx      -> xx
-        $path =~ s|^/(\.\./)+|/|s;                     # /../../xx -> xx
-        $path =~ s|/$|| unless $path eq "/";           # xx/       -> xx
-    }
-    return $path;
-}
-
-sub catdir
-{
-    my $self = shift;
-    my @args = @_;
-    foreach (@args)
-    {
-
-        # append a slash to each argument unless it has one there
-        $_ .= $_SEP if $_ eq '' || substr($_, -1) ne $_SEP;
-    }
-    return $self->canonpath(join ('', @args));
-}
-
-sub catfile
-{
-    my $self = shift;
-    my $file = pop @_;
-    return $file unless @_;
-    my $dir = $self->catdir(@_);
-    $dir .= $_SEP unless substr($dir, -1) eq $_SEP;
-    $file = '' if !defined($file);
-    return $dir . $file;
-}
-
-sub catpath
-{
-    my $path = $_[1] . $_[0]->catfile(@_[2 .. $#_]);
-    $path =~ s/(.)$_MATCH_SEP*$/$1/;
-    $path;
-}
-
-sub curdir
-{
-    '.';
-}
-
-sub file_name_is_absolute
-{
-    my ($self, $file) = @_;
-    return scalar($file =~ m{^$_MATCH_VOL}is);
-}
-
-sub splitdir
-{
-    my @dirs = split (/$_MATCH_SEP/, $_[1], -1);
-    push (@dirs, '') if $dirs[$#dirs];
-    @dirs;
-}
-
-sub splitpath
-{
-    my ($self, $path) = @_;
-    my $vol = '';
-    my $sep = $_SEP;
-    if ($main::_WIN32)
-    {
-        if ($path =~ s#^([A-Za-z]:|(?:\\\\|//)[^\\/]+[\\/][^\\/]+)([\\/])#$2#)
-        {
-            $vol = $1;
-            $sep = $2;
-        }
-    }
-    my (@path) = split (/$_MATCH_SEP/, $path, -1);
-    my $file = pop @path;
-    my $dirs = join ($sep, @path, '');
-    return ($vol, $dirs, $file);
-}
-
-sub updir
-{
-    '..';
-}
-
-sub case_tolerant
-{
-    return $main::_WIN32;
-}
-
-# Directory and file handling. Files/dirs are represented by objects.
-# Other packages are welcome to add component-specific attributes.
-package dir;
-
-use vars qw( $SEPARATOR $MATCH_SEPARATOR $CURDIR $UPDIR
-  $cwd_vol %root $top $cwd );
-
-BEGIN
-{
-
-    # A portable way of determing our directory separator.
-    $SEPARATOR = File::Spec->catdir('', '');
-
-    # A fast-path regular expression to match a directory separator
-    # anywhere in a path name.
-    if ($SEPARATOR eq '/')
-    {
-        $MATCH_SEPARATOR = "\Q$SEPARATOR\E";
-    }
-    else
-    {
-        $MATCH_SEPARATOR = "[\Q/$SEPARATOR\E]";
-    }
-
-    # Cache these values so we don't have to make a method call
-    # every time we need them.
-    $CURDIR  = File::Spec->curdir;    # '.' on UNIX
-    $UPDIR   = File::Spec->updir;     # '..' on UNIX
-                                      #
-    $cwd_vol = '';
-}
-
-# Annotate a node (file or directory) with info about the
-# method that created it.
-sub creator
-{
-    my ($self, @frame) = @_;
-    $self->{'creator'} = \@frame if @frame;
-    $self->{'creator'};
-}
-
-# Handle a file|dir type exception.  We only die if we find we were
-# invoked by something in a Conscript/Construct file, because
-# dependencies created directly by Cons' analysis shouldn't cause
-# an error.
-sub _type_exception
-{
-    my ($e) = @_;
-    my ($line, $sub);
-    (undef, undef, $line, $sub) = script::caller_info;
-    if (defined $line)
-    {
-        my $err =
-          "\"${\$e->path}\" already in use as a "
-          . ref($e)
-          . " before $sub on line $line";
-        if ($e->{'creator'})
-        {
-            my $script;
-            (undef, $script, $line, $sub) = @{$e->{'creator'}};
-            $err =
-              "\t" . $err . ",\n\t\tdefined by $sub in $script, line $line";
-        }
-        $err .= "\n";
-        die $err;
-    }
-}
-
-# This wraps up all the common File::Spec logic that we use for parsing
-# directory separators in a path and turning it into individual
-# subdirectories that we must create, as well as creation of root
-# nodes for any new file system volumes we find.  File::Spec doesn't have
-# intuitively obvious interfaces, so this is heavily commented.
-#
-# Note:  This is NOT an object or class method;
-# it's just a utility subroutine.
-sub _parse_path
-{
-    my ($dir, $path) = @_;
-
-    # Convert all slashes to the native directory separator.
-    # This allows Construct files to always be written with good
-    # old POSIX path names, regardless of what we're running on.
-    $path = File::Spec->canonpath($path);
-
-    # File::Spec doesn't understand the Cons convention of
-    # an initial '#' for top-relative files.  Strip it.
-    my ($toprel) = $path =~ s/^#//;
-
-    # Let File::Spec do the heavy lifting of parsing the path name.
-    my ($vol, $directories, $entry) = File::Spec->splitpath($path);
-    my @dirs = File::Spec->splitdir($directories);
-
-    # If there was a file entry on the end of the path, then the
-    # last @dirs element is '' and we don't need it.  If there
-    # wasn't a file entry on the end (File::Spec->splitpath() knew
-    # the last component was a directory), then the last @dirs
-    # element becomes the entry we want to look up.
-    my ($e) = pop @dirs;
-    $entry = $e if $entry eq '';
-
-    if (File::Spec->file_name_is_absolute($path))
-    {
-
-        # An absolute path name.  If no volume was supplied,
-        # use the volume of our current directory.
-        $vol = $cwd_vol if $vol eq '';
-        $vol = uc($vol) if File::Spec->case_tolerant;
-        if (!defined $root{$vol})
-        {
-
-            # This is our first time looking up a path name
-            # on this volume, so create a root node for it.
-            # (On UNIX systems, $vol is always '', so '/'
-            # always maps to the $root{''} node.)
-            $root{$vol} = {
-                            path     => $vol . $SEPARATOR,
-                            prefix   => $vol . $SEPARATOR,
-                            srcpath  => $vol . $SEPARATOR,
-                            'exists' => 1
-                            };
-            $root{$vol}->{'srcdir'} = $root{$vol};
-            bless $root{$vol};
-        }
-
-        # We're at the top, so strip the blank entry from the front of
-        # the @dirs array since the initial '/' it represents will now
-        # be supplied by the root node we return.
-        shift @dirs;
-        $dir = $root{$vol};
-    }
-    elsif ($toprel)
-    {
-        $dir = $dir::top;
-    }
-    ($dir, \@dirs, $entry);
-}
-
-# Common subroutine for creating directory nodes.
-sub _create_dirs
-{
-    my ($dir, @dirs) = @_;
-    my $e;
-    foreach $e (@dirs)
-    {
-        my $d = $dir->{member}->{$e};
-        if (!defined $d)
-        {
-            bless $d = {'entry' => $e, 'dir' => $dir,}, 'dir';
-            $d->creator(script::caller_info);
-            $d->{member}->{$dir::CURDIR} = $d;
-            $d->{member}->{$dir::UPDIR}  = $dir;
-            $dir->{member}->{$e}         = $d;
-        }
-        elsif (ref $d eq 'entry')
-        {
-            bless $d, 'dir';
-            $d->{member}->{$dir::CURDIR} = $d;
-            $d->{member}->{$dir::UPDIR}  = $dir;
-        }
-        elsif (ref $d eq 'file')
-        {
-
-            # This clause is to supply backwards compatibility,
-            # with a warning, for anyone that's used FilePath
-            # to refer to a directory.  After people have using
-            # 1.8 have had time to adjust (sometime in version
-            # 1.9 or later), we should remove this entire clause.
-            my ($script, $line, $sub);
-            (undef, $script, $line, $sub) = @{$d->{'creator'}};
-            if ($sub eq 'script::FilePath')
-            {
-                print STDERR
-                  "$0:  Warning:  $sub used to refer to a directory\n"
-                  . "\tat line $line of $script.  Use DirPath instead.\n";
-                bless $d, 'dir';
-            }
-            else
-            {
-                _type_exception($d);
-            }
-        }
-        elsif (ref $d ne 'dir')
-        {
-            _type_exception($d);
-        }
-        $dir = $d;
-    }
-    $dir;
-}
-
-# Look up an entry in a directory.  This method is for when we don't
-# care whether a file or directory is returned, so if the entry already
-# exists, it will simply be returned.  If not, we create it as a
-# generic "entry" which can be later turned into a file or directory
-# by a more-specific lookup.
-#
-# The file entry may be specified as relative, absolute (starts with /),
-# or top-relative (starts with #).
-sub lookup
-{
-    my ($dir, $entry) = @_;
-
-    if ($entry !~ m#$MATCH_SEPARATOR#o)
-    {
-
-        # Fast path: simple entry name in a known directory.
-        if ($entry =~ s/^#//)
-        {
-
-            # Top-relative names begin with #.
-            $dir = $dir::top;
-        }
-        elsif ($entry =~ s/^!//)
-        {
-            $dir = $dir::cwd->srcdir;
-        }
-    }
-    else
-    {
-        my $dirsref;
-        ($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-        $dir = _create_dirs($dir, @$dirsref) if @$dirsref;
-        return if !defined $dir;
-        return $dir if $entry eq '';
-    }
-
-    my $e = $dir->{member}->{$entry};
-    if (!defined $e)
-    {
-        bless $e = {'entry' => $entry, 'dir' => $dir,}, 'entry';
-        $e->creator(script::caller_info);
-        $dir->{member}->{$entry} = $e;
-    }
-
-    $e;
-}
-
-# Look up a file entry in a directory.
-#
-# The file entry may be specified as relative, absolute (starts with /),
-# or top-relative (starts with #).
-sub lookupfile
-{
-    my ($dir, $entry) = @_;
-
-    if ($entry !~ m#$MATCH_SEPARATOR#o)
-    {
-
-        # Fast path: simple entry name in a known directory.
-        if ($entry =~ s/^#//)
-        {
-
-            # Top-relative names begin with #.
-            $dir = $dir::top;
-        }
-        elsif ($entry =~ s/^!//)
-        {
-            $dir = $dir::cwd->srcdir;
-        }
-    }
-    else
-    {
-        my $dirsref;
-        ($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-        $dir = _create_dirs($dir, @$dirsref) if @$dirsref;
-        return undef if $entry eq '';
-    }
-
-    my $f = $dir->{member}->{$entry};
-    if (!defined $f)
-    {
-        bless $f = {'entry' => $entry, 'dir' => $dir,}, 'file';
-        $f->creator(script::caller_info);
-        $dir->{member}->{$entry} = $f;
-    }
-    elsif (ref $f eq 'entry')
-    {
-        bless $f, 'file';
-    }
-    elsif (ref $f ne 'file')
-    {
-        _type_exception($f);
-    }
-
-    $f;
-}
-
-# Look up a (sub-)directory entry in a directory.
-#
-# The (sub-)directory entry may be specified as relative, absolute
-# (starts with /), or top-relative (starts with #).
-sub lookupdir
-{
-    my ($dir, $entry) = @_;
-
-    my $dirsref;
-    if ($entry !~ m#$MATCH_SEPARATOR#o)
-    {
-
-        # Fast path: simple entry name in a known directory.
-        if ($entry =~ s/^#//)
-        {
-
-            # Top-relative names begin with #.
-            $dir = $dir::top;
-        }
-        elsif ($entry =~ s/^!//)
-        {
-            $dir = $dir::cwd->srcdir;
-        }
-    }
-    else
-    {
-        ($dir, $dirsref, $entry) = _parse_path($dir, $entry);
-    }
-    push (@$dirsref, $entry) if $entry ne '';
-    _create_dirs($dir, @$dirsref);
-}
-
-# Look up a file entry and return it if it's accessible.
-sub lookup_accessible
-{
-    my $file = $_[0]->lookupfile($_[1]);
-    return ($file && $file->accessible) ? $file : undef;
-}
-
-# Return the parent directory without doing a lookupdir,
-# which would create a parent if it doesn't already exist.
-# A return value of undef (! $dir->up) indicates a root directory.
-sub up
-{
-    $_[0]->{member}->{$dir::UPDIR};
-}
-
-# Return whether this is an entry somewhere underneath the
-# specified directory.
-sub is_under
-{
-    my $dir = $_[0];
-    while ($dir)
-    {
-        return 1 if $_[1] == $dir;
-        $dir = $dir->up;
-    }
-    return undef;
-}
-
-# Return the relative path from the calling directory ($_[1])
-# to the object.  If the object is not under the directory, then
-# we return it as a top-relative or absolute path name.
-sub relpath
-{
-    my ($dir, $obj) = @_;
-    my @dirs;
-    my $o = $obj;
-    while ($o)
-    {
-        if ($dir == $o)
-        {
-            if (@dirs < 2)
-            {
-                return $dirs[0] || '';
-            }
-            else
-            {
-                return File::Spec->catdir(@dirs);
-            }
-        }
-        unshift (@dirs, $o->{entry});
-        $o = $o->up;
-    }
-
-    # The object was not underneath the specified directory.
-    # Use the node's cached path, which is either top-relative
-    # (in which case we append '#' to the beginning) or
-    # absolute.
-    my $p = $obj->path;
-    $p = '#' . $p if !File::Spec->file_name_is_absolute($p);
-    return $p;
-}
-
-# Return the path of the directory (file paths implemented
-# separately, below).
-sub path
-{
-    $_[0]->{path} || ($_[0]->{path} = $_[0]->{dir}->prefix . $_[0]->{entry});
-}
-
-# Return the pathname as a prefix to be concatenated with an entry.
-sub prefix
-{
-    return $_[0]->{prefix} if exists $_[0]->{prefix};
-    $_[0]->{prefix} = $_[0]->path . $SEPARATOR;
-}
-
-# Return the related source path prefix.
-sub srcprefix
-{
-    return $_[0]->{srcprefix} if exists $_[0]->{srcprefix};
-    my ($srcdir) = $_[0]->srcdir;
-    $srcdir->{srcprefix} =
-      $srcdir eq $_[0] ? $srcdir->prefix : $srcdir->srcprefix;
-}
-
-# Return the related source directory.
-sub srcdir
-{
-    $_[0]->{'srcdir'}
-      || ($_[0]->{'srcdir'} = $_[0]->{dir}->srcdir->lookupdir($_[0]->{entry}));
-}
-
-# Return if the directory is linked to a separate source directory.
-sub is_linked
-{
-    return $_[0]->{is_linked} if defined $_[0]->{is_linked};
-    $_[0]->{is_linked} = $_[0]->path ne $_[0]->srcdir->path;
-}
-
-sub link
-{
-    my (@paths)  = @_;
-    my ($srcdir) = $dir::cwd->lookupdir(pop @paths)->srcdir;
-    map($dir::cwd->lookupdir($_)->{'srcdir'} = $srcdir, @paths);
-
-    # make a reverse lookup for the link.
-    $srcdir->{links} = [] if !$srcdir->{links};
-    push @{$srcdir->{links}}, @paths;
-}
-
-use vars qw( @tail );    # TODO: Why global ????
-
-sub linked_targets
-{
-    my $tgt     = shift;
-    my @targets = ();
-    my $dir;
-    if (ref $tgt eq 'dir')
-    {
-        $dir = $tgt;
-    }
-    else
-    {
-        push @tail, $tgt;
-        $dir = $tgt->{dir};
-    }
-    while ($dir)
-    {
-        if (defined $dir->{links} && @{$dir->{links}})
-        {
-            push @targets, map(File::Spec->catdir($_, @tail), @{$dir->{links}});
-
-            #print STDERR "Found Link: ${\$dir->path} -> @{\$dir->{links}}\n";
-        }
-        unshift @tail, $dir->{entry};
-        $dir = $dir->up;
-    }
-
-    return map($dir::top->lookupdir($_), @targets);
-}
-
-sub accessible
-{
-    my $path = $_[0]->path;
-    my $err  =
-      "$0: you have attempted to use path \"$path\" both as a file "
-      . "and as a directory!\n";
-    die $err;
-}
-
-sub init
-{
-    my $path = Cwd::cwd();
-
-    # We know we can get away with passing undef to lookupdir
-    # as the directory because $dir is an absolute path.
-    $top = lookupdir(undef, $path);
-    $top->{'path'} = $top->{srcpath} = $dir::CURDIR;
-    $top->{'prefix'} = '';
-    $top->{'srcdir'} = $top;
-
-    $cwd = $top;
-
-    ($cwd_vol, undef, undef) = File::Spec->splitpath($path);
-    $cwd_vol = '' if !defined $cwd_vol;
-    $cwd_vol = uc($cwd_vol) if File::Spec->case_tolerant;
-}
-
-package file;
-
-use vars qw( @ISA $level );
-
-BEGIN { @ISA = qw(dir); $level = 0 }
-
-# Return the pathname of the file.
-# Define this separately from dir::path because we don't want to
-# cache all file pathnames (just directory pathnames).
-sub path
-{
-    $_[0]->{dir}->prefix . $_[0]->{entry};
-}
-
-# Return the related source file path.
-sub srcpath
-{
-    $_[0]->{dir}->srcprefix . $_[0]->{entry};
-}
-
-# Return if the file is (should be) linked to a separate source file.
-sub is_linked
-{
-    $_[0]->{dir}->is_linked;
-}
-
-# Repository file search.  If the local file exists, that wins.
-# Otherwise, return the first existing same-named file under a
-# Repository directory.  If there isn't anything with the same name
-# under a Repository directory, return the local file name anyway
-# so that some higher layer can try to construct it.
-sub rfile
-{
-    return $_[0]->{rfile} if exists $_[0]->{rfile};
-    my ($self)  = @_;
-    my ($rfile) = $self;
-    if (@param::rpath)
-    {
-        my ($path) = $self->path;
-        if (!File::Spec->file_name_is_absolute($path) && !-f $path)
-        {
-            my ($dir);
-            foreach $dir (@param::rpath)
-            {
-                my ($t) = $dir->prefix . $path;
-                if (-f $t)
-                {
-                    $rfile = $_[0]->lookupfile($t);
-                    $rfile->{'lfile'} = $self;
-                    last;
-                }
-            }
-        }
-    }
-    $self->{rfile} = $rfile;
-}
-
-# Returns the local file for a repository file;
-# returns self if it's already a local file.
-sub lfile
-{
-    $_[0]->{'lfile'} || $_[0];
-}
-
-# returns the "precious" status of this file.
-sub precious
-{
-    return $_[0]->{precious};
-}
-
-# "Erase" reference to a Repository file,
-# making this a completely local file object
-# by pointing it back to itself.
-sub no_rfile
-{
-    $_[0]->{'rfile'} = $_[0];
-}
-
-# Return a path to the first existing file under a Repository directory,
-# implicitly returning the current file's path if there isn't a
-# same-named file under a Repository directory.
-sub rpath
-{
-    $_[0]->{rpath} || ($_[0]->{rpath} = $_[0]->rfile->path);
-}
-
-# Return a path to the first linked srcpath file under a Repositoy
-# directory, implicitly returning the current file's srcpath if there
-# isn't a same-named file under a Repository directory.
-sub rsrcpath
-{
-    return $_[0]->{rsrcpath} if exists $_[0]->{rsrcpath};
-    my ($self) = @_;
-    my ($path) = $self->{rsrcpath} = $self->srcpath;
-    if (@param::rpath && !File::Spec->file_name_is_absolute($path) && !-f $path)
-    {
-        my ($dir);
-        foreach $dir (@param::rpath)
-        {
-            my ($t) = $dir->prefix . $path;
-            if (-f $t)
-            {
-                $self->{rsrcpath} = $t;
-                last;
-            }
-        }
-    }
-    $self->{rsrcpath};
-}
-
-# Return if a same-named file source file exists.
-# This handles the interaction of Link and Repository logic.
-# As a side effect, it will link a source file from its Linked
-# directory (preferably local, but maybe in a repository)
-# into a build directory from its proper Linked directory.
-sub source_exists
-{
-    return $_[0]->{source_exists} if defined $_[0]->{source_exists};
-    my ($self) = @_;
-    my ($path) = $self->path;
-    my ($mtime, $ctime) = (stat($path))[9, 10];
-    if ($self->is_linked)
-    {
-
-        # Linked directory, local logic.
-        my ($srcpath) = $self->srcpath;
-        my ($src_mtime, $src_ctime) = (stat($srcpath))[9, 10];
-        if ($src_mtime)
-        {
-            if (!$mtime || $src_mtime != $mtime || $src_ctime != $ctime)
-            {
-                futil::install($srcpath, $self);
-            }
-            return $self->{source_exists} = 1;
-        }
-
-        # Linked directory, repository logic.
-        if (@param::rpath)
-        {
-            if ($self != $self->rfile)
-            {
-                return $self->{source_exists} = 1;
-            }
-            my ($rsrcpath) = $self->rsrcpath;
-            if ($path ne $rsrcpath)
-            {
-                my ($rsrc_mtime, $rsrc_ctime) = (stat($rsrcpath))[9, 10];
-                if ($rsrc_mtime)
-                {
-                    if (!$mtime
-                        || $rsrc_mtime != $mtime
-                        || $rsrc_ctime != $ctime)
-                    {
-                        futil::install($rsrcpath, $self);
-                    }
-                    return $self->{source_exists} = 1;
-                }
-            }
-        }
-
-        # There was no source file in any Linked directory
-        # under any Repository.  If there's one in the local
-        # build directory, it no longer belongs there.
-        if ($mtime)
-        {
-            unlink($path) || die ("$0: couldn't unlink $path ($!)\n");
-        }
-        return $self->{source_exists} = '';
-    }
-    else
-    {
-        if ($mtime)
-        {
-            return $self->{source_exists} = 1;
-        }
-        if (@param::rpath && $self != $self->rfile)
-        {
-            return $self->{source_exists} = 1;
-        }
-        return $self->{source_exists} = '';
-    }
-}
-
-# Return if a same-named derived file exists under a Repository directory.
-sub derived_exists
-{
-    $_[0]->{derived_exists}
-      || ($_[0]->{derived_exists} = ($_[0] != $_[0]->rfile));
-}
-
-# Return if this file is somewhere under a Repository directory.
-sub is_on_rpath
-{
-    defined $_[0]->{'lfile'};
-}
-
-sub local
-{
-    my ($self, $arg) = @_;
-    if (defined $arg)
-    {
-        $self->{'local'} = $arg;
-    }
-    $self->{'local'};
-}
-
-# Return the entry name of the specified file with the specified
-# suffix appended.  Leave it untouched if the suffix is already there.
-# Differs from the addsuffix function, below, in that this strips
-# the existing suffix (if any) before appending the desired one.
-sub base_suf
-{
-    my ($entry) = $_[0]->{entry};
-    if ($entry !~ m/$_[1]$/)
-    {
-        $entry =~ s/\.[^\.]*$//;
-        $entry .= $_[1];
-    }
-    $entry;
-}
-
-# Return the suffix of the file; everything including and to the
-# right of the last dot.
-sub suffix
-{
-    my @pieces = split (/\./, $_[0]->{entry});
-    my $suffix = pop (@pieces);
-    return ".$suffix";
-}
-
-# Called as a simple function file::addsuffix(name, suffix)
-sub addsuffix
-{
-    my ($name, $suffix) = @_;
-
-    if ($suffix && substr($name, -length($suffix)) ne $suffix)
-    {
-        return $name .= $suffix;
-    }
-    $name;
-}
-
-# Return true if the file is (or will be) accessible.
-# That is, if we can build it, or if it is already present.
-sub accessible
-{
-    (exists $_[0]->{builder}) || ($_[0]->source_exists);
-}
-
-# Return true if the file should be ignored for the purpose
-# of computing dependency information (should not be considered
-# as a dependency and, further, should not be scanned for
-# dependencies).
-sub ignore
-{
-    return 0 if !$param::ignore;
-    return $_[0]->{ignore} if exists $_[0]->{ignore};
-    $_[0]->{ignore} = $_[0]->path =~ /$param::ignore/o;
-}
-
-# Build the file, if necessary.
-sub build
-{
-    return $_[0]->{status} if $_[0]->{status};
-    my ($status) = &file::_build;
-    if ($_[0]->{after_build_func})
-    {
-
-        #print STDERR "DEBUG: after_build_func=$_[0]->{after_build_func}\n";
-        my ($pkgvars) = $_[0]->{conscript}->{pkgvars};
-        NameSpace::restore('script', $pkgvars) if $pkgvars;
-        eval("package script; " . $_[0]->{after_build_func});
-        print "Error running AfterBuild for ${\$_[0]->path}: $@\n" if ($@);
-        NameSpace::remove('script', keys %$pkgvars) if $pkgvars;
-    }
-    return $status;
-}
-
-sub _build
-{
-    my @args = @_;
-
-    if ($param::max_jobs <= 1)
-    {    # pcons
-        my ($self) = @args;
-        print main::DEPFILE $self->path, "\n" if $param::depfile;
-        print((' ' x $level), "Checking ", $self->path, "\n")
-          if $param::depends;
-        if (!exists $self->{builder})
-        {
-
-            # We don't know how to build the file. This is OK, if
-            # the file is present as a source file, under either the
-            # local tree or a Repository.
-            if ($self->source_exists)
-            {
-                return $self->{status} = 'handled';
-            }
-            else
-            {
-                my ($name) = $self->path;
-                print("$0: don't know how to construct \"$name\"\n");
-                exit(1) unless $param::kflag;
-                return $self->{status} = 'errors';    # xxx used to be 'unknown'
-            }
-        }
-
-        # An associated build object exists, so we know how to build
-        # the file. We first compute the signature of the file, based
-        # on its dependendencies, then only rebuild the file if the
-        # signature has changed.
-        my ($builder) = $self->{builder};
-        $level += 2;
-
-        my (@deps) = (@{$self->{dep}}, @{$self->{sources}});
-        my ($rdeps) = \@deps;
-
-        if ($param::random)
-        {
-
-            # If requested, build in a random order, instead of the
-            # order that the dependencies were listed.
-            my (%rdeps);
-            map { $rdeps{$_, '*' x int(rand 10)} = $_ } @deps;
-            $rdeps = [values(%rdeps)];
-        }
-
-        $self->{status} = '';
-
-        my $dep;
-        for $dep (@$rdeps)
-        {
-            if ((build $dep) eq 'errors')
-            {
-
-                # Propagate dependent errors to target.
-                # but try to build all dependents regardless of errors.
-                $self->{status} = 'errors';
-            }
-        }
-
-        # If any dependents had errors, then we abort.
-        if ($self->{status} eq 'errors')
-        {
-            $level -= 2;
-            return 'errors';
-        }
-
-        # Compute the final signature of the file, based on
-        # the static dependencies (in order), dynamic dependencies,
-        # output path name, and (non-substituted) build script.
-        my ($sig) =
-          'sig'->collect(map('sig'->signature($_->rfile), @deps),
-                         $builder->includes($self), $builder->scriptsig);
-
-        # May have gotten errors during computation of dynamic
-        # dependency signature, above.
-        $level -= 2;
-        return 'errors' if $self->{status} eq 'errors';
-
-        if (@param::rpath && $self->derived_exists)
-        {
-
-            # There is no local file of this name, but there is one
-            # under a Repository directory.
-
-            if ('sig'->current($self->rfile, $sig))
-            {
-
-                # The Repository copy is current (its signature matches
-                # our calculated signature).
-                if ($self->local)
-                {
-
-                    # ...but they want a local copy, so provide it.
-                    main::showcom("Local copy of ${\$self->path} from "
-                                  . "${\$self->rpath}");
-                    futil::install($self->rpath, $self);
-                    'sig'->bsig($self, $sig);
-                }
-                return $self->{status} = 'handled';
-            }
-
-            # The signatures don't match, implicitly because something
-            # on which we depend exists locally.  Get rid of the reference
-            # to the Repository file; we'll build this (and anything that
-            # depends on it) locally.
-            $self->no_rfile;
-        }
-
-        # Then check for currency.
-        if (!'sig'->current($self, $sig))
-        {
-
-            # We have to build/derive the file.
-            print((' ' x $level), "Rebuilding ", $self->path,
-                  ": out of date.\n")
-              if $param::depends;
-
-            # First check to see if the built file is cached.
-            if ($builder->cachin($self, $sig))
-            {
-                'sig'->bsig($self, $sig);
-                return $self->{status} = 'built';
-            }
-            elsif ($builder->action($self))
-            {
-                $builder->cachout($self, $sig);
-                'sig'->bsig($self, $sig);
-                return $self->{status} = 'built';
-            }
-            else
-            {
-                die ("$0: errors constructing ${\$self->path}\n")
-                  unless $param::kflag;
-                return $self->{status} = 'errors';
-            }
-        }
-        else
-        {
-
-            # Push this out to the cache if we've been asked to (-C option).
-            # Don't normally do this because it slows us down.
-            # In a fully built system, no accesses to the cache directory
-            # are required to check any files. This is a win if cache is
-            # heavily shared. Enabling this option puts the directory in the
-            # loop. Useful only when you wish to recreate a cache from a build.
-            if ($param::cachesync)
-            {
-                $builder->cachout($self, $sig);
-                'sig'->bsig($self, $sig);
-            }
-            return $self->{status} = 'handled';
-        }
-    }
-    else
-    {    # pcons
-        my ($tgt) = @args;    # pcons
-        local ($file::child_queue) = {parent => $tgt};    # pcons
-        _pbuild($tgt);                                    # pcons
-        wait_on_all_children();                           # pcons
-        return $tgt->{status};                            # pcons
-    }
-}
-
-########################################
-# pcons only BEGIN
-#
-
-sub pbuild
-{
-    $_[0]->{status} || &file::_pbuild;
-}
-
-sub _pbuild
-{
-    my ($self) = @_;
-    $self->{status} = '';    # tgl
-    print main::DEPFILE $self->path, "\n" if param::depfile;
-    print((' ' x $level), $self->path, "\n") if $param::depends;
-    if (!exists $self->{builder})
-    {
-
-        # We don't know how to build the file. This is OK, if
-        # the file is present as a source file, under either the
-        # local tree or a Repository.
-        if ($self->source_exists)
-        {
-            return $self->{status} = 'handled';
-        }
-        else
-        {
-            my ($name) = $self->path;
-            print("$0: don't know how to construct \"$name\"\n");
-            exit(1) unless $param::kflag;
-            return $self->{status} = 'errors';    # xxx used to be 'unknown'
-        }
-    }
-
-    # An associated build object exists, so we know how to build
-    # the file. We first compute the signature of the file, based
-    # on its dependendencies, then only rebuild the file if the
-    # signature has changed.
-    my ($builder) = $self->{'builder'};
-    $level += 2;
-
-    my (@deps) = (@{$self->{dep}}, @{$self->{sources}});
-    my ($rdeps) = \@deps;
-
-    if ($param::random)
-    {
-
-        # If requested, build in a random order, instead of the
-        # order that the dependencies were listed.
-        my (%rdeps);
-
-        # FIX	map { $rdeps{$_,'*' x int(rand(0,10))} = $_ } @deps;
-        map { $rdeps{$_, '*' x int(rand(10))} = $_ } @deps;
-        $rdeps = [values(%rdeps)];
-    }
-
-    $self->{status} = '';
-
-    my $sig;
-    {
-
-        # print "in ", $self->path, "\n";
-        local ($file::child_queue) = {parent => $self};
-        for my $dep (@$rdeps)
-        {
-            if ((pbuild $dep) eq 'errors')
-            {
-
-                # Propagate dependent errors to target.
-                # but try to build all dependents regardless of errors.
-                $self->{status} = 'errors';
-            }
-        }
-        wait_on_all_children();
-
-    }
-
-    # If any dependents had errors, then we abort.
-    if ($self->{'status'} eq 'errors')
-    {
-        $level -= 2;
-        return 'errors';
-    }
-
-    # Compute the final signature of the file, based on
-    # the static dependencies (in order), dynamic dependencies,
-    # output path name, and (non-substituted) build script.
-
-    #    my($sig) = $self->{'sign'} = sig->collect(map(sig->signature($_->rfile), @deps),
-    #			    $builder->includes($self),
-    ## FIX			    $builder->script);
-    #			    $builder->scriptsig);
-
-    my ($sig) = 'sig'->collect(
-        map('sig'->signature($_->rfile), @deps),    # from cons-2.3.0
-        $builder->includes($self),                  # from cons-2.3.0
-        $builder->scriptsig
-        );    # from cons-2.3.0
-    $self->{sign} = $sig;
-
-    # May have gotten errors during computation of dynamic
-    # dependency signature, above.
-    $level -= 2;
-    return 'errors' if $self->{status} eq 'errors';
-
-    if (@param::rpath && $self->derived_exists)
-    {
-
-        # There is no local file of this name, but there is one
-        # under a Repository directory.
-
-        if ('sig'->current($self->rfile, $sig))
-        {
-
-            # The Repository copy is current (its signature matches
-            # our calculated signature).
-            if ($self->local)
-            {
-
-                # ...but they want a local copy, so provide it.
-                main::showcom(
-                         "Local copy of ${\$self->path} from ${\$self->rpath}");
-                futil::install($self->rpath, $self);
-
-                #'sig'->set($self, $sig);
-                'sig'->bsig($self, $sig);    # pcons
-            }
-            return $self->{status} = 'handled';
-        }
-
-        # The signatures don't match, implicitly because something
-        # on which we depend exists locally.  Get rid of the reference
-        # to the Repository file; we'll build this (and anything that
-        # depends on it) locally.
-        $self->no_rfile;
-    }
-
-    # Then check for currency.
-    if (!'sig'->current($self, $sig))
-    {
-
-        # We have to build/derive the file.
-        # First check to see if the built file is cached.
-        if ($builder->cachin($self, $sig))
-        {
-
-            #'sig'->set($self, $sig);
-            'sig'->bsig($self, $sig);    # pcons
-            return $self->{status} = 'built';
-
-            # action no longer blocks (for most actions), so this returns
-            # immediately, before any  commands are actually run.  The
-            # signature and return status should be overridden later in
-            # wait_on_child if a process was forked, but they are still set
-            # here in case a non-spawning action was called
-        }
-        elsif ($builder->action($self))
-        {
-            $builder->cachout($self, $sig);
-
-            #'sig'->set($self, $sig);
-            'sig'->bsig($self, $sig);    # pcons
-            return $self->{status} = 'built';
-        }
-        else
-        {
-            die ("$0: errors constructing ${\$self->path}\n")
-              unless $param::kflag;
-            return $self->{status} = 'errors';
-        }
-    }
-    else
-    {
-
-        # Push this out to the cache if we've been asked to (-C option).
-        # Don't normally do this because it slows us down.
-        # In a fully built system, no accesses to the cache directory
-        # are required to check any files. This is a win if cache is
-        # heavily shared. Enabling this option puts the directory in the
-        # loop. Useful only when you wish to recreate a cache from a build.
-        if ($param::cachesync)
-        {
-            $builder->cachout($self, $sig);
-
-            #'sig'->set($self, $sig);
-            'sig'->bsig($self, $sig);
-        }
-        return $self->{status} = 'handled';
-    }
-}
-
-my @finished;    # pcons //fix -Mstrict
-
-sub wait_on_max_jobs
-{
-    while (grep(/\d+/, keys %{$file::child_queue}) >= $param::max_jobs)
-    {
-        wait_on_child();
-    }
-}
-
-sub wait_on_all_children
-{
-
-    while (grep(/\d+/, keys %{$file::child_queue}) != 0)
-    {
-        wait_on_child();
-    }
-}
-
-sub wait_on_child
-{
-    my ($queue)  = $file::child_queue;
-    my ($parent) = $queue->{parent};
-
-    my $n = grep(/\d+/, keys %{$file::child_queue});
-
-    # printf "Waiting to build (%s): %s\n", $n, $parent->path if ref($parent) eq 'file';
-    my $pid = undef;
-
-    # first check for jobs that have already been collected from child
-    # targets
-    for my $p (@finished)
-    {
-        if ($queue->{$p})
-        {
-            $pid = $p;
-            last;
-        }
-    }
-
-    while (!$queue->{$pid})
-    {
-        $pid = wait();
-        if ($pid < 1)
-        {
-            die "wait returned invalid pid $pid";
-        }
-        else
-        {
-
-            # this job was meant for a parent, save it so that it can be
-            # found later
-            if (!$queue->{$pid})
-            {
-                push @finished, $pid;
-            }
-        }
-    }
-
-    my $child = $queue->{$pid};
-    my $tgt   = $queue->{$pid}->{'tgt'};
-    my $com   = $child->{'com'};
-    $tgt->{status} = 'built';
-
-    #print "waited: ", $tgt->path; 
-    #print "on: ",  keys %{$queue}, "\n";
-
-    my ($b0, $b1) = ($? & 0xFF, $? >> 8);
-
-    # Don't actually see 0177 on stopped process; is this necessary?
-    # next if $b0 == 0177; # process stopped; we can wait.
-    if ($b0)
-    {
-        my ($core, $sig) = ($b0 & 0200, $b0 & 0177);
-        my ($coremsg) = $core ? "; core dumped" : "";
-        $com =~ s/\s.*//;
-        my ($path) = $tgt->path;
-        warn qq($0: *** [$path] $com terminated by signal $sig$coremsg\n);
-        $parent->{status} = $tgt->{status} = 'errors';
-    }
-    if ($b1)
-    {
-        my ($path) = $tgt->path;
-        warn qq($0: *** [$path] Error $b1\n);    # trying to be like make.
-        $parent->{status} = $tgt->{status} = 'errors';
-    }
-    if ($tgt->{status} eq 'built')
-    {
-        $tgt->{builder}->cachout($tgt, $tgt->{sign});
-
-        #'sig'->set($tgt, $tgt->{sign});
-        'sig'->bsig($tgt, $tgt->{sign});
-    }
-    else
-    {
-        die ("$0: errors constructing ${\$tgt->path}\n") unless $param::kflag;
-    }
-    delete $queue->{$pid};
-
-}
-
-#
-# pcons END
-########################################
-
-# Bind an action to a file, with the specified sources. No return value.
-sub bind
-{
-    my ($self, $builder, @sources) = @_;
-    if ($self->{builder} && !$self->{builder}->compatible($builder))
-    {
-
-        # Even if not "compatible", we can still check to see if the
-        # derivation is identical. It should be identical if the builder is
-        # the same and the sources are the same.
-        if ("$self->{builder} @{$self->{sources}}" ne "$builder @sources")
-        {
-            $main::errors++;
-            my ($_foo1, $script1, $line1, $sub1) = @{$self->creator};
-            my ($_foo2, $script2, $line2, $sub2) = script::caller_info;
-            my $err =
-              "\t${\$self->path}\n"
-              . "\tbuilt (at least) two different ways:\n"
-              . "\t\t$script1, line $line1:  $sub1\n"
-              . "\t\t$script2, line $line2:  $sub2\n";
-            die $err;
-        }
-        return;
-    }
-    if ($param::wflag)
-    {
-        my ($script, $line, $sub);
-        (undef, $script, $line, $sub) = script::caller_info;
-        $self->{script} = '' if !defined $self->{script};
-        $self->{script} .= "; " if $self->{script};
-        $self->{script} .= qq($sub in "$script", line $line);
-    }
-    $self->{builder} = $builder;
-    push (@{$self->{sources}}, @sources);
-    @{$self->{dep}} = () if !defined $self->{dep};
-    $self->{conscript} = $priv::self->{script};
-}
-
-sub is_under
-{
-    $_[0]->{dir}->is_under($_[1]);
-}
-
-sub relpath
-{
-    my $dirpath = $_[0]->relpath($_[1]->{dir});
-    if (!$dirpath)
-    {
-        return $_[1]->{entry};
-    }
-    else
-    {
-        File::Spec->catfile($dirpath, $_[1]->{entry});
-    }
-}
-
-# Return the signature array for this file.
-# This probably belongs in its own "sigarray" package,
-# which would make it easier to optimize performance.
-sub sigarray
-{
-    if ($_[0]->{sigaref})
-    {
-        return @{$_[0]->{sigaref}};
-    }
-    my $self = shift;
-
-    # glob2pat based on The Perl Cookbook, p. 180.
-    sub glob2pat
-    {
-        my $globstr = shift;
-        my %patmap = (
-                     '*' => '.*',
-                     '?' => '.',
-                     '[' => '[',
-                     ']' => ']',
-                     '/' => "\Q$dir::SEPARATOR",    # Cons-specific modification
-                     );
-        $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge;
-        return '^' . $globstr . '$';
-    }
-    my @sigarray;
-    my $default;
-    my $builder = $self->lfile->{builder};
-    if (!$builder)
-    {
-        @sigarray = @$param::sourcesig;
-        $default  = [qw(content)];
-    }
-    else
-    {
-        if ($builder->{env} && $builder->{env}->{SIGNATURE})
-        {
-            @sigarray = @{$builder->{env}->{SIGNATURE}};
-        }
-        else
-        {
-            my $class = ref $builder;
-            my $path  = $self->path;
-            warn qq($0: Warning:  Builder package $class did not record\n)
-              . qq(\tthe calling environment for '$path'.\n)
-              . qq(\tUnable to use any %SIGNATURE construction variable\n)
-              . qq(\tfor signature configuration.\n);
-        }
-        $default = [qw(build)];
-    }
-    my $path = $self->path;
-    while (@sigarray)
-    {
-        my ($glob, $aref) = splice(@sigarray, 0, 2);
-        my $re = glob2pat($glob);
-        if ($path =~ /$re/)
-        {
-            $aref = [split (/\s+/, $aref)] if !ref $aref;
-            $self->{sigaref} = $aref;
-            return @$aref;
-        }
-    }
-    $self->{sigaref} = $default;
-    return @{$self->{sigaref}};
-}
-
-# Decide if this file's signature should be the content or build signature.
-sub sigtype
-{
-    if ($_[0]->{sigtype})
-    {
-        return $_[0]->{sigtype};
-    }
-    my $self     = shift;
-    my @sigarray = $self->sigarray;
-    my $sigtype;
-    if (grep($_ eq "build", @sigarray))
-    {
-        $sigtype = 'bsig';
-    }
-    elsif (grep($_ =~ /content$/, @sigarray))
-    {
-        $sigtype = 'csig';
-    }
-    return $self->{sigtype} = $sigtype;
-}
-
-# Return whether this file is configured to use stored
-# signature values from the .consign file.
-sub stored
-{
-    if (!defined $_[0]->{stored})
-    {
-        $_[0]->{stored} = grep($_ eq "stored-content", $_[0]->sigarray);
-    }
-    return $_[0]->{stored};
-}
-
-# Generic entry (file or directory) handling.
-# This is an empty subclass for nodes that haven't
-# quite decided whether they're files or dirs.
-# Use file methods until someone blesses them one way or the other.
-package entry;
-
-use vars qw( @ISA );
-
-BEGIN { @ISA = qw(file) }
-
-# File utilities
-package futil;
-
-# Install one file as another.
-# Links them if possible (hard link), otherwise copies.
-# Don't ask why, but the source is a path, the tgt is a file obj.
-sub install
-{
-    my ($sp, $tgt) = @_;
-    my ($tp) = $tgt->path;
-    return 1 if $tp eq $sp;
-    return 1 if eval { link($sp, $tp) };
-    unlink($tp);
-    if (!futil::mkdir($tgt->{dir}))
-    {
-        return undef;
-    }
-    return 1 if eval { link($sp, $tp) };
-    futil::copy($sp, $tp);
-}
-
-# Copy one file to another. Arguments are actual file names.
-# Returns undef on failure. Preserves mtime and mode.
-sub copy
-{
-    my ($sp, $tp) = @_;
-    my ($mode, $length, $atime, $mtime) = (stat($sp))[2, 7, 8, 9];
-
-    # Use Perl standard library module for file copying, which handles
-    # binary copies. <schwarze@isa.de> 1998-06-18
-    if (!File::Copy::copy($sp, $tp))
-    {
-        warn qq($0: can\'t install "$sp" to "$tp" ($!)\n);    #'
-        return undef;
-    }
-
-    # The file has been created, so try both the chmod and utime,
-    # first making sure the copy is writable (because permissions
-    # affect the ability to modify file times on some operating
-    # systems), and then changing permissions back if necessary.
-    my $ret   = 1;
-    my $wmode = $mode | 0700;
-    if (!chmod $wmode, $tp)
-    {
-        warn qq($0: can\'t set mode $wmode on file "$tp" ($!)\n);    #'
-        $ret = undef;
-    }
-    if (!utime $atime, $mtime, $tp)
-    {
-        warn qq($0: can\'t set modification time for file "$tp" ($!)\n);    #'
-        $ret = undef;
-    }
-    if ($mode != $wmode && !chmod $mode, $tp)
-    {
-        warn qq($0: can\'t set mode $mode on file "$tp" ($!)\n);    #'
-        $ret = undef;
-    }
-    return $ret;
-}
-
-# Ensure that the specified directory exists.
-# Aborts on failure.
-sub mkdir
-{
-    return 1 if $_[0]->{'exists'};
-    if (!futil::mkdir($_[0]->{dir}))
-    {    # Recursively make parent.
-        return undef;
-    }
-    my ($path) = $_[0]->path;
-    if (!-d $path && !mkdir($path, 0777))
-    {
-        warn qq($0: can't create directory $path ($!).\n);    #'
-        return undef;
-    }
-    $_[0]->{'exists'} = 1;
-}
-
-# Signature package.
-package sig::hash;
-
-use vars qw( $called );
-
-sub init
-{
-    my ($dir)     = @_;
-    my ($consign) = $dir->prefix . ".consign";
-    my ($dhash)   = $dir->{consign} = {};
-    if (-f $consign)
-    {
-        open(CONSIGN, $consign) || die ("$0: can't open $consign ($!)\n");
-        while (<CONSIGN>)
-        {
-            chop;
-            my ($file, $sig) = split (/:/, $_);
-            $dhash->{$file} = $sig;
-        }
-        close(CONSIGN);
-    }
-    $dhash;
-}
-
-# Read the hash entry for a particular file.
-sub in
-{
-    my ($dir) = $_[0]->{dir};
-    ($dir->{consign} || init($dir))->{$_[0]->{entry}};
-}
-
-# Write the hash entry for a particular file.
-sub out
-{
-    my ($file, $sig) = @_;
-    my ($dir) = $file->{dir};
-    ($dir->{consign} || init($dir))->{$file->{entry}} = $sig;
-    $sig::hash::dirty{$dir} = $dir;
-}
-
-# Eliminate the hash entry for a particular file.
-sub clear
-{
-    my ($file) = @_;
-    my ($dir)  = $file->{dir};
-    delete $dir->{consign}->{$file->{entry}} if $dir->{consign};
-    $sig::hash::dirty{$dir} = $dir;
-}
-
-# Flush hash entries. Called at end or via ^C interrupt.
-sub END
-{
-    return if $called++;    # May be called twice.
-    close(CONSIGN);         # in case this came in via ^C.
-    my $dir;
-    for $dir (values %sig::hash::dirty)
-    {
-        my ($consign)  = $dir->prefix . ".consign";
-        my ($constemp) = $consign . ".$$";
-        if (!open(CONSIGN, ">$constemp"))
-        {
-            die ("$0: can't create $constemp ($!)\n");
-        }
-        my ($entry, $sig);
-        while (($entry, $sig) = each %{$dir->{consign}})
-        {
-            if (!print CONSIGN "$entry:$sig\n")
-            {
-                die ("$0: error writing to $constemp ($!)\n");
-            }
-        }
-        close(CONSIGN);
-        if (!rename($constemp, $consign))
-        {
-            if (futil::copy($constemp, $consign))
-            {
-                unlink($constemp);
-            }
-            else
-            {
-                die ("$0: couldn't rename or copy $constemp to $consign "
-                     . "($!)\n");
-            }
-        }
-    }
-}
-
-# Derived file caching.
-package cache;
-
-# Find a file in the cache. Return non-null if the file is in the cache.
-sub in
-{
-    return undef unless $param::cache;
-    my ($file, $sig) = @_;
-
-    # Add the path to the signature, to make it unique.
-    $sig = 'sig'->collect($sig, $file->path) unless $param::mixtargets;
-    my ($dir) = substr($sig, 0, 1);
-    my ($cp) = File::Spec->catfile($param::cache, $dir, $sig);
-    return -f $cp && futil::install($cp, $file);
-}
-
-# Try to flush a file to the cache, if not already there.
-# If it doesn't make it out, due to an error, then that doesn't
-# really matter.
-sub out
-{
-    return unless $param::cache;
-    my ($file, $sig) = @_;
-
-    # Add the path to the signature, to make it unique.
-    $sig = 'sig'->collect($sig, $file->path) unless $param::mixtargets;
-    my ($dir) = substr($sig, 0, 1);
-    my ($sp) = $file->path;
-    my ($cp) = File::Spec->catfile($param::cache, $dir, $sig);
-    my ($cdir) = File::Spec->catfile($param::cache, $dir);
-    if (!-d $cdir)
-    {
-        mkdir($cdir, 0777)
-          || die ("$0: can't create cache directory $cdir ($!).\n");
-    }
-    elsif (-f $cp)
-    {
-
-        # Already cached: try to use that instead, to save space.
-        # This can happen if the -cs option is used on a previously
-        # uncached build, or if two builds occur simultaneously.
-        my ($lp) = ".$sig";
-        unlink($lp);
-        return if !eval { link($cp, $lp) };
-        rename($lp, $sp);
-
-        # Unix98 says, "If the old argument and the new argument both
-        # [refer] to the same existing file, the rename() function
-        # returns successfully and performs no other action."  So, if
-        # $lp and $sp are links (i.e., $cp and $sp are links), $lp is
-        # left, and we must unlink it ourselves.  If the rename failed
-        # for any reason, it is also good form to unlink the temporary
-        # $lp.  Otherwise $lp no longer exists and, barring some race,
-        # the unlink fails silently.
-        unlink($lp);
-        return;
-    }
-
-    return if eval { link($sp, $cp) };
-    return if !-f $sp;    # if nothing to cache.
-    if (futil::copy($sp, "$cp.new"))
-    {
-        rename("$cp.new", $cp);
-    }
-}
-
-# Generic signature handling package.
-# This handles the higher-layer distinction between content and build
-# signatures, relying on an underlying calculation package like
-# "sig::md5"" to provide the signature values themselves.
-package sig;
-
-use vars qw( @ISA );
-
-# Select the underlying package to be used for signature calculation.
-# We play a few namespace games here.  Specifically, we append
-# "sig::" to the beginning of the subclass we're passed.  Then,
-# if the package ends in "::debug", we actually subclass the
-# "sig::debug" package and as a wrapper around the underlying
-# (e.g.) "sig::md5" package that's doing the real calculation.
-sub select
-{
-    my ($package, $subclass) = @_;
-    my $p      = $package . "::" . $subclass;
-    my $sigpkg = $p;
-    if ($p =~ /(.*)::debug$/)
-    {
-        $sigpkg = $1;
-        $p      = 'sig::debug';
-    }
-    @ISA = ($p);
-    $p->init($sigpkg);
-};
-
-# Set or return the build signature of a file.
-# This is computed elsewhere and passed in to us.
-sub bsig
-{
-    my ($self, $file, $sig) = @_;
-    if (defined $sig)
-    {
-        $file->{'bsig'} = $sig;
-        $self->set($file);
-    }
-    elsif (!defined $file->{'bsig'})
-    {
-        $file->{'bsig'} = '';
-    }
-    $file->{'bsig'};
-}
-
-# Determine the content signature of a file.
-# This also sets the .consign entry unless the file is in a
-# repository; we don't write into repositories, only read from them.
-sub csig
-{
-    my ($self, $file) = @_;
-    if (!$file->{'csig'})
-    {
-        $file->{'csig'} = $self->srcsig($file->path);
-        $self->set($file) if !$file->is_on_rpath;
-    }
-    $_[1]->{'csig'};
-}
-
-# Determine the current signature of an already-existing or
-# non-existant file.  Unless a specific signature type (bsig
-# or csig) is requested, this consults the file's signature
-# array to decide whether to return content or build signature,
-# and whether to use a cached value from a .consign file.
-sub signature
-{
-    my ($self, $file, $sigtype) = @_;
-    $sigtype = $file->sigtype if !$sigtype;
-
-    #open(TTY, ">/dev/tty");
-    #print TTY $file->path, ": $sigtype\n";
-    #close(TTY);
-    my ($path) = $file->path;
-    my ($time) = (stat($path))[9];
-    if ($time)
-    {
-        if ($file->{$sigtype})
-        {
-            return $file->{$sigtype};
-        }
-        if ($file->is_on_rpath || $file->stored)
-        {
-            if ('sig'->fetch($file) && $file->{$sigtype})
-            {
-                if ($file->{'sigtime'} == $time
-                    || !$param::rep_sig_times_ok && $file->is_on_rpath)
-                {
-                    return $file->{$sigtype};
-                }
-            }
-            $file->{$sigtype} = undef;
-        }
-        if ($file->is_on_rpath || !File::Spec->file_name_is_absolute($path))
-        {
-            my $sig = '';
-            if    ($sigtype eq 'bsig') { $sig = $self->bsig($file); }
-            elsif ($sigtype eq 'csig') { $sig = $self->csig($file); }
-            return $sig;
-        }
-
-        # This file is not in a repository or under the local directory
-        # structure.  In the canonical case, it's a utility that will be
-        # executed by a command.  Historically, Cons has returned the
-        # name of the command concatenated with the modification time.
-        # Note that this is *not* the path ("cc" not "/bin/cc"), so it
-        # would lose in the unlikely event that a different copy of the
-        # utility was used that happened to have the same modification
-        # time (due to living in a different directory on the PATH, for
-        # example).  The obvious "fix" of using the path like so, however:
-        #	return $path . $time;
-        # is wrong.  In a multi-machine build environment, different
-        # systems may have the same utility in different locations (due
-        # to different NFS mount points, for example), which would
-        # cause a lot of unnecessary builds if we used the full path.
-        # A better solution to strengthen this signature would be to
-        # also concatenate the size of the file, but that would cause
-        # unnecessary rebuilds when coming from .consign files that used
-        # the old scheme.  All of which is to merely explain why we're
-        # leaving this as it has been, but documenting it here in case
-        # there's reason to change it in the future.
-        return $file->{entry} . $time;
-    }
-    return $file->{$sigtype} = '';
-}
-
-sub bsignature
-{
-    my ($self, $file) = @_;
-    my ($path) = $file->path;
-    my ($time) = (stat($path))[9];
-    if ($time)
-    {
-        if ($file->{'bsig'})
-        {
-            return $file->{'bsig'};
-        }
-        if ('sig'->fetch($file, 'bsig') && $file->{'bsig'})
-        {
-            if ($file->{'sigtime'} == $time
-                || !$param::rep_sig_times_ok && $file->is_on_rpath)
-            {
-                return $file->{'bsig'};
-            }
-        }
-        if ($file->is_on_rpath || !File::Spec->file_name_is_absolute($path))
-        {
-            return $self->bsig($file);
-        }
-        return $path . $time;
-    }
-    return $file->{'bsig'} = '';
-}
-
-# Invalidate a file's signature, also clearing its .consign entry.
-sub invalidate
-{
-    my ($self, $file) = @_;
-    delete $file->{'sigtime'};
-    delete $file->{'bsig'};
-    delete $file->{'csig'};
-    sig::hash::clear($file);
-}
-
-# Store the signature for a file.
-sub set
-{
-    my ($self, $file) = @_;
-    my $sig = (stat($file->path))[9];
-    $sig .= " " . ($file->{'bsig'} || '-');
-    $sig .= " " . $file->{'csig'} if $file->{'csig'};
-    sig::hash::out($file, $sig);
-}
-
-# Fetch the signature(s) for a file.
-# Returns whether there was a signature to fetch.
-sub fetch
-{
-    my ($self, $file, @kw) = @_;
-    @kw = ('bsig', 'csig') if !@kw;
-    my $sig = sig::hash::in($file) || '';
-    my ($sigtime, $bsig, $csig) = split (/ /, $sig);
-    $file->{'sigtime'} = $sigtime;
-    $file->{'bsig'}    = $bsig || '' if grep($_ eq 'bsig', @kw);
-    $file->{'csig'}    = $csig || '' if grep($_ eq 'csig', @kw);
-    $file->{'bsig'} = '' if $file->{'bsig'} eq '-';
-    return $sig ne '';
-}
-
-# MD5-based signature package.
-package sig::md5;
-
-use vars qw( $md5 );
-
-# Initialize MD5 signature calculation by finding an appropriate
-# module and creating the proper object.
-sub init
-{
-    my $self        = shift;
-    my @md5_modules = qw(Digest::MD5 MD5 Digest::Perl::MD5);
-
-    # We used to find the right module more simply, using $_ as the
-    # loop iterator and just doing:
-    #
-    #		eval "use $_";
-    #		$module = $_, $last if ! $@;
-    #
-    # in the loop.  Empirically, though, this doesn't pass back the
-    # right value in $module on some ActiveState versions.  (Maybe
-    # it's something to do with the eval in a for loop, I dunno.)
-    # Work around it by using $_ to pass the value out of the loop,
-    # which seems to work everywhere.
-    my $module;
-    for $module (@md5_modules)
-    {
-        eval "use $module";
-        $_ = $module, last if !$@;
-    }
-    $module = $_;
-    die "Cannot find any MD5 module from:  @md5_modules" if $@;
-
-    $md5 = new $module;
-}
-
-# Is the provided signature equal to the signature of the current
-# instantiation of the target (and does the target exist)?
-sub current
-{
-    my ($self, $file, $sig, $sigtype) = @_;
-    $self->bsignature($file) eq $sig;
-}
-
-# Return an aggregate signature for a list of signature values.
-sub collect
-{
-    my ($self, @sigs) = @_;
-
-    # The following sequence is faster than calling the hex interface.
-    $md5->reset();
-    $md5->add(join ('', $param::salt, @sigs));
-    unpack("H*", $md5->digest());
-}
-
-# Directly compute a file signature as the MD5 checksum of the
-# bytes in the file.
-sub srcsig
-{
-    my ($self, $path) = @_;
-    $md5->reset();
-    open(FILE, $path) || return '';
-    binmode(FILE);
-    $md5->addfile(\*FILE);
-    close(FILE);
-    unpack("H*", $md5->digest());
-}
-
-# Compute the signature of a command string.
-# For MD5, this is just the string itself, since MD5 will condense
-# the string contents into the ultimate signature.  Other signature
-# schemes may need to figure this out differently.
-sub cmdsig
-{
-    my ($self, $sig) = @_;
-    return $sig;
-}
-
-# Generic debug package for signature calculation.
-# Because of the way we're called by sig::select() and then use
-# the specified value to set up @ISA, this package is essentially a
-# factory that creates packages like sig::md5::debug, etc., on the fly.
-package sig::debug;
-
-use vars qw( @ISA $sigpkg $outfh );
-
-local *FH;
-
-sub init
-{
-    my $self = shift;
-    $sigpkg = shift;
-    @ISA    = ($sigpkg);
-    $sigpkg->init();
-    my $file = $ENV{CONS_SIG_DEBUG};
-    if ($file)
-    {
-        if (!open(FH, ">$file"))
-        {
-            die "Cannot open $file: $!";
-        }
-        $outfh = \*FH;
-    }
-    else
-    {
-        $outfh = \*STDOUT;
-    }
-}
-
-sub current
-{
-    my ($self, $file, $sig, $sigtype) = @_;
-    my $fsig = $self->bsignature($file);
-    my $sub  = "${sigpkg}::current";
-    my $sep  = "\n" . ' ' x (length($sub) + 1 - 3);
-    print $outfh "$sub(|$fsig|${sep}eq |$sig|)\n";
-    return $fsig eq $sig;
-}
-
-sub collect
-{
-    my ($self, @sigs) = @_;
-    my $sig = $sigpkg->collect(@sigs);
-    my $sub = "${sigpkg}::collect";
-    my $sep = ",\n" . ' ' x (length($sub) + 1);
-    my $buf = join ($sep, @sigs);
-    $buf = $param::salt . $sep . $buf if $param::salt;
-    print $outfh "$sub($buf)\n\t=> |$sig|\n";
-    return $sig;
-}
-
-sub srcsig
-{
-    my ($self, $path) = @_;
-    my $sig = $sigpkg->srcsig($path);
-    print $outfh "${sigpkg}::srcsig($path)\n\t=> |$sig|\n";
-    return $sig;
-}
-
-__END__;
-
-=head1 NAME
-
-Cons - A Software Construction System
-
-=head1 DESCRIPTION
-
-A guide and reference for version __VERSION____REVISION__
-
-Copyright (c) 1996-2001 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
-
-=head1 Introduction
-
-B<Cons> is a system for constructing, primarily, software, but is quite
-different from previous software construction systems. Cons was designed
-from the ground up to deal easily with the construction of software spread
-over multiple source directories. Cons makes it easy to create build scripts
-that are simple, understandable and maintainable. Cons ensures that complex
-software is easily and accurately reproducible.
-
-Cons uses a number of techniques to accomplish all of this. Construction
-scripts are just Perl scripts, making them both easy to comprehend and very
-flexible. Global scoping of variables is replaced with an import/export
-mechanism for sharing information between scripts, significantly improving
-the readability and maintainability of each script. B<Construction
-environments> are introduced: these are Perl objects that capture the
-information required for controlling the build process. Multiple
-environments are used when different semantics are required for generating
-products in the build tree. Cons implements automatic dependency analysis
-and uses this to globally sequence the entire build. Variant builds are
-easily produced from a single source tree. Intelligent build subsetting is
-possible, when working on localized changes. Overrides can be setup to
-easily override build instructions without modifying any scripts. MD5
-cryptographic B<signatures> are associated with derived files, and are used
-to accurately determine whether a given file needs to be rebuilt.
-
-While offering all of the above, and more, Cons remains simple and easy to
-use. This will, hopefully, become clear as you read the remainder of this
-document.
-
-
-=head1 Why Cons? Why not Make?
-
-Cons is a B<make> replacement. In the following paragraphs, we look at a few
-of the undesirable characteristics of make--and typical build environments
-based on make--that motivated the development of Cons.
-
-=head2 Build complexity
-
-Traditional make-based systems of any size tend to become quite complex. The
-original make utility and its derivatives have contributed to this tendency
-in a number of ways. Make is not good at dealing with systems that are
-spread over multiple directories. Various work-arounds are used to overcome
-this difficulty; the usual choice is for make to invoke itself recursively
-for each sub-directory of a build. This leads to complicated code, in which
-it is often unclear how a variable is set, or what effect the setting of a
-variable will have on the build as a whole. The make scripting language has
-gradually been extended to provide more possibilities, but these have
-largely served to clutter an already overextended language. Often, builds
-are done in multiple passes in order to provide appropriate products from
-one directory to another directory. This represents a further increase in
-build complexity.
-
-
-=head2 Build reproducibility
-
-The bane of all makes has always been the correct handling of
-dependencies. Most often, an attempt is made to do a reasonable job of
-dependencies within a single directory, but no serious attempt is made to do
-the job between directories. Even when dependencies are working correctly,
-make's reliance on a simple time stamp comparison to determine whether a
-file is out of date with respect to its dependents is not, in general,
-adequate for determining when a file should be rederived. If an external
-library, for example, is rebuilt and then ``snapped'' into place, the
-timestamps on its newly created files may well be earlier than the last
-local build, since it was built before it became visible.
-
-
-=head2 Variant builds
-
-Make provides only limited facilities for handling variant builds. With the
-proliferation of hardware platforms and the need for debuggable
-vs. optimized code, the ability to easily create these variants is
-essential. More importantly, if variants are created, it is important to
-either be able to separate the variants or to be able to reproduce the
-original or variant at will. With make it is very difficult to separate the
-builds into multiple build directories, separate from the source. And if
-this technique isn't used, it's also virtually impossible to guarantee at
-any given time which variant is present in the tree, without resorting to a
-complete rebuild.
-
-
-=head2 Repositories
-
-Make provides only limited support for building software from code that
-exists in a central repository directory structure.  The VPATH feature of
-GNU make (and some other make implementations) is intended to provide this,
-but doesn't work as expected: it changes the path of target file to the
-VPATH name too early in its analysis, and therefore searches for all
-dependencies in the VPATH directory.  To ensure correct development builds,
-it is important to be able to create a file in a local build directory and
-have any files in a code repository (a VPATH directory, in make terms) that
-depend on the local file get rebuilt properly.  This isn't possible with
-VPATH, without coding a lot of complex repository knowledge directly into
-the makefiles.
-
-
-=head1 Keeping it simple
-
-A few of the difficulties with make have been cited above. In this and
-subsequent sections, we shall introduce Cons and show how these issues are
-addressed.
-
-=head2 Perl scripts
-
-Cons is Perl-based. That is, Cons scripts--F<Conscript> and F<Construct>
-files, the equivalent to F<Makefile> or F<makefile>--are all written in
-Perl. This provides an immediate benefit: the language for writing scripts
-is a familiar one. Even if you don't happen to be a Perl programmer, it
-helps to know that Perl is basically just a simple declarative language,
-with a well-defined flow of control, and familiar semantics. It has
-variables that behave basically the way you would expect them to,
-subroutines, flow of control, and so on. There is no special syntax
-introduced for Cons. The use of Perl as a scripting language simplifies
-the task of expressing the appropriate solution to the often complex
-requirements of a build.
-
-
-=head2 Hello, World!
-
-To ground the following discussion, here's how you could build the B<Hello,
-World!> C application with Cons:
-
-
-
-  $env = new cons();
-  Program $env 'hello', 'hello.c';
-
-If you install this script in a directory, naming the script F<Construct>,
-and create the F<hello.c> source file in the same directory, then you can
-type C<cons hello> to build the application:
-
-
-
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-
-
-=head2 Construction environments
-
-A key simplification of Cons is the idea of a B<construction environment>. A
-construction environment is an B<object> characterized by a set of key/value
-pairs and a set of B<methods>. In order to tell Cons how to build something,
-you invoke the appropriate method via an appropriate construction
-environment. Consider the following example:
-
-
-
-  $env = new cons(
-	CC	=>	'gcc',
-	LIBS	=>	'libworld.a'
-  );
-
-  Program $env 'hello', 'hello.c';
-
-In this case, rather than using the default construction environment, as is,
-we have overridden the value of C<CC> so that the GNU C Compiler equivalent
-is used, instead. Since this version of B<Hello, World!> requires a library,
-F<libworld.a>, we have specified that any program linked in this environment
-should be linked with that library. If the library exists already, well and
-good, but if not, then we'll also have to include the statement:
-
-
-
-  Library $env 'libworld', 'world.c';
-
-Now if you type C<cons hello>, the library will be built before the program
-is linked, and, of course, C<gcc> will be used to compile both modules:
-
-
-
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-
-=head2 Automatic and complete dependency analysis
-
-With Cons, dependencies are handled automatically. Continuing the previous
-example, note that when we modify F<world.c>, F<world.o> is recompiled,
-F<libworld.a> recreated, and F<hello> relinked:
-
-
-
-  % vi world.c
-    [EDIT]
-  % cons hello
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-This is a relatively simple example: Cons ``knows'' F<world.o> depends upon
-F<world.c>, because the dependency is explicitly set up by the C<Library>
-method. It also knows that F<libworld.a> depends upon F<world.o> and that
-F<hello> depends upon F<libworld.a>, all for similar reasons.
-
-Now it turns out that F<hello.c> also includes the interface definition
-file, F<world.h>:
-
-
-
-  % emacs world.h
-    [EDIT]
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -o hello hello.o libworld.a
-
-How does Cons know that F<hello.c> includes F<world.h>, and that F<hello.o>
-must therefore be recompiled? For now, suffice it to say that when
-considering whether or not F<hello.o> is up-to-date, Cons invokes a scanner
-for its dependency, F<hello.c>. This scanner enumerates the files included
-by F<hello.c> to come up with a list of further dependencies, beyond those
-made explicit by the Cons script. This process is recursive: any files
-included by included files will also be scanned.
-
-Isn't this expensive? The answer is--it depends. If you do a full build of a
-large system, the scanning time is insignificant. If you do a rebuild of a
-large system, then Cons will spend a fair amount of time thinking about it
-before it decides that nothing has to be done (although not necessarily more
-time than make!). The good news is that Cons makes it very easy to
-intelligently subset your build, when you are working on localized changes.
-
-
-=head2 Automatic global build sequencing
-
-Because Cons does full and accurate dependency analysis, and does this
-globally, for the entire build, Cons is able to use this information to take
-full control of the B<sequencing> of the build. This sequencing is evident
-in the above examples, and is equivalent to what you would expect for make,
-given a full set of dependencies. With Cons, this extends trivially to
-larger, multi-directory builds. As a result, all of the complexity involved
-in making sure that a build is organized correctly--including multi-pass
-hierarchical builds--is eliminated. We'll discuss this further in the next
-sections.
-
-=head1 Building large trees--still just as simple
-
-
-=head2 A hierarchy of build scripts
-
-A larger build, in Cons, is organized by creating a hierarchy of B<build
-scripts>. At the top of the tree is a script called F<Construct>. The rest
-of the scripts, by convention, are each called F<Conscript>. These scripts
-are connected together, very simply, by the C<Build>, C<Export>, and
-C<Import> commands.
-
-
-=head2 The Build command
-
-The C<Build> command takes a list of F<Conscript> file names, and arranges
-for them to be included in the build. For example:
-
-  Build qw(
-	drivers/display/Conscript
-	drivers/mouse/Conscript
-	parser/Conscript
-	utilities/Conscript
-  );
-
-This is a simple two-level hierarchy of build scripts: all the subsidiary
-F<Conscript> files are mentioned in the top-level F<Construct> file. Notice
-that not all directories in the tree necessarily have build scripts
-associated with them.
-
-This could also be written as a multi-level script. For example, the
-F<Construct> file might contain this command:
-
-  Build qw(
-	parser/Conscript
-	drivers/Conscript
-	utilities/Conscript
-  );
-
-and the F<Conscript> file in the F<drivers> directory might contain this:
-
-  Build qw(
-	display/Conscript
-	mouse/Conscript
-  );
-
-Experience has shown that the former model is a little easier to understand,
-since the whole construction tree is laid out in front of you, at the
-top-level. Hybrid schemes are also possible. A separately maintained
-component that needs to be incorporated into a build tree, for example,
-might hook into the build tree in one place, but define its own construction
-hierarchy.
-
-By default, Cons does not change its working directory to the directory
-containing a subsidiary F<Conscript> file it is including.  This behavior
-can be enabled for a build by specifying, in the top-level F<Construct>
-file:
-
-  Conscript_chdir 1;
-
-When enabled, Cons will change to the subsidiary F<Conscript> file's
-containing directory while reading in that file, and then change back
-to the top-level directory once the file has been processed.
-
-It is expected that this behavior will become the default in some future
-version of Cons.  To prepare for this transition, builds that expect
-Cons to remain at the top of the build while it reads in a subsidiary
-F<Conscript> file should explicitly disable this feature as follows:
-
-  Conscript_chdir 0;
-
-
-=head2 Relative, top-relative, and absolute file names
-
-You may have noticed that the file names specified to the Build command are
-relative to the location of the script it is invoked from. This is generally
-true for other filename arguments to other commands, too, although we might
-as well mention here that if you begin a file name with a hash mark, ``#'',
-then that file is interpreted relative to the top-level directory (where the
-F<Construct> file resides). And, not surprisingly, if you begin it with ``/'',
-then it is considered to be an absolute pathname. This is true even on
-systems which use a back slash rather than a forward slash to name absolute
-paths.
-
-(There is another file prefix, ``!'', that is interpreted specially by
-Cons.  See discussion of the C<Link> command, below, for details.)
-
-
-=head2 Using modules in build scripts
-
-You may pull modules into each F<Conscript> file using the normal Perl
-C<use> or C<require> statements:
-
-  use English;
-  require My::Module;
-
-Each C<use> or C<require> only affects the one F<Conscript> file in which
-it appears.  To use a module in multiple F<Conscript> files, you must
-put a C<use> or C<require> statement in each one that needs the module.
-
-
-=head2 Scope of variables
-
-The top-level F<Construct> file and all F<Conscript> files begin life in
-a common, separate Perl package.  B<Cons> controls the symbol table for
-the package so that, the symbol table for each script is empty, except
-for the F<Construct> file, which gets some of the command line arguments.
-All of the variables that are set or used, therefore, are set by the
-script itself--not by some external script.
-
-Variables can be explicitly B<imported> by a script from its parent
-script. To import a variable, it must have been B<exported> by the parent
-and initialized (otherwise an error will occur).
-
-
-=head2 The Export command
-
-The C<Export> command is used as in the following example:
-
-  $env = new cons();
-  $INCLUDE = "#export/include";
-  $LIB = "#export/lib";
-  Export qw( env INCLUDE LIB );
-  Build qw( util/Conscript );
-
-The values of the simple variables mentioned in the C<Export> list will be
-squirreled away by any subsequent C<Build> commands. The C<Export> command
-will only export Perl B<scalar> variables, that is, variables whose name
-begins with C<$>. Other variables, objects, etc. can be exported by
-reference--but all scripts will refer to the same object, and this object
-should be considered to be read-only by the subsidiary scripts and by the
-original exporting script. It's acceptable, however, to assign a new value
-to the exported scalar variable--that won't change the underlying variable
-referenced. This sequence, for example, is OK:
-
-  $env = new cons();
-  Export qw( env INCLUDE LIB );
-  Build qw( util/Conscript );
-  $env = new cons(CFLAGS => '-O');
-  Build qw( other/Conscript );
-
-It doesn't matter whether the variable is set before or after the C<Export>
-command. The important thing is the value of the variable at the time the
-C<Build> command is executed. This is what gets squirreled away. Any
-subsequent C<Export> commands, by the way, invalidate the first: you must
-mention all the variables you wish to export on each C<Export> command.
-
-
-=head2 The Import command
-
-Variables exported by the C<Export> command can be imported into subsidiary
-scripts by the C<Import> command. The subsidiary script always imports
-variables directly from the superior script. Consider this example:
-
-  Import qw( env INCLUDE );
-
-This is only legal if the parent script exported both C<$env> and
-C<$INCLUDE>. It also must have given each of these variables values. It is
-OK for the subsidiary script to only import a subset of the exported
-variables (in this example, C<$LIB>, which was exported by the previous
-example, is not imported).
-
-All the imported variables are automatically re-exported, so the sequence:
-
-  Import qw ( env INCLUDE );
-  Build qw ( beneath-me/Conscript );
-
-will supply both C<$env> and C<$INCLUDE> to the subsidiary file. If only
-C<$env> is to be exported, then the following will suffice:
-
-  Import qw ( env INCLUDE );
-  Export qw ( env );
-  Build qw ( beneath-me/Conscript );
-
-Needless to say, the variables may be modified locally before invoking
-C<Build> on the subsidiary script.
-
-
-=head2 Build script evaluation order
-
-The only constraint on the ordering of build scripts is that superior
-scripts are evaluated before their inferior scripts. The top-level
-F<Construct> file, for instance, is evaluated first, followed by any
-inferior scripts. This is all you really need to know about the evaluation
-order, since order is generally irrelevant. Consider the following C<Build>
-command:
-
-  Build qw(
-	drivers/display/Conscript
-	drivers/mouse/Conscript
-	parser/Conscript
-	utilities/Conscript
-  );
-
-We've chosen to put the script names in alphabetical order, simply because
-that's the most convenient for maintenance purposes. Changing the order will
-make no difference to the build.
-
-
-=head1 A Model for sharing files
-
-
-=head2 Some simple conventions
-
-In any complex software system, a method for sharing build products needs to
-be established. We propose a simple set of conventions which are trivial to
-implement with Cons, but very effective.
-
-The basic rule is to require that all build products which need to be shared
-between directories are shared via an intermediate directory. We have
-typically called this F<export>, and, in a C environment, provided
-conventional sub-directories of this directory, such as F<include>, F<lib>,
-F<bin>, etc.
-
-These directories are defined by the top-level F<Construct> file. A simple
-F<Construct> file for a B<Hello, World!> application, organized using
-multiple directories, might look like this:
-
-  # Construct file for Hello, World!
-
-  # Where to put all our shared products.
-  $EXPORT = '#export';
-
-  Export qw( CONS INCLUDE LIB BIN );
-
-  # Standard directories for sharing products.
-  $INCLUDE = "$EXPORT/include";
-  $LIB = "$EXPORT/lib";
-  $BIN = "$EXPORT/bin";
-
-  # A standard construction environment.
-  $CONS = new cons (
-	CPPPATH => $INCLUDE,	# Include path for C Compilations
-	LIBPATH => $LIB,	# Library path for linking programs
-	LIBS => '-lworld',	# List of standard libraries
-  );
-
-  Build qw(
-	hello/Conscript
-	world/Conscript
-  );
-
-The F<world> directory's F<Conscript> file looks like this:
-
-  # Conscript file for directory world
-  Import qw( CONS INCLUDE LIB );
-
-  # Install the products of this directory
-  Install $CONS $LIB, 'libworld.a';
-  Install $CONS $INCLUDE, 'world.h';
-
-  # Internal products
-  Library $CONS 'libworld.a', 'world.c';
-
-and the F<hello> directory's F<Conscript> file looks like this:
-
-  # Conscript file for directory hello
-  Import qw( CONS BIN );
-
-  # Exported products
-  Install $CONS $BIN, 'hello';
-
-  # Internal products
-  Program $CONS 'hello', 'hello.c';
-
-To construct a B<Hello, World!> program with this directory structure, go to
-the top-level directory, and invoke C<cons> with the appropriate
-arguments. In the following example, we tell Cons to build the directory
-F<export>. To build a directory, Cons recursively builds all known products
-within that directory (only if they need rebuilding, of course). If any of
-those products depend upon other products in other directories, then those
-will be built, too.
-
-  % cons export
-  Install world/world.h as export/include/world.h
-  cc -Iexport/include -c hello/hello.c -o hello/hello.o
-  cc -Iexport/include -c world/world.c -o world/world.o
-  ar r world/libworld.a world/world.o
-  ar: creating world/libworld.a
-  ranlib world/libworld.a
-  Install world/libworld.a as export/lib/libworld.a
-  cc -o hello/hello hello/hello.o -Lexport/lib -lworld
-  Install hello/hello as export/bin/hello
-
-
-=head2 Clean, understandable, location-independent scripts
-
-You'll note that the two F<Conscript> files are very clean and
-to-the-point. They simply specify products of the directory and how to build
-those products. The build instructions are minimal: they specify which
-construction environment to use, the name of the product, and the name of
-the inputs. Note also that the scripts are location-independent: if you wish
-to reorganize your source tree, you are free to do so: you only have to
-change the F<Construct> file (in this example), to specify the new locations
-of the F<Conscript> files. The use of an export tree makes this goal easy.
-
-Note, too, how Cons takes care of little details for you. All the F<export>
-directories, for example, were made automatically. And the installed files
-were really hard-linked into the respective export directories, to save
-space and time. This attention to detail saves considerable work, and makes
-it even easier to produce simple, maintainable scripts.
-
-
-=head1 Separating source and build trees
-
-It's often desirable to keep any derived files from the build completely
-separate from the source files. This makes it much easier to keep track of
-just what is a source file, and also makes it simpler to handle B<variant>
-builds, especially if you want the variant builds to co-exist.
-
-
-=head2 Separating build and source directories using the Link command
-
-Cons provides a simple mechanism that handles all of these requirements. The
-C<Link> command is invoked as in this example:
-
-  Link 'build' => 'src';
-
-The specified directories are ``linked'' to the specified source
-directory. Let's suppose that you setup a source directory, F<src>, with the
-sub-directories F<world> and F<hello> below it, as in the previous
-example. You could then substitute for the original build lines the
-following:
-
-  Build qw(
-	build/world/Conscript
-	build/hello/Conscript
-  );
-
-Notice that you treat the F<Conscript> file as if it existed in the build
-directory. Now if you type the same command as before, you will get the
-following results:
-
-  % cons export
-  Install build/world/world.h as export/include/world.h
-  cc -Iexport/include -c build/hello/hello.c -o build/hello/hello.o
-  cc -Iexport/include -c build/world/world.c -o build/world/world.o
-  ar r build/world/libworld.a build/world/world.o
-  ar: creating build/world/libworld.a
-  ranlib build/world/libworld.a
-  Install build/world/libworld.a as export/lib/libworld.a
-  cc -o build/hello/hello build/hello/hello.o -Lexport/lib -lworld
-  Install build/hello/hello as export/bin/hello
-
-Again, Cons has taken care of the details for you. In particular, you will
-notice that all the builds are done using source files and object files from
-the build directory. For example, F<build/world/world.o> is compiled from
-F<build/world/world.c>, and F<export/include/world.h> is installed from
-F<build/world/world.h>. This is accomplished on most systems by the simple
-expedient of ``hard'' linking the required files from each source directory
-into the appropriate build directory.
-
-The links are maintained correctly by Cons, no matter what you do to the
-source directory. If you modify a source file, your editor may do this ``in
-place'' or it may rename it first and create a new file. In the latter case,
-any hard link will be lost. Cons will detect this condition the next time
-the source file is needed, and will relink it appropriately.
-
-You'll also notice, by the way, that B<no> changes were required to the
-underlying F<Conscript> files. And we can go further, as we shall see in the
-next section.
-
-=head2 Explicit references to the source directory
-
-When using the C<Link> command on some operating systems or with some
-tool chains, it's sometimes useful to have a command actually use
-the path name to the source directory, not the build directory.  For
-example, on systems that must copy, not "hard link," the F<src/> and
-F<build/> copies of C<Linked> files, using the F<src/> path of a file
-name might make an editor aware that a syntax error must be fixed in the
-source directory, not the build directory.
-
-You can tell Cons that you want to use the "source path" for a file by
-preceding the file name with a ``!'' (exclamation point).  For example,
-if we add a ``!'' to the beginning of a source file:
-
-  Program $env "foo", "!foo.c";	# Notice initial ! on foo.c
-
-Cons will compile the target as follows:
-
-  cc -c src/foo.c -o build/foo.o
-  cc -o build/foo build/foo.o
-
-Notice that Cons has compiled the program from the the F<src/foo.c>
-source file.  Without the initial ``!'', Cons would have compiled the
-program using the F<build/foo.c> path name.
-
-
-
-=head1 Variant builds
-
-
-=head2 Hello, World! for baNaNa and peAcH OS's
-
-Variant builds require just another simple extension. Let's take as an
-example a requirement to allow builds for both the baNaNa and peAcH
-operating systems. In this case, we are using a distributed file system,
-such as NFS to access the particular system, and only one or the other of
-the systems has to be compiled for any given invocation of C<cons>. Here's
-one way we could set up the F<Construct> file for our B<Hello, World!>
-application:
-
-  # Construct file for Hello, World!
-
-  die qq(OS must be specified) unless $OS = $ARG{OS};
-  die qq(OS must be "peach" or "banana")
-	if $OS ne "peach" && $OS ne "banana";
-
-  # Where to put all our shared products.
-  $EXPORT = "#export/$OS";
-
-  Export qw( CONS INCLUDE LIB BIN );
-
-  # Standard directories for sharing products.
-  $INCLUDE = "$EXPORT/include";
-  $LIB = "$EXPORT/lib";
-  $BIN = "$EXPORT/bin";
-
-  # A standard construction environment.
-  $CONS = new cons (
-	CPPPATH => $INCLUDE,	# Include path for C Compilations
-	LIBPATH => $LIB,	# Library path for linking programs
-	LIBS => '-lworld',	# List of standard libraries
-  );
-
-  # $BUILD is where we will derive everything.
-  $BUILD = "#build/$OS";
-
-  # Tell cons where the source files for $BUILD are.
-  Link $BUILD => 'src';
-
-  Build (
-	"$BUILD/hello/Conscript",
-	"$BUILD/world/Conscript",
-  );
-
-Now if we login to a peAcH system, we can build our B<Hello, World!>
-application for that platform:
-
-  % cons export OS=peach
-  Install build/peach/world/world.h as export/peach/include/world.h
-  cc -Iexport/peach/include -c build/peach/hello/hello.c -o build/peach/hello/hello.o
-  cc -Iexport/peach/include -c build/peach/world/world.c -o build/peach/world/world.o
-  ar r build/peach/world/libworld.a build/peach/world/world.o
-  ar: creating build/peach/world/libworld.a
-  ranlib build/peach/world/libworld.a
-  Install build/peach/world/libworld.a as export/peach/lib/libworld.a
-  cc -o build/peach/hello/hello build/peach/hello/hello.o -Lexport/peach/lib -lworld
-  Install build/peach/hello/hello as export/peach/bin/hello
-
-
-=head2 Variations on a theme
-
-Other variations of this model are possible. For example, you might decide
-that you want to separate out your include files into platform dependent and
-platform independent files. In this case, you'd have to define an
-alternative to C<$INCLUDE> for platform-dependent files. Most F<Conscript>
-files, generating purely platform-independent include files, would not have
-to change.
-
-You might also want to be able to compile your whole system with debugging
-or profiling, for example, enabled. You could do this with appropriate
-command line options, such as C<DEBUG=on>. This would then be translated
-into the appropriate platform-specific requirements to enable debugging
-(this might include turning off optimization, for example). You could
-optionally vary the name space for these different types of systems, but, as
-we'll see in the next section, it's not B<essential> to do this, since Cons
-is pretty smart about rebuilding things when you change options.
-
-
-=head1 Signatures
-
-Cons uses file B<signatures> to decide if a derived file is out-of-date
-and needs rebuilding.  In essence, if the contents of a file change,
-or the manner in which the file is built changes, the file's signature
-changes as well.  This allows Cons to decide with certainty when a file
-needs rebuilding, because Cons can detect, quickly and reliably, whether
-any of its dependency files have been changed.
-
-
-=head2 MD5 content and build signatures
-
-Cons uses the B<MD5> (B<Message Digest 5>) algorithm to compute file
-signatures.  The MD5 algorithm computes a strong cryptographic checksum
-for any given input string.  Cons can, based on configuration, use two
-different MD5 signatures for a given file:
-
-The B<content signature> of a file is an MD5 checksum of the file's
-contents.  Consequently, when the contents of a file change, its content
-signature changes as well.
-
-The B<build signature> of a file is a combined MD5 checksum of:
-
-=over 4
-
-the signatures of all the input files used to build the file
-
-the signatures of all dependency files discovered by source scanners
-(for example, C<.h> files)
-
-the signatures of all dependency files specified explicitly via the
-C<Depends> method)
-
-the command-line string used to build the file
-
-=back
-
-The build signature is, in effect, a digest of all the dependency
-information for the specified file.  Consequently, a file's build
-signature changes whenever any part of its dependency information
-changes: a new file is added, the contents of a file on which it depends
-change, there's a change to the command line used to build the file (or
-any of its dependency files), etc.
-
-For example, in the previous section, the build signature of the
-F<world.o> file will include:
-
-=over 4
-
-the signature of the F<world.c> file
-
-the signatures of any header files that Cons detects are included,
-directly or indirectly, by F<world.c>
-
-the text of the actual command line was used to generate F<world.o>
-
-=back
-
-Similarly, the build signature of the F<libworld.a> file will include
-all the signatures of its constituents (and hence, transitively, the
-signatures of B<their> constituents), as well as the command line that
-created the file.
-
-Note that there is no need for a derived file to depend upon any
-particular F<Construct> or F<Conscript> file.  If changes to these files
-affect a file, then this will be automatically reflected in its build
-signature, since relevant parts of the command line are included in the
-signature. Unrelated F<Construct> or F<Conscript> changes will have no
-effect.
-
-
-=head2 Storing signatures in .consign files
-
-Before Cons exits, it stores the calculated signatures for all of the
-files it built or examined in F<.consign> files, one per directory.
-Cons uses this stored information on later invocations to decide if
-derived files need to be rebuilt.
-
-After the previous example was compiled, the F<.consign> file in the
-F<build/peach/world> directory looked like this:
-
-  world.h:985533370 - d181712f2fdc07c1f05d97b16bfad904
-  world.o:985533372 2a0f71e0766927c0532977b0d2158981
-  world.c:985533370 - c712f77189307907f4189b5a7ab62ff3
-  libworld.a:985533374 69e568fc5241d7d25be86d581e1fb6aa
-
-After the file name and colon, the first number is a timestamp of the
-file's modification time (on UNIX systems, this is typically the number
-of seconds since January 1st, 1970).  The second value is the build
-signature of the file (or ``-'' in the case of files with no build
-signature--that is, source files).  The third value, if any, is the
-content signature of the file.
-
-
-=head2 Using build signatures to decide when to rebuild files
-
-When Cons is deciding whether to build or rebuild a derived file, it
-first computes the file's current build signature.  If the file doesn't
-exist, it must obviously be built.
-
-If, however, the file already exists, Cons next compares the
-modification timestamp of the file against the timestamp value in
-the F<.consign> file.  If the timestamps match, Cons compares the
-newly-computed build signature against the build signature in the
-F<.consign> file.  If the timestamps do not match or the build
-signatures do not match, the derived file is rebuilt.
-
-After the file is built or rebuilt, Cons arranges to store the
-newly-computed build signature in the F<.consign> file when it exits.
-
-
-=head2 Signature example
-
-The use of these signatures is an extremely simple, efficient, and
-effective method of improving--dramatically--the reproducibility of a
-system.
-
-We'll demonstrate this with a simple example:
-
-  # Simple "Hello, World!" Construct file
-  $CFLAGS = '-g' if $ARG{DEBUG} eq 'on';
-  $CONS = new cons(CFLAGS => $CFLAGS);
-  Program $CONS 'hello', 'hello.c';
-
-Notice how Cons recompiles at the appropriate times:
-
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons hello
-  cons: "hello" is up-to-date.
-  % cons DEBUG=on hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons DEBUG=on hello
-  cons: "hello" is up-to-date.
-  % cons hello
-  cc -c hello.c -o hello.o
-  cc -o hello hello.o
-
-
-=head2 Source-file signature configuration
-
-Cons provides a C<SourceSignature> method that allows you to configure
-how the signature should be calculated for any source file when its
-signature is being used to decide if a dependent file is up-to-date.
-The arguments to the C<SourceSignature> method consist of one or more
-pairs of strings:
-
-  SourceSignature 'auto/*.c' => 'content',
-		  '*' => 'stored-content';
-
-The first string in each pair is a pattern to match against derived file
-path names. The pattern is a file-globbing pattern, not a Perl regular
-expression; the pattern <*.l> will match all Lex source files.  The C<*>
-wildcard will match across directory separators; the pattern C<foo/*.c>
-would match all C source files in any subdirectory underneath the C<foo>
-subdirectory.
-
-The second string in each pair contains one of the following keywords to
-specify how signatures should be calculated for source files that match
-the pattern.  The available keywords are:
-
-=over 4
-
-=item content
-
-Use the content signature of the source file when calculating signatures
-of files that depend on it.  This guarantees correct calculation of the
-file's signature for all builds, by telling Cons to read the contents of
-a source file to calculate its content signature each time it is run.
-
-=item stored-content
-
-Use the source file's content signature as stored in the F<.consign>
-file, provided the file's timestamp matches the cached timestamp value
-in the F<.consign> file.  This optimizes performance, with the slight
-risk of an incorrect build if a source file's contents have been changed
-so quickly after its previous update that the timestamp still matches
-the stored timestamp in the F<.consign> file even though the contents
-have changed.
-
-=back
-
-The Cons default behavior of always calculating a source file's
-signature from the file's contents is equivalent to specifying:
-
-  SourceSignature '*' => 'content';
-
-The C<*> will match all source files.  The C<content> keyword
-specifies that Cons will read the contents of a source file to calculate
-its signature each time it is run.
-
-A useful global performance optimization is:
-
-  SourceSignature '*' => 'stored-content';
-
-This specifies that Cons will use pre-computed content signatures
-from F<.consign> files, when available, rather than re-calculating a
-signature from the the source file's contents each time Cons is run.  In
-practice, this is safe for most build situations, and only a problem
-when source files are changed automatically (by scripts, for example).
-The Cons default, however, errs on the side of guaranteeing a correct
-build in all situations.
-
-Cons tries to match source file path names against the patterns in the
-order they are specified in the C<SourceSignature> arguments:
-
-  SourceSignature '/usr/repository/objects/*' => 'stored-content',
-		  '/usr/repository/*' => 'content',
-		  '*.y' => 'content',
-		  '*' => 'stored-content';
-
-In this example, all source files under the F</usr/repository/objects>
-directory will use F<.consign> file content signatures, source files
-anywhere else underneath F</usr/repository> will not use F<.consign>
-signature values, all Yacc source files (C<*.y>) anywhere else will not
-use F<.consign> signature values, and any other source file will use
-F<.consign> signature values.
-
-
-=head2 Derived-file signature configuration
-
-Cons provides a C<SIGNATURE> construction variable that allows you to
-configure how signatures are calculated for any derived file when its
-signature is being used to decide if a dependent file is up-to-date.
-The value of the C<SIGNATURE> construction variable is a Perl array
-reference that holds one or more pairs of strings, like the arguments to
-the C<SourceSignature> method.
-
-The first string in each pair is a pattern to match against derived file
-path names. The pattern is a file-globbing pattern, not a Perl regular
-expression; the pattern `*.obj' will match all (Win32) object files.
-The C<*> wildcard will match across directory separators; the pattern
-`foo/*.a' would match all (UNIX) library archives in any subdirectory
-underneath the foo subdirectory.
-
-The second string in each pair contains one of the following keywords
-to specify how signatures should be calculated for derived files that
-match the pattern.  The available keywords are the same as for the
-C<SourceSignature> method, with an additional keyword:
-
-=over 4
-
-=item build
-
-Use the build signature of the derived file when calculating signatures
-of files that depend on it.  This guarantees correct builds by forcing
-Cons to rebuild any and all files that depend on the derived file.
-
-=item content
-
-Use the content signature of the derived file when calculating signatures
-of files that depend on it.  This guarantees correct calculation of the
-file's signature for all builds, by telling Cons to read the contents of
-a derived file to calculate its content signature each time it is run.
-
-=item stored-content
-
-Use the derived file's content signature as stored in the F<.consign>
-file, provided the file's timestamp matches the cached timestamp value
-in the F<.consign> file.  This optimizes performance, with the slight
-risk of an incorrect build if a derived file's contents have been
-changed so quickly after a Cons build that the file's timestamp still
-matches the stored timestamp in the F<.consign> file.
-
-=back
-
-The Cons default behavior (as previously described) for using
-derived-file signatures is equivalent to:
-
-  $env = new cons(SIGNATURE => ['*' => 'build']);
-
-The C<*> will match all derived files.  The C<build> keyword specifies
-that all derived files' build signatures will be used when calculating
-whether a dependent file is up-to-date.
-
-A useful alternative default C<SIGNATURE> configuration for many sites:
-
-  $env = new cons(SIGNATURE => ['*' => 'content']);
-
-In this configuration, derived files have their signatures calculated
-from the file contents.  This adds slightly to Cons' workload, but has
-the useful effect of "stopping" further rebuilds if a derived file is
-rebuilt to exactly the same file contents as before, which usually
-outweighs the additional computation Cons must perform.
-
-For example, changing a comment in a C file and recompiling should
-generate the exact same object file (assuming the compiler doesn't
-insert a timestamp in the object file's header).  In that case,
-specifying C<content> or C<stored-content> for the signature calculation
-will cause Cons to recognize that the object file did not actually
-change as a result of being rebuilt, and libraries or programs that
-include the object file will not be rebuilt.  When C<build> is
-specified, however, Cons will only "know" that the object file was
-rebuilt, and proceed to rebuild any additional files that include the
-object file.
-
-Note that Cons tries to match derived file path names against the
-patterns in the order they are specified in the C<SIGNATURE> array
-reference:
-
-  $env = new cons(SIGNATURE => ['foo/*.o' => 'build',
-				'*.o' => 'content',
-				'*.a' => 'stored-content',
-				'*' => 'content']);
-
-In this example, all object files underneath the F<foo> subdirectory
-will use build signatures, all other object files (including object
-files underneath other subdirectories!) will use F<.consign> file
-content signatures, libraries will use F<.consign> file build
-signatures, and all other derived files will use content signatures.
-
-
-=head2 Debugging signature calculation
-
-Cons provides a C<-S> option that can be used to specify what internal
-Perl package Cons should use to calculate signatures.  The default Cons
-behavior is equivalent to specifying C<-S md5> on the command line.
-
-The only other package (currently) available is an C<md5::debug>
-package that prints out detailed information about the MD5 signature
-calculations performed by Cons:
-
-  % cons -S md5::debug hello
-  sig::md5::srcsig(hello.c)
-          => |52d891204c62fe93ecb95281e1571938|
-  sig::md5::collect(52d891204c62fe93ecb95281e1571938)
-          => |fb0660af4002c40461a2f01fbb5ffd03|
-  sig::md5::collect(52d891204c62fe93ecb95281e1571938,
-                    fb0660af4002c40461a2f01fbb5ffd03,
-                    cc   -c %< -o %>)
-          => |f7128da6c3fe3c377dc22ade70647b39|
-  sig::md5::current(||
-                 eq |f7128da6c3fe3c377dc22ade70647b39|)
-  cc -c hello.c -o hello.o
-  sig::md5::collect()
-          => |d41d8cd98f00b204e9800998ecf8427e|
-  sig::md5::collect(f7128da6c3fe3c377dc22ade70647b39,
-                    d41d8cd98f00b204e9800998ecf8427e,
-                    cc  -o %> %<  )
-          => |a0bdce7fd09e0350e7efbbdb043a00b0|
-  sig::md5::current(||
-                 eq |a0bdce7fd09e0350e7efbbdb043a00b0|)
-  cc -o hello, hello.o
-
-
-=head1 Code Repositories
-
-Many software development organizations will have one or more central
-repository directory trees containing the current source code for one or
-more projects, as well as the derived object files, libraries, and
-executables.  In order to reduce unnecessary recompilation, it is useful to
-use files from the repository to build development software--assuming, of
-course, that no newer dependency file exists in the local build tree.
-
-
-=head2 Repository
-
-Cons provides a mechanism to specify a list of code repositories that will
-be searched, in-order, for source files and derived files not found in the
-local build directory tree.
-
-The following lines in a F<Construct> file will instruct Cons to look first
-under the F</usr/experiment/repository> directory and then under the
-F</usr/product/repository> directory:
-
-  Repository qw (
-	/usr/experiment/repository
-	/usr/product/repository
-  );
-
-The repository directories specified may contain source files, derived files
-(objects, libraries and executables), or both.  If there is no local file
-(source or derived) under the directory in which Cons is executed, then the
-first copy of a same-named file found under a repository directory will be
-used to build any local derived files.
-
-Cons maintains one global list of repositories directories.  Cons will
-eliminate the current directory, and any non-existent directories, from the
-list.
-
-
-=head2 Finding the Construct file in a Repository
-
-Cons will also search for F<Construct> and F<Conscript> files in the
-repository tree or trees.  This leads to a chicken-and-egg situation,
-though: how do you look in a repository tree for a F<Construct> file if the
-F<Construct> file tells you where the repository is?  To get around this,
-repositories may be specified via C<-R> options on the command line:
-
-  % cons -R /usr/experiment/repository -R /usr/product/repository .
-
-Any repository directories specified in the F<Construct> or F<Conscript>
-files will be appended to the repository directories specified by
-command-line C<-R> options.
-
-=head2 Repository source files
-
-If the source code (include the F<Conscript> file) for the library version
-of the I<Hello, World!> C application is in a repository (with no derived
-files), Cons will use the repository source files to create the local object
-files and executable file:
-
-  % cons -R /usr/src_only/repository hello
-  gcc -c /usr/src_only/repository/hello.c -o hello.o
-  gcc -c /usr/src_only/repository/world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-Creating a local source file will cause Cons to rebuild the appropriate
-derived file or files:
-
-  % pico world.c
-    [EDIT]
-  % cons -R /usr/src_only/repository hello
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-And removing the local source file will cause Cons to revert back to
-building the derived files from the repository source:
-
-  % rm world.c
-  % cons -R /usr/src_only/repository hello
-  gcc -c /usr/src_only/repository/world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-
-=head2 Repository derived files
-
-If a repository tree contains derived files (usually object files,
-libraries, or executables), Cons will perform its normal signature
-calculation to decide whether the repository file is up-to-date or a derived
-file must be built locally.  This means that, in order to ensure correct
-signature calculation, a repository tree must also contain the F<.consign>
-files that were created by Cons when generating the derived files.
-
-This would usually be accomplished by building the software in the
-repository (or, alternatively, in a build directory, and then copying the
-result to the repository):
-
-  % cd /usr/all/repository
-  % cons hello
-  gcc -c hello.c -o hello.o
-  gcc -c world.c -o world.o
-  ar r libworld.a world.o
-  ar: creating libworld.a
-  ranlib libworld.a
-  gcc -o hello hello.o libworld.a
-
-(This is safe even if the F<Construct> file lists the F</usr/all/repository>
-directory in a C<Repository> command because Cons will remove the current
-directory from the repository list.)
-
-Now if we want to build a copy of the application with our own F<hello.c>
-file, we only need to create the one necessary source file, and use the
-C<-R> option to have Cons use other files from the repository:
-
-  % mkdir $HOME/build1
-  % cd $HOME/build1
-  % ed hello.c
-    [EDIT]
-  % cons -R /usr/all/repository hello
-  gcc -c hello.c -o hello.o
-  gcc -o hello hello.o /usr/all/repository/libworld.a
-
-Notice that Cons has not bothered to recreate a local F<libworld.a> library
-(or recompile the F<world.o> module), but instead uses the already-compiled
-version from the repository.
-
-Because the MD5 signatures that Cons puts in the F<.consign> file contain
-timestamps for the derived files, the signature timestamps must match the
-file timestamps for a signature to be considered valid.
-
-Some software systems may alter the timestamps on repository files (by
-copying them, e.g.), in which case Cons will, by default, assume the
-repository signatures are invalid and rebuild files unnecessarily.  This
-behavior may be altered by specifying:
-
-  Repository_Sig_Times_OK 0;
-
-This tells Cons to ignore timestamps when deciding whether a signature is
-valid.  (Note that avoiding this sanity check means there must be proper
-control over the repository tree to ensure that the derived files cannot be
-modified without updating the F<.consign> signature.)
-
-
-=head2 Local copies of files
-
-If the repository tree contains the complete results of a build, and we try
-to build from the repository without any files in our local tree, something
-moderately surprising happens:
-
-  % mkdir $HOME/build2
-  % cd $HOME/build2
-  % cons -R /usr/all/repository hello
-  cons: "hello" is up-to-date.
-
-Why does Cons say that the F<hello> program is up-to-date when there is no
-F<hello> program in the local build directory?  Because the repository (not
-the local directory) contains the up-to-date F<hello> program, and Cons
-correctly determines that nothing needs to be done to rebuild this
-up-to-date copy of the file.
-
-There are, however, many times in which it is appropriate to ensure that a
-local copy of a file always exists.  A packaging or testing script, for
-example, may assume that certain generated files exist locally.  Instead of
-making these subsidiary scripts aware of the repository directory, the
-C<Local> command may be added to a F<Construct> or F<Conscript> file to
-specify that a certain file or files must appear in the local build
-directory:
-
-  Local qw(
-	hello
-  );
-
-Then, if we re-run the same command, Cons will make a local copy of the
-program from the repository copy (telling you that it is doing so):
-
-  % cons -R /usr/all/repository hello
-  Local copy of hello from /usr/all/repository/hello
-  cons: "hello" is up-to-date.
-
-Notice that, because the act of making the local copy is not considered a
-"build" of the F<hello> file, Cons still reports that it is up-to-date.
-
-Creating local copies is most useful for files that are being installed into
-an intermediate directory (for sharing with other directories) via the
-C<Install> command.  Accompanying the C<Install> command for a file with a
-companion C<Local> command is so common that Cons provides a
-C<Install_Local> command as a convenient way to do both:
-
-  Install_Local $env, '#export', 'hello';
-
-is exactly equivalent to:
-
-  Install $env '#export', 'hello';
-  Local '#export/hello';
-
-Both the C<Local> and C<Install_Local> commands update the local F<.consign>
-file with the appropriate file signatures, so that future builds are
-performed correctly.
-
-
-=head2 Repository dependency analysis
-
-Due to its built-in scanning, Cons will search the specified repository
-trees for included F<.h> files.  Unless the compiler also knows about the
-repository trees, though, it will be unable to find F<.h> files that only
-exist in a repository.  If, for example, the F<hello.c> file includes the
-F<hello.h> file in its current directory:
-
-  % cons -R /usr/all/repository hello
-  gcc -c /usr/all/repository/hello.c -o hello.o
-  /usr/all/repository/hello.c:1: hello.h: No such file or directory
-
-Solving this problem forces some requirements onto the way construction
-environments are defined and onto the way the C C<#include> preprocessor
-directive is used to include files.
-
-In order to inform the compiler about the repository trees, Cons will add
-appropriate C<-I> flags to the compilation commands.  This means that the
-C<CPPPATH> variable in the construction environment must explicitly specify
-all subdirectories which are to be searched for included files, including the
-current directory.  Consequently, we can fix the above example by changing
-the environment creation in the F<Construct> file as follows:
-
-  $env = new cons(
-	CC	=> 'gcc',
-	CPPPATH	=> '.',
-	LIBS	=> 'libworld.a',
-  );
-
-Due to the definition of the C<CPPPATH> variable, this yields, when we
-re-execute the command:
-
-  % cons -R /usr/all/repository hello
-  gcc -c -I. -I/usr/all/repository /usr/all/repository/hello.c -o hello.o
-  gcc -o hello hello.o /usr/all/repository/libworld.a
-
-The order of the C<-I> flags replicates, for the C preprocessor, the same
-repository-directory search path that Cons uses for its own dependency
-analysis.  If there are multiple repositories and multiple C<CPPPATH>
-directories, Cons will append the repository directories to the beginning of
-each C<CPPPATH> directory, rapidly multiplying the number of C<-I> flags.
-As an extreme example, a F<Construct> file containing:
-
-  Repository qw(
-	/u1
-	/u2
-  );
-
-  $env = new cons(
-	CPPPATH	=> 'a:b:c',
-  );
-
-Would yield a compilation command of:
-
-  cc -Ia -I/u1/a -I/u2/a -Ib -I/u1/b -I/u2/b -Ic -I/u1/c -I/u2/c -c hello.c -o hello.o
-
-In order to shorten the command lines as much as possible, Cons will
-remove C<-I> flags for any directories, locally or in the repositories,
-which do not actually exist.  (Note that the C<-I> flags are not included
-in the MD5 signature calculation for the target file, so the target will
-not be recompiled if the compilation command changes due to a directory
-coming into existence.)
-
-Because Cons relies on the compiler's C<-I> flags to communicate the
-order in which repository directories must be searched, Cons' handling
-of repository directories is fundamentally incompatible with using
-double-quotes on the C<#include> directives in any C source code that
-you plan to modify:
-
-  #include "file.h"	/* DON'T USE DOUBLE-QUOTES LIKE THIS */
-
-This is because most C preprocessors, when faced with such a directive, will
-always first search the directory containing the source file.  This
-undermines the elaborate C<-I> options that Cons constructs to make the
-preprocessor conform to its preferred search path.
-
-Consequently, when using repository trees in Cons, B<always> use
-angle-brackets for included files in any C source (.c or .h) files that
-you plan to modify locally:
-
-  #include <file.h>	/* USE ANGLE-BRACKETS INSTEAD */
-
-Code that will not change can still safely use double quotes on #include
-lines.
-
-
-=head2 Repository_List
-
-Cons provides a C<Repository_List> command to return a list of all
-repository directories in their current search order.  This can be used for
-debugging, or to do more complex Perl stuff:
-
-  @list = Repository_List;
-  print join(' ', @list), "\n";
-
-
-=head2 Repository interaction with other Cons features
-
-Cons' handling of repository trees interacts correctly with other Cons
-features--which is to say, it generally does what you would expect.
-
-Most notably, repository trees interact correctly, and rather powerfully,
-with the 'Link' command.  A repository tree may contain one or more
-subdirectories for version builds established via C<Link> to a source
-subdirectory.  Cons will search for derived files in the appropriate build
-subdirectories under the repository tree.
-
-
-=head1 Default targets
-
-Until now, we've demonstrated invoking Cons with an explicit target
-to build:
-
-  % cons hello
-
-Normally, Cons does not build anything unless a target is specified,
-but specifying '.' (the current directory) will build everything:
-
-  % cons		# does not build anything
-
-  % cons .		# builds everything under the top-level directory
-
-Adding the C<Default> method to any F<Construct> or F<Conscript> file will add
-the specified targets to a list of default targets.  Cons will build
-these defaults if there are no targets specified on the command line.
-So adding the following line to the top-level F<Construct> file will mimic
-Make's typical behavior of building everything by default:
-
-  Default '.';
-
-The following would add the F<hello> and F<goodbye> commands (in the
-same directory as the F<Construct> or F<Conscript> file) to the default list:
-
-  Default qw(
-	hello
-	goodbye
-  );
-
-The C<Default> method may be used more than once to add targets to the
-default list.
-
-=head1 Selective builds
-
-Cons provides two methods for reducing the size of given build. The first is
-by specifying targets on the command line, and the second is a method for
-pruning the build tree. We'll consider target specification first.
-
-
-=head2 Selective targeting
-
-Like make, Cons allows the specification of ``targets'' on the command
-line. Cons targets may be either files or directories. When a directory is
-specified, this is simply a short-hand notation for every derivable
-product--that Cons knows about--in the specified directory and below. For
-example:
-
-  % cons build/hello/hello.o
-
-means build F<hello.o> and everything that F<hello.o> might need. This is
-from a previous version of the B<Hello, World!> program in which F<hello.o>
-depended upon F<export/include/world.h>. If that file is not up-to-date
-(because someone modified F<src/world/world.h)>, then it will be rebuilt,
-even though it is in a directory remote from F<build/hello>.
-
-In this example:
-
-  % cons build
-
-Everything in the F<build> directory is built, if necessary. Again, this may
-cause more files to be built. In particular, both F<export/include/world.h>
-and F<export/lib/libworld.a> are required by the F<build/hello> directory,
-and so they will be built if they are out-of-date.
-
-If we do, instead:
-
-  % cons export
-
-then only the files that should be installed in the export directory will be
-rebuilt, if necessary, and then installed there. Note that C<cons build>
-might build files that C<cons export> doesn't build, and vice-versa.
-
-
-=head2 No ``special'' targets
-
-With Cons, make-style ``special'' targets are not required. The simplest
-analog with Cons is to use special F<export> directories, instead. Let's
-suppose, for example, that you have a whole series of unit tests that are
-associated with your code. The tests live in the source directory near the
-code. Normally, however, you don't want to build these tests. One solution
-is to provide all the build instructions for creating the tests, and then to
-install the tests into a separate part of the tree. If we install the tests
-in a top-level directory called F<tests>, then:
-
-  % cons tests
-
-will build all the tests.
-
-  % cons export
-
-will build the production version of the system (but not the tests), and:
-
-  % cons build
-
-should probably be avoided (since it will compile tests unnecessarily).
-
-If you want to build just a single test, then you could explicitly name the
-test (in either the F<tests> directory or the F<build> directory). You could
-also aggregate the tests into a convenient hierarchy within the tests
-directory. This hierarchy need not necessarily match the source hierarchy,
-in much the same manner that the include hierarchy probably doesn't match
-the source hierarchy (the include hierarchy is unlikely to be more than two
-levels deep, for C programs).
-
-If you want to build absolutely everything in the tree (subject to whatever
-options you select), you can use:
-
-  % cons .
-
-This is not particularly efficient, since it will redundantly walk all the
-trees, including the source tree. The source tree, of course, may have
-buildable objects in it--nothing stops you from doing this, even if you
-normally build in a separate build tree.
-
-
-=head1 Build Pruning
-
-In conjunction with target selection, B<build pruning> can be used to reduce
-the scope of the build. In the previous peAcH and baNaNa example, we have
-already seen how script-driven build pruning can be used to make only half
-of the potential build available for any given invocation of C<cons>. Cons
-also provides, as a convenience, a command line convention that allows you
-to specify which F<Conscript> files actually get ``built''--that is,
-incorporated into the build tree. For example:
-
-  % cons build +world
-
-The C<+> argument introduces a Perl regular expression. This must, of
-course, be quoted at the shell level if there are any shell meta-characters
-within the expression. The expression is matched against each F<Conscript>
-file which has been mentioned in a C<Build> statement, and only those
-scripts with matching names are actually incorporated into the build
-tree. Multiple such arguments are allowed, in which case a match against any
-of them is sufficient to cause a script to be included.
-
-In the example, above, the F<hello> program will not be built, since Cons
-will have no knowledge of the script F<hello/Conscript>. The F<libworld.a>
-archive will be built, however, if need be.
-
-There are a couple of uses for build pruning via the command line. Perhaps
-the most useful is the ability to make local changes, and then, with
-sufficient knowledge of the consequences of those changes, restrict the size
-of the build tree in order to speed up the rebuild time. A second use for
-build pruning is to actively prevent the recompilation of certain files that
-you know will recompile due to, for example, a modified header file. You may
-know that either the changes to the header file are immaterial, or that the
-changes may be safely ignored for most of the tree, for testing
-purposes.With Cons, the view is that it is pragmatic to admit this type of
-behavior, with the understanding that on the next full build everything that
-needs to be rebuilt will be. There is no equivalent to a ``make touch''
-command, to mark files as permanently up-to-date. So any risk that is
-incurred by build pruning is mitigated. For release quality work, obviously,
-we recommend that you do not use build pruning (it's perfectly OK to use
-during integration, however, for checking compilation, etc. Just be sure to
-do an unconstrained build before committing the integration).
-
-
-=head1 Temporary overrides
-
-Cons provides a very simple mechanism for overriding aspects of a build. The
-essence is that you write an override file containing one or more
-C<Override> commands, and you specify this on the command line, when you run
-C<cons>:
-
-  % cons -o over export
-
-will build the F<export> directory, with all derived files subject to the
-overrides present in the F<over> file. If you leave out the C<-o> option,
-then everything necessary to remove all overrides will be rebuilt.
-
-
-=head2 Overriding environment variables
-
-The override file can contain two types of overrides. The first is incoming
-environment variables. These are normally accessible by the F<Construct>
-file from the C<%ENV> hash variable. These can trivially be overridden in
-the override file by setting the appropriate elements of C<%ENV> (these
-could also be overridden in the user's environment, of course).
-
-
-=head2 The Override command
-
-The second type of override is accomplished with the C<Override> command,
-which looks like this:
-
-  Override <regexp>, <var1> => <value1>, <var2> => <value2>, ...;
-
-The regular expression I<regexp> is matched against every derived file that
-is a candidate for the build. If the derived file matches, then the
-variable/value pairs are used to override the values in the construction
-environment associated with the derived file.
-
-Let's suppose that we have a construction environment like this:
-
-  $CONS = new cons(
-	COPT => '',
-	CDBG => '-g',
-	CFLAGS => '%COPT %CDBG',
-  );
-
-Then if we have an override file F<over> containing this command:
-
-  Override '\.o$', COPT => '-O', CDBG => '';
-
-then any C<cons> invocation with C<-o over> that creates F<.o> files via
-this environment will cause them to be compiled with C<-O >and no C<-g>. The
-override could, of course, be restricted to a single directory by the
-appropriate selection of a regular expression.
-
-Here's the original version of the Hello, World! program, built with this
-environment. Note that Cons rebuilds the appropriate pieces when the
-override is applied or removed:
-
-  % cons hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons -o over hello
-  cc -O -c hello.c -o hello.o
-  cc -o hello hello.o
-  % cons -o over hello
-  cons: "hello" is up-to-date.
-  % cons hello
-  cc -g -c hello.c -o hello.o
-  cc -o hello hello.o
-
-It's important that the C<Override> command only be used for temporary,
-on-the-fly overrides necessary for development because the overrides are not
-platform independent and because they rely too much on intimate knowledge of
-the workings of the scripts. For temporary use, however, they are exactly
-what you want.
-
-Note that it is still useful to provide, say, the ability to create a fully
-optimized version of a system for production use--from the F<Construct> and
-F<Conscript> files. This way you can tailor the optimized system to the
-platform. Where optimizer trade-offs need to be made (particular files may
-not be compiled with full optimization, for example), then these can be
-recorded for posterity (and reproducibility) directly in the scripts.
-
-
-=head1 More on construction environments
-
-As previously mentioned, a B<construction environment> is an object that
-has a set of keyword/value pairs and a set of methods, and which is used
-to tell Cons how target files should be built.  This section describes
-how Cons uses and expands construction environment values to control its
-build behavior.
-
-=head2 Construction variable expansion
-
-Construction variables from a construction environment are expanded
-by preceding the keyword with a C<%> (percent sign):
-
-  Construction variables:
-	XYZZY => 'abracadabra',
-
-  The string:  "The magic word is:  %XYZZY!"
-  expands to:  "The magic word is:  abracadabra!"
-
-A construction variable name may be surrounded by C<{> and C<}> (curly
-braces), which are stripped as part of the expansion.  This can
-sometimes be necessary to separate a variable expansion from trailing
-alphanumeric characters:
-
-  Construction variables:
-	OPT    => 'value1',
-	OPTION => 'value2',
-
-  The string:  "%OPT %{OPT}ION %OPTION %{OPTION}"
-  expands to:  "value1 value1ION value2 value2"
-
-Construction variable expansion is recursive--that is, a string
-containing C<%->expansions after substitution will be re-expanded until
-no further substitutions can be made:
-
-  Construction variables:
-	STRING => 'The result is:  %FOO',
-	FOO    => '%BAR',
-	BAR    => 'final value',
-
-  The string:  "The string says:  %STRING"
-  expands to:  "The string says:  The result is:  final value"
-
-If a construction variable is not defined in an environment, then the
-null string is substituted:
-
-  Construction variables:
-	FOO => 'value1',
-	BAR => 'value2',
-
-  The string:  "%FOO <%NO_VARIABLE> %BAR"
-  expands to:  "value1 <> value2"
-
-A doubled C<%%> will be replaced by a single C<%>:
-
-  The string:  "Here is a percent sign:  %%"
-  expands to:  "Here is a percent sign: %"
-
-=head2 Default construction variables
-
-When you specify no arguments when creating a new construction
-environment:
-
-  $env = new cons();
-
-Cons creates a reference to a new, default construction
-environment. This contains a number of construction variables and some
-methods. At the present writing, the default construction variables on a
-UNIX system are:
-
-  CC            => 'cc',
-  CFLAGS        => '',
-  CCCOM         => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-  CXX           => '%CC',
-  CXXFLAGS      => '%CFLAGS',
-  CXXCOM        => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
-  INCDIRPREFIX  => '-I',
-  INCDIRSUFFIX  => '',
-  LINK          => '%CXX',
-  LINKCOM       => '%LINK %LDFLAGS -o %> %< %_LDIRS %LIBS',
-  LINKMODULECOM => '%LD -r -o %> %<',
-  LIBDIRPREFIX  => '-L',
-  LIBDIRSUFFIX  => '',
-  AR		=> 'ar',
-  ARFLAGS	=> 'r',
-  ARCOM		=> ['%AR %ARFLAGS %> %<', '%RANLIB %>'],
-  RANLIB	=> 'ranlib',
-  AS		=> 'as',
-  ASFLAGS	=> '',
-  ASCOM		=> '%AS %ASFLAGS %< -o %>',
-  LD		=> 'ld',
-  LDFLAGS	=> '',
-  PREFLIB	=> 'lib',
-  SUFLIB	=> '.a',
-  SUFLIBS	=> '.so:.a',
-  SUFOBJ	=> '.o',
-  SIGNATURE     => [ '*' => 'build' ],
-  ENV		=> { 'PATH' => '/bin:/usr/bin' },
-
-
-And on a Win32 system (Windows NT), the default construction variables
-are (unless the default rule style is set using the B<DefaultRules>
-method):
-
-  CC		=> 'cl',
-  CFLAGS	=> '/nologo',
-  CCCOM		=> '%CC %CFLAGS %_IFLAGS /c %< /Fo%>',
-  CXXCOM        => '%CXX %CXXFLAGS %_IFLAGS /c %< /Fo%>',
-  INCDIRPREFIX  => '/I',
-  INCDIRSUFFIX  => '',
-  LINK          => 'link',
-  LINKCOM       => '%LINK %LDFLAGS /out:%> %< %_LDIRS %LIBS',
-  LINKMODULECOM => '%LD /r /o %> %<',
-  LIBDIRPREFIX  => '/LIBPATH:',
-  LIBDIRSUFFIX  => '',
-  AR            => 'lib',
-  ARFLAGS       => '/nologo ',
-  ARCOM         => "%AR %ARFLAGS /out:%> %<",
-  RANLIB        => '',
-  LD            => 'link',
-  LDFLAGS       => '/nologo ',
-  PREFLIB       => '',
-  SUFEXE	=> '.exe',
-  SUFLIB	=> '.lib',
-  SUFLIBS	=> '.dll:.lib',
-  SUFOBJ	=> '.obj',
-  SIGNATURE     => [ '*' => 'build' ],
-
-These variables are used by the various methods associated with the
-environment. In particular, any method that ultimately invokes an external
-command will substitute these variables into the final command, as
-appropriate. For example, the C<Objects> method takes a number of source
-files and arranges to derive, if necessary, the corresponding object
-files:
-
-  Objects $env 'foo.c', 'bar.c';
-
-This will arrange to produce, if necessary, F<foo.o> and F<bar.o>. The
-command invoked is simply C<%CCCOM>, which expands, through substitution,
-to the appropriate external command required to build each object. The
-substitution rules will be discussed in detail in the next section.
-
-The construction variables are also used for other purposes. For example,
-C<CPPPATH> is used to specify a colon-separated path of include
-directories. These are intended to be passed to the C preprocessor and are
-also used by the C-file scanning machinery to determine the dependencies
-involved in a C Compilation.
-
-Variables beginning with underscore are created by various methods,
-and should normally be considered ``internal'' variables. For example,
-when a method is called which calls for the creation of an object from
-a C source, the variable C<_IFLAGS> is created: this corresponds to the
-C<-I> switches required by the C compiler to represent the directories
-specified by C<CPPPATH>.
-
-Note that, for any particular environment, the value of a variable is set
-once, and then never reset (to change a variable, you must create a new
-environment. Methods are provided for copying existing environments for this
-purpose). Some internal variables, such as C<_IFLAGS> are created on demand,
-but once set, they remain fixed for the life of the environment.
-
-The C<CFLAGS>, C<LDFLAGS>, and C<ARFLAGS> variables all supply a place
-for passing options to the compiler, loader, and archiver, respectively.
-
-The C<INCDIRPREFIX> and C<INCDIRSUFFIX> variables specify option
-strings to be appended to the beginning and end, respectively, of each
-include directory so that the compiler knows where to find F<.h> files.
-Similarly, the C<LIBDIRPREFIX> and C<LIBDIRSUFFIX> variables specify the
-option string to be appended to the beginning of and end, respectively,
-of each directory that the linker should search for libraries.
-
-Another variable, C<ENV>, is used to determine the system environment during
-the execution of an external command. By default, the only environment
-variable that is set is C<PATH>, which is the execution path for a UNIX
-command. For the utmost reproducibility, you should really arrange to set
-your own execution path, in your top-level F<Construct> file (or perhaps by
-importing an appropriate construction package with the Perl C<use>
-command). The default variables are intended to get you off the ground.
-
-=head2 Expanding variables in construction commands
-
-Within a construction command, construction variables will be expanded
-according to the rules described above.  In addition to normal variable
-expansion from the construction environment, construction commands also
-expand the following pseudo-variables to insert the specific input and
-output files in the command line that will be executed:
-
-=over 10
-
-=item %>
-
-The target file name.  In a multi-target command, this expands to the
-first target mentioned.)
-
-=item %0
-
-Same as C<%E<gt>>.
-
-=item %1, %2, ..., %9
-
-These refer to the first through ninth input file, respectively.
-
-=item %E<lt>
-
-The full set of input file names. If any of these have been used
-anywhere else in the current command line (via C<%1>, C<%2>, etc.), then
-those will be deleted from the list provided by C<%E<lt>>. Consider the
-following command found in a F<Conscript> file in the F<test> directory:
-
-  Command $env 'tgt', qw(foo bar baz), qq(
-	echo %< -i %1 > %>
-	echo %< -i %2 >> %>
-	echo %< -i %3 >> %>
-  );
-
-If F<tgt> needed to be updated, then this would result in the execution of
-the following commands, assuming that no remapping has been established for
-the F<test> directory:
-
-  echo test/bar test/baz -i test/foo > test/tgt
-  echo test/foo test/baz -i test/bar >> test/tgt
-  echo test/foo test/bar -i test/baz >> test/tgt
-
-=back
-
-Any of the above pseudo-variables may be followed immediately by one of
-the following suffixes to select a portion of the expanded path name:
-
-  :a    the absolute path to the file name
-  :b    the directory plus the file name stripped of any suffix
-  :d    the directory
-  :f    the file name
-  :s    the file name suffix
-  :F    the file name stripped of any suffix
-  :S    the absolute path path to a Linked source file
-
-Continuing with the above example, C<%E<lt>:f> would expand to C<foo bar baz>,
-and C<%E<gt>:d> would expand to C<test>.
-
-There are additional C<%> elements which affect the command line(s):
-
-=over 10
-
-=item %[ %]
-
-It is possible to programmatically rewrite part of the command by
-enclosing part of it between C<%[> and C<%]>.  This will call the
-construction variable named as the first word enclosed in the brackets
-as a Perl code reference; the results of this call will be used to
-replace the contents of the brackets in the command line.  For example,
-given an existing input file named F<tgt.in>:
-
-  @keywords = qw(foo bar baz);
-  $env = new cons(X_COMMA => sub { join(",", @_) });
-  Command $env 'tgt', 'tgt.in', qq(
-	echo '# Keywords: %[X_COMMA @keywords %]' > %>
-	cat %< >> %>
-  );
-
-This will execute:
-
-  echo '# Keywords: foo,bar,baz' > tgt
-  cat tgt.in >> tgt
-
-=item %( %)
-
-Cons includes the text of the command line in the MD5 signature for a
-build, so that targets get rebuilt if you change the command line (to
-add or remove an option, for example).  Command-line text in between
-C<%(> and C<%)>, however, will be ignored for MD5 signature calculation.
-
-Internally, Cons uses C<%(> and C<%)> around include and library
-directory options (C<-I> and C<-L> on UNIX systems, C</I> and
-C</LIBPATH> on Windows NT) to avoid rebuilds just because the directory
-list changes.  Rebuilds occur only if the changed directory list causes
-any included I<files> to change, and a changed include file is detected
-by the MD5 signature calculation on the actual file contents.
-
-=back
-
-=head2 Expanding construction variables in file names
-
-Cons expands construction variables in the source and target file names
-passed to the various construction methods according to the expansion
-rules described above:
-
-  $env = new cons(
-	DESTDIR	=>	'programs',
-	SRCDIR	=>	'src',
-  );
-  Program $env '%DESTDIR/hello', '%SRCDIR/hello.c';
-
-This allows for flexible configuration, through the construction
-environment, of directory names, suffixes, etc.
-
-
-=head1 Build actions
-
-Cons supports several types of B<build actions> that can be performed
-to construct one or more target files.  Usually, a build action is
-a construction command--that is, a command-line string that invokes
-an external command.  Cons can also execute Perl code embedded in a
-command-line string, and even supports an experimental ability to build
-a target file by executing a Perl code reference directly.
-
-A build action is usually specified as the value of a construction
-variable:
-
-  $env = new cons(
-	CCCOM         => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
-	LINKCOM       => '[perl] &link_executable("%>", "%<")',
-	ARCOM         => sub { my($env, $target, @sources) = @_;
-				 # code to create an archive
-				}
-  );
-
-A build action may be associated directly with one or more target files
-via the C<Command> method; see below.
-
-=head2 Construction commands
-
-A construction command goes through expansion of construction variables
-and C<%-> pseudo-variables, as described above, to create the actual
-command line that Cons will execute to generate the target file or
-files.
-
-After substitution occurs, strings of white space are converted into
-single blanks, and leading and trailing white space is eliminated. It
-is therefore currently not possible to introduce variable length white
-space in strings passed into a command.
-
-If a multi-line command string is provided, the commands are executed
-sequentially. If any of the commands fails, then none of the rest are
-executed, and the target is not marked as updated, i.e. a new signature is
-not stored for the target.
-
-Normally, if all the commands succeed, and return a zero status (or whatever
-platform-specific indication of success is required), then a new signature
-is stored for the target. If a command erroneously reports success even
-after a failure, then Cons will assume that the target file created by that
-command is accurate and up-to-date.
-
-The first word of each command string, after expansion, is assumed to be an
-executable command looked up on the C<PATH> environment variable (which is,
-in turn, specified by the C<ENV> construction variable). If this command is
-found on the path, then the target will depend upon it: the command will
-therefore be automatically built, as necessary. It's possible to write
-multi-part commands to some shells, separated by semi-colons. Only the first
-command word will be depended upon, however, so if you write your command
-strings this way, you must either explicitly set up a dependency (with the
-C<Depends> method), or be sure that the command you are using is a system
-command which is expected to be available. If it isn't available, you will,
-of course, get an error.
-
-Cons normally prints a command before executing it.  This behavior is
-suppressed if the first character of the command is C<@>.  Note that
-you may need to separate the C<@> from the command name or escape it to
-prevent C<@cmd> from looking like an array to Perl quote operators that
-perform interpolation:
-
-  # The first command line is incorrect,
-  # because "@cp" looks like an array
-  # to the Perl qq// function.
-  # Use the second form instead.
-  Command $env 'foo', 'foo.in', qq(
-	@cp %< tempfile
-	@ cp tempfile %>
-  );
-
-If there are shell meta characters anywhere in the expanded command line,
-such as C<E<lt>>, C<E<gt>>, quotes, or semi-colon, then the command
-will actually be executed by invoking a shell. This means that a command
-such as:
-
-  cd foo
-
-alone will typically fail, since there is no command C<cd> on the path. But
-the command string:
-
-  cd $<:d; tar cf $>:f $<:f
-
-when expanded will still contain the shell meta character semi-colon, and a
-shell will be invoked to interpret the command. Since C<cd> is interpreted
-by this sub-shell, the command will execute as expected.
-
-=head2 Perl expressions
-
-If any command (even one within a multi-line command) begins with
-C<[perl]>, the remainder of that command line will be evaluated by the
-running Perl instead of being forked by the shell.  If an error occurs
-in parsing the Perl code, or if the Perl expression returns 0 or undef,
-the command will be considered to have failed.  For example, here is a
-simple command which creates a file C<foo> directly from Perl:
-
-  $env = new cons();
-  Command $env 'foo',
-    qq([perl] open(FOO,'>foo');print FOO "hi\\n"; close(FOO); 1);
-
-Note that when the command is executed, you are in the same package as
-when the F<Construct> or F<Conscript> file was read, so you can call
-Perl functions you've defined in the same F<Construct> or F<Conscript>
-file in which the C<Command> appears:
-
-  $env = new cons();
-  sub create_file {
-	my $file = shift;
-	open(FILE, ">$file");
-	print FILE "hi\n";
-	close(FILE);
-	return 1;
-  }
-  Command $env 'foo', "[perl] &create_file('%>')";
-
-The Perl string will be used to generate the signature for the derived
-file, so if you change the string, the file will be rebuilt.  The contents
-of any subroutines you call, however, are not part of the signature,
-so if you modify a called subroutine such as C<create_file> above,
-the target will I<not> be rebuilt.  Caveat user.
-
-=head2 Perl code references [EXPERIMENTAL]
-
-Cons supports the ability to create a derived file by directly executing
-a Perl code reference.  This feature is considered EXPERIMENTAL and
-subject to change in the future.
-
-A code reference may either be a named subroutine referenced by the
-usual C<\&> syntax:
-
-  sub build_output {
-	my($env, $target, @sources) = @_;
-	print "build_output building $target\n";
-	open(OUT, ">$target");
-	foreach $src (@sources) {
-	    if (! open(IN, "<$src")) {
-		print STDERR "cannot open '$src': $!\n";
-		return undef;
-	    }
-	    print OUT, <IN>;
-	}
-	close(OUT);
-	return 1;
-  }
-  Command $env 'output', \&build_output;
-
-or the code reference may be an anonymous subroutine:
-
-  Command $env 'output', sub {
-	my($env, $target, @sources) = @_;
-	print "building $target\n";
-	open(FILE, ">$target");
-	print FILE "hello\n";
-	close(FILE);
-	return 1;
-  };
-
-To build the target file, the referenced subroutine is passed, in order:
-the construction environment used to generate the target; the path
-name of the target itself; and the path names of all the source files
-necessary to build the target file.
-
-The code reference is expected to generate the target file, of course,
-but may manipulate the source and target files in any way it chooses.
-The code reference must return a false value (C<undef> or C<0>) if
-the build of the file failed.  Any true value indicates a successful
-build of the target.
-
-Building target files using code references is considered EXPERIMENTAL
-due to the following current limitations:
-
-=over 4
-
-Cons does I<not> print anything to indicate the code reference is being
-called to build the file.  The only way to give the user any indication
-is to have the code reference explicitly print some sort of "building"
-message, as in the above examples.
-
-Cons does not generate any signatures for code references, so if the
-code in the reference changes, the target will I<not> be rebuilt.
-
-Cons has no public method to allow a code reference to extract
-construction variables.  This would be good to allow generalization of
-code references based on the current construction environment, but would
-also complicate the problem of generating meaningful signatures for code
-references.
-
-=back
-
-Support for building targets via code references has been released in
-this version to encourage experimentation and the seeking of possible
-solutions to the above limitations.
-
-
-=head1 Default construction methods
-
-The list of default construction methods includes the following:
-
-
-=head2 The C<new> constructor
-
-The C<new> method is a Perl object constructor. That is, it is not invoked
-via a reference to an existing construction environment B<reference>, but,
-rather statically, using the name of the Perl B<package> where the
-constructor is defined. The method is invoked like this:
-
-  $env = new cons(<overrides>);
-
-The environment you get back is blessed into the package C<cons>, which
-means that it will have associated with it the default methods described
-below. Individual construction variables can be overridden by providing
-name/value pairs in an override list. Note that to override any command
-environment variable (i.e. anything under C<ENV>), you will have to override
-all of them. You can get around this difficulty by using the C<copy> method
-on an existing construction environment.
-
-
-=head2 The C<clone> method
-
-The C<clone> method creates a clone of an existing construction environment,
-and can be called as in the following example:
-
-  $env2 = $env1->clone(<overrides>);
-
-You can provide overrides in the usual manner to create a different
-environment from the original. If you just want a new name for the same
-environment (which may be helpful when exporting environments to existing
-components), you can just use simple assignment.
-
-
-=head2 The C<copy> method
-
-The C<copy> method extracts the externally defined construction variables
-from an environment and returns them as a list of name/value
-pairs. Overrides can also be provided, in which case, the overridden values
-will be returned, as appropriate. The returned list can be assigned to a
-hash, as shown in the prototype, below, but it can also be manipulated in
-other ways:
-
-  %env = $env1->copy(<overrides>);
-
-The value of C<ENV>, which is itself a hash, is also copied to a new hash,
-so this may be changed without fear of affecting the original
-environment. So, for example, if you really want to override just the
-C<PATH> variable in the default environment, you could do the following:
-
-  %cons = new cons()->copy();
-  $cons{ENV}{PATH} = "<your path here>";
-  $cons = new cons(%cons);
-
-This will leave anything else that might be in the default execution
-environment undisturbed.
-
-
-=head2 The C<Install> method
-
-The C<Install> method arranges for the specified files to be installed in
-the specified directory. The installation is optimized: the file is not
-copied if it can be linked. If this is not the desired behavior, you will
-need to use a different method to install the file. It is called as follows:
-
-  Install $env <directory>, <names>;
-
-Note that, while the files to be installed may be arbitrarily named,
-only the last component of each name is used for the installed target
-name. So, for example, if you arrange to install F<foo/bar> in F<baz>,
-this will create a F<bar> file in the F<baz> directory (not F<foo/bar>).
-
-
-=head2 The C<InstallAs> method
-
-The C<InstallAs> method arranges for the specified source file(s) to be
-installed as the specified target file(s). Multiple files should be
-specified as a file list. The installation is optimized: the file is not
-copied if it can be linked. If this is not the desired behavior, you will
-need to use a different method to install the file. It is called as follows:
-
-C<InstallAs> works in two ways:
-
-Single file install:
-
-  InstallAs $env TgtFile, SrcFile;
-
-Multiple file install:
-
-  InstallAs $env ['tgt1', 'tgt2'], ['src1', 'src2'];
-
-Or, even as:
-
-  @srcs = qw(src1 src2 src3);
-  @tgts = qw(tgt1 tgt2 tgt3);
-  InstallAs $env [@tgts], [@srcs];
-
-Both the target and the sources lists should be of the same length.
-
-=head2 The C<Precious> method
-
-The C<Precious> method asks cons not to delete the specified file or
-list of files before building them again.  It is invoked as:
-
-  Precious <files>;
-
-This is especially useful for allowing incremental updates to libraries
-or debug information files which are updated rather than rebuilt anew each
-time.  Cons will still delete the files when the C<-r> flag is specified.
-
-=head2 The C<AfterBuild> method
-
-The C<AfterBuild> method evaluates the specified perl string after
-building the given file or files (or finding that they are up to date).
-The eval will happen once per specified file.  C<AfterBuild> is called
-as follows:
-
-  AfterBuild $env 'foo.o', qq(print "foo.o is up to date!\n");
-
-The perl string is evaluated in the C<script> package, and has access
-to all variables and subroutines defined in the F<Conscript> file in
-which the C<AfterBuild> method is called.
-
-=head2 The C<Command> method
-
-The C<Command> method is a catchall method which can be used to arrange for
-any build action to be executed to update the target. For this command, a
-target file and list of inputs is provided. In addition, a build action
-is specified as the last argument.  The build action is typically a
-command line or lines, but may also contain Perl code to be executed;
-see the section above on build actions for details.
-
-The C<Command> method is called as follows:
-
-  Command $env <target>, <inputs>, <build action>;
-
-The target is made dependent upon the list of input files specified, and the
-inputs must be built successfully or Cons will not attempt to build the
-target.
-
-To specify a command with multiple targets, you can specify a reference to a
-list of targets. In Perl, a list reference can be created by enclosing a
-list in square brackets. Hence the following command:
-
-  Command $env ['foo.h', 'foo.c'], 'foo.template', q(
-	gen %1
-  );
-
-could be used in a case where the command C<gen> creates two files, both
-F<foo.h> and F<foo.c>.
-
-
-=head2 The C<Objects> method
-
-The C<Objects> method arranges to create the object files that correspond to
-the specified source files. It is invoked as shown below:
-
-  @files = Objects $env <source or object files>;
-
-Under Unix, source files ending in F<.s> and F<.c> are currently
-supported, and will be compiled into a name of the same file ending
-in F<.o>. By default, all files are created by invoking the external
-command which results from expanding the C<CCCOM> construction variable,
-with C<%E<lt>> and C<%E<gt>> set to the source and object files,
-respectively. (See the section above on construction variable expansion
-for details).  The variable C<CPPPATH> is also used when scanning source
-files for dependencies. This is a colon separated list of pathnames, and
-is also used to create the construction variable C<_IFLAGS,> which will
-contain the appropriate list of -C<I> options for the compilation. Any
-relative pathnames in C<CPPPATH> is interpreted relative to the
-directory in which the associated construction environment was created
-(absolute and top-relative names may also be used). This variable is
-used by C<CCCOM>. The behavior of this command can be modified by
-changing any of the variables which are interpolated into C<CCCOM>, such
-as C<CC>, C<CFLAGS>, and, indirectly, C<CPPPATH>. It's also possible
-to replace the value of C<CCCOM>, itself. As a convenience, this file
-returns the list of object filenames.
-
-
-=head2 The C<Program> method
-
-The C<Program> method arranges to link the specified program with the
-specified object files. It is invoked in the following manner:
-
-  Program $env <program name>, <source or object files>;
-
-The program name will have the value of the C<SUFEXE> construction
-variable appended (by default, C<.exe> on Win32 systems, nothing on Unix
-systems) if the suffix is not already present.
-
-Source files may be specified in place of objects files--the C<Objects>
-method will be invoked to arrange the conversion of all the files into
-object files, and hence all the observations about the C<Objects> method,
-above, apply to this method also.
-
-The actual linking of the program will be handled by an external command
-which results from expanding the C<LINKCOM> construction variable, with
-C<%E<lt>> set to the object files to be linked (in the order presented),
-and C<%E<gt>> set to the target. (See the section above on construction
-variable expansion for details.)  The user may set additional variables
-in the construction environment, including C<LINK>, to define which
-program to use for linking, C<LIBPATH>, a colon-separated list of
-library search paths, for use with library specifications of the form
-I<-llib>, and C<LIBS>, specifying the list of libraries to link against
-(in either I<-llib> form or just as pathnames. Relative pathnames in
-both C<LIBPATH> and C<LIBS> are interpreted relative to the directory
-in which the associated construction environment is created (absolute
-and top-relative names may also be used). Cons automatically sets up
-dependencies on any libraries mentioned in C<LIBS>: those libraries will
-be built before the command is linked.
-
-
-=head2 The C<Library> method
-
-The C<Library> method arranges to create the specified library from the
-specified object files. It is invoked as follows:
-
-  Library $env <library name>, <source or object files>;
-
-The library name will have the value of the C<SUFLIB> construction
-variable appended (by default, C<.lib> on Win32 systems, C<.a> on Unix
-systems) if the suffix is not already present.
-
-Source files may be specified in place of objects files--the C<Objects>
-method will be invoked to arrange the conversion of all the files into
-object files, and hence all the observations about the C<Objects> method,
-above, apply to this method also.
-
-The actual creation of the library will be handled by an external
-command which results from expanding the C<ARCOM> construction variable,
-with C<%E<lt>> set to the library members (in the order presented),
-and C<%E<gt>> to the library to be created.  (See the section above
-on construction variable expansion for details.)  The user may set
-variables in the construction environment which will affect the
-operation of the command. These include C<AR>, the archive program
-to use, C<ARFLAGS>, which can be used to modify the flags given to
-the program specified by C<AR>, and C<RANLIB>, the name of a archive
-index generation program, if needed (if the particular need does not
-require the latter functionality, then C<ARCOM> must be redefined to not
-reference C<RANLIB>).
-
-The C<Library> method allows the same library to be specified in multiple
-method invocations. All of the contributing objects from all the invocations
-(which may be from different directories) are combined and generated by a
-single archive command. Note, however, that if you prune a build so that
-only part of a library is specified, then only that part of the library will
-be generated (the rest will disappear!).
-
-
-=head2 The C<Module> method
-
-The C<Module> method is a combination of the C<Program> and C<Command>
-methods. Rather than generating an executable program directly, this command
-allows you to specify your own command to actually generate a module. The
-method is invoked as follows:
-
-  Module $env <module name>, <source or object files>, <construction command>;
-
-This command is useful in instances where you wish to create, for example,
-dynamically loaded modules, or statically linked code libraries.
-
-
-=head2 The C<Depends> method
-
-The C<Depends> method allows you to specify additional dependencies for a
-target.  It is invoked as follows:
-
-  Depends $env <target>, <dependencies>;
-
-This may be occasionally useful, especially in cases where no scanner exists
-(or is writable) for particular types of files. Normally, dependencies are
-calculated automatically from a combination of the explicit dependencies set
-up by the method invocation or by scanning source files.
-
-A set of identical dependencies for multiple targets may be specified
-using a reference to a list of targets. In Perl, a list reference can
-be created by enclosing a list in square brackets. Hence the following
-command:
-
-  Depends $env ['foo', 'bar'], 'input_file_1', 'input_file_2';
-
-specifies that both the F<foo> and F<bar> files depend on the listed
-input files.
-
-
-=head2 The C<RuleSet> method
-
-The C<RuleSet> method returns the construction variables for building
-various components with one of the rule sets supported by Cons.  The
-currently supported rule sets are:
-
-=over 4
-
-=item msvc
-
-Rules for the Microsoft Visual C++ compiler suite.
-
-=item unix
-
-Generic rules for most UNIX-like compiler suites.
-
-=back
-
-On systems with more than one available compiler suite, this allows you
-to easily create side-by-side environments for building software with
-multiple tools:
-
-    $msvcenv = new cons(RuleSet("msvc"));
-    $cygnusenv = new cons(RuleSet("unix"));
-
-In the future, this could also be extended to other platforms that
-have different default rule sets.
-
-
-=head2 The C<DefaultRules> method
-
-The C<DefaultRules> method sets the default construction variables that
-will be returned by the C<new> method to the specified arguments:
-
-  DefaultRules(CC     => 'gcc',
-	       CFLAGS => '',
-	       CCCOM  => '%CC %CFLAGS %_IFLAGS -c %< -o %>');
-  $env = new cons();
-  # $env now contains *only* the CC, CFLAGS,
-  # and CCCOM construction variables
-
-Combined with the C<RuleSet> method, this also provides an easy way
-to set explicitly the default build environment to use some supported
-toolset other than the Cons defaults:
-
-    # use a UNIX-like tool suite (like cygwin) on Win32
-    DefaultRules(RuleSet('unix'));
-    $env = new cons();
-
-Note that the C<DefaultRules> method completely replaces the default
-construction environment with the specified arguments, it does not
-simply override the existing defaults.  To override one or more
-variables in a supported C<RuleSet>, append the variables and values:
-
-  DefaultRules(RuleSet('unix'), CFLAGS => '-O3');
-  $env1 = new cons();
-  $env2 = new cons();
-  # both $env1 and $env2 have 'unix' defaults
-  # with CFLAGS set to '-O3'
-
-
-=head2 The C<Ignore> method
-
-The C<Ignore> method allows you to ignore explicitly dependencies that
-Cons infers on its own.  It is invoked as follows:
-
-  Ignore <patterns>;
-
-This can be used to avoid recompilations due to changes in system header
-files or utilities that are known to not affect the generated targets.
-
-If, for example, a program is built in an NFS-mounted directory on
-multiple systems that have different copies of F<stdio.h>, the differences
-will affect the signatures of all derived targets built from source files
-that C<#include E<lt>stdio.hE<gt>>.  This will cause all those targets to
-be rebuilt when changing systems.  If this is not desirable behavior, then
-the following line will remove the dependencies on the F<stdio.h> file:
-
-  Ignore '^/usr/include/stdio\.h$';
-
-Note that the arguments to the C<Ignore> method are regular expressions,
-so special characters must be escaped and you may wish to anchor the
-beginning or end of the expression with C<^> or C<$> characters.
-
-
-=head2 The C<Salt> method
-
-The C<Salt> method adds a constant value to the signature calculation
-for every derived file.  It is invoked as follows:
-
-  Salt $string;
-
-Changing the Salt value will force a complete rebuild of every derived
-file.  This can be used to force rebuilds in certain desired
-circumstances.  For example,
-
-  Salt `uname -s`;
-
-Would force a complete rebuild of every derived file whenever the
-operating system on which the build is performed (as reported by C<uname
--s>) changes.
-
-
-=head2 The C<UseCache> method
-
-The C<UseCache> method instructs Cons to maintain a cache of derived
-files, to be shared among separate build trees of the same project.
-
-  UseCache("cache/<buildname>") || warn("cache directory not found");
-
-
-=head2 The C<SourcePath> method
-
-The C<SourcePath> mathod returns the real source path name of a file,
-as opposed to the path name within a build directory.  It is invoked
-as follows:
-
-  $path = SourcePath <buildpath>;
-
-
-=head2 The C<ConsPath> method
-
-The C<ConsPath> method returns true if the supplied path is a derivable
-file, and returns undef (false) otherwise.
-It is invoked as follows:
-
-  $result = ConsPath <path>;
-
-
-=head2 The C<SplitPath> method
-
-The C<SplitPath> method looks up multiple path names in a string separated
-by the default path separator for the operating system (':' on UNIX
-systems, ';' on Windows NT), and returns the fully-qualified names.
-It is invoked as follows:
-
-  @paths = SplitPath <pathlist>;
-
-The C<SplitPath> method will convert  names prefixed '#' to the
-appropriate top-level build name (without the '#') and will convert
-relative names to top-level names.
-
-
-=head2 The C<DirPath> method
-
-The C<DirPath> method returns the build path name(s) of a directory or
-list of directories.  It is invoked as follows:
-
-  $cwd = DirPath <paths>;
-
-The most common use for the C<DirPath> method is:
-
-  $cwd = DirPath '.';
-
-to fetch the path to the current directory of a subsidiary F<Conscript>
-file.
-
-
-=head2 The C<FilePath> method
-
-The C<FilePath> method returns the build path name(s) of a file or
-list of files.  It is invoked as follows:
-
-  $file = FilePath <path>;
-
-
-=head2 The C<Help> method
-
-The C<Help> method specifies help text that will be displayed when the
-user invokes C<cons -h>.  This can be used to provide documentation
-of specific targets, values, build options, etc. for the build tree.
-It is invoked as follows:
-
-  Help <helptext>;
-
-The C<Help> method may only be called once, and should typically be
-specified in the top-level F<Construct> file.
-
-
-=head1 Extending Cons
-
-
-=head2 Overriding construction variables
-
-There are several ways of extending Cons, which vary in degree of
-difficulty. The simplest method is to define your own construction
-environment, based on the default environment, but modified to reflect your
-particular needs. This will often suffice for C-based applications. You can
-use the C<new> constructor, and the C<clone> and C<copy> methods to create
-hybrid environments. These changes can be entirely transparent to the
-underlying F<Conscript> files.
-
-
-=head2 Adding new methods
-
-For slightly more demanding changes, you may wish to add new methods to the
-C<cons> package. Here's an example of a very simple extension,
-C<InstallScript>, which installs a tcl script in a requested location, but
-edits the script first to reflect a platform-dependent path that needs to be
-installed in the script:
-
-  # cons::InstallScript - Create a platform dependent version of a shell
-  # script by replacing string ``#!your-path-here'' with platform specific
-  # path $BIN_DIR.
-
-  sub cons::InstallScript {
-	my ($env, $dst, $src) = @_;
-	Command $env $dst, $src, qq(
-		sed s+your-path-here+$BIN_DIR+ %< > %>
-		chmod oug+x %>
-	);
-  }
-
-Notice that this method is defined directly in the C<cons> package (by
-prefixing the name with C<cons::>). A change made in this manner will be
-globally visible to all environments, and could be called as in the
-following example:
-
-  InstallScript $env "$BIN/foo", "foo.tcl";
-
-For a small improvement in generality, the C<BINDIR> variable could be
-passed in as an argument or taken from the construction environment--as
-C<%BINDIR>.
-
-
-=head2 Overriding methods
-
-Instead of adding the method to the C<cons> name space, you could define a
-new package which inherits existing methods from the C<cons> package and
-overrides or adds others. This can be done using Perl's inheritance
-mechanisms.
-
-The following example defines a new package C<cons::switch> which
-overrides the standard C<Library> method. The overridden method builds
-linked library modules, rather than library archives. A new
-constructor is provided. Environments created with this constructor
-will have the new library method; others won't.
-
-  package cons::switch;
-  BEGIN {@ISA = 'cons'}
-
-  sub new {
-	shift;
-	bless new cons(@_);
-  }
-
-  sub Library {
-	my($env) = shift;
-	my($lib) = shift;
-	my(@objs) = Objects $env @_;
-	Command $env $lib, @objs, q(
-		%LD -r %LDFLAGS %< -o %>
-	);
-  }
-
-This functionality could be invoked as in the following example:
-
-  $env = new cons::switch(@overrides);
-  ...
-  Library $env 'lib.o', 'foo.c', 'bar.c';
-
-
-=head1 Invoking Cons
-
-The C<cons> command is usually invoked from the root of the build tree. A
-F<Construct> file must exist in that directory. If the C<-f> argument is
-used, then an alternate F<Construct> file may be used (and, possibly, an
-alternate root, since C<cons> will cd to F<Construct> file's containing
-directory).
-
-If C<cons> is invoked from a child of the root of the build tree with
-the C<-t> argument, it will walk up the directory hierarchy looking for a
-F<Construct> file.  (An alternate name may still be specified with C<-f>.)
-The targets supplied on the command line will be modified to be relative
-to the discovered F<Construct> file.  For example, from a directory
-containing a top-level F<Construct> file, the following invocation:
-
-  % cd libfoo/subdir
-  % cons -t target
-
-is exactly equivalent to:
-
-  % cons libfoo/subdir/target
-
-If there are any C<Default> targets specified in the directory hierarchy's
-F<Construct> or F<Conscript> files, only the default targets at or below
-the directory from which C<cons -t> was invoked will be built.
-
-The command is invoked as follows:
-
-  cons <arguments> -- <construct-args>
-
-where I<arguments> can be any of the following, in any order:
-
-=over 10
-
-=item I<target>
-
-Build the specified target. If I<target> is a directory, then recursively
-build everything within that directory.
-
-=item I<+pattern>
-
-Limit the F<Conscript> files considered to just those that match I<pattern>,
-which is a Perl regular expression. Multiple C<+> arguments are accepted.
-
-=item I<name>=<val>
-
-Sets I<name> to value I<val> in the C<ARG> hash passed to the top-level
-F<Construct> file.
-
-=item C<-cc>
-
-Show command that would have been executed, when retrieving from cache. No
-indication that the file has been retrieved is given; this is useful for
-generating build logs that can be compared with real build logs.
-
-=item C<-cd>
-
-Disable all caching. Do not retrieve from cache nor flush to cache.
-
-=item C<-cr>
-
-Build dependencies in random order. This is useful when building multiple
-similar trees with caching enabled.
-
-=item C<-cs>
-
-Synchronize existing build targets that are found to be up-to-date with
-cache. This is useful if caching has been disabled with -cc or just recently
-enabled with UseCache.
-
-=item C<-d>
-
-Enable dependency debugging.
-
-=item C<-f> <file>
-
-Use the specified file instead of F<Construct> (but first change to
-containing directory of I<file>).
-
-=item C<-h>
-
-Show a help message local to the current build if one such is defined, and
-exit.
-
-=item C<-k>
-
-Keep going as far as possible after errors.
-
-=item C<-o> <file>
-
-Read override file I<file>.
-
-=item C<-p>
-
-Show construction products in specified trees. No build is attempted.
-
-=item C<-pa>
-
-Show construction products and associated actions. No build is attempted.
-
-=item C<-pw>
-
-Show products and where they are defined. No build is attempted.
-
-=item C<-q>
-
-Make the build quiet.  Multiple C<-q> options may be specified.
-
-A single C<-q> options suppress messages about Installing and Removing
-targets.
-
-Two C<-q> options suppress build command lines and target up-to-date
-messages.
-
-=item C<-r>
-
-Remove construction products associated with <targets>. No build is
-attempted.
-
-=item C<-R> <repos>
-
-Search for files in I<repos>.  Multiple B<-R> I<repos> directories are
-searched in the order specified.
-
-=item C<-S> <pkg>
-
-Use the sig::<pkg> package to calculate.  Supported <pkg> values
-include "md5" for MD5 signature calculation and "md5::debug" for debug
-information about MD5 signature calculation.
-
-If the specified package ends in <::debug>, signature debug information
-will be printed to the file name specified in the C<CONS_SIG_DEBUG>
-environment variable, or to standard output if the environment variable
-is not set.
-
-=item C<-t>
-
-Traverse up the directory hierarchy looking for a F<Construct> file,
-if none exists in the current directory.  Targets will be modified to
-be relative to the F<Construct> file.
-
-Internally, C<cons> will change its working directory to the directory
-which contains the top-level F<Construct> file and report:
-
-  cons: Entering directory `top-level-directory'
-
-This message indicates to an invoking editor (such as emacs) or build
-environment that Cons will now report all file names relative to the
-top-level directory.  This message can not be suppressed with the C<-q>
-option.
-
-=item C<-v>
-
-Show C<cons> version and continue processing.
-
-=item C<-V>
-
-Show C<cons> version and exit.
-
-=item C<-wf> <file>
-
-Write all filenames considered into I<file>.
-
-=item C<-x>
-
-Show a help message similar to this one, and exit.
-
-=back
-
-And I<construct-args> can be any arguments that you wish to process in the
-F<Construct> file. Note that there should be a B<--> separating the arguments
-to cons and the arguments that you wish to process in the F<Construct> file.
-
-Processing of I<construct-args> can be done by any standard package like
-B<Getopt> or its variants, or any user defined package. B<cons> will pass in
-the I<construct-args> as B<@ARGV> and will not attempt to interpret anything
-after the B<-->.
-
-  % cons -R /usr/local/repository -d os=solaris +driver -- -c test -f DEBUG
-
-would pass the following to cons
-
-  -R /usr/local/repository -d os=solaris +driver
-
-and the following, to the top level F<Construct> file as B<@ARGV>
-
-  -c test -f DEBUG
-
-Note that C<cons -r .> is equivalent to a full recursive C<make clean>,
-but requires no support in the F<Construct> file or any F<Conscript>
-files. This is most useful if you are compiling files into source
-directories (if you separate the F<build> and F<export> directories,
-then you can just remove the directories).
-
-The options C<-p>, C<-pa>, and C<-pw> are extremely useful for use as an aid
-in reading scripts or debugging them. If you want to know what script
-installs F<export/include/foo.h>, for example, just type:
-
-  % cons -pw export/include/foo.h
-
-
-=head1 Using and writing dependency scanners
-
-QuickScan allows simple target-independent scanners to be set up for
-source files. Only one QuickScan scanner may be associated with any given
-source file and environment, although the same scanner may (and should)
-be used for multiple files of a given type.
-
-A QuickScan scanner is only ever invoked once for a given source file,
-and it is only invoked if the file is used by some target in the tree
-(i.e., there is a dependency on the source file).
-
-QuickScan is invoked as follows:
-
-  QuickScan CONSENV CODEREF, FILENAME [, PATH]
-
-The subroutine referenced by CODEREF is expected to return a list of
-filenames included directly by FILE. These filenames will, in turn, be
-scanned. The optional PATH argument supplies a lookup path for finding
-FILENAME and/or files returned by the user-supplied subroutine.  The PATH
-may be a reference to an array of lookup-directory names, or a string of
-names separated by the system's separator character (':' on UNIX systems,
-';' on Windows NT).
-
-The subroutine is called once for each line in the file, with $_ set to the
-current line. If the subroutine needs to look at additional lines, or, for
-that matter, the entire file, then it may read them itself, from the
-filehandle SCAN. It may also terminate the loop, if it knows that no further
-include information is available, by closing the filehandle.
-
-Whether or not a lookup path is provided, QuickScan first tries to lookup
-the file relative to the current directory (for the top-level file
-supplied directly to QuickScan), or from the directory containing the
-file which referenced the file. This is not very general, but seems good
-enough--especially if you have the luxury of writing your own utilities
-and can control the use of the search path in a standard way.
-
-Here's a real example, taken from a F<Construct> file here:
-
-  sub cons::SMFgen {
-      my($env, @tables) = @_;
-      foreach $t (@tables) {
-	  $env->QuickScan(sub { /\b\S*?\.smf\b/g }, "$t.smf",
-			  $env->{SMF_INCLUDE_PATH});
-	  $env->Command(["$t.smdb.cc","$t.smdb.h","$t.snmp.cc",
-			 "$t.ami.cc", "$t.http.cc"], "$t.smf",
-			q(smfgen %( %SMF_INCLUDE_OPT %) %<));
-      }
-  }
-
-The subroutine above finds all names of the form <name>.smf in the
-file. It will return the names even if they're found within comments,
-but that's OK (the mechanism is forgiving of extra files; they're just
-ignored on the assumption that the missing file will be noticed when
-the program, in this example, smfgen, is actually invoked).
-
-[NOTE that the form C<$env-E<gt>QuickScan ...>  and C<$env-E<gt>Command
-...> should not be necessary, but, for some reason, is required
-for this particular invocation. This appears to be a bug in Perl or
-a misunderstanding on my part; this invocation style does not always
-appear to be necessary.]
-
-Here is another way to build the same scanner. This one uses an
-explicit code reference, and also (unnecessarily, in this case) reads
-the whole file itself:
-
-  sub myscan {
-      my(@includes);
-      do {
-	  push(@includes, /\b\S*?\.smf\b/g);
-      } while <SCAN>;
-      @includes
-  }
-
-Note that the order of the loop is reversed, with the loop test at the
-end. This is because the first line is already read for you. This scanner
-can be attached to a source file by:
-
-  QuickScan $env \&myscan, "$_.smf";
-
-This final example, which scans a different type of input file, takes
-over the file scanning rather than being called for each input line:
-
-  $env->QuickScan(
-      sub { my(@includes) = ();
-	  do {
-	     push(@includes, $3)
-		 if /^(#include|import)\s+(\")(.+)(\")/ && $3
-	  } while <SCAN>;
-	  @includes
-      },
-      "$idlFileName",
-      "$env->{CPPPATH};$BUILD/ActiveContext/ACSCLientInterfaces"
-  );
-
-=head1 SUPPORT AND SUGGESTIONS
-
-Cons is maintained by the user community.  To subscribe, send mail to
-B<cons-discuss-request@gnu.org> with body B<subscribe>.
-
-Please report any suggestions through the B<cons-discuss@gnu.org> mailing
-list.
-
-=head1 BUGS
-
-Sure to be some. Please report any bugs through the B<bug-cons@gnu.org>
-mailing list.
-
-=head1 INFORMATION ABOUT CONS
-
-Information about CONS can be obtained from the official cons web site
-B<http://www.dsmit.com/cons/> or its mirrors listed there.
-
-The cons maintainers can be contacted by email at
-B<cons-maintainers@gnu.org>
-
-=head1 AUTHORS
-
-Originally by Bob Sidebotham. Then significantly enriched by the members
-of the Cons community B<cons-discuss@gnu.org>.
-
-The Cons community would like to thank Ulrich Pfeifer for the original pod
-documentation derived from the F<cons.html> file. Cons documentation is now
-a part of the program itself.
-
-=cut
-
diff --git a/code/unix/q3test.spec.sh b/code/unix/q3test.spec.sh
deleted file mode 100644
index ca696365..00000000
--- a/code/unix/q3test.spec.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Generate Quake3 test
-# $1 is version
-# $2 is release
-# $3 is arch
-# $4 is install dir (assumed to be in /var/tmp)
-cat <<EOF
-%define name q3test
-%define version ${1}
-%define release ${2}
-%define arch ${3}
-%define builddir \$RPM_BUILD_DIR/%{name}-%{version}
-Name:		%{name}
-Version:	%{version}
-Release:	%{release}
-Vendor:		id Software
-Packager:	Dave "Zoid" Kirsch <zoid@idsoftware.com>
-URL:		http://www.idsoftware.com/
-Source:		q3test-%{version}.tar.gz
-Group:		Games
-Copyright:	Restricted
-Icon:		quake3.gif
-BuildRoot:	/var/tmp/%{name}-%{version}
-Summary:	Q3Test for Linux
-
-%description
-
-%install
-
-%files
-
-%attr(644,root,root) $4/README.EULA
-%attr(644,root,root) $4/README.Q3Test
-%attr(644,root,root) $4/README.Linux
-%attr(644,root,root) $4/Quake3.kdelnk
-%attr(644,root,root) $4/quake3.xpm
-%attr(755,root,root) $4/linuxquake3
-%attr(755,root,root) $4/cgamei386.so
-%attr(755,root,root) $4/qagamei386.so
-%attr(755,root,root) $4/uii386.so
-%attr(755,root,root) $4/libMesaVoodooGL.so.3.1
-%attr(644,root,root) $4/demoq3/pak0.pk3
-
-%post
-
-if [ -n "\$KDEDIR" ]; then
-	ln -sf $4/Quake3.kdelnk \$KDEDIR/share/applnk/Games/Quake3.kdelnk
-	ln -sf $4/quake3.xpm \$KDEDIR/share/icons/quake3.xpm
-fi
-
-EOF
-
diff --git a/code/unix/qasm.h b/code/unix/qasm.h
deleted file mode 100644
index f6d16d6b..00000000
--- a/code/unix/qasm.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#ifndef __ASM_I386__
-#define __ASM_I386__
-
-#ifdef ELF
-#define C(label) label
-#else
-#define C(label) _##label
-#endif
-
-
-//#define GLQUAKE	1
-
-#if defined(_WIN32) && !defined(WINDED)
-
-#if defined(_M_IX86)
-#define __i386__	1
-#endif
-
-#endif
-
-#ifdef __i386__
-#define id386	1
-#else
-#define id386	0
-#endif
-
-// !!! must be kept the same as in d_iface.h !!!
-#define TRANSPARENT_COLOR	255
-
-#ifndef GLQUAKE
-	.extern C(d_zistepu)
-	.extern C(d_pzbuffer)
-	.extern C(d_zistepv)
-	.extern C(d_zrowbytes)
-	.extern C(d_ziorigin)
-	.extern C(r_turb_s)
-	.extern C(r_turb_t)
-	.extern C(r_turb_pdest)
-	.extern C(r_turb_spancount)
-	.extern C(r_turb_turb)
-	.extern C(r_turb_pbase)
-	.extern C(r_turb_sstep)
-	.extern C(r_turb_tstep)
-	.extern	C(r_bmodelactive)
-	.extern	C(d_sdivzstepu)
-	.extern	C(d_tdivzstepu)
-	.extern	C(d_sdivzstepv)
-	.extern	C(d_tdivzstepv)
-	.extern	C(d_sdivzorigin)
-	.extern	C(d_tdivzorigin)
-	.extern	C(sadjust)
-	.extern	C(tadjust)
-	.extern	C(bbextents)
-	.extern	C(bbextentt)
-	.extern	C(cacheblock)
-	.extern	C(d_viewbuffer)
-	.extern	C(cachewidth)
-	.extern	C(d_pzbuffer)
-	.extern	C(d_zrowbytes)
-	.extern	C(d_zwidth)
-	.extern C(d_scantable)
-	.extern C(r_lightptr)
-	.extern C(r_numvblocks)
-	.extern C(prowdestbase)
-	.extern C(pbasesource)
-	.extern C(r_lightwidth)
-	.extern C(lightright)
-	.extern C(lightrightstep)
-	.extern C(lightdeltastep)
-	.extern C(lightdelta)
-	.extern C(lightright)
-	.extern C(lightdelta)
-	.extern C(sourcetstep)
-	.extern C(surfrowbytes)
-	.extern C(lightrightstep)
-	.extern C(lightdeltastep)
-	.extern C(r_sourcemax)
-	.extern C(r_stepback)
-	.extern C(colormap)
-	.extern C(blocksize)
-	.extern C(sourcesstep)
-	.extern C(lightleft)
-	.extern C(blockdivshift)
-	.extern C(blockdivmask)
-	.extern C(lightleftstep)
-	.extern C(r_origin)
-	.extern C(r_ppn)
-	.extern C(r_pup)
-	.extern C(r_pright)
-	.extern C(ycenter)
-	.extern C(xcenter)
-	.extern C(d_vrectbottom_particle)
-	.extern C(d_vrectright_particle)
-	.extern C(d_vrecty)
-	.extern C(d_vrectx)
-	.extern C(d_pix_shift)
-	.extern C(d_pix_min)
-	.extern C(d_pix_max)
-	.extern C(d_y_aspect_shift)
-	.extern C(screenwidth)
-	.extern C(r_leftclipped)
-	.extern C(r_leftenter)
-	.extern C(r_rightclipped)
-	.extern C(r_rightenter)
-	.extern C(modelorg)
-	.extern C(xscale)
-	.extern C(r_refdef)
-	.extern C(yscale)
-	.extern C(r_leftexit)
-	.extern C(r_rightexit)
-	.extern C(r_lastvertvalid)
-	.extern C(cacheoffset)
-	.extern C(newedges)
-	.extern C(removeedges)
-	.extern C(r_pedge)
-	.extern C(r_framecount)
-	.extern C(r_u1)
-	.extern C(r_emitted)
-	.extern C(edge_p)
-	.extern C(surface_p)
-	.extern C(surfaces)
-	.extern C(r_lzi1)
-	.extern C(r_v1)
-	.extern C(r_ceilv1)
-	.extern C(r_nearzi)
-	.extern C(r_nearzionly)
-	.extern C(edge_aftertail)
-	.extern C(edge_tail)
-	.extern C(current_iv)
-	.extern C(edge_head_u_shift20)
-	.extern C(span_p)
-	.extern C(edge_head)
-	.extern C(fv)
-	.extern C(edge_tail_u_shift20)
-	.extern C(r_apverts)
-	.extern C(r_anumverts)
-	.extern C(aliastransform)
-	.extern C(r_avertexnormals)
-	.extern C(r_plightvec)
-	.extern C(r_ambientlight)
-	.extern C(r_shadelight)
-	.extern C(aliasxcenter)
-	.extern C(aliasycenter)
-	.extern C(a_sstepxfrac)
-	.extern C(r_affinetridesc)
-	.extern C(acolormap)
-	.extern C(d_pcolormap)
-	.extern C(r_affinetridesc)
-	.extern C(d_sfrac)
-	.extern C(d_ptex)
-	.extern C(d_pedgespanpackage)
-	.extern C(d_tfrac)
-	.extern C(d_light)
-	.extern C(d_zi)
-	.extern C(d_pdest)
-	.extern C(d_pz)
-	.extern C(d_aspancount)
-	.extern C(erroradjustup)
-	.extern C(errorterm)
-	.extern C(d_xdenom)
-	.extern C(r_p0)
-	.extern C(r_p1)
-	.extern C(r_p2)
-	.extern C(a_tstepxfrac)
-	.extern C(r_sstepx)
-	.extern C(r_tstepx)
-	.extern C(a_ststepxwhole)
-	.extern C(zspantable)
-	.extern C(skintable)
-	.extern C(r_zistepx)
-	.extern C(erroradjustdown)
-	.extern C(d_countextrastep)
-	.extern C(ubasestep)
-	.extern C(a_ststepxwhole)
-	.extern C(a_tstepxfrac)
-	.extern C(r_lstepx)
-	.extern C(a_spans)
-	.extern C(erroradjustdown)
-	.extern C(d_pdestextrastep)
-	.extern C(d_pzextrastep)
-	.extern C(d_sfracextrastep)
-	.extern C(d_ptexextrastep)
-	.extern C(d_countextrastep)
-	.extern C(d_tfracextrastep)
-	.extern C(d_lightextrastep)
-	.extern C(d_ziextrastep)
-	.extern C(d_pdestbasestep)
-	.extern C(d_pzbasestep)
-	.extern C(d_sfracbasestep)
-	.extern C(d_ptexbasestep)
-	.extern C(ubasestep)
-	.extern C(d_tfracbasestep)
-	.extern C(d_lightbasestep)
-	.extern C(d_zibasestep)
-	.extern C(zspantable)
-	.extern C(r_lstepy)
-	.extern C(r_sstepy)
-	.extern C(r_tstepy)
-	.extern C(r_zistepy)
-	.extern C(D_PolysetSetEdgeTable)
-	.extern C(D_RasterizeAliasPolySmooth)
-
-	.extern float_point5
-	.extern Float2ToThe31nd
-	.extern izistep
-	.extern izi
-	.extern FloatMinus2ToThe31nd
-	.extern float_1
-	.extern float_particle_z_clip
-	.extern float_minus_1
-	.extern float_0
-	.extern fp_16
-	.extern fp_64k
-	.extern fp_1m
-	.extern fp_1m_minus_1
-	.extern fp_8 
-	.extern entryvec_table
-	.extern advancetable
-	.extern sstep
-	.extern tstep
-	.extern pspantemp
-	.extern counttemp
-	.extern jumptemp
-	.extern reciprocal_table
-	.extern DP_Count
-	.extern DP_u
-	.extern DP_v
-	.extern DP_32768
-	.extern DP_Color
-	.extern DP_Pix
-	.extern DP_EntryTable
-	.extern	pbase
-	.extern s
-	.extern t
-	.extern sfracf
-	.extern tfracf
-	.extern snext
-	.extern tnext
-	.extern	spancountminus1
-	.extern zi16stepu
-	.extern sdivz16stepu
-	.extern tdivz16stepu
-	.extern	zi8stepu
-	.extern sdivz8stepu
-	.extern tdivz8stepu
-	.extern reciprocal_table_16
-	.extern entryvec_table_16
-	.extern ceil_cw
-	.extern single_cw
-	.extern fp_64kx64k
-	.extern pz
-	.extern spr8entryvec_table
-#endif
-
-	.extern C(snd_scaletable)
-	.extern C(paintbuffer)
-	.extern C(snd_linear_count)
-	.extern C(snd_p)
-	.extern C(snd_vol)
-	.extern C(snd_out)
-	.extern C(vright)
-	.extern C(vup)
-	.extern C(vpn)
-	.extern C(BOPS_Error)
-
-//
-// !!! note that this file must match the corresponding C structures at all
-// times !!!
-//
-
-// plane_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-// !!! if the size of this is changed, the array lookup in SV_HullPointContents
-//     must be changed too !!!
-#define pl_normal	0
-#define pl_dist		12
-#define pl_type		16
-#define pl_signbits	17
-#define pl_pad		18
-#define pl_size		20
-
-// hull_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define	hu_clipnodes		0
-#define	hu_planes			4
-#define	hu_firstclipnode	8
-#define	hu_lastclipnode		12
-#define	hu_clip_mins		16
-#define	hu_clip_maxs		28
-#define hu_size  			40
-
-// dnode_t structure
-// !!! if this is changed, it must be changed in bspfile.h too !!!
-#define	nd_planenum		0
-#define	nd_children		4
-#define	nd_mins			8
-#define	nd_maxs			20
-#define	nd_firstface	32
-#define	nd_numfaces		36
-#define nd_size			40
-
-// sfxcache_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define sfxc_length		0
-#define sfxc_loopstart	4
-#define sfxc_speed		8
-#define sfxc_width		12
-#define sfxc_stereo		16
-#define sfxc_data		20
-
-// channel_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define ch_sfx			0
-#define ch_leftvol		4
-#define ch_rightvol		8
-#define ch_end			12
-#define ch_pos			16
-#define ch_looping		20
-#define ch_entnum		24
-#define ch_entchannel	28
-#define ch_origin		32
-#define ch_dist_mult	44
-#define ch_master_vol	48
-#define ch_size			52
-
-// portable_samplepair_t structure
-// !!! if this is changed, it much be changed in sound.h too !!!
-#define psp_left		0
-#define psp_right		4
-#define psp_size		8
-
-
-//
-// !!! note that this file must match the corresponding C structures at all
-// times !!!
-//
-
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define	NEAR_CLIP	0.01
-
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define	CYCLE	128
-
-// espan_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define espan_t_u    	0
-#define espan_t_v	    4
-#define espan_t_count   8
-#define espan_t_pnext	12
-#define espan_t_size    16
-
-// sspan_t structure
-// !!! if this is changed, it must be changed in d_local.h too !!!
-#define sspan_t_u    	0
-#define sspan_t_v	    4
-#define sspan_t_count   8
-#define sspan_t_size    12
-
-// spanpackage_t structure
-// !!! if this is changed, it must be changed in d_polyset.c too !!!
-#define spanpackage_t_pdest				0
-#define spanpackage_t_pz				4
-#define spanpackage_t_count				8
-#define spanpackage_t_ptex				12
-#define spanpackage_t_sfrac				16
-#define spanpackage_t_tfrac				20
-#define spanpackage_t_light				24
-#define spanpackage_t_zi				28
-#define spanpackage_t_size				32 
-
-// edge_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define et_u			0
-#define et_u_step		4
-#define et_prev			8
-#define et_next			12
-#define et_surfs		16
-#define et_nextremove	20
-#define et_nearzi		24
-#define et_owner		28
-#define et_size			32
-
-// surf_t structure
-// !!! if this is changed, it must be changed in r_shared.h too !!!
-#define SURF_T_SHIFT	6
-#define st_next			0
-#define st_prev			4
-#define st_spans		8
-#define st_key			12
-#define st_last_u		16
-#define st_spanstate	20
-#define st_flags		24
-#define st_data			28
-#define st_entity		32
-#define st_nearzi		36
-#define st_insubmodel	40
-#define st_d_ziorigin	44
-#define st_d_zistepu	48
-#define st_d_zistepv	52
-#define st_pad			56
-#define st_size			64
-
-// clipplane_t structure
-// !!! if this is changed, it must be changed in r_local.h too !!!
-#define cp_normal		0
-#define cp_dist			12
-#define cp_next			16
-#define cp_leftedge		20
-#define cp_rightedge	21
-#define cp_reserved		22
-#define cp_size			24
-
-// medge_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define me_v				0
-#define me_cachededgeoffset	4
-#define me_size				8
-
-// mvertex_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define mv_position		0
-#define mv_size			12
-
-// refdef_t structure
-// !!! if this is changed, it must be changed in render.h too !!!
-#define rd_vrect					0
-#define rd_aliasvrect				20
-#define rd_vrectright				40
-#define rd_vrectbottom				44
-#define rd_aliasvrectright			48
-#define rd_aliasvrectbottom			52
-#define rd_vrectrightedge			56
-#define rd_fvrectx					60
-#define rd_fvrecty					64
-#define rd_fvrectx_adj				68
-#define rd_fvrecty_adj				72
-#define rd_vrect_x_adj_shift20		76
-#define rd_vrectright_adj_shift20	80
-#define rd_fvrectright_adj			84
-#define rd_fvrectbottom_adj			88
-#define rd_fvrectright				92
-#define rd_fvrectbottom				96
-#define rd_horizontalFieldOfView	100
-#define rd_xOrigin					104
-#define rd_yOrigin					108
-#define rd_vieworg					112
-#define rd_viewangles				124
-#define rd_ambientlight				136
-#define rd_size						140
-
-// mtriangle_t structure
-// !!! if this is changed, it must be changed in model.h too !!!
-#define mtri_facesfront		0
-#define mtri_vertindex		4
-#define mtri_size			16	// !!! if this changes, array indexing in !!!
-								// !!! d_polysa.s must be changed to match !!!
-#define mtri_shift			4
-
-#endif
diff --git a/code/unix/quake3.gif b/code/unix/quake3.gif
deleted file mode 100644
index 0e7a01ce..00000000
Binary files a/code/unix/quake3.gif and /dev/null differ
diff --git a/code/unix/quake3.xpm b/code/unix/quake3.xpm
deleted file mode 100644
index c9b736db..00000000
--- a/code/unix/quake3.xpm
+++ /dev/null
@@ -1,161 +0,0 @@
-/* XPM */
-static char *quake3[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32      122            2",
-/* colors */
-".. c #6b1008",
-".# c #6b1810",
-".a c #6b2118",
-".b c #6b2921",
-".c c #6b3129",
-".d c #731810",
-".e c #732118",
-".f c #732921",
-".g c #733129",
-".h c #733931",
-".i c #733939",
-".j c #734239",
-".k c #734a4a",
-".l c #7b1810",
-".m c #7b2118",
-".n c #7b2921",
-".o c #7b4239",
-".p c #7b4a4a",
-".q c #7b524a",
-".r c #7b5252",
-".s c #7b5a5a",
-".t c #7b6363",
-".u c #7b6b6b",
-".v c #7b7373",
-".w c #842110",
-".x c #842118",
-".y c #842921",
-".z c #843129",
-".A c #843931",
-".B c #844239",
-".C c #844a42",
-".D c #84524a",
-".E c #845252",
-".F c #845a5a",
-".G c #846b63",
-".H c #846b6b",
-".I c #847373",
-".J c #847b7b",
-".K c #848484",
-".L c #8c2118",
-".M c #8c2921",
-".N c #8c4239",
-".O c #8c4a42",
-".P c #8c5a52",
-".Q c #8c635a",
-".R c #8c6363",
-".S c #8c6b6b",
-".T c #8c7b7b",
-".U c #8c8484",
-".V c #8c848c",
-".W c #8c8c8c",
-".X c #942921",
-".Y c #944a42",
-".Z c #946363",
-".0 c #946b63",
-".1 c #947373",
-".2 c #947b7b",
-".3 c #948484",
-".4 c #949494",
-".5 c #9c5a5a",
-".6 c #9c6363",
-".7 c #9c6b63",
-".8 c #9c736b",
-".9 c #9c7b73",
-"#. c #9c7b7b",
-"## c #9c8c8c",
-"#a c #9c9494",
-"#b c #9c949c",
-"#c c #9c9c9c",
-"#d c #a55a52",
-"#e c #a5736b",
-"#f c #a57b73",
-"#g c #a57b7b",
-"#h c #a58484",
-"#i c #a58c8c",
-"#j c #a59c9c",
-"#k c #a5a5a5",
-"#l c #ad8c84",
-"#m c #ad8c8c",
-"#n c #ad9494",
-"#o c #ada5a5",
-"#p c #adadad",
-"#q c #b59c9c",
-"#r c #b5a5a5",
-"#s c #b5adad",
-"#t c #b5b5b5",
-"#u c #bda5a5",
-"#v c #bdadad",
-"#w c #bdb5b5",
-"#x c #bdbdbd",
-"#y c #c69c9c",
-"#z c #c6a59c",
-"#A c #c6adad",
-"#B c #c6b5ad",
-"#C c #c6b5b5",
-"#D c #c6bdbd",
-"#E c #c6c6c6",
-"#F c #ceb5b5",
-"#G c #cec6c6",
-"#H c #cecece",
-"#I c #d6b5b5",
-"#J c #d6bdbd",
-"#K c #d6c6bd",
-"#L c #d6cece",
-"#M c #d6d6d6",
-"#N c #decec6",
-"#O c #decece",
-"#P c #ded6ce",
-"#Q c #ded6d6",
-"#R c #dedede",
-"#S c #e7d6d6",
-"#T c #e7dede",
-"#U c #e7e7e7",
-"#V c #efe7e7",
-"#W c #efefe7",
-"#X c #efefef",
-"#Y c #f7efef",
-"#Z c #f7f7ef",
-"#0 c #f7f7f7",
-"#1 c #fff7f7",
-"#2 c #fffff7",
-"#3 c #ffffff",
-/* pixels */
-"#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0#3#2#3#2",
-"#3#2#3#2#3#0#3#2#3#2#3#0#3#2#Z#A#3#2#3#0#3#2#3#2#3#0#3#2#3#2#3#0",
-"#3#2#3#0#3#3#2#3#0#3#3#2#3#3#X#l#U#0#3#2#3#3#0#3#2#3#3#2#3#0#3#3",
-"#3#2#3#2#3#0#3#3#2#3#2#3#0#3#Y#e#G#0#3#2#3#2#3#3#0#3#2#3#2#3#0#3",
-"#3#2#3#0#3#3#2#3#0#3#3#2#3#2#U.6#D#X#3#2#3#3#0#3#2#3#3#0#3#2#3#2",
-"#3#2#3#2#3#0#3#2#3#2#3#3#0#3#Q#d#t#X#3#2#3#2#3#0#3#2#3#3#2#3#0#3",
-"#3#2#3#0#3#3#2#3#0#3#2#3#3#2#H.Y#t#X#2#3#1#3#3#2#3#2#3#0#3#3#2#3",
-"#3#2#3#2#3#0#3#3#2#3#2#3#0#3#G.N#s#X#3#2#3#2#3#3#0#3#2#3#2#3#3#0",
-"#3#2#3#0#3#3#2#3#0#3#3#2#3#2#A.A#o#W#3#0#3#3#2#3#2#3#3#0#3#2#3#2",
-"#3#Z#O#s#R#2#3#2#3#2#3#3#0#3#r.z#k#U#2#3#0#3#2#3#2#T#F#L#X#2#3#0",
-"#O.2#B#V#X#X#3#2#3#3#0#3#2#3#n.m#a#U#2#3#3#0#3#2#3#3#X#C#.#u#2#3",
-".D#Q#M#H#M#Z#3#3#0#3#2#3#2#3#h.x.W#R#3#2#3#2#3#3#0#3#Z#R#D.C#M#0",
-".7.D#n#R#1#3#2#3#2#3#0#3#3#1#f.x.W#R#2#3#1#3#2#3#2#0#X#F.5.o#s#U",
-"#V.R.b.f.C.7#i#y#F#K#N#O#P#X.8.w.K#D#O#N#J#I#z#h.7.C.f.f.P#v#k#R",
-"#3#R#a.s.h.a.#...d.d.m.y.n#A.Z.x.I.D.y.m.e.#...#.a.i.t###a#c#x#Y",
-"#3#1#W#E#k.T.H.k.j.j.h.y.m.1.C.L.v.o.l.a.b.h.k.u.v.J.W#c#t#M#0#3",
-"#3#2#3#0#Z#R#E#t#b#a.W.H.y.t.p.X.J.o.g.v.J.V.W.4#o#x#M#V#0#3#2#3",
-"#3#2#3#2#3#3#1#0#X#U#R#r.n.I.q.M.J.p.g.U#t#M#R#V#0#0#2#3#2#3#2#3",
-"#3#2#3#0#3#2#3#2#3#2#3#N.z.J.E.x.K.D.h.4#T#3#2#3#2#3#2#3#0#3#3#2",
-"#3#2#3#2#3#3#0#3#2#3#2#O.A.K.Q.m.K.F.o#a#U#3#2#3#0#3#3#2#3#2#3#0",
-"#3#2#3#0#3#2#3#3#2#3#0#S.B.U.T.d.4.0.p#c#X#3#2#3#2#3#0#3#3#2#3#2",
-"#3#2#3#2#3#3#0#3#2#3#3#S.O.4.3.e.4#g.r#p#X#3#2#3#0#3#3#2#3#0#3#3",
-"#3#2#3#0#3#2#3#2#3#0#3#T.C#a.4.b.4#h.G#s#Z#3#3#2#3#0#3#2#3#2#3#2",
-"#3#2#3#2#3#3#0#3#2#3#2#U.F#j#o.c.4#m.T#w#0#3#0#3#2#3#3#2#3#0#3#3",
-"#3#2#3#0#3#2#3#3#2#3#0#Y.S#o#t.j#j#q###x#0#3#2#3#3#0#3#2#3#3#2#3",
-"#3#2#3#2#3#3#0#3#2#3#3#0.9#w#G.p#k#r#o#E#0#3#2#3#2#3#0#3#2#3#2#3",
-"#3#2#3#0#3#2#3#2#3#0#3#2#n#E#Q.Q#p#w#x#G#0#3#2#3#3#2#3#0#3#3#2#3",
-"#3#2#3#2#3#3#0#3#2#3#3#2#R#H#T.3#t#R#T#R#2#3#2#3#0#3#3#2#3#2#3#0",
-"#3#2#3#0#3#2#3#3#2#3#0#3#2#U#U#s#D#0#0#W#3#3#0#3#2#3#2#3#3#0#3#2",
-"#3#2#3#2#3#3#0#3#2#3#3#2#3#2#3#X#E#0#3#2#3#0#3#3#2#3#0#3#2#3#3#0",
-"#3#2#3#0#3#2#3#2#3#0#3#2#3#3#0#3#W#2#3#0#3#3#2#3#0#3#3#2#3#0#3#2",
-"#3#2#3#2#3#3#0#3#2#3#3#2#3#0#3#2#3#3#0#3#2#3#2#3#2#3#0#3#3#2#3#2"
-};
diff --git a/code/unix/run-target.sh b/code/unix/run-target.sh
deleted file mode 100644
index 5cdc6318..00000000
--- a/code/unix/run-target.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# for easy use with Anjuta
-cd `dirname $0`/debugi386-glibc
-echo "in $PWD"
-
-# now execute whatever you want
-#./linuxquake3-smp +set fs_basepath /usr/local/games/quake3 +set developer 1 +set r_smp 1 +set r_showsmp 1 +devmap mythology
-
-#gvd ./linuxquake3-smp --pargs +set logfile 2 +set fs_basepath /usr/local/games/quake3 +set developer 1 +set r_smp 0 +set r_showsmp 1 +devmap mythology
-
-./linuxquake3-smp +set logfile 2 +set fs_basepath /usr/local/games/quake3 +set developer 1 +set r_smp 1 +set r_fullscreen 0 +set r_showsmp 1 +devmap mythology &
-gvd ./linuxquake3-smp
diff --git a/code/unix/snapvector.nasm b/code/unix/snapvector.nasm
deleted file mode 100644
index 64a7eefd..00000000
--- a/code/unix/snapvector.nasm
+++ /dev/null
@@ -1,95 +0,0 @@
-;===========================================================================
-;Copyright (C) 1999-2005 Id Software, Inc.
-;
-;This file is part of Quake III Arena source code.
-;
-;Quake III Arena source code is free software; you can redistribute it
-;and/or modify it under the terms of the GNU General Public License as
-;published by the Free Software Foundation; either version 2 of the License,
-;or (at your option) any later version.
-;
-;Quake III Arena source code is distributed in the hope that it will be
-;useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;GNU General Public License for more details.
-;
-;You should have received a copy of the GNU General Public License
-;along with Foobar; if not, write to the Free Software
-;Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-;===========================================================================
-
-;
-; Sys_SnapVector NASM code (Andrew Henderson)
-; See win32/win_shared.c for the Win32 equivalent
-; This code is provided to ensure that the
-;  rounding behavior (and, if necessary, the
-;  precision) of DLL and QVM code are identical
-;  e.g. for network-visible operations.
-; See ftol.nasm for operations on a single float,
-;  as used in compiled VM and DLL code that does
-;  not use this system trap.
-;
-
-
-segment .data
-
-fpucw	dd	0
-cw037F  dd 0x037F   ; Rounding to nearest (even). 
-
-segment .text
-
-; void Sys_SnapVector( float *v )
-global Sys_SnapVector
-Sys_SnapVector:
-	push 	eax
-	push 	ebp
-	mov	ebp, esp
-
-	fnstcw	[fpucw]
-	mov	eax, dword [ebp + 12]
-	fldcw	[cw037F]	
-	fld	dword [eax]
-	fistp	dword [eax]
-	fild	dword [eax]
-	fstp	dword [eax]
-	fld	dword [eax + 4]
-	fistp	dword [eax + 4]
-	fild	dword [eax + 4]
-	fstp	dword [eax + 4]
-	fld	dword [eax + 8]
-	fistp	dword [eax + 8]
-	fild	dword [eax + 8]
-	fstp	dword [eax + 8]
-	fldcw	[fpucw]
-	
-	pop ebp
-	pop eax
-	ret
-	
-; void Sys_SnapVectorCW( float *v, unsigned short int cw )
-global Sys_SnapVectorCW
-Sys_SnapVector_cw:
-	push 	eax
-	push 	ebp
-	mov	ebp, esp
-
-	fnstcw	[fpucw]
-	mov	eax, dword [ebp + 12]
-	fldcw	[ebp + 16]	
-	fld	dword [eax]
-	fistp	dword [eax]
-	fild	dword [eax]
-	fstp	dword [eax]	
-	fld	dword [eax + 4]
-	fistp	dword [eax + 4]
-	fild	dword [eax + 4]
-	fstp	dword [eax + 4]
-	fld	dword [eax + 8]
-	fistp	dword [eax + 8]
-	fild	dword [eax + 8]
-	fstp	dword [eax + 8]
-	fldcw	[fpucw]
-	
-	pop ebp
-	pop eax
-	ret
\ No newline at end of file
diff --git a/code/unix/snd_mixa.s b/code/unix/snd_mixa.s
deleted file mode 100644
index 4c6be5b7..00000000
--- a/code/unix/snd_mixa.s
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//
-// snd_mixa.s
-// x86 assembly-language sound code
-//
-
-#include "qasm.h"
-
-#if	id386
-
-	.text
-
-#if 0 
-//----------------------------------------------------------------------
-// 8-bit sound-mixing code
-//----------------------------------------------------------------------
-
-#define ch		4+16
-#define sc		8+16
-#define count	12+16
-
-.globl C(S_PaintChannelFrom8)
-C(S_PaintChannelFrom8):
-	pushl	%esi				// preserve register variables
-	pushl	%edi
-	pushl	%ebx
-	pushl	%ebp
-
-//	int 	data;
-//	short	*lscale, *rscale;
-//	unsigned char *sfx;
-//	int		i;
-
-	movl	ch(%esp),%ebx
-	movl	sc(%esp),%esi
-
-//	if (ch->leftvol > 255)
-//		ch->leftvol = 255;
-//	if (ch->rightvol > 255)
-//		ch->rightvol = 255;
-	movl	ch_leftvol(%ebx),%eax
-	movl	ch_rightvol(%ebx),%edx
-	cmpl	$255,%eax
-	jna		LLeftSet
-	movl	$255,%eax
-LLeftSet:
-	cmpl	$255,%edx
-	jna		LRightSet
-	movl	$255,%edx
-LRightSet:
-
-//	lscale = snd_scaletable[ch->leftvol >> 3];
-//	rscale = snd_scaletable[ch->rightvol >> 3];
-//	sfx = (signed char *)sc->data + ch->pos;
-//	ch->pos += count;
-	andl	$0xF8,%eax
-	addl	$20,%esi
-	movl	(%esi),%esi
-	andl	$0xF8,%edx
-	movl	ch_pos(%ebx),%edi
-	movl	count(%esp),%ecx
-	addl	%edi,%esi
-	shll	$7,%eax
-	addl	%ecx,%edi
-	shll	$7,%edx
-	movl	%edi,ch_pos(%ebx)
-	addl	$(C(snd_scaletable)),%eax
-	addl	$(C(snd_scaletable)),%edx
-	subl	%ebx,%ebx
-	movb	-1(%esi,%ecx,1),%bl
-
-	testl	$1,%ecx
-	jz		LMix8Loop
-
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	addl	C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size),%ebp
-	movl	%edi,C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size)
-	movb	-2(%esi,%ecx,1),%bl
-
-	decl	%ecx
-	jz		LDone
-
-//	for (i=0 ; i<count ; i++)
-//	{
-LMix8Loop:
-
-//		data = sfx[i];
-//		paintbuffer[i].left += lscale[data];
-//		paintbuffer[i].right += rscale[data];
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	addl	C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size),%ebp
-	movb	-2(%esi,%ecx,1),%bl
-	movl	%edi,C(paintbuffer)+psp_left-psp_size(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size(,%ecx,psp_size)
-
-	movl	(%eax,%ebx,4),%edi
-	movl	(%edx,%ebx,4),%ebp
-	movb	-3(%esi,%ecx,1),%bl
-	addl	C(paintbuffer)+psp_left-psp_size*2(,%ecx,psp_size),%edi
-	addl	C(paintbuffer)+psp_right-psp_size*2(,%ecx,psp_size),%ebp
-	movl	%edi,C(paintbuffer)+psp_left-psp_size*2(,%ecx,psp_size)
-	movl	%ebp,C(paintbuffer)+psp_right-psp_size*2(,%ecx,psp_size)
-
-//	}
-	subl	$2,%ecx
-	jnz		LMix8Loop
-
-LDone:
-	popl	%ebp
-	popl	%ebx
-	popl	%edi
-	popl	%esi
-
-	ret
-
-
-#endif
-
-//----------------------------------------------------------------------
-// Transfer of stereo buffer to 16-bit DMA buffer code
-//----------------------------------------------------------------------
-
-.globl C(S_WriteLinearBlastStereo16)
-C(S_WriteLinearBlastStereo16):
-	pushl	%edi
-	pushl	%ebx
-
-//	int		i;
-//	int		val;
-	movl	C(snd_linear_count),%ecx
-	movl	C(snd_p),%ebx
-	movl	C(snd_out),%edi
-
-//	for (i=0 ; i<snd_linear_count ; i+=2)
-//	{
-LWLBLoopTop:
-
-//		val = (snd_p[i]*snd_vol)>>8;
-//		if (val > 0x7fff)
-//			snd_out[i] = 0x7fff;
-//		else if (val < (short)0x8000)
-//			snd_out[i] = (short)0x8000;
-//		else
-//			snd_out[i] = val;
-	movl	-8(%ebx,%ecx,4),%eax
-	sarl	$8,%eax
-	cmpl	$0x7FFF,%eax
-	jg		LClampHigh
-	cmpl	$0xFFFF8000,%eax
-	jnl		LClampDone
-	movl	$0xFFFF8000,%eax
-	jmp		LClampDone
-LClampHigh:
-	movl	$0x7FFF,%eax
-LClampDone:
-
-//		val = (snd_p[i+1]*snd_vol)>>8;
-//		if (val > 0x7fff)
-//			snd_out[i+1] = 0x7fff;
-//		else if (val < (short)0x8000)
-//			snd_out[i+1] = (short)0x8000;
-//		else
-//			snd_out[i+1] = val;
-	movl	-4(%ebx,%ecx,4),%edx
-	sarl	$8,%edx
-	cmpl	$0x7FFF,%edx
-	jg		LClampHigh2
-	cmpl	$0xFFFF8000,%edx
-	jnl		LClampDone2
-	movl	$0xFFFF8000,%edx
-	jmp		LClampDone2
-LClampHigh2:
-	movl	$0x7FFF,%edx
-LClampDone2:
-	shll	$16,%edx
-	andl	$0xFFFF,%eax
-	orl		%eax,%edx
-	movl	%edx,-4(%edi,%ecx,2)
-
-//	}
-	subl	$2,%ecx
-	jnz		LWLBLoopTop
-
-//	snd_p += snd_linear_count;
-
-	popl	%ebx
-	popl	%edi
-
-	ret
-
-#endif	// id386
-
diff --git a/code/unix/sys_dosa.s b/code/unix/sys_dosa.s
deleted file mode 100644
index 150f6669..00000000
--- a/code/unix/sys_dosa.s
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//
-// sys_dosa.s
-// x86 assembly-language DOS-dependent routines.
-
-#include "qasm.h"
-
-
-	.data
-
-	.align	4
-fpenv:
-	.long	0, 0, 0, 0, 0, 0, 0, 0
-
-	.text
-
-.globl C(MaskExceptions)
-C(MaskExceptions):
-	fnstenv	fpenv
-	orl		$0x3F,fpenv
-	fldenv	fpenv
-
-	ret
-
-#if 0
-.globl C(unmaskexceptions)
-C(unmaskexceptions):
-	fnstenv	fpenv
-	andl		$0xFFFFFFE0,fpenv
-	fldenv	fpenv
-
-	ret
-#endif
-
-	.data
-
-	.align	4
-.globl	ceil_cw, single_cw, full_cw, cw, pushed_cw
-ceil_cw:	.long	0
-single_cw:	.long	0
-full_cw:	.long	0
-cw:			.long	0
-pushed_cw:	.long	0
-
-	.text
-
-.globl C(Sys_LowFPPrecision)
-C(Sys_LowFPPrecision):
-	fldcw	single_cw
-
-	ret
-
-.globl C(Sys_HighFPPrecision)
-C(Sys_HighFPPrecision):
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PushFPCW_SetHigh)
-C(Sys_PushFPCW_SetHigh):
-	fnstcw	pushed_cw
-	fldcw	full_cw
-
-	ret
-
-.globl C(Sys_PopFPCW)
-C(Sys_PopFPCW):
-	fldcw	pushed_cw
-
-	ret
-
-.globl C(Sys_SetFPCW)
-C(Sys_SetFPCW):
-	fnstcw	cw
-	movl	cw,%eax
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x03,%ah	// round mode, 64-bit precision
-#endif
-	movl	%eax,full_cw
-
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x0C,%ah	// chop mode, single precision
-#endif
-	movl	%eax,single_cw
-
-#if	id386
-	andb	$0xF0,%ah
-	orb		$0x08,%ah	// ceil mode, single precision
-#endif
-	movl	%eax,ceil_cw
-
-	ret
-
diff --git a/code/unix/unix_glw.h b/code/unix/unix_glw.h
deleted file mode 100644
index e7cbb7a3..00000000
--- a/code/unix/unix_glw.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#if !( defined __linux__ || defined __FreeBSD__ )
-#error You should include this file only on Linux/FreeBSD platforms
-#endif
-
-#ifndef __GLW_LINUX_H__
-#define __GLW_LINUX_H__
-
-typedef struct
-{
-	void *OpenGLLib; // instance of OpenGL library
-
-	FILE *log_fp;
-} glwstate_t;
-
-extern glwstate_t glw_state;
-
-#endif
diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c
deleted file mode 100644
index a9a0c0e0..00000000
--- a/code/unix/unix_main.c
+++ /dev/null
@@ -1,1662 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <errno.h>
-#ifdef __linux__ // rb010123
-  #include <mntent.h>
-#endif
-#include <dlfcn.h>
-
-#ifdef __linux__
-  #include <fpu_control.h> // bk001213 - force dumps on divide by zero
-#endif
-
-// FIXME TTimo should we gard this? most *nix system should comply?
-#include <termios.h>
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-#include "../renderer/tr_public.h"
-#include "../win32/win_localization.h"
-
-#include "linux_local.h" // bk001204
-
-unsigned  sys_frame_time;
-
-uid_t saved_euid;
-qboolean stdin_active = qtrue;
-
-// =============================================================
-// tty console variables
-// =============================================================
-
-// enable/disabled tty input mode
-// NOTE TTimo this is used during startup, cannot be changed during run
-static cvar_t *ttycon = NULL;
-// general flag to tell about tty console mode
-static qboolean ttycon_on = qfalse;
-// when printing general stuff to stdout stderr (Sys_Printf)
-//   we need to disable the tty console stuff
-// this increments so we can recursively disable
-static int ttycon_hide = 0;
-// some key codes that the terminal may be using
-// TTimo NOTE: I'm not sure how relevant this is
-static int tty_erase;
-static int tty_eof;
-
-static struct termios tty_tc;
-
-#define	MAX_EDIT_LINE	256
-typedef struct {
-	int		cursor;
-	int		scroll;
-	int		widthInChars;
-	char	buffer[MAX_EDIT_LINE];
-} field_t;
-
-static field_t tty_con;
-
-// history
-// NOTE TTimo this is a bit duplicate of the graphical console history
-//   but it's safer and faster to write our own here
-#define TTY_HISTORY 32
-static field_t ttyEditLines[TTY_HISTORY];
-static int hist_current = -1, hist_count = 0;
-static void* game_library = NULL;
-static void* cgame_library = NULL;
-
-// =======================================================================
-// General routines
-// =======================================================================
-
-// bk001207 
-#define MEM_THRESHOLD 96*1024*1024
-
-/*
-==================
-Sys_LowPhysicalMemory()
-==================
-*/
-qboolean Sys_LowPhysicalMemory() {
-  //MEMORYSTATUS stat;
-  //GlobalMemoryStatus (&stat);
-  //return (stat.dwTotalPhys <= MEM_THRESHOLD) ? qtrue : qfalse;
-  return qfalse; // bk001207 - FIXME
-}
-
-/*
-==================
-Sys_FunctionCmp
-==================
-*/
-int Sys_FunctionCmp(void *f1, void *f2) {
-  return qtrue;
-}
-
-/*
-==================
-Sys_FunctionCheckSum
-==================
-*/
-int Sys_FunctionCheckSum(void *f1) {
-  return 0;
-}
-
-/*
-==================
-Sys_MonkeyShouldBeSpanked
-==================
-*/
-int Sys_MonkeyShouldBeSpanked( void ) {
-  return 0;
-}
-
-void Sys_BeginProfiling( void ) {
-}
-
-/*
-=================
-Sys_In_Restart_f
-
-Restart the input subsystem
-=================
-*/
-void Sys_In_Restart_f( void ) 
-{
-  IN_Shutdown();
-  IN_Init();
-}
-
-// =============================================================
-// tty console routines
-// NOTE: if the user is editing a line when something gets printed to the early console then it won't look good
-//   so we provide tty_Clear and tty_Show to be called before and after a stdout or stderr output
-// =============================================================
-
-// flush stdin, I suspect some terminals are sending a LOT of shit
-// FIXME TTimo relevant?
-void tty_FlushIn()
-{
-  char key;
-  while (read(0, &key, 1)!=-1);
-}
-
-// do a backspace
-// TTimo NOTE: it seems on some terminals just sending '\b' is not enough
-//   so for now, in any case we send "\b \b" .. yeah well ..
-//   (there may be a way to find out if '\b' alone would work though)
-void tty_Back()
-{
-  char key;
-  key = '\b';
-  write(1, &key, 1);
-  key = ' ';
-  write(1, &key, 1);
-  key = '\b';
-  write(1, &key, 1);
-}
-
-// clear the display of the line currently edited
-// bring cursor back to beginning of line
-void tty_Hide()
-{
-  int i;
-  assert(ttycon_on);
-  if (ttycon_hide)
-  {
-    ttycon_hide++;
-    return;
-  }
-  if (tty_con.cursor>0)
-  {
-    for (i=0; i<tty_con.cursor; i++)
-    {
-      tty_Back();
-    }
-  }
-  ttycon_hide++;
-}
-
-// show the current line
-// FIXME TTimo need to position the cursor if needed??
-void tty_Show()
-{
-  int i;
-  assert(ttycon_on);
-  assert(ttycon_hide>0);
-  ttycon_hide--;
-  if (ttycon_hide == 0)
-  {
-    if (tty_con.cursor)
-    {
-      for (i=0; i<tty_con.cursor; i++)
-      {
-        write(1, tty_con.buffer+i, 1);
-      }
-    }
-  }
-}
-
-// never exit without calling this, or your terminal will be left in a pretty bad state
-void Sys_ConsoleInputShutdown()
-{
-  if (ttycon_on)
-  {
-    Com_Printf("Shutdown tty console\n");
-    tcsetattr (0, TCSADRAIN, &tty_tc);
-  }
-}
-
-void Hist_Add(field_t *field)
-{
-  int i;
-  assert(hist_count <= TTY_HISTORY);
-  assert(hist_count >= 0);
-  assert(hist_current >= -1);
-  assert(hist_current <= hist_count);
-  // make some room
-  for (i=TTY_HISTORY-1; i>0; i--)
-  {
-    ttyEditLines[i] = ttyEditLines[i-1];
-  }
-  ttyEditLines[0] = *field;
-  if (hist_count<TTY_HISTORY)
-  {
-    hist_count++;
-  }
-  hist_current = -1; // re-init
-}
-
-field_t *Hist_Prev()
-{
-  int hist_prev;
-  assert(hist_count <= TTY_HISTORY);
-  assert(hist_count >= 0);
-  assert(hist_current >= -1);
-  assert(hist_current <= hist_count);
-  hist_prev = hist_current + 1;
-  if (hist_prev >= hist_count)
-  {
-    return NULL;
-  }
-  hist_current++;
-  return &(ttyEditLines[hist_current]);
-}
-
-field_t *Hist_Next()
-{
-  assert(hist_count <= TTY_HISTORY);
-  assert(hist_count >= 0);
-  assert(hist_current >= -1);
-  assert(hist_current <= hist_count);
-  if (hist_current >= 0)
-  {
-    hist_current--;
-  }
-  if (hist_current == -1)
-  {
-    return NULL;
-  }
-  return &(ttyEditLines[hist_current]);
-}
-
-// =============================================================
-// general sys routines
-// =============================================================
-
-#if 0
-// NOTE TTimo this is not used .. looks interesting though? protection against buffer overflow kind of stuff?
-void Sys_Printf (char *fmt, ...)
-{
-  va_list   argptr;
-  char    text[1024];
-  unsigned char   *p;
-
-  va_start (argptr,fmt);
-  vsprintf (text,fmt,argptr);
-  va_end (argptr);
-
-  if (strlen(text) > sizeof(text))
-    Sys_Error("memory overwrite in Sys_Printf");
-
-  for (p = (unsigned char *)text; *p; p++)
-  {
-    *p &= 0x7f;
-    if ((*p > 128 || *p < 32) && *p != 10 && *p != 13 && *p != 9)
-      printf("[%02x]", *p);
-    else
-      putc(*p, stdout);
-  }
-}
-#endif
-
-// single exit point (regular exit or in case of signal fault)
-void Sys_Exit( int ex ) {
-  Sys_ConsoleInputShutdown();
-
-#ifdef NDEBUG // regular behavior
-
-  // We can't do this 
-  //  as long as GL DLL's keep installing with atexit...
-  //exit(ex);
-  _exit(ex);
-#else
-
-  // Give me a backtrace on error exits.
-  assert( ex == 0 );
-  exit(ex);
-#endif
-}
-
-
-void Sys_Quit (void) {
-  CL_Shutdown ();
-  fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-  Sys_Exit(0);
-}
-
-void Sys_Init(void)
-{
-  Cmd_AddCommand ("in_restart", Sys_In_Restart_f);
-
-#if defined __linux__
-#if defined __i386__
-  Cvar_Set( "arch", "linux i386" );
-#elif defined __alpha__
-  Cvar_Set( "arch", "linux alpha" );
-#elif defined __sparc__
-  Cvar_Set( "arch", "linux sparc" );
-#elif defined __FreeBSD__
-
-#if defined __i386__ // FreeBSD
-  Cvar_Set( "arch", "freebsd i386" );
-#elif defined __alpha__
-  Cvar_Set( "arch", "freebsd alpha" );
-#else
-  Cvar_Set( "arch", "freebsd unknown" );
-#endif // FreeBSD
-
-#else
-  Cvar_Set( "arch", "linux unknown" );
-#endif
-#elif defined __sun__
-#if defined __i386__
-  Cvar_Set( "arch", "solaris x86" );
-#elif defined __sparc__
-  Cvar_Set( "arch", "solaris sparc" );
-#else
-  Cvar_Set( "arch", "solaris unknown" );
-#endif
-#elif defined __sgi__
-#if defined __mips__
-  Cvar_Set( "arch", "sgi mips" );
-#else
-  Cvar_Set( "arch", "sgi unknown" );
-#endif
-#else
-  Cvar_Set( "arch", "unknown" );
-#endif
-
-  Cvar_Set( "username", Sys_GetCurrentUser() );
-
-  IN_Init();
-
-}
-
-void  Sys_Error( const char *error, ...)
-{ 
-  va_list     argptr;
-  char        string[1024];
-
-  // change stdin to non blocking
-  // NOTE TTimo not sure how well that goes with tty console mode
-  fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY);
-
-  // don't bother do a show on this one heh
-  if (ttycon_on)
-  {
-    tty_Hide();
-  }
-
-  CL_Shutdown ();
-
-  va_start (argptr,error);
-  vsprintf (string,error,argptr);
-  va_end (argptr);
-  fprintf(stderr, "Sys_Error: %s\n", string);
-
-  Sys_Exit( 1 ); // bk010104 - use single exit point.
-} 
-
-void Sys_Warn (char *warning, ...)
-{ 
-  va_list     argptr;
-  char        string[1024];
-
-  va_start (argptr,warning);
-  vsprintf (string,warning,argptr);
-  va_end (argptr);
-
-  if (ttycon_on)
-  {
-    tty_Hide();
-  }
-
-  fprintf(stderr, "Warning: %s", string);
-
-  if (ttycon_on)
-  {
-    tty_Show();
-  }
-} 
-
-/*
-============
-Sys_FileTime
-
-returns -1 if not present
-============
-*/
-int Sys_FileTime (char *path)
-{
-  struct  stat  buf;
-
-  if (stat (path,&buf) == -1)
-    return -1;
-
-  return buf.st_mtime;
-}
-
-void floating_point_exception_handler(int whatever)
-{
-  signal(SIGFPE, floating_point_exception_handler);
-}
-
-/*
-===========================================
-command line completion
-===========================================
-*/
-
-/*
-==================
-Field_Clear
-==================
-*/
-void Field_Clear(field_t* edit) {
-    memset(edit->buffer, 0, MAX_EDIT_LINE);
-    edit->cursor = 0;
-    edit->scroll = 0;
-}
-
-static const char* completionString;
-static char shortestMatch[MAX_TOKEN_CHARS];
-static int	matchCount;
-// field we are working on, passed to Field_CompleteCommand (&g_consoleCommand for instance)
-static field_t* completionField;
-
-/*
-===============
-FindMatches
-
-===============
-*/
-static void FindMatches(const char* s) {
-    int		i;
-
-    if (Q_stricmpn(s, completionString, strlen(completionString))) {
-        return;
-    }
-    matchCount++;
-    if (matchCount == 1) {
-        Q_strncpyz(shortestMatch, s, sizeof(shortestMatch));
-        return;
-    }
-
-    // cut shortestMatch to the amount common with s
-    for (i = 0; s[i]; i++) {
-        if (tolower(shortestMatch[i]) != tolower(s[i])) {
-            shortestMatch[i] = 0;
-        }
-    }
-}
-
-/*
-===============
-PrintMatches
-
-===============
-*/
-static void PrintMatches(const char* s) {
-    if (!Q_stricmpn(s, shortestMatch, strlen(shortestMatch))) {
-        Com_Printf("    %s\n", s);
-    }
-}
-
-static void keyConcatArgs(void) {
-    int		i;
-    char* arg;
-
-    for (i = 1; i < Cmd_Argc(); i++) {
-        Q_strcat(completionField->buffer, sizeof(completionField->buffer), " ");
-        arg = Cmd_Argv(i);
-        while (*arg) {
-            if (*arg == ' ') {
-                Q_strcat(completionField->buffer, sizeof(completionField->buffer), "\"");
-                break;
-            }
-            arg++;
-        }
-        Q_strcat(completionField->buffer, sizeof(completionField->buffer), Cmd_Argv(i));
-        if (*arg == ' ') {
-            Q_strcat(completionField->buffer, sizeof(completionField->buffer), "\"");
-        }
-    }
-}
-
-static void ConcatRemaining(const char* src, const char* start) {
-    char* str;
-
-    str = strstr(src, start);
-    if (!str) {
-        keyConcatArgs();
-        return;
-    }
-
-    str += strlen(start);
-    Q_strcat(completionField->buffer, sizeof(completionField->buffer), str);
-}
-
-/*
-===============
-Field_CompleteCommand
-
-perform Tab expansion
-NOTE TTimo this was originally client code only
-  moved to common code when writing tty console for *nix dedicated server
-===============
-*/
-void Field_CompleteCommand(field_t* field) {
-    field_t		temp;
-
-    completionField = field;
-
-    // only look at the first token for completion purposes
-    Cmd_TokenizeString(completionField->buffer);
-
-    completionString = Cmd_Argv(0);
-    if (completionString[0] == '\\' || completionString[0] == '/') {
-        completionString++;
-    }
-    matchCount = 0;
-    shortestMatch[0] = 0;
-
-    if (strlen(completionString) == 0) {
-        return;
-    }
-
-    Cmd_CommandCompletion(FindMatches);
-    Cvar_CommandCompletion(FindMatches);
-
-    if (matchCount == 0) {
-        return;	// no matches
-    }
-
-    Com_Memcpy(&temp, completionField, sizeof(field_t));
-
-    if (matchCount == 1) {
-        Com_sprintf(completionField->buffer, sizeof(completionField->buffer), "\\%s", shortestMatch);
-        if (Cmd_Argc() == 1) {
-            Q_strcat(completionField->buffer, sizeof(completionField->buffer), " ");
-        }
-        else {
-            ConcatRemaining(temp.buffer, completionString);
-        }
-        completionField->cursor = strlen(completionField->buffer);
-        return;
-    }
-
-    // multiple matches, complete to shortest
-    Com_sprintf(completionField->buffer, sizeof(completionField->buffer), "\\%s", shortestMatch);
-    completionField->cursor = strlen(completionField->buffer);
-    ConcatRemaining(temp.buffer, completionString);
-
-    Com_Printf("]%s\n", completionField->buffer);
-
-    // run through again, printing matches
-    Cmd_CommandCompletion(PrintMatches);
-    Cvar_CommandCompletion(PrintMatches);
-}
-
-
-// initialize the console input (tty mode if wanted and possible)
-void Sys_ConsoleInputInit()
-{
-  struct termios tc;
-
-  // TTimo 
-  // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=390
-  // ttycon 0 or 1, if the process is backgrounded (running non interactively)
-  // then SIGTTIN or SIGTOU is emitted, if not catched, turns into a SIGSTP
-  signal(SIGTTIN, SIG_IGN);
-  signal(SIGTTOU, SIG_IGN);
-
-  // FIXME TTimo initialize this in Sys_Init or something?
-  ttycon = Cvar_Get("ttycon", "1", 0);
-  if (ttycon && ttycon->value)
-  {
-    if (isatty(STDIN_FILENO)!=1)
-    {
-      Com_Printf("stdin is not a tty, tty console mode failed\n");
-      Cvar_Set("ttycon", "0");
-      ttycon_on = qfalse;
-      return;
-    }
-    Com_Printf("Started tty console (use +set ttycon 0 to disable)\n");
-    Field_Clear(&tty_con);
-    tcgetattr (0, &tty_tc);
-    tty_erase = tty_tc.c_cc[VERASE];
-    tty_eof = tty_tc.c_cc[VEOF];
-    tc = tty_tc;
-    /*
-     ECHO: don't echo input characters
-     ICANON: enable canonical mode.  This  enables  the  special
-              characters  EOF,  EOL,  EOL2, ERASE, KILL, REPRINT,
-              STATUS, and WERASE, and buffers by lines.
-     ISIG: when any of the characters  INTR,  QUIT,  SUSP,  or
-              DSUSP are received, generate the corresponding sig­
-              nal
-    */              
-    tc.c_lflag &= ~(ECHO | ICANON);
-    /*
-     ISTRIP strip off bit 8
-     INPCK enable input parity checking
-     */
-    tc.c_iflag &= ~(ISTRIP | INPCK);
-    tc.c_cc[VMIN] = 1;
-    tc.c_cc[VTIME] = 0;
-    tcsetattr (0, TCSADRAIN, &tc);    
-    ttycon_on = qtrue;
-  } else
-    ttycon_on = qfalse;
-}
-
-char *Sys_ConsoleInput(void)
-{
-  // we use this when sending back commands
-  static char text[256];
-  int i;
-  int avail;
-  char key;
-  field_t *history;
-
-  if (ttycon && ttycon->value)
-  {
-    avail = read(0, &key, 1);
-    if (avail != -1)
-    {
-      // we have something
-      // backspace?
-      // NOTE TTimo testing a lot of values .. seems it's the only way to get it to work everywhere
-      if ((key == tty_erase) || (key == 127) || (key == 8))
-      {
-        if (tty_con.cursor > 0)
-        {
-          tty_con.cursor--;
-          tty_con.buffer[tty_con.cursor] = '\0';
-          tty_Back();
-        }
-        return NULL;
-      }
-      // check if this is a control char
-      if ((key) && (key) < ' ')
-      {
-        if (key == '\n')
-        {
-          // push it in history
-          Hist_Add(&tty_con);
-          strcpy(text, tty_con.buffer);
-          Field_Clear(&tty_con);
-          key = '\n';
-          write(1, &key, 1);
-          return text;
-        }
-        if (key == '\t')
-        {
-          tty_Hide();
-          Field_CompleteCommand( &tty_con );
-          // Field_CompleteCommand does weird things to the string, do a cleanup
-          //   it adds a '\' at the beginning of the string
-          //   cursor doesn't reflect actual length of the string that's sent back
-          tty_con.cursor = strlen(tty_con.buffer);
-          if (tty_con.cursor>0)
-          {
-            if (tty_con.buffer[0] == '\\')
-            {
-              for (i=0; i<=tty_con.cursor; i++)
-              {
-                tty_con.buffer[i] = tty_con.buffer[i+1];
-              }
-              tty_con.cursor--;
-            }
-          }
-          tty_Show();
-          return NULL;
-        }
-        avail = read(0, &key, 1);
-        if (avail != -1)
-        {
-          // VT 100 keys
-          if (key == '[' || key == 'O')
-          {
-            avail = read(0, &key, 1);
-            if (avail != -1)
-            {
-              switch (key)
-              {
-              case 'A':
-                history = Hist_Prev();
-                if (history)
-                {
-                  tty_Hide();
-                  tty_con = *history;
-                  tty_Show();
-                }
-                tty_FlushIn();
-                return NULL;
-                break;
-              case 'B':
-                history = Hist_Next();
-                tty_Hide();
-                if (history)
-                {
-                  tty_con = *history;
-                } else
-                {
-                  Field_Clear(&tty_con);
-                }
-                tty_Show();
-                tty_FlushIn();
-                return NULL;
-                break;
-              case 'C':
-                return NULL;
-              case 'D':
-                return NULL;
-              }
-            }
-          }
-        }
-        Com_DPrintf("droping ISCTL sequence: %d, tty_erase: %d\n", key, tty_erase);
-        tty_FlushIn();
-        return NULL;
-      }
-      // push regular character
-      tty_con.buffer[tty_con.cursor] = key;
-      tty_con.cursor++;
-      // print the current line (this is differential)
-      write(1, &key, 1);
-    }
-    return NULL;
-  } else
-  {
-    int     len;
-    fd_set  fdset;
-    struct timeval timeout;
-
-    if (!com_dedicated || !com_dedicated->value)
-      return NULL;
-
-    if (!stdin_active)
-      return NULL;
-
-    FD_ZERO(&fdset);
-    FD_SET(0, &fdset); // stdin
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 0;
-    if (select (1, &fdset, NULL, NULL, &timeout) == -1 || !FD_ISSET(0, &fdset))
-    {
-      return NULL;
-    }
-
-    len = read (0, text, sizeof(text));
-    if (len == 0)
-    { // eof!
-      stdin_active = qfalse;
-      return NULL;
-    }
-
-    if (len < 1)
-      return NULL;
-    text[len-1] = 0;    // rip off the /n and terminate
-
-    return text;
-  }
-}
-
-/*****************************************************************************/
-
-/*
-=================
-Sys_UnloadDll
-
-=================
-*/
-void Sys_UnloadDll( void *dllHandle ) {
-  // bk001206 - verbose error reporting
-  const char* err; // rb010123 - now const
-  if ( !dllHandle )
-  {
-    Com_Printf("Sys_UnloadDll(NULL)\n");
-    return;
-  }
-  dlclose( dllHandle );
-  err = dlerror();
-  if ( err != NULL )
-    Com_Printf ( "Sys_UnloadGame failed on dlclose: \"%s\"!\n", err );
-}
-
-/*
-=================
-Sys_UnloadGame
-=================
-*/
-void Sys_UnloadGame(void)
-{
-    Com_Printf("------ Unloading Game ------\n");
-
-    if (game_library) {
-        dlclose(game_library);
-    }
-
-    game_library = NULL;
-}
-
-/*
-=================
-Sys_GetGameAPI
-=================
-*/
-void* Sys_GetGameAPI(void* parms)
-{
-    void* (*GetGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-    const char* fn;
-    const char* gamename = "game" ARCH_STRING DLL_SUFFIX DLL_EXT;
-
-    if (game_library)
-        Com_Error(ERR_FATAL, "Sys_GetGameAPI without calling Sys_UnloadGame");
-
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-
-    fn = FS_BuildOSPath(basepath, gamedir, gamename);
-
-#define Q_RTLD    RTLD_NOW
-    game_library = dlopen(fn, Q_RTLD);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            game_library = dlopen(fn, Q_RTLD);
-        }
-    }
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            game_library = dlopen(fn, Q_RTLD);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        game_library = dlopen(fn, Q_RTLD);
-    }
-
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            game_library = dlopen(fn, Q_RTLD);
-        }
-    }
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            game_library = dlopen(fn, Q_RTLD);
-        }
-    }
-
-    //Still couldn't find it.
-    if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-        Com_Error(ERR_FATAL, "Couldn't load game");
-    }
-
-    Com_Printf("Sys_GetGameAPI(%s): succeeded ...\n", fn);
-    GetGameAPI = (void* (*)(void*))dlsym(game_library, "GetGameAPI");
-
-    if (!GetGameAPI)
-    {
-        Sys_UnloadGame();
-        return NULL;
-    }
-
-    return GetGameAPI(parms);
-}
-
-/*
-=================
-Sys_UnloadCGame
-=================
-*/
-void Sys_UnloadCGame(void)
-{
-    Com_Printf("------ Unloading ClientGame ------\n");
-
-    if (cgame_library) {
-        dlclose(cgame_library);
-    }
-
-    cgame_library = NULL;
-}
-
-/*
-=================
-Sys_GetCGameAPI
-=================
-*/
-void* Sys_GetCGameAPI(void* parms)
-{
-    void* (*GetCGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-    const char* fn;
-    const char* gamename = "cgame" ARCH_STRING DLL_SUFFIX DLL_EXT;
-
-    if (cgame_library)
-        Com_Error(ERR_FATAL, "Sys_GetCGameAPI without calling Sys_UnloadCGame");
-
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-
-    fn = FS_BuildOSPath(basepath, gamedir, gamename);
-
-#define Q_RTLD    RTLD_NOW
-    cgame_library = dlopen(fn, Q_RTLD);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            cgame_library = dlopen(fn, Q_RTLD);
-        }
-    }
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            cgame_library = dlopen(fn, Q_RTLD);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        cgame_library = dlopen(fn, Q_RTLD);
-    }
-
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            cgame_library = dlopen(fn, Q_RTLD);
-        }
-    }
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            cgame_library = dlopen(fn, Q_RTLD);
-        }
-    }
-
-    //Still couldn't find it.
-    if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%s\"\n", fn, dlerror());
-        Com_Error(ERR_FATAL, "Couldn't load game");
-    }
-
-    Com_Printf("Sys_GetCGameAPI(%s): succeeded ...\n", fn);
-    GetCGameAPI = (void* (*)(void*))dlsym(cgame_library, "GetCGameAPI");
-
-    if (!GetCGameAPI)
-    {
-        Sys_UnloadCGame();
-        return NULL;
-    }
-
-    return GetCGameAPI(parms);
-}
-
-/*
-========================================================================
-
-BACKGROUND FILE STREAMING
-
-========================================================================
-*/
-
-#if 1
-
-void Sys_InitStreamThread( void ) {
-}
-
-void Sys_ShutdownStreamThread( void ) {
-}
-
-void Sys_BeginStreamedFile( fileHandle_t f, int readAhead ) {
-}
-
-void Sys_EndStreamedFile( fileHandle_t f ) {
-}
-
-int Sys_StreamedRead( void *buffer, int size, int count, fileHandle_t f ) {
-  return FS_Read( buffer, size * count, f );
-}
-
-void Sys_StreamSeek( fileHandle_t f, int offset, int origin ) {
-  FS_Seek( f, offset, origin );
-}
-
-#else
-
-typedef struct
-{
-  fileHandle_t file;
-  byte  *buffer;
-  qboolean  eof;
-  int   bufferSize;
-  int   streamPosition; // next byte to be returned by Sys_StreamRead
-  int   threadPosition; // next byte to be read from file
-} streamState_t;
-
-streamState_t stream;
-
-/*
-===============
-Sys_StreamThread
-
-A thread will be sitting in this loop forever
-================
-*/
-void Sys_StreamThread( void ) 
-{
-  int   buffer;
-  int   count;
-  int   readCount;
-  int   bufferPoint;
-  int   r;
-
-  // if there is any space left in the buffer, fill it up
-  if ( !stream.eof )
-  {
-    count = stream.bufferSize - (stream.threadPosition - stream.streamPosition);
-    if ( count )
-    {
-      bufferPoint = stream.threadPosition % stream.bufferSize;
-      buffer = stream.bufferSize - bufferPoint;
-      readCount = buffer < count ? buffer : count;
-      r = FS_Read ( stream.buffer + bufferPoint, readCount, stream.file );
-      stream.threadPosition += r;
-
-      if ( r != readCount )
-        stream.eof = qtrue;
-    }
-  }
-}
-
-/*
-===============
-Sys_InitStreamThread
-
-================
-*/
-void Sys_InitStreamThread( void ) 
-{
-}
-
-/*
-===============
-Sys_ShutdownStreamThread
-
-================
-*/
-void Sys_ShutdownStreamThread( void ) 
-{
-}
-
-
-/*
-===============
-Sys_BeginStreamedFile
-
-================
-*/
-void Sys_BeginStreamedFile( fileHandle_t f, int readAhead ) 
-{
-  if ( stream.file )
-  {
-    Com_Error( ERR_FATAL, "Sys_BeginStreamedFile: unclosed stream");
-  }
-
-  stream.file = f;
-  stream.buffer = Z_Malloc( readAhead );
-  stream.bufferSize = readAhead;
-  stream.streamPosition = 0;
-  stream.threadPosition = 0;
-  stream.eof = qfalse;
-}
-
-/*
-===============
-Sys_EndStreamedFile
-
-================
-*/
-void Sys_EndStreamedFile( fileHandle_t f ) 
-{
-  if ( f != stream.file )
-  {
-    Com_Error( ERR_FATAL, "Sys_EndStreamedFile: wrong file");
-  }
-
-  stream.file = 0;
-  Z_Free( stream.buffer );
-}
-
-
-/*
-===============
-Sys_StreamedRead
-
-================
-*/
-int Sys_StreamedRead( void *buffer, int size, int count, fileHandle_t f ) 
-{
-  int   available;
-  int   remaining;
-  int   sleepCount;
-  int   copy;
-  int   bufferCount;
-  int   bufferPoint;
-  byte  *dest;
-
-  dest = (byte *)buffer;
-  remaining = size * count;
-
-  if ( remaining <= 0 )
-  {
-    Com_Error( ERR_FATAL, "Streamed read with non-positive size" );
-  }
-
-  sleepCount = 0;
-  while ( remaining > 0 )
-  {
-    available = stream.threadPosition - stream.streamPosition;
-    if ( !available )
-    {
-      if (stream.eof)
-        break;
-      Sys_StreamThread();
-      continue;
-    }
-
-    bufferPoint = stream.streamPosition % stream.bufferSize;
-    bufferCount = stream.bufferSize - bufferPoint;
-
-    copy = available < bufferCount ? available : bufferCount;
-    if ( copy > remaining )
-    {
-      copy = remaining;
-    }
-    memcpy( dest, stream.buffer + bufferPoint, copy );
-    stream.streamPosition += copy;
-    dest += copy;
-    remaining -= copy;
-  }
-
-  return(count * size - remaining) / size;
-}
-
-/*
-===============
-Sys_StreamSeek
-
-================
-*/
-void Sys_StreamSeek( fileHandle_t f, int offset, int origin ) {
-  // clear to that point
-  FS_Seek( f, offset, origin );
-  stream.streamPosition = 0;
-  stream.threadPosition = 0;
-  stream.eof = qfalse;
-}
-
-#endif
-
-/*
-========================================================================
-
-EVENT LOOP
-
-========================================================================
-*/
-
-// bk000306: upped this from 64
-#define	MAX_QUED_EVENTS		256
-#define	MASK_QUED_EVENTS	( MAX_QUED_EVENTS - 1 )
-
-sysEvent_t  eventQue[MAX_QUED_EVENTS];
-// bk000306: initialize
-int   eventHead = 0;
-int             eventTail = 0;
-byte    sys_packetReceived[MAX_MSGLEN];
-
-/*
-================
-Sys_QueEvent
-
-A time of 0 will get the current time
-Ptr should either be null, or point to a block of data that can
-be freed by the game later.
-================
-*/
-void Sys_QueEvent( int time, sysEventType_t type, int value, int value2, int ptrLength, void *ptr ) {
-  sysEvent_t  *ev;
-
-  ev = &eventQue[ eventHead & MASK_QUED_EVENTS ];
-
-  // bk000305 - was missing
-  if ( eventHead - eventTail >= MAX_QUED_EVENTS )
-  {
-    Com_Printf("Sys_QueEvent: overflow\n");
-    // we are discarding an event, but don't leak memory
-    if ( ev->evPtr )
-    {
-      Z_Free( ev->evPtr );
-    }
-    eventTail++;
-  }
-
-  eventHead++;
-
-  if ( time == 0 )
-  {
-    time = Sys_Milliseconds();
-  }
-
-  ev->evTime = time;
-  ev->evType = type;
-  ev->evValue = value;
-  ev->evValue2 = value2;
-  ev->evPtrLength = ptrLength;
-  ev->evPtr = ptr;
-}
-
-/*
-================
-Sys_GetEvent
-
-================
-*/
-sysEvent_t Sys_GetEvent( void ) {
-  sysEvent_t  ev;
-  char    *s;
-  msg_t   netmsg;
-  netadr_t  adr;
-
-  // return if we have data
-  if ( eventHead > eventTail )
-  {
-    eventTail++;
-    return eventQue[ ( eventTail - 1 ) & MASK_QUED_EVENTS ];
-  }
-
-  // pump the message loop
-  // in vga this calls KBD_Update, under X, it calls GetEvent
-  Sys_SendKeyEvents ();
-
-  // check for console commands
-  s = Sys_ConsoleInput();
-  if ( s )
-  {
-    char  *b;
-    int   len;
-
-    len = strlen( s ) + 1;
-    b = Z_Malloc( len );
-    strcpy( b, s );
-    Sys_QueEvent( 0, SE_CONSOLE, 0, 0, len, b );
-  }
-
-  // check for other input devices
-  IN_Frame();
-
-  // check for network packets
-  MSG_Init( &netmsg, sys_packetReceived, sizeof( sys_packetReceived ) );
-  if ( Sys_GetPacket ( &adr, &netmsg ) )
-  {
-    netadr_t    *buf;
-    int       len;
-
-    // copy out to a seperate buffer for qeueing
-    len = sizeof( netadr_t ) + netmsg.cursize;
-    buf = Z_Malloc( len );
-    *buf = adr;
-    memcpy( buf+1, netmsg.data, netmsg.cursize );
-    Sys_QueEvent( 0, SE_PACKET, 0, 0, len, buf );
-  }
-
-  // return if we have data
-  if ( eventHead > eventTail )
-  {
-    eventTail++;
-    return eventQue[ ( eventTail - 1 ) & MASK_QUED_EVENTS ];
-  }
-
-  // create an empty event to return
-
-  memset( &ev, 0, sizeof( ev ) );
-  ev.evTime = Sys_Milliseconds();
-
-  return ev;
-}
-
-/*****************************************************************************/
-
-qboolean Sys_CheckCD( void ) {
-  return qtrue;
-}
-
-void Sys_AppActivate (void)
-{
-}
-
-char *Sys_GetClipboardData(void)
-{
-  return NULL;
-}
-
-void  Sys_Print( const char *msg )
-{
-  if (ttycon_on)
-  {
-    tty_Hide();
-  }
-  fputs(msg, stderr);
-  if (ttycon_on)
-  {
-    tty_Show();
-  }
-}
-
-
-void    Sys_ConfigureFPU() { // bk001213 - divide by zero
-#ifdef __linux__
-#ifdef __i386
-#ifndef NDEBUG
-
-  // bk0101022 - enable FPE's in debug mode
-  static int fpu_word = _FPU_DEFAULT & ~(_FPU_MASK_ZM | _FPU_MASK_IM);
-  int current = 0;
-  _FPU_GETCW(current);
-  if ( current!=fpu_word)
-  {
-#if 0
-    Com_Printf("FPU Control 0x%x (was 0x%x)\n", fpu_word, current );
-    _FPU_SETCW( fpu_word );
-    _FPU_GETCW( current );
-    assert(fpu_word==current);
-#endif
-  }
-#else // NDEBUG
-  static int fpu_word = _FPU_DEFAULT;
-  _FPU_SETCW( fpu_word );
-#endif // NDEBUG
-#endif // __i386 
-#endif // __linux
-}
-
-void Sys_PrintBinVersion( const char* name ) {
-  char* date = __DATE__;
-  char* time = __TIME__;
-  char* sep = "==============================================================";
-  fprintf( stdout, "\n\n%s\n", sep );
-#ifdef DEDICATED
-  fprintf( stdout, "Linux Quake3 Dedicated Server [%s %s]\n", date, time );  
-#else
-  fprintf( stdout, "Linux Quake3 Full Executable  [%s %s]\n", date, time );  
-#endif
-  fprintf( stdout, " local install: %s\n", name );
-  fprintf( stdout, "%s\n\n", sep );
-}
-
-void Sys_ParseArgs( int argc, char* argv[] ) {
-
-  if ( argc==2 )
-  {
-    if ( (!strcmp( argv[1], "--version" ))
-         || ( !strcmp( argv[1], "-v" )) )
-    {
-      Sys_PrintBinVersion( argv[0] );
-      Sys_Exit(0);
-    }
-  }
-}
-
-#include "../client/client.h"
-extern clientStatic_t cls;
-
-int main ( int argc, char* argv[] )
-{
-  // int 	oldtime, newtime; // bk001204 - unused
-  int   len, i;
-  char  *cmdline;
-  void Sys_SetDefaultCDPath(const char *path);
-
-  // go back to real user for config loads
-  saved_euid = geteuid();
-  seteuid(getuid());
-
-  Sys_ParseArgs( argc, argv );  // bk010104 - added this for support
-
-  Sys_SetDefaultCDPath(argv[0]);
-
-  // merge the command line, this is kinda silly
-  for (len = 1, i = 1; i < argc; i++)
-    len += strlen(argv[i]) + 1;
-  cmdline = malloc(len);
-  *cmdline = 0;
-  for (i = 1; i < argc; i++)
-  {
-    if (i > 1)
-      strcat(cmdline, " ");
-    strcat(cmdline, argv[i]);
-  }
-
-  // bk000306 - clear queues
-  memset( &eventQue[0], 0, MAX_QUED_EVENTS*sizeof(sysEvent_t) ); 
-  memset( &sys_packetReceived[0], 0, MAX_MSGLEN*sizeof(byte) );
-
-  Com_Init(cmdline);
-  Sys_InitLocalization();
-  // Already called inside Com_Init
-  //NET_Init();
-
-  Sys_ConsoleInputInit();
-
-  fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
-	
-#ifdef DEDICATED
-	// init here for dedicated, as we don't have GLimp_Init
-	InitSig();
-#endif
-
-  while (1)
-  {
-#ifdef __linux__
-    Sys_ConfigureFPU();
-#endif
-    Com_Frame ();
-  }
-}
-
-/*
-================
-RecoverLostAutodialData
-================
-*/
-void RecoverLostAutodialData(void)
-{
-    // FIXME: stub
-}
-
-/*
-==============
-Sys_CloseMutex
-==============
-*/
-void Sys_CloseMutex(void)
-{
-    // FIXME: stub
-}
-
-
-/*
-==============
-Sys_PumpMessageLoop
-==============
-*/
-void Sys_PumpMessageLoop(void)
-{
-    // FIXME: stub
-}
-
-/*
-==============
-SaveRegistryInfo
-==============
-*/
-qboolean SaveRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long lSize)
-{
-    STUB_DESC("not implemented");
-    return qfalse;
-}
-
-/*
-==============
-LoadRegistryInfo
-==============
-*/
-qboolean LoadRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long* plSize)
-{
-    STUB_DESC("not implemented");
-    return qfalse;
-}
-
-/*
-==============
-IsFirstRun
-==============
-*/
-qboolean IsFirstRun(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-IsNewConfig
-==============
-*/
-qboolean IsNewConfig(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-IsSafeMode
-==============
-*/
-qboolean IsSafeMode(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-ClearNewConfigFlag
-==============
-*/
-void ClearNewConfigFlag(void)
-{
-}
-
-/*
-==============
-Sys_GetWholeClipboard
-==============
-*/
-const char* Sys_GetWholeClipboard(void)
-{
-    return NULL;
-}
-
-/*
-==============
-Sys_SetClipboard
-==============
-*/
-void Sys_SetClipboard(const char* contents)
-{
-}
-
-/*
-==================
-SetNormalThreadPriority
-==================
-*/
-void SetNormalThreadPriority(void)
-{
-    // FIXME: stub
-}
-
-/*
-==================
-SetBelowNormalThreadPriority
-==================
-*/
-void SetBelowNormalThreadPriority(void)
-{
-    // FIXME: stub
-}
-
diff --git a/code/unix/unix_net.c b/code/unix/unix_net.c
deleted file mode 100644
index 7ca61051..00000000
--- a/code/unix/unix_net.c
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// unix_net.c
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <arpa/inet.h> // bk001204
-
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <errno.h>
-
-#ifdef MACOS_X
-#import <sys/sockio.h>
-#import <net/if.h>
-#import <net/if_types.h>
-
-#import <arpa/inet.h>         // for inet_ntoa()
-#import <net/if_dl.h>         // for 'struct sockaddr_dl'
-#endif
-
-static cvar_t	*noudp;
-
-netadr_t	net_local_adr;
-
-int			ip_socket;
-int			ipx_socket;
-
-#define	MAX_IPS		16
-static	int		numIP;
-static	byte	localIP[MAX_IPS][4];
-
-int NET_Socket (char *net_interface, int port);
-char *NET_ErrorString (void);
-
-//=============================================================================
-
-void NetadrToSockadr (netadr_t *a, struct sockaddr_in *s)
-{
-	memset (s, 0, sizeof(*s));
-
-	if (a->type == NA_BROADCAST)
-	{
-		s->sin_family = AF_INET;
-
-		s->sin_port = a->port;
-		*(int *)&s->sin_addr = -1;
-	}
-	else if (a->type == NA_IP)
-	{
-		s->sin_family = AF_INET;
-
-		*(int *)&s->sin_addr = *(int *)&a->ip;
-		s->sin_port = a->port;
-	}
-}
-
-void SockadrToNetadr (struct sockaddr_in *s, netadr_t *a)
-{
-	*(int *)&a->ip = *(int *)&s->sin_addr;
-	a->port = s->sin_port;
-	a->type = NA_IP;
-}
-
-char	*NET_BaseAdrToString (netadr_t a)
-{
-	static	char	s[64];
-	
-	Com_sprintf (s, sizeof(s), "%i.%i.%i.%i", a.ip[0], a.ip[1], a.ip[2], a.ip[3]);
-
-	return s;
-}
-
-/*
-=============
-Sys_StringToAdr
-
-idnewt
-192.246.40.70
-=============
-*/
-qboolean	Sys_StringToSockaddr (const char *s, struct sockaddr *sadr)
-{
-	struct hostent	*h;
-	//char	*colon; // bk001204 - unused
-	
-	memset (sadr, 0, sizeof(*sadr));
-	((struct sockaddr_in *)sadr)->sin_family = AF_INET;
-	
-	((struct sockaddr_in *)sadr)->sin_port = 0;
-	
-	if ( s[0] >= '0' && s[0] <= '9')
-	{
-		*(int *)&((struct sockaddr_in *)sadr)->sin_addr = inet_addr(s);
-	}
-	else
-	{
-		if (! (h = gethostbyname(s)) )
-			return qfalse;
-		*(int *)&((struct sockaddr_in *)sadr)->sin_addr = *(int *)h->h_addr_list[0];
-	}
-	
-	return qtrue;
-}
-
-/*
-=============
-Sys_StringToAdr
-
-localhost
-idnewt
-idnewt:28000
-192.246.40.70
-192.246.40.70:28000
-=============
-*/
-qboolean	Sys_StringToAdr (const char *s, netadr_t *a)
-{
-	struct sockaddr_in sadr;
-	
-	if (!Sys_StringToSockaddr (s, (struct sockaddr *)&sadr))
-		return qfalse;
-	
-	SockadrToNetadr (&sadr, a);
-
-	return qtrue;
-}
-
-
-//=============================================================================
-
-qboolean	Sys_GetPacket (netadr_t *net_from, msg_t *net_message)
-{
-	int 	ret;
-	struct sockaddr_in	from;
-	int		fromlen;
-	int		net_socket;
-	int		protocol;
-	int		err;
-
-	for (protocol = 0 ; protocol < 2 ; protocol++)
-	{
-		if (protocol == 0)
-			net_socket = ip_socket;
-		else
-			net_socket = ipx_socket;
-
-		if (!net_socket)
-			continue;
-
-		fromlen = sizeof(from);
-		ret = recvfrom (net_socket, net_message->data, net_message->maxsize
-			, 0, (struct sockaddr *)&from, &fromlen);
-
-		SockadrToNetadr (&from, net_from);
-		// bk000305: was missing
-		net_message->readcount = 0;
-
-		if (ret == -1)
-		{
-			err = errno;
-
-			if (err == EWOULDBLOCK || err == ECONNREFUSED)
-				continue;
-			Com_Printf ("NET_GetPacket: %s from %s\n", NET_ErrorString(),
-						NET_AdrToString(*net_from));
-			continue;
-		}
-
-		if (ret == net_message->maxsize)
-		{
-			Com_Printf ("Oversize packet from %s\n", NET_AdrToString (*net_from));
-			continue;
-		}
-
-		net_message->cursize = ret;
-		return qtrue;
-	}
-
-	return qfalse;
-}
-
-//=============================================================================
-
-void	Sys_SendPacket( size_t length, const void *data, netadr_t to )
-{
-	int		ret;
-	struct sockaddr_in	addr;
-	int		net_socket;
-
-	if (to.type == NA_BROADCAST)
-	{
-		net_socket = ip_socket;
-	}
-	else if (to.type == NA_IP)
-	{
-		net_socket = ip_socket;
-	}
-	else if (to.type == NA_IPX)
-	{
-		net_socket = ipx_socket;
-	}
-	else if (to.type == NA_BROADCAST_IPX)
-	{
-		net_socket = ipx_socket;
-	}
-	else {
-		Com_Error (ERR_FATAL, "NET_SendPacket: bad address type");
-		return;
-	}
-
-	if (!net_socket)
-		return;
-
-	NetadrToSockadr (&to, &addr);
-
-	ret = sendto (net_socket, data, length, 0, (struct sockaddr *)&addr, sizeof(addr) );
-	if (ret == -1)
-	{
-		Com_Printf ("NET_SendPacket ERROR: %s to %s\n", NET_ErrorString(),
-				NET_AdrToString (to));
-	}
-}
-
-
-//=============================================================================
-
-/*
-==================
-Sys_IsLANAddress
-
-LAN clients will have their rate var ignored
-==================
-*/
-qboolean	Sys_IsLANAddress (netadr_t adr) {
-	int		i;
-
-	if( adr.type == NA_LOOPBACK ) {
-		return qtrue;
-	}
-
-	if( adr.type == NA_IPX ) {
-		return qtrue;
-	}
-
-	if( adr.type != NA_IP ) {
-		return qfalse;
-	}
-
-	// choose which comparison to use based on the class of the address being tested
-	// any local adresses of a different class than the address being tested will fail based on the first byte
-
-	// Class A
-	if( (adr.ip[0] & 0x80) == 0x00 ) {
-		for ( i = 0 ; i < numIP ; i++ ) {
-			if( adr.ip[0] == localIP[i][0] ) {
-				return qtrue;
-			}
-		}
-		// the RFC1918 class a block will pass the above test
-		return qfalse;
-	}
-
-	// Class B
-	if( (adr.ip[0] & 0xc0) == 0x80 ) {
-		for ( i = 0 ; i < numIP ; i++ ) {
-			if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] ) {
-				return qtrue;
-			}
-			// also check against the RFC1918 class b blocks
-			if( adr.ip[0] == 172 && localIP[i][0] == 172 && (adr.ip[1] & 0xf0) == 16 && (localIP[i][1] & 0xf0) == 16 ) {
-				return qtrue;
-			}
-		}
-		return qfalse;
-	}
-
-	// Class C
-	for ( i = 0 ; i < numIP ; i++ ) {
-		if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] && adr.ip[2] == localIP[i][2] ) {
-			return qtrue;
-		}
-		// also check against the RFC1918 class c blocks
-		if( adr.ip[0] == 192 && localIP[i][0] == 192 && adr.ip[1] == 168 && localIP[i][1] == 168 ) {
-			return qtrue;
-		}
-	}
-	return qfalse;
-}
-
-/*
-==================
-Sys_ShowIP
-==================
-*/
-void Sys_ShowIP(void) {
-	int i;
-
-	for (i = 0; i < numIP; i++) {
-		Com_Printf( "IP: %i.%i.%i.%i\n", localIP[i][0], localIP[i][1], localIP[i][2], localIP[i][3] );
-	}
-}
-
-/*
-=====================
-NET_GetLocalAddress
-=====================
-*/
-#ifdef MACOS_X
-// Don't do a forward mapping from the hostname of the machine to the IP.  The reason is that we might have obtained an IP address from DHCP and there might not be any name registered for the machine.  On Mac OS X, the machine name defaults to 'localhost' and NetInfo has 127.0.0.1 listed for this name.  Instead, we want to get a list of all the IP network interfaces on the machine.
-// This code adapted from OmniNetworking.
-
-#define IFR_NEXT(ifr)	\
-    ((struct ifreq *) ((char *) (ifr) + sizeof(*(ifr)) + \
-      MAX(0, (int) (ifr)->ifr_addr.sa_len - (int) sizeof((ifr)->ifr_addr))))
-
-void NET_GetLocalAddress( void ) {
-        struct ifreq requestBuffer[MAX_IPS], *linkInterface, *inetInterface;
-        struct ifconf ifc;
-        struct ifreq ifr;
-        struct sockaddr_dl *sdl;
-        int interfaceSocket;
-        int family;
-        
-        //Com_Printf("NET_GetLocalAddress: Querying for network interfaces\n");
-        
-        // Set this early so we can just return if there is an error
-	numIP = 0;
-        
-        ifc.ifc_len = sizeof(requestBuffer);
-        ifc.ifc_buf = (caddr_t)requestBuffer;
-
-        // Since we get at this info via an ioctl, we need a temporary little socket.  This will only get AF_INET interfaces, but we probably don't care about anything else.  If we do end up caring later, we should add a ONAddressFamily and at a -interfaces method to it.
-        family = AF_INET;
-        if ((interfaceSocket = socket(family, SOCK_DGRAM, 0)) < 0) {
-            Com_Printf("NET_GetLocalAddress: Unable to create temporary socket, errno = %d\n", errno);
-            return;
-        }
-
-        if (ioctl(interfaceSocket, SIOCGIFCONF, &ifc) != 0) {
-            Com_Printf("NET_GetLocalAddress: Unable to get list of network interfaces, errno = %d\n", errno);
-            return;
-        }
-
-
-        linkInterface = (struct ifreq *) ifc.ifc_buf;
-        while ((char *) linkInterface < &ifc.ifc_buf[ifc.ifc_len]) {
-            unsigned int nameLength;
-
-            // The ioctl returns both the entries having the address (AF_INET) and the link layer entries (AF_LINK).  The AF_LINK entry has the link layer address which contains the interface type.  This is the only way I can see to get this information.  We cannot assume that we will get bot an AF_LINK and AF_INET entry since the interface may not be configured.  For example, if you have a 10Mb port on the motherboard and a 100Mb card, you may not configure the motherboard port.
-
-            // For each AF_LINK entry...
-            if (linkInterface->ifr_addr.sa_family == AF_LINK) {
-                // if there is a matching AF_INET entry
-                inetInterface = (struct ifreq *) ifc.ifc_buf;
-                while ((char *) inetInterface < &ifc.ifc_buf[ifc.ifc_len]) {
-                    if (inetInterface->ifr_addr.sa_family == AF_INET &&
-                        !strncmp(inetInterface->ifr_name, linkInterface->ifr_name, sizeof(linkInterface->ifr_name))) {
-
-                        for (nameLength = 0; nameLength < IFNAMSIZ; nameLength++)
-                            if (!linkInterface->ifr_name[nameLength])
-                                break;
-
-                        sdl = (struct sockaddr_dl *)&linkInterface->ifr_addr;
-                        // Skip loopback interfaces
-                        if (sdl->sdl_type != IFT_LOOP) {
-                            // Get the local interface address
-                            strncpy(ifr.ifr_name, inetInterface->ifr_name, sizeof(ifr.ifr_name));
-                            if (ioctl(interfaceSocket, OSIOCGIFADDR, (caddr_t)&ifr) < 0) {
-                                Com_Printf("NET_GetLocalAddress: Unable to get local address for interface '%s', errno = %d\n", inetInterface->ifr_name, errno);
-                            } else {
-                                struct sockaddr_in *sin;
-                                int ip;
-            
-                                sin = (struct sockaddr_in *)&ifr.ifr_addr;
-            
-                                ip = ntohl(sin->sin_addr.s_addr);
-                                localIP[ numIP ][0] = (ip >> 24) & 0xff;
-                                localIP[ numIP ][1] = (ip >> 16) & 0xff;
-                                localIP[ numIP ][2] = (ip >>  8) & 0xff;
-                                localIP[ numIP ][3] = (ip >>  0) & 0xff;
-                                Com_Printf( "IP: %i.%i.%i.%i (%s)\n", localIP[ numIP ][0], localIP[ numIP ][1], localIP[ numIP ][2], localIP[ numIP ][3], inetInterface->ifr_name);
-                                numIP++;
-                            }
-                        }
-
-                        // We will assume that there is only one AF_INET entry per AF_LINK entry.
-                        // What happens when we have an interface that has multiple IP addresses, or
-                        // can that even happen?
-                        // break;
-                    }
-                    inetInterface = IFR_NEXT(inetInterface);
-                }
-            }
-            linkInterface = IFR_NEXT(linkInterface);
-        }
-
-        close(interfaceSocket);
-}
-
-#else
-void NET_GetLocalAddress( void ) {
-	char				hostname[256];
-	struct hostent		*hostInfo;
-	// int					error; // bk001204 - unused
-	char				*p;
-	int					ip;
-	int					n;
-
-	if ( gethostname( hostname, 256 ) == -1 ) {
-		return;
-	}
-
-	hostInfo = gethostbyname( hostname );
-	if ( !hostInfo ) {
-		return;
-	}
-
-	Com_Printf( "Hostname: %s\n", hostInfo->h_name );
-	n = 0;
-	while( ( p = hostInfo->h_aliases[n++] ) != NULL ) {
-		Com_Printf( "Alias: %s\n", p );
-	}
-
-	if ( hostInfo->h_addrtype != AF_INET ) {
-		return;
-	}
-
-	numIP = 0;
-	while( ( p = hostInfo->h_addr_list[numIP++] ) != NULL && numIP < MAX_IPS ) {
-		ip = ntohl( *(int *)p );
-		localIP[ numIP ][0] = p[0];
-		localIP[ numIP ][1] = p[1];
-		localIP[ numIP ][2] = p[2];
-		localIP[ numIP ][3] = p[3];
-		Com_Printf( "IP: %i.%i.%i.%i\n", ( ip >> 24 ) & 0xff, ( ip >> 16 ) & 0xff, ( ip >> 8 ) & 0xff, ip & 0xff );
-	}
-}
-#endif
-
-/*
-====================
-NET_OpenIP
-====================
-*/
-// bk001204 - prototype needed
-int NET_IPSocket (char *net_interface, int port);
-void NET_OpenIP (void)
-{
-	cvar_t	*ip;
-	int		port;
-	int		i;
-
-	ip = Cvar_Get ("net_ip", "localhost", 0);
-
-	port = Cvar_Get("net_port", va("%i", PORT_SERVER), 0)->value;
-
-	for ( i = 0 ; i < 10 ; i++ ) {
-		ip_socket = NET_IPSocket (ip->string, port + i);
-		if ( ip_socket ) {
-			Cvar_SetValue( "net_port", port + i );
-			NET_GetLocalAddress();
-			return;
-		}
-	}
-	Com_Error (ERR_FATAL, "Couldn't allocate IP port");
-}
-
-
-/*
-====================
-NET_Init
-====================
-*/
-void NET_Init (void)
-{
-	noudp = Cvar_Get ("net_noudp", "0", 0);
-	// open sockets
-	if (! noudp->value) {
-		NET_OpenIP ();
-	}
-}
-
-
-/*
-====================
-NET_IPSocket
-====================
-*/
-int NET_IPSocket (char *net_interface, int port)
-{
-	int newsocket;
-	struct sockaddr_in address;
-	qboolean _qtrue = qtrue;
-	int	i = 1;
-
-	if ( net_interface ) {
-		Com_Printf("Opening IP socket: %s:%i\n", net_interface, port );
-	} else {
-		Com_Printf("Opening IP socket: localhost:%i\n", port );
-	}
-
-	if ((newsocket = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
-	{
-		Com_Printf ("ERROR: UDP_OpenSocket: socket: %s", NET_ErrorString());
-		return 0;
-	}
-
-	// make it non-blocking
-	if (ioctl (newsocket, FIONBIO, &_qtrue) == -1)
-	{
-		Com_Printf ("ERROR: UDP_OpenSocket: ioctl FIONBIO:%s\n", NET_ErrorString());
-		return 0;
-	}
-
-	// make it broadcast capable
-	if (setsockopt(newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i)) == -1)
-	{
-		Com_Printf ("ERROR: UDP_OpenSocket: setsockopt SO_BROADCAST:%s\n", NET_ErrorString());
-		return 0;
-	}
-
-	if (!net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost"))
-		address.sin_addr.s_addr = INADDR_ANY;
-	else
-		Sys_StringToSockaddr (net_interface, (struct sockaddr *)&address);
-
-	if (port == PORT_ANY)
-		address.sin_port = 0;
-	else
-		address.sin_port = htons((short)port);
-
-	address.sin_family = AF_INET;
-
-	if( bind (newsocket, (void *)&address, sizeof(address)) == -1)
-	{
-		Com_Printf ("ERROR: UDP_OpenSocket: bind: %s\n", NET_ErrorString());
-		close (newsocket);
-		return 0;
-	}
-
-	return newsocket;
-}
-
-/*
-====================
-NET_Shutdown
-====================
-*/
-void	NET_Shutdown (void)
-{
-	if (ip_socket) {
-		close(ip_socket);
-		ip_socket = 0;
-	}
-}
-
-
-/*
-====================
-NET_ErrorString
-====================
-*/
-char *NET_ErrorString (void)
-{
-	int		code;
-
-	code = errno;
-	return strerror (code);
-}
-
-// sleeps msec or until net socket is ready
-void NET_Sleep(int msec)
-{
-    struct timeval timeout;
-	fd_set	fdset;
-	extern qboolean stdin_active;
-
-	if (!ip_socket || !com_dedicated->integer)
-		return; // we're not a server, just run full speed
-
-	FD_ZERO(&fdset);
-	if (stdin_active)
-		FD_SET(0, &fdset); // stdin is processed too
-	FD_SET(ip_socket, &fdset); // network socket
-	timeout.tv_sec = msec/1000;
-	timeout.tv_usec = (msec%1000)*1000;
-	select(ip_socket+1, &fdset, NULL, NULL, &timeout);
-}
-
diff --git a/code/unix/unix_shared.c b/code/unix/unix_shared.c
deleted file mode 100644
index 5913df0a..00000000
--- a/code/unix/unix_shared.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <stdio.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <pwd.h>
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-
-//=============================================================================
-
-// Used to determine CD Path
-static char cdPath[MAX_OSPATH];
-
-// Used to determine local installation path
-static char installPath[MAX_OSPATH];
-
-// Used to determine where to store user-specific files
-static char homePath[MAX_OSPATH];
-
-/*
-================
-Sys_Milliseconds
-================
-*/
-/* base time in seconds, that's our origin
-   timeval:tv_sec is an int: 
-   assuming this wraps every 0x7fffffff - ~68 years since the Epoch (1970) - we're safe till 2038
-   using unsigned long data type to work right with Sys_XTimeToSysTime */
-unsigned long sys_timeBase = 0;
-/* current time in ms, using sys_timeBase as origin
-   NOTE: sys_timeBase*1000 + curtime -> ms since the Epoch
-     0x7fffffff ms - ~24 days
-   although timeval:tv_usec is an int, I'm not sure wether it is actually used as an unsigned int
-     (which would affect the wrap period) */
-int curtime;
-int Sys_Milliseconds (void)
-{
-	struct timeval tp;
-
-	gettimeofday(&tp, NULL);
-	
-	if (!sys_timeBase)
-	{
-		sys_timeBase = tp.tv_sec;
-		return tp.tv_usec/1000;
-	}
-
-	curtime = (tp.tv_sec - sys_timeBase)*1000 + tp.tv_usec/1000;
-	
-	return curtime;
-}
-
-#if defined(__linux__) && !defined(DEDICATED)
-/*
-================
-Sys_XTimeToSysTime
-sub-frame timing of events returned by X
-X uses the Time typedef - unsigned long
-disable with in_subframe 0
-
- sys_timeBase*1000 is the number of ms since the Epoch of our origin
- xtime is in ms and uses the Epoch as origin
-   Time data type is an unsigned long: 0xffffffff ms - ~49 days period
- I didn't find much info in the XWindow documentation about the wrapping
-   we clamp sys_timeBase*1000 to unsigned long, that gives us the current origin for xtime
-   the computation will still work if xtime wraps (at ~49 days period since the Epoch) after we set sys_timeBase
-
-================
-*/
-extern cvar_t *in_subframe;
-int Sys_XTimeToSysTime (unsigned long xtime)
-{
-	int ret, time, test;
-	
-	if (!in_subframe->value)
-	{
-		// if you don't want to do any event times corrections
-		return Sys_Milliseconds();
-	}
-
-	// test the wrap issue
-#if 0	
-	// reference values for test: sys_timeBase 0x3dc7b5e9 xtime 0x541ea451 (read these from a test run)
-	// xtime will wrap in 0xabe15bae ms >~ 0x2c0056 s (33 days from Nov 5 2002 -> 8 Dec)
-	//   NOTE: date -d '1970-01-01 UTC 1039384002 seconds' +%c
-	// use sys_timeBase 0x3dc7b5e9+0x2c0056 = 0x3df3b63f
-	// after around 5s, xtime would have wrapped around
-	// we get 7132, the formula handles the wrap safely
-	unsigned long xtime_aux,base_aux;
-	int test;
-//	Com_Printf("sys_timeBase: %p\n", sys_timeBase);
-//	Com_Printf("xtime: %p\n", xtime);
-	xtime_aux = 500; // 500 ms after wrap
-	base_aux = 0x3df3b63f; // the base a few seconds before wrap
-	test = xtime_aux - (unsigned long)(base_aux*1000);
-	Com_Printf("xtime wrap test: %d\n", test);
-#endif
-
-  // some X servers (like suse 8.1's) report weird event times
-  // if the game is loading, resolving DNS, etc. we are also getting old events
-  // so we only deal with subframe corrections that look 'normal'
-  ret = xtime - (unsigned long)(sys_timeBase*1000);
-  time = Sys_Milliseconds();
-  test = time - ret;
-  //printf("delta: %d\n", test);
-  if (test < 0 || test > 30) // in normal conditions I've never seen this go above
-  {
-    return time;
-  }
-
-	return ret;
-}
-#endif
-
-void	Sys_Mkdir( const char *path )
-{
-    mkdir (path, 0777);
-}
-
-char *strlwr (char *s) {
-  if ( s==NULL ) { // bk001204 - paranoia
-    assert(0);
-    return s;
-  }
-  while (*s) {
-    *s = tolower(*s);
-    s++;
-  }
-  return s; // bk001204 - duh
-}
-
-//============================================
-
-#define	MAX_FOUND_FILES	0x1000
-
-// bk001129 - new in 1.26
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, const char *filter, char **list, int *numfiles ) {
-	char		search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char		filename[MAX_OSPATH];
-	DIR			*fdir;
-	struct dirent *d;
-	struct stat st;
-
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
-
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s/%s", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s", basedir );
-	}
-
-	if ((fdir = opendir(search)) == NULL) {
-		return;
-	}
-
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(filename, sizeof(filename), "%s/%s", search, d->d_name);
-		if (stat(filename, &st) == -1)
-			continue;
-
-		if (st.st_mode & S_IFDIR) {
-			if (Q_stricmp(d->d_name, ".") && Q_stricmp(d->d_name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s/%s", subdirs, d->d_name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", d->d_name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s/%s", subdirs, d->d_name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	}
-
-	closedir(fdir);
-}
-
-// bk001129 - in 1.17 this used to be
-// char **Sys_ListFiles( const char *directory, const char *extension, int *numfiles, qboolean wantsubs )
-char **Sys_ListFiles( const char *directory, const char *extension, const char *filter, int *numfiles, qboolean wantsubs )
-{
-	struct dirent *d;
-	// char *p; // bk001204 - unused
-	DIR		*fdir;
-	qboolean dironly = wantsubs;
-	char		search[MAX_OSPATH];
-	int			nfiles;
-	char		**listCopy;
-	char		*list[MAX_FOUND_FILES];
-	//int			flag; // bk001204 - unused
-	int			i;
-	struct stat st;
-
-	int			extLen;
-
-	if (filter) {
-
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
-
-		list[ nfiles ] = 0;
-		*numfiles = nfiles;
-
-		if (!nfiles)
-			return NULL;
-
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
-
-		return listCopy;
-	}
-
-	if ( !extension)
-		extension = "";
-
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		dironly = qtrue;
-	}
-
-	extLen = strlen( extension );
-	
-	// search
-	nfiles = 0;
-
-	if ((fdir = opendir(directory)) == NULL) {
-		*numfiles = 0;
-		return NULL;
-	}
-
-	while ((d = readdir(fdir)) != NULL) {
-		Com_sprintf(search, sizeof(search), "%s/%s", directory, d->d_name);
-		if (stat(search, &st) == -1)
-			continue;
-		if ((dironly && !(st.st_mode & S_IFDIR)) ||
-			(!dironly && (st.st_mode & S_IFDIR)))
-			continue;
-
-		if (*extension) {
-			if ( strlen( d->d_name ) < strlen( extension ) ||
-				Q_stricmp( 
-					d->d_name + strlen( d->d_name ) - strlen( extension ),
-					extension ) ) {
-				continue; // didn't match
-			}
-		}
-
-		if ( nfiles == MAX_FOUND_FILES - 1 )
-			break;
-		list[ nfiles ] = CopyString( d->d_name );
-		nfiles++;
-	}
-
-	list[ nfiles ] = 0;
-
-	closedir(fdir);
-
-	// return a copy of the list
-	*numfiles = nfiles;
-
-	if ( !nfiles ) {
-		return NULL;
-	}
-
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
-
-	return listCopy;
-}
-
-void	Sys_FreeFileList( char **list ) {
-	int		i;
-
-	if ( !list ) {
-		return;
-	}
-
-	for ( i = 0 ; list[i] ; i++ ) {
-		Z_Free( list[i] );
-	}
-
-	Z_Free( list );
-}
-
-char *Sys_Cwd( void ) 
-{
-	static char cwd[MAX_OSPATH];
-
-	getcwd( cwd, sizeof( cwd ) - 1 );
-	cwd[MAX_OSPATH-1] = 0;
-
-	return cwd;
-}
-
-void Sys_SetDefaultCDPath(const char *path)
-{
-	Q_strncpyz(cdPath, path, sizeof(cdPath));
-}
-
-char *Sys_DefaultCDPath(void)
-{
-        return cdPath;
-}
-
-void Sys_SetDefaultInstallPath(const char *path)
-{
-	Q_strncpyz(installPath, path, sizeof(installPath));
-}
-
-char *Sys_DefaultInstallPath(void)
-{
-	if (*installPath)
-		return installPath;
-	else
-		return Sys_Cwd();
-}
-
-void Sys_SetDefaultHomePath(const char *path)
-{
-	Q_strncpyz(homePath, path, sizeof(homePath));
-}
-
-char *Sys_DefaultHomePath(void)
-{
-	char *p;
-
-        if (*homePath)
-            return homePath;
-            
-	if ((p = getenv("HOME")) != NULL) {
-		Q_strncpyz(homePath, p, sizeof(homePath));
-#ifdef MACOS_X
-		Q_strcat(homePath, sizeof(homePath), "/Library/Application Support/Quake3");
-#else
-		Q_strcat(homePath, sizeof(homePath), "/.q3a");
-#endif
-		if (mkdir(homePath, 0777)) {
-			if (errno != EEXIST) 
-				Sys_Error("Unable to create directory \"%s\", error is %s(%d)\n", homePath, strerror(errno), errno);
-		}
-		return homePath;
-	}
-	return ""; // assume current dir
-}
-
-//============================================
-
-int Sys_GetProcessorId( void )
-{
-	return CPUID_GENERIC;
-}
-
-void Sys_ShowConsole( int visLevel, qboolean quitOnClose )
-{
-}
-
-char *Sys_GetCurrentUser( void )
-{
-	struct passwd *p;
-
-	if ( (p = getpwuid( getuid() )) == NULL ) {
-		return "player";
-	}
-	return p->pw_name;
-}
-
-#if defined(__linux__)
-// TTimo 
-// sysconf() in libc, POSIX.1 compliant
-unsigned int Sys_ProcessorCount()
-{
-  return sysconf(_SC_NPROCESSORS_ONLN);
-}
-#endif
diff --git a/code/unix/vm_x86.c b/code/unix/vm_x86.c
deleted file mode 100644
index cbd78d53..00000000
--- a/code/unix/vm_x86.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../qcommon/vm_local.h"
-
-void VM_Compile( vm_t *vm, vmHeader_t *header ) {}
-int	VM_CallCompiled( vm_t *vm, int *args ) {}
-
-
-
diff --git a/code/unix/vm_x86a.s b/code/unix/vm_x86a.s
deleted file mode 100644
index 8dc7ddb2..00000000
--- a/code/unix/vm_x86a.s
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//
-// vm_x86a.s
-// linux x86 vm support
-
-#include "qasm.h"
-
-.extern	C(instructionPointers)
-
-	.data
-
-	.align	4
-
-programStack	.long	0
-opStack			.long	0
-syscallNum		.long	0
-
-	.text
-
-.globl C(AsmCAll)
-C(AsmCall):
-	movl	(%edi),%eax
-	subl	4,%edi
-	orl		%eax,%eax
-	jl		systemCall
-	// calling another vm function
-	shll	2,%eax
-	addl	C(instructionPointers),%eax
-	call	(%eax)
-	ret
-systemCall:
-
-	// convert negative num to system call number
-	// and store right before the first arg
-	negl	%eax
-	decl	%eax
-
-	movl	%eax,syscallNum
-///---- UNFINISHED FROM HERE
-	mov		dword ptr syscallNum, eax	// so C code can get at it
-	mov		dword ptr programStack, esi	// so C code can get at it
-	mov		dword ptr opStack, edi
-
-	push	ecx
-	push	esi							// we may call recursively, so the
-	push	edi							// statics aren't guaranteed to be around
-}
-	// save the stack to allow recursive VM entry
-	currentVM->programStack = programStack - 4;
-	*(int *)((byte *)currentVM->dataBase + programStack + 4) = syscallNum;
-//VM_LogSyscalls(  (int *)((byte *)currentVM->dataBase + programStack + 4) );
-	*(opStack+1) = currentVM->systemCall( (int *)((byte *)currentVM->dataBase + programStack + 4) );
-
-_asm {
-	pop		edi
-	pop		esi
-	pop		ecx
-	add		edi, 4		// we added the return value
-
-	ret
-}
-
-}
-
-//--------------------------------------------
-	movl	val(%esp),%ecx
-	movl	$0x100,%edx		// 0x10000000000 as dividend
-	cmpl	%edx,%ecx
-	jle		LOutOfRange
-
-	subl	%eax,%eax
-	divl	%ecx
-
-	ret
-
-LOutOfRange:
-	movl	$0xFFFFFFFF,%eax
-	ret
-
-#if 0
-
-#define	in	4
-#define out	8
-
-	.align 2
-.globl C(TransformVector)
-C(TransformVector):
-	movl	in(%esp),%eax
-	movl	out(%esp),%edx
-
-	flds	(%eax)		// in[0]
-	fmuls	C(vright)		// in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vright[0]
-	fmuls	C(vup)		// in[0]*vup[0] | in[0]*vright[0]
-	flds	(%eax)		// in[0] | in[0]*vup[0] | in[0]*vright[0]
-	fmuls	C(vpn)		// in[0]*vpn[0] | in[0]*vup[0] | in[0]*vright[0]
-
-	flds	4(%eax)		// in[1] | ...
-	fmuls	C(vright)+4	// in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vright[1] | ...
-	fmuls	C(vup)+4		// in[1]*vup[1] | in[1]*vright[1] | ...
-	flds	4(%eax)		// in[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fmuls	C(vpn)+4		// in[1]*vpn[1] | in[1]*vup[1] | in[1]*vright[1] | ...
-	fxch	%st(2)		// in[1]*vright[1] | in[1]*vup[1] | in[1]*vpn[1] | ...
-
-	faddp	%st(0),%st(5)	// in[1]*vup[1] | in[1]*vpn[1] | ...
-	faddp	%st(0),%st(3)	// in[1]*vpn[1] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	flds	8(%eax)		// in[2] | ...
-	fmuls	C(vright)+8	// in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vright[2] | ...
-	fmuls	C(vup)+8		// in[2]*vup[2] | in[2]*vright[2] | ...
-	flds	8(%eax)		// in[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fmuls	C(vpn)+8		// in[2]*vpn[2] | in[2]*vup[2] | in[2]*vright[2] | ...
-	fxch	%st(2)		// in[2]*vright[2] | in[2]*vup[2] | in[2]*vpn[2] | ...
-
-	faddp	%st(0),%st(5)	// in[2]*vup[2] | in[2]*vpn[2] | ...
-	faddp	%st(0),%st(3)	// in[2]*vpn[2] | ...
-	faddp	%st(0),%st(1)	// vpn_accum | vup_accum | vright_accum
-
-	fstps	8(%edx)		// out[2]
-	fstps	4(%edx)		// out[1]
-	fstps	(%edx)		// out[0]
-
-	ret
-
-#endif
-
-#define EMINS	4+4
-#define EMAXS	4+8
-#define P		4+12
-
-	.align 2
-.globl C(BoxOnPlaneSide)
-C(BoxOnPlaneSide):
-	pushl	%ebx
-
-	movl	P(%esp),%edx
-	movl	EMINS(%esp),%ecx
-	xorl	%eax,%eax
-	movl	EMAXS(%esp),%ebx
-	movb	pl_signbits(%edx),%al
-	cmpb	$8,%al
-	jge		Lerror
-	flds	pl_normal(%edx)		// p->normal[0]
-	fld		%st(0)				// p->normal[0] | p->normal[0]
-	jmp		Ljmptab(,%eax,4)
-
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase0:
-	fmuls	(%ebx)				// p->normal[0]*emaxs[0] | p->normal[0]
-	flds	pl_normal+4(%edx)	// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]
-	fxch	%st(2)				// p->normal[0] | p->normal[0]*emaxs[0] |
-								//  p->normal[1]
-	fmuls	(%ecx)				// p->normal[0]*emins[0] |
-								//  p->normal[0]*emaxs[0] | p->normal[1]
-	fxch	%st(2)				// p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ebx)				// p->normal[1]*emaxs[1] | p->normal[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	flds	pl_normal+8(%edx)	// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[1] | p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	4(%ecx)				// p->normal[1]*emins[1] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[2] | p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(2)				// p->normal[2] | p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fld		%st(0)				// p->normal[2] | p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fmuls	8(%ebx)				// p->normal[2]*emaxs[2] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[0]*emins[0]
-	fxch	%st(5)				// p->normal[0]*emins[0] |
-								//  p->normal[2] |
-								//  p->normal[1]*emaxs[1] |
-								//  p->normal[1]*emins[1] |
-								//  p->normal[0]*emaxs[0] |
-								//  p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fmuls	8(%ecx)				//p->normal[2]*emins[2] |
-								// p->normal[1]*emaxs[1] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	fxch	%st(1)				//p->normal[1]*emaxs[1] |
-								// p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0] |
-								// p->normal[2]*emaxs[2]
-	faddp	%st(0),%st(3)		//p->normal[2]*emins[2] |
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emaxs[2]
-	fxch	%st(3)				//p->normal[2]*emaxs[2] +
-								// p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// p->normal[0]*emaxs[0]+p->normal[1]*emaxs[1]|
-								// p->normal[2]*emins[2]
-	faddp	%st(0),%st(2)		//p->normal[1]*emins[1]+p->normal[0]*emins[0]|
-								// dist1 | p->normal[2]*emins[2]
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-Lcase1:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase2:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-Lcase3:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase4:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emaxs[2];
-Lcase5:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ebx)				// emaxs[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ecx)				// emins[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emaxs[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emins[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase6:
-	fmuls	(%ebx)				// emaxs[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ecx)				// emins[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-	jmp		LSetSides
-
-//dist1= p->normal[0]*emins[0] + p->normal[1]*emins[1] + p->normal[2]*emins[2];
-//dist2= p->normal[0]*emaxs[0] + p->normal[1]*emaxs[1] + p->normal[2]*emaxs[2];
-Lcase7:
-	fmuls	(%ecx)				// emins[0]
-	flds	pl_normal+4(%edx)
-	fxch	%st(2)
-	fmuls	(%ebx)				// emaxs[0]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	4(%ecx)				// emins[1]
-	flds	pl_normal+8(%edx)
-	fxch	%st(2)
-	fmuls	4(%ebx)				// emaxs[1]
-	fxch	%st(2)
-	fld		%st(0)
-	fmuls	8(%ecx)				// emins[2]
-	fxch	%st(5)
-	faddp	%st(0),%st(3)
-	fmuls	8(%ebx)				// emaxs[2]
-	fxch	%st(1)
-	faddp	%st(0),%st(3)
-	fxch	%st(3)
-	faddp	%st(0),%st(2)
-
-LSetSides:
-
-//	sides = 0;
-//	if (dist1 >= p->dist)
-//		sides = 1;
-//	if (dist2 < p->dist)
-//		sides |= 2;
-
-	faddp	%st(0),%st(2)		// dist1 | dist2
-	fcomps	pl_dist(%edx)
-	xorl	%ecx,%ecx
-	fnstsw	%ax
-	fcomps	pl_dist(%edx)
-	andb	$1,%ah
-	xorb	$1,%ah
-	addb	%ah,%cl
-
-	fnstsw	%ax
-	andb	$1,%ah
-	addb	%ah,%ah
-	addb	%ah,%cl
-
-//	return sides;
-
-	popl	%ebx
-	movl	%ecx,%eax	// return status
-
-	ret
-
-
-Lerror:
-	movl	1, %eax
-	ret
-
-#endif	// id386
diff --git a/code/web/client-config.json b/code/web/client-config.json
new file mode 100644
index 00000000..eddf35db
--- /dev/null
+++ b/code/web/client-config.json
@@ -0,0 +1,47 @@
+{
+    "baseq3": {
+        "files": [
+            {"src": "baseq3/pak0.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak1.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak2.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak3.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak4.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak5.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak6.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak7.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/pak8.pk3", "dst": "/baseq3"},
+            {"src": "baseq3/vm/cgame.qvm", "dst": "/baseq3/vm"},
+            {"src": "baseq3/vm/qagame.qvm", "dst": "/baseq3/vm"},
+            {"src": "baseq3/vm/ui.qvm", "dst": "/baseq3/vm"}
+        ]
+    },
+    "missionpack": {
+        "files": [
+            {"src": "missionpack/pak0.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak1.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak2.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/pak3.pk3", "dst": "/missionpack"},
+            {"src": "missionpack/vm/cgame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/qagame.qvm", "dst": "/missionpack/vm"},
+            {"src": "missionpack/vm/ui.qvm", "dst": "/missionpack/vm"}
+        ]
+    },
+    "demoq3": {
+        "_comment": "Copy baseq3/vm/*.qvm to demoq3/vm/ as the Quake 3 demo QVMs are not compatible. However the botfiles are not fully compatible with newer QVMs.",
+        "files": [
+            {"src": "demoq3/pak0.pk3", "dst": "/demoq3"},
+            {"src": "demoq3/vm/cgame.qvm", "dst": "/demoq3/vm"},
+            {"src": "demoq3/vm/qagame.qvm", "dst": "/demoq3/vm"},
+            {"src": "demoq3/vm/ui.qvm", "dst": "/demoq3/vm"}
+        ]
+    },
+    "tademo": {
+        "_comment": "Copy missionpack/vm/*.qvm to tademo/vm/ as the Team Arena demo QVMs are not compatible.",
+        "files": [
+            {"src": "tademo/pak0.pk3", "dst": "/tademo"},
+            {"src": "tademo/vm/cgame.qvm", "dst": "/tademo/vm"},
+            {"src": "tademo/vm/qagame.qvm", "dst": "/tademo/vm"},
+            {"src": "tademo/vm/ui.qvm", "dst": "/tademo/vm"}
+        ]
+    }
+}
diff --git a/code/web/client.html b/code/web/client.html
new file mode 100644
index 00000000..3a23ab92
--- /dev/null
+++ b/code/web/client.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>__CLIENTBIN__ Emscripten demo</title>
+<style>
+html, body { margin: 0; padding: 0; width: 100%; height: 100%; overflow: hidden; background: rgb(0, 0, 0); display:flex; align-items: center; justify-content: center; }
+canvas { max-width: 100%; max-height: 100%; min-width: 100%; min-height: 100%; object-fit: contain; }
+</style>
+
+<canvas id=canvas></canvas>
+
+<script type=module>
+// These strings are set in the generated HTML file in the build directory.
+let CLIENTBIN = '__CLIENTBIN__';
+let BASEGAME = '__BASEGAME__';
+let EMSCRIPTEN_PRELOAD_FILE = Number('__EMSCRIPTEN_PRELOAD_FILE__');
+// Detect if it's not the generated HTML file.
+let clientHtmlFallback = (CLIENTBIN === '\_\_CLIENTBIN\_\_');
+
+// Path or URL containing the client engine .js, .wasm, and possibly .data.
+let enginePath = './';
+// Path or URL containing fs_game directories.
+let dataPath = './';
+// Path or URL for config file that specifies the files to load for each fs_game.
+let configFilename = `./${CLIENTBIN}-config.json`;
+
+// If displaying the unmodified HTML file, fallback to defaults.
+if (clientHtmlFallback) {
+    CLIENTBIN='ioquake3';
+    BASEGAME='baseq3';
+    EMSCRIPTEN_PRELOAD_FILE=0;
+    configFilename='./client-config.json';
+}
+
+if (window.location.protocol === 'file:') throw new Error(`Unfortunately browser security restrictions prevent loading wasm from a file: URL. This file must be loaded from a web server. The easiest way to do this is probably to use Python\'s built-in web server by running \`python3 -m http.server\` in the top level source directory and then navigate to http://localhost:8000/build/debug-emscripten-wasm32/${CLIENTBIN}.html`);
+
+// First set up the command line arguments and the Emscripten filesystem.
+const urlParams = new URLSearchParams(window.location.search);
+const com_basegame = urlParams.get('com_basegame') || BASEGAME;
+const fs_basegame = urlParams.get('fs_basegame') || '';
+const fs_game = urlParams.get('fs_game') || '';
+let generatedArguments = `
+    +set sv_pure 0
+    +set net_enabled 0
+    +set r_mode -2
+    +set com_basegame "${com_basegame}"
+    +set fs_basegame "${fs_basegame}"
+    +set fs_game "${fs_game}"
+`;
+// Note that unfortunately "+" needs to be encoded as "%2b" in URL query strings or it will be stripped by the browser.
+const queryArgs = urlParams.get('args');
+if (queryArgs) generatedArguments += ` ${queryArgs} `;
+
+// If displaying the unmodified HTML file, the engine and data are probably located in a different directory.
+if (clientHtmlFallback) {
+    // If buildPath is not specified, try to find a build in one of a few default paths.
+    let buildPath = urlParams.get('buildPath');
+    if (buildPath && !buildPath.endsWith('/')) buildPath += '/';
+    const buildPaths = buildPath ? [buildPath] : ['../../build/debug-emscripten-wasm32/', '../../build/release-emscripten-wasm32/', './'];
+    const scriptPaths = buildPaths.map(buildPath => buildPath + `${CLIENTBIN}_opengl2.wasm32.js`);
+    const scriptResponses = await Promise.all(scriptPaths.map(p => fetch(p, {method: 'HEAD'})));
+    const validBuilds = scriptResponses.filter(r => r.ok).length;
+    const goodURL = (newPath) => {
+        const url = new URL(window.location);
+        url.searchParams.set('buildPath', newPath);
+        return url.toString().replace(/%2f/gi, '/');
+    };
+    if (validBuilds === 0) throw new Error(`Didn't find any wasm builds. Run \`emmake make debug\` to build one, or use the buildPath query parameter to specify a directory containing ${CLIENTBIN}_opengl2.wasm32.[js,wasm,data], e.g. ${goodURL('../../build/debug-emscripten-wasm32/')}`);
+    if (validBuilds > 1) throw new Error(`Found multiple valid builds at the following paths: [${buildPaths.filter((path, i)=>scriptResponses[i].ok)}]. Please specify which one to run by adding a buildPath query parameter to the URL, e.g. ${goodURL(buildPaths.filter((path, i)=>scriptResponses[i].ok)[0])}`);
+    const buildIndex = scriptResponses.findIndex(r => r.ok);
+
+    enginePath = buildPaths[buildIndex];
+    dataPath = buildPaths[buildIndex];
+}
+
+const dataURL = new URL(dataPath, location.origin + location.pathname);
+
+const configPromise = ( EMSCRIPTEN_PRELOAD_FILE === 1 ) ? Promise.resolve({[BASEGAME]: {files: []}})
+  : fetch(configFilename).then(r => r.ok ? r.json() : { /* empty config */ });
+
+const ioquake3 = (await import(enginePath + `${CLIENTBIN}_opengl2.wasm32.js`)).default;
+ioquake3({
+    canvas: canvas,
+    arguments: generatedArguments.trim().split(/\s+/),
+    locateFile: (file) => enginePath + file,
+    preRun: [async (module) => {
+        module.addRunDependency('setup-ioq3-filesystem');
+        try {
+            const config = await configPromise;
+            const gamedirs = [com_basegame,fs_basegame,fs_game];
+            for (let g = 0; g < gamedirs.length; g++) {
+                const gamedir = gamedirs[g];
+                if (gamedir === '') {
+                    continue;
+                }
+                if (config[gamedir] === null
+                 || config[gamedir].files === null) {
+                    console.warn(`Game directory '${gamedir}' cannot be used. It must have files listed in ${configFilename}.`);
+                    continue;
+                }
+                const files = config[gamedir].files;
+                const fetches = files.map(file => fetch(new URL(file.src, dataURL)));
+                for (let i = 0; i < files.length; i++) {
+                    const response = await fetches[i];
+                    if (!response.ok) continue;
+                    const data = await response.arrayBuffer();
+                    let name = files[i].src.match(/[^/]+$/)[0];
+                    let dir = files[i].dst;
+                    module.FS.mkdirTree(dir);
+                    module.FS.writeFile(`${dir}/${name}`, new Uint8Array(data));
+                }
+            }
+        } finally {
+            module.removeRunDependency('setup-ioq3-filesystem');
+        }
+    }],
+});
+</script>
diff --git a/code/win32/RCa13168 b/code/win32/RCa13168
deleted file mode 100644
index 063466fc..00000000
Binary files a/code/win32/RCa13168 and /dev/null differ
diff --git a/code/win32/background.bmp b/code/win32/background.bmp
deleted file mode 100644
index 88b3dabf..00000000
Binary files a/code/win32/background.bmp and /dev/null differ
diff --git a/code/win32/clear.bmp b/code/win32/clear.bmp
deleted file mode 100644
index 14516380..00000000
Binary files a/code/win32/clear.bmp and /dev/null differ
diff --git a/code/win32/glw_win.h b/code/win32/glw_win.h
deleted file mode 100644
index e90377bd..00000000
--- a/code/win32/glw_win.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#ifndef _WIN32
-#  error You should not be including this file on this platform
-#endif
-
-#ifndef __GLW_WIN_H__
-#define __GLW_WIN_H__
-
-typedef struct
-{
-	WNDPROC		wndproc;
-
-	HDC     hDC;			// handle to device context
-	HGLRC   hGLRC;			// handle to GL rendering context
-
-	HINSTANCE hinstOpenGL;	// HINSTANCE for the OpenGL library
-
-	qboolean allowdisplaydepthchange;
-	qboolean pixelFormatSet;
-
-	int		 desktopBitsPixel;
-	int		 desktopWidth, desktopHeight;
-
-	qboolean	cdsFullscreen;
-
-	FILE *log_fp;
-} glwstate_t;
-
-extern glwstate_t glw_state;
-
-#endif
diff --git a/code/win32/icon2.ico b/code/win32/icon2.ico
deleted file mode 100644
index 8ba93283..00000000
Binary files a/code/win32/icon2.ico and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/GameSource.VCT b/code/win32/mod-sdk-setup/GameSource.VCT
deleted file mode 100644
index b9dda618..00000000
Binary files a/code/win32/mod-sdk-setup/GameSource.VCT and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/QIIIA Game Source License.doc b/code/win32/mod-sdk-setup/QIIIA Game Source License.doc
deleted file mode 100644
index 790e7fe4..00000000
Binary files a/code/win32/mod-sdk-setup/QIIIA Game Source License.doc and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/bin/lcc.exe b/code/win32/mod-sdk-setup/bin/lcc.exe
deleted file mode 100644
index ff0b2864..00000000
Binary files a/code/win32/mod-sdk-setup/bin/lcc.exe and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/bin/q3asm.exe b/code/win32/mod-sdk-setup/bin/q3asm.exe
deleted file mode 100644
index ba9fd3d6..00000000
Binary files a/code/win32/mod-sdk-setup/bin/q3asm.exe and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/bin/q3cpp.exe b/code/win32/mod-sdk-setup/bin/q3cpp.exe
deleted file mode 100644
index 55e68a10..00000000
Binary files a/code/win32/mod-sdk-setup/bin/q3cpp.exe and /dev/null differ
diff --git a/code/win32/mod-sdk-setup/bin/q3rcc.exe b/code/win32/mod-sdk-setup/bin/q3rcc.exe
deleted file mode 100644
index 8f09cab7..00000000
Binary files a/code/win32/mod-sdk-setup/bin/q3rcc.exe and /dev/null differ
diff --git a/code/win32/qe3.ico b/code/win32/qe3.ico
deleted file mode 100644
index a7f4f0a3..00000000
Binary files a/code/win32/qe3.ico and /dev/null differ
diff --git a/code/win32/resource.h b/code/win32/resource.h
deleted file mode 100644
index 21899cae..00000000
--- a/code/win32/resource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by winquake.rc
-//
-#define IDS_STRING1                     1
-#define IDI_ICON1                       1
-#define IDB_BITMAP1                     1
-#define IDB_BITMAP2                     128
-#define IDC_CURSOR1                     129
-#define IDC_CURSOR2                     130
-#define IDC_CURSOR3                     131
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        132
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/code/win32/win_gamma.c b/code/win32/win_gamma.c
deleted file mode 100644
index 1473dffa..00000000
--- a/code/win32/win_gamma.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** WIN_GAMMA.C
-*/
-#include <assert.h>
-#include "../renderer/tr_local.h"
-#include "../qcommon/qcommon.h"
-#include "glw_win.h"
-#include "win_local.h"
-
-static unsigned short s_oldHardwareGamma[3][256];
-
-/*
-** WG_CheckHardwareGamma
-**
-** Determines if the underlying hardware supports the Win32 gamma correction API.
-*/
-void WG_CheckHardwareGamma( void )
-{
-	HDC			hDC;
-
-	glConfig.deviceSupportsGamma = qfalse;
-
-	if ( qwglSetDeviceGammaRamp3DFX )
-	{
-		glConfig.deviceSupportsGamma = qtrue;
-
-		hDC = GetDC( GetDesktopWindow() );
-		glConfig.deviceSupportsGamma = qwglGetDeviceGammaRamp3DFX( hDC, s_oldHardwareGamma );
-		ReleaseDC( GetDesktopWindow(), hDC );
-
-		return;
-	}
-
-	// non-3Dfx standalone drivers don't support gamma changes, period
-	if ( glConfig.driverType == GLDRV_STANDALONE )
-	{
-		return;
-	}
-
-	if ( !r_ignorehwgamma->integer )
-	{
-		hDC = GetDC( GetDesktopWindow() );
-		glConfig.deviceSupportsGamma = GetDeviceGammaRamp( hDC, s_oldHardwareGamma );
-		ReleaseDC( GetDesktopWindow(), hDC );
-
-		if ( glConfig.deviceSupportsGamma )
-		{
-			//
-			// do a sanity check on the gamma values
-			//
-			if ( ( HIBYTE( s_oldHardwareGamma[0][255] ) <= HIBYTE( s_oldHardwareGamma[0][0] ) ) ||
-				 ( HIBYTE( s_oldHardwareGamma[1][255] ) <= HIBYTE( s_oldHardwareGamma[1][0] ) ) ||
-				 ( HIBYTE( s_oldHardwareGamma[2][255] ) <= HIBYTE( s_oldHardwareGamma[2][0] ) ) )
-			{
-				glConfig.deviceSupportsGamma = qfalse;
-				ri.Printf( PRINT_WARNING, "WARNING: device has broken gamma support, generated gamma.dat\n" );
-			}
-
-			//
-			// make sure that we didn't have a prior crash in the game, and if so we need to
-			// restore the gamma values to at least a linear value
-			//
-			if ( ( HIBYTE( s_oldHardwareGamma[0][181] ) == 255 ) )
-			{
-				int g;
-
-				ri.Printf( PRINT_WARNING, "WARNING: suspicious gamma tables, using linear ramp for restoration\n" );
-
-				for ( g = 0; g < 255; g++ )
-				{
-					s_oldHardwareGamma[0][g] = g << 8;
-					s_oldHardwareGamma[1][g] = g << 8;
-					s_oldHardwareGamma[2][g] = g << 8;
-				}
-			}
-		}
-	}
-}
-
-/*
-void mapGammaMax( void ) {
-	int		i, j;
-	unsigned short table[3][256];
-
-	// try to figure out what win2k will let us get away with setting
-	for ( i = 0 ; i < 256 ; i++ ) {
-		if ( i >= 128 ) {
-			table[0][i] = table[1][i] = table[2][i] = 0xffff;
-		} else {
-			table[0][i] = table[1][i] = table[2][i] = i<<9;
-		}
-	}
-
-	for ( i = 0 ; i < 128 ; i++ ) {
-		for ( j = i*2 ; j < 255 ; j++ ) {
-			table[0][i] = table[1][i] = table[2][i] = j<<8;
-			if ( !SetDeviceGammaRamp( glw_state.hDC, table ) ) {
-				break;
-			}
-		}
-		table[0][i] = table[1][i] = table[2][i] = i<<9;
-		Com_Printf( "index %i max: %i\n", i, j-1 );
-	}
-}
-*/
-
-/*
-** GLimp_SetGamma
-**
-** This routine should only be called if glConfig.deviceSupportsGamma is TRUE
-*/
-void GLimp_SetGamma( unsigned char red[256], unsigned char green[256], unsigned char blue[256] ) {
-	unsigned short table[3][256];
-	int		i, j;
-	int		ret;
-	OSVERSIONINFO	vinfo;
-
-	if ( !glConfig.deviceSupportsGamma || r_ignorehwgamma->integer || !glw_state.hDC ) {
-		return;
-	}
-
-//mapGammaMax();
-
-	for ( i = 0; i < 256; i++ ) {
-		table[0][i] = ( ( ( unsigned short ) red[i] ) << 8 ) | red[i];
-		table[1][i] = ( ( ( unsigned short ) green[i] ) << 8 ) | green[i];
-		table[2][i] = ( ( ( unsigned short ) blue[i] ) << 8 ) | blue[i];
-	}
-
-	// Win2K puts this odd restriction on gamma ramps...
-	vinfo.dwOSVersionInfoSize = sizeof(vinfo);
-	GetVersionEx( &vinfo );
-	if ( vinfo.dwMajorVersion == 5 && vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT ) {
-		Com_DPrintf( "performing W2K gamma clamp.\n" );
-		for ( j = 0 ; j < 3 ; j++ ) {
-			for ( i = 0 ; i < 128 ; i++ ) {
-				if ( table[j][i] > ( (128+i) << 8 ) ) {
-					table[j][i] = (128+i) << 8;
-				}
-			}
-			if ( table[j][127] > 254<<8 ) {
-				table[j][127] = 254<<8;
-			}
-		}
-	} else {
-		Com_DPrintf( "skipping W2K gamma clamp.\n" );
-	}
-
-	// enforce constantly increasing
-	for ( j = 0 ; j < 3 ; j++ ) {
-		for ( i = 1 ; i < 256 ; i++ ) {
-			if ( table[j][i] < table[j][i-1] ) {
-				table[j][i] = table[j][i-1];
-			}
-		}
-	}
-
-
-	if ( qwglSetDeviceGammaRamp3DFX )
-	{
-		qwglSetDeviceGammaRamp3DFX( glw_state.hDC, table );
-	}
-	else
-	{
-		ret = SetDeviceGammaRamp( glw_state.hDC, table );
-		if ( !ret ) {
-			Com_Printf( "SetDeviceGammaRamp failed.\n" );
-		}
-	}
-}
-
-/*
-** WG_RestoreGamma
-*/
-void WG_RestoreGamma( void )
-{
-	if ( glConfig.deviceSupportsGamma )
-	{
-		if ( qwglSetDeviceGammaRamp3DFX )
-		{
-			qwglSetDeviceGammaRamp3DFX( glw_state.hDC, s_oldHardwareGamma );
-		}
-		else
-		{
-			HDC hDC;
-			
-			hDC = GetDC( GetDesktopWindow() );
-			SetDeviceGammaRamp( hDC, s_oldHardwareGamma );
-			ReleaseDC( GetDesktopWindow(), hDC );
-		}
-	}
-}
-
diff --git a/code/win32/win_glimp.c b/code/win32/win_glimp.c
deleted file mode 100644
index ecc02546..00000000
--- a/code/win32/win_glimp.c
+++ /dev/null
@@ -1,1669 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** WIN_GLIMP.C
-**
-** This file contains ALL Win32 specific stuff having to do with the
-** OpenGL refresh.  When a port is being made the following functions
-** must be implemented by the port:
-**
-** GLimp_EndFrame
-** GLimp_Init
-** GLimp_LogComment
-** GLimp_Shutdown
-**
-** Note that the GLW_xxx functions are Windows specific GL-subsystem
-** related functions that are relevant ONLY to win_glimp.c
-*/
-#include <assert.h>
-#include "../renderer/tr_local.h"
-#include "../qcommon/qcommon.h"
-#include "resource.h"
-#include "glw_win.h"
-#include "win_local.h"
-
-extern void WG_CheckHardwareGamma( void );
-extern void WG_RestoreGamma( void );
-
-typedef enum {
-	RSERR_OK,
-
-	RSERR_INVALID_FULLSCREEN,
-	RSERR_INVALID_MODE,
-
-	RSERR_UNKNOWN
-} rserr_t;
-
-#define TRY_PFD_SUCCESS		0
-#define TRY_PFD_FAIL_SOFT	1
-#define TRY_PFD_FAIL_HARD	2
-
-#define	WINDOW_CLASS_NAME	PRODUCT_NAME_FULL
-#define	WINDOW_TITLE_NAME	PRODUCT_NAME_FULL
-
-static void		GLW_InitExtensions( void );
-static rserr_t	GLW_SetMode( const char *drivername, 
-							 int mode, 
-							 int colorbits, 
-							 qboolean cdsFullscreen );
-
-static qboolean s_classRegistered = qfalse;
-
-//
-// function declaration
-//
-void	 QGL_EnableLogging( qboolean enable );
-qboolean QGL_Init( const char *dllname );
-void     QGL_Shutdown( void );
-
-//
-// variable declarations
-//
-glwstate_t glw_state;
-
-cvar_t	*r_allowSoftwareGL;		// don't abort out if the pixelformat claims software
-cvar_t	*r_maskMinidriver;		// allow a different dll name to be treated as if it were opengl32.dll
-
-
-
-/*
-** GLW_StartDriverAndSetMode
-*/
-static qboolean GLW_StartDriverAndSetMode( const char *drivername, 
-										   int mode, 
-										   int colorbits,
-										   qboolean cdsFullscreen )
-{
-	rserr_t err;
-
-	err = GLW_SetMode( drivername, r_mode->integer, colorbits, cdsFullscreen );
-
-	switch ( err )
-	{
-	case RSERR_INVALID_FULLSCREEN:
-		ri.Printf( PRINT_ALL, "...WARNING: fullscreen unavailable in this mode\n" );
-		return qfalse;
-	case RSERR_INVALID_MODE:
-		ri.Printf( PRINT_ALL, "...WARNING: could not set the given mode (%d)\n", mode );
-		return qfalse;
-	default:
-		break;
-	}
-	return qtrue;
-}
-
-/*
-** ChoosePFD
-**
-** Helper function that replaces ChoosePixelFormat.
-*/
-#define MAX_PFDS 256
-
-static int GLW_ChoosePFD( HDC hDC, PIXELFORMATDESCRIPTOR *pPFD )
-{
-	PIXELFORMATDESCRIPTOR pfds[MAX_PFDS+1];
-	int maxPFD = 0;
-	int i;
-	int bestMatch = 0;
-
-	ri.Printf( PRINT_ALL, "...GLW_ChoosePFD( %d, %d, %d )\n", ( int ) pPFD->cColorBits, ( int ) pPFD->cDepthBits, ( int ) pPFD->cStencilBits );
-
-	// count number of PFDs
-	if ( glConfig.driverType > GLDRV_ICD )
-	{
-		maxPFD = qwglDescribePixelFormat( hDC, 1, sizeof( PIXELFORMATDESCRIPTOR ), &pfds[0] );
-	}
-	else
-	{
-		maxPFD = DescribePixelFormat( hDC, 1, sizeof( PIXELFORMATDESCRIPTOR ), &pfds[0] );
-	}
-	if ( maxPFD > MAX_PFDS )
-	{
-		ri.Printf( PRINT_WARNING, "...numPFDs > MAX_PFDS (%d > %d)\n", maxPFD, MAX_PFDS );
-		maxPFD = MAX_PFDS;
-	}
-
-	ri.Printf( PRINT_ALL, "...%d PFDs found\n", maxPFD - 1 );
-
-	// grab information
-	for ( i = 1; i <= maxPFD; i++ )
-	{
-		if ( glConfig.driverType > GLDRV_ICD )
-		{
-			qwglDescribePixelFormat( hDC, i, sizeof( PIXELFORMATDESCRIPTOR ), &pfds[i] );
-		}
-		else
-		{
-			DescribePixelFormat( hDC, i, sizeof( PIXELFORMATDESCRIPTOR ), &pfds[i] );
-		}
-	}
-
-	// look for a best match
-	for ( i = 1; i <= maxPFD; i++ )
-	{
-		//
-		// make sure this has hardware acceleration
-		//
-		if ( ( pfds[i].dwFlags & PFD_GENERIC_FORMAT ) != 0 ) 
-		{
-			if ( !r_allowSoftwareGL->integer )
-			{
-				if ( r_verbose->integer )
-				{
-					ri.Printf( PRINT_ALL, "...PFD %d rejected, software acceleration\n", i );
-				}
-				continue;
-			}
-		}
-
-		// verify pixel type
-		if ( pfds[i].iPixelType != PFD_TYPE_RGBA )
-		{
-			if ( r_verbose->integer )
-			{
-				ri.Printf( PRINT_ALL, "...PFD %d rejected, not RGBA\n", i );
-			}
-			continue;
-		}
-
-		// verify proper flags
-		if ( ( ( pfds[i].dwFlags & pPFD->dwFlags ) & pPFD->dwFlags ) != pPFD->dwFlags ) 
-		{
-			if ( r_verbose->integer )
-			{
-				ri.Printf( PRINT_ALL, "...PFD %d rejected, improper flags (%x instead of %x)\n", i, pfds[i].dwFlags, pPFD->dwFlags );
-			}
-			continue;
-		}
-
-		// verify enough bits
-		if ( pfds[i].cDepthBits < 15 )
-		{
-			continue;
-		}
-		if ( ( pfds[i].cStencilBits < 4 ) && ( pPFD->cStencilBits > 0 ) )
-		{
-			continue;
-		}
-
-		//
-		// selection criteria (in order of priority):
-		// 
-		//  PFD_STEREO
-		//  colorBits
-		//  depthBits
-		//  stencilBits
-		//
-		if ( bestMatch )
-		{
-			// check stereo
-			if ( ( pfds[i].dwFlags & PFD_STEREO ) && ( !( pfds[bestMatch].dwFlags & PFD_STEREO ) ) && ( pPFD->dwFlags & PFD_STEREO ) )
-			{
-				bestMatch = i;
-				continue;
-			}
-			
-			if ( !( pfds[i].dwFlags & PFD_STEREO ) && ( pfds[bestMatch].dwFlags & PFD_STEREO ) && ( pPFD->dwFlags & PFD_STEREO ) )
-			{
-				bestMatch = i;
-				continue;
-			}
-
-			// check color
-			if ( pfds[bestMatch].cColorBits != pPFD->cColorBits )
-			{
-				// prefer perfect match
-				if ( pfds[i].cColorBits == pPFD->cColorBits )
-				{
-					bestMatch = i;
-					continue;
-				}
-				// otherwise if this PFD has more bits than our best, use it
-				else if ( pfds[i].cColorBits > pfds[bestMatch].cColorBits )
-				{
-					bestMatch = i;
-					continue;
-				}
-			}
-
-			// check depth
-			if ( pfds[bestMatch].cDepthBits != pPFD->cDepthBits )
-			{
-				// prefer perfect match
-				if ( pfds[i].cDepthBits == pPFD->cDepthBits )
-				{
-					bestMatch = i;
-					continue;
-				}
-				// otherwise if this PFD has more bits than our best, use it
-				else if ( pfds[i].cDepthBits > pfds[bestMatch].cDepthBits )
-				{
-					bestMatch = i;
-					continue;
-				}
-			}
-
-			// check stencil
-			if ( pfds[bestMatch].cStencilBits != pPFD->cStencilBits )
-			{
-				// prefer perfect match
-				if ( pfds[i].cStencilBits == pPFD->cStencilBits )
-				{
-					bestMatch = i;
-					continue;
-				}
-				// otherwise if this PFD has more bits than our best, use it
-				else if ( ( pfds[i].cStencilBits > pfds[bestMatch].cStencilBits ) && 
-					 ( pPFD->cStencilBits > 0 ) )
-				{
-					bestMatch = i;
-					continue;
-				}
-			}
-		}
-		else
-		{
-			bestMatch = i;
-		}
-	}
-	
-	if ( !bestMatch )
-		return 0;
-
-	if ( ( pfds[bestMatch].dwFlags & PFD_GENERIC_FORMAT ) != 0 )
-	{
-		if ( !r_allowSoftwareGL->integer )
-		{
-			ri.Printf( PRINT_ALL, "...no hardware acceleration found\n" );
-			return 0;
-		}
-		else
-		{
-			ri.Printf( PRINT_ALL, "...using software emulation\n" );
-		}
-	}
-	else if ( pfds[bestMatch].dwFlags & PFD_GENERIC_ACCELERATED )
-	{
-		ri.Printf( PRINT_ALL, "...MCD acceleration found\n" );
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...hardware acceleration found\n" );
-	}
-
-	*pPFD = pfds[bestMatch];
-
-	return bestMatch;
-}
-
-/*
-** void GLW_CreatePFD
-**
-** Helper function zeros out then fills in a PFD
-*/
-static void GLW_CreatePFD( PIXELFORMATDESCRIPTOR *pPFD, int colorbits, int depthbits, int stencilbits, qboolean stereo )
-{
-    PIXELFORMATDESCRIPTOR src = 
-	{
-		sizeof(PIXELFORMATDESCRIPTOR),	// size of this pfd
-		1,								// version number
-		PFD_DRAW_TO_WINDOW |			// support window
-		PFD_SUPPORT_OPENGL |			// support OpenGL
-		PFD_DOUBLEBUFFER,				// double buffered
-		PFD_TYPE_RGBA,					// RGBA type
-		24,								// 24-bit color depth
-		0, 0, 0, 0, 0, 0,				// color bits ignored
-		0,								// no alpha buffer
-		0,								// shift bit ignored
-		0,								// no accumulation buffer
-		0, 0, 0, 0, 					// accum bits ignored
-		24,								// 24-bit z-buffer	
-		8,								// 8-bit stencil buffer
-		0,								// no auxiliary buffer
-		PFD_MAIN_PLANE,					// main layer
-		0,								// reserved
-		0, 0, 0							// layer masks ignored
-    };
-
-	src.cColorBits = colorbits;
-	src.cDepthBits = depthbits;
-	src.cStencilBits = stencilbits;
-
-	if ( stereo )
-	{
-		ri.Printf( PRINT_ALL, "...attempting to use stereo\n" );
-		src.dwFlags |= PFD_STEREO;
-		glConfig.stereoEnabled = qtrue;
-	}
-	else
-	{
-		glConfig.stereoEnabled = qfalse;
-	}
-
-	*pPFD = src;
-}
-
-/*
-** GLW_MakeContext
-*/
-static int GLW_MakeContext( PIXELFORMATDESCRIPTOR *pPFD )
-{
-	int pixelformat;
-
-	//
-	// don't putz around with pixelformat if it's already set (e.g. this is a soft
-	// reset of the graphics system)
-	//
-	if ( !glw_state.pixelFormatSet )
-	{
-		//
-		// choose, set, and describe our desired pixel format.  If we're
-		// using a minidriver then we need to bypass the GDI functions,
-		// otherwise use the GDI functions.
-		//
-		if ( ( pixelformat = GLW_ChoosePFD( glw_state.hDC, pPFD ) ) == 0 )
-		{
-			ri.Printf( PRINT_ALL, "...GLW_ChoosePFD failed\n");
-			return TRY_PFD_FAIL_SOFT;
-		}
-		ri.Printf( PRINT_ALL, "...PIXELFORMAT %d selected\n", pixelformat );
-
-		if ( glConfig.driverType > GLDRV_ICD )
-		{
-			qwglDescribePixelFormat( glw_state.hDC, pixelformat, sizeof( *pPFD ), pPFD );
-			if ( qwglSetPixelFormat( glw_state.hDC, pixelformat, pPFD ) == FALSE )
-			{
-				ri.Printf ( PRINT_ALL, "...qwglSetPixelFormat failed\n");
-				return TRY_PFD_FAIL_SOFT;
-			}
-		}
-		else
-		{
-			DescribePixelFormat( glw_state.hDC, pixelformat, sizeof( *pPFD ), pPFD );
-
-			if ( SetPixelFormat( glw_state.hDC, pixelformat, pPFD ) == FALSE )
-			{
-				ri.Printf (PRINT_ALL, "...SetPixelFormat failed\n", glw_state.hDC );
-				return TRY_PFD_FAIL_SOFT;
-			}
-		}
-
-		glw_state.pixelFormatSet = qtrue;
-	}
-
-	//
-	// startup the OpenGL subsystem by creating a context and making it current
-	//
-	if ( !glw_state.hGLRC )
-	{
-		ri.Printf( PRINT_ALL, "...creating GL context: " );
-		if ( ( glw_state.hGLRC = qwglCreateContext( glw_state.hDC ) ) == 0 )
-		{
-			ri.Printf (PRINT_ALL, "failed\n");
-
-			return TRY_PFD_FAIL_HARD;
-		}
-		ri.Printf( PRINT_ALL, "succeeded\n" );
-
-		ri.Printf( PRINT_ALL, "...making context current: " );
-		if ( !qwglMakeCurrent( glw_state.hDC, glw_state.hGLRC ) )
-		{
-			qwglDeleteContext( glw_state.hGLRC );
-			glw_state.hGLRC = NULL;
-			ri.Printf (PRINT_ALL, "failed\n");
-			return TRY_PFD_FAIL_HARD;
-		}
-		ri.Printf( PRINT_ALL, "succeeded\n" );
-	}
-
-	return TRY_PFD_SUCCESS;
-}
-
-
-/*
-** GLW_InitDriver
-**
-** - get a DC if one doesn't exist
-** - create an HGLRC if one doesn't exist
-*/
-static qboolean GLW_InitDriver( const char *drivername, int colorbits )
-{
-	int		tpfd;
-	int		depthbits, stencilbits;
-	static PIXELFORMATDESCRIPTOR pfd;		// save between frames since 'tr' gets cleared
-
-	ri.Printf( PRINT_ALL, "Initializing OpenGL driver\n" );
-
-	//
-	// get a DC for our window if we don't already have one allocated
-	//
-	if ( glw_state.hDC == NULL )
-	{
-		ri.Printf( PRINT_ALL, "...getting DC: " );
-
-		if ( ( glw_state.hDC = GetDC( g_wv.hWnd ) ) == NULL )
-		{
-			ri.Printf( PRINT_ALL, "failed\n" );
-			return qfalse;
-		}
-		ri.Printf( PRINT_ALL, "succeeded\n" );
-	}
-
-	if ( colorbits == 0 )
-	{
-		colorbits = glw_state.desktopBitsPixel;
-	}
-
-	//
-	// implicitly assume Z-buffer depth == desktop color depth
-	//
-	if ( r_depthbits->integer == 0 ) {
-		if ( colorbits > 16 ) {
-			depthbits = 24;
-		} else {
-			depthbits = 16;
-		}
-	} else {
-		depthbits = r_depthbits->integer;
-	}
-
-	//
-	// do not allow stencil if Z-buffer depth likely won't contain it
-	//
-	stencilbits = r_stencilbits->integer;
-	if ( depthbits < 24 )
-	{
-		stencilbits = 0;
-	}
-
-	//
-	// make two attempts to set the PIXELFORMAT
-	//
-
-	//
-	// first attempt: r_colorbits, depthbits, and r_stencilbits
-	//
-	if ( !glw_state.pixelFormatSet )
-	{
-		GLW_CreatePFD( &pfd, colorbits, depthbits, stencilbits, r_stereo->integer );
-		if ( ( tpfd = GLW_MakeContext( &pfd ) ) != TRY_PFD_SUCCESS )
-		{
-			if ( tpfd == TRY_PFD_FAIL_HARD )
-			{
-				ri.Printf( PRINT_WARNING, "...failed hard\n" );
-				return qfalse;
-			}
-
-			//
-			// punt if we've already tried the desktop bit depth and no stencil bits
-			//
-			if ( ( r_colorbits->integer == glw_state.desktopBitsPixel ) &&
-				 ( stencilbits == 0 ) )
-			{
-				ReleaseDC( g_wv.hWnd, glw_state.hDC );
-				glw_state.hDC = NULL;
-
-				ri.Printf( PRINT_ALL, "...failed to find an appropriate PIXELFORMAT\n" );
-
-				return qfalse;
-			}
-
-			//
-			// second attempt: desktop's color bits and no stencil
-			//
-			if ( colorbits > glw_state.desktopBitsPixel )
-			{
-				colorbits = glw_state.desktopBitsPixel;
-			}
-			GLW_CreatePFD( &pfd, colorbits, depthbits, 0, r_stereo->integer );
-			if ( GLW_MakeContext( &pfd ) != TRY_PFD_SUCCESS )
-			{
-				if ( glw_state.hDC )
-				{
-					ReleaseDC( g_wv.hWnd, glw_state.hDC );
-					glw_state.hDC = NULL;
-				}
-
-				ri.Printf( PRINT_ALL, "...failed to find an appropriate PIXELFORMAT\n" );
-
-				return qfalse;
-			}
-		}
-
-		/*
-		** report if stereo is desired but unavailable
-		*/
-		if ( !( pfd.dwFlags & PFD_STEREO ) && ( r_stereo->integer != 0 ) ) 
-		{
-			ri.Printf( PRINT_ALL, "...failed to select stereo pixel format\n" );
-			glConfig.stereoEnabled = qfalse;
-		}
-	}
-
-	/*
-	** store PFD specifics 
-	*/
-	glConfig.colorBits = ( int ) pfd.cColorBits;
-	glConfig.depthBits = ( int ) pfd.cDepthBits;
-	glConfig.stencilBits = ( int ) pfd.cStencilBits;
-
-	return qtrue;
-}
-
-/*
-** GLW_CreateWindow
-**
-** Responsible for creating the Win32 window and initializing the OpenGL driver.
-*/
-#define	WINDOW_STYLE	(WS_OVERLAPPED|WS_BORDER|WS_CAPTION|WS_VISIBLE)
-static qboolean GLW_CreateWindow( const char *drivername, int width, int height, int colorbits, qboolean cdsFullscreen )
-{
-	RECT			r;
-	cvar_t			*vid_xpos, *vid_ypos;
-	int				stylebits;
-	int				x, y, w, h;
-	int				exstyle;
-
-	//
-	// register the window class if necessary
-	//
-	if ( !s_classRegistered )
-	{
-		WNDCLASS wc;
-
-		memset( &wc, 0, sizeof( wc ) );
-
-		wc.style         = 0;
-		wc.lpfnWndProc   = (WNDPROC) glw_state.wndproc;
-		wc.cbClsExtra    = 0;
-		wc.cbWndExtra    = 0;
-		wc.hInstance     = g_wv.hInstance;
-		wc.hIcon         = LoadIcon( g_wv.hInstance, MAKEINTRESOURCE(IDI_ICON1));
-		wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
-		wc.hbrBackground = (void *)COLOR_GRAYTEXT;
-		wc.lpszMenuName  = 0;
-		wc.lpszClassName = WINDOW_CLASS_NAME;
-
-		if ( !RegisterClass( &wc ) )
-		{
-			ri.Error( ERR_FATAL, "GLW_CreateWindow: could not register window class" );
-		}
-		s_classRegistered = qtrue;
-		ri.Printf( PRINT_ALL, "...registered window class\n" );
-	}
-
-	//
-	// create the HWND if one does not already exist
-	//
-	if ( !g_wv.hWnd )
-	{
-		//
-		// compute width and height
-		//
-		r.left = 0;
-		r.top = 0;
-		r.right  = width;
-		r.bottom = height;
-
-		if ( cdsFullscreen || !Q_stricmp( _3DFX_DRIVER_NAME, drivername ) )
-		{
-			exstyle = WS_EX_TOPMOST;
-			stylebits = WS_POPUP|WS_VISIBLE|WS_SYSMENU;
-		}
-		else
-		{
-			exstyle = 0;
-			stylebits = WINDOW_STYLE|WS_SYSMENU;
-			AdjustWindowRect (&r, stylebits, FALSE);
-		}
-
-		w = r.right - r.left;
-		h = r.bottom - r.top;
-
-		if ( cdsFullscreen || !Q_stricmp( _3DFX_DRIVER_NAME, drivername ) )
-		{
-			x = 0;
-			y = 0;
-		}
-		else
-		{
-			vid_xpos = ri.Cvar_Get ("vid_xpos", "", 0);
-			vid_ypos = ri.Cvar_Get ("vid_ypos", "", 0);
-			x = vid_xpos->integer;
-			y = vid_ypos->integer;
-
-			// adjust window coordinates if necessary 
-			// so that the window is completely on screen
-			if ( x < 0 )
-				x = 0;
-			if ( y < 0 )
-				y = 0;
-
-			if ( w < glw_state.desktopWidth &&
-				 h < glw_state.desktopHeight )
-			{
-				if ( x + w > glw_state.desktopWidth )
-					x = ( glw_state.desktopWidth - w );
-				if ( y + h > glw_state.desktopHeight )
-					y = ( glw_state.desktopHeight - h );
-			}
-		}
-
-		g_wv.hWnd = CreateWindowEx (
-			 exstyle, 
-			 WINDOW_CLASS_NAME,
-			 WINDOW_TITLE_NAME,
-			 stylebits,
-			 x, y, w, h,
-			 NULL,
-			 NULL,
-			 g_wv.hInstance,
-			 NULL);
-
-		if ( !g_wv.hWnd )
-		{
-			ri.Error (ERR_FATAL, "GLW_CreateWindow() - Couldn't create window");
-		}
-	
-		ShowWindow( g_wv.hWnd, SW_SHOW );
-		UpdateWindow( g_wv.hWnd );
-		ri.Printf( PRINT_ALL, "...created window@%d,%d (%dx%d)\n", x, y, w, h );
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...window already present, CreateWindowEx skipped\n" );
-	}
-
-	if ( !GLW_InitDriver( drivername, colorbits ) )
-	{
-		ShowWindow( g_wv.hWnd, SW_HIDE );
-		DestroyWindow( g_wv.hWnd );
-		g_wv.hWnd = NULL;
-
-		return qfalse;
-	}
-
-	SetForegroundWindow( g_wv.hWnd );
-	SetFocus( g_wv.hWnd );
-
-	return qtrue;
-}
-
-static void PrintCDSError( int value )
-{
-	switch ( value )
-	{
-	case DISP_CHANGE_RESTART:
-		ri.Printf( PRINT_ALL, "restart required\n" );
-		break;
-	case DISP_CHANGE_BADPARAM:
-		ri.Printf( PRINT_ALL, "bad param\n" );
-		break;
-	case DISP_CHANGE_BADFLAGS:
-		ri.Printf( PRINT_ALL, "bad flags\n" );
-		break;
-	case DISP_CHANGE_FAILED:
-		ri.Printf( PRINT_ALL, "DISP_CHANGE_FAILED\n" );
-		break;
-	case DISP_CHANGE_BADMODE:
-		ri.Printf( PRINT_ALL, "bad mode\n" );
-		break;
-	case DISP_CHANGE_NOTUPDATED:
-		ri.Printf( PRINT_ALL, "not updated\n" );
-		break;
-	default:
-		ri.Printf( PRINT_ALL, "unknown error %d\n", value );
-		break;
-	}
-}
-
-/*
-** GLW_SetMode
-*/
-static rserr_t GLW_SetMode( const char *drivername, 
-						    int mode, 
-							int colorbits, 
-							qboolean cdsFullscreen )
-{
-	HDC hDC;
-	const char *win_fs[] = { "W", "FS" };
-	int		cdsRet;
-	DEVMODE dm;
-		
-	//
-	// print out informational messages
-	//
-	ri.Printf( PRINT_ALL, "...setting mode %d:", mode );
-	if ( !R_GetModeInfo( &glConfig.vidWidth, &glConfig.vidHeight, &glConfig.windowAspect, mode ) )
-	{
-		ri.Printf( PRINT_ALL, " invalid mode\n" );
-		return RSERR_INVALID_MODE;
-	}
-	ri.Printf( PRINT_ALL, " %d %d %s\n", glConfig.vidWidth, glConfig.vidHeight, win_fs[cdsFullscreen] );
-
-	//
-	// check our desktop attributes
-	//
-	hDC = GetDC( GetDesktopWindow() );
-	glw_state.desktopBitsPixel = GetDeviceCaps( hDC, BITSPIXEL );
-	glw_state.desktopWidth = GetDeviceCaps( hDC, HORZRES );
-	glw_state.desktopHeight = GetDeviceCaps( hDC, VERTRES );
-	ReleaseDC( GetDesktopWindow(), hDC );
-
-	//
-	// verify desktop bit depth
-	//
-	if ( glConfig.driverType != GLDRV_VOODOO )
-	{
-		if ( glw_state.desktopBitsPixel < 15 || glw_state.desktopBitsPixel == 24 )
-		{
-			if ( colorbits == 0 || ( !cdsFullscreen && colorbits >= 15 ) )
-			{
-				if ( MessageBox( NULL,
-							"It is highly unlikely that a correct\n"
-							"windowed display can be initialized with\n"
-							"the current desktop display depth.  Select\n"
-							"'OK' to try anyway.  Press 'Cancel' if you\n"
-							"have a 3Dfx Voodoo, Voodoo-2, or Voodoo Rush\n"
-							"3D accelerator installed, or if you otherwise\n"
-							"wish to quit.",
-							"Low Desktop Color Depth",
-							MB_OKCANCEL | MB_ICONEXCLAMATION ) != IDOK )
-				{
-					return RSERR_INVALID_MODE;
-				}
-			}
-		}
-	}
-
-	// do a CDS if needed
-	if ( cdsFullscreen )
-	{
-		memset( &dm, 0, sizeof( dm ) );
-		
-		dm.dmSize = sizeof( dm );
-		
-		dm.dmPelsWidth  = glConfig.vidWidth;
-		dm.dmPelsHeight = glConfig.vidHeight;
-		dm.dmFields     = DM_PELSWIDTH | DM_PELSHEIGHT;
-
-		if ( r_displayRefresh->integer != 0 )
-		{
-			dm.dmDisplayFrequency = r_displayRefresh->integer;
-			dm.dmFields |= DM_DISPLAYFREQUENCY;
-		}
-		
-		// try to change color depth if possible
-		if ( colorbits != 0 )
-		{
-			if ( glw_state.allowdisplaydepthchange )
-			{
-				dm.dmBitsPerPel = colorbits;
-				dm.dmFields |= DM_BITSPERPEL;
-				ri.Printf( PRINT_ALL, "...using colorsbits of %d\n", colorbits );
-			}
-			else
-			{
-				ri.Printf( PRINT_ALL, "WARNING:...changing depth not supported on Win95 < pre-OSR 2.x\n" );
-			}
-		}
-		else
-		{
-			ri.Printf( PRINT_ALL, "...using desktop display depth of %d\n", glw_state.desktopBitsPixel );
-		}
-
-		//
-		// if we're already in fullscreen then just create the window
-		//
-		if ( glw_state.cdsFullscreen )
-		{
-			ri.Printf( PRINT_ALL, "...already fullscreen, avoiding redundant CDS\n" );
-
-			if ( !GLW_CreateWindow ( drivername, glConfig.vidWidth, glConfig.vidHeight, colorbits, qtrue ) )
-			{
-				ri.Printf( PRINT_ALL, "...restoring display settings\n" );
-				ChangeDisplaySettings( 0, 0 );
-				return RSERR_INVALID_MODE;
-			}
-		}
-		//
-		// need to call CDS
-		//
-		else
-		{
-			ri.Printf( PRINT_ALL, "...calling CDS: " );
-			
-			// try setting the exact mode requested, because some drivers don't report
-			// the low res modes in EnumDisplaySettings, but still work
-			if ( ( cdsRet = ChangeDisplaySettings( &dm, CDS_FULLSCREEN ) ) == DISP_CHANGE_SUCCESSFUL )
-			{
-				ri.Printf( PRINT_ALL, "ok\n" );
-
-				if ( !GLW_CreateWindow ( drivername, glConfig.vidWidth, glConfig.vidHeight, colorbits, qtrue) )
-				{
-					ri.Printf( PRINT_ALL, "...restoring display settings\n" );
-					ChangeDisplaySettings( 0, 0 );
-					return RSERR_INVALID_MODE;
-				}
-				
-				glw_state.cdsFullscreen = qtrue;
-			}
-			else
-			{
-				//
-				// the exact mode failed, so scan EnumDisplaySettings for the next largest mode
-				//
-				DEVMODE		devmode;
-				int			modeNum;
-
-				ri.Printf( PRINT_ALL, "failed, " );
-				
-				PrintCDSError( cdsRet );
-			
-				ri.Printf( PRINT_ALL, "...trying next higher resolution:" );
-				
-				// we could do a better matching job here...
-				for ( modeNum = 0 ; ; modeNum++ ) {
-					if ( !EnumDisplaySettings( NULL, modeNum, &devmode ) ) {
-						modeNum = -1;
-						break;
-					}
-					if ( devmode.dmPelsWidth >= glConfig.vidWidth
-						&& devmode.dmPelsHeight >= glConfig.vidHeight
-						&& devmode.dmBitsPerPel >= 15 ) {
-						break;
-					}
-				}
-
-				if ( modeNum != -1 && ( cdsRet = ChangeDisplaySettings( &devmode, CDS_FULLSCREEN ) ) == DISP_CHANGE_SUCCESSFUL )
-				{
-					ri.Printf( PRINT_ALL, " ok\n" );
-					if ( !GLW_CreateWindow( drivername, glConfig.vidWidth, glConfig.vidHeight, colorbits, qtrue) )
-					{
-						ri.Printf( PRINT_ALL, "...restoring display settings\n" );
-						ChangeDisplaySettings( 0, 0 );
-						return RSERR_INVALID_MODE;
-					}
-					
-					glw_state.cdsFullscreen = qtrue;
-				}
-				else
-				{
-					ri.Printf( PRINT_ALL, " failed, " );
-					
-					PrintCDSError( cdsRet );
-					
-					ri.Printf( PRINT_ALL, "...restoring display settings\n" );
-					ChangeDisplaySettings( 0, 0 );
-					
-					glw_state.cdsFullscreen = qfalse;
-					glConfig.isFullscreen = qfalse;
-					if ( !GLW_CreateWindow( drivername, glConfig.vidWidth, glConfig.vidHeight, colorbits, qfalse) )
-					{
-						return RSERR_INVALID_MODE;
-					}
-					return RSERR_INVALID_FULLSCREEN;
-				}
-			}
-		}
-	}
-	else
-	{
-		if ( glw_state.cdsFullscreen )
-		{
-			ChangeDisplaySettings( 0, 0 );
-		}
-
-		glw_state.cdsFullscreen = qfalse;
-		if ( !GLW_CreateWindow( drivername, glConfig.vidWidth, glConfig.vidHeight, colorbits, qfalse ) )
-		{
-			return RSERR_INVALID_MODE;
-		}
-	}
-
-	//
-	// success, now check display frequency, although this won't be valid on Voodoo(2)
-	//
-	memset( &dm, 0, sizeof( dm ) );
-	dm.dmSize = sizeof( dm );
-	if ( EnumDisplaySettings( NULL, ENUM_CURRENT_SETTINGS, &dm ) )
-	{
-		glConfig.displayFrequency = dm.dmDisplayFrequency;
-	}
-
-	// NOTE: this is overridden later on standalone 3Dfx drivers
-	glConfig.isFullscreen = cdsFullscreen;
-
-	return RSERR_OK;
-}
-
-/*
-** GLW_InitExtensions
-*/
-static void GLW_InitExtensions( void )
-{
-	if ( !r_allowExtensions->integer )
-	{
-		ri.Printf( PRINT_ALL, "*** IGNORING OPENGL EXTENSIONS ***\n" );
-		return;
-	}
-
-	ri.Printf( PRINT_ALL, "Initializing OpenGL extensions\n" );
-
-	// GL_S3_s3tc
-	qglCompressedTexImage2DARB = NULL;
-	glConfig.textureCompression = TC_NONE;
-	if ( strstr( glConfig.extensions_string, "GL_EXT_texture_compression_s3tc" ) && strstr(glConfig.extensions_string, "GL_ARB_texture_compression"))
-	{
-		if ( r_ext_compressed_textures->integer )
-		{
-			qglCompressedTexImage2DARB = wglGetProcAddress("glCompressedTexImage2DARB");
-			glConfig.textureCompression = TC_S3TC;
-			ri.Printf( PRINT_ALL, "...using GL_S3_s3tc\n" );
-		}
-		else
-		{
-			glConfig.textureCompression = TC_NONE;
-			ri.Printf( PRINT_ALL, "...ignoring GL_S3_s3tc\n" );
-		}
-	}
-	else if (!strstr(glConfig.extensions_string, "GL_EXT_texture_compression_s3tc"))
-	{
-		ri.Printf(PRINT_ALL, "...GL_ARB_texture_compression not found\n");
-	}
-	else if (strstr(glConfig.extensions_string, "GL_ARB_texture_compression"))
-	{
-		ri.Printf(PRINT_ALL, "...GL_EXT_texture_compression_s3tc not found\n");
-	}
-	else
-	{
-		ri.Printf(PRINT_ALL, "...GL_EXT_texture_compression_s3tc not found\n");
-		ri.Printf(PRINT_ALL, "...GL_ARB_texture_compression not found\n");
-	}
-
-	// GL_EXT_texture_env_add
-	glConfig.textureEnvAddAvailable = qfalse;
-	if ( strstr( glConfig.extensions_string, "EXT_texture_env_add" ) )
-	{
-		if ( r_ext_texture_env_add->integer )
-		{
-			glConfig.textureEnvAddAvailable = qtrue;
-			ri.Printf( PRINT_ALL, "...using GL_EXT_texture_env_add\n" );
-		}
-		else
-		{
-			glConfig.textureEnvAddAvailable = qfalse;
-			ri.Printf( PRINT_ALL, "...ignoring GL_EXT_texture_env_add\n" );
-		}
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...GL_EXT_texture_env_add not found\n" );
-	}
-
-	// WGL_EXT_swap_control
-	qwglSwapIntervalEXT = ( BOOL (WINAPI *)(int)) qwglGetProcAddress( "wglSwapIntervalEXT" );
-	if ( qwglSwapIntervalEXT )
-	{
-		ri.Printf( PRINT_ALL, "...using WGL_EXT_swap_control\n" );
-		r_swapInterval->modified = qtrue;	// force a set next frame
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...WGL_EXT_swap_control not found\n" );
-	}
-
-	// GL_ARB_multitexture
-	qglMultiTexCoord2fARB = NULL;
-	qglActiveTextureARB = NULL;
-	qglClientActiveTextureARB = NULL;
-	if ( strstr( glConfig.extensions_string, "GL_ARB_multitexture" )  )
-	{
-		if ( r_ext_multitexture->integer )
-		{
-			qglMultiTexCoord2fARB = ( PFNGLMULTITEXCOORD2FARBPROC ) qwglGetProcAddress( "glMultiTexCoord2fARB" );
-			qglActiveTextureARB = ( PFNGLACTIVETEXTUREARBPROC ) qwglGetProcAddress( "glActiveTextureARB" );
-			qglClientActiveTextureARB = ( PFNGLCLIENTACTIVETEXTUREARBPROC ) qwglGetProcAddress( "glClientActiveTextureARB" );
-
-			if ( qglActiveTextureARB )
-			{
-				qglGetIntegerv( GL_MAX_ACTIVE_TEXTURES_ARB, &glConfig.maxActiveTextures );
-
-				if ( glConfig.maxActiveTextures > 1 )
-				{
-					ri.Printf( PRINT_ALL, "...using GL_ARB_multitexture\n" );
-				}
-				else
-				{
-					qglMultiTexCoord2fARB = NULL;
-					qglActiveTextureARB = NULL;
-					qglClientActiveTextureARB = NULL;
-					ri.Printf( PRINT_ALL, "...not using GL_ARB_multitexture, < 2 texture units\n" );
-				}
-			}
-		}
-		else
-		{
-			ri.Printf( PRINT_ALL, "...ignoring GL_ARB_multitexture\n" );
-		}
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...GL_ARB_multitexture not found\n" );
-	}
-
-	// GL_EXT_compiled_vertex_array
-	qglLockArraysEXT = NULL;
-	qglUnlockArraysEXT = NULL;
-	if ( strstr( glConfig.extensions_string, "GL_EXT_compiled_vertex_array" ) && ( glConfig.hardwareType != GLHW_RIVA128 ) )
-	{
-		if ( r_ext_compiled_vertex_array->integer )
-		{
-			ri.Printf( PRINT_ALL, "...using GL_EXT_compiled_vertex_array\n" );
-			qglLockArraysEXT = ( void ( APIENTRY * )( int, int ) ) qwglGetProcAddress( "glLockArraysEXT" );
-			qglUnlockArraysEXT = ( void ( APIENTRY * )( void ) ) qwglGetProcAddress( "glUnlockArraysEXT" );
-			if (!qglLockArraysEXT || !qglUnlockArraysEXT) {
-				ri.Error (ERR_FATAL, "bad getprocaddress");
-			}
-		}
-		else
-		{
-			ri.Printf( PRINT_ALL, "...ignoring GL_EXT_compiled_vertex_array\n" );
-		}
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...GL_EXT_compiled_vertex_array not found\n" );
-	}
-
-	// WGL_3DFX_gamma_control
-	qwglGetDeviceGammaRamp3DFX = NULL;
-	qwglSetDeviceGammaRamp3DFX = NULL;
-
-	if ( strstr( glConfig.extensions_string, "WGL_3DFX_gamma_control" ) )
-	{
-		if ( !r_ignorehwgamma->integer && r_ext_gamma_control->integer )
-		{
-			qwglGetDeviceGammaRamp3DFX = ( BOOL ( WINAPI * )( HDC, LPVOID ) ) qwglGetProcAddress( "wglGetDeviceGammaRamp3DFX" );
-			qwglSetDeviceGammaRamp3DFX = ( BOOL ( WINAPI * )( HDC, LPVOID ) ) qwglGetProcAddress( "wglSetDeviceGammaRamp3DFX" );
-
-			if ( qwglGetDeviceGammaRamp3DFX && qwglSetDeviceGammaRamp3DFX )
-			{
-				ri.Printf( PRINT_ALL, "...using WGL_3DFX_gamma_control\n" );
-			}
-			else
-			{
-				qwglGetDeviceGammaRamp3DFX = NULL;
-				qwglSetDeviceGammaRamp3DFX = NULL;
-			}
-		}
-		else
-		{
-			ri.Printf( PRINT_ALL, "...ignoring WGL_3DFX_gamma_control\n" );
-		}
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "...WGL_3DFX_gamma_control not found\n" );
-	}
-}
-
-/*
-** GLW_CheckOSVersion
-*/
-static qboolean GLW_CheckOSVersion( void )
-{
-#define OSR2_BUILD_NUMBER 1111
-
-	OSVERSIONINFO	vinfo;
-
-	vinfo.dwOSVersionInfoSize = sizeof(vinfo);
-
-	glw_state.allowdisplaydepthchange = qfalse;
-
-	if ( GetVersionEx( &vinfo) )
-	{
-		if ( vinfo.dwMajorVersion > 4 )
-		{
-			glw_state.allowdisplaydepthchange = qtrue;
-		}
-		else if ( vinfo.dwMajorVersion == 4 )
-		{
-			if ( vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
-			{
-				glw_state.allowdisplaydepthchange = qtrue;
-			}
-			else if ( vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
-			{
-				if ( LOWORD( vinfo.dwBuildNumber ) >= OSR2_BUILD_NUMBER )
-				{
-					glw_state.allowdisplaydepthchange = qtrue;
-				}
-			}
-		}
-	}
-	else
-	{
-		ri.Printf( PRINT_ALL, "GLW_CheckOSVersion() - GetVersionEx failed\n" );
-		return qfalse;
-	}
-
-	return qtrue;
-}
-
-/*
-** GLW_LoadOpenGL
-**
-** GLimp_win.c internal function that attempts to load and use 
-** a specific OpenGL DLL.
-*/
-static qboolean GLW_LoadOpenGL( const char *drivername )
-{
-	char buffer[1024];
-	qboolean cdsFullscreen;
-
-	Q_strncpyz( buffer, drivername, sizeof(buffer) );
-	Q_strlwr(buffer);
-
-	//
-	// determine if we're on a standalone driver
-	//
-	if ( strstr( buffer, "opengl32" ) != 0 || r_maskMinidriver->integer )
-	{
-		glConfig.driverType = GLDRV_ICD;
-	}
-	else
-	{
-		glConfig.driverType = GLDRV_STANDALONE;
-
-		ri.Printf( PRINT_ALL, "...assuming '%s' is a standalone driver\n", drivername );
-
-		if ( strstr( buffer, _3DFX_DRIVER_NAME ) )
-		{
-			glConfig.driverType = GLDRV_VOODOO;
-		}
-	}
-
-	// disable the 3Dfx splash screen
-	_putenv("FX_GLIDE_NO_SPLASH=0");
-
-	//
-	// load the driver and bind our function pointers to it
-	// 
-	if ( QGL_Init( buffer ) ) 
-	{
-		cdsFullscreen = r_fullscreen->integer;
-
-		// create the window and set up the context
-		if ( !GLW_StartDriverAndSetMode( drivername, r_mode->integer, r_colorbits->integer, cdsFullscreen ) )
-		{
-			// if we're on a 24/32-bit desktop and we're going fullscreen on an ICD,
-			// try it again but with a 16-bit desktop
-			if ( glConfig.driverType == GLDRV_ICD )
-			{
-				if ( r_colorbits->integer != 16 ||
-					 cdsFullscreen != qtrue ||
-					 r_mode->integer != 3 )
-				{
-					if ( !GLW_StartDriverAndSetMode( drivername, 3, 16, qtrue ) )
-					{
-						goto fail;
-					}
-				}
-			}
-			else
-			{
-				goto fail;
-			}
-		}
-
-		if ( glConfig.driverType == GLDRV_VOODOO )
-		{
-			glConfig.isFullscreen = qtrue;
-		}
-
-		return qtrue;
-	}
-fail:
-
-	QGL_Shutdown();
-
-	return qfalse;
-}
-
-/*
-** GLimp_EndFrame
-*/
-void GLimp_EndFrame (void)
-{
-	//
-	// swapinterval stuff
-	//
-	if ( r_swapInterval->modified ) {
-		r_swapInterval->modified = qfalse;
-
-		if ( !glConfig.stereoEnabled ) {	// why?
-			if ( qwglSwapIntervalEXT ) {
-				qwglSwapIntervalEXT( r_swapInterval->integer );
-			}
-		}
-	}
-
-	// don't flip if drawing to front buffer
-	if ( Q_stricmp( r_drawBuffer->string, "GL_FRONT" ) != 0 )
-	{
-		if ( glConfig.driverType > GLDRV_ICD )
-		{
-			if ( !qwglSwapBuffers( glw_state.hDC ) )
-			{
-				ri.Error( ERR_FATAL, "GLimp_EndFrame() - SwapBuffers() failed!\n" );
-			}
-		}
-		else
-		{
-			SwapBuffers( glw_state.hDC );
-		}
-	}
-
-	// check logging
-	QGL_EnableLogging( r_logFile->integer );
-}
-
-static void GLW_StartOpenGL( void )
-{
-	qboolean attemptedOpenGL32 = qfalse;
-	qboolean attempted3Dfx = qfalse;
-
-	//
-	// load and initialize the specific OpenGL driver
-	//
-	if ( !GLW_LoadOpenGL( r_glDriver->string ) )
-	{
-		if ( !Q_stricmp( r_glDriver->string, OPENGL_DRIVER_NAME ) )
-		{
-			attemptedOpenGL32 = qtrue;
-		}
-		else if ( !Q_stricmp( r_glDriver->string, _3DFX_DRIVER_NAME ) )
-		{
-			attempted3Dfx = qtrue;
-		}
-
-		if ( !attempted3Dfx )
-		{
-			attempted3Dfx = qtrue;
-			if ( GLW_LoadOpenGL( _3DFX_DRIVER_NAME ) )
-			{
-				ri.Cvar_Set( "r_glDriver", _3DFX_DRIVER_NAME );
-				r_glDriver->modified = qfalse;
-			}
-			else
-			{
-				if ( !attemptedOpenGL32 )
-				{
-					if ( !GLW_LoadOpenGL( OPENGL_DRIVER_NAME ) )
-					{
-						ri.Error( ERR_FATAL, "GLW_StartOpenGL() - could not load OpenGL subsystem\n" );
-					}
-					ri.Cvar_Set( "r_glDriver", OPENGL_DRIVER_NAME );
-					r_glDriver->modified = qfalse;
-				}
-				else
-				{
-					ri.Error( ERR_FATAL, "GLW_StartOpenGL() - could not load OpenGL subsystem\n" );
-				}
-			}
-		}
-		else if ( !attemptedOpenGL32 )
-		{
-			attemptedOpenGL32 = qtrue;
-			if ( GLW_LoadOpenGL( OPENGL_DRIVER_NAME ) )
-			{
-				ri.Cvar_Set( "r_glDriver", OPENGL_DRIVER_NAME );
-				r_glDriver->modified = qfalse;
-			}
-			else
-			{
-				ri.Error( ERR_FATAL, "GLW_StartOpenGL() - could not load OpenGL subsystem\n" );
-			}
-		}
-	}
-}
-
-/*
-** GLimp_Init
-**
-** This is the platform specific OpenGL initialization function.  It
-** is responsible for loading OpenGL, initializing it, setting
-** extensions, creating a window of the appropriate size, doing
-** fullscreen manipulations, etc.  Its overall responsibility is
-** to make sure that a functional OpenGL subsystem is operating
-** when it returns to the ref.
-*/
-void GLimp_Init( void )
-{
-	char	buf[1024];
-	cvar_t *lastValidRenderer = ri.Cvar_Get( "r_lastValidRenderer", "(uninitialized)", CVAR_ARCHIVE );
-	cvar_t	*cv;
-
-	ri.Printf( PRINT_ALL, "Initializing OpenGL subsystem\n" );
-
-	//
-	// check OS version to see if we can do fullscreen display changes
-	//
-	if ( !GLW_CheckOSVersion() )
-	{
-		ri.Error( ERR_FATAL, "GLimp_Init() - incorrect operating system\n" );
-	}
-
-	// save off hInstance and wndproc
-	cv = ri.Cvar_Get( "win_hinstance", "", 0 );
-	sscanf( cv->string, "%zu", (uintptr_t*)&g_wv.hInstance);
-
-	cv = ri.Cvar_Get( "win_wndproc", "", 0 );
-	sscanf( cv->string, "%zu", (uintptr_t*)&glw_state.wndproc );
-
-	r_allowSoftwareGL = ri.Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
-	r_maskMinidriver = ri.Cvar_Get( "r_maskMinidriver", "0", CVAR_LATCH );
-
-	// load appropriate DLL and initialize subsystem
-	GLW_StartOpenGL();
-
-	// get our config strings
-	Q_strncpyz( glConfig.vendor_string, qglGetString (GL_VENDOR), sizeof( glConfig.vendor_string ) );
-	Q_strncpyz( glConfig.renderer_string, qglGetString (GL_RENDERER), sizeof( glConfig.renderer_string ) );
-	Q_strncpyz( glConfig.version_string, qglGetString (GL_VERSION), sizeof( glConfig.version_string ) );
-	Q_strncpyz( glConfig.extensions_string, qglGetString (GL_EXTENSIONS), sizeof( glConfig.extensions_string ) );
-
-	//
-	// chipset specific configuration
-	//
-	Q_strncpyz( buf, glConfig.renderer_string, sizeof(buf) );
-	Q_strlwr( buf );
-
-	//
-	// NOTE: if changing cvars, do it within this block.  This allows them
-	// to be overridden when testing driver fixes, etc. but only sets
-	// them to their default state when the hardware is first installed/run.
-	//
-	if ( Q_stricmp( lastValidRenderer->string, glConfig.renderer_string ) )
-	{
-		glConfig.hardwareType = GLHW_GENERIC;
-
-		ri.Cvar_Set( "r_textureMode", "GL_LINEAR_MIPMAP_NEAREST" );
-
-		// VOODOO GRAPHICS w/ 2MB
-		if ( strstr( buf, "voodoo graphics/1 tmu/2 mb" ) )
-		{
-			ri.Cvar_Set( "r_picmip", "2" );
-			ri.Cvar_Get( "r_picmip", "1", CVAR_ARCHIVE | CVAR_LATCH );
-		}
-		else
-		{
-			ri.Cvar_Set( "r_picmip", "1" );
-
-			if ( strstr( buf, "rage 128" ) || strstr( buf, "rage128" ) )
-			{
-				ri.Cvar_Set( "r_finish", "0" );
-			}
-			// Savage3D and Savage4 should always have trilinear enabled
-			else if ( strstr( buf, "savage3d" ) || strstr( buf, "s3 savage4" ) )
-			{
-				ri.Cvar_Set( "r_texturemode", "GL_LINEAR_MIPMAP_LINEAR" );
-			}
-		}
-	}
-	
-	//
-	// this is where hardware specific workarounds that should be
-	// detected/initialized every startup should go.
-	//
-	if ( strstr( buf, "banshee" ) || strstr( buf, "voodoo3" ) )
-	{
-		glConfig.hardwareType = GLHW_3DFX_2D3D;
-	}
-	// VOODOO GRAPHICS w/ 2MB
-	else if ( strstr( buf, "voodoo graphics/1 tmu/2 mb" ) )
-	{
-	}
-	else if ( strstr( buf, "glzicd" ) )
-	{
-	}
-	else if ( strstr( buf, "rage pro" ) || strstr( buf, "Rage Pro" ) || strstr( buf, "ragepro" ) )
-	{
-		glConfig.hardwareType = GLHW_RAGEPRO;
-	}
-	else if ( strstr( buf, "rage 128" ) )
-	{
-	}
-	else if ( strstr( buf, "permedia2" ) )
-	{
-		glConfig.hardwareType = GLHW_PERMEDIA2;
-	}
-	else if ( strstr( buf, "riva 128" ) )
-	{
-		glConfig.hardwareType = GLHW_RIVA128;
-	}
-	else if ( strstr( buf, "riva tnt " ) )
-	{
-	}
-
-	ri.Cvar_Set( "r_lastValidRenderer", glConfig.renderer_string );
-
-	GLW_InitExtensions();
-	WG_CheckHardwareGamma();
-}
-
-/*
-** GLimp_Shutdown
-**
-** This routine does all OS specific shutdown procedures for the OpenGL
-** subsystem.
-*/
-void GLimp_Shutdown( void )
-{
-//	const char *strings[] = { "soft", "hard" };
-	const char *success[] = { "failed", "success" };
-	int retVal;
-
-	// FIXME: Brian, we need better fallbacks from partially initialized failures
-	if ( !qwglMakeCurrent ) {
-		return;
-	}
-
-	ri.Printf( PRINT_ALL, "Shutting down OpenGL subsystem\n" );
-
-	// restore gamma.  We do this first because 3Dfx's extension needs a valid OGL subsystem
-	WG_RestoreGamma();
-
-	// set current context to NULL
-	if ( qwglMakeCurrent )
-	{
-		retVal = qwglMakeCurrent( NULL, NULL ) != 0;
-
-		ri.Printf( PRINT_ALL, "...wglMakeCurrent( NULL, NULL ): %s\n", success[retVal] );
-	}
-
-	// delete HGLRC
-	if ( glw_state.hGLRC )
-	{
-		retVal = qwglDeleteContext( glw_state.hGLRC ) != 0;
-		ri.Printf( PRINT_ALL, "...deleting GL context: %s\n", success[retVal] );
-		glw_state.hGLRC = NULL;
-	}
-
-	// release DC
-	if ( glw_state.hDC )
-	{
-		retVal = ReleaseDC( g_wv.hWnd, glw_state.hDC ) != 0;
-		ri.Printf( PRINT_ALL, "...releasing DC: %s\n", success[retVal] );
-		glw_state.hDC   = NULL;
-	}
-
-	// destroy window
-	if ( g_wv.hWnd )
-	{
-		ri.Printf( PRINT_ALL, "...destroying window\n" );
-		ShowWindow( g_wv.hWnd, SW_HIDE );
-		DestroyWindow( g_wv.hWnd );
-		g_wv.hWnd = NULL;
-		glw_state.pixelFormatSet = qfalse;
-	}
-
-	// close the r_logFile
-	if ( glw_state.log_fp )
-	{
-		fclose( glw_state.log_fp );
-		glw_state.log_fp = 0;
-	}
-
-	// reset display settings
-	if ( glw_state.cdsFullscreen )
-	{
-		ri.Printf( PRINT_ALL, "...resetting display\n" );
-		ChangeDisplaySettings( 0, 0 );
-		glw_state.cdsFullscreen = qfalse;
-	}
-
-	// shutdown QGL subsystem
-	QGL_Shutdown();
-
-	memset( &glConfig, 0, sizeof( glConfig ) );
-	memset( &glState, 0, sizeof( glState ) );
-}
-
-/*
-** GLimp_LogComment
-*/
-void GLimp_LogComment( char *comment ) 
-{
-	if ( glw_state.log_fp ) {
-		fprintf( glw_state.log_fp, "%s", comment );
-	}
-}
-
-
-/*
-===========================================================
-
-SMP acceleration
-
-===========================================================
-*/
-
-HANDLE	renderCommandsEvent;
-HANDLE	renderCompletedEvent;
-HANDLE	renderActiveEvent;
-
-void (*glimpRenderThread)( void );
-
-void GLimp_RenderThreadWrapper( void ) {
-	glimpRenderThread();
-
-	// unbind the context before we die
-	qwglMakeCurrent( glw_state.hDC, NULL );
-}
-
-/*
-=======================
-GLimp_SpawnRenderThread
-=======================
-*/
-HANDLE	renderThreadHandle;
-int		renderThreadId;
-qboolean GLimp_SpawnRenderThread( void (*function)( void ) ) {
-
-	renderCommandsEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
-	renderCompletedEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
-	renderActiveEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
-
-	glimpRenderThread = function;
-
-	renderThreadHandle = CreateThread(
-	   NULL,	// LPSECURITY_ATTRIBUTES lpsa,
-	   0,		// DWORD cbStack,
-	   (LPTHREAD_START_ROUTINE)GLimp_RenderThreadWrapper,	// LPTHREAD_START_ROUTINE lpStartAddr,
-	   0,			// LPVOID lpvThreadParm,
-	   0,			//   DWORD fdwCreate,
-	   &renderThreadId );
-
-	if ( !renderThreadHandle ) {
-		return qfalse;
-	}
-
-	return qtrue;
-}
-
-static	void	*smpData;
-static	int		wglErrors;
-
-void *GLimp_RendererSleep( void ) {
-	void	*data;
-
-	if ( !qwglMakeCurrent( glw_state.hDC, NULL ) ) {
-		wglErrors++;
-	}
-
-	ResetEvent( renderActiveEvent );
-
-	// after this, the front end can exit GLimp_FrontEndSleep
-	SetEvent( renderCompletedEvent );
-
-	WaitForSingleObject( renderCommandsEvent, INFINITE );
-
-	if ( !qwglMakeCurrent( glw_state.hDC, glw_state.hGLRC ) ) {
-		wglErrors++;
-	}
-
-	ResetEvent( renderCompletedEvent );
-	ResetEvent( renderCommandsEvent );
-
-	data = smpData;
-
-	// after this, the main thread can exit GLimp_WakeRenderer
-	SetEvent( renderActiveEvent );
-
-	return data;
-}
-
-
-void GLimp_FrontEndSleep( void ) {
-	WaitForSingleObject( renderCompletedEvent, INFINITE );
-
-	if ( !qwglMakeCurrent( glw_state.hDC, glw_state.hGLRC ) ) {
-		wglErrors++;
-	}
-}
-
-
-void GLimp_WakeRenderer( void *data ) {
-	smpData = data;
-
-	if ( !qwglMakeCurrent( glw_state.hDC, NULL ) ) {
-		wglErrors++;
-	}
-
-	// after this, the renderer can continue through GLimp_RendererSleep
-	SetEvent( renderCommandsEvent );
-
-	WaitForSingleObject( renderActiveEvent, INFINITE );
-}
-
diff --git a/code/win32/win_input.c b/code/win32/win_input.c
deleted file mode 100644
index 60e600dc..00000000
--- a/code/win32/win_input.c
+++ /dev/null
@@ -1,1149 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// win_input.c -- win32 mouse and joystick code
-// 02/21/97 JCB Added extended DirectInput code to support external controllers.
-
-#include "../client/client.h"
-#include "win_local.h"
-
-
-typedef struct {
-	int			oldButtonState;
-
-	qboolean	mouseActive;
-	qboolean	mouseInitialized;
-  qboolean  mouseStartupDelayed; // delay mouse init to try DI again when we have a window
-} WinMouseVars_t;
-
-static WinMouseVars_t s_wmv;
-
-static int	window_center_x, window_center_y;
-
-//
-// MIDI definitions
-//
-static void IN_StartupMIDI( void );
-static void IN_ShutdownMIDI( void );
-
-#define MAX_MIDIIN_DEVICES	8
-
-typedef struct {
-	int			numDevices;
-	MIDIINCAPS	caps[MAX_MIDIIN_DEVICES];
-
-	HMIDIIN		hMidiIn;
-} MidiInfo_t;
-
-static MidiInfo_t s_midiInfo;
-
-//
-// Joystick definitions
-//
-#define	JOY_MAX_AXES		6				// X, Y, Z, R, U, V
-
-typedef struct {
-	qboolean	avail;
-	int			id;			// joystick number
-	JOYCAPS		jc;
-
-	int			oldbuttonstate;
-	int			oldpovstate;
-
-	JOYINFOEX	ji;
-} joystickInfo_t;
-
-static	joystickInfo_t	joy;
-
-
-
-cvar_t	*in_midi;
-cvar_t	*in_midiport;
-cvar_t	*in_midichannel;
-cvar_t	*in_mididevice;
-
-cvar_t	*in_mouse;
-cvar_t  *in_logitechbug;
-cvar_t	*in_joystick;
-cvar_t	*in_joyBallScale;
-cvar_t	*in_debugJoystick;
-cvar_t	*joy_threshold;
-
-qboolean	in_appactive;
-
-// forward-referenced functions
-void IN_StartupJoystick (void);
-void IN_JoyMove(void);
-
-static void MidiInfo_f( void );
-
-/*
-============================================================
-
-WIN32 MOUSE CONTROL
-
-============================================================
-*/
-
-/*
-================
-IN_InitWin32Mouse
-================
-*/
-void IN_InitWin32Mouse( void ) 
-{
-}
-
-/*
-================
-IN_ShutdownWin32Mouse
-================
-*/
-void IN_ShutdownWin32Mouse( void ) {
-}
-
-/*
-================
-IN_ActivateWin32Mouse
-================
-*/
-void IN_ActivateWin32Mouse( void ) {
-	int			width, height;
-	RECT		window_rect;
-
-	width = GetSystemMetrics (SM_CXSCREEN);
-	height = GetSystemMetrics (SM_CYSCREEN);
-
-	GetWindowRect ( g_wv.hWnd, &window_rect);
-	if (window_rect.left < 0)
-		window_rect.left = 0;
-	if (window_rect.top < 0)
-		window_rect.top = 0;
-	if (window_rect.right >= width)
-		window_rect.right = width-1;
-	if (window_rect.bottom >= height-1)
-		window_rect.bottom = height-1;
-	window_center_x = (window_rect.right + window_rect.left)/2;
-	window_center_y = (window_rect.top + window_rect.bottom)/2;
-
-	SetCursorPos (window_center_x, window_center_y);
-
-	SetCapture ( g_wv.hWnd );
-	ClipCursor (&window_rect);
-	while (ShowCursor (FALSE) >= 0)
-		;
-}
-
-/*
-================
-IN_DeactivateWin32Mouse
-================
-*/
-void IN_DeactivateWin32Mouse( void ) 
-{
-	ClipCursor (NULL);
-	ReleaseCapture ();
-	while (ShowCursor (TRUE) < 0)
-		;
-}
-
-/*
-================
-IN_Win32Mouse
-================
-*/
-void IN_Win32Mouse( int *mx, int *my ) {
-	POINT		current_pos;
-
-	// find mouse movement
-	GetCursorPos (&current_pos);
-
-	// force the mouse to the center, so there's room to move
-	SetCursorPos (window_center_x, window_center_y);
-
-	*mx = current_pos.x - window_center_x;
-	*my = current_pos.y - window_center_y;
-}
-
-
-/*
-============================================================
-
-DIRECT INPUT MOUSE CONTROL
-
-============================================================
-*/
-
-#undef DEFINE_GUID
-
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        EXTERN_C const GUID name \
-                = { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-
-DEFINE_GUID(GUID_SysMouse,   0x6F1D2B60,0xD5A0,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_XAxis,   0xA36D02E0,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_YAxis,   0xA36D02E1,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-DEFINE_GUID(GUID_ZAxis,   0xA36D02E2,0xC9F3,0x11CF,0xBF,0xC7,0x44,0x45,0x53,0x54,0x00,0x00);
-
-
-#define DINPUT_BUFFERSIZE           16
-#define iDirectInputCreate(a,b,c,d)	pDirectInputCreate(a,b,c,d)
-
-HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
-	LPDIRECTINPUT * lplpDirectInput, LPUNKNOWN punkOuter);
-
-static HINSTANCE hInstDI;
-
-typedef struct MYDATA {
-	LONG  lX;                   // X axis goes here
-	LONG  lY;                   // Y axis goes here
-	LONG  lZ;                   // Z axis goes here
-	BYTE  bButtonA;             // One button goes here
-	BYTE  bButtonB;             // Another button goes here
-	BYTE  bButtonC;             // Another button goes here
-	BYTE  bButtonD;             // Another button goes here
-} MYDATA;
-
-static DIOBJECTDATAFORMAT rgodf[] = {
-  { &GUID_XAxis,    FIELD_OFFSET(MYDATA, lX),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_YAxis,    FIELD_OFFSET(MYDATA, lY),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_ZAxis,    FIELD_OFFSET(MYDATA, lZ),       0x80000000 | DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonA), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonB), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonC), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonD), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-};
-
-#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
-
-// NOTE TTimo: would be easier using c_dfDIMouse or c_dfDIMouse2 
-static DIDATAFORMAT	df = {
-	sizeof(DIDATAFORMAT),       // this structure
-	sizeof(DIOBJECTDATAFORMAT), // size of object data format
-	DIDF_RELAXIS,               // absolute axis coordinates
-	sizeof(MYDATA),             // device data size
-	NUM_OBJECTS,                // number of objects
-	rgodf,                      // and here they are
-};
-
-static LPDIRECTINPUT		g_pdi;
-static LPDIRECTINPUTDEVICE	g_pMouse;
-
-void IN_DIMouse( int *mx, int *my );
-
-/*
-========================
-IN_InitDIMouse
-========================
-*/
-qboolean IN_InitDIMouse( void ) {
-    HRESULT		hr;
-	int			x, y;
-	DIPROPDWORD	dipdw = {
-		{
-			sizeof(DIPROPDWORD),        // diph.dwSize
-			sizeof(DIPROPHEADER),       // diph.dwHeaderSize
-			0,                          // diph.dwObj
-			DIPH_DEVICE,                // diph.dwHow
-		},
-		DINPUT_BUFFERSIZE,              // dwData
-	};
-
-	Com_Printf( "Initializing DirectInput...\n");
-
-	if (!hInstDI) {
-		hInstDI = LoadLibrary("dinput.dll");
-		
-		if (hInstDI == NULL) {
-			Com_Printf ("Couldn't load dinput.dll\n");
-			return qfalse;
-		}
-	}
-
-	if (!pDirectInputCreate) {
-		pDirectInputCreate = (long (__stdcall *)(void *,unsigned long ,struct IDirectInputA ** ,struct IUnknown *))
-			GetProcAddress(hInstDI,"DirectInputCreateA");
-
-		if (!pDirectInputCreate) {
-			Com_Printf ("Couldn't get DI proc addr\n");
-			return qfalse;
-		}
-	}
-
-	// register with DirectInput and get an IDirectInput to play with.
-	hr = iDirectInputCreate( g_wv.hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL);
-
-	if (FAILED(hr)) {
-		Com_Printf ("iDirectInputCreate failed\n");
-		return qfalse;
-	}
-
-	// obtain an interface to the system mouse device.
-	hr = IDirectInput_CreateDevice(g_pdi, &GUID_SysMouse, &g_pMouse, NULL);
-
-	if (FAILED(hr)) {
-		Com_Printf ("Couldn't open DI mouse device\n");
-		return qfalse;
-	}
-
-	// set the data format to "mouse format".
-	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &df);
-
-	if (FAILED(hr)) 	{
-		Com_Printf ("Couldn't set DI mouse format\n");
-		return qfalse;
-	}
-
-	// set the cooperativity level.
-	hr = IDirectInputDevice_SetCooperativeLevel(g_pMouse, g_wv.hWnd,
-			DISCL_EXCLUSIVE | DISCL_FOREGROUND);
-
-	// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=50
-	if (FAILED(hr)) {
-		Com_Printf ("Couldn't set DI coop level\n");
-		return qfalse;
-	}
-
-
-	// set the buffer size to DINPUT_BUFFERSIZE elements.
-	// the buffer size is a DWORD property associated with the device
-	hr = IDirectInputDevice_SetProperty(g_pMouse, DIPROP_BUFFERSIZE, &dipdw.diph);
-
-	if (FAILED(hr)) {
-		Com_Printf ("Couldn't set DI buffersize\n");
-		return qfalse;
-	}
-
-	// clear any pending samples
-	IN_DIMouse( &x, &y );
-	IN_DIMouse( &x, &y );
-
-	Com_Printf( "DirectInput initialized.\n");
-	return qtrue;
-}
-
-/*
-==========================
-IN_ShutdownDIMouse
-==========================
-*/
-void IN_ShutdownDIMouse( void ) {
-    if (g_pMouse) {
-		IDirectInputDevice_Release(g_pMouse);
-		g_pMouse = NULL;
-	}
-
-    if (g_pdi) {
-		IDirectInput_Release(g_pdi);
-		g_pdi = NULL;
-	}
-}
-
-/*
-==========================
-IN_ActivateDIMouse
-==========================
-*/
-void IN_ActivateDIMouse( void ) {
-	HRESULT		hr;
-
-	if (!g_pMouse) {
-		return;
-	}
-
-	// we may fail to reacquire if the window has been recreated
-	hr = IDirectInputDevice_Acquire( g_pMouse );
-	if (FAILED(hr)) {
-		if ( !IN_InitDIMouse() ) {
-			Com_Printf ("Falling back to Win32 mouse support...\n");
-			Cvar_Set( "in_mouse", "-1" );
-		}
-	}
-}
-
-/*
-==========================
-IN_DeactivateDIMouse
-==========================
-*/
-void IN_DeactivateDIMouse( void ) {
-	if (!g_pMouse) {
-		return;
-	}
-	IDirectInputDevice_Unacquire( g_pMouse );
-}
-
-
-/*
-===================
-IN_DIMouse
-===================
-*/
-void IN_DIMouse( int *mx, int *my ) {
-	DIDEVICEOBJECTDATA	od;
-	DIMOUSESTATE		state;
-	DWORD				dwElements;
-	HRESULT				hr;
-  int value;
-	static float		oldSysTime;
-
-	if ( !g_pMouse ) {
-		return;
-	}
-
-	// fetch new events
-	for (;;)
-	{
-		dwElements = 1;
-
-		hr = IDirectInputDevice_GetDeviceData(g_pMouse,
-				sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
-		if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED)) {
-			IDirectInputDevice_Acquire(g_pMouse);
-			return;
-		}
-
-		/* Unable to read data or no data available */
-		if ( FAILED(hr) ) {
-			break;
-		}
-
-		if ( dwElements == 0 ) {
-			break;
-		}
-
-		switch (od.dwOfs) {
-		case DIMOFS_BUTTON0:
-			if (od.dwData & 0x80)
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE1, qtrue, 0, NULL );
-			else
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE1, qfalse, 0, NULL );
-			break;
-
-		case DIMOFS_BUTTON1:
-			if (od.dwData & 0x80)
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE2, qtrue, 0, NULL );
-			else
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE2, qfalse, 0, NULL );
-			break;
-			
-		case DIMOFS_BUTTON2:
-			if (od.dwData & 0x80)
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE3, qtrue, 0, NULL );
-			else
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE3, qfalse, 0, NULL );
-			break;
-
-		case DIMOFS_BUTTON3:
-			if (od.dwData & 0x80)
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE4, qtrue, 0, NULL );
-			else
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MOUSE4, qfalse, 0, NULL );
-			break;      
-    // https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=50
-		case DIMOFS_Z:
-			value = od.dwData;
-			if (value == 0) {
-
-			} else if (value < 0) {
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MWHEELDOWN, qtrue, 0, NULL );
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MWHEELDOWN, qfalse, 0, NULL );
-			} else {
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MWHEELUP, qtrue, 0, NULL );
-				Sys_QueEvent( od.dwTimeStamp, SE_KEY, K_MWHEELUP, qfalse, 0, NULL );
-			}
-			break;
-		}
-	}
-
-	// read the raw delta counter and ignore
-	// the individual sample time / values
-	hr = IDirectInputDevice_GetDeviceState(g_pMouse,
-			sizeof(DIDEVICEOBJECTDATA), &state);
-	if ( FAILED(hr) ) {
-		*mx = *my = 0;
-		return;
-	}
-	*mx = state.lX;
-	*my = state.lY;
-}
-
-/*
-============================================================
-
-  MOUSE CONTROL
-
-============================================================
-*/
-
-/*
-===========
-IN_ActivateMouse
-
-Called when the window gains focus or changes in some way
-===========
-*/
-void IN_ActivateMouse( void ) 
-{
-	if (!s_wmv.mouseInitialized ) {
-		return;
-	}
-	if ( !in_mouse->integer ) 
-	{
-		s_wmv.mouseActive = qfalse;
-		return;
-	}
-	if ( s_wmv.mouseActive ) 
-	{
-		return;
-	}
-
-	s_wmv.mouseActive = qtrue;
-
-	if ( in_mouse->integer != -1 ) {
-		IN_ActivateDIMouse();
-	}
-	IN_ActivateWin32Mouse();
-}
-
-
-/*
-===========
-IN_DeactivateMouse
-
-Called when the window loses focus
-===========
-*/
-void IN_DeactivateMouse( void ) {
-	if (!s_wmv.mouseInitialized ) {
-		return;
-	}
-	if (!s_wmv.mouseActive ) {
-		return;
-	}
-	s_wmv.mouseActive = qfalse;
-
-	IN_DeactivateDIMouse();
-	IN_DeactivateWin32Mouse();
-}
-
-
-
-/*
-===========
-IN_StartupMouse
-===========
-*/
-void IN_StartupMouse( void ) 
-{
-	s_wmv.mouseInitialized = qfalse;
-  s_wmv.mouseStartupDelayed = qfalse;
-
-	if ( in_mouse->integer == 0 ) {
-		Com_Printf ("Mouse control not active.\n");
-		return;
-	}
-
-	// nt4.0 direct input is screwed up
-	if ( ( g_wv.osversion.dwPlatformId == VER_PLATFORM_WIN32_NT ) &&
-		 ( g_wv.osversion.dwMajorVersion == 4 ) )
-	{
-		Com_Printf ("Disallowing DirectInput on NT 4.0\n");
-		Cvar_Set( "in_mouse", "-1" );
-	}
-
-	if ( in_mouse->integer == -1 ) {
-		Com_Printf ("Skipping check for DirectInput\n");
-	} else {
-    if (!g_wv.hWnd)
-    {
-      Com_Printf ("No window for DirectInput mouse init, delaying\n");
-      s_wmv.mouseStartupDelayed = qtrue;
-      return;
-    }
-		if ( IN_InitDIMouse() ) {
-	    s_wmv.mouseInitialized = qtrue;
-			return;
-		}
-		Com_Printf ("Falling back to Win32 mouse support...\n");
-	}
-	s_wmv.mouseInitialized = qtrue;
-	IN_InitWin32Mouse();
-}
-
-/*
-===========
-IN_MouseEvent
-===========
-*/
-void IN_MouseEvent (int mstate)
-{
-	int		i;
-
-	if ( !s_wmv.mouseInitialized )
-		return;
-
-// perform button actions
-	for  (i = 0 ; i < 3 ; i++ )
-	{
-		if ( (mstate & (1<<i)) &&
-			!(s_wmv.oldButtonState & (1<<i)) )
-		{
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MOUSE1 + i, qtrue, 0, NULL );
-		}
-
-		if ( !(mstate & (1<<i)) &&
-			(s_wmv.oldButtonState & (1<<i)) )
-		{
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MOUSE1 + i, qfalse, 0, NULL );
-		}
-	}	
-
-	s_wmv.oldButtonState = mstate;
-}
-
-
-/*
-===========
-IN_MouseMove
-===========
-*/
-void IN_MouseMove ( void ) {
-	int		mx, my;
-
-	if ( g_pMouse ) {
-		IN_DIMouse( &mx, &my );
-	} else {
-		IN_Win32Mouse( &mx, &my );
-	}
-
-	if ( !mx && !my ) {
-		return;
-	}
-
-	Sys_QueEvent( 0, SE_MOUSE, mx, my, 0, NULL );
-}
-
-
-/*
-=========================================================================
-
-=========================================================================
-*/
-
-/*
-===========
-IN_Startup
-===========
-*/
-void IN_Startup( void ) {
-	Com_Printf ("\n------- Input Initialization -------\n");
-	IN_StartupMouse ();
-	IN_StartupJoystick ();
-	IN_StartupMIDI();
-	Com_Printf ("------------------------------------\n");
-
-	in_mouse->modified = qfalse;
-	in_joystick->modified = qfalse;
-}
-
-/*
-===========
-IN_Shutdown
-===========
-*/
-void IN_Shutdown( void ) {
-	IN_DeactivateMouse();
-	IN_ShutdownDIMouse();
-	IN_ShutdownMIDI();
-	Cmd_RemoveCommand("midiinfo" );
-}
-
-
-/*
-===========
-IN_Init
-===========
-*/
-void IN_Init( void ) {
-	// MIDI input controler variables
-	in_midi					= Cvar_Get ("in_midi",					"0",		CVAR_ARCHIVE);
-	in_midiport				= Cvar_Get ("in_midiport",				"1",		CVAR_ARCHIVE);
-	in_midichannel			= Cvar_Get ("in_midichannel",			"1",		CVAR_ARCHIVE);
-	in_mididevice			= Cvar_Get ("in_mididevice",			"0",		CVAR_ARCHIVE);
-
-	Cmd_AddCommand( "midiinfo", MidiInfo_f );
-
-	// mouse variables
-  in_mouse				= Cvar_Get ("in_mouse",					"1",		CVAR_ARCHIVE|CVAR_LATCH);
-	in_logitechbug  = Cvar_Get ("in_logitechbug", "0", CVAR_ARCHIVE);
-
-	// joystick variables
-	in_joystick				= Cvar_Get ("in_joystick",				"0",		CVAR_ARCHIVE|CVAR_LATCH);
-	in_joyBallScale			= Cvar_Get ("in_joyBallScale",			"0.02",		CVAR_ARCHIVE);
-	in_debugJoystick		= Cvar_Get ("in_debugjoystick",			"0",		CVAR_TEMP);
-
-	joy_threshold			= Cvar_Get ("joy_threshold",			"0.15",		CVAR_ARCHIVE);
-
-	IN_Startup();
-}
-
-
-/*
-===========
-IN_Activate
-
-Called when the main window gains or loses focus.
-The window may have been destroyed and recreated
-between a deactivate and an activate.
-===========
-*/
-void IN_Activate (qboolean active) {
-	in_appactive = active;
-
-	if ( !active )
-	{
-		IN_DeactivateMouse();
-	}
-}
-
-
-/*
-==================
-IN_Frame
-
-Called every frame, even if not generating commands
-==================
-*/
-void IN_Frame (void) {
-	// post joystick events
-	IN_JoyMove();
-
-	if ( !s_wmv.mouseInitialized ) {
-    if (s_wmv.mouseStartupDelayed && g_wv.hWnd)
-		{
-			Com_Printf("Proceeding with delayed mouse init\n");
-      IN_StartupMouse();
-			s_wmv.mouseStartupDelayed = qfalse;
-		}
-		return;
-	}
-
-	if ( cls.keyCatchers & KEYCATCH_CONSOLE ) {
-		// temporarily deactivate if not in the game and
-		// running on the desktop
-		// voodoo always counts as full screen
-		if (Cvar_VariableValue ("r_fullscreen") == 0
-			&& strcmp( Cvar_VariableString("r_glDriver"), _3DFX_DRIVER_NAME) )	{
-			IN_DeactivateMouse ();
-			return;
-		}
-	}
-
-	if ( !in_appactive ) {
-		IN_DeactivateMouse ();
-		return;
-	}
-
-	IN_ActivateMouse();
-
-	// post events to the system que
-	IN_MouseMove();
-
-}
-
-
-/*
-===================
-IN_ClearStates
-===================
-*/
-void IN_ClearStates (void) 
-{
-	s_wmv.oldButtonState = 0;
-}
-
-
-/*
-=========================================================================
-
-JOYSTICK
-
-=========================================================================
-*/
-
-/* 
-=============== 
-IN_StartupJoystick 
-=============== 
-*/  
-void IN_StartupJoystick (void) { 
-	int			numdevs;
-	MMRESULT	mmr;
-
-	// assume no joystick
-	joy.avail = qfalse; 
-
-	if (! in_joystick->integer ) {
-		Com_Printf ("Joystick is not active.\n");
-		return;
-	}
-
-	// verify joystick driver is present
-	if ((numdevs = joyGetNumDevs ()) == 0)
-	{
-		Com_Printf ("joystick not found -- driver not present\n");
-		return;
-	}
-
-	// cycle through the joystick ids for the first valid one
-	mmr = 0;
-	for (joy.id=0 ; joy.id<numdevs ; joy.id++)
-	{
-		Com_Memset (&joy.ji, 0, sizeof(joy.ji));
-		joy.ji.dwSize = sizeof(joy.ji);
-		joy.ji.dwFlags = JOY_RETURNCENTERED;
-
-		if ((mmr = joyGetPosEx (joy.id, &joy.ji)) == JOYERR_NOERROR)
-			break;
-	} 
-
-	// abort startup if we didn't find a valid joystick
-	if (mmr != JOYERR_NOERROR)
-	{
-		Com_Printf ("joystick not found -- no valid joysticks (%x)\n", mmr);
-		return;
-	}
-
-	// get the capabilities of the selected joystick
-	// abort startup if command fails
-	Com_Memset (&joy.jc, 0, sizeof(joy.jc));
-	if ((mmr = joyGetDevCaps (joy.id, &joy.jc, sizeof(joy.jc))) != JOYERR_NOERROR)
-	{
-		Com_Printf ("joystick not found -- invalid joystick capabilities (%x)\n", mmr); 
-		return;
-	}
-
-	Com_Printf( "Joystick found.\n" );
-	Com_Printf( "Pname: %s\n", joy.jc.szPname );
-	Com_Printf( "OemVxD: %s\n", joy.jc.szOEMVxD );
-	Com_Printf( "RegKey: %s\n", joy.jc.szRegKey );
-
-	Com_Printf( "Numbuttons: %i / %i\n", joy.jc.wNumButtons, joy.jc.wMaxButtons );
-	Com_Printf( "Axis: %i / %i\n", joy.jc.wNumAxes, joy.jc.wMaxAxes );
-	Com_Printf( "Caps: 0x%x\n", joy.jc.wCaps );
-	if ( joy.jc.wCaps & JOYCAPS_HASPOV ) {
-		Com_Printf( "HASPOV\n" );
-	} else {
-		Com_Printf( "no POV\n" );
-	}
-
-	// old button and POV states default to no buttons pressed
-	joy.oldbuttonstate = 0;
-	joy.oldpovstate = 0;
-
-	// mark the joystick as available
-	joy.avail = qtrue; 
-}
-
-/*
-===========
-JoyToF
-===========
-*/
-float JoyToF( int value ) {
-	float	fValue;
-
-	// move centerpoint to zero
-	value -= 32768;
-
-	// convert range from -32768..32767 to -1..1 
-	fValue = (float)value / 32768.0;
-
-	if ( fValue < -1 ) {
-		fValue = -1;
-	}
-	if ( fValue > 1 ) {
-		fValue = 1;
-	}
-	return fValue;
-}
-
-int JoyToI( int value ) {
-	// move centerpoint to zero
-	value -= 32768;
-
-	return value;
-}
-
-int	joyDirectionKeys[16] = {
-	K_LEFTARROW, K_RIGHTARROW,
-	K_UPARROW, K_DOWNARROW,
-	K_JOY16, K_JOY17,
-	K_JOY18, K_JOY19,
-	K_JOY20, K_JOY21,
-	K_JOY22, K_JOY23,
-
-	K_JOY24, K_JOY25,
-	K_JOY26, K_JOY27
-};
-
-/*
-===========
-IN_JoyMove
-===========
-*/
-void IN_JoyMove( void ) {
-	float	fAxisValue;
-	int		i;
-	DWORD	buttonstate, povstate;
-	int		x, y;
-
-	// verify joystick is available and that the user wants to use it
-	if ( !joy.avail ) {
-		return; 
-	}
-
-	// collect the joystick data, if possible
-	Com_Memset (&joy.ji, 0, sizeof(joy.ji));
-	joy.ji.dwSize = sizeof(joy.ji);
-	joy.ji.dwFlags = JOY_RETURNALL;
-
-	if ( joyGetPosEx (joy.id, &joy.ji) != JOYERR_NOERROR ) {
-		// read error occurred
-		// turning off the joystick seems too harsh for 1 read error,\
-		// but what should be done?
-		// Com_Printf ("IN_ReadJoystick: no response\n");
-		// joy.avail = false;
-		return;
-	}
-
-	if ( in_debugJoystick->integer ) {
-		Com_Printf( "%8x %5i %5.2f %5.2f %5.2f %5.2f %6i %6i\n", 
-			joy.ji.dwButtons,
-			joy.ji.dwPOV,
-			JoyToF( joy.ji.dwXpos ), JoyToF( joy.ji.dwYpos ),
-			JoyToF( joy.ji.dwZpos ), JoyToF( joy.ji.dwRpos ),
-			JoyToI( joy.ji.dwUpos ), JoyToI( joy.ji.dwVpos ) );
-	}
-
-	// loop through the joystick buttons
-	// key a joystick event or auxillary event for higher number buttons for each state change
-	buttonstate = joy.ji.dwButtons;
-	for ( i=0 ; i < joy.jc.wNumButtons ; i++ ) {
-		if ( (buttonstate & (1<<i)) && !(joy.oldbuttonstate & (1<<i)) ) {
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_JOY1 + i, qtrue, 0, NULL );
-		}
-		if ( !(buttonstate & (1<<i)) && (joy.oldbuttonstate & (1<<i)) ) {
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_JOY1 + i, qfalse, 0, NULL );
-		}
-	}
-	joy.oldbuttonstate = buttonstate;
-
-	povstate = 0;
-
-	// convert main joystick motion into 6 direction button bits
-	for (i = 0; i < joy.jc.wNumAxes && i < 4 ; i++) {
-		// get the floating point zero-centered, potentially-inverted data for the current axis
-		fAxisValue = JoyToF( (&joy.ji.dwXpos)[i] );
-
-		if ( fAxisValue < -joy_threshold->value ) {
-			povstate |= (1<<(i*2));
-		} else if ( fAxisValue > joy_threshold->value ) {
-			povstate |= (1<<(i*2+1));
-		}
-	}
-
-	// convert POV information from a direction into 4 button bits
-	if ( joy.jc.wCaps & JOYCAPS_HASPOV ) {
-		if ( joy.ji.dwPOV != JOY_POVCENTERED ) {
-			if (joy.ji.dwPOV == JOY_POVFORWARD)
-				povstate |= 1<<12;
-			if (joy.ji.dwPOV == JOY_POVBACKWARD)
-				povstate |= 1<<13;
-			if (joy.ji.dwPOV == JOY_POVRIGHT)
-				povstate |= 1<<14;
-			if (joy.ji.dwPOV == JOY_POVLEFT)
-				povstate |= 1<<15;
-		}
-	}
-
-	// determine which bits have changed and key an auxillary event for each change
-	for (i=0 ; i < 16 ; i++) {
-		if ( (povstate & (1<<i)) && !(joy.oldpovstate & (1<<i)) ) {
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, joyDirectionKeys[i], qtrue, 0, NULL );
-		}
-
-		if ( !(povstate & (1<<i)) && (joy.oldpovstate & (1<<i)) ) {
-			Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, joyDirectionKeys[i], qfalse, 0, NULL );
-		}
-	}
-	joy.oldpovstate = povstate;
-
-	// if there is a trackball like interface, simulate mouse moves
-	if ( joy.jc.wNumAxes >= 6 ) {
-		x = JoyToI( joy.ji.dwUpos ) * in_joyBallScale->value;
-		y = JoyToI( joy.ji.dwVpos ) * in_joyBallScale->value;
-		if ( x || y ) {
-			Sys_QueEvent( g_wv.sysMsgTime, SE_MOUSE, x, y, 0, NULL );
-		}
-	}
-}
-
-/*
-=========================================================================
-
-MIDI
-
-=========================================================================
-*/
-
-static void MIDI_NoteOff( int note )
-{
-	int qkey;
-
-	qkey = note - 60 + K_AUX1;
-
-	if ( qkey > 255 || qkey < K_AUX1 )
-		return;
-
-	Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, qkey, qfalse, 0, NULL );
-}
-
-static void MIDI_NoteOn( int note, int velocity )
-{
-	int qkey;
-
-	if ( velocity == 0 )
-		MIDI_NoteOff( note );
-
-	qkey = note - 60 + K_AUX1;
-
-	if ( qkey > 255 || qkey < K_AUX1 )
-		return;
-
-	Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, qkey, qtrue, 0, NULL );
-}
-
-static void CALLBACK MidiInProc( HMIDIIN hMidiIn, UINT uMsg, DWORD dwInstance, 
-								 DWORD dwParam1, DWORD dwParam2 )
-{
-	int message;
-
-	switch ( uMsg )
-	{
-	case MIM_OPEN:
-		break;
-	case MIM_CLOSE:
-		break;
-	case MIM_DATA:
-		message = dwParam1 & 0xff;
-
-		// note on
-		if ( ( message & 0xf0 ) == 0x90 )
-		{
-			if ( ( ( message & 0x0f ) + 1 ) == in_midichannel->integer )
-				MIDI_NoteOn( ( dwParam1 & 0xff00 ) >> 8, ( dwParam1 & 0xff0000 ) >> 16 );
-		}
-		else if ( ( message & 0xf0 ) == 0x80 )
-		{
-			if ( ( ( message & 0x0f ) + 1 ) == in_midichannel->integer )
-				MIDI_NoteOff( ( dwParam1 & 0xff00 ) >> 8 );
-		}
-		break;
-	case MIM_LONGDATA:
-		break;
-	case MIM_ERROR:
-		break;
-	case MIM_LONGERROR:
-		break;
-	}
-
-//	Sys_QueEvent( sys_msg_time, SE_KEY, wMsg, qtrue, 0, NULL );
-}
-
-static void MidiInfo_f( void )
-{
-	int i;
-
-	const char *enableStrings[] = { "disabled", "enabled" };
-
-	Com_Printf( "\nMIDI control:       %s\n", enableStrings[in_midi->integer != 0] );
-	Com_Printf( "port:               %d\n", in_midiport->integer );
-	Com_Printf( "channel:            %d\n", in_midichannel->integer );
-	Com_Printf( "current device:     %d\n", in_mididevice->integer );
-	Com_Printf( "number of devices:  %d\n", s_midiInfo.numDevices );
-	for ( i = 0; i < s_midiInfo.numDevices; i++ )
-	{
-		if ( i == Cvar_VariableValue( "in_mididevice" ) )
-			Com_Printf( "***" );
-		else
-			Com_Printf( "..." );
-		Com_Printf(    "device %2d:       %s\n", i, s_midiInfo.caps[i].szPname );
-		Com_Printf( "...manufacturer ID: 0x%hx\n", s_midiInfo.caps[i].wMid );
-		Com_Printf( "...product ID:      0x%hx\n", s_midiInfo.caps[i].wPid );
-
-		Com_Printf( "\n" );
-	}
-}
-
-static void IN_StartupMIDI( void )
-{
-	int i;
-
-	if ( !Cvar_VariableValue( "in_midi" ) )
-		return;
-
-	//
-	// enumerate MIDI IN devices
-	//
-	s_midiInfo.numDevices = midiInGetNumDevs();
-
-	for ( i = 0; i < s_midiInfo.numDevices; i++ )
-	{
-		midiInGetDevCaps( i, &s_midiInfo.caps[i], sizeof( s_midiInfo.caps[i] ) );
-	}
-
-	//
-	// open the MIDI IN port
-	//
-	if ( midiInOpen( &s_midiInfo.hMidiIn, 
-		             in_mididevice->integer,
-					 ( DWORD_PTR ) MidiInProc,
-					 ( DWORD_PTR ) NULL,
-					 CALLBACK_FUNCTION ) != MMSYSERR_NOERROR )
-	{
-		Com_Printf( "WARNING: could not open MIDI device %d: '%s'\n", in_mididevice->integer , s_midiInfo.caps[( int ) in_mididevice->value] );
-		return;
-	}
-
-	midiInStart( s_midiInfo.hMidiIn );
-}
-
-static void IN_ShutdownMIDI( void )
-{
-	if ( s_midiInfo.hMidiIn )
-	{
-		midiInClose( s_midiInfo.hMidiIn );
-	}
-	Com_Memset( &s_midiInfo, 0, sizeof( s_midiInfo ) );
-}
-
diff --git a/code/win32/win_local.h b/code/win32/win_local.h
deleted file mode 100644
index 86d512b2..00000000
--- a/code/win32/win_local.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// win_local.h: Win32-specific Quake3 header file
-
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(disable : 4201)
-#pragma warning( push )
-#endif
-#include <windows.h>
-#if defined (_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning( pop )
-#endif
-
-#define	DIRECTSOUND_VERSION	0x0300
-#define	DIRECTINPUT_VERSION	0x0300
-
-#include <dinput.h>
-#include <dsound.h>
-#include <winsock.h>
-#include <wsipx.h>
-
-void	IN_MouseEvent (int mstate);
-
-void Sys_QueEvent( int time, sysEventType_t type, int value, int value2, int ptrLength, void *ptr );
-
-void	Sys_CreateConsole( void );
-void	Sys_DestroyConsole( void );
-
-char	*Sys_ConsoleInput (void);
-
-qboolean	Sys_GetPacket ( netadr_t *net_from, msg_t *net_message );
-
-// Input subsystem
-
-void	IN_Init (void);
-void	IN_Shutdown (void);
-void	IN_JoystickCommands (void);
-
-void	IN_Move (usercmd_t *cmd);
-// add additional non keyboard / non mouse movement on top of the keyboard move cmd
-
-void	IN_DeactivateWin32Mouse( void);
-
-void	IN_Activate (qboolean active);
-void	IN_Frame (void);
-
-// window procedure
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam);
-
-void Conbuf_AppendText( const char *msg );
-
-void SNDDMA_Activate( void );
-int  SNDDMA_InitDS ();
-
-typedef struct
-{
-	
-	HINSTANCE		reflib_library;		// Handle to refresh DLL 
-	qboolean		reflib_active;
-
-	HWND			hWnd;
-	HINSTANCE		hInstance;
-	qboolean		activeApp;
-	qboolean		isMinimized;
-	OSVERSIONINFO	osversion;
-
-	// when we get a windows message, we store the time off so keyboard processing
-	// can know the exact time of an event
-	unsigned		sysMsgTime;
-} WinVars_t;
-
-extern WinVars_t	g_wv;
diff --git a/code/win32/win_main.c b/code/win32/win_main.c
deleted file mode 100644
index 3e607511..00000000
--- a/code/win32/win_main.c
+++ /dev/null
@@ -1,1608 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// win_main.c
-
-#include "../client/client.h"
-#include "../qcommon/qcommon.h"
-#include "win_local.h"
-#include "win_localization.h"
-#include "resource.h"
-#include <errno.h>
-#include <float.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <direct.h>
-#include <io.h>
-#include <conio.h>
-
-#define	CD_BASEDIR	"openmohaa"
-#define	CD_EXE		"openmohaa.exe"
-#define	CD_BASEDIR_LINUX	"bin\\x86\\glibc-2.1"
-#define	CD_EXE_LINUX "openmohaa"
-#define MEM_THRESHOLD 96*1024*1024
-
-static char		sys_cmdline[MAX_STRING_CHARS];
-static void* game_library = NULL;
-static void* cgame_library = NULL;
-
-// define this to use alternate spanking method
-// I found out that the regular way doesn't work on my box for some reason
-// see the associated spank.sh script
-#define ALT_SPANK
-#ifdef ALT_SPANK
-#include <stdio.h>
-#include <sys\stat.h>
-
-int fh = 0;
-
-void Spk_Open(char *name)
-{
-  fh = open( name, O_TRUNC | O_CREAT | O_WRONLY, S_IREAD | S_IWRITE );
-};
-
-void Spk_Close()
-{
-  if (!fh)
-    return;
-
-  close( fh );
-  fh = 0;
-}
-
-void Spk_Printf (const char *text, ...)
-{
-  va_list argptr;
-  char buf[32768];
-
-  if (!fh)
-    return;
-
-  va_start (argptr,text);
-  vsprintf (buf, text, argptr);
-  write(fh, buf, strlen(buf));
-  _commit(fh);
-  va_end (argptr);
-
-};
-#endif
-
-/*
-==================
-Sys_LowPhysicalMemory()
-==================
-*/
-
-qboolean Sys_LowPhysicalMemory() {
-	MEMORYSTATUS stat;
-  GlobalMemoryStatus (&stat);
-	return (stat.dwTotalPhys <= MEM_THRESHOLD) ? qtrue : qfalse;
-}
-
-/*
-==================
-Sys_BeginProfiling
-==================
-*/
-void Sys_BeginProfiling( void ) {
-	// this is just used on the mac build
-}
-
-/*
-=============
-Sys_Error
-
-Show the early console as an error dialog
-=============
-*/
-void QDECL Sys_Error( const char *error, ... ) {
-	va_list		argptr;
-	char		text[4096];
-    MSG        msg;
-
-	va_start (argptr, error);
-	vsprintf (text, error, argptr);
-	va_end (argptr);
-
-	Conbuf_AppendText( text );
-	Conbuf_AppendText( "\n" );
-
-	Sys_SetErrorText( text );
-	Sys_ShowConsole( 1, qtrue );
-
-	timeEndPeriod( 1 );
-
-	IN_Shutdown();
-
-	// wait for the user to quit
-	while ( 1 ) {
-		if (!GetMessage (&msg, NULL, 0, 0))
-			Com_Quit_f ();
-		TranslateMessage (&msg);
-      	DispatchMessage (&msg);
-	}
-
-	Sys_DestroyConsole();
-
-	exit (1);
-}
-
-/*
-==============
-Sys_Quit
-==============
-*/
-void Sys_Quit( void ) {
-	timeEndPeriod( 1 );
-	IN_Shutdown();
-	Sys_DestroyConsole();
-
-	exit (0);
-}
-
-/*
-==============
-Sys_Print
-==============
-*/
-void Sys_Print( const char *msg ) {
-	Conbuf_AppendText( msg );
-}
-
-
-/*
-==============
-Sys_Mkdir
-==============
-*/
-void Sys_Mkdir( const char *path ) {
-	_mkdir (path);
-}
-
-/*
-==============
-Sys_Cwd
-==============
-*/
-char *Sys_Cwd( void ) {
-	static char cwd[MAX_OSPATH];
-
-	_getcwd( cwd, sizeof( cwd ) - 1 );
-	cwd[MAX_OSPATH-1] = 0;
-
-	return cwd;
-}
-
-/*
-==============
-Sys_DefaultCDPath
-==============
-*/
-char *Sys_DefaultCDPath( void ) {
-	return "";
-}
-
-/*
-==============
-Sys_DefaultBasePath
-==============
-*/
-char *Sys_DefaultBasePath( void ) {
-	return Sys_Cwd();
-}
-
-/*
-==============================================================
-
-DIRECTORY SCANNING
-
-==============================================================
-*/
-
-#define	MAX_FOUND_FILES	0x1000
-
-void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, char **list, int *numfiles ) {
-	char		search[MAX_OSPATH], newsubdirs[MAX_OSPATH];
-	char		filename[MAX_OSPATH];
-	intptr_t	findhandle;
-	struct _finddata_t findinfo;
-
-	if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-		return;
-	}
-
-	if (strlen(subdirs)) {
-		Com_sprintf( search, sizeof(search), "%s\\%s\\*", basedir, subdirs );
-	}
-	else {
-		Com_sprintf( search, sizeof(search), "%s\\*", basedir );
-	}
-
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		return;
-	}
-
-	do {
-		if (findinfo.attrib & _A_SUBDIR) {
-			if (Q_stricmp(findinfo.name, ".") && Q_stricmp(findinfo.name, "..")) {
-				if (strlen(subdirs)) {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s\\%s", subdirs, findinfo.name);
-				}
-				else {
-					Com_sprintf( newsubdirs, sizeof(newsubdirs), "%s", findinfo.name);
-				}
-				Sys_ListFilteredFiles( basedir, newsubdirs, filter, list, numfiles );
-			}
-		}
-		if ( *numfiles >= MAX_FOUND_FILES - 1 ) {
-			break;
-		}
-		Com_sprintf( filename, sizeof(filename), "%s\\%s", subdirs, findinfo.name );
-		if (!Com_FilterPath( filter, filename, qfalse ))
-			continue;
-		list[ *numfiles ] = CopyString( filename );
-		(*numfiles)++;
-	} while ( _findnext (findhandle, &findinfo) != -1 );
-
-	_findclose (findhandle);
-}
-
-static qboolean strgtr(const char *s0, const char *s1) {
-	size_t l0, l1, i;
-
-	l0 = strlen(s0);
-	l1 = strlen(s1);
-
-	if (l1<l0) {
-		l0 = l1;
-	}
-
-	for(i=0;i<l0;i++) {
-		if (s1[i] > s0[i]) {
-			return qtrue;
-		}
-		if (s1[i] < s0[i]) {
-			return qfalse;
-		}
-	}
-	return qfalse;
-}
-
-char **Sys_ListFiles( const char *directory, const char *extension, char *filter, int *numfiles, qboolean wantsubs ) {
-	char		search[MAX_OSPATH];
-	int			nfiles;
-	char		**listCopy;
-	char		*list[MAX_FOUND_FILES];
-	struct _finddata_t findinfo;
-	intptr_t	findhandle;
-	int			flag;
-	int			i;
-
-	if (filter) {
-
-		nfiles = 0;
-		Sys_ListFilteredFiles( directory, "", filter, list, &nfiles );
-
-		list[ nfiles ] = 0;
-		*numfiles = nfiles;
-
-		if (!nfiles)
-			return NULL;
-
-		listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-		for ( i = 0 ; i < nfiles ; i++ ) {
-			listCopy[i] = list[i];
-		}
-		listCopy[i] = NULL;
-
-		return listCopy;
-	}
-
-	if ( !extension) {
-		extension = "";
-	}
-
-	// passing a slash as extension will find directories
-	if ( extension[0] == '/' && extension[1] == 0 ) {
-		extension = "";
-		flag = 0;
-	} else {
-		flag = _A_SUBDIR;
-	}
-
-	Com_sprintf( search, sizeof(search), "%s\\*%s", directory, extension );
-
-	// search
-	nfiles = 0;
-
-	findhandle = _findfirst (search, &findinfo);
-	if (findhandle == -1) {
-		*numfiles = 0;
-		return NULL;
-	}
-
-	do {
-		if ( (!wantsubs && flag ^ ( findinfo.attrib & _A_SUBDIR )) || (wantsubs && findinfo.attrib & _A_SUBDIR) ) {
-			if ( nfiles == MAX_FOUND_FILES - 1 ) {
-				break;
-			}
-			list[ nfiles ] = CopyString( findinfo.name );
-			nfiles++;
-		}
-	} while ( _findnext (findhandle, &findinfo) != -1 );
-
-	list[ nfiles ] = 0;
-
-	_findclose (findhandle);
-
-	// return a copy of the list
-	*numfiles = nfiles;
-
-	if ( !nfiles ) {
-		return NULL;
-	}
-
-	listCopy = Z_Malloc( ( nfiles + 1 ) * sizeof( *listCopy ) );
-	for ( i = 0 ; i < nfiles ; i++ ) {
-		listCopy[i] = list[i];
-	}
-	listCopy[i] = NULL;
-
-	do {
-		flag = 0;
-		for(i=1; i<nfiles; i++) {
-			if (strgtr(listCopy[i-1], listCopy[i])) {
-				char *temp = listCopy[i];
-				listCopy[i] = listCopy[i-1];
-				listCopy[i-1] = temp;
-				flag = 1;
-			}
-		}
-	} while(flag);
-
-	return listCopy;
-}
-
-void	Sys_FreeFileList( char **list ) {
-	int		i;
-
-	if ( !list ) {
-		return;
-	}
-
-	for ( i = 0 ; list[i] ; i++ ) {
-		Z_Free( list[i] );
-	}
-
-	Z_Free( list );
-}
-
-//========================================================
-
-
-/*
-================
-Sys_ScanForCD
-
-Search all the drives to see if there is a valid CD to grab
-the cddir from
-================
-*/
-qboolean Sys_ScanForCD( void ) {
-	static char	cddir[MAX_OSPATH];
-	char		drive[4];
-	FILE		*f;
-	char		test[MAX_OSPATH];
-#if 0
-	// don't override a cdpath on the command line
-	if ( strstr( sys_cmdline, "cdpath" ) ) {
-		return;
-	}
-#endif
-
-	drive[0] = 'c';
-	drive[1] = ':';
-	drive[2] = '\\';
-	drive[3] = 0;
-
-	// scan the drives
-	for ( drive[0] = 'c' ; drive[0] <= 'z' ; drive[0]++ ) {
-		if ( GetDriveType (drive) != DRIVE_CDROM ) {
-			continue;
-		}
-
-		sprintf (cddir, "%s%s", drive, CD_BASEDIR);
-		sprintf (test, "%s\\%s", cddir, CD_EXE);
-		f = fopen( test, "r" );
-		if ( f ) {
-			fclose (f);
-			return qtrue;
-    } else {
-      sprintf(cddir, "%s%s", drive, CD_BASEDIR_LINUX);
-      sprintf(test, "%s\\%s", cddir, CD_EXE_LINUX);
-  		f = fopen( test, "r" );
-	  	if ( f ) {
-		  	fclose (f);
-			  return qtrue;
-      }
-    }
-	}
-
-	return qfalse;
-}
-
-/*
-================
-Sys_CheckCD
-
-Return true if the proper CD is in the drive
-================
-*/
-qboolean	Sys_CheckCD( void ) {
-  // FIXME: mission pack
-  return qtrue;
-	//return Sys_ScanForCD();
-}
-
-
-/*
-================
-Sys_GetClipboardData
-
-================
-*/
-char *Sys_GetClipboardData( void ) {
-	char *data = NULL;
-	char *cliptext;
-
-	if ( OpenClipboard( NULL ) != 0 ) {
-		HANDLE hClipboardData;
-
-		if ( ( hClipboardData = GetClipboardData( CF_TEXT ) ) != 0 ) {
-			if ( ( cliptext = GlobalLock( hClipboardData ) ) != 0 ) {
-				data = Z_Malloc( GlobalSize( hClipboardData ) + 1 );
-				Q_strncpyz( data, cliptext, GlobalSize( hClipboardData ) );
-				GlobalUnlock( hClipboardData );
-				
-				strtok( data, "\n\r\b" );
-			}
-		}
-		CloseClipboard();
-	}
-	return data;
-}
-
-
-/*
-========================================================================
-
-LOAD/UNLOAD DLL
-
-========================================================================
-*/
-
-/*
-=================
-Sys_UnloadDll
-
-=================
-*/
-void Sys_UnloadDll( void *dllHandle ) {
-	if ( !dllHandle ) {
-		return;
-	}
-	if ( !FreeLibrary( dllHandle ) ) {
-		Com_Error (ERR_FATAL, "Sys_UnloadDll FreeLibrary failed");
-	}
-}
-
-/*
-=================
-Sys_LoadDll
-
-Used to load a development dll instead of a virtual machine
-
-TTimo: added some verbosity in debug
-=================
-*/
-extern char		*FS_BuildOSPath( const char *base, const char *game, const char *qpath );
-
-// fqpath param added 7/20/02 by T.Ray - Sys_LoadDll is only called in vm.c at this time
-// fqpath will be empty if dll not loaded, otherwise will hold fully qualified path of dll module loaded
-// fqpath buffersize must be at least MAX_QPATH+1 bytes long
-void * QDECL Sys_LoadDll( const char *name, char *fqpath , int (QDECL **entryPoint)(int, ...),
-				  int (QDECL *systemcalls)(int, ...) ) {
-	static int	lastWarning = 0;
-	HINSTANCE	libHandle;
-	void	(QDECL *dllEntry)( int (QDECL *syscallptr)(int, ...) );
-	char	*basepath;
-	char	*cdpath;
-	char	*gamedir;
-	char	*fn;
-#ifdef NDEBUG
-	int		timestamp;
-  int   ret;
-#endif
-	char	filename[MAX_QPATH];
-
-	*fqpath = 0 ;		// added 7/20/02 by T.Ray
-
-	Com_sprintf( filename, sizeof( filename ), "%sx86.dll", name );
-
-#ifdef NDEBUG
-	timestamp = Sys_Milliseconds();
-	if( ((timestamp - lastWarning) > (5 * 60000)) && !Cvar_VariableIntegerValue( "dedicated" )
-		&& !Cvar_VariableIntegerValue( "com_blindlyLoadDLLs" ) ) {
-		if (FS_FileExists(filename)) {
-			lastWarning = timestamp;
-			ret = MessageBoxEx( NULL, "You are about to load a .DLL executable that\n"
-				  "has not been verified for use with Quake III Arena.\n"
-				  "This type of file can compromise the security of\n"
-				  "your computer.\n\n"
-				  "Select 'OK' if you choose to load it anyway.",
-				  "Security Warning", MB_OKCANCEL | MB_ICONEXCLAMATION | MB_DEFBUTTON2 | MB_TOPMOST | MB_SETFOREGROUND,
-				  MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ) );
-			if( ret != IDOK ) {
-				return NULL;
-			}
-		}
-	}
-#endif
-
-#ifndef NDEBUG
-	libHandle = LoadLibrary( filename );
-  if (libHandle)
-    Com_Printf("LoadLibrary '%s' ok\n", filename);
-  else
-    Com_Printf("LoadLibrary '%s' failed\n", filename);
-	if ( !libHandle ) {
-#endif
-	basepath = Cvar_VariableString( "fs_basepath" );
-	cdpath = Cvar_VariableString( "fs_cdpath" );
-	gamedir = Cvar_VariableString( "fs_game" );
-
-	fn = FS_BuildOSPath( basepath, gamedir, filename );
-	libHandle = LoadLibrary( fn );
-#ifndef NDEBUG
-  if (libHandle)
-    Com_Printf("LoadLibrary '%s' ok\n", fn);
-  else
-    Com_Printf("LoadLibrary '%s' failed\n", fn);
-#endif
-
-	if ( !libHandle ) {
-		if( cdpath[0] ) {
-			fn = FS_BuildOSPath( cdpath, gamedir, filename );
-			libHandle = LoadLibrary( fn );
-#ifndef NDEBUG
-      if (libHandle)
-        Com_Printf("LoadLibrary '%s' ok\n", fn);
-      else
-        Com_Printf("LoadLibrary '%s' failed\n", fn);
-#endif
-		}
-
-		if ( !libHandle ) {
-			return NULL;
-		}
-	}
-#ifndef NDEBUG
-	}
-#endif
-
-	dllEntry = ( void (QDECL *)( int (QDECL *)( int, ... ) ) )GetProcAddress( libHandle, "dllEntry" ); 
-	*entryPoint = (int (QDECL *)(int,...))GetProcAddress( libHandle, "vmMain" );
-	if ( !*entryPoint || !dllEntry ) {
-		FreeLibrary( libHandle );
-		return NULL;
-	}
-	dllEntry( systemcalls );
-
-	if ( libHandle ) Q_strncpyz ( fqpath , filename , MAX_QPATH ) ;		// added 7/20/02 by T.Ray
-	return libHandle;
-}
-
-
-/*
-========================================================================
-
-BACKGROUND FILE STREAMING
-
-========================================================================
-*/
-
-#if 1
-
-void Sys_InitStreamThread( void ) {
-}
-
-void Sys_ShutdownStreamThread( void ) {
-}
-
-void Sys_BeginStreamedFile( fileHandle_t f, int readAhead ) {
-}
-
-void Sys_EndStreamedFile( fileHandle_t f ) {
-}
-
-int Sys_StreamedRead( void *buffer, int size, int count, fileHandle_t f ) {
-   return FS_Read( buffer, size * count, f );
-}
-
-void Sys_StreamSeek( fileHandle_t f, int offset, int origin ) {
-   FS_Seek( f, offset, origin );
-}
-
-
-#else
-
-typedef struct {
-	fileHandle_t	file;
-	byte	*buffer;
-	qboolean	eof;
-	qboolean	active;
-	int		bufferSize;
-	int		streamPosition;	// next byte to be returned by Sys_StreamRead
-	int		threadPosition;	// next byte to be read from file
-} streamsIO_t;
-
-typedef struct {
-	HANDLE				threadHandle;
-	int					threadId;
-	CRITICAL_SECTION	crit;
-	streamsIO_t			sIO[MAX_FILE_HANDLES];
-} streamState_t;
-
-streamState_t	stream;
-
-/*
-===============
-Sys_StreamThread
-
-A thread will be sitting in this loop forever
-================
-*/
-void Sys_StreamThread( void ) {
-	int		buffer;
-	int		count;
-	int		readCount;
-	int		bufferPoint;
-	int		r, i;
-
-	while (1) {
-		Sleep( 10 );
-//		EnterCriticalSection (&stream.crit);
-
-		for (i=1;i<MAX_FILE_HANDLES;i++) {
-			// if there is any space left in the buffer, fill it up
-			if ( stream.sIO[i].active  && !stream.sIO[i].eof ) {
-				count = stream.sIO[i].bufferSize - (stream.sIO[i].threadPosition - stream.sIO[i].streamPosition);
-				if ( !count ) {
-					continue;
-				}
-
-				bufferPoint = stream.sIO[i].threadPosition % stream.sIO[i].bufferSize;
-				buffer = stream.sIO[i].bufferSize - bufferPoint;
-				readCount = buffer < count ? buffer : count;
-
-				r = FS_Read( stream.sIO[i].buffer + bufferPoint, readCount, stream.sIO[i].file );
-				stream.sIO[i].threadPosition += r;
-
-				if ( r != readCount ) {
-					stream.sIO[i].eof = qtrue;
-				}
-			}
-		}
-//		LeaveCriticalSection (&stream.crit);
-	}
-}
-
-/*
-===============
-Sys_InitStreamThread
-
-================
-*/
-void Sys_InitStreamThread( void ) {
-	int i;
-
-	InitializeCriticalSection ( &stream.crit );
-
-	// don't leave the critical section until there is a
-	// valid file to stream, which will cause the StreamThread
-	// to sleep without any overhead
-//	EnterCriticalSection( &stream.crit );
-
-	stream.threadHandle = CreateThread(
-	   NULL,	// LPSECURITY_ATTRIBUTES lpsa,
-	   0,		// DWORD cbStack,
-	   (LPTHREAD_START_ROUTINE)Sys_StreamThread,	// LPTHREAD_START_ROUTINE lpStartAddr,
-	   0,			// LPVOID lpvThreadParm,
-	   0,			//   DWORD fdwCreate,
-	   &stream.threadId);
-	for(i=0;i<MAX_FILE_HANDLES;i++) {
-		stream.sIO[i].active = qfalse;
-	}
-}
-
-/*
-===============
-Sys_ShutdownStreamThread
-
-================
-*/
-void Sys_ShutdownStreamThread( void ) {
-}
-
-
-/*
-===============
-Sys_BeginStreamedFile
-
-================
-*/
-void Sys_BeginStreamedFile( fileHandle_t f, int readAhead ) {
-	if ( stream.sIO[f].file ) {
-		Sys_EndStreamedFile( stream.sIO[f].file );
-	}
-
-	stream.sIO[f].file = f;
-	stream.sIO[f].buffer = Z_Malloc( readAhead );
-	stream.sIO[f].bufferSize = readAhead;
-	stream.sIO[f].streamPosition = 0;
-	stream.sIO[f].threadPosition = 0;
-	stream.sIO[f].eof = qfalse;
-	stream.sIO[f].active = qtrue;
-
-	// let the thread start running
-//	LeaveCriticalSection( &stream.crit );
-}
-
-/*
-===============
-Sys_EndStreamedFile
-
-================
-*/
-void Sys_EndStreamedFile( fileHandle_t f ) {
-	if ( f != stream.sIO[f].file ) {
-		Com_Error( ERR_FATAL, "Sys_EndStreamedFile: wrong file");
-	}
-	// don't leave critical section until another stream is started
-	EnterCriticalSection( &stream.crit );
-
-	stream.sIO[f].file = 0;
-	stream.sIO[f].active = qfalse;
-
-	Z_Free( stream.sIO[f].buffer );
-
-	LeaveCriticalSection( &stream.crit );
-}
-
-
-/*
-===============
-Sys_StreamedRead
-
-================
-*/
-int Sys_StreamedRead( void *buffer, int size, int count, fileHandle_t f ) {
-	int		available;
-	int		remaining;
-	int		sleepCount;
-	int		copy;
-	int		bufferCount;
-	int		bufferPoint;
-	byte	*dest;
-
-	if (stream.sIO[f].active == qfalse) {
-		Com_Error( ERR_FATAL, "Streamed read with non-streaming file" );
-	}
-
-	dest = (byte *)buffer;
-	remaining = size * count;
-
-	if ( remaining <= 0 ) {
-		Com_Error( ERR_FATAL, "Streamed read with non-positive size" );
-	}
-
-	sleepCount = 0;
-	while ( remaining > 0 ) {
-		available = stream.sIO[f].threadPosition - stream.sIO[f].streamPosition;
-		if ( !available ) {
-			if ( stream.sIO[f].eof ) {
-				break;
-			}
-			if ( sleepCount == 1 ) {
-				Com_DPrintf( "Sys_StreamedRead: waiting\n" );
-			}
-			if ( ++sleepCount > 100 ) {
-				Com_Error( ERR_FATAL, "Sys_StreamedRead: thread has died");
-			}
-			Sleep( 10 );
-			continue;
-		}
-
-		EnterCriticalSection( &stream.crit );
-
-		bufferPoint = stream.sIO[f].streamPosition % stream.sIO[f].bufferSize;
-		bufferCount = stream.sIO[f].bufferSize - bufferPoint;
-
-		copy = available < bufferCount ? available : bufferCount;
-		if ( copy > remaining ) {
-			copy = remaining;
-		}
-		memcpy( dest, stream.sIO[f].buffer + bufferPoint, copy );
-		stream.sIO[f].streamPosition += copy;
-		dest += copy;
-		remaining -= copy;
-
-		LeaveCriticalSection( &stream.crit );
-	}
-
-	return (count * size - remaining) / size;
-}
-
-/*
-===============
-Sys_StreamSeek
-
-================
-*/
-void Sys_StreamSeek( fileHandle_t f, int offset, int origin ) {
-
-	// halt the thread
-	EnterCriticalSection( &stream.crit );
-
-	// clear to that point
-	FS_Seek( f, offset, origin );
-	stream.sIO[f].streamPosition = 0;
-	stream.sIO[f].threadPosition = 0;
-	stream.sIO[f].eof = qfalse;
-
-	// let the thread start running at the new position
-	LeaveCriticalSection( &stream.crit );
-}
-
-#endif
-
-/*
-========================================================================
-
-EVENT LOOP
-
-========================================================================
-*/
-
-#define	MAX_QUED_EVENTS		256
-#define	MASK_QUED_EVENTS	( MAX_QUED_EVENTS - 1 )
-
-sysEvent_t	eventQue[MAX_QUED_EVENTS];
-int			eventHead, eventTail;
-byte		sys_packetReceived[MAX_MSGLEN];
-
-/*
-================
-Sys_QueEvent
-
-A time of 0 will get the current time
-Ptr should either be null, or point to a block of data that can
-be freed by the game later.
-================
-*/
-void Sys_QueEvent( int time, sysEventType_t type, int value, int value2, int ptrLength, void *ptr ) {
-	sysEvent_t	*ev;
-
-	ev = &eventQue[ eventHead & MASK_QUED_EVENTS ];
-	if ( eventHead - eventTail >= MAX_QUED_EVENTS ) {
-		Com_Printf("Sys_QueEvent: overflow\n");
-		// we are discarding an event, but don't leak memory
-		if ( ev->evPtr ) {
-			Z_Free( ev->evPtr );
-		}
-		eventTail++;
-	}
-
-	eventHead++;
-
-	if ( time == 0 ) {
-		time = Sys_Milliseconds();
-	}
-
-	ev->evTime = time;
-	ev->evType = type;
-	ev->evValue = value;
-	ev->evValue2 = value2;
-	ev->evPtrLength = ptrLength;
-	ev->evPtr = ptr;
-}
-
-/*
-================
-Sys_GetEvent
-
-================
-*/
-sysEvent_t Sys_GetEvent( void ) {
-    MSG			msg;
-	sysEvent_t	ev;
-	char		*s;
-	msg_t		netmsg;
-	netadr_t	adr;
-
-	// return if we have data
-	if ( eventHead > eventTail ) {
-		eventTail++;
-		return eventQue[ ( eventTail - 1 ) & MASK_QUED_EVENTS ];
-	}
-
-	// pump the message loop
-	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE)) {
-		if ( !GetMessage (&msg, NULL, 0, 0) ) {
-			Com_Quit_f();
-		}
-
-		// save the msg time, because wndprocs don't have access to the timestamp
-		g_wv.sysMsgTime = msg.time;
-
-		TranslateMessage (&msg);
-      	DispatchMessage (&msg);
-	}
-
-	// check for console commands
-	s = Sys_ConsoleInput();
-	if ( s ) {
-		char	*b;
-		int		len;
-
-		len = strlen( s ) + 1;
-		b = Z_Malloc( len );
-		Q_strncpyz( b, s, len-1 );
-		Sys_QueEvent( 0, SE_CONSOLE, 0, 0, len, b );
-	}
-
-	// check for network packets
-	MSG_Init( &netmsg, sys_packetReceived, sizeof( sys_packetReceived ) );
-	if ( Sys_GetPacket ( &adr, &netmsg ) ) {
-		netadr_t		*buf;
-		int				len;
-
-		// copy out to a seperate buffer for qeueing
-		// the readcount stepahead is for SOCKS support
-		len = sizeof( netadr_t ) + netmsg.cursize - netmsg.readcount;
-		buf = Z_Malloc( len );
-		*buf = adr;
-		memcpy( buf+1, &netmsg.data[netmsg.readcount], netmsg.cursize - netmsg.readcount );
-		Sys_QueEvent( 0, SE_PACKET, 0, 0, len, buf );
-	}
-
-	// return if we have data
-	if ( eventHead > eventTail ) {
-		eventTail++;
-		return eventQue[ ( eventTail - 1 ) & MASK_QUED_EVENTS ];
-	}
-
-	// create an empty event to return
-
-	memset( &ev, 0, sizeof( ev ) );
-	ev.evTime = timeGetTime();
-
-	return ev;
-}
-
-//================================================================
-
-/*
-=================
-Sys_In_Restart_f
-
-Restart the input subsystem
-=================
-*/
-void Sys_In_Restart_f( void ) {
-	IN_Shutdown();
-	IN_Init();
-}
-
-
-/*
-=================
-Sys_Net_Restart_f
-
-Restart the network subsystem
-=================
-*/
-void Sys_Net_Restart_f( void ) {
-	NET_Restart();
-}
-
-
-/*
-================
-Sys_Init
-
-Called after the common systems (cvars, files, etc)
-are initialized
-================
-*/
-#define OSR2_BUILD_NUMBER 1111
-#define WIN98_BUILD_NUMBER 1998
-
-void Sys_Init( void ) {
-	int cpuid;
-
-	// make sure the timer is high precision, otherwise
-	// NT gets 18ms resolution
-	timeBeginPeriod( 1 );
-
-	Cmd_AddCommand ("in_restart", Sys_In_Restart_f);
-	Cmd_AddCommand ("net_restart", Sys_Net_Restart_f);
-
-	g_wv.osversion.dwOSVersionInfoSize = sizeof( g_wv.osversion );
-
-	if (!GetVersionEx (&g_wv.osversion))
-		Sys_Error ("Couldn't get OS info");
-
-	if (g_wv.osversion.dwMajorVersion < 4)
-		Sys_Error ("OpenMoHAA requires Windows version 4 or greater");
-	if (g_wv.osversion.dwPlatformId == VER_PLATFORM_WIN32s)
-		Sys_Error ("OpenMoHAA doesn't run on Win32s");
-
-	if ( g_wv.osversion.dwPlatformId == VER_PLATFORM_WIN32_NT )
-	{
-		Cvar_Set( "arch", "winnt" );
-	}
-	else if ( g_wv.osversion.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
-	{
-		if ( LOWORD( g_wv.osversion.dwBuildNumber ) >= WIN98_BUILD_NUMBER )
-		{
-			Cvar_Set( "arch", "win98" );
-		}
-		else if ( LOWORD( g_wv.osversion.dwBuildNumber ) >= OSR2_BUILD_NUMBER )
-		{
-			Cvar_Set( "arch", "win95 osr2.x" );
-		}
-		else
-		{
-			Cvar_Set( "arch", "win95" );
-		}
-	}
-	else
-	{
-		Cvar_Set( "arch", "unknown Windows variant" );
-	}
-
-	// save out a couple things in rom cvars for the renderer to access
-	Cvar_Get( "win_hinstance", va("%zu", (uintptr_t)g_wv.hInstance), CVAR_ROM );
-	Cvar_Get( "win_wndproc", va("%zu", (uintptr_t)MainWndProc), CVAR_ROM );
-
-	//
-	// figure out our CPU
-	//
-	Cvar_Get( "sys_cpustring", "detect", 0 );
-	if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring"), "detect" ) )
-	{
-		Com_Printf( "...detecting CPU, found " );
-
-		cpuid = Sys_GetProcessorId();
-
-		switch ( cpuid )
-		{
-		case CPUID_GENERIC:
-			Cvar_Set( "sys_cpustring", "generic" );
-			break;
-		case CPUID_INTEL_UNSUPPORTED:
-			Cvar_Set( "sys_cpustring", "x86 (pre-Pentium)" );
-			break;
-		case CPUID_INTEL_PENTIUM:
-			Cvar_Set( "sys_cpustring", "x86 (P5/PPro, non-MMX)" );
-			break;
-		case CPUID_INTEL_MMX:
-			Cvar_Set( "sys_cpustring", "x86 (P5/Pentium2, MMX)" );
-			break;
-		case CPUID_INTEL_KATMAI:
-			Cvar_Set( "sys_cpustring", "Intel Pentium III" );
-			break;
-		case CPUID_AMD_3DNOW:
-			Cvar_Set( "sys_cpustring", "AMD w/ 3DNow!" );
-			break;
-		case CPUID_AXP:
-			Cvar_Set( "sys_cpustring", "Alpha AXP" );
-			break;
-		default:
-			Com_Error( ERR_FATAL, "Unknown cpu type %d\n", cpuid );
-			break;
-		}
-	}
-	else
-	{
-		Com_Printf( "...forcing CPU type to " );
-		if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "generic" ) )
-		{
-			cpuid = CPUID_GENERIC;
-		}
-		else if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "x87" ) )
-		{
-			cpuid = CPUID_INTEL_PENTIUM;
-		}
-		else if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "mmx" ) )
-		{
-			cpuid = CPUID_INTEL_MMX;
-		}
-		else if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "3dnow" ) )
-		{
-			cpuid = CPUID_AMD_3DNOW;
-		}
-		else if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "PentiumIII" ) )
-		{
-			cpuid = CPUID_INTEL_KATMAI;
-		}
-		else if ( !Q_stricmp( Cvar_VariableString( "sys_cpustring" ), "axp" ) )
-		{
-			cpuid = CPUID_AXP;
-		}
-		else
-		{
-			Com_Printf( "WARNING: unknown sys_cpustring '%s'\n", Cvar_VariableString( "sys_cpustring" ) );
-			cpuid = CPUID_GENERIC;
-		}
-	}
-	Cvar_SetValue( "sys_cpuid", cpuid );
-	Com_Printf( "%s\n", Cvar_VariableString( "sys_cpustring" ) );
-
-	Cvar_Set( "username", Sys_GetCurrentUser() );
-
-	IN_Init();		// FIXME: not in dedicated?
-}
-
-/*
-================
-RecoverLostAutodialData
-================
-*/
-void RecoverLostAutodialData(void)
-{
-    // FIXME: stub
-}
-
-/*
-==============
-Sys_CloseMutex
-==============
-*/
-void Sys_CloseMutex(void)
-{
-    // FIXME: stub
-}
-
-/*
-==============
-Sys_PumpMessageLoop
-==============
-*/
-void Sys_PumpMessageLoop(void)
-{
-	MSG msg;
-
-	while (PeekMessageA(&msg, 0, 0, 0, 0))
-	{
-		if (!GetMessageA(&msg, 0, 0, 0)) {
-			Com_Quit_f();
-		}
-
-		g_wv.sysMsgTime = msg.time;
-
-		TranslateMessage(&msg);
-		DispatchMessageA(&msg);
-	}
-}
-
-/*
-==============
-SaveRegistryInfo
-==============
-*/
-qboolean SaveRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long lSize)
-{
-    STUB_DESC("not implemented");
-    return qfalse;
-}
-
-/*
-==============
-LoadRegistryInfo
-==============
-*/
-qboolean LoadRegistryInfo(qboolean user, const char* pszName, void* pvBuf, long* plSize)
-{
-    STUB_DESC("not implemented");
-    return qfalse;
-}
-
-/*
-==============
-IsFirstRun
-==============
-*/
-qboolean IsFirstRun(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-IsNewConfig
-==============
-*/
-qboolean IsNewConfig(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-IsSafeMode
-==============
-*/
-qboolean IsSafeMode(void)
-{
-    STUB_DESC("wtf");
-    return qfalse;
-}
-
-/*
-==============
-ClearNewConfigFlag
-==============
-*/
-void ClearNewConfigFlag(void)
-{
-}
-
-/*
-==============
-Sys_GetWholeClipboard
-==============
-*/
-const char* Sys_GetWholeClipboard(void)
-{
-    return NULL;
-}
-
-/*
-==============
-Sys_SetClipboard
-==============
-*/
-void Sys_SetClipboard(const char* contents)
-{
-}
-
-/*
-==================
-SetNormalThreadPriority
-==================
-*/
-void SetNormalThreadPriority(void)
-{
-    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_NORMAL);
-}
-
-/*
-==================
-SetBelowNormalThreadPriority
-==================
-*/
-void SetBelowNormalThreadPriority(void)
-{
-    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL);
-}
-
-/*
-=================
-Sys_UnloadGame
-=================
-*/
-void Sys_UnloadGame(void)
-{
-    Com_Printf("------ Unloading Game ------\n");
-
-    if (game_library) {
-        FreeLibrary(game_library);
-    }
-
-    game_library = NULL;
-}
-
-/*
-=================
-Sys_GetGameAPI
-=================
-*/
-void* Sys_GetGameAPI(void* parms)
-{
-    void* (*GetGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-    const char* fn;
-    const char* gamename = "game" ARCH_STRING DLL_SUFFIX DLL_EXT;
-
-    if (game_library)
-        Com_Error(ERR_FATAL, "Sys_GetGameAPI without calling Sys_UnloadGame");
-
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-
-    fn = FS_BuildOSPath(basepath, gamedir, gamename);
-
-    game_library = LoadLibrary(fn);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            game_library = LoadLibrary(fn);
-        }
-    }
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            game_library = LoadLibrary(fn);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        game_library = LoadLibrary(fn);
-    }
-
-    if (!game_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            game_library = LoadLibrary(fn);
-        }
-    }
-    if (!game_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            game_library = LoadLibrary(fn);
-        }
-    }
-
-    //Still couldn't find it.
-    if (!game_library) {
-        Com_Printf("Sys_GetGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-        Com_Error(ERR_FATAL, "Couldn't load game");
-    }
-
-    Com_Printf("Sys_GetGameAPI(%s): succeeded ...\n", fn);
-    GetGameAPI = (void* (*)(void*))GetProcAddress(game_library, "GetGameAPI");
-
-    if (!GetGameAPI)
-    {
-        Sys_UnloadGame();
-        return NULL;
-    }
-
-    return GetGameAPI(parms);
-}
-
-/*
-=================
-Sys_UnloadCGame
-=================
-*/
-void Sys_UnloadCGame(void)
-{
-    Com_Printf("------ Unloading ClientGame ------\n");
-
-    if (cgame_library) {
-        FreeLibrary(cgame_library);
-    }
-
-    cgame_library = NULL;
-}
-
-/*
-=================
-Sys_GetCGameAPI
-=================
-*/
-void* Sys_GetCGameAPI(void* parms)
-{
-    void* (*GetCGameAPI) (void*);
-    const char* basepath;
-    const char* cdpath;
-    const char* gamedir;
-    const char* homepath;
-    const char* fn;
-    const char* gamename = "cgame" ARCH_STRING DLL_SUFFIX DLL_EXT;
-
-    if (cgame_library)
-        Com_Error(ERR_FATAL, "Sys_GetCGameAPI without calling Sys_UnloadCGame");
-
-    // check the current debug directory first for development purposes
-    homepath = Cvar_VariableString("fs_homepath");
-    basepath = Cvar_VariableString("fs_basepath");
-    cdpath = Cvar_VariableString("fs_cdpath");
-    gamedir = Cvar_VariableString("fs_game");
-
-    fn = FS_BuildOSPath(basepath, gamedir, gamename);
-
-    cgame_library = LoadLibrary(fn);
-
-    //First try in mod directories. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(homepath, gamedir, gamename);
-            cgame_library = LoadLibrary(fn);
-        }
-    }
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(cdpath, gamedir, gamename);
-            cgame_library = LoadLibrary(fn);
-        }
-    }
-
-    //Now try in base. basepath -> homepath -> cdpath
-    if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-        fn = FS_BuildOSPath(basepath, PRODUCT_NAME, gamename);
-        cgame_library = LoadLibrary(fn);
-    }
-
-    if (!cgame_library) {
-        if (homepath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(homepath, PRODUCT_NAME, gamename);
-            cgame_library = LoadLibrary(fn);
-        }
-    }
-    if (!cgame_library) {
-        if (cdpath[0]) {
-            Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-            fn = FS_BuildOSPath(cdpath, PRODUCT_NAME, gamename);
-            cgame_library = LoadLibrary(fn);
-        }
-    }
-
-    //Still couldn't find it.
-    if (!cgame_library) {
-        Com_Printf("Sys_GetCGameAPI(%s) failed: \"%d\"\n", fn, GetLastError());
-        Com_Error(ERR_FATAL, "Couldn't load game");
-    }
-
-    Com_Printf("Sys_GetCGameAPI(%s): succeeded ...\n", fn);
-    GetCGameAPI = (void* (*)(void*))GetProcAddress(cgame_library, "GetCGameAPI");
-
-    if (!GetCGameAPI)
-    {
-        Sys_UnloadCGame();
-        return NULL;
-    }
-
-    return GetCGameAPI(parms);
-}
-
-//=======================================================================
-
-int	totalMsec, countMsec;
-
-/*
-==================
-WinMain
-
-==================
-*/
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
-	char		cwd[MAX_OSPATH];
-	int			startTime, endTime;
-
-    // should never get a previous instance in Win32
-    if ( hPrevInstance ) {
-        return 0;
-	}
-
-	g_wv.hInstance = hInstance;
-	Q_strncpyz( sys_cmdline, lpCmdLine, sizeof( sys_cmdline ) );
-
-	// done before Com/Sys_Init since we need this for error output
-	Sys_CreateConsole();
-
-	// no abort/retry/fail errors
-	SetErrorMode( SEM_FAILCRITICALERRORS );
-
-	// get the initial time base
-	Sys_Milliseconds();
-#if 0
-	// if we find the CD, add a +set cddir xxx command line
-	Sys_ScanForCD();
-#endif
-
-	Sys_InitStreamThread();
-
-	Com_Init( sys_cmdline );
-	Sys_InitLocalization();
-	// Already called inside Com_Init
-	//NET_Init();
-
-	_getcwd (cwd, sizeof(cwd));
-	Com_Printf("Working directory: %s\n", cwd);
-
-	// hide the early console since we've reached the point where we
-	// have a working graphics subsystems
-#ifndef DEDICATED
-	if ( !com_dedicated->integer && !com_viewlog->integer ) {
-		Sys_ShowConsole( 0, qfalse );
-	}
-#endif
-
-    // main game loop
-	while( 1 ) {
-		// if not running as a game client, sleep a bit
-#ifndef DEDICATED
-		if ( g_wv.isMinimized || ( com_dedicated && com_dedicated->integer ) ) {
-			Sleep( 5 );
-		}
-#else
-        Sleep(5);
-#endif
-
-		// set low precision every frame, because some system calls
-		// reset it arbitrarily
-//		_controlfp( _PC_24, _MCW_PC );
-//    _controlfp( -1, _MCW_EM  ); // no exceptions, even if some crappy
-                                // syscall turns them back on!
-
-		startTime = Sys_Milliseconds();
-
-		// make sure mouse and joystick are only called once a frame
-		IN_Frame();
-
-		// run the game
-		Com_Frame();
-
-		endTime = Sys_Milliseconds();
-		totalMsec += endTime - startTime;
-		countMsec++;
-	}
-
-	// never gets here
-}
-
-
diff --git a/code/win32/win_manifest.xml b/code/win32/win_manifest.xml
deleted file mode 100644
index ae5906dc..00000000
--- a/code/win32/win_manifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*">
-      </assemblyIdentity>
-    </dependentAssembly>
-  </dependency>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-      <application>
-          <!-- No id for Windows XP -->
-          <!-- Windows Vista -->
-          <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-          <!-- Windows 7 -->
-          <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-          <!-- Windows 8 -->
-          <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-          <!-- Windows 8.1 -->
-          <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-          <!-- Windows 10 -->
-          <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-      </application>
-  </compatibility>
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
-    </windowsSettings>
-  </application>
-</assembly>
diff --git a/code/win32/win_net.c b/code/win32/win_net.c
deleted file mode 100644
index 07c762e0..00000000
--- a/code/win32/win_net.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// net_wins.c
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-#include "win_local.h"
-
-static WSADATA	winsockdata;
-static qboolean	winsockInitialized = qfalse;
-static qboolean usingSocks = qfalse;
-static qboolean networkingEnabled = qfalse;
-
-static cvar_t	*net_noudp;
-static cvar_t	*net_noipx;
-
-static cvar_t	*net_socksEnabled;
-static cvar_t	*net_socksServer;
-static cvar_t	*net_socksPort;
-static cvar_t	*net_socksUsername;
-static cvar_t	*net_socksPassword;
-static struct sockaddr	socksRelayAddr;
-
-static SOCKET	ip_socket;
-static SOCKET	socks_socket;
-static SOCKET	ipx_socket;
-
-#define	MAX_IPS		16
-static	int		numIP;
-static	byte	localIP[MAX_IPS][4];
-
-//=============================================================================
-
-
-/*
-====================
-NET_ErrorString
-====================
-*/
-char *NET_ErrorString( void ) {
-	int		code;
-
-	code = WSAGetLastError();
-	switch( code ) {
-	case WSAEINTR: return "WSAEINTR";
-	case WSAEBADF: return "WSAEBADF";
-	case WSAEACCES: return "WSAEACCES";
-	case WSAEDISCON: return "WSAEDISCON";
-	case WSAEFAULT: return "WSAEFAULT";
-	case WSAEINVAL: return "WSAEINVAL";
-	case WSAEMFILE: return "WSAEMFILE";
-	case WSAEWOULDBLOCK: return "WSAEWOULDBLOCK";
-	case WSAEINPROGRESS: return "WSAEINPROGRESS";
-	case WSAEALREADY: return "WSAEALREADY";
-	case WSAENOTSOCK: return "WSAENOTSOCK";
-	case WSAEDESTADDRREQ: return "WSAEDESTADDRREQ";
-	case WSAEMSGSIZE: return "WSAEMSGSIZE";
-	case WSAEPROTOTYPE: return "WSAEPROTOTYPE";
-	case WSAENOPROTOOPT: return "WSAENOPROTOOPT";
-	case WSAEPROTONOSUPPORT: return "WSAEPROTONOSUPPORT";
-	case WSAESOCKTNOSUPPORT: return "WSAESOCKTNOSUPPORT";
-	case WSAEOPNOTSUPP: return "WSAEOPNOTSUPP";
-	case WSAEPFNOSUPPORT: return "WSAEPFNOSUPPORT";
-	case WSAEAFNOSUPPORT: return "WSAEAFNOSUPPORT";
-	case WSAEADDRINUSE: return "WSAEADDRINUSE";
-	case WSAEADDRNOTAVAIL: return "WSAEADDRNOTAVAIL";
-	case WSAENETDOWN: return "WSAENETDOWN";
-	case WSAENETUNREACH: return "WSAENETUNREACH";
-	case WSAENETRESET: return "WSAENETRESET";
-	case WSAECONNABORTED: return "WSWSAECONNABORTEDAEINTR";
-	case WSAECONNRESET: return "WSAECONNRESET";
-	case WSAENOBUFS: return "WSAENOBUFS";
-	case WSAEISCONN: return "WSAEISCONN";
-	case WSAENOTCONN: return "WSAENOTCONN";
-	case WSAESHUTDOWN: return "WSAESHUTDOWN";
-	case WSAETOOMANYREFS: return "WSAETOOMANYREFS";
-	case WSAETIMEDOUT: return "WSAETIMEDOUT";
-	case WSAECONNREFUSED: return "WSAECONNREFUSED";
-	case WSAELOOP: return "WSAELOOP";
-	case WSAENAMETOOLONG: return "WSAENAMETOOLONG";
-	case WSAEHOSTDOWN: return "WSAEHOSTDOWN";
-	case WSASYSNOTREADY: return "WSASYSNOTREADY";
-	case WSAVERNOTSUPPORTED: return "WSAVERNOTSUPPORTED";
-	case WSANOTINITIALISED: return "WSANOTINITIALISED";
-	case WSAHOST_NOT_FOUND: return "WSAHOST_NOT_FOUND";
-	case WSATRY_AGAIN: return "WSATRY_AGAIN";
-	case WSANO_RECOVERY: return "WSANO_RECOVERY";
-	case WSANO_DATA: return "WSANO_DATA";
-	default: return "NO ERROR";
-	}
-}
-
-void NetadrToSockadr( netadr_t *a, struct sockaddr *s ) {
-	memset( s, 0, sizeof(*s) );
-
-	if( a->type == NA_BROADCAST ) {
-		((struct sockaddr_in *)s)->sin_family = AF_INET;
-		((struct sockaddr_in *)s)->sin_port = a->port;
-		((struct sockaddr_in *)s)->sin_addr.s_addr = INADDR_BROADCAST;
-	}
-	else if( a->type == NA_IP ) {
-		((struct sockaddr_in *)s)->sin_family = AF_INET;
-		((struct sockaddr_in *)s)->sin_addr.s_addr = *(int *)&a->ip;
-		((struct sockaddr_in *)s)->sin_port = a->port;
-	}
-	else if( a->type == NA_IPX ) {
-		((struct sockaddr_ipx *)s)->sa_family = AF_IPX;
-		memcpy( ((struct sockaddr_ipx *)s)->sa_netnum, &a->ipx[0], 4 );
-		memcpy( ((struct sockaddr_ipx *)s)->sa_nodenum, &a->ipx[4], 6 );
-		((struct sockaddr_ipx *)s)->sa_socket = a->port;
-	}
-	else if( a->type == NA_BROADCAST_IPX ) {
-		((struct sockaddr_ipx *)s)->sa_family = AF_IPX;
-		memset( ((struct sockaddr_ipx *)s)->sa_netnum, 0, 4 );
-		memset( ((struct sockaddr_ipx *)s)->sa_nodenum, 0xff, 6 );
-		((struct sockaddr_ipx *)s)->sa_socket = a->port;
-	}
-}
-
-
-void SockadrToNetadr( struct sockaddr *s, netadr_t *a ) {
-	if (s->sa_family == AF_INET) {
-		a->type = NA_IP;
-		*(int *)&a->ip = ((struct sockaddr_in *)s)->sin_addr.s_addr;
-		a->port = ((struct sockaddr_in *)s)->sin_port;
-	}
-	else if( s->sa_family == AF_IPX ) {
-		a->type = NA_IPX;
-		memcpy( &a->ipx[0], ((struct sockaddr_ipx *)s)->sa_netnum, 4 );
-		memcpy( &a->ipx[4], ((struct sockaddr_ipx *)s)->sa_nodenum, 6 );
-		a->port = ((struct sockaddr_ipx *)s)->sa_socket;
-	}
-}
-
-
-/*
-=============
-Sys_StringToAdr
-
-idnewt
-192.246.40.70
-12121212.121212121212
-=============
-*/
-#define DO(src,dest)	\
-	copy[0] = s[src];	\
-	copy[1] = s[src + 1];	\
-	sscanf (copy, "%x", &val);	\
-	((struct sockaddr_ipx *)sadr)->dest = val
-
-qboolean Sys_StringToSockaddr( const char *s, struct sockaddr *sadr ) {
-	struct hostent	*h;
-	int		val;
-	char	copy[MAX_STRING_CHARS];
-	
-	memset( sadr, 0, sizeof( *sadr ) );
-
-	// check for an IPX address
-	if( ( strlen( s ) == 21 ) && ( s[8] == '.' ) ) {
-		((struct sockaddr_ipx *)sadr)->sa_family = AF_IPX;
-		((struct sockaddr_ipx *)sadr)->sa_socket = 0;
-		copy[2] = 0;
-		DO(0, sa_netnum[0]);
-		DO(2, sa_netnum[1]);
-		DO(4, sa_netnum[2]);
-		DO(6, sa_netnum[3]);
-		DO(9, sa_nodenum[0]);
-		DO(11, sa_nodenum[1]);
-		DO(13, sa_nodenum[2]);
-		DO(15, sa_nodenum[3]);
-		DO(17, sa_nodenum[4]);
-		DO(19, sa_nodenum[5]);
-	}
-	else {
-		((struct sockaddr_in *)sadr)->sin_family = AF_INET;
-		((struct sockaddr_in *)sadr)->sin_port = 0;
-
-		if( s[0] >= '0' && s[0] <= '9' ) {
-			*(int *)&((struct sockaddr_in *)sadr)->sin_addr = inet_addr(s);
-		} else {
-			if( ( h = gethostbyname( s ) ) == 0 ) {
-				return 0;
-			}
-			*(int *)&((struct sockaddr_in *)sadr)->sin_addr = *(int *)h->h_addr_list[0];
-		}
-	}
-	
-	return qtrue;
-}
-
-#undef DO
-
-/*
-=============
-Sys_StringToAdr
-
-idnewt
-192.246.40.70
-=============
-*/
-qboolean Sys_StringToAdr( const char *s, netadr_t *a ) {
-	struct sockaddr sadr;
-	
-	if ( !Sys_StringToSockaddr( s, &sadr ) ) {
-		return qfalse;
-	}
-	
-	SockadrToNetadr( &sadr, a );
-	return qtrue;
-}
-
-//=============================================================================
-
-/*
-==================
-Sys_GetPacket
-
-Never called by the game logic, just the system event queing
-==================
-*/
-int	recvfromCount;
-
-qboolean Sys_GetPacket( netadr_t *net_from, msg_t *net_message ) {
-	int 	ret;
-	struct sockaddr from;
-	int		fromlen;
-	int		net_socket;
-	int		protocol;
-	int		err;
-
-	for( protocol = 0 ; protocol < 2 ; protocol++ )	{
-		if( protocol == 0 ) {
-			net_socket = ip_socket;
-		}
-		else {
-			net_socket = ipx_socket;
-		}
-
-		if( !net_socket ) {
-			continue;
-		}
-
-		fromlen = sizeof(from);
-		recvfromCount++;		// performance check
-		ret = recvfrom( net_socket, net_message->data, net_message->maxsize, 0, (struct sockaddr *)&from, &fromlen );
-		if (ret == SOCKET_ERROR)
-		{
-			err = WSAGetLastError();
-
-			if( err == WSAEWOULDBLOCK || err == WSAECONNRESET ) {
-				continue;
-			}
-			Com_Printf( "NET_GetPacket: %s\n", NET_ErrorString() );
-			continue;
-		}
-
-		if ( net_socket == ip_socket ) {
-			memset( ((struct sockaddr_in *)&from)->sin_zero, 0, 8 );
-		}
-
-		if ( usingSocks && net_socket == ip_socket && memcmp( &from, &socksRelayAddr, fromlen ) == 0 ) {
-			if ( ret < 10 || net_message->data[0] != 0 || net_message->data[1] != 0 || net_message->data[2] != 0 || net_message->data[3] != 1 ) {
-				continue;
-			}
-			net_from->type = NA_IP;
-			net_from->ip[0] = net_message->data[4];
-			net_from->ip[1] = net_message->data[5];
-			net_from->ip[2] = net_message->data[6];
-			net_from->ip[3] = net_message->data[7];
-			net_from->port = *(short *)&net_message->data[8];
-			net_message->readcount = 10;
-		}
-		else {
-			SockadrToNetadr( &from, net_from );
-			net_message->readcount = 0;
-		}
-
-		if( ret == net_message->maxsize ) {
-			Com_Printf( "Oversize packet from %s\n", NET_AdrToString (*net_from) );
-			continue;
-		}
-
-		net_message->cursize = ret;
-		return qtrue;
-	}
-
-	return qfalse;
-}
-
-//=============================================================================
-
-static char socksBuf[4096];
-
-/*
-==================
-Sys_SendPacket
-==================
-*/
-void Sys_SendPacket( size_t length, const void *data, netadr_t to ) {
-	int				ret;
-	struct sockaddr	addr;
-	SOCKET			net_socket;
-
-	if( to.type == NA_BROADCAST ) {
-		net_socket = ip_socket;
-	}
-	else if( to.type == NA_IP ) {
-		net_socket = ip_socket;
-	}
-	else if( to.type == NA_IPX ) {
-		net_socket = ipx_socket;
-	}
-	else if( to.type == NA_BROADCAST_IPX ) {
-		net_socket = ipx_socket;
-	}
-	else {
-		Com_Error( ERR_FATAL, "Sys_SendPacket: bad address type" );
-		return;
-	}
-
-	if( !net_socket ) {
-		return;
-	}
-
-	NetadrToSockadr( &to, &addr );
-
-	if( usingSocks && to.type == NA_IP ) {
-		socksBuf[0] = 0;	// reserved
-		socksBuf[1] = 0;
-		socksBuf[2] = 0;	// fragment (not fragmented)
-		socksBuf[3] = 1;	// address type: IPV4
-		*(int *)&socksBuf[4] = ((struct sockaddr_in *)&addr)->sin_addr.s_addr;
-		*(short *)&socksBuf[8] = ((struct sockaddr_in *)&addr)->sin_port;
-		memcpy( &socksBuf[10], data, length );
-		ret = sendto( net_socket, socksBuf, length+10, 0, &socksRelayAddr, sizeof(socksRelayAddr) );
-	}
-	else {
-		ret = sendto( net_socket, data, length, 0, &addr, sizeof(addr) );
-	}
-	if( ret == SOCKET_ERROR ) {
-		int err = WSAGetLastError();
-
-		// wouldblock is silent
-		if( err == WSAEWOULDBLOCK ) {
-			return;
-		}
-
-		// some PPP links do not allow broadcasts and return an error
-		if( ( err == WSAEADDRNOTAVAIL ) && ( ( to.type == NA_BROADCAST ) || ( to.type == NA_BROADCAST_IPX ) ) ) {
-			return;
-		}
-
-		Com_Printf( "NET_SendPacket: %s\n", NET_ErrorString() );
-	}
-}
-
-
-//=============================================================================
-
-/*
-==================
-Sys_IsLANAddress
-
-LAN clients will have their rate var ignored
-==================
-*/
-qboolean Sys_IsLANAddress( netadr_t adr ) {
-	int		i;
-
-	if( adr.type == NA_LOOPBACK ) {
-		return qtrue;
-	}
-
-	if( adr.type == NA_IPX ) {
-		return qtrue;
-	}
-
-	if( adr.type != NA_IP ) {
-		return qfalse;
-	}
-
-	// choose which comparison to use based on the class of the address being tested
-	// any local adresses of a different class than the address being tested will fail based on the first byte
-
-	if( adr.ip[0] == 127 && adr.ip[1] == 0 && adr.ip[2] == 0 && adr.ip[3] == 1 ) {
-		return qtrue;
-	}
-
-	// Class A
-	if( (adr.ip[0] & 0x80) == 0x00 ) {
-		for ( i = 0 ; i < numIP ; i++ ) {
-			if( adr.ip[0] == localIP[i][0] ) {
-				return qtrue;
-			}
-		}
-		// the RFC1918 class a block will pass the above test
-		return qfalse;
-	}
-
-	// Class B
-	if( (adr.ip[0] & 0xc0) == 0x80 ) {
-		for ( i = 0 ; i < numIP ; i++ ) {
-			if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] ) {
-				return qtrue;
-			}
-			// also check against the RFC1918 class b blocks
-			if( adr.ip[0] == 172 && localIP[i][0] == 172 && (adr.ip[1] & 0xf0) == 16 && (localIP[i][1] & 0xf0) == 16 ) {
-				return qtrue;
-			}
-		}
-		return qfalse;
-	}
-
-	// Class C
-	for ( i = 0 ; i < numIP ; i++ ) {
-		if( adr.ip[0] == localIP[i][0] && adr.ip[1] == localIP[i][1] && adr.ip[2] == localIP[i][2] ) {
-			return qtrue;
-		}
-		// also check against the RFC1918 class c blocks
-		if( adr.ip[0] == 192 && localIP[i][0] == 192 && adr.ip[1] == 168 && localIP[i][1] == 168 ) {
-			return qtrue;
-		}
-	}
-	return qfalse;
-}
-
-/*
-==================
-Sys_ShowIP
-==================
-*/
-void Sys_ShowIP(void) {
-	int i;
-
-	for (i = 0; i < numIP; i++) {
-		Com_Printf( "IP: %i.%i.%i.%i\n", localIP[i][0], localIP[i][1], localIP[i][2], localIP[i][3] );
-	}
-}
-
-
-//=============================================================================
-
-
-/*
-====================
-NET_IPSocket
-====================
-*/
-int NET_IPSocket( char *net_interface, int port ) {
-	SOCKET				newsocket;
-	struct sockaddr_in	address;
-	qboolean			_true = qtrue;
-	int					i = 1;
-	int					err;
-
-	if( net_interface ) {
-		Com_Printf( "Opening IP socket: %s:%i\n", net_interface, port );
-	}
-	else {
-		Com_Printf( "Opening IP socket: localhost:%i\n", port );
-	}
-
-	if( ( newsocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) == INVALID_SOCKET ) {
-		err = WSAGetLastError();
-		if( err != WSAEAFNOSUPPORT ) {
-			Com_Printf( "WARNING: UDP_OpenSocket: socket: %s\n", NET_ErrorString() );
-		}
-		return 0;
-	}
-
-	// make it non-blocking
-	if( ioctlsocket( newsocket, FIONBIO, &_true ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: UDP_OpenSocket: ioctl FIONBIO: %s\n", NET_ErrorString() );
-		return 0;
-	}
-
-	// make it broadcast capable
-	if( setsockopt( newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&i, sizeof(i) ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: UDP_OpenSocket: setsockopt SO_BROADCAST: %s\n", NET_ErrorString() );
-		return 0;
-	}
-
-	if( !net_interface || !net_interface[0] || !Q_stricmp(net_interface, "localhost") ) {
-		address.sin_addr.s_addr = INADDR_ANY;
-	}
-	else {
-		Sys_StringToSockaddr( net_interface, (struct sockaddr *)&address );
-	}
-
-	if( port == PORT_ANY ) {
-		address.sin_port = 0;
-	}
-	else {
-		address.sin_port = htons( (short)port );
-	}
-
-	address.sin_family = AF_INET;
-
-	if( bind( newsocket, (void *)&address, sizeof(address) ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: UDP_OpenSocket: bind: %s\n", NET_ErrorString() );
-		closesocket( newsocket );
-		return 0;
-	}
-
-	return newsocket;
-}
-
-
-/*
-====================
-NET_OpenSocks
-====================
-*/
-void NET_OpenSocks( int port ) {
-	struct sockaddr_in	address;
-	int					err;
-	struct hostent		*h;
-	int					len;
-	qboolean			rfc1929;
-	unsigned char		buf[64];
-
-	usingSocks = qfalse;
-
-	Com_Printf( "Opening connection to SOCKS server.\n" );
-
-	if ( ( socks_socket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ) ) == INVALID_SOCKET ) {
-		err = WSAGetLastError();
-		Com_Printf( "WARNING: NET_OpenSocks: socket: %s\n", NET_ErrorString() );
-		return;
-	}
-
-	h = gethostbyname( net_socksServer->string );
-	if ( h == NULL ) {
-		err = WSAGetLastError();
-		Com_Printf( "WARNING: NET_OpenSocks: gethostbyname: %s\n", NET_ErrorString() );
-		return;
-	}
-	if ( h->h_addrtype != AF_INET ) {
-		Com_Printf( "WARNING: NET_OpenSocks: gethostbyname: address type was not AF_INET\n" );
-		return;
-	}
-	address.sin_family = AF_INET;
-	address.sin_addr.s_addr = *(int *)h->h_addr_list[0];
-	address.sin_port = htons( (short)net_socksPort->integer );
-
-	if ( connect( socks_socket, (struct sockaddr *)&address, sizeof( address ) ) == SOCKET_ERROR ) {
-		err = WSAGetLastError();
-		Com_Printf( "NET_OpenSocks: connect: %s\n", NET_ErrorString() );
-		return;
-	}
-
-	// send socks authentication handshake
-	if ( *net_socksUsername->string || *net_socksPassword->string ) {
-		rfc1929 = qtrue;
-	}
-	else {
-		rfc1929 = qfalse;
-	}
-
-	buf[0] = 5;		// SOCKS version
-	// method count
-	if ( rfc1929 ) {
-		buf[1] = 2;
-		len = 4;
-	}
-	else {
-		buf[1] = 1;
-		len = 3;
-	}
-	buf[2] = 0;		// method #1 - method id #00: no authentication
-	if ( rfc1929 ) {
-		buf[2] = 2;		// method #2 - method id #02: username/password
-	}
-	if ( send( socks_socket, buf, len, 0 ) == SOCKET_ERROR ) {
-		err = WSAGetLastError();
-		Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
-		return;
-	}
-
-	// get the response
-	len = recv( socks_socket, buf, 64, 0 );
-	if ( len == SOCKET_ERROR ) {
-		err = WSAGetLastError();
-		Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
-		return;
-	}
-	if ( len != 2 || buf[0] != 5 ) {
-		Com_Printf( "NET_OpenSocks: bad response\n" );
-		return;
-	}
-	switch( buf[1] ) {
-	case 0:	// no authentication
-		break;
-	case 2: // username/password authentication
-		break;
-	default:
-		Com_Printf( "NET_OpenSocks: request denied\n" );
-		return;
-	}
-
-	// do username/password authentication if needed
-	if ( buf[1] == 2 ) {
-		int		ulen;
-		int		plen;
-
-		// build the request
-		ulen = strlen( net_socksUsername->string );
-		plen = strlen( net_socksPassword->string );
-
-		buf[0] = 1;		// username/password authentication version
-		buf[1] = ulen;
-		if ( ulen ) {
-			memcpy( &buf[2], net_socksUsername->string, ulen );
-		}
-		buf[2 + ulen] = plen;
-		if ( plen ) {
-			memcpy( &buf[3 + ulen], net_socksPassword->string, plen );
-		}
-
-		// send it
-		if ( send( socks_socket, buf, 3 + ulen + plen, 0 ) == SOCKET_ERROR ) {
-			err = WSAGetLastError();
-			Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
-			return;
-		}
-
-		// get the response
-		len = recv( socks_socket, buf, 64, 0 );
-		if ( len == SOCKET_ERROR ) {
-			err = WSAGetLastError();
-			Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
-			return;
-		}
-		if ( len != 2 || buf[0] != 1 ) {
-			Com_Printf( "NET_OpenSocks: bad response\n" );
-			return;
-		}
-		if ( buf[1] != 0 ) {
-			Com_Printf( "NET_OpenSocks: authentication failed\n" );
-			return;
-		}
-	}
-
-	// send the UDP associate request
-	buf[0] = 5;		// SOCKS version
-	buf[1] = 3;		// command: UDP associate
-	buf[2] = 0;		// reserved
-	buf[3] = 1;		// address type: IPV4
-	*(int *)&buf[4] = INADDR_ANY;
-	*(short *)&buf[8] = htons( (short)port );		// port
-	if ( send( socks_socket, buf, 10, 0 ) == SOCKET_ERROR ) {
-		err = WSAGetLastError();
-		Com_Printf( "NET_OpenSocks: send: %s\n", NET_ErrorString() );
-		return;
-	}
-
-	// get the response
-	len = recv( socks_socket, buf, 64, 0 );
-	if( len == SOCKET_ERROR ) {
-		err = WSAGetLastError();
-		Com_Printf( "NET_OpenSocks: recv: %s\n", NET_ErrorString() );
-		return;
-	}
-	if( len < 2 || buf[0] != 5 ) {
-		Com_Printf( "NET_OpenSocks: bad response\n" );
-		return;
-	}
-	// check completion code
-	if( buf[1] != 0 ) {
-		Com_Printf( "NET_OpenSocks: request denied: %i\n", buf[1] );
-		return;
-	}
-	if( buf[3] != 1 ) {
-		Com_Printf( "NET_OpenSocks: relay address is not IPV4: %i\n", buf[3] );
-		return;
-	}
-	((struct sockaddr_in *)&socksRelayAddr)->sin_family = AF_INET;
-	((struct sockaddr_in *)&socksRelayAddr)->sin_addr.s_addr = *(int *)&buf[4];
-	((struct sockaddr_in *)&socksRelayAddr)->sin_port = *(short *)&buf[8];
-	memset( ((struct sockaddr_in *)&socksRelayAddr)->sin_zero, 0, 8 );
-
-	usingSocks = qtrue;
-}
-
-
-/*
-=====================
-NET_GetLocalAddress
-=====================
-*/
-void NET_GetLocalAddress( void ) {
-	char				hostname[256];
-	struct hostent		*hostInfo;
-	int					error;
-	char				*p;
-	int					ip;
-	int					n;
-
-	if( gethostname( hostname, 256 ) == SOCKET_ERROR ) {
-		error = WSAGetLastError();
-		return;
-	}
-
-	hostInfo = gethostbyname( hostname );
-	if( !hostInfo ) {
-		error = WSAGetLastError();
-		return;
-	}
-
-	Com_Printf( "Hostname: %s\n", hostInfo->h_name );
-	n = 0;
-	while( ( p = hostInfo->h_aliases[n++] ) != NULL ) {
-		Com_Printf( "Alias: %s\n", p );
-	}
-
-	if ( hostInfo->h_addrtype != AF_INET ) {
-		return;
-	}
-
-	numIP = 0;
-	while( ( p = hostInfo->h_addr_list[numIP] ) != NULL && numIP < MAX_IPS ) {
-		ip = ntohl( *(int *)p );
-		localIP[ numIP ][0] = p[0];
-		localIP[ numIP ][1] = p[1];
-		localIP[ numIP ][2] = p[2];
-		localIP[ numIP ][3] = p[3];
-		Com_Printf( "IP: %i.%i.%i.%i\n", ( ip >> 24 ) & 0xff, ( ip >> 16 ) & 0xff, ( ip >> 8 ) & 0xff, ip & 0xff );
-		numIP++;
-	}
-}
-
-/*
-====================
-NET_OpenIP
-====================
-*/
-void NET_OpenIP( void ) {
-	cvar_t	*ip;
-	int		port;
-	int		i;
-
-	ip = Cvar_Get( "net_ip", "localhost", CVAR_LATCH );
-	port = Cvar_Get( "net_port", va( "%i", PORT_SERVER ), CVAR_LATCH )->integer;
-
-	// automatically scan for a valid port, so multiple
-	// dedicated servers can be started without requiring
-	// a different net_port for each one
-	for( i = 0 ; i < 10 ; i++ ) {
-		ip_socket = NET_IPSocket( ip->string, port + i );
-		if ( ip_socket ) {
-			Cvar_SetValue( "net_port", port + i );
-			if ( net_socksEnabled->integer ) {
-				NET_OpenSocks( port + i );
-			}
-			NET_GetLocalAddress();
-			return;
-		}
-	}
-	Com_Printf( "WARNING: Couldn't allocate IP port\n");
-}
-
-
-/*
-====================
-NET_IPXSocket
-====================
-*/
-int NET_IPXSocket( int port ) {
-	SOCKET				newsocket;
-	struct sockaddr_ipx	address;
-	int					_true = 1;
-	int					err;
-
-	if( ( newsocket = socket( AF_IPX, SOCK_DGRAM, NSPROTO_IPX ) ) == INVALID_SOCKET ) {
-		err = WSAGetLastError();
-		if (err != WSAEAFNOSUPPORT) {
-			Com_Printf( "WARNING: IPX_Socket: socket: %s\n", NET_ErrorString() );
-		}
-		return 0;
-	}
-
-	// make it non-blocking
-	if( ioctlsocket( newsocket, FIONBIO, &_true ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: IPX_Socket: ioctl FIONBIO: %s\n", NET_ErrorString() );
-		return 0;
-	}
-
-	// make it broadcast capable
-	if( setsockopt( newsocket, SOL_SOCKET, SO_BROADCAST, (char *)&_true, sizeof( _true ) ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: IPX_Socket: setsockopt SO_BROADCAST: %s\n", NET_ErrorString() );
-		return 0;
-	}
-
-	address.sa_family = AF_IPX;
-	memset( address.sa_netnum, 0, 4 );
-	memset( address.sa_nodenum, 0, 6 );
-	if( port == PORT_ANY ) {
-		address.sa_socket = 0;
-	}
-	else {
-		address.sa_socket = htons( (short)port );
-	}
-
-	if( bind( newsocket, (void *)&address, sizeof(address) ) == SOCKET_ERROR ) {
-		Com_Printf( "WARNING: IPX_Socket: bind: %s\n", NET_ErrorString() );
-		closesocket( newsocket );
-		return 0;
-	}
-
-	return newsocket;
-}
-
-
-/*
-====================
-NET_OpenIPX
-====================
-*/
-void NET_OpenIPX( void ) {
-	int		port;
-
-	port = Cvar_Get( "net_port", va( "%i", PORT_SERVER ), CVAR_LATCH )->integer;
-	ipx_socket = NET_IPXSocket( port );
-}
-
-
-
-//===================================================================
-
-
-/*
-====================
-NET_GetCvars
-====================
-*/
-static qboolean NET_GetCvars( void ) {
-	qboolean	modified;
-
-	modified = qfalse;
-
-	if( net_noudp && net_noudp->modified ) {
-		modified = qtrue;
-	}
-	net_noudp = Cvar_Get( "net_noudp", "0", CVAR_LATCH | CVAR_ARCHIVE );
-
-	if( net_noipx && net_noipx->modified ) {
-		modified = qtrue;
-	}
-	net_noipx = Cvar_Get( "net_noipx", "0", CVAR_LATCH | CVAR_ARCHIVE );
-
-
-	if( net_socksEnabled && net_socksEnabled->modified ) {
-		modified = qtrue;
-	}
-	net_socksEnabled = Cvar_Get( "net_socksEnabled", "0", CVAR_LATCH | CVAR_ARCHIVE );
-
-	if( net_socksServer && net_socksServer->modified ) {
-		modified = qtrue;
-	}
-	net_socksServer = Cvar_Get( "net_socksServer", "", CVAR_LATCH | CVAR_ARCHIVE );
-
-	if( net_socksPort && net_socksPort->modified ) {
-		modified = qtrue;
-	}
-	net_socksPort = Cvar_Get( "net_socksPort", "1080", CVAR_LATCH | CVAR_ARCHIVE );
-
-	if( net_socksUsername && net_socksUsername->modified ) {
-		modified = qtrue;
-	}
-	net_socksUsername = Cvar_Get( "net_socksUsername", "", CVAR_LATCH | CVAR_ARCHIVE );
-
-	if( net_socksPassword && net_socksPassword->modified ) {
-		modified = qtrue;
-	}
-	net_socksPassword = Cvar_Get( "net_socksPassword", "", CVAR_LATCH | CVAR_ARCHIVE );
-
-
-	return modified;
-}
-
-
-/*
-====================
-NET_Config
-====================
-*/
-void NET_Config( qboolean enableNetworking ) {
-	qboolean	modified;
-	qboolean	stop;
-	qboolean	start;
-
-	// get any latched changes to cvars
-	modified = NET_GetCvars();
-
-	if( net_noudp->integer && net_noipx->integer ) {
-		enableNetworking = qfalse;
-	}
-
-	// if enable state is the same and no cvars were modified, we have nothing to do
-	if( enableNetworking == networkingEnabled && !modified ) {
-		return;
-	}
-
-	if( enableNetworking == networkingEnabled ) {
-		if( enableNetworking ) {
-			stop = qtrue;
-			start = qtrue;
-		}
-		else {
-			stop = qfalse;
-			start = qfalse;
-		}
-	}
-	else {
-		if( enableNetworking ) {
-			stop = qfalse;
-			start = qtrue;
-		}
-		else {
-			stop = qtrue;
-			start = qfalse;
-		}
-		networkingEnabled = enableNetworking;
-	}
-
-	if( stop ) {
-		if ( ip_socket && ip_socket != INVALID_SOCKET ) {
-			closesocket( ip_socket );
-			ip_socket = 0;
-		}
-
-		if ( socks_socket && socks_socket != INVALID_SOCKET ) {
-			closesocket( socks_socket );
-			socks_socket = 0;
-		}
-
-		if ( ipx_socket && ipx_socket != INVALID_SOCKET ) {
-			closesocket( ipx_socket );
-			ipx_socket = 0;
-		}
-	}
-
-	if( start ) {
-		if (! net_noudp->integer ) {
-			NET_OpenIP();
-		}
-		if (! net_noipx->integer ) {
-			NET_OpenIPX();
-		}
-	}
-}
-
-
-/*
-====================
-NET_Init
-====================
-*/
-void NET_Init( void ) {
-	int		r;
-
-	r = WSAStartup( MAKEWORD( 1, 1 ), &winsockdata );
-	if( r ) {
-		Com_Printf( "WARNING: Winsock initialization failed, returned %d\n", r );
-		return;
-	}
-
-	winsockInitialized = qtrue;
-	Com_Printf( "Winsock Initialized\n" );
-
-	// this is really just to get the cvars registered
-	NET_GetCvars();
-
-	//FIXME testing!
-	NET_Config( qtrue );
-}
-
-
-/*
-====================
-NET_Shutdown
-====================
-*/
-void NET_Shutdown( void ) {
-	if ( !winsockInitialized ) {
-		return;
-	}
-	NET_Config( qfalse );
-	WSACleanup();
-	winsockInitialized = qfalse;
-}
-
-
-/*
-====================
-NET_Sleep
-
-sleeps msec or until net socket is ready
-====================
-*/
-void NET_Sleep( int msec ) {
-}
-
-
-/*
-====================
-NET_Restart_f
-====================
-*/
-void NET_Restart( void ) {
-	NET_Config( networkingEnabled );
-}
diff --git a/code/win32/win_qgl.c b/code/win32/win_qgl.c
deleted file mode 100644
index b7bfdf5f..00000000
--- a/code/win32/win_qgl.c
+++ /dev/null
@@ -1,4396 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-/*
-** QGL_WIN.C
-**
-** This file implements the operating system binding of GL to QGL function
-** pointers.  When doing a port of Quake3 you must implement the following
-** two functions:
-**
-** QGL_Init() - loads libraries, assigns function pointers, etc.
-** QGL_Shutdown() - unloads libraries, NULLs function pointers
-*/
-#include <float.h>
-#include "../renderer/tr_local.h"
-#include "glw_win.h"
-
-void QGL_EnableLogging( qboolean enable );
-
-int ( WINAPI * qwglSwapIntervalEXT)( int interval );
-BOOL  ( WINAPI * qwglGetDeviceGammaRamp3DFX)( HDC, LPVOID );
-BOOL  ( WINAPI * qwglSetDeviceGammaRamp3DFX)( HDC, LPVOID );
-
-int   ( WINAPI * qwglChoosePixelFormat )(HDC, CONST PIXELFORMATDESCRIPTOR *);
-int   ( WINAPI * qwglDescribePixelFormat) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-int   ( WINAPI * qwglGetPixelFormat)(HDC);
-BOOL  ( WINAPI * qwglSetPixelFormat)(HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-BOOL  ( WINAPI * qwglSwapBuffers)(HDC);
-
-BOOL  ( WINAPI * qwglCopyContext)(HGLRC, HGLRC, UINT);
-HGLRC ( WINAPI * qwglCreateContext)(HDC);
-HGLRC ( WINAPI * qwglCreateLayerContext)(HDC, int);
-BOOL  ( WINAPI * qwglDeleteContext)(HGLRC);
-HGLRC ( WINAPI * qwglGetCurrentContext)(VOID);
-HDC   ( WINAPI * qwglGetCurrentDC)(VOID);
-PROC  ( WINAPI * qwglGetProcAddress)(LPCSTR);
-BOOL  ( WINAPI * qwglMakeCurrent)(HDC, HGLRC);
-BOOL  ( WINAPI * qwglShareLists)(HGLRC, HGLRC);
-BOOL  ( WINAPI * qwglUseFontBitmaps)(HDC, DWORD, DWORD, DWORD);
-
-BOOL  ( WINAPI * qwglUseFontOutlines)(HDC, DWORD, DWORD, DWORD, FLOAT,
-                                           FLOAT, int, LPGLYPHMETRICSFLOAT);
-
-BOOL ( WINAPI * qwglDescribeLayerPlane)(HDC, int, int, UINT,
-                                            LPLAYERPLANEDESCRIPTOR);
-int  ( WINAPI * qwglSetLayerPaletteEntries)(HDC, int, int, int,
-                                                CONST COLORREF *);
-int  ( WINAPI * qwglGetLayerPaletteEntries)(HDC, int, int, int,
-                                                COLORREF *);
-BOOL ( WINAPI * qwglRealizeLayerPalette)(HDC, int, BOOL);
-BOOL ( WINAPI * qwglSwapLayerBuffers)(HDC, UINT);
-
-void ( APIENTRY * qglAccum )(GLenum op, GLfloat value);
-void ( APIENTRY * qglAlphaFunc )(GLenum func, GLclampf ref);
-GLboolean ( APIENTRY * qglAreTexturesResident )(GLsizei n, const GLuint *textures, GLboolean *residences);
-void ( APIENTRY * qglArrayElement )(GLint i);
-void ( APIENTRY * qglBegin )(GLenum mode);
-void ( APIENTRY * qglBindTexture )(GLenum target, GLuint texture);
-void ( APIENTRY * qglBitmap )(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-void ( APIENTRY * qglBlendFunc )(GLenum sfactor, GLenum dfactor);
-void ( APIENTRY * qglCallList )(GLuint list);
-void ( APIENTRY * qglCallLists )(GLsizei n, GLenum type, const GLvoid *lists);
-void ( APIENTRY * qglClear )(GLbitfield mask);
-void ( APIENTRY * qglClearAccum )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void ( APIENTRY * qglClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-void ( APIENTRY * qglClearDepth )(GLclampd depth);
-void ( APIENTRY * qglClearIndex )(GLfloat c);
-void ( APIENTRY * qglClearStencil )(GLint s);
-void ( APIENTRY * qglClipPlane )(GLenum plane, const GLdouble *equation);
-void ( APIENTRY * qglColor3b )(GLbyte red, GLbyte green, GLbyte blue);
-void ( APIENTRY * qglColor3bv )(const GLbyte *v);
-void ( APIENTRY * qglColor3d )(GLdouble red, GLdouble green, GLdouble blue);
-void ( APIENTRY * qglColor3dv )(const GLdouble *v);
-void ( APIENTRY * qglColor3f )(GLfloat red, GLfloat green, GLfloat blue);
-void ( APIENTRY * qglColor3fv )(const GLfloat *v);
-void ( APIENTRY * qglColor3i )(GLint red, GLint green, GLint blue);
-void ( APIENTRY * qglColor3iv )(const GLint *v);
-void ( APIENTRY * qglColor3s )(GLshort red, GLshort green, GLshort blue);
-void ( APIENTRY * qglColor3sv )(const GLshort *v);
-void ( APIENTRY * qglColor3ub )(GLubyte red, GLubyte green, GLubyte blue);
-void ( APIENTRY * qglColor3ubv )(const GLubyte *v);
-void ( APIENTRY * qglColor3ui )(GLuint red, GLuint green, GLuint blue);
-void ( APIENTRY * qglColor3uiv )(const GLuint *v);
-void ( APIENTRY * qglColor3us )(GLushort red, GLushort green, GLushort blue);
-void ( APIENTRY * qglColor3usv )(const GLushort *v);
-void ( APIENTRY * qglColor4b )(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-void ( APIENTRY * qglColor4bv )(const GLbyte *v);
-void ( APIENTRY * qglColor4d )(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-void ( APIENTRY * qglColor4dv )(const GLdouble *v);
-void ( APIENTRY * qglColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-void ( APIENTRY * qglColor4fv )(const GLfloat *v);
-void ( APIENTRY * qglColor4i )(GLint red, GLint green, GLint blue, GLint alpha);
-void ( APIENTRY * qglColor4iv )(const GLint *v);
-void ( APIENTRY * qglColor4s )(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-void ( APIENTRY * qglColor4sv )(const GLshort *v);
-void ( APIENTRY * qglColor4ub )(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-void ( APIENTRY * qglColor4ubv )(const GLubyte *v);
-void ( APIENTRY * qglColor4ui )(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-void ( APIENTRY * qglColor4uiv )(const GLuint *v);
-void ( APIENTRY * qglColor4us )(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-void ( APIENTRY * qglColor4usv )(const GLushort *v);
-void ( APIENTRY * qglColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-void ( APIENTRY * qglColorMaterial )(GLenum face, GLenum mode);
-void ( APIENTRY * qglColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglCopyPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-void ( APIENTRY * qglCopyTexImage1D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-void ( APIENTRY * qglCopyTexImage2D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-void ( APIENTRY * qglCopyTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-void ( APIENTRY * qglCopyTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-void ( APIENTRY * qglCullFace )(GLenum mode);
-void ( APIENTRY * qglDeleteLists )(GLuint list, GLsizei range);
-void ( APIENTRY * qglDeleteTextures )(GLsizei n, const GLuint *textures);
-void ( APIENTRY * qglDepthFunc )(GLenum func);
-void ( APIENTRY * qglDepthMask )(GLboolean flag);
-void ( APIENTRY * qglDepthRange )(GLclampd zNear, GLclampd zFar);
-void ( APIENTRY * qglDisable )(GLenum cap);
-void ( APIENTRY * qglDisableClientState )(GLenum array);
-void ( APIENTRY * qglDrawArrays )(GLenum mode, GLint first, GLsizei count);
-void ( APIENTRY * qglDrawBuffer )(GLenum mode);
-void ( APIENTRY * qglDrawElements )(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-void ( APIENTRY * qglDrawPixels )(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglEdgeFlag )(GLboolean flag);
-void ( APIENTRY * qglEdgeFlagPointer )(GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglEdgeFlagv )(const GLboolean *flag);
-void ( APIENTRY * qglEnable )(GLenum cap);
-void ( APIENTRY * qglEnableClientState )(GLenum array);
-void ( APIENTRY * qglEnd )(void);
-void ( APIENTRY * qglEndList )(void);
-void ( APIENTRY * qglEvalCoord1d )(GLdouble u);
-void ( APIENTRY * qglEvalCoord1dv )(const GLdouble *u);
-void ( APIENTRY * qglEvalCoord1f )(GLfloat u);
-void ( APIENTRY * qglEvalCoord1fv )(const GLfloat *u);
-void ( APIENTRY * qglEvalCoord2d )(GLdouble u, GLdouble v);
-void ( APIENTRY * qglEvalCoord2dv )(const GLdouble *u);
-void ( APIENTRY * qglEvalCoord2f )(GLfloat u, GLfloat v);
-void ( APIENTRY * qglEvalCoord2fv )(const GLfloat *u);
-void ( APIENTRY * qglEvalMesh1 )(GLenum mode, GLint i1, GLint i2);
-void ( APIENTRY * qglEvalMesh2 )(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-void ( APIENTRY * qglEvalPoint1 )(GLint i);
-void ( APIENTRY * qglEvalPoint2 )(GLint i, GLint j);
-void ( APIENTRY * qglFeedbackBuffer )(GLsizei size, GLenum type, GLfloat *buffer);
-void ( APIENTRY * qglFinish )(void);
-void ( APIENTRY * qglFlush )(void);
-void ( APIENTRY * qglFogf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglFogfv )(GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglFogi )(GLenum pname, GLint param);
-void ( APIENTRY * qglFogiv )(GLenum pname, const GLint *params);
-void ( APIENTRY * qglFrontFace )(GLenum mode);
-void ( APIENTRY * qglFrustum )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLuint ( APIENTRY * qglGenLists )(GLsizei range);
-void ( APIENTRY * qglGenTextures )(GLsizei n, GLuint *textures);
-void ( APIENTRY * qglGetBooleanv )(GLenum pname, GLboolean *params);
-void ( APIENTRY * qglGetClipPlane )(GLenum plane, GLdouble *equation);
-void ( APIENTRY * qglGetDoublev )(GLenum pname, GLdouble *params);
-GLenum ( APIENTRY * qglGetError )(void);
-void ( APIENTRY * qglGetFloatv )(GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetIntegerv )(GLenum pname, GLint *params);
-void ( APIENTRY * qglGetLightfv )(GLenum light, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetLightiv )(GLenum light, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetMapdv )(GLenum target, GLenum query, GLdouble *v);
-void ( APIENTRY * qglGetMapfv )(GLenum target, GLenum query, GLfloat *v);
-void ( APIENTRY * qglGetMapiv )(GLenum target, GLenum query, GLint *v);
-void ( APIENTRY * qglGetMaterialfv )(GLenum face, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetMaterialiv )(GLenum face, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetPixelMapfv )(GLenum map, GLfloat *values);
-void ( APIENTRY * qglGetPixelMapuiv )(GLenum map, GLuint *values);
-void ( APIENTRY * qglGetPixelMapusv )(GLenum map, GLushort *values);
-void ( APIENTRY * qglGetPointerv )(GLenum pname, GLvoid* *params);
-void ( APIENTRY * qglGetPolygonStipple )(GLubyte *mask);
-const GLubyte * ( APIENTRY * qglGetString )(GLenum name);
-void ( APIENTRY * qglGetTexEnvfv )(GLenum target, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexEnviv )(GLenum target, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexGendv )(GLenum coord, GLenum pname, GLdouble *params);
-void ( APIENTRY * qglGetTexGenfv )(GLenum coord, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexGeniv )(GLenum coord, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexImage )(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-void ( APIENTRY * qglGetTexLevelParameterfv )(GLenum target, GLint level, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexLevelParameteriv )(GLenum target, GLint level, GLenum pname, GLint *params);
-void ( APIENTRY * qglGetTexParameterfv )(GLenum target, GLenum pname, GLfloat *params);
-void ( APIENTRY * qglGetTexParameteriv )(GLenum target, GLenum pname, GLint *params);
-void ( APIENTRY * qglHint )(GLenum target, GLenum mode);
-void ( APIENTRY * qglIndexMask )(GLuint mask);
-void ( APIENTRY * qglIndexPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglIndexd )(GLdouble c);
-void ( APIENTRY * qglIndexdv )(const GLdouble *c);
-void ( APIENTRY * qglIndexf )(GLfloat c);
-void ( APIENTRY * qglIndexfv )(const GLfloat *c);
-void ( APIENTRY * qglIndexi )(GLint c);
-void ( APIENTRY * qglIndexiv )(const GLint *c);
-void ( APIENTRY * qglIndexs )(GLshort c);
-void ( APIENTRY * qglIndexsv )(const GLshort *c);
-void ( APIENTRY * qglIndexub )(GLubyte c);
-void ( APIENTRY * qglIndexubv )(const GLubyte *c);
-void ( APIENTRY * qglInitNames )(void);
-void ( APIENTRY * qglInterleavedArrays )(GLenum format, GLsizei stride, const GLvoid *pointer);
-GLboolean ( APIENTRY * qglIsEnabled )(GLenum cap);
-GLboolean ( APIENTRY * qglIsList )(GLuint list);
-GLboolean ( APIENTRY * qglIsTexture )(GLuint texture);
-void ( APIENTRY * qglLightModelf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglLightModelfv )(GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglLightModeli )(GLenum pname, GLint param);
-void ( APIENTRY * qglLightModeliv )(GLenum pname, const GLint *params);
-void ( APIENTRY * qglLightf )(GLenum light, GLenum pname, GLfloat param);
-void ( APIENTRY * qglLightfv )(GLenum light, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglLighti )(GLenum light, GLenum pname, GLint param);
-void ( APIENTRY * qglLightiv )(GLenum light, GLenum pname, const GLint *params);
-void ( APIENTRY * qglLineStipple )(GLint factor, GLushort pattern);
-void ( APIENTRY * qglLineWidth )(GLfloat width);
-void ( APIENTRY * qglListBase )(GLuint base);
-void ( APIENTRY * qglLoadIdentity )(void);
-void ( APIENTRY * qglLoadMatrixd )(const GLdouble *m);
-void ( APIENTRY * qglLoadMatrixf )(const GLfloat *m);
-void ( APIENTRY * qglLoadName )(GLuint name);
-void ( APIENTRY * qglLogicOp )(GLenum opcode);
-void ( APIENTRY * qglMap1d )(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-void ( APIENTRY * qglMap1f )(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-void ( APIENTRY * qglMap2d )(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-void ( APIENTRY * qglMap2f )(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-void ( APIENTRY * qglMapGrid1d )(GLint un, GLdouble u1, GLdouble u2);
-void ( APIENTRY * qglMapGrid1f )(GLint un, GLfloat u1, GLfloat u2);
-void ( APIENTRY * qglMapGrid2d )(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-void ( APIENTRY * qglMapGrid2f )(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-void ( APIENTRY * qglMaterialf )(GLenum face, GLenum pname, GLfloat param);
-void ( APIENTRY * qglMaterialfv )(GLenum face, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglMateriali )(GLenum face, GLenum pname, GLint param);
-void ( APIENTRY * qglMaterialiv )(GLenum face, GLenum pname, const GLint *params);
-void ( APIENTRY * qglMatrixMode )(GLenum mode);
-void ( APIENTRY * qglMultMatrixd )(const GLdouble *m);
-void ( APIENTRY * qglMultMatrixf )(const GLfloat *m);
-void ( APIENTRY * qglNewList )(GLuint list, GLenum mode);
-void ( APIENTRY * qglNormal3b )(GLbyte nx, GLbyte ny, GLbyte nz);
-void ( APIENTRY * qglNormal3bv )(const GLbyte *v);
-void ( APIENTRY * qglNormal3d )(GLdouble nx, GLdouble ny, GLdouble nz);
-void ( APIENTRY * qglNormal3dv )(const GLdouble *v);
-void ( APIENTRY * qglNormal3f )(GLfloat nx, GLfloat ny, GLfloat nz);
-void ( APIENTRY * qglNormal3fv )(const GLfloat *v);
-void ( APIENTRY * qglNormal3i )(GLint nx, GLint ny, GLint nz);
-void ( APIENTRY * qglNormal3iv )(const GLint *v);
-void ( APIENTRY * qglNormal3s )(GLshort nx, GLshort ny, GLshort nz);
-void ( APIENTRY * qglNormal3sv )(const GLshort *v);
-void ( APIENTRY * qglNormalPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglOrtho )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-void ( APIENTRY * qglPassThrough )(GLfloat token);
-void ( APIENTRY * qglPixelMapfv )(GLenum map, GLsizei mapsize, const GLfloat *values);
-void ( APIENTRY * qglPixelMapuiv )(GLenum map, GLsizei mapsize, const GLuint *values);
-void ( APIENTRY * qglPixelMapusv )(GLenum map, GLsizei mapsize, const GLushort *values);
-void ( APIENTRY * qglPixelStoref )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglPixelStorei )(GLenum pname, GLint param);
-void ( APIENTRY * qglPixelTransferf )(GLenum pname, GLfloat param);
-void ( APIENTRY * qglPixelTransferi )(GLenum pname, GLint param);
-void ( APIENTRY * qglPixelZoom )(GLfloat xfactor, GLfloat yfactor);
-void ( APIENTRY * qglPointSize )(GLfloat size);
-void ( APIENTRY * qglPolygonMode )(GLenum face, GLenum mode);
-void ( APIENTRY * qglPolygonOffset )(GLfloat factor, GLfloat units);
-void ( APIENTRY * qglPolygonStipple )(const GLubyte *mask);
-void ( APIENTRY * qglPopAttrib )(void);
-void ( APIENTRY * qglPopClientAttrib )(void);
-void ( APIENTRY * qglPopMatrix )(void);
-void ( APIENTRY * qglPopName )(void);
-void ( APIENTRY * qglPrioritizeTextures )(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-void ( APIENTRY * qglPushAttrib )(GLbitfield mask);
-void ( APIENTRY * qglPushClientAttrib )(GLbitfield mask);
-void ( APIENTRY * qglPushMatrix )(void);
-void ( APIENTRY * qglPushName )(GLuint name);
-void ( APIENTRY * qglRasterPos2d )(GLdouble x, GLdouble y);
-void ( APIENTRY * qglRasterPos2dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos2f )(GLfloat x, GLfloat y);
-void ( APIENTRY * qglRasterPos2fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos2i )(GLint x, GLint y);
-void ( APIENTRY * qglRasterPos2iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos2s )(GLshort x, GLshort y);
-void ( APIENTRY * qglRasterPos2sv )(const GLshort *v);
-void ( APIENTRY * qglRasterPos3d )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglRasterPos3dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos3f )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglRasterPos3fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos3i )(GLint x, GLint y, GLint z);
-void ( APIENTRY * qglRasterPos3iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos3s )(GLshort x, GLshort y, GLshort z);
-void ( APIENTRY * qglRasterPos3sv )(const GLshort *v);
-void ( APIENTRY * qglRasterPos4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void ( APIENTRY * qglRasterPos4dv )(const GLdouble *v);
-void ( APIENTRY * qglRasterPos4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void ( APIENTRY * qglRasterPos4fv )(const GLfloat *v);
-void ( APIENTRY * qglRasterPos4i )(GLint x, GLint y, GLint z, GLint w);
-void ( APIENTRY * qglRasterPos4iv )(const GLint *v);
-void ( APIENTRY * qglRasterPos4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-void ( APIENTRY * qglRasterPos4sv )(const GLshort *v);
-void ( APIENTRY * qglReadBuffer )(GLenum mode);
-void ( APIENTRY * qglReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-void ( APIENTRY * qglRectd )(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-void ( APIENTRY * qglRectdv )(const GLdouble *v1, const GLdouble *v2);
-void ( APIENTRY * qglRectf )(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-void ( APIENTRY * qglRectfv )(const GLfloat *v1, const GLfloat *v2);
-void ( APIENTRY * qglRecti )(GLint x1, GLint y1, GLint x2, GLint y2);
-void ( APIENTRY * qglRectiv )(const GLint *v1, const GLint *v2);
-void ( APIENTRY * qglRects )(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-void ( APIENTRY * qglRectsv )(const GLshort *v1, const GLshort *v2);
-GLint ( APIENTRY * qglRenderMode )(GLenum mode);
-void ( APIENTRY * qglRotated )(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglRotatef )(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglScaled )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglScalef )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
-void ( APIENTRY * qglSelectBuffer )(GLsizei size, GLuint *buffer);
-void ( APIENTRY * qglShadeModel )(GLenum mode);
-void ( APIENTRY * qglStencilFunc )(GLenum func, GLint ref, GLuint mask);
-void ( APIENTRY * qglStencilMask )(GLuint mask);
-void ( APIENTRY * qglStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
-void ( APIENTRY * qglTexCoord1d )(GLdouble s);
-void ( APIENTRY * qglTexCoord1dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord1f )(GLfloat s);
-void ( APIENTRY * qglTexCoord1fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord1i )(GLint s);
-void ( APIENTRY * qglTexCoord1iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord1s )(GLshort s);
-void ( APIENTRY * qglTexCoord1sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord2d )(GLdouble s, GLdouble t);
-void ( APIENTRY * qglTexCoord2dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord2f )(GLfloat s, GLfloat t);
-void ( APIENTRY * qglTexCoord2fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord2i )(GLint s, GLint t);
-void ( APIENTRY * qglTexCoord2iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord2s )(GLshort s, GLshort t);
-void ( APIENTRY * qglTexCoord2sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord3d )(GLdouble s, GLdouble t, GLdouble r);
-void ( APIENTRY * qglTexCoord3dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord3f )(GLfloat s, GLfloat t, GLfloat r);
-void ( APIENTRY * qglTexCoord3fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord3i )(GLint s, GLint t, GLint r);
-void ( APIENTRY * qglTexCoord3iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord3s )(GLshort s, GLshort t, GLshort r);
-void ( APIENTRY * qglTexCoord3sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoord4d )(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-void ( APIENTRY * qglTexCoord4dv )(const GLdouble *v);
-void ( APIENTRY * qglTexCoord4f )(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-void ( APIENTRY * qglTexCoord4fv )(const GLfloat *v);
-void ( APIENTRY * qglTexCoord4i )(GLint s, GLint t, GLint r, GLint q);
-void ( APIENTRY * qglTexCoord4iv )(const GLint *v);
-void ( APIENTRY * qglTexCoord4s )(GLshort s, GLshort t, GLshort r, GLshort q);
-void ( APIENTRY * qglTexCoord4sv )(const GLshort *v);
-void ( APIENTRY * qglTexCoordPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglTexEnvf )(GLenum target, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexEnvfv )(GLenum target, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexEnvi )(GLenum target, GLenum pname, GLint param);
-void ( APIENTRY * qglTexEnviv )(GLenum target, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexGend )(GLenum coord, GLenum pname, GLdouble param);
-void ( APIENTRY * qglTexGendv )(GLenum coord, GLenum pname, const GLdouble *params);
-void ( APIENTRY * qglTexGenf )(GLenum coord, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexGenfv )(GLenum coord, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexGeni )(GLenum coord, GLenum pname, GLint param);
-void ( APIENTRY * qglTexGeniv )(GLenum coord, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexImage1D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexImage2D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexParameterf )(GLenum target, GLenum pname, GLfloat param);
-void ( APIENTRY * qglTexParameterfv )(GLenum target, GLenum pname, const GLfloat *params);
-void ( APIENTRY * qglTexParameteri )(GLenum target, GLenum pname, GLint param);
-void ( APIENTRY * qglTexParameteriv )(GLenum target, GLenum pname, const GLint *params);
-void ( APIENTRY * qglTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-void ( APIENTRY * qglTranslated )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglTranslatef )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglVertex2d )(GLdouble x, GLdouble y);
-void ( APIENTRY * qglVertex2dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex2f )(GLfloat x, GLfloat y);
-void ( APIENTRY * qglVertex2fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex2i )(GLint x, GLint y);
-void ( APIENTRY * qglVertex2iv )(const GLint *v);
-void ( APIENTRY * qglVertex2s )(GLshort x, GLshort y);
-void ( APIENTRY * qglVertex2sv )(const GLshort *v);
-void ( APIENTRY * qglVertex3d )(GLdouble x, GLdouble y, GLdouble z);
-void ( APIENTRY * qglVertex3dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex3f )(GLfloat x, GLfloat y, GLfloat z);
-void ( APIENTRY * qglVertex3fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex3i )(GLint x, GLint y, GLint z);
-void ( APIENTRY * qglVertex3iv )(const GLint *v);
-void ( APIENTRY * qglVertex3s )(GLshort x, GLshort y, GLshort z);
-void ( APIENTRY * qglVertex3sv )(const GLshort *v);
-void ( APIENTRY * qglVertex4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-void ( APIENTRY * qglVertex4dv )(const GLdouble *v);
-void ( APIENTRY * qglVertex4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void ( APIENTRY * qglVertex4fv )(const GLfloat *v);
-void ( APIENTRY * qglVertex4i )(GLint x, GLint y, GLint z, GLint w);
-void ( APIENTRY * qglVertex4iv )(const GLint *v);
-void ( APIENTRY * qglVertex4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-void ( APIENTRY * qglVertex4sv )(const GLshort *v);
-void ( APIENTRY * qglVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-void ( APIENTRY * qglViewport )(GLint x, GLint y, GLsizei width, GLsizei height);
-void (APIENTRY* qglCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* qglCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* qglGetCompressedTexImageARB)(GLenum target, GLint lod, void* img);
-
-void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s, GLfloat t );
-void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-
-void ( APIENTRY* qglLockArraysEXT )(GLint, GLint);
-void ( APIENTRY* qglUnlockArraysEXT ) (void);
-
-static void ( APIENTRY * dllAccum )(GLenum op, GLfloat value);
-static void ( APIENTRY * dllAlphaFunc )(GLenum func, GLclampf ref);
-GLboolean ( APIENTRY * dllAreTexturesResident )(GLsizei n, const GLuint *textures, GLboolean *residences);
-static void ( APIENTRY * dllArrayElement )(GLint i);
-static void ( APIENTRY * dllBegin )(GLenum mode);
-static void ( APIENTRY * dllBindTexture )(GLenum target, GLuint texture);
-static void ( APIENTRY * dllBitmap )(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap);
-static void ( APIENTRY * dllBlendFunc )(GLenum sfactor, GLenum dfactor);
-static void ( APIENTRY * dllCallList )(GLuint list);
-static void ( APIENTRY * dllCallLists )(GLsizei n, GLenum type, const GLvoid *lists);
-static void ( APIENTRY * dllClear )(GLbitfield mask);
-static void ( APIENTRY * dllClearAccum )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-static void ( APIENTRY * dllClearColor )(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
-static void ( APIENTRY * dllClearDepth )(GLclampd depth);
-static void ( APIENTRY * dllClearIndex )(GLfloat c);
-static void ( APIENTRY * dllClearStencil )(GLint s);
-static void ( APIENTRY * dllClipPlane )(GLenum plane, const GLdouble *equation);
-static void ( APIENTRY * dllColor3b )(GLbyte red, GLbyte green, GLbyte blue);
-static void ( APIENTRY * dllColor3bv )(const GLbyte *v);
-static void ( APIENTRY * dllColor3d )(GLdouble red, GLdouble green, GLdouble blue);
-static void ( APIENTRY * dllColor3dv )(const GLdouble *v);
-static void ( APIENTRY * dllColor3f )(GLfloat red, GLfloat green, GLfloat blue);
-static void ( APIENTRY * dllColor3fv )(const GLfloat *v);
-static void ( APIENTRY * dllColor3i )(GLint red, GLint green, GLint blue);
-static void ( APIENTRY * dllColor3iv )(const GLint *v);
-static void ( APIENTRY * dllColor3s )(GLshort red, GLshort green, GLshort blue);
-static void ( APIENTRY * dllColor3sv )(const GLshort *v);
-static void ( APIENTRY * dllColor3ub )(GLubyte red, GLubyte green, GLubyte blue);
-static void ( APIENTRY * dllColor3ubv )(const GLubyte *v);
-static void ( APIENTRY * dllColor3ui )(GLuint red, GLuint green, GLuint blue);
-static void ( APIENTRY * dllColor3uiv )(const GLuint *v);
-static void ( APIENTRY * dllColor3us )(GLushort red, GLushort green, GLushort blue);
-static void ( APIENTRY * dllColor3usv )(const GLushort *v);
-static void ( APIENTRY * dllColor4b )(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha);
-static void ( APIENTRY * dllColor4bv )(const GLbyte *v);
-static void ( APIENTRY * dllColor4d )(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha);
-static void ( APIENTRY * dllColor4dv )(const GLdouble *v);
-static void ( APIENTRY * dllColor4f )(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-static void ( APIENTRY * dllColor4fv )(const GLfloat *v);
-static void ( APIENTRY * dllColor4i )(GLint red, GLint green, GLint blue, GLint alpha);
-static void ( APIENTRY * dllColor4iv )(const GLint *v);
-static void ( APIENTRY * dllColor4s )(GLshort red, GLshort green, GLshort blue, GLshort alpha);
-static void ( APIENTRY * dllColor4sv )(const GLshort *v);
-static void ( APIENTRY * dllColor4ub )(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-static void ( APIENTRY * dllColor4ubv )(const GLubyte *v);
-static void ( APIENTRY * dllColor4ui )(GLuint red, GLuint green, GLuint blue, GLuint alpha);
-static void ( APIENTRY * dllColor4uiv )(const GLuint *v);
-static void ( APIENTRY * dllColor4us )(GLushort red, GLushort green, GLushort blue, GLushort alpha);
-static void ( APIENTRY * dllColor4usv )(const GLushort *v);
-static void ( APIENTRY * dllColorMask )(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-static void ( APIENTRY * dllColorMaterial )(GLenum face, GLenum mode);
-static void ( APIENTRY * dllColorPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllCopyPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type);
-static void ( APIENTRY * dllCopyTexImage1D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border);
-static void ( APIENTRY * dllCopyTexImage2D )(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
-static void ( APIENTRY * dllCopyTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
-static void ( APIENTRY * dllCopyTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-static void ( APIENTRY * dllCullFace )(GLenum mode);
-static void ( APIENTRY * dllDeleteLists )(GLuint list, GLsizei range);
-static void ( APIENTRY * dllDeleteTextures )(GLsizei n, const GLuint *textures);
-static void ( APIENTRY * dllDepthFunc )(GLenum func);
-static void ( APIENTRY * dllDepthMask )(GLboolean flag);
-static void ( APIENTRY * dllDepthRange )(GLclampd zNear, GLclampd zFar);
-static void ( APIENTRY * dllDisable )(GLenum cap);
-static void ( APIENTRY * dllDisableClientState )(GLenum array);
-static void ( APIENTRY * dllDrawArrays )(GLenum mode, GLint first, GLsizei count);
-static void ( APIENTRY * dllDrawBuffer )(GLenum mode);
-static void ( APIENTRY * dllDrawElements )(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
-static void ( APIENTRY * dllDrawPixels )(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllEdgeFlag )(GLboolean flag);
-static void ( APIENTRY * dllEdgeFlagPointer )(GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllEdgeFlagv )(const GLboolean *flag);
-static void ( APIENTRY * dllEnable )(GLenum cap);
-static void ( APIENTRY * dllEnableClientState )(GLenum array);
-static void ( APIENTRY * dllEnd )(void);
-static void ( APIENTRY * dllEndList )(void);
-static void ( APIENTRY * dllEvalCoord1d )(GLdouble u);
-static void ( APIENTRY * dllEvalCoord1dv )(const GLdouble *u);
-static void ( APIENTRY * dllEvalCoord1f )(GLfloat u);
-static void ( APIENTRY * dllEvalCoord1fv )(const GLfloat *u);
-static void ( APIENTRY * dllEvalCoord2d )(GLdouble u, GLdouble v);
-static void ( APIENTRY * dllEvalCoord2dv )(const GLdouble *u);
-static void ( APIENTRY * dllEvalCoord2f )(GLfloat u, GLfloat v);
-static void ( APIENTRY * dllEvalCoord2fv )(const GLfloat *u);
-static void ( APIENTRY * dllEvalMesh1 )(GLenum mode, GLint i1, GLint i2);
-static void ( APIENTRY * dllEvalMesh2 )(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
-static void ( APIENTRY * dllEvalPoint1 )(GLint i);
-static void ( APIENTRY * dllEvalPoint2 )(GLint i, GLint j);
-static void ( APIENTRY * dllFeedbackBuffer )(GLsizei size, GLenum type, GLfloat *buffer);
-static void ( APIENTRY * dllFinish )(void);
-static void ( APIENTRY * dllFlush )(void);
-static void ( APIENTRY * dllFogf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllFogfv )(GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllFogi )(GLenum pname, GLint param);
-static void ( APIENTRY * dllFogiv )(GLenum pname, const GLint *params);
-static void ( APIENTRY * dllFrontFace )(GLenum mode);
-static void ( APIENTRY * dllFrustum )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GLuint ( APIENTRY * dllGenLists )(GLsizei range);
-static void ( APIENTRY * dllGenTextures )(GLsizei n, GLuint *textures);
-static void ( APIENTRY * dllGetBooleanv )(GLenum pname, GLboolean *params);
-static void ( APIENTRY * dllGetClipPlane )(GLenum plane, GLdouble *equation);
-static void ( APIENTRY * dllGetDoublev )(GLenum pname, GLdouble *params);
-GLenum ( APIENTRY * dllGetError )(void);
-static void ( APIENTRY * dllGetFloatv )(GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetIntegerv )(GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetLightfv )(GLenum light, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetLightiv )(GLenum light, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetMapdv )(GLenum target, GLenum query, GLdouble *v);
-static void ( APIENTRY * dllGetMapfv )(GLenum target, GLenum query, GLfloat *v);
-static void ( APIENTRY * dllGetMapiv )(GLenum target, GLenum query, GLint *v);
-static void ( APIENTRY * dllGetMaterialfv )(GLenum face, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetMaterialiv )(GLenum face, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetPixelMapfv )(GLenum map, GLfloat *values);
-static void ( APIENTRY * dllGetPixelMapuiv )(GLenum map, GLuint *values);
-static void ( APIENTRY * dllGetPixelMapusv )(GLenum map, GLushort *values);
-static void ( APIENTRY * dllGetPointerv )(GLenum pname, GLvoid* *params);
-static void ( APIENTRY * dllGetPolygonStipple )(GLubyte *mask);
-const GLubyte * ( APIENTRY * dllGetString )(GLenum name);
-static void ( APIENTRY * dllGetTexEnvfv )(GLenum target, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexEnviv )(GLenum target, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexGendv )(GLenum coord, GLenum pname, GLdouble *params);
-static void ( APIENTRY * dllGetTexGenfv )(GLenum coord, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexGeniv )(GLenum coord, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexImage )(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels);
-static void ( APIENTRY * dllGetTexLevelParameterfv )(GLenum target, GLint level, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexLevelParameteriv )(GLenum target, GLint level, GLenum pname, GLint *params);
-static void ( APIENTRY * dllGetTexParameterfv )(GLenum target, GLenum pname, GLfloat *params);
-static void ( APIENTRY * dllGetTexParameteriv )(GLenum target, GLenum pname, GLint *params);
-static void ( APIENTRY * dllHint )(GLenum target, GLenum mode);
-static void ( APIENTRY * dllIndexMask )(GLuint mask);
-static void ( APIENTRY * dllIndexPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllIndexd )(GLdouble c);
-static void ( APIENTRY * dllIndexdv )(const GLdouble *c);
-static void ( APIENTRY * dllIndexf )(GLfloat c);
-static void ( APIENTRY * dllIndexfv )(const GLfloat *c);
-static void ( APIENTRY * dllIndexi )(GLint c);
-static void ( APIENTRY * dllIndexiv )(const GLint *c);
-static void ( APIENTRY * dllIndexs )(GLshort c);
-static void ( APIENTRY * dllIndexsv )(const GLshort *c);
-static void ( APIENTRY * dllIndexub )(GLubyte c);
-static void ( APIENTRY * dllIndexubv )(const GLubyte *c);
-static void ( APIENTRY * dllInitNames )(void);
-static void ( APIENTRY * dllInterleavedArrays )(GLenum format, GLsizei stride, const GLvoid *pointer);
-GLboolean ( APIENTRY * dllIsEnabled )(GLenum cap);
-GLboolean ( APIENTRY * dllIsList )(GLuint list);
-GLboolean ( APIENTRY * dllIsTexture )(GLuint texture);
-static void ( APIENTRY * dllLightModelf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllLightModelfv )(GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllLightModeli )(GLenum pname, GLint param);
-static void ( APIENTRY * dllLightModeliv )(GLenum pname, const GLint *params);
-static void ( APIENTRY * dllLightf )(GLenum light, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllLightfv )(GLenum light, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllLighti )(GLenum light, GLenum pname, GLint param);
-static void ( APIENTRY * dllLightiv )(GLenum light, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllLineStipple )(GLint factor, GLushort pattern);
-static void ( APIENTRY * dllLineWidth )(GLfloat width);
-static void ( APIENTRY * dllListBase )(GLuint base);
-static void ( APIENTRY * dllLoadIdentity )(void);
-static void ( APIENTRY * dllLoadMatrixd )(const GLdouble *m);
-static void ( APIENTRY * dllLoadMatrixf )(const GLfloat *m);
-static void ( APIENTRY * dllLoadName )(GLuint name);
-static void ( APIENTRY * dllLogicOp )(GLenum opcode);
-static void ( APIENTRY * dllMap1d )(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
-static void ( APIENTRY * dllMap1f )(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
-static void ( APIENTRY * dllMap2d )(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
-static void ( APIENTRY * dllMap2f )(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
-static void ( APIENTRY * dllMapGrid1d )(GLint un, GLdouble u1, GLdouble u2);
-static void ( APIENTRY * dllMapGrid1f )(GLint un, GLfloat u1, GLfloat u2);
-static void ( APIENTRY * dllMapGrid2d )(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2);
-static void ( APIENTRY * dllMapGrid2f )(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2);
-static void ( APIENTRY * dllMaterialf )(GLenum face, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllMaterialfv )(GLenum face, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllMateriali )(GLenum face, GLenum pname, GLint param);
-static void ( APIENTRY * dllMaterialiv )(GLenum face, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllMatrixMode )(GLenum mode);
-static void ( APIENTRY * dllMultMatrixd )(const GLdouble *m);
-static void ( APIENTRY * dllMultMatrixf )(const GLfloat *m);
-static void ( APIENTRY * dllNewList )(GLuint list, GLenum mode);
-static void ( APIENTRY * dllNormal3b )(GLbyte nx, GLbyte ny, GLbyte nz);
-static void ( APIENTRY * dllNormal3bv )(const GLbyte *v);
-static void ( APIENTRY * dllNormal3d )(GLdouble nx, GLdouble ny, GLdouble nz);
-static void ( APIENTRY * dllNormal3dv )(const GLdouble *v);
-static void ( APIENTRY * dllNormal3f )(GLfloat nx, GLfloat ny, GLfloat nz);
-static void ( APIENTRY * dllNormal3fv )(const GLfloat *v);
-static void ( APIENTRY * dllNormal3i )(GLint nx, GLint ny, GLint nz);
-static void ( APIENTRY * dllNormal3iv )(const GLint *v);
-static void ( APIENTRY * dllNormal3s )(GLshort nx, GLshort ny, GLshort nz);
-static void ( APIENTRY * dllNormal3sv )(const GLshort *v);
-static void ( APIENTRY * dllNormalPointer )(GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllOrtho )(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-static void ( APIENTRY * dllPassThrough )(GLfloat token);
-static void ( APIENTRY * dllPixelMapfv )(GLenum map, GLsizei mapsize, const GLfloat *values);
-static void ( APIENTRY * dllPixelMapuiv )(GLenum map, GLsizei mapsize, const GLuint *values);
-static void ( APIENTRY * dllPixelMapusv )(GLenum map, GLsizei mapsize, const GLushort *values);
-static void ( APIENTRY * dllPixelStoref )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllPixelStorei )(GLenum pname, GLint param);
-static void ( APIENTRY * dllPixelTransferf )(GLenum pname, GLfloat param);
-static void ( APIENTRY * dllPixelTransferi )(GLenum pname, GLint param);
-static void ( APIENTRY * dllPixelZoom )(GLfloat xfactor, GLfloat yfactor);
-static void ( APIENTRY * dllPointSize )(GLfloat size);
-static void ( APIENTRY * dllPolygonMode )(GLenum face, GLenum mode);
-static void ( APIENTRY * dllPolygonOffset )(GLfloat factor, GLfloat units);
-static void ( APIENTRY * dllPolygonStipple )(const GLubyte *mask);
-static void ( APIENTRY * dllPopAttrib )(void);
-static void ( APIENTRY * dllPopClientAttrib )(void);
-static void ( APIENTRY * dllPopMatrix )(void);
-static void ( APIENTRY * dllPopName )(void);
-static void ( APIENTRY * dllPrioritizeTextures )(GLsizei n, const GLuint *textures, const GLclampf *priorities);
-static void ( APIENTRY * dllPushAttrib )(GLbitfield mask);
-static void ( APIENTRY * dllPushClientAttrib )(GLbitfield mask);
-static void ( APIENTRY * dllPushMatrix )(void);
-static void ( APIENTRY * dllPushName )(GLuint name);
-static void ( APIENTRY * dllRasterPos2d )(GLdouble x, GLdouble y);
-static void ( APIENTRY * dllRasterPos2dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos2f )(GLfloat x, GLfloat y);
-static void ( APIENTRY * dllRasterPos2fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos2i )(GLint x, GLint y);
-static void ( APIENTRY * dllRasterPos2iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos2s )(GLshort x, GLshort y);
-static void ( APIENTRY * dllRasterPos2sv )(const GLshort *v);
-static void ( APIENTRY * dllRasterPos3d )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllRasterPos3dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos3f )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllRasterPos3fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos3i )(GLint x, GLint y, GLint z);
-static void ( APIENTRY * dllRasterPos3iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos3s )(GLshort x, GLshort y, GLshort z);
-static void ( APIENTRY * dllRasterPos3sv )(const GLshort *v);
-static void ( APIENTRY * dllRasterPos4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-static void ( APIENTRY * dllRasterPos4dv )(const GLdouble *v);
-static void ( APIENTRY * dllRasterPos4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-static void ( APIENTRY * dllRasterPos4fv )(const GLfloat *v);
-static void ( APIENTRY * dllRasterPos4i )(GLint x, GLint y, GLint z, GLint w);
-static void ( APIENTRY * dllRasterPos4iv )(const GLint *v);
-static void ( APIENTRY * dllRasterPos4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-static void ( APIENTRY * dllRasterPos4sv )(const GLshort *v);
-static void ( APIENTRY * dllReadBuffer )(GLenum mode);
-static void ( APIENTRY * dllReadPixels )(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
-static void ( APIENTRY * dllRectd )(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
-static void ( APIENTRY * dllRectdv )(const GLdouble *v1, const GLdouble *v2);
-static void ( APIENTRY * dllRectf )(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2);
-static void ( APIENTRY * dllRectfv )(const GLfloat *v1, const GLfloat *v2);
-static void ( APIENTRY * dllRecti )(GLint x1, GLint y1, GLint x2, GLint y2);
-static void ( APIENTRY * dllRectiv )(const GLint *v1, const GLint *v2);
-static void ( APIENTRY * dllRects )(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
-static void ( APIENTRY * dllRectsv )(const GLshort *v1, const GLshort *v2);
-GLint ( APIENTRY * dllRenderMode )(GLenum mode);
-static void ( APIENTRY * dllRotated )(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllRotatef )(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllScaled )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllScalef )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllScissor )(GLint x, GLint y, GLsizei width, GLsizei height);
-static void ( APIENTRY * dllSelectBuffer )(GLsizei size, GLuint *buffer);
-static void ( APIENTRY * dllShadeModel )(GLenum mode);
-static void ( APIENTRY * dllStencilFunc )(GLenum func, GLint ref, GLuint mask);
-static void ( APIENTRY * dllStencilMask )(GLuint mask);
-static void ( APIENTRY * dllStencilOp )(GLenum fail, GLenum zfail, GLenum zpass);
-static void ( APIENTRY * dllTexCoord1d )(GLdouble s);
-static void ( APIENTRY * dllTexCoord1dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord1f )(GLfloat s);
-static void ( APIENTRY * dllTexCoord1fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord1i )(GLint s);
-static void ( APIENTRY * dllTexCoord1iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord1s )(GLshort s);
-static void ( APIENTRY * dllTexCoord1sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord2d )(GLdouble s, GLdouble t);
-static void ( APIENTRY * dllTexCoord2dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord2f )(GLfloat s, GLfloat t);
-static void ( APIENTRY * dllTexCoord2fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord2i )(GLint s, GLint t);
-static void ( APIENTRY * dllTexCoord2iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord2s )(GLshort s, GLshort t);
-static void ( APIENTRY * dllTexCoord2sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord3d )(GLdouble s, GLdouble t, GLdouble r);
-static void ( APIENTRY * dllTexCoord3dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord3f )(GLfloat s, GLfloat t, GLfloat r);
-static void ( APIENTRY * dllTexCoord3fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord3i )(GLint s, GLint t, GLint r);
-static void ( APIENTRY * dllTexCoord3iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord3s )(GLshort s, GLshort t, GLshort r);
-static void ( APIENTRY * dllTexCoord3sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoord4d )(GLdouble s, GLdouble t, GLdouble r, GLdouble q);
-static void ( APIENTRY * dllTexCoord4dv )(const GLdouble *v);
-static void ( APIENTRY * dllTexCoord4f )(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-static void ( APIENTRY * dllTexCoord4fv )(const GLfloat *v);
-static void ( APIENTRY * dllTexCoord4i )(GLint s, GLint t, GLint r, GLint q);
-static void ( APIENTRY * dllTexCoord4iv )(const GLint *v);
-static void ( APIENTRY * dllTexCoord4s )(GLshort s, GLshort t, GLshort r, GLshort q);
-static void ( APIENTRY * dllTexCoord4sv )(const GLshort *v);
-static void ( APIENTRY * dllTexCoordPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllTexEnvf )(GLenum target, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexEnvfv )(GLenum target, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexEnvi )(GLenum target, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexEnviv )(GLenum target, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexGend )(GLenum coord, GLenum pname, GLdouble param);
-static void ( APIENTRY * dllTexGendv )(GLenum coord, GLenum pname, const GLdouble *params);
-static void ( APIENTRY * dllTexGenf )(GLenum coord, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexGenfv )(GLenum coord, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexGeni )(GLenum coord, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexGeniv )(GLenum coord, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexImage1D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexImage2D )(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexParameterf )(GLenum target, GLenum pname, GLfloat param);
-static void ( APIENTRY * dllTexParameterfv )(GLenum target, GLenum pname, const GLfloat *params);
-static void ( APIENTRY * dllTexParameteri )(GLenum target, GLenum pname, GLint param);
-static void ( APIENTRY * dllTexParameteriv )(GLenum target, GLenum pname, const GLint *params);
-static void ( APIENTRY * dllTexSubImage1D )(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTexSubImage2D )(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);
-static void ( APIENTRY * dllTranslated )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllTranslatef )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllVertex2d )(GLdouble x, GLdouble y);
-static void ( APIENTRY * dllVertex2dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex2f )(GLfloat x, GLfloat y);
-static void ( APIENTRY * dllVertex2fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex2i )(GLint x, GLint y);
-static void ( APIENTRY * dllVertex2iv )(const GLint *v);
-static void ( APIENTRY * dllVertex2s )(GLshort x, GLshort y);
-static void ( APIENTRY * dllVertex2sv )(const GLshort *v);
-static void ( APIENTRY * dllVertex3d )(GLdouble x, GLdouble y, GLdouble z);
-static void ( APIENTRY * dllVertex3dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex3f )(GLfloat x, GLfloat y, GLfloat z);
-static void ( APIENTRY * dllVertex3fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex3i )(GLint x, GLint y, GLint z);
-static void ( APIENTRY * dllVertex3iv )(const GLint *v);
-static void ( APIENTRY * dllVertex3s )(GLshort x, GLshort y, GLshort z);
-static void ( APIENTRY * dllVertex3sv )(const GLshort *v);
-static void ( APIENTRY * dllVertex4d )(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
-static void ( APIENTRY * dllVertex4dv )(const GLdouble *v);
-static void ( APIENTRY * dllVertex4f )(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-static void ( APIENTRY * dllVertex4fv )(const GLfloat *v);
-static void ( APIENTRY * dllVertex4i )(GLint x, GLint y, GLint z, GLint w);
-static void ( APIENTRY * dllVertex4iv )(const GLint *v);
-static void ( APIENTRY * dllVertex4s )(GLshort x, GLshort y, GLshort z, GLshort w);
-static void ( APIENTRY * dllVertex4sv )(const GLshort *v);
-static void ( APIENTRY * dllVertexPointer )(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
-static void ( APIENTRY * dllViewport )(GLint x, GLint y, GLsizei width, GLsizei height);
-
-void (APIENTRY* dllCompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* dllCompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data);
-void (APIENTRY* dllGetCompressedTexImageARB)(GLenum target, GLint lod, void* img);
-
-static const char * BooleanToString( GLboolean b )
-{
-	if ( b == GL_FALSE )
-		return "GL_FALSE";
-	else if ( b == GL_TRUE )
-		return "GL_TRUE";
-	else
-		return "OUT OF RANGE FOR BOOLEAN";
-}
-
-static const char * FuncToString( GLenum f )
-{
-	switch ( f )
-	{
-	case GL_ALWAYS:
-		return "GL_ALWAYS";
-	case GL_NEVER:
-		return "GL_NEVER";
-	case GL_LEQUAL:
-		return "GL_LEQUAL";
-	case GL_LESS:
-		return "GL_LESS";
-	case GL_EQUAL:
-		return "GL_EQUAL";
-	case GL_GREATER:
-		return "GL_GREATER";
-	case GL_GEQUAL:
-		return "GL_GEQUAL";
-	case GL_NOTEQUAL:
-		return "GL_NOTEQUAL";
-	default:
-		return "!!! UNKNOWN !!!";
-	}
-}
-
-static const char * PrimToString( GLenum mode )
-{
-	static char prim[1024];
-
-	if ( mode == GL_TRIANGLES )
-		strcpy( prim, "GL_TRIANGLES" );
-	else if ( mode == GL_TRIANGLE_STRIP )
-		strcpy( prim, "GL_TRIANGLE_STRIP" );
-	else if ( mode == GL_TRIANGLE_FAN )
-		strcpy( prim, "GL_TRIANGLE_FAN" );
-	else if ( mode == GL_QUADS )
-		strcpy( prim, "GL_QUADS" );
-	else if ( mode == GL_QUAD_STRIP )
-		strcpy( prim, "GL_QUAD_STRIP" );
-	else if ( mode == GL_POLYGON )
-		strcpy( prim, "GL_POLYGON" );
-	else if ( mode == GL_POINTS )
-		strcpy( prim, "GL_POINTS" );
-	else if ( mode == GL_LINES )
-		strcpy( prim, "GL_LINES" );
-	else if ( mode == GL_LINE_STRIP )
-		strcpy( prim, "GL_LINE_STRIP" );
-	else if ( mode == GL_LINE_LOOP )
-		strcpy( prim, "GL_LINE_LOOP" );
-	else
-		sprintf( prim, "0x%x", mode );
-
-	return prim;
-}
-
-static const char * CapToString( GLenum cap )
-{
-	static char buffer[1024];
-
-	switch ( cap )
-	{
-	case GL_TEXTURE_2D:
-		return "GL_TEXTURE_2D";
-	case GL_BLEND:
-		return "GL_BLEND";
-	case GL_DEPTH_TEST:
-		return "GL_DEPTH_TEST";
-	case GL_CULL_FACE:
-		return "GL_CULL_FACE";
-	case GL_CLIP_PLANE0:
-		return "GL_CLIP_PLANE0";
-	case GL_COLOR_ARRAY:
-		return "GL_COLOR_ARRAY";
-	case GL_TEXTURE_COORD_ARRAY:
-		return "GL_TEXTURE_COORD_ARRAY";
-	case GL_VERTEX_ARRAY:
-		return "GL_VERTEX_ARRAY";
-	case GL_ALPHA_TEST:
-		return "GL_ALPHA_TEST";
-	case GL_STENCIL_TEST:
-		return "GL_STENCIL_TEST";
-	default:
-		sprintf( buffer, "0x%x", cap );
-	}
-
-	return buffer;
-}
-
-static const char * TypeToString( GLenum t )
-{
-	switch ( t )
-	{
-	case GL_BYTE:
-		return "GL_BYTE";
-	case GL_UNSIGNED_BYTE:
-		return "GL_UNSIGNED_BYTE";
-	case GL_SHORT:
-		return "GL_SHORT";
-	case GL_UNSIGNED_SHORT:
-		return "GL_UNSIGNED_SHORT";
-	case GL_INT:
-		return "GL_INT";
-	case GL_UNSIGNED_INT:
-		return "GL_UNSIGNED_INT";
-	case GL_FLOAT:
-		return "GL_FLOAT";
-	case GL_DOUBLE:
-		return "GL_DOUBLE";
-	default:
-		return "!!! UNKNOWN !!!";
-	}
-}
-
-static void APIENTRY logAccum(GLenum op, GLfloat value)
-{
-	fprintf( glw_state.log_fp, "glAccum\n" );
-	dllAccum( op, value );
-}
-
-static void APIENTRY logAlphaFunc(GLenum func, GLclampf ref)
-{
-	fprintf( glw_state.log_fp, "glAlphaFunc( 0x%x, %f )\n", func, ref );
-	dllAlphaFunc( func, ref );
-}
-
-static GLboolean APIENTRY logAreTexturesResident(GLsizei n, const GLuint *textures, GLboolean *residences)
-{
-	fprintf( glw_state.log_fp, "glAreTexturesResident\n" );
-	return dllAreTexturesResident( n, textures, residences );
-}
-
-static void APIENTRY logArrayElement(GLint i)
-{
-	fprintf( glw_state.log_fp, "glArrayElement\n" );
-	dllArrayElement( i );
-}
-
-static void APIENTRY logBegin(GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glBegin( %s )\n", PrimToString( mode ));
-	dllBegin( mode );
-}
-
-static void APIENTRY logBindTexture(GLenum target, GLuint texture)
-{
-	fprintf( glw_state.log_fp, "glBindTexture( 0x%x, %u )\n", target, texture );
-	dllBindTexture( target, texture );
-}
-
-static void APIENTRY logBitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
-{
-	fprintf( glw_state.log_fp, "glBitmap\n" );
-	dllBitmap( width, height, xorig, yorig, xmove, ymove, bitmap );
-}
-
-static void BlendToName( char *n, GLenum f )
-{
-	switch ( f )
-	{
-	case GL_ONE:
-		strcpy( n, "GL_ONE" );
-		break;
-	case GL_ZERO:
-		strcpy( n, "GL_ZERO" );
-		break;
-	case GL_SRC_ALPHA:
-		strcpy( n, "GL_SRC_ALPHA" );
-		break;
-	case GL_ONE_MINUS_SRC_ALPHA:
-		strcpy( n, "GL_ONE_MINUS_SRC_ALPHA" );
-		break;
-	case GL_DST_COLOR:
-		strcpy( n, "GL_DST_COLOR" );
-		break;
-	case GL_ONE_MINUS_DST_COLOR:
-		strcpy( n, "GL_ONE_MINUS_DST_COLOR" );
-		break;
-	case GL_DST_ALPHA:
-		strcpy( n, "GL_DST_ALPHA" );
-		break;
-	default:
-		sprintf( n, "0x%x", f );
-	}
-}
-static void APIENTRY logBlendFunc(GLenum sfactor, GLenum dfactor)
-{
-	char sf[128], df[128];
-
-	BlendToName( sf, sfactor );
-	BlendToName( df, dfactor );
-
-	fprintf( glw_state.log_fp, "glBlendFunc( %s, %s )\n", sf, df );
-	dllBlendFunc( sfactor, dfactor );
-}
-
-static void APIENTRY logCallList(GLuint list)
-{
-	fprintf( glw_state.log_fp, "glCallList( %u )\n", list );
-	dllCallList( list );
-}
-
-static void APIENTRY logCallLists(GLsizei n, GLenum type, const void *lists)
-{
-	fprintf( glw_state.log_fp, "glCallLists\n" );
-	dllCallLists( n, type, lists );
-}
-
-static void APIENTRY logClear(GLbitfield mask)
-{
-	fprintf( glw_state.log_fp, "glClear( 0x%x = ", mask );
-
-	if ( mask & GL_COLOR_BUFFER_BIT )
-		fprintf( glw_state.log_fp, "GL_COLOR_BUFFER_BIT " );
-	if ( mask & GL_DEPTH_BUFFER_BIT )
-		fprintf( glw_state.log_fp, "GL_DEPTH_BUFFER_BIT " );
-	if ( mask & GL_STENCIL_BUFFER_BIT )
-		fprintf( glw_state.log_fp, "GL_STENCIL_BUFFER_BIT " );
-	if ( mask & GL_ACCUM_BUFFER_BIT )
-		fprintf( glw_state.log_fp, "GL_ACCUM_BUFFER_BIT " );
-
-	fprintf( glw_state.log_fp, ")\n" );
-	dllClear( mask );
-}
-
-static void APIENTRY logClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	fprintf( glw_state.log_fp, "glClearAccum\n" );
-	dllClearAccum( red, green, blue, alpha );
-}
-
-static void APIENTRY logClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
-{
-	fprintf( glw_state.log_fp, "glClearColor\n" );
-	dllClearColor( red, green, blue, alpha );
-}
-
-static void APIENTRY logClearDepth(GLclampd depth)
-{
-	fprintf( glw_state.log_fp, "glClearDepth( %f )\n", ( float ) depth );
-	dllClearDepth( depth );
-}
-
-static void APIENTRY logClearIndex(GLfloat c)
-{
-	fprintf( glw_state.log_fp, "glClearIndex\n" );
-	dllClearIndex( c );
-}
-
-static void APIENTRY logClearStencil(GLint s)
-{
-	fprintf( glw_state.log_fp, "glClearStencil( %d )\n", s );
-	dllClearStencil( s );
-}
-
-static void APIENTRY logClipPlane(GLenum plane, const GLdouble *equation)
-{
-	fprintf( glw_state.log_fp, "glClipPlane\n" );
-	dllClipPlane( plane, equation );
-}
-
-static void APIENTRY logColor3b(GLbyte red, GLbyte green, GLbyte blue)
-{
-	fprintf( glw_state.log_fp, "glColor3b\n" );
-	dllColor3b( red, green, blue );
-}
-
-static void APIENTRY logColor3bv(const GLbyte *v)
-{
-	fprintf( glw_state.log_fp, "glColor3bv\n" );
-	dllColor3bv( v );
-}
-
-static void APIENTRY logColor3d(GLdouble red, GLdouble green, GLdouble blue)
-{
-	fprintf( glw_state.log_fp, "glColor3d\n" );
-	dllColor3d( red, green, blue );
-}
-
-static void APIENTRY logColor3dv(const GLdouble *v)
-{
-	fprintf( glw_state.log_fp, "glColor3dv\n" );
-	dllColor3dv( v );
-}
-
-static void APIENTRY logColor3f(GLfloat red, GLfloat green, GLfloat blue)
-{
-	fprintf( glw_state.log_fp, "glColor3f\n" );
-	dllColor3f( red, green, blue );
-}
-
-static void APIENTRY logColor3fv(const GLfloat *v)
-{
-	fprintf( glw_state.log_fp, "glColor3fv\n" );
-	dllColor3fv( v );
-}
-
-static void APIENTRY logColor3i(GLint red, GLint green, GLint blue)
-{
-	fprintf( glw_state.log_fp, "glColor3i\n" );
-	dllColor3i( red, green, blue );
-}
-
-static void APIENTRY logColor3iv(const GLint *v)
-{
-	fprintf( glw_state.log_fp, "glColor3iv\n" );
-	dllColor3iv( v );
-}
-
-static void APIENTRY logColor3s(GLshort red, GLshort green, GLshort blue)
-{
-	fprintf( glw_state.log_fp, "glColor3s\n" );
-	dllColor3s( red, green, blue );
-}
-
-static void APIENTRY logColor3sv(const GLshort *v)
-{
-	fprintf( glw_state.log_fp, "glColor3sv\n" );
-	dllColor3sv( v );
-}
-
-static void APIENTRY logColor3ub(GLubyte red, GLubyte green, GLubyte blue)
-{
-	fprintf( glw_state.log_fp, "glColor3ub\n" );
-	dllColor3ub( red, green, blue );
-}
-
-static void APIENTRY logColor3ubv(const GLubyte *v)
-{
-	fprintf( glw_state.log_fp, "glColor3ubv\n" );
-	dllColor3ubv( v );
-}
-
-#define SIG( x ) fprintf( glw_state.log_fp, x "\n" )
-
-static void APIENTRY logColor3ui(GLuint red, GLuint green, GLuint blue)
-{
-	SIG( "glColor3ui" );
-	dllColor3ui( red, green, blue );
-}
-
-static void APIENTRY logColor3uiv(const GLuint *v)
-{
-	SIG( "glColor3uiv" );
-	dllColor3uiv( v );
-}
-
-static void APIENTRY logColor3us(GLushort red, GLushort green, GLushort blue)
-{
-	SIG( "glColor3us" );
-	dllColor3us( red, green, blue );
-}
-
-static void APIENTRY logColor3usv(const GLushort *v)
-{
-	SIG( "glColor3usv" );
-	dllColor3usv( v );
-}
-
-static void APIENTRY logColor4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
-{
-	SIG( "glColor4b" );
-	dllColor4b( red, green, blue, alpha );
-}
-
-static void APIENTRY logColor4bv(const GLbyte *v)
-{
-	SIG( "glColor4bv" );
-	dllColor4bv( v );
-}
-
-static void APIENTRY logColor4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
-{
-	SIG( "glColor4d" );
-	dllColor4d( red, green, blue, alpha );
-}
-static void APIENTRY logColor4dv(const GLdouble *v)
-{
-	SIG( "glColor4dv" );
-	dllColor4dv( v );
-}
-static void APIENTRY logColor4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-	fprintf( glw_state.log_fp, "glColor4f( %f,%f,%f,%f )\n", red, green, blue, alpha );
-	dllColor4f( red, green, blue, alpha );
-}
-static void APIENTRY logColor4fv(const GLfloat *v)
-{
-	fprintf( glw_state.log_fp, "glColor4fv( %f,%f,%f,%f )\n", v[0], v[1], v[2], v[3] );
-	dllColor4fv( v );
-}
-static void APIENTRY logColor4i(GLint red, GLint green, GLint blue, GLint alpha)
-{
-	SIG( "glColor4i" );
-	dllColor4i( red, green, blue, alpha );
-}
-static void APIENTRY logColor4iv(const GLint *v)
-{
-	SIG( "glColor4iv" );
-	dllColor4iv( v );
-}
-static void APIENTRY logColor4s(GLshort red, GLshort green, GLshort blue, GLshort alpha)
-{
-	SIG( "glColor4s" );
-	dllColor4s( red, green, blue, alpha );
-}
-static void APIENTRY logColor4sv(const GLshort *v)
-{
-	SIG( "glColor4sv" );
-	dllColor4sv( v );
-}
-static void APIENTRY logColor4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
-{
-	SIG( "glColor4b" );
-	dllColor4b( red, green, blue, alpha );
-}
-static void APIENTRY logColor4ubv(const GLubyte *v)
-{
-	SIG( "glColor4ubv" );
-	dllColor4ubv( v );
-}
-static void APIENTRY logColor4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha)
-{
-	SIG( "glColor4ui" );
-	dllColor4ui( red, green, blue, alpha );
-}
-static void APIENTRY logColor4uiv(const GLuint *v)
-{
-	SIG( "glColor4uiv" );
-	dllColor4uiv( v );
-}
-static void APIENTRY logColor4us(GLushort red, GLushort green, GLushort blue, GLushort alpha)
-{
-	SIG( "glColor4us" );
-	dllColor4us( red, green, blue, alpha );
-}
-static void APIENTRY logColor4usv(const GLushort *v)
-{
-	SIG( "glColor4usv" );
-	dllColor4usv( v );
-}
-static void APIENTRY logColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
-{
-	SIG( "glColorMask" );
-	dllColorMask( red, green, blue, alpha );
-}
-static void APIENTRY logColorMaterial(GLenum face, GLenum mode)
-{
-	SIG( "glColorMaterial" );
-	dllColorMaterial( face, mode );
-}
-
-static void APIENTRY logColorPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	fprintf( glw_state.log_fp, "glColorPointer( %d, %s, %d, MEM )\n", size, TypeToString( type ), stride );
-	dllColorPointer( size, type, stride, pointer );
-}
-
-static void APIENTRY logCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
-{
-	SIG( "glCopyPixels" );
-	dllCopyPixels( x, y, width, height, type );
-}
-
-static void APIENTRY logCopyTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border)
-{
-	SIG( "glCopyTexImage1D" );
-	dllCopyTexImage1D( target, level, internalFormat, x, y, width, border );
-}
-
-static void APIENTRY logCopyTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
-{
-	SIG( "glCopyTexImage2D" );
-	dllCopyTexImage2D( target, level, internalFormat, x, y, width, height, border );
-}
-
-static void APIENTRY logCopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
-{
-	SIG( "glCopyTexSubImage1D" );
-	dllCopyTexSubImage1D( target, level, xoffset, x, y, width );
-}
-
-static void APIENTRY logCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	SIG( "glCopyTexSubImage2D" );
-	dllCopyTexSubImage2D( target, level, xoffset, yoffset, x, y, width, height );
-}
-
-static void APIENTRY logCullFace(GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glCullFace( %s )\n", ( mode == GL_FRONT ) ? "GL_FRONT" : "GL_BACK" );
-	dllCullFace( mode );
-}
-
-static void APIENTRY logDeleteLists(GLuint list, GLsizei range)
-{
-	SIG( "glDeleteLists" );
-	dllDeleteLists( list, range );
-}
-
-static void APIENTRY logDeleteTextures(GLsizei n, const GLuint *textures)
-{
-	SIG( "glDeleteTextures" );
-	dllDeleteTextures( n, textures );
-}
-
-static void APIENTRY logDepthFunc(GLenum func)
-{
-	fprintf( glw_state.log_fp, "glDepthFunc( %s )\n", FuncToString( func ) );
-	dllDepthFunc( func );
-}
-
-static void APIENTRY logDepthMask(GLboolean flag)
-{
-	fprintf( glw_state.log_fp, "glDepthMask( %s )\n", BooleanToString( flag ) );
-	dllDepthMask( flag );
-}
-
-static void APIENTRY logDepthRange(GLclampd zNear, GLclampd zFar)
-{
-	fprintf( glw_state.log_fp, "glDepthRange( %f, %f )\n", ( float ) zNear, ( float ) zFar );
-	dllDepthRange( zNear, zFar );
-}
-
-static void APIENTRY logDisable(GLenum cap)
-{
-	fprintf( glw_state.log_fp, "glDisable( %s )\n", CapToString( cap ) );
-	dllDisable( cap );
-}
-
-static void APIENTRY logDisableClientState(GLenum array)
-{
-	fprintf( glw_state.log_fp, "glDisableClientState( %s )\n", CapToString( array ) );
-	dllDisableClientState( array );
-}
-
-static void APIENTRY logDrawArrays(GLenum mode, GLint first, GLsizei count)
-{
-	SIG( "glDrawArrays" );
-	dllDrawArrays( mode, first, count );
-}
-
-static void APIENTRY logDrawBuffer(GLenum mode)
-{
-	SIG( "glDrawBuffer" );
-	dllDrawBuffer( mode );
-}
-
-static void APIENTRY logDrawElements(GLenum mode, GLsizei count, GLenum type, const void *indices)
-{
-	fprintf( glw_state.log_fp, "glDrawElements( %s, %d, %s, MEM )\n", PrimToString( mode ), count, TypeToString( type ) );
-	dllDrawElements( mode, count, type, indices );
-}
-
-static void APIENTRY logDrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glDrawPixels" );
-	dllDrawPixels( width, height, format, type, pixels );
-}
-
-static void APIENTRY logEdgeFlag(GLboolean flag)
-{
-	SIG( "glEdgeFlag" );
-	dllEdgeFlag( flag );
-}
-
-static void APIENTRY logEdgeFlagPointer(GLsizei stride, const void *pointer)
-{
-	SIG( "glEdgeFlagPointer" );
-	dllEdgeFlagPointer( stride, pointer );
-}
-
-static void APIENTRY logEdgeFlagv(const GLboolean *flag)
-{
-	SIG( "glEdgeFlagv" );
-	dllEdgeFlagv( flag );
-}
-
-static void APIENTRY logEnable(GLenum cap)
-{
-	fprintf( glw_state.log_fp, "glEnable( %s )\n", CapToString( cap ) );
-	dllEnable( cap );
-}
-
-static void APIENTRY logEnableClientState(GLenum array)
-{
-	fprintf( glw_state.log_fp, "glEnableClientState( %s )\n", CapToString( array ) );
-	dllEnableClientState( array );
-}
-
-static void APIENTRY logEnd(void)
-{
-	SIG( "glEnd" );
-	dllEnd();
-}
-
-static void APIENTRY logEndList(void)
-{
-	SIG( "glEndList" );
-	dllEndList();
-}
-
-static void APIENTRY logEvalCoord1d(GLdouble u)
-{
-	SIG( "glEvalCoord1d" );
-	dllEvalCoord1d( u );
-}
-
-static void APIENTRY logEvalCoord1dv(const GLdouble *u)
-{
-	SIG( "glEvalCoord1dv" );
-	dllEvalCoord1dv( u );
-}
-
-static void APIENTRY logEvalCoord1f(GLfloat u)
-{
-	SIG( "glEvalCoord1f" );
-	dllEvalCoord1f( u );
-}
-
-static void APIENTRY logEvalCoord1fv(const GLfloat *u)
-{
-	SIG( "glEvalCoord1fv" );
-	dllEvalCoord1fv( u );
-}
-static void APIENTRY logEvalCoord2d(GLdouble u, GLdouble v)
-{
-	SIG( "glEvalCoord2d" );
-	dllEvalCoord2d( u, v );
-}
-static void APIENTRY logEvalCoord2dv(const GLdouble *u)
-{
-	SIG( "glEvalCoord2dv" );
-	dllEvalCoord2dv( u );
-}
-static void APIENTRY logEvalCoord2f(GLfloat u, GLfloat v)
-{
-	SIG( "glEvalCoord2f" );
-	dllEvalCoord2f( u, v );
-}
-static void APIENTRY logEvalCoord2fv(const GLfloat *u)
-{
-	SIG( "glEvalCoord2fv" );
-	dllEvalCoord2fv( u );
-}
-
-static void APIENTRY logEvalMesh1(GLenum mode, GLint i1, GLint i2)
-{
-	SIG( "glEvalMesh1" );
-	dllEvalMesh1( mode, i1, i2 );
-}
-static void APIENTRY logEvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
-{
-	SIG( "glEvalMesh2" );
-	dllEvalMesh2( mode, i1, i2, j1, j2 );
-}
-static void APIENTRY logEvalPoint1(GLint i)
-{
-	SIG( "glEvalPoint1" );
-	dllEvalPoint1( i );
-}
-static void APIENTRY logEvalPoint2(GLint i, GLint j)
-{
-	SIG( "glEvalPoint2" );
-	dllEvalPoint2( i, j );
-}
-
-static void APIENTRY logFeedbackBuffer(GLsizei size, GLenum type, GLfloat *buffer)
-{
-	SIG( "glFeedbackBuffer" );
-	dllFeedbackBuffer( size, type, buffer );
-}
-
-static void APIENTRY logFinish(void)
-{
-	SIG( "glFinish" );
-	dllFinish();
-}
-
-static void APIENTRY logFlush(void)
-{
-	SIG( "glFlush" );
-	dllFlush();
-}
-
-static void APIENTRY logFogf(GLenum pname, GLfloat param)
-{
-	SIG( "glFogf" );
-	dllFogf( pname, param );
-}
-
-static void APIENTRY logFogfv(GLenum pname, const GLfloat *params)
-{
-	SIG( "glFogfv" );
-	dllFogfv( pname, params );
-}
-
-static void APIENTRY logFogi(GLenum pname, GLint param)
-{
-	SIG( "glFogi" );
-	dllFogi( pname, param );
-}
-
-static void APIENTRY logFogiv(GLenum pname, const GLint *params)
-{
-	SIG( "glFogiv" );
-	dllFogiv( pname, params );
-}
-
-static void APIENTRY logFrontFace(GLenum mode)
-{
-	SIG( "glFrontFace" );
-	dllFrontFace( mode );
-}
-
-static void APIENTRY logFrustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	SIG( "glFrustum" );
-	dllFrustum( left, right, bottom, top, zNear, zFar );
-}
-
-static GLuint APIENTRY logGenLists(GLsizei range)
-{
-	SIG( "glGenLists" );
-	return dllGenLists( range );
-}
-
-static void APIENTRY logGenTextures(GLsizei n, GLuint *textures)
-{
-	SIG( "glGenTextures" );
-	dllGenTextures( n, textures );
-}
-
-static void APIENTRY logGetBooleanv(GLenum pname, GLboolean *params)
-{
-	SIG( "glGetBooleanv" );
-	dllGetBooleanv( pname, params );
-}
-
-static void APIENTRY logGetClipPlane(GLenum plane, GLdouble *equation)
-{
-	SIG( "glGetClipPlane" );
-	dllGetClipPlane( plane, equation );
-}
-
-static void APIENTRY logGetDoublev(GLenum pname, GLdouble *params)
-{
-	SIG( "glGetDoublev" );
-	dllGetDoublev( pname, params );
-}
-
-static GLenum APIENTRY logGetError(void)
-{
-	SIG( "glGetError" );
-	return dllGetError();
-}
-
-static void APIENTRY logGetFloatv(GLenum pname, GLfloat *params)
-{
-	SIG( "glGetFloatv" );
-	dllGetFloatv( pname, params );
-}
-
-static void APIENTRY logGetIntegerv(GLenum pname, GLint *params)
-{
-	SIG( "glGetIntegerv" );
-	dllGetIntegerv( pname, params );
-}
-
-static void APIENTRY logGetLightfv(GLenum light, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetLightfv" );
-	dllGetLightfv( light, pname, params );
-}
-
-static void APIENTRY logGetLightiv(GLenum light, GLenum pname, GLint *params)
-{
-	SIG( "glGetLightiv" );
-	dllGetLightiv( light, pname, params );
-}
-
-static void APIENTRY logGetMapdv(GLenum target, GLenum query, GLdouble *v)
-{
-	SIG( "glGetMapdv" );
-	dllGetMapdv( target, query, v );
-}
-
-static void APIENTRY logGetMapfv(GLenum target, GLenum query, GLfloat *v)
-{
-	SIG( "glGetMapfv" );
-	dllGetMapfv( target, query, v );
-}
-
-static void APIENTRY logGetMapiv(GLenum target, GLenum query, GLint *v)
-{
-	SIG( "glGetMapiv" );
-	dllGetMapiv( target, query, v );
-}
-
-static void APIENTRY logGetMaterialfv(GLenum face, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetMaterialfv" );
-	dllGetMaterialfv( face, pname, params );
-}
-
-static void APIENTRY logGetMaterialiv(GLenum face, GLenum pname, GLint *params)
-{
-	SIG( "glGetMaterialiv" );
-	dllGetMaterialiv( face, pname, params );
-}
-
-static void APIENTRY logGetPixelMapfv(GLenum map, GLfloat *values)
-{
-	SIG( "glGetPixelMapfv" );
-	dllGetPixelMapfv( map, values );
-}
-
-static void APIENTRY logGetPixelMapuiv(GLenum map, GLuint *values)
-{
-	SIG( "glGetPixelMapuiv" );
-	dllGetPixelMapuiv( map, values );
-}
-
-static void APIENTRY logGetPixelMapusv(GLenum map, GLushort *values)
-{
-	SIG( "glGetPixelMapusv" );
-	dllGetPixelMapusv( map, values );
-}
-
-static void APIENTRY logGetPointerv(GLenum pname, GLvoid* *params)
-{
-	SIG( "glGetPointerv" );
-	dllGetPointerv( pname, params );
-}
-
-static void APIENTRY logGetPolygonStipple(GLubyte *mask)
-{
-	SIG( "glGetPolygonStipple" );
-	dllGetPolygonStipple( mask );
-}
-
-static const GLubyte * APIENTRY logGetString(GLenum name)
-{
-	SIG( "glGetString" );
-	return dllGetString( name );
-}
-
-static void APIENTRY logGetTexEnvfv(GLenum target, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexEnvfv" );
-	dllGetTexEnvfv( target, pname, params );
-}
-
-static void APIENTRY logGetTexEnviv(GLenum target, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexEnviv" );
-	dllGetTexEnviv( target, pname, params );
-}
-
-static void APIENTRY logGetTexGendv(GLenum coord, GLenum pname, GLdouble *params)
-{
-	SIG( "glGetTexGendv" );
-	dllGetTexGendv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexGenfv(GLenum coord, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexGenfv" );
-	dllGetTexGenfv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexGeniv(GLenum coord, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexGeniv" );
-	dllGetTexGeniv( coord, pname, params );
-}
-
-static void APIENTRY logGetTexImage(GLenum target, GLint level, GLenum format, GLenum type, void *pixels)
-{
-	SIG( "glGetTexImage" );
-	dllGetTexImage( target, level, format, type, pixels );
-}
-static void APIENTRY logGetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat *params )
-{
-	SIG( "glGetTexLevelParameterfv" );
-	dllGetTexLevelParameterfv( target, level, pname, params );
-}
-
-static void APIENTRY logGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexLevelParameteriv" );
-	dllGetTexLevelParameteriv( target, level, pname, params );
-}
-
-static void APIENTRY logGetTexParameterfv(GLenum target, GLenum pname, GLfloat *params)
-{
-	SIG( "glGetTexParameterfv" );
-	dllGetTexParameterfv( target, pname, params );
-}
-
-static void APIENTRY logGetTexParameteriv(GLenum target, GLenum pname, GLint *params)
-{
-	SIG( "glGetTexParameteriv" );
-	dllGetTexParameteriv( target, pname, params );
-}
-
-static void APIENTRY logHint(GLenum target, GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glHint( 0x%x, 0x%x )\n", target, mode );
-	dllHint( target, mode );
-}
-
-static void APIENTRY logIndexMask(GLuint mask)
-{
-	SIG( "glIndexMask" );
-	dllIndexMask( mask );
-}
-
-static void APIENTRY logIndexPointer(GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glIndexPointer" );
-	dllIndexPointer( type, stride, pointer );
-}
-
-static void APIENTRY logIndexd(GLdouble c)
-{
-	SIG( "glIndexd" );
-	dllIndexd( c );
-}
-
-static void APIENTRY logIndexdv(const GLdouble *c)
-{
-	SIG( "glIndexdv" );
-	dllIndexdv( c );
-}
-
-static void APIENTRY logIndexf(GLfloat c)
-{
-	SIG( "glIndexf" );
-	dllIndexf( c );
-}
-
-static void APIENTRY logIndexfv(const GLfloat *c)
-{
-	SIG( "glIndexfv" );
-	dllIndexfv( c );
-}
-
-static void APIENTRY logIndexi(GLint c)
-{
-	SIG( "glIndexi" );
-	dllIndexi( c );
-}
-
-static void APIENTRY logIndexiv(const GLint *c)
-{
-	SIG( "glIndexiv" );
-	dllIndexiv( c );
-}
-
-static void APIENTRY logIndexs(GLshort c)
-{
-	SIG( "glIndexs" );
-	dllIndexs( c );
-}
-
-static void APIENTRY logIndexsv(const GLshort *c)
-{
-	SIG( "glIndexsv" );
-	dllIndexsv( c );
-}
-
-static void APIENTRY logIndexub(GLubyte c)
-{
-	SIG( "glIndexub" );
-	dllIndexub( c );
-}
-
-static void APIENTRY logIndexubv(const GLubyte *c)
-{
-	SIG( "glIndexubv" );
-	dllIndexubv( c );
-}
-
-static void APIENTRY logInitNames(void)
-{
-	SIG( "glInitNames" );
-	dllInitNames();
-}
-
-static void APIENTRY logInterleavedArrays(GLenum format, GLsizei stride, const void *pointer)
-{
-	SIG( "glInterleavedArrays" );
-	dllInterleavedArrays( format, stride, pointer );
-}
-
-static GLboolean APIENTRY logIsEnabled(GLenum cap)
-{
-	SIG( "glIsEnabled" );
-	return dllIsEnabled( cap );
-}
-static GLboolean APIENTRY logIsList(GLuint list)
-{
-	SIG( "glIsList" );
-	return dllIsList( list );
-}
-static GLboolean APIENTRY logIsTexture(GLuint texture)
-{
-	SIG( "glIsTexture" );
-	return dllIsTexture( texture );
-}
-
-static void APIENTRY logLightModelf(GLenum pname, GLfloat param)
-{
-	SIG( "glLightModelf" );
-	dllLightModelf( pname, param );
-}
-
-static void APIENTRY logLightModelfv(GLenum pname, const GLfloat *params)
-{
-	SIG( "glLightModelfv" );
-	dllLightModelfv( pname, params );
-}
-
-static void APIENTRY logLightModeli(GLenum pname, GLint param)
-{
-	SIG( "glLightModeli" );
-	dllLightModeli( pname, param );
-
-}
-
-static void APIENTRY logLightModeliv(GLenum pname, const GLint *params)
-{
-	SIG( "glLightModeliv" );
-	dllLightModeliv( pname, params );
-}
-
-static void APIENTRY logLightf(GLenum light, GLenum pname, GLfloat param)
-{
-	SIG( "glLightf" );
-	dllLightf( light, pname, param );
-}
-
-static void APIENTRY logLightfv(GLenum light, GLenum pname, const GLfloat *params)
-{
-	SIG( "glLightfv" );
-	dllLightfv( light, pname, params );
-}
-
-static void APIENTRY logLighti(GLenum light, GLenum pname, GLint param)
-{
-	SIG( "glLighti" );
-	dllLighti( light, pname, param );
-}
-
-static void APIENTRY logLightiv(GLenum light, GLenum pname, const GLint *params)
-{
-	SIG( "glLightiv" );
-	dllLightiv( light, pname, params );
-}
-
-static void APIENTRY logLineStipple(GLint factor, GLushort pattern)
-{
-	SIG( "glLineStipple" );
-	dllLineStipple( factor, pattern );
-}
-
-static void APIENTRY logLineWidth(GLfloat width)
-{
-	SIG( "glLineWidth" );
-	dllLineWidth( width );
-}
-
-static void APIENTRY logListBase(GLuint base)
-{
-	SIG( "glListBase" );
-	dllListBase( base );
-}
-
-static void APIENTRY logLoadIdentity(void)
-{
-	SIG( "glLoadIdentity" );
-	dllLoadIdentity();
-}
-
-static void APIENTRY logLoadMatrixd(const GLdouble *m)
-{
-	SIG( "glLoadMatrixd" );
-	dllLoadMatrixd( m );
-}
-
-static void APIENTRY logLoadMatrixf(const GLfloat *m)
-{
-	SIG( "glLoadMatrixf" );
-	dllLoadMatrixf( m );
-}
-
-static void APIENTRY logLoadName(GLuint name)
-{
-	SIG( "glLoadName" );
-	dllLoadName( name );
-}
-
-static void APIENTRY logLogicOp(GLenum opcode)
-{
-	SIG( "glLogicOp" );
-	dllLogicOp( opcode );
-}
-
-static void APIENTRY logMap1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
-{
-	SIG( "glMap1d" );
-	dllMap1d( target, u1, u2, stride, order, points );
-}
-
-static void APIENTRY logMap1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
-{
-	SIG( "glMap1f" );
-	dllMap1f( target, u1, u2, stride, order, points );
-}
-
-static void APIENTRY logMap2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
-{
-	SIG( "glMap2d" );
-	dllMap2d( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
-}
-
-static void APIENTRY logMap2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
-{
-	SIG( "glMap2f" );
-	dllMap2f( target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points );
-}
-
-static void APIENTRY logMapGrid1d(GLint un, GLdouble u1, GLdouble u2)
-{
-	SIG( "glMapGrid1d" );
-	dllMapGrid1d( un, u1, u2 );
-}
-
-static void APIENTRY logMapGrid1f(GLint un, GLfloat u1, GLfloat u2)
-{
-	SIG( "glMapGrid1f" );
-	dllMapGrid1f( un, u1, u2 );
-}
-
-static void APIENTRY logMapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
-{
-	SIG( "glMapGrid2d" );
-	dllMapGrid2d( un, u1, u2, vn, v1, v2 );
-}
-static void APIENTRY logMapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
-{
-	SIG( "glMapGrid2f" );
-	dllMapGrid2f( un, u1, u2, vn, v1, v2 );
-}
-static void APIENTRY logMaterialf(GLenum face, GLenum pname, GLfloat param)
-{
-	SIG( "glMaterialf" );
-	dllMaterialf( face, pname, param );
-}
-static void APIENTRY logMaterialfv(GLenum face, GLenum pname, const GLfloat *params)
-{
-	SIG( "glMaterialfv" );
-	dllMaterialfv( face, pname, params );
-}
-
-static void APIENTRY logMateriali(GLenum face, GLenum pname, GLint param)
-{
-	SIG( "glMateriali" );
-	dllMateriali( face, pname, param );
-}
-
-static void APIENTRY logMaterialiv(GLenum face, GLenum pname, const GLint *params)
-{
-	SIG( "glMaterialiv" );
-	dllMaterialiv( face, pname, params );
-}
-
-static void APIENTRY logMatrixMode(GLenum mode)
-{
-	SIG( "glMatrixMode" );
-	dllMatrixMode( mode );
-}
-
-static void APIENTRY logMultMatrixd(const GLdouble *m)
-{
-	SIG( "glMultMatrixd" );
-	dllMultMatrixd( m );
-}
-
-static void APIENTRY logMultMatrixf(const GLfloat *m)
-{
-	SIG( "glMultMatrixf" );
-	dllMultMatrixf( m );
-}
-
-static void APIENTRY logNewList(GLuint list, GLenum mode)
-{
-	SIG( "glNewList" );
-	dllNewList( list, mode );
-}
-
-static void APIENTRY logNormal3b(GLbyte nx, GLbyte ny, GLbyte nz)
-{
-	SIG ("glNormal3b" );
-	dllNormal3b( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3bv(const GLbyte *v)
-{
-	SIG( "glNormal3bv" );
-	dllNormal3bv( v );
-}
-
-static void APIENTRY logNormal3d(GLdouble nx, GLdouble ny, GLdouble nz)
-{
-	SIG( "glNormal3d" );
-	dllNormal3d( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3dv(const GLdouble *v)
-{
-	SIG( "glNormal3dv" );
-	dllNormal3dv( v );
-}
-
-static void APIENTRY logNormal3f(GLfloat nx, GLfloat ny, GLfloat nz)
-{
-	SIG( "glNormal3f" );
-	dllNormal3f( nx, ny, nz );
-}
-
-static void APIENTRY logNormal3fv(const GLfloat *v)
-{
-	SIG( "glNormal3fv" );
-	dllNormal3fv( v );
-}
-static void APIENTRY logNormal3i(GLint nx, GLint ny, GLint nz)
-{
-	SIG( "glNormal3i" );
-	dllNormal3i( nx, ny, nz );
-}
-static void APIENTRY logNormal3iv(const GLint *v)
-{
-	SIG( "glNormal3iv" );
-	dllNormal3iv( v );
-}
-static void APIENTRY logNormal3s(GLshort nx, GLshort ny, GLshort nz)
-{
-	SIG( "glNormal3s" );
-	dllNormal3s( nx, ny, nz );
-}
-static void APIENTRY logNormal3sv(const GLshort *v)
-{
-	SIG( "glNormal3sv" );
-	dllNormal3sv( v );
-}
-static void APIENTRY logNormalPointer(GLenum type, GLsizei stride, const void *pointer)
-{
-	SIG( "glNormalPointer" );
-	dllNormalPointer( type, stride, pointer );
-}
-static void APIENTRY logOrtho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar)
-{
-	SIG( "glOrtho" );
-	dllOrtho( left, right, bottom, top, zNear, zFar );
-}
-
-static void APIENTRY logPassThrough(GLfloat token)
-{
-	SIG( "glPassThrough" );
-	dllPassThrough( token );
-}
-
-static void APIENTRY logPixelMapfv(GLenum map, GLsizei mapsize, const GLfloat *values)
-{
-	SIG( "glPixelMapfv" );
-	dllPixelMapfv( map, mapsize, values );
-}
-
-static void APIENTRY logPixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values)
-{
-	SIG( "glPixelMapuiv" );
-	dllPixelMapuiv( map, mapsize, values );
-}
-
-static void APIENTRY logPixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values)
-{
-	SIG( "glPixelMapusv" );
-	dllPixelMapusv( map, mapsize, values );
-}
-static void APIENTRY logPixelStoref(GLenum pname, GLfloat param)
-{
-	SIG( "glPixelStoref" );
-	dllPixelStoref( pname, param );
-}
-static void APIENTRY logPixelStorei(GLenum pname, GLint param)
-{
-	SIG( "glPixelStorei" );
-	dllPixelStorei( pname, param );
-}
-static void APIENTRY logPixelTransferf(GLenum pname, GLfloat param)
-{
-	SIG( "glPixelTransferf" );
-	dllPixelTransferf( pname, param );
-}
-
-static void APIENTRY logPixelTransferi(GLenum pname, GLint param)
-{
-	SIG( "glPixelTransferi" );
-	dllPixelTransferi( pname, param );
-}
-
-static void APIENTRY logPixelZoom(GLfloat xfactor, GLfloat yfactor)
-{
-	SIG( "glPixelZoom" );
-	dllPixelZoom( xfactor, yfactor );
-}
-
-static void APIENTRY logPointSize(GLfloat size)
-{
-	SIG( "glPointSize" );
-	dllPointSize( size );
-}
-
-static void APIENTRY logPolygonMode(GLenum face, GLenum mode)
-{
-	fprintf( glw_state.log_fp, "glPolygonMode( 0x%x, 0x%x )\n", face, mode );
-	dllPolygonMode( face, mode );
-}
-
-static void APIENTRY logPolygonOffset(GLfloat factor, GLfloat units)
-{
-	SIG( "glPolygonOffset" );
-	dllPolygonOffset( factor, units );
-}
-static void APIENTRY logPolygonStipple(const GLubyte *mask )
-{
-	SIG( "glPolygonStipple" );
-	dllPolygonStipple( mask );
-}
-static void APIENTRY logPopAttrib(void)
-{
-	SIG( "glPopAttrib" );
-	dllPopAttrib();
-}
-
-static void APIENTRY logPopClientAttrib(void)
-{
-	SIG( "glPopClientAttrib" );
-	dllPopClientAttrib();
-}
-
-static void APIENTRY logPopMatrix(void)
-{
-	SIG( "glPopMatrix" );
-	dllPopMatrix();
-}
-
-static void APIENTRY logPopName(void)
-{
-	SIG( "glPopName" );
-	dllPopName();
-}
-
-static void APIENTRY logPrioritizeTextures(GLsizei n, const GLuint *textures, const GLclampf *priorities)
-{
-	SIG( "glPrioritizeTextures" );
-	dllPrioritizeTextures( n, textures, priorities );
-}
-
-static void APIENTRY logPushAttrib(GLbitfield mask)
-{
-	SIG( "glPushAttrib" );
-	dllPushAttrib( mask );
-}
-
-static void APIENTRY logPushClientAttrib(GLbitfield mask)
-{
-	SIG( "glPushClientAttrib" );
-	dllPushClientAttrib( mask );
-}
-
-static void APIENTRY logPushMatrix(void)
-{
-	SIG( "glPushMatrix" );
-	dllPushMatrix();
-}
-
-static void APIENTRY logPushName(GLuint name)
-{
-	SIG( "glPushName" );
-	dllPushName( name );
-}
-
-static void APIENTRY logRasterPos2d(GLdouble x, GLdouble y)
-{
-	SIG ("glRasterPot2d" );
-	dllRasterPos2d( x, y );
-}
-
-static void APIENTRY logRasterPos2dv(const GLdouble *v)
-{
-	SIG( "glRasterPos2dv" );
-	dllRasterPos2dv( v );
-}
-
-static void APIENTRY logRasterPos2f(GLfloat x, GLfloat y)
-{
-	SIG( "glRasterPos2f" );
-	dllRasterPos2f( x, y );
-}
-static void APIENTRY logRasterPos2fv(const GLfloat *v)
-{
-	SIG( "glRasterPos2dv" );
-	dllRasterPos2fv( v );
-}
-static void APIENTRY logRasterPos2i(GLint x, GLint y)
-{
-	SIG( "glRasterPos2if" );
-	dllRasterPos2i( x, y );
-}
-static void APIENTRY logRasterPos2iv(const GLint *v)
-{
-	SIG( "glRasterPos2iv" );
-	dllRasterPos2iv( v );
-}
-static void APIENTRY logRasterPos2s(GLshort x, GLshort y)
-{
-	SIG( "glRasterPos2s" );
-	dllRasterPos2s( x, y );
-}
-static void APIENTRY logRasterPos2sv(const GLshort *v)
-{
-	SIG( "glRasterPos2sv" );
-	dllRasterPos2sv( v );
-}
-static void APIENTRY logRasterPos3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glRasterPos3d" );
-	dllRasterPos3d( x, y, z );
-}
-static void APIENTRY logRasterPos3dv(const GLdouble *v)
-{
-	SIG( "glRasterPos3dv" );
-	dllRasterPos3dv( v );
-}
-static void APIENTRY logRasterPos3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glRasterPos3f" );
-	dllRasterPos3f( x, y, z );
-}
-static void APIENTRY logRasterPos3fv(const GLfloat *v)
-{
-	SIG( "glRasterPos3fv" );
-	dllRasterPos3fv( v );
-}
-static void APIENTRY logRasterPos3i(GLint x, GLint y, GLint z)
-{
-	SIG( "glRasterPos3i" );
-	dllRasterPos3i( x, y, z );
-}
-static void APIENTRY logRasterPos3iv(const GLint *v)
-{
-	SIG( "glRasterPos3iv" );
-	dllRasterPos3iv( v );
-}
-static void APIENTRY logRasterPos3s(GLshort x, GLshort y, GLshort z)
-{
-	SIG( "glRasterPos3s" );
-	dllRasterPos3s( x, y, z );
-}
-static void APIENTRY logRasterPos3sv(const GLshort *v)
-{
-	SIG( "glRasterPos3sv" );
-	dllRasterPos3sv( v );
-}
-static void APIENTRY logRasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	SIG( "glRasterPos4d" );
-	dllRasterPos4d( x, y, z, w );
-}
-static void APIENTRY logRasterPos4dv(const GLdouble *v)
-{
-	SIG( "glRasterPos4dv" );
-	dllRasterPos4dv( v );
-}
-static void APIENTRY logRasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	SIG( "glRasterPos4f" );
-	dllRasterPos4f( x, y, z, w );
-}
-static void APIENTRY logRasterPos4fv(const GLfloat *v)
-{
-	SIG( "glRasterPos4fv" );
-	dllRasterPos4fv( v );
-}
-static void APIENTRY logRasterPos4i(GLint x, GLint y, GLint z, GLint w)
-{
-	SIG( "glRasterPos4i" );
-	dllRasterPos4i( x, y, z, w );
-}
-static void APIENTRY logRasterPos4iv(const GLint *v)
-{
-	SIG( "glRasterPos4iv" );
-	dllRasterPos4iv( v );
-}
-static void APIENTRY logRasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	SIG( "glRasterPos4s" );
-	dllRasterPos4s( x, y, z, w );
-}
-static void APIENTRY logRasterPos4sv(const GLshort *v)
-{
-	SIG( "glRasterPos4sv" );
-	dllRasterPos4sv( v );
-}
-static void APIENTRY logReadBuffer(GLenum mode)
-{
-	SIG( "glReadBuffer" );
-	dllReadBuffer( mode );
-}
-static void APIENTRY logReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels)
-{
-	SIG( "glReadPixels" );
-	dllReadPixels( x, y, width, height, format, type, pixels );
-}
-
-static void APIENTRY logRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
-{
-	SIG( "glRectd" );
-	dllRectd( x1, y1, x2, y2 );
-}
-
-static void APIENTRY logRectdv(const GLdouble *v1, const GLdouble *v2)
-{
-	SIG( "glRectdv" );
-	dllRectdv( v1, v2 );
-}
-
-static void APIENTRY logRectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
-{
-	SIG( "glRectf" );
-	dllRectf( x1, y1, x2, y2 );
-}
-
-static void APIENTRY logRectfv(const GLfloat *v1, const GLfloat *v2)
-{
-	SIG( "glRectfv" );
-	dllRectfv( v1, v2 );
-}
-static void APIENTRY logRecti(GLint x1, GLint y1, GLint x2, GLint y2)
-{
-	SIG( "glRecti" );
-	dllRecti( x1, y1, x2, y2 );
-}
-static void APIENTRY logRectiv(const GLint *v1, const GLint *v2)
-{
-	SIG( "glRectiv" );
-	dllRectiv( v1, v2 );
-}
-static void APIENTRY logRects(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
-{
-	SIG( "glRects" );
-	dllRects( x1, y1, x2, y2 );
-}
-static void APIENTRY logRectsv(const GLshort *v1, const GLshort *v2)
-{
-	SIG( "glRectsv" );
-	dllRectsv( v1, v2 );
-}
-static GLint APIENTRY logRenderMode(GLenum mode)
-{
-	SIG( "glRenderMode" );
-	return dllRenderMode( mode );
-}
-static void APIENTRY logRotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glRotated" );
-	dllRotated( angle, x, y, z );
-}
-
-static void APIENTRY logRotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glRotatef" );
-	dllRotatef( angle, x, y, z );
-}
-
-static void APIENTRY logScaled(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glScaled" );
-	dllScaled( x, y, z );
-}
-
-static void APIENTRY logScalef(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glScalef" );
-	dllScalef( x, y, z );
-}
-
-static void APIENTRY logScissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	fprintf( glw_state.log_fp, "glScissor( %d, %d, %d, %d )\n", x, y, width, height );
-	dllScissor( x, y, width, height );
-}
-
-static void APIENTRY logSelectBuffer(GLsizei size, GLuint *buffer)
-{
-	SIG( "glSelectBuffer" );
-	dllSelectBuffer( size, buffer );
-}
-
-static void APIENTRY logShadeModel(GLenum mode)
-{
-	SIG( "glShadeModel" );
-	dllShadeModel( mode );
-}
-
-static void APIENTRY logStencilFunc(GLenum func, GLint ref, GLuint mask)
-{
-	SIG( "glStencilFunc" );
-	dllStencilFunc( func, ref, mask );
-}
-
-static void APIENTRY logStencilMask(GLuint mask)
-{
-	SIG( "glStencilMask" );
-	dllStencilMask( mask );
-}
-
-static void APIENTRY logStencilOp(GLenum fail, GLenum zfail, GLenum zpass)
-{
-	SIG( "glStencilOp" );
-	dllStencilOp( fail, zfail, zpass );
-}
-
-static void APIENTRY logTexCoord1d(GLdouble s)
-{
-	SIG( "glTexCoord1d" );
-	dllTexCoord1d( s );
-}
-
-static void APIENTRY logTexCoord1dv(const GLdouble *v)
-{
-	SIG( "glTexCoord1dv" );
-	dllTexCoord1dv( v );
-}
-
-static void APIENTRY logTexCoord1f(GLfloat s)
-{
-	SIG( "glTexCoord1f" );
-	dllTexCoord1f( s );
-}
-static void APIENTRY logTexCoord1fv(const GLfloat *v)
-{
-	SIG( "glTexCoord1fv" );
-	dllTexCoord1fv( v );
-}
-static void APIENTRY logTexCoord1i(GLint s)
-{
-	SIG( "glTexCoord1i" );
-	dllTexCoord1i( s );
-}
-static void APIENTRY logTexCoord1iv(const GLint *v)
-{
-	SIG( "glTexCoord1iv" );
-	dllTexCoord1iv( v );
-}
-static void APIENTRY logTexCoord1s(GLshort s)
-{
-	SIG( "glTexCoord1s" );
-	dllTexCoord1s( s );
-}
-static void APIENTRY logTexCoord1sv(const GLshort *v)
-{
-	SIG( "glTexCoord1sv" );
-	dllTexCoord1sv( v );
-}
-static void APIENTRY logTexCoord2d(GLdouble s, GLdouble t)
-{
-	SIG( "glTexCoord2d" );
-	dllTexCoord2d( s, t );
-}
-
-static void APIENTRY logTexCoord2dv(const GLdouble *v)
-{
-	SIG( "glTexCoord2dv" );
-	dllTexCoord2dv( v );
-}
-static void APIENTRY logTexCoord2f(GLfloat s, GLfloat t)
-{
-	SIG( "glTexCoord2f" );
-	dllTexCoord2f( s, t );
-}
-static void APIENTRY logTexCoord2fv(const GLfloat *v)
-{
-	SIG( "glTexCoord2fv" );
-	dllTexCoord2fv( v );
-}
-static void APIENTRY logTexCoord2i(GLint s, GLint t)
-{
-	SIG( "glTexCoord2i" );
-	dllTexCoord2i( s, t );
-}
-static void APIENTRY logTexCoord2iv(const GLint *v)
-{
-	SIG( "glTexCoord2iv" );
-	dllTexCoord2iv( v );
-}
-static void APIENTRY logTexCoord2s(GLshort s, GLshort t)
-{
-	SIG( "glTexCoord2s" );
-	dllTexCoord2s( s, t );
-}
-static void APIENTRY logTexCoord2sv(const GLshort *v)
-{
-	SIG( "glTexCoord2sv" );
-	dllTexCoord2sv( v );
-}
-static void APIENTRY logTexCoord3d(GLdouble s, GLdouble t, GLdouble r)
-{
-	SIG( "glTexCoord3d" );
-	dllTexCoord3d( s, t, r );
-}
-static void APIENTRY logTexCoord3dv(const GLdouble *v)
-{
-	SIG( "glTexCoord3dv" );
-	dllTexCoord3dv( v );
-}
-static void APIENTRY logTexCoord3f(GLfloat s, GLfloat t, GLfloat r)
-{
-	SIG( "glTexCoord3f" );
-	dllTexCoord3f( s, t, r );
-}
-static void APIENTRY logTexCoord3fv(const GLfloat *v)
-{
-	SIG( "glTexCoord3fv" );
-	dllTexCoord3fv( v );
-}
-static void APIENTRY logTexCoord3i(GLint s, GLint t, GLint r)
-{
-	SIG( "glTexCoord3i" );
-	dllTexCoord3i( s, t, r );
-}
-static void APIENTRY logTexCoord3iv(const GLint *v)
-{
-	SIG( "glTexCoord3iv" );
-	dllTexCoord3iv( v );
-}
-static void APIENTRY logTexCoord3s(GLshort s, GLshort t, GLshort r)
-{
-	SIG( "glTexCoord3s" );
-	dllTexCoord3s( s, t, r );
-}
-static void APIENTRY logTexCoord3sv(const GLshort *v)
-{
-	SIG( "glTexCoord3sv" );
-	dllTexCoord3sv( v );
-}
-static void APIENTRY logTexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
-{
-	SIG( "glTexCoord4d" );
-	dllTexCoord4d( s, t, r, q );
-}
-static void APIENTRY logTexCoord4dv(const GLdouble *v)
-{
-	SIG( "glTexCoord4dv" );
-	dllTexCoord4dv( v );
-}
-static void APIENTRY logTexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
-{
-	SIG( "glTexCoord4f" );
-	dllTexCoord4f( s, t, r, q );
-}
-static void APIENTRY logTexCoord4fv(const GLfloat *v)
-{
-	SIG( "glTexCoord4fv" );
-	dllTexCoord4fv( v );
-}
-static void APIENTRY logTexCoord4i(GLint s, GLint t, GLint r, GLint q)
-{
-	SIG( "glTexCoord4i" );
-	dllTexCoord4i( s, t, r, q );
-}
-static void APIENTRY logTexCoord4iv(const GLint *v)
-{
-	SIG( "glTexCoord4iv" );
-	dllTexCoord4iv( v );
-}
-static void APIENTRY logTexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q)
-{
-	SIG( "glTexCoord4s" );
-	dllTexCoord4s( s, t, r, q );
-}
-static void APIENTRY logTexCoord4sv(const GLshort *v)
-{
-	SIG( "glTexCoord4sv" );
-	dllTexCoord4sv( v );
-}
-static void APIENTRY logTexCoordPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	fprintf( glw_state.log_fp, "glTexCoordPointer( %d, %s, %d, MEM )\n", size, TypeToString( type ), stride );
-	dllTexCoordPointer( size, type, stride, pointer );
-}
-
-static void APIENTRY logTexEnvf(GLenum target, GLenum pname, GLfloat param)
-{
-	fprintf( glw_state.log_fp, "glTexEnvf( 0x%x, 0x%x, %f )\n", target, pname, param );
-	dllTexEnvf( target, pname, param );
-}
-
-static void APIENTRY logTexEnvfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexEnvfv" );
-	dllTexEnvfv( target, pname, params );
-}
-
-static void APIENTRY logTexEnvi(GLenum target, GLenum pname, GLint param)
-{
-	fprintf( glw_state.log_fp, "glTexEnvi( 0x%x, 0x%x, 0x%x )\n", target, pname, param );
-	dllTexEnvi( target, pname, param );
-}
-static void APIENTRY logTexEnviv(GLenum target, GLenum pname, const GLint *params)
-{
-	SIG( "glTexEnviv" );
-	dllTexEnviv( target, pname, params );
-}
-
-static void APIENTRY logTexGend(GLenum coord, GLenum pname, GLdouble param)
-{
-	SIG( "glTexGend" );
-	dllTexGend( coord, pname, param );
-}
-
-static void APIENTRY logTexGendv(GLenum coord, GLenum pname, const GLdouble *params)
-{
-	SIG( "glTexGendv" );
-	dllTexGendv( coord, pname, params );
-}
-
-static void APIENTRY logTexGenf(GLenum coord, GLenum pname, GLfloat param)
-{
-	SIG( "glTexGenf" );
-	dllTexGenf( coord, pname, param );
-}
-static void APIENTRY logTexGenfv(GLenum coord, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexGenfv" );
-	dllTexGenfv( coord, pname, params );
-}
-static void APIENTRY logTexGeni(GLenum coord, GLenum pname, GLint param)
-{
-	SIG( "glTexGeni" );
-	dllTexGeni( coord, pname, param );
-}
-static void APIENTRY logTexGeniv(GLenum coord, GLenum pname, const GLint *params)
-{
-	SIG( "glTexGeniv" );
-	dllTexGeniv( coord, pname, params );
-}
-static void APIENTRY logTexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexImage1D" );
-	dllTexImage1D( target, level, internalformat, width, border, format, type, pixels );
-}
-static void APIENTRY logTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexImage2D" );
-	dllTexImage2D( target, level, internalformat, width, height, border, format, type, pixels );
-}
-
-static void APIENTRY logTexParameterf(GLenum target, GLenum pname, GLfloat param)
-{
-	fprintf( glw_state.log_fp, "glTexParameterf( 0x%x, 0x%x, %f )\n", target, pname, param );
-	dllTexParameterf( target, pname, param );
-}
-
-static void APIENTRY logTexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
-{
-	SIG( "glTexParameterfv" );
-	dllTexParameterfv( target, pname, params );
-}
-static void APIENTRY logTexParameteri(GLenum target, GLenum pname, GLint param)
-{
-	fprintf( glw_state.log_fp, "glTexParameteri( 0x%x, 0x%x, 0x%x )\n", target, pname, param );
-	dllTexParameteri( target, pname, param );
-}
-static void APIENTRY logTexParameteriv(GLenum target, GLenum pname, const GLint *params)
-{
-	SIG( "glTexParameteriv" );
-	dllTexParameteriv( target, pname, params );
-}
-static void APIENTRY logTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexSubImage1D" );
-	dllTexSubImage1D( target, level, xoffset, width, format, type, pixels );
-}
-static void APIENTRY logTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels)
-{
-	SIG( "glTexSubImage2D" );
-	dllTexSubImage2D( target, level, xoffset, yoffset, width, height, format, type, pixels );
-}
-static void APIENTRY logTranslated(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glTranslated" );
-	dllTranslated( x, y, z );
-}
-
-static void APIENTRY logTranslatef(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glTranslatef" );
-	dllTranslatef( x, y, z );
-}
-
-static void APIENTRY logVertex2d(GLdouble x, GLdouble y)
-{
-	SIG( "glVertex2d" );
-	dllVertex2d( x, y );
-}
-
-static void APIENTRY logVertex2dv(const GLdouble *v)
-{
-	SIG( "glVertex2dv" );
-	dllVertex2dv( v );
-}
-static void APIENTRY logVertex2f(GLfloat x, GLfloat y)
-{
-	SIG( "glVertex2f" );
-	dllVertex2f( x, y );
-}
-static void APIENTRY logVertex2fv(const GLfloat *v)
-{
-	SIG( "glVertex2fv" );
-	dllVertex2fv( v );
-}
-static void APIENTRY logVertex2i(GLint x, GLint y)
-{
-	SIG( "glVertex2i" );
-	dllVertex2i( x, y );
-}
-static void APIENTRY logVertex2iv(const GLint *v)
-{
-	SIG( "glVertex2iv" );
-	dllVertex2iv( v );
-}
-static void APIENTRY logVertex2s(GLshort x, GLshort y)
-{
-	SIG( "glVertex2s" );
-	dllVertex2s( x, y );
-}
-static void APIENTRY logVertex2sv(const GLshort *v)
-{
-	SIG( "glVertex2sv" );
-	dllVertex2sv( v );
-}
-static void APIENTRY logVertex3d(GLdouble x, GLdouble y, GLdouble z)
-{
-	SIG( "glVertex3d" );
-	dllVertex3d( x, y, z );
-}
-static void APIENTRY logVertex3dv(const GLdouble *v)
-{
-	SIG( "glVertex3dv" );
-	dllVertex3dv( v );
-}
-static void APIENTRY logVertex3f(GLfloat x, GLfloat y, GLfloat z)
-{
-	SIG( "glVertex3f" );
-	dllVertex3f( x, y, z );
-}
-static void APIENTRY logVertex3fv(const GLfloat *v)
-{
-	SIG( "glVertex3fv" );
-	dllVertex3fv( v );
-}
-static void APIENTRY logVertex3i(GLint x, GLint y, GLint z)
-{
-	SIG( "glVertex3i" );
-	dllVertex3i( x, y, z );
-}
-static void APIENTRY logVertex3iv(const GLint *v)
-{
-	SIG( "glVertex3iv" );
-	dllVertex3iv( v );
-}
-static void APIENTRY logVertex3s(GLshort x, GLshort y, GLshort z)
-{
-	SIG( "glVertex3s" );
-	dllVertex3s( x, y, z );
-}
-static void APIENTRY logVertex3sv(const GLshort *v)
-{
-	SIG( "glVertex3sv" );
-	dllVertex3sv( v );
-}
-static void APIENTRY logVertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-	SIG( "glVertex4d" );
-	dllVertex4d( x, y, z, w );
-}
-static void APIENTRY logVertex4dv(const GLdouble *v)
-{
-	SIG( "glVertex4dv" );
-	dllVertex4dv( v );
-}
-static void APIENTRY logVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-	SIG( "glVertex4f" );
-	dllVertex4f( x, y, z, w );
-}
-static void APIENTRY logVertex4fv(const GLfloat *v)
-{
-	SIG( "glVertex4fv" );
-	dllVertex4fv( v );
-}
-static void APIENTRY logVertex4i(GLint x, GLint y, GLint z, GLint w)
-{
-	SIG( "glVertex4i" );
-	dllVertex4i( x, y, z, w );
-}
-static void APIENTRY logVertex4iv(const GLint *v)
-{
-	SIG( "glVertex4iv" );
-	dllVertex4iv( v );
-}
-static void APIENTRY logVertex4s(GLshort x, GLshort y, GLshort z, GLshort w)
-{
-	SIG( "glVertex4s" );
-	dllVertex4s( x, y, z, w );
-}
-static void APIENTRY logVertex4sv(const GLshort *v)
-{
-	SIG( "glVertex4sv" );
-	dllVertex4sv( v );
-}
-static void APIENTRY logVertexPointer(GLint size, GLenum type, GLsizei stride, const void *pointer)
-{
-	fprintf( glw_state.log_fp, "glVertexPointer( %d, %s, %d, MEM )\n", size, TypeToString( type ), stride );
-	dllVertexPointer( size, type, stride, pointer );
-}
-static void APIENTRY logViewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-	fprintf( glw_state.log_fp, "glViewport( %d, %d, %d, %d )\n", x, y, width, height );
-	dllViewport( x, y, width, height );
-}
-
-/*
-** QGL_Shutdown
-**
-** Unloads the specified DLL then nulls out all the proc pointers.  This
-** is only called during a hard shutdown of the OGL subsystem (e.g. vid_restart).
-*/
-void QGL_Shutdown( void )
-{
-	ri.Printf( PRINT_ALL, "...shutting down QGL\n" );
-
-	if ( glw_state.hinstOpenGL )
-	{
-		ri.Printf( PRINT_ALL, "...unloading OpenGL DLL\n" );
-		FreeLibrary( glw_state.hinstOpenGL );
-	}
-
-	glw_state.hinstOpenGL = NULL;
-
-	qglAccum                     = NULL;
-	qglAlphaFunc                 = NULL;
-	qglAreTexturesResident       = NULL;
-	qglArrayElement              = NULL;
-	qglBegin                     = NULL;
-	qglBindTexture               = NULL;
-	qglBitmap                    = NULL;
-	qglBlendFunc                 = NULL;
-	qglCallList                  = NULL;
-	qglCallLists                 = NULL;
-	qglClear                     = NULL;
-	qglClearAccum                = NULL;
-	qglClearColor                = NULL;
-	qglClearDepth                = NULL;
-	qglClearIndex                = NULL;
-	qglClearStencil              = NULL;
-	qglClipPlane                 = NULL;
-	qglColor3b                   = NULL;
-	qglColor3bv                  = NULL;
-	qglColor3d                   = NULL;
-	qglColor3dv                  = NULL;
-	qglColor3f                   = NULL;
-	qglColor3fv                  = NULL;
-	qglColor3i                   = NULL;
-	qglColor3iv                  = NULL;
-	qglColor3s                   = NULL;
-	qglColor3sv                  = NULL;
-	qglColor3ub                  = NULL;
-	qglColor3ubv                 = NULL;
-	qglColor3ui                  = NULL;
-	qglColor3uiv                 = NULL;
-	qglColor3us                  = NULL;
-	qglColor3usv                 = NULL;
-	qglColor4b                   = NULL;
-	qglColor4bv                  = NULL;
-	qglColor4d                   = NULL;
-	qglColor4dv                  = NULL;
-	qglColor4f                   = NULL;
-	qglColor4fv                  = NULL;
-	qglColor4i                   = NULL;
-	qglColor4iv                  = NULL;
-	qglColor4s                   = NULL;
-	qglColor4sv                  = NULL;
-	qglColor4ub                  = NULL;
-	qglColor4ubv                 = NULL;
-	qglColor4ui                  = NULL;
-	qglColor4uiv                 = NULL;
-	qglColor4us                  = NULL;
-	qglColor4usv                 = NULL;
-	qglColorMask                 = NULL;
-	qglColorMaterial             = NULL;
-	qglColorPointer              = NULL;
-	qglCopyPixels                = NULL;
-	qglCopyTexImage1D            = NULL;
-	qglCopyTexImage2D            = NULL;
-	qglCopyTexSubImage1D         = NULL;
-	qglCopyTexSubImage2D         = NULL;
-	qglCullFace                  = NULL;
-	qglDeleteLists               = NULL;
-	qglDeleteTextures            = NULL;
-	qglDepthFunc                 = NULL;
-	qglDepthMask                 = NULL;
-	qglDepthRange                = NULL;
-	qglDisable                   = NULL;
-	qglDisableClientState        = NULL;
-	qglDrawArrays                = NULL;
-	qglDrawBuffer                = NULL;
-	qglDrawElements              = NULL;
-	qglDrawPixels                = NULL;
-	qglEdgeFlag                  = NULL;
-	qglEdgeFlagPointer           = NULL;
-	qglEdgeFlagv                 = NULL;
-	qglEnable                    = NULL;
-	qglEnableClientState         = NULL;
-	qglEnd                       = NULL;
-	qglEndList                   = NULL;
-	qglEvalCoord1d               = NULL;
-	qglEvalCoord1dv              = NULL;
-	qglEvalCoord1f               = NULL;
-	qglEvalCoord1fv              = NULL;
-	qglEvalCoord2d               = NULL;
-	qglEvalCoord2dv              = NULL;
-	qglEvalCoord2f               = NULL;
-	qglEvalCoord2fv              = NULL;
-	qglEvalMesh1                 = NULL;
-	qglEvalMesh2                 = NULL;
-	qglEvalPoint1                = NULL;
-	qglEvalPoint2                = NULL;
-	qglFeedbackBuffer            = NULL;
-	qglFinish                    = NULL;
-	qglFlush                     = NULL;
-	qglFogf                      = NULL;
-	qglFogfv                     = NULL;
-	qglFogi                      = NULL;
-	qglFogiv                     = NULL;
-	qglFrontFace                 = NULL;
-	qglFrustum                   = NULL;
-	qglGenLists                  = NULL;
-	qglGenTextures               = NULL;
-	qglGetBooleanv               = NULL;
-	qglGetClipPlane              = NULL;
-	qglGetDoublev                = NULL;
-	qglGetError                  = NULL;
-	qglGetFloatv                 = NULL;
-	qglGetIntegerv               = NULL;
-	qglGetLightfv                = NULL;
-	qglGetLightiv                = NULL;
-	qglGetMapdv                  = NULL;
-	qglGetMapfv                  = NULL;
-	qglGetMapiv                  = NULL;
-	qglGetMaterialfv             = NULL;
-	qglGetMaterialiv             = NULL;
-	qglGetPixelMapfv             = NULL;
-	qglGetPixelMapuiv            = NULL;
-	qglGetPixelMapusv            = NULL;
-	qglGetPointerv               = NULL;
-	qglGetPolygonStipple         = NULL;
-	qglGetString                 = NULL;
-	qglGetTexEnvfv               = NULL;
-	qglGetTexEnviv               = NULL;
-	qglGetTexGendv               = NULL;
-	qglGetTexGenfv               = NULL;
-	qglGetTexGeniv               = NULL;
-	qglGetTexImage               = NULL;
-	qglGetTexLevelParameterfv    = NULL;
-	qglGetTexLevelParameteriv    = NULL;
-	qglGetTexParameterfv         = NULL;
-	qglGetTexParameteriv         = NULL;
-	qglHint                      = NULL;
-	qglIndexMask                 = NULL;
-	qglIndexPointer              = NULL;
-	qglIndexd                    = NULL;
-	qglIndexdv                   = NULL;
-	qglIndexf                    = NULL;
-	qglIndexfv                   = NULL;
-	qglIndexi                    = NULL;
-	qglIndexiv                   = NULL;
-	qglIndexs                    = NULL;
-	qglIndexsv                   = NULL;
-	qglIndexub                   = NULL;
-	qglIndexubv                  = NULL;
-	qglInitNames                 = NULL;
-	qglInterleavedArrays         = NULL;
-	qglIsEnabled                 = NULL;
-	qglIsList                    = NULL;
-	qglIsTexture                 = NULL;
-	qglLightModelf               = NULL;
-	qglLightModelfv              = NULL;
-	qglLightModeli               = NULL;
-	qglLightModeliv              = NULL;
-	qglLightf                    = NULL;
-	qglLightfv                   = NULL;
-	qglLighti                    = NULL;
-	qglLightiv                   = NULL;
-	qglLineStipple               = NULL;
-	qglLineWidth                 = NULL;
-	qglListBase                  = NULL;
-	qglLoadIdentity              = NULL;
-	qglLoadMatrixd               = NULL;
-	qglLoadMatrixf               = NULL;
-	qglLoadName                  = NULL;
-	qglLogicOp                   = NULL;
-	qglMap1d                     = NULL;
-	qglMap1f                     = NULL;
-	qglMap2d                     = NULL;
-	qglMap2f                     = NULL;
-	qglMapGrid1d                 = NULL;
-	qglMapGrid1f                 = NULL;
-	qglMapGrid2d                 = NULL;
-	qglMapGrid2f                 = NULL;
-	qglMaterialf                 = NULL;
-	qglMaterialfv                = NULL;
-	qglMateriali                 = NULL;
-	qglMaterialiv                = NULL;
-	qglMatrixMode                = NULL;
-	qglMultMatrixd               = NULL;
-	qglMultMatrixf               = NULL;
-	qglNewList                   = NULL;
-	qglNormal3b                  = NULL;
-	qglNormal3bv                 = NULL;
-	qglNormal3d                  = NULL;
-	qglNormal3dv                 = NULL;
-	qglNormal3f                  = NULL;
-	qglNormal3fv                 = NULL;
-	qglNormal3i                  = NULL;
-	qglNormal3iv                 = NULL;
-	qglNormal3s                  = NULL;
-	qglNormal3sv                 = NULL;
-	qglNormalPointer             = NULL;
-	qglOrtho                     = NULL;
-	qglPassThrough               = NULL;
-	qglPixelMapfv                = NULL;
-	qglPixelMapuiv               = NULL;
-	qglPixelMapusv               = NULL;
-	qglPixelStoref               = NULL;
-	qglPixelStorei               = NULL;
-	qglPixelTransferf            = NULL;
-	qglPixelTransferi            = NULL;
-	qglPixelZoom                 = NULL;
-	qglPointSize                 = NULL;
-	qglPolygonMode               = NULL;
-	qglPolygonOffset             = NULL;
-	qglPolygonStipple            = NULL;
-	qglPopAttrib                 = NULL;
-	qglPopClientAttrib           = NULL;
-	qglPopMatrix                 = NULL;
-	qglPopName                   = NULL;
-	qglPrioritizeTextures        = NULL;
-	qglPushAttrib                = NULL;
-	qglPushClientAttrib          = NULL;
-	qglPushMatrix                = NULL;
-	qglPushName                  = NULL;
-	qglRasterPos2d               = NULL;
-	qglRasterPos2dv              = NULL;
-	qglRasterPos2f               = NULL;
-	qglRasterPos2fv              = NULL;
-	qglRasterPos2i               = NULL;
-	qglRasterPos2iv              = NULL;
-	qglRasterPos2s               = NULL;
-	qglRasterPos2sv              = NULL;
-	qglRasterPos3d               = NULL;
-	qglRasterPos3dv              = NULL;
-	qglRasterPos3f               = NULL;
-	qglRasterPos3fv              = NULL;
-	qglRasterPos3i               = NULL;
-	qglRasterPos3iv              = NULL;
-	qglRasterPos3s               = NULL;
-	qglRasterPos3sv              = NULL;
-	qglRasterPos4d               = NULL;
-	qglRasterPos4dv              = NULL;
-	qglRasterPos4f               = NULL;
-	qglRasterPos4fv              = NULL;
-	qglRasterPos4i               = NULL;
-	qglRasterPos4iv              = NULL;
-	qglRasterPos4s               = NULL;
-	qglRasterPos4sv              = NULL;
-	qglReadBuffer                = NULL;
-	qglReadPixels                = NULL;
-	qglRectd                     = NULL;
-	qglRectdv                    = NULL;
-	qglRectf                     = NULL;
-	qglRectfv                    = NULL;
-	qglRecti                     = NULL;
-	qglRectiv                    = NULL;
-	qglRects                     = NULL;
-	qglRectsv                    = NULL;
-	qglRenderMode                = NULL;
-	qglRotated                   = NULL;
-	qglRotatef                   = NULL;
-	qglScaled                    = NULL;
-	qglScalef                    = NULL;
-	qglScissor                   = NULL;
-	qglSelectBuffer              = NULL;
-	qglShadeModel                = NULL;
-	qglStencilFunc               = NULL;
-	qglStencilMask               = NULL;
-	qglStencilOp                 = NULL;
-	qglTexCoord1d                = NULL;
-	qglTexCoord1dv               = NULL;
-	qglTexCoord1f                = NULL;
-	qglTexCoord1fv               = NULL;
-	qglTexCoord1i                = NULL;
-	qglTexCoord1iv               = NULL;
-	qglTexCoord1s                = NULL;
-	qglTexCoord1sv               = NULL;
-	qglTexCoord2d                = NULL;
-	qglTexCoord2dv               = NULL;
-	qglTexCoord2f                = NULL;
-	qglTexCoord2fv               = NULL;
-	qglTexCoord2i                = NULL;
-	qglTexCoord2iv               = NULL;
-	qglTexCoord2s                = NULL;
-	qglTexCoord2sv               = NULL;
-	qglTexCoord3d                = NULL;
-	qglTexCoord3dv               = NULL;
-	qglTexCoord3f                = NULL;
-	qglTexCoord3fv               = NULL;
-	qglTexCoord3i                = NULL;
-	qglTexCoord3iv               = NULL;
-	qglTexCoord3s                = NULL;
-	qglTexCoord3sv               = NULL;
-	qglTexCoord4d                = NULL;
-	qglTexCoord4dv               = NULL;
-	qglTexCoord4f                = NULL;
-	qglTexCoord4fv               = NULL;
-	qglTexCoord4i                = NULL;
-	qglTexCoord4iv               = NULL;
-	qglTexCoord4s                = NULL;
-	qglTexCoord4sv               = NULL;
-	qglTexCoordPointer           = NULL;
-	qglTexEnvf                   = NULL;
-	qglTexEnvfv                  = NULL;
-	qglTexEnvi                   = NULL;
-	qglTexEnviv                  = NULL;
-	qglTexGend                   = NULL;
-	qglTexGendv                  = NULL;
-	qglTexGenf                   = NULL;
-	qglTexGenfv                  = NULL;
-	qglTexGeni                   = NULL;
-	qglTexGeniv                  = NULL;
-	qglTexImage1D                = NULL;
-	qglTexImage2D                = NULL;
-	qglTexParameterf             = NULL;
-	qglTexParameterfv            = NULL;
-	qglTexParameteri             = NULL;
-	qglTexParameteriv            = NULL;
-	qglTexSubImage1D             = NULL;
-	qglTexSubImage2D             = NULL;
-	qglTranslated                = NULL;
-	qglTranslatef                = NULL;
-	qglVertex2d                  = NULL;
-	qglVertex2dv                 = NULL;
-	qglVertex2f                  = NULL;
-	qglVertex2fv                 = NULL;
-	qglVertex2i                  = NULL;
-	qglVertex2iv                 = NULL;
-	qglVertex2s                  = NULL;
-	qglVertex2sv                 = NULL;
-	qglVertex3d                  = NULL;
-	qglVertex3dv                 = NULL;
-	qglVertex3f                  = NULL;
-	qglVertex3fv                 = NULL;
-	qglVertex3i                  = NULL;
-	qglVertex3iv                 = NULL;
-	qglVertex3s                  = NULL;
-	qglVertex3sv                 = NULL;
-	qglVertex4d                  = NULL;
-	qglVertex4dv                 = NULL;
-	qglVertex4f                  = NULL;
-	qglVertex4fv                 = NULL;
-	qglVertex4i                  = NULL;
-	qglVertex4iv                 = NULL;
-	qglVertex4s                  = NULL;
-	qglVertex4sv                 = NULL;
-	qglVertexPointer             = NULL;
-	qglViewport                  = NULL;
-
-	qglCompressedTexImage3DARB    = NULL;
-	qglCompressedTexImage2DARB    = NULL;
-	qglCompressedTexSubImage3DARB = NULL;
-	qglCompressedTexSubImage2DARB = NULL;
-	qglGetCompressedTexImageARB   = NULL;
-
-	qwglCopyContext              = NULL;
-	qwglCreateContext            = NULL;
-	qwglCreateLayerContext       = NULL;
-	qwglDeleteContext            = NULL;
-	qwglDescribeLayerPlane       = NULL;
-	qwglGetCurrentContext        = NULL;
-	qwglGetCurrentDC             = NULL;
-	qwglGetLayerPaletteEntries   = NULL;
-	qwglGetProcAddress           = NULL;
-	qwglMakeCurrent              = NULL;
-	qwglRealizeLayerPalette      = NULL;
-	qwglSetLayerPaletteEntries   = NULL;
-	qwglShareLists               = NULL;
-	qwglSwapLayerBuffers         = NULL;
-	qwglUseFontBitmaps           = NULL;
-	qwglUseFontOutlines          = NULL;
-
-	qwglChoosePixelFormat        = NULL;
-	qwglDescribePixelFormat      = NULL;
-	qwglGetPixelFormat           = NULL;
-	qwglSetPixelFormat           = NULL;
-	qwglSwapBuffers              = NULL;
-}
-
-#define GR_NUM_BOARDS 0x0f
-
-static qboolean GlideIsValid( void )
-{
-	HMODULE hGlide;
-//	int numBoards;
-//	void (__stdcall *grGet)(unsigned int, unsigned int, int*);
-
-    if ( ( hGlide = LoadLibrary("Glide3X") ) != 0 ) 
-	{
-		// FIXME: 3Dfx needs to fix this shit
-		return qtrue;
-
-#if 0
-        grGet = (void *)GetProcAddress( hGlide, "_grGet@12");
-
-		if ( grGet )
-		{
-	        grGet( GR_NUM_BOARDS, sizeof(int), &numBoards);
-		}
-		else
-		{
-			// if we've reached this point, something is seriously wrong
-			ri.Printf( PRINT_WARNING, "WARNING: could not find grGet in GLIDE3X.DLL\n" );
-			numBoards = 0;
-		}
-
-		FreeLibrary( hGlide );
-		hGlide = NULL;
-
-		if ( numBoards > 0 )
-		{
-			return qtrue;
-		}
-
-		ri.Printf( PRINT_WARNING, "WARNING: invalid Glide installation!\n" );
-#endif
-    }
-
-	return qfalse;
-} 
-
-#	pragma warning (disable : 4113 4133 4047 )
-#	define GPA( a ) GetProcAddress( glw_state.hinstOpenGL, a )
-
-/*
-** QGL_Init
-**
-** This is responsible for binding our qgl function pointers to 
-** the appropriate GL stuff.  In Windows this means doing a 
-** LoadLibrary and a bunch of calls to GetProcAddress.  On other
-** operating systems we need to do the right thing, whatever that
-** might be.
-*/
-qboolean QGL_Init( const char *dllname )
-{
-	char systemDir[1024];
-	char libName[1024];
-
-	GetSystemDirectory( systemDir, sizeof( systemDir ) );
-
-	assert( glw_state.hinstOpenGL == 0 );
-
-	ri.Printf( PRINT_ALL, "...initializing QGL\n" );
-
-	// NOTE: this assumes that 'dllname' is lower case (and it should be)!
-	if ( strstr( dllname, _3DFX_DRIVER_NAME ) )
-	{
-		if ( !GlideIsValid() )
-		{
-			ri.Printf( PRINT_ALL, "...WARNING: missing Glide installation, assuming no 3Dfx available\n" );
-			return qfalse;
-		}
-	}
-
-	if ( dllname[0] != '!' )
-	{
-		Com_sprintf( libName, sizeof( libName ), "%s\\%s", systemDir, dllname );
-	}
-	else
-	{
-		Q_strncpyz( libName, dllname, sizeof( libName ) );
-	}
-
-	ri.Printf( PRINT_ALL, "...calling LoadLibrary( '%s.dll' ): ", libName );
-
-	if ( ( glw_state.hinstOpenGL = LoadLibrary( dllname ) ) == 0 )
-	{
-		ri.Printf( PRINT_ALL, "failed\n" );
-		return qfalse;
-	}
-	ri.Printf( PRINT_ALL, "succeeded\n" );
-
-	qglAccum                     = dllAccum = GPA( "glAccum" );
-	qglAlphaFunc                 = dllAlphaFunc = GPA( "glAlphaFunc" );
-	qglAreTexturesResident       = dllAreTexturesResident = GPA( "glAreTexturesResident" );
-	qglArrayElement              = dllArrayElement = GPA( "glArrayElement" );
-	qglBegin                     = dllBegin = GPA( "glBegin" );
-	qglBindTexture               = dllBindTexture = GPA( "glBindTexture" );
-	qglBitmap                    = dllBitmap = GPA( "glBitmap" );
-	qglBlendFunc                 = dllBlendFunc = GPA( "glBlendFunc" );
-	qglCallList                  = dllCallList = GPA( "glCallList" );
-	qglCallLists                 = dllCallLists = GPA( "glCallLists" );
-	qglClear                     = dllClear = GPA( "glClear" );
-	qglClearAccum                = dllClearAccum = GPA( "glClearAccum" );
-	qglClearColor                = dllClearColor = GPA( "glClearColor" );
-	qglClearDepth                = dllClearDepth = GPA( "glClearDepth" );
-	qglClearIndex                = dllClearIndex = GPA( "glClearIndex" );
-	qglClearStencil              = dllClearStencil = GPA( "glClearStencil" );
-	qglClipPlane                 = dllClipPlane = GPA( "glClipPlane" );
-	qglColor3b                   = dllColor3b = GPA( "glColor3b" );
-	qglColor3bv                  = dllColor3bv = GPA( "glColor3bv" );
-	qglColor3d                   = dllColor3d = GPA( "glColor3d" );
-	qglColor3dv                  = dllColor3dv = GPA( "glColor3dv" );
-	qglColor3f                   = dllColor3f = GPA( "glColor3f" );
-	qglColor3fv                  = dllColor3fv = GPA( "glColor3fv" );
-	qglColor3i                   = dllColor3i = GPA( "glColor3i" );
-	qglColor3iv                  = dllColor3iv = GPA( "glColor3iv" );
-	qglColor3s                   = dllColor3s = GPA( "glColor3s" );
-	qglColor3sv                  = dllColor3sv = GPA( "glColor3sv" );
-	qglColor3ub                  = dllColor3ub = GPA( "glColor3ub" );
-	qglColor3ubv                 = dllColor3ubv = GPA( "glColor3ubv" );
-	qglColor3ui                  = dllColor3ui = GPA( "glColor3ui" );
-	qglColor3uiv                 = dllColor3uiv = GPA( "glColor3uiv" );
-	qglColor3us                  = dllColor3us = GPA( "glColor3us" );
-	qglColor3usv                 = dllColor3usv = GPA( "glColor3usv" );
-	qglColor4b                   = dllColor4b = GPA( "glColor4b" );
-	qglColor4bv                  = dllColor4bv = GPA( "glColor4bv" );
-	qglColor4d                   = dllColor4d = GPA( "glColor4d" );
-	qglColor4dv                  = dllColor4dv = GPA( "glColor4dv" );
-	qglColor4f                   = dllColor4f = GPA( "glColor4f" );
-	qglColor4fv                  = dllColor4fv = GPA( "glColor4fv" );
-	qglColor4i                   = dllColor4i = GPA( "glColor4i" );
-	qglColor4iv                  = dllColor4iv = GPA( "glColor4iv" );
-	qglColor4s                   = dllColor4s = GPA( "glColor4s" );
-	qglColor4sv                  = dllColor4sv = GPA( "glColor4sv" );
-	qglColor4ub                  = dllColor4ub = GPA( "glColor4ub" );
-	qglColor4ubv                 = dllColor4ubv = GPA( "glColor4ubv" );
-	qglColor4ui                  = dllColor4ui = GPA( "glColor4ui" );
-	qglColor4uiv                 = dllColor4uiv = GPA( "glColor4uiv" );
-	qglColor4us                  = dllColor4us = GPA( "glColor4us" );
-	qglColor4usv                 = dllColor4usv = GPA( "glColor4usv" );
-	qglColorMask                 = dllColorMask = GPA( "glColorMask" );
-	qglColorMaterial             = dllColorMaterial = GPA( "glColorMaterial" );
-	qglColorPointer              = dllColorPointer = GPA( "glColorPointer" );
-	qglCopyPixels                = dllCopyPixels = GPA( "glCopyPixels" );
-	qglCopyTexImage1D            = dllCopyTexImage1D = GPA( "glCopyTexImage1D" );
-	qglCopyTexImage2D            = dllCopyTexImage2D = GPA( "glCopyTexImage2D" );
-	qglCopyTexSubImage1D         = dllCopyTexSubImage1D = GPA( "glCopyTexSubImage1D" );
-	qglCopyTexSubImage2D         = dllCopyTexSubImage2D = GPA( "glCopyTexSubImage2D" );
-	qglCullFace                  = dllCullFace = GPA( "glCullFace" );
-	qglDeleteLists               = dllDeleteLists = GPA( "glDeleteLists" );
-	qglDeleteTextures            = dllDeleteTextures = GPA( "glDeleteTextures" );
-	qglDepthFunc                 = dllDepthFunc = GPA( "glDepthFunc" );
-	qglDepthMask                 = dllDepthMask = GPA( "glDepthMask" );
-	qglDepthRange                = dllDepthRange = GPA( "glDepthRange" );
-	qglDisable                   = dllDisable = GPA( "glDisable" );
-	qglDisableClientState        = dllDisableClientState = GPA( "glDisableClientState" );
-	qglDrawArrays                = dllDrawArrays = GPA( "glDrawArrays" );
-	qglDrawBuffer                = dllDrawBuffer = GPA( "glDrawBuffer" );
-	qglDrawElements              = dllDrawElements = GPA( "glDrawElements" );
-	qglDrawPixels                = dllDrawPixels = GPA( "glDrawPixels" );
-	qglEdgeFlag                  = dllEdgeFlag = GPA( "glEdgeFlag" );
-	qglEdgeFlagPointer           = dllEdgeFlagPointer = GPA( "glEdgeFlagPointer" );
-	qglEdgeFlagv                 = dllEdgeFlagv = GPA( "glEdgeFlagv" );
-	qglEnable                    = 	dllEnable                    = GPA( "glEnable" );
-	qglEnableClientState         = 	dllEnableClientState         = GPA( "glEnableClientState" );
-	qglEnd                       = 	dllEnd                       = GPA( "glEnd" );
-	qglEndList                   = 	dllEndList                   = GPA( "glEndList" );
-	qglEvalCoord1d				 = 	dllEvalCoord1d				 = GPA( "glEvalCoord1d" );
-	qglEvalCoord1dv              = 	dllEvalCoord1dv              = GPA( "glEvalCoord1dv" );
-	qglEvalCoord1f               = 	dllEvalCoord1f               = GPA( "glEvalCoord1f" );
-	qglEvalCoord1fv              = 	dllEvalCoord1fv              = GPA( "glEvalCoord1fv" );
-	qglEvalCoord2d               = 	dllEvalCoord2d               = GPA( "glEvalCoord2d" );
-	qglEvalCoord2dv              = 	dllEvalCoord2dv              = GPA( "glEvalCoord2dv" );
-	qglEvalCoord2f               = 	dllEvalCoord2f               = GPA( "glEvalCoord2f" );
-	qglEvalCoord2fv              = 	dllEvalCoord2fv              = GPA( "glEvalCoord2fv" );
-	qglEvalMesh1                 = 	dllEvalMesh1                 = GPA( "glEvalMesh1" );
-	qglEvalMesh2                 = 	dllEvalMesh2                 = GPA( "glEvalMesh2" );
-	qglEvalPoint1                = 	dllEvalPoint1                = GPA( "glEvalPoint1" );
-	qglEvalPoint2                = 	dllEvalPoint2                = GPA( "glEvalPoint2" );
-	qglFeedbackBuffer            = 	dllFeedbackBuffer            = GPA( "glFeedbackBuffer" );
-	qglFinish                    = 	dllFinish                    = GPA( "glFinish" );
-	qglFlush                     = 	dllFlush                     = GPA( "glFlush" );
-	qglFogf                      = 	dllFogf                      = GPA( "glFogf" );
-	qglFogfv                     = 	dllFogfv                     = GPA( "glFogfv" );
-	qglFogi                      = 	dllFogi                      = GPA( "glFogi" );
-	qglFogiv                     = 	dllFogiv                     = GPA( "glFogiv" );
-	qglFrontFace                 = 	dllFrontFace                 = GPA( "glFrontFace" );
-	qglFrustum                   = 	dllFrustum                   = GPA( "glFrustum" );
-	qglGenLists                  = 	dllGenLists                  = ( GLuint (__stdcall * )(int) ) GPA( "glGenLists" );
-	qglGenTextures               = 	dllGenTextures               = GPA( "glGenTextures" );
-	qglGetBooleanv               = 	dllGetBooleanv               = GPA( "glGetBooleanv" );
-	qglGetClipPlane              = 	dllGetClipPlane              = GPA( "glGetClipPlane" );
-	qglGetDoublev                = 	dllGetDoublev                = GPA( "glGetDoublev" );
-	qglGetError                  = 	dllGetError                  = ( GLenum (__stdcall * )(void) ) GPA( "glGetError" );
-	qglGetFloatv                 = 	dllGetFloatv                 = GPA( "glGetFloatv" );
-	qglGetIntegerv               = 	dllGetIntegerv               = GPA( "glGetIntegerv" );
-	qglGetLightfv                = 	dllGetLightfv                = GPA( "glGetLightfv" );
-	qglGetLightiv                = 	dllGetLightiv                = GPA( "glGetLightiv" );
-	qglGetMapdv                  = 	dllGetMapdv                  = GPA( "glGetMapdv" );
-	qglGetMapfv                  = 	dllGetMapfv                  = GPA( "glGetMapfv" );
-	qglGetMapiv                  = 	dllGetMapiv                  = GPA( "glGetMapiv" );
-	qglGetMaterialfv             = 	dllGetMaterialfv             = GPA( "glGetMaterialfv" );
-	qglGetMaterialiv             = 	dllGetMaterialiv             = GPA( "glGetMaterialiv" );
-	qglGetPixelMapfv             = 	dllGetPixelMapfv             = GPA( "glGetPixelMapfv" );
-	qglGetPixelMapuiv            = 	dllGetPixelMapuiv            = GPA( "glGetPixelMapuiv" );
-	qglGetPixelMapusv            = 	dllGetPixelMapusv            = GPA( "glGetPixelMapusv" );
-	qglGetPointerv               = 	dllGetPointerv               = GPA( "glGetPointerv" );
-	qglGetPolygonStipple         = 	dllGetPolygonStipple         = GPA( "glGetPolygonStipple" );
-	qglGetString                 = 	dllGetString                 = GPA( "glGetString" );
-	qglGetTexEnvfv               = 	dllGetTexEnvfv               = GPA( "glGetTexEnvfv" );
-	qglGetTexEnviv               = 	dllGetTexEnviv               = GPA( "glGetTexEnviv" );
-	qglGetTexGendv               = 	dllGetTexGendv               = GPA( "glGetTexGendv" );
-	qglGetTexGenfv               = 	dllGetTexGenfv               = GPA( "glGetTexGenfv" );
-	qglGetTexGeniv               = 	dllGetTexGeniv               = GPA( "glGetTexGeniv" );
-	qglGetTexImage               = 	dllGetTexImage               = GPA( "glGetTexImage" );
-	qglGetTexParameterfv         = 	dllGetTexParameterfv         = GPA( "glGetTexParameterfv" );
-	qglGetTexParameteriv         = 	dllGetTexParameteriv         = GPA( "glGetTexParameteriv" );
-	qglHint                      = 	dllHint                      = GPA( "glHint" );
-	qglIndexMask                 = 	dllIndexMask                 = GPA( "glIndexMask" );
-	qglIndexPointer              = 	dllIndexPointer              = GPA( "glIndexPointer" );
-	qglIndexd                    = 	dllIndexd                    = GPA( "glIndexd" );
-	qglIndexdv                   = 	dllIndexdv                   = GPA( "glIndexdv" );
-	qglIndexf                    = 	dllIndexf                    = GPA( "glIndexf" );
-	qglIndexfv                   = 	dllIndexfv                   = GPA( "glIndexfv" );
-	qglIndexi                    = 	dllIndexi                    = GPA( "glIndexi" );
-	qglIndexiv                   = 	dllIndexiv                   = GPA( "glIndexiv" );
-	qglIndexs                    = 	dllIndexs                    = GPA( "glIndexs" );
-	qglIndexsv                   = 	dllIndexsv                   = GPA( "glIndexsv" );
-	qglIndexub                   = 	dllIndexub                   = GPA( "glIndexub" );
-	qglIndexubv                  = 	dllIndexubv                  = GPA( "glIndexubv" );
-	qglInitNames                 = 	dllInitNames                 = GPA( "glInitNames" );
-	qglInterleavedArrays         = 	dllInterleavedArrays         = GPA( "glInterleavedArrays" );
-	qglIsEnabled                 = 	dllIsEnabled                 = GPA( "glIsEnabled" );
-	qglIsList                    = 	dllIsList                    = GPA( "glIsList" );
-	qglIsTexture                 = 	dllIsTexture                 = GPA( "glIsTexture" );
-	qglLightModelf               = 	dllLightModelf               = GPA( "glLightModelf" );
-	qglLightModelfv              = 	dllLightModelfv              = GPA( "glLightModelfv" );
-	qglLightModeli               = 	dllLightModeli               = GPA( "glLightModeli" );
-	qglLightModeliv              = 	dllLightModeliv              = GPA( "glLightModeliv" );
-	qglLightf                    = 	dllLightf                    = GPA( "glLightf" );
-	qglLightfv                   = 	dllLightfv                   = GPA( "glLightfv" );
-	qglLighti                    = 	dllLighti                    = GPA( "glLighti" );
-	qglLightiv                   = 	dllLightiv                   = GPA( "glLightiv" );
-	qglLineStipple               = 	dllLineStipple               = GPA( "glLineStipple" );
-	qglLineWidth                 = 	dllLineWidth                 = GPA( "glLineWidth" );
-	qglListBase                  = 	dllListBase                  = GPA( "glListBase" );
-	qglLoadIdentity              = 	dllLoadIdentity              = GPA( "glLoadIdentity" );
-	qglLoadMatrixd               = 	dllLoadMatrixd               = GPA( "glLoadMatrixd" );
-	qglLoadMatrixf               = 	dllLoadMatrixf               = GPA( "glLoadMatrixf" );
-	qglLoadName                  = 	dllLoadName                  = GPA( "glLoadName" );
-	qglLogicOp                   = 	dllLogicOp                   = GPA( "glLogicOp" );
-	qglMap1d                     = 	dllMap1d                     = GPA( "glMap1d" );
-	qglMap1f                     = 	dllMap1f                     = GPA( "glMap1f" );
-	qglMap2d                     = 	dllMap2d                     = GPA( "glMap2d" );
-	qglMap2f                     = 	dllMap2f                     = GPA( "glMap2f" );
-	qglMapGrid1d                 = 	dllMapGrid1d                 = GPA( "glMapGrid1d" );
-	qglMapGrid1f                 = 	dllMapGrid1f                 = GPA( "glMapGrid1f" );
-	qglMapGrid2d                 = 	dllMapGrid2d                 = GPA( "glMapGrid2d" );
-	qglMapGrid2f                 = 	dllMapGrid2f                 = GPA( "glMapGrid2f" );
-	qglMaterialf                 = 	dllMaterialf                 = GPA( "glMaterialf" );
-	qglMaterialfv                = 	dllMaterialfv                = GPA( "glMaterialfv" );
-	qglMateriali                 = 	dllMateriali                 = GPA( "glMateriali" );
-	qglMaterialiv                = 	dllMaterialiv                = GPA( "glMaterialiv" );
-	qglMatrixMode                = 	dllMatrixMode                = GPA( "glMatrixMode" );
-	qglMultMatrixd               = 	dllMultMatrixd               = GPA( "glMultMatrixd" );
-	qglMultMatrixf               = 	dllMultMatrixf               = GPA( "glMultMatrixf" );
-	qglNewList                   = 	dllNewList                   = GPA( "glNewList" );
-	qglNormal3b                  = 	dllNormal3b                  = GPA( "glNormal3b" );
-	qglNormal3bv                 = 	dllNormal3bv                 = GPA( "glNormal3bv" );
-	qglNormal3d                  = 	dllNormal3d                  = GPA( "glNormal3d" );
-	qglNormal3dv                 = 	dllNormal3dv                 = GPA( "glNormal3dv" );
-	qglNormal3f                  = 	dllNormal3f                  = GPA( "glNormal3f" );
-	qglNormal3fv                 = 	dllNormal3fv                 = GPA( "glNormal3fv" );
-	qglNormal3i                  = 	dllNormal3i                  = GPA( "glNormal3i" );
-	qglNormal3iv                 = 	dllNormal3iv                 = GPA( "glNormal3iv" );
-	qglNormal3s                  = 	dllNormal3s                  = GPA( "glNormal3s" );
-	qglNormal3sv                 = 	dllNormal3sv                 = GPA( "glNormal3sv" );
-	qglNormalPointer             = 	dllNormalPointer             = GPA( "glNormalPointer" );
-	qglOrtho                     = 	dllOrtho                     = GPA( "glOrtho" );
-	qglPassThrough               = 	dllPassThrough               = GPA( "glPassThrough" );
-	qglPixelMapfv                = 	dllPixelMapfv                = GPA( "glPixelMapfv" );
-	qglPixelMapuiv               = 	dllPixelMapuiv               = GPA( "glPixelMapuiv" );
-	qglPixelMapusv               = 	dllPixelMapusv               = GPA( "glPixelMapusv" );
-	qglPixelStoref               = 	dllPixelStoref               = GPA( "glPixelStoref" );
-	qglPixelStorei               = 	dllPixelStorei               = GPA( "glPixelStorei" );
-	qglPixelTransferf            = 	dllPixelTransferf            = GPA( "glPixelTransferf" );
-	qglPixelTransferi            = 	dllPixelTransferi            = GPA( "glPixelTransferi" );
-	qglPixelZoom                 = 	dllPixelZoom                 = GPA( "glPixelZoom" );
-	qglPointSize                 = 	dllPointSize                 = GPA( "glPointSize" );
-	qglPolygonMode               = 	dllPolygonMode               = GPA( "glPolygonMode" );
-	qglPolygonOffset             = 	dllPolygonOffset             = GPA( "glPolygonOffset" );
-	qglPolygonStipple            = 	dllPolygonStipple            = GPA( "glPolygonStipple" );
-	qglPopAttrib                 = 	dllPopAttrib                 = GPA( "glPopAttrib" );
-	qglPopClientAttrib           = 	dllPopClientAttrib           = GPA( "glPopClientAttrib" );
-	qglPopMatrix                 = 	dllPopMatrix                 = GPA( "glPopMatrix" );
-	qglPopName                   = 	dllPopName                   = GPA( "glPopName" );
-	qglPrioritizeTextures        = 	dllPrioritizeTextures        = GPA( "glPrioritizeTextures" );
-	qglPushAttrib                = 	dllPushAttrib                = GPA( "glPushAttrib" );
-	qglPushClientAttrib          = 	dllPushClientAttrib          = GPA( "glPushClientAttrib" );
-	qglPushMatrix                = 	dllPushMatrix                = GPA( "glPushMatrix" );
-	qglPushName                  = 	dllPushName                  = GPA( "glPushName" );
-	qglRasterPos2d               = 	dllRasterPos2d               = GPA( "glRasterPos2d" );
-	qglRasterPos2dv              = 	dllRasterPos2dv              = GPA( "glRasterPos2dv" );
-	qglRasterPos2f               = 	dllRasterPos2f               = GPA( "glRasterPos2f" );
-	qglRasterPos2fv              = 	dllRasterPos2fv              = GPA( "glRasterPos2fv" );
-	qglRasterPos2i               = 	dllRasterPos2i               = GPA( "glRasterPos2i" );
-	qglRasterPos2iv              = 	dllRasterPos2iv              = GPA( "glRasterPos2iv" );
-	qglRasterPos2s               = 	dllRasterPos2s               = GPA( "glRasterPos2s" );
-	qglRasterPos2sv              = 	dllRasterPos2sv              = GPA( "glRasterPos2sv" );
-	qglRasterPos3d               = 	dllRasterPos3d               = GPA( "glRasterPos3d" );
-	qglRasterPos3dv              = 	dllRasterPos3dv              = GPA( "glRasterPos3dv" );
-	qglRasterPos3f               = 	dllRasterPos3f               = GPA( "glRasterPos3f" );
-	qglRasterPos3fv              = 	dllRasterPos3fv              = GPA( "glRasterPos3fv" );
-	qglRasterPos3i               = 	dllRasterPos3i               = GPA( "glRasterPos3i" );
-	qglRasterPos3iv              = 	dllRasterPos3iv              = GPA( "glRasterPos3iv" );
-	qglRasterPos3s               = 	dllRasterPos3s               = GPA( "glRasterPos3s" );
-	qglRasterPos3sv              = 	dllRasterPos3sv              = GPA( "glRasterPos3sv" );
-	qglRasterPos4d               = 	dllRasterPos4d               = GPA( "glRasterPos4d" );
-	qglRasterPos4dv              = 	dllRasterPos4dv              = GPA( "glRasterPos4dv" );
-	qglRasterPos4f               = 	dllRasterPos4f               = GPA( "glRasterPos4f" );
-	qglRasterPos4fv              = 	dllRasterPos4fv              = GPA( "glRasterPos4fv" );
-	qglRasterPos4i               = 	dllRasterPos4i               = GPA( "glRasterPos4i" );
-	qglRasterPos4iv              = 	dllRasterPos4iv              = GPA( "glRasterPos4iv" );
-	qglRasterPos4s               = 	dllRasterPos4s               = GPA( "glRasterPos4s" );
-	qglRasterPos4sv              = 	dllRasterPos4sv              = GPA( "glRasterPos4sv" );
-	qglReadBuffer                = 	dllReadBuffer                = GPA( "glReadBuffer" );
-	qglReadPixels                = 	dllReadPixels                = GPA( "glReadPixels" );
-	qglRectd                     = 	dllRectd                     = GPA( "glRectd" );
-	qglRectdv                    = 	dllRectdv                    = GPA( "glRectdv" );
-	qglRectf                     = 	dllRectf                     = GPA( "glRectf" );
-	qglRectfv                    = 	dllRectfv                    = GPA( "glRectfv" );
-	qglRecti                     = 	dllRecti                     = GPA( "glRecti" );
-	qglRectiv                    = 	dllRectiv                    = GPA( "glRectiv" );
-	qglRects                     = 	dllRects                     = GPA( "glRects" );
-	qglRectsv                    = 	dllRectsv                    = GPA( "glRectsv" );
-	qglRenderMode                = 	dllRenderMode                = GPA( "glRenderMode" );
-	qglRotated                   = 	dllRotated                   = GPA( "glRotated" );
-	qglRotatef                   = 	dllRotatef                   = GPA( "glRotatef" );
-	qglScaled                    = 	dllScaled                    = GPA( "glScaled" );
-	qglScalef                    = 	dllScalef                    = GPA( "glScalef" );
-	qglScissor                   = 	dllScissor                   = GPA( "glScissor" );
-	qglSelectBuffer              = 	dllSelectBuffer              = GPA( "glSelectBuffer" );
-	qglShadeModel                = 	dllShadeModel                = GPA( "glShadeModel" );
-	qglStencilFunc               = 	dllStencilFunc               = GPA( "glStencilFunc" );
-	qglStencilMask               = 	dllStencilMask               = GPA( "glStencilMask" );
-	qglStencilOp                 = 	dllStencilOp                 = GPA( "glStencilOp" );
-	qglTexCoord1d                = 	dllTexCoord1d                = GPA( "glTexCoord1d" );
-	qglTexCoord1dv               = 	dllTexCoord1dv               = GPA( "glTexCoord1dv" );
-	qglTexCoord1f                = 	dllTexCoord1f                = GPA( "glTexCoord1f" );
-	qglTexCoord1fv               = 	dllTexCoord1fv               = GPA( "glTexCoord1fv" );
-	qglTexCoord1i                = 	dllTexCoord1i                = GPA( "glTexCoord1i" );
-	qglTexCoord1iv               = 	dllTexCoord1iv               = GPA( "glTexCoord1iv" );
-	qglTexCoord1s                = 	dllTexCoord1s                = GPA( "glTexCoord1s" );
-	qglTexCoord1sv               = 	dllTexCoord1sv               = GPA( "glTexCoord1sv" );
-	qglTexCoord2d                = 	dllTexCoord2d                = GPA( "glTexCoord2d" );
-	qglTexCoord2dv               = 	dllTexCoord2dv               = GPA( "glTexCoord2dv" );
-	qglTexCoord2f                = 	dllTexCoord2f                = GPA( "glTexCoord2f" );
-	qglTexCoord2fv               = 	dllTexCoord2fv               = GPA( "glTexCoord2fv" );
-	qglTexCoord2i                = 	dllTexCoord2i                = GPA( "glTexCoord2i" );
-	qglTexCoord2iv               = 	dllTexCoord2iv               = GPA( "glTexCoord2iv" );
-	qglTexCoord2s                = 	dllTexCoord2s                = GPA( "glTexCoord2s" );
-	qglTexCoord2sv               = 	dllTexCoord2sv               = GPA( "glTexCoord2sv" );
-	qglTexCoord3d                = 	dllTexCoord3d                = GPA( "glTexCoord3d" );
-	qglTexCoord3dv               = 	dllTexCoord3dv               = GPA( "glTexCoord3dv" );
-	qglTexCoord3f                = 	dllTexCoord3f                = GPA( "glTexCoord3f" );
-	qglTexCoord3fv               = 	dllTexCoord3fv               = GPA( "glTexCoord3fv" );
-	qglTexCoord3i                = 	dllTexCoord3i                = GPA( "glTexCoord3i" );
-	qglTexCoord3iv               = 	dllTexCoord3iv               = GPA( "glTexCoord3iv" );
-	qglTexCoord3s                = 	dllTexCoord3s                = GPA( "glTexCoord3s" );
-	qglTexCoord3sv               = 	dllTexCoord3sv               = GPA( "glTexCoord3sv" );
-	qglTexCoord4d                = 	dllTexCoord4d                = GPA( "glTexCoord4d" );
-	qglTexCoord4dv               = 	dllTexCoord4dv               = GPA( "glTexCoord4dv" );
-	qglTexCoord4f                = 	dllTexCoord4f                = GPA( "glTexCoord4f" );
-	qglTexCoord4fv               = 	dllTexCoord4fv               = GPA( "glTexCoord4fv" );
-	qglTexCoord4i                = 	dllTexCoord4i                = GPA( "glTexCoord4i" );
-	qglTexCoord4iv               = 	dllTexCoord4iv               = GPA( "glTexCoord4iv" );
-	qglTexCoord4s                = 	dllTexCoord4s                = GPA( "glTexCoord4s" );
-	qglTexCoord4sv               = 	dllTexCoord4sv               = GPA( "glTexCoord4sv" );
-	qglTexCoordPointer           = 	dllTexCoordPointer           = GPA( "glTexCoordPointer" );
-	qglTexEnvf                   = 	dllTexEnvf                   = GPA( "glTexEnvf" );
-	qglTexEnvfv                  = 	dllTexEnvfv                  = GPA( "glTexEnvfv" );
-	qglTexEnvi                   = 	dllTexEnvi                   = GPA( "glTexEnvi" );
-	qglTexEnviv                  = 	dllTexEnviv                  = GPA( "glTexEnviv" );
-	qglTexGend                   = 	dllTexGend                   = GPA( "glTexGend" );
-	qglTexGendv                  = 	dllTexGendv                  = GPA( "glTexGendv" );
-	qglTexGenf                   = 	dllTexGenf                   = GPA( "glTexGenf" );
-	qglTexGenfv                  = 	dllTexGenfv                  = GPA( "glTexGenfv" );
-	qglTexGeni                   = 	dllTexGeni                   = GPA( "glTexGeni" );
-	qglTexGeniv                  = 	dllTexGeniv                  = GPA( "glTexGeniv" );
-	qglTexImage1D                = 	dllTexImage1D                = GPA( "glTexImage1D" );
-	qglTexImage2D                = 	dllTexImage2D                = GPA( "glTexImage2D" );
-	qglTexParameterf             = 	dllTexParameterf             = GPA( "glTexParameterf" );
-	qglTexParameterfv            = 	dllTexParameterfv            = GPA( "glTexParameterfv" );
-	qglTexParameteri             = 	dllTexParameteri             = GPA( "glTexParameteri" );
-	qglTexParameteriv            = 	dllTexParameteriv            = GPA( "glTexParameteriv" );
-	qglTexSubImage1D             = 	dllTexSubImage1D             = GPA( "glTexSubImage1D" );
-	qglTexSubImage2D             = 	dllTexSubImage2D             = GPA( "glTexSubImage2D" );
-	qglTranslated                = 	dllTranslated                = GPA( "glTranslated" );
-	qglTranslatef                = 	dllTranslatef                = GPA( "glTranslatef" );
-	qglVertex2d                  = 	dllVertex2d                  = GPA( "glVertex2d" );
-	qglVertex2dv                 = 	dllVertex2dv                 = GPA( "glVertex2dv" );
-	qglVertex2f                  = 	dllVertex2f                  = GPA( "glVertex2f" );
-	qglVertex2fv                 = 	dllVertex2fv                 = GPA( "glVertex2fv" );
-	qglVertex2i                  = 	dllVertex2i                  = GPA( "glVertex2i" );
-	qglVertex2iv                 = 	dllVertex2iv                 = GPA( "glVertex2iv" );
-	qglVertex2s                  = 	dllVertex2s                  = GPA( "glVertex2s" );
-	qglVertex2sv                 = 	dllVertex2sv                 = GPA( "glVertex2sv" );
-	qglVertex3d                  = 	dllVertex3d                  = GPA( "glVertex3d" );
-	qglVertex3dv                 = 	dllVertex3dv                 = GPA( "glVertex3dv" );
-	qglVertex3f                  = 	dllVertex3f                  = GPA( "glVertex3f" );
-	qglVertex3fv                 = 	dllVertex3fv                 = GPA( "glVertex3fv" );
-	qglVertex3i                  = 	dllVertex3i                  = GPA( "glVertex3i" );
-	qglVertex3iv                 = 	dllVertex3iv                 = GPA( "glVertex3iv" );
-	qglVertex3s                  = 	dllVertex3s                  = GPA( "glVertex3s" );
-	qglVertex3sv                 = 	dllVertex3sv                 = GPA( "glVertex3sv" );
-	qglVertex4d                  = 	dllVertex4d                  = GPA( "glVertex4d" );
-	qglVertex4dv                 = 	dllVertex4dv                 = GPA( "glVertex4dv" );
-	qglVertex4f                  = 	dllVertex4f                  = GPA( "glVertex4f" );
-	qglVertex4fv                 = 	dllVertex4fv                 = GPA( "glVertex4fv" );
-	qglVertex4i                  = 	dllVertex4i                  = GPA( "glVertex4i" );
-	qglVertex4iv                 = 	dllVertex4iv                 = GPA( "glVertex4iv" );
-	qglVertex4s                  = 	dllVertex4s                  = GPA( "glVertex4s" );
-	qglVertex4sv                 = 	dllVertex4sv                 = GPA( "glVertex4sv" );
-	qglVertexPointer             = 	dllVertexPointer             = GPA( "glVertexPointer" );
-	qglViewport                  = 	dllViewport                  = GPA( "glViewport" );
-
-	qwglCopyContext              = GPA( "wglCopyContext" );
-	qwglCreateContext            = GPA( "wglCreateContext" );
-	qwglCreateLayerContext       = GPA( "wglCreateLayerContext" );
-	qwglDeleteContext            = GPA( "wglDeleteContext" );
-	qwglDescribeLayerPlane       = GPA( "wglDescribeLayerPlane" );
-	qwglGetCurrentContext        = GPA( "wglGetCurrentContext" );
-	qwglGetCurrentDC             = GPA( "wglGetCurrentDC" );
-	qwglGetLayerPaletteEntries   = GPA( "wglGetLayerPaletteEntries" );
-	qwglGetProcAddress           = GPA( "wglGetProcAddress" );
-	qwglMakeCurrent              = GPA( "wglMakeCurrent" );
-	qwglRealizeLayerPalette      = GPA( "wglRealizeLayerPalette" );
-	qwglSetLayerPaletteEntries   = GPA( "wglSetLayerPaletteEntries" );
-	qwglShareLists               = GPA( "wglShareLists" );
-	qwglSwapLayerBuffers         = GPA( "wglSwapLayerBuffers" );
-	qwglUseFontBitmaps           = GPA( "wglUseFontBitmapsA" );
-	qwglUseFontOutlines          = GPA( "wglUseFontOutlinesA" );
-
-	qwglChoosePixelFormat        = GPA( "wglChoosePixelFormat" );
-	qwglDescribePixelFormat      = GPA( "wglDescribePixelFormat" );
-	qwglGetPixelFormat           = GPA( "wglGetPixelFormat" );
-	qwglSetPixelFormat           = GPA( "wglSetPixelFormat" );
-	qwglSwapBuffers              = GPA( "wglSwapBuffers" );
-
-	qwglSwapIntervalEXT = 0;
-	qglActiveTextureARB = 0;
-	qglClientActiveTextureARB = 0;
-	qglMultiTexCoord2fARB = 0;
-	qglLockArraysEXT = 0;
-	qglUnlockArraysEXT = 0;
-	qwglGetDeviceGammaRamp3DFX = NULL;
-	qwglSetDeviceGammaRamp3DFX = NULL;
-
-	// check logging
-	QGL_EnableLogging( r_logFile->integer );
-
-	return qtrue;
-}
-
-void QGL_EnableLogging( qboolean enable )
-{
-	static qboolean isEnabled;
-
-	// return if we're already active
-	if ( isEnabled && enable ) {
-		// decrement log counter and stop if it has reached 0
-		ri.Cvar_Set( "r_logFile", va("%d", r_logFile->integer - 1 ) );
-		if ( r_logFile->integer ) {
-			return;
-		}
-		enable = qfalse;
-	}
-
-	// return if we're already disabled
-	if ( !enable && !isEnabled )
-		return;
-
-	isEnabled = enable;
-
-	if ( enable )
-	{
-		if ( !glw_state.log_fp )
-		{
-			struct tm *newtime;
-			time_t aclock;
-			char buffer[1024];
-			cvar_t	*basedir;
-
-			time( &aclock );
-			newtime = localtime( &aclock );
-
-			asctime( newtime );
-
-			basedir = ri.Cvar_Get( "fs_basepath", "", 0 );
-			Com_sprintf( buffer, sizeof(buffer), "%s/gl.log", basedir->string ); 
-			glw_state.log_fp = fopen( buffer, "wt" );
-
-			fprintf( glw_state.log_fp, "%s\n", asctime( newtime ) );
-		}
-
-		qglAccum                     = logAccum;
-		qglAlphaFunc                 = logAlphaFunc;
-		qglAreTexturesResident       = logAreTexturesResident;
-		qglArrayElement              = logArrayElement;
-		qglBegin                     = logBegin;
-		qglBindTexture               = logBindTexture;
-		qglBitmap                    = logBitmap;
-		qglBlendFunc                 = logBlendFunc;
-		qglCallList                  = logCallList;
-		qglCallLists                 = logCallLists;
-		qglClear                     = logClear;
-		qglClearAccum                = logClearAccum;
-		qglClearColor                = logClearColor;
-		qglClearDepth                = logClearDepth;
-		qglClearIndex                = logClearIndex;
-		qglClearStencil              = logClearStencil;
-		qglClipPlane                 = logClipPlane;
-		qglColor3b                   = logColor3b;
-		qglColor3bv                  = logColor3bv;
-		qglColor3d                   = logColor3d;
-		qglColor3dv                  = logColor3dv;
-		qglColor3f                   = logColor3f;
-		qglColor3fv                  = logColor3fv;
-		qglColor3i                   = logColor3i;
-		qglColor3iv                  = logColor3iv;
-		qglColor3s                   = logColor3s;
-		qglColor3sv                  = logColor3sv;
-		qglColor3ub                  = logColor3ub;
-		qglColor3ubv                 = logColor3ubv;
-		qglColor3ui                  = logColor3ui;
-		qglColor3uiv                 = logColor3uiv;
-		qglColor3us                  = logColor3us;
-		qglColor3usv                 = logColor3usv;
-		qglColor4b                   = logColor4b;
-		qglColor4bv                  = logColor4bv;
-		qglColor4d                   = logColor4d;
-		qglColor4dv                  = logColor4dv;
-		qglColor4f                   = logColor4f;
-		qglColor4fv                  = logColor4fv;
-		qglColor4i                   = logColor4i;
-		qglColor4iv                  = logColor4iv;
-		qglColor4s                   = logColor4s;
-		qglColor4sv                  = logColor4sv;
-		qglColor4ub                  = logColor4ub;
-		qglColor4ubv                 = logColor4ubv;
-		qglColor4ui                  = logColor4ui;
-		qglColor4uiv                 = logColor4uiv;
-		qglColor4us                  = logColor4us;
-		qglColor4usv                 = logColor4usv;
-		qglColorMask                 = logColorMask;
-		qglColorMaterial             = logColorMaterial;
-		qglColorPointer              = logColorPointer;
-		qglCopyPixels                = logCopyPixels;
-		qglCopyTexImage1D            = logCopyTexImage1D;
-		qglCopyTexImage2D            = logCopyTexImage2D;
-		qglCopyTexSubImage1D         = logCopyTexSubImage1D;
-		qglCopyTexSubImage2D         = logCopyTexSubImage2D;
-		qglCullFace                  = logCullFace;
-		qglDeleteLists               = logDeleteLists ;
-		qglDeleteTextures            = logDeleteTextures ;
-		qglDepthFunc                 = logDepthFunc ;
-		qglDepthMask                 = logDepthMask ;
-		qglDepthRange                = logDepthRange ;
-		qglDisable                   = logDisable ;
-		qglDisableClientState        = logDisableClientState ;
-		qglDrawArrays                = logDrawArrays ;
-		qglDrawBuffer                = logDrawBuffer ;
-		qglDrawElements              = logDrawElements ;
-		qglDrawPixels                = logDrawPixels ;
-		qglEdgeFlag                  = logEdgeFlag ;
-		qglEdgeFlagPointer           = logEdgeFlagPointer ;
-		qglEdgeFlagv                 = logEdgeFlagv ;
-		qglEnable                    = 	logEnable                    ;
-		qglEnableClientState         = 	logEnableClientState         ;
-		qglEnd                       = 	logEnd                       ;
-		qglEndList                   = 	logEndList                   ;
-		qglEvalCoord1d				 = 	logEvalCoord1d				 ;
-		qglEvalCoord1dv              = 	logEvalCoord1dv              ;
-		qglEvalCoord1f               = 	logEvalCoord1f               ;
-		qglEvalCoord1fv              = 	logEvalCoord1fv              ;
-		qglEvalCoord2d               = 	logEvalCoord2d               ;
-		qglEvalCoord2dv              = 	logEvalCoord2dv              ;
-		qglEvalCoord2f               = 	logEvalCoord2f               ;
-		qglEvalCoord2fv              = 	logEvalCoord2fv              ;
-		qglEvalMesh1                 = 	logEvalMesh1                 ;
-		qglEvalMesh2                 = 	logEvalMesh2                 ;
-		qglEvalPoint1                = 	logEvalPoint1                ;
-		qglEvalPoint2                = 	logEvalPoint2                ;
-		qglFeedbackBuffer            = 	logFeedbackBuffer            ;
-		qglFinish                    = 	logFinish                    ;
-		qglFlush                     = 	logFlush                     ;
-		qglFogf                      = 	logFogf                      ;
-		qglFogfv                     = 	logFogfv                     ;
-		qglFogi                      = 	logFogi                      ;
-		qglFogiv                     = 	logFogiv                     ;
-		qglFrontFace                 = 	logFrontFace                 ;
-		qglFrustum                   = 	logFrustum                   ;
-		qglGenLists                  = 	logGenLists                  ;
-		qglGenTextures               = 	logGenTextures               ;
-		qglGetBooleanv               = 	logGetBooleanv               ;
-		qglGetClipPlane              = 	logGetClipPlane              ;
-		qglGetDoublev                = 	logGetDoublev                ;
-		qglGetError                  = 	logGetError                  ;
-		qglGetFloatv                 = 	logGetFloatv                 ;
-		qglGetIntegerv               = 	logGetIntegerv               ;
-		qglGetLightfv                = 	logGetLightfv                ;
-		qglGetLightiv                = 	logGetLightiv                ;
-		qglGetMapdv                  = 	logGetMapdv                  ;
-		qglGetMapfv                  = 	logGetMapfv                  ;
-		qglGetMapiv                  = 	logGetMapiv                  ;
-		qglGetMaterialfv             = 	logGetMaterialfv             ;
-		qglGetMaterialiv             = 	logGetMaterialiv             ;
-		qglGetPixelMapfv             = 	logGetPixelMapfv             ;
-		qglGetPixelMapuiv            = 	logGetPixelMapuiv            ;
-		qglGetPixelMapusv            = 	logGetPixelMapusv            ;
-		qglGetPointerv               = 	logGetPointerv               ;
-		qglGetPolygonStipple         = 	logGetPolygonStipple         ;
-		qglGetString                 = 	logGetString                 ;
-		qglGetTexEnvfv               = 	logGetTexEnvfv               ;
-		qglGetTexEnviv               = 	logGetTexEnviv               ;
-		qglGetTexGendv               = 	logGetTexGendv               ;
-		qglGetTexGenfv               = 	logGetTexGenfv               ;
-		qglGetTexGeniv               = 	logGetTexGeniv               ;
-		qglGetTexImage               = 	logGetTexImage               ;
-		qglGetTexLevelParameterfv    = 	logGetTexLevelParameterfv    ;
-		qglGetTexLevelParameteriv    = 	logGetTexLevelParameteriv    ;
-		qglGetTexParameterfv         = 	logGetTexParameterfv         ;
-		qglGetTexParameteriv         = 	logGetTexParameteriv         ;
-		qglHint                      = 	logHint                      ;
-		qglIndexMask                 = 	logIndexMask                 ;
-		qglIndexPointer              = 	logIndexPointer              ;
-		qglIndexd                    = 	logIndexd                    ;
-		qglIndexdv                   = 	logIndexdv                   ;
-		qglIndexf                    = 	logIndexf                    ;
-		qglIndexfv                   = 	logIndexfv                   ;
-		qglIndexi                    = 	logIndexi                    ;
-		qglIndexiv                   = 	logIndexiv                   ;
-		qglIndexs                    = 	logIndexs                    ;
-		qglIndexsv                   = 	logIndexsv                   ;
-		qglIndexub                   = 	logIndexub                   ;
-		qglIndexubv                  = 	logIndexubv                  ;
-		qglInitNames                 = 	logInitNames                 ;
-		qglInterleavedArrays         = 	logInterleavedArrays         ;
-		qglIsEnabled                 = 	logIsEnabled                 ;
-		qglIsList                    = 	logIsList                    ;
-		qglIsTexture                 = 	logIsTexture                 ;
-		qglLightModelf               = 	logLightModelf               ;
-		qglLightModelfv              = 	logLightModelfv              ;
-		qglLightModeli               = 	logLightModeli               ;
-		qglLightModeliv              = 	logLightModeliv              ;
-		qglLightf                    = 	logLightf                    ;
-		qglLightfv                   = 	logLightfv                   ;
-		qglLighti                    = 	logLighti                    ;
-		qglLightiv                   = 	logLightiv                   ;
-		qglLineStipple               = 	logLineStipple               ;
-		qglLineWidth                 = 	logLineWidth                 ;
-		qglListBase                  = 	logListBase                  ;
-		qglLoadIdentity              = 	logLoadIdentity              ;
-		qglLoadMatrixd               = 	logLoadMatrixd               ;
-		qglLoadMatrixf               = 	logLoadMatrixf               ;
-		qglLoadName                  = 	logLoadName                  ;
-		qglLogicOp                   = 	logLogicOp                   ;
-		qglMap1d                     = 	logMap1d                     ;
-		qglMap1f                     = 	logMap1f                     ;
-		qglMap2d                     = 	logMap2d                     ;
-		qglMap2f                     = 	logMap2f                     ;
-		qglMapGrid1d                 = 	logMapGrid1d                 ;
-		qglMapGrid1f                 = 	logMapGrid1f                 ;
-		qglMapGrid2d                 = 	logMapGrid2d                 ;
-		qglMapGrid2f                 = 	logMapGrid2f                 ;
-		qglMaterialf                 = 	logMaterialf                 ;
-		qglMaterialfv                = 	logMaterialfv                ;
-		qglMateriali                 = 	logMateriali                 ;
-		qglMaterialiv                = 	logMaterialiv                ;
-		qglMatrixMode                = 	logMatrixMode                ;
-		qglMultMatrixd               = 	logMultMatrixd               ;
-		qglMultMatrixf               = 	logMultMatrixf               ;
-		qglNewList                   = 	logNewList                   ;
-		qglNormal3b                  = 	logNormal3b                  ;
-		qglNormal3bv                 = 	logNormal3bv                 ;
-		qglNormal3d                  = 	logNormal3d                  ;
-		qglNormal3dv                 = 	logNormal3dv                 ;
-		qglNormal3f                  = 	logNormal3f                  ;
-		qglNormal3fv                 = 	logNormal3fv                 ;
-		qglNormal3i                  = 	logNormal3i                  ;
-		qglNormal3iv                 = 	logNormal3iv                 ;
-		qglNormal3s                  = 	logNormal3s                  ;
-		qglNormal3sv                 = 	logNormal3sv                 ;
-		qglNormalPointer             = 	logNormalPointer             ;
-		qglOrtho                     = 	logOrtho                     ;
-		qglPassThrough               = 	logPassThrough               ;
-		qglPixelMapfv                = 	logPixelMapfv                ;
-		qglPixelMapuiv               = 	logPixelMapuiv               ;
-		qglPixelMapusv               = 	logPixelMapusv               ;
-		qglPixelStoref               = 	logPixelStoref               ;
-		qglPixelStorei               = 	logPixelStorei               ;
-		qglPixelTransferf            = 	logPixelTransferf            ;
-		qglPixelTransferi            = 	logPixelTransferi            ;
-		qglPixelZoom                 = 	logPixelZoom                 ;
-		qglPointSize                 = 	logPointSize                 ;
-		qglPolygonMode               = 	logPolygonMode               ;
-		qglPolygonOffset             = 	logPolygonOffset             ;
-		qglPolygonStipple            = 	logPolygonStipple            ;
-		qglPopAttrib                 = 	logPopAttrib                 ;
-		qglPopClientAttrib           = 	logPopClientAttrib           ;
-		qglPopMatrix                 = 	logPopMatrix                 ;
-		qglPopName                   = 	logPopName                   ;
-		qglPrioritizeTextures        = 	logPrioritizeTextures        ;
-		qglPushAttrib                = 	logPushAttrib                ;
-		qglPushClientAttrib          = 	logPushClientAttrib          ;
-		qglPushMatrix                = 	logPushMatrix                ;
-		qglPushName                  = 	logPushName                  ;
-		qglRasterPos2d               = 	logRasterPos2d               ;
-		qglRasterPos2dv              = 	logRasterPos2dv              ;
-		qglRasterPos2f               = 	logRasterPos2f               ;
-		qglRasterPos2fv              = 	logRasterPos2fv              ;
-		qglRasterPos2i               = 	logRasterPos2i               ;
-		qglRasterPos2iv              = 	logRasterPos2iv              ;
-		qglRasterPos2s               = 	logRasterPos2s               ;
-		qglRasterPos2sv              = 	logRasterPos2sv              ;
-		qglRasterPos3d               = 	logRasterPos3d               ;
-		qglRasterPos3dv              = 	logRasterPos3dv              ;
-		qglRasterPos3f               = 	logRasterPos3f               ;
-		qglRasterPos3fv              = 	logRasterPos3fv              ;
-		qglRasterPos3i               = 	logRasterPos3i               ;
-		qglRasterPos3iv              = 	logRasterPos3iv              ;
-		qglRasterPos3s               = 	logRasterPos3s               ;
-		qglRasterPos3sv              = 	logRasterPos3sv              ;
-		qglRasterPos4d               = 	logRasterPos4d               ;
-		qglRasterPos4dv              = 	logRasterPos4dv              ;
-		qglRasterPos4f               = 	logRasterPos4f               ;
-		qglRasterPos4fv              = 	logRasterPos4fv              ;
-		qglRasterPos4i               = 	logRasterPos4i               ;
-		qglRasterPos4iv              = 	logRasterPos4iv              ;
-		qglRasterPos4s               = 	logRasterPos4s               ;
-		qglRasterPos4sv              = 	logRasterPos4sv              ;
-		qglReadBuffer                = 	logReadBuffer                ;
-		qglReadPixels                = 	logReadPixels                ;
-		qglRectd                     = 	logRectd                     ;
-		qglRectdv                    = 	logRectdv                    ;
-		qglRectf                     = 	logRectf                     ;
-		qglRectfv                    = 	logRectfv                    ;
-		qglRecti                     = 	logRecti                     ;
-		qglRectiv                    = 	logRectiv                    ;
-		qglRects                     = 	logRects                     ;
-		qglRectsv                    = 	logRectsv                    ;
-		qglRenderMode                = 	logRenderMode                ;
-		qglRotated                   = 	logRotated                   ;
-		qglRotatef                   = 	logRotatef                   ;
-		qglScaled                    = 	logScaled                    ;
-		qglScalef                    = 	logScalef                    ;
-		qglScissor                   = 	logScissor                   ;
-		qglSelectBuffer              = 	logSelectBuffer              ;
-		qglShadeModel                = 	logShadeModel                ;
-		qglStencilFunc               = 	logStencilFunc               ;
-		qglStencilMask               = 	logStencilMask               ;
-		qglStencilOp                 = 	logStencilOp                 ;
-		qglTexCoord1d                = 	logTexCoord1d                ;
-		qglTexCoord1dv               = 	logTexCoord1dv               ;
-		qglTexCoord1f                = 	logTexCoord1f                ;
-		qglTexCoord1fv               = 	logTexCoord1fv               ;
-		qglTexCoord1i                = 	logTexCoord1i                ;
-		qglTexCoord1iv               = 	logTexCoord1iv               ;
-		qglTexCoord1s                = 	logTexCoord1s                ;
-		qglTexCoord1sv               = 	logTexCoord1sv               ;
-		qglTexCoord2d                = 	logTexCoord2d                ;
-		qglTexCoord2dv               = 	logTexCoord2dv               ;
-		qglTexCoord2f                = 	logTexCoord2f                ;
-		qglTexCoord2fv               = 	logTexCoord2fv               ;
-		qglTexCoord2i                = 	logTexCoord2i                ;
-		qglTexCoord2iv               = 	logTexCoord2iv               ;
-		qglTexCoord2s                = 	logTexCoord2s                ;
-		qglTexCoord2sv               = 	logTexCoord2sv               ;
-		qglTexCoord3d                = 	logTexCoord3d                ;
-		qglTexCoord3dv               = 	logTexCoord3dv               ;
-		qglTexCoord3f                = 	logTexCoord3f                ;
-		qglTexCoord3fv               = 	logTexCoord3fv               ;
-		qglTexCoord3i                = 	logTexCoord3i                ;
-		qglTexCoord3iv               = 	logTexCoord3iv               ;
-		qglTexCoord3s                = 	logTexCoord3s                ;
-		qglTexCoord3sv               = 	logTexCoord3sv               ;
-		qglTexCoord4d                = 	logTexCoord4d                ;
-		qglTexCoord4dv               = 	logTexCoord4dv               ;
-		qglTexCoord4f                = 	logTexCoord4f                ;
-		qglTexCoord4fv               = 	logTexCoord4fv               ;
-		qglTexCoord4i                = 	logTexCoord4i                ;
-		qglTexCoord4iv               = 	logTexCoord4iv               ;
-		qglTexCoord4s                = 	logTexCoord4s                ;
-		qglTexCoord4sv               = 	logTexCoord4sv               ;
-		qglTexCoordPointer           = 	logTexCoordPointer           ;
-		qglTexEnvf                   = 	logTexEnvf                   ;
-		qglTexEnvfv                  = 	logTexEnvfv                  ;
-		qglTexEnvi                   = 	logTexEnvi                   ;
-		qglTexEnviv                  = 	logTexEnviv                  ;
-		qglTexGend                   = 	logTexGend                   ;
-		qglTexGendv                  = 	logTexGendv                  ;
-		qglTexGenf                   = 	logTexGenf                   ;
-		qglTexGenfv                  = 	logTexGenfv                  ;
-		qglTexGeni                   = 	logTexGeni                   ;
-		qglTexGeniv                  = 	logTexGeniv                  ;
-		qglTexImage1D                = 	logTexImage1D                ;
-		qglTexImage2D                = 	logTexImage2D                ;
-		qglTexParameterf             = 	logTexParameterf             ;
-		qglTexParameterfv            = 	logTexParameterfv            ;
-		qglTexParameteri             = 	logTexParameteri             ;
-		qglTexParameteriv            = 	logTexParameteriv            ;
-		qglTexSubImage1D             = 	logTexSubImage1D             ;
-		qglTexSubImage2D             = 	logTexSubImage2D             ;
-		qglTranslated                = 	logTranslated                ;
-		qglTranslatef                = 	logTranslatef                ;
-		qglVertex2d                  = 	logVertex2d                  ;
-		qglVertex2dv                 = 	logVertex2dv                 ;
-		qglVertex2f                  = 	logVertex2f                  ;
-		qglVertex2fv                 = 	logVertex2fv                 ;
-		qglVertex2i                  = 	logVertex2i                  ;
-		qglVertex2iv                 = 	logVertex2iv                 ;
-		qglVertex2s                  = 	logVertex2s                  ;
-		qglVertex2sv                 = 	logVertex2sv                 ;
-		qglVertex3d                  = 	logVertex3d                  ;
-		qglVertex3dv                 = 	logVertex3dv                 ;
-		qglVertex3f                  = 	logVertex3f                  ;
-		qglVertex3fv                 = 	logVertex3fv                 ;
-		qglVertex3i                  = 	logVertex3i                  ;
-		qglVertex3iv                 = 	logVertex3iv                 ;
-		qglVertex3s                  = 	logVertex3s                  ;
-		qglVertex3sv                 = 	logVertex3sv                 ;
-		qglVertex4d                  = 	logVertex4d                  ;
-		qglVertex4dv                 = 	logVertex4dv                 ;
-		qglVertex4f                  = 	logVertex4f                  ;
-		qglVertex4fv                 = 	logVertex4fv                 ;
-		qglVertex4i                  = 	logVertex4i                  ;
-		qglVertex4iv                 = 	logVertex4iv                 ;
-		qglVertex4s                  = 	logVertex4s                  ;
-		qglVertex4sv                 = 	logVertex4sv                 ;
-		qglVertexPointer             = 	logVertexPointer             ;
-		qglViewport                  = 	logViewport                  ;
-	}
-	else
-	{
-		if ( glw_state.log_fp )	{
-			fprintf( glw_state.log_fp, "*** CLOSING LOG ***\n" );
-			fclose( glw_state.log_fp );
-			glw_state.log_fp = NULL;
-		}
-		qglAccum                     = dllAccum;
-		qglAlphaFunc                 = dllAlphaFunc;
-		qglAreTexturesResident       = dllAreTexturesResident;
-		qglArrayElement              = dllArrayElement;
-		qglBegin                     = dllBegin;
-		qglBindTexture               = dllBindTexture;
-		qglBitmap                    = dllBitmap;
-		qglBlendFunc                 = dllBlendFunc;
-		qglCallList                  = dllCallList;
-		qglCallLists                 = dllCallLists;
-		qglClear                     = dllClear;
-		qglClearAccum                = dllClearAccum;
-		qglClearColor                = dllClearColor;
-		qglClearDepth                = dllClearDepth;
-		qglClearIndex                = dllClearIndex;
-		qglClearStencil              = dllClearStencil;
-		qglClipPlane                 = dllClipPlane;
-		qglColor3b                   = dllColor3b;
-		qglColor3bv                  = dllColor3bv;
-		qglColor3d                   = dllColor3d;
-		qglColor3dv                  = dllColor3dv;
-		qglColor3f                   = dllColor3f;
-		qglColor3fv                  = dllColor3fv;
-		qglColor3i                   = dllColor3i;
-		qglColor3iv                  = dllColor3iv;
-		qglColor3s                   = dllColor3s;
-		qglColor3sv                  = dllColor3sv;
-		qglColor3ub                  = dllColor3ub;
-		qglColor3ubv                 = dllColor3ubv;
-		qglColor3ui                  = dllColor3ui;
-		qglColor3uiv                 = dllColor3uiv;
-		qglColor3us                  = dllColor3us;
-		qglColor3usv                 = dllColor3usv;
-		qglColor4b                   = dllColor4b;
-		qglColor4bv                  = dllColor4bv;
-		qglColor4d                   = dllColor4d;
-		qglColor4dv                  = dllColor4dv;
-		qglColor4f                   = dllColor4f;
-		qglColor4fv                  = dllColor4fv;
-		qglColor4i                   = dllColor4i;
-		qglColor4iv                  = dllColor4iv;
-		qglColor4s                   = dllColor4s;
-		qglColor4sv                  = dllColor4sv;
-		qglColor4ub                  = dllColor4ub;
-		qglColor4ubv                 = dllColor4ubv;
-		qglColor4ui                  = dllColor4ui;
-		qglColor4uiv                 = dllColor4uiv;
-		qglColor4us                  = dllColor4us;
-		qglColor4usv                 = dllColor4usv;
-		qglColorMask                 = dllColorMask;
-		qglColorMaterial             = dllColorMaterial;
-		qglColorPointer              = dllColorPointer;
-		qglCopyPixels                = dllCopyPixels;
-		qglCopyTexImage1D            = dllCopyTexImage1D;
-		qglCopyTexImage2D            = dllCopyTexImage2D;
-		qglCopyTexSubImage1D         = dllCopyTexSubImage1D;
-		qglCopyTexSubImage2D         = dllCopyTexSubImage2D;
-		qglCullFace                  = dllCullFace;
-		qglDeleteLists               = dllDeleteLists ;
-		qglDeleteTextures            = dllDeleteTextures ;
-		qglDepthFunc                 = dllDepthFunc ;
-		qglDepthMask                 = dllDepthMask ;
-		qglDepthRange                = dllDepthRange ;
-		qglDisable                   = dllDisable ;
-		qglDisableClientState        = dllDisableClientState ;
-		qglDrawArrays                = dllDrawArrays ;
-		qglDrawBuffer                = dllDrawBuffer ;
-		qglDrawElements              = dllDrawElements ;
-		qglDrawPixels                = dllDrawPixels ;
-		qglEdgeFlag                  = dllEdgeFlag ;
-		qglEdgeFlagPointer           = dllEdgeFlagPointer ;
-		qglEdgeFlagv                 = dllEdgeFlagv ;
-		qglEnable                    = 	dllEnable                    ;
-		qglEnableClientState         = 	dllEnableClientState         ;
-		qglEnd                       = 	dllEnd                       ;
-		qglEndList                   = 	dllEndList                   ;
-		qglEvalCoord1d				 = 	dllEvalCoord1d				 ;
-		qglEvalCoord1dv              = 	dllEvalCoord1dv              ;
-		qglEvalCoord1f               = 	dllEvalCoord1f               ;
-		qglEvalCoord1fv              = 	dllEvalCoord1fv              ;
-		qglEvalCoord2d               = 	dllEvalCoord2d               ;
-		qglEvalCoord2dv              = 	dllEvalCoord2dv              ;
-		qglEvalCoord2f               = 	dllEvalCoord2f               ;
-		qglEvalCoord2fv              = 	dllEvalCoord2fv              ;
-		qglEvalMesh1                 = 	dllEvalMesh1                 ;
-		qglEvalMesh2                 = 	dllEvalMesh2                 ;
-		qglEvalPoint1                = 	dllEvalPoint1                ;
-		qglEvalPoint2                = 	dllEvalPoint2                ;
-		qglFeedbackBuffer            = 	dllFeedbackBuffer            ;
-		qglFinish                    = 	dllFinish                    ;
-		qglFlush                     = 	dllFlush                     ;
-		qglFogf                      = 	dllFogf                      ;
-		qglFogfv                     = 	dllFogfv                     ;
-		qglFogi                      = 	dllFogi                      ;
-		qglFogiv                     = 	dllFogiv                     ;
-		qglFrontFace                 = 	dllFrontFace                 ;
-		qglFrustum                   = 	dllFrustum                   ;
-		qglGenLists                  = 	dllGenLists                  ;
-		qglGenTextures               = 	dllGenTextures               ;
-		qglGetBooleanv               = 	dllGetBooleanv               ;
-		qglGetClipPlane              = 	dllGetClipPlane              ;
-		qglGetDoublev                = 	dllGetDoublev                ;
-		qglGetError                  = 	dllGetError                  ;
-		qglGetFloatv                 = 	dllGetFloatv                 ;
-		qglGetIntegerv               = 	dllGetIntegerv               ;
-		qglGetLightfv                = 	dllGetLightfv                ;
-		qglGetLightiv                = 	dllGetLightiv                ;
-		qglGetMapdv                  = 	dllGetMapdv                  ;
-		qglGetMapfv                  = 	dllGetMapfv                  ;
-		qglGetMapiv                  = 	dllGetMapiv                  ;
-		qglGetMaterialfv             = 	dllGetMaterialfv             ;
-		qglGetMaterialiv             = 	dllGetMaterialiv             ;
-		qglGetPixelMapfv             = 	dllGetPixelMapfv             ;
-		qglGetPixelMapuiv            = 	dllGetPixelMapuiv            ;
-		qglGetPixelMapusv            = 	dllGetPixelMapusv            ;
-		qglGetPointerv               = 	dllGetPointerv               ;
-		qglGetPolygonStipple         = 	dllGetPolygonStipple         ;
-		qglGetString                 = 	dllGetString                 ;
-		qglGetTexEnvfv               = 	dllGetTexEnvfv               ;
-		qglGetTexEnviv               = 	dllGetTexEnviv               ;
-		qglGetTexGendv               = 	dllGetTexGendv               ;
-		qglGetTexGenfv               = 	dllGetTexGenfv               ;
-		qglGetTexGeniv               = 	dllGetTexGeniv               ;
-		qglGetTexImage               = 	dllGetTexImage               ;
-		qglGetTexLevelParameterfv    = 	dllGetTexLevelParameterfv    ;
-		qglGetTexLevelParameteriv    = 	dllGetTexLevelParameteriv    ;
-		qglGetTexParameterfv         = 	dllGetTexParameterfv         ;
-		qglGetTexParameteriv         = 	dllGetTexParameteriv         ;
-		qglHint                      = 	dllHint                      ;
-		qglIndexMask                 = 	dllIndexMask                 ;
-		qglIndexPointer              = 	dllIndexPointer              ;
-		qglIndexd                    = 	dllIndexd                    ;
-		qglIndexdv                   = 	dllIndexdv                   ;
-		qglIndexf                    = 	dllIndexf                    ;
-		qglIndexfv                   = 	dllIndexfv                   ;
-		qglIndexi                    = 	dllIndexi                    ;
-		qglIndexiv                   = 	dllIndexiv                   ;
-		qglIndexs                    = 	dllIndexs                    ;
-		qglIndexsv                   = 	dllIndexsv                   ;
-		qglIndexub                   = 	dllIndexub                   ;
-		qglIndexubv                  = 	dllIndexubv                  ;
-		qglInitNames                 = 	dllInitNames                 ;
-		qglInterleavedArrays         = 	dllInterleavedArrays         ;
-		qglIsEnabled                 = 	dllIsEnabled                 ;
-		qglIsList                    = 	dllIsList                    ;
-		qglIsTexture                 = 	dllIsTexture                 ;
-		qglLightModelf               = 	dllLightModelf               ;
-		qglLightModelfv              = 	dllLightModelfv              ;
-		qglLightModeli               = 	dllLightModeli               ;
-		qglLightModeliv              = 	dllLightModeliv              ;
-		qglLightf                    = 	dllLightf                    ;
-		qglLightfv                   = 	dllLightfv                   ;
-		qglLighti                    = 	dllLighti                    ;
-		qglLightiv                   = 	dllLightiv                   ;
-		qglLineStipple               = 	dllLineStipple               ;
-		qglLineWidth                 = 	dllLineWidth                 ;
-		qglListBase                  = 	dllListBase                  ;
-		qglLoadIdentity              = 	dllLoadIdentity              ;
-		qglLoadMatrixd               = 	dllLoadMatrixd               ;
-		qglLoadMatrixf               = 	dllLoadMatrixf               ;
-		qglLoadName                  = 	dllLoadName                  ;
-		qglLogicOp                   = 	dllLogicOp                   ;
-		qglMap1d                     = 	dllMap1d                     ;
-		qglMap1f                     = 	dllMap1f                     ;
-		qglMap2d                     = 	dllMap2d                     ;
-		qglMap2f                     = 	dllMap2f                     ;
-		qglMapGrid1d                 = 	dllMapGrid1d                 ;
-		qglMapGrid1f                 = 	dllMapGrid1f                 ;
-		qglMapGrid2d                 = 	dllMapGrid2d                 ;
-		qglMapGrid2f                 = 	dllMapGrid2f                 ;
-		qglMaterialf                 = 	dllMaterialf                 ;
-		qglMaterialfv                = 	dllMaterialfv                ;
-		qglMateriali                 = 	dllMateriali                 ;
-		qglMaterialiv                = 	dllMaterialiv                ;
-		qglMatrixMode                = 	dllMatrixMode                ;
-		qglMultMatrixd               = 	dllMultMatrixd               ;
-		qglMultMatrixf               = 	dllMultMatrixf               ;
-		qglNewList                   = 	dllNewList                   ;
-		qglNormal3b                  = 	dllNormal3b                  ;
-		qglNormal3bv                 = 	dllNormal3bv                 ;
-		qglNormal3d                  = 	dllNormal3d                  ;
-		qglNormal3dv                 = 	dllNormal3dv                 ;
-		qglNormal3f                  = 	dllNormal3f                  ;
-		qglNormal3fv                 = 	dllNormal3fv                 ;
-		qglNormal3i                  = 	dllNormal3i                  ;
-		qglNormal3iv                 = 	dllNormal3iv                 ;
-		qglNormal3s                  = 	dllNormal3s                  ;
-		qglNormal3sv                 = 	dllNormal3sv                 ;
-		qglNormalPointer             = 	dllNormalPointer             ;
-		qglOrtho                     = 	dllOrtho                     ;
-		qglPassThrough               = 	dllPassThrough               ;
-		qglPixelMapfv                = 	dllPixelMapfv                ;
-		qglPixelMapuiv               = 	dllPixelMapuiv               ;
-		qglPixelMapusv               = 	dllPixelMapusv               ;
-		qglPixelStoref               = 	dllPixelStoref               ;
-		qglPixelStorei               = 	dllPixelStorei               ;
-		qglPixelTransferf            = 	dllPixelTransferf            ;
-		qglPixelTransferi            = 	dllPixelTransferi            ;
-		qglPixelZoom                 = 	dllPixelZoom                 ;
-		qglPointSize                 = 	dllPointSize                 ;
-		qglPolygonMode               = 	dllPolygonMode               ;
-		qglPolygonOffset             = 	dllPolygonOffset             ;
-		qglPolygonStipple            = 	dllPolygonStipple            ;
-		qglPopAttrib                 = 	dllPopAttrib                 ;
-		qglPopClientAttrib           = 	dllPopClientAttrib           ;
-		qglPopMatrix                 = 	dllPopMatrix                 ;
-		qglPopName                   = 	dllPopName                   ;
-		qglPrioritizeTextures        = 	dllPrioritizeTextures        ;
-		qglPushAttrib                = 	dllPushAttrib                ;
-		qglPushClientAttrib          = 	dllPushClientAttrib          ;
-		qglPushMatrix                = 	dllPushMatrix                ;
-		qglPushName                  = 	dllPushName                  ;
-		qglRasterPos2d               = 	dllRasterPos2d               ;
-		qglRasterPos2dv              = 	dllRasterPos2dv              ;
-		qglRasterPos2f               = 	dllRasterPos2f               ;
-		qglRasterPos2fv              = 	dllRasterPos2fv              ;
-		qglRasterPos2i               = 	dllRasterPos2i               ;
-		qglRasterPos2iv              = 	dllRasterPos2iv              ;
-		qglRasterPos2s               = 	dllRasterPos2s               ;
-		qglRasterPos2sv              = 	dllRasterPos2sv              ;
-		qglRasterPos3d               = 	dllRasterPos3d               ;
-		qglRasterPos3dv              = 	dllRasterPos3dv              ;
-		qglRasterPos3f               = 	dllRasterPos3f               ;
-		qglRasterPos3fv              = 	dllRasterPos3fv              ;
-		qglRasterPos3i               = 	dllRasterPos3i               ;
-		qglRasterPos3iv              = 	dllRasterPos3iv              ;
-		qglRasterPos3s               = 	dllRasterPos3s               ;
-		qglRasterPos3sv              = 	dllRasterPos3sv              ;
-		qglRasterPos4d               = 	dllRasterPos4d               ;
-		qglRasterPos4dv              = 	dllRasterPos4dv              ;
-		qglRasterPos4f               = 	dllRasterPos4f               ;
-		qglRasterPos4fv              = 	dllRasterPos4fv              ;
-		qglRasterPos4i               = 	dllRasterPos4i               ;
-		qglRasterPos4iv              = 	dllRasterPos4iv              ;
-		qglRasterPos4s               = 	dllRasterPos4s               ;
-		qglRasterPos4sv              = 	dllRasterPos4sv              ;
-		qglReadBuffer                = 	dllReadBuffer                ;
-		qglReadPixels                = 	dllReadPixels                ;
-		qglRectd                     = 	dllRectd                     ;
-		qglRectdv                    = 	dllRectdv                    ;
-		qglRectf                     = 	dllRectf                     ;
-		qglRectfv                    = 	dllRectfv                    ;
-		qglRecti                     = 	dllRecti                     ;
-		qglRectiv                    = 	dllRectiv                    ;
-		qglRects                     = 	dllRects                     ;
-		qglRectsv                    = 	dllRectsv                    ;
-		qglRenderMode                = 	dllRenderMode                ;
-		qglRotated                   = 	dllRotated                   ;
-		qglRotatef                   = 	dllRotatef                   ;
-		qglScaled                    = 	dllScaled                    ;
-		qglScalef                    = 	dllScalef                    ;
-		qglScissor                   = 	dllScissor                   ;
-		qglSelectBuffer              = 	dllSelectBuffer              ;
-		qglShadeModel                = 	dllShadeModel                ;
-		qglStencilFunc               = 	dllStencilFunc               ;
-		qglStencilMask               = 	dllStencilMask               ;
-		qglStencilOp                 = 	dllStencilOp                 ;
-		qglTexCoord1d                = 	dllTexCoord1d                ;
-		qglTexCoord1dv               = 	dllTexCoord1dv               ;
-		qglTexCoord1f                = 	dllTexCoord1f                ;
-		qglTexCoord1fv               = 	dllTexCoord1fv               ;
-		qglTexCoord1i                = 	dllTexCoord1i                ;
-		qglTexCoord1iv               = 	dllTexCoord1iv               ;
-		qglTexCoord1s                = 	dllTexCoord1s                ;
-		qglTexCoord1sv               = 	dllTexCoord1sv               ;
-		qglTexCoord2d                = 	dllTexCoord2d                ;
-		qglTexCoord2dv               = 	dllTexCoord2dv               ;
-		qglTexCoord2f                = 	dllTexCoord2f                ;
-		qglTexCoord2fv               = 	dllTexCoord2fv               ;
-		qglTexCoord2i                = 	dllTexCoord2i                ;
-		qglTexCoord2iv               = 	dllTexCoord2iv               ;
-		qglTexCoord2s                = 	dllTexCoord2s                ;
-		qglTexCoord2sv               = 	dllTexCoord2sv               ;
-		qglTexCoord3d                = 	dllTexCoord3d                ;
-		qglTexCoord3dv               = 	dllTexCoord3dv               ;
-		qglTexCoord3f                = 	dllTexCoord3f                ;
-		qglTexCoord3fv               = 	dllTexCoord3fv               ;
-		qglTexCoord3i                = 	dllTexCoord3i                ;
-		qglTexCoord3iv               = 	dllTexCoord3iv               ;
-		qglTexCoord3s                = 	dllTexCoord3s                ;
-		qglTexCoord3sv               = 	dllTexCoord3sv               ;
-		qglTexCoord4d                = 	dllTexCoord4d                ;
-		qglTexCoord4dv               = 	dllTexCoord4dv               ;
-		qglTexCoord4f                = 	dllTexCoord4f                ;
-		qglTexCoord4fv               = 	dllTexCoord4fv               ;
-		qglTexCoord4i                = 	dllTexCoord4i                ;
-		qglTexCoord4iv               = 	dllTexCoord4iv               ;
-		qglTexCoord4s                = 	dllTexCoord4s                ;
-		qglTexCoord4sv               = 	dllTexCoord4sv               ;
-		qglTexCoordPointer           = 	dllTexCoordPointer           ;
-		qglTexEnvf                   = 	dllTexEnvf                   ;
-		qglTexEnvfv                  = 	dllTexEnvfv                  ;
-		qglTexEnvi                   = 	dllTexEnvi                   ;
-		qglTexEnviv                  = 	dllTexEnviv                  ;
-		qglTexGend                   = 	dllTexGend                   ;
-		qglTexGendv                  = 	dllTexGendv                  ;
-		qglTexGenf                   = 	dllTexGenf                   ;
-		qglTexGenfv                  = 	dllTexGenfv                  ;
-		qglTexGeni                   = 	dllTexGeni                   ;
-		qglTexGeniv                  = 	dllTexGeniv                  ;
-		qglTexImage1D                = 	dllTexImage1D                ;
-		qglTexImage2D                = 	dllTexImage2D                ;
-		qglTexParameterf             = 	dllTexParameterf             ;
-		qglTexParameterfv            = 	dllTexParameterfv            ;
-		qglTexParameteri             = 	dllTexParameteri             ;
-		qglTexParameteriv            = 	dllTexParameteriv            ;
-		qglTexSubImage1D             = 	dllTexSubImage1D             ;
-		qglTexSubImage2D             = 	dllTexSubImage2D             ;
-		qglTranslated                = 	dllTranslated                ;
-		qglTranslatef                = 	dllTranslatef                ;
-		qglVertex2d                  = 	dllVertex2d                  ;
-		qglVertex2dv                 = 	dllVertex2dv                 ;
-		qglVertex2f                  = 	dllVertex2f                  ;
-		qglVertex2fv                 = 	dllVertex2fv                 ;
-		qglVertex2i                  = 	dllVertex2i                  ;
-		qglVertex2iv                 = 	dllVertex2iv                 ;
-		qglVertex2s                  = 	dllVertex2s                  ;
-		qglVertex2sv                 = 	dllVertex2sv                 ;
-		qglVertex3d                  = 	dllVertex3d                  ;
-		qglVertex3dv                 = 	dllVertex3dv                 ;
-		qglVertex3f                  = 	dllVertex3f                  ;
-		qglVertex3fv                 = 	dllVertex3fv                 ;
-		qglVertex3i                  = 	dllVertex3i                  ;
-		qglVertex3iv                 = 	dllVertex3iv                 ;
-		qglVertex3s                  = 	dllVertex3s                  ;
-		qglVertex3sv                 = 	dllVertex3sv                 ;
-		qglVertex4d                  = 	dllVertex4d                  ;
-		qglVertex4dv                 = 	dllVertex4dv                 ;
-		qglVertex4f                  = 	dllVertex4f                  ;
-		qglVertex4fv                 = 	dllVertex4fv                 ;
-		qglVertex4i                  = 	dllVertex4i                  ;
-		qglVertex4iv                 = 	dllVertex4iv                 ;
-		qglVertex4s                  = 	dllVertex4s                  ;
-		qglVertex4sv                 = 	dllVertex4sv                 ;
-		qglVertexPointer             = 	dllVertexPointer             ;
-		qglViewport                  = 	dllViewport                  ;
-	}
-}
-
-#pragma warning (default : 4113 4133 4047 )
-
-
-
diff --git a/code/win32/win_resource.h b/code/win32/win_resource.h
deleted file mode 100644
index 93c517ea..00000000
--- a/code/win32/win_resource.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Quake III Arena source code; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by winquake.rc
-//
-#define IDS_STRING1                     1
-#define IDI_ICON1                       1
-#define IDB_BITMAP1                     1
-#define IDB_BITMAP2                     128
-#define IDC_CURSOR1                     129
-#define IDC_CURSOR2                     130
-#define IDC_CURSOR3                     131
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        132
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1005
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/code/win32/win_resource.rc b/code/win32/win_resource.rc
deleted file mode 100644
index 455a6d7d..00000000
--- a/code/win32/win_resource.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "win_resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <winresrc.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#ifndef __MINGW32__
-IDI_ICON1               ICON    DISCARDABLE     "../../misc/openmohaa.ico"
-#else
-IDI_ICON1               ICON    DISCARDABLE     "misc/openmohaa.ico"
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STRING1             "OpenMoHAA"
-END
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Application Manifest
-//
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "win_manifest.xml"
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/code/win32/win_shared.c b/code/win32/win_shared.c
deleted file mode 100644
index 33790a71..00000000
--- a/code/win32/win_shared.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../qcommon/q_shared.h"
-#include "../qcommon/qcommon.h"
-#include "win_local.h"
-#include <lmerr.h>
-#include <lmcons.h>
-#include <lmwksta.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <direct.h>
-#include <io.h>
-#include <conio.h>
-#include <intrin.h>
-
-/*
-================
-Sys_Milliseconds
-================
-*/
-int			sys_timeBase;
-int Sys_Milliseconds (void)
-{
-	int			sys_curtime;
-	static qboolean	initialized = qfalse;
-
-	if (!initialized) {
-		sys_timeBase = timeGetTime();
-		initialized = qtrue;
-	}
-	sys_curtime = timeGetTime() - sys_timeBase;
-
-	return sys_curtime;
-}
-
-/*
-**
-** Disable all optimizations temporarily so this code works correctly!
-**
-*/
-#pragma optimize( "", off )
-
-/*
-** --------------------------------------------------------------------------------
-**
-** PROCESSOR STUFF
-**
-** --------------------------------------------------------------------------------
-*/
-static void CPUID( int func, unsigned regs[4] )
-{
-	__cpuid(regs, func);
-	/*
-	unsigned regEAX, regEBX, regECX, regEDX;
-
-#ifndef __VECTORC
-	__asm mov eax, func
-	__asm __emit 00fh
-	__asm __emit 0a2h
-	__asm mov regEAX, eax
-	__asm mov regEBX, ebx
-	__asm mov regECX, ecx
-	__asm mov regEDX, edx
-
-	regs[0] = regEAX;
-	regs[1] = regEBX;
-	regs[2] = regECX;
-	regs[3] = regEDX;
-#else
-	regs[0] = 0;
-	regs[1] = 0;
-	regs[2] = 0;
-	regs[3] = 0;
-#endif
-*/
-}
-
-static int IsPentium( void )
-{
-#ifndef _WIN64
-	__asm 
-	{
-		pushfd						// save eflags
-		pop		eax
-		test	eax, 0x00200000		// check ID bit
-		jz		set21				// bit 21 is not set, so jump to set_21
-		and		eax, 0xffdfffff		// clear bit 21
-		push	eax					// save new value in register
-		popfd						// store new value in flags
-		pushfd
-		pop		eax
-		test	eax, 0x00200000		// check ID bit
-		jz		good
-		jmp		err					// cpuid not supported
-set21:
-		or		eax, 0x00200000		// set ID bit
-		push	eax					// store new value
-		popfd						// store new value in EFLAGS
-		pushfd
-		pop		eax
-		test	eax, 0x00200000		// if bit 21 is on
-		jnz		good
-		jmp		err
-	}
-
-err:
-	return qfalse;
-good:
-	return qtrue;
-#else
-	return qtrue;
-#endif
-}
-
-static int Is3DNOW( void )
-{
-	unsigned regs[4];
-	char pstring[16];
-	char processorString[13];
-
-	// get name of processor
-	CPUID( 0, ( unsigned int * ) pstring );
-	processorString[0] = pstring[4];
-	processorString[1] = pstring[5];
-	processorString[2] = pstring[6];
-	processorString[3] = pstring[7];
-	processorString[4] = pstring[12];
-	processorString[5] = pstring[13];
-	processorString[6] = pstring[14];
-	processorString[7] = pstring[15];
-	processorString[8] = pstring[8];
-	processorString[9] = pstring[9];
-	processorString[10] = pstring[10];
-	processorString[11] = pstring[11];
-	processorString[12] = 0;
-
-//  REMOVED because you can have 3DNow! on non-AMD systems
-//	if ( strcmp( processorString, "AuthenticAMD" ) )
-//		return qfalse;
-
-	// check AMD-specific functions
-	CPUID( 0x80000000, regs );
-	if ( regs[0] < 0x80000000 )
-		return qfalse;
-
-	// bit 31 of EDX denotes 3DNOW! support
-	CPUID( 0x80000001, regs );
-	if ( regs[3] & ( 1 << 31 ) )
-		return qtrue;
-
-	return qfalse;
-}
-
-static int IsKNI( void )
-{
-	unsigned regs[4];
-
-	// get CPU feature bits
-	CPUID( 1, regs );
-
-	// bit 25 of EDX denotes KNI existence
-	if ( regs[3] & ( 1 << 25 ) )
-		return qtrue;
-
-	return qfalse;
-}
-
-static int IsMMX( void )
-{
-	unsigned regs[4];
-
-	// get CPU feature bits
-	CPUID( 1, regs );
-
-	// bit 23 of EDX denotes MMX existence
-	if ( regs[3] & ( 1 << 23 ) )
-		return qtrue;
-	return qfalse;
-}
-
-int Sys_GetProcessorId( void )
-{
-#if defined _M_ALPHA
-	return CPUID_AXP;
-#elif !defined _M_IX86
-	return CPUID_GENERIC;
-#else
-
-	// verify we're at least a Pentium or 486 w/ CPUID support
-	if ( !IsPentium() )
-		return CPUID_INTEL_UNSUPPORTED;
-
-	// check for MMX
-	if ( !IsMMX() )
-	{
-		// Pentium or PPro
-		return CPUID_INTEL_PENTIUM;
-	}
-
-	// see if we're an AMD 3DNOW! processor
-	if ( Is3DNOW() )
-	{
-		return CPUID_AMD_3DNOW;
-	}
-
-	// see if we're an Intel Katmai
-	if ( IsKNI() )
-	{
-		return CPUID_INTEL_KATMAI;
-	}
-
-	// by default we're functionally a vanilla Pentium/MMX or P2/MMX
-	return CPUID_INTEL_MMX;
-
-#endif
-}
-
-/*
-**
-** Re-enable optimizations back to what they were
-**
-*/
-#pragma optimize( "", on )
-
-//============================================
-
-char *Sys_GetCurrentUser( void )
-{
-	static char s_userName[1024];
-	unsigned long size = sizeof( s_userName );
-
-
-	if ( !GetUserName( s_userName, &size ) )
-		strcpy( s_userName, "player" );
-
-	if ( !s_userName[0] )
-	{
-		strcpy( s_userName, "player" );
-	}
-
-	return s_userName;
-}
-
-char	*Sys_DefaultHomePath(void) {
-	return NULL;
-}
-
-char *Sys_DefaultInstallPath(void)
-{
-	return Sys_Cwd();
-}
-
diff --git a/code/win32/win_snd.c b/code/win32/win_snd.c
deleted file mode 100644
index 084ed444..00000000
--- a/code/win32/win_snd.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-#include <float.h>
-
-#include "../client/snd_local.h"
-#include "win_local.h"
-
-HRESULT (WINAPI *pDirectSoundCreate)(GUID FAR *lpGUID, LPDIRECTSOUND FAR *lplpDS, IUnknown FAR *pUnkOuter);
-#define iDirectSoundCreate(a,b,c)	pDirectSoundCreate(a,b,c)
-
-#define SECONDARY_BUFFER_SIZE	0x10000
-
-
-static qboolean	dsound_init;
-static int		sample16;
-static DWORD	gSndBufSize;
-static DWORD	locksize;
-static LPDIRECTSOUND pDS;
-static LPDIRECTSOUNDBUFFER pDSBuf, pDSPBuf;
-static HINSTANCE hInstDS;
-
-
-static const char *DSoundError( int error ) {
-	switch ( error ) {
-	case DSERR_BUFFERLOST:
-		return "DSERR_BUFFERLOST";
-	case DSERR_INVALIDCALL:
-		return "DSERR_INVALIDCALLS";
-	case DSERR_INVALIDPARAM:
-		return "DSERR_INVALIDPARAM";
-	case DSERR_PRIOLEVELNEEDED:
-		return "DSERR_PRIOLEVELNEEDED";
-	}
-
-	return "unknown";
-}
-
-/*
-==================
-SNDDMA_Shutdown
-==================
-*/
-void SNDDMA_Shutdown( void ) {
-	Com_DPrintf( "Shutting down sound system\n" );
-
-	if ( pDS ) {
-		Com_DPrintf( "Destroying DS buffers\n" );
-		if ( pDS )
-		{
-			Com_DPrintf( "...setting NORMAL coop level\n" );
-			pDS->lpVtbl->SetCooperativeLevel( pDS, g_wv.hWnd, DSSCL_PRIORITY );
-		}
-
-		if ( pDSBuf )
-		{
-			Com_DPrintf( "...stopping and releasing sound buffer\n" );
-			pDSBuf->lpVtbl->Stop( pDSBuf );
-			pDSBuf->lpVtbl->Release( pDSBuf );
-		}
-
-		// only release primary buffer if it's not also the mixing buffer we just released
-		if ( pDSPBuf && ( pDSBuf != pDSPBuf ) )
-		{
-			Com_DPrintf( "...releasing primary buffer\n" );
-			pDSPBuf->lpVtbl->Release( pDSPBuf );
-		}
-		pDSBuf = NULL;
-		pDSPBuf = NULL;
-
-		dma.buffer = NULL;
-
-		Com_DPrintf( "...releasing DS object\n" );
-		pDS->lpVtbl->Release( pDS );
-	}
-
-	if ( hInstDS ) {
-		Com_DPrintf( "...freeing DSOUND.DLL\n" );
-		FreeLibrary( hInstDS );
-		hInstDS = NULL;
-	}
-
-	pDS = NULL;
-	pDSBuf = NULL;
-	pDSPBuf = NULL;
-	dsound_init = qfalse;
-	memset ((void *)&dma, 0, sizeof (dma));
-	CoUninitialize( );
-}
-
-/*
-==================
-SNDDMA_Init
-
-Initialize direct sound
-Returns false if failed
-==================
-*/
-qboolean SNDDMA_Init(void) {
-
-	memset ((void *)&dma, 0, sizeof (dma));
-	dsound_init = 0;
-
-	CoInitialize(NULL);
-
-	if ( !SNDDMA_InitDS () ) {
-		return qfalse;
-	}
-
-	dsound_init = qtrue;
-
-	Com_DPrintf("Completed successfully\n" );
-
-    return qtrue;
-}
-
-#undef DEFINE_GUID
-
-#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-        EXTERN_C const GUID name \
-                = { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
-
-// DirectSound Component GUID {47D4D946-62E8-11CF-93BC-444553540000}
-DEFINE_GUID(CLSID_DirectSound, 0x47d4d946, 0x62e8, 0x11cf, 0x93, 0xbc, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0);
-
-// DirectSound 8.0 Component GUID {3901CC3F-84B5-4FA4-BA35-AA8172B8A09B}
-DEFINE_GUID(CLSID_DirectSound8, 0x3901cc3f, 0x84b5, 0x4fa4, 0xba, 0x35, 0xaa, 0x81, 0x72, 0xb8, 0xa0, 0x9b);
-
-DEFINE_GUID(IID_IDirectSound8, 0xC50A7E93, 0xF395, 0x4834, 0x9E, 0xF6, 0x7F, 0xA9, 0x9D, 0xE5, 0x09, 0x66);
-DEFINE_GUID(IID_IDirectSound, 0x279AFA83, 0x4981, 0x11CE, 0xA5, 0x21, 0x00, 0x20, 0xAF, 0x0B, 0xE5, 0x60);
-
-
-int SNDDMA_InitDS ()
-{
-	HRESULT			hresult;
-	DSBUFFERDESC	dsbuf;
-	DSBCAPS			dsbcaps;
-	WAVEFORMATEX	format;
-	int				use8;
-
-	Com_Printf( "Initializing DirectSound\n");
-
-	use8 = 1;
-    // Create IDirectSound using the primary sound device
-    if( FAILED( hresult = CoCreateInstance(&CLSID_DirectSound8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound8, (void **)&pDS))) {
-		use8 = 0;
-	    if( FAILED( hresult = CoCreateInstance(&CLSID_DirectSound, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void **)&pDS))) {
-			Com_Printf ("failed\n");
-			SNDDMA_Shutdown ();
-			return qfalse;
-		}
-	}
-
-	hresult = pDS->lpVtbl->Initialize( pDS, NULL);
-
-	Com_DPrintf( "ok\n" );
-
-	Com_DPrintf("...setting DSSCL_PRIORITY coop level: " );
-
-	if ( DS_OK != pDS->lpVtbl->SetCooperativeLevel( pDS, g_wv.hWnd, DSSCL_PRIORITY ) )	{
-		Com_Printf ("failed\n");
-		SNDDMA_Shutdown ();
-		return qfalse;
-	}
-	Com_DPrintf("ok\n" );
-
-
-	// create the secondary buffer we'll actually work with
-	dma.channels = 2;
-	dma.samplebits = 16;
-
-//	if (s_khz->integer == 44)
-//		dma.speed = 44100;
-//	else if (s_khz->integer == 22)
-//		dma.speed = 22050;
-//	else
-//		dma.speed = 11025;
-
-	dma.speed = 22050;
-	memset (&format, 0, sizeof(format));
-	format.wFormatTag = WAVE_FORMAT_PCM;
-    format.nChannels = dma.channels;
-    format.wBitsPerSample = dma.samplebits;
-    format.nSamplesPerSec = dma.speed;
-    format.nBlockAlign = format.nChannels * format.wBitsPerSample / 8;
-    format.cbSize = 0;
-    format.nAvgBytesPerSec = format.nSamplesPerSec*format.nBlockAlign; 
-
-	memset (&dsbuf, 0, sizeof(dsbuf));
-	dsbuf.dwSize = sizeof(DSBUFFERDESC);
-
-	// Micah: take advantage of 2D hardware.if available.
-	dsbuf.dwFlags = DSBCAPS_LOCHARDWARE;
-	if (use8) {
-		dsbuf.dwFlags |= DSBCAPS_GETCURRENTPOSITION2;
-	}
-	dsbuf.dwBufferBytes = SECONDARY_BUFFER_SIZE;
-	dsbuf.lpwfxFormat = &format;
-	
-	memset(&dsbcaps, 0, sizeof(dsbcaps));
-	dsbcaps.dwSize = sizeof(dsbcaps);
-	
-	Com_DPrintf( "...creating secondary buffer: " );
-	if (DS_OK == pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL)) {
-		Com_Printf( "locked hardware.  ok\n" );
-	}
-	else {
-		// Couldn't get hardware, fallback to software.
-		dsbuf.dwFlags = DSBCAPS_LOCSOFTWARE;
-		if (use8) {
-			dsbuf.dwFlags |= DSBCAPS_GETCURRENTPOSITION2;
-		}
-		if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL)) {
-			Com_Printf( "failed\n" );
-			SNDDMA_Shutdown ();
-			return qfalse;
-		}
-		Com_DPrintf( "forced to software.  ok\n" );
-	}
-		
-	// Make sure mixer is active
-	if ( DS_OK != pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING) ) {
-		Com_Printf ("*** Looped sound play failed ***\n");
-		SNDDMA_Shutdown ();
-		return qfalse;
-	}
-
-	// get the returned buffer size
-	if ( DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps) ) {
-		Com_Printf ("*** GetCaps failed ***\n");
-		SNDDMA_Shutdown ();
-		return qfalse;
-	}
-	
-	gSndBufSize = dsbcaps.dwBufferBytes;
-
-	dma.channels = format.nChannels;
-	dma.samplebits = format.wBitsPerSample;
-	dma.speed = format.nSamplesPerSec;
-	dma.samples = gSndBufSize/(dma.samplebits/8);
-	dma.submission_chunk = 1;
-	dma.buffer = NULL;			// must be locked first
-
-	sample16 = (dma.samplebits/8) - 1;
-
-	SNDDMA_BeginPainting ();
-	if (dma.buffer)
-		memset(dma.buffer, 0, dma.samples * dma.samplebits/8);
-	SNDDMA_Submit ();
-	return 1;
-}
-/*
-==============
-SNDDMA_GetDMAPos
-
-return the current sample position (in mono samples read)
-inside the recirculating dma buffer, so the mixing code will know
-how many sample are required to fill it up.
-===============
-*/
-int SNDDMA_GetDMAPos( void ) {
-	MMTIME	mmtime;
-	int		s;
-	DWORD	dwWrite;
-
-	if ( !dsound_init ) {
-		return 0;
-	}
-
-	mmtime.wType = TIME_SAMPLES;
-	pDSBuf->lpVtbl->GetCurrentPosition(pDSBuf, &mmtime.u.sample, &dwWrite);
-
-	s = mmtime.u.sample;
-
-	s >>= sample16;
-
-	s &= (dma.samples-1);
-
-	return s;
-}
-
-/*
-==============
-SNDDMA_BeginPainting
-
-Makes sure dma.buffer is valid
-===============
-*/
-void SNDDMA_BeginPainting( void ) {
-	int		reps;
-	DWORD	dwSize2;
-	DWORD	*pbuf, *pbuf2;
-	HRESULT	hresult;
-	DWORD	dwStatus;
-
-	if ( !pDSBuf ) {
-		return;
-	}
-
-	// if the buffer was lost or stopped, restore it and/or restart it
-	if ( pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DS_OK ) {
-		Com_Printf ("Couldn't get sound buffer status\n");
-	}
-	
-	if (dwStatus & DSBSTATUS_BUFFERLOST)
-		pDSBuf->lpVtbl->Restore (pDSBuf);
-	
-	if (!(dwStatus & DSBSTATUS_PLAYING))
-		pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
-
-	// lock the dsound buffer
-
-	reps = 0;
-	dma.buffer = NULL;
-
-	while ((hresult = pDSBuf->lpVtbl->Lock(pDSBuf, 0, gSndBufSize, &pbuf, &locksize, 
-								   &pbuf2, &dwSize2, 0)) != DS_OK)
-	{
-		if (hresult != DSERR_BUFFERLOST)
-		{
-			Com_Printf( "SNDDMA_BeginPainting: Lock failed with error '%s'\n", DSoundError( hresult ) );
-			S_Shutdown ();
-			return;
-		}
-		else
-		{
-			pDSBuf->lpVtbl->Restore( pDSBuf );
-		}
-
-		if (++reps > 2)
-			return;
-	}
-	dma.buffer = (unsigned char *)pbuf;
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-Also unlocks the dsound buffer
-===============
-*/
-void SNDDMA_Submit( void ) {
-    // unlock the dsound buffer
-	if ( pDSBuf ) {
-		pDSBuf->lpVtbl->Unlock(pDSBuf, dma.buffer, locksize, NULL, 0);
-	}
-}
-
-
-/*
-=================
-SNDDMA_Activate
-
-When we change windows we need to do this
-=================
-*/
-void SNDDMA_Activate( void ) {
-	if ( !pDS ) {
-		return;
-	}
-
-	if ( DS_OK != pDS->lpVtbl->SetCooperativeLevel( pDS, g_wv.hWnd, DSSCL_PRIORITY ) )	{
-		Com_Printf ("sound SetCooperativeLevel failed\n");
-		SNDDMA_Shutdown ();
-	}
-}
-
-
diff --git a/code/win32/win_syscon.c b/code/win32/win_syscon.c
deleted file mode 100644
index 0fd2162e..00000000
--- a/code/win32/win_syscon.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-// win_syscon.h
-#include "../client/client.h"
-#include "win_local.h"
-#include "resource.h"
-#include <errno.h>
-#include <float.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <direct.h>
-#include <io.h>
-#include <conio.h>
-
-#define COPY_ID			1
-#define QUIT_ID			2
-#define CLEAR_ID		3
-
-#define ERRORBOX_ID		10
-#define ERRORTEXT_ID	11
-
-#define EDIT_ID			100
-#define INPUT_ID		101
-
-typedef struct
-{
-	HWND		hWnd;
-	HWND		hwndBuffer;
-
-	HWND		hwndButtonClear;
-	HWND		hwndButtonCopy;
-	HWND		hwndButtonQuit;
-
-	HWND		hwndErrorBox;
-	HWND		hwndErrorText;
-
-	HBITMAP		hbmLogo;
-	HBITMAP		hbmClearBitmap;
-
-	HBRUSH		hbrEditBackground;
-	HBRUSH		hbrErrorBackground;
-
-	HFONT		hfBufferFont;
-	HFONT		hfButtonFont;
-
-	HWND		hwndInputLine;
-
-	char		errorString[80];
-
-	char		consoleText[512], returnedText[512];
-	int			visLevel;
-	qboolean	quitOnClose;
-	int			windowWidth, windowHeight;
-	
-	WNDPROC		SysInputLineWndProc;
-
-} WinConData;
-
-static WinConData s_wcd;
-
-static LRESULT WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	char *cmdString;
-	static qboolean s_timePolarity;
-
-	switch (uMsg)
-	{
-	case WM_ACTIVATE:
-		if ( LOWORD( wParam ) != WA_INACTIVE )
-		{
-			SetFocus( s_wcd.hwndInputLine );
-		}
-
-		if ( com_viewlog && ( com_dedicated && !com_dedicated->integer ) )
-		{
-			// if the viewlog is open, check to see if it's being minimized
-			if ( com_viewlog->integer == 1 )
-			{
-				if ( HIWORD( wParam ) )		// minimized flag
-				{
-					Cvar_Set( "viewlog", "2" );
-				}
-			}
-			else if ( com_viewlog->integer == 2 )
-			{
-				if ( !HIWORD( wParam ) )		// minimized flag
-				{
-					Cvar_Set( "viewlog", "1" );
-				}
-			}
-		}
-		break;
-
-	case WM_CLOSE:
-		if ( ( com_dedicated && com_dedicated->integer ) )
-		{
-			cmdString = CopyString( "quit" );
-			Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString );
-		}
-		else if ( s_wcd.quitOnClose )
-		{
-			PostQuitMessage( 0 );
-		}
-		else
-		{
-			Sys_ShowConsole( 0, qfalse );
-			Cvar_Set( "viewlog", "0" );
-		}
-		return 0;
-	case WM_CTLCOLORSTATIC:
-		if ( ( HWND ) lParam == s_wcd.hwndBuffer )
-		{
-			SetBkColor( ( HDC ) wParam, RGB( 0x00, 0x00, 0xB0 ) );
-			SetTextColor( ( HDC ) wParam, RGB( 0xff, 0xff, 0x00 ) );
-
-#if 0	// this draws a background in the edit box, but there are issues with this
-			if ( ( hdcScaled = CreateCompatibleDC( ( HDC ) wParam ) ) != 0 )
-			{
-				if ( SelectObject( ( HDC ) hdcScaled, s_wcd.hbmLogo ) )
-				{
-					StretchBlt( ( HDC ) wParam, 0, 0, 512, 384, 
-							hdcScaled, 0, 0, 512, 384,
-							SRCCOPY );
-				}
-				DeleteDC( hdcScaled );
-			}
-#endif
-			return (LRESULT) s_wcd.hbrEditBackground;
-		}
-		else if ( ( HWND ) lParam == s_wcd.hwndErrorBox )
-		{
-			if ( s_timePolarity & 1 )
-			{
-				SetBkColor( ( HDC ) wParam, RGB( 0x80, 0x80, 0x80 ) );
-				SetTextColor( ( HDC ) wParam, RGB( 0xff, 0x0, 0x00 ) );
-			}
-			else
-			{
-				SetBkColor( ( HDC ) wParam, RGB( 0x80, 0x80, 0x80 ) );
-				SetTextColor( ( HDC ) wParam, RGB( 0x00, 0x0, 0x00 ) );
-			}
-			return (LRESULT) s_wcd.hbrErrorBackground;
-		}
-		break;
-
-	case WM_COMMAND:
-		if ( wParam == COPY_ID )
-		{
-			SendMessage( s_wcd.hwndBuffer, EM_SETSEL, 0, -1 );
-			SendMessage( s_wcd.hwndBuffer, WM_COPY, 0, 0 );
-		}
-		else if ( wParam == QUIT_ID )
-		{
-			if ( s_wcd.quitOnClose )
-			{
-				PostQuitMessage( 0 );
-			}
-			else
-			{
-				cmdString = CopyString( "quit" );
-				Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString );
-			}
-		}
-		else if ( wParam == CLEAR_ID )
-		{
-			SendMessage( s_wcd.hwndBuffer, EM_SETSEL, 0, -1 );
-			SendMessage( s_wcd.hwndBuffer, EM_REPLACESEL, FALSE, ( LPARAM ) "" );
-			UpdateWindow( s_wcd.hwndBuffer );
-		}
-		break;
-	case WM_CREATE:
-//		s_wcd.hbmLogo = LoadBitmap( g_wv.hInstance, MAKEINTRESOURCE( IDB_BITMAP1 ) );
-//		s_wcd.hbmClearBitmap = LoadBitmap( g_wv.hInstance, MAKEINTRESOURCE( IDB_BITMAP2 ) );
-		s_wcd.hbrEditBackground = CreateSolidBrush( RGB( 0x00, 0x00, 0xB0 ) );
-		s_wcd.hbrErrorBackground = CreateSolidBrush( RGB( 0x80, 0x80, 0x80 ) );
-		SetTimer( hWnd, 1, 1000, NULL );
-		break;
-	case WM_ERASEBKGND:
-#if 0
-	HDC hdcScaled;
-	HGDIOBJ oldObject;
-
-#if 1	// a single, large image
-		hdcScaled = CreateCompatibleDC( ( HDC ) wParam );
-		assert( hdcScaled != 0 );
-
-		if ( hdcScaled )
-		{
-			oldObject = SelectObject( ( HDC ) hdcScaled, s_wcd.hbmLogo );
-			assert( oldObject != 0 );
-			if ( oldObject )
-			{
-				StretchBlt( ( HDC ) wParam, 0, 0, s_wcd.windowWidth, s_wcd.windowHeight, 
-						hdcScaled, 0, 0, 512, 384,
-						SRCCOPY );
-			}
-			DeleteDC( hdcScaled );
-			hdcScaled = 0;
-		}
-#else	// a repeating brush
-		{
-			HBRUSH hbrClearBrush;
-			RECT r;
-
-			GetWindowRect( hWnd, &r );
-
-			r.bottom = r.bottom - r.top + 1;
-			r.right = r.right - r.left + 1;
-			r.top = 0;
-			r.left = 0;
-
-			hbrClearBrush = CreatePatternBrush( s_wcd.hbmClearBitmap );
-
-			assert( hbrClearBrush != 0 );
-
-			if ( hbrClearBrush )
-			{
-				FillRect( ( HDC ) wParam, &r, hbrClearBrush );
-				DeleteObject( hbrClearBrush );
-			}
-		}
-#endif
-		return 1;
-#endif
-	    return DefWindowProc( hWnd, uMsg, wParam, lParam );
-	case WM_TIMER:
-		if ( wParam == 1 )
-		{
-			s_timePolarity = !s_timePolarity;
-			if ( s_wcd.hwndErrorBox )
-			{
-				InvalidateRect( s_wcd.hwndErrorBox, NULL, FALSE );
-			}
-		}
-		break;
-    }
-
-    return DefWindowProc( hWnd, uMsg, wParam, lParam );
-}
-
-LONG WINAPI InputLineWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	char inputBuffer[1024];
-
-	switch ( uMsg )
-	{
-	case WM_KILLFOCUS:
-		if ( ( HWND ) wParam == s_wcd.hWnd ||
-			 ( HWND ) wParam == s_wcd.hwndErrorBox )
-		{
-			SetFocus( hWnd );
-			return 0;
-		}
-		break;
-
-	case WM_CHAR:
-		if ( wParam == 13 )
-		{
-			GetWindowText( s_wcd.hwndInputLine, inputBuffer, sizeof( inputBuffer ) );
-			strncat( s_wcd.consoleText, inputBuffer, sizeof( s_wcd.consoleText ) - strlen( s_wcd.consoleText ) - 5 );
-			strcat( s_wcd.consoleText, "\n" );
-			SetWindowText( s_wcd.hwndInputLine, "" );
-
-			Sys_Print( va( "]%s\n", inputBuffer ) );
-
-			return 0;
-		}
-	}
-
-	return CallWindowProc( s_wcd.SysInputLineWndProc, hWnd, uMsg, wParam, lParam );
-}
-
-/*
-** Sys_CreateConsole
-*/
-void Sys_CreateConsole( void )
-{
-	HDC hDC;
-	WNDCLASS wc;
-	RECT rect;
-	const char *DEDCLASS = "Q3 WinConsole";
-	int nHeight;
-	int swidth, sheight;
-	int DEDSTYLE = WS_POPUPWINDOW | WS_CAPTION | WS_MINIMIZEBOX;
-
-	memset( &wc, 0, sizeof( wc ) );
-
-	wc.style         = 0;
-	wc.lpfnWndProc   = (WNDPROC) ConWndProc;
-	wc.cbClsExtra    = 0;
-	wc.cbWndExtra    = 0;
-	wc.hInstance     = g_wv.hInstance;
-	wc.hIcon         = LoadIcon( g_wv.hInstance, MAKEINTRESOURCE(IDI_ICON1));
-	wc.hCursor       = LoadCursor (NULL,IDC_ARROW);
-	wc.hbrBackground = (void *)COLOR_WINDOW;
-	wc.lpszMenuName  = 0;
-	wc.lpszClassName = DEDCLASS;
-
-	if ( !RegisterClass (&wc) )
-		return;
-
-	rect.left = 0;
-	rect.right = 540;
-	rect.top = 0;
-	rect.bottom = 450;
-	AdjustWindowRect( &rect, DEDSTYLE, FALSE );
-
-	hDC = GetDC( GetDesktopWindow() );
-	swidth = GetDeviceCaps( hDC, HORZRES );
-	sheight = GetDeviceCaps( hDC, VERTRES );
-	ReleaseDC( GetDesktopWindow(), hDC );
-
-	s_wcd.windowWidth = rect.right - rect.left + 1;
-	s_wcd.windowHeight = rect.bottom - rect.top + 1;
-
-	s_wcd.hWnd = CreateWindowEx( 0,
-							   DEDCLASS,
-							   "OpenMoHAA Console",
-							   DEDSTYLE,
-							   ( swidth - 600 ) / 2, ( sheight - 450 ) / 2 , rect.right - rect.left + 1, rect.bottom - rect.top + 1,
-							   NULL,
-							   NULL,
-							   g_wv.hInstance,
-							   NULL );
-
-	if ( s_wcd.hWnd == NULL )
-	{
-		return;
-	}
-
-	//
-	// create fonts
-	//
-	hDC = GetDC( s_wcd.hWnd );
-	nHeight = -MulDiv( 8, GetDeviceCaps( hDC, LOGPIXELSY), 72);
-
-	s_wcd.hfBufferFont = CreateFont( nHeight,
-									  0,
-									  0,
-									  0,
-									  FW_LIGHT,
-									  0,
-									  0,
-									  0,
-									  DEFAULT_CHARSET,
-									  OUT_DEFAULT_PRECIS,
-									  CLIP_DEFAULT_PRECIS,
-									  DEFAULT_QUALITY,
-									  FF_MODERN | FIXED_PITCH,
-									  "Courier New" );
-
-	ReleaseDC( s_wcd.hWnd, hDC );
-
-	//
-	// create the input line
-	//
-	s_wcd.hwndInputLine = CreateWindow( "edit", NULL, WS_CHILD | WS_VISIBLE | WS_BORDER | 
-												ES_LEFT | ES_AUTOHSCROLL,
-												6, 400, 528, 20,
-												s_wcd.hWnd, 
-												( HMENU ) INPUT_ID,	// child window ID
-												g_wv.hInstance, NULL );
-
-	//
-	// create the buttons
-	//
-	s_wcd.hwndButtonCopy = CreateWindow( "button", NULL, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
-												5, 425, 72, 24,
-												s_wcd.hWnd, 
-												( HMENU ) COPY_ID,	// child window ID
-												g_wv.hInstance, NULL );
-	SendMessage( s_wcd.hwndButtonCopy, WM_SETTEXT, 0, ( LPARAM ) "copy" );
-
-	s_wcd.hwndButtonClear = CreateWindow( "button", NULL, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
-												82, 425, 72, 24,
-												s_wcd.hWnd, 
-												( HMENU ) CLEAR_ID,	// child window ID
-												g_wv.hInstance, NULL );
-	SendMessage( s_wcd.hwndButtonClear, WM_SETTEXT, 0, ( LPARAM ) "clear" );
-
-	s_wcd.hwndButtonQuit = CreateWindow( "button", NULL, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON,
-												462, 425, 72, 24,
-												s_wcd.hWnd, 
-												( HMENU ) QUIT_ID,	// child window ID
-												g_wv.hInstance, NULL );
-	SendMessage( s_wcd.hwndButtonQuit, WM_SETTEXT, 0, ( LPARAM ) "quit" );
-
-
-	//
-	// create the scrollbuffer
-	//
-	s_wcd.hwndBuffer = CreateWindow( "edit", NULL, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_BORDER | 
-												ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY,
-												6, 40, 526, 354,
-												s_wcd.hWnd, 
-												( HMENU ) EDIT_ID,	// child window ID
-												g_wv.hInstance, NULL );
-	SendMessage( s_wcd.hwndBuffer, WM_SETFONT, ( WPARAM ) s_wcd.hfBufferFont, 0 );
-
-	s_wcd.SysInputLineWndProc = ( WNDPROC ) SetWindowLongPtr( s_wcd.hwndInputLine, GWLP_WNDPROC, (LONG_PTR)InputLineWndProc );
-	SendMessage( s_wcd.hwndInputLine, WM_SETFONT, ( WPARAM ) s_wcd.hfBufferFont, 0 );
-
-	ShowWindow( s_wcd.hWnd, SW_SHOWDEFAULT);
-	UpdateWindow( s_wcd.hWnd );
-	SetForegroundWindow( s_wcd.hWnd );
-	SetFocus( s_wcd.hwndInputLine );
-
-	s_wcd.visLevel = 1;
-}
-
-/*
-** Sys_DestroyConsole
-*/
-void Sys_DestroyConsole( void ) {
-	if ( s_wcd.hWnd ) {
-		ShowWindow( s_wcd.hWnd, SW_HIDE );
-		CloseWindow( s_wcd.hWnd );
-		DestroyWindow( s_wcd.hWnd );
-		s_wcd.hWnd = 0;
-	}
-}
-
-/*
-** Sys_ShowConsole
-*/
-void Sys_ShowConsole( int visLevel, qboolean quitOnClose )
-{
-	s_wcd.quitOnClose = quitOnClose;
-
-	if ( visLevel == s_wcd.visLevel )
-	{
-		return;
-	}
-
-	s_wcd.visLevel = visLevel;
-
-	if ( !s_wcd.hWnd )
-		return;
-
-	switch ( visLevel )
-	{
-	case 0:
-		ShowWindow( s_wcd.hWnd, SW_HIDE );
-		break;
-	case 1:
-		ShowWindow( s_wcd.hWnd, SW_SHOWNORMAL );
-		SendMessage( s_wcd.hwndBuffer, EM_LINESCROLL, 0, 0xffff );
-		break;
-	case 2:
-		ShowWindow( s_wcd.hWnd, SW_MINIMIZE );
-		break;
-	default:
-		Sys_Error( "Invalid visLevel %d sent to Sys_ShowConsole\n", visLevel );
-		break;
-	}
-}
-
-/*
-** Sys_ConsoleInput
-*/
-char *Sys_ConsoleInput( void )
-{
-	if ( s_wcd.consoleText[0] == 0 )
-	{
-		return NULL;
-	}
-		
-	strcpy( s_wcd.returnedText, s_wcd.consoleText );
-	s_wcd.consoleText[0] = 0;
-	
-	return s_wcd.returnedText;
-}
-
-/*
-** Conbuf_AppendText
-*/
-void Conbuf_AppendText( const char *pMsg )
-{
-#define CONSOLE_BUFFER_SIZE		16384
-
-	char buffer[CONSOLE_BUFFER_SIZE*2];
-	char *b = buffer;
-	const char *msg;
-	int bufLen;
-	int i = 0;
-	static unsigned long s_totalChars;
-
-	//
-	// if the message is REALLY long, use just the last portion of it
-	//
-	if ( strlen( pMsg ) > CONSOLE_BUFFER_SIZE - 1 )
-	{
-		msg = pMsg + strlen( pMsg ) - CONSOLE_BUFFER_SIZE + 1;
-	}
-	else
-	{
-		msg = pMsg;
-	}
-
-	//
-	// copy into an intermediate buffer
-	//
-	while ( msg[i] && ( ( b - buffer ) < sizeof( buffer ) - 1 ) )
-	{
-		if ( msg[i] == '\n' && msg[i+1] == '\r' )
-		{
-			b[0] = '\r';
-			b[1] = '\n';
-			b += 2;
-			i++;
-		}
-		else if ( msg[i] == '\r' )
-		{
-			b[0] = '\r';
-			b[1] = '\n';
-			b += 2;
-		}
-		else if ( msg[i] == '\n' )
-		{
-			b[0] = '\r';
-			b[1] = '\n';
-			b += 2;
-		}
-		else if (pMsg[i + 1] == 0x1B)
-		{
-			i++;
-		}
-		else
-		{
-			*b= msg[i];
-			b++;
-		}
-		i++;
-	}
-	*b = 0;
-	bufLen = b - buffer;
-
-	s_totalChars += bufLen;
-
-	//
-	// replace selection instead of appending if we're overflowing
-	//
-	if ( s_totalChars > 0x7fff )
-	{
-		SendMessage( s_wcd.hwndBuffer, EM_SETSEL, 0, -1 );
-		s_totalChars = bufLen;
-	}
-
-	//
-	// put this text into the windows console
-	//
-	SendMessage( s_wcd.hwndBuffer, EM_LINESCROLL, 0, 0xffff );
-	SendMessage( s_wcd.hwndBuffer, EM_SCROLLCARET, 0, 0 );
-	SendMessage( s_wcd.hwndBuffer, EM_REPLACESEL, 0, (LPARAM) buffer );
-}
-
-/*
-** Sys_SetErrorText
-*/
-void Sys_SetErrorText( const char *buf )
-{
-	Q_strncpyz( s_wcd.errorString, buf, sizeof( s_wcd.errorString ) );
-
-	if ( !s_wcd.hwndErrorBox )
-	{
-		s_wcd.hwndErrorBox = CreateWindow( "static", NULL, WS_CHILD | WS_VISIBLE | SS_SUNKEN,
-													6, 5, 526, 30,
-													s_wcd.hWnd, 
-													( HMENU ) ERRORBOX_ID,	// child window ID
-													g_wv.hInstance, NULL );
-		SendMessage( s_wcd.hwndErrorBox, WM_SETFONT, ( WPARAM ) s_wcd.hfBufferFont, 0 );
-		SetWindowText( s_wcd.hwndErrorBox, s_wcd.errorString );
-
-		DestroyWindow( s_wcd.hwndInputLine );
-		s_wcd.hwndInputLine = NULL;
-	}
-}
diff --git a/code/win32/win_wndproc.c b/code/win32/win_wndproc.c
deleted file mode 100644
index 08654139..00000000
--- a/code/win32/win_wndproc.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-===========================================================================
-Copyright (C) 1999-2005 Id Software, Inc.
-
-This file is part of Quake III Arena source code.
-
-Quake III Arena source code is free software; you can redistribute it
-and/or modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of the License,
-or (at your option) any later version.
-
-Quake III Arena source code is distributed in the hope that it will be
-useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Foobar; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-===========================================================================
-*/
-
-#include "../client/client.h"
-#include "win_local.h"
-
-WinVars_t	g_wv;
-
-#ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL (WM_MOUSELAST+1)  // message that will be supported by the OS 
-#endif
-
-static UINT MSH_MOUSEWHEEL;
-
-// Console variables that we need to access from this module
-cvar_t		*vid_xpos;			// X coordinate of window position
-cvar_t		*vid_ypos;			// Y coordinate of window position
-cvar_t		*r_fullscreen;
-
-#define VID_NUM_MODES ( sizeof( vid_modes ) / sizeof( vid_modes[0] ) )
-
-LONG WINAPI MainWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
-
-static qboolean s_alttab_disabled;
-
-static void WIN_DisableAltTab( void )
-{
-	if ( s_alttab_disabled )
-		return;
-
-	if ( !Q_stricmp( Cvar_VariableString( "arch" ), "winnt" ) )
-	{
-		RegisterHotKey( 0, 0, MOD_ALT, VK_TAB );
-	}
-	else
-	{
-		BOOL old;
-
-		SystemParametersInfo( SPI_SCREENSAVERRUNNING, 1, &old, 0 );
-	}
-	s_alttab_disabled = qtrue;
-}
-
-static void WIN_EnableAltTab( void )
-{
-	if ( s_alttab_disabled )
-	{
-		if ( !Q_stricmp( Cvar_VariableString( "arch" ), "winnt" ) )
-		{
-			UnregisterHotKey( 0, 0 );
-		}
-		else
-		{
-			BOOL old;
-
-			SystemParametersInfo( SPI_SCREENSAVERRUNNING, 0, &old, 0 );
-		}
-
-		s_alttab_disabled = qfalse;
-	}
-}
-
-/*
-==================
-VID_AppActivate
-==================
-*/
-static void VID_AppActivate(BOOL fActive, BOOL minimize)
-{
-	g_wv.isMinimized = minimize;
-
-	Com_DPrintf("VID_AppActivate: %i\n", fActive );
-
-	//Key_ClearStates();	// FIXME!!!
-
-	// we don't want to act like we're active if we're minimized
-	if (fActive && !g_wv.isMinimized )
-	{
-		g_wv.activeApp = qtrue;
-	}
-	else
-	{
-		g_wv.activeApp = qfalse;
-	}
-
-	// minimize/restore mouse-capture on demand
-	if (!g_wv.activeApp )
-	{
-		IN_Activate (qfalse);
-	}
-	else
-	{
-		IN_Activate (qtrue);
-	}
-}
-
-//==========================================================================
-
-static byte s_scantokey[128] =
-{
-	//  0           1       2       3       4       5       6       7 
-	//  8           9       A       B       C       D       E       F 
-		0  ,    27,     '1',    '2',    '3',    '4',    '5',    '6',
-		'7',    '8',    '9',    '0',    '-',    '=',    K_BACKSPACE, 9, // 0 
-		'q',    'w',    'e',    'r',    't',    'y',    'u',    'i',
-		'o',    'p',    '[',    ']',    13 ,    K_LCTRL,'a',  's',      // 1 
-		'd',    'f',    'g',    'h',    'j',    'k',    'l',    ';',
-		'\'' ,    '`',    K_LSHIFT,'\\',  'z',    'x',    'c',    'v',      // 2 
-		'b',    'n',    'm',    ',',    '.',    '/',    K_RSHIFT,'*',
-		K_LALT,' ',   K_CAPSLOCK  ,    K_F1, K_F2, K_F3, K_F4, K_F5,   // 3 
-		K_F6, K_F7, K_F8, K_F9, K_F10,  K_PAUSE,    0  , K_HOME,
-		K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5,K_RIGHTARROW, K_KP_PLUS,K_END, //4 
-		K_DOWNARROW,K_PGDN,K_INS,K_DEL,0,0,             0,              K_F11,
-		K_F12,0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 5
-		0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,
-		0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,        // 6 
-		0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0,
-		0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0  ,    0         // 7 
-};
-
-/*
-=======
-MapKey
-
-Map from windows to quake keynums
-=======
-*/
-static int MapKey (int key)
-{
-	int result;
-	int modified;
-	qboolean is_extended;
-
-//	Com_Printf( "0x%x\n", key);
-
-	modified = ( key >> 16 ) & 255;
-
-	if ( modified > 127 )
-		return 0;
-
-	if ( key & ( 1 << 24 ) )
-	{
-		is_extended = qtrue;
-	}
-	else
-	{
-		is_extended = qfalse;
-	}
-
-	result = s_scantokey[modified];
-
-	if ( !is_extended )
-	{
-		switch ( result )
-		{
-		case K_HOME:
-			return K_KP_HOME;
-		case K_UPARROW:
-			return K_KP_UPARROW;
-		case K_PGUP:
-			return K_KP_PGUP;
-		case K_LEFTARROW:
-			return K_KP_LEFTARROW;
-		case K_RIGHTARROW:
-			return K_KP_RIGHTARROW;
-		case K_END:
-			return K_KP_END;
-		case K_DOWNARROW:
-			return K_KP_DOWNARROW;
-		case K_PGDN:
-			return K_KP_PGDN;
-		case K_INS:
-			return K_KP_INS;
-		case K_DEL:
-			return K_KP_DEL;
-		default:
-			return result;
-		}
-	}
-	else
-	{
-		switch ( result )
-		{
-		case K_PAUSE:
-			return K_KP_NUMLOCK;
-		case 0x0D:
-			return K_KP_ENTER;
-		case 0x2F:
-			return K_KP_SLASH;
-		case 0xAF:
-			return K_KP_PLUS;
-		}
-		return result;
-	}
-}
-
-
-/*
-====================
-MainWndProc
-
-main window procedure
-====================
-*/
-extern cvar_t *in_mouse;
-
-LONG WINAPI MainWndProc (
-    HWND    hWnd,
-    UINT    uMsg,
-    WPARAM  wParam,
-    LPARAM  lParam)
-{
-	static qboolean flip = qtrue;
-	int zDelta, i;
-
-	// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/windowsuserinterface/userinput/mouseinput/aboutmouseinput.asp
-	// Windows 95, Windows NT 3.51 - uses MSH_MOUSEWHEEL
-	// only relevant for non-DI input
-	//
-	// NOTE: not sure how reliable this is anymore, might trigger double wheel events
-	if (in_mouse->integer != 1)
-	{
-		if ( uMsg == MSH_MOUSEWHEEL )
-		{
-			if ( ( ( int ) wParam ) > 0 )
-			{
-				Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELUP, qtrue, 0, NULL );
-				Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELUP, qfalse, 0, NULL );
-			}
-			else
-			{
-				Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELDOWN, qtrue, 0, NULL );
-				Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELDOWN, qfalse, 0, NULL );
-			}
-			return DefWindowProc (hWnd, uMsg, wParam, lParam);
-		}
-	}
-
-	switch (uMsg)
-	{
-	case WM_MOUSEWHEEL:
-		// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/winui/windowsuserinterface/userinput/mouseinput/aboutmouseinput.asp
-		// Windows 98/Me, Windows NT 4.0 and later - uses WM_MOUSEWHEEL
-		// only relevant for non-DI input and when console is toggled in window mode
-		//   if console is toggled in window mode (KEYCATCH_CONSOLE) then mouse is released and DI doesn't see any mouse wheel
-		if (in_mouse->integer != 1 || (!r_fullscreen->integer && (cls.keyCatchers & KEYCATCH_CONSOLE)))
-		{
-			// 120 increments, might be 240 and multiples if wheel goes too fast
-			// NOTE Logitech: logitech drivers are screwed and send the message twice?
-			//   could add a cvar to interpret the message as successive press/release events
-			zDelta = ( short ) HIWORD( wParam ) / 120;
-			if ( zDelta > 0 )
-			{
-				for(i=0; i<zDelta; i++)
-				{
-					Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELUP, qtrue, 0, NULL );
-					Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELUP, qfalse, 0, NULL );
-				}
-			}
-			else
-			{
-				for(i=0; i<-zDelta; i++)
-				{
-					Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELDOWN, qtrue, 0, NULL );
-					Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, K_MWHEELDOWN, qfalse, 0, NULL );
-				}
-			}
-			// when an application processes the WM_MOUSEWHEEL message, it must return zero
-			return 0;
-		}
-		break;
-
-	case WM_CREATE:
-
-		g_wv.hWnd = hWnd;
-
-		vid_xpos = Cvar_Get ("vid_xpos", "3", CVAR_ARCHIVE);
-		vid_ypos = Cvar_Get ("vid_ypos", "22", CVAR_ARCHIVE);
-		r_fullscreen = Cvar_Get ("r_fullscreen", "1", CVAR_ARCHIVE | CVAR_LATCH );
-
-		MSH_MOUSEWHEEL = RegisterWindowMessage("MSWHEEL_ROLLMSG"); 
-		if ( r_fullscreen->integer )
-		{
-			WIN_DisableAltTab();
-		}
-		else
-		{
-			WIN_EnableAltTab();
-		}
-
-		break;
-#if 0
-	case WM_DISPLAYCHANGE:
-		Com_DPrintf( "WM_DISPLAYCHANGE\n" );
-		// we need to force a vid_restart if the user has changed
-		// their desktop resolution while the game is running,
-		// but don't do anything if the message is a result of
-		// our own calling of ChangeDisplaySettings
-		if ( com_insideVidInit ) {
-			break;		// we did this on purpose
-		}
-		// something else forced a mode change, so restart all our gl stuff
-		Cbuf_AddText( "vid_restart\n" );
-		break;
-#endif
-	case WM_DESTROY:
-		// let sound and input know about this?
-		g_wv.hWnd = NULL;
-		if ( r_fullscreen->integer )
-		{
-			WIN_EnableAltTab();
-		}
-		break;
-
-	case WM_CLOSE:
-		Cbuf_ExecuteText( EXEC_APPEND, "quit" );
-		break;
-
-	case WM_ACTIVATE:
-		{
-			int	fActive, fMinimized;
-
-			fActive = LOWORD(wParam);
-			fMinimized = (BOOL) HIWORD(wParam);
-
-			VID_AppActivate( fActive != WA_INACTIVE, fMinimized);
-			SNDDMA_Activate();
-		}
-		break;
-
-	case WM_MOVE:
-		{
-			int		xPos, yPos;
-			RECT r;
-			int		style;
-
-			if (!r_fullscreen->integer )
-			{
-				xPos = (short) LOWORD(lParam);    // horizontal position 
-				yPos = (short) HIWORD(lParam);    // vertical position 
-
-				r.left   = 0;
-				r.top    = 0;
-				r.right  = 1;
-				r.bottom = 1;
-
-				style = GetWindowLong( hWnd, GWL_STYLE );
-				AdjustWindowRect( &r, style, FALSE );
-
-				Cvar_SetValue( "vid_xpos", xPos + r.left);
-				Cvar_SetValue( "vid_ypos", yPos + r.top);
-				vid_xpos->modified = qfalse;
-				vid_ypos->modified = qfalse;
-				if ( g_wv.activeApp )
-				{
-					IN_Activate (qtrue);
-				}
-			}
-		}
-		break;
-
-// this is complicated because Win32 seems to pack multiple mouse events into
-// one update sometimes, so we always check all states and look for events
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONUP:
-	case WM_RBUTTONDOWN:
-	case WM_RBUTTONUP:
-	case WM_MBUTTONDOWN:
-	case WM_MBUTTONUP:
-	case WM_MOUSEMOVE:
-		{
-			int	temp;
-
-			temp = 0;
-
-			if (wParam & MK_LBUTTON)
-				temp |= 1;
-
-			if (wParam & MK_RBUTTON)
-				temp |= 2;
-
-			if (wParam & MK_MBUTTON)
-				temp |= 4;
-
-			IN_MouseEvent (temp);
-		}
-		break;
-
-	case WM_SYSCOMMAND:
-		if ( wParam == SC_SCREENSAVE )
-			return 0;
-		break;
-
-	case WM_SYSKEYDOWN:
-		if ( wParam == 13 )
-		{
-			if ( r_fullscreen )
-			{
-				Cvar_SetValue( "r_fullscreen", !r_fullscreen->integer );
-				Cbuf_AddText( "vid_restart\n" );
-			}
-			return 0;
-		}
-		// fall through
-	case WM_KEYDOWN:
-		Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, MapKey( lParam ), qtrue, 0, NULL );
-		break;
-
-	case WM_SYSKEYUP:
-	case WM_KEYUP:
-		Sys_QueEvent( g_wv.sysMsgTime, SE_KEY, MapKey( lParam ), qfalse, 0, NULL );
-		break;
-
-	case WM_CHAR:
-		Sys_QueEvent( g_wv.sysMsgTime, SE_CHAR, wParam, 0, 0, NULL );
-		break;
-   }
-
-    return DefWindowProc( hWnd, uMsg, wParam, lParam );
-}
-
diff --git a/code/win32/winquake.rc b/code/win32/winquake.rc
deleted file mode 100644
index c99e257e..00000000
--- a/code/win32/winquake.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "qe3.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_STRING1             "Quake3"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/code/zlib/zlib.h b/code/zlib/zlib.h
new file mode 100644
index 00000000..02281792
--- /dev/null
+++ b/code/zlib/zlib.h
@@ -0,0 +1,1357 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.3, July 18th, 2005
+
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
+
+/*
+     The 'zlib' compression library provides in-memory compression and
+  decompression functions, including integrity checks of the uncompressed
+  data.  This version of the library supports only one compression method
+  (deflation) but other algorithms will be added later and will have the same
+  stream interface.
+
+     Compression can be done in a single step if the buffers are large
+  enough (for example if an input file is mmap'ed), or can be done by
+  repeated calls of the compression function.  In the latter case, the
+  application must provide more input and/or consume the output
+  (providing more output space) before each call.
+
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
+
+     The library also supports reading and writing files in gzip (.gz) format
+  with an interface similar to that of stdio using the functions that start
+  with "gz".  The gzip format is different from the zlib format.  gzip is a
+  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+     This library can optionally read and write gzip streams in memory as well.
+
+     The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
+
+     The library does not install any signal handler. The decoder checks
+  the consistency of the compressed data, so the library should never
+  crash even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+    Bytef    *next_in;  /* next input byte */
+    uInt     avail_in;  /* number of bytes available at next_in */
+    uLong    total_in;  /* total nb of input bytes read so far */
+
+    Bytef    *next_out; /* next output byte should be put there */
+    uInt     avail_out; /* remaining free space at next_out */
+    uLong    total_out; /* total nb of bytes output so far */
+
+    char     *msg;      /* last error message, NULL if no error */
+    struct internal_state FAR *state; /* not visible by applications */
+
+    alloc_func zalloc;  /* used to allocate the internal state */
+    free_func  zfree;   /* used to free the internal state */
+    voidpf     opaque;  /* private data object passed to zalloc and zfree */
+
+    int     data_type;  /* best guess about the data type: binary or text */
+    uLong   adler;      /* adler32 value of the uncompressed data */
+    uLong   reserved;   /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+   The application must update next_in and avail_in when avail_in has
+   dropped to zero. It must update next_out and avail_out when avail_out
+   has dropped to zero. The application must initialize zalloc, zfree and
+   opaque before calling the init function. All other fields are set by the
+   compression library and must not be updated by the application.
+
+   The opaque value provided by the application will be passed as the first
+   parameter for calls of zalloc and zfree. This can be useful for custom
+   memory management. The compression library attaches no meaning to the
+   opaque value.
+
+   zalloc must return Z_NULL if there is not enough memory for the object.
+   If zlib is used in a multi-threaded application, zalloc and zfree must be
+   thread safe.
+
+   On 16-bit systems, the functions zalloc and zfree must be able to allocate
+   exactly 65536 bytes, but will not be required to allocate more than this
+   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
+   pointers returned by zalloc for objects of exactly 65536 bytes *must*
+   have their offset normalized to zero. The default allocation function
+   provided by this library ensures this (see zutil.c). To reduce memory
+   requirements and avoid any allocation of 64K objects, at the expense of
+   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
+
+   The fields total_in and total_out can be used for statistics or
+   progress reports. After compression, total_in holds the total size of
+   the uncompressed data and may be saved for use in the decompressor
+   (particularly if the decompressor wants to decompress everything in
+   a single step).
+*/
+
+                        /* constants */
+
+#define Z_NO_FLUSH      0
+#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
+#define Z_SYNC_FLUSH    2
+#define Z_FULL_FLUSH    3
+#define Z_FINISH        4
+#define Z_BLOCK         5
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK            0
+#define Z_STREAM_END    1
+#define Z_NEED_DICT     2
+#define Z_ERRNO        (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR   (-3)
+#define Z_MEM_ERROR    (-4)
+#define Z_BUF_ERROR    (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION         0
+#define Z_BEST_SPEED             1
+#define Z_BEST_COMPRESSION       9
+#define Z_DEFAULT_COMPRESSION  (-1)
+/* compression levels */
+
+#define Z_FILTERED            1
+#define Z_HUFFMAN_ONLY        2
+#define Z_RLE                 3
+#define Z_FIXED               4
+#define Z_DEFAULT_STRATEGY    0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY   0
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN  2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED   8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+                        /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+   If the first character differs, the library code actually used is
+   not compatible with the zlib.h header file used by the application.
+   This check is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+     Initializes the internal stream state for compression. The fields
+   zalloc, zfree and opaque must be initialized before by the caller.
+   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
+   use default allocation functions.
+
+     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+   1 gives best speed, 9 gives best compression, 0 gives no compression at
+   all (the input data is simply copied a block at a time).
+   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
+   compression (currently equivalent to level 6).
+
+     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
+   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+   with the version assumed by the caller (ZLIB_VERSION).
+   msg is set to null if there is no error message.  deflateInit does not
+   perform any compression: this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+    deflate compresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce some
+  output latency (reading input without producing any output) except when
+  forced to flush.
+
+    The detailed semantics are as follows. deflate performs one or both of the
+  following actions:
+
+  - Compress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in and avail_in are updated and
+    processing will resume at this point for the next call of deflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly. This action is forced if the parameter flush is non zero.
+    Forcing flush frequently degrades the compression ratio, so this parameter
+    should be set only when necessary (in interactive applications).
+    Some output may be provided even if flush is not set.
+
+  Before the call of deflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating avail_in or avail_out accordingly; avail_out
+  should never be zero before the call. The application can consume the
+  compressed output when it wants, for example when the output buffer is full
+  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
+  and with zero avail_out, it must be called again after making room in the
+  output buffer because there might be more output pending.
+
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumualte before producing output, in order to
+  maximize compression.
+
+    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+  flushed to the output buffer and the output is aligned on a byte boundary, so
+  that the decompressor can get all input data available so far. (In particular
+  avail_in is zero after the call if enough output space has been provided
+  before the call.)  Flushing may degrade compression for some compression
+  algorithms and so it should be used only when necessary.
+
+    If flush is set to Z_FULL_FLUSH, all output is flushed as with
+  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+  restart from this point if previous compressed data has been damaged or if
+  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+  compression.
+
+    If deflate returns with avail_out == 0, this function must be called again
+  with the same value of the flush parameter and more output space (updated
+  avail_out), until the flush is complete (deflate returns with non-zero
+  avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+  avail_out is greater than six to avoid repeated flush markers due to
+  avail_out == 0 on return.
+
+    If the parameter flush is set to Z_FINISH, pending input is processed,
+  pending output is flushed and deflate returns with Z_STREAM_END if there
+  was enough output space; if deflate returns with Z_OK, this function must be
+  called again with Z_FINISH and more output space (updated avail_out) but no
+  more input data, until it returns with Z_STREAM_END or an error. After
+  deflate has returned Z_STREAM_END, the only possible operations on the
+  stream are deflateReset or deflateEnd.
+
+    Z_FINISH can be used immediately after deflateInit if all the compression
+  is to be done in a single step. In this case, avail_out must be at least
+  the value returned by deflateBound (see below). If deflate does not return
+  Z_STREAM_END, then it must be called again as described above.
+
+    deflate() sets strm->adler to the adler32 checksum of all input read
+  so far (that is, total_in bytes).
+
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+  binary. This field is only for information purposes and does not affect
+  the compression algorithm in any manner.
+
+    deflate() returns Z_OK if some progress has been made (more input
+  processed or more output produced), Z_STREAM_END if all input has been
+  consumed and all output has been produced (only when flush is set to
+  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
+  (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+  fatal, and deflate() can be called again with more input and more output
+  space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+   prematurely (some input or output was discarded). In the error case,
+   msg may be set but then points to a static string (which must not be
+   deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+     Initializes the internal stream state for decompression. The fields
+   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
+   value depends on the compression method), inflateInit determines the
+   compression method from the zlib header and allocates all data structures
+   accordingly; otherwise the allocation will be deferred to the first call of
+   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+   use default allocation functions.
+
+     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+   version assumed by the caller.  msg is set to null if there is no error
+   message. inflateInit does not perform any decompression apart from reading
+   the zlib header if present: this will be done by inflate().  (So next_in and
+   avail_in may be modified, but next_out and avail_out are unchanged.)
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+    inflate decompresses as much data as possible, and stops when the input
+  buffer becomes empty or the output buffer becomes full. It may introduce
+  some output latency (reading input without producing any output) except when
+  forced to flush.
+
+  The detailed semantics are as follows. inflate performs one or both of the
+  following actions:
+
+  - Decompress more input starting at next_in and update next_in and avail_in
+    accordingly. If not all input can be processed (because there is not
+    enough room in the output buffer), next_in is updated and processing
+    will resume at this point for the next call of inflate().
+
+  - Provide more output starting at next_out and update next_out and avail_out
+    accordingly.  inflate() provides as much output as possible, until there
+    is no more input data or no more space in the output buffer (see below
+    about the flush parameter).
+
+  Before the call of inflate(), the application should ensure that at least
+  one of the actions is possible, by providing more input and/or consuming
+  more output, and updating the next_* and avail_* values accordingly.
+  The application can consume the uncompressed output when it wants, for
+  example when the output buffer is full (avail_out == 0), or after each
+  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
+  must be called again after making room in the output buffer because there
+  might be more output pending.
+
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
+
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
+
+    inflate() should normally be called until it returns Z_STREAM_END or an
+  error. However if all decompression is to be performed in a single step
+  (a single call of inflate), the parameter flush should be set to
+  Z_FINISH. In this case all pending input is processed and all pending
+  output is flushed; avail_out must be large enough to hold all the
+  uncompressed data. (The size of the uncompressed data may have been saved
+  by the compressor for this purpose.) The next operation on this stream must
+  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
+  is never required, but can be used to inform inflate that a faster approach
+  may be used for the single inflate() call.
+
+     In this implementation, inflate() always flushes as much output as
+  possible to the output buffer, and always uses the faster approach on the
+  first call. So the only effect of the flush parameter in this implementation
+  is on the return value of inflate(), as noted below, or when it returns early
+  because Z_BLOCK is used.
+
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below. At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
+
+    inflate() returns Z_OK if some progress has been made (more input processed
+  or more output produced), Z_STREAM_END if the end of the compressed data has
+  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+  corrupted (input stream not conforming to the zlib format or incorrect check
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+  inflate() can be called again with more input and more output space to
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+     All dynamically allocated data structures for this stream are freed.
+   This function discards any unprocessed input and does not flush any
+   pending output.
+
+     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+   was inconsistent. In the error case, msg may be set but then points to a
+   static string (which must not be deallocated).
+*/
+
+                        /* Advanced functions */
+
+/*
+    The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+                                     int  level,
+                                     int  method,
+                                     int  windowBits,
+                                     int  memLevel,
+                                     int  strategy));
+
+     This is another version of deflateInit with more compression options. The
+   fields next_in, zalloc, zfree and opaque must be initialized before by
+   the caller.
+
+     The method parameter is the compression method. It must be Z_DEFLATED in
+   this version of the library.
+
+     The windowBits parameter is the base two logarithm of the window size
+   (the size of the history buffer). It should be in the range 8..15 for this
+   version of the library. Larger values of this parameter result in better
+   compression at the expense of memory usage. The default value is 15 if
+   deflateInit is used instead.
+
+     windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+   determines the window size. deflate() will then generate raw deflate data
+   with no zlib header or trailer, and will not compute an adler32 check value.
+
+     windowBits can also be greater than 15 for optional gzip encoding. Add
+   16 to windowBits to write a simple gzip header and trailer around the
+   compressed data instead of a zlib wrapper. The gzip header will have no
+   file name, no extra data, no comment, no modification time (set to zero),
+   no header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+     The memLevel parameter specifies how much memory should be allocated
+   for the internal compression state. memLevel=1 uses minimum memory but
+   is slow and reduces compression ratio; memLevel=9 uses maximum memory
+   for optimal speed. The default value is 8. See zconf.h for total memory
+   usage as a function of windowBits and memLevel.
+
+     The strategy parameter is used to tune the compression algorithm. Use the
+   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+   string match), or Z_RLE to limit match distances to one (run-length
+   encoding). Filtered data consists mostly of small values with a somewhat
+   random distribution. In this case, the compression algorithm is tuned to
+   compress them better. The effect of Z_FILTERED is to force more Huffman
+   coding and less string matching; it is somewhat intermediate between
+   Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
+   Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
+   parameter only affects the compression ratio but not the correctness of the
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
+
+      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
+   method). msg is set to null if there is no error message.  deflateInit2 does
+   not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the compression dictionary from the given byte sequence
+   without producing any compressed output. This function must be called
+   immediately after deflateInit, deflateInit2 or deflateReset, before any
+   call of deflate. The compressor and decompressor must use exactly the same
+   dictionary (see inflateSetDictionary).
+
+     The dictionary should consist of strings (byte sequences) that are likely
+   to be encountered later in the data to be compressed, with the most commonly
+   used strings preferably put towards the end of the dictionary. Using a
+   dictionary is most useful when the data to be compressed is short and can be
+   predicted with good accuracy; the data can then be compressed better than
+   with the default empty dictionary.
+
+     Depending on the size of the compression data structures selected by
+   deflateInit or deflateInit2, a part of the dictionary may in effect be
+   discarded, for example if the dictionary is larger than the window size in
+   deflate or deflate2. Thus the strings most likely to be useful should be
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
+
+     Upon return of this function, strm->adler is set to the adler32 value
+   of the dictionary; the decompressor may later use this value to determine
+   which dictionary has been used by the compressor. (The adler32 value
+   applies to the whole dictionary even if only a subset of the dictionary is
+   actually used by the compressor.) If a raw deflate was requested, then the
+   adler32 value is not computed and strm->adler is not set.
+
+     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent (for example if deflate has already been called for this stream
+   or if the compression method is bsort). deflateSetDictionary does not
+   perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when several compression strategies will be
+   tried, for example when there are several ways of pre-processing the input
+   data with a filter. The streams that will be discarded should then be freed
+   by calling deflateEnd.  Note that deflateCopy duplicates the internal
+   compression state which can be quite large, so this strategy is slow and
+   can consume lots of memory.
+
+     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to deflateEnd followed by deflateInit,
+   but does not free and reallocate all the internal compression state.
+   The stream will keep the same compression level and any other attributes
+   that may have been set by deflateInit2.
+
+      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+                                      int level,
+                                      int strategy));
+/*
+     Dynamically update the compression level and compression strategy.  The
+   interpretation of level and strategy is as in deflateInit2.  This can be
+   used to switch between compression and straight copy of the input data, or
+   to switch to a different kind of input data requiring a different
+   strategy. If the compression level is changed, the input available so far
+   is compressed with the old level (and may be flushed); the new level will
+   take effect only at the next call of deflate().
+
+     Before the call of deflateParams, the stream state must be set as for
+   a call of deflate(), since the currently available input may have to
+   be compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
+   if strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+                                       uLong sourceLen));
+/*
+     deflateBound() returns an upper bound on the compressed size after
+   deflation of sourceLen bytes.  It must be called after deflateInit()
+   or deflateInit2().  This would be used to allocate an output buffer
+   for deflation in a single pass, and so would be called before deflate().
+*/
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     deflatePrime() inserts bits in the deflate output stream.  The intent
+  is that this function is used to start off the deflate output with the
+  bits leftover from a previous deflate stream when appending to it.  As such,
+  this function can only be used for raw deflate, and must be used before the
+  first deflate() call after a deflateInit2() or deflateReset().  bits must be
+  less than or equal to 16, and that many of the least significant bits of
+  value will be inserted in the output.
+
+      deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+      If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+                                     int  windowBits));
+
+     This is another version of inflateInit with an extra parameter. The
+   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+   before by the caller.
+
+     The windowBits parameter is the base two logarithm of the maximum window
+   size (the size of the history buffer).  It should be in the range 8..15 for
+   this version of the library. The default value is 15 if inflateInit is used
+   instead. windowBits must be greater than or equal to the windowBits value
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
+
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+   determines the window size. inflate() will then process raw deflate data,
+   not looking for a zlib or gzip header, not generating a check value, and not
+   looking for any check values for comparison at the end of the stream. This
+   is for use with other formats that use the deflate compressed data format
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
+
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+                                             const Bytef *dictionary,
+                                             uInt  dictLength));
+/*
+     Initializes the decompression dictionary from the given uncompressed byte
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
+
+     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+   parameter is invalid (such as NULL dictionary) or the stream state is
+   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+   expected one (incorrect adler32 value). inflateSetDictionary does not
+   perform any decompression: this will be done by subsequent calls of
+   inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+    Skips invalid compressed data until a full flush point (see above the
+  description of deflate with Z_FULL_FLUSH) can be found, or until all
+  available input is skipped. No output is provided.
+
+    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
+  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
+  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
+  case, the application may save the current current value of total_in which
+  indicates where valid compressed data was found. In the error case, the
+  application may repeatedly call inflateSync, providing more input each time,
+  until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+                                    z_streamp source));
+/*
+     Sets the destination stream as a complete copy of the source stream.
+
+     This function can be useful when randomly accessing a large stream.  The
+   first pass through the stream can periodically record the inflate state,
+   allowing restarting inflate at those points when randomly accessing the
+   stream.
+
+     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+   (such as zalloc being NULL). msg is left unchanged in both source and
+   destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+     This function is equivalent to inflateEnd followed by inflateInit,
+   but does not free and reallocate all the internal decompression state.
+   The stream will keep attributes that may have been set by inflateInit2.
+
+      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent (such as zalloc or state being NULL).
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
+/*
+     This function inserts bits in the inflate input stream.  The intent is
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
+
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
+
+      The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+      If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+                                        unsigned char FAR *window));
+
+     Initialize the internal stream state for decompression using inflateBack()
+   calls.  The fields zalloc, zfree and opaque in strm must be initialized
+   before the call.  If zalloc and zfree are Z_NULL, then the default library-
+   derived memory allocation routines are used.  windowBits is the base two
+   logarithm of the window size, in the range 8..15.  window is a caller
+   supplied buffer of that size.  Except for special applications where it is
+   assured that deflate was used with small window sizes, windowBits must be 15
+   and a 32K byte window must be supplied to be able to decompress general
+   deflate streams.
+
+     See inflateBack() for the usage of these routines.
+
+     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+   the paramaters are invalid, Z_MEM_ERROR if the internal state could not
+   be allocated, or Z_VERSION_ERROR if the version of the library does not
+   match the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+                                    in_func in, void FAR *in_desc,
+                                    out_func out, void FAR *out_desc));
+/*
+     inflateBack() does a raw inflate with a single call using a call-back
+   interface for input and output.  This is more efficient than inflate() for
+   file i/o applications in that it avoids copying between the output and the
+   sliding window by simply making the window itself the output buffer.  This
+   function trusts the application to not change the output buffer passed by
+   the output function, at least until inflateBack() returns.
+
+     inflateBackInit() must be called first to allocate the internal state
+   and to initialize the state with the user-provided window buffer.
+   inflateBack() may then be used multiple times to inflate a complete, raw
+   deflate stream with each call.  inflateBackEnd() is then called to free
+   the allocated state.
+
+     A raw deflate stream is one with no zlib or gzip header or trailer.
+   This routine would normally be used in a utility that reads zip or gzip
+   files and writes out uncompressed files.  The utility would decode the
+   header and process the trailer on its own, hence this routine expects
+   only the raw deflate stream to decompress.  This is different from the
+   normal behavior of inflate(), which expects either a zlib or gzip header and
+   trailer around the deflate stream.
+
+     inflateBack() uses two subroutines supplied by the caller that are then
+   called by inflateBack() for input and output.  inflateBack() calls those
+   routines until it reads a complete deflate stream and writes out all of the
+   uncompressed data, or until it encounters an error.  The function's
+   parameters and return types are defined above in the in_func and out_func
+   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
+   number of bytes of provided input, and a pointer to that input in buf.  If
+   there is no input available, in() must return zero--buf is ignored in that
+   case--and inflateBack() will return a buffer error.  inflateBack() will call
+   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
+   should return zero on success, or non-zero on failure.  If out() returns
+   non-zero, inflateBack() will return with an error.  Neither in() nor out()
+   are permitted to change the contents of the window provided to
+   inflateBackInit(), which is also the buffer that out() uses to write from.
+   The length written by out() will be at most the window size.  Any non-zero
+   amount of input may be provided by in().
+
+     For convenience, inflateBack() can be provided input on the first call by
+   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
+   in() will be called.  Therefore strm->next_in must be initialized before
+   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
+   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
+   must also be initialized, and then if strm->avail_in is not zero, input will
+   initially be taken from strm->next_in[0 .. strm->avail_in - 1].
+
+     The in_desc and out_desc parameters of inflateBack() is passed as the
+   first parameter of in() and out() respectively when they are called.  These
+   descriptors can be optionally used to pass any information that the caller-
+   supplied in() and out() functions need to do their job.
+
+     On return, inflateBack() will set strm->next_in and strm->avail_in to
+   pass back any unused input that was provided by the last in() call.  The
+   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+   if in() or out() returned an error, Z_DATA_ERROR if there was a format
+   error in the deflate stream (in which case strm->msg is set to indicate the
+   nature of the error), or Z_STREAM_ERROR if the stream was not properly
+   initialized.  In the case of Z_BUF_ERROR, an input or output error can be
+   distinguished using strm->next_in which will be Z_NULL only if in() returned
+   an error.  If strm->next is not Z_NULL, then the Z_BUF_ERROR was due to
+   out() returning non-zero.  (in() will always be called before out(), so
+   strm->next_in is assured to be defined if out() returns non-zero.)  Note
+   that inflateBack() cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+     All memory allocated by inflateBackInit() is freed.
+
+     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+   state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+     1.0: size of uInt
+     3.2: size of uLong
+     5.4: size of voidpf (pointer)
+     7.6: size of z_off_t
+
+    Compiler, assembler, and debug options:
+     8: DEBUG
+     9: ASMV or ASMINF -- use ASM code
+     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+     11: 0 (reserved)
+
+    One-time table building (smaller code, but not thread-safe if true):
+     12: BUILDFIXED -- build static block decoding tables when needed
+     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+     14,15: 0 (reserved)
+
+    Library content (indicates missing functionality):
+     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+                          deflate code when not needed)
+     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+                    and decode gzip streams (to avoid linking crc code)
+     18-19: 0 (reserved)
+
+    Operation variations (changes in library functionality):
+     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+     21: FASTEST -- deflate algorithm with only one, lowest compression level
+     22,23: 0 (reserved)
+
+    The sprintf variant used by gzprintf (zero is best):
+     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+    Remainder:
+     27-31: 0 (reserved)
+ */
+
+
+                        /* utility functions */
+
+/*
+     The following utility functions are implemented on top of the
+   basic stream-oriented functions. To simplify the interface, some
+   default options are assumed (compression level and memory usage,
+   standard memory allocation functions). The source code of these
+   utility functions can easily be modified if you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+/*
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least the value returned
+   by compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
+                                  const Bytef *source, uLong sourceLen,
+                                  int level));
+/*
+     Compresses the source buffer into the destination buffer. The level
+   parameter has the same meaning as in deflateInit.  sourceLen is the byte
+   length of the source buffer. Upon entry, destLen is the total size of the
+   destination buffer, which must be at least the value returned by
+   compressBound(sourceLen). Upon exit, destLen is the actual size of the
+   compressed buffer.
+
+     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+   Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+     compressBound() returns an upper bound on the compressed size after
+   compress() or compress2() on sourceLen bytes.  It would be used before
+   a compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+/*
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.
+*/
+
+
+typedef voidp gzFile;
+
+ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
+/*
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb") but can also include a compression level
+   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
+   Huffman only compression as in "wb1h", or 'R' for run-length encoding
+   as in "wb1R". (See the description of deflateInit2 for more information
+   about the strategy parameter.)
+
+     gzopen can be used to read a file which is not in gzip format; in this
+   case gzread will directly read from the file without decompression.
+
+     gzopen returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).  */
+
+ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
+/*
+     gzdopen() associates a gzFile with the file descriptor fd.  File
+   descriptors are obtained from calls like open, dup, creat, pipe or
+   fileno (in the file has been previously opened with fopen).
+   The mode parameter is as in gzopen.
+     The next call of gzclose on the returned gzFile will also close the
+   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
+   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
+     gzdopen returns NULL if there was insufficient memory to allocate
+   the (de)compression state.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+     Dynamically update the compression level or strategy. See the description
+   of deflateInit2 for the meaning of these parameters.
+     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+   opened for writing.
+*/
+
+ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
+/*
+     Reads the given number of uncompressed bytes from the compressed file.
+   If the input file was not in gzip format, gzread copies the given number
+   of bytes into the buffer.
+     gzread returns the number of uncompressed bytes actually read (0 for
+   end of file, -1 for error). */
+
+ZEXTERN int ZEXPORT    gzwrite OF((gzFile file,
+                                   voidpc buf, unsigned len));
+/*
+     Writes the given number of uncompressed bytes into the compressed file.
+   gzwrite returns the number of uncompressed bytes actually written
+   (0 in case of error).
+*/
+
+ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
+/*
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).  The number of
+   uncompressed bytes written is limited to 4095. The caller should assure that
+   this limit is not exceeded. If it is exceeded, then gzprintf() will return
+   return an error (0) with nothing written. In this case, there may also be a
+   buffer overflow with unpredictable consequences, which is possible only if
+   zlib was compiled with the insecure functions sprintf() or vsprintf()
+   because the secure snprintf() or vsnprintf() functions were not available.
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+      Reads bytes from the compressed file until len-1 characters are read, or
+   a newline character is read and transferred to buf, or an end-of-file
+   condition is encountered.  The string is then terminated with a null
+   character.
+      gzgets returns buf, or Z_NULL in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
+/*
+      Writes c, converted to an unsigned char, into the compressed file.
+   gzputc returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
+/*
+      Reads one byte from the compressed file. gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+
+ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+/*
+      Push one character back onto the stream to be read again later.
+   Only one character of push-back is allowed.  gzungetc() returns the
+   character pushed, or -1 on failure.  gzungetc() will fail if a
+   character has been pushed but not read yet, or if c is -1. The pushed
+   character will be discarded if the stream is repositioned with gzseek()
+   or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
+/*
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function. The return value is the zlib
+   error number (see function gzerror below). gzflush returns Z_OK if
+   the flush parameter is Z_FINISH and all output could be flushed.
+     gzflush should be called only when strictly necessary because it can
+   degrade compression.
+*/
+
+ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
+                                      z_off_t offset, int whence));
+/*
+      Sets the starting position for the next gzread or gzwrite on the
+   given compressed file. The offset represents a number of bytes in the
+   uncompressed data stream. The whence parameter is defined as in lseek(2);
+   the value SEEK_END is not supported.
+     If the file is opened for reading, this function is emulated but can be
+   extremely slow. If the file is opened for writing, only forward seeks are
+   supported; gzseek then compresses a sequence of zeroes up to the new
+   starting position.
+
+      gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error, in
+   particular if the file is opened for writing and the new starting position
+   would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
+/*
+     Rewinds the given file. This function is supported only for reading.
+
+   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
+/*
+     Returns the starting position for the next gzread or gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+
+   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
+*/
+
+ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
+/*
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state. The return value is the zlib
+   error number (see function gzerror below).
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+     Clears the error and end-of-file flags for file. This is analogous to the
+   clearerr() function in stdio. This is useful for continuing to read a gzip
+   file that is being written concurrently.
+*/
+
+                        /* checksum functions */
+
+/*
+     These functions are not related to compression but are exported
+   anyway because they might be useful in applications using the
+   compression library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
+   return the updated checksum. If buf is NULL, this function returns
+   the required initial value for the checksum.
+   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+   much faster. Usage example:
+
+     uLong adler = adler32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       adler = adler32(adler, buffer, length);
+     }
+     if (adler != original_adler) error();
+*/
+
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+/*
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
+ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
+/*
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
+   Usage example:
+
+     uLong crc = crc32(0L, Z_NULL, 0);
+
+     while (read_buffer(buffer, length) != EOF) {
+       crc = crc32(crc, buffer, length);
+     }
+     if (crc != original_crc) error();
+*/
+
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
+
+                        /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+                                     const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
+                                      int windowBits, int memLevel,
+                                      int strategy, const char *version,
+                                      int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
+                                      const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+                                         unsigned char FAR *window,
+                                         const char *version,
+                                         int stream_size));
+#define deflateInit(strm, level) \
+        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit(strm) \
+        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+        inflateBackInit_((strm), (windowBits), (window), \
+        ZLIB_VERSION, sizeof(z_stream))
+
+
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+    struct internal_state {int dummy;}; /* hack for buggy compilers */
+#endif
+
+ZEXTERN const char   * ZEXPORT zError           OF((int));
+ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
+ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh
deleted file mode 100644
index c6dbe377..00000000
--- a/cross-make-mingw.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-export CC=i586-mingw32msvc-gcc
-export WINDRES=i586-mingw32msvc-windres
-export PLATFORM=mingw32
-exec make $*
diff --git a/docker/README.md b/docker/README.md
index 30b23b8e..eecfbf4a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,6 @@
 # Docker
 
-Run with
-```sh
-mkdir .cmake
-cd .cmake
-cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -G Ninja ../
-ninja
-```
+This contains Docker files for openmohaa development and server.
+
+- See [Development](dev/README.md) to build dev container images.
+- See [Server](server/README.md) to build an OpenMoHAA server container image.
diff --git a/docker/build.ps1 b/docker/build.ps1
deleted file mode 100644
index d6165255..00000000
--- a/docker/build.ps1
+++ /dev/null
@@ -1,7 +0,0 @@
-docker build -t openmohaa/builder.14_04 x86_64/14.04 && `
-docker build -t openmohaa/builder.16_04 x86_64/16.04 && `
-docker build -t openmohaa/builder.18_04 x86_64/18.04 && `
-docker build -t openmohaa/builder.20_04 x86_64/20.04 && `
-docker build -t openmohaa/builder.22_04 x86_64/22.04 && `
-docker build -t openmohaa/builder.22_10 x86_64/22.10 && `
-docker build -t openmohaa/builder.18_04.i386 i386/18.04
diff --git a/docker/dev/README.md b/docker/dev/README.md
new file mode 100644
index 00000000..30b23b8e
--- /dev/null
+++ b/docker/dev/README.md
@@ -0,0 +1,9 @@
+# Docker
+
+Run with
+```sh
+mkdir .cmake
+cd .cmake
+cmake -DCMAKE_C_COMPILER=clang-15 -DCMAKE_CXX_COMPILER=clang++-15 -G Ninja ../
+ninja
+```
diff --git a/docker/armhf/Dockerfile b/docker/dev/armhf/Dockerfile
similarity index 100%
rename from docker/armhf/Dockerfile
rename to docker/dev/armhf/Dockerfile
diff --git a/docker/dev/build.ps1 b/docker/dev/build.ps1
new file mode 100644
index 00000000..61601a22
--- /dev/null
+++ b/docker/dev/build.ps1
@@ -0,0 +1,10 @@
+docker build -t openmohaa/builder.14_04 x86_64/14.04
+docker build -t openmohaa/builder.16_04 x86_64/16.04
+docker build -t openmohaa/builder.18_04 x86_64/18.04
+docker build -t openmohaa/builder.20_04 x86_64/20.04
+docker build -t openmohaa/builder.22_04 x86_64/22.04
+docker build -t openmohaa/builder.22_10 x86_64/22.10
+docker build -t openmohaa/builder.debian-11 x86_64/debian-11
+docker build -t openmohaa/builder.debian-12 x86_64/debian-12
+
+docker build -t openmohaa/builder.18_04.i386 i386/18.04
diff --git a/docker/i386/18.04/Dockerfile b/docker/dev/i386/18.04/Dockerfile
similarity index 100%
rename from docker/i386/18.04/Dockerfile
rename to docker/dev/i386/18.04/Dockerfile
diff --git a/docker/s390x/Dockerfile b/docker/dev/s390x/Dockerfile
similarity index 100%
rename from docker/s390x/Dockerfile
rename to docker/dev/s390x/Dockerfile
diff --git a/docker/x86_64/14.04/Dockerfile b/docker/dev/x86_64/14.04/Dockerfile
similarity index 61%
rename from docker/x86_64/14.04/Dockerfile
rename to docker/dev/x86_64/14.04/Dockerfile
index 6f8b8207..b6624b02 100644
--- a/docker/x86_64/14.04/Dockerfile
+++ b/docker/dev/x86_64/14.04/Dockerfile
@@ -2,5 +2,7 @@ FROM ubuntu:14.04
 
 # install dev tools
 RUN apt update && apt install -y ninja-build cmake make clang-3.5 gcc-4.8 g++-4.8 flex bison
+# install some important libraries like SDL
+RUN apt install -y --no-install-recommends libsdl2-dev
 
 WORKDIR /usr/src/openmohaa/
diff --git a/docker/x86_64/16.04/Dockerfile b/docker/dev/x86_64/16.04/Dockerfile
similarity index 62%
rename from docker/x86_64/16.04/Dockerfile
rename to docker/dev/x86_64/16.04/Dockerfile
index 21689689..b5564908 100644
--- a/docker/x86_64/16.04/Dockerfile
+++ b/docker/dev/x86_64/16.04/Dockerfile
@@ -2,5 +2,7 @@ FROM ubuntu:16.04
 
 # install dev tools
 RUN apt update && apt install -y ninja-build cmake make clang-5.0 lld-5.0 gcc-5 g++-5 flex bison
+# install some important libraries like SDL
+RUN apt install -y --no-install-recommends libsdl2-dev
 
 WORKDIR /usr/src/openmohaa/
diff --git a/docker/x86_64/18.04/Dockerfile b/docker/dev/x86_64/18.04/Dockerfile
similarity index 62%
rename from docker/x86_64/18.04/Dockerfile
rename to docker/dev/x86_64/18.04/Dockerfile
index a967fba4..8ef23bc8 100644
--- a/docker/x86_64/18.04/Dockerfile
+++ b/docker/dev/x86_64/18.04/Dockerfile
@@ -2,5 +2,7 @@ FROM ubuntu:18.04
 
 # install dev tools
 RUN apt update && apt install -y ninja-build cmake make clang-6.0 lld-6.0 gcc-6 g++-6 flex bison
+# install some important libraries like SDL
+RUN apt install -y --no-install-recommends libsdl2-dev
 
 WORKDIR /usr/src/openmohaa/
diff --git a/docker/x86_64/20.04/Dockerfile b/docker/dev/x86_64/20.04/Dockerfile
similarity index 61%
rename from docker/x86_64/20.04/Dockerfile
rename to docker/dev/x86_64/20.04/Dockerfile
index 93fcf966..44dcdb2d 100644
--- a/docker/x86_64/20.04/Dockerfile
+++ b/docker/dev/x86_64/20.04/Dockerfile
@@ -2,5 +2,7 @@ FROM ubuntu:20.04
 
 # install dev tools
 RUN apt update && apt install -y ninja-build cmake make clang-7 lld-7 gcc-7 g++-7 flex bison
+# install some important libraries like SDL
+RUN apt install -y --no-install-recommends libsdl2-dev
 
 WORKDIR /usr/src/openmohaa/
diff --git a/docker/x86_64/22.04/Dockerfile b/docker/dev/x86_64/22.04/Dockerfile
similarity index 72%
rename from docker/x86_64/22.04/Dockerfile
rename to docker/dev/x86_64/22.04/Dockerfile
index e2a56e61..fa33bc02 100644
--- a/docker/x86_64/22.04/Dockerfile
+++ b/docker/dev/x86_64/22.04/Dockerfile
@@ -2,8 +2,8 @@ FROM ubuntu:22.04
 
 # install dev tools
 RUN apt update && apt install -y ninja-build cmake make clang-15 lld-15 gcc-12 g++-12 flex bison
-# install some important libraries like GL
-RUN apt install -y --no-install-recommends ncurses-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libxxf86vm-dev libxxf86dga-dev libsdl2-dev
+# install some important libraries like SDL
+RUN apt install -y --no-install-recommends libsdl2-dev
 
 WORKDIR /usr/src/openmohaa/
 #COPY CMakeLists.txt ./
diff --git a/docker/x86_64/22.10/Dockerfile b/docker/dev/x86_64/22.10/Dockerfile
similarity index 100%
rename from docker/x86_64/22.10/Dockerfile
rename to docker/dev/x86_64/22.10/Dockerfile
diff --git a/docker/dev/x86_64/debian-11/Dockerfile b/docker/dev/x86_64/debian-11/Dockerfile
new file mode 100644
index 00000000..cf3a9e6c
--- /dev/null
+++ b/docker/dev/x86_64/debian-11/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:11
+
+# install dev tools
+RUN apt update && apt install -y ninja-build cmake make clang-16 lld-16 gcc-10 g++-10 flex bison
+# install some important libraries like GL
+RUN apt install -y --no-install-recommends ncurses-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libxxf86vm-dev libxxf86dga-dev libsdl2-dev
+
+WORKDIR /usr/src/openmohaa/
diff --git a/docker/dev/x86_64/debian-12/Dockerfile b/docker/dev/x86_64/debian-12/Dockerfile
new file mode 100644
index 00000000..19f8d33c
--- /dev/null
+++ b/docker/dev/x86_64/debian-12/Dockerfile
@@ -0,0 +1,8 @@
+FROM debian:12
+
+# install dev tools
+RUN apt update && apt install -y ninja-build cmake make clang-19 lld-19 gcc-12 g++-12 flex bison
+# install some important libraries like GL
+RUN apt install -y --no-install-recommends ncurses-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libxxf86vm-dev libxxf86dga-dev libsdl2-dev
+
+WORKDIR /usr/src/openmohaa/
diff --git a/docker/server/README.md b/docker/server/README.md
new file mode 100644
index 00000000..7dfa48f3
--- /dev/null
+++ b/docker/server/README.md
@@ -0,0 +1,39 @@
+# Server image
+
+## Introduction
+
+Contains Dockerfile for building openmohaa-based server on Debian Bookworm. MOHAA data must be stored in `/usr/local/share/mohaa`, the directory structure should look like this:
+```
+[/usr/local/share/mohaa]
+├── [main]
+│   └── Pak*.pk3
+├── [mainta]
+│   └── pak*.pk3
+├── [maintt]
+│   └── pak*.pk3
+└── [home]
+    ├── [main]
+    │   └── Custom PK3s go here
+    ├── [mainta]
+    │   └── Custom PK3s go here
+    └── [maintt]
+        └── Custom PK3s go here
+```
+
+`sound` and `video` folders are not needed.
+
+There are two ways to handle game data:
+1) Create a new image based on this image (with a new Dockerfile) and copy the game directory in `/usr/local/share/mohaa`. This is the recommended solution because game data should be immutable. For mods, a base image can be created, or a volume can be mounted to `/usr/local/share/mohaa/home` which contains files (in main, mainta or maintt subdir) that will modify the game.
+
+or
+
+2) Mount a volume to the game directory directly in `/usr/local/share/mohaa`.
+
+## Building
+
+1) Put the game data (`main`, `mainta` and `maintt`) inside `full/game`, it should match the directory structure above
+2) Execute one of the build.* scripts (depending on if you are running Linux or Windows).
+
+## Starting
+
+The server can now be executed using `docker run -p 12203:12203 -p 12300:12300 openmohaa/full`, or by using a docker composition file.
diff --git a/docker/server/base/Dockerfile b/docker/server/base/Dockerfile
new file mode 100644
index 00000000..bf63cff2
--- /dev/null
+++ b/docker/server/base/Dockerfile
@@ -0,0 +1,46 @@
+FROM debian:bookworm
+
+RUN apt update && apt install -y git clang cmake flex bison zlib1g-dev ninja-build
+
+# Compile with clang
+ENV CC=clang
+ENV CXX=clang++
+
+# Clone the repository
+RUN mkdir -p /tmp/openmohaa/build \
+    && cd /tmp/openmohaa \
+    && git clone --depth 1 --single-branch -b main https://github.com/openmoh/openmohaa.git
+
+# Build the project
+RUN cd /tmp/openmohaa/build \
+    && cmake -G "Ninja" -DBUILD_NO_CLIENT=1 -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DTARGET_LOCAL_SYSTEM=1 -DCMAKE_INSTALL_PREFIX="/usr/local/games/openmohaa" /tmp/openmohaa/openmohaa \
+    && cmake --build . \
+    && cmake --install .
+
+# Reset to the base debian image, will gain space
+FROM debian:bookworm
+
+# Copy the installed directory
+COPY --from=0 /usr/local/games/openmohaa /usr/local/games/openmohaa
+
+# MOHAA data (main, mainta and maintt) goes inside this directory
+# mods can go inside a subdirectory called "home"
+VOLUME "/usr/local/share/mohaa"
+
+# Install tools to check for the health
+RUN apt update && apt install -y socat
+COPY "health_check.sh" "/usr/local/bin/health_check.sh"
+HEALTHCHECK --interval=15s --timeout=20s --start-period=10s --retries=3 CMD [ "bash", "/usr/local/bin/health_check.sh" ]
+
+# Create an user for starting the server
+# This improves the overall security of the server instance
+RUN useradd -m openmohaa
+USER openmohaa
+
+ENV GAME_PORT=12203
+ENV GAMESPY_PORT=12300
+
+COPY "entrypoint.sh" "/usr/local/bin/entrypoint.sh"
+WORKDIR "/usr/local/share/mohaa"
+
+ENTRYPOINT [ "bash", "entrypoint.sh" ]
diff --git a/docker/server/base/entrypoint.sh b/docker/server/base/entrypoint.sh
new file mode 100644
index 00000000..a5d26623
--- /dev/null
+++ b/docker/server/base/entrypoint.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# It's amazing that with Docker, one can't put environment variables in the array of the ENTRYPOINT command
+
+/usr/local/games/openmohaa/lib/openmohaa/omohaaded +set fs_homepath home +set dedicated 2 +set net_port $GAME_PORT:-12203 +set net_gamespy_port $GAMESPY_PORT:-12300 $@
diff --git a/docker/server/base/health_check.sh b/docker/server/base/health_check.sh
new file mode 100644
index 00000000..f7f490eb
--- /dev/null
+++ b/docker/server/base/health_check.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+header=$'\xff\xff\xff\xff\x01disconnect'
+# to avoid spamming the log file with getinfo/getstatus
+# simply send an unsupported message
+# so the server will return the disconnect message
+message=$'none'
+
+query_port=${GAME_PORT:-12203}
+data=""
+
+while [ -z "$data" ]
+do
+    data=$(echo "$message" | socat - UDP:0.0.0.0:$query_port 2>/dev/null)
+    ret=$?
+
+    if [ $ret != 0 ]
+    then
+        echo "Fail (socat returned $ret)"
+        exit 1
+    fi
+
+    if [ -n "$data" ]
+    then
+        break
+    fi
+done
+
+if [ "$data" != "$header" ]
+then
+    echo "Fail (not maching header)"
+    echo $line
+    exit 1
+fi
+
+# Success
+exit 0
diff --git a/docker/server/build.ps1 b/docker/server/build.ps1
new file mode 100644
index 00000000..d41125a6
--- /dev/null
+++ b/docker/server/build.ps1
@@ -0,0 +1,2 @@
+docker build -t openmohaa/base base
+docker build -t openmohaa/full full
diff --git a/docker/server/build.sh b/docker/server/build.sh
new file mode 100644
index 00000000..d41125a6
--- /dev/null
+++ b/docker/server/build.sh
@@ -0,0 +1,2 @@
+docker build -t openmohaa/base base
+docker build -t openmohaa/full full
diff --git a/docker/server/full/.dockerignore b/docker/server/full/.dockerignore
new file mode 100644
index 00000000..52417c5b
--- /dev/null
+++ b/docker/server/full/.dockerignore
@@ -0,0 +1,2 @@
+**/.gitignore
+**/.gitkeep
\ No newline at end of file
diff --git a/docker/server/full/Dockerfile b/docker/server/full/Dockerfile
new file mode 100644
index 00000000..e2a3d64d
--- /dev/null
+++ b/docker/server/full/Dockerfile
@@ -0,0 +1,6 @@
+FROM openmohaa/base
+
+USER openmohaa
+
+COPY --chown=openmohaa:openmohaa "game" "/usr/local/share/mohaa"
+
diff --git a/docker/server/full/game/.gitkeep b/docker/server/full/game/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docker/server/full/game/home/.gitkeep b/docker/server/full/game/home/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/compiling.md b/docs/compiling.md
new file mode 100644
index 00000000..41b4f445
--- /dev/null
+++ b/docs/compiling.md
@@ -0,0 +1,84 @@
+# Compiling
+
+OpenMoHAA supports any architecture, thanks to the CMake build system and cross-platform code/libraries. While the most common little-Endian architectures (arm, aarch64, x86, x86_64, ppc64le) have been tested and confirmed to work, big-Endian architectures should be supported as well; however, they remain untested.
+
+The following tools are required for all platforms:
+- CMake >= 3.12
+- Flex (>= 2.6.4) and Bison (>= 3.5.1)
+- A C++11 compiler
+- [SDL2](https://github.com/libsdl-org/SDL/tree/SDL2)
+- [OpenAL SDK](https://github.com/kcat/openal-soft)
+
+The following tools may be useful:
+- [cURL](https://github.com/curl/curl)
+
+The installation directory can be set to the MOHAA directory with `-DCMAKE_INSTALL_PREFIX=/path/to/mohaa`.
+
+Compiling debug binaries will result in a `-dbg` suffix appended to the name of the binaries to avoid mixing debug/release code.
+
+cURL is used to access websites. It is currently used to check for a new release. If the project is compiled without cURL, OpenMoHAA will be unable to check for new updates automatically.
+
+## Compiling for Linux
+
+These are the tools required on Linux :
+- Clang >= 7.0.1 or GCC >= 9.4.0
+- libsdl2-dev
+- libopenal-dev
+- libssl-dev
+- libcurl4-openssl-dev
+
+**clang-7** and **gcc-9** has been tested to work on Ubuntu 20.04. Although it's best to use the latest versions.
+
+1 line install command with clang:
+```sh
+sudo apt-get install -y cmake ninja-build clang lld flex bison libsdl2-dev libopenal-dev libcurl4-openssl-dev
+```
+
+Example with **CMake** and **ninja-build** installed:
+```sh
+mkdir .cmake && cd .cmake
+cmake ../
+cmake --build .
+cmake --install .
+```
+
+Usually binaries get installed inside the `/usr/local/lib/openmohaa` directory.
+
+Other compilers can be specified by appending `-DCMAKE_C_COMPILER=/path/to/compiler -DCMAKE_CXX_COMPILER=path/to/compiler` to the CMake command-line.
+
+## Compiling for Windows
+
+Visual Studio (2019 or 2022) is generally preferred.
+
+- Get Flex/Bison: https://github.com/lexxmark/winflexbison/releases/latest
+- Get OpenAL: https://github.com/kcat/openal-soft/releases/latest rename `soft_oal.dll` to `OpenAL64.dll` on 64-bit and `OpenAL32.dll` on 32-bit
+- Get cURL: https://github.com/curl/curl
+
+Optionally, The cURL library can be compiled with the following CMake commands:
+```
+cmake -DCMAKE_INSTALL_PREFIX="E:\Src\openmoh\openmohaa\thirdparty\curl\build\install" -DCURL_USE_LIBPSL=OFF -DCURL_USE_SCHANNEL=ON -B build
+cmake --build build --config Release
+cmake --install build --config Release
+```
+
+Append `-DFLEX_EXECUTABLE=...\win_flex.exe -DBISON_EXECUTABLE=...\win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal"` to the CMake command-line to compile the project.
+
+Example after cloning the repository:
+```sh
+mkdir .cmake && cd .cmake
+cmake -DFLEX_EXECUTABLE=path/to/win_flex.exe -DBISON_EXECUTABLE=path/to/win_bison.exe -DOPENAL_INCLUDE_DIR="path/to/oal/include" -DOPENAL_LIBRARY="path/to/oal" ../
+cmake --build .
+cmake --install .
+```
+
+Usually binaries get installed inside the `Program Files (x86)` folder.
+
+afterwards you can can append `-DCURL_ROOT=path\to\curl\install` to specify the install path to cURL.
+
+## Tweaking the build
+
+- `-DBUILD_NO_CLIENT=1` Don't build client binaries. This will only build the dedicated server binaries.
+- `-DCMAKE_LIB_SUFFIX=suffix` Default suffix to use for the default `lib` directory. For example `-DCMAKE_LIB_SUFFIX=64`
+- `-DNO_MODERN_DMA=1` Use the basic DMA sound system from quake3. This lacks many features such as soundtracks and movie audio from the modern OpenAL-based DMA sound system. This option is not recommended, unless openal is not available.
+- `-DTARGET_LOCAL_SYSTEM=1` for compiling and installing on the local system. This will remove the architecture suffix at the end of each binary. This option can be useful for packaging builds.
+- `-DUSE_SYSTEM_LIBS=1` for third-party libraries, this will make use of system libraries instead of libraries that are embedded within the project.
diff --git a/docs/configuration.md b/docs/configuration.md
new file mode 100644
index 00000000..b110713e
--- /dev/null
+++ b/docs/configuration.md
@@ -0,0 +1,139 @@
+# Configuration and commands
+
+## General configuration
+
+This documentation currently only lists new changes that were introduced in OpenMoHAA.
+
+If you want to use containers, see [Building a server container in Docker](../../docker/server/README.md) to build an image for your dedicated server.
+
+### Home directory
+
+In original MOH:AA, the game installation directory is used to store mods and data, it's not the case in OpenMoHAA as it uses the home directory by default to write data in here, and the home directory can be used to store mods. This behavior can be changed:
+
+- `set fs_homepath Z:\openmohaa_data`: User data will be read and written in the directory located in `Z:\openmohaa_data`
+- `set fs_homepath homedata`: The subdirectory `homedata` in the game directory will be used to read and store user data
+- `set fs_homepath .`: Not recommended, the game directory will be used for storing user data, just like the original MOH:AA
+
+The variable defaults to the following value depending on the OS:
+
+- `%APPDATA%\openmohaa` on Windows
+- `~/.openmohaa` on Linux
+- `~/Library/Application Support/openmohaa` on macOS
+
+### Configure the network components
+
+The network settings can be adjusted to use either IPv4, IPv6, or both. By default, IPv6 is disabled on dedicated servers. The following commands adjust network settings:
+
+- `set net_enabled 0`: This networking.
+- `set net_enabled 1`: This enables IPv4 only (the default setting for dedicated servers).
+- `set net_enabled 2`: This enables IPv6 only.
+- `set net_enabled 3`: This enables both IPv4 and IPv6 (the default setting when running the standalone game).
+
+*Note: The master server (using the GameSpy protocol) does not support IPv6. If IPv4 is disabled, the server won't appear in the online server list for internet games, even if IPv6 is enabled.*
+
+### Flood protection differences with MOH: Spearhead
+
+Flood protection is turned on by default in all games (`sv_floodProtection 1`).
+
+- In MOH: Allied Assault and OpenMoHAA, flood protection checks all commands.
+- In MOH: Spearhead 2.0 and later, flood protection only checks for text messages.
+
+While flood protection prevents spam, it can sometimes be annoying in certain situations like reloading and checking scores within a short period of time. If needed, it can be disabled with `set sv_floodProtection 0`.
+
+For more details on preventing message spamming, check out the [Chat](#chat) section below.
+
+### Updates
+
+The game periodically retrieves the latest version number from the GitHub project page at fixed intervals to check for available updates. This process runs in the background and does not interfere with the main thread, meaning it will not cause hangs or stability issues. Updates are not applied automatically, they must be downloaded and installed manually.
+
+Update checking is enabled by default, but can be disabled under any of the following conditions:
+- `net_enabled` is set to 0, disables networking, as mentioned above
+- `com_updatechecker_enabled` is set to 0
+- The project is compiled without libcurl support
+
+If you disable the update checker, remember to regularly check the project page for new versions. Updates can improve security and provide important fixes against exploits.
+
+## Server configuration
+
+### Optimization / Antichams
+
+A new variable, `sv_netoptimize`, enables a feature that optimizes network bandwidth by not sending players information about others they can't see. For each client, the server optimizes by only transmitting data about players within their view. Clients will not receive information about players they can't see. This feature also helps protect against cheaters:
+
+- `set sv_netoptimize 0`: This disables the optimization - the default
+- `set sv_netoptimize 1`: This enables the optimization for entities that are moving
+- `set sv_netoptimize 2`: This enables the optimization, always
+
+This option exists since **Medal of Honor: Allied Assault Breakthrough** 2.30, however it was improved in OpenMoHAA: sounds like footsteps will be sent so players don't get confused.
+
+### Managing bans
+
+A new feature was introduced to ban IP addresses, thanks to the [ioquake3](https://ioquake3.org/) project. Bans are saved by default in `serverbans.dat` but it can be modified with the `sv_banFile` variable. Here are commands to manage bans:
+
+|Name       |Parameters                                      |Description
+|-----------|------------------------------------------------|-----------
+|rehashbans |                                                |Loads saved bans from the banlist file
+|listbans   |                                                |Lists all banned IP addresses
+|banaddr    |ip[*/subnet*] \| clientnum [*subnet*] [reason]  |Bans an IP through its address or through a client number, a subnet can be specified to ban a network range
+|exceptaddr |ip[*/subnet*] \| clientnum [*subnet*]           |Adds an IP as an exception, for example IP ranges can be banned but one or more exceptions can be added
+|bandel     |ip[*/subnet*] \| num                            |Unbans an IP address or a subnet, the entry number can be specified as an alternative
+|exceptdel  |ip[*/subnet*] \| num                            |Removes a ban exception
+|flushbans  |                                                |Removes all bans
+
+Examples:
+
+- `banaddr 192.168.5.2` will ban the IP address **192.168.5.2**.
+- `banaddr 192.168.1.0/24` will ban all **192.168.1.x** IP addresses (in the range **192.168.1.0**-**192.168.1.255**).
+- `banaddr 2` will ban the IP address of the client **#2**.
+- `banaddr 4 24` will ban the subnet of client **#4** - i.e if client .**#4** has IP **192.168.8.4**, then it will ban all IPs ranging from **192.168.8.0**-**192.168.8.255**.
+- `exceptaddr 3` will add the IP of client **#3** as an exception.
+- `bandel 192.168.8.4` will unban **192.168.8.4**.
+- `bandel 192.168.1.0/24` will unban the entire **192.168.1.0** subnet (IP ranging from **192.168.1.0**-**192.168.1.255**).
+
+To calculate IP subnets, search for `IP subnet calculator` on Internet.
+
+### Game
+
+#### Chat
+
+Chat messages will be logged in the console and in the logfile without requiring to set the `developer` variable.
+
+The in-game chat can be tweaked:
+
+- `set g_instamsg_allowed 0`: This disables voice instant messages.
+- `set g_instamsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each instant messages to avoid spamming. Defaults to 1000.
+- `set g_textmsg_allowed 0`: This disables text messages. All, team and private messages will be disabled.
+- `set g_textmsg_minDelay x`: x is the delay in milliseconds, the minimum delay between each text message to avoid spamming. Defaults to 1000.
+
+Temporarily disabling text messages can be useful in situations where tensions arise in the chat. Otherwise, it's best to keep them enabled under normal circumstances.
+
+#### Balancing teams
+
+This setting prevents clients from joining a team if that team already has more players than the others. By default, it's turned off, but it can be switched on with the command `set g_teambalance 1`.
+
+This feature is passive: it only checks the team sizes when someone tries to join, so it won't automatically balance teams during the game.
+
+*Note: This check doesn't apply in server scripts; it only works when clients join teams directly.*
+
+#### Bots
+
+OpenMoHAA introduced multiplayer bots which can be used for entertainment or for testing purposes. Bots are players controlled by the computer, they appear in the scoreboard with their ping set to **bot**.
+
+First get the [mp-navigation](https://github.com/openmoh/mp-navigation) pk3, it is needed so bots can navigate through MP maps. Then the following variables are used to configure bots:
+
+- `set sv_maxbots x`: **Required**, configure the maximum number of bots allowed in the game. Since the game can only handle a total of 64 players (clients), the number of bots will be limited to 64 minus the number of real players (`sv_maxclients`). For example, if you set `sv_maxclients` to 48, the maximum number of bots (sv_maxbots) can be 16.
+- `set sv_numbots x`: Set the number of bots to spawn. It will be capped to the value of `sv_maxbots`.
+- `set sv_minPlayers x`: Configure the minimum number of players required. If the number of real players in a team is below the specified value, the game will automatically add bots to fill the gap. For example, if `sv_minPlayers` is set to 8 and only 5 real players are connected and in a team, the game will spawn 3 bots to make sure there are always 8 players in the game.
+
+Example with the requirement of 6 players:
+```cpp
+set sv_maxbots 16 // Reserve 16 client slots for bots
+set sv_minPlayers 6 // When there is 0 player in a team, there will be 6 bots. When there is 1 player in a team, there will be 5 bots, and so on
+```
+
+Example with 4 bots playing:
+```cpp
+set sv_maxbots 16 // Reserve 16 client slots for bots
+set sv_numbots 4 // Spawn 4 bots
+```
+
+*Note: Bots will have their ping set to **bot** so that all players in-game know they are bots. This prevents any confusion and eliminates any doubt about a hacker being in the game.*
diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 00000000..6f54759f
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,126 @@
+# Frequently Asked Questions
+
+<details>
+<summary>My OpenMoHAA client has crashed, leaving the desktop brightened up. How can I fix this without restarting the computer?</summary>
+
+## Try one of the following options:
+  
+### 1. Lock and Unlock Your Screen (Windows+L)
+Simply pressing **Win+L** to lock your screen and then logging back in can sometimes reset the brightness to its previous state.
+
+### 2. Command Line Fix (Windows)
+If you have an **NVIDIA** or **AMD** GPU, you can try these commands:
+
+- **For NVIDIA GPUs:**
+  Open **Command Prompt (cmd.exe)** or **PowerShell** and run:
+  
+  ```powershell
+  nvidia-settings -a "DPY-0/RedBrightness=0.0" -a "DPY-0/GreenBrightness=0.0" -a "DPY-0/BlueBrightness=0.0"
+  ```
+  
+  (If you have multiple displays, `DPY-0` may need to be replaced with the correct display identifier.)
+
+- **For AMD GPUs:**
+  Open the **AMD Radeon Software** and manually adjust brightness or SDR settings to reset them.
+
+### 3. Use a Third-Party Tool to Reset Gamma & Brightness
+Programs like **Gamma Panel** or **f.lux** can help restore modified brightness and gamma settings quickly.
+
+### 4. Restart the Graphics Driver (Windows)
+Press **Win + Ctrl + Shift + B** to restart the graphics driver without rebooting your PC. Your screen will briefly go black, then reset.
+
+### 5. Reset Gamma via Xrandr (Linux, Xorg Users)
+If you’re using Linux with Xorg, try this command to reset gamma settings:
+
+```bash
+xrandr --output eDP-1 --gamma 1:1:1
+```
+
+(Replace `eDP-1` with the correct display name, which you can find by running `xrandr` in the terminal.)
+
+### 6. Changing Display Mode in Windows (Alternative)
+If none of the above solutions work, you can manually reset brightness by changing the display mode:
+1. Right-click on your desktop and select **Display settings**.
+2. Scroll down to **Display resolution** and change it to a different setting.
+3. Revert it back to your original resolution.
+
+This forces Windows to refresh display settings, which may restore brightness.
+</details>
+
+---
+
+<details>
+<summary>I am using a custom map/mod, and I experience glitches that do not occur in the original game. What should I do?</summary>
+
+### 1. Check game file precedences:
+As OpenMoHAA has MultiUser Support (on Windows, user game data is stored in `%APPDATA%\openmohaa`), custom files in this directory override existing files in the game installation folder.
+
+|Example|
+|-|
+| A custom `grenzuebergang_KE.pk3` (placed in the user game data folder) contains a `scripts/effects.shader` file and it does not declare `bh_wood_puff_simple`. As a result, bullet impact effect has no texture.
+However, if `grenzuebergang_KE.pk3` is placed in the game installation folder (`MOHAA/main` or `/mainta` or `/maintt`, where the base `pak*.pk3` files are located) original files take precedence over custom files as they follow the alphabetical order of file naming.
+`Pak1.pk3` contains the original `scripts/effects.shader` where the impact effect is declared; therefore, the player does not experience any issue, as the original file is "loaded" after the custom file. |
+
+### 2. Create a new issue:
+If changing the file precedences has no effect on the glitch you discovered, you have probably found a new bug in the OpenMoHAA engine, so please <a href="https://github.com/openmoh/openmohaa/issues/new/choose">create a new issue</a> for the developers.
+</details>
+
+---
+
+<details>
+<summary>I cannot set my screen resolution in the Options/Video menu. How can I change it?</summary>
+
+### Edit `omconfig.cfg`:
+
+If they do not exist, add the following console variables (cvars) to your `omconfig.cfg`[^1]
+
+```
+seta r_mode "-1"
+seta r_customwidth "1920"
+seta r_customheight "1080"
+```
+
+### or (alternatively) run the game with command line parameters:
+
+Launch your OpenMoHAA client with the following:
+
+```
++set r_mode -1 +set r_customwidth 1920 +set r_customheight 1080
+```
+
+Change the width and height accordingly.
+
+</details>
+
+---
+
+<details>
+<summary>Console does not show up in OpenMoHAA. How can I enable it?</summary>
+
+### 1. Check if console is enabled
+
+In the Options -> Advanced menu, make sure that the checkbox is checked (red "X") at the Console.
+Alternatively, check if the value is equal to 1 for the following cvar in `omconfig.cfg`[^1]:
+```
+seta ui_console "1"
+```
+
+### 2. Check Console keys cvar
+
+OpenMoHAA introduces a new cvar that stores the keys to open up console. Edit the following cvar in your `omconfig.cfg`[^1]:
+
+```
+seta cl_consoleKeys "~ ` 0x7e 0x60"
+```
+
+As you see the default variable above, you can add multiple keys (between the quotation marks, divided by spaces) to display/hide the console. 
+
+> bind ` "toggleconsole" is not to be used anymore.
+</details>
+
+
+---
+
+Footnotes:
+
+[^1]: omconfig.cfg is the OpenMoHAA configuration file that is located in the user game data folder (on Windows,  `%APPDATA%\openmohaa\main` or `mainta` or `maintt` `\configs\omconfig.cfg`)
diff --git a/docs/features.md b/docs/features.md
new file mode 100644
index 00000000..2ebf8105
--- /dev/null
+++ b/docs/features.md
@@ -0,0 +1,89 @@
+# Features
+
+A lot of bugs and exploits from MOH:AA were fixed in OpenMoHAA (BOF exploit, grenade crash bug, command overflow...).
+
+## Summary
+
+- SDL2 backend
+- OpenAL sound support (better sound quality)
+- Full 64-bit support
+- Cross-platform support
+- Multiuser support on OS (On Windows, user game data is stored in "%APPDATA%\openmohaa")
+- Many bug fixes and additions from ioquake3
+- Automatic scaling of UI elements on high resolutions like 4K
+
+Overall, better compatibility on modern systems and bugfixes.
+
+## Additions
+
+### General
+
+- Demo recording
+- Features from ioquake3
+- Features from MOH: Spearhead 2.15 and MOH: Breakthrough 2.40
+- IPv6 support (from ioquake3)
+
+### Client-side
+
+- Customizable FOV
+- OpenAL and SDL are used
+- Smoother animations
+
+#### Stufftext restriction
+
+Servers can no longer make players run any command. Only a small number of safe commands are now allowed. This change helps prevent abuse, like unbinding player controls, and improves overall security.
+
+`stufftext` is now limited to trusted, commonly used commands, like those for controlling in-game music. The full list can be found in [cgame/cg_servercmds_filter.c](../code/cgame/cg_servercmds_filter.c).
+
+### Server-side
+
+- Bots
+- IP ban (from ioquake3)
+- More script commands for mods
+- Non-PVS optimization
+- Packet flood protection
+- Ability to enable/disable the text chat and the voice message chat and set a delay between chat/instant messages
+
+#### Non-PVS optimization
+
+For each client, the server optimizes by only sending them information about other players that they can see. Clients won't see other players they can't see.
+
+Enable this feature with `set sv_netoptimize 2`.
+
+## Fixes
+
+### Client-side and server-side
+
+- Fixed background ambient sounds being muted when restarting
+- Fixes from SH 2.15, BT 2.40 and ioquake3
+- Buffer overflow fixes
+- Directory traversal fix
+
+### Server-side
+
+- DM message comment fix
+- Callvote fix
+- Fix to prevent getting weapons from opposite team
+- Fixed grenade crash bug
+- Fixed grenade spectator charge bug
+- Fixed `leave_team` bug
+- Fixed memory leaks issues in long matches
+- Fixed sharking issues with ladders
+- Fix to prevent being able to spectate while still in the team with a NULL primary deathmatch weapon
+- Fix to prevent throwing a projectile and going into spectator to kill anyone
+- Fix for `sv_fps` (tickrate), higher values won't cause animation issues anymore
+- Grenades with 1 ammo can now be picked up
+- Prevent crashing when the last weapon has no ammo and other weapons are inventory items
+- Prevent doors from getting blocked
+
+## Planned features
+
+This is a non-exhaustive list of objectives and planned features.
+
+### Server-side
+
+- 100% compatibility with mohaa content
+- More feature for mods
+- Anticheat
+- Stats system
+- Multiple roles/abilities for server admins to reduce password-stealing
\ No newline at end of file
diff --git a/docs/features_g_allclasses.html b/docs/features_g_allclasses.html
new file mode 100644
index 00000000..0c82ecfa
--- /dev/null
+++ b/docs/features_g_allclasses.html
@@ -0,0 +1,8267 @@
+<HTML>
+<HEAD>
+<Title>Game Module Classes</Title>
+</HEAD>
+<BODY>
+<H1>
+<center>Game Module Classes</center>
+</H1>
+<h2><a href="#Actor">Actor</a>, <a href="#Animate">Animate</a>, <a href="#Entity">Entity</a>, <a href="#ScriptSlave">ScriptSlave</a>, <a href="#ScriptThread">ScriptThread</a>, <a href="#Sentient">Sentient</a>, <a href="#StateMap">StateMap</a>, <a href="#Trigger">Trigger</a>, <a href="#World">World</a></h2>
+<h2> <a name="Actor">Actor (<i>Actor</i>)</a> -> <a href="#SimpleActor">SimpleActor</a> -> <a href="#Sentient">Sentient</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>accuracy</B>( <i>Float value </i>)</tt><BR>
+<ul>Set percent to hit</ul>
+
+<P><tt><B>accuracy</B>( <i>Float value </i>)</tt><BR>
+<ul>Set percent to hit</ul>
+
+<P><tt><B>accuracy</B></tt><BR>
+<ul>Set percent to hit</ul>
+
+<P><tt><B>aimat</B>( <i>String target </i>)</tt><BR>
+<ul>Specify the target to aim at.</ul>
+
+<P><tt><B>ai_off</B></tt><BR>
+<ul>Turns the AI off for this actor.</ul>
+
+<P><tt><B>ai_on</B></tt><BR>
+<ul>Turns the AI on for this actor.</ul>
+
+<P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmnode</B></tt><BR>
+<ul>Gets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmthread</B></tt><BR>
+<ul>Gets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm thread for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
+<ul>Gives the AI some grenades</ul>
+
+<P><tt><B>ammo_grenade</B></tt><BR>
+<ul>Returns how many grenades an AI has</ul>
+
+<P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
+<ul>Gives the AI some grenades</ul>
+
+<P><tt><B>anim</B>( <i>String name </i>)</tt><BR>
+<ul>Play animation.</ul>
+
+<P><tt><B>animfinal</B></tt><BR>
+<ul>Whether the animation was succesfully finished</ul>
+
+<P><tt><B>animloop</B>( <i>String name </i>)</tt><BR>
+<ul>Loop animation.</ul>
+
+<P><tt><B>animname</B></tt><BR>
+<ul>Sets the animname.</ul>
+
+<P><tt><B>animname</B></tt><BR>
+<ul>Gets the animname.</ul>
+
+<P><tt><B>animscript</B>( <i>String name </i>)</tt><BR>
+<ul>Play the animation script</ul>
+
+<P><tt><B>animscript_attached</B>( <i>String name </i>)</tt><BR>
+<ul>Play a noclip animation even when attached</ul>
+
+<P><tt><B>animscript_noclip</B>( <i>String name </i>)</tt><BR>
+<ul>Play the noclip animation script</ul>
+
+<P><tt><B>animscript_scripted</B>( <i>String name </i>)</tt><BR>
+<ul>Play the scripted animation script</ul>
+
+<P><tt><B>anim_attached</B>( <i>String name </i>)</tt><BR>
+<ul>Play attached animation.</ul>
+
+<P><tt><B>anim_noclip</B>( <i>String name </i>)</tt><BR>
+<ul>Play noclip animation.</ul>
+
+<P><tt><B>anim_scripted</B>( <i>String name </i>)</tt><BR>
+<ul>Play scripted animation.</ul>
+
+<P><tt><B>attachgrenade</B></tt><BR>
+<ul>Used only by grenade return animations to tell the code when to attach the grenade to the actor</ul>
+
+<P><tt><B>attackhandler</B></tt><BR>
+<ul>Gets the current script that will handle attack events</ul>
+
+<P><tt><B>attackhandler</B></tt><BR>
+<ul>Sets the current script that will handle attack events</ul>
+
+<P><tt><B>attackplayer</B></tt><BR>
+<ul>Force Actor to attack the player</ul>
+
+<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
+<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
+</ul>
+
+<P><tt><B>avoidplayer</B>( <i>Integer allowavoid </i>)</tt><BR>
+<ul>set to 0 if this AI shouldn't automatically get out of the way, non-zero if he should.<BR>
+</ul>
+
+<P><tt><B>avoidplayer</B></tt><BR>
+<ul>is 0 if this AI won't automatically get out of the way, non-zero if he will<BR>
+</ul>
+
+<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
+<P><tt><B>balconyheight</B></tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
+<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
+<P><tt><B>bedead</B></tt><BR>
+<ul>Forces the actor to be instantly and totally dead; no death animation is played</ul>
+
+<P><tt><B>blendtime</B></tt><BR>
+<ul>Set the crossblend time to something other than the default, in seconds</ul>
+
+<P><tt><B>blendtime</B></tt><BR>
+<ul>Get the crossblend time</ul>
+
+<P><tt><B>breakspecial</B></tt><BR>
+<ul>tell ai to break special attack</ul>
+
+<P><tt><B>calcgrenadetoss</B>( <i>Vector target_position </i>)</tt><BR>
+<ul>Called to calculate a grenade toss.  Must be called before a grenade throwing animation.<BR>
+Returns the name of the script to call with animscript if the toss can succeed, or  if the toss won't work.<BR>
+Should be called infrequently, and never during the middle of a grenade toss.</ul>
+
+<P><tt><B>calcgrenadetoss2</B>( <i>Vector target_position, Float speed </i>)</tt><BR>
+<ul>Called to calculate a grenade toss.  Must be called before a grenade throwing animation.<BR>
+Returns the name of the script to call with animscript if the toss can succeed, or  if the toss won't work.<BR>
+Should be called infrequently, and never during the middle of a grenade toss.<BR>
+ The speed parameter is optional.  Pass a speed if you just want to override and throw no matter what...</ul>
+
+<P><tt><B>canmoveto</B>( <i>Vector position </i>)</tt><BR>
+<ul>returns a boolean if the AI can move to a point; for use in anim scripts</ul>
+
+<P><tt><B>canshoot</B>( <i>Vector shootOrigin </i>)</tt><BR>
+<ul>Determines if it would be possible to shoot the sentient's enemy from the given position.</ul>
+
+<P><tt><B>canshootenemyfrom</B>( <i>Vector shootOrigin </i>)</tt><BR>
+<ul>Determines if it would be possible to shoot the sentient's enemy from the given position.</ul>
+
+<P><tt><B>crawlto</B>( <i>String dest </i>)</tt><BR>
+<ul>Specify the location to crawl to.</ul>
+
+<P><tt><B>crouchto</B>( <i>String dest </i>)</tt><BR>
+<ul>Specify the location to crouch to.</ul>
+
+<P><tt><B>curiousoff</B></tt><BR>
+<ul>Turn off an actor's curious state</ul>
+
+<P><tt><B>curiouson</B></tt><BR>
+<ul>Turn on an actor's curious state</ul>
+
+<P><tt><B>damagepuff</B>( <i>Vector position, Vector direction </i>)</tt><BR>
+<ul>Spawns a puff of 'blood' smoke at the speficied location in the specified direction.</ul>
+
+<P><tt><B>deathembalm</B></tt><BR>
+<ul>preps the dead actor for turning nonsolid gradually over time</ul>
+
+<P><tt><B>deathhandler</B></tt><BR>
+<ul>Sets the current script that will handle death events</ul>
+
+<P><tt><B>deathhandler</B></tt><BR>
+<ul>Gets the current script that will handle death events</ul>
+
+<P><tt><B>deathsinkstart</B></tt><BR>
+<ul>Makes the entity sink into the ground and then get removed (this starts it).</ul>
+
+<P><tt><B>defaultnonvislevel</B></tt><BR>
+<ul>updates the default value for 'nonvislevel'</ul>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>detachgrenade</B></tt><BR>
+<ul>Used only by grenade return animations to tell the code when to throw the grenade</ul>
+
+<P><tt><B>disguise_accept_thread</B></tt><BR>
+<ul>Gets the name of the thread for the actor to start when accepting papers</ul>
+
+<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
+
+<P><tt><B>disguise_accept_thread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the thread for the actor to start when accepting papers</ul>
+
+<P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
+<ul>Sets the disguise level of the actor. May be 1 or 2</ul>
+
+<P><tt><B>disguise_level</B></tt><BR>
+<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+
+<P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
+<ul>Sets the disguise level of the actor. May be 1 or 2</ul>
+
+<P><tt><B>disguise_period</B>( <i>Float period_in_seconds </i>)</tt><BR>
+<ul>Sets the time between the end of one disguise behavior and start of the next</ul>
+
+<P><tt><B>disguise_period</B>( <i>Float period_in_seconds </i>)</tt><BR>
+<ul>Sets the time between the end of one disguise behavior and start of the next</ul>
+
+<P><tt><B>disguise_period</B></tt><BR>
+<ul>Gets the time between the end of one disguise behavior and start of the next</ul>
+
+<P><tt><B>disguise_range</B>( <i>Float range_in_units </i>)</tt><BR>
+<ul>Sets the maximum distance for disguise behavior to get triggered</ul>
+
+<P><tt><B>disguise_range</B></tt><BR>
+<ul>Gets the maximum distance for disguise behavior to get triggered</ul>
+
+<P><tt><B>disguise_range</B>( <i>Float range_in_units </i>)</tt><BR>
+<ul>Sets the maximum distance for disguise behavior to get triggered</ul>
+
+<P><tt><B>distancetoenemy</B></tt><BR>
+<ul>Get the distance from the Actor to its enemy</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>dumb</B></tt><BR>
+<ul>Make Actor dumb.</ul>
+
+<P><tt><B>emotion</B></tt><BR>
+<ul>The method of setting the facial expression of the Actor</ul>
+
+<P><tt><B>enableEnemy</B></tt><BR>
+<ul>sets enableEnemy variable</ul>
+
+<P><tt><B>enablePain</B></tt><BR>
+<ul>sets enablePain variable</ul>
+
+<P><tt><B>endactionanim</B>( <i> </i>)</tt><BR>
+<ul>End any aiming/action animation which is currently playing</ul>
+
+<P><tt><B>enemy</B></tt><BR>
+<ul>Get the actor's current enemy</ul>
+
+<P><tt><B>enemysharerange</B></tt><BR>
+<ul>gets the range outside which the AI will not receive notification that a teammate has a new enemy</ul>
+
+<P><tt><B>enemysharerange</B>( <i>Float range </i>)</tt><BR>
+<ul>sets the range outside which the AI will not receive notification that a teammate has a new enemy</ul>
+
+<P><tt><B>enemysharerange</B>( <i>Float range </i>)</tt><BR>
+<ul>sets the range outside which the AI will not receive notification that a teammate has a new enemy</ul>
+
+<P><tt><B>enemyswitchdisable</B></tt><BR>
+<ul>Disable enemy switching...</ul>
+
+<P><tt><B>enemyswitchenable</B></tt><BR>
+<ul>Enable enemy switching...</ul>
+
+<P><tt><B>enemy_visible_change_time</B></tt><BR>
+<ul>Get the last time whether or not the enemy is visible changed, in seconds</ul>
+
+<P><tt><B>entitystart</B></tt><BR>
+<ul>Initialize a Actor.</ul>
+
+<P><tt><B>eyeslookat</B>( <i>Entity entity </i>)</tt><BR>
+<ul>The actor will look at this entity.</ul>
+
+<P><tt><B>fallheight</B>( <i>Float height </i>)</tt><BR>
+<ul>Set the fallheight</ul>
+
+<P><tt><B>fallheight</B></tt><BR>
+<ul>Set the fallheight</ul>
+
+<P><tt><B>favoriteenemy</B>( <i>Entity ai_or_player </i>)</tt><BR>
+<ul>Gets this AI's favorite enemy</ul>
+
+<P><tt><B>favoriteenemy</B>( <i>Entity ai_or_player </i>)</tt><BR>
+<ul>Gets this AI's favorite enemy</ul>
+
+<P><tt><B>favoriteenemy</B></tt><BR>
+<ul>Gets this AI's favorite enemy</ul>
+
+<P><tt><B>findenemy</B></tt><BR>
+<ul>Finds the best enemy to target</ul>
+
+<P><tt><B>fire_grenade</B></tt><BR>
+<ul>Used only by grenade throw animations to tell the code when to throw a grenade</ul>
+
+<P><tt><B>fixedleash</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
+
+<P><tt><B>fixedleash</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
+
+<P><tt><B>fixedleash</B></tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
+
+<P><tt><B>fov</B></tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>GetRunAnim</B></tt><BR>
+<ul>Internal usage</ul>
+
+<P><tt><B>GetWalkAnim</B></tt><BR>
+<ul>Internal usage</ul>
+
+<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gren_awareness</B></tt><BR>
+<ul>gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
+<ul>specifies the gun to use</ul>
+
+<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
+<ul>specifies the gun to use</ul>
+
+<P><tt><B>gun</B></tt><BR>
+<ul>gets the gun to being used</ul>
+
+<P><tt><B>hascompletelookahead</B></tt><BR>
+<ul>returns true if there are no corners to turn on the rest of the AI's current path</ul>
+
+<P><tt><B>headmodel</B></tt><BR>
+<ul>gets the head model</ul>
+
+<P><tt><B>headmodel</B>( <i>String headmodel </i>)</tt><BR>
+<ul>sets the head model</ul>
+
+<P><tt><B>headskin</B></tt><BR>
+<ul>gets the head skin</ul>
+
+<P><tt><B>headskin</B>( <i>String headskin </i>)</tt><BR>
+<ul>sets the head skin</ul>
+
+<P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
+<ul>The hearing radius of the actor</ul>
+
+<P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
+<ul>The hearing radius of the actor</ul>
+
+<P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
+<ul>The hearing radius of the actor</ul>
+
+<P><tt><B>holster</B>( <i>Integer holster </i>)</tt><BR>
+<ul>If non-zero, affects offhand. Holster weapon</ul>
+
+<P><tt><B>idlesay</B>( <i>String animation </i>)</tt><BR>
+<ul>The name of an idle dialog animation to play</ul>
+
+<P><tt><B>ignorebadplaces</B>( <i>Integer ignore </i>)</tt><BR>
+<ul>sets whether or not this AI guy will ignore bad places (0 = not suicidal)</ul>
+
+<P><tt><B>ignorebadplaces</B></tt><BR>
+<ul>gets whether or not this AI guy will ignore bad places (0 = not suicidal)</ul>
+
+<P><tt><B>ignorebadplaces</B>( <i>Integer ignore </i>)</tt><BR>
+<ul>sets whether or not this AI guy will ignore bad places (0 = not suicidal)</ul>
+
+<P><tt><B>immediateremove</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>inreload</B></tt><BR>
+<ul>returns non-zero if the AI is in a reload</ul>
+
+<P><tt><B>inreload</B>( <i>Integer reloading </i>)</tt><BR>
+<ul>set to non-zero to indicate the AI is in a reload</ul>
+
+<P><tt><B>interrupt_point</B></tt><BR>
+<ul>hint from animation scripts to AI code that now is a good time to switch animations</ul>
+
+<P><tt><B>interval</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the distance AI tries to keep between squadmates while moving.</ul>
+
+<P><tt><B>interval</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the distance AI tries to keep between squadmates while moving.</ul>
+
+<P><tt><B>interval</B></tt><BR>
+<ul>Gets the distance AI tries to keep between squadmates while moving.</ul>
+
+<P><tt><B>intervaldir</B></tt><BR>
+<ul>the direction the AI would like to move to maintain its interval</ul>
+
+<P><tt><B>is_enemy_visible</B></tt><BR>
+<ul>0 if the enemy is not currently visible, 1 if he is</ul>
+
+<P><tt><B>kickdir</B></tt><BR>
+<ul>Gets the direction the AI wants to kick</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>last_enemy_visible_time</B></tt><BR>
+<ul>Get the last time the enemy was visible, in seconds</ul>
+
+<P><tt><B>leash</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI will wander from its leash home</ul>
+
+<P><tt><B>leash</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI will wander from its leash home</ul>
+
+<P><tt><B>leash</B></tt><BR>
+<ul>Gets the maximum distance the AI will wander from its leash home</ul>
+
+<P><tt><B>lookaroundangle</B>( <i>Float angle </i>)</tt><BR>
+<ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
+
+<P><tt><B>lookaroundangle</B></tt><BR>
+<ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
+
+<P><tt><B>lookaroundangle</B>( <i>Float angle </i>)</tt><BR>
+<ul>gets the angle in degrees left or right of center that the AI will look around while patrolling</ul>
+
+<P><tt><B>lookat</B>( <i>Entity entity </i>)</tt><BR>
+<ul>The actor will look at this entity.</ul>
+
+<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+
+<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+
+<P><tt><B>maxdist</B></tt><BR>
+<ul>Gets the maximum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mindist</B></tt><BR>
+<ul>Gets the minimum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mood</B></tt><BR>
+<ul>gets the AI mood: 'bored', 'nervous', 'curious', or 'alert'.</ul>
+
+<P><tt><B>mood</B>( <i>String new_mood </i>)</tt><BR>
+<ul>sets the AI mood... must be 'bored', 'nervous', 'curious', or 'alert'.</ul>
+
+<P><tt><B>movedir</B></tt><BR>
+<ul>Returns a unit vector pointing in the current direction of motion, or zero if not moving.This still has meaning if velocity is zero but the AI is starting to move on a path.</ul>
+
+<P><tt><B>movedoneradius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the waittill movedone radius, default 0 means don't use manual radius</ul>
+
+<P><tt><B>movedoneradius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the waittill movedone radius, default 0 means don't use manual radius</ul>
+
+<P><tt><B>moveto</B>( <i>String anim, String dest </i>)</tt><BR>
+<ul>Specify the location to move to, with animation anim.</ul>
+
+<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
+<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
+
+<P><tt><B>mumble</B>( <i>Integer can_mumble </i>)</tt><BR>
+<ul>Set to 1 if this guy is allowed to mumble, or 0 if he is not</ul>
+
+<P><tt><B>mumble</B></tt><BR>
+<ul>Returns 1 if this guy is allowed to mumble, or 0 if he is not</ul>
+
+<P><tt><B>nationality</B></tt><BR>
+<ul>Get the nationality of an actor. Return values are ger, it, usa, uk, ussr and unset.</ul>
+
+<P><tt><B>nationality</B>( <i>String nationality </i>)</tt><BR>
+<ul>Set the nationality of an actor. Valid entries are default, ger, it, usa, uk, and ussr.</ul>
+
+<P><tt><B>nationality</B>( <i>String nationality </i>)</tt><BR>
+<ul>Set the nationality of an actor. Valid entries are default, ger, it, usa, uk, and ussr.</ul>
+
+<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
+<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
+
+<P><tt><B>nolongpain</B>( <i>Integer allow </i>)</tt><BR>
+<ul>Set to 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
+
+<P><tt><B>nolongpain</B></tt><BR>
+<ul>Returns 1 if long pain is not allowed, or 0 if long pain is allowed.</ul>
+
+<P><tt><B>nonvislevel</B></tt><BR>
+<ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
+
+<P><tt><B>nonvislevel</B></tt><BR>
+<ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
+
+<P><tt><B>nonvislevel</B></tt><BR>
+<ul>visibility level in range 0-1 below which an enemy is treated as non-visible</ul>
+
+<P><tt><B>nosurprise</B>( <i>Integer nosurprise </i>)</tt><BR>
+<ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
+<P><tt><B>nosurprise</B></tt><BR>
+<ul>gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
+<P><tt><B>nosurprise</B>( <i>Integer nosurprise </i>)</tt><BR>
+<ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
+<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
+
+<P><tt><B>noticescale</B></tt><BR>
+<ul>Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
+
+<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
+
+<P><tt><B>no_idle</B></tt><BR>
+<ul>Gets if the actor will not go into idle after playing an animation</ul>
+
+<P><tt><B>no_idle</B></tt><BR>
+<ul>Specifies if the actor will not go into idle after playing an animation</ul>
+
+<P><tt><B>pain</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>used to inflict pain to an entity</ul>
+
+<P><tt><B>painhandler</B></tt><BR>
+<ul>Gets the current script that will handle pain events</ul>
+
+<P><tt><B>painhandler</B></tt><BR>
+<ul>Sets the current script that will handle pain events</ul>
+
+<P><tt><B>pathdist</B></tt><BR>
+<ul>returns total distance along current path to the path goal</ul>
+
+<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>patrolpath</B></tt><BR>
+<ul>Gets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>physics_off</B></tt><BR>
+<ul>turn physics off.</ul>
+
+<P><tt><B>physics_on</B></tt><BR>
+<ul>turn physics on.</ul>
+
+<P><tt><B>playsound</B>( <i>String soundName, [ Integer channel ], [ Float volume ], [ String min_distance ] </i>)</tt><BR>
+<ul>play a sound coming from this entity.<BR>
+default channel, CHAN_BODY.</ul>
+
+<P><tt><B>pointat</B>( <i>Entity entity </i>)</tt><BR>
+<ul>The actor will point at this entity.</ul>
+
+<P><tt><B>position</B></tt><BR>
+<ul>The Position the Actor wants to be and should animate towards</ul>
+
+<P><tt><B>position</B></tt><BR>
+<ul>The Position the Actor wants to be and should animate towards</ul>
+
+<P><tt><B>prealarmthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the pre alarm thread for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>prealarmthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the pre alarm thread for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>ReadyToFire</B></tt><BR>
+<ul>Returns if ready to fire</ul>
+
+<P><tt><B>reload_mg42</B></tt><BR>
+<ul>Reload the mg42 - only used by machinegunner</ul>
+
+<P><tt><B>remove</B></tt><BR>
+<ul>Removes this listener the next time events are processed.</ul>
+
+<P><tt><B>resetleash</B></tt><BR>
+<ul>resets the AI's leash to their current position</ul>
+
+<P><tt><B>runanimrate</B></tt><BR>
+<ul>Get the rate at which the run animation plays back</ul>
+
+<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the rate at which the run animation plays back</ul>
+
+<P><tt><B>runanimrate</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the rate at which the run animation plays back</ul>
+
+<P><tt><B>runto</B>( <i>String dest </i>)</tt><BR>
+<ul>Specify the location to run to.</ul>
+
+<P><tt><B>say</B>( <i>String animation </i>)</tt><BR>
+<ul>The name of a dialog animation to play</ul>
+
+<P><tt><B>saydone</B></tt><BR>
+<ul>Even used by sound-only special case of say to trigger waittill saydone</ul>
+
+<P><tt><B>setactionanim</B>( <i>String base_anim, Float lower_limit, Float upper_limit </i>)</tt><BR>
+<ul>Set the base action animation and range that they cover</ul>
+
+<P><tt><B>setaimmotionanim</B>( <i>String anim_crouch, String anim_stand </i>)</tt><BR>
+<ul>Set aim motion animation (handler scripts only)</ul>
+
+<P><tt><B>setaimtarget</B>( <i>Entity entity, Integer bMakeEnemy </i>)</tt><BR>
+<ul>Sets the primary weapon's aim target. if you pass a 1 for p2, the target will become the current enemy...</ul>
+
+<P><tt><B>setanim</B>( <i>String anim, Integer slot, Float weight, String flagged </i>)</tt><BR>
+<ul>Set animation slot</ul>
+
+<P><tt><B>setanimlength</B>( <i>Float time </i>)</tt><BR>
+<ul>Set the maximum time an animation will play</ul>
+
+<P><tt><B>setmotionanim</B>( <i>String anim </i>)</tt><BR>
+<ul>Set motion animation (handler scripts only)</ul>
+
+<P><tt><B>setreloadcover</B></tt><BR>
+<ul>do this command to let the ai know it needs to reload; used to reload while going to cover</ul>
+
+<P><tt><B>setsay</B>( <i>String animation </i>)</tt><BR>
+<ul>The name of a dialog animation to play - used by animation script only</ul>
+
+<P><tt><B>setupperanim</B>( <i>String anim </i>)</tt><BR>
+<ul>Set the upper body animation - used by animation script only</ul>
+
+<P><tt><B>share_enemy</B></tt><BR>
+<ul>internal code use only - shares an AI's enemy with his squad mates.</ul>
+
+<P><tt><B>share_grenade</B></tt><BR>
+<ul>internal code use only - shares an AI's grenade with his squad mates.</ul>
+
+<P><tt><B>sight</B></tt><BR>
+<ul>Gets the vision distance of the actor.</ul>
+
+<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
+<ul>Sets the vision distance of the actor.</ul>
+
+<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
+<ul>Sets the vision distance of the actor.</ul>
+
+<P><tt><B>silent</B>( <i>Integer silent </i>)</tt><BR>
+<ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
+</ul>
+
+<P><tt><B>silent</B></tt><BR>
+<ul>gets whether or not this guy is allowed to say stuff besides pain and death sounds</ul>
+
+<P><tt><B>silent</B>( <i>Integer silent </i>)</tt><BR>
+<ul>set to 0 to prevent this guy from saying stuff besides pain and death sounds.<BR>
+</ul>
+
+<P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
+<P><tt><B>sound_awareness</B></tt><BR>
+<ul>gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
+<P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
+<P><tt><B>stopped</B></tt><BR>
+<ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
+
+<P><tt><B>suppresschance</B></tt><BR>
+<ul>sets the percent chance of doing suppressing fire when appropriate (0-100)</ul>
+
+<P><tt><B>suppresschance</B></tt><BR>
+<ul>sets the percent chance of doing suppressing fire when appropriate (0-100)</ul>
+
+<P><tt><B>suppresschance</B></tt><BR>
+<ul>sets the percent chance of doing suppressing fire when appropriate (0-100)</ul>
+
+<P><tt><B>tether</B>( <i>Entity entity </i>)</tt><BR>
+<ul>the entity to which the AI's leash should be tethered</ul>
+
+<P><tt><B>thinkstate</B></tt><BR>
+<ul>current ai think state; can be void, idle, pain, killed, attack, curious, disguise, or grenade.</ul>
+
+<P><tt><B>turndoneerror</B></tt><BR>
+<ul>The error amount that turndone will occur for the turnto command.</ul>
+
+<P><tt><B>turndoneerror</B>( <i>Float error </i>)</tt><BR>
+<ul>The error amount that turndone will occur for the turnto command.</ul>
+
+<P><tt><B>turndoneerror</B>( <i>Float error </i>)</tt><BR>
+<ul>The error amount that turndone will occur for the turnto command.</ul>
+
+<P><tt><B>turnspeed</B></tt><BR>
+<ul>The turn speed of the actor.</ul>
+
+<P><tt><B>turnspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>The turn speed of the actor.</ul>
+
+<P><tt><B>turnspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>The turn speed of the actor.</ul>
+
+<P><tt><B>turnto</B>( <i>Entity entity </i>)</tt><BR>
+<ul>The actor will turn to this entity.</ul>
+
+<P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
+<ul>Sets the turret of the actor.</ul>
+
+<P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
+<ul>Sets the turret of the actor.</ul>
+
+<P><tt><B>turret</B></tt><BR>
+<ul>Gets the turret of the actor.</ul>
+
+<P><tt><B>type_attack</B></tt><BR>
+<ul>Gets the attack type of the actor.</ul>
+
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
+
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
+
+<P><tt><B>type_disguise</B></tt><BR>
+<ul>Gets the disguise type of the actor.</ul>
+
+<P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the disguise type of the actor.</ul>
+
+<P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the disguise type of the actor.</ul>
+
+<P><tt><B>type_grenade</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the grenade type of the actor.</ul>
+
+<P><tt><B>type_grenade</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the grenade type of the actor.</ul>
+
+<P><tt><B>type_grenade</B></tt><BR>
+<ul>Gets the grenade type of the actor.</ul>
+
+<P><tt><B>type_idle</B></tt><BR>
+<ul>Gets the idle type of the actor.</ul>
+
+<P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the idle type of the actor.</ul>
+
+<P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the idle type of the actor.</ul>
+
+<P><tt><B>unholster</B>( <i>Integer holster </i>)</tt><BR>
+<ul>If non-zero, affects offhand. Unholster weapon</ul>
+
+<P><tt><B>upperanim</B>( <i>String anim </i>)</tt><BR>
+<ul>Set the upper body animation</ul>
+
+<P><tt><B>use</B>( <i>String name, Integer weapon_hand </i>)</tt><BR>
+<ul>Use the specified weapon or item in the hand choosen (optional).</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Set voicetype to magic letter postfix</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Set voicetype to magic letter postfix</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Gets the voice type</ul>
+
+<P><tt><B>waittrigger</B></tt><BR>
+<ul>If true, patrol guys and running men wait until triggered to move</ul>
+
+<P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>If true, patrol guys and running men wait until triggered to move</ul>
+
+<P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>If true, patrol guys and running men wait until triggered to move</ul>
+
+<P><tt><B>walkto</B>( <i>String dest </i>)</tt><BR>
+<ul>Specify the location to walk to.</ul>
+
+<P><tt><B>weapon</B>( <i>String weapon_modelname </i>)</tt><BR>
+<ul>Sets the weapon.</ul>
+
+<P><tt><B>weapon</B></tt><BR>
+<ul>Gets the weapon.</ul>
+
+<P><tt><B>weapon</B>( <i>String weapon_modelname </i>)</tt><BR>
+<ul>Gives the sentient the weapon specified.</ul>
+
+<P><tt><B>weapongroup</B></tt><BR>
+<ul>Specifies weapon animation set to use in anim scripts</ul>
+
+<P><tt><B>weapontype</B></tt><BR>
+<ul>The Weapon Type of the Actor</ul>
+
+<P><tt><B>weapon_internal</B>( <i>String s </i>)</tt><BR>
+<ul>internal use</ul>
+
+<P><tt><B>writestats</B></tt><BR>
+<ul>Used internally to write stats to a CSV file.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="AISpawnPoint">AISpawnPoint (<i>info_aispawnpoint</i>)</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>accuracy</B>( <i>Float value </i>)</tt><BR>
+<ul>Set percent to hit</ul>
+
+<P><tt><B>accuracy</B></tt><BR>
+<ul>Set percent to hit</ul>
+
+<P><tt><B>alarmnode</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>alarmnode</B></tt><BR>
+<ul>Gets the name of the alarm node for the actor (must have type set to alarm for effect)</ul>
+
+<P><tt><B>ammo_grenade</B></tt><BR>
+<ul>Returns how many grenades an AI has</ul>
+
+<P><tt><B>ammo_grenade</B>( <i>Integer grenade_count </i>)</tt><BR>
+<ul>Gives the AI some grenades</ul>
+
+<P><tt><B>balconyheight</B></tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
+<P><tt><B>balconyheight</B>( <i>Float height </i>)</tt><BR>
+<ul>minimum height a balcony guy must fall to do special balcony death</ul>
+
+<P><tt><B>disguise_level</B>( <i>Integer value </i>)</tt><BR>
+<ul>Sets the disguise level of the actor. May be 1 or 2</ul>
+
+<P><tt><B>disguise_level</B></tt><BR>
+<ul>Gets the disguise level of the actor. May be 1 or 2</ul>
+
+<P><tt><B>disguise_period</B>( <i>Float period_in_seconds </i>)</tt><BR>
+<ul>Sets the time between the end of one disguise behavior and start of the next</ul>
+
+<P><tt><B>disguise_period</B></tt><BR>
+<ul>Gets the time between the end of one disguise behavior and start of the next</ul>
+
+<P><tt><B>disguise_range</B></tt><BR>
+<ul>Gets the maximum distance for disguise behavior to get triggered</ul>
+
+<P><tt><B>disguise_range</B>( <i>Float range_in_units </i>)</tt><BR>
+<ul>Sets the maximum distance for disguise behavior to get triggered</ul>
+
+<P><tt><B>dontdrophealth</B></tt><BR>
+<ul>dontdrophealth setter</ul>
+
+<P><tt><B>dontdrophealth</B></tt><BR>
+<ul>dontdrophealth getter</ul>
+
+<P><tt><B>dontdropweapons</B>( <i>[ Boolean dont_drop ] </i>)</tt><BR>
+<ul>Make the sentient not drop weapons</ul>
+
+<P><tt><B>dontdropweapons</B></tt><BR>
+<ul>dontdropweapons getter</ul>
+
+<P><tt><B>enemyname</B>( <i>String enemyname </i>)</tt><BR>
+<ul></ul>
+
+<P><tt><B>enemyname</B>( <i>String enemyname </i>)</tt><BR>
+<ul></ul>
+
+<P><tt><B>enemyname</B>( <i>String enemyname </i>)</tt><BR>
+<ul></ul>
+
+<P><tt><B>enemysharerange</B></tt><BR>
+<ul>gets the range outside which the AI will not receive notification that a teammate has a new enemy</ul>
+
+<P><tt><B>enemysharerange</B>( <i>Float range </i>)</tt><BR>
+<ul>sets the range outside which the AI will not receive notification that a teammate has a new enemy</ul>
+
+<P><tt><B>favoriteenemy</B>( <i>Entity ai_or_player </i>)</tt><BR>
+<ul>Gets this AI's favorite enemy</ul>
+
+<P><tt><B>favoriteenemy</B></tt><BR>
+<ul>Gets this AI's favorite enemy</ul>
+
+<P><tt><B>fixedleash</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
+
+<P><tt><B>fixedleash</B></tt><BR>
+<ul>if non-zero, the leash will never auto-reset; if zero, the leash may auto-reset</ul>
+
+<P><tt><B>forcedrophealth</B></tt><BR>
+<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Force the sentient to drop weapons no matter what level.nodropweapon is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>fov</B></tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>fov</B>( <i>Float angle </i>)</tt><BR>
+<ul>The fov angle of the actor</ul>
+
+<P><tt><B>gren_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gren_awareness</B></tt><BR>
+<ul>gets the awareness of grenades in 0-100 percent chance of responding to a grenadewhen the AI sees it (applied once every 0.4 seconds)</ul>
+
+<P><tt><B>gun</B>( <i>String s </i>)</tt><BR>
+<ul>specifies the gun to use</ul>
+
+<P><tt><B>gun</B></tt><BR>
+<ul>gets the gun to being used</ul>
+
+<P><tt><B>health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>set the health of the entity to newHealth</ul>
+
+<P><tt><B>health</B></tt><BR>
+<ul>entity's health</ul>
+
+<P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
+<ul>The hearing radius of the actor</ul>
+
+<P><tt><B>hearing</B>( <i>Float radius </i>)</tt><BR>
+<ul>The hearing radius of the actor</ul>
+
+<P><tt><B>interval</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the distance AI tries to keep between squadmates while moving.</ul>
+
+<P><tt><B>interval</B></tt><BR>
+<ul>Gets the distance AI tries to keep between squadmates while moving.</ul>
+
+<P><tt><B>leash</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI will wander from its leash home</ul>
+
+<P><tt><B>leash</B></tt><BR>
+<ul>Gets the maximum distance the AI will wander from its leash home</ul>
+
+<P><tt><B>maxdist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the maximum distance the AI tries to allow between itself and the player</ul>
+
+<P><tt><B>maxdist</B></tt><BR>
+<ul>Gets the maximum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mindist</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the minimum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>mindist</B></tt><BR>
+<ul>Gets the minimum distance the AI tries to keep between itself and the player</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>model</B></tt><BR>
+<ul>get the modelName.</ul>
+
+<P><tt><B>nosurprise</B></tt><BR>
+<ul>gets whether or not this guy is allowed to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
+<P><tt><B>nosurprise</B>( <i>Integer nosurprise </i>)</tt><BR>
+<ul>set to 0 to allow this guy to play a surprised animation when first encountering an enemy.<BR>
+</ul>
+
+<P><tt><B>noticescale</B></tt><BR>
+<ul>Get the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
+
+<P><tt><B>noticescale</B>( <i>Float multiplier </i>)</tt><BR>
+<ul>Set the max multiplier in time to notice an enemy (default 100, half as big notices twice as fast)</ul>
+
+<P><tt><B>patrolpath</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>patrolpath</B></tt><BR>
+<ul>Gets the name of the patrol path for the actor (must have type set to patrol for effect)</ul>
+
+<P><tt><B>sight</B></tt><BR>
+<ul>Gets the vision distance of the actor.</ul>
+
+<P><tt><B>sight</B>( <i>Float max_sight_range </i>)</tt><BR>
+<ul>Sets the vision distance of the actor.</ul>
+
+<P><tt><B>sound_awareness</B>( <i>Float awareness_percent </i>)</tt><BR>
+<ul>sets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
+<P><tt><B>sound_awareness</B></tt><BR>
+<ul>gets the awareness of sounds in 0-100 percent chance of hearing a sound withinhalf of the sound's radius' fades to zero outside sound's radius</ul>
+
+<P><tt><B>target</B></tt><BR>
+<ul>entity's target</ul>
+
+<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
+<ul>target another entity with targetname_to_target.</ul>
+
+<P><tt><B>turret</B>( <i>String turret </i>)</tt><BR>
+<ul>Sets the turret of the actor.</ul>
+
+<P><tt><B>turret</B></tt><BR>
+<ul>Gets the turret of the actor.</ul>
+
+<P><tt><B>type_attack</B></tt><BR>
+<ul>Gets the attack type of the actor.</ul>
+
+<P><tt><B>type_attack</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the attack type of the actor.</ul>
+
+<P><tt><B>type_disguise</B></tt><BR>
+<ul>Gets the disguise type of the actor.</ul>
+
+<P><tt><B>type_disguise</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the disguise type of the actor.</ul>
+
+<P><tt><B>type_grenade</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the grenade type of the actor.</ul>
+
+<P><tt><B>type_grenade</B></tt><BR>
+<ul>Gets the grenade type of the actor.</ul>
+
+<P><tt><B>type_idle</B></tt><BR>
+<ul>Gets the idle type of the actor.</ul>
+
+<P><tt><B>type_idle</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the idle type of the actor.</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Set voicetype to magic letter postfix</ul>
+
+<P><tt><B>voicetype</B></tt><BR>
+<ul>Gets the voice type</ul>
+
+<P><tt><B>waittrigger</B></tt><BR>
+<ul>If true, patrol guys and running men wait until triggered to move</ul>
+
+<P><tt><B>waittrigger</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>If true, patrol guys and running men wait until triggered to move</ul>
+
+<P><tt><B>weapon</B>( <i>String weapon_modelname </i>)</tt><BR>
+<ul>Sets the weapon.</ul>
+
+<P><tt><B>weapon</B></tt><BR>
+<ul>Gets the weapon.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Ammo">Ammo</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="AmmoEntity">AmmoEntity</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>ammoentity_postspawn</B></tt><BR>
+<ul>Ammo Entity Post Spawn</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Animate">Animate (<i>animate</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>anim</B>( <i>String animName </i>)</tt><BR>
+<ul>Exec anim commands on server or client.</ul>
+
+<P><tt><B>isloopinganim</B>( <i>String anim_name </i>)</tt><BR>
+<ul>returns 1 if the anim is a looping anim, or 0 otherwise</ul>
+
+<P><tt><B>pauseanims</B>( <i>Integer pause </i>)</tt><BR>
+<ul>Pause (or unpause) animations</ul>
+
+<P><tt><B>playerspawn</B>( <i>String model_name, [ Float range ], [ Vector vector_offset ], [ Float inFOV ], [ Float speed ] </i>)</tt><BR>
+<ul>spawn something near the player, either within the player's view or behind him<BR>
+model - name of model to spawn<BR>
+range - how close does this need to be to the player to actually get spawned, default 480 (30 foot radius).<BR>
+vector_offset - oriented vector offset of where to spawn the item, default (0 0 0)<BR>
+inFOV - <BR>
+		1 - Only spawn when this position is within the FOV of the player<BR>
+	   -1 - Only spawn when this position is outside the FOV of the player<BR>
+       0 - (default) don't care, always spawn<BR>
+speed - how fast the effect should travel, in other words, how long before the effect gets spawned.<BR>
+	     delay is calculated based on the distance between object and player divided by the speed<BR>
+	   0 - no delay<BR>
+	 960 - (default) 60 feet per second.  If the object is 60 feet from the player, the player effect will spawn one second later.</ul>
+
+<P><tt><B>setcontrollerangles</B>( <i>Integer num, Vector angles </i>)</tt><BR>
+<ul>Sets the control angles for the specified bone.</ul>
+
+<P><tt><B>setsynctime</B>( <i>Float synctime </i>)</tt><BR>
+<ul>Set sync time for entity.</ul>
+
+<P><tt><B>setyawfrombone</B>( <i>String bone_name </i>)</tt><BR>
+<ul>Set the yaw of the model based on the current animation time</ul>
+
+<P><tt><B>testmojo</B>( <i>String model_name, Vector vector_offset </i>)</tt><BR>
+<ul>INTERNAL EVENT</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="AnimationEvent">AnimationEvent</a> -> <a href="#Event">Event</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Armor">Armor</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="AttractiveNode">AttractiveNode</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>max_dist</B></tt><BR>
+<ul>Get the max distance for this node</ul>
+
+<P><tt><B>max_dist</B>( <i>Float max_dist </i>)</tt><BR>
+<ul>Set the max distance for this node to be attracted, -1 for unlimited distance.</ul>
+
+<P><tt><B>priority</B>( <i>Integer priority </i>)</tt><BR>
+<ul>Set the node priority</ul>
+
+<P><tt><B>priority</B></tt><BR>
+<ul>Get the node priority</ul>
+
+<P><tt><B>respawn_time</B>( <i>Float respawn_time </i>)</tt><BR>
+<ul>Set the how much time will this node re-attract already attracted AIs. The minimum required value is 1, otherwise AI will get stuck.</ul>
+
+<P><tt><B>respawn_time</B></tt><BR>
+<ul>Get the how much time will this node re-attract already attracted AIs</ul>
+
+<P><tt><B>setuse</B>( <i>Boolean use </i>)</tt><BR>
+<ul>Set if AI should use or not</ul>
+
+<P><tt><B>stay_time</B></tt><BR>
+<ul>Get the max stay time for this node</ul>
+
+<P><tt><B>stay_time</B>( <i>Float stay_time </i>)</tt><BR>
+<ul>Set the maximum stay time AI will stay on this node</ul>
+
+<P><tt><B>team</B>( <i>String team </i>)</tt><BR>
+<ul>Set the attractive node team. 'none' for no team.</ul>
+
+<P><tt><B>team</B></tt><BR>
+<ul>Get the attractive node team. 'none' for no team.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="BarrelObject">BarrelObject (<i>func_barrel</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>barreltype</B>( <i>String type </i>)</tt><BR>
+<ul>Sets the barrel's type</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Body">Body</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Camera">Camera (<i>func_camera</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
+<ul>set the angles of the entity to newAngles.</ul>
+
+<P><tt><B>auto_active</B>( <i>Boolean newActiveState </i>)</tt><BR>
+<ul>Whether or not the auto camera is active.</ul>
+
+<P><tt><B>auto_maxfov</B>( <i>Float maxFOV </i>)</tt><BR>
+<ul>Sets the maximum FOV that should be used when automatically calculating FOV.</ul>
+
+<P><tt><B>auto_radius</B>( <i>Float newRadius </i>)</tt><BR>
+<ul>Sets the radius of the automatic camera.</ul>
+
+<P><tt><B>auto_starttime</B>( <i>Float newTime </i>)</tt><BR>
+<ul>Sets how long it takes for the camera to be switched to.</ul>
+
+<P><tt><B>auto_state</B>( <i>String state1, [ String state2 ], [ String state3 ], [ String state4 ], [ String state5 ], [ String state6 ] </i>)</tt><BR>
+<ul>Sets the states the player needs to be in for this camera to activate.</ul>
+
+<P><tt><B>auto_stoptime</B>( <i>Float newTime </i>)</tt><BR>
+<ul>Sets how long it takes for the camera switch back to the player.</ul>
+
+<P><tt><B>camera_think</B></tt><BR>
+<ul>Called each frame to allow the camera to adjust its position.</ul>
+
+<P><tt><B>continue</B></tt><BR>
+<ul>Continue the camera movement.</ul>
+
+<P><tt><B>cut</B></tt><BR>
+<ul>switch camera states immediately, do not transition</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>fadetime</B>( <i>Float fadetime </i>)</tt><BR>
+<ul>Sets the fade time for camera transitioning.</ul>
+
+<P><tt><B>follow</B>( <i>Entity targetEnt, [ Entity targetWatchEnt ] </i>)</tt><BR>
+<ul>Makes the camera follow an entity and optionally watch an entity.</ul>
+
+<P><tt><B>follow_distance</B>( <i>Float distance </i>)</tt><BR>
+<ul>Sets the camera follow distance.</ul>
+
+<P><tt><B>follow_yaw</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Sets the yaw offset of the camera following an entity.</ul>
+
+<P><tt><B>follow_yaw_absolute</B></tt><BR>
+<ul>Makes the follow camera yaw absolute.</ul>
+
+<P><tt><B>follow_yaw_relative</B></tt><BR>
+<ul>Makes the follow camera yaw relative (not absolute).</ul>
+
+<P><tt><B>fov</B>( <i>Float fov, [ Float fadeTime ] </i>)</tt><BR>
+<ul>Sets the camera's field of view (fov).<BR>
+if fadeTime is specified, camera will fade over that time<BR>
+if fov is less than 3, than an auto_fov will be assumed<BR>
+the value of fov will be the ratio used for keeping a watch<BR>
+entity in the view at the right scale</ul>
+
+<P><tt><B>lookat</B>( <i>Entity ent </i>)</tt><BR>
+<ul>Makes the camera look at an entity.</ul>
+
+<P><tt><B>moveto</B>( <i>Entity ent </i>)</tt><BR>
+<ul>Move the camera's position to that of the specified entities.</ul>
+
+<P><tt><B>movetopos</B>( <i>Vector position </i>)</tt><BR>
+<ul>Move the camera's position to the specified position.</ul>
+
+<P><tt><B>nextcamera</B>( <i>String nextCamera </i>)</tt><BR>
+<ul>Sets the next camera to use.</ul>
+
+<P><tt><B>nowatch</B>( <i>[ Float fadeTime ] </i>)</tt><BR>
+<ul>Stop watching an entity or looking along a path.<BR>
+Camera is now static as far as orientation.<BR>
+if fadeTime is specified, camera will fade over that time</ul>
+
+<P><tt><B>orbit</B>( <i>Entity targetEnt, [ Entity targetWatchEnt ] </i>)</tt><BR>
+<ul>Makes the camera orbit around an entity and optionally watch an entity.</ul>
+
+<P><tt><B>orbit_height</B>( <i>Float height </i>)</tt><BR>
+<ul>Sets the orbit camera's height.</ul>
+
+<P><tt><B>pause</B></tt><BR>
+<ul>Pause the camera.</ul>
+
+<P><tt><B>showquakes</B>( <i>Boolean showquakes </i>)</tt><BR>
+<ul>Sets the camera to show or not show earthquake effects from the player triggered either from the earthquake command, or a viewjitter.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the camera speed.</ul>
+
+<P><tt><B>start</B></tt><BR>
+<ul>Start camera moving.</ul>
+
+<P><tt><B>stop</B></tt><BR>
+<ul>Stop the camera movement.</ul>
+
+<P><tt><B>turnto</B>( <i>Vector angle </i>)</tt><BR>
+<ul>Makes the camera look in the specified direction.</ul>
+
+<P><tt><B>watch</B>( <i>Entity watchEnt, [ Float fadeTime ] </i>)</tt><BR>
+<ul>Makes the camera watch an entity.<BR>
+if fadeTime is specified, camera will fade over that time</ul>
+
+<P><tt><B>watchnode</B>( <i>[ Float fadeTime ] </i>)</tt><BR>
+<ul>Makes the camera watch based on what is stored<BR>
+in the camera nodes.<BR>
+if fadeTime is specified, camera will fade over that time</ul>
+
+<P><tt><B>watchpath</B>( <i>[ Float fadeTime ] </i>)</tt><BR>
+<ul>Makes the camera look along the path of travel.<BR>
+if fadeTime is specified, camera will fade over that time</ul>
+
+<P><tt><B>watchstring</B>( <i>String string, [ Float fadeTime ] </i>)</tt><BR>
+<ul>Makes the camera watch based on a string.<BR>
+if fadeTime is specified, camera will fade over that time</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="CameraManager">CameraManager</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>add</B></tt><BR>
+<ul>Add a new point to the camera path where the player is standing.</ul>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Delete the current path node.</ul>
+
+<P><tt><B>hide</B></tt><BR>
+<ul>Hides the paths.</ul>
+
+<P><tt><B>load</B>( <i>String filename </i>)</tt><BR>
+<ul>Loads a camera path.</ul>
+
+<P><tt><B>loop</B>( <i>[ Entity path ] </i>)</tt><BR>
+<ul>Loop the current path or the specified one.</ul>
+
+<P><tt><B>moveplayer</B></tt><BR>
+<ul>Move the player to the current path node position.</ul>
+
+<P><tt><B>new</B></tt><BR>
+<ul>Starts a new path.</ul>
+
+<P><tt><B>next</B></tt><BR>
+<ul>Go to the next path node.</ul>
+
+<P><tt><B>nextpath</B></tt><BR>
+<ul>Go to the next path.</ul>
+
+<P><tt><B>nowatch</B></tt><BR>
+<ul>Set the current path node to watch nothing.</ul>
+
+<P><tt><B>play</B>( <i>[ Entity path ] </i>)</tt><BR>
+<ul>Play the current path or the specified one once.</ul>
+
+<P><tt><B>prev</B></tt><BR>
+<ul>Go to the previous path node.</ul>
+
+<P><tt><B>prevpath</B></tt><BR>
+<ul>Go to the previous path.</ul>
+
+<P><tt><B>renamepath</B>( <i>String newName </i>)</tt><BR>
+<ul>Rename the path to the new name.</ul>
+
+<P><tt><B>replace</B></tt><BR>
+<ul>Replace the current path node position/angle with the player's.</ul>
+
+<P><tt><B>save</B>( <i>String filename </i>)</tt><BR>
+<ul>Saves the camera path.</ul>
+
+<P><tt><B>savemap</B>( <i>String filename </i>)</tt><BR>
+<ul>Saves the camera path to a map file.</ul>
+
+<P><tt><B>setfadetime</B>( <i>Float newFadeTime </i>)</tt><BR>
+<ul>Set the fadetime of the current path node.</ul>
+
+<P><tt><B>setfov</B>( <i>String newFOV </i>)</tt><BR>
+<ul>Set the fov at the current path node.</ul>
+
+<P><tt><B>setpath</B>( <i>Entity path </i>)</tt><BR>
+<ul>Sets the new path.</ul>
+
+<P><tt><B>setspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed of the camera at the current path node.</ul>
+
+<P><tt><B>settarget</B>( <i>String target </i>)</tt><BR>
+<ul>Set the trigger target.</ul>
+
+<P><tt><B>settargetname</B>( <i>String targetname </i>)</tt><BR>
+<ul>Set the targetname.</ul>
+
+<P><tt><B>show</B>( <i>[ Entity path ] </i>)</tt><BR>
+<ul>Shows the specified path.</ul>
+
+<P><tt><B>stop</B></tt><BR>
+<ul>Stop the camera playing path.</ul>
+
+<P><tt><B>updateinput</B></tt><BR>
+<ul>Updates the current node with user interface values.</ul>
+
+<P><tt><B>watch</B>( <i>String watch </i>)</tt><BR>
+<ul>Set the current path node to watch something.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="CarryableTurret">CarryableTurret</a> -> <a href="#InventoryItem">InventoryItem</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>dropturret</B></tt><BR>
+<ul>Makes the carryable turret have itself dropped</ul>
+
+<P><tt><B>item_pickup</B>( <i>Entity item </i>)</tt><BR>
+<ul>Pickup the specified item.</ul>
+
+<P><tt><B>placeturret</B></tt><BR>
+<ul>Try to place the carryable turret</ul>
+
+<P><tt><B>turrettik</B></tt><BR>
+<ul>Tiki of the turret to place</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Conditional">Conditional</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ConsoleEvent">ConsoleEvent</a> -> <a href="#Event">Event</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="CrateObject">CrateObject (<i>func_crate</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>debristype</B>( <i>Integer type </i>)</tt><BR>
+<ul>Sets the debris type of the crate</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="DamageModel">DamageModel (<i>DamageModel</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killthread</B>( <i>String thread </i>)</tt><BR>
+<ul>Set the thread to execute when this model is killed</ul>
+
+<P><tt><B>killtrace</B>( <i>Vector offset, Vector direction, Float radius, Float distance </i>)</tt><BR>
+<ul>kills all objects along the trace<BR>
+offset - initial offset from origin<BR>
+direction - angular offset orientation for trace<BR>
+radius - thickness of trace<BR>
+distance - how far to trace</ul>
+
+<P><tt><B>orientedbbox</B>( <i>Vector mins, Vector maxs, Float yawoffset </i>)</tt><BR>
+<ul>spawn an oriented bounding box with the given dimensions and an angular offset<BR>
+mins - min dimensions of box<BR>
+maxs - max dimensions of box<BR>
+yawoffset - angular offset orientation of box</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Decal">Decal</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="DM_Manager">DM_Manager</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doroundtransition</B></tt><BR>
+<ul>delayed function call to (possibly) determine round winner and restart next round</ul>
+
+<P><tt><B>finishroundtransition</B></tt><BR>
+<ul>delayed function call to do the actual restart for the next round</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="DM_Team">DM_Team</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Door">Door (<i>NormalDoor</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>alwaysaway</B>( <i>[ Boolean bAlwaysAway ] </i>)</tt><BR>
+<ul>Makes the door always open away from the person opening it.</ul>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>close</B></tt><BR>
+<ul>Closes the door.</ul>
+
+<P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the amount of damage the door will do to entities that get stuck in it.</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doBlocked</B>( <i>Entity obstacle </i>)</tt><BR>
+<ul>sent to entity when blocked.</ul>
+
+<P><tt><B>doorclosed</B></tt><BR>
+<ul>Called when the door finishes closing.</ul>
+
+<P><tt><B>dooropened</B></tt><BR>
+<ul>Called when the door finishes opening.</ul>
+
+<P><tt><B>doortype</B>( <i>String door_type </i>)</tt><BR>
+<ul>Sets the defaults for this door<BR>
+Door Defaults: wood(default)<BR>
+metal</ul>
+
+<P><tt><B>door_triggerfield</B>( <i>Entity other </i>)</tt><BR>
+<ul>Is called when a doors trigger field is touched.</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>linkdoor</B></tt><BR>
+<ul>Link doors together.</ul>
+
+<P><tt><B>lock</B></tt><BR>
+<ul>Lock the door.</ul>
+
+<P><tt><B>open</B>( <i>Entity other </i>)</tt><BR>
+<ul>Opens the door.</ul>
+
+<P><tt><B>sound_close_end</B>( <i>String sound_close </i>)</tt><BR>
+<ul>Sets the sound to use when the door closes.</ul>
+
+<P><tt><B>sound_close_start</B>( <i>String sound_close </i>)</tt><BR>
+<ul>Sets the sound to use when the door closes.</ul>
+
+<P><tt><B>sound_locked</B>( <i>String sound_locked </i>)</tt><BR>
+<ul>Sets the sound to use when the door is locked.</ul>
+
+<P><tt><B>sound_message</B>( <i>String sound_message </i>)</tt><BR>
+<ul>Sets the sound to use when the door displays a message.</ul>
+
+<P><tt><B>sound_open_end</B>( <i>String sound_open_end </i>)</tt><BR>
+<ul>Sets the sound to use when the door stops to opens.</ul>
+
+<P><tt><B>sound_open_start</B>( <i>String sound_open_start </i>)</tt><BR>
+<ul>Sets the sound to use when the door starts to opens.</ul>
+
+<P><tt><B>time</B>( <i>Float traveltime </i>)</tt><BR>
+<ul>Sets the time it takes for the door to open an close.</ul>
+
+<P><tt><B>toggledoor</B>( <i>Entity other </i>)</tt><BR>
+<ul>Toggles the state of the door (open/close).</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>trysolid</B></tt><BR>
+<ul>Trys to make the door solid.</ul>
+
+<P><tt><B>tryToOpen</B>( <i>Entity other </i>)</tt><BR>
+<ul>Tries to open the door.</ul>
+
+<P><tt><B>unlock</B></tt><BR>
+<ul>Unlock the door.</ul>
+
+<P><tt><B>wait</B>( <i>Float wait </i>)</tt><BR>
+<ul>Sets the amount of time to wait before automatically shutting.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="DrivableVehicle">DrivableVehicle (<i>script_drivablevehicle</i>)</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="DrivableVehicleTandem">DrivableVehicleTandem (<i>DrivableVehicleTandem</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="DynItem">DynItem</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>kill</B></tt><BR>
+<ul>console based command to kill yourself if stuck.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="EffectEntity">EffectEntity (<i>effectentity</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Emitter">Emitter (<i>func_emitter</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>emitter</B>( <i>String name </i>)</tt><BR>
+<ul>Emitter to use</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>ai_event</B>( <i>[ String type ], [ Float radius ] </i>)</tt><BR>
+<ul>Let the AI know that this entity made a sound,<BR>
+type is a string specifying what type of sound it is.<BR>
+radius determines how far the sound reaches.</ul>
+
+<P><tt><B>alpha</B>( <i>Float newAlpha </i>)</tt><BR>
+<ul>Set the alpha of the entity to alpha.</ul>
+
+<P><tt><B>alwaysdraw</B></tt><BR>
+<ul>Sets this entity to always draw</ul>
+
+<P><tt><B>attach</B>( <i>Entity parent, String tagname, [ Integer use_angles ] </i>)</tt><BR>
+<ul>attach this entity to the parent's legs tag called tagname</ul>
+
+<P><tt><B>attachedmodelanim</B>( <i>String tagname, String anim_name, Float crossblend_time, String model_name </i>)</tt><BR>
+<ul>Tells models (or specified model) attached to specified tag to play <BR>
+specified animation.  Crossblend time doesn't work yet.</ul>
+
+<P><tt><B>attachmodel</B>( <i>String modelname, String tagname, [ Float scale ], [ String targetname ], [ Boolean detach_at_death ], [ Float removetime ], [ Float fadeintime ], [ Float fadeoutdelay ], [ Float fadetime ], [ Vector offset ] </i>)</tt><BR>
+<ul>attach a entity with modelname to this entity to tag called tagname.<BR>
+scale           - scale of attached entities<BR>
+targetname      - targetname for attached entities<BR>
+detach_at_death - when entity dies, should this model be detached.<BR>
+removetime      - when the entity should be removed, if not specified, never.<BR>
+fadeintime      - time to fade the model in over.<BR>
+fadeoutdelay    - time to wait until we fade the attached model out<BR>
+fadeoutspeed    - time the model fades out over<BR>
+offset		     - vector offset for the model from the specified tag</ul>
+
+<P><tt><B>avelocity</B></tt><BR>
+<ul>gets the angular velocity for this entity.</ul>
+
+<P><tt><B>bind</B>( <i>Entity parent, [ Boolean bind_child ] </i>)</tt><BR>
+<ul>bind this entity to the specified entity.</ul>
+
+<P><tt><B>brushmodel</B></tt><BR>
+<ul>get the brush modelName.</ul>
+
+<P><tt><B>cansee</B>( <i>Entity entity, [ Float fov ], [ Float vision_distance ] </i>)</tt><BR>
+<ul>returns 1 if the entities can see eachother, 0 if not</ul>
+
+<P><tt><B>censor</B></tt><BR>
+<ul>used to ban certain contact when in parentmode<BR>
+</ul>
+
+<P><tt><B>classname</B>( <i>String nameOfClass </i>)</tt><BR>
+<ul>Determines what class to use for this entity,<BR>
+this is pre-processed from the BSP at the start<BR>
+of the level.</ul>
+
+<P><tt><B>classname</B></tt><BR>
+<ul>The entity's classname</ul>
+
+<P><tt><B>claypidgeon</B></tt><BR>
+<ul>turn the entity into a non-solid shootable thing</ul>
+
+<P><tt><B>connect_paths</B></tt><BR>
+<ul>Connects all navigation paths which intersect with the specified entity's volume</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>damage_type</B>( <i>String meansofdeathstring </i>)</tt><BR>
+<ul>Set the type of damage that this entity can take</ul>
+
+<P><tt><B>deathsinkeachframe</B></tt><BR>
+<ul>Makes the entity sink into the ground and then get removed (this gets called each frame).</ul>
+
+<P><tt><B>deathsinkstart</B></tt><BR>
+<ul>Makes the entity sink into the ground and then get removed (this starts it).</ul>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>depthhack</B>( <i>Integer bEnable </i>)</tt><BR>
+<ul>Enable or disable depth hack.</ul>
+
+<P><tt><B>detach</B></tt><BR>
+<ul>detach this entity from its parent.</ul>
+
+<P><tt><B>detachallchildren</B></tt><BR>
+<ul>Detach all the children from the entity.</ul>
+
+<P><tt><B>disconnect_paths</B></tt><BR>
+<ul>disonnects all navigation paths which intersect with the specified entity's volume</ul>
+
+<P><tt><B>dm</B>( <i>String command, [ String parm1 ], [ String parm2 ], [ String ... ] </i>)</tt><BR>
+<ul>Makes a command be executed only in multiplayer</ul>
+
+<P><tt><B>dmrealism</B>( <i>String command, [ String parm1 ], [ String parm2 ], [ String ... ] </i>)</tt><BR>
+<ul>Makes a command be executed only in multiplayer realism mode</ul>
+
+<P><tt><B>droptofloor</B>( <i>[ Float maxRange ] </i>)</tt><BR>
+<ul>drops the entity to the ground, if maxRange is not specified 8192 is used.</ul>
+
+<P><tt><B>duckableglue</B>( <i>Entity parent, [ Integer glueAngles ] </i>)</tt><BR>
+<ul>glue this entity to the specified entity, but allow ducking.</ul>
+
+<P><tt><B>effects</B>( <i>[ String parameter1 ], [ String parameter2 ], [ String parameter3 ], [ String parameter4 ], [ String parameter5 ], [ String parameter6 ] </i>)</tt><BR>
+<ul>Change the current entity effects flags.<BR>
+Valid flags are as follows:<BR>
++ sets a flag, - clears a flag<BR>
+antisbjuice - anti sucknblow juiceeveryframe - process commands every time entity is rendered</ul>
+
+<P><tt><B>entnum</B></tt><BR>
+<ul>The entity's entity number</ul>
+
+<P><tt><B>explosionattack</B>( <i>String explosionModel, [ String tagName ] </i>)</tt><BR>
+<ul>Spawn an explosion optionally from a specific tag</ul>
+
+<P><tt><B>fade</B>( <i>[ Float fadetime<0.00...max_float> ], [ Float target_alpha<0.00...1.00> ] </i>)</tt><BR>
+<ul>Fade the entity's alpha, reducing it by 0.03<BR>
+every FRAMETIME, until it has faded out, does not remove the entity</ul>
+
+<P><tt><B>fadein</B>( <i>[ Float fadetime<0.00...max_float> ], [ Float target_alpha<0.00...1.00> ] </i>)</tt><BR>
+<ul>Fade the entity's alpha and scale in, increasing it by 0.03<BR>
+every FRAMETIME, until it has faded completely in to 1.0.<BR>
+If fadetime or target_alpha are defined, they will override<BR>
+the default values.</ul>
+
+<P><tt><B>fadeout</B>( <i>[ Float fadetime<0.00...max_float> ], [ Float target_alpha<0.00...1.00> ] </i>)</tt><BR>
+<ul>Fade the entity's alpha and scale out, reducing it by 0.03<BR>
+every FRAMETIME, until it has faded out. If fadetime or<BR>
+target_alpha are defined, they will override the defaults.<BR>
+Once the entity has been completely faded, the entity is removed.</ul>
+
+<P><tt><B>flags</B>( <i>[ String parameter1 ], [ String parameter2 ], [ String parameter3 ], [ String parameter4 ], [ String parameter5 ], [ String parameter6 ] </i>)</tt><BR>
+<ul>Change the current entity flags.<BR>
+Valid flags are as follows:<BR>
++ sets a flag, - clears a flag<BR>
+blood - should it bleed<BR>
+explode - should it explode when dead<BR>
+die_gibs - should it spawn gibs when dead<BR>
+god - makes the entity invincible<BR>
+</ul>
+
+<P><tt><B>forceactivate</B></tt><BR>
+<ul>Forces an entity to activate outside of the player's PVS</ul>
+
+<P><tt><B>getcontrollerangles</B>( <i>Integer num </i>)</tt><BR>
+<ul>Gets the control angles for the specified bone.</ul>
+
+<P><tt><B>GetLocalYawFromVector</B></tt><BR>
+<ul>Turn a worldspace vector into a local space yaw</ul>
+
+<P><tt><B>getmaxs</B></tt><BR>
+<ul>Get the maxs of the bounding box of the entity to maxs.</ul>
+
+<P><tt><B>getmins</B></tt><BR>
+<ul>Get the mins of the bounding box of the entity to mins.</ul>
+
+<P><tt><B>gettagangles</B>( <i>String tag_name </i>)</tt><BR>
+<ul>Gets the world angles of the tag</ul>
+
+<P><tt><B>gettagposition</B>( <i>String tag_name </i>)</tt><BR>
+<ul>Gets the world position of the tag</ul>
+
+<P><tt><B>ghost</B></tt><BR>
+<ul>make non-solid but still send to client regardless of hide status.</ul>
+
+<P><tt><B>glue</B>( <i>Entity parent, [ Integer glueAngles ] </i>)</tt><BR>
+<ul>glue this entity to the specified entity.</ul>
+
+<P><tt><B>gravity</B>( <i>Float gravityValue </i>)</tt><BR>
+<ul>Change the gravity on this entity</ul>
+
+<P><tt><B>heal</B>( <i>Float health </i>)</tt><BR>
+<ul>Adds health to an entity,0-1 fraction of max_health</ul>
+
+<P><tt><B>health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>set the health of the entity to newHealth</ul>
+
+<P><tt><B>health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>set the health of the entity to newHealth</ul>
+
+<P><tt><B>health</B></tt><BR>
+<ul>entity's health</ul>
+
+<P><tt><B>healthonly</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>set the health of the entity to newHealth without changing max_health</ul>
+
+<P><tt><B>healthonly</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>set the health of the entity to newHealth without changing max_health</ul>
+
+<P><tt><B>hide</B></tt><BR>
+<ul>hide the entity,opposite of show.</ul>
+
+<P><tt><B>hurt</B>( <i>Integer damage, [ String means_of_death ], [ Vector direction ] </i>)</tt><BR>
+<ul>Inflicts damage if the entity is damageable.  If the number of damage<BR>
+points specified in the command argument is greater or equal than the<BR>
+entity's current health, it will be killed or destroyed.</ul>
+
+<P><tt><B>immediateremove</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>immune</B>( <i>String immune_string1, [ String immune_string2 ], [ String immune_string3 ], [ String immune_string4 ], [ String immune_string5 ], [ String immune_string6 ] </i>)</tt><BR>
+<ul>Adds to the immunity list for this sentient.</ul>
+
+<P><tt><B>inpvs</B>( <i>Entity entity </i>)</tt><BR>
+<ul>returns 1 if the entities have connected pvs,0 if not</ul>
+
+<P><tt><B>isinside</B>( <i>Entity ent </i>)</tt><BR>
+<ul>returns 1 if the entity is inside,0 if not</ul>
+
+<P><tt><B>istouching</B>( <i>Entity ent </i>)</tt><BR>
+<ul>returns 1 if the entities are touching,0 if not</ul>
+
+<P><tt><B>joinTeam</B>( <i>Entity teamMember </i>)</tt><BR>
+<ul>join a bind team.</ul>
+
+<P><tt><B>kill</B></tt><BR>
+<ul>console based command to kill yourself if stuck.</ul>
+
+<P><tt><B>killattach</B></tt><BR>
+<ul>kill all the attached entities.</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killtarget</B>( <i>String targetName </i>)</tt><BR>
+<ul>when dying kill entities with this targetName.</ul>
+
+<P><tt><B>light</B>( <i>Float red, Float green, Float blue, Float radius </i>)</tt><BR>
+<ul>Create a dynmaic light on this entity.</ul>
+
+<P><tt><B>lightBlue</B>( <i>Float red </i>)</tt><BR>
+<ul>Set the red component of the dynmaic light on this entity.</ul>
+
+<P><tt><B>lightGreen</B>( <i>Float red </i>)</tt><BR>
+<ul>Set the red component of the dynmaic light on this entity.</ul>
+
+<P><tt><B>lightOff</B></tt><BR>
+<ul>Turn the configured dynamic light on this entity off.</ul>
+
+<P><tt><B>lightOn</B></tt><BR>
+<ul>Turn the configured dynmaic light on this entity on.</ul>
+
+<P><tt><B>lightRadius</B>( <i>Float red </i>)</tt><BR>
+<ul>Set the red component of the dynmaic light on this entity.</ul>
+
+<P><tt><B>lightRed</B>( <i>Float red </i>)</tt><BR>
+<ul>Set the red component of the dynmaic light on this entity.</ul>
+
+<P><tt><B>lightStyle</B>( <i>Integer lightStyleIndex </i>)</tt><BR>
+<ul>What light style to use for this dynamic light on this entity.</ul>
+
+<P><tt><B>loopsound</B>( <i>String soundName, [ Float volume ], [ String minimum_distance ] </i>)</tt><BR>
+<ul>play a looped-sound with a certain volume and minimum_distance<BR>
+which is attached to the current entity.</ul>
+
+<P><tt><B>mass</B>( <i>Float massAmount </i>)</tt><BR>
+<ul>set the mass of this entity.</ul>
+
+<P><tt><B>max_health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>sets max_health without changing health</ul>
+
+<P><tt><B>max_health</B></tt><BR>
+<ul>gets the entity's max health</ul>
+
+<P><tt><B>max_health</B>( <i>Integer newHealth </i>)</tt><BR>
+<ul>sets max_health without changing health</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>model</B></tt><BR>
+<ul>get the modelName.</ul>
+
+<P><tt><B>movementstealth</B>( <i>Float scale </i>)</tt><BR>
+<ul>Sets the current movement stealth scalar for the sentient</ul>
+
+<P><tt><B>neverdraw</B></tt><BR>
+<ul>Sets this entity to never draw</ul>
+
+<P><tt><B>nodamage</B></tt><BR>
+<ul>entity does not take damage.</ul>
+
+<P><tt><B>normaldraw</B></tt><BR>
+<ul>Sets this entity to normal draw</ul>
+
+<P><tt><B>normal_damage</B></tt><BR>
+<ul>The Normal Health of the Actor (0 - 100)</ul>
+
+<P><tt><B>normal_health</B></tt><BR>
+<ul>The Normal Health of the Actor</ul>
+
+<P><tt><B>notarget</B>( <i>Boolean setNoTarget </i>)</tt><BR>
+<ul>flag an entity as no target.</ul>
+
+<P><tt><B>notsolid</B></tt><BR>
+<ul>make non-solid.</ul>
+
+<P><tt><B>playsound</B>( <i>String soundName, [ Integer channel ], [ Float volume ], [ String min_distance ] </i>)</tt><BR>
+<ul>play a sound coming from this entity.<BR>
+default channel, CHAN_BODY.</ul>
+
+<P><tt><B>pusher</B>( <i>Entity inflictor, Entity attacker, Vector direction, Float force </i>)</tt><BR>
+<ul>Push an entity in the specified direction with the specified force</ul>
+
+<P><tt><B>quitTeam</B></tt><BR>
+<ul>quit the current bind team</ul>
+
+<P><tt><B>radnum</B></tt><BR>
+<ul>entity's radnum</ul>
+
+<P><tt><B>radnum</B>( <i>Integer radnum </i>)</tt><BR>
+<ul>set the radnum</ul>
+
+<P><tt><B>realism</B>( <i>String command, [ String parm1 ], [ String parm2 ], [ String ... ] </i>)</tt><BR>
+<ul>Makes a command be executed only in realism mode</ul>
+
+<P><tt><B>remove</B></tt><BR>
+<ul>Removes this listener the next time events are processed.</ul>
+
+<P><tt><B>removeattachedmodel</B>( <i>String tagname </i>)</tt><BR>
+<ul>Removes the model attached to this entity at the specified tag.</ul>
+
+<P><tt><B>removeimmune</B>( <i>String immune_string1, [ String immune_string2 ], [ String immune_string3 ], [ String immune_string4 ], [ String immune_string5 ], [ String immune_string6 ] </i>)</tt><BR>
+<ul>Removes from the immunity list for this sentient.</ul>
+
+<P><tt><B>rendereffects</B>( <i>[ String parameter1 ], [ String parameter2 ], [ String parameter3 ], [ String parameter4 ], [ String parameter5 ], [ String parameter6 ] </i>)</tt><BR>
+<ul>Change the current render effects flags.<BR>
+Valid flags are as follows:<BR>
++ sets a flag, - clears a flag<BR>
+dontdraw - send the entity to the client, but don't draw<BR>
+betterlighting - do sphere based vertex lighting on the entity<BR>
+lensflare - add a lens glow to the entity at its origin<BR>
+viewlensflare - add a view dependent lens glow to the entity at its origin<BR>
+lightoffset - use the dynamic color values as a light offset to the model<BR>
+skyorigin - this entity is the portal sky origin<BR>
+minlight - this entity always has some lighting on it<BR>
+fullbright - this entity is always fully lit<BR>
+additivedynamiclight - the dynamic light should have an additive effect<BR>
+lightstyledynamiclight - the dynamic light uses a light style, use the<BR>
+'lightstyle' command to set the index of the light style to be used</ul>
+
+<P><tt><B>revive</B>( <i>Float health </i>)</tt><BR>
+<ul>sets the health,even if dead</ul>
+
+<P><tt><B>rotatedbbox</B></tt><BR>
+<ul>Gets te entity's bbox to rotate with it.</ul>
+
+<P><tt><B>rotatedbbox</B>( <i>Integer on_off </i>)</tt><BR>
+<ul>Sets the entity's bbox to rotate with it.</ul>
+
+<P><tt><B>safesolid</B></tt><BR>
+<ul>make solid but first make sure no one is in my bounds that is thinking.</ul>
+
+<P><tt><B>saydone</B></tt><BR>
+<ul>Even used by sound-only special case of say to trigger waittill saydone</ul>
+
+<P><tt><B>scale</B>( <i>Float newScale </i>)</tt><BR>
+<ul>set the scale of the entity</ul>
+
+<P><tt><B>scale</B>( <i>Float newScale </i>)</tt><BR>
+<ul>set the scale of the entity</ul>
+
+<P><tt><B>scale</B>( <i>Float newScale </i>)</tt><BR>
+<ul>set the scale of the entity</ul>
+
+<P><tt><B>scriptshader</B>( <i>String shaderCommand, Float argument1, [ Float argument2 ] </i>)</tt><BR>
+<ul>alias for shader command, change a specific shader parameter for the entity.<BR>
+Valid shader commands are:<BR>
+translation [trans_x] [trans_y] - change the texture translation<BR>
+offset [offset_x] [offset_y] - change the texture offset<BR>
+rotation [rot_speed] - change the texture rotation speed<BR>
+frame [frame_num] - change the animated texture frame<BR>
+wavebase [base] - change the base parameter of the wave function<BR>
+waveamp [amp] - change the amp parameter of the wave function<BR>
+wavebase [phase] - change the phase parameter of the wave function<BR>
+wavefreq [freq] - change the frequency parameter of the wave function<BR>
+</ul>
+
+<P><tt><B>setcontrollerangles</B>( <i>Integer num, Vector angles </i>)</tt><BR>
+<ul>Sets the control angles for the specified bone.</ul>
+
+<P><tt><B>sethintstring</B>( <i>String string </i>)</tt><BR>
+<ul>Sets the hint string for an entity when touching it. '&&1' will be replaced by the +use key on the client. If hideent/hide is called on this entity, the hint string won't be shown for the client</ul>
+
+<P><tt><B>setshader</B>( <i>String shadername </i>)</tt><BR>
+<ul>Sets a shader for the entity. An empty string will revert to the normal entity shader.</ul>
+
+<P><tt><B>setshaderdata</B>( <i>Float data0, Float data1 </i>)</tt><BR>
+<ul>sets the shader controllers for this entity.</ul>
+
+<P><tt><B>setshadertime</B>( <i>[ Float timeOffset ], [ Float randomTimeOffset ] </i>)</tt><BR>
+<ul>reset the shader time for this entity.</ul>
+
+<P><tt><B>setsize</B>( <i>Vector mins, Vector maxs </i>)</tt><BR>
+<ul>Set the bounding box of the entity to mins and maxs.</ul>
+
+<P><tt><B>setuselookat</B>( <i>Boolean lookat </i>)</tt><BR>
+<ul>Sets if the client must look at the entity to use it</ul>
+
+<P><tt><B>shader</B>( <i>String shaderCommand, Float argument1, [ Float argument2 ] </i>)</tt><BR>
+<ul>change a specific shader parameter for the entity.<BR>
+Valid shader commands are:<BR>
+translation [trans_x] [trans_y] - change the texture translation<BR>
+offset [offset_x] [offset_y] - change the texture offset<BR>
+rotation [rot_speed] - change the texture rotation speed<BR>
+frame [frame_num] - change the animated texture frame<BR>
+wavebase [base] - change the base parameter of the wave function<BR>
+waveamp [amp] - change the amp parameter of the wave function<BR>
+wavebase [phase] - change the phase parameter of the wave function<BR>
+wavefreq [freq] - change the frequency parameter of the wave function<BR>
+</ul>
+
+<P><tt><B>shootableonly</B></tt><BR>
+<ul>Makes the entity shootable only.</ul>
+
+<P><tt><B>show</B></tt><BR>
+<ul>show the entity,opposite of hide.</ul>
+
+<P><tt><B>sighttrace</B>( <i>Vector start, Vector end, [ Integer pass_entities ], [ Vector mins ], [ Vector maxs ] </i>)</tt><BR>
+<ul>Performs a trace line from the start to the end, returns 0 if something was hit and 1 otherwise.</ul>
+
+<P><tt><B>solid</B></tt><BR>
+<ul>make solid.</ul>
+
+<P><tt><B>sp</B>( <i>String command, [ String parm1 ], [ String parm2 ], [ String ... ] </i>)</tt><BR>
+<ul>Makes a command be executed only in single player</ul>
+
+<P><tt><B>spawnflags</B>( <i>Integer flags </i>)</tt><BR>
+<ul>spawnflags from the BSP,these are set inside the editor</ul>
+
+<P><tt><B>sprealism</B>( <i>String command, [ String parm1 ], [ String parm2 ], [ String ... ] </i>)</tt><BR>
+<ul>Makes a command be executed only in single player realism mode</ul>
+
+<P><tt><B>stationary</B></tt><BR>
+<ul>entity does not move,causes no physics to be run on it.</ul>
+
+<P><tt><B>stoploopsound</B></tt><BR>
+<ul>Stop the looped-sound on this entity.</ul>
+
+<P><tt><B>stopsound</B>( <i>[ Integer channel ] </i>)</tt><BR>
+<ul>stop the current sound on the specified channel.<BR>
+default channel, CHAN_BODY.</ul>
+
+<P><tt><B>surface</B>( <i>String surfaceName, [ String parameter1 ], [ String parameter2 ], [ String parameter3 ], [ String parameter4 ], [ String parameter5 ], [ String parameter6 ] </i>)</tt><BR>
+<ul>change a legs surface parameter for the given surface.<BR>
++ sets the flag, - clears the flag<BR>
+Valid surface commands are:<BR>
+skin1 - set the skin1 offset bit<BR>
+skin2 - set the skin2 offset bit<BR>
+nodraw - don't draw this surface</ul>
+
+<P><tt><B>svflags</B>( <i>[ String parameter1 ], [ String parameter2 ], [ String parameter3 ], [ String parameter4 ], [ String parameter5 ], [ String parameter6 ] </i>)</tt><BR>
+<ul>Change the current server flags.<BR>
+Valid flags are as follows:<BR>
++ sets a flag, - clears a flag<BR>
+broadcast - always send this entity to the client</ul>
+
+<P><tt><B>takedamage</B></tt><BR>
+<ul>makes entity take damage.</ul>
+
+<P><tt><B>team</B>( <i>String moveTeam </i>)</tt><BR>
+<ul>used to make multiple entities move together.</ul>
+
+<P><tt><B>toss</B></tt><BR>
+<ul>entity has gravity applied to it.</ul>
+
+<P><tt><B>touchtriggers</B></tt><BR>
+<ul>this entity should touch triggers.</ul>
+
+<P><tt><B>trace</B>( <i>Vector start, Vector end, [ Integer pass_entities ], [ Vector mins ], [ Vector maxs ] </i>)</tt><BR>
+<ul>Performs a Trace Line from the start to the end, returns the end or the position it hit at.</ul>
+
+<P><tt><B>trigger</B>( <i>String name </i>)</tt><BR>
+<ul>Trigger the specified target or entity.</ul>
+
+<P><tt><B>unbind</B></tt><BR>
+<ul>unbind this entity.</ul>
+
+<P><tt><B>unglue</B></tt><BR>
+<ul>unglue this entity.</ul>
+
+<P><tt><B>usebbox</B></tt><BR>
+<ul>do not perform perfect collision,use bounding box instead.</ul>
+
+<P><tt><B>velocity</B>( <i>Vector velocity </i>)</tt><BR>
+<ul>sets the velocity for this entity.</ul>
+
+<P><tt><B>velocity</B></tt><BR>
+<ul>gets the velocity for this entity.</ul>
+
+<P><tt><B>volumedamage</B>( <i>Float damage </i>)</tt><BR>
+<ul>does damage to any entity within this's volume</ul>
+
+<P><tt><B>yaw</B></tt><BR>
+<ul>entity's yaw</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Event">Event</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ExplodeObject">ExplodeObject (<i>func_explodeobject</i>)</a> -> <a href="#MultiExploder">MultiExploder</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>amount</B>( <i>Integer amountOfDebris </i>)</tt><BR>
+<ul>How much debris to spawn each time.</ul>
+
+<P><tt><B>debrismodel</B>( <i>String debrisModel </i>)</tt><BR>
+<ul>What kind of debris to spawn when triggered.</ul>
+
+<P><tt><B>severity</B>( <i>Float newSeverity </i>)</tt><BR>
+<ul>How violently the debris should be ejected.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Exploder">Exploder (<i>func_exploder</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the damage the explosion does.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ExplodingWall">ExplodingWall (<i>func_explodingwall</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>anglespeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the angle speed.</ul>
+
+<P><tt><B>base_velocity</B>( <i>Vector velocity </i>)</tt><BR>
+<ul>Set the base velocity.</ul>
+
+<P><tt><B>checkonground</B></tt><BR>
+<ul>Check if exploding wall is on ground.</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>dmg</B>( <i>Integer dmg </i>)</tt><BR>
+<ul>Set the damage from the exploding wall.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>explosions</B>( <i>Integer explosions </i>)</tt><BR>
+<ul>Set the number of explosions.</ul>
+
+<P><tt><B>land_angles</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Set the land angles.</ul>
+
+<P><tt><B>land_radius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the land radius.</ul>
+
+<P><tt><B>random_velocity</B>( <i>Vector velocity </i>)</tt><BR>
+<ul>Set the amount of random variation of the base velocity.</ul>
+
+<P><tt><B>stoprotating</B></tt><BR>
+<ul>Stop rotating the wall.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Explosion">Explosion</a> -> <a href="#Projectile">Projectile</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>constantdamage</B></tt><BR>
+<ul>Makes the explosion do constant damage over the radius</ul>
+
+<P><tt><B>damageagain</B></tt><BR>
+<ul>This event is generated each frame if explosion is set to damage each frame</ul>
+
+<P><tt><B>damageeveryframe</B></tt><BR>
+<ul>Makes the explosion damage every frame</ul>
+
+<P><tt><B>explosioneffect</B>( <i>String explosiontype </i>)</tt><BR>
+<ul>Make an explosionType explosion effect</ul>
+
+<P><tt><B>flash</B>( <i>Float time, Float r, Float g, Float b, Float radius </i>)</tt><BR>
+<ul>Flash player screens</ul>
+
+<P><tt><B>radius</B>( <i>Float projectileRadius </i>)</tt><BR>
+<ul>set the radius for the explosion</ul>
+
+<P><tt><B>radiusdamage</B>( <i>Float radiusDamage </i>)</tt><BR>
+<ul>set the radius damage an explosion does</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FallingRock">FallingRock (<i>func_fallingrock</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>bounce</B></tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>dmg</B>( <i>Integer dmg </i>)</tt><BR>
+<ul>Set the damage from the rock.</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>noise</B>( <i>String sound </i>)</tt><BR>
+<ul>Set the sound to play when the rock bounces</ul>
+
+<P><tt><B>rotate</B></tt><BR>
+<ul>rotates the falling rock.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed that the rock moves at.</ul>
+
+<P><tt><B>start</B></tt><BR>
+<ul>Starts rock falling.</ul>
+
+<P><tt><B>wait</B>( <i>Float wait </i>)</tt><BR>
+<ul>How long to wait before rock starts falling.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FencePost">FencePost (<i>func_fencepost</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FixedTurret">FixedTurret</a> -> <a href="#VehicleTank">VehicleTank</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Fulcrum">Fulcrum (<i>func_fulcrum</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>dampening</B>( <i>Float newDampening </i>)</tt><BR>
+<ul>dampening of fulcrum.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>limit</B>( <i>Float newLimit </i>)</tt><BR>
+<ul>angular limit for the fulcrum.</ul>
+
+<P><tt><B>movesound</B>( <i>String newSinkSound </i>)</tt><BR>
+<ul>Sound played when fulcrum is moving.</ul>
+
+<P><tt><B>reset</B></tt><BR>
+<ul>Reset the fulcrum right now.</ul>
+
+<P><tt><B>resetspeed</B>( <i>Float newResetspeed </i>)</tt><BR>
+<ul>Speed at which fulcrum resets itself, defaults to 0.002 * speed.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Speed at which fulcrum operates itself.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FuncBeam">FuncBeam (<i>func_beam</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activate</B></tt><BR>
+<ul>Activate the beam</ul>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
+<ul>set the angles of the entity to newAngles.</ul>
+
+<P><tt><B>color</B>( <i>Vector beam_color<0.00...1.00><0.00...1.00><0.00...1.00> </i>)</tt><BR>
+<ul>Set the color of the beam</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>deactivate</B></tt><BR>
+<ul>Deactivate the beam</ul>
+
+<P><tt><B>delay</B>( <i>Float delay </i>)</tt><BR>
+<ul>Set the amount of delay on the beam updater</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>endalpha</B>( <i>Float alpha </i>)</tt><BR>
+<ul>Set the endpoint alpha value of the beam</ul>
+
+<P><tt><B>endpoint</B>( <i>Vector beam_end_point </i>)</tt><BR>
+<ul>Set the end point of the beam. The beam will be draw from the origin to<BR>
+the end point.</ul>
+
+<P><tt><B>findendpoint</B></tt><BR>
+<ul>Find the endpoint of a beam</ul>
+
+<P><tt><B>ignorewalls</B>( <i>[ Boolean bool ] </i>)</tt><BR>
+<ul>Set if the beam can traverse walls</ul>
+
+<P><tt><B>life</B>( <i>Float beam_life </i>)</tt><BR>
+<ul>Set the amount of time the beam stays on when activated</ul>
+
+<P><tt><B>maxoffset</B>( <i>Float max_offset </i>)</tt><BR>
+<ul>Set the maximum offset the beam can travel above, below, forward or back of it's endpoints</ul>
+
+<P><tt><B>minoffset</B>( <i>Float min_offset </i>)</tt><BR>
+<ul>Set the minimun offset the beam can travel above, below, forward or back of it's endpoints</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>numsegments</B>( <i>Integer numsegments </i>)</tt><BR>
+<ul>Set the number of segments for the beam</ul>
+
+<P><tt><B>numspherebeams</B>( <i>Integer num </i>)</tt><BR>
+<ul>Set the number of beams that will be shot out in a sphere like formation</ul>
+
+<P><tt><B>overlap</B>( <i>Float beam_overlap </i>)</tt><BR>
+<ul>Set the amount of overlap the beams have when they are being strung together</ul>
+
+<P><tt><B>persist</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Set the persist property of the beam</ul>
+
+<P><tt><B>radius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the starting radius of the beams if this is a beamsphere</ul>
+
+<P><tt><B>shader</B>( <i>String beam_shader </i>)</tt><BR>
+<ul>Set the shader that the beam will use</ul>
+
+<P><tt><B>shoot</B></tt><BR>
+<ul>Make the beam cause damage to entities that get in the way</ul>
+
+<P><tt><B>shootradius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the radius of the damage area between beam endpoints</ul>
+
+<P><tt><B>tileshader</B>( <i>String beam_shader </i>)</tt><BR>
+<ul>Set the shader that the beam will use.  This shader will be tiled.</ul>
+
+<P><tt><B>toggledelay</B>( <i>[ String [random] ], [ Float time ] </i>)</tt><BR>
+<ul>Causes a beam toggling effect.  Sets the time between toggling.  If random is specified, The time will be between 0 and time</ul>
+
+<P><tt><B>updateendpoint</B></tt><BR>
+<ul>Update the endpoint of a beam</ul>
+
+<P><tt><B>updateorigin</B></tt><BR>
+<ul>Update the origin of a beam</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FuncLadder">FuncLadder (<i>func_ladder</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="FuncRemove">FuncRemove (<i>func_remove</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Game">Game</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>detail</B></tt><BR>
+<ul>game.detail</ul>
+
+<P><tt><B>skill</B></tt><BR>
+<ul>game.skill</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Gib">Gib (<i>gib</i>)</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>stopped</B></tt><BR>
+<ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
+
+<P><tt><B>throwgib</B>( <i>Entity ent, Integer velocity, Float scale </i>)</tt><BR>
+<ul>Throw a gib.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="GravPath">GravPath</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="GravPathManager">GravPathManager</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="GravPathNode">GravPathNode (<i>info_grav_pathnode</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activate</B></tt><BR>
+<ul>Activate the grav path.</ul>
+
+<P><tt><B>deactivate</B></tt><BR>
+<ul>Deactivate the grav path.</ul>
+
+<P><tt><B>gravpath_create</B></tt><BR>
+<ul>Create the grav path.</ul>
+
+<P><tt><B>maxspeed</B>( <i>Float maxspeed </i>)</tt><BR>
+<ul>Set the max speed of the grav path.</ul>
+
+<P><tt><B>radius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the radius of the grav path.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed of the grav path.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="GrenadeHint">GrenadeHint (<i>info_grenadehint</i>)</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Health">Health (<i>health_020</i>)</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>health_postspawn</B></tt><BR>
+<ul>Health Post Spawn</ul>
+
+<P><tt><B>item_pickup</B>( <i>Entity item </i>)</tt><BR>
+<ul>Pickup the specified item.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="HelmetObject">HelmetObject (<i>helmetobject</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="HorizontalPipe">HorizontalPipe (<i>func_horizontalpipe</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Hud">Hud</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>alignx</B></tt><BR>
+<ul>Gets the horizontal alignment for the HUD. Specified by 'left', 'center', or 'right'</ul>
+
+<P><tt><B>alignx</B>( <i>String align </i>)</tt><BR>
+<ul>Sets the horizontal alignment for the HUD. Specified by 'left', 'center', or 'right'</ul>
+
+<P><tt><B>aligny</B>( <i>String align </i>)</tt><BR>
+<ul>Sets the vertical alignment for the HUD. Specified by 'top', 'center', or 'bottom'</ul>
+
+<P><tt><B>aligny</B></tt><BR>
+<ul>Gets the vertical alignment for the HUD</ul>
+
+<P><tt><B>alpha</B></tt><BR>
+<ul>Gets the HUD alpha</ul>
+
+<P><tt><B>alpha</B>( <i>Float alpha </i>)</tt><BR>
+<ul>Sets the HUD alpha</ul>
+
+<P><tt><B>color</B></tt><BR>
+<ul>Gets the HUD colors</ul>
+
+<P><tt><B>color</B>( <i>Vector color </i>)</tt><BR>
+<ul>Sets the HUD colors</ul>
+
+<P><tt><B>fadeovertime</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the HUD to transition in color (or alpha) over time</ul>
+
+<P><tt><B>font</B></tt><BR>
+<ul>Gets the HUD font</ul>
+
+<P><tt><B>font</B>( <i>String font </i>)</tt><BR>
+<ul>Sets the HUD font</ul>
+
+<P><tt><B>getheight</B></tt><BR>
+<ul>Gets the HUD height</ul>
+
+<P><tt><B>gettime</B></tt><BR>
+<ul>Gets the HUD  time</ul>
+
+<P><tt><B>getwidth</B></tt><BR>
+<ul>Gets the HUD width</ul>
+
+<P><tt><B>moveovertime</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the HUD to move over time</ul>
+
+<P><tt><B>refresh</B></tt><BR>
+<ul>Refresh the HUD</ul>
+
+<P><tt><B>resetdimension</B></tt><BR>
+<ul>Bring the HUD back to normal dimension (non-3D)</ul>
+
+<P><tt><B>scaleovertime</B>( <i>Float time, Integer width, Integer height </i>)</tt><BR>
+<ul>Sets the HUD to scale over time</ul>
+
+<P><tt><B>setdimension</B>( <i>Vector vector_or_offset, Boolean always_show, Boolean depth, [ Entity entity ] </i>)</tt><BR>
+<ul>Sets this huddraw element to be a 3D world icon and can specify if this icon is always shown on-screen even if the player isn't looking at.<BR>
+It uses xy pos from huddraw_rect.<BR>
+If entity is specified, the vector will be an offset relative to the entity.<BR>
+depth specify if the icon is shown through walls.</ul>
+
+<P><tt><B>setplayer</B>( <i>Entity entity, [ Boolean clears ] </i>)</tt><BR>
+<ul>Sets to which player this HUD is shown and possibly clears the HUD to the previous player(s) it was shown. A NULL/NIL entity means the HUD will be shown to all players<BR>
+Note : you will need to call in HUD functions again as it won't refresh to the player(s)</ul>
+
+<P><tt><B>setshader</B>( <i>String shader, Integer width, Integer height </i>)</tt><BR>
+<ul>Sets the HUD shader</ul>
+
+<P><tt><B>settext</B>( <i>String text </i>)</tt><BR>
+<ul>Sets the HUD text</ul>
+
+<P><tt><B>settimer</B>( <i>Float time, [ Float fade_at_time ] </i>)</tt><BR>
+<ul>Sets a timer to count down an optionally fade at the specified time</ul>
+
+<P><tt><B>settimerup</B>( <i>Float time, [ Float fade_at_time ] </i>)</tt><BR>
+<ul>Sets a timer to count up an optionally fade at the specified time</ul>
+
+<P><tt><B>setvirtualsize</B>( <i>Boolean virtual </i>)</tt><BR>
+<ul>Sets if the HUD should use virtual screen resolution for positioning and size</ul>
+
+<P><tt><B>x</B></tt><BR>
+<ul>Gets the HUD horizontal position</ul>
+
+<P><tt><B>x</B>( <i>Integer x </i>)</tt><BR>
+<ul>Sets the HUD horizontal position</ul>
+
+<P><tt><B>y</B>( <i>Integer y </i>)</tt><BR>
+<ul>Sets the HUD vertical position</ul>
+
+<P><tt><B>y</B></tt><BR>
+<ul>Gets the HUD vertical position</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="InfoLandmark">InfoLandmark (<i>info_landmark</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>landmark_name</B>( <i>String name </i>)</tt><BR>
+<ul>Set the name of this landmark</ul>
+
+<P><tt><B>origin</B>( <i>Vector origin </i>)</tt><BR>
+<ul>Set the origin of the landmark.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="InfoNotNull">InfoNotNull (<i>info_notnull</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="InfoNull">InfoNull (<i>info_null</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="InteractObject">InteractObject (<i>interactobject</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>hiteffect</B></tt><BR>
+<ul>Sets the tiki it will spawn when it's hit</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killedeffect</B></tt><BR>
+<ul>Sets the tiki it will spawn when it's destroyed</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="InventoryItem">InventoryItem</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activateitem</B>( <i>[ String mode ] </i>)</tt><BR>
+<ul>Activates the item</ul>
+
+<P><tt><B>activatepapers</B></tt><BR>
+<ul>The activation of the papers item</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>amount</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Sets the amount of the item.</ul>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>dialogneeded</B>( <i>String dialog_needed </i>)</tt><BR>
+<ul>Sets the dialog needed string.</ul>
+
+<P><tt><B>dmamount</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Sets the amount of the item for DM.</ul>
+
+<P><tt><B>dmmaxamount</B>( <i>Integer max_amount </i>)</tt><BR>
+<ul>Sets the max amount of the item fmr DM.</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>item_droptofloor</B></tt><BR>
+<ul>Drops the item to the ground.</ul>
+
+<P><tt><B>item_pickup</B>( <i>Entity item </i>)</tt><BR>
+<ul>Pickup the specified item.</ul>
+
+<P><tt><B>maxamount</B>( <i>Integer max_amount </i>)</tt><BR>
+<ul>Sets the max amount of the item.</ul>
+
+<P><tt><B>name</B>( <i>String item_name </i>)</tt><BR>
+<ul>Sets the item name.</ul>
+
+<P><tt><B>no_remove</B></tt><BR>
+<ul>Makes it so the item is not removed from the world when it is picked up.</ul>
+
+<P><tt><B>pickupsound</B>( <i>String name </i>)</tt><BR>
+<ul>sets the item's pickup sound alias</ul>
+
+<P><tt><B>pickup_done</B></tt><BR>
+<ul>Called when the item pickup is done.</ul>
+
+<P><tt><B>respawn</B></tt><BR>
+<ul>Respawns the item.</ul>
+
+<P><tt><B>respawnsound</B></tt><BR>
+<ul>Turns on the respawn sound for this item.</ul>
+
+<P><tt><B>respawn_done</B></tt><BR>
+<ul>Called when the item respawn is done.</ul>
+
+<P><tt><B>set_respawn</B>( <i>Integer respawn </i>)</tt><BR>
+<ul>Turns respawn on or off.</ul>
+
+<P><tt><B>set_respawn_time</B>( <i>Float respawn_time </i>)</tt><BR>
+<ul>Sets the respawn time.</ul>
+
+<P><tt><B>stopped</B></tt><BR>
+<ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>viewmodelprefix</B>( <i>String prefix </i>)</tt><BR>
+<ul>Sets the item's prefix for viewmodelanim.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Level">Level</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>alarm</B></tt><BR>
+<ul>zero = global level alarm off,non-zero = alarm on</ul>
+
+<P><tt><B>alarm</B>( <i>Integer alarm_status </i>)</tt><BR>
+<ul>zero = global level alarm off,non-zero = alarm on</ul>
+
+<P><tt><B>badplace</B>( <i>String name, Vector origin, Float radius, [ String [team] ], [ Float [duration] ] </i>)</tt><BR>
+<ul>Enables a 'bad place' for AI of team 'american', 'german', or (default) 'both' to avoid, and optionally gives it a duration</ul>
+
+<P><tt><B>bombs_planted</B>( <i>Integer num </i>)</tt><BR>
+<ul>Sets the number of bombs that are set</ul>
+
+<P><tt><B>bombs_planted</B>( <i>Integer num </i>)</tt><BR>
+<ul>the number of bombs that are set</ul>
+
+<P><tt><B>bombs_planted</B></tt><BR>
+<ul>Gets the number of bombs that are set</ul>
+
+<P><tt><B>clockside</B>( <i>String axis_allies_draw_kills </i>)</tt><BR>
+<ul>Sets which side the clock is on... 'axis' or 'allies' win when time is up, 'kills' gives the win to the team with more live members,'draw' no one wins</ul>
+
+<P><tt><B>clockside</B>( <i>String axis_or_allies </i>)</tt><BR>
+<ul>Sets which side the clock is on... 'axis' or 'allies' win when time is up</ul>
+
+<P><tt><B>clockside</B></tt><BR>
+<ul>Gets which side the clock is on... 'axis' or 'allies' win when time is up</ul>
+
+<P><tt><B>dmrespawning</B></tt><BR>
+<ul>returns 1 if wave-based DM, 0 if respawns are disabled within a round</ul>
+
+<P><tt><B>dmrespawning</B>( <i>Integer allow_respawn </i>)</tt><BR>
+<ul>set to 1 to turn on wave-based DM, to 0 to disable respawns within a round</ul>
+
+<P><tt><B>dmrespawning</B>( <i>Integer allow_respawn </i>)</tt><BR>
+<ul>set to 1 to turn on wave-based DM,to 0 to disable respawns within a round</ul>
+
+<P><tt><B>dmroundlimit</B>( <i>Integer roundlimit </i>)</tt><BR>
+<ul>sets the default roundlimit, in minutes; can be overridden by 'roundlimit' cvar</ul>
+
+<P><tt><B>dmroundlimit</B>( <i>Integer roundlimit </i>)</tt><BR>
+<ul>sets the default roundlimit,in minutes; can be overridden by 'roundlimit' cvar</ul>
+
+<P><tt><B>dmroundlimit</B></tt><BR>
+<ul>gets the actual roundlimit, in minutes; may be 'roundlimit' cvar or the default round limit</ul>
+
+<P><tt><B>force_team_objective</B></tt><BR>
+<ul>Return 1 if each team has a separate objective location</ul>
+
+<P><tt><B>force_team_objective</B>( <i>Integer force </i>)</tt><BR>
+<ul>Whether or not to force using a separate objective location for each team.<BR>
+1 (forced on TOW/Liberation match): different location for each team<BR>
+0 (default): teams use same location on non-TOW/non-Liberation match<BR>
+</ul>
+
+<P><tt><B>found_secrets</B></tt><BR>
+<ul>count of found secrets</ul>
+
+<P><tt><B>ignoreclock</B>( <i>Integer ignoreclock </i>)</tt><BR>
+<ul>Tells a level weather or not to ignore the clock</ul>
+
+<P><tt><B>loop_protection</B></tt><BR>
+<ul>says if infinite loop protection is enabled</ul>
+
+<P><tt><B>loop_protection</B>( <i>Integer loop_protection </i>)</tt><BR>
+<ul>specify if infinite loop protection is enabled</ul>
+
+<P><tt><B>nodrophealth</B>( <i>Integer alarm_status </i>)</tt><BR>
+<ul>zero = automatically drop health according to cvars, non-zero = don't autodrop health (like hard mode)</ul>
+
+<P><tt><B>nodropweapon</B>( <i>Integer alarm_status </i>)</tt><BR>
+<ul>zero = automatically drop weapons according to cvars, non-zero = don't autodrop weapons (like hard mode)</ul>
+
+<P><tt><B>objectivebased</B></tt><BR>
+<ul>Gets wether or not the game is currently objective based or not</ul>
+
+<P><tt><B>papers</B></tt><BR>
+<ul>the level of papers the player currently has</ul>
+
+<P><tt><B>papers</B></tt><BR>
+<ul>the level of papers the player currently has</ul>
+
+<P><tt><B>planting_team</B>( <i>String axis_allies_draw_kills </i>)</tt><BR>
+<ul>which is planting the bomb,'axis' or 'allies'</ul>
+
+<P><tt><B>planting_team</B>( <i>String axis_or_allies </i>)</tt><BR>
+<ul>Sets which is planting the bomb,'axis' or 'allies'</ul>
+
+<P><tt><B>planting_team</B></tt><BR>
+<ul>Gets which is planting the bomb,'axis' or 'allies'</ul>
+
+<P><tt><B>rain_density</B></tt><BR>
+<ul>Sets the rain density</ul>
+
+<P><tt><B>rain_density</B></tt><BR>
+<ul>Sets the rain density</ul>
+
+<P><tt><B>rain_length</B></tt><BR>
+<ul>Sets the rain length</ul>
+
+<P><tt><B>rain_length</B></tt><BR>
+<ul>Sets the rain length</ul>
+
+<P><tt><B>rain_min_dist</B></tt><BR>
+<ul>Sets the rain min_dist</ul>
+
+<P><tt><B>rain_min_dist</B></tt><BR>
+<ul>Sets the rain min_dist</ul>
+
+<P><tt><B>rain_numshaders</B></tt><BR>
+<ul>Sets the rain numshaders</ul>
+
+<P><tt><B>rain_numshaders</B></tt><BR>
+<ul>Sets the rain numshaders</ul>
+
+<P><tt><B>rain_shader</B></tt><BR>
+<ul>Sets the rain </ul>
+
+<P><tt><B>rain_shader</B></tt><BR>
+<ul>Sets the rain </ul>
+
+<P><tt><B>rain_slant</B></tt><BR>
+<ul>Sets the rain slant</ul>
+
+<P><tt><B>rain_slant</B></tt><BR>
+<ul>Sets the rain slant</ul>
+
+<P><tt><B>rain_speed</B></tt><BR>
+<ul>Sets the rain speed</ul>
+
+<P><tt><B>rain_speed</B></tt><BR>
+<ul>Sets the rain speed</ul>
+
+<P><tt><B>rain_speed_vary</B></tt><BR>
+<ul>Sets the rain speed variance</ul>
+
+<P><tt><B>rain_speed_vary</B></tt><BR>
+<ul>Sets the rain speed variance</ul>
+
+<P><tt><B>rain_width</B></tt><BR>
+<ul>Sets the rain width</ul>
+
+<P><tt><B>rain_width</B></tt><BR>
+<ul>Sets the rain width</ul>
+
+<P><tt><B>removebadplace</B>( <i>String name </i>)</tt><BR>
+<ul>Removes a 'bad place'</ul>
+
+<P><tt><B>roundbased</B></tt><BR>
+<ul>Gets wether or not the game is currently round based or not</ul>
+
+<P><tt><B>roundstarted</B></tt><BR>
+<ul>non-zero if round has started</ul>
+
+<P><tt><B>targets_destroyed</B>( <i>Integer num </i>)</tt><BR>
+<ul>Sets the number of bomb targets that have been destroyed</ul>
+
+<P><tt><B>targets_destroyed</B></tt><BR>
+<ul>Gets the number of bomb targets that have been destroyed</ul>
+
+<P><tt><B>targets_destroyed</B>( <i>Integer num </i>)</tt><BR>
+<ul>the number of bomb targets that have been destroyed</ul>
+
+<P><tt><B>targets_to_destroy</B>( <i>Integer num </i>)</tt><BR>
+<ul>Sets the number of bomb targets that must be destroyed</ul>
+
+<P><tt><B>targets_to_destroy</B></tt><BR>
+<ul>Gets the number of bomb targets that must be destroyed</ul>
+
+<P><tt><B>targets_to_destroy</B>( <i>Integer num </i>)</tt><BR>
+<ul>the number of bomb targets that must be destroyed</ul>
+
+<P><tt><B>time</B></tt><BR>
+<ul>current level time</ul>
+
+<P><tt><B>total_secrets</B></tt><BR>
+<ul>count of total secrets</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Light">Light (<i>light</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="LightStyleClass">LightStyleClass</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>cancelFor</B>( <i>String name </i>)</tt><BR>
+<ul>Cancel for event of type name.</ul>
+
+<P><tt><B>classname</B></tt><BR>
+<ul>classname variable</ul>
+
+<P><tt><B>commanddelay</B>( <i>Float delay, String command, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>executes a command after the given delay.</ul>
+
+<P><tt><B>delaythrow</B>( <i>String label </i>)</tt><BR>
+<ul>Internal usage.</ul>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>endon</B>( <i>String name </i>)</tt><BR>
+<ul>Ends the function when the specified event is triggered.</ul>
+
+<P><tt><B>exec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script.</ul>
+
+<P><tt><B>exec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script.</ul>
+
+<P><tt><B>immediateremove</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>inheritsfrom</B>( <i>String class </i>)</tt><BR>
+<ul>Returns 1 if the class inherits from the specified class. 0 otherwise.</ul>
+
+<P><tt><B>isinheritedby</B>( <i>String class </i>)</tt><BR>
+<ul>Returns 1 if the class is inherited by the specified class. 0 otherwise.</ul>
+
+<P><tt><B>notify</B>( <i>String name </i>)</tt><BR>
+<ul>Triggers an event. An undefined event will be automatically created by calling waittill or endon.</ul>
+
+<P><tt><B>owner</B></tt><BR>
+<ul>Returns the owner.</ul>
+
+<P><tt><B>remove</B></tt><BR>
+<ul>Removes this listener the next time events are processed.</ul>
+
+<P><tt><B>thread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label.</ul>
+
+<P><tt><B>thread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label.</ul>
+
+<P><tt><B>throw</B>( <i>String label </i>)</tt><BR>
+<ul>Throws to the specified label.</ul>
+
+<P><tt><B>unregister</B>( <i>String label </i>)</tt><BR>
+<ul>Unregisters the label from the event of the same name.</ul>
+
+<P><tt><B>waitexec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script and waits until the called thread group is finished.</ul>
+
+<P><tt><B>waitexec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script and waits until the called thread group is finished.</ul>
+
+<P><tt><B>waitthread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label and waits until the called thread is finished.</ul>
+
+<P><tt><B>waitthread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label and waits until the called thread is finished.</ul>
+
+<P><tt><B>waitTill</B>( <i>String name </i>)</tt><BR>
+<ul>Wait until event of type name</ul>
+
+<P><tt><B>waittill_any</B>( <i>String name1, [ String ... ] </i>)</tt><BR>
+<ul>Wait until any event of type name</ul>
+
+<P><tt><B>waittill_any_timeout</B>( <i>Float timeout_time, String name1, [ String ... ] </i>)</tt><BR>
+<ul>Wait until any event of type name with a timeout time</ul>
+
+<P><tt><B>waittill_timeout</B>( <i>Float timeout_time, String name </i>)</tt><BR>
+<ul>Wait until event of type name with a timeout time</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="LODMaster">LODMaster (<i>lodmaster</i>)</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>lod_angles</B>( <i>Float pitch<0.00...360.00>, Float yaw<0.00...360.00>, Float roll<0.00...360.00> </i>)</tt><BR>
+<ul>Set the angles of the model</ul>
+
+<P><tt><B>lod_discard</B></tt><BR>
+<ul>Discard LOD changes</ul>
+
+<P><tt><B>lod_roll</B>( <i>Float roll </i>)</tt><BR>
+<ul>Set the roll of the model</ul>
+
+<P><tt><B>lod_spawn</B>( <i>String model </i>)</tt><BR>
+<ul>Edit LOD on the specified model</ul>
+
+<P><tt><B>lod_yaw</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Set the yaw of the model</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="LODSlave">LODSlave (<i>lodslave</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>lod_discard</B></tt><BR>
+<ul>Discard LOD changes</ul>
+
+<P><tt><B>lod_model</B></tt><BR>
+<ul>Set the model of the current viewthing</ul>
+
+<P><tt><B>lod_think</B></tt><BR>
+<ul>Called every frame to process the view thing.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="MiscModel">MiscModel (<i>misc_model</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="MonkeyBars">MonkeyBars (<i>func_monkeybars</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Mover">Mover (<i>mover</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>movedone</B>( <i>Entity finishedEntity </i>)</tt><BR>
+<ul>Sent to commanding thread when done with move .</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="MultiExploder">MultiExploder (<i>func_multi_exploder</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the damage the explosion does.</ul>
+
+<P><tt><B>duration</B>( <i>Float duration </i>)</tt><BR>
+<ul>Sets the duration of the explosion.</ul>
+
+<P><tt><B>random</B>( <i>Float randomness </i>)</tt><BR>
+<ul>Sets the randomness value of the explosion.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>wait</B>( <i>Float explodewait </i>)</tt><BR>
+<ul>Sets the wait time of the explosion.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Object">Object</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Objective">Objective (<i>func_objective</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>Complete</B></tt><BR>
+<ul>Complete this objective.</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>ObjectiveNbr</B>( <i>Integer index </i>)</tt><BR>
+<ul>Sets the objective number.</ul>
+
+<P><tt><B>SetCurrent</B></tt><BR>
+<ul>Set this objective as current.</ul>
+
+<P><tt><B>Text</B>( <i>String text </i>)</tt><BR>
+<ul>Set current text.</ul>
+
+<P><tt><B>TurnOff</B></tt><BR>
+<ul>Turn Off and cancel the current cycle (if any)</ul>
+
+<P><tt><B>TurnOn</B></tt><BR>
+<ul>Turn On and begin the first cycle</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Parm">Parm</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>motionfail</B></tt><BR>
+<ul>motionfail</ul>
+
+<P><tt><B>movedone</B></tt><BR>
+<ul>movedone</ul>
+
+<P><tt><B>movefail</B></tt><BR>
+<ul>movefail</ul>
+
+<P><tt><B>other</B></tt><BR>
+<ul>other</ul>
+
+<P><tt><B>owner</B></tt><BR>
+<ul>owner</ul>
+
+<P><tt><B>previousthread</B></tt><BR>
+<ul>previousthread</ul>
+
+<P><tt><B>sayfail</B></tt><BR>
+<ul>sayfail</ul>
+
+<P><tt><B>upperfail</B></tt><BR>
+<ul>upperfail</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PathNode">PathNode (<i>info_pathnode</i>)</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>immediateremove</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>istouching</B>( <i>Entity ent </i>)</tt><BR>
+<ul>returns 1 if the entities are touching,0 if not</ul>
+
+<P><tt><B>low_wall_arc</B>( <i>Float arc_half_angle </i>)</tt><BR>
+<ul>Marks this node as good for low-wall behavior, and gives the arc</ul>
+
+<P><tt><B>spawnflags</B>( <i>Integer node_flags </i>)</tt><BR>
+<ul>Sets the path nodes flags.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PathSearch">PathSearch</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Player">Player (<i>player</i>)</a> -> <a href="#Sentient">Sentient</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>actor</B>( <i>String modelname, [ String keyname1 ], [ String value1 ], [ String keyname2 ], [ String value2 ], [ String keyname3 ], [ String value3 ], [ String keyname4 ], [ String value4 ] </i>)</tt><BR>
+<ul>Spawns an actor.</ul>
+
+<P><tt><B>actorinfo</B>( <i>Integer actor_number </i>)</tt><BR>
+<ul>Prints info on the specified actor.</ul>
+
+<P><tt><B>adddeaths</B>( <i>Integer deaths </i>)</tt><BR>
+<ul>adds deaths number to player</ul>
+
+<P><tt><B>addkills</B>( <i>Integer kills </i>)</tt><BR>
+<ul>Give or take kills from the player</ul>
+
+<P><tt><B>adminrights</B></tt><BR>
+<ul>returns client admin rights</ul>
+
+<P><tt><B>animloop_legs</B></tt><BR>
+<ul>Called when the legs animation has finished.</ul>
+
+<P><tt><B>animloop_pain</B></tt><BR>
+<ul>Called when the pain animation has finished.</ul>
+
+<P><tt><B>animloop_torso</B></tt><BR>
+<ul>Called when the torso animation has finished.</ul>
+
+<P><tt><B>armwithweapons</B></tt><BR>
+<ul>give player their primary and secondary weapons.</ul>
+
+<P><tt><B>attachtoladder</B></tt><BR>
+<ul>Attaches the sentient to a ladder</ul>
+
+<P><tt><B>auto_join_team</B></tt><BR>
+<ul>Join the team with fewer players</ul>
+
+<P><tt><B>bindweap</B>( <i>Entity weapon, Integer handnum </i>)</tt><BR>
+<ul>binds weapon to player and sets him as weapon owner</ul>
+
+<P><tt><B>callvote</B>( <i>String arg1, String arg2 </i>)</tt><BR>
+<ul>Player calls a vote</ul>
+
+<P><tt><B>canswitchteams</B>( <i>Boolean allow_team_change, [ Boolean allow_spectate ] </i>)</tt><BR>
+<ul>Specify if this player is allowed to switch teams and spectate. Doesn't override global canswitchteams.</ul>
+
+<P><tt><B>clearcommand</B>( <i>[ String command ] </i>)</tt><BR>
+<ul>Clears any or a specific client command</ul>
+
+<P><tt><B>coord</B></tt><BR>
+<ul>Prints out current location and angles</ul>
+
+<P><tt><B>correctweaponattachments</B></tt><BR>
+<ul>makes sure the weapons is properly attached when interupting a reload</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>damage_multiplier</B>( <i>Float damage_multiplier </i>)</tt><BR>
+<ul>Sets the current damage multiplier</ul>
+
+<P><tt><B>damage_multiplier</B></tt><BR>
+
+<P><tt><B>dead</B></tt><BR>
+<ul>Called when the player is dead.</ul>
+
+<P><tt><B>deadbody</B></tt><BR>
+<ul>Spawn a dead body</ul>
+
+<P><tt><B>dive</B>( <i>Float height, [ Float airborne_duration ] </i>)</tt><BR>
+<ul>Makes the player dive into prone position.</ul>
+
+<P><tt><B>dmdeathdrop</B></tt><BR>
+<ul>Drops the player inventory in DM after's he's been killed</ul>
+
+<P><tt><B>dmmessage</B>( <i>Integer mode, String stuffstrings </i>)</tt><BR>
+<ul>sends a DM message to the appropriate players</ul>
+
+<P><tt><B>dmteam</B></tt><BR>
+<ul>returns 'allies','axis','spectator',or 'freeforall'</ul>
+
+<P><tt><B>dog</B>( <i>[ Integer god_mode ] </i>)</tt><BR>
+<ul>Sets the god mode cheat or toggles it.</ul>
+
+<P><tt><B>earthquake2</B>( <i>Float duration, Float magnitude, Boolean no_rampup, Boolean no_rampdown, [ Vector location ], [ Float radius ] </i>)</tt><BR>
+<ul>Create a smooth realistic earthquake for a player. Requires sv_reborn to be set.</ul>
+
+<P><tt><B>endlevel</B></tt><BR>
+<ul>Called when the player gets to the end of the level.</ul>
+
+<P><tt><B>ensureforwardoffladder</B></tt><BR>
+<ul>Ensures that the player went forward off the ladder.</ul>
+
+<P><tt><B>ensureoverladder</B></tt><BR>
+<ul>Ensures that the player is at the proper height when getting off the top of a ladder</ul>
+
+<P><tt><B>enter</B>( <i>Entity vehicle, [ String driver_anim ] </i>)</tt><BR>
+<ul>Called when someone gets into a vehicle.</ul>
+
+<P><tt><B>exit</B>( <i>Entity vehicle </i>)</tt><BR>
+<ul>Called when driver gets out of the vehicle.</ul>
+
+<P><tt><B>face</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Force angles to specified vector</ul>
+
+<P><tt><B>finishuseanim</B></tt><BR>
+<ul>Fires off all targets associated with a particular useanim.</ul>
+
+<P><tt><B>finishuseobject</B></tt><BR>
+<ul>Fires off all targets associated with a particular useobject.</ul>
+
+<P><tt><B>fireheld</B></tt><BR>
+<ul>returns 1 if this player is holding fire,or 0 if he is not</ul>
+
+<P><tt><B>forcelegsstate</B>( <i>String legsstate </i>)</tt><BR>
+<ul>Force the player's legs to a certain state</ul>
+
+<P><tt><B>forcetorsostate</B>( <i>String torsostate </i>)</tt><BR>
+<ul>Force the player's torso to a certain state</ul>
+
+<P><tt><B>fov</B>( <i>[ Float fov ] </i>)</tt><BR>
+<ul>Sets the fov.</ul>
+
+<P><tt><B>freezecontrols</B>( <i>Boolean freeze_state </i>)</tt><BR>
+<ul>Blocks or unblocks control input from this player.</ul>
+
+<P><tt><B>fullheal</B></tt><BR>
+<ul>Heals player.</ul>
+
+<P><tt><B>gameversion</B></tt><BR>
+<ul>Prints the game version.</ul>
+
+<P><tt><B>getconnstate</B></tt><BR>
+<ul>gets connection state. [DEPRECATED]</ul>
+
+<P><tt><B>getcurrentdmweapontype</B></tt><BR>
+<ul>get the player's current DM weapon type.</ul>
+
+<P><tt><B>getdeaths</B></tt><BR>
+<ul>gets deaths number of player</ul>
+
+<P><tt><B>getkills</B></tt><BR>
+<ul>gets kills number of player</ul>
+
+<P><tt><B>getlegsstate</B></tt><BR>
+<ul>Gets the player's current legs state name</ul>
+
+<P><tt><B>getmovement</B></tt><BR>
+<ul>returns the player current movement</ul>
+
+<P><tt><B>getposition</B></tt><BR>
+<ul>returns the player current position</ul>
+
+<P><tt><B>gettorsostate</B></tt><BR>
+<ul>Gets the player's current torso state name</ul>
+
+<P><tt><B>give</B>( <i>String name, [ Integer amount ] </i>)</tt><BR>
+<ul>Gives the player the specified thing (weapon, ammo, item, etc.) and optionally the amount.</ul>
+
+<P><tt><B>giveweapon</B>( <i>String weapon_name </i>)</tt><BR>
+<ul>Gives the player the specified weapon.</ul>
+
+<P><tt><B>gotkill</B>( <i>Entity victim, Integer damage, Entity inflictor, Integer meansofdeath, Boolean gib </i>)</tt><BR>
+<ul>event sent to attacker when an entity dies</ul>
+
+<P><tt><B>gvo</B></tt><BR>
+<ul>Retrieves the server's vote options file</ul>
+
+<P><tt><B>has_disguise</B>( <i>Integer is_disguised </i>)</tt><BR>
+<ul>zero = does not have a disguise,non - zero = has a disguise</ul>
+
+<P><tt><B>has_disguise</B></tt><BR>
+<ul>zero = does not have a disguise,non - zero = has a disguise</ul>
+
+<P><tt><B>hideent</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Hides the specified entity to the player.</ul>
+
+<P><tt><B>holster</B></tt><BR>
+<ul>Holsters all wielded weapons, or unholsters previously put away weapons</ul>
+
+<P><tt><B>injail</B></tt><BR>
+<ul>returns 1 if player is in jail,0 if out</ul>
+
+<P><tt><B>injail</B>( <i>Integer boolean </i>)</tt><BR>
+<ul>set to 1 to indicate when player is in jail,0 when they are free</ul>
+
+<P><tt><B>inventory</B>( <i>Entity array </i>)</tt><BR>
+<ul>Set up the player's inventory</ul>
+
+<P><tt><B>inventory</B></tt><BR>
+<ul>returns player's inventory</ul>
+
+<P><tt><B>invnext</B></tt><BR>
+<ul>Cycle to player's next item.</ul>
+
+<P><tt><B>invprev</B></tt><BR>
+<ul>Cycle to player's previous item.</ul>
+
+<P><tt><B>iprint</B>( <i>String string, [ Integer bold ] </i>)</tt><BR>
+<ul>prints a string to the player,optionally in bold</ul>
+
+<P><tt><B>isadmin</B></tt><BR>
+<ul>checks if player is logged as admin</ul>
+
+<P><tt><B>isEscaping</B></tt><BR>
+<ul>Return non-zero if escaping or assisting escape</ul>
+
+<P><tt><B>isSpectator</B></tt><BR>
+<ul>Check to see if player is a spectator (non-zero return value)</ul>
+
+<P><tt><B>is_disguised</B></tt><BR>
+<ul>zero = not disguisednon-zero = disguised</ul>
+
+<P><tt><B>jailassistescape</B></tt><BR>
+<ul>Start the assist jail escape animation</ul>
+
+<P><tt><B>jailescape</B></tt><BR>
+<ul>Start the escape from jail animation</ul>
+
+<P><tt><B>jailescapestop</B></tt><BR>
+<ul>Stop either the escape from jail or assist animation</ul>
+
+<P><tt><B>join_team</B>( <i>String team </i>)</tt><BR>
+<ul>Join the specified team (allies or axis)</ul>
+
+<P><tt><B>jump</B>( <i>Float height </i>)</tt><BR>
+<ul>Makes the player jump.</ul>
+
+<P><tt><B>jumpxy</B>( <i>Float forwardmove, Float sidemove, Float speed </i>)</tt><BR>
+<ul>Makes the sentient jump.</ul>
+
+<P><tt><B>kill</B></tt><BR>
+<ul>console based command to kill yourself if stuck.</ul>
+
+<P><tt><B>killaxis</B>( <i>Float radius </i>)</tt><BR>
+<ul>Kills all of the axis that are in the passed radius, or all of them if radius is 0.</ul>
+
+<P><tt><B>killclass</B>( <i>String classname, [ Integer except_entity_number ] </i>)</tt><BR>
+<ul>Kills all of the entities in the specified class.</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killent</B>( <i>Integer entity_number </i>)</tt><BR>
+<ul>Kills the specified entity.</ul>
+
+<P><tt><B>killhandler</B>( <i>String label </i>)</tt><BR>
+<ul>Gets the player's current killed event handler. Returns NIL if no custom killhandler was set.</ul>
+
+<P><tt><B>killhandler</B>( <i>String label </i>)</tt><BR>
+<ul>Replace the player's killed event by a new scripted handler. None or an empty string will revert to the default killed event handler.</ul>
+
+<P><tt><B>leanleftheld</B></tt><BR>
+<ul>Returns 1 if this player is holding lean left key, or 0 if he is not</ul>
+
+<P><tt><B>leanrightheld</B></tt><BR>
+<ul>returns EV_RETURN if this player is holding lean right key, or 0 if he is not</ul>
+
+<P><tt><B>leave_team</B></tt><BR>
+<ul>Leave the current team</ul>
+
+<P><tt><B>listinventory</B></tt><BR>
+<ul>List of the player's inventory.</ul>
+
+<P><tt><B>logstats</B>( <i>Boolean state </i>)</tt><BR>
+<ul>Turn on/off the debugging playlog</ul>
+
+<P><tt><B>modheight</B>( <i>String height </i>)</tt><BR>
+<ul>change the maximum height of the player<BR>
+can specify 'stand', 'duck' or 'prone'.</ul>
+
+<P><tt><B>modheightfloat</B>( <i>Float height, Float max_z </i>)</tt><BR>
+<ul>Specify the view height of the player and the height of his bounding box.</ul>
+
+<P><tt><B>moveposflags</B>( <i>String position, [ String movement ] </i>)</tt><BR>
+<ul>used by the state files to tell the game dll what the player is doing</ul>
+
+<P><tt><B>moveSpeedScale</B></tt><BR>
+<ul>Gets the player's speed multiplier.</ul>
+
+<P><tt><B>moveSpeedScale</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the player's speed multiplier (default 1.0).</ul>
+
+<P><tt><B>nationalityprefix</B></tt><BR>
+<ul>get the three or five letter prefix that denotes the player's nationality</ul>
+
+<P><tt><B>netname</B></tt><BR>
+<ul>returns player's name</ul>
+
+<P><tt><B>nextpaintime</B>( <i>Float seconds </i>)</tt><BR>
+<ul>Set the next time the player experiences pain (Current time + seconds specified).</ul>
+
+<P><tt><B>noclip</B></tt><BR>
+<ul>Toggles the noclip cheat.</ul>
+
+<P><tt><B>notarget</B></tt><BR>
+<ul>Toggles the notarget cheat.</ul>
+
+<P><tt><B>notready</B></tt><BR>
+<ul>makes this player not ready for the round to start</ul>
+
+<P><tt><B>objective</B>( <i>Integer num_completed, Integer out_of </i>)</tt><BR>
+<ul>Sets the number of objectives completed and the total number of objectives</ul>
+
+<P><tt><B>pain</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>used to inflict pain to an entity</ul>
+
+<P><tt><B>perferredweapon</B>( <i>String weapon_name </i>)</tt><BR>
+<ul>Overrides your perferred weapon that is displayed in the stats screen.</ul>
+
+<P><tt><B>physics_off</B></tt><BR>
+<ul>turn player physics off.</ul>
+
+<P><tt><B>physics_on</B></tt><BR>
+<ul>turn player physics on.</ul>
+
+<P><tt><B>pickweapon</B></tt><BR>
+<ul>Pick your weapon.</ul>
+
+<P><tt><B>playlocalsound</B>( <i>String soundName, [ Boolean loop ], [ Float time ] </i>)</tt><BR>
+<ul>Plays a local sound to the player. The sound must be aliased globally. Requires sv_reborn to be set for stereo sounds.</ul>
+
+<P><tt><B>poweruptimer</B>( <i>Integer poweruptimer, Integer poweruptype </i>)</tt><BR>
+<ul>Sets the powerup timer and powerup type.</ul>
+
+<P><tt><B>primarydmweapon</B>( <i>String weaptype </i>)</tt><BR>
+<ul>Sets the player's primary DM weapon</ul>
+
+<P><tt><B>primaryfireheld</B></tt><BR>
+<ul>returns 1 if this player is holding the primary fire, or 0 if not</ul>
+
+<P><tt><B>ready</B></tt><BR>
+<ul>makes this player ready for the round to start</ul>
+
+<P><tt><B>ready</B></tt><BR>
+<ul>returns 1 if this player is ready,0 otherwise</ul>
+
+<P><tt><B>reload</B></tt><BR>
+<ul>Reloads the player's weapon</ul>
+
+<P><tt><B>removeclass</B>( <i>String classname, [ Integer except_entity_number ] </i>)</tt><BR>
+<ul>Removes all of the entities in the specified class.</ul>
+
+<P><tt><B>removeent</B>( <i>Integer entity_number </i>)</tt><BR>
+<ul>Removes the specified entity.</ul>
+
+<P><tt><B>resethaveitem</B>( <i>String weapon_name </i>)</tt><BR>
+<ul>Resets the game var that keeps track that we have gotten this weapon</ul>
+
+<P><tt><B>resetstate</B></tt><BR>
+<ul>Reset the player's state table.</ul>
+
+<P><tt><B>respawn</B></tt><BR>
+<ul>Respawns the player.</ul>
+
+<P><tt><B>runheld</B></tt><BR>
+<ul>returns 1 if this player is holding run key,or 0 if he is not</ul>
+
+<P><tt><B>safeholster</B>( <i>Boolean putaway </i>)</tt><BR>
+<ul>Holsters all wielded weapons, or unholsters previously put away weapons<BR>
+preserves state, so it will not holster or unholster unless necessary</ul>
+
+<P><tt><B>safezoom</B>( <i>Boolean zoomin </i>)</tt><BR>
+<ul>0 turns off zoom,and 1 returns zoom to previous setting</ul>
+
+<P><tt><B>score</B></tt><BR>
+<ul>Show the score for the current deathmatch game</ul>
+
+<P><tt><B>secfireheld</B></tt><BR>
+<ul>returns EV_RETURN if this player is holding secondary fire, or 0 if he is not</ul>
+
+<P><tt><B>secondaryfireheld</B></tt><BR>
+<ul>returns 1 if this player is holding the secondary fire, or 0 if not</ul>
+
+<P><tt><B>setanimspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>set the player's animation speed multiplier (default 1.0).</ul>
+
+<P><tt><B>setclientflag</B>( <i>String name </i>)</tt><BR>
+<ul>Calls a flag to the script client.</ul>
+
+<P><tt><B>setentshader</B>( <i>Entity entity, String shadername </i>)</tt><BR>
+<ul>Sets an entity shader for this player. An empty string will revert to the normal entity shader.</ul>
+
+<P><tt><B>setlocalsoundrate</B>( <i>String name, Float rate, [ Float time ] </i>)</tt><BR>
+<ul>Sets the local sound rate.</ul>
+
+<P><tt><B>setspeed</B>( <i>Float speed, [ Integer index ] </i>)</tt><BR>
+<ul>Sets the player's speed multiplier (default 1.0). Index specify which array value will be used (maximum 4).</ul>
+
+<P><tt><B>setteam</B>( <i>String team_name </i>)</tt><BR>
+<ul>sets the player's team without respawning.<BR>
+Available team names are 'none', 'spectator', 'freeforall', 'axis' and 'allies'.</ul>
+
+<P><tt><B>setvmaspeed</B>( <i>String name, Float speed </i>)</tt><BR>
+<ul>Sets the player's animation speed when playing it.</ul>
+
+<P><tt><B>show</B></tt><BR>
+<ul>show the entity,opposite of hide.</ul>
+
+<P><tt><B>showent</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Shows the specified entity to the player.</ul>
+
+<P><tt><B>skipcinematic</B></tt><BR>
+<ul>Skip the current cinematic</ul>
+
+<P><tt><B>spawn</B>( <i>String entityname, [ String keyname1 ], [ String value1 ], [ String keyname2 ], [ String value2 ], [ String keyname3 ], [ String value3 ], [ String keyname4 ], [ String value4 ] </i>)</tt><BR>
+<ul>Spawns an entity.</ul>
+
+<P><tt><B>spectator</B></tt><BR>
+<ul>Become a spectator</ul>
+
+<P><tt><B>startuseobject</B></tt><BR>
+<ul>starts up the useobject's animations.</ul>
+
+<P><tt><B>state</B></tt><BR>
+<ul>Dumps the player's state to the console.</ul>
+
+<P><tt><B>statefile</B></tt><BR>
+<ul>Gets the player's current state file.</ul>
+
+<P><tt><B>statefile</B>( <i>[ String statefile ] </i>)</tt><BR>
+<ul>Sets the player's current state file (setting NIL, NULL or an empty string will revert to the global statefile).</ul>
+
+<P><tt><B>stats</B></tt><BR>
+<ul>Display the MissionLog.</ul>
+
+<P><tt><B>stoplocalsound</B>( <i>String soundName, [ Float time ] </i>)</tt><BR>
+<ul>Stops the specified sound.</ul>
+
+<P><tt><B>stopwatch</B>( <i>Integer duration </i>)</tt><BR>
+<ul>Starts a stopwatch for a given duration... use 0 to clear the stopwatch</ul>
+
+<P><tt><B>stopwatchingactor</B>( <i>Entity actor_to_stop_watching </i>)</tt><BR>
+<ul>Makes the player's camera stop watching the specified actor.</ul>
+
+<P><tt><B>stufftext</B>( <i>String stuffstrings </i>)</tt><BR>
+<ul>Stuffs text to the player's console</ul>
+
+<P><tt><B>takepain</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Set whether or not to take pain</ul>
+
+<P><tt><B>tele</B>( <i>Vector location </i>)</tt><BR>
+<ul>Teleport to location</ul>
+
+<P><tt><B>testplayeranim</B>( <i>Float weight, [ String anim ] </i>)</tt><BR>
+<ul>Plays a test animation on the player</ul>
+
+<P><tt><B>testthread</B>( <i>String scriptfile, [ String label ] </i>)</tt><BR>
+<ul>Starts the named thread at label if provided.</ul>
+
+<P><tt><B>turn</B>( <i>Float yawangle </i>)</tt><BR>
+<ul>Causes player to turn the specified amount.</ul>
+
+<P><tt><B>turnlegs</B>( <i>Float yawangle </i>)</tt><BR>
+<ul>Turns the players legs instantly by the specified amount.</ul>
+
+<P><tt><B>turnupdate</B>( <i>Float yaw, Float timeleft </i>)</tt><BR>
+<ul>Causes player to turn the specified amount.</ul>
+
+<P><tt><B>turret</B></tt><BR>
+<ul>Returns the turret the player is using. NULL if player isn't using a turret.</ul>
+
+<P><tt><B>turretenter</B>( <i>Entity turret, [ String driver_anim ] </i>)</tt><BR>
+<ul>Called when someone gets into a turret.</ul>
+
+<P><tt><B>turretexit</B>( <i>Entity turret </i>)</tt><BR>
+<ul>Called when driver gets out of the turret.</ul>
+
+<P><tt><B>tweakladderpos</B></tt><BR>
+<ul>Tweaks the player's position on a ladder to be proper</ul>
+
+<P><tt><B>unattachfromladder</B></tt><BR>
+<ul>Unattaches the sentient from a ladder</ul>
+
+<P><tt><B>updatepoweruptime</B></tt><BR>
+<ul>Called once a second to decrement powerup time.</ul>
+
+<P><tt><B>useheld</B></tt><BR>
+<ul>returns 1 if this player is holding use,or 0 if he is not</ul>
+
+<P><tt><B>userinfo</B></tt><BR>
+<ul>returns userinfo string</ul>
+
+<P><tt><B>usestuff</B></tt><BR>
+<ul>Makes the player try to use whatever is in front of her.</ul>
+
+<P><tt><B>vehicle</B></tt><BR>
+<ul>Returns the vehicle the player is using. NULL if player isn't using a vehicle.</ul>
+
+<P><tt><B>viewangles</B></tt><BR>
+<ul>get the angles of the entity.</ul>
+
+<P><tt><B>viewangles</B>( <i>Vector newAngles </i>)</tt><BR>
+<ul>set the view angles of the entity to newAngles.</ul>
+
+<P><tt><B>viewmodelanim</B>( <i>String name, [ Integer force_restart ] </i>)</tt><BR>
+<ul>Sets the player's view model animation.</ul>
+
+<P><tt><B>viewmodelanimfinished</B></tt><BR>
+<ul>True if the player's current view model finished its animation.</ul>
+
+<P><tt><B>viewmodelanimvalid</B>( <i>String anim, [ Boolean fullanim ] </i>)</tt><BR>
+<ul>True if the view model animation is valid.</ul>
+
+<P><tt><B>viewmodelgetanim</B>( <i>[ Boolean fullanim ] </i>)</tt><BR>
+<ul>Gets the player's current view model animation.</ul>
+
+<P><tt><B>visiongetnaked</B></tt><BR>
+<ul>Gets the player's current naked-eye vision.</ul>
+
+<P><tt><B>visionsetblur</B>( <i>Float level, [ Float transition_time ] </i>)</tt><BR>
+<ul>Sets the player's blur level. Level is a fraction from 0-1</ul>
+
+<P><tt><B>visionsetnaked</B>( <i>String vision_name, [ Float transition_time ], [ Float phase ] </i>)</tt><BR>
+<ul>Sets the player's naked-eye vision. Optionally give a transition time from the current vision. If vision_name is an empty string, it will revert to the current global vision.</ul>
+
+<P><tt><B>voicetype</B>( <i>String voice_name </i>)</tt><BR>
+<ul>Sets the voice type to use the player.</ul>
+
+<P><tt><B>vote</B>( <i>String arg1 </i>)</tt><BR>
+<ul>Player votes either yes or no</ul>
+
+<P><tt><B>waitForState</B>( <i>String stateToWaitFor </i>)</tt><BR>
+<ul>When set, the player will clear waitforplayer when this state is hit<BR>
+in the legs or torso.</ul>
+
+<P><tt><B>watchactor</B>( <i>Entity actor_to_watch </i>)</tt><BR>
+<ul>Makes the player's camera watch the specified actor.</ul>
+
+<P><tt><B>weapdrop</B></tt><BR>
+<ul>Drops the player's current weapon.</ul>
+
+<P><tt><B>weapnext</B></tt><BR>
+<ul>Cycle to player's next weapon.</ul>
+
+<P><tt><B>weapprev</B></tt><BR>
+<ul>Cycle to player's previous weapon.</ul>
+
+<P><tt><B>whatis</B>( <i>Integer entity_number </i>)</tt><BR>
+<ul>Prints info on the specified entity.</ul>
+
+<P><tt><B>wuss</B></tt><BR>
+<ul>Gives player all weapons.</ul>
+
+<P><tt><B>zoomoff</B></tt><BR>
+<ul>makes sure that zoom is off</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerAlliedDeathmatchStart">PlayerAlliedDeathmatchStart (<i>info_player_allied</i>)</a> -> <a href="#PlayerDeathmatchStart">PlayerDeathmatchStart</a> -> <a href="#PlayerStart">PlayerStart</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerAxisDeathmatchStart">PlayerAxisDeathmatchStart (<i>info_player_axis</i>)</a> -> <a href="#PlayerDeathmatchStart">PlayerDeathmatchStart</a> -> <a href="#PlayerStart">PlayerStart</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerBot">PlayerBot</a> -> <a href="#Player">Player</a> -> <a href="#Sentient">Sentient</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>gotkill</B>( <i>Entity victim, Integer damage, Entity inflictor, Integer meansofdeath, Boolean gib </i>)</tt><BR>
+<ul>event sent to attacker when an entity dies</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>stufftext</B>( <i>String stuffstrings </i>)</tt><BR>
+<ul>Stuffs text to the player's console</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerDeathmatchStart">PlayerDeathmatchStart (<i>info_player_deathmatch</i>)</a> -> <a href="#PlayerStart">PlayerStart</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerIntermission">PlayerIntermission (<i>info_player_intermission</i>)</a> -> <a href="#Camera">Camera</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="PlayerStart">PlayerStart (<i>info_player_start</i>)</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>deletespawn</B></tt><BR>
+<ul>delete this spawnpoint when spawning from this spawnpoint</ul>
+
+<P><tt><B>disablespawn</B></tt><BR>
+<ul>forbids spawning from this spawnpoint</ul>
+
+<P><tt><B>enablespawn</B></tt><BR>
+<ul>allows spawning from this spawnpoint</ul>
+
+<P><tt><B>keepspawn</B></tt><BR>
+<ul>keep this spawnpoint when spawning from this spawnpoint</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PortableTurret">PortableTurret</a> -> <a href="#TurretGun">TurretGun</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>clipsize</B>( <i>Integer ammoClipSize </i>)</tt><BR>
+<ul>Set the amount of rounds a clip of the weapon holds</ul>
+
+<P><tt><B>item_droptofloor</B></tt><BR>
+<ul>Drops the item to the ground.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PortalCamera">PortalCamera (<i>portal_camera</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>roll</B>( <i>Float roll </i>)</tt><BR>
+<ul>Sets the portal camera's roll.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PortalSurface">PortalSurface (<i>portal_surface</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>locatecamera</B></tt><BR>
+<ul>Locates the camera position.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Projectile">Projectile</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>addownervelocity</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Set whether or not the owner's velocity is added to the projectile's velocity</ul>
+
+<P><tt><B>addvelocity</B>( <i>Float velocity_x, Float velocity_y, Float velocity_z </i>)</tt><BR>
+<ul>Set a velocity to be added to the projectile when it is created</ul>
+
+<P><tt><B>arctotarget</B></tt><BR>
+<ul>Make the projectile follow a normal arc on its way to its target</ul>
+
+<P><tt><B>avelocity</B>( <i>[ String [random|crandom] ], [ Float yaw ], [ String [random|crandom] ], [ Float pitch ], [ String [random|crandom] ], [ Float roll ] </i>)</tt><BR>
+<ul>set the angular velocity of the projectile</ul>
+
+<P><tt><B>beam</B>( <i>String command, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>send a command to the beam of this projectile</ul>
+
+<P><tt><B>becomebomb</B></tt><BR>
+<ul>Make the projectile into a bomb</ul>
+
+<P><tt><B>bouncesound</B></tt><BR>
+<ul>Set the name of the sound that is played when the projectile bounces</ul>
+
+<P><tt><B>bouncesound_hard</B></tt><BR>
+<ul>Set the name of the sound that is played when the projectile bounces off hard surfaces</ul>
+
+<P><tt><B>bouncesound_metal</B></tt><BR>
+<ul>Set the name of the sound that is played when the projectile bounces off metal</ul>
+
+<P><tt><B>bouncesound_water</B></tt><BR>
+<ul>Set the name of the sound that is played when the projectile bounces off water</ul>
+
+<P><tt><B>bouncetouch</B></tt><BR>
+<ul>Make the projectile bounce when it hits a non-damageable solid</ul>
+
+<P><tt><B>canhitowner</B></tt><BR>
+<ul>Make the projectile be able to hit its owner</ul>
+
+<P><tt><B>chargelife</B></tt><BR>
+<ul>set the projectile's life to be determined by the charge time</ul>
+
+<P><tt><B>chargespeed</B></tt><BR>
+<ul>set the projectile's speed to be determined by the charge time</ul>
+
+<P><tt><B>clearowner</B></tt><BR>
+<ul>Make the projectile be able to hit its owner now</ul>
+
+<P><tt><B>dieinwater</B></tt><BR>
+<ul>Make the projectile die when gets wet</ul>
+
+<P><tt><B>dlight</B>( <i>Float red, Float green, Float blue, Float intensity </i>)</tt><BR>
+<ul>set the color and intensity of the dynamic light on the projectile</ul>
+
+<P><tt><B>dmlife</B>( <i>Float projectileLife </i>)</tt><BR>
+<ul>set the life of the projectile in DM</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>drunk</B>( <i>Float amount, Float rate </i>)</tt><BR>
+<ul>Make the projectile drunk</ul>
+
+<P><tt><B>explode</B></tt><BR>
+<ul>Make the projectile explode</ul>
+
+<P><tt><B>explodeontouch</B></tt><BR>
+<ul>Make the projectile explode when it touches something damagable</ul>
+
+<P><tt><B>explosionmodel</B>( <i>String modelname </i>)</tt><BR>
+<ul>Set the modelname of the explosion to be spawned</ul>
+
+<P><tt><B>fuse</B>( <i>Integer fuse </i>)</tt><BR>
+<ul>set the projectile's life to be determined by the charge time</ul>
+
+<P><tt><B>heatseek</B></tt><BR>
+<ul>Make the projectile heat seek</ul>
+
+<P><tt><B>hitdamage</B>( <i>Float projectileHitDamage </i>)</tt><BR>
+<ul>set the damage a projectile does when it hits something</ul>
+
+<P><tt><B>impactmarkorientation</B>( <i>Float degrees </i>)</tt><BR>
+<ul>Set the orientation of the impact mark</ul>
+
+<P><tt><B>impactmarkradius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Set the radius of the impact mark</ul>
+
+<P><tt><B>impactmarkshader</B>( <i>String shader </i>)</tt><BR>
+<ul>Set the impact mark of the shader</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>knockback</B>( <i>Float projectileKnockback </i>)</tt><BR>
+<ul>set the knockback of the projectile when it hits something</ul>
+
+<P><tt><B>life</B>( <i>Float projectileLife </i>)</tt><BR>
+<ul>set the life of the projectile</ul>
+
+<P><tt><B>meansofdeath</B>( <i>String meansOfDeath </i>)</tt><BR>
+<ul>set the meansOfDeath of the projectile</ul>
+
+<P><tt><B>minlife</B>( <i>Float minProjectileLife </i>)</tt><BR>
+<ul>set the minimum life of the projectile (this is for charge up weapons)</ul>
+
+<P><tt><B>minspeed</B>( <i>Float minspeed </i>)</tt><BR>
+<ul>set the minimum speed of the projectile (this is for charge up weapons)</ul>
+
+<P><tt><B>notouchdamage</B></tt><BR>
+<ul>Makes the projectile not blow up or deal damage when it touches a damagable object</ul>
+
+<P><tt><B>prethink</B></tt><BR>
+<ul>Make the projectile think to update it's velocity</ul>
+
+<P><tt><B>removewhenstopped</B></tt><BR>
+<ul>Make the projectile get removed when it stops</ul>
+
+<P><tt><B>smashthroughglass</B>( <i>Integer speed </i>)</tt><BR>
+<ul>Makes the projectile smash through windows & other damageble glass objects when going above a set speed</ul>
+
+<P><tt><B>speed</B>( <i>Float projectileSpeed </i>)</tt><BR>
+<ul>set the speed of the projectile</ul>
+
+<P><tt><B>stopped</B></tt><BR>
+<ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
+
+<P><tt><B>updatebeam</B></tt><BR>
+<ul>Update the attached beam</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ProjectileGenerator">ProjectileGenerator (<i>ProjectileGenerator</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>Accuracy</B>( <i>Float Accuracy </i>)</tt><BR>
+<ul>Accuracy 0-25 feet<BR>
+Default=10</ul>
+
+<P><tt><B>BeginCycle</B></tt><BR>
+<ul>Startup the cycle..</ul>
+
+<P><tt><B>Cycles</B>( <i>Integer Cycles </i>)</tt><BR>
+<ul>Number of cycles. 0=infinte<BR>
+Default=0</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>EndCycle</B></tt><BR>
+<ul>End the cycle..</ul>
+
+<P><tt><B>FireOnStartUp</B></tt><BR>
+<ul>Default=1; Set this to 0 if you don't want the PG to fire on startup.</ul>
+
+<P><tt><B>gettargetentity</B></tt><BR>
+<ul>Returns entity being targeted by the projectile generator,</ul>
+
+<P><tt><B>ID</B>( <i>Integer ID </i>)</tt><BR>
+<ul>Sets the ID for this projectile generator<BR>
+Default=0:</ul>
+
+<P><tt><B>initialize</B></tt><BR>
+<ul>Initialize object</ul>
+
+<P><tt><B>isturnedon</B></tt><BR>
+<ul>Returns whether the generator is on or off.</ul>
+
+<P><tt><B>launchsound</B>( <i>String Sound </i>)</tt><BR>
+<ul>Set a launch sound for the projectile.</ul>
+
+<P><tt><B>MaxDelay</B>( <i>Float MaxDelay </i>)</tt><BR>
+<ul>Maximum time between bursts<BR>
+Default=10</ul>
+
+<P><tt><B>MaxDuration</B>( <i>Float MaxDuration </i>)</tt><BR>
+<ul>Sets the maximum duration of bursts(in seconds)<BR>
+Default=3</ul>
+
+<P><tt><B>MaxNumShots</B>( <i>Integer MaxNumShots </i>)</tt><BR>
+<ul>Sets the maximum # of shots to fire in a cycle<BR>
+Default=1</ul>
+
+<P><tt><B>MinDelay</B>( <i>Float MinDelay </i>)</tt><BR>
+<ul>Minimum time between bursts.<BR>
+</ul>
+
+<P><tt><B>MinDuration</B>( <i>Float MinDuration </i>)</tt><BR>
+<ul>Sets the minimum duration of the bursts (in seconds)<BR>
+Default=3</ul>
+
+<P><tt><B>MinNumShots</B>( <i>Integer MinNumShots </i>)</tt><BR>
+<ul>Sets the minimum # of shots to fire in a cycle<BR>
+Default=1</ul>
+
+<P><tt><B>Model</B>( <i>String Model </i>)</tt><BR>
+<ul>Projectile model to use.<BR>
+Default=models/projectiles/bazookashell.tik</ul>
+
+<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
+<ul>target another entity with targetname_to_target.</ul>
+
+<P><tt><B>TickCycle</B></tt><BR>
+<ul>Tick the cycle..</ul>
+
+<P><tt><B>TurnOff</B></tt><BR>
+<ul>Turn Off and cancel the current cycle (if any)</ul>
+
+<P><tt><B>TurnOn</B></tt><BR>
+<ul>Turn On and begin the first cycle</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ProjectileGenerator_Gun">ProjectileGenerator_Gun (<i>ProjectileGenerator_Gun</i>)</a> -> <a href="#ProjectileGenerator">ProjectileGenerator</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>bulletcount</B>( <i>Float bulletCount </i>)</tt><BR>
+<ul>Set the number of bullets this weapon shoots when fired</ul>
+
+<P><tt><B>bulletdamage</B>( <i>Float bulletDamage </i>)</tt><BR>
+<ul>Set the damage that the bullet causes</ul>
+
+<P><tt><B>bulletknockback</B>( <i>Float bulletKnockback </i>)</tt><BR>
+<ul>Set the knockback that the bullet causes</ul>
+
+<P><tt><B>bulletlarge</B>( <i>Integer bulletType </i>)</tt><BR>
+<ul>Set if the bullets fired are rifle bullets(1), artillery(2) or larger tracers(3)</ul>
+
+<P><tt><B>bulletrange</B>( <i>Float bulletRange </i>)</tt><BR>
+<ul>Set the range of the bullets</ul>
+
+<P><tt><B>bulletspread</B>( <i>Float bulletSpreadX, Float bulletSpreadY, [ Float bulletSpreadXmax ], [ Float bulletSpreadYmax ] </i>)</tt><BR>
+<ul>Set the min & optional max spread of the bullet in the x and y axis</ul>
+
+<P><tt><B>fakebullets</B>( <i>Boolean useFakeBullets </i>)</tt><BR>
+<ul>Whether or not the projectile generator should fire real bullets.</ul>
+
+<P><tt><B>firedelay</B>( <i>Float fFireDelay </i>)</tt><BR>
+<ul>Set the minimum time between shots from the weapon</ul>
+
+<P><tt><B>ID</B>( <i>Integer ID </i>)</tt><BR>
+<ul>Sets the ID for this projectile generator<BR>
+Default=0:</ul>
+
+<P><tt><B>meansofdeath</B>( <i>String meansOfDeath </i>)</tt><BR>
+<ul>Set the meansOfDeath of the weapon.</ul>
+
+<P><tt><B>throughmetal</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through metal</ul>
+
+<P><tt><B>throughwood</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through wood</ul>
+
+<P><tt><B>tracerfrequency</B>( <i>Float frequenct </i>)</tt><BR>
+<ul>Set the frequency of making tracers</ul>
+
+<P><tt><B>tracerspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Scale factor of how fast a tracer should travel (valid ranges 0-2)</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ProjectileGenerator_Heavy">ProjectileGenerator_Heavy (<i>ProjectileGenerator_Heavy</i>)</a> -> <a href="#ProjectileGenerator">ProjectileGenerator</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>projectile</B>( <i>String projectileModel </i>)</tt><BR>
+<ul>Set the model of the projectile that this weapon fires</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ProjectileGenerator_Projectile">ProjectileGenerator_Projectile (<i>ProjectileGenerator_Projectile</i>)</a> -> <a href="#ProjectileGenerator">ProjectileGenerator</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>arc</B>( <i>Float arc </i>)</tt><BR>
+<ul>arc in front of the player</ul>
+
+<P><tt><B>isdonut</B>( <i>Integer isdonut </i>)</tt><BR>
+<ul>will target donut</ul>
+
+<P><tt><B>maxdonut</B>( <i>Float maxdonut </i>)</tt><BR>
+<ul>max extent of donut from player</ul>
+
+<P><tt><B>mindonut</B>( <i>Float mindonut </i>)</tt><BR>
+<ul>min extent of donut from player</ul>
+
+<P><tt><B>playpreimpact</B></tt><BR>
+<ul>Play a pre-impact sound</ul>
+
+<P><tt><B>preimpactsound</B>( <i>String Sound </i>)</tt><BR>
+<ul>Set a pre-impact sound.</ul>
+
+<P><tt><B>preimpactsoundprob</B>( <i>Float probability </i>)</tt><BR>
+<ul>Set the chance for a pre-impact sound to occur.<BR>
+Range: ( 0.0, 1.0 ), with 0 having no chance, and 1 always occurring.</ul>
+
+<P><tt><B>preimpactsoundtime</B>( <i>Float delay </i>)</tt><BR>
+<ul>Set the time before impact to play the preimpact sound.</ul>
+
+<P><tt><B>projectile</B>( <i>String projectileModel </i>)</tt><BR>
+<ul>Set the model of the projectile that this weapon fires</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ProjectileTarget">ProjectileTarget (<i>ProjectileGenerator_Target</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>ID</B>( <i>Integer ID </i>)</tt><BR>
+<ul>Sets the ID for this projectile generator<BR>
+Default=0:</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PuffDaddy">PuffDaddy (<i>plant_puffdaddy</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>idle</B></tt><BR>
+<ul>Animates the puff daddy.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="PushObject">PushObject (<i>func_pushobject</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Set the damage.</ul>
+
+<P><tt><B>doBlocked</B>( <i>Entity obstacle </i>)</tt><BR>
+<ul>sent to entity when blocked.</ul>
+
+<P><tt><B>pushsound</B>( <i>String sound </i>)</tt><BR>
+<ul>Set the pushing sound</ul>
+
+<P><tt><B>start</B></tt><BR>
+<ul>Sets up the pushobject.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Rain">Rain (<i>func_rain</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="RandomSpawn">RandomSpawn (<i>func_randomspawn</i>)</a> -> <a href="#Spawn">Spawn</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>max_time</B>( <i>Float maxTime </i>)</tt><BR>
+<ul>Maximum time between random spawns.</ul>
+
+<P><tt><B>min_time</B>( <i>Float minTime </i>)</tt><BR>
+<ul>Minimum time between random spawns.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="RandomSpeaker">RandomSpeaker (<i>sound_randomspeaker</i>)</a> -> <a href="#TriggerSpeaker">TriggerSpeaker</a> -> <a href="#TriggerPlaySound">TriggerPlaySound</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>chance</B>( <i>Float newChance<0.00...1.00> </i>)</tt><BR>
+<ul>Sets the chance that the sound will play when triggered.</ul>
+
+<P><tt><B>maxdelay</B>( <i>Float max_delay </i>)</tt><BR>
+<ul>Sets the maximum time between playings.</ul>
+
+<P><tt><B>mindelay</B>( <i>Float min_delay </i>)</tt><BR>
+<ul>Sets the minimum time between playings.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ReSpawn">ReSpawn (<i>func_respawn</i>)</a> -> <a href="#Spawn">Spawn</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="RotatingDoor">RotatingDoor (<i>func_rotatingdoor</i>)</a> -> <a href="#Door">Door</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doclose</B></tt><BR>
+<ul>Closes the door (special doors).</ul>
+
+<P><tt><B>doopen</B>( <i>Entity other </i>)</tt><BR>
+<ul>Opens the door (special doors).</ul>
+
+<P><tt><B>openangle</B>( <i>Float open_angle </i>)</tt><BR>
+<ul>Sets the open angle of the door.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="RunThrough">RunThrough (<i>func_runthrough</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>chance</B>( <i>Float chance </i>)</tt><BR>
+<ul>chance that trigger will spawn something.</ul>
+
+<P><tt><B>delay</B>( <i>Float delay </i>)</tt><BR>
+<ul>time between RunThrough being activated.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>lip</B>( <i>Float lip </i>)</tt><BR>
+<ul>distance below trigger we should spawn things.</ul>
+
+<P><tt><B>offset</B>( <i>Vector spawn_offset </i>)</tt><BR>
+<ul>When triggered, what to offset the spawned object by.</ul>
+
+<P><tt><B>spawnmodel</B>( <i>String model_to_spawn </i>)</tt><BR>
+<ul>When triggered, what to spawn.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>threshold speed at which RunThrough is activated.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Script">Script</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptAimedStrafingGunfire">ScriptAimedStrafingGunfire (<i>script_aimedstrafinggunfire</i>)</a> -> <a href="#ScriptSimpleStrafingGunfire">ScriptSimpleStrafingGunfire</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>aimtarget</B></tt><BR>
+<ul>Set the aim target.</ul>
+
+<P><tt><B>fire</B></tt><BR>
+<ul>Fire.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptClass">ScriptClass</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptDoor">ScriptDoor (<i>script_door</i>)</a> -> <a href="#Door">Door</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>closethread</B>( <i>String closethread </i>)</tt><BR>
+<ul>Set the thread to run when the door is closed (required).</ul>
+
+<P><tt><B>doclose</B></tt><BR>
+<ul>Closes the door (special doors).</ul>
+
+<P><tt><B>doinit</B></tt><BR>
+<ul>Sets up the script door.</ul>
+
+<P><tt><B>doopen</B>( <i>Entity other </i>)</tt><BR>
+<ul>Opens the door (special doors).</ul>
+
+<P><tt><B>initthread</B>( <i>String initthread </i>)</tt><BR>
+<ul>Set the thread to run when the door is initialized (optional).</ul>
+
+<P><tt><B>openthread</B>( <i>String openthread </i>)</tt><BR>
+<ul>Set the thread to run when the door is opened (required).</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptEvent">ScriptEvent</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptMaster">ScriptMaster</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>alias</B>( <i>String alias_name, String real_name, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ] </i>)</tt><BR>
+<ul>Sets up an alias.</ul>
+
+<P><tt><B>aliascache</B>( <i>String alias_name, String real_name, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ] </i>)</tt><BR>
+<ul>Sets up an alias and caches the resourse.</ul>
+
+<P><tt><B>cache</B>( <i>String resourceName </i>)</tt><BR>
+<ul>pre-cache the given resource.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptModel">ScriptModel (<i>script_model</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>anim</B>( <i>String anim_name </i>)</tt><BR>
+<ul>Sets the script model's animation</ul>
+
+<P><tt><B>animdone</B></tt><BR>
+<ul>Script model animation has finished.</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>moveanim</B>( <i>String animName </i>)</tt><BR>
+<ul>Makes the script model play an animation and move with the deltas contained in the animation</ul>
+
+<P><tt><B>moving_from_anim</B></tt><BR>
+<ul>The script model is moving based on an animation</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptModelRealDamage">ScriptModelRealDamage (<i>script_model_realdamage</i>)</a> -> <a href="#ScriptModel">ScriptModel</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptOrigin">ScriptOrigin (<i>script_origin</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptSimpleStrafingGunfire">ScriptSimpleStrafingGunfire (<i>script_simplestrafinggunfire</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>bulletcount</B>( <i>Float bulletCount </i>)</tt><BR>
+<ul>Set the number of bullets this weapon shoots when fired</ul>
+
+<P><tt><B>bulletdamage</B>( <i>Float bulletDamage </i>)</tt><BR>
+<ul>Set the damage that the bullet causes</ul>
+
+<P><tt><B>bulletknockback</B>( <i>Float bulletKnockback </i>)</tt><BR>
+<ul>Set the knockback that the bullet causes</ul>
+
+<P><tt><B>bulletrange</B>( <i>Float bulletRange </i>)</tt><BR>
+<ul>Set the range of the bullets</ul>
+
+<P><tt><B>bulletspread</B>( <i>Float bulletSpreadX, Float bulletSpreadY, [ Float bulletSpreadXmax ], [ Float bulletSpreadYmax ] </i>)</tt><BR>
+<ul>Set the min & optional max spread of the bullet in the x and y axis</ul>
+
+<P><tt><B>fire</B></tt><BR>
+<ul>Fire.</ul>
+
+<P><tt><B>firedelay</B>( <i>Float fFireDelay </i>)</tt><BR>
+<ul>Set the minimum time between shots from the weapon</ul>
+
+<P><tt><B>off</B></tt><BR>
+<ul>Turn the gunfire off.</ul>
+
+<P><tt><B>on</B></tt><BR>
+<ul>Turn the gunfire on.</ul>
+
+<P><tt><B>projectile</B></tt><BR>
+<ul>Set the projectile model</ul>
+
+<P><tt><B>throughmetal</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through metal</ul>
+
+<P><tt><B>throughwood</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through wood</ul>
+
+<P><tt><B>tracerfreq</B></tt><BR>
+<ul>Set the frequency of the tracers</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptSkyOrigin">ScriptSkyOrigin (<i>script_skyorigin</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptSlave">ScriptSlave (<i>script_object</i>)</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>angles</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Sets the angles.</ul>
+
+<P><tt><B>bind</B>( <i>Entity parent, [ Boolean bind_child ] </i>)</tt><BR>
+<ul>bind this entity to the specified entity.</ul>
+
+<P><tt><B>closeportal</B></tt><BR>
+<ul>Close the area portal enclosed in this object</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>dmg</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Set the damage.</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doBlocked</B>( <i>Entity obstacle </i>)</tt><BR>
+<ul>sent to entity when blocked.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>endpath</B></tt><BR>
+<ul>Stop following the path</ul>
+
+<P><tt><B>explode</B>( <i>Float damage </i>)</tt><BR>
+<ul>Creates an explosion at the script slave's position</ul>
+
+<P><tt><B>flypath</B>( <i>Entity array, Float speed, Float acceleration, Float look_ahead </i>)</tt><BR>
+<ul>Makes the script slave fly the specified path with speed and acceleration until reached_distance close to position</ul>
+
+<P><tt><B>followpath</B>( <i>Entity path, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>Makes the script slave follow the specified path.  The allowable arguments are ignoreangles,<BR>
+ignorevelocity, normalangles, loop, and a number specifying the start time.</ul>
+
+<P><tt><B>jumpto</B>( <i>String vector_or_entity </i>)</tt><BR>
+<ul>Jump to specified vector or entity.</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>modifyflypath</B>( <i>Entity array, Float speed, Float acceleration, Float look_ahead </i>)</tt><BR>
+<ul>Makes the script slave fly the specified path with speed and acceleration until reached_distance close to position</ul>
+
+<P><tt><B>move</B></tt><BR>
+<ul>Move the script slave.</ul>
+
+<P><tt><B>moveBackward</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position backward.</ul>
+
+<P><tt><B>moveDown</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position down.</ul>
+
+<P><tt><B>moveEast</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position east.</ul>
+
+<P><tt><B>moveForward</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position forward.</ul>
+
+<P><tt><B>moveLeft</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position left.</ul>
+
+<P><tt><B>moveNorth</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position north.</ul>
+
+<P><tt><B>moveRight</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position right.</ul>
+
+<P><tt><B>moveSouth</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position south.</ul>
+
+<P><tt><B>moveto</B>( <i>String vector_or_entity </i>)</tt><BR>
+<ul>Move to the specified vector or entity.</ul>
+
+<P><tt><B>moveUp</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position up.</ul>
+
+<P><tt><B>moveWest</B>( <i>Float dist </i>)</tt><BR>
+<ul>Move the position west.</ul>
+
+<P><tt><B>next</B></tt><BR>
+<ul>Goto the next waypoint.</ul>
+
+<P><tt><B>normalangles</B>( <i>Boolean bUseNormalAngles </i>)</tt><BR>
+<ul>Sets the object to use normal angles when travelling on a spline path</ul>
+
+<P><tt><B>notshootable</B></tt><BR>
+<ul>Makes the script slave not shootable</ul>
+
+<P><tt><B>openportal</B></tt><BR>
+<ul>Open the area portal enclosed in this object</ul>
+
+<P><tt><B>path_relativeyaw</B>( <i>Float relativeYaw </i>)</tt><BR>
+<ul>Makes the script slave follow the specified path with a yaw offset,</ul>
+
+<P><tt><B>physics_off</B></tt><BR>
+<ul>Turn physics off this script object on</ul>
+
+<P><tt><B>physics_on</B>( <i>[ Integer no_collide_entity ] </i>)</tt><BR>
+<ul>Turn physics on this script object on<BR>
+If no_collide_entity is set to 1 then the script slave will not collide with other entities</ul>
+
+<P><tt><B>physics_velocity</B>( <i>Vector impulseVector </i>)</tt><BR>
+<ul>Add a physical impulse to an object when it is being physically simulated</ul>
+
+<P><tt><B>rotateaxis</B>( <i>Integer axis, Float avelocity </i>)</tt><BR>
+<ul>Rotate about the specified axis at the specified angular velocity.</ul>
+
+<P><tt><B>rotateaxisdown</B>( <i>Integer axis, Float angle </i>)</tt><BR>
+<ul>Rotate the specified axis down by the specified amount.</ul>
+
+<P><tt><B>rotateaxisdownto</B>( <i>Integer axis, Float angle </i>)</tt><BR>
+<ul>Rotate the specified axis down to angle.</ul>
+
+<P><tt><B>rotateaxisup</B>( <i>Integer axis, Float angle </i>)</tt><BR>
+<ul>Rotate the specified axis up by the specified amount.</ul>
+
+<P><tt><B>rotateaxisupto</B>( <i>Integer axis, Float angle </i>)</tt><BR>
+<ul>Rotate the specified axis up to angle.</ul>
+
+<P><tt><B>rotatedownto</B>( <i>Vector direction </i>)</tt><BR>
+<ul>Rotate down to the specified direction.</ul>
+
+<P><tt><B>rotateto</B>( <i>Vector direction </i>)</tt><BR>
+<ul>Rotate to the specified direction.</ul>
+
+<P><tt><B>rotateupto</B>( <i>Vector direction </i>)</tt><BR>
+<ul>Rotate up to the specified direction.</ul>
+
+<P><tt><B>rotateX</B>( <i>Float avelocity </i>)</tt><BR>
+<ul>Rotate about the x axis at the specified angular velocity.</ul>
+
+<P><tt><B>rotateXdown</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the x down by the specified amount.</ul>
+
+<P><tt><B>rotateXdownto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the x down to angle.</ul>
+
+<P><tt><B>rotateXup</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the x up by the specified amount.</ul>
+
+<P><tt><B>rotateXupto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the x up to angle.</ul>
+
+<P><tt><B>rotateY</B>( <i>Float avelocity </i>)</tt><BR>
+<ul>Rotate about the y axis at the specified angular velocity.</ul>
+
+<P><tt><B>rotateYdown</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the y down by the specified amount.</ul>
+
+<P><tt><B>rotateYdownto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the y down to angle.</ul>
+
+<P><tt><B>rotateYup</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the y up by the specified amount.</ul>
+
+<P><tt><B>rotateYupto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the y up to angle.</ul>
+
+<P><tt><B>rotateZ</B>( <i>Float avelocity </i>)</tt><BR>
+<ul>Rotate about the z axis at the specified angular velocity.</ul>
+
+<P><tt><B>rotateZdown</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the z down by the specified amount.</ul>
+
+<P><tt><B>rotateZdownto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the z down to angle.</ul>
+
+<P><tt><B>rotateZup</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the z up by the specified amount.</ul>
+
+<P><tt><B>rotateZupto</B>( <i>Float angle </i>)</tt><BR>
+<ul>Rotate the z up to angle.</ul>
+
+<P><tt><B>scriptslave_followingpath</B></tt><BR>
+<ul>Called every frame to actually follow the path</ul>
+
+<P><tt><B>scriptslave_movedone</B></tt><BR>
+<ul>Called when the script slave is doen moving</ul>
+
+<P><tt><B>setdamage</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Set the damage.</ul>
+
+<P><tt><B>setmeansofdeath</B>( <i>String means_of_death </i>)</tt><BR>
+<ul>Set the damage means of death.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the speed.</ul>
+
+<P><tt><B>time</B>( <i>Float travel_time </i>)</tt><BR>
+<ul>Sets the travel time.</ul>
+
+<P><tt><B>trigger</B>( <i>Entity ent </i>)</tt><BR>
+<ul>Trigger entities target.</ul>
+
+<P><tt><B>unbind</B></tt><BR>
+<ul>unbind this entity.</ul>
+
+<P><tt><B>waitmove</B></tt><BR>
+<ul>Move the script slave and wait until finished.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptThread">ScriptThread</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>abs</B>( <i>Float arg </i>)</tt><BR>
+<ul>Absolute value of int or float</ul>
+
+<P><tt><B>acos</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute arc cosine</ul>
+
+<P><tt><B>addobjective</B>( <i>Integer objective_number, Integer status, String text, Vector location </i>)</tt><BR>
+<ul>Adds/Changes an Objective</ul>
+
+<P><tt><B>aliascache</B>( <i>String alias, String realPath, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>Create an alias to the specified path and cache the resource</ul>
+
+<P><tt><B>all_ai_off</B></tt><BR>
+<ul>Turns all AI off.</ul>
+
+<P><tt><B>all_ai_on</B></tt><BR>
+<ul>Turns all AI on.</ul>
+
+<P><tt><B>angles_pointat</B>( <i>Entity parent_entity, Entity entity, Entity target_entity </i>)</tt><BR>
+<ul>Returns the angles that points at the target_entity given the base orientation of the parent_entity and the position of the entity.</ul>
+
+<P><tt><B>angles_toforward</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Returns the forward vector of the specified angles</ul>
+
+<P><tt><B>angles_toleft</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Returns the left vector of the specified angles</ul>
+
+<P><tt><B>angles_toup</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Returns the up vector of the specified angles</ul>
+
+<P><tt><B>asin</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute arc sine</ul>
+
+<P><tt><B>assert</B>( <i>Float value </i>)</tt><BR>
+<ul>Assert if value is 0.</ul>
+
+<P><tt><B>atan</B>( <i>Float arg, [ Float arg2 ] </i>)</tt><BR>
+<ul>ArcTangent of float (in degrees not radians)</ul>
+
+<P><tt><B>atan2</B>( <i>Float x, Float y </i>)</tt><BR>
+<ul>Compute arc tangent with two parameters</ul>
+
+<P><tt><B>bool</B>( <i>Integer value </i>)</tt><BR>
+<ul>Casts value to a bool.</ul>
+
+<P><tt><B>bsptransition</B>( <i>String next_map </i>)</tt><BR>
+<ul>Transitions to the next BSP. Keeps player data,and game data.</ul>
+
+<P><tt><B>cache</B>( <i>String resource_name </i>)</tt><BR>
+<ul>Cache the specified resource.</ul>
+
+<P><tt><B>cam</B>( <i>String command, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>Processes a camera command.</ul>
+
+<P><tt><B>canswitchteams</B>( <i>Boolean allow_team_change, [ Boolean allow_spectator ] </i>)</tt><BR>
+<ul>Specify if players are allowed to switch teams and spectate. Override player's canswitchteams.</ul>
+
+<P><tt><B>ceil</B>( <i>Float x </i>)</tt><BR>
+<ul>Round up value</ul>
+
+<P><tt><B>centerprint</B>( <i>String stuffToPrint </i>)</tt><BR>
+<ul>prints the included message in the middle of all player's screens</ul>
+
+<P><tt><B>chartoint</B>( <i>String character </i>)</tt><BR>
+<ul>Converts char to int</ul>
+
+<P><tt><B>cinematic</B></tt><BR>
+<ul>Turns on cinematic.</ul>
+
+<P><tt><B>clearfade</B></tt><BR>
+<ul>Clear the fade from the screen</ul>
+
+<P><tt><B>clearletterbox</B>( <i>Float time </i>)</tt><BR>
+<ul>Clears letterbox mode.</ul>
+
+<P><tt><B>clear_objective_pos</B></tt><BR>
+<ul>Clears the position of the current objective,for when you don't have one</ul>
+
+<P><tt><B>conprintf</B>( <i>String text </i>)</tt><BR>
+<ul>Prints to console</ul>
+
+<P><tt><B>cos</B>( <i>Float arg </i>)</tt><BR>
+<ul>Cosine of float (expects degrees not radians)</ul>
+
+<P><tt><B>cosh</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute hyperbolic cosine</ul>
+
+<P><tt><B>CreateListener</B></tt><BR>
+<ul>Creates a Listener instance.</ul>
+
+<P><tt><B>cuecamera</B>( <i>Entity entity, [ Float switchTime ] </i>)</tt><BR>
+<ul>Cue the camera. If switchTime is specified, then the camera<BR>
+will switch over that length of time.</ul>
+
+<P><tt><B>cueplayer</B>( <i>[ Float switchTime ] </i>)</tt><BR>
+<ul>Go back to the normal camera. If switchTime is specified,<BR>
+then the camera will switch over that length of time.</ul>
+
+<P><tt><B>debugline</B>( <i>Vector start, Vector end, [ Float red ], [ Float green ], [ Float blue ], [ Float alpha ] </i>)</tt><BR>
+<ul>Draws a debug line from start to end using the given color and alpha for g_numdebuglinedelays server frames</ul>
+
+<P><tt><B>debug_int3</B></tt><BR>
+<ul>Generate an asm int 3</ul>
+
+<P><tt><B>delaythrow</B>( <i>String label </i>)</tt><BR>
+<ul>Internal usage.</ul>
+
+<P><tt><B>dprintln</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a debug string.followed by a newline.</ul>
+
+<P><tt><B>drawhud</B>( <i>Integer value </i>)</tt><BR>
+<ul>Specify if hud is to be drawn</ul>
+
+<P><tt><B>earthquake</B>( <i>Float duration, Float magnitude, Float no_rampup, Float no_rampdown </i>)</tt><BR>
+<ul>Create an earthquake</ul>
+
+<P><tt><B>earthquake2</B>( <i>Float duration, Float magnitude, Boolean no_rampup, Boolean no_rampdown, [ Vector location ], [ Float radius ] </i>)</tt><BR>
+<ul>Create a smooth realistic earthquake. Requires sv_reborn to be set.</ul>
+
+<P><tt><B>end</B></tt><BR>
+<ul>Ends the script</ul>
+
+<P><tt><B>entity</B>( <i>Integer value </i>)</tt><BR>
+<ul>Casts value to an entity.</ul>
+
+<P><tt><B>error</B></tt><BR>
+<ul>Ends the script</ul>
+
+<P><tt><B>exec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script.</ul>
+
+<P><tt><B>exec</B>( <i>String script </i>)</tt><BR>
+<ul>Executes the specified script.</ul>
+
+<P><tt><B>exp</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute exponential function</ul>
+
+<P><tt><B>fadein</B>( <i>Float time, Float red, Float green, Float blue, Float alpha, [ Integer mode ] </i>)</tt><BR>
+<ul>Sets up fadein in values.</ul>
+
+<P><tt><B>fadeout</B>( <i>Float time, Float red, Float green, Float blue, Float alpha, [ Integer mode ] </i>)</tt><BR>
+<ul>Sets up fadeout values.</ul>
+
+<P><tt><B>fadesound</B>( <i>Float time, [ Float min_vol ], [ Entity player ] </i>)</tt><BR>
+<ul>Fades the sound out over the given time, optionally to one single player.<BR>
+min_vol being a 0-1 fraction is the minimum volume.</ul>
+
+<P><tt><B>fclose</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Closes file of given file handle</ul>
+
+<P><tt><B>fcopy</B>( <i>String filename, String copyfilename </i>)</tt><BR>
+<ul>Copies the file</ul>
+
+<P><tt><B>feof</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Checks for end of file</ul>
+
+<P><tt><B>ferror</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Checks for last file i/o error</ul>
+
+<P><tt><B>fexists</B>( <i>String filename </i>)</tt><BR>
+<ul>Checks if file exists</ul>
+
+<P><tt><B>fflush</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Flushes given stream. Writes all unsaved data from stream buffer to stream</ul>
+
+<P><tt><B>fgetc</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Reads single character from file</ul>
+
+<P><tt><B>fgets</B>( <i>Integer filehandle, Integer maxbuffsize </i>)</tt><BR>
+<ul>Reads string line from file</ul>
+
+<P><tt><B>flag_clear</B>( <i>String name </i>)</tt><BR>
+<ul>Clears and deletes a flag.</ul>
+
+<P><tt><B>flag_init</B>( <i>String name </i>)</tt><BR>
+<ul>Initializes a flag so it can be set. Flags MUST be initialized before they can be used for the first time.</ul>
+
+<P><tt><B>flag_set</B>( <i>String name </i>)</tt><BR>
+<ul>Sets a flag which alerts all flag_wait()'s and changes are reflected in flag() checks thereafter.</ul>
+
+<P><tt><B>flag_wait</B>( <i>String name </i>)</tt><BR>
+<ul>Pauses execution flow until a flag has been set.</ul>
+
+<P><tt><B>flist</B>( <i>String path, String extension, Integer wantSubs </i>)</tt><BR>
+<ul>Returns the list of files with given extension</ul>
+
+<P><tt><B>float</B>( <i>Integer value </i>)</tt><BR>
+<ul>Casts value to a float.</ul>
+
+<P><tt><B>floor</B>( <i>Float x </i>)</tt><BR>
+<ul>Round down value</ul>
+
+<P><tt><B>fmod</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute remainder of division</ul>
+
+<P><tt><B>fnewdir</B>( <i>String path </i>)</tt><BR>
+<ul>Creates a new directory</ul>
+
+<P><tt><B>fopen</B>( <i>String filename, String accesstype </i>)</tt><BR>
+<ul>Opens file,returning it's handle</ul>
+
+<P><tt><B>forcemusic</B>( <i>String current, [ String fallback ] </i>)</tt><BR>
+<ul>Forces the current and fallback (optional) music moods.</ul>
+
+<P><tt><B>fputc</B>( <i>Integer filehandle, Integer character </i>)</tt><BR>
+<ul>Writes single character to file</ul>
+
+<P><tt><B>fputs</B>( <i>Integer filehandle, String text </i>)</tt><BR>
+<ul>Writes string line to file</ul>
+
+<P><tt><B>fread</B>( <i>Entity player, Integer index, Integer virtual </i>)</tt><BR>
+<ul>Reads binary buffer from file</ul>
+
+<P><tt><B>freadall</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Reads whole file and returns it as string</ul>
+
+<P><tt><B>freezeplayer</B></tt><BR>
+<ul>Freeze the player.</ul>
+
+<P><tt><B>fremove</B>( <i>String filename </i>)</tt><BR>
+<ul>Removes the file</ul>
+
+<P><tt><B>fremovedir</B>( <i>String path </i>)</tt><BR>
+<ul>Removes a directory</ul>
+
+<P><tt><B>frename</B>( <i>String oldfilename, String newfilename </i>)</tt><BR>
+<ul>Renames the file</ul>
+
+<P><tt><B>frewind</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Rewinds file carret to files beginning</ul>
+
+<P><tt><B>frexp</B>( <i>Float x </i>)</tt><BR>
+<ul>Get significand and exponent</ul>
+
+<P><tt><B>fsaveall</B>( <i>Integer filehandle, String text </i>)</tt><BR>
+<ul>Saves whole text to file</ul>
+
+<P><tt><B>fseek</B>( <i>Integer filehandle, Integer offset, Integer startpos </i>)</tt><BR>
+<ul>Sets file carret at given position</ul>
+
+<P><tt><B>ftell</B>( <i>Integer filehandle </i>)</tt><BR>
+<ul>Gets current file carret position</ul>
+
+<P><tt><B>fwrite</B>( <i>Entity player, Integer index, Integer virtual </i>)</tt><BR>
+<ul>Writes binary buffer to file</ul>
+
+<P><tt><B>getareaentities</B>( <i>Vector origin, Vector mins, Vector maxs </i>)</tt><BR>
+<ul>Get all entities around the origin</ul>
+
+<P><tt><B>getarraykeys</B>( <i>String array </i>)</tt><BR>
+<ul>Retrieves a full list containing the name of arrays</ul>
+
+<P><tt><B>getarrayvalues</B>( <i>String array </i>)</tt><BR>
+<ul>Retrieves the full list of an array that was set-up with name, such as local.array[ "name" ] and return their values</ul>
+
+<P><tt><B>getboundkey1</B>( <i>String keyname </i>)</tt><BR>
+<ul>return a string describing the key</ul>
+
+<P><tt><B>getboundkey2</B>( <i>String keyname </i>)</tt><BR>
+<ul>return a string describing the key</ul>
+
+<P><tt><B>getclientnum</B>( <i>Entity player </i>)</tt><BR>
+<ul>Gets player's client number</ul>
+
+<P><tt><B>getcvar</B>( <i>String name </i>)</tt><BR>
+<ul>getcvar</ul>
+
+<P><tt><B>getdate</B></tt><BR>
+<ul>Gets current date</ul>
+
+<P><tt><B>getentarray</B>( <i>String name, String key </i>)</tt><BR>
+<ul>Gets an array of entities that have the given key, name pair (case sensitive)</ul>
+
+<P><tt><B>getentbyentnum</B>( <i>Integer ent_num </i>)</tt><BR>
+<ul>Gets the specified entity</ul>
+
+<P><tt><B>getip</B>( <i>Entity player </i>)</tt><BR>
+<ul>Gets player's ip</ul>
+
+<P><tt><B>getping</B>( <i>Entity player </i>)</tt><BR>
+<ul>Gets player's ping</ul>
+
+<P><tt><B>gettime</B></tt><BR>
+<ul>Gets current time</ul>
+
+<P><tt><B>gettimezone</B></tt><BR>
+<ul>Gets current time zone</ul>
+
+<P><tt><B>goto</B>( <i>String label </i>)</tt><BR>
+<ul>Goes to the specified label.</ul>
+
+<P><tt><B>hidemenu</B>( <i>String name, [ Integer bForce ] </i>)</tt><BR>
+<ul>hide menu,with option to force it off</ul>
+
+<P><tt><B>hidemouse</B></tt><BR>
+<ul>hide mouse cursor</ul>
+
+<P><tt><B>huddraw_3d</B>( <i>Integer index, Vector vector_or_offset, Integer always_show, Integer depth, [ Entity entity ] </i>)</tt><BR>
+<ul>Sets this huddraw element to be a 3D world icon and can specify if this icon is always shown on-screen even if the player isn't looking at.<BR>
+Uses xy pos from huddraw_rect.<BR>
+If entity is specified, the vector will be an offset relative to the entity.<BR>
+depth specify if the icon is shown through walls.</ul>
+
+<P><tt><B>huddraw_align</B>( <i>Integer index, String h_align, String v_align </i>)</tt><BR>
+<ul>Sets the alignment of a huddraw element for given player. Specified with 'left', 'center', or 'right'</ul>
+
+<P><tt><B>huddraw_alpha</B>( <i>Integer index, Float alpha </i>)</tt><BR>
+<ul>Sets the alpha of a huddraw element for given player</ul>
+
+<P><tt><B>huddraw_color</B>( <i>Integer index, Float red, Float green, Float blue </i>)</tt><BR>
+<ul>Sets the color for a huddraw element for given player</ul>
+
+<P><tt><B>huddraw_font</B>( <i>Integer index, String fontname </i>)</tt><BR>
+<ul>Sets the font to use for given player huddraw element</ul>
+
+<P><tt><B>huddraw_rect</B>( <i>Integer index, Integer x, Integer y, Integer width, Integer height </i>)</tt><BR>
+<ul>Specifies the position of the upper left corner and size of a huddraw element for given player</ul>
+
+<P><tt><B>huddraw_shader</B>( <i>Integer index, String shader </i>)</tt><BR>
+<ul>Sets the shader to use for a particular huddraw element for given player</ul>
+
+<P><tt><B>huddraw_string</B>( <i>Integer index, String string </i>)</tt><BR>
+<ul>Sets a string to be displayed for given player. Clears the shader value</ul>
+
+<P><tt><B>huddraw_timer</B>( <i>Integer index, Float duration, Float fade_out_time </i>)</tt><BR>
+<ul>Sets a timer to be displayed and fade within the given time in seconds. Clears the string value and the shader value of huddraw element.</ul>
+
+<P><tt><B>huddraw_virtualsize</B>( <i>Integer index, Integer virtual </i>)</tt><BR>
+<ul>Sets if the huddraw element for given player should use virutal screen resolution for positioning and size</ul>
+
+<P><tt><B>ihuddraw_3d</B>( <i>Entity player, Integer index, Vector vector_or_offset, Integer always_show, Integer depth, [ Entity entity ] </i>)</tt><BR>
+<ul>Sets this huddraw element to be a 3D world icon for individual player and can specify if this icon is always shown on-screen even if the player isn't looking at.<BR>
+Uses xy pos from huddraw_rect.<BR>
+If entity is specified, the vector will be an offset relative to the entity.<BR>
+depth specify if the icon is shown through walls.</ul>
+
+<P><tt><B>ihuddraw_align</B>( <i>Entity player, Integer index, String h_align, String v_align </i>)</tt><BR>
+<ul>Sets the alignment of a huddraw element for given player. Specified with 'left', 'center', or 'right'</ul>
+
+<P><tt><B>ihuddraw_alpha</B>( <i>Entity player, Integer index, Float alpha </i>)</tt><BR>
+<ul>Sets the alpha of a huddraw element for given player</ul>
+
+<P><tt><B>ihuddraw_color</B>( <i>Entity player, Integer index, Float red, Float green, Float blue </i>)</tt><BR>
+<ul>Sets the color for a huddraw element for given player</ul>
+
+<P><tt><B>ihuddraw_font</B>( <i>Entity player, Integer index, String fontname </i>)</tt><BR>
+<ul>Sets the font to use for given player huddraw element</ul>
+
+<P><tt><B>ihuddraw_rect</B>( <i>Entity player, Integer index, Integer x, Integer y, Integer width, Integer height </i>)</tt><BR>
+<ul>Specifies the position of the upper left corner and size of a huddraw element for given player</ul>
+
+<P><tt><B>ihuddraw_shader</B>( <i>Entity player, Integer index, String shader </i>)</tt><BR>
+<ul>Sets the shader to use for a particular huddraw element for given player</ul>
+
+<P><tt><B>ihuddraw_string</B>( <i>Entity player, Integer index, String string </i>)</tt><BR>
+<ul>Sets a string to be displayed for given player. Clears the shader value</ul>
+
+<P><tt><B>ihuddraw_timer</B>( <i>Entity player, Integer index, Float duration, Float fade_out_time </i>)</tt><BR>
+<ul>Sets a timer to be displayed and fade within the given time in seconds for given player. Clears the string value and the shader value of huddraw element.</ul>
+
+<P><tt><B>ihuddraw_virtualsize</B>( <i>Entity player, Integer index, Integer virtual </i>)</tt><BR>
+<ul>Sets if the huddraw element for given player should use virutal screen resolution for positioning and size</ul>
+
+<P><tt><B>int</B>( <i>Integer value </i>)</tt><BR>
+<ul>Casts value to an int.</ul>
+
+<P><tt><B>iprintln</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string. followed by a newline.</ul>
+
+<P><tt><B>iprintlnbold</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string.followed by a newline in a bold/important way.</ul>
+
+<P><tt><B>iprintlnbold_noloc</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string.followed by a newline in a bold/important way with no localization conversion.</ul>
+
+<P><tt><B>iprintln_noloc</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string.followed by a newline with no localization conversion.</ul>
+
+<P><tt><B>IsAlive</B>( <i>Entity ent </i>)</tt><BR>
+<ul>Returns true if the specified entity exists and has health > 0.</ul>
+
+<P><tt><B>isarray</B>( <i>String object </i>)</tt><BR>
+<ul>Checks whether this variable is an array</ul>
+
+<P><tt><B>isdefined</B>( <i>String object </i>)</tt><BR>
+<ul>Checks whether this entity/variable is defined</ul>
+
+<P><tt><B>isonground</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Returns 1 if the entity is on ground. 0 otherwise</ul>
+
+<P><tt><B>isoutofbounds</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Returns 1 if the entity is out of bounds. 0 otherwise</ul>
+
+<P><tt><B>killclass</B>( <i>String class_name, [ Integer except ] </i>)</tt><BR>
+<ul>Kills everything in the specified class except for the specified entity (optional).</ul>
+
+<P><tt><B>killent</B>( <i>Integer ent_num </i>)</tt><BR>
+<ul>Kill the specified entity.</ul>
+
+<P><tt><B>landminedamage</B>( <i>Entity landmine, Float damage, Float radius </i>)</tt><BR>
+<ul>radius damage at landmine</ul>
+
+<P><tt><B>ldexp</B>( <i>Float x </i>)</tt><BR>
+<ul>Generate number from significand and exponent</ul>
+
+<P><tt><B>letterbox</B>( <i>Float time </i>)</tt><BR>
+<ul>Puts the game in letterbox mode.</ul>
+
+<P><tt><B>leveltransition</B>( <i>String next_map </i>)</tt><BR>
+<ul>Transitions to the next Level. Statistics to Map Loading,does not keep player data or game data.</ul>
+
+<P><tt><B>locprint</B>( <i>Integer xoffset, Integer yoffset, String stuffToPrint </i>)</tt><BR>
+<ul>prints the included message in the specified location of all player's screens</ul>
+
+<P><tt><B>loc_convert_string</B>( <i>String in </i>)</tt><BR>
+<ul>returns a localized version of the string.</ul>
+
+<P><tt><B>log</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute natural logarithm</ul>
+
+<P><tt><B>log10</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute common logarithm</ul>
+
+<P><tt><B>map</B>( <i>String map_name </i>)</tt><BR>
+<ul>Starts the specified map.</ul>
+
+<P><tt><B>md5string</B>( <i>String text </i>)</tt><BR>
+<ul>generates MD5 hash of given text</ul>
+
+<P><tt><B>missionfailed</B></tt><BR>
+<ul>Makes the player fail their mission,level restarts.</ul>
+
+<P><tt><B>missiontransition</B>( <i>String next_map </i>)</tt><BR>
+<ul>Transitions to the next Mission. Statistics to Main Menu,Next Level should be unlocked.</ul>
+
+<P><tt><B>modf</B>( <i>Float x </i>)</tt><BR>
+<ul>Break into fractional and integral parts</ul>
+
+<P><tt><B>mprint</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string.</ul>
+
+<P><tt><B>mprintln</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string. followed by a newline</ul>
+
+<P><tt><B>music</B>( <i>String current, [ String fallback ] </i>)</tt><BR>
+<ul>Sets the current and fallback (optional) music moods.</ul>
+
+<P><tt><B>musicvolume</B>( <i>Float volume, Float fade_time </i>)</tt><BR>
+<ul>Sets the volume and fade time of the music.</ul>
+
+<P><tt><B>netname</B>( <i>Entity player </i>)</tt><BR>
+<ul>Gets player's netname</ul>
+
+<P><tt><B>newhud</B>( <i>[ Entity player ] </i>)</tt><BR>
+<ul>Create a new HUD element. Optionally for a particular client</ul>
+
+<P><tt><B>noncinematic</B></tt><BR>
+<ul>Turns off cinematic.</ul>
+
+<P><tt><B>pause</B></tt><BR>
+<ul>Pauses the thread.</ul>
+
+<P><tt><B>PlayMovie</B>( <i>String name </i>)</tt><BR>
+<ul>Play a Movie...</ul>
+
+<P><tt><B>popmenu</B>( <i>Integer index </i>)</tt><BR>
+<ul>pop menu</ul>
+
+<P><tt><B>pow</B>( <i>Float x, Float y </i>)</tt><BR>
+<ul>Raise to power</ul>
+
+<P><tt><B>preg_match</B>( <i>String pattern, String subject </i>)</tt><BR>
+<ul>Searches subject for a match to the regular expression given in pattern.</ul>
+
+<P><tt><B>print</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string.</ul>
+
+<P><tt><B>print3d</B>( <i>Vector origin, Float scale, String string </i>)</tt><BR>
+<ul>prints a string in 3D space</ul>
+
+<P><tt><B>println</B>( <i>String string </i>)</tt><BR>
+<ul>Prints a string. followed by a newline.</ul>
+
+<P><tt><B>pushmenu</B>( <i>String name </i>)</tt><BR>
+<ul>push menu</ul>
+
+<P><tt><B>radiusdamage</B>( <i>Vector origin, Integer damage, Integer radius, [ Integer constant_damage ] </i>)</tt><BR>
+<ul>radius damage at origin</ul>
+
+<P><tt><B>randomfloat</B>( <i>Float max </i>)</tt><BR>
+<ul>randomfloat</ul>
+
+<P><tt><B>randomint</B>( <i>Integer max </i>)</tt><BR>
+<ul>randomint</ul>
+
+<P><tt><B>registercmd</B>( <i>String name, String label </i>)</tt><BR>
+<ul>Registers a command.</ul>
+
+<P><tt><B>registerev</B>( <i>String eventname, String script </i>)</tt><BR>
+<ul>Registers script callback handler for specified event</ul>
+
+<P><tt><B>releaseplayer</B></tt><BR>
+<ul>Release the player.</ul>
+
+<P><tt><B>removearchivedclass</B>( <i>String class, [ Integer except_entity_number ] </i>)</tt><BR>
+<ul>Removes all of the simple archived entities in the specified class.</ul>
+
+<P><tt><B>removeclass</B>( <i>String class_name, [ Integer except ] </i>)</tt><BR>
+<ul>Removes everything in the specified class except for the specified entity (optional).</ul>
+
+<P><tt><B>removeent</B>( <i>Integer ent_num </i>)</tt><BR>
+<ul>Removes the specified entity.</ul>
+
+<P><tt><B>restoremusicvolume</B>( <i>Float fade_time </i>)</tt><BR>
+<ul>Restores the music volume to its previous value.</ul>
+
+<P><tt><B>restoresound</B>( <i>Float time, [ Float max_vol ], [ Entity player ] </i>)</tt><BR>
+<ul>Fades the sound in over the given time, optionally to one single player.<BR>
+max_vol being a 0-1 fraction is the maximum volume.</ul>
+
+<P><tt><B>restoresoundtrack</B></tt><BR>
+<ul>Restores the soundtrack to the previous one.</ul>
+
+<P><tt><B>self</B></tt><BR>
+<ul>self</ul>
+
+<P><tt><B>server</B>( <i>[ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>Server only command.</ul>
+
+<P><tt><B>setcurrentobjective</B>( <i>Integer objective_number </i>)</tt><BR>
+<ul>Sets the specified objective as the current objective</ul>
+
+<P><tt><B>setcvar</B>( <i>String cvar_name, String value </i>)</tt><BR>
+<ul>Sets the value of the specified cvar.</ul>
+
+<P><tt><B>setlightstyle</B>( <i>Integer lightstyleindex, String lightstyledata </i>)</tt><BR>
+<ul>Set up the lightstyle with lightstyleindex to the specified data</ul>
+
+<P><tt><B>setscoreboardtoggle</B>( <i>String team, Integer value </i>)</tt><BR>
+<ul>Sets the specified team's scoreboard toggle</ul>
+
+<P><tt><B>settimer</B>( <i>Integer interval, String script </i>)</tt><BR>
+<ul>Sets timer that will execute script after given interval.</ul>
+
+<P><tt><B>set_objective_pos</B>( <i>Vector pos </i>)</tt><BR>
+<ul>Sets the position in the world of the current objective</ul>
+
+<P><tt><B>showmenu</B>( <i>String name, [ Integer bForce ] </i>)</tt><BR>
+<ul>show menu,with option to force it on</ul>
+
+<P><tt><B>sighttrace</B>( <i>Vector start, Vector end, [ Integer pass_entities ], [ Vector mins ], [ Vector maxs ] </i>)</tt><BR>
+<ul>Performs a trace line from the start to the end, returns 0 if something was hit and 1 otherwise.</ul>
+
+<P><tt><B>sin</B>( <i>Float arg </i>)</tt><BR>
+<ul>Sine of float (expects degrees not radians)</ul>
+
+<P><tt><B>sinh</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute hyperbolic sine</ul>
+
+<P><tt><B>soundtrack</B>( <i>String soundtrack_name </i>)</tt><BR>
+<ul>Changes the soundtrack.</ul>
+
+<P><tt><B>spawn</B>( <i>String entityname, [ String keyname1 ], [ String value1 ], [ String keyname2 ], [ String value2 ], [ String keyname3 ], [ String value3 ], [ String keyname4 ], [ String value4 ] </i>)</tt><BR>
+<ul>Spawns an entity.</ul>
+
+<P><tt><B>spawn</B>( <i>String entityname, [ String keyname1 ], [ String value1 ], [ String keyname2 ], [ String value2 ], [ String keyname3 ], [ String value3 ], [ String keyname4 ], [ String value4 ] </i>)</tt><BR>
+<ul>Spawns an entity.</ul>
+
+<P><tt><B>sqrt</B>( <i>Float arg </i>)</tt><BR>
+<ul>Sqrt of float</ul>
+
+<P><tt><B>stopteamrespawn</B>( <i>String team </i>)</tt><BR>
+<ul>Stops a team (anerican, german, both) from spawning in non-wave deathmatches</ul>
+
+<P><tt><B>string</B>( <i>Integer value </i>)</tt><BR>
+<ul>Casts value to a string.</ul>
+
+<P><tt><B>strncpy</B>( <i>Integer bytes, String source </i>)</tt><BR>
+<ul>Returns the copied string with the specified bytes</ul>
+
+<P><tt><B>stuffcmd</B>( <i>[ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ] </i>)</tt><BR>
+<ul>Server only command.</ul>
+
+<P><tt><B>stuffsrv</B>( <i>String string </i>)</tt><BR>
+<ul>Sends command to server</ul>
+
+<P><tt><B>tan</B>( <i>Float arg </i>)</tt><BR>
+<ul>Tangent of float (expects degrees not radians)</ul>
+
+<P><tt><B>tanh</B>( <i>Float x </i>)</tt><BR>
+<ul>Compute hyperbolic tangent</ul>
+
+<P><tt><B>teamwin</B>( <i>String axis_or_allies </i>)</tt><BR>
+<ul>Sets that the 'axis' or the 'allies' have won the map.</ul>
+
+<P><tt><B>team_getscore</B>( <i>String team </i>)</tt><BR>
+<ul>Get a team's current score.</ul>
+
+<P><tt><B>team_setscore</B>( <i>String team, Integer score, [ Integer bAdd ] </i>)</tt><BR>
+<ul>Change/Add score to a team.</ul>
+
+<P><tt><B>thread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label.</ul>
+
+<P><tt><B>thread</B>( <i>String label </i>)</tt><BR>
+<ul>Creates a thread starting at label.</ul>
+
+<P><tt><B>throw</B>( <i>String label </i>)</tt><BR>
+<ul>Throws to the specified label.</ul>
+
+<P><tt><B>timeout</B>( <i>Float time </i>)</tt><BR>
+<ul>specifies script timeout time</ul>
+
+<P><tt><B>trace</B>( <i>Vector start, Vector end, [ Integer pass_entities ], [ Vector mins ], [ Vector maxs ] </i>)</tt><BR>
+<ul>Performs a Trace Line from the start to the end, returns the end or the position it hit at.</ul>
+
+<P><tt><B>traced</B>( <i>Vector start, Vector end, [ Integer pass_entities ], [ Vector mins ], [ Vector maxs ], [ Integer mask ] </i>)</tt><BR>
+<ul>Performs a Trace Line from the start to the end, returns the array with detailed results</ul>
+
+<P><tt><B>trigger</B>( <i>String name </i>)</tt><BR>
+<ul>Trigger the specified target or entity.</ul>
+
+<P><tt><B>typeof</B>( <i>Integer variable </i>)</tt><BR>
+<ul>Returns the type of variable</ul>
+
+<P><tt><B>unregisterev</B>( <i>String eventname </i>)</tt><BR>
+<ul>Unregisters script callback handler for specified event</ul>
+
+<P><tt><B>vector_add</B>( <i>Vector vector1, Vector vector2 </i>)</tt><BR>
+<ul>Returns vector1 + vector2.</ul>
+
+<P><tt><B>vector_closer</B>( <i>Vector vec_a, Vector vec_b, Vector vec_c </i>)</tt><BR>
+<ul>returns 1 if the first vector is closer than the second vector to the third vector.</ul>
+
+<P><tt><B>vector_cross</B>( <i>Vector vector1, Vector vector2 </i>)</tt><BR>
+<ul>Returns vector1 x vector2.</ul>
+
+<P><tt><B>vector_dot</B>( <i>Vector vector1, Vector vector2 </i>)</tt><BR>
+<ul>Returns vector1 * vector2.</ul>
+
+<P><tt><B>vector_length</B>( <i>Vector vector </i>)</tt><BR>
+<ul>Returns the length of the specified vector.</ul>
+
+<P><tt><B>vector_normalize</B>( <i>Vector vector </i>)</tt><BR>
+<ul>Returns the normalized vector of the specified vector.</ul>
+
+<P><tt><B>vector_scale</B>( <i>Vector vector1, Float scale_factor </i>)</tt><BR>
+<ul>Returns vector1 * scale_factor.</ul>
+
+<P><tt><B>vector_subtract</B>( <i>Vector vector1, Vector vector2 </i>)</tt><BR>
+<ul>Returns vector1 - vector2.</ul>
+
+<P><tt><B>vector_toangles</B>( <i>Vector vector1 </i>)</tt><BR>
+<ul>Returns vector1 converted to angles.</ul>
+
+<P><tt><B>vector_within</B>( <i>Vector position1, Vector position2, Float distance </i>)</tt><BR>
+<ul>returns 1 if the two points are <= distance apart, or 0 if they are greater than distance apart.</ul>
+
+<P><tt><B>visiongetnaked</B></tt><BR>
+<ul>Gets players' global current naked-eye vision.</ul>
+
+<P><tt><B>visionsetnaked</B>( <i>String vision_name, [ Float transition_time ] </i>)</tt><BR>
+<ul>Sets players' naked-eye vision. Optionally give a transition time from the current vision. If vision_name is an empty string, it will be set to the current map's name.</ul>
+
+<P><tt><B>wait</B>( <i>Float wait_time </i>)</tt><BR>
+<ul>Wait for the specified amount of time.</ul>
+
+<P><tt><B>waitframe</B></tt><BR>
+<ul>Wait for one server frame.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptTimer">ScriptTimer</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ScriptVariableList">ScriptVariableList</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Sentient">Sentient</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activatenewweapon</B></tt><BR>
+<ul>Activate the new weapon specified by useWeapon. handsurf allows specifying which hand to use for the player</ul>
+
+<P><tt><B>american</B></tt><BR>
+<ul>Makes the sentient an American.</ul>
+
+<P><tt><B>ammo</B>( <i>String type, Integer amount </i>)</tt><BR>
+<ul>Gives the sentient some ammo.</ul>
+
+<P><tt><B>armor</B>( <i>String type, Integer amount </i>)</tt><BR>
+<ul>Gives the sentient some armor.</ul>
+
+<P><tt><B>blockend</B></tt><BR>
+<ul>Is the end of the sentient's block.</ul>
+
+<P><tt><B>blockstart</B></tt><BR>
+<ul>Is the start of the sentient's block.</ul>
+
+<P><tt><B>bloodmodel</B>( <i>String bloodModel </i>)</tt><BR>
+<ul>set the model to be used when showing blood</ul>
+
+<P><tt><B>charge</B>( <i>String hand </i>)</tt><BR>
+<ul>Starts the charging of the weapon in the specified hand</ul>
+
+<P><tt><B>checkanims</B></tt><BR>
+<ul>Check the animations in the .tik file versus the statefile</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>damagemult</B>( <i>Integer location, Float multiplier </i>)</tt><BR>
+<ul>Sets the damage multiplier for a particular body location</ul>
+
+<P><tt><B>deactivateweapon</B>( <i>String side </i>)</tt><BR>
+<ul>Deactivate the weapon in the specified hand.</ul>
+
+<P><tt><B>dontdropweapons</B>( <i>[ Boolean dont_drop ] </i>)</tt><BR>
+<ul>Make the sentient not drop weapons</ul>
+
+<P><tt><B>dropitems</B></tt><BR>
+<ul>drops inventory items</ul>
+
+<P><tt><B>fire</B>( <i>[ String hand ], [ String mode ] </i>)</tt><BR>
+<ul>Fires the weapon in the specified hand.</ul>
+
+<P><tt><B>forcedrophealth</B></tt><BR>
+<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Force the sentient to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Force the sentient to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcedropweapon</B></tt><BR>
+<ul>Get if the sentient is forced to drop health no matter what level.nodrophealth is.</ul>
+
+<P><tt><B>forcelandminemeasure</B></tt><BR>
+<ul>Force a remeasurement to all landmines</ul>
+
+<P><tt><B>german</B></tt><BR>
+<ul>Makes the sentient a German.</ul>
+
+<P><tt><B>getactiveweap</B>( <i>Integer weaponhand </i>)</tt><BR>
+<ul>gets currently active weapon in a given hand</ul>
+
+<P><tt><B>getnewactiveweap</B></tt><BR>
+<ul>gets new active weapon</ul>
+
+<P><tt><B>give</B>( <i>String name </i>)</tt><BR>
+<ul>Gives the sentient the targeted item.</ul>
+
+<P><tt><B>givedynitem</B>( <i>String model, String bonename </i>)</tt><BR>
+<ul>Pass the args to the item.</ul>
+
+<P><tt><B>item</B>( <i>String type, Integer amount </i>)</tt><BR>
+<ul>Gives the sentient the specified amount of the specified item.</ul>
+
+<P><tt><B>jumpxy</B>( <i>Float forwardmove, Float sidemove, Float speed </i>)</tt><BR>
+<ul>Makes the sentient jump.</ul>
+
+<P><tt><B>maxgibs</B>( <i>Integer max_number_of_gibs </i>)</tt><BR>
+<ul>Sets the maximum amount of generic gibs this sentient will spawn when hit.</ul>
+
+<P><tt><B>maxmouthangle</B>( <i>Float max_mouth_angle </i>)</tt><BR>
+<ul>Sets the max mouth angle.</ul>
+
+<P><tt><B>meleeattackend</B></tt><BR>
+<ul>Is the end of the sentient's melee attack.</ul>
+
+<P><tt><B>meleeattackstart</B></tt><BR>
+<ul>Is the start of the sentient's melee attack.</ul>
+
+<P><tt><B>noshadow</B></tt><BR>
+<ul>Turns off the shadow for this sentient.</ul>
+
+<P><tt><B>onfire</B></tt><BR>
+<ul>Called every frame when the sentient is on fire.</ul>
+
+<P><tt><B>pingformines</B></tt><BR>
+<ul>actively uncover mines nearby.</ul>
+
+<P><tt><B>pophelmet</B></tt><BR>
+<ul>Pops a sentient's helmet off if he's got one</ul>
+
+<P><tt><B>putawayweapon</B>( <i>String whichHand </i>)</tt><BR>
+<ul>Put away or deactivate the current weapon, whichHand can be left or right.</ul>
+
+<P><tt><B>releasefire</B>( <i>Float fireholdtime </i>)</tt><BR>
+<ul>Releases the attack in the time specified.</ul>
+
+<P><tt><B>reloadweapon</B>( <i>String hand </i>)</tt><BR>
+<ul>Reloads the weapon in the specified hand</ul>
+
+<P><tt><B>sethelmet</B>( <i>String tikifile, Float popspeed, Float dmgmult, String surfacename, String [optional_additional_surface_name] </i>)</tt><BR>
+<ul>Gives the sentient a helmet and sets the needed info for it</ul>
+
+<P><tt><B>setweaponidlestate</B>( <i>Integer state </i>)</tt><BR>
+<ul>set the idle state of the given weapon.</ul>
+
+<P><tt><B>shadow</B></tt><BR>
+<ul>Turns on the shadow for this sentient.</ul>
+
+<P><tt><B>spawnbloodygibs</B>( <i>[ Integer number_of_gibs ], [ Float scale ] </i>)</tt><BR>
+<ul>Spawns some bloody generic gibs.</ul>
+
+<P><tt><B>stopfire</B>( <i>String hand </i>)</tt><BR>
+<ul>Stops the firing of the weapon in the specified hand.</ul>
+
+<P><tt><B>stoponfire</B></tt><BR>
+<ul>Stops the sentient from being on fire.</ul>
+
+<P><tt><B>stunend</B></tt><BR>
+<ul>Is the end of the sentient's stun.</ul>
+
+<P><tt><B>stunstart</B></tt><BR>
+<ul>Is the start of the sentient's stun.</ul>
+
+<P><tt><B>take</B>( <i>String item_name </i>)</tt><BR>
+<ul>Takes away the specified item from the sentient.</ul>
+
+<P><tt><B>takeall</B></tt><BR>
+<ul>Clears out the sentient's entire inventory.</ul>
+
+<P><tt><B>team</B></tt><BR>
+<ul>returns 'german' or 'american'</ul>
+
+<P><tt><B>threatbias</B>( <i>Integer bias </i>)</tt><BR>
+<ul>Sets the threat bias for this player / AI</ul>
+
+<P><tt><B>threatbias</B>( <i>Integer bias </i>)</tt><BR>
+<ul>Sets the threat bias for this player / AI</ul>
+
+<P><tt><B>threatbias</B></tt><BR>
+<ul>Gets the threat bias for this player / AI</ul>
+
+<P><tt><B>toggleitem</B></tt><BR>
+<ul>Toggles the use of the player's item (first item if he has multiple)</ul>
+
+<P><tt><B>use</B>( <i>String name, Integer weapon_hand </i>)</tt><BR>
+<ul>Use the specified weapon or item in the hand choosen (optional).</ul>
+
+<P><tt><B>uselast</B></tt><BR>
+<ul>Activates the last active weapon</ul>
+
+<P><tt><B>useweaponclass</B>( <i>String name, [ Integer weapon_hand ] </i>)</tt><BR>
+<ul>Use the weapon of the specified class in the hand choosen (optional).</ul>
+
+<P><tt><B>weapon</B>( <i>String weapon_modelname </i>)</tt><BR>
+<ul>Gives the sentient the weapon specified.</ul>
+
+<P><tt><B>weaponcommand</B>( <i>String hand, [ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ], [ String arg7 ] </i>)</tt><BR>
+<ul>Pass the args to the active weapon in the specified hand</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SimpleActor">SimpleActor</a> -> <a href="#Sentient">Sentient</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>noanimlerp</B></tt><BR>
+<ul>Do not LERP to the next animation</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>angle</B></tt><BR>
+<ul>get the angles of the entity using just one value.<BR>
+Gets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
+<ul>set the angles of the entity to newAngles.</ul>
+
+<P><tt><B>angles</B></tt><BR>
+<ul>get the angles of the entity.</ul>
+
+<P><tt><B>angles</B>( <i>Vector newAngles<0.00...360.00><0.00...360.00><0.00...360.00> </i>)</tt><BR>
+<ul>set the angles of the entity to newAngles.</ul>
+
+<P><tt><B>centroid</B></tt><BR>
+<ul>entity's centroid</ul>
+
+<P><tt><B>forwardvector</B></tt><BR>
+<ul>get the forward vector of angles</ul>
+
+<P><tt><B>leftvector</B></tt><BR>
+<ul>get the left vector of angles</ul>
+
+<P><tt><B>origin</B>( <i>Vector newOrigin </i>)</tt><BR>
+<ul>Set the origin of the entity to newOrigin.</ul>
+
+<P><tt><B>origin</B></tt><BR>
+<ul>entity's origin</ul>
+
+<P><tt><B>origin</B>( <i>Vector newOrigin </i>)</tt><BR>
+<ul>Set the origin of the entity to newOrigin.</ul>
+
+<P><tt><B>rightvector</B></tt><BR>
+<ul>get the right vector of angles</ul>
+
+<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
+<ul>target another entity with targetname_to_target.</ul>
+
+<P><tt><B>target</B></tt><BR>
+<ul>entity's target</ul>
+
+<P><tt><B>target</B>( <i>String targetname_to_target </i>)</tt><BR>
+<ul>target another entity with targetname_to_target.</ul>
+
+<P><tt><B>targetname</B>( <i>String targetName </i>)</tt><BR>
+<ul>set the targetname of the entity to targetName.</ul>
+
+<P><tt><B>targetname</B></tt><BR>
+<ul>entity's targetname</ul>
+
+<P><tt><B>targetname</B>( <i>String targetName </i>)</tt><BR>
+<ul>set the targetname of the entity to targetName.</ul>
+
+<P><tt><B>upvector</B></tt><BR>
+<ul>get the up vector of angles</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SinkObject">SinkObject (<i>func_sinkobject</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>active</B></tt><BR>
+<ul>make the SinkObject active, so that it will respond to players touching it.</ul>
+
+<P><tt><B>dampening</B>( <i>Float newDampening </i>)</tt><BR>
+<ul>dampening of SinkObject.</ul>
+
+<P><tt><B>delay</B>( <i>Float delay </i>)</tt><BR>
+<ul>Delay until SinkObject starts falling.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>limit</B>( <i>Float newLimit </i>)</tt><BR>
+<ul>maximum displacement of the SinkObject.</ul>
+
+<P><tt><B>notactive</B></tt><BR>
+<ul>make the SinkObject not active, so that it won't respond to players touching it.</ul>
+
+<P><tt><B>reset</B></tt><BR>
+<ul>Reset the SinkObject right now.</ul>
+
+<P><tt><B>resetdelay</B>( <i>Float newResetDelay </i>)</tt><BR>
+<ul>Delay between when sinkobject starts resetting.</ul>
+
+<P><tt><B>resetsound</B>( <i>String newResetSound </i>)</tt><BR>
+<ul>Sound played when sinkobject is resetting.</ul>
+
+<P><tt><B>resetspeed</B>( <i>Float newResetspeed </i>)</tt><BR>
+<ul>Speed at which SinkObject resets itself, defaults to 0.002 * speed.</ul>
+
+<P><tt><B>sinksound</B>( <i>String newSinkSound </i>)</tt><BR>
+<ul>Sound played when sinkobject is sinking.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Speed at which SinkObject starts falling.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SlidingDoor">SlidingDoor (<i>func_door</i>)</a> -> <a href="#Door">Door</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>doclose</B></tt><BR>
+<ul>Closes the door (special doors).</ul>
+
+<P><tt><B>doopen</B>( <i>Entity other </i>)</tt><BR>
+<ul>Opens the door (special doors).</ul>
+
+<P><tt><B>lip</B>( <i>Float lip </i>)</tt><BR>
+<ul>Sets the lip of the sliding door.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the speed of the sliding door.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SmokeGrenade">SmokeGrenade (<i>smokegrenade</i>)</a> -> <a href="#EffectEntity">EffectEntity</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>bouncefactor</B>( <i>Float factor </i>)</tt><BR>
+<ul>sets how far smoke volumes bounce when they collide with something</ul>
+
+<P><tt><B>fadedelay</B>( <i>Float time </i>)</tt><BR>
+<ul>sets how long the entity waits until fading out from 1 alpha to 0 alpha, in seconds</ul>
+
+<P><tt><B>fadein</B>( <i>Float time </i>)</tt><BR>
+<ul>sets fadein time from 0 alpha to 1 alpha, in seconds</ul>
+
+<P><tt><B>life</B>( <i>Float life </i>)</tt><BR>
+<ul>sets how long the smoke emitter lives</ul>
+
+<P><tt><B>maxalpha</B>( <i>Float alpha </i>)</tt><BR>
+<ul>sets maximum opacity of an individual smoke particle, in 0-1 range</ul>
+
+<P><tt><B>offset</B>( <i>Float offset_x, Float offset_y, Float offset_z </i>)</tt><BR>
+<ul>sets offset of the smoke volume from the entity</ul>
+
+<P><tt><B>scale</B>( <i>Float scale </i>)</tt><BR>
+<ul>sets initial scale of each smoke volume</ul>
+
+<P><tt><B>scalerate</B>( <i>Float rate </i>)</tt><BR>
+<ul>sets how fast the smoke volume grows</ul>
+
+<P><tt><B>spawnlife</B>( <i>Float life </i>)</tt><BR>
+<ul>sets how long each smoke volume lives</ul>
+
+<P><tt><B>spawnrate</B>( <i>Float rate </i>)</tt><BR>
+<ul>sets how many smoke volumes are spawned per second</ul>
+
+<P><tt><B>spin</B>( <i>Float avel </i>)</tt><BR>
+<ul>sets the number of rotations per second for this entity around its z axis</ul>
+
+<P><tt><B>velocity</B>( <i>Float vel_x, Float vel_y, Float vel_z </i>)</tt><BR>
+<ul>sets how fast the smoke volume moves away, with x forward and z up</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SoundManager">SoundManager</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>addmusictrigger</B></tt><BR>
+<ul>Add a new music trigger where the player is standing.</ul>
+
+<P><tt><B>addrandomspeaker</B></tt><BR>
+<ul>Add a new sound where the player is standing.</ul>
+
+<P><tt><B>addreverbtrigger</B></tt><BR>
+<ul>Add a new reverb trigger where the player is standing.</ul>
+
+<P><tt><B>addspeaker</B></tt><BR>
+<ul>Add a new sound where the player is standing.</ul>
+
+<P><tt><B>delete</B></tt><BR>
+<ul>Delete the current sound.</ul>
+
+<P><tt><B>globaltranslate</B>( <i>Vector translate_amount </i>)</tt><BR>
+<ul>Translates all sounds and triggers by specified amount.</ul>
+
+<P><tt><B>hide</B></tt><BR>
+<ul>Hides the sounds.</ul>
+
+<P><tt><B>moveplayer</B></tt><BR>
+<ul>Move the player to the current sound position.</ul>
+
+<P><tt><B>next</B></tt><BR>
+<ul>Go to the next sound.</ul>
+
+<P><tt><B>prev</B></tt><BR>
+<ul>Go to the previous sound.</ul>
+
+<P><tt><B>previewreverb</B></tt><BR>
+<ul>Test out the current reverb settings.</ul>
+
+<P><tt><B>replace</B></tt><BR>
+<ul>Replace the current sound position with the player's.</ul>
+
+<P><tt><B>reset</B></tt><BR>
+<ul>Resets the state of all sounds and triggers.</ul>
+
+<P><tt><B>resetreverb</B></tt><BR>
+<ul>reset the reverb settings to a normal.</ul>
+
+<P><tt><B>save</B></tt><BR>
+<ul>Saves the sounds.</ul>
+
+<P><tt><B>show</B>( <i>[ Entity path ] </i>)</tt><BR>
+<ul>Show all the sounds.</ul>
+
+<P><tt><B>switchfacet</B></tt><BR>
+<ul>Switch the current facet that we are editing.</ul>
+
+<P><tt><B>updateinput</B></tt><BR>
+<ul>Updates the current sound with user interface values.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Spawn">Spawn (<i>func_spawn</i>)</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>attackmode</B>( <i>Integer attackmode </i>)</tt><BR>
+<ul>Sets the attackmode for this spawn entity.</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>modelname</B>( <i>String model_name </i>)</tt><BR>
+<ul>Sets the model name for this spawn entity.</ul>
+
+<P><tt><B>pickup_thread</B>( <i>String threadName </i>)</tt><BR>
+<ul>Sets the pickup thread for the spawned entity.</ul>
+
+<P><tt><B>spawnchance</B>( <i>Float spawn_chance </i>)</tt><BR>
+<ul>Sets the chance that this spawned entity will spawn something when killed, if it is an actor.</ul>
+
+<P><tt><B>spawnitem</B>( <i>String spawn_item_name </i>)</tt><BR>
+<ul>Adds this named item to what will be spawned when this spawned entity is killed, if it is an actor.</ul>
+
+<P><tt><B>spawntarget</B>( <i>String spawntarget </i>)</tt><BR>
+<ul>Sets spawn target for this spawn entity.</ul>
+
+<P><tt><B>spawntargetname</B>( <i>String spawntargetname </i>)</tt><BR>
+<ul>Sets spawn target name for this spawn entity.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="SpawnArgs">SpawnArgs</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="SpawnChain">SpawnChain (<i>func_spawnchain</i>)</a> -> <a href="#Spawn">Spawn</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="SpawnOutOfSight">SpawnOutOfSight (<i>func_spawnoutofsight</i>)</a> -> <a href="#Spawn">Spawn</a> -> <a href="#ScriptSlave">ScriptSlave</a> -> <a href="#Mover">Mover</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="SplinePath">SplinePath (<i>info_splinepath</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>fadetime</B>( <i>Float fadeTime </i>)</tt><BR>
+<ul>Sets the fadetime at this node.</ul>
+
+<P><tt><B>fov</B>( <i>Float cameraFOV </i>)</tt><BR>
+<ul>Sets the fov at this node.</ul>
+
+<P><tt><B>loop</B>( <i>String loop_name </i>)</tt><BR>
+<ul>Sets the loop name.</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the path speed.</ul>
+
+<P><tt><B>SplinePath_create</B></tt><BR>
+<ul>Creates the spline path from the target list.</ul>
+
+<P><tt><B>triggertarget</B>( <i>String target </i>)</tt><BR>
+<ul>Sets the trigger target.</ul>
+
+<P><tt><B>watch</B>( <i>String watchEntity </i>)</tt><BR>
+<ul>Sets the entity to watch at this node.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TargetList">TargetList</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Teleporter">Teleporter (<i>trigger_teleport</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TeleporterDestination">TeleporterDestination (<i>func_teleportdest</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TempWaypoint">TempWaypoint</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TestPlayerStart">TestPlayerStart (<i>testplayerstart</i>)</a> -> <a href="#PlayerStart">PlayerStart</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_ExplodeFlak88">ThrobbingBox_ExplodeFlak88 (<i>ThrobbingBox_ExplodeFlak88</i>)</a> -> <a href="#ThrobbingBox_Explosive">ThrobbingBox_Explosive</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_ExplodeNebelwerfer">ThrobbingBox_ExplodeNebelwerfer (<i>ThrobbingBox_ExplodeNebelwerfer</i>)</a> -> <a href="#ThrobbingBox_Explosive">ThrobbingBox_Explosive</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_ExplodePlayerFlak88">ThrobbingBox_ExplodePlayerFlak88 (<i>ThrobbingBox_ExplodePlayerFlak88</i>)</a> -> <a href="#ThrobbingBox_Explosive">ThrobbingBox_Explosive</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_ExplodePlayerNebelwerfer">ThrobbingBox_ExplodePlayerNebelwerfer (<i>ThrobbingBox_ExplodeNebelwerfer</i>)</a> -> <a href="#ThrobbingBox_Explosive">ThrobbingBox_Explosive</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_Explosive">ThrobbingBox_Explosive (<i>ThrobbingBox_Explosive</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>ActivateSound</B>( <i>String ActivateSound </i>)</tt><BR>
+
+<P><tt><B>BlowUp</B></tt><BR>
+
+<P><tt><B>DestroyModel</B>( <i>String DestroyModel </i>)</tt><BR>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>Explode</B></tt><BR>
+<ul>Cause the explosion to happen.</ul>
+
+<P><tt><B>explosioneffect</B>( <i>String effectModel </i>)</tt><BR>
+<ul>Set the explosion effect model</ul>
+
+<P><tt><B>ExplosionSound</B>( <i>String ExplosionSound </i>)</tt><BR>
+
+<P><tt><B>Radius</B>( <i>Float Radius </i>)</tt><BR>
+
+<P><tt><B>SetDamage</B>( <i>Float Damage </i>)</tt><BR>
+
+<P><tt><B>setthread</B>( <i>String thread </i>)</tt><BR>
+<ul>Set the thread to execute when this object is used</ul>
+
+<P><tt><B>setusethread</B>( <i>String thread </i>)</tt><BR>
+<ul>Set the thread to execute when this object is used</ul>
+
+<P><tt><B>StopWatchDuration</B>( <i>Float StopWatchDuration </i>)</tt><BR>
+
+<P><tt><B>TickSound</B>( <i>String TickSound </i>)</tt><BR>
+
+<P><tt><B>triggered</B>( <i>Integer triggered </i>)</tt><BR>
+<ul>Set the triggered status (0 or 1)</ul>
+
+<P><tt><B>UsedModel</B>( <i>String UsedModel </i>)</tt><BR>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrobbingBox_Stickybomb">ThrobbingBox_Stickybomb (<i>ThrobbingBox_ExplodeNebelwerfer</i>)</a> -> <a href="#ThrobbingBox_Explosive">ThrobbingBox_Explosive</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>stickybombwet</B></tt><BR>
+</BLOCKQUOTE>
+
+<h2> <a name="ThrowObject">ThrowObject (<i>func_throwobject</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>pickup</B>( <i>Entity entity, String tag_name </i>)</tt><BR>
+<ul>Picks up this throw object and attaches it to the entity.</ul>
+
+<P><tt><B>pickupoffset</B>( <i>Vector pickup_offset </i>)</tt><BR>
+<ul>Sets the pickup_offset.</ul>
+
+<P><tt><B>throw</B>( <i>Entity owner, Float speed, Entity targetent, [ Float grav ] </i>)</tt><BR>
+<ul>Throw this throw object.</ul>
+
+<P><tt><B>throwsound</B>( <i>String throw_sound </i>)</tt><BR>
+<ul>Sets the sound to play when object is thrown.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TossObject">TossObject (<i>TossObject</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>bouncesound</B>( <i>String sound </i>)</tt><BR>
+<ul>When bouncing, what sound to play on impact</ul>
+
+<P><tt><B>bouncesoundchance</B>( <i>Float chance<0.00...1.00> </i>)</tt><BR>
+<ul>When bouncing, the chance that the bounce sound will be played</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>stopped</B></tt><BR>
+<ul>sent when entity has stopped bouncing for MOVETYPE_TOSS.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TouchAnim">TouchAnim (<i>func_touchanim</i>)</a> -> <a href="#UseAnim">UseAnim</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TouchField">TouchField</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TOWObjective">TOWObjective (<i>func_towobjective</i>)</a> -> <a href="#Objective">Objective</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>AlliesObjNum</B>( <i>Integer AlliesObjNum </i>)</tt><BR>
+<ul>Sets the objective number for the allies team</ul>
+
+<P><tt><B>AxisObjNum</B>( <i>Integer AxisObjNum </i>)</tt><BR>
+<ul>Sets the objective number for the axis team</ul>
+
+<P><tt><B>ControlledBy</B></tt><BR>
+<ul>Objective controller</ul>
+
+<P><tt><B>ControlledBy</B>( <i>Integer ControlledBy </i>)</tt><BR>
+<ul>Sets the team controlling the objective</ul>
+
+<P><tt><B>initialize</B></tt><BR>
+<ul>Initialize object</ul>
+
+<P><tt><B>SetCurrent</B>( <i>Integer TeamNum </i>)</tt><BR>
+<ul>Set this objective as the current objective for the specified team.</ul>
+
+<P><tt><B>TakeOver</B>( <i>Integer TeamNum </i>)</tt><BR>
+<ul>Sets the team controlling the objective. 0 = Axis, 1 = Allies</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Trigger">Trigger (<i>trigger_multiple</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activatetrigger</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Activates all of the targets for this trigger.</ul>
+
+<P><tt><B>activator</B></tt><BR>
+<ul>Get's entity who last activated this trigger.</ul>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>cnt</B>( <i>Integer count </i>)</tt><BR>
+<ul>Set the amount of times this trigger can be triggered</ul>
+
+<P><tt><B>cone</B>( <i>Float newTriggerCone </i>)</tt><BR>
+<ul>Sets the cone in which directed triggers will trigger.</ul>
+
+<P><tt><B>delay</B>( <i>Float delay_time </i>)</tt><BR>
+<ul>Set the delay time (time between triggering and firing) for this trigger</ul>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>edgetriggered</B>( <i>Boolean newEdgeTriggered </i>)</tt><BR>
+<ul>If true, trigger will only trigger when object enters trigger, not when it is inside it.</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>message</B>( <i>String message </i>)</tt><BR>
+<ul>Set a message to be displayed when this trigger is activated</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>multifaceted</B>( <i>Integer facetDirection </i>)</tt><BR>
+<ul>Make this trigger multifaceted.  If facet is 1, than trigger is North/South oriented.<BR>
+If facet is 2 than trigger is East/West oriented. If facet is 3 than trigger is Up/Down oriented.</ul>
+
+<P><tt><B>noise</B>( <i>String sound </i>)</tt><BR>
+<ul>Set the sound to play when this trigger is activated</ul>
+
+<P><tt><B>nottriggerable</B></tt><BR>
+<ul>Turn this trigger off</ul>
+
+<P><tt><B>setthread</B>( <i>String thread </i>)</tt><BR>
+<ul>Set the thread to execute when this trigger is activated</ul>
+
+<P><tt><B>sound</B>( <i>String sound </i>)</tt><BR>
+<ul>Set the sound to play when this trigger is activated</ul>
+
+<P><tt><B>triggerable</B></tt><BR>
+<ul>Turn this trigger back on</ul>
+
+<P><tt><B>triggerthread</B></tt><BR>
+<ul>Start the trigger thread.</ul>
+
+<P><tt><B>wait</B>( <i>Float wait_time </i>)</tt><BR>
+<ul>Set the wait time (time bewteen triggerings) for this trigger</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerAll">TriggerAll (<i>trigger_multipleall</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doActivate</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>General trigger event for all entities</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerBox">TriggerBox (<i>trigger_box</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>maxs</B>( <i>Vector maxs </i>)</tt><BR>
+<ul>Sets the maximum bounds of the trigger box.</ul>
+
+<P><tt><B>mins</B>( <i>Vector mins </i>)</tt><BR>
+<ul>Sets the minimum bounds of the trigger box.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerByPushObject">TriggerByPushObject (<i>trigger_pushobject</i>)</a> -> <a href="#TriggerOnce">TriggerOnce</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>triggername</B>( <i>String targetname_of_object </i>)</tt><BR>
+<ul>If set, trigger will only respond to objects with specified name.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerCameraUse">TriggerCameraUse (<i>trigger_camerause</i>)</a> -> <a href="#TriggerUse">TriggerUse</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerChangeLevel">TriggerChangeLevel (<i>trigger_changelevel</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>map</B>( <i>String map_name </i>)</tt><BR>
+<ul>Sets the map to change to when triggered.</ul>
+
+<P><tt><B>spawnspot</B>( <i>String spawn_spot </i>)</tt><BR>
+<ul>Sets the spawn spot to use.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerClickItem">TriggerClickItem (<i>trigger_clickitem</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerDamageTargets">TriggerDamageTargets (<i>trigger_damagetargets</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activatetrigger</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Activates all of the targets for this trigger.</ul>
+
+<P><tt><B>damage</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the amount of damage to do.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerEntity">TriggerEntity (<i>trigger_entity</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerExit">TriggerExit (<i>trigger_exit</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerGivePowerup">TriggerGivePowerup (<i>trigger_givepowerup</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>oneshot</B></tt><BR>
+<ul>Make this a one time trigger.</ul>
+
+<P><tt><B>powerupname</B>( <i>String powerup_name </i>)</tt><BR>
+<ul>Specifies the powerup to give to the sentient.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerHurt">TriggerHurt (<i>trigger_hurt</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Integer damage </i>)</tt><BR>
+<ul>Sets the amount of damage to do.</ul>
+
+<P><tt><B>damagetype</B>( <i>String damageType </i>)</tt><BR>
+<ul>Sets the type of damage a TriggerHurt delivers.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerLandmine">TriggerLandmine (<i>trigger_landmine</i>)</a> -> <a href="#TriggerEntity">TriggerEntity</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damageable</B>( <i>Boolean isDamageable </i>)</tt><BR>
+<ul>Makes the trigger able to take damage, but it is up to the script to watch this damage</ul>
+
+<P><tt><B>isabandoned</B>( <i>Entity owner </i>)</tt><BR>
+<ul>Returns true if the owner has abandoned the mine</ul>
+
+<P><tt><B>isimmune</B>( <i>Entity owner </i>)</tt><BR>
+<ul>Returns true if the given entity is immune to this landmine</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerMusic">TriggerMusic (<i>trigger_music</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>altcurrent</B>( <i>String alternate_current_mood </i>)</tt><BR>
+<ul>Sets the alternate current mood to use when triggered.</ul>
+
+<P><tt><B>altfallback</B>( <i>String alterante_fallback_mood </i>)</tt><BR>
+<ul>Sets the alternate fallback mood to use when triggered.</ul>
+
+<P><tt><B>current</B>( <i>String current_mood </i>)</tt><BR>
+<ul>Sets the current mood to use when triggered.</ul>
+
+<P><tt><B>fallback</B>( <i>String fallback_mood </i>)</tt><BR>
+<ul>Sets the fallback mood to use when triggered.</ul>
+
+<P><tt><B>oneshot</B></tt><BR>
+<ul>Make this a one time trigger.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>triggereffectalt</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.  This event is only triggered when using a trigger<BR>
+as a multi-faceted edge trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerNoDamage">TriggerNoDamage (<i>trigger_nodamage</i>)</a> -> <a href="#TriggerUse">TriggerUse</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerOnce">TriggerOnce (<i>trigger_once</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerPlaySound">TriggerPlaySound (<i>play_sound_triggered</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>channel</B>( <i>Integer channel </i>)</tt><BR>
+<ul>Sets the sound channel to play on.</ul>
+
+<P><tt><B>min_dist</B>( <i>Float min_dist </i>)</tt><BR>
+<ul>Sets the minimum distance.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>volume</B>( <i>Float volume </i>)</tt><BR>
+<ul>Sets the volume.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerPush">TriggerPush (<i>trigger_push</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>angle</B>( <i>Float newAngle </i>)</tt><BR>
+<ul>set the angles of the entity using just one value.<BR>
+Sets the yaw of the entity or an up and down<BR>
+direction if newAngle is[ 0 - 359 ] or - 1 or - 2</ul>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the push speed of the TriggerPush</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerPushAny">TriggerPushAny (<i>trigger_pushany</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerRelay">TriggerRelay (<i>trigger_relay</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerReverb">TriggerReverb (<i>trigger_music</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>altreverblevel</B>( <i>Float reverbLevel </i>)</tt><BR>
+<ul>Sets the reverb level to be used when triggered.</ul>
+
+<P><tt><B>altreverbtype</B>( <i>Integer reverbType </i>)</tt><BR>
+<ul>Sets the reverb type.</ul>
+
+<P><tt><B>oneshot</B></tt><BR>
+<ul>Make this a one time trigger.</ul>
+
+<P><tt><B>reverblevel</B>( <i>Float reverbLevel </i>)</tt><BR>
+<ul>Sets the reverb level to be used when triggered.</ul>
+
+<P><tt><B>reverbtype</B>( <i>Integer reverbType </i>)</tt><BR>
+<ul>Sets the reverb type.</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+
+<P><tt><B>triggereffectalt</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.  This event is only triggered when using a trigger<BR>
+as a multi-faceted edge trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerSave">TriggerSave (<i>trigger_save</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>savename</B>( <i>String name </i>)</tt><BR>
+<ul>Sets the name which is appended to the world.message for this specific autosave</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerSecret">TriggerSecret (<i>trigger_secret</i>)</a> -> <a href="#TriggerOnce">TriggerOnce</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerSidedUse">TriggerSidedUse (<i>trigger_sideduse</i>)</a> -> <a href="#TriggerUse">TriggerUse</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerSpeaker">TriggerSpeaker (<i>sound_speaker</i>)</a> -> <a href="#TriggerPlaySound">TriggerPlaySound</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerUse">TriggerUse (<i>trigger_use</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerUseOnce">TriggerUseOnce (<i>trigger_useonce</i>)</a> -> <a href="#TriggerUse">TriggerUse</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TriggerVehicle">TriggerVehicle (<i>trigger_vehicle</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="TurretGun">TurretGun</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>aibulletspread</B>( <i>Float bulletSpreadX, Float bulletSpreadY </i>)</tt><BR>
+<ul>Set the spread of the bullets in the x and y axis</ul>
+
+<P><tt><B>burstFireSettings</B>( <i>Float mintime, Float maxtime, Float mindelay, Float maxdelay </i>)</tt><BR>
+<ul>Sets the settings for burst mode firing</ul>
+
+<P><tt><B>clearAimTarget</B>( <i>[ String target ] </i>)</tt><BR>
+<ul>Makes the turret aim at an entity</ul>
+
+<P><tt><B>convergeTime</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the convergence time</ul>
+
+<P><tt><B>dojitter</B>( <i>[ Float jitterAmount ] </i>)</tt><BR>
+<ul>Apply the jitter without firing</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>idleCheckOffset</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Sets the offset to trace to for collision checking when idling</ul>
+
+<P><tt><B>item_droptofloor</B></tt><BR>
+<ul>Drops the item to the ground.</ul>
+
+<P><tt><B>maxIdlePitch</B>( <i>Float offset </i>)</tt><BR>
+<ul>Sets the offset to trace to for collision checking when idling</ul>
+
+<P><tt><B>maxIdleYaw</B>( <i>Float offset </i>)</tt><BR>
+<ul>Sets the offset to trace to for collision checking when idling</ul>
+
+<P><tt><B>maxuseangle</B>( <i>Float maxuseangle </i>)</tt><BR>
+<ul>Set max use angle to allow player to mount the turret.</ul>
+
+<P><tt><B>maxYawOffset</B>( <i>Float maxoffset </i>)</tt><BR>
+<ul>Sets the max yaw offset from the turrets central facing direction</ul>
+
+<P><tt><B>pitchCaps</B>( <i>Vector caps </i>)</tt><BR>
+<ul>Sets the pitch caps for the turret. First number is upward cap, second is downward cap, and the third just makes it nice little vector</ul>
+
+<P><tt><B>pitchSpeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the turret's pitch speed</ul>
+
+<P><tt><B>psetviewangles</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Sets the view angles.</ul>
+
+<P><tt><B>setAimOffset</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Makes the turret aim with specified offset</ul>
+
+<P><tt><B>setAimTarget</B>( <i>[ String target ] </i>)</tt><BR>
+<ul>Makes the turret aim at an entity</ul>
+
+<P><tt><B>setPlayerUsable</B>( <i>Integer state </i>)</tt><BR>
+<ul>Sets wether the turret can be used by players. 0 means no, 1 means yes.</ul>
+
+<P><tt><B>setthread</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the name of the thread called when a player uses the turret</ul>
+
+<P><tt><B>setusable</B>( <i>Integer state </i>)</tt><BR>
+<ul>Sets wether the turret can be used as a weapon. 0 means no, 1 means yes.</ul>
+
+<P><tt><B>shoot</B>( <i>[ String mode ] </i>)</tt><BR>
+<ul>Shoot the weapon</ul>
+
+<P><tt><B>startFiring</B></tt><BR>
+<ul>Makes the turret start shooting</ul>
+
+<P><tt><B>startyaw</B>( <i>Float startyaw </i>)</tt><BR>
+<ul>Sets the yaw to be used as the center of our allowed turn arc.</ul>
+
+<P><tt><B>stopFiring</B></tt><BR>
+<ul>Makes the turret stop shooting</ul>
+
+<P><tt><B>suppressHeight</B>( <i>Float radius </i>)</tt><BR>
+<ul>Sets the vertical radius of suppression fire</ul>
+
+<P><tt><B>suppressTime</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the suppression time</ul>
+
+<P><tt><B>suppressWaitTime</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the suppression wait nonfiring time before turret returns to default position</ul>
+
+<P><tt><B>suppressWidth</B>( <i>Float radius </i>)</tt><BR>
+<ul>Sets the horizontal radius of suppression fire</ul>
+
+<P><tt><B>targettype</B></tt><BR>
+<ul>Gets the target type</ul>
+
+<P><tt><B>targettype</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the target type to be none, any, or player</ul>
+
+<P><tt><B>targettype</B>( <i>String value </i>)</tt><BR>
+<ul>Sets the target type to be none any, or player</ul>
+
+<P><tt><B>turnSpeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Sets the turret's turn speed</ul>
+
+<P><tt><B>userdistance</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets the distance the user should be placed at while using this turret</ul>
+
+<P><tt><B>viewangles</B></tt><BR>
+<ul>get the angles of the entity.</ul>
+
+<P><tt><B>viewangles</B>( <i>Vector newAngles </i>)</tt><BR>
+<ul>set the view angles of the entity to newAngles.</ul>
+
+<P><tt><B>viewjitter</B>( <i>Float amount </i>)</tt><BR>
+<ul>Sets the amount that the owner's view should be jittered when fired</ul>
+
+<P><tt><B>viewOffset</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Sets the view offset to use for the turret</ul>
+
+<P><tt><B>yawCenter</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Sets the yaw for the center of the turret's turning arc</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="UseAnim">UseAnim (<i>func_useanim</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>anim</B>( <i>String animName </i>)</tt><BR>
+<ul>set the animation to use for player.</ul>
+
+<P><tt><B>camera</B>( <i>String cameraPosition </i>)</tt><BR>
+<ul>set the camera to use when in this animation.<BR>
+topdown, behind, front, side, behind_fixed, side_left, side_right</ul>
+
+<P><tt><B>count</B>( <i>Integer newCount </i>)</tt><BR>
+<ul>Sets how many times the UseAnim can be triggered.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>key</B>( <i>String keyName </i>)</tt><BR>
+<ul>set the key needed to make this UseAnim function.</ul>
+
+<P><tt><B>num_loops</B>( <i>Integer loopCount </i>)</tt><BR>
+<ul>set the number of times to loop an animation per use.</ul>
+
+<P><tt><B>setthread</B>( <i>String label </i>)</tt><BR>
+<ul>Sets which thread to use when this UseAnim is triggered.</ul>
+
+<P><tt><B>state</B>( <i>String stateName </i>)</tt><BR>
+<ul>set the state to use for the player.</ul>
+
+<P><tt><B>triggertarget</B>( <i>String targetname </i>)</tt><BR>
+<ul>Sets what should be triggered, when this UseAnim is triggered.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="UseAnimDestination">UseAnimDestination (<i>func_useanimdest</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>anim</B>( <i>String animName </i>)</tt><BR>
+<ul>set the animation to use for player.</ul>
+
+<P><tt><B>num_loops</B>( <i>Integer loopCount </i>)</tt><BR>
+<ul>set the number of times to loop an animation per use.</ul>
+
+<P><tt><B>state</B>( <i>String stateName </i>)</tt><BR>
+<ul>set the state to use for the player.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="UseObject">UseObject (<i>func_useobject</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>activate</B></tt><BR>
+<ul>Allow the useobject to be used.</ul>
+
+<P><tt><B>cone</B>( <i>Float newCone </i>)</tt><BR>
+<ul>Sets the cone in angles of where the Useobject can be used.</ul>
+
+<P><tt><B>count</B>( <i>Integer newCount </i>)</tt><BR>
+<ul>Sets how many times the UseObject can be triggered.</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>damage_type</B>( <i>String newDamageType </i>)</tt><BR>
+<ul>Sets what kind of damage is needed to activate the trigger.</ul>
+
+<P><tt><B>deactivate</B></tt><BR>
+<ul>Do not allow the useobject to be used.</ul>
+
+<P><tt><B>move_thread</B>( <i>String label </i>)</tt><BR>
+<ul>Sets which move thread to use when this UseObject has finshed looping.</ul>
+
+<P><tt><B>offset</B>( <i>Vector newOffset </i>)</tt><BR>
+<ul>Sets the offset to use for this UseObject.</ul>
+
+<P><tt><B>reset_thread</B>( <i>String label </i>)</tt><BR>
+<ul>Sets which thread to call when resetting.</ul>
+
+<P><tt><B>reset_time</B>( <i>Float newResetTime </i>)</tt><BR>
+<ul>Sets the time it takes for the UseObject to reset itself.</ul>
+
+<P><tt><B>state</B>( <i>String newState </i>)</tt><BR>
+<ul>Sets the state to use for this UseObject.</ul>
+
+<P><tt><B>state_backwards</B>( <i>String newState </i>)</tt><BR>
+<ul>Sets the backward state to use for this UseObject.</ul>
+
+<P><tt><B>stop_thread</B>( <i>String label </i>)</tt><BR>
+<ul>Sets which stop thread to use when this UseObject is finished.</ul>
+
+<P><tt><B>triggertarget</B>( <i>String targetname </i>)</tt><BR>
+<ul>Sets what should be triggered, when this UseObject is triggered.</ul>
+
+<P><tt><B>usematerial</B>( <i>String nameOfUseMaterial </i>)</tt><BR>
+<ul>the name of the material that glows when active.</ul>
+
+<P><tt><B>yaw_offset</B>( <i>Float newYawOffset </i>)</tt><BR>
+<ul>Sets the yaw offset to use for this UseObject.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Vehicle">Vehicle (<i>script_vehicle</i>)</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>AnimationSet</B>( <i>String animset </i>)</tt><BR>
+<ul>Sets the Animation Set to use.</ul>
+
+<P><tt><B>AttachDriverSlot</B>( <i>Integer slot, Entity entity </i>)</tt><BR>
+<ul>Attaches an entity to the specified slot.</ul>
+
+<P><tt><B>AttachPassengerSlot</B>( <i>Integer slot, Entity entity </i>)</tt><BR>
+<ul>Attaches an entity to the specified slot.</ul>
+
+<P><tt><B>AttachTurretSlot</B>( <i>Integer slot, Entity entity </i>)</tt><BR>
+<ul>Attaches an entity to the specified slot.</ul>
+
+<P><tt><B>back_mass</B>( <i>Float weight </i>)</tt><BR>
+<ul>Sets the mass of the back of the vehicle</ul>
+
+<P><tt><B>BounceBackwardsVelocity</B>( <i>Integer bStayFullSpeed </i>)</tt><BR>
+<ul>For vehicles on rails that are moving backwards, reverse our velocity. (Optionally pass bStayFullSpeed to keep vehicle at full speed after the bounce)</ul>
+
+<P><tt><B>BounceForwardsVelocity</B></tt><BR>
+<ul>For vehicles on rails that are moving forwards, reverse our velocity.</ul>
+
+<P><tt><B>canjump</B>( <i>Boolean jumpable </i>)</tt><BR>
+<ul>Sets whether or not the vehicle can jump</ul>
+
+<P><tt><B>canuse</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Returns 1 if passed entity can 'use' this vehicle.</ul>
+
+<P><tt><B>collisionent</B></tt><BR>
+<ul>Gets the Collision Entity</ul>
+
+<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Gets the Collision Entity</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>damagesounds</B>( <i>Integer on_off </i>)</tt><BR>
+<ul>Makes the vehicle play damaged sounds.</ul>
+
+<P><tt><B>DetachDriverSlot</B>( <i>Integer slot, [ Vector exit_position ] </i>)</tt><BR>
+<ul>Detaches an entity to the specified slot.</ul>
+
+<P><tt><B>DetachPassengerSlot</B>( <i>Integer slot, [ Vector exit_position ] </i>)</tt><BR>
+<ul>Detaches an entity to the specified slot.</ul>
+
+<P><tt><B>DetachTurretSlot</B>( <i>Integer slot, [ Vector exit_position ] </i>)</tt><BR>
+<ul>Detaches an entity to the specified slot.</ul>
+
+<P><tt><B>doBlocked</B>( <i>Entity obstacle </i>)</tt><BR>
+<ul>sent to entity when blocked.</ul>
+
+<P><tt><B>doTouch</B>( <i>Entity touchingEntity </i>)</tt><BR>
+<ul>sent to entity when touched.</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>drivable</B></tt><BR>
+<ul>Make the vehicle drivable</ul>
+
+<P><tt><B>drive</B>( <i>Vector position, Float speed, Float acceleration, Float reach_distance, Float look_ahead, [ Vector alternate_position ] </i>)</tt><BR>
+<ul>Makes the vehicle drive to position with speed and acceleration until reached_distance close to position</ul>
+
+<P><tt><B>driveNoWait</B>( <i>Vector position, Float speed, Float acceleration, Float reach_distance </i>)</tt><BR>
+<ul>Makes the vehicle drive to position with speed and acceleration until reached_distance close to position, thread doesn't wait</ul>
+
+<P><tt><B>explosionmodel</B>( <i>String model </i>)</tt><BR>
+<ul>Sets the TIKI to call when the vehicle dies.</ul>
+
+<P><tt><B>front_mass</B>( <i>Float weight </i>)</tt><BR>
+<ul>Sets the mass of the front of the vehicle</ul>
+
+<P><tt><B>fullstop</B></tt><BR>
+<ul>Make the Vehicle Stop Moving... Completely!</ul>
+
+<P><tt><B>immediateremove</B></tt><BR>
+<ul>Removes this listener immediately.</ul>
+
+<P><tt><B>lock</B></tt><BR>
+<ul>Sets the vehicle to be locked</ul>
+
+<P><tt><B>lockmovement</B></tt><BR>
+<ul>The Vehicle cannot move.</ul>
+
+<P><tt><B>maxuseangle</B>( <i>Float maxuseangle </i>)</tt><BR>
+<ul>Set max use angle to allow player to mount the turret.</ul>
+
+<P><tt><B>model</B>( <i>Entity modelName </i>)</tt><BR>
+<ul>set the model to modelName.</ul>
+
+<P><tt><B>modifydrive</B>( <i>Float desired_speed, Float acceleration, Float look_ahead </i>)</tt><BR>
+<ul>Modifys the parameters of the current drive.</ul>
+
+<P><tt><B>moveanim</B>( <i>String anim_name </i>)</tt><BR>
+<ul>move the vehicle with an animation</ul>
+
+<P><tt><B>name</B>( <i>String vehicleName </i>)</tt><BR>
+<ul>Set the name for the vehicle</ul>
+
+<P><tt><B>nextdrive</B>( <i>Entity next_path </i>)</tt><BR>
+<ul>appends the specified path to the current path</ul>
+
+<P><tt><B>pathDrivable</B>( <i>Boolean pathDrivable </i>)</tt><BR>
+<ul>Make the vehicle drivable along a path</ul>
+
+<P><tt><B>projectilevulnerable</B>( <i>[ Integer number_of_hits ] </i>)</tt><BR>
+<ul>Make vehicle vulnerable to being one-shot by projectiles. If number_of_hits is given, it will take this many shots.</ul>
+
+<P><tt><B>QueryDriverSlotAngles</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the angles of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QueryDriverSlotEntity</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns an entity at the specified slot.</ul>
+
+<P><tt><B>QueryDriverSlotPosition</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the position of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QueryDriverSlotStatus</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the status of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QueryFreeDriverSlot</B></tt><BR>
+<ul>Returns a number that represents the first free driver slot on the vehicle.</ul>
+
+<P><tt><B>QueryFreePassengerSlot</B></tt><BR>
+<ul>Returns a number that represents the first free passenger slot on the vehicle.</ul>
+
+<P><tt><B>QueryFreeTurretSlot</B></tt><BR>
+<ul>Returns a number that represents the first free turret slot on the vehicle.</ul>
+
+<P><tt><B>QueryPassengerSlotEntity</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns an entity at the specified slot.</ul>
+
+<P><tt><B>QueryPassengerSlotPosition</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the position of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QueryPassengerSlotStatus</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the status of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QuerySpeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Returns the current speed of the vehicle.</ul>
+
+<P><tt><B>QueryTurretSlotEntity</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns an entity at the specified slot.</ul>
+
+<P><tt><B>QueryTurretSlotPosition</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the position of the specified slot on the vehicle.</ul>
+
+<P><tt><B>QueryTurretSlotStatus</B>( <i>Integer slot </i>)</tt><BR>
+<ul>Returns the status of the specified slot on the vehicle.</ul>
+
+<P><tt><B>removeondeath</B>( <i>Integer removeondeath </i>)</tt><BR>
+<ul>If set to a non-zero value, vehicles will not be removed when they die</ul>
+
+<P><tt><B>runsounds</B>( <i>Integer on_off </i>)</tt><BR>
+<ul>Makes the vehicle play running sounds.</ul>
+
+<P><tt><B>seatanglesoffset</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Set the angles offset of the seat</ul>
+
+<P><tt><B>seatoffset</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Set the offset of the seat</ul>
+
+<P><tt><B>setcollisionentity</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Sets the Collision Entity.</ul>
+
+<P><tt><B>setsoundparameters</B>( <i>Float min_speed, Float min_pitch, Float max_speed, Float max_pitch </i>)</tt><BR>
+<ul>Sets the Sound parameters for this vehicle</ul>
+
+<P><tt><B>setvolumeparameters</B>( <i>Float min_speed, Float min_volume, Float max_speed, Float max_volume </i>)</tt><BR>
+<ul>Sets the Volume parameters for this vehicle</ul>
+
+<P><tt><B>setweapon</B>( <i>String weaponname </i>)</tt><BR>
+<ul>Set the weapon for the vehicle</ul>
+
+<P><tt><B>showweapon</B></tt><BR>
+<ul>Set the weapon to be show in the view</ul>
+
+<P><tt><B>skidding</B>( <i>Integer on_off </i>)</tt><BR>
+<ul>Makes the vehicle skid around corners.</ul>
+
+<P><tt><B>SoundSet</B>( <i>String soundset </i>)</tt><BR>
+<ul>Sets the Sound Set to use.</ul>
+
+<P><tt><B>spawnturret</B>( <i>Integer slot, String tikifile </i>)</tt><BR>
+<ul>Spawns a turret with the specified model and connects it to the specified slot</ul>
+
+<P><tt><B>start</B></tt><BR>
+<ul>Initialize the vehicle.</ul>
+
+<P><tt><B>steerinplace</B></tt><BR>
+<ul>Set the vehicle to turn in place</ul>
+
+<P><tt><B>stop</B></tt><BR>
+<ul>Make the Vehicle Stop Moving... FULL BREAKS!</ul>
+
+<P><tt><B>stopatend</B></tt><BR>
+<ul>Makes the vehicle slow down to a complete stop at the end of the path.</ul>
+
+<P><tt><B>StopBackwardsVelocity</B></tt><BR>
+<ul>Stops any backwards motion for vehicles on rails.</ul>
+
+<P><tt><B>turnrate</B>( <i>Float rate </i>)</tt><BR>
+<ul>Set the turning rate of the vehicle</ul>
+
+<P><tt><B>undrivable</B></tt><BR>
+<ul>Make the vehicle undrivable</ul>
+
+<P><tt><B>unlock</B></tt><BR>
+<ul>Sets the vehicle to be unlocked</ul>
+
+<P><tt><B>unlockmovement</B></tt><BR>
+<ul>The Vehicle can move again.</ul>
+
+<P><tt><B>vehicleanim</B>( <i>String anim_name, [ Float weight ] </i>)</tt><BR>
+<ul>Sets an animation to use in the LD Animation slot. <BR>
+Weight defaults to 1.0</ul>
+
+<P><tt><B>vehiclebouncy</B>( <i>Float bouncycoef </i>)</tt><BR>
+<ul>Sets the Bouncy Coefficient for the shocks.</ul>
+
+<P><tt><B>vehicledestroyed</B></tt><BR>
+<ul>Driver is dead</ul>
+
+<P><tt><B>vehicledrag</B>( <i>Float size </i>)</tt><BR>
+<ul>Sets the Drag Factor</ul>
+
+<P><tt><B>vehicleinit</B></tt><BR>
+<ul>Initialized the Vehicle as the specified file</ul>
+
+<P><tt><B>vehiclemass</B>( <i>Float weight </i>)</tt><BR>
+<ul>Sets the mass of the vehicle (backmass = frontmass = mass/2)</ul>
+
+<P><tt><B>vehicleradius</B>( <i>Float size </i>)</tt><BR>
+<ul>Sets the radius of the wheels</ul>
+
+<P><tt><B>vehicleRoll</B>( <i>Float min, Float max, Float coef </i>)</tt><BR>
+<ul>Sets the Roll min and max and the acceleration coefficient for the shocks.</ul>
+
+<P><tt><B>vehiclerollingresistance</B>( <i>Float size </i>)</tt><BR>
+<ul>Sets the radius of the wheels</ul>
+
+<P><tt><B>vehiclespeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed of the vehicle</ul>
+
+<P><tt><B>vehiclespringy</B>( <i>Float springycoef </i>)</tt><BR>
+<ul>Sets the Springy Coefficient for the shocks.</ul>
+
+<P><tt><B>vehicletread</B>( <i>Float size </i>)</tt><BR>
+<ul>Sets the size of the wheels</ul>
+
+<P><tt><B>VehicleWheelCorners</B>( <i>Vector size, Vector offset </i>)</tt><BR>
+<ul>Sets the wheel trace corners.</ul>
+
+<P><tt><B>vehicleYaw</B>( <i>Float min, Float max, Float coef </i>)</tt><BR>
+<ul>Sets the Yaw min and max and the acceleration coefficient for the shocks.</ul>
+
+<P><tt><B>vehicleZ</B>( <i>Float min, Float max, Float coef </i>)</tt><BR>
+<ul>Sets the Z min and max and the acceleration coefficient for the shocks.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleCollisionEntity">VehicleCollisionEntity</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>owner</B></tt><BR>
+<ul>owner</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleHalfTrack">VehicleHalfTrack (<i>VehicleHalfTrack</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehiclePoint">VehiclePoint (<i>info_vehiclepoint</i>)</a> -> <a href="#Waypoint">Waypoint</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>spawnflags</B>( <i>Integer spawn_flags </i>)</tt><BR>
+<ul>Sets the spawn flags.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleSoundEntity">VehicleSoundEntity</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>vehiclesoudnentity_updatetraces</B></tt><BR>
+<ul>Updates the traces of a Vehicle Sound Entity</ul>
+
+<P><tt><B>vehiclesoundentity_post</B></tt><BR>
+<ul>PostSpawn of a Vehicle Sound Entity</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleTank">VehicleTank (<i>VehicleTank</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleTankTandem">VehicleTankTandem (<i>VehicleTankTandem</i>)</a> -> <a href="#VehicleTank">VehicleTank</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleTurretGun">VehicleTurretGun</a> -> <a href="#TurretGun">TurretGun</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>aimoffset</B>( <i>Vector value </i>)</tt><BR>
+<ul>Adjust aiming angles by offset.</ul>
+
+<P><tt><B>aimtolerance</B>( <i>Vector caps </i>)</tt><BR>
+<ul>Sets a tolerance for the angles.</ul>
+
+<P><tt><B>collisionent</B></tt><BR>
+<ul>Gets the Collision Entity</ul>
+
+<P><tt><B>collisionent</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Sets the Collision Entity</ul>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>doUse</B>( <i>Entity activatingEntity </i>)</tt><BR>
+<ul>sent to entity when it is used by another entity</ul>
+
+<P><tt><B>firewarmupdelay</B>( <i>Float value </i>)</tt><BR>
+<ul>Set the warmup delay before use after mounting the weapon.</ul>
+
+<P><tt><B>item_droptofloor</B></tt><BR>
+<ul>Drops the item to the ground.</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>lock</B></tt><BR>
+<ul>The turret cannot be used.</ul>
+
+<P><tt><B>playreloadsound</B></tt><BR>
+<ul>Play the turret reload sound.</ul>
+
+<P><tt><B>reloaddelay</B>( <i>Float value </i>)</tt><BR>
+<ul>Set a delay that implies a reload. Will also play a sound</ul>
+
+<P><tt><B>reloadshots</B>( <i>Integer value </i>)</tt><BR>
+<ul>Set the number of shots fired before forcing a reload</ul>
+
+<P><tt><B>removeondeath</B>( <i>Integer removeondeath </i>)</tt><BR>
+<ul>If set to a non-zero value, vehicles will not be removed when they die</ul>
+
+<P><tt><B>setbaseentity</B>( <i>Entity base_entity </i>)</tt><BR>
+<ul>Sets the base entity to take its orientation from.</ul>
+
+<P><tt><B>setcollisionentity</B>( <i>Entity entity </i>)</tt><BR>
+<ul>Sets the Collision Entity.</ul>
+
+<P><tt><B>settargetentity</B>( <i>Entity ent </i>)</tt><BR>
+<ul>Set the entity to point the turret at visually.</ul>
+
+<P><tt><B>SoundSet</B>( <i>String soundset </i>)</tt><BR>
+<ul>Sets the Sound Set to use.</ul>
+
+<P><tt><B>unlock</B></tt><BR>
+<ul>The turret can be used.</ul>
+
+<P><tt><B>warmupdelay</B>( <i>Float value </i>)</tt><BR>
+<ul>Set the warmup delay before use after mounting the weapon.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleTurretGunTandem">VehicleTurretGunTandem (<i>VehicleTurretGunTandem</i>)</a> -> <a href="#VehicleTurretGun">VehicleTurretGun</a> -> <a href="#TurretGun">TurretGun</a> -> <a href="#Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>linkturret</B>( <i>String name </i>)</tt><BR>
+<ul>Sets the next turret in the link.</ul>
+
+<P><tt><B>setswitchthread</B>( <i>String thread </i>)</tt><BR>
+<ul>Set the thread to execute when turret is switched</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleWheelsX2">VehicleWheelsX2 (<i>VehicleWheelsX2</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VehicleWheelsX4">VehicleWheelsX4 (<i>VehicleWheelsX4</i>)</a> -> <a href="#DrivableVehicle">DrivableVehicle</a> -> <a href="#Vehicle">Vehicle</a> -> <a href="#VehicleBase">VehicleBase</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ViewJitter">ViewJitter (<i>func_viewjitter</i>)</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>donedeath</B></tt><BR>
+<ul>Makes the view jitter only happen once</ul>
+
+<P><tt><B>duration</B>( <i>Float time </i>)</tt><BR>
+<ul>Sets the length of time it should last. 0 will be instantanious</ul>
+
+<P><tt><B>edgeeffect</B>( <i>Float fraction </i>)</tt><BR>
+<ul>Sets the fraction of the jitter to apply at the max radius</ul>
+
+<P><tt><B>jitteramount</B>( <i>Vector jitterangles </i>)</tt><BR>
+<ul>Sets the jitter angles to apply to the player</ul>
+
+<P><tt><B>radius</B>( <i>Float radius </i>)</tt><BR>
+<ul>Sets the max radius of the view jitter. 0 affects all</ul>
+
+<P><tt><B>timedecay</B>( <i>Vector decayrate </i>)</tt><BR>
+<ul>Sets jitter decay per second</ul>
+
+<P><tt><B>triggereffect</B>( <i>Entity triggering_entity </i>)</tt><BR>
+<ul>Send event to owner of trigger.</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="ViewMaster">ViewMaster</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>viewangles</B>( <i>Float pitch<0.00...360.00>, Float yaw<0.00...360.00>, Float roll<0.00...360.00> </i>)</tt><BR>
+<ul>Set the angles of the current viewthing</ul>
+
+<P><tt><B>viewanimate</B></tt><BR>
+<ul>Cycle through the animations modes of the current viewthing<BR>
+No Animation<BR>
+Animation with no motion<BR>
+Animation with looping motion<BR>
+Animation with motion<BR>
+</ul>
+
+<P><tt><B>viewattach</B>( <i>String tagname, String model </i>)</tt><BR>
+<ul>Attach a model the the specified tagname</ul>
+
+<P><tt><B>viewdelete</B></tt><BR>
+<ul>Delete the current viewthing</ul>
+
+<P><tt><B>viewdeleteall</B></tt><BR>
+<ul>Delete all viewthings</ul>
+
+<P><tt><B>viewdetach</B></tt><BR>
+<ul>Detach the current viewthing from its parent</ul>
+
+<P><tt><B>viewdetachall</B></tt><BR>
+<ul>Detach all the models attached to the current viewthing</ul>
+
+<P><tt><B>viewmodel</B>( <i>String viewthingModel </i>)</tt><BR>
+<ul>Set the model of the current viewthing</ul>
+
+<P><tt><B>viewnext</B></tt><BR>
+<ul>Advance to the next frame of animation of the current viewthing</ul>
+
+<P><tt><B>viewnextanim</B></tt><BR>
+<ul>Advance to the next animation of the current viewthing</ul>
+
+<P><tt><B>vieworigin</B>( <i>Float x, Float y, Float z </i>)</tt><BR>
+<ul>Set the origin of the current viewthing</ul>
+
+<P><tt><B>viewpitch</B>( <i>Float pitch </i>)</tt><BR>
+<ul>Set the pitch of the current viewthing</ul>
+
+<P><tt><B>viewprev</B></tt><BR>
+<ul>Advance to the previous frame of animation of the current viewthing</ul>
+
+<P><tt><B>viewprevanim</B></tt><BR>
+<ul>Advance to the previous animation of the current viewthing</ul>
+
+<P><tt><B>viewroll</B>( <i>Float roll </i>)</tt><BR>
+<ul>Set the roll of the current viewthing</ul>
+
+<P><tt><B>viewscale</B>( <i>Float scale </i>)</tt><BR>
+<ul>Set the scale of the current viewthing</ul>
+
+<P><tt><B>viewscaledown</B></tt><BR>
+<ul>Decrease the scale of the current viewthing</ul>
+
+<P><tt><B>viewscaleup</B></tt><BR>
+<ul>Increase the scale of the current viewthing</ul>
+
+<P><tt><B>viewsetanim</B>( <i>Float animNum </i>)</tt><BR>
+<ul>Set the animation absolutely based off a floating point value</ul>
+
+<P><tt><B>viewspawn</B>( <i>String model </i>)</tt><BR>
+<ul>Create a viewthing with the specified model</ul>
+
+<P><tt><B>viewthingnext</B></tt><BR>
+<ul>Change the active viewthing to the next viewthing</ul>
+
+<P><tt><B>viewthingprev</B></tt><BR>
+<ul>Change the active viewthing to the previous viewthing</ul>
+
+<P><tt><B>viewyaw</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Set the yaw of the current viewthing</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="Viewthing">Viewthing (<i>viewthing</i>)</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>viewangles</B>( <i>Float pitch<0.00...360.00>, Float yaw<0.00...360.00>, Float roll<0.00...360.00> </i>)</tt><BR>
+<ul>Set the angles of the current viewthing</ul>
+
+<P><tt><B>viewanimate</B></tt><BR>
+<ul>Cycle through the animations modes of the current viewthing<BR>
+No Animation<BR>
+Animation with no motion<BR>
+Animation with looping motion<BR>
+Animation with motion<BR>
+</ul>
+
+<P><tt><B>viewattach</B>( <i>String tagname, String model </i>)</tt><BR>
+<ul>Attach a model the the specified tagname</ul>
+
+<P><tt><B>viewdelete</B></tt><BR>
+<ul>Delete the current viewthing</ul>
+
+<P><tt><B>viewdetach</B></tt><BR>
+<ul>Detach the current viewthing from its parent</ul>
+
+<P><tt><B>viewdetachall</B></tt><BR>
+<ul>Detach all the models attached to the current viewthing</ul>
+
+<P><tt><B>viewlastframe</B></tt><BR>
+<ul>Called when the view things last animation frame is displayed.</ul>
+
+<P><tt><B>viewmodel</B>( <i>String viewthingModel </i>)</tt><BR>
+<ul>Set the model of the current viewthing</ul>
+
+<P><tt><B>viewnext</B></tt><BR>
+<ul>Advance to the next frame of animation of the current viewthing</ul>
+
+<P><tt><B>viewnextanim</B></tt><BR>
+<ul>Advance to the next animation of the current viewthing</ul>
+
+<P><tt><B>vieworigin</B>( <i>Float x, Float y, Float z </i>)</tt><BR>
+<ul>Set the origin of the current viewthing</ul>
+
+<P><tt><B>viewpitch</B>( <i>Float pitch </i>)</tt><BR>
+<ul>Set the pitch of the current viewthing</ul>
+
+<P><tt><B>viewprev</B></tt><BR>
+<ul>Advance to the previous frame of animation of the current viewthing</ul>
+
+<P><tt><B>viewprevanim</B></tt><BR>
+<ul>Advance to the previous animation of the current viewthing</ul>
+
+<P><tt><B>viewroll</B>( <i>Float roll </i>)</tt><BR>
+<ul>Set the roll of the current viewthing</ul>
+
+<P><tt><B>viewsavesurfaces</B></tt><BR>
+<ul>Called after the model is spawned to save off the models original surfaces.</ul>
+
+<P><tt><B>viewscale</B>( <i>Float scale </i>)</tt><BR>
+<ul>Set the scale of the current viewthing</ul>
+
+<P><tt><B>viewscaledown</B></tt><BR>
+<ul>Decrease the scale of the current viewthing</ul>
+
+<P><tt><B>viewscaleup</B></tt><BR>
+<ul>Increase the scale of the current viewthing</ul>
+
+<P><tt><B>viewsetanim</B>( <i>Float animNum </i>)</tt><BR>
+<ul>Set the animation absolutely based off a floating point value</ul>
+
+<P><tt><B>viewthing_think</B></tt><BR>
+<ul>Called every frame to process the view thing.</ul>
+
+<P><tt><B>viewyaw</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Set the yaw of the current viewthing</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="VoteOptions">VoteOptions</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Waypoint">Waypoint (<i>info_waypoint</i>)</a> -> <a href="#SimpleArchivedEntity">SimpleArchivedEntity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<h2> <a name="Weapon">Weapon</a> -> <a href="#Item">Item</a> -> <a href="#Trigger">Trigger</a> -> <a href="#Animate">Animate</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>additionalstartammo</B>( <i>String ammotype, Integer amount </i>)</tt><BR>
+<ul>Gives some additional start ammo of the specified type</ul>
+
+<P><tt><B>airange</B>( <i>String airange </i>)</tt><BR>
+<ul>Set the range of this gun for the ai: short, medium, long, sniper</ul>
+
+<P><tt><B>ai_event</B>( <i>[ String type ], [ Float radius ] </i>)</tt><BR>
+<ul>Let the AI know that this entity made a sound,<BR>
+type is a string specifying what type of sound it is.<BR>
+radius determines how far the sound reaches.</ul>
+
+<P><tt><B>ammopickupsound</B>( <i>String name </i>)</tt><BR>
+<ul>sets the weapon's ammo pickup sound alias</ul>
+
+<P><tt><B>ammorequired</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Set the amount of ammo this weapon requires to fire</ul>
+
+<P><tt><B>ammotype</B>( <i>String name </i>)</tt><BR>
+<ul>Set the type of ammo this weapon uses</ul>
+
+<P><tt><B>ammo_in_clip</B>( <i>Integer ammoInClip </i>)</tt><BR>
+<ul>Set the amount of ammo in the clip</ul>
+
+<P><tt><B>anim</B>( <i>String animName </i>)</tt><BR>
+<ul>Exec anim commands on server or client.</ul>
+
+<P><tt><B>attachtohand</B>( <i>String weapon_hand </i>)</tt><BR>
+<ul>Attaches an active weapon to the specified hand</ul>
+
+<P><tt><B>autoaim</B></tt><BR>
+<ul>Turn on auto aiming for the weapon</ul>
+
+<P><tt><B>autoputaway</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Set the weapon to be automatically put away when out of ammo</ul>
+
+<P><tt><B>bulletcount</B>( <i>Float bulletCount </i>)</tt><BR>
+<ul>Set the number of bullets this weapon shoots when fired</ul>
+
+<P><tt><B>bulletdamage</B>( <i>Float bulletDamage </i>)</tt><BR>
+<ul>Set the damage that the bullet causes</ul>
+
+<P><tt><B>bulletknockback</B>( <i>Float bulletKnockback </i>)</tt><BR>
+<ul>Set the knockback that the bullet causes</ul>
+
+<P><tt><B>bulletlarge</B>( <i>Integer bulletType </i>)</tt><BR>
+<ul>Set if the bullets fired are rifle bullets(1), artillery(2) or larger tracers(3)</ul>
+
+<P><tt><B>bulletrange</B>( <i>Float bulletRange </i>)</tt><BR>
+<ul>Set the range of the bullets</ul>
+
+<P><tt><B>bulletspread</B>( <i>Float bulletSpreadX, Float bulletSpreadY, [ Float bulletSpreadXmax ], [ Float bulletSpreadYmax ] </i>)</tt><BR>
+<ul>Set the min & optional max spread of the bullet in the x and y axis</ul>
+
+<P><tt><B>cantpartialreload</B></tt><BR>
+<ul>Prevents the weapon from being reloaded part way through a clip</ul>
+
+<P><tt><B>clipsize</B>( <i>Integer ammoClipSize </i>)</tt><BR>
+<ul>Set the amount of rounds a clip of the weapon holds</ul>
+
+<P><tt><B>clip_add</B>( <i>Integer ammoAmount </i>)</tt><BR>
+<ul>Add to the weapons ammo clip with ammo from its owner</ul>
+
+<P><tt><B>clip_empty</B></tt><BR>
+<ul>Empties the weapon's clip of ammo,returning it to the owner</ul>
+
+<P><tt><B>clip_fill</B></tt><BR>
+<ul>Fills the weapons ammo clip with ammo from its owner</ul>
+
+<P><tt><B>cooktime</B>( <i>Float cooktime </i>)</tt><BR>
+<ul>sets weapons cook time.</ul>
+
+<P><tt><B>crosshair</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Turn on/off the crosshair for this weapon</ul>
+
+<P><tt><B>dmammorequired</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Set the amount of ammo this weapon requires to fire</ul>
+
+<P><tt><B>dmbulletcount</B>( <i>Float bulletCount </i>)</tt><BR>
+<ul>Set the number of bullets this weapon shoots when fired</ul>
+
+<P><tt><B>dmbulletdamage</B>( <i>Float bulletDamage </i>)</tt><BR>
+<ul>Set the damage that the bullet causes</ul>
+
+<P><tt><B>dmbulletrange</B>( <i>Float bulletRange </i>)</tt><BR>
+<ul>Set the range of the bullets</ul>
+
+<P><tt><B>dmbulletspread</B>( <i>Float bulletSpreadX, Float bulletSpreadY, [ Float bulletSpreadXmax ], [ Float bulletSpreadYmax ] </i>)</tt><BR>
+<ul>Set the min & optional max spread of the bullet in the x and y axis</ul>
+
+<P><tt><B>dmcantpartialreload</B></tt><BR>
+<ul>Prevents the weapon from being reloaded part way through a clip for DM</ul>
+
+<P><tt><B>dmcrosshair</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Turn on/off the crosshair for this weapon</ul>
+
+<P><tt><B>dmfiredelay</B>( <i>Float fFireDelay </i>)</tt><BR>
+<ul>Set the minimum time between shots from the weapon</ul>
+
+<P><tt><B>dmfirespreadmult</B>( <i>Float scaleadd, Float falloff, Float cap, Float maxtime </i>)</tt><BR>
+<ul>Sets a time decayed multiplyer to spread when the weapon is fired</ul>
+
+<P><tt><B>dmmovementspeed</B>( <i>Float speedmult </i>)</tt><BR>
+<ul>Alters the movement speed of the player when he has the weapon out</ul>
+
+<P><tt><B>dmprojectile</B>( <i>String projectileModel </i>)</tt><BR>
+<ul>Set the model of the projectile that this weapon fires</ul>
+
+<P><tt><B>dmstartammo</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Set the starting ammo of this weapon</ul>
+
+<P><tt><B>dmzoomspreadmult</B>( <i>Float scale </i>)</tt><BR>
+<ul>Sets the spread multiplier for when using the zoom on a zooming weapon</ul>
+
+<P><tt><B>donefiring</B></tt><BR>
+<ul>Signals the end of the fire animation</ul>
+
+<P><tt><B>donereloading</B></tt><BR>
+<ul>Signals the end of the reload animation</ul>
+
+<P><tt><B>fallingangleadjust</B></tt><BR>
+<ul>Adjusts the weapons angles as it falls to the ground</ul>
+
+<P><tt><B>firedelay</B>( <i>Float fFireDelay </i>)</tt><BR>
+<ul>Set the minimum time between shots from the weapon</ul>
+
+<P><tt><B>firespreadmult</B>( <i>Float scaleadd, Float falloff, Float cap, Float maxtime </i>)</tt><BR>
+<ul>Sets a time decayed multiplyer to spread when the weapon is fired</ul>
+
+<P><tt><B>firetype</B>( <i>String firingType </i>)</tt><BR>
+<ul>Set the firing type of the weapon (projectile or bullet)</ul>
+
+<P><tt><B>holsterangles</B>( <i>Vector angles </i>)</tt><BR>
+<ul>Set the angles of this weapon when it is holstered</ul>
+
+<P><tt><B>holsteroffset</B>( <i>Vector offset </i>)</tt><BR>
+<ul>Set the positional offset when it is holstered</ul>
+
+<P><tt><B>holsterscale</B>( <i>Float scale </i>)</tt><BR>
+<ul>Set the scale of this weapon when it is holstered</ul>
+
+<P><tt><B>holstertag</B>( <i>String tagname </i>)</tt><BR>
+<ul>Set the name of the tag to attach this to when the weapon is holstered.</ul>
+
+<P><tt><B>idle</B></tt><BR>
+<ul>Puts the weapon into an idle state</ul>
+
+<P><tt><B>idleinit</B></tt><BR>
+<ul>Puts the weapon into an idle state and clears all the anim slots</ul>
+
+<P><tt><B>item_pickup</B>( <i>Entity item </i>)</tt><BR>
+<ul>Pickup the specified item.</ul>
+
+<P><tt><B>loopfire</B></tt><BR>
+<ul>Makes the weapon fire by looping the fire animation.</ul>
+
+<P><tt><B>mainattachtotag</B>( <i>String tagname </i>)</tt><BR>
+<ul>Set the name of the tag to attach this to it's owner when being used.</ul>
+
+<P><tt><B>makenoise</B>( <i>[ Float noise_radius ], [ Boolean force ] </i>)</tt><BR>
+<ul>Makes the weapon make noise that actors can hear.</ul>
+
+<P><tt><B>maxchargetime</B>( <i>Integer time </i>)</tt><BR>
+<ul>Set the maximum time the weapon may be charged up</ul>
+
+<P><tt><B>maxfiremovement</B>( <i>Float speedmult </i>)</tt><BR>
+<ul>Sets the max speed the player can be moving to fire the weapon (fraction of weapon's running speed)</ul>
+
+<P><tt><B>maxmovementsound</B>( <i>String name </i>)</tt><BR>
+<ul>sets the weapon's movement fire prevention sound alias</ul>
+
+<P><tt><B>maxrange</B>( <i>Float maxRange </i>)</tt><BR>
+<ul>Set the maximum range of a weapon so the AI knows how to use it</ul>
+
+<P><tt><B>meansofdeath</B>( <i>String meansOfDeath </i>)</tt><BR>
+<ul>Set the meansOfDeath of the weapon.</ul>
+
+<P><tt><B>minchargetime</B>( <i>Integer time </i>)</tt><BR>
+<ul>Set the minimum time the weapon must be charged up</ul>
+
+<P><tt><B>minrange</B>( <i>Float minRange </i>)</tt><BR>
+<ul>Set the minimum range of a weapon so the AI knows how to use it</ul>
+
+<P><tt><B>movementspeed</B>( <i>Float speedmult </i>)</tt><BR>
+<ul>Alters the movement speed of the player when he has the weapon out</ul>
+
+<P><tt><B>noammosound</B>( <i>String name </i>)</tt><BR>
+<ul>sets the weapon's dry fire sound alias</ul>
+
+<P><tt><B>notdroppable</B></tt><BR>
+<ul>Makes a weapon not droppable</ul>
+
+<P><tt><B>numfireanims</B>( <i>Integer value </i>)</tt><BR>
+<ul>Sets the number of fire animations this weapon uses.</ul>
+
+<P><tt><B>offhandattachtotag</B>( <i>String tagname </i>)</tt><BR>
+<ul>Set the name of the tag to attach this to it's owner's off hand.</ul>
+
+<P><tt><B>overcooked</B></tt><BR>
+<ul>used when the cookable weapon has been over cooked.</ul>
+
+<P><tt><B>overcooked_warning</B></tt><BR>
+<ul>causes a warning sound to play that the grenade is about to be overcooked.</ul>
+
+<P><tt><B>projectile</B>( <i>String projectileModel </i>)</tt><BR>
+<ul>Set the model of the projectile that this weapon fires</ul>
+
+<P><tt><B>quiet</B></tt><BR>
+<ul>Makes the weapon make no noise.</ul>
+
+<P><tt><B>range</B>( <i>Float range </i>)</tt><BR>
+<ul>Set the range of the weapon</ul>
+
+<P><tt><B>rank</B>( <i>Integer iOrder, Integer iRank </i>)</tt><BR>
+<ul>Set the order value and power ranking for the weapon</ul>
+
+<P><tt><B>ready</B></tt><BR>
+<ul>Signals the end of the ready animation so the weapon can be used</ul>
+
+<P><tt><B>secondary</B>( <i>[ String arg1 ], [ String arg2 ], [ String arg3 ], [ String arg4 ], [ String arg5 ], [ String arg6 ], [ String arg7 ], [ String arg8 ] </i>)</tt><BR>
+<ul>Set the secondary mode of the weapon, by passing commands through</ul>
+
+<P><tt><B>secondaryammoinhud</B></tt><BR>
+<ul>Makes the weapon show its secondary ammo to the hud.</ul>
+
+<P><tt><B>semiauto</B></tt><BR>
+<ul>Sets the weapon to fire semi-auto</ul>
+
+<P><tt><B>setaimanim</B>( <i>String aimAnimation, Integer aimFrame </i>)</tt><BR>
+<ul>Set the aim animation and frame for when a weapon fires</ul>
+
+<P><tt><B>setcurrentfireanim</B>( <i>Integer value </i>)</tt><BR>
+<ul>Sets the current firing animation.</ul>
+
+<P><tt><B>shareclip</B>( <i>Integer shareClip </i>)</tt><BR>
+<ul>Sets the weapon to share the same clip between all fire modes</ul>
+
+<P><tt><B>shoot</B>( <i>[ String mode ] </i>)</tt><BR>
+<ul>Shoot the weapon</ul>
+
+<P><tt><B>startammo</B>( <i>Integer amount </i>)</tt><BR>
+<ul>Set the starting ammo of this weapon</ul>
+
+<P><tt><B>startingammotoowner</B></tt><BR>
+<ul>Internal event used to give ammo to the owner of the weapon</ul>
+
+<P><tt><B>startitem</B>( <i>String itemname </i>)</tt><BR>
+<ul>Adds an item to the starting loadout of the weapon</ul>
+
+<P><tt><B>throughmetal</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through metal</ul>
+
+<P><tt><B>throughwood</B>( <i>Float dist </i>)</tt><BR>
+<ul>Sets how far the bullets can go through wood</ul>
+
+<P><tt><B>tracerfrequency</B>( <i>Float frequenct </i>)</tt><BR>
+<ul>Set the frequency of making tracers</ul>
+
+<P><tt><B>tracerspeed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Scale factor of how fast a tracer should travel (valid ranges 0-2)</ul>
+
+<P><tt><B>usenoammo</B>( <i>Boolean bool </i>)</tt><BR>
+<ul>Set the weapon to be able to be used when it's out of ammo</ul>
+
+<P><tt><B>viewkick</B>( <i>Float pitchmin, Float pitchmax, [ Float yawmin ], [ Float yawmax ] </i>)</tt><BR>
+<ul>Adds kick to the view of the owner when fired.</ul>
+
+<P><tt><B>weapongroup</B>( <i>String weapon_group </i>)</tt><BR>
+<ul>Sets the weapon group, a set of animations for actor animations scripts to use</ul>
+
+<P><tt><B>weapontype</B>( <i>String weapon_type </i>)</tt><BR>
+<ul>Sets the weapon type</ul>
+
+<P><tt><B>worldhitspawn</B>( <i>String modelname </i>)</tt><BR>
+<ul>Set a model to be spawned when the weapon strikes the world-></ul>
+
+<P><tt><B>zoom</B>( <i>Integer zoomfov, [ Integer autozoom ] </i>)</tt><BR>
+<ul>Sets fov to zoom to on a secondary fire</ul>
+
+<P><tt><B>zoommovement</B>( <i>Float speedmult </i>)</tt><BR>
+<ul>Sets the max speed the player can move while zoomed (fraction of weapon's running speed)</ul>
+
+<P><tt><B>zoomspreadmult</B>( <i>Float scale </i>)</tt><BR>
+<ul>Sets the spread multiplier for when using the zoom on a zooming weapon</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="WindowObject">WindowObject (<i>func_window</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>damage</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>general damage event used by all entities<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+
+<P><tt><B>debristype</B>( <i>Integer type </i>)</tt><BR>
+<ul>Sets the debris type of the Window</ul>
+
+<P><tt><B>killed</B>( <i>Entity attacker, Integer damage, Entity inflictor, Vector position, Vector direction, Vector normal, Integer knockback, Integer damageflags, Integer meansofdeath, Integer location </i>)</tt><BR>
+<ul>event which is sent to an entity once it as been killed<BR>
+<BR>
+Location values:<BR>
+-1 General<BR>
+0 Pelvis<BR>
+1 Lower Torso<BR>
+2 Mid Torso<BR>
+3 Upper Torso<BR>
+4 Neck<BR>
+5 Head<BR>
+6 RUpperArm<BR>
+7 RForearm<BR>
+8 RHand<BR>
+9 LUpperArm<BR>
+10 LForearm<BR>
+11 LHand<BR>
+12 RThigh<BR>
+13 RCalf<BR>
+14 RFoot<BR>
+15 LThigh<BR>
+16 LCalf<BR>
+17 LFoot<BR>
+</ul>
+</BLOCKQUOTE>
+
+<h2> <a name="World">World (<i>worldspawn</i>)</a> -> <a href="#Entity">Entity</a> -> <a href="#SimpleEntity">SimpleEntity</a> -> <a href="#Listener">Listener</a> -> <a href="#Class">Class</a></h2>
+<BLOCKQUOTE>
+
+<P><tt><B>ai_visiondistance</B>( <i>Float vision_distance </i>)</tt><BR>
+<ul>Sets the default AI Vision Distance</ul>
+
+<P><tt><B>animated_farplane</B>( <i>Float farplaneStart, Float farplaneEnd, Float ZStart, Float ZEnd </i>)</tt><BR>
+<ul>Set the distance of the far clipping plane based on a farplane range and a Z range</ul>
+
+<P><tt><B>animated_farplane_bias</B>( <i>Float biasStart, Float biasEnd, Float ZStart, Float ZEnd </i>)</tt><BR>
+<ul>Set the bias of the far clipping plane based on a bias range and a Z range</ul>
+
+<P><tt><B>animated_farplane_color</B>( <i>Vector colorStart, Vector colorEnd, Float ZStart, Float ZEnd </i>)</tt><BR>
+<ul>Set the color of the far clipping plane based on a color range and a Z range</ul>
+
+<P><tt><B>farclipoverride</B>( <i>Float farclipoverride </i>)</tt><BR>
+<ul>Override the min config default for the far clip distance</ul>
+
+<P><tt><B>farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
+<ul>Set the distance of the far clipping plane</ul>
+
+<P><tt><B>farplane</B></tt><BR>
+<ul>Get the distance of the far clipping plane</ul>
+
+<P><tt><B>farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
+<ul>Set the distance of the far clipping plane</ul>
+
+<P><tt><B>farplaneclipcolor</B>( <i>Vector farplaneclipcolor </i>)</tt><BR>
+<ul>Override the fog color for the min config</ul>
+
+<P><tt><B>farplane_bias</B>( <i>Float farplaneDistanceBias </i>)</tt><BR>
+<ul>Set the distance bias of the far clipping plane</ul>
+
+<P><tt><B>farplane_bias</B>( <i>Float farplaneDistanceBias </i>)</tt><BR>
+<ul>Set the distance bias of the far clipping plane</ul>
+
+<P><tt><B>farplane_bias</B></tt><BR>
+<ul>Get the distance bias of the far clipping plane</ul>
+
+<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
+<ul>Set the color of the far clipping plane fog</ul>
+
+<P><tt><B>farplane_color</B>( <i>Vector farplaneColor </i>)</tt><BR>
+<ul>Set the color of the far clipping plane fog</ul>
+
+<P><tt><B>farplane_color</B></tt><BR>
+<ul>Get the color of the far clipping plane fog</ul>
+
+<P><tt><B>farplane_cull</B>( <i>Integer farplaneCull </i>)</tt><BR>
+<ul>Whether or not the far clipping plane should cull things out of the world<BR>
+0 - no cull<BR>
+1 - normal cull<BR>
+2 - cull but no bsp culling</ul>
+
+<P><tt><B>get_render_terrain</B></tt><BR>
+<ul>Get the render terrain switch</ul>
+
+<P><tt><B>gravity</B>( <i>Float worldGravity </i>)</tt><BR>
+<ul>Set the gravity for the whole world.</ul>
+
+<P><tt><B>lavaalpha</B>( <i>Float lavaAlpha </i>)</tt><BR>
+<ul>Set the alpha of lava screen blend</ul>
+
+<P><tt><B>lavacolor</B>( <i>Vector lavaColor </i>)</tt><BR>
+<ul>Set the color of lava screen blend</ul>
+
+<P><tt><B>message</B>( <i>String worldMessage </i>)</tt><BR>
+<ul>Set a message for the world</ul>
+
+<P><tt><B>nextmap</B>( <i>String nextMap </i>)</tt><BR>
+<ul>Set the next map to change to</ul>
+
+<P><tt><B>northyaw</B>( <i>Float yaw </i>)</tt><BR>
+<ul>Sets the yaw direction that is considered to be north</ul>
+
+<P><tt><B>render_terrain</B>( <i>Boolean render_terrain </i>)</tt><BR>
+<ul>Set to draw or not draw terrain</ul>
+
+<P><tt><B>skyalpha</B>( <i>Float newAlphaForPortalSky </i>)</tt><BR>
+<ul>Set the alpha on the sky</ul>
+
+<P><tt><B>skybox_farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
+<ul>Set the distance of the skybox far clipping plane</ul>
+
+<P><tt><B>skybox_farplane</B></tt><BR>
+<ul>Get the distance of the skybox far clipping plane</ul>
+
+<P><tt><B>skybox_farplane</B>( <i>Float farplaneDistance </i>)</tt><BR>
+<ul>Set the distance of the skybox far clipping plane</ul>
+
+<P><tt><B>skybox_speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed of the skybox</ul>
+
+<P><tt><B>skybox_speed</B>( <i>Float speed </i>)</tt><BR>
+<ul>Set the speed of the skybox</ul>
+
+<P><tt><B>skybox_speed</B></tt><BR>
+<ul>Get the speed of the skybox</ul>
+
+<P><tt><B>skyportal</B>( <i>Boolean newSkyPortalState </i>)</tt><BR>
+<ul>Whether or not to use the sky portal at all</ul>
+
+<P><tt><B>soundtrack</B>( <i>String MusicFile </i>)</tt><BR>
+<ul>Set music soundtrack for this level.</ul>
+
+<P><tt><B>wateralpha</B>( <i>Float waterAlpha </i>)</tt><BR>
+<ul>Set the alpha of the water screen blend</ul>
+
+<P><tt><B>watercolor</B>( <i>Vector waterColor </i>)</tt><BR>
+<ul>Set the watercolor screen blend</ul>
+</BLOCKQUOTE>
+<H2>
+191 Game Module Classes.<BR>2169 Game Module Events.
+</H2>
+</BODY>
+</HTML>
diff --git a/docs/getting_started_installation.md b/docs/getting_started_installation.md
new file mode 100644
index 00000000..d1edfa69
--- /dev/null
+++ b/docs/getting_started_installation.md
@@ -0,0 +1,128 @@
+# Installation
+
+- Windows users can check this [Quick install guide](getting_started_installation_windows.md).
+- Linux users may want to check if an OpenMoHAA package is available with the distribution's package manager.
+
+## Requirements
+
+- A MOH:AA installation. Common installations include:
+  - GOG copy (recommended). A fully patched MOH:AA War Chest copy can be acquired [here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
+    - For Linux/macOS, see [Extracting GOG Installer on Linux and macOS](#extracting-gog-setup-file-on-linux-and-macos).
+  - From a CD. Make sure to [patch your installed copy](#installing-official-patches)
+  - Demo. See [obtaining a demo version](#obtaining-a-demo-version)
+- On Windows, Microsoft Visual C++ 2015/2017/2019/2022 Redistributable from https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170 is required.
+- The game should be able to run on any modern hardware. See [System requirements](./getting_started_requirements.md)
+
+## Installing official patches
+
+If the **MOH: Warchest** copy is installed, skip directly to the [OpenMoHAA installation](#downloadinginstalling) section.
+
+Otherwise, install the following patches:
+
+|Game           |Patch to download and install
+|---------------|------------------
+|Allied Assault |Depends on the installed language: [English](https://web.archive.org/web/20160229203048/http://largedownloads.ea.com/pub/patches/MOHAA_UKUS_ONLY_patch111v9safedisk.exe), [German](https://web.archive.org/web/20160229203013/http://largedownloads.ea.com/pub/patches/MOHAA_DE_ONLY_patch111v9safedisk.exe), [French](https://web.archive.org/web/20151201080806/http://largedownloads.ea.com/pub/patches/MOHAA_FR_ONLY_patch111v9safedisk.exe) [Italian](https://web.archive.org/web/20141205065317/http://largedownloads.ea.com/pub/patches/MOHAA_IT_ONLY_patch111v9safedisk.exe), [Spanish](https://web.archive.org/web/20151201080738/http://largedownloads.ea.com/pub/patches/MOHAA_ES_ONLY_patch111v9safedisk.exe), or [Dutch](https://web.archive.org/web/20151201080902/http://largedownloads.ea.com/pub/patches/MOHAA_NL_ONLY_patch111v9safedisk.exe)
+|Spearhead      |[2.0 to 2.11](https://web.archive.org/web/20170130184731/ftp://ftp.ea.com/pub/ea/patches/mohaa_spearhead/mohaas_patch_20_to_211.exe), followed by [2.11 to 2.15](https://web.archive.org/web/20170130184725/ftp://ftp.ea.com/pub/ea/patches/mohaa_spearhead/MOHAAS_Patch_211_to_215.exe)
+|Breakthrough   |[2.40b](https://web.archive.org/web/20160301122255/http://largedownloads.ea.com/pub/patches/medal_of_honor_allied_assault_breakthrough_patch_2_40.exe)
+
+These patches are required to connect to multiplayer servers and ensure a smooth, bug-free single-player experience.
+
+## Downloading/installing OpenMoHAA
+
+Ensure that you download the binaries compatible with your platform in the [releases](https://github.com/openmoh/openmohaa/releases/latest) section.
+
+### Which release should be downloaded?
+
+It depends on the OS that is installed on your device:
+
+|OS       |Kind of hardware (CPU, platform...)        |Archive
+|---------|-------------------------------------------|-----------------------
+|Windows  |AMD/Intel                                  |`*-windows-x64.zip`
+|Windows  |Qualcomm/Snapdragon (ARM-based)            |`*-windows-arm64.zip`
+|macOS    |Apple Silicon (ARM)                        |`*-macos-arm64.zip`
+|macOS    |Intel                                      |`*-macos-x86_64.zip`
+|Linux    |AMD/Intel                                  |`*-linux-amd64`
+|Linux    |Raspberry Pi 4 or 5                        |`*-linux-arm64`
+
+Once the correct archive was downloaded:
+
+a) Extract the archive<sup>1</sup> to your MOHAA installation directory.
+
+-or-
+
+b) Extract the archive<sup>1</sup> somewhere on your hard drive, create a shortcut to each of the **launch_openmohaa_\*** executables (or omohaaded.exe), and set the shortcut's 'Start in' directory to your MOHAA installation directory.
+
+Once you're ready, start one of the three launchers based on whether you want to play the base game, Spearhead, or Breakthrough, and then you can start playing.
+
+----
+
+**Notes:**
+
+1. For servers, only the `omohaaded.*` and `game.*` binaries from the archive are required.
+
+## Appendix
+
+### Cleaning up the game installation directory
+
+If you want to clean up the mohaa installation directory by keeping only what is needed for OpenMoHAA, the following files/directories can be kept:
+```cpp
+[MOHAA]
+├── [main]
+|   ├── [sound]
+|   ├── [video]
+│   ├── Pak*.pk3 // all pak files
+├── [mainta]
+|   ├── [sound]
+|   ├── [video]
+│   ├── pak*.pk3 // all pak files
+├── [maintt]
+|   ├── [sound]
+|   ├── [video]
+│   ├── pak*.pk3 // all pak files
+├── All files from the OpenMoHAA archive
+```
+
+### Extracting GOG setup file on Linux and macOS
+
+If your MOH:AA copy was acquired from GOG then this section will be relevant.
+
+The MOH:AA Warchest installer files on GOG are Windows binaries. To attain the game files, you can quickly extract them using [Innoextract](https://github.com/dscharrer/innoextract). 
+
+- Install Innoextract using your preferred Package Manager (e.g. [Brew](https://brew.sh/)). 
+
+- Once installed run the command `innoextract setup_medal_of_honor_2.0.0.21.exe`. The MoH:AA game files will be extracted into a folder called 'app'.
+
+Alternatively, you can use [WINE](https://www.winehq.org/) as well, but this process may take longer if you do not already have WINE installed and configured. 
+
+### Obtaining a demo version
+
+Alternatively, free demo versions are available online. Here are the links to the demos:
+
+|Game                |Type                               |Link                                                                                  |
+|--------------------|-----------------------------------|--------------------------------------------------------------------------------------|
+|MOH:AA              | Single-player (0.05)              |https://www.gamefront.com/games/medal-of-honor/file/single-player-demo                |
+|MOH:AA              | Multiplayer<sup>1</sup> (1.00)    |https://www.gamefront.com/games/medal-of-honor/file/multiplayer-demo                  |
+|MOH:AA Spearhead    | Multiplayer<sup>2</sup> (2.11)    |https://www.gamefront.com/games/medal-of-honor/file/mohaa-spearhead-demo-eng          |
+|MOH:AA Breakthrough | Multiplayer<sup>2</sup> (0.30)    |https://www.gamefront.com/games/medal-of-honor/file/mohaa-breakthrough-demo           |
+
+- MOH:AA singleplayer demo ships with the level: **Mission 3: Level 3**.
+- MOH:AA multiplayer demo ships with the level: **Stalingrad**. **The Hunt** can be added with the [MP Demo addon](https://www.gamefront.com/games/medal-of-honor/file/mp-demo-add-on-the-hunt). 
+- MOH:AA Spearhead multiplayer demo ships with multiplayer maps: **Malta** and **Druckkammern**.
+- MOH:AA Breakthrough multiplayer demo ships with multiplayer maps: **Anzio** and **Palermo**.
+
+--------
+
+**Notes:**
+
+1. Can play on MOH:AA 1.00 servers only.
+2. Only compatible with demo servers. These servers can be identified by having the letter `d` at the start of their version number (e.g: `(d2.11)`).
+
+---
+
+## Ports and other systems
+
+OpenMoHAA is officially supported on Windows, Linux and macOS. Below is a list of unofficial open-source ports that required custom modifications to the OpenMoHAA source code to build and run:
+
+- https://github.com/Rinnegatamante/openmohaa
+
+To stay up to date with the latest features and fixes from the official repository, these ports depend on their respective maintainers to synchronize changes with the main OpenMoHAA codebase.
diff --git a/docs/getting_started_installation_windows.md b/docs/getting_started_installation_windows.md
new file mode 100644
index 00000000..a446adb8
--- /dev/null
+++ b/docs/getting_started_installation_windows.md
@@ -0,0 +1,38 @@
+# Quick installation
+
+This guide assumes you installed **Medal of Honor: Allied Assault Warchest** from GOG, but it also works with CD or other versions.
+
+You can get it from [GOG here](https://www.gog.com/en/game/medal_of_honor_allied_assault_war_chest).
+
+## 1. Download
+
+Grab the latest `openmohaa-*-windows-x64.zip` from the [releases page](https://github.com/openmoh/openmohaa/releases).
+
+## 2. Find your game folder
+
+1. Right-click your **Medal of Honor - Allied Assault** desktop shortcut → **Properties**
+2. Then check the "**Start in**" field, that's your game folder.
+
+![Shortcut](screenshots/install_guide/windows_installation_shortcut.png)
+
+Alternatively, try one of these common locations:
+- C:\GOG Games\Medal of Honor - Allied Assault War Chest
+- C:\Program Files (x86)\EA Games\MOHAA
+- C:\Program Files\Origin Games\Medal of Honor Allied Assault Warchest
+- C:\Program Files\GOG Galaxy\Games\Medal of Honor - Allied Assault War Chest
+
+If not there, you'll need to search where you installed it.
+
+## 3. Install
+
+1. **Extract the .zip file** you downloaded into the game folder you found earlier.
+2. **Create desktop shortcuts** for these 3 files:
+    * `launch_openmohaa_base.x86_64.exe` - *Allied Assault*
+    * `launch_openmohaa_spearhead.x86_64.exe` - *Spearhead*
+    * `launch_openmohaa_breakthrough.x86_64.exe` - *Breakthrough*
+
+To do that, **right-click each file**, then choose **Send to → Desktop (create shortcut)**.
+
+![Send To](screenshots/install_guide/windows_installation_sendto.png)
+
+Now you can launch any version of the game directly from your desktop using OpenMoHAA.
diff --git a/docs/getting_started_requirements.md b/docs/getting_started_requirements.md
new file mode 100644
index 00000000..ad76075f
--- /dev/null
+++ b/docs/getting_started_requirements.md
@@ -0,0 +1,88 @@
+# System requirements
+
+This matches the hardware requirements (x86) of the original game.
+
+## Medal of Honor: Allied Assault
+
+1.2 GB of free disk space is required for the full game installation + binaries.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 450 MHz                                          |G4 1 GHz
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+## Spearhead expansion
+
+1.0 GB of free disk space is required to install Spearhead on top of the base game.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |450 MHz (Intel Pentium II), or 500 MHz (AMD Athlon) |700 MHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |600 MHz ARM Cortex-A8                               |800 MHz ARM Cortex-A9
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 500 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+## Breakthrough expansion
+
+800 MB of free disk space is required to install Breakthrough on top of the base game.
+
+### x86 (AMD and Intel)
+
+|Hardware       |Minimum                                              |Recommended
+|---------------|-----------------------------------------------------|---------------
+|CPU            |733 MHz (Intel Pentium III), or 700 MHz (AMD Athlon) |1 GHz (Intel Pentium III or AMD Athlon)
+|Memory         |128MB                                                |256MB
+|GPU            |16MB                                                 |32MB
+
+### ARM
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |800 MHz ARM Cortex-A9                               |1 GHz ARM Cortex-A15
+|Memory         |128MB                                               |256MB
+|GPU            |16MB                                                |32MB
+
+
+### PowerPC
+
+|Hardware       |Minimum                                             |Recommended
+|---------------|----------------------------------------------------|---------------
+|CPU            |G3 800 MHz                                          |G4 1 GHz
+|Memory         |256MB                                               |256MB
+|GPU            |16MB                                                |32MB
diff --git a/docs/getting_started_running.md b/docs/getting_started_running.md
new file mode 100644
index 00000000..c89b3288
--- /dev/null
+++ b/docs/getting_started_running.md
@@ -0,0 +1,64 @@
+# Running
+
+## Game selection
+
+**Medal of Honor: Allied Assault** is the default game, but expansions are also supported.
+
+### From the launchers
+
+Base game and expansions can be started from one of the 3 launchers:
+
+- `launch_openmohaa_base`, this starts OpenMoHAA in **Medal of Honor: Allied Assault** mode which is the base game
+- `launch_openmohaa_spearhead`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Spearhead** mode
+- `launch_openmohaa_breakthrough`, this starts OpenMoHAA in **Medal of Honor: Allied Assault: Breakthrough** mode
+
+### From command-line
+
+**Spearhead** and **Breakthrough** are supported in OpenMoHAA using the `com_target_game` variable.
+
+To change the target game, append the following command-line arguments to the `openmohaa` and `omohaaded` executable:
+
+- `+set com_target_game 0` for the default base game (mohaa, uses `main` folder)
+- `+set com_target_game 1` for the Spearhead expansion (mohaas, uses `mainta` folder)
+- `+set com_target_game 2` for the Breakthrough expansion (mohaab, uses `maintt` folder)
+
+OpenMoHAA will also use the correct network protocol version accordingly. The default value of `com_target_game` is 0.
+
+On Windows, a shortcut can be created to the `openmohaa` executable, with the command-line argument appended from above to play an expansion.
+
+You can now start a local OpenMOHAA server or play on a server.
+
+### Using a demo version
+
+The argument `+set com_target_demo 1` must be appended to command-line to play the game or host a server using demo assets. Allied Assault, Spearhead and Breakthrough demos are supported.
+
+## User data location
+
+The location of user-writable data, like the console logfile, saves and configuration files can be found in different locations depending on the platform:
+
+- `%APPDATA%\openmohaa` on Windows
+- `~/.openmohaa` on Linux
+- `~/Library/Application Support/openmohaa` on macOS
+
+There will be one or more subdirectories like in the game installation folder, they match the game being used: either base game `main` or expansions `mainta`/`maintt`.
+
+This is by design since ioquake3 and has two advantages:
+- On a multi-user system, each user will have their own configuration file
+- It doesn't overwrite the existing MOHAA configuration in the MOHAA installation directory.
+
+If necessary, the location of user-writable data can be changed manually by setting the `fs_homepath` variable in the command-line argument. This is useful when running a dedicated server that can only use the game directory to store/read data. The value can be a relative path (relative to the current working directory) or an absolute path. Example:
+- `+set fs_homepath Z:\openmohaa_data` data will be written inside the fully qualified path `Z:\openmohaa_data`
+- `+set fs_homepath homedata` will use the subfolder `homedata` in the process current working directory to write data (will be created automatically)
+- `+set fs_homepath .` not recommended, will write data inside the process current working directory
+
+The game directory is intended to be read-only, which is the reason why the home path exists. This prevents existing files in the game directory from being accidentally overwritten.
+
+Note that the configuration file isn't created nor written automatically on a dedicated server (**omohaaded**).
+
+## Playing with bots
+
+OpenMoHAA has a basic bot system that emulates real players. The maximum number of bots is defined by the `sv_maxbots` variable, and the number of initial bots is defined by the `sv_numbots` variable. Bots can also be added or removed using the `addbot` and `removebot` commands.
+
+This feature is a great way to test the gameplay and mods.
+
+Note that maps must have path built for bots to move, multiplayer maps don't have path built by default. The [mp-navigation](https://github.com/openmoh/mp-navigation) PK3 file can be downloaded and installed in the `main` directory, it adds navigation for all multiplayer maps, including multiplayer maps from Spearhead and Breakthrough.
diff --git a/docs/images/opm_50a_1.png b/docs/images/v0.50a-x86_64/1.png
similarity index 100%
rename from docs/images/opm_50a_1.png
rename to docs/images/v0.50a-x86_64/1.png
diff --git a/docs/images/opm_50b_1.png b/docs/images/v0.50b-x86_64/1.png
similarity index 100%
rename from docs/images/opm_50b_1.png
rename to docs/images/v0.50b-x86_64/1.png
diff --git a/docs/images/opm_50b_2.png b/docs/images/v0.50b-x86_64/2.png
similarity index 100%
rename from docs/images/opm_50b_2.png
rename to docs/images/v0.50b-x86_64/2.png
diff --git a/docs/images/opm-arm_53_tt_1.png b/docs/images/v0.53-armhf/1.png
similarity index 100%
rename from docs/images/opm-arm_53_tt_1.png
rename to docs/images/v0.53-armhf/1.png
diff --git a/docs/images/opm_53_tt_1.png b/docs/images/v0.53-x86_64/1.png
similarity index 100%
rename from docs/images/opm_53_tt_1.png
rename to docs/images/v0.53-x86_64/1.png
diff --git a/docs/images/opmtt-x86_64_0.56.0_1.png b/docs/images/v0.56.0-x86_64/1.png
similarity index 100%
rename from docs/images/opmtt-x86_64_0.56.0_1.png
rename to docs/images/v0.56.0-x86_64/1.png
diff --git a/docs/images/opmtt-x86_64_0.56.0_2.png b/docs/images/v0.56.0-x86_64/2.png
similarity index 100%
rename from docs/images/opmtt-x86_64_0.56.0_2.png
rename to docs/images/v0.56.0-x86_64/2.png
diff --git a/docs/images/opmtt-x86_64_0.56.0_3.png b/docs/images/v0.56.0-x86_64/3.png
similarity index 100%
rename from docs/images/opmtt-x86_64_0.56.0_3.png
rename to docs/images/v0.56.0-x86_64/3.png
diff --git a/docs/images/opm-x86_64_0.58.0_1.png b/docs/images/v0.58.0-x86_64/1.png
similarity index 100%
rename from docs/images/opm-x86_64_0.58.0_1.png
rename to docs/images/v0.58.0-x86_64/1.png
diff --git a/docs/images/v0.58.0-x86_64/1_old.png b/docs/images/v0.58.0-x86_64/1_old.png
new file mode 100644
index 00000000..39e8e791
Binary files /dev/null and b/docs/images/v0.58.0-x86_64/1_old.png differ
diff --git a/docs/images/opm-x86_64_0.58.0_2.png b/docs/images/v0.58.0-x86_64/2.png
similarity index 100%
rename from docs/images/opm-x86_64_0.58.0_2.png
rename to docs/images/v0.58.0-x86_64/2.png
diff --git a/docs/images/v0.60.0-armhf/1.png b/docs/images/v0.60.0-armhf/1.png
new file mode 100644
index 00000000..8d3cb76c
Binary files /dev/null and b/docs/images/v0.60.0-armhf/1.png differ
diff --git a/docs/images/v0.60.0-x86_64/flughafen_1.png b/docs/images/v0.60.0-x86_64/flughafen_1.png
new file mode 100644
index 00000000..e2594f87
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/flughafen_1.png differ
diff --git a/docs/images/v0.60.0-x86_64/flughafen_2.png b/docs/images/v0.60.0-x86_64/flughafen_2.png
new file mode 100644
index 00000000..db99e529
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/flughafen_2.png differ
diff --git a/docs/images/v0.60.0-x86_64/flughafen_3.png b/docs/images/v0.60.0-x86_64/flughafen_3.png
new file mode 100644
index 00000000..f71230f3
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/flughafen_3.png differ
diff --git a/docs/images/v0.60.0-x86_64/mohdm1_1.png b/docs/images/v0.60.0-x86_64/mohdm1_1.png
new file mode 100644
index 00000000..470ca3bd
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/mohdm1_1.png differ
diff --git a/docs/images/v0.60.0-x86_64/mohdm2_1.png b/docs/images/v0.60.0-x86_64/mohdm2_1.png
new file mode 100644
index 00000000..11a0cc34
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/mohdm2_1.png differ
diff --git a/docs/images/v0.60.0-x86_64/training_1.png b/docs/images/v0.60.0-x86_64/training_1.png
new file mode 100644
index 00000000..36f4f63d
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/training_1.png differ
diff --git a/docs/images/v0.60.0-x86_64/training_2.png b/docs/images/v0.60.0-x86_64/training_2.png
new file mode 100644
index 00000000..75678b0c
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/training_2.png differ
diff --git a/docs/images/v0.60.0-x86_64/training_3.png b/docs/images/v0.60.0-x86_64/training_3.png
new file mode 100644
index 00000000..31b172de
Binary files /dev/null and b/docs/images/v0.60.0-x86_64/training_3.png differ
diff --git a/docs/screenshots/install_guide/windows_installation_sendto.png b/docs/screenshots/install_guide/windows_installation_sendto.png
new file mode 100644
index 00000000..069a18d0
Binary files /dev/null and b/docs/screenshots/install_guide/windows_installation_sendto.png differ
diff --git a/docs/screenshots/install_guide/windows_installation_shortcut.png b/docs/screenshots/install_guide/windows_installation_shortcut.png
new file mode 100644
index 00000000..014206e7
Binary files /dev/null and b/docs/screenshots/install_guide/windows_installation_shortcut.png differ
diff --git a/docs/script/events.md b/docs/script/events.md
new file mode 100644
index 00000000..74bad85b
--- /dev/null
+++ b/docs/script/events.md
@@ -0,0 +1,93 @@
+# Events
+
+OpenMoHAA introduces a new way for scripts to monitor for specific events, like players spawning or getting killed. Multiple scripts can subscribe to the same events.
+
+## Subscribing
+
+Commands related to events:
+```cpp
+event_subscribe event_name script_label
+    Subscribes to an event, script_label will be called when the event is triggered
+
+event_unsubscribe event_name script_label
+    Unsubscribe from an event, script_label will not be called anymore
+```
+
+When an event is not needed anymore, make sure to call `event_unsubscribe` with the same parameters used when subscribing to the event.
+
+### Example
+
+```cpp
+main:
+    event_subscribe "player_spawned" event_player_spawned
+    // Can specify another script:
+    //event_subscribe "player_spawned" global/test_script::event_player_spawned
+end
+
+event_player_spawned:
+    iprintlnbold("player entity number " + self.entnum + " just spawned!")
+end
+```
+
+## List of events
+
+### Player events
+
+The `self` object is the player object for all triggered player events.
+
+#### player_connected
+
+The player entered the game.
+
+Called when:
+- When a client spawns for the first time
+- When the map restarts, or when the map changes (for all players)
+- On the next round (for all players)
+
+This is called after the player finished spawning, and before `player_spawned` event.
+
+#### player_damaged
+
+The player just got hit.
+
+The parameters are the same as the `damage` command:
+```
+player_damaged local.attacker local.damage local.inflictor local.position local.direction local.normal local.knockback local.damageflags local.meansofdeath local.location
+```
+
+#### player_disconnecting
+
+The player is disconnecting.
+
+#### player_killed
+
+The player got killed.
+
+The parameters are the same as the `killed` command:
+```
+player_killed local.attacker local.damage local.inflictor local.position local.direction local.normal local.knockback local.damageflags local.meansofdeath local.location
+```
+
+#### player_spawned
+
+The player just spawned.
+
+Called when:
+- The player has entered the battle
+- The player respawned or spawned with weapons
+
+This is called after the player finished spawning.
+
+The event can be called even for spectators (when the spectator gets respawned).
+
+#### player_textMessage
+
+The player sent a text message.
+
+```
+player_textMessage local.text local.is_team
+```
+
+Parameters:
+- local.text: The raw text message the client sent to the server
+- local.is_team: `1` if it's a team message. `0` otherwise (everyone)
diff --git a/docs/scripting.md b/docs/scripting.md
new file mode 100644
index 00000000..d8130122
--- /dev/null
+++ b/docs/scripting.md
@@ -0,0 +1,6 @@
+# Scripting
+
+The documentation is currently incomplete.
+
+- [Event subscription](./script/events.md)
+- [Scripting commands](https://htmlpreview.github.io/?https://github.com/openmoh/openmohaa/blob/main/docs/features_g_allclasses.html) (all classes documentation)
\ No newline at end of file
diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh
deleted file mode 100644
index a7833e2d..00000000
--- a/make-macosx-ub.sh
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/bin/sh
-APPBUNDLE=openmohaa.app
-BINARY=openmohaa.ub
-DEDBIN=omohaaded.ub
-PKGINFO=APPLOMOHAA
-ICNS=misc/openmohaa.icns
-DESTDIR=build/release-darwin-ub
-BASEDIR=main
-MPACKDIR=missionpack
-Q3_VERSION=`grep "\#define Q3_VERSION" code/qcommon/q_shared.h | \
-	sed -e 's/.*".* \([^ ]*\)"/\1/'`;
-
-BIN_OBJ="
-	build/release-darwin-ppc/openmohaa-smp.ppc
-	build/release-darwin-i386/openmohaa-smp.i386
-"
-BIN_DEDOBJ="
-	build/release-darwin-ub/omohaaded.ppc
-	build/release-darwin-i386/omohaaded.i386
-"
-BASE_OBJ="
-	build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
-	build/release-darwin-i386/$BASEDIR/cgamei386.dylib
-	build/release-darwin-ppc/$BASEDIR/uippc.dylib
-	build/release-darwin-i386/$BASEDIR/uii386.dylib
-	build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
-	build/release-darwin-i386/$BASEDIR/qagamei386.dylib
-"
-MPACK_OBJ="
-	build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
-	build/release-darwin-i386/$MPACKDIR/cgamei386.dylib
-	build/release-darwin-ppc/$MPACKDIR/uippc.dylib
-	build/release-darwin-i386/$MPACKDIR/uii386.dylib
-	build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
-	build/release-darwin-i386/$MPACKDIR/qagamei386.dylib
-"
-if [ ! -f Makefile ]; then
-	echo "This script must be run from the openmohaa build directory";
-fi
-
-TIGERHOST=0
-if uname -r | grep ^8. > /dev/null; then
-	TIGERHOST=1
-fi
-
-# we want to use the oldest available SDK for max compatiblity
-unset PPC_CLIENT_SDK
-PPC_CLIENT_CC=gcc
-unset PPC_CLIENT_CFLAGS
-unset PPC_CLIENT_LDFLAGS
-unset PPC_SERVER_SDK
-unset PPC_SERVER_CFLAGS
-unset PPC_SERVER_LDFLAGS
-unset X86_SDK
-unset X86_CFLAGS
-unset X86_LDFLAGS
-if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-mmacosx-version-min=10.5"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-
-	X86_SDK=/Developer/SDKs/MacOSX10.5.sdk
-	X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
-	X86_LDFLAGS="-arch i386 \
-			-isysroot /Developer/SDKs/MacOSX10.5.sdk \
-			-mmacosx-version-min=10.5"
-	X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-mmacosx-version-min=10.4"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-
-	X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
-	X86_LDFLAGS="-arch i386 \
-			-isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-			-mmacosx-version-min=10.4"
-	X86_ENV="CFLAGS=$CFLAGS LDFLAGS=$LDFLAGS"
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-	PPC_CLIENT_CC=gcc-4.0
-	PPC_CLIENT_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-			-DMAC_OS_X_VERSION_MIN_REQUIRED=1030"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-			-isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-			-mmacosx-version-min=10.3"
-	PPC_SERVER_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-	PPC_SERVER_CFLAGS=$PPC_CLIENT_CFLAGS
-	PPC_SERVER_LDFLAGS=$PPC_CLIENT_LDFLAGS
-fi
-
-if [ -d /Developer/SDKs/MacOSX10.2.8.sdk ] && [ -x /usr/bin/gcc-3.3 ] && [ $TIGERHOST ]; then
-	PPC_CLIENT_SDK=/Developer/SDKs/MacOSX10.2.8.sdk
-	PPC_CLIENT_CC=gcc-3.3
-	PPC_CLIENT_CFLAGS="-arch ppc \
-		-nostdinc \
-		-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-		-I/Developer/SDKs/MacOSX10.2.8.sdk/usr/include/gcc/darwin/3.3 \
-		-isystem /Developer/SDKs/MacOSX10.2.8.sdk/usr/include \
-		-DMAC_OS_X_VERSION_MIN_REQUIRED=1020"
-	PPC_CLIENT_LDFLAGS="-arch ppc \
-		-L/Developer/SDKs/MacOSX10.2.8.sdk/usr/lib/gcc/darwin/3.3 \
-		-F/Developer/SDKs/MacOSX10.2.8.sdk/System/Library/Frameworks \
-		-Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk,-m"
-fi
-
-echo "Building PPC Dedicated Server against \"$PPC_SERVER_SDK\""
-echo "Building PPC Client against \"$PPC_CLIENT_SDK\""
-echo "Building X86 Client/Dedicated Server against \"$X86_SDK\""
-if [ "$PPC_CLIENT_SDK" != "/Developer/SDKs/MacOSX10.2.8.sdk" ] || \
-	[ "$PPC_SERVER_SDK" != "/Developer/SDKs/MacOSX10.3.9.sdk" ] || \
-	[ "$X86_SDK" != "/Developer/SDKs/MacOSX10.4u.sdk" ]; then
-	echo "\
-WARNING: in order to build a binary with maximum compatibility you must
-         build on Mac OS X 10.4 using Xcode 2.3 or 2.5 and have the
-         MacOSX10.2.8, MacOSX10.3.9, and MacOSX10.4u SDKs installed
-         from the Xcode install disk Packages folder."
-fi
-
-if [ -z $PPC_CLIENT_SDK ] || [ -z $PPC_SERVER_SDK ] || [ -z $X86_SDK ]; then
-	echo "\
-ERROR: This script is for building a Universal Binary.  You cannot build
-       for a different architecture unless you have the proper Mac OS X SDKs
-       installed.  If you just want to to compile for your own system run
-       'make' instead of this script."
-	exit 1
-fi
-sleep 3
-
-if [ ! -d $DESTDIR ]; then
-	mkdir -p $DESTDIR
-fi
-
-# ppc dedicated server
-echo "Building Dedicated Server using $PPC_SERVER_SDK"
-sleep 2
-if [ -d build/release-darwin-ppc ]; then
-	rm -r build/release-darwin-ppc
-fi
-(ARCH=ppc BUILD_CLIENT_SMP=0 BUILD_CLIENT=0 BUILD_GAME_VM=0 BUILD_GAME_SO=0 \
-	CFLAGS=$PPC_SERVER_CFLAGS LDFLAGS=$PPC_SERVER_LDFLAGS make) || exit 1;
-cp build/release-darwin-ppc/omohaaded.ppc $DESTDIR
-
-# ppc client
-if [ -d build/release-darwin-ppc ]; then
-	rm -r build/release-darwin-ppc
-fi
-(ARCH=ppc USE_OPENAL_DLOPEN=1 BUILD_SERVER=0 CC=$PPC_CLIENT_CC \
-	CFLAGS=$PPC_CLIENT_CFLAGS LDFLAGS=$PPC_CLIENT_LDFLAGS make) || exit 1;
-
-# intel client and server
-if [ -d build/release-darwin-i386 ]; then
-	rm -r build/release-darwin-i386
-fi
-(ARCH=i386 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make) || exit 1;
-
-echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR || exit 1;
-fi
-if [ ! -d $DESTDIR/$APPBUNDLE/Contents/Resources ]; then
-	mkdir -p $DESTDIR/$APPBUNDLE/Contents/Resources
-fi
-cp $ICNS $DESTDIR/$APPBUNDLE/Contents/Resources/openmohaa.icns || exit 1;
-echo $PKGINFO > $DESTDIR/$APPBUNDLE/Contents/PkgInfo
-echo "
-	<?xml version=\"1.0\" encoding="UTF-8"?>
-	<!DOCTYPE plist
-		PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"
-		\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-	<plist version=\"1.0\">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleExecutable</key>
-		<string>$BINARY</string>
-		<key>CFBundleGetInfoString</key>
-		<string>openmohaa $Q3_VERSION</string>
-		<key>CFBundleIconFile</key>
-		<string>openmohaa.icns</string>
-		<key>CFBundleIdentifier</key>
-		<string>org.icculus.quake3</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleName</key>
-		<string>opemohaa</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$Q3_VERSION</string>
-		<key>CFBundleSignature</key>
-		<string>$PKGINFO</string>
-		<key>CFBundleVersion</key>
-		<string>$Q3_VERSION</string>
-		<key>NSExtensions</key>
-		<dict/>
-		<key>NSPrincipalClass</key>
-		<string>NSApplication</string>
-	</dict>
-	</plist>
-	" > $DESTDIR/$APPBUNDLE/Contents/Info.plist
-
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ
-lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ
-rm $DESTDIR/omohaaded.ppc
-cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
-cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
-cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/
-
diff --git a/misc/build_increment.bat b/misc/build_increment.bat
deleted file mode 100644
index a0c38aaf..00000000
--- a/misc/build_increment.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@echo off
-
-set BUILD=
-
-IF EXIST %1.txt (
-	set /p BUILD=<%1.txt
-) ELSE (
-	set BUILD=0
-)
-
-set /a BUILD=%BUILD%+1
-@echo %BUILD% >%1.txt
-
-echo Successfully wrote build number to %1.txt.
\ No newline at end of file
diff --git a/TargetArch.cmake b/misc/cmake/TargetArch.cmake
similarity index 91%
rename from TargetArch.cmake
rename to misc/cmake/TargetArch.cmake
index fd4ba8d9..c2c42fb0 100644
--- a/TargetArch.cmake
+++ b/misc/cmake/TargetArch.cmake
@@ -3,8 +3,12 @@ set(archdetect_c_code "
 #  error cmake_ARCH x86
 #elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
 #  error cmake_ARCH x86_64
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#  error cmake_ARCH ppc64
+#elif defined(__PPC64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64)
+#  if __BIG_ENDIAN__
+#    error cmake_ARCH ppc64
+#  else
+#    error cmake_ARCH ppc64el
+#  endif
 #elif defined(__ppc__) || defined(__ppc) || defined(__powerpc__)
 #  error cmake_ARCH ppc
 #elif defined __s390__
@@ -19,10 +23,14 @@ set(archdetect_c_code "
 #  error cmake_ARCH alpha
 #elif defined __sparc__
 #  error cmake_ARCH sparc
-#elif defined __arm__ || defined (_M_ARM)
-#  error cmake_ARCH arm
 #elif defined(__aarch64__) || defined(__ARM64__) || defined(_M_ARM64)
-#  error cmake_ARCH aarch64
+#  error cmake_ARCH arm64
+#elif defined __arm__ || defined (_M_ARM)
+#  if defined(__ARM_PCS_VFP) && (__ARM_PCS_VFP)
+#    error cmake_ARCH armhf
+#  else
+#    error cmake_ARCH armel
+#  endif
 #elif defined __cris__
 #  error cmake_ARCH cris
 #elif defined __hppa__
@@ -63,12 +71,14 @@ function(target_architecture output_var)
         foreach(osx_arch ${CMAKE_OSX_ARCHITECTURES})
             if("${osx_arch}" STREQUAL "ppc" AND ppc_support)
                 set(osx_arch_ppc TRUE)
+            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
+                set(osx_arch_ppc64 TRUE)
             elseif("${osx_arch}" STREQUAL "i386")
                 set(osx_arch_i386 TRUE)
             elseif("${osx_arch}" STREQUAL "x86_64")
                 set(osx_arch_x86_64 TRUE)
-            elseif("${osx_arch}" STREQUAL "ppc64" AND ppc_support)
-                set(osx_arch_ppc64 TRUE)
+            elseif("${osx_arch}" STREQUAL "arm64")
+                set(osx_arch_arm64 TRUE)
             else()
                 message(FATAL_ERROR "Invalid OS X arch name: ${osx_arch}")
             endif()
@@ -79,6 +89,10 @@ function(target_architecture output_var)
             list(APPEND ARCH ppc)
         endif()
 
+        if(osx_arch_ppc64)
+            list(APPEND ARCH ppc64)
+        endif()
+
         if(osx_arch_i386)
             list(APPEND ARCH i386)
         endif()
@@ -87,8 +101,8 @@ function(target_architecture output_var)
             list(APPEND ARCH x86_64)
         endif()
 
-        if(osx_arch_ppc64)
-            list(APPEND ARCH ppc64)
+        if(osx_arch_arm64)
+            list(APPEND ARCH arm64)
         endif()
     else()
     	# figure out extension for the source file
diff --git a/misc/linux/org.openmoh.openmohaa.desktop.in b/misc/linux/org.openmoh.openmohaa.desktop.in
new file mode 100644
index 00000000..f9657705
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaa.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_base@TARGET_ARCH@
+Terminal=false
diff --git a/misc/linux/org.openmoh.openmohaa.metainfo.xml b/misc/linux/org.openmoh.openmohaa.metainfo.xml
new file mode 100644
index 00000000..b1229586
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaa.metainfo.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.openmoh.openmohaa</id>
+
+  <name>OpenMoHAA</name>
+  <summary>An open-source game engine compatible with Medal of Honor: Allied Assault and its expansions (Spearhead and Breakthrough)</summary>
+
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-2.0-or-later</project_license>
+
+  <description>
+    <p>
+      The main goal of OpenMoHAA is to ensure the future and continuity of Medal of Honor: Allied Assault. It has always been a dream in the community to provide patches and security fixes for the game. Thanks to the ioquake3 project, F.A.K.K SDK and other quality tools, OpenMoHAA has already reached more than half of its goal: to create an open-source version of MoH:AA (based on version 2.40) that is fully compatible with the original game (in terms of protocol, assets, and scripts).
+    </p>
+  </description>
+
+  <launchable type="desktop-id">org.openmoh.openmohaa.desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/mohdm1_1.png?raw=true</image>
+      <caption>Shows a smoke being deployed during multiplayer gameplay</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/flughafen_1.png?raw=true</image>
+      <caption>Shows a turret firing during multiplayer gameplay</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://github.com/openmoh/openmohaa/blob/main/docs/images/v0.60.0-x86_64/flughafen_3.png?raw=true</image>
+      <caption>Shows a mortar firing during multiplayer gameplay</caption>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.0">
+    <content_attribute id="violence-realistic">moderate</content_attribute>
+    <content_attribute id="social-chat">moderate</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+  </content_rating>
+</component>
diff --git a/misc/linux/org.openmoh.openmohaab.desktop.in b/misc/linux/org.openmoh.openmohaab.desktop.in
new file mode 100644
index 00000000..5b2ecf3d
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaab.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA Breakthrough
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault Breakthrough
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_breakthrough@TARGET_ARCH@
+Terminal=false
diff --git a/misc/linux/org.openmoh.openmohaas.desktop.in b/misc/linux/org.openmoh.openmohaas.desktop.in
new file mode 100644
index 00000000..66633291
--- /dev/null
+++ b/misc/linux/org.openmoh.openmohaas.desktop.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+
+Name=OpenMoHAA Spearhead
+Comment=An open-source game engine compatible with Medal of Honor: Allied Assault Spearhead
+Categories=Game;Shooter;
+
+Icon=org.openmoh.openmohaa
+Exec=launch_openmohaa_spearhead@TARGET_ARCH@
+Terminal=false
diff --git a/misc/openmohaa-lowdetail.svg b/misc/openmohaa-lowdetail.svg
new file mode 100644
index 00000000..31994e76
--- /dev/null
+++ b/misc/openmohaa-lowdetail.svg
@@ -0,0 +1,2254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3F3F41;}
+	.st1{fill:#28282A;}
+	.st2{fill:#9BB9DB;}
+</style>
+<g id="Background">
+	<path class="st0" d="M1299.5,6.2c-0.8,0.6-1.6,1.3-2.3,1.9c0.3,2,0.6,4,0.9,6.1C1298.4,11.5,1299.6,9,1299.5,6.2z"/>
+	<path class="st0" d="M1214.6,22.4c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c0.2,1,0.4,2,0.7,2.9
+		C1213.4,23.6,1214.2,22.8,1214.6,22.4z"/>
+	<path class="st0" d="M1402.6,33.3c0.1,0,0.2,0,0.2,0c2.4,1.1,5.3,1.1,8,1.5c-0.1-0.7-0.3-2-0.4-2.9c0.1-0.2,0.1-0.3,0.2-0.5
+		c0.8,0.1,2.2,0.2,2.9,0.2c0-0.3,0.1-0.7,0.1-1c0.2,0,0.4,0,0.6,0c-0.2-0.3-0.3-0.5-0.5-0.8c0.1-0.6,0.1-1.1,0.2-1.7
+		c-0.4,0.1-0.7,0.1-1,0.3c-0.1-0.2-0.3-0.4-0.4-0.7c-0.2,0.3-0.6,0.9-0.9,1.4c-0.5,0.3-0.9,0.8-1.2,1.3c-0.3,0-0.6,0-0.8,0.1
+		c-0.8-0.3-1.8-0.7-2.3-0.9c-2.1,0.9-4.2,1.7-6.3,2.5C1401.3,32.4,1401.9,32.8,1402.6,33.3C1402.6,33.2,1402.6,33.2,1402.6,33.3z"/>
+	<path class="st0" d="M1394.5,113.8C1394.5,113.8,1394.6,113.8,1394.5,113.8C1394.6,113.8,1394.6,113.8,1394.5,113.8
+		c0.2,0,0.5,0,0.7-0.1c0-0.5,0.1-0.9,0.3-1.3c0.7-1.7,1.9-3,3.4-4c0.3-0.1,0.5-0.2,0.8-0.4c-0.1-0.4-0.3-1.3-0.3-1.8
+		c-0.2,0.1-0.3,0.2-0.5,0.3c-0.1-0.2-0.3-0.4-0.4-0.7c-0.1,0.3-0.3,0.7-0.5,1.1c-1,0.5-2,1-3,1.5c-0.1,0-0.2,0-0.3,0
+		c0,0,0,0.1,0,0.1c0,0-0.1,0-0.1,0.1c0,0.7,0,1.4,0.1,2.1C1394.5,111.9,1394.5,112.8,1394.5,113.8z"/>
+	<path class="st0" d="M1449.8,827.5c-0.1-0.7-0.4-2.2-0.5-2.9c-0.5-0.1-1.5-0.2-2-0.3c0.3,1.8,0.7,3.7,1,5.5
+		C1448.8,829,1449.3,828.2,1449.8,827.5z"/>
+	<path class="st0" d="M131.7,828.6c0-0.4,0-0.8,0-1.2c-1.7,0.1-3.4,0.1-5.2,0.2c0,0.3,0,0.7,0,1c0,0-0.1,0-0.1,0
+		c0,0.2,0.1,0.5,0.1,0.7c0,1.9-0.1,3.8-0.1,5.7c2.1,0,3.8-1.1,5.3-2.5c0-1.1,0-2.2,0-3.3c0.1-0.2,0.1-0.3,0.2-0.5
+		C131.8,828.6,131.7,828.6,131.7,828.6z"/>
+	<path class="st0" d="M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2l0.7-0.1c0-0.7-0.1-2-0.1-2.6
+		C1493.5,829.5,1492.2,831.2,1490.7,832.6z"/>
+	<path class="st0" d="M167.7,835.3c-0.6-1.4-2.3-2.1-3.5-3c-2.3,0.3-4.6,0.7-6.8,1.2c0,0.3,0,0.7,0,1.1c-0.1,0-0.2,0.1-0.3,0.1
+		c0.1,0.1,0.2,0.2,0.3,0.3c0,1,0,2.1,0,2.8c3.5-0.2,6.9-1.5,10.5-1.2c0.1-0.5,0-0.9-0.1-1.2c0,0,0-0.1,0-0.1
+		C167.7,835.3,167.7,835.3,167.7,835.3z"/>
+	<path class="st0" d="M316.5,37c0.8-2.5,2.7-4.4,4.6-6.1c0.5,0.6,1.4,1.9,1.9,2.6c1.2,0.1,2.4,0.2,3.7,0.2c0-1.1,0-2.1,0-3.2
+		c-1.5,0-3.1,0-4.6,0c-1.7-0.7-3.6-1-5.4-1.2c0-0.8,0-2.5,0-3.3c2.7-1.8,4.9-4.2,5.3-7.6c-1.1,0.1-2.1,0.2-3.2,0.2
+		c-0.3,1.8-0.5,3.8-2,5c0-5,0.6-10,0.2-15c1.7-0.2,3.2-0.8,4.6-1.7c-1.2-0.1-3.6-0.2-4.8-0.2c0.2-2.2,0.4-4.4,0.6-6.6h-1
+		C315.6,12.3,316.7,24.6,316.5,37z"/>
+	<path class="st0" d="M349.5,4.5c0.2-1.5,0.2-3,0.3-4.5h-1.5c-1.3,2.4-6,5.3-3.4,8.1C347,7.7,347.5,5.1,349.5,4.5z"/>
+	<path class="st0" d="M376.6,1.7c-0.1-0.4-0.3-1.2-0.4-1.7H364C367.7,2.3,372.3,2.2,376.6,1.7z"/>
+	<path class="st0" d="M425.8,2.6c-0.1-0.6-0.3-1.9-0.4-2.6h-2.2c0.1,0.5,0.3,1.5,0.4,2C424.1,2.2,425.2,2.4,425.8,2.6z"/>
+	<path class="st0" d="M459.9,0h-3C456,3,460.6,3,459.9,0z"/>
+	<path class="st0" d="M1268.6,1.6l-0.2-1.4c1.3-0.1,2.6-0.1,3.9-0.2h-10.7c0,0.4-0.1,1.3-0.2,1.7c2.2-0.6,4.5-1.2,6.8-1.7
+		C1268.4,0.4,1268.6,1.2,1268.6,1.6z"/>
+	<path class="st0" d="M1359,3.4c0.6,0,1.7-0.2,2.3-0.2c0-0.7-0.1-2.2-0.1-2.9l0.9-0.2h-1.7c-2.3,0.9-4.6,2.3-4.3,5.1
+		C1357,4.5,1358,4,1359,3.4z"/>
+	<path class="st0" d="M1401.6,17.5c-1.4,0-2.9,0-4.3,0c0,1,0.1,2,0.1,3c0.8,0,2.4-0.1,3.2-0.1c0,1.8,0,3.7,0,5.5
+		c0.4-0.1,1.2-0.4,1.6-0.5c0.3-0.5,1.1-1.6,1.4-2.1c0.7,0,2.1,0.1,2.8,0.1c1.7-2.1,4.2-2.2,6.7-2c1-0.7,2-1.5,3-2.2
+		c0-2.3,0-4.6-0.1-6.8c-0.7,0.5-1.5,1-2.2,1.5c0.4,1.6,0.8,3.3,1.1,5c-1.1-0.1-3.2-0.4-4.3-0.5c-1.3-1.5-2.5-3.2-4.2-4.3
+		c0-0.8,0.1-2.5,0.2-3.3c3-1.2,6.2-2.8,9.3-0.9c0-0.7,0.1-2,0.1-2.7c-0.3,0.2-0.8,0.7-1.1,0.9c-0.4,0.1-1.1,0.3-1.5,0.4
+		c-2-2.6-3.4-5.7-5.3-8.4h-5.8c2.5,1.8,5.1,3.6,7.9,5.1c-2,1.7-4.2,2.8-6.7,1.2c-1.3,1.4-2.6,2.9-3.8,4.3c1.2-0.1,2.4-0.1,3.6-0.2
+		c0.5,0.8,0.9,1.6,1.4,2.4c-0.1,1.2-0.2,2.5-0.2,3.7c0.7,0,2.2-0.1,3-0.2c0.5,1.4,1.1,2.8,1.6,4.3c-1.7-0.1-3.4-0.1-5.1-0.2
+		C1403.1,19.5,1402.3,18.5,1401.6,17.5z"/>
+	<path class="st0" d="M1416.1,1.6c-0.1-0.4-0.2-1.2-0.3-1.6h-2.7C1413.6,1,1414.8,2.3,1416.1,1.6z"/>
+	<path class="st0" d="M356.4,3.5c0-0.5,0.1-1.6,0.2-2.1c-1,0-2,0.1-3.1,0.2c0,0.5,0,1.5,0,1.9C354.5,3.5,355.5,3.5,356.4,3.5z"/>
+	<path class="st0" d="M1292.6,7.6c-0.3-0.3-1-1-1.3-1.3c0-0.6-0.1-1.8-0.1-2.4c-1.7,0.1-2.3-1.3-2.9-2.5c0.2,1.2,0.4,2.4,0.6,3.6
+		C1290.3,5.6,1291.5,6.6,1292.6,7.6z"/>
+	<path class="st0" d="M441.8,7.3c0.3,0,1,0.1,1.3,0.1c0.5-1,0.9-2.1,1.4-3.1c-1.4-1.8-3.6-1.8-5.6-1.7c0.9,0.4,1.8,0.7,2.8,1.1
+		C441.7,4.9,441.7,6.1,441.8,7.3z"/>
+	<path class="st0" d="M1392.7,9.3c1.5,0.1,3,0.2,4.5,0.3c-1.9-2.1-4.4-3.6-6.3-5.8c-0.8-0.1-1.6-0.3-2.3-0.4c0,1-0.1,2.1-0.1,3.1
+		c1.4-0.1,2.8-0.2,4.2-0.3C1392.7,7,1392.7,8.6,1392.7,9.3z"/>
+	<path class="st0" d="M379.8,6.1c-0.6-1-1.7-3-2.3-4c-0.2,1.9-0.1,3.8,0,5.7C378.3,7.2,379.1,6.6,379.8,6.1z"/>
+	<path class="st0" d="M341.6,4.1c-2.4-0.1-3.4,1.4-3.5,3.6c1.1,0,2.3-0.1,3.5-0.1C341.6,6.4,341.6,5.2,341.6,4.1z"/>
+	<path class="st0" d="M394.7,5.7c-1-0.1-2.1-0.2-3.1-0.3c0,1.3,0.1,2.5,0.1,3.8c-2.1,0.9-3.9,2.3-4.8,4.4c1.9-0.1,4,0.2,5.5-1.3
+		C393.7,10.3,394.1,7.9,394.7,5.7z"/>
+	<path class="st0" d="M1260,5.5c-1.8,0.3-4-0.5-5.3,1.1c-0.2,1.1-0.3,2.1-0.4,3.2C1257,9.7,1258.5,7.4,1260,5.5z"/>
+	<path class="st0" d="M335.6,8.6c0-0.5-0.1-1.5-0.1-2c-1.1,0-2.2-0.1-3.2-0.1c0,0.6,0.1,1.7,0.1,2.3C333.5,8.6,334.5,8.6,335.6,8.6z
+		"/>
+	<path class="st0" d="M602.2,7.8c-0.8-1.5-1.7-1.5-2.5,0C600.6,9.2,601.4,9.2,602.2,7.8z"/>
+	<path class="st0" d="M382.5,13.5c0.1-1.1,0.1-2.2,0.2-3.3c-2.5,0.2-5.2,0.9-6.6,3.1C378.3,13.5,380.4,13.5,382.5,13.5z"/>
+	<path class="st0" d="M440.2,14.8c0,0.2,0.1,0.5,0.1,0.7c1.9,0.1,3.7,0.2,5.6,0.3c-0.1-1.4-0.3-2.8-0.4-4.2c-0.4,0-1.2,0-1.6,0
+		C443.7,13.7,442.4,15.1,440.2,14.8z"/>
+	<path class="st0" d="M332.9,12.5c1.2,0.9,2.5,1.8,3.7,2.7c2.4,0.3,4.7,1,6.8,2.2c-0.1-0.8-0.1-1.6-0.2-2.4
+		C339.6,14.4,336.7,11.7,332.9,12.5z"/>
+	<path class="st0" d="M407,15.4c1.6-0.6,0.6-3.4-1-3C404.4,13.1,405.4,15.9,407,15.4z"/>
+	<path class="st0" d="M371.1,14.7c-1.5-0.1-3.1-0.2-4.6-0.3c0,0.6-0.1,1.9-0.1,2.5C368.2,16.8,370.1,16.5,371.1,14.7z"/>
+	<path class="st0" d="M1255.4,14c-1,1.3,1.1,3.5,2.2,1.8C1258.6,14.5,1256.4,12.3,1255.4,14z"/>
+	<path class="st0" d="M362.8,15.3c-1.1,0.1-2.2,0.2-3.3,0.2c-0.1,1.1-0.2,2.2-0.3,3.3c1.1-0.4,2.3-0.8,3.4-1.2
+		C362.7,17.1,362.7,15.9,362.8,15.3z"/>
+	<path class="st0" d="M402.1,15.3c-1.3,0.1-2.5,0.1-3.8,0.2c0.1,1.8,0.2,3.5,0.3,5.3C400.1,19.1,401.3,17.3,402.1,15.3z"/>
+	<path class="st0" d="M1386.7,18.9c-0.1-1.2-0.2-2.3-0.2-3.5c-1.5,0-3,0-4.5,0C1381.8,18.5,1384.4,18.8,1386.7,18.9z"/>
+	<path class="st0" d="M347.5,16.2c0,0.6,0.1,1.8,0.1,2.4c1.3-0.1,2.7-0.1,4-0.2c0.5,0.9,0.9,1.7,1.4,2.6c0.3,0.1,1,0.4,1.3,0.6
+		c0-0.9,0.1-1.8,0.1-2.7C352,18,350.2,15.9,347.5,16.2z"/>
+	<path class="st0" d="M381.3,22.4c1.6,0.1,3.3,0.1,5,0.2c-0.5-0.3-1.3-1-1.8-1.4c0-0.4-0.1-1.1-0.1-1.4c1.5-0.8,2.9-1.8,3.8-3.3
+		c-1.1-0.1-2.3-0.1-3.4-0.2C382.8,17.9,380.8,19.6,381.3,22.4z"/>
+	<path class="st0" d="M393.1,17.3c-2,1.9-5.6,3.4-4.7,6.8c2.8-1.8,5.4-3.9,8.6-4.8C395.1,19.9,392.9,19.9,393.1,17.3z"/>
+	<path class="st0" d="M331,20.6c-0.2-3.3-3.2-3.2-5.7-3.2C324.5,21.3,328.5,20.5,331,20.6z"/>
+	<path class="st0" d="M412.5,19.2c-3-0.2-3,2.3-3.3,4.5c1.1,0,2.2,0,3.3,0C412.5,22.5,412.5,20.3,412.5,19.2z"/>
+	<path class="st0" d="M1250.7,20.2c-0.5,0.1-1.4,0.2-1.9,0.3c-0.6,1-1.1,2.1-1.7,3.2c1.1-0.1,2.2-0.2,3.3-0.3
+		C1250.5,22.3,1250.6,21.3,1250.7,20.2z"/>
+	<path class="st0" d="M1692.7,823.4c-0.1-0.5-0.2-1.3-0.3-2h16v-13.6c0,0.2,0.1,0.3,0.1,0.4c1.8,0,3.6,0,5.5,0.1
+		c-0.4,1.6-1.3,2.6-2.9,3.2c1,0.4,2.1,0.7,3.1,1.1c0-3.3,0.3-6.6,0.4-9.9c-1,0.8-1.9,1.6-2.6,2.6c-1.2,0.3-2.4,0.6-3.6,0.8v-3.7
+		c0.6-0.1,1.2-0.2,1.9-0.2c0.1-0.9,0.2-1.7,0.2-2.6c-1.3-0.7-1.9-1.7-2.1-2.9v-17.5c0.7,0,1.4,0,1.9-0.1c0-1.4,0-2.7,0-4
+		c0.9,0.1,2.6,0.3,3.5,0.4c-0.1-0.5-0.3-1.6-0.4-2.1c-0.5-0.4-1.5-1.1-2-1.4c-0.1-1.2-0.1-2.5-0.1-3.7c-1,0-2-0.1-3-0.1v-8.6
+		c0.7-0.1,1.8-0.1,2.4-0.2c-0.3-2.3-0.6-4.6-2-6.6c-0.1,0.4-0.3,0.8-0.4,1.2v-12.4c0.4-0.1,0.7-0.2,1.1-0.4
+		c-0.1-0.8-0.2-2.5-0.2-3.3c1.8,0,3.6,0.1,5.4,0.1c-0.1,2-0.2,4.1-0.3,6.1c-0.6,0-1.9,0.1-2.5,0.2c-0.6,1.6-1.2,3.2-1.7,4.8
+		c1.2,0.5,2.5,0.9,3.7,1.4c-0.5,1.1-1.1,2.3-1.6,3.5c1.4,1.1,2.8,2.1,4.3,3.1c2.5-0.5,5.1,0,7.6-0.1c1.9-0.5,3.3-2.1,4.9-3.2
+		c-1.6-1.1-3.4-1.8-5.2-2.2c-0.8,1.3-1.7,2.7-2.5,4c-2.6-0.6-5.2-1.5-7.6-2.7c0.8-1.3,1.6-2.6,2.4-4c0.8,0.1,2.5,0.2,3.4,0.2
+		c0.3-3.4-0.4-6.7-2.1-9.6c0-1,0-3.1,0-4.1c4,0.8,3.7,5.6,5.1,8.7c0.5,0,1.5,0,2,0c0-2.1,0-4.3,0-6.4c1.3,0.3,2.6,0.7,3.9,1.1
+		c0.5,1.7,1.1,3.3,1.6,5c0.2-1,0.5-2,0.7-3c-0.9-1.6-1.8-3.2-2.7-4.8c-0.7,0-1.5,0.1-2.1,0.1c-1.3,1.1-2.6,2.1-4.3,2.3
+		c-0.7-1.5-1.3-2.9-1.8-4.4c0.9,0,2.7,0.1,3.6,0.1c0.4-0.8,1.1-2.3,1.5-3c-1.3,0-2.6,0-3.8,0c-2.5,3.2-5.8,7.2-10.3,5.9
+		c-0.2-1.4-0.4-2.8-0.5-4.2c-0.4,0.1-1.1,0.3-1.5,0.4c-0.1,0.3-0.2,0.6-0.4,0.8v-15.8c1.4-1.5,3.1-2.8,5.1-3.7
+		c0.5-2.1,0.8-4.2,1.2-6.2c-2.1,0-4.2-0.3-6.3-0.6v-5.7c0.1-0.7,0.2-1.5,0.4-2.2c-0.1,0-0.2,0.1-0.4,0.1V680
+		c0.3-0.4,0.6-0.9,0.7-1.6c-0.2,0-0.5,0-0.7,0v-13.2c0.4,0.1,0.8,0,1.2-0.4c0.6-0.9-0.3-2.2-1.2-2.3v-3.4c1.1,0.4,2.2,0.6,3.5,0.4
+		c-1.1-1-2.3-1.9-3.5-2.7v-13.5c0.4,0.2,0.8,0.4,1.1,0.5c0,0.7,0.1,2,0.1,2.6c0.9-0.1,1.7-0.1,2.6-0.2c0-0.7,0-2,0.1-2.7
+		c0.3-0.2,1.1-0.5,1.4-0.7c-0.8-0.1-2.5-0.3-3.3-0.4c0-1.3,0.1-2.6,0.1-4c-0.7,0-1.4,0-2.1,0v-17.8c0.1-0.1,0.2-0.2,0.3-0.3
+		c1.2,0.1,2.5,0.2,3.8,0.4c-0.1-0.5-0.1-1.6-0.2-2.2c-1.1,0.1-2.3,0.2-3.4,0.3c-0.1,0.5-0.4,0.9-0.6,1.2v-21.2
+		c0.5-0.1,1.5-0.4,2-0.5c0.2-2.6,0.1-5.3-1.6-7.5c-0.1,0.3-0.3,0.7-0.4,1v-13.6c0.6,0.6,1.3,1.2,2,1.9c0.1,0.8,0.3,1.6,0.5,2.4
+		c0.7-1,1.7-1.4,2.9-1.2c0.3,0.5,1,1.4,1.3,1.8c0.5,0.5,1.6,1.4,2.1,1.9c1.3-2,2.5-4.2,2.4-6.6c-1.6,0.5-3.2,1.2-4.7,1.8
+		c-2.4,1.1-4.9,0.4-4.9-2.5c-0.4,0-1.1,0.1-1.6,0.1v-3.2c0.6,0,1.2,0,1.8,0c0.3-1.1,0.7-2.1,1-3.2c1.6,0,3.2-0.1,4.9-0.1
+		c-1.3-0.3-2.6-0.5-3.8-0.8c0-0.6-0.1-1.7-0.1-2.2c-1.3,0.9-2.8,1.8-3.8,3v-45.5c0.4,0.1,0.8,0.2,1.2,0.3c-0.1-2-0.1-4-0.2-6
+		c-0.4,0.2-0.7,0.4-1.1,0.6V263.3h-210.2c0.1-1.3,0.1-2.5,0.2-3.8c-0.8,0.1-2.3,0.2-3,0.2c0-0.7-0.1-2.2-0.1-3
+		c-1.5,1.6-2.9,3.3-4.4,4.8c0.7-0.5,2.1-1.6,2.8-2.1c0.4,0.9,1,2.7,1.5,3.8h-7.8c-2.4-0.5-4.7-1.1-7-1.9c-0.1-1.1-0.2-2.2-0.3-3.3
+		c-0.4,1.7-0.8,3.5-1.2,5.2h-88.1V232c0.6,0.7,1.7,1.8,2.3,2.4c1.5-0.8,2.9-1.5,4.4-2.2c0-2.1-0.1-4.2,0-6.3
+		c1.1-0.8,2.1-1.6,3.2-2.4c0-0.7-0.1-2-0.2-2.7c-1.9,0.5-3.4,1.7-4.6,3.2c-1.2,0.6-2.3,1.3-3.5,1.9c1.2,0.9,2.5,1.7,3.7,2.6
+		c-0.6,2.4-1.5,4.9-4.6,4.3c-0.1-1.3-0.2-2.5-0.3-3.8c-0.2-1.4-0.3-2.7-0.4-4.1v-36.3c0.1-0.5,0.1-1.1,0.2-1.6
+		c-0.1-0.6-0.1-1.1-0.2-1.7v-11.1c0.1-0.8,0.2-1.5,0.4-2.3c-0.1-0.7-0.3-1.5-0.4-2.2v-3.5c1.3-0.4,2.6-0.9,4-1.3
+		c-1.3-0.2-2.7-0.5-4-0.8c0-0.1,0-0.3,0-0.4v-15.6c0.1-1,0.2-2.1,0.3-3.1c0.1-2.2-0.1-4.4-0.3-6.6v-4.6c0.8-0.5,1.6-1.1,2.4-1.6
+		c-0.8-0.8-1.6-1.7-2.4-2.5v-29.1c0.1-0.9,0.1-1.9,0.2-2.8c0.5,1.7,1.1,3.4,1.6,5.1c0.9-1,1.8-2,2.7-3c-0.4-1-0.9-1.9-1.3-2.9
+		c0.7-0.3,2.2-1,3-1.3c-0.8-1.6-1.6-3.2-2.4-4.8c0.3-0.8,0.9-2.5,1.2-3.4c-1.2,0.1-2.3,0.2-3.4,0.3c0.3,2.1,0.8,4.2,0.9,6.3
+		c-0.6,0.3-1.8,0.9-2.6,1.2V46.6c0.6-0.1,1.1-0.2,1.7-0.3c0.2,0,0.3,0,0.5-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0c-1-0.4-1.7-1-2.3-1.8
+		v-1.8c0.1,0,0.2-0.1,0.3-0.1c0.6,0.2,1.2,0.4,1.6,0.5c0-0.3-0.1-0.7-0.1-1.1c0.2-0.1,0.3-0.1,0.5-0.2c0.1,0,0.1,0.1,0.2,0.1
+		c0,0.3,0,0.8,0,1.1c0.5,0,1.4,0,2-0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0-0.1c0,0,0.1,0,0.1,0c0-0.5,0.1-1.2,0.1-1.9c0-0.1,0-0.3,0-0.4
+		c0,0,0,0,0,0c0-0.1,0-0.1,0-0.2c-0.9,0-1.8,0.1-2.7,0.1c-0.8,0-1.5,0-2.3,0v-6.9c0.6-0.4,1.4-0.9,1.9-1.2c-0.1-0.4-0.2-1.3-0.2-1.8
+		c-0.6-0.6-1.1-1.3-1.7-1.9v-3.2h-0.5c-0.1,0-0.2,0-0.2,0c-2.3-0.1-4.6-0.1-6.9-0.2c-1.1-1.1-2.1-2.3-3.2-3.4
+		c-0.5,1.2-1,2.3-1.4,3.5c-0.9,0-1.8,0-2.7,0l-876.1,0c-37.6,0-75.2,0-112.8,0c-5.1-0.4-10.2-1.3-15.2,0h-1.2
+		c-0.2-0.2-0.4-0.3-0.6-0.5c-0.4-0.3-0.8-0.7-1-0.9c-0.2,0.2-0.6,0.4-0.9,0.7c-0.4,0.2-0.8,0.4-1.1,0.6c-0.5,0-1.5,0.1-2,0.1
+		c0,0,0,0,0,0c-0.8,0-1.6,0-2.4,0c-2,0-4,0-6.1,0h-1.2c-1.4-0.1-2.8-0.2-4.3-0.6c-0.3-0.2-0.7-0.5-0.9-0.6c-0.4,0.3-1.1,0.8-1.6,1.1
+		c-0.1,0-0.1,0.1-0.1,0.1l-2.8,0c-0.5,0-1,0-1.5,0c-0.7,0-1.4,0-2.1,0c-0.7,5.9,0.5,12-0.4,17.9c-0.3,0.1-0.7,0.3-1.2,0.4
+		c-0.3,0-0.7,0-0.9,0c0.1,0.3,0.1,0.5,0.2,0.7c0,0.2,0,0.5,0,0.7c0,0,0.1-0.1,0.1-0.1c0,0.1,0,0.1,0,0.2c0.3-0.2,0.9-0.6,1.4-1
+		c0.2-0.1,0.4-0.2,0.6-0.3c0,1.5,0.1,3.1,0.1,4.6c0.1,13.8-0.3,27.6,0,41.4c-0.1,2.5-0.1,5.1-0.1,7.6c-0.1,6.1-0.2,12.3,0.1,18.4
+		c0,0.4,0,0.9,0,1.3c0,1.6,0,3.2,0,4.8c-0.1,4.2-0.3,8.4,0,12.6c-0.1,0-0.2,0-0.3,0c-0.4,0-0.9,0-1.2-0.1c0,0,0.1,0.1,0.1,0.1
+		c-0.1,0-0.2,0-0.4,0c0.3,0.1,0.5,0.3,0.7,0.5c0.4,0.7,0.8,1.5,1.1,2.2c0,0.3,0,0.6-0.1,1c0,0,0,0.1,0,0.2c-1.1,0-2.1,0.1-3.2,0.1
+		c0,1.3-0.1,2.6-0.1,3.8c-0.9,0-2.8-0.1-3.7-0.1c0.6,1.6,1.2,3.1,1.9,4.7c0.9-1.9,1.7-3.7,2.5-5.6c0.6-0.4,1.9-1.1,2.5-1.4
+		c0,3.7,0.1,7.5,0.1,11.2c0,0.7,0,1.3,0,2c-1.4,0.2-2.7,0.5-4.1,0.8c0,0,0.1,0,0.1,0c-0.1,0-0.2,0-0.2,0c1.4,0.1,2.7,0.2,4.1,0.4
+		c0,0.5,0.1,1.1,0.1,1.6c-0.1,2,0,4.1,0,6.1c-0.1,2.7-0.2,5.5-0.3,8.2c-0.1,0.9-0.3,1.7-0.5,2.5c0.2,0.9,0.4,1.8,0.5,2.7
+		c0,1.4,0.1,2.8,0.2,4.2c0,2.8,0,5.7,0,8.5c0,4.4,0,8.8,0,13.2c0,12.5-0.1,24.9-0.1,37.4c0,3-0.1,5.9-0.2,8.9
+		c0.1,1.9,0.2,3.7,0.2,5.6c0,1.4,0,2.9,0,4.3l0,5.9c-14.9,0-29.7,0-44.6,0c-89.2,0-178.4,0-267.6,0v121.6c-1.2,0.2-2.4,0.4-3.6,0.6
+		c1.2,0.3,2.4,0.5,3.6,0.8v88c-0.2,1.5-0.7,2.9-1.2,4.4c0,0.1-0.1,0.2-0.1,0.3c0,0,0,0,0,0.1c-0.1,0.3-0.2,0.6-0.3,0.8
+		c0.4,0.4,1.1,1.2,1.6,1.6v5.5c-0.1,3.2-0.3,6.4-0.2,9.6c0.1,2.2,0.2,4.4,0.2,6.6v16.7c-0.1,5.6-0.1,11.3,0,16.9
+		c0,9.5,0,19.1,0,28.6c0,0.6,0,1.2-0.1,1.8c0,0.3,0,0.6,0.1,0.8c0,4.4,0,8.9,0,13.3v22.7c0,2-0.2,4.1-0.4,6.1
+		c-0.7-1.7-1.4-3.4-2.1-5c-0.9,0-1.8,0.1-2.7,0.1c-0.3,1-0.7,2-0.9,3c1.7,2,3.9,3.5,6,5.1c0,0.7,0.1,1.4,0.1,2.1v8.5
+		c-0.1,4.4-0.3,8.7-0.2,13.1c-0.3,0.4-0.7,1.2-1,1.8c-0.2,0.2-0.3,0.3-0.5,0.5c-1,0.1-2.8,0.2-3.7,0.3c0.1-2.4,0.1-4.8,0.2-7.2
+		c-0.5-0.3-1.5-1-2-1.4c-0.1-1.6-0.2-3.3-0.2-4.9c1.5,0,3.1,0,4.6,0.1c-1-1.9-2-3.7-3.1-5.6c-0.1,1.6-0.2,3.2-0.2,4.9
+		c-1.6,0.4-3.2,0.8-4.8,1.2c-0.8,1.2-1.6,2.5-2.4,3.7c-1.5-0.1-3.1-0.1-4.6-0.2c-0.1,1.2-0.3,2.4-0.5,3.6c-2,1.9-4.8,2.8-6.3,5.2
+		c2.2,0.1,4.5,0.2,6.8,0.2c0.1,2.9-0.4,5.8-1.2,8.7c1,0.5,1.9,0.9,2.9,1.4c0.5,3,1.4,6,0.3,9c-1,0-2.9,0-3.8-0.1
+		c-1.7-1.5-3.4-3-5.1-4.4c-0.3-1.5-0.6-3-1-4.6c-1.2-0.1-2.5-0.3-3.7-0.4v17.1c2.3,0.2,2.5,5.2,0,4.9v7.8c0.4-0.5,1.1-1.4,1.5-1.8
+		c1.8,0,3.6,0.1,5.4,0.2c-0.5,1.8-1,3.6-1.5,5.4c-1.8-0.6-3.6-1.2-5.4-1.8v10c0.9,0.5,1.8,1,2.7,1.4c1.6-0.5,3.3-1.1,4.9-1.6
+		c0,1.2,0,3.5,0,4.6c-2.5,0-5.1,0-7.6,0.1v3.1c2,0.8,2.6,2.9,3.5,4.6c1,0.2,2,0.3,2.9,0.4c0.3-0.5,1-1.6,1.3-2.2
+		c2.8-0.2,5.5-0.9,8.3-0.9c2.5,0.8,4.9,1.7,7.5,2.2c0-0.9-0.2-2.8-0.2-3.7c1.7,0.2,3.4,0.4,5.1,0.7c-0.1,1.6-0.4,3.3-0.7,4.9
+		c-1.2,0-2.4-0.1-3.5-0.1c-0.9,4.8-8.3,4.1-9.3-0.3c-0.9,0.9-1.8,1.9-2.8,2.8c5.9,0.9,11.6,3.1,17.6,2.2v2.6
+		c-0.1,1.8-0.2,3.6-0.4,5.3c-3.9,0.9-7.9-0.4-11.8-1c0,1.5,0.1,3.1,0.2,4.6c3.2,1,5.8,3.2,8.1,5.6c1.3,0,2.5-0.1,3.8-0.1
+		c0,3,0.1,6,0.1,9v14.5c0,0.4,0,0.8,0,1.2c0.1,1.6-1.2,2.7-2,3.9c-0.1,0.7-0.2,1.3-0.3,2c0,0,0,0,0.1,0c0,0.1-0.1,0.2-0.1,0.3
+		c0.3,0,0.6,0.1,1,0.1c0.8,0.5,1.2,1.2,1.4,2v4c-0.2,1.3-0.3,2.5-0.2,3.5c-0.8-0.7-2.3-2.1-3-2.8c0-0.5-0.1-1.6-0.2-2.1
+		c-3-1-5-3.3-5.2-6.5c-1.9-0.1-3.7-0.1-5.6-0.2c0.3,4.7,0.8,9.7-1.9,13.9c-1.8,0.1-3.7,0.1-5.4,0.5c-3.3,1.7-2.5,5.8-2.8,8.9
+		c1-0.1,2-0.1,3-0.2c0.3-1.8,0.6-3.5,1-5.3c2.4,0.1,4.7,0.1,7.1,0.2c1.2-3.6,1.3-7.4,1.1-11.2c1.4,0,2.8,0,4.2,0
+		c3.3,2.8,5.3,6.6,6.9,10.5c0.5,2.9,1,5.9,1.2,8.8v3.9c-4.6,0-9.4,0.3-13.6-2c0.6-1.7,1.2-3.4,1.8-5.1c-1.3-0.4-2.6-0.8-3.9-1.1
+		c-1.5,3.9-5.4,6.2-7,10c1.1,0.1,2.2,0.3,3.4,0.5c0.4-0.4,1.2-1.2,1.7-1.6c1.2,1.1,2.4,2.2,3.6,3.4c4.7-0.3,9.4,0.5,14,1.1v1.7
+		c-0.1,1.9-0.2,3.8-0.4,5.7c-0.5-0.4-1.6-1.3-2.1-1.7c-2.8,0.4-5.6,0.8-8.3,1.7c-0.2,1.2-0.4,2.4-0.5,3.7c-1.2,1.3-2.5,2.6-3.8,4
+		c-0.5,0-1.5,0-2-0.1c0-1.9,0.1-3.8,0.1-5.7c1.7-0.5,3.4-1,5-1.6c1.1-2.8-1.8-3.3-3.7-4.2c-1.8,1.8-3.9,3.4-5.4,5.5
+		c-0.9,1.7-1,3.8-1.3,5.7c1.9,0.8,3.7,1.6,5.5,2.4c-0.5,2.2-1,4.5-1.4,6.8c0.8,0.7,1.5,1.4,2.3,2.1c0.9,0,1.8,0,2.7,0
+		c0.2-1.8,0.5-3.5,0.8-5.3c1.5,0,3.1,0.1,4.6,0.1c0,3.1-0.1,6.1-0.1,9.2c1.8,0.7,3.7,1.3,5.5,2c-0.6,1.8-1.1,3.5-1.7,5.3
+		c2.1-0.3,4-1,5.8-2.1c2.5-0.3,4.9-0.7,7.3-1.3c0-1,0-2,0-3h12c0.1,1.1,0.2,3.2,0.2,4.2c-3.1,2.2-6.7,3.2-10.4,2.8
+		c0.1,1.2,0.1,2.5,0.2,3.7c2.5,1.9,3.6,4.7,3.1,7.8c-1.4,1.1-2.8,2.2-4.1,3.3c0,0.9,0.1,1.7,0.2,2.6c1.8,1.3,4.8,2.2,3.9,5.1h4
+		c-0.7-8.2,1.7-16.1,2.3-24.2c2.9-0.4,5.8-0.2,8.6-0.2c2-1.7,4-3.4,5.9-5.1h1.1c0,1.1,0,2.1-0.1,3.2c1-0.1,2-0.2,2.9-0.3
+		c0-0.7,0.1-2.2,0.1-2.9c0.1,0,0.2,0,0.2,0h8.8c0,2.6,0.5,5.2,2,7.5c1,0.4,2,0.9,3,1.5c0.2,2.1,0.1,4.2,0.2,6.3c-2.5,0-4.9,0-7.3,0
+		c-0.1-2-0.2-3.9-0.4-5.9c-1.8-0.1-3.5-0.1-5.3-0.2c-0.8-0.7-1.5-1.5-2.3-2.2c-0.4,0-1.1-0.1-1.5-0.1c-0.9,1.5-1.8,3-2.7,4.6
+		c1.4,3.7,0.4,8.1,2.2,11.6c4-0.5,7.9-1.3,11.9-1.3c0.3-0.5,1-1.6,1.4-2.1c1.6,0.3,3.3,0.5,4.9,0.8c0,1.1-0.1,3.3-0.1,4.4
+		c-4.3,0.3-8.6,1-12.9,1.2c-0.2,1.1-0.4,2.2-0.6,3.3h1.3h7.1h1.8c0-0.9,0-2.7,0-3.6c2.2,0,4.4-0.1,6.6-0.1c-0.2,0.9-0.5,2.8-0.7,3.7
+		h8.3c0.8-0.4,2.3-1.2,3.1-1.6c-0.1-1.2-0.1-2.3-0.2-3.5c-0.5-0.3-1.3-1-1.8-1.3c-0.3-1.7-0.7-3.5-1-5.2c-1.1,0-2.2,0-3.3,0
+		c0.1,1.2,0.2,2.5,0.3,3.7c1.2,0.5,2.4,1,3.6,1.5c-0.5,1.4-1.2,2.8-1.8,4.2c-4.4,0.3-5.9-4.7-7.8-7.7c-1.8-2.7-1-5.9-0.3-8.8
+		c2.1,0.1,4.2,0.2,6.4,0.4c-0.1-0.9-0.2-1.8-0.2-2.8c-3.6-1.5-6.8-4.3-7.2-8.4h43.3c0,0.3,0,0.6,0.1,0.8c-1.6,0.1-3.1,0.2-4.7,0.5
+		c-0.3,1.1-0.5,2.3-0.7,3.4c1.4,0.5,2.8,1,4.2,1.4c0.6-1.1,1.1-2.1,1.7-3.2c2.8,0.6,5.6,1,8.4,1.3c0.1-1,0.1-2.1,0.1-3.1
+		c-0.3-0.3-0.7-0.7-1.2-1.1H157c-0.1,2.2-0.5,4.3-0.7,6.5c0.5-0.2,1.4-0.5,1.9-0.7c0.4-1,0.7-1.9,1.1-2.8c-0.3-1-0.3-1.9-0.1-2.9
+		h11.7c-0.1,0.8-0.2,2.3-0.3,3.1c1.6,1.1,3.3,2.2,4.9,3.4c0-1-0.1-2-0.1-2.9c-1.2-1.2-2.4-2.3-3.6-3.5h66.8c0,0.6,0,1.3,0,1.7
+		c1.6,0.4,3.2,0.8,4.9,1.3c0-1-0.1-2-0.1-3h38.6c-2.3,3-5.3,5.3-8.4,7.4c0,1.2,0,2.4,0,3.7c1.3,1.2,2.6,2.5,4,3.7
+		c0.6,0,1.8,0.1,2.4,0.1c-2.7-2-2.9-5.3-2.7-8.4c3,0.7,6.7,2.5,9.3-0.2c-0.1-2.1-0.1-4.3-0.1-6.4h30.9c1,0.3,2,0.7,3,1.1
+		c0.5,1.3,0.9,2.6,1.4,4c1,0,2.1,0,3.1,0c-0.1-0.9-0.2-1.8-0.3-2.7c-0.7-0.8-1.4-1.7-2-2.5h839.3c0,0.2,0,0.5-0.1,0.7
+		c-0.6,0.8-1.2,1.6-1.8,2.4c1.8,1,3.8,0.5,5.8,0c-0.1-0.6-0.1-1.5-0.2-2.3c0-0.3,0-0.5,0.1-0.8h12.2c0.6,0,1.2,0,1.8,0h7.9
+		c0.1,0.9,0,1.9,0.1,2.9c0,0.5,0,1,0,1.3c0.1,0,0.2,0,0.3,0c0.4,0.7,1,1.2,2.2,1.3c0.4-0.9,0.7-2.2,1.1-3.3c0.2-0.5,0.5-0.9,0.7-1.4
+		c0.2-0.3,0.5-0.6,0.8-0.8h19.9c0.8,0.2,1.6,0.5,2.4,0.9c0,0,0.1,0,0.1-0.1c0,0,0.1,0,0.1,0.1c0.1-0.1,0.2-0.2,0.2-0.2
+		c0.5-0.2,0.9-0.5,1.4-0.7h8.2c2.2,0.3,4.3,1,6.2,2.2c0.7-0.7,1.4-1.5,2.1-2.2h11.5c2.3,0.9,4.5,2.2,6.8,3.2
+		c-0.1,1.8-0.1,3.6-0.1,5.5c-0.7,0.8-1.3,1.7-2,2.5c0,0.4-0.1,1.3-0.1,1.7c0.3,0.5,1,1.5,1.4,2.1c0.4,0.1,1.2,0.2,1.7,0.3
+		c0.8-2.1,1.7-4.1,2.8-6.1c0.1,1.6,0.1,3.2,0.2,4.8c0.9,0.3,1.9,0.7,2.9,1.1c0.2,2.3,0.6,4.6,1.1,6.9c0,0-0.1,0-0.1,0.1
+		c-0.1,0.1-0.2,0.1-0.3,0.2c-0.9-0.5-1.9-1-2.8-1.5c0.1,1.3,0.2,2.7,0.3,4c-0.3,0.5-1,1.4-1.3,1.8c1,0.6,1.9,1.3,2.9,1.9
+		c0,0.1,0.1,0.3,0.1,0.4l-1.4,0.6h1.6h1.6h5h7.2h4.4c1.4-1.8,2.8-4.5,5.6-3.5c0.2,1.2,0.3,2.3,0.4,3.5h2.3c0.5-0.8,1.1-1.6,1.7-2.4
+		c0.2-1.1,0.2-2.2,0.1-3.2c-1.2-1.2-2.4-2.4-3.8-3.3c-1.1-0.2-2.2-0.4-3.3-0.7c-0.2-1.4,0.9-2.5,0.8-3.8c-1.6,0-2.5,1.5-3.7,2.3
+		c-2.1,0.5-4.3,0.1-6.3,0.5c-0.6,2.1,0.6,5.1-1.6,6.5c-1.6,0.3-3.6,1.1-5,0.2c0.8-0.6,1.8-1.2,2.8-1.6c-0.1-2.3-0.9-4.7,0.3-6.7
+		c0.5-0.5,1-0.9,1.6-1.3c-0.2-0.4-0.4-0.7-0.6-1.1c0-0.5,0-1,0-1.3c-0.3,0-0.8-0.1-1.3-0.2c-0.5-0.4-1-0.7-1.5-0.9
+		c-0.1,0.4-0.2,0.8-0.3,1.2c-1,1.2-1.1,3-1.9,4.4c-0.4-0.2-1.3-0.5-1.7-0.6c-1.4-1.7-1.6-4-1.1-6.1c0.6-1.5,2.5-1.2,3.8-1.6
+		c-2.3-1.6-5.2-1.1-7.7-1.3c-2.3-1.8-2.1-5.1-3.9-7.3c-0.4-0.3-1.3-0.9-1.8-1.2l0-0.1h8.2c-0.2,0.9-0.3,1.7-0.4,2.6
+		c0.1,0.1,0.2,0.3,0.3,0.4c0,0.1,0,0.2,0,0.3c0.1,0,0.2,0,0.3-0.1c0.5,0.4,1.1,0.2,1.5-0.3c0.3,0,0.5-0.1,0.8-0.2
+		c0-0.2-0.1-0.5-0.2-0.8c0.3-0.7,0.6-1.4,0.7-1.9h5.2c-0.8,1.6-1.7,3.2-2.3,4.9c-0.4,0.7-0.3,1.6,0.1,2.2c0,0.1,0,0.1,0,0.2
+		c0,0,0.1,0,0.1,0c0.3,0.3,0.7,0.5,1.3,0.3c1-1,1.2-2.3,1.6-3.6c0.3-0.4,0.5-0.8,0.9-1.2c0.4-0.2,0.9-0.4,1.2-0.6c0-0.8,0-1.5,0-2.2
+		h10.8c0.5,0.1,1,0.3,1.5,0.5c0,0.1,0,0.2,0,0.3c-1,0.1-2.3,0.2-3.1,0.3c-0.1,0.2-0.1,0.6-0.2,0.9c-0.3,0.3-0.4,0.6-0.2,0.9
+		c0,0.2-0.1,0.4-0.1,0.5c0.2,0,0.3,0,0.5,0c0.1,0.1,0.2,0.2,0.3,0.2c1.3,0,2.6,0,4,0c0.6,0.3,1.2,0.6,1.8,0.9
+		c0.3,0.4,0.5,0.8,0.8,1.2c0-0.2-0.1-0.5-0.1-0.8c0.1,0.1,0.3,0.1,0.4,0.2c-0.1-1.8-0.9-3.4-1.4-5.1h51c0.1,0.6,0.1,1.2,0.3,1.8
+		c1.5,1.3,3.2,2.1,4.8,3.4c0.6,1,0.2,2.3-0.5,3.2c-2.1,1.3-4.1,2.6-5.7,4.4c0.4,3.3,3.6,5.2,4.4,8.4c1.8-1.3,3.3-2.9,5.1-4.1
+		c0.2-1,0.1-2-0.3-3c-1.7-0.8-3.5,0.3-5.2,0.2c-0.2-0.4-0.6-1.1-0.8-1.5c0.5-0.2,1.6-0.7,2.1-0.9c1.9-1.8,3.2-4.4,5.8-5.3
+		c0.2-0.5,0.5-1.5,0.7-2c-0.9-1-2.3-1.2-3.1-2.3c-0.3-1.1,0-1.9,0.7-2.4h4.4c0.4,0.2,0.7,0.5,0.9,0.8c0.2,0.5,0.5,1.7,0.7,2.2
+		c0.6,0.1,1.8,0.4,2.4,0.5c1,0.3,1.8,1,2.2,2c-0.7,1.1-2,1.7-3.2,2.1c-0.9-0.4-1.7-1.1-2.5-1.6c-0.1,1.1-0.4,2.1-0.7,3.2
+		c-1.1,0.3-2.3,0.6-3.4,0.8c-0.1,1.7,1.1,4.3,3.1,4.2c0.2-1.2,0.5-2.3,0.8-3.4c2.4-1,5.4-0.8,7.5-2.6c2.2-2.2,0.2-5.7,1.5-8.3h4.1
+		c0,0,0,0.1,0,0.1c0.1,0.9,0.2,1.8,0.3,2.7c1-0.7,1.6-1.8,2.1-2.9h28.1c0.5,1.7,0.4,3.6,0.8,5.4c0.1-0.1,0.2-0.2,0.3-0.3
+		c0,0.1,0,0.2,0,0.3c0-0.1,0-0.2,0-0.4c1-1.4,0.4-3.5,1-5h11.8c0.3,1,0.5,2.1,0.7,3.2c0.5,0.5,1.2,0.9,1.9,1.2c0-0.1,0-0.1-0.1-0.2
+		c0,0,0.1,0,0.1,0.1c0,0-0.1-0.1-0.1-0.1c-0.1-0.5-0.4-1.3-0.5-1.8c0-0.6,0.1-1.6,0.1-2.3h75.6c0,0.2,0,0.4,0,0.6
+		c-0.4,0.8-0.7,1.6-1,2.4l1.4-0.6c0.5,1.1,1,2.2,1.5,3.3c0,0.2,0,0.5,0.1,0.7c0-0.2,0-0.4,0-0.6c0,0.1,0.1,0.1,0.1,0.2
+		c0.1-1.8,0-3.7,0.3-5.5c0.3-0.1,0.7-0.4,1.1-0.6h74.5c0.2,0.1,0.4,0.3,0.6,0.5c0.2,1.4,1.1,3,0.2,4.3c-1,0.4-2,0.8-3,1.2
+		c0.1,0.4,0.4,1.3,0.5,1.7c1.2,0.5,2.6,0.5,3.9,0.4c0.7,0.5,1.5,1,2.3,1.5c1.7,0,3.7,0.2,5-1c-1.9-1.6-5.1-1.6-6.3-4
+		c-0.1-1.5-0.2-3.1,0.3-4.6h16.5c-0.9,1.7-1.8,3.6-3.2,5c-0.3,1-0.3,2,0.2,2.9c0.8,0.5,1.7,0.5,2.6-0.1c0.5-0.9,1.1-1.8,1.9-2.5
+		c1.7-0.3,3.4,0.4,4.7,1.4c1,0.6,2.3,0.4,3.3-0.1c0.9-0.8,1-2.6-0.1-3.3c-2.3-0.8-4.7-0.7-7-0.4c-0.1-0.6-0.2-1.8-0.2-2.4
+		c0.2-0.2,0.5-0.4,0.8-0.6h16.8c0.1,0,0.1,0,0.2,0c-0.6,0.2-1.6,0.7-2.1,0.9c0,0,0,0.1,0,0.2c-0.1,0.1-0.3,0.1-0.4,0.2
+		c0.1,0.1,0.2,0.3,0.4,0.4c0,0.2,0,0.3,0,0.5c1.9,2.2,4.3,4.6,7.3,5.1c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.4,0.2
+		c-0.1-0.2-0.3-0.4-0.4-0.6c-0.1-0.5-0.2-1.1-0.2-1.5c-1.1-1.4-2.4-2.5-3.4-3.9c0.2-0.6,0.6-1.1,1.1-1.4h1.5
+		c0.4,0.4,1.1,1.2,1.5,1.6c1,0,1.5-0.8,2-1.6h19c0.3,0.1,0.6,0.2,0.9,0.3c1.3,1.9,0.4,4.6,0.7,6.8c-2,0-4,0.1-6,0.1
+		c0.9,0.3,1.8,0.5,2.8,0.8c0.4,1.8,0.8,3.6,1.2,5.4c-4.3-0.5-6.1-4.7-8.7-7.5c-0.6,1.3-1.1,2.6-1.7,3.8c-0.4,0.1-1.3,0.4-1.7,0.5
+		c-0.1-0.7-0.1-2.1-0.2-2.9c-1,0.3-1.9,0.7-2.9,1.1c-1.7-0.4-3.3-0.7-4.9-1c2.1,3.5,5.6,5.6,9.5,6.9c0.9-0.9,1.9-1.8,2.8-2.7
+		c1.2,0.4,2.4,0.9,3.7,1.3c0,0.6-0.1,2-0.1,2.6c1.9,1,4.1,1.8,5.2,3.7c-0.2,1.1-0.4,2.3-0.7,3.4c0.2,1,0.5,2.1,0.8,3.1
+		c-1.8,1.4-3.6,3.1-5.9,3.5h4.6c2.2-1.1,4.7-1.6,7.2-1.6c-0.1-1-0.1-2-0.2-3c-1.8,0.6-3.7,1.1-5.5,1.6c-1.4-4.6,1.6-8.7,2.8-12.9
+		c-0.8-1-1.6-2-2.3-3c0.5-2.6,2.2-4.7,3.4-6.9c2.1,0.1,4.3,0.4,6.4,1c0.8-1,1.6-2,2.5-2.8c2.4,0.5,4.1,2.6,5.9,4.1
+		c0.7,0,2.1,0,2.8-0.1c0,1,0,2,0,3c-1.6,0.1-3.2,0.1-4.7,0.3c-0.1,1-0.4,3-0.6,4c2.3-0.5,4.7-1,7.1-1.5c0.1-1.2,0.3-2.4,0.5-3.6
+		c3.5,1.7,3,6,3.8,9.2c1.7-0.8,3.4-1.5,5.1-2.3c-0.1-1.2-0.1-2.4-0.2-3.5c-1.5,0.6-3,1.3-4.4,2c0.5-2,1.1-3.9,1.6-5.8
+		c-2.3-0.8-3.9-2.5-5.4-4.3c-1.8-0.7-5.6-0.3-5.2-3.2c0.2-0.1,0.3-0.1,0.5-0.2h10.2c-0.8,0.6-1.7,1.2-2.5,1.8c2,0.8,4.1,1.3,6.3,1.7
+		c0.3-1.2,0.6-2.3,0.9-3.5h4.2c-0.2,3-0.3,6-0.2,9c-0.3,0.3-0.9,1-1.2,1.3c0,0.7,0.1,2.2,0.2,3c0.8-0.1,1.6-0.2,2.5-0.2
+		c1.8-1.9,3.7-3.6,5.8-5.1c2.5,1.5,5.3,1.1,7.9,0.1c0-2.2,0-4.4,0.1-6.6c-0.8-0.5-1.6-0.9-2.4-1.4h5.3c0.1,0.6,0.2,1.3,0.3,1.7
+		c1.1,2.2,2.3,4.5,2.7,7.1c0,2-0.8,3.8-1.3,5.7c1.4-0.5,2.9-1.1,4.4-1.6c0-1.3,0-2.7,0.1-4c-0.5-0.3-1.6-0.9-2.1-1.1
+		c0-0.9,0-2.7,0-3.6C1690.6,824.9,1691.6,824.2,1692.7,823.4z M1.5,689.5c0-1.3-0.1-2.7-0.1-4c1.7,0,3.5-0.1,5.2-0.1
+		c0,1.1,0.1,3.2,0.1,4.3C5,689.6,3.2,689.5,1.5,689.5z M1277.3,842.4c0.8,0.6,1.6,1.3,2.4,1.9c-0.1,1-0.2,2.1-0.3,3.1
+		c-1,0-2.9,0.2-3.9,0.2c-1.4-1.5-2.3-3.2-2.3-5.2C1274.2,842.4,1276.2,842.4,1277.3,842.4z M1710.1,772c1.1,0.9,0,3.5-1.4,2.4
+		c-0.1-0.1-0.2-0.2-0.2-0.2v-1.8C1708.8,771.8,1709.4,771.4,1710.1,772z M1713.4,711.2c-0.2,0.4-0.5,1.1-0.7,1.5
+		c-1.2,1-2.8,0.6-4.2,0.7c-0.1,0.2-0.1,0.3-0.2,0.5v-3.5C1710.2,710.2,1711.9,710.3,1713.4,711.2z M29.5,694.6c-0.8,0-2.3,0-3,0
+		c-0.8,1.4-1.5,2.8-2.2,4.2c-2.8-0.1-7.1,0.4-5.9-3.9c1.2-1.5,3.9-2.9,2.8-5.2c-1.4-3.7-0.5-7.5,0.6-11.1c-1.4-0.1-2.9-0.1-4.3-0.2
+		c0.1,2.4,0.1,4.7,0.2,7.1c0.8,1.1,2.4,1.9,2,3.6c0.7,2.5-2.2,2.7-3.8,2.6c0,2.6-2.1,3.5-4.5,3.3c0-1.1-0.1-3.2-0.1-4.2
+		c1-0.1,1.8-0.6,2.3-1.3c-0.6-0.3-1.8-0.8-2.4-1.1c0.1-2.4-0.2-5,2-6.5c0.1-1,0.1-2,0.2-3c-3.5-0.2-6.7-1.6-10-2.5
+		c0.5-2.3-1.7-7.4,2-7.2c0-0.9-0.1-1.7-0.1-2.5c-0.8,0-2.3,0.1-3,0.1c0.1-2.9,0.1-5.7,0.1-8.6c1.7,0.1,3.5,0.2,5.2,0.3
+		c0,1.5,0.1,3,0.1,4.6c0.4,0.2,0.8,0.5,1.2,0.7c0,0,0,0.1,0,0.1c0.3,0.1,0.8,0.3,1.2,0.5c1,0.5,1.9,1.1,2.7,1.9
+		c1.1,1.8,2.3,3.7,3.9,5.1c1,0,2,0.1,2.9,0.1c0-2-0.1-4-0.1-5.9c-0.7-0.8-1.4-1.5-2-2.2c0-3,0-6-0.1-9c0.9-0.1,2.5-0.2,3.4-0.3
+		c-0.1,1.8-0.1,3.5-0.2,5.3c1.1,0.1,2.1,0.1,3.2,0.2c-0.1-1.7-0.1-3.3-0.2-5c-1.8-1.7-3.2-3.6-4.3-5.8c-1.2-0.5-2.4-1-3.6-1.5
+		c0-2.3,0-4.6,0-6.9c-0.8-0.8-1.6-1.6-2.4-2.4c0.4-0.7,1.2-2.1,1.6-2.8c0.9,0,2.6,0,3.5,0c2.6,3.2,4.7,6.9,7.2,10.2
+		c1,1.4,2.8,0.7,4.2,0.7v8.7c0,2.5,0,4.9,0,7.4v8.3c-1.4-0.1-2.8-0.2-4.2-0.4c0,0.5,0.1,1.6,0.1,2.1c1.3,1,3.3,1.4,4,3
+		c0.1,0.5,0.1,1,0.1,1.5v5.6c-1,0-2.9-0.1-3.8-0.1c1.2,1.1,2.5,2.2,3.7,3.2C29.6,688.8,29.5,691.7,29.5,694.6z M23.2,817.7
+		c0.1-2.1,0.2-4.2,0.3-6.3c1.7,0,3.4,0,5.1,0c0,1.9,0,3.8-0.1,5.8C26.7,817.6,25,817.7,23.2,817.7z M33.6,823.8
+		c-1.6-0.1-3.2-0.3-4.7-0.5c-1.2-1.5-0.2-3.6-0.3-5.3c0.2,1,0.6,1.7,1.2,2.1v1.4h3.9C33.6,822.2,33.6,823.2,33.6,823.8z M60.7,821.8
+		c-2.7,3.4-6.8,0.3-10.1,0.1c0.4-0.2,0.7-0.3,1.1-0.5h8C60,821.6,60.4,821.7,60.7,821.8z M1353.4,823.3c-1.1,1.3-3.8-0.4-2.6-1.8
+		h2.7C1353.9,822,1354,822.6,1353.4,823.3z M1639.4,824.2c-1.6,0.4-3.3,0.6-4.9,0.8c0-0.9-0.1-2.6-0.1-3.6h5.3
+		C1639.5,822.4,1639.4,823.6,1639.4,824.2z M1674.6,823.7c-1.1,0-2.1-0.1-3.1-0.1c-0.4-0.5-1.1-1.6-1.6-2.1h4.7
+		C1674.7,822.2,1674.6,823.2,1674.6,823.7z"/>
+	<path class="st0" d="M340.6,27.6c-1.8,0.1-3.6,0.1-3.3-2.1c-0.5,0-1.4,0-1.9,0c0,1.1,0,2.2-0.1,3.3c0.5-0.1,1.4-0.3,1.9-0.4
+		c0.4,1.4,0.9,2.8,1.3,4.2c0.5,0,1.5,0.1,2.1,0.1C340.7,30.9,340.6,29.2,340.6,27.6z"/>
+	<path class="st0" d="M1402,29.3c-1.6-1.2-3.1-2.5-4.5-3.8c-0.1,0-0.2,0-0.3,0l-0.2-0.1c-0.1,0-0.3,0.1-0.5,0.1
+		c-0.7,0-1.5-0.1-2.2-0.1c0,0.6,0,1.7,0.1,2.2c0.8,0.4,1.6,1,2.5,1.6c0.2,0.2,0.3,0.4,0.5,0.6l0.5,0
+		C1399.3,30.4,1400.7,30.7,1402,29.3z"/>
+	<path class="st0" d="M1413.6,35.7c1-1.2-1-3.2-1.9-1.6C1410.6,35.3,1412.6,37.3,1413.6,35.7z"/>
+	<path class="st0" d="M322.1,52.3c-1.8,1.3-3.7,2.6-5.5,3.9c0,0.5,0,1.4,0,1.8c0.8-0.9,1.6-1.8,2.4-2.7c1.2,0,2.5,0,3.7,0.1
+		C322.4,54.4,322.2,53.4,322.1,52.3z"/>
+	<path class="st0" d="M340.8,64.4c-0.5,0-1.5,0-2,0c-1,1.7-2,3.4-2.8,5.1c0.6,0,1.8,0.2,2.4,0.2c0.2-1.5,0.8-2.8,1.9-3.9
+		C340.4,65.5,340.6,64.8,340.8,64.4z"/>
+	<path class="st0" d="M1404.4,81.8c0.9-0.5,1.8-0.9,2.7-1.4c1.2,0,2.5-0.1,3.8-0.1c-0.5-1.3-1.6-2.1-3-2.2c0.3-1.5,1.1-2.5,2.5-3.1
+		c0-0.4,0.1-1.1,0.1-1.4c-2.6,0-5.1-0.2-7.6-0.3c1.2,0.2,2.4,0.4,3.6,0.5c1,1.8,1.2,3.8,1.4,5.9c-1.2,0.4-2.4,0.7-3.6,1.1
+		C1404.3,81,1404.4,81.6,1404.4,81.8z"/>
+	<path class="st0" d="M336.1,92.6c0.4-2.4,1-4.8,1.7-7.1c-1.7,0.1-3.3,0.2-5,0.2c-0.9,0.6-1.8,1.3-2.6,1.9c-1.5,0-2.9,0-4.4,0.1
+		c-0.1,0.7-0.3,2.1-0.3,2.9c-0.8,0-2.3,0-3.1,0c0,0.2-0.1,0.6-0.2,0.8c2,0,4.1,0,6.1,0c0-0.8-0.1-2.2-0.1-3c2.6-1.4,7.8-1.5,7.5,2.7
+		c-3.1,2.4-1.8,6.1-0.8,9.2c-1.7,0.3-3.4,0.7-5,1.3c0.7,0.6,1.3,1.3,2.1,1.8c2-1.5,3.8-3.4,5.6-5c-0.1-1.6-0.2-3.2-0.3-4.9
+		c1-0.3,1.9-0.7,2.9-1C339.1,92.6,337.1,92.6,336.1,92.6z"/>
+	<path class="st0" d="M316.5,96.7c-0.4,5.4-0.2,10.9,0,16.3c0.8-1.1,1.6-2.2,2.5-3.3c-0.8-0.7-1.5-1.4-2.2-2.1
+		c0.2-2.8,0.1-5.7,0-8.5c1.3,0.5,2.7,1,4,1.5C319.3,99.3,317.9,98,316.5,96.7z"/>
+	<path class="st0" d="M326.3,105.1c0-0.8,0-1.5,0-2.2c-0.4-0.2-1.1-0.4-1.5-0.6c0,2.1-0.9,3.9-3.3,3.4c0,1,0.1,2,0.1,3
+		c1.1-0.1,2.2-0.2,3.3-0.4C325.4,107.2,325.8,106.1,326.3,105.1z"/>
+	<path class="st0" d="M331.3,109.4c0,1.2,0.1,2.4,0.1,3.6c1.9-0.9,3.8-2,5.4-3.3C335,109.5,333.2,109.4,331.3,109.4z"/>
+	<path class="st0" d="M328.3,134.8c2-0.3,3.8-1.1,5.5-2.2c1.5-0.1,3.1-0.2,4.6-0.3c0.1-1.1,0.2-2.2,0.3-3.3c-2.3,0.4-4.5,1.1-6.6,2
+		C330,131.5,327.7,132.2,328.3,134.8z"/>
+	<path class="st0" d="M1410.6,131.1c1,0.7,3.2,1.1,3.8-0.3C1414.1,129,1409.4,128.9,1410.6,131.1z"/>
+	<path class="st0" d="M1416,137.6c-1.6-0.5-3.2-1-4.7-1.5c-0.4,1.5-0.8,3-1.2,4.6c2-0.1,3.9-0.2,5.9-0.3
+		C1416,139.4,1416,138.5,1416,137.6z"/>
+	<path class="st0" d="M1401.4,137.6c-1-0.1-3-0.2-4-0.2c0,0.5-0.1,1.6-0.1,2.2c1.4,0.4,2.9,0.9,4.4,1.3
+		C1401.5,139.8,1401.4,138.7,1401.4,137.6z"/>
+	<path class="st0" d="M327.4,145.2c0-1.2,0.1-2.5,0.1-3.8c-0.5,0-1.5,0-1.9-0.1c-0.9,1.6-1.9,3.2-3.7,3.7c-0.2,0.8-0.4,1.7-0.6,2.5
+		c0.4-0.1,1.3-0.2,1.8-0.2C323.8,145.5,325.5,145.1,327.4,145.2z"/>
+	<path class="st0" d="M1397.6,143.6c-0.1,1.4-0.2,2.7-0.2,4.1c1.4,0,2.8,0,4.2-0.1c0-1.4,0-2.8,0-4.3
+		C1400.2,143.4,1398.9,143.5,1397.6,143.6z"/>
+	<path class="st0" d="M1411.3,143.6c-1-1-3.3-0.3-2.8,1.3c0.8,1.1,1.7,1.3,2.9,0.6C1411.4,145,1411.4,144.1,1411.3,143.6z"/>
+	<path class="st0" d="M1416,167.8c-0.5-0.3-1.4-0.9-1.9-1.2c-0.9,0.5-1.7,0.9-2.5,1.4c0,0.8,0.1,1.6,0.2,2.4
+		c1.4-0.1,2.8-0.1,4.3-0.1C1416,169.3,1416,168.5,1416,167.8z"/>
+	<path class="st0" d="M1407.5,178.4c1,0.1,2,0.2,3.1,0.2c-0.2-1.6-0.3-3.2-0.4-4.8c-0.9-0.1-1.8-0.2-2.7-0.4
+		C1407.5,175.1,1407.5,176.8,1407.5,178.4z"/>
+	<path class="st0" d="M1409.1,197.5c1,1.6,4.1,5.3,5.7,2.5c-1.5-0.5-3.1-1-4.6-1.5c0-0.7,0.1-2.2,0.2-2.9c-1.4,0-2.8,0-4.1-0.1
+		c0.2,0.4,0.5,1.2,0.7,1.6C1407.4,197.3,1408.6,197.4,1409.1,197.5z"/>
+	<path class="st0" d="M1412.1,202.8c-0.5,0.9-1,1.8-1.5,2.7l1.6-0.1c0.9,1.6,2.2,2.8,3.8,3.8c0-1,0-2,0-3
+		C1414.2,205.8,1412.5,204.7,1412.1,202.8z"/>
+	<path class="st0" d="M1400.2,205.4c-1-0.1-2.1-0.1-3.1-0.1c0.5,0.9,1.1,1.8,1.6,2.7c-0.3,0.5-1,1.5-1.3,2c-0.2,1.8,1.8,1.4,3,1.8
+		c0.4-1.3,0.8-2.6,1.2-3.9C1401.2,207.3,1400.5,206,1400.2,205.4z"/>
+	<path class="st0" d="M1403.2,237.6c1.4-0.6,2.9-1,4.5-1.3c0.2-1.6,0.4-3.2,0.7-4.8c0.9-0.1,2.5-0.2,3.4-0.3
+		c-0.9-1.8-3.9-2.9-4.7-0.4c-1.8-0.1-3.6-0.2-5.4,0.1c2,1.2,4.8-0.3,6.4,1.7C1406.6,234.5,1402.7,234.4,1403.2,237.6z"/>
+	<path class="st0" d="M1398.6,236.8c-1.3,2,2.6,2.3,2.7,0.4C1400.6,236,1399.7,235.9,1398.6,236.8z"/>
+	<path class="st0" d="M1482.7,247.6c-0.1,1.7-0.2,3.5-0.2,5.2c1.7,1.3,3.2,2.8,4.6,4.5c0.8,0.1,1.6,0.1,2.4,0.2
+		c0-0.4,0.1-1.3,0.2-1.8c-1.6-0.3-3.1-0.5-4.6-0.9c0.2-1.8,0.7-3.5,1.6-5c-0.7-2-2.7-3.7-2.2-6c1.6-2.3,4.8-1.1,7.3-1.6
+		c0.3,1.2,0.7,2.3,1.1,3.5c1.5-0.1,2.9-0.3,4.4-0.4c-0.9-0.3-1.8-0.6-2.8-0.9c0-0.7-0.1-2-0.1-2.6c-1.8,0-3.6-0.1-5.4-0.2
+		c-1.7-1.9-4.9-0.2-6.4-2.4c0,2.6,0.7,5,1.4,7.5c-1,0-3.1,0.1-4.1,0.1C1480.8,247,1481.7,247.3,1482.7,247.6z"/>
+	<path class="st0" d="M1474.7,247c0-2-0.1-3.9-0.2-5.9c-2.2-0.1-3.6,1.2-4.5,3C1471.3,245.5,1472.8,246.7,1474.7,247z"/>
+	<path class="st0" d="M1536.5,245.6c0.4-1,0.8-2.1,1.2-3.1c-1.1,0-2.2-0.1-3.3-0.1c0,1,0,2,0.1,3.1
+		C1535,245.5,1536,245.6,1536.5,245.6z"/>
+	<path class="st0" d="M1509.8,246c1.6-0.1,2.2-3,0.3-3.1C1508.6,243,1507.9,246,1509.8,246z"/>
+	<path class="st0" d="M1524.9,247.6c1.7-1.1-0.6-3.2-1.9-2.1C1521.3,246.5,1523.6,248.6,1524.9,247.6z"/>
+	<path class="st0" d="M1413,251.4c0.9-1.5,2.2-2.8,3.8-3.6c-3.4,0-5.3,3.3-8.2,4.4c0.1,2.6,1.1,5.1,1.2,7.7c2.5-2.5,6-0.2,9.1-0.3
+		c-1.7-1.3-3.4-2.8-3.7-5.1c-1.6,0.1-3.2,0.2-4.8,0.4c0-0.8,0.2-2.5,0.2-3.3C1411.1,251.4,1412.4,251.4,1413,251.4z"/>
+	<path class="st0" d="M1463.8,254.5c0.3,0,1-0.1,1.4-0.1c0.9-0.6,1.9-1.1,2.9-1.7c-0.9,0-2.8,0-3.7,0c0-1.4,0.1-2.8,0.1-4.2
+		c-1.1,0-2.1,0-3.1,0c0.1,1,0.1,2,0.2,3C1462.3,252.5,1463.1,253.5,1463.8,254.5z"/>
+	<path class="st0" d="M1504.9,253.4c0.4,0,1.2,0.2,1.6,0.2c-0.4-0.5-1.2-1.3-1.7-1.8c-0.7-0.1-1.3-0.1-2-0.2c-1.2,1.4-2.4,2.7-3.6,4
+		c0.3-0.2,1-0.8,1.3-1C1502.1,254.2,1503.5,253.8,1504.9,253.4z"/>
+	<path class="st0" d="M1510.5,256.2c1.3,0.1,2.7,0.2,4.1,0.3c-0.1-1.1-0.1-2.1-0.1-3.2c-1.6,1.8-3.7,2.5-6,2.4c0,1,0.1,2,0.2,3
+		C1509.2,257.9,1509.8,257.1,1510.5,256.2z"/>
+	<path class="st0" d="M1527.1,258.8c-1.5-0.2-3-0.3-4.5-0.4c-0.1-1.2-0.2-2.5-0.3-3.8c-0.9,0-1.7,0-2.6,0.1
+		c-0.1,1.2-0.2,2.4-0.3,3.6C1521.9,258.4,1524.6,259.8,1527.1,258.8z"/>
+	<path class="st0" d="M1713.1,259.6c-0.8,2.1,0.2,4.1,1.3,5.9C1715.3,263.2,1715.2,261.1,1713.1,259.6z"/>
+	<path class="st0" d="M21.5,318.6c0-1.4,0-2.8-0.1-4.1c-1,0-2,0-3.1,0c0,1.3,0.1,2.6,0.1,4C19.5,318.5,20.5,318.5,21.5,318.6z"/>
+	<path class="st0" d="M1720.8,322.2c-0.2,2.5-0.2,5-0.3,7.4c0.6,0,1.7-0.1,2.2-0.1C1722.6,327,1722.3,324.4,1720.8,322.2z"/>
+	<path class="st0" d="M11.5,330.6c-1-0.1-2-0.2-3-0.3c-0.4,1.4-0.9,2.8-1.3,4.2c1.5,0,3,0,4.4,0C11.5,333.6,11.5,331.6,11.5,330.6z"
+		/>
+	<path class="st0" d="M19.8,377.2c1.4,0.1,2.4-1.1,3.5-1.8c0-1.2,0-2.5,0-3.7c-1.3,0-2.5-0.1-3.8-0.1
+		C19.6,373.5,19.6,375.4,19.8,377.2z"/>
+	<path class="st0" d="M16.5,410.5c-1.3,0.1-2.5,0.1-3.8,0.2c0,0.9-0.1,1.9-0.1,2.8c1.4,0.1,2.7,0.2,4.1,0.2
+		C16.6,412.6,16.5,411.5,16.5,410.5z"/>
+	<path class="st0" d="M17.2,480.3c1.5-0.7,1.3-2.5,1.6-3.9c-2.2,0-4.5,0-6.7,0c0.6,1.4,1.1,2.8,1.7,4.2
+		C15,480.5,16.1,480.5,17.2,480.3z"/>
+	<path class="st0" d="M12.9,482.5c-1.1,0-2.2,0.1-3.2,0.1c-0.1,0.6-0.2,1.8-0.3,2.4c-0.2,0.6-0.7,1.8-1,2.3c-1.2,0.5-2.5,1-3.7,1.5
+		c0,0.9-0.1,1.8-0.2,2.6c1,0,2.1,0,3.1,0C9.5,488.6,11.4,485.6,12.9,482.5z"/>
+	<path class="st0" d="M21,484.6c-1.6,2-2.8,4.2-2.3,6.8c3.4,0.5,4.8-2.8,5.5-5.5c-0.7-0.4-1.5-0.7-2.2-1.1
+		C21.8,484.8,21.2,484.7,21,484.6z"/>
+	<path class="st0" d="M18,499c-1-1.7-2.5-2.9-4.6-2.7c0,1.8,0,3.6,0,5.4C15.5,501.8,17,500.7,18,499z"/>
+	<path class="st0" d="M21.7,502.3c-0.6,0-1.8,0-2.4,0c0,0.6,0.1,1.7,0.1,2.2c0.5,0,1.5,0,2,0C21.6,504,21.7,502.9,21.7,502.3z"/>
+	<path class="st0" d="M1717.2,520.1c0.7-2,1.1-4,0.7-6c0,0.7,0,2,0,2.6c-0.6,0-1.8,0-2.5-0.1c0,1.3,0,2.7,0,4
+		C1715.9,520.6,1716.8,520.3,1717.2,520.1z"/>
+	<path class="st0" d="M23.7,519.6c-0.1,1.3-0.1,2.6-0.2,3.9c1.4,0,2.8,0,4.2,0.1c0-1.4,0-2.8-0.1-4.2
+		C26.3,519.5,25,519.5,23.7,519.6z"/>
+	<path class="st0" d="M1728,525c-1.6-0.4-3.2-0.8-4.8-1.3c0.2-1.5,0.5-2.9,0.7-4.4c-0.6,0-1.8,0.1-2.3,0.2c0,1.3-0.1,2.7,0,4
+		c-0.5,0.1-1.6,0.2-2.2,0.3c0.9,0.8,1.8,1.7,2.8,2.5C1724.2,527.1,1726.2,525.7,1728,525z"/>
+	<path class="st0" d="M27.2,540.5c-2.1-0.2-3.9,1.3-5.4,2.5c2.2,1.5,4.5,3.3,7.2,1.8C28.6,543.3,28.7,541.5,27.2,540.5z"/>
+	<path class="st0" d="M1729.5,542.6c0,0.5-0.1,1.5-0.1,1.9c0.8,0,2.4,0,3.3,0c0.1,0.4,0.2,1.2,0.3,1.5v-3.3
+		C1731.8,542.7,1730.7,542.6,1729.5,542.6z"/>
+	<path class="st0" d="M4.7,552.6c0-1.1,0.1-2.2,0.1-3.3c-1.2,0-2.3,0-3.5,0c0,1.1,0,2.2,0.1,3.4C2.5,552.7,3.5,552.6,4.7,552.6z"/>
+	<path class="st0" d="M19.7,559.7c0.7-0.3,2.2-0.9,2.9-1.2c0.1-2.5-0.4-4.8-3.1-5.7C18.7,554.8,17.2,558.2,19.7,559.7z"/>
+	<path class="st0" d="M1723.8,568.1c-1.3,0.2-2.6,0.3-3.8,0.5c-0.6,0.6-1.2,1.2-1.8,1.8c1.8,0,3.6,0,5.4,0
+		C1723.7,569.8,1723.8,568.7,1723.8,568.1z"/>
+	<path class="st0" d="M8.2,570.5c-0.4,0-1.3-0.1-1.7-0.1c-1.6,1.5-3.4,3-3.3,5.4c2.5-0.2,5-0.5,6.7-2.5
+		C9.5,572.6,8.6,571.2,8.2,570.5z"/>
+	<path class="st0" d="M1730.9,581.7c0.5-2.5,0.6-5,0.6-7.6c-0.8,0.3-2.3,0.9-3.1,1.2c0,2.1-0.1,4.3-1.2,6.2
+		C1728.4,581.5,1729.7,581.6,1730.9,581.7z"/>
+	<path class="st0" d="M3.1,581.5c-1,0.1-2.1,0.2-3.1,0.3v4.7c1.3-1,2.7-2,4.1-3C3.8,582.9,3.4,582.2,3.1,581.5z"/>
+	<path class="st0" d="M1728.2,584.5c-0.8,0-1.6,0.1-2.4,0.2c-0.2,0.9-0.3,1.8-0.5,2.7c2.6,0.4,5.1,0.9,7.7,1.4v-0.6
+		C1731.1,587.3,1729.5,586,1728.2,584.5z"/>
+	<path class="st0" d="M27.8,598.5c0.5-3.5-2.7-4.4-5.4-4.3c0,1.4,0.1,2.9,0.1,4.4C24.2,598.6,26,598.5,27.8,598.5z"/>
+	<path class="st0" d="M15.3,596.6c-0.9,0-1.8,0-2.7-0.1c0,1.3-0.1,2.7-0.2,4c1.1,0,2.1,0.1,3.2,0.1C15.5,599.3,15.4,598,15.3,596.6z
+		"/>
+	<path class="st0" d="M3.4,604.8c-1.8-2.1-3.2-4.5-3.4-7.3v10.4c1.2-0.6,2.3-1.2,3.5-1.8C3.5,605.7,3.4,605.1,3.4,604.8z"/>
+	<path class="st0" d="M15.6,622.6c0-1.2-0.1-2.4-0.1-3.6c-1.2-0.9-2.4-1.8-3.6-2.7c0.9-2,1.9-3.9,3.5-5.4c-1.4-1.9-2-4.1-2-6.4
+		c-1,0-2,0.1-3,0.1c-1.1,1.1-2.1,2.3-3.2,3.4c1.5,0.5,2.9,1,4.3,1.5c0.1,2.8-0.5,5.9,1,8.4c-0.4,1.5-0.8,3-1.2,4.6
+		C12.8,622.5,14.2,622.6,15.6,622.6z"/>
+	<path class="st0" d="M0,616.4v5.3c1.1-1.8,2.4-3.4,3.8-5C2.5,616.6,1.3,616.5,0,616.4z"/>
+	<path class="st0" d="M3.4,624.9c-1.2-0.6-2.3-1.2-3.4-1.8v5.4c1.2-0.4,2.5-0.8,3.7-1.2C3.6,626.5,3.5,625.7,3.4,624.9z"/>
+	<path class="st0" d="M1722.3,644.7c1.8-0.2,3.4-0.7,5-1.6c-1.6-1.1-3.2-2.1-4.7-3.1C1722.4,641.6,1722.4,643.2,1722.3,644.7z"/>
+	<path class="st0" d="M1731.8,643c-2.1,0.5-4.1,1.1-6.1,1.8c1.2,1.7,3.2,1.9,5,2C1731.1,645.6,1731.5,644.3,1731.8,643z"/>
+	<path class="st0" d="M1723.3,656.3c-0.3,0.3-0.9,0.8-1.2,1c1.7,0,3.5,0,5.2,0c0-1.3,0-2.5,0.1-3.8c0.7-0.1,2-0.3,2.7-0.3
+		c0.2-0.5,0.5-1.4,0.6-1.9C1727.3,651,1724.5,653.2,1723.3,656.3z"/>
+	<path class="st0" d="M1715.2,652c-0.9,3.2,1.8,4,4.3,4.7C1720.7,653.5,1717.7,652.7,1715.2,652z"/>
+	<path class="st0" d="M1720.3,667.7c2.6,2.7,6.5,1.6,9.8,1.6c-0.2-0.4-0.7-1.3-0.9-1.7C1726.3,667.1,1723.3,667.3,1720.3,667.7z"/>
+	<path class="st0" d="M1727.3,678.5c-0.8,0-1.7-0.1-2.5-0.1c-0.3-2.1-0.7-4.2-1.9-5.9c-2.2,3.4-0.4,7.3-0.2,11
+		c-1.6,1.3-3.1,2.7-4.7,4c1.3,0.1,2.7,0.2,4,0.4c0.6-0.6,1.2-1.2,1.8-1.8c-1,2.4-2,4.7-2.8,7.1c4.1-0.5,5.7-4.6,7.8-7.4
+		c-1.3-0.5-2.6-1-3.8-1.5c0.8-0.9,1.5-1.8,2.3-2.6c1.8-0.1,3.7-0.1,5.6-0.1v-4.8c-1.5-0.1-3-0.2-4.4-0.3
+		C1728.3,676.9,1727.6,678,1727.3,678.5z"/>
+	<path class="st0" d="M1711.6,680.6c-0.1,0.8-0.2,2.4-0.2,3.2c4.1,0.2,7.8-3.6,8.5-7.5C1716.7,676.9,1714.1,678.7,1711.6,680.6z"/>
+	<path class="st0" d="M1713.3,688c0.9-2.9-4.2-3.4-2.6-0.2C1711.6,688.9,1712.4,689,1713.3,688z"/>
+	<path class="st0" d="M1733,687.8v-1.6c-0.4,0.2-1.1,0.6-1.5,0.8C1731.9,687.2,1732.6,687.6,1733,687.8z"/>
+	<path class="st0" d="M1712.7,692.7c-0.1-1.2-0.1-2.5-0.1-3.7c-2.8-0.6-2,2-2.4,3.5C1710.8,692.6,1712,692.7,1712.7,692.7z"/>
+	<path class="st0" d="M1714.2,694.7c0.6,0,1.8-0.1,2.4-0.1c1.2-1.1,2.4-2.2,3.6-3.2c-2,0-3.9,0.3-5.7,1.2
+		C1714.4,693.1,1714.3,694.2,1714.2,694.7z"/>
+	<path class="st0" d="M1726.4,692.6c0,0.5-0.1,1.6-0.1,2.1c0.7,0,2,0.1,2.7,0.1c0.6-0.6,1.2-1.1,1.8-1.7c0.6,0.2,1.6,0.7,2.2,0.9
+		v-1.3C1731.1,690.8,1728.6,692,1726.4,692.6z"/>
+	<path class="st0" d="M1719.6,699.4c-1,0.1-2,0.1-3,0.2c-0.1,0.5-0.2,1.5-0.3,2c1.1,0,2.3,0,3.5,0.1
+		C1719.7,701.1,1719.6,700,1719.6,699.4z"/>
+	<path class="st0" d="M1724.6,700.4c-0.6,0-1.8,0-2.5,0c0.1,1.9,0.9,3.6,2.2,4.9C1724.4,703.6,1724.5,702,1724.6,700.4z"/>
+	<path class="st0" d="M1713.7,704.5c0-0.6,0.1-1.7,0.1-2.2c-1.2,0-2.4,0-3.5-0.1c0.1,0.6,0.2,1.7,0.2,2.2
+		C1711.5,704.5,1712.6,704.5,1713.7,704.5z"/>
+	<path class="st0" d="M1718.6,715.4c-0.9,0.6-1.9,1.2-2.8,1.8c2,0.2,4,0.4,6,0.6c0-0.6-0.1-1.8-0.1-2.4c-0.7,0-2,0-2.7,0
+		c0-1.7,1-3.3,2.4-4.1c2.4-0.8,3.4,1.8,4,3.5c-0.6,3.6-2.6,7.1-0.8,10.7c0.5,0.1,1.5,0.1,2,0.2c-0.1-2-0.2-4-0.2-5.9
+		c1.1-1.4,2.2-2.8,3.3-4.2c0.5-0.3,1.4-0.8,1.9-1.1c0-0.5,0.1-1.5,0.1-2c-2-0.4-4-0.9-6-1.2c-0.5-1-1-2-1.4-2.9
+		c-1.7,0.5-3.3,1.1-5,1.3C1718.9,711.5,1718.7,713.5,1718.6,715.4z"/>
+	<path class="st0" d="M8.4,710.3c-1.5-1.1-3.5-0.8-5.3-1.2c0,3,1.6,5.5,3.4,7.8c-0.9,1.3-1.7,2.8-0.9,4.4c1.8,0.4,3.8,0.6,5.5-0.1
+		C12.3,717.5,11.8,712.6,8.4,710.3z"/>
+	<path class="st0" d="M1.3,721.7c0.9,0,2.6,0,3.5,0c0-1.4-0.1-2.8-0.1-4.2c-0.8,0-2.5,0-3.3,0C1.3,718.8,1.3,720.2,1.3,721.7z"/>
+	<path class="st0" d="M1717.6,724.5c0.8-1.1,1.6-2.1,2.5-3.1c-1.9,0-3.8,0-5.7,0c0.1,0.9,0.2,2.6,0.2,3.4
+		C1715.4,724.8,1716.9,724.6,1717.6,724.5z"/>
+	<path class="st0" d="M1717.9,729.4c0.7,0.1,2.2,0.3,2.9,0.4c0-0.6-0.1-1.8-0.2-2.5c-0.5,0.1-1.4,0.3-1.9,0.4
+		c-1.2,1-2.6,1.9-4.2,2.1c0,1,0,2.1,0,3.2C1716.3,732.6,1717.2,731,1717.9,729.4z"/>
+	<path class="st0" d="M1728.3,729.4c0.8-1.2,0.6-2.1-0.5-2.7C1725.8,726.8,1726.4,730.8,1728.3,729.4z"/>
+	<path class="st0" d="M1733,729.2v-1.7c-0.6,0.2-1.9,0.6-2.5,0.8C1731.1,728.4,1732.4,728.9,1733,729.2z"/>
+	<path class="st0" d="M19.5,727c-4.1,1.8-7.8,4.8-12.6,4.5c-0.8-1-1.5-2-2.3-3c-0.6,0-1.9-0.2-2.6-0.2C4,733,4,738,3.4,742.9
+		c-0.3,0.9-1,2.7-1.3,3.5c1.7,0,3.5,0.1,5.2,0.1c0.3-0.5,1-1.6,1.3-2.1c1,0,2,0,3,0c0,1,0,2.1-0.1,3.2c-0.5-0.1-1.6-0.2-2.2-0.2
+		c0,0.6,0,1.8,0,2.5c1.6-0.2,3.3-0.3,4.8-1.1c1.1-0.2,2.2-0.3,3.3-0.4c0.1-1.6,0.2-3.2,0.1-4.8c0-0.4,0-0.8,0.1-1.2
+		c-0.1,0-0.1,0-0.2,0c-1.5-0.8-3.2-1.4-4.8-2c-0.1-1.7-0.2-3.3-0.3-5c2.4-0.8,4.9-1.3,7.3-1.9C19.6,731.3,19.6,729.2,19.5,727z"/>
+	<path class="st0" d="M28.5,745c-0.3-0.6-1-1.9-1.3-2.5c-0.8,0-1.6,0-2.4,0.1c-0.4,1.6-0.9,3.1-1.3,4.7c-0.4,0.3-1.2,0.9-1.6,1.2
+		c1.8,0,3.5,0,5.2,0C27.6,747.3,28,746.1,28.5,745z"/>
+	<path class="st0" d="M1733,752.5v-3.1c-1.7,0-3.4-0.1-5.1-0.1C1727.2,752.7,1731,752.2,1733,752.5z"/>
+	<path class="st0" d="M8.2,755.5c0-0.3,0-0.6,0-0.9c-0.4,0-0.9,0.1-1.4,0.1c-0.5-0.2-0.9-0.5-1.3-0.6c-1.4,3.3-1.6,7.4,0.1,10.7
+		c1.9,0.3,3.1-1,4-2.4c-1.2-2-1.2-4.4-1.1-6.7C8.4,755.6,8.3,755.5,8.2,755.5z"/>
+	<path class="st0" d="M1718,760.1c-2,0.1-4,0.3-6,0.5c0.4,2.2,0.9,4.4,1.5,6.6c1.8-1.7,3.7-3.4,5.5-5.1c0.9,0.8,1.8,1.6,2.7,2.4
+		c0.9,0,1.7,0.1,2.6,0.1c0.3-0.5,0.9-1.4,1.2-1.9c2.1-1.1,4-2.3,6-3.7c0,1.3,0,2.6,0.2,4c0.3,0.4,1,1.1,1.4,1.5v-5.8
+		c-1.3-0.5-2.6-1-3.8-1.4C1726,759.9,1722,761.2,1718,760.1z"/>
+	<path class="st0" d="M1730.6,765.8c-0.8,0.6-1.6,1.2-2.3,1.8c-0.4,0-1.2,0-1.6,0c-0.3-0.3-1-0.9-1.4-1.2c-1.3,1.4-2.8,2.6-4.3,3.8
+		c-0.7-1.5-1.4-2.9-2.1-4.4c-1.4,1.6-2.2,3.5-2.6,5.5c1.2,0,2.3,0.1,3.5,0.2c-0.5,2.6,0.4,5.8-1.4,8c-1.3,0-2.7,0-4,0
+		c0,1.7,0,3.4,0,5.1c0.6,0.3,1.7,0.9,2.3,1.1c-0.1,1.2-0.2,2.5-0.3,3.7c1.7,0.1,3.4,0.2,5.2,0.2c-0.1-0.8-0.1-2.4-0.2-3.2
+		c0.9,0,2.8,0,3.7,0c-0.8,1.8-1.9,3.4-3.2,4.8c2.5,0.3,5,1,7.3,1.9c-2.1,0.6-4.2,1.2-6.3,1.4c-1.9-2.1-4.6-2.2-7.2-2.2
+		c-0.7-1.3-1.3-2.5-2-3.8c-0.7,2.2-1.2,4.4-1.6,6.7c2.8,2.6,5.7,5.2,7.9,8.5c2-3.3,4.6-6.3,8.2-7.8c0.1,1.5,0.2,3,0.3,4.6
+		c-1.3,0.4-2.7,0.8-4,1.2c-0.5,2.6-1.8,5.5-0.3,8c0.9,1.9,3.3,1.8,5.1,2.4c-0.9-1-1.9-2-2.8-3c-0.1-1.2-0.3-2.5-0.4-3.7
+		c1.6,0,3.3,0.1,4.9,0.2c0.6-1,1.2-2,1.8-3V800c-1-1.5-2-2.9-3-4.4c0.8-0.1,2.3-0.3,3-0.4v-7.5c-0.7-0.5-2.1-1.5-2.8-2.1
+		c0.2-1.8,0.8-3.4,2.8-3.7v-2.8c-0.8-0.9-1.7-1.8-2.5-2.7C1730.6,772.8,1730.6,769.3,1730.6,765.8z M1729.6,775.5
+		c-0.1,2.8-0.1,5.8-1.6,8.3c-2-2.4-1.5-5.5-1.7-8.3C1727.4,775.4,1728.5,775.4,1729.6,775.5z M1730.6,787c-0.4,0.8-1.1,2.3-1.5,3.1
+		c-1.6-1.1-4.6-3.1-3.4-5.3c0.9-0.1,2.6-0.4,3.5-0.5C1729.6,784.9,1730.3,786.3,1730.6,787z"/>
+	<path class="st0" d="M6,807.5c-0.4-2.7-2.1-4.7-4.1-6.5c-0.7-1.6-1.3-3.2-1.9-4.9v9c0.4,0.6,1.2,1.9,1.6,2.6
+		C3.1,807.6,4.5,807.5,6,807.5z"/>
+	<path class="st0" d="M1725.1,812.6c-2.9-0.5-5.9-0.2-8.7,0.8c0,0.5,0,1.5,0,2.1C1719.6,815.6,1723.6,816.3,1725.1,812.6z"/>
+	<path class="st0" d="M1729.7,817.3c-2.9-0.9-4.3,1.2-4.5,3.7c0.9,0.5,2.6,1.6,3.4,2.1C1729.4,821.3,1729.5,819.3,1729.7,817.3z"/>
+	<path class="st0" d="M1717.6,825.5c0,1-0.1,2.9-0.1,3.8c-1,0.4-2.1,0.9-3.1,1.3c0,0.5,0.1,1.4,0.2,1.9c3.4,0.2,7.1,0.1,9.9-2.1
+		c0.2-1.4,0.2-2.9,0.2-4.3c-1.6,0.8-3.3,1.3-5,1.6c-0.2-1.1-0.3-2.1-0.4-3.1c1.3-0.5,2.7-0.9,4.1-1.5c-1.6-1.3-3.2-2.8-5.4-2.9
+		c-1.2,1.2-2.6,2.1-4.1,2.8C1715.1,823.9,1716.3,824.7,1717.6,825.5z"/>
+	<path class="st0" d="M4.3,822.8c-1.5-0.6-2.9-1.2-4.3-1.9v4.6c1.6,0,3.2-0.1,4.8-0.1C4.7,824.8,4.4,823.5,4.3,822.8z"/>
+	<path class="st0" d="M298.4,822.5c-1-0.1-2-0.1-3-0.2c0,1.3,0.1,2.7,0.1,4.1c1,0,2,0,3,0.1C298.5,825.2,298.5,823.9,298.4,822.5z"
+		/>
+	<path class="st0" d="M375.7,822.7c-0.4,0-1.2,0-1.6,0c-2.1,0.8-2.9,2.5-2.6,4.7c1,0,1.9,0,2.9,0.1
+		C374.5,825.7,373.7,823.5,375.7,822.7z"/>
+	<path class="st0" d="M1175.2,828.5c0.6,0,1.9,0.1,2.5,0.1c1.8-1.8,1.9-4.2,2-6.6C1176,821.7,1175.6,825.8,1175.2,828.5z"/>
+	<path class="st0" d="M1330.6,822.2c-0.8,0.1-2.5,0.2-3.4,0.2c0.1,1.5,0.1,2.9,0.2,4.4C1330.4,827.3,1330.4,824,1330.6,822.2z"/>
+	<path class="st0" d="M1558.2,824.7c0.1-0.7,0.4-2,0.6-2.6c-1.7,0.2-3.5,0.4-5.1,0.7C1555.2,823.5,1556.7,824.1,1558.2,824.7z"/>
+	<path class="st0" d="M1706.5,822.7c0,1.2,0,2.4,0,3.6c-0.7,0.5-1.9,1.4-2.6,1.9c1.8,1.2,3.6,2.2,5.5,3.2c0-2.9,0.5-5.8,1-8.6
+		C1710.8,820,1707.6,822.2,1706.5,822.7z"/>
+	<path class="st0" d="M204.3,829.9c0-0.1,0.1-0.2,0.1-0.3c-0.4-0.4-1.1-1.1-1.5-1.5c-0.1-0.1-0.3-0.3-0.4-0.5c0-1.4,0-2.8,0-4.2
+		c-1.4-0.4-2.8-0.9-4.1-1.3c-0.2,3.5,0,7,1.2,10.2c1.2,0,2.3,0.1,3.5,0.1c0,0,0,0,0,0c0,0,0,0,0,0c0.5,0,1.1,0,1.6,0.1
+		C204.8,831.6,204.6,830.7,204.3,829.9z"/>
+	<path class="st0" d="M1700.9,829.9c0.5,1.2,1.4,1.9,2.8,2c-0.2-1.5,0.2-3.4-1.2-4.5c-1.5-1.2-0.9-3.2-1.1-4.8c-1,0-3-0.2-4-0.2
+		c0,2-0.1,3.9-0.8,5.8c-2.5,0.1-2.2,2.4-2.1,4.1c1.5,0.1,3,0.3,4.6,0.5c-1-1-2.1-2-3-3C1697.2,828,1699.9,828,1700.9,829.9z"/>
+	<path class="st0" d="M1729,822.7c-0.4,1.5-0.4,3.1-0.5,4.7c1.5-0.1,3-0.2,4.5-0.3v-3.3C1732.3,822.2,1730.3,822,1729,822.7z"/>
+	<path class="st0" d="M1315.5,824.6c-0.5-0.1-1.6-0.2-2.1-0.3c0,1.4,0.1,2.8,0.1,4.3c-3.8-0.7-7.5,0.2-10.5,2.7
+		c2.2-0.4,4.3-0.7,6.5-1c0,1.5,0.1,3.1,0.2,4.6c0.8,1.2,2.6,2.5,1.1,4c-3.4,1.7-6-2.9-7.8-5.3c-0.9-0.1-1.7-0.3-2.5-0.4
+		c-0.3,0.6-1,1.9-1.4,2.5c-1.6-1.5-3.3-2.8-5.1-4c0.7,1.8,1.5,3.6,2.1,5.4c0.2,2.4-1.1,4.7-0.5,7.1c0.7,2.3,3,3.5,4.5,5.1
+		c-1.6,0.6-3.2,1.1-4.9,1.6h3c2-1.1,4-2.3,5.9-3.5c-1,0-2.9,0-3.9,0c0.1-3.5,0.2-7,0-10.5c2.2,0.4,4.3,0.8,6.5,1.3
+		c-0.5,2.1-0.9,4.3-1,6.5c-0.1,0.5-0.2,1-0.3,1.5c0.1,0,0.2,0.1,0.3,0.1c0,1.5,0.2,3.1,0.6,4.6h4.1h1.2h0.7c-1.1-3.1-2.3-6.3-2-9.7
+		c3.5-1.7,4.5-5.9,5.3-9.4c4.2,0.4,3.8,5,3.8,8.1c-1.7,0.8-3.4,1.7-5.1,2.6c1.8-0.5,3.5-1,5.2-1.4c-0.4,1.9-0.7,3.9-1.1,5.8
+		c0.2,0.3,0.3,0.7,0.5,1c0,0.1,0,0.2,0,0.3c0,0,0.1,0,0.1-0.1c0.5,0.9,0.9,1.8,1.4,2.8h4.3c-0.5-0.1-1.4-0.4-1.9-0.6
+		c0.6-4,1.5-7.9,1.5-11.9c-0.6-0.3-1.8-0.8-2.4-1.1c0-0.9,0.1-1.8,0.1-2.8c0.6-0.3,1.2-0.6,1.8-0.8c0.1,0,0.2,0,0.3,0.1
+		c0-0.1,0-0.1,0.1-0.2c0.6-0.3,1.2-0.6,1.8-0.8c0-1.4,0.1-2.8,0.1-4.1c-3.7-0.1-7.4-0.5-11.1-1.2
+		C1315.4,826.8,1315.4,825.4,1315.5,824.6z"/>
+	<path class="st0" d="M1565.8,826.3c1.3,0.2,2.6,0.3,4,0.5c-0.2-1.3-0.3-2.6-0.4-3.8C1568,824,1566.8,825.1,1565.8,826.3z"/>
+	<path class="st0" d="M120.3,833.7c-1.6-0.3-3.1-0.7-4.6-1.2c-0.7-2.4-1.5-4.7-2.3-7.1c-1.7,0-3.4,0-5,0c-0.4,1.1-0.9,2.1-1.3,3.2
+		c0.8,0,2.3-0.1,3.1-0.1c3.4,4,6.9,8.1,8.4,13.2c0.5,0,1.6-0.1,2.1-0.2c0-0.8-0.2-2.3-0.2-3.1c0.8-0.8,1.7-1.7,2.5-2.5
+		C122.1,835.2,121.2,834.4,120.3,833.7z"/>
+	<path class="st0" d="M224,825.7c-0.2,3-3,3-5.4,2.8c-0.4,1.7-0.9,3.3-1.4,5c1.6,0,3.2-0.1,4.8-0.1c0.4-1.7,0.8-3.4,1.3-5
+		c1.4,0,2.8,0.1,4.2,0.1c0-1-0.1-2-0.1-3.1C226.3,825.5,225.2,825.6,224,825.7z"/>
+	<path class="st0" d="M32.6,833.2c-0.6,0.8-1.3,1.6-1.9,2.5c0.4,1.3,0.8,2.6,1.1,4c-2.7,0.8-3.7-2.4-5.3-3.8
+		c-2.1-0.3-4.1-0.5-6.2-0.8c0.1-3,0.2-6,0.3-9c-0.8,0.6-1.5,1.2-2.3,1.8c-2.1-0.5-4.2-1-6.4-1.5c-0.6,1.1-1.1,2.1-1.6,3.2
+		c-1.8,0-3.7,0-5.5,0c-0.8,1.8-1.6,3.7-2.5,5.6c2.7,1,6.2,2,5.7,5.8c-3.4,0.2-6.2-1.3-7.9-4.2V851h19.3c-2.3-0.9-4.6-1.9-6.9-2.8
+		c0-0.9,0-1.9,0-2.8c3.2,0.1,6.5-0.2,9.6,0.4c0.4,1.2,0.6,2.5,0.9,3.7c-0.5,0.3-1.6,1-2.1,1.4h12c1.7-1.2,3.4-2.4,5-3.7
+		c-2.2-2.3-4-4.8-5.1-7.8c2-0.5,4-1,6.1-1.4C39,834.5,35.4,833.5,32.6,833.2z M8.6,848.6c-2.5-0.1-4.9-0.1-7.4-0.1
+		c0.1-2,0.6-4,2.4-5.1c1.7,0,3.3-0.1,5-0.1C8.6,845.1,8.6,846.9,8.6,848.6z"/>
+	<path class="st0" d="M142.8,826.5c-0.4,0.7-1.3,2.2-1.8,3c1.2,0.6,2.5,1,3.9,1.1c2.4,0.5,2.8-2.5,2.8-4.1
+		C146.1,826.4,144.5,826.4,142.8,826.5z"/>
+	<path class="st0" d="M180.3,832.4c0.6,0.1,1.6,0.2,2.2,0.3c0.5-2.1,0.9-4.2,1.2-6.4c-0.5,0-1.5,0.1-2,0.2
+		C181,828.4,180.5,830.4,180.3,832.4z"/>
+	<path class="st0" d="M187.7,825.6c-0.2,1.3-0.3,2.7-0.5,4.1c1.2-0.1,2.4-0.1,3.6-0.2C190.7,827.9,190.3,824,187.7,825.6z"/>
+	<path class="st0" d="M361.7,829.2c1.3,0.1,2.5,0.2,3.8,0.3c0-1,0-2.1,0-3.1c-1.4,0-2.8,0-4.2,0
+		C361.5,827.4,361.6,828.3,361.7,829.2z"/>
+	<path class="st0" d="M1222.6,831c0.4-2,0.9-3.9,1.2-5.9c-2.6,0.1-4.2,2.3-6,3.9C1218.7,830.8,1220.9,830.6,1222.6,831z"/>
+	<path class="st0" d="M1300.3,825c-1.9,0.7-3.6,1.9-5.2,3.1c0.8,0.8,1.7,1.7,2.5,2.5c1,0,2,0.1,3,0.1
+		C1300.5,828.8,1300.4,826.9,1300.3,825z"/>
+	<path class="st0" d="M1376.5,828.9c0.3,0.8,1,2.3,1.3,3c-2,1.6-1,4.3-1.3,6.4c-1.2,1.2-2,2.7-2.3,4.4c0.5-0.1,1.4-0.2,1.9-0.3
+		c0.5-1.3,1.1-2.6,1.9-3.7c0.3-4.7,4.3-9.3,1.2-13.8C1377.8,825.9,1376.2,826.9,1376.5,828.9z"/>
+	<path class="st0" d="M1530.4,829.7c0.5-0.1,1.4-0.2,1.9-0.3c0.1-1,0.1-2,0.2-3c-1.1,0-2.2,0-3.3,0.1
+		C1529.6,827.3,1530.1,828.9,1530.4,829.7z"/>
+	<path class="st0" d="M1542.9,824.6c-2.4,2.2-1.3,4.7,1.7,5.4C1544.7,828,1544.6,826,1542.9,824.6z"/>
+	<path class="st0" d="M1660.2,826.5c-1.7,0.9,0.1,3,1.4,1.9C1663.3,827.6,1661.4,825.4,1660.2,826.5z"/>
+	<path class="st0" d="M101.5,830.6c0-1.4,0-2.9,0.1-4.3c-1.5,0.4-3,0.8-4.4,1.3C97.3,830,99.2,830.9,101.5,830.6z"/>
+	<path class="st0" d="M349.6,825.9c-1.5,1.8-0.8,4,0.1,5.9c1.4-0.5,2.8-1.1,4.2-1.6C353.6,827.8,351.5,826.8,349.6,825.9z"/>
+	<path class="st0" d="M1240.6,826.6c0,1,0,1.9,0,2.9c1.3,0.1,2.6,0.1,4,0.2c0-1-0.1-2.1-0.1-3.1
+		C1243.5,826.5,1241.5,826.6,1240.6,826.6z"/>
+	<path class="st0" d="M299,828c0.7,1,1.5,2,2.4,2.9c0.1,1.2,0.1,2.3,0.2,3.5c1.2-0.1,2.5-0.1,3.7-0.1c0-1.3,0.1-2.5,0.2-3.7
+		c-1.1-0.1-2.3-0.2-3.4-0.2C301.1,829.5,300.2,828.7,299,828z"/>
+	<path class="st0" d="M1180.6,829c2,1.3,4.2,2.1,6.5,2.8c0.3,0.4,0.9,1.3,1.2,1.7c0.5,0,1.4,0,1.8,0c0.5-1.3,1-2.6,1.6-4
+		c-1.6,0-3.2,0-4.8,0C1185.1,827.7,1182.5,826.7,1180.6,829z"/>
+	<path class="st0" d="M1277.5,835.7c0.3,0,0.6,0.1,1,0.1c0.1-0.1,0.1-0.3,0.2-0.4c0.7-0.3,1.1-0.8,1.1-2c1-0.1,1.9-0.1,2.9-0.1
+		c1.1,1.4,2.2,2.8,3.2,4.2c0.7,0,2.1,0.1,2.8,0.2c-0.1-1-0.1-1.9-0.2-2.9c-1-1.3-1.8-2.8-2.3-4.3c-1.9,0.1-3.7,0.1-5.6,0.2
+		c0,0,0,0,0,0c0-0.9-0.1-2.6-0.1-3.5c-2.6,0.2-4.1,2.1-5.3,4.2c-0.1,0.1-0.3,0.2-0.4,0.4l-0.3,0.3c0,0.1,0.1,0.3,0.2,0.4
+		c-0.1,0.2-0.2,0.4-0.3,0.6c0.4,0.7,1.1,2.1,1.5,2.8C1276.3,835.7,1276.9,835.7,1277.5,835.7z"/>
+	<path class="st0" d="M1554.7,831.3c0.9,0.1,1.9,0.3,2.8,0.4c0-1.2,0.1-2.3,0.2-3.4c-1.1,0.1-2.2,0.1-3.3,0.2
+		C1554.5,829.4,1554.6,830.4,1554.7,831.3z"/>
+	<path class="st0" d="M1270.5,829.5c-1.2,0-2.3-0.1-3.4-0.1c0.9,2.3,1.8,4.5,2.8,6.8c1.1,0.5,2.1,1,3.2,1.5c0.4-0.8,1.4-2.3,1.8-3.1
+		c-1.4-0.8-2.8-1.6-4.3-2.4C1270.6,831.5,1270.5,830.2,1270.5,829.5z"/>
+	<path class="st0" d="M1385.5,831.1c-0.1,0.8-0.2,1.7-0.2,2.5c0.5-0.1,1.4-0.4,1.9-0.5c0.5-1.3,1.1-2.6,1.8-3.9
+		C1388.1,830.4,1386.8,830.8,1385.5,831.1z"/>
+	<path class="st0" d="M1602.8,831c-0.4-0.4-1.1-1.2-1.5-1.6c-0.6,0-1.7-0.1-2.2-0.1c0.5,1.8,1,3.5,1.5,5.3c0.8-0.1,2.3-0.2,3.1-0.3
+		c-0.1,0.7-0.2,2.2-0.3,2.9c1,1.1,2.1,2.2,3.1,3.3c0.5,0,1.5,0.1,2,0.2c0.3-1.2,0.6-2.4,0.8-3.6
+		C1607.3,834.9,1605.4,832.5,1602.8,831z"/>
+	<path class="st0" d="M1638.6,829.5c-1.4-0.1-2.7-0.1-4.1-0.2c-0.3,0.8-1,2.3-1.3,3.1c1.6,1.3,3.7,1,5.5,0.4
+		C1638.6,831.7,1638.6,830.5,1638.6,829.5z"/>
+	<path class="st0" d="M376.5,837.5c1,0,2.1,0.1,3.1,0.2c0.5-2.4,0.8-4.8,0.9-7.2c-1.4-0.1-2.8-0.1-4.2-0.1
+		C376.5,832.8,376.5,835.1,376.5,837.5z"/>
+	<path class="st0" d="M1360.2,828.8c-1.3,3.2-2.5,6.4-3.1,9.8c0.6,0,1.8,0.1,2.4,0.1C1360.1,835.5,1361.2,832.1,1360.2,828.8z"/>
+	<path class="st0" d="M1593.2,830.6c-1.3,0.8-0.3,3.6,1.2,2.5C1595.4,832.2,1594.6,829.5,1593.2,830.6z"/>
+	<path class="st0" d="M1201.2,830.8c-1.1,0.6-1.3,1.5-0.7,2.6C1203,835.2,1204.6,830.1,1201.2,830.8z"/>
+	<path class="st0" d="M1211.2,834.8c-2-3.4-4.4,0.5-4.1,2.8c1.1,0,2.2,0,3.2,0c1.1-1.4,2.4-2.6,4-3.5c0.4-0.7,1.1-2,1.5-2.7
+		C1213.2,830.6,1212.3,833.1,1211.2,834.8z"/>
+	<path class="st0" d="M1728.5,831.5c0,1.4,0,2.8,0.1,4.3c-0.9-0.1-2.6-0.3-3.5-0.4c-1.2-0.3-2.4-0.5-3.6-0.8c0.8,0.3,2.3,0.9,3,1.2
+		c0,2.9,0.4,6-1.4,8.6c-1.2-2.4-2.1-4.8-2.9-7.3c-2.7,0.5-5.4,1-8,1.4c0.1,0.4,0.2,1.3,0.3,1.8c2.2,0,4.5,0,6.8,0.1
+		c0.8,1.7,1.7,3.5,2.6,5.2c2.1-0.5,4.1-1,6.2-1.5c0.6,1.6,1.3,3.2,1.9,4.8c1-1.7,2-3.4,3-5.2c-1.5-0.5-3-1-4.4-1.5
+		c-0.1-1.3-0.1-2.6-0.1-3.9c1.5,0.1,3,0.2,4.5,0.3v-2.2c-0.6-1.7-1.2-3.4-1.8-5.1C1730.3,831.4,1729.4,831.4,1728.5,831.5z"/>
+	<path class="st0" d="M55.5,846.6c0-2.5-0.3-5.1,0.3-7.6c0.9-1.8,2.4-3.2,3.7-4.8c0.1-0.5,0.3-1.4,0.3-1.9c-1.4,0-2.8,0-4.2,0
+		c-0.7,0.7-1.3,1.5-2,2.2c-0.4,2.5-0.9,5.1-1.3,7.6c-0.7,1.2-1.3,2.4-1.9,3.7c0.6,1.8,1.6,3.4,2.6,5.1h5.2c2.2-0.9,3.8-2.6,5.2-4.4
+		C60.7,846.5,58.1,846.5,55.5,846.6z"/>
+	<path class="st0" d="M135.5,835.2c1.3,1.5,3.3,2.1,5.1,2.9c0-2.3-0.1-4.5-0.1-6.8C138.2,831.1,134.8,832.3,135.5,835.2z"/>
+	<path class="st0" d="M1523.5,835.5c0.6,0.1,1.6,0.1,2.2,0.2c0-0.6,0-1.9,0-2.5c-0.5,0.1-1.6,0.3-2.1,0.4
+		C1523.6,834.1,1523.5,835.1,1523.5,835.5z"/>
+	<path class="st0" d="M1682.6,837.5c-0.1-1.4-0.1-2.8-0.1-4.2c-3.7,1.2-7.5,1.7-10.9,3.6C1674.6,840.3,1678.9,837,1682.6,837.5z"/>
+	<path class="st0" d="M1705.4,837.4c1.1,0.5,2.2,1,3.3,1.6c0.5-1.8,0.8-3.8,1.1-5.7c-1.5,0-2.9,0.1-4.3,0.1
+		C1705.4,834.4,1705.4,836.4,1705.4,837.4z"/>
+	<path class="st0" d="M1014.6,836.4c1.6,0.5,3.2,1,4.9,1.4c0.1-1.1,0.1-2.3,0.2-3.4c-1.8,0-3.5,0.1-5.3,0.1
+		C1014.5,835,1014.5,836,1014.6,836.4z"/>
+	<path class="st0" d="M1547.8,837.6c-1,0-3.1,0-4.1,0c-0.3-1.2-0.6-2.3-0.8-3.5c-0.5,1-1,1.9-1.5,2.9c2,0.3,3.5,1.3,3.5,3.6
+		c1.2-0.1,2.4-0.2,3.7-0.3c-0.2-1.8-0.3-3.6-0.6-5.4C1547.8,835.6,1547.8,837,1547.8,837.6z"/>
+	<path class="st0" d="M1567.4,834.1c0,0.5-0.1,1.4-0.1,1.8C1570.2,838.5,1570.3,831,1567.4,834.1z"/>
+	<path class="st0" d="M170,835.3c0.4,2.4,1,4.9,1.6,7.3c1.4,0,2.8,0,4.1,0c-0.1-2.5-0.4-5-1.2-7.3
+		C173.1,835.3,171.6,835.3,170,835.3z"/>
+	<path class="st0" d="M196.6,834.4c-0.1,1.8-0.1,3.6-0.2,5.4c1.8-0.3,4.2,0.6,5.2-1.4C201.9,835.6,199,833.8,196.6,834.4z"/>
+	<path class="st0" d="M1134.6,840.3c1.2,0,2.4,0.1,3.7,0.1c0.1-1.7,0.1-3.4,0.2-5.1c-1.3,0.1-2.6,0.3-3.9,0.4
+		C1134.6,837.3,1134.6,838.8,1134.6,840.3z"/>
+	<path class="st0" d="M1238.5,840.8c-0.3,0-0.9,0-1.2-0.1c0.1-1.9,0.3-3.9,0.3-5.8c-2.9,0.3-3,3.3-3.1,5.5c-0.6,0.2-1.9,0.7-2.5,0.9
+		c-0.6,0.1-1.9,0.2-2.5,0.2c-1.5,1.3-3.1,2.4-4.9,3.3c-0.1,0.9-0.2,1.8-0.2,2.7c1.4-0.1,2.8-0.1,4.1-0.1c0-0.8-0.1-2.3-0.2-3.1
+		c1.3,0,2.6,0,3.9,0c1.6-1.3,3.9-1.6,4.9,0.7c-0.5,0.4-1.6,1.3-2.1,1.8c0.5-0.1,1.6-0.3,2.1-0.5c0.2-2.2,1-4.3,2.3-6.1
+		c0.8,0.1,2.3,0.4,3.1,0.5c0.6-2.1,1.1-4.2,1.2-6.4c-1,0-3.1,0.1-4.1,0.2C1239.3,836.7,1238.9,838.8,1238.5,840.8z"/>
+	<path class="st0" d="M1352.5,837.1c-0.1-0.6-0.3-1.7-0.4-2.3c-0.3,0.9-0.6,1.8-0.8,2.7c-0.8,0.1-2.3,0.1-3,0.2
+		c0,0.2-0.1,0.6-0.1,0.7c0.7,0,2.1,0,2.8,0c0.8,1.3,2.4,1.2,3.8,1.5C1354.4,838.6,1354,837.3,1352.5,837.1z"/>
+	<path class="st0" d="M1498.2,835.3c0.1,1.1,0.1,2.2,0.2,3.3c0.5-0.1,1.4-0.3,1.8-0.4c0.1-0.9,0.2-1.9,0.4-2.8
+		C1500.1,835.4,1498.8,835.3,1498.2,835.3z"/>
+	<path class="st0" d="M1396.3,836.3c0,0.5,0.1,1.6,0.2,2.2c1,0,2,0,3,0.1c0-0.5,0-1.6,0-2.2C1398.4,836.3,1397.3,836.3,1396.3,836.3
+		z"/>
+	<path class="st0" d="M1491.1,835.8c-1.1,0.6-1.3,1.5-0.6,2.6C1493.2,840.4,1494.3,835.3,1491.1,835.8z"/>
+	<path class="st0" d="M1563.1,838.4c0.6-0.3,1.7-1,2.2-1.3C1564.9,834.1,1560.1,837.2,1563.1,838.4z"/>
+	<path class="st0" d="M1576.4,834.9c-1.6,1.2-3.2,2.4-4.7,3.7c0,0.8-0.1,2.3-0.2,3c-0.5,0-1.5-0.1-2-0.1c0,0.5,0,1.6,0,2.2
+		c1-1.8,2.9-2.4,4.9-2.5c0-0.7,0-2,0-2.7c0.6,0,1.7,0,2.3,0C1576.6,837.3,1576.5,836.1,1576.4,834.9z"/>
+	<path class="st0" d="M1636.6,835.5c-0.1,0.8-0.2,1.7-0.3,2.6c1.2,0.8,2.5,1.7,3.7,2.5c1.2-0.4,2.4-0.8,3.6-1.2
+		c0-1.1,0.1-2.1,0.1-3.1C1641.3,836.6,1638.9,836.3,1636.6,835.5z"/>
+	<path class="st0" d="M1700.5,839.3c0.1-1.2,0.1-2.3,0.2-3.4c-0.8,0.6-1.7,1.2-2.4,1.8c-1.7-0.1-3.3-0.2-4.9-0.3
+		c0,0.5,0,1.6-0.1,2.2C1695.7,840.5,1698.3,841.1,1700.5,839.3z"/>
+	<path class="st0" d="M265.7,844.6c-0.8,0.7-1.6,1.4-2.4,2.1c-2.2,0-4.4,0-6.6,0c-0.1,1.2-0.2,2.4-0.2,3.7c-0.4,0.2-1.1,0.5-1.5,0.7
+		h3.3c2.4-1.6,5.2-1.8,7.9-1.8c0.1-3.8,0.4-7.6,1.2-11.4c-0.5-0.1-1.5-0.4-2-0.6C265.6,839.7,265.6,842.1,265.7,844.6z"/>
+	<path class="st0" d="M1484.3,837.8c0,1.8,0.1,3.7,0.1,5.6c2.2,0,4.3,0.1,6.5,0.2c-0.2-0.4-0.6-1.2-0.8-1.6
+		C1488.2,840.7,1486.2,839.3,1484.3,837.8z"/>
+	<path class="st0" d="M123.5,841.5c-0.1,0.5-0.2,1.4-0.2,1.9c1.4,0.4,2.8,0.9,4.2,1.3c0-1.8,0-3.6,0-5.4c-0.5,0-1.5,0.1-2.1,0.1
+		C124.8,840.2,124.2,840.8,123.5,841.5z"/>
+	<path class="st0" d="M1156.7,839.6c1.8,2,4.3,2.1,6.8,2.1c0-0.5,0-1.6,0-2.2C1161.3,839.5,1159,839.5,1156.7,839.6z"/>
+	<path class="st0" d="M1181.4,841.7c1.9,0.8,4,0.9,6.1,1c0-1.1,0.1-2.2,0.2-3.2c-2,0.1-4,0.1-5.9,0.2
+		C1181.6,840.1,1181.4,841.2,1181.4,841.7z"/>
+	<path class="st0" d="M1203.5,843.9c1-0.4,2.1-0.8,3.2-1.2c0-1.1,0-2.2,0-3.3c-1.1,0-2.2,0-3.2,0
+		C1203.4,840.9,1203.4,842.4,1203.5,843.9z"/>
+	<path class="st0" d="M1289.6,839c-1.3,0.5-3.5,0.2-3.5,2.3c1.2,0.1,2.3,0.3,3.6,0.4C1289.7,841.1,1289.6,839.7,1289.6,839z"/>
+	<path class="st0" d="M1366.2,841.4c1.2,0,2.4,0,3.7,0c-0.4-0.8-1.3-2.3-1.7-3C1365.9,837.6,1366.7,840.3,1366.2,841.4z"/>
+	<path class="st0" d="M1595.6,839.6c-0.1,1-0.3,2.1-0.4,3.2c1.8-0.2,3.6-0.3,5.4-0.4c-0.4-1-0.8-2-1.2-2.9
+		C1598.1,839.5,1596.8,839.5,1595.6,839.6z"/>
+	<path class="st0" d="M1611,839.1c0.8,1.2,1.6,2.4,2.4,3.6c0.7,0,2,0,2.7,0C1615.9,839.8,1613.4,839.2,1611,839.1z"/>
+	<path class="st0" d="M138.6,839.5c-3.3-1.2-4.2,2-5,4.4c0.5,0.8,0.9,1.6,1.4,2.4c0.8,0,1.5,0.1,2.3,0.1
+		C137.8,844.1,138.3,841.8,138.6,839.5z"/>
+	<path class="st0" d="M1173.7,842c0,0.5-0.1,1.4-0.1,1.9c0.8,0.5,1.5,1,2.3,1.5c1.8-1.5,1.8-3.5,0.3-5.3
+		C1175.4,840.7,1174.5,841.3,1173.7,842z"/>
+	<path class="st0" d="M1361.2,840.5c-1.9,1,0.2,3.2,1.6,2.1C1364.7,841.6,1362.6,839.3,1361.2,840.5z"/>
+	<path class="st0" d="M1717.9,843.7c-4.4-0.4-10.5,1.7-13.1-3c-0.2,0-0.6,0-0.8,0c-0.9,1.1-1.8,2.2-2.6,3.2c0.5,1.6,1,3.1,1.6,4.7
+		c-0.8-0.1-2.5-0.2-3.4-0.2c-0.4,0.6-1.1,1.9-1.5,2.6h16.3c-0.8-0.1-2.5-0.4-3.3-0.5C1710.8,846.4,1714.9,845,1717.9,843.7z
+		 M1703.4,847.5c0-1.8,0-3.7,0-5.5c2.6,0.7,5.4,2.5,5.5,5.5C1707,847.5,1705.2,847.5,1703.4,847.5z"/>
+	<path class="st0" d="M1247.4,843.6c1.4,0.8,2.7,1.7,4.1,2.5c0-1.6,0.1-3.1,0.1-4.6c-1.5-0.1-2.9-0.2-4.3-0.2
+		C1247.3,841.8,1247.4,843,1247.4,843.6z"/>
+	<path class="st0" d="M1346.8,847.1c2-1.3,3.2-3.2,3-5.7c-1.1-0.1-2.2-0.1-3.3-0.2C1346.1,843.3,1345.2,845.4,1346.8,847.1z"/>
+	<path class="st0" d="M1500.5,841.4c0,1,0,2,0,3c1.9,0.7,3.9,1,5.9,1.2c0.1-0.5,0.1-1.5,0.2-2.1c-1.7,0-3.2-0.7-4.3-1.9
+		C1501.9,841.7,1501,841.5,1500.5,841.4z"/>
+	<path class="st0" d="M1676.7,840.6c0.8,1.9,2.2,3.4,3.8,4.8c0.6,0,1.7,0,2.2,0c-0.9-1.6-1.7-3.3-2.5-4.9
+		C1679.3,840.5,1677.6,840.6,1676.7,840.6z"/>
+	<path class="st0" d="M107.2,841.8c-1.6-0.4-3.2-0.6-4.8-0.6c0,1.1,0,3.2,0,4.3c1.5,1.4,3.2,2.4,5.3,2.4
+		C107.5,845.9,107.9,843.8,107.2,841.8z"/>
+	<path class="st0" d="M159.9,843.2c-0.8,0.6-1.7,1.3-2.5,1.9c0-0.7,0.1-2.1,0.2-2.8c-1.7,0-3.4,0.1-5.1,0.1c0,1.3,0,2.6,0,4
+		c1.4,0,2.8-0.1,4.2-0.1c-0.1,0.6-0.2,1.8-0.2,2.4c2.5-0.4,4.9-0.9,7.4-1.4C164.3,844.6,162,843.9,159.9,843.2z"/>
+	<path class="st0" d="M1659.2,846.8c3.2-0.3,6.2-1.4,9-2.7c-2.3-1.8-5.3-1.4-7.7-2.9C1660.1,843,1659.6,844.9,1659.2,846.8z"/>
+	<path class="st0" d="M1675.3,840.5c-1.5,1.3-2,3-1.9,4.9c1.2,1.3,2.3,2.8,3.2,4.3c0.5,0,1.5,0,2,0c0.1-0.6,0.2-1.7,0.2-2.3
+		c-0.8,0-2.4,0-3.2,0.1C1675.6,845.1,1675.5,842.8,1675.3,840.5z"/>
+	<path class="st0" d="M205.8,845c-0.4,1.3-0.5,2.6-0.6,4c3.9,0.4,6-3.6,5.4-7C209,842.9,207.3,843.8,205.8,845z"/>
+	<path class="st0" d="M295.3,847.5c0.8,0.7,1.5,1.5,2.3,2.3c1.3-1.9,2-4.1,1.9-6.3c-1.2,0.1-2.4,0.3-3.6,0.6
+		C295.5,845.1,295.5,846.3,295.3,847.5z"/>
+	<path class="st0" d="M1353.5,846.5c1.3,0,2.6-0.1,3.9-0.1c0.1-1.1,0.2-2.1,0.3-3.2c-1.4,0.1-2.8,0.1-4.2,0.2
+		C1353.5,844.5,1353.5,845.5,1353.5,846.5z"/>
+	<path class="st0" d="M1405.1,843c-0.4,1.5,0.2,2.1,1.9,1.5C1407.4,842.9,1406.8,842.4,1405.1,843z"/>
+	<path class="st0" d="M404.5,843.3c0,1.4,0,2.9,0,4.3c2.2-0.1,5.3,0.1,5.5-3C408.2,844.2,406.3,843.7,404.5,843.3z"/>
+	<path class="st0" d="M194,848.6c1.6,0,3.2,0,4.8,0c0.1-2-0.5-3.6-1.8-4.9C195.8,845.2,194.7,846.8,194,848.6z"/>
+	<path class="st0" d="M1199,846.7c0.4,3.1,5.2,4.2,6.6,1.5c-0.2-0.8-0.6-2.4-0.8-3.2C1202.8,845.3,1200.8,845.8,1199,846.7z"/>
+	<path class="st0" d="M1289.1,848.1c0.1,1,0.4,2,0.8,2.9h0.7c1-1.5,2.3-2.9,4.1-3.6c-0.1-0.4-0.3-1.2-0.5-1.6
+		C1292.2,844.9,1290.3,846.7,1289.1,848.1z"/>
+	<path class="st0" d="M111.8,851h5.1c-0.9-1.9-1.8-3.7-2.9-5.5C113.3,847.3,112.6,849.2,111.8,851z"/>
+	<path class="st0" d="M1337.6,845.6c-0.4,0-0.7,0-1.1,0.2c-1.1,0.5-2.2,1-3.3,1.5c-1.2,0.4-2.4,0.9-3.6,1.3c-0.1,0-0.3,0.1-0.4,0.1
+		c0,0,0,0,0,0c0,0,0,0,0,0c0.2,0.7,0.3,1.5,0.5,2.2h0h4.5h0c0.6-1.3,1.1-2.6,1.7-3.9c0.5,0.2,0.9,0.5,1.4,0.7c0.9,0.5,1.7,1.2,2.2,2
+		c0.2,0.3,0.3,0.7,0.4,1.1h0.2h3.4h0.1c-1.7-1.8-3.2-3.8-4.6-5.9C1338.5,845.3,1338,845.5,1337.6,845.6z"/>
+	<path class="st0" d="M1654.8,849.8c-0.8,0.3-2.5,0.9-3.3,1.2c0-1.9-0.1-3.8-0.1-5.7c-1.4,0.3-2.8,0.7-4.1,1.1
+		c0.3,1.5,0.7,3.1,1.1,4.7h7.2c3.2-1.2,2-4.7,0.4-6.7C1655.6,846.1,1655.4,848,1654.8,849.8z"/>
+	<path class="st0" d="M1694.2,849.8c1.1-0.1,2.2-0.2,3.3-0.3c0-1.2,0.1-2.3,0.2-3.4c-1.1,0.5-2.2,1.1-3.3,1.6
+		C1694.3,848.2,1694.2,849.3,1694.2,849.8z"/>
+	<path class="st0" d="M168,846.5c-2.7-0.7-2.5,2.8-2.6,4.5h7.7C171.9,849,170.8,846,168,846.5z"/>
+	<path class="st0" d="M287.5,850.5c-0.3,0.1-1.1,0.4-1.4,0.5h5.5c0-1.2,0-2.5,0-3.7c-0.9,0.1-1.7,0.2-2.6,0.3
+		C288.5,848.6,288,849.5,287.5,850.5z"/>
+	<path class="st0" d="M1422.2,847.4c-1.9,0.9,0.1,3.3,1.6,2.1C1425.7,848.6,1423.7,846.2,1422.2,847.4z"/>
+	<path class="st0" d="M1447.2,851h2c0.2-1.2,0.5-2.5,0.7-3.7c-0.6,0-1.7,0.1-2.3,0.1C1447.4,848.6,1447.3,849.8,1447.2,851z"/>
+	<path class="st0" d="M1617.6,851h2.7c0.1-1.3,0.2-2.5,0.4-3.7c-1.1,0.1-2.2,0.2-3.3,0.4C1617.4,848.8,1617.5,849.9,1617.6,851z"/>
+	<path class="st0" d="M1666.2,851h7.4c-2.1-1.6-4.1-3.4-6.1-5.2C1667.1,847.5,1666.6,849.3,1666.2,851z"/>
+	<path class="st0" d="M147.7,851h5c-1-1.3-2-2.7-3-4.1C149.1,848.3,148.4,849.6,147.7,851z"/>
+	<path class="st0" d="M374.9,848.5c-0.2,0.6-0.7,1.8-0.9,2.5h3.5c0-0.6-0.1-1.7-0.2-2.3C376.5,848.6,375.7,848.6,374.9,848.5z"/>
+	<path class="st0" d="M410.8,848.3c-0.2,0.7-0.6,2-0.8,2.7h4.7c-0.4-0.6-1.2-1.8-1.6-2.5C412.3,848.5,411.5,848.4,410.8,848.3z"/>
+	<path class="st0" d="M1371.4,851h3.8c0.1-0.7,0.2-2,0.3-2.7c-1.3-0.4-2.7-0.8-4-1.2C1371.5,848.4,1371.4,849.7,1371.4,851z"/>
+	<path class="st0" d="M1598.1,848.3C1596.6,851.2,1601.5,848.3,1598.1,848.3L1598.1,848.3z"/>
+	<path class="st0" d="M137.2,851h3C141.2,848.5,136.8,848.5,137.2,851z"/>
+	<path class="st0" d="M1510.5,849.8c-0.4,0.3-1.3,0.9-1.7,1.2h9.3C1516.4,848.4,1513,850,1510.5,849.8z"/>
+</g>
+<g id="Shadow">
+	<path class="st1" d="M373.2,40.6c1.5,0.1,2.5,3.7,0.8,4.3C372.5,44.3,372.3,41.8,373.2,40.6z"/>
+	<path class="st1" d="M377.4,50.5c2.5-1.1,1.6,5.5-1.2,4.2C375.4,53.2,376.4,51.7,377.4,50.5z"/>
+	<path class="st1" d="M367.7,51c2.2,0.3,4.4,0.7,6.6,1.2c-1.8,1.5-4.1,2.6-6.5,1.9C367.9,53.3,367.8,51.8,367.7,51z"/>
+	<path class="st1" d="M438.7,56.8c0.4-1.7,2-2,3.4-2.5c0.2,0.7,0.6,2,0.8,2.7C441.6,57,440.1,56.9,438.7,56.8z"/>
+	<path class="st1" d="M353,65.9c0.3-2.9,3-3.6,5.5-2.9C357.1,64.8,355,65.4,353,65.9z"/>
+	<path class="st1" d="M383.3,72.2c3.1-0.2,0.8,3.6-1.2,2.5C380.4,74,382,72,383.3,72.2z"/>
+	<path class="st1" d="M443.2,73.2c2.4-0.8,1.2,2.8-0.5,2.4C441.2,75.4,442.2,73.3,443.2,73.2z"/>
+	<path class="st1" d="M1380.1,78.2c1.6-0.6,2.2,0,1.7,1.6C1380.2,80.3,1379.6,79.8,1380.1,78.2z"/>
+	<path class="st1" d="M1361.1,80.1c1.6-0.5,2.2,0,1.7,1.6C1361.2,82.3,1360.6,81.7,1361.1,80.1z"/>
+	<path class="st1" d="M346.1,91.9c-1.8-1.9,0.2-4.2,1.8-5.3C349.5,88.6,348.8,91.4,346.1,91.9z"/>
+	<path class="st1" d="M403.9,104.1c0.8-1.5,0.5-4.5,3-4.1c0.5,1,1,2,1.4,3C406.9,103.4,405.4,103.8,403.9,104.1z"/>
+	<path class="st1" d="M1087.5,113.3c0.5,0.1,1.7,0.3,2.2,0.5c-0.3,0.3-1,0.8-1.3,1.1c-0.1,1.4-0.1,2.7-0.2,4.1l1.5-0.1
+		c2.7,0,5.5,0,8.2,0c3.7-0.1,7.5-0.1,11.2,0c2.2,0.1,4.5,0.2,6.7,0.1c5.2-0.2,10.4-0.1,15.6-0.1c0,2.8-0.1,5.5-0.2,8.3
+		c-32.4,0.5-64.8,0.1-97.1,0.2c-101.4,0-202.7,0-304.1,0c-43.3-0.1-86.6,0.2-129.9-0.1c0-2.8,0-5.6,0-8.4c3.9,0,7.9,0,11.8,0
+		c4,0.1,8,0.2,12,0c3.7-0.2,7.5-0.2,11.2,0c2.2,0.1,4.5,0.2,6.8,0.1c13.7-0.5,27.5,0,41.2-0.3c39,0.4,78-0.2,117,0.2
+		c17.8,0.2,35.5-0.4,53.3,0.1c2.3,0.1,4.6,0.1,6.9,0c3.9-0.2,7.9-0.1,11.8,0c2.2,0.1,4.4,0.1,6.6,0.1c69.7-0.1,139.5-0.3,209.2,0
+		C1087.7,117,1087.6,115.2,1087.5,113.3z"/>
+	<path class="st1" d="M1291,117.1c0.8,0,2.3,0,3.1,0.1c-0.4,1.6-0.5,4.4-2.8,2.8C1291.2,119.2,1291.1,117.8,1291,117.1z"/>
+	<path class="st1" d="M369,141c1.4,0.7,2.8,1.5,4.2,2.3c-0.9,0.6-1.8,1.4-3,1.6C369.8,143.6,369.4,142.3,369,141z"/>
+	<path class="st1" d="M689,189.1c0.4-1.9,2.3-2.5,3.7-3.3c0.3,1.9,0.7,3.7,1,5.6c5.2-0.1,10.4,0,15.5,1.2c3.6,2.8,6.6,6.5,7.5,11.1
+		c2.4,11.7,1.7,23.6,1.7,35.4c-0.1,7,0.3,14-0.3,21c-1,9.3-0.2,18.6-0.3,27.9c-0.4,19-0.1,38-0.3,57c-0.1,3.4,0.3,6.9,0.6,10.3
+		c-0.5,6.7-0.7,14-5.2,19.5c-0.4-1.6-0.8-3.2-0.8-4.8c0.3-16.6,0-33.3,0.1-50c0.1-6.4-0.2-12.7,0.4-19c0.6-5.4-0.4-10.7-0.4-16.1
+		c0-20,0-39.9,0-59.9c-0.4-4.6-0.8-9.8-3.9-13.4c-4.8-4.1-11.6-2-17.3-3.7c-2.5-0.7-2.6-3.8-2.8-5.9
+		C688.3,197.7,687.9,193.3,689,189.1z"/>
+	<path class="st1" d="M858.6,188.6c0.7-2.2,3-2.6,4.9-3.1c0,1.9,0,3.9,0.1,5.8c3.8,0,7.6-0.1,11.5,0.1c4.5,0,8,3.8,9.8,7.6
+		c3.5,8.5,2.5,18,3.3,26.9c-0.7,12.3-0.3,24.6-0.4,36.9c0.1,8.4-0.4,16.7,0.4,25.1c0.3,4.7-0.9,9.3-0.3,14c0.8,5-0.4,10-0.2,14.9
+		c0.5,6.7,0.2,13.3,0.7,20c-1.5,10.3,0.4,20.9-2.5,31.1c-0.7,2.8-2.2,5.4-4.2,7.4c0.5-14.8,0.2-29.7,0.2-44.5c0-34.7,0-69.4,0-104
+		c-0.2-5.2-0.8-10.8-3.8-15.2c-4.8-4.1-11.5-2.4-17.2-3.7c-3.1-0.9-3-4.5-3.1-7.1C858,196.9,857.5,192.6,858.6,188.6z"/>
+	<path class="st1" d="M1018.4,186c1.5,1,3.3,2,3.3,4c1.8,15.6,1.9,31.4,4.2,47c0.2,3.6,1.1,9.3-3.3,10.7c-5.9,2-12.3,1.5-18.4,2.3
+		c0-0.6,0.1-1.8,0.2-2.3c-0.6,0-1.8,0-2.4,0c-2.1-8.7-2.5-18.3-7.9-25.8c-3.2-4.6-8.8-6.9-14.2-7.8c-8.3-1.4-16.7-2.2-25-2
+		c-7,0.1-14.1-0.6-21,0.9c-2,7.9-1.3,16-1.3,24.1c0.1,12.2-0.2,24.4,0.1,36.5c-2,0-3.9,0-5.8-0.2c0.5-11.7,0.3-23.5,0.4-35.3
+		c0.1-3.2,0.2-6.3,0.1-9.5c-0.1-4.5-0.9-9-0.3-13.5c0.7-6.1-0.5-12.4,1.3-18.3c3.3-1.4,6.9-2.6,10.6-2.3c13,0.3,26.1-0.7,38.9,1.6
+		c7.5,1,15.6,3.4,20.3,9.8c5.8,7.4,6.9,16.9,9,25.7l0.2,0.8c2.1-0.1,4.3-0.3,6.5-0.6c2.3-0.3,4.5-0.7,6.8-1.1l0.5-0.1
+		c0.1-2.7-0.5-5.3-1.6-7.7c-0.4-2.6-0.6-5.2-0.7-7.8c-0.1-2.9-0.3-5.7-0.7-8.5c-0.8-4.9-0.8-9.8-1.1-14.8
+		C1017.6,189.7,1018,187.9,1018.4,186z"/>
+	<path class="st1" d="M1044.2,191c0.2-2.5,2.4-3.9,4.3-5c0.3,1.8,0.6,3.5,1,5.3c5.8,0.1,11.9,0.2,17.3,2.9c3.5,3.4,5.9,8,6.4,12.9
+		c0.9,7.9,1.6,15.9,1.3,23.9c-0.2,30-0.3,60-0.1,90c-0.2,8,0.3,16-0.6,24c-0.8,9.6,0.9,20.4-4.8,28.8c-1.8-3.3-0.8-7.2-1-10.8
+		c-0.3-8.4,1.2-16.7,1-25c-0.1-29.7,0-59.3,0-89c-0.2-5.3-0.7-10.7-0.6-16c-0.3-6.7,0.2-13.9-3.6-19.8c-2.6-3.9-7.7-3.8-11.8-4.3
+		c-3-0.4-7.1,0.1-8.6-3.2C1043.6,200.9,1043.8,195.9,1044.2,191z"/>
+	<path class="st1" d="M1206.4,189.2c0.3-2.6,3.2-2.8,5.1-3.5c0,1.8-0.1,3.7-0.1,5.6c5.9,0,12.2,0.7,17.1,4.1
+		c4.7,4.7,6.8,11.3,7.4,17.8c0.3,3.9,1.9,7.8,1,11.7c-0.7,4-0.4,8-0.4,12c0.1,6.7-0.5,13.4,0.7,20c0.3,5-1.2,9.9-0.7,14.9
+		c0,2-0.1,4,0,6c0,6-0.2,12.1,0.7,18c0.3,11.8,0.7,23.6,1.1,35.4c-2.9-1.6-5.2-4-6.9-6.7c-0.8-25.2-0.2-50.5-0.5-75.7
+		c-0.2-11.2,1.1-23-3.5-33.5c-2.1-4.8-7.7-6.1-12.4-6.5c-3-0.5-7.1,0-8.6-3.3C1205.5,200.3,1205.7,194.6,1206.4,189.2z"/>
+	<path class="st1" d="M1281.2,185.6c5.2,0.4,4.5,6.6,4.7,10.3c-0.3,3.8,0.9,8.7-2.2,11.7c-5.2,2.1-11.6,0.1-16.3,3.7
+		c-2.7,2.8-3.4,6.9-3.7,10.7c-0.1,9.4-1.5,18.6-1.5,28c0,16,0,32-0.2,48c-1.5,36-0.6,72.1-1,108.1c0.4,3.1-2.5,5.4-5.4,5.4
+		c-5.4,0.2-10.8,0.3-16.2,0c-3.4-0.1-5.3-3.3-7.2-5.7c-23.1-30.9-49.1-59.6-74.1-88.9c-19.9-22.8-39.5-45.8-58.8-69
+		c-0.9,11.1,1.1,22.1,0.9,33.2c0.2,14.7-0.4,29.4,0.6,44c0.7,12.3,0.3,24.6,0.6,37c0,4.3,2,8.5,0.8,12.8c-4-4.2-5.2-10.1-5.6-15.7
+		c-0.5-8.1-1-16.1-0.9-24.2c0.3-5.1,0.2-10.2-0.7-15.2c-0.3-15.9,0-31.8-0.3-47.7c0-10-0.9-20-1-29.9c-1.1-8.3-1.3-16.7-1.3-25.1
+		c5.6,7,11.5,13.8,17,20.9c4.8,7.7,11.1,14.2,17,21c7.5,8.5,14.2,17.7,22.2,25.7c4.3,4.1,7.1,9.4,11.5,13.4
+		c5.8,5.3,9.8,12.2,15.3,17.7c6.4,7.9,12.8,15.9,20.1,23c3.7,4.6,7,9.5,11,13.8c4.7,6,10.5,11,15,17.2c6.3,7.3,10.9,15.9,17.8,22.8
+		c5.1,1,10.3,1.2,15.4,1.2c-0.1-4.6-0.4-9.1-0.1-13.7c0.2-3.7,1.8-7.6,0-11.2c-0.2-3.3,0.3-6.5,0.7-9.8c0.4-3.4-0.8-6.6-0.8-10
+		c0-4.7,0.7-9.3,0.8-14c0.3-7.1-0.1-14.1,0.6-21.2c0.2-2.1,0.3-4.2,0.2-6.2c-0.4-4.3-0.5-8.5-0.2-12.8c0.1-1.8,0.2-3.6,0.2-5.3
+		c0.2-6.7-0.2-13.4,0.4-20.1c1.3-6.5,0.8-13.2,0.4-19.8c-0.9-8.2,0.7-16.5,0-24.7c-0.5-4.4,0.8-8.7,0.6-13
+		c-0.3-6.5,1.7-13.3,6.7-17.7c5.1-2.6,11-2.3,16.5-3.1C1280.9,189.2,1281,187.4,1281.2,185.6z"/>
+	<path class="st1" d="M551,191.6c6.7-0.1,13.4-0.3,20.2-0.3c0.5-0.2,1.4-0.6,1.9-0.9c3.5,2.2,7.8,2.6,11.6,4.1
+		c14.5,4.7,26.4,15.4,34.7,28c5,5.8,7,13.3,9.7,20.4c2.4,7.2,4.8,14.6,5.4,22.2c1.6,8.2,0.9,16.7,1.9,25c0.3,2.4-0.5,4.7-0.8,7
+		c-0.8,7.4-1.4,14.8-3.2,22c-0.4,1.5-0.8,3.1-1,4.6c0,0.6-0.2,1.8-0.2,2.5c-1.4,3.1-2.7,6.2-4.1,9.3c-0.3-0.4-0.8-1.3-1.1-1.8
+		c0.3-3.6,1.3-7.2,1.9-10.7c1.3-6.6,1.4-13.3,2.3-20c1-6.7-0.7-13.3-1.1-19.9c-1.3-15.6-6.2-30.8-14.1-44.3
+		c-4.9-7.8-11.1-14.9-18.8-20c-6.4-4.5-13.9-7.1-21.4-8.9c-11.5-2.9-23.8-0.1-34.3,4.8c-13.5,6.7-23.2,18.9-29.9,32.1
+		c-11.7,25.5-13.3,55-6.3,82c0.7,2.4,0.8,4.8,0.7,7.2c-5.9-11.8-8.5-24.9-9.8-37.9c-2.7-21.3,1.1-43,8.5-63c0.8-1.6,1.5-3.3,2.2-4.9
+		c1.8-3.7,4.4-6.8,6.8-10.1c5.6-7.4,11.5-14.8,19.5-19.8c2.4-1.9,5.1-3.2,8.1-3.7c1.4-0.4,2.9-0.8,4.3-1.3l1.3-1.2
+		C547.9,193.6,549.7,193,551,191.6z"/>
+	<path class="st1" d="M1146.3,193c1.9-0.6,2.8,2.6,0.8,3C1145.2,196.5,1144.4,193.5,1146.3,193z"/>
+	<path class="st1" d="M757.7,195.7c13.1-1.8,27.6-1,38.8,6.8c9.7,6.8,14.6,18.7,15.2,30.2c-0.1,5.6-0.1,11.2,0.1,16.8
+		c0.1,8.1-1.8,16.2-5.7,23.4c-1.5-3.1,0-6.6,0.2-9.9c1.4-8.3,0.5-16.8-1.3-24.9c-1.9-7.6-5.8-15.1-12.6-19.3
+		c-8.6-5.6-19.3-6.6-29.3-5.5c0,49.3,0,98.6,0,147.9c-0.2,4.5,2.2,9.3,0,13.6c-0.7-0.9-1.3-1.8-2-2.7c-1.2-4-1.9-8.1-2.7-12.2
+		c-1-6.5-0.8-13-0.8-19.6c0.2-30.5-0.2-61,0.2-91.6c0.3-6.8,1-13.7-0.1-20.4C757.2,217.4,758,206.5,757.7,195.7z"/>
+	<path class="st1" d="M1378.2,209.2c1.7-1,3.7,1.8,1.4,2.4C1378,212.6,1376.1,210,1378.2,209.2z"/>
+	<path class="st1" d="M850.4,218.2c0.3-0.6,0.8-1.6,1.1-2.2c3.2,6.9,5.6,14.4,6.1,22c0,11.3,1,22.9-3,33.7
+		c-6.3,17.5-19.8,31.9-36,40.8c-13.9,7.3-29.9,11-45.6,9.3c-2.6-0.6-4.2-3.2-4.1-5.8c-0.2-4.6-0.3-9.3,0.3-13.9
+		c0.1-2.1,2.2-2.8,3.8-3.4c0.2,1.8,0.3,3.6,0.5,5.4l0.9,0.1c11,1.2,22.1-0.8,32.4-4.7c3.4-0.9,6.8-1.9,9.8-3.7
+		c4.8-3,9.9-5.9,13.8-10.2c2.6-2.4,4.9-5.3,6.9-8.2c8.5-7.5,12.3-18.8,14.4-29.6c0.9-2.1,1.7-4.4,1.7-6.7c0-6.8,0.8-13.8-2-20.2
+		C851,220.1,850.6,218.8,850.4,218.2z"/>
+	<path class="st1" d="M673.5,248.4c0.3-0.4,0.8-1.1,1.1-1.5c5.5,13,9.3,26.9,9.3,41.1c1,20.3-1.3,41.2-10,59.7
+		c-12.4,29.7-39.5,52.2-70.2,60.8c-8.3,2.6-17,4.1-25.6,5.5c-10.7,0.2-21.4,0.2-32.1,0c-25.8-4.1-51.3-15.2-69.4-34.6
+		c-17.5-16.9-27.2-40.5-30.3-64.3c0-11.7-0.2-23.4,0.1-35.1c2.2-10.6,4.5-21.4,9.5-31.2l0.8,1.9c-3.1,8.8-3.9,18.1-4.8,27.4
+		c-0.2,2.4-0.2,4.7-0.2,7.1c-0.4,14.9,1.6,30,7.1,43.9c2.8,7.8,7.1,14.8,11.2,22c0.6,0.9,1.2,1.8,1.9,2.6
+		c7.4,8.7,15.3,17.2,24.9,23.5c6.8,4.7,14.3,8.2,21.7,11.7c1.1,0.5,2.2,0.9,3.3,1.3c5.7,2,11.7,2.9,17.5,4.5
+		c5.1,1.4,10.4,2,15.7,1.9c8-0.2,16,0.6,23.9-0.8c6.8-0.4,13.2-2.7,19.9-3.7c2.3,0,4.6-0.5,6.6-1.8c0.5-0.3,1.5-0.9,2-1.2
+		c23.4-7.2,43.5-23.8,55.9-44.8c0.6-1,1.1-2,1.6-3c2.2-5,3.8-10.3,6.5-15c2.9-4.6,3.4-10.1,4.7-15.2c0.8-3.5,1.3-7.2,1.3-10.8
+		c-0.1-5.4,1.4-10.7,1.1-16.1C678.7,272,676.8,260,673.5,248.4z"/>
+	<path class="st1" d="M986,268c-1-4.9-1.7-11.4,3.7-14c0.3,0.6,0.9,1.7,1.2,2.3C990.4,260.6,988.9,264.8,986,268z"/>
+	<path class="st1" d="M1003.4,286c0.2-10.9-0.3-21.9,0.6-32.8c3.4,1.1,6.9,3.8,6,7.9c-2,16.9-0.6,34-1,51c-0.3,5.4,1.5,10.6,1,16
+		c-0.2,2.5-2.3,4.8-4.9,4.9c-4.7,0.3-9.4,0.2-14.1,0c-2.6,0-5.2-1.9-5.4-4.6c-0.5-5.8,0.3-12.4-3.9-17.1c-3-2.5-6.9-3.4-10.7-4.2
+		c-12.7-1.6-25.5-1.6-38.2-1.2c-0.5,13-0.1,26.1-0.2,39.1c0.2,7-0.5,14,0.5,20.9c0.2,1.3,0.1,2.6-0.2,3.9c-3.8-4.4-5-10.2-5.5-15.8
+		c-0.5-11,0.2-22-0.5-33c0.3-6,0.8-12,0-18c-1-4.8,0.8-9.7-0.5-14.5c12.5,0,25-0.2,37.5,0.2c7.7,0.8,16.5,1.2,22.2,7.1
+		c4.9,5.2,4.2,12.8,5.6,19.4c4.2-0.5,8.5-0.8,12.8-0.5C1003,305.2,1003.6,295.5,1003.4,286z"/>
+	<path class="st1" d="M1481.6,284.9c1.6-1.7,4.1,0.3,4.9,2C1484.8,286.7,1482.1,287.1,1481.6,284.9z"/>
+	<path class="st1" d="M1449.2,296.2c2.8-0.5,1,3.7-1,2.7C1446.5,298.3,1447.9,296.1,1449.2,296.2z"/>
+	<path class="st1" d="M1291.2,318.2c1.4-1.1,2.7,1.4,1.3,2.2C1291.2,321.5,1289.9,319,1291.2,318.2z"/>
+	<path class="st1" d="M45.2,330.2c1.5-1.2,3,1.4,1.6,2.4C45.4,333.9,43.8,331.2,45.2,330.2z"/>
+	<path class="st1" d="M1025.4,391.5c3.4-16.2,7.2-32.4,11.4-48.5c2,0.9,4.7,1.1,5.8,3.3c2.2,4,0.3,8.7-0.7,12.8
+		c-3.8,12.7-6.5,25.6-9.4,38.5c-0.8,3.9-0.6,9.1-4.8,11c-4.5,1.1-9.1-0.2-13.6-0.4c-10-0.4-20.1,0.2-30.1-0.6
+		c-10.3-1-20.6-0.4-30.9-0.6c-15,0.2-30-0.5-45,0.8c-14.7,0.7-29.5-0.6-44.1,1.1c-2.9,0.4-5.8-2-5.9-4.9c-0.2-4.9-0.5-9.9,0.2-14.8
+		c0.4-2.2,2.7-2.8,4.5-3.4c0.3,1.8,0.6,3.7,0.9,5.6c14.1-1.3,28.2-0.9,42.3-1.2c28.6-1.3,57.3,0,86-0.7
+		C1003.1,391.1,1014.3,390.1,1025.4,391.5z"/>
+	<path class="st1" d="M1049.3,379.3c0.7,0,2.1,0,2.8,0c-0.7,0-2.1,0.1-2.7,0.2c0,4,0,7.9,0.1,11.9c10.1-1.4,20.4-0.4,30.5-1.5
+		c11.8,0.6,23.6,0.2,35.3,1c0.4-0.4,1.1-1.1,1.5-1.5c0.6,0.1,1.8,0.4,2.4,0.5c0.1-3.5,0.1-6.9,0.2-10.4l0-0.6
+		c0.2,2.2,0.4,4.4,0.6,6.6c1.7,0.9,4.2,1.4,4.6,3.7c0.9,4.5,0.2,9.1,0,13.7c-0.1,2.4-0.9,5.4-3.6,5.9c-4.3,0.5-8.6-1-12.9-0.8
+		c-8.7,0.3-17.4-0.8-26-0.1c-10.7,0.5-21.4-0.6-32,0.9c-2.6,0.5-5.7-1.1-5.8-3.9c-0.4-5.2-0.5-10.6,0.2-15.8
+		c0.3-2.2,2.9-2.6,4.6-3.5C1049.1,383.5,1049.2,381.4,1049.3,379.3z"/>
+	<path class="st1" d="M688.6,389.7c0.3-2.1,2.4-3,4-3.9c0.3,1.9,0.7,3.8,1,5.7c3.4-0.2,6.8-0.6,10.1-1.2c10.3,0.4,20.6-1.1,31-0.5
+		c7.7,1.1,15.5,0.3,23.2,0.7c7.9,0.6,15.9,1.2,23.8,1.3c1.4-1.5,1-4,1.6-5.9c2.2,0.8,4.2,2.6,4.2,5.2c0.1,4.9,0.5,10-0.5,14.9
+		c-1,3.5-5.2,3.2-8.1,2.8c-5.9-1-12-0.5-17.9-0.9c-9.6-1.3-19.4-0.6-29.1-0.8c-8-0.2-15.9,1.3-23.9,1c-5.1-0.2-10,1-15.1,0.9
+		c-2.6,0-4.5-2.6-4.6-5.1C688.2,399.2,688,394.4,688.6,389.7z"/>
+	<path class="st1" d="M147.6,426.2c0.8-1,2.9-0.8,3.2,0.6C150.5,428.7,146.6,428.1,147.6,426.2z"/>
+	<path class="st1" d="M161.2,437.5c2-1,2.8,3.2,0.7,3.4C160.4,440.6,160.1,438.4,161.2,437.5z"/>
+	<path class="st1" d="M1053.5,475.5l0-0.5c0.1,2,0.2,4,0.3,6c2.1,1.1,5.3,1.9,5.1,4.9c0.3,5.3,0.3,10.7,0.1,16
+		c0,2.6-1.9,5.2-4.6,5.4c-6.2,0.7-12.8-0.6-18.5,2.3c-3.6,2.1-4.9,6.4-6,10.1c-2.9,15.5-2,31.4-2.1,47.2c0,39-0.1,78,0,116.9
+		c0.1,8.6-0.5,17.2,0.8,25.7c0.5,3.5,0.7,7.1,0.5,10.6c-1-1-2.4-1.7-2.8-3.2c-1.8-5.5-2-11.3-2.7-17.1c-1-7.1,0.3-14.3-1-21.4
+		c-0.4-6.2,0.3-12.5-0.5-18.7c-0.7-4.4,0.5-8.7,0.4-13.1c-0.2-41,0.1-81.9,0-122.9c0-9.3,0.6-19.1,5.6-27.3
+		c3.3-2.7,6.9-5.5,11.3-5.9c4.4-0.4,9-0.1,13.4-1C1052.7,485,1053.2,480.3,1053.5,475.5z"/>
+	<path class="st1" d="M1236.2,476.1c0.4-0.3,1.3-0.8,1.7-1.1c3.8,8.3,6.1,17.3,8.7,26c7.2,21.3,14,42.7,21.2,64
+		c13.5,39.3,27,78.6,40.3,117.9c1.2,3.7,2.9,7.1,4.1,10.8c0.6,1.3,0.3,2.7-0.4,4c-3.9-9-7.2-18.2-10.5-27.5
+		c-2.7-7.6-4.7-15.4-8.4-22.5c-1.8-9.2-5.5-17.9-8.4-26.8c-2.8-8.6-6.8-16.9-8.8-25.7C1262.2,555.6,1248.6,516,1236.2,476.1z"/>
+	<path class="st1" d="M1524.4,474.8c3.8,0.1,4.1,4.2,4.9,7c15.9,51.1,33.5,101.6,50.8,152.2c3.5,8.7,5.9,17.8,9.2,26.5
+		c2.8,7.7,4.7,15.7,7.9,23.2c0.5,2.2,2.5,5.1,0.3,7c-0.4-1.4-0.8-2.8-1.1-4.2c-0.5-2.8-1.6-5.4-3.1-7.8c-2.2-4.7-3.9-9.6-5.2-14.6
+		c-0.6-2.8-1.4-5.6-2.6-8.2c-2.4-5.6-4.8-11.2-6.3-17.2c-6.3-18.8-12.9-37.5-19.2-56.4c-1.4-4.4-3.9-8.3-5.2-12.8
+		c-2.5-8.2-5.4-16.2-7.6-24.5C1539.5,521.6,1531.7,498.2,1524.4,474.8z"/>
+	<path class="st1" d="M432.1,480.8c2.1,0.8,4.2,2.1,4.4,4.6c0.4,5.2,0.1,10.5,0.1,15.7c-0.1,2.4-0.6,5.9-3.6,6.2
+		c-7.7,0.9-15.8,0.5-23,3.8c-3.6,1.5-5.2,5.5-5.9,9.1c-1,6.6-1.4,13.3-0.5,20c0.6,21.9-0.8,44,1.1,65.9c0.7,13,0.4,26,0.5,39
+		c0.7,7,1.1,14,1.1,21c0.9,8-0.1,16,1.1,23.9c1,6.6-0.3,13.3,1.1,19.8c0.5,3.3,1.7,7.2-0.5,10.1c-4.9-8.7-5.5-19.1-5.7-28.8
+		c-1.9-15.9-1.1-32-2.5-48c-0.3-8,0.2-16-0.8-24c-0.3-3.3,0.6-6.7,0.2-10c-1.2-9.6-0.1-19.4-1.2-29c-0.8-7.6,0.3-15.3-1-22.9
+		c-0.5-5.7-0.7-11.4,0.2-17.1c0.6-3.7-0.6-7.3-0.2-11c0.7-6-0.8-12-0.2-18c0.8-3.3,2.2-6.5,2.9-9.9c3-3.4,6.7-6,10-9.1
+		c7.1-1.7,14.5-1.6,21.7-2.4l0.4,0C431.7,486.6,431.9,483.7,432.1,480.8z"/>
+	<path class="st1" d="M755.5,485.3c0.1-2.5,2.3-3.9,4.5-4.6c0.2,2.8,0.3,5.6,0.3,8.4l1.2,0.2c6.8,0.5,14.2,0,20.3,3.7
+		c4.3,2.7,6,7.7,8.5,11.8c1.8,7.9,1.1,16.1,1.2,24.2c0.1,11.3-0.2,22.6,0.1,34c1.3,9.3,0.7,18.7,0.5,28c0.3,10,0.5,20.1-0.5,30
+		c-0.1,21.7,0,43.3-0.1,65c-0.1,11.7,0.7,24.3-5.5,34.8c-2.8-5.5,0-11.9-0.2-17.8c-0.2-14,0.5-28,0.3-42c0-27.3,0.1-54.7,0-82
+		c-1-16.6,0.7-33.4-1.2-50c0-5.8-1-11.9-4.3-16.8c-4.8-5.2-12.4-4.7-18.8-4.7c-3,0.1-6.3-1.7-6.5-4.9
+		C755.2,496.9,755.2,491.1,755.5,485.3z"/>
+	<path class="st1" d="M98.3,487c2.2-1.9,3.5-5.1,6.7-5.3c0.2,2.5,0.3,5,0.4,7.6l1.2,0.2c7.4,0.6,15.6,0.5,21.5,5.5
+		c7.4,6,9.2,16.1,9.2,25.1c0.3,9.8-0.7,19.7-1.1,29.5c-1.1,8.8-0.2,17.8-1.5,26.5c-0.3,11-1.3,22-1.6,33c-0.7,3.5,0.4,6.7,1.3,10
+		c-0.6,1.3-1.6,2.5-1.9,4c-1.5,8.9-0.4,18-1.7,27c-0.5,7-0.3,14-1.2,21c-0.8,6,0.3,12.1-0.8,18c-0.8,3-1.3,6.1-1.5,9.2
+		c-0.9,0.7-1.4,1.6-1.5,2.8c-0.8,6.1-1.8,12.5-5.7,17.5c1.3-8.5,2.1-17,3.1-25.5c0.2-5-0.5-10.1,0.8-15c1.8-8.1,0-16.5,1.4-24.6
+		c1.7-9,0.1-18.3,1.4-27.3c0.9-6,0.2-12.1,0.5-18.1c0.1-6,2-11.9,1.5-18c-0.3-3.5-0.3-7,0.1-10.5c-0.8-0.2-2.3-0.7-3-1
+		c5.6-4.4,4-12.2,4.4-18.5c-0.9-11.1,3.3-22,0.8-33c-1.3-5.2-1.8-11.3-6.2-14.9c-5.1-4.4-12.4-4.3-18.8-4.6c-2.3,0-4.4-1.4-5.2-3.5
+		C98.9,498.5,102.6,491.7,98.3,487z"/>
+	<path class="st1" d="M873.2,481.5c2,0.4,4.8,0.8,5,3.4c0.8,5.6,0.4,11.4,0.3,17.1c0.1,3.4-3.3,5.9-6.6,5.7
+		c-6.5,0-13.9-0.4-19.1,4.3c-4.2,6.9-5.2,15.2-4.9,23.2c0.3,7.6-0.8,15.3-0.2,22.9c0.5,9,0,18,0.2,27c0.1,3.9,0,7.8-0.9,11.5
+		c-1.9,0.1-3.8,0-5.7,0c0.2-8-0.4-16.1,0.1-24.1c1.7-6.4,0.9-12.9,1-19.4c-0.2-6.9,0.2-13.8-0.7-20.6c-0.5-5-0.5-10.1,0.5-15
+		c1-4,1.6-8.2,1.9-12.3c0.5-2.9,1.6-5.6,2.6-8.3c2.9-2.2,5.8-4.5,9.3-5.6c5.5-1.8,11.4-1.5,17.2-1.6
+		C873.2,486.9,873.2,484.2,873.2,481.5z"/>
+	<path class="st1" d="M935.6,485.6c0.2-1.9,2-4.7,4.2-3.5c0.5,2.6,0.4,5.3,0.4,7.9c4.4,0.7,8.9,0.3,13.4,0.2
+		c5.6,0.4,11.1,3.4,13.8,8.4c4.1,7,4.1,15.3,4.3,23.1c1,8.7,0.8,17.4,0.7,26.2c0,16.2-0.1,32.4,0.1,48.6c-0.8-0.1-2.5-0.2-3.3-0.3
+		c-1.4-0.7-3.4-1.4-3.2-3.2c-0.3-13,0-26,0.3-38.9c-1.3-13.2,1.8-27-3.8-39.5c-1.5-3.9-5.7-5.7-9.6-6.5c-4.4-0.9-8.8,0-13.2-0.7
+		c-2.9-0.6-4.5-3.5-4.4-6.3C935.3,495.9,935.1,490.7,935.6,485.6z"/>
+	<path class="st1" d="M41.8,486.8c2.9,1.3,4.7,4.5,4.5,7.6C43,494,42.3,489.4,41.8,486.8z"/>
+	<path class="st1" d="M561.6,496.6c8.8-2.2,17.4-5.7,26.4-7.2c5.4,0.1,10.8-0.1,16.2,0.5c14,1.6,27.5,7,38.8,15.3
+		c3.9,2.9,7.4,6.2,11.2,9.3c3.3,5.3,8.4,9.4,10.8,15.1c0.9,2.3,2,4.5,3.7,6.3c0.4,0.2,1.3,0.6,1.7,0.8c0.2,0.5,0.5,1.6,0.7,2.1
+		c1.1,3.8,2.8,7.4,5.1,10.6c0.8,4,1.7,8,4,11.5c1.2,9.3,4.7,18.3,4.4,27.8c0.2-0.6,0.5-1.2,0.7-1.8c0,3.3-0.1,6.7,0.4,10
+		c1.4,6.9,1,14,0.2,21c-0.6,8.2,0,16.5-1.6,24.7c-3.3,11.2-5.7,22.8-10.5,33.5c-0.8,1-1.6,2-2.5,3c2.1-8.8,5.4-17.2,6.5-26.2
+		c0.6-5.6,2-11.2,2.1-16.8c0.1-12,1.3-24.1-1-36c-2.6-21.3-9.2-42.6-22-60c-15.7-22.8-44.6-36.4-72.1-31.6
+		c-22.6,3.7-42.3,19.1-53.3,38.9c1.1,1.2,2.2,2.5,3.3,3.8c-1.6-0.3-3.3-0.6-4.9-0.9c-8.1,13.6-12.5,29.1-15.1,44.7
+		c-1.7,12.4-3.3,25-1.3,37.5c0.8,4.2-0.4,9.1,2.9,12.5c-1.2,4.2,0.6,8.5,1.2,12.7c1.8,5.6,2.2,12.1,6.4,16.6
+		c-0.6,0.7-1.2,1.4-1.8,2.2c-4,1.4-2-4.1-3.2-6.3c-2.6-5.8-5-11.7-5.8-18c-0.6-4.7-2.1-9.3-2.8-14c-1.1-6.5-1.7-13-2.8-19.4
+		c-0.2-1.4-0.2-2.8-0.3-4.2c-1.5-0.1-2.9-0.2-4.3-0.3c1.5-0.4,3-0.6,4.5-0.7c-1.6-8.2-0.5-16.7-1-25l0.9-0.1
+		c0.9-2.5,1.3-5.1,1.3-7.8c1-4.6,2.3-9.2,3-13.8c1.5-4.6,3-9.2,4.1-13.9c0.7-2.9,2.1-5.5,3.6-8c1.6-4.5,4.3-8.6,6.5-12.8
+		c4.3-5.5,7.3-12,12.6-16.6c4-3.6,7.2-8.3,12-10.8c3.9-2,6.9-5.4,10.8-7.5L561.6,496.6z"/>
+	<path class="st1" d="M32.2,507.3c1.8,0.2,1.5,3.4-0.2,3.5C30.1,510.6,30.5,507.5,32.2,507.3z"/>
+	<path class="st1" d="M202.3,513.3c0.8-1.5,3.5,0,2.4,1.4C204,517.2,199.8,514.9,202.3,513.3z"/>
+	<path class="st1" d="M208.3,521.2c1.9-0.7,2.8,2.6,0.7,2.9C207.2,524.6,206.4,521.6,208.3,521.2z"/>
+	<path class="st1" d="M407.9,525.3c1.2-0.4,2.3-0.9,3.5-1.3c0.1,1.7-0.2,3.5-0.5,5.2C409.6,528.1,408.5,526.9,407.9,525.3z"/>
+	<path class="st1" d="M424.1,525.2c1.6-0.5,2.2,0,1.7,1.7C424.2,527.4,423.6,526.8,424.1,525.2z"/>
+	<path class="st1" d="M1206.8,527.8c1.3,2.2,2,4.6,2.5,7.1c4.6,23.2,12.4,45.6,19.2,68.2c1.7,6.2,4.7,12,5.8,18.3
+		c-3.4,0-6.8-0.1-10.2-0.1c-3.8-11.1-6.9-22.5-10.5-33.7c-2.6-8.1-4.2-16.6-7.4-24.5c-3.9,9.7-6.8,19.8-10.7,29.5
+		c-3.6,9.1-6.5,18.5-10.8,27.2c-3.7,1.2-7.6,1-11.3,0.1c8.9-22.3,17.9-44.5,25.5-67.3C1201.6,544.3,1203.6,535.8,1206.8,527.8z"/>
+	<path class="st1" d="M465.2,529.3c1.5-1.1,2.9,1.5,1.6,2.5C465.3,532.9,463.9,530.2,465.2,529.3z"/>
+	<path class="st1" d="M1486.3,555.9c3.1-9.3,6.2-18.7,8.7-28.2c0.8,1,2.1,1.9,2.2,3.4c1.4,7.6,2.8,15.3,5.1,22.7
+		c1.5,4.7,2.1,9.7,4.9,13.9c0.4,7.8,4.2,14.8,5.9,22.4c3.1,9.8,5.7,19.7,9.7,29.1c-3.3,1.1-7.1,2.1-10.4,0.5
+		c-3.4-8.4-5.4-17.3-8.2-25.8c-3.5-10.3-5.7-20.9-9.5-31.1c-7,19.4-13.4,39-21.9,57.8c-3.5,0-7.1,0.1-10.6,0.1
+		c1.7-3.7,3.2-7.5,4.1-11.5c4.4-11.2,8.9-22.2,13-33.5c1.4-4.1,2.1-8.5,3.6-12.6C1484.4,560.9,1485.5,558.5,1486.3,555.9z"/>
+	<path class="st1" d="M158.2,542.3c0.5,0,1.6,0,2.2,0.1c1.2,3.4,2.2,6.9,4.3,9.8c0.7,4.2,2.3,8.1,4.2,11.9c0.9,0.4,1.8,0.8,2.6,1.3
+		c-0.2,2.7-0.7,5.8,1.5,7.9c0.7,2.4,1.4,4.8,2.4,7.2c12.4,28,25.7,55.5,38.5,83.3c2.4,6.6,5.4,13.1,8.9,19.2
+		c6.7,12.9,12.3,26.4,18.9,39.4c1.1,3,2.5,5.9,4.4,8.5c1.1,4,2.9,7.7,4.5,11.5c0.5,0.2,1.6,0.7,2.1,0.9c3.2-0.6,6.6-0.8,9.9-0.7
+		c6.5-13.3,12-27,18-40.5c6.4-15.1,13.7-29.7,20.6-44.5c18-38.4,36.9-76.5,50.7-116.7c1.9,2.4,0.7,5.5,0.5,8.3
+		c-1,5.9-0.2,11.9-0.8,17.9c-1.3,11.5-1.6,23.1-0.6,34.6c1.2,29.1-0.3,58.3,0.2,87.5c-0.3,11,1.2,23.7-6.4,32.8
+		c-0.4-1.1-0.5-2.3-0.5-3.4c1.2-8.8,1.4-17.7,1.3-26.5c0-29,0-58,0-87c0-5.7,0.2-11.4-0.2-17.1c-5.2,10.3-9,21.3-14.2,31.6
+		c-2.7,5.2-4.5,10.7-7.2,15.8c-4.3,8.2-7.5,16.9-11.8,25c-3.6,6.7-6.3,13.7-9.6,20.4c-10.9,21.7-20,44.1-29.8,66.3
+		c-2,4.4-3.5,9.4-7.2,12.8c-2.8,2.3-6.5,1.5-9.8,1.5c-2.7-0.1-5.7,0.5-8.1-1.2c-1.9-0.9-2.5-3-3.3-4.8c-2.5-6-5.8-11.6-8.3-17.6
+		c-3-7.6-7-14.8-10.6-22.2c-3-8.4-7.8-16-11.1-24.3c-14.3-30.3-28.7-60.6-42.5-91.2c-2.4-5.1-3.9-10.7-7-15.5
+		c-0.7,14.4-0.3,28.9-0.4,43.3c-0.1,4-1.3,8-1.4,12c-0.2,5.3,0,10.7-0.1,16c0,5.6-1,11.1-1,16.8c0.8,0.2,2.3,0.7,3.1,0.9
+		c-1,1.2-2,2.3-3,3.5c-0.1,11-0.1,22-0.1,33c-0.1,3.6,0.9,7.3,0,10.8c-4.9-5.8-5.6-13.5-5.9-20.8c-1.3-7.5,0.1-15.1,0.4-22.7
+		c0.6-5.9,0.9-11.9,0.2-17.9c-1-9.2,1-18.4,0.8-27.6c0.4-6.7-0.8-13.4,0.7-20c0.8-8,0.3-16,0.6-24
+		C160.2,572.8,158.8,557.5,158.2,542.3z"/>
+	<path class="st1" d="M255.2,546.2c1.8-1.3,4.2,0,5.1,1.7C259.9,551.5,253.1,549.5,255.2,546.2z"/>
+	<path class="st1" d="M639.2,551c1-0.8,3.5,0.1,2.5,1.6C640.5,554.5,636.6,552.4,639.2,551z"/>
+	<path class="st1" d="M618.2,552.2c0.8-1.3,3.4-0.1,2.2,1.3C619.6,554.8,617,553.6,618.2,552.2z"/>
+	<path class="st1" d="M1661.5,552.6c1.4-0.1,2.9-0.1,4.4,0c-1.1,1.2-1.5,3.8-3.7,3.3C1662,555.1,1661.7,553.5,1661.5,552.6z"/>
+	<path class="st1" d="M418.3,553.1c1.3,0.1,2.9,0.1,2.9,1.9c0.3,1.8-1.7,2.6-3.1,1.8C418.1,555.6,418.2,554.4,418.3,553.1z"/>
+	<path class="st1" d="M542.9,552.7c1.1,0.6,2.5,1,3.2,2.2c0.5,1.2-1.8,2.6-2.3,1.1C543.5,555,543.1,553.8,542.9,552.7z"/>
+	<path class="st1" d="M550.3,553.9c2-0.7,2.6,2.6,0.7,3C549.2,557.4,548.5,554.4,550.3,553.9z"/>
+	<path class="st1" d="M630.3,557.3c2.1,0.3,0.9,4.5-1,3.4C628.3,559.7,628.9,557.6,630.3,557.3z"/>
+	<path class="st1" d="M446.3,607.9c2.3-17.1,5.2-34.7,13.5-50.1c0,0.7-0.1,2-0.1,2.7c0,0.3-0.1,0.9-0.1,1.2
+		c-1.2,4.5-3.3,8.7-3.7,13.3c-0.2,2.1-0.8,4.1-1.4,6.1c0.6,0.3,1.8,0.8,2.4,1.1c0.2,0.8,0.5,1.5,0.8,2.3c-1.1-0.4-2.2-0.9-3.2-1.3
+		c-0.3,1.2-0.5,2.3-0.8,3.5l-0.2,0.8c-1.7,4.7-2.3,9.8-1.2,14.8c-0.2,5.8,0.2,11.6-0.2,17.5c-0.4,2.5,0,5.1,0.7,7.5
+		c0.6,2.9,0.9,5.9,1,8.8c0.2,0.1,0.7,0.4,0.9,0.5c0.2,5.6,1.4,11.2,3.4,16.5c0.6,4.5,2.9,8.6,3.9,13.1c0.9,4.6,3.1,8.8,5.7,12.6
+		c1.5,2.4,3,4.7,4.5,7c2.2,3.3,3.7,7.2,7.1,9.4c0.1-0.9,0.2-2.8,0.3-3.7c1.4-0.1,2.8-0.2,4.2-0.3c-0.1,0.5-0.2,1.4-0.2,1.9
+		c-1.2,0.6-4,0.7-3,2.8c0.9,3.3,3.1,5.9,5.5,8.2c0.3,0.6,1,1.9,1.3,2.6c1.3,1.5,2.9,2.8,4.5,4.1c2,1.5,4,3,5.7,4.7
+		c7.5,7.5,17.1,12.3,25.9,18c1.5,1,3.1,1.9,4.8,2.7c16.5,6.9,33.8,12.8,51.9,13.5c13.9-0.8,28.5,1.8,41.9-2.9
+		c12.8-1.4,24.9-5.8,37.1-9.6c3.3-0.5,6.3-1.9,8.9-3.8c3.5-2.4,7.2-4.3,10.8-6.5c6-3.5,10.9-8.6,16.5-12.6c7.9-7,15.6-14.5,21-23.8
+		c7-10.2,12.9-21.4,15.6-33.5c1.5-3.5,2.5-7.2,2.9-10.9c1.1-2.5,1.7-5.2,2-8c2-4.8,1.7-10,1.9-15c0.2-0.5,0.6-1.5,0.8-2
+		c1.4-3,1-6.3,0.9-9.5c-0.2-4.3,0-8.6,0-12.9c0.8-3.5,1.3-7.2-1-10.3c-0.8-7.1-2.3-14-4.1-20.9c0.2-0.9,0.5-2.8,0.6-3.7
+		c6.3,11.8,7.7,25.4,9.9,38.4c0.5,9.3,0,18.7,0.2,28c-1.5,23.5-7.2,47.2-19.4,67.7c-8.6,15.4-20.8,28.6-34.6,39.5
+		c-21.2,15.9-46.8,25.6-73.1,28.9c-2.7,0.6-5.2,1.8-8,1.6c-11,0-22,0-33,0c-3-0.1-6.2,0.3-9.1-0.6c-7.8-2.5-16-3.4-23.8-6.1
+		c-26.3-8.7-50.8-24.1-68.1-45.9c-2.2-2.6-3.9-5.4-6.2-7.9c-0.9-1.2-2.6-0.7-3.8-0.9c0.3-1.1,0.6-2.3,1-3.4
+		c-2.9-4.7-5.6-9.5-8.1-14.5c-0.6-0.2-1.9-0.6-2.5-0.8c2-4-1.3-7.7-2.4-11.5c-3.8-10.5-6.2-21.5-7.3-32.6c-0.3-2.1-1-4.1-1.6-6.1
+		c-0.9,0.1-2.2,2.2-2.8,0.5c-1.1-2.2-3.7-4.2-3.2-6.9c2.4-0.2,3.8,3.1,6,4.1C446.7,626.1,446.2,617,446.3,607.9z"/>
+	<path class="st1" d="M533.7,561.1c1.3,0.1,2.7,0.2,2.5,1.9c-0.8,1.8-2.3,3-3.8,4.2c-0.2-0.3-0.6-1-0.8-1.3
+		C532.3,564.2,533,562.7,533.7,561.1z"/>
+	<path class="st1" d="M54.2,565c3.8-0.6-0.1,4.6-1,1.2C53.5,565.9,54,565.3,54.2,565z"/>
+	<path class="st1" d="M442.1,566c0.9-0.1,2.6-0.2,3.4-0.2c-0.6,1.6-1.5,3-3.3,3.5C442.2,568.5,442.1,566.8,442.1,566z"/>
+	<path class="st1" d="M522.7,569.9c0.6-0.8,1.4-1.6,2.2-2.2c0.4,1.4,0.7,2.9,1.1,4.3C524.7,571.7,522.4,572,522.7,569.9z"/>
+	<path class="st1" d="M1620.1,570.1c3.9-0.6,0,4.5-1,1.2C1619.3,571,1619.9,570.4,1620.1,570.1z"/>
+	<path class="st1" d="M99.3,576.1c1-1.5,3.5,0.2,2.4,1.6C100.6,579.2,98.1,577.6,99.3,576.1z"/>
+	<path class="st1" d="M1329.1,586.1c1.6,0.3,3.9,0.6,3,2.9C1330.1,590.1,1328,588.1,1329.1,586.1z"/>
+	<path class="st1" d="M99.2,590.8c-0.4-2.4,1.9-3.7,3.9-4C103.2,589.3,102,591.6,99.2,590.8z"/>
+	<path class="st1" d="M619.2,587.1c1.6-0.5,2.2,0,1.6,1.7C619.2,589.3,618.7,588.8,619.2,587.1z"/>
+	<path class="st1" d="M1616.3,588.1c1.3,0.3,2.6,0.7,3.9,1.2c-1.2,1-2.8,1.5-4.3,1.8C1616.1,590.4,1616.2,588.8,1616.3,588.1z"/>
+	<path class="st1" d="M444.2,591.4c1.3-1.4,3.6,0.8,2.1,2.1C445,595,442.6,592.7,444.2,591.4z"/>
+	<path class="st1" d="M1111.2,591.2c1.6-0.5,2.2,0,1.6,1.7C1111.2,593.3,1110.6,592.8,1111.2,591.2z"/>
+	<path class="st1" d="M118.2,593.3c1.5-1.2,2.9,1.5,1.5,2.5C118.2,597,116.8,594.3,118.2,593.3z"/>
+	<path class="st1" d="M1313.7,602.7c1.9-1.6,5.3-0.2,6.2,2c-1.5,2.4-4.5,1.2-6.6,0.8C1313.3,604.6,1313.4,603.7,1313.7,602.7z"/>
+	<path class="st1" d="M775.1,606c2.8-1,1.6,3,1.8,4.4C775.2,609.8,773.2,607.6,775.1,606z"/>
+	<path class="st1" d="M1676.7,611.2c0-1.8,0.6-5,3.2-4C1680.8,609.6,1678.3,610.5,1676.7,611.2z"/>
+	<path class="st1" d="M644.3,608.2c1.5-1.1,2.9,1.5,1.6,2.5C644.4,611.8,643,609.2,644.3,608.2z"/>
+	<path class="st1" d="M69.2,610.2c1.8-1.1,2.2,4.3,0,3.4C67.5,613.3,67.6,610.6,69.2,610.2z"/>
+	<path class="st1" d="M1680.8,610.4c2.4-0.8,4.8-0.8,7.3-0.3c-0.4,1-0.7,2-1,3C1685,612.2,1682.9,611.3,1680.8,610.4z"/>
+	<path class="st1" d="M56.2,615.8c-0.2-1.6-1.5-4.2,0.8-4.8c1,0.5,2,1.1,2.9,1.7C59.2,614.4,58.5,617,56.2,615.8z"/>
+	<path class="st1" d="M562.8,615.6c1.3,1.5,5.4,4.2,2.1,5.8C562.7,620.3,562.6,617.8,562.8,615.6z"/>
+	<path class="st1" d="M841.5,624.7c0-2.7,0-5.4,0-8.1c12.1,0.3,24.3,0.1,36.5,0.1c31.6-0.2,63.1,0.3,94.7-0.3
+		c-0.5,13.3,0.2,26.6-0.5,39.8c-0.2,1.6-0.2,3.2,0,4.8c0.9,5.6,0,11.3,0.3,16.9c0.4,13.2-0.7,26.5-3,39.5c-0.4,0.5-1.3,1.5-1.8,2
+		c-0.6,0.1-1.9,0.4-2.6,0.5c1.3-5.6,0.9-11.3,0.9-17c0-17.3,0-34.6,0-52c-0.1-5.4,0.3-10.7,0.8-16.1c-12.9-0.7-25.9-0.1-38.8-0.3
+		c-22,0-44,0-66,0c-4.9,0.3-10-0.6-14.8,0.4c0.3,7.3,1.1,14.6,0.8,21.9c-0.1,19-0.2,38,0.1,57c0,2.5,1.4,5.2,0,7.5
+		c-2.4-3.4-3.9-7.4-4.7-11.5c-2.4-13.9-1.7-28-1.8-42c0.1-14.2,0-28.5,0-42.7c-0.7-0.1-2-0.3-2.7-0.4
+		C839.5,624.9,840.8,624.8,841.5,624.7z"/>
+	<path class="st1" d="M1678.2,617.2c0.7-0.1,2-0.2,2.7-0.2c-0.4,2.1-0.8,4.2-1.3,6.3C1678.2,621.6,1677.7,619.4,1678.2,617.2z"/>
+	<path class="st1" d="M38.1,620.3c1.5-1.2,2.9,1.6,1.6,2.5C38.1,624,36.8,621.2,38.1,620.3z"/>
+	<path class="st1" d="M753.2,620.4c0.9-1.2,3.3,0.2,2.3,1.5C754.5,623.1,752.1,621.8,753.2,620.4z"/>
+	<path class="st1" d="M546.3,624.5c1.3-0.9,3.9,0.6,3.4,2.3C548.3,627.5,545.5,626,546.3,624.5z"/>
+	<path class="st1" d="M1637.3,629.3c1.4-1.2,2.5,1.4,1.3,2.2C1637.1,632.7,1635.9,630.1,1637.3,629.3z"/>
+	<path class="st1" d="M86.3,631.2c2-2,2.9,0.9,2.5,2.6C87.1,634.8,84.1,632.6,86.3,631.2z"/>
+	<path class="st1" d="M50.2,632.4c1.5-1.2,3,1.5,1.6,2.5C50.3,636,48.8,633.4,50.2,632.4z"/>
+	<path class="st1" d="M105,637c-1.9-1.5-1.4-4.1,0.9-4.9c0.6,1.2,0.9,2.5,1.2,3.8C106.6,636.1,105.5,636.7,105,637z"/>
+	<path class="st1" d="M32.3,634.1c2,0.9,3.9,2.2,4.7,4.4c-2.4,1.2-4.7,2.4-7.1,3.5C30.4,639.3,31.2,636.6,32.3,634.1z"/>
+	<path class="st1" d="M63.5,643.2c-0.2-3.3-3.8-7.3-0.5-10C64.8,635.9,68.4,641.5,63.5,643.2z"/>
+	<path class="st1" d="M599.5,636.5c1-0.9,3.9-1.5,3.9,0.6c-3.1,2.9-9,5.7-11.7,0.9C594.2,637.7,597.2,638.1,599.5,636.5z"/>
+	<path class="st1" d="M540.1,641.2c0.9-1.9,1.3-4.8,4-4.8C546,638.7,541.5,639.9,540.1,641.2z"/>
+	<path class="st1" d="M86.2,638.3c2-0.5,1.2,4,0.7,5.4C83.3,645.2,84,639.2,86.2,638.3z"/>
+	<path class="st1" d="M618.2,638c3.9-0.7,0,4.5-1.1,1.2C617.4,638.9,617.9,638.3,618.2,638z"/>
+	<path class="st1" d="M1321.2,641c2-1.9,2.5,1.6,2,3c-0.6,1.6-3.3,2-3.6,0C1319.5,642.7,1320,641.7,1321.2,641z"/>
+	<path class="st1" d="M1520.8,642.6c2.5,0,5.1-0.2,7.7-0.2c0.6,0,1.7,0.2,2.3,0.2c1.4,4.5,1.8,9.2,3.4,13.6c3.2,9.2,5.7,18.6,9,27.8
+		c1.4,5.3,2.5,10.7,3.8,16c1.4,7.4,3.2,15.8-1.3,22.6c-0.7,0.1-2,0.2-2.7,0.2c-1.3-4-1.7-8.1-2.5-12.2c-4.2-16.8-9.8-33.1-14.8-49.6
+		c-9.5-0.9-19.1-0.2-28.7-0.4c-12.3,0.1-24.6-0.2-36.9,0.1c-1.6-0.2-2.2,1.3-2.6,2.5c-6.1,16-12.3,32-18,48.1
+		c-1.5,4-1.8,8.4-3.4,12.3c-3-2.3-4.9-5.9-4.8-9.7c-0.8-8.6,2.3-16.8,5.2-24.8c3.4-8.5,6.3-17.3,9.9-25.7c2-3,3.3-6.4,4-10
+		c1-3.6,1.2-7.7,3.7-10.7c3.6-0.7,7.3-0.3,11,0c4.3,0.6,8.7,0.8,13,0.6c6.3-0.2,12.7,0.5,19-0.6
+		C1504.9,642.2,1512.8,642.7,1520.8,642.6z"/>
+	<path class="st1" d="M1165.7,642.5c25.2-0.1,50.4,0.1,75.6,0c6,20.8,14.1,41,17.9,62.3c0.8,6.2,1.6,13.5-3.1,18.4
+		c-2,0.1-2.6-1.6-2.8-3.2c-0.9-11.7-5.5-22.7-8.5-33.9c-2.6-7.3-4.6-14.7-6.9-22c-0.6-1.3-1.1-3.6-2.9-3.3
+		c-15.7-0.1-31.3-0.1-47-0.1c-6,0.2-12-0.4-17.9,0.3c-3,4.8-4.4,10.5-6.5,15.7c-4.8,14.5-11.8,28.2-15,43.1
+		c-0.5,1.3-0.6,3.3-2.4,3.3c-0.7-0.9-1.3-1.9-1.9-2.8c-1-4.9-1.4-9.9-1.4-14.9c0.5-1.5,0.9-3,1.3-4.5c1.3-10,6.8-18.6,9.9-28.1
+		C1158.1,662.8,1161,652.3,1165.7,642.5z"/>
+	<path class="st1" d="M1653.1,646.7c-1.4-2.6,2.5-2.1,4-2.8C1657.5,646.4,1655,646.5,1653.1,646.7z"/>
+	<path class="st1" d="M628.3,645.2c0.9-1.4,3.8-0.1,2.5,1.4C629.9,648,627.1,646.8,628.3,645.2z"/>
+	<path class="st1" d="M1663.5,647.3c0.6-1,3.1-0.9,2.9,0.5C1665.8,648.7,1663.3,648.7,1663.5,647.3z"/>
+	<path class="st1" d="M60.9,656c0.1-3.9,4.4-5.7,6.4-8.7c1.9,3.9-1.8,7.5-2,11.4C63.7,658.2,61.5,658,60.9,656z"/>
+	<path class="st1" d="M532.9,647.7c2.1,0.8,4,2.1,4.5,4.4c-1.3-0.2-2.5-0.4-3.8-0.7C533.1,650.2,532.8,649,532.9,647.7z"/>
+	<path class="st1" d="M574,653.9c0.3-1.6-0.7-4.6,1.9-3.8c0.8,1.1,0.9,2.6,1.2,3.9C576.4,654,574.8,653.9,574,653.9z"/>
+	<path class="st1" d="M524.7,655.4c0.6-1.7,1.2-3.4,2.2-4.9C530.1,651.2,527.4,656,524.7,655.4z"/>
+	<path class="st1" d="M32.3,656.2c0.6-1.2,2.2-1.6,2.9-0.2c0,2.6-1.4,5-2.5,7.3C30.5,661.4,31.4,658.4,32.3,656.2z"/>
+	<path class="st1" d="M56.5,659.3c1.3-1.6,3.8,0.7,2.1,2.1C57.3,662.8,55,660.6,56.5,659.3z"/>
+	<path class="st1" d="M560.8,663.3c-0.5-1.6-3.1-4.8,0.2-4.6C562.2,660.2,561.7,661.9,560.8,663.3z"/>
+	<path class="st1" d="M585.1,659.2c0.8,0,2.5-0.2,3.4-0.2c-1,2.4-2.6,4.8-5.6,4.3C583.6,661.9,583.6,660,585.1,659.2z"/>
+	<path class="st1" d="M601.3,659.4c0.8-0.9,3.2-1.1,3.5,0.4C604.5,661.8,600,661.6,601.3,659.4z"/>
+	<path class="st1" d="M527.2,663.8c-1.3-0.8-0.7-2.3-0.7-3.5c1.5,0.6,3.1,1.3,4.6,2C530.1,663.3,528.8,664.7,527.2,663.8z"/>
+	<path class="st1" d="M650.5,661.3c2.7-1,1.2,4.6-0.8,3.2C648.9,663.4,649.5,661.9,650.5,661.3z"/>
+	<path class="st1" d="M1692.8,664.9c1.3-2.2,3.7-3.2,5.8-4.3C1699.4,664.1,1695.3,665,1692.8,664.9z"/>
+	<path class="st1" d="M62.4,665.2c0.3-1.6,1.8-4.2,3.5-2.1C66.6,665.4,64.1,666.1,62.4,665.2z"/>
+	<path class="st1" d="M606.7,662.3c3.6-0.7,1.2,4.4-0.7,5c-2,1.4-1.2-1.4-0.8-2.1C605.5,664.2,606,663.2,606.7,662.3z"/>
+	<path class="st1" d="M1662.8,667.1c-1.5-3.3,2.8-4.4,4.5-1.9C1666.1,666.5,1664.8,667.9,1662.8,667.1z"/>
+	<path class="st1" d="M1605.2,665.3c0.9-1.3,3.8,0,2.5,1.5C1606.8,668.1,1604,666.8,1605.2,665.3z"/>
+	<path class="st1" d="M1675,665.3c2.8,0,6.2-0.9,8.3,1.5C1680.4,667.6,1677.6,666.6,1675,665.3z"/>
+	<path class="st1" d="M1630.1,665.8c2.5-0.7,4.8,1.5,6.4,3.2c-2.2,0.1-4.5,0.1-6.7,0.1C1629.8,668.3,1630,666.7,1630.1,665.8z"/>
+	<path class="st1" d="M641.2,666.8c1.7,1.9,3.4,4.4,2.7,7C640.3,673.5,640.8,669.3,641.2,666.8z"/>
+	<path class="st1" d="M551,667.7c3.6-0.6,4.1,3.2,4.3,5.9C552.8,672.7,552.1,669.9,551,667.7z"/>
+	<path class="st1" d="M165.4,672.3c0.6-1.5,1.3-3.5,3.4-3.2c0.1,0.7,0.3,2.2,0.4,2.9C168.2,672.1,166.4,672.2,165.4,672.3z"/>
+	<path class="st1" d="M440.1,677.3c-0.6-1.8-0.4-6.4,2.5-4.9C442.7,674.4,442.2,676.5,440.1,677.3z"/>
+	<path class="st1" d="M1345.4,672.4c0.7-1.2,4.2-0.1,2.6,1.4C1346.7,675.9,1343.2,674.3,1345.4,672.4z"/>
+	<path class="st1" d="M58.3,673.1c1.9-0.7,2.7,2.6,0.7,3C57.2,676.6,56.5,673.5,58.3,673.1z"/>
+	<path class="st1" d="M598.1,674.2c1.6-0.5,2.2,0,1.7,1.7C598.2,676.3,597.6,675.8,598.1,674.2z"/>
+	<path class="st1" d="M632.7,675.2c1.8-0.8,3.6-1.6,5.6-1C636.8,675.6,634.3,677.4,632.7,675.2z"/>
+	<path class="st1" d="M549,678.1c0.8-1.3,1.5-2.7,3-3.2c-0.6,3-1.7,6.3-4.8,7.6c-0.3-0.5-0.8-1.6-1.1-2.2
+		C547.1,679.5,548.1,678.8,549,678.1z"/>
+	<path class="st1" d="M1101.2,675.3c1,0.1,2.1,0.4,3.1,0.8c-1,0.7-1.8,2.5-3.3,1.9C1099.3,678.3,1100.2,675.4,1101.2,675.3z"/>
+	<path class="st1" d="M1639.3,675.3c0.8-1.4,3.3-0.1,2.1,1.3C1640.6,677.9,1638.1,676.7,1639.3,675.3z"/>
+	<path class="st1" d="M1678.7,677.3c1.9-0.8,5.8-1.5,5.4,1.8C1682.2,678.8,1680.3,678.4,1678.7,677.3z"/>
+	<path class="st1" d="M560.3,681.1c0.7-1.5,1.5-3.3,3.4-3.1c0.2,0.8,0.5,2.3,0.7,3C563.4,681.1,561.3,681.1,560.3,681.1z"/>
+	<path class="st1" d="M49.3,683.4c0.9-1,3.1-0.7,3.4,0.7C52.5,686.2,48.1,685.5,49.3,683.4z"/>
+	<path class="st1" d="M1353.3,684.2c1.4-1.2,2.6,1.4,1.2,2.2C1353.1,687.7,1351.9,685,1353.3,684.2z"/>
+	<path class="st1" d="M555.4,684.7c1,1.3,2.3,2.6,2,4.4c-0.8,1.2-2.3,1.4-3.5,2C554.3,688.9,554.8,686.8,555.4,684.7z"/>
+	<path class="st1" d="M177.8,688c0.6-1.4,1.4-2.8,3.3-2.4c0.3,0.6,1,1.8,1.3,2.4C180.8,688,179.3,688,177.8,688z"/>
+	<path class="st1" d="M569.3,687.3c1.4-1.6,3.7,0.7,2,2C569.9,690.9,567.6,688.6,569.3,687.3z"/>
+	<path class="st1" d="M537.1,688c1.4,0,2.8,0.1,4.3,0.1c-1.1,2-3.2,2.4-5.3,2.1C536.3,689.6,536.8,688.5,537.1,688z"/>
+	<path class="st1" d="M55,690.1c0.7,0,2.2,0,3,0c-0.2,2.4-0.1,5.2-1.9,7.1C53.4,696.4,55.1,692.3,55,690.1z"/>
+	<path class="st1" d="M561.3,690.2c1.3-1,2.7,1.4,1.5,2.3C561.5,693.5,560.1,691.1,561.3,690.2z"/>
+	<path class="st1" d="M549.6,694.9c1.1-1.6,3.2-0.9,4.8-1.1C554.3,696.2,550.2,697.5,549.6,694.9z"/>
+	<path class="st1" d="M107.6,697.9c2.1-3.1,6.5-1.9,9.4-0.9c0.6,1.3,0.7,2.7,1,4.1C114.6,700,111.1,699,107.6,697.9z"/>
+	<path class="st1" d="M1674.8,699.8c0.7-1,1.4-2.1,2.1-3.1c0.4,3.2,0.9,6.5,1.5,9.7c-0.8,0.8-1.7,1.5-2.1,2.6
+		c-0.3,2.3,3.7,4.1,1.7,6.3c-2.2-1.8-3.7-4.4-4.6-7.1C1676.8,706.5,1675.8,702.8,1674.8,699.8z"/>
+	<path class="st1" d="M89.8,705.3c1.9-1.8,3.7-3.7,5.3-5.9c1.1,1.1,2.1,2.2,3.2,3.4c-1.5,1.6-3,3.2-4.5,4.8
+		C92.5,706.8,91.2,706.1,89.8,705.3z"/>
+	<path class="st1" d="M71.6,705c1.8-1.1,6.4-1.3,5.2,2C74.7,708.2,72.7,706.9,71.6,705z"/>
+	<path class="st1" d="M1192.4,704.3c1.2-3.1,5,2.8,1.4,2.7C1192,707.7,1191.7,705.4,1192.4,704.3z"/>
+	<path class="st1" d="M53.3,705.3c0.8-0.9,3.2-1.1,3.4,0.5C56.5,707.9,52,707.5,53.3,705.3z"/>
+	<path class="st1" d="M1343.8,711.5c0.5-2.5,0.2-6.6,3.6-6.9C1347.4,707.4,1346.3,710.1,1343.8,711.5z"/>
+	<path class="st1" d="M455.9,706.6c1.3,1.4,3.2,3.4,2.1,5.5C454.6,713.2,455.9,708.4,455.9,706.6z"/>
+	<path class="st1" d="M1680.4,707.4c2-1.1,3,3.2,0.9,3.4C1679.8,710.5,1679.4,708.4,1680.4,707.4z"/>
+	<path class="st1" d="M218.9,712.9c-3-0.7-1-4.2,0.2-5.6C220.1,709,220.7,711.4,218.9,712.9z"/>
+	<path class="st1" d="M98.2,709.2c1.2-1.5,4.4-0.1,2.9,1.8C100.9,713.2,96.7,710.7,98.2,709.2z"/>
+	<path class="st1" d="M1334.8,713.9c-2.9-0.7-0.9-4.5,1.2-5C1335.9,710.5,1336.4,712.7,1334.8,713.9z"/>
+	<path class="st1" d="M1189.2,711.6c1.7-0.2,2.9,3.5,1.1,4C1188.8,715,1188.2,712.8,1189.2,711.6z"/>
+	<path class="st1" d="M1329.2,712.3c1.8,0.2,1.5,3.4-0.2,3.5C1327.2,715.6,1327.5,712.5,1329.2,712.3z"/>
+	<path class="st1" d="M1629.2,715.8c-0.3-1.4,1.4-2.7,2.7-1.9c0.5,1.1,0.9,2.2,1.3,3.3C1631.9,716.9,1630.3,716.8,1629.2,715.8z"/>
+	<path class="st1" d="M71.6,717.1c0.7-1.4,2.1-1.9,3.4-2.5c0,0.9,0.1,2.8,0.1,3.7C73.9,718.1,72.7,717.7,71.6,717.1z"/>
+	<path class="st1" d="M1652.2,717.1c2.4,0.5,5.2,0.6,7.2,2.2c-1.9,0.2-3.8,0.6-5.6,1.2C1653.3,719.4,1652.7,718.2,1652.2,717.1z"/>
+	<path class="st1" d="M60.9,721.1c1.8-0.8,6.5-1.5,5.8,1.7C64.6,724,61.1,724.3,60.9,721.1z"/>
+	<path class="st1" d="M1375.3,720.3c1.4-1.2,3.5,1.1,2.4,2.4C1376.2,724,1374,721.7,1375.3,720.3z"/>
+	<path class="st1" d="M459.2,721.2c1.6-0.6,2.2,0,1.7,1.6C459.2,723.3,458.7,722.8,459.2,721.2z"/>
+	<path class="st1" d="M1678.3,721.3c1.5-1.2,2.9,1.5,1.5,2.4C1678.2,724.9,1676.8,722.2,1678.3,721.3z"/>
+	<path class="st1" d="M86.1,722.1c3.1-0.7,4.7,4.5,1.7,5.8C84.4,729.9,84.3,723.7,86.1,722.1z"/>
+	<path class="st1" d="M208.1,726.7c1.9,0.2,5.8-0.9,5.2,2.3c-1.6,2.2-3.4,4.3-5.4,6.3c-0.4-0.1-1.3-0.2-1.7-0.3
+		C206.9,732.2,207.7,729.5,208.1,726.7z"/>
+	<path class="st1" d="M219.1,727.4c1-0.5,2.3,0.9,2.5,1.8c0.6,1.5-1.6,1.6-2.5,1.7C218,730.1,217.7,727.8,219.1,727.4z"/>
+	<path class="st1" d="M940.5,728.1l0,0.5c0.2,4.6,0.8,9.3,0.9,13.9c3.5,0,7-0.2,10.5-0.7c5.3-0.7,10.6,0,16-0.2
+		c8-0.4,16.1,0.1,24.1-0.7c4.7,0.1,9.3,0.8,14,0.1c5.3,0.8,10.7-0.6,16,0.4c10.1,1.3,20.2,0.8,30.3,1.7l1.2,0.1
+		c0-3.1,0.1-6.2,0.4-9.2c2.2,0.9,5.1,2.1,4.9,5c0.2,6,0.3,12-0.1,18c0,2.8-3.1,4.1-5.5,4.4c-2.6,0.1-5.1-0.7-7.6-1.1
+		c-0.4,1.8,0,4.7-2.8,4c0.1-1.4,0.3-2.8,0.5-4.2c-7.1-0.3-14.3,0.4-21.4-0.5c-10.6-1.6-21.3-0.7-32-0.9c-9.7-0.2-19.4,1.7-29.1,1.4
+		c-7-0.2-14,0.2-21-0.1c-3.2,0.1-4.7-3.2-4.6-5.9c0-5.1-0.3-10.3,0.2-15.4c0.1-2.5,2.5-3.7,4.3-4.9
+		C940.1,731.8,940.3,730,940.5,728.1z"/>
+	<path class="st1" d="M32.2,729.2c2.3-1,5.1-0.9,7.2,0.4c1.2,1.6-1.2,2.4-2.4,2.5c-2.1,0.1-5.3,1.5-6.4-1.1
+		C31,730.6,31.8,729.7,32.2,729.2z"/>
+	<path class="st1" d="M1687.4,730.3c2-1.2,2.9,3.2,0.7,3.3C1686.7,733.4,1686.4,731.2,1687.4,730.3z"/>
+	<path class="st1" d="M94.1,738c0.1-2.1,1.9-3.3,3.6-4.1c0.7,2.8-1,7,1.4,9c9.9,1.1,19.9,0,29.9-0.8c8.4-1,16.9,0.7,25.3-0.6
+		c4.6-0.2,9.2-0.1,13.8,0.4c5.8,0.8,11.7,0.3,17.6,0.7l1.1,0.1c0.1-2.9,0.2-5.8,0.3-8.7c1.8,1,4.4,1.7,4.7,4c0.6,5,0.1,10,0.3,15
+		c-0.2,2.2,0.2,4.8-1.4,6.6c-1.4,0.9-2.9,1.4-4.4,2.1c0.6,1.1,1.2,2.2,1.8,3.4c-2,0.1-3.9-0.3-5.4-1.8c0.7-0.7,1.3-1.3,2-2
+		c-5.8-1.6-11.8-1.2-17.7-1.2c-3.6,0-7.3-1-10.8,0.4c-2.3-1-4.6-1.9-7.1-1.8c-7,0.1-14.1-0.4-21,0.7c-11.1,1.7-22.3-0.1-33.4,1.2
+		C93.5,753.1,93.1,745.5,94.1,738z"/>
+	<path class="st1" d="M317,739c-0.1-2.5,2.3-3.8,4-5.1c0.2,2.9,0.2,5.8,1.3,8.5c0.1,0.2,0.2,0.7,0.3,1c6.7-1.2,13.6-0.5,20.4-1.4
+		c5.3-0.6,10.7-0.5,16-0.6c24.5-0.2,49.1-0.6,73.5,2c0.1-3.2,0.2-6.4,0.2-9.7c2.1,0.8,4.8,1.7,5.1,4.3c0.5,6.3,0.6,12.7,0,19
+		c-0.2,3.4-4,5.2-7,4.4c-4.8-1.3-9.8-1.5-14.8-1.3c-7.7,0.3-15.3-1.6-23-1.4c-15.4,0.2-30.8-0.8-46.1,1.6c-1.4,0.4-2.6,1.1-4,1.6
+		c-1.7-0.5-3.2-1.4-4.7-2.1c0.3,0.6,0.8,1.9,1.1,2.5c-1.2,0.7-2.1,3.2-3.8,2.1c-1.5-1.5,0.5-2.9,1.1-4.3c-4.1-0.2-8.3,0-11.9,2.3
+		c-5.3-0.4-8.4-5-11.6-8.6c-1-0.9-0.9-2.2-0.6-3.4c0.8,1,1.5,2,2.2,3c0.5,0.1,1.4,0.4,1.9,0.5C317.1,748.9,316.6,743.9,317,739z"/>
+	<path class="st1" d="M756.1,737.1c0.5-1.8,2.5-2.2,3.9-3.2c0.2,2.9,0.4,5.9,0.5,8.8l0.8,0.5c0.3,0.2,0.9,0.5,1.1,0.6
+		c9.5-0.8,19.2,0,28.7-1.5c5-0.7,10-0.3,15-0.1c9.8,0.1,19.6,0.2,29.3-0.7c1.4,0,2.8,0.1,4.2,0.1c4.9,2.1,10.3,1.1,15.5,1.6
+		c6.1,0,12.2,0.5,18.3,1.2c0.6-3.4,0.8-6.9,0.8-10.4c1.6,0.9,3.8,1.6,4.1,3.8c0.8,4.3,0.3,8.8,0.5,13.1c-0.2,3,0.4,6.5-1.8,8.9
+		c-2.1,2.1-5.3,1.7-7.9,1.1c-6.6-1.5-13.3-0.8-20-0.9c-7.7,0.3-15.3-1.6-23-1.4c-12.3,0.1-24.8-0.7-37,1c-8,1-16.1-0.6-24,1.4
+		c-2.8,0.7-6.2,0.4-8.4-1.8c-1.8-3.1-1.1-6.9-1.3-10.3C755.5,745,754.8,740.9,756.1,737.1z"/>
+	<path class="st1" d="M1069.8,737.9c0.1-2.1,2.3-2.9,3.8-3.9c0.4,3.2,0.9,6.3,1.3,9.5c5.7,0.4,11.3-0.5,17-0.5
+		c2.9,0,5.9-0.2,8.4-1.7c0.4-0.1,1.2-0.4,1.6-0.5c1.5-0.1,3.1-0.2,4.7-0.1c3.4,0.8,6.8,1.1,10.3,0.7c2.6-0.2,5.2-0.2,7.8,0
+		c3.5,0.3,7,0,10.4-0.5c1.5,0,2.9,0.1,4.4,0.2c4.8,0.2,9.5,1.7,14.4,2.1c3.5,0.3,7,0,10.5-0.3c2-0.2,4-0.2,6.1-0.2l1.2,0
+		c0.1-2.9,0.1-5.8,0.3-8.7c4,1.1,4.9,5.4,4.8,9c-0.1,4.6-0.1,9.2-0.4,13.7c-0.3,3.1-3.7,5.4-6.7,4.8c-5.6-1.2-11.9-2.6-17.4,0.1
+		c-5.1-2.5-10.9-2.3-16.5-2.7c-10.3,0-20.7-0.3-31,0.1c-6,0.7-12,1.6-18,1.2c-4.6-0.5-9.3,2.9-13.7,0.7c-2.8-1.5-3.6-4.8-4-7.7
+		C1068.2,748,1069.2,742.9,1069.8,737.9z"/>
+	<path class="st1" d="M1228.2,738c0.4-2.2,2.7-3.2,4.5-4.1c0.1,3.2,0.2,6.4,0.2,9.6c5.8,0.3,11.6-0.3,17.3-0.6
+		c5.9,0.2,11.9,0.6,17.8-0.5c-3.6-0.3-7.3-0.4-10.9-0.5c-0.4-0.3-1.2-1-1.6-1.3c4.5,0.8,9,1.2,13.6,0.9c7.2-0.3,14.4,0.2,21.5-0.6
+		c1.2-0.1,2.5,0,3.7,0.3c5.5,1.4,11.2,0.7,16.8,1.2c2.2,0.3,4.4-0.2,6.4-1.3c0.5,0.5,1,1,1.5,1.5c1.2-0.1,2.4-0.1,3.6-0.1
+		c3.2-0.1,6.3-0.1,9.5-0.1c-0.1,0.5-0.2,1.5-0.3,2.1c4.5-0.3,9.1,0.2,13.5-1c0.9-2.8,0.6-5.9,0.7-8.8c1.6-0.2,3.2-0.3,4.8-0.5
+		c-0.9,2.7-0.7,5.5,1.6,7.5c-3.7,5-0.2,11.7-2.7,17.2c-0.5,1.1-1.6,1.8-2.8,2c-6.9,0.7-14.1,2-20.7-0.8c-1.2,0.7-2.2,3.3-3.8,2
+		c-0.3-0.5-0.9-1.4-1.2-1.8c-5.8,0.1-11.5-0.8-17.3-1.5c-4.3-0.8-7.4,3.4-11.7,3.3c0.9-1,1.8-2,2.8-3c-11.3-1-22.8-0.2-34,1.2
+		c-7.3,0.2-14.7-0.9-21.9,0.6c-2.4,0.3-4.8,1.2-7.1,0.5c-2-1.2-3.7-2.7-5.7-3.6c0.6-0.9,1.7-1.5,1.6-2.6
+		C1228.3,749.4,1227.4,743.7,1228.2,738z"/>
+	<path class="st1" d="M1358.1,739c-0.2-2.6,2.3-3.8,4.2-4.9c0.5,1,1,2,1.5,3c-0.2,2.4-0.2,4.8,0,7.2c4.7-0.3,9.4-1.3,14.2-1
+		c3.8,0.3,7.7-0.4,11.3-1.7c2.1-0.1,4.2-0.2,6.4-0.3c0.9,0,1.9,0,2.8,0c9.2,0.2,18.5-0.1,27.8,0.2c5.2,0.5,10.4,1.7,15.7,1.6
+		c5.7-0.1,11.5,0.8,17.2,0.3c2.1-2.6,1.2-6.4,1.9-9.4c1.6,1.1,3.8,1.8,4.1,4c0.8,4,0.3,8,0.5,12.1c-0.1,3.1,0.4,6.6-1.3,9.4
+		c-2.2,2.3-5.6,2.6-8.4,1.7c-7.2-1.9-14.6-0.4-21.9-1.5c-10.9-1.6-22-0.7-33-1c-7.4-0.4-14.7,1.7-22.1,1.4c-4.1-0.1-8.2,0-12,1.5
+		c-1,1.6-2.3,2.9-4.1,3.4c0.5-1.2,1.1-2.3,1.6-3.5c-3-0.7-5.5-2.7-6.1-5.8C1357.5,750.2,1357.9,744.5,1358.1,739z"/>
+	<path class="st1" d="M1517.2,738.1c0-2.3,2.1-3.3,3.9-4.2c0.2,2.7,0.2,5.5,0.3,8.2l1.1,0.2c6.8,0.4,14.2,1.4,20.5-1.7
+		c3.1-0.1,6.3-0.2,9.4-0.1c0.3-0.5,0.9-1.5,1.3-2c0.6,0,1.9,0,2.5,0c0,1.1,0,2.3,0.1,3.5c2.3-0.1,4.6-0.3,7-0.5
+		c16.2-0.4,32.5-0.2,48.7,0.2c6.8,1.2,13.7,0.6,20.6,0.8c0-1.8,0-3.5,0-5.3c0.2-0.8,0.8-2.5,1-3.3c1.9,0.8,4.4,1.4,4.7,3.9
+		c1,5.9,0.3,12,0.4,18c0.1,3.1-2.9,4.7-5,6.4c-9.4-4-19.9-1.1-29.8-2.4c-12.6-1.7-25.3-1-38-1c-7.3-0.1-14.6,1.7-21.9,1.3
+		c-6.6-0.3-13.2,0.1-19.7,1.3c-3.1,0.7-6.9-0.9-7.2-4.4C1516.6,750.7,1516.7,744.3,1517.2,738.1z"/>
+	<path class="st1" d="M79.8,735.1c0.8-0.2,2.5-0.5,3.3-0.6c1,1.9,3.3,3.8,2.5,6.2c-1.6,0.8-3.8,1.2-5.1-0.4
+		C79.1,739,79.9,736.8,79.8,735.1z"/>
+	<path class="st1" d="M73.3,737.4c1.3-1.4,3.9,0.6,2.3,2C74.3,740.7,71.8,738.8,73.3,737.4z"/>
+	<path class="st1" d="M193.2,739c-0.1-2.1,2.2-1.3,3.2-0.5c1.2,1.3,0.5,3.1,0.5,4.6C195,742.5,193.2,741.2,193.2,739z"/>
+	<path class="st1" d="M1666.3,743c2.1-0.8,2.4,2.5,0.5,2.8C1664.7,746.5,1664.4,743.3,1666.3,743z"/>
+	<path class="st1" d="M1642.2,745.3c1.3,0,2.1,1.2,1.6,2.4c-1.3,0.5-2.6,0.6-4,0.3C1639.7,746.6,1640.6,745.2,1642.2,745.3z"/>
+	<path class="st1" d="M1682.6,747.2c0.3-2.8,3.3-2.6,5.3-1.9C1689.1,748.4,1684.3,746.9,1682.6,747.2z"/>
+	<path class="st1" d="M1648.1,748.1c1.4-0.8,2.7-1.5,4.1-2.2c0.1,1.2,0.5,2.4,0.3,3.6c-1.1,0.6-2.3,0.9-3.6,1
+		C1648.7,749.9,1648.3,748.7,1648.1,748.1z"/>
+	<path class="st1" d="M1695.5,750.5c-1.1-1.8,1.5-2.5,2.4-3.6c0.4,1.8,0.8,3.5,1.2,5.3C1697.7,752,1695.8,752.2,1695.5,750.5z"/>
+	<path class="st1" d="M54,747.7c1.3,0.7,3.7,2.7,1.8,4c-0.9,1.7-2.7-0.6-2.8-1.6C53.2,749.5,53.7,748.3,54,747.7z"/>
+	<path class="st1" d="M63.3,752.3c1.8-0.6,4.1,0.5,2.5,2.5c-1.8,0.9-7,1.6-6-1.8C61,752.7,62.1,752.4,63.3,752.3z"/>
+	<path class="st1" d="M83.5,753.8c1.5-0.7,3-1.3,4.5-1.8c-0.3,1.7-1.3,3.1-2.7,4.1C84.9,755.5,84,754.4,83.5,753.8z"/>
+	<path class="st1" d="M1662,756.7c2,1.2,2.3,3.3,2,5.5C1661.7,761.1,1661.4,758.9,1662,756.7z"/>
+	<path class="st1" d="M1693.9,761.3c-3.1,0.3-2.8-4.5,0-4.5C1693.9,758.2,1693.9,759.7,1693.9,761.3z"/>
+	<path class="st1" d="M84.1,759.7c1.6,1.4,3,3.1,3.4,5.3c-0.5,2.1-3.8,1.5-4.4-0.2C82.3,763,83.4,761.3,84.1,759.7z"/>
+	<path class="st1" d="M232.2,762.1c1.1-0.9,4.3,1.8,2.5,2.4C233,766.6,229.3,763.3,232.2,762.1z"/>
+	<path class="st1" d="M1173,764.8c0.7-1.2,1-3.2,2.8-2.6c0.6,1.4-0.2,2.7-0.8,4C1174.6,765.8,1173.5,765.1,1173,764.8z"/>
+	<path class="st1" d="M133.9,769.5c2-4.2,6.5-6.3,11-6.6c-1.9,1.4-3.8,2.9-5.3,4.8C137.7,768.3,135.8,768.9,133.9,769.5z"/>
+	<path class="st1" d="M194.2,763.2c1.9-1.1,3.2,1.6,1.9,2.9C194.3,766.7,191.6,764.1,194.2,763.2z"/>
+	<path class="st1" d="M71.2,765.2c0.7-1.8,3.1-1.7,4.2-0.3c0.3,1.7-1.5,2.6-2.4,3.7C72.4,767.5,71.5,766.5,71.2,765.2z"/>
+	<path class="st1" d="M1343.2,764.2c0.6,0.2,1.8,0.6,2.4,0.8c-1.2,1.2-2.9,2.5-4.7,2.1C1340.2,765.5,1342.1,764.7,1343.2,764.2z"/>
+	<path class="st1" d="M1675.9,763.9c2.6,0.4,7.1,2,6.1,5.2C1679.6,768.2,1676.2,766.9,1675.9,763.9z"/>
+	<path class="st1" d="M1360.8,765.8c3.6,0.5,5.3,4.1,4,7.4C1363.1,770.9,1361.6,768.5,1360.8,765.8z"/>
+	<path class="st1" d="M236.1,771.8c0.3-1.8-0.1-6.4,2.9-4.8c0.9,2.2,0.5,4.6-0.6,6.7C237.8,773.2,236.6,772.2,236.1,771.8z"/>
+	<path class="st1" d="M1593.8,767c2.6-0.1,5.2,0.3,7.8,0.9c-0.2,0.7-0.7,2-0.9,2.7C1597.8,771.7,1595.6,768.8,1593.8,767z"/>
+	<path class="st1" d="M212.3,769.3c1.5-1.1,2.8,1.2,2.6,2.5C213.5,774,209.6,770.5,212.3,769.3z"/>
+	<path class="st1" d="M1345.2,769.2c0.7,0,1.9,0,2.6,0c1.1,2.2-2,3.7-3.8,3.9C1343.5,771.7,1343.8,770,1345.2,769.2z"/>
+	<path class="st1" d="M1587.9,769.8c1.2-0.8,2.6-0.3,3.9,0c-1.7,1.3-3.4,3-5.6,3C1584.3,771.7,1587.1,770.4,1587.9,769.8z"/>
+	<path class="st1" d="M1621.6,770.2c1.7-1.3,5.1-2.2,5.7,0.7C1625.3,771.2,1623.4,771.2,1621.6,770.2z"/>
+	<path class="st1" d="M1685,770.1c0.3-1.4,2.8-0.8,2.5,0.6c0,0.9,0,1.9,0,2.8c2.1,2.9,2.4,6.6,1.4,10c-2.4-2.1-1.6-5.5-2.5-8.2
+		C1686,773.5,1684.8,771.9,1685,770.1z"/>
+	<path class="st1" d="M1694.5,772.6c-1-2.5,3.4-5.3,4.7-2.5c-1.6,3.2-2.5,6.7-0.8,10c1.6-1.8,2.6-3.9,3.5-6.1c0.7,3.2,1,6.6,0.8,9.9
+		c-2.5-1.1-5.2-1.7-7.6-3.1C1694.5,778.1,1695.1,775.3,1694.5,772.6z"/>
+	<path class="st1" d="M1256.7,769.9c1.2,2.1,0,4.2-0.9,6.1c-0.9-0.6-3-1.3-1.6-2.6C1254.9,772.2,1255.8,771,1256.7,769.9z"/>
+	<path class="st1" d="M135.2,770.9c1.2,0.5,2.7,0.7,3.1,2.2c0,2-1.8,1.7-3.2,2C135.1,773.6,135.2,772.3,135.2,770.9z"/>
+	<path class="st1" d="M355,774.1c-0.8-2.3,1.4-2.6,3-3.2C357.6,772.7,357.6,775.5,355,774.1z"/>
+	<path class="st1" d="M47.1,777.2c0.8-2,1.9-3.8,3.5-5.3c0.5,0.5,1.5,1.6,2.1,2.1c-1.5,3.8-5,8-9.6,7c0.1-0.6,0.3-1.7,0.5-2.3
+		C44.7,778.2,45.9,777.7,47.1,777.2z"/>
+	<path class="st1" d="M252.8,779.2c-3.2-0.4-4-4.7-1.8-6.7C253.6,773.8,252.8,776.8,252.8,779.2z"/>
+	<path class="st1" d="M193.1,778.4c-2.8-1.5-0.3-4.2,1.9-4.6C194.9,775.3,195.5,778.6,193.1,778.4z"/>
+	<path class="st1" d="M1355.4,778.6c-3.2,0.3-4.6-4.2-1.2-5.1C1355.8,774.5,1354.9,777,1355.4,778.6z"/>
+	<path class="st1" d="M60.1,775.1c2-2.1,3.4,3,0.8,3.2C58.6,779,58.8,775.9,60.1,775.1z"/>
+	<path class="st1" d="M1064.5,775.1c0.9-1.3,3.3,0.1,2.3,1.4C1065.9,777.8,1063.4,776.5,1064.5,775.1z"/>
+	<path class="st1" d="M1153,774.7c2.7,0.2,4.8,2.1,6.2,4.2c-0.6,1.5-1.6,1.8-3.1,1C1154.6,778.6,1153.9,776.6,1153,774.7z"/>
+	<path class="st1" d="M204.2,776.2c2.7-0.4,3.6,2.7,3.8,4.8c-0.8,2.1-4.7,2.6-5.2,0C202.4,779.4,202.4,776.9,204.2,776.2z"/>
+	<path class="st1" d="M1206.1,775.9c1.8-0.3,3.9-0.3,3,2.2C1207.2,779.7,1203.9,778.1,1206.1,775.9z"/>
+	<path class="st1" d="M1649.3,777.2c2.9-1,2.3,3.6,3,5.3C1649.4,782.5,1649.1,779.5,1649.3,777.2z"/>
+	<path class="st1" d="M241.9,778.2c0.7,0.1,2.1,0.3,2.8,0.3c0.1,1.7-0.1,3.5-1.4,4.8C242.3,781.7,241.9,780,241.9,778.2z"/>
+	<path class="st1" d="M351.1,778.1c1.6-0.5,2.2,0,1.7,1.6C351.1,780.3,350.6,779.8,351.1,778.1z"/>
+	<path class="st1" d="M93.4,781.2c1.4-1.9,3.3-3,5.7-2.3c-0.6,1.3-1,2.9-2.2,3.8C95.6,782.5,94.5,781.7,93.4,781.2z"/>
+	<path class="st1" d="M1310.3,779c0.6,0.2,1.8,0.5,2.4,0.6c-0.5,2.3-0.2,5.9-3.5,5.5C1309.5,783,1309.9,781,1310.3,779z"/>
+	<path class="st1" d="M340.3,780c2-0.7,2.7,2.6,0.7,2.9C339.2,783.5,338.5,780.5,340.3,780z"/>
+	<path class="st1" d="M231.1,781.1c0.8,0,2.3,0,3-0.1c-0.1,2.7,0.1,6.5-3.2,7.4C230.7,786,230.8,783.5,231.1,781.1z"/>
+	<path class="st1" d="M69.2,782.3c1.8-0.6,2.8,2.5,0.8,2.9C68.1,785.8,67.2,782.7,69.2,782.3z"/>
+	<path class="st1" d="M220.2,782.3c0.9-1.2,3.3,0.2,2.2,1.5C221.5,785.1,219.1,783.6,220.2,782.3z"/>
+	<path class="st1" d="M126.3,786.8c3.3-1.1,6.5-2.7,9.7-4.2c2.7-0.4,3.6,2.6,5.2,4.1c2.7,1.9,5.9,0.1,8.8,0c1.8,1.1,4.1,2.1,4.8,4.2
+		c-5.4,0-10.9-1.2-16.4,0c-0.2-1.3-0.5-2.6-0.8-3.9c-3.5-0.6-6.7,1.2-9.8,2.4C127.5,788.8,126.7,787.5,126.3,786.8z"/>
+	<path class="st1" d="M30.2,786.7c4.2-0.4,8.4-3.3,12.5-1.2c-0.2,0.9-0.7,2.6-1,3.5c-4.1-1.3-8.4-0.9-12,1.7
+		C29.9,789.3,30.1,788,30.2,786.7z"/>
+	<path class="st1" d="M197.2,790.4c0.3-2,0.2-5.8,3.2-4.9c0.4,1.8-0.2,3.6-0.6,5.4C199.2,790.7,197.9,790.5,197.2,790.4z"/>
+	<path class="st1" d="M1644.3,785.5c1.3-0.6,3-1.2,3.7,0.5c-0.2,2.8-4.1,2.2-4.6-0.1L1644.3,785.5z"/>
+	<path class="st1" d="M113.2,787.7c-1.1-4,5.2-1.1,4.5,1.7C116.3,789.1,113.4,789.8,113.2,787.7z"/>
+	<path class="st1" d="M1162.2,790.9c-2.3-1.7-1.1-5.1,1.7-5.1C1163.7,787.5,1164.3,790.1,1162.2,790.9z"/>
+	<path class="st1" d="M1378.3,786.1c0.4,0,1.3-0.2,1.7-0.2c0.1,3-2.9,5.1-4.2,7.6c-1.1-0.8-1.7-2-1.8-3.4
+		C1375.2,788.6,1376.7,787.3,1378.3,786.1z"/>
+	<path class="st1" d="M75.4,795.6c0.2-3-0.2-6.6,2.4-8.8c2.8,2.5,1.7,5.9,0.8,9C77.6,795.7,76.5,795.6,75.4,795.6z"/>
+	<path class="st1" d="M1139.9,786.9c2.9-1.1,2.6,3.1,2.7,4.9c-0.2,2.5-2.2,0.7-3.1-0.3C1138.6,790.1,1139.2,788.2,1139.9,786.9z"/>
+	<path class="st1" d="M1233.5,786.8c2.1,0,4.7-1,6.1,1.1C1239.1,791.8,1233,790.5,1233.5,786.8z"/>
+	<path class="st1" d="M1603,787.5c1.1-0.3,2.6-0.1,3.4,0.9C1606.3,790.4,1600.9,789.1,1603,787.5z"/>
+	<path class="st1" d="M1696.1,787c1.9,0.4,4.8-0.6,5.3,2c-1.4,0.1-2.9,0.1-4.3,0.2C1696.8,788.7,1696.3,787.5,1696.1,787z"/>
+	<path class="st1" d="M279.9,788.1c0.7,0.1,2,0.3,2.7,0.5c0,0.6,0,1.7,0,2.2C280.4,792.4,279.5,790,279.9,788.1z"/>
+	<path class="st1" d="M1589.1,790.6c0.7-0.8,1.4-1.6,2.2-2.4c1.5,2,3.6,3.5,5.5,5.2c0.2,1.3-0.3,1.9-1.8,1.8
+		C1593,793.8,1591.1,792.1,1589.1,790.6z"/>
+	<path class="st1" d="M1677.2,788.2c0.6,0,1.9,0.1,2.5,0.1c0.3,1.1,0.5,2.2,0.8,3.3c1.5,0.6,3.3,0.9,4.1,2.5
+		C1680.3,795.3,1678.2,791.6,1677.2,788.2z"/>
+	<path class="st1" d="M308.8,794.4c0.2-1.7-0.9-4.8,1.2-5.6C312.5,790,311.7,794.5,308.8,794.4z"/>
+	<path class="st1" d="M48.8,792c-0.4-2.5,2.4-1.8,4-2.2c0,0.8,0,2.4,0,3.2C51.4,792.9,49.6,793.5,48.8,792z"/>
+	<path class="st1" d="M1216,791.3c1-0.5,1.8-1.2,3-1.4c1.2,0.7,2.2,1.5,3.3,2.4c1.9-0.2,3.7-0.6,5.6-0.2c0.3,3.2-3.8,2.8-5.8,3.1
+		C1220.1,793.9,1218.1,792.6,1216,791.3z"/>
+	<path class="st1" d="M1349.9,791.4c1.7-0.5,3.5-1,5.3-1.5c-0.4,1.5-0.8,3-1.2,4.5C1352.3,794,1350.9,792.9,1349.9,791.4z"/>
+	<path class="st1" d="M1650.5,789.9c0.8,0,2.5,0.1,3.3,0.2c0.8,1.4,1.3,2.9,1.9,4.4c2.7,0.8,5.7,1,8.1,2.7c-0.1,0.3-0.3,1-0.4,1.4
+		c-2.4,0.1-4.8-0.4-7.1-0.7C1654.3,795.2,1652.1,792.8,1650.5,789.9z"/>
+	<path class="st1" d="M1660.1,790.1c0.7-0.1,2.2-0.2,2.9-0.3c0.2,0.5,0.6,1.5,0.8,2.1c-1.3,0.4-2.5,0.8-3.7,1.2
+		C1660.1,792.3,1660.1,790.8,1660.1,790.1z"/>
+	<path class="st1" d="M61.3,792c1.8-0.6,2.3,2.4,0.6,2.8C60.1,795.2,59.6,792.4,61.3,792z"/>
+	<path class="st1" d="M130.7,793.3c2.5-0.5,5-0.8,7.5-1C138.6,797,132.4,796.5,130.7,793.3z"/>
+	<path class="st1" d="M1153.2,792.2c1.6-0.3,3.4-0.5,3.1,1.7C1155.6,796.8,1151.4,794.4,1153.2,792.2z"/>
+	<path class="st1" d="M1696.8,795.7c2.1-1.4,4.2-2.8,6.4-4.1l-0.1,0.8c-2.4,2.3-2,5.6-1.5,8.6
+		C1700.1,799.1,1698.4,797.4,1696.8,795.7z"/>
+	<path class="st1" d="M106.5,793.2c1.4-1.6,3.7,0.9,2.1,2.2C107.3,796.7,105.2,794.5,106.5,793.2z"/>
+	<path class="st1" d="M1200.5,793.1c0.8-1,3,0.1,2.3,1.4C1202,795.4,1199.8,794.3,1200.5,793.1z"/>
+	<path class="st1" d="M1191.9,797.1c-0.7-2.9,2.6-2.9,4.5-3.4C1195.3,795.2,1194.4,798.1,1191.9,797.1z"/>
+	<path class="st1" d="M1340,793.5c2.2,1.8,4.3,3.7,6.2,5.8c-2.2-0.1-4.3-0.5-6.3-1.1C1339.8,796.6,1339.9,795,1340,793.5z"/>
+	<path class="st1" d="M1669,794.9c1.7-0.5,3.4-1.5,5.2-0.9C1674.6,796.9,1670.2,796.6,1669,794.9z"/>
+	<path class="st1" d="M1224.9,796.1c1.8,0.9,3.6,1.9,4.3,4C1226.6,800.2,1225.5,798.2,1224.9,796.1z"/>
+	<path class="st1" d="M97.3,797.3c1.9-0.6,3.4,1.2,5,2c-1.3,2-4,2.8-6.1,1.5C95.4,799.6,95.6,797.5,97.3,797.3z"/>
+	<path class="st1" d="M1158.9,797c0.8-0.1,2.3-0.2,3.1-0.3c-0.1,0.8-0.2,2.5-0.2,3.4C1160.3,799.5,1158.2,799.2,1158.9,797z"/>
+	<path class="st1" d="M1306.4,797.5c2.6,1.2-2.3,4.5-2.9,2C1304,798.3,1305.3,797.6,1306.4,797.5z"/>
+	<path class="st1" d="M1585.7,801c1.4-2.8,4.6-4,7.6-4C1591.8,799.7,1588.6,801,1585.7,801z"/>
+	<path class="st1" d="M1606.1,800.1c2.3-1,4.4-2.8,7-3.2c0.1,2.7-2.5,4.6-3.9,6.8C1608.2,802.5,1607.1,801.3,1606.1,800.1z"/>
+	<path class="st1" d="M1640.6,801.3c-0.3-3.6,3.5-5,6.6-4.5C1647.1,800,1642.8,800.1,1640.6,801.3z"/>
+	<path class="st1" d="M30.3,799.4c2-0.4,3.9-0.9,5.9-1.1c4.3,0.1,5.6,9,0.2,8.3c-1.6-1.9-3.3-3.8-5.8-4.5
+		C30.5,801.2,30.4,800.3,30.3,799.4z"/>
+	<path class="st1" d="M52.6,799.1c2.4-1.9,5.3-0.8,7.4,1.1C57.7,802,54.1,801.8,52.6,799.1z"/>
+	<path class="st1" d="M118.2,798.3c1.7,0.3,1.5,3.4-0.2,3.6C116.2,801.7,116.5,798.6,118.2,798.3z"/>
+	<path class="st1" d="M199.9,807.1c-3.5-2.2-0.1-7.1,2.1-9.2C201.8,800.9,202.1,804.6,199.9,807.1z"/>
+	<path class="st1" d="M180.7,806.6c-0.1-3,0.4-6.1,2.4-8.5C185.2,801,184.4,805.6,180.7,806.6z"/>
+	<path class="st1" d="M1189.2,799.4c0.9-1.1,3.4,0.1,2.4,1.5C1190.6,802,1188.1,800.8,1189.2,799.4z"/>
+	<path class="st1" d="M1242.3,799.3c1.2-1.2,3.3,0.8,2.1,2.1C1243.2,802.6,1241.1,800.5,1242.3,799.3z"/>
+	<path class="st1" d="M1621.3,800.1c1.9-0.7,2.8,2.6,0.8,3C1620.2,803.5,1619.4,800.5,1621.3,800.1z"/>
+	<path class="st1" d="M229.2,801.4c1.8-0.5,2.8,3.4,0.8,3.7C227.7,806.4,226.9,801.8,229.2,801.4z"/>
+	<path class="st1" d="M1632.1,800.8c1.2,0.4,3.5-0.5,4,1.2c-0.7,1.8-2.5,2.5-4.1,3.4C1632.1,803.9,1632.1,802.3,1632.1,800.8z"/>
+	<path class="st1" d="M371.5,802.8c1.8-0.1,3.9-1,5.4,0.2c0.5,2-0.3,3.9-0.8,5.8C373.9,807.4,371.5,805.8,371.5,802.8z"/>
+	<path class="st1" d="M1282.5,806.3c1-1.9,2.5-3.4,4.7-3.8C1287.4,805.4,1285.2,806.7,1282.5,806.3z"/>
+	<path class="st1" d="M1330.7,802.6c1.5,0.5,3,1.1,4.5,1.7C1333.7,806.8,1330,805.8,1330.7,802.6z"/>
+	<path class="st1" d="M1695.4,810.6c-3.1-3.1,1.2-5.9,3.4-7.8c1.2,1.5-0.2,3.2-0.6,4.7c1.7,0,3.5,0,5.2,0.1c0,0.6,0,1.9,0,2.5
+		C1700.8,810.5,1698.1,811,1695.4,810.6z"/>
+	<path class="st1" d="M1051.3,804.1c1.9-0.7,2.8,2.5,0.8,2.9C1050.2,807.5,1049.3,804.5,1051.3,804.1z"/>
+	<path class="st1" d="M1224.2,804.2c0.9-1.4,3.7,0,2.5,1.6C1225.7,807.1,1223,805.7,1224.2,804.2z"/>
+	<path class="st1" d="M66.2,810.6c-1.5-3,1.2-5.1,3.9-5.6c1.6,1.4,2.3,3.5,3.3,5.3C71,810.4,68.6,810.5,66.2,810.6z"/>
+	<path class="st1" d="M1129.3,807.7c-0.8-1.4,1.3-2.5,1.8-3.7c0.3,0.5,0.8,1.6,1.1,2.1C1133.5,807.8,1129.7,809.9,1129.3,807.7z"/>
+	<path class="st1" d="M1244,804.8c3.1-1.1,2.9,4.5-0.1,3.8C1242.1,807.8,1243.3,805.8,1244,804.8z"/>
+	<path class="st1" d="M1292.1,804.8c2.6,0.2,2.5,3.5,2.9,5.4C1292.7,809.5,1290.9,807.3,1292.1,804.8z"/>
+	<path class="st1" d="M413.9,810.2c-1.7-1.3,0-3.7,1-4.8c0.7,0.8,1.5,1.6,2.2,2.5C416.1,808.6,415,809.5,413.9,810.2z"/>
+	<path class="st1" d="M1099.7,811.4c0.5-1.8,1.3-3.6,2.2-5.3C1104.3,808.3,1102.8,811.5,1099.7,811.4z"/>
+	<path class="st1" d="M1219.7,808.5c2.7,0.2,6.7-2.7,8.5,0.1C1225.4,808.8,1222,810.8,1219.7,808.5z"/>
+	<path class="st1" d="M1619.2,807.5c1.5-1.2,2.9,4.4,0.7,3.4C1618.2,811,1617.6,808,1619.2,807.5z"/>
+	<path class="st1" d="M1189.2,808.3c1.4-1.5,5.2,2.5,2.5,3.2C1189.9,813.1,1187.3,809.2,1189.2,808.3z"/>
+	<path class="st1" d="M1363.5,808.1c0.9-0.9,3-0.5,3.4,0.8C1366.6,810.8,1362.8,809.8,1363.5,808.1z"/>
+	<path class="st1" d="M1327.2,809.2c1.6-0.5,2.2,0,1.6,1.7C1327.2,811.4,1326.6,810.8,1327.2,809.2z"/>
+	<path class="st1" d="M79.9,809.7c2,0.2,4.5,0.1,5.5,2.3c-1.2,2.8-4.3,0.4-6.3,0C79.3,811.4,79.7,810.2,79.9,809.7z"/>
+	<path class="st1" d="M1685.5,810.2c1.5,0.1,3.1,0.2,4.6,0.7c1.1,3.4-3.2,2.2-5.1,2.1C1685.1,812.3,1685.4,810.9,1685.5,810.2z"/>
+	<path class="st1" d="M266,811.9c3-0.9,6.1-0.4,9.2-0.1c-0.2,1.3-0.4,2.7-0.6,4C271.5,815.1,268.4,814.1,266,811.9z"/>
+	<path class="st1" d="M284,811.8c2.4-1.5,4.7,0.5,6.2,2.2c0.7,2.2-1.6,2.4-3,3.1C286.1,815.4,285,813.6,284,811.8z"/>
+	<path class="st1" d="M1318.2,816.1c-3.5,2.6-7.1-2.7-5.5-5.9C1315,811.6,1316.7,813.8,1318.2,816.1z"/>
+	<path class="st1" d="M1629.2,811.2c1.6-0.6,2.2,0,1.7,1.6C1629.2,813.4,1628.7,812.8,1629.2,811.2z"/>
+	<path class="st1" d="M1673.6,814.1c0.2-3.3,3.8-0.9,5.7-0.9C1678.6,815.9,1675.2,815.6,1673.6,814.1z"/>
+	<path class="st1" d="M262,816c-0.7-2.4,1.9-2.9,3.6-2.4C264.8,815,264.1,817.2,262,816z"/>
+	<path class="st1" d="M1216.2,813.6c0.9-0.8,2.6,0,2.8,1.2C1218.6,816.7,1215.2,815.2,1216.2,813.6z"/>
+	<path class="st1" d="M1259.2,813.2c2.3-0.1,1,3,0.8,4.2C1257.6,817.1,1257.7,814.5,1259.2,813.2z"/>
+	<path class="st1" d="M1644.5,813.1c0.9-1.2,3.4,0.2,2.3,1.5C1645.9,815.7,1643.5,814.4,1644.5,813.1z"/>
+	<path class="st1" d="M1231.7,813.7c3.3-0.9,5.5,1.8,7,4.3c-0.6,0.2-1.9,0.6-2.5,0.8C1234.4,817.4,1232.8,815.7,1231.7,813.7z"/>
+	<path class="st1" d="M30.2,814.8c1.7,0,3.5,0,5.2,0.1c0,2.1,0.2,4.2,1.2,6c-2.1-1.1-4.3-2.1-6.4-3.1
+		C30.1,817.1,30.2,815.6,30.2,814.8z"/>
+	<path class="st1" d="M41.8,820.1c-0.3-2.2,0.2-4,2.1-5.3c0.6,1.7,1.1,3.5,1.6,5.3C44.5,820.1,42.7,820.1,41.8,820.1z"/>
+	<path class="st1" d="M109.7,816c2.3-3.9,5.7,1.1,5.4,3.9C113.2,818.8,111.1,817.8,109.7,816z"/>
+	<path class="st1" d="M1167.7,814.6c2.1,0.8,4.2,3.3,2.1,5.4C1168.2,818.7,1167.9,816.6,1167.7,814.6z"/>
+	<path class="st1" d="M1288.7,817.8c1.2-1.3,2.5-2.4,4.2-2.6c1,0.9,0.4,2.2,0.3,3.3C1291.7,818.2,1290.2,818,1288.7,817.8z"/>
+	<path class="st1" d="M59.4,820.4c0.5-1.7,0.7-5.3,3.4-4.3c0.2,1.2,0.2,2.5,0,3.7C62,821,60.5,820.4,59.4,820.4z"/>
+	<path class="st1" d="M318.7,821.4c0.2-2-0.8-5.8,2.3-5.6C322.6,818,321.4,821,318.7,821.4z"/>
+	<path class="st1" d="M1301.4,816.5c2.3-0.7,1.2,4.2-0.7,3.2C1299.9,818.7,1300.5,817.2,1301.4,816.5z"/>
+	<path class="st1" d="M1341.5,821.2c-1.2-2.3-0.1-4.7,1.8-6.2C1344.5,817.3,1342.7,819.3,1341.5,821.2z"/>
+	<path class="st1" d="M1350.9,820.2c0.1-1.6-0.2-4,2-4.2c0.3,0.5,1,1.5,1.3,2C1353.9,819.5,1352,819.4,1350.9,820.2z"/>
+	<path class="st1" d="M1229.3,817.2c2,0.3,2.3,2.3,3,3.9c-1.4-0.4-2.8-0.7-4.2-1.2C1227.9,818.7,1228.2,817.8,1229.3,817.2z"/>
+</g>
+<g id="Text">
+	<path class="st2" d="M317.5,0h30.9c-1.3,2.4-6,5.3-3.4,8.1c2-0.5,2.5-3,4.5-3.6c0.2-1.5,0.2-3,0.3-4.5H364
+		c3.8,2.3,8.4,2.2,12.6,1.6c-0.1-0.4-0.3-1.2-0.4-1.6h47.1c0.1,0.5,0.3,1.5,0.4,2c0.6,0.1,1.6,0.4,2.2,0.5c-0.1-0.6-0.3-1.9-0.4-2.6
+		h31.4c-0.8,3,3.8,3,3,0h801.8c0,0.4-0.1,1.3-0.2,1.7c2.2-0.6,4.5-1.2,6.8-1.7c0.1,0.4,0.3,1.2,0.4,1.6l-0.2-1.4
+		c1.3-0.1,2.6-0.1,3.9-0.2h88c-2.3,0.9-4.6,2.3-4.3,5.1c1-0.6,2-1.1,3-1.7c0.6-0.1,1.7-0.2,2.3-0.2c0-0.7-0.1-2.2-0.1-2.9l0.9-0.2
+		h40.2c2.5,1.9,5.1,3.6,7.9,5.1c-2,1.7-4.2,2.8-6.7,1.2c-1.3,1.4-2.6,2.9-3.8,4.3c1.2-0.1,2.4-0.1,3.6-0.2c0.5,0.8,0.9,1.6,1.4,2.4
+		c-0.1,1.2-0.2,2.5-0.2,3.7c0.7,0,2.2-0.1,3-0.2c0.5,1.4,1.1,2.8,1.6,4.3c-1.7-0.1-3.4-0.1-5.1-0.2c-0.8-1-1.6-1.9-2.3-2.9
+		c-1.4,0-2.9,0-4.3,0c0,1,0.1,2,0.1,3c0.8,0,2.4-0.1,3.2-0.1c0,1.8,0,3.7,0,5.5c0.4-0.1,1.2-0.4,1.6-0.5c0.3-0.5,1.1-1.6,1.4-2.1
+		c0.7,0,2.1,0.1,2.8,0.1c1.7-2.1,4.2-2.2,6.7-2.1c1-0.7,2-1.5,3-2.2c-0.2,39.5,0,79,0,118.5c-1.6-0.5-3.2-1-4.7-1.5
+		c-0.4,1.5-0.8,3-1.2,4.6c2-0.1,3.9-0.2,5.9-0.3c0.1,9.1-0.2,18.3,0,27.4c-0.5-0.3-1.4-0.9-1.9-1.2c-0.9,0.5-1.7,0.9-2.5,1.4
+		c0,0.8,0.1,1.6,0.2,2.4c1.4-0.1,2.8-0.1,4.3-0.1c-0.3,12,0.1,24.1,0,36.2c-1.8-0.5-3.4-1.6-3.9-3.5c-0.5,0.9-1,1.8-1.5,2.7l1.6-0.1
+		c0.9,1.6,2.2,2.8,3.8,3.8c-0.1,8.3,0.1,16.5-0.1,24.8c105.7,0,211.4-0.1,317.1-0.1v308.7c-1.2-0.1-2.3-0.1-3.5-0.2
+		c0,0.5-0.1,1.5-0.1,1.9c0.8,0,2.4,0,3.3,0c0.1,0.4,0.2,1.2,0.3,1.5v42.2c-1.9-0.9-3.5-2.2-4.8-3.7c-0.8,0-1.6,0.1-2.4,0.2
+		c-0.2,0.9-0.3,1.8-0.5,2.7c2.6,0.4,5.1,0.9,7.7,1.4v87.8c-1.5-0.1-3-0.2-4.4-0.3c-0.3,0.5-0.9,1.6-1.3,2.2c-0.8,0-1.7-0.1-2.5-0.1
+		c-0.3-2.1-0.7-4.2-1.9-5.9c-2.2,3.4-0.4,7.3-0.2,11c-1.6,1.3-3.1,2.7-4.7,4c1.3,0.1,2.7,0.2,4,0.4c0.6-0.6,1.2-1.2,1.8-1.8
+		c-1,2.4-2,4.7-2.8,7.1c4.1-0.5,5.7-4.6,7.8-7.4c-1.3-0.5-2.6-1-3.8-1.5c0.8-0.9,1.5-1.8,2.3-2.6c1.8-0.1,3.7-0.1,5.6-0.1v4.8
+		c-0.4,0.2-1.1,0.6-1.5,0.8c0.4,0.2,1.1,0.6,1.5,0.8v4.9c-1.9-1.9-4.4-0.7-6.6-0.1c0,0.5-0.1,1.6-0.1,2.1c0.7,0,2,0.1,2.7,0.1
+		c0.6-0.6,1.2-1.1,1.8-1.7c0.6,0.2,1.6,0.7,2.2,0.9v33.5c-0.6,0.2-1.9,0.6-2.5,0.8c0.6,0.2,1.9,0.7,2.5,1v20.3
+		c-1.7,0-3.4-0.1-5.1-0.1c-0.8,3.4,3.1,2.8,5.1,3.2v6.2c-1.3-0.5-2.6-1-3.8-1.4c-3.1,2.6-7.2,3.8-11.1,2.7c-2,0.1-4,0.3-6,0.5
+		c0.4,2.2,0.9,4.4,1.5,6.6c1.8-1.7,3.7-3.4,5.5-5.1c0.9,0.8,1.8,1.6,2.7,2.4c0.9,0,1.7,0.1,2.6,0.1c0.3-0.5,0.9-1.4,1.2-1.9
+		c2.1-1.1,4-2.3,6-3.7c0,1.3,0,2.6,0.2,4c0.3,0.4,1,1.1,1.4,1.5v14.5c-0.8-0.9-1.7-1.8-2.5-2.7c0.1-3.5,0.1-7,0.1-10.5
+		c-0.8,0.6-1.6,1.2-2.3,1.8c-0.4,0-1.2,0-1.6,0c-0.3-0.3-1-0.9-1.4-1.2c-1.3,1.4-2.8,2.6-4.3,3.8c-0.7-1.5-1.4-2.9-2.1-4.4
+		c-1.4,1.6-2.2,3.5-2.6,5.5c1.2,0,2.3,0.1,3.5,0.2c-0.5,2.6,0.4,5.8-1.4,8c-1.3,0-2.7,0-4,0c0,1.7,0,3.4,0,5.1
+		c0.6,0.3,1.7,0.9,2.3,1.1c-0.1,1.2-0.2,2.5-0.3,3.7c1.7,0.1,3.4,0.2,5.2,0.2c-0.1-0.8-0.1-2.4-0.2-3.2c0.9,0,2.8,0,3.7,0
+		c-0.8,1.8-1.9,3.4-3.2,4.8c2.5,0.3,5,1,7.3,1.9c-2.1,0.6-4.2,1.2-6.3,1.4c-1.9-2.1-4.6-2.2-7.2-2.2c-0.7-1.3-1.3-2.5-2-3.8
+		c-0.7,2.2-1.2,4.4-1.6,6.7c2.8,2.6,5.7,5.2,7.9,8.5c2-3.3,4.6-6.3,8.2-7.8c0.1,1.5,0.2,3,0.3,4.6c-1.3,0.4-2.7,0.8-4,1.2
+		c-0.5,2.6-1.8,5.5-0.3,8c0.9,1.9,3.3,1.8,5.1,2.4c-0.9-1-1.9-2-2.8-3c-0.1-1.2-0.3-2.5-0.4-3.7c1.6,0,3.3,0.1,4.9,0.2
+		c0.6-1,1.2-2,1.8-3v21.3c-0.7-1.5-2.7-1.8-4-1.1c-0.4,1.5-0.4,3.1-0.5,4.7c1.5-0.1,3-0.2,4.5-0.3v9.3c-0.6-1.7-1.2-3.4-1.8-5.1
+		c-0.9,0-1.8,0.1-2.7,0.1c0,1.4,0,2.8,0.1,4.3c-0.9-0.1-2.6-0.3-3.5-0.4c-1.2-0.3-2.4-0.5-3.6-0.8c0.8,0.3,2.3,0.9,3,1.2
+		c0,2.9,0.4,6-1.4,8.6c-1.2-2.4-2.1-4.8-2.9-7.3c-2.7,0.5-5.4,1-8,1.4c0.1,0.4,0.2,1.3,0.3,1.8c2.2,0,4.5,0,6.8,0.1
+		c0.8,1.7,1.7,3.5,2.6,5.2c2.1-0.5,4.1-1,6.2-1.5c0.6,1.6,1.3,3.2,1.9,4.8c1-1.7,2-3.4,3-5.2c-1.5-0.5-3-1-4.4-1.5
+		c-0.1-1.3-0.1-2.6-0.1-3.9c1.5,0.1,3,0.2,4.5,0.3V851h-18.7c-0.8-0.1-2.5-0.4-3.3-0.5c-0.2-4,3.9-5.4,6.9-6.8
+		c-4.4-0.4-10.5,1.7-13.1-3c-0.2,0-0.6,0-0.8,0c-0.9,1.1-1.8,2.2-2.6,3.2c0.5,1.6,1,3.1,1.6,4.7c-0.8-0.1-2.5-0.2-3.4-0.2
+		c-0.4,0.6-1.1,1.9-1.5,2.6h-24.4c-2.1-1.6-4.1-3.4-6.1-5.2c-0.4,1.7-0.9,3.4-1.3,5.2h-10.6c3.2-1.2,2-4.7,0.4-6.7
+		c-0.4,1.8-0.6,3.7-1.2,5.5c-0.8,0.3-2.5,0.9-3.3,1.2c0-1.9-0.1-3.8-0.1-5.7c-1.4,0.3-2.8,0.7-4.1,1.1c0.3,1.5,0.7,3.1,1.1,4.7
+		h-20.9c2.2-1.1,4.7-1.6,7.2-1.6c-0.1-1-0.1-2-0.2-3c-1.8,0.6-3.7,1.1-5.5,1.6c-1.4-4.6,1.6-8.7,2.8-12.9c-0.8-1-1.6-2-2.3-3
+		c0.5-2.6,2.2-4.7,3.4-6.9c2.1,0.1,4.3,0.4,6.4,1c0.8-1,1.6-2,2.5-2.8c2.4,0.5,4.1,2.6,5.9,4.1c0.7,0,2.1,0,2.8-0.1c0,1,0,2,0,3
+		c-1.6,0.1-3.2,0.1-4.7,0.3c-0.1,1-0.4,3-0.6,4c2.3-0.5,4.7-1,7.1-1.5c0.1-1.2,0.3-2.4,0.5-3.6c3.5,1.7,3,6,3.8,9.2
+		c1.7-0.8,3.4-1.5,5.1-2.3c-0.1-1.2-0.1-2.4-0.2-3.5c-1.5,0.6-3,1.3-4.4,2c0.5-2,1.1-3.9,1.6-5.8c-2.3-0.8-3.9-2.5-5.4-4.3
+		c-1.8-0.7-5.6-0.3-5.2-3.2c3.2-1.5,7.3,0,10.8-0.3c-0.9,0.6-1.8,1.3-2.6,1.9c2,0.8,4.1,1.3,6.3,1.7c0.3-1.2,0.6-2.5,1-3.7
+		c1,0,3.1,0.1,4.1,0.1c-0.2,3-0.3,6-0.2,9.1c-0.3,0.3-0.9,1-1.2,1.3c0,0.7,0.1,2.2,0.2,3c0.8-0.1,1.6-0.2,2.5-0.2
+		c1.8-1.9,3.7-3.6,5.8-5.1c2.5,1.5,5.3,1.1,7.9,0.1c0-2.2,0-4.4,0.1-6.6c-1.1-0.6-2.1-1.2-3.1-1.8c1.9-0.1,3.9-0.2,5.9-0.3
+		c0.1,0.6,0.3,1.8,0.4,2.3c1.1,2.2,2.3,4.5,2.7,7.1c0,2-0.8,3.8-1.3,5.7c1.4-0.5,2.9-1.1,4.4-1.6c0-1.3,0-2.7,0.1-4
+		c-0.5-0.3-1.6-0.9-2.1-1.1c0-0.9,0-2.7,0-3.6c1-0.8,2.1-1.5,3.2-2.2c-0.1-0.7-0.3-2-0.3-2.7c3.5,0,6.9,0,10.4,0
+		c0.5-3.5,0.7-7.1,0.7-10.7c0-0.6,0-1.9,0-2.5c0.2-2-1.2-5.4,2-5.5c0.1-0.7,0.2-2.2,0.2-2.9c0.7,1.1,1.5,2.3,2.3,3.4
+		c0.8-0.1,1.6-0.2,2.4-0.3c0.1-0.9,0.2-1.7,0.2-2.6c-2.4-1.3-2.4-3.9-2.3-6.3c-0.4-0.1-1.2-0.2-1.6-0.3c-0.8,2.1-1.2,4.8-4,4.8
+		c0.1-1.9,0.3-3.8,0.5-5.7l0.1-0.8c0-1.8,0-3.5,0-5.2c1.4,0.1,2.8,0.1,4.2,0.2c0-0.9,0.1-1.8,0.2-2.7c-1.3-0.9-3.6-0.9-3.8-2.8
+		c0.7-2.6,4.4-1.2,6.5-1.7c0-1.4,0-2.7,0-4c0.9,0.1,2.6,0.3,3.5,0.4c-0.1-0.5-0.3-1.6-0.4-2.1c-0.5-0.4-1.5-1.1-2-1.4
+		c-0.1-1.2-0.1-2.5-0.1-3.7c-1,0-2.1-0.1-3.1-0.1c-0.4,0.3-1.1,0.9-1.5,1.2c-0.8-0.1-1.6-0.2-2.4-0.3c-0.3,1.5-0.6,3-0.8,4.6
+		c-0.2-2.5-0.3-5-0.4-7.5c1.2,0.4,2.4,1.2,3.8,0.9c0.6-1.4,0.4-2.9,0.7-4.3c-1.1,0.5-3.4,1.6-4.5,2.1c-0.4-3.1-0.7-6.2-0.7-9.2
+		c2.2-0.2,4.1-1,4.9-3.3c-1.4,0-2.8,0-4.1,0c-0.2-3.7-0.5-7.4-0.5-11.1c2.1,1.3,4.4,1.1,6.6,0.2c-0.1-0.8-0.2-2.5-0.2-3.3
+		c1.8,0,3.6,0.1,5.4,0.1c-0.1,2-0.2,4.1-0.3,6.1c-0.6,0-1.9,0.1-2.5,0.2c-0.6,1.6-1.2,3.2-1.7,4.8c1.2,0.5,2.5,0.9,3.7,1.4
+		c-0.5,1.1-1.1,2.3-1.6,3.5c1.4,1.1,2.8,2.1,4.3,3.1c2.5-0.5,5.1,0,7.6-0.1c1.9-0.5,3.3-2.1,4.9-3.2c-1.6-1.1-3.4-1.8-5.2-2.2
+		c-0.8,1.3-1.7,2.7-2.5,4c-2.6-0.6-5.2-1.5-7.6-2.7c0.8-1.3,1.6-2.6,2.4-4c0.8,0.1,2.5,0.2,3.4,0.2c0.3-3.4-0.4-6.7-2.1-9.6
+		c0-1,0-3.1,0-4.1c4,0.8,3.7,5.6,5.1,8.7c0.5,0,1.5,0,2,0c0-2.1,0-4.3,0-6.4c1.3,0.3,2.6,0.7,3.9,1.1c0.5,1.7,1.1,3.3,1.6,5
+		c0.2-1,0.5-2,0.7-3c-0.9-1.6-1.8-3.2-2.7-4.8c-0.7,0-1.5,0.1-2.1,0.1c-1.3,1.1-2.6,2.1-4.3,2.3c-0.7-1.5-1.3-2.9-1.8-4.4
+		c0.9,0,2.7,0.1,3.6,0.1c0.4-0.8,1.1-2.3,1.5-3c-1.3,0-2.6,0-3.8,0c-2.5,3.2-5.8,7.2-10.3,5.9c-0.2-1.4-0.4-2.8-0.5-4.2
+		c-0.4,0.1-1.1,0.3-1.5,0.4c-1.1,2.7-3,5-5.9,5.8c-0.1-9.4,0.4-18.7,0.4-28.1c3.3-0.5,7-1.8,10.2,0c-0.2,0.4-0.5,1.1-0.7,1.5
+		c-1.2,1-2.8,0.6-4.2,0.7c-0.4,1.3-0.8,2.6-1.2,3.9c-1.2,0.8-2.3,1.7-3.4,2.6c0.2,1.5,0.5,2.9,0.8,4.4c1.9-4,4.6-7.6,8.8-9.3
+		c0.5-2.1,0.8-4.2,1.2-6.2c-3.9,0-7.7-1-11.6-1.4c0.6-6.6-1.1-13.2,0.5-19.7c0.3,0.9,0.8,2.7,1,3.6c0.8-0.5,2.5-1.3,3.4-1.8
+		c-0.8-1-1.5-2-2.2-2.9c-0.4-1.1-0.8-2.1-1.2-3.1c-0.6,1-0.9,2-1.3,3c0.4-6.4-1-12.9-0.2-19.3c0.5-4.1-0.2-8.1-0.5-12.2
+		c2.7,2.3,5.4,5.3,9.3,4.6c-2.7-2.5-5.9-4.2-8.8-6.4c-0.8-2.6-0.4-5.4-0.5-8.1c0.2-5.7-0.3-11.3,0.3-17c1-7-0.7-14.1,0-21.2
+		c0.2-1.3,1.5-2,2.3-2.9c0.2-0.8,0.4-1.7,0.6-2.5c-0.8,0.1-2.4,0.3-3.2,0.4c0.5-3.3,0.6-6.7,0-10c1.5-0.6,3-1.2,4.5-1.8
+		c-1.5-0.6-3-1.1-4.5-1.7c1.1-8.7-0.7-17.5,0.1-26.2c0.9-7-0.4-14-0.1-21.1c0-46,0-91.9,0-137.9c-0.3-9.4,0.6-18.7,0-28.1
+		c-0.1-15.9,0-31.9-0.1-47.8c1.7,1.3,3.4,2.6,5.4,3.5c0-0.9,0.1-1.8,0.1-2.6c-1.8-0.5-4.3,0-5.3-1.9c-0.4-2.7-0.2-5.5-0.2-8.2
+		c1,0.5,2,1,3,1.6c-0.2-0.3-0.6-1-0.8-1.4c-0.6-0.1-1.7-0.2-2.2-0.3c0.1-18,0-35.9,0-53.9c-54.9-0.1-109.9,0-164.8,0
+		c-13.2-0.2-26.5-0.2-39.7-0.1c0.1-1.4,0.2-2.8,0.3-4.1c-0.8,0.1-2.3,0.2-3,0.2c0-0.7-0.1-2.2-0.1-3c-1.5,1.6-2.9,3.3-4.4,4.8
+		c0.7-0.5,2.1-1.6,2.8-2.1c0.4,1.1,1.2,3.2,1.7,4.3c-5.2,0.5-10.2-0.8-15-2.4c-0.1-1.1-0.2-2.2-0.3-3.3c-0.4,1.9-0.8,3.8-1.3,5.6
+		c-29.4-0.1-58.9,0.1-88.3-0.1c0.2-10.6-0.2-21.2,0.1-31.7c0.6,0.6,1.8,1.9,2.5,2.6c1.5-0.8,2.9-1.5,4.4-2.2c0-2.1-0.1-4.2,0-6.3
+		c1.1-0.8,2.1-1.6,3.2-2.4c0-0.7-0.1-2-0.2-2.7c-1.9,0.5-3.4,1.7-4.6,3.2c-1.2,0.6-2.3,1.3-3.5,1.9c1.2,0.9,2.5,1.7,3.7,2.6
+		c-0.6,2.4-1.5,4.9-4.6,4.3c-0.1-1.3-0.2-2.5-0.3-3.8c-1.2-9.6-0.5-19.4-0.6-29.1c-0.1-4.3-0.2-8.7,0.4-13c-0.6-5-0.9-10.1,0.3-15.1
+		c-0.4-1.8-0.7-3.7-1-5.5c1.5-0.5,3-1,4.6-1.5c-1.3-0.2-2.7-0.5-4-0.8c-0.7-6.4-0.5-12.8,0.3-19.2c0.2-3.7-0.6-7.3-0.7-11
+		c0.9-0.6,1.8-1.2,2.7-1.8c-0.9-0.9-1.8-1.8-2.6-2.7c0.1-10.6-0.6-21.2,0.4-31.7c0.5,1.7,1.1,3.4,1.6,5.1c0.9-1,1.8-2,2.7-3
+		c-0.4-1-0.9-1.9-1.3-2.9c0.7-0.3,2.2-1,3-1.3c-0.8-1.6-1.6-3.2-2.4-4.8c0.3-0.8,0.9-2.5,1.2-3.4c-1.2,0.1-2.3,0.2-3.4,0.3
+		c0.3,2.1,0.8,4.1,0.9,6.3c-0.7,0.3-2,1-2.7,1.3c0.1-16.2-0.3-32.4,0-48.7c0.8-0.2,1.6-0.3,2.4-0.4c-1.5-0.6-2.5-1.7-3-3.3
+		c0.9-0.5,2.2-0.9,3.2-1.4c0,0.3,0,1,0,1.3c0.6,0,1.7-0.1,2.3-0.1c0-0.6,0.1-1.8,0.1-2.5c-1.8,0-3.5,0.1-5.2,0.2
+		c0-2.3,0-4.5-0.1-6.8c0.6-0.3,1.7-1.1,2.2-1.4c-0.1-0.4-0.2-1.3-0.2-1.8c-0.7-0.8-1.3-1.5-2-2.3c0-0.7,0-2.1,0-2.8
+		c-2.4-0.1-4.9-0.1-7.3-0.2c-1.1-1.1-2.1-2.3-3.2-3.4c-0.5,1.2-1,2.4-1.5,3.6c-116.1-0.2-232.3,0-348.4,0c-214.3,0-428.7,0-643,0
+		c-5.4-0.4-10.8-1.4-16.1,0.3c-0.5-0.4-1.5-1.3-2-1.7c-0.5,0.4-1.5,1.1-1.9,1.4c-5.8-0.3-11.6,0.8-17.2-0.8
+		c-0.4,0.2-1.2,0.7-1.6,0.9c-2.1,0-4.2-0.1-6.2-0.1c-0.7,5.9,0.5,12-0.4,17.9c-0.5,0.2-1.4,0.5-1.9,0.7c0,0.4,0,0.8,0,1.1
+		c0.5-0.3,1.6-0.9,2.2-1.2c0.2,15.7-0.3,31.4,0.1,47.1c-0.1,8.3-0.5,16.7,0,25c0.3,6.2-0.4,12.5,0,18.7c-0.4,0-1.1-0.1-1.4-0.1
+		c0.9,1.2,1.4,2.6,1.9,4c-1.2,0.1-2.4,0.1-3.6,0.2c0,1.3-0.1,2.6-0.1,3.8c-0.9,0-2.8-0.1-3.7-0.1c0.6,1.6,1.2,3.1,1.9,4.7
+		c0.9-1.9,1.7-3.7,2.5-5.6c0.6-0.4,1.9-1.1,2.5-1.4c0,4.4,0.1,8.8,0.1,13.2c-1.4,0.2-2.8,0.5-4.2,0.8c1.4,0.1,2.7,0.2,4.1,0.4
+		c0.6,8.5-0.8,17,0.1,25.4c0.1,27.9-0.2,55.8,0,83.8c-104.1,0-208.1,0-312.2,0c0,40.5-0.1,81,0,121.6c-1.2,0.2-2.4,0.4-3.6,0.6
+		c1.2,0.3,2.5,0.6,3.7,0.8c0,28.8,0,57.5,0,86.3c0.1,2.5-0.8,4.8-1.7,7.2c0.4,0.4,1.3,1.3,1.7,1.8c0,5-0.5,10-0.4,15
+		c0.7,13.4-0.1,26.8,0.2,40.2c0,22.3,0.1,44.6,0,66.9c0,2.1-0.2,4.3-0.5,6.4c-0.7-1.7-1.4-3.4-2.1-5c-0.9,0-1.8,0.1-2.7,0.1
+		c-0.3,1-0.7,2-0.9,3c1.7,2,3.9,3.5,6,5.1c0.4,7.9-0.3,15.8-0.1,23.6c-0.3,0.5-1,1.7-1.3,2.2c-1,0.1-3,0.2-4,0.3
+		c0.1-2.4,0.1-4.8,0.2-7.2c-0.5-0.3-1.5-1-2-1.4c-0.1-1.6-0.1-3.3-0.2-4.9c1.5,0,3.1,0,4.6,0.1c-1-1.9-2-3.7-3.1-5.6
+		c-0.1,1.6-0.1,3.2-0.2,4.9c-1.6,0.4-3.2,0.8-4.8,1.2c-0.8,1.2-1.6,2.5-2.4,3.7c-1.5-0.1-3.1-0.1-4.6-0.2c-0.1,1.2-0.3,2.4-0.5,3.6
+		c-2,1.9-4.8,2.8-6.3,5.2c2.2,0.1,4.5,0.2,6.8,0.2c0.1,2.9-0.4,5.8-1.2,8.7c1,0.5,1.9,0.9,2.9,1.4c0.5,3,1.4,6,0.3,9
+		c-1,0-2.9,0-3.8-0.1c-1.7-1.5-3.4-3-5.1-4.4c-0.3-1.5-0.6-3-1-4.6c-1.2-0.1-2.5-0.3-3.7-0.4v-20.7c1.2-0.4,2.5-0.8,3.7-1.2
+		c-0.1-0.8-0.2-1.6-0.2-2.5c-1.2-0.6-2.3-1.2-3.4-1.8v-1.4c1.1-1.8,2.4-3.4,3.8-5c-1.3-0.1-2.5-0.2-3.8-0.3v-8.6
+		c1.1-0.6,2.3-1.2,3.5-1.8c0-0.3-0.1-1-0.1-1.3c-1.8-2.1-3.2-4.5-3.4-7.3v-11c1.3-1,2.7-2,4.1-3c-0.3-0.7-0.7-1.4-1-2
+		c-1,0.1-2.1,0.2-3.1,0.3V234c105.5,0,211,0,316.5,0c0-40.3,0.1-80.7,0-121c0.8-1.1,1.6-2.2,2.4-3.3c-0.8-0.7-1.5-1.4-2.2-2.1
+		c0.2-2.8,0.1-5.7,0-8.5c1.3,0.5,2.7,1,4,1.5c-1.5-1.3-2.9-2.5-4.3-3.8c0-12.9,0.1-25.8,0-38.7c0.8-0.9,1.6-1.8,2.4-2.7
+		c1.2,0,2.5,0,3.7,0.1c-0.2-1-0.4-2.1-0.5-3.1c-1.9,1.3-3.7,2.6-5.6,3.9c0-6.4,0-12.8-0.1-19.2c0.8-2.5,2.7-4.4,4.6-6.1
+		c0.5,0.6,1.4,1.9,1.9,2.6c1.2,0.1,2.4,0.2,3.7,0.2c0-1.1,0-2.1,0-3.2c-1.5,0-3.1,0-4.6,0c-1.7-0.7-3.6-1-5.4-1.2c0-0.8,0-2.5,0-3.4
+		c2.7-1.8,4.9-4.2,5.3-7.6c-1.1,0.1-2.1,0.1-3.2,0.2c-0.3,1.8-0.5,3.8-2,5c0-5,0.6-10,0.2-15c1.7-0.2,3.2-0.8,4.6-1.7
+		c-1.2-0.1-3.6-0.2-4.8-0.2C317,4.4,317.3,2.2,317.5,0 M353.5,1.5c0,0.5,0,1.5,0,1.9c0.9,0,1.9,0,2.9,0c0-0.5,0.1-1.6,0.2-2.2
+		C355.5,1.4,354.5,1.5,353.5,1.5 M1288.3,1.3c0.2,1.2,0.4,2.4,0.6,3.6c1.4,0.6,2.5,1.6,3.7,2.7c-0.3-0.3-1-1-1.3-1.3
+		c0-0.6-0.1-1.8-0.1-2.4C1289.5,4,1288.9,2.6,1288.3,1.3 M438.8,2.6c0.9,0.4,1.8,0.7,2.8,1.1c0.1,1.2,0.2,2.4,0.2,3.6
+		c0.3,0,1,0.1,1.3,0.1c0.5-1.1,0.9-2.1,1.4-3.1C443.1,2.4,440.9,2.5,438.8,2.6 M1388.6,3.4c0,1-0.1,2.1-0.1,3.1
+		c1.4-0.1,2.8-0.2,4.2-0.3c0,0.8,0,2.3,0,3.1c1.5,0.1,3,0.2,4.5,0.3c-1.9-2.1-4.4-3.6-6.3-5.8C1390.1,3.7,1389.3,3.6,1388.6,3.4
+		 M377.5,7.8c0.8-0.6,1.5-1.1,2.3-1.7c-0.6-1-1.7-3-2.3-4C377.4,4,377.4,5.9,377.5,7.8 M338.1,7.7c1.1,0,2.3-0.1,3.5-0.1
+		c0-1.1,0-2.3,0-3.4C339.2,4.1,338.1,5.5,338.1,7.7 M391.6,5.4c0,1.3,0.1,2.5,0.1,3.8c-2.1,0.9-3.9,2.3-4.8,4.4
+		c1.9-0.1,4,0.2,5.5-1.3c1.4-1.9,1.8-4.3,2.4-6.5C393.6,5.6,392.6,5.5,391.6,5.4 M1254.7,6.7c-0.2,1.1-0.3,2.1-0.4,3.2
+		c2.7-0.1,4.2-2.4,5.7-4.3C1258.2,5.8,1255.9,5,1254.7,6.7 M332.3,6.4c0,0.6,0.1,1.7,0.1,2.3c1,0,2.1-0.1,3.2-0.1
+		c0-0.5-0.1-1.5-0.1-2C334.4,6.5,333.4,6.4,332.3,6.4 M599.7,7.8c0.8,1.4,1.7,1.4,2.5,0C601.4,6.3,600.5,6.3,599.7,7.8 M376.1,13.3
+		c2.1,0.1,4.3,0.2,6.4,0.2c0.1-1.1,0.1-2.2,0.2-3.3C380.2,10.4,377.6,11.1,376.1,13.3 M443.8,11.5c-0.1,2.1-1.4,3.6-3.7,3.2
+		c0,0.2,0.1,0.5,0.1,0.7c1.9,0.1,3.7,0.2,5.6,0.3c-0.1-1.4-0.3-2.8-0.4-4.1C445,11.5,444.2,11.5,443.8,11.5 M332.9,12.5
+		c1.2,0.9,2.5,1.8,3.7,2.7c2.4,0.3,4.7,1,6.8,2.2c-0.1-0.8-0.1-1.6-0.2-2.4C339.6,14.4,336.6,11.7,332.9,12.5 M407,15.4
+		c1.6-0.6,0.6-3.4-1-3C404.4,13.1,405.4,15.9,407,15.4 M366.5,14.3c0,0.6-0.1,1.9-0.1,2.5c1.9,0,3.8-0.3,4.8-2.1
+		C369.5,14.5,368,14.4,366.5,14.3 M1255.4,14c-1,1.3,1.1,3.6,2.2,1.9C1258.6,14.5,1256.4,12.3,1255.4,14 M359.5,15.6
+		c-0.1,1.1-0.2,2.2-0.3,3.3c1.1-0.4,2.3-0.8,3.4-1.2c0-0.6,0.1-1.7,0.1-2.3C361.7,15.4,360.6,15.5,359.5,15.6 M398.4,15.5
+		c0.1,1.8,0.1,3.5,0.3,5.3c1.4-1.7,2.6-3.5,3.5-5.5C400.9,15.4,399.6,15.4,398.4,15.5 M1382,15.5c-0.2,3.1,2.4,3.3,4.7,3.5
+		c-0.1-1.2-0.2-2.3-0.2-3.5C1385,15.4,1383.5,15.4,1382,15.5 M347.5,16.2c0,0.6,0.1,1.8,0.1,2.4c1.3-0.1,2.7-0.1,4-0.2
+		c0.5,0.9,0.9,1.7,1.4,2.6c0.3,0.1,1,0.4,1.3,0.6c0-0.9,0.1-1.8,0.1-2.7C352,18,350.2,15.9,347.5,16.2 M384.8,16.4
+		c-2,1.5-4,3.2-3.5,6c1.6,0.1,3.3,0.1,5,0.2c-0.5-0.3-1.4-1-1.8-1.4c0-0.4-0.1-1.1-0.1-1.4c1.5-0.8,2.9-1.8,3.8-3.3
+		C387,16.5,385.9,16.4,384.8,16.4 M388.4,24c2.8-1.8,5.4-3.9,8.6-4.8c-1.9,0.6-4.1,0.6-3.9-2C391.1,19.2,387.5,20.6,388.4,24
+		 M325.3,17.4c-0.7,3.9,3.2,3.1,5.7,3.2C330.8,17.3,327.7,17.3,325.3,17.4 M409.2,23.6c1.1,0,2.2,0,3.3,0c0-1.1,0-3.3,0-4.4
+		C409.5,19,409.5,21.5,409.2,23.6 M1248.8,20.5c-0.6,1-1.1,2.1-1.7,3.2c1.1-0.1,2.2-0.2,3.3-0.3c0.1-1,0.2-2.1,0.3-3.1
+		C1250.2,20.3,1249.2,20.4,1248.8,20.5 M335.5,25.4c0,1.1-0.1,2.2-0.1,3.3c0.5-0.1,1.4-0.3,1.9-0.4c0.4,1.4,0.9,2.8,1.3,4.2
+		c0.5,0,1.5,0.1,2.1,0.1c0-1.7-0.1-3.3-0.1-5c-1.8,0.1-3.6,0.1-3.3-2.1C336.9,25.4,335.9,25.4,335.5,25.4 M1394.3,25.3
+		c0,0.6,0,1.7,0.1,2.2c2.3,1.2,5.2,4.4,7.6,1.8c-1.6-1.2-3.1-2.5-4.5-3.8C1396.4,25.4,1395.4,25.3,1394.3,25.3 M1410,30.6
+		c-0.8-0.3-2.2-0.9-3-1.2c-2.1,0.9-4.2,1.7-6.3,2.5c2.7,2.6,6.6,2.5,10.1,2.9c-0.1-0.9-0.4-2.6-0.5-3.5c0.8,0.1,2.4,0.2,3.2,0.2
+		c0.1-1.2,0.2-2.4,0.4-3.6C1412.1,28.2,1410.8,29.1,1410,30.6 M1411.7,34.1c-1.1,1.2,1,3.2,1.9,1.6
+		C1414.6,34.5,1412.6,32.5,1411.7,34.1 M338.7,64.4c-1,1.7-1.9,3.4-2.8,5.1c0.6,0,1.8,0.2,2.4,0.2c0.2-1.5,0.8-2.8,1.9-3.9
+		c0.1-0.3,0.4-1.1,0.6-1.4C340.2,64.4,339.2,64.4,338.7,64.4 M1402.9,73.4c1.2,0.2,2.4,0.3,3.6,0.5c1,1.8,1.2,3.8,1.4,5.9
+		c-1.2,0.4-2.4,0.7-3.6,1.1c0,0.3,0.1,0.8,0.1,1c0.9-0.5,1.8-0.9,2.7-1.4c1.2,0,2.5-0.1,3.8-0.1c-0.5-1.3-1.6-2.1-3-2.2
+		c0.3-1.5,1.1-2.5,2.5-3.1c0-0.4,0.1-1.1,0.1-1.4C1408,73.6,1405.4,73.5,1402.9,73.4 M332.8,85.7c-0.9,0.6-1.8,1.3-2.6,1.9
+		c-1.5,0-2.9,0.1-4.4,0.1c-0.1,0.7-0.3,2.2-0.3,2.9c-0.8,0-2.3,0-3.1,0c0,0.2-0.1,0.6-0.2,0.8c2,0,4.1,0,6.1,0c0-0.8-0.1-2.2-0.1-3
+		c2.6-1.3,7.8-1.5,7.5,2.7c-3.1,2.4-1.8,6.1-0.8,9.2c-1.7,0.3-3.4,0.7-5,1.3c0.7,0.6,1.4,1.3,2.1,1.8c2-1.5,3.8-3.4,5.6-5
+		c-0.1-1.6-0.2-3.2-0.3-4.9c0.9-0.3,1.9-0.6,2.9-1c-1,0-3,0-4,0c0.4-2.4,1-4.8,1.7-7.1C336.1,85.6,334.4,85.6,332.8,85.7
+		 M324.7,102.2c0,2.1-0.9,3.9-3.3,3.4c0,1,0.1,2,0.1,3c1.1-0.1,2.2-0.2,3.4-0.4c0.4-1.1,0.9-2.1,1.4-3.2c0-0.8,0-1.5,0-2.2
+		C325.9,102.7,325.1,102.4,324.7,102.2 M1394.4,108.7c0,1.7,0.1,3.4,0.2,5.1c0.2,0,0.5-0.1,0.6-0.1c0.2-2.7,2-4.7,4.4-5.6
+		c-0.1-0.4-0.3-1.3-0.3-1.8C1397.7,107.3,1396.1,108.1,1394.4,108.7 M331.3,109.4c0,1.2,0.1,2.4,0.1,3.6c1.9-0.9,3.8-2,5.4-3.3
+		C335,109.5,333.2,109.4,331.3,109.4 M332.1,131.1c-2.1,0.3-4.4,1.1-3.8,3.7c2-0.3,3.8-1.1,5.5-2.2c1.5-0.1,3.1-0.2,4.6-0.3
+		c0.1-1.1,0.2-2.2,0.3-3.3C336.4,129.4,334.2,130.2,332.1,131.1 M1410.6,131.1c1,0.7,3.2,1.1,3.8-0.3
+		C1414.1,129,1409.4,128.9,1410.6,131.1 M1397.3,139.6c1.4,0.4,2.9,0.9,4.4,1.3c-0.1-1.1-0.2-2.1-0.3-3.2c-1-0.1-3-0.2-4-0.2
+		C1397.4,137.9,1397.3,139,1397.3,139.6 M325.6,141.4c-0.9,1.6-1.9,3.2-3.7,3.7c-0.2,0.8-0.4,1.7-0.6,2.5c0.4-0.1,1.3-0.2,1.8-0.2
+		c0.7-2,2.5-2.3,4.4-2.2c0-1.2,0.1-2.5,0.1-3.8C327.1,141.4,326.1,141.4,325.6,141.4 M1397.6,143.6c-0.1,1.4-0.2,2.7-0.2,4.1
+		c1.4,0,2.8-0.1,4.2-0.1c0-1.4,0-2.9,0-4.3C1400.2,143.4,1398.9,143.5,1397.6,143.6 M1408.5,144.9c0.8,1.1,1.7,1.3,2.9,0.6
+		c0-0.5-0.1-1.4-0.1-1.9C1410.4,142.6,1408,143.3,1408.5,144.9 M1407.6,173.5c0,1.6,0,3.3,0,4.9c1,0.1,2,0.2,3.1,0.2
+		c-0.2-1.6-0.3-3.2-0.4-4.8C1409.3,173.7,1408.4,173.6,1407.6,173.5 M1406.2,195.6c0.2,0.4,0.5,1.2,0.7,1.6c0.5,0.1,1.7,0.3,2.2,0.4
+		c1,1.6,4.1,5.3,5.7,2.4c-1.5-0.5-3.1-1-4.6-1.4c0-0.7,0.1-2.2,0.2-2.9C1409,195.6,1407.6,195.6,1406.2,195.6 M1397.1,205.2
+		c0.5,0.9,1.1,1.8,1.6,2.7c-0.3,0.5-1,1.5-1.3,2c-0.2,1.8,1.8,1.4,3,1.8c0.4-1.3,0.8-2.6,1.2-3.9c-0.3-0.6-1-1.9-1.4-2.5
+		C1399.1,205.3,1398.1,205.3,1397.1,205.2 M1407.1,230.8c-1.8-0.1-3.6-0.2-5.4,0.1c2,1.2,4.8-0.3,6.4,1.7c-1.5,2-5.4,1.9-4.9,5.1
+		c1.4-0.6,2.9-1,4.5-1.3c0.2-1.6,0.4-3.2,0.7-4.8c0.9-0.1,2.5-0.2,3.4-0.3C1410.9,229.4,1407.9,228.2,1407.1,230.8 M1398.6,236.8
+		c-1.3,2,2.6,2.3,2.7,0.4C1400.6,236,1399.7,235.9,1398.6,236.8 M1482.5,239.2c0,2.6,0.7,5,1.4,7.4c-1,0-3.1,0.1-4.1,0.1
+		c1,0.3,1.9,0.6,2.9,0.8c-0.1,1.7-0.2,3.5-0.2,5.2c1.7,1.3,3.2,2.8,4.6,4.5c0.8,0.1,1.6,0.1,2.4,0.2c0-0.4,0.1-1.3,0.2-1.8
+		c-1.6-0.3-3.1-0.5-4.6-0.9c0.2-1.8,0.7-3.4,1.6-5c-0.7-2.1-2.7-3.7-2.2-6.1c1.6-2.3,4.8-1.1,7.3-1.6c0.3,1.2,0.7,2.3,1.1,3.5
+		c1.5-0.1,2.9-0.3,4.4-0.4c-0.9-0.3-1.8-0.6-2.8-0.9c0-0.7-0.1-2-0.1-2.6c-1.8,0-3.6-0.1-5.4-0.1
+		C1487.2,239.7,1484,241.4,1482.5,239.2 M1470,244.1c1.2,1.4,2.8,2.5,4.7,2.9c0-2-0.1-3.9-0.2-5.9C1472.3,241,1471,242.3,1470,244.1
+		 M1534.4,242.4c0,1,0,2.1,0.1,3.1c0.5,0,1.5,0.1,2,0.1c0.4-1,0.8-2.1,1.2-3.1C1536.6,242.5,1535.5,242.4,1534.4,242.4 M1509.8,246
+		c1.6-0.1,2.2-3,0.3-3.1C1508.6,243,1507.9,246,1509.8,246 M1523,245.4c-1.7,1.1,0.6,3.2,1.9,2.1
+		C1526.6,246.5,1524.3,244.4,1523,245.4 M1408.5,252.1c0.1,2.6,1.1,5.1,1.2,7.7c2.5-2.5,6-0.2,9.1-0.3c-1.7-1.3-3.4-2.8-3.7-5.1
+		c-1.6,0.1-3.2,0.2-4.8,0.3c0-0.8,0.2-2.4,0.2-3.3c0.6,0,1.9,0,2.5,0c0.9-1.5,2.2-2.8,3.8-3.7C1413.4,247.8,1411.5,251,1408.5,252.1
+		 M1461.4,248.5c0.1,1,0.1,2,0.2,3c0.7,1,1.4,2,2.1,3c0.3,0,1-0.1,1.4-0.1c0.9-0.6,1.9-1.1,2.9-1.7c-0.9,0-2.8,0-3.7,0
+		c0-1.4,0.1-2.8,0.1-4.2C1463.5,248.4,1462.5,248.4,1461.4,248.5 M1502.9,251.6c-1.2,1.4-2.4,2.7-3.6,4c0.3-0.2,1-0.8,1.3-1
+		c1.4-0.4,2.9-0.8,4.3-1.2c0.4,0.1,1.2,0.2,1.6,0.2c-0.4-0.5-1.2-1.3-1.7-1.8C1504.2,251.7,1503.5,251.6,1502.9,251.6 M1508.5,255.8
+		c0,1,0.1,2,0.2,3c0.6-0.9,1.2-1.7,1.9-2.6c1.3,0.1,2.7,0.2,4.1,0.3c-0.1-1.1-0.1-2.1-0.1-3.2
+		C1512.9,255.2,1510.8,255.9,1508.5,255.8 M1519.7,254.7c-0.1,1.2-0.2,2.4-0.3,3.6c2.5,0.1,5.2,1.5,7.7,0.5c-1.5-0.2-3-0.3-4.5-0.4
+		c-0.1-1.2-0.2-2.5-0.3-3.8C1521.4,254.7,1520.6,254.7,1519.7,254.7 M1713.1,259.6c-0.8,2.1,0.2,4.1,1.3,5.9
+		C1715.3,263.2,1715.2,261.1,1713.1,259.6 M18.4,314.5c0,1.3,0.1,2.6,0.1,4c1,0,2,0.1,3,0.2c0-1.4,0-2.8-0.1-4.1
+		C20.5,314.5,19.5,314.5,18.4,314.5 M1720.8,322.2c-0.2,2.5-0.2,4.9-0.3,7.4c0.6,0,1.7-0.1,2.2-0.1
+		C1722.6,327,1722.3,324.4,1720.8,322.2 M8.4,330.3c-0.4,1.4-0.9,2.8-1.3,4.2c1.5,0,2.9,0,4.4,0c0-1-0.1-3-0.1-4
+		C10.4,330.5,9.4,330.4,8.4,330.3 M19.5,371.6c0.1,1.9,0,3.7,0.3,5.6c1.4,0.1,2.4-1.1,3.5-1.8c0-1.2,0-2.5,0-3.7
+		C22.1,371.7,20.8,371.7,19.5,371.6 M12.7,410.6c0,0.9-0.1,1.9-0.1,2.8c1.4,0.1,2.7,0.2,4.1,0.2c-0.1-1.1-0.1-2.2-0.2-3.2
+		C15.2,410.5,13.9,410.6,12.7,410.6 M12.2,476.4c0.6,1.4,1.1,2.8,1.7,4.2c1.1-0.1,2.3-0.1,3.4-0.3c1.5-0.7,1.3-2.5,1.6-3.9
+		C16.6,476.4,14.4,476.4,12.2,476.4 M9.7,482.6c-0.1,0.6-0.2,1.8-0.3,2.4c-0.2,0.6-0.7,1.8-1,2.3c-1.2,0.5-2.5,1-3.7,1.5
+		c-0.1,0.9-0.1,1.8-0.2,2.6c1,0,2.1,0,3.1,0c1.9-2.9,3.8-5.8,5.3-9C11.8,482.5,10.7,482.6,9.7,482.6 M21,484.6
+		c-1.6,2-2.8,4.1-2.3,6.8c3.4,0.5,4.8-2.8,5.5-5.5c-0.7-0.4-1.5-0.7-2.2-1.1C21.8,484.8,21.2,484.7,21,484.6 M13.5,496.3
+		c0,1.8,0,3.6,0,5.4c2.1,0.1,3.5-1,4.6-2.7C17,497.3,15.6,496.1,13.5,496.3 M19.3,502.3c0,0.6,0.1,1.7,0.1,2.2c0.5,0,1.5,0,2,0
+		c0-0.5,0.1-1.6,0.2-2.2C21.1,502.3,19.9,502.3,19.3,502.3 M1717.9,516.7c-0.6,0-1.8,0-2.5-0.1c0,1.3,0,2.7,0,4
+		c0.4-0.1,1.3-0.4,1.7-0.6c0.7-2,1.1-4,0.7-6C1717.9,514.8,1717.9,516.1,1717.9,516.7 M23.6,519.6c-0.1,1.3-0.1,2.6-0.2,3.9
+		c1.4,0,2.8,0,4.2,0.1c0-1.4,0-2.8-0.1-4.2C26.3,519.5,25,519.5,23.6,519.6 M1721.6,519.5c0,1.3-0.1,2.7,0,4
+		c-0.5,0.1-1.6,0.2-2.2,0.3c0.9,0.8,1.8,1.7,2.8,2.5c2,0.8,3.9-0.5,5.7-1.3c-1.6-0.4-3.2-0.8-4.8-1.3c0.2-1.5,0.5-2.9,0.7-4.4
+		C1723.4,519.4,1722.2,519.5,1721.6,519.5 M1706.2,521.9c-0.3,2.4,1.1,3.9,3.5,4.2c-0.1-2-0.1-4-0.2-6
+		C1708.4,520.7,1707.3,521.3,1706.2,521.9 M21.7,543c2.2,1.5,4.5,3.3,7.2,1.8c-0.3-1.5-0.2-3.4-1.7-4.4
+		C25,540.3,23.3,541.8,21.7,543 M1.3,549.3c0,1.1,0,2.2,0.1,3.4c1.1,0,2.2,0,3.3,0c0-1.1,0.1-2.2,0.1-3.3
+		C3.6,549.3,2.5,549.3,1.3,549.3 M19.7,559.7c0.7-0.3,2.2-0.9,2.9-1.2c0.1-2.5-0.4-4.8-3.1-5.7C18.7,554.8,17.2,558.2,19.7,559.7
+		 M1703.9,555.2c0.3,0.5,0.9,1.5,1.2,2.1C1708.2,556.9,1705.2,552.2,1703.9,555.2 M1707.2,574.6c1,0,2-0.1,3-0.1
+		c0.3-1.1,0.7-2.1,1-3.2c1.6,0,3.2-0.1,4.9-0.1c-1.3-0.3-2.6-0.5-3.8-0.8c0-0.6-0.1-1.7-0.1-2.2
+		C1710,569.8,1707.1,571.3,1707.2,574.6 M1720,568.7c-0.6,0.6-1.2,1.2-1.8,1.8c1.8,0,3.6,0,5.4,0c0-0.6,0.1-1.7,0.2-2.3
+		C1722.5,568.3,1721.2,568.5,1720,568.7 M6.5,570.4c-1.6,1.5-3.4,3-3.3,5.4c2.5-0.2,5-0.5,6.7-2.5c-0.4-0.7-1.2-2.1-1.6-2.8
+		C7.8,570.5,6.9,570.4,6.5,570.4 M1728.5,575.3c0,2.1-0.1,4.3-1.2,6.2c1.2,0,2.5,0.1,3.7,0.2c0.5-2.5,0.6-5,0.6-7.6
+		C1730.8,574.4,1729.2,575,1728.5,575.3 M1708,577.7c0.8,0.8,1.6,1.5,2.4,2.3c0.1,0.8,0.3,1.6,0.5,2.4c0.7-1,1.7-1.4,2.9-1.2
+		c0.3,0.5,1,1.4,1.3,1.8c0.5,0.5,1.6,1.4,2.1,1.9c1.3-2,2.5-4.2,2.4-6.6c-1.6,0.5-3.2,1.2-4.7,1.8c-2.4,1.1-4.9,0.4-4.9-2.5
+		C1709.6,577.6,1708.5,577.7,1708,577.7 M1708.9,590.8c-1.1,2.6-2,5.4-0.4,8c0.5-0.1,1.5-0.4,2-0.5
+		C1710.6,595.7,1710.5,593,1708.9,590.8 M22.4,594.2c0,1.4,0,2.9,0.1,4.4c1.8,0,3.6,0,5.4,0C28.3,595,25.1,594.2,22.4,594.2
+		 M12.6,596.5c-0.1,1.3-0.1,2.7-0.2,4c1.1,0,2.1,0.1,3.2,0.1c-0.1-1.3-0.2-2.7-0.3-4C14.4,596.6,13.5,596.6,12.6,596.5 M10.4,604.6
+		c-1.1,1.1-2.1,2.3-3.2,3.4c1.5,0.5,2.9,1,4.3,1.5c0.1,2.8-0.5,5.9,1,8.4c-0.4,1.5-0.8,3-1.2,4.6c1.4,0,2.8,0.1,4.2,0.1
+		c0-1.2-0.1-2.4-0.1-3.6c-1.2-0.9-2.4-1.8-3.6-2.7c0.9-2,1.9-3.9,3.5-5.4c-1.4-1.9-2-4.1-2-6.4C12.4,604.5,11.4,604.5,10.4,604.6
+		 M1709.1,618.8c-0.6,2.4-3.1,2.9-5.1,3.6c0.6,0,1.8,0.1,2.4,0.1c0.8-0.7,1.6-1.5,2.4-2.2c1.2,0.1,2.5,0.2,3.8,0.4
+		c-0.1-0.5-0.1-1.6-0.2-2.2C1711.3,618.6,1710.2,618.7,1709.1,618.8 M1707.4,638.4c0,1.4,0,2.9,0,4.3c0.5,0.2,1.6,0.8,2.1,1
+		c0,0.7,0.1,2,0.1,2.6c0.9-0.1,1.7-0.1,2.6-0.2c0-0.7,0-2,0.1-2.7c0.3-0.2,1.1-0.5,1.4-0.7c-0.8-0.1-2.5-0.3-3.3-0.4
+		c0-1.3,0.1-2.6,0.1-4C1709.5,638.5,1708.5,638.4,1707.4,638.4 M1722.3,644.7c1.8-0.2,3.4-0.7,5-1.6c-1.6-1.1-3.2-2.1-4.7-3.1
+		C1722.4,641.6,1722.4,643.2,1722.3,644.7 M1725.7,644.8c1.2,1.7,3.2,1.9,5,2c0.3-1.3,0.7-2.5,1.1-3.8
+		C1729.8,643.5,1727.7,644.1,1725.7,644.8 M1723.3,656.3c-0.3,0.3-0.9,0.8-1.2,1c1.7,0,3.5,0,5.2,0c0-1.3,0-2.5,0.1-3.8
+		c0.7-0.1,2-0.3,2.7-0.3c0.2-0.5,0.5-1.4,0.6-1.9C1727.3,651,1724.5,653.2,1723.3,656.3 M1715.2,652c-0.9,3.2,1.8,4,4.3,4.7
+		C1720.7,653.5,1717.7,652.7,1715.2,652 M1707.5,663c-0.9,1.2,1.1,3.2,2.1,1.8C1710.4,663.6,1708.5,661.6,1707.5,663 M1720.3,667.7
+		c2.6,2.7,6.5,1.6,9.8,1.6c-0.2-0.4-0.7-1.3-0.9-1.7C1726.3,667.1,1723.3,667.3,1720.3,667.7 M1711.6,680.6
+		c-0.1,0.8-0.2,2.4-0.2,3.2c4.1,0.2,7.8-3.6,8.5-7.5C1716.7,676.9,1714.1,678.7,1711.6,680.6 M1704.4,678.4
+		c-0.1,1.2-0.2,2.3-0.3,3.5c1.9-0.8,4.7-0.9,5.1-3.5C1707.5,678.4,1705.9,678.4,1704.4,678.4 M1710.7,687.8c0.8,1.1,1.7,1.1,2.6,0.2
+		C1714.2,685.1,1709.1,684.6,1710.7,687.8 M1710.2,692.5c0.6,0.1,1.9,0.2,2.5,0.2c-0.1-1.2-0.1-2.5-0.1-3.7
+		C1709.8,688.5,1710.6,691.1,1710.2,692.5 M1714.5,692.5c-0.1,0.5-0.3,1.6-0.3,2.2c0.6,0,1.8-0.1,2.4-0.1c1.2-1.1,2.4-2.2,3.6-3.2
+		C1718.2,691.3,1716.3,691.6,1714.5,692.5 M1716.6,699.6c-0.1,0.5-0.2,1.5-0.3,2c1.1,0,2.3,0,3.5,0.1c0-0.6-0.1-1.7-0.1-2.3
+		C1718.6,699.4,1717.6,699.5,1716.6,699.6 M1705.3,701.2c0,1.2,0.1,2.4,0.1,3.7c0.9-0.2,1.8-0.5,2.7-0.7c0.3-1.3,0.5-2.6,0.7-3.9
+		C1707.6,700.5,1706.5,700.8,1705.3,701.2 M1722.1,700.4c0.1,1.9,0.9,3.6,2.2,4.9c0.1-1.6,0.1-3.3,0.2-4.9
+		C1724,700.4,1722.8,700.4,1722.1,700.4 M1710.3,702.2c0.1,0.6,0.2,1.7,0.2,2.2c1,0,2.1,0.1,3.2,0.1c0-0.6,0.1-1.7,0.1-2.2
+		C1712.6,702.3,1711.4,702.2,1710.3,702.2 M1719.2,709.7c-0.3,1.9-0.5,3.8-0.6,5.7c-0.9,0.6-1.9,1.2-2.8,1.8c2,0.2,4,0.4,6,0.6
+		c0-0.6-0.1-1.8-0.1-2.4c-0.7,0-2,0-2.7,0c0-1.7,1-3.3,2.4-4.1c2.4-0.8,3.4,1.8,4,3.5c-0.6,3.6-2.6,7.1-0.8,10.7
+		c0.5,0.1,1.5,0.1,2,0.2c-0.1-2-0.2-4-0.2-5.9c1.1-1.4,2.2-2.8,3.3-4.2c0.5-0.3,1.4-0.8,1.9-1.1c0-0.5,0.1-1.5,0.1-2
+		c-2-0.4-4-0.9-6-1.2c-0.5-1-1-2-1.4-2.9C1722.6,708.9,1720.9,709.4,1719.2,709.7 M1714.4,721.4c0.1,0.9,0.2,2.6,0.2,3.4
+		c0.7-0.1,2.2-0.2,3-0.3c0.8-1.1,1.6-2.1,2.5-3.1C1718.2,721.4,1716.3,721.4,1714.4,721.4 M1705.9,726.9c-1.2,1.1,0.4,3.5,1.9,2.5
+		C1709.1,728.3,1707.3,725.8,1705.9,726.9 M1718.7,727.7c-1.2,1-2.6,1.9-4.2,2.1c0,1,0,2.1,0,3.2c1.8-0.4,2.7-2.1,3.4-3.6
+		c0.7,0.1,2.2,0.3,2.9,0.4c0-0.6-0.1-1.8-0.2-2.5C1720.1,727.4,1719.2,727.6,1718.7,727.7 M1728.3,729.4c0.8-1.2,0.6-2.1-0.5-2.7
+		C1725.8,726.8,1726.4,730.8,1728.3,729.4 M1708.1,759.8c0.7,0,2.1-0.1,2.8-0.2c-0.3-2.3-0.6-4.6-2-6.6
+		C1708.1,755.2,1707.6,757.5,1708.1,759.8 M1712.1,805.4c-1.3,0.3-2.7,0.6-4,0.9c0.1,0.5,0.3,1.5,0.5,2c1.8,0,3.6,0,5.5,0.1
+		c-0.4,1.6-1.3,2.6-2.9,3.2c1,0.4,2.1,0.7,3.1,1.1c0-3.3,0.3-6.6,0.4-9.9C1713.7,803.6,1712.8,804.4,1712.1,805.4 M1704.1,814
+		c0.8,0.5,2.5,1.4,3.4,1.9c1.7-1.5,0.5-3.3-0.1-5C1705.8,811.5,1704.7,812.5,1704.1,814 M1716.4,813.5c0,0.5,0,1.5,0,2.1
+		c3.1,0,7.1,0.7,8.7-2.9C1722.2,812.2,1719.2,812.5,1716.4,813.5 M1725.2,821.1c0.9,0.5,2.6,1.6,3.4,2.1c0.8-1.9,0.8-3.9,1-5.8
+		C1726.8,816.5,1725.4,818.5,1725.2,821.1 M1717.9,820.3c-1.2,1.2-2.6,2.1-4.1,2.8c1.2,0.8,2.5,1.6,3.7,2.4c0,1-0.1,2.9-0.1,3.8
+		c-1,0.4-2.1,0.9-3.1,1.3c0,0.5,0.1,1.4,0.2,1.9c3.4,0.2,7.1,0.1,9.9-2.1c0.2-1.4,0.2-2.9,0.2-4.3c-1.6,0.8-3.3,1.3-5,1.6
+		c-0.2-1.1-0.3-2.1-0.4-3.1c1.3-0.5,2.7-0.9,4.1-1.5C1721.7,821.9,1720.1,820.4,1717.9,820.3 M1706.5,822.7c0,1.2,0,2.4,0,3.6
+		c-0.7,0.5-1.9,1.4-2.6,1.9c1.8,1.2,3.6,2.2,5.5,3.2c0-2.9,0.5-5.8,1-8.6C1710.8,820,1707.6,822.2,1706.5,822.7 M1696.6,828.2
+		c-2.5,0.1-2.2,2.4-2.1,4.1c1.5,0.1,3,0.3,4.6,0.5c-1-1-2.1-2-3-3c1.2-1.7,3.9-1.7,4.9,0.2c0.5,1.2,1.4,1.9,2.8,2
+		c-0.2-1.5,0.2-3.4-1.2-4.5c-1.5-1.2-0.9-3.2-1.1-4.8c-1,0-3-0.2-4-0.2C1697.4,824.4,1697.3,826.3,1696.6,828.2 M1660.2,826.5
+		c-1.7,0.9,0.1,3,1.4,1.9C1663.3,827.6,1661.4,825.4,1660.2,826.5 M1634.5,829.3c-0.3,0.8-1,2.3-1.3,3.1c1.6,1.3,3.7,1,5.5,0.4
+		c-0.1-1.1-0.1-2.2-0.1-3.3C1637.2,829.4,1635.8,829.3,1634.5,829.3 M1671.6,836.9c3,3.5,7.3,0.1,11,0.6c-0.1-1.4-0.1-2.8-0.1-4.2
+		C1678.8,834.5,1675,835,1671.6,836.9 M1705.5,833.4c0,1-0.1,3-0.1,4c1.1,0.5,2.2,1,3.3,1.6c0.5-1.8,0.8-3.8,1.1-5.7
+		C1708.3,833.3,1706.9,833.4,1705.5,833.4 M1636.3,838.1c1.2,0.8,2.5,1.7,3.7,2.5c1.2-0.4,2.4-0.8,3.6-1.2c0-1.1,0.1-2.1,0.1-3.1
+		c-2.4,0.3-4.9,0-7.2-0.8C1636.5,836.4,1636.4,837.2,1636.3,838.1 M1698.3,837.7c-1.7-0.1-3.3-0.2-4.9-0.3c0,0.5,0,1.6-0.1,2.2
+		c2.3,1,5,1.6,7.2-0.1c0.1-1.2,0.1-2.3,0.2-3.4C1699.9,836.5,1699.1,837.1,1698.3,837.7 M1676.7,840.6c0.8,1.9,2.2,3.4,3.8,4.8
+		c0.6,0,1.7,0,2.2,0c-0.9-1.6-1.7-3.3-2.5-4.9C1679.3,840.5,1677.6,840.6,1676.7,840.6 M1659.2,846.8c3.2-0.3,6.2-1.4,9-2.7
+		c-2.3-1.8-5.3-1.4-7.7-2.9C1660.1,843,1659.6,844.9,1659.2,846.8 M1673.4,845.4c1.2,1.3,2.3,2.8,3.2,4.3c0.5,0,1.5,0,2,0
+		c0.1-0.6,0.2-1.7,0.2-2.3c-0.8,0-2.4,0-3.2,0.1c0-2.3,0-4.6-0.2-7C1673.9,841.8,1673.3,843.5,1673.4,845.4 M1694.4,847.7
+		c0,0.5-0.1,1.6-0.2,2.1c1.1-0.1,2.2-0.2,3.3-0.3c0-1.2,0.1-2.3,0.2-3.4C1696.5,846.6,1695.4,847.2,1694.4,847.7z"/>
+	<path class="st2" d="M1408,0h5c0.5,1,1.7,2.3,3,1.6c-0.1,1.8-0.1,3.7-0.1,5.5c-0.3,0.2-0.8,0.7-1.1,0.9c-0.4,0.1-1.1,0.3-1.5,0.4
+		C1411.3,5.8,1409.9,2.7,1408,0z"/>
+	<path class="st2" d="M1406.5,10.6c3-1.2,6.2-2.8,9.3-0.9c0,0.6,0.1,1.9,0.1,2.6c-0.7,0.5-1.5,1-2.2,1.5c0.4,1.6,0.8,3.3,1.1,4.9
+		c-1.1-0.1-3.2-0.4-4.3-0.5c-1.3-1.5-2.5-3.2-4.2-4.3C1406.4,13.1,1406.5,11.5,1406.5,10.6z"/>
+	<path class="st2" d="M600,76.7c25.6,0,51.3,0,77,0c1.4,0,2.8,0.1,4.2,0.4c0.1,0.4,0.2,1.3,0.3,1.8c1.2,0.2,1.6-0.5,1.2-2.1
+		c18.7,0.1,37.4,0,56.2,0.1c-0.8,2.9-1.6,5.8-2.3,8.7c-0.3,0.4-0.9,1.1-1.3,1.4c0.4-0.1,1.3-0.4,1.8-0.5c0.7-3.2,1.4-6.5,2.8-9.5
+		c0.6,0.1,1.8,0.2,2.5,0.2c1.2,3.4,1.8,7,3.5,10.2c-0.6-3.5-1.8-6.9-2.7-10.4c29-0.6,58-0.1,87-0.2c7.3,0.2,14.7-0.4,22,0.4
+		c5.6-0.6,11.3-0.4,17-0.3c22-0.1,44,0,66,0c7.7,0.6,15.3-0.2,23-0.1c10.6,0.2,21.1-0.1,31.7,0.1c-0.8,3.6-1.8,7.2-3.1,10.7
+		c2.3-3.1,2.5-7.1,4.2-10.5c0.6,0,1.8,0.1,2.4,0.1c1.2,3.4,1.8,7,3.5,10.3c-0.6-3.5-2-6.9-2.8-10.4c19.7-0.5,39.4,0,59-0.2
+		c13.7,0.6,27.4-0.7,41.1,0.5c12.4-1,24.8-0.3,37.3-0.5c0.2,14,0.1,28.1,0.1,42.2c-5.2,0-10.4-0.1-15.6,0.1
+		c-1.2-3.7-2.5-7.4-3.8-11.2c3.4-2.5,6.8-4.9,10.4-7.1c0-1.2,0-2.4,0-3.6c-3.6,3.1-7.6,5.5-11.4,8.3c0.8,3.9,2.1,7.7,3.6,11.3
+		c-0.7,0.6-1.3,1.2-1.9,1.8c-3-2.5-5.8-5.6-9.5-7.2c-3.9,2.2-6.8,6.1-11.2,7.2c0.6-4.6,3.6-8.6,3.7-13.3c-3.1-3.1-7.1-5.1-10.5-7.9
+		c-0.9,0.1-1.8,0.1-2.6,0.2c0,0.4-0.1,1.3-0.1,1.7c3.5,3.3,7.6,5.6,11.5,8.4c-0.6,3.6-1.3,7.2-2.6,10.7c-0.4,0.1-1.2,0.4-1.6,0.5
+		l-1.5,0.1c0-1.4,0.1-2.7,0.2-4.1c0.3-0.3,1-0.8,1.3-1.1c-0.5-0.1-1.7-0.3-2.2-0.5c0.1,1.8,0.2,3.7,0.3,5.5
+		c-69.7-0.3-139.5-0.1-209.2,0c-1.6-3.8-3.2-7.7-3.5-11.9c3.3-1.5,6.5-3.4,9.4-5.7c0.1-1.4,0.2-2.8,0.4-4.2
+		c-3.5,3.2-7.7,5.5-11.3,8.5c0.8,4.5,2.6,8.7,4.3,12.9c-0.8,0-2.5-0.1-3.3-0.1c0-0.6-0.1-1.8-0.2-2.4c-3-1.1-5.4-3.6-8.4-4.7
+		c-3.8,1.1-6.3,4.7-9.6,6.7c-0.3-0.1-0.9-0.2-1.2-0.3c-0.1-0.3-0.2-0.8-0.3-1.1c1.3-3.8,3.1-7.5,2.8-11.6c-4.1-2.3-7.4-5.9-11.4-8.3
+		c0.1,1.3,0.3,2.5,0.6,3.8c3,2.6,6.6,4.4,9.9,6.6c-0.3,4.2-1.8,8.1-3.5,11.8c-17.8-0.4-35.5,0.1-53.3-0.1c-39-0.3-78,0.3-117-0.2
+		c-13.7,0.3-27.5-0.2-41.2,0.3c-1.3-3.7-2.9-7.3-3.5-11.1c3-2.9,6.8-4.8,10.3-7.1c0-1.2-0.1-2.5-0.1-3.7c-3.7,3.2-7.7,6-11.8,8.8
+		c0.9,4,3.9,7.9,3.1,12c-4.2-0.1-6.7-5-10.6-6.4c-3.6,2.2-6.7,5.1-10.3,7.4c-0.4-0.3-1.1-0.8-1.4-1c-1.9,0.5-3.8,0.9-5.7,1.1
+		c-3.9,0-7.9,0-11.8,0C600,104.8,600,90.7,600,76.7 M1085.5,81.3c-0.1,1.2-0.1,2.3-0.1,3.4c0.3,0,0.9,0,1.2,0c0-1.2,0-2.3,0-3.4
+		C1086.3,81.3,1085.7,81.3,1085.5,81.3 M721.7,87.2c-0.1,1.1-0.2,2.3-0.3,3.4c3.5,2.8,7.5,5.1,10.9,8.2c0.4-0.9,0.8-1.7,1.3-2.6
+		C729.6,93.2,725.2,90.8,721.7,87.2 M748.5,95.1c0.5,4.8,3.4,9.1,3.1,14c-3.5-2.7-7.4-4.8-10.7-7.8c-3.5,2.9-7.2,5.8-11.3,7.8
+		c-0.1-1.6-0.1-3.2-0.2-4.8c-0.8,2.6-1,5.3-0.9,8c1,0.1,1.9,0.1,2.9,0.2c3.2-2.8,6-7.3,10.8-7.3c2.9,2.3,5.8,4.6,8.3,7.2
+		c1.1,0,2.2,0.1,3.3,0.1c-0.8-5-2.9-9.7-3.8-14.7c3-2.3,6.2-4.4,9.4-6.3c0.2-1.4,0.2-2.9,0.4-4.3C756.8,90.7,752.7,93.2,748.5,95.1
+		 M972.3,90.6c3.5,2.4,7,4.8,10.5,7.2c-0.6,5-3.4,9.5-3.6,14.7c0.6,0,1.9-0.1,2.5-0.2c3.8-2.2,7-5.2,10.1-8.1c2.7,3,6.2,5,9.4,7.4
+		c1.1,0,2.3,0.1,3.5,0.1c-0.9-4.7-2.9-9.1-3.6-13.8c3.6-1.9,6.8-4.4,10.3-6.7c0-1.2-0.1-2.4-0.1-3.6c-0.4,0-1.1,0.1-1.4,0.1
+		c-3.5,3-7.4,5.4-10.5,8.9c1.2,4.3,2.6,8.4,4.5,12.5c-5.2-0.2-7.5-5.7-11.9-7.7c-3.5,2.7-7.1,5.1-11,7.1c0.7-4.1,2-8.1,3.4-12
+		c-3.7-3.3-8.4-5.3-11.6-9.1C972.6,88.3,972.5,89.4,972.3,90.6 M1049.4,88.4c0.3,1.4,0.6,2.8,0.9,4.3c0.5,0,1.6-0.2,2.2-0.2
+		c0-1.4-0.1-2.8-0.1-4.2C1051.4,88.4,1050.4,88.4,1049.4,88.4 M610.4,96.7c0,1.3,0,2.6,0.2,3.9c3.1,2.6,6.7,4.6,10,7.1
+		c0.1,0.7,0.2,2.1,0.3,2.8c0.3-1.7,0.6-3.4,0.9-5c-3.3-2.1-6.3-4.7-9.8-6.5C611.4,98.2,610.9,97.5,610.4,96.7z"/>
+	<path class="st2" d="M623.8,118.9c1.6-1.8,3.4-3.4,5.2-4.9c2.1,1.5,4.1,3.1,6,4.9C631.3,118.7,627.6,118.7,623.8,118.9z"/>
+	<path class="st2" d="M860.2,118.9c1.9-1.5,3.9-3,5.8-4.5c2,1.5,4.1,3,6,4.5C868,118.7,864.1,118.7,860.2,118.9z"/>
+	<path class="st2" d="M1097.9,118.9c1.6-1.8,3.3-3.4,5.1-4.9c2.2,1.4,4.3,2.9,6.1,4.9C1105.4,118.8,1101.7,118.8,1097.9,118.9z"/>
+	<path class="st2" d="M546,176.3c9.5-1.2,19-2.3,28.6-1.9c0,1.9,0,3.8,0,5.7c0.6,0.3,1.8,0.9,2.4,1.3c0.8,0.1,1.5,0.1,2.3,0.2
+		c0.5-0.4,1.4-1.4,1.8-1.8c-1.2-0.6-2.5-1.1-3.8-1.4c0-1.1,0-2.1,0-3.2c0.9,0.4,2.7,1.1,3.6,1.5c1.4-0.1,2.8-0.3,4.1-0.9
+		c5.8-0.1,11.5,1.6,17,3.1c17.1,5.2,33.6,14.1,44.9,28.2c2.9,3.5,7.3,5.4,9.6,9.3c5.8,8.2,11.9,16.9,14,26.9c1,1.7,2.2,3.3,2.8,5.2
+		c3.4,11.5,5.3,23.5,5.1,35.5c0.2,5.4-1.2,10.7-1.1,16.1c-2.9,4.2-7.1,7.1-11,10.3c-2.2,2.4-4.5,4.6-6.6,7.1c-2.3,3-6,4.2-8.7,6.8
+		c-3.4,3.2-6.2,7-9.6,10.3c0,0.7-0.1,2.2-0.1,3c-1.6,0-3.2,0-4.8,0c0.8,6.1-6.6,6.1-9.5,10c-0.6,0.1-1.8,0.2-2.4,0.3
+		c-0.1,1.9-0.2,3.8-0.2,5.7c2.8-1.4,5.2-3.3,7.2-5.6c3.8-4.2,8.6-7.4,12-12c2-2.4,3.3-5.3,5.3-7.8c3.9-2.7,8.2-4.7,12.3-7
+		c0-0.6-0.1-1.8-0.1-2.4c2-2.2,4.2-4.3,6.4-6.3c1.1,0,3.2-0.1,4.2-0.2c1.3,2.6,0.2,4.8-2.3,5.8c-0.1,0.8-0.1,1.6-0.2,2.4
+		c0.6,0,1.7-0.1,2.3-0.1c-0.1,1.9-0.2,3.8-0.2,5.7c-2.7,4.7-4.2,10-6.5,15c-0.4-0.5-1.1-1.6-1.5-2.1c0.9-1.6,1.9-3.2,2.8-4.9
+		c-1.8,0.4-3.7,0.8-5.5,1.2c-0.5,2.4-0.6,5.1-2,7.2c-2.1,1.8-4.6,3-7,4.4c-0.1,0.7-0.2,2.2-0.3,2.9c-1.8,1.8-3.5,3.6-5.2,5.6
+		c-1.4,0-2.8,0-4.1,0c-0.8,2.6-2.6,4.6-5.2,5.5c-1.2,1.9-2.2,4-2.8,6.2c4.2-3,7.2-7.2,11.6-10c1.5,0.1,3,0.2,4.4,0.2
+		c1.9-3.2,3.8-6.4,5.7-9.6c2.7-2,5-4.5,7.8-6.4c-0.1,0.6-0.2,1.9-0.3,2.6c-12.4,21-32.5,37.6-55.9,44.8c-0.5,0.3-1.5,0.9-2,1.2
+		c-0.6-1.8-1-3.7-1.2-5.6c0.8,0,2.5-0.1,3.3-0.1c-0.1-0.8-0.2-2.3-0.3-3c5.7-1.6,9.2-6.5,14-9.5c0.5-1.7,1-3.4,1.6-5.1
+		c3.2-2.2,6.2-4.7,9-7.4c0.7,0,2.1,0.1,2.8,0.2c-0.1-1.7-0.1-3.4-0.1-5.1c-0.5,0-1.4,0.1-1.9,0.1c-2,2.4-4,4.8-6.1,7.1
+		c-1.2-0.1-2.3-0.1-3.5-0.2c-0.4,3.2-2.4,5.6-4.8,7.5c-0.7,1.4-0.8,3.2-2.1,4.1c-2.3,1-4.8,1.3-7.2,1.7c-0.5,1.8-0.9,3.6-1.4,5.4
+		c-3.4,4.5-8,7.8-12.3,11.3c0.9,0.1,2.8,0.3,3.8,0.4c-6.7,1-13.1,3.2-19.9,3.7c-7.9,1.4-16,0.6-23.9,0.8c-5.3,0.1-10.6-0.5-15.7-1.9
+		c-5.8-1.6-11.8-2.5-17.5-4.5c0.7-1.6,1.5-3.3,2.4-4.8c0.1-0.5,0.3-1.5,0.4-2c-1.5,0.5-3,1.1-4.5,1.6c-0.5,1.3-0.9,2.6-1.5,3.9
+		c-7.4-3.5-14.9-7-21.7-11.7c-9.6-6.3-17.6-14.8-24.9-23.5c1.5-0.5,3-1.1,4.6-1.6c0-0.9,0-1.7,0-2.6c-0.7-0.7-1.4-1.4-2-2.1
+		c-1.1,1.6-2.3,3.4-4.5,3.7c-4.1-7.1-8.4-14.2-11.2-22c-5.5-13.9-7.5-29-7.1-43.9c0.2-0.7,0.7-2,0.9-2.7c0.8,0,2.3-0.1,3.1-0.1
+		c1.9-2.4,3.8-4.8,5.8-7.1c0.7,0,2.2,0.1,2.9,0.1c0-1.6,0-3.1,0-4.6c0.5-0.3,1.5-1,2-1.3c0-0.9-0.1-1.9-0.1-2.8
+		c-0.9-0.9-1.8-1.7-2.7-2.6c0,1.1-0.1,2.2-0.1,3.3c-4,3.5-6.4,9.2-11.8,10.7c0.9-9.2,1.7-18.5,4.8-27.4c1.2-4.5,4.4-8,5.7-12.4
+		c0.8-2.7,2-5.2,3.5-7.5c2.8-4.2,4.1-9.5,8.3-12.7c3.6-2.8,5.4-7.1,8.4-10.4c7.1-6.7,14.7-13.1,23.6-17.2
+		C518.2,182.6,532.2,179.1,546,176.3 M588.6,181.8c0,0.9-0.1,1.8-0.1,2.6c2.3,0,4.7,0,7,0.1c0.6-0.6,1.2-1.2,1.9-1.9
+		c0.1-0.6,0.2-1.7,0.3-2.2C594.6,180.3,591.5,180.6,588.6,181.8 M543.5,183.4c0.4,3.1,0.1,6.4-2.9,8c0,1.7-0.1,3.4-0.1,5
+		c-3,0.5-5.8,1.8-8.1,3.7c-8,4.9-13.9,12.4-19.5,19.8c-2.4,3.3-5,6.4-6.8,10.1c-0.7,1.7-1.5,3.3-2.2,4.9c-7.4,20.1-11.2,41.7-8.5,63
+		c1.3,13,3.9,26.2,9.8,37.9c0.3,2.1,1.2,4,2.1,5.8c4.3,7.7,9.9,14.7,16,21c2.1,3.1,5.6,4.7,8.4,7.1c-1.4,2.5,0,7.6-4.2,6.9
+		c0.1,1.5,0.1,3,0.2,4.5c1.7-3.5,4.1-6.6,7.1-9.1c9.2,4.4,18.9,8.6,29.2,8.5c2.3,0,4.6,0.9,6.9,1c3.3-1,6.5-2.1,9.9-2.5
+		c0.4,1.8,0.7,3.6,1.1,5.4c0.1,0,0.3,0,0.4,0c-0.3-2-0.4-4.1-0.5-6.1c10.3-1.4,18.3-8.7,27.3-13.3c1.6-1.5,2.1-3.9,3.5-5.5
+		c6-7.1,11.6-14.8,15-23.6l-0.3-0.5c1.4-3.1,2.7-6.2,4.1-9.3c0-0.6,0.2-1.8,0.2-2.5c2.4-0.9,4.6-2.3,7.1-2.6c0,2.1,0,4.2,0,6.4
+		c-1.5,2.4-3.7,3.6-6.5,3.1c-0.1,2.5,1.7,4.1,4,4.3c0.9-4,2.7-8.8,7.3-9.7c0-1.1,0-2.2-0.1-3.3c0.5-0.7,1-1.4,1.5-2.1
+		c-1.6,0-3-0.5-4.3-1.4c0.8-0.9,1.7-1.8,2.5-2.8c-2.3-0.1-4.6-0.1-6.8,0c-1.1,1.4-2.3,2.6-3.8,3.5c1.8-7.2,2.3-14.6,3.2-22
+		c0.3-2.3,1-4.6,0.8-7c-1-8.3-0.4-16.7-1.9-25c-0.7-7.6-3.1-15-5.4-22.2c-2.7-7-4.8-14.5-9.7-20.4c-8.3-12.6-20.2-23.2-34.7-28
+		c-3.8-1.5-8.1-1.9-11.6-4.1c-0.5,0.2-1.4,0.6-1.9,0.9c-6.7,0-13.4,0.2-20.2,0.3c-1.3,1.4-3.1,1.9-4.9,2.3l-1.3,1.2
+		c-0.2-1.2-0.3-2.5-0.5-3.8c0.6,0,1.7,0,2.3,0.1c0-2.7-0.1-5.4-1.1-8C545,183.4,544,183.4,543.5,183.4 M489.6,222.8
+		c0,0.9-0.1,1.8-0.1,2.7c2.9,0,5.7-0.1,8.5,0c-2.6-0.7-4.4-2.4-3.8-5.2C493.4,222,491.7,223,489.6,222.8 M476.5,252.4
+		c0,1.6,0,3.3,0,4.9c2.9-0.6,3.7,2.4,4.2,4.5c-0.8,1.1-1.2,2.3-1.5,3.6c0.6,0,1.8,0,2.4-0.1c0.9-0.9,1.9-1.9,2.8-2.8
+		c0-1.7,0.1-3.4,0.1-5.2c-1.3,0.1-2.6,0.1-3.8,0.2c-0.8-0.8-1.6-1.5-2.3-2.3c0.1-0.7,0.2-2.2,0.3-2.9
+		C478.1,252.4,477,252.4,476.5,252.4 M649.6,304.5c0,0.5-0.1,1.4-0.1,1.9c1.3,0,2.7,0,4,0c0-0.7,0-2.1,0-2.8c1.1-0.5,2.3-1,3.4-1.6
+		c0.8-1.8,1.9-3.4,3.1-4.9C656.3,299.2,652.5,301.3,649.6,304.5 M662.4,322.5c0.1,1.2,0.2,2.4,0.2,3.7c-3.5,1.6-5.5,5-7.4,8.1
+		c-0.6,0.2-1.6,0.7-2.2,0.9c-2.5,0.6-4.3,2.6-4.8,5.1c-0.5,0.3-1.6,0.9-2.1,1.2c-0.5,0-1.5,0-2.1,0.1c-0.8,0.8-1.6,1.7-2.4,2.5
+		c-0.1,0.4-0.4,1.1-0.5,1.4c1.7,0.1,3.7-0.2,5.1,1c0.1-0.4,0.2-1.3,0.3-1.7c2.8-2.7,5.9-5.1,8.5-8c1.4-0.5,2.7-1,4.1-1.5
+		c0.9-1,2-1.9,3.5-1.9c0-1.9-0.3-3.8,0.1-5.7c1.3-0.1,2.7-0.2,4.1-0.2c-0.1-0.4-0.2-1.1-0.3-1.5c0.9-1,1.1-2.3,1.4-3.5
+		C666,322.5,664.2,322.5,662.4,322.5 M516.4,369.6c-0.6,0.7-1.2,1.3-1.8,2c2.7,1.7,2,4.8,2,7.5c-1,0.7-2,1.5-3,2.2
+		c0,0.6-0.1,1.7-0.1,2.2c1-0.1,2-0.1,2.9-0.2c0.1-0.6,0.2-1.8,0.2-2.4c2.4-1.9,2.6-5.2,3.8-7.9c-1-1-2-2.1-2.3-3.6
+		C517.7,369.5,516.8,369.6,516.4,369.6 M540.6,382.4c0,1.7-0.1,3.4-0.1,5.1c1.2-0.1,2.5-0.1,3.8-0.2c0.2-1.6-0.3-3.5,1.3-4.5
+		c-0.9-0.8-1.8-1.6-2.7-2.4C542.1,381.1,541.3,381.8,540.6,382.4z"/>
+	<path class="st2" d="M694.2,179.4c7.9,0.3,15.8,1.5,23.8,1.4c16-0.3,32,0.4,47.9-1c11-0.3,22.1-0.4,33.1-0.3
+		c7.8,0.1,15.6,1.6,22.8,4.5c7.9,2.2,13.9,8,19.2,14c1.5,2.2,2.6,4.7,4.1,6.9c2.8,4,3.9,8.8,5.4,13.4c0.2,0.7,0.6,2,0.8,2.6
+		c0.3,4.4,1.6,9.3-1.2,13.1c-1.8,2.7-2.7,5.9-4.2,8.8c-1.9,2.6-4,5.1-5.6,7.9c-0.6,0-1.9,0-2.6,0c0.1,3.7-1,7.1-3,10.2
+		c-1.5-0.1-2.9-0.2-4.3-0.4c0.1,2.7,0.2,5.5,0.4,8.2c-1,0-1.9-0.1-2.8-0.1c-0.8,2-1.7,4.1-2.5,6.1c-1.4-0.1-2.7-0.2-4-0.3
+		c0,1.2,0.1,2.3,0.2,3.5c2.3-1.5,4.9-2.6,7.8-2.7c0.2,1.5,0.6,2.9,0.9,4.4c0.1-2,0.2-4.1,0.3-6.1c1.6-0.8,3.1-1.6,4.7-2.4
+		c0.5-3.2,2.2-5.8,4.5-8c-1.4-0.7-2.7-1.5-4.1-2.2c1.6-0.6,3.2-1.2,4.8-1.8c1.7-3,3.3-5.9,5.1-8.8c0.7,0.1,2.2,0.2,2.9,0.3
+		c0-2.7,0-5.9,3-7.1c0.1,1.1,0.2,3.1,0.2,4.2c-2.1,10.8-5.9,22.1-14.4,29.6c-2,3-4.2,5.8-6.9,8.2l-1.9,0.4c0-1.8,0.1-3.6,0.1-5.3
+		c-1.7-0.5-3.4-1-5.1-1.4c0.1,2.3,0.1,4.6,0.2,7c-2.1,0.2-4.2,0.4-6.3,0.5c-0.6,2.2-0.8,4.6-2.2,6.5c-2.7,2.3-6.2,3.5-8.5,6.3
+		c-10.3,3.9-21.4,5.8-32.4,4.7c-0.1-4.1-0.2-8.2-0.2-12.3c3.4-0.6,6.8-1.3,10.3-1.6c8.7-3.5,16.8-9.2,21.6-17.5
+		c3.9-7.1,5.8-15.3,5.7-23.4c1.2,0,2.4,0,3.6-0.1c0-2.3,0.1-4.7,0.2-7c-1,0.2-2.1,0.4-3.1,0.6c0-2.7,0-5.4,0.1-8.1
+		c2.8,0.5,4,2.9,5,5.3c1.3-2.9,0-6.1-0.4-9.1c-0.6,0.5-1.2,1.1-1.8,1.6c-1.2,0-2.4,0-3.7,0c-0.6-11.5-5.6-23.4-15.2-30.2
+		c-11.2-7.8-25.7-8.6-38.8-6.8c0.3,10.8-0.5,21.7,0,32.5l-1.1-1.3c-0.2-2.1-0.2-4.3-0.2-6.4c-0.4,1.9-0.7,3.8-1.1,5.7
+		c-4.4,3.4-8.3,8.5-14.4,8.6c-1.5,3.9-3.8,7.4-4.8,11.4c1.1-1.6,2.2-3.2,3.3-4.8c1.9,0,3.8,0,5.8,0c0.8,0.4,1.6,0.9,2.4,1.3
+		c-0.6-2.4-1.1-4.8-1.6-7.2c3.5-2.9,7.7-4.7,11.6-6.9c-0.1,4.9,0.9,10.4-2.2,14.6c-3.2,6-7.2,13.7-15.1,13.7c0-1,0.1-3.1,0.1-4.1
+		c0.4-0.9,0.9-1.9,1.3-2.8c-1.8,1.4-3.5,2.9-5.2,4.4c1.3,3.2,0.6,6.6,0,9.8c-1.1,1.4-2.2,2.8-3.3,4.2c1.8,0,3.6,0,5.4,0
+		c-0.1-2.5-0.1-4.9-0.1-7.4c1.6,0.4,3.2,0.9,4.8,1.4c3.3-3.2,7-6,10.9-8.4c0.4-2,0.8-4,1.3-5.9c0.6,0.1,1.8,0.3,2.4,0.4
+		c-0.4,30.5,0,61-0.2,91.6c0,6.5-0.2,13.1,0.8,19.6c0.1,1.7,0.1,3.4,0.1,5.1c-0.5-0.1-1.6-0.2-2.1-0.3c0.1,3,0.1,6,0.2,8.9
+		c-1,1.1-2.1,2.1-3.1,3.2c0,0.8,0.1,2.2,0.2,3c-0.8,0.7-1.5,1.4-2.2,2.1c-1.6,0-3.3,0-4.9,0c-1.6,2.1-3.1,4.3-5.1,6
+		c-1.5,0.1-3.1,0-4.6,0c-0.1,1.4-0.9,2.1-2.1,2.2c-10.4-0.6-20.7,0.9-31,0.5c-3.3,0.6-6.7,1-10.1,1.2c1-4,0-8-0.1-11.9
+		c6.6-0.4,14.5,0.6,19.5-4.8c4.4-5.5,4.7-12.8,5.2-19.5c0.8-17.8,0-35.6,0.4-53.4c0-1.9,0.6-3.7,1.8-5.2c3-3.7,6.6-6.9,10-10.2
+		c0.1-0.5,0.2-1.6,0.2-2.1c-1.2,0-2.5,0.1-3.7,0.2c-0.8,1.7-1.6,3.3-2.4,5c-1.9,0-3.7,0-5.6,0.1c-0.1-2.2-0.5-4.4-0.1-6.6
+		c1.4-1.4,3.1-2.5,4.8-3.7c0.6,0,1.7,0,2.2,0c1.9-3.3,4.4-6.3,7.1-9c-1.5,0.1-3,0.2-4.5,0.3c-0.8,1-1.6,1.9-2.4,2.9
+		c-0.5,0.1-1.4,0.3-1.9,0.4c-0.9,2.5-2.8,4.1-5.5,4.3c0.3-5.2-0.8-10.7,0.9-15.7c1.5-4,6.1-5.4,10.1-5.2c-0.1-1.2-0.1-2.3-0.2-3.5
+		c1.6-2.5,3.5-4.9,5.6-7.1c-3.1,2.2-6.2,4.6-8.8,7.4c-2.4,2.3-4.5,5.3-8,6c0.6-7,0.2-14,0.3-21c-0.1-11.8,0.7-23.8-1.7-35.4
+		c-0.9-4.6-3.9-8.3-7.5-11.1c-5.1-1.2-10.3-1.2-15.5-1.2C693.8,187.3,693.2,183.3,694.2,179.4 M830,202.4c-1.6,2.1-4.1,2.3-6.6,2.1
+		c0,0.5,0.1,1.4,0.1,1.9c1.4,1.5,2.9,3,4.4,4.4c-0.9,2.6-2.3,5-3.6,7.4c-0.8,1.5-1.7,3-2.7,4.3c-0.1,1.7-0.2,3.4-0.2,5.1
+		c1-0.1,2.1-0.1,3.1-0.1c0-2.3,0-4.5-0.1-6.8c1.4-2,2.7-4.2,4.5-6c1.7-0.3,3.4-0.3,5.1-0.4c-1.6-2-3.4-3.7-5.4-5.2
+		c-0.1-1.6-0.2-3.1-0.2-4.6c2.3,0,4.6,0,7,0C833.7,203.3,831.9,202.4,830,202.4 M836.4,205.5c0,1,0.1,2,0.2,3c1.7,0,3.3,0,5,0.1
+		c0-1.1,0-2.1,0.1-3.2C839.9,205.4,838.1,205.4,836.4,205.5 M830.6,224.7c0,1,0,2.1,0,3.1c1.1-0.4,2.3-0.7,3.4-1.2
+		c1.1-0.1,2.2-0.1,3.4-0.2c0.1-1,0.2-1.9,0.3-2.9C835.2,223.5,832.8,223.7,830.6,224.7 M804.3,281.5c-0.6,1-1.2,2.1-1.8,3.1
+		c-1.6-0.1-3.3-0.1-4.9-0.1c0,1.3-0.1,2.7-0.1,4c0.9-0.1,1.9-0.1,2.8-0.2c1.3-2.8,4.1-4.3,7.2-4c0-1,0-1.9,0-2.9
+		C806.4,281.5,805.4,281.5,804.3,281.5 M704,382.1c0.8,1.3,1.4,2.7,1.9,4.2c1.5,0.5,3.1,1,4.7,1.4c-0.1-1-0.1-2-0.2-2.9
+		C707.8,384.8,705.4,384.4,704,382.1z"/>
+	<path class="st2" d="M1098.7,180.2c3.4-0.4,6.8-0.8,10.2-0.3c2.4,1.6,4.1,4.1,6.2,6.1c1.6,1.9,4.2,3.6,3.6,6.5
+		c-3.4,2.2-7.7,0.9-11.4,1.1c0,0.2,0,0.5,0,0.7c0.9,0.4,1.9,0.7,2.9,0.9c2.6-1.5,5.9-1,7.9,1.4c1.3-0.8,2.6-1.7,4-2.5
+		c0.9,1.3,1.9,2.7,2.9,4.1c-1.1,2-2.3,3.8-3.6,5.7c0.6-0.1,1.6-0.3,2.2-0.4c1.3-1.2,2.8-2.1,4.7-2.1c3.4,3.7,5.3,8.4,8.8,12
+		c4.9,5.8,9.7,11.6,14.8,17.2c6.2,5.2,10.8,11.9,16.1,17.8c6,7.4,12.7,14.2,18,22c8.4,8,15.3,17.4,22.8,26.4
+		c6.1,6.2,11.7,12.9,16.8,20c1.3,3.2,3.8,5.6,6.1,8.2c1.8,2.7,4.1,5.1,6.9,6.7c-0.4-11.8-0.9-23.6-1.1-35.4c-0.8-6-0.6-12-0.7-18
+		c3.9,0.5,5.3,4.3,6.4,7.5c0.9,0,1.7,0,2.6,0.1c-0.1-1.5-0.1-2.9-0.2-4.4c0.5-0.3,1.4-0.9,1.9-1.2c-2.9-0.2-5.5-1.6-6.3-4.5
+		c-0.6,0.1-1.8,0.2-2.4,0.2c-0.7-1.2-1.3-2.4-2-3.7c-0.5-5,1-9.9,0.7-14.9c-1.2-6.6-0.6-13.3-0.7-20c0-4-0.4-8.1,0.4-12
+		c1-3.9-0.7-7.8-1-11.7c-0.6-6.5-2.8-13.1-7.4-17.8c-4.9-3.5-11.2-4.1-17.1-4.1c0-1.9,0-3.7,0.1-5.6c0-2.2,0-4.3-0.1-6.5
+		c3.1,0.7,6.3,1.5,9.5,1.4c19.6-0.3,39.2,0.6,58.7-1.3c1.3,3.5,0.4,7.2-0.4,10.6c-1-1.1-1.9-2.1-2.9-3.2c-1.9-0.1-3.6-0.9-5-2.2
+		c-2.3-0.1-4.5-0.1-6.8-0.1c0,1.3,0.1,2.6,0.2,3.9c-0.5,0.2-1.6,0.7-2.2,0.9c0,0.6-0.1,1.7-0.2,2.2c0.6-0.1,1.9-0.3,2.6-0.4
+		c-0.2,0.7-0.5,2.2-0.7,3c-5,4.4-7.1,11.2-6.7,17.7c0.3,4.4-1.1,8.7-0.6,13c0.8,8.2-0.9,16.5,0,24.7c-1.1,0-2.3,0.1-3.4,0.1
+		c-0.7-1.4-1.2-2.8-2-4.1c-1.1,0.7-2.1,1.4-3.1,2.1c0,0.3,0.1,1,0.2,1.3c2.6,1,6.5,1,7.3,4.2c1.1,3-0.6,6-1.6,8.7
+		c1.9,2,2.4,4.7,2.1,7.3c-0.6,6.7-0.2,13.4-0.4,20.1c-0.9,0-2.6,0.1-3.4,0.2c-0.4-0.2-1.1-0.8-1.5-1c-2.7,2.1-6.1,2.1-9.3,2
+		c0,0.2,0.1,0.6,0.1,0.8c4.6,0.4,11.2-1.8,13.8,3.4c-0.3,4.3-0.2,8.5,0.2,12.8c-2.7,0-5.3,0-7.9,0c1.4,2.4,2.7,4.8,3.6,7.5
+		c1.3-0.4,2.7-0.8,4.1-1.2c-0.7,7-0.3,14.1-0.6,21.2c-0.2,4.7-0.8,9.3-0.8,14c0,3.3,1.1,6.6,0.8,10c-0.4,3.2-0.9,6.5-0.7,9.8
+		c1.8,3.6,0.2,7.5,0,11.2c-0.3,4.6,0.1,9.1,0.1,13.7c-5.2-0.1-10.4-0.2-15.4-1.2c-6.9-6.8-11.5-15.5-17.8-22.8
+		c-4.5-6.2-10.3-11.2-15-17.2c-4.1-4.3-7.3-9.2-11-13.8c-7.3-7.1-13.7-15.1-20.1-23c-5.6-5.5-9.6-12.4-15.3-17.7
+		c-4.4-4-7.2-9.3-11.5-13.4c-8-8-14.8-17.2-22.2-25.7c-5.9-6.8-12.2-13.3-17-21c-5.5-7.1-11.4-13.9-17-20.9c0,8.4,0.2,16.8,1.3,25.1
+		c0.1,10,1,19.9,1,29.9c0.3,15.9,0,31.8,0.3,47.7c-2.3,2.2-0.3,5.2-0.2,7.9c-1.9,1.2-2.6-1.1-3.8-1.9c-1.7,1.1-3.5,2.3-5.2,3.4
+		c0,0.8,0,1.6,0,2.5c1.3,1.1,2.6,2.3,3.9,3.4c0,0.9,0.1,1.9,0.2,2.8c1.8-1.2,3.8-2.1,5.9-2.8c-0.1,8.1,0.4,16.2,0.9,24.2
+		c0.4,5.6,1.5,11.5,5.6,15.7c4.8,4.1,11.5,3.8,17.4,4.7c-0.1,3.5-0.2,6.9-0.2,10.4c-0.6-0.1-1.8-0.4-2.4-0.5
+		c-0.4,0.4-1.1,1.1-1.5,1.5c-11.8-0.8-23.6-0.4-35.3-1c-10.2,1-20.4,0.1-30.5,1.5c-0.1-4-0.1-7.9-0.1-11.9c0.7,0,2-0.1,2.7-0.2
+		c5.2-0.2,10.3-1.4,15.2-2.9c0.5-0.9,1.1-1.8,1.6-2.6c5.8-8.5,4-19.2,4.8-28.8c0.9-8,0.3-16,0.6-24c-0.2-30-0.1-60,0.1-90
+		c0.3-8-0.4-16-1.3-23.9c-0.6-4.9-2.9-9.5-6.4-12.9c-5.3-2.7-11.4-2.8-17.3-2.9c-0.1-3.6,0.1-7.3,1.1-10.8c1.5-0.3,2.9-0.7,4.5-0.8
+		c9.1,1.3,18.3,0.9,27.5,0.9c0,1,0.1,2,0.2,3c-0.5,0-1.6-0.1-2.1-0.1c0,0.5-0.1,1.5-0.1,2c1.6-0.1,3.1-0.1,4.7-0.1
+		c0.4-1.3,0.9-2.6,1.4-3.9C1090.5,180.1,1094.7,180.7,1098.7,180.2 M1101.6,183.1c0,0.8,0,2.4-0.1,3.2c-0.9,0.7-1.8,1.3-2.7,2
+		c1.5,0.1,3.1,0.2,4.6,0.3c0.7-0.6,1.5-1.2,2.2-1.8C1104.3,185.5,1103,184.2,1101.6,183.1 M1231.9,186.8c-0.3,0.9-0.6,1.7-0.8,2.6
+		c2.7,1.1,5.6,1.2,8.5,1.2c0-1.1,0-2.3,0-3.4c-0.5,0.1-1.5,0.3-2,0.4l-0.2-1.3C1235.6,186.5,1233.7,186.4,1231.9,186.8
+		 M1084.6,193.9c0,2-0.1,3.9-0.1,5.9c0.8-0.3,1.6-0.7,2.4-1c1-0.4,2-0.8,3-1.2c1.4-0.1,2.8-0.1,4.2-0.2c-1-0.3-1.9-0.6-2.9-1
+		c-0.4-1.2-0.8-2.5-1.1-3.8c-1.2-0.1-2.7,0.2-3.2-1.2C1086.2,192.3,1085.4,193.1,1084.6,193.9 M1235.3,199.5
+		c0.1,0.4,0.3,1.2,0.4,1.6c2.5,0.7,5,1.3,7.6,1.4c0-1,0-1.9,0.1-2.9C1240.7,199.6,1238,199.6,1235.3,199.5 M1156.2,245.3
+		c0.4,0.9,0.8,1.8,1.2,2.7c0,0.6,0.1,1.9,0.1,2.5c1,0,1.9,0,2.9-0.1c0-1.2,0-2.4,0-3.6C1159,246.4,1157.6,245.8,1156.2,245.3
+		 M1186.7,279.3c-0.3,1.4,0.6,3.8-1.4,4.2c-1.6,0.6-3.3,0.9-4.9,1.2c0.1,0.4,0.2,1.2,0.3,1.6c1.6,0.2,3.6-0.2,4.6,1.4
+		c0.1-1.3,0.1-2.6,0.2-3.9c2-0.5,4-1,6-1.5c0-0.4-0.1-1.2-0.1-1.7C1189.8,280.1,1188.3,279.6,1186.7,279.3 M1084.2,293.6
+		c-1.5,0-3,0-4.5,0c-1,0.8-2,1.6-3,2.4c-0.2,1-0.3,1.9-0.5,2.9c1.2-0.5,2.4-1,3.6-1.5c2.1,0,4.3,0,6.5,0c0.7-2.1,1.1-4.3,1.3-6.5
+		C1086.5,291.8,1085.3,292.7,1084.2,293.6 M1180.8,296.5c-0.6,1-1.1,2-1.6,3c2.1,0,4.2-0.1,6.3-0.1c0-0.9,0-1.9,0-2.8
+		C1183.9,296.6,1182.3,296.5,1180.8,296.5 M1205.3,345.5c0.1,0.9,0.2,1.7,0.3,2.6c0.4,0.3,1.3,1,1.7,1.3c0.5,0,1.5,0.1,2,0.2
+		c0.5-1.4,0.9-2.7,1.4-4C1209,345.5,1207.2,345.5,1205.3,345.5 M1242.2,379.5c-1.7-0.2-3.2-0.8-4.7-1.3c0,1.6,0.1,3.1,0.2,4.7
+		c0.8,1.1,1.6,2.2,2.3,3.4c1.2,0,2.3,0.1,3.5,0.2c-0.1-2.3-0.1-4.7,0-7.1c0.8,0,2.3,0,3,0c0-0.6,0-1.8,0-2.4
+		C1244.9,377.6,1243.5,378.5,1242.2,379.5z"/>
+	<path class="st2" d="M863.5,185.5c0-2.1,0.1-4.1,0.2-6.1c5.7,1.7,11.9-0.2,17.4,2c4.4,0.3,8.8-0.5,13.2,0.4c-1.5,0.4-2.9,1-4.2,1.7
+		c-0.6,0-1.9,0-2.5-0.1c0,1.8,0,3.5,0,5.2c0.5-0.1,1.5-0.1,2-0.2c0-0.7,0-2,0-2.7c0.5-0.3,1.6-0.9,2.2-1.3c2.4,0,5,0.2,7.3-0.5
+		c3.2-2.2,7.1-3.8,11-3c4.3,0.9,8.7-0.4,13-0.3c11,0.1,21.9-0.2,32.9,0.1c1.6,1.1,3.5,1,5.1-0.1c10.6-0.6,21.3,0.3,31.9-0.7
+		c7.9-0.4,15.7-0.3,23.6-0.5c0.1,4.1-0.2,8.2,0.8,12.2c0.3,4.9,0.3,9.9,1.1,14.8c-1.2,0.1-2.4,0.2-3.5,0.3c-1.5,2-3.1,4-4.6,5.9
+		c-1.4-0.1-2.8-0.1-4.2-0.2c0.1,0.5,0.4,1.4,0.5,1.9c0.6,0,1.9,0.1,2.5,0.2c1.2,1.4,2.4,2.9,3.6,4.3c-0.6,4.2-1.4,8.4-1.4,12.6
+		c-1.4,0-2.7,0-4.1,0c-2.1-8.8-3.2-18.4-9-25.7c-4.7-6.4-12.8-8.8-20.3-9.8c-12.9-2.3-26-1.3-38.9-1.6c-3.7-0.3-7.2,0.9-10.6,2.3
+		c-1.8,6-0.6,12.2-1.3,18.3c-0.6,4.5,0.2,9,0.3,13.5c-0.7,0-2.1,0-2.8,0c-0.4-2.1-0.9-4.2-1.3-6.2c-0.4,0.1-1.2,0.4-1.5,0.5
+		c-1.7,1.6-3.4,3.1-5.1,4.6c0,1.8,0,3.5,0,5.3c-1.5-0.1-3.1-0.1-4.6-0.2c-0.8-0.7-1.6-1.4-2.3-2.2c-0.3-1.7-0.8-3.4-2.2-4.5
+		c-0.4,0.4-0.9,0.9-1.3,1.4c0.6,1.2,1.2,2.4,1.8,3.6c1.1,0.4,2.1,0.8,3.2,1.3c0.5,1.9,0.3,3.9,0.3,5.9c-3.1,3.2-0.5,7.5-0.7,11.4
+		c-1.1,0.6-2.2,1.2-3.3,1.9c0,1,0.1,2.1,0.1,3.1c2.5,0,5,0,7.5,0c1.4-1.6,2.9-3.1,4-4.9c0.5-3.2,0.2-6.5,0.2-9.7
+		c1.4-1.2,2.9-2.4,4.3-3.6c0.9,0.1,1.8,0.2,2.8,0.3c0.2,0.4,0.7,1.2,0.9,1.6c-0.1,11.8,0.1,23.5-0.4,35.3c1.9,0.2,3.9,0.2,5.8,0.2
+		c13.7-0.4,27.5,0.6,41.2-1.2c4.2-0.5,8.4-1.9,12-4.3c3-3.2,4.4-7.5,4.9-11.8c0.5-2.8,0.6-5.7,0.8-8.6c3.5,0,6.9,0,10.4,0
+		c0.6,0,1.8,0,2.4,0c0,0.6-0.1,1.8-0.2,2.3c-0.1,1-0.2,2.1-0.3,3.1c-0.9,10.9-0.5,21.9-0.6,32.8c0.2,9.6-0.4,19.2,1.2,28.7
+		c-4.3-0.3-8.5,0-12.8,0.5c-1.4-6.5-0.7-14.1-5.6-19.4c-5.7-5.9-14.5-6.3-22.2-7.1c-12.5-0.4-25-0.2-37.5-0.2
+		c1.3,4.8-0.5,9.7,0.5,14.5c0.8,6,0.2,12,0,18c0.8,11,0,22,0.5,33c0.4,5.6,1.7,11.5,5.5,15.8c4.9,4.4,11.8,4.9,18.1,4.9
+		c2.5-0.1,6.2,0.5,5.7,3.9c1.2-0.1,2.4-0.1,3.6-0.2c0-0.7,0-2.1,0-2.8c7.1-1.4,14.4-0.5,21.6-1.1c5.4-0.4,10.5-2,15.7-3.3
+		c0,0.7-0.1,2.2-0.1,2.9c0.6,0.3,1.8,0.9,2.4,1.1c3.8,0.4,7.6,1.5,11.5,1.3c0-1.6-0.1-3.2-0.1-4.8c-1.1-0.4-2.1-0.9-3.2-1.2
+		c-0.8,0.6-1.5,1.2-2.2,1.9c-2.4,0.1-6,0.5-6-2.9c9.1-3.8,15.5-11.9,20-20.4c2-5,3.6-10.1,5.4-15.2c4.2,0.3,8.1,1.9,12.1,2.8
+		c0.2,2.1-0.3,4.1-0.8,6.1c-4.2,16.1-7.9,32.2-11.4,48.5c-11.1-1.3-22.3-0.3-33.3-1.9c-28.6,0.7-57.3-0.6-86,0.7
+		c-14.1,0.3-28.3-0.1-42.3,1.2c0.1-4,0-7.9,0-11.8c6.1-0.2,13.1,0.2,18.1-4.1c2-2.1,3.5-4.6,4.2-7.4c2.9-10.1,1-20.8,2.5-31.1
+		c-0.5-6.7-0.3-13.3-0.7-20c-0.2-5,0.9-10,0.2-14.9c-0.6-4.7,0.6-9.3,0.3-14c-0.8-8.3-0.3-16.7-0.4-25.1c0.1-12.3-0.3-24.6,0.4-36.9
+		c-0.9-9,0.2-18.4-3.3-26.9c-1.8-3.9-5.3-7.6-9.8-7.6c-3.8-0.2-7.6,0-11.5-0.1C863.5,189.4,863.4,187.5,863.5,185.5 M947.5,183.5
+		c0,1.3,0.1,2.6,0.1,4c2.3,0,4.6,0.1,7,0.1c0-1.4,0-2.7,0-4.1C952.2,183.5,949.8,183.5,947.5,183.5 M893.4,310.6c-0.9,1-1.8,2-2.8,3
+		c0,0.5-0.2,1.4-0.2,1.9c1.1,0,2.1-0.1,3.2-0.1c0.6-0.6,1.2-1.2,1.8-1.9c0-1.1,0-2.1,0.1-3.1C895,310.5,894,310.6,893.4,310.6
+		 M1022,362.7c-1.5,1.8-3.5,3.4-3.8,5.8c0.6,0,1.7,0,2.3,0c1.3-1.3,2.6-2.6,3.9-3.9c0.1-0.5,0.2-1.7,0.2-2.2
+		C1023.8,362.4,1022.9,362.5,1022,362.7z"/>
+	<path class="st2" d="M1014.4,212c2.6,0.1,4.4,1.4,4.8,4.1c0-0.3,0-0.9,0-1.2c0.1,2.6,0.3,5.2,0.7,7.8c-0.5-1.1-1.1-2.2-1.6-3.2
+		c-1.2,0-2.5,0.1-3.7,0.1C1014.5,217,1014.4,214.5,1014.4,212z"/>
+	<path class="st2" d="M1014,231.7c0.9-3.2,1.7-7.2,5.5-8.1c0.5,2.3,0.9,4.6,1.3,6.9C1018.6,231,1016.3,231.3,1014,231.7z"/>
+	<path class="st2" d="M759.5,370.7l1.6,1.1c0.6,0.9,1.3,1.8,2,2.7c4.6,5.1,12.2,4.9,18.6,4.8c0.1,4,0,8-0.1,11.9
+		c-6.7-1.4-13.6-0.3-20.4-1.7c0.1-0.6,0.1-1.9,0.2-2.5c-4.3,2.3-9.1,3-14,2.4c-0.1-1-0.1-2-0.1-2.9c4.7-2.4,6.7-8.1,12.1-9.6
+		C759.4,374.9,759.4,372.8,759.5,370.7z"/>
+	<path class="st2" d="M545.8,477.4c18.7-6.2,38.5-9.5,58.2-8.8c5.9-0.2,11.8-0.1,17.6,1.1c0,1.3,0,2.5,0,3.8c1.7,1.3,2.8,3,3.2,5.1
+		c0.4,0,1.3,0,1.7,0c0-2.5-0.1-4.9-0.2-7.4c3.5-1.2,7,0.4,10.5,1c7.4,2,15,3.8,21.8,7.5c5.8,2.8,12.8,4.4,17,9.6
+		c7.8,2.7,14.1,8.6,20.1,14c6.9,5.4,12.4,12.3,17.7,19.2c1.8,2.3,2.3,5.4,4.5,7.5c5,5.1,7.3,12,10.7,18.2c-0.3,0.4-1,1.1-1.4,1.4
+		c0.5-0.1,1.3-0.4,1.8-0.5c2.5,5.9,4,12.2,6.4,18.2c1.8,6.9,3.3,13.8,4.1,20.9c0.1,1.8,0.1,3.6,0.1,5.5c-1.9-0.1-3.8-0.2-5.7-0.3
+		c-0.9,7.1-6.5,12.7-12.8,15.5c-1.1,1.5-2.2,3.1-4.4,2.6c-1.2-1.6-2.2-3.3-3.1-5.1c-1,0-2.1,0-3.1,0c-1,1-2,1.9-3,2.9
+		c0,1,0,2.1,0,3.1c2.9-0.1,5.8-0.2,8.6-0.2c-0.7,1.4-1.3,2.8-2,4.2c2.8-0.1,5.6-0.1,8.4-0.1c0-0.7-0.2-2.1-0.2-2.8
+		c1.8-1.4,3.6-2.8,5.4-4.2c0.7,0.1,2,0.2,2.7,0.2c0-1.8-0.2-3.8,0.4-5.5c1-1.4,2.3-2.6,3.5-3.8c0.1-1.6,0.1-3.2,0.2-4.9
+		c1.6,0,3.3-0.1,4.9-0.1c0.4,1.1,0.7,2.2,1.1,3.3c0,4.3-0.2,8.6,0,12.9c-0.9,0-2.5-0.2-3.4-0.2c-0.4,2.4-0.7,4.8-0.9,7.3
+		c1.1,0.8,2.2,1.6,3.3,2.4c-0.2,0.5-0.6,1.5-0.8,2c-0.2,5.1,0.1,10.3-1.9,15c-0.3,2.7-1,5.4-2,8c-0.5,3.8-1.4,7.5-2.9,10.9
+		c-2.8,12.1-8.6,23.4-15.6,33.5c-5.4,9.2-13.1,16.7-21,23.8c-5.7,4-10.5,9.1-16.5,12.6c-3.6,2.2-7.3,4.1-10.8,6.5
+		c-5.2,1.5-7.5-5.5-12.8-5.2c0.1,0.5,0.4,1.6,0.6,2.2c0.8,0,2.4,0.1,3.1,0.1c-0.3,2.3-0.6,4.7-1.1,7c0.3-0.1,0.9-0.2,1.2-0.2
+		c-12.2,3.8-24.3,8.2-37.1,9.6c-13.5,4.7-28,2-41.9,2.9c-18-0.8-35.4-6.6-51.9-13.5c0.5-1.9,1.1-3.8,1.6-5.6c-1.1,0-2.2-0.1-3.4-0.1
+		c0,0.8,0.1,2.4,0.1,3.2c-0.8,0-2.4-0.1-3.2-0.2c-8.8-5.7-18.4-10.5-25.9-18c-1.8-1.8-3.7-3.2-5.7-4.7c-0.1-0.7-0.4-2.2-0.5-2.9
+		c0.4-0.4,1.1-1.3,1.4-1.8c-1.6-1.2-3.3-2.2-5.1-3.2c-0.1,1-0.2,2.9-0.3,3.8c-0.3-0.6-1-1.9-1.3-2.6c-2.4-2.3-4.6-4.9-5.5-8.2
+		c-1-2.1,1.8-2.2,3-2.8c0.1-0.5,0.2-1.4,0.2-1.9c-1.4,0.1-2.8,0.2-4.2,0.3c-0.1,0.9-0.2,2.8-0.3,3.7c-3.4-2.3-4.9-6.2-7.1-9.4
+		c-1.5-2.3-3.1-4.7-4.5-7l-0.6-1.2c1.4-0.1,2.8-0.1,4.2-0.1c0.2-1.3,0.4-2.6,0.6-4c-1.1,0.4-2.2,1.3-3.4,1.2c-2.1,0-1.8-2.9-2.3-4.2
+		c1.4,0,2.8,0,4.1,0c0.5-1.3,1-2.6,1.5-4c1.6-0.1,3.2-0.2,4.9-0.3c0,1.3,0,2.7,0,4c-0.5,0.3-1.6,0.9-2.1,1.2c0,0.5,0.1,1.4,0.1,1.8
+		c3,2.6,6,5.4,9.7,6.9c-1,0.8-1.9,1.6-3,2.3c-1.7-0.1-3.3-0.8-4.9-1.3c0.1,0.9,0.2,1.7,0.3,2.6c1.8,1,3.3,2.4,4.4,4
+		c0.9-1.9,1.9-3.8,3.2-5.5c0.1-1.3,0.3-2.6,0.4-3.9c-1.8-1.2-3.7-2.4-5.5-3.5c-0.1-2.9,2.1-4.3,4.5-5.3c0,1-0.1,2.9-0.1,3.9
+		c3.4,0,6.7-0.5,10-1.3c-0.1-1.5-0.2-3-0.3-4.5c-1.3-0.1-2.6-0.2-3.8-0.3c0-0.9-0.1-2.8-0.2-3.7c0.8-0.8,1.6-1.6,2.5-2.3
+		c-0.4-1.4-0.9-2.9-1.4-4.3c-0.9,0.8-1.8,1.5-2.7,2.3c-0.2,2.8,0.8,6.6-2.6,7.9c-0.6-1.7-1-3.4-1.7-5.1c-1.1,0.3-2.2,0.7-3.2,1
+		c0.6,1.3,1.1,2.6,1.7,3.9c-2-3-3.6-6.2-5.5-9.2c0.5-3,1.2-6,1.7-9c-1.2,0.7-2.4,1.4-3.4,2.3c-0.1,2.2,0.7,4.2,1.2,6.3
+		c-1.1,0-3.3,0.1-4.4,0.1c0-1.8,0.1-3.6,0.2-5.4c-0.5,0-1.4,0-1.9,0c-0.4,1-0.9,1.9-1.3,2.9c-0.8,0.3-1.6,0.6-2.4,1
+		c1.5,0,2.9,0.1,4.4,0.1c1.1,1.5,2.2,3,3.4,4.5c0,1.5,0,3,0,4.5c-1.3,0.5-2.6,1-4,1.5c-0.1-2.6-0.7-5.1-2.4-7.1
+		c-1.7,2.2-3.5,4.4-5.4,6.4c-1-4.5-3.3-8.5-3.9-13.1c-2-5.3-3.2-10.9-3.4-16.5c-0.2-0.1-0.7-0.4-0.9-0.5c-0.1-3-0.3-5.9-1-8.8
+		c-0.1-1.6-0.2-3.1-0.3-4.7c2.4-2.1,5.4-2.6,8.3-1.1c-0.1-0.5-0.4-1.4-0.5-1.9c-0.8,0-2.3-0.1-3.1-0.2c0.2-2.8,1.6-5.3,2.5-7.9
+		c-0.5-0.4-1.4-1.1-1.9-1.5c-0.7-1.2-1.3-2.4-2-3.6c-0.4,4.1-1.1,8.1-1.4,12.2c-0.6,0.3-1.8,0.8-2.4,1.1c0.4-5.8,0-11.6,0.2-17.5
+		c0.5-2.7,1.3-5.4,0.2-8.1c1.6-0.2,3.2-0.5,4.8-0.8c0.5-1.2,1-2.5,1.5-3.7c0.6,0.5,2,1.6,2.6,2.1c0-0.4,0-1.1,0-1.5
+		c-0.9-0.9-1.9-1.9-2.8-2.8c-0.2-6.4-2.8-13.3,0.8-19.3c0.8,0,2.4,0.2,3.1,0.2c0.1-0.5,0.2-1.5,0.2-2c-0.8,0.1-2.5,0.2-3.4,0.2
+		c0.1-1.7,0.2-3.3,0.3-5c0-0.3,0.1-0.9,0.1-1.2c0.7,0,2.1-0.1,2.9-0.2c-0.3-3-0.2-6,1.1-8.8c0.9-0.1,2.6-0.4,3.5-0.5
+		c-0.5-0.2-1.5-0.5-2-0.6c0.5-4.7,3.3-8.8,6.1-12.5c0.1-0.5,0.3-1.4,0.4-1.8c2.8-3.5,4.2-8.3,8.2-10.9c1.2,0.3,2.4,0.8,3.6,1.3
+		c0-2,0.3-4.2-1.2-5.7c2.6-2.6,4.7-5.7,7.2-8.3c1.2-1.5,3.3-1,4.9-1.3c0.9,1.6,1.8,3.3,2.6,5c0.9,0.1,1.9,0.2,2.8,0.4
+		c-0.9-2.5-2-5-4.4-6.4c0-0.8,0-2.5,0-3.3c2.2-1.9,4.4-4,7.3-5c0,0.9-0.1,2.7-0.2,3.6c0.7,0.7,1.3,1.4,2,2.2
+		c0.9-1.4,1.9-2.9,2.8-4.3c0.1-0.5,0.2-1.4,0.2-1.9c-0.9,0-2.8,0.1-3.7,0.1c0.3-0.6,1-1.8,1.3-2.4c6.4-5.7,14-9.8,21.5-13.7
+		C532.8,482.1,539.6,480.4,545.8,477.4 M635.3,476.1c1.1,0.6,2.2,1.2,3.3,1.8c0-0.7,0.1-2.2,0.2-2.9
+		C637.6,475.4,636.4,475.7,635.3,476.1 M558,490.5c-1.4,1.1,0.2,3.9,1.9,3C561.1,492.5,559.5,489.9,558,490.5 M561.6,496.6l-0.2,0.5
+		c-3.9,2-6.9,5.5-10.8,7.5c-4.9,2.5-8.1,7.2-12,10.8c-5.3,4.6-8.3,11.2-12.6,16.6c-2.2,4.3-4.9,8.3-6.5,12.8c-1.5,2.5-2.9,5.1-3.6,8
+		c-1.2,4.7-2.6,9.3-4.1,13.9c-0.7,4.7-2,9.2-3,13.8c0,2.7-0.4,5.3-1.3,7.8l-0.9,0.1c0.5,8.3-0.6,16.8,1,25c-1.5,0.1-3,0.3-4.5,0.7
+		c1.4,0.1,2.9,0.2,4.3,0.3c0,1.4,0.1,2.8,0.3,4.2c-0.1,3.3,0.8,9-4,9.2c-0.1,0.9-0.2,1.9-0.3,2.8c0.5,0,1.6,0,2.2,0
+		c0.4-1,1.3-3.2,1.7-4.2c1.1,3.2,1.6,6.7,1.7,10.1c-0.7,0-2.2-0.1-2.9-0.2c-1.1,2.4-2.1,4.8-3.1,7.3c-1.5-0.1-2.9-0.2-4.3-0.3
+		c0,0.7-0.1,2-0.1,2.6c1,0.9,1.9,1.7,2.9,2.6c0.8-1.1,1.6-2.2,2.4-3.3c2.5,0,4.9,0,7.4-0.1c0.3,1.3,0.6,2.5,0.9,3.8
+		c-1.6,0.8-3.2,1.7-4.8,2.7c0.5,0.5,1.4,1.4,1.8,1.8c1.4-0.7,2.9-1.2,4.4-1.6c0.7,6.3,3.2,12.3,5.8,18c1.2,2.2-0.8,7.7,3.2,6.3
+		c0.3,2,0.2,4,0.2,6.1c0.6,0.1,1.8,0.2,2.3,0.3c1.6,2.6,2.9,5.3,4.8,7.7c2.1,3.1,5.2,5.8,5.4,9.8c-1.6,0.3-3.1,1-4.5,1.8
+		c0.2,1.5,0.3,2.9,0.5,4.4c-2.3,0-4.6,0.1-6.9,0.1c-0.1-2.3,1.4-3.7,3-5c-1.2-0.1-2.4-0.1-3.6-0.2c0.1,1.7,0.2,3.4,0.4,5.1
+		c-0.5,0.1-1.5,0.4-2,0.5c1.5,0.1,3,0.2,4.5,0.4c0.2,2.2,0.9,4.3,1.8,6.4c1.1,3.2,5,4.8,4.7,8.6l-1.4,0.2c0,1.3-0.1,2.6-0.1,4
+		c1.4-0.1,2.9-0.1,4.3-0.2c-0.6-2.3-1.3-4.5-1.5-6.8c1.2-0.9,2.7-1.1,4.1-1.4c0-0.6,0-1.8,0-2.5c1.4-1,2.7-2,4.1-3
+		c0-1.6-0.1-3.2-0.1-4.7c4.5,1.6,8.1,4.9,11.5,8.1c2.3,2.6,6,3.2,9,4.9c9.9,5.1,21,7.7,32,8.5c-0.2,1.7-0.4,3.4-0.5,5.1
+		c1.1,0,2.2,0,3.3,0.1c-0.1-1.8-0.2-3.5-0.4-5.2c2.4,0,4.9,0,7.3,0c0,1.4-0.1,2.8-0.1,4.2c1.3-0.4,2.7-0.8,4-1.2
+		c-0.1-0.8-0.2-2.3-0.3-3c4.6-1.2,9.2-2.6,14-3.2c4.4-2.6,9.9-2.8,14.1-5.9c6.9-5.7,14.9-10.3,20.8-17.3c4.4-3.8,6-9.9,10.7-13.4
+		c3.5-2.1,5.1-6.1,8.1-8.8c-0.7-0.3-2-1-2.7-1.3c0.1-0.9,0.4-2.6,0.5-3.4c4.9-10.7,7.3-22.2,10.5-33.5c1.6-8.1,1-16.5,1.6-24.7
+		c0.8-7,1.2-14.1-0.2-21c-0.4-3.3-0.3-6.7-0.4-10c-0.2,0.6-0.5,1.2-0.7,1.8c0.3-9.5-3.2-18.5-4.4-27.8c-2.3-3.4-3.2-7.5-4-11.5
+		c-2.4-3.2-4-6.8-5.1-10.6c-0.2-0.5-0.6-1.6-0.7-2.1c-0.4-0.2-1.3-0.6-1.7-0.8c0.2-0.5,0.7-1.6,0.9-2.1c2.8-1.6-0.3-4.6-1.4-6.2
+		c-0.5,1.6-1.9,1.7-3.2,2c-2.4-5.8-7.6-9.8-10.8-15.1c-3.8-3-7.3-6.4-11.2-9.3c-11.3-8.3-24.8-13.7-38.8-15.3
+		c-5.4-0.6-10.8-0.4-16.2-0.5C578.9,490.9,570.4,494.4,561.6,496.6 M674.2,498.4c0.9,2.3,1.7,4.7,1.4,7.2c2.3-0.1,4.5-0.2,6.8-0.6
+		c-0.5-0.1-1.6-0.3-2.1-0.4c0-0.6,0-1.8,0-2.4c1.1,0.1,2.2,0.2,3.3,0.3c0-1.4-0.1-2.9-0.1-4.3c-0.8,0.4-1.5,0.8-2.2,1.3
+		c-1.2,0.1-2.4,0.2-3.5,0.4c-0.3-0.4-0.9-1.1-1.2-1.4C675.9,498.4,674.7,498.4,674.2,498.4 M531.5,500.6c-0.1,0.5-0.2,1.6-0.2,2.1
+		c0.6,0,1.8,0,2.5,0c-0.1-0.5-0.2-1.6-0.3-2.2C533,500.6,532,500.6,531.5,500.6 M520.6,515.7c0,1,0,2,0,3c1.3-0.5,2.7-0.9,4.1-1.3
+		c0-0.5,0.1-1.6,0.1-2.1C523.4,515.4,522,515.5,520.6,515.7 M662.4,520.2c0,1.1,0.1,2.2,0.2,3.2c1.1,0,3.2,0.1,4.3,0.1
+		C667.3,520.4,664.7,520.2,662.4,520.2 M493.8,523.6c1.1,1.7,1.8,3.6,2.2,5.6c0.4,0.1,1.1,0.2,1.4,0.2c0-1.5,0-3,0-4.4
+		c-1.4-0.4-2.9-1-2.9-2.7C494.2,522.8,494,523.2,493.8,523.6 M679.2,525.1l2.5,0.5c-0.6,0.6-1.1,1.3-1.7,1.9c1.2,2,0.7,3.2-1.5,3.5
+		c0,0.1,0,0.3-0.1,0.4c1.9-0.7,3.8-1.1,5.8-1.3c0-0.8,0.1-1.7,0.2-2.5c-0.7,0.1-2.2,0.3-2.9,0.4c0.3-1.2,0.7-2.4,1-3.5
+		C681.4,524.6,680.3,524.8,679.2,525.1 M501.5,530.6c-0.1,1.4-0.1,2.7-0.2,4.1c0.6,0,1.8,0,2.4,0c0-1.4,0-2.9,0-4.3
+		C503.1,530.4,502,530.5,501.5,530.6 M690.6,530.4c-0.7,0.8-1.4,1.5-2.1,2.3c0,0.9,0,1.8,0.1,2.7c0.9,0,1.8,0,2.8,0c0-0.7,0-2,0-2.7
+		c0.5-0.8,1.1-1.6,1.6-2.4C692.4,530.4,691.2,530.4,690.6,530.4 M497.3,542.6c-1.8,0.3-3.3-0.4-4.7-1.3c0,0.5-0.1,1.7-0.1,2.2
+		c0.6,0,1.9,0,2.6,0.1c1.4,0.6,2.9,1.2,4.5,0.9c1.8-2,3.9-4.7,1.8-7.3C500.4,539.2,499.3,541.3,497.3,542.6 M675.8,541.9
+		c0.1,1.5,2.8,1.2,2.9-0.2C678.6,540,675.9,540.5,675.8,541.9 M701.4,549.1c2.1-1.3,3.4-3.5,3.5-6
+		C700.8,542.5,701.4,546.5,701.4,549.1 M497.5,549.2c0,1.8,0,3.6,0,5.4c0.5,0,1.6,0.1,2.1,0.1c0-0.7,0-2.1,0-2.8
+		c0.8-0.6,1.7-1.2,2.5-1.9C500.5,549.7,499,549.5,497.5,549.2 M472.3,550.3c0.1,1.3,0.1,2.6,0.2,3.9c0.8,1.1,1.7,2.2,2.5,3.3
+		c1,0,2,0,3,0c-1.3-2.2-2.7-4.5-2.8-7.1C474.2,550.4,473.3,550.3,472.3,550.3 M507.7,554.6c-1.4,1.3,0.8,3.7,2.1,2.1
+		C511.5,555.3,509,553.2,507.7,554.6 M483.6,554c0,1.9-0.1,3.8-0.1,5.6c1.5,0,2.9-0.1,4.4-0.1C487.1,557.2,486.6,554.2,483.6,554
+		 M469,557.7c-0.9,1.5-1.8,2.9-2.6,4.3c1.2,0.7,2.5,1.5,3.7,2.3c1.4,0.1,2.7,0.2,4.1,0.3c1.8,2.2,4.7,4.1,4.6,7.4
+		c3,1.9,5.8,4.5,9.6,3.4c0.8,0.7,1.6,1.5,2.4,2.2c1.4-1.2,3.1-2.1,4.9-2.3c-0.1-0.8-0.2-1.6-0.3-2.4c-1-0.8-2-1.5-3-2.2
+		c-2.3,0-4.5-0.3-4.2-3.1c-2.4,0-4.9,0.5-7.2-0.3c-1.3-1.2-2.4-2.6-3.6-3.9c0.1-0.7,0.2-2,0.2-2.6c-1.1-0.4-2.2-0.8-3.2-1.2
+		c0-0.5,0-1.5,0-2C472.6,557.5,470.8,557.6,469,557.7 M681.8,561.8c0.9,1.4,1.8,1.3,2.6-0.1C683.5,560.3,682.6,560.3,681.8,561.8
+		 M704.8,567.8c0.9,1.3,1.7,1.3,2.6-0.1C706.5,566.3,705.6,566.3,704.8,567.8 M460.5,575.1c-1.1,1.3,1.1,3.5,2.1,1.8
+		C463.7,575.6,461.5,573.4,460.5,575.1 M468.3,581.4c0.9,0.1,2.6,0.4,3.4,0.5c-0.3-1.9-0.8-3.9-1.6-5.6
+		C469.1,577.9,468.5,579.6,468.3,581.4 M482,578.2c0.7,1.3,1.4,2.7,2.1,4c0.3-0.5,1-1.6,1.3-2.2C485.8,578,483.2,578.6,482,578.2
+		 M687.1,582c0.8,1.6,1.5,1.6,2.3,0.1C688.6,580.5,687.9,580.4,687.1,582 M484.2,584c-0.2,3.6,3.7,5.6,3.6,9.1
+		c0.8-2.5,1.5-5,1.9-7.6c-0.6,0-1.9-0.1-2.6-0.1C486.2,585,485.2,584.5,484.2,584 M501.2,584.4c0,2.3,0.4,4.7,3.4,4.5
+		c0-1.1,0-3.3,0-4.5C503.4,584.4,502.3,584.4,501.2,584.4 M466.3,585.3c0,0.6,0,1.7,0.1,2.2c1.4,0.8,2.8,1.6,4.1,2.4
+		c0-1.5,0-2.9,0.1-4.3C469.1,585.5,467.7,585.4,466.3,585.3 M497,595.5c-1.7-1.8-3.4-3.7-5.1-5.6C488,593.4,493.7,596.3,497,595.5
+		 M489.5,597.6c-1.3,1.5-2.8,2.9-4.8,3.3c-0.1,0.4-0.3,1.2-0.5,1.7c1.9-0.2,4.1,0.2,5.7-1.1c0.6,0,1.9,0,2.6,0c0-1.3,0-2.7,0.1-4
+		C491.5,597.5,490.5,597.6,489.5,597.6 M494.4,608.5c1.1,0,3.5,0.1,4.6,0.1c-0.2-2.3-1.5-4.1-3-5.7
+		C494.3,604.3,494.4,606.5,494.4,608.5 M467.9,613.1c1.5-0.3,2.8-0.9,2.8-2.6c0.9,0,1.9-0.1,2.8-0.1c0.3,0.5,1,1.5,1.3,2
+		c1.7,0.1,3.4,0.2,5.2,0.3c-0.6-1-1.2-2-1.9-2.8c-2.2-0.4-4.4-1-6.2-2.5C469.8,608.6,468.4,610.7,467.9,613.1 M471.4,614.8
+		c-0.3,2.7,2.6,4.6,5,5c0-1.5,0.1-2.9,0.1-4.3C475.2,614.1,472.8,612.3,471.4,614.8 M691.7,616.5c1.5-0.8,1.5-1.6,0.2-2.5
+		C690.4,614.7,690.3,615.5,691.7,616.5 M463.1,618.3c2.7,1.5,0.1,3.8,0.7,5.8c0.9,0.2,2.6,0.4,3.5,0.6c0.8-2,1.3-4.2,0-6.2
+		C465.9,618.5,464.5,618.4,463.1,618.3 M480.6,623.5c0,1-0.1,2-0.1,3.1c1.3-0.1,2.5-0.2,3.8-0.3c0-0.9,0-1.9,0-2.8
+		C483.1,623.5,481.9,623.5,480.6,623.5 M463.2,631.3c2,1.3,2.7-0.6,3.4-2c0.3,0.4,0.9,1.3,1.2,1.7c1.8-0.7,2.8-1.9,3.2-3.6
+		c-2.4,0.4-4.9,0.6-6.5-1.7C463.7,627.4,463.1,629.3,463.2,631.3 M488.1,628.6c-1.2,0-2.4-0.1-3.5-0.1c-0.1,1-0.1,1.9-0.2,2.9
+		c0.6,0.3,1.8,0.9,2.4,1.2c-0.4,2.1-1.8,4.4-0.2,6.3c1.6-1.3,3.2-3.2,5.5-2.5c1.3,1,2.5,2.1,3.6,3.2c1.2-0.5,2.5-0.9,3.7-1.4
+		c0-2.2,0-4.4,0-6.6c-0.5,0-1.6-0.1-2.2-0.1c0.1,2.1,0.2,4.2,0.3,6.3c-0.8-0.1-2.3-0.2-3-0.3c-1.7-0.5-1.1-2.5-1.4-3.8
+		c-0.7,0-2-0.1-2.7-0.1c-0.1-2.1-0.1-4.2-0.2-6.3C489.6,627.7,488.9,628.1,488.1,628.6 M711.2,627.3c0,0.6,0,1.8,0,2.4
+		c0.6,0,1.9,0,2.5,0c0-0.6,0-1.8,0.1-2.4C713.1,627.3,711.9,627.3,711.2,627.3 M707.3,630.2c0.1,1.3,0.2,2.6,0.2,3.9
+		c1.3-0.8,2.1-2.1,2.4-3.6C709.3,630.4,708,630.3,707.3,630.2 M474.1,633.4c-1.7,1.3,1,3.4,2.3,2.1
+		C477.8,634.1,475.5,632.1,474.1,633.4 M479.4,633.2c0.1,0.8,0.2,2.4,0.3,3.2c-0.7,0.7-1.5,1.3-2.2,2c0,0.7,0,2.2,0,2.9
+		c-1.6,0.9-3.3,1.8-4.9,2.8c2.5,2.6,6-1.1,8.5,1.3c1.3,0,2.6-0.1,3.9-0.2c-1-1.5-2.7-1.8-4.4-1.9c0-3.4,0-6.7-0.1-10.1
+		C480.2,633.2,479.7,633.2,479.4,633.2 M464.4,634.3c0,1,0,3,0,3.9c0.7,0.7,1.4,1.5,2.2,2.2c1.3-0.8,2.7-1.5,4-2.2
+		c0-0.8-0.1-1.7-0.1-2.5C468.4,635.4,466.4,634.8,464.4,634.3 M491.6,645.5c1.3,0,2.6,0,3.9,0c0-1.3,0-2.6,0.1-3.9
+		c-1.3-0.5-2.6-0.9-3.9-1.3C491.6,642,491.6,643.7,491.6,645.5 M460.5,643.1c0,1.4,0,2.8,0,4.2c2.7-0.5,3.4,2.5,4.4,4.3
+		c0.5-1.4,0.8-3.2,2.7-3.3c2.1-0.3,2.8-2.3,3.3-4.1c-1.7,0.2-3.9-0.4-5,1.5C464,645.1,462.2,644.1,460.5,643.1 M705.8,644.2
+		c0.8,1.5,1.6,1.5,2.5,0.1C707.5,642.8,706.7,642.8,705.8,644.2 M713,644.1c-1.2,1.4,1.5,2.3,2.4,1.3
+		C716.5,644,713.8,642.9,713,644.1 M718,648.9c1.5-0.7,1.5-1.5,0-2.3C716.5,647.3,716.5,648.1,718,648.9 M483.4,648.6
+		c0.1,0.9,0.2,1.9,0.3,2.8c2,0.1,4,0.2,6.1,0.3c-0.1-1.1-0.1-2.2-0.1-3.4C487.5,648.4,485.4,648.5,483.4,648.6 M491.3,650.3
+		c0.1,0.6,0.2,1.8,0.3,2.4c2.4,0.3,3.2-1.2,3.1-3.3C493.6,649.7,492.4,650,491.3,650.3 M480.3,655.5c0,0.6-0.1,1.7-0.2,2.3
+		c0.6,0,1.9,0,2.5,0c-0.1-0.5-0.2-1.6-0.2-2.1C481.9,655.5,480.9,655.5,480.3,655.5 M505.7,676.7c-0.6,1.4-0.9,2.9-1.3,4.4
+		c1.2,1.6,2.3,3.2,3.5,4.9c1.9,0.9,4.2,1.8,4,4.4c-1.8,1.5-5.1,2.9-4.2,5.8c0.9,0.2,1.7,0.4,2.6,0.6c0.4-1.4,0.8-2.8,1.2-4.2
+		c1-0.5,2.1-0.9,3.2-1.3c-1.8-2.6-2.9-8.8,2.1-8.1c0-0.2-0.1-0.8-0.2-1c-1.9,0.6-4,1.1-5.6,2.4c-1.1,0-2.1-0.1-3.2-0.1
+		c0.4-1.6,1.3-2.9,2.5-4c0-1.3-0.1-2.6-0.1-3.9c0.7-0.3,2.1-1,2.8-1.3c1,0.5,2,1,3,1.5c-1.2-1.2-2.5-2.3-3.8-3.4c-0.9,0-2.6,0-3.4,0
+		C508.4,675.1,506.9,675.7,505.7,676.7 M494.1,675.3c0.4,2.9,2.9,4.7,3.8,7.4c2.8,0.6,2.7-1.8,2.7-3.8
+		C498.2,678.1,496.9,675.3,494.1,675.3 M699.2,682.4c-0.5,3.1,1.4,4.7,4.4,4.4c-0.1-1.5-0.1-2.9-0.1-4.3
+		C702.4,682.5,700.3,682.4,699.2,682.4 M519.7,688.4c1.4-0.4,1.7-3.2,0.2-3.7C518.4,685.2,518,688,519.7,688.4 M498.8,694.2
+		c-2-0.1-2.6,1-2.4,2.7c2-1.1,3.9-2.4,6.1-2.8c-0.6-2.4-2.6-4.2-3.6-6.4C497,689.6,498.2,692,498.8,694.2 M515.5,693.1
+		c2.7,1.4,6.5,2.3,6.4,6.1c0.4,0.1,1.2,0.4,1.6,0.5c-0.1-1.2-0.1-2.5-0.2-3.7c-1.8-1.7-0.7-3.8,0.4-5.3c-0.7-0.3-2.2-1-3-1.4
+		C519.3,690.9,517.7,692.4,515.5,693.1 M486.2,697.6c1,0,2-0.1,3-0.1c0.9-1,1.9-1.9,2.8-2.9c-2.2-0.9-4.6-1.5-6.7-2.5
+		C485.2,694,485.5,695.9,486.2,697.6 M528,692.8c-1,1.3,1.2,3.7,2.5,2.4C531.6,693.8,529.3,691.6,528,692.8 M511.4,697.5
+		c0,0.6,0,1.7,0.1,2.3c1.7-0.3,3.5-0.7,5.2-1c0-0.7,0-2,0-2.7C514.9,696.5,513.1,697,511.4,697.5 M503.3,699.5
+		c0.1,1.1,0.1,2.2,0.2,3.4c2.4,0.2,3.2-1.4,3.5-3.5C505.8,699.4,504.5,699.4,503.3,699.5 M496.4,701.2c0,0.6,0,1.9,0,2.5
+		c1.6-0.1,3.3-0.2,4.9-0.5c0.1-0.7,0.4-2.2,0.5-3C499.9,700.5,498.1,700.8,496.4,701.2 M518.6,712.7c-0.6,0.7-1.3,1.3-1.9,2
+		c0,1.9-0.1,3.8-0.1,5.7c-2.2-0.1-3.3,1.7-4.5,3.2c1.2,0,2.3-0.1,3.5-0.3c1.1-1.5,2.1-3.2,3.7-4.3c0.6-1.7,1.1-3.5,1.4-5.3
+		c0.4-0.3,1.1-0.8,1.4-1C520.9,712.6,519.7,712.6,518.6,712.7 M548.2,724.5c1.1,2.2,2,4.4,2.7,6.8c0.4,0.1,1.3,0.2,1.7,0.2
+		c-0.2-2.4-0.7-4.7-1.4-6.9C550.2,724.6,549.2,724.6,548.2,724.5z"/>
+	<path class="st2" d="M1229.7,469.9c1-1.3,2.5-1.5,4-1.8c0.9,2.7,1.6,5.3,2.5,8c12.4,39.9,26,79.5,39.5,119c2.1,8.9,6,17.1,8.8,25.7
+		c2.8,8.9,6.6,17.6,8.4,26.8c3.7,7.1,5.7,15,8.4,22.5c3.3,9.2,6.6,18.5,10.5,27.5c0.7,1.8,1.3,3.6,1.8,5.5c0.6,1,1.3,1.9,1.9,3
+		c-0.3,1.5-1,2.9-1.5,4.4c0.9,0,2.6-0.1,3.4-0.2c1.3,1.8,2.4,3.6,3.4,5.5c3,3.1,6.1,6.2,9.2,9.2c-1.2,0.1-2.3,0.2-3.5,0.3
+		c-1,1.3-2,2.5-2.9,3.8c1.5,0.6,3,1.1,4.6,1.5c1-2.8,2.8-5.2,6.1-4.5c0,0.9,0,2.6,0,3.5c0.4-0.2,1.1-0.5,1.5-0.6
+		c1.7-1.7,3.9-1.9,6.1-1.2c0.6,0.1,1.8,0.3,2.4,0.4c-0.2,4.1,0.7,8.5-0.5,12.4c-3,1.5-6.4,2.1-9.6,2.7c0.4-1,1.1-3.1,1.5-4.1
+		c-0.5,0-1.6-0.1-2.1-0.1c-0.5,1-1.1,1.9-1.6,2.9c-3.2,0-6.4,0-9.5,0.1c0-0.5,0-1.6,0-2.2c-1.1,0.5-2.2,0.9-3.3,1.4
+		c-1-1.6-2-3.1-3.3-4.4c-0.2,1.5-0.3,3-0.4,4.5c-5.4-0.4-10.9-1.1-16.3-0.3c0-1.2,0.1-2.5,0.2-3.7c-1.4-0.5-2.7-1.1-4.1-1.6
+		c0,0.6-0.1,1.8-0.1,2.4c1.1,0.9,2.1,1.8,3.2,2.7c-1.1,0-3.2,0-4.3,0c-1.2-0.2-2.5-0.4-3.7-0.3c-7.1,0.8-14.4,0.3-21.5,0.6
+		c-4.6,0.2-9.1-0.1-13.6-0.9c-1.2,0.7-2.3,1.4-3.4,2.1c-0.8-0.7-1.6-1.5-2.4-2.2c-0.5,0-1.6,0-2.2,0c-0.3,0.5-0.9,1.4-1.3,1.9
+		c-3.7,0.1-7.4,0.2-11.1,0.4c0.1-0.6,0.4-1.7,0.5-2.3c-0.5,0.1-1.6,0.2-2.1,0.3c0.1-2,0.2-4.1,0.3-6.1c1,0.8,2,1.6,3.1,2.4
+		c0.5,0.2,1.5,0.6,2,0.8c-0.4-0.4-1.2-1.1-1.6-1.5c0.1-0.8,0.2-2.3,0.3-3.1c-1.3-0.3-2.7-0.6-4-0.8c0-1.4-0.1-2.9-0.1-4.3
+		c1.8,0.3,4.1-0.5,5.5,1c1.5-1.7,4-1.7,6-1.4c2.7,0.7,5.3-0.3,8-0.5c0.8-1.5,1.9-2.8,3.1-4.1c4.7-4.9,3.8-12.2,3.1-18.4
+		c-3.8-21.3-11.9-41.6-17.9-62.3c-25.2,0.1-50.4-0.1-75.6,0c-4.7,9.8-7.5,20.3-11.7,30.2c-3,9.5-8.6,18.1-9.9,28.1
+		c-0.2,0.4-0.7,1.2-0.9,1.6c-0.6,0-1.9,0.1-2.5,0.1c-0.5,0.9-0.9,1.8-1.3,2.6c-0.5,0.3-1.5,0.8-2,1c0,0.6,0,1.7,0,2.2
+		c1.6-0.1,3.3-0.2,4.9-0.2c0.2,4-1.1,8.6,1.8,11.9c0.6,0.9,1.2,1.9,1.9,2.8c0.2,0.3,0.6,0.9,0.8,1.2c2.4,0.8,4.8,1.9,6.9,3.3
+		c4.3,0,8.6,0.1,12.9,0.2c-0.2,1.1-0.3,2.2-0.5,3.3c1.5-0.3,2.9-1,4.1-1.9c0.3,4.5,0,9.1,0.2,13.6c-2,0-4.1,0.1-6.1,0.2
+		c0-2.2-0.1-4.5-0.3-6.7c0.8,0.1,2.4,0.2,3.2,0.3c0.1-1.4,0.2-2.7,0.3-4.1c-1.5,0.1-3.1,0.2-4.6,0.4c0.3,1.8,0.5,3.7,0.8,5.6
+		c-0.6,0.3-1.8,1-2.4,1.3c0,0.6,0,1.7,0,2.3c-2.7-0.2-5.5-0.4-8.2-0.5c0.1-0.9,0.2-2.7,0.2-3.7c1.2-0.6,2.5-1.3,3.7-1.9
+		c-1.6-0.6-3.2-1.2-4.8-1.8c0,2.5,0.1,5,0.2,7.5c-1.1,0-3.2-0.2-4.2-0.2c0-0.7,0-2.2,0-2.9c-1.3-1.1-2.6-2.3-3.9-3.4
+		c-0.1-1.5-0.2-3-0.3-4.5c-0.7-1-1.5-1.9-2.2-2.9c-2.9,2.1-5.6,4.5-6.9,7.9c-1.3,0-2.6-0.1-3.8-0.1c0,0.6,0,1.9,0,2.5
+		c2.7-0.6,5.7-3.4,8.2-1.6c0.2,1.6,0.1,3.1,0.1,4.7c-1.5-0.1-3-0.1-4.4-0.2c-4.3-1.3-7.8-4.2-11.9-5.9c0.5,2.1,1,4.2,1.5,6.3
+		c-2.6-0.1-5.2-0.2-7.8,0c-0.9-1.1-1.8-2.2-2.6-3.3c-1.8,0.2-3.6,0.6-4.5,2.3c-1.1,0.1-2.1,0.2-3.1,0.3c-1.6,0-3.1,0-4.7,0.1
+		c-0.4,0.1-1.2,0.4-1.6,0.5c-4.7,0.1-9.4,0.1-14.1,0.5c0.1-1.9,0.6-4.2-1.9-4.7c0-0.8,0.1-2.4,0.2-3.2c-0.3,0.4-0.9,1.1-1.2,1.5
+		c-2.1,0.2-3.4,1.8-4.8,3.1c0,0.5-0.1,1.6-0.1,2.1c0.6-0.1,1.7-0.3,2.2-0.4c0,0.6-0.1,1.8-0.1,2.5c-1,0-3-0.1-4-0.1
+		c-0.5-4.7-1.6-9.3-1.2-14.1c4.1,0.2,7.9-1.3,12-1.1c0.2,0.9,0.4,1.8,0.6,2.6c-0.1-4.6,5.2-5.4,7.9-8.1c5.8-5.8,10.3-12.7,13.8-20
+		c10-20.3,18.4-41.2,27.1-62.1c7.6-18.6,15.5-37,23.1-55.6c1.1,1.3,1.9,2.8,2.2,4.5c0.2-1.3,0.7-2.6,1.3-3.7
+		c-1.1-0.6-2.1-1.3-3.1-2.1c8.9-20.2,17-40.7,25.2-61.2c1.2-2.8,2.7-5.5,4-8.3c1.6,0.1,3.3,0.2,5,0.2c1.5-1.6,3.1-3.2,4.8-4.5
+		c0.1-0.9,0.2-1.7,0.3-2.5c-1,0.1-2,0.1-2.9,0.2c0,0.7-0.1,2.2-0.1,2.9c-2.2,0.1-4.4,0.1-6.5,0.2c1-3.4,2.4-6.6,4.3-9.5
+		c2.6,0.2,5.6-0.3,7.5,2.1c3.5,0.1,7.1,0.1,10.6,0.1c0-1.4-0.1-2.7-0.1-4c1.7,0,3.4,0.1,5.1,0.1c0-0.5,0.1-1.5,0.2-2
+		c-2.5,0.5-6.7-1.4-7.5,2c-1.6,0.1-3.2,0.1-4.7,0.2c0-1.1,0.1-3.2,0.1-4.3c1.6,0.1,3.3,0.1,4.9,0.2c0.3-1.5,0.6-2.9,1-4.3
+		c1.4,0.1,2.8,0.3,4.3,0.5c-0.1-1.4-0.2-2.7-0.2-4.1c1.4-0.5,2.8-0.9,4.1-1.4c-0.1-0.6-0.2-1.9-0.2-2.6c1.7-1.8,3.5-3.5,5.3-5.2
+		c1.7,0,3.4,0.1,5.2,0.1C1229.6,475,1227.1,471.8,1229.7,469.9 M1212.1,510.5c-1.4,0-2.9,0-4.3,0c0.4,0.3,1.1,0.9,1.5,1.2
+		c0,3.2,3.3,3.6,5.7,4.6c0.1-2.4,1.8-4.2,4.3-4.2c-0.6-0.8-1-1.7-1.1-2.6c-0.6,0-1.7,0-2.2,0
+		C1214.8,507.8,1212.3,508.4,1212.1,510.5 M1206.8,527.8c-3.2,8.1-5.2,16.6-8,24.8c-7.5,22.8-16.5,45.1-25.5,67.3
+		c-0.5-0.1-1.4-0.3-1.8-0.4c-0.2,1.3-1.8,2.9-0.5,4c4.1-2.9,9.3-1.9,14-2.1c13-0.9,26.1-0.9,39,0c3.4,0,6.8,0.1,10.2,0.1
+		c-1.1-6.3-4.1-12.1-5.8-18.3c-6.8-22.7-14.6-45-19.2-68.2C1208.8,532.4,1208.1,529.9,1206.8,527.8 M1238.5,575.6
+		c0,0.5-0.1,1.6-0.2,2.1c0.6,0,1.8,0,2.4,0c0-0.5-0.1-1.6-0.2-2.2C1240,575.5,1239,575.5,1238.5,575.6 M1250.9,607
+		c-0.2,0.8-0.3,1.7-0.5,2.5c1.5-0.1,3.1-0.2,4.6-0.3c0.7-0.3,2-0.9,2.7-1.2c-0.3-0.1-1-0.4-1.3-0.5c0-0.5-0.1-1.5-0.2-1.9
+		C1254.6,606.5,1252.7,606.7,1250.9,607 M1159.4,616.3c0,1.1-0.1,2.1-0.1,3.2c0.7,0.2,2.1,0.7,2.8,0.9c1.5-0.7,1.4-2.4,1.5-3.8
+		C1162.2,616.5,1160.8,616.4,1159.4,616.3 M1268.6,616.7c0,1.4,0,2.8,0,4.1c1.4-1.2,2.9-2.2,4.7-2.7c0.1-0.4,0.4-1.1,0.5-1.5
+		C1272,616.6,1270.3,616.6,1268.6,616.7 M1278.5,617.5c0,1.6,0,3.2,0.1,4.8c0.9-0.4,1.7-0.9,2.6-1.4c0.1-1.2,0.2-2.3,0.3-3.5
+		C1280.5,617.5,1279.5,617.5,1278.5,617.5 M1277.5,628.5c-0.1,1.1-0.2,2.2-0.3,3.4c1.8,0.4,3.5,0.6,5.3,0.9c0-1.4-0.1-2.8-0.1-4.2
+		C1280.8,628.5,1279.2,628.5,1277.5,628.5 M1286.1,657.7c1.2,0,2.4,0,3.7,0c-0.1-0.8-0.2-2.5-0.3-3.4
+		C1286.8,653.8,1286,655.4,1286.1,657.7 M1285.3,671.1c1.7,0.4,3.4,0.8,5.1,1.4c0-1.8,0-3.6-0.1-5.3
+		C1288.5,668.3,1287.1,669.9,1285.3,671.1 M1257,677.2c1.6,0.5,3.3,1,4.9,1.6c0.9,0.8,1.8,1.7,3.1,1.9c-2-1.8-3.5-4-5.2-6
+		C1258.6,675.2,1257.9,676.3,1257,677.2 M1134.3,690.7c0.2,1.5,0.8,3,1.3,4.5c0.6,0.4,1.7,1.1,2.3,1.5c0.7-0.4,2-1.1,2.7-1.5
+		c0-0.8,0.1-1.7,0.2-2.5c-2.5,0-2.1-2.5-2.5-4.2C1136.5,687.9,1135.4,689.8,1134.3,690.7 M1266.2,696.2c0.9,0,2.8,0.2,3.8,0.2
+		c-1.8,3.3-0.7,7.1-1.6,10.7c-0.8,1-1.6,2-2.4,3c1,1,2,2,3,3c1-1,1.9-1.9,2.9-2.9c-1.3-1.6-2.6-3.3-2.8-5.4c0.6-0.4,1.9-1.1,2.5-1.4
+		c-0.1-1.2-0.1-2.3-0.1-3.5c0.4-1,0.9-2.1,1.3-3.1c-2.5,0.7-3.6-1.2-3.9-3.4C1268,694.3,1267.1,695.2,1266.2,696.2 M1287.7,693.6
+		c-0.1,1-0.2,2-0.3,2.9c1,0.4,2.1,0.9,3.1,1.3c0-1.5,0-3,0-4.5C1289.5,693.4,1288.6,693.5,1287.7,693.6 M1293.3,701.9
+		c0.8-0.4,2.4-1.3,3.1-1.7c0-1.1,0.1-2.1,0.2-3.2c0.9-1.2,0.9-2.7,1-4C1294.2,694.4,1294.1,698.8,1293.3,701.9 M1279.9,700.3
+		c-2.2,1.4-4.6,3-3.4,6.1c-1.4,1.4-2.9,2.8-3.4,4.8c0.8,0.1,2.5,0.4,3.3,0.5c0.1,0.9,0.2,2.7,0.3,3.6c1.6-1.2,0-2.9-0.3-4.4
+		c1.2-3.1,2.6-6.2,4.2-9.2c1-0.4,2-0.7,3-1c0.1-0.6,0.2-1.7,0.2-2.3c-1.5,0.1-3,0.2-4.5,0.4c0-1,0.1-3,0.1-4
+		C1277.8,696.3,1278.6,698.7,1279.9,700.3 M1136.4,698.9c-0.5,1.6,0,2.2,1.7,1.7C1138.6,698.9,1138,698.4,1136.4,698.9
+		 M1285.8,702.8c-0.8,2.1-1.4,4.4-1.6,6.7c0.6,0,1.7,0,2.2,0c0-0.6,0.1-1.9,0.2-2.5c1.3-1.1,2.6-2.1,4-3.2c0-0.7,0.1-2,0.2-2.7
+		C1289,701.6,1287.4,702.2,1285.8,702.8 M1113.5,703.6c0,2.5,0,5,0.1,7.5c1.7-2.2,2.1-5,2.1-7.7
+		C1115.1,703.5,1114.1,703.6,1113.5,703.6 M1123.5,704.5c0,1.7-0.1,3.4-0.1,5.1c1-0.1,2.1-0.1,3.1-0.2c0.7-0.6,1.3-1.3,2-1.9
+		c-0.3-1-0.7-2-1-3C1126.2,704.5,1124.9,704.5,1123.5,704.5 M1303.3,707.8c1,0.2,2.1,0.5,3.2,0.6c1.8-1.1,0.8-3.4,1.1-5.1
+		c-0.9,0.1-2.7,0.4-3.6,0.5C1303.3,705.1,1303.4,706.5,1303.3,707.8 M1309.5,708.5c0.1,0.8,0.2,2.4,0.3,3.2
+		c-1.8-0.1-3.5-0.1-5.2-0.1c0,1.3,0,2.5,0,3.8c1.2,0,2.4,0.1,3.6,0.2c0.8,0.9,1.7,1.8,2.5,2.6c-0.3-1.9-0.9-3.8-1.4-5.6
+		c2.1-0.8,4.7-1.4,4.8-4.1C1312.5,708.4,1311,708.4,1309.5,708.5 M1107.7,714.6c-0.1,1.3-0.2,2.6-0.4,4c2.8-0.1,5.7-0.1,8.5-0.1
+		c0-0.2,0-0.7,0-1c-1.4,0-2.8,0-4.2,0.1c-0.5-1-1-2-1.5-3.1C1109.3,714.5,1108.5,714.6,1107.7,714.6 M1135.3,715.3
+		c0,0.6,0.1,1.8,0.2,2.4c1,0,2,0,3-0.1c0.1-0.6,0.2-1.7,0.3-2.3C1137.6,715.3,1136.4,715.3,1135.3,715.3 M1283.1,715.4
+		c0.1,2.3,1.3,4.4,2.6,6.3c1.1-0.1,3.2-0.2,4.2-0.2c0-1.6-0.8-2.7-2.2-3.5c0-0.7,0.1-2,0.1-2.6
+		C1286.1,715.4,1284.6,715.4,1283.1,715.4 M1296.2,715.1c0.1,2.2,0.9,6.8,4.1,5.2C1301.1,717.9,1298.8,714.8,1296.2,715.1
+		 M1273.1,721.6c1.2,0,2.4,0,3.5,0c0-0.6,0-1.9,0-2.5C1275.2,719.6,1272.4,718.8,1273.1,721.6 M1283.6,726.8
+		c1.5-0.4,3.7,0.2,4.4-1.6c-1.6-1.5-3-3.1-4.3-4.9C1281.4,722,1283,724.6,1283.6,726.8 M1293.5,727.6c1.4-0.4,4.3,0.4,4.1-1.9
+		c0.2-1.8-0.9-3.3-1.5-4.9C1293.7,722.4,1293.1,724.9,1293.5,727.6 M1320.8,725.8c2.1-0.2,4.2-0.7,6.2-1.4c-0.4-0.8-1.3-2.3-1.7-3.1
+		C1322.5,721,1321.5,723.7,1320.8,725.8 M1114.7,723.5c-0.1,0.7-0.2,2.1-0.3,2.7c-0.5,0.9-0.9,1.7-1.4,2.6c2.7-0.9,5.3-2,8-2.7
+		c-0.7-0.3-1.4-0.7-2.1-1C1118,723.6,1116.4,723.4,1114.7,723.5 M1258.4,723.6c0,1,0,2,0,3c0.6,0,1.7,0.1,2.3,0.1
+		c-0.1-1.1-0.1-2.1-0.1-3.2C1260,723.5,1259,723.5,1258.4,723.6 M1266.4,724.1c0,1.9,0,3.8,0,5.7c0.9-0.2,1.9-0.4,2.9-0.5
+		c0-1,0.1-1.9,0.2-2.8c-0.4-0.4-1.1-1.3-1.4-1.7C1267.7,724.6,1266.9,724.3,1266.4,724.1 M1272.3,724.4c0,1.1,0,2.2,0,3.3
+		c1.1,0,2.1,0,3.2-0.1c0-1.1,0-2.1,0.1-3.2C1274.5,724.4,1273.4,724.4,1272.3,724.4 M1285.3,728.4c0.4,1.6,0.8,3.2,1.3,4.8
+		c0.7-0.5,2.2-1.6,2.9-2.2C1290.7,727.8,1287.2,728.6,1285.3,728.4 M1277.4,730.4c-1.7,0.4-3.6,0.2-5.3,0.3c0.3,2.2,2.4,2.7,4.3,3
+		c0.4,0.6,1.1,1.9,1.5,2.5c1.1-1.5,2.2-2.9,3.5-4.3c0.1-1,0.2-2.9,0.3-3.8C1279.9,728.2,1278.6,729.1,1277.4,730.4 M1294,733.5
+		c1.2,0,2.4,0.1,3.6,0.1c0-1.2-0.1-2.4-0.1-3.6C1295.5,730.3,1294.1,731.3,1294,733.5 M1313.5,733.3c0.1,2.5,3.1,0.4,4.4,0.1
+		c-0.6-1.5-1.2-2.9-1.7-4.4C1314.4,729.9,1312.7,731.1,1313.5,733.3 M1335.3,733.2c-0.2,0.4-0.5,1.3-0.7,1.7
+		C1336.6,738.2,1339,731.1,1335.3,733.2 M1255.3,735.4c0,0.6,0,1.7,0,2.3c0.6,0,1.7-0.1,2.3-0.1c0-0.5-0.1-1.5-0.1-2
+		C1256.9,735.5,1255.9,735.4,1255.3,735.4z"/>
+	<path class="st2" d="M1509.5,472.5c4.2-1.8,8.3-3.9,12.7-5.1c0.8,2.4,1.5,4.9,2.2,7.3c7.3,23.5,15.1,46.9,22.9,70.2
+		c2.2,8.3,5.1,16.3,7.6,24.5c1.2,4.5,3.8,8.4,5.2,12.8c6.2,18.8,12.9,37.5,19.2,56.4c1.5,5.9,3.9,11.6,6.3,17.2c0,2.2-1,4.3-1.9,6.2
+		c-2.6-0.2-5-1.1-7-2.8c-0.1-0.5-0.4-1.6-0.5-2.1c-1-1.2-2-2.5-2.9-3.7c-0.5,0-1.5-0.1-2-0.1c0.1,0.4,0.4,1.1,0.5,1.5
+		c3.4,2.4,1.4,7.2,1.8,10.7c1.7-0.1,3.4-0.2,5.2-0.3c-0.1,1.3-0.1,2.6-0.1,3.8c-0.4,0.5-1.1,1.5-1.4,2c4-1.8,7.4-4.7,11.1-7.1
+		c1.3,5,3.1,9.9,5.2,14.6c0.1,0.8,0.3,2.5,0.4,3.4c-0.6,1-1.1,2.1-1.7,3.2c1.4,0.4,2.9,0.9,4.4,1.3c0.3,1.4,0.7,2.8,1.1,4.2
+		c1.2,3.5,3.1,6.8,3.3,10.6c-0.3-0.5-1-1.5-1.3-2c-0.6,0-1.7,0-2.2,0.1c0,0.6,0,1.7,0,2.3c1.9,1.5,3.6,3.3,4.6,5.5
+		c-0.7,0.4-1.9,1.1-2.6,1.5c0,0.9,0,1.9,0.1,2.8c0.5,0.1,1.5,0.3,2,0.4c0.1-2.2,1.2-4,3.2-4.9c3.6,6.8,7.9,13.8,14.6,17.8
+		c1.8,1.3,4.6,1.1,5.7,3.2c-1.5,0.7-3.1,1.2-4.7,1.8c0.1,3-0.6,6.5,1.9,8.8c0.2-3.7,0.9-7.3,3.1-10.3c2.4,0,4.8,0,7.2,0.2
+		c-1.1,0.5-2.1,1-3.2,1.5c0.3,1.8,1.6,3,2.9,4.1c0.1,1.1,0.2,2.2,0.3,3.2c0,1.8,0,3.5,0,5.3c-6.9-0.3-13.8,0.4-20.6-0.8
+		c-16.2-0.4-32.5-0.5-48.7-0.2c-1.5-1.3-3.1-2.5-4.6-3.7c0.9-1,1.9-2,2.9-3c-1-1-2-2-3-3c0,1.6,0.1,3.1,0.1,4.7
+		c-0.8,0.6-1.6,1.2-2.4,1.9c-0.6,0-1.9,0-2.5,0c-0.3,0.5-1,1.5-1.3,2c-3.1-0.1-6.3,0-9.4,0.1c-6.3,3-13.7,2.1-20.5,1.7
+		c-0.2-4.6-0.2-9.3-0.2-13.9c7.9-1.2,17.2,0.5,23.3-5.8c4.6-6.8,2.7-15.2,1.3-22.6c-1.3-5.3-2.4-10.7-3.8-16
+		c-3.4-9.1-5.8-18.6-9-27.8c-1.6-4.4-2-9.1-3.4-13.6c-0.6-0.1-1.7-0.2-2.3-0.2c-0.7-1.2-1.1-2.5-1.3-3.9c1.1-0.5,2.2-1,3.3-1.5
+		c0-2.6,0-5.1,0-7.7c0.8,0,2.4,0.1,3.2,0.1c-0.1-1.1-0.2-2.2-0.3-3.3c-5.5,0.8-8.4,6.7-14.1,7c0-2.9,0.3-5.9,1.3-8.7
+		c-4.6-0.1-9.1,0.3-13.7-0.2c-0.2-0.7-0.8-2.2-1-2.9c6-0.3,12,0,18,0c-0.3-0.8-0.6-1.5-0.9-2.3c-4-9.4-6.6-19.4-9.7-29.1
+		c-1.8-7.5-5.5-14.5-5.9-22.4c-2.8-4.1-3.4-9.2-4.9-13.9c-2.3-7.4-3.7-15.1-5.1-22.7c-0.1-1.5-1.4-2.3-2.2-3.4
+		c-2.5,9.5-5.7,18.8-8.7,28.2c-0.8,2.6-2,5-3.5,7.2c-1.5,4.1-2.2,8.4-3.6,12.6c-4.1,11.3-8.6,22.4-13,33.5c-0.3,0.4-0.9,1.3-1.2,1.8
+		c-1.2-0.1-2.5-0.2-3.7-0.2c-1.7-1.7-3.2-3.5-4.5-5.4c-1.7,2.6-4.7,2.7-7.5,2.6c0.2,0.5,0.4,1,0.7,1.5l0.3-1.1c2.5-0.4,5,0.6,7.4,1
+		c-0.2,1.6-0.5,3.3-0.8,4.9c-1.1,0.3-2.2,0.6-3.3,0.8c-0.3,1.2-0.6,2.5-0.8,3.7c0.3,1.6,0.6,3.2,0.9,4.9c-1.9,1.5-3.9,2.7-6.2,3.6
+		c-0.2,0.8-0.4,1.7-0.5,2.5c2.8-1.9,5.7-0.2,8.3,1.3c0-1.8,0-3.7,0-5.5c2.5,0,5.1,0,7.7-0.1c0.5-1.3,1-2.6,1.5-3.9
+		c3.6-0.1,7.3-0.2,11-0.2c-0.1,1.6-0.1,3.3-0.1,4.9c0.8,1.1,1.6,2.1,2.5,3.2c4.8-0.5,9.8-0.2,14.3-2.2c-1.9-0.7-3.9-1.5-5.8-2.2
+		c2-1.8,4.7-1.7,7.2-1.9c-0.1,1-0.2,2.9-0.2,3.9c0.3-0.4,0.9-1.3,1.2-1.8c0.9,0,2.8,0.1,3.7,0.1c0.4,1,0.8,2,1.3,3
+		c1,0,1.9,0.1,2.9,0.2c0.7-1.1,1.5-2.2,2.2-3.3c7.6-1.2,12.4,5.5,15.7,11.2c-1,0-2.9,0-3.9,0c-0.1,1-0.2,2-0.2,3
+		c1.4-0.2,2.8-0.4,4.3-0.6c0,0.9,0.1,2.6,0.1,3.5c-7.9,0.1-15.9-0.4-23.8,0.3c-2-1.2-2.6-3.3-2.8-5.4c-2.2,0-4.4,0.1-6.5,0.2
+		c-0.7-0.5-1.3-1-1.9-1.5c-0.4,1.5-0.7,2.9-1.1,4.4c-3.3,0-6.6,0.6-9.9,1c-4.4-2.2-8.4-5.2-12.5-7.8c-1-0.1-1.9-0.2-2.8-0.3
+		c0,1.1,0.1,2.2,0.1,3.3c1.8-0.1,3.5-0.2,5.3-0.3c0.8,2.2,3.3,5.1,0.2,6.5c-3.7-0.2-7.4-0.7-11,0c-2.5,3-2.7,7.1-3.7,10.7
+		c-0.7,0.1-2.2,0.2-2.9,0.3c0-1.3,0-2.6,0.1-3.9c-1.2,0.7-2.5,1.3-3.7,2c-0.1,2.1-0.2,4.2-0.2,6.4c-3.1,1.9-7.3,4.9-10.4,1.3
+		c-0.9-0.1-1.8-0.2-2.6-0.2c0,1-0.1,2.1-0.1,3.1c1.4,1.1,2.8,2.3,4.2,3.4c2.3,0.8,4.6,1.7,6.8,2.9c-0.1-1.3-0.1-2.7-0.2-4
+		c0.8-1.1,1.5-2.3,2.3-3.4c0.8-0.1,2.3-0.2,3-0.3c-0.1,0.6-0.3,1.8-0.4,2.4c-3.6,8.4-6.5,17.2-9.9,25.7c-2.9,7.9-6,16.2-5.2,24.8
+		c-0.1,3.8,1.8,7.4,4.8,9.7c2.8,1.3,2.7,4.4,3,7.2c0.2-1.5,0.4-3,0.7-4.5c1.8,0.4,3.7,0.8,5.6,1.2c0.3,0.5,0.8,1.6,1.1,2.1
+		c2,0,4.1-0.1,6.1-0.1c0.1-0.8,0.3-1.5,0.4-2.3c0,4.4,4.3,1.2,6.6,1c-0.2,4.4,0.4,8.9-0.9,13.2c-7.1,2.4-14.4-0.1-21.6,0.1
+		c-2.5-0.2-5.6,0.7-7.1-1.9c-0.6,0-1.2,0-1.8,0.1c-0.5,0.5-1.4,1.3-1.8,1.8c-9.3-0.4-18.5,0-27.8-0.2c-0.1-0.7-0.2-2-0.3-2.7
+		c3.1-0.1,6-1.4,9.1-1.3c0-0.4,0-1.1,0-1.4c-1.3-0.9-2.2-2.1-2.3-3.8c0.4-0.7,1.2-2.1,1.7-2.8c0.8,0.1,2.3,0.5,3.1,0.6
+		c-0.1-0.7-0.2-2.1-0.3-2.9c-0.8,0.6-1.6,1.1-2.3,1.7c-2.9,0-5.7-0.1-8.6,0c-1-1-2-2.1-3-3.1c-0.5-1.9-1.1-3.8-1.6-5.6
+		c-0.4,0.9-1.3,2.8-1.7,3.7c-2.9-0.1-5.8-0.1-8.7-0.1c4.3-5.4,8.8-10.6,12.1-16.8c2.4-4.4,4.5-8.9,6.9-13.3c1.2,0,2.4-0.1,3.7-0.1
+		c0.9,0.7,1.9,2.2,2.5,0c2.3,0,4.6,0.1,6.9,0.2c-0.1-0.5-0.2-1.7-0.3-2.2c-0.7-0.7-1.4-1.5-2.1-2.2c1.5-2.1,1.6-4.6,0.4-6.9
+		c-0.2,1.7-0.3,3.4-0.3,5.2c-0.9,0.5-1.8,1-2.8,1.5c-0.1,1.2-0.1,2.4-0.1,3.6c-2.1,0-4.3,0-6.4,0c0.1-3.4,1.6-6.5,2.9-9.6
+		c0.5,0.4,1.6,1.3,2.1,1.7c1.4-1.5,2.6-3.1,3.8-4.8c-0.7-0.4-2.2-1.2-2.9-1.5c1.7-7.6,5.7-14.4,9.1-21.3c2-7.8,5.4-15.1,8.7-22.4
+		l1.8-0.7c0,0.6-0.1,1.8-0.1,2.4c2.6-0.1,5.9-0.7,6.5,2.7c0.3,0.2,0.8,0.5,1.1,0.7c0.4-1.5,0.9-3.1,1.3-4.6c1.7,0.3,3.5,0.7,5.2,1.1
+		c-0.1,2.1-0.2,4.2-0.3,6.3c1.4,0,2.8,0,4.3,0c-0.1-0.7-0.2-2.2-0.3-2.9c0.7-0.7,1.4-1.4,2.1-2c0.1-0.5,0.2-1.7,0.3-2.2
+		c-0.8,0.1-2.5,0.2-3.3,0.3c0-1.4,0.1-2.8,0.2-4.2c-3.6,0.1-7.1,0-10.7,0c-0.5,0.7-1.4,2-1.8,2.7c-1.3-1.3-2.6-2.6-3.8-3.9
+		c1.9-7.8,5.7-15,8.6-22.5c3.9-9.5,8.1-18.9,11.8-28.4c2.7-6,4.7-12.3,7.8-18.1c2.1,0,4.1,0,6.2,0c-0.8-1.9-2.1-3.5-3.3-5.1
+		c-0.7-3.1,1.4-5.8,2.8-8.4c2.1-7.6,5.6-14.6,8.2-22c5.4-14.3,11.3-28.4,15.4-43.1C1494.6,478.5,1502.3,475.9,1509.5,472.5
+		 M1504,514.3c-1.5,0.3-3.1,0.6-3.9,2.1c-0.5,0.2-1.4,0.6-1.9,0.8c2.2,1.5,4.9,1.5,7.5,2.2c0,0.8-0.1,2.3-0.2,3.1c1,0,2-0.1,3-0.1
+		c-0.1-1.7,0-3.8-2.1-4.3c0-1.6,0-3.3,0-4.9C1505.6,513.5,1504.8,513.9,1504,514.3 M1515.3,525.1c0.7,1.7,1.2,3.5,1.5,5.3
+		c1.3,0.1,2.6,0.1,3.9,0.2c-0.1-0.9-0.3-1.8-0.4-2.7C1518.6,527,1516.9,526.1,1515.3,525.1 M1453.6,583.6c-1.3,1.2-2.7,2.4-4,3.5
+		c-0.1,1.1-0.1,2.3-0.1,3.4c2.7,0,5.4,0,8.1,0.1c-0.1-1.7-0.1-3.5-0.1-5.2c-0.7-0.6-1.3-1.2-2-1.9
+		C1455,583.6,1454.1,583.6,1453.6,583.6 M1523.5,623.5c0,0.5-0.1,1.6-0.1,2.2c0.6,0,1.8,0.1,2.4,0.1c0-0.6-0.1-1.8-0.1-2.3
+		C1525.1,623.4,1524,623.4,1523.5,623.5 M1548.2,629c1.3,1,4.4,3.8,1.1,4.6c2-0.3,4.3-0.9,5.7,1.1c-0.8-1.3-1.4-2.6-1.7-4.1
+		c-0.6-0.1-1.7-0.4-2.3-0.5c0-0.8,0.1-2.3,0.2-3l-0.5,3.8C1550,630.3,1548.8,629.4,1548.2,629 M1564,632.8c-0.9,1.8-2.1,3.4-3.4,4.9
+		c0,0.5,0,1.4,0,1.9c0.9,1,1.9,2,2.9,3c0.4,0,1.2,0,1.6,0c0.5-1.7,1.5-3.2,2.6-4.5c-0.8-0.9-1.6-1.8-2.3-2.7c0-0.8,0.1-2.3,0.2-3
+		C1565.2,632.3,1564.4,632.6,1564,632.8 M1564,666c0.2,3.3,4.7-0.2,1.8-1.4C1565.4,664.9,1564.5,665.7,1564,666 M1546.6,669.6
+		c0,0.9,0,1.8,0,2.8c1,0.1,2,0.2,3,0.2c-0.1-1-0.2-2-0.3-3C1548.4,669.6,1547.5,669.6,1546.6,669.6 M1554,688.2
+		c1.3,0.9,3.2-1.4,1.8-2.4C1554.4,684.7,1552.5,687.1,1554,688.2 M1398.5,712.5c1.3,0,2.7,0,4.1,0c0-1.7,0-3.4,0-5.1
+		c-1,0-2.9,0.1-3.8,0.2C1398.6,709.2,1398.6,710.8,1398.5,712.5 M1563.3,712.9c0.1,0.8,0.4,2.5,0.5,3.3c1.2,0.3,2.5,0.4,3.8,0.6
+		c-0.1-1.6-0.1-3.2-0.2-4.9c3.1-0.2,2.3-4.3-0.7-3.6C1565.6,709.8,1564.5,711.4,1563.3,712.9 M1592.2,709.7c0.7,2,1.4,4,2.1,6
+		c0.7,0,2.1-0.2,2.8-0.2c-0.8-1-1.7-1.7-2.8-2.3c0.1-1.4,0.3-2.7,0.4-4.1C1594.2,709.2,1592.9,709.5,1592.2,709.7 M1588.8,713.4
+		c1.4-0.9,1.4-1.8,0-2.6C1587.3,711.8,1587.3,712.6,1588.8,713.4 M1397,715.7c-1.1,0.8-2.1,1.6-3.2,2.4c-0.2,0.4-0.5,1.3-0.6,1.7
+		c0.5,0,1.4-0.2,1.9-0.2c1-1.5,2.9-1.1,4.4-1.4c0-0.9,0-1.8,0-2.6C1398.6,715.6,1397.8,715.6,1397,715.7 M1583.6,715.6
+		c0,0.8,0.1,1.5,0.2,2.3c1.2,0.5,2.4,1.1,3.6,1.7c0-1.4,0-2.8,0-4.1C1586.1,715.5,1584.9,715.6,1583.6,715.6 M1415.5,717.4
+		c0,0.6,0,1.8,0,2.4c1.1,0.6,2.1,1.3,3.2,1.9c-0.1,1.2-0.1,2.5-0.1,3.8c1.2,0,2.5,0,3.8,0c1-1,2.1-2.1,3.1-3.1c0-1.3,0-2.6,0.1-3.9
+		c-1.9,0-3.8,0-5.6,0C1418.7,717.4,1417,717.5,1415.5,717.4 M1406.2,719.5c0.2,1.7,0.8,3.3,1.7,4.8c1.6-1.7,2.3-3.9,3-6
+		C1409.3,718.5,1407.4,718.2,1406.2,719.5 M1399.5,726.5c0.5,0,1.5,0,1.9-0.1c1-0.9,0.4-3.3-1.2-2.8
+		C1399.1,724.3,1398.8,725.3,1399.5,726.5 M1567.4,727.4c-0.1,0.6-0.2,1.7-0.2,2.3c0.5-0.1,1.6-0.2,2.2-0.3c0.8-1.4,1.6-2.8,2.3-4.1
+		C1570.3,726,1568.8,726.7,1567.4,727.4 M1528.4,729.9c-1.2,1.3,1,3.5,2.1,1.8C1531.7,730.4,1529.5,728.3,1528.4,729.9 M1546.6,737
+		c3.6-0.8,3.5-5.2,0-5.9C1546.4,733.1,1546.2,735,1546.6,737 M1541.3,734c0.3,1.5-0.6,3.9,1.3,4.6c1.2,0,3.4,0,4.6,0
+		c-0.8-1.5-2-2.6-2.9-4C1543.5,734.4,1542.1,734.1,1541.3,734 M1443.8,739.7c1.4-0.2,1.2-2.3,0.4-3.1
+		C1442.1,735.3,1441.8,739.5,1443.8,739.7z"/>
+	<path class="st2" d="M1208.1,479.2c5.3-2.9,10.6-6.4,16.8-7.1c-0.9,2.7-0.7,7-4.6,6.8c-3,3.4-6.4,6.7-10.8,8
+		c-0.7,0.9-1.4,1.8-2.1,2.7c-2,0-4.1,0.1-6.1,0.2c0-3,0-6,0.1-9.1C1203.5,480,1205.8,479.5,1208.1,479.2z"/>
+	<path class="st2" d="M106.5,475.4c14.5,0.2,29,1.7,43.5,1c9.8-0.8,19.6-0.7,29.4-1.9c1.6,3.1,2.9,6.4,4.1,9.8
+		c5,12.3,10.6,24.4,15.7,36.6c2.3,5.3,6.3,10.5,5.2,16.6c0.7,0,2,0.1,2.6,0.1c6.1,14.1,12.9,27.8,19.5,41.7c0.9,1.6,0.7,3.5,0.8,5.4
+		c0.5,0.3,1.6,0.8,2.1,1.1c3.6,7.7,7.7,15.2,10.5,23.2c1.6,3.5,4.5,6.4,4.7,10.4c1.6,2.2,3.1,4.5,4.1,7
+		c5.6,12.5,11.9,24.7,16.4,37.7c-0.9-0.2-1.8-0.4-2.7-0.5c0.1,2,0.1,4,0.2,6c2.5,0.2,6.1-1,6.2,2.7c2.9-3.1,3.7-7.3,5.4-11
+		c2.8-6.5,4.8-13.3,8.5-19.3c1.9-6.1,4.5-12,7.9-17.4c3.6-7.4,5.7-15.5,10.6-22.2c2.5-8.2,6.5-15.8,10-23.6
+		c12.6-27.1,25.4-54.1,37-81.7c0.9-2.5,2.6-4.5,3.9-6.8c0.7-4.9,2.6-9.6,4.7-14.1c5.1-1.2,10.7-0.3,15.8,0.6
+		c-0.1,1.3-0.2,2.6-0.2,3.9c-0.8,0.8-1.6,1.5-2.4,2.2c-0.7,0-2.1-0.1-2.8-0.1c0.1,0.5,0.2,1.5,0.2,2c1.4,0,2.7,0,4.1,0.1
+		c2.2-2.1,2.4-5.2,2.8-8.1c3.5,0,7.1-0.3,10.6,0.3c3,0.6,5.9-0.6,8.9-0.1c3.8,0.6,7.5-0.1,11.3-0.3c0.3,0.3,1,1,1.3,1.3
+		c1.2-2.2,3.8-0.9,5.5-0.1c5.2-2.9,11.4-1.7,17-2.8c2.2-0.7,2.3,2,1.7,3.4c-0.5,3.8,0.7,7.7,0.4,11.6c-7.3,0.7-14.6,0.7-21.7,2.4
+		c-0.9-0.6-1.8-1.2-2.6-1.8c-1.2,1.1-2.4,2.2-3.6,3.3c-1.3,0-2.6-0.1-3.9-0.1c-0.9,0.8-1.9,1.6-2.8,2.4c-0.1,0.4-0.3,1.3-0.4,1.7
+		c0.9-0.1,2.6-0.2,3.5-0.2c0,1.2-0.1,2.5-0.1,3.8c-0.7,3.4-2.1,6.5-2.9,9.9c-0.6,6,0.9,12,0.2,18c-0.4,3.7,0.8,7.3,0.2,11
+		c-0.9,5.6-0.7,11.4-0.2,17.1c1.3,7.6,0.1,15.3,1,22.9c1.2,9.6,0,19.4,1.2,29c0.5,3.3-0.5,6.6-0.2,10c1,8,0.4,16,0.8,24
+		c1.4,16,0.7,32.1,2.5,48c0.2,9.8,0.8,20.1,5.7,28.8c5.8,7.2,16,7.6,24.6,7.9c0.1,2,0.2,4,0.2,6c0,3.2,0,6.4-0.2,9.7
+		c-24.4-2.6-49-2.1-73.5-2c-5.3,0.1-10.7,0-16,0.6c-6.8,0.8-13.6,0.2-20.4,1.4c-0.1-0.2-0.2-0.7-0.3-1c0-4.7,0.1-9.5-0.1-14.2
+		c2.1-0.4,4.2-0.6,6.3-0.7c0,1.7-0.1,3.3-0.1,5c1.2,0,2.5,0,3.8,0c0.3-1.4,0.6-2.8,0.9-4.2c1.2,0,2.4,0.1,3.6,0.1
+		c-0.1,0.5-0.3,1.6-0.4,2.2c1.6,0,3.1-0.1,4.7-0.1c-1-1.2-2.1-2.5-3.1-3.7c2.2-2,5.1-2.8,7.1-4.9c7.6-9.2,6-21.8,6.4-32.8
+		c-0.5-29.2,0.9-58.3-0.2-87.5c0.9-0.1,1.9-0.1,2.8-0.1c1.1-2.1,2.4-4,3.9-5.8c0.6,0,2-0.2,2.6-0.2c0-0.5,0.1-1.5,0.1-2
+		c-1.8,0.1-3.5,0.2-5.3,0.4c0-1.8,0.1-3.6,0.1-5.4c1.8,0,3.6,0.1,5.4,0.1c-0.5-1.7-1-3.4-1.5-5c-1.1,0.1-2.3,0.1-3.4,0.2
+		c-0.4,1.3-0.7,2.7-1,4c-0.8,0-2.5,0-3.3,0.1c0.1-4.3-0.3-8.7,0.4-13c0.7-1.7,3-1.2,4.4-1.7c0-0.8,0-1.6,0-2.4
+		c-1.3-0.1-2.5-0.2-3.8-0.3c0-9.7,1.1-19.4,1.8-29c-0.8-0.2-1.6-0.4-2.3-0.6c-13.9,40.1-32.7,78.3-50.7,116.7
+		c-6.9,14.8-14.3,29.4-20.6,44.5c-6,13.5-11.5,27.2-18,40.5c-3.3-0.1-6.6,0.1-9.9,0.7c-0.5-0.2-1.6-0.7-2.1-0.9
+		c-1.6-3.8-3.4-7.5-4.5-11.5c-1.9-2.6-3.3-5.5-4.4-8.5c-6.6-13-12.2-26.5-18.9-39.4c-0.1-0.8-0.4-2.5-0.5-3.4
+		c2.4-0.5,4.8-0.9,7.3-1.3c-0.1-1.3-0.2-2.6-0.3-3.9c2.4-1.4,4.7-2.9,6.9-4.5c-0.1-3.4,1.7-7,0.1-10.3c-0.5-1.2-1-2.3-1.4-3.4
+		c-0.9,0.9-1.7,1.7-2.6,2.6c2.1,2.1,2.4,4.9,2.4,7.8c-4.7,2.5-10,3-15.2,3.3c-1.8-2.3-3.3-4.8-3.4-7.7c-0.6,0.4-1.7,1.2-2.2,1.6
+		c-12.8-27.8-26.1-55.3-38.5-83.3c-0.9-2.3-1.6-4.8-2.4-7.2c-2.2-2.1-1.7-5.1-1.5-7.9c-0.9-0.4-1.8-0.9-2.6-1.3
+		c-1.9-3.8-3.5-7.7-4.2-11.9c-2.1-2.9-3.2-6.4-4.3-9.8c-0.5,0-1.6,0-2.2-0.1c0.6,15.2,2,30.5,0.6,45.7c-0.3,8,0.2,16-0.6,24
+		c-1.5,6.6-0.3,13.3-0.7,20c0.2,9.2-1.8,18.4-0.8,27.6c-2.8-0.1-5.7-0.4-8.2,1.2c2.6,1,5.2,2,7.9,2.9c0,2.3-0.1,4.6-0.1,6.9
+		c-2.9-1.5-5.8-0.9-7.9,1.5c1.9,0.6,3.8,1.2,5.7,1.8c0.8,1.2,1.6,2.3,2.4,3.5c-0.3,7.5-1.8,15.1-0.4,22.7c0.3,7.2,1,15,5.9,20.8
+		c4.9,4.9,12.2,6.7,19,6.7c1.4,0.3,3.5-0.5,4.5,0.8c0.4,4.7-0.1,9.5,0.2,14.3c-5.9-0.5-11.8,0.1-17.6-0.7c-4.6-0.5-9.2-0.6-13.8-0.4
+		l-0.7,0c0-0.7,0-2-0.1-2.7c-1.3,0.3-2.5,0.8-3.7,1.5c-4.5,0.2-9,1.3-13.4,0.3c0-2.5-0.1-5-0.2-7.4c-0.8,0.8-1.7,1.6-2.5,2.5
+		c-0.3,1.1-0.6,2.3-0.8,3.4c-0.8,3.8-5.4,1.9-8.1,2.3c0.4-0.6,1.3-1.7,1.7-2.3c-0.1-0.8-0.3-2.4-0.4-3.2c-1.2-0.5-2.5-0.5-3.8-0.7
+		c0,2.1,0.1,4.2,0.2,6.4c-2.9,0-5.8,0.1-8.6,0.2c0.2-2,1-3.9,2.3-5.4c0.1-1.3,0.2-2.6,0.3-3.9c-1.3,0.1-2.6,0.1-3.9,0.2
+		c-0.1,1.1-0.1,2.3-0.2,3.4c-0.3,0.7-0.8,2-1.1,2.7c-1.3-0.1-2.7-0.2-4-0.3c0.1,0.8,0.3,2.3,0.4,3.1c-2.8,0-5.7,0.4-8.4,1
+		c-0.3-4.7-0.1-9.4,0-14.1c4.4,0.1,8.7-1.2,13-1.2c3.9-2.7,7.7-5.6,10.5-9.5c1.3-0.5,2.6-1,3.9-1.4c-1.8-4-1.7-8.4,0-12.5
+		c0.4-1.9,0.5-3.8,0.6-5.7c0.2-3.1,0.7-6.2,1.5-9.2c1.1-5.9,0.1-12,0.8-18c0.9-7,0.7-14,1.2-21c1.3-9,0.2-18,1.7-27
+		c0.3-1.5,1.3-2.7,1.9-4c-0.9-3.3-2-6.6-1.3-10c0.3-11,1.3-22,1.6-33c1.3-8.8,0.4-17.7,1.5-26.5c0.4-9.8,1.4-19.6,1.1-29.5
+		c0-9-1.8-19.1-9.2-25.1c-6-5-14.2-5-21.5-5.5C106.6,484.7,106.5,480,106.5,475.4 M413.5,478c0,1.8,0,3.7,0,5.5c1,0,2-0.1,3-0.1
+		c0-1.3,0-2.5,0-3.8C415.5,479.1,414.5,478.6,413.5,478 M376.6,485.8c-0.1,1.3-0.1,2.5-0.1,3.8c1.7-0.1,3.5-0.2,5.2-0.4
+		c0.4,1.1,0.8,2.2,1.1,3.4c1.5-0.6,3.1-1,4.7-1.4c0-1.2,0-2.4,0-3.6c-1.2-0.5-2.5-0.9-3.7-1.4c-0.3-0.5-0.9-1.4-1.2-1.9
+		C380.6,485,378.6,485.5,376.6,485.8 M153.9,485.5c0.4,2.8,0.1,5.7-0.3,8.5c-1.2,0.8-2.5,1.5-3.8,2.1c-0.1,0.4-0.2,1.1-0.3,1.5
+		c0.4-0.1,1.1-0.2,1.5-0.3c0.8-1,1.6-2,2.4-3c1.7,0,3.4,0,5.1,0c0.2-2.3-0.4-4.2-2.7-5C155.1,488,154.5,486.7,153.9,485.5
+		 M358.6,503.4c0,0.7,0,2.2,0,3c-1.8,1.3-3.5,2.7-4.6,4.6c1.9-1.1,3.6-2.6,5.8-3.4c2.4,0.8,5,1,7.5,0.9c0.1-0.9,0.1-1.8,0.2-2.7
+		C364.6,504.6,361.7,503.4,358.6,503.4 M348.3,513.9c0.4,1.2,0.9,2.3,1.4,3.5c1,0,1.9,0.1,2.9,0.1c-0.1-1.7-0.2-3.4-0.2-5.1
+		C351,512.9,349.6,513.4,348.3,513.9 M346,527.6c-0.9,1.2-1.9,2.5-2.8,3.6c1.8,0.1,3.6,0.7,4.9,2c0.3,0.1,1,0.3,1.4,0.4c1-1,2-2,3-3
+		c0-1,0.1-2,0.1-3C350.4,527.6,348.2,527.6,346,527.6 M390.4,532.7c0.7,2.3,1.1,4.6,1.4,7c-1.8-0.1-3.6-0.1-5.4-0.2
+		c0,0.4,0,1.3,0,1.7c3-0.2,1.8,3,2.1,5c-0.8,0.8-1.6,1.6-2.3,2.5c-1.7,0-3.3,0-5,0c0.1-0.8,0.2-2.5,0.3-3.4
+		c-2.3,0.9-4.7,1.5-7.1,1.6c0-1.1,0-3.3-0.1-4.4c1-0.6,2.1-1.2,3.1-1.8c0-1.6-0.1-3.2-0.1-4.7c-2,1.1-3.3,2.9-3,5.3
+		c-1.7,1.3-3.4,2.8-4.9,4.3c0,1.3-0.1,2.6-0.1,3.9c2.1-0.1,4.2-0.2,6.3-0.3c0,1.6-0.1,3.3-0.1,4.9c0.9,0.9,1.8,1.8,2.7,2.8
+		c0.4-2.2,0.5-5,2.5-6.4c1.6-0.2,3.3-0.3,4.9-0.3c0,2.4,0,4.9,0,7.4c-2.1-0.1-4.2-0.1-6.3,0c2.3,0.8,4.7,0.8,7.1,0.9
+		c-0.1-3-0.2-6,0-8.9c0.8-2,3.3-1,5-1.2c-0.3-3.9,0.5-7.8,1.2-11.6c0.4-0.3,1.3-0.9,1.7-1.2c0.1-1,0.1-2.1,0.2-3.1
+		C393.2,532.5,391.8,532.6,390.4,532.7 M144.8,541.6c-0.1,0.5-0.3,1.4-0.4,1.9c1,0,1.9-0.1,2.9-0.1c0.1-0.6,0.3-1.7,0.4-2.2
+		C146.7,541.3,145.7,541.4,144.8,541.6 M179.2,541.3c-0.9,4.2,4.6,5.2,7.1,2.9C184.9,541.4,181.9,541.4,179.2,541.3 M177.7,554.4
+		c-0.5,1.3-0.9,2.7-1.4,4.1c1.7,0,3.5,0,5.2,0c0-1,0.1-3.1,0.1-4.1C180.3,554.4,179,554.4,177.7,554.4 M137.5,556.5
+		c0,1.3,0,2.7-0.1,4c1,0,2.1,0,3.1,0c0-1.4,0-2.7,0-4.1C139.5,556.5,138.5,556.5,137.5,556.5 M320.5,571.6c-2.2,1.6-4.1,3.6-5.5,5.9
+		c1.1,0,2.3-0.1,3.5-0.1c1.3-0.8,2.6-1.6,3.9-2.4c0.1-1.2,0.2-2.4,0.3-3.5C322,571.5,321,571.6,320.5,571.6 M324.4,580.5
+		c0,1.2,0,2.4,0.1,3.7c1.4,0.3,2.4,1.4,3.3,2.5c-0.1,1.5-0.2,3.1-0.2,4.7c-0.4,0.3-1.2,0.8-1.6,1.1c0.6,0.1,1.8,0.2,2.5,0.3
+		c0.5-1.7,0.9-3.4,1.2-5.1c-0.8-0.7-1.6-1.4-2.4-2.1c0.1-1.7,0.2-3.3,0.3-5C326.5,580.5,325.5,580.5,324.4,580.5 M222.8,599.6
+		c-0.1,2.3-1.1,4.3-2.6,6c0.4-0.1,1.2-0.3,1.6-0.4c1-1.8,2.8-2,4.7-1.9c0-1.4,0.1-2.7,0.1-4.1C225.4,599.4,224.1,599.5,222.8,599.6
+		 M198,606c-1.8,1.4,0.7,6.6,3.1,4.1C202.7,607.8,200.8,603.5,198,606 M141.7,621.7c-0.1,0.9-0.1,1.9-0.1,2.8
+		c0.6,0.7,1.2,1.4,1.8,2.1c0.7-0.8,1.5-1.6,2.2-2.4c-0.5-0.9-0.9-1.8-1.4-2.6C143.3,621.6,142.5,621.6,141.7,621.7 M225.2,625.8
+		c0.4,0.1,1.1,0.4,1.5,0.6c-0.1,2.1,0.1,4.2,1.4,5.9c0.6,0,1.7,0,2.2-0.1c0.1-1.2,0.2-2.3,0.3-3.5c0.4-1,0.8-2.1,1.1-3.1
+		C229.5,625.7,227.3,625.8,225.2,625.8 M287.3,635.3c0,1.2,0,2.5,0.1,3.7c2-0.4,3.3-1.5,3.5-3.6
+		C289.7,635.4,288.5,635.3,287.3,635.3 M242.4,641.5c0,1,0,2.1,0,3.1c1.1,0,3.2-0.1,4.2-0.2c-0.1-1.3-0.1-2.7-0.3-4
+		C245,640.5,243.7,640.9,242.4,641.5 M143.9,644.7c-0.1,0.6-0.3,1.8-0.4,2.5c-0.4,0.8-0.9,1.5-1.3,2.3c2.1,0,4.2,0,6.3,0.1
+		c0-1.7,0.1-3.4,0.1-5.1C147,644.5,145.4,644.6,143.9,644.7 M284.4,648.7c-0.7-0.1-2.2-0.3-3-0.4c0,1.1,0.1,2.1,0.1,3.2
+		c1.3,0,2.7,0,4,0c0-2-0.1-4-0.2-6C285,646.5,284.7,647.6,284.4,648.7 M150.3,651.5c0.1,1.5,0.3,3.1,1.3,4.4
+		c0.7-0.4,2.2-1.2,2.9-1.6c0-0.9,0-1.8-0.1-2.7C153.1,651.5,151.7,651.5,150.3,651.5 M369.4,655.1c0,0.5,0.1,1.5,0.2,2.1
+		c2.7,1,5.2,2.5,7.4,4.4c0.8-0.8,1.5-1.5,2.3-2.3c0.1-1,0.1-2,0.2-3c-1.8,2.2-4.5,0.8-6.6,0.1C371.7,655.9,370.5,655.5,369.4,655.1
+		 M285.5,656.5c-0.7,0.7-1.5,1.5-2.2,2.2c-1.3-0.1-2.6-0.2-3.8-0.4c0.1,2,0.1,4.1,0.2,6.1c0.5,0,1.5-0.1,2-0.1
+		c1.9-1.8,3.5-4,4.5-6.5c1-0.5,2.1-0.9,3.1-1.3C288,656.6,286.7,656.6,285.5,656.5 M254.3,657.1c0,1.2,0,2.4,0.1,3.6
+		c1.8-0.1,3.6-0.1,5.3-0.2c-0.1-0.5-0.3-1.4-0.4-1.9C257.8,657.9,256.1,657.4,254.3,657.1 M277.2,674.6c-1.9-0.1-3.8-0.1-5.8-0.2
+		c0.1,1.9,0.1,3.9,0.2,5.8c-2.2,0.7-4.2,2-6.1,3.3c0,0.6-0.1,1.6-0.1,2.2c3.4-0.8,7.4-0.4,10.4-2.3c0.4,0,1.2,0.1,1.7,0.1
+		c-0.1-2-0.1-3.9-0.2-5.8c1.3-1.8,2.5-3.6,3.7-5.4C279.4,672.5,277.3,672.4,277.2,674.6 M369.5,687.4c0,1.1-0.1,2.2-0.1,3.2
+		c1.8,0,3.5-0.1,5.3-0.2C375.4,686.9,371.8,687.5,369.5,687.4 M255.7,691.7c0.2,2.3-0.3,4.6-2.2,6.1c0.4,1.5,0.9,3.1,1.4,4.6
+		c2.2,0,4.8,0.6,6.1-1.7c1.3-2.1,4-1.1,6-1.3c-0.7-0.6-1.3-1.3-1.9-1.9c-0.6,0-1.9,0.1-2.5,0.1c-0.9-1.1-2.8-2.2-1.9-3.9
+		c0.5-0.1,1.6-0.2,2.1-0.3c-0.1-1-0.2-2.1-0.2-3.1C260.1,690.4,257.9,690.9,255.7,691.7 M271.1,693.8c0.5,1.3,1,2.6,1.4,3.9
+		c2.1-0.2,7,0.9,6-2.9c-1.5-0.9-3-1.7-4.5-2.4C273.3,692.7,271.9,693.4,271.1,693.8 M132.6,698.5c0,1.6-0.1,3.2-0.1,4.9
+		c1.6,0,3.1,0.1,4.7,0.1c0.4-1.3,0.8-2.6,1.2-4c1-0.3,1.9-0.5,2.9-0.8C138.5,698.5,135.6,698.5,132.6,698.5 M359.6,702.5
+		c-1.9,1.7-3.9,3.4-6,5c0,0.5,0,1.4,0,1.9c1.2,0,2.4,0,3.5,0c1.2-1.6,2.8-2.8,4.3-4C361.2,704.2,360.2,703.4,359.6,702.5
+		 M130.5,710.4c0,1.2,0,2.3,0,3.5c0.6-0.5,1.6-1.3,2.2-1.8c2.7,1.7,1.5,4.5,0.7,7c1.4,1,2.8,2.2,4.1,3.3c0.4,0,1.1-0.2,1.4-0.2
+		c1.2-0.4,2.5-0.8,3.7-1.1c-0.2-1.4-0.3-3-1.1-4.2c-0.2-1.4-0.3-2.9-0.4-4.3c-2.5-0.1-5.2,0.3-6.9-1.9c0.8-1.5,1-3.1,1-4.8
+		C133.7,707.5,132.1,708.9,130.5,710.4 M241,713.4c0.4,0.8,1.1,2.3,1.4,3.1c1.4,0,2.8,0,4.2,0c-0.1-1-0.2-2-0.3-3
+		C244.6,713.5,242.8,713.5,241,713.4 M358.6,713c0,1.4,0,2.8,0.1,4.2c1.5,0,3,0.1,4.5,0.1c0.5-0.4,1.3-1.1,1.8-1.5
+		c-1.7-0.5-3.4-1.1-5.1-1.6C359.5,714,358.9,713.4,358.6,713 M148.5,714.5c0,1.2,0.1,2.3,0.1,3.5c2.7,0.3,3.1,3.3,4.2,5.3
+		c0.4,0.1,1.1,0.3,1.5,0.4c0.4-2.3,1.5-4.3,2.7-6.3c-1.8,0.1-3.5,0.1-5.3,0.2c-0.4-1.1-0.8-2.2-1.2-3.3
+		C150,714.4,149,714.5,148.5,714.5 M123.9,720.5c-1.8,3.1-3.9,6.1-5.9,9.1c1.5-0.1,3,0.1,4.4-0.4c2-1.8,4.8-3.5,4.2-6.7
+		c0.5-0.7,1-1.3,1.5-2C126.7,720.5,125.3,720.5,123.9,720.5 M374.4,721.5c0.5,0.9,1.1,1.8,1.7,2.7c1.1,0.2,2.3,0.3,3.4,0.5
+		c0-1.1,0-2.2,0-3.3C377.9,721.4,376.1,721.5,374.4,721.5 M105.4,731.4c0.1,1.4,0.1,2.8,0.2,4.2c0.5,0,1.7-0.1,2.2-0.1
+		c0.6-0.7,1.1-1.4,1.7-2c0-0.5,0.1-1.4,0.1-1.9C108.2,731.5,106.8,731.4,105.4,731.4 M356.5,731c-0.1,2.6-0.1,5.2,0.8,7.7
+		c1.5-0.1,2.9-0.1,4.4-0.1c-0.5-2.1-0.9-4.1-1.3-6.1C359.1,731.9,357.8,731.4,356.5,731 M256.2,736.3c0.4,1.6-0.2,4.1,2,4.6
+		c2.2-1.1,1.2-2.8,0.4-4.5C258,736.4,256.8,736.3,256.2,736.3z"/>
+	<path class="st2" d="M761.5,489.4c-0.1-5-0.3-9.9,0-14.9c4.2,0.1,8.3,1.2,12.5,1.1c4.4-0.4,8.6,1.9,13,0.8c15,0.2,30,0.7,45,0
+		c4-0.3,8.1,0.6,12.1,0c8.2-1.6,16.6-0.1,24.9-1.4c1.5-0.4,2.9,0.2,4.4,0.5c0,2-0.1,4-0.1,6c0,2.7,0,5.4,0,8
+		c-5.8,0.1-11.6-0.2-17.2,1.6c-3.5,1-6.5,3.4-9.3,5.6c-1,2.8-2.1,5.5-2.6,8.3c-1.4,0.6-2.8,1.2-4.2,1.8c0.8,1,1.7,1.9,2.6,2.9
+		c-0.1,2.5-0.1,5.1-0.2,7.6c-1,4.9-1,10-0.5,15c-1.9,1.8-3.8,3.6-5.8,5.3c-0.4,1.4-0.7,2.8-1.1,4.2c2.2-0.3,4.3-0.5,6.5-0.8
+		c-0.1,10.4,0.1,20.9,0.1,31.3c-0.5,8,0.1,16.1-0.1,24.1c1.9,0,3.8,0.1,5.7,0c4.9-0.8,10-1.4,14.9-0.5c3.7,1,7.3-0.9,11-0.2
+		c4.6,1,9.3-0.6,14,0.4c9.3-0.6,18.7-1.2,28,0.2c3.7,0.3,7.3-1.3,10.9-0.3c6.2,1.2,12.4-1,18.5,0.4c0,1,0.1,3,0.2,4
+		c-2,0-3.9-0.1-5.9-0.1c-0.6,0.9-1.1,1.9-1.6,2.8c1.3,0.5,2.6,1,3.9,1.5c1.4,0.4,2.9,0.8,4.5,0.6c1.7-2.6,2-5.9,2-8.9
+		c7.2-1.3,14.5-1.1,21.7-0.3c0.8,0.1,2.5,0.2,3.3,0.3c-0.2-16.2-0.1-32.4-0.1-48.6c0.1-8.7,0.3-17.5-0.7-26.2
+		c-0.3-7.8-0.2-16.2-4.3-23.1c-2.8-5-8.2-8-13.8-8.4c-0.1-1.5-0.2-3-0.2-4.5c2-2.2,3.8-4.6,6-6.6c0-0.7,0-2.1,0-2.7
+		c8.6-0.4,17.1,0.3,25.7,0.2c15.7-0.2,31.4,0.4,47-0.9c7.1-0.2,14.3-0.4,21.4-0.2c-0.3,4.7-0.8,9.5-0.8,14.2
+		c-8.1-0.3-16.3-0.2-24.4,0c-1.3-1.7-2-3.8-2.3-5.9c-0.8,2.6-1.3,5.3-1.4,8.1c1.4,0.5,2.8,1,4.3,1.6c-0.2,0.8-0.7,2.4-0.9,3.2
+		c-4.9,8.1-5.6,18-5.6,27.3c0.1,41-0.2,81.9,0,122.9c0,4.4-1.1,8.7-0.4,13.1c0.8,6.2,0.1,12.5,0.5,18.7c-0.5,1.2-1.1,2.3-1.7,3.4
+		c-0.1,1.9-0.1,3.8-0.1,5.6c-0.8,0-2.5-0.2-3.4-0.2c-1,2-2.2,3.9-4.2,5c1.9-0.1,3.8-0.1,5.7-0.2c-0.1,1.6-0.2,3.2-0.3,4.7
+		c-0.9,0.7-1.7,1.5-2.5,2.3c1,0,2.1,0,3.2,0c1.1-0.5,2.2-0.9,3.2-1.2c-0.8,7.3,2.6,14.1,2.4,21.3c-0.6,0.3-1.6,0.8-2.2,1.1
+		c0,1.6,0,3.2,0,4.8c0.5,0.3,1.6,0.9,2.1,1.2c0,1.2,0,2.5,0.1,3.8c1.8,0,3.5,0.1,5.3,0.1c-1.2-1.1-2.4-2.1-3.6-3.2c0-1-0.1-3-0.1-4
+		c0.9,0.1,2.8,0.2,3.8,0.3c3.1,2,6.5,3.3,9.9,4.9c4.2,0.2,8.5,0,12.7-0.2c-0.2,5-0.5,9.9-0.3,14.9c-10.1-1-20.3-0.4-30.3-1.7
+		c-5.3-1-10.7,0.4-16-0.4c-4.7,0.7-9.4,0-14-0.1c-8,0.8-16.1,0.3-24.1,0.7c-5.3,0.2-10.7-0.5-16,0.2c-3.5,0.5-7,0.7-10.5,0.7
+		c-0.1-4.7-0.6-9.3-0.9-13.9c5.7-0.8,11.7,0.3,17.2-2c4-1.1,7.2-4,9.9-7.2c0.4-0.5,1.3-1.5,1.8-2c2.3-13,3.5-26.3,3-39.5
+		c-0.2-5.6,0.7-11.3-0.3-16.9l1.7,0.5c-0.2,1.7-0.3,3.3-0.5,5c2-0.6,4-1.1,6-1.6c0.1-1.1,0.2-2.2,0.3-3.3c-1-0.5-2.1-1-3.1-1.4
+		c0-2.4,0-4.8,0-7.1c-1.4,1.1-2.9,2.1-4.4,3.1c0.7-13.2,0-26.6,0.5-39.8c-31.5,0.6-63.1,0.1-94.7,0.3c-12.2-0.1-24.3,0.2-36.5-0.1
+		c0,2.7,0,5.4,0,8.1c-0.7,0.1-2,0.2-2.7,0.2c0.7,0.1,2,0.3,2.7,0.4c0,14.2,0.1,28.5,0,42.7c0.1,14-0.6,28.1,1.8,42
+		c0.8,4.1,2.3,8.1,4.7,11.5c6.2,7.2,16.6,6.5,25.3,6.9c-0.5,4.7-0.5,9.5-0.7,14.2c-11.1,0.4-22.1-2-33.2-1.1
+		c-1.4-0.1-2.8-0.1-4.2-0.1c-2.7-0.1-5.5-0.2-8.2-0.3c0.1-1.8,0.2-3.7,0.4-5.5c-1.4,1.1-3,1.9-4.6,2.5c-0.1,0.7-0.1,2-0.2,2.7
+		c-5.8,0-11.6,0-17.5,0c0.1-1.9,0.1-3.7,0.2-5.6c1.6-0.8,3.2-1.6,4.8-2.3c2-3.5,1-7.7,1.4-11.6c-1.9-0.8-3.7-1.5-5.6-2.2
+		c-0.9,2.1-1.9,4.2-2.9,6.3c1.8-0.1,3.5-0.1,5.3-0.2c0.7,1.4,2.7,2.8,1.4,4.5c-0.9,0.5-1.9,0.8-2.9,1.1c-0.1,2.7-2.1,4.2-4.3,5.2
+		c0,1.5-0.1,2.9-0.1,4.4c-8.5,1.4-17.1,0.3-25.7,1.5c-5.2,0.7-10.5,0.2-15.7,1.2c0.3-5.2-0.1-10.3,0.3-15.5c3.8,0,7.7,0.1,11.5-0.2
+		c4.3-0.3,8.1-2.7,12-4.6c0.3-0.7,0.7-1.5,1.1-2.2c6.2-10.5,5.4-23.1,5.5-34.8c0-21.6,0-43.3,0.1-65c1-10,0.8-20,0.5-30
+		c0.2-9.3,0.9-18.7-0.5-28c-0.3-11.3,0-22.6-0.1-34c-0.2-8.1,0.5-16.2-1.2-24.2c-2.6-4.1-4.2-9.1-8.5-11.8
+		C775.7,489.3,768.3,489.9,761.5,489.4 M826.5,479.8c0.1,0.6,0.2,1.9,0.2,2.6c-1.3,1.5-2.7,3-4,4.4c0,0.8-0.1,2.2-0.1,3
+		c-1.6-0.2-3.3,0-4.7-1.1c-1.1,0.4-2.2,0.9-3.3,1.3c-0.1,1.3-0.1,2.7-0.1,4.1c0.7-0.5,1.4-1.1,2.2-1.6c1.5,0,3.1,0,4.7,0
+		c0.7,1.1,1.4,2.2,2.2,3.3c1.3-1.6,2.8-3.1,4.8-3.6c0.1-0.8,0.2-1.6,0.3-2.3c-1.1-0.4-2.2-0.9-3.3-1.3c0-1.6,0.2-3.1,0.5-4.6
+		c1.3-0.2,2.6-0.4,3.9-0.4c0.6-0.6,1.1-1.1,1.7-1.7c0-1.1,0-2.2,0-3.2C829.8,478.9,828.1,479.3,826.5,479.8 M849.6,478.5
+		c-0.1,1-0.1,2-0.2,3.1c0.6,0,1.7-0.1,2.2-0.1c0.7-0.9,1.4-1.9,2.1-2.8C852.4,478.6,851,478.6,849.6,478.5 M1014.1,482.8
+		c0,0.2,0.1,0.6,0.1,0.7c0.6-0.1,1.8-0.2,2.4-0.2c-0.1,0.6-0.2,1.7-0.3,2.2c1.3,0,2.7,0,4.1,0c0-1.4,0-2.8,0-4.2
+		C1018.3,481.8,1016.2,482.4,1014.1,482.8 M795.3,486c0.6,1.3,1.1,2.5,1.7,3.8c1.5-1.4,2.9-2.8,4.4-4.2c0-1.2,0.1-2.3,0.1-3.5
+		C799.8,483.9,797.9,485.7,795.3,486 M998.5,486.3c0,1.9,0,3.9,0.1,5.8c-0.4,0.5-0.8,1.1-1.1,1.7c1.6,1.9,2.4,4.5,4.6,5.8
+		c0.7-0.6,1.3-1.2,2-1.8c1.8-0.9,3.5-1.9,5.4-2.7c0-1,0.1-2,0.1-2.9c-1.2,0.3-2.4,0.7-3.5,1.3c-1.4,0.1-2.9,0.1-4.2-0.2
+		c-0.9-2.4-0.3-5-0.3-7.5c0.5-1,0.9-1.9,1.4-2.9C1001.3,483.9,999.9,485.1,998.5,486.3 M810.1,496.6c-1.3,2-3.1,3.9-5.6,4.2
+		c0,0.4,0.2,1.1,0.2,1.5c0.5,0.3,1.6,0.9,2.1,1.2c0,0.7-0.1,2.1-0.2,2.8c0.5,0.1,1.4,0.3,1.9,0.3c0-1.6,0-3.2,0.8-4.7
+		c0.1-0.6,0.2-1.7,0.3-2.2c1.2-1,2.5-2.1,3.7-3.2C812.1,496.6,811.1,496.6,810.1,496.6 M837,497.7c-1.2,2.1-2.5,4.3-2.8,6.8
+		c1,0,2,0,3,0c0.6-2.4,1.4-4.7,2.3-7C838.7,497.5,837.8,497.6,837,497.7 M815.7,500.5c-0.4,0.5-1.1,1.4-1.5,1.9
+		c-0.5,0.1-1.6,0.3-2.1,0.4c0.4,0.4,1.2,1.4,1.6,1.8c1.6-0.4,3.1-0.9,4.7-1.3c0-1,0.1-2,0.1-3C817.6,500.4,816.6,500.5,815.7,500.5
+		 M799.5,509.4c0,0.5,0.1,1.5,0.1,2c3.2,1.8,4.8,5.4,7.8,7.4c1.2,2.1,1.1,4.5,1.2,6.9c-1.4,0-2.7-0.1-4.1-0.1c0,0.4-0.1,1.2-0.2,1.5
+		c0.8,0.4,1.7,0.8,2.5,1.2c1.1-0.5,2.2-0.9,3.3-1.3c0-0.6,0.1-1.7,0.1-2.2c1-1.8,2.2-3.6,3.5-5.2c-0.8,0-2.4,0.1-3.2,0.2
+		c-2-1.9-4.2-3.5-5.8-5.8c-0.5-0.1-1.6-0.3-2.2-0.4c-0.6-1.2-1.1-2.4-1.6-3.6C800.7,509.7,799.9,509.5,799.5,509.4 M818.5,536.8
+		c0.9,1.8,1.7,3.7,2.4,5.7c0.5,0.6,1.4,1.7,1.9,2.3c-1,0.8-1.9,1.5-2.9,2.3c-0.3,0.4-0.8,1.3-1.1,1.7c-0.5,0.3-1.6,0.9-2.1,1.2
+		c0,0.6,0,2,0,2.6c-1.3,0-2.6,0.1-3.8,0.1c-0.1,0.6-0.2,1.8-0.3,2.5c-2.9,1.8-7,3.7-6.1,7.8c1.1-1.4,2.2-2.9,3.3-4.3
+		c1.4-0.5,2.8-1,4.1-1.6c1.1-1.9,2.2-3.9,3.9-5.3c1.2-0.8,3-1.2,3.3-2.9c1.1-0.9,2.2-1.7,3.4-2.5c0-0.9,0-1.7,0-2.6
+		c-1.5-0.3-4.4-0.8-3.1-3.2c1.1-1.3,2.1-2.5,2.4-4.2C822,536.6,820.3,536.7,818.5,536.8 M821,563.9c0.9,1,1.8,1.9,2.7,2.9
+		c-1.9,3.3-0.8,7.3-1.1,10.9c-0.6-0.1-1.7-0.2-2.2-0.2c0.1,1.6,0.1,3.3,0.2,4.9c-0.4,0.2-1.3,0.6-1.7,0.7c4,0.1,5.3,4.9,5.7,8.1
+		c1.4,0.5,2.8,1,4.3,1.6c-0.5-0.9-1-1.8-1.5-2.7c0-0.6,0-1.7,0-2.3c-1-0.5-2-1-3-1.5c0-2.3,0-4.6-0.1-6.8c1.9-1,4-1,6.2-1
+		c0-1,0-2.1,0.1-3.1c-1.8,0.1-3.5,0.2-5.2,0.3c0.1-3,0.1-5.9,0.1-8.8C824,565.8,822.5,564.8,821,563.9 M988.9,579.4
+		c-0.4,1.4-0.9,2.7-1.5,4c2.6,1,5.4,2.7,8.1,1.1c0-0.9,0-1.8,0-2.8C993.3,580.9,991.1,580.1,988.9,579.4 M997.6,587.5
+		c0,1.7,0,3.3,0,5c-0.7,0-2.1,0.1-2.8,0.2c-2.7,2.2-5.9,3.5-9.4,2.8c0.3,1.3-0.1,3.1,1.3,4c3.1-0.1,6.2-2,9.4-0.6
+		c2.1,0.9,4.4,0,6.5-0.6c0.2-1.8-0.5-4,1.1-5.3c-2-1.1-0.7-3.7-1-5.5C1000.9,587.5,999.2,587.5,997.6,587.5 M951.8,601.7
+		c-0.1,0.4-0.3,1.3-0.4,1.8c0.6,0.1,1.8,0.2,2.4,0.3c0-0.6-0.1-1.8-0.2-2.4C953.1,601.4,952.2,601.6,951.8,601.7 M809.5,605.9
+		c-2.1-0.1-4.1-0.4-5.9-1.4c0,1.3,0,2.6,0,3.9c-1.2,0.7-2.5,1.5-3.7,2.2c-0.3,2.6-2.2,4.4-4.8,4.3c2.6,0.9,1.2,4,1.5,6.1
+		c-1.1-0.2-2.2-0.4-3.2-0.6c0.1,0.5,0.3,1.4,0.3,1.8c1.4,0.2,2.8,0.6,3.8,1.6c-0.1-2.3-0.1-4.6-0.1-6.9c0.3-0.6,0.8-1.7,1.1-2.2
+		c1.4-1,2.8-2.1,4.2-3.2c1.9,0,3.8,0,5.6,0.1c0-1.6-0.1-3.1-0.1-4.7c1.8-0.9,2.5-2.7,3.4-4.4l-0.9-0.2
+		C810.4,603.4,809.9,604.6,809.5,605.9 M806.4,628.3c0,1.4,0.1,2.8,0.1,4.2c0.5,0,1.5,0.1,2.1,0.2c0-1.4,0-2.9,0-4.3
+		C808,628.4,806.9,628.4,806.4,628.3 M809.5,640.7c-1.3,0-2.5-0.1-3.8-0.1c0.2,4.5-2.7,8.3-6.1,10.9c0,1.3,0,2.6,0,4
+		c0.9,0,1.8,0,2.7-0.1c0-1.6,0-3.2,0.2-4.8c1.2-1.5,2.9-2.8,3.2-4.8c1.5-1,2.9-2.2,2.9-4.2c0.5-0.3,1.4-0.8,1.8-1
+		c-0.1-1.2-0.2-2.5-0.4-3.7C809.9,638.2,809.7,639.4,809.5,640.7 M983.6,670.5c-0.7,1.2-1.3,2.3-2,3.4c0,0.4-0.1,1.2-0.1,1.6
+		c1,1,1.9,1.9,2.9,2.9c0.5,0.1,1.5,0.2,2.1,0.3c-0.1-2.7-0.1-5.5-0.1-8.2C985.5,670.5,984.5,670.5,983.6,670.5 M799.5,698.8
+		c0,0.3,0.1,1,0.1,1.3c1.4,0.4,2.8,0.8,4.2,1.3c-0.5,2-1,3.9-1.4,5.9c-0.9,0.3-1.8,0.7-2.6,1c3.2-0.3,6.5-0.2,8.6,2.5
+		c-0.5-5.6-1.3-11.2-0.9-16.9C804.9,695.7,802.3,697.5,799.5,698.8 M988.9,703.1c-0.3,1-0.6,2-0.9,3c0.6,2.2,1.3,4.8-0.1,6.9
+		c-0.5,1.4-1,2.9-1.5,4.4c0.8,0,2.3-0.1,3.1-0.1c1.4,1.6,2.6,3.4,3.6,5.3c0.9-0.6,1.9-1.1,2.8-1.7c-1.8-1.5-4.1-2.6-5.6-4.4
+		c-0.2-1.7,0.5-3.2,1-4.8c2.5-0.8,4.4-2.5,6.3-4.3c1,0,3,0,4,0c-0.1,0.8-0.2,2.5-0.2,3.3c1.6,2.2,4.4,1.4,6.6,2.4
+		c0.5,1.4,0.9,2.8,1.3,4.2c0.1-1.9,0.1-3.8,0.2-5.7c-1.4-0.4-2.8-0.8-4.2-1.2c0.1-0.7,0.2-2.1,0.3-2.8c-2.6,0.4-4.9-0.6-6.1-3
+		c-0.9,0-1.8,0.1-2.8,0.2c-1.2,0.7-2.2,2.2-3.8,1.9C990.6,707.3,990,704.5,988.9,703.1 M981.6,719.6c0,1.4,0,2.7-0.1,4.1
+		c1.8-0.3,3.6-0.8,5.3-1.4c-0.8-0.9-1.7-1.8-2.5-2.7C983.4,719.6,982.5,719.6,981.6,719.6 M1028.4,732.5c0.1,0.4,0.2,1.1,0.3,1.5
+		c1,0.8,2,1.6,3,2.4c1.1,0,2.1,0.1,3.2,0.2c-0.1-1.7-1-3.1-2.3-4.1C1031.2,732.5,1029.8,732.5,1028.4,732.5z"/>
+	<path class="st2" d="M946.5,476.4c2,0,4,0,6.1,0c0,2,0,4,0.1,6c-1.2,1-2.4,1.9-3.8,2.6c-0.1,4.1-4.4,4.6-7.7,4.6
+		c0.4-3.5,3-5.9,4.8-8.7C946.2,479.5,946.4,477.9,946.5,476.4z"/>
+	<path class="st2" d="M1195.2,497.4c0.5-3.3,0.7-9,5.6-8.4c-0.1,1.9-0.1,3.7-0.1,5.6C1198.9,495.6,1197,496.5,1195.2,497.4z"/>
+	<path class="st2" d="M453.6,586.7c0.8-0.1,2.3-0.4,3.1-0.6c-0.4,2.2-0.9,4.4-1.3,6.7c-0.5,0.1-1.6,0.4-2.2,0.6c0-2,0.1-3.9,0.1-5.9
+		L453.6,586.7z"/>
+	<path class="st2" d="M14.7,635.4c0.9,0,2.6,0,3.5,0c2.6,3.2,4.7,6.9,7.2,10.2c1,1.5,2.9,0.6,4.3,0.8c-0.2,8.2-0.1,16.3-0.1,24.5
+		c-1.4-0.1-2.8-0.2-4.2-0.4c0,0.5,0.1,1.6,0.1,2.1c1.3,1,3.3,1.4,3.9,3c0.3,2.3,0.1,4.7,0.1,7.1c-1,0-2.9-0.1-3.9-0.1
+		c1.2,1.1,2.5,2.2,3.7,3.2c0,2.9-0.1,5.8-0.1,8.7c-0.8,0-2.3,0-3,0c-0.8,1.4-1.5,2.8-2.2,4.2c-2.8-0.1-7.1,0.4-5.9-3.9
+		c1.2-1.5,3.9-2.9,2.8-5.2c-1.4-3.7-0.5-7.5,0.6-11.1c-1.4-0.1-2.9-0.1-4.3-0.2c0.1,2.4,0.1,4.7,0.2,7.1c0.8,1.1,2.4,1.9,2,3.6
+		c0.7,2.5-2.2,2.7-3.8,2.6c0,2.6-2.1,3.5-4.5,3.3c0-1.1-0.1-3.2-0.1-4.2c1-0.1,1.8-0.6,2.3-1.3c-0.6-0.3-1.8-0.8-2.4-1.1
+		c0.1-2.4-0.2-5,2-6.5c0.1-1,0.1-2,0.1-3c-3.5-0.2-6.7-1.6-10-2.5c0.5-2.3-1.7-7.4,2-7.2c0-0.9-0.1-1.7-0.1-2.5
+		c-0.8,0-2.3,0.1-3,0.1c0.1-2.9,0.1-5.7,0.1-8.6c1.7,0.1,3.5,0.2,5.2,0.3c0,1.5,0.1,3,0.1,4.6c1.7,1,3.6,1.8,5,3.2
+		c1.1,1.8,2.3,3.7,3.9,5.1c1,0,2,0.1,2.9,0.1c0-2-0.1-4-0.1-5.9c-0.7-0.8-1.4-1.5-2.1-2.2c0-3,0-6-0.1-9c0.8-0.1,2.5-0.2,3.4-0.3
+		c-0.1,1.8-0.1,3.5-0.2,5.3c1.1,0.1,2.1,0.1,3.2,0.2c-0.1-1.7-0.1-3.3-0.2-5c-1.8-1.7-3.2-3.6-4.3-5.8c-1.2-0.5-2.4-1-3.6-1.5
+		c0-2.3,0-4.6,0-6.9c-0.8-0.8-1.6-1.6-2.4-2.4C13.5,637.5,14.3,636.1,14.7,635.4z"/>
+	<path class="st2" d="M466.2,665.3c0.6,0.1,1.9,0.2,2.5,0.3c-0.4,1.6,0.7,4.6-2.2,4.4C466.4,668.4,466.3,666.9,466.2,665.3z"/>
+	<path class="st2" d="M0,666.3c2.3,0.2,2.5,5.2,0,4.9V666.3z"/>
+	<path class="st2" d="M484.7,667.7c1.6-0.9,3.4,0.2,5,0.5c0,1.1,0,3.3-0.1,4.4c-1.8,0-3.7,0-5.5,0
+		C484.3,671,484.5,669.3,484.7,667.7z"/>
+	<path class="st2" d="M0,679.1c0.4-0.5,1.1-1.4,1.5-1.8c1.8,0,3.6,0.1,5.4,0.2c-0.5,1.8-1,3.6-1.5,5.4c-1.8-0.6-3.6-1.2-5.4-1.8
+		V679.1z"/>
+	<path class="st2" d="M1.4,685.5c1.7,0,3.5-0.1,5.2-0.1c0,1.1,0.1,3.2,0.2,4.3c-1.8-0.1-3.5-0.2-5.2-0.2
+		C1.5,688.1,1.4,686.8,1.4,685.5z"/>
+	<path class="st2" d="M1019.3,694.2c0.4-1.9-1.1-5.2,2-5.4c0.2,0.8,0.5,2.5,0.7,3.3c-0.2,1.6-0.3,3.3-0.5,5
+		C1020.8,696.1,1020.1,695.1,1019.3,694.2z"/>
+	<path class="st2" d="M0,691.1c0.9,0.5,1.8,1,2.7,1.4c1.6-0.5,3.3-1.1,4.9-1.6c0,1.2,0,3.5,0,4.6c-2.5,0-5.1,0-7.6,0.1V691.1z"/>
+	<path class="st2" d="M0,698.7c2,0.8,2.6,2.9,3.5,4.6c1,0.2,1.9,0.3,2.9,0.4c0.3-0.5,1-1.6,1.3-2.2c2.8-0.2,5.5-0.9,8.3-0.9
+		c2.5,0.8,4.9,1.7,7.5,2.2c-0.1-0.9-0.2-2.8-0.2-3.7c1.7,0.2,3.4,0.4,5.1,0.7c-0.1,1.6-0.4,3.3-0.7,4.9c-1.2,0-2.4-0.1-3.5-0.1
+		c-0.9,4.8-8.3,4.1-9.3-0.3c-0.9,0.9-1.8,1.9-2.8,2.8c5.9,0.9,11.6,3.2,17.7,2.2c-0.1,2.6-0.2,5.3-0.6,7.9c-3.9,0.9-7.9-0.4-11.8-1
+		c0,1.5,0.1,3.1,0.2,4.6c3.2,1,5.8,3.2,8.1,5.6c1.3,0,2.5-0.1,3.8-0.1c0.1,8.2,0.4,16.5,0.1,24.7c0.1,1.6-1.2,2.7-2,3.9
+		c-0.1,0.7-0.2,1.3-0.3,2c4.2,1.5,1.8,6.8,2.1,10c-0.8-0.7-2.3-2.1-3-2.8c-0.1-0.5-0.1-1.6-0.2-2.1c-2.9-1-5-3.3-5.2-6.5
+		c-1.9-0.1-3.7-0.1-5.6-0.2c0.3,4.7,0.8,9.7-1.9,13.9c-1.8,0.1-3.7,0.1-5.4,0.5c-3.3,1.7-2.5,5.8-2.8,8.9c1-0.1,2-0.1,3-0.2
+		c0.3-1.8,0.6-3.5,1-5.3c2.4,0.1,4.7,0.1,7.1,0.2c1.2-3.6,1.3-7.4,1.1-11.2c1.4,0,2.8,0,4.2,0c3.3,2.8,5.3,6.6,6.9,10.5
+		c0.7,4.2,1.5,8.4,1.3,12.7c-4.6,0-9.5,0.3-13.6-2c0.6-1.7,1.2-3.4,1.8-5.1c-1.3-0.4-2.6-0.8-3.9-1.1c-1.5,3.9-5.4,6.2-7,10
+		c1.1,0.1,2.2,0.3,3.4,0.5c0.4-0.4,1.2-1.2,1.6-1.6c1.2,1.1,2.4,2.2,3.6,3.4c4.7-0.3,9.4,0.6,14.1,1.1c-0.1,2.5-0.3,4.9-0.5,7.4
+		c-0.5-0.4-1.6-1.3-2.1-1.7c-2.8,0.4-5.6,0.8-8.3,1.7c-0.2,1.2-0.4,2.4-0.6,3.7c-1.2,1.3-2.5,2.6-3.8,4c-0.5,0-1.5,0-2-0.1
+		c0-1.9,0.1-3.8,0.1-5.7c1.7-0.5,3.4-1,5-1.6c1.1-2.8-1.8-3.3-3.7-4.2c-1.8,1.8-3.9,3.4-5.4,5.5c-0.9,1.7-1,3.8-1.3,5.7
+		c1.9,0.8,3.7,1.6,5.6,2.4c-0.5,2.2-0.9,4.5-1.4,6.8c0.8,0.7,1.5,1.4,2.3,2.1c0.9,0,1.8,0,2.7,0c0.2-1.8,0.5-3.5,0.8-5.3
+		c1.5,0,3,0.1,4.6,0.1c0,3.1-0.1,6.1-0.1,9.2c1.8,0.7,3.7,1.3,5.5,2c-0.6,1.8-1.1,3.5-1.7,5.3c2.1-0.3,4.1-1,5.8-2.1
+		c2.5-0.3,4.9-0.7,7.3-1.3c0-1.1,0-2.2,0-3.2c4,0,8,0.1,12,0.2c0.1,1.1,0.2,3.2,0.2,4.2c-3.1,2.2-6.7,3.2-10.4,2.8
+		c0.1,1.2,0.1,2.5,0.2,3.7c2.5,1.9,3.6,4.7,3.1,7.8c-1.4,1.1-2.8,2.2-4.1,3.3c0,0.9,0.1,1.7,0.2,2.6c1.8,1.3,4.8,2.2,3.9,5.1H32.8
+		c1.7-1.2,3.4-2.4,5-3.7c-2.2-2.3-4-4.8-5.1-7.8c2-0.5,4-1,6.1-1.4c0.2-3.7-3.4-4.6-6.3-4.9c-0.6,0.8-1.3,1.6-1.9,2.5
+		c0.4,1.3,0.8,2.6,1.1,4c-2.7,0.8-3.7-2.4-5.3-3.8c-2.1-0.3-4.1-0.5-6.2-0.8c0.1-3,0.2-6,0.3-9c-0.8,0.6-1.6,1.2-2.3,1.8
+		c-2.1-0.5-4.2-1-6.4-1.5c-0.6,1.1-1.1,2.1-1.6,3.2c-1.8,0-3.7,0-5.5,0c-0.8,1.8-1.6,3.7-2.5,5.6c2.7,1,6.2,2,5.7,5.8
+		c-3.3,0.2-6.2-1.3-7.9-4.2v-11.1c1.6,0,3.2-0.1,4.8-0.1c-0.1-0.7-0.4-2-0.5-2.7c-1.5-0.6-2.9-1.2-4.3-1.9v-15.8
+		c0.4,0.6,1.2,1.9,1.6,2.6c1.5-0.1,2.9-0.1,4.4-0.2c-0.4-2.7-2.1-4.7-4.1-6.5c-0.7-1.6-1.3-3.2-1.9-4.9V698.7 M3.1,709.1
+		c0,3,1.6,5.5,3.4,7.8c-0.9,1.3-1.7,2.8-0.9,4.4c1.8,0.4,3.8,0.6,5.5-0.1c1.1-3.7,0.7-8.6-2.8-10.9C6.9,709.1,4.8,709.5,3.1,709.1
+		 M1.3,721.7c0.9,0,2.6,0,3.5,0c0-1.4-0.1-2.8-0.1-4.2c-0.8,0-2.5,0-3.3,0C1.3,718.8,1.3,720.2,1.3,721.7 M2.1,728.3
+		C4,733,4,738,3.4,742.9c-0.3,0.9-1,2.7-1.3,3.5c1.7,0,3.5,0.1,5.2,0.1c0.3-0.5,1-1.6,1.3-2.1c1,0,2,0,3,0c0,1,0,2.1-0.1,3.2
+		c-0.5-0.1-1.6-0.2-2.1-0.2c0,0.6,0,1.8,0,2.5c1.6-0.2,3.3-0.3,4.8-1.1c1.1-0.2,2.2-0.3,3.3-0.4c0.1-2,0.2-4,0.1-5.9
+		c-1.6-0.8-3.3-1.4-4.9-2.1c-0.1-1.7-0.2-3.3-0.3-5c2.4-0.8,4.9-1.3,7.3-1.9c0-2.1,0-4.3-0.1-6.4c-4.1,1.8-7.8,4.8-12.6,4.5
+		c-0.8-1-1.5-2-2.3-3C4,728.5,2.8,728.3,2.1,728.3 M24.8,742.6c-0.4,1.6-0.9,3.1-1.3,4.7c-0.4,0.3-1.2,0.9-1.6,1.2
+		c1.8,0,3.5,0,5.2,0c0.5-1.2,0.9-2.3,1.4-3.5c-0.3-0.6-1-1.9-1.3-2.5C26.4,742.5,25.6,742.5,24.8,742.6 M5.6,764.7
+		c1.9,0.3,3.1-1,4.1-2.4c-1.2-2-1.2-4.4-1.1-6.7c-0.8-0.4-2.3-1.2-3-1.6C4.1,757.4,3.9,761.5,5.6,764.7z"/>
+	<path class="st2" d="M535.2,709.2c0-1.9,1.1-3.2,2.6-4.2c0.7,0.4,2.1,1.2,2.8,1.6c-0.1,1.2-0.1,2.5-0.2,3.7c-1.1,1.4-2.2,2.8-3.5,4
+		c-1.5,0.3-2.9,0.4-4.4,0.5c-0.4-0.7-1.3-2.2-1.7-2.9C532,710.4,533.4,709.3,535.2,709.2z"/>
+	<path class="st2" d="M1378.6,725.3c3,0,6,0.4,8.9,1.4c-1,1.8-3.1,2-4.7,2.7c2.3-0.4,6.7,1.6,6.9-1.9c0.7-0.1,2-0.2,2.7-0.3
+		c0.1,1.7-0.1,3.8,2.4,3.5c0,1.6,0,3.3,0,4.9c-1.6,0.5-3.1,1-4.7,1.5c-0.2-1.6-0.4-3.1-0.6-4.7c-0.6,0-1.9,0.1-2.5,0.1
+		c0.4,1.9,1.3,3.6,2.6,5c-0.3,0.4-0.9,1.3-1.2,1.7c0.5,0.1,1.4,0.3,1.8,0.4c-0.5-2.8,2.7-2.9,4.5-3.8c0.7,1.8,0.9,3.6,1,5.5
+		c-2.2,0.1-4.3,0.2-6.4,0.3c-7.1-0.1-14.3-0.4-21.3,1.4c0.4-2,1-3.9,1.5-5.9c-1.6,1.8-2.9,3.8-3.2,6.2l-1.7-0.8
+		c-0.2-2.8-0.1-5.6-0.1-8.4c1.8-1.5-0.1-3.7-0.4-5.4c2.8-0.3,5.6-0.7,8.4-1.1c0,0.8-0.1,2.4-0.2,3.2c1-0.1,2-0.1,3-0.2
+		c-0.1-1-0.2-2.1-0.3-3.1c0.6,0,1.8-0.1,2.5-0.1c0.1,0.8,0.2,2.3,0.3,3C1378.2,728.6,1378.4,726.9,1378.6,725.3z"/>
+	<path class="st2" d="M1708.7,774.4c-1.1-0.9,0-3.6,1.4-2.4C1711.2,772.9,1710.1,775.5,1708.7,774.4z"/>
+	<path class="st2" d="M1726.4,775.4c1.1,0,2.1,0,3.2,0.1c-0.1,2.8-0.1,5.8-1.6,8.3C1726.1,781.3,1726.5,778.2,1726.4,775.4z"/>
+	<path class="st2" d="M1706.2,778.5c-1.7,0.5-2.8-2.3-1-2.8C1706.7,775.2,1707.9,778,1706.2,778.5z"/>
+	<path class="st2" d="M1730.2,785.7c0.2-1.8,0.8-3.4,2.8-3.7v5.8C1732.3,787.2,1730.9,786.2,1730.2,785.7z"/>
+	<path class="st2" d="M1725.7,784.8c0.9-0.1,2.6-0.4,3.5-0.5c0.4,0.7,1.1,2,1.4,2.7c-0.4,0.8-1.1,2.3-1.5,3.1
+		C1727.5,788.9,1724.6,787,1725.7,784.8z"/>
+	<path class="st2" d="M1730,795.6c0.8-0.1,2.3-0.3,3-0.4v4.8C1732,798.5,1731,797.1,1730,795.6z"/>
+	<path class="st2" d="M23.5,811.4c1.7,0,3.4,0,5.1,0c0,1.9,0.1,3.8-0.1,5.8c-1.7,0.3-3.5,0.5-5.2,0.5
+		C23.3,815.6,23.4,813.5,23.5,811.4z"/>
+	<path class="st2" d="M28.9,823.3c-1.2-1.5-0.2-3.6-0.4-5.3c0.5,2.8,2.8,3,5,2.9c0,0.7,0.1,2.1,0.1,2.8
+		C32,823.6,30.4,823.5,28.9,823.3z"/>
+	<path class="st2" d="M100.1,821c9.1,0.6,18.2-0.2,27.3-0.3c0,0.4,0.1,1.2,0.1,1.6c-1.6,0.1-3.1,0.2-4.7,0.5
+		c-0.3,1.1-0.5,2.3-0.7,3.4c1.4,0.5,2.8,1,4.2,1.4c0.6-1.1,1.2-2.1,1.7-3.2c2.8,0.6,5.6,1,8.4,1.3c0.1-1,0.1-2.1,0.1-3.1
+		c-0.5-0.5-1.5-1.4-2-1.9c5.1,0.1,10.2,1.1,15.3,0.6c2.3-0.2,4.7-0.7,7-0.1c-0.1,2.3-0.5,4.5-0.7,6.8c0.5-0.2,1.4-0.5,1.9-0.7
+		c0.4-1,0.7-1.9,1.1-2.8c-0.3-1.1-0.3-2.1,0-3.2c3.8-1.1,7.8-0.3,11.6,0.1c-0.1,0.8-0.2,2.4-0.3,3.2c1.6,1.1,3.3,2.2,4.9,3.4
+		c0-1-0.1-2-0.1-2.9c-1.2-1.2-2.5-2.4-3.7-3.6c4.8-0.7,9.6-0.9,14.3-0.4c8.6,1,17.3-0.5,26-0.2c8.9-0.3,17.8,0.8,26.7-0.1
+		c0,0.6,0,1.9-0.1,2.5c1.6,0.4,3.2,0.8,4.9,1.3c-0.1-1.2-0.1-2.5-0.2-3.7c13,0.1,26-0.1,39,0.1c-2.3,3.3-5.5,5.7-8.8,8
+		c0,1.2,0,2.4,0,3.7c1.3,1.2,2.6,2.5,4,3.7c0.6,0,1.8,0.1,2.4,0.1c-2.7-2-2.9-5.3-2.7-8.4c3,0.7,6.7,2.5,9.3-0.2
+		c-0.1-2.4-0.1-4.8-0.1-7.2c8.9,0.7,17.8,0.7,26.7,0.2c2.5-0.2,4.9,0.9,7.2,1.8c0.5,1.3,0.9,2.6,1.4,4c1,0,2.1,0,3.1,0
+		c-0.1-0.9-0.2-1.8-0.4-2.7c-0.9-1-1.7-2.1-2.6-3.1c9.1,0.1,18.1-0.3,27.2,0.2c36.3-0.5,72.6-0.1,109-0.2c178,0,356,0,534,0
+		c8.7-0.4,17.3,0.8,26,0c17.3-0.1,34.7,0,52,0c11.3,0.1,22.6-0.4,33.9,0.5c8.6-0.8,17.3-0.4,26-0.5c10.8,0.2,21.5-0.5,32.2,0.7
+		c-0.8,1-1.6,2-2.4,3c1.8,1,3.8,0.5,5.8,0c-0.1-0.9-0.2-2.6-0.3-3.4c7.3,0,14.7,1,22-0.3c0.4,2.3-0.7,6,2.8,6.2
+		c1-2.3,1.2-6.5,4.8-5.7c6.7,0.4,13.8-1.8,20.1,1.2c1.3-0.5,2.5-1.4,4-1.4c4.2,0.2,8.7,0.3,12.4,2.6c0.7-0.8,1.4-1.5,2.2-2.3
+		c3.1-0.4,6.3-0.9,9.5-0.5c3.1,0.7,5.8,2.5,8.6,3.8c-0.1,1.8-0.1,3.6-0.1,5.5c-0.7,0.8-1.3,1.7-2,2.5c0,0.4-0.1,1.3-0.1,1.7
+		c0.3,0.5,1,1.5,1.4,2.1c0.4,0.1,1.2,0.2,1.7,0.3c0.8-2.1,1.7-4.1,2.8-6.1c0.1,1.6,0.1,3.2,0.2,4.8c0.9,0.3,1.9,0.7,2.9,1.1
+		c0.3,2.5,0.7,5,1.2,7.5c-1.1-0.6-2.2-1.2-3.3-1.8c0.1,1.3,0.2,2.7,0.3,4c-0.3,0.5-1,1.4-1.3,1.8c1.1,0.7,2.2,1.5,3.4,2.2l-1.8,0.7
+		H414.7c-0.4-0.6-1.2-1.8-1.6-2.5c-0.8-0.1-1.5-0.1-2.3-0.2c-0.2,0.7-0.6,2-0.8,2.7h-32.5c0-0.6-0.1-1.7-0.2-2.3
+		c-0.8-0.1-1.6-0.1-2.4-0.1c-0.2,0.6-0.7,1.8-0.9,2.5h-82.5c0-1.2,0-2.5,0-3.7c-0.9,0.1-1.7,0.2-2.6,0.3c-0.5,1-1,1.9-1.5,2.9
+		c-0.4,0.1-1.1,0.4-1.4,0.5h-27.6c2.4-1.6,5.2-1.8,7.9-1.8c0.1-3.8,0.4-7.6,1.2-11.4c-0.5-0.1-1.5-0.4-2-0.6c0,2.4,0.1,4.8,0.1,7.3
+		c-0.8,0.7-1.6,1.4-2.4,2.1c-2.2,0-4.4,0-6.6,0c-0.1,1.2-0.2,2.4-0.2,3.7c-0.4,0.2-1.1,0.5-1.5,0.7h-82c-1.1-2-2.2-5-5-4.5
+		c-2.7-0.7-2.5,2.8-2.6,4.5h-12.6c-1-1.3-2-2.7-3-4.1c-0.7,1.4-1.3,2.8-2,4.1h-7.6c1.1-2.5-3.3-2.5-3,0h-20.2
+		c-0.9-1.9-1.9-3.7-2.9-5.5c-0.7,1.8-1.4,3.7-2.2,5.5H94.5c0.8-0.4,2.3-1.2,3.1-1.6c-0.1-1.2-0.1-2.3-0.2-3.5
+		c-0.5-0.3-1.3-1-1.8-1.3c-0.3-1.7-0.7-3.5-1-5.2c-1.1,0-2.2,0-3.3,0c0.1,1.2,0.2,2.5,0.3,3.7c1.2,0.5,2.4,1,3.6,1.5
+		c-0.6,1.4-1.2,2.8-1.8,4.2c-4.4,0.3-5.9-4.7-7.8-7.7c-1.8-2.7-1.1-5.9-0.3-8.8c2.1,0.1,4.2,0.2,6.4,0.4c-0.1-0.9-0.2-1.8-0.2-2.8
+		c-3.9-1.6-7.2-4.7-7.3-9.1C89.5,821.7,94.8,820.5,100.1,821 M295.4,822.4c0,1.3,0.1,2.7,0.1,4.1c1,0,2,0,3,0.1c0-1.3-0.1-2.7-0.1-4
+		C297.4,822.5,296.4,822.4,295.4,822.4 M371.5,827.3c0.9,0,1.9,0,2.9,0.1c0.2-1.7-0.6-3.9,1.3-4.7c-0.4,0-1.2,0-1.6,0
+		C372,823.5,371.1,825.2,371.5,827.3 M1175.2,828.5c0.6,0,1.9,0.1,2.5,0.1c1.8-1.8,1.9-4.2,2-6.6
+		C1176,821.7,1175.6,825.8,1175.2,828.5 M198.4,822.2c-0.2,3.5-0.1,7,1.2,10.2c1.7,0.1,3.4,0.1,5.2,0.2c0-1.9-0.6-3.6-2.2-4.7
+		c0-1.5,0-3,0-4.5C201.2,823,199.8,822.6,198.4,822.2 M108.3,825.4c-0.4,1.1-0.9,2.1-1.3,3.2c0.8,0,2.3-0.1,3.1-0.1
+		c3.4,4,6.9,8.1,8.4,13.2c0.5,0,1.6-0.1,2.1-0.2c0-0.8-0.1-2.3-0.2-3.1c0.8-0.8,1.7-1.7,2.5-2.5c-0.9-0.8-1.7-1.5-2.6-2.3
+		c-1.6-0.3-3.1-0.7-4.6-1.2c-0.7-2.4-1.5-4.7-2.3-7.1C111.7,825.4,110,825.4,108.3,825.4 M224.1,825.7c-0.2,3-3,3-5.4,2.8
+		c-0.4,1.7-0.9,3.3-1.4,5c1.6,0,3.2-0.1,4.8-0.1c0.4-1.7,0.8-3.4,1.3-5c1.4,0,2.8,0.1,4.1,0.1c0-1-0.1-2-0.1-3.1
+		C226.3,825.5,225.2,825.6,224.1,825.7 M142.8,826.5c-0.4,0.7-1.3,2.2-1.8,3c1.2,0.6,2.5,1,3.9,1.1c2.4,0.5,2.8-2.5,2.9-4.1
+		C146.1,826.4,144.5,826.4,142.8,826.5 M181.6,826.5c-0.6,1.9-1.1,3.9-1.3,5.9c0.6,0.1,1.6,0.2,2.2,0.3c0.5-2.1,0.9-4.2,1.2-6.4
+		C183.2,826.4,182.1,826.5,181.6,826.5 M187.7,825.6c-0.2,1.3-0.3,2.7-0.5,4.1c1.2-0.1,2.4-0.1,3.6-0.2
+		C190.7,827.9,190.3,824,187.7,825.6 M361.4,826.5c0.1,0.9,0.2,1.8,0.3,2.7c1.3,0.1,2.5,0.2,3.8,0.3c0-1,0-2.1,0-3.1
+		C364.2,826.5,362.8,826.5,361.4,826.5 M1217.8,829c0.9,1.8,3.1,1.6,4.8,2c0.4-2,0.9-3.9,1.2-5.9
+		C1221.2,825.2,1219.6,827.4,1217.8,829 M97.1,827.6c0.2,2.4,2.1,3.3,4.4,3c0-1.4,0-2.9,0.1-4.3C100,826.7,98.6,827.2,97.1,827.6
+		 M349.7,831.8c1.4-0.5,2.8-1.1,4.2-1.6c-0.2-2.4-2.4-3.4-4.3-4.3C348.1,827.7,348.8,829.9,349.7,831.8 M1240.5,829.4
+		c1.3,0.1,2.6,0.1,4,0.2c0-1-0.1-2.1-0.1-3.1c-1,0-2.9,0-3.9,0C1240.6,827.5,1240.5,828.5,1240.5,829.4 M126.5,827.5
+		c-0.1,2.4-0.1,4.9-0.1,7.3c2.1,0,3.8-1.1,5.3-2.5c0-1.7,0-3.4,0-5C129.9,827.4,128.2,827.5,126.5,827.5 M299,828
+		c0.7,1,1.5,2,2.4,2.9c0.1,1.2,0.1,2.3,0.2,3.5c1.2-0.1,2.5-0.1,3.7-0.1c0-1.3,0.1-2.5,0.1-3.7c-1.1-0.1-2.3-0.2-3.4-0.2
+		C301.1,829.5,300.1,828.7,299,828 M1180.6,829c2,1.3,4.2,2.1,6.5,2.8c0.3,0.4,0.9,1.3,1.2,1.7c0.5,0,1.4,0,1.8,0
+		c0.5-1.3,1-2.6,1.6-4c-1.6,0-3.2,0-4.8,0C1185.1,827.7,1182.5,826.7,1180.6,829 M376.4,830.4c0,2.4,0.1,4.7,0.1,7.1
+		c1,0,2.1,0.1,3.1,0.2c0.5-2.4,0.8-4.8,0.9-7.2C379.2,830.5,377.8,830.4,376.4,830.4 M1200.5,833.4c2.5,1.8,4-3.3,0.7-2.6
+		C1200.1,831.4,1199.9,832.3,1200.5,833.4 M1211.2,834.8c-2-3.4-4.4,0.5-4.1,2.8c1.1,0,2.2,0,3.2,0c1.1-1.4,2.4-2.6,4-3.5
+		c0.4-0.7,1.1-2,1.5-2.7C1213.2,830.6,1212.3,833.1,1211.2,834.8 M135.5,835.2c1.3,1.5,3.3,2.1,5.1,2.9c0-2.3-0.1-4.5-0.1-6.8
+		C138.2,831.1,134.8,832.3,135.5,835.2 M157.4,833.5c0,1.1,0,3.3,0,4.4c3.6-0.2,6.9-1.5,10.5-1.2c0.3-2.4-2.2-3.2-3.7-4.4
+		C161.9,832.6,159.6,833,157.4,833.5 M1014.4,834.5c0,0.5,0.1,1.4,0.2,1.9c1.6,0.5,3.2,1,4.9,1.4c0.1-1.1,0.1-2.3,0.2-3.4
+		C1017.9,834.4,1016.2,834.5,1014.4,834.5 M170.1,835.3c0.4,2.4,1,4.9,1.6,7.3c1.4,0,2.8,0,4.1,0c-0.1-2.5-0.4-5-1.2-7.3
+		C173.1,835.3,171.6,835.3,170.1,835.3 M196.6,834.4c-0.1,1.8-0.1,3.6-0.2,5.4c1.8-0.3,4.2,0.6,5.2-1.4
+		C201.9,835.6,199,833.8,196.6,834.4 M1134.7,835.7c0,1.5,0,3.1,0,4.6c1.2,0,2.4,0.1,3.7,0.1c0.1-1.7,0.1-3.4,0.2-5.1
+		C1137.2,835.5,1135.9,835.6,1134.7,835.7 M1238.5,840.8c-0.3,0-0.9,0-1.2-0.1c0.1-1.9,0.3-3.9,0.3-5.8c-2.9,0.3-3,3.3-3.1,5.5
+		c-0.6,0.2-1.9,0.7-2.5,0.9c-0.6,0.1-1.9,0.2-2.5,0.2c-1.5,1.3-3.1,2.4-4.9,3.3c-0.1,0.9-0.2,1.8-0.2,2.7c1.4-0.1,2.8-0.1,4.1-0.1
+		c0-0.8-0.1-2.3-0.2-3.1c1.3,0,2.6,0,3.9,0c1.6-1.3,3.9-1.6,4.9,0.7c-0.5,0.4-1.6,1.3-2.1,1.8c0.5-0.1,1.6-0.3,2.1-0.5
+		c0.2-2.2,1-4.3,2.3-6.1c0.8,0.1,2.3,0.4,3.1,0.5c0.6-2.1,1.1-4.2,1.2-6.4c-1,0-3.1,0.1-4.1,0.2
+		C1239.3,836.7,1238.9,838.8,1238.5,840.8 M125.5,839.5c-0.7,0.7-1.3,1.4-2,2.1c-0.1,0.5-0.2,1.4-0.2,1.9c1.4,0.4,2.8,0.9,4.2,1.3
+		c0-1.8,0-3.6,0.1-5.4C127,839.4,126,839.4,125.5,839.5 M1156.7,839.6c1.8,2,4.3,2.1,6.8,2.1c0-0.5,0-1.6,0-2.2
+		C1161.3,839.5,1159,839.5,1156.7,839.6 M1181.7,839.6c-0.1,0.5-0.2,1.6-0.3,2.1c1.9,0.8,4,0.9,6.1,1c0-1.1,0.1-2.2,0.2-3.2
+		C1185.6,839.5,1183.6,839.5,1181.7,839.6 M1203.4,839.4c0,1.5,0,3,0.1,4.5c1-0.4,2.1-0.8,3.2-1.2c0-1.1,0-2.2,0-3.3
+		C1205.5,839.4,1204.5,839.4,1203.4,839.4 M133.6,843.9c0.4,0.8,0.9,1.6,1.4,2.4c0.8,0,1.5,0.1,2.3,0.1c0.5-2.3,1.1-4.6,1.3-6.9
+		C135.3,838.3,134.4,841.5,133.6,843.9 M1173.7,842c0,0.5-0.1,1.4-0.1,1.9c0.8,0.5,1.5,1,2.3,1.5c1.8-1.5,1.8-3.5,0.3-5.3
+		C1175.4,840.7,1174.5,841.3,1173.7,842 M1247.3,841.2c0,0.6,0.1,1.8,0.1,2.3c1.4,0.8,2.7,1.7,4.1,2.5c0-1.6,0.1-3.1,0.1-4.6
+		C1250.2,841.4,1248.7,841.3,1247.3,841.2 M102.4,841.2c0,1.1,0,3.2,0,4.3c1.5,1.4,3.2,2.4,5.3,2.4c-0.2-2,0.2-4.2-0.5-6.1
+		C105.6,841.5,104,841.3,102.4,841.2 M152.5,842.5c0,1.3,0,2.6,0,4c1.4,0,2.8-0.1,4.2-0.1c-0.1,0.6-0.2,1.8-0.2,2.4
+		c2.5-0.4,4.9-0.9,7.4-1.4c0.5-2.8-1.8-3.5-3.9-4.1c-0.9,0.6-1.7,1.3-2.5,1.9c0.1-0.7,0.1-2.1,0.2-2.8
+		C155.9,842.5,154.2,842.5,152.5,842.5 M205.8,845c-0.4,1.3-0.4,2.6-0.6,4c3.9,0.4,6-3.6,5.4-7C209,842.9,207.3,843.8,205.8,845
+		 M295.9,844c-0.4,1.1-0.5,2.3-0.6,3.5c0.8,0.7,1.5,1.5,2.3,2.3c1.3-1.9,2-4.1,1.9-6.3C298.3,843.5,297.1,843.7,295.9,844
+		 M404.5,847.6c2.2-0.1,5.3,0.1,5.5-3c-1.8-0.5-3.7-0.9-5.6-1.4C404.5,844.7,404.5,846.2,404.5,847.6 M194,848.6c1.6,0,3.2,0,4.8,0
+		c0.1-2-0.5-3.6-1.8-4.9C195.8,845.2,194.7,846.8,194,848.6 M1199,846.7c0.4,3.1,5.2,4.2,6.6,1.5c-0.2-0.8-0.6-2.4-0.8-3.2
+		C1202.8,845.3,1200.8,845.8,1199,846.7z"/>
+	<path class="st2" d="M1609.6,820.7c3.7-0.2,7.3,0.4,11,0.6c2.8,0.1,5.8-0.7,8.4,0.5c1.3,1.9,0.4,4.6,0.7,6.8c-2,0-4,0.1-6,0.1
+		c0.9,0.3,1.8,0.5,2.8,0.8c0.4,1.8,0.8,3.6,1.2,5.4c-4.3-0.5-6.1-4.7-8.7-7.5c-0.6,1.3-1.1,2.6-1.7,3.8c-0.4,0.1-1.3,0.4-1.7,0.5
+		c-0.1-0.7-0.1-2.1-0.2-2.9c-1,0.3-1.9,0.7-2.9,1.1c-1.7-0.4-3.3-0.7-4.9-1c2.1,3.5,5.6,5.6,9.5,6.9c0.9-0.9,1.9-1.8,2.8-2.7
+		c1.2,0.4,2.4,0.9,3.7,1.3c0,0.6-0.1,2-0.1,2.6c1.9,1,4.1,1.8,5.2,3.7c-0.2,1.1-0.4,2.3-0.7,3.4c0.2,1,0.5,2.1,0.8,3.1
+		c-1.8,1.4-3.6,3.1-5.9,3.5h-2.6c0.1-1.3,0.2-2.5,0.4-3.7c-1.1,0.1-2.2,0.2-3.3,0.4c0,1.1,0.1,2.2,0.2,3.4h-99.5
+		c-1.6-2.6-5.1-1-7.5-1.2c-0.4,0.3-1.3,0.9-1.7,1.2h-59.7c0.2-1.2,0.5-2.5,0.7-3.7c-0.6,0-1.7,0.1-2.3,0.1c-0.1,1.2-0.3,2.4-0.4,3.5
+		h-72c0.1-0.7,0.2-2,0.3-2.7c-1.3-0.4-2.7-0.8-4-1.2c-0.1,1.3-0.1,2.5-0.1,3.8h-27.9c-1.7-1.8-3.2-3.8-4.6-5.9
+		c-3.3,1.3-6.5,2.6-9.8,3.7c0.2,0.7,0.3,1.5,0.5,2.2h-4.5c-0.5-0.1-1.4-0.4-1.9-0.6c0.6-4,1.5-7.9,1.5-11.9
+		c-0.6-0.3-1.8-0.8-2.4-1.1c0-0.9,0.1-1.8,0.1-2.8c1.3-0.6,2.6-1.2,3.9-1.8c0-1.4,0.1-2.8,0.1-4.1c-3.7-0.1-7.4-0.5-11.1-1.2
+		c0-0.7,0.1-2.2,0.1-2.9c-0.5-0.1-1.6-0.2-2.1-0.3c0,1.4,0.1,2.8,0.1,4.3c-3.8-0.7-7.5,0.2-10.5,2.7c2.2-0.4,4.3-0.7,6.5-1
+		c0,1.5,0.1,3.1,0.2,4.6c0.8,1.2,2.6,2.5,1.1,4c-3.4,1.7-6-2.9-7.8-5.3c-0.9-0.1-1.7-0.3-2.5-0.4c-0.3,0.6-1,1.9-1.4,2.5
+		c-1.6-1.5-3.3-2.8-5.1-4c0.7,1.8,1.5,3.6,2.1,5.4c0.2,2.4-1.1,4.7-0.5,7.1c0.7,2.3,3,3.5,4.5,5.1c-1.6,0.6-3.2,1.1-4.9,1.6h-4.8
+		c1-1.5,2.3-2.9,4.1-3.6c-0.1-0.4-0.3-1.2-0.5-1.6c-2-0.9-3.9,0.9-5.1,2.3c0.1,1,0.4,2,0.8,2.9h-4.9c0.5-0.8,1.1-1.6,1.7-2.4
+		c0.2-1.1,0.2-2.2,0.1-3.2c-1.2-1.2-2.4-2.4-3.8-3.3c-1.1-0.2-2.2-0.4-3.3-0.7c-0.2-1.4,0.9-2.5,0.8-3.8c-1.6,0-2.5,1.5-3.7,2.3
+		c-2.1,0.5-4.3,0.1-6.3,0.5c-0.6,2.1,0.6,5.1-1.6,6.5c-1.6,0.3-3.6,1.1-5,0.2c0.8-0.6,1.8-1.2,2.8-1.6c-0.2-2.8-1.2-5.7,1.3-7.9
+		c0-0.6-0.1-1.8-0.1-2.5c-0.7-0.1-2-0.3-2.6-0.3c-1.4,1.2-1.5,3.3-2.4,4.9c-0.4-0.2-1.3-0.5-1.7-0.6c-1.4-1.7-1.6-4-1.1-6.1
+		c0.6-1.5,2.5-1.2,3.8-1.6c-2.3-1.6-5.2-1.1-7.7-1.3c-2.3-1.8-2.1-5.1-3.9-7.3c-0.4-0.3-1.3-0.9-1.8-1.2l0-0.3
+		c2.7-0.3,5.5-0.4,8.2-0.1c-0.2,1-0.4,1.9-0.5,2.9c1.6,2.5,3.1-1.4,3.3-2.8c1.7-0.7,3.6-0.3,5.3-0.1c-0.9,1.7-1.8,3.4-2.5,5.2
+		c-0.7,1.1,0,3.1,1.5,2.7c1.2-1.2,1.3-3,1.9-4.5c0.4-0.2,1.3-0.6,1.8-0.8c0-0.8,0-1.6,0-2.3c3.1-0.7,6.4-0.5,9.6-0.4
+		c0.9,0.1,3,0,2.7,1.5c-0.7,0.1-2,0.4-2.7,0.5c-1.1,0.6-1.2,1.3-0.1,2c1.3,0,2.6,0,4,0c1,0.4,1.9,1,2.9,1.5c-0.1-1.9-1-3.6-1.4-5.4
+		c3.2-0.5,6.4-0.2,9.6-0.1c13.8,0.1,27.6-0.3,41.4,0.2c0,0.7,0.1,1.3,0.3,2c1.5,1.3,3.2,2.1,4.8,3.4c0.6,1,0.2,2.3-0.5,3.2
+		c-2.1,1.3-4.1,2.6-5.7,4.4c0.4,3.3,3.6,5.2,4.4,8.4c1.8-1.3,3.3-2.9,5.1-4.1c0.2-1,0.1-2-0.3-3c-1.7-0.8-3.5,0.3-5.2,0.2
+		c-0.2-0.4-0.6-1.1-0.8-1.5c0.5-0.2,1.6-0.7,2.1-0.9c1.9-1.8,3.2-4.4,5.8-5.3c0.2-0.5,0.5-1.5,0.7-2c-0.9-1-2.3-1.2-3.1-2.3
+		c-0.9-3.5,4.4-3.7,6-1.6c0.2,0.5,0.5,1.7,0.7,2.2c0.6,0.1,1.8,0.4,2.4,0.5c1,0.3,1.8,1,2.2,2c-0.7,1.1-2,1.7-3.2,2.1
+		c-0.9-0.4-1.7-1.1-2.5-1.6c-0.1,1.1-0.4,2.1-0.7,3.2c-1.1,0.3-2.3,0.6-3.4,0.8c-0.1,1.7,1.1,4.3,3.1,4.2c0.2-1.2,0.5-2.3,0.8-3.4
+		c2.4-1,5.4-0.8,7.5-2.6c2.2-2.3,0.1-5.9,1.6-8.4c1.2-0.8,2.7-0.4,4-0.1c0.2,0.8,0.4,1.9,1.5,1.9c0.4-0.6,0.6-1.2,0.8-1.9
+		c5.7-0.8,11.6,0,17.3-0.3c3.6,0.1,7.3-0.5,10.8,0.2c0.6,1.8,0.5,3.8,0.9,5.7c1.5-1.4,0.6-3.9,1.4-5.6c3.8-0.6,7.8-0.6,11.7,0
+		c0.3,1.1,0.5,2.2,0.8,3.4c0.5,0.5,1.2,0.9,1.9,1.2c-0.1-0.5-0.4-1.5-0.5-2c0-0.6,0.1-1.9,0.1-2.5c1.6-0.6,3.3-0.3,4.9-0.4
+		c23.6,0.2,47.1-0.2,70.7,0.3c0,0.4-0.1,1.3-0.1,1.7c0.6,1.6,1.4,3.1,2.1,4.7c0.1-1.8,0-3.7,0.3-5.5c0.5-0.3,1.5-0.8,2-1.1
+		c23.3,0.1,46.7-0.3,70,0.1c1.3,0.1,3.1-0.3,4.1,0.9c0.2,1.4,1.1,3,0.2,4.3c-1,0.4-2,0.8-3,1.2c0.1,0.4,0.4,1.3,0.5,1.7
+		c1.2,0.5,2.6,0.5,3.9,0.4c0.7,0.5,1.5,1,2.3,1.5c1.7,0,3.7,0.2,5-1c-1.9-1.6-5.1-1.6-6.3-4c-0.1-1.6-0.2-3.3,0.4-4.8
+		c5.4-0.7,11-0.4,16.5,0c-1,1.8-1.8,3.7-3.3,5.2c-0.3,1-0.3,2,0.2,2.9c0.8,0.5,1.7,0.5,2.6-0.1c0.5-0.9,1.1-1.8,1.9-2.5
+		c1.7-0.3,3.4,0.4,4.7,1.4c1,0.6,2.3,0.4,3.3-0.1c0.9-0.8,1-2.6-0.1-3.3c-2.3-0.8-4.7-0.7-7-0.4c-0.1-0.6-0.2-1.8-0.2-2.4
+		c0.3-0.2,0.9-0.7,1.2-1c5.5-0.4,11.1-0.5,16.6,0.3c-0.6,0.2-1.7,0.7-2.2,0.9c0,0.3,0,0.9,0,1.2c1.9,2.2,4.3,4.6,7.3,5.1
+		c-0.1-0.5-0.2-1.5-0.3-2c-1.1-1.4-2.4-2.5-3.4-3.9c0.3-1,1.4-2,2.6-1.5c0.4,0.4,1.2,1.2,1.6,1.6
+		C1608.5,823.1,1608.9,821.6,1609.6,820.7 M1327.3,822.4c0.1,1.5,0.1,2.9,0.2,4.4c2.9,0.5,2.9-2.8,3.2-4.7
+		C1329.8,822.2,1328.1,822.3,1327.3,822.4 M1553.7,822.8c1.5,0.6,3,1.2,4.6,1.9c0.1-0.7,0.4-2,0.6-2.6
+		C1557.1,822.3,1555.4,822.5,1553.7,822.8 M1565.8,826.3c1.3,0.2,2.6,0.3,4,0.5c-0.2-1.3-0.3-2.6-0.4-3.8
+		C1568,824,1566.8,825.1,1565.8,826.3 M1295.1,828.1c0.8,0.8,1.7,1.7,2.5,2.5c1,0,2,0.1,3,0.1c-0.1-1.9-0.2-3.8-0.3-5.7
+		C1298.4,825.7,1296.8,826.9,1295.1,828.1 M1376.5,828.9c0.3,0.8,1,2.3,1.3,3c-2,1.6-1,4.3-1.3,6.4c-1.2,1.2-2,2.7-2.3,4.4
+		c0.5-0.1,1.4-0.2,1.9-0.3c0.5-1.3,1.1-2.6,1.9-3.7c0.3-4.7,4.3-9.3,1.2-13.8C1377.8,825.9,1376.2,826.9,1376.5,828.9 M1529.3,826.5
+		c0.3,0.8,0.9,2.4,1.2,3.2c0.5-0.1,1.4-0.2,1.9-0.3c0.1-1,0.1-2,0.2-3C1531.4,826.4,1530.3,826.4,1529.3,826.5 M1544.6,830
+		c0.1-2,0-4.1-1.7-5.4C1540.5,826.8,1541.7,829.4,1544.6,830 M1274.3,833c0.4,0.7,1.1,2.1,1.5,2.8c1.7-0.2,4,0,3.9-2.4
+		c1-0.1,1.9-0.1,2.9-0.1c1.1,1.4,2.2,2.8,3.2,4.2c0.7,0,2.1,0.1,2.8,0.2c-0.1-1-0.1-1.9-0.2-2.9c-1-1.3-1.8-2.8-2.3-4.3
+		c-1.9,0.1-3.8,0.2-5.6,0.2c0-0.9-0.1-2.6-0.1-3.5C1277.2,827.4,1275.6,830.5,1274.3,833 M1554.4,828.5c0.1,0.9,0.2,1.8,0.3,2.8
+		c0.9,0.1,1.9,0.3,2.8,0.4c0-1.2,0.1-2.3,0.2-3.4C1556.6,828.4,1555.5,828.4,1554.4,828.5 M1267,829.4c0.9,2.3,1.8,4.5,2.8,6.8
+		c1.1,0.5,2.1,1,3.2,1.5c0.4-0.8,1.4-2.3,1.8-3.1c-1.4-0.8-2.8-1.6-4.3-2.4c0-0.7-0.1-2-0.1-2.7
+		C1269.3,829.5,1268.2,829.4,1267,829.4 M1385.5,831.1c-0.1,0.8-0.2,1.7-0.2,2.5c0.5-0.1,1.4-0.4,1.9-0.5c0.5-1.3,1.1-2.6,1.8-3.9
+		C1388.1,830.4,1386.8,830.8,1385.5,831.1 M1599.1,829.3c0.5,1.8,1,3.5,1.5,5.3c0.8-0.1,2.3-0.2,3.1-0.3c-0.1,0.7-0.2,2.2-0.3,2.9
+		c1,1.1,2.1,2.2,3.1,3.3c0.5,0,1.5,0.1,2,0.2c0.3-1.2,0.6-2.4,0.8-3.6c-1.9-2.2-3.8-4.7-6.4-6.1c-0.4-0.4-1.1-1.2-1.5-1.6
+		C1600.8,829.4,1599.6,829.3,1599.1,829.3 M1357.1,838.7c0.6,0,1.8,0.1,2.4,0.1c0.7-3.2,1.8-6.6,0.7-9.9
+		C1358.9,832,1357.6,835.2,1357.1,838.7 M1593.2,830.6c-1.3,0.8-0.3,3.6,1.2,2.5C1595.4,832.2,1594.6,829.5,1593.2,830.6
+		 M1523.6,833.6c0,0.5-0.1,1.5-0.1,1.9c0.6,0.1,1.6,0.1,2.2,0.2c0-0.6,0-1.9,0-2.5C1525.1,833.3,1524.1,833.5,1523.6,833.6
+		 M1541.3,837c2,0.3,3.5,1.3,3.5,3.6c1.2-0.1,2.4-0.2,3.7-0.3c-0.2-1.8-0.3-3.6-0.6-5.4c0,0.7,0,2-0.1,2.7c-1,0-3.1,0-4.1,0
+		c-0.3-1.2-0.6-2.3-0.8-3.5C1542.3,835.1,1541.8,836.1,1541.3,837 M1567.4,834.1c0,0.5-0.1,1.4-0.1,1.8
+		C1570.2,838.5,1570.3,831,1567.4,834.1 M1351.3,837.5c-0.8,0.1-2.3,0.1-3,0.2c0,0.2-0.1,0.6-0.1,0.7c0.7,0,2.1,0,2.8,0
+		c0.8,1.3,2.4,1.2,3.8,1.5c-0.3-1.2-0.8-2.5-2.2-2.7c-0.1-0.6-0.3-1.7-0.4-2.3C1351.8,835.7,1351.6,836.6,1351.3,837.5
+		 M1498.2,835.3c0.1,1.1,0.1,2.2,0.2,3.3c0.5-0.1,1.4-0.3,1.8-0.4c0.1-0.9,0.2-1.9,0.4-2.8C1500.1,835.4,1498.8,835.3,1498.2,835.3
+		 M1396.3,836.3c0,0.5,0.1,1.6,0.2,2.2c1,0,2,0,3,0.1c0-0.5,0-1.6,0-2.2C1398.4,836.3,1397.3,836.3,1396.3,836.3 M1490.6,838.3
+		c2.6,2,3.8-3,0.6-2.6C1490.1,836.4,1489.9,837.2,1490.6,838.3 M1563.1,838.4c0.6-0.3,1.7-1,2.2-1.3
+		C1564.9,834.1,1560.1,837.2,1563.1,838.4 M1571.7,838.6c0,0.8-0.1,2.3-0.2,3c-0.5,0-1.5-0.1-2-0.1c0,0.5,0,1.6,0,2.2
+		c1-1.8,2.9-2.4,4.9-2.5c0-0.7,0-2,0-2.7c0.6,0,1.7,0,2.3,0c-0.1-1.2-0.2-2.4-0.3-3.6C1574.8,836.1,1573.2,837.3,1571.7,838.6
+		 M1484.3,837.8c0,1.8,0.1,3.7,0.1,5.6c2.2,0,4.3,0.1,6.5,0.2c-0.2-0.4-0.6-1.2-0.8-1.6C1488.2,840.7,1486.2,839.3,1484.3,837.8
+		 M1286.1,841.3c1.2,0.1,2.3,0.3,3.6,0.4c0-0.7,0-2.1,0-2.8C1288.3,839.5,1286.1,839.2,1286.1,841.3 M1366.2,841.4
+		c1.2,0,2.4,0,3.7,0c-0.4-0.8-1.3-2.3-1.7-3C1365.9,837.6,1366.7,840.3,1366.2,841.4 M1595.6,839.6c-0.1,1-0.3,2.1-0.4,3.2
+		c1.8-0.2,3.6-0.3,5.4-0.4c-0.4-1-0.8-2-1.2-2.9C1598.1,839.5,1596.8,839.5,1595.6,839.6 M1611,839.1c0.8,1.2,1.6,2.4,2.4,3.6
+		c0.7,0,2,0,2.7,0C1615.9,839.8,1613.4,839.2,1611,839.1 M1361.2,840.5c-1.9,1,0.2,3.2,1.6,2.1
+		C1364.7,841.6,1362.6,839.3,1361.2,840.5 M1346.4,841.3c-0.4,2-1.3,4.1,0.3,5.8c2-1.3,3.2-3.2,3-5.7
+		C1348.6,841.4,1347.5,841.3,1346.4,841.3 M1500.5,841.4c0,1,0,2,0,3c1.9,0.7,3.9,1,5.9,1.2c0.1-0.5,0.1-1.5,0.2-2.1
+		c-1.7,0-3.2-0.7-4.3-1.9C1501.9,841.7,1501,841.5,1500.5,841.4 M1353.5,843.5c0,1,0,2,0,3.1c1.3,0,2.6-0.1,3.9-0.1
+		c0.1-1.1,0.2-2.1,0.3-3.2C1356.3,843.3,1354.9,843.4,1353.5,843.5 M1405.1,843c-0.4,1.5,0.2,2.1,1.9,1.5
+		C1407.4,842.9,1406.8,842.4,1405.1,843 M1422.2,847.4c-1.9,0.9,0.1,3.3,1.6,2.1C1425.7,848.6,1423.7,846.2,1422.2,847.4
+		 M1598.1,848.3C1596.6,851.2,1601.5,848.3,1598.1,848.3z"/>
+	<path class="st2" d="M50.6,821.9c3.2-1.5,6.8-1.4,10.1-0.1C58,825.2,53.9,822.1,50.6,821.9z"/>
+	<path class="st2" d="M58.5,826.6c2.3-2,4.7-4,7-6c0,1.4-0.1,2.8-0.1,4.1c1-0.1,2-0.2,2.9-0.3c0-0.7,0.1-2.2,0.1-2.9
+		c3-0.5,6-0.8,9.1-0.8c-0.2,2.9,0.3,5.8,2,8.2c1,0.4,2,0.9,3,1.5c0.2,2.1,0.1,4.2,0.2,6.3c-2.4,0-4.9,0-7.3,0
+		c-0.1-2-0.2-3.9-0.4-5.9c-1.8-0.1-3.5-0.1-5.3-0.2c-0.8-0.7-1.5-1.5-2.3-2.2c-0.4,0-1.1-0.1-1.5-0.1c-0.9,1.5-1.8,3-2.7,4.6
+		c1.4,3.7,0.4,8.1,2.2,11.6c3.9-0.5,7.9-1.3,11.9-1.3c0.3-0.5,1-1.6,1.4-2.1c1.6,0.3,3.3,0.5,4.9,0.8c0,1.1-0.1,3.3-0.1,4.4
+		c-4.3,0.3-8.6,1-12.9,1.2c-0.2,1.1-0.4,2.2-0.6,3.3h-12c2.2-0.9,3.8-2.6,5.2-4.4c-2.6-0.1-5.3-0.1-7.9,0c0-2.5-0.3-5.1,0.3-7.6
+		c0.9-1.8,2.4-3.2,3.7-4.8c0.1-0.5,0.3-1.4,0.3-1.9c-1.4,0-2.8,0-4.2,0c-0.7,0.7-1.3,1.5-2,2.2c-0.4,2.5-0.9,5.1-1.3,7.6
+		c-0.7,1.2-1.3,2.4-1.9,3.7c0.6,1.8,1.6,3.4,2.6,5.1h-5.4c-0.7-8.2,1.7-16.1,2.3-24.2C52.7,826.4,55.6,826.5,58.5,826.6z"/>
+	<path class="st2" d="M1351,821.3c1.3-1.4,3.9,0.4,2.4,1.9C1352.3,824.6,1349.5,822.7,1351,821.3z"/>
+	<path class="st2" d="M1634.3,821.3c1.8-0.2,3.5-0.5,5.4-0.7c-0.1,0.9-0.2,2.7-0.3,3.6c-1.6,0.4-3.3,0.6-4.9,0.8
+		C1634.4,824.1,1634.3,822.2,1634.3,821.3z"/>
+	<path class="st2" d="M1669.9,821.4c1.6-0.3,3.2-0.4,4.8-0.5c0,0.7-0.1,2.1-0.1,2.8c-1.1,0-2.1-0.1-3.1-0.1
+		C1671.1,823.1,1670.3,822,1669.9,821.4z"/>
+	<path class="st2" d="M1315.9,831.9c4.2,0.4,3.8,5,3.8,8.1c-1.7,0.8-3.4,1.7-5.1,2.6c1.8-0.5,3.5-1,5.2-1.4
+		c-0.4,1.9-0.7,3.9-1.1,5.8c0.7,1.3,1.3,2.6,2,4h-8.2c-1.1-3.1-2.3-6.3-2-9.7C1314.1,839.6,1315,835.4,1315.9,831.9z"/>
+	<path class="st2" d="M1300.4,837.1c2.2,0.4,4.3,0.8,6.5,1.3c-1.1,4.2-1.4,8.4-0.3,12.7h-8.2c2-1.1,4-2.3,5.9-3.5c-1,0-2.9,0-3.9,0
+		C1300.4,844,1300.5,840.5,1300.4,837.1z"/>
+	<path class="st2" d="M1273.2,842.4c1,0,3.1,0,4.1,0c0.8,0.6,1.6,1.3,2.4,1.9c-0.1,1-0.2,2.1-0.3,3.1c-1,0-2.9,0.2-3.9,0.2
+		C1274.1,846.2,1273.2,844.5,1273.2,842.4z"/>
+	<path class="st2" d="M1703.4,842c2.6,0.7,5.4,2.5,5.5,5.5c-1.8,0-3.7,0-5.5,0C1703.4,845.6,1703.4,843.8,1703.4,842z"/>
+	<path class="st2" d="M1.2,848.5c0.1-2,0.5-4,2.4-5.1c1.7,0,3.3-0.1,5-0.1c0,1.8,0,3.5,0,5.3C6.2,848.6,3.7,848.5,1.2,848.5z"/>
+	<path class="st2" d="M12.4,848.2c0-0.9,0-1.9,0-2.8c3.2,0.1,6.5-0.2,9.6,0.4c0.4,1.2,0.6,2.5,0.9,3.7c-0.5,0.3-1.6,1-2.1,1.4h-1.6
+		C17,850.1,14.7,849.1,12.4,848.2z"/>
+	<path class="st2" d="M80.3,847.4c2.2,0,4.4-0.1,6.6-0.1c-0.2,0.9-0.5,2.8-0.7,3.7h-5.8C80.4,850.1,80.3,848.3,80.3,847.4z"/>
+	<path class="st2" d="M1276.6,851c1.4-1.8,2.8-4.5,5.6-3.5c0.2,1.2,0.3,2.3,0.4,3.5H1276.6z"/>
+	<path class="st2" d="M1334.2,851c0.6-1.3,1.2-2.6,1.7-3.9c1.7,0.9,3.5,1.9,4.2,3.9H1334.2z"/>
+</g>
+</svg>
diff --git a/misc/openmohaa-text-mono.svg b/misc/openmohaa-text-mono.svg
new file mode 100644
index 00000000..ca7dd433
--- /dev/null
+++ b/misc/openmohaa-text-mono.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<g>
+	<path d="M316.5,0H1416c0,78,0,156,0,234c105.7,0,211.3,0,317,0v617H0V234c105.5,0,211,0,316.5,0C316.5,156,316.5,78,316.5,0
+		 M342,25.5c0,79.4,0,158.8,0,238.2c-104.1,0-208.2,0-312.2,0c0,185.7,0,371.4,0,557.1c557.7,0,1115.3,0,1673,0
+		c0-185.7,0-371.4,0-557.1c-104.1,0-208.2,0-312.3,0c0-79.4,0-158.8,0-238.2C1041,25.5,691.5,25.5,342,25.5z"/>
+	<path d="M600,76.5c46.6,0,93.3-0.1,139.9,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.1-0.1-13.7,0c3.5,3,7.4,5.5,11.1,8.2
+		c-1.3,4.5-2.8,8.9-4.5,13.2c4.2-2.1,7.3-5.8,11.6-7.7c4,2,7.2,5.3,10.9,7.7c-0.6-4.6-2.7-8.7-3.9-13.1c3.7-2.9,7.6-5.5,11.4-8.3
+		c-4.7-0.2-9.4-0.1-14.1-0.1c-1.3-3.6-2.5-7.3-3.6-11c83.1-0.1,166.2-0.1,249.2,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.3-0.1-13.9,0.1
+		c3.7,2.8,7.6,5.5,11.3,8.2c-1.3,4.5-2.8,8.8-4.5,13.2c4.2-2,7.4-6,11.7-7.7c4,2.1,7.2,5.3,11,7.7c-1-4.5-2.8-8.8-4.1-13.1
+		c3.7-2.9,7.6-5.5,11.4-8.3c-4.7-0.2-9.3-0.1-14,0c-1.4-3.6-2.5-7.2-3.5-11c46.2-0.1,92.5,0,138.7,0c0,14.1,0,28.3,0,42.4
+		c-10.8,0-21.7-0.1-32.5,0.1c-2.3,0-4.7,0.4-6.7-0.8c4-2.1,7.4-5.1,11.1-7.7c3.8,2.7,7.4,5.6,11.3,8c-1.3-4.3-2.8-8.6-4.3-12.9
+		c3.7-2.9,7.6-5.6,11.4-8.3c-4.6-0.1-9.3,0-13.9,0c-1.9-4.1-2.1-8.9-4.8-12.6c-1.3,4.2-2.6,8.4-4.1,12.6c-4.6,0.1-9.3,0-13.9,0.1
+		c3.8,2.8,7.7,5.4,11.4,8.3c-1.6,4.6-3.2,9.1-4.8,13.7c-12.2-0.8-24.5-0.1-36.8-0.3c-52.7,0-105.3,0-158,0
+		c-6.6-0.2-13.2,0.4-19.7-0.2c-1.5-4.5-3-8.9-4.2-13.5c3.8-2.6,7.5-5.2,11.1-8c-4.6-0.1-9.1,0-13.6,0c-1.9-4.3-3-9-4.6-13.4
+		c-1.5,4.5-2.8,9-4.5,13.4c-4.6-0.1-9.2-0.1-13.8,0c3.6,3,8.1,4.9,11.1,8.5c-1.1,4.5-2.9,8.7-4.1,13.2c-78,0-156-0.1-234,0.1
+		c-0.8-0.2-1.5-0.5-2.2-0.8c3.9-2.2,7.4-5.1,11-7.7c3.8,2.7,7.4,5.6,11.4,8c-1.4-4.3-2.9-8.6-4.4-12.8c3.6-2.9,7.6-5.5,11.3-8.3
+		c-4.6-0.2-9.2-0.1-13.7-0.1c-1.3-3.3-2.3-6.8-3.3-10.2c-0.2-1-0.8-1.7-1.6-2.3c-1.2,4.2-2.4,8.5-4.2,12.6c-4.5-0.1-9.1-0.1-13.6,0
+		c3.6,2.7,7.3,5.3,11,7.9c-0.8,4.9-3,9.4-4.3,14.2c-5.9-0.7-11.8-0.2-17.7-0.4C600,104.8,600,90.7,600,76.5z"/>
+	<path d="M854.8,118.8c3.6-3,7.5-5.6,11.2-8.4c3.2,3,7.5,4.7,10.1,8.2C869,119.3,861.9,118.9,854.8,118.8z"/>
+	<path d="M555.6,175c17.6-1.9,35.8-0.4,52.5,5.7c29.2,10.3,53.1,34,63.7,63c7.6,20.8,8.4,43.6,4.3,65.3c-3.7,20-12.9,39.3-27.1,54
+		c-19.9,21-48.7,31.4-77.1,33.4c-7,0-14,0.1-21,0c-31.2-2.9-61.7-18.6-80-44.4c-12.9-17.9-19.4-40-19.3-62c0-4.7-0.1-9.4,0.2-14
+		c1.7-27.8,14.7-55,35.9-73.2C506.6,186.4,531,177.4,555.6,175 M555.6,191.8c-16.2,2.6-30.8,12.2-40.6,25.2
+		c-13.6,17.6-19.3,40-20.4,61.9c-0.4,14.9,1.4,29.8,5.5,44.1c5.4,18.2,15.8,35.4,31.4,46.4c12.4,9,28.3,12.4,43.4,10.6
+		c15-2,28.8-10.1,38.5-21.6c13.1-15.6,19.5-35.8,21.6-55.7c1.8-20.6,0.7-41.8-6.6-61.3c-6.2-17.8-18.2-34.2-35.1-43.2
+		C581.9,192.1,568.5,190,555.6,191.8z"/>
+	<path d="M770.9,179.6c10-0.1,20-0.3,30-0.1c13.4,0.9,27.5,4.7,36.9,14.8c10.9,11.6,15.2,28.1,14.6,43.7c-0.4,9.6-2.2,19.3-6.8,27.9
+		c-13.2,25-41.8,40.4-69.8,38.4c-0.4-0.1-1.1-0.3-1.5-0.4c-0.4-4-0.2-8.1-0.1-12.1c10.6-1.4,21.6-5.6,28.4-14.3
+		c7.7-9,9.3-21.2,9.7-32.6c0.3-12-1-24.9-8.2-35c-5.7-8.3-15.5-12.8-25.1-14.3c-7-0.9-14.2-0.6-21.2-0.1c0,52.5-0.1,104.9,0,157.4
+		c0.8,7.3,0.3,15.8,5.6,21.7c4.7,5,12.1,4.7,18.4,4.7c0,4,0,8,0,12.1c-19.5-1.8-39.1-2.1-58.7-1.6c-9.5,0.8-19.1,0.5-28.6,1.7
+		c-1.1-3.9-0.6-8-0.6-12c6.5-0.1,14.2,0.4,19.1-4.7c5.4-6.2,4.8-15,5.6-22.7c0.1-42.7,0-85.4,0-128.1c0.2-6-0.6-12-1.2-18
+		c-0.9-4.9-2.9-10.3-7.7-12.6c-4.9-2.6-10.5-1.9-15.8-2.1c-0.1-3.9-0.1-7.8,0-11.8c5.8-0.3,11.5,1.1,17.3,1
+		C731,180.7,751,181.1,770.9,179.6z"/>
+	<path d="M1262.9,180.5c5.8,0,11.6-1.2,17.4-1.1c0,4,0,7.9,0,11.9c-5.8,0-12.5-0.3-17.1,4c-5.1,4.8-5.4,12.2-5.7,18.7
+		c-0.4,15-1,30-0.9,45.1c-0.9,44.8-1.4,89.7-1.3,134.5c-5.4,0.1-10.8,0.2-16.2-0.1c-10.5-13.6-20.9-27.4-32.2-40.3
+		c-25.5-30.1-51.5-59.8-77.2-89.8c-8.5-9.8-16.9-19.8-24.9-30.1c-4.3-5.3-7.9-11.1-12.6-16.1c0.8,19,2.1,37.9,2.2,56.9
+		c0.2,12,0,24,0.6,36c0.3,17,0.1,34.1,1.5,51.1c0.6,5.1,1.8,10.9,6.1,14.2c4.7,3.7,11,3.3,16.6,4.2c-0.5,3.9,0.9,8.3-1,11.8
+		c-14.1-1.4-28.2-1.1-42.3-1c-8.8,0.3-17.7-0.2-26.5,1.1c-0.1-4-0.1-7.9,0-11.9c5.8-0.6,12.2-0.4,17.3-3.7c4.1-3.2,5.7-8.6,6.3-13.6
+		c2-28.4,1-56.8,1.3-85.2c0-19.7,0-39.3-0.1-59c-0.6-8-0.8-17.2-7.2-23.1c-4.9-3.8-11.6-3.4-17.5-3.7c-0.2-3.9-0.2-7.9,0.1-11.8
+		c3.8-0.1,7.5,0.4,11.3,0.8c16.3,0.7,32.7,0.5,48.9-0.9c36.7,44.8,75,88.1,112.2,132.5c5.4,6.4,10.2,13.3,15.6,19.7
+		c0.2-10.9-0.2-21.8-0.9-32.6c-0.3-26,0-52-0.2-78.1c-0.1-8.2-0.9-17.3-6.6-23.8c-4.6-5.1-12-6-18.5-5.9c-0.1-4-0.1-8,0-12
+		c4.5,0,9,0.7,13.5,1C1237.6,180.8,1250.2,180.7,1262.9,180.5z"/>
+	<path d="M863.7,179.4c16.7,1.7,33.6,1.2,50.4,1.4c24.7-0.1,49.4-0.3,74-0.4c9.5-0.8,19-0.6,28.5-0.9c0.6,17.1,2.3,34.1,4.3,51.1
+		c-4.5,1-9.2,1.3-13.8,1.2c-1.4-9.1-3.1-18.6-8.8-26.1c-4-5.5-10.9-8-17.3-9.3c-13.9-2.5-28-2-42-1.9c-3.5,0.1-7.8,0.2-10,3.5
+		c-1.6,3.4-1.5,7.3-1.6,11c-0.2,21.5,0.1,43-0.2,64.5c12.6-0.2,25.3,0.1,37.9-0.3c7.1-0.7,14.9-0.7,20.8-5.3
+		c5.5-5.2,4.9-13.3,5.7-20.2c4.3,0,8.6,0,12.9,0c-1.8,18.1-0.9,36.3-0.9,54.4c-0.3,4.4,0.9,8.7,0.7,13.1c-4.2,0.3-8.4,0.1-12.6,0.2
+		c-0.9-6.9-0.6-14.8-5.9-20.1c-5.8-5.4-14.2-5.8-21.6-6.6c-12.5-0.4-25.1-0.1-37.7-0.2c1.4,6.4,0.7,13,0.9,19.5
+		c0.1,15.3-0.2,30.6,0.2,46c0.6,6.6,2.1,14.8,8.7,18.1c7.7,3.9,16.5,2.1,24.8,2.9c5,0.6,10-0.5,15.1-0.3c11.3,0.3,22.8-3,31.9-9.7
+		c9.7-7.9,13.7-20.2,17.9-31.5c3.9,1.3,7.8,2.5,11.8,3.4c0.4,4.2-1.4,8.1-2.3,12.1c-3.7,14-6.7,28.3-9.8,42.5
+		c-15.1-1.1-30.3-0.8-45.4-1.6c-21-0.2-42-0.2-63,0c-17.6,0.8-35.2,0.6-52.8,1.1c0-3.8,0-7.6,0-11.4c4.8,0,9.9,0.1,14.4-2
+		c3.5-1.6,6-4.9,7.1-8.6c2.2-7.1,2-14.6,2-21.9c0-43.3,0.1-86.7-0.1-130c-0.2-7.3-0.3-15.5-5.4-21.2c-4.9-5-12.3-4.5-18.7-4.4
+		C863.4,187.3,863.5,183.3,863.7,179.4z"/>
+	<path d="M586.6,469c16.1-1.3,32.4-0.8,48.2,2.8c32.1,7,61.2,26.3,80.2,53c17.7,24.5,26.3,55.1,25.4,85.3
+		c-0.8,29.9-8.9,60.2-26.8,84.5c-18.5,25.6-47.1,42.8-77.6,50.2c-9.9,2.6-20,3.9-30.2,4.8c-9.7,0.2-19.4,0.1-29.1,0
+		c-32.6-3.4-64.1-17.8-87.4-41.1c-10.9-11.3-19.9-24.5-26.1-39c-8.3-19.3-11.8-40.6-11.3-61.5c-0.1-33.3,11.7-66.8,34-91.8
+		c12.3-13.8,27.6-24.7,44.3-32.6C548,475.2,567.3,470.8,586.6,469 M587.6,490c-17.4,1.9-33.6,10.3-46.1,22.4
+		c-12.6,12.2-21.2,28-26.8,44.5c-5.1,15.5-7.8,31.8-7.5,48.1c-0.8,27.2,4.8,55,18.2,78.8c8.1,14.2,19.6,26.7,33.6,35.2
+		c17.8,10.2,39.6,13.3,59.5,7.9c14-3.5,26.5-11.6,36.4-22c14.6-15.7,23.3-36.1,27.7-57c3-15.1,4.3-30.5,3.8-46
+		c-0.5-3.7-1.1-7.3-1.1-11c-1.9-19.9-7.3-39.6-17.4-57c-6.9-11.7-15.7-22.4-26.9-30.1C625.6,493.3,606.3,487.8,587.6,490z"/>
+	<path d="M1213,476c6.7-2.9,13.4-6,20.2-8.7c5.5,15.8,10.1,31.9,15.4,47.8c14.1,43,29.1,85.8,43.7,128.7c7.1,20.5,13.4,41.4,22.7,61
+		c3.5,7.3,7.8,14.6,14.5,19.5c4.4,3.1,9.8,3.4,15,4.3c0,4.7,0,9.4,0,14.2c-4.3-0.3-9.1,1.2-13.1-0.9c-25.5-0.4-51-0.8-76.5,0
+		c-7.1,1-14.4,0.8-21.5,1c0-4.8,0-9.6,0-14.5c7.4-0.4,15.9,0.2,22.1-4.7c5.1-4.3,4.4-11.8,3.7-17.8c-3.7-21.6-11.8-42.2-18-63.2
+		c-25.4,0.1-50.8-0.2-76.2,0.1c-3.3,10.6-7.7,20.8-11.5,31.2c-3.8,10.6-8.6,20.9-10.8,32c-0.7,5.7-1.2,12.5,3.5,16.8
+		c6.5,6.2,16.2,4.8,24.4,5.6c0,4.8,0,9.6,0,14.4c-8.6,0.2-17-1.4-25.6-1.3c-15.4-0.2-30.7-0.3-46.1,0c-7.8-0.1-15.5,1.7-23.3,1.2
+		c-0.3-4.7-0.3-9.5-0.3-14.2c4.8-0.8,9.9-0.7,14.4-2.8c8.5-3.4,13-12.1,17.5-19.5c10.6-20.3,19-41.7,27.9-62.7
+		c21.9-53.6,45.4-106.5,64.6-161.1C1203.7,479.4,1208.7,478.2,1213,476 M1206.8,527.7c-1.1,2.7-2,5.4-2.8,8.2
+		c-6.1,20.8-13.6,41.1-21.6,61.2c-2.9,8.2-6.9,16-9.4,24.3c5.3-0.2,10.7-0.1,16-0.3c15.3-1.2,30.6,0.2,45.9,0.3
+		c-3-8.1-5.9-16.2-8.3-24.4c-5.9-19.8-12.8-39.3-16.8-59.6C1209.1,534.2,1208.6,530.7,1206.8,527.7z"/>
+	<path d="M1499.5,476.9c7.5-3.2,14.8-6.9,22.6-9.5c19.2,62,40.8,123.2,61.8,184.6c6.5,18.9,12.5,38,21.4,55.9
+		c3.7,7,8.3,14.4,15.8,17.9c3.6,1.8,7.7,1.8,11.6,2.6c-0.1,4.8,0,9.6,0,14.4c-6.2-0.1-12.5-0.1-18.7-1c-15.7-0.5-31.4-0.5-47.1-0.4
+		c-9.3,0.2-18.6-0.3-27.8,1c-5.6,0.4-11.3,0.3-16.9,0.4c0-4.8,0-9.6,0-14.5c7.7-0.4,16.6,0.1,22.8-5.3c4-4.5,3.8-11.1,3-16.6
+		c-3.6-21.9-12-42.5-18-63.8c-25.4-0.1-50.8-0.2-76.2,0c-4.4,12.5-9.3,24.9-14,37.3c-3.1,8.5-6.9,16.9-8.5,26
+		c-0.3,5.2-1.2,11.1,2.2,15.5c2.3,3.2,6.2,4.7,9.8,5.8c5.3,1.1,10.8-0.3,16,1.3c-0.1,4.8-0.1,9.5,0,14.3c-7.2,0-14.4-0.2-21.5-1.1
+		c-19-0.4-38.1-0.4-57.1,0.1l-0.8,0.6c-5.2,0.2-10.4,0.4-15.6,0.5c-0.2-4.8-0.3-9.5-0.2-14.3c7.4-0.7,15.5-1.7,21-7.2
+		c8.1-8.6,13.1-19.6,18.1-30.2c8.4-18.5,16.2-37.2,23.9-56c15.3-37.2,31.2-74.2,45.9-111.8c5.1-13.5,10.6-26.8,14.6-40.6
+		C1491.2,479.9,1495.6,478.9,1499.5,476.9 M1494.9,528.1c-8.9,31.9-21.2,62.7-33.6,93.4c5.6-0.2,11.2,0,16.8-0.4
+		c15-1.2,30.1,0.3,45.2,0.3c-2.5-8.3-5.7-16.4-8.1-24.7c-6.5-21.9-14.3-43.6-18-66.3C1497.2,529,1495.8,528.7,1494.9,528.1z"/>
+	<path d="M392,476.5c13,0.4,26-0.8,39-2c0.5,5,0.2,10,0.4,15c-8.2,1.1-17.1,0.1-24.6,4.4c-5.6,2.9-8.3,9.1-9.1,15
+		c-0.5,4.7-0.4,9.4-0.4,14.1c0.3,15.7-0.3,31.4,1,47c0.2,12.7,0.1,25.4,0.5,38.1l0.7,0.8c0.1,11,0,22,0.4,32.9
+		c1.3,10.9,0.4,22,1.5,32.9c0.3,4,0,8,0.6,11.9c1.1,6.1,0,12.3,1.5,18.3c1.2,6.4,2.1,13.9,7.9,18c6.2,4.4,14.2,4.2,21.5,5.1
+		c0,4.9,0,9.8,0,14.7c-9.2,0.3-18.4-1.4-27.6-1.3c-20.7-0.3-41.3-0.3-62,0.2c-6.9,1-13.8,0.9-20.7,1c0-5-0.1-10.1,0.2-15.1
+		c7.5,0.1,15.8-0.3,21.9-5.2c6.5-6.7,6.8-16.7,6.9-25.5c0.2-39.7-0.1-79.3,0.2-119c0.1-5.3,1.3-10.6,1-16
+		c-0.1-6.9,1.6-13.7,1.2-20.6c-0.5,0-1.5,0-1.9,0c-13.7,38.9-31.6,76.1-49.3,113.4c-8,17-16.4,33.8-23.6,51.2
+		c-5.5,12.5-10.5,25.2-16.7,37.3c-3.4-0.1-6.7,0.2-10.1-0.2c-1.3-0.3-1.8-1.8-2.4-2.9c-18.2-39.6-37-78.9-55.4-118.4
+		c-12.4-26-24.3-52.4-34.1-79.5c-0.5,0-1.6-0.1-2.1-0.1c0.1,10.3,1.5,20.5,1.1,30.8c0.4,13.1-0.6,26.2-0.9,39.3
+		c-1.2,9.9-0.1,19.9-1.6,29.8c-0.4,11.4-0.2,22.9-0.4,34.4c-0.8,9.1-1.4,18.4-0.1,27.5c0.4,6.4,2.1,13.3,6.8,18
+		c6.2,5.1,14.6,6.1,22.4,5.8c0.3,5,0.2,10,0.2,15.1c-7.9,0.3-15.7-1.4-23.6-1.2c-12.8-0.3-25.6-0.4-38.4,0.1
+		c-8.3,1.1-16.6,0.8-25,0.8c0.4-4.9-1-10.1,1-14.7c6.6,0.3,14.1-0.1,19-5.1c5.4-5.9,7-14,8.3-21.6c0.8-3.9,0.8-8,0.4-11.9
+		c0.3,1.7,0.6,3.4,0.9,5.1c0.4-9.1,1.1-18.1,2-27.2c0.2-4.4,0-8.8,0.6-13.1c1-6.6,0.4-13.3,0.9-20c0.9-7.6,0.7-15.3,1.5-22.9
+		c-0.3-9,1.4-17.9,1.2-27c-0.2-5.4,1-10.7,1-16c-0.1-17.7,2.7-35.4,1.6-53.1c-0.6-8.3-3.8-17.1-11.2-21.6
+		c-5.7-3.6-12.7-3.2-19.2-3.1c-0.2-4.9-0.1-9.9-0.1-14.8c14.5,0.2,29,1.7,43.5,1c9.8-0.7,19.7-0.7,29.4-1.9
+		c15.6,37.3,32.4,74,49.9,110.4c13.4,28.9,28,57.3,39.5,87c0.3-0.2,0.9-0.5,1.3-0.7c7.5-18.6,15.2-37.2,23.9-55.3
+		c18.6-40.6,38.1-80.9,55.6-122c2.8-6,4.7-12.4,7.8-18.3C368.9,475,380.4,476.6,392,476.5z"/>
+	<path d="M761.3,489.6c-0.1-5.1-0.1-10.1,0-15.1c26.2,2,52.5,2.5,78.7,1.7c9.6-1,19.3-0.1,28.8-1.3c1.5-0.3,3,0.2,4.4,0.7
+		c-0.2,4.7-0.1,9.3-0.1,14c-8.3,0-18.2-0.4-24.5,6c-6.9,8.1-5.9,19.5-7,29.4c-0.3,23.8,0.1,47.6-0.3,71.4c31.5-0.4,63.1,0,94.6-0.2
+		c12.2,0.1,24.4-0.2,36.6,0.2c-0.3-17.8-0.2-35.6-0.1-53.4c-0.2-8.3,0.3-16.7-0.9-25c-0.2-8.1-1.2-17.2-7.3-23.2
+		c-6.4-5.7-15.5-5-23.5-5.2c0-4.6,0-9.3,0-13.9c8.1-0.2,16.2-0.1,24.2,0.7c19.3,0.8,38.7,0.2,58,0c9.9-0.8,19.8-0.5,29.7-0.8
+		c0.1,4.7,0.1,9.5,0,14.2c-6.5-0.1-13.3-0.3-19.2,2.6c-4.3,2.1-7.2,6.2-8.5,10.8c-3.5,10.6-2.4,21.9-2.6,32.9c0,47,0,94,0,141.1
+		c0.2,12.3-0.9,25,2.3,37c1.3,5,4.6,9.8,9.5,11.8c4,2.1,8.5,1.6,12.8,2.3c1.8-0.2,3.6-0.4,5.5-0.6c0.4,5.1,0.2,10.2,0.2,15.2
+		c-7.2-0.2-14.5-0.3-21.7-0.6c-8.3-1.1-16.7-0.8-25-0.9c-13.8,0-27.7,0-41.5,0.4c-7.7,1.1-15.4,0.5-23.1,0.9
+		c-0.8-4.8,0.2-9.6-0.1-14.5c6.9-1.2,14.6,0.8,20.7-3.5c7.6-4.9,9.2-14.6,9.6-22.9c1.4-9.9,0.7-19.9,0.9-29.9
+		c0-18.5,0-36.9,0.1-55.4c-43.7,0.2-87.3,0.3-131,0c0.2,26.8,0,53.6,0.2,80.4c1,8.4,1.2,17.8,6.7,24.7c6.2,7.1,16.4,6.1,24.9,6.9
+		c-0.1,4.7-0.1,9.4,0,14.2c-7.5,0-14.9,0-22.3-1c-23-0.5-46-0.6-69,0c-6.8,1-13.7,1.1-20.6,1.1c0-4.8,0-9.7,0-14.5
+		c7.9-0.3,17,0,23.2-5.8c5.5-6.4,6.5-15.4,7-23.5c0.2-57.3,0.1-114.6,0.1-172c-0.1-10.3,0.1-21.7-6.1-30.5
+		C779.8,489.4,769.7,489.5,761.3,489.6z"/>
+</g>
+</svg>
diff --git a/misc/openmohaa-text-sm.png b/misc/openmohaa-text-sm.png
new file mode 100644
index 00000000..e27733be
Binary files /dev/null and b/misc/openmohaa-text-sm.png differ
diff --git a/misc/openmohaa-text.png b/misc/openmohaa-text.png
new file mode 100644
index 00000000..57e1c665
Binary files /dev/null and b/misc/openmohaa-text.png differ
diff --git a/misc/openmohaa-text.svg b/misc/openmohaa-text.svg
new file mode 100644
index 00000000..8de0f98e
--- /dev/null
+++ b/misc/openmohaa-text.svg
@@ -0,0 +1,8500 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1733 851" style="enable-background:new 0 0 1733 851;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3F3F41;}
+	.st1{fill:#28282A;}
+	.st2{fill:#9CBADC;}
+	.st3{fill:#57626E;}
+	.st4{fill:#7F8E9F;}
+	.st5{fill:#9EAFC2;}
+	.st6{fill:#8A9EB6;}
+	.st7{fill:#6D7E92;}
+</style>
+<g id="Background">
+	<path class="st0" d="M1390.8,263.3v-74.6c0.1-0.5,0.1-1.1,0.2-1.6c-0.1-0.6-0.1-1.1-0.2-1.7v-11.4c0-0.1,0-0.2,0-0.3
+		c0.1-0.4,0.2-1.2,0.3-1.6c-0.1-0.7-0.2-1.3-0.4-2v-4.5c1-0.3,2-0.6,3-0.8c-1,0-2,0-3,0v-31.1c0-0.2,0-0.4,0-0.6
+		c0.5-0.3,1-0.6,1.6-0.8c-0.7-0.7-1.3-1.4-1.6-2.3V46.5c0.6-0.1,1.7-0.2,2.2-0.3c-1-0.3-1.7-0.9-2.2-1.7v-2.2
+		c0.6,0.2,1.4,0.4,1.9,0.6c0-0.4-0.1-1.2-0.1-1.6c0.9,0.5,1.9,1,2.9,1.5c0.1-0.6,0.2-1.8,0.3-2.4c-1.7-0.1-3.3-0.1-5-0.1v-7
+		c0.5-0.6,1-1.1,1.5-1.7c-0.5-1-1.1-2-1.5-3v-3.2h-0.5l0,0c-0.5,0-1.4,0-1.9,0c-1.8,0-3.5,0-5.2-0.1c-1.1-0.8-2.1-1.7-3.2-2.5
+		c-0.2,0.6-0.6,1.9-0.8,2.5c-1.1,0-2.2,0-3.3,0.1l-991.4,0c-3.1-0.2-6.1-0.7-9.2-0.4c-1,0.1-1.9,0.2-2.9,0.4h-1.7
+		c-0.5-0.4-1.2-1-1.6-1.3c-0.5,0.3-1.6,0.8-2.1,1.1c-0.5,0-1.5,0.1-2,0.1c-0.2,0-0.8,0-1,0c-2.5,0-5,0-7.5,0l-4.6,0
+		c-0.5-0.3-1.3-0.9-1.7-1.2c-0.4,0.3-1.2,0.8-1.7,1.2l-2.8,0c-1.1,0-2.2,0-3.2,0c-0.1,0.3-0.2,0.9-0.3,1.1c-0.3,4.1,0.1,8.3,0,12.4
+		c-0.1,1.6-0.2,3.2-0.2,4.7c-0.6,0-1.7,0-2.2-0.1c0.1,0.5,0.2,1,0.4,1.6c0.5-0.4,1.5-1,1.9-1.4c0.1,1.9,0.1,3.8,0.1,5.6
+		c0,0.8,0,1.6,0,2.5c0,3.5,0.1,6.9,0.1,10.4c0,1.1,0,2.2,0,3.3c0,2,0,4.1,0,6.1c0,0.4,0,1.2,0,1.5c0,1.9,0,3.8,0,5.8
+		c0,1.3,0,2.5,0,3.8l0,0.9c0,5.2-0.3,10.5-0.2,15.7c0.1,3.2,0.1,6.5,0,9.7c0,0.6,0,1.8,0,2.4c0.1,5.7,0.1,11.3,0,17
+		c0,0.5,0,1.6,0,2.1c0,1,0,3,0.1,3.9c-0.6,0-1.1,0.1-1.7,0.1c1.4,0.8,2,2,1.7,3.7c0,0.4,0,1.2,0,1.6c0,2.3,0,4.5,0,6.8
+		c0,2.2,0,4.3,0,6.5c-1.4,0.2-2.7,0.5-4.1,0.8c1.4,0,2.7,0.1,4.1,0.2v1.3c-0.1,2.5,0,5.1,0.1,7.6l0,4c-0.1,1.9-0.3,3.8-0.8,5.7
+		c0.6,2.3,0.8,4.6,0.8,6.9c-0.1,8.8-0.1,17.5,0,26.3c0,2.4,0,4.8,0,7.2c0,4.4,0,8.9,0,13.3l0,4.9c0,5.5-0.1,10.9-0.2,16.4
+		c0.1,2,0.2,4,0.2,6l0,9.8c-104.1-0.1-208.2,0-312.3,0v121.7c-0.8,0.1-2.1,0.3-2.7,0.5c0.9,0.3,1.8,0.5,2.7,0.8v89.2
+		c-0.2,1.2-0.6,2.4-1.3,3.5c0.4,0.8,0.9,1.6,1.3,2.4v83.7c0,0.7,0,1.4-0.1,2c0,0.3,0,0.6,0.1,0.9v62.3c-0.1,2.4-0.1,4.9-0.1,7.3
+		c-0.6,0.5-1.7,1.5-2.3,2c-0.8,1.2-2.5,2.5-1.6,4.2c0.9,1.4,2.6,1,4,1.1v55.2c0,0.2,0,0.3,0,0.5c0,0.2,0,0.3,0,0.5v50.9
+		c-0.4,1.2-1.2,2.2-1.9,3.3c-0.1,0.4-0.3,1.3-0.5,1.7c0.6,0.1,1.7,0.2,2.4,0.3v7.9c-0.3,2.8-0.1,5.6,0,8.3v12.7
+		c-2.7-0.1-5.5-0.1-8.2-0.1c0.2,0.8,0.4,1.6,0.6,2.4c2.6,0.2,5.1,0.7,7.6,1.3v19.7c0,1.4,0,2.8,0,4.1v7.4h252.9
+		c-1.1,1.7-2.3,3.3-3.3,5.1c1.4,0.6,2.9,1,4.4,1.5c0.5-2.2,1-4.4,1.5-6.6h876.5c-0.1,1.1-0.2,2.1-0.3,3.2c1.2-0.1,2.4-0.1,3.6-0.1
+		c0.1-0.2,0.2-0.6,0.2-0.8c0.1-0.6,0.1-1.5,0.2-2.3h22c0,0.4,0,0.8,0,1.1c0,0.8,0,2.3,0,3.1c0.9,0,1.8,0,2.7,0
+		c0.7-1.4,1.4-2.8,2.1-4.1h20.8c0.7,0.3,1.5,0.6,2.2,0.9c0.3-0.3,0.6-0.6,0.9-0.9h11.9c1.7,0.8,3.4,0.9,5,0h26.3
+		c-0.3,0.4-0.6,0.9-0.8,1.1c-0.1,0.5-0.2,1.6-0.3,2.1c0.8-0.2,1.7-0.3,2.5-0.5c-0.1-0.7-0.4-2-0.5-2.7h6.2c-0.8,1.7-1.5,3.4-2.1,5.2
+		c0,0.5-0.1,1.6-0.1,2.1c0.4-0.1,1.3-0.3,1.8-0.4c0.7-2,1.6-3.9,3.4-5.2c-0.2-0.4-0.6-1.3-0.8-1.7c0,0,0,0,0,0h11.7
+		c0.8,0.2,1.5,0.4,2.3,0.7c-1,0.1-2.9,0.2-3.9,0.3c-0.1,0.6-0.4,1.7-0.5,2.3c1.4-0.1,2.8-0.3,4.2-0.4l1.1-0.2
+		c0.7,0.9,1.4,1.9,2.1,2.9c-0.1-0.6-0.3-2-0.4-2.6c-0.3-1-0.5-2-0.8-3h69.4c0.1,0.4,0.2,1,0.3,1.4c0.1,0.5,0.2,1.5,0.2,2.1
+		c0.8-1.2,1.5-2.3,2.4-3.4h4.7c0.1,0.9,0.2,1.9,0.4,2.9c1-0.7,1.6-1.8,2.1-2.9h28.9c0.1,1.8,0.2,3.6,0.3,5.4
+		c0.1-1.8,0.2-3.6,0.2-5.4h13.5c0,1,0,1.9,0,2.9c0.6,0.4,1.1,0.8,1.8,1.3c-0.4-0.3-1-0.9-1.4-1.2c0-0.7,0-2,0-3h76.7
+		c-0.5,1-0.9,2-1.3,3l2.6-1c0.1,1.5,0.2,3,0.3,4.5c0.1-2.2,0.2-4.3,0.3-6.5h115.6c0.1,0,0.3,0,0.4,0.1c-0.7,0.3-2.1,0.9-2.7,1.2
+		c1.6,1.9,3.4,3.5,5.4,4.9c0.8,0.4,1.7,0.8,2.6,1.2c-1.4-2.2-4.4-3.9-4.1-6.8c0.2-0.2,0.4-0.4,0.6-0.6h2.6c0.4,0.4,0.8,0.9,1.2,1.3
+		c0.5-0.4,0.9-0.9,1.4-1.3h22.1c0.2,0,0.4,0.1,0.6,0.1c-0.4,2.1-0.8,4.2-1.1,6.4c1.2-2.1,2.5-4.3,3.6-6.5h74.5V263.3H1390.8z"/>
+	<path class="st0" d="M1299.5,6.2c-0.8,0.6-1.6,1.3-2.3,1.9c0.3,2,0.6,4,0.9,6.1C1298.4,11.5,1299.6,9,1299.5,6.2z"/>
+	<path class="st0" d="M1214.6,22.4c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c0.2,1,0.4,2,0.7,2.9
+		C1213.4,23.6,1214.2,22.8,1214.6,22.4z"/>
+	<path class="st0" d="M1397.9,29.7c0.8-0.1,2.5-0.2,3.3-0.2c-1.2-1.3-2.4-2.6-3.6-3.7l-0.6-0.5c-0.7,0.1-2,0.4-2.6,0.5
+		c1,1.3,2,2.6,3,3.9L1397.9,29.7z"/>
+	<path class="st0" d="M1409.3,34.6c0.4-1.3,0.9-2.6,1.4-3.9c0.8,0,2.5-0.2,3.3-0.2c-0.6-1-1.2-1.9-1.7-2.9c-0.3,0.4-0.9,1.3-1.2,1.7
+		c-0.2,0.2-0.7,0.7-0.9,1c-2.8,0.2-5.5,0.5-8.2,1.2c0.1,0.5,0.3,1.4,0.4,1.9C1404.8,33.6,1407.1,34.1,1409.3,34.6z"/>
+	<path class="st0" d="M1394.6,108.5c-0.1,1.8-0.1,3.5-0.1,5.3c0.1,0,0.4-0.1,0.5-0.1c0.6-2.6,2.3-4.5,4.6-5.7
+		c-0.4-0.7-0.8-1.4-1.2-2c-0.3,0.6-0.8,1.8-1.1,2.4C1396.6,108.4,1395.2,108.5,1394.6,108.5z"/>
+	<path class="st0" d="M18.8,670.1c-0.2-2.7-1.4-5-3.1-7.1c-0.1-1.6-0.1-3.2-0.2-4.9c-2.6,1.4-6,2.5-6.7,5.8c0.5,0.2,1.6,0.7,2.1,0.9
+		C14.2,665.6,15.4,669.4,18.8,670.1z"/>
+	<path class="st0" d="M7,701.2c-0.3-1.1-0.7-2.2-1-3.3c-1.1-0.5-2.1-1-3.2-1.4c-0.4,0-1.2,0.1-1.7,0.1c0.3,1,0.7,2,1,3
+		c0.2,0.7,0.8,2.1,1,2.8c0.8,0,1.5,0.1,2.3,0.2C5.9,702.2,6.7,701.5,7,701.2z"/>
+	<path class="st0" d="M27.6,724.9c0-2.3,0-4.6-0.1-6.9c-1.7,1-4,2.3-4,4.6C24.3,724.2,26,724.5,27.6,724.9z"/>
+	<path class="st0" d="M17.7,742.3c-0.4,0-1.2,0-1.6,0c-0.7,0-1.9,0.1-2.6,0.1c0,1.3,0,2.6,0.1,3.9c1.3,0.3,2.6,0.5,3.9,0.8
+		C17.5,745.6,17.5,743.9,17.7,742.3z"/>
+	<path class="st0" d="M5.3,754.8c0,2.9,0.1,5.8,0.2,8.7c1,0,1.9,0,2.9,0c0-3-0.1-5.9-0.3-8.9C7.5,754.6,6.1,754.8,5.3,754.8z"/>
+	<path class="st0" d="M16.3,756.4c0.1,1.4,0.3,2.8,0.4,4.2c1.3-0.3,2.6-0.7,3.9-1c-0.1-1-0.2-1.9-0.3-2.8
+		C18.9,756.6,17.6,756.5,16.3,756.4z"/>
+	<path class="st0" d="M201.2,823.5c-0.5-0.1-1.6-0.2-2.2-0.3c-0.3,2.6,0.1,5.3,0.8,7.8c1.1,0.5,2.2,1,3.4,1.5c0.4-1,0.8-2,1.2-2.9
+		c-0.4-0.4-1.1-1.1-1.5-1.5C201.7,826.9,201.6,825.1,201.2,823.5z"/>
+	<path class="st0" d="M1447.2,824.3c0.3,1.8,0.7,3.7,1,5.5c0.5-0.8,1-1.6,1.5-2.3c-0.1-0.7-0.4-2.2-0.5-2.9
+		C1448.8,824.5,1447.8,824.4,1447.2,824.3z"/>
+	<path class="st0" d="M126.4,828.5c0.2,1.8,0.5,3.7,0.9,5.5c2.6-0.6,3.9-3,4.5-5.4C130,828.5,128.2,828.4,126.4,828.5z"/>
+	<path class="st0" d="M1274.8,831.7l-0.3,0.3c0.4,1.2,0.8,2.3,1.3,3.5c0.9,0.1,1.8,0.2,2.7,0.3c0.5-1.1,1.1-2.1,1.7-3.1
+		c0.2-0.3,0.5-1,0.7-1.3c-0.5-1.2-1-2.3-1.5-3.5C1277.8,829.1,1276.3,830.4,1274.8,831.7z"/>
+	<path class="st0" d="M1310.3,834.3c1,0.9,2.1,1.7,3.2,2.6c0-1.5,0-2.9,0.1-4.4c3.5-2.6,7.3,0.7,10.9,1.3c0.3-1.3,0.7-2.7,1.1-4
+		c-3-0.1-5.9-0.4-8.7-1.3C1314.6,830.4,1312.3,832.2,1310.3,834.3z"/>
+	<path class="st0" d="M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2l0.7-0.1c0-0.7-0.1-2-0.1-2.6
+		C1493.5,829.5,1492.2,831.2,1490.7,832.6z"/>
+	<path class="st0" d="M157.1,834.8c0.8,0.8,1,3.4,2.6,2.7c2.4-0.8,5-1,7.5-1.2c0.1-0.2,0.4-0.7,0.6-0.9
+		C164.8,832.7,160.4,832.8,157.1,834.8z"/>
+	<path class="st0" d="M1265.6,844.1c0-0.4,0-1.2-0.1-1.6c-0.7-2.3,1.3-3.7,2.9-4.9c-0.7-1.5-1.8-2.8-3.5-3.4c-0.4,2.2-1.2,4.3-2,6.4
+		c-1.2,1-2.4,1.9-3.6,3c-0.8,0.5-1.6,1-2.4,1.6c0.5,2,1,3.9,1.5,5.9h1.6c-0.8-1.6-1.3-3.3-1.8-5.1c1,0.4,2.2,1,3.2,1.4
+		C1262.8,846.2,1264.2,845.2,1265.6,844.1z"/>
+	<path class="st0" d="M1319.4,845.2c0,0.8-0.1,2.3-0.1,3.1c1.3-0.9,3.3-1.2,4.1-2.8c0.4-2.2,0.2-4.5,0.1-6.7
+		C1321.5,840.5,1320.1,842.7,1319.4,845.2z"/>
+	<path class="st0" d="M1308.4,841.2c-0.7,0.6-1.4,1.3-2.1,2c-0.2,1-0.5,2.1-0.6,3.1c2.2,0.9,3.7,2.7,5,4.7h1.2
+		c-0.4-1.6-0.8-3.2-1.3-4.8C1309.9,844.5,1309.2,842.8,1308.4,841.2z"/>
+	<path class="st0" d="M102.5,844c0.7,1.7,2.2,2.8,4.1,2.7c1.4-1.3,0.4-2.9,0-4.4C105,842.5,102.7,841.7,102.5,844z"/>
+	<path class="st0" d="M1265.9,849c-0.2,0.5-0.7,1.5-0.9,2h7.2c0.8-1.4,2.2-2.8,1.2-4.5C1270.8,845.9,1268.4,848.2,1265.9,849z"/>
+	<path class="st0" d="M1336.4,845.9c-2.4,1.2-4.8,2.2-7.3,2.9c0.2,0.7,0.3,1.5,0.5,2.2h4.5c0.6-1.3,1.1-2.6,1.7-3.9
+		c1.7,0.9,3.7,1.7,4,3.9h3.6c-1.1-1.3-2.2-2.7-3.3-4C1339.1,846.1,1337.9,845.2,1336.4,845.9z"/>
+	<path class="st0" d="M71.5,851h7.1c0-0.7-0.1-2-0.1-2.7C75.8,848.3,72.9,848.3,71.5,851z"/>
+</g>
+<g id="Shadow">
+	<path class="st1" d="M373.2,40.6c1.4,0.3,2.6,3.8,0.8,4.4C372.4,44.4,372.3,41.8,373.2,40.6z"/>
+	<path class="st1" d="M377.2,50.2c0.5,0.2,1.4,0.7,1.9,0.9c-0.7,1.5-0.5,4.4-2.9,3.7C375.4,53.1,376.5,51.7,377.2,50.2z"/>
+	<path class="st1" d="M367.5,53c0.1-3.7,4.6-0.8,6.8-0.8C372.6,53.6,369,55.7,367.5,53z"/>
+	<path class="st1" d="M438.9,56.9c0.4-2.8,4-3.1,4.3-0.1C441.7,56.8,440.3,56.9,438.9,56.9z"/>
+	<path class="st1" d="M353,66c0.2-3,2.9-3.5,5.4-2.9C357,64.7,355,65.5,353,66z"/>
+	<path class="st1" d="M383.3,72.2c3.1-0.3,0.8,3.7-1.2,2.5C380.4,73.9,382.1,72.1,383.3,72.2z"/>
+	<path class="st1" d="M443.2,73.1c2.4-0.7,1.2,2.9-0.5,2.5C441.2,75.3,442.2,73.3,443.2,73.1z"/>
+	<path class="st1" d="M1380.1,78.2c1.6-0.5,2.2,0,1.7,1.6C1380.1,80.3,1379.6,79.8,1380.1,78.2z"/>
+	<path class="st1" d="M1361.1,80.2c1.6-0.5,2.2,0,1.7,1.7C1361.2,82.3,1360.6,81.8,1361.1,80.2z"/>
+	<path class="st1" d="M347.1,87.2c1.3-0.8,2,1.7,1.8,2.6c-0.7,1-1.8,1.6-2.8,2.1C344.7,90.7,345.6,87.9,347.1,87.2z"/>
+	<path class="st1" d="M403.9,104.1c0.8-1.5,0.5-4.6,2.9-4c0.8,1,1.5,2.2,0.5,3.3C406.2,103.7,405.1,103.9,403.9,104.1z"/>
+	<path class="st1" d="M1087.6,113.7c0.5,0,0.9-0.1,1.5-0.1c-0.7,1.7-0.9,3.6-1.1,5.4l1.6-0.1c2.9-0.1,5.9-0.1,8.8-0.1
+		c3.4,0.1,6.8,0,10.2,0c2.5,0,5.1,0,7.6,0c5.1,0,10.1,0,15.2,0.1c0,2.8-0.1,5.6-0.2,8.4c-32.4,0.4-64.8,0.1-97.2,0.2
+		c-104.7,0-209.3,0-314,0c-40-0.1-79.9,0.2-119.9-0.1c-0.1-2.8-0.1-5.6-0.1-8.4c3.9,0,7.9,0,11.8,0c4.2,0.1,8.4,0,12.6,0
+		c3.3,0,6.7,0,10,0c2.6,0,5.1,0,7.7,0c16.9-0.1,33.8-0.1,50.7-0.1c4.4,0.2,8.8,0.4,13.3,0.3c27.5-0.4,55,0.2,82.5-0.4
+		c11.2,0.3,22.3,0,33.5,0.2c10.5,0.3,20.9-0.2,31.4,0.1c2.4,0,4.8,0,7.2,0c3.7,0,7.4,0.1,11.1,0c2.4,0,4.8,0,7.3,0
+		c51.4-0.1,102.8-0.1,154.1-0.1c18.3-0.1,36.7,0.3,55-0.2l-0.3-1.2C1087.7,116.3,1087.6,115,1087.6,113.7z"/>
+	<path class="st1" d="M1291.5,117.4c1.5-2.3,3.8,2,1.5,2.7C1291.4,121.6,1290.7,118.3,1291.5,117.4z"/>
+	<path class="st1" d="M369.1,141.1c1.5,0.7,2.9,1.5,4.1,2.7c-1,0.4-1.9,0.8-2.9,1.2C369.9,143.7,369.5,142.4,369.1,141.1z"/>
+	<path class="st1" d="M688.9,189.2c0.3-1.9,2.3-2.6,3.8-3.3c0.3,1.8,0.6,3.7,0.9,5.5c3.2,0,6.5-0.1,9.7,0.2c2.5,0.5,4.8,1.3,7.1,2.2
+		c7.3,5.3,7,15.1,7.8,23.2c0.3,14.1,0.1,28.2,0.1,42.3c-0.5,14.6,0.3,29.2-0.1,43.8c-0.3,17.5,0.4,35-0.4,52.4
+		c-0.2,6.3-1,12.7-4.2,18.3l-0.8,1c-0.3-1.2-0.5-2.4-0.6-3.6c0.1-20.7,0.1-41.4,0-62.1c0-5,1-10,0.5-15c-0.6-6.6-0.4-13.3-0.5-20
+		c0.1-16.3-0.1-32.7,0-49c-0.3-4.6-1-9.7-4-13.4c-4.6-3.7-11-2.5-16.4-3.3c-3.1-0.3-3.5-3.8-3.6-6.2
+		C688.3,197.8,687.8,193.4,688.9,189.2z"/>
+	<path class="st1" d="M858.4,189.2c0.4-2.5,2.8-3.5,5.1-3.6c0,1.8,0,3.7,0.1,5.5c3.3,0.4,6.7,0.3,10,0.3c3.5,0.6,6.7,2.4,9.4,4.8
+		c0.8,1.2,1.6,2.5,2.3,3.9c1.5,4.7,2.3,9.6,2.4,14.6c-0.1,28.4,0,56.9,0,85.3c0.1,12.3-0.3,24.7,0.4,37c-0.6,7.2-0.3,14.5-0.6,21.7
+		c-0.4,5.9-1.3,12.4-5.7,16.8c0.6-49.2,0-98.3,0.3-147.5c0.1-5.3-0.8-10.9-3.3-15.6c-3.8-3.9-9.8-3.7-14.8-3.8
+		c-2.6,0.1-6-1.5-5.8-4.5C857.8,199.2,857.6,194.1,858.4,189.2z"/>
+	<path class="st1" d="M1018.4,186c1.5,0.9,3.4,1.9,3.4,4c1.7,14,1.7,28.1,3.6,42.1c0.3,4.8,2.1,10.3-0.7,14.6
+		c-6.1,3.6-13.6,2.3-20.4,3.4c0-0.6,0.1-1.7,0.2-2.3c-0.6,0-1.8,0-2.4,0c-2.2-8.7-2.6-18.3-7.9-25.9c-3.7-5.2-10.1-7.3-16.1-8.2
+		c-7.7-1-15.3-1.9-23.1-1.7c-7,0.3-14.1-0.7-21,0.9c-1.9,7.5-1.3,15.3-1.3,23c0.1,12.5-0.1,25,0.2,37.6c-1.9-0.5-5.4,1.3-5.8-1.4
+		c0.5-11.3,0.2-22.6,0.3-33.9c0-3.2,0-6.3,0-9.5c0.1-5.3,0-10.6,0.1-15.9c0-1.2,0-2.4,0-3.6c0.7-4.8-0.5-11.3,4.7-13.8
+		c3.4-1,6.9-1,10.4-1c12.6,0.1,25.2-0.3,37.6,1.9c7.7,1.2,15.8,4.6,19.7,11.7c1.2,2.2,2.3,4.4,3.3,6.6c1.5,4.4,2.6,8.9,3.4,13.4
+		c0.1,0.9,0.3,2.7,0.5,3.6c2.7,0.2,5.4,0.2,8.2-0.2c1.8-0.2,3.5-0.5,5.3-0.8l0.7-0.1c-0.3-2.8-0.7-5.6-1.3-8.4
+		c-0.4-2.4-0.5-4.8-0.8-7.1c-0.4-3.1-0.5-6.2-0.8-9.4c-0.2-2.6-0.5-5.2-0.7-7.8c-0.1-2.1-0.2-4.2-0.3-6.2
+		C1017.6,189.7,1018,187.9,1018.4,186z"/>
+	<path class="st1" d="M1044.2,191c0.2-2.5,2.3-3.9,4.4-4.9c0.3,1.7,0.6,3.4,0.9,5.1c6.7,1,15.7-0.2,19.9,6.4c2.7,3.4,3.5,7.8,4.2,12
+		c-0.2,6.8,1,13.6,0.7,20.4c-0.4,8.8-0.2,17.5,0.1,26.3c-0.1,17.2,0.1,34.5,0,51.7c0.1,10.9,0.3,21.9-0.2,32.8
+		c-1.2,10.1,0.6,20.8-3.5,30.4c-0.5,0.9-0.9,1.7-1.4,2.6c-2.1-2.5-1-5.9-1.2-8.8c-0.1-7.3,0.4-14.6,0.9-22c0.1-21.7,0-43.4,0-65
+		c-0.2-12.6,0.5-25.3-0.5-37.9c-0.1-6.6,0-13.2-0.9-19.7c-0.8-3.8-2.2-8-5.8-9.9c-4.5-1.6-9.3-1.3-13.9-2.1
+		c-2.1-0.4-3.8-2.2-3.7-4.3C1043.8,199.7,1043.7,195.3,1044.2,191z"/>
+	<path class="st1" d="M1206.3,189.2c0.3-2.4,2.9-2.7,4.8-3.5c0,1.9,0.1,3.7,0.3,5.6c4.5,0,9.1,0.3,13.2,2.1c2,1.2,3.9,2.6,5.6,4.3
+		c1.6,2.3,3,4.8,4.1,7.4c1.3,4.5,1.9,9.1,2.2,13.7c0.1,1.1,0.2,2.1,0.4,3.2c-0.2,1.4-0.3,2.8-0.4,4.2c-0.1,8,0.1,15.9-0.1,23.9
+		c0,4.6,0.2,9.2,0.1,13.8c0,2.6,0,5.3,0,7.9c0,2.2,0,4.4,0,6.6c0,0.5,0,1.4,0,1.9c-0.1,3.6-0.1,7.2,0,10.8c-0.2,8.4,0.8,16.7,0.9,25
+		c0,2.1,0.1,4.2,0.3,6.3c0.3,2.7,0.6,5.4,0.8,8.1l-1.2,0.2c-0.4-0.4-1.2-1.1-1.6-1.4c-1.4-1.7-2.7-3.5-4-5.2
+		c-0.8-10-0.8-20.1-0.8-30.2c0.1-18.7-0.1-37.4,0.1-56c0-7.8-0.4-16-4-23.1c-2.9-5.3-9.7-5.7-15-6.3c-2.7-0.1-6.1-1.5-5.9-4.7
+		C1205.9,199.1,1205.5,194.1,1206.3,189.2z"/>
+	<path class="st1" d="M1280.5,190.5c0.3-1.8,0.8-3.6,1.3-5.3c1.3,1,3.3,1.7,3.5,3.6c0.9,4.3,0.5,8.8,0.5,13.2
+		c-0.2,2.4-0.6,5.9-3.6,6.2c-5.1,0.8-11.1-0.1-15.3,3.5c-1.9,2.6-2.7,6-3,9.2c-0.2,10.4-1.7,20.6-1.6,31c0.1,24,0.1,48.1-1,72.1
+		c0,27,0,54-0.1,81c0.3,3-1.5,6.1-4.7,6.3c-5.7,0.5-11.4,0.4-17,0.1c-3.7-0.2-5.5-3.7-7.6-6.3c-23.1-30.7-48.8-59.1-73.7-88.3
+		c-12.6-14.4-25-29.1-37.5-43.6c-7.4-8.3-14-17.2-21.4-25.4c-0.3,4.4-0.2,8.8-0.1,13.1c1.8,18.6,0.5,37.4,1.1,56
+		c0.6,10,0.9,20,0.8,29.9c0.3,7.3-0.6,14.8,1,22c0.4,1.9,0.7,3.9-0.2,5.8c-3.7-3.9-5-9.4-5.4-14.7c-0.6-8.1-1-16.2-1-24.3
+		c-0.2-5.4-0.3-10.7-0.3-16.1c0-4.3,0-8.7-0.1-13c-0.1-9.3,0.4-18.7-0.6-28c0.1-14-1-28-1.2-42c-0.2-6.2-0.9-12.3-1-18.5l1.6,0.5
+		c1.3,1.6,2.5,3.2,3.7,4.9c1.2,1.7,2.5,3.4,3.8,5.1c3.4,4.5,6.9,8.8,10.3,13.3c0.2,0.2,0.5,0.7,0.7,0.9c1.1,1.4,2.3,2.8,3.4,4.1
+		c0.9,1.1,1.8,2.2,2.8,3.3c1.6,1.9,3.3,3.7,4.9,5.6c0.2,0.2,0.7,0.8,0.9,1c2,2.6,3.9,5.2,6.2,7.7c0.6,0.7,1.2,1.4,1.9,2.1
+		c0.2,0.3,0.8,0.9,1,1.2c4.2,4.6,8.1,9.5,12.3,14.1c1.5,1.6,2.8,3.3,4.2,5c2,2.5,4,4.9,6.1,7.2c0.6,0.8,1.3,1.5,2,2.3
+		c3.9,4.1,7.4,8.6,11.3,12.8c2,2.1,3.9,4.4,5.8,6.7c1,1.3,2.1,2.6,3.2,3.9c0.5,0.5,1.4,1.6,1.9,2.1c1,1.2,2.1,2.4,3.1,3.6
+		c3,3.5,5.9,7.2,9.1,10.7c2.5,2.8,4.9,5.7,7.3,8.7c2,2.4,4.1,4.8,6.2,7.2c1.1,1.2,2.1,2.4,3.2,3.7c1.6,2,3.3,4,5,5.9
+		c5,5.9,9.7,12.1,14.6,18.2c0.6,0.8,1.2,1.5,1.8,2.3c1.5,1.8,2.9,3.6,4.3,5.5c1.6,2,3.3,3.9,5,5.9c2.7,0.1,5.3,0.1,8,0.1
+		c2.5,0,5,0,7.5,0l0-1c0.1-5.6,0.1-11.3,0.3-17c0-2.1,0-4.2,0-6.3c-0.1-2.5-0.2-4.9-0.2-7.4v-1.1c0-0.6,0-1.7,0-2.3c0-2,0-4,0-6
+		c0.1-10.3,0.6-20.6,0.3-30.9c0-2.5,0-5,0.1-7.5c0-2.4,0.1-4.7,0.2-7c0.2-4,0.1-8,0-11.9c0-2.1,0.1-4.1,0.2-6.2
+		c0.1-3,0.1-5.9,0.1-8.9c0-2.3-0.1-4.6,0-7c0.1-1.3,0.2-2.5,0.3-3.8c0.4-6.7,0-13.4,0.2-20.1c-0.3-8.8,0.5-17.6,0.5-26.5
+		c0.4-5.5,0.8-11.1,1-16.6c0.2-4.8,2.9-9,6.4-12.1C1269.5,191,1275.3,191.9,1280.5,190.5z"/>
+	<path class="st1" d="M558.2,191.6c0.6-0.1,1.8-0.3,2.4-0.3c5,0.3,9.9,0.1,14.9,0.5c3.3,0.8,6.6,1.9,9.8,3c14.6,5,26.7,16,34.8,29.1
+		c0.2,0.3,0.6,0.9,0.7,1.2c1.7,2.9,3.2,5.8,4.7,8.9c2.5,5.4,4.5,11.1,6,16.8c1,4.5,2.2,9,2.9,13.6c1.5,8.2,1.2,16.6,1.8,25
+		c-1.1,9.6-1.8,19.3-3.7,28.8c-0.3,1.9-0.7,3.7-1.1,5.6c-1,4.2-2.9,8.1-4.5,12.2c-1.5-3.7,0-7.5,0.7-11.2c1.6-7.1,1.7-14.5,2.7-21.7
+		c0.9-6.4-0.7-12.7-1.1-19c-1.2-15.9-6.1-31.5-14.1-45.2c-6.2-10.1-15.1-18.8-25.8-24.1c-11-5-23.5-7.9-35.4-4.7
+		c-16,3.4-29.8,14.1-38.2,28.1c-5,7-7.9,15.2-10.6,23.3c-6.7,22.6-6.4,47-0.3,69.7c0.5,1.6,0.3,3.3,0,5c-7.9-17.5-10.6-37-10.4-56
+		c0.7-13.1,2.6-26.2,7.2-38.6c2.6-6.8,5.7-13.5,9.7-19.6c2.5-3.8,5.3-7.4,8.4-10.7c5.7-6,12.4-11.3,20.1-14.6c1.5-0.6,3-1.2,4.5-1.7
+		c1.8-0.6,3.7-1.3,5.6-1.8C552.8,192.4,555.5,192.1,558.2,191.6z"/>
+	<path class="st1" d="M1146.2,193.1c1.9-0.8,2.9,2.6,0.8,2.9C1145.3,196.5,1144.4,193.6,1146.2,193.1z"/>
+	<path class="st1" d="M757.7,195.7c0.9-0.2,1.8-0.3,2.7-0.5c9.4-0.2,19-0.2,28,3c12.4,4.1,20.3,16.1,22.7,28.5c0.3,2,0.5,4,0.6,6
+		c0.5,5.8,0.1,11.5,0,17.3c0,0.7-0.1,2.2-0.1,2.9c-0.3,5.8-1.8,11.5-4.1,16.8c-0.1,0.2-0.3,0.7-0.4,0.9c-0.3,0.5-0.8,1.5-1,2
+		c-0.2-0.5-0.5-1.4-0.7-1.8c0.3-6.3,2-12.6,1.6-19c-0.8-10.9-2.8-22.9-11.2-30.7c-8.9-7.7-21.4-9.3-32.7-8.1
+		c-0.1,49.3,0,98.6,0,147.9c-0.3,4.5,2.2,9.3,0.1,13.6c-0.8-1-1.5-2.1-2.2-3.2c-1.3-3.8-2-7.8-2.5-11.7c-1.1-8.6-0.6-17.2-0.7-25.8
+		c0-28.4,0.1-56.9-0.1-85.3c-0.2-7.2,0.9-14.4,0.2-21.6C757.2,216.7,758,206.2,757.7,195.7z"/>
+	<path class="st1" d="M1378.2,209.2c1.2-0.8,3.5,0.9,2,2.1C1378.7,212.9,1375.8,210.3,1378.2,209.2z"/>
+	<path class="st1" d="M851.1,215.8c4.7,8.5,7,18.4,6.6,28.1c-0.2,6.7,0.5,13.5-1,20c-2.2,11.8-8.6,22.4-16.5,31.4
+		c-16.5,18.9-42.3,28.8-67.2,26.5c-2.5-0.6-4.3-3.2-4.1-5.8c-0.1-4.6-0.3-9.3,0.2-14c0.2-2,2.3-2.7,3.9-3.4c0.1,1.8,0.3,3.6,0.5,5.5
+		l0.8,0.1c11,1.2,22.4-0.4,32.6-4.7c8.5-3.1,16.4-7.9,23.3-13.8c3.7-3.1,6.4-7.2,9.6-10.7c5.4-6.8,9.2-14.7,10.9-23.2
+		c0.3-1.5,0.7-2.9,1-4.4c0.7-3.1,0.8-6.2,0.8-9.3c-0.1-5.8,0.6-11.7-1.4-17.3c-0.2-0.6-0.5-1.8-0.6-2.4
+		C850.6,217.7,851,216.4,851.1,215.8z"/>
+	<path class="st1" d="M673.4,248.5c0.3-0.4,0.8-1.2,1-1.6c3.3,6.4,4.7,13.6,6.9,20.4c3,13,2.9,26.4,2.3,39.7
+		c-0.3,11.6-3.3,22.9-6.8,33.9c-4.3,10.2-8.8,20.4-15.9,29c-14.6,19.1-35.7,32.8-58.9,39c-7.5,2.5-15.3,3.5-23,5
+		c-10.7,0.4-21.4,0.1-32.1,0.1c-20.3-2.8-39.9-10.5-56.6-22.4c-17.5-13.4-31.9-31.4-38.4-52.6c-2.8-7.1-3.8-14.7-5.5-22
+		c-0.4-12,0-24.1-0.1-36.1c1.7-11,5-21.6,9-32c0.4,0.2,1.1,0.7,1.4,0.9c-3,8.9-4.6,18.3-5,27.7c-0.1,2.5-0.1,5-0.1,7.4
+		c-1,23.2,5.3,46.6,18.3,65.8c0.8,1.2,1.6,2.3,2.5,3.4c2.1,2.6,4.2,5.1,6.4,7.6c2,2.2,4.1,4.4,6.4,6.3c7.4,6.6,15.8,12.2,24.7,16.6
+		c2.5,1.3,5.1,2.5,7.8,3.6c1.5,0.6,3.1,1.2,4.7,1.8c1.8,0.6,3.6,1.2,5.4,1.8c8.8,2.4,17.8,5,27.1,4.6c7.4-0.2,14.8,0.5,22.2-0.6
+		c2.9-0.4,5.8-0.7,8.6-1.2c4.1-1,8.2-2,12.4-2.7c2.6-0.4,5-1.2,7.5-2.1c2.4-0.9,4.9-1.7,7.3-2.7c14.5-6.1,27.9-15,38.5-26.7
+		c0.8-0.9,1.6-1.8,2.3-2.8c3.4-4.2,6.6-8.6,9.3-13.4c0.7-1.3,1.5-2.5,2.2-3.8c2.5-4.6,4.3-9.5,6.2-14.3c4.1-10.6,5.8-22,6.8-33.2
+		C679.3,278.1,677.8,262.9,673.4,248.5z"/>
+	<path class="st1" d="M986,268c-1-4.8-1.7-11.5,3.7-14c0.3,0.6,0.9,1.7,1.2,2.3C990.4,260.6,988.9,264.8,986,268z"/>
+	<path class="st1" d="M1003.4,286c0.2-11-0.3-22,0.6-32.9c2.2,1.1,5.2,2.1,5.8,4.9c0.9,5-0.8,10-0.7,15c0,13.6,0,27.3,0,40.9
+		c-0.1,5.2,2,10.6,0.5,15.8c-2.2,5-8.4,3-12.6,3.4c-3.7-0.2-9,1-10.9-3.1c-1.4-5.1,0-10.7-2.4-15.6c-1.7-4.9-7.2-6.1-11.6-7.1
+		c-12.9-1.6-26-1.8-39.1-1.3c-0.6,17.7,0,35.4-0.3,53.1c-0.3,3.6,1.4,7.3,0.3,10.8c-3.8-4.4-5-10.3-5.4-15.9
+		c-0.5-10.6,0.3-21.3-0.5-31.9c0.1-6.3,0.8-12.7,0-19.1c-1-4.8,0.9-9.7-0.5-14.5c8.5-0.1,17,0,25.5,0c9,0,18.2-0.1,26.9,2.7
+		c4.6,1.5,8.6,4.8,10.3,9.4c2,4.6,1.2,9.9,2.8,14.5c4.2-0.4,8.4-0.6,12.6-0.4C1002.9,305.2,1003.6,295.6,1003.4,286z"/>
+	<path class="st1" d="M1481.9,286c-0.8-3.5,4.1-1.1,4.4,1C1484.8,286.7,1483.2,286.7,1481.9,286z"/>
+	<path class="st1" d="M1449.3,296.1c2.7-0.6,0.9,3.8-1,2.7C1446.5,298.2,1447.8,296.1,1449.3,296.1z"/>
+	<path class="st1" d="M1291.2,318.2c1.4-1.2,2.7,1.4,1.3,2.2C1291.1,321.5,1289.9,319,1291.2,318.2z"/>
+	<path class="st1" d="M45.2,330.2c1.5-1.2,3,1.4,1.6,2.4C45.3,333.8,43.8,331.2,45.2,330.2z"/>
+	<path class="st1" d="M1036.6,344.2c0.1-0.2,0.2-0.8,0.3-1c3.5,0.5,6.8,3,6.7,6.9c-0.6,7.1-3.5,13.8-5,20.7c-2.4,11-5.4,21.9-7.2,33
+		c-0.5,2.6-2.7,5.1-5.4,5.3c-5,0.4-10-0.9-15-0.9c-11,0-22,0.3-33-0.9c-17.4-0.3-34.7,0-52.1-0.1c-4.1-0.1-8.2,0-12.3,0.4
+		c-14.5,1.3-29.1,0-43.6,0.9c-4,0.5-9.6,2.1-11.7-2.7c-0.8-5.2-0.6-10.5-0.2-15.7c0.1-2.5,2.6-3.5,4.7-4.1c0.3,1.8,0.1,3.8,0.9,5.5
+		c11.5-1,23.1-0.7,34.6-1.1c17.9,0.4,35.7-0.8,53.6-0.4c12.7-0.3,25.4,0.9,38.1,0.1c2.3,0,4.7,0.4,7,0.5c0.7,0,2.1,0.1,2.8,0.1
+		c7-0.1,13.9,0.8,20.8,0.8c1.5,0,3.1,0.1,4.6,0.1c0.4-1.3,0.8-2.7,1.1-4c0.8-2.7,1.3-5.5,1.8-8.3
+		C1030.5,367.3,1033.4,355.6,1036.6,344.2z"/>
+	<path class="st1" d="M1049.3,379.4c0.7,0,2.1-0.2,2.8-0.2l-0.7,0.1C1051,379.3,1049.9,379.4,1049.3,379.4c0.1,4,0.1,8,0.2,12
+		c9.1-1.4,18.3-0.5,27.5-1.3c4.6-0.5,9.3,0.4,13.9,0.2c8-0.1,16,0.5,24,0.4c1.3-0.7,2.7-1,4.2-1.3c0.1-3.3,0.1-6.6,0.2-9.9l0-0.3
+		c0.2,2.1,0.4,4.3,0.6,6.4c1.7,0.9,4.1,1.5,4.6,3.7c0.7,3.8,0.1,7.8,0.1,11.6c-0.2,2.2-0.1,4.6-1.4,6.5c-2.1,2.3-5.4,1.5-8.1,1.2
+		c-6.7-1.1-13.5-0.2-20.2-0.7c-6.7-0.6-13.3,0.2-20,0.1c-8.3,0.2-16.7-0.5-25,0.9c-2.6,0.5-5.7-1.1-5.8-4c-0.4-5-0.4-10,0-14.9
+		c0.1-2.6,2.7-3.5,4.8-4.3C1049.1,383.6,1049.2,381.5,1049.3,379.4z"/>
+	<path class="st1" d="M688.9,389c0.4-1.9,2.3-2.5,3.9-3.1c0.3,1.9,0.3,3.8,1,5.6c4.1,0.1,8.1-1,12.1-0.9c4,0,8,0,12-0.5
+		c5.6-0.4,11.2-0.1,16.8-0.4c15.8-0.1,31.6,1.1,47.4,1.8c0.6-1.8,0.7-3.7,1-5.6c1.9,0.6,3.9,1.7,4.2,3.9c0.6,4.6,0.4,9.4,0.2,14
+		c0,2.5-1.7,5.3-4.5,5.2c-4.7,0.1-9.3-1.2-14-0.9c-6.7,0.5-13.3-1.3-20-1c-10.3,0.2-20.6-0.5-30.9,0.8c-6.1,0.6-12.3-0.3-18.5,0.7
+		c-2.9,0.3-6.1,1.1-8.9-0.2c-2.9-1.7-2.4-5.5-2.5-8.4C688.4,396.3,687.9,392.5,688.9,389z"/>
+	<path class="st1" d="M147.5,426.2c0.8-1,3-0.8,3.1,0.6C150.5,428.7,146.6,428.1,147.5,426.2z"/>
+	<path class="st1" d="M161.2,437.5c2-1,2.8,3.2,0.7,3.4C160.4,440.7,160.2,438.4,161.2,437.5z"/>
+	<path class="st1" d="M1053.5,475.6l0-0.5c0.1,2,0.1,4,0.2,6c1.8,1,4.7,1.4,5,3.9c0.6,5.7,0.3,11.4,0.2,17.1
+		c0.1,2.9-2.3,5.5-5.3,5.5c-6.7,0.5-14.7-1-20,4c-3.8,4.9-4.5,11.4-5,17.4c-1.6,11.3-0.7,22.7-0.9,34c0,45.7-0.1,91.3,0,137
+		c-0.1,6.7,1.7,13.2,1.3,19.8c-0.6-0.1-1.8-0.4-2.4-0.5c-4.5-13.1-4.2-27.2-4.3-40.8c0.1-3.2,0.1-6.4,0.1-9.5c0-2.6,0-5.1,0-7.6
+		c0-3.2-0.1-6.5,0-9.7c0.1-13.4,0.1-26.8-0.1-40.1c0.1-29.8,0.1-59.7,0.1-89.5c0.1-8.5,0.7-17.5,5.5-24.9l0.5-0.9
+		c2.8-3.1,6.5-5.5,10.7-5.8c4.5-0.4,9-0.4,13.6-0.9C1052.6,484.9,1053.1,480.2,1053.5,475.6z"/>
+	<path class="st1" d="M1236.2,476.2c0.9-2.4,2.6,0.2,3,1.5c4,10.9,6.7,22.3,10.8,33.2c16.8,52.6,35.3,104.6,53,156.9
+		c2.7,8.1,5.4,16.2,8.6,24.2c0.6,1.8,1.7,3.9,0.1,5.6c-1.4-3.6-3-7.2-4.2-10.9c-1.2-4.2-2.8-8.3-4.6-12.2c-0.7-1.9-1.3-3.7-1.9-5.6
+		c-2-6.2-4.2-12.4-6.3-18.6c-1.1-3.1-2.1-6.3-3.1-9.4c-2.6-7-5-14-7.3-21.1c-1.1-3.4-2.3-6.8-3.6-10.2c-3.2-6.1-4.1-13-6.6-19.5
+		c-4.4-13-9.1-25.9-13.2-38.9c-0.8-2.7-1.7-5.5-2.7-8.1c-2.5-6.7-4.6-13.5-6.8-20.2c-0.4-1.2-0.8-2.5-1.2-3.7
+		c-1.6-4.8-3.2-9.5-4.6-14.3c-0.5-1.5-1-3.1-1.5-4.6C1241.2,492.3,1238.8,484.2,1236.2,476.2z"/>
+	<path class="st1" d="M1524.7,474.7c1.5,0.5,3.2,1.3,3.5,3.1c2.2,8.8,5.8,17.2,8,26c3.6,10.7,7.3,21.4,10.6,32.3
+		c6.8,19.4,12.8,39,19.9,58.3c8.1,24.2,16.5,48.2,24.8,72.3c1.7,6.2,3.9,12.3,6.2,18.3c0.5,1.9,1.9,4.2-0.1,5.7
+		c-0.4-1.2-0.8-2.4-1.2-3.6c-0.8-2.8-1.9-5.5-3-8.1c-0.5-1.3-1-2.6-1.5-3.8c-1.2-3.6-2.5-7.1-3.9-10.7c-1.1-3.3-2-6.7-3.2-10
+		c-0.8-2.4-1.7-4.8-2.6-7.1c-1.4-4.2-2.4-8.4-4.2-12.4c-0.7-1.7-1.2-3.5-1.7-5.2c-1.1-4-2.3-7.9-3.9-11.6c-1.3-3.1-2.3-6.2-3.3-9.4
+		c-0.4-1.3-0.9-2.7-1.3-4c-3.5-9.4-6.5-19-9.9-28.5l-0.2-0.6c-2.7-7.6-4.8-15.4-7.9-22.9c-1.4-3.9-2.6-7.9-3.9-11.9
+		c-3.4-10-6.7-19.9-9.9-29.9c-1.2-4-2.4-8-3.9-12c-0.9-2.5-1.8-5-2.5-7.5l0-0.2C1528.4,485.7,1526.5,480.2,1524.7,474.7z"/>
+	<path class="st1" d="M432,480.8c2.1,0.7,4.4,2,4.5,4.5c0.4,5.2,0.2,10.5,0.2,15.7c-0.1,2.4-0.6,5.9-3.6,6.2
+		c-8.5,1-18.1,0.1-25.4,5.4c-4.7,5.2-4.1,12.9-4.6,19.4c1.3,17.3,0.4,34.6,0.7,51.9c-0.3,9.7,0.9,19.3,1.2,29
+		c0.7,11.9-0.5,23.9,0.5,35.8c1.1,7,0.3,14.1,1,21.1c0.6,6.7-0.3,13.5,0.9,20.2c1,6.6-0.5,13.3,1.1,19.8c0.6,3.3,1.6,7.1-0.6,10
+		c-1.5-2.6-2.5-5.4-3.2-8.3c-0.2-1-0.5-2-0.7-2.9c-1.7-6.1-1.5-12.4-1.7-18.6c-2.2-11.5-1.2-23.3-1.7-35c0.1-5.5-0.2-10.9-1-16.3
+		c-0.1-6.9,0.1-13.8-0.7-20.7c0.8-8.8-0.8-17.6-0.4-26.5c0-4.2-0.1-8.4-0.1-12.6c0.1-12.9-1.4-25.7-1.2-38.5
+		c0.1-1.8,0.2-3.6,0.2-5.3c0-6.7-0.2-13.4-0.1-20.1c0.1-3.8,0.7-7.6,1.5-11.3c0.2-0.6,0.7-1.7,0.9-2.2c2.6-5.3,7.8-8.9,13.5-10
+		c1.7-0.4,3.5-0.7,5.2-1c4.3-0.2,8.5-0.2,12.8-0.5l0.5,0C431.7,486.9,431.8,483.8,432,480.8z"/>
+	<path class="st1" d="M755.5,485.3c0.1-2.5,2.3-3.9,4.5-4.5c0.2,2.8,0.4,5.6,0.4,8.4l1.1,0.1c4.8,0.5,9.7,0.4,14.5,1.3
+		c2.9,0.8,5.7,2,7.9,4c0.6,0.6,1.1,1.3,1.7,2c0.9,1.3,1.7,2.7,2.5,4.1c2.6,5.7,2.6,12,3.3,18.2c0.5,15,0,30.1,0.2,45.1
+		c0,0.8,0,2.5,0,3.4c0,6.5-0.1,12.9,0,19.4c0,2.8,0,5.6,0,8.4c-0.1,3.9,0,7.8,0,11.8c0.2,7.5-0.2,15,0,22.5c0.1,22.1,0,44.2,0,66.3
+		c-0.5,3.7-0.9,7.5-1.1,11.3c-0.3,4.8-2.8,9-4.2,13.6c-3-4.2-0.7-9.8-0.5-14.6c0.9-42,0.4-84,0.5-126c-1-17.3,0.7-34.7-1.2-52
+		c0.2-5.3-1.3-10.7-3.9-15.3c-4.6-5.6-12.6-5.1-19.1-5.1c-3.3,0.2-6.7-2.1-6.6-5.6C755.4,496.5,755.2,490.9,755.5,485.3z"/>
+	<path class="st1" d="M100.4,485.4c0.9-2.1,2.3-3.8,4.8-3.7c0.2,2.6-0.2,5.4,1.2,7.7c0,0.1,0.2,0.4,0.2,0.5
+		c4.9,0.5,9.9,0.2,14.7,1.4c8.7,2.5,14.2,11.1,15.3,19.8c1.2,9.1,0.8,18.4,0.2,27.5c-0.2,2.3-0.2,4.7-0.3,7
+		c-0.7,7.1-0.8,14.3-1.2,21.4c-1.2,8.6-0.8,17.3-1.7,26c0,7.9-1.7,15.9-0.3,23.8c0.6,2.9-1.5,5.4-1.5,8.2
+		c-0.2,14.7-1.4,29.3-2.1,43.9c-0.8,8.5-0.8,17-1.9,25.5c-0.2,1.7-0.4,3.5-0.5,5.2c-0.4,1.9-0.8,3.7-1.1,5.6
+		c-0.3,1.8-0.7,3.7-0.8,5.6c0.1,1.4,0.2,2.8,0.3,4.2c-1.4,1-2.9,2-4,3.4l-0.6,0.8c-1.5-3.7,0.6-7.6,0.7-11.3
+		c0.3-6.7,2.2-13.2,1.7-20c-0.2-3.4,0.1-6.7,0.8-10c1.8-8.1-0.1-16.5,1.4-24.6c1.7-9,0-18.3,1.4-27.3c0.9-6,0.3-12.1,0.5-18.1
+		c0.1-6.4,2.2-12.6,1.4-19c-0.4-3.2-0.2-6.4,0.1-9.5c-0.8-0.2-2.4-0.7-3.2-0.9c1.1-1,2.1-2,3.2-2.9c2.2-8.6,1-17.5,1.6-26.3
+		c1.3-7.7,2.3-15.7,0.3-23.3c-1.1-4.5-1.6-9.5-5-12.9c-4.9-5.5-13-5.3-19.8-5.6c-3,0-5.6-2.6-5.6-5.6c-0.2-4.3,0.1-8.5-0.2-12.8
+		c-0.8-0.9-1.5-1.7-2.3-2.5C98.5,486.3,99.8,485.7,100.4,485.4z"/>
+	<path class="st1" d="M874,481.7c1.9,0.3,4.1,0.9,4.2,3.2c0.9,5.6,0.4,11.3,0.4,16.9c0,3.4-3.3,6-6.6,5.8c-6.5-0.1-13.8-0.4-19,4.2
+		c-5.2,8.4-5.3,18.6-4.9,28.2c0,5.9-0.8,11.9-0.3,17.8c0.6,7.4,0.1,14.8,0.2,22.2c0,5.3,0.5,10.8-0.8,16c-1.6,0.1-3.4,0.6-4.9-0.3
+		c-0.2-0.4-0.5-1.1-0.6-1.5c0.1-8.4-0.4-16.9,0.5-25.3c-0.2-12.2-0.4-24.5-0.6-36.8c0-5-0.2-10,0.8-15c0.7-4.1,1.2-8.2,1.8-12.4
+		c0.1-0.4,0.4-1.2,0.5-1.6c0.7-2.2,1.5-4.4,2.2-6.5c2.8-2.2,5.8-4.5,9.3-5.6c5.4-1.7,11.1-1.6,16.7-1.5l1,0
+		C873.9,487,874,484.4,874,481.7z"/>
+	<path class="st1" d="M936,484.1c0.4-1.9,2.5-2,4-2.4c0.2,2.7,0.2,5.4,0.3,8.2l0.7,0c4.3-0.1,8.6-0.3,12.9,0.3
+		c4.5,1,9.3,2.6,11.9,6.7c0.8,1.2,1.6,2.4,2.4,3.6c0.2,0.4,0.6,1.1,0.8,1.4c2.3,8.9,2.4,18.1,2.6,27.1c0.9,11.6,0.7,23.3,0.3,34.9
+		c-0.9,8.4,0.2,16.8,0.5,25.3c0,2.4,0,4.9,0,7.3c-0.8-0.1-2.3-0.2-3.1-0.3c-1.1-0.5-2.2-1-3.3-1.6c-0.3-12.9-0.2-25.8,0.2-38.6
+		c-0.4-8.3-0.5-16.7-0.4-25c0.2-4.4-1.1-8.7-2.1-12.9c-1-3.8-3.1-7.8-7.1-8.9c-5.4-2.5-11.4-1.1-17-1.9c-3.8-0.8-4.8-5-4.5-8.3
+		C935.6,494,934.6,488.9,936,484.1z"/>
+	<path class="st1" d="M41.9,486.7c2.5,1.6,4.8,4.4,4.2,7.5C43.2,493.9,41.9,489.4,41.9,486.7z"/>
+	<path class="st1" d="M572.9,493.3c4.4-0.9,8.8-2,13.2-3.3c13.2-1.5,26.9,0.3,39.2,5.5c3,1.3,6,2.7,8.9,4.2
+		c6.5,3.5,12.3,8.1,17.7,13.1c0.8,0.7,1.5,1.4,2.3,2c3,4.5,6.9,8.3,9.7,12.9c0.2,0.4,0.6,1.1,0.9,1.5c1.2,2.2,2.5,4.4,3.9,6.5
+		c1.3,2,2.5,4.1,3.5,6.2c0.9,2,1.8,4,2.7,6.1c2.1,5.7,4,11.5,5.9,17.3c0.5,2.1,1.1,4.2,1.7,6.3c0.1,0.5,0.3,1.6,0.4,2.1
+		c0.9,5.1,1.7,10.1,2,15.3c0.2-0.7,0.5-1.3,0.7-2c-0.1,3.7-0.1,7.3,0.6,10.9l0.2,1.1c0,15-0.8,30.1-2.6,45.1
+		c-1.4,5-2.7,10.1-3.8,15.2c-1.4,5.3-3.3,10.4-5.5,15.5c-0.1,0.3-0.4,1-0.6,1.4c-0.6,1.3-1.2,2.6-1.8,3.9c-0.5-4.6,1.8-8.9,2.8-13.3
+		c2.8-9,3.7-18.4,5-27.7c0.2-13.5,1.6-27.1-1-40.4c-2.9-24.1-11.7-48-27.9-66.3c-11.9-13-28.4-21.8-45.9-24.2
+		c-12.3-1.6-25.2,0.2-36.5,5.3c-15.7,6.7-28.4,19.2-37,33.7c1.1,1.4,2.2,2.7,3.3,4.1c-1.6-0.4-3.2-0.7-4.8-1.1
+		c-11.7,19.9-16,43.2-17.3,65.9c-0.6,8.9,1.4,17.7,1.7,26.6c0.8,0.7,1.5,1.4,2.3,2.1c-1.7,3-0.1,6.3,0.2,9.4
+		c0.5,4.5,2.3,8.6,3.3,12.9c0.5,2.7,2.1,4.9,3.7,7.1c-0.6,0.9-1.2,1.9-1.8,2.8c-3.1-4.5-3.8-10.2-6.3-15c-1.2-3.6-2.3-7.3-3.5-11
+		c-0.5,0.4-1.4,1.2-1.9,1.6c-0.6,0-1.7,0.1-2.2,0.1c0.1-0.5,0.4-1.5,0.5-2c0.8-0.1,2.3-0.2,3.1-0.3c-0.2-1.6-0.3-3.3-0.6-4.9
+		c-1.7-8.9-3.4-17.8-3.8-26.8c0-0.7,0-2,0-2.7l0-1.7c-1.4,0-2.8,0-4.3,0c1.4-0.2,2.8-0.4,4.2-0.6c0-0.9,0-2.7,0-3.6
+		c0.3-8.4-0.8-16.8,1.2-25c2.2-13.7,5.4-27.4,11.1-40.2c2.2-5,4.8-9.8,7.6-14.5c1-1.7,2.1-3.3,3.3-4.9c1-1.4,2-2.7,3.1-4.1
+		c1.6-2.1,3.4-4.1,5.2-6c0.5-0.5,1.4-1.5,1.9-2c3.1-3.2,6.3-6.4,10.1-8.8c2.6-1.5,5-3.4,7.3-5.3C562.4,495.8,567.9,495,572.9,493.3z
+		"/>
+	<path class="st1" d="M32.1,507.3c1.8,0.2,1.6,3.4-0.1,3.6C30.1,510.7,30.5,507.6,32.1,507.3z"/>
+	<path class="st1" d="M201.9,513c1.5-0.2,3.9-0.3,2.8,1.8C203.4,517,200.6,515.2,201.9,513z"/>
+	<path class="st1" d="M208.4,521.2c2-0.8,2.8,2.6,0.7,2.9C207.2,524.6,206.5,521.6,208.4,521.2z"/>
+	<path class="st1" d="M407.9,525.2c1-0.3,2-0.6,3.1-0.9c1.3,1.4-0.1,3.3-0.3,4.9C409.5,528.1,408.4,526.8,407.9,525.2z"/>
+	<path class="st1" d="M424.1,525.2c1.6-0.5,2.2,0,1.7,1.7C424.2,527.4,423.6,526.8,424.1,525.2z"/>
+	<path class="st1" d="M1204.5,534.5c0.9-2.2,1.7-4.3,2.3-6.6c3.4,5.7,3,12.8,5.4,19c1.7,10.2,5.4,19.8,8.2,29.7
+		c3.3,10.5,6.4,21.1,9.8,31.6c1.4,4.5,3.1,8.8,4.7,13.1c-2.9,0-5.8-0.1-8.7-0.1c-0.5,0-1.6,0-2.2,0c-3.9-12-7.5-24.1-11.2-36.1
+		c-2.2-7.3-3.9-14.9-6.8-22c-3.7,8.9-6.2,18.2-9.8,27c-3.4,9-6.8,17.9-10.3,26.8c-0.6,1-0.8,2.6-2.1,2.9c-3.5,0.8-7.2,1.1-10.5-0.2
+		c8-20.6,16.6-41,23.5-62C1199.7,550.1,1201.9,542.3,1204.5,534.5z"/>
+	<path class="st1" d="M465.2,529.3c1.4-1.2,3,1.4,1.7,2.5C465.4,532.9,463.8,530.4,465.2,529.3z"/>
+	<path class="st1" d="M1494.7,529.1c0.6,0.1,1.7,0.3,2.3,0.4c0.1,0.9,0.3,1.8,0.4,2.8c0.2,2,0.6,4,1.1,5.9c2,9,4.5,17.9,7.1,26.8
+		c1.3,4.4,2.1,9,3.8,13.3c0.4,1.4,0.9,2.7,1.3,4.1c0.6,2,1.2,3.9,1.8,5.9c1.2,3.9,2.6,7.7,3.7,11.6c2,6.5,4.1,13.1,6.7,19.4
+		c-3.4,1.1-7.1,1.8-10.5,0.5c-3.7-10.1-6.3-20.5-9.7-30.7c-3-8.7-4.7-17.7-8-26.3c-6.9,19.5-13.7,39.1-21.8,58.1
+		c-3.9-0.1-7.8,0.3-11.6,0.6c1.6-4.2,3.5-8.2,5-12.4c4.3-10.7,8.5-21.4,12.6-32.1c0.4-0.9,0.8-1.9,1.1-2.9c1.7-4.4,2.8-9,4.8-13.3
+		c1.7-3.5,2.8-7.3,3.5-11.1C1490.5,542.9,1492.8,536,1494.7,529.1z"/>
+	<path class="st1" d="M348.7,550.5c1.4-3.2,2.5-6.5,3.5-9.8c2.4,1.7,1.2,4.8,1.1,7.3c-1.3,7.9-0.5,15.9-1.5,23.9
+		c-1.3,10.1,0,20.3-0.4,30.5c0,1.8,0,3.5,0,5.3c0.2,19.4-0.3,38.8-0.3,58.2c0.4,9.4-0.7,18.8,0.1,28.3c0.1,4.3,0.2,8.6-0.1,12.9
+		c-0.1,0.7-0.5,2.1-0.6,2.8c-1,4.3-2.5,8.6-5.4,12c-0.9-1.9-0.5-3.9-0.2-5.9c1.5-12.6,0.9-25.3,1-38c0.1-27,0-54,0-81
+		c0-3,0-6.1-0.2-9.1c-5.7,11.1-9.8,23-15.5,34.1c-3,7.5-6.7,14.7-10.2,22c-4.1,10.3-9.7,19.8-14.1,30c-4.4,9.9-9.6,19.4-13.8,29.4
+		c-6.4,13.5-11.8,27.4-18,41c-2.5,5.3-3.9,11.5-8.4,15.5c-3.7,3-8.5,1.1-12.7,1.5c-3.1,0.3-6.8-1.2-7.8-4.4
+		c-2.9-7-6.6-13.7-9.6-20.7c-3.6-9-8.9-17.2-12.3-26.3c-6-12.1-11.3-24.6-17.4-36.7c-4.2-10-9.6-19.5-13.7-29.5
+		c-7.1-14.7-13.9-29.5-20.6-44.4c-2.1-4.9-3.7-10.1-6.6-14.6c-0.9,15.3,0,30.7-0.7,46c-2.4,11-0.6,22.3-1.9,33.4
+		c-0.3,2.8-0.4,5.7-0.5,8.6c1.1,0.5,2.2,0.9,3.2,1.4c-1,0.8-2,1.6-3.1,2.5c-0.5,10.8-0.2,21.7-0.3,32.5c-0.2,3.9,0.8,7.8,0.2,11.7
+		c-2.7-3.3-4.2-7.4-5.3-11.4c-1.1-11-0.3-22-0.6-33c0.8-5.5,0.8-11,0.5-16.6c-0.3-6.2,0.5-12.5,0.7-18.7c0.4-6.9,0.1-13.7,0.8-20.6
+		c1.7-10.4,1.3-21,1.4-31.4c-0.1-15.4,0.7-30.9-1-46.3c0.9,0.7,1.8,1.3,2.7,2c0.8,2.6,1.5,5.4,3.5,7.4c0.4,2.7,1,5.4,2.1,8
+		c0.8,2.5,2.4,4.7,4.6,6.1c-0.3,0.7-1,2.1-1.3,2.8c1,1.6,2,3.2,2.9,4.8c0.6,3.1,1.8,6,3.2,8.8c11.9,26.2,24.1,52.3,36.4,78.4
+		c0.2,0.4,0.7,1.3,0.9,1.8c3.2,6.7,5.8,13.5,9.2,20.1c0.2,0.3,0.4,0.9,0.6,1.2c1.1,2.2,2.2,4.5,3.3,6.7c0.9,2,1.9,4,2.9,6.1
+		c0.5,1.1,0.9,2.1,1.4,3.2c1,2.3,2,4.5,3.1,6.7c1.3,2.5,2.6,5,3.7,7.6c0.4,1,0.9,2.1,1.4,3.1c0.9,1.5,1.9,2.9,3,4.3
+		c0.4,2.1,1.1,4.2,2.1,6.1c2.2,4.4,3.8,9.1,6,13.5l0.4,1c3.8,1.5,8.1,0.7,12.1,0.6c0.2-0.4,0.5-1.2,0.7-1.7c0.3-0.8,0.6-1.6,1-2.4
+		c2.5-5.3,4.7-10.8,7.4-16c0.6-1.3,1.1-2.6,1.6-3.9c1.9-5.3,4.2-10.4,6.6-15.4c1.1-2.4,2.2-4.8,3.2-7.3c1.9-4.9,4.3-9.7,6.5-14.5
+		c9.1-18.9,17.9-37.9,27-56.8c1.2-2.5,2.4-5,3.5-7.6C330.4,595.5,340.1,573.2,348.7,550.5z"/>
+	<path class="st1" d="M255.3,546.3c1.8-1.2,4.2,0,5.2,1.7C259.7,551.4,253.1,549.5,255.3,546.3z"/>
+	<path class="st1" d="M639.2,551.1c1-0.9,3.6,0,2.5,1.5C640.5,554.4,636.5,552.5,639.2,551.1z"/>
+	<path class="st1" d="M618.2,552.2c0.8-1.2,3.5-0.2,2.3,1.3C619.6,554.7,617,553.6,618.2,552.2z"/>
+	<path class="st1" d="M1661.7,552.7c1.2,0.2,3-1.3,3.7,0.3c0,1.9-1.8,2.7-3.2,3.3C1662.1,555.4,1661.8,553.6,1661.7,552.7z"/>
+	<path class="st1" d="M419.1,553c2.8-0.3,2.7,5,0,4C417,556.9,418.2,554,419.1,553z"/>
+	<path class="st1" d="M543,552.7c1.6,0.6,2.8,1.7,3.5,3.2c-0.6,0.2-1.8,0.7-2.5,0.9C543.6,555.4,543.3,554,543,552.7z"/>
+	<path class="st1" d="M550.3,554c2-0.8,2.6,2.6,0.7,3C549.2,557.4,548.5,554.4,550.3,554z"/>
+	<path class="st1" d="M630.3,557.2c2.1,0.2,0.9,4.5-1,3.5C628.3,559.7,628.9,557.6,630.3,557.2z"/>
+	<path class="st1" d="M447.5,600.8c1.9-14.8,5.3-29.6,12.3-42.9c0,0.5,0,1.5,0,2c-0.1,0.4-0.2,1.1-0.3,1.5c-1,5.2-3.6,10.2-3.5,15.6
+		c-0.6,1.4-1.2,2.7-1.8,4.1c0.7,0.2,2.1,0.5,2.9,0.7c0.2,0.9,0.4,1.8,0.6,2.7c-1.1-0.5-2.1-1-3.2-1.5c-0.3,1.1-0.6,2.3-0.8,3.5
+		l-0.2,1.1c-1.1,4.7-2.1,9.5-1.3,14.4c-0.1,5.6-0.3,11.2-0.1,16.8c0,2.8,0.1,5.6,0.5,8.4c0.5,3.2,0.9,6.4,1,9.6
+		c0.2-0.3,0.7-1,0.9-1.3c0.1,3.9,0.7,7.7,1.5,11.5c0.7,3.1,1.6,6.1,2.6,9.2c1.1,3.3,2.7,6.5,3.4,9.9c0.9,4.7,3.3,9,5.8,13
+		c2.4,4,5.2,7.8,7.5,11.8c1,1.8,2.4,3.1,4,4.4c0.3-1.3,0.7-2.6,1-3.9c1.3,0.1,2.7,0.2,4,0.3c-0.8,0.7-1.6,1.4-2.4,2.1l-1.3-0.1
+		c0,0.9,0,2.6,0.1,3.5c0.4,0.5,1.2,1.3,1.6,1.8c0.6,1.2,1.1,2.4,1.7,3.5c1,1.3,2,2.4,3.1,3.6c1.6,1.6,3.2,3.1,4.8,4.6
+		c0.5,0.4,1.4,1.3,1.9,1.8c1.6,1.5,3.3,3,5,4.4c3.5,2.9,7.1,5.6,10.9,8.1c2.4,1.5,4.7,3.1,7.1,4.7c2.4,1.6,4.9,3.1,7.5,4.4
+		c1.4,0.7,2.8,1.4,4.3,2c0.6,0.3,1.9,0.8,2.5,1.1c5.8,2.5,11.6,4.8,17.6,6.6c2.6,1,5.2,2,8,2.7c8.4,1.9,16.8,3.9,25.5,3.4
+		c7-0.5,14,0.9,21,0.3c17.3-1.2,34.4-5,50.8-10.7c1.8-0.8,3.5-1.7,5.3-2.5c2.9-1,5.8-2.2,8.6-3.5l0.6-0.3c3.3-2.1,6.8-4,10.2-5.9
+		c3.4-1.9,6.5-4.3,9.6-6.7c6.4-4.4,12.3-9.5,17.4-15.4c0.2-0.2,0.6-0.7,0.8-0.9c2.5-3.1,5.1-6.1,7.5-9.3c1.4-1.9,2.9-3.9,4.1-6
+		c0.4-0.6,0.8-1.3,1.2-1.9c2.2-3.6,4.3-7.2,6.3-10.9c0.8-1.5,1.5-3.1,2.2-4.7c0.5-1.3,1-2.6,1.5-3.9c4.8-10.8,7.4-22.4,9.7-33.9
+		l0.1-0.5c0.9-3.9,0.8-7.9,1-11.9c0.5-3.5,0.9-7,1-10.5c0.1-4.2,0.2-8.4,0.1-12.6c-0.1-3.2-0.3-6.3-0.8-9.5
+		c-0.5-3.6-1.1-7.2-1.9-10.8c-0.8-3.5-1.6-7-2.5-10.5c0.2-0.9,0.5-2.8,0.7-3.7c4.3,7.5,5.7,16.3,7.6,24.6c3.4,14,2.2,28.4,2.4,42.7
+		c0,4-1.3,7.9-1.4,12c-3.6,31.2-17.5,61.6-40.3,83.3c-23,22.9-54.4,35.8-86.2,39.8c-2.3,0.7-4.6,1.6-7.1,1.5
+		c-13.6-0.1-27.3,0.2-40.9-0.2c-8.2-2.7-16.8-3.7-25-6.5c-25.9-8.5-50-23.5-67.3-44.8c-2.8-3.2-5-6.8-7.8-9.9c-1,0.1-2,0.1-3,0.1
+		c0-1.6,1.2-3.2,0.2-4.7c-2.6-4.4-5.3-8.9-7.5-13.5c-0.7-0.2-2-0.5-2.7-0.6c0.4-0.9,0.8-1.9,1.2-2.8c-5.3-11.7-8.5-24.2-10.2-36.9
+		c-0.3-3.6-1-7.1-1.9-10.6c-0.9,0.4-2.4,2.2-2.9,0.5c-1.1-2.2-3.8-4.2-3.1-6.9c2.4,0,3.7,3.1,5.9,4.1
+		C447.3,623.7,445,612,447.5,600.8z"/>
+	<path class="st1" d="M533.5,561.3c0.6,0,1.9-0.1,2.6-0.1c0.4,2.4-1.6,4-3,5.7c-0.4-0.2-1.2-0.7-1.6-0.9
+		C532.3,564.5,532.9,562.9,533.5,561.3z"/>
+	<path class="st1" d="M54.2,565c3.8-0.6,0,4.7-1,1.2C53.5,565.9,54,565.3,54.2,565z"/>
+	<path class="st1" d="M441.9,566c0.9-0.1,2.7-0.2,3.6-0.2c-0.7,1.1-1.3,3.9-3.2,3C442.2,568.1,442,566.7,441.9,566z"/>
+	<path class="st1" d="M523.3,571.5c-1.7-1.4,0.7-2.9,1.6-3.8c0.4,1.4,0.8,2.8,1.1,4.3C525.3,571.9,524,571.6,523.3,571.5z"/>
+	<path class="st1" d="M1620.2,570.1c4-0.6-0.2,4.4-1.1,1.1C1619.4,570.9,1619.9,570.4,1620.2,570.1z"/>
+	<path class="st1" d="M99.3,576.1c1-1.5,3.5,0.3,2.3,1.7C100.6,579.3,98.1,577.6,99.3,576.1z"/>
+	<path class="st1" d="M1329.4,586.2c1.8,0,3.4,0.9,2.7,3C1330.2,590,1327.6,587.8,1329.4,586.2z"/>
+	<path class="st1" d="M101.1,587.2c3.4-1.2,1.6,4.8-1.1,3.8C97.8,591,100,587.7,101.1,587.2z"/>
+	<path class="st1" d="M619.2,587.1c1.6-0.5,2.2,0.1,1.6,1.7C619.2,589.3,618.7,588.8,619.2,587.1z"/>
+	<path class="st1" d="M1616.3,587.8c1.3,0.6,2.7,1.3,4.1,2c-1.4,0.5-2.8,0.9-4.2,1.3C1616.2,590.3,1616.2,588.7,1616.3,587.8z"/>
+	<path class="st1" d="M444.2,591.3c1.3-1.4,3.6,0.8,2.1,2.1C445,595,442.6,592.7,444.2,591.3z"/>
+	<path class="st1" d="M1111.1,591.2c1.6-0.6,2.2,0,1.7,1.6C1111.2,593.4,1110.6,592.8,1111.1,591.2z"/>
+	<path class="st1" d="M118.2,593.3c1.5-1.2,2.9,1.5,1.5,2.5C118.2,597,116.8,594.2,118.2,593.3z"/>
+	<path class="st1" d="M1314.3,602.3c1.9-0.9,4.3,0.4,5.5,1.9C1319,608.4,1310.4,605.6,1314.3,602.3z"/>
+	<path class="st1" d="M777,610.3c-2.4-0.1-4.1-4.2-0.9-4.6C777.7,606.8,776.8,608.8,777,610.3z"/>
+	<path class="st1" d="M1676.7,611.4c-0.4-2,0.6-4.8,3-4.2C1681.1,609.5,1678.2,610.3,1676.7,611.4z"/>
+	<path class="st1" d="M644.2,608.2c1.5-1.2,2.9,1.5,1.6,2.5C644.4,611.9,643,609.2,644.2,608.2z"/>
+	<path class="st1" d="M69.1,610c2.2,0.4,1.7,2.5,1,4c-0.6-0.3-1.8-0.8-2.4-1.1C68.1,611.8,68.6,610.9,69.1,610z"/>
+	<path class="st1" d="M1680.8,610.2c2-0.3,4.2-1,6.3-0.4c1.6,0.6,0.3,2.2,0.1,3.2C1685,612.2,1682.9,611.2,1680.8,610.2z"/>
+	<path class="st1" d="M56.1,610.8c1.3,0.6,2.5,1.2,3.8,1.9c-0.7,1.4-0.8,3.7-2.9,3.5C55.2,614.9,56,612.6,56.1,610.8z"/>
+	<path class="st1" d="M562.9,615.7c1.4,1.4,2.6,2.9,3.9,4.4C563.8,623.3,562.1,618.1,562.9,615.7z"/>
+	<path class="st1" d="M841.5,616.7c13.1,0.9,26.3,0.4,39.5,0.5c30.5-0.2,61,0.5,91.5-0.6c0,2.9,0,5.7-0.1,8.6c-0.1,10,0.1,20-0.1,30
+		c0,2.2-0.1,4.4,0,6.6c0.1,10,0.1,20.1,0,30.1c-1,6.2-0.6,12.4-1.9,18.6c-0.9,2.9-1.9,5.8-3.2,8.6c-0.5,0.3-1.6,0.8-2.2,1
+		c1.3-6.3,0.8-12.7,0.9-19.1c0-13.3,0.1-26.7,0-40c0-8.7-0.3-17.4,0.7-26.1c-10.9-0.7-21.8-0.1-32.7-0.3c-29,0.1-58-0.2-86.9,0.2
+		c2,20.3,0.3,40.8,1,61.1c0.3,7.4-0.6,15,0.6,22.3c0.3,1.2,0.1,2.2-0.6,3.2c-2.6-3.5-3.9-7.8-4.9-12c-0.3-4.3-0.5-8.6-1.4-12.9
+		c-0.5-23.8,0-47.6-0.2-71.3c-0.9-0.1-1.7-0.3-2.6-0.4c0.6,0,1.9-0.1,2.6-0.2C841.5,622.1,841.5,619.4,841.5,616.7z"/>
+	<path class="st1" d="M1678.1,617.2c0.7,0,2.1-0.1,2.8-0.1c-0.4,2.1-0.8,4.1-1.3,6.2C1678.1,621.5,1677.7,619.3,1678.1,617.2z"/>
+	<path class="st1" d="M38.2,620.2c1.5-1.2,2.8,1.6,1.5,2.6C38.1,624,36.8,621.2,38.2,620.2z"/>
+	<path class="st1" d="M753.1,620.4c0.9-1.2,3.3,0.1,2.4,1.5C754.6,623.1,752.1,621.8,753.1,620.4z"/>
+	<path class="st1" d="M546.2,624.4c1.3-0.8,4,0.7,3.4,2.3C548.3,627.5,545.4,626,546.2,624.4z"/>
+	<path class="st1" d="M1637.2,629.3c1.4-1.2,2.6,1.4,1.3,2.2C1637.1,632.7,1635.9,630.1,1637.2,629.3z"/>
+	<path class="st1" d="M86.2,631.2c1.9-2,3.2,0.8,2.7,2.5C87.3,635,84.3,632.9,86.2,631.2z"/>
+	<path class="st1" d="M50.2,632.4c1.5-1.2,3,1.5,1.5,2.5C50.3,636.1,48.8,633.4,50.2,632.4z"/>
+	<path class="st1" d="M104.7,632.6c2.7-1.3,2.4,3.2,1.3,4.6C104.1,636.3,102.9,634.4,104.7,632.6z"/>
+	<path class="st1" d="M32.3,634.1c2.1,0.9,3.9,2.3,4.7,4.4c-2.3,1.2-4.7,2.4-7.1,3.6C30.4,639.3,31.2,636.6,32.3,634.1z"/>
+	<path class="st1" d="M61.6,634.6c1.3-2.5,2.6,0.4,3.2,1.7c1.3,2.3,2.1,6.1-1.3,6.8C63.2,640.3,61.1,637.4,61.6,634.6z"/>
+	<path class="st1" d="M592,637.8c2.9-0.3,6.5,0.7,8.3-2.2c1,0,4.4,0.4,2.5,1.9c-2.8,2.2-6.1,4-9.7,2.7
+		C592.7,639.6,592.2,638.4,592,637.8z"/>
+	<path class="st1" d="M540.2,641.1c0.7-2.2,2.4-6.2,5-3.4C543.6,638.9,541.9,640.1,540.2,641.1z"/>
+	<path class="st1" d="M87.1,644.2c-4.3,0.1-2.7-5.2,0-6.5C87.3,639.9,87.3,642.1,87.1,644.2z"/>
+	<path class="st1" d="M618.2,638c4-0.7-0.2,4.5-1.1,1.2C617.3,638.9,617.9,638.3,618.2,638z"/>
+	<path class="st1" d="M1321.1,641c3.1-2.2,3.1,5.3-0.1,4.3C1318.5,645.2,1319.6,641.8,1321.1,641z"/>
+	<path class="st1" d="M1520.6,642.6c1.5-0.1,3-0.2,4.5-0.4c1.4,0,2.9,0.1,4.4,0.2c2.1,2.5,2.4,5.8,3.3,8.9c0.9,3.3,2.1,6.6,3,9.9
+		c0.9,3.7,2.1,7.4,3.4,11c3.4,8.9,6,18.1,7.7,27.5c1.1,6.5,2.2,13.2,0.8,19.8c-0.7,1-1.3,2-2.1,2.9c-0.6,0.2-1.9,0.5-2.5,0.7
+		c-1.8-5.6-1.9-11.5-3.8-17c-3.4-12.8-7.6-25.3-11.4-38c-0.9-2.4-1.2-5.1-2.8-7.1c-9.6-0.6-19.3-0.1-29-0.3c-12,0.1-24-0.2-35.9,0.1
+		c-1.9-0.2-2.4,2-3,3.3c-3.3,9-7,17.9-10.2,26.9c-3.6,9.9-7.8,19.6-9.9,30c-0.3,0.7-0.8,2.2-1.1,2.9c-1.6-1.6-2.9-3.4-4-5.4
+		c-2.2-10.1,1.7-20,4.8-29.5c3.1-8.7,6.3-17.3,9.8-25.8c1.3-3.2,2.6-6.5,3.8-9.7c1.4-3.6,1.8-7.8,4.4-10.9c3.1-0.2,6.3,0,9.4,0
+		l1.3,0c10.5,0,21,0,31.5,0.1l1.5,0C1505.8,642.5,1513.2,642.5,1520.6,642.6z"/>
+	<path class="st1" d="M1166.1,642.9c8.9-1,18,0,26.9-0.3c16,0,32.1,0,48.1,0c1,3.2,2.1,6.4,3.1,9.6c0.2,0.5,0.5,1.6,0.7,2.1
+		c2.4,7.8,5,15.5,7.3,23.3c1.2,4.4,3.2,8.7,3.8,13.3c1.7,8.7,4.2,17.5,3.5,26.4c-0.4,1.2-0.9,2.3-1.4,3.5c-0.7,0.7-1.5,1.5-2.2,2.2
+		c-0.4-0.1-1.2-0.3-1.6-0.4c-1.6-2.8-1.1-6.3-1.8-9.3c-2.1-9.7-5.3-19.2-8.1-28.7c-2.7-7.5-4.4-15.2-7.3-22.7
+		c-0.5-1.8-2.8-1.1-4.1-1.4c-18,0-36,0-53.9,0c-3.1,0.2-6.6-0.6-9.5,0.7c-3.6,8.1-6.3,16.5-9.5,24.8c-3.8,10.9-9.1,21.4-11.3,32.9
+		c-0.6,1.5-0.3,4.2-2.6,4c-0.7-1-1.5-2-2.2-3c-1.5-4.8-1.3-9.8-1.6-14.7c0.6-1.4,1.2-2.8,1.7-4.2c0.2-0.6,0.6-1.7,0.7-2.3
+		c1.6-6.3,4.5-12.1,6.5-18.3c0.7-2.4,1.6-4.8,2.5-7.1c0.5-1.3,0.9-2.5,1.4-3.8c1.1-3,2.2-6,3.5-9
+		C1161.5,654.8,1162.3,648.1,1166.1,642.9z"/>
+	<path class="st1" d="M1653.2,646.7c-1.4-2.4,2.5-2.5,3.9-2.8C1657.5,646.3,1655,646.5,1653.2,646.7z"/>
+	<path class="st1" d="M628.3,645.1c0.9-1.4,3.8,0,2.5,1.5C629.9,647.9,627.1,646.7,628.3,645.1z"/>
+	<path class="st1" d="M1663.5,647.2c0.6-0.9,3.1-0.9,3,0.5C1665.8,648.7,1663.3,648.7,1663.5,647.2z"/>
+	<path class="st1" d="M61.4,653.3c1.9-2,4-3.8,5.8-6c2,3.7-1.6,7.3-2,11.1C62.3,659.4,59.8,655.9,61.4,653.3z"/>
+	<path class="st1" d="M533,647.8c2.1,0.7,3.8,2.1,4.3,4.3C534.6,652.3,532.2,650.8,533,647.8z"/>
+	<path class="st1" d="M574.1,649.8c2.2,0.2,2.9,2.1,3.1,4.1c-0.8,0-2.3,0-3.1,0C574.1,652.5,574.1,651.2,574.1,649.8z"/>
+	<path class="st1" d="M524.7,655.2c0.7-1.8,1.4-3.5,2.3-5.2C529.5,652,527.7,655.8,524.7,655.2z"/>
+	<path class="st1" d="M32.8,663.2c-2.8-2-1.5-6.9,1.1-8.5C36.6,657,33.7,660.6,32.8,663.2z"/>
+	<path class="st1" d="M56.4,659.2c1.3-1.5,3.8,0.7,2.2,2.1C57.3,662.7,55,660.6,56.4,659.2z"/>
+	<path class="st1" d="M559.2,659.3c2.2-2.5,3.9,3.8,1,3.4C559.7,661.6,559.2,660.5,559.2,659.3z"/>
+	<path class="st1" d="M582.9,663.2c0.4-2.9,2.4-5,5.5-4.3C587.4,661.3,585.9,663.8,582.9,663.2z"/>
+	<path class="st1" d="M601.2,659.4c0.8-1,3.2-1.2,3.5,0.4C604.5,661.7,600,661.6,601.2,659.4z"/>
+	<path class="st1" d="M528,664c-2,0-1.7-2.3-1.4-3.6c1.5,0.6,3,1.3,4.5,2C530.2,663,529.4,664.5,528,664z"/>
+	<path class="st1" d="M650.5,661.3c2.5-0.9,1.6,3.6-0.4,3.3C648.7,664.1,649.4,661.9,650.5,661.3z"/>
+	<path class="st1" d="M1692.8,664.8c1.1-2.3,3.7-3.1,5.7-4.2C1699.5,664.1,1695.5,664.9,1692.8,664.8z"/>
+	<path class="st1" d="M64.4,661.8c0.7,0.9,1.7,1.8,1.6,3.1c-1,1.1-3.3,1-3.2-0.8C63.2,663.5,64,662.3,64.4,661.8z"/>
+	<path class="st1" d="M604.2,667.2c0.9-1.8,1.7-3.5,2.8-5.1c0.5,0.2,1.6,0.7,2.1,1C608,665.1,607,667.7,604.2,667.2z"/>
+	<path class="st1" d="M1663.2,664.2c1.6-1.6,4.4,0.2,3.2,2.1C1664.8,668.6,1660.9,666.6,1663.2,664.2z"/>
+	<path class="st1" d="M1605.2,665.3c0.9-1.3,3.8-0.1,2.6,1.4C1606.9,668.1,1604,666.9,1605.2,665.3z"/>
+	<path class="st1" d="M1675,665.2c2.7,0.2,6.4-1.1,8.2,1.7C1680.3,667.7,1677.6,666.5,1675,665.2z"/>
+	<path class="st1" d="M1629.9,665.4c2.5,0.4,4.9,1.5,6.5,3.7c-2.2,0.1-4.3,0.1-6.4,0.1C1630,668.2,1629.9,666.4,1629.9,665.4z"/>
+	<path class="st1" d="M641.2,666.9c1.9,1.8,2.6,4.3,3.3,6.7C640.7,674.1,640.5,669.5,641.2,666.9z"/>
+	<path class="st1" d="M551,667.8c3.1-0.7,4.5,2.8,3.9,5.3l-1.1,0.3C552.8,671.6,551.9,669.7,551,667.8z"/>
+	<path class="st1" d="M167.4,669.4c1.8-1.2,2.2,1.5,1.8,2.7c-0.8,0-2.5,0-3.3,0.1C165.8,670.8,166.3,669.9,167.4,669.4z"/>
+	<path class="st1" d="M441.2,672.2c2.2-0.9,1,3.4,0.5,4.6C439,677.5,439.2,672.9,441.2,672.2z"/>
+	<path class="st1" d="M1345.4,672.4c1-1,4-0.1,2.4,1.5C1346.8,676.1,1343.2,674,1345.4,672.4z"/>
+	<path class="st1" d="M58.3,673.1c1.9-0.7,2.8,2.6,0.8,2.9C57.2,676.5,56.4,673.5,58.3,673.1z"/>
+	<path class="st1" d="M598.1,674.1c1.6-0.5,2.2,0.1,1.7,1.7C598.1,676.3,597.6,675.7,598.1,674.1z"/>
+	<path class="st1" d="M632.8,676c1.3-1.9,3.5-2.8,5.5-1.4C636.6,675.8,634.8,676.5,632.8,676z"/>
+	<path class="st1" d="M546.8,679.9c2.1-1.3,2.9-4,5.2-5c-0.8,2.5-1.2,6.1-4,7.1C546.8,682.9,545.7,680.5,546.8,679.9z"/>
+	<path class="st1" d="M1100.2,677.7c-0.5-2.8,2-2.8,3.8-1.7c-0.3,0.6-0.8,1.7-1.1,2.3C1102.2,678.1,1100.9,677.8,1100.2,677.7z"/>
+	<path class="st1" d="M1639.2,675.3c0.8-1.4,3.4-0.3,2.2,1.2C1640.7,677.9,1638.1,676.8,1639.2,675.3z"/>
+	<path class="st1" d="M1678.7,677.8c1.6-1.8,5.8-2,5.4,1.3C1682.3,678.7,1680.5,678.3,1678.7,677.8z"/>
+	<path class="st1" d="M560.5,681.3c-0.2-1.8,2.4-4.7,3.8-2.4C565.1,681.6,562.1,681.1,560.5,681.3z"/>
+	<path class="st1" d="M49.3,683.4c1-0.9,3.1-0.6,3.4,0.8C52.5,686.3,48.1,685.4,49.3,683.4z"/>
+	<path class="st1" d="M1353.3,684.3c1.5-1.2,2.5,1.5,1.2,2.3C1353,687.7,1352,685,1353.3,684.3z"/>
+	<path class="st1" d="M555.4,684.6c1.7,1.3,2.1,3.3,1.8,5.4c-1.1,0.3-2.2,0.6-3.3,0.9C554.3,688.8,554.8,686.7,555.4,684.6z"/>
+	<path class="st1" d="M177.8,688c0.3-2.4,3.2-3.4,4.4-1C181.3,688.7,179.3,687.9,177.8,688z"/>
+	<path class="st1" d="M569.3,687.4c1.3-1.6,3.8,0.7,1.9,1.9C569.9,690.9,567.5,688.7,569.3,687.4z"/>
+	<path class="st1" d="M537.1,688c1.4,0,2.8,0,4.2,0.1c-1,2.1-3.1,2.4-5.2,2.1C536.3,689.6,536.8,688.5,537.1,688z"/>
+	<path class="st1" d="M55,697.4c-0.2-2.8-1.5-8.1,3.1-7.6C57.7,692.5,58.1,696.4,55,697.4z"/>
+	<path class="st1" d="M561.3,690.2c1.4-1,2.7,1.4,1.5,2.4C561.4,693.5,560.2,691.1,561.3,690.2z"/>
+	<path class="st1" d="M549.2,694.8c1.6-0.7,3.4-1.1,5.2-1.1C554.3,696.6,550.5,697.1,549.2,694.8z"/>
+	<path class="st1" d="M109.1,696.2c2.4-0.3,5-0.2,7.4,0.4c1.4,1.1,1.1,3,1.5,4.5c-3.1-1.1-6.3-1.8-9.4-2.8
+		C107.8,697.4,108,696.7,109.1,696.2z"/>
+	<path class="st1" d="M1676.5,696.8c1.1,3.2,1,6.7,2.1,10c-0.9,0.5-1.7,1.1-2.6,1.6c0.3,2.5,3.3,4.5,2.1,7.1c-1.8-2-3.7-4-4.6-6.6
+		c0.7-1.3,1.6-2.6,2.3-3.9C1675.5,702.2,1674.4,699.2,1676.5,696.8z"/>
+	<path class="st1" d="M90.5,704.7c1.6-1.7,3.3-3.3,4.6-5.2c1.1,1.1,2.1,2.2,3.2,3.3c-1.5,1.5-2.9,3.1-4.4,4.8
+		C92.9,706.6,89.4,706.6,90.5,704.7z"/>
+	<path class="st1" d="M73.3,704.3c1.5-0.6,3.5,0,3.8,1.7C76.6,709.4,69.6,705.9,73.3,704.3z"/>
+	<path class="st1" d="M1191.9,707c-0.2-1.7,0.8-4.5,3-2.8C1196.5,706.4,1193.9,707.5,1191.9,707z"/>
+	<path class="st1" d="M53.3,705.3c0.8-1,3.1-1,3.4,0.5C56.5,707.9,52.1,707.5,53.3,705.3z"/>
+	<path class="st1" d="M1343.8,711.5c0.6-2.2-0.1-7,3.3-6.6C1348,707.7,1345.8,710.1,1343.8,711.5z"/>
+	<path class="st1" d="M456,706.7c1.2,1.5,2.8,3.2,2,5.4C454.5,713.2,455.8,708.6,456,706.7z"/>
+	<path class="st1" d="M1680.4,707.3c2-1.1,2.9,3.2,0.8,3.5C1679.8,710.5,1679.5,708.3,1680.4,707.3z"/>
+	<path class="st1" d="M218.9,712.8c-3-0.1-1-4.1,0.1-5.4C220.2,708.9,220.8,711.4,218.9,712.8z"/>
+	<path class="st1" d="M98.3,709.2c1.3-1.6,3.8-0.3,3.1,1.8C100.5,713,97,711,98.3,709.2z"/>
+	<path class="st1" d="M1335.2,709.4c2-0.5,0.8,6.2-1.4,3.9C1333,712,1333.7,709.7,1335.2,709.4z"/>
+	<path class="st1" d="M1189.2,711.6c1.7-0.3,2.9,3.4,1.1,4C1188.8,715.1,1188.2,712.8,1189.2,711.6z"/>
+	<path class="st1" d="M1329.2,712.3c1.8,0.2,1.4,3.4-0.2,3.5C1327.2,715.6,1327.5,712.5,1329.2,712.3z"/>
+	<path class="st1" d="M1628.9,716c0.7-1.2,1.3-2.7,3.1-2.1c0.5,1.1,0.9,2.2,1.3,3.4C1631.7,716.9,1630.3,716.5,1628.9,716z"/>
+	<path class="st1" d="M73.1,715.2c3-1.6,3,4.3,0,2.7C71.2,718.3,72.2,715.6,73.1,715.2z"/>
+	<path class="st1" d="M1652.1,717.2c2.5,0.5,5.4,0.3,7.3,2.3c-1.9,0-3.8,0.4-5.6,1.1C1653.2,719.5,1652.7,718.3,1652.1,717.2z"/>
+	<path class="st1" d="M61.2,721.2c1.8-0.9,3.9-1.2,5.6,0.1c0.6,2.7-3.4,2.1-5.1,2.3C61.5,723,61.3,721.8,61.2,721.2z"/>
+	<path class="st1" d="M1375.2,720.3c1.4-1.2,3.5,1.1,2.4,2.5C1376.2,724,1374,721.6,1375.2,720.3z"/>
+	<path class="st1" d="M459.2,721.2c1.6-0.5,2.2,0,1.7,1.6C459.2,723.4,458.7,722.8,459.2,721.2z"/>
+	<path class="st1" d="M1678.3,721.2c1.5-1.3,2.9,1.5,1.5,2.5C1678.2,724.9,1676.9,722.2,1678.3,721.2z"/>
+	<path class="st1" d="M86.2,722.2c2.8-0.9,4.6,4.5,1.5,5.6C84.4,730,84.1,723.2,86.2,722.2z"/>
+	<path class="st1" d="M208.1,726.6c1.8,0.3,4.6-0.7,5.4,1.4c-1.1,2.9-3.7,4.9-5.6,7.3l-1.1,0.1C205.7,732.6,208.4,729.7,208.1,726.6
+		z"/>
+	<path class="st1" d="M218.6,727.2c1.5,0.2,2.9,1.1,3.2,2.7c-1.1,1.2-2.6,0.8-3.9,0.3C218.1,729.4,218.4,727.9,218.6,727.2z"/>
+	<path class="st1" d="M939.8,733.7c0.3-2,0.5-4,0.8-6c0,5,0,9.9,0.2,14.9c5.7,0.1,11.5-0.4,17.2-0.8c6.3,1.1,12.6-0.4,19-0.3
+		c12.3-0.2,24.5-0.2,36.8-0.1c13.1,0.9,26.2,1.5,39.3,1.8l0.7,0c-0.1-3.1-0.1-6.1,0.2-9.2c1.8,1,4.4,1.7,4.7,4
+		c0.6,5.6,0.2,11.3,0.2,17c0.2,2.3-0.8,4.9-3.2,5.7c-3.3,1.6-6.8,0.2-10.1-0.5c-0.3,1.8,0.1,4.8-2.8,3.9c0-1.4,0.3-2.7,0.5-4.1
+		c-7.3-0.3-14.8,0.5-22.1-0.6c-9.4-1.5-18.9-0.6-28.3-0.9c-8-0.2-16,0.6-24,1.3c-9.7,0.1-19.4,0.2-29.1,0c-3,0-4.7-3.2-4.6-5.9
+		c0-5.1-0.3-10.3,0.2-15.4C935.7,736.1,938.1,735,939.8,733.7z"/>
+	<path class="st1" d="M30.1,731.1c2.1-2.8,6.3-3.3,9.2-1.5c0.6,0.9,0.5,1.6-0.6,2C36,732.3,32.5,733.5,30.1,731.1z"/>
+	<path class="st1" d="M1687.4,730.3c2-1.2,2.9,3.2,0.7,3.4C1686.7,733.4,1686.4,731.2,1687.4,730.3z"/>
+	<path class="st1" d="M94.2,738.1c0.2-2.3,2.3-3.5,4.2-4.3c0,3,0.1,5.9,0.2,8.9c7.9-0.2,15.8-0.1,23.7-0.4
+		c10.6-1.2,21.2-0.3,31.8-0.7c10.6,0.7,21.2,1,31.9,1.6h0.8c0-3.1,0.1-6.2,0.3-9.2c2.1,0.9,4.9,2.1,4.8,4.9c0.2,6,0.4,12.1-0.1,18.1
+		c-0.2,3-3.4,3.7-5.6,4.8c0.6,1.1,2.3,2.3,0.9,3.6c-1.8,0-3.2-1-4.5-2.2c0.7-0.6,1.3-1.2,2-1.8c-6-1.9-12.4-1.2-18.6-1.3
+		c-3.3,0-6.7-1-9.8,0.5c-5-2.9-10.8-1.6-16.3-1.8c-5.7-0.2-11.3,0.6-17,1.3c-9.4,0.5-18.9-0.4-28.3,0.6
+		C93.5,753.1,93.1,745.5,94.2,738.1z"/>
+	<path class="st1" d="M320.3,734.1c2,2.1,0.2,5.8,2,8.2c0.1,0.2,0.3,0.7,0.4,1c3-0.5,5.9-0.7,8.9-0.8c11.4,1.2,22.9-1.3,34.3-0.8
+		c10.3-0.1,20.6-0.1,31-0.1c8.8-0.5,17.6,2.2,26.4,0.8c2.9,0.1,5.9,0.5,8.8,0.6c0.8-3.1,0.4-6.3,0.5-9.4c2.1,0.7,4.7,1.8,5.1,4.3
+		c0.6,5,0.2,10,0.3,14.9c-0.1,2.6,0.1,6-2.4,7.7c-3.7,2.2-7.8-0.4-11.7-0.5c-6.2-0.4-12.5,0.3-18.7-0.6c-10.7-1.5-21.5-0.5-32.2-0.9
+		c-9-0.3-18,0.7-26.9,1.6c-2.2,2.6-5.2,0.9-7.7-0.4c0.1,1.4,1.1,3.1-0.6,4c-1.1,1.5-2.3,0.2-3.3-0.7c0.7-1,1.4-2,2.1-3.1
+		c-4.1-0.5-8.4-0.1-12,2.2c-5.3-0.5-8.3-5-11.6-8.7c-0.9-0.9-1-2.1-0.6-3.2c1.2,1.4,2.5,2.8,4.1,3.6c0.4-5-0.1-10.1,0.3-15.2
+		C317,736.8,318.8,735.3,320.3,734.1z"/>
+	<path class="st1" d="M756,737.1c0.4-1.9,2.5-2.3,4-3.1c0.2,3,0.3,6,0.3,9l1,0.1c12.5,0.4,25.1-1.3,37.6-1.5
+		c12.2-0.1,24.5,0.1,36.7-0.2c1.3,0.1,2.6,0.3,3.9,0.4c11.2,1.4,22.6,1.3,33.9,1.8c0.1-3.3,0.2-6.5,0.3-9.8c1.8,1,4.2,1.8,4.5,4.1
+		c0.9,4.3,0.3,8.8,0.5,13.1c-0.1,3.1,0.5,7.1-2.3,9.3c-3.2,2.4-7.1,0.5-10.6,0.1c-9.3-1.1-18.8,0.4-28.1-1
+		c-7.8-1.2-15.8-0.6-23.7-0.8c-8,0-16.1-0.3-24,0.9c-7.9,1.2-16-0.5-23.9,1.3c-3.1,0.8-7,1-9.4-1.5c-1.9-3.1-1.2-6.9-1.3-10.3
+		C755.5,745.1,754.8,741,756,737.1z"/>
+	<path class="st1" d="M1069.7,737.9c0.3-2.2,2.4-3,4.1-3.9c0.3,2.2,0.7,4.4,1.4,6.5c0.2,0.9,0.5,1.8,0.9,2.6c1.6,0.4,3.3,0,5-0.1
+		c6.5-0.9,13.1-0.3,19.5-1.6c2.1,0,4.2-0.1,6.3-0.2c3.6,0,7.2,0,10.9-0.1c2,0,4.1,0,6.1,0.1c3.9,0,7.8,0,11.8,0
+		c1.3,0,2.6-0.1,3.8-0.2c0.8-0.2,1.6-0.3,2.5-0.5c2.2,0.5,4.5,1,6.8,1.3c5.3,0.6,10.6,0.9,15.8,1.2c2,0,4,0,6-0.1l1.1-0.1
+		c0-3,0.1-6,0.3-9c1.4,0.9,3.5,1.3,3.9,3.1c1.6,4.5,0.7,9.3,0.8,13.9c-0.1,3.2,0.5,7.1-2.3,9.4c-2.9,2.2-6.3,0.5-9.4,0
+		c-4.1-0.5-8.5-0.8-12.3,1c-8.8-3.2-18.4-2.5-27.7-2.6c-8.8,0.2-17.6-0.5-26.3,0.9c-6.5,1.1-13.2-0.4-19.6,1.6c-3,1-6.7-0.1-8.4-2.9
+		C1067.8,751.9,1068.8,744.7,1069.7,737.9z"/>
+	<path class="st1" d="M1228.2,738c0.4-2.3,2.6-3.4,4.6-4.1c0.3,3.1-0.7,6.6,0.8,9.5c4.8-0.3,9.6-0.4,14.3-1.4
+		c2.1-0.6,4.1,0.5,6.2,0.3c1.1-0.6,2.2-1.2,3.2-1.9l0.2,1.4c3.7-0.1,7.3-0.2,11-0.2c0.5,0,1.5,0,2,0c7.7-0.1,15.4,0.1,23-0.7
+		c7.2,1.8,14.8,0.4,22.2,1.2c0.3-0.3,1-0.9,1.3-1.2c1.9,1.1,4,1.8,6.3,1.7c2.8,0,5.7-0.1,8.6-0.1c0,0.5-0.1,1.5-0.1,2
+		c4.3-0.3,8.7,0.1,12.9-0.7c2-2.4,0.6-6.2,1.2-9.1c1.7-0.1,3.3-0.3,5-0.5c-1,2.7-0.8,5.7,1.7,7.6c-0.6,0.8-1.3,1.6-1.9,2.4
+		c-0.1,4.1,0.2,8.2-0.2,12.2c-0.2,1.9-1.2,4.2-3.4,4.4c-6.9,0.7-14.2,2-20.8-0.8c-1.2,2-4.4,3.7-4.7,0.2c-5.9,0.2-11.7-0.7-17.5-1.4
+		c-4.4-0.9-7.4,3.5-11.8,3.3c0.9-1,1.9-2,2.9-3c-11.4-0.9-22.8-0.2-34.1,1.2c-7.6,0.2-15.4-0.9-22.9,0.8c-2.3,0.3-4.8,1.1-6.9-0.1
+		c-1.7-1.2-3.1-2.7-5.1-3.2c0.7-0.8,2-1.3,1.8-2.7C1228.2,749.3,1227.4,743.7,1228.2,738z"/>
+	<path class="st1" d="M1358.1,738.9c-0.1-3,2.9-4.1,5.2-5c0.3,1,0.6,2,0.8,3c-0.2,2.3-0.2,4.5,0.1,6.8c8.3-1.2,16.8-0.9,25-2.2
+		c2-0.1,4-0.2,6-0.4c0.4,0,1.2-0.1,1.7-0.2c0.5,0,1.5,0.1,2,0.2c8.9,0.4,17.7,0,26.6,0.2c11.3,0.8,22.6,1.9,34,1.3
+		c0.1-0.3,0.2-0.9,0.3-1.2c0.7-2.4,1-4.9,1.2-7.4c1.7,1,3.9,1.7,4.2,3.9c0.8,5,0.3,10,0.4,15c-0.1,2.7-0.1,6.3-3,7.7
+		c-2.7,1.6-5.9,0.6-8.7,0c-6.6-1.3-13.3,0-19.9-1.1c-7-1.2-14-0.9-21.1-0.9c-8.7,0.1-17.4-0.4-26.1,1c-6,1-12.1-0.4-18,1.2
+		c-2.6,0.5-3.6,3.3-6,4.2c0.4-1.3,1-2.4,1.6-3.6c-3.4-0.6-5.9-3.1-6.3-6.5C1357.7,749.6,1357.9,744.2,1358.1,738.9z"/>
+	<path class="st1" d="M1517.3,737.2c0.3-1.9,2.2-2.5,3.6-3.3c0.2,2.7,0.3,5.5,0.4,8.2l1.1,0.2c3.5,0.5,7.1,0.4,10.7,0.3
+		c2.5-0.1,4.9-0.2,7.4-0.5c4.3-0.7,8.7-0.7,13.1-0.7c-0.1-0.5-0.3-1.6-0.4-2.1c1-0.3,2.1-0.7,3.1-1.1c0,1.1,0,2.2,0.1,3.3
+		c2.3,0,4.6,0,6.9,0c1.6,0,3.2-0.1,4.9-0.1c0.6,0,1.8,0,2.4,0c0.5,0,1.6,0,2.1-0.1c3.7-0.1,7.4,0,11.1,0c1.5,0,3,0,4.6,0
+		c5.9,0,11.8,0.2,17.7,0.1c6.4-0.3,12.8,1.4,19.3,1c2.5,0,4.9,0.2,7.4,0.3c0-1.9,0.1-3.8,0.1-5.7c0.1-1.2,0.3-2.5,0.5-3.7
+		c2.1,1.3,5,2.4,5.2,5.3c0.5,5.7,0.2,11.5,0.2,17.2c0.1,3.1-3.1,4.7-5.2,6.4c-9.3-4.1-19.8-1.1-29.6-2.5c-10.3-1.5-20.6-1.1-31-1.1
+		c-6.3,0.1-12.7,0.1-19,0.9c-8.6,1.2-17.4-0.5-25.9,1.2c-3.1,0.5-6.6,1.4-9.3-0.7c-2.2-2.1-1.8-5.4-1.9-8.2
+		C1517,747.1,1516.5,742.1,1517.3,737.2z"/>
+	<path class="st1" d="M81.8,741.4c-3.3-1.7-2.9-7.3,1.4-7.2c1,1.8,2.5,3.5,2.8,5.6C85.6,741.7,83.2,741.2,81.8,741.4z"/>
+	<path class="st1" d="M73.3,737.4c1.3-1.4,4,0.6,2.3,2C74.4,740.7,71.8,738.8,73.3,737.4z"/>
+	<path class="st1" d="M193.2,738.2c3.2-1.9,4.9,2.5,3.7,5C194.6,742.6,193,740.6,193.2,738.2z"/>
+	<path class="st1" d="M1666.2,743c2.1-0.9,2.5,2.5,0.5,2.8C1664.7,746.5,1664.3,743.3,1666.2,743z"/>
+	<path class="st1" d="M1639.9,748.1c-0.4-2.1,1.7-2.4,3.1-3.1c0.5,0.9,0.8,1.8,0.8,2.8C1642.5,748.3,1641.2,748.4,1639.9,748.1z"/>
+	<path class="st1" d="M1683.4,745.4c1.2-1.3,3.7-0.5,4.9,0.5C1687.7,748.2,1681.3,748.1,1683.4,745.4z"/>
+	<path class="st1" d="M1647.9,748.2c1.4-0.8,2.8-1.6,4.3-2.4c0.1,1.3,1.2,3.1-0.3,4.1C1650.5,751.5,1648.5,749.6,1647.9,748.2z"/>
+	<path class="st1" d="M1694.9,749.2c1-0.8,2-1.6,3.1-2.4c0.3,1.7,0.7,3.5,1,5.2C1696.8,752.3,1695.5,751.1,1694.9,749.2z"/>
+	<path class="st1" d="M54.2,748.3c1.6-0.2,2.3,1.5,2.2,2.8C54.8,754.2,50.7,749.2,54.2,748.3z"/>
+	<path class="st1" d="M59.8,753c2.1-0.6,4.2-0.8,6.3-1c0.1,1.3-0.1,3.9-2.1,3.4C62.4,755.4,58.5,755.8,59.8,753z"/>
+	<path class="st1" d="M84.7,755.3c-2.4-2.1,1.8-3.1,3.4-3.2C87.7,753.5,86.5,756.8,84.7,755.3z"/>
+	<path class="st1" d="M1661.5,757.7c2.6-1.7,2.8,2.8,2.3,4.4C1662.3,761.2,1661.2,759.6,1661.5,757.7z"/>
+	<path class="st1" d="M1692.2,757.1c2.7-1,1.4,2.6,1.8,4.1C1691.5,761.4,1691.4,758.8,1692.2,757.1z"/>
+	<path class="st1" d="M82.8,760.7c3.6-1.6,4.3,3.1,4.7,5.6c-1.4-0.4-3.8,0.5-4.2-1.5C83,763.4,82.8,762.1,82.8,760.7z"/>
+	<path class="st1" d="M231.5,762.5c2.1-1.7,3.5,0.8,3.7,2.6C233.4,765,230.3,765.1,231.5,762.5z"/>
+	<path class="st1" d="M1174.2,762.2c2.9-1,2.3,3.7-0.1,3.8C1172.8,765,1173.6,763.4,1174.2,762.2z"/>
+	<path class="st1" d="M133.9,769.5c2-4.1,6.4-6.5,10.9-6.3c-2,1.2-3.8,2.6-5.1,4.5C137.8,768.3,135.8,768.9,133.9,769.5z"/>
+	<path class="st1" d="M192.7,764.5c1-0.8,2.2-1.5,3.4-2c0.8,1.5,0.5,2.9-0.9,3.9C194.5,766,193.3,765,192.7,764.5z"/>
+	<path class="st1" d="M72.2,764.2c1.9-1.7,4.6,1.7,2.2,3.1C72.4,769.6,70,765.4,72.2,764.2z"/>
+	<path class="st1" d="M1340.6,767.3c0.3-2.2,2.3-3.5,4.5-3.4C1346.4,766.4,1342.1,766.9,1340.6,767.3z"/>
+	<path class="st1" d="M1675.8,764c3,0.4,6.5,1.9,6.6,5.5C1680,767.9,1676.2,767.2,1675.8,764z"/>
+	<path class="st1" d="M1360.8,765.8c3.6,0.5,5.3,4.2,3.9,7.4C1363,770.9,1361.6,768.4,1360.8,765.8z"/>
+	<path class="st1" d="M237,766.9c4-1.6,2.8,9.5-0.3,5.5C235.7,770.7,236.2,768.5,237,766.9z"/>
+	<path class="st1" d="M1593.8,767.1c2.6-0.2,5.2,0.3,7.7,0.9c-0.4,1.3-0.4,3.4-2.4,3C1597,770.3,1595.4,768.6,1593.8,767.1z"/>
+	<path class="st1" d="M211.3,770.1c1.6-2.4,3.6-0.1,4,1.9C213.5,772.2,211.1,772.6,211.3,770.1z"/>
+	<path class="st1" d="M1344.9,768.8c0.7,0.1,2.2,0.4,2.9,0.5c1,2.3-2,3.6-3.8,3.8C1343.4,771.6,1344.4,770.2,1344.9,768.8z"/>
+	<path class="st1" d="M1589.3,769.3c0.4,0,1.2-0.1,1.7-0.2c0.5,2.6-3,3-4.8,3.7C1584.5,771.2,1587.9,769.7,1589.3,769.3z"/>
+	<path class="st1" d="M1621.8,770.9c1.2-2.4,4.8-2.8,5.7,0.1C1625.5,771.1,1623.6,771,1621.8,770.9z"/>
+	<path class="st1" d="M1684.8,769.9c3.5-2.3,2.1,3,3.3,4.8c1.7,2.7,1.6,5.8,0.8,8.7c-2.1-1.5-1.6-4.3-2.2-6.5
+		C1686.6,774.5,1684.8,772.4,1684.8,769.9z"/>
+	<path class="st1" d="M1694.6,771.3c0.2-2,2.7-2.6,4.4-2c0,2.2-1.2,4.2-1.5,6.4c0.1,1.5,0.6,3,1,4.6c1.2-1.9,2.3-3.8,3.3-5.8
+		c0.3,0.1,0.9,0.2,1.1,0.3c0,3.1-0.1,6.2-0.2,9.3c-2.5-1.1-5.1-2-7.4-3.3C1694.8,777.6,1694.5,774.4,1694.6,771.3z"/>
+	<path class="st1" d="M1256.5,770.3c2,1.5-0.1,4.1-0.7,5.8c-0.8-0.6-1.7-1.3-2.5-1.9C1254.4,772.9,1255.4,771.5,1256.5,770.3z"/>
+	<path class="st1" d="M135.2,770.8c1,0.7,2.8,0.7,3.1,2.2c0.1,1.9-1.8,1.8-3.1,2.1C135.2,773.6,135.2,772.2,135.2,770.8z"/>
+	<path class="st1" d="M354.9,774.2c-0.5-2.2,1.5-2.9,3.1-3.2C358,772.8,357.3,775.2,354.9,774.2z"/>
+	<path class="st1" d="M47.2,777.2c0.8-1.9,2.2-6.6,4.8-4.1c0.6,4.3-4.6,8.9-8.9,7.9c0.1-0.6,0.4-1.8,0.5-2.4
+		C44.8,778.1,46,777.7,47.2,777.2z"/>
+	<path class="st1" d="M252.8,779.1c-3.2-0.2-4-4.7-1.8-6.5C253.5,773.8,253,776.7,252.8,779.1z"/>
+	<path class="st1" d="M193.2,774.3c2.9-1.3,2.4,4.7-0.2,4C190.9,778,192,775,193.2,774.3z"/>
+	<path class="st1" d="M1355.4,778.5c-3.4,0.4-4.4-4-1.2-5.2C1355.5,774.7,1355.1,776.7,1355.4,778.5z"/>
+	<path class="st1" d="M60,774.9c3.2-1.4,3,4.2,0,3.5C58.3,777.8,59.5,775.9,60,774.9z"/>
+	<path class="st1" d="M1064.5,775.1c0.9-1.2,3.4,0.1,2.3,1.5C1065.9,777.8,1063.5,776.5,1064.5,775.1z"/>
+	<path class="st1" d="M1153.1,774.8c2.8,0,4.7,2.1,6.3,4.2C1156.7,782.9,1153.9,777.3,1153.1,774.8z"/>
+	<path class="st1" d="M204.2,776.2c3.2-0.5,3.5,3.5,3.9,5.8c-1.6,0.4-3.5,1.4-5,0C202.4,780.1,202,777.1,204.2,776.2z"/>
+	<path class="st1" d="M1206,776c1.3-1.1,4.1-0.1,3,1.9C1207.4,779.7,1203.8,778.3,1206,776z"/>
+	<path class="st1" d="M1649.1,776.9c2.7,0.2,3,3.3,3.1,5.4C1648.9,783.1,1649.6,778.8,1649.1,776.9z"/>
+	<path class="st1" d="M242,777.9c1.1,0.5,2.7,0.7,2.9,2.1c-0.3,1.1-0.7,2.2-1.1,3.2C242.1,782,241.6,780,242,777.9z"/>
+	<path class="st1" d="M351.1,778.1c1.6-0.6,2.2-0.1,1.7,1.6C351.1,780.3,350.6,779.8,351.1,778.1z"/>
+	<path class="st1" d="M93.8,781.8c0.3-2.8,2.8-3.5,5.2-2.9c-0.7,1.3-1.3,2.7-2,4C96,782.5,94.9,782.2,93.8,781.8z"/>
+	<path class="st1" d="M1310.3,779c0.8,0.3,1.7,0.7,2.6,1.1c-0.7,1.8-0.7,6.1-3.6,4.8C1309.4,782.8,1309.8,780.9,1310.3,779z"/>
+	<path class="st1" d="M340.3,780.1c2-0.8,2.8,2.5,0.7,2.9C339.2,783.5,338.5,780.5,340.3,780.1z"/>
+	<path class="st1" d="M231.2,781.2c4.6-2.4,3.2,7.3-0.2,6.8C230.4,785.8,230.6,783.4,231.2,781.2z"/>
+	<path class="st1" d="M69.1,782.3c1.8-0.6,2.8,2.5,0.8,2.9C68,785.8,67.1,782.7,69.1,782.3z"/>
+	<path class="st1" d="M220.2,782.3c0.9-1.2,3.3,0.2,2.3,1.6C221.5,785.1,219.1,783.7,220.2,782.3z"/>
+	<path class="st1" d="M128,786c2.8-0.8,5.4-2.1,8-3.4c2.7-0.6,3.7,2.1,4.6,4.1c3,1.5,6.3,0.5,9.4,0.1c2,1,3.6,2.6,5.2,4.2
+		c-5.6-0.1-11.1-1.3-16.7,0c-0.2-1.3-0.5-2.6-0.8-3.9c-3.5-1-6.4,1.6-9.7,2.2C126.7,788.6,125.9,786.2,128,786z"/>
+	<path class="st1" d="M30,786.6c3.9-0.1,7.5-2.3,11.4-2c1.4,1.1,0.7,2.8,0.3,4.3c-2-0.2-3.9-0.7-5.8-1.1c-2,0.8-4.1,1.7-6.1,2.5
+		C29.9,789,30,787.8,30,786.6z"/>
+	<path class="st1" d="M199.2,784.7c2.2,1.5,1.3,4.1,0.5,6.1C195.9,791.2,197.6,786.3,199.2,784.7z"/>
+	<path class="st1" d="M1643.2,785.8c1.5-0.3,3.1-1.2,4.7-0.6c0.1,1.3-0.4,2.7-1.9,2.9C1644.9,787.5,1644,786.8,1643.2,785.8z"/>
+	<path class="st1" d="M113.2,786.2c1.2-1.3,2.8,0.4,4,0.9C118.8,791.1,111.4,789.2,113.2,786.2z"/>
+	<path class="st1" d="M1162.2,791.2c-1.7-2.1-1.4-5.4,1.8-5.3C1164,787.9,1163.8,790,1162.2,791.2z"/>
+	<path class="st1" d="M1374,789.6c2-1.2,3.5-3.9,6-3.8c0.5,2-1.1,3.3-2.3,4.6c-0.6,1.1-0.9,4-2.7,2.6
+		C1374.4,792,1374.3,790.8,1374,789.6z"/>
+	<path class="st1" d="M75.4,795.5c0.2-3-0.1-6.4,2.2-8.7c3.2,2.2,1.9,5.9,1.1,9C77.6,795.7,76.5,795.6,75.4,795.5z"/>
+	<path class="st1" d="M1139.9,786.9c0.5,0,1.5,0,2,0c0.4,2,1.6,4.3,0.1,6.2C1139.1,792.7,1138.4,789.1,1139.9,786.9z"/>
+	<path class="st1" d="M1234,786.9c1.8-0.3,4.4-1.1,5.5,1.1C1239.7,791.8,1232.1,790.5,1234,786.9z"/>
+	<path class="st1" d="M1603.1,787.5c1.1-0.3,2.6-0.1,3.4,0.8C1606.5,790.4,1600.8,789.1,1603.1,787.5z"/>
+	<path class="st1" d="M1695.9,787.2c1.5,0.4,6-1,5.2,1.8C1698.9,790.2,1696.9,789,1695.9,787.2z"/>
+	<path class="st1" d="M280.2,788c1.7-0.3,3.8,2.2,1.7,3.1C279.5,792.1,279.7,789.6,280.2,788z"/>
+	<path class="st1" d="M1591.1,788.2c1.9,2.2,4.2,4,6.4,5.9c-0.6,0.3-1.8,0.9-2.5,1.2c-2-1.5-3.9-3.2-5.9-4.6
+		C1589.8,789.8,1590.4,789,1591.1,788.2z"/>
+	<path class="st1" d="M1677.1,788.2c0.6,0,1.9,0,2.6,0c0.2,1.1,0.5,2.3,0.8,3.5c1.5,0.5,3.3,0.7,4.1,2.4
+		C1680.2,795.4,1678.3,791.5,1677.1,788.2z"/>
+	<path class="st1" d="M309.4,789.3c2.3-2.1,3.4,6-0.2,4.7C308.7,792.5,308.2,790.6,309.4,789.3z"/>
+	<path class="st1" d="M49,790.1c1.3-0.1,2.6-0.1,3.9-0.2c0,0.8,0,2.3-0.1,3.1c-1.2,0-2.4-0.1-3.5-0.3
+		C49.2,792.1,49.1,790.8,49,790.1z"/>
+	<path class="st1" d="M1216,791.4c1.9-2.4,4.6-0.9,6.3,0.9c2-0.3,4-0.4,6.1-0.2c-0.9,3.3-5.2,3.8-7.7,2.1
+		C1219.1,793.3,1217.6,792.3,1216,791.4z"/>
+	<path class="st1" d="M1349.9,791.3c1.7-0.5,3.5-1,5.2-1.5c-0.2,1.4-0.1,3-1.3,4.1C1352,794.7,1350.9,792.5,1349.9,791.3z"/>
+	<path class="st1" d="M1650.6,789.9c0.8,0,2.5,0.1,3.3,0.2c0.8,1.4,1.3,2.9,1.9,4.4c2.6,1.1,7.6,0.4,8,4.2c-2.5-0.2-5.1-0.2-7.5-1
+		C1654.2,795.2,1652.1,792.7,1650.6,789.9z"/>
+	<path class="st1" d="M1660.1,789.9c1.8-0.2,3.4,0,4,1.9c-1.3,0.4-2.6,0.8-3.9,1.2C1660.2,792.3,1660.1,790.7,1660.1,789.9z"/>
+	<path class="st1" d="M61.3,792c1.8-0.7,2.4,2.4,0.6,2.7C60.2,795.3,59.6,792.4,61.3,792z"/>
+	<path class="st1" d="M131.3,793.2c2.2-0.6,4.5-0.8,6.7-0.9c-0.4,1.2-0.1,3.8-2,3.5C134.3,795.5,130.6,795.7,131.3,793.2z"/>
+	<path class="st1" d="M1153,792.1c1.5-0.1,3.3-0.1,3.5,1.9C1155.2,796.5,1151.7,794.6,1153,792.1z"/>
+	<path class="st1" d="M1696.9,795.7c1.9-1.4,3.8-2.7,5.8-4l0,1c-0.5,0.8-1,1.6-1.5,2.5c0.1,1.9,0.3,3.9,0.5,5.8
+		C1700.1,799.2,1698.5,797.5,1696.9,795.7z"/>
+	<path class="st1" d="M106.5,793.2c1.4-1.6,3.7,0.9,2.1,2.2C107.2,796.7,105.2,794.5,106.5,793.2z"/>
+	<path class="st1" d="M1200.5,793.1c0.8-1,3,0.1,2.4,1.3C1202,795.4,1199.8,794.4,1200.5,793.1z"/>
+	<path class="st1" d="M1192.2,796.8c-1.2-2.5,2.5-2.8,4.1-3.1C1195.5,795,1194,798.8,1192.2,796.8z"/>
+	<path class="st1" d="M1339.8,798.1c0.2-1.2-0.9-4,1-4c1.7,1.5,3.3,3.1,4.9,4.7C1344.1,800.1,1341.7,798.2,1339.8,798.1z"/>
+	<path class="st1" d="M1669.4,796.2c0.3-2.4,3.9-3.5,5.2-1.2C1673.1,796.4,1671.1,796,1669.4,796.2z"/>
+	<path class="st1" d="M1225,796.1c1.4,1.1,4,1.6,3.8,3.8C1226.3,800.8,1225.7,797.8,1225,796.1z"/>
+	<path class="st1" d="M95.7,799c1.2-3.5,5.3-1.2,6.7,1C100.4,801.2,95.7,802.7,95.7,799z"/>
+	<path class="st1" d="M1158.9,797c2.6-1.5,3.4,1.1,3,3.2C1160.3,799.7,1158.4,799,1158.9,797z"/>
+	<path class="st1" d="M1306.3,797.4c2.4,1-1.3,4.2-2.7,2.5C1303.4,798.5,1305.2,797.6,1306.3,797.4z"/>
+	<path class="st1" d="M1590.3,797.4c0.6,0,1.9-0.1,2.6-0.2c-0.7,2.4-4.4,4.1-6.7,3.6C1586,798.6,1588.9,798.3,1590.3,797.4z"/>
+	<path class="st1" d="M1606.1,800.1c2.3-1.3,4.8-2.6,7.3-3.5c-0.8,2.7-2.4,4.9-4.2,7C1608.1,802.5,1607.1,801.3,1606.1,800.1z"/>
+	<path class="st1" d="M1643.2,797.3c1.2-0.5,4-1.4,4.1,0.8c-2,1.4-4.1,2.6-6.5,3.1C1640.4,799.4,1641.3,797.7,1643.2,797.3z"/>
+	<path class="st1" d="M29.9,799.3c2.5-0.4,4.9-0.8,7.4-1.3c0.8,1.1,1.6,2.2,2.3,3.4c1.5,2-0.1,5.1-2.5,5.4c-2.2-1.9-4.4-3.9-7.1-5.1
+		C29.9,801.1,29.9,799.9,29.9,799.3z"/>
+	<path class="st1" d="M52.9,799.3c0.5-0.4,1.6-1.3,2.1-1.7c1.3,0.9,5.1,1,4.1,3.4C56.8,801.9,54.2,801.5,52.9,799.3z"/>
+	<path class="st1" d="M118.2,798.4c1.8,0.2,1.6,3.4-0.2,3.6C116.2,801.7,116.5,798.6,118.2,798.4z"/>
+	<path class="st1" d="M198.4,804.4c0.3-2.6,1.7-4.8,3.5-6.6c-0.1,3.1,0.3,6.8-2.1,9.2C198.6,806.8,198,805.5,198.4,804.4z"/>
+	<path class="st1" d="M182.3,799.3l0.7-0.9c2.4,2.1,1.2,8-2.2,7.7C180.4,803.7,180.8,801.1,182.3,799.3z"/>
+	<path class="st1" d="M1189.1,799.4c0.9-1.1,3.4,0.1,2.4,1.5C1190.6,802,1188.1,800.8,1189.1,799.4z"/>
+	<path class="st1" d="M1242.3,799.3c1.2-1.3,3.3,0.8,2.1,2.1C1243.2,802.6,1241,800.5,1242.3,799.3z"/>
+	<path class="st1" d="M1621.2,800.1c1.9-0.7,2.8,2.6,0.8,3C1620.3,803.5,1619.4,800.5,1621.2,800.1z"/>
+	<path class="st1" d="M227.6,801.8c2.2-1.2,4.2,0.6,3.1,2.9C228.4,806.7,227.8,803.5,227.6,801.8z"/>
+	<path class="st1" d="M1632.3,801.3c1.1-0.5,2.3-0.6,3.7-0.2c0.3,2.2-2,3.6-3.9,4C1631.8,803.8,1631.8,802.5,1632.3,801.3z"/>
+	<path class="st1" d="M374.3,802.3c3.4-0.8,3.2,3.3,2.4,5.5c-1.9,1.4-3.9-1.4-4.8-2.8C370.5,803.3,373.1,802.5,374.3,802.3z"/>
+	<path class="st1" d="M1282.5,806.1c1.1-1.5,3.5-5.5,4.8-2.1C1286.7,806.2,1284.5,806.4,1282.5,806.1z"/>
+	<path class="st1" d="M1330.9,802.9c1.6-0.8,3,0.9,4.1,1.9C1333.7,806.8,1329.6,805.5,1330.9,802.9z"/>
+	<path class="st1" d="M1694.1,807.5c1.7-1.5,3-4.8,5.8-3.9c-0.7,1.3-1.3,2.5-2,3.8c1.7,0.1,3.4,0.1,5.1,0.3c0,0.6,0,1.8,0,2.4
+		c-2.6,0.4-5.2,0.6-7.8,0.8C1694.9,809.7,1694.5,808.6,1694.1,807.5z"/>
+	<path class="st1" d="M1051.3,804.1c1.9-0.8,2.8,2.6,0.7,2.9C1050.1,807.5,1049.3,804.5,1051.3,804.1z"/>
+	<path class="st1" d="M1224.2,804.2c0.9-1.3,3.7,0,2.6,1.5C1225.7,807.1,1223,805.7,1224.2,804.2z"/>
+	<path class="st1" d="M65.6,810.3c-0.6-3.2,2.4-4.4,4.6-5.7c1.2,1.9,2.2,3.9,3.1,6C70.7,810.5,68.1,810.5,65.6,810.3z"/>
+	<path class="st1" d="M1130.1,805c2.2-1.8,3.2,3.4,0.7,3.7C1128.5,809,1128.7,806,1130.1,805z"/>
+	<path class="st1" d="M1244,804.8c2.5-1,2,2.1,2.2,3.5c-0.8-0.1-2.4-0.2-3.2-0.3C1243,806.9,1243.3,805.8,1244,804.8z"/>
+	<path class="st1" d="M1292.2,804.9c2.2,0,2.3,2.6,2.9,4.2C1293.3,811.4,1290.6,806.6,1292.2,804.9z"/>
+	<path class="st1" d="M413,810.1c0.4-1.7,1-3.3,1.9-4.9c0.6,0.5,1.7,1.5,2.2,2.1C416.1,808.8,414.7,809.8,413,810.1z"/>
+	<path class="st1" d="M1101.3,807.3l0.7-0.9c2.4,1.4,1.1,4.3-1.1,5.1C1099.2,810.6,1100.4,808.3,1101.3,807.3z"/>
+	<path class="st1" d="M1223.9,808c1.4-0.8,3.7-1.6,4.2,0.6c-2.8,0.1-6.4,2.5-8.4-0.3C1221.1,808.1,1222.4,808,1223.9,808z"/>
+	<path class="st1" d="M1619.2,807.4c2-0.2,2.6,3.1,0.8,4C1618.6,810.8,1617.2,808,1619.2,807.4z"/>
+	<path class="st1" d="M1189.1,810.8c-1-1.4-0.8-2.4,0.8-3c1.4,0.6,2.2,1.9,3.2,3.1C1191.9,811.4,1190,812.6,1189.1,810.8z"/>
+	<path class="st1" d="M1363.4,808.1c0.9-1,3-0.6,3.4,0.8C1366.6,810.8,1362.9,809.8,1363.4,808.1z"/>
+	<path class="st1" d="M1327.2,809.1c1.6-0.5,2.2,0,1.6,1.6C1327.2,811.3,1326.6,810.8,1327.2,809.1z"/>
+	<path class="st1" d="M78.8,811.8c1.1-2.9,5.6-2.7,6.4,0.3C84.2,814.7,80.7,812.2,78.8,811.8z"/>
+	<path class="st1" d="M1686.2,810.2c1.6,0,3.6,0.2,4.5,1.8C1689.4,815,1682.3,812.7,1686.2,810.2z"/>
+	<path class="st1" d="M266.4,812c2.2-1.2,5-0.5,7.4-0.3c2.3,0.3,1,3,0.3,4.3C271.6,814.7,268.3,814.4,266.4,812z"/>
+	<path class="st1" d="M283.9,811.8c2.3-1.6,4.7,0.4,6.2,2.1c0.6,1.7-1.3,2.5-2.2,3.5C286.4,815.8,285,813.8,283.9,811.8z"/>
+	<path class="st1" d="M1312.2,811.2c0.4-0.1,1.4-0.4,1.8-0.5c1.5,1.6,3.5,3.3,3.7,5.7C1314.5,818.3,1312.2,813.8,1312.2,811.2z"/>
+	<path class="st1" d="M1629.2,811.2c1.6-0.6,2.1,0,1.6,1.6C1629.2,813.4,1628.7,812.8,1629.2,811.2z"/>
+	<path class="st1" d="M1674.3,812.3c1.6,0.5,5.3,0,4.4,2.6C1676.9,815.7,1672,815.1,1674.3,812.3z"/>
+	<path class="st1" d="M263.4,813.3c2.8-0.8,2.1,3.6-0.4,2.9C261.1,816,261.9,813.4,263.4,813.3z"/>
+	<path class="st1" d="M1216.1,813.6c1-0.9,3.4,0.4,2.7,1.8C1217.8,816.2,1215.4,815,1216.1,813.6z"/>
+	<path class="st1" d="M1259.3,813.4c1.7-1.2,1.3,2.8,0.6,3.6C1257.4,817.8,1257.7,814.1,1259.3,813.4z"/>
+	<path class="st1" d="M1644.5,813.1c0.9-1.2,3.4,0.1,2.4,1.5C1645.9,815.7,1643.5,814.4,1644.5,813.1z"/>
+	<path class="st1" d="M1231.7,813.8c3.3-1,5.5,1.7,6.9,4.4C1235.3,819.8,1233.3,816.1,1231.7,813.8z"/>
+	<path class="st1" d="M29.7,814.7c1.8,0.1,3.7,0.2,5.5,0.3c0.2,2.1,0.6,4.2,1.4,6.3C33.5,820.2,28.9,819.1,29.7,814.7z"/>
+	<path class="st1" d="M41.7,820.1c-0.3-2.1,0.3-4,2-5.3c0.7,1.7,1.2,3.5,1.7,5.3C44.4,820.1,42.6,820.1,41.7,820.1z"/>
+	<path class="st1" d="M115,819.9c-1.8-1.3-6.8-2.8-4.2-5.5C113.8,814.5,114.8,817.5,115,819.9z"/>
+	<path class="st1" d="M1169.8,820.3c-0.7-1.7-3.9-4.4-0.9-5.3C1170.4,816.4,1171.3,818.4,1169.8,820.3z"/>
+	<path class="st1" d="M1288.8,817.9c1.1-1.8,3.1-3,5.2-2.1c-0.2,0.6-0.7,1.9-0.9,2.5C1291.6,818.2,1290.2,818,1288.8,817.9z"/>
+	<path class="st1" d="M59.6,821c0.2-2.2,0.9-4.3,2.5-6c0.6,2,0.6,4,0.1,6.1C61.6,821.1,60.3,821,59.6,821z"/>
+	<path class="st1" d="M1301.4,816.5c2.3-0.6,1.2,4.1-0.7,3.3C1299.9,818.8,1300.5,817.3,1301.4,816.5z"/>
+	<path class="st1" d="M1340.5,821c0.6-2,0.8-4.5,2.7-5.8c1.2,2-0.3,4-1.2,5.9L1340.5,821z"/>
+	<path class="st1" d="M1350.9,816.6c0.9,0.1,2.3-0.7,3,0.4c1.1,1.9-1.7,2.3-2.8,3.1C1351.1,819.2,1350.9,817.5,1350.9,816.6z"/>
+	<path class="st1" d="M1229.2,816.9c1.6,0.9,2.5,2.4,3,4.1c-1.5-0.3-2.9-0.7-4.4-1C1228.3,818.9,1228.7,817.9,1229.2,816.9z"/>
+</g>
+<g id="Text_Full">
+	<path class="st2" d="M600,76.2c46.6,0,93.3-0.1,139.9,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.1-0.1-13.7,0c3.5,3,7.4,5.5,11.1,8.2
+		c-1.3,4.5-2.8,8.9-4.5,13.2c4.2-2.1,7.3-5.8,11.6-7.7c4,2,7.2,5.3,10.9,7.7c-0.6-4.6-2.7-8.7-3.9-13.1c3.7-2.9,7.6-5.5,11.4-8.3
+		c-4.7-0.2-9.4-0.1-14.1-0.1c-1.3-3.6-2.5-7.3-3.6-11c83.1-0.1,166.2-0.1,249.2,0c-1,3.7-2.2,7.4-3.5,11c-4.6,0-9.3-0.1-13.9,0.1
+		c3.7,2.8,7.6,5.5,11.3,8.2c-1.3,4.5-2.8,8.8-4.5,13.2c4.2-2,7.4-6,11.7-7.7c4,2.1,7.2,5.3,11,7.7c-1-4.5-2.8-8.8-4.1-13.1
+		c3.7-2.9,7.6-5.5,11.4-8.3c-4.7-0.2-9.3-0.1-14,0c-1.4-3.6-2.5-7.2-3.5-11c46.2-0.1,92.5,0,138.7,0c0,14.1,0,28.3,0,42.4
+		c-10.8,0-21.7-0.1-32.5,0.1c-2.3,0-4.7,0.4-6.7-0.8c4-2.1,7.4-5.1,11.1-7.7c3.8,2.7,7.4,5.6,11.3,8c-1.3-4.3-2.8-8.6-4.3-12.9
+		c3.7-2.9,7.6-5.6,11.4-8.3c-4.6-0.1-9.3,0-13.9,0c-1.9-4.1-2.1-8.9-4.8-12.6c-1.3,4.2-2.6,8.4-4.1,12.6c-4.6,0.1-9.3,0-13.9,0.1
+		c3.8,2.8,7.7,5.4,11.4,8.3c-1.6,4.6-3.2,9.1-4.8,13.7c-12.2-0.8-24.5-0.1-36.8-0.3c-52.7,0-105.3,0-158,0
+		c-6.6-0.2-13.2,0.4-19.7-0.2c-1.5-4.5-3-8.9-4.2-13.5c3.8-2.6,7.5-5.2,11.1-8c-4.6-0.1-9.1,0-13.6,0c-1.9-4.3-3-9-4.6-13.4
+		c-1.5,4.5-2.8,9-4.5,13.4c-4.6-0.1-9.2-0.1-13.8,0c3.6,3,8.1,4.9,11.1,8.5c-1.1,4.5-2.9,8.7-4.1,13.2c-78,0-156-0.1-234,0.1
+		c-0.8-0.2-1.5-0.5-2.2-0.8c3.9-2.2,7.4-5.1,11-7.7c3.8,2.7,7.4,5.6,11.4,8c-1.4-4.3-2.9-8.6-4.4-12.8c3.6-2.9,7.6-5.5,11.3-8.3
+		c-4.6-0.2-9.2-0.1-13.7-0.1c-1.3-3.3-2.3-6.8-3.3-10.2c-0.2-1-0.8-1.7-1.6-2.3c-1.2,4.2-2.4,8.5-4.2,12.6c-4.5-0.1-9.1-0.1-13.6,0
+		c3.6,2.7,7.3,5.3,11,7.9c-0.8,4.9-3,9.4-4.3,14.2c-5.9-0.7-11.8-0.2-17.7-0.4C600,104.5,600,90.4,600,76.2z"/>
+	<path class="st2" d="M854.8,118.5c3.6-3,7.5-5.6,11.2-8.4c3.2,3,7.5,4.7,10.1,8.2C869,119,861.9,118.6,854.8,118.5z"/>
+	<path class="st2" d="M555.6,174.7c17.6-1.9,35.8-0.4,52.5,5.7c29.2,10.3,53.1,34,63.7,63c7.6,20.8,8.4,43.6,4.3,65.3
+		c-3.7,20-12.9,39.3-27.1,54c-19.9,21-48.7,31.4-77.1,33.4c-7,0-14,0.1-21,0c-31.2-2.9-61.7-18.6-80-44.4
+		c-12.9-17.9-19.4-40-19.3-62c0-4.7-0.1-9.4,0.2-14c1.7-27.8,14.7-55,35.9-73.2C506.6,186.1,531,177.1,555.6,174.7 M555.6,191.5
+		c-16.2,2.6-30.8,12.2-40.6,25.2c-13.6,17.6-19.3,40-20.4,61.9c-0.4,14.9,1.4,29.8,5.5,44.1c5.4,18.2,15.8,35.4,31.4,46.4
+		c12.4,9,28.3,12.4,43.4,10.6c15-2,28.8-10.1,38.5-21.6c13.1-15.6,19.5-35.8,21.6-55.7c1.8-20.6,0.7-41.8-6.6-61.3
+		c-6.2-17.8-18.2-34.2-35.1-43.2C581.9,191.8,568.5,189.7,555.6,191.5z"/>
+	<path class="st2" d="M770.9,179.3c10-0.1,20-0.3,30-0.1c13.4,0.9,27.5,4.7,36.9,14.8c10.9,11.6,15.2,28.1,14.6,43.7
+		c-0.4,9.6-2.2,19.3-6.8,27.9c-13.2,25-41.8,40.4-69.8,38.4c-0.4-0.1-1.1-0.3-1.5-0.4c-0.4-4-0.2-8.1-0.1-12.1
+		c10.6-1.4,21.6-5.6,28.4-14.3c7.7-9,9.3-21.2,9.7-32.6c0.3-12-1-24.9-8.2-35c-5.7-8.3-15.5-12.8-25.1-14.3
+		c-7-0.9-14.2-0.6-21.2-0.1c0,52.5-0.1,104.9,0,157.4c0.8,7.3,0.3,15.8,5.6,21.7c4.7,5,12.1,4.7,18.4,4.7c0,4,0,8,0,12.1
+		c-19.5-1.8-39.1-2.1-58.7-1.6c-9.5,0.8-19.1,0.5-28.6,1.7c-1.1-3.9-0.6-8-0.6-12c6.5-0.1,14.2,0.4,19.1-4.7
+		c5.4-6.2,4.8-15,5.6-22.7c0.1-42.7,0-85.4,0-128.1c0.2-6-0.6-12-1.2-18c-0.9-4.9-2.9-10.3-7.7-12.6c-4.9-2.6-10.5-1.9-15.8-2.1
+		c-0.1-3.9-0.1-7.8,0-11.8c5.8-0.3,11.5,1.1,17.3,1C731,180.4,751,180.8,770.9,179.3z"/>
+	<path class="st2" d="M1262.9,180.2c5.8,0,11.6-1.2,17.4-1.1c0,4,0,7.9,0,11.9c-5.8,0-12.5-0.3-17.1,4c-5.1,4.8-5.4,12.2-5.7,18.7
+		c-0.4,15-1,30-0.9,45.1c-0.9,44.8-1.4,89.7-1.3,134.5c-5.4,0.1-10.8,0.2-16.2-0.1c-10.5-13.6-20.9-27.4-32.2-40.3
+		c-25.5-30.1-51.5-59.8-77.2-89.8c-8.5-9.8-16.9-19.8-24.9-30.1c-4.3-5.3-7.9-11.1-12.6-16.1c0.8,19,2.1,37.9,2.2,56.9
+		c0.2,12,0,24,0.6,36c0.3,17,0.1,34.1,1.5,51.1c0.6,5.1,1.8,10.9,6.1,14.2c4.7,3.7,11,3.3,16.6,4.2c-0.5,3.9,0.9,8.3-1,11.8
+		c-14.1-1.4-28.2-1.1-42.3-1c-8.8,0.3-17.7-0.2-26.5,1.1c-0.1-4-0.1-7.9,0-11.9c5.8-0.6,12.2-0.4,17.3-3.7c4.1-3.2,5.7-8.6,6.3-13.6
+		c2-28.4,1-56.8,1.3-85.2c0-19.7,0-39.3-0.1-59c-0.6-8-0.9-17.2-7.2-23.1c-4.9-3.8-11.6-3.4-17.5-3.7c-0.2-3.9-0.2-7.9,0.1-11.8
+		c3.8-0.1,7.5,0.4,11.3,0.8c16.3,0.7,32.7,0.5,48.9-0.9c36.7,44.8,75,88.1,112.2,132.5c5.4,6.4,10.2,13.3,15.6,19.7
+		c0.2-10.9-0.2-21.8-0.9-32.6c-0.3-26-0.1-52-0.2-78.1c-0.1-8.2-0.9-17.3-6.6-23.8c-4.6-5.1-12-6-18.5-5.9c-0.1-4-0.1-8,0-12
+		c4.5,0,9,0.7,13.5,1C1237.6,180.5,1250.3,180.4,1262.9,180.2z"/>
+	<path class="st2" d="M863.7,179.1c16.7,1.7,33.6,1.2,50.4,1.4c24.7-0.1,49.4-0.3,74-0.4c9.5-0.8,19-0.6,28.5-0.9
+		c0.6,17.1,2.3,34.1,4.3,51.1c-4.5,1-9.2,1.3-13.8,1.2c-1.4-9.1-3.1-18.6-8.8-26.1c-4-5.5-10.9-8-17.3-9.3c-13.9-2.5-28-2-42-1.9
+		c-3.5,0.1-7.8,0.2-10,3.5c-1.6,3.4-1.5,7.3-1.6,11c-0.2,21.5,0.1,43-0.2,64.5c12.6-0.2,25.3,0.1,37.9-0.3
+		c7.1-0.7,14.9-0.7,20.8-5.3c5.5-5.2,4.9-13.3,5.7-20.2c4.3,0,8.6,0,12.9,0c-1.8,18.1-0.9,36.3-0.9,54.4c-0.3,4.4,0.9,8.7,0.7,13.1
+		c-4.2,0.3-8.4,0.1-12.6,0.2c-0.9-6.9-0.6-14.8-5.9-20.1c-5.8-5.4-14.2-5.8-21.6-6.6c-12.5-0.4-25.1-0.1-37.7-0.2
+		c1.4,6.4,0.7,13,0.9,19.5c0.1,15.3-0.2,30.6,0.2,46c0.6,6.6,2.1,14.8,8.7,18.1c7.7,3.9,16.5,2.1,24.8,2.9c5,0.6,10-0.5,15.1-0.3
+		c11.3,0.3,22.8-3,31.9-9.7c9.7-7.9,13.7-20.2,17.9-31.5c3.9,1.3,7.8,2.5,11.8,3.4c0.4,4.2-1.4,8.1-2.3,12.1
+		c-3.7,14-6.7,28.3-9.9,42.5c-15.1-1.1-30.3-0.8-45.4-1.6c-21-0.2-42-0.2-63,0c-17.6,0.8-35.2,0.6-52.8,1.1c0-3.8,0-7.6,0-11.4
+		c4.8,0,9.9,0.1,14.4-2c3.5-1.6,6-4.9,7.1-8.6c2.2-7.1,2-14.6,2-21.9c0-43.3,0.1-86.7-0.1-130c-0.2-7.3-0.3-15.5-5.4-21.2
+		c-4.9-5-12.3-4.5-18.7-4.4C863.4,187,863.5,183,863.7,179.1z"/>
+	<path class="st2" d="M586.6,468.7c16.1-1.3,32.4-0.8,48.2,2.8c32.1,7,61.2,26.3,80.2,53c17.7,24.5,26.3,55.1,25.4,85.3
+		c-0.8,29.9-8.9,60.2-26.8,84.5c-18.5,25.6-47.1,42.8-77.6,50.2c-9.9,2.6-20,3.9-30.2,4.8c-9.7,0.2-19.4,0.1-29.1,0
+		c-32.6-3.4-64.1-17.8-87.4-41.1c-10.9-11.3-19.9-24.5-26.1-39c-8.3-19.3-11.8-40.6-11.3-61.5c-0.1-33.3,11.7-66.8,34-91.8
+		c12.3-13.8,27.6-24.7,44.3-32.6C548,474.9,567.3,470.5,586.6,468.7 M587.6,489.7c-17.4,1.9-33.6,10.3-46.1,22.4
+		c-12.6,12.2-21.2,28-26.8,44.5c-5.1,15.5-7.8,31.8-7.5,48.1c-0.8,27.2,4.8,55,18.2,78.8c8.1,14.2,19.6,26.7,33.6,35.2
+		c17.8,10.2,39.6,13.3,59.5,7.9c14-3.5,26.5-11.6,36.4-22c14.6-15.7,23.3-36.1,27.7-57c3-15.1,4.3-30.5,3.8-46
+		c-0.5-3.7-1.1-7.3-1.1-11c-1.9-19.9-7.3-39.6-17.4-57c-6.9-11.7-15.7-22.4-26.9-30.1C625.6,493,606.4,487.5,587.6,489.7z"/>
+	<path class="st2" d="M1213,475.7c6.7-2.9,13.4-6,20.2-8.7c5.5,15.8,10.1,31.9,15.4,47.8c14.1,43,29.1,85.8,43.7,128.7
+		c7.1,20.5,13.4,41.4,22.7,61c3.5,7.3,7.8,14.6,14.5,19.5c4.4,3.1,9.8,3.4,15,4.3c0,4.7,0,9.4,0,14.2c-4.3-0.3-9.1,1.2-13.1-0.9
+		c-25.5-0.4-51-0.8-76.5,0c-7.1,1-14.4,0.8-21.5,1c0-4.8,0-9.6,0-14.5c7.4-0.4,15.9,0.2,22.1-4.7c5.1-4.3,4.4-11.8,3.7-17.8
+		c-3.7-21.6-11.8-42.2-18-63.2c-25.4,0.1-50.8-0.2-76.2,0.1c-3.3,10.6-7.7,20.8-11.5,31.2c-3.8,10.6-8.6,20.9-10.8,32
+		c-0.7,5.7-1.2,12.5,3.5,16.8c6.5,6.2,16.2,4.8,24.4,5.6c0,4.8,0,9.6,0,14.4c-8.6,0.2-17-1.4-25.6-1.3c-15.4-0.2-30.7-0.3-46.1,0
+		c-7.8-0.1-15.5,1.7-23.3,1.2c-0.3-4.7-0.3-9.5-0.3-14.2c4.8-0.8,9.9-0.7,14.4-2.8c8.5-3.4,13-12.1,17.5-19.5
+		c10.6-20.3,19-41.7,27.9-62.7c21.9-53.6,45.4-106.5,64.6-161.1C1203.7,479.1,1208.7,477.9,1213,475.7 M1206.8,527.4
+		c-1.1,2.7-2,5.4-2.8,8.2c-6.1,20.8-13.6,41.1-21.6,61.2c-2.9,8.2-6.9,16-9.4,24.3c5.3-0.2,10.7-0.1,16-0.3
+		c15.3-1.2,30.6,0.2,45.9,0.3c-3-8.1-5.9-16.2-8.3-24.4c-5.9-19.8-12.8-39.3-16.8-59.6C1209.1,533.8,1208.6,530.4,1206.8,527.4z"/>
+	<path class="st2" d="M1499.6,476.6c7.5-3.2,14.8-6.9,22.6-9.5c19.2,62,40.9,123.2,61.8,184.6c6.5,18.9,12.5,38,21.4,55.9
+		c3.7,7,8.3,14.4,15.8,17.9c3.6,1.8,7.7,1.8,11.6,2.6c-0.1,4.8,0,9.6,0,14.4c-6.2-0.1-12.5-0.1-18.7-1c-15.7-0.5-31.4-0.5-47.1-0.4
+		c-9.3,0.2-18.6-0.3-27.8,1c-5.6,0.4-11.3,0.3-16.9,0.4c0-4.8,0-9.6,0-14.5c7.7-0.4,16.6,0.1,22.8-5.3c4-4.5,3.8-11.1,3-16.6
+		c-3.6-21.9-12-42.5-18-63.8c-25.4-0.1-50.8-0.2-76.2,0c-4.4,12.5-9.3,24.9-13.9,37.3c-3.1,8.5-6.9,16.9-8.5,26
+		c-0.3,5.2-1.2,11.1,2.2,15.5c2.3,3.2,6.2,4.7,9.9,5.8c5.3,1.1,10.8-0.3,16,1.3c-0.1,4.8-0.1,9.5,0,14.3c-7.2,0-14.4-0.2-21.5-1.1
+		c-19-0.4-38.1-0.4-57.1,0.1l-0.8,0.6c-5.2,0.2-10.4,0.4-15.6,0.5c-0.2-4.8-0.3-9.5-0.2-14.3c7.4-0.7,15.5-1.7,21-7.2
+		c8.1-8.6,13.1-19.6,18.1-30.2c8.4-18.5,16.2-37.2,23.9-56c15.3-37.2,31.2-74.2,45.9-111.8c5.1-13.5,10.6-26.8,14.6-40.6
+		C1491.2,479.6,1495.6,478.6,1499.6,476.6 M1494.9,527.8c-8.9,31.9-21.2,62.7-33.6,93.4c5.6-0.2,11.2,0,16.8-0.4
+		c15-1.2,30.1,0.3,45.2,0.3c-2.5-8.3-5.7-16.4-8.1-24.7c-6.5-21.9-14.3-43.6-17.9-66.3C1497.2,528.7,1495.9,528.3,1494.9,527.8z"/>
+	<path class="st2" d="M392,476.2c13,0.4,26-0.8,39-2c0.5,5,0.2,10,0.4,15c-8.2,1.1-17.1,0.1-24.6,4.4c-5.6,2.9-8.3,9.1-9.1,15
+		c-0.5,4.7-0.4,9.4-0.4,14.1c0.3,15.7-0.3,31.4,1,47c0.2,12.7,0.1,25.4,0.5,38.1l0.7,0.8c0.1,11,0,22,0.4,32.9
+		c1.3,10.9,0.4,22,1.5,32.9c0.3,4,0,8,0.6,11.9c1.1,6.1,0,12.3,1.5,18.3c1.2,6.4,2.1,13.9,7.9,18c6.2,4.4,14.2,4.2,21.5,5.1
+		c0,4.9,0,9.8,0,14.7c-9.2,0.3-18.4-1.4-27.6-1.3c-20.7-0.3-41.3-0.3-62,0.2c-6.9,1-13.8,0.9-20.7,1c0-5-0.1-10.1,0.2-15.1
+		c7.5,0.1,15.8-0.3,21.9-5.2c6.5-6.7,6.8-16.7,6.9-25.5c0.2-39.7-0.1-79.3,0.2-119c0.1-5.3,1.3-10.6,1-16
+		c-0.1-6.9,1.6-13.7,1.2-20.6c-0.5,0-1.5,0-1.9,0c-13.7,38.9-31.6,76.1-49.3,113.4c-8,17-16.4,33.8-23.6,51.2
+		c-5.5,12.5-10.5,25.2-16.7,37.3c-3.4-0.1-6.7,0.2-10.1-0.2c-1.3-0.3-1.8-1.8-2.4-2.9c-18.2-39.6-37-78.9-55.4-118.4
+		c-12.4-26-24.3-52.4-34.1-79.5c-0.5,0-1.6-0.1-2.1-0.1c0.1,10.3,1.5,20.5,1.1,30.8c0.4,13.1-0.6,26.2-0.9,39.3
+		c-1.2,9.9-0.1,19.9-1.6,29.8c-0.4,11.4-0.2,22.9-0.4,34.4c-0.8,9.1-1.4,18.4-0.1,27.5c0.4,6.4,2.1,13.3,6.8,18
+		c6.2,5.1,14.6,6.1,22.4,5.8c0.3,5,0.2,10,0.2,15.1c-7.9,0.3-15.7-1.4-23.6-1.2c-12.8-0.3-25.6-0.4-38.4,0.1
+		c-8.3,1.1-16.6,0.8-25,0.8c0.4-4.9-1-10.1,1-14.7c6.6,0.3,14.1-0.1,19-5.1c5.4-5.9,7-14,8.3-21.6c0.8-3.9,0.8-8,0.4-11.9
+		c0.3,1.7,0.6,3.4,0.9,5.1c0.4-9.1,1.1-18.1,2-27.2c0.2-4.4,0-8.8,0.6-13.1c1-6.6,0.4-13.3,0.9-20c0.9-7.6,0.7-15.3,1.5-22.9
+		c-0.3-9,1.4-17.9,1.2-27c-0.2-5.4,1-10.7,1-16c-0.1-17.7,2.7-35.4,1.6-53.1c-0.6-8.3-3.8-17.1-11.2-21.6
+		c-5.7-3.6-12.7-3.2-19.2-3.1c-0.2-4.9-0.1-9.9-0.1-14.8c14.5,0.2,29,1.7,43.5,1c9.8-0.7,19.7-0.7,29.4-1.9
+		c15.6,37.3,32.4,74,49.9,110.4c13.4,28.9,28,57.3,39.5,87c0.3-0.2,0.9-0.5,1.3-0.7c7.5-18.6,15.2-37.2,23.9-55.3
+		c18.6-40.6,38.1-80.9,55.6-122c2.8-6,4.7-12.4,7.8-18.3C368.9,474.7,380.4,476.3,392,476.2z"/>
+	<path class="st2" d="M761.4,489.3c-0.1-5.1-0.1-10.1,0-15.1c26.2,2,52.5,2.5,78.7,1.7c9.6-1,19.3-0.1,28.8-1.3
+		c1.5-0.3,3,0.2,4.4,0.7c-0.2,4.7-0.1,9.3-0.1,14c-8.3,0-18.2-0.4-24.5,6c-6.9,8.1-5.9,19.5-7,29.4c-0.3,23.8,0.1,47.6-0.3,71.4
+		c31.5-0.4,63.1,0,94.6-0.2c12.2,0.1,24.4-0.2,36.6,0.2c-0.3-17.8-0.2-35.6-0.1-53.4c-0.2-8.3,0.3-16.7-0.9-25
+		c-0.2-8.1-1.2-17.2-7.3-23.2c-6.4-5.7-15.5-5-23.5-5.2c0-4.6,0-9.3,0-13.9c8.1-0.2,16.2-0.1,24.2,0.7c19.3,0.8,38.7,0.2,58,0
+		c9.9-0.8,19.8-0.5,29.7-0.8c0.1,4.7,0.1,9.5,0,14.2c-6.5-0.1-13.3-0.3-19.2,2.6c-4.3,2.1-7.2,6.2-8.5,10.8
+		c-3.6,10.6-2.4,21.9-2.6,32.9c0,47,0,94,0,141.1c0.2,12.3-0.9,25,2.3,37c1.3,5,4.6,9.8,9.6,11.8c3.9,2.1,8.5,1.6,12.8,2.3
+		c1.8-0.2,3.6-0.4,5.5-0.6c0.4,5.1,0.2,10.2,0.2,15.2c-7.2-0.2-14.5-0.3-21.7-0.6c-8.3-1.1-16.7-0.8-25-0.9c-13.8,0-27.7,0-41.5,0.4
+		c-7.7,1.1-15.4,0.5-23.1,0.9c-0.8-4.8,0.2-9.6-0.1-14.5c6.9-1.2,14.6,0.8,20.7-3.5c7.6-4.9,9.2-14.6,9.6-22.9
+		c1.4-9.9,0.7-19.9,0.9-29.9c0-18.5,0-36.9,0.1-55.4c-43.7,0.2-87.3,0.3-131,0c0.2,26.8,0,53.6,0.2,80.4c1,8.4,1.2,17.8,6.7,24.7
+		c6.2,7.1,16.4,6.1,24.9,6.9c-0.1,4.7-0.1,9.4,0,14.2c-7.5,0-14.9,0-22.3-1c-23-0.5-46-0.6-69,0c-6.8,1-13.7,1.1-20.6,1.1
+		c0-4.8,0-9.7,0-14.5c7.9-0.3,17,0,23.2-5.8c5.5-6.4,6.5-15.4,7-23.5c0.2-57.3,0.1-114.6,0.1-172c-0.1-10.3,0.1-21.7-6.1-30.5
+		C779.8,489.1,769.7,489.2,761.4,489.3z"/>
+</g>
+<g>
+	<g id="_x23_57626eff">
+		<path class="st3" d="M316.5,0h0.6c-0.1,0.8-0.2,2.3-0.3,3c-0.1,0.7-0.2,2-0.3,2.6l1.4,0c2.6,0.3,1.7,2.2,0.1,3.2
+			c-1.1,0.7-1.5,1.7-1.4,2.9c0,1,0,2.9,0.1,3.9c0.1,2.6,0.4,5.1,0.8,7.6c0.3-1.6,0.7-3.3,1-4.9c1.2-0.3,2.4-0.6,3.5-0.9
+			c-0.2,1.2-0.4,2.4-0.6,3.6c-0.2,3-5.4,3.8-4.2,7l0.1,0.5c1.4,1.1,3.3,1.3,5,1.9c1.4,0,2.8,0,4.2,0c0,1.2,0.1,2.3,0.1,3.5
+			c-2.2-0.3-4.3-1.1-6.1-2.4c-1.7,1.6-3.1,3.4-4.1,5.5C316.4,24.6,316.3,12.3,316.5,0z"/>
+		<path class="st3" d="M349.3,0h0.5c-0.3,1.5-0.5,2.9-0.7,4.4c-0.5,0.6-1.1,1.1-1.6,1.7c-0.4,0.6-1.3,1.7-1.7,2.2
+			c-0.5-0.2-1.6-0.5-2.2-0.6c0.2-1.9,1.2-3.6,2.5-5C347.1,1.8,348.2,0.9,349.3,0z"/>
+		<path class="st3" d="M363.7,0h12.2c0.3,0.6,0.9,1.8,1.1,2.4c-2.8-0.1-5.5-0.3-8.2-1C367.2,0.7,365.5,0.3,363.7,0z"/>
+		<path class="st3" d="M456.9,0h2.7C461.1,3,455.7,3,456.9,0z"/>
+		<path class="st3" d="M1402.7,0h5.5c2.3,2.7,3.8,6,5.7,9l1.3-0.3c0.2-0.4,0.6-1.1,0.8-1.5c0,0.5,0,1.6,0,2.2
+			c-3.2-0.3-6.4,0.4-9.3,1.8c-0.8,0.3-1.6,0.6-2.3,0.9c-0.4-0.4-1.1-1.1-1.5-1.5c-1,0-2.1,0-3.1,0c0.9-1,1.8-2.1,2.9-2.9
+			c2.5-0.6,5.1-0.9,7.2-2.6C1407.4,3.5,1405,1.8,1402.7,0z"/>
+		<path class="st3" d="M338.2,5.3c0.8-0.2,2.5-0.7,3.4-0.9c-0.2,1-0.3,2.1-0.5,3.1c-0.6,0.1-1.8,0.3-2.4,0.3
+			C338.5,7,338.4,6.2,338.2,5.3z"/>
+		<path class="st3" d="M391.5,5.4c0.8,0,2.4,0,3.2,0c-0.6,2.5-1.4,4.9-2.3,7.3c-0.6,0.4-1.9,1.2-2.6,1.7c-0.7-0.3-2.2-1-2.9-1.3
+			c1.5-1.5,3-3.1,4.4-4.7C391.4,7.3,391.4,6.3,391.5,5.4z"/>
+		<path class="st3" d="M1254.3,6.3c1.8-0.6,3.8-0.8,5.7-0.9c-1.3,2.2-2.8,4.6-5.7,4.5C1254.3,8.7,1254.3,7.5,1254.3,6.3z"/>
+		<path class="st3" d="M376.1,13.1c1.6-2.6,4.8-3.5,7.6-2.4c0.1,2.2-1.9,3-3.5,3.8C378.8,14,377.5,13.6,376.1,13.1z"/>
+		<path class="st3" d="M443.8,11.5c0.5,0,1.5-0.1,2-0.2c0.1,0.4,0.4,1.1,0.5,1.5c0.4,1.5,0,2.7-1.1,3.7c-1.5-0.3-3-0.8-4.4-1.3
+			c-0.3-0.1-0.9-0.4-1.2-0.6c0.6-0.1,1.8-0.2,2.4-0.2C442.6,13.4,443.2,12.4,443.8,11.5z"/>
+		<path class="st3" d="M367.3,14.3c1.2-1.2,3.6-0.2,2.5,1.5C369.2,18.7,364,15.7,367.3,14.3z"/>
+		<path class="st3" d="M1254.6,15.6c0.7-1.5,1.8-2,3.3-1.5C1258.7,16.2,1255.9,17,1254.6,15.6z"/>
+		<path class="st3" d="M358.6,15.6c1.7,0,3.4,0,5,0c-0.1,0.5-0.4,1.5-0.5,1.9l-1.1,0.4c-0.9,0.3-1.7,0.5-2.6,0.8
+			C359.2,17.9,358.8,16.3,358.6,15.6z"/>
+		<path class="st3" d="M397.2,18.2c1.1-2.3,3-3.5,5.5-2.8l-1.1,1.6C400.4,18.1,398.8,18.5,397.2,18.2z"/>
+		<path class="st3" d="M1383.2,15.1c1.3,0.7,2.7,1.4,4,2.2c-1,1.6-2.6,2-4.2,0.9C1383.1,17.4,1383.1,15.8,1383.2,15.1z"/>
+		<path class="st3" d="M346.9,16.5c0.8-0.1,2.4-0.3,3.2-0.4c0.3,0.2,0.9,0.5,1.1,0.7c1.1,0.7,2.2,1.3,3.3,2c0,1-0.1,2-0.1,2.9
+			c-2-1.6-4.4-2.8-6.9-3.4C347.4,17.9,347,17,346.9,16.5z"/>
+		<path class="st3" d="M380.2,21.2c1.7-2.7,4.2-4.7,7.2-5.8c0.6,2.5-1.5,3.7-3.1,4.9c0.5,0.9,1.1,1.8,1.6,2.8
+			C384,22.6,382.1,22,380.2,21.2z"/>
+		<path class="st3" d="M387.2,21.4c1.8-1.4,3.6-2.8,5.6-4c1.4,0.8,2.8,1.5,4.2,2.1l0,0.1c-2.3,0.6-4.3,2-6,3.5
+			c-0.5,0-1.4,0.2-1.8,0.2C388.7,22.8,387.7,21.9,387.2,21.4z"/>
+		<path class="st3" d="M325.4,17.9c1.5,0.1,3,0.2,4.6,0.2c-0.3,1.3-0.6,2.5-0.9,3.8l-1.1-0.5C327.1,20.3,326.2,19.1,325.4,17.9z"/>
+		<path class="st3" d="M409.7,19.8c3-1.3,3.2,2,2.2,3.9C409.5,24.9,408.7,21.4,409.7,19.8z"/>
+		<path class="st3" d="M334.7,26c0.5-0.2,1.5-0.7,2-0.9c1.3,1.3,2.7,2.4,4.1,3.5c0.5,1.8,0.4,3.8-1.7,4.3
+			C337.7,30.6,336.2,28.3,334.7,26z"/>
+		<path class="st3" d="M1411.6,34.1c0.9-1.4,3.2,0.2,2.1,1.5C1412.8,36.9,1410.5,35.4,1411.6,34.1z"/>
+		<path class="st3" d="M1390.6,97.6c-0.8-4.6-0.5-9.3,0-13.9c0,3.9,0,7.8,0.5,11.7c2.3-2.6,0.7-6.5,2.8-9.3c0.6,1.9,1.2,3.8,1.9,5.7
+			c0.3,0.8,1,2.4,1.3,3.2c-0.9,0.7-1.7,1.3-2.5,2c0.2,0.6,0.6,1.7,0.8,2.3c-0.6,0.9-1.2,1.8-1.8,2.7
+			C1392.5,100.7,1391.5,99.2,1390.6,97.6z"/>
+		<path class="st3" d="M971.9,87.2c0.8,0.5,1.7,1,2.6,1.5c3.5,2.3,6.8,4.8,10.1,7.4c-1.2,4-2.4,7.9-3.4,12c3.9-2.2,7.4-5,11.4-6.9
+			c1.7,1.4,3.3,2.8,5,4.2c1.8,1.5,3.8,2.8,5.9,3.8c-0.7-2.1-1.4-4.2-2.2-6.3c-0.7-2-1.3-3.9-1.8-5.9c0.6-0.8,1.1-1.7,1.7-2.5
+			c3.1-2.3,6.2-4.5,9.2-7c0.4,0.2,1.1,0.5,1.5,0.7c-0.2,1.1-0.4,2.2-0.5,3.4c-3.2,2.4-6.8,4.4-9.8,6.9c0.1,1.3,0.5,2.5,0.8,3.8
+			c1.1,3.4,2.2,6.8,2.8,10.3c-2.8,0.2-5.1-1.2-7.1-2.9c-2.1-1.6-4.1-3.2-6.1-4.9c-2.9,2.4-5.6,5-8.7,7.2c-1.3,0.4-2.7,0.7-4,1.1
+			c0-5,2.1-9.6,3.7-14.2c-3.4-3-7.7-4.9-10.6-8.4C972.2,89.5,972,87.9,971.9,87.2z"/>
+		<path class="st3" d="M1049.8,92.2c0.5-1.5-0.6-4.1,1.2-4.9c1.9,1.4,1.6,3.6,1.2,5.6C1051.6,92.8,1050.4,92.4,1049.8,92.2z"/>
+		<path class="st3" d="M333.5,95.2c0.2-1.6,1-2.9,1.8-4.2c1.2,2.5,1.7,5.2,2.1,7.9c-2.1,1.6-4.5,6.4-7.4,3.4
+			c0.7-0.4,1.5-0.8,2.2-1.2c1.9-0.5,2.6-1.6,2-3.3C333.9,96.9,333.7,96,333.5,95.2z"/>
+		<path class="st3" d="M316.6,113.4c-0.2-5.6-0.5-11.3-0.1-16.9c1.5,1.3,2.9,2.6,4.4,3.8c-1.4-0.1-2.7-0.2-4.1-0.3
+			c0.1,2.4,0.1,4.8,0,7.3c0.8,0.7,1.6,1.4,2.4,2.1C318.5,110.8,317.6,112.1,316.6,113.4z"/>
+		<path class="st3" d="M846.5,96.7c1.8,1.2,3.5,2.3,5.3,3.6c2.4,1.8,4.7,3.6,7.1,5.3c-1.4,4.3-3,8.6-4.2,13c2.5-1.7,4.8-3.7,7.3-5.5
+			c1.3-0.8,2.6-1.6,4.1-2c2.5,1.1,4.7,2.7,7.1,4.1c1.3,1.1,2.7,2.3,4,3.4c-1-4.5-2.7-8.8-4-13.3c4-2.7,7.8-5.6,11.6-8.5
+			c1.9,4.5-3.3,6.7-6.3,8.8c-1.1,0.7-2.3,1.4-3.4,2.1c1,3.6,2,7.1,3.5,10.5l0.3,0.7c-2.4,0-4.9,0-7.3,0c-1.8-1.6-3.7-3-5.6-4.3
+			c-1.8,1.4-3.6,2.8-5.4,4.3c-2.4,0-4.8,0.1-7.2,0c0.3-0.9,0.6-1.7,0.8-2.6c0.9-2.8,1.6-5.7,2.4-8.6c-3.3-2.8-7.6-4.3-10.2-7.8
+			C846.4,99.2,846.4,97.6,846.5,96.7z"/>
+		<path class="st3" d="M1082.7,97.8c0.5-0.1,1.5-0.4,2-0.6c3.9,2.7,8,5.4,11.6,8.5c-0.6,1.8-1.1,3.7-1.7,5.5c-1,2.3-1.9,4.6-2.8,6.9
+			l-0.7,0.3c0.5-1.7,1.1-3.4,1.6-5.1c0.3-1.9,1.7-4.3-0.1-5.9c-3.1-3-7.2-4.9-10.3-8C1082.5,99,1082.6,98.2,1082.7,97.8z"/>
+		<path class="st3" d="M330.3,110.4c1.2-0.8,2.4-1.7,3.7-2.4c0.3,0.6,0.8,1.8,1.1,2.4C334.1,112.4,331.3,112.6,330.3,110.4z"/>
+		<path class="st3" d="M330.5,131.2c2.5-0.6,5-1.3,7.4-2.1c0.4,0.9,0.8,1.7,1.2,2.6c-2.3,0.8-4.6,1.7-6.9,2.5
+			c-1.3-0.1-2.6-0.1-3.8-0.2c0.1-0.6,0.3-1.7,0.5-2.3C329.2,131.6,330.1,131.4,330.5,131.2z"/>
+		<path class="st3" d="M1410.5,130.1c1-1,3.3-0.8,3.6,0.8C1413.8,132.9,1409.7,132.1,1410.5,130.1z"/>
+		<path class="st3" d="M1410.3,141c0.4-1.8,0.9-3.6,2.1-5.1c1.2,0.5,2.3,1,3.5,1.5c0,1,0,2,0,3.1c-0.8,0.1-2.5,0.2-3.3,0.3
+			C1412.1,140.8,1410.9,140.9,1410.3,141z"/>
+		<path class="st3" d="M338.8,138.7c1.1-0.1,2.1-0.2,3.2-0.3c0,0.4,0,1.2,0,1.6c-2,1.9-3.4,4.3-4.7,6.6c-0.8-0.4-1.5-1-2.2-1.5
+			c0.1-0.7,0.2-2.1,0.2-2.8c0.8-0.1,2.4-0.2,3.1-0.2C338.6,141.1,338.7,139.9,338.8,138.7z"/>
+		<path class="st3" d="M1396,139c2.3-1.7,4.9-1.5,6.3,1c-1.4,0-2.8,0-4.1-0.1C1397.7,139.7,1396.6,139.2,1396,139z"/>
+		<path class="st3" d="M321,146.4c1.8-2,3.5-4,5.2-6.1c0.7,1,1.5,1.9,2.2,2.9c-0.7,0.6-1.4,1.3-2.1,1.9c-1.1,1-2.1,2-3.1,3
+			C322.5,147.5,321.7,146.9,321,146.4z"/>
+		<path class="st3" d="M1398.6,143.3c1,0,2,0,3,0.1c0,1.4,0,2.8,0,4.3c-1.5,0-3,0-4.4,0C1397.7,146.2,1398.1,144.8,1398.6,143.3z"/>
+		<path class="st3" d="M1409.2,143.4c1.3-1.3,3.5,0.9,2.2,2.2C1410.1,147.1,1407.7,144.7,1409.2,143.4z"/>
+		<path class="st3" d="M1407.4,173.4c0.9,0.1,1.9,0.2,2.9,0.4c0.1,1,0.2,2,0.3,3c0,0.5,0.1,1.5,0.1,2c-1.1-0.2-2.2-0.3-3.3-0.5
+			C1407.4,176.6,1407.4,175,1407.4,173.4z"/>
+		<path class="st3" d="M1397.2,205c4.3-0.9,4.8,4,3.3,6.9c-1.3-0.5-2.5-1-3.7-1.6c0.4-0.6,1.2-1.8,1.6-2.4
+			C1398,207,1397.6,206,1397.2,205z"/>
+		<path class="st3" d="M1406.4,230.8c0.8-0.8,1.7-1.5,2.6-2.3c0.6,0.3,1.7,1,2.3,1.3c0.1,0.3,0.2,0.9,0.2,1.3
+			c-0.9,0.5-1.8,1-2.7,1.5c-1,1.7-2,3.4-3,5c-1.2-0.8-2.4-1.7-3.5-2.6c1.8-0.2,3.5-0.4,5.3-0.5c0-0.8,0.1-2.5,0.1-3.3
+			c-1.7,0.2-3.3,0.4-5,0.6c0-0.5,0.1-1.5,0.2-2c0.7,0.1,2,0.4,2.7,0.6L1406.4,230.8z"/>
+		<path class="st3" d="M1399.3,236.1c3.9-0.7-0.2,4.6-1,1.2C1398.5,237,1399,236.4,1399.3,236.1z"/>
+		<path class="st3" d="M1471.2,242.1c0.7-0.2,2.2-0.6,2.9-0.7c0.5,2,0.9,4-0.2,5.9C1472.3,246.1,1469.6,244.5,1471.2,242.1z"/>
+		<path class="st3" d="M1509.2,243.1c1.5-0.3,2.1,0.3,2,1.8c-0.5,2.2-3,0.5-2.6-1.1L1509.2,243.1z"/>
+		<path class="st3" d="M1482.8,253c0.7-2.2-0.3-6.4,3.2-6.3c-0.1,1.6-0.2,3.3-0.6,4.9c-0.1,0.5-0.4,1.6-0.5,2.2
+			C1484.4,253.6,1483.3,253.2,1482.8,253z"/>
+		<path class="st3" d="M1461.2,248.3c1,0,2.1-0.1,3.2-0.1c0.2,2.2,1,4.6,3.7,4.7c-1.1,1.4-2.9,2.2-4.6,1.6
+			C1461.5,253,1461.4,250.5,1461.2,248.3z"/>
+		<path class="st3" d="M1411.7,255.1c0.6-0.5,1.8-1.4,2.4-1.9c1.8,1.9,3.3,4.1,4.9,6.2c-1.8-0.1-3.5-0.1-5.2-0.2
+			C1412.8,258,1411.7,256.8,1411.7,255.1z"/>
+		<path class="st3" d="M1520.2,253.8c1.7,2,3,4.9,6,4.9c0.2,0.2,0.6,0.5,0.7,0.7c-2.7-0.2-5.4-0.6-8.1-1c0.2-0.5,0.5-1.6,0.6-2.2
+			C1519.7,255.6,1520.1,254.4,1520.2,253.8z"/>
+		<path class="st3" d="M1714.6,265.7c-1.9-1.7-2.7-4.1-1.2-6.4c0.7,0.7,1.4,1.5,2.2,2.2C1715.2,262.9,1714.9,264.3,1714.6,265.7z"/>
+		<path class="st3" d="M18.2,314.3c1.2,0,2.4,0,3.5,0c-0.3,1.8,0.9,4.6-1.5,5.2C17.9,318.7,18.2,316.2,18.2,314.3z"/>
+		<path class="st3" d="M1720.7,322.1c2.8,1.8,2.2,5.7,1.7,8.5l-1.7,0C1720.2,327.8,1720.4,324.9,1720.7,322.1z"/>
+		<path class="st3" d="M9.3,330.4c3.2-0.7,2.9,5.7-0.2,4.8C6.5,334.8,7.2,330.8,9.3,330.4z"/>
+		<path class="st3" d="M19.4,371.6c1.1-0.1,2.2-0.2,3.3-0.3c0.3,1.2,0.7,2.4,1,3.6c-0.8,1.5-2.4,2.4-4,2.9
+			C19.6,375.8,19.5,373.7,19.4,371.6z"/>
+		<path class="st3" d="M12.7,410.1c1.7,0.3,4.1-0.3,4.8,1.8c0,2.6-3,2.4-4.8,2.4C12.7,413,12.7,411.6,12.7,410.1z"/>
+		<path class="st3" d="M12,476.2c2.3-0.5,4.7-0.1,7,0.3c-0.3,1.8-0.8,4.2-3.1,4.1C13.2,481.3,12.9,477.9,12,476.2z"/>
+		<path class="st3" d="M20.3,484.6c0.6,0,1.7-0.1,2.3-0.1c0.7,0.6,1.3,1.2,2,1.8c-0.7,1.5-1.2,3-2.1,4.3c-0.9,1.3-2.6,0.6-4,0.8
+			C18.1,488.9,18.9,486.6,20.3,484.6z"/>
+		<path class="st3" d="M558,490.5c1.6-0.7,2.9,2.1,1.7,3.1C558,494.5,556.7,491.5,558,490.5z"/>
+		<path class="st3" d="M12.3,499c1-1.2,1.9-2.8,3.8-2.5c1.9,1.2,2,4,0,5.1C14.2,501.9,13.4,500,12.3,499z"/>
+		<path class="st3" d="M840.3,506.8c1.3-0.6,2.5-1.2,3.8-1.9c-0.6,4.1-1,8.2-1.8,12.4c0.1-1.7,0.1-3.3,0.1-5
+			C842,510.3,841.2,508.5,840.3,506.8z"/>
+		<path class="st3" d="M1717.8,514.1c0.5,2.1,1.2,5.1-1.2,6.3c-2.1,1.2-1.6-2.4-2-3.6c0.8-0.1,2.4-0.3,3.2-0.4
+			C1717.8,515.9,1717.8,514.7,1717.8,514.1z"/>
+		<path class="st3" d="M23,523.9c0.5-1.8,1.1-3.5,1.7-5.1c0.7,0.2,2.1,0.7,2.9,1c0.3,1.3,0.6,2.7,1,4
+			C26.7,523.7,24.8,523.8,23,523.9z"/>
+		<path class="st3" d="M1721.8,519.2c0.9,0.1,1.9,0.2,2.8,0.3c-0.2,1-0.6,2.9-0.8,3.8c1.3,0.5,2.7,1,4.1,1.6c-1.7,2-4.2,1.7-6.5,1.7
+			c-0.7-0.8-1.3-1.7-2-2.5C1720.5,522.6,1721.3,521,1721.8,519.2z"/>
+		<path class="st3" d="M662.8,523.3c-0.8-1.4-0.5-2.7,0.8-3.6c1.7,0.3,2.2,1.9,3,3.2C665.7,523.1,663.8,523.2,662.8,523.3z"/>
+		<path class="st3" d="M1707.9,520.5c0.5-0.1,1.5-0.2,1.9-0.2c0.5,2.3,0.6,4.8-0.5,6.9c-1.4-1.3-2.8-2.7-4.1-4.1
+			c0.5-0.6,1.5-1.8,1.9-2.4C1707.3,520.6,1707.7,520.5,1707.9,520.5z"/>
+		<path class="st3" d="M494.1,522.5c1.1,0.9,2.4,1.8,3.4,2.9c0.2,1.4,0.1,2.8,0.1,4.2c-0.4,0-1.2-0.1-1.6-0.2
+			c-0.7-1.9-1.4-3.8-2.2-5.6C493.8,523.5,494,522.9,494.1,522.5z"/>
+		<path class="st3" d="M664.7,529.2c2.2,0.2,4.3,0.7,6.3,1.6l0.4,0.8c-1.1,1.2-2.1,2.5-2.8,4.1C667.2,533.5,665.9,531.4,664.7,529.2
+			z"/>
+		<path class="st3" d="M500.7,531.9c0.8-0.9,1.8-1.7,2.8-2.3c0.1,2.2,0.1,4.4,0,6.6c-0.7-0.5-2.1-1.5-2.8-2
+			C500.7,533.6,500.7,532.5,500.7,531.9z"/>
+		<path class="st3" d="M21.8,542.9c1.6-1.4,3.5-2.2,5.5-2.8c0.9,1.6,2.6,4.5-0.2,5.4C25,545.6,23.4,544.1,21.8,542.9z"/>
+		<path class="st3" d="M158.4,554c-0.2-4.5-1.7-9.2,0.4-13.5c1,1.3,1.9,2.6,2.5,4.2c-0.9-0.7-1.8-1.4-2.7-2
+			c1.7,15.4,0.9,30.9,1,46.3c-0.1,10.5,0.3,21-1.4,31.4c-1.4-0.7-2.8-1.5-4.1-2.3c0.6-1.6,2.2-2.5,3.4-3.6c0.2-1.3,0.3-2.5,0.5-3.8
+			c0.3-2.7,0.3-5.4,0.4-8.1c0-1.2,0.1-2.5,0.1-3.7c0-1.2,0.1-2.4,0.1-3.6c0.2-2.5,0-4.9-0.8-7.2c0.7-2.4,1.1-4.8,1.3-7.2
+			c0.1-2.5,0-5-0.1-7.5C158.8,567,158.8,560.5,158.4,554z"/>
+		<path class="st3" d="M179.2,541.4c2.2,0.3,6-0.4,6.6,2.5C184.4,547.2,178.1,545.1,179.2,541.4z"/>
+		<path class="st3" d="M1729.3,542.5c1.2,0,2.4,0.1,3.7,0.1v3.4c-1.2-0.6-2.5-1.1-3.7-1.7C1729.3,543.8,1729.3,542.9,1729.3,542.5z"
+			/>
+		<path class="st3" d="M3,553.7c-2.8-0.6-1.7-3.6-1.5-5.5c1.5,0.3,2.9,0.8,4.2,1.6C5.8,551.6,4.5,552.8,3,553.7z"/>
+		<path class="st3" d="M472.2,551.3c1.2-2.7,3.1,0.1,3.8,1.6c0.3,0.5,0.8,1.5,1,2c0.1,0.9,0.2,2.7,0.3,3.6
+			C474.9,556.8,471.7,554.5,472.2,551.3z"/>
+		<path class="st3" d="M19.1,554.6c0.6-0.2,2-0.6,2.6-0.8l0.7-0.2c0.1,0.5,0.3,1.5,0.5,2c-0.2,1.3-0.4,2.6-0.7,3.9
+			c-0.8-0.2-2.4-0.7-3.3-1C19,557.2,19,555.9,19.1,554.6z"/>
+		<path class="st3" d="M176.9,556.1c0.5-2.4,3.2-1.6,4.9-1.6c-0.4,1.6-0.2,3.6-1.7,4.8C178.2,559.8,175.6,558.1,176.9,556.1z"/>
+		<path class="st3" d="M508.3,554.1c1.9-0.7,2.8,2.6,0.7,2.9C507.2,557.5,506.4,554.5,508.3,554.1z"/>
+		<path class="st3" d="M483.9,554.8c0.5-0.1,1.5-0.2,2-0.2c0.3,0.3,0.9,1,1.2,1.3c0.1,0.9,0.2,2.6,0.2,3.5c-1.2,0-2.5,0-3.8,0
+			C483.7,557.9,483.8,556.3,483.9,554.8z"/>
+		<path class="st3" d="M681.9,563c-0.5-2.6,3.5-2.3,2,0.1C683.3,563.1,682.4,563,681.9,563z"/>
+		<path class="st3" d="M456,577.1c-0.1-5.5,2.4-10.4,3.5-15.6c0,1.1,0.1,3.2,0.2,4.3c1.3,0.7,2.5,1.4,3.8,2.1
+			c-1.8,1-4.6,1.3-5.2,3.6c-1.6,5,0.4,10.2,0.3,15.2c1.1,1.4,2.3,2.8,3.2,4.3c-1,0.1-2.1,0-3.1,0c-0.4,0.7-0.8,1.5-1.2,2.2
+			c-1.5,0.4-3.4,0.2-4.4,1.5c0.1,1,0.2,2,0.4,3.1c-0.5,1.5-0.8,3-1.2,4.6l-0.1-0.4c-0.7-4.9,0.3-9.7,1.3-14.4
+			c0.2,1.6-0.6,4.1,0.6,5.3c2.3-1.1,1.8-4.4,2.7-6.5c-0.8,0-2.3,0-3.1,0.1c0.3-1.2,0.5-2.3,0.8-3.5c1.1,0.5,2.1,1,3.2,1.5
+			c-0.2-0.9-0.4-1.8-0.6-2.7c-0.7-0.2-2.1-0.5-2.9-0.7C454.8,579.8,455.4,578.5,456,577.1z"/>
+		<path class="st3" d="M705.2,567.2c1.6-0.5,2.2,0,1.6,1.7C705.2,569.4,704.7,568.8,705.2,567.2z"/>
+		<path class="st3" d="M1710.5,568.5c0.4,0,1.3,0.1,1.7,0.1c1.2,1,2.4,1.9,3.7,2.9c-1.4,0-2.7,0-4,0.1c-0.6,1.1-1.2,2.2-1.8,3.3
+			c-0.7-0.1-2.2-0.2-2.9-0.2C1707,572,1708.6,570.1,1710.5,568.5z"/>
+		<path class="st3" d="M1717.8,570.4c0.9-0.8,1.9-1.7,3-2.4c0.9-0.1,2.8-0.3,3.7-0.4c-0.2,0.8-0.6,2.3-0.7,3.1
+			C1721.8,570.6,1719.8,570.5,1717.8,570.4z"/>
+		<path class="st3" d="M5.8,570.6c1.2-0.1,2.3-0.2,3.5-0.2c-0.3,1.4-0.5,2.9-0.8,4.3c-1.6,0.2-3.2,0.5-4.8,0.6
+			C3,573.5,5.2,572.1,5.8,570.6z"/>
+		<path class="st3" d="M1729.8,582.8c-2.5-2.3-2.4-7.4,1.2-8.6c0.1,2.3,0.2,4.7,0.2,7C1730.9,581.6,1730.2,582.4,1729.8,582.8z"/>
+		<path class="st3" d="M1708,577.5c0.5,0,1.6,0,2.1,0c0.5,1.7,1.9,3.4,3.9,2.6c0.5-0.2,1.5-0.4,2-0.6c0.9-0.2,2.6-0.6,3.5-0.9
+			c-0.2,2.5-1.4,4.6-3.3,6.3c-0.8-1.3-1.6-2.6-2.4-3.8c-1,0.3-1.8,0.8-2.5,1.5c-0.4-0.8-0.8-1.6-1.1-2.4
+			C1709.4,579.2,1708.7,578.3,1708,577.5z"/>
+		<path class="st3" d="M469.6,577.6c1.5,1.3,2.3,3.1,0.8,4.8l-2-0.6C468.8,580.4,469.2,579,469.6,577.6z"/>
+		<path class="st3" d="M482,578.6c0.9-0.2,1.8-0.3,2.7-0.5c0.4,1.2,0.5,2.4,0.3,3.6c-0.6-0.2-1.7-0.5-2.2-0.7
+			C482.6,580.5,482.2,579.2,482,578.6z"/>
+		<path class="st3" d="M502.2,588.2c-2.1-1.9-0.6-4.6,2-4.8c-0.1,1.4-0.2,2.9-0.3,4.3C503.5,587.8,502.6,588.1,502.2,588.2z"/>
+		<path class="st3" d="M466.4,586.6c0.2-0.5,0.7-1.5,0.9-2c1.4,0.8,2.8,1.6,4.2,2.4c-0.8,0.8-1.5,1.7-2.3,2.5l-1.1-1.2
+			C467.5,587.8,467,587.2,466.4,586.6z"/>
+		<path class="st3" d="M491.2,591.2c1.1-0.8,2.1-0.3,2.9,1.3c0.7,1.1,1.3,2.2,2.1,3.4c-1.8-0.7-3.6-1.3-5.4-1.9
+			C490.9,593.3,491.1,591.9,491.2,591.2z"/>
+		<path class="st3" d="M22.5,594.5c1.4,0,2.8,0.3,4.2,0.5c0.1,1.2,0.2,2.4,0.3,3.6c-1.5,0.1-3,0.2-4.4,0.3
+			C22.5,597.4,22.4,596,22.5,594.5z"/>
+		<path class="st3" d="M13,596.4c0.9,0.1,1.8,0.3,2.7,0.4l0.2,0.7c-0.1,0.8-0.4,2.4-0.5,3.2c-1.1-0.2-2.1-0.4-3.2-0.5
+			C12.5,598.9,12.8,597.7,13,596.4z"/>
+		<path class="st3" d="M0,597.7c0.6,2.7,1.9,5.2,3.8,7.3c-1.3,1-2.5,2.1-3.8,3.2V597.7z"/>
+		<path class="st3" d="M220.1,605.9c0.9-3,2.1-6,4.8-7.8c0.7,0.4,2.1,1.2,2.8,1.6c-0.1,0.8-0.2,2.5-0.3,3.3
+			C225,604.2,222.6,605.2,220.1,605.9z"/>
+		<path class="st3" d="M494.6,603.7l1.4-0.3c0.5,0.4,1.6,1.3,2.2,1.8c0,0.8,0,2.4,0,3.1c-0.8,0-2.5-0.1-3.4-0.2
+			C494.8,606.6,494.7,605.2,494.6,603.7z"/>
+		<path class="st3" d="M198.1,609.9c-0.3-1.5-0.5-5,1.9-4C202.9,607,200.8,610.9,198.1,609.9z"/>
+		<path class="st3" d="M454.8,607.4c1.9-0.3,2.7,1,3.2,2.6c0.8,0.8,1.7,1.6,2.5,2.5c-1.2,1.7-2.3,3.4-3.3,5.3c1.3,1.2,2.7,2.4,4,3.6
+			c-2.2,0-4.4-0.3-6.5,0.2c-2.3,0.9-1.7,3.8-2.2,5.7c-0.4-2.8-0.5-5.6-0.5-8.4c0.6-0.1,1.7-0.2,2.3-0.3c0.2-2.5,0.5-4.9,0.9-7.3
+			C455,609.9,454.8,608.6,454.8,607.4z"/>
+		<path class="st3" d="M0,616c1.2,0.3,2.5,0.6,3.7,0.8c-0.5,0.7-0.9,1.5-1.4,2.2C1.6,620,0.8,621,0,622V616z"/>
+		<path class="st3" d="M1158.7,616.3c1.4,0,2.8,0,4.3,0.1l0.9,0l-0.1,0.5c-0.2,1.4-0.6,4.4-2.8,3.5
+			C1158.8,620.3,1158.7,617.9,1158.7,616.3z"/>
+		<path class="st3" d="M12,618.8c0.5-0.1,1.6-0.4,2.1-0.5l1-0.2c0.2,1.3,0.5,2.6,0.8,4c-1.2,0.2-2.3,0.5-3.5,0.8
+			C12.3,621.5,12.1,620.2,12,618.8z"/>
+		<path class="st3" d="M1709.3,618.5c1.4,0.1,2.9,0.2,4.2,0.8c-0.9,0.5-1.8,1-2.7,1.4c-1.1,0.2-2.1,0.5-3.2,0.8
+			c-1.1,0.3-2.1,0.6-3.2,0.9c-0.1-0.1-0.2-0.2-0.3-0.3C1706.3,621.5,1708.2,620.4,1709.3,618.5z"/>
+		<path class="st3" d="M142.8,620.9c0.5,0.3,1.4,0.8,1.9,1.1c0.9,1.8-0.1,3.5-1.1,5c-0.9-1.3-1.8-2.5-2.7-3.8
+			C141.4,622.6,142.4,621.4,142.8,620.9z"/>
+		<path class="st3" d="M0,623c1.6,0.6,3.1,1.3,4.7,2c-0.9,2-2.8,3-4.7,3.9V623z"/>
+		<path class="st3" d="M480.4,623.6c1.2-0.1,2.5-0.1,3.7-0.2c0.2,0.9,0.5,1.9,0.7,2.9c-0.2,0-0.6,0.2-0.8,0.2
+			c-0.5,0.1-1.3,0.4-1.8,0.6c-0.4-0.2-1.1-0.5-1.5-0.7C480.6,625.4,480.5,624.5,480.4,623.6z"/>
+		<path class="st3" d="M17.7,629.1c0.6-1,2.4-3.2,3.3-1.3c2.1,3.6,4.3,9.2,0.1,12.2c-0.2-0.5-0.7-1.5-0.9-2.1
+			C19.4,635,17.7,632.1,17.7,629.1z"/>
+		<path class="st3" d="M464.2,627.2c1.8,0.3,3.6,0.5,5.5,0.9c0.2,0.5,0.6,1.6,0.8,2.2l-1.2-0.2c-0.6-0.1-1.9-0.2-2.6-0.3
+			c-1.3,0.5-2.5,1-3.8,1.5C463.4,629.9,463.8,628.5,464.2,627.2z"/>
+		<path class="st3" d="M710.7,626.6c1.2,0.4,2.4,0.8,3.6,1.3c-0.8,0.9-1.8,1.7-2.7,2.4C711.4,629.5,711,627.6,710.7,626.6z"/>
+		<path class="st3" d="M1548.6,628.5c1.6,0.5,3.4,0.8,4.7,1.9c0.6,1.4,1.1,2.9,1.6,4.3c-0.4-0.4-1.2-1.2-1.6-1.6
+			c-1.4,0.2-2.6,0.4-3.9,0.6c1.1-1.2,1.6-2.6,1.3-4.3c-0.6,0-1.7-0.1-2.3-0.1C1548.5,629.1,1548.5,628.7,1548.6,628.5z"/>
+		<path class="st3" d="M1278,628.8c2-0.2,4.2,0.1,5.2,2.1c-1.8,1.9-4.1,1.4-6,0.1C1277.4,630.5,1277.8,629.4,1278,628.8z"/>
+		<path class="st3" d="M477.9,638.3c0.8-1.8,1.6-3.6,2.3-5.4c0.2,3.3,0.4,6.6,0.7,9.9l0.9,0.3c0.6,0.2,1.8,0.6,2.4,0.8
+			c0.1,0.4,0.5,1.2,0.6,1.6c-0.8,0-2.2-0.1-3-0.2c-0.8-0.1-1.6-0.2-2.3-0.2c-0.6,0-1.8,0.1-2.3,0.1c-1.3-0.2-2.6-0.4-3.9-0.6
+			c0.9-0.9,1.9-1.7,2.8-2.6C476.7,640.8,477.3,639.5,477.9,638.3z"/>
+		<path class="st3" d="M9.8,635.1c1.1,0.2,2.1,0.4,3.1,0.8c0.1,0.9,0.4,2.5,0.6,3.4c-1.9,0-3.9,0-5.8-0.1c0.3-1.3,0.7-2.5,1-3.8
+			L9.8,635.1z"/>
+		<path class="st3" d="M464.9,635.2c1.8,0.2,3.7,0.5,5.5,0.7c0.1,0.9,0.3,1.8,0.4,2.7c-1.5,0.7-3.1,1.4-4.6,2.1
+			c-0.4-0.4-1.1-1.3-1.5-1.8C464.8,637.7,464.8,636.4,464.9,635.2z"/>
+		<path class="st3" d="M485.7,634.5c0.8,0.1,2.4,0.4,3.2,0.5c0.1,0.6,0.4,1.7,0.6,2.3c-1.2,0.4-2.3,0.8-3.5,1.2
+			C485.9,637.4,485.8,635.4,485.7,634.5z"/>
+		<path class="st3" d="M1708.3,639.3c1.5-1.1,2.7,1.7,1.5,2.6C1708.2,643.1,1707,640.2,1708.3,639.3z"/>
+		<path class="st3" d="M11.6,646.1c0.9-1.8,0.1-6.5,3.3-5.2c0.3,2.2,0.3,4.5,0.7,6.7c1.1,1.3,4.1,2.3,2.3,4.3
+			c-0.5,0.2-1.5,0.5-2,0.7C14.2,650.7,13.2,648.2,11.6,646.1z"/>
+		<path class="st3" d="M242,644.1c0.6-1.2,1.3-2.4,1.9-3.6c1,0.7,2.7,0.9,2.9,2.4C245.7,644.6,243.8,644.4,242,644.1z"/>
+		<path class="st3" d="M1722,644.1c-1.3-2.3,0.7-4,3-3.6c0.6,1.3,1.2,2.6,1.8,3.9C1725.2,644.4,1723.6,644.2,1722,644.1z"/>
+		<path class="st3" d="M706,643.2c0.5,0,1.4,0,1.9,0C709.4,645.7,705.1,645.8,706,643.2z"/>
+		<path class="st3" d="M1726.5,645.1c1.5-1.4,3.5-1.9,5.4-2.5c-0.6,1.6-1.2,3.2-1.8,4.8C1728.8,646.9,1727.1,646.7,1726.5,645.1z"/>
+		<path class="st3" d="M142.6,645.8c1.9-1.6,4.4-1.5,6.8-1.4c-0.4,1.7-0.7,3.5-1.1,5.2c-1.9,0.4-4,1.1-5.6-0.4
+			C142.6,648.1,142.6,646.9,142.6,645.8z"/>
+		<path class="st3" d="M497.6,644.4c1.4-1,2.6-0.8,3.5,0.4c-0.6,1.2-1.6,1.6-2.9,1.1C498,645.5,497.7,644.8,497.6,644.4z"/>
+		<path class="st3" d="M713.2,644.1c0.8-1.3,3.4-0.1,2.3,1.3C714.6,646.7,712,645.6,713.2,644.1z"/>
+		<path class="st3" d="M284,648.2c0.7-0.7,1.5-1.5,2.2-2.2c0.4,2.9-1.1,6.7-4.6,5.6c-0.1-1-0.2-2-0.4-3.1
+			C282,648.4,283.4,648.2,284,648.2z"/>
+		<path class="st3" d="M717.2,647.2c1.6-0.5,2.2,0,1.7,1.7C717.2,649.3,716.7,648.8,717.2,647.2z"/>
+		<path class="st3" d="M0,648.8c1.1,0.3,2.2,0.7,3.3,1c0.2,0.3,0.5,0.9,0.7,1.2c-0.3,1.3-0.6,2.6-1,3.9c-1-0.7-2-1.4-3-2.2V648.8z"
+			/>
+		<path class="st3" d="M474.5,650.8c0.4-0.3,1.1-0.8,1.4-1.1c0.7-0.1,2.2-0.2,2.9-0.2c-0.3,0.5-0.9,1.5-1.2,2
+			c-0.9,1.5-2,2.9-3.1,4.4C474.5,654.2,474.5,652.5,474.5,650.8z"/>
+		<path class="st3" d="M150.3,651.3c1.5,0,2.9,0.1,4.4,0.1c0.1,1.8-0.2,4.6-2.7,4C149.6,655.9,150.6,652.7,150.3,651.3z"/>
+		<path class="st3" d="M1727.1,651.3c0.5,0,1.6,0.1,2.1,0.1c0.5,0,1.5-0.1,1.9-0.1c-1.1,1.3-2.3,2.5-3.4,3.7
+			c-0.1,0.6-0.4,1.8-0.5,2.4c-1.8,0-3.5,0-5.2,0.1c0.8-1.2,1.6-2.5,2.5-3.7C1725.3,653,1726.2,652.2,1727.1,651.3z"/>
+		<path class="st3" d="M1715.7,654.9c-0.5-1.8,0.4-2.7,2.5-2.7l1.2,0.9c-0.1,0.9-0.3,2.6-0.4,3.5
+			C1717.9,656,1716.8,655.5,1715.7,654.9z"/>
+		<path class="st3" d="M1286.3,655.2c1.9-1.3,2.7,0.8,3.4,2.2C1288.1,657.7,1284.7,657.6,1286.3,655.2z"/>
+		<path class="st3" d="M0,656.3c2.2,2.8,2,6.4,0,9.2V656.3z"/>
+		<path class="st3" d="M254.4,660.5c-1.4-1.3-0.6-3.1,0.2-4.4c1.6,0.8,3.2,1.6,4.9,2.4c0.1,0.6,0.2,1.8,0.3,2.4
+			C258,661.1,255.6,662.3,254.4,660.5z"/>
+		<path class="st3" d="M487.6,658c0.9-0.2,1.9-0.3,2.8-0.5c0.4,1.3,0.8,2.6,1.3,3.9c-0.9,1.5-1.8,3-2.7,4.5c1.6,0.9,3.2,1.9,4.9,2.9
+			c-0.2,1.1-0.3,2.2-0.4,3.4c-1,0.4-1.9,0.8-2.8,1.2c-0.4,0.3-1.1,0.9-1.5,1.2c-0.5-0.3-1.5-0.9-2-1.2c-1.1,0-2.3,0.1-3.4,0.1
+			c-0.1-0.8-0.4-2.5-0.5-3.4c-1.2,1.3-5.5,2.4-3.2,4.6c2.2,1.9,4.4,3.9,5.7,6.6c-1,1.2-2,2.4-2.8,3.7c-0.5,0.9-1.1,1.8-1.6,2.7
+			c-1.5-1.4-3.1-2.8-4.8-3.9c-0.1-0.7-0.3-2.2-0.4-2.9c1.7,0.1,3.2,0.6,4.5,1.7c1.1-0.6,2.2-1.3,3.2-1.9c-3.8-2-7.7-4.3-9.9-8.1
+			c0.2-0.3,0.6-1,0.9-1.4c0.7-0.2,2-0.7,2.6-0.9c-0.7-3.4-1.2-6.8-1.6-10.2c1.1,0.7,2.1,1.5,3.2,2.3l0.8,0.7
+			c0.8-0.4,2.5-1.2,3.3-1.5c0.5,1.2,0.9,2.4,1.4,3.7c0.9-0.2,1.8-0.4,2.7-0.5C487.5,662.2,487.6,660.1,487.6,658 M485.6,667.2
+			c-0.6,1.4-1.1,2.8-1.6,4.1c1.4,0.7,2.8,1.3,4.2,2c0.6-1.5,1.2-3.1,1.8-4.7C488.5,668.2,487.1,667.7,485.6,667.2z"/>
+		<path class="st3" d="M150,659.8c2.3-0.1,4.6-0.1,6.8-0.1c0.2,5.5,0.3,11.1-0.5,16.6l-0.3,1.1c-0.5-0.7-1.4-2.1-1.8-2.8
+			c-0.3-0.2-0.8-0.4-1-0.6c-1.3-0.8-2.6-1.5-3.9-2.2c1.8-2.1,4.4-2,6.9-1.4c0.1-2.2,0.3-4.3,0.1-6.4
+			C154.1,662.7,151.5,662,150,659.8z"/>
+		<path class="st3" d="M262.3,663.5c1.1-0.1,2.2-0.1,3.4-0.2c1,2.1,1.9,4.2,2.8,6.4c-1.9-0.1-3.9-0.2-5.8-0.3
+			C262.5,667.5,262.4,665.5,262.3,663.5z"/>
+		<path class="st3" d="M1707.4,663.1c1-1.2,3.3,0.3,2.3,1.7C1708.8,665.8,1706.5,664.4,1707.4,663.1z"/>
+		<path class="st3" d="M1720.8,668.1c0.7-0.3,2.2-0.9,2.9-1.3c1.4,0.1,2.8,0.2,4.3,0.4c0.8,0.5,1.5,1.1,2.3,1.7
+			C1727.1,669.3,1723.7,669.8,1720.8,668.1z"/>
+		<path class="st3" d="M1546.4,669.5c1,0,2-0.1,3.1-0.1c0.1,1.1,0.1,2.3,0.2,3.4c-1.1-0.1-2.2-0.2-3.3-0.3
+			C1546.4,671.5,1546.4,670.5,1546.4,669.5z"/>
+		<path class="st3" d="M506.8,675.8c1.7-1.5,3.9-1.9,6.1-2.3c1.1,0.9,2.2,1.9,3.3,2.9c-1.9,0-3.7,0-5.6,0c-0.1,1.3-0.1,2.6-0.2,4
+			c-0.5,1.4-2.5,2.8-1.5,4.4c2.8-1,5.5-2.2,8.5-2.6c-1.4,1.2-2.8,2.3-4.2,3.5c0.4,1.4,0.8,2.7,1.3,4.1c-1.6,2.1-3.1,4.3-4.5,6.5
+			c-0.5,0.1-1.4,0.4-1.8,0.6c0.2-1.5,0.4-3.1,0.6-4.6c1.2-1,2.4-2,3.6-3c-2.7-1.7-5.2-3.7-7.2-6.3
+			C505.5,680.6,504.4,677.4,506.8,675.8z"/>
+		<path class="st3" d="M1720.8,684.9c4.3-2.6-0.6-8.1,2.2-11c1.6,0.8,1.4,2.9,2.1,4.3c0.8,0.1,1.6,0.2,2.4,0.3
+			c0.3-0.5,0.9-1.6,1.2-2.2c0.7-0.1,2.1-0.3,2.8-0.5c0.4,0.2,1.1,0.6,1.5,0.8v4.3c-1.9,0.1-3.8,0.2-5.7,0.3
+			c-0.7,0.9-1.3,1.8-1.9,2.7c1.2,0.8,2.4,1.9,3.1,3.3c-0.4,0.5-1.1,1.4-1.5,1.9c-1.6,1.5-3.5,2.7-5.4,3.8c0.7-2.4,1.4-4.8,2.1-7.2
+			c-0.9,0.9-1.8,1.8-2.6,2.7c-0.8-0.4-2.3-1-3.1-1.4C1718.9,686.4,1719.9,685.7,1720.8,684.9z"/>
+		<path class="st3" d="M494.5,674.9c2.7,1.2,4.9,3.1,6.8,5.3c-0.5,0.6-1.6,1.8-2.1,2.4c-1.5-1.4-3.1-2.8-4.8-3.9
+			C494.4,677.8,494.5,675.8,494.5,674.9z"/>
+		<path class="st3" d="M1711.5,680.8c2.3-2,5.1-3.3,7.8-4.5c0.2,3.4-2.8,5.5-5.4,7.1C1712,683.8,1711.2,682.9,1711.5,680.8z"/>
+		<path class="st3" d="M1703.4,682.4c-0.6-2.2,0.6-3.8,2.3-5c0.7,0.4,2.1,1.2,2.8,1.7c-0.1,0.6-0.2,1.8-0.3,2.4
+			C1706.6,681.7,1705,682,1703.4,682.4z"/>
+		<path class="st3" d="M6.6,680c1.1-0.5,2.2-1.7,3.4-1c1.9,0.4,1.8,2.6,2.5,4c-4.2,0.9-8.4,1.5-12.5,2.8v-4.6
+			C2.3,681.4,4.9,682.1,6.6,680z"/>
+		<path class="st3" d="M700.2,683c1.7,0.2,3.4,0.8,3.9,2.6c-1.4,0.1-2.7,0.1-4,0.2C700.2,685.1,700.2,683.7,700.2,683z"/>
+		<path class="st3" d="M518.6,686c0.9-1.3,1.7-1.3,2.6,0.1c-0.1,0.5-0.4,1.6-0.5,2.1C519.3,688.1,518.6,687.3,518.6,686z"/>
+		<path class="st3" d="M1711.2,685.5c1.9-1.1,3.1,3.1,0.9,3.3C1710.5,688.7,1710.1,686.5,1711.2,685.5z"/>
+		<path class="st3" d="M1732.2,685.9l0.8-0.3v1.8c-0.3-0.2-0.9-0.5-1.2-0.7L1732.2,685.9z"/>
+		<path class="st3" d="M369.3,690.5c-1.2-3.2,4.2-4.5,5-1.5C374.1,691.8,371.1,690.3,369.3,690.5z"/>
+		<path class="st3" d="M498,692.3c0.2-1.4,0.4-2.8,0.7-4.2c0.4,0.5,1.3,1.5,1.8,2c0.7,1.1,1.3,2.3,2,3.5c-0.9,0.7-1.7,1.4-2.6,2
+			c-1.3,0.1-2.6,0.2-3.8,0.3c0.3-0.5,0.8-1.4,1.1-1.9c0.3-0.2,0.9-0.7,1.2-0.9L498,692.3z"/>
+		<path class="st3" d="M1134.3,690c0.6-0.4,1.9-1.3,2.6-1.7c1.2,2,2.7,3.9,3.7,6c-0.8,0.6-1.7,1.1-2.6,1.6
+			C1135.6,694.9,1135.3,692,1134.3,690z"/>
+		<path class="st3" d="M256.3,691.3c1.5-1,3.4-1.1,5.2-0.9c1,0.7,1,2,1.5,3c-0.8,0.2-2.4,0.7-3.2,0.9c-1.1,0.1-2.1,0.1-3.2,0.2
+			C256.5,693.5,256.4,692.4,256.3,691.3z"/>
+		<path class="st3" d="M516.8,692.8c1.7-1.2,3.5-2.5,5.3-3.6c0.4,0.3,1.2,1,1.6,1.3c-0.2,1-0.5,1.9-0.8,2.9l-0.1,0.3
+			c0.5,2,0.8,4.1,1.1,6.2c-0.3-0.1-0.9-0.3-1.2-0.4c-1.1-1.4-2.2-2.8-3.3-4.1C518.5,694.6,517.7,693.7,516.8,692.8z"/>
+		<path class="st3" d="M1709.3,691.6c0.9-0.9,1.9-1.7,2.9-2.5c0.4,1.5,0.8,3.3-0.8,4.2C1710.9,692.9,1709.9,692.1,1709.3,691.6z"/>
+		<path class="st3" d="M273.2,693.3c1.9-0.3,4.3,0.8,5,2.7c-1,1.3-2.7,2-4.3,1.3C272,696.9,270.6,693.9,273.2,693.3z"/>
+		<path class="st3" d="M527.5,693.9c0.7-1.7,2.8-0.5,3.9,0C530.7,695.9,527.9,696.5,527.5,693.9z"/>
+		<path class="st3" d="M1267.1,693.8c0.8,0,1.5,0,2.4,0c0.6,1.5,1.6,2.8,3.2,3.4c-0.4,3.2-1.2,6.4-3.2,9l0.5,0.9
+			c1.2,2,1,4.1-0.7,5.7c-0.8-1.1-1.6-2.1-2.4-3.2c0.8-2,1.6-4.1,1.8-6.3c0.1-2.2,0.1-4.3,0.2-6.5c-0.9-0.3-1.7-0.6-2.6-0.8
+			C1266.5,695.4,1266.9,694.3,1267.1,693.8z"/>
+		<path class="st3" d="M1295.1,693.8c0.6,0.1,1.8,0.4,2.4,0.6c-0.3,1.5-0.6,3-0.9,4.4c-0.2,0.6-0.6,1.8-0.7,2.3
+			c-0.7,0-2-0.1-2.7-0.1C1293.9,698.7,1294.5,696.3,1295.1,693.8z"/>
+		<path class="st3" d="M2.8,696.5c3.1-0.1,6.6-1.6,9.4,0.2c1.7,0.6,1.1,2.6,1.4,4c-1.7-0.3-3.3-0.6-5-0.9c-0.4,0.3-1.3,1-1.7,1.4
+			c-0.3-1.1-0.7-2.2-1-3.3C5,697.4,3.9,697,2.8,696.5z"/>
+		<path class="st3" d="M510.9,697.6c2.2-0.5,4.7-1.9,6.7-0.1c-1.5,1.2-3,2.2-4.6,3.2C512.3,699.7,511.6,698.6,510.9,697.6z"/>
+		<path class="st3" d="M132.8,698.3c2.7,0.1,5.3,0.2,8,0.2c-1.4,1.6-2.6,3.4-4.2,4.8c-1.3,0.2-2.5,0.2-3.8,0.2
+			c-0.1-0.7-0.3-2.1-0.4-2.8C132.5,699.9,132.6,699.1,132.8,698.3z"/>
+		<path class="st3" d="M503.5,699.2c0.8-0.1,2.5-0.3,3.3-0.4c0,1.3,0,3.6-1.9,3.4C502.9,703.1,503.7,700.2,503.5,699.2z"/>
+		<path class="st3" d="M1136.2,699c1.7-0.5,2.2,0.1,1.7,1.7C1136.2,701.1,1135.7,700.6,1136.2,699z"/>
+		<path class="st3" d="M1597.4,700.2c0.4-0.6,1.2-1.8,1.7-2.4c0.6,1,1.2,2.1,1.9,3.2c-0.1-0.5-0.3-1.6-0.3-2.2c2.1,2.2,2,5.6,4,8
+			l-0.1,0.2c-0.6,0.7-1.1,1.3-1.6,2c-0.7,1.2-1.3,2.5-1.9,3.8c-0.4-0.5-1.3-1.4-1.7-1.9l-0.4-0.8c1-1.1,2-2.1,3-3.2
+			c-0.7-1-1.3-1.9-2-2.8c-1.1-0.9-2.2-1.8-3.3-2.7C1596.8,701,1597.2,700.5,1597.4,700.2z"/>
+		<path class="st3" d="M1716,700c1-0.2,2-0.4,3-0.6c0.4,0.7,0.8,1.4,1.3,2.2c-1,0.1-2.9,0.3-3.8,0.4
+			C1716.4,701.5,1716.1,700.5,1716,700z"/>
+		<path class="st3" d="M1275.7,703c1.1-0.8,2.1-1.5,3.2-2.3c0.3,0.6,0.8,1.8,1.1,2.4c-1.4,2.9-2.7,5.9-3.9,9c0.5,0.4,1.5,1.3,2,1.7
+			c-0.3,0.3-0.9,0.9-1.2,1.2c-0.2-0.4-0.7-1.1-0.9-1.5c-0.2-0.3-0.5-0.8-0.7-1.1c-0.4-0.4-1.3-1.3-1.7-1.7c0.1-0.3,0.2-0.8,0.2-1
+			c0.7-1.3,1.6-2.5,2.4-3.6C1276.2,705.3,1275.9,703.8,1275.7,703z"/>
+		<path class="st3" d="M1283.1,709.2c1.4-3.5,3-7.2,6.8-8.5c0.4,0.5,1.1,1.4,1.5,1.9c-2,2.2-3.8,4.5-5.4,7
+			C1285,709.5,1284,709.3,1283.1,709.2z"/>
+		<path class="st3" d="M1702.9,712.8c-0.3-4.1-1.3-8.3,0.3-12.3c-0.1,1.9-0.1,3.9-0.1,5.8c3.9,0.7,7.6,2.5,11.7,2.2
+			c0,0.5-0.1,1.4-0.1,1.9c0,0.4-0.1,1.2-0.1,1.7c-1,4.1-5.3,5.9-7.7,9c-0.8,0.8-1.6,1.5-2.4,2.2c-0.2-0.8-0.4-2.4-0.6-3.1
+			c1.1-1,2.2-2,3.3-3.1c0.6-1.5,1.1-3.1,1.7-4.6c1.6,0.1,3.1,0.2,4.7,0.2C1710.9,709,1705.8,710.5,1702.9,712.8z"/>
+		<path class="st3" d="M488.3,703.7c2-0.9,2.9,1.4,3.9,2.7c0,0.4-0.1,1.1-0.1,1.5c-0.1,0.7-0.2,2-0.3,2.7c-1.6-1.5-3.2-3.1-4.8-4.6
+			C487.3,705.4,488,704.3,488.3,703.7z"/>
+		<path class="st3" d="M1123.2,704.4c1.5,0,2.9-0.1,4.4,0.1c1.7,1.6,0.3,3.7-0.7,5.2c-1.1-0.1-2.2-0.1-3.3-0.2
+			C1123.4,707.8,1123.3,706.1,1123.2,704.4z"/>
+		<path class="st3" d="M1303.4,704.2c1.5-0.1,3.1-0.1,4.7-0.1c-0.6,1.6-1.1,3.3-1.7,4.9c-0.9-0.3-1.8-0.5-2.6-0.8
+			C1303.6,706.8,1303.5,705.5,1303.4,704.2z"/>
+		<path class="st3" d="M1310.3,708.4c0.7,0,2.2,0.2,2.9,0.2l0.6,0.6c-0.1,0.4-0.3,1.1-0.5,1.4c-1.1,0.8-2.3,1.5-3.4,2.3
+			c0.3,1.6,0.6,3.3,0.9,4.9c-0.8-0.4-1.6-0.7-2.3-1c-1.4-0.6-2.8-1.2-4.1-1.8c0.1-1,0.1-1.9,0.3-2.9c0.1-0.2,0.4-0.7,0.5-0.9
+			c1,0,3,0.1,4,0.1C1309.5,710.3,1309.9,709.3,1310.3,708.4z"/>
+		<path class="st3" d="M1563.4,711.9c1.6-1.6,3.3-3.5,5.8-3.6c1,1.5-0.2,2.8-0.9,4.1l-0.2,0.4c-1,1.6-1.9,3.1-2.9,4.7
+			C1564.5,715.7,1563.9,713.8,1563.4,711.9z"/>
+		<path class="st3" d="M1717.9,714.7c0.2-2.3,0.9-4.6,3.1-5.8c0.7,0,2,0.1,2.7,0.1c1,0.8,2,1.6,3.2,2.2c1.6,0.8,3.3,1.4,5,2
+			c-0.3,0.4-0.9,1.2-1.1,1.7c-2.2,2.5-4.4,5.1-4.2,8.7c-0.3,0.9-0.6,1.7-0.9,2.6c-0.9-1.8-1.9-3.8-1.6-5.9c0.1-3.1,2.2-8.3-2.4-8.9
+			c-0.4,0.2-1.1,0.6-1.5,0.8c-2.4,2.1,1.9,3.6,2.9,5.3c-2.4,0.4-4.7,0.4-7.1,0.2c0.3-0.5,0.7-1,1-1.5L1717.9,714.7z"/>
+		<path class="st3" d="M3.5,709.6c5.5-1.2,9.5,5.6,7.6,10.4c-0.9,1.7-3.5,2.1-4.8,0.7c-1.6-0.7,0-2.6,0.2-3.8
+			C5.3,714.6,3.1,712.4,3.5,709.6z"/>
+		<path class="st3" d="M1588.1,711.2c1.6-0.5,2.1,0.1,1.6,1.7C1588.2,713.5,1587.6,712.9,1588.1,711.2z"/>
+		<path class="st3" d="M241.1,715.6c0.6-1,1.2-2,1.8-2.9c2.1,0.3,3.6,1.8,4.2,3.8c-1.5,0.1-2.9,0.2-4.4,0.4
+			C242.3,716.5,241.5,715.9,241.1,715.6z"/>
+		<path class="st3" d="M358.6,713.2c1.1,0.5,2.3,0.9,3.4,1.4c1,0.4,2,0.9,3.1,1.3c-0.8,0.6-1.6,1.3-2.4,1.9
+			c-1.4-0.2-2.9-0.3-4.4-0.5C358.4,715.9,358.5,714.5,358.6,713.2z"/>
+		<path class="st3" d="M134.4,719.5c-0.1-2.7,1.2-6.6,4.7-6c1.5,1.1,1.3,3.2,1.8,4.9C138.8,719.1,136.6,719.5,134.4,719.5z"/>
+		<path class="st3" d="M1108.2,714.3c0.8,0.2,1.7,0.4,2.5,0.6c0.2,0.5,0.6,1.5,0.8,1.9c1.4,0.8,3.1,1,4.8,1.3
+			c-3,0.5-6.1,0.7-9.2,0.6C1107.5,717.2,1107.8,715.7,1108.2,714.3z"/>
+		<path class="st3" d="M1134.2,714.5c1.3,0.3,2.6,0.6,3.9,1c0.3,0.3,0.9,0.9,1.2,1.2c-0.6,0.6-1.9,1.8-2.5,2.3
+			C1135.6,717.7,1134.6,716.2,1134.2,714.5z"/>
+		<path class="st3" d="M1283.9,718.9c-1.5-1.2-0.2-4.8,1.9-3.7c1.4,0.4,1.5,2.1,2,3.2c0.5,0.5,1.5,1.4,2.1,1.9
+			C1287.9,722.7,1285.2,721,1283.9,718.9z"/>
+		<path class="st3" d="M1295.4,715.8c0.5-0.4,1.4-1.2,1.9-1.5c0.5,0.3,1.5,0.9,2,1.2c0.4,1.7,0.6,3.5,0.9,5.2
+			C1297.7,720.2,1296.5,717.9,1295.4,715.8z"/>
+		<path class="st3" d="M1397.2,715.4c0.5,0,1.6,0.1,2.1,0.2c0.1,0.5,0.4,1.6,0.6,2.1c-1.4,0.5-2.9,1-4.3,1.5c-0.3,0.1-1,0.2-1.3,0.3
+			c-0.5-0.1-1.6-0.4-2.1-0.6C1393.9,717.8,1395.5,716.6,1397.2,715.4z"/>
+		<path class="st3" d="M1583.3,716.1c0.5-0.3,1.4-0.8,1.9-1.1c0.9,0.6,1.7,1.2,2.6,1.9c-0.1,0.8-0.4,2.4-0.5,3.2
+			C1585.6,719,1583.5,718.3,1583.3,716.1z"/>
+		<path class="st3" d="M19.2,717.1c2.3-1.2,4.5,3.2,1.9,4.5C18.9,721.4,16.5,718.5,19.2,717.1z"/>
+		<path class="st3" d="M1.2,718c2.7-1.6,4.5,1.4,3.3,3.7c-0.9-0.1-2.7-0.3-3.6-0.4C0.9,720.5,1.1,718.8,1.2,718z"/>
+		<path class="st3" d="M1406.1,719.8c1.3-0.7,2.6-1.3,3.9-2c-0.2,1.9,0.4,5.2-2.2,5.5C1407.1,722.3,1406.5,721.1,1406.1,719.8z"/>
+		<path class="st3" d="M1274.1,719.1c1.4-1.7,2.5,1.3,3.4,2.1c-1.4,0.1-2.8,0.3-4.2,0.3C1273.5,720.9,1273.9,719.7,1274.1,719.1z"/>
+		<path class="st3" d="M1714.2,721.8c1.6-0.4,3.3-0.8,5-1.1l1-0.1c-0.3,0.5-0.9,1.7-1.2,2.2c-0.8,0.9-1.5,1.7-2.3,2.6
+			C1715,725,1714.7,723.3,1714.2,721.8z"/>
+		<path class="st3" d="M1285.7,727.2c-1.8-1.5-4.5-4.1-1.9-6.1c1.2,1.3,2.4,2.6,3.6,4C1287,725.6,1286.1,726.7,1285.7,727.2z"/>
+		<path class="st3" d="M1292.8,726.2c0.6-1.7,1.3-3.4,2.1-5c1.7,1.1,3.5,3,2.6,5.2C1296.1,727.8,1294.3,726.6,1292.8,726.2z"/>
+		<path class="st3" d="M1393,723.3c0.2-0.5,0.7-1.5,1-1.9c1.2,2.4,2.6,4.7,3.9,7c0.2,0.5,0.6,1.5,0.8,2c-0.8-0.2-2.5-0.5-3.3-0.6
+			C1394.5,727.6,1393.7,725.4,1393,723.3z"/>
+		<path class="st3" d="M1115.3,723.4c0.6,0,1.7,0.1,2.2,0.2c1,0.9,2.1,1.9,3.1,2.8c-0.9,0.3-1.7,0.7-2.6,1c-0.7,0.2-2.2,0.7-2.9,0.9
+			c-0.5,0.1-1.6,0.4-2.1,0.5C1113.8,727,1114.6,725.2,1115.3,723.4z"/>
+		<path class="st3" d="M1259.1,723.4c0.4,0.1,1.4,0.2,1.8,0.3c0,0.4,0.1,1.3,0.2,1.8c-0.2,0.4-0.7,1.3-0.9,1.7
+			c-0.8-0.7-1.6-1.4-2.4-2.1C1258.2,724.7,1258.8,723.9,1259.1,723.4z"/>
+		<path class="st3" d="M1266.6,723.6c1.2,1.3,3.8,2.5,2.7,4.6c-0.5,2.4-3.7,1.7-3.9-0.6C1265.8,726.4,1266.2,725,1266.6,723.6z"/>
+		<path class="st3" d="M1330.2,724.3c4.4,2.3,9.3,3.1,14.2,3.3c-2.5,0.1-4.9,0.2-7.4,0.2c-0.8,0.8-1.5,1.6-2.2,2.4
+			c-0.6-1.3-1.2-2.6-1.8-3.9c-1.1,0.7-2.2,1.3-3.3,2.1c-0.6,0.7-1.3,1.5-1.8,2.2c-0.8-0.2-2.4-0.6-3.2-0.9
+			C1324.4,726.6,1328.1,725.7,1330.2,724.3z"/>
+		<path class="st3" d="M1567.1,727.6c1.4-0.9,2.9-1.7,4.4-2.5c0,0.6-0.1,1.9-0.1,2.5c-0.8,0.8-1.7,1.5-2.5,2.3
+			c-0.3-0.1-1.1-0.3-1.4-0.4C1567.4,729,1567.2,728.1,1567.1,727.6z"/>
+		<path class="st3" d="M857.8,727.1c5.3-0.1,10.5-0.1,15.8,0.4c0.1,2.1,0.2,4.2,0.2,6.3c0,3.3-0.2,6.5-0.3,9.8
+			c-11.3-0.5-22.7-0.3-33.9-1.8c4.7-0.4,9.4-0.5,14.1-0.3c5.9,0.4,11.8,1.2,17.8,0.9c0.4-0.1,1.1-0.2,1.5-0.3
+			c0.1-4.6,0-9.2,0.2-13.8c-1.5,0-3.1,0-4.6,0c-1.3,0-2.6,0-3.9-0.1C862.3,728.1,860,727.6,857.8,727.1z"/>
+		<path class="st3" d="M1705.7,729c0.1-1.6,0.9-2.3,2.5-2c0,0.7-0.1,2-0.1,2.6c-0.4,0-1.3,0.1-1.7,0.1L1705.7,729z"/>
+		<path class="st3" d="M1727.2,727.2c1.4-1.1,2.6,1.4,1.3,2.2C1727,730.6,1725.8,728.1,1727.2,727.2z"/>
+		<path class="st3" d="M1733,729c-2.6,1.6-2.6-3.3,0-1.8V729z"/>
+		<path class="st3" d="M1.9,730.8c0.5-1.1,0.9-2.2,1.4-3.2c1.5,1.3,3,2.7,4.7,3.7c4.2-0.2,7.8-2.8,11.6-4.3c0,2,0.1,4.1,0.1,6.2
+			c-2.5,1.1-7.8,1-7.1,4.8c0,1.7,1.9,2.5,2.8,3.7l0.6,0.6c-0.7,0-1.9,0.1-2.6,0.1c0,1.3,0,2.6,0.1,3.9c1.3,0.3,2.6,0.5,3.9,0.8
+			c-1.6,1-3.1,2-4.7,2.9c-1.2-0.4-2.4-0.7-3.5-1.2c1-1.1,2-2.1,3.1-3.2c-0.8-0.5-1.5-1-2.3-1.5c-2.2,1.1-4.5,3.1-7,1.8
+			c0.1-0.7,0.2-2.2,0.2-3c0.3-3.7,1.4-7.7-0.3-11.3L1.9,730.8z"/>
+		<path class="st3" d="M1286.3,728c1,0.6,2.3,1,3.1,2c0.5,2-2.2,1.9-3.4,2.5C1286.1,731,1286.2,729.5,1286.3,728z"/>
+		<path class="st3" d="M1276.8,730.7c1.6-0.9,3.2-1.8,4.9-2.6c-0.2,2.4-0.8,5-3,6.5c-2.1-0.3-4.2-1.1-6.2-1.8
+			c0.1-0.5,0.3-1.3,0.5-1.8C1274.2,730.9,1275.5,730.8,1276.8,730.7z"/>
+		<path class="st3" d="M1294.3,733.3c0.5-1.3,0.9-3.1,2.6-3.3c0.5,1.1,0.7,2.3,0.9,3.6C1296.6,733.6,1295.4,733.5,1294.3,733.3z"/>
+		<path class="st3" d="M1314.3,730.3c1.1-1.4,3.1,0.2,2.8,1.7c0.7,1.9-2,2.6-3.3,2C1313.3,732.6,1313.5,731.4,1314.3,730.3z"/>
+		<path class="st3" d="M105.3,731.2c1.5,0.1,3,0.3,4.4,0.4c-0.5,2.1-1.6,4.4-4.2,4C105.5,734.2,105.4,732.7,105.3,731.2z"/>
+		<path class="st3" d="M357.2,731c3.5,0.9,4,4.3,4.3,7.4c-1.3,0-2.6,0.4-3.8,0C356.2,736.2,357.1,733.5,357.2,731z"/>
+		<path class="st3" d="M594.4,734.7c0-1.5,0-3,0.1-4.5c1.1,0.5,2.2,1.1,3.3,1.7c-0.1,0.7-0.3,2.2-0.4,2.9
+			C596.5,734.7,595.4,734.7,594.4,734.7z"/>
+		<path class="st3" d="M1137,732.2c0.3-0.6,0.8-1.8,1-2.4c1.2,1,2.5,1.9,3.5,3.1c-0.6,2.2-2.8,2.3-4.7,2.7
+			C1136.9,734.7,1136.9,733,1137,732.2z"/>
+		<path class="st3" d="M1398.4,730.7c2.9,2.2,0.2,6.8-3.2,5.5C1396.2,734.3,1397.2,732.5,1398.4,730.7z"/>
+		<path class="st3" d="M1721.5,730.9c0.9,0.2,2.6,0.7,3.4,1c-1,1-2.1,2.1-3.1,3.1c-0.2-0.5-0.7-1.4-0.9-1.9
+			C1721.1,732.5,1721.4,731.4,1721.5,730.9z"/>
+		<path class="st3" d="M1028.5,732.4c2.8-0.3,5.3,0.7,7.3,2.6c-2.1,2.9-5,0.9-7.2-0.5C1028.5,734,1028.5,732.9,1028.5,732.4z"/>
+		<path class="st3" d="M1162.8,733.5c1.2-0.6,2.3-1.3,3.5-2c0.4,0.4,1.2,1.3,1.6,1.8c-0.1,0.9-0.2,1.9-0.3,2.8
+			c-1.2,0-2.4,0.1-3.5,0.2c0.2,0.7,0.7,2,0.9,2.7c-0.2,1.4-0.3,2.7-0.5,4.1c-5.3-0.2-10.6-0.5-15.8-1.2c3.5-0.2,7.1-0.4,10.6-0.3
+			c0.4,0,1.2,0.1,1.6,0.2C1162.2,739.3,1164.6,736.5,1162.8,733.5z"/>
+		<path class="st3" d="M1545.7,733.1c0.4-0.3,1.1-1,1.5-1.4c2.9,0.4,1.3,3.5,0.9,5.2C1547.3,735.7,1546.5,734.4,1545.7,733.1z"/>
+		<path class="st3" d="M1335.3,733.2c1.4-0.4,2.1,0.2,2.1,1.9c-0.3,0.3-1.1,0.9-1.4,1.2C1334.8,735.4,1334.6,734.4,1335.3,733.2z"/>
+		<path class="st3" d="M1541.3,733.9c0.8,0.2,2.3,0.7,3.1,0.9c0.7,1.3,1.4,2.6,2.1,3.9c-1.4-0.2-2.7-0.5-4-1
+			C1542,736.4,1541.6,735.1,1541.3,733.9z"/>
+		<path class="st3" d="M122.2,741.2c-0.2-2.6-0.1-5.3,1.6-7.4c2.5,1.9,2.8,4.6,1.7,7.4c2.1,0,4.2,0.1,6.3-0.1
+			c0.4-1.1,0.8-2.3,1.1-3.4c0.7,0.1,2.1,0.2,2.8,0.2c0.3,0.6,0.8,1.7,1.1,2.2l0.4,0.7c2.8,0.2,5.7,0.2,8.5,0
+			c2.4-0.1,4.8-0.7,7.1-1.5c0.4,0.7,0.8,1.5,1.2,2.2c-10.6,0.4-21.2-0.5-31.8,0.7L122.2,741.2z"/>
+		<path class="st3" d="M1445,739.1c-2.6,2.1-3.1-2.6-0.6-3.1C1444.8,737,1445,738,1445,739.1z"/>
+		<path class="st3" d="M1722.2,738.4c2.4,0.7,1.8,3.3,2.1,5.3c-0.7-0.1-2.1-0.3-2.8-0.4l-0.3-0.9
+			C1721.4,741.5,1721.9,739.5,1722.2,738.4z"/>
+		<path class="st3" d="M332.4,742.5c3.4-0.7,6.8-1.1,10.2-1.1c5.5,0,11-0.3,16.5-0.1c0.9,0,2.6-0.1,3.4-0.1c1.5-0.1,3-0.2,4.5-0.2
+			c9.4-0.4,18.9,0.1,28.3,0c9.4,0.7,18.9-0.3,28.1,1.6c-8.8,1.4-17.6-1.3-26.4-0.8c-10.3,0-20.7,0-31,0.1c-11.5-0.5-22.9,2-34.3,0.8
+			L332.4,742.5z"/>
+		<path class="st3" d="M1716.3,741.2c1,0,1.9,0.2,2.9,0.3c0.1,0.5,0.3,1.6,0.4,2.1c0.1,1.4,0.2,2.8,0.3,4.3c-1,0.6-1.9,1.2-2.9,1.8
+			c-0.4,0.2-1.1,0.7-1.5,1c-0.1,1-0.2,2-0.2,3c0.4,0.2,1.1,0.6,1.4,0.8c1.5,0.6,3.4,1.7,5,0.5c2-1.3,4-2.7,6.6-2.6c0,0.7,0,2,0,2.7
+			l-0.3,0.9c-1.7,0.7-3.3,1.4-5,2.1c-3.9-0.7-8.6-0.1-10.9-4c0.4-0.6,1.2-1.8,1.5-2.3c-1.1-0.8-2.2-1.6-3.3-2.4
+			c0.1-0.2,0.3-0.7,0.4-0.9C1712.7,746.2,1714.5,743.7,1716.3,741.2z"/>
+		<path class="st3" d="M24.2,743c0.9-0.3,1.8-0.6,2.8-0.9c0.4,0.4,1.2,1.1,1.6,1.5c-0.5,1.7-0.6,3.7-2,4.9c-1.4,0.4-2.8,0.3-4.2,0.4
+			c0.3-0.9,0.6-1.8,0.9-2.7C23.6,745.1,23.9,744.1,24.2,743z"/>
+		<path class="st3" d="M1728.8,749.6c1.4,0,2.8,0,4.2,0.1v2.4c-1.4,0.2-2.8,0.3-4.2,0.5C1728.8,751.8,1728.8,750.3,1728.8,749.6z"/>
+		<path class="st3" d="M1708.1,755.6c0.5-0.2,1.4-0.5,1.9-0.6c0.1,1.5,0.2,3,0.4,4.6c-1-0.2-2.1-0.4-3.1-0.6
+			C1707.6,758.1,1707.9,756.4,1708.1,755.6z"/>
+		<path class="st3" d="M1721.2,760.3c4-0.4,7.8-4.4,11.8-1.9v6.1c-2.6,0.4-1.2-3.1-1.7-4.5c-2.8,1.3-5.7,2.8-7.6,5.4
+			c-2-0.8-4.1-1.6-6.1-2.2c-0.9,1.1-1.8,2.2-2.7,3.3c-0.5,0-1.4-0.1-1.9-0.1c-0.2-1.7-0.4-3.5-0.6-5.2c0.9-0.5,1.9-1,2.9-1.5
+			C1717.3,759.7,1719.3,760,1721.2,760.3z"/>
+		<path class="st3" d="M1725.2,766.3c0.8,0.4,1.7,0.9,2.6,1.3c0.9-1,1.8-1.9,2.7-2.9c0.6,3.9,0.7,7.9,1.1,11.8c0.3,0.5,1,1.5,1.4,2
+			v4.6c-0.6-0.2-1.8-0.6-2.3-0.7c-0.1,0.9-0.2,2.6-0.2,3.5c0.7,0.4,1.9,1.2,2.6,1.5v7.4c-0.7,0.1-2.2,0.4-2.9,0.5
+			c0.8,1.6,1.8,3.1,2.9,4.5v2.6c-0.6,1-1.2,1.9-1.8,2.9c-1.5,0-3.1,0.1-4.6,0.4c-0.1,0.9-0.2,1.8-0.2,2.8c0.7,1.2,1.5,2.4,2.3,3.6
+			c-1.7-0.7-3.3-1.4-4.9-2.1l0.2-1.7c0.2-2.3,0.5-4.6,1-6.9c1.3-0.3,2.7-0.6,4-0.8c-0.6-1.6-0.6-3.5-2-4.6c-1.4,0.9-2.6,2-3.7,3.3
+			c-0.4,0.6-1.4,1.9-1.8,2.5c-0.3,0.3-0.9,1.1-1.2,1.4c-1.1-1-2.1-1.9-3.1-2.8c-1.7-1.3-3.3-2.7-4.7-4.4c0.2-2.1,0.5-4.2,0.9-6.3
+			c0.8,0.8,1.6,1.6,2.4,2.4c4.3,1.1,8.7,3.4,13.2,1.6c-1.9-1.2-3.9-2-6.1-2.5c0.6-1.7,1.2-3.5,1.8-5.2c-2.4,0-3.2,1.8-3.7,3.7
+			c-1.6-0.4-3.2-0.7-4.7-1.1c0.2-0.7,0.6-2,0.8-2.7c-0.9-0.6-1.8-1.2-2.7-1.7c0-1.5,0-3.1,0.1-4.6c1.6-0.3,3.4-0.3,4.7-1.6
+			c0.2-2,0.4-4.1,0.5-6.1c-0.4-0.1-1.2-0.3-1.6-0.5c-0.4-0.1-1.3-0.4-1.7-0.6c0-1.4,0.1-2.8,0.2-4.1c0.6-0.1,1.8-0.2,2.3-0.3
+			c0.8,0.8,1.6,1.6,2.4,2.5C1722.8,768.1,1724,767.2,1725.2,766.3 M1727.2,775.3c-2,1.4-0.4,4.8-0.4,6.9
+			C1730.5,783.7,1730.9,774.7,1727.2,775.3 M1725.3,784.6c0.4,1.5,0.7,3.2,1.8,4.4c1.9,1.7,2.9-0.7,3.8-2.1
+			c-0.4-0.6-1.2-1.8-1.7-2.5C1728.2,784.5,1726.3,784.6,1725.3,784.6z"/>
+		<path class="st3" d="M13.1,769c1.1-0.5,2.1-1,3.2-1.6c-0.3,1.8,0.4,4.3-1.4,5.3c-1.8,0.3-3.7,0.3-5.5,0.5c-0.1,0.3-0.3,1-0.3,1.3
+			c-0.2,1.7-0.4,3.5-0.6,5.2c-0.8-0.3-2.5-1-3.3-1.3c0.4-2.5,0.3-5.4,2-7.5C8.8,769.8,11.1,769.7,13.1,769z"/>
+		<path class="st3" d="M1704.7,769.8c2-0.5,4.1-1.1,6.1-1.6c1.1,2.2,2.1,4.5,3.5,6.5c-1.1,0.5-2.3,0.9-3.4,1.4
+			c-0.5,1-0.9,2.1-1.3,3.1c-2.3,0.2-4.6,0.7-6.7,1.8c1.6,1,3.3,1.9,5,2.8c0,0.5-0.1,1.5-0.1,2.1c-2.5,0.6-5.4,1.1-5.1,4.3l0,0.9
+			c-0.1-2.4-0.1-4.7,0-7c0.1-3.1,0.1-6.2,0.2-9.3c0-0.3,0-0.8,0-1.1C1703.4,772.3,1704.1,771.1,1704.7,769.8 M1708.7,772.2
+			c-1.2,0.8-0.2,3.5,1.3,2.3C1711.2,773.7,1710.1,770.9,1708.7,772.2 M1704.4,776.1c-1.1,1.4,1.3,3.2,2.4,1.8
+			C1707.8,776.5,1705.4,774.6,1704.4,776.1z"/>
+		<path class="st3" d="M10.9,780.8c1.2-1.3,2.3-3,4-3.8c1.1,0.2,2,0.7,2.8,1.4c-0.1,1.7-0.7,3.2-1.2,4.8c4.2,1.9,8.9,1.1,13.4,1.8
+			l0.2,1.5c-2.9-0.1-5.8-0.1-8.6-0.1c0.2,0.8,0.4,1.6,0.6,2.4c-3.5-0.1-7.2-0.1-10-2.5c-1.4,0.5-2.7,1-4.1,1.5
+			C8.2,785.3,9.3,782.9,10.9,780.8z"/>
+		<path class="st3" d="M1705.2,796.4c0.8-1.3,1.7-2.6,2.5-3.9c0.2,1.8,0.5,3.6,0.8,5.4c1.1,0.6,2.2,1.3,3.4,1.9
+			c-0.9,1.1-1.8,2.3-2.7,3.5c-1.1-1.2-2.1-2.3-3.1-3.5c-0.2,0.6-0.6,1.9-0.8,2.5c-0.6,0.1-1.9,0.4-2.5,0.5c-0.1-1.9,0-3.9,0.1-5.8
+			c0.4-0.1,1.2-0.2,1.6-0.2L1705.2,796.4z"/>
+		<path class="st3" d="M7.6,804.2c-0.2-4.5,3.3-7.4,6.7-9.8c1.3,0.9,2.7,1.7,4,2.6c-1.7,0.8-3.4,1.6-5.1,2.5l-0.4,0.2
+			c-0.4,1.6-0.8,3.3-1.3,4.9C10.2,805.5,8.8,804.5,7.6,804.2z"/>
+		<path class="st3" d="M0,796.5c1.2,3.6,3.5,6.8,5.8,9.8c-1.8,2-4,0.8-5.8-0.5V796.5z"/>
+		<path class="st3" d="M20.6,797.5c3-0.8,6.2-0.6,9.2-0.2c0,0.5,0,1.5,0.1,2c0,0.6,0,1.8,0.1,2.4c0,4.3-0.5,8.6-0.2,13
+			c-0.8,4.4,3.8,5.5,7,6.6l2.1,0.1c-1.1,1.5-2.5,2.8-4.4,3.3c-0.2-1.2-0.5-2.3-0.7-3.4c-0.9-0.1-2.7-0.4-3.6-0.6l-0.9-1.5
+			c0.4-3-0.1-6-1.2-8.8c-3.6,0-7.1-0.2-10.6,0.3c-1.1,1.3-1.9,2.8-2.7,4.2c-0.5-0.2-1.4-0.5-1.9-0.7c0.5-2.2,0.8-4.5,1.9-6.5
+			c1.2-1.6,3.1-2.4,4.7-3.5C19.7,801.9,20.2,799.7,20.6,797.5z"/>
+		<path class="st3" d="M1711.6,805.1c1-0.9,1.9-2,2.9-2.9c1.2,3.4,0,7-0.3,10.5c-1.1-0.2-2.1-0.4-3.1-0.5c0.8-1.1,1.6-2.2,2.5-3.2
+			c-2.2-0.4-4.3-0.8-6.5-1.2c1-0.6,1.9-1.2,2.9-1.8C1710.5,805.7,1711.3,805.3,1711.6,805.1z"/>
+		<path class="st3" d="M1705.5,812.3c0.7-0.1,2.1-0.4,2.8-0.5c0,0.9,0,2.7,0.1,3.5c-0.5,0-1.6-0.1-2.1-0.1l-1.4-0.8
+			C1704.9,813.9,1705.3,812.9,1705.5,812.3z"/>
+		<path class="st3" d="M1721,812.1c1.4,0.1,3.4-0.1,3.3,2c-2.2,2.1-5.2,1.6-7.9,1c0.1-0.6,0.3-1.7,0.5-2.3
+			C1718.2,812.5,1719.6,812.3,1721,812.1z"/>
+		<path class="st3" d="M22.5,818.2c1.5,0,2.9,0,4.4,0c0,1.2,0,2.3-0.1,3.5c-0.8,0-2.3,0.1-3,0.1l-1.1-0.7c-0.2-0.1-0.7-0.4-1-0.6
+			C22,820,22.4,818.8,22.5,818.2z"/>
+		<path class="st3" d="M1728.3,823.7c-1.5-1.8-3.2-3.8-1.8-6.2c1,0,3,0.1,4.1,0.2c0,0.9-0.1,2.6-0.1,3.5c0.8-0.3,1.7-0.6,2.6-0.9v7
+			c-1.5,0.1-2.9,0.2-4.4,0.4C1728.5,826.3,1728.4,825,1728.3,823.7z"/>
+		<path class="st3" d="M79.8,820.7c11.3-0.1,22.8-1.2,34,0.4c-1.9,0-3.7,0-5.6,0c-3.1,0-6.2-0.1-9.3-0.1c-2,0-4,0-6.1,0
+			c-2.8,0-5.7,0.1-8.5,0.1l-0.8,0c1.3,4.4,4.5,7.6,8.7,9.3c-1.6,1.2-3.6,1.6-5.6,1.6c-0.2-1.4-0.5-2.9-0.7-4.3
+			c-1.8,0.5-3.5,1-5.3,1.6C78.8,826.7,78.1,823.5,79.8,820.7z"/>
+		<path class="st3" d="M1639.9,821c2.7-0.1,5.4-0.4,8.2-0.3c0.4,3.5,4.4,3.7,6.8,5.4c0.8,0.8,1.6,1.6,2.4,2.3c0.6,0.5,1.3,0.9,2,1.4
+			c-0.8,1.8-1.6,3.6-2.3,5.4c1.2-0.8,2.4-1.6,3.7-2.4c0.4,0.3,1.3,1,1.8,1.3c-0.6,1.2-1.2,2.4-1.8,3.6c-1.3,0-2.6,0.1-3.9,0.1
+			c-0.5-2-0.9-3.9-1.5-5.8c-0.4-0.5-1.2-1.5-1.6-1.9c-0.7,1.5-1.4,3-2.1,4.5c-0.9-0.1-2.7-0.2-3.6-0.2c-0.5,0-1.5-0.1-2-0.2
+			c0-0.7,0-2,0-2.6c1.5-0.5,3.1-1,4.8-1.4c0-0.8-0.1-1.6,0-2.3c-3-1.2-5.7-2.9-8.5-4.5c-1.1,1-2,2.1-2.9,3.2
+			c-1.7-0.4-3.4-0.8-5.1-0.8c-3.2,1.6-5,6.2-2.3,9.2c-0.2,1.2-0.3,2.5-0.4,3.7c-2.3,2.5-2.4,5.9-2.3,9.1c0.9-0.3,1.8-0.6,2.7-0.8
+			c0.6-0.2,1.8-0.6,2.4-0.8c0.3,0.5,0.8,1.6,1,2.1c-2,1.6-4.7,1.7-7.1,2.6h-5.1c2.9-1.3,6.3-3.6,4.8-7.3c0.3-0.5,0.8-1.5,1-2
+			c-1-1-1.9-2-2.9-2.9c-1.2-1-2.4-1.9-3.5-2.8c0.1-0.5,0.2-1.4,0.3-1.8c-2.8,0.4-5.7,1.1-8.5,0.9c-2.6-1-4.6-3-6.7-4.7
+			c1.1-0.6,2.3-1.1,3.5-1.6c0.3,0.5,1,1.4,1.3,1.8c0.7-0.4,1.5-0.8,2.3-1.2c0.5,0.9,1,1.8,1.5,2.8c1.3-1.3,2.5-2.6,3.8-4
+			c2,2.5,4.2,4.9,6.6,7c0.8-2.7-0.1-5-2.2-6.7c1.7,0,3.5,0,5.3,0c0.1-2,0.2-3.9,0.3-5.9c-1.3-0.6-2.6-1.2-3.9-1.8
+			c1.8,0.1,3.7,0.4,5.6,0.7c-0.4,2.1-0.8,4.2-1.1,6.4c1.4-2.4,2.8-4.8,4-7.3c-0.1,1.5,0.2,2.8,0.9,4.1
+			C1637.6,826.8,1638.7,822.4,1639.9,821z"/>
+		<path class="st3" d="M1658.8,820.7c11.2,0,22.5-0.7,33.7,0.1c-0.8,1.6-1.6,3.3-2.3,4.9c-0.1,2,0.7,3.7,1.9,5.2
+			c-0.1,2.7-2,4.9-4.8,4.7c0.2-2,0.8-3.8,1.5-5.7c-0.3-0.4-1-1.1-1.3-1.5c-0.5-2.6-1.5-5.1-2.7-7.5c-1.7,0-3.4,0-5.1,0
+			c1.2,0.6,2.5,1.3,3.8,1.9c-0.2,2.5,0.5,5.8-2.2,7.3c-1.3-0.1-2.7-0.2-4-0.2c0.5-1.3,1.1-2.6,1.7-3.8c-2.3,0.3-4.5,0.7-6.8,1.1
+			c0.7,1,1.3,2,2.1,3c-0.9,0.5-1.7,1-2.5,1.6c-1.4,1.1-2.7,2.2-4,3.4c-0.7-1-1.4-2.1-2-3.1c0.7-0.7,1.4-1.4,2.1-2.1
+			c-0.4-1.5-0.8-2.9-1.2-4.3c0.5-1.1,0.9-2.3,1.4-3.4c-0.8-0.3-2.3-0.8-3.1-1.1c-0.6,0.9-1.2,1.8-1.8,2.6c-0.5,0.5-1.6,1.4-2.1,1.9
+			c-1.3-0.8-2.6-1.6-3.8-2.5C1657.2,822.3,1658.2,821.6,1658.8,820.7 M1670,821.1c1.2,1.2,2.5,4,4.5,2.3
+			C1676.2,820.2,1671.8,821,1670,821.1z"/>
+		<path class="st3" d="M1716.5,821.1c0.6-0.2,1.9-0.7,2.5-0.9c1.3,1,2.7,2,4,3.1c-1.6,0.6-3.2,1.2-4.7,1.8c0.8,1,1.6,1.9,2.5,2.9
+			c1.1-0.5,2.3-1,3.5-1.4c0.3,0.8,0.8,2.3,1,3.1c-0.9,0.8-1.8,1.5-2.7,2.2c-1.6,0.5-3.2,1-4.8,1.5c-1.2-0.6-2.4-1.2-3.7-1.7
+			c1.2-1.4,2.8-2.6,3-4.5c-0.5-1.8-1.8-3.2-2.9-4.6C1714.8,822.1,1716,821.4,1716.5,821.1z"/>
+		<path class="st3" d="M0,820.6c1.6,1.3,3.4,2.6,5,3.9c-1.7,0.5-3.4,0.9-5,1.4V820.6z"/>
+		<path class="st3" d="M128.5,821c2.1,0,4.2-0.1,6.2-0.2c1,0.8,1.9,1.7,2.9,2.5c-2.5,2.7-6.1,1.4-9.2,1c-0.8,1-1.6,2-2.4,3
+			c-0.5,0-1.6-0.2-2.1-0.2c-0.6-0.2-1.8-0.8-2.4-1c0.5-1,1-2,1.5-3C124.8,822.5,126.7,821.8,128.5,821z"/>
+		<path class="st3" d="M157.7,820.8c0.2,0,0.6,0,0.9,0c1.9,2.5,1,8.4-3.2,6.6C155.5,825,156.5,822.8,157.7,820.8z"/>
+		<path class="st3" d="M238.4,820.6c1.6,0,3.2,0,4.8,0.1c0.1,1.3,0.2,2.6,0.3,3.9c-1.7-0.4-3.3-0.8-5-1.2
+			C238.5,822.8,238.4,821.3,238.4,820.6z"/>
+		<path class="st3" d="M318.1,820.9c1.5,0,3,0,4.5,0c1.2,1.8,2.4,3.6,3.6,5.5c-0.9,0.3-2.6,0.8-3.4,1.1c-0.6-0.7-1.3-1.5-1.8-2.3
+			C320.1,823.7,319.3,822.1,318.1,820.9z"/>
+		<path class="st3" d="M1245.5,821c1.3,0,2.6,0,3.9,0c1.2,1.1,2.4,2.3,3.5,3.6c0.8,1.8,1.5,3.8,2.3,5.7c2.9,0.2,5.9,0.4,8.8,0.9
+			c-1.6,0.5-3.1,0.9-4.7,1.4c0.1,1,0.4,3.1,0.6,4.1c-0.6-0.1-1.8-0.3-2.4-0.3c-2.4,0.1-2.4-2.7-3.3-4.3c-0.4,1.6-0.9,3.3-1.3,4.9
+			c-1.2-0.4-2.3-0.7-3.4-1c0.8-3.7,2.1-7.3,2.4-11.1c-2.1-0.9-4.1-1.9-6.4-2C1245.5,822.3,1245.5,821.4,1245.5,821z"/>
+		<path class="st3" d="M1335.2,821c1.7-0.1,3.5-0.1,5.3,0l1.5,0.1l1.4,0.1c0.1,1,0.2,2.1,0.3,3.1c0.6,0.3,1.8,1,2.5,1.3
+			c-1.2,4.3-5.4,6.7-8.8,9.1c0.1,0.3,0.4,1,0.6,1.3c0.2,0.5,0.6,1.4,0.8,1.8c-0.5,0.4-1.3,1.2-1.8,1.6c-0.9-1.5-1.8-3-2.8-4.5
+			c2.2-2.4,5.4-4,6.9-6.9C1339.8,825,1335.5,824.5,1335.2,821z"/>
+		<path class="st3" d="M1348,821.2c0.7-0.1,2.2-0.2,3-0.3c-0.9,1.9,1.7,3.9,3,2c0.1,0.5,0.2,1.5,0.2,2.1c0.8-1.2,1.6-2.5,2.5-3.7
+			c-0.6,3.1,1.3,7.6-2.1,9.4c-2.1,1.4-4.7,1.6-7.2,1.8c-0.1,1.2-0.2,2.5-0.2,3.8c-1.5-1.4-3-2.8-4.1-4.5c1.2-1.5,3.2-1.2,4.9-1.3
+			c0.1-1.1,0.1-2.2,0.2-3.2c0.9,0.7,1.8,1.4,2.8,2.1c1-1,2-2,2.7-3.3c-1.6-0.5-3.1-0.8-4.6-1.4
+			C1348.8,823.5,1348.4,822.3,1348,821.2z"/>
+		<path class="st3" d="M1562,820.8c0.6,0,1.8,0,2.4,0l0.1,1.4c0.1,1.5,0.2,3.1,0.5,4.6c2,1.4,4.2,2.4,6.3,3.5
+			c-1.8,0.3-3.5,0.5-5.2,0.8c-0.8-0.5-1.5-1-2.2-1.5c-1.9-0.1-3.7-0.6-5.1-1.8c1.1-0.7,2.2-1.3,3.4-1.9l0.5-0.2
+			c-0.1-0.4-0.2-1.3-0.2-1.7C1562.3,823.2,1562.1,821.6,1562,820.8z"/>
+		<path class="st3" d="M1582.1,821c0.4,0,1.2,0,1.6,0.1c0.1,1.1,0.1,2.3,0.2,3.4c2.8-0.1,5.5,0.2,8.2,1c-0.6,1.2-1.3,2.4-1.9,3.5
+			c-0.5-0.1-1.5-0.5-1.9-0.6c-1.7-0.7-3.3-1.5-4.9-2.2c-1.3,1.8-2.8,3.7-5.2,3.9C1578.4,826.7,1580.2,823.7,1582.1,821z"/>
+		<path class="st3" d="M1175.6,825.5c0.6-1.4,1.2-4.3,3.3-3.3c0.8,2.1,0.7,4.6-1.1,6.2l-1.1,1.3
+			C1176.2,828.3,1174.9,827,1175.6,825.5z"/>
+		<path class="st3" d="M1326.3,823.1c0.7-0.5,2.1-1.4,2.8-1.9c0.3,0.4,0.9,1.3,1.2,1.7c-0.4,1.3-0.8,2.6-1.2,3.9
+			C1328.1,825.6,1327.2,824.3,1326.3,823.1z"/>
+		<path class="st3" d="M1554,823c1.6-1.5,4.7-1.9,5.2,0.9C1557.4,823.9,1555.6,823.9,1554,823z"/>
+		<path class="st3" d="M1705.6,826c1.1-1.9,1.8-5.2,4.8-4.5c0,1.4-0.1,2.8-0.1,4.2c-0.4,1.8-0.9,3.6-1.4,5.4c-1.4-1.1-2.7-2.2-4-3.3
+			C1705,827.3,1705.4,826.4,1705.6,826z"/>
+		<path class="st3" d="M51.8,823c2.2,0.6,5.3,0,6.7,2c-0.8,2.6-4.7,1-6.8,1.1C51.8,825.3,51.8,823.8,51.8,823z"/>
+		<path class="st3" d="M1696.8,824.2c1.3-1.1,3-1,4.7-1.2c-0.3,1-0.6,2-0.9,3c1.3,1.3,2.6,2.5,4,3.7c-0.7,0.7-1.4,1.5-2,2.3
+			c-1.3-1.6-2.7-3.3-4.8-3.8c-1.6,1.7,0.4,3.4,1.1,5c-2.2,0.8-3.7-1.2-5.3-2.3l0.5-1.4c0.8-0.8,1.6-1.5,2.4-2.2
+			C1696.5,826.5,1696.7,824.9,1696.8,824.2z"/>
+		<path class="st3" d="M1313.1,829c0.3-1.6,0.7-3.1,1-4.7c0.7,1.1,1.4,2.3,2.2,3.4c2.9,0.8,6,0.6,9,1.1c0.6,1.2,0.8,2.6,1.2,3.9
+			c-1.6,1-3.1,2.1-4.6,3.2c1.2,1,2.5,2,3.8,3c-0.5,3.4-1.2,6.8-2.4,10.1c0.5,0.7,1.1,1.4,1.7,2.1h-4.6c-0.3-0.4-0.9-1.2-1.2-1.7l0-1
+			c1.3-0.9,3.3-1.2,4.1-2.8c0.4-2.2,0.2-4.5,0.1-6.7c-1.9,1.7-3.4,3.9-4.1,6.4c0-0.9,0-2.8,0-3.7c-1.5,0.4-2.9,0.8-4.3,1.2
+			c1.5-1.1,3-2.2,4.5-3.4c0.5-2.8-1.2-5.2-2.5-7.5c-1,2-1.9,4.1-3,6.1c-2.3,2.2-4.5,4.7-3.5,8.2c-0.7-1.7-1.4-3.3-2.2-5
+			c-0.7,0.6-1.4,1.3-2.1,2c0.2-1.2,0.4-2.4,0.3-3.7c-1.6-1.7-4-2-6.2-2.6c0.1,2.2,0.3,4.3,0.3,6.5c0,0.8-0.2,2.3-0.2,3.1
+			c1.1,0.4,2.2,0.8,3.2,1.2c-1.5,1.2-3.1,2.3-4.6,3.4h-3.4c1-0.6,2-1.2,3-1.8c-3-2.9-4-6.9-3-10.8c0-2.2-1.3-4-2.4-5.7
+			c0.6-0.1,1.9-0.4,2.5-0.6c0.7,1.1,1.4,2.3,2.1,3.4c1.6-1,3.2-1.9,4.9-2.8c1.6,3.3,4.7,5.4,7.7,7.3c1.4-1.8,0.2-3.4-0.9-4.9
+			c-0.2-1.6-0.3-3.2-0.4-4.7c-1.6,0.3-3.1,0.6-4.6,0.9c-0.5-0.2-1-0.4-1.4-0.5c1-0.7,2.1-1.4,3.2-2.1c0.6-0.2,1.8-0.6,2.4-0.8
+			C1310.2,828.2,1311.7,828.6,1313.1,829 M1310.3,834.3c1,0.9,2.1,1.7,3.2,2.6c0-1.5,0-2.9,0.1-4.4c3.5-2.6,7.3,0.7,10.9,1.3
+			c0.3-1.3,0.7-2.7,1.1-4c-3-0.1-5.9-0.4-8.7-1.3C1314.6,830.4,1312.3,832.2,1310.3,834.3z"/>
+		<path class="st3" d="M1567,826.9c0-1.8,0.6-3.1,2.7-2.9c0,0.7,0.1,2,0.1,2.7C1569,826.7,1567.7,826.8,1567,826.9z"/>
+		<path class="st3" d="M108.8,825.4c1.5,0,3.1,0,4.6,0c0.8,2.2,1.4,4.5,2.7,6.5c1.9,1.3,4,2,6.1,3.1c-0.1,0.4-0.2,1.2-0.3,1.6
+			c-0.8,1.8-1.7,3.5-2.6,5.3c-3.2-5.1-5.4-12.1-11.9-13.7C107.9,827.3,108.4,826.3,108.8,825.4z"/>
+		<path class="st3" d="M223.5,826.3c1.4-0.4,2.7-0.8,4.1-1.2c0,1.1,0.1,2.2,0.1,3.3c-1.3,0.4-2.7,0.8-4,1.3
+			c-0.6,1.3-1.2,2.7-1.8,4.1c-1.5-0.2-3-0.3-4.5-0.4c0.4-1.6,0.7-3.2,1.1-4.8c1.2-0.1,2.3-0.2,3.5-0.3
+			C222.4,827.8,223.1,826.8,223.5,826.3z"/>
+		<path class="st3" d="M142.6,826.6c1.4-0.1,2.9-0.3,4.4-0.4c0.1,0.7,0.3,2.1,0.5,2.9c-1.2,1.9-3.4,1-5.2,0.9
+			C142.3,828.8,142.5,827.7,142.6,826.6z"/>
+		<path class="st3" d="M186.9,828.1c0.7-1.1,1.5-2.2,2.3-3.2c0.7,2,1.2,4,1.3,6.1C189.2,830.1,188,829.2,186.9,828.1z"/>
+		<path class="st3" d="M1218.6,829.1c1.3-0.9,3-4.3,4.5-2.1c0.4,1.5-0.2,3-1.2,4C1220.3,831.5,1219.5,829.8,1218.6,829.1z"/>
+		<path class="st3" d="M1297.1,826.6c1-0.5,2-1,3-1.4c0.1,1.9,0.2,3.8,0.3,5.7c-1.2-0.2-2.3-0.4-3.4-0.6c-0.8-0.8-1.5-1.5-2.2-2.3
+			C1295.3,827.6,1296.5,827,1297.1,826.6z"/>
+		<path class="st3" d="M1376.8,829.8c0.1-1.6,0.4-3.2,0.8-4.8c0.8,0.4,2.3,1.3,3.1,1.7c-0.3,2-0.8,3.9-1.9,5.6
+			C1378.2,831.7,1377.3,830.5,1376.8,829.8z"/>
+		<path class="st3" d="M1541.4,828.2c0.4-0.8,1.2-2.4,1.6-3.1c0.7,1.1,1.9,2.2,1.8,3.8C1543.6,829.4,1542.4,829.2,1541.4,828.2z"/>
+		<path class="st3" d="M1660.1,829.1c-0.4-1.1-0.2-3.9,1.5-3c0.6,1.2,0.4,2.2-0.8,3L1660.1,829.1z"/>
+		<path class="st3" d="M13.1,827.2c1.9-0.5,3.1,2.4,1.8,3.7c-3,3.1-7.6,6.7-11.8,3.3c1.3-1.6,2.6-3.4,4.8-3.6
+			C10.2,830.3,11.5,828.4,13.1,827.2z"/>
+		<path class="st3" d="M97.4,830.4c0-1.3,0.1-2.6,0.1-3.8c1.5,0.4,3,0.8,4.5,1.2c-0.3,0.6-0.8,1.7-1.1,2.2
+			C100.1,830.1,98.3,830.3,97.4,830.4z"/>
+		<path class="st3" d="M349.2,827.2c1.6-0.2,3.5,0.1,4.2,1.9c-0.3,1.7-1.9,2.5-3.5,2.2C348.9,830.1,348.4,828.6,349.2,827.2z"/>
+		<path class="st3" d="M1181.7,827.8c3.5-0.4,6.5,2.3,10.1,1.9c-0.7,1.6-1.3,3.4-3.1,4.1c-1.9-2-4.6-2.8-7.1-3.8
+			C1181.7,829.4,1181.7,828.3,1181.7,827.8z"/>
+		<path class="st3" d="M39.2,829.6c3-0.8,6.2-0.9,9.1,0.4c0.3,2.3,0.3,4.7,0.1,7c-0.1,1.2-0.6,4.1-2.4,3.2c-1.7-2.6-1.6-6.5-5.1-7.6
+			C40.3,831.6,39.7,830.6,39.2,829.6z"/>
+		<path class="st3" d="M1267.4,829.7c0.4-0.1,1.3-0.2,1.8-0.3c0.8,0.8,1.5,1.6,2.3,2.5c0.4,0.4,1.1,1,1.4,1.4
+			c0.5,0.4,1.6,1.3,2.1,1.8c-1.1,2-3.4,3.5-5.1,1.4C1269.1,834.1,1268.2,831.9,1267.4,829.7z"/>
+		<path class="st3" d="M1385.3,833.6c-2.7-2.4,2.2-3,3.6-4.2C1388.3,831.3,1388.1,834.2,1385.3,833.6z"/>
+		<path class="st3" d="M1599,830.5c0.5-0.4,1.4-1.3,1.9-1.7c0.9,0.8,1.8,1.7,2.8,2.5c0.6,0.5,1.2,1,1.9,1.5c0.9,0.7,1.9,1.4,2.9,2.1
+			c-0.2,1.9,1.4,5.6-1.4,6c-1.8-1.6-2.8-3.9-4-6C1601.6,833.5,1600.2,832,1599,830.5z"/>
+		<path class="st3" d="M1633.8,832c-0.7-2.7,2.5-3.6,4.2-2C1641.1,832,1634.3,835.3,1633.8,832z"/>
+		<path class="st3" d="M64.4,830.8c0.7-0.4,2.1-1.2,2.8-1.6c2.5,1.8,4.2,4.3,4.6,7.5c1.9,0.5,3.8,1,5.6,1.5
+			c-0.3,1.4,0.2,3.4-1.7,3.6c-3.5,0.8-8.3,2.9-10.9-0.6c1.3-1.1,2.5-2.2,3.8-3.2c-3.2-0.6-4.7-3.1-4.4-6.3L64.4,830.8z"/>
+		<path class="st3" d="M378.1,838c-2.1-2.2-2.5-6.9,0.8-8.2C381,832.1,380.9,836.7,378.1,838z"/>
+		<path class="st3" d="M1359.3,830l0.6-0.9c2.6,0.7,0.8,3.8,0.8,5.7c-0.7,1.5-0.3,5-2.8,4.7C1355.2,836.6,1358.9,833.2,1359.3,830z"
+			/>
+		<path class="st3" d="M1593.1,830.5c1.3-1.1,2.6,1.4,1.4,2.3C1593.2,833.9,1591.9,831.4,1593.1,830.5z"/>
+		<path class="st3" d="M1200.4,831.3c1-1.2,2.9,0,2.9,1.4c-0.6,0.3-1.7,0.9-2.3,1.3C1200,833.3,1199.8,832.4,1200.4,831.3z"/>
+		<path class="st3" d="M1213.8,830.4c0.6,1,1.1,2.1,1.7,3.2c-0.3,0.3-1,0.8-1.4,1.1c-1.7,1.1-3.4,2.2-5.2,3.1c-1-0.5-1.4-1.5-2-2.3
+			c0.4-0.5,1.3-1.4,1.7-1.9c1,0,2.1,0,3.1,0l0.3-0.5C1212.5,832.5,1213.3,831.1,1213.8,830.4z"/>
+		<path class="st3" d="M1280.8,831.3c1.5-0.3,2.9-0.5,4.4-0.8c0.4,0.3,1.1,1,1.5,1.3c0.3,0.4,1,1.3,1.3,1.8c0.3,1.3,0.6,2.5,0.9,3.8
+			c-1.9-0.2-3.6-1-5.1-2.2c-1.2-0.9-2.5-1.8-3.8-2.6C1280.3,832.3,1280.7,831.6,1280.8,831.3z"/>
+		<path class="st3" d="M54,834.9c0.9-2.5,4-2.3,6.1-2.9c-1,1.9-2.2,3.8-3.3,5.7l-0.5,0.9c-1.2,1.9-2.3,4.1-1.1,6.3
+			c0.8,3.3,4.8,1.2,7.1,1.5c-0.8,1.8-1.9,3.4-3.5,4.6h-5.6c-0.8-1.6-1.6-3.2-2.4-4.8C52.6,842.7,52.9,838.7,54,834.9z"/>
+		<path class="st3" d="M135.8,834.1c0.7-1,1.4-1.9,2.2-2.8c2.9,1,2.9,3.8,2.3,6.4C138.7,836.8,135.7,836.6,135.8,834.1z"/>
+		<path class="st3" d="M1729.3,831.3c1.2,1.1,2.4,2.3,3.6,3.5l0.1,0.9v3.1c-1.6-0.1-3.2-0.3-4.8-0.4c-0.1,2.8,1.6,4.6,4.1,5.7
+			c0,0.7,0.1,2,0.2,2.7l-1,0.2c-0.6,0.1-1.8,0.4-2.4,0.5c-0.3-0.6-0.9-1.8-1.2-2.5c-1.5-2.1-2.9-4.3-3.6-6.8
+			c1.3-0.6,2.7-1.2,4.1-1.8C1728.6,834.6,1728.9,832.9,1729.3,831.3z"/>
+		<path class="st3" d="M1676,834.8c2.2-0.5,4.3-1,6.5-1.6c0.1,0.4,0.3,1.2,0.4,1.6c0,0.6-0.1,1.9-0.2,2.5c-1.6,0.2-3.2,0.5-4.7,0.7
+			c-1.8-0.1-4.6,1.1-5.4-1C1673.4,836,1674.8,835.5,1676,834.8z"/>
+		<path class="st3" d="M1705.7,833.9c1.1-0.3,2.2-0.6,3.3-0.8c-0.1,2.1-0.4,4.3-0.9,6.4c-0.6-0.3-1.8-1-2.3-1.4
+			C1705.7,836.7,1705.7,835.2,1705.7,833.9z"/>
+		<path class="st3" d="M31.6,836.3c1.1-1.1,2.3-2.2,3.4-3.2c2.4,0.8,3.9,2.6,3.8,5.2C36.2,838.5,33.6,838.2,31.6,836.3z"/>
+		<path class="st3" d="M1014,835.7c1.6-1.2,3.7-1.4,5.6-1.4c0,0.7,0,2.1,0,2.8C1017.6,837.5,1015.7,836.8,1014,835.7z"/>
+		<path class="st3" d="M1542.5,834.3c0.8,1.3,1.5,2.6,2.3,3.9c1.1-0.9,2.2-1.9,3.3-2.8c0.1,1.7,0.2,3.3,0.3,5
+			c-1.3,0.1-2.5,0.2-3.8,0.3c-0.3-0.7-1-2-1.4-2.7c-0.8-0.7-1.6-1.3-2.3-2C1541.3,835.7,1542.1,834.8,1542.5,834.3z"/>
+		<path class="st3" d="M1567,834.9c0.1-1.9,2.8-1.5,3.2,0.1l-0.3,0.8C1568.4,836.5,1567.5,836.2,1567,834.9z"/>
+		<path class="st3" d="M8.5,837.9c4.6-4.7,11.4-2.7,16.9-1.4c2,1.9,3.9,3.8,6.5,4.6c2.1,0.4,1.2,2.8,1.5,4.3
+			c-2.9,0.2-5.8-0.2-8.6-1.3c-0.1-0.6-0.2-1.9-0.3-2.5c-3.1,2.1-5.1-1.3-7.1-3.2c-1.3,0.1-2.5,0.1-3.8,0.2c-0.2,1.3-0.4,2.6-0.5,3.9
+			C10.4,842.9,7.6,841,8.5,837.9z"/>
+		<path class="st3" d="M170.2,835.4c4.1-1.8,6.4,3.4,4.9,6.6c-0.8,0.9-1.6,1-2.6,0.5C170.6,840.7,170.7,837.8,170.2,835.4z"/>
+		<path class="st3" d="M197.5,839.6c-2-1.5-0.3-3.8,0.3-5.5c1.4,1,3.5,1.9,3.4,4C200.5,839.4,198.9,840,197.5,839.6z"/>
+		<path class="st3" d="M1134.2,840.1c0.2-1.7-0.3-4,1.7-4.8c0.6,0,1.9-0.1,2.5-0.1c0.1,0.7,0.2,2.1,0.3,2.8l0.1,0.9
+			c-0.3,0.4-1,1.2-1.4,1.6C1136.4,840.4,1135.3,840.2,1134.2,840.1z"/>
+		<path class="st3" d="M1239.6,834.7c1.5,0,3,0.1,4.5,0.2c-0.3,1-0.6,2.1-0.8,3.2c-0.9,1-1.9,1.9-2.8,2.9
+			C1239.9,838.9,1239.6,836.8,1239.6,834.7z"/>
+		<path class="st3" d="M1348.1,838.2c1.4-1,2.7-2.1,4.1-3.1c1,1.2,4.2,4.7,1,5C1351.5,839.4,1349.8,838.7,1348.1,838.2z"/>
+		<path class="st3" d="M1235,835.6c0.7,0.1,2.1,0.3,2.8,0.4c-0.2,1.1-0.4,2.3-0.5,3.5c-0.6,0.2-1.7,0.5-2.2,0.7
+			c-0.2-0.7-0.5-2-0.6-2.6C1234.6,837,1234.9,836,1235,835.6z"/>
+		<path class="st3" d="M1490.5,836.3c1.2-1.5,3.8,0.9,2.2,2.2C1491.3,839.7,1489.2,837.7,1490.5,836.3z"/>
+		<path class="st3" d="M1562.3,836.2c0.7-0.1,2.1-0.2,2.8-0.3c-0.1,0.4-0.3,1.3-0.4,1.7l-0.7,0.6
+			C1562.5,838.3,1561.9,837.6,1562.3,836.2z"/>
+		<path class="st3" d="M1574,835.9c0.8,0,2.3,0.1,3.1,0.1c-1,1.7-2,3.3-3.1,4.9c-0.8,0.3-1.5,0.6-2.2,1c-0.5,0.5-1.5,1.5-2,2
+			c0-0.6,0-1.2,0.1-1.8c0.2-0.3,0.6-1,0.8-1.3C1571.7,839.1,1572.6,837.3,1574,835.9z"/>
+		<path class="st3" d="M1634.8,837c0.5-0.2,1.4-0.7,1.8-1c0.8,0.1,2.2,0.3,3,0.4c1.5,0.2,2.9,0.2,4.4,0.4c-0.5,2.5-2.5,3.6-4.9,4
+			C1637.6,839.5,1636.2,838.2,1634.8,837z"/>
+		<path class="st3" d="M1699.4,835.8c3,1,0.7,3.2-0.3,4.9c-0.5,0.1-1.3,0.2-1.8,0.2c-1.3-0.5-2.6-1-3.8-1.5c0-0.5-0.1-1.5-0.1-2
+			c0.7-0.2,2-0.6,2.7-0.8c0.5,0.3,1.4,1,1.9,1.3C1698.2,837.4,1699,836.3,1699.4,835.8z"/>
+		<path class="st3" d="M0,836.7c1,1.2,2,2.4,3.2,3.5c0.9,0.7,1.8,1.3,2.7,2c-2.4,1.2-4.9,2.4-5.9,5.1V836.7z"/>
+		<path class="st3" d="M1715.9,837.6c1.7-0.3,3.4-0.6,5.1-0.9l0.1,1.4c-1.8,2.9-5.4,2.3-8.3,2.3l-1.3-0.1c0.4-0.5,1.1-1.6,1.5-2.1
+			c0.6-0.1,1.7-0.4,2.2-0.5C1715.4,837.7,1715.7,837.6,1715.9,837.6z"/>
+		<path class="st3" d="M1483.6,838.9c0.6-0.3,1.7-0.9,2.3-1.2c0.8,0.8,1.5,1.7,2.3,2.5c1.1,1.2,2.2,2.5,3.2,3.8c-1,0-3-0.1-3.9-0.1
+			c-0.7,0-2,0.1-2.6,0.1C1484.4,842.3,1484,840.6,1483.6,838.9z"/>
+		<path class="st3" d="M91.5,839.3c0.8,0.1,1.7,0.2,2.6,0.4c0.9,2.4,2,4.7,3.1,7c0.9,1.5-0.9,2.8-1.3,4.2c-0.5-1.1-1.1-2.2-1.4-3.4
+			c-0.1-2.2-1.7-3.5-3.2-4.7C91.3,841.6,91.4,840.5,91.5,839.3z"/>
+		<path class="st3" d="M125.2,839.3c2.4,0.3,2.2,3,2.8,4.8c-1.8-0.4-3.5-0.8-5.2-1.4C123.6,841.5,124.4,840.4,125.2,839.3z"/>
+		<path class="st3" d="M1181.8,839.4l1.1,0c1.7,0,3.4,0,5.2,0.1c-0.6,1.4-1.2,2.7-1.7,4.1c-1.6-0.7-3.2-1.4-4.9-2.1
+			C1181.6,840.8,1181.7,840.1,1181.8,839.4z"/>
+		<path class="st3" d="M1287.3,839.5c0.6-0.2,1.8-0.6,2.4-0.8c0.1,0.7,0.3,2.1,0.4,2.7c-1.1,0-2.3,0.1-3.4,0.1
+			C1287,841.1,1287.2,840,1287.3,839.5z"/>
+		<path class="st3" d="M1594.2,841.3c1-0.8,2-1.6,3.1-2.3c1,0.3,1.9,0.6,2.9,1c0.1,0.5,0.2,1.5,0.3,2c-0.4,0.4-1.1,1.2-1.5,1.6
+			C1597.3,842.9,1595.7,842.2,1594.2,841.3z"/>
+		<path class="st3" d="M1611.1,839.3c0.7-0.1,2.1-0.3,2.8-0.4c1.2,1.1,2.9,2.2,2.3,4.1C1613.7,842.9,1612.3,841.1,1611.1,839.3z"/>
+		<path class="st3" d="M133.4,845.5c0.4-2,1-4,1.6-5.9c0.8,0.1,2.3,0.3,3.1,0.4c0,1,0.1,2,0.1,3c0,2.3,0.4,4.6,1.8,6.5
+			c-1-1.2-3.6,0-2.3,1.5h-1.6c0.2-0.8,0.7-2.5,1-3.4C135.9,846.9,134.6,846.2,133.4,845.5z"/>
+		<path class="st3" d="M1360.6,841c0.7-0.2,2-0.6,2.6-0.8C1364.8,842.8,1360.2,844.3,1360.6,841z"/>
+		<path class="st3" d="M1246.7,842.3c1.1-0.6,2.2-1.3,3.3-1.9c1.7,1.4,2.8,3.2,2.4,5.6C1250.4,845,1248.5,843.7,1246.7,842.3z"/>
+		<path class="st3" d="M1346.2,840.4c1.5,0.3,3,0.8,4.3,1.7c-0.8,2.1-2.3,3.6-4.3,4.6C1346.1,844.5,1346.1,842.4,1346.2,840.4z"/>
+		<path class="st3" d="M1500.3,841.1c2.2,0.5,4.3,1.3,6.5,2.2c0,0.6-0.1,1.8-0.1,2.5c-2.1-0.1-4.2-0.3-6.2-0.8
+			C1500.4,843.7,1500.4,842.4,1500.3,841.1z"/>
+		<path class="st3" d="M1677,840.8c0.7,0,2.2,0,3,0c0.4,0.3,1.3,1,1.7,1.4c0.3,1.3,0.7,2.6,0.5,4c-1.5-0.9-3.1-1.8-4.6-2.6
+			C1677.5,842.7,1677.2,841.4,1677,840.8z"/>
+		<path class="st3" d="M41.4,842.4c1.2-0.8,3.1-1.5,4,0.2c1,2.7,1.3,5.6,2,8.4h-2.6C44.1,847.9,39.3,845.6,41.4,842.4z"/>
+		<path class="st3" d="M151.6,844c1.5-0.7,3.1-1.4,4.7-2c0.2,0.7,0.7,1.9,1,2.6c2.1,0,5.6-1.4,6.4,1.5c-1.1,2.1-3.6,1.9-5.6,2.5
+			c-1-0.5-2-1.1-3-1.6l-1.1-0.6C153.1,845.5,152.4,844.7,151.6,844z"/>
+		<path class="st3" d="M1278.4,843.8c0.2-0.5,0.7-1.5,0.9-2c0.9,0.1,2.8,0.2,3.8,0.3c0.8,0.6,1.6,1.2,2.4,1.8
+			c-0.2,1.5,0.7,3.9-1.4,4.5c-1.4-0.7-2.6-1.8-3.8-2.8C1279.8,845.1,1278.9,844.2,1278.4,843.8z"/>
+		<path class="st3" d="M1660.1,847c-0.6-1.9-0.4-3.7,0.6-5.4c2.4,0.5,4.8,1.2,7,2.4C1665.2,845.2,1662.7,846.2,1660.1,847z"/>
+		<path class="st3" d="M1673.9,841.5c0.6,0.3,1.8,0.9,2.4,1.2c-0.1,1.2-0.1,2.5-0.1,3.7c1.2,0.5,2.5,1,3.8,1.6
+			c-0.9,0.9-1.9,1.8-2.8,2.7c-1.1-1.8-2.4-3.6-3.9-5C1673.4,844.2,1673.6,842.8,1673.9,841.5z"/>
+		<path class="st3" d="M206.2,844c1.6-0.3,3.2-0.5,4.8-0.8c-0.8,2.4-2.1,4.7-4.8,5.3c-0.4-0.7-1.3-2.2-1.8-2.9
+			C204.8,845.2,205.8,844.4,206.2,844z"/>
+		<path class="st3" d="M294.3,845.2c1.1-0.6,2.2-1.3,3.4-1.9c0.5,0.2,1,0.4,1.5,0.6c0.1,0.8,0.4,2.3,0.5,3c-0.9,1-1.7,2.1-2.6,3.2
+			C296.2,848.5,295.3,846.8,294.3,845.2z"/>
+		<path class="st3" d="M1353.3,845.1c0.2-2.3,2.8-1.8,4.4-2c-0.4,1.2-0.7,2.5-1.1,3.8C1355.4,846.4,1353.6,846.7,1353.3,845.1z"/>
+		<path class="st3" d="M1404.6,843.2c1-1.4,3.7,0.1,2.6,1.6C1406.1,846,1403.5,844.6,1404.6,843.2z"/>
+		<path class="st3" d="M405,847.3c-1.2-1-0.5-2.7-0.4-3.9c1.7,0.3,3.7,0.2,5.1,1.4C410.2,847.5,406.8,847.8,405,847.3z"/>
+		<path class="st3" d="M196,849.1c-2.8-1.2-0.2-3.6,1.1-4.8C198.9,845.8,198.8,849,196,849.1z"/>
+		<path class="st3" d="M1199.4,847c1.7-1.3,4.7-3,5.8,0C1205.6,851,1200.1,849.9,1199.4,847z"/>
+		<path class="st3" d="M112.1,849.2c0.8-1.1,1.6-2.1,2.4-3.2c0.7,1.7,1.3,3.3,2,5h-4.8C111.9,850.5,112,849.6,112.1,849.2z"/>
+		<path class="st3" d="M1648.2,845.9c0.7,0,2.1-0.1,2.9-0.1c0.1,1.3,0.2,2.7,0.3,4c0.4,0,1.2,0,1.6,0c0.5,0,1.4,0,1.9,0
+			c0-0.9,0-2.8,0-3.7c0.9,0,1.8,0.2,2.6,0.3c1.3,1.7-0.6,3.2-1.5,4.5h-8C1648,849.3,1648.1,847.6,1648.2,845.9z"/>
+		<path class="st3" d="M166,847.2c1.8,0.1,3.6,0.2,5.4,0.3c0.1,1.2,0.2,2.3,0.3,3.5h-6.1C165.8,849.7,165.9,848.4,166,847.2z"/>
+		<path class="st3" d="M286.1,851c1.1-1.4,2.1-2.9,3.1-4.3c0.6,0.2,1.9,0.5,2.5,0.7c0,1.2,0.1,2.4,0.1,3.7H286.1z"/>
+		<path class="st3" d="M1446.6,851c0.6-1.5,1.2-3.1,1.9-4.6c0.6,1.1,1.1,2.3,1.3,3.6l-0.4,1H1446.6z"/>
+		<path class="st3" d="M1616.4,848c1.5-0.5,2.9-1,4.4-1.6c-0.2,1.5-0.3,3-0.4,4.6h-2.4C1617.5,850,1616.9,849,1616.4,848z"/>
+		<path class="st3" d="M86.7,851c0.6-1.2,1.2-2.4,2.4-3.1c0.9,1,1.6,2,2.4,3.1H86.7z"/>
+		<path class="st3" d="M147.2,851c1-0.9,1.5-2.4,2.8-2.8c0.7,0.6,1.4,1.2,2.1,1.9l0.9,1H147.2z"/>
+		<path class="st3" d="M410.6,848.4c0.8,0,1.6,0,2.5,0.1c0.4,0.6,1.1,1.9,1.4,2.5H410C410.2,850.3,410.5,849,410.6,848.4z"/>
+		<path class="st3" d="M1371.4,847.9c1.2-0.2,2.5-0.3,3.8-0.5c0,1.2,0.1,2.4,0.2,3.6h-3.2c-0.4-0.5-1.2-1.5-1.7-1.9L1371.4,847.9z"
+			/>
+		<path class="st3" d="M1598.1,848.2C1601.5,848.4,1596.5,851.2,1598.1,848.2z"/>
+		<path class="st3" d="M1703.4,847.7c1.8,0,3.5,0.1,5.3,0.1C1708.3,851,1702.8,851.8,1703.4,847.7z"/>
+		<path class="st3" d="M1508.5,851c2.2-1.7,5.1-1.7,7.8-2.3c0.6,0.8,1.2,1.5,1.8,2.3H1508.5z"/>
+		<path class="st3" d="M1699.4,851c-1.4-2.8,2.9-2.6,2.8,0H1699.4z"/>
+	</g>
+	<g id="_x23_7f8e9fff">
+		<path class="st4" d="M317.2,0h3c-0.3,0.6-0.8,1.8-1.1,2.3c-0.5,0.2-1.7,0.5-2.2,0.7C316.9,2.3,317.1,0.8,317.2,0z"/>
+		<path class="st4" d="M419.1,0h1.1c1.1,1.5,2.2,3,3.3,4.6c-0.1,1.4-0.3,2.8-0.4,4.2c-0.5,0-1.6,0-2.2,0c-1.7-1.6-3.1-3.5-4.7-5.2
+			c-1,1.9-2.1,3.9-3.1,5.8c2,0.4,4,0.8,6,1.1c-1.1,2.9-3.1,5.3-5.9,6.6c-0.3-1.5-0.6-3.1-0.9-4.6c-2.1-2.1-1.9-4.8-1-7.5l-1.2,0
+			c-0.9,0-2.8,0-3.7,0c0.7-1.1,1.4-2.3,2.2-3.4c3-0.6,6,0.6,9.1,0.5C418.1,1.7,418.8,0.6,419.1,0z"/>
+		<path class="st4" d="M543.8,0h3.2c-0.2,1.2-0.3,2.5-0.4,3.7c1.2,0,2.4-0.1,3.6-0.1c-0.8,1.2-1,3.7-3,3.1c-1.5-0.5-2.9-1.5-3.9-2.8
+			C543.3,2.6,543.5,1.3,543.8,0z"/>
+		<path class="st4" d="M1364.1,0h2.7c1.5,1.4,3.8,2.6,3.7,5c-0.7,0.9-1.5,1.7-2.2,2.5C1366.7,5.1,1365.4,2.5,1364.1,0z"/>
+		<path class="st4" d="M1389.1,0h3.4c0.8,2.4,1.6,4.7,2.5,7.1c-1.8-2-4.2-3.2-6.7-4.1c0,1.1-0.1,2.2-0.1,3.3c1,0.4,1.9,0.7,2.9,1.1
+			l0.4,0.3c-0.9,0.6-1.8,1.1-2.7,1.7c-0.3,0.3-0.9,0.9-1.2,1.2c-0.5,1.7-0.9,3.4-1.4,5.1c-0.2-0.2-0.8-0.6-1-0.8
+			c1.6-4.3,1.2-8.9,1.1-13.3C1387.1,1.2,1388.4,0.4,1389.1,0z"/>
+		<path class="st4" d="M1397.2,0h5.5c2.4,1.8,4.8,3.5,7.3,5.2c-2.1,1.7-4.7,2-7.2,2.6c-1.1,0.8-2,1.9-2.9,2.9c1,0,2,0,3.1,0
+			c0.4,0.4,1.1,1.1,1.5,1.5c0,1.3,0,2.7,0.1,4c1.8,0.9,3.5,2.1,4.3,4.1c-4.3,0.8-7.7-4.9-11.7-2.4c-0.1,0.4-0.2,1.2-0.3,1.6
+			c-1.1,0.3-4.2-0.7-3.1,1.5c-0.1,2.2,2,3.1,3.4,4.4c-0.7,0.1-2,0.4-2.6,0.5c1,1.3,2,2.6,3,3.9c-0.7,0.1-2.1,0.1-2.7,0.2
+			c0,1.2,0,2.5,0,3.7c-1.4,0-2.8,0.1-4.1,0.1c0.6-0.7,1.2-1.4,1.9-2c-0.5-1-1.1-2-1.5-3c0.6-0.3,1.8-1,2.5-1.3
+			c-1.4-2.5-3.6-5-3.4-8.1c0.9-0.7,1.8-1.3,2.8-2c0.4-0.7,0.9-1.5,1.3-2.2c1.8,0.3,3.6,0.6,5.4,0.9c-1.1-2.2-2.7-4-4.5-5.6
+			c0.6-0.1,1.8-0.4,2.5-0.5c-0.7-0.9-1.4-1.9-2.1-2.8c1.1,0.4,2.3,0.8,3.5,1.2C1399.2,5.4,1399.3,2.3,1397.2,0z"/>
+		<path class="st4" d="M321.9,4.4c0.5-0.7,1.5-2.1,2-2.8c3.2,0.9,6.4,2,9.4,3.3c1.9,1,3.9-0.3,5.7-0.8c2.3-0.9,4.7-1.1,7.1-1.4
+			c-1.3,1.4-2.3,3.1-2.5,5c-0.8-0.1-1.7-0.1-2.5-0.2c0.2-1,0.4-2,0.5-3.1c-0.8,0.2-2.5,0.7-3.4,0.9c0.1,0.8,0.3,1.7,0.5,2.6
+			c-0.5,0.1-1.4,0.3-1.9,0.3c-1.8-1.5-3.8-2.5-5.7-0.7C328.3,5.8,325,5.3,321.9,4.4z"/>
+		<path class="st4" d="M455.2,3.3c1.6,0.6,3.1,1.3,4.7,1.9c-2.2,0.4-3.7,2.1-5,3.8c-1.4,1.8-3.8,1.7-5.9,1.9
+			c0.4-1.2,0.3-2.7,1.3-3.6c1.1,0.3,2.1,0.7,3.1,1.1C454.1,6.7,454.6,5,455.2,3.3z"/>
+		<path class="st4" d="M1264.1,5.2c2.1-0.7,4.2-1.2,6.4-1.8c0,2.3,0.1,4.5,0.1,6.8c-1.5,0.6-3,1.3-4.4,2c-0.2,0.1-0.7,0.4-1,0.5
+			c0.3-1.5,0.6-3.1,0.9-4.6c-0.1-0.2-0.4-0.7-0.5-0.9C1265.2,6.7,1264.5,5.7,1264.1,5.2z"/>
+		<path class="st4" d="M472.3,4c1.2-0.1,2.2,0.3,2.9,1c0.9,2.6-1.2,2.5-3.1,2.2C472.2,6.5,472.3,4.8,472.3,4z"/>
+		<path class="st4" d="M480,6c1.5-1.9,4.8-1.8,4.9,1C484.1,9.8,481.5,6.6,480,6z"/>
+		<path class="st4" d="M404.2,6.2c1.6-0.5,2.4,1.5,1.5,2.6c-0.4,0.1-1.1,0.4-1.5,0.5C403.1,8.6,402.6,6.6,404.2,6.2z"/>
+		<path class="st4" d="M1361.4,6c2.9,1.7,6.8,4.1,6.2,8c0.1,1.2-1.1,1.5-1.8,2c-0.7-2.5-2.4-4.3-4.2-6.1
+			C1361.4,8.6,1361.3,7.3,1361.4,6z"/>
+		<path class="st4" d="M1174.2,14.6c-0.4-2.9,1.8-4.7,4.2-5.7c0.1,2.4,0.1,4.9,0.1,7.3C1177.1,15.7,1175.7,15.2,1174.2,14.6z"/>
+		<path class="st4" d="M395.1,12.8c0.6-3,4.1-2.6,6.3-1.6C399.6,12.4,397,14.8,395.1,12.8z"/>
+		<path class="st4" d="M573,11.2c1.3,0.5,3.6,0,3.7,1.9c0.4,1.5-0.6,2.7-1.3,3.9C574.3,15.2,573.5,13.3,573,11.2z"/>
+		<path class="st4" d="M1151.2,11.2c1.3,0.1,2.7,0.2,4,0.5c0.3,1,0.6,2.1,0.8,3.1c-1.5-0.1-3-0.2-4.5-0.4
+			C1151.4,13.4,1151.3,12.3,1151.2,11.2z"/>
+		<path class="st4" d="M1250.3,11.5c2.4-0.2,4.8-0.1,7.2-0.6c0.1,0.5,0.2,1.5,0.2,2l0.1,1.1c-1.5-0.4-2.6,0.1-3.3,1.5
+			C1252.5,14.9,1249.1,14.6,1250.3,11.5z"/>
+		<path class="st4" d="M1194,15c1.7-0.4,3.5-1,5.2-0.2c1,2,0.5,4.3-1.2,5.8C1196.6,18.8,1195.2,17,1194,15z"/>
+		<path class="st4" d="M1233.1,15.3c0.5-0.4,1.6-1.2,2.2-1.6c0.6,0.2,1.9,0.6,2.5,0.7c-0.4,1.8-0.8,3.5-1.1,5.3
+			c-0.4-0.5-0.8-1.1-1.2-1.6C1234.6,17.2,1233.9,16.3,1233.1,15.3z"/>
+		<path class="st4" d="M357.1,20.8c0.2-1.8,0.9-3.5,1.5-5.2c0.2,0.8,0.6,2.3,0.8,3.1c0.9-0.3,1.7-0.5,2.6-0.8
+			c-0.3,0.6-1,1.9-1.3,2.6c1.8,0,3.7,0,5.5,0c-0.4,1.7-0.9,3.3-1.4,5c-0.2,0-0.8,0-1,0C361.6,23.9,359.3,22.4,357.1,20.8z"/>
+		<path class="st4" d="M482.6,16.1c1.4,0.1,2.7,0.2,4.1,0.3c-0.1,1-0.2,2-0.3,3.1c-2.2,0.1-4.5,0.1-6.7,0.1c0.5-0.2,1.5-0.6,2-0.8
+			C482,18,482.4,16.8,482.6,16.1z"/>
+		<path class="st4" d="M739,16c1.7,1.5,3.5,3.1,3.9,5.5c-1.2,0.4-2.3,0.9-3.4,1.3C738.7,20.6,738.2,18.3,739,16z"/>
+		<path class="st4" d="M1187.2,17.4c0.8-0.4,1.7-0.8,2.5-1.1c1.2,1.6,2.5,3.2,3.6,4.9c0,0.3-0.1,0.9-0.1,1.2c-2-0.4-4-0.8-6-1.2
+			C1187.2,19.9,1187.2,18.6,1187.2,17.4z"/>
+		<path class="st4" d="M409.7,19.1c1.5-0.5,2.9-1,4.4-1.3c1.4,2.3-1.3,4.9-1.7,7.3c5.1,0.2,10.2,0.1,15.3-0.1c0.6,0,1.8,0.1,2.4,0.1
+			c8.6,0.3,17.3,0.3,26,0c0.3-1.4,0.7-2.8,1.1-4.3c0.2,1.4,0.5,2.9,0.7,4.3c8.1,0.2,16.2,0.3,24.3-0.2c7.2-0.4,14.4,0.5,21.6,0.2
+			c0.2-0.7,0.6-2.2,0.8-3c0.8,1,1.6,2.1,2.4,3.1c2.3,0,4.6-0.1,6.9-0.1c-0.2-1.3-0.4-2.5-0.5-3.8c0.5,0,1.5-0.1,2-0.1
+			c0.1,1.4,0.3,2.7,0.5,4.1c2.4,0.2,4.5-0.9,5.8-2.8c0.9,0.6,1.7,1.2,2.6,1.8c11.2,1.7,22.5,0,33.8,0.9c17.6,0,35.3,0.2,52.9-0.1
+			c0.2-0.7,0.6-2.2,0.8-3c1.6,1.3,2.9,3.3,5.2,3.1c7.9,0.1,15.9,0.2,23.8-0.2c1.8,0,3.6,0,5.4,0c6.9,0.1,13.9,0.8,20.8-0.2
+			c4.6-0.8,9.2,0.9,13.8,0.4c0.5,0,1.4-0.1,1.9-0.1c149.1,0.2,298.2,0,447.3,0.1c11-0.3,22.1,0.4,33.1-0.4c1.9-0.1,3.7-0.1,5.6,0
+			c3.2,0.5,6.3,0.3,9.2-1.2c3.1,1.6,6.5,1.8,9.9,1.6c1.7,0,3.4-0.1,5.1-0.2c1.3,0,2.6-0.1,3.9-0.2c1.4-0.1,2.8-0.1,4.2-0.2
+			c3.4,0.5,6.9,0.5,10.4,0.3c1.1,0.1,2.2,0.1,3.4,0.2c4.8,0.1,9.6,0.1,14.4-0.2c2.7-0.3,5.5-0.5,8.2-0.4c2.3,0.4,4.7,0.7,7,0.5
+			c1.7-0.1,3.4-0.2,5.1-0.2c3.4,0.1,6.8,0.3,10.2,0.1c2-0.1,4-0.3,6-0.4c0.2,0.1,0.5,0.2,0.7,0.3c0.2-1.5,0.4-3,0.7-4.4
+			c1-0.1,2-0.2,3.1-0.2c0.3,1.6,0.6,3.2,0.9,4.8c3.3,0.2,6.5,0.2,9.8-0.1c1.4-1.5,2.9-2.9,4.5-4.2c-0.1,1.4-0.2,2.8-0.2,4.2
+			c5.4,0.3,10.7,0.2,16.1,0c-0.3-1.3-0.6-2.5-0.9-3.8c0.8-0.4,1.5-0.8,2.3-1.2c-0.2,1.6-0.3,3.3-0.4,4.9c3.9,0.5,7.9,0.4,11.7-1.1
+			c3.1,1.1,6.9,2.1,10,0.7c-1-1-2-1.9-3-2.8c2.6-0.5,5.3-1,7.9-1.6c-1.5,1.3-3.9,2.4-4.2,4.6c8.2,0.8,16.6,0.3,24.8,0.3
+			c0.5,0,1.6,0,2.2,0.1c3.5,0.2,7.1,0.3,10.6-0.4c-1.3-1.2-2.5-2.4-3.5-3.7c2.7,0.8,4.7,2.9,7.4,4c4.1,0.9,8.3,0.1,12.4,0l0.7,0.4
+			c-25,0.6-50.1,0.1-75.2,0.3c-293.7-0.1-587.3,0-881,0c-11.5-0.1-23,0.3-34.4-0.1c6.3-1.9,12.9-0.1,19.2-0.9
+			C408.6,23,409.1,21,409.7,19.1 M409.7,19.8c-1,1.6-0.2,5.1,2.2,3.9C412.9,21.8,412.7,18.5,409.7,19.8z"/>
+		<path class="st4" d="M328.6,26.9c0.9,0.8,1.9,1.7,2.8,2.5c0.9,1.3,2.6,2.8,1,4.3c-2.5,0-3.6-2.7-4.9-4.5
+			C327.9,28.6,328.4,27.5,328.6,26.9z"/>
+		<path class="st4" d="M1396.5,35.9c0.6-1.2,2-3,3.6-2c0.2,1.4,0.1,2.8-0.3,4.2C1398.6,37.4,1396.8,37.4,1396.5,35.9z"/>
+		<path class="st4" d="M331.3,45.2c1-1.5,2.6,0.4,3.8,0.6c0.3,0.3,0.8,1,1.1,1.3c1.9,0.9,3.8,1.7,5.8,2.4c0,0.8,0,1.6,0,2.5
+			c-3.5,2.5-4.3,7-6.3,10.6l0.5,0.4c1.9,0.5,3.9-0.2,5.8-0.6c0,1.1,0,2.2,0,3.3l-0.7-0.3c-2-2.1-3.7,0.2-5.2,1.7
+			c-0.1-0.7-0.3-2.1-0.4-2.8c-2.1-1.3-3.4,2.1-4.9,3.2c1.5,2.6,1.9,5.6,2,8.6c-1.5-0.8-3-1.5-4.4-2.3c-1.3-8,5.7-13.2,9.9-18.9
+			c-0.4-0.6-1.2-1.9-1.6-2.6c-1.7,2.4-3.1,5-5.1,7.2c-1.5,0.2-2.9-0.1-4.4-0.3c0.2,2.2,1.2,4.8-1.2,6.2c-0.3-0.2-0.9-0.5-1.2-0.6
+			c-0.4-2.5-0.8-5-1.5-7.4c2.4-0.5,4.8-1.1,7.1-1.9c1.7-1.2,3.9-2.4,4.5-4.5c0-1.7-2-1.5-3.2-1.9C331.7,47.8,329.7,46.1,331.3,45.2z
+			"/>
+		<path class="st4" d="M319.9,61.1c0.3-0.4,0.8-1.3,1.1-1.7c0.7,0.4,2.2,1.3,2.9,1.7c-1,0.9-2,1.9-2.9,2.8
+			C320.7,63.2,320.2,61.8,319.9,61.1z"/>
+		<path class="st4" d="M985.2,78.5c1.4-0.4,1.9,0.1,1.5,1.5C985.3,80.4,984.8,79.9,985.2,78.5z"/>
+		<path class="st4" d="M1406.8,86.2c1.7-1,3.6-1,5,0.4c-1.4,0.7-2.8,1.3-4.2,2c-0.8,1.3-1.5,2.7-2.2,4c-0.4-0.2-1.1-0.5-1.5-0.6
+			c0.1-1.5,0.3-3.1,0.5-4.6C1405.1,87,1405.9,86.6,1406.8,86.2z"/>
+		<path class="st4" d="M1411.2,90.4c0.7-2.7,1.7-5.4,4.7-6.2c0,3.8,0.1,7.6,0,11.4c-1.5-1.1-2.9-2.3-4.4-3.5
+			c-0.6-0.1-1.8-0.4-2.3-0.5C1409.9,91.2,1410.6,90.8,1411.2,90.4z"/>
+		<path class="st4" d="M325.6,97.4c2.6-0.7,5.2-1.4,7.8-2.2c0.2,0.8,0.4,1.7,0.7,2.6c-1.7-0.1-3.4-0.1-5.1-0.1
+			c0.6,1.5,1.6,2.6,3.1,3.4c-0.7,0.4-1.5,0.8-2.2,1.2c-1-0.6-2-1.2-3-1.9c-0.3,0.3-0.9,0.9-1.2,1.2c-1.7,1.8-3.4,3.6-5.1,5.4
+			c0-1.4-0.5-3,0.4-4.1c1.2-1,2.6-1.6,4-2.3C325.2,99.5,325.4,98.5,325.6,97.4z"/>
+		<path class="st4" d="M1390.6,97.6c0.9,1.5,1.9,3,3,4.4c0.9,0.7,1.8,1.4,2.7,2c-0.3,0.6-1,1.7-1.3,2.2c-1.6-1.1-2.9-2.6-4.1-4.1
+			c-0.5,8.7,0,17.3,0,26c1.9-0.1,3.8-0.2,5.7-0.4c-1.1,1.8-3,3.8-1.8,6c0.8,3.8,5.1,2.9,8,3.6c-1.2-1.6-2.9-3.2-2.7-5.4
+			c1.3-1.7,3.1-2.9,4.7-4.3c0.6,1.5,1.2,3.1,1.8,4.7c1,0.1,2,0.2,3,0.4c-0.5-1.2-1-2.3-1.5-3.4c2.4-0.5,6.9-2,7.3,1.6
+			c-0.8,1.8-2,3.2-3,4.8c-1.2,1.5-1.7,3.3-2.1,5.1c0.6-0.1,1.7-0.1,2.3-0.2c-0.1,1.9,0,3.8-0.3,5.7c-1.3,1.9-3.6,0.1-5.3,0
+			c1.3-3.7,3.1-7.2,3.1-11.2c-1.2,0.1-2.3,0.2-3.4,0.3c-1.4,3.9-4,7.4-4.2,11.6c2.3,2.5,6.2,2.1,9.2,3.4c1.5,0.3,1.6,0.9,0.3,1.7
+			c-2.6,1.3-5.4-0.6-7.9-1.4c-2.5-1.2-5.4-1.1-7.9-2.1c-1.1-2.3,0.2-5.7-3-6.6c-0.5,2.1-1,4.2-2.6,5.8c0-2.2-0.1-4.5-0.1-6.7
+			c2.7,0.9,5.5,1.3,8.3,1.2c-0.2-0.6-0.5-1.9-0.6-2.5c1.3,0.1,2.7,0.1,4.1,0.1c-1.5-2.5-4.1-2.6-6.3-1c-0.9-0.4-1.8-0.8-2.7-1.2
+			c-0.7-1.6-1.5-3.3-2.5-4.8c0.5-0.3,1-0.6,1.6-0.8c-1.8-1.6-2.3-3.9-2.1-6.2C1390.5,116.6,1390.1,107.1,1390.6,97.6 M1410.5,130.1
+			c-0.8,1.9,3.3,2.8,3.6,0.8C1413.8,129.4,1411.5,129.1,1410.5,130.1 M1398.6,143.3c-0.5,1.4-0.9,2.9-1.4,4.3c1.5,0,2.9,0,4.4,0
+			c0-1.4-0.1-2.9,0-4.3C1400.6,143.4,1399.6,143.4,1398.6,143.3 M1409.2,143.4c-1.5,1.3,0.9,3.7,2.2,2.2
+			C1412.7,144.3,1410.5,142.1,1409.2,143.4z"/>
+		<path class="st4" d="M336,106.9c1.6-0.3,3.2-0.6,4.8-0.8c0.4,1,0.8,2.1,1.2,3.2c0,0.6,0,1.8,0,2.4c-3.2,0.5-6.4,0.9-9.7,1.4
+			c0.1,1.2,0.2,2.3,0.2,3.4c-3,2-5.6,6.4-9.8,4.6c-2,1.1-4.1,2-6.2,2.7c0-1.6,0-3.2,0-4.9c1.8-0.1,3.7-0.1,5.6-0.2
+			c2.3-0.7,4.6-1.2,7-1.6c-0.6-1.3-1.3-2.5-1.9-3.8c1.1-1,2.1-2,3.2-3c1,2.2,3.7,2,4.8,0c-0.3-0.6-0.8-1.8-1.1-2.4
+			C334.6,107.6,335.3,107.2,336,106.9z"/>
+		<path class="st4" d="M841.7,113.3c-2.4,0.4-2.4-3.9,0-2.1C841.6,111.7,841.7,112.8,841.7,113.3z"/>
+		<path class="st4" d="M1402.9,113.1c1.2,1.3,2.5,2.6,3.7,3.9c-0.9,0.1-2.7,0.2-3.7,0.3C1400.3,117.4,1403,114.3,1402.9,113.1z"/>
+		<path class="st4" d="M1393.7,120.3c2.3-0.4,4.6,0.2,6.2,2c4.9-1.2,10-0.3,15-1c-0.7,1.1-1.4,2.2-2.2,3.1c-1.4,0.2-2.9,0.1-4.3,0.1
+			c-0.9-0.8-1.5-1.9-2.6-2.3c-1.1,0-2,0.8-2.9,1.2c-1.4,0.1-2.7,0.2-4,0.3c-0.2,1-0.3,2-0.4,3c-0.1-0.7-0.3-2.1-0.4-2.8
+			C1396.5,123,1394.9,121.9,1393.7,120.3z"/>
+		<path class="st4" d="M334.8,121.2c1.6,0.5,3.2,1,4.9,1.5c-0.6,1.1-1.3,2.2-1.9,3.4c0.5,1.9,2.7,1.9,4.2,2.6c0,0.5,0,1.6,0,2.1
+			c-1,0.3-1.9,0.7-2.9,1c-0.4-0.9-0.8-1.7-1.2-2.6c-2.4,0.8-4.9,1.4-7.4,2.1c1.4-0.9,2.8-1.9,4.1-2.9c0.1-0.5,0.2-1.4,0.3-1.8
+			c-1.9,0.3-4,0.7-5.7-0.5c1.5-0.9,3-1.7,4.5-2.5C333.9,122.9,334.5,121.8,334.8,121.2z"/>
+		<path class="st4" d="M316.5,131.8c3.3-0.1,6.6-0.4,9.6-1.6c0.9,0.5,1.8,1,2.7,1.6c-0.1,0.6-0.3,1.7-0.5,2.3
+			c1.3,0.1,2.6,0.2,3.8,0.2c-2.8,1.8-5.8,0.8-8.4-0.9c-2.4,0.5-4.9,1-7.3,1.5C316.5,134.2,316.5,132.6,316.5,131.8z"/>
+		<path class="st4" d="M334.2,135.4c2.1-1.1,2.7,2.3,0.6,2.7C333.1,140,331.1,134.6,334.2,135.4z"/>
+		<path class="st4" d="M319.3,138.1c1.9-1.8,4.3-2.8,6.9-2.6c-0.6,1.8-0.7,4.5-3.1,4.9C321.4,141.1,320.5,139,319.3,138.1z"/>
+		<path class="st4" d="M316.5,148.3c1.5-0.6,3-1.2,4.4-1.9c0.7,0.6,1.5,1.1,2.2,1.7c-0.5,0.6-1,1.2-1.5,1.8c0.8,0.8,1.5,1.5,2.3,2.3
+			c1.2,0.2,2.5,0.5,3.7,0.7c-0.8,0.3-1.7,0.6-2.5,0.9c-0.6-0.4-1.8-1.1-2.5-1.5c-0.8,1-1.6,2-2.4,3.1c-1.3,0.2-2.7,0.4-4,0.6
+			C316.4,153.4,316.5,150.9,316.5,148.3z"/>
+		<path class="st4" d="M1406.3,162.6c-1.2-1.8-2.6-4.2-0.5-6c0.5,0.1,1.6,0.2,2.2,0.3c0.3,2.8,1,5.6,0.2,8.4c-0.7-0.2-2-0.7-2.7-1
+			C1405.8,163.9,1406.2,163,1406.3,162.6z"/>
+		<path class="st4" d="M1409.5,156.5c0.7,0,2.2,0.1,2.9,0.1l1.2,0.4c-0.2,0.7-0.5,2.2-0.6,3c-0.5,0-1.5,0.1-2,0.1l-1.3-0.2
+			C1409.6,159,1409.5,157.3,1409.5,156.5z"/>
+		<path class="st4" d="M322.1,166.5c1.1-0.4,2.3-0.9,3.4-1.3c-0.1,3.2-0.1,6.4,0.9,9.4c-0.5,0-1.5,0-2,0
+			C324.6,171.7,323.2,169.1,322.1,166.5z"/>
+		<path class="st4" d="M1402,164.4c1.9,1.1,3.8,2.4,5.6,3.7c-0.4,1.1-0.6,4.8-2.4,2.9c-1.4-1-2.7-2.3-3.8-3.7
+			C1401.5,166.5,1401.8,165.1,1402,164.4z"/>
+		<path class="st4" d="M573.1,174.5c0.9,2.6,1,6.3,4.2,7.1c1.6,0.6,2.7-1.1,3.9-1.8c-1.5-1.1-3.1-2.1-4.6-3.2
+			c3.4,0,6.8-0.2,10.3-0.4c-2.7,2.5-5.3,4.9-8.2,7.2c-0.4,3.1-1.8,5.8-3.3,8.5c-4.9-0.5-9.9-0.2-14.9-0.5c3-0.6,6.1-0.6,9.2-1.2
+			c2.3-2.3,4.7-4.8,7.7-6.2c-1.7-1.4-3.6-2.7-5-4.4C572.4,177.8,572.9,176.2,573.1,174.5z"/>
+		<path class="st4" d="M321.2,186.6c-1-2.3-3-5.7-0.9-7.8c0.1,1.5,0.2,3.1,0.2,4.6c1.3,0.1,2.6,0.2,3.9,0.3
+			C325.1,185.9,323.4,187.5,321.2,186.6z"/>
+		<path class="st4" d="M693.7,179.5c7.5-0.6,14.9,1.1,22.3,1.1c12.7-0.1,25.3-0.1,38-0.2c14.3-1.4,28.6-1,42.9-1.1
+			c5.3-0.2,10.5,0.5,15.7,1.3l-0.1,0.7c-16.4-2.5-33-1.9-49.5-0.5c-12.7-0.4-25.4,1.1-38.1,0.5c-2.1,0.1-4.8-0.5-6.2,1.5
+			c-3,3.5-7.5,6.1-8.4,11c-2.3-1-4.7-1.7-7.1-2.2c0.6-1.3,1.2-2.5,1.8-3.8c0.2,0.9,0.7,2.7,1,3.6c3.7-2.6,6.4-6.3,8.3-10.4
+			C707.5,180.7,700.6,180.9,693.7,179.5z"/>
+		<path class="st4" d="M1096.7,180.4c4.2-1.5,8.7-0.8,13-0.9c2.3,2.5,4.9,4.8,6.5,7.9c-3.5-1-5.4-5.4-9.5-4.2
+			c-0.1,1.7-0.1,3.4-0.4,5c-1.2,1-2.5,1.6-3.8,2.3c-1.2-0.4-2.4-0.8-3.6-1.2c-0.2-0.5-0.6-1.5-0.8-2c1.5-2.5,3.3-4.9,6-6.2
+			C1101.5,180.9,1099.1,180.6,1096.7,180.4 M1102.3,183.4c-1.2,1.4-2.2,3.1-3.2,4.6c2.5,1.2,5.4,0.9,6.9-1.7
+			C1104.8,185.3,1103.7,184.2,1102.3,183.4z"/>
+		<path class="st4" d="M543.2,181.1c4.2-0.4,4.3,5.1,6.4,7.7c1.1-0.6,2.3-1.2,3.4-1.8c-0.9,2-2,3.9-2.9,5.9
+			c-1.9,0.5-3.7,1.2-5.6,1.8c1.7-3.6,2.8-7.6,1.4-11.6c-0.6,0-1.8-0.1-2.4-0.1c0,4.8-3.9,8.5-3.5,13.3c-7.7,3.3-14.4,8.6-20.1,14.6
+			c0.3-2.5,0.2-5.3,2-7.2c2.6-3.6,7.3-4.6,10.6-7.4c1.6-1.4,3.7-1.6,5.6-2.1C540.3,190.1,541.5,185.4,543.2,181.1z"/>
+		<path class="st4" d="M910.7,180.7c8.3-0.1,16.6-0.3,24.9-0.2c0,1.4-0.1,2.8-0.1,4.3c-1.6-1.6-3.4-3-5.6-3.6
+			c-0.2,1-0.5,2.9-0.7,3.8c-1.7-2.1-3.6-4.1-6.5-3.6c-0.1,0.9-0.3,2.6-0.4,3.4c-0.4-0.1-1.1-0.4-1.5-0.6c-0.2-1-0.5-1.9-0.7-2.9
+			c-1.9,0.4-4,0-5.7,1.1c-1.1,1.5-1.8,3.2-2.6,4.8c0.7,0.5,1.3,0.9,2,1.4l0.9,1.2c-1.3-0.1-2.5-0.2-3.7-0.3c0.8,1.8,1.6,3.5,1.9,5.4
+			c-3.3,0.8-6.2-1.8-9.5-2.1c0.1,0.6,0.2,1.8,0.3,2.3c-1.9-0.9-2.5-3-2.9-5c2.6,0.9,5.3,1.5,8,1.8c-0.1-0.5-0.4-1.5-0.5-2
+			c-1.5-0.9-3-1.8-4.6-2.6C906.6,185.8,909.5,183.9,910.7,180.7z"/>
+		<path class="st4" d="M943.4,180.6c5,0,10.2-1,15.1,0.5c0.9-0.1,1.9-1,2.7-0.5c3.9,3.2,8.8,4.5,12.8,7.5c-1.2,1.6-2.3,3.3-3.5,4.9
+			c0.5,0.4,1.6,1.4,2.2,1.8c-2.4-0.2-5.1,0-7.1-1.6c-0.4-2.4-0.1-4.9,0-7.3c-4.8-0.9-8.1,3.7-12.7,3.7c-2.9,0.2-5.7-1-8.4-2
+			C944.7,185.3,944.3,182.8,943.4,180.6 M947.1,183.1c-2,5.3,8.6,7.4,8.4,1.8C953.5,182.6,949.9,183.3,947.1,183.1z"/>
+		<path class="st4" d="M499.1,193.7c3.6-2.1,7.3-4.1,11.1-5.8c-0.4,1-0.8,2-1.1,3.1c-1.8,1.5-3.3,3.4-5.3,4.5
+			c-1.5-0.3-2.8-0.9-4.2-1.5L499.1,193.7z"/>
+		<path class="st4" d="M1117.5,188c0.2,0.3,0.6,1,0.8,1.4c-0.7,5.7-7.9,3.4-11.8,4c3.2,3,7.9,0.6,11.5,3c1.6-0.6,3.1-1.2,4.7-1.8
+			c0.4,0.6,1.3,1.7,1.7,2.3c-1.1,2.3-2.2,4.6-3.2,6.8c2-0.5,4-1,6-1.5c-2.2,1.5-4.4,3-6.7,4.3c-0.2,4.6-2.8,8.3-6.1,11.3
+			c0.6,1.5,1.1,2.9,1.7,4.4c1.6,0.4,3.1,0.7,4.7,1.2c-2.2,1.8-4.9,4.6-7.9,2.6c-2.7-0.8-1.3-3.8-0.8-5.6c1-4.5,5.4-7.1,6.7-11.4
+			c-3.2-1.8-6.4-3.6-9.3-5.8c-2.9,1.1-5.8,2.1-8.6,3.1c0.9-0.8,1.7-1.6,2.6-2.5c-0.9-1.1-1.8-2.1-2.7-3.2c0.8-1.2,1.5-2.4,2.4-3.6
+			c0.3,0,1,0.1,1.3,0.1c0.8,1.5,1.5,3.1,2.2,4.7c1.8-1.2,3.5-2.6,5.4-3.6c2-0.6,3.4,1.1,4.9,2.2c-1.1,1.5-2.2,3-3.2,4.5
+			c1.4,0.2,2.9,0.4,4.4,0.6c1.8-2.3,3.4-4.8,3.5-7.9c-5.2-0.2-10.3-1-15.4-2.1c0-1.1,0-2.3,0-3.4c2.9-0.3,5.9-0.4,8.9-0.9
+			C1116.9,191.2,1117.6,189.6,1117.5,188z"/>
+		<path class="st4" d="M833,189.6c2.3,1.7,4.3,3.7,6.2,5.9c-2.2,0.3-4.8,1.6-6.7-0.1C830.2,194.1,832.1,191.3,833,189.6z"/>
+		<path class="st4" d="M784.1,196.1c0.9-1.3,1.8-2.7,2.9-3.9c0.9,0.5,1.8,1.1,2.7,1.6c-0.4,1.4-0.9,2.9-1.3,4.4
+			c-9-3.2-18.6-3.2-28-3c4.2-1,8.5-1.4,12.8-1.3C776.9,194.4,780.5,195.5,784.1,196.1z"/>
+		<path class="st4" d="M520.5,194.4c0.9-1.5,2.9-0.8,4.4-1.1c-0.8,1.8-1.7,3.6-2.5,5.4c-1-0.1-2-0.2-3-0.4
+			C519.6,197,519.5,195.5,520.5,194.4z"/>
+		<path class="st4" d="M637.7,197c1.8,1.6,3.6,3.1,5.4,4.7c-0.1,3.9,2.1,7.1,4.5,9.9c-4.4,2.1-7.8-1.6-10.8-4.3
+			c-0.6,1.3-0.8,2.8-1.8,3.9c-2,0.2-4,0.2-5.9,0.2c-0.3,2.1-0.5,4.2-0.8,6.3c0.9,0.8,1.9,1.6,2.8,2.5c-1.6,2.1-3.2,4.1-4.9,6.1
+			c-1.1-0.6-2.2-1.2-3.2-1.9c-0.6,0.2-1.7,0.5-2.2,0.7c-0.2-0.3-0.5-0.9-0.7-1.2c2.7-1.8,5.6-3.8,6.8-7c0.8-2.3,0.9-4.8,1.2-7.2
+			c1.6-0.2,3.3-0.3,4.9-0.7C635.9,205.8,637.8,201.4,637.7,197z"/>
+		<path class="st4" d="M799.5,202.5c-1.1-3.2,2.4-4.4,4.5-5.8c0.5,0.6,1.4,1.8,1.8,2.3C804.2,201,802.4,203.7,799.5,202.5z"/>
+		<path class="st4" d="M506.2,203c0.5-0.1,1.4-0.4,1.9-0.5c2.3,1.4,5,2.5,6.8,4.5c-0.6,1.5-2.3,1.9-3.8,1.7
+			C509,207.2,507.8,204.9,506.2,203z"/>
+		<path class="st4" d="M467.3,227.3c2.9-6.4,8-11.3,12.6-16.4c-0.2,2.3-0.5,4.6-0.8,6.9c-0.4,0.3-1.2,0.8-1.6,1.1
+			c-0.7,0.5-1.5,1-2.2,1.5c0.1,2,1.5,4.4-0.2,6c-1.8-0.3-3.6-0.8-5.3-1.2c-0.6,2.1-1.1,4.2-1.7,6.3c1.4,0.5,2.7,1.1,4.1,1.6
+			c-0.2,1-0.4,2-0.6,3.1c-1.5,0.2-3.1,0.3-4.6,0.7c-1.4,2.2-2,4.8-2.9,7.2c-2.3,1-4.6,2.1-6.5,3.8
+			C460.8,241,463.2,233.7,467.3,227.3z"/>
+		<path class="st4" d="M1015.2,212.6c1.4,0.7,2.7,1.7,3.8,2.9c0-0.1,0.1-0.4,0.1-0.5c0.3,2.4,0.4,4.8,0.8,7.1
+			c-0.4-0.9-0.7-1.9-1.1-2.8c-1.2-0.3-2.4-0.5-3.5-0.8C1015.2,216.5,1015.2,214.6,1015.2,212.6z"/>
+		<path class="st4" d="M497.7,215.7c1.1-0.3,2.5-0.7,3.6,0c0.2,0.9,0.4,1.8,0.5,2.8c-0.9,0.4-1.8,0.8-2.7,1.3
+			C498.4,218.5,496.7,217.2,497.7,215.7z"/>
+		<path class="st4" d="M887.7,214.7c1.5,5.6,2,11.6,1.1,17.3c-0.2,17.6-0.1,35.3-0.1,53c-0.5,3.3,2.3,5.4,4.5,7.3
+			c-1.5,0.2-2.9,0.5-4.3,0.7c-0.1,3.4-0.2,6.7-0.1,10.1c1,0.7,2.1,1.4,3.1,2.1c-2.2,2.3-4.2,5.5-2.3,8.7c0.9,0.9,1.8,1.8,2.7,2.8
+			c1.2-1,2.6-1.7,3.5-3c0.2-1.6-0.1-3.1-0.2-4.7c2.8,2.4,1.5,6.5-1.5,7.9c-1.7,1.3-3.6-0.2-5.3-0.7c0.1,4.8,0.1,9.7,0.1,14.5
+			c2.7,0.7,4.8,2.4,6.2,4.7c-2.1,1.3-5.5,1.7-6,4.6c-0.8,4.5-0.4,9.1-0.3,13.7c1.5-0.2,3-0.4,4.5-0.6c-0.3,2.2-0.5,4.3-0.8,6.5
+			c-1.7-0.3-3.3-0.7-5-1c0.3-7.2,0-14.5,0.6-21.7c-0.7-12.3-0.3-24.7-0.4-37C887.7,271.5,887.5,243.1,887.7,214.7z"/>
+		<path class="st4" d="M1236.6,218.8c1.3,0.3,2.6,0.6,3.9,1c0,1.3,0.1,2.5,0,3.8c-1,1.2-2.6,1.8-3.9,2.7c0.1-1.4,0.2-2.8,0.4-4.2
+			C1236.8,221,1236.7,219.9,1236.6,218.8z"/>
+		<path class="st4" d="M1129.7,229.3c-1.4-1.4-0.6-3.8,1.3-4.2c3.4-0.7,7.1-0.4,10.4,0.5c1.2,1.8,0,4,0.2,6c0.7,1.4,1.7,2.6,2.7,3.8
+			c2.1-0.3,5-0.4,4.9,2.5c-0.8,2.3-3.6,0.8-5.2,0.3c-1.5,0.1-2.9,0.3-4.3,0.4c-0.4-1.6-0.6-3.3-1.3-4.9
+			C1135.6,232.1,1132.2,231.5,1129.7,229.3 M1131.9,228.1c1.8,2,6,4.7,7.6,1C1139.7,225,1133.6,224.8,1131.9,228.1z"/>
+		<path class="st4" d="M474.3,229.9c2.5-3.5,6.5,0.1,9.1,1.6c2.4,1.1,3.7-1.4,4.7-3.1c1.7,0.6,3.4,1.1,5,1.7
+			c-1.1,2.3-3.4,2.6-5.6,2.4c-0.8,1.2-1.6,2.5-2.5,3.7c-2.1,0.2-2.1-2.5-3-3.8C479.3,232.9,474.4,234.2,474.3,229.9z"/>
+		<path class="st4" d="M719.1,229.3c1.2,0.1,2.3,0.2,3.5,0.3c0,1.3-0.1,2.6-0.1,3.8c-1.1,0.1-2.2,0.2-3.3,0.3
+			C719.1,232.2,719.1,230.8,719.1,229.3z"/>
+		<path class="st4" d="M30.4,234c1.6,0,3.3,0,4.9,0c0,0.6-0.1,1.8-0.1,2.4c-1.4,0.5-2.8,1.1-4.3,1C30.4,236.3,30.5,235.1,30.4,234z"
+			/>
+		<path class="st4" d="M1415.7,234c4,0.1,8.1,0,12.1,0c-1,1.4-2.1,2.9-3.1,4.3c-1.9-1-3.7-2.1-5.6-3.1c-0.9,1.4-1.8,2.7-2.7,4.1
+			C1415.6,237.7,1415.5,235.8,1415.7,234z"/>
+		<path class="st4" d="M1441.8,234c2,0,4,0,6,0c-0.4,1.1-0.7,2.3-1,3.5c1.2,0,2.5,0.1,3.7,0c0.9-1.1,1.6-2.3,2.3-3.5
+			c1.5,0,3.1,0,4.7,0c-1.5,2.1-3.3,3.8-5.4,5.3c2.9,2.3,3.7,6,3.4,9.6c-1.3-1.5-2.4-3.1-3.6-4.7c-1.8-2.5-4.8-4-6.5-6.6
+			C1444.2,236.4,1443,235.2,1441.8,234z"/>
+		<path class="st4" d="M1394.5,237.9c2.3-1.5,4.9-2.9,7.8-2.9c1.1,0.9,2.3,1.8,3.5,2.6c-3.3,0.7-6.5,1.7-9.8,2.7
+			C1395.6,239.7,1394.9,238.5,1394.5,237.9 M1399.3,236.1c-0.3,0.3-0.8,0.9-1,1.2C1399.1,240.7,1403.1,235.4,1399.3,236.1z"/>
+		<path class="st4" d="M1458.2,242c0.2-2.2,0.6-4.3,1.3-6.4c2.2,1,4.6,0.9,6.9,0.1c0.9,1.2,1.4,2.6,1.8,4c-1.4,0-2.8-0.1-4.1-0.1
+			C1462.2,240.9,1460.2,241.7,1458.2,242z"/>
+		<path class="st4" d="M669.8,239c0.8,2.1,1.5,4.1,2.4,6.1c-6.2,4.3-8.8,11.7-13.7,17.2c-4.5,6.4-10.1,12.2-13.7,19.3
+			c-1.5,3.1-2.7,6.3-4.7,9.2c-1.5,2.6-3.9,4.9-4.1,8.1c-0.4,2.7-0.2,5.4,0.2,8.2c-1.2,2.3-1.9,4.8-2.3,7.4c2.9-0.6,5.8-1,8.7-1.2
+			c1.6-1.4,2.9-5.1,5.3-2.9c-0.1,1.7-0.7,3.3-1.2,4.9c1.8,3.6-0.5,7-2.3,10c0.1-1.9,0.2-3.8,0.3-5.6c-0.5-0.3-1.6-0.9-2.1-1.2
+			c0.1-1.2,0.1-2.4,0.2-3.6c-3.9-0.7-7.4,0.8-10.2,3.3c1.9-9.5,2.6-19.2,3.7-28.8c3.2-8.2,10.5-14.4,12.5-23.2
+			c3.7-6,10.3-9.4,14.1-15.4C665.3,246.9,668.1,243.3,669.8,239z"/>
+		<path class="st4" d="M1401.5,246.3c-0.8-4.2,3.5-7.2,7.4-6c-0.3,1.9-0.7,3.8-1.2,5.6c-0.9-0.4-1.8-0.7-2.7-1.1
+			C1403.8,245.3,1402.6,245.8,1401.5,246.3z"/>
+		<path class="st4" d="M1469.6,242.5c2-1.4,4.2-2.4,6.5-3.2c3.2,3.1-0.9,6.6-2.1,9.6c-1.8-1.5-3.3-3.2-5-4.7c-1.7,0.6-3.2,1.8-5,2.1
+			c-2-0.2-0.3-2.5,0.6-3C1466,242,1467.9,240.7,1469.6,242.5 M1471.2,242.1c-1.6,2.4,1,4,2.7,5.2c1.1-1.9,0.7-3.9,0.2-5.9
+			C1473.4,241.5,1472,241.9,1471.2,242.1z"/>
+		<path class="st4" d="M492.2,251.7c-1.9-2.3,0.3-6.8,3.5-6.6c0,1.5,0,3.1-0.2,4.6C494.8,250.7,493.4,251.1,492.2,251.7z"/>
+		<path class="st4" d="M1247.8,246.8c0.3-0.2,0.9-0.7,1.3-0.9c-0.2,1-0.5,2-0.7,3c2.5,1.6,5.6,2.8,7.5,5.3c1.3,2.6-1.1,5-1.4,7.6
+			c0.3,1.2,0.8,2.3,1.3,3.4c-2.6-0.4-5.1-0.9-7.4-2c-1.3-0.6-2.6-1.1-3.8-1.6c0,1.9,0,3.7-0.2,5.6c-0.9,0.3-1.8,0.5-2.7,0.8
+			c0-1.3,0-2.6,0-3.8c-0.9-0.4-1.7-0.8-2.6-1.2c-0.6,0.3-1.8,0.9-2.4,1.1c0.1-4.6-0.2-9.2-0.1-13.8c3.6-1.1,7.2-0.1,10.5,1.4
+			C1247.2,250,1247.5,248.4,1247.8,246.8 M1251.1,251.9c-0.9,1.3-1.7,2.6-2.5,3.9c-3.1,0.4-5.2-2.2-8.1-2.4c0.7,1.1,1.4,2.3,2.2,3.4
+			c-0.9,0.7-1.8,1.5-2.6,2.2c1.9,1.1,3.9,1.6,6.1,1.3c0.1-0.8,0.2-2.4,0.3-3.2c0.4,0.1,1.3,0.3,1.7,0.4c1.2,1.3,2,5,4.2,3.9
+			c1.5-1.8,2.7-4.2,2.1-6.5C1253.7,253.5,1252.3,252.8,1251.1,251.9z"/>
+		<path class="st4" d="M1486,246.7c1,3.8,4.9,4.4,8.2,5.1c0.3,1,0.6,2,0.9,3c1.4,1.1,3.1,2.1,4.3,3.5c0.1,1.4,0,2.7,0,4.1
+			c-0.2-0.6-0.7-1.9-0.9-2.5c-1.4-1-2.8-2-4.1-3.2c-0.5-0.4-1.3-1.3-1.8-1.7c-0.9,0.7-1.8,1.4-2.7,2.1c0.1-0.3,0.3-1,0.4-1.3
+			c-0.2-1.2,0.9-2.9-0.3-3.8c-1.6-0.2-3.1-0.3-4.7-0.3C1485.7,250,1485.9,248.4,1486,246.7z"/>
+		<path class="st4" d="M1475.8,248.9c1.7-1.4,2.8,1.1,3.8,2.1c-0.4,0.7-1.3,2.1-1.7,2.8C1476.3,252.5,1474.7,250.9,1475.8,248.9z"/>
+		<path class="st4" d="M634,255.1c2.7-1.9,5-4.5,8.1-5.9c1.8,1.4,1.6,3.8,1.4,5.8c-0.3,4.2-5.8,3.4-8.7,4.7c-0.2,1.5-0.3,3-0.4,4.6
+			c-0.8-4.6-1.9-9.1-2.9-13.6C632.2,252.2,633.1,253.7,634,255.1z"/>
+		<path class="st4" d="M1532.1,250.7c0.4-0.2,1.3-0.6,1.8-0.9c0.7,1.3,1.6,2.6,1.2,4.1c-0.4,3.1-0.7,7-4,8.5
+			C1530.9,258.4,1533.6,254.6,1532.1,250.7z"/>
+		<path class="st4" d="M1436.9,259.7c0.7-3.1,2.2-5.9,4.6-8c-0.1,2.3-0.2,4.7-0.4,7c3.3-0.2,6-1.9,8.4-4c2.2-2.1,5.5-0.7,8.1,0
+			c2.3,1.5,2.6,5.2,5.6,6c4.6,2.5,9.8,3.2,15,2.5l-0.1,0.6c-29.1,0.2-58.2,0.1-87.3,0.1l-0.2-0.7c2.5,0,5.1,0,7.7,0
+			c4.3,0.2,8.5-0.5,12.7-1.2c-0.3-0.6-0.9-1.7-1.2-2.3c0.5-0.1,1.4-0.2,1.9-0.3c1.5,1.2,3,2.3,4.5,3.5c11.4-0.2,22.8,1,34.1,0
+			c-0.2-2.1-0.2-4.4-1.9-5.9c-0.9,1-1.8,2-2.7,3C1442.6,260.3,1439.8,260.2,1436.9,259.7 M1450.2,261.3c3.3,2.9,8.7,2.6,11-1.4
+			c-1.4-0.9-3.2-1.5-4.1-2.9c-1.1-0.9-1.4-3-3.2-2.8C1452.8,256.7,1452.4,259.5,1450.2,261.3z"/>
+		<path class="st4" d="M1085.4,258.6c-0.6-2.2-1.9-5.9,1.6-6.1c3.2,0.5,2.4,4,2,6.3C1087.8,258.8,1086.6,258.7,1085.4,258.6z"/>
+		<path class="st4" d="M26.3,254.4c1.3,0.3,3.4-0.5,4.1,1c0.2,1,0.3,2.1,0.4,3.2c-0.8,0.2-2.3,0.7-3.1,1
+			C26.3,258.1,26.2,256.2,26.3,254.4z"/>
+		<path class="st4" d="M1431.3,258.6c-4.2,0.5-3.1-4.9,0-5.6C1431.9,254.8,1432.5,256.9,1431.3,258.6z"/>
+		<path class="st4" d="M1723.5,254.2c3.1,5,6,10.2,8.2,15.7c-2.8-1.4-3.6-4.3-3.6-7.2c-2.9-0.1-5.8-0.2-8.7-0.2
+			c-0.3-0.3-1-0.8-1.3-1c0.9,0.2,1.8,0.4,2.8,0.6C1722.5,259.7,1724.3,257.2,1723.5,254.2z"/>
+		<path class="st4" d="M1124.5,256.9c2-0.1,4.1-0.2,6.2-0.3c0.6,1.3,1.2,2.6,2,3.8c1.2,0.1,2.4,0,3.6,0c-1.1,2.2-3.6,3-5.6,4
+			C1128.4,262.1,1126.4,259.5,1124.5,256.9z"/>
+		<path class="st4" d="M719.1,264c1.1-2.9,3.8-5,6.9-5.3c-3,1.9-5.2,4.6-7.1,7.6c1.6,0,3.3,0.1,4.9,0.1c1.3-1.4,2.7-2.7,4.3-3.6
+			c-1.5,3.6-4.3,6.5-6.7,9.6c-0.7,0.1-2,0.4-2.7,0.5C718.7,270,718.5,267,719.1,264z"/>
+		<path class="st4" d="M1165.5,266.3c1.7-1,3.7-1,5.5-1.4c-0.3,1.5-0.5,3-0.8,4.6c-1.6,0-3.3,0-4.9-0.1
+			C1165.4,268.3,1165.4,267.3,1165.5,266.3z"/>
+		<path class="st4" d="M1183,265.9c2.1,2.4,4,4.9,6.1,7.3c-1.6,0-3.1,0.1-4.6,0.2C1183.5,271,1183.1,268.5,1183,265.9z"/>
+		<path class="st4" d="M1247.9,268.1c1-0.4,1.9-0.8,3-1.1c0,0.6-0.1,2-0.1,2.6c-0.2,2,0.1,4.5-1.6,6c-2.7,0.2-4.4-2.3-6.3-3.8
+			C1244.5,270.5,1246.1,269.3,1247.9,268.1z"/>
+		<path class="st4" d="M20.5,276.9c-0.8-2.8,3-2.8,4.5-1.6c2.2,0.9,1.3,3.6,1.6,5.4C23.8,280.9,20.7,280.2,20.5,276.9z"/>
+		<path class="st4" d="M918.5,277.3c0.5-1.5,2.5-1,3.7-0.6c0.8,1.2,0.4,2.8,0.6,4.1c-1.5,0.5-3.1,0.6-4.7,0.1
+			C918.2,279.7,918.3,278.5,918.5,277.3z"/>
+		<path class="st4" d="M1088.2,276.3c1.2,0,2.4,0,3.6,0c-0.2,1.8-0.4,3.6-0.8,5.4c-0.7,0-2.1,0-2.8,0
+			C1087.3,279.9,1087.4,278,1088.2,276.3z"/>
+		<path class="st4" d="M1725,280.8c0.5,0,1.5,0,2,0l1,0c0.1,2.1,0.2,4.2-0.3,6.3C1726.3,285.2,1724.4,283.4,1725,280.8z"/>
+		<path class="st4" d="M657.2,286.6c0.1-2.1,1.1-3.4,3.2-3.5c0.4,0.9,0.8,1.7,1.2,2.5c-0.7,1-1.3,2-2,3.1
+			C658.9,288,658,287.3,657.2,286.6z"/>
+		<path class="st4" d="M1187.1,283.9c0.7,0,2.1-0.1,2.8-0.2c-2.1,1.4-2.7,3.6-2.6,6c4,0.2,6.3-3.3,9.5-5.1c0.4,0.5,1.2,1.6,1.6,2.2
+			c-0.7,1.3-1.4,2.6-2.1,3.9c2.4-0.1,4.8-0.3,7.3-0.3c0.3,0.2,0.9,0.6,1.2,0.8c-2.3,0.5-4.5,0.9-6.8,1.3c0.5,3,1.6,6.4-0.5,9
+			c-2,4.5-7.6,4.6-11.8,5.3c2.2-2.7,4.5-6,8.5-5.8c0.9-2.1,2.2-4.8,0.2-6.7c-2.2-1.9-5.2,0.2-7.9-0.1c-0.1-1.8,0.1-3.5,0.3-5.2
+			c-2.1-0.5-4.3-0.9-6-2.2c1.2,0.2,2.4,0.3,3.7,0.5C1185.5,286.2,1186.3,285.1,1187.1,283.9z"/>
+		<path class="st4" d="M645.2,296.2c1.4,0.4,3.3-0.1,4.3,1.3c0.5,2.6-2.3,3.8-3.6,5.5C643.3,301.4,644.4,298.4,645.2,296.2z"/>
+		<path class="st4" d="M742.1,296.1l1-0.7c3.3,1.8-0.3,5.2-1.7,7.1c-0.7,1.5-3.2,1-3.1-0.6C737.7,299.2,740.4,297.6,742.1,296.1z"/>
+		<path class="st4" d="M638.1,309.9c0.8-3,2.3-7.7,6.1-7.3c0.2,1.9-0.2,3.8-1.1,5.4C641.7,309.2,639.8,309.4,638.1,309.9z"/>
+		<path class="st4" d="M648,306.6c2.6,0.2,5.3-0.2,7.3-2.2c0,0.6,0.1,1.8,0.2,2.4c1.5-0.7,2.9-2.4,4.7-2c1.9,3.3-1.9,5.5-4.7,6
+			c-0.6-0.8-1.3-1.5-1.9-2.2C651.5,308.4,649.5,308.1,648,306.6z"/>
+		<path class="st4" d="M1094.3,306.4l0.9,0.4c0.1,4.4,0.1,8.7,0.1,13c-0.5,0.4-1.4,1.2-1.9,1.6c0.2,1.9,0.5,3.8,0.7,5.8
+			c-1.3-0.5-2.6-1.1-3.9-1.6c-1.9,1.5-5.8,2.3-4.9,5.4c1.3,2.5,3.2,4.5,5,6.6c1.7-0.6,3.5-1.1,5.3-1.6c-1.6,2.2-4.2,2.7-6.7,2.9
+			c-1.5-3.5-5.7-6.2-5.3-10.3c2.2-2,4.8-3.7,6.6-6.1c-0.7-1.5-1.4-3-2.1-4.4c2.4-0.8,4.6-2,6.4-3.8
+			C1094.4,311.6,1094.4,309,1094.3,306.4z"/>
+		<path class="st4" d="M657.2,324.2c2.4-1.4,4.4-3.4,5.9-5.8c0.4,0.7,0.8,1.5,1.3,2.2c0.6,0,1.7-0.1,2.2-0.1
+			c0.7-0.7,1.4-1.4,2.1-2.1c0.9,1.1,1.8,2.2,2.7,3.4c0,1.5,0,3,0,4.5c-1.9,4.8-3.7,9.8-6.2,14.3c-0.2-0.6-0.6-1.9-0.8-2.5
+			c0.6-1.2,1.1-2.4,1.7-3.6c-1.8,0.1-3.9-0.2-5.4,1.1c-1.2,2.4-1.1,5.5-3.3,7.2c-0.1-1.3-0.3-2.6-0.4-3.8c-1.4,0.3-2.7,0.7-4.1,1
+			c2-2.9,5.2-4.1,8.3-5.6c2.6-0.7,2-3.8,2.4-5.8c1.1-0.3,2.2-0.5,3.4-0.8c0.4-2,0.7-4.1,1.1-6.1c-1.8,0.2-4-0.5-5.4,0.8
+			c-0.6,1.2-1,2.6-1.5,3.9c-1.2,0.9-2.3,1.7-3.5,2.6c0.7-1.5,1.3-3,2-4.5C659,324.4,657.8,324.2,657.2,324.2z"/>
+		<path class="st4" d="M20.8,326.8c1-0.3,2-0.5,3.1-0.6c-0.3,2.4-1,5.1-3.5,6C20.4,330.4,20,328.5,20.8,326.8z"/>
+		<path class="st4" d="M1037.6,336.9c1.2,2.1-0.1,4.2-0.7,6.3c-0.1,0.2-0.2,0.7-0.3,1c-1.5-0.3-2.9-0.5-4.3-0.8c0-1.3,0-2.6,0.1-4
+			c1.5,0.1,3,0.2,4.6,0.3C1037.1,339,1037.4,337.6,1037.6,336.9z"/>
+		<path class="st4" d="M1727.9,338c0.7-1.2,1.8-1.4,3.2-0.8c0,0.4,0,1.2,0,1.7C1729.6,339.5,1728.6,339.2,1727.9,338z"/>
+		<path class="st4" d="M631.1,349.7c3-4.4,7.6-7.4,11.4-11.1c1.4,0.5,2.7,1,4.1,1.6c-2.3,1.4-4.6,3-6.4,5c1.7,0.6,3.5,1.2,5.2,1.8
+			c-3.7,2-6.8,4.9-8.9,8.4c0.3,0.6,0.7,1.3,1.1,1.9c2.4-2.1,5.3-3.6,8.5-3.6c-5.2,2.9-9.7,7.1-12.7,12.3c0.6,0.4,1.9,1.1,2.5,1.5
+			c-2.9,3.1-5.7,6.2-8.2,9.6c-0.9,1.1-1.9,2.8-3.7,2.3c-1.9-0.9-3.5-2.1-5.2-3.3c-2.5,2.6-5.6,4.5-8.5,6.6c-2,1.7-0.2,5.3,2.5,4.8
+			c-2.4,0.9-4.9,1.8-7.3,2.7c-1.5-3.4,1.1-6.5,3.6-8.6c5.1-3.5,10.9-6.9,13.9-12.6c0.2,1.7,0.3,3.5,1.2,5c5.1-2.2,7.8-7.8,9.7-12.8
+			c-2.1,1.1-4.1,2.1-6.2,3.2c1.8-2.5,4.4-4.3,7.2-5.5c-0.2-1.3-0.4-2.7-0.8-4c-1-0.2-2.1-0.2-3.1-0.3c0.7-0.8,1.4-1.6,2.2-2.4
+			c0.1-0.4,0.3-1.2,0.4-1.6C633.1,350.3,631.8,349.9,631.1,349.7z"/>
+		<path class="st4" d="M506.4,339.3c0.8,1.7,1.7,3.4,2.5,5c-1.4,0.7-2.8,1.5-4.2,2.2c-0.6,0-1.7-0.1-2.2-0.1c0-1.5-0.1-3.1-0.1-4.6
+			C503.8,340.9,505.1,340.1,506.4,339.3z"/>
+		<path class="st4" d="M5.7,350.3c2.3-2,5.1-3.2,8.1-3.4c-0.3,0.9-0.5,1.7-0.8,2.6c-0.2,0.5-0.5,1.4-0.6,1.9
+			c-1.1,0.4-2.1,0.9-3.2,1.2C7.9,351.9,6.8,351.1,5.7,350.3z"/>
+		<path class="st4" d="M717.9,355.5l0.8-0.9c0,1.5,0,3.1,0,4.6c1.6,1.4,3,3.1,3.4,5.3c-1.4,0.2-2.9,0.3-4.3,0.5
+			c-0.3,2.9-0.6,5.8-1.1,8.7c-0.7,0.1-2.2,0.1-3,0.2C716.8,368.2,717.7,361.8,717.9,355.5z"/>
+		<path class="st4" d="M1020.3,357.5c1.3,0,2.6,0,4-0.1c0.6,2,1.3,3.9,2.1,5.8c-1.2,3-3.6,6.7-7.3,6.5c-1.5,0.1-2.1-1.5-1.8-2.7
+			c-0.2-2.9,3.5-3.8,4.2-6.1C1021.2,359.7,1020.7,358.6,1020.3,357.5 M1018.2,366.2c0.1,0.6,0.3,1.9,0.4,2.5
+			c3.6-0.1,6.1-3.5,6.5-6.8C1022,361.6,1020.1,364.3,1018.2,366.2z"/>
+		<path class="st4" d="M914.1,357.9c2.9,0,3.8,2.5,4.6,4.8c-1.4,0.4-2.9,0.7-4.3,1C913.7,361.9,913.3,359.9,914.1,357.9z"/>
+		<path class="st4" d="M478.9,361.8c1.1-0.5,2.2-1,3.3-1.5c1.4,0.8,2.8,1.6,4.1,2.7c0.7,1.7-0.6,3.5-1,5.1
+			C483.1,366.2,480.9,364.1,478.9,361.8z"/>
+		<path class="st4" d="M523.5,362.7c1.8,1.7,3.6,3.3,5.5,4.8c-1.4,2.1-5.1,4.4-2.6,7.1c1.5,0.4,2.6-0.9,3.7-1.7
+			c-0.1,0.5-0.3,1.6-0.4,2.2c-0.9,0.7-1.8,1.4-2.8,2.1c0.1,1.4,0.2,2.7,0.4,4.1c2.5-2.9,4.1-6.9,8.1-8c-2.6,3.1-5.1,6.3-7.4,9.6
+			c-2-2.1-1.7-5.2-3.1-7.5c-1.5,0-2.9,0.1-4.4,0.1c-0.1-2-0.5-4.1-0.9-6.1l1.3,0.5c0.4,0.1,1.2,0.5,1.6,0.6c0.8-1.9,0.7-3.9,0.3-5.8
+			C522.9,364.3,523.3,363.2,523.5,362.7z"/>
+		<path class="st4" d="M0,368.4c2.2,0.4,2.7,2.1,2.8,4c-0.9,0.6-1.9,1.1-2.8,1.8V368.4z"/>
+		<path class="st4" d="M1073.5,373.4c0.5,0,1.6,0,2.1,0c0.5,2.1,1,4.2,1.2,6.3c-0.8-0.3-2.5-0.8-3.4-1
+			C1073.4,376.9,1073.5,375.1,1073.5,373.4z"/>
+		<path class="st4" d="M1713.1,374.3c1.6,0.2,3.4,0,4.8,0.9c1.2,1.4,2,3,2.9,4.6c1-0.5,2-1,3.1-1.5c-0.5,1.9,0.3,5.8-2.1,6.3
+			c-1.8-2.2-2.9-4.7-4.5-7c-1.1-0.3-2.3-0.3-3.4-0.6C1713.6,376.1,1713.3,375.2,1713.1,374.3z"/>
+		<path class="st4" d="M549.1,377.9c4.1,0.9,8.2,1.8,12.3,2.5c-1.3,1-2.5,2.1-4,2.8c-3.1,0.7-6.4,0-9.6,0.4c-2.4,0.6-2.1,3.7-3,5.5
+			c-1.4,0.2-2.8,0.3-4.1,0.5c-0.6,1.3-1.3,2.6-1.9,3.9c6.2,2.1,12.9,2.9,19.5,2c2.9-4.1,4.9-8.9,8.1-12.9c-0.1-0.5-0.2-1.5-0.2-2
+			c2.7,0.2,5.5,0.4,8.2-0.2c-1.8,2.6-5.3,4.1-5.6,7.5c-0.2,1-0.5,2-0.7,3c-2.7,0.7-4.8,2.2-5.3,5.1c4.1,0.1,8.3,0.2,12.4,0.1
+			c0.5,0,1.4-0.1,1.9-0.1c-7.3,1.1-14.8,0.4-22.2,0.6c-9.3,0.4-18.2-2.3-27.1-4.6c3,0,5.9-1,8.3-2.7c3.5-1.9,2.5-6.6,4.6-9.5
+			c3-0.7,6.1,0.2,9.1,0.6C549.7,379.7,549.3,378.5,549.1,377.9 M540.2,387.8c3.4,0.7,5.4-2.2,5.3-5.3c-0.7-0.9-1.6-1.7-2.5-2.3
+			C539.5,381.2,540.3,385.1,540.2,387.8 M564.6,386.6c-0.7,1.4-0.4,3-0.5,4.5c2.5-0.7,3.8-2.6,3.7-5.1
+			C566.8,386.2,565.7,386.4,564.6,386.6z"/>
+		<path class="st4" d="M725.5,379c2.3-3.2,6.1,0.3,6.4,3.2c0.6,3,3.8,3.8,6.2,4.9c-0.8,0.6-1.7,1.2-2.5,1.9
+			C731.3,386.9,726.2,384.2,725.5,379z"/>
+		<path class="st4" d="M5.9,385.1c1.6,0,3.2,0,4.8,0.1c0,0.7,0.1,2.1,0.1,2.8C8.5,388.6,6.2,387.7,5.9,385.1z"/>
+		<path class="st4" d="M906.9,385.2c1.2,0.1,2.4,0.2,3.6,0.4c0,1.2-0.1,2.5-0.1,3.8c2.8,0,5.7,0,8.5-0.1c0.5-1,1-2,1.5-3
+			c0.6,1,1.2,1.9,1.8,2.9c20.6,0.6,41.2,0,61.8,0.3c4.5,0.5,6.9-5.5,11.5-4c0.8,1.5,1,3.3,1.5,5c-2.4-0.1-4.7-0.5-7-0.5
+			c-12.7,0.8-25.4-0.4-38.1-0.1c-17.9-0.3-35.7,0.8-53.6,0.4c3.4-0.7,6.8-0.9,10.3-0.9C908.1,388,907.5,386.6,906.9,385.2z"/>
+		<path class="st4" d="M16,397.9c0.2-1.7,0.5-3.3,0.9-5c1,0.3,1.9,0.6,2.9,0.9c-0.1,1.2-0.2,2.4-0.3,3.6
+			C18.3,397.6,17.1,397.7,16,397.9z"/>
+		<path class="st4" d="M24.1,406.1c1.1-3.2,3.6-5.7,5.8-8.2c0,2.3,0.1,4.7,0,7c-0.4-0.1-1.2-0.3-1.6-0.5c0.1,0.5,0.2,1.6,0.3,2.2
+			l-0.6,2C26.6,408,24.3,408.1,24.1,406.1z"/>
+		<path class="st4" d="M8.4,421.5c3.3-1.2,6.5-2.6,9.7-4.2c0.2,1.4,0.4,2.7,0.6,4.1c-3.1,1.9-6.6,4.5-10.4,2.4
+			C8.4,423.2,8.4,422,8.4,421.5z"/>
+		<path class="st4" d="M7.2,454.3c0.6-1.4,1.2-2.7,1.8-4.1c3.5,3.2-1.6,6.2-3,9.2c-1.3-0.4-2.5-0.8-3.8-1.2
+			C2.3,455.2,4.7,454.5,7.2,454.3z"/>
+		<path class="st4" d="M562.3,472.4c10.4-2.4,21.1-3.7,31.8-4.2c5,0.1,9.9,0.3,14.9,0.1c2.7,0.1,5.7-0.4,8.2,1
+			c-1.9,0.1-3.8,0.2-5.8,0.2c-0.6,1.7-1.1,3.5-1.9,5.1c-3,0.6-5.7-1.2-8.3-2.5c0.1,1.9,2.1,4.7,0,6c-2.4-0.4-4.7-1.2-6.9-2.2
+			c1-2.3,4.2-3.2,4.2-6.1c-1.6-2.4-3.8-0.3-4.7,1.5c-1.8-1-3.8-2.1-6-1.9c-7.7,0.3-15.3,1.8-22.7,3.5c-4.2,0.6-8.1,2.5-12.4,2.4
+			C555.6,473.5,559.1,473.2,562.3,472.4z"/>
+		<path class="st4" d="M1523.7,472c0.3,0.9,0.6,1.8,0.9,2.7c1.8,5.5,3.7,10.9,5,16.6c-2.6,0-5.2-0.3-7.7-0.9c0.6-2,1.3-4.1,3.6-4.8
+			c0.5,0.2,1.4,0.7,1.9,0.9c-0.9-2.6-1.7-5.2-2.4-7.9c-1.9,0.4-4.2,2.5-5.7,0.4C1520.3,476.5,1522.3,474.4,1523.7,472z"/>
+		<path class="st4" d="M998,484.9c2.4-2.6,5.4-4.7,7.3-7.8c4-1,8.1-0.2,12.2,0.1c0,0.5-0.1,1.5-0.2,2c1.2,0.2,2.5,0.4,3.7,0.7
+			c0.6,1.2,1.2,2.4,1.8,3.6c1.2-0.3,2.5-0.7,3.8-0.8c1.4,1.6,1.9,4.1,3.7,5.2c3,0.6,6.1,0.8,9.2,1.3c-3.4,0.1-6.9,0.8-10.2-0.2
+			c-1.8-1-2.3-3.2-3.4-4.8c-1.1,2.1-2.2,4.4-1.4,6.7c1.2,1.9,2.8,3.5,3.9,5.5l-0.5,0.9c-2.7-2.6-4.8-5.8-5.7-9.5
+			c-2.1-0.2-4.2-0.1-6.1-0.7c-2.7-2.1-4-5.3-5.9-8c-4.3,1.9-8,6.5-6.6,11.4c2.4,0.8,4.9,1,7.3,1.7c1.2,4.3-3.7,6.1-6.6,7.9
+			c-2,1.3-4.7,0.6-5.9-1.4C994.8,494.8,996.8,489.3,998,484.9 M1014,482.6c1.5,2.5,3.8,3.6,6.7,3.2c0-1.5,0-3,0-4.6
+			C1018.4,481.4,1016.2,481.9,1014,482.6 M997.7,493.7c0.4,2.3,1.8,4.5,3.7,6c3.1-1.2,6.9-2.6,8.4-5.8c-0.8-3.5-6,0.8-7.7-2.1
+			c-1.5-2.8,0.2-6,0.6-8.9C997.7,484,998.1,489.7,997.7,493.7z"/>
+		<path class="st4" d="M1706.2,478.1c1-1.4,3.6,0.2,2.4,1.6C1707.6,481.2,1705,479.6,1706.2,478.1z"/>
+		<path class="st4" d="M568.3,479.4c2.7-0.6,3.8,1.9,4.6,4C569.8,484.8,568.4,482,568.3,479.4z"/>
+		<path class="st4" d="M181.8,480.3l0.7-0.1c0.9,2.6,1.8,5.2,2.7,7.8c-2.4-0.3-4.7-1-6.4-2.8c1.2-0.7,2.4-1.4,3.7-2.1
+			C182.3,482.5,181.9,481,181.8,480.3z"/>
+		<path class="st4" d="M635.2,481.1c1.3-1.9,3-1,4,0.7c0.5,1.4,0.9,2.8,1.3,4.2c-3.3,1.5-5.1,4.6-7.2,7.3c-0.9,1.6-2.8,1.2-4.3,1.3
+			C629.9,489.5,635.6,486.4,635.2,481.1z"/>
+		<path class="st4" d="M582.4,481.3c4-1.1,5.6,3.1,8,5.2c0.1,0.5,0.4,1.7,0.6,2.2c-1.6,0.4-3.3,0.8-4.9,1.3
+			c-4.4,1.3-8.8,2.3-13.2,3.3c3.1-1.9,6.4-3.9,10.1-4.1c2,0.1,3.1-1.6,4-3.2c-1.6-0.6-3.2-1.1-4.8-1.7
+			C582.3,483.3,582.3,482.3,582.4,481.3z"/>
+		<path class="st4" d="M553.4,484c-0.1-1.9,2.2-1.4,3.3-1.9c0,2-0.2,4.1-1,6C554,487.4,552.8,486,553.4,484z"/>
+		<path class="st4" d="M661.4,482.4c0.7-0.2,2-0.7,2.7-1c1.8,1,3.6,1.9,5.5,2.9c-1.5,1.3-2.8,2.8-3.9,4.4c1.2,2.1,2.7,4.4,1.8,6.9
+			c-0.3,2.9-3.2,4.2-5.4,5.6c0.6-2.5,1.7-4.7,3.9-6.1c-0.4-4-0.6-8.1-0.7-12.1C664.3,482.8,662.4,482.5,661.4,482.4z"/>
+		<path class="st4" d="M1493.1,485.1c2.3-1.8,3.2,1.1,3.8,2.8C1495.4,487.2,1492.6,487.4,1493.1,485.1z"/>
+		<path class="st4" d="M1502.4,485.4c0.8-1.6,3.1-0.3,4.4,0C1507.7,488.1,1501.2,488,1502.4,485.4z"/>
+		<path class="st4" d="M1509.3,485.1c1.2,0,2.3,0,3.5,0c-0.1,1.1-0.2,2.3-0.3,3.4c-1.1,0.1-2.2,0.1-3.2,0.2
+			C1509.3,487.5,1509.3,486.3,1509.3,485.1z"/>
+		<path class="st4" d="M350.1,493c1.1-2.4,2.1-4.8,3-7.3c0.6,1.9,1.2,3.8,1.8,5.7C353.3,492,351.7,492.5,350.1,493z"/>
+		<path class="st4" d="M654.5,487.4c0.8-0.1,1.6-0.2,2.5-0.2c1.3,1.2,2.7,2.5,4,3.7c-1.7,3-1.4,6.6-1.3,9.9c-0.5,0-1.6,0-2.1,0
+			c-0.5-1.1-0.9-2.2-1.4-3.4c-3.7,0.5-7.7,0.9-10.4,3.9c-1.7-0.6-3.4-1.2-5.1-1.9c2.7-2.2,5.6-4,8.6-5.6c0.9,0.4,1.8,0.8,2.7,1.2
+			c1.1-1.3,2.3-2.5,3.3-4C655,489.8,654.8,488.5,654.5,487.4 M655.3,493.2c0,0.6,0.1,1.9,0.1,2.6c1.2,0,2.4,0.1,3.6,0.1
+			c0-0.6-0.1-1.9-0.1-2.5C657.6,493.3,656.5,493.2,655.3,493.2z"/>
+		<path class="st4" d="M136.4,491.3c2.6,0,5.5-0.1,7.2,2.1c0,0.6,0,1.7,0,2.3c-2.4,0-4.8-0.2-7.2-0.9
+			C136.4,493.6,136.4,492.4,136.4,491.3z"/>
+		<path class="st4" d="M541.1,491.3c1.5-1.2,3,1.4,1.6,2.4C541.3,494.9,539.7,492.3,541.1,491.3z"/>
+		<path class="st4" d="M786.4,491.3c1.1,0.3,2.1,0.6,3.2,0.9c0,1,0,2.1,0.1,3.1c-1.4,0.4-2.8,0.9-4.2,1.4c-0.5-0.7-1.1-1.3-1.7-2
+			C784.7,493.6,785.6,492.4,786.4,491.3z"/>
+		<path class="st4" d="M1728,495.5c0.5-1.5,1-3,1.6-4.4c1.1,0.9,2.2,1.9,3.4,2.9v2.1C1731.3,495.8,1729.7,495.6,1728,495.5z"/>
+		<path class="st4" d="M1496.3,492.4c1.2,0,2.3,0,3.5-0.1c-0.2,1.8-0.5,3.6-1,5.4c-0.6,0-1.9,0-2.5,0
+			C1496.3,495.9,1496.3,494.1,1496.3,492.4z"/>
+		<path class="st4" d="M684.5,493.7c1.2,0.9,2.4,1.8,3.6,2.7c-1.2,0.5-2.3,1.1-3.4,1.7c-0.5,2.1,1.7,2.7,3,3.8
+			c0,1.6-0.1,3.2-0.2,4.9c-1.1-0.6-2.3-1.1-3.4-1.7c-3.3,1.3-6.7,2.2-10.1,2.9c0.3-1.9,0.6-3.8,0.9-5.6c0.3,1.2,0.7,2.3,1,3.5
+			c2-0.3,4-0.7,6-1.1c-0.5-0.3-1.4-1-1.9-1.3c1.5-0.7,3-1.3,4.3-2.4c0.2-3.2-3.1-2.8-5.1-1.9C681.2,497.7,682.9,495.7,684.5,493.7z"
+			/>
+		<path class="st4" d="M1233.1,496.8c0.8-1,1.2-2.7,2.8-2.6c3.4,1.2,3.4,7.9,8,6.1c0.5,1.5,1,3.1,1.5,4.6c-1.8-0.2-3.6-0.3-5.3-0.9
+			C1237.3,502,1235.5,499.1,1233.1,496.8z"/>
+		<path class="st4" d="M534.6,494.7c2.4-0.1,4.9-0.4,7.2,0.5c1,2,0.2,4.2-0.1,6.3c-1.2,0-2.4-0.1-3.6-0.1c-0.1-0.6-0.4-1.8-0.6-2.4
+			C535.8,498,533.5,497.1,534.6,494.7z"/>
+		<path class="st4" d="M1222,498c0.2,1.3,0.5,2.6,0.8,3.9c-0.5,0.4-1.5,1.1-2,1.5c-1.8,1.2-2.6,3.2-3.3,5.1c-3.1,0-6.1,0.7-8.9,1.8
+			c0,1,0,2.1,0.1,3.1c-0.7-1-1.4-2.1-2-3.2c0.3-0.2,1-0.8,1.3-1c3-1.3,4.9-3.9,7.3-6C1217.7,501.8,1220.1,500.3,1222,498z"/>
+		<path class="st4" d="M1010.7,502.8c1.8-1.3,4-1.6,6.1-2.3c-0.1,0.4-0.2,1.3-0.2,1.8c-3.3,0.1-1.4,3.5-1.3,5.5
+			C1013.7,506.3,1009.5,505.6,1010.7,502.8z"/>
+		<path class="st4" d="M373.3,507.1c2.2-1.9,4.2-4,6.7-5.6c2-0.4,3.7,0.6,5.1,2C381.8,505.8,377.2,511,373.3,507.1z"/>
+		<path class="st4" d="M969.1,501.9c2.6,3.9,2.6,8.7,3.1,13.2l0,0.3c1.8,0.3,3.6,0.6,5.4,1.1c0.6,2.6-0.4,5.3-0.7,7.9
+			c-1.3-1.2-2.5-2.4-3.8-3.6c-0.7,7.7,0.5,15.5-0.3,23.2c-0.4,5.3-0.2,10.6,0,15.9c0.8,0.7,1.5,1.5,2.3,2.2c-0.7,1-1.4,2-2.1,3
+			c0,8-0.1,16.1-0.5,24.1c-0.3-8.4-1.4-16.8-0.5-25.3c0.4-11.6,0.6-23.3-0.3-34.9C971.5,520,971.4,510.8,969.1,501.9z"/>
+		<path class="st4" d="M1524.5,504.6c-0.7-2.5,2.5-2.2,4.1-2.4c0.4,1,0.8,2,1.2,3C1528,505.2,1525.6,506.4,1524.5,504.6z"/>
+		<path class="st4" d="M1708.3,502.3c0.5,0,1.5,0,2,0.1c0.4,2.4,2.4,5.6-0.9,6.7C1708.7,506.9,1708.4,504.6,1708.3,502.3z"/>
+		<path class="st4" d="M826.8,503.1c3.4,1.1,6.9,3.3,8.1,6.9c-0.6,2.3-3.4,0.2-4.9,0.4c-2-0.9-3.2,1.2-4.4,2.4
+			c-1.7-0.2-3.7,0-4.9-1.4c-0.7-1.1-0.2-2.4-0.3-3.6c1.5-0.3,3-0.2,4.4-0.9C825.9,505.9,826.1,504.3,826.8,503.1z"/>
+		<path class="st4" d="M664.6,507.6c0.8-0.9,2.1-1.2,3.2-1.7c0.4,1.9,0.5,3.8-0.2,5.6c-1.2,0.1-2.3,0.2-3.5,0.4
+			C664.3,510.5,664.3,509,664.6,507.6z"/>
+		<path class="st4" d="M528.3,512.5c0.4-0.1,1.2-0.4,1.6-0.5c1.4,1.3,2.7,2.9,4.5,3.7c1.5,0.2,3-0.2,4.5-0.4c-1.8,1.9-3.6,3.9-5.2,6
+			c-0.3-0.6-1.1-1.9-1.4-2.5c-2.1-0.5-4.1-0.9-6.2-1.6c-0.4-0.5-1.2-1.5-1.6-2c-0.6,0-1.9-0.2-2.6-0.2
+			C524,514,526.2,513.2,528.3,512.5z"/>
+		<path class="st4" d="M175.1,515.4c1.1,0,2.3,0,3.5,0c0.8,0.7,1.5,1.4,2.3,2.1c0.6-0.3,1.7-0.9,2.3-1.1c-1.2,1.4-2.4,3.8-4.7,3
+			C176.3,519.2,175.2,517.5,175.1,515.4z"/>
+		<path class="st4" d="M359.4,515.3c1.8,0.1,4.2,0.1,5.1,2.1c0.6,3-2.9,4.1-3.9,6.5c-0.9,2.1-3.4,2.5-5.2,3.5
+			c-1.7,3-2.4,7.7-6.4,8.4c-2.5-1.3-7.6-1.8-6.7-5.7c0.3-1.2,1.2-2,2-2.8c2.2-2.8,6-0.4,8.8-1.9c0.7-1.6,1.1-3.5,2.4-4.8
+			c1.2-0.2,2.5-0.2,3.8-0.4C359.6,518.6,359.5,517,359.4,515.3 M343,530.8c2,1.1,3.9,2.4,6.1,2.9c2.4-0.9,4.2-3.3,3.4-6
+			c-1.9-0.2-3.7-0.6-5.6-0.6C345.2,527.7,344.2,529.5,343,530.8z"/>
+		<path class="st4" d="M1480.6,521c0.1-2.1,0.9-5.8,3.8-4.5c2.2,2.4,1,6.2-1.3,8.2C1482.3,523.5,1480.2,522.7,1480.6,521z"/>
+		<path class="st4" d="M1725.2,517.7c1.9-1.7,4.9-0.5,3.9,2.3C1728.1,524,1726,519.3,1725.2,517.7z"/>
+		<path class="st4" d="M690,519.1c1.7,0.4,3.4,0.7,5.1,1.1c-0.7,0.9-1.5,1.9-2.2,2.8c0.3,1.6,0.6,3.2,0.9,4.9c0,1.9-0.5,3.9-1.5,5.6
+			c0.1-1.3,0.1-2.6,0.2-3.9c-2.3,1-4,3.1-5.2,5.3c-0.2-0.2-0.7-0.5-1-0.7c0-1.5,0-2.9,0-4.4c1.9-0.5,3.8-1.1,5.4-2.4
+			C690.4,524.9,690,522,690,519.1z"/>
+		<path class="st4" d="M1490,527.1c0.9-2,2.3-3.8,4.6-4.2c0.9,2.2,1.7,4.4,2.4,6.7c-0.6-0.1-1.7-0.3-2.3-0.4
+			C1493.1,528.5,1491.5,527.8,1490,527.1z"/>
+		<path class="st4" d="M387.2,523.5c1.2,1.4,2.3,3,3.3,4.6c-1.3,1.2-2.7,2.4-4.2,3.3C386.2,528.7,386.4,526,387.2,523.5z"/>
+		<path class="st4" d="M715.1,524.8c1.3,2.1,2.6,4.3,4,6.3c-0.8,1.2-1.5,2.4-2.2,3.7c-1.7-1.2-3.4-2.4-4.8-3.8
+			C712.8,528.8,714,526.8,715.1,524.8z"/>
+		<path class="st4" d="M1728.8,525.9c1.4-0.2,2.8-0.4,4.2-0.6v3.1c-1.7,1.3-2.5,3.4-3.5,5.3C1728.9,531.1,1728.7,528.5,1728.8,525.9
+			z"/>
+		<path class="st4" d="M378.9,531.3c0.8-1.9,0.3-5.4,3.1-5.5c3.4,1.7,3.2,6.7,2.5,10c-1.8-0.6-3.5-1.2-5.3-1.9
+			c-0.1-0.5-0.4-1.4-0.5-1.8L378.9,531.3z"/>
+		<path class="st4" d="M4.2,527.2c1.8,0.2,3.6,0.6,5.4,1.1c0,1.1,0,2.2,0,3.4c-1.5-0.2-3.2,0.1-4.6-0.6C4.3,530,4.5,528.5,4.2,527.2
+			z"/>
+		<path class="st4" d="M199.5,529c0.8-0.3,2.3-1,3.1-1.3c1.1,2.2,2.2,4.4,3.2,6.7c-0.6,1-1.2,2-1.8,3.1c-1.6-1-3.4-2.1-4.3-3.9
+			C199.4,532,199.5,530.5,199.5,529z"/>
+		<path class="st4" d="M513.4,528.7c0.5-0.1,1.6-0.3,2.2-0.3c0.5,0.9,1,1.8,1.4,2.8c1.1,0.1,2.1,0.2,3.2,0.4c-0.1,2.2,0.9,4,2.7,5.2
+			c0.2-2.1,0.4-4.2,0.5-6.3c1.3-0.1,2.5-0.1,3.8-0.2c-2.8,4.7-5.3,9.5-7.6,14.5l-0.5,0.4c-0.2-1.5-0.4-3-0.7-4.4
+			c-2.7,0.8-3.8,3.5-5.2,5.6c1.5,0,3-0.1,4.5-0.1c-1.7,1.3-3.1,2.8-4.6,4.3c0.7,0.2,2.1,0.6,2.8,0.7c-0.2,0.4-0.8,1.1-1,1.4
+			c-4.7-0.4-9.5,0.2-13.3,3.2c0.5,0.3,1.6,0.8,2.1,1c1.1,3,0.6,6-0.4,9c0.8,1.3,2,2.4,3,3.6c-0.2,0.4-0.6,1.1-0.8,1.4
+			c-2.7-2.1-4.6-4.8-5-8.3c-1,0.2-1.9,0.5-2.9,0.8c-1.4-0.6-2.7-1.2-4.1-1.8c-1.9,1.4-3.8,2.7-5.7,4.2c0.9,1,1.9,1.9,2.8,2.9
+			c0.6-0.3,1.3-0.6,1.9-0.9c1.9,0.3,3.7,0.5,5.6,0.7c-0.8,1.1-1,2.4-1.1,3.8c-0.5,0.9-0.9,1.7-1.4,2.5c-1.8-2.2-4.3-3.7-7-4.5
+			c-0.1-0.7-0.5-2-0.6-2.6c-2.9-0.1-6.8,0.6-8.6-2.4c-1.9-3.2-4.1-6.2-7-8.5c-2.8,0.8-5.2,2.4-7,4.7c2.2,2.4,5.4,3.4,8.4,4.6
+			c2.2,0.9,3.1,3.2,3.9,5.2c-1.5-1.5-3.2-2.8-4.8-4.2c0,1.7,0,3.4-0.2,5.1c-2.5-0.9-2.5-3.7-2.9-5.9c-1.4-0.6-2.8-1.2-4.3-1.6
+			c-0.5,1-1,1.9-1.5,2.8c-0.2,0.1-0.7,0.3-1,0.5c-1.3-0.7-2.5-1.4-3.8-2.1c1.9-1.2,4.6-2.2,4.7-4.8c-1.6,0.1-3.2,0.3-4.8,0.6
+			c0.1-0.4,0.2-1.1,0.3-1.5c1.1-0.1,2.2-0.2,3.2-0.3c1.5-0.2,2.9-0.5,4.4-0.8c-0.9-1.3-1.7-2.6-2.6-3.9c2-0.2,4-0.2,6-0.2
+			c0.2-1.4,0.5-2.8,0.7-4.2c0.9-0.8,1.8-1.6,2.7-2.4c-0.7-1-1.5-2.1-2.1-3.1c-0.7-1.2-1.4-2.4-2.1-3.6c1.3,0,2.7,0.1,4.1,0.1
+			c0.8,1.1,1.5,2.2,2.2,3.3c0.2,0.4,0.6,1.1,0.8,1.4c-0.6,2.2-1.1,4.4-1.1,6.7c-0.6-1.5-2.5-4.3-3.8-1.6c-0.5,3.2,2.7,5.6,5,7.2
+			c-0.1-0.9-0.2-2.7-0.3-3.6c0.7,0.7,1.3,1.4,2,2.2c-0.3,2.5,0.4,4.9,1.4,7.1c3.1-3.3,2.8-8.1,0.7-11.9c1.6,0.7,3.3,1.3,4.8,2.3
+			c-0.5,0-1.5,0.2-2,0.2c-0.1,1.5-0.2,3.1-0.3,4.7c1.2,0,2.5,0,3.8,0c-0.1-0.9-0.2-2.6-0.2-3.5c1.2,1,2,2.7,3.6,3.2
+			c0.2-0.8,0.5-2.3,0.7-3.1c-1.1-0.5-2.2-1-3.3-1.4c1.3-3.3,4.2-5.2,7.5-6.1c3-1.6,6.2,0.7,9.1,1.3c-0.7-1.4-1.4-2.8-2-4.2
+			c1.4-1.6,2.9-3.1,4.3-4.7c-0.1-1-0.2-2-0.3-3c1.1-0.3,2.3-0.7,3.4-1c0.1-0.5,0.2-1.6,0.3-2.2c1.3,0.3,2.6,0.6,4,0.9
+			C514.1,533.3,513.7,531,513.4,528.7 M515.6,531.6c-0.4,2.5,1.3,5.3,4.1,5.1C519.1,534.8,518.6,530.6,515.6,531.6 M507.8,537.9
+			c-1.2,1.5,0.4,3.2,0.8,4.7c1.8-0.1,4,0.4,5.2-1.4C512.5,539.3,510.6,536.2,507.8,537.9 M506.5,543.7c0.7,2.4,2,4.5,3.4,6.5
+			c1.1-0.5,2.2-1,3.3-1.6C511.5,546.4,508.9,545.1,506.5,543.7 M497.4,548.9c-0.2,1.4-0.4,2.9-0.5,4.3c-1.8-2.1-7.6-2.2-6,1.7
+			c2.5,1.3,5.1,2.6,7.1,4.6c1.4-0.8,2.7-1.6,4.1-2.5c-0.8-1.5-2.6-1.4-4-1.6c1.8-1.4,2.6-3.5,3.6-5.5
+			C500.2,549.6,498.8,549.3,497.4,548.9 M488,563.5c2.9,1.1,2.8-1.8,2.4-3.8C488,558.4,486,562.2,488,563.5z"/>
+		<path class="st4" d="M1717.3,531.2c1.8-1.9,4.3-2,6.7-1.9c-0.9,3-3.8,4.3-6.7,4.6C1717.3,533.2,1717.3,531.9,1717.3,531.2z"/>
+		<path class="st4" d="M179.5,532.5c-0.4-2.7,3.6-2.1,5.3-2.3c0.6,0,1.9,0.1,2.5,0.1c-0.7,1.1-1.3,2.3-2.1,3.4
+			C183.5,535.1,180.7,534.1,179.5,532.5z"/>
+		<path class="st4" d="M1237.1,530c1.3,2.3,3.1,4.1,5.3,5.4c0.6,2-0.3,3.9-1.6,5.4c-1.1-0.1-2.1-0.3-3.1-0.5
+			c-1.1-2.1,0.2-4.3,0.7-6.3C1238,532.7,1237.5,531.3,1237.1,530z"/>
+		<path class="st4" d="M471.7,535.8c0.8-1.6,1.7-3.1,2.6-4.6c1,1.6,2,3.3,3.1,4.9c0.3-1.8,0.6-3.5,0.9-5.3c1.2,1.5,2.4,3,3.6,4.6
+			c-1.4,0.9-2.7,1.9-4.2,2.6C475.5,539.3,473.6,536.7,471.7,535.8z"/>
+		<path class="st4" d="M671.3,531.6c2.1,3.1,1.7,6.8,0.7,10.3c-1-2.1-2.2-4.2-3.5-6.2C669.2,534.1,670.3,532.8,671.3,531.6z"/>
+		<path class="st4" d="M1220.2,533.2c1.2,0,2.4,0.1,3.6,0.1c-0.3,1.7-0.1,3.8-1.5,5.1c-1,0.2-2.1,0.3-3.1,0.4
+			C1219.4,536.9,1219.7,535,1220.2,533.2z"/>
+		<path class="st4" d="M1707.5,536.8c3.5-0.6,4.9,4,8.3,4.5c-1.5,1.1-3,2.2-4.4,3.4c-0.1-1.8-0.2-3.7-0.2-5.5c-0.7,0.3-2,1-2.7,1.3
+			c-2.2,2.3,0.6,5.1,1.4,7.5l-1,0.6c-1.1-0.7-2.1-1.4-3.1-2.2C1706.2,543.2,1706.2,539.8,1707.5,536.8z"/>
+		<path class="st4" d="M391.5,546.8c0.7-3.3,0.8-6.8,2.3-9.9c0.5,1.8,1.1,3.7,1.6,5.5c-0.3,0.7-0.6,1.3-0.9,2
+			c0.6,1.5,1.5,2.9,1.6,4.5c-0.5,1.4-1.2,2.8-1.9,4.1c0.7,1.7,1.4,3.5,2.1,5.2c-2.5,1-5,1.8-7.6,2.4c-0.9,1.9-1.7,3.8-3.1,5.4
+			c-0.1-2.1-0.2-4.2-0.2-6.2c-2.9,0-5.9,0.2-8.8,0.5c-0.3-1.5-0.6-2.9-0.9-4.4c0.9,0.1,1.7,0.3,2.6,0.4c1-2.1,1.3-5.7,4.5-5.5
+			c2.7-0.5,4.7,3.7,2.3,5.3c-1.7,0.6-3.5,0.9-5.2,1.3c2.1,0.4,4.2,0.8,6.4,1.1c0.3-2.8,0.3-5.7,1.1-8.3
+			C388.7,549.1,390.5,548.3,391.5,546.8 M389,550c-0.8,2.4-1.1,5-0.9,7.6c1.8,0.4,3.6,0.7,5.4,1.1C393.6,555.3,393.2,550.5,389,550
+			 M380.1,553.8c1,0.9,1.9,1.8,2.9,2.6c0.9-0.9,1.8-1.7,2.8-2.6c-0.9-0.8-1.8-1.4-2.8-2C382,552.5,381,553.1,380.1,553.8z"/>
+		<path class="st4" d="M1721.3,540.2c0.3-1.6,1.2-2.9,2.5-3.9c0.6,1.2,1.2,2.4,1.7,3.6C1724.4,540,1722.3,540.2,1721.3,540.2z"/>
+		<path class="st4" d="M340.7,555.2c1.8-5.7,5-11.1,9-15.6c0.7,0.2,2,0.6,2.6,0.8l-0.1,0.3c-1,3.3-2,6.6-3.5,9.8
+			C345.3,551.1,344.5,556.9,340.7,555.2z"/>
+		<path class="st4" d="M482,539.8c2.2,0.1,4.4,0.2,6.6,0.3c0.2,0.5,0.6,1.5,0.8,2.1c-0.2,0.4-0.6,1.1-0.7,1.4
+			c-2.8,0.2-5.6,0-8.2-1.1C480.9,541.9,481.6,540.5,482,539.8z"/>
+		<path class="st4" d="M1179.3,540.6c0.7-0.1,2-0.3,2.7-0.4c0.4,1.6,0.6,3.1,0.9,4.7c-1.1-0.2-2.1-0.4-3.1-0.7
+			C1179.3,543.1,1179.5,541.8,1179.3,540.6z"/>
+		<path class="st4" d="M324,550.8c1.4-3.4,3-6.7,4.6-10c1.3,3.5,3.7,8.3-0.3,11c-0.9-0.5-1.7-1-2.6-1.5
+			C325.4,550.5,324.5,550.7,324,550.8z"/>
+		<path class="st4" d="M1465.3,544c2.3-1.3,4.8-2.3,7.4-2.9c-0.2,1.4,0,2.8-0.5,4.2c-2.6,1.6-5.6,2.3-8.2,3.7c0.1-1.5,0.3-3,0.5-4.5
+			C1464.7,544.3,1465.1,544.1,1465.3,544z"/>
+		<path class="st4" d="M691.2,542c1.8,0.7,3.8,1.2,5.3,2.4c1.2,1,0.8,2.8,1.1,4.2c-2.5-0.3-5-0.8-7.5-1.1
+			C690.4,545.7,690.8,543.8,691.2,542z"/>
+		<path class="st4" d="M1725,542.3c0.4,0.1,1.3,0.3,1.7,0.5c-0.2,1.3-0.5,2.6-0.7,4c-1.2,0-2.3,0-3.5,0c-2.2-0.4-4.5-0.9-6.7-1.3
+			c0.4-0.9,0.8-1.8,1.3-2.6c1.8,0.3,3.4,1.2,5,2C1723.1,543.9,1724,543,1725,542.3z"/>
+		<path class="st4" d="M809.3,548.2c0.3-1.7,0.3-4,2.2-4.7c0.8,0.3,1.6,0.7,2.4,1.1c0.7,1.8,1.5,3.5,3,4.7c0.3-1,0.7-2,1-2.9
+			c1-1.1,2-2.2,3-3.3c0.5,0.7,0.9,1.3,1.4,2c-0.7,0.7-1.4,1.3-2.2,2c-1.8,1.9-3.7,3.7-5.8,5.3c0.5-1.2,0.9-2.4,1.4-3.6
+			C813.5,548.6,811.4,548.4,809.3,548.2z"/>
+		<path class="st4" d="M1258.1,543.1c1,2.7,1.9,5.4,2.7,8.1c-1.2-0.6-2.4-1.2-3.5-1.7C1257.6,547.4,1257.8,545.2,1258.1,543.1z"/>
+		<path class="st4" d="M170.1,544.4c1.7-0.5,3.5-0.9,5.3-1.2c0.2,1.6,0.6,3.4-0.3,4.8c-0.9,0.8-2.4,0.6-3.4,0.2
+			C171,547.1,170.3,545.8,170.1,544.4z"/>
+		<path class="st4" d="M713.8,552.1c-0.4-1.5-1.7-3.5,0-4.7c1.6-0.2,2.6,1.4,3.1,2.7c0.2,2.2,0.2,4.3,0.3,6.5
+			C714.9,556.2,714.5,553.9,713.8,552.1z"/>
+		<path class="st4" d="M830.1,548.2c1.1,0.5,2.2,1,3.3,1.5c0.9,1.1,1.8,2.2,2.7,3.4c-0.1,0.7-0.3,2-0.5,2.7
+			c-0.9-0.2-1.8-0.4-2.6-0.7c-1-1.4-2-2.9-3.1-4.2C830,550.2,830.1,548.9,830.1,548.2z"/>
+		<path class="st4" d="M1719.7,549.6c3-0.5,6-0.2,9-0.2c0,0.5,0,1.6,0,2.1c-1.9,0.2-3.9,0.1-5.5,1.3c0.4,2,2.3,3.3,3.6,4.8
+			c-1.8,1-3.7,1.4-5.6,0.6c0.3-1.1,0.7-2.2,1.1-3.3C1721.3,553.3,1717.8,551.7,1719.7,549.6z"/>
+		<path class="st4" d="M794.8,552.7c1.3-0.3,2.6-0.3,4-0.3c-0.3,1.3,0.3,3.6-1.8,3.7c-0.7,0-2.2-0.1-2.9-0.2
+			C794.2,554.8,794.5,553.7,794.8,552.7z"/>
+		<path class="st4" d="M149.1,563.2c1.3-1.7,2.6-3.5,4-5.1c0.9,1.6,1.7,3.3,2.5,5c-0.8,1-1.7,1.9-2.5,2.9
+			C151.7,565,150.4,564.1,149.1,563.2z"/>
+		<path class="st4" d="M356.9,561.8c1.4-0.5,2.8-1,4.3-1.3c1.1,1.4,0.6,3.2,0.6,4.8c-2.2,0.1-4.3,0.2-6.5,0.4c0-0.6,0-1.8,0-2.4
+			C355.7,562.9,356.5,562.2,356.9,561.8z"/>
+		<path class="st4" d="M135.3,567c2,0.7,3.9,1.4,5.9,2.1c-1.7,0.2-3.4,0.5-5.1,0.7c-0.1,1.6-0.1,3.3-0.2,5c1.6-0.1,3.3-0.3,4.9-0.4
+			c0.4,0.8,0.7,1.5,1,2.3c-2.4,1.6-5.2,2.8-6.7,5.3c-0.6,3.9-0.1,7.8,0.1,11.7c0.1,1,0.1,2.1,0.2,3.1c-1.9,3.1-1.6,6.8-1.6,10.4
+			c0,2.9-0.7,6.2,1.1,8.8c1,2.3,3.2,4.6,2.5,7.2c-1.3,0.6-2.7,1-4.1,1.4c-0.3,3-0.4,6-0.4,9c1.7-0.4,3.4-0.9,5.1-1.1
+			c2,0.1,2.8,2.3,4.1,3.5c-3,1.2-6.2,2.2-8.6,4.3c-1,1.8-1.5,3.7-1.6,5.8c-0.1,3.5-0.1,7-0.3,10.6c2.8,0,4.4-2.2,5.9-4.3
+			c0.5,0,1.4-0.1,1.9-0.1c0.5,1.3,1,2.7,1.6,4c1.2,0.1,2.3,0.1,3.5,0.2c3.5,2.3,7.7,2,11.7,2.2c-0.2-2.9-0.4-5.8-0.4-8.7
+			c0.1-4.1,0.2-8.2,0.5-12.3c0.1-1.3,0.2-2.5,0.4-3.8c0.1-0.9,0.3-2.6,0.4-3.5c0.1-2.2,0-4.5-0.2-6.7c0-3-3.3-1.3-5-1
+			c-0.6,0-1.9,0.1-2.5,0.2c-0.1-0.7-0.4-2-0.6-2.6c3.9-2.3,5-7.4,9.2-9.5c-0.2,1.2-0.3,2.5-0.5,3.8c-1.2,1.1-2.8,2-3.4,3.6
+			c1.3,0.8,2.7,1.6,4.1,2.3c-0.6,6.8-0.4,13.7-0.8,20.6c-0.1,6.2-1,12.5-0.7,18.7c-2.3,0-4.6,0-6.8,0.1c1.5,2.1,4.1,2.9,6.2,4.1
+			c0.2,2.1,0.1,4.3-0.1,6.4c-2.5-0.6-5-0.7-6.9,1.4c1.3,0.7,2.6,1.5,3.9,2.2c-2.4,0.1-4.9,0.4-7.2-0.7c1.3-1.4,2.6-2.8,4.2-4
+			c2.2-1,6.5-1.1,5.4-4.5c-1.6-0.9-3.3-1.4-5.1-1.9c-1.1,0.9-2.3,1.9-3.5,2.7c-3.8-1.4-7.1-4.3-8.8-8.1c-0.7-0.3-2-1-2.7-1.4
+			c-0.4,1.8-0.8,3.7-1.3,5.5c-1.1-0.1-2.2-0.2-3.3-0.3c-0.1,7.3-0.9,14.5-1.3,21.8c1.2-0.9,2.5-1.8,3.7-2.7c2.2-2.5,1.5-7.5,5.4-8.3
+			c1.8,2.1,1.7,5,1.2,7.5c-1.3-0.1-2.6-0.2-3.9-0.2c0.1,1.1,0.1,2.1,0.2,3.2c-4.4,2.8-5.2,8.2-8.7,11.7c1.1-8.5,1.1-17,1.9-25.5
+			c0.7-14.6,1.9-29.2,2.1-43.9c0-2.8,2.1-5.3,1.5-8.2c-1.4-7.9,0.3-15.9,0.3-23.8C134.5,584.3,134.1,575.6,135.3,567z"/>
+		<path class="st4" d="M1253.9,567.9c1.8-1.5,3.5,0.6,4.8,1.7c-1.1,2.2-3.2,3.4-5.6,2.2C1253.4,570.5,1253.4,569.2,1253.9,567.9z"/>
+		<path class="st4" d="M29.6,567.5c0.7,7.8,0.2,15.7,0.3,23.5c0,6,0.2,12-0.2,18c-0.4-0.8-0.8-1.7-1.2-2.5c0.5-2.7,0.8-5.4,0.7-8.1
+			c-0.6,0-1.7,0.1-2.2,0.2c-0.1-1.2-0.2-2.4-0.3-3.6c-1.4-0.2-2.8-0.5-4.2-0.5c-0.2,1.5-0.1,2.9,0,4.4l-0.7,0
+			c-2.5-2.2-3.3-5.6-5-8.4c-2.6-0.5-5.3-0.5-7.5-2c3.6-3.3,9.5-4.7,11.3-9.5c-1.2-1.6-2.7-2.9-4.2-4.2c0.8-1.4,1.6-2.8,2.3-4.2
+			c2.9,2.1,5.2,4.9,8.3,6.5c0.5,0.2,1.6,0.5,2.1,0.7c0.1-2.4,0.1-4.9,0.2-7.3C29.5,569.8,29.5,568.2,29.6,567.5 M22.4,582.5
+			c-2.6,2.3-2.5,6.5-1.6,9.7c2.4,0.9,5.1,1.1,7.6,1.5c1.7-4,0.9-8.3,0.8-12.5C27,581.6,24.6,581.8,22.4,582.5z"/>
+		<path class="st4" d="M0,568.9c0.3,0,0.9,0.1,1.3,0.2c0.7,0.7,1.4,1.4,2.2,2.1c0.8-0.2,1.6-0.4,2.4-0.6c-0.7,1.5-2.8,3-2.1,4.8
+			c1.6-0.1,3.2-0.4,4.8-0.6c0.3-1.5,0.5-2.9,0.8-4.3c0.2,0.3,0.5,0.8,0.7,1c0.9,3.1,2.4,6.1,2.7,9.3c-1.3,0.6-2.7,0.9-4,1.3
+			c-0.4-1.9-0.7-3.9-1.1-5.8c-1.7,0.5-3.3,0.9-4.9,1.4c-0.9-1.3-1.8-2.6-2.7-3.9V568.9z"/>
+		<path class="st4" d="M1727.4,575.3c1.9-1.1,3.7-2.2,5.6-3.4v7.6c-0.4,0.4-1.3,1.3-1.8,1.7c0-2.3-0.1-4.7-0.2-7
+			c-3.6,1.2-3.8,6.3-1.2,8.6c-0.3,0.4-0.9,1.1-1.2,1.5c-0.4-0.3-1.2-0.9-1.6-1.2c-1-0.8-2-1.7-2.9-2.6c0.8-0.6,1.7-1.2,2.5-1.8
+			C1726.8,577.6,1727.1,576.4,1727.4,575.3z"/>
+		<path class="st4" d="M358.2,573.6c1.9-0.1,3.8-0.1,5.7,0.1c-0.6,1.2-1.1,2.3-1.7,3.5c0.6,0.6,1.2,1.2,1.8,1.8
+			c-0.7,0.1-2.1,0.3-2.8,0.4c0,1,0.1,1.9,0.1,2.9c1.8,0.9,4.5,0.9,5.5,3c0.8,2.8,0.9,5.8,1,8.7c-0.1,0.2-0.3,0.5-0.4,0.6
+			c-1-0.8-1.6-2.6-3-2.1c-1.1,0.6-2.1,1.4-3.1,2.2c-0.3-0.4-0.9-1.2-1.2-1.5c-1.4-0.3-4.9,1.3-4.8-1.1c-0.2-3.1,3.5-3.2,5.5-4
+			c-0.3-2.4-1.5-4.4-3.6-5.5c0.9-0.4,1.8-0.8,2.8-1.1C359.6,578.7,359,576.1,358.2,573.6z"/>
+		<path class="st4" d="M1720.1,577.1c0.9-1.5,2-3,3.5-4c0.7,0.9,1.4,1.8,2.2,2.7c-0.9,0.8-1.8,1.7-2.6,2.6c-0.8-0.2-2.4-0.6-3.2-0.8
+			c-0.3,2.8,2.4,7.2-0.9,8.9c-1-0.5-1.9-1-2.8-1.6c1.9-1.6,3.1-3.8,3.3-6.3c-0.9,0.2-2.6,0.7-3.5,0.9
+			C1716.5,577.5,1718.5,577.5,1720.1,577.1z"/>
+		<path class="st4" d="M1702.7,579.6c2.6,2.1,5.5,4,8.7,5.2c-1.1,1.1-2.1,2.3-3.1,3.5c1.8,2,3.2,4.3,3.3,7c-1-1.6-2.1-3.2-3.2-4.6
+			c-1,3.1-1.6,6.7,1.2,9c-0.2,0.4-0.7,1.3-0.9,1.7c2,0.5,4,1,6,1.5c0.2,2-0.9,2.9-2.9,2.7c-0.9,0.6-1.9,1.3-2.8,2
+			c-0.8-0.6-1.7-1.2-2.5-1.9c-1.2,0.2-2.5,0.4-3.7,0.6c0.9-1.6,2-3.1,3-4.7c-0.6,0-1.7,0-2.2,0.1c1.4-0.9,2.8-2,4.3-3
+			c-1.4-1.5-3.4-1.2-5.2-1.1c0-0.5,0-1.5,0-1.9c2-0.9,3.9-2.1,5.3-3.8c-0.5-0.4-1.4-1.2-1.9-1.6c-1.1-0.7-2.3-1.3-3.4-1.8
+			c1.9-0.3,3.7-0.8,5.5-1.6c-1.9-0.7-3.7-1.2-5.6-1.7C1702.7,583.4,1702.7,581.5,1702.7,579.6z"/>
+		<path class="st4" d="M475.7,581.8c2.5,1.2,2.3,4,2.3,6.3c-1.2,0.8-2.3,1.7-3.4,2.7c-1.1,1-2.2,2.1-3.4,3.1
+			c-0.8-0.8-1.5-1.5-2.2-2.3c-0.1-0.4-0.2-1.2-0.2-1.6l0.5-0.5c0.8-0.8,1.6-1.7,2.3-2.5c0.3,0.2,0.9,0.5,1.2,0.7
+			C473.7,585.8,474.7,583.8,475.7,581.8z"/>
+		<path class="st4" d="M716.7,585.4c0.6,0,1.7-0.1,2.2-0.1c-0.5,1.6-1.3,3.2-2.3,4.7c0.8,1,1.6,2,2.4,3c0.1,1.7,0.2,3.4,0.2,5.1
+			c-1.6,0.4-3.2,0.8-4.8,0.2c-0.3-1.6,1.1-2.9,1.5-4.3c0-1.9-1.6-3.1-2.7-4.4C714.6,588.2,715.7,586.8,716.7,585.4z"/>
+		<path class="st4" d="M1529.9,589c-0.3-2.1,1.8-3.9,3.6-2.2C1533.3,588.9,1531.5,588.8,1529.9,589z"/>
+		<path class="st4" d="M485.9,590c0.6,0.9,1.2,1.9,1.8,2.8c0.2-0.5,0.7-1.4,0.9-1.9c0.1,0.5,0.3,1.5,0.3,1.9
+			c0.8-0.6,1.5-1.1,2.3-1.7c-0.1,0.7-0.3,2.1-0.4,2.8c1.8,0.6,3.6,1.2,5.4,1.9l0,0c-0.5,0.6-0.9,1.1-1.4,1.7
+			c-0.8,1.8-1.2,4.2-3.2,5.1c-3.4,1.6-7.2,1.7-10.9,2.4c-0.3-0.5-0.8-1.4-1.1-1.9c0.6-0.3,1.6-1,2.2-1.4c-0.8-1-1.6-2-2.4-3
+			c0.8-0.8,1.6-1.6,2.4-2.4c1,1.3,1.9,2.5,2.9,3.8c-0.2,0.9-0.3,1.9-0.5,2.8c2.9-0.5,8.3,0,8.7-3.9c-0.5-3-3.9-1.4-5.6-0.4
+			C487,595.7,486.6,592.8,485.9,590z"/>
+		<path class="st4" d="M1548.7,589.9c0.5,1.2,1,2.4,1.5,3.6c1-0.3,2-0.5,3-0.8c0.8,1.8,1.7,3.6,2.5,5.4c1.6,0.9,3.2,1.7,4.7,2.8
+			c-0.1,3.3-3.5,5-5.3,7.3c4,1.6,7.9-1.3,12-1.3c0.2-0.6,0.5-1.8,0.7-2.4c0.5,1.3,0.9,2.6,1.3,4c-1.1,0.5-2.2,1-3.2,1.6
+			c0,2.5,0.3,5,0.4,7.5c-2.5-0.8-5.3-3-7.7-1c-1,2.8-1.6,5.9-3.7,8.1c-0.3-1.2-0.5-2.5-0.8-3.7c-3.1-1.1-6.2-1.9-9.4-2.6
+			c0-3.9-2.4-6.7-4.7-9.5c-1.8-4.7-3.9-9.4-7.3-13.1c0.2-1,0.4-1.9,0.7-2.8c1.7,5.4,8.2,8.6,7.2,14.8c2.8,2.8,5.2,5.9,6.2,9.8
+			c2.6,0.7,5.2,1.4,7.9,2.1c2.1-3.3,5.3-5.3,9.2-6c-0.3-1.1-0.7-2.3-1-3.4c-3.2,0-6.7,0.4-9.3-1.8c0.3-1.4,0.6-2.7,0.9-4.1
+			c-0.5-0.8-1.1-1.7-1.6-2.5c0.3-1.5,0.6-3.1,0.9-4.6c-0.8-0.3-1.6-0.6-2.3-0.9c-1.4,1.3-2.4,3.1-4.3,3.8c-1-0.6-1.9-1.2-2.8-1.8
+			C1546,595.7,1547.5,592.8,1548.7,589.9z"/>
+		<path class="st4" d="M200.4,591.3c2.7-2.1,4.8,2.7,2,4.1C199.9,596.6,199.4,592.9,200.4,591.3z"/>
+		<path class="st4" d="M218.4,593.5c-0.6-1.5,0.8-2.4,1.5-3.5c1.1,1.1,2.2,2.1,3.2,3.2C221.7,594.2,219.8,595,218.4,593.5z"/>
+		<path class="st4" d="M707,591.3c1.2-0.1,2.5-0.1,3.7-0.1c1.2,2.6,2,5.5,1.8,8.4c0.5,1,0.9,1.9,1.4,2.9c-0.6,0.1-1.8,0.2-2.4,0.2
+			c-0.3-2.3-0.8-4.5-1.4-6.7C708.7,594.7,707.7,593.1,707,591.3z"/>
+		<path class="st4" d="M693,593.5c1.2-0.1,2.4-0.1,3.6-0.2c0.4,1.8,0.7,3.6,1.1,5.5c-0.4,1.1-0.8,2.2-1.2,3.2
+			c0.6,0.2,1.9,0.6,2.5,0.8c1.2,1.4,2.5,2.8,3.7,4.3c0.5,1.6-1.1,2.6-2,3.7c-2.5-3.3-3.1-7.9-6.4-10.9c0.8-1,1.5-2,2.3-3
+			C695.2,596.1,693.8,595,693,593.5z"/>
+		<path class="st4" d="M1449.3,593.2c1.4-1.2,2.4-1,3,0.8c1,1.9-1.8,2.8-3.1,1.8C1449.2,595.2,1449.2,593.9,1449.3,593.2z"/>
+		<path class="st4" d="M1259.8,598.2c-1.3-2,1.4-4.7,3.4-3.4c0.3,1.3,0.4,2.7,0.6,4.1C1262.4,598.6,1260.9,599,1259.8,598.2z"/>
+		<path class="st4" d="M15.9,597.5c0.6,2,2.2,4,1.5,6.2c-0.1,1.7-1.7,3.9,0.6,4.8c2.6-0.4,4.3-2.9,6-4.7c1.1-0.2,2.3-0.4,3.4-0.6
+			c0.1,0.3,0.3,0.9,0.4,1.2c-1.9,0.8-3.6,1.9-5.1,3.3c1.4,1.7,2.9,3.5,4.4,5.1c-1.7-0.9-3.4-1.8-5.1-2.8c-1.9,1.6-4.2,2.6-6.4,3.7
+			c-1.7,0.9-0.6,2.9-0.6,4.3l-1,0.2c-0.3-0.5-1-1.6-1.4-2.1c0.9-1.9,2.1-3.8,2.4-5.9c-0.3-2.2-1-4.4-2.4-6c-2.5-0.6-4,1.7-5.6,3.1
+			c1.2,1.2,2.8,2.1,3.6,3.7c0.8,2.5,0.9,5.1,1.3,7.7c0.1,1.3,0.3,2.7,0.4,4c1.2-0.3,2.3-0.5,3.5-0.8l0.1,0.8c-0.2,0.3-0.5,1-0.6,1.4
+			c-1.1,0.2-2.2,0.4-3.3,0.5c-0.9-3.2-1.6-6.5-2-9.8c0.1-3.2-2.3-5.8-5.3-6.5C3,609,1.5,610.2,0,611.3v-3.1c1.2-1.1,2.5-2.1,3.8-3.2
+			c3.2-0.9,6.5-1.6,9.9-2c-0.5-0.9-0.9-1.8-1.4-2.8c1.1,0.2,2.1,0.4,3.2,0.5C15.6,599.9,15.8,598.3,15.9,597.5z"/>
+		<path class="st4" d="M739.2,597.3c0.4,0.2,1.1,0.7,1.4,0.9c0.2,4.2,0,8.4-0.1,12.6c-0.9,0-2.6,0.1-3.5,0.2
+			c-0.6,2.3-1.2,4.5-1.3,6.9c1.2,1.3,2.5,2.3,3.9,3.4c-0.2,4-0.2,7.9-1,11.9c-0.5-2.4-1.8-4.4-3.3-6.2c0.7-1.8,1.3-3.6,1.9-5.4
+			c-1.4-0.2-2.8-0.5-4.2-0.7c0.7-3.8,1.7-7.5,3-11c1.5-1.1,4.5-1.4,4.1-3.8C740,603.1,739.6,600.2,739.2,597.3z"/>
+		<path class="st4" d="M1727.2,598c1.2,1,2.5,2,3.4,3.4c-0.2,1.7-0.7,3.4-1.2,5c-2.9,1.9-4.4,5.5-7.8,6.5c-0.1-1.1-0.2-2.2-0.3-3.2
+			c1.9-0.8,4.1-1.2,5.6-2.7C1726.5,604,1726.3,600.9,1727.2,598z"/>
+		<path class="st4" d="M1252.3,600.3c0.9-0.4,1.8-0.8,2.7-1.2c1.4,1.7,2,3.9,2.2,6l0,0.4c-1.2,0.1-2.4,0.3-3.6,0.5
+			C1253.5,604.1,1252.9,602.2,1252.3,600.3z"/>
+		<path class="st4" d="M885.3,607.2c2-3.1,5.2-5.8,9.1-4.4C892.9,606,888.7,609.5,885.3,607.2z"/>
+		<path class="st4" d="M874.4,605.1c2.2,0.8,5.5,1,6.1,3.8c-1,3.4-6.1-1.5-6.3,2.6c-0.5,0-1.6,0-2.2,0c0.5-1.1,1.2-2.1,2.1-2.9
+			C874.2,607.5,874.3,606.3,874.4,605.1z"/>
+		<path class="st4" d="M1702.7,609.5c1.3,0.2,2.6,0.4,3.9,0.7c1.1-0.5,2.2-1,3.4-1.5c0.4,0.9,0.8,1.8,1.2,2.7
+			c-1.1,0.5-2.3,1-3.4,1.4c0,1.3,0,2.7,0,4.1c-1.1,0.4-2.2,0.7-3.2,1.1c0-1.1,0-2.3,0-3.4c-0.5-0.5-1.4-1.4-1.8-1.9
+			C1702.7,611.9,1702.7,610.3,1702.7,609.5z"/>
+		<path class="st4" d="M294.6,614.2c0.7-1.5,1.5-2.9,2.4-4.3c-0.2,2.5,0.7,4.9,1.2,7.4c0,1.6-0.6,3.1-0.8,4.7c1.4,2.3,3.4,4.2,5,6.3
+			c-1.8,0.2-3.7-0.2-5.4-0.7c-1.7,1.4-3.6,2.7-5,4.5c-0.8,1.9-0.1,4.1-0.8,6.1c-1,1.6-3,2.1-4.5,3.1c-0.6-1.9-1.2-3.8-1.7-5.7
+			c0.9-3.1,2.5-5.9,3.8-8.8c0.4-0.1,1.3-0.2,1.8-0.3c0.5,0.9,0.9,1.7,1.4,2.6c0.6-0.2,1.8-0.5,2.4-0.6c-0.2-3.5,0.6-6.9,2.1-10.1
+			C295.8,616.9,295.2,615.6,294.6,614.2 M288,639.2c2-0.5,2.6-2.5,3.1-4.2c-0.7,0-2.2-0.1-2.9-0.1C286.3,635.5,286,638.5,288,639.2z
+			"/>
+		<path class="st4" d="M723.8,613.5c1.3-2.4,4.2-2.8,6.6-3.5c-1.3,0.9-2.6,1.8-3.8,2.8c-0.5,0.4-1.6,1.2-2.1,1.6
+			c1.1,1.3,2.3,2.6,3.6,3.8c-1,1.5-2,3.1-2.9,4.6c-1,0.5-1.9,1-2.9,1.5c-2.5,1.3-5,2.4-7.4,3.9l-0.5-0.2c-1.2-0.5-2.4-0.9-3.6-1.3
+			c-0.2-0.7-0.4-1.5-0.6-2.2c1.1,0.1,2.2,0.1,3.3,0.2c0.6-2,1.3-4,2-6c-0.3-0.5-1-1.4-1.3-1.8c1.9,0.1,3.9,0.2,5.9,0.1
+			C722.1,617.2,722.6,614.7,723.8,613.5z"/>
+		<path class="st4" d="M1728.7,611.7c1.2-1,2.8-1.3,4.3-1.8v15.1c-1.7-1.7-1.8-4.1-2.1-6.4c-1.8,0.3-3.6,0.7-5.4,1.1
+			c0.8,2.4,1.6,4.7,2.5,7.1c1.5,0.6,3.1,1.1,4.3,2.3c-1.1,1.5-3,1.5-4.6,1.9c-0.2-0.7-0.6-2.1-0.8-2.8c-0.9-0.5-1.8-1.1-2.7-1.6
+			c0.3-2.4,0.7-4.9,1.2-7.3c-2.8-0.9-5.1,0.9-7.2,2.5c0.4,0.7,1.3,2,1.8,2.6c-0.4-0.3-1.2-0.8-1.5-1.1c-0.4-0.5-1.1-1.4-1.5-1.9
+			c-0.4,0-1.3-0.2-1.7-0.2c0,0.6-0.1,1.7-0.1,2.2c-1.4-1-2.9-1.9-4.4-2.8c0.9-0.5,1.8-0.9,2.7-1.4c0.4,0.3,1.3,0.9,1.8,1.2
+			c4.2-0.9,6.5-4.9,10.3-6.6c1,0.8,2,1.5,3,2.3C1728.6,614.7,1728.5,613.2,1728.7,611.7z"/>
+		<path class="st4" d="M222.2,617.9c0.2-2.6,0.6-5.2,1.2-7.7c1,0.9,2.1,1.9,3.1,2.8c0.8,0.7,1.5,1.3,2.3,2c-0.2,0.6-0.5,1.7-0.7,2.2
+			C226.1,617.3,224.2,617.6,222.2,617.9z"/>
+		<path class="st4" d="M480.9,617c0.1-1.9,1.3-3.6,2-5.3c2.1,0.3,4.2,0.7,6.2,1c0.4,1.2,0.7,2.4,1.1,3.6c0.7-0.1,2.1-0.2,2.7-0.3
+			c-2.2,1.4-6.2,2.3-4.9,5.8C485.8,620,483.2,618.7,480.9,617z"/>
+		<path class="st4" d="M354.3,618.8c0.6-3,3.7-4.4,5.9-6.1c1.2,1.3,2.2,3,1.1,4.7C360.7,620.5,356,621.1,354.3,618.8z"/>
+		<path class="st4" d="M5,618.2c1.3,0,2.6,0,3.9,0.1c-0.3,1.3-0.7,2.6-1,3.9C6.6,621.1,5.7,619.7,5,618.2z"/>
+		<path class="st4" d="M1572.4,618c1.6,3.8,2.9,7.7,3.9,11.6c-1.8,0.2-3.5,0.5-5.2,0.7c0.6-1.6,1.8-2.9,3.1-3.9
+			c-0.5-1.5-0.9-3-1.3-4.6c-0.7,1-1.3,2-2,3.1c-1,0.3-2,0.5-3,0.8C1569.2,623,1570.7,620.4,1572.4,618z"/>
+		<path class="st4" d="M1702.8,618.6c0.4,0.9,1,2.6,1.4,3.5c0.1,0.1,0.2,0.2,0.3,0.3c1-0.3,2.1-0.6,3.2-0.9
+			c-0.1,1.6-0.1,3.3-0.1,4.9c1.9-0.4,3.8-0.8,5.7-1.1c-1.1,2.3-3,4-5,5.7c1.3,1.9,2.6,3.7,4,5.5c-0.3,1.6-0.6,3.2-0.9,4.8
+			c-0.4-1-0.7-2-1-2.9c-1.1,0-2.2,0-3.2,0c0.1,2,0.2,4,0.5,6.1c-1.5-1.5-3.2-2.8-4.8-4.1v-0.1c0.6-0.9,1.2-1.7,1.9-2.5
+			c1.6-0.2,3.2-0.3,4.9-0.5c-0.8-1.8-1.5-3.6-2.2-5.5c-1.7,1.2-3.4,2.7-4.7,4.3c-0.1-1.4,0-2.8,0-4.2c2.3-0.6,4.5-1.5,6.5-2.7
+			c-1.6-2-4-2.7-6.5-2.8C1702.8,623.7,1702.8,621.1,1702.8,618.6z"/>
+		<path class="st4" d="M1140.9,629.7c1-2.9,2.2-5.8,3.5-8.5c0.6,1,1.2,1.9,1.9,2.9c0.2,2.6,0.3,5.2,0.3,7.9
+			C1144.8,631.2,1142.8,630.4,1140.9,629.7z"/>
+		<path class="st4" d="M1538.2,621.1c1.4-0.2,2.8-0.4,4.2-0.5c-0.2,0.8-0.5,2.3-0.7,3.1c-1.2,0-2.3,0-3.4,0
+			C1538.3,623,1538.2,621.7,1538.2,621.1z"/>
+		<path class="st4" d="M1258.4,622.5c0.7,0,2.1,0,2.7,0c-2,1.9-5.5,2.2-5.9,5.4c2-0.3,4.1-0.4,6.1-0.5c0.3,0.7,0.8,2.2,1.1,2.9
+			c-1.2,0.9-2.5,1.9-3.6,2.8c-0.7-1.4-1.4-2.9-2.1-4.3c-0.6-0.1-1.8-0.3-2.5-0.3c0-0.5,0.1-1.4,0.2-1.8
+			C1255.8,625.2,1257.1,623.9,1258.4,622.5z"/>
+		<path class="st4" d="M390.7,628.6c1.3-2.5,3.7-4.1,6.5-4.6c1.1,3.8-3.1,6.3-4.8,9.2c-1.4,2.7-4.2,3.6-7.1,3.4
+			C385.6,633.1,389.1,631.5,390.7,628.6z"/>
+		<path class="st4" d="M1011.4,624.5c1.1-0.1,2.3-0.1,3.4-0.2c0.1,2.5-0.5,4.9-3.1,5.7C1010.6,628.3,1011.1,626.3,1011.4,624.5z"/>
+		<path class="st4" d="M1196.3,625.4c0.6,0,1.9-0.1,2.5-0.1c0.1,2,0,4.7-2.7,4.6C1195.2,628.5,1196.2,626.8,1196.3,625.4z"/>
+		<path class="st4" d="M1562.5,624.3c2,0.3,5.9,2.5,2.7,4.3C1562.5,628.7,1562.6,626.3,1562.5,624.3z"/>
+		<path class="st4" d="M1500.5,629.2c3.2-0.7,5.7-4.3,9.2-2.8c4.9,1.2,7.6,5.8,9.5,10.1c-0.8,0-2.5,0.1-3.4,0.1c-1.9-1-4-0.8-6-0.3
+			c-0.9-0.9-1.8-1.8-2.6-2.7c-1.5,1.3-2.9,2.6-4.4,3.9c0.1-1.5,0.2-3,0.4-4.4c0-0.3,0.1-0.9,0.1-1.2
+			C1502.3,631,1501.4,630.1,1500.5,629.2z"/>
+		<path class="st4" d="M1533.2,625.5c0.8,0.8,1.7,1.6,2.5,2.3c-1.2,2.4-1.9,4.9-2.4,7.5c-0.4,0.2-1.3,0.8-1.7,1
+			c0.2,0.8,0.5,1.6,0.7,2.5c-0.6,0.5-1.7,1.5-2.2,1.9c2.5,2.5,5.8,3.1,9.2,3.1c-0.5-2.9-1.8-5.5-2.9-8.1c2.9,1.4,5.7,3,8.5,4.7
+			c2.6-0.7,5.2-1.3,7.8-1.9c1,2,2,4,3,6c2.8,1.1,5.7,1.9,8.6,2.3c0.6,0.8,1.1,1.6,1.8,2.4c0.9-0.2,2-0.5,3-0.7
+			c0.5,0.5,1.5,1.5,2,1.9c3.3-0.7,6.1-3.1,8.9-4.9c0.8-3.7-3-6.9-1.8-10.8c1.8,4,2.8,8.3,4.2,12.4c-3.1,1.8-7.8,3.1-7.8,7.4
+			c-0.8-0.8-1.6-1.6-2.3-2.4c-0.4,0.6-1.1,1.9-1.4,2.6c-2.2-2.3-4.6-5.5-8.2-4.5c-2.2,2-1.7,5.2-2.1,7.8c-2.4,0.8-4.8,1.9-6.8,3.6
+			c1.2,0.3,2.5,0.7,3.8,1c-0.2,3.1,0.7,6.2,2.3,8.8c-1.8,0-3.7,0-5.5,0c0.4-1.5,0.9-3,1.4-4.5c-0.7-0.3-2-0.9-2.6-1.2
+			c-2.9,0.4-5.8,0.8-8.7,1c0.9-1.2,1.9-2.5,2.8-3.7c-0.7-3.6-0.5-7.3-1.1-10.9c-0.8-1.9-3.2-1.3-4.8-1.7c0.5,1.5,1.1,3,1.6,4.6
+			c-1.2,0.7-2.3,1.4-3.4,2.2c1.4,1.2,2.9,2.4,4.2,3.8c-2,2.5-3.7,5.3-2.4,8.5c-0.7,0.9-1.3,1.8-2,2.6c-1.3-3.6-2.5-7.3-3.4-11
+			c0.5-0.3,1.4-0.9,1.9-1.2c0-3.4,1.6-6.5,2.1-9.8c-1.2-2.5-3.9-3.8-6.6-3.8c-0.2,1.6-0.3,3.2-0.4,4.8c-0.9-3-1.2-6.4-3.3-8.9
+			c-0.7-1.1-1.5-2.2-2.1-3.3c0.8-0.3,2.2-1,3-1.3c0.1-2.3,0-4.6,0.6-6.9c0.9-0.7,1.8-1.3,2.8-1.8
+			C1533.5,627.9,1533.3,626.7,1533.2,625.5 M1541,640.1c0.3,2.8,0.4,5.7,0.2,8.5c2.1,0.5,4.7,0.1,6.1,2.1c1.6,1.8,0.2,4.3,0.2,6.4
+			c-0.8,2.7,1.1,5.3,3.4,6.6c1.8-3.3,4.7-5.9,8.6-6.3c-0.1-3.3,0.5-6.6,1.2-9.8c-1.9-0.5-3.8-0.8-5.5-1.7c-1.8-1.5-1.5-5.1-4.2-5.5
+			c-1.4,0.8-2.7,2-3.9,3C1545,642.2,1543,641.1,1541,640.1 M1538.1,661c-1.8,0.6-0.7,2.8-0.2,3.9c1.7-1.4,3.8-2.9,3.7-5.4
+			C1540.4,660,1539.2,660.5,1538.1,661z"/>
+		<path class="st4" d="M700.5,633.6c0-2.6-1.4-6.8,2.4-7c1,2.1,1.9,4.3,2.7,6.5C703.9,633.3,702.2,633.5,700.5,633.6z"/>
+		<path class="st4" d="M1225.8,628.6c0.8-0.5,1.6-1.1,2.4-1.6c1.8,1.4,2.3,3.6,2.7,5.8c-2.4-0.5-4.8-1-7.1-1.5c-0.4-1-0.8-2-1.3-2.9
+			C1223.6,628.5,1224.7,628.5,1225.8,628.6z"/>
+		<path class="st4" d="M1152.1,629.1c0.8-0.2,2.3-0.7,3-0.9c-0.1,1.4,1.2,4.4-1.2,4.5C1152,633,1150.8,630.6,1152.1,629.1z"/>
+		<path class="st4" d="M235.3,634.2c1.8-3.6,6.4-4.2,9.6-2.3c-1.4,1-2.8,2.1-4,3.4c-1.3,1.4-2.6,2.9-4.1,4.1
+			C235.8,637.9,233.6,636.2,235.3,634.2z"/>
+		<path class="st4" d="M1160.7,632c1.2-2.1,2.9,0,4.3,0.5c-1.4,0.6-2.7,1.2-4.1,1.8C1160.9,633.8,1160.8,632.6,1160.7,632z"/>
+		<path class="st4" d="M1720.7,636c1.9-1.6,4.1-3,6.6-3.3c-1.2,2-2.8,3.7-4.6,5.2C1722.2,637.5,1721.2,636.5,1720.7,636z"/>
+		<path class="st4" d="M1182.3,634.2c1.5,0.1,3.3,0.7,2.6,2.5c-1.3,0.5-2.5,0.8-3.8,1.2C1181.3,636.7,1181.3,635.2,1182.3,634.2z"/>
+		<path class="st4" d="M237.8,645.3c2.3-2,4.2-4.4,6.2-6.7c1.4,0.3,2.9,0.6,4.3,0.9c0.1,1.5,0.3,3,0.5,4.5c0.6,0.3,1.8,0.8,2.4,1
+			c0.4,2,1.4,4.9-1.2,5.9c-1.4-1.7-2.5-3.6-3.9-5.2c-2.3-0.7-4.3,0.7-4.9,2.9c-1.1-0.1-2.2-0.1-3.3-0.3
+			C237.8,647.6,237.8,646.1,237.8,645.3 M242,644.1c1.8,0.3,3.7,0.5,4.8-1.3c-0.2-1.5-1.9-1.7-2.9-2.4
+			C243.2,641.7,242.6,642.9,242,644.1z"/>
+		<path class="st4" d="M399.5,638.7c0.8,5.4,1.1,10.9,1,16.3c-1.4,0.6-2.7,1.1-4.1,1.7c-0.8-1.4-1.3-2.9-1.7-4.5
+			c1.5,0.1,3,0.2,4.5,0.2C399,647.9,399,643.2,399.5,638.7z"/>
+		<path class="st4" d="M354.6,640.5c1.9,0.3,4.6-0.8,5.5,1.5c-0.8,1.4-1.9,2.5-3,3.7c-0.6-0.4-1.9-1.2-2.5-1.6
+			C354.7,643.2,354.6,641.4,354.6,640.5z"/>
+		<path class="st4" d="M458.5,643.2c0.2-1.6,1.8-1.1,3-1.2c4.8,1.2,9.7,0.5,14.5,0c-0.9,0.9-1.9,1.8-2.8,2.6
+			c1.3,0.2,2.6,0.4,3.9,0.6c-1.7,0.2-3.3,0.3-5,0.5c-1.2,3-3.2,5.5-6.7,5.6c1.2-1.4,2.5-2.7,3.7-4.1c0.5-0.9,1.1-1.8,1.6-2.6
+			c-1.5,0.1-3,0.2-4.4,0.3c-2.2-0.6-4.3-1.2-6.5-1.8c0.1,2.5,1.4,4.7,3.1,6.6c-0.4-0.1-1.3-0.2-1.7-0.3c-1.2,2.1-2.2,4.3-2.7,6.7
+			c-1-3-1.9-6-2.6-9.2c0.9,1.3,2.3,2,3.8,2.5C459.3,647.4,458.6,645.3,458.5,643.2z"/>
+		<path class="st4" d="M232.2,645.4c2,0,3.1,2.6,2.5,4.3c-1.2,0.6-2.4,1-3.7,1.4C231,649.2,230.4,646.5,232.2,645.4z"/>
+		<path class="st4" d="M373.1,649.3c2.8-1.5,5.6-3.1,8.4-4.7c0.2,0.8,0.5,2.4,0.7,3.1c-1.8,1.4-3.6,2.8-5.4,4.3
+			c-1.2-0.1-2.5-0.2-3.7-0.2C373.2,651.2,373.1,649.9,373.1,649.3z"/>
+		<path class="st4" d="M360.4,648.9c0.7-1.2,1.2-2.6,2.6-3.3c1.3,0.7,2.7,1.6,2.5,3.4c-0.8,0.9-1.6,1.7-2.4,2.5
+			C362.1,650.7,361.3,649.8,360.4,648.9z"/>
+		<path class="st4" d="M218.8,648.2c2-0.1,3.9-0.2,5.9-0.3c-0.3,1.1-0.6,2.1-0.9,3.2c1,1,2.1,1.9,3.1,2.9c-0.2,0.6-0.5,1.7-0.7,2.2
+			c-0.5-0.1-1.4-0.2-1.8-0.3C221.9,653.8,218.8,651.7,218.8,648.2z"/>
+		<path class="st4" d="M1709.9,649.6c1.3-0.6,2.5-1.3,4-1.5c1.7,1.1,2.8,2.8,4.3,4.1c-2.2,0-3,0.9-2.5,2.7c1.1,0.6,2.2,1.1,3.3,1.6
+			c0.1-0.9,0.3-2.6,0.4-3.5c0.8,2.4,1.3,5,1.8,7.5c2.3,0,4.7,0,7-0.1c0.7,0,2.1-0.1,2.9-0.2c0.4,1.4,0.8,2.7,1.3,4.1
+			c-3.1,0.1-6.2,0.3-9.2,0.4c0.1,0.5,0.3,1.6,0.4,2.1c-0.7,0.3-2.1,1-2.9,1.3c2.9,1.8,6.2,1.3,9.4,0.8c-0.8-0.6-1.5-1.2-2.3-1.7
+			c0.7,0.1,2,0.2,2.6,0.3c0.5,0.4,1.5,1.1,1.9,1.5c-3.9,1.1-7.9,1.1-11.9,0.6c-0.4-1.3-0.8-2.7-1.1-4c-1.3-0.4-2.7-0.8-4-1.2
+			c-0.2-0.5-0.6-1.6-0.8-2.2c0.9-1.6,1.9-3.2,2.9-4.8c-1.4-0.9-2.8-1.9-3.9-3.1c0-0.5-0.1-1.6-0.2-2.1
+			C1712.4,651.3,1711.1,650.4,1709.9,649.6z"/>
+		<path class="st4" d="M809.2,650.4c0.8-0.3,2.3-0.8,3.1-1c0.8,2.3,1.9,5.8-0.8,7.2C808.2,656.9,809.5,652.4,809.2,650.4z"/>
+		<path class="st4" d="M1248.8,649.9l1-0.3c0.8,0.4,2.4,1.1,3.2,1.4c-1.5,1.3-2.9,2.9-5,3.1C1246.4,652.8,1248.1,651.2,1248.8,649.9
+			z"/>
+		<path class="st4" d="M1428.6,649.9c2.6,1.6,5.2,3.3,7.7,5.1c-0.4,1.1-0.7,2.2-1,3.4c2.8,0.6,5.4-0.6,7.7-2.3
+			c-0.3,2.7-3,3.9-5.3,4.5c-2.8-0.3-5.7-1.7-8.3,0.2c2.2,5,7.5,6.6,12.2,8.3l0,0.8c-2.2-0.5-4.5-1-6.7-1.5c-0.8,1.4-1.6,2.7-2.4,4.1
+			c-1.8,0.5-3.6,1-5.3,1.5c1.6-3.9,4-8.2,1.6-12.3c0.7-2.7,2-6-1.2-7.7C1427.8,652.6,1428.2,651.2,1428.6,649.9z"/>
+		<path class="st4" d="M1279,652.2c1.1,0.3,2.2,0.5,3.3,0.8c-0.3,1.4-0.6,2.8-0.9,4.2c-1.4-0.7-2.7-1.4-4.1-2
+			C1277.9,654.2,1278.4,653.2,1279,652.2z"/>
+		<path class="st4" d="M1133.2,661c-1.7-4,2.2-6.3,4.7-8.6c0.9,1.7,0.8,5,3.2,5.2c0.6-1.5,1-3.1,1.4-4.7c0.3,1.6,1,3.1,2.5,4
+			c-0.4,1.3-0.9,2.5-1.3,3.7c-1.3,0.1-2.5,0.2-3.8,0.3C1137.7,659.7,1135.2,658.5,1133.2,661z"/>
+		<path class="st4" d="M713.9,655.9c2.9-0.4,5,1,6.2,3.6c0.6-1.1,1.2-2.3,1.8-3.4c2.5,0.7,5,1.5,7.5,2.6c0.1,0.4,0.3,1.2,0.4,1.6
+			c-2.3-0.7-4.5-1.4-6.9-1.8c-0.3,3.4,0.8,6.8,1.3,10.2c-2.8,0.4-5.6,0.8-8.4,1.2c0.6-1.4,1.2-2.7,1.8-4c-1.1-1-2.2-2-3.1-3.2
+			C713.7,660.5,714,658.1,713.9,655.9 M715.2,657.4c0.1,1.4,0,2.8,0.3,4.2c0.4,1.4,2.2,0.7,3.2,1c-0.2-1.8-0.5-3.6-0.9-5.4
+			C717.1,657.3,715.8,657.4,715.2,657.4z"/>
+		<path class="st4" d="M464.5,657.5c1,0,2.8,0.1,3.8,0.1c0.3,1.3,0.5,2.7,0.8,4c-0.8-0.1-1.6-0.2-2.4-0.3c-0.5,0.5-1.4,1.4-1.9,1.9
+			C464.7,661.3,464.6,659.4,464.5,657.5z"/>
+		<path class="st4" d="M241.4,659.3c1.4,0.1,4.6-0.8,4.3,1.6c0,2.5-2.8,2.9-4.7,3C241,662.4,241.1,660.8,241.4,659.3z"/>
+		<path class="st4" d="M509,661.1c0.6,0.1,1.8,0.4,2.4,0.5c-0.3,1.8-1.6,3.1-3,4.3c-0.1,0.5-0.3,1.5-0.3,2c3.1-1.2,6.2-2.9,7.6-6
+			c2.5,4.8,3.2,10.5,6.3,15c1,1.6,0.8,3.4,0.9,5.2c0.5,0.2,1.6,0.6,2.1,0.7c0.2,0.4,0.7,1.3,0.9,1.7c-1.7,0.1-3.3,0.4-4.6,1.6
+			c-0.9-1.4-1.7-1.4-2.6-0.1c0,1.3,0.7,2,2.1,2.1c0.3,0.3,1,0.9,1.4,1.1c-1.8,1.1-3.5,2.3-5.3,3.6c0.8,0.8,1.7,1.7,2.5,2.6
+			c-0.6,0.7-1.2,1.4-1.7,2c-2-1.8-4.5-0.4-6.7,0.1c0.7,1,1.4,2.1,2.1,3.1c-0.7,0.4-1.3,0.8-2,1.3c-0.7-1.5-1.5-2.9-2.2-4.3
+			c-1,2.7-2,5.5-3.4,8c1,0.7,2.1,1.5,3.2,2.2c-0.6-0.1-1.7-0.2-2.3-0.3c-2.1,1.1-4.5,1.8-6.3,3.3c-0.3,1.5-0.2,3-0.3,4.5
+			c-0.2,0.3-0.7,1-0.9,1.4c-1.7-1.4-3.3-2.9-5-4.4c0.9,0,2.7-0.1,3.5-0.2c2-2.9,3.8-6,5.8-8.8c-0.5,0-1.6,0.1-2.1,0.1
+			c-0.2-1-0.5-1.9-0.7-2.9c-1.2,0.3-2.3,0.7-3.4,1c-0.1,0.5-0.4,1.4-0.6,1.9l-0.5,0c-0.3-0.6-1-1.7-1.3-2.3c-1.2,0.3-2.5,0.6-3.7,1
+			c1,2,2.9,3.2,5,3.8c-0.1,0.3-0.3,1-0.5,1.3c-1.1,0.2-2.2,0.5-3.2,0.7c0-0.4,0.1-1.1,0.1-1.5c-1-1.3-1.8-3.6-3.9-2.7
+			c-0.3,0.6-1,1.7-1.4,2.2c-1.1-1.1-2.1-2.3-3.1-3.6c1.6-0.4,3.3-0.8,4.9-1.1c-0.6-1.1-1.3-2.2-1.9-3.2c1.5-1.1,2.9-2.2,4.4-3.2
+			c-2-0.6-4-1.2-6.1-1.8c0,0.5,0.1,1.4,0.2,1.9c-1.2-0.4-2.4-0.8-3.6-1.1c0.8-0.7,1.6-1.4,2.4-2.1c-1.3-0.1-2.7-0.2-4-0.3
+			c0.1-0.5,0.4-1.4,0.5-1.9c-1.1-0.2-2.1-0.4-3.2-0.6c-0.4-1.7-0.7-3.5-0.9-5.2c1.7,1.2,3.3,2.5,4.8,3.9c0.5-0.9,1-1.8,1.6-2.7
+			c-0.1,1.6-0.2,3.3-0.4,5c2.9,1.7,6.1,2.5,9.4,2.8c-0.1,1.8-0.3,3.7-0.4,5.5c1.8-1.4,3.7-2.8,5.7-4.1c-0.3,0.5-0.8,1.4-1.1,1.9
+			c1.3-0.1,2.5-0.2,3.8-0.3c-1.8,1.2-3.8,2.3-4.6,4.5c2.8-0.2,5.5-0.6,8.3-0.9c0.2,1-0.6,3.9,1.4,3.1c1.9,0.2,1.9-2.1,1.9-3.4
+			c0.4-3.9-1.1-7.5-1.9-11.3c1.4,1.5,2.6,3,3.7,4.7c-0.2,1.5-0.4,3.1-0.6,4.6c0.4-0.1,1.3-0.4,1.8-0.6c1.4-2.2,2.9-4.4,4.5-6.5
+			c2.8-3.4,6.5-6.4,7.7-10.7c-0.7-1.8-3.1-0.6-4.5-1.1c0.4-1.8,0.7-3.5,1.1-5.3c-1-0.3-2.1-0.6-3.2-0.8c-0.9-0.9-1.4-2.2-2.6-2.6
+			c-0.4,0.6-1.1,1.9-1.5,2.5c-0.6,0.2-1.7,0.5-2.2,0.7c1.2,0.4,2.4,0.7,3.6,1.1c-2.1,0.4-4.4,0.8-6.1,2.3c-2.4,1.5-1.3,4.8-1.7,7.2
+			c-0.4-0.4-1.1-1.2-1.5-1.7c0.2-1.4,0.4-2.8,0.6-4.2c-2.4-0.8-5.1-1.9-3.9-4.9c1.9,0.9,3.8,1.9,5.8,2.9c-0.6-2.4-1.4-4.7-1.6-7.2
+			C505,665.2,507.3,663.2,509,661.1z"/>
+		<path class="st4" d="M1148.4,666.2c0-2.3-0.2-5,2.6-5.8c0.4,1,0.8,2.1,1.1,3.2c-2.1,2.8-4.1,5.6-5.9,8.6c-0.6,0.3-1.7,0.8-2.3,1.1
+			c-0.6-0.7-1.3-1.3-1.9-1.9c-1.1-1.1-2.3-2.2-3.3-3.4c0.3-1,0.7-2.1,1.1-3c0.3-0.2,1.1-0.8,1.4-1c0.8-0.6,1.7-1.2,2.5-1.8
+			C1144.4,664.5,1145.5,666.7,1148.4,666.2z"/>
+		<path class="st4" d="M379.3,665.9c0.8-2.2,2.6-3.5,4.7-4.4c1.4,1.3,1.7,3.2,1.9,5.1C383.6,666.6,381.4,666.7,379.3,665.9z"/>
+		<path class="st4" d="M685.1,662.2c1.9,0.4,5.2,0.5,5.5,2.8c0.2,2.4-3,1.5-4.2,0.6C685.1,665,685.4,663.3,685.1,662.2z"/>
+		<path class="st4" d="M498.2,665c0.9-0.5,1.7-1,2.6-1.4c0.2,0.6,0.5,1.9,0.7,2.5c-0.1,0.6-0.4,1.7-0.5,2.3
+			c-1.1-0.4-2.3-0.8-3.4-1.1C497.8,666.7,498.1,665.5,498.2,665z"/>
+		<path class="st4" d="M465.9,669.3c0.1-1.5-1.3-4.2,0.8-4.9c0.5,0.3,1.6,1,2.1,1.3c-0.1,0.9-0.2,1.9-0.3,2.8
+			C467.9,668.7,466.5,669.1,465.9,669.3z"/>
+		<path class="st4" d="M1128.6,668.2c1.1-1.2,2.3-2.5,3.5-3.6c0.3,0.7,1,2,1.3,2.6c-0.9,1.5-2.1,2.9-3.2,4.2
+			C1129.6,670.4,1129,669.3,1128.6,668.2z"/>
+		<path class="st4" d="M1293.7,669.8c1.3-0.1,2.6-1,3.9-0.5c0.7,0.9,1.4,1.9,2.1,2.9c-1.7,0.4-3.5,0.4-5.2,0.1
+			C1294.3,671.7,1293.9,670.4,1293.7,669.8z"/>
+		<path class="st4" d="M1568.2,675.6c-1.8-1.5-3.7-4.1-1.2-6C1570.8,668.7,1569.7,673.8,1568.2,675.6z"/>
+		<path class="st4" d="M229.5,677.9c0.4-3.7,3.4-5.6,6.6-6.9c0.3,1.1-0.1,2.9,1.4,3.3c3.4,0,6.9-0.9,10.2,0.3
+			c-1.2,1.2-2.2,2.6-3.7,3.5c-2.5,0.8-5.1,0.3-7.6,0.2c-0.2,2.8-0.2,5.7,0.2,8.5c-1.4-1.3-2.8-2.5-4.1-3.9c-0.4-1.3-0.9-2.5-1.3-3.8
+			c-3,0.9-7.5,0.9-7.7,4.9c-0.1-0.3-0.4-0.9-0.6-1.2c0-0.7,0.1-2,0.1-2.7C225.2,679.5,227.4,678.7,229.5,677.9z"/>
+		<path class="st4" d="M1702.7,671c3.3,0.4,6.7,0.4,10,1.1c0.9,1,1.7,2.2,2.6,3.4c3.1-0.3,5.7-2.1,8.7-2.8c2.7,0.4,5.1,2,7.5,3.2
+			c-0.7,0.1-2.1,0.4-2.8,0.5c-0.3,0.5-0.9,1.6-1.2,2.2c-0.8-0.1-1.6-0.2-2.4-0.3c-0.7-1.4-0.5-3.6-2.1-4.3c-2.8,2.9,2.1,8.4-2.2,11
+			c-0.1-1.6-0.1-3.2-0.1-4.8c-2.6,1.6-5,3.5-7.2,5.6c2.2,2,4.7,3.8,7.5,5.1c0-0.6,0.1-1.7,0.2-2.2c0.8-0.9,1.7-1.8,2.6-2.7
+			c-0.7,2.4-1.4,4.8-2.1,7.2c1.9-1.1,3.8-2.2,5.4-3.8c0,0.6-0.1,1.9-0.1,2.5c2.2-1.5,3.8-3.7,5.2-5.9l-0.4,0.9
+			c0.3,0.2,0.9,0.5,1.2,0.7v4.3c-2.5-0.3-6-0.6-7.2,2.2c1.1,2.2,3.4,0.7,4.9-0.1c0.7,0,1.5,0,2.3,0v2.4c-2.5,0.1-5-0.1-7.5-0.1
+			c1,3.5,4.2,5.6,6.7,7.9c-0.8,0.6-1.7,1.3-2.5,2c-0.1-0.6-0.4-1.9-0.5-2.5c-0.9,0-1.9,0-2.8,0c-0.1,2.7-0.2,5.5,1.3,7.8l-0.9-0.1
+			c-1.2-0.6-2.2-1.5-3.2-2.2c-0.7,0-2-0.1-2.7-0.1c0.8-0.7,1.7-1.4,2.5-2c-1.1-1.8-2.2-3.5-3.2-5.3c-0.5-0.7-0.9-1.5-1.3-2.2
+			c2.1-0.4,4.3-0.7,6.4-1.1c0-1.5,0-3,0-4.5c-2.4,0.1-4.9,0.2-7.3,0.4c0.8-0.9,1.6-1.8,2.4-2.7c-3.1-1.6-6,0.6-7,3.6
+			c-0.7-0.6-1.4-1.2-2-1.8c1.6-0.9,1.2-2.8,0.8-4.2c-1,0.8-2,1.6-2.9,2.5c-2.3-0.2-4.5-0.2-6.8-0.3c-0.2-1.2,0-2.2,0.6-3.1
+			c0.6,0.6,1.7,1.7,2.2,2.3c0.4-0.7,0.9-1.3,1.4-1.9c0.7-0.3,2-0.9,2.7-1.2c0.4-2,0.8-4.1,1.2-6.1c-0.7,0-2,0.1-2.6,0.1
+			c0.1-0.6,0.2-1.8,0.3-2.4c-0.7-0.4-2.1-1.2-2.8-1.7c1.7-0.8,3.5-1.5,5.3-2.2c-2.5-1.5-5.4-2-8.3-1.5
+			C1702.7,673,1702.7,671.7,1702.7,671 M1711.5,680.8c-0.3,2.1,0.5,2.9,2.5,2.6c2.6-1.5,5.6-3.7,5.4-7.1
+			C1716.6,677.6,1713.8,678.9,1711.5,680.8 M1711.2,685.5c-1.1,0.9-0.6,3.1,0.9,3.3C1714.2,688.7,1713.1,684.4,1711.2,685.5
+			 M1722.5,700.4c-2,2,1.2,3.5,2.5,4.7c0-0.8,0.1-2.4,0.1-3.2C1725.5,700.6,1723.1,698.8,1722.5,700.4z"/>
+		<path class="st4" d="M248.5,672.6c3.3-1.9,6.3,0.5,8.9,2.5c1.1,0.8,2.3,1.6,3.6,2.3c1.4-1.1,2.7-2.3,4-3.4
+			c-0.6,2.6-2.4,4.6-4.2,6.4c-2-0.5-4.1-1-6.1-1.5C252.7,676.7,250.6,674.6,248.5,672.6z"/>
+		<path class="st4" d="M1125.1,675.1c1.6-0.3,3.1-0.6,4.7-0.9c0,1.9,0.1,3.9,0.1,5.9C1127.3,679.7,1126.4,677,1125.1,675.1z"/>
+		<path class="st4" d="M1119.1,681.4c0.8-2.2,1.7-4.3,2.7-6.4c1.4,1.9,3,3.7,3.5,6.1C1123.2,681.3,1121.2,681.3,1119.1,681.4z"/>
+		<path class="st4" d="M1302.9,674.5c1.8,4,3.4,8,4.6,12.2c-1.4,1.7-2.5,3.7-3.2,5.8c1.1,1.4,2.4,2.8,2.3,4.7
+			c-1-1.3-2.1-2.5-3.2-3.7c0.1-2.4-0.1-4.8-0.3-7.1c-1.4,1.4-2.6,2.9-3.7,4.5c0.9,0.8,1.8,1.6,2.8,2.4c-2-0.1-4,0-6,0.1
+			c3.7-3,3.4-8.5,7.3-11.4c-1-0.6-1.9-1.1-2.9-1.6c-0.1-0.5-0.3-1.5-0.4-2c1.1,0.3,2.2,0.6,3.4,0.9
+			C1303.3,677.6,1303.2,676.1,1302.9,674.5z"/>
+		<path class="st4" d="M156,677.4l0.3-1.1c0.3,11-0.6,22,0.6,33l-0.2-0.7c-0.5-2-0.9-4-1.6-5.9c-0.7-2-3-2.8-3.7-4.7
+			c-0.6-2.5,1.8-3.9,3.3-5.4c0.1-2,0.3-3.9,0.4-5.8c0.1-1.7,0.1-3.3,0.2-4.9C155.4,680.4,155.7,678.9,156,677.4z"/>
+		<path class="st4" d="M1273.7,679.1c0-1.5,0.8-2.2,2.3-2l0.4,0.7C1276.7,679.3,1274.4,681.1,1273.7,679.1z"/>
+		<path class="st4" d="M1426.4,677.8c1.3,3.1,4.3,5.8,4,9.4c-2.2-1.2-4.8-2.2-6.5-4.2C1423.4,680.9,1425.4,679.4,1426.4,677.8z"/>
+		<path class="st4" d="M494.4,678.7c1.7,1.1,3.3,2.5,4.8,3.9c0.5-0.6,1.6-1.8,2.1-2.4c-0.2,2.2,0.2,4.5,1,6.6
+			c-0.6,1.1-1.2,2.2-1.9,3.3c-0.4-0.5-1.3-1.5-1.8-2c-0.3,1.4-0.5,2.8-0.7,4.2c-0.3-0.6-1-1.8-1.3-2.4c0.8-1.4,1.6-2.7,2.2-4.2
+			c-1.1-0.8-2.4-1.2-3.6-1.7C494.9,682.3,494.6,680.5,494.4,678.7z"/>
+		<path class="st4" d="M797.1,678.9c1.1,0.9,3,1.3,3.3,3c-0.2,1.2-0.5,2.4-0.8,3.6c-1.1,0-2.2,0-3.3,0.1
+			C795.5,683.3,795.6,681,797.1,678.9z"/>
+		<path class="st4" d="M836.5,679.2c1.6,0,3.8,0.5,3.2,2.7c-0.2,2.9-3.3,1.3-4.5,0C835.6,681,836,680.1,836.5,679.2z"/>
+		<path class="st4" d="M1727.3,681.4c1.9-0.1,3.8-0.2,5.7-0.3v0.8c-1.4,0.4-2.7,0.7-4,1.1c-0.2,1.5-0.3,2.9-0.5,4.4
+			c-0.7-1.4-1.8-2.4-3.1-3.3C1726.1,683.2,1726.7,682.3,1727.3,681.4z"/>
+		<path class="st4" d="M1274.6,682.9c1.2-0.4,2.4-0.8,3.6-1.2c0.2,1.5,0.3,3,0.2,4.5c-1,0.6-2,1.3-2.9,1.9
+			C1275.2,686.3,1274.9,684.6,1274.6,682.9z"/>
+		<path class="st4" d="M368.5,687.5c2.1-1.5,4.2-4.1,7-3.1c0.9,2.4-0.5,5-0.8,7.4c-2.1,0.3-4.3,0.1-6.4-0.3
+			C368.3,690.3,367,688.4,368.5,687.5 M369.3,690.5c1.8-0.2,4.8,1.2,5-1.5C373.6,686,368.1,687.4,369.3,690.5z"/>
+		<path class="st4" d="M138.1,689.5c1.6-1.5,3.1-3.1,4.9-4.3c3-0.1,5.3,2,7.4,3.8c-2.6,0.7-5.2,0.6-7.8,0.6c-0.2,0.4-0.7,1.1-1,1.5
+			c-0.8,1.2-1.5,2.3-2.2,3.5c-0.9-1-1.8-2.1-2.7-3.1C137.2,691,137.8,690,138.1,689.5z"/>
+		<path class="st4" d="M1113.6,693.6c1.1-2.9,2.4-5.7,3.8-8.4c1.8,0.3,3.7,0.5,5.5,1c0.1,2.2-2.4,2.8-3.7,4.2c1,2.2,2.2,4.2,2.9,6.6
+			c-0.7-0.1-2.1-0.3-2.8-0.5c-0.8-1-1.5-1.9-2.3-2.8C1116.2,693.6,1114.5,693.6,1113.6,693.6z"/>
+		<path class="st4" d="M2,685.8c1.5,0.1,3.4-0.6,4.3,1.1c0,0.8-0.1,2.4-0.2,3.2c-1.7-0.6-3.4-1.3-5.1-2.1
+			C1.3,687.4,1.8,686.3,2,685.8z"/>
+		<path class="st4" d="M485.5,685.9c2.1,0.5,4.6,0.3,6.2,2c-0.9,0.9-2.1,2.4-3.5,1.9C486.5,689.3,486.3,687.2,485.5,685.9z"/>
+		<path class="st4" d="M1258.9,687.1c1.1-0.4,2.3-0.7,3.5-1.1c0.5,0.3,1.6,1,2.1,1.3c-1.1,0.9-2.2,1.8-3.3,2.8
+			C1260.4,689.1,1259.7,688.1,1258.9,687.1z"/>
+		<path class="st4" d="M822.3,687.4c1.3-1,3.3-1.3,4.2,0.5c0,2-1.1,6-3.9,4.5C822,690.8,821.1,688.9,822.3,687.4z"/>
+		<path class="st4" d="M1432,687.5c1.5,0.5,3.1,1,4.6,1.5c-3.1,9.5-7,19.3-4.8,29.5c-0.6-0.2-1.8-0.6-2.4-0.8
+			c0.8-3.8,1.1-7.7,1.1-11.5c0-3.6,1.8-6.8,3-10.1c-1.1-0.6-2.1-1.1-3.2-1.7C1430.9,692,1431.5,689.8,1432,687.5z"/>
+		<path class="st4" d="M1021.8,696.2c-1.2-1.8-3.6-4.8-0.9-6.4C1023.2,691,1021.9,694.2,1021.8,696.2z"/>
+		<path class="st4" d="M798.7,697.8c3.1-2.1,5.7-5.5,9.4-6.5c3.3,0.4,6.3,2.6,9.6,3.3c0,0.6,0.1,1.7,0.1,2.2c-2.5,0-5.1-0.1-7.5,0.4
+			c-1.4,3.8-1.9,10,2.5,12c2.5,1.5,5.2,3.2,6.8,5.8c0.9,5.3-6.5,6.1-7,11c-0.2-1.6-0.4-3.2-0.9-4.8c-1.8-1.2-4.5-3.4-6.4-1.2
+			c-1,1.4-1.6,3.1-2.2,4.7c2.7,0.8,5.4,1.8,7.4,3.8c-2.1,1.7-4.3,3.3-6.2,5.2c0.1-0.8,0.2-2.3,0.3-3c-2.1-0.6-4.1-1.2-6.2-1.8
+			c-0.1-2.8,1.7-4.8,3.4-6.8c-1.1-1.1-2.3-2.1-3.3-3.3c0.7-2,2.7-3.2,4.7-3.5c2.8,0.6,5,2.9,7.8,3.5c1.5-0.7,2.9-1.8,4.3-2.7
+			c-1.4-1.8-2.7-3.5-4-5.3c-2.4,1.8-5.3,1.9-8.1,1.2c-1.9,0.6-3.8,1.2-5.6,1.8c0.1-1.9,0.2-3.8,0.3-5.7c-2.4,0.9-5.2,1.4-6.9,3.5
+			c-1.7,3.2-2.3,7-4.8,9.8l0.3-0.9c1.4-4.5,3.9-8.8,4.2-13.6c0.2-3.8,0.5-7.5,1.1-11.3c0.2,3,0.5,5.9,0.8,8.9c1.7-0.7,3.4-1.3,5.1-2
+			C797.8,701,798.3,699.4,798.7,697.8 M799,699.5c1.4,0.9,2.7,1.8,4.1,2.7c-0.5,2.3-1.4,4.5-2.7,6.5c2.8-0.7,5.3,0.4,7.5,2
+			c1.1-5.5-0.6-11.1-0.1-16.7C804.4,695.1,801.4,697,799,699.5z"/>
+		<path class="st4" d="M1583.9,694.5c1.7-1.5,3.6-2.8,5.7-3.4c1.2,1.9,0.8,3.9-0.6,5.5c-0.8-0.8-1.7-1.6-2.5-2.5
+			C1585.7,694.2,1584.8,694.3,1583.9,694.5z"/>
+		<path class="st4" d="M1555,693.6c1.6-0.3,3.2-0.6,4.8-0.8c0.1,0.7,0.2,2,0.3,2.7C1558.4,694.8,1556.7,694.2,1555,693.6z"/>
+		<path class="st4" d="M831.8,700.2c1.2-3.1,4.6-3.2,7.5-3.8c0.8,0.8,1.7,1.5,2.5,2.3c0-0.5,0-1.5,0-2c0.9,4.2,1.1,8.6,1.4,12.9
+			c-0.9-3-1.7-6-2.4-9.1C837.9,702,834.7,701,831.8,700.2z"/>
+		<path class="st4" d="M1548.7,700.8c1.4-1.7,2.7-3.4,3.8-5.2c1.1,1.8,2.1,3.6,3.1,5.4c-2,0.2-4,0.4-6,0.4
+			C1549.4,701.3,1548.9,701,1548.7,700.8z"/>
+		<path class="st4" d="M1577,696.3c2.5,0.5,5.1,1,7.7,1.5c-0.8,1.3-1.6,2.5-2.3,3.8c2.9-0.4,5.8,0.2,8.7,0.8c0.9-1,1.7-2,2.6-3.1
+			c1.2,0.2,2.4,0.5,3.7,0.8c-0.2,0.3-0.6,0.9-0.8,1.2c-2,2.7-4.5,4.8-6.9,7c3.7,0.6,8.8-0.1,10.2-4.2c0.7,0.9,1.3,1.8,2,2.8
+			c-1,1-2,2.1-3,3.2c-0.6-0.4-1.7-1.2-2.2-1.6c-0.4,0.9-0.9,1.8-1.3,2.7c-0.2-1.6-1-2.3-2.4-2.2c-0.9,3.2,0.7,6.6,3.9,7.6
+			c-1.4,2.1-3.2,4-4.2,6.3c1.4-0.1,2.8-0.2,4.2-0.3c-0.2,1.1-0.4,2.2-0.5,3.3c-2.6-0.3-4.5-2.3-6.3-4c0.7-1,1.4-1.9,2.1-2.9
+			c-0.1-2-0.2-4-0.3-6c-1.3,1.3-2.7,2.7-4,4c-0.9-0.6-1.7-1.3-2.6-1.9c0.5-3.3,0.8-6.7,1-10.1c-1.2-1-2.7-1.6-4.2-1.6
+			c-2.5,2.4-2.7,6.2-3.6,9.4c-1.6-0.9-3.2-1.7-4.8-2.6c0,1.7,0,3.5,0,5.2c1.7,0,3.5,0,5.3,0c-0.2,1-0.3,1.9-0.4,2.9
+			c-1.5,0.2-2.9,0.3-4.4,0.5c-0.7,1.4-1.4,2.7-2,4.1c-1.2-0.2-2.3-0.3-3.4-0.5c-1.9,2.7-4.9,4.1-7.5,5.9c0.7,0.8,1.6,1.6,2.5,2.3
+			c1.2-1,2.3-2.1,3.5-3.1c0.1,0.5,0.3,1.5,0.4,1.9c0.3,0.1,1.1,0.3,1.4,0.4c-1,0.9-2,1.8-2.9,2.7c-2.7-1.1-5.3-2.4-7.5-4.3
+			c3.4-1.7,5.6-4.8,7.4-8.1c-2-1.7-3.6-3.8-4.3-6.3c0.6-0.7,1.3-1.3,2-2c0.5,1.9,1.1,3.8,1.7,5.6c1-1.5,1.9-3.1,2.9-4.7l0.2-0.4
+			c1,2.4,1.2,5.5,3.7,7c0.9-0.6,1.7-1.2,2.6-1.8c-2.3-3.1-2.3-6.9-2.4-10.6c1.1-0.2,2.2-0.4,3.3-0.5c2.2-2.1,4.5-4.2,5.8-7
+			c-1.7-0.1-3.3-0.1-4.9-0.2C1576.6,698.3,1576.8,697.3,1577,696.3 M1588.1,711.2c-0.5,1.6,0,2.2,1.6,1.7
+			C1590.3,711.3,1589.7,710.8,1588.1,711.2z"/>
+		<path class="st4" d="M973.2,697.4c3,1.3,5.9,2.9,9.2,3.5c0.5,0.7,1.1,1.5,1.6,2.2c-0.6,2,0,4.9-2.2,6c-1-1.2-1.8-2.6-2.5-3.9
+			c-1.1-1.8-2.2-3.6-3.2-5.4c-1.4,0-2.7-0.4-3.9-1C972.5,698.5,973,697.8,973.2,697.4z"/>
+		<path class="st4" d="M1264.1,699c-2.4,0-0.9-3.1,0.8-2l0.5,0.7C1265.1,698.1,1264.4,698.7,1264.1,699z"/>
+		<path class="st4" d="M232.6,699.8c1.3-0.2,2.7-0.3,4.1-0.5c0.5,1.1,1,2.2,1.5,3.4c-1.3,1.4-2.7,2.8-4,4.2
+			c-1.2-2.2-2.2-4.4-3.1-6.7C231.4,700.1,232.2,699.9,232.6,699.8z"/>
+		<path class="st4" d="M0.7,700l1.5-0.4c0.2,0.7,0.8,2.1,1,2.8c0.1,0.3,0.4,1,0.5,1.3c0.5,0.2,1.5,0.5,2.1,0.7
+			c-0.6,0.4-1.1,0.9-1.7,1.4c2.9,2.1,6.1,4.1,7.9,7.3c0.9,2.8,2.5,6.4-0.3,8.7c-1.9,0.5-3.9,0.7-5.8,1.3c-1.3,1.2-1.8,3-2.6,4.6
+			c-0.5,1.1-1,2.2-1.4,3.2c-0.6-0.7-1.2-1.4-1.9-2.1V717c1.5-0.2,3.1-0.3,4.7-0.4c-0.5-0.9-1-1.9-1.5-2.8c-1.1-0.4-2.1-0.8-3.2-1.1
+			V704C2.1,703.6,2.9,700.8,0.7,700 M3.5,709.6c-0.4,2.8,1.7,5,3,7.2c-0.1,1.2-1.8,3-0.2,3.8c1.4,1.4,3.9,1.1,4.8-0.7
+			C13.1,715.2,9.1,708.4,3.5,709.6 M1.2,718c-0.1,0.8-0.2,2.5-0.3,3.3c0.9,0.1,2.7,0.3,3.6,0.4C5.7,719.3,3.8,716.3,1.2,718z"/>
+		<path class="st4" d="M1313.1,701.3l0.5-0.2c1.2,2.5,2.3,5,3.3,7.6c-0.9,0-2.7-0.1-3.6-0.1c-0.7,0-2.1-0.2-2.9-0.2
+			c-0.4,1-0.8,2-1.2,2.9c-1,0-3,0-4-0.1c0.3-0.6,0.9-1.7,1.2-2.3c0.6-1.6,1.2-3.3,1.7-4.9c-1.6,0-3.1,0.1-4.7,0.1
+			c0.1,1.3,0.2,2.6,0.3,4c-0.3,0.4-1.1,1.3-1.4,1.8c-0.6-1.3-1.1-2.6-1.7-3.9c0.7-1.2,1.4-2.4,2.1-3.5
+			C1306.2,703.2,1309.8,703.2,1313.1,701.3z"/>
+		<path class="st4" d="M1422.2,702c3.8-0.7,0,4.6-1,1.2C1421.5,702.9,1421.9,702.3,1422.2,702z"/>
+		<path class="st4" d="M517.8,704.1c0.6-0.5,1.9-1.4,2.5-1.9c0.3,2.3,0.5,4.7,0.1,7.1c-0.4,0.4-1.2,1.2-1.6,1.5
+			C516.2,709.4,517.7,706.3,517.8,704.1z"/>
+		<path class="st4" d="M1399,707.4c2.5-1.1,4.9-2.5,7.3-3.8c2.4,2.4,0.4,6-2,7.6c-0.4,0.2-1.2,0.6-1.6,0.8
+			C1402.4,709.7,1401.8,707.4,1399,707.4z"/>
+		<path class="st4" d="M828.1,708.4c1.4-0.3,3.4-1.8,4.5-0.2c0.2,1.7-0.6,3.3-1,4.9C829.6,712.1,828.7,710.3,828.1,708.4z"/>
+		<path class="st4" d="M1011.5,710c0.1-1.4,1.3-2.3,2-3.4c2.2,1.2,4.3,2.4,6.6,3.5c0.3,0.4,0.8,1.3,1.1,1.7c-0.4,2-0.7,3.9-0.9,5.9
+			c1.3-0.1,2.7-0.2,4-0.4c-1.4,3-2.2,6.2-2.1,9.5c-0.7-2.1-1.2-4.3-2-6.4c-2.4,0.8-4.6,2.3-7.1,2.4c-1.1-0.8-2-1.9-2.9-2.9
+			c0.8-1.8,2.7-2.3,4.4-2.8c0.7-1.1,1.5-2.2,2.1-3.3C1015.1,712.3,1013.2,711.3,1011.5,710z"/>
+		<path class="st4" d="M1552.8,708.2c2-1,4.3-1.2,5.6,1C1556.5,710.5,1554.3,709.8,1552.8,708.2z"/>
+		<path class="st4" d="M1131.5,708.5c1.1,0,2.2,0.3,3.3,0.4c-0.4,1-0.8,1.9-1.2,2.9c-0.9,2.3-0.9,4.8-1.7,7.1
+			c-0.8,1.5-2.5,1.5-4,1.6c0.5-1.5,1.1-3,1.6-4.6c-0.6-0.4-1.7-1.3-2.3-1.7c0.3-0.4,0.8-1.2,1.1-1.6
+			C1129.4,711.3,1130.3,709.8,1131.5,708.5z"/>
+		<path class="st4" d="M1288.5,710.2c0.4-0.8,1.1-2.4,1.5-3.3c0.8,1.2,2.8,3.2,1.1,4.5C1290.4,711.1,1289.2,710.5,1288.5,710.2z"/>
+		<path class="st4" d="M1116.3,710.3c1.3-1.4,3.6,0.9,2.1,2.2C1117.1,714,1114.8,711.6,1116.3,710.3z"/>
+		<path class="st4" d="M125.2,710.8c0.7,0.9,1.3,1.7,2,2.6c0,2.4,0,4.9,1.2,7c1,2.7,3.8,5.8,1.4,8.6c-1-1-1.9-2.1-2.8-3.2
+			c-0.3-0.9-0.5-1.8-0.8-2.7c0.5-0.7,1-1.5,1.5-2.2c-1.2-0.5-2.4-1-3.7-1.4c-0.7-0.3-2-0.8-2.7-1.1c1.1-1.4,2.6-2.4,4-3.4
+			C125.4,713.6,125.2,712.2,125.2,710.8z"/>
+		<path class="st4" d="M527.2,712.8c1.3,2.5,3.2,4.7,4.3,7.4c0.1,2.1-0.5,4.2-0.3,6.2c0.7,0.4,2.2,1.2,3,1.6c-1.7,2.2-3,4.6-4.3,7
+			c0.2,0.5,0.8,1.6,1,2.1c-0.6-0.3-1.9-0.8-2.5-1.1c0.6-2,1.2-4,1.8-6c-0.8-0.1-2.3-0.4-3.1-0.5c-1,1.5-2,3-2.9,4.5
+			c-2.6-1.3-5.1-2.8-7.5-4.4c2.9-4.5,5.2-9.7,10-12.4C526.8,715.7,527,714.2,527.2,712.8z"/>
+		<path class="st4" d="M1281,712.7c2.1,0.4,4.2,0.7,6.3,1.2c0.3,0.1,1,0.4,1.4,0.5c0.3,1.1,0.6,2.2,0.9,3.3c1.9-0.6,3.9-1.1,5.8-1.9
+			c1.1,2.1,2.4,4.3,4.9,4.9c-0.3-1.8-0.6-3.5-0.9-5.2c2.4,1.7,2,4.6,1.9,7.2c-1.4,1.8-2.6,3.8-3.8,5.7c0.7,1.5,2.1,2.8,2,4.6
+			c-0.6,2.4-3.5,2-5.4,2.6c1.3,0.1,2.6,0.3,4,0.5c-1.3,0.7-2.6,1.4-3.9,2.1c-1.4-0.3-2.7-0.7-4-1c1.2-2,2.5-4.1,3.8-6.1
+			c-3.9,0-6.6,2.5-8.3,5.8c-0.6-3-0.8-6.1-0.9-9.2c-2.1,2.7-3.4,5.9-5.3,8.7c-2.3,2.6-5.8,3.7-8.9,5c-0.5,0-1.5,0-2,0
+			c1.7-2.2,3.6-4.3,5.6-6.3c-0.4-0.6-1.2-1.8-1.6-2.4c2,0.6,4.1,1.4,6.2,1.8c2.2-1.5,2.7-4.1,3-6.5c-1.7,0.8-3.3,1.7-4.9,2.6
+			c-1.3,0.1-2.6,0.2-3.8,0.4c0.1-0.3,0.2-1,0.3-1.3c-1.4-1.7-2.4-3.7-3.6-5.5c-1.8-2.1-5.4-3.9-3.1-7l1.3,0.6c1.3,0.9,2.7,1.9,4,2.8
+			c0.7-0.5,1.5-1.1,2.3-1.6c-0.2,0.6-0.6,1.8-0.8,2.5c1.4-0.1,2.8-0.2,4.2-0.3c0.4,0.6,0.8,1.2,1.2,1.9c-0.6,1.6-1.1,3.2-1.6,4.8
+			c1.5-0.4,3-0.8,4.6-1.1c-0.2-1.2-0.5-2.4-0.6-3.6C1283.1,719.9,1282.6,716,1281,712.7 M1283.9,718.9c1.3,2.1,3.9,3.8,6,1.4
+			c-0.5-0.5-1.5-1.4-2.1-1.9c-0.5-1.2-0.6-2.8-2-3.2C1283.7,714.1,1282.5,717.6,1283.9,718.9 M1287.4,722.5c1.9,1.5,3.5,3.2,5,5.2
+			c0.1-0.4,0.3-1.2,0.4-1.6c1.5,0.4,3.3,1.6,4.7,0.2c0.9-2.2-0.9-4.1-2.6-5.2c0.3-0.7,0.7-1.4,1-2.1
+			C1293.2,720.6,1290.4,721.8,1287.4,722.5 M1285.7,727.2c0.4-0.5,1.3-1.6,1.7-2.2c-1.2-1.3-2.4-2.6-3.6-4
+			C1281.2,723.1,1283.9,725.7,1285.7,727.2 M1271.5,724.8c-0.2,1.8,1.5,2.9,2.5,4.1c1.2-1.4,2-3.1,2.2-4.9
+			C1274.7,724.1,1272.9,723.6,1271.5,724.8 M1286.3,728c-0.1,1.5-0.2,3-0.3,4.5c1.2-0.6,3.8-0.5,3.4-2.5
+			C1288.6,729,1287.4,728.6,1286.3,728 M1294.3,733.3c1.1,0.2,2.3,0.3,3.5,0.3c-0.2-1.2-0.4-2.4-0.9-3.6
+			C1295.2,730.3,1294.8,732,1294.3,733.3z"/>
+		<path class="st4" d="M1134.2,714.5c2.6-0.5,5.2-0.7,7.8-1c0,1.7,0,3.3,0,5c-0.9-0.6-1.8-1.2-2.7-1.8c-0.3-0.3-0.9-0.9-1.2-1.2
+			C1136.8,715.1,1135.4,714.8,1134.2,714.5z"/>
+		<path class="st4" d="M1410.2,714.1c0.5,0.2,1.3,0.6,1.8,0.8c0.1,1.3,0.2,2.6,0.3,3.9c1.5-1.1,3-2.3,4.7-3
+			c3.7-0.9,7.2,0.8,10.4,2.3c0.2,2.6-0.5,5.8,1.6,7.8c2.7,3.1,4.5,7,8.1,9.3c-0.3,1.5-0.7,3-1,4.5c-0.4-0.1-1.1-0.2-1.4-0.3
+			c-0.7-2-1.4-4-2.1-5.9c-1.1-0.4-2.1-0.7-3.1-1c-1.4-1.8-2.5-4.1-4.7-5.2c-2.3-0.7-4.7-0.7-7-0.9c-0.8-1.6-1.6-3.1-2.3-4.7
+			c-0.5,1.3-0.9,2.6-1.4,3.9c-1.5-0.4-3-0.8-4.6-1.1c-1.8-0.5-1.6,2.2-2.2,3c-3.1,1.2-6.4,0.8-9.6,0.7c-1.3-2.3-2.7-4.6-3.9-7
+			c-0.2,0.5-0.7,1.4-1,1.9c-1.6,0.2-3.2,0.2-4.7,0c0.6-2.1,1.4-4.3,4-4.4c0.5,0.1,1.6,0.4,2.1,0.6c0.3-0.1,1-0.2,1.3-0.3
+			c0.1,2.7,0.1,5.9,3.1,6.9c0.9,0.7,2.1,0.3,3.1,0.4c1.5,1.3,3.5,0.3,5.2,0c-0.7-2.2-1.6-4.4-2.5-6.5c-0.1-0.4-0.2-1.3-0.3-1.7
+			C1407.2,718.4,1408.9,716.4,1410.2,714.1 M1416.2,717.4c-0.2,0.2-0.7,0.6-1,0.8c0.6,2.7,2.9,4.8,4.1,7.3c3.8,1.2,8-3.5,6.1-7
+			C1422.4,717.7,1419.3,717.3,1416.2,717.4 M1406.1,719.8c0.4,1.3,1,2.5,1.8,3.6c2.6-0.3,1.9-3.7,2.2-5.5
+			C1408.7,718.5,1407.4,719.2,1406.1,719.8z"/>
+		<path class="st4" d="M553.5,715.3c1.6,1.2,3.2,2.4,4.9,3.4c-2,0.7-3.5,2.3-4.9,3.8c-0.9-0.7-1.8-1.4-2.7-2.1
+			C551.7,718.7,552.6,717,553.5,715.3z"/>
+		<path class="st4" d="M834.6,717c0.6-1.9,2.8-1.6,4.4-1.9c0.9,2.7,0.3,5.2-2,6.8C835.9,720.4,834.3,718.9,834.6,717z"/>
+		<path class="st4" d="M365,715.9c3,0.6,6.1,0.5,9,1.6c-2.1,2-4.2,3.8-6.4,5.7c-0.8-1.6-1.6-3.2-2.3-4.8c-0.7-0.1-2-0.4-2.7-0.5
+			C363.4,717.1,364.2,716.5,365,715.9z"/>
+		<path class="st4" d="M1702.7,718c1.4-0.3,2.9-0.7,4.3-1c-1.1,1.1-2.2,2.1-3.3,3.1c0.1,0.8,0.4,2.3,0.6,3.1
+			c0.8-0.8,1.6-1.5,2.4-2.2c0.6,1,1.2,1.9,1.9,2.9c-0.2,1-0.4,2-0.5,3c-1.6-0.2-2.4,0.5-2.5,2c-1-0.9-2-1.7-3-2.5
+			C1702.6,723.7,1702.6,720.8,1702.7,718z"/>
+		<path class="st4" d="M1726.5,723.6c1.8-2.4,4.1-4.4,6.5-6.3v3c-0.7,1-1.3,2-2,3c-1.5,1.6,1.2,2.8,2,3.8v0.1
+			c-2.6-1.5-2.6,3.4,0,1.8v0.3c-2.5,0.8-4.9,1.4-7.4,2.1c-0.4,1.1-0.7,2.3-1,3.4c-0.6,0.1-1.9,0.3-2.5,0.4l-0.2-0.3
+			c1-1,2-2.1,3.1-3.1c-0.9-0.2-2.6-0.7-3.4-1c-2.8,2.8-5.6,6.5-10,6.1l-0.3-1.1c1.3,0.8,2.2,0.6,2.8-0.8c-0.6-1.2-1.6-1.6-3-1.1
+			c-0.2-0.3-0.7-1-1-1.4c-0.5,0.3-1.6,0.9-2.1,1.2c1.2-1.7,2.5-3.4,3.8-5c-0.3-0.6-0.9-1.7-1.3-2.2c0.9-0.9,1.8-1.8,2.7-2.6
+			c0.4-1.3,0.8-2.5,1.2-3.8c1.6,0.2,3.3,0.4,4.9,0.5c-1.7,0.3-3.3,0.7-5,1.1c0.5,1.4,0.8,3.1,2.5,3.6c-1.1,1-1.5,2.3-1.4,3.8
+			c-0.5,1.1-1.1,2.2-1.6,3.4c1.7-0.5,3.2-1.2,4.7-2.2c0.7-0.2,2.1-0.5,2.8-0.7c-0.1-0.8-0.3-2.5-0.4-3.4c0.7,1.3,1.4,2.5,2.2,3.8
+			c1-0.3,2-0.6,3-0.9c-1.3-2.2-2.7-4.3-4-6.4c-0.8,0-2.3,0-3.1,0.1c0.3-0.6,0.9-1.7,1.2-2.2c1.2-0.1,2.5-0.2,3.8-0.3
+			c-0.3,2.1,0.6,4.1,1.6,5.9C1725.9,725.3,1726.2,724.5,1726.5,723.6 M1727.2,727.2c-1.4,0.8-0.1,3.3,1.3,2.2
+			C1729.8,728.6,1728.6,726.1,1727.2,727.2z"/>
+		<path class="st4" d="M1324.3,719.2c1.8,1.8,3.8,3.5,5.9,5.1c-2.1,1.4-5.8,2.3-5.5,5.5c0.8,0.2,2.4,0.6,3.2,0.9
+			c0.6-0.8,1.2-1.5,1.8-2.2c0.9,1.9,2.1,3.7,3.5,5.3c0.8-0.7,1.5-1.3,2.3-1.9c-0.2-0.4-0.5-1.1-0.7-1.5c0.7-0.8,1.4-1.6,2.2-2.4
+			c2.4-0.1,4.9-0.2,7.4-0.2c0.5,4.9,0.5,9.8-0.1,14.7l-0.3-1.1c-0.1-0.6-0.2-1.8-0.2-2.4c0-2.1-0.6-4-1.7-5.8
+			c-0.5,0.2-1.6,0.6-2.1,0.8c-0.9,0.4-1.8,0.8-2.7,1.2c0-1.7-0.7-2.3-2.1-1.9c-0.8,1.2-0.5,2.2,0.7,3.1c-2.1,2.2-4.6,0-6.5-1.1
+			c-3.1-2.1-6-4.5-7.5-8c-1.8,0.2-3.2,1.1-4.4,2.4c0.5,1.5,2.5,2.9,1.7,4.6c-4.2,1.4-9.9,1.8-11.2,6.9c-1.5,0-2.9-0.1-4.3-0.2
+			c1.6-2.4,5.3-4,4.6-7.3c-2.6,0-4.4,2-6.5,3.1c-0.9-0.9-1.4-2-1.6-3.4c2.2-1.2,4.4-2.6,6.8-3.6c1.9,0.3,3.2,1.9,4.7,2.9
+			c2-4.1,6.5-5.7,9.7-8.6c-0.1,0.5-0.1,1.4-0.2,1.8c1.4-0.4,2.8-0.8,4.2-1.2c0-0.5,0-1.4,0-1.8c-0.7-0.2-2.1-0.7-2.8-1
+			C1323.3,720.8,1323.8,720,1324.3,719.2 M1314.3,730.3c-0.9,1-1,2.3-0.5,3.7c1.3,0.6,4-0.1,3.3-2
+			C1317.4,730.6,1315.4,729,1314.3,730.3z"/>
+		<path class="st4" d="M1132,724c-1.1-1.5-0.7-2.6,1-3.2c1.6-0.2,2.6,1.4,3.9,2.1C1135.6,723.7,1133.5,725.8,1132,724z"/>
+		<path class="st4" d="M1577.3,721.5c0.6-0.1,1.9-0.2,2.5-0.2c0.4,1.1,0.9,2.3,1.4,3.4c0.7,0.3,2,0.9,2.6,1.2
+			c-0.7,2.4-3.5,2.6-5.4,3.1C1577.6,726.5,1577.2,724,1577.3,721.5z"/>
+		<path class="st4" d="M1139,725c-1.6-2.7,2.1-3.2,3.9-2.6C1142.2,723.7,1140.3,727.7,1139,725z"/>
+		<path class="st4" d="M829,729.1c2.2-2.2,3.9-4.8,6.2-6.9c3.7,3.8-1.4,7-4.2,9.1C830.3,730.6,829.6,729.8,829,729.1z"/>
+		<path class="st4" d="M166.5,724.1c2.2,0.8,4.5,1.6,6.6,2.6c-0.9,0.1-2.7,0.4-3.6,0.5c-1,0.6-1.9,1.3-2.8,1.9
+			c-1.3-0.9-2.5-1.8-3.8-2.6C164.1,725.7,165.3,724.9,166.5,724.1z"/>
+		<path class="st4" d="M965,725.2c1,0.3,2.1,0.6,3.1,0.9c1.5,0.6,2.9,1.1,4.4,1.7c0,0.6,0,1.2,0.1,1.8c-0.9,0.4-1.9,0.7-2.8,1.1
+			c-0.5,0.2-1.6,0.6-2.2,0.8C965.2,730.2,965.1,727.6,965,725.2z"/>
+		<path class="st4" d="M339.7,727c0-0.4-0.1-1.2-0.1-1.6c1.3,2.3,3.8,4.7,1.8,7.4c-3,0.2-6.3,0-9,1.6c-1.5,1.7-0.8,4.2-1,6.3
+			c-1.2-0.1-2.4-0.2-3.6-0.3c-0.8-2.3-2-4.3-3.4-6.3c0.8-1.4,1.6-2.8,2.4-4.2c-1.3-0.5-2.6-1-3.9-1.4c1.7-0.1,3.3-0.3,5-0.5
+			c0.3,1.5,0.5,3,0.8,4.5c0.9,0.1,1.9,0.2,2.8,0.4c1-1.6,2-3.2,3.1-4.8c1.7,1.7,3.5,3.6,6.1,3.3C340.4,729.8,340,728.4,339.7,727z"
+			/>
+		<path class="st4" d="M1260.2,727.2c0.2-0.4,0.6-1.3,0.9-1.7c0.4,4.9,1.1,9.9,2.2,14.7c-1.7-1.4-3.4-2.9-5.2-4.2
+			c-0.2-0.1-0.5-0.2-0.7-0.3c-0.1-1-0.2-2.1-0.3-3.1C1258.1,730.8,1259.2,729,1260.2,727.2z"/>
+		<path class="st4" d="M1539.3,725.4c0.2,0.2,0.7,0.6,1,0.8c1.5,1.6,2.8,3.4,4.2,5.2c1.5,0,3-0.2,4.5,0c1.2,1.4,2.1,3.1,3.3,4.5
+			c1.4,0.9,3.2,0.4,4.8,0.6c0.2-1.5,0.4-2.9,0.6-4.3l0.6-0.4c0,1.4,0,2.9,0,4.3c-0.7,0.7-1.3,1.4-2,2.1c-1,0.4-2.1,0.8-3.1,1.1
+			c-1.9-0.3-3.8-0.6-5.6-0.8c0.1-0.5,0.3-1.1,0.5-1.6c0.4-1.8,2.1-4.9-0.9-5.2c-0.4,0.3-1.1,1-1.5,1.4c-0.5,0.6-0.9,1.1-1.4,1.7
+			c-0.8-0.2-2.3-0.7-3.1-0.9l0,0.3c-0.3,2.3-0.5,4.7-0.6,7c-0.2-2.2-1.4-4.1-2.8-5.6c0.4-1,0.8-2,1.3-3c0.3-0.2,1-0.5,1.4-0.7
+			c-0.4-1.8-0.7-3.6-1-5.5L1539.3,725.4z"/>
+		<path class="st4" d="M1602.9,726.4c2,0.4,4.1,0.7,6.2,1.1c-0.2,0.3-0.5,0.9-0.6,1.2c0.4,0.2,1.4,0.5,1.8,0.7
+			c-2.5,0.1-6.1-0.7-6.2,2.9c1.8,0.1,3.6,0.1,5.5,0.2c1.6,2.6,4.2,4.6,7.4,4.9c1.7,0.7,2.5-1.2,3.3-2.3c0.7,0.6,1.4,1.2,2.2,1.8
+			c-0.2-3.4,0.6-7.1,3.7-9c1.9-1,4.3-0.1,6.4-0.2c-1,0.8-2,1.6-3,2.4c1.2,2.3,2.4,4.6,3.4,7c-0.1,1.9-0.1,3.8-0.1,5.7
+			c-2.5-0.1-4.9-0.3-7.4-0.3c-2.9-1.4-5.5-3.2-8.4-4.5c-2.8,0.1-5.6,0.6-8.4,0.9c0.2-1.3,0.5-2.7,0.7-4c-0.7-1.7-2.6-1.2-4-1.4
+			c-0.5,1.5-1,3-1.5,4.5c-1.4-0.4-2.9-0.8-4.3-1.2c0-1.4,0.1-2.8,0.1-4.1c0.5-0.3,1.5-0.8,2-1
+			C1601.8,729.9,1602.3,728.1,1602.9,726.4 M1625.9,737.2c1.2-1.4,2.4-2.7,3.6-4.1c-0.4-1.4-0.8-2.9-1.1-4.3
+			C1624.9,729.6,1621.3,735.3,1625.9,737.2z"/>
+		<path class="st4" d="M1383.1,729.9c3.3,0.5,6.4-0.6,8.8-2.9c0.1,0.7,0.4,2.1,0.6,2.9c-3.9,0.9-7.9,1.4-11.8,2
+			c1.6,1.5,3.4,2.8,4.9,4.5c0.2,1.6-0.8,3.1-1.2,4.6c-0.7-0.1-2.1-0.2-2.8-0.2c-0.3-2-0.6-4.1-0.8-6.1c-1.2-0.6-2.4-1.2-3.6-1.9
+			c2.1-2,4.5-3.7,7-5.2C1383.8,728.2,1383.3,729.4,1383.1,729.9z"/>
+		<path class="st4" d="M244.2,728c1.4,0.6,3.6,0.7,4.2,2.5c0.3,1.7,0,3.4,0,5.1c3.3,0.2,3.6-3.1,4.4-5.5c1.1,0.1,2.2,0.2,3.3,0.4
+			c-0.7,0.3-2.2,0.8-2.9,1.1c0.8,2.1,1.5,4.3,2.1,6.5c-0.6-0.3-1.9-1-2.6-1.3c-0.9,1.6-1.8,3.2-2.6,4.8
+			C248,737.1,246.4,732.5,244.2,728z"/>
+		<path class="st4" d="M353.6,728.6c0.3-0.3,1-1,1.3-1.4c2.6,0.7,4.3,3,6.3,4.6c1,3,1.8,6.1,1.2,9.3c-0.9,0-2.6,0.1-3.4,0.1
+			C355.4,738.1,355.5,732.8,353.6,728.6 M357.2,731c-0.1,2.4-1,5.2,0.5,7.4c1.2,0.5,2.6,0.1,3.8,0
+			C361.1,735.4,360.7,731.9,357.2,731z"/>
+		<path class="st4" d="M1075.8,728.8c1.8-0.4,3.7-0.7,5.5-0.9c-0.2,2.4,1.4,4.1,3.2,5.4l0.4,0.5c-2.5,1.3-5.6,2.2-6.8,5
+			c0.8,1.2,1.8,2.2,2.7,3.3c-1.3,0-2.6-0.1-3.9-0.1c-0.3-1.5-0.5-3.1-0.7-4.6c1-1.1,2.5-1.9,3-3.4c-0.2-1.5-0.4-2.9-0.7-4.4
+			C1077.9,729.5,1076.5,729.1,1075.8,728.8z"/>
+		<path class="st4" d="M540.2,733.7c0.4-1.4-0.5-4.4,1.8-4.3c2,0,1.3,2.9,1.9,4.2C542.6,733.6,541.4,733.6,540.2,733.7z"/>
+		<path class="st4" d="M947.7,732.3c0.8,0.3,1.6,0.6,2.4,0.9c-0.2,2.6-0.1,5.3,0.4,7.9c2.1-1,4-2.4,4.8-4.6c1.2-0.6,2.3-1.2,3.5-1.6
+			c2.1-1.3,4.8,0.8,5.6,2.8c-0.8,1.2-1.8,2.4-2.8,3.5c1.9,0,3.9,0,5.9,0c-0.1-1.1-0.3-2.2-0.4-3.2c3.1,0,6.2,0.2,9.3,0.4
+			c0.1,0.8,0.3,2.4,0.5,3.2c-6.4-0.1-12.7,1.4-19,0.3c-5.7,0.4-11.4,0.9-17.2,0.8C945.8,741.7,947.1,736.5,947.7,732.3z"/>
+		<path class="st4" d="M1243.9,732c1.5-0.6,3.1,1.2,2.5,2.7C1244.7,735.4,1243,733.5,1243.9,732z"/>
+		<path class="st4" d="M1367.5,731.3c0.9,0.2,2.6,0.5,3.5,0.7c1.3,1.4,0.3,4.3-1.8,3.8C1366.9,735.8,1367.8,732.7,1367.5,731.3z"/>
+		<path class="st4" d="M617.8,736.2c0.8-1.1,1.5-2.2,2.3-3.3c-0.3,1.8-0.5,3.7-0.7,5.5c2.3-1.2,4.4-2.8,6.6-4.1c2-0.2,2.2,2.3,2,3.7
+			c0.1,2.7-3.3,2.8-5.1,3.8c-1,1.9-2,3.8-3.3,5.5c-0.2-1.3-0.3-2.7-0.5-4c-1.6,0.1-3.3,0.3-4.9,0.4c-0.4-0.5-1.1-1.4-1.5-1.9
+			c-1.4-2-2.2-4.2-2.9-6.5c0.7-0.1,2.1-0.2,2.8-0.3C613.8,736.8,616.6,739.2,617.8,736.2z"/>
+		<path class="st4" d="M1114.9,735.3c0.8-1,1.5-1.9,2.3-2.8c0.9,1.2,1.8,2.5,2.5,3.9c-1.3,1-2.5,2-3.8,3.1c-0.9-0.7-1.7-1.6-2.8-1.9
+			c-2.2,1-4.2,2.5-6.2,3.8c-2.1,0.1-4.2,0.1-6.3,0.2l-1.7-0.2c0.2-2.4,0.5-4.7,0.7-7.1c0.5,0.4,1.1,0.8,1.6,1.2
+			c0.3,2.3,2.4,6.5,4.9,3.7c1.5-1.4,2.9-2.9,4.6-4C1112,735.3,1113.5,735.5,1114.9,735.3z"/>
+		<path class="st4" d="M546.3,734.3c1.1,0,2.2,0,3.4,0c-0.1,1-0.2,2.1-0.3,3.1c-1,0.1-2,0.2-3,0.3
+			C546.4,736.6,546.3,735.5,546.3,734.3z"/>
+		<path class="st4" d="M773.4,734.5c2.8-1.2,4.4,2.4,1.5,3.5C772.6,740.5,771,735,773.4,734.5z"/>
+		<path class="st4" d="M1440.1,733.7c1.5,0.7,2.9,1.4,4.3,2.3c-2.6,0.4-2,5.1,0.6,3.1c0,0.7,0,2.1,0,2.8c-2.1-0.2-4.1-0.4-6.1-0.6
+			c1-0.1,2.9-0.3,3.8-0.3C1441.8,738.5,1440.9,736.1,1440.1,733.7z"/>
+		<path class="st4" d="M1726.1,735.2c2.3-0.2,4.6-0.4,6.9-0.9v4.1c-0.4,1.8-0.9,3.6-1.3,5.5C1730.6,740.6,1729.6,736.8,1726.1,735.2
+			z"/>
+		<path class="st4" d="M1559.4,737.2c0.3-0.2,0.8-0.7,1.1-0.9c2,1.6,4.4,2.1,6.9,2.3c0.2,0.7,0.6,2.1,0.8,2.8
+			c-1.6,0-3.3,0.1-4.9,0.1C1562,740.1,1560.6,738.8,1559.4,737.2z"/>
+		<path class="st4" d="M0,743.4c1-0.1,2.1-0.2,3.1-0.3c0,0.7-0.2,2.2-0.2,3c2.6,1.2,4.9-0.8,7-1.8c0.8,0.5,1.5,1,2.3,1.5
+			c-1,1-2.1,2.1-3.1,3.2c1.2,0.4,2.4,0.8,3.5,1.2c-0.8,0.4-1.5,0.8-2.3,1.2c-0.5-0.4-1.5-1.1-2-1.4c-2.5-2.2-6.4-2.9-8.4,0.2V743.4z
+			"/>
+		<path class="st4" d="M4.5,755.2l0.9-0.4c0,2.9,0.1,5.8,0.2,8.7c1,0,1.9,0,2.9,0c0-3-0.1-5.9-0.3-8.9c2.5,2.5,2.6,6.1,2.8,9.4
+			c-0.9,1.1-1.8,2.3-2.6,3.4c1.6,0.5,3.2,0.9,4.9,1.4l-0.1,0.2c-2,0.7-4.3,0.9-6.1,2c-1.7,2.1-1.6,5-2,7.5c0.8,0.3,2.5,1,3.3,1.3
+			c-1.6-0.1-3.2-0.1-4.8-0.2c0.5-3,1-6.1-0.2-9c-1.7,3.1-3.4,7.3,0.1,10c-0.8,2-2,3.8-3.4,5.4v-20.5c1.1-1,2.4-1.8,3.2-3.1
+			C3.8,760,4,757.6,4.5,755.2z"/>
+		<path class="st4" d="M1727.2,775.3c3.6-0.6,3.2,8.3-0.4,6.9C1726.8,780.2,1725.2,776.7,1727.2,775.3z"/>
+		<path class="st4" d="M1707.9,783.8c2.3-1.8,4.4-3.7,6.3-5.9c1.6,0,3.3,0.1,5,0.2c-1.2,1.3-3.1,1.2-4.7,1.6c0,1.5-0.1,3.1-0.1,4.6
+			c0.9,0.6,1.8,1.2,2.7,1.7c-0.2,0.7-0.6,2-0.8,2.7c1.6,0.3,3.1,0.7,4.7,1.1c0.5-1.9,1.3-3.6,3.7-3.7c-0.6,1.7-1.2,3.5-1.8,5.2
+			c2.2,0.4,4.2,1.3,6.1,2.5c-4.5,1.8-8.9-0.5-13.2-1.6c-0.8-0.8-1.6-1.6-2.4-2.4c-0.4,2.1-0.7,4.2-0.9,6.3c-0.8-1.1-1.5-2.1-2.2-3.2
+			c-0.9,1.6-1.6,3.3-1.9,5.1c-0.2-1.8-0.5-3.6-0.8-5.4c-0.8,1.3-1.7,2.6-2.5,3.9l-0.7,0.4c0.6-1.1,0.7-2.2,0.5-3.4
+			c-0.6,0.2-1.6,0.6-2.2,0.8l-0.1-1.6l0-1l0-0.6l0-0.9c2.4,0.4,4.8,0.3,7.1-0.8c0.8,0.5,1.7,0.9,2.5,1.4c0.8-2.4-0.4-4.2-2.1-5.7
+			c-0.6,0.2-1.8,0.6-2.4,0.8C1707.8,785.4,1707.9,784.3,1707.9,783.8z"/>
+		<path class="st4" d="M6.4,785.1c0.2-2.4,2.8-3.3,4.5-4.3c-1.6,2-2.7,4.5-2.9,7.1c1.4-0.5,2.7-1,4.1-1.5c2.8,2.4,6.5,2.4,10,2.5
+			c2.6,0.2,5.3,0.7,7.8,1.4c0,0.4,0,1.2,0,1.6c-3.2-0.6-6.4-1.1-9.7-1.6c0.4,1.6-0.4,4.2,1.8,4.7c2.6,0.3,5.2-0.3,7.8-0.9
+			c0,0.8,0,2.4,0,3.1c-3.1-0.4-6.2-0.5-9.2,0.2c-0.3,0.2-1,0.5-1.3,0.7c-1.1,3.2-2.9,6.1-6,7.7c-0.1-2.1-0.1-4.2-0.2-6.3
+			c1.7-0.9,3.4-1.7,5.1-2.5c-1.3-0.9-2.7-1.7-4-2.6c-3.3,2.4-6.8,5.2-6.7,9.8c0,0.3-0.1,0.8-0.2,1.1c1.4,0.7,2.9,1.5,4.3,2.2
+			c0,2.3-0.1,4.6-0.1,7c1.2,1,2.4,2.1,3.7,3.1c1.2-2.2,1.6-5.1,3.7-6.6c1.3,0.1,2,0.8,2.1,2.1c0.4,2.5,0.4,5,0.8,7.5
+			c0.2,0.2,0.7,0.4,1,0.6c-3.4,2.8,0.9,6.8-1,10.4c-0.4-1.7-0.8-3.4-1.3-5.1c-1.2,0.2-2.4,0.6-3.6,1c-1.2-0.5-2.5-1.1-3.7-1.6
+			c-2.1,2.1-5,3-7.9,3.6c-1.6,1.3-2.1,3.5-3,5.3c1.8,1.4,5.1,2.2,4.6,5.1c-1.2,0.1-2.5,0.2-3.7,0.3C2,839.1,1,837.9,0,836.7v-10.9
+			c1.7-0.5,3.4-1,5-1.4c-1.7-1.3-3.4-2.5-5-3.9v-5c1.2,1.8,3.2,2.1,5.1,2.4c-1-3.1-2.7-5.8-5.1-7.9v-4.3c1.7,1.3,4,2.5,5.8,0.5
+			c-2.3-3.1-4.5-6.2-5.8-9.8v-2.2c1.5,2.6,2.2,6,5.1,7.5c2.2-1.5,2.6-4.4,3.2-6.8C9.1,791.5,6.8,788.4,6.4,785.1 M4.7,812
+			c-0.5,2.4,2,4,3.2,5.8c-1.6,0.7-3.1,1.4-4.7,2.2c1.2,1,2.2,2.4,3.8,2.9c1.9-1.3,3.7-2.8,5.7-4c-0.8-1.3-1.6-2.6-2.4-3.9
+			c0.2-2.6,0.6-5.5-1.3-7.6C7.3,808.6,5.6,810,4.7,812z"/>
+		<path class="st4" d="M1730.7,782.4c0.6,0.2,1.8,0.5,2.3,0.7v4.3c-0.7-0.4-1.9-1.2-2.6-1.5C1730.5,785,1730.6,783.3,1730.7,782.4z"
+			/>
+		<path class="st4" d="M1725.3,784.6c1,0,2.9-0.1,3.9-0.2c0.4,0.6,1.2,1.8,1.7,2.5c-0.9,1.4-1.8,3.8-3.8,2.1
+			C1726,787.8,1725.8,786.1,1725.3,784.6z"/>
+		<path class="st4" d="M1730.1,795.3c0.7-0.1,2.2-0.4,2.9-0.5v5C1731.8,798.4,1730.9,796.9,1730.1,795.3z"/>
+		<path class="st4" d="M1723.3,799.3c1.1-1.2,2.3-2.3,3.7-3.3c1.3,1.1,1.4,3,2,4.6c-1.4,0.3-2.7,0.5-4,0.8c-0.5,2.3-0.8,4.6-1,6.9
+			c-2.6-0.1-5,1.2-7.3,2.2c0.5-3.4,0.9-6.8,0.5-10.2c1.1,0.9,2.1,1.8,3.1,2.8c0.3-0.3,0.9-1.1,1.2-1.4c-0.5,1.5-1,3-1.4,4.5
+			C1723.8,806.2,1724.9,802.1,1723.3,799.3z"/>
+		<path class="st4" d="M1706.1,799.9c1,1.2,2,2.3,3.1,3.5c-0.2,0.3-0.7,0.9-0.9,1.2c0.5,0.3,1.5,1,1.9,1.4c-1,0.6-2,1.1-2.9,1.8
+			c-0.3-0.1-0.9-0.2-1.2-0.2c0.1,0.4,0.2,1.1,0.3,1.5c-1.1-0.7-2.2-1.4-3.3-2c-0.1-1.3-0.2-2.7-0.3-4c0.6-0.1,1.8-0.4,2.5-0.5
+			C1705.5,801.8,1705.9,800.5,1706.1,799.9z"/>
+		<path class="st4" d="M1731.2,805.4c0.6-1,1.2-2,1.8-2.9v9.6c-2.5,0.2-5.1,0.4-7.6,0.5c-0.7,1.3-1.4,2.6-2.1,4c2.4-0.1,4.9,0,7.2,1
+			c-1,0-3-0.1-4.1-0.2c-1.4,2.4,0.3,4.4,1.8,6.2c-1,2-1.9,4-2.9,5.9c-0.3-0.8-0.8-2.3-1-3.1c-1.2,0.5-2.4,0.9-3.5,1.4
+			c-0.8-1-1.7-1.9-2.5-2.9c1.5-0.6,3.1-1.2,4.7-1.8c-1.3-1-2.7-2-4-3.1c-0.6,0.2-1.9,0.7-2.5,0.9c0.3-0.4,1-1,1.4-1.4
+			c1-0.4,2-0.8,3-1.2c-0.6-0.5-1.3-1.1-1.9-1.6c-2.1,0.1-4.2,0.2-6.3,0.2c1-1.8,1.8-3.9,4-4.4c-0.1,0.6-0.3,1.8-0.5,2.3
+			c2.7,0.5,5.7,1.1,7.9-1c0.1-2.1-1.9-1.8-3.3-2c1-0.6,1.9-1.3,2.9-2c1.6,0.7,3.3,1.4,4.9,2.1c-0.8-1.2-1.6-2.4-2.3-3.6
+			c2,0.4,4.7,1.9,6.1-0.5C1732.3,807.4,1731.6,806,1731.2,805.4z"/>
+		<path class="st4" d="M1609.6,820.7c3.6-0.1,7.1,0.1,10.7,0.4c-0.8,2-1.5,4.1-2.2,6.1c-0.4-0.4-1.1-1.1-1.4-1.5c0-1.2,0-2.4,0-3.6
+			c-2.4-0.6-4.8-1-7.3-1.2c0.7,1.4,1.5,2.7,2.7,3.8c-0.3,0.3-0.8,0.9-1.1,1.2c-1.5-0.4-2.5-0.1-3.2,1.1c0.2,2,3,1.2,3.3-0.3
+			c0.1,0.4,0.3,1.3,0.4,1.7l-0.7,0.3c-1.2,0.5-2.3,1-3.5,1.6c-0.7,0.8-1.3,1.6-1.9,2.5c-0.7-0.5-1.3-1-1.9-1.5
+			c0.2-0.9,0.7-2.7,0.9-3.6c0.8,0.4,1.7,0.8,2.6,1.2c-1.4-2.2-4.4-3.9-4.1-6.8c0.5-0.5,1.5-1.5,1.9-2c0.8,0.9,1.6,1.8,2.5,2.7
+			C1608.1,822.1,1608.8,821.3,1609.6,820.7z"/>
+		<path class="st4" d="M64.5,821.1l0.4,0c0.1,1.4,0.3,2.9,0.4,4.3c2.2-1.1,4.1-2.7,5.9-4.3c-1.2,2.3-2.4,4.6-3.7,6.9
+			c-0.9,0.2-1.7,0.5-2.6,0.7c-1-1.6-3-1.4-4.6-1.5c0.4,1.5,0.7,2.9,1.1,4.4c0.6,0,1.8,0,2.3,0c-0.2,0.5-0.6,1.6-0.8,2.2
+			c1.6,3.2,2,6.8,2.1,10.3c2.2,0.2,4.4,0.4,6.6,0.5c-2.2,0.5-4.8,0.6-6.6,2.1c-0.4,1.4-0.6,2.8-0.8,4.2h-5.4
+			c1.6-1.2,2.7-2.8,3.5-4.6c-2.3-0.3-6.3,1.8-7.1-1.5c-1.2-2.2-0.1-4.4,1.1-6.3c0.8,2.4,1.6,6,4.8,5.9c2.8-1,3.3-5,1.5-7.1
+			c-1.8-1.3-3.9,0.1-5.8,0.3c1.1-1.9,2.3-3.8,3.3-5.7c-2.1,0.5-5.2,0.4-6.1,2.9c-1.1,3.8-1.4,7.7-3.3,11.3c0.8,1.6,1.6,3.2,2.4,4.8
+			h-4.9c-0.3-3.5-0.8-7,0.2-10.4c1.1-4.4,0.7-9,2.1-13.3c2.5-0.3,5-0.2,7.4-0.5C60.8,825.9,62.6,823.2,64.5,821.1 M51.6,828.1
+			c-0.9,4.2-1.4,8.6-1,12.9c1-2.6,1.2-5.4,2.5-7.9c1.1-2,4.4-2.3,4.6-4.7C55.8,827.6,53.6,827.6,51.6,828.1z"/>
+		<path class="st4" d="M83.5,821.1l0.8,0c1.1,1.6,2.2,3.3,3.4,4.8c3.5,2,6,5,8,8.4c2.1,2.1,5.1,0.4,7.5,1.2c0.5,1.3,0.9,2.6,1.4,3.9
+			c1.7,0.4,3.4,0.8,5.2,1.1c-0.3,3.5-0.9,7-1.7,10.4H106c-3.2-3.3-5.2-7.5-8.1-11c-1.5,3.6,1.4,7.2,1,11h-3l-0.1-0.1
+			c0.4-1.4,2.2-2.7,1.3-4.2c-1-2.3-2.2-4.6-3.1-7c-0.9-0.1-1.7-0.3-2.6-0.4c-0.1,1.2-0.2,2.3-0.3,3.5c-3.1-2.2-2.7-6.5-0.7-9.3
+			c0.5-1,1.1-2.1,1.6-3.1C88,828.7,84.7,825.5,83.5,821.1 M102.5,844c0.7,1.7,2.2,2.8,4.1,2.7c1.4-1.3,0.4-2.9,0-4.4
+			C105,842.5,102.7,841.7,102.5,844z"/>
+		<path class="st4" d="M142.3,820.7c3.3,0,6.6,0,9.9,0c-1.6,3.2-2.7,6.6-4.7,9.6c-1.7,0.7-3.5,1-5.3,1.5c0.9,2.4,1.7,4.7,2.6,7.1
+			c-2.4,1-4.9,2-6.6,4.1c-0.1-1-0.1-2-0.1-3c-0.8-0.1-2.3-0.3-3.1-0.4c0.3-1.3,1.3-3.5-0.9-3.6c-1.7,0.9-3.1,2.1-4.7,3.2
+			c-0.1,2.2-0.1,4.5-0.2,6.7c-2.1-0.3-4.3-0.7-6.4-1.1c-1.3-0.3-2.6-0.6-3.9-0.8c-3.2-4.5-5.9-9.4-9.3-13.7
+			c-1.3,0.5-2.5,1.1-3.8,1.7c-1-0.6-1.9-1.1-2.9-1.7c-1.4,0.3-2.8,0.6-4.2,0.8c-0.3-0.2-1-0.7-1.3-0.9c0.9-0.1,2.7-0.3,3.6-0.3
+			c0.3-0.6,0.8-1.7,1.1-2.2c-1.5-0.4-3-0.9-4.5-1.2c1.2-0.3,2.5-0.6,3.7-0.9c0.9-0.5,1.8-1,2.7-1.4c1.6,0.5,3.2,1,4.9,1.2
+			c-0.5,0.9-1,1.9-1.4,2.8c6.5,1.6,8.7,8.6,11.9,13.7c0.9-1.8,1.8-3.5,2.6-5.3c-0.4,2.1-0.5,4.3,0.9,6.1c1.7,0.6,3.4,1,5.2,1.4
+			c-0.6-1.8-0.3-4.5-2.8-4.8c0.6-3.7,0.7-7.6,0.1-11.3c-0.3-0.2-1-0.6-1.3-0.8c0.5,0.1,1.6,0.2,2.1,0.2c0.8-1,1.6-2,2.4-3
+			c3.1,0.4,6.7,1.7,9.2-1c0.2,0.2,0.6,0.6,0.8,0.8c-1.6,1.3-3.1,2.5-4.8,3.7c0.2,0.8,0.7,2.4,0.9,3.1
+			C139.4,830.2,143.6,825.7,142.3,820.7 M142.6,826.6c-0.1,1.1-0.3,2.3-0.4,3.4c1.8,0,4,1,5.2-0.9c-0.1-0.7-0.3-2.2-0.5-2.9
+			C145.5,826.3,144,826.5,142.6,826.6 M126.4,828.5c0.2,1.8,0.5,3.7,0.9,5.5c2.7-0.6,3.9-3,4.6-5.4
+			C130,828.5,128.2,828.4,126.4,828.5 M135.8,834.1c-0.1,2.5,2.9,2.7,4.5,3.6c0.5-2.5,0.6-5.4-2.3-6.4
+			C137.2,832.2,136.5,833.1,135.8,834.1z"/>
+		<path class="st4" d="M188.2,821c1.5,0.1,3,0.1,4.6,0.2c-1,3.3-1.7,6.6-2.3,10c-0.2-2.1-0.6-4.2-1.3-6.1c-0.8,1-1.6,2.1-2.3,3.2
+			c1.1,1.1,2.4,2,3.6,2.9c-2-0.6-4-1.3-6-1.9c-0.8,2.7,0.6,4.7,3,6c-0.7,1.4-0.3,3.8-2,4.5c-1.2-1.2-2.3-2.5-3.4-3.9
+			c-0.9-1.3-1.8-2.5-2.7-3.7c1.2,0.3,2.3,0.6,3.5,0.9c0.3-2.4,0.6-4.8,0.8-7.2c-1.3,1-2.6,2.1-3.8,3.3c0.4-2.3,1.4-4.5,2.5-6.5
+			c1.2,0.8,2.4,1.6,3.6,2.4C186.8,823.6,187.5,822.3,188.2,821z"/>
+		<path class="st4" d="M196,821c1.3-0.1,2.6-0.2,4-0.2c1.1,1,2.4,2,3.3,3.2c0,1.4-0.1,2.8-0.3,4.2c-1.2-1.3-1.3-3-1.8-4.6
+			c-0.6-0.1-1.6-0.2-2.2-0.3c-0.3,2.6,0.1,5.3,0.8,7.8c1.1,0.5,2.2,1,3.3,1.5c0.4-1,0.8-2,1.2-2.9c0.5,0.8,1,1.6,1.6,2.4
+			c-1.4,0.7-2.9,1.4-4.3,2.1c0.2,1.9,0.4,3.9,0.4,5.8c-1.5,2.6-1.7,5.6-2.7,8.3c-1.1,1.4-3,2-4.6,2.7H189c0-1.2,0.1-2.3,0.1-3.4
+			c1.8-0.1,3.7-0.1,5.3-1.1c0.5-5.2,0-10.5,1.7-15.4C197.2,827.8,196.6,824.3,196,821 M197.5,839.6c1.4,0.4,3-0.2,3.7-1.5
+			c0.1-2.1-2-3-3.4-4C197.2,835.8,195.5,838.1,197.5,839.6 M196,849.1c2.8-0.1,2.9-3.3,1.1-4.8C195.8,845.4,193.2,847.9,196,849.1z"
+			/>
+		<path class="st4" d="M350.2,820.8c0.8,0,2.4,0,3.3,0c-0.2,1.6-0.4,3.1-0.6,4.7c1,1.8,1.6,3.8,2.1,5.8c-2.2,0.5-4.4,0.7-6.6,0.8
+			c-0.7-2.2-1.6-4.3-1.9-6.6C347.5,823.8,348.9,822.3,350.2,820.8 M349.2,827.2c-0.8,1.4-0.3,2.9,0.6,4.1c1.6,0.2,3.2-0.5,3.5-2.2
+			C352.7,827.3,350.8,827,349.2,827.2z"/>
+		<path class="st4" d="M1169.5,820.7c2,0,3.9,0.2,5.9,0.3c-1.2,1.8-2.5,3.7-4.6,4.5C1169.6,824.2,1169.9,822.3,1169.5,820.7z"/>
+		<path class="st4" d="M1201.2,820.8c0.8,0,2.3,0,3.1,0c0.1,0.9,0.2,1.8,0.3,2.8c-1.1,0.4-2.1,0.7-3.1,1.1c0.2,0.8,0.5,1.6,0.8,2.4
+			c-0.4,1.1-0.7,2.1-1,3.2c2-0.2,4-0.7,6.1-0.5c1.8,0.9,3.2,2.3,4.7,3.5l-0.3,0.5c-1.1,0-2.1,0-3.1,0c-0.6-0.8-1.2-1.5-1.9-2.2
+			c-1.3-0.1-2.3,0.8-3.4,1.3c0.1-1.4-1.8-2.6-2.9-1.4c-0.6,1-0.4,1.9,0.6,2.7c1.3,1.2,2.7,2.5,4.1,3.7c0.6-0.7,1.2-1.5,1.8-2.2
+			c0.5,0.8,1,1.8,2,2.3c1.8-0.9,3.5-2,5.2-3.1c-2.7,3.4-5.2,6.9-8.1,10.2c0.2,1.3,0.4,2.6,0.6,3.8c-0.6,0.7-1.1,1.5-1.6,2.2h-4.1
+			c-1.4-1.1-3.7-2-3.7-4.1c1.3-1.3,2.8-2.4,4.3-3.5c0-1.3,0-2.7,0.1-4c-1.3-1-2.6-2.1-3.8-3.2c-0.8-1.2-1.5-2.5-2.2-3.7
+			c1.3-2.1,2.7-4.3,4.1-6.4c-0.1-0.5-0.4-1.6-0.5-2.1C1200,822.9,1200.6,821.8,1201.2,820.8 M1203.5,839.5c-1.6,1.7-0.4,3.5,1.1,4.6
+			c1-1.1,2-2.2,3.1-3.2C1206.4,840,1205.1,838,1203.5,839.5 M1199.4,847c0.7,3,6.2,4,5.8,0C1204.2,844,1201.1,845.7,1199.4,847z"/>
+		<path class="st4" d="M1234,820.8c0.6,0,1.9,0,2.6,0c0.9,1.7,1.9,3.4,2.9,5.1c2.3-0.6,4.9-0.9,6-3.2c2.3,0.2,4.3,1.1,6.4,2
+			c-0.2,3.8-1.6,7.4-2.4,11.1c-3.8-1.8-5.4,3.3-6,6.1c-1.3,0.2-2.5,0.5-3.8,0.8c-0.5,0.8-1,1.7-1.5,2.6c0.1-1.2,0.3-2.4,0.4-3.6
+			c1.3-0.3,2.7-0.7,4-1c0.2-0.7,0.5-2,0.7-2.7c0.3-1.1,0.5-2.1,0.8-3.2c-1.5-0.1-3-0.1-4.5-0.2c-0.5,2.2-1.2,4.4-2.1,6.5
+			c-0.1-0.5-0.2-1.3-0.2-1.8c0.1-1.2,0.3-2.3,0.5-3.5c-0.7-0.1-2.1-0.3-2.8-0.4c1.6-0.7,3.2-1.2,4.9-1.7c3.1-0.4,6.3-0.9,9.4-1.5
+			c-0.6-1.5-1.2-2.9-1.8-4.3c-0.6,0.2-1.2,0.5-1.7,0.7c-1.5-1.6-3.6-2-5.6-2c0.3,1.2,0.6,2.4,0.9,3.7c-2.2-0.8-4.6-1.1-6.8-1.8
+			c-1.9-1-2.3-3.2-3.3-4.9c0.6,0,1.8,0,2.4,0C1233.6,823,1233.9,821.5,1234,820.8z"/>
+		<path class="st4" d="M1268.6,821.5c0.6-0.1,1.7-0.3,2.2-0.4c1.3,2.3,4.7,4.9,2.5,7.6c-1.7-1.3-3.3-2.8-5.2-3.8
+			c0,1.8,1.4,3.1,2.4,4.4c0.3,0.6,0.8,1.9,1,2.5c-0.8-0.8-1.6-1.6-2.3-2.5c-0.5,0.1-1.4,0.2-1.8,0.3c0.9,2.2,1.7,4.5,2.6,6.7
+			c-0.5,0.4-1,0.8-1.5,1.2c-0.7-1.5-1.8-2.8-3.5-3.4c-0.1-0.2-0.2-0.6-0.3-0.8c-1.3-0.2-2.6-0.4-3.9-0.5c0,1.7,0,3.5,0.1,5.2
+			c-0.3-0.4-0.8-1.1-1.1-1.4c-0.2-1-0.4-3-0.6-4.1c1.5-0.5,3.1-0.9,4.7-1.4c-2.9-0.5-5.9-0.8-8.8-0.9c-0.7-1.9-1.4-3.8-2.3-5.7
+			c2-0.2,4-0.9,5.7-1.9c-0.1,0.5-0.2,1.6-0.3,2.1c0.8-0.2,1.7-0.3,2.5-0.5c1.2,0.9,2.4,1.6,3.6,2.5c0,0.5-0.1,1.6-0.1,2.1
+			c0.4-0.1,1.3-0.3,1.8-0.4c0.7-2,1.6-3.9,3.4-5.2C1269.2,822.8,1268.8,821.9,1268.6,821.5 M1256,826c0.6,2.4,3.4,4.7,5.4,2
+			C1260.2,826,1258.1,825.6,1256,826z"/>
+		<path class="st4" d="M1292.8,820.9c2.2,0.1,4.5,0.3,6.8,0.3c0,1.2-0.1,2.3,0,3.5c2.5,0.2,4.3-1.2,4.9-3.6c1.3,0,2.6-0.1,3.9-0.1
+			c-0.8,1.6-1.6,3.2-2.3,4.8c-0.4,0.4-1.3,1.3-1.8,1.7c-1.2-0.5-2.4-0.9-3.6-1.3c0.7,2.2,1.3,4.4,2.2,6.6c-1.6,0.9-3.3,1.9-4.9,2.8
+			c-0.7-1.2-1.4-2.3-2.1-3.4c0.3-0.5,0.8-1.4,1.1-1.8c1.1,0.2,2.2,0.4,3.4,0.6c-0.1-1.9-0.2-3.8-0.3-5.7c-1,0.4-2,0.9-3,1.4
+			C1295.7,824.7,1294.3,822.8,1292.8,820.9z"/>
+		<path class="st4" d="M1311.3,820.8c4.7-0.1,9.4-0.1,14.1,0c-2.7,1.6-5.5,2.8-8.1,4.5c0,0.4-0.1,1.1-0.2,1.5
+			c2.3,0.2,4.6-0.1,6.9-0.3c0.7-1.2,1.4-2.4,2.2-3.5c0.9,1.2,1.8,2.5,2.8,3.8c0.4-1.3,0.8-2.6,1.2-3.9c-0.3-0.4-0.9-1.3-1.2-1.7
+			l-0.2-0.2c2.1,0.1,4.2,0.1,6.3,0c0.3,3.5,4.7,4,5.8,7c-1.4,3-4.7,4.5-6.9,6.9c-1.1-0.6-2.2-1.2-3.3-1.9c-0.1-1.3-0.2-2.7-0.2-4
+			c-0.7-0.2-2-0.5-2.7-0.7c-0.5,1.4-1,2.8-1.4,4.2c-0.4-1.3-0.6-2.7-1.2-3.9c-3-0.5-6.1-0.3-9-1.1c-0.8-1.1-1.5-2.3-2.2-3.4
+			c-0.3,1.6-0.7,3.1-1,4.7c-1.4-0.4-2.8-0.7-4.2-1c1.2-0.8,2.4-1.7,3.3-2.9C1311.9,823.6,1311.6,822.2,1311.3,820.8z"/>
+		<path class="st4" d="M1465.2,820.8c1.2,0,2.4,0,3.7,0c0.7,1,1.5,2.1,2.3,3.1c-1.5,1-3,2.1-4.4,3.2
+			C1466.2,824.9,1465.8,822.8,1465.2,820.8z"/>
+		<path class="st4" d="M1492.6,820.8c2.1,0,4.2-0.1,6.4-0.1c0.8,1.3,1.6,2.6,2.4,3.9C1497.9,825.1,1495.1,823,1492.6,820.8z"/>
+		<path class="st4" d="M1580.9,821c0.3,0,0.9,0,1.2,0c-2,2.7-3.8,5.7-4,9.1c2.4-0.2,3.9-2.1,5.2-3.9c1.6,0.7,3.2,1.5,4.9,2.2
+			c-5.1-0.9-8.8,3.8-10.2,8.1c2.6-0.3,5.4-1.8,7.9-0.4c3,1.2,5.4,3.4,7.4,5.9c0.2-0.2,0.6-0.5,0.8-0.6c1.5,1,3.1,1.7,4.8,2.3
+			c-2.2,0.2-4.3,0.5-6.5,0.9c-0.1-2.7-2.1-4.6-4.2-6.1c-0.1,0.9-0.4,2.6-0.6,3.4c-0.8-0.6-1.7-1.2-2.4-1.8c-1.2,1.7-2.8,3.1-5,3.1
+			c0.4-1.8,0.7-3.7,1-5.5c-2.6-0.2-3.6,3.1-5.3,4.6c-0.1,0.5-0.3,1.6-0.4,2.2c-1.3-0.9-2.5-1.7-3.8-2.5c0.7-0.3,1.5-0.7,2.2-1
+			c1-1.6,2-3.3,3.1-4.9c-0.8,0-2.3-0.1-3.1-0.1c0.7-0.7,1.4-1.4,2.1-2.1c-0.9-2-1.9-3.9-2.8-5.9c-1,2.4-2.1,4.7-3.1,7
+			c-0.3-1.6-3.1-2-3.2-0.1c0.5,1.3,1.5,1.6,2.8,0.8c-1.1,1.8-1.3,3.9,0.9,5c-0.2,0.3-0.6,1-0.8,1.3c0,0.6-0.1,1.2-0.1,1.8
+			c-1.7,1.8-3.2,3.7-4.8,5.5c2.5,1.2,4.7-0.5,6.8-1.6c0,0.8,0,2.3,0,3.1h-8.8c0.4-1.8,0.9-3.6,1.4-5.4c1.3-0.2,2.7-0.5,4.1-0.7
+			c-0.2-0.7-0.5-2.1-0.6-2.8c-2-0.8-3.5,0.9-5.1,1.7c-1.6,1-3.7,0.7-5.5,1c0.1-1.7,0.3-3.5,0.4-5.2c1.5-1.1,2.9-2.3,4.5-3.3
+			c-0.3,1.3,0.2,2,1.7,2c-4.3,2.3,3.5,5.3,4,1.7c0.2-2-1.7-2.5-3.2-2.3c0.1-0.4,0.3-1.2,0.4-1.7c1.1-1.4,2.3-2.7,3.6-4
+			c-4.4,0.2-8.7,1.3-12.7,3.1c-0.6,0.8-1.2,1.7-1.8,2.5c-1-0.3-1.9-0.7-2.9-1c0-0.6,0-1.7,0-2.3c1.1-0.7,2.1-1.5,3.2-2.2
+			c-0.7-1.4-1.4-2.9-2.1-4.3c-2.7,0.7-5.3,2.1-8,2.5c-3.5-1.4-6.7-3.4-10.2-4.8c1-0.7,2-1.4,3-2.1c0.6,0.2,1.7,0.5,2.3,0.7
+			c1.3-1.2,2.7-2.1,4.6-2c1.6,1.7,3.3,3.3,5.5,4.1c4,2,8.4,0.1,12.5-0.5c-1.2,0.6-2.3,1.2-3.4,1.9c1.4,1.3,3.2,1.7,5.1,1.8
+			c0.7,0.5,1.5,1,2.2,1.5c1.7-0.3,3.5-0.5,5.2-0.8c-2.1-1.2-4.3-2.2-6.3-3.5c-0.3-1.5-0.4-3.1-0.5-4.6c2.7,1.7,5.7,0.5,8.6,0.3
+			C1575.8,822.1,1578.8,823.2,1580.9,821 M1567,826.9c0.7,0,2-0.1,2.7-0.2c0-0.7-0.1-2-0.1-2.7C1567.6,823.8,1566.9,825,1567,826.9
+			 M1541.4,828.2c1,1,2.1,1.2,3.4,0.6c0-1.5-1.1-2.6-1.8-3.8C1542.6,825.8,1541.8,827.4,1541.4,828.2 M1554.3,829.1
+			c0,0.6,0.1,1.9,0.2,2.5c1.2-0.1,2.4-0.1,3.7-0.2c-0.1-0.9-0.2-2.6-0.3-3.5C1556.6,826.6,1555.4,828.5,1554.3,829.1z"/>
+		<path class="st4" d="M1583.7,821.1l0.7,0c0.4,0.2,1.2,0.7,1.6,1c2.9,0.3,5.8,0.9,7.8,3.2c1,0,2-0.1,3-0.1c1.3,1.2,2.7,2.4,4,3.6
+			c-0.5,0.4-1.4,1.3-1.9,1.7c1.3,1.5,2.6,3,4,4.5c1.2,2.1,2.2,4.3,4,6c2.8-0.4,1.2-4,1.4-6c1.8,1.3,3.6,2.6,5.4,4
+			c-0.7,0.1-2.1,0.3-2.8,0.4c1.3,1.7,2.6,3.6,5,3.6c-0.9,1.1-1.8,2.2-2.7,3.3c-1.6,1.7-3.3,3.3-5,4.7h-4c1.9-2.4,4.4-4,6.6-6.1
+			c1.2-1.2,0.4-3,0.4-4.4c-1.8,0.6-3.5,1.2-5.3,1.8c-1.8-2.4-3.9-4.6-6.5-6.2c0.1,1,0.4,2.9,0.5,3.8c-1-0.3-2-0.7-2.9-1
+			c0.2-1.9,0-3.7-0.6-5.5c-1.1,0.3-3.2,0.9-4.3,1.1c-0.3-1.8-0.5-3.5-0.9-5.2c-0.3-0.1-0.9-0.3-1.2-0.4c0.6-1.2,1.2-2.4,1.9-3.5
+			c-2.7-0.7-5.4-1-8.2-1C1583.8,823.3,1583.7,822.2,1583.7,821.1 M1593.1,830.5c-1.2,0.9,0,3.4,1.4,2.3
+			C1595.7,831.9,1594.5,829.4,1593.1,830.5z"/>
+		<path class="st4" d="M938.2,823.4c2.9-0.5,5.8-1,8.7-1.2c-0.4,1.1-0.8,2.3-1.2,3.4c-1-0.1-2-0.1-3-0.2
+			C941.2,824.4,939.8,823.8,938.2,823.4z"/>
+		<path class="st4" d="M1285.1,824.5c2,0.4,4,0.8,6,1.2c0.7,3-2.5,4.4-4.3,6.1c-0.4-0.3-1.1-1-1.5-1.3c-1.5,0.2-3,0.5-4.4,0.8
+			c-0.5-1.2-1-2.3-1.5-3.5c-1.5,1.3-3,2.6-4.5,3.9c-0.1-0.5-0.4-1.6-0.6-2.1c1.6-1.3,3.2-2.7,3.9-4.8c1.4-0.1,2.8-0.3,4.2-0.4
+			c-0.7,0.8-1.5,1.6-2.2,2.5c0.8,2.8,3.2,3.2,5.8,2.9c-0.1-0.7-0.3-2-0.4-2.7C1285.4,826.5,1285.2,825.1,1285.1,824.5z"/>
+		<path class="st4" d="M1518,827.2c0.1-1.9,1.4-4.6,3.6-2.8c2,1.7-1.5,2.7-2.6,3.5c0.2,1,0.4,2.1,0.7,3.1c-2.1,0.7-4.1,0-3.6-2.4
+			C1516.7,828.2,1517.6,827.5,1518,827.2z"/>
+		<path class="st4" d="M1639.1,826.6c1-1.1,1.9-2.2,2.9-3.2c2.8,1.5,5.5,3.3,8.5,4.5c0,0.8,0,1.5,0,2.3c-1.6,0.4-3.2,0.8-4.8,1.4
+			c0,0.6,0,2,0,2.6c-0.1,1-0.6,1.6-1.5,1.8c-0.9-1.4-1.7-2.8-2.4-4.2c-0.8,1.6-1.5,3.2-2.4,4.7c-0.8-0.1-2.2-0.3-3-0.4
+			c1-0.6,2.1-1.1,3.2-1.7c-2.4,0-4.8-0.1-7.2-0.2c0.3-1.8,0.6-3.5,1-5.2C1635.4,828.3,1637.6,828.1,1639.1,826.6 M1633.8,832
+			c0.5,3.3,7.3,0.1,4.2-2C1636.3,828.3,1633.1,829.2,1633.8,832z"/>
+		<path class="st4" d="M244.8,826.5c3-1.8,7.2,1,6.5,4.4c-0.4,1.7-1.2,4.5-3.4,4.4c-2.1-0.6-1.1-2.8-1.3-4.3
+			C246.8,829.3,245.4,828,244.8,826.5z"/>
+		<path class="st4" d="M1144.4,826.2c1.2-0.8,3.1-0.7,3.8,0.7c-0.7,2-1.8,4.3-4,4.9C1142.7,830.3,1143.5,827.9,1144.4,826.2z"/>
+		<path class="st4" d="M1663.5,830.9c0.9-1.8,2.1-3.4,3.2-5.1c0.4,1.4,0.8,2.9,1.2,4.3c-0.7,0.7-1.4,1.4-2.1,2.1c0.7,1,1.3,2,2,3.1
+			c1.3-1.2,2.6-2.4,4-3.4c0.2,0.7,0.5,2.2,0.6,2.9c1.2,0,2.3,0,3.6,0c-1.2,0.6-2.6,1.1-3.4,2.2c0.9,2.1,3.7,0.9,5.4,1
+			c-0.1,0.3-0.3,1-0.5,1.3c0.8,0.4,1.6,0.9,2.5,1.4c-0.7,0-2.2,0-3,0c0.2,0.7,0.4,2,0.6,2.6c-0.3-0.2-1-0.5-1.3-0.7
+			c-0.6-0.3-1.8-0.9-2.4-1.2c0.1-0.5,0.2-1.1,0.4-1.6c-1.3-1.4-2.6-2.8-3.7-4.3c-1.5,0.1-3.1,0.1-4.6,0.3
+			C1665.1,834.2,1664.1,832.6,1663.5,830.9z"/>
+		<path class="st4" d="M388.4,832.3c2.6-2.1,5-4.7,8.4-5.4c0.2,1.2,0.5,2.4,0.7,3.6c1.1,0.9,2.5,1.5,3.2,2.8c1,1.3-1,2.1-1.9,2.5
+			c-1.6,0.6-3.4,0.7-5.1,0.9c-0.4-1-0.8-2-1.2-3C391,833.7,389.5,833.3,388.4,832.3z"/>
+		<path class="st4" d="M153.3,832.5c4.1-0.8,8.7-0.6,11.5-4.2c0.5,1.4,0.9,2.8,1.4,4.2c3-0.1,6.1,0.2,8.9,1c0.6,1.8,1.3,3.7,1.9,5.5
+			c0.1,0.4,0.4,1.3,0.6,1.8c-1.8,3.1-3.4,6.5-3.6,10.1h-2.2c-0.1-1.2-0.2-2.4-0.3-3.5c-1.8-0.1-3.6-0.2-5.4-0.3
+			c-0.1,1.3-0.2,2.6-0.3,3.8h-0.4c-0.6-0.9-1.2-1.8-1.8-2.7c-1.9,0.8-3.7,1.7-5.4,2.7H156c-0.3-1.4-0.6-2.7-1-4.1c1,0.5,2,1.1,3,1.6
+			c1.9-0.6,4.5-0.3,5.6-2.5c-0.8-2.9-4.3-1.5-6.4-1.5c-0.2-0.7-0.7-1.9-1-2.6c-1.6,0.6-3.1,1.3-4.7,2c0.7,0.8,1.5,1.6,2.3,2.3
+			c-0.4,0.3-1.1,0.9-1.5,1.2c-0.1,0.6-0.2,1.9-0.3,2.5c-0.7-0.7-1.4-1.3-2.1-1.9c-1.3,0.4-1.8,2-2.8,2.8H147
+			c0.2-1.5,0.4-2.9,0.6-4.3c2.7-2.4,5.8-4.6,7.8-7.7C156.1,836.6,154.2,834.6,153.3,832.5 M157.1,834.8c0.8,0.8,1,3.4,2.6,2.7
+			c2.4-0.8,5-1,7.5-1.2c0.1-0.2,0.4-0.7,0.6-0.9C164.8,832.7,160.4,832.8,157.1,834.8 M170.2,835.4c0.4,2.4,0.4,5.2,2.3,7.1
+			c1,0.5,1.9,0.4,2.6-0.5C176.6,838.8,174.3,833.6,170.2,835.4 M160,841.2c3.1,2.1,6.9,3.5,10.8,3.4c-0.4-2.4-0.4-6.3-3.7-6.4
+			C164.1,837.4,161.6,838.9,160,841.2z"/>
+		<path class="st4" d="M937.5,828.4c1.9-0.6,1.8,2.3,1.9,3.5c-0.4,4,1.5,7.8,1.3,11.9c-0.3-0.3-0.8-0.8-1.1-1.1
+			c-0.1-1.9-0.1-3.8-0.2-5.7c-1-0.8-2-1.7-3-2.5C936.7,832.5,937,830.4,937.5,828.4z"/>
+		<path class="st4" d="M375.4,829.4c1.8-1.2,4.1-0.8,5.8,0.5c0.3,3.2,0.1,6.3,0.1,9.5c1.6,0.5,3.2,1,4.9,1.6
+			c0.2,0.9,0.4,1.9,0.7,2.8c-2.8-0.2-5.5-0.3-8.3-0.5c-1.3-1.2-3.1-2.2-3-4.2C375.3,835.9,374.2,832.5,375.4,829.4 M378.1,838
+			c2.8-1.3,2.9-6,0.8-8.2C375.5,831.1,376,835.9,378.1,838z"/>
+		<path class="st4" d="M434.4,832.9c-0.4-2,2-4.3,3.9-3.2c0.6,2.4,0.2,4.9-0.3,7.3C436.5,835.9,434.4,835,434.4,832.9z"/>
+		<path class="st4" d="M1079.2,829.5c1.2,0.2,2.3,0.5,3.5,0.8c-0.1,1.4-0.1,2.8-0.1,4.2c-2.5-0.5-5-0.4-7.4,0.1
+			C1076.2,832.7,1076.8,830,1079.2,829.5z"/>
+		<path class="st4" d="M1226.5,830.3c0.7-0.6,2-1.7,2.7-2.2c1.7,3.7,3.2,7.5,3.5,11.6c0.6-0.7,1.1-1.5,1.7-2.2
+			c0.2,0.7,0.5,2,0.6,2.6c-1.9,0.4-3.9,0.7-5.9,1c-0.2-0.6-0.5-1.8-0.6-2.4c-1.2-0.4-2.3-0.8-3.4-1.3c-0.1-1.8,2.2-2.2,3.3-3.2
+			C1227.8,832.9,1227.2,831.6,1226.5,830.3z"/>
+		<path class="st4" d="M1441,829.2c1.9,1.2,3.9,2.4,5.1,4.4c-1.9,0.5-3.7,1-5.5,1.5C1440.6,833,1440.8,831.1,1441,829.2z"/>
+		<path class="st4" d="M1007,830.1c1.7,0,3.3,0,5,0.2c1,0.7,1.4,1.9,2.2,2.9c2.6,0.1,5.2,0.1,7.7,0.1c-0.5,1.8-0.4,4.3-2.6,5
+			c-2.9,0.8-5.7-1.2-7-3.7c-0.8-1.7-2.7-1.6-4.2-2C1007.7,831.8,1007.3,831,1007,830.1 M1014,835.7c1.7,1.1,3.6,1.8,5.7,1.4
+			c0-0.7,0-2.1,0-2.8C1017.6,834.3,1015.6,834.5,1014,835.7z"/>
+		<path class="st4" d="M1410,839.1c-3.1-1.9-5.2-5.9-2.8-9.2c0.2,0.8,0.4,2.3,0.6,3c1,0.5,2,1,3,1.5
+			C1410.5,836,1410.3,837.5,1410,839.1z"/>
+		<path class="st4" d="M1533.5,831.2c0.7-0.5,2.2-1.4,2.9-1.8c0.6,0.9,1.2,1.8,1.8,2.7c-0.5,1.8-1.5,3.4-2.3,5
+			c0.8,0.8,1.5,1.6,2.3,2.4c-0.2,0.4-0.7,1.1-0.9,1.5c-2.8-0.5-5.6-1-8.4-1.7c1.9-1.5,4.9-2.4,5-5.3
+			C1533.8,833.3,1533.6,831.9,1533.5,831.2z"/>
+		<path class="st4" d="M747.2,831.2c1.7,0.4,5.2-0.8,5.4,1.8c0,2.2-2.9,1.6-4.3,1.5C747.5,833.6,747.5,832.3,747.2,831.2z"/>
+		<path class="st4" d="M1363.2,840.2c3.9-1.4,4-7.1,8.6-7.4c-1.2,3.7-1.7,7.5-2.3,11.3c-0.3-0.3-1-1-1.4-1.3c0.5-1.5,1-3,1.5-4.5
+			c-1.5,0.4-3,0.9-4.3,1.8c-0.7,1.1-1.4,2.2-2,3.3c-1.4,0.1-2.8,0.2-4.2,0.3c-1.2,2.4-2.4,4.8-3.7,7.1h-1.9c0.7-2.3-0.7-4.2-2.2-5.9
+			c-1.4,0.8-2.8,1.7-4.2,2.5c-0.5-0.2-1.5-0.6-2-0.8c0-1.8,0.1-3.7,0.2-5.5l0.8-0.9c-0.1,2.1-0.1,4.2-0.1,6.3c2-1,3.6-2.5,4.3-4.6
+			c0.4,0.2,1.1,0.7,1.5,0.9c2.3-0.3,4.7-0.7,7.1-1c0.4-0.2,1.2-0.7,1.6-1C1360.2,844.3,1364.8,842.8,1363.2,840.2 M1353.3,845.1
+			c0.3,1.6,2.2,1.3,3.4,1.8c0.3-1.3,0.7-2.5,1.1-3.8C1356.1,843.3,1353.5,842.8,1353.3,845.1z"/>
+		<path class="st4" d="M1288.1,833.6c1.4,0,2.9,0,4.4,0l-0.5,0.7c-1.1,1.3-2,2.7-2.2,4.5c-0.6,0.2-1.8,0.6-2.4,0.8
+			c-0.1,0.5-0.4,1.6-0.5,2.1c-0.5,0-1.5,0-2,0c0.4,0.9,0.8,1.8,1.2,2.7l-0.6-0.5c-0.8-0.6-1.6-1.2-2.4-1.8c-0.9-0.1-2.8-0.2-3.8-0.3
+			c0.5-1.3,1.1-2.6,1.7-3.9c0.4,0.2,1.3,0.5,1.7,0.6c0.4-1.1,0.8-2.2,1.2-3.3c1.5,1.2,3.2,2,5.1,2.2
+			C1288.7,836.1,1288.4,834.8,1288.1,833.6z"/>
+		<path class="st4" d="M1662.3,834.1c1.1,0.8,2.2,1.7,3.4,2.6c-0.5,1.4-1,2.9-1.4,4.3c1,0.5,2.1,0.9,3.2,1.4
+			c1.1,1.6,2.3,3.2,3.6,4.8c0.7,0.9,1.5,1.9,2.3,2.8c-2-1.5-4.2-2.6-6.5-3.6c0,1.5,0,3.1,0,4.6H1656c0.8-1.4,2.8-2.8,1.5-4.5
+			c-0.9-0.2-1.8-0.3-2.6-0.3c-1.1,0.4-2.4,0.7-2.9,1.8c0.2,0.5,0.8,1.4,1,1.9c-0.4,0-1.2,0-1.6,0c-0.1-1.4-0.2-2.7-0.3-4
+			c-0.7,0-2.2,0.1-2.9,0.1c-0.1,1.7-0.1,3.4-0.2,5.1h-0.8c0-2,0-4,0-5.9c3.1-0.3,6.2-0.6,9.3-0.9c0.7,0.5,1.5,1.1,2.3,1.6
+			c0.8-2.7,1.5-5.4,1.9-8.2C1661.2,836.5,1661.7,835.3,1662.3,834.1 M1660.1,847c2.6-0.8,5.1-1.8,7.5-3c-2.2-1.2-4.6-1.9-7-2.4
+			C1659.7,843.3,1659.5,845.1,1660.1,847 M1661.9,848.8c1.2,0.4,2.5,0.8,3.8,1.2c0.1-1.4,0.2-2.9,0.3-4.3
+			C1664.4,846.4,1663.1,847.5,1661.9,848.8z"/>
+		<path class="st4" d="M1154.3,835.2c3,2.1,6.6,3.3,10.3,3.6c-0.1,1.4-0.2,2.9-0.3,4.3c-2,0-4-0.2-5.9-0.2c-1.8,0-3.5,0.4-5.2,0.7
+			c-2.8-1.4-5.9-2.1-8.9-2.4c0.2-1.9,1.4-4.1,3.7-3.8c1.5,0.7,2.8,1.7,4.1,2.6C1152.8,838.3,1153.5,836.7,1154.3,835.2
+			 M1157.1,839.3c1.5,2.5,4.7,4.4,6.8,1.4C1162.8,838,1159.2,839.5,1157.1,839.3z"/>
+		<path class="st4" d="M437,841.5c1.1-2,2.1-4.5,4.8-4.4c-0.6,2.9-1.3,5.8-2.1,8.7c-1.5-0.2-2.9-0.5-4.2-1.2
+			c-0.4-0.1-1.1-0.2-1.5-0.3C434.4,842.8,435,841.2,437,841.5z"/>
+		<path class="st4" d="M1421.5,838.9c0.9-0.7,2-1.1,3.2-1c-0.1,0.7-0.2,2.1-0.3,2.7C1423,840.8,1421.4,840.9,1421.5,838.9z"/>
+		<path class="st4" d="M1241.9,849c-0.6-4.3,3.8-7,6.2-9.9c0.6,0.4,1.3,0.9,1.9,1.3c-1.1,0.6-2.2,1.3-3.3,1.9
+			c1.8,1.5,3.7,2.7,5.8,3.7C1248.9,846.7,1245.7,849.8,1241.9,849z"/>
+		<path class="st4" d="M1328.3,841.9c2-0.8,4.2-1.3,6.3-1.5c-0.8,1.5-1.7,3-2.5,4.5C1330.5,844.3,1329.2,843.3,1328.3,841.9z"/>
+		<path class="st4" d="M339.5,851c-1.1-2.8-3.6-5.7-2.3-8.8c1.3,1.7,2.7,3.4,4.2,5c1,1.2,1.8,2.5,2.5,3.8H339.5z"/>
+		<path class="st4" d="M1717.1,843.4c0.3,0,1,0.1,1.3,0.1c2.6,2.3,5.1,5,8.4,6.4c0.7-0.9,1.4-1.7,2.2-2.6c0.6-0.1,1.8-0.4,2.4-0.5
+			c-1.4,1.1-0.3,3.8,1.6,3.2v0.9h-13.2c-0.7-1.8-1.2-3.6-1.5-5.4c-0.6,0-1.8,0-2.4,0c0.4-0.2,1.1-0.8,1.5-1
+			C1717.3,844.3,1717.2,843.7,1717.1,843.4z"/>
+		<path class="st4" d="M112.1,849.2c0.3-2.1,0.9-4.1,1.8-6c1,1.2,2,2.5,2.9,3.9l0.5,1c1.3,0.2,2.6,0.5,3.8,0.8
+			c0.4,0.6,1.3,1.7,1.8,2.2h-6.3c-0.7-1.7-1.4-3.3-2-5C113.7,847.1,112.9,848.1,112.1,849.2z"/>
+		<path class="st4" d="M1186.6,846.8c2.5-0.9,5-2.7,7.8-2.3c0.9,2.8-3,4.5-4.4,6.5h-4C1186.2,849.6,1186.4,848.2,1186.6,846.8z"/>
+		<path class="st4" d="M12.1,846.3c3.1,0,6.3,0,9.4,0.1c0.3,0.5,0.8,1.4,1.1,1.8c-0.6,0.9-1.1,1.8-1.6,2.8h-2
+			c-2-1.1-4.1-2.2-6.2-3.1C12.6,847.5,12.3,846.7,12.1,846.3z"/>
+		<path class="st4" d="M493,846.3c1.5,0.1,3.1,0.3,4.6,0.4c-0.3,1.4-0.6,2.8-1,4.2h-4C492.7,849.4,492.9,847.9,493,846.3z"/>
+		<path class="st4" d="M749.8,849c1.7-4.4,9-3.7,10.5,0.6C756.8,849.6,753.3,849.4,749.8,849z"/>
+		<path class="st4" d="M226.9,849.7c2.9-1.2,6-1.5,9-2.5c0.3,1.3,0.6,2.5,0.9,3.8h-10.5L226.9,849.7z"/>
+		<path class="st4" d="M1479.1,847.1c2.2,0.3,4.5,0.6,6.8,0.9c-0.6,1-1.2,2-1.7,3h-4.3C1479.6,849.7,1479.4,848.4,1479.1,847.1z"/>
+		<path class="st4" d="M1493.9,848c1.4-0.5,2.8-1,4.3-1.4c0.5,0.1,1.5,0.3,2.1,0.3c0.2,0.6,0.6,1.9,0.8,2.5
+			C1498.5,850.2,1496.1,849.4,1493.9,848z"/>
+		<path class="st4" d="M1596.3,851c0.3-1.6,0.3-3.3,1.7-4.4c2.4,0.1,2.6,2.8,3.5,4.4H1596.3 M1598.1,848.2
+			C1596.5,851.2,1601.5,848.4,1598.1,848.2z"/>
+		<path class="st4" d="M1277.1,851c0.9-1,1.5-2.4,2.8-3.1c1.1,0.3,2.1,0.6,3.2,1c-0.3,0.5-0.8,1.6-1.1,2.2H1277.1z"/>
+		<path class="st4" d="M1041.1,851c-1.5-2.6,3.3-2.6,1.8,0H1041.1z"/>
+	</g>
+	<g id="_x23_9cbadcff">
+		<path class="st2" d="M320.2,0h5c-0.3,0.4-1,1.2-1.3,1.6c-0.5,0.7-1.5,2.1-2,2.8c3.1,0.9,6.4,1.4,9.2,3.1c0.5,0.4,1.5,1.2,1.9,1.6
+			c0.6,0.5,1.1,1,1.7,1.4c-1.6,0.8-3.2,1.7-4.9,2.5c-0.7-1-1.3-2.1-2-3.1l-0.4-0.5c-1.8-0.4-3.6-0.6-5.4-0.9c-0.3-1-0.6-2.1-0.8-3.1
+			c-1.1,0.1-2.2,0.1-3.4,0.2l-1.4,0c0.1-0.7,0.2-2,0.3-2.6c0.6-0.2,1.7-0.5,2.2-0.7C319.4,1.8,319.9,0.6,320.2,0z"/>
+		<path class="st2" d="M335.3,0h14c-1.1,0.9-2.2,1.8-3.2,2.7c-2.4,0.3-4.8,0.6-7.1,1.4c-1.9,0.5-3.8,1.9-5.7,0.8
+			c0-1.2,0.1-2.3,0.1-3.5C333.9,1.1,334.8,0.4,335.3,0z"/>
+		<path class="st2" d="M359.5,0h4.2c1.8,0.3,3.5,0.7,5.1,1.3c0.7,0.9,1.4,1.8,2.1,2.8c-0.9,2.6-3.2,3.8-5.8,4.2c0,0.8,0,2.3,0,3
+			c2.2-0.8,4.4-1.9,6.8-1.8c-1.3,1.3-2.5,2.7-4.1,3.6c-2.3,1.4-3.7-2-5.9-1.9c-1.2,0.4-2.4,1-3.6,1.5c-1-1.3-2.3-2.6-1.5-4.3
+			c0.4-1.4,0.7-2.7,0.9-4.1c-0.1-0.3-0.2-0.9-0.3-1.2c-0.2-0.6-0.5-1.9-0.6-2.6C357.6,0.5,358.8,0.2,359.5,0 M363.1,3.3
+			c-1.9,0.2-1.3,3.4,0.6,2.6C365.4,5.6,364.9,2.8,363.1,3.3z"/>
+		<path class="st2" d="M384.5,0h6.7c1.3,1,2.7,2.1,4.1,3.1c-0.1,0.6-0.5,1.7-0.6,2.3c-0.8,0-2.4,0-3.2,0c0,1-0.1,2-0.1,3
+			c-4.2-0.1-4.4,4.8-7.1,6.9c-2,1.5-3.8,3.2-5.1,5.5c-1.9-1.1-3.7-2.6-6-2.5c0.4,2.4,1.2,4.6,2,6.9c-1.5,0.2-2.9,0.4-4.4,0.6
+			c-0.4-0.4-1.4-1.1-1.8-1.5c-0.5,0.3-1.6,0.8-2.1,1.1c-0.5,0-1.5,0.1-2,0.1c0.5-1.6,0.9-3.3,1.4-5c-1.9,0-3.7,0-5.5,0
+			c0.3-0.6,0.9-1.9,1.3-2.6l1.1-0.4c2.2,0.1,4.4,0.4,6.5,0.6c1.4-2.6,3.1-5,5.1-7.3c-0.5-2.7-0.6-5.5-0.1-8.3
+			c0.8,1.2,1.5,2.4,2.2,3.6c0.3,0.4,0.8,1.3,1,1.8c0.5-0.2,1.6-0.7,2.1-0.9l0.4-0.2c-0.2-1.6-0.5-3.1-0.8-4.6
+			C381.2,1.5,382.9,0.7,384.5,0 M386.2,1.3c-1.4,1.5-2,3.4-2.1,5.4c0.6,0,1.9,0,2.5,0c0.7-1.5,1.4-2.9,2.1-4.4
+			C387.8,2,387,1.6,386.2,1.3 M376.1,13.1c1.4,0.5,2.7,0.9,4.1,1.4c1.6-0.8,3.6-1.6,3.5-3.8C380.9,9.6,377.7,10.5,376.1,13.1z"/>
+		<path class="st2" d="M394.4,0h8.3c-1.2,0.9-2.4,2-3.8,2.8C397,2.8,395.8,0.9,394.4,0z"/>
+		<path class="st2" d="M403.4,0h15.7c-0.3,0.6-1,1.7-1.4,2.2c-3,0.1-6-1.1-9.1-0.5C406.5,2.5,404.8,1.6,403.4,0z"/>
+		<path class="st2" d="M428.3,0h8c-0.9,0.8-1.8,1.6-2.7,2.4c-1.5,0.2-3,0.4-4.5,0.5c1.4,1.5,2.7,3.1,4.1,4.6c1.3-2.2,2.4-4.8,5-5.8
+			c-0.8,2.4-2.1,4.7-3.6,6.8c-3.4-1-6.9-1.6-10.5-1.3C425.5,4.8,426.8,2.3,428.3,0z"/>
+		<path class="st2" d="M444,0h4.2c1.9,1.2,3.9,2.3,6,3.1c-0.8-1-1.6-2.1-2.4-3.1h5.1c-1.2,3,4.1,3,2.7,0h5.4c1.3,1,2.5,2.2,4,3
+			c2.1-0.2,3.7-2,5.5-3h60.3c-0.1,0.9-0.2,1.9-0.3,2.8c2.4-0.8,4.8-1.8,7.1-2.8h2.2c-0.2,1.3-0.5,2.6-0.5,3.9c1,1.3,2.4,2.3,3.9,2.8
+			c2,0.6,2.2-1.9,3-3.1c-1.2,0-2.4,0.1-3.6,0.1c0.1-1.2,0.3-2.5,0.4-3.7h87c-1.4,3,4,3,2.7,0h26.1c1.2,1.1,2.4,2.2,3.5,3.3
+			c0.3-0.8,0.8-2.5,1-3.3h510.4c0,0.7,0.1,2.2,0.2,2.9c2.8,0,5.3-1.2,7.5-2.9h12.4c1.3,2,2.6,4,4.2,5.8c1.8-1.5,3.2-3.4,4.7-5.2
+			c0.6,0.2,1.8,0.6,2.4,0.8c0.3-0.3,1-1.1,1.3-1.4h14.8c0.2,0.4,0.7,1.2,0.9,1.6c1.7-0.2,3.5-0.4,5.2-0.6c-0.6,1.1-2.4,2.4-0.6,3.3
+			c1.2-0.6,2.3-1.3,3.5-2c-0.4-0.6-1.2-1.8-1.6-2.4h27.5c0.4,0.6,1.2,1.7,1.6,2.2c3.5-0.6,7-1.4,10.4-2.2h24.9
+			c0.7,2.3,3.7,1.8,4.7,0h10.4c1.4,1.4,3,2.6,4.8,3.6c0.2-1.2,0.4-2.4,0.5-3.6h2.8c0,2.7,0,5.3,0,7.9c-1,0.8-2,1.7-3,2.5
+			c0.9,1.7,1.7,3.4,2.6,5.1c1.6-0.5,3.2-0.9,4.8-1.4c-1.3-1.3-2.6-2.7-3.9-4c0.4-0.4,1.3-1.2,1.8-1.6c-0.2-2.8-0.1-5.6,0.4-8.4h17.6
+			c-1.3,1.2-2.6,2.5-3.8,3.9c2.3,0.9,4.5,0.4,6.6-0.8c1,1.3,2,2.5,3,3.8c1.1-0.5,2.2-0.9,3.3-1.4c0.5,0.9,1.1,1.8,1.7,2.7
+			c0.9-0.6,1.9-1.3,2.8-1.9c-1-1.5-2-3-3-4.5c0.7-0.2,2.1-0.7,2.8-0.9c0.7,1.6,1.2,3.2,1.8,4.8c1.9-0.7,3.8-1.5,5.7-2.2
+			c0.2-1.1,0.4-2.2,0.6-3.4h2.1c1.4,2.5,2.7,5.1,4.1,7.5c0.8-0.8,1.5-1.7,2.2-2.5c0.1-2.4-2.2-3.6-3.7-5h8.6c0.2,0.8,0.6,2.2,0.8,3
+			c0.8-0.6,1.6-1.1,2.4-1.7c1.2,1.4,2.3,2.7,3.5,4.1c-1.3,0.2-2.6,0.4-3.8,0.6c-1.9-0.7-3.8-1.4-5.7-2c-0.1,2-0.4,4-0.8,6
+			c0.6,1.1,1.1,2.1,1.8,3.2c-1.1,3-3.4,5.2-6.6,5.8c-0.3,0.3-0.9,1-1.2,1.3l0.3,0.8c3.1,2.3,6.9,3,10.6,2.7c0.4,0.3,1.3,0.9,1.7,1.2
+			c-4.1,0.1-8.3,0.9-12.4,0c-2.6-1-4.6-3.2-7.4-4c1.1,1.3,2.3,2.5,3.5,3.7c-3.5,0.6-7,0.6-10.6,0.4c-0.6-2.3-1.1-4.7-1.3-7.1
+			c-2,0.1-4,0.3-6,0.5c1.7,2.2,3.4,4.3,5.1,6.5c-8.2,0-16.7,0.5-24.8-0.3c0.2-2.2,2.6-3.3,4.2-4.6c-2.6,0.6-5.3,1.1-7.9,1.6
+			c1,0.9,2,1.9,3,2.8c-3.1,1.4-6.9,0.4-10-0.7c-3.7,1.5-7.7,1.6-11.7,1.1c0.1-1.6,0.2-3.3,0.4-4.9c-0.8,0.4-1.5,0.8-2.3,1.2
+			c0.3,1.3,0.6,2.5,0.9,3.8c-5.4,0.2-10.8,0.3-16.1,0c0.1-1.4,0.2-2.8,0.2-4.2c0.1-3-0.1-8.6-4.5-6.8c0.9,1.6,2,3.1,3.1,4.6
+			c-1.8,0-3.6,0-5.3,0.1c-0.2-0.8-0.7-2.4-0.9-3.2c-1.4,0.7-2.7,1.3-4.1,2c1.5,3.3,4.3,5.6,7.3,7.6c-3.3,0.3-6.5,0.2-9.8,0.1
+			c-0.3-1.6-0.6-3.2-0.9-4.8c-1,0-2.1,0.1-3.1,0.2c-0.3,1.4-0.5,2.9-0.7,4.4c-0.2-0.1-0.5-0.2-0.7-0.3c-1.8-2-3.8-3.8-6.2-5.1
+			c0,1.8,0.1,3.6,0.2,5.5c-3.4,0.2-6.8,0-10.2-0.1l0.5-0.7c0.4-0.6,1.1-1.7,1.4-2.3c0.4-2-0.5-3.6-1.8-4.9c-1.8,2.6-3.6,5.3-5.2,8.1
+			c-2.4,0.1-4.7-0.2-7-0.5c1.7-0.3,3.4-0.7,5.1-1.1c1-3.3,2.4-6.5,4.5-9.2c-1.8-0.2-3.7-0.4-5.4-0.6c2.7-2.4,6.1-3.9,8.5-6.6
+			c-0.4-1.9-2.2-3-3.5-4.2c-0.1-0.5-0.3-1.4-0.4-1.9c-1.6,0.8-3.2,1.5-4.8,2.2c0.1,0.9,0.2,1.7,0.3,2.6c-2.4,0.6-4.7,1.6-6.4,3.3
+			c0,1.6,0,3.2-0.1,4.8c-0.6,0.4-1.6,1.2-2.2,1.6c0.8,1,1.5,1.9,2.3,2.9c-0.2,1.9-0.4,3.9-2,5.3c-1-1.9-1.4-4.2-2.8-5.9
+			c-1.7-1.2-3.7-1.8-5.6-2.5c-0.4,3.3,2,5.1,4.6,6.6c-0.1,1.1-0.3,2.2-0.3,3.4c-4.8,0.3-9.6,0.3-14.4,0.2c-0.1-0.7-0.2-2.1-0.3-2.8
+			c0.3-0.6,0.7-1.3,1-1.9c-1.1,0.2-2.2,0.4-3.3,0.5c-0.6,0.1-1.7,0.3-2.3,0.4c-4.1-2.5-8.6-1.2-12.5,0.9c-0.2,0.6-0.5,2-0.7,2.6
+			c-1.3,0.1-2.6,0.1-3.9,0.2c0.1-0.7,0.2-2.1,0.3-2.8c0-0.3,0.1-0.9,0.1-1.2c-1.1-1.7-2.4-3.3-3.6-4.9c-0.8,0.4-1.7,0.7-2.5,1.1
+			c0,1.2,0,2.5,0,3.7c0.1,1.4,0.3,2.8,0.6,4.2c-3.4,0.2-6.9,0-9.9-1.6c-2.9,1.5-6.1,1.7-9.2,1.2c-1.5-3-4.5-4.7-7.8-4.4
+			c0.7,1.5,1.4,2.9,2.2,4.4c-11,0.8-22.1,0.1-33.1,0.4c-149.1-0.1-298.2,0.1-447.3-0.1c0.5-1.4,1-2.8,1.5-4.1c-0.7-0.3-1.3-0.6-2-1
+			c-0.9-1.4-1.8-2.7-3-3.8c0.2,3,0.9,6,1.6,9c-4.6,0.5-9.2-1.2-13.8-0.4c-6.9,1-13.9,0.4-20.8,0.2c-0.1-0.9-0.2-2.8-0.2-3.7
+			c-2.1,0.7-3.7,2.1-5.1,3.7c-7.9,0.4-15.9,0.3-23.8,0.2c-2.3,0.2-3.6-1.8-5.2-3.1c-0.2,0.8-0.6,2.2-0.8,3
+			c-17.6,0.3-35.3,0.1-52.9,0.1c-11.3-0.8-22.6,0.9-33.8-0.9c-0.9-0.6-1.8-1.2-2.6-1.8c-1.4,2-3.4,3-5.8,2.8
+			c-0.2-1.4-0.3-2.7-0.5-4.1c-0.5,0-1.5,0.1-2,0.1c0.2,1.3,0.4,2.5,0.5,3.8c-2.3,0-4.6,0.1-6.9,0.1c-0.8-1-1.6-2.1-2.4-3.1
+			c-0.2,0.7-0.6,2.2-0.8,3c-7.2,0.4-14.4-0.6-21.6-0.2c-8.1,0.5-16.2,0.4-24.3,0.2c-0.2-1.4-0.5-2.9-0.7-4.3
+			c-0.4,1.4-0.7,2.8-1.1,4.3c-8.6,0.3-17.3,0.3-26,0c-1.8-2.7-3.7-5.4-5.6-8c-1,1.7-1.9,3.4-2.8,5.2c2.1,0.5,4.2,1.3,6,2.7
+			c-5.1,0.2-10.2,0.2-15.3,0.1c0.4-2.4,3.1-5,1.7-7.3c-1.5,0.3-2.9,0.8-4.4,1.3c-0.6,1.9-1,3.8-1.9,5.6c-6.4,0.7-12.9-1-19.2,0.9
+			c0.8-0.9,1.6-1.7,2.5-2.5c1.8-1.5,3.8-2.9,6-3.5c0.7,1.5,1.4,3,2.1,4.5c1.6-0.2,3.3-0.4,4.9-0.6c1.3-1.7,2.6-3.5,4-5.2
+			c-2.3,0.3-6.7,3.1-6.5-1.2c3.3-0.7,6.9-0.7,9.5-3.2c-1.8-1.3-3.7-2.8-6-2.9c-3.2-0.7-7.7,0.1-9.5-3.4c1.7-0.4,3.3-0.8,5-1.2
+			c0.2,0.6,0.7,1.9,0.9,2.6c0.7,0.1,2,0.3,2.7,0.4c0.4-0.1,1.1-0.4,1.5-0.5c1.3-1.4,2.7-2.8,4.5-3.6l1.2,0c-0.9,2.6-1.1,5.4,1,7.5
+			c0.3,1.5,0.6,3.1,0.9,4.6c2.8-1.3,4.7-3.8,5.9-6.6c-2-0.4-4-0.8-6-1.1c1-1.9,2-3.9,3.1-5.8c1.6,1.7,3,3.6,4.7,5.2
+			c1.9,1.1,3.9,2,5.9,2.9c-0.4,0.8-0.8,1.6-1.2,2.4c1.7,0.8,1.8,2.8,2.2,4.4c0.6,0,1.7,0.1,2.3,0.1c-0.5-2.1-1.6-3.9-3.1-5.4
+			c1.8-1.1,4.2-3.4,5.2-0.1c0.1,0.5,0.2,1.6,0.2,2.2c2,0.1,4.1-0.1,6.1-0.2c0.5,1.5,1,2.9,1.6,4.4c1.5,0.8,3.1,1.6,4.7,2.3
+			c0.8-3,3-6.2,1.4-9.3c-0.1-0.4-0.4-1.1-0.5-1.5c-0.5,0-1.5,0.1-2,0.2c-0.6,1-1.1,1.9-1.7,2.9c-0.6,0-1.8,0.1-2.4,0.2
+			c-2-1-3.8-2.3-5.7-3.4c2.7-1.5,4.9-3.8,6.7-6.3c0.3,0.7,1,2.1,1.3,2.8c0.4,0,1.2,0,1.6,0c0.6-1.3,1.1-2.7,1.7-4.1
+			C444.8,2.4,444.4,1.2,444,0 M498.8,5.1c1.4-0.4,2.8-0.7,4.1-1.1c0-0.7,0.1-2.2,0.1-3C500.9,1.6,498.4,2.3,498.8,5.1 M557,1.4
+			c0.3,1.3-0.5,4.3,1.8,3.7c0.5-0.3,1.6-0.9,2.2-1.2c-0.3-0.9-0.7-1.9-1-2.8C559.3,1.2,557.8,1.3,557,1.4 M577.7,2.7
+			c0.2,1.8,0.4,3.6,0.6,5.4c2.1-1.8,3.5-4.4,2.8-7.3C580,1.5,578.9,2.1,577.7,2.7 M611.3,1.2c-0.1,0.4-0.4,1.3-0.5,1.7
+			c1,1.9,2.8,0.3,3.4-1C613.4,0.9,612.4,0.7,611.3,1.2 M1288.6,5.7c1.3,0.7,2.6,1.4,4,2c-0.5-1.3-0.9-2.7-1.3-4
+			c-1-0.7-1.9-1.5-2.8-2.2C1288.5,2.9,1288.5,4.3,1288.6,5.7 M804.3,2.3c-0.6,1.6-0.1,2.2,1.6,1.7C806.5,2.4,805.9,1.8,804.3,2.3
+			 M1251,2.6c0.7,1.1,1.7,2.1,2.2,3.4c0,3.6-5.2,4.3-4.6,8.1c0.8,1.4,2.6,1.8,3.9,2.6c0.3,1.9,0.4,3.9,1.8,5.4
+			c1.5-2.8,3.9-5,6.6-6.6c-1.1-0.8-2.1-1.6-3.2-2.4c-0.1-0.5-0.2-1.5-0.2-2c1.6-1.3,3.1-2.7,4.8-4.1c-0.8-1.3-1.5-2.6-2.4-3.9
+			C1256.9,4.2,1254,2.6,1251,2.6 M1302.8,3.2c0.8,2,2.5,2.2,4.4,1.2c1.4,0.3,2.7,0.6,4.1,0.9c-0.3-1.2-0.6-2.5-0.9-3.7
+			C1307.8,2.1,1305.3,2.6,1302.8,3.2 M455.2,3.3c-0.6,1.7-1.1,3.4-1.7,5.1c-1-0.4-2.1-0.8-3.1-1.1c-1,0.9-0.9,2.4-1.3,3.6
+			c2-0.2,4.5-0.1,5.9-1.9c1.3-1.7,2.8-3.3,5-3.8C458.3,4.6,456.8,4,455.2,3.3 M490.4,6.3c0.1,2.7-0.4,5.8,1.9,7.8
+			c1.1-3.5,2.2-7.1,2.6-10.8C493.4,4.2,491.9,5.3,490.4,6.3 M503.3,7.3c-1,2.2-4.3,2-5.2,4.2c1.5,0.1,3.7,1,4.7-0.6
+			c1.9-2.7,4.3-5,7.4-6.1c-0.2,1.3-0.5,2.7-0.7,4.1c0.5-0.1,1.6-0.2,2.2-0.3c0.4-1,0.8-2.1,1.2-3.1c-1.6-1-3.1-2-4.8-2.7
+			C505.1,1.9,504.8,5.7,503.3,7.3 M1184.7,5.7c-1.7-0.4-3.3-0.8-5-1.2c0,1.5,0,3.1,0.1,4.6c1.9-0.2,3.9-0.3,5.9-0.7
+			c2.2-0.6,4.9-2.9,3.1-5.3C1186.9,3.1,1185.9,4.7,1184.7,5.7 M1264.1,5.2c0.3,0.5,1.1,1.5,1.4,2c-0.5,2.4-3.2,1.9-4.9,2.9
+			c-0.4,2.2,2.2,1.6,3.6,2.1c-0.3,0.9-0.6,1.8-0.8,2.7c2.5,2.1,5.7,2.1,8.5,0.7c-2-0.9-4-1.9-5.7-3.4c1.4-0.7,2.9-1.4,4.4-2
+			c-0.1-2.3-0.1-4.5-0.1-6.8C1268.3,3.9,1266.2,4.5,1264.1,5.2 M448.3,4.2c-1.8,0.4-1.1,3.2,0.7,2.7C450.8,6.5,450.1,3.5,448.3,4.2
+			 M472.3,4c0,0.8-0.1,2.4-0.1,3.3c1.9,0.3,4,0.4,3.1-2.2C474.5,4.3,473.5,3.9,472.3,4 M628.6,3.9c-0.5,2-0.9,3.9-1.3,5.9
+			c1.2,0.1,2.4,0.2,3.7,0.4C630.4,8,631.4,4.6,628.6,3.9 M1115.2,4.2c-2.2,0.5-1.7,4.9,0.8,4.1C1118.4,8.6,1117.6,2.9,1115.2,4.2
+			 M480,6c1.4,0.6,4.1,3.8,4.9,1C484.9,4.2,481.5,4.1,480,6 M465.2,5.8c-0.6,1-1.6,1.8-1.9,2.9c0.5,1.2,1.2,2.3,1.9,3.4
+			c0.9-0.4,1.8-0.8,2.7-1.2C467,9.2,466.1,7.5,465.2,5.8 M587.1,12.1c0.9,0.3,1.8,0.5,2.7,0.8c0.1-2.2,1.9-5,0-6.8
+			C587.8,7.4,587.8,10,587.1,12.1 M1124.8,5.7c-0.1,1.8-0.3,3.6,0.3,5.3c1.9,0.6,3.1-1.3,3.2-3C1129,5.6,1126.4,5.9,1124.8,5.7
+			 M1226.2,9c0.6,2.5,2.9,4,4.8,5.6c0.8-2.3,2.5-5.1,0.6-7.3C1230.1,5.1,1227,7.1,1226.2,9 M1297.2,8.1c-1.8,1.2-4.1,2.3-4.5,4.8
+			c0.5,0.2,1.6,0.5,2.1,0.7c-1.5,0.2-2.9,0.3-4.3,0.5c1,1.8,2.4,3.3,4,4.6c-0.3,0.7-0.9,2-1.2,2.7c1.2,0.4,2.4,0.8,3.6,1.1
+			c0.1-2.6,0.4-5.2,1.2-7.7l-0.1-0.5c0.3-2.7,1.5-5.2,1.5-8C1298.7,6.8,1297.9,7.5,1297.2,8.1 M1361.4,6c0,1.3,0,2.6,0.2,3.9
+			c1.8,1.7,3.5,3.6,4.2,6.1c0.7-0.5,1.9-0.9,1.8-2C1368.1,10.1,1364.2,7.7,1361.4,6 M600.2,7c-0.5,1.6,0,2.2,1.7,1.6
+			C602.4,7.1,601.8,6.5,600.2,7 M1305.3,7c-0.5,1.4-1,2.8-1.5,4.2c1.5,0,3.1,0,4.6,0C1307.4,9.8,1306.3,8.3,1305.3,7 M469.3,15.7
+			c1.1,0.5,2.2,0.9,3.3,1.4c-0.2,0.8-0.5,1.6-0.7,2.4c1.8,0.1,3.5,0.3,5.3,0.4c-1.5-1.9-3.1-3.6-4.9-5.3c0.3-1.2,0.6-2.4,0.8-3.7
+			c-0.2-1.6-1.9-2.4-3.2-3.1C467.6,9.7,469.8,13.2,469.3,15.7 M476.1,11c0.1,1.4,0.6,2.8,0.9,4.1c2.6-1.4,2.5-4.7,2.8-7.2
+			C478.4,8.6,476.3,9.1,476.1,11 M584.1,8.6c0.1,1.3,0.2,2.6,0.3,3.9c-0.4,1.1-0.9,2.2-1.3,3.4c1.4-0.3,2.8-0.5,4.1-0.8
+			C586.5,12.9,586.9,9.4,584.1,8.6 M619.9,13c1.7,0.3,3.4,0.6,5.2,0.8c-0.5-1.7-1.2-3.3-2-4.9C621,9.5,619.7,10.8,619.9,13
+			 M754.4,9.3c-1.2,1.4,1.3,3.3,2.5,2.2C758.2,10.1,755.7,7.9,754.4,9.3 M1174.2,14.6c1.4,0.5,2.8,1.1,4.3,1.6c0-2.4,0-4.9-0.1-7.3
+			C1176.1,10,1173.9,11.8,1174.2,14.6 M1168.2,10.1c-1.9,1.2-2.2,4-0.2,5.3C1170.4,14.5,1171,10.8,1168.2,10.1 M1341.4,10.4
+			l-0.7,0.4c2,2.8,5.2,4.8,8.4,5.9c1,0.7,2.4-1.4,1.2-2C1347.6,13,1344.9,9.3,1341.4,10.4 M573,11.2c0.4,2.1,1.3,4,2.4,5.9
+			c0.7-1.2,1.7-2.4,1.3-3.9C576.7,11.1,574.3,11.6,573,11.2 M1151.2,11.2c0.1,1.1,0.2,2.2,0.3,3.3c1.5,0.1,3,0.2,4.5,0.4
+			c-0.2-1.1-0.5-2.1-0.8-3.1C1153.9,11.4,1152.6,11.3,1151.2,11.2 M613.2,12.3c-1.8,0.3-1.3,3.4,0.6,2.7
+			C615.4,14.6,614.9,11.8,613.2,12.3 M793.2,12.4c-1.5,1.3,0.8,3.6,2.2,2.1C796.9,13.2,794.5,10.9,793.2,12.4 M1209.8,11.8
+			c1.2,1.5,1.8,4.9,4.2,4.4C1216.3,14.1,1212.2,10.8,1209.8,11.8 M1132.2,13.3c-2,0.5-2.4,5-0.1,4.9
+			C1135.2,19,1134.8,12.8,1132.2,13.3 M1215.3,15.9c1.1,0.8,2.2,1.6,3.2,2.3c-0.2,0.9-0.4,1.9-0.5,2.8c2.1,1,4.3,2,6.5,2.7
+			c-0.1-1.1,0.1-2.5-0.9-3.3c-2.2-2.5-4.1-5.2-5.7-8.1C1217.1,13.5,1216.2,14.7,1215.3,15.9 M967.3,14.2c-3.4,1.1,0.4,6,2.2,2.9
+			C969.2,16.1,969,12.9,967.3,14.2 M1194,15c1.1,2,2.5,3.8,4,5.5c1.7-1.4,2.2-3.8,1.2-5.8C1197.6,13.9,1195.7,14.6,1194,15
+			 M1288.2,14.1c-0.5,1.7,0,2.2,1.6,1.8C1290.3,14.2,1289.8,13.6,1288.2,14.1 M463,15.5c-1.1,3.5,3.4,3.1,5.5,2.7
+			c-0.2-0.8-0.6-2.2-0.8-3C466.2,15.2,464.6,15.2,463,15.5 M479.7,19.5c2.2,0,4.5,0,6.7-0.1c0.1-1,0.2-2,0.3-3.1
+			c-1.4-0.1-2.8-0.2-4.1-0.3C479.5,14.5,478.8,17.2,479.7,19.5 M519.2,16c-0.8,0.6-2.1,3.2-0.2,3C521.9,20.6,521.9,14.8,519.2,16
+			 M739,16c-0.8,2.3-0.3,4.6,0.4,6.8c1.1-0.4,2.3-0.9,3.4-1.3C742.5,19.1,740.8,17.5,739,16 M618,22c0.2-1.8,0.8-4.8-2.1-4.5
+			C613.1,18.9,615.1,23,618,22 M788.1,18.2c-2,0.4-1.3,3.6,0.7,3C790.6,20.9,789.9,17.8,788.1,18.2 M1352.9,17.9
+			c-0.8,2.4,1.9,4.5,4.1,3.2C1357.7,18.8,1354.8,17.2,1352.9,17.9 M461.6,22.7c0.9-0.2,2.6-0.6,3.5-0.8c0.7-2-1.3-3.5-3.1-3.1
+			C459.7,19.4,461.1,21.3,461.6,22.7 M543.1,20.3c1.3,1.5,2.7,2.9,4,4.3c0.8-0.9,2.2-1.8,1.3-3.2C547.4,19.4,544.9,19.3,543.1,20.3
+			 M608.4,19.2c-1.3,1.3,0.8,3.6,2.1,2.2C612.1,20.1,609.7,17.7,608.4,19.2 M1307.3,19.3c-2.2,0.9-0.7,4.2,1.4,3.4
+			C1311.1,22,1308.8,19.5,1307.3,19.3 M434,19.7c-0.2,0.6-0.7,1.7-0.9,2.2c1.9,1,3.7,2.9,6,2.1C440.4,20.8,436,20.6,434,19.7
+			 M590.5,20.9c0.3,1.3,0.7,2.6,1.2,3.8c1.2-0.9,2.5-1.8,3.6-2.8C595.4,19.1,592.1,21.2,590.5,20.9 M1340.6,20.1
+			c-0.7,1.3,0.1,3.4,1.5,3.8C1344.1,23.3,1342.3,19.7,1340.6,20.1 M647,21c-1.4,2.2,5.2,4.5,4.3,1.1C651.5,19.8,648.2,20.8,647,21z"
+			/>
+		<path class="st2" d="M1343.3,0h4.6C1346.9,1.7,1343.9,2.4,1343.3,0z"/>
+		<path class="st2" d="M1382.8,0h6.3c-0.7,0.4-1.9,1.2-2.6,1.6c0.1,4.5,0.4,9-1.1,13.3c-1.5-1.1-2.8-2.3-4.1-3.6
+			c-0.3-0.5-0.8-1.5-1.1-2c1.5-0.8,2.9-1.5,4.5-2.3C1384.1,4.7,1383.5,2.3,1382.8,0z"/>
+		<path class="st2" d="M1392.5,0h4.6c2.1,2.3,2.1,5.4,1.4,8.2c-1.2-0.4-2.3-0.8-3.5-1.2C1394.2,4.7,1393.3,2.4,1392.5,0z"/>
+		<path class="st2" d="M347.5,6.1c0.8,0.8,1.6,1.6,2.5,2.4c0.9-0.8,1.7-1.8,2.8-2.4c2,2,2,4.8,2,7.4c-2.8,0.6-5.6,1.1-8.4,1.5
+			c0.1,0.4,0.4,1.1,0.5,1.5c0.2,0.4,0.5,1.4,0.7,1.8c2.5,0.6,4.9,1.8,6.9,3.4c0-1,0.1-2,0.1-2.9c-1.1-0.7-2.2-1.3-3.3-2
+			c2.4-1.5,5.1-2,7.8-2.5c-0.1,0.3-0.3,0.9-0.4,1.2c-0.6,1.7-1.2,3.4-1.5,5.2c2.2,1.7,4.5,3.1,6.8,4.7c-4,0-8,0-12,0.1
+			c-0.5-0.3-1.4-0.9-1.8-1.2c-0.4,0.3-1.3,0.9-1.8,1.2c-2,0-4-0.1-6-0.1c-0.1,0.3-0.2,0.9-0.3,1.1c-1.7-0.6-3.5-1.2-5.3-1.6
+			c-0.5,0.2-1.5,0.7-2,0.9c-0.8,1.4-1.2,3.6-3.3,3.4c-0.9-0.8-1.9-1.7-2.8-2.5c-0.3,0.6-0.8,1.8-1,2.4c-0.5,0-1.6,0-2.1,0
+			c-0.4-2.3,0.9-6.7-2.6-6.7c-1.3,1.4-1.2,3.4-1.8,5.1c-1.3,0.1-2.6,0.3-4,0.4c-1.2-3.2,3.9-4,4.2-7c0.2-1.2,0.4-2.4,0.6-3.6
+			c-1.2,0.3-2.4,0.6-3.5,0.9c-0.3,1.6-0.7,3.3-1,4.9c-0.4-2.5-0.7-5.1-0.8-7.6c2.7-0.8,5.3-1.8,7.7-3.2c0.9,0.1,1.7,0.1,2.6,0.1
+			c-1.1,0.5-2.2,1.1-3.3,1.6c1.1,2.6,0.7,6.9,4.3,7.3l1.1,0.5c1.3,0.7,2.4,1.9,3.9,1.9c1.3-0.4,2.2-1.5,3.2-2.3
+			c-1.6-0.3-3.2-0.6-4.9-0.9c0.8-2.4,2.4-4.1,4.6-5.4c2.5,1.1,5.1,1.9,7.7,2.6c0-1-0.1-2.1-0.1-3.2c-2.2-1-4.5-2-6.8-2.9
+			c-0.1-0.5-0.4-1.6-0.5-2.2c2.7-0.6,5.4,0.1,7.9,1.1c0.6-0.8,1.1-1.6,1.7-2.3C346.2,7.7,347.1,6.6,347.5,6.1z"/>
+		<path class="st2" d="M1388.9,9.4c0.8-0.6,1.8-1.2,2.7-1.7c1,0.9,2.1,1.9,3.1,2.8c1.9,1.5,3.5,3.4,4.5,5.6
+			c-1.8-0.3-3.6-0.6-5.4-0.9c-0.5,0.7-0.9,1.5-1.3,2.2c-1,0.6-1.9,1.3-2.8,2c-0.2,3.1,2,5.6,3.4,8.1c-0.6,0.3-1.8,1-2.5,1.3
+			c-0.1-0.8-0.4-2.4-0.5-3.2c-0.5,0-1.4,0-1.9,0c-1.4-1.3-2.9-2.6-4.3-3.9c-2,0.1-4.1,0.2-6.1,0.4c0.2-1.2,0.4-2.4,0.7-3.5
+			c2.8,0.4,5.5,0.9,8.3,1.3C1388.2,16.3,1391.9,12.9,1388.9,9.4z"/>
+		<path class="st2" d="M1406.7,11.2c2.9-1.4,6.1-2.1,9.3-1.8c0,0.6,0,1.9,0,2.5c-0.8,0.5-1.7,1-2.5,1.5c-0.2,1.6,0.8,4.2-1.5,4.5
+			C1409.6,16.1,1408.1,13.6,1406.7,11.2z"/>
+		<path class="st2" d="M389.8,14.3c0.7-0.4,1.9-1.2,2.6-1.7c1.7,1.8,3.9,3.4,4.6,5.8l0,1c-1.4-0.6-2.8-1.3-4.2-2.1
+			c-2,1.2-3.8,2.6-5.6,4c-0.2-0.2-0.5-0.5-0.7-0.7C387.6,18.6,388.8,16.5,389.8,14.3z"/>
+		<path class="st2" d="M1393.6,20.9c-1.1-2.2,2-1.2,3.1-1.5c1.3,1.3,2.6,2.6,3.4,4.3c-0.6,0.5-1.9,1.5-2.5,2l-0.6-0.5
+			C1395.6,24.1,1393.5,23.1,1393.6,20.9z"/>
+		<path class="st2" d="M1407.7,22.8c0.5-0.2,1.6-0.5,2.1-0.6l1.3-0.4c1.2,1.7,1.8,3.7,1.2,5.8c-0.3,0.4-0.9,1.3-1.2,1.7
+			c-1.3-0.2-2.6-0.5-3.9-0.7C1407.4,26.6,1407.6,24.7,1407.7,22.8z"/>
+		<path class="st2" d="M1201.1,24.8c3-2.9,7-0.5,10.4,0.3C1208,25.3,1204.5,25.3,1201.1,24.8z"/>
+		<path class="st2" d="M334.3,30c0.6,0,1.8,0.1,2.4,0.1c0.2,1.7,0.4,3.4,0.7,5c1.5,1.3,3,2.5,4.6,3.8c-0.1,1.6-0.2,3.2-0.2,4.7
+			c-0.6,0-1.7,0-2.2-0.1c0.1,0.5,0.2,1,0.4,1.5c0.5-0.4,1.5-1,1.9-1.4c0.1,1.9,0.1,3.8,0.1,5.7c-2-0.7-3.9-1.5-5.8-2.4
+			c-0.3-0.3-0.8-1-1.1-1.3c-1.3-2.2-3.3-3.7-5.8-4.3c0.1,1,0.2,2,0.4,3.1c-1.1-0.4-2.2-0.8-3.3-1.1c0,1.1-0.1,2.2-0.1,3.4
+			c-1.1-0.8-2.2-1.7-3.4-2.4c-1.9,0.2-2.8,1.8-3.6,3.3c4.6,0,7,3.8,8.9,7.4c-1.6,0.2-3.3,0.4-4.9,0.7c-0.8-1.1-0.7-3.4-2.4-3.4
+			c-1.8,0.5-3.1,1.8-4.5,2.8c0.1-6.1,0.1-12.1,0-18.2c1.1,0.2,2.2,0.4,3.3,0.5c1.9-1.2,3.8-3.4,6.4-2.5c0.7,3-2.1,4.5-4.6,4.5
+			c1,1.1,2.1,2.3,3.1,3.4c2.4-2.2,4.7-4.6,7.9-5.6C333.1,34.9,333.7,32.5,334.3,30 M335.9,40c-0.6,1.5,1.2,2.2,1.8,3.2
+			c0.6-1.2,1.2-2.4,1.8-3.7C338.4,39.2,335.7,37.6,335.9,40z"/>
+		<path class="st2" d="M1394.6,29.9c0.7,0,2.1-0.1,2.7-0.2l0.6,0c1.6,1.9,2.8,4.4,5.3,5.1c3.6,1.2,7.3,1.8,11,2.6
+			c0.6-1.5,1.2-3.1,1.8-4.7c0,2.6,0.1,5.2,0,7.8c-2.4,0.2-4.8,0.6-7.2,0.6c-2.9-0.7-5.2-3.8-8.4-2.8c0.8,1.5,1.7,2.9,2.6,4.3
+			c-2.4-0.8-4.8-1.5-7.2-2.1c-1.8-0.1-3.5-0.1-5.2-0.1c0-2.2-0.1-4.5-0.1-6.7c1.4,0,2.7-0.1,4.1-0.1
+			C1394.6,32.4,1394.6,31.1,1394.6,29.9 M1396.5,35.9c0.3,1.5,2.1,1.6,3.2,2.2c0.4-1.4,0.5-2.8,0.3-4.2
+			C1398.5,32.9,1397.1,34.7,1396.5,35.9z"/>
+		<path class="st2" d="M1404.6,44.1c2.7-0.1,5.4-0.3,8.2-0.6c0.1,0.6,0.4,1.8,0.6,2.4c0.6,0.1,1.9,0.3,2.6,0.4c0,1.4,0,2.8,0.1,4.2
+			c-1.2-0.5-2.4-0.9-3.6-1.4c0.2,0.5,0.6,1.4,0.8,1.9c-0.2,0.6-0.5,1.7-0.7,2.3c-1,0-2.8,0.1-3.8,0.1c-2.4,0.7-4.7,1.6-7,2.5
+			c0.1-0.8,0.3-2.3,0.4-3c-0.3,1.2-0.5,2.5-0.7,3.7c0.9,0.7,1.9,1.4,2.9,2.1c1.7-1.1,3.4-2.1,5-3.2c0.8,1,1.9,2,2.4,3.3
+			c-0.7,0.6-1.5,1.2-2.2,1.8c2.2,0.4,4.4,1.2,6.4,2.2c0,0.9,0,2.6,0,3.4c-2.3-1.5-4.9-2.1-7.5-2.4c-0.2,1.6-0.5,3.2-0.7,4.7
+			c-3.1-0.2-3.8-3-4.5-5.6c-3.5,0.4-0.8,3.6-0.1,5.4c-2.8,1.8-6.8,2.8-7.5,6.4c3.5,0.8,7.1,0.3,10.6-0.2c0.2,1.4,0.5,2.7,0.5,4.1
+			c-0.9,0.7-1.8,1.3-2.8,2c-1.7-1-3.5-2.3-5.6-2.3c-3,1.4-3.4,4.9-4.5,7.7c-2.2,2.8-0.6,6.7-2.8,9.3c-0.5-3.9-0.5-7.8-0.5-11.7
+			c0-2.5,0-5-0.1-7.5c1.4,0.3,2.8,0.5,4.3,0.8c-0.5-3.7-1.1-7.3-1.8-10.9c-0.6,0.2-1.9,0.6-2.5,0.8c0-5.2,0-10.5,0.1-15.7
+			c0.5-0.4,1.5-1.4,2-1.8c1.6,0.7,3.2,1.5,4.9,2.2c-1.5,1.8-3.1,3.5-4.6,5.3c0.3,0.6,0.9,1.8,1.2,2.5c1.5-0.5,3.1-0.9,4.7-1.4
+			c-0.5-1.1-1-2.2-1.5-3.3c1.1-0.5,2.2-1,3.4-1.5c-2-1.9-4.3-3.6-6.1-5.7c-0.1-1.3,0-2.6,0.1-3.8c3.8,0.5,6.5,3.1,8.6,6
+			C1403.7,47.8,1404.1,46,1404.6,44.1 M1404.8,50c2.3,1.2,4.7-0.2,6.6-1.6c0.8-1-0.3-2.3-0.3-3.4C1408.8,46.3,1406.6,47.9,1404.8,50
+			 M1396,61.6c-1.1,1.8-1.5,4,1,4.8C1399.8,65.2,1397.5,62.8,1396,61.6z"/>
+		<path class="st2" d="M329.1,49.2c0.7,0,2-0.1,2.7-0.1c1.2,0.4,3.1,0.2,3.2,1.9c-0.6,2.2-2.8,3.3-4.5,4.5
+			C330,53.4,329.6,51.3,329.1,49.2z"/>
+		<path class="st2" d="M331.6,59.6c2-2.2,3.4-4.8,5.1-7.2c0.4,0.6,1.2,1.9,1.6,2.6c-4.2,5.7-11.1,10.9-9.9,18.9
+			c1.5,0.8,2.9,1.5,4.4,2.3c-0.1-3-0.5-6-2-8.6c1.5-1.1,2.7-4.4,4.9-3.2c0.1,0.7,0.3,2.1,0.4,2.8c-0.7,1.5-0.6,3.9,1.7,3.3
+			c1.3-1.5,2.4-3.3,3.5-4.9l0.7,0.3c0,2,0,4.1,0,6.1c-3.9,0.9-6.1,4.2-8.2,7.3c-1-0.5-2.1-0.9-3.1-1.4c-1.5,0.2-3.6,2.1-4.6,0.1
+			c-0.6-2.1,0-4.4,0-6.6c-2.8,0-3.8,2.3-4.7,4.6c1.1,0.5,2.1,0.9,3.2,1.4c-0.5,1.3-1,2.6-1.5,3.9c-1,0.5-2.1,1.1-3.1,1.7
+			c-1.1,1.5-2.3,2.9-3.5,4.2c0-4.2,0-8.4,0-12.6c0.6-0.4,1.7-1.2,2.3-1.6c-0.3-1.5-0.5-3.1-0.8-4.6c1.3,0.3,2.5,0.7,3.8,1
+			c1.4-1.2,2.8-2.4,4.2-3.7c2.4-1.3,1.4-4,1.2-6.2C328.7,59.4,330.2,59.7,331.6,59.6z"/>
+		<path class="st2" d="M335.6,62.5c2-3.6,2.8-8.1,6.3-10.6c0,3.5,0.1,6.9,0.1,10.4c-1.9,0.4-3.9,1.1-5.8,0.6L335.6,62.5z"/>
+		<path class="st2" d="M318.1,57.2c1.2,0.2,2.5,0.5,3.8,0.8c-0.2,0.4-0.6,1.1-0.9,1.4c-0.3,0.4-0.8,1.3-1.1,1.7
+			c-1.1,0.4-2.3,0.8-3.4,1.1c0-1.5,0-2.9,0-4.4C316.9,57.7,317.7,57.4,318.1,57.2z"/>
+		<path class="st2" d="M1408.6,70.5c0.8-0.9,1.6-1.7,2.5-2.6c1.6-0.1,3.3-0.2,4.9-0.2c0,5.5,0,11-0.1,16.5c-3,0.8-4,3.5-4.7,6.2
+			c-0.7,0.4-1.3,0.8-1.9,1.2c0.6,0.1,1.8,0.4,2.3,0.5c1.4,1.2,2.9,2.3,4.4,3.5c0,2.6,0,5.1,0.1,7.7c-0.6-0.1-1.9-0.4-2.6-0.5
+			c-0.9-2.4-1.2-5.2-2.9-7.2c-1.2-0.8-4.6-1.9-4.4,0.5c-0.3,2.8,3.2,2.8,5.1,3.6c0.1,1.8,0.9,3.8-0.2,5.5c-2-0.9-2.8-3.4-4.9-4.2
+			c-0.5,1.8,0.8,3.2,1.6,4.7c-1.8,1.8-3.6,3.6-5.4,5.4c0.2,0.7,0.3,1.3,0.5,2c0.1,1.2-2.6,4.3,0,4.2c2.7,0.5,5.5,0.9,8.3,1.2
+			c-1.8-1.8-3.7-3.4-5.8-4.8c0.5-1.6,1-3.3,1.7-4.9c2.4,0,3.9,2.1,5.8,3.3c1-1.4,2-2.7,3.1-4.1c0,9.8,0.1,19.6,0,29.4
+			c-1.2-0.5-2.4-1-3.5-1.5c1.1-1.5,2.3-3,3-4.8c-0.4-3.6-4.9-2.2-7.3-1.6c0.5,1.1,1,2.3,1.5,3.4c-1-0.1-2-0.2-3-0.4
+			c-0.6-1.6-1.2-3.1-1.8-4.7c-1.7,1.3-3.4,2.6-4.7,4.3c-0.2,2.2,1.5,3.8,2.7,5.4c-2.9-0.7-7.2,0.2-8-3.6c-1.3-2.2,0.7-4.2,1.8-6
+			c-1.9,0.1-3.8,0.2-5.7,0.4c0-8.7-0.5-17.3,0-26c1.2,1.5,2.5,2.9,4.1,4.1l0.3,0.2c-0.3,0.7-0.6,1.3-0.8,2c-0.1,1.8-0.1,3.5-0.1,5.3
+			c0.1,0,0.4-0.1,0.5-0.1c0.6-2.6,2.3-4.5,4.6-5.7c-0.4-0.7-0.8-1.4-1.2-2.1c-0.1-0.3-0.2-0.9-0.2-1.2c1.7-0.6,5.2-1.2,4.2-3.8
+			c-2.3-1-4.7-1.8-6.6-3.4c2.3-0.1,4.7-0.1,7-0.2c-0.4-2.1-0.7-4.2-1.1-6.3c0.5,0.2,1.6,0.7,2.1,0.9c0.4,0.2,1.1,0.5,1.5,0.6
+			c0.7-1.3,1.4-2.7,2.2-4c1.4-0.7,2.8-1.3,4.2-2c-1.5-1.5-3.3-1.5-5-0.4c-0.9-0.9-1.8-1.9-2.7-2.8c0.4-0.4,1.3-1.1,1.8-1.5
+			c1.7-0.6,3.4-1.1,5.1-1.6c-0.5-1.1-1.1-2.1-1.6-3.1c0.7-1.2,1.4-2.3,2.2-3.5c-0.6-0.1-1.8-0.3-2.4-0.5c-2.4-0.8-5.5-0.7-6.8-3.3
+			C1404.6,70,1406.6,70.3,1408.6,70.5 M1409.2,112.6c-1,1.3,1.2,3.3,2.5,2.2C1412.7,113.4,1410.4,111.6,1409.2,112.6 M1393.7,120.3
+			c1.2,1.6,2.8,2.7,4.4,3.8c0.1,0.7,0.3,2.1,0.4,2.8c0.1-1,0.2-2,0.4-3c1.3-0.1,2.7-0.2,4-0.3c0.9-0.4,1.8-1.2,2.9-1.2
+			c1.1,0.4,1.7,1.5,2.6,2.3c1.4,0,2.8,0,4.3-0.1c0.8-1,1.5-2.1,2.2-3.1c-5,0.7-10.1-0.2-15,1
+			C1398.3,120.6,1396.1,119.9,1393.7,120.3z"/>
+		<path class="st2" d="M600,76.7c23.8,0,47.6,0,71.5,0c-0.4,1.9-0.1,4-1.2,5.7c-2.1,1.8-4.7,3-7.1,4.4c-1.8-0.5-3.5-1-5.3-1.2
+			c-1.3,1.3-2.3,2.7-3.4,4.2c-2.7,0.1-5.5,0.4-8.2-0.3c-3.2-1.4-5.2-4.4-8.4-5.7c-2.1-0.3-5.8,1-4.4,3.7c1,4,5.8,3.4,9,4
+			c1,1.3,2.1,2.7,3.1,4c1.7-0.4,3.4-0.8,5.2-1.3c1.2,2.4,3,5.1,2.1,7.9c-0.9,2.5-3.6,0.5-5.4,0.3c1.5-1.6,1.5-3.7,1.3-5.8
+			c-4.3,2.7-8.6,5.5-12.5,8.9c0.6,4.4,2.7,8.5,3.8,12.8c-3.7-2.6-7.3-5.3-11-7.8c-3.6,2.8-7.2,5.5-10.9,7.9
+			c1.3-4.3,2.8-8.5,4.2-12.6c-4.1-3.4-8.4-6.5-12.9-9.3c0,0.9,0.1,2.7,0.1,3.6c2.5,3.7,7.2,4.9,10,8.2c-0.4,3.3-1.9,6.2-3.1,9.3
+			c-1.6,0.4-3.2,0.9-4.7,1.2c-3.9,0.1-7.9,0-11.8,0C600,104.8,600,90.7,600,76.7 M618.3,81.5c-1,1-0.9,3.3,0.7,3.6
+			C621,84.9,620.2,80.7,618.3,81.5 M626.7,85.9c-1.4,3.9-1.9,8.2-4.4,11.7c-1.1-0.7-1.7-2.5-3.2-2.4c-1.7,0.5-3.2,1.7-4.7,2.5
+			c3.5-0.1,7.1-0.1,10.6,0c1.7-3.9,3.2-7.8,4.6-11.8c1.2,3.7,2,7.5,3.7,11c0.5,0.2,1.6,0.6,2.2,0.8c-1.2-4.6-2.7-9-3.7-13.7
+			C629.9,84.3,627.2,83.6,626.7,85.9 M603.3,99c-1.8,0.5-1.1,3.4,0.8,2.9C606,101.6,605.2,98.2,603.3,99z"/>
+		<path class="st2" d="M674.4,76.6c2.4,0,4.8,0,7.2,0c0.1,0.6,0.2,1.7,0.2,2.2c0.2-0.7,0.3-1.5,0.5-2.2c7.5,0.1,15-0.1,22.4,0.1
+			c1.8,1.1,3.4,2.5,5,3.9c-2.1,1.8-4,3.7-5.9,5.7c-2-0.4-4-0.8-6-1.2c0.5,1.8,0.9,3.5,1.4,5.3c-1.4,0.8-2.8,1.6-4.2,2.4
+			c0.3,1.9,0.9,3.6,1.9,5.3c3.9-3.9,9.9-6,11.9-11.6c1.1-3.3,3.8-6.2,3.2-9.8c8.9,0.1,17.7,0,26.6,0.1c-1.1,3.4-1.2,7.4-3.6,10.2
+			c-1.2,0.1-2.5,0-3.7-0.1c1.3-1.8,2.6-3.5,3.7-5.4c-4.1,0.6-8.2,1.1-12.3,1.2c1.4,2.9,3.5,5.3,6,7.4c-0.1,0.5-0.4,1.5-0.5,2
+			c-2.5-1.2-4.7-5.3-7.6-3.9c-0.3,2,0.9,3.5,2.2,4.9c0.2,1.6,0.4,3.2,0.6,4.9c2.2,0,4.5,0.1,6.8,0.1l1,0.5c-0.7,2.7-2.1,5-5,5.6
+			c0.5,1.5,1,3,1.4,4.5c0.2,1.3,0.3,2.7,0.5,4c0.2,1.9,0.4,3.9,0.7,5.8c-12,0.6-24.1-0.5-36.1,0.5c-16.9,0-33.8,0-50.7,0.1
+			c-1.1-3.6-2.2-7.2-3.2-10.8c1.4-1.1,2.8-2.2,4.3-3.3c0.7,0,2,0,2.7,0c2.2,1.9,4.7,3.6,6.7,5.8c0.1,2.3-1,4.4-1.6,6.5
+			c2.2,0.8,4.6,1.7,6.9,0.8c2.6-2.3,2.4-6.1,2.8-9.2c2.5-1,5.7-1.3,7.2-3.8c0.6-2.4-0.3-4.9-0.5-7.3c3,0,6,0,9,0.1
+			c-0.4-3.7-1.4-7.2-1.7-10.9C674.8,83.3,675.7,79.9,674.4,76.6 M684.9,102c1.4,3.1,3.1,6.2,2.9,9.7c-3.3,0-6.6-0.8-9.9-1.1
+			c-2.7,1,0.4,3.6,1.1,5.1c1.7,3.2,5.8,2.4,8.8,2.5c2.9,0.4,4.7-2,6.5-3.8c3.5,0,8.4,0.7,9.9-3.5c1-2.2-2-2.1-3.2-2.6
+			c-3.4-0.5-3.5-4.9-6.2-6.3c-2.7-1.7-5.3-3.3-8-4.9C685.9,98.6,683.7,100,684.9,102 M710,105.1c-0.4,3.8,3.8,4.6,6.7,4.5
+			c1.6-0.7,1.9-2.8,0.6-3.9C715.1,104.2,712.3,104.9,710,105.1z"/>
+		<path class="st2" d="M739.7,76.9c0.6,0,1.9,0.1,2.5,0.1c1.2,3.4,1.8,7,3.5,10.2c-0.5-3.5-1.7-6.9-2.7-10.3c15-0.7,30-0.1,45-0.3
+			c20.2,0,40.4-0.1,60.5,0.1c1.6,3.4,3.7,6.6,6.7,9c1.2-0.3,2.2-0.9,3.4-1.3c-0.8-1.5-1.6-3-2.4-4.5c0.2-1.1,0.4-2.1,0.6-3.2
+			c3.6,0,7.2-0.1,10.9,0.1c-0.9,3.1-3.3,5.2-5.7,7.1c0.2,0.6,0.5,1.8,0.6,2.3c0.1,3.9-1.6,7.6-2.4,11.4c3.7,2.3,7.8,3.6,11.9,4.8
+			c0.8-1.7,1.8-3.3,2.3-5.2c-0.5-2.5-1.7-4.9-2.6-7.2c1.8-2.3,5.7-4.5,4.2-7.9c-2.7,0.4-4.9,2.2-7.2,3.6c0.5-3.5,2.2-6.6,4.5-9.2
+			l0.3,0.4c1.7,1.9,3.3,3.9,4.7,6c1.5-0.3,3.1-0.6,4.6-0.9c-0.3-1.8-0.5-3.5-0.8-5.3c5.1,0.1,10.3,0.1,15.4,0.1
+			c1.2,1.9,2.6,3.6,4,5.3c1.1-1.8,2.2-3.5,3.3-5.3c1.7,0,3.5,0,5.2,0c0.1,2.6,0.3,5.3,0.4,7.9c2.2,0,4.3,0.1,6.5,0.1
+			c0.5-2.2,1-4.3,1.6-6.5c4,2.1,7.5,4.8,11.7,6.5c3.2,1.2,3.7,5.1,5.3,7.7c0.7-1.3,1.5-2.5,2.2-3.8c0.8-1.2,1.6-2.3,2.4-3.5
+			c2.2,0.4,4.4,0.8,6.6,1.2c-0.4,2.1-0.8,4.2-1.1,6.3c-1.4,0.3-2.8,0.6-4.2,0.9c-1.7,3.3-3.4,6.5-5.1,9.8c2.9,1.3,6,2.4,9.1,3.3
+			c1.6,2.3,3.3,4.6,5.2,6.6c2.5,1.8,5.5,2.7,8.3,3.9c-2.2,0.9-4.5,1.5-6.9,1.3c-10.8-0.3-21.7,0.2-32.5-0.2
+			c-0.1-0.8-0.2-1.7-0.3-2.5c-1.4-0.5-2.8-0.9-4.3-1.3c-0.3,1.3-0.5,2.7-0.9,4c-11.8,0.1-23.7,0.1-35.5,0.1
+			c-1.5-3.4-2.5-6.9-3.5-10.5c1.1-0.7,2.2-1.4,3.4-2.1c3.2,1.3,6.7,2.6,10.2,1.8c1.6-1.1,0.8-3.4,1.2-5.1c-1.4-0.2-2.8-0.4-4.2-0.6
+			c0.2-2,0.4-4.1,0.6-6.1c-0.6,0.4-1.1,0.7-1.7,1.1c-3.8,2.9-7.6,5.8-11.6,8.5c1.3,4.4,3,8.8,4,13.3c-1.3-1.1-2.7-2.3-4-3.4
+			c-1.8-3.1-2.6-6.8-5.1-9.5c-3.4,1-6.7,3.5-6.1,7.4c-2.4,1.8-4.8,3.7-7.3,5.5c1.2-4.4,2.8-8.6,4.2-13c-2.4-1.8-4.7-3.6-7.1-5.3
+			c0.3-1.9,2.1-4.5-0.1-5.8c-3.2-1.6-7.1-1-10.2-2.8c-2.6-2-2.7-7-6.5-7.4c-3.2,1.1-6,3.2-9,4.6c-0.2,0.5-0.5,1.4-0.6,1.9
+			c3.5,1.2,7.1,0.6,10.2-1.4c1,1.4,2.3,2.7,2.2,4.6c-2,2.2-5,0.3-7.5,1c-3,0.7-6.7,1.7-7.8,4.9c0.7,3.9,5.2,5.1,8.1,7.2
+			c-0.8,3.3-3.7,4.7-6.5,5.9c-0.9,1.8-1.3,3.8-1.8,5.8c-11.2-0.1-22.3,0.2-33.5-0.2c-3.3-1.1-6.8-1.2-10.3-0.9
+			c0.4-0.3,1.2-0.9,1.6-1.2c-3.2-3.3-5-8-9-10.4c-1.7-1.2-3.6-2.4-4.6-4.3c-1.8-3.9-6.6-5.3-10.5-5.3c-0.2,1.5-0.2,3-0.2,4.5
+			c4.5,0.7,10.1,2.4,11.3,7.4c0.8,1.5-0.1,3.3-1.7,3.7c-2.9,1-4.9-1.8-7.2-2.8c-1.2,0-2.4,0.2-3.6,0.4c-1.3-3.7-2.7-7.4-4-11.2
+			c3.3-2.7,7.1-4.7,10.2-7.6c0-1.4-0.1-2.8-0.2-4.2c-2.6,1.8-5,3.7-7.5,5.5c-2.2-1-4.4-2.2-6.8-2.9c-1.6,0.5-2.1,2.3-3,3.5
+			c1.6,0.8,3.2,1.7,4.9,2.5c0.5,1.9,1.1,3.7,1.6,5.6c-0.3,0.6-1,1.9-1.3,2.6c-4.8-3.3-8-9.6-14.6-9.6c-0.1-1.9-0.2-3.7-0.2-5.5
+			c1-0.3,2-0.7,3-1l0.3-0.6C737.8,83.5,738.3,80.1,739.7,76.9 M817.1,78c0.7,3.6,3.6,6.2,4.4,9.7c0.7,0,2,0.1,2.6,0.1
+			C823.6,83.6,821.2,79.5,817.1,78 M812,88c0.5,2.7,0.1,5.5,0.7,8.2c3.3,1,6.3-2.5,9.9-1.9c-0.1-1.3-0.3-2.6-0.4-4
+			c-1.7,0.4-3.4,1.3-5.2,1c-3.6-1.6-1.4-6.5-4-9C812,84.1,811.5,86.1,812,88 M803.8,88.7c-0.8,2-0.3,4.2-0.3,6.3
+			c2.7-1.4,5.4-3.5,5.5-6.8C807.2,88.3,805.4,88.2,803.8,88.7 M919.5,92.6c-0.7,0.6-1.5,1.1-2.2,1.7c0,1.2,0,2.4,0,3.6
+			c2.2-0.7,4.5-1.3,6.8-1.7c-1.2-0.8-2.4-1.5-3.6-2.2c0.8-0.7,1.6-1.4,2.3-2.1c0.5-1.7-0.2-2.3-1.9-1.9
+			C920.5,90.8,920,91.7,919.5,92.6 M877.1,91c-0.7,1.6-0.9,3.6,0.9,4.5c0.9-0.9,1.7-1.8,2.5-2.7C879.5,92.1,878.5,90.9,877.1,91
+			 M792.5,96.7c1,2.9,1,6.3,3.1,8.8c3.6-3.2,9.3-0.4,12.2-4.5c-2.7-3.1-7.2-2.8-10-5.7C795.9,93.5,793.8,95.3,792.5,96.7
+			 M925.9,104.2c-4.8-2.4-10.6,1.1-11,6.4c1.8-1.1,3.7-2.7,6-1.9c1.8,0.1,4.1,1.6,5.5-0.2c2.1-2.4,5.1-3.4,8.1-4.1
+			c0-0.5,0-1.6,0-2.1C931.6,102.1,928.3,102,925.9,104.2 M899.2,107.9c2.4,1.7,4.7,3.6,6.8,5.6c1.1-1.2,2.3-2.3,3.5-3.5
+			c-2.1-2.3-4.6-4.1-7.6-5.1C900.3,105.1,899.9,106.8,899.2,107.9 M800.4,109.5c-2.1,0.8-3.6,2.5-5.3,3.9c-0.1,2.3,1,3.6,3.4,3.5
+			c0.8-1,1.6-2.1,2.4-3.1c2.3,0.7,4.7,1.3,6.9,0.2c-0.4-1.2-0.8-2.4-1.2-3.6C804.6,109.9,802.5,109,800.4,109.5 M932.6,114
+			c-0.1,2.4,4,3.7,4.7,1.1c1.2-2.3-0.8-4.3-2.3-5.8C933.9,110.6,931.8,111.8,932.6,114z"/>
+		<path class="st2" d="M924.5,76.7c2.4,0,4.9-0.1,7.3-0.1c1.6,1.9,3.2,3.9,4.7,5.9C931.9,82.5,927,80.9,924.5,76.7z"/>
+		<path class="st2" d="M953,76.6c3.6,0.1,7.3-0.1,10.9,0.1c5.7,2.3,6,8.8,8.4,13.6c2.9,3.4,7.2,5.4,10.6,8.4
+			c-1.7,4.6-3.7,9.2-3.7,14.2c1.3-0.3,2.7-0.7,4-1.1c3.8,0,6.5,3,9.7,4.5c1.7-2.3,3.3-4.6,5-6.9c2,1.7,4.4,3.1,7.1,2.9
+			c-0.6-3.5-1.6-6.9-2.8-10.3c1.7-0.6,3.4-1.4,5.2-1.6c2.4,1.3,3.3,5,6.2,5.2c3.4-3.6,6.1-7.9,10.1-10.9c1.2,0.3,2.5,0.5,3.7,0.8
+			c0.2-0.5,0.6-1.6,0.8-2.1c0.9-0.8,1.8-1.6,2.6-2.6c1.2-2,0.8-5,3.1-6.3c3.9,0.6,6.1,4.2,8.6,6.8c1.5-1.8,3.1-3.5,4.7-5.2
+			c0.8,2.5,1.2,5,1.4,7.6c1,1,2,1.9,3,2.9c-2.4,0.7-4-1.3-5.8-2.5c-0.5,1.3-2.3,2.7-1.2,4.2c2.1,4.5,6.6,7.1,10.9,9.3
+			c1.3-1.6,2.7-3.2,4.1-4.8c0.3,0.7,0.8,2,1.1,2.7c1.7,0.5,3.4,1,5.1,1.5c-0.9,0.8-1.8,1.5-2.6,2.3c-1-0.7-2-1.4-3-2.1
+			c-1,3.8,0.7,7.4,1.1,11.1c-2.5,0.1-5.1,0.1-7.6,0.2c0.6-0.8,1.3-1.7,1.9-2.5c0-0.7,0.1-2.1,0.1-2.8c-1.5,1.8-2.6,4.2-4.7,5.3
+			c-4.7,1-7.4-5.7-12.1-4.3c-4.7,0.6-8.1,4.7-12.9,4.4c-3.2,0-6.4-0.3-9.6-0.5c0.8-2.7,2.7-5.7,1.5-8.5c-0.9-0.7-1.8-1.3-2.7-1.9
+			c-0.6,0.3-1.9,0.9-2.5,1.2c-0.1,1.7-0.1,3.3-0.2,4.9c-1.9,0.3-3.7,0.7-5.5,1c-1.1,1.3-1.8,3.4-3.8,3.5c-5.9,0.7-12.1,0.8-17.8-1.1
+			c-3.4-1.4-6.6,3.1-10,0.9c-0.8-2.8-1.4-5.6-3-8.1c1.3-0.1,2.6-0.2,4-0.2c1.4-3.7-1.5-6.7-3.7-9.4c-1.5,2.1-3.3,4.1-6.2,3.7
+			c-0.2,1.5-0.4,3-0.6,4.5c-3.9-0.1-7.9-2.4-8.9-6.4c-1-2.3,1.2-4.3,3.1-5.1c2.2,0,4.3,0.5,6.5,0.5c1.8-0.7,3.3-2,4.9-3.1
+			c-0.2-0.8-0.6-2.5-0.8-3.4c-2,0.1-3.5,1.4-4.7,2.9c-2.8-1.3-6.6-4-9.3-1.1c-2.8,1.8-2,5.2-2.3,7.9c-3.6,1.2-3.6-3.8-4.9-6
+			c1.3-1.1,2.7-2,3.8-3.3c0.5-1.5,0.6-3.1,0.8-4.7c-1.7-0.3-3.4-0.6-5-1C948.8,82.1,951.3,79.4,953,76.6 M959.1,80.2
+			c-0.6,2-1.2,4-1.8,6c2.6,0.8,6.6,1.4,7.5-2.1C964,81.8,960.9,81.3,959.1,80.2 M1031,98.5c0.1,2.1-0.2,4.6,1.9,5.9
+			c0.3-1.5,1.8-3.3,0.5-4.7C1032.8,99.4,1031.6,98.8,1031,98.5 M1023.4,103.2c-2.7,2.5,3.8,4.8,4,1.7
+			C1027.4,103,1024.7,103.4,1023.4,103.2 M1017.1,104.1c0.3,1.4,0.6,2.8,0.9,4.2c0.7-0.2,2-0.5,2.7-0.7
+			C1021.7,105.1,1019.3,104.1,1017.1,104.1 M1050.5,108.9c-2.1,1.3-3.2,3.4-3.4,5.8c1.5-0.3,3.5,0.4,4.6-1
+			C1051.9,112,1051.4,110.4,1050.5,108.9z"/>
+		<path class="st2" d="M972.7,76.7c3,0,6.1,0,9.1,0c-0.9,1.4-1.2,3.5-3.1,4c-2.1,0.8-4.3,0.1-6.4,0C972.5,79.3,972.5,78,972.7,76.7z
+			"/>
+		<path class="st2" d="M990.8,77c0.6,0,1.8,0,2.4,0c0.8,3,2.5,6.1,2.4,9.2c-1.8,3.5-5.6,2-8.3,0.9C988.6,83.8,989.3,80.3,990.8,77z"
+			/>
+		<path class="st2" d="M994,76.9c3.1-0.3,6.2-0.3,9.3-0.2c-2.1,0.8-4,1.9-6,2.9c2,2.1,3.9,4.3,4.8,7.1c-1.8-0.1-3.5-0.3-5.2-0.7
+			C995.5,83.2,994.8,80,994,76.9z"/>
+		<path class="st2" d="M1008.3,76.6c2.6,0.1,5.2,0.1,7.8,0.1c-1.7,0.9-3.4,1.8-4.6,3.2c-0.1,1.9,0.7,3.6,1.2,5.3
+			c3.4-1.8,4.7-5.4,6.4-8.6c0.5,0,1.4,0,1.9,0.1c1,2.5,1.6,5.2,2.3,7.8c-1.4,0.6-2.9,1.1-4.2,1.8c-0.4,2.7,1.2,5.2,1.9,7.8
+			c-2.6-2.7-5.6-5.1-9.2-6.2c-0.4-0.2-1.1-0.5-1.5-0.7c-1-0.9-2-1.7-2.8-2.8C1007.3,81.8,1008,79.2,1008.3,76.6z"/>
+		<path class="st2" d="M1078.8,76.7c2.4,0,4.8,0,7.2,0c0.6,1.1,1.2,2.1,1.9,3.2c-1.1,0.2-2.2,0.5-3.3,0.8c-0.6,1.9,0.2,4.9-2.1,5.8
+			c-1.8,1.2-3.8-0.7-4.7-2.2C1077.4,81.7,1078.3,79.2,1078.8,76.7z"/>
+		<path class="st2" d="M1106.4,76.7c5.3,0,10.6,0,15.9,0c-0.8,2.2-1.5,4.4-2.3,6.6c-4.2-0.3-6.7,3.6-9.7,5.8
+			c0.4,0.4,1.3,1.1,1.7,1.5c-1.3,1-2.6,2-3.8,2.9c-0.5-1.5-1.1-3-1.5-4.6c-0.1-3.1,2.4-5.2,3.2-8
+			C1109.3,79.2,1107.5,78.1,1106.4,76.7z"/>
+		<path class="st2" d="M324.5,83.4c0.7-1.4,1.4-2.9,2.1-4.3c2.3,1.8,4.5,3.8,6.2,6.2c-4.3,1.3-8.5,3-11.9,6c1.6,0.6,3.3,1.6,5.1,1
+			c2.2-0.4,2.9-3.3,4.9-4c2-0.4,3.3,1.2,4.3,2.6c-0.8,1.3-1.5,2.7-1.8,4.2c-2.6,0.8-5.2,1.6-7.8,2.2c-0.2,1.1-0.5,2.1-0.7,3.2
+			c-1.4,0.7-2.8,1.3-4,2.3c-0.8,1.2-0.4,2.8-0.4,4.1c0.3,0.8,1,2.3,1.3,3c2.5-0.8,4.1-2.7,5.5-4.7c-0.6-1.2-1.2-2.4-1.7-3.7
+			c0.3-0.3,0.9-0.9,1.2-1.2c1,0.6,2,1.2,3,1.9c2.9,3,5.3-1.8,7.4-3.4c0.1-0.3,0.4-0.8,0.6-1c0.6-2,1.1-4,1.7-6
+			c-0.6-0.1-1.7-0.3-2.3-0.5c0.1-1,0.2-1.9,0.3-2.9c1.8-1.2,3.4-2.6,4.4-4.6c0,5.2-0.3,10.5-0.2,15.7c-1.9,2.5-3.4,5.4-5.9,7.4
+			c-0.7,0.3-1.3,0.7-2,1.1c-1.2,0.8-2.5,1.6-3.7,2.4c-1.1,1-2.2,2-3.2,3c0.6,1.3,1.3,2.5,1.9,3.8c-2.4,0.4-4.7,0.9-7,1.6
+			c-1.9,0.1-3.7,0.1-5.6,0.2c0-1.8,0.1-3.7,0.1-5.5c1-1.3,1.9-2.6,2.7-4c-0.8-0.7-1.6-1.4-2.4-2.1c0.1-2.4,0.1-4.8,0-7.3
+			c1.4,0.1,2.7,0.2,4.1,0.3c-1.5-1.3-2.9-2.6-4.4-3.8c0-2.2,0-4.4,0-6.7c2.9-1.3,5.3-3.5,7.6-5.7C324.2,84,324.4,83.6,324.5,83.4z"
+			/>
+		<path class="st2" d="M1122.4,87.4c1.8-3.4,5.3-5.4,9-6c0,12.5,0.1,25,0,37.5c-5.1,0-10.2,0-15.2-0.1c-1.1-3.6-2.1-7.1-3.2-10.7
+			c3.3-2.5,6.8-4.9,10.3-7.2c-0.2-1.4-0.3-2.8-0.4-4.2c-4.5,2.6-8.9,5.3-12.6,9c1.5,4.2,2.9,8.3,4.1,12.6c-3.7-2.5-7.2-5.1-10.6-7.8
+			c-4.1,2.4-7.5,5.9-11.9,7.7c0.9-2.3,1.8-4.6,2.8-6.9c2.3-2.2,3-5.2,3.3-8.3c2.3-1.8,5.1-3,7.6-4.5c0.2,0.6,0.6,1.9,0.8,2.5
+			c0.3-0.9,0.6-1.9,0.9-2.8c1.6-0.2,3.2-0.3,4.9-0.5c1.8-3.5,5.7-3.8,9.2-4.3C1121.6,91.3,1121.8,89.3,1122.4,87.4z"/>
+		<path class="st2" d="M1398.6,83.4c1.3,0.9,3.6,1.4,3.5,3.4c-0.6,2.3-1.7,4.5-2.7,6.6c-0.6,0.4-1.7,1.1-2.3,1.5
+			c-0.3-0.8-1-2.4-1.3-3.2C1396.6,89,1397.7,86.2,1398.6,83.4z"/>
+		<path class="st2" d="M1073.1,90.7c0.9,0.8,1.8,1.7,2.6,2.6c3.9,3.7,1.9,9.8,4,14.3c1.6,1.7,3.9,2.4,5.5,4.1c1,1.9,1.7,3.9,2.5,5.9
+			l0.3,1.2c-7.2-0.9-14.5-0.1-21.8-0.4c0.9-2.8,1.4-5.7,2.6-8.4c1.2-1.2,3.1-1.3,4.6-2c-0.9-2.2-2-4.4-2.3-6.8
+			C1070.8,97.5,1072,94,1073.1,90.7 M1073.6,102.3c0.7,1.9,1.9,5.3,4.5,3.6c1-1.8-1.8-2.6-2.7-3.7c-0.5-2.6,1.6-6.7-1.7-7.8
+			C1073.3,97,1073.1,99.8,1073.6,102.3 M1072.9,113.1c2.6,0.5,5.1-1.2,7.7-1.5c-0.8-0.8-1.7-1.5-2.5-2.3
+			C1076.1,110.1,1071.5,109.8,1072.9,113.1z"/>
+		<path class="st2" d="M733,99.2c0.2-0.7,0.7-2.1,0.9-2.8c2,1.5,4.3,2.3,6.6,3.1c0,0.4,0.1,1.1,0.2,1.5c-3,2.3-6.2,4.4-9.1,6.7
+			C731.6,104.8,732.2,101.9,733,99.2z"/>
+		<path class="st2" d="M841.7,99.5c1-0.8,2-1.6,2.9-2.3c0.6,1,1.2,1.9,1.8,2.9c2.6,3.5,6.9,5,10.2,7.8c-0.8,2.9-1.5,5.7-2.4,8.6
+			c-0.8-0.1-2.4-0.3-3.2-0.4c-0.6-1.7-1.2-3.3-1.8-4.9c-1.5,1.2-3,2.5-4.6,3.6c-1.2,1.3-2.2-0.7-3-1.4c0-0.5,0-1.6,0-2.1
+			c-0.3-0.7-0.6-1.4-0.9-2c0.2-1.2,0.5-2.3,0.5-3.5c-1-2.3-3.4-3.5-5.2-5.1c0.6-1.1,1.2-2.1,1.8-3.2
+			C839.1,98.1,840.4,98.8,841.7,99.5z"/>
+		<path class="st2" d="M329,97.6c1.7,0,3.4,0,5.1,0.1c0.5,1.7-0.1,2.8-2,3.3C330.7,100.3,329.6,99.1,329,97.6z"/>
+		<path class="st2" d="M734.8,110.1c2-1.7,4-3.3,6-4.8c2.5,1.7,5,3.5,7,5.8c1.6,3.2,4.8,4.8,7.6,6.8c-5.5,0.6-11,0.8-16.5-0.2
+			c-1.7-0.3-3.2-1.2-4.4-2.4C734.4,113.6,734.6,111.8,734.8,110.1z"/>
+		<path class="st2" d="M963.4,112.3c1.1-0.8,2.3-1.5,3.4-2.2c1.2,2.5,1.6,5.2,1.3,8c-3,0.2-6.1,0.8-8.8-0.8c0.7-1.4,1.4-2.8,2.1-4.1
+			c0.7,0.9,1.5,1.9,2.3,2.7C965.3,114.9,963.9,113.5,963.4,112.3z"/>
+		<path class="st2" d="M332.2,113c3.2-0.5,6.5-0.9,9.7-1.4c0.1,5.7,0.1,11.3,0,17c-1.5-0.7-3.7-0.7-4.2-2.6c0.5-1.2,1.2-2.3,1.9-3.4
+			c-1.6-0.5-3.2-1-4.9-1.5c-0.3,0.6-0.9,1.8-1.2,2.3c-1.5,0.8-3,1.7-4.5,2.5c1.8,1.1,3.8,0.8,5.7,0.5c-0.1,0.5-0.2,1.4-0.3,1.8
+			c-1.4,1-2.7,2-4.1,2.9c-0.4,0.1-1.2,0.4-1.7,0.5c-0.9-0.5-1.8-1-2.7-1.6c-3.1,1.2-6.4,1.5-9.6,1.6c0-2.7,0.1-5.3,0-8
+			c2.2-0.7,4.3-1.6,6.2-2.7c4.2,1.8,6.7-2.6,9.8-4.6C332.4,115.3,332.3,114.2,332.2,113z"/>
+		<path class="st2" d="M826.8,118c1.3-3.2,5.1-3.7,7.5-5.9c1.6,1.8,2.5,4.2,1.1,6.4C832.5,118.4,829.7,118.2,826.8,118z"/>
+		<path class="st2" d="M760.8,117.8c2.3-1.6,7.7-5.5,8.7-0.8C767.4,119.5,763.6,118,760.8,117.8z"/>
+		<path class="st2" d="M1098.4,118.8c1.5-1.2,3-2.5,4.7-3.5c2.1,0.5,3.7,2.2,5.5,3.5C1105.2,118.8,1101.8,118.8,1098.4,118.8z"/>
+		<path class="st2" d="M339.1,131.8c1-0.3,1.9-0.7,2.9-1c0,1,0,2.9,0.1,3.9c-0.6,0-1.1,0.1-1.7,0.1c1.4,0.8,2,2,1.7,3.7
+			c-1.1,0.1-2.1,0.2-3.2,0.3c-0.1,1.2-0.2,2.3-0.4,3.5c-0.8,0.1-2.4,0.2-3.1,0.2c-0.1,0.7-0.2,2.1-0.2,2.8c-0.1,2.2-0.1,4.3-0.1,6.5
+			c2.2-1.3,3.6-3.5,4.8-5.6c0.5,0.2,1.6,0.6,2.1,0.8c0,2.2,0,4.3,0,6.5c-1.4,0.2-2.7,0.5-4.1,0.8c-1.3,2.4-1,6-3.9,7.3
+			c-1.2-0.5-2.4-1.2-3.5-1.8c-1.2-2.1-2.1-4.3-2.7-6.7c-1.2-0.2-2.5-0.5-3.7-0.7c-0.8-0.8-1.5-1.5-2.3-2.3c0.5-0.6,1-1.2,1.5-1.8
+			c1-1,2-2,3.1-3c1.2,2.5,2.1,5.6,5.2,6.1c0.3-1.7,0.8-3.3,0.9-5.1c-0.1-1.7-2.2-1.5-3.3-2.1c-0.2-0.2-0.6-0.7-0.8-0.9
+			c-0.8-0.9-1.5-1.9-2.2-2.9c-1.7,2.1-3.4,4.1-5.2,6.1c-1.4,0.7-3,1.3-4.4,1.9c0-4.4-0.1-8.9-0.1-13.3c2.4-0.5,4.8-1.1,7.3-1.5
+			c2.6,1.6,5.6,2.7,8.4,0.9C334.5,133.4,336.8,132.6,339.1,131.8 M334.2,135.4c-3.2-0.8-1.2,4.6,0.6,2.7
+			C336.9,137.6,336.4,134.3,334.2,135.4 M319.3,138.1c1.2,0.8,2.1,2.9,3.8,2.2c2.4-0.4,2.5-3,3.1-4.9
+			C323.6,135.4,321.2,136.4,319.3,138.1 M333.3,152.2c-1.3,0.2-3.3,1-2.3,2.8c2.2,1.2,5.8-0.3,4-3.1
+			C334.5,152,333.7,152.2,333.3,152.2z"/>
+		<path class="st2" d="M1390.8,133.1c1,1.5,1.7,3.1,2.5,4.8c0.9,0.4,1.8,0.8,2.7,1.2c0.6,0.2,1.7,0.6,2.2,0.9
+			c0.2,0.6,0.5,1.9,0.6,2.5c-2.8,0.1-5.6-0.3-8.3-1.2C1390.6,138.5,1390.6,135.8,1390.8,133.1z"/>
+		<path class="st2" d="M1406.8,135.5c1.1-0.1,2.3-0.2,3.4-0.3c0,4-1.9,7.5-3.1,11.2c1.7,0.2,4,1.9,5.3,0c0.3-1.9,0.2-3.8,0.3-5.7
+			c0.8-0.1,2.5-0.2,3.3-0.3c0,5.2,0,10.3,0,15.5c-0.8,0.3-1.6,0.7-2.4,1l-1.2-0.4c-1.2-0.6-2.4-1.2-3.5-1.9c-1,0.6-2.1,1.2-3,1.9
+			c-2.1,1.8-0.7,4.1,0.5,6c-0.2,0.4-0.6,1.3-0.8,1.8c-1.5-0.4-3-0.5-4.5-0.3c0,1.1,0.1,2.1,0.3,3.2c1.1,1.4,2.3,2.7,3.8,3.7
+			c1.8,1.9,2-1.8,2.4-2.9l0.2-1c0.9,0.9,1.8,1.8,2.8,2.7c1.8,0.5,3.6,0.7,5.4,1c-0.1,3.2-0.2,6.4,0,9.6c-0.7-0.1-2.1-0.4-2.8-0.5
+			c-0.9-1-1.8-2-2.6-3.1c-0.1-1-0.2-2-0.3-3c-1-0.1-2-0.2-2.9-0.4c0,1.6,0,3.3,0,4.9c0,2.7,0.1,5.4,0.1,8c1.1-0.4,2.2-0.8,3.4-1.2
+			c1.3,1.9,3,3.5,5,4.7c0,5.1,0,10.2,0,15.4c-1.5-0.6-3-1.3-4.5-1.9c0.4,1.6,0.9,3.3,1.3,4.9c1,0.4,2.1,0.8,3.2,1.2
+			c0,1.9,0,3.8,0,5.6c-1.4,0.9-4.4,0.8-4.2,3c0.4,2.1,2.7,1.4,4.2,1.5c0,4.8,0.1,9.6-0.2,14.5c-0.3,1.8-0.1,3.7,0.8,5.4
+			c0.9-1.3,1.8-2.7,2.7-4.1c1.9,1,3.7,2.1,5.6,3.1c1-1.4,2-2.9,3.1-4.3c0.8,0,2.5,0,3.3,0c0.1,2.2,0.2,4.4,0.3,6.6
+			c0.7,0.4,1.3,0.8,2,1.1c0.4-1.1,0.9-2.2,1.4-3.2c1.6,1.2,3.2,2.4,4.9,3.6c0.6,1.7,1.2,3.4,1.9,5.2c0.1-2.2,0.1-4.4,0.1-6.7
+			c-0.5-0.3-1.6-0.8-2.1-1.1c-0.5-0.9-1-1.8-1.4-2.7c-2.3-0.9-4.5-1.8-6.7-2.8c3.4,0,6.9-0.1,10.3-0.1c1.2,1.2,2.4,2.4,3.7,3.6
+			c1.7,2.6,4.6,4.1,6.5,6.6c1.2,1.6,2.3,3.2,3.6,4.7c0.3-3.6-0.5-7.2-3.4-9.6c2-1.5,3.9-3.2,5.4-5.3c5.7,0.1,11.4-0.1,17.1,0
+			c1,1.2,2.1,2.5,3.2,3.7c3.8-1.3,8.4,1.5,11.5-1.7c0.7-0.7,1.5-1.3,2.2-2c0.7,0,2.1,0,2.8,0c0.4,0.5,1.2,1.4,1.6,1.9
+			c-0.5,1.1-0.9,2.1-1.4,3.2c1.7,0.6,3.5,1.3,5.1,2.2c-1.2,1-2.4,2.1-3.6,3.1c-0.6-0.9-1.1-1.8-1.7-2.6c-4.2-0.9-8.3-2.3-12.7-2.8
+			c0.3,2.2,0.6,4.4,1,6.6c-0.6,0.2-1.7,0.6-2.3,0.8c0.7,2.4,1.2,4.8,2.2,7.1c1.4,2.1,3.5,3.6,5.3,5.2c0.5-0.4,1.5-1.2,2.1-1.7
+			c0.9-0.7,1.8-1.4,2.7-2.1c0.5,0.4,1.3,1.3,1.8,1.7c-1.1,1.5-2.1,3-3.2,4.4c1.5,0.4,2.8,0.9,3.9,2.1c-5.9,1.4-11.6-1.4-16.1-5
+			c-0.3,1.7-0.5,3.4-0.8,5c-5.2,0.7-10.4,0-15-2.5c-2.9-0.8-3.3-4.5-5.6-6c-2.6-0.8-5.8-2.1-8.1,0c-2.4,2.1-5.1,3.8-8.4,4
+			c0.1-2.3,0.3-4.7,0.4-7c-2.4,2.1-3.9,4.9-4.6,8c2.8,0.5,5.7,0.6,8.6,0.4c0.9-1,1.8-2,2.7-3c1.7,1.5,1.8,3.8,1.9,5.9
+			c-11.4,1-22.8-0.2-34.1,0c-1.5-1.2-3-2.3-4.5-3.5c0.5,0,1.5-0.2,2-0.2c1.7,0,3.5,0.1,5.2,0.2c-1.6-2.1-3.1-4.3-4.9-6.2
+			c-0.6,0.5-1.8,1.4-2.4,1.9c-0.1-0.8-0.2-1.5-0.2-2.2c1.6-1.2,3.2-2.4,4.9-3.6c2.1,1.1,4.2,2.4,6.4,3.4c1.4-1.4,0.2-3.4,0.2-5.1
+			c1.2-0.7,2.5-1.4,3.8-2.1c2.2,2.3,4.5,4.5,7.2,6.2c0.3,0,0.8,0,1.1,0c1.4-1.6,2.5-4.1,0.2-5.5c-0.3-0.3-0.9-1-1.2-1.4
+			c-1.7,0.3-3.4,0.6-5.1,1c-0.1-1.2-0.3-2.4-0.4-3.5c-2.2,0.6-4.4,1.1-6.5,1.7c-0.7-1.1-1.3-2.3-1.9-3.4c-0.4-0.1-1.3-0.4-1.7-0.6
+			c-0.3,2.4,1.6,6.8-2.2,7c-3.3,0.7-5.9,3.1-8.5,5.1c-1.7,1-3.6,1.7-5.5,2.2c-2.1,0.2-4.4,1-3.3,3.6c-1.8,2.9-5.4,2.8-8.5,3
+			c0.2-9.4-0.1-18.9,0.1-28.3c0.9,0.8,1.8,1.6,2.7,2.4c2-0.9,3.9-2,5.1-3.9c0.8-0.5,1.7-0.9,2.5-1.4c0.6,0.7,1.2,1.4,1.9,2
+			c1.6-0.2,3.3-0.4,5-0.6c0,0.8-0.1,2.5-0.1,3.3c-1.8,0.2-3.6,0.3-5.3,0.5c-2.9,0-5.4,1.4-7.8,2.9c0.4,0.6,1.1,1.8,1.5,2.3
+			c3.2-1,6.5-1.9,9.8-2.7c1-1.6,2-3.3,3-5c0.9-0.5,1.8-1,2.7-1.5c-0.1-0.3-0.2-0.9-0.2-1.3c-0.6-0.3-1.7-1-2.3-1.3
+			c-0.9,0.8-1.7,1.5-2.6,2.3l-0.8-0.4c-2.1-1.2-4.1-2.4-6.1-3.6c0.5-0.9,1-1.8,1.6-2.6c1.6,0.5,3.2,1,4.9,1.6
+			c0.1-0.6,0.3-1.9,0.4-2.6c-0.7-0.2-2.1-0.7-2.8-0.9c-0.3-0.4-0.9-1.3-1.2-1.8c-1.8-0.6-3.6-1.2-5.3-1.7c2.2-0.9,4.4-1.7,6.6-2.6
+			c1.7-2.8,3.5-6.2,1.6-9.3c-1.1,1.7-2.1,3.4-3,5.2c0.4-2.7,0.8-5.5,1.2-8.2c2,0.9,4.2,2.3,6.1,0.4c-2-1.4-4-2.8-6-4.2
+			c1.2-0.9,2.5-1.8,3.7-2.7c1.9,2.2,4.3,3.8,7.2,4.4c0-0.5,0.1-1.6,0.2-2.1c-2.3-1.9-4.4-4.1-7-5.4c-0.5,0.4-1.4,1.1-1.9,1.5
+			c-0.9,0.7-1.8,1.4-2.7,2.1c-1.7-2.3-3.3-4.7-4.8-7.1c-0.9,0.8-1.8,1.6-2.7,2.5c0.8,1,1.5,2,2.3,3c-1.2,0.5-2.4,1-3.6,1.4
+			c1.2,2.7,3.4,4.6,6,5.9c-1.3,0.3-2.5,0.6-3.7,0.9c0,1,0,2,0,2.9c-1.6,0.8-3.4,1.5-4.6,2.9c2.5,1.8,6.4,1,7.7,4.4
+			c-2,1.3-4.4,1.1-6.6,0.8c0.5,0.9,0.9,1.9,1.4,2.8c-0.9,1.5-2.2,2.5-3.8,3.2c-0.2-5.9-0.2-11.7-0.1-17.6c0.1-5.6-0.5-11.3,0.4-16.9
+			c-0.6-4.4-0.8-9-0.2-13.4c1.4,0.6,2.8,1.3,4.2,1.9c0.9-0.2,1.9-0.5,2.9-0.7c-0.7-1.2-1.4-2.3-2.1-3.5c-1,0.4-2.1,0.8-3,1.3
+			c0.8-1.3,1.6-2.6,2.4-3.8c-0.4-0.6-1.3-1.8-1.7-2.4c2.7-1.5,5.4-3,8-4.6c0.2-2.5,0.3-4.9,0.1-7.4c-0.6,0-1.7-0.1-2.2-0.1
+			c-0.1,0.6-0.3,1.8-0.5,2.3c0.5,0.4,1.4,1.3,1.9,1.7c1,1.7-1.5,3.8-2.7,1.8c-1.5-2-1.2-4.6-1.6-6.8c-1.1-0.8-2.1-1.5-3.1-2.2
+			c-0.4,4.2,1.4,7.9,3.6,11.2c-2.2,0.4-4.3,0.8-6.4,1.2c-0.1-5.2-0.2-10.3,0.1-15.5c1.6-1.6,2.1-3.7,2.6-5.8c3.2,0.9,1.9,4.3,3,6.6
+			c2.5,1,5.4,0.9,7.9,2.1c2.5,0.8,5.3,2.6,7.9,1.4c1.3-0.8,1.2-1.4-0.3-1.7c-3-1.3-6.9-0.9-9.2-3.4
+			C1402.8,142.9,1405.4,139.4,1406.8,135.5 M1400.2,179.4c0.3,1.1,0.7,2.3,1.1,3.4c1.5,0.6,3.5-1,2.4-2.5
+			C1403.3,178.8,1401.2,179.8,1400.2,179.4 M1407.1,186.9c-0.1,1.4-0.1,2.9-0.1,4.3c1-0.4,2-0.8,2.9-1.2
+			C1410.1,188.3,1408,187.8,1407.1,186.9 M1406.9,214.1c2.4,0.8,4.8-0.6,3-3.1C1407.4,209.4,1407.4,212.7,1406.9,214.1
+			 M1408.2,219.4c-3.8,1.9,0.7,6,3.5,5.4C1412.1,222.8,1410.1,219.6,1408.2,219.4 M1458.2,242c2.1-0.3,4.1-1.1,5.9-2.3
+			c1.3,0,2.7,0,4.1,0.1c-0.4-1.4-1-2.8-1.8-4c-2.3,0.8-4.7,0.9-6.9-0.1C1458.8,237.7,1458.3,239.9,1458.2,242 M1409.5,237.1
+			c-1,1.4,1.5,2.6,2.4,1.4C1412.9,237.1,1410.3,235.9,1409.5,237.1 M1401.5,246.3c1.2-0.5,2.3-1,3.5-1.5c0.9,0.4,1.8,0.7,2.7,1.1
+			c0.5-1.9,0.9-3.7,1.2-5.6C1405,239.1,1400.7,242.1,1401.5,246.3 M1469.6,242.5c-1.8-1.8-3.6-0.4-5.1,0.9c-0.9,0.5-2.6,2.8-0.6,3
+			c1.8-0.4,3.3-1.5,5-2.1c1.7,1.5,3.2,3.2,5,4.7c1.2-3.1,5.3-6.5,2.1-9.6C1473.9,240.1,1471.6,241.1,1469.6,242.5 M1412,246.1
+			c1.8-0.4,5.3-2,2.9-4C1413,242.5,1412.2,244.3,1412,246.1 M1443.2,251.4c0.7,1.2,1.3,2.4,2,3.5c0.9-1,1.8-2,2.7-3
+			c0.7-0.1,2.2-0.3,2.9-0.4c-0.3-1.6,0.5-4.5-1.8-4.8C1447.1,248.3,1445.3,250,1443.2,251.4 M1391.8,247.8c-0.6,2.3,1.8,5.2,3.8,3
+			C1397.3,248.3,1393.2,248.5,1391.8,247.8 M1461.2,248.3c0.2,2.2,0.3,4.7,2.2,6.2c1.8,0.6,3.5-0.2,4.6-1.6
+			c-2.7-0.1-3.5-2.4-3.7-4.7C1463.3,248.2,1462.2,248.3,1461.2,248.3 M1475.8,248.9c-1.1,2.1,0.6,3.7,2,4.9c0.4-0.7,1.3-2.1,1.7-2.8
+			C1478.6,249.9,1477.5,247.4,1475.8,248.9 M1431.3,258.6c1.2-1.7,0.7-3.8,0-5.6C1428.2,253.7,1427.1,259,1431.3,258.6
+			 M1470.6,254.1c0.4,1.7,1,3.6,2.9,4.3c1.1,0.7,4.1,2.2,3.8-0.4c0-0.5,0.2-1.6,0.2-2.1C1475.2,255.4,1472.9,254.7,1470.6,254.1
+			 M1426.1,259.4c-2.2,0.3-1.3,3.5,0.7,2.8C1428.8,261.9,1427.9,258.7,1426.1,259.4z"/>
+		<path class="st2" d="M320.5,155.4c0.8-1,1.6-2.1,2.4-3.1c0.6,0.4,1.9,1.1,2.5,1.5c0.6,2.3,1.1,4.6,1.4,7l0.1,0.4
+			c0.8,0.6,1.7,1.2,2.5,1.7c-0.4,1.8-0.8,3.7-1.1,5.5c2.2-0.1,2.9-2.2,3.9-3.8c2.6-0.4,5.1-0.7,7.7-1c-0.5-2.5-0.9-5-1.2-7.5
+			c0.9-0.1,2.5-0.3,3.4-0.4c-0.3,5.8,0.8,11.7-0.8,17.4c0.6,2.3,0.8,4.6,0.8,6.9c-0.1,8.8-0.1,17.5,0,26.3c-1-0.3-2-0.5-3-0.8
+			c-1,1.3-2,2.6-2.9,3.9c1.8,1.6,3.8,3,5.9,4.2c0,11.5,0.1,23-0.2,34.5c0.3,5.2,0.4,10.5,0.2,15.8c-104.1-0.1-208.2,0-312.2,0
+			c-0.8,20.7,0,41.5-0.4,62.2c-0.8,0.7-1.6,1.4-2.4,2.1c0.6,1,1.3,2,2,3c0,2.3,0,4.6,0.2,7c-3-0.4-5.9-0.7-8.9-0.9
+			c0.4,0.8,0.9,1.6,1.3,2.4c2.1,0.1,4.3,0.1,6.4,0.7c1.8,2.2,1.4,5.2,1.5,7.8c-1.4,0.2-2.8,0.4-4.1,0.6c-0.4,1.4-0.7,2.7-1.1,4.1
+			c1.7-0.3,3.4-0.7,5.1-1c0.7,4.9-1.7,9.9,0.2,14.8c-2.2,1.7-4.5,3.3-6.8,4.9c-1.1,0.1-2.2,0.2-3.3,0.3c0.1,2.1,0.2,4.1,0.3,6.2
+			c1.6-0.5,3.1-1.4,4-2.9c1.3-2.4,2.8-4.7,5.6-5.4c0.7,3-0.7,5.3-2.9,7.2c1,0.9,2,1.8,3.1,2.6c-0.2,1.4,0.1,3.1-0.7,4.3
+			c-3,1.5-7.3-0.5-9.4,2.7c-1.3,1.3-0.2,3.2-0.2,4.7c-0.8,0.6-1.5,1.2-2.2,1.9c-0.4,1.6-0.6,3.3-0.9,5c1.2-0.1,2.3-0.3,3.5-0.4
+			c0.1-1.2,0.2-2.4,0.3-3.6c0.1-0.8,0.2-2.2,0.2-3c1.2,0.3,2.3,0.6,3.5,1c0,2.9,1.4,5.5,2.4,8.2c-0.8,2.4-2.6,4.2-4.1,6.2
+			c1.7,1.6,3.7,2.9,5.7,4c0.1-0.4,0.4-1.2,0.5-1.6l0.6-2c1.1,5.6,0.9,11.4,0.5,17.1c-0.7,0.2-2.2,0.6-2.9,0.8
+			c0.1,0.5,0.2,1.5,0.3,1.9c1.2,1.3,3.1,2.4,2.9,4.5c0.2,5.7,0,11.4-0.1,17c-4.8-0.4-9.4,1.3-14.2,1.9c-0.3-3.5,2.5-5.3,5.1-7.1
+			c0.8-2-0.4-3.9-1-5.8c-1.7,0.8-3.3,1.9-5.1,2.2c-2.1,0-5.1-1.8-6.3,0.8c0.5,4.8,6.2,7.9,4.9,13c-0.3,2-0.6,4-0.9,6
+			c0.2,0.3,0.6,1,0.8,1.3c1.6,0.2,3.3,0.3,4.9,0.5c-0.3-1.9-0.6-3.8-0.9-5.7c1.3-0.9,2.6-1.7,3.9-2.5c1.3-0.6,2.7-1.1,4-1.6
+			c0.6,4.2-3,7.1-4.1,10.9c1.5-0.1,3-0.2,4.6-0.3c1.1-2.2,2.4-4.3,3.9-6.2c0.4,5.9,0.7,11.8,0.3,17.6c-0.2,2.5-2.4,4.5-2.6,7
+			c0.7,1.2,1.6,2.3,2.5,3.3c0,3.2-0.5,6.4-1.2,9.6c-0.8,3.5,0.4,6.9,0.9,10.3c-2.5-2.5-4.1-5.6-5.6-8.7c-1.1,1.1-2.3,2.2-3.4,3.3
+			c-3.6-3.7-8.8-2.1-13.3-3.4c3-2.7,6-5.6,6.6-9.8l0.6-0.9c2.6-1.7,5.9-2.9,7.4-5.8c0.6-1.5-1.3-2.4-2.4-2.8
+			c-2.2-0.8-4.5-1.4-6.8-1.2c-2,1.4-1,3.8-0.7,5.8c-2.8,3.8-8.2,6.6-7.8,11.9c0.2,2.7-2,4.9-1.9,7.5c1.9,0.2,3.8,0,5.8,0.3
+			c2.4,0.8,4.3,2.6,6.6,3.7c1.8,0.1,3.3-0.8,5-1.2c0.1,0.6,0.3,1.8,0.4,2.3c0.4,0.3,1.3,1.1,1.8,1.4c1.2,1,2.3,2,3.4,3.1
+			c1.4-1.5,2.9-2.9,4.4-4.2c0.6,4.4,0.6,8.9,0.2,13.4c-1.4,0.1-2.8,0.2-4.2,0.4c-3,0.6-5.8-0.7-8.3-2.2c-0.7,3-1.9,5.9-2.7,8.9
+			c0.4,0.8,0.8,1.6,1.3,2.3c0.9-1.8,1.2-4,2.8-5.3c1.6,1.1,3.1,2.3,4.6,3.6c2.2-0.1,4.5-0.3,6.7-0.5c-2.1,1.7-3.8,3.8-3.6,6.7
+			c1.2,0.4,2.3,0.7,3.5,1.1c-0.1,2.1-0.3,4.2-0.5,6.4c-1.7,0-3.5,0.1-5.2-0.1c-1.3-0.7-2.1-2-3.1-3c-1.2,0.5-2.4,1.1-3.6,1.7
+			c1.7,2.6,3.2,5.6,6,7.2c2.1,1,4.4,1.3,6.7,1.8c-0.1,1.3-0.3,2.5-0.4,3.8c-0.9-0.6-1.8-1.3-2.7-1.9c-2.9,0.2-5.8-0.4-8.4-1.7
+			c-0.5,0.1-1.6,0.3-2.1,0.4c-0.5,1.5-0.9,3-1.4,4.5c-1.8,0.9-3.6,1.8-5,3.2c0.1,2.3,1.5,4.6,3.8,5.4c3.4,1.3,7.1,0.9,10.7,0.8
+			c-0.1-2-0.4-4-0.9-6c-0.1-0.5-0.4-1.5-0.5-2c0.7-0.2,2.2-0.7,2.9-1c1.4,1.7,3.1,3.3,4,5.4c0.2,2.8-1.9,5.2-2.4,8
+			c-0.1,1.9,1.5,3.2,2.5,4.5c-0.1,2.4-0.1,4.8-0.2,7.3c-0.5-0.2-1.6-0.5-2.1-0.7c-2-4.1-5.3-7.2-8.4-10.4c-2.3,2.1-4.3,5.2-2.2,8.2
+			c1.4,1.4,3,2.7,4.2,4.2c-1.8,4.8-7.7,6.2-11.3,9.5c-1.6,0.7-3.6,1.7-5.1,0.3c-0.7-1-1.4-2-2-3c1-0.9,2-1.8,3-2.8
+			C3.9,581.5,2,581,0,581.5v-7.7c0.9,1.3,1.8,2.6,2.7,3.9c1.6-0.5,3.3-1,4.9-1.4c0.4,1.9,0.7,3.8,1.1,5.8c1.4-0.4,2.7-0.7,4-1.3
+			c-0.3-3.2-1.7-6.2-2.7-9.3c-0.2-0.3-0.5-0.8-0.7-1c-1.2,0-2.3,0-3.5,0.2c-0.8,0.2-1.6,0.4-2.4,0.6c-0.7-0.7-1.4-1.4-2.2-2.1
+			c1.3-3.2,2.8-6.2,4.7-9.1c-2,0.5-4,1.1-5.9,1.8v-7.2c1.5-0.2,3.1-0.2,4.6-0.8c2.5-2.8,4.7-5.8,7.3-8.5c-1.6-3.3-0.7-6.8-1-10.3
+			c-3.7,0.7-7.2,1.9-10.8,2.8v-25.7c1.6,0.9,3.4,1.4,5.1,1.8c1.4-2.7,3.4-5,5.8-6.9c-3.6,1-7.2,1.9-10.9,2.3V481c3,1.2,3-4.3,0-2.7
+			v-35.5c1,0.8,2.1,1.6,3.2,2.3c0.3-1.3,1.5-2.6,1-4.1c-1.3-1.6-2.8-2.9-4.2-4.4v-36.2c0.6,0.3,1.8,1.1,2.3,1.4
+			c0.3,1.7,0.6,3.5,0.9,5.2c0.7-0.2,1.4-0.4,2.1-0.7c1.5-1.6,2.7-3.3,4-5c0.8,0.4,1.6,0.8,2.4,1.3c0-0.6-0.1-1.9-0.1-2.5
+			c-3.7-1.6-7.6-3.1-11.7-2.4v-11.3c3.4-1,5.8,2.1,8.9,2.6c4.8,0.2,5.8-5.4,7.7-8.7c-2-2.6-3.1-5.7-3.7-8.9c2.3-0.9,4.6-2.1,6.5-3.7
+			c-1.1,0.1-2.1,0.2-3.2,0.3c-0.6-1.4-1.2-2.7-1.7-4.1c-1.2,1.8-2,3.8-2.2,6c-3.6,1.1-7.1,2.8-9.9,5.3c0,1.5-0.1,3-0.1,4.4
+			c1.8-1.3,3.3-3.4,5.8-3.1c2.8-0.4,5,1.7,7,3.3c-1,1.4-1.8,2.9-3,4.1c-4,1.4-8.3-0.2-11.9-2v-7.8c0.9-0.6,1.9-1.2,2.8-1.8
+			c-0.1-1.9-0.6-3.6-2.8-4v-3.8c1.4-0.6,3.7,0.1,4.4-1.6c-0.1-1.8-1.2-3.2-2-4.8c-0.6,0.5-1.8,1.4-2.4,1.8v-12.5
+			c1-2.3,2.5-4.3,4.1-6.2c-0.3-1.4-0.5-2.8-0.8-4.1c-1.1,0.3-2.2,0.5-3.3,0.8v-52c1.6-2.5,4.2-3.9,6.7-5.3c-0.9-0.6-1.8-1.1-2.8-1.6
+			c-1.5,0.7-2.7,1.8-4,2.9v-6.6c1.3-0.2,2.6-0.5,4-0.7c-0.3-0.9-0.7-1.8-1-2.6c-0.7,0-2.2-0.1-3-0.2v-29c1.1,0.8,2.2,1.5,3.2,2.2
+			c0.8-2.2-0.1-5.9,2.7-6.6c2.6,0.1,3.5,2.9,4.9,4.6c0.5,0.1,1.5,0.5,2,0.6c-0.8-1.8-1.6-3.6-2.4-5.5c-3.6-0.1-7.2,0.5-10.5,1.7v-6
+			c4.3,0,8.5,0,12.8,0c-0.3,1-0.5,2-0.8,3c1.3,0.1,2.6,0.1,4,0.1c0.1-0.8,0.2-2.4,0.3-3.2c4.4,0,8.8,0,13.2,0
+			c-1.7,0.9-3.3,1.9-4.8,3.2c-0.3,2.2,1.9,3.5,3,5.1c1.7-2.5,4.2-4.3,7.4-3.9c0-0.5,0.1-1.4,0.1-1.9c0-0.6,0.1-1.8,0.1-2.4
+			c13.7,0,27.5,0,41.2,0c0.8,1.1,1.7,2.3,2.6,3.3c1.5-0.5,1.8-2.1,2.5-3.3c78.3-0.1,156.6,0.1,234.9-0.1c-0.1-26,0-52,0-78
+			C317.8,155.8,319.1,155.6,320.5,155.4 M322.1,166.5c1.1,2.6,2.5,5.2,2.4,8.1c0.5,0,1.5,0,2,0c-1-3-1.1-6.3-0.9-9.4
+			C324.4,165.6,323.2,166.1,322.1,166.5 M324.8,182.8c0.8,0,2.4,0,3.2,0c-0.1-1.7-0.4-3.4-1.2-5
+			C325.2,178.9,324.9,180.9,324.8,182.8 M321.2,186.6c2.1,0.9,3.8-0.7,3.3-2.8c-1.3-0.1-2.6-0.2-3.9-0.3c-0.1-1.5-0.1-3.1-0.2-4.6
+			C318.3,180.9,320.3,184.3,321.2,186.6 M320.8,193c0.8,0.1,2.3,0.2,3.1,0.3c0.1-0.7,0.4-2.2,0.5-2.9c1.2-0.1,2.5-0.3,3.7-0.4
+			c0.7-2,0-2.7-2-2.2C323.7,188.7,321.1,190.4,320.8,193 M317.8,205c1.7,2.3,3.1,5.8,6.1,6.4c3.3-1.6-1.1-3.5-2.3-5
+			c-0.8-1.9-0.6-4.8-2.7-5.7C316.9,200.8,317.8,203.7,317.8,205 M321.4,215.1c0.1,2.9,0.5,6,2.3,8.4c0.8,0.8,4.2,1.8,3.5-0.3
+			c-1.1-1.8-2.7-3.4-3.5-5.5C323,216.8,322.7,213.8,321.4,215.1 M336.4,216.3c-2.4,1.7,1.6,7.7,2.9,3.8
+			C340.4,218.3,338.1,214.2,336.4,216.3 M332.6,228.9c0.1,2.3,0.3,4.6,0.5,6.9c2.4,0.3,4.8,0.8,7.1,1.3c1.9-1.2-0.8-3.4-2.3-3.6
+			C335.1,233.3,334,230.8,332.6,228.9 M325.2,230.2c-1.6,2.1-2.7,4.4-3.5,6.9c0.3,0.2,0.9,0.6,1.1,0.8c1.5-1.9,2.9-3.8,3.8-6.1
+			C326.7,230.9,326.2,230.3,325.2,230.2 M336.5,240.2c-1.2,0.9,0,3.3,1.4,2.3C339.1,241.6,337.9,239.1,336.5,240.2 M50.8,250.2
+			c1.5,0.7,3.1,0.5,4.7,0.5c0.4-0.8,0.8-1.6,1.2-2.4c-1.6-0.4-3.2-0.9-4.8-1.3c0.3-1.7,0.6-3.5,0.9-5.2
+			C50,243.6,50.5,247.4,50.8,250.2 M19.1,244c-0.2,1.6-0.7,4.5,1.8,4.3C23.6,247.4,22.3,241.9,19.1,244 M324.3,249.3
+			c-3.8,2.3,5.4,4.4,4.7,0.8C328.5,248,325.7,248.4,324.3,249.3 M302.2,251.2c-0.5,1.6,0.1,2.2,1.7,1.6
+			C304.4,251.2,303.9,250.7,302.2,251.2 M62.4,260c3.2-1.7,1.9-5.1,1.2-7.9C59.1,252.5,61.4,257.3,62.4,260 M46.9,256.2
+			c0.1,2,2.5,1.6,3.8,2.1c0.2,0.6,0.5,1.9,0.7,2.6c1.9-0.4,3.8-0.8,5.7-1.2c-0.1-1.5-0.3-3.4-2.1-3.9c-1.8,0.1-3.8,1.2-5.2-0.4
+			c0.8-0.9,1.6-1.7,2.3-2.6C49.7,252.4,48.2,254.5,46.9,256.2 M26.3,254.4c-0.1,1.9,0,3.8,1.4,5.2c0.8-0.2,2.3-0.7,3.1-1
+			c-0.1-1.1-0.2-2.1-0.4-3.2C29.7,253.8,27.6,254.7,26.3,254.4 M191.6,256.8c0.2,0.8,0.5,2.3,0.7,3.1c1.2,0,2.5,0,3.7-0.1
+			c0-1.3-0.1-2.5-0.1-3.8C194.6,254.5,192.9,256.2,191.6,256.8 M95.3,256.2c-1.4,0.9,0,3.6,1.5,2.4
+			C98.2,257.6,96.8,254.9,95.3,256.2 M63.9,261.6c1.3,0.7,2.7,2,4.3,1.5c1.8-0.3,2.8-2,4-3.2C69.7,256.6,66.3,260,63.9,261.6
+			 M20.5,276.9c0.2,3.4,3.4,4.1,6.2,3.8c-0.4-1.8,0.6-4.6-1.6-5.4C23.5,274,19.7,274,20.5,276.9 M11.3,298.4c-1.6,1.4-1,3.8-1.3,5.7
+			c2-0.5,3.9-1.5,5.3-3C14.1,300,13.2,297.8,11.3,298.4 M1.2,309.3c2.6,2.8,5.4,5.6,6.6,9.3c0.5,0,1.6,0.1,2.1,0.1
+			c-0.4-3.3-2-6.2-3.4-9.2C4.9,308.4,2.8,308.1,1.2,309.3 M18.2,314.3c0.1,1.9-0.3,4.4,2,5.2c2.4-0.7,1.2-3.5,1.5-5.2
+			C20.5,314.3,19.4,314.3,18.2,314.3 M20.8,326.8c-0.8,1.7-0.4,3.6-0.5,5.4c2.6-1,3.3-3.6,3.5-6C22.8,326.3,21.8,326.5,20.8,326.8
+			 M5.1,336.6c3,0.1,6,0.8,8.7,2.2c-0.9-3.1-0.3-7.2-2.9-9.6C6.9,328.2,4.7,333.2,5.1,336.6 M9.1,346.1c-1.9,1.5-4.9,2.5-5.5,5
+			c1.9,2.7,7.5,4.6,8.8,0.3c0.2-0.5,0.5-1.4,0.6-1.9c1.7,0.3,3.3,0.7,5,1.3c0.3-0.5,1-1.4,1.4-1.8C17.2,345.7,12.4,343.4,9.1,346.1
+			 M11.3,358.9c-0.5,1.1-1,2.3-1.5,3.4c0.9,0.9,1.7,2,3.1,1.6C13.9,361.9,13,360,11.3,358.9 M1.7,391.7c0.2,0.8,0.7,2.3,0.9,3
+			c1.8,0,3.9-0.6,3.6-2.9C5,390.2,3.2,390.8,1.7,391.7 M9.1,408.9c-0.5,1.1-1,2.3-1.6,3.4c1.7,0.7,3.4,1.4,5.1,2.1
+			c1.8,0,4.8,0.1,4.8-2.4c-0.6-2.1-3.1-1.5-4.8-1.8C11.5,409.7,10.3,409.3,9.1,408.9 M8.4,421.5c0,0.6-0.1,1.7-0.1,2.3
+			c3.7,2.1,7.2-0.5,10.4-2.4c-0.2-1.4-0.4-2.7-0.6-4.1C15,418.9,11.7,420.2,8.4,421.5 M2.6,448c-0.1,1.7,0.7,2.5,2.5,2.4
+			c2-0.7,0.7-3.1,0.8-4.5C4.7,446.3,3.2,446.6,2.6,448 M7.2,454.3c-2.5,0.2-4.9,0.9-5,3.9c1.3,0.4,2.5,0.8,3.8,1.2
+			c1.3-3,6.4-6,3-9.2C8.4,451.5,7.8,452.9,7.2,454.3 M1,467.3c1.2,1.6,2.5,3.1,4,4.4c2.5-2.1,5.2-0.9,7.8,0.2
+			c4.7-1.3,9.3,0.3,14,0.8c0.6-1.6,1.1-3.1,1.5-4.8c-1.6,1-3.2,2-4.8,3c-0.2-0.8-0.6-2.5-0.7-3.3c-0.4,0.5-1.1,1.5-1.4,2
+			c-3.9-0.6-8.4-1.3-10.5-5.1C7.9,466.6,4.4,467.1,1,467.3 M20.3,484.6c-1.5,2-2.2,4.3-1.7,6.8c1.3-0.2,3.1,0.5,4-0.8
+			c0.9-1.3,1.5-2.8,2.1-4.3c-0.7-0.6-1.4-1.2-2-1.8C22.1,484.5,20.9,484.6,20.3,484.6 M12.4,511.3c-0.9,2,1.7,2.6,3,3.5
+			c1.1-2,3.7-3.7,3.1-6.3C16.1,508,13.8,509.5,12.4,511.3 M7.3,517.3c-1.9,1.2-0.5,3.7-0.1,5.4c0.6,0,1.9,0,2.5-0.1
+			C9.8,520.6,10.5,517,7.3,517.3 M4.2,527.2c0.3,1.3,0,2.7,0.7,3.9c1.4,0.7,3.1,0.4,4.6,0.6c0-1.1,0-2.3,0-3.4
+			C7.8,527.8,6,527.5,4.2,527.2z"/>
+		<path class="st2" d="M1410.2,166.1c-0.2-2.1-0.4-4.2-0.6-6.3l1.3,0.2c1.4,1.3,2.2,3.1,3,4.8
+			C1412.7,165.3,1411.4,165.7,1410.2,166.1z"/>
+		<path class="st2" d="M540.3,177.6c10.7-2.8,21.8-3.1,32.8-3.4l0,0.3c-0.2,1.7-0.7,3.3-0.6,5c1.4,1.7,3.2,3,5,4.4
+			c-3,1.4-5.4,3.9-7.7,6.2c-3,0.5-6.1,0.6-9.2,1.2c-0.6,0.1-1.8,0.2-2.4,0.3c-0.5-0.2-1.7-0.6-2.2-0.8c0.9-6.3,5.8-10.7,8.4-16.2
+			c-3.3,0.4-5.2,3.4-8,4.8c-1.3,2.4-2.3,5.1-3.3,7.6c-1.2,0.6-2.3,1.2-3.4,1.8c-2.1-2.5-2.2-8.1-6.4-7.7c-1.8,4.3-2.9,8.9-5.1,13.2
+			c-2,0.5-4.1,0.8-5.6,2.1c-3.3,2.8-8,3.8-10.6,7.4c-1.8,2-1.7,4.8-2,7.2c-3,3.4-5.9,6.9-8.4,10.7c-1.4-0.2-2.7-0.4-4.1-0.7
+			c-0.4,1.1-0.8,2.2-1.3,3.3c-1.5,0.4-3,0.9-4.5,1.2c-1.2,0-2.3-0.1-3.4-0.1c-0.6-1.1-1.2-2.2-1.9-3.3c-0.6-1.6-1.2-3.1-1.8-4.6
+			c-2.1,1.3-4.2,2.6-6.3,3.9c-0.8,3.2-1.9,6.3-3.3,9.3c-2.5-1.4-5.3-2.4-7.4-4.4c-0.8-2.5-0.2-5.1-0.1-7.6c0.4-0.3,1.2-0.8,1.6-1.1
+			c2.8-1.8,6.6-0.9,8.7-3.9c-1.9-0.8-3.8-1.4-5.7-2c-0.4-0.4-1.2-1.1-1.6-1.4c0.8-1.1,1.5-2.3,2.5-3.3c5.3-4.7,10.5-9.6,16.6-13.1
+			c1.4,0.6,2.7,1.2,4.2,1.5c2.1-1.1,3.6-3,5.3-4.5c0.4-1,0.7-2,1.1-3.1l0.1-0.3c7.5-3.4,15.1-6.7,23.1-8.5c-0.3,2-0.7,4.1-1.2,6.1
+			C536.6,185.3,538.1,180.5,540.3,177.6 M520.5,194.4c-0.9,1.1-0.9,2.6-1.1,3.9c1,0.1,2,0.2,3,0.4c0.8-1.8,1.7-3.6,2.5-5.4
+			C523.4,193.6,521.4,192.9,520.5,194.4 M492.5,204.1c-0.7,2.3,1.5,2.5,3.1,2.7c0.4-1.2,0.8-2.3,1.2-3.4
+			C495.3,203,492.5,201.4,492.5,204.1 M506.2,203c1.6,1.9,2.8,4.2,4.8,5.7c1.5,0.1,3.2-0.2,3.8-1.7c-1.8-2.1-4.5-3.1-6.8-4.5
+			C507.6,202.6,506.6,202.9,506.2,203 M506.4,213.4c-2.5,2.2,2.8,4,3.4,1.4C510.5,212.8,507.4,212.1,506.4,213.4 M497.7,215.7
+			c-1,1.6,0.7,2.8,1.5,4.1c0.9-0.4,1.8-0.8,2.7-1.3c-0.1-0.9-0.3-1.9-0.5-2.8C500.2,215,498.8,215.3,497.7,215.7z"/>
+		<path class="st2" d="M586.9,176.2c0.9,0,2.6-0.1,3.5-0.1c17.2,2.8,33.5,10.3,47.3,20.9c0.1,4.4-1.7,8.8-4.8,12
+			c-1.6,0.4-3.3,0.5-4.9,0.7c-0.3,2.4-0.4,4.9-1.2,7.2c-1.2,3.2-4.1,5.2-6.8,7c-8-13.1-20.1-24.1-34.8-29.1c-3.2-1.1-6.5-2.1-9.8-3
+			c1.5-2.6,2.9-5.4,3.3-8.5C581.6,181.1,584.2,178.6,586.9,176.2 M586.8,183.1c2.1,2.4,5.3,2.8,8.3,2.4c2.4-0.9,4-3.5,3.6-6.1
+			C594.3,178.9,589.7,179.4,586.8,183.1 M618.2,213.3c0,1.5-0.1,3-0.1,4.5c0.6,0,1.9-0.1,2.5-0.1c0-1.5,0-3,0.1-4.4
+			C620.1,213.3,618.9,213.3,618.2,213.3z"/>
+		<path class="st2" d="M693.7,179.5c6.8,1.4,13.8,1.2,20.8,1.5c-1.9,4.1-4.6,7.8-8.3,10.4c-0.2-0.9-0.7-2.7-1-3.6
+			c-0.6,1.3-1.2,2.5-1.8,3.8c-3.2-0.3-6.5-0.2-9.7-0.2C693.7,187.4,693.6,183.4,693.7,179.5z"/>
+		<path class="st2" d="M763.1,180.8c16.5-1.4,33.1-2,49.5,0.5c1.3,0.3,2.9,0.1,4.1,0.9c1,1.1,1.8,2.3,2.9,3.3c1.6,0,3.2-0.5,4.7-0.8
+			c2.9,1.6,5.8,3.3,8.7,5c-0.9,1.6-2.8,4.4-0.5,5.8c1.9,1.8,4.5,0.4,6.7,0.1c1.1,1.6,2.3,3.1,3.5,4.7c-0.7,1.1-1.3,2.2-2.1,3.2
+			c-2.1,0.3-4.1-0.1-6-0.8c-0.5-0.3-1.6-0.9-2.1-1.2c-0.4-0.2-1.1-0.6-1.5-0.8c-2.9,0.9-5.9,1.7-8.8,2.6c-1.1,0.2-2.3,1.2-1.6,2.4
+			c0.9,2.1,2.7,3.5,3.9,5.4c-1.9,4.9-4.6,9.6-5.8,14.8c-0.5,2.7-2.9,4-5,5.3c-0.8-1.4-1.7-2.8-2.4-4.3
+			c-2.4-12.4-10.3-24.4-22.7-28.5c0.4-1.5,0.8-2.9,1.3-4.4c-0.9-0.6-1.8-1.1-2.7-1.6c-1.1,1.2-2,2.6-2.9,3.9
+			c-3.6-0.6-7.1-1.7-10.8-2.1c-4.3-0.1-8.6,0.3-12.8,1.3c-0.9,0.2-1.8,0.3-2.7,0.5c0.3,10.4-0.5,20.9,0.1,31.3
+			c-0.3-2.4-1-4.7-1.6-6.9c-0.3,1.5-0.6,3-0.9,4.6c-4.3,4.2-9.3,8.3-15.4,9.2c-0.5,1.1-1,2.2-1.4,3.3c-0.5,0.3-1.1,0.5-1.6,0.8
+			c-0.6,2.3-1.2,4.6-1.8,7c-2.7,1.6-5.3,3.3-7.3,5.8c-2.7,3.3-6,5.9-9.4,8.5c0-14.1,0.2-28.2-0.1-42.3c-0.8-8.1-0.4-17.9-7.8-23.2
+			c0.8-4.9,5.4-7.4,8.4-11c1.4-2.1,4-1.4,6.2-1.5C737.7,181.9,750.4,180.4,763.1,180.8 M799.5,202.5c2.9,1.2,4.7-1.5,6.3-3.4
+			c-0.5-0.6-1.4-1.8-1.8-2.3C801.9,198.1,798.4,199.3,799.5,202.5 M742.3,209.6c-2.2,0.8-0.5,4.8,1.6,4.2c2.3,0.4,3.6-2.4,2.3-4.1
+			C745.1,208.9,743.6,209.3,742.3,209.6 M719.1,229.3c0,1.5,0,2.9,0,4.4c1.1-0.1,2.2-0.2,3.3-0.3c0-1.3,0.1-2.6,0.1-3.8
+			C721.4,229.5,720.3,229.4,719.1,229.3z"/>
+		<path class="st2" d="M863.4,185.6c0.5-1.8-1.1-7,2-5.8c0.5,0.3,1.5,0.8,2,1c3.5,0.2,7,0.2,10.4,0.5c-1.7,2.7-3.3,5.8-6.2,7.3
+			c-2.5,1.2-5.4,1.7-8.1,2.4C863.4,189.3,863.4,187.4,863.4,185.6z"/>
+		<path class="st2" d="M961.2,180.6c11.2-0.6,22.5,0.3,33.7-0.8c7.2-0.3,14.4-0.3,21.6-0.4c0.2,4.1-0.3,8.2,0.8,12.2
+			c0.1,2.1,0.2,4.1,0.3,6.2c-0.1,2-0.4,4.1-0.6,6.1c-3,1.6-5.5,4-8.4,5.7c-2.5,1.1-4.3-1.2-6-2.7c-1,0.4-1.9,0.7-2.8,1.1
+			c-3.9-7.1-12-10.5-19.7-11.7c-12.4-2.2-25.1-1.8-37.6-1.9c-3.1-2-6-4.2-9.4-5.6c-3.7,2.5-7.5,5.3-12,6.2c-2.4-2.2-4.4-4.7-7.2-6.4
+			c-0.7-0.5-1.3-0.9-2-1.4c0.8-1.6,1.6-3.3,2.6-4.8c1.7-1,3.8-0.7,5.7-1.1c0.2,0.9,0.5,1.9,0.7,2.9c0.4,0.1,1.1,0.4,1.5,0.6
+			c0.1-0.9,0.3-2.6,0.4-3.4c2.9-0.5,4.8,1.6,6.5,3.6c0.2-0.9,0.5-2.8,0.7-3.8c2.2,0.6,4,2,5.6,3.6c0-1.4,0-2.8,0.1-4.3
+			c2.6,0.1,5.1,0.1,7.7,0c1,2.3,1.3,4.7,1.2,7.1c2.7,1,5.4,2.1,8.4,2c4.6,0,7.9-4.7,12.7-3.7c-0.1,2.4-0.5,4.9,0,7.3
+			c2,1.6,4.7,1.5,7.1,1.6c-0.5-0.5-1.6-1.4-2.2-1.8c1.1-1.6,2.3-3.3,3.5-4.9C970,185.1,965.1,183.8,961.2,180.6 M992.6,183
+			c0,2.2,2.4,2.2,3.9,1.4c0.1-1,0-1.9-0.2-2.9C994.9,181.8,993.7,182.3,992.6,183 M998.3,190.3c0,1.5,0,3.1,0,4.6
+			c1.1-0.3,2.4-0.4,3.4-1.2c-0.2-1.1-0.6-2.2-0.9-3.3C1000.2,190.4,998.9,190.3,998.3,190.3z"/>
+		<path class="st2" d="M1050.6,180.6c3-0.9,6.1-1.2,9.1-0.1c-2,1.6-3.9,3.4-5.1,5.6c2.6,1.3,5.5-0.8,8.1-1.6
+			c1.8-0.6,0.6-2.9,0.8-4.2c1.3,0.1,2.6,0.2,3.9,0.3c0.4,1.8,0.8,3.7,1.3,5.5c-0.1,2.5-0.9,5.3-3.7,6c-5.2-0.4-10.3-1.9-15.5-1
+			C1049.4,187.6,1049.6,184,1050.6,180.6z"/>
+		<path class="st2" d="M1264.3,180.5c5.1-0.2,10.2-1,15.3-1.1c1.2,2.8,0.8,5.9,0.1,8.8c-1.1-0.8-2.2-1.6-3.3-2.4
+			c-2.6-2.3-5.9-3.9-9.5-3.3c-5.1-0.1-4.3,7.3-8.7,8.7c-3,0.5-6.1,0.3-9,1.3c-1.6-2.3-2.4-5.1-0.8-7.6c1.8,0.3,3.5,0.7,5.4,0.8
+			c0.8-1.5,1-3.2,1.5-4.8C1258.3,180.9,1261.3,180.7,1264.3,180.5 M1257.3,184.8c0.9,1,1.8,2,2.7,2.9c0.8-1,3.4-2,2.1-3.6
+			C1260.5,182.9,1258.8,184.3,1257.3,184.8z"/>
+		<path class="st2" d="M905.4,180.8c1.8-0.1,3.5-0.1,5.3-0.1c-1.2,3.2-4.1,5.1-7,6.7c1.5,0.9,3,1.8,4.6,2.6c0.1,0.5,0.4,1.5,0.5,2
+			c-2.7-0.4-5.4-1-8-1.8c0.5,1.9,1,4,2.9,5c2.1,1.3,4.2,2.6,6.3,4.1c1.8,1.1,3.8,2.1,6,2.2c2.4-0.1,4.4-1.8,6.8-1.9
+			c1.4,0.2,2.2,1.5,3.3,2.2c-2.6,1.2-6,1.4-7.5,4c-1.9,2.3,1.7,5,4,4.1c1.7-1.9,3-4.1,4.4-6.2c0.2,1.9,0.3,3.8,0.3,5.7
+			c0,1.2,0,2.4,0,3.6c-1.2,4.3-6,3.4-9.5,3.8c1,1.2,2.1,2.3,3.1,3.5c-0.4,0.9-0.7,1.9-1.1,2.8c-2.8,2.2-4.2,5.5-4.8,8.9
+			c-3.5,0-5.1-3.1-6.2-5.9c-0.4-0.1-1.2-0.4-1.6-0.5c-0.7,0.7-1.5,1.4-2.2,2.1c1.4,2.3,3.4,4.3,5.1,6.4c1.1,2.6-0.8,5.1-1.7,7.4
+			c0.6,2.1,1.3,4.2,2,6.3c-1.7,2-6.1,4.4-3.1,7.1c3.5,2,8.6,1.1,11-2.2c3-3.3,1.9-8,2.1-12c1.6-1.3,3.1-2.6,4.7-4
+			c0.5,0.4,1.5,1.3,2,1.8c-0.1,11.3,0.2,22.6-0.3,33.9c0.4,2.7,4,0.9,5.8,1.4c10.4-0.2,20.8,0.1,31.2-0.2c7.5-0.6,15.5-0.7,21.9-5.2
+			c3-3.2,4.4-7.4,4.9-11.7c0.5-2.9,0.7-5.8,0.8-8.7c3.5,0,7,0,10.5,0c0.6,0,1.8,0,2.4,0c0,0.6-0.1,1.7-0.2,2.3
+			c-0.1,1-0.2,2.1-0.3,3.1c-1,10.9-0.5,21.9-0.6,32.9c0.2,9.5-0.5,19.2,1.2,28.6c-4.2-0.3-8.4,0-12.6,0.4c-1.7-4.6-0.8-9.9-2.8-14.5
+			c-1.7-4.6-5.7-7.9-10.3-9.4c-8.7-2.9-17.9-2.7-26.9-2.7c-8.5,0-17-0.1-25.5,0c1.4,4.8-0.5,9.6,0.5,14.5c0.8,6.3,0.1,12.7,0,19.1
+			c0.8,10.6,0,21.3,0.5,31.9c0.5,5.6,1.7,11.5,5.4,15.9c2.5,2.4,5.9,3.5,9.1,4.3c2.6,0.6,5.3,0.8,8,0.9c4.1,1.8,6.4,6.5,11.2,6.8
+			c3.5,0.9-0.4-4.4,2-5.7c3.4-0.7,6.8-0.4,10.3-0.3c0,1.1,0.1,2.2,0.2,3.2c0.7,0.6,1.5,1.1,2.2,1.7c0.9,1.2,1.8,2.3,2.8,3.4
+			c0.5-1,0.9-2,1.4-3c-1.5-1.4-2.9-2.8-4.3-4.1c0.3-0.6,0.9-1.8,1.2-2.4c5.4,0.1,10.7-0.8,15.8-2.4c3,1.2,5,4.1,8.2,4.7
+			c4.2,1,8.6,1.8,12.7,3.3c0.1,1.3,0.2,2.7,0.3,4c-1.5-0.1-3.1-0.2-4.6-0.4c-1.2-0.8-2.5-1.7-3.7-2.6c-1.5,3.3-3.2,6.5-5.7,9.1
+			c-0.7,0-2.1-0.1-2.8-0.1c-0.5-1.7-0.7-3.4-1.5-5c-4.6-1.5-7,4.4-11.5,4c-20.6-0.3-41.2,0.3-61.8-0.3c-0.6-1-1.2-1.9-1.8-2.9
+			c-0.5,1-1,2-1.5,3c-2.8,0.1-5.7,0.1-8.5,0.1c0-1.3,0-2.5,0.1-3.8c-1.2-0.1-2.4-0.2-3.6-0.4c0.6,1.4,1.2,2.7,1.8,4.1
+			c-3.5-0.1-6.9,0.2-10.3,0.9c-11.5,0.4-23.1,0.1-34.6,1.1c0-3.9-0.1-7.8-0.1-11.7c6.1-0.2,13.1,0.2,18-4.1
+			c4.4-4.4,5.3-10.9,5.7-16.8c1.7,0.3,3.3,0.7,5,1c0.3-2.2,0.5-4.3,0.8-6.5c-1.5,0.2-3,0.4-4.5,0.6c-0.1-4.6-0.5-9.2,0.3-13.7
+			c0.5-2.9,3.9-3.3,6-4.6c-1.4-2.4-3.6-4-6.2-4.7c0-4.8,0-9.6-0.1-14.5c1.7,0.5,3.6,2,5.3,0.7c3.1-1.5,4.3-5.5,1.5-7.9
+			c-2.6,0.9-4.4,2.9-6,4.9c-1.8-3.2,0.1-6.4,2.3-8.7c-1.1-0.7-2.1-1.4-3.1-2.1c0-3.4,0-6.7,0.1-10.1c1.4-0.2,2.9-0.5,4.3-0.7
+			c-2.2-2-5-4-4.5-7.3c0-17.7-0.1-35.3,0.1-53c0.9-5.8,0.4-11.7-1.1-17.3c-0.1-4.9-0.9-9.9-2.4-14.6c0.8-1.8,1.7-3.6,2.6-5.3
+			c1.9,1.4,3.7,3.1,5.2,4.9c-1.6,2.1-3.2,4.2-4.7,6.4c3.3,1.8,6.7,4.2,10.7,3.7c2.5-0.3,5.3-1,7.2-2.8c-0.2-2.3-1-4.7-3-6
+			c-4-3-8.7-6.6-9.5-11.9c3.7-2,7.9-3.4,10.5-6.9C904.5,181.8,905.1,181.1,905.4,180.8 M890.3,246.1c0,0.7,0,2.1,0,2.8
+			c1.8,0.3,4.8,1.8,5.4-0.9C895.3,245.6,892.2,246,890.3,246.1 M896.1,270.2c-0.7,2,1.3,2.2,2.7,2.6c1-0.8,0.6-2.1,0.6-3.2
+			C898.6,269.8,896.9,270.1,896.1,270.2 M897.1,276.1c-0.3,1.3-0.3,2.6-0.1,3.9c1.1-0.6,3.7-0.1,3.7-1.9
+			C901.1,276,898.6,275.4,897.1,276.1 M918.5,277.3c-0.2,1.2-0.3,2.4-0.4,3.5c1.5,0.5,3.1,0.5,4.7-0.1c-0.3-1.3,0.2-2.9-0.6-4.1
+			C921.1,276.4,919,275.9,918.5,277.3 M975.3,278.9c-0.7,2.3-0.5,4.7,1.5,6.3C977.3,282.8,977.5,280.4,975.3,278.9 M909.3,344.2
+			c-1.7,1.3-4.6,2.7-4,5.3c2.9,2.9,5.6-1.3,7.1-3.6C913.7,344,910.5,342.3,909.3,344.2 M914.1,357.9c-0.8,2-0.4,4,0.3,5.9
+			c1.4-0.3,2.9-0.6,4.3-1C917.9,360.4,917,357.9,914.1,357.9 M919.2,364.1c0.3,0.9,0.7,1.7,1,2.6c1,0,2.1,0,3.2,0
+			c0.2-0.6,0.6-1.7,0.8-2.3c0.6-0.5,1.8-1.4,2.4-1.9C924.1,361.8,921.7,363.5,919.2,364.1 M910.3,367.3c-2.4,0.4-1.3,3.2-1.5,4.9
+			c1.1-0.6,2.5-1,3.4-2.1C912.3,368.9,911.8,367.2,910.3,367.3 M910.2,378c2.4,1.4,5,3.3,7.8,1.9c-0.1-2-0.9-3.8-2.7-4.7
+			C913.6,376.1,911.9,377.1,910.2,378 M983.6,379c0.9,1.9,2.5,2.2,4.5,1.9C987.8,378.4,985.6,377.5,983.6,379 M895.9,380.4
+			c1.7,1.4,5.7,5.3,6.8,1.6C901.9,379.2,898,378.7,895.9,380.4 M942.2,379.2c-0.5,0.2-1.6,0.7-2.1,1c-1.5,2.5,2.2,2.4,3.4,1.2
+			C944.9,380.5,943.8,378.1,942.2,379.2 M955.9,383.1c0.6,2,1.9,3.7,4.2,3.1c-0.8-1.4-1.6-2.8-2.4-4.2
+			C957.3,382.3,956.4,382.8,955.9,383.1 M983.2,382.2c-1.3,1,0,3.7,1.5,2.5C986.1,383.7,984.7,380.9,983.2,382.2z"/>
+		<path class="st2" d="M1070.8,180.6c2.4,0,4.7,0,7.1,0.1c0.4,0.4,1.1,1.2,1.5,1.6c-0.7,2.4-0.1,6.3-3.5,6.7c-1.2-1.9-2.7-3.6-4.4-5
+			C1071.2,182.9,1071,181.8,1070.8,180.6z"/>
+		<path class="st2" d="M1090.1,180.4c2.2,0.1,4.4,0,6.5,0c2.4,0.2,4.8,0.4,7.2,0.7c-2.7,1.3-4.5,3.7-6,6.2c-1.4,0.1-2.9,0.1-4.3,0.2
+			c-3.1,2.5-7.2,2.5-10.7,4.1c-0.3-0.7-0.5-1.4-0.8-2.1C1086.2,187.9,1088.4,184.2,1090.1,180.4z"/>
+		<path class="st2" d="M1227.4,181.9c4.9-2.2,10.6-0.7,15.8,0c-2.7,1.8-6,1.3-8.9,2.3c-3,1.8-5.3,4.5-8.6,5.8
+			c-0.4,1.2-0.7,2.3-1,3.5c-4.1-1.9-8.7-2.2-13.2-2.1c0.1-0.8,0.3-2.4,0.4-3.2c1,0.2,2,0.5,3,0.7c0.9-1.2,1.8-2.5,2.7-3.7
+			c1.9,0.8,3.8,1.7,5.8,2.6C1225,186,1226.4,184.1,1227.4,181.9z"/>
+		<path class="st2" d="M1106.6,183.1c4.1-1.1,6,3.2,9.5,4.2c0.3,0.2,1,0.5,1.4,0.6c0.1,1.6-0.6,3.2-2.4,3.3
+			c-2.9,0.6-5.9,0.6-8.9,0.9c0,1.1,0,2.3,0,3.4c5.1,1.1,10.2,1.9,15.4,2.1c0,3-1.7,5.6-3.5,7.9c-1.5-0.2-2.9-0.4-4.4-0.6
+			c1.1-1.5,2.1-3,3.2-4.5c-1.4-1.1-2.9-2.8-4.9-2.2c-2,1-3.7,2.4-5.4,3.6c-0.8-1.6-1.5-3.2-2.2-4.7c-0.3,0-1-0.1-1.3-0.1
+			c-1.6-0.1-3.2-0.2-4.8,0.1c-0.9,1.9-0.6,4-0.6,6c1-0.8,2-1.7,3-2.5c0.9,1.1,1.8,2.1,2.7,3.2c-0.9,0.8-1.7,1.6-2.6,2.5
+			c-5.2,4.5-12.5,0.2-18.2,3.5c-2.2,2.4-2.7,5.7-3.6,8.6c1.6-0.1,3.2-0.1,4.9-0.1c-1,1.5-1,4.3-3.2,4.2c-2.6,0.5-5-1.4-5.6-3.9
+			c-0.9-3.4-0.7-7.1-0.9-10.6c0-0.9,0-1.8,0-2.7c1.2,1.8,2.4,4.1,5,3.9c1-4.1-5.1-4.9-5.7-8.7c-1-2.2,2.5-2.3,3.7-3.3
+			c0.9-1.1,1.8-2.1,2.8-3.1c5.1,2.1-0.5,7.9,2.9,11c2.6-1.8,4.8-4.3,8-5.1c1.5-0.8,4.3-0.8,4.4-3c-1-1-2.1-1.8-3.1-2.7l-0.7-0.8
+			c2.3-3.7,7.2-2.1,10.8-3.1c1.3-0.7,2.7-1.3,3.8-2.3C1106.5,186.5,1106.5,184.8,1106.6,183.1z"/>
+		<path class="st2" d="M1237,194c2.1-1,4.2-2.2,6.1-3.5c1.3,0.8,2.7,1.5,4,2.3c-1.6,2.1-2.8,6-6.2,5.2
+			C1238.5,198.3,1237.9,195.8,1237,194z"/>
+		<path class="st2" d="M1249.4,196.6c0.8-0.9,1.6-2.6,3.2-2.1c2.3,2,5,5.2,4.4,8.4c-4.3,0.1-8.5,1.5-12.8,1.2
+			c0.2-1.4,0.5-2.8,0.9-4.1C1246.3,198.7,1248.3,198.2,1249.4,196.6z"/>
+		<path class="st2" d="M1127.2,202.4c0.3-0.1,1-0.3,1.4-0.4c1,1.2,1.9,2.3,3,3.4c-1.5,2-4.4,3.7-4.1,6.5c1.2,2.5,3.6,4.2,5.4,6.2
+			c-2.2,3.7-5.7,6.3-9.4,8.5c-0.9-1-1.8-2-2.6-3c-1.6-0.5-3.1-0.8-4.7-1.2c-0.6-1.5-1.2-2.9-1.7-4.4c3.3-3,5.9-6.7,6.1-11.3
+			C1122.8,205.3,1125,203.8,1127.2,202.4z"/>
+		<path class="st2" d="M1234.7,204c-0.5-2.4,2.7-1.2,2.5,0.1c0.1,2.4,0.2,5,1.7,7c0.4-2,1.2-3.9,2.7-5.4c0.9,1.7,1.7,3.5,2.8,5.1
+			c1.6-0.2,3-0.8,4.5-1.3c2.9-2,6.5-0.1,8,2.7c0.5,2.1,0.3,4.4,0.4,6.6c-4.1-1-8.3-2.6-12.5-1.8c-0.3,3.3-1,6.6-1,9.9
+			c0.4,0.4,1.1,1.3,1.5,1.7c1.7-1.9,3-4.2,4.9-5.9c2.4-0.3,4.9-0.1,7.3,0c0,8.8-0.8,17.6-0.5,26.5c-0.4,0.1-1.2,0.3-1.6,0.4
+			c-0.9-1.5-1.8-3-2.7-4.5c-1.2,0.3-2.3,0.5-3.4,0.8c-0.3,0.2-0.9,0.7-1.3,0.9c-0.3,1.6-0.6,3.1-0.8,4.7c-3.3-1.4-6.9-2.5-10.5-1.4
+			c0.2-8,0-15.9,0.1-23.9c1.2-0.9,2.9-1.4,3.9-2.7c0.1-1.3,0-2.5,0-3.8c-1.3-0.3-2.6-0.6-3.9-1c-0.3-4.6-0.9-9.2-2.2-13.7
+			L1234.7,204 M1249.1,230c0.9,2.1,1.9,4.7,4.7,4c-0.1-1.6-0.2-3.1-0.2-4.7C1252,229.2,1250.5,229.4,1249.1,230 M1240.6,234.6
+			c-0.1,2.1-0.1,4.2-0.2,6.4l0.4-0.1c2,3,6.1,1.3,9.1,1.7c-1.5-2.9-3.3-5.6-5.3-8.1C1243.3,233.3,1241.8,234.2,1240.6,234.6z"/>
+		<path class="st2" d="M844,206.4c0.6,0,1.8,0,2.3,0c1.6,3.9,3,7.8,4.2,11.9c0.2,0.6,0.5,1.8,0.6,2.4c0.1,2.9,0.7,5.9,0,8.8
+			c-3.1,3.4-5.3,7.4-7.4,11.4c-2.1-0.2-3.8-1.2-4.6-3.2c1.7-1.6,5-3.4,3.3-6.2c-0.5-1.8-3-0.9-3.3,0.6c-3.1,4.9-8,8.2-13,10.9
+			c-3.2,1.6-5.4,4.7-7.9,7.1c-0.7-0.6-1.4-1.1-2.1-1.7l0.2-1.2c0.9-3.3,2.5-6.4,4.2-9.3c-0.3-2-1-3.9-0.8-6c0.7-2.2,3.5-2.3,5.4-3
+			c3-1.1,6.1,0.2,9,1c2.3-1.8,6.5-3.8,5.2-7.3c-3.9-1.7-8,0.1-11.8,1.2c0-1.6-0.3-3.4,0.6-4.8c1.1-2.5,4-2.9,6.2-3.8
+			c0.9-1.3,1.8-2.6,2.8-3.9c3.3,0.1,5.2,3,7.1,5.3c1-1,3-1.7,2.4-3.5c-0.7-1.3-1.9-2.3-2.9-3.4C843.8,208.6,843.9,207.5,844,206.4z"
+			/>
+		<path class="st2" d="M1103.3,210c2.2,0.4,4.5,0.8,6.7,1.2c-0.4,5.2-5.9,6.8-9.5,9.3c-0.4,1-0.7,2-1,2.9c-0.4,0-1.3,0.1-1.8,0.1
+			c-1.2-1.6-2.4-3.3-3.7-4.9l-0.9-1.1c3.1-2.4,7.1-2.3,10.8-2.6C1103.7,213.4,1103.5,211.7,1103.3,210z"/>
+		<path class="st2" d="M644.1,219c1.3-3.9,5.4-5.6,8.7-7.4c7,8.2,12.8,17.4,17,27.4c-1.7,4.3-4.5,7.9-7,11.7
+			c-3.8,6-10.4,9.4-14.1,15.4c-1.9,8.8-9.2,14.9-12.5,23.2c-0.7-8.3-0.3-16.7-1.8-25c0.1-1.5,0.2-3.1,0.4-4.6
+			c2.9-1.4,8.4-0.5,8.7-4.7c0.2-2,0.4-4.5-1.4-5.8c-3.1,1.3-5.4,4-8.1,5.9c-0.9-1.5-1.8-2.9-2.5-4.4c-1.5-5.8-3.5-11.4-6-16.8
+			c1.5-1.3,3.7-2.1,4.5-4c0.8-1.4,0.8-3.7,2.8-4.1c2.1-0.6,4.4-0.4,6.6-0.4C641.5,223.8,643.1,221.6,644.1,219 M655.4,229.5
+			c-2.3,2-4.3,4.4-6.3,6.6c-0.8,0.7-1.1,1.6-0.9,2.7c2.8-0.1,4.9-2.6,7.8-2.2c1.7-0.3,4.4,0.6,4.9-1.7
+			C662.2,231.6,658.4,228.7,655.4,229.5 M654.3,243.3c-1.1,1.4-0.5,4.2,1.6,3.8c2-0.3,1.7-2.5,2.1-4
+			C656.8,243,655.5,243.1,654.3,243.3z"/>
+		<path class="st2" d="M1003.1,214.6c3.1,0.5,6.7,2.3,7.4,5.7c-0.7,2.8-1.7,5.5-2.1,8.3c-0.5-0.1-1.4-0.4-1.9-0.6
+			C1005.7,223.5,1004.6,219,1003.1,214.6z"/>
+		<path class="st2" d="M1017.7,225.6c0.5-0.1,1.5-0.2,2-0.3c0.2,1.8,0.5,3.6,0.8,5.3c-1.8,0.3-3.6,0.6-5.3,0.8
+			C1015.9,229.5,1016.8,227.6,1017.7,225.6z"/>
+		<path class="st2" d="M1131.9,228.1c1.6-3.3,7.7-3.1,7.6,1C1138,232.7,1133.8,230.1,1131.9,228.1z"/>
+		<path class="st2" d="M1079.5,227.6c2.1-0.5,2.8,2.2,3.2,3.8c-2.1,2-4.3,3.8-6.9,4.8c-0.2-1.4-0.4-2.9-0.5-4.3
+			C1076.7,230.4,1078,228.9,1079.5,227.6z"/>
+		<path class="st2" d="M491.6,233.4c2.1-1.1,2.9-3.5,4.5-5.1c2.6-0.9,2.7,2.5,3,4.2c-1.2-0.1-2.3-0.1-3.5-0.2
+			c1.1,1.8,2.2,3.5,3.4,5.2c-1.7,1.1-4,1.6-5.2,3.4c0.2,1.4,1.2,2.4,1.9,3.6c0.5-0.4,1.6-1.2,2.1-1.6c1.2-0.9,2.6-1.4,4-1.6
+			c-4.6,12.3-6.6,25.5-7.2,38.6c-0.2,19.1,2.5,38.5,10.4,56c0.5,1.1,1,2.2,1.5,3.3c-1.3,0.8-2.7,1.7-4,2.5c0,1.5,0.1,3,0.1,4.6
+			c0.6,0,1.7,0.1,2.2,0.1c1.4-0.7,2.8-1.5,4.2-2.2c3.8,6.9,8.8,13,14.5,18.4c-0.2,0.5-0.5,1.6-0.7,2.1c0.3,1.9,0.5,3.9-0.3,5.8
+			c-0.4-0.2-1.2-0.5-1.6-0.6c-1.1-2.8-4.2-3.9-6.5-1.7c-2.6,2.3-0.5,5.5-0.1,8.2c-0.9,3-2.7,5.6-4.3,8.2c-8.9-4.4-17.2-10-24.7-16.6
+			c0.3-1.7,1.7-3.4,1-5.1c-1.3-1-2.7-1.8-4.1-2.7c-1.1,0.5-2.2,1-3.3,1.5c-2.2-2.5-4.3-5.1-6.4-7.6c1.7-0.6,3.4-1.2,5.1-1.8
+			c-0.6-3.2-1.1-6.3-1.4-9.5c-0.5,0.9-1.1,1.8-1.6,2.7c-1.6,1.7-3.1,3.4-4.7,5.2c-13-19.2-19.3-42.6-18.3-65.8
+			c5.1-1.6,7.8-6.5,12.3-8.9c0.4-0.2,1.2-0.6,1.6-0.9c1.7-3.4,3.1-7,5.7-9.9c1.8-2.3,3.9-4.4,6-6.4c3.7,1.8,0,6.4,3.6,8.3
+			c2.3-2.2,5.5-4.6,4.7-8.2c-0.3-2.4-3.4-2.2-5.1-3.1c-0.7-3.7,2-6.5,3.8-9.4c-3.6-0.9-4.8,3-7.5,4c-0.4-3.7,0-7.7-2.7-10.7
+			c-1.6,1.6-3.1,3.3-4.1,5.3c-1.8,3.5-5.4,5.5-7.2,8.9c-1.5,1.9-3.9,2.7-5.9,4c-1,1.8-0.4,4-0.6,5.9c2-0.6,3.9-1.2,5.9-1.8
+			c-0.1,6-5.8,9.2-9.6,13c0.9-2.1,2-4.2,2.8-6.3c-0.2-2.2-1.7-4.2-1.1-6.5c0.9-3.9,2.5-7.6,2.8-11.6c0.1-0.7,0.4-2.2,0.5-2.9
+			c1.9-1.7,4.2-2.8,6.5-3.8c0.9-2.4,1.4-5,2.9-7.2c1.5-0.3,3.1-0.5,4.6-0.7c0.9-0.9,1.9-1.7,2.8-2.6c2.1,0.1,4.3,0.2,6.4,0.7
+			c1,0.9,1.8,2.1,2.6,3.2C486.3,236.4,489,234.9,491.6,233.4 M492.2,251.7c1.1-0.5,2.5-0.9,3.3-2c0.2-1.5,0.2-3,0.2-4.6
+			C492.5,244.9,490.4,249.4,492.2,251.7 M469.7,273.7c-0.3,1.7-0.3,3.4-0.4,5c1-0.1,1.9-0.2,2.9-0.4c0.5-1.1,1-2.2,1.5-3.2
+			C472.6,274.2,471.3,272.9,469.7,273.7 M481.1,288c1-0.3,1.9-0.7,2.9-1.1c0.6-1.6,0.4-4.3-2-3.1C480.2,284.1,481.5,286.8,481.1,288
+			 M487.3,295.4c1,2.6,1.7,5.5,3.4,7.8c1.5-2.9,1-6.1,0-9.1C489.5,294.5,488.4,294.9,487.3,295.4 M488,303.5c-0.3,0.7-1,2-1.3,2.6
+			c0.8,0.8,1.5,1.6,2.3,2.4c1.1-1.1,2.2-2.3,3.3-3.4C491,304.2,489.6,303.6,488,303.5 M481.9,311c-0.2,1.5,1.1,2.4,1.9,3.4
+			c0.9-2.1,1.3-4.3,1.2-6.6C483.9,308.7,482.4,309.5,481.9,311 M488.1,333.7c0.7,0,2.1,0.2,2.8,0.2c-0.4-1.4-0.7-2.7-1.1-4.1
+			C488.7,330.9,487.2,332,488.1,333.7 M475.3,332.3c-2.3,0.5-1.8,4.4,0.6,4.1C478.2,336.4,477.7,330.9,475.3,332.3 M478.7,336.5
+			c1.4,2.6,2.2,5.5,2.7,8.4c1-1.1,2.8-2.1,2.3-3.9C483.7,338.4,481.9,334.5,478.7,336.5 M465.5,337.2c-1.1,2,3.1,3,3.3,0.8
+			C468.7,336.5,466.4,336.2,465.5,337.2z"/>
+		<path class="st2" d="M748,236.1c2.3-3,6.3-4.1,9.3-6.2c-0.1,3.3,0.6,7.1-1.8,9.9c-2.8,3.5-3.6,8.1-6.5,11.5
+			c-1.6,2-4.1,2.8-6.4,3.8c-0.3-2.2-0.8-4.3-1.3-6.4c-2.2,1.8-4.2,3.8-6,6c1.6,3.8,0.3,7.7-1.4,11.2c-1.8,1.3-3.6,2.4-5.3,3.7
+			c-3.6,2.4-6.7,5.4-9.6,8.6c-0.1-1.7-0.3-3.5-0.3-5.2c0.7-0.1,2-0.4,2.7-0.5c2.3-3.1,5.1-6,6.7-9.6c-1.7,0.9-3,2.2-4.3,3.6
+			c-1.7,0-3.3,0-4.9-0.1c1.8-3,4.1-5.7,7.1-7.6c1.3-0.3,2.7-0.5,4.1-0.7c0.5-2.8,0.9-5.8,3.3-7.6c2.7-2.3,4.8-5.3,7.5-7.6
+			c2.5-0.6,4.9,0.6,7.4,1C748.3,241.3,747.6,238.6,748,236.1z"/>
+		<path class="st2" d="M1447.7,234c1.7,0,3.3,0,5,0c-0.8,1.2-1.5,2.4-2.3,3.5c-1.2,0.1-2.5,0-3.7,0
+			C1447.1,236.3,1447.4,235.1,1447.7,234z"/>
+		<path class="st2" d="M1496,234c6.1,0,12.1,0.1,18.2,0c-1.2,0.5-2.5,1.1-3.6,1.7c0.7,1.1,1.5,2.2,2.3,3.3c-1.3,1.3-2.5,2.6-3.7,4
+			l-0.6,0.7c-0.4,0.3-1.2,0.8-1.5,1.1c-2-2.1-4.1-4.1-6.2-6.2c-0.2-0.4-0.6-1.2-0.9-1.6C1498.7,236.1,1497.3,235.1,1496,234z"/>
+		<path class="st2" d="M1516.8,234c3,0,6.1,0,9.1,0c-0.7,2.3-1.3,4.6-1.8,7c-0.7,0.7-1.3,1.4-1.9,2.1c-0.6,3.6-2.3,7-1.9,10.7
+			c-0.2,0.6-0.5,1.9-0.7,2.5c-1.1,0.3-2.3,0.6-3.4,1c-0.3-1.4-0.5-2.9-0.8-4.3l-0.4,0.2c-2.5,0.9-5,1.8-7.5,2.8
+			c0.2,0.7,0.5,2.1,0.7,2.8c0.9-0.4,1.9-0.8,2.9-1.2c1.3,0.1,2.4,0.7,3.3,1.6c-1.9,1.8-4.3,2.8-6.5,4c-2-0.3-4.3-1.6-5.9,0.2
+			c-0.7,0.1-1.9,0.2-2.6,0.3l0-1.2c0-1.4,0.1-2.7,0-4.1c-1.2-1.4-2.8-2.4-4.3-3.5c-0.3-1-0.6-2-0.9-3c-3.3-0.7-7.2-1.4-8.2-5.1
+			c-0.3-0.5-0.8-1.5-1.1-2.1c1.8-1.2,4.3-3.4,5.9-0.7c0.2,0.6,0.6,1.9,0.8,2.5c2.5,0.8,4.8,2,6.9,3.5c0.3-1.9,0.7-3.8,1.1-5.8
+			c2.8-0.2,4.6,1.9,6.7,3.5c1.8,0,3.5-0.6,5.3-0.9c0.2-1.2,0.5-2.3,0.8-3.5c1.2-1.3,2.3-2.5,3.5-3.8c1.1-0.5,2.2-0.9,3.3-1.3
+			C1518.3,236.7,1517.6,235.4,1516.8,234 M1514.7,250c1.2,0.3,2.4,0.7,3.7,1c-0.1-2.1-0.6-4.2-2.3-5.4
+			C1514.6,246.7,1514.8,248.4,1514.7,250 M1499.1,255.6c2.5-0.7,5-1.4,7.5-2.1c-0.4-0.7-0.7-1.4-1.1-2.2
+			C1502.2,250.3,1500.5,253.2,1499.1,255.6z"/>
+		<path class="st2" d="M1528.3,234c62.8,0.1,125.6,0,188.4,0c0.2,1.8,0.5,3.5,0.8,5.2c1.1-1.6,2.1-3.4,2.9-5.2c4.2,0,8.4,0,12.6,0
+			v82.9c-1.1-0.4-2.2-0.7-3.3-1.1c0.2,3.5,1.7,6.7,3.3,9.7v45c-1.8,0.7-3.5,1.3-5.2,2c1.7,0.4,3.5,0.9,5.2,1.4V469
+			c-2.5,0.2-3,4.4,0,3.5v5.6c-1.5,1.9-2.9,3.9-4,6.1c1.3-0.4,2.6-0.8,4-1.2v10.9c-1.1-1-2.3-1.9-3.4-2.9c-0.6,1.5-1.1,3-1.6,4.4
+			c1.6,0.2,3.3,0.4,5,0.5v7.8c-2-0.8-4.1-1.4-6.1-1.9c1,2.3,2.1,4.6,3.2,6.9c-0.2,1.4-1.2,2.8-0.5,4.2c1.1-0.3,2.3-0.6,3.4-0.9v13.1
+			c-1.4,0.2-2.9,0.4-4.2,0.6c-0.1,2.6,0.1,5.2,0.7,7.8c1-1.8,1.8-3.9,3.5-5.3v14.2c-1.3,0-2.5-0.1-3.7-0.1c0,0.5,0,1.4,0,1.8
+			c1.2,0.5,2.4,1.1,3.7,1.7v14.8c-2.3,0-4.6,0-6.9,0.1c-0.2,1.6-0.3,3.2-0.4,4.9c-1.7,0.7-3.3,1.4-4.9,2.2c-1.1,0.7-2,1.6-3,2.4
+			c2,0.1,4,0.2,6,0.4c0.3,0.6,1,1.9,1.4,2.5c2.4-2.1,4.8-4.4,7.8-5.7v4.3c-1.8,1.2-3.7,2.3-5.6,3.4c-0.3,1.1-0.6,2.2-0.9,3.4
+			c-0.8,0.6-1.7,1.2-2.5,1.8c1,0.9,1.9,1.7,2.9,2.6c-0.8,1.1-1.6,2.2-2.4,3.3c-0.5,1.3-1,2.7-1.4,4c-0.6-0.5-1.9-1.5-2.5-2
+			c-2,1.1-5.3,1.8-5.3,4.6c1.6,3.4,4.2,0.2,5.9-1.3c0.6,1,1.2,2,1.9,3c-1.7,1-3.4,2.2-5.3,2.9c-1.8-0.3-3.4-1-5.1-1.5
+			c0.6,1.5,1.2,3,1.9,4.5c4.5-0.7,9-2,12.2-5.6c1.8,1,3.9,1.6,6,1.5v13.3c-1.5,0.5-3.1,0.8-4.3,1.8c-0.2,1.5-0.2,3-0.2,4.5
+			c-1-0.8-2-1.6-3-2.3c-3.8,1.7-6,5.8-10.3,6.6c-0.4-0.3-1.3-0.9-1.8-1.2c-1.4-0.5-2.8-0.7-4.2-0.8c-1.1,1.9-3,3-5.1,3.5
+			c-0.3-0.9-1-2.6-1.4-3.5c-0.1-2-0.1-3.9-0.1-5.8c0.5,0.5,1.4,1.4,1.8,1.9c0,1.1,0,2.3,0,3.4c1.1-0.4,2.1-0.8,3.2-1.1
+			c0-1.4,0-2.7,0-4.1c1.1-0.5,2.2-1,3.4-1.4c-0.4-0.9-0.8-1.8-1.2-2.7c-1.2,0.4-2.3,0.9-3.4,1.5c-1.3-0.2-2.6-0.5-3.9-0.7
+			c0-1.1,0.1-2.2,0.2-3.2c1.2-0.2,2.5-0.4,3.7-0.6c0.8,0.6,1.6,1.2,2.5,1.9c0.9-0.7,1.8-1.3,2.8-2c2,0.2,3.1-0.7,2.9-2.7
+			c-2-0.5-4-1-6-1.5c0.2-0.4,0.7-1.3,0.9-1.7c0.7-1.4,1.5-2.9,2-4.4c-0.2-2.7-1.6-5-3.3-7c1-1.2,2.1-2.3,3.1-3.5
+			c-3.2-1.2-6.1-3.1-8.7-5.2c0.1-3.8,0-7.5,0-11.2c2.9-0.8,5.4-2.5,6.9-5.2c2.4-0.1,4.8-0.2,7.3-0.3c0-1.3,0-2.6,0-3.9
+			c-2,0.5-4,1.1-6,1.7c0.2-1.8,0.6-3.5,0.6-5.3c-1.9-2.8-5.6-3.5-8.7-3.6c0-4.5,0-8.9,0-13.4c3.7,0.8,2.2,5.4,3.1,8.1
+			c1,0.8,2,1.5,3.1,2.2l1-0.6c1.9-2.1,4.5-0.5,6.9-0.4c1.9,0,3.8-0.6,5.7-0.8c1.1,0,2.3,0,3.5,0c0.2-1.3,0.5-2.7,0.7-4
+			c-0.4-0.1-1.3-0.3-1.7-0.5c-0.5-0.1-1.4-0.4-1.8-0.5c0.7-0.6,1.5-1.2,2.3-1.8c-0.6-1.2-1.1-2.4-1.7-3.6l-0.1,0
+			c-2.7-0.2-5.4-0.2-7.9-1.1c-0.5-1.7-0.7-3.4-0.9-5.1c-1.3-1.5-3.5-2.8-3.4-5c-0.1-3.2,0.4-6.4,0.7-9.6c-1.8,1.3-3.2,3-4.1,5
+			c-0.2,0-0.6,0.1-0.8,0.2c-0.6,0.1-1.7,0.4-2.3,0.6c0.3,3.7,0.8,7.4,1.6,11.1c1.1-0.3,2.2-0.6,3.3-0.9c1.2,1.8,2.2,3.7,3.8,5.1
+			c2.4,1.1,5.1,1.5,7.7,2.1c-0.5,1-0.9,2.1-1.5,3.1c-1.3,0-2.7-0.2-3.9-0.4c-3.4-0.5-4.8-5.1-8.3-4.5c-0.3,0-0.8,0-1.1,0
+			c-0.3-1.1-0.7-2.2-0.9-3.3c-0.7-0.1-2-0.3-2.7-0.4c0.1-39.7,0-79.4,0-119.1c0.1-10-0.3-20.1,0.3-30.1c-0.6-18.9-0.2-37.9-0.2-56.9
+			c1,1,2.1,2,3.2,3c0.7,0.1,1.4,0.1,2.2,0.2c0-0.8,0-1.7,0.1-2.5c-1.6-0.1-3.2-0.2-4.8-0.3c-0.7-3.2-0.9-6.5-0.7-9.7
+			c0.9,0.6,1.9,1.1,2.9,1.7c-0.1-0.4-0.4-1.2-0.5-1.6c-0.6,0-1.8-0.1-2.4-0.1c0-0.7,0-2,0-2.6c0.7,0.3,2,1,2.7,1.3
+			c0.9-2.9,0.2-5.8-2.6-7.2c-0.1-12.9-0.1-25.9,0-38.8c0.9,3.4,1.5,6.8,2.7,10.1c1.1,0.4,2.2,0.6,3.3,0.8c-1.3-3.8-3-7.8-2.2-11.9
+			c-0.7,0.6-1.3,1.2-2,1.8c0.3-2.3,0.7-4.6,1.2-6.8c1.6,0,3.2,0.1,4.7-0.3c-0.2-0.9-0.3-1.8-0.5-2.8c-2.3-0.3-4.5-0.6-6.7-1
+			c0.4,1.3,0.8,2.6,1.3,4c-0.4,0-1.2-0.1-1.5-0.2c-5-0.7-10.1-0.4-15.2-0.5c-57.4-0.1-114.8,0.2-172.2-0.2c1.5-0.4,2.9-0.9,4.3-1.4
+			c-1-0.5-2-1-3-1.4c0.6-0.8,1.2-1.5,1.9-2.2c2.7,0.4,5.4,0.8,8.1,1c-0.2-0.2-0.6-0.5-0.7-0.7c-1.1-1.1-2.1-2.2-3.1-3.3
+			c2.5-1.8,4.7,0.8,6.9,1.8c-0.1-0.8-0.4-2.3-0.5-3c-2.1-1.4-4.9-0.8-7.3-1.2c0.2-1.4,0.5-2.7,0.8-4.1c3.2-1.1,6.8-1.1,9.2,1.8
+			c1.5,3.9-1.2,7.7-1,11.7c3.3-1.5,3.6-5.3,4-8.5c0.4-1.5-0.6-2.8-1.2-4.1c-1.4-1.8-3-3.6-4.4-5.4c-1.1,0.8-2.2,1.6-3.2,2.5
+			c-0.5-1.2-0.9-2.5-1.3-3.7C1528.3,241.2,1528.4,237.4,1528.3,234 M1565,235c-0.2,2.4,0.1,4.9,0.3,7.3c1.4-0.4,2.1-1.8,2-3.3
+			C1567.2,237.3,1567.9,233.9,1565,235 M1689.2,235.2c-0.3,1.1-0.1,2.2,0.7,3.1c1.8,0.2,2.7-0.7,2.5-2.6
+			C1691.4,235,1690.4,234.8,1689.2,235.2 M1706.1,235c0,0.8,0.1,2.3,0.1,3c1.2,0,2.5-0.3,3.8-0.5c0.9,1.7,1.8,3.4,3,4.9
+			c1.7-0.8,1.3-3.4,0.3-4.7C1711.2,236.2,1708.6,235.6,1706.1,235 M1530.2,237.5c-1.5,1.3,0.9,3.8,2.3,2.4
+			C1533.6,238.6,1531.6,236.3,1530.2,237.5 M1676.3,239.1c-0.4,1.8-2.5,3.9-1.1,5.8c1.3-1.4,2.6-2.7,3.9-4.1
+			C1679.4,238.9,1677.5,239.3,1676.3,239.1 M1533.4,244.1c0.6,1.2,1.5,2.2,2.7,3.1c1.3-1.7,1.8-3.8,1.6-5.9
+			C1536.1,241.7,1532.4,241.3,1533.4,244.1 M1726.3,244.4c-1.6,0.4-1.2,4.2,0.8,4C1729.1,247.7,1728.3,244,1726.3,244.4
+			 M1692.7,246.5c-1,3.2,2.3,4.4,4.8,4.8C1697.3,248.6,1695,247.2,1692.7,246.5 M1701.6,246.6c0.3,3.6,1.6,7.6,5.6,8.5
+			C1706,252.2,1706,246.3,1701.6,246.6 M1685.2,249.1c-0.5,2.5,1.4,3.6,3.6,3.7C1688.7,250.7,1688.1,247.1,1685.2,249.1
+			 M1711.8,251.9c1.6,1.3,4.5,4.9,6.3,2.1C1717.2,251.4,1713.9,252,1711.8,251.9 M1606.1,253.9c-0.1,0.8-0.2,2.3-0.3,3.1
+			c0.5,0.2,1.6,0.7,2.1,0.9c0.4-1.4,0.9-2.8,1.3-4.2C1608.5,253.8,1606.9,253.9,1606.1,253.9 M1723.5,254.2c0.8,3-1,5.5-2.6,7.8
+			c-0.9-0.2-1.9-0.4-2.8-0.6c0.3,0.3,1,0.8,1.3,1c2.9,0,5.8,0.1,8.7,0.2c0,2.9,0.8,5.8,3.6,7.2
+			C1729.6,264.4,1726.6,259.2,1723.5,254.2 M1591.4,255.6c0.9,1.1,1.1,4.7,3.1,2.8C1594.7,256.3,1593.6,254.5,1591.4,255.6
+			 M1656.7,257c1.4,3.7,6.7,3.8,9.4,1.5c1.4,0.1,2.8,0.2,4.2,0.4c-1-2.2-3.8-2.3-5.7-3.3C1662.2,256.8,1659.3,256.8,1656.7,257
+			 M1714.6,265.7c0.3-1.4,0.6-2.8,0.9-4.2c-0.7-0.7-1.5-1.5-2.2-2.2C1712,261.6,1712.7,264,1714.6,265.7 M1721.4,266.8
+			c1.3,4.7,2.5,9.3,3.6,14.1c-0.6,2.5,1.3,4.4,2.7,6.2c0.5-2.1,0.4-4.2,0.3-6.3l-1,0c0.5-2.5-0.6-4.8-1.4-7.1
+			c-0.8-2.1,1.2-4.5,0.3-6.5C1724.4,266.9,1722.9,266.9,1721.4,266.8 M1729.2,291.2c-1.3,1.2-0.3,3.2-0.1,4.7
+			C1732.9,297.9,1731.4,289,1729.2,291.2 M1705.5,296.2c1.3,2.5,4.9,2.9,7.4,2.8c0.6-1.5,0-3-0.6-4.4
+			C1710.1,295.2,1707.8,295.7,1705.5,296.2 M1704.2,306.3c-1.5,0.9,0,3.7,1.5,2.4C1707.1,307.8,1705.7,305.1,1704.2,306.3
+			 M1720.2,316.2c-1.4,1,0,3.6,1.6,2.4C1723.2,317.7,1721.7,315,1720.2,316.2 M1709.5,320.2c2,0.8,4,1.2,6.2,1.5
+			c0-1.4-0.1-2.8-0.2-4.2C1713.4,318.3,1711.4,319.2,1709.5,320.2 M1720.7,322.1c-0.2,2.8-0.5,5.7,0,8.5l1.7,0
+			C1722.8,327.8,1723.4,323.9,1720.7,322.1 M1713.2,332.1c-1.9,0.5-0.9,3.3,0.9,2.9C1716.2,334.6,1715.1,331.4,1713.2,332.1
+			 M1725.4,335.2c-0.8,0.6-1.5,1.2-2.3,1.8c-1.4-0.3-2.8-0.6-4.2-0.8c0,2.1,3.2,2,4.6,3.2c2.4-0.2,5.6,1.7,7.5-0.5
+			c0-0.4,0-1.2,0-1.7C1729.7,335.4,1727.4,335.3,1725.4,335.2 M1715.8,340c1,1.4,3.4,5.2,4.6,1.9
+			C1720.4,339.2,1717.6,339.8,1715.8,340 M1709.1,341c-2.3,2,1,4.2,3.1,3.2C1712.9,342.3,1710.9,340.6,1709.1,341 M1717,344.4
+			c0.2,1.8,0.7,3.5,2.8,3.7c0-1.3-0.1-2.6-0.1-3.9C1719,344.2,1717.7,344.3,1717,344.4 M1723.4,352.3c-1,1-0.6,3.1,0.9,3.4
+			C1726.4,355.5,1725.3,351.3,1723.4,352.3 M1718.3,355.3c-1.2,1.6,2.3,4.4,3.7,2.5C1722.2,356,1719.7,353.2,1718.3,355.3
+			 M1707,364.9c0.3,1,0.8,1.9,1.2,2.9c1.6,0.5,3.5-1.1,2.6-2.8C1709.7,364,1708.2,364.6,1707,364.9 M1717.6,365.1
+			c0.1,2.3,0.2,4.5,0.5,6.8c0.7,0,2.1-0.1,2.8-0.2C1720.6,369.1,1719.2,367,1717.6,365.1 M1727.1,365.1c-1.5,3,1.9,3.1,3.9,2.9
+			C1730.7,366,1729.5,363.6,1727.1,365.1 M1713.1,374.3c0.2,0.9,0.5,1.9,0.8,2.8c1.1,0.2,2.2,0.3,3.4,0.6c1.6,2.3,2.7,4.8,4.5,7
+			c2.4-0.6,1.6-4.4,2.1-6.3c-1.1,0.5-2.1,1-3.1,1.5c-0.9-1.6-1.7-3.2-2.9-4.6C1716.5,374.3,1714.7,374.5,1713.1,374.3 M1708.3,420.1
+			c-1.4,0.9-0.1,3.7,1.5,2.5C1711.2,421.7,1709.8,418.9,1708.3,420.1 M1729.3,427.2c-0.6,1.6-0.1,2.2,1.6,1.7
+			C1731.4,427.3,1730.9,426.7,1729.3,427.2 M1715.8,446.2c0.7,2.4,2.8,4.9,5.6,4C1721.5,447.2,1717.8,447.3,1715.8,446.2
+			 M1714.9,457c1.7,0.8,2.8-1.4,4.1-2.2c1,0.3,2,0.6,3,0.9c-0.5-2.9-3.8-2.8-6.1-2.8C1714,453.4,1714.7,455.7,1714.9,457
+			 M1704.1,463c2-0.2,3.6-1.6,5.1-2.9C1706.7,459.4,1702,459.1,1704.1,463 M1716.9,473c1.2,0.3,2.5,0.6,3.9,0.8
+			c1.8-2.4-1.7-3.2-3.1-4.4C1717.4,470.6,1717.1,471.8,1716.9,473 M1724.3,474.1c0.1,3.6-1.4,7.1-1.1,10.7c0.1,1.3,2.3,3.4,2.9,1.2
+			c0.5-4.3,1.4-8.9-0.3-13.1C1725.4,473.3,1724.7,473.9,1724.3,474.1 M1706.2,478.1c-1.2,1.5,1.4,3,2.4,1.6
+			C1709.8,478.3,1707.2,476.8,1706.2,478.1 M1720.2,493.3c0.5,1.7,1.2,3.2,2,4.7c0.1,2,0.2,4.1,1.2,6c0.7-3.3,1.7-6.9,0.7-10.1
+			C1722.8,493.4,1721.5,493.5,1720.2,493.3 M1708.3,502.3c0.1,2.3,0.3,4.6,1.1,6.7c3.3-1.1,1.3-4.3,0.9-6.7
+			C1709.8,502.4,1708.8,502.3,1708.3,502.3 M1717.8,514.1c0,0.6,0,1.8,0,2.4c-0.8,0.1-2.4,0.3-3.2,0.4c0.3,1.2-0.1,4.8,2,3.6
+			C1719,519.2,1718.3,516.2,1717.8,514.1 M1725.2,517.7c0.7,1.5,2.9,6.3,3.9,2.3C1730.1,517.3,1727.2,516.1,1725.2,517.7
+			 M1721.8,519.2c-0.5,1.8-1.3,3.4-2.4,4.9c0.6,0.8,1.3,1.6,2,2.5c2.3,0,4.9,0.3,6.5-1.7c-1.4-0.5-2.7-1-4.1-1.6
+			c0.2-1,0.6-2.9,0.8-3.8C1723.7,519.4,1722.8,519.3,1721.8,519.2 M1717.3,531.2c0,0.7,0,2,0.1,2.7c2.9-0.3,5.7-1.6,6.7-4.6
+			C1721.6,529.2,1719.1,529.3,1717.3,531.2 M1712.8,548.9c-0.3,1.4-0.5,2.8-0.7,4.2c2.3,0,3.9-1.4,4-3.8
+			C1715.3,549.2,1713.6,549,1712.8,548.9 M1719.7,549.6c-1.9,2,1.6,3.7,2.6,5.3c-0.4,1.1-0.7,2.2-1.1,3.3c1.9,0.8,3.8,0.4,5.6-0.6
+			c-1.3-1.5-3.2-2.8-3.6-4.8c1.6-1.2,3.6-1.1,5.5-1.3c0-0.5,0-1.6,0-2.1C1725.7,549.4,1722.7,549.2,1719.7,549.6 M1714.7,553.8
+			c0,0.6,0.1,1.7,0.1,2.2c0,1.4,3.3,1.4,2.8-0.1C1718.2,554.1,1716.1,553.4,1714.7,553.8 M1710.5,568.5c-1.9,1.6-3.4,3.5-3.3,6.1
+			c0.7,0.1,2.2,0.2,2.9,0.2c0.6-1.1,1.2-2.2,1.8-3.3c1.3,0,2.7-0.1,4-0.1c-1.2-1-2.5-1.9-3.7-2.9
+			C1711.8,568.6,1710.9,568.6,1710.5,568.5 M1720.1,577.1c-1.6,0.4-3.6,0.5-4.1,2.4c-0.5,0.2-1.5,0.4-2,0.6c-2,0.8-3.4-0.9-3.9-2.6
+			c-0.5,0-1.6,0-2.1,0c0.7,0.9,1.4,1.7,2.2,2.6c0.3,0.8,0.8,1.6,1.1,2.4c0.7-0.7,1.6-1.1,2.5-1.5c0.8,1.2,1.6,2.5,2.4,3.8
+			c0.9,0.5,1.8,1.1,2.8,1.6c3.3-1.6,0.6-6,0.9-8.9c0.8,0.2,2.4,0.6,3.2,0.8c0.8-0.9,1.7-1.7,2.6-2.6c-0.7-0.9-1.5-1.8-2.2-2.7
+			C1722.1,574.1,1721,575.5,1720.1,577.1 M1727.2,598c-0.8,2.9-0.7,6-0.3,9c-1.5,1.5-3.7,1.9-5.6,2.7c0.1,1.1,0.2,2.1,0.3,3.2
+			c3.4-1,4.9-4.6,7.8-6.5c0.4-1.7,1-3.3,1.2-5C1729.7,600,1728.4,599,1727.2,598 M1720.6,602.5c-1.8,1.6-4.8,3.1-4.1,6
+			c2.9,0.9,4.8-1.7,6.2-3.7C1723.4,603.5,1721.9,601.5,1720.6,602.5 M1716.8,616.2c2.9,0.5,4-1.9,3.4-4.5
+			C1718.2,612.6,1717.3,614.4,1716.8,616.2z"/>
+		<path class="st2" d="M1155.4,241.6c-0.2-2.5,0.2-5,0.2-7.5c7,7.8,13.8,15.9,20.6,24c-0.1,0.5-0.3,1.5-0.4,2
+			c-2.8-0.6-5.4-1.9-8-3.2c-4.7,0.8-9.5,1.2-14.2,2.2c-1.2,0.3-2.5,0.6-3.7,0.9c-0.5,0.1-1.6,0.5-2.1,0.6c0.1,2.8,2.6,3.4,4.9,4
+			c-0.2,1.1-0.3,2.1-0.4,3.2c2.5-0.1,5.2,0.3,7.6-0.8c-0.1-1.6-0.4-3.1-0.6-4.7c1.3,0.4,2.7,0.7,4,1.3c0.5,1.6,0.8,3.3,1.2,4.9
+			c0.2,0.2,0.7,0.5,0.9,0.7c1.6,0.1,3.2,0.1,4.9,0.1c0.3-0.2,0.9-0.6,1.2-0.8c0.8-1.5,0.8-3.6,2.3-4.5c1.4,0.6,2.8,1.3,4.2,2
+			c1-0.8,2.1-1.6,3.1-2.4c0.6,0.8,1.2,1.5,1.8,2.2c0.1,2.5,0.5,5.1,1.5,7.5c1.5-0.1,3.1-0.2,4.6-0.2c5,5.6,9.9,11.4,14.6,17.2
+			c-2.4,0-4.9,0.2-7.3,0.3c0.7-1.3,1.3-2.6,2.1-3.9c-0.4-0.5-1.2-1.6-1.6-2.2c-3.2,1.7-5.5,5.3-9.5,5.1c-0.1-2.4,0.6-4.6,2.6-6
+			c1-0.9,2-1.8,3-2.7c-2-1.6-4.2-2.8-6.8-2.8c-0.9,1.7-1.1,4.4-3.5,4.6c-3,0.8-4.4-3.7-7.5-3.3c-3.1,0-6.5,1.8-9.4-0.1
+			c-2.7-1-3.7-3.9-4.9-6.2c-0.6-1.9-2.9-1.5-4.4-2.1c-3.7-2.5-10.4-1.2-10.6,4c1.8-0.2,3.6-0.5,5.4-0.8c-1.2,2.9-2.8,5.7-5.4,7.6
+			c-4.2-4.6-8.1-9.5-12.3-14.1c1.1-1,2.3-1.9,3.4-2.9c0.9,1.1,1.9,2.2,2.8,3.3c0.3,0.3,0.9,1,1.2,1.3c1.4,0.1,2.9,0.2,4.4-0.2
+			c0.5-1.4-0.6-2.4-1.3-3.4c-1.8-1.8-4.4-3.5-4.6-6.3c-0.5-2.6,0.8-5.1,1.8-7.5c-1-1.5-2-2.9-3-4.3c0.6-1.1,1.2-2.2,1.9-3.4
+			c1.6,0.5,3.1,1,4.7,1.6c2-1,3.9-2.5,6.2-2.7c3.5,1.2,4.7,5.1,4.8,8.5c1.8,0,3.9,0.6,5.6-0.4c1.1-1.3,2.3-4,0.3-5
+			C1159.6,244.7,1157.1,243.6,1155.4,241.6 M1149.3,250.3c-1.2,1.7,0.5,4.1,2.5,3.5C1153,251.9,1151.7,248.5,1149.3,250.3z"/>
+		<path class="st2" d="M1087,237c2-1.6,4.2-1.5,6.4-0.2c0.2,14,1.3,28,1.2,42c-0.6,8.1,0.8,16.6-3.1,24.1c-0.8,0.9-1.6,1.8-2.4,2.6
+			c-2.3-1.4-5.7-1.2-5.8,2.1c1.8,1.8,4.3,2.5,6.7,3.1l0.2-0.2c1.3-1.4,2.1-3.7,4.2-4.1c0.1,2.6,0.2,5.2,0.3,7.8
+			c-1.8,1.8-4,3-6.4,3.8c0.7,1.5,1.4,3,2.1,4.4c-1.9,2.4-4.4,4.1-6.6,6.1c-0.4,4,3.8,6.8,5.3,10.3c2.5-0.2,5.1-0.8,6.7-2.9
+			c0,8.1,0.4,16.2,1,24.3c0.4,5.2,1.7,10.7,5.4,14.7c4.8,4.1,11.6,3.8,17.5,4.8c-0.1,3.3-0.2,6.6-0.2,9.9c-1.5,0.2-2.9,0.5-4.2,1.3
+			c-8,0-16-0.6-24-0.4c-4.7,0.2-9.3-0.8-13.9-0.2c-9.2,0.9-18.4,0-27.5,1.3c-0.1-4-0.1-8-0.1-11.9c0.5,0,1.5-0.1,2-0.2
+			c0.8,0.2,2.4,0.5,3.1,0.7c0,1.5,0,3,0,4.5c0.9,0.1,1.8,0.1,2.8,0.1c0.6-2,1.2-4,1.8-5.9c1.5-0.4,2.9-0.8,4.4-1.2
+			c1.3,1.4,2.6,2.8,3.9,4.3c2.4-1.9,2.2-4.8,1.7-7.6l0.2-0.3c0.5-0.9,0.9-1.7,1.4-2.6c1.8-0.9,3.3-2.1,4.8-3.5
+			c0.9,0.2,1.8,0.3,2.7,0.5c1.7-1.8,3.1-3.9,3.6-6.4c-2.5,0.9-5.1,1.8-7.7,2.5c-0.4-6.2,0.6-12.3,1.3-18.4c0.2-1.8,1.2-3.3,1.9-4.9
+			c-0.8-0.1-2.4-0.2-3.2-0.3c0.5-10.9,0.3-21.9,0.2-32.8c0.1-17.2,0-34.5,0-51.7c0.4-1.9,0.8-3.7,1.3-5.6c4.8-0.5,9.7-0.9,14.5-1.6
+			c0.3-1.6,0.4-3.2,0.6-4.9c-2.2-0.4-4.5-1.5-6.6-0.3c-3.1,1.3-6.3,2-9.6,1.8c0.2-2.2,0.3-4.3,0.9-6.4
+			C1079,237.7,1083.6,239.5,1087,237 M1085.4,258.6c1.2,0.1,2.4,0.1,3.6,0.2c0.4-2.3,1.2-5.8-2-6.3
+			C1083.6,252.7,1084.9,256.4,1085.4,258.6 M1089.1,266.1c-2.4,1.5,0.5,5.8,2.3,3.2C1093,267.9,1090.8,265.2,1089.1,266.1
+			 M1076.9,272.1c2.9,0.3,5.7-2.1,5.1-5.1C1078.8,265.6,1077,269.6,1076.9,272.1 M1088.2,276.3c-0.7,1.8-0.8,3.6,0,5.4
+			c0.7,0,2.1,0,2.8,0c0.4-1.8,0.6-3.6,0.8-5.4C1090.6,276.3,1089.3,276.3,1088.2,276.3 M1079.7,291.8c-2.5,2.1-5.3,4.4-4.6,8.1
+			c4-0.5,7.9-1.1,11.9-1.6c1.1-2.6,2.2-5.2,2.8-8C1086.4,290.5,1083.1,291.6,1079.7,291.8 M1082.1,352.1c0.2,1.3-0.1,2.8,1,3.8
+			c2.1,0.2,1.5-2,1.7-3.4C1084.1,352.4,1082.7,352.2,1082.1,352.1 M1075.6,355.6c-0.1,1.8-0.2,3.6-0.3,5.4c1-0.2,2-0.5,3-0.8
+			c0.9-1.6-0.1-3.4-0.6-5C1077.2,355.3,1076.1,355.5,1075.6,355.6 M1090.1,364.2c-1.7,1.8-2.9,4.1-3.1,6.7c1.4-0.8,2.9-1.5,4.3-2.3
+			c0.8,0.5,1.6,0.9,2.4,1.3c0.9-1.1,1.2-2.7,0.5-4C1092.9,365.2,1091.5,364.8,1090.1,364.2 M1073.5,373.4c0,1.8-0.1,3.5-0.1,5.3
+			c0.8,0.3,2.5,0.8,3.4,1c-0.3-2.2-0.7-4.3-1.2-6.3C1075.1,373.4,1074,373.4,1073.5,373.4 M1088.5,375.5c-0.8,1.1-1.6,2.3-2.3,3.4
+			c-2.6-0.8-5.2-1.6-7.8-1.6c0.2,1.5-0.4,3.6,1.5,4.3c2,0.3,2.8-1.3,3.4-2.8c2.6,1,5.1,0.1,7.3-1.4c0-0.5,0-1.5,0-2
+			C1090.1,375.4,1089,375.4,1088.5,375.5 M1099.2,376.1c-0.8,0.9-2.6,2.7-0.8,3.6c2,1.2,4.9,3.5,7,1.4c0.1-2.1-1.9-2.4-3.4-3.1
+			C1101.2,377.3,1100.5,376.2,1099.2,376.1 M1092,379c-0.7,1.7-0.2,3.5,1.8,3.8C1095.6,381.5,1094.6,377.6,1092,379z"/>
+		<path class="st2" d="M1112.5,242.9c0.8-2.5,5-2.8,5.8-0.2c1.1,1.9-1.5,3-2.4,4.3C1114.7,245.6,1113.6,244.3,1112.5,242.9z"/>
+		<path class="st2" d="M1118.7,250.3c1.9-3.8,4.9-8.2,9.9-6.8c-0.6,2.1-1.6,4.5,0,6.5c0.8,1.8,1.7,3.6,2.5,5.4
+			c-2.5,0.1-5,0.2-7.5,0.4C1122,254,1120.3,252.2,1118.7,250.3z"/>
+		<path class="st2" d="M836,245c1.1-0.2,2.2-0.4,3.3-0.7c0.1,1.4,0.3,3-0.9,4c-2.2,2.4-3,5.7-4.6,8.4c-1.2,2.1-3.7,2-5.8,2.3
+			c1-3.1,1.9-6.2,3.1-9.2C832.6,248.1,834.4,246.7,836,245z"/>
+		<path class="st2" d="M658.5,262.4c4.8-5.5,7.5-12.9,13.7-17.2c0.5,1.1,0.9,2.2,1.3,3.3c4.4,14.4,5.9,29.6,4.8,44.6
+			c-0.7,0.1-2,0.3-2.7,0.3c0,2.2,0.2,4.5-0.1,6.7c-2.7,4-6.8,6.6-10.2,10c-3.8,3.3-6.7,7.6-11,10.4c-4.6,3.1-8.6,7.2-11.8,11.8
+			c-0.9-1.2-1.7-2.4-2.6-3.7c1.5-1.2,3-2.2,4.4-3.4c1.9-3,4.1-6.4,2.3-10c0.5-1.6,1.1-3.2,1.2-4.9c-2.4-2.2-3.7,1.6-5.3,2.9
+			c-2.9,0.2-5.8,0.7-8.7,1.2c0.4-2.6,1.1-5.1,2.3-7.4c-0.3-2.7-0.6-5.5-0.2-8.2c0.3-3.1,2.6-5.5,4.1-8.1c2-2.9,3.2-6.1,4.7-9.2
+			C648.3,274.6,654,268.8,658.5,262.4 M670.8,271.9c0.6,0.3,1.7,0.9,2.3,1.2c1.5,0.8,3-2,1.7-2.8
+			C673.4,267.9,671.6,270.6,670.8,271.9 M668.3,280.9c0.1,1.6,0.1,3.1,0.2,4.7c1.4,0,2.8,0,4.2,0c-0.2-1.6,0.6-4.3-1.8-4.7
+			C670.3,281,668.9,281,668.3,280.9 M657.2,286.6c0.8,0.7,1.7,1.4,2.5,2.1c0.6-1,1.3-2,2-3.1c-0.4-0.9-0.8-1.7-1.2-2.5
+			C658.3,283.2,657.3,284.6,657.2,286.6 M648.1,287c-2.4,1.3,0,5.4,2.2,3.3C652.8,289,650.3,285.1,648.1,287 M645.2,296.2
+			c-0.8,2.2-1.9,5.2,0.6,6.8c1.3-1.7,4.2-2.9,3.6-5.5C648.6,296.1,646.6,296.5,645.2,296.2 M648,306.6c1.5,1.5,3.5,1.8,5.6,2
+			c0.6,0.7,1.3,1.5,1.9,2.2c2.8-0.5,6.5-2.7,4.7-6c-1.8-0.4-3.2,1.4-4.7,2c0-0.6-0.1-1.8-0.2-2.4c2.5-2.1,4.9-4.7,5.5-8.1
+			C655.4,297.6,650.2,301.4,648,306.6 M638.1,309.9c1.7-0.4,3.6-0.6,5-1.9c0.9-1.6,1.4-3.6,1.1-5.4
+			C640.3,302.2,638.9,306.9,638.1,309.9z"/>
+		<path class="st2" d="M756.5,248.7c0.3,0,0.9,0,1.2,0c0.1,28.4,0,56.9,0.1,85.3c0.1,8.6-0.4,17.3,0.7,25.8c0,0.6,0,1.8,0,2.4
+			c-1.5,0.1-2.9,0.2-4.3,0.3c0.4,2.8,1.1,5.6,0.9,8.4c-1.5,3.1-3.2,6.1-5.3,8.9c-3,1.4-5.1-1.9-7.6-2.9c-1.4,0.2-2.7,0.5-4,0.8
+			c1.1,2.1,2.3,4.2,3.2,6.4c-0.3,1.1-1,1.6-2,1.5c-2.8-0.1-5.1-1.9-7.4-3.3c-0.3-2.9-4.1-6.4-6.4-3.2c0.8,5.3,5.8,8,10.2,10
+			l-0.9,0.7c-5.6,0.3-11.2-0.1-16.8,0.4c0.9-0.4,1.8-0.7,2.6-1.1c-0.7-1.5-1.3-3.1-2-4.6c1.2,0.6,2.5,1.1,3.8,1.7
+			c-0.5-2.2-2.4-3.6-3.8-5.3c0-0.6-0.1-1.7-0.2-2.3c-4.1-0.1-4.1,5.7-3.2,8.6c0.1,0.6,0.4,1.7,0.5,2.2c-1.1-0.1-2.2-0.1-3.2-0.1
+			c-0.3-1.4-0.5-2.9-0.8-4.3c-0.3-0.1-1.1-0.3-1.4-0.4L709,384c-0.3-0.5-1-1.5-1.3-2.1c0.8-1.5,1.6-3,2.5-4.5c0.8-1,1.8-1.8,2.6-2.7
+			l0.8-1c0.8,0,2.2-0.1,3-0.2c0.5-2.9,0.8-5.8,1.1-8.7c1.4-0.2,2.9-0.3,4.3-0.5c-0.4-2.2-1.8-3.9-3.4-5.3c0-1.5,0-3.1,0-4.6
+			c0-16.8,0-33.7,0-50.5c-0.2-2.2,0.8-4.1,2.1-5.8c4.3-3.5,8.1-7.5,11.9-11.6c1.4-1.7,3.5-3.6,2.8-6.1c-2.4-1.5-4.2,1.4-6,2.6
+			c-0.7-1.1-2-2.3-1-3.7c2.2-4,4.8-9.1,10-9.4c0.1,2,0.2,4,0.2,6c2.9,1.4,5.6,3.7,9,3.7c2.7-0.3,2.9-3.2,3.3-5.2
+			c-1.8,0-3.6,0.3-5.3-0.2c-1.7-1-3.1-2.6-3.9-4.4c0.1-1.3,1-2.2,1.6-3.3c2.3,0.9,4.6,2.7,7.2,1.9c1.5-1.1,2.4-2.7,3.6-4.1
+			c-2.2-0.2-5.7,1.4-6.6-1.4c0.8-3.1,3.9-4.7,5.8-7.1C755.3,254,755.8,251.2,756.5,248.7 M742.1,296.1c-1.7,1.5-4.5,3.1-3.9,5.8
+			c-0.1,1.6,2.4,2.1,3.1,0.6c1.5-1.9,5.1-5.3,1.7-7.1L742.1,296.1 M726.2,362.7c1.6,1.1,3.6,0.9,5.4,0.9c-0.2-1.1,0-2.5-1-3.2
+			C728.9,360,725.7,360.1,726.2,362.7 M728.9,370.7c-0.2,2.5,0.1,5.6,2.9,6.4C731.4,374.8,731.2,372,728.9,370.7z"/>
+		<path class="st2" d="M811.7,253c0.8-0.7,1.7-1.4,2.5-2.1c1.5,3.4,0.9,6.9-0.7,10.1c1.2,2.4,2,4.9,1.7,7.6c-2.5,0.3-5,0.7-7.5,1.2
+			C809.9,264.5,811.3,258.8,811.7,253z"/>
+		<path class="st2" d="M845.6,254.4c1.1-1.8,3.3-2,5.1-2.7c-1.7,8.4-5.6,16.4-10.9,23.2c-2-2.1-2-5.4-0.4-7.8
+			C841.9,263.1,842.4,258.1,845.6,254.4z"/>
+		<path class="st2" d="M1251.1,251.9c1.1,0.9,2.6,1.6,3.2,3c0.6,2.4-0.6,4.7-2.1,6.5c-2.2,1.1-3-2.6-4.2-3.9
+			c-0.4-0.1-1.2-0.3-1.7-0.4c-0.1,0.8-0.2,2.4-0.3,3.2c-2.2,0.3-4.3-0.2-6.1-1.3c0.9-0.8,1.7-1.5,2.6-2.2c-0.7-1.1-1.5-2.3-2.2-3.4
+			c2.9,0.2,5,2.8,8.1,2.4C1249.4,254.5,1250.3,253.2,1251.1,251.9z"/>
+		<path class="st2" d="M1450.2,261.3c2.3-1.8,2.7-4.6,3.7-7.1c1.7-0.2,2.1,1.9,3.2,2.8c1,1.5,2.7,2,4.1,2.9
+			C1458.8,263.9,1453.5,264.2,1450.2,261.3z"/>
+		<path class="st2" d="M1403.2,259.9c0.2-1.1,0.4-2.2,0.6-3.2c0.5,0.5,1.3,1.5,1.8,2c1.2,0.2,2.5,0.4,3.8,0.6
+			c0.1,0.1,0.2,0.4,0.3,0.6c0.3,0.6,0.9,1.7,1.2,2.3c-4.2,0.7-8.4,1.4-12.7,1.2C1399.8,261.9,1401.4,260.8,1403.2,259.9z"/>
+		<path class="st2" d="M825.6,261.6c1.3-0.7,2.5,0.9,3.1,1.8c-0.7,5-5,8.3-8.9,10.8c-0.4,2.5,0.7,5.1,0.7,7.6
+			c-0.8,1.4-2.3,2.2-3.4,3.4c-2.2,1.9-3.1,4.8-5.1,6.9c-1.5,1.2-3.4,1.9-4.8,3.2c-1.3,1.6-2.4,3.4-3.6,5.1c-1.2-1-2.3-2-3.5-3
+			c-0.8,1.4-1.6,2.8-2.4,4.2c-6.7,1.3-13.4,2.5-20.2,1.6c1.5-1.9,3.1-3.7,4.8-5.5c-2.3-2.8-5.1-0.6-7.3,1c-0.2-2.4-0.3-4.7-0.6-7
+			c2.4-0.2,4.8-0.6,7.2-1c0.7,0.9,1.3,1.8,2,2.6c1.5-1.1,2.9-2.3,4.5-3.2c2.1,0.4,4,1.5,5.9,2.5c3-0.9,7.2-0.8,8.2-4.5
+			c1.4-2.2,4.1-2.5,6.4-3c0.3-1.4,0.7-2.7,0.7-4.1c-1.3-1-2.8-1.7-4.3-2.4c-1.5,1.4-3,2.8-4.5,4.1c-0.6-0.1-1.7-0.2-2.3-0.3
+			c2.7-3.1,5.8-5.9,7.7-9.5c0.3-0.5,0.8-1.5,1-2c1.5,2.4,2.8,4.8,3.8,7.5c3.2-0.7,4.8-3.4,5.4-6.5c1.3-1.5,3-2.5,4.7-3.6
+			C822.2,265.8,822.8,262.6,825.6,261.6z"/>
+		<path class="st2" d="M1244.5,261.5c1.3,0.5,2.5,1.1,3.8,1.6c-0.1,1.6-0.3,3.3-0.5,4.9c-1.7,1.2-3.4,2.4-5,3.7
+			c1.9,1.5,3.5,4,6.3,3.8c1.7-1.5,1.4-4,1.6-6c1.9,1.2,3.7,2.4,5.6,3.6c-0.1,2.3-0.1,4.6,0,7c-0.5,0.2-1.5,0.5-2,0.6
+			c-0.4-1.1-0.8-2.2-1.1-3.2c-2.9-0.1-5.9,0-8.8-0.3c-1-1.4-1.6-3.1-2.3-4.6c-1.5,0.1-3,0.1-4.5,0.2c-0.2-0.2-0.8-0.7-1-0.9
+			c0-2.6,0-5.3,0-7.9c0.6-0.3,1.8-0.9,2.4-1.1c0.8,0.4,1.7,0.8,2.6,1.2c0,1.3,0,2.6,0,3.8c0.9-0.2,1.8-0.5,2.7-0.8
+			C1244.6,265.2,1244.5,263.4,1244.5,261.5z"/>
+		<path class="st2" d="M1156.5,278.9c3.4,1.4,6.7,3.2,10.2,4.7c0.3,1,0.7,2,1.1,3.1c3.4,1.9,6.4-0.6,9.3-2.2
+			c1.4,0.6,2.7,1.6,3.9,2.5c1.7,1.4,3.9,1.8,6,2.2c-0.2,1.7-0.5,3.5-0.3,5.2c2.6,0.3,5.6-1.8,7.9,0.1c2,1.8,0.7,4.6-0.2,6.7
+			c-4-0.2-6.2,3.1-8.5,5.8c-1-0.3-1.9-0.7-2.9-1c-0.7,0.2-2,0.5-2.7,0.6c0.3-1.4,0.2-2.9,0.9-4.2c1.9-1.3,4.2-1.7,6.2-2.8
+			c0.1-1,0.2-2,0.3-3c-0.6-0.2-1.8-0.5-2.5-0.7c-1.8-0.2-3.6-0.3-5.4-0.3c-1.7,2.5-3.2,5.2-5.7,7.1c-2.2-1.7-5-1.1-7.6-1
+			c-0.6-4.3-1.2-8.9-3.6-12.6c-2.1-2.7-5-4.8-7.5-7C1155.8,281.2,1156.3,279.7,1156.5,278.9 M1170.8,297.1c0.5,0.2,1.6,0.5,2.1,0.6
+			c1.3-1.4,4.6-2.6,4.1-4.7C1173.7,291.3,1171.9,294.5,1170.8,297.1z"/>
+		<path class="st2" d="M1247.3,282.5c0.7-0.7,1.5-1.4,2.2-2.1c1.7,1.2,3.5,2.2,5.5,3.1c0,1.4,0,2.9,0,4.3
+			C1252.1,286.5,1249.1,285.2,1247.3,282.5z"/>
+		<path class="st2" d="M718.5,287.5c0.3-1.5,0.7-3,1.1-4.5c1.8,0.2,3.5,0.4,5.3,0.6c-0.6,1.2-1.1,2.5-1.8,3.6
+			C721.6,287.6,720.1,287.5,718.5,287.5z"/>
+		<path class="st2" d="M1245.1,295.6c2.1-2.1,5.1-2.4,7.9-2.6c1,0.7,2,1.5,3.1,2.2c0.1,4,0.2,8,0,11.9c-0.4-0.1-1.3-0.4-1.7-0.6
+			c-2.1-0.6-5.1-2.5-6.6,0c-2.1,2.9,0.9,6,2,8.7c1.6,2.2,0.1,4.9-0.7,7.2c-1.7,2.8-3.4,5.6-4.8,8.5c-0.6-1.4-1.2-2.9-1.7-4.3
+			c-1.4,0.5-3.5,2-1.6,3.4c1.8,1.5,1.8,3.6,1.3,5.7c-1.2-0.7-2.3-1.3-3.4-2c-0.9,1.1-1.7,2.1-2.6,3.2c-0.9-0.6-1.8-1.2-2.6-1.7
+			c0.3-1.2,0.7-2.4,1.1-3.6c0.7-0.2,2.1-0.5,2.7-0.7l1.2-0.2c-0.2-2.7-0.4-5.4-0.8-8.1c2.7,0.2,4.9-1,6.1-3.4
+			c-0.5-0.5-1.5-1.5-1.9-2c1.8-5.1,0.7-10.4,0.4-15.6c3.3-0.7,6.7-1.3,10-2c-0.9-1.4-2.3-2.3-3.9-2.7
+			C1247.7,296.5,1245.9,295.9,1245.1,295.6z"/>
+		<path class="st2" d="M1207.6,300.5c1.4-0.1,2.9-0.3,4.3-0.4c3.6,3.5,6.5,7.7,9.9,11.5c-3.5,2.7-6.5-1.6-9.5-3.1
+			c-2.4-1.6-7.8-1.2-7.7,2.5c0.6,4.1,2.2,7.9,2.8,12c-1.5,0.1-3,0.2-4.4,0.2c-1.6-2.7-3.2-5.5-4.8-8.2c-0.6,0.3-1.1,0.6-1.6,0.9
+			c-1.6,1.3-3,2.8-4.4,4.2c-0.6-0.4-1.7-1-2.3-1.4c0.4-1.2,0.3-2.6,1.1-3.6c1.7-0.7,3.6-1.1,5.4-1.8c1.5-2.1,1.9-5,4.1-6.6
+			C1203,304.8,1205.5,302.9,1207.6,300.5z"/>
+		<path class="st2" d="M1209.8,321.9c-0.4-2.1,1.3-4.5,3.5-3.3c3.8,0.5,5.4,4.9,3.5,8c-1.2,0-2.3-0.1-3.5-0.1
+			C1212.1,325.1,1210.8,323.6,1209.8,321.9z"/>
+		<path class="st2" d="M1180.1,321.8c2.1-0.8,4.6-2.1,6.6-0.4c-0.2,1.9-2.3,2.7-3.5,3.9C1182.2,324.2,1181.2,323,1180.1,321.8z"/>
+		<path class="st2" d="M651.7,328.7c1.4-0.4,2.8-0.3,4.2-0.3c-0.8,1.7-1.3,3.7-2.8,4.9c-1.2,0.5-2.6,0.3-3.9,0.4
+			C650,332,650.5,330.1,651.7,328.7z"/>
+		<path class="st2" d="M1223.9,330.9c2.8-1.4,5.4,1.9,6.5,4.2c-0.3,2.4-3.2,1.8-4.9,1.5C1224.1,335.2,1222.4,332.6,1223.9,330.9z"/>
+		<path class="st2" d="M1020.2,348.8c1.9-5.1,3.5-10.3,5.6-15.4c3.9,1.3,7.8,2.6,11.8,3.4c-0.2,0.7-0.5,2.1-0.7,2.8
+			c-1.5-0.1-3-0.2-4.6-0.3c0,1.3-0.1,2.6-0.1,4c1.4,0.2,2.9,0.5,4.3,0.8c-3.3,11.5-6.1,23.1-8.4,34.9l-0.7,0.1
+			c-3.9-0.5-8.5,1.9-11.7-1c-3-2.4-2.1-7.7-6-9.2c-2.2,0-4.3,0.7-6.5,1.1c-0.5-0.2-1.5-0.6-2-0.7
+			C1009.9,364.9,1016,357.2,1020.2,348.8 M1020.3,357.5c0.4,1.1,0.9,2.2,1.2,3.4c-0.8,2.4-4.5,3.3-4.2,6.1c-0.2,1.2,0.3,2.9,1.8,2.7
+			c3.7,0.3,6.1-3.5,7.3-6.5c-0.8-1.9-1.4-3.9-2.1-5.8C1022.9,357.4,1021.6,357.4,1020.3,357.5z"/>
+		<path class="st2" d="M631.7,335c1.2,1.1,3.1,2,3,3.9c-0.8,1.5-1.9,2.7-3,4c-2.6,1.5-5,3.4-7.2,5.4c0,1.9,0,3.8,0,5.7
+			c2.6-0.8,5.2-1.8,6.6-4.2c0.7,0.2,2,0.5,2.7,0.7c-0.1,0.4-0.3,1.2-0.4,1.6c-0.8,0.8-1.5,1.6-2.2,2.4c-1.9,2.8-4.3,5.5-7.9,5.6
+			c0.1-2,0.2-4.1,0.3-6.1c-5,0.4-6.7,6.1-11,8.1c-0.2-0.5-0.5-1.4-0.7-1.9c4.9-5.5,9.4-11.5,12.9-18.1
+			C627.7,340.5,629.8,337.8,631.7,335z"/>
+		<path class="st2" d="M1205.6,337.8c2.2-0.9,4.3-2.4,6.8-2.3c1.1,2,0,4.2-0.8,6.1c-1.1,2.4-4.3,1.9-6.3,1.3
+			c-0.3-1.4-0.4-2.8-0.5-4.2C1204.9,338.5,1205.4,338,1205.6,337.8z"/>
+		<path class="st2" d="M652.9,340c1.3-0.4,2.7-0.7,4.1-1c0.1,1.3,0.2,2.6,0.4,3.8c-1.9,1-4.6,1.4-5.6,3.6c-1.4,2.7-2.9,5.6-5.6,7.2
+			c-3.3,0-6.1,1.6-8.5,3.6c-0.4-0.6-0.8-1.2-1.1-1.9c2.1-3.6,5.3-6.4,8.9-8.4C648.4,345.2,650.7,342.6,652.9,340z"/>
+		<path class="st2" d="M1240.8,339.8c3.1,2.1,3.2,6.1,4.7,9.2c-1.2,0.3-2.3,0.6-3.4,0.9c-1.4-1.1-2.8-2.3-4.2-3.4
+			c0.8-0.9,1.6-1.8,2.4-2.7C1240.4,342.6,1240.6,341.2,1240.8,339.8z"/>
+		<path class="st2" d="M1227.3,341.3c2.2-0.1,4.7-0.3,6.6,1.1c-1,1.4-2,2.9-3,4.3c-1.3-0.4-2.5-0.8-3.8-1.1
+			C1227.2,344.2,1227.3,342.7,1227.3,341.3z"/>
+		<path class="st2" d="M653.7,357.9c-1.4-6.9,5.5-10.8,9.1-15.5c0,0.5,0.2,1.6,0.2,2.1C660.4,349.2,657.1,353.6,653.7,357.9z"/>
+		<path class="st2" d="M1213.2,345.1c2.3-0.9,7-2.1,6.7,1.9c-1.3,2.6-4.5,1.6-6.7,0.9C1213.2,347.2,1213.2,345.8,1213.2,345.1z"/>
+		<path class="st2" d="M1246.9,355c2.6,1.7,5.3,3.4,8.5,3.6c0,0.6,0,1.7,0,2.3c-2.2-0.1-4.3-0.1-6.4-0.1
+			C1248.2,358.8,1247.5,356.9,1246.9,355z"/>
+		<path class="st2" d="M644.5,359.6c2.3-0.5,5.1-0.8,6.9,1c-10.6,11.7-24,20.6-38.5,26.7c-2.7,0.5-4.5-3-2.5-4.8
+			c2.9-2.1,6-4,8.5-6.6c1.7,1.1,3.3,2.4,5.2,3.3c1.7,0.6,2.7-1.2,3.7-2.3c2.5-3.4,5.4-6.5,8.2-9.6
+			C638.7,364.7,641.1,361.5,644.5,359.6z"/>
+		<path class="st2" d="M627.8,364.2c2-1.1,4.1-2.2,6.2-3.2c-1.9,5-4.6,10.6-9.7,12.8c-0.8-1.5-1-3.3-1.2-5
+			C624.1,366.8,626.1,365.6,627.8,364.2z"/>
+		<path class="st2" d="M1240.7,362.6c2.5-0.3,5.5,1.1,5.2,4.1c-2.2,0.5-4.5,0.8-6.8,0.1C1239.4,365.3,1239,363.3,1240.7,362.6z"/>
+		<path class="st2" d="M610.6,367.5c3.1-1.6,5.9-3.8,9.4-4.5c-1.1,3-2.4,6.1-4.7,8.4c-2,1.5-4.7,1.8-6.8,3.1c-2,3-2.8,6.8-5.7,9.2
+			c-3.1,2.5-6.2,5.1-8.5,8.4c1,0,2.9,0,3.8,0c-4.2,0.7-8.2,1.8-12.4,2.7c-0.1-1.1-0.2-2.2-0.4-3.3c-0.8-0.5-1.6-1-2.5-1.6
+			c0.6-0.9,1.2-1.7,1.8-2.6c1.4,0.4,2.9,0.9,4.3,1.3c0.1-1.6,1.1-4-1-4.8c-2.6-1.7-4,2-5.9,3.2c-3.3,2.1-5.1,5.6-7,9
+			c-4.1,0.1-8.3,0.1-12.4-0.1c0.5-2.9,2.6-4.4,5.3-5.1c0.2-1,0.4-2,0.7-3c0.3-3.4,3.8-4.9,5.6-7.5c2.1-0.6,4.2-1,6.3-1.4
+			c0.5,2,1,3.9,1.5,5.9c-0.2-2.1-0.3-4.3-0.4-6.4c8.2-1.4,15.5-5.8,22.1-10.6C606.1,368.1,608.5,368.8,610.6,367.5z"/>
+		<path class="st2" d="M526.4,374.6c-2.5-2.6,1.2-5,2.6-7.1c0.5,0.3,1.3,1,1.8,1.3c-0.2,1.3-0.5,2.7-0.7,4
+			C529,373.7,528,375.1,526.4,374.6z"/>
+		<path class="st2" d="M758.6,378.6c2.5-1.5,2.1-4.7,2.3-7.2c0.7,1.1,1.4,2.1,2.2,3.2c2.4,2.7,6.1,3.8,9.5,4.5
+			c2.9,0.6,5.8,0.7,8.7,0.8c0.1,3.6,0.1,7.3-0.2,10.9l-1.3-0.1c-0.2-2.5-0.7-5-2.7-6.7c-1.1,2-2.2,4.1-3.2,6.2
+			c-3.8-0.1-7.5-0.2-11.3-0.7c-0.5-1.2-1.1-2.3-1.6-3.5c-3.9,1.9-8,4.1-12.4,3C751.3,385.1,754.7,381.5,758.6,378.6z"/>
+		<path class="st2" d="M535.3,373.3c0.4-0.2,1.1-0.5,1.5-0.7c3.8,2.3,8,4.2,12.4,5.3c0.2,0.6,0.6,1.8,0.7,2.4
+			c-3-0.4-6.1-1.2-9.1-0.6c-2.1,2.9-1.1,7.6-4.6,9.5c-2.4,1.7-5.3,2.7-8.3,2.7c-1.8-0.5-3.6-1.2-5.4-1.8c0.4-0.5,1.3-1.5,1.7-2
+			c1.4-1.7,2.6-3.4,3.8-5.2C530.2,379.6,532.7,376.4,535.3,373.3z"/>
+		<path class="st2" d="M1230.5,382.1c0.6-3.4,2.6-6.6,6.3-7.1c-0.7,3.6-1.9,7.3-0.5,10.8c-0.3,0.4-1,1.3-1.4,1.8
+			C1233.3,385.7,1231.9,383.9,1230.5,382.1z"/>
+		<path class="st2" d="M522.4,376.3c2.9-0.4,3.5,4,1.2,5.2c-1.2,0.1-2.3,0.2-3.5,0.3C520.2,379.8,520.3,377.4,522.4,376.3z"/>
+		<path class="st2" d="M693.7,379.6c2.4-0.1,4.7-0.3,7.1-0.1c0.8,0.1,2.3,0.3,3,0.4c-0.5,0.8-1,1.5-1.5,2.3c0.1,2,0.8,4.2-0.3,6
+			c-1.1,3.1-5,1.9-7.5,2.3c0.7-2.4,1.5-4.7,2.3-7c-0.8-0.1-2.4-0.3-3.2-0.4C693.6,382.1,693.7,380.4,693.7,379.6z"/>
+		<path class="st2" d="M1247.3,380.4c0.9,0.5,1.8,1,2.7,1.5c0.8,3,2,6,3.9,8.5c0.3,0.6,1.1,1.7,1.4,2.2l0,1c-2.5,0-5,0-7.5,0
+			c1-4.3-1.4-8-2.8-11.9C1245.6,381.3,1246.8,380.7,1247.3,380.4z"/>
+		<path class="st2" d="M561.5,380.4c1.6,0.1,3.2,0.1,4.8,0.3c0.1,0.5,0.2,1.5,0.2,2c-3.2,4-5.2,8.7-8.1,12.9
+			c-6.5,0.9-13.3,0.2-19.5-2c0.6-1.3,1.2-2.6,1.9-3.9c1.4-0.2,2.8-0.4,4.1-0.5c0.9-1.8,0.5-4.9,3-5.5c3.2-0.4,6.4,0.2,9.6-0.4
+			C559,382.5,560.2,381.4,561.5,380.4z"/>
+		<path class="st2" d="M1020.5,384.7c1.9-0.5,3.8-0.8,5.8-1.2c0,1,0.1,2.9,0.2,3.8c-0.3,1.3-0.8,2.7-1.1,4c-1.5,0-3.1-0.1-4.6-0.1
+			C1020.5,389.1,1019.8,386.9,1020.5,384.7z"/>
+		<path class="st2" d="M24.9,387.1c1.5,0.3,2.9,0.6,4.4,0.9c0.3,3.1,0.2,6.2-0.3,9.3C26.7,394.4,23.7,391.1,24.9,387.1z"/>
+		<path class="st2" d="M1497.6,477.8c8.2-3.4,16.1-7.6,24.6-10.3c0.5,1.5,1.1,3,1.6,4.5c-1.5,2.3-3.4,4.4-4.4,7
+			c1.5,2.1,3.8,0,5.7-0.4c0.8,2.6,1.5,5.3,2.4,7.9c-0.5-0.2-1.4-0.7-1.9-0.9c-2.8-1.7-3.3,1.8-4.5,3.6c-0.8,2-3.2,2.4-4.9,3.4
+			c0.4,1.6,0.8,3.2,1.2,4.8c3.4-3.2,7.8-5.1,12.3-5.9c0.7,2.5,1.6,5,2.5,7.5c-0.7,1.3-1.3,2.5-1.9,3.8c0.9,0.7,1.7,1.4,2.6,2.1
+			c-0.6,1.5-1.5,2.9-1.4,4.6c1.3,1.2,2.8,2.1,4.2,3.2c0.1-0.4,0.2-1.3,0.3-1.7c3.1,10,6.5,20,9.9,29.9c-3.3-0.1-6.2,1.3-8.2,4
+			c0.4,2.3,2.6,6.2-1,6.8c-3.2,0.2-2.7-3.4-2.6-5.6c0.1-4.4,2.6-8.2,4.1-12.2c-0.3-0.3-1-0.8-1.3-1c-2.4,1.6-4,4-5.8,6.2
+			c-1.3,0.3-2.8,0.4-3.9,1.2c0.6,2.7,1.6,5.4,2.1,8.1c0.1,2.1,0.3,4.2,0,6.4c-0.9,1-2,1.9-3,2.9c0,1,0,2,0.1,3.1
+			c1.4,1.1,2.8,2.2,4.2,3.3c-0.4,1.6-0.8,3.2-1.2,4.9c-5,0.8-10.2-0.6-15.1,0.9c0.2,1.9,0.1,4,1.7,5.4c1.5,1.9,4.8,4.1,2.8,6.8
+			c-1.8,3.1-5.7,1.5-8.3,0.7c-0.5-1.4-0.9-2.7-1.3-4.1c0.6-3.4,3.1-6.7,2.3-10.2c-0.7-2.7-4-2.4-6.1-3.1c-2.6-8.9-5.1-17.8-7.1-26.8
+			c2.6-2.3,4.9-5,6.5-8.2c-2.6,0.7-5.1,1.4-7.6,2.2c-0.1-0.9-0.3-1.9-0.4-2.8c-0.7-2.3-1.6-4.5-2.4-6.7c-2.3,0.5-3.7,2.2-4.6,4.2
+			c1.6,0.7,3.1,1.4,4.7,2c-1.9,7-4.2,13.8-6.4,20.7c-1.8,3.5-3.2,7.1-4.5,10.8c-3.1-1.8-2.2-5.5-2.6-8.4c-2,0.9-3.7,2.2-4.9,4
+			c-1.3,0.6-2.7,2.4-4.2,1.7c-0.4-1.6-0.5-3.1-0.7-4.7c-0.3-0.2-1-0.7-1.3-0.9c-0.7,0.7-1.3,1.3-2,2c0.6,1.3,1.2,2.6,1.8,4
+			c-0.6,0.7-1.3,1.3-1.9,2c-1.8-2.9-3.6-5.8-6.2-8c0.4-1.3,1.1-2.4,2.1-3.2c2.7-1.3,5.7-2.1,8.2-3.7c0.5-1.3,0.3-2.8,0.5-4.2
+			c-2.6,0.7-5.1,1.6-7.4,2.9c7.8-20.2,16.1-40.3,22.7-61C1490.6,480.4,1494.4,479.4,1497.6,477.8 M1493.1,485.1
+			c-0.4,2.3,2.3,2.1,3.8,2.8C1496.3,486.2,1495.4,483.4,1493.1,485.1 M1502.4,485.4c-1.3,2.7,5.3,2.8,4.4,0
+			C1505.5,485,1503.2,483.8,1502.4,485.4 M1509.3,485.1c0,1.2,0,2.4,0,3.6c1-0.1,2.1-0.1,3.2-0.2c0.1-1.1,0.2-2.3,0.3-3.4
+			C1511.7,485.1,1510.5,485.1,1509.3,485.1 M1496.3,492.4c0,1.8,0,3.5,0,5.3c0.6,0,1.9,0,2.5,0c0.5-1.8,0.8-3.6,1-5.4
+			C1498.6,492.3,1497.4,492.3,1496.3,492.4 M1505.6,504.6c-1.8,1.4-3.6,2.9-5.2,4.4c0.9,0.8,1.8,1.7,2.8,2.5
+			c2.8-2.6,3.5-6.6,5.6-9.7c1.8-0.5,3.6-0.6,5.5-0.9c-1-2.8-4.7-2.3-6.7-4C1505.1,498.8,1505.2,501.9,1505.6,504.6 M1498.9,498.7
+			c0.2,2.1,0.4,4.1,0.6,6.2c1.5-0.9,3.3-1.9,3.3-4C1503.1,498.8,1500.3,498.8,1498.9,498.7 M1524.5,504.6c1.1,1.8,3.6,0.6,5.3,0.6
+			c-0.4-1-0.8-2-1.2-3C1527,502.4,1523.7,502.1,1524.5,504.6 M1516.2,505.2c0.1,3.1,0.2,6.3,0.2,9.4c0.6,0,1.7,0.1,2.2,0.1
+			c-0.1-0.8-0.2-1.6-0.3-2.4c0.8-0.7,1.6-1.4,2.4-2.1c-0.9-1.6-1.8-3.3-2.6-4.9C1517.7,505.3,1516.7,505.3,1516.2,505.2 M1498,517
+			c1.6,2.1,4,3.1,6.3,3.9c0.1,0.7,0.2,2,0.2,2.6c1.1,0,2.2,0.1,3.4,0.1c0.5-0.8,1.1-1.7,1.6-2.6c-0.8-2.9-1.9-5.8-2.3-8.8
+			C1503.5,512.4,1500.5,514.5,1498,517 M1480.6,521c-0.4,1.7,1.7,2.4,2.5,3.7c2.3-2,3.5-5.8,1.3-8.2
+			C1481.5,515.2,1480.7,518.9,1480.6,521 M1532.2,529.2c1.5-0.4,3.8-0.2,3.9-2.3c-1.9-2.5-4.1-4.8-5.4-7.7
+			C1529.2,522.6,1531,526,1532.2,529.2 M1513.1,521.9c-0.2,2.8,0.4,5.7,1.9,8.1c0.9,2.3,3.9,2.4,6.1,2.2c2.2-2.3,3.1-5.5,4.5-8.3
+			c-0.2-0.5-0.7-1.6-0.9-2.1c-1,1.6-1.8,3.3-2.7,4.9C1518.9,525.3,1516.6,522.4,1513.1,521.9 M1510.1,532.1c-0.1,2,0,4,0,6
+			c0.7,0,2.1,0,2.8,0c-0.2-1.8-0.1-3.7,0.3-5.5C1512.3,531.6,1511.1,530.8,1510.1,532.1 M1485.3,532.3c-0.4,0.4-1.3,1.3-1.8,1.7
+			c1.3,2.2,4.8,1.6,5.4-0.9C1488,532.3,1486.5,531.7,1485.3,532.3 M1514.4,544.1c0.8,1.8,1.6,3.5,2.4,5.3c0.9,0.1,1.9,0.2,2.9,0.3
+			c-0.1-1.4-0.1-2.7-0.2-4.1C1517.8,545.1,1516.1,544.6,1514.4,544.1z"/>
+		<path class="st2" d="M593.9,471.4c0.9-1.7,3.1-3.8,4.7-1.5c0,2.8-3.2,3.8-4.2,6.1c2.2,0.9,4.5,1.7,6.9,2.2c2.1-1.3,0.1-4.1,0-6
+			c2.6,1.3,5.3,3.1,8.3,2.5c0.8-1.7,1.3-3.4,1.9-5.1c1.9-0.1,3.8-0.2,5.8-0.2c0.8,0,2.3,0,3.1-0.1l-0.1,0.4c-0.9,3.9-5.2,4-7.6,6.2
+			c2,2.4,4.3,4.4,6.5,6.6c1.1-0.6,2.2-1.2,3.4-1.8c1.3,0.3,2.6,0.6,4,0.9c1.9-3.1,2.9-6.6,3-10.2c2.3,0.2,4.6,0.5,6.9,0.8
+			c1.2,0.2,2.4,0.4,3.5,1c1.2,0.6,2.5,1.3,3.7,2c-0.6,1-1.2,1.9-1.8,2.9c0.9,1.1,1.7,2.2,2.6,3.2c1,0.8,2.3,1.2,3.6,0.7
+			c1.8,0.3,3.5,0.8,5.3,1.4c-2.6,1.2-5.2,2.6-8.1,3.1c-2.7-0.2-4.1-3-5.8-4.8c-1-1.7-2.8-2.5-4-0.7c-1.6,1.4-3.5,2.5-5.4,3.4
+			c0.1,1,0.2,2,0.3,3.1c-1.7,2.6-3.3,5.2-4.9,7.9c-12.3-5.2-26-7-39.2-5.5c1.6-0.4,3.3-0.9,4.9-1.3c-0.1-0.6-0.4-1.7-0.6-2.2
+			c-2.5-2.2-4.1-6.3-8-5.2c-0.1,1-0.1,2-0.2,3c1.6,0.5,3.2,1.1,4.8,1.7c-0.9,1.5-2,3.2-4,3.2c-3.8,0.3-7,2.2-10.1,4.1
+			c-5,1.7-10.5,2.5-14.7,5.9c-2.4,1.9-4.7,3.8-7.3,5.3c-4-0.6-7,2.2-9.9,4.5c1.1-2.4,2.3-5,0.7-7.5c0.2-2.1,1.1-4.3,0.1-6.3
+			c-2.2-1-4.8-0.7-7.2-0.5c-1.1,2.4,1.2,3.3,2.9,4.3c0.1,0.6,0.4,1.8,0.6,2.4c-0.4,2.3-1.3,4.4-1.8,6.7c1.1,2,3,3.5,4.5,5.2
+			c-0.5,0.5-1.4,1.5-1.9,2c-1.5,0.2-3,0.6-4.5,0.4c-1.8-0.7-3.1-2.4-4.5-3.7c-0.4,0.1-1.2,0.4-1.6,0.5c-2,0.1-4-0.3-5.8-1.1
+			c-1.8,3.2-4.7,5.5-8.4,6.2c-0.7-1.2-1.4-2.4-2.1-3.7c-1.1-0.3-2.2-0.5-3.3-0.8c1.3,2.6,2.7,5.2,4.7,7.3c6.2-1.5,12.8-1.8,19-0.2
+			c-1.1,0.8-2.2,1.7-3.2,2.5c0.5,0.9,1,1.8,1.5,2.6c-1.2,1.6-2.3,3.2-3.3,4.9c-1.3,0-2.5,0.1-3.8,0.2c-0.2,2.1-0.3,4.2-0.5,6.3
+			c-1.9-1.2-2.9-3-2.7-5.2c-1.1-0.1-2.1-0.3-3.2-0.4c-0.5-0.9-1-1.9-1.4-2.8c-0.5,0.1-1.6,0.2-2.2,0.3c0.3,2.3,0.6,4.6,1,6.9
+			c-1.3-0.3-2.7-0.6-4-0.9c-0.1,0.5-0.2,1.6-0.3,2.2c-1.1,0.3-2.3,0.7-3.4,1c0.1,1,0.2,2,0.3,3c-1.4,1.6-2.9,3.1-4.3,4.7
+			c0.7,1.4,1.3,2.8,2,4.2c-3-0.6-6.1-2.9-9.1-1.3c-3.2,1-6.2,2.8-7.5,6.1c1.1,0.5,2.2,0.9,3.3,1.4c-0.2,0.8-0.5,2.3-0.7,3.1
+			c-1.6-0.4-2.4-2.2-3.6-3.2c-0.3-0.3-0.9-1-1.2-1.3c-1.5-1-3.1-1.6-4.8-2.3c2.1,3.7,2.4,8.6-0.7,11.9c-1-2.3-1.6-4.6-1.4-7.1
+			c-0.7-0.7-1.4-1.4-2-2.2c-0.3-0.5-0.8-1.5-1-2c0-2.3,0.5-4.5,1.1-6.7c-0.2-0.3-0.6-1.1-0.8-1.4c-0.1-1.1-0.1-2.2-0.1-3.3
+			c0.7-0.1,2.1-0.4,2.8-0.6c0.2-0.6,0.6-1.9,0.8-2.5c0.6-0.4,1.3-0.9,2-1.3c0.1,0.7,0.3,2,0.4,2.7c-0.4,0.7-1.2,2.1-1.6,2.8
+			c2.6,1.1,5.4,1.3,8.2,1.1c0.2-0.4,0.6-1.1,0.7-1.4c0.3-0.6,0.9-1.7,1.2-2.3c-2.3-1.5-4.6-3.1-6.7-4.9c1.9-0.2,4-1.2,5.8-0.3
+			c1.9,1,3.5,2.3,5.2,3.6c1.2-0.8,2.4-1.6,3.7-2.4c0.6,0.6,1.1,1.1,1.7,1.7c-1.2,1.3-2.1,2.9-3.7,3.7c-1.5,0.1-2.9,0-4.4,0
+			c0,0.6,0,1.9,0,2.5c2.2,0.6,4.4,1.6,6.8,1.6c1.3-0.6,2.5-1.5,3.6-2.3c1.3-2.3,2-4.9,2.6-7.5c0.6-0.1,1.8-0.2,2.4-0.2
+			c-1-2-2.1-4-3.5-5.7l-0.6-0.2c-1,0.7-2,1.4-2.8,2.3c-0.4,0.5-1.2,1.4-1.6,1.9c-2-1.4-4.5-2.5-5.5-4.9c-0.8-1.1-0.8-3.3-2.5-3.3
+			c-1.8,0.4-2.9,1.9-4.3,3c-0.7-0.2-1.4-0.5-2.2-0.7c1.2-3.4,0.8-6.9,0.9-10.4c1.2-2.1,3-3.9,4.6-5.7c1,0.3,2.1,0.6,3.1,0.9
+			c1.5,1.7,3,3.5,4.7,5c0.9,0.8,1.9,1.7,2.8,2.5c-0.1,1.5-0.2,3.1-0.3,4.6c3.3-0.5,6.8-0.9,9.8-2.8c1.4-0.9,0.5-3.7-1.2-3.5
+			c-1.5,0.5-2.9,1.4-4.2,2.2c0.3-1.6,0.6-3.3,1-4.9c-3-0.6-5.2-2.3-5.6-5.4c-1.5-0.8-3.1-1.6-4.6-2.4c0.8-1.1,1.5-2.2,2.3-3.3
+			c0.8-0.7,1.7-1.4,2.6-2c1.1,2.2,2.6,4.3,4.3,6.1c1.3-1.9,3.1-3.6,3.8-5.9c0.2-2-1.8-3-3-4.3c9.3-7.1,19.6-13.2,30.6-17.4
+			c-2,2.1-4.2,4-6.5,5.8c0.3,2.1,0.7,4.2,1.1,6.3c1,0.5,2,1,3.1,1.5c-0.1-1.7-0.2-3.4-0.3-5c3.3-3.4,6.7-6.7,8.7-11
+			c3.5-1.2,7-2.9,10.7-3.4c4.3,0.1,8.2-1.7,12.4-2.4c7.5-1.8,15-3.2,22.7-3.5C590.1,469.3,592.1,470.4,593.9,471.4 M560.5,475.4
+			c-1,0.8-1.2,3.1,0.3,3.3C562.9,478.6,562.8,474.1,560.5,475.4 M636.2,475.3c-2.9,1.6,2.9,4.2,3.4,1.8
+			C640.2,474.8,637.6,473.7,636.2,475.3 M568.3,479.4c0.1,2.6,1.6,5.4,4.6,4C572.1,481.4,571,478.8,568.3,479.4 M553.4,484
+			c-0.6,2,0.6,3.3,2.3,4.1c0.8-1.9,1-4,1-6C555.6,482.6,553.3,482.2,553.4,484 M564.2,484.9c0.6,1.4,2.5,0.4,3.6,0.6
+			c-0.3-0.7-1-2.2-1.4-3C565.1,480.5,562.6,483.5,564.2,484.9 M558,490.5c-1.4,1.1,0,4,1.7,3.1C561,492.6,559.6,489.8,558,490.5
+			 M541.1,491.3c-1.4,1,0.1,3.6,1.6,2.4C544.1,492.7,542.6,490.1,541.1,491.3 M518,497.1c0.8,1.3,1.7,2.7,2.6,4
+			c-1.1,2.3-2.1,4.7-3.1,7c1,0.8,2.3,2,3.6,1c2.1-0.7,1.4-3.1,1.4-4.8c0.7-1.5,3.3-3,2-4.8C522.8,497.8,520.5,495.6,518,497.1
+			 M531.3,500l-0.3,1c-1.3,0.3-2.6,0.5-3.9,1c-2.5,1.4-1.5,5.4,0.8,6.3c2.8-0.1,1.6-3.8,2.5-5.6c1,0.1,3,0.3,4,0.4
+			C535.3,500.9,533.2,500.2,531.3,500 M494.1,522.5c-0.1,0.3-0.3,1-0.4,1.3c0.8,1.8,1.5,3.7,2.2,5.6c0.4,0,1.2,0.1,1.6,0.2
+			c0-1.4,0.1-2.8-0.1-4.2C496.4,524.3,495.2,523.5,494.1,522.5 M510.4,529c0.9-2.1,2.6-3.9,2.8-6.2C510.6,522.2,508,527.2,510.4,529
+			 M515.4,526.1c1.6,2.8,4.7,3.4,7.7,3.1c-1.3-2-2.7-4-4.1-5.9C517.8,524.2,516.6,525.1,515.4,526.1z"/>
+		<path class="st2" d="M1231.7,471.9c1.1-0.2,2.2-0.3,3.3-0.4c0.3,1.6,0.8,3.2,1.2,4.8c2.6,8,5,16.1,7.7,24c-4.6,1.8-4.7-4.9-8-6.1
+			c-1.6-0.1-2,1.6-2.8,2.6c2.4,2.4,4.2,5.2,7,7.2c1.7,0.6,3.6,0.6,5.3,0.9c1.4,4.8,3,9.6,4.6,14.3c-3.5,1.8-6.4-0.6-9.2-2.4
+			c-1.2,4.2,3.4,6.3,4.4,9.9c2-1.3,4-2.6,6-3.9c2.2,6.8,4.3,13.6,6.8,20.2c-0.3,2.1-0.6,4.3-0.8,6.4c1.2,0.6,2.3,1.1,3.5,1.7
+			c4.1,13.1,8.8,25.9,13.2,38.9c2.5,6.4,3.4,13.3,6.6,19.5c-1.6,1-3.1,2-4.7,3.1c-0.8-1.9-1.7-3.6-2.7-5.4c-0.8,0.2-2.4,0.6-3.2,0.8
+			c0.1,2.1,0.2,4.2,0.3,6.3c-2,0.9-4,1.7-5.9,2.6c1.4,1.9,2.2,4.7,4.4,5.8c3.3-1.7,6-4.3,8.8-6.6c0,0.5,0.1,1.4,0.1,1.8
+			c0.1,1.7,0.4,3.4,0.7,5.1c1.4-1,2.8-2,4.2-2.8c0.4-0.1,1.3-0.3,1.7-0.4c2.2,7.1,4.7,14.1,7.3,21.1c-0.7,2.4-0.9,5.9-3.8,6.7
+			c-2.2-0.1-4.2-0.8-6.3-1.3c0,1.1,0,2.2,0,3.4c1.4,0.7,2.9,1.5,4.4,2.2c-0.2,1.7-0.5,3.5-0.7,5.2c0.3,0.2,0.9,0.7,1.2,0.9
+			c-1.3,2-3.7,4-3,6.7c0.9,1.3,2,2.4,3.1,3.6c-2.5,0.1-5.1,0.2-7.6,0.1c-0.9,2.1-1.5,4.3-1.8,6.6c1.3-1.2,2.5-2.4,3.9-3.4
+			c2.8-0.2,5.2,1.6,8,1.9c1.8-0.2,3.6-0.8,5.5-1.2c1.7,0.4,3.5,0.4,5.2-0.1c0.3-0.1,0.8-0.4,1-0.5c0.1-0.7,0.2-2.1,0.3-2.8
+			c0.6,1.9,1.3,3.8,1.9,5.6c0.2,1.6,0.4,3.1,0.6,4.7c-1.2-0.3-2.3-0.6-3.4-0.9c0.1,0.5,0.3,1.5,0.4,2c0.9,0.5,1.9,1.1,2.9,1.6
+			c-3.9,2.9-3.6,8.4-7.3,11.4c-0.2,0.1-0.8,0.3-1,0.4c-0.6,0.3-1.7,0.8-2.3,1c0-1.8,0-3.5,0.1-5.3c-1.7-0.7-3.7-1.4-4.6,0.7
+			c-2.7,3.1-1.8,7.2-0.3,10.6c-0.7,0-1.9-0.1-2.6-0.1c-0.3-1.2-0.5-2.4-0.7-3.6c-1-0.2-2.1-0.3-3.1-0.4c0.1-0.4,0.3-1.1,0.4-1.4
+			c1.3-3.6,1.6-7.7,4.3-10.7c0-0.4-0.1-1.3-0.1-1.7c1.2-0.6,2.7-3.1,3.8-1.2c-0.6,1.6-1.5,3.2-1.6,4.9c1.3-0.1,2.5-0.8,3.7-1.4
+			c0.2,1.2,0.5,2.4,0.8,3.6c3.4-0.6,2.8-4.4,2.2-6.9c-1.1-3-4.1-4.4-6.8-5.8c-1.9,1.6-3.9,3.2-5.8,4.9c-0.2,1.7-0.1,3.4-0.1,5.1
+			c-1.5,1.1-3,2.3-4.5,3.5c0.2-1.2,0.3-2.3,0.5-3.4c0-1.5,0-3-0.2-4.5c-0.5-1.3-1.2-2.6-1.8-3.8l-0.4-0.7c-0.5-0.3-1.5-1-2-1.3
+			c-1.8,3.2-4.9,7.1-2.4,10.8c0.4-0.5,1.3-1.6,1.8-2.1c0.5,2.2,1.2,4.4,2,6.6c-2,0.9-4,1.9-5.9,2.8c-0.8,0-1.6,0-2.4,0
+			c-0.2,0.5-0.7,1.6-0.9,2.1c-0.2,0.5-0.6,1.4-0.8,1.8l-0.5-0.7c-0.7-1-1.4-2-2.2-2.9c-1.7-0.3-3.4,0.2-5.1,0.5
+			c-0.3-1.4-0.7-2.7-1-4c0.3-0.2,1.1-0.6,1.4-0.8c2.1,0.6,4.2,0.9,6.3,1c1.6,0.5,3.5,2.5,4.9,0.7c1.6-1.5,0.2-3.8-0.3-5.5
+			c-1.5,0.5-3,1.2-4.6,1.4c-0.5-0.3-1.6-1-2.1-1.3c2.8-1.7,6.4-4.1,5.6-7.9c-0.3-2.6-3.5-1.9-5.3-2.4c-1.6-0.8-3.2-1.2-5-1.2
+			c-1.4,0-2.8,0.1-4.1,0.1c-1.6-5.1-5.7-9.7-5.3-15.3c1.9-0.8,3.9-1.2,6-1.7c-0.1-3.2-0.2-6.4-0.3-9.6c-1.4,0.5-2.8,1-4.2,1.5
+			l-1,0.3c-0.5,0.2-1.5,0.6-2.1,0.8c-0.6,1.3-1.3,2.5-1.9,3.8c-0.2-0.5-0.5-1.6-0.7-2.1c0.3-1.9,0.2-4.1,1.3-5.7
+			c2.9-2.3,7-0.2,10-1.9c1.1-2.7-3.5-2.7-5.1-3.9c0.2-1.1,0.4-2.2,0.6-3.4c0.7-1.7,0.3-2.9-1.1-3.5c-1.1,1-2,2.2-2.8,3.4
+			c0.6,1.5,1.2,3,1.9,4.5c-1.7,1.2-3.7,2-5.8,2.5c-0.6-1.3-1.2-2.5-1.8-3.8c-2.3-0.5-4.7-1.8-6.9-0.6c-5.1,2.7-11.1,1.4-16.6,1.6
+			c-6.9-0.3-13.8,0.6-20.7-0.6c-2.2-0.4-4.4-0.3-6.6-0.1c-0.3-0.8-0.6-1.7-0.8-2.5c-1.9,1.1-3.8,2.4-5.9,3.2
+			c-3.1,0.2-6.1-1.3-9.1-0.5c-4,0.8-8,1.4-12,1.9c1-3.3,3.5-5.7,5.8-8.2c-1-1-2.5-1.3-3.6-2c-1.4-0.5-3.2-2.6-4.3-0.5
+			c-0.7,0.6-1.3,1.3-1.9,2c2,0.5,4.2,0.9,5.8,2.5c-1.6,0.3-3.1,0.6-4.6,0.9c-0.7,2.5-1.3,4.9-1.8,7.5c-0.6-0.1-1.9-0.2-2.6-0.2
+			c-0.6-3.5-1-7-1.1-10.6c-1.7,0.4-3.4,0.9-5.1,1.3c-1.1-0.4-2.3-0.8-3.4-1.2c0.6,1.4,1.2,2.9,1.8,4.3c-3.2-0.5-6.4-0.9-9.6-1.2
+			c0.8-2.5,1.8-5,2.7-7.5c1.9,0.8,3.9,1.5,5.8,2.3c-0.1-2.6-0.2-5.3-0.3-7.9c-0.7-1-1.3-1.9-1.9-2.9c0.6-1.2,0.9-2.8,2-3.7
+			c3.1-0.8,6.2-1.8,9.1-3.2c-2.2-1.2-4.4-2.4-6.4-4.1c3.6-8.6,7.2-17.3,10.7-26c1.1,1.3,1.8,2.8,2.4,4.3l0.3-0.7
+			c1.8,1.8,4,3,6.6,3.3c0-3.2-1.4-6.1-3.1-8.8c-2,0.4-4,0.8-6,1.2c7.8-18.3,15.3-36.7,22.6-55.1c1.4-3.4,2.4-7,4.4-10.2
+			c3.6-2.4,8.5-2.5,11.4-5.9c2.3-1.9,1.9-5.2,3.4-7.6c2.7-1.3,5.8-0.4,8.4,0.7c-0.8,1.2-1.6,2.4-2.5,3.6c-0.3,0.2-0.9,0.8-1.3,1
+			c0.6,1,1.3,2.1,2,3.2c1.6,2.3,4.2,3.1,6.8,3.4c0.4-0.5,1.1-1.5,1.5-2c1-0.2,2-0.5,3-0.7c0.2,0.6,0.5,2,0.7,2.6
+			c1.5-1.1,2.9-2.3,4.4-3.4c-1.3-0.3-2.7-0.6-4-0.9c-0.7-1.9-1.3-3.9-2-5.8c1.6,0,3.3,0,4.9,0.3c1.6,1,3,2.4,4.6,3.5
+			c1.5,1.3,2.6-1.1,3.8-1.8c0.4-0.1,1.2-0.2,1.6-0.2c0-0.4,0-1.2,0-1.6c-4.3-1-8.7-1.3-13-1.6c0-0.4-0.1-1.3-0.1-1.7
+			c0.5-0.4,1.5-1.1,2-1.5c0.8-0.8,1.3-1.8,1.5-2.9c-1.1-0.9-2.4-1.7-3.6-2.5c0-2.9-0.3-5.8-1.2-8.5c3.3,1.8,6.4,4,9.6,6.1
+			c-0.3-2.4-0.9-4.8-1.6-7.2c-1.7-1.2-5.4-1.3-5.1-4c1.5-4,6.5-3.3,9.8-5C1232.1,475.9,1231.7,473.9,1231.7,471.9 M1230.9,482
+			c0.3,2.8,1.6,6.6,5.1,6.3C1238.5,485.2,1234,481.9,1230.9,482 M1227.1,502.9c2.3,1.4,3-1.4,4-2.9
+			C1228.9,499.5,1226.6,500.3,1227.1,502.9 M1230.6,520.2c1.4,1.4,3.1,2.7,5.2,1.6c1.1-2.3-1.7-3.6-2.8-5.2
+			C1232.1,517.9,1231.3,519,1230.6,520.2 M1190.3,520c-0.6,1.9-1,3.8-1.2,5.8c2,0.6,4.3,0.8,6.1,2c0.9,1.4,1.5,3.2,3.4,3.5
+			c0-2.1,1.2-4.7-0.1-6.5C1195.7,523.2,1192.9,521.7,1190.3,520 M1203.3,522.3c-0.4,2.5,0.2,4.8,2.2,6.5c-0.7,1.8-1.2,3.7-1,5.7
+			c-2.6,7.7-4.8,15.6-7.5,23.2c-6.9,21-15.5,41.4-23.5,62c-0.5-0.1-1.6-0.3-2.1-0.4c-0.2,1.1-0.4,2.2-0.6,3.3
+			c0.2-0.2,0.7-0.5,0.9-0.7c0.1,0.3,0.3,1,0.4,1.3c3.1-3.3,8-1.5,12-2c13.3-0.9,26.7-0.9,40-0.1c0.5,0,1.6,0,2.2,0
+			c0.5,0.4,1,0.9,1.5,1.3c-1,0.9-2,1.7-3,2.6c1.2,0.6,2.4,1.2,3.6,1.8c-0.8,0.5-1.6,1.1-2.4,1.6c-1.1-0.1-2.2-0.2-3.2-0.2
+			c-0.6-2.4-4.1-4.7-6.1-2.4c1,0.5,2,1.1,3.1,1.6c1.1,1.8,1.9,4,3.6,5.4c2.6,0.6,5.3,0.8,8,1.3c0.7-1,1.4-2,2.1-3
+			c2.2,0,4.5,0.2,6.7-0.3c0.5-1,0.9-2,1.3-3c-3.7-0.4-7.9,2.1-10.7-1.4c0.3-1.4,0.5-2.8,0.8-4.2c0.8,1.1,1.6,2.1,2.6,3.1
+			c1.3-2.8,1.4-5.8,0.5-8.7c1-0.8,2.2-1.5,2.8-2.7c-1.9-1.2-4.9-1.2-5.5-3.8c-1.4-2.4,1.1-4.2,2.1-6.1c-2.2-1.6-5,1.7-3.7,4.1
+			c-3.4-10.5-6.4-21.1-9.8-31.6c-2.7-9.9-6.5-19.6-8.2-29.7c-2.5-6.1-2-13.2-5.4-19c-0.1-1.8-0.3-3.6-0.4-5.4
+			C1205.3,522.5,1204.3,522.4,1203.3,522.3 M1230.3,526.3c-1.1,1.5-0.3,3.4,0.8,4.6C1234.2,530.3,1233.5,524.1,1230.3,526.3
+			 M1237.1,530c0.4,1.3,0.9,2.7,1.3,4c-0.6,2-1.9,4.2-0.7,6.3c1,0.2,2,0.4,3.1,0.5c1.3-1.5,2.3-3.4,1.6-5.4
+			C1240.2,534,1238.4,532.3,1237.1,530 M1220.2,533.2c-0.5,1.8-0.8,3.7-0.9,5.6c1-0.1,2.1-0.2,3.1-0.4c1.4-1.3,1.1-3.3,1.5-5.1
+			C1222.6,533.3,1221.4,533.3,1220.2,533.2 M1189.3,537.3c-0.8,1.8,0.6,6,3.1,4.1C1194.7,539.6,1191.6,535.2,1189.3,537.3
+			 M1231.3,537.2c-2,0.6-2,4.6,0.6,3.8C1234.2,541.4,1233.6,535.8,1231.3,537.2 M1179.3,540.6c0.1,1.2,0,2.5,0.5,3.6
+			c1,0.3,2,0.6,3.1,0.7c-0.2-1.6-0.5-3.2-0.9-4.7C1181.4,540.3,1180,540.5,1179.3,540.6 M1214,547.4c2,3,3.2,6.5,3.5,10.1
+			c1.4,1,2.8,2,4.2,2.9c2.5-2.1,8.5-1,8-5.5c-1.2-4.6-1.9-10.8-7.3-12.4C1218.5,541,1216.8,545.7,1214,547.4 M1235.1,545.2
+			c-1.8,0.3-1.2,3.4,0.6,2.7C1237.4,547.5,1236.9,544.7,1235.1,545.2 M1180.2,558.3c-0.1,1.6-1.8,4.2,0.1,5.2c2.7,0.9,2.4-3.3,2.4-5
+			C1182.1,558.5,1180.8,558.3,1180.2,558.3 M1232,576.1c1.4-1.5,3.4-3,3.6-5.2c-0.5-2.7-1.6-5.3-2.4-7.9
+			C1230.6,566.8,1231,571.8,1232,576.1 M1253.9,567.9c-0.5,1.2-0.5,2.6-0.7,3.9c2.4,1.2,4.4,0,5.6-2.2
+			C1257.4,568.5,1255.7,566.5,1253.9,567.9 M1260,573.2c0.3,1.7,1,3.3,2.1,4.6c0.8-0.4,1.7-0.8,2.5-1.2c0-1.1,0.1-2.3,0.1-3.4
+			C1263.2,573.3,1261.6,573.2,1260,573.2 M1238.2,575c-0.1,0.8-0.3,2.5-0.5,3.3c0.8-0.1,2.5-0.2,3.4-0.3
+			C1242.4,575.6,1240,575.2,1238.2,575 M1173.9,586.2c0.4-1.4,0.7-2.9,1.1-4.3c-1.6-0.1-3.1-0.1-4.7-0.2c-0.2-0.7-0.7-2-1-2.7
+			C1167.4,582.2,1171,585.3,1173.9,586.2 M1240.1,589.8c2.5,0.7,4-1.5,4-3.7C1242.8,587.1,1239,587.7,1240.1,589.8 M1177,587.2
+			c-0.1,2.4,1.4,3.7,3.7,3.9c0-1.3,0.1-2.6,0.2-3.9C1179.6,587.1,1178.3,587.1,1177,587.2 M1176.3,594.2c-0.2,2.4,2.7,2.2,4.2,1.5
+			c0.1-1.3,0.2-2.5,0.3-3.8C1179,591.8,1176.4,591.9,1176.3,594.2 M1248.1,595.8c1.4-0.1,2.9-0.1,4.3-0.5c1.2-1.6-0.5-3.6-2.3-2.9
+			C1248.2,592.3,1248.5,594.6,1248.1,595.8 M1166,598.7c1.5,0,3,0.1,4.5-0.1c1.1-1.4,3.3-3.8,1.1-5.4
+			C1168.7,593.3,1166,595.6,1166,598.7 M1259.8,598.2c1.2,0.8,2.7,0.4,4,0.6c-0.2-1.4-0.3-2.7-0.6-4.1
+			C1261.2,593.5,1258.5,596.2,1259.8,598.2 M1266.8,599.1c2.6,0.7,5.3,1.1,7.9,1.7c0-0.5-0.1-1.4-0.1-1.9c-2.1-1.2-3.7-3.4-5.8-4.4
+			C1266.2,593.9,1266.1,597.4,1266.8,599.1 M1242.1,598c-3.3,1.7-1.1,5.9,2.1,5.7c1.5-1.7,1.8-4.3,1.1-6.5
+			C1244.6,597.5,1242.9,597.9,1242.1,598 M1252.3,600.3c0.7,1.8,1.2,3.7,1.3,5.7c-1.3,0.2-2.9,0.4-3.5,1.7c-2.5,1-4.1,3.4-2.4,5.9
+			c3-2.2,6.7-3,10.4-2.8c0.4-1.5,0.9-2.9,1.3-4.4c1.5,3.9,5.8,2,8.5,0.6c-0.9-1.8-2.8-2.2-4.6-2.7c-1.1-1.2-2-2.5-3.3-3.5
+			c-2,0.3-2.6,2.5-2.9,4.2c-0.2-2.2-0.8-4.3-2.2-6C1254.1,599.5,1253.2,599.9,1252.3,600.3 M1171.3,600.2c-0.2,0.7-0.5,2.1-0.6,2.8
+			c-1.5,0.4-3.2,0.5-4.6,1.3c-0.5,2.3,1.8,2.5,3.5,2.7c0.5-0.8,1-1.7,1.6-2.5c0.7-0.1,2.1-0.3,2.8-0.4c-0.1-1.3-0.1-2.5-0.1-3.8
+			C1173.3,600.2,1172,600.2,1171.3,600.2 M1157,618c0.2,1.9,2,2.7,3.4,3.6c0.1,1.4,0.1,2.9,0.5,4.3c1.2,1.5,3.3,1.8,5,0.9
+			c0.1-1.8-1.5-3-2.4-4.3c1.2-0.9,2.4-1.7,3.4-2.7c-0.8-1.2-2.1-2-3.1-3l0.1-0.5l-0.9,0c-1-1.4-2-2.8-2.9-4.1
+			C1158.9,614.1,1157.6,615.9,1157,618 M1152.2,618.3c0,1.2,0,2.4,0,3.6c2.3,0.2,3.6-1.4,3.7-3.6
+			C1154.7,618.3,1153.5,618.3,1152.2,618.3 M1258.4,622.5c-1.3,1.4-2.6,2.7-4,4c0,0.5-0.1,1.4-0.2,1.8c0.6,0.1,1.8,0.2,2.5,0.3
+			c0.7,1.4,1.4,2.9,2.1,4.3c1.2-1,2.4-1.9,3.6-2.8c-0.3-0.7-0.8-2.2-1.1-2.9c-2.1,0.1-4.1,0.2-6.1,0.5c0.4-3.1,3.9-3.5,5.9-5.4
+			C1260.5,622.5,1259.1,622.5,1258.4,622.5 M1153.2,623c0.1,1.5,0.1,3.1,0.2,4.6c-0.3,0.4-1,1.2-1.4,1.5c-1.3,1.4-0.1,3.9,1.8,3.6
+			c2.4-0.1,1.2-3,1.2-4.5c2-0.3,2.9-2.2,2.9-4C1156.4,623.8,1154.8,623.3,1153.2,623 M1210.9,623c-2.1,2.8-3,6.2-2.7,9.8
+			c1-0.1,2.1-0.1,3.2-0.1c0.8-1.8,2-3.5,2.3-5.5C1213.5,625.3,1212.2,624,1210.9,623 M1175.6,624.6c-2.1,0.6-1.6,3.2-2.2,4.9
+			c-0.7,0.2-2.1,0.7-2.7,0.9c1.2,1,2.5,1.6,4,2.1c-0.4,0.2-1.3,0.7-1.7,1c1.2,2.9,4.7,0.9,5.6-1.3c-0.7-0.9-1.3-1.7-2-2.6
+			c0.8-1.4,1.6-2.8,2.2-4.4C1178.3,623.6,1176.8,624.1,1175.6,624.6 M1202.2,624c-0.2,3.7-1.9,7.1-1.4,10.8c-0.7,0.1-2,0.3-2.7,0.3
+			c0.3,0.3,1,1,1.3,1.4c0.2,1.2,0.4,2.3,0.6,3.5c3.3,0.3,5-3.1,7.1-5c-1.3-1.8-3.1-3.3-3.7-5.5
+			C1203.5,627.6,1205.7,623.8,1202.2,624 M1248.4,629.6c1.1,0.6,3.3,1.5,3.6-0.4c-0.3-2.3-1.4-4.4-3.1-5.9
+			C1247.9,625.1,1246.7,627.8,1248.4,629.6 M1196.3,625.4c-0.2,1.5-1.1,3.1-0.2,4.5c2.7,0.1,2.8-2.6,2.7-4.6
+			C1198.2,625.3,1197,625.3,1196.3,625.4 M1276.4,628.1l0,0.8c-4,1.9-7,5.4-11.6,6c-1.7,2.5-0.3,5.6,0.4,8.2c-0.8,0-2.4,0.1-3.2,0.1
+			c-0.1-1.8-0.2-3.6-0.3-5.4c-3,1.2-2.6,4.5-1.7,7c-0.3,1.3-0.6,2.7-0.9,4c1.1-0.4,3.6,0.1,3.5-1.8c2.7,0,4.7-1.7,6.2-3.9
+			c-0.9-1.7-2.6-3.7-1.2-5.6c2.1-2.5,5.3-0.2,7.9,0c1.4-0.7,1.8-2.5,2.7-3.7c1.2,0,2.5,0.1,3.8,0.2c-1.6,1.3-3.4,2.6-2.8,4.9
+			c0.8,3.1-2.8,3.9-4.5,5.5c1.5-0.3,3-0.7,4.5-1c2.3-3.4,3.9-7.2,4.6-11.2c-0.1-1.2-0.2-2.5-0.3-3.7
+			C1281.2,627.9,1278.8,627.6,1276.4,628.1 M1180.8,629.8c-0.1,0.4-0.2,1.3-0.3,1.8c1,0,2.1,0.1,3.2,0.2c-0.1-0.6-0.2-1.7-0.2-2.3
+			C1182.5,629.5,1181.7,629.6,1180.8,629.8 M1193.1,633.1c-1.7,1.8,1.1,4.7,2.7,2.8C1197.7,634,1194.9,631.4,1193.1,633.1
+			 M1182.3,634.2c-1,1-0.9,2.4-1.2,3.7c1.3-0.4,2.5-0.7,3.8-1.2C1185.6,634.9,1183.7,634.3,1182.3,634.2 M1254.3,636.4
+			c-1.6,0.6-2.6,3.7-0.2,4C1256.8,640.6,1256.7,635.9,1254.3,636.4 M1276.9,644.8l0.1,1.3c0,0.4,0.1,1.3,0.1,1.8
+			c0.2,2.5,0,4.9,0.2,7.4c1.3,0.6,2.7,1.3,4.1,2c0.3-1.4,0.6-2.8,0.9-4.2c-2.3-2.1-2.1-5.2-2.3-8
+			C1279.3,644.9,1277.7,644.8,1276.9,644.8 M1262.2,651.1c0.1,1.1,0.2,2.3,0.3,3.5c1.6,0,3.3-0.5,4.8,0.1c0.9,1,1.6,2.1,2.4,3.3
+			c-0.9,0.9-1.7,1.8-2.6,2.8c0.8,0.6,1.6,1.2,2.4,1.8c0.2,1.1,0.3,2.1,0.5,3.2c-1,0.9-2.7,1.4-2.8,3c1.4,1.9,3.3-0.1,4.7-0.8
+			c1.7-1.4,3.9-0.8,5.8-0.4c0.8-2,2.1-3.7,3.8-5c-0.5-0.3-1.5-0.8-1.9-1c-0.9,0.7-1.8,1.3-2.7,2c-2.1-0.9-3.2-2.5-2.8-4.8
+			c-1.7-1.6-2.3-3.8-3.1-5.9C1268.2,651.9,1265.2,651.6,1262.2,651.1 M1253.8,662.3c2.3,2,5.4,2.1,8.3,2.4c-0.9-1.6-1.7-3.5-3.5-4.3
+			C1256.7,659.7,1255.2,661.3,1253.8,662.3z"/>
+		<path class="st2" d="M1208.3,479.3c4-2.3,7.9-4.7,12.3-6.2c0.7,1.3,1.8,3.4,0.2,4.5c-5.1,4.6-10.8,8.6-16.8,11.8
+			c-2.9-1.8-2.1-5.7-2.6-8.6C1203.6,479.9,1205.9,479.4,1208.3,479.3z"/>
+		<path class="st2" d="M106.5,475.4c3.5,0,7.1,0.1,10.6,0.3c-1.4,0.3-2.8,0.6-4.2,1c2.9,0.1,5.8,0.2,8.6,0.3
+			c-0.2,1.1-0.3,2.1-0.5,3.2c0.7,0,2.2,0.1,2.9,0.1c0.2-0.8,0.5-2.4,0.6-3.3c3.8-0.1,7.5,0.1,11.3,0.4c-1.8,1.7-6.9,4-3.7,6.6
+			c3.6,1.3,6.4-2.7,7.8-5.5c4.9-1.1,10-1.8,15-1.5c6,0.2,12.3,0.8,18-1.6l1.1-0.4c1.8-0.2,3.6-0.3,5.3-0.4c0.9,1.9,1.9,3.8,2.3,5.9
+			c0.2,0.7,0.5,2.1,0.6,2.8c-1.2,0.7-2.4,1.4-3.7,2.1c1.7,1.8,4,2.5,6.4,2.8c3.8,9.6,8.1,18.9,12.2,28.4c1.4,3.9,3.4,7.5,5.3,11.2
+			c-0.8,0.3-2.3,1-3.1,1.3c0,1.5-0.1,3.1,0.2,4.6c0.9,1.8,2.7,2.9,4.3,3.9c1,0.1,2,0.2,3.1,0.3c1.3,3,2.7,6,4,9.1
+			c-0.9,1.1-1.5,2.8-2.9,3.2c-1.6-2.3-3-4.8-4.6-7.1c0.3,2.5,0.6,5,0.9,7.5c2,0.5,5.1-0.1,5.5,2.6c0.5,3.3,0.3,6.7,0.4,10.1
+			c1.8-1.9,3.7-3.7,5.8-5.2c1,1.8,1.9,3.7,2.7,5.6c-0.5,1.8-2.4,3.7-1.2,5.6c1.4,0.4,2.9,0.6,4.3,0.9c0.5,1,1,1.9,1.5,2.9
+			c-1.9,1.9-3.5,4.1-3.7,6.9c2-0.2,4.1-0.5,6.1-0.8c-0.2,2.1-0.3,4.2-0.5,6.3c1.6,0.5,3.1,1,4.7,1.5c1.2,3.1,2.8,6,4.2,9
+			c-1.1,0.6-2.1,1.2-3.2,1.8c0.4,1.5,0.9,2.9,1.3,4.4c-0.5,1-0.9,1.9-1.4,2.9c1,3.5-0.2,8.3-4.6,8c-1-1-2.1-1.9-3.1-2.8
+			c-0.6,2.5-1,5.1-1.2,7.7c1.9-0.3,3.9-0.5,5.9-0.6c2.6,0.1,5.9,2.1,8.1-0.1c0-2.3,0-4.7,0.1-7c2.3,0.2,4.4,1.2,6.1,2.9
+			c0.8,1.1,1.3,2.4,1.6,3.7c-1.1,2.2-2.3,4.5-2.7,6.9c2-0.3,3.9-0.7,5.9-1c1.3,3.6,3.1,7,4.8,10.4c-2,2.7-5,4.2-7.9,5.7
+			c-2,2.3-3.9,4.7-6.2,6.7c-0.4,0.4-1.3,1.1-1.7,1.5c-0.7-1.3-1.4-2.6-1.8-4c-0.4-1.7,1.6-2.4,2.5-3.4c1.5-1.2,2.8-2.7,4.1-4.1
+			c2.5-0.2,5-0.6,7-2.2c-1.9-1.7-3.9-4.4-6.8-4c-3,0.8-5.9,2.3-9,3c0.8-2.5,3.2-5.6,0.4-7.8c-2-2.4-5.2-0.7-7.2,0.7
+			c0.1,3,1.2,5.8,2.1,8.5c0.5,3,3.1,4.8,4.4,7.4c-0.5,3.4-2.1,6.5-3.2,9.7c-0.5,0.1-1.5,0.3-2,0.4c0-1.7,1.2-4.9-1.5-4.8
+			c-2.9,0.3-7.6-0.1-8.1,3.7c1.2,3,4.1,5.3,7.3,6c0.5,0.1,1.4,0.2,1.8,0.3c1.7,0,3.4-0.1,5-0.1c-0.1,2.6,0.1,5.3,0.6,7.9
+			c-3.2,0.9-6.3,2.3-9.5,3.2c-1.2,0.6-2.3-0.5-2.6-1.5c-0.1-2.1,0.4-4.1,0.6-6.2c-2.5,0.4-4.9,0.9-7.4,1.6
+			c-12.4-26-24.5-52.1-36.4-78.4c0.2-3.9,0.1-7.9-0.3-11.8c3.1,0,6.2-0.3,9.3-0.1c3.2,0.2,6,1.9,9.2,2.3c4.3-0.2,8.7-0.7,13-0.6
+			c0.6-3.8-2.4-6.4-3.8-9.6c-0.9-2.3,1.9-3.6,3.1-5.2c-0.3-0.8-0.6-1.6-0.9-2.4c-3.7,1.1-8.5,0.2-11.1,3.6c-1.1,1.3-1.7,2.9-2.3,4.5
+			c3.1-1.1,4.6-4.5,7.4-5.9c3.4,1.9,2.6,6.4,1.9,9.5c-0.4,2.7-3.8,3.1-6,2.9c-3.8-0.2-6.2-3.6-8.5-6.2c0.4-0.7,0.8-1.3,1.2-2
+			c-2-1.1-4-2.2-6-3.3c1.2-0.8,2.5-1.6,3.7-2.4c0.8,1.7,1.8,3.3,3.3,4.4c-0.3-1.6,0.6-4-1.2-5c-3.1-2-6.5-3.8-10.2-4.1
+			c-3.1,3.4-3.4,8.3-5,12.4c-2.1-1.2-4.3-2.4-6.4-3.7c-1.1-2.5-1.7-5.2-2.1-8c-2-2-2.7-4.8-3.5-7.4c-0.6-1.5-1.6-2.9-2.5-4.2
+			c-2.1,4.3-0.6,9-0.4,13.5c0.3,6.5,0.4,12.9,0.7,19.4c-1.5-0.7-3-1.5-4.5-2.2c0,1.4,0.1,2.8-0.1,4.1c-2.8,0.2-5.5-0.1-8.3,0.2
+			c-2.8,2.4-0.4,6.1,2.1,7.6c-0.2,0.5-0.7,1.6-0.9,2.2c-3.5,1.1-6.8,2.9-9.4,5.5c1,0.8,1.9,1.5,2.9,2.3c2.7-1.7,5.4-3.6,7-6.5
+			c0.9-0.5,1.8-0.9,2.8-1.4c-0.7-1.9-3.7-4.4-0.8-5.6c3.1,0.1,6.2,0.8,9.2,1.3c-0.2,2.4-0.6,4.9-1.3,7.2c-0.4,0.3-1.2,0.9-1.6,1.2
+			c-2-0.6-4.2-1.6-5.9,0.3c2.3,2.5,5,4.7,8.4,5.7c0,1.2-0.1,2.4-0.1,3.6c-2.1,0.6-4.1,1.1-6.2,1.7c-1,2.3-1.1,4.7-0.4,7
+			c1.5,0,3.1,0,4.6,0c-0.2-1.1-0.3-2.3-0.5-3.4c0.6-0.4,1.8-1.1,2.4-1.5c-0.1,2.7-0.2,5.4-0.4,8.1c-4.2,2.1-5.2,7.2-9.2,9.5
+			c-1,0.6-2,1.2-3.1,1.8c-0.2-2.4-0.1-4.9-0.7-7.2c-2.1-2.2-5.1-3.7-6.5-6.5c-1.4-2.6-2.5-5.2-3.9-7.8c1.1-0.5,2.2-0.9,3.3-1.4
+			c-0.4-2.1-1.4-3.9-2.9-5.5c-0.2-3.9-0.7-7.8-0.1-11.7c1.5-2.5,4.4-3.7,6.7-5.3c-0.3-0.8-0.7-1.5-1-2.3c-1.6,0.1-3.3,0.2-4.9,0.4
+			c0.1-1.7,0.1-3.3,0.2-5c1.7-0.2,3.4-0.5,5.1-0.7c-2-0.7-3.9-1.4-5.9-2.1c0.4-7.2,0.5-14.3,1.2-21.4c3.3,1.3,6.2,3.5,9,5.6
+			c-0.7-1.7-1.4-3.3-2.3-4.9c0.5-0.5,1-1,1.5-1.5c1.6-1,3.6-1.9,3.6-4.1l-0.1-0.9c-1.7,0-3.3,0-5,0c-0.3,1.2-0.6,2.4-1,3.6
+			c-1.3,0.1-2.6,0.3-3.8,0.4c-0.6-1.8-1.1-3.5-1.6-5.3c0.6-9.1,1.1-18.4-0.2-27.5c-1.1-8.7-6.6-17.3-15.3-19.8
+			c-0.7-1.1-1.4-2.2-2.1-3.4c-2.8,0.3-5.7,0.5-7.9-1.6c2.8-1.7,6.4-2.9,7.8-6.2c-2.6,0-5.4-0.1-7.9,0.7c-1.7,2.9-3.2,5.9-4.5,9
+			c-0.1-0.1-0.2-0.4-0.2-0.5C106.7,484.7,106.5,480,106.5,475.4 M173.3,481.2c1.6,0.8,3.3,1.4,5,1.9c-0.3-1.4,0.7-4-1.4-4.3
+			C175.4,479,174.4,480.3,173.3,481.2 M150.8,487c0.3,1.9,1.2,3.6,1.9,5.4c-0.6,1.5-2.1,2.4-3.3,3.4c0.1,1,0.2,2,0.4,3
+			c2.6-2.1,5.3-4.1,8.7-4.6c0.1-1.3,0.3-2.7,0.4-4c0.1-2-1.6-3.1-2.9-4.3c0.3-1.7,0.6-3.4,0.9-5.1
+			C153.4,480.3,151.9,484.3,150.8,487 M136.4,491.3c0,1.2,0,2.3,0.1,3.5c2.3,0.7,4.8,0.9,7.2,0.9c0-0.6,0-1.7,0-2.3
+			C141.9,491.1,139,491.3,136.4,491.3 M160.8,496c1.4,2.2,2.8,4.7,5.3,5.8c2.9-0.6,5.9-1.2,8.9-1.4c1.5,0.2,2.6-1.8,1.2-2.7
+			c-2.5-1.8-5.4,0.9-8,0.3C165.8,497.1,163.5,494.4,160.8,496 M136.1,497.1c-0.3,1.3-0.7,2.6-1,4c2.1,1,4.5,1.6,6.8,0.8
+			C142.3,498.8,138.1,498.6,136.1,497.1 M177.4,499.7c1.2,1,2,2.8,3.6,3.2c1.4-0.4,2.5-1.2,3.8-1.9
+			C182.6,499.4,179.9,498.3,177.4,499.7 M142.4,508.8c1.2,2,3.7,0.2,5.4,0c-0.3-1.6,0.6-4.6-2-4.5
+			C143.1,503.1,141.6,506.5,142.4,508.8 M155.5,507.1c1.8,1.9,4.1,1.8,5.7-0.3c-1-0.7-1.8-2.1-3.2-2
+			C157.2,505.5,156.3,506.2,155.5,507.1 M187.6,512.1c-0.3,1.8-0.9,3.5-2.4,4.7c1.1,0.7,2.2,1.6,3.5,1.8
+			C191.8,517.2,191.7,511.3,187.6,512.1 M175.1,515.4c0.1,2,1.2,3.7,3.4,4c2.3,0.8,3.4-1.6,4.7-3c-0.6,0.3-1.7,0.8-2.3,1.1
+			c-0.8-0.7-1.5-1.4-2.3-2.1C177.4,515.4,176.3,515.4,175.1,515.4 M148.1,520.9c0,0.8,0.1,2.4,0.1,3.2c1.4-0.4,4.2-1,2.9-3.2
+			C150.4,520.9,148.8,520.9,148.1,520.9 M138.1,524.1c-0.3,3.8,4,2.2,6.1,1.5c0.8,1.4,1.6,2.8,2.3,4.2c1.6-0.1,3.6-0.7,3.3-2.7
+			c-1.4-2-3.7-3.1-5.5-4.6c-0.4,0.3-1.1,0.9-1.4,1.2C141.4,522.9,138.4,521.2,138.1,524.1 M184.8,530.3c-1.7,0.2-5.7-0.5-5.3,2.3
+			c1.2,1.5,4,2.5,5.7,1.2c3.8,0.7,7.2,2.4,10.7,4c0.2-0.4,0.6-1.3,0.9-1.7c-0.6-1-1.1-2-1.6-3c0.3-1.3,0.5-2.6,0.8-3.9
+			c-2.3-0.4-4.5,0.3-6.5,1.3C188,530,185.8,528.2,184.8,530.3 M170.4,533c-0.5,3.1,3.3,2.6,5.2,3.6c1.2,2.5,1.6,5.5,2.9,8
+			c2,1.6,5,2.2,7.5,1.4c1.6-1.4,2.1-3.9,2.9-5.8c-2.9,0.1-6.9,2-9-1c-2.4-3.3-4.8-6.6-8-9.2C171,530.9,170.1,531.7,170.4,533
+			 M139,532c0.5,2.7,2.3,5.1,4,7.2l0.9-0.2C143.7,536.3,142.4,532.1,139,532 M146.1,532.3c-1.3,0.8-0.1,3.4,1.3,2.2
+			C148.8,533.6,147.6,531.1,146.1,532.3 M151.3,537.4c-1.8,1-0.2,3.2-0.2,4.7c1.6-0.8,4-1,4.7-3
+			C155.8,536.7,152.9,537.1,151.3,537.4 M158.4,537.3c-1.3,1.3,1,3.7,2.3,2.3C162,538.3,159.7,536,158.4,537.3 M166.1,541.3
+			c-0.2,1.3-0.4,2.6-0.7,3.9c2.1,1,4.2,2,6.3,3.1c1,0.4,2.5,0.6,3.4-0.2c0.9-1.5,0.5-3.3,0.3-4.8C172.2,543,168.9,542.9,166.1,541.3
+			 M187.1,548c-0.1,0.8-0.3,2.3-0.5,3.1c0.6,0.2,1.2,0.3,1.8,0.5c0.2,3.4,4.2,2.3,3.7-0.7C192.6,547.9,189,548.4,187.1,548
+			 M145.5,552.1c0.8,0.8,1.6,1.7,2.5,2.5c1.2-0.9,2.6-1.9,2.3-3.6C148.8,550.8,145.9,549.9,145.5,552.1 M137.8,555.5
+			c-2,1.7-2.1,6.1,1.2,6.1C143.2,561.8,141.9,554,137.8,555.5 M149.1,563.2c1.3,0.9,2.6,1.8,4,2.7c0.8-1,1.7-1.9,2.5-2.9
+			c-0.8-1.7-1.6-3.3-2.5-5C151.7,559.7,150.4,561.4,149.1,563.2 M214.2,565.2c-1.5,0.1-1.9,2.8-0.2,2.8
+			C215.5,568,215.9,565.3,214.2,565.2 M209.2,575.3c0,1.1,0.1,2.3,0.1,3.5c2.2,0,4.5,0.1,6.7,0c-0.7-1.2-1-2.7-2.3-3.3
+			C212.2,575.2,210.7,575.3,209.2,575.3 M194.8,580.3c-3.2-0.5-6.1,0.9-8.8,2.5c-1.3,0.7-1.7,1.7-1,3.2c3.9,0.3,6.9-3.2,10.8-2.7
+			c0.2,1-0.2,1.8-1.2,2.3c-2.6,1.6-3.9,5.5-3.4,8.2c2.6,0.7,5.3-1.4,7.9-2c-0.5,2-1.2,4-2.1,5.9c2.1-0.4,4.4-0.5,6.4-1.5
+			c1-1.3,1.4-3.1,2.8-4.1c0.9,2.2,1.9,4.7,4.8,4c-1.2-3.2,0.5-7.9-2.4-10.2c-0.8-0.5-1.7-1-2.5-1.6c-1.2,1.1-3.1,1.8-2.9,3.8
+			c-0.2,0.4-0.7,1.2-1,1.6c-0.3-3.6-0.1-7.2,0.6-10.8C200,577,197.7,581,194.8,580.3 M218.4,593.5c1.4,1.5,3.3,0.8,4.7-0.3
+			c-1.1-1.1-2.1-2.2-3.2-3.2C219.2,591,217.8,592,218.4,593.5 M145,597c-0.5,0.7-1.1,1.4-1.6,2.1c-1.6,0.2-4.2,0.8-4.1,2.9
+			c0.9,2.2,3.4,3,5.3,4.3c0.2,0.7,0.7,1.9,0.9,2.6c2.8,0.3,3.6-2,3.3-4.4c-0.8-0.2-2.2-0.7-3-0.9c2.2-1.9,5.6-3.9,4.7-7.3
+			C149.3,594.3,146.4,595.7,145,597 M202.6,598.5c-0.2,1.7-0.5,3.5-0.7,5.2c-1.4,0.3-2.8,0.6-4.2,0.9c-1.2,1.9-0.5,4.1-0.2,6.2
+			c-1.4,1-2.8,1.9-4.3,2.8c2.7,2.4,5.7,4.4,8.4,6.8c1.1,0.1,2.2,0.2,3.4,0.3c-0.7-5-2.3-10.1-1.4-15.1c1.1,0.6,2.1,1.4,3.2,1.9
+			c2-0.2,3.3-1.8,4.3-3.3c-1.3-0.5-2.6-0.9-3.9-1.4c-0.6-1.5-1.2-3-1.8-4.4C204.4,598.4,203.5,598.5,202.6,598.5 M220.1,605.9
+			c2.5-0.7,4.9-1.7,7.3-2.8c0.1-0.8,0.2-2.5,0.3-3.3c-0.7-0.4-2.1-1.2-2.8-1.6C222.1,599.9,220.9,602.9,220.1,605.9 M212.2,608.2
+			c0,0.6,0.1,1.9,0.1,2.6c1.4,0,2.9,0,4.3,0c0-0.6,0.1-1.8,0.1-2.4C215.2,608.3,213.7,608.3,212.2,608.2 M212.8,615.9
+			c-0.1,2.1-0.6,5.3,2.2,6c2.2-0.3,2.6-3,2.2-4.8C216.6,615.3,214.2,616.2,212.8,615.9 M203.4,625.9c0.5,3.7,0.5,8.5,4.6,10.1
+			c1.5-3.6,0.8-7.6-2.4-10.1c0.6-0.8,1.2-1.7,1.9-2.5c-0.2-0.3-0.5-0.9-0.6-1.2C205.7,623.4,203.1,623.9,203.4,625.9 M214.1,631
+			c1.8,1.3,3.7,3,6,2.5c2.3,0.2,1.3-2.7,1.6-4.1C218.9,627.8,216.1,628.9,214.1,631z"/>
+		<path class="st2" d="M427.4,475c1.7-0.7,3.4-0.7,4.1,1.3c-1.3,0.9-3.9,0.8-4.2,2.8c0.3,2,2.4,3.1,2.9,5c0.2,1.7,0.1,3.4,0.1,5.2
+			c-2.8,0-5.5-0.1-8.3-0.3c1.2-0.7,2.4-1.4,3.5-2.1c-3.1-2.9-6.1-6.1-8.4-9.8C420.7,476.6,424.1,475.9,427.4,475z"/>
+		<path class="st2" d="M1014,476.6c13.2-0.4,26.3-1.4,39.5-1c-0.4,4.7-0.8,9.3-0.8,14c-4.4-0.4-8.8-0.3-13.2-0.4
+			c-3.1-0.5-6.2-0.7-9.2-1.3c-1.9-1.1-2.4-3.6-3.7-5.2c-1.3,0.2-2.5,0.5-3.8,0.8c-0.6-1.2-1.2-2.4-1.8-3.6c-1.2-0.2-2.5-0.5-3.7-0.7
+			c0-0.5,0.1-1.5,0.2-2c-4-0.3-8.2-1.1-12.2-0.1c-1.9,3.1-4.9,5.1-7.3,7.8c-1.2,4.4-3.1,9.9,0.3,13.8c1.2,2,3.9,2.8,5.9,1.4
+			c2.9-1.8,7.8-3.6,6.6-7.9c-2.4-0.8-4.9-1-7.3-1.7c-1.4-4.9,2.3-9.5,6.6-11.4c1.9,2.7,3.2,5.9,5.9,8c2,0.5,4.1,0.5,6.1,0.7
+			c0.9,3.7,3,6.8,5.7,9.5c-4.7,7.3-5.4,16.4-5.5,24.9c0,29.8,0,59.7-0.1,89.5c-1.4,1-2.8,2.1-4.2,3.1c1.2,0.8,2.4,1.7,3.6,2.5
+			c-0.8,1.6-1.5,3.1-2.2,4.7c3.5,5.4,1.4,12.1,1.8,18.1c-0.3,3.9,1.6,9.1-2.7,11.3c0.6,1.2,1.2,2.4,1.7,3.6
+			c-1.4,1.4-2.9,2.5-4.4,3.7c-0.9-1.8-1.9-3.6-2.8-5.4c-0.8,0.6-1.6,1.2-2.4,1.8c-2.3-1.8-3.7-4.3-4.2-7.2c2.1-2.2,4.8,1.2,7.3,0.2
+			c-0.6-1.3-1.2-2.7-2.3-3.6c-2.9-0.7-6,1-8.9-0.2c-4.4-1.6-7.6-5.3-11.9-7c-0.8,2.6-1.8,5-2.4,7.6c0.8,2.2,2.3,4.1,3.5,6
+			c2.1-1.5,4.3-2.8,6.9-3.2c1.7,1.1,3,2.6,4.2,4.2c-3.1,1.3-4.4,4.1-4.3,7.3c3.1,0.4,5.7-1.2,8.4-2.5c2.7,1.1,5.1,3,7.6,4.6
+			c-0.8,2.9-2.5,5.3-4.4,7.7c-1.1,0.4-2.3,0.6-3.4,0.8c-0.5-1.9-1-3.8-1.6-5.7c-1.6,0.5-3.4,0.6-4.8,1.5c-0.9,1-1.1,2.5-1.5,3.7
+			c1.7,2.2,3.4,4.5,5.9,5.8c-1.8,1.9-3.6,3.8-5.6,5.4c-3.2-1.4-6.7-2.1-10-2.9c-1.2-3.4-1.5-7.1-3.1-10.3c-3.5,1.8-6.8,4.8-7.9,8.6
+			c0.4,2.4,2,4.4,3.2,6.4c0.9,0.3,1.8,0.6,2.8,0.8c0.8,1.6,1.6,3.2,2.4,4.9c-1.5,1.2-3,2.3-4.5,3.5c1.7,2.1,3.1,4.5,3.7,7.1
+			c0.3-0.1,0.9-0.4,1.2-0.5c0.3-1.1,0.6-2.2,1-3.2c1.6,1.3,2.3,3.1,2.6,5c-1.8,1.6-3.5,3.2-5.3,4.9c-0.3-0.5-1-1.4-1.3-1.9
+			c-0.5-0.8-1.1-1.5-1.6-2.2c-3.3-0.5-6.2-2.2-9.2-3.5c-0.2,0.4-0.7,1.1-1,1.4c1.2,0.6,2.5,0.9,3.9,1c1.1,1.8,2.2,3.6,3.2,5.4
+			c0.1,2.6-1.2,4.3-3.8,4.6c-1.4,1.4-2.7,2.9-4.1,4.4c-0.3-0.9-0.8-2.7-1.1-3.6c1.2-6.1,0.9-12.4,1.9-18.6c0.1-10,0.1-20.1,0-30.1
+			c0.1,2,0.4,4,0.6,6c4.3-0.6,7.5-3.7,10.8-6.2c0.7,0.3,2,0.8,2.7,1.1c0.8,1.4,1.6,2.7,2.4,4.1c1.1-0.2,2.2-0.4,3.3-0.7
+			c1.3-2.5,2.4-5.2,5.5-5.8c0-0.5-0.1-1.4-0.1-1.9c-3.9-2.1-6.8,1.5-9.8,3.4c-2.9-4.4,1.5-9.6-1.6-13.9c-1.6,1.6-3.6,2.9-4.5,5.1
+			c-0.5,2.1-0.3,4.3-0.3,6.5c-1,0-2,0.1-2.9,0.1c-0.7-2.5-1.4-5.1-2.2-7.6c-1.4,1.1-2.7,2.1-4.1,3.2c0.2-10,0-20,0.1-30
+			c0.5-2.4,1.5-4.8,2.1-7.2c-1-2.2-2.9-3.8-4.7-5.3c-1.9-0.2-2.4,2-3.4,3.1c-3.3,0.4-6.7,0.4-10,0.3c0.7-1.7,1.5-3.5,2.2-5.2
+			c-3.1-0.8-6.3-1.2-9.5-1.2c1.3,2.6,3.5,4.5,5.8,6.2c-5.6-0.1-11.2,0.5-16.8-0.1c-3.4-1.6-5.5-5.1-8.8-7.1
+			c-0.9,1.7-1.8,3.4-2.6,5.1c1.2,0.7,2.4,1.4,3.6,2.1c-1.9,0-3.7,0.1-5.6,0.1c-0.7-1.5-1.5-3-1.7-4.7c1-1,2.1-2,3.2-2.9
+			c-1.2-0.5-2.4-0.9-3.6-1.4c-0.7-1.9-1.6-3.7-2.8-5.3c-0.1-1.8-0.2-3.6-0.2-5.4c4.4,0.2,8.7,1.4,13.1,0.7c0.2,3.6-3,6.6-1.9,10.2
+			c1-0.9,2-1.8,3-2.7c3.7,2.4,8,3.1,12.4,2.9c2.2-3.4,5.2-7.1,3.7-11.4l0-0.4c6.5,0,13.1-0.3,19.6,0.5c0.8,0.1,2.3,0.2,3.1,0.3
+			c0-2.4,0-4.9,0-7.3c0.4-8,0.5-16.1,0.5-24.1c0.7-1,1.4-2,2.1-3c-0.8-0.8-1.6-1.5-2.3-2.2c-0.2-5.3-0.4-10.6,0-15.9
+			c0.8-7.7-0.5-15.5,0.3-23.2c1.2,1.2,2.5,2.4,3.8,3.6c0.2,1.9-1.1,6.2,2,5.8c2.6-2.1,5.4-3.9,8.7-4.9c1.5-0.5,0.7-2.2,0.6-3.3
+			c-0.9-4.1-1.4-8.2-1.6-12.4c-3.6-0.5-5.5,2.7-8,4.7c-2,0.8-4.2,0.6-6.3,0.8c-0.5-4.5-0.5-9.3-3.1-13.2c-0.2-0.4-0.6-1.1-0.8-1.4
+			c0.1-0.8,0.3-2.3,0.4-3.1c3.1,1.3,5.7,3.3,8.1,5.6c-1-3.3-2.3-6.5-4-9.5c-2.1,1.5-4.5,2.7-7,3.4c-2.5-4.1-7.4-5.8-11.9-6.7
+			c0.2-5.6,5.6-8.8,7.2-13.9C978.8,476.7,996.4,476.6,1014,476.6 M961.8,482.2c0.9,1.9,1.9,4.1,4.2,4.6c1.9,0,1.8-2.1,1.5-3.5
+			C966.5,481.1,963.7,482.3,961.8,482.2 M978.5,489.3c-0.4,1.1-0.8,2.2-1.2,3.3c0.9-0.2,1.8-0.4,2.8-0.6c1.1,3.4,3.1,8,7.5,7.6
+			c2.3-0.2,2.2-2.3,2-4.1c-1.9-0.1-4.2,1-5.7-0.6c-1.6-1.4-1.1-3.8-1.5-5.6C981.2,489.3,979.8,489.3,978.5,489.3 M1010.7,502.8
+			c-1.2,2.8,3,3.5,4.5,5c-0.1-2.1-2-5.4,1.3-5.5c0.1-0.4,0.2-1.3,0.2-1.8C1014.8,501.2,1012.5,501.5,1010.7,502.8 M979.3,505.4
+			c-2.2,1.9,5.7,6.1,3.6,1.8C982.1,506.4,980.4,504,979.3,505.4 M992.4,532.3c-1.8,0.8-0.9,3.1-1.2,4.7c2.5,0,3.9-1.9,4.7-4
+			C994.8,532.8,993.6,532.2,992.4,532.3 M986.5,571.3c2.4,2.5,1.4,6.3-0.1,9c-0.5,1.6-2.4,3.5-0.7,5c3.1,1.2,6.5,1.3,9.6,2.6
+			c-1.6,2.2-3.5,4.1-5.7,5.8c-1.6-0.2-3.1-0.4-4.6-0.6c-0.6,1.6-1.8,3.1-1.2,4.9c0.2,1.9,2.3,2.5,3.7,3.5c0,3,0.6,6.1,0.1,9.1
+			c-1.4,1.3-4.5,1.8-3.7,4.4c0.1,1.8,2.8,2,3.7,0.7c1.7-2.1,3.3-4.5,5-6.6c2.2,2.1,4.9,5.7,8.2,3.2c-2.2-2.5-4.5-5.1-5.3-8.4
+			c-0.3-0.4-1-1.1-1.3-1.5c-1.3-0.4-2.6-0.7-3.8-1c0.3-0.3,0.8-0.9,1.1-1.2c2.8,0.3,5.7,1.7,8.6,0.7c6.4-1.4,7.6-11,3-15
+			c-1.6-0.5-3.2-0.7-4.8-1.2c-1.2-1.3-1.3-3.4-1.9-5c-2.1-0.5-4.2-1.1-6-2.5c1.1-2.3,2.9-4.4,3.4-6.9
+			C991.9,567.5,988.5,569.9,986.5,571.3 M1011.9,570.2c1,2.1,2.4,4.1,4.4,5.3c2,0.7,4,0,5.5-1.4
+			C1019.5,571,1015.6,570.1,1011.9,570.2 M977.8,574c-0.9,2,0.8,3.4,2.2,4.4c0.2-1.5,0.4-2.9,0.5-4.4
+			C979.5,572.6,978.6,572.6,977.8,574 M977,599.2c-1.1,1.4,1.2,2.2,1.8,3.2c0.6-0.4,1.8-1.3,2.4-1.7
+			C980.3,599.6,978.5,597.8,977,599.2 M952.1,601c-1.1,1-1.3,3.6,0.8,3.3C955.7,604.7,954.5,600,952.1,601 M976.8,606.8
+			c-0.6,1.6,0.3,3.2,0.7,4.7c1,0,2.1,0,3.2,0.1c0-1.9,0-3.7,0-5.5C979.4,606.3,978,606.5,976.8,606.8 M937.8,610.9
+			c1.8,1.4,3.6,2.8,5.7,3.8c0.2-1.1,0.5-2.3,0.6-3.4C942.2,611,938.8,608.6,937.8,610.9 M1008.2,614.8c1.1,2.1,3.4,0.8,5,0.1
+			c-1.2-1.4-2.3-2.8-3.5-4.1C1008.8,612,1006.8,613.2,1008.2,614.8 M991.8,620.8c-1.4,1.2,0.3,1.9,1.2,2.7c0.9-0.2,1.9-0.2,2.9-0.3
+			c1,1.3,1.4,3,2,4.5c2.3,0.4,3.7-2,2.3-3.8C998,622,994.8,619.3,991.8,620.8 M1011.4,624.5c-0.3,1.9-0.8,3.8,0.3,5.5
+			c2.6-0.9,3.2-3.3,3.1-5.7C1013.7,624.3,1012.5,624.4,1011.4,624.5 M984.3,632.2c0,1.3-1.1,3.4,0.6,4c1.4,1.3,4.2-0.5,3.3-2.3
+			C987.9,632,985.8,632.5,984.3,632.2 M998.8,633.8c-0.4,1-0.8,2.5,0.1,3.4c1.3,0.3,2.5,0.3,3.9,0.5c1-1.3,1.8-2.8,2.2-4.3
+			C1002.9,633.4,1000.7,633,998.8,633.8 M1013.8,641.8c1.2,0.8,2.4,1.9,3.9,0.9c0-0.6,0-1.8,0-2.4
+			C1016.1,638.9,1015,640.7,1013.8,641.8 M972.9,683.1c-0.4,3.5-0.4,7,0.2,10.5c1.2-3.1,3.4-6,2.9-9.5
+			C975,683.7,974,683.4,972.9,683.1z"/>
+		<path class="st2" d="M356.9,475.5c8.1-0.8,15.9,1.6,24,0.9c8.8,0.4,17.5-0.4,26.2,0.2c-4.8,1.1-9.8-0.3-14.5,1.1
+			c-2.7,3.6,2.1,7.4,5.6,7.5c-1-2.5-2.6-4.8-4.3-6.9c2.5,0,4.9-0.1,7.4-0.1c0.7,1.8,0.6,4.2,2.6,5.2c2.9,0,3.6-3.4,5.2-5.2
+			c2.8,1.8,2.8,5.3,3.5,8.3c1.9-0.2,3.8-0.5,5.7-0.7c0,1.6,0,3.1,0.1,4.7c-1.8,0.2-3.5,0.6-5.2,1c-2.1-0.6-4.2-1.3-6.2-2
+			c-1.6,0.7-3.2,1.4-4.9,1.9c-2.3-0.2-4.3-1.4-6.4-2.1c1,2.9,0.4,5.8,0.1,8.7c1.2,1.4,2.6,2.5,4,3.6c-0.2,0.6-0.6,1.7-0.9,2.2
+			c-1.1,3.3-3.5,5.8-5.8,8.4c-1,1.8-1.8,3.6-2.6,5.4c-2-1.1-3.9-2.2-5.9-3.2c-4-0.8-6,4.1-9.7,5.1c0.4,1.6,1.4,2.9,2.7,4
+			c1.5-2.5,3.7-4.3,6.5-5c2,1.3,4.1,2.5,6.3,3.6c1.4-2.3,3.2-4.2,5.6-5.4c0.2,3.6,0.2,7.3,0.1,10.9l-0.5-0.1c-0.5-0.5-1.5-1.6-2-2.1
+			c-1.1,0.9-2.1,1.7-3.2,2.7c-1-1.6-2-3.2-3.3-4.6c-2.3,1.9-5.2,1.5-7.9,1.8c-1.5,1.7-0.6,4-0.4,5.9l-0.2,0.8
+			c-4.4,3.6-7.4,8.5-10.8,13c-0.9,1.7-1.9,4.7,0.3,5.8c1.8,0.6,3.6,0.7,5.4,0.9c0,1.9,0.8,4.4-1.1,5.7c-2.6,2.1-5.6,4.9-9.3,3.9
+			c1.1-2.7,2.8-5.6,1.1-8.4c-2.8,2.7-4.7,6.1-7.4,8.9c-0.4,0.4-1.2,1.1-1.7,1.5c0,0.6,0,1.8,0,2.4c2.1-0.2,4.3-0.3,6.5-0.4
+			c1.7,0.3,3.8,0.4,4.9,2c0.5,3.1,0.1,6.3-0.1,9.4c-0.2,0.3-0.7,0.9-1,1.2c-0.2-1.9-0.4-3.8-0.8-5.6c-2.4-0.5-4.8-0.6-7.2-1
+			c-1.6-0.7-3.2-1.5-4.8-2.3c0.1-9.3,2-18.5,1.8-27.8c-0.6-0.2-1.7-0.5-2.3-0.7c-0.7-0.2-2-0.6-2.6-0.8c-4,4.5-7.2,9.9-9,15.6
+			c3.8,1.6,4.6-4.1,8-4.7c-8.6,22.7-18.3,45-28.5,67.1c-2.2-0.6-4.2-1.4-5.9-3c-0.6-0.1-1.9-0.2-2.5-0.3c1.3,3.8,4.8,6.6,4.8,10.8
+			c-9.1,18.9-17.9,37.9-27,56.8c-2.2,4.8-4.6,9.6-6.5,14.5c-2.2-1.9-4.5-3.9-6.8-5.7c0.4-2.7,2-4.8,3.3-7c0.5-2.1,0.5-4.3,1-6.3
+			c0.8-2.1,2.3-3.8,3.6-5.6c-1.7-0.8-3.3-1.5-5-2.3c-2.6,1.7-5.8,1.9-8.7,2.9c-1.7,1.2-1.5,3.6-2.3,5.4c-0.7,2.8-4.4,4-4.2,7.1
+			c-0.1,3.5,4.3,2.9,6.6,3.7c-0.2,3.5-0.6,7.1-1.1,10.6c-4-1.7-3.5-6.6-6-9.5c-0.3-0.3-0.9-1-1.1-1.4c-2.1-0.5-4.3-0.7-6.3-1.4
+			c-2.6-1.8-1.9-5.4-1.4-8c2,0.5,4.1,1,6.1,1.5c1.9-1.8,3.6-3.8,4.2-6.4c-1.3,1.1-2.6,2.3-4,3.4c-1.3-0.7-2.4-1.5-3.6-2.3
+			c-1-2.1-2.2-4.3-4.6-4.9c-2.7-1.1-5.2,0.9-7.6,1.8c-2.3,1.1-4.8,0.8-7.3,0.9c0.2-3,0.7-5.9,1.5-8.8c1.5,0.9,3,1.8,4.5,2.7
+			c1.2-1.9,2.9-3.7,3.3-5.9c-1-3.9-1.7-9.3-6.5-10.1c-0.6,1.5-1.1,3-1.7,4.6c-2.1-0.8-4.1-1.6-6.1-2.5c1.8-2.4,4.7-2.7,7.5-2.7
+			c0.2-0.4,0.7-1.3,0.9-1.7c0.6-2.2,2.6-3.6,4.9-2.9c1.4,1.7,2.5,3.6,3.9,5.2c2.6-1,1.6-3.8,1.2-5.9c-0.3-2.1,0.3-4.2,0.8-6.3
+			c1.5,1.3,3.1,2.7,4.5,4.1c2.2,4.4,4.1,8.9,5.7,13.6c-3.9,0.4-7-2.2-10.6-3.3c0.3,2.8,0.4,5.7,1.9,8.2c1.9,0.7,4,1,6,1.3
+			c1,2.6,1.5,5.3,1.7,8c2.3,0.2,4.6,0.4,6.9,0.6c2,0.8,2.6-1.5,3.3-2.9c2.3-5.5,4.5-11.1,6.6-16.6c0.5-0.1,1.5-0.4,1.9-0.5
+			c0.6,1.2,1.3,2.4,1.8,3.7c-0.9,1.5-2.8,2.1-4.2,3.1c0.1,2.9,0.4,5.9,0.8,8.8c2.3-0.6,5-1,6.4-3.1c1.9-2.6,4.2-4.9,7.2-6.5
+			c-0.8-2.2-2.3-3.9-4.4-5c0-2.5,0.2-5-0.2-7.4c-0.8-2.3-2.2-4.3-3.4-6.5c0.3-0.8,0.8-2.3,1-3.1c0.5,1.9,1.1,3.8,1.7,5.7
+			c1.5-1,3.5-1.5,4.5-3.1c0.7-2,0-4.2,0.8-6.1c1.4-1.8,3.2-3.1,5-4.5c1.7,0.6,3.6,0.9,5.4,0.7c-1.6-2.2-3.6-4-5-6.3
+			c0.2-1.6,0.9-3.1,0.8-4.7c-0.5-2.4-1.4-4.8-1.2-7.4c0.6-1.9,1.6-3.6,2.7-5.3c0.7,0.3,2,0.8,2.7,1.1c1.4,3.9,2.6,8,2,12.1
+			c0.7,0,1.9-0.1,2.6-0.1c0.4-1.6,0.8-3.2,0.9-4.8c-1-2.9-3.2-5.1-3.9-8.1c-0.4-2.5,0-4.9,0.3-7.4c1.5,1.1,2.9,2.4,4.2,3.9
+			c1.5-2.5,3.8-4.2,5.6-6.4c1.6-1.9,0.9-5.5-2-5.4c-1.4,2.3-0.1,5.2-0.8,7.7c-2.4-1-4.6-2.4-6.8-3.8c6.4-14.3,13.4-28.3,19.6-42.7
+			c0.4-0.1,1.3-0.4,1.8-0.5c0.9,0.5,1.7,1,2.6,1.5c3.9-2.7,1.6-7.5,0.3-11c2.1-3.8,4.1-7.7,5.6-11.8c5.4-11.9,10.6-24,15.9-36
+			c1.6-0.5,3.2-1.1,4.8-1.6c-0.6-1.9-1.1-3.8-1.8-5.7C354.3,482.3,355.7,478.9,356.9,475.5 M371.7,477.7c-0.2,1.1-0.5,2.3-0.7,3.4
+			c-1.9,0.4-6.2,0.3-4.3,3.4c2.4,0.4,4.9,0,7.3,0.4c1.9,1.2,1.2,3.7,1.5,5.6c2.6,1,5.1,2.4,7.3,4.1c1.3-0.7,2.6-1.4,4-2.1
+			c1.4,1.1,3,2.1,4.8,2.2c-0.4-2.7-1.7-5.2-2.8-7.7c-1.9-1.1-3.7-2.3-5.5-3.6c0.6-1.5,3.6-3.2,1.6-4.7c-2.8,0.2-6.6,1.6-6.3,5
+			c-1,0.2-2,0.5-3,0.8c-0.3-0.6-0.8-1.8-1.1-2.4c0.3-1.8,0.6-3.5,0.9-5.2C374.3,477.1,373,477.4,371.7,477.7 M356.1,486
+			c0.1,1.4-0.1,3,0.6,4.3c1.1,0.2,2.1,0.4,3.2,0.6C360.8,488.1,358.9,486,356.1,486 M356.3,497.5c2.6,0.4,5.4,0.5,6.7,3.2
+			c-1.3,0.6-2.6,1.2-3.9,1.8c-2.8,4.1-6.3,7.8-10.6,10.3c-0.5,1.6-1.4,3.4,0,4.8c1,1.6,3.1,0.9,4.6,0.8c0.9-1.6,0.3-3.7,0.6-5.5
+			c3.8-3,8.4-4,13.1-3.2c0.5-1,1-1.9,1.4-2.9c1-1.2,3.5-2.3,2.2-4.2c-1.8-0.1-3.6,0.2-5.3,0.4c0.2-2.4,1.7-5.1,0.3-7.3
+			c-2.2-0.5-4.5-0.8-6.8-1.1C357,494.3,354.8,495.9,356.3,497.5 M375.9,497.9c0.2,1.6,0.5,3.1,0.6,4.7c-1.1,2-6.1,3-3.8,5.7
+			c2.9,2.3,8-1.1,9.8,3.2c1.1,0.1,2.3,0.2,3.5,0.3c1.8,0.3,2.4-0.4,1.7-2.2c1.2-0.3,2.3-0.7,3.5-1.1c-1.4-1.3-2.8-2.5-4.2-3.6
+			c-0.6-1.3-0.8-3-2.4-3.5c-2.7-1-4.7-3-6-5.6C377.6,496.3,375.1,496.1,375.9,497.9 M393.2,500.8c-0.8,1-1.7,2.1-2.4,3.2
+			c0.9,2.4,4.6,1.4,4.6-1C394.7,502.2,394,501.5,393.2,500.8 M359.4,515.3c0,1.6,0.2,3.3-0.1,5c-1.3,0.2-2.5,0.2-3.8,0.4
+			c-1.3,1.3-1.7,3.1-2.4,4.8c-2.8,1.5-6.7-1-8.8,1.9c-0.8,0.8-1.8,1.7-2,2.8c-0.9,3.9,4.2,4.4,6.7,5.7c4-0.7,4.7-5.4,6.4-8.4
+			c1.8-1,4.3-1.4,5.2-3.5c1-2.4,4.6-3.5,3.9-6.5C363.6,515.5,361.3,515.5,359.4,515.3 M368.6,518.7c-1.5,1.2-0.2,3.3,1.4,3.6
+			c1-0.7,1.9-1.4,2.7-2.2C371.5,519.2,370.1,517,368.6,518.7 M366.3,522.3c-0.1,0.4-0.4,1.2-0.6,1.6
+			C367.4,527,369.6,520.6,366.3,522.3 M327.7,557.4c-0.4,1.7-0.4,3.5-1.2,5.1c-1.4,1.7-3.4,3.1-3.6,5.4c3.4-0.2,5.7-2.9,8-5
+			c0.8-0.9,2.3-1.9,1.5-3.3C332,557.4,329.6,557.3,327.7,557.4 M316.5,573.6c-1.1,1.6-3.4,3.8-0.7,5.1c3.6-0.2,8.5-2.6,7.9-6.9
+			c-0.7-0.3-2-1-2.6-1.4C319.4,571.4,317.7,572.2,316.5,573.6 M323.4,579.6c-0.7,3.3,0.6,6.2,3.2,8.3c-1,2.2-1.9,7.1,2.1,5.8
+			c4.1-4.5-0.9-9.4-0.2-14.4C326.8,579.3,325.1,579.5,323.4,579.6 M304.3,629.6c1.1,0,2.3-0.1,3.4-0.1c0.1-1.5,0.5-4.2-1.8-4.2
+			C303.5,625,303.8,628.1,304.3,629.6 M297.3,640.3c0,1.2,0,2.4,0,3.6c2.4,0.1,3.7-1.1,3.6-3.6C299.7,640.3,298.5,640.3,297.3,640.3
+			 M289.6,643.5c0,2.1-0.4,5.4,2.4,5.9c1.4-0.1,5,1.2,4.6-1.4C294.6,646,291.9,644.9,289.6,643.5z"/>
+		<path class="st2" d="M775,475.4c1.3,0,2.6,0,3.9,0c1.9,2.6,3.4,5.6,5.9,7.6c2.3,0.5,4.7,0.4,7,0.6c-2.5-1.8-4.9-3.9-5.7-7
+			c2,0,4,0,6,0c0.6,1,1.1,2.1,1.7,3.1c2.9-2.1,6.2-3.4,9.8-2.9c-0.1,0.6-0.2,1.8-0.3,2.3c-3.2,2.7-7.7,4.1-10.2,7.6
+			c1.2,2.3,3.2,4.1,4.5,6.4c0.2,2.9-2.4,4.7-4.2,6.5c-1.2,1.1-2.4,2.2-3.5,3.2c-0.5-0.5-1.5-1.6-1.9-2.1c-0.8-1.4-1.6-2.8-2.5-4.1
+			c1.4-0.5,2.8-0.9,4.2-1.4c0-1.1-0.1-2.1-0.1-3.1c-1.1-0.3-2.2-0.6-3.2-0.9c-0.9,1.1-1.7,2.3-2.6,3.4c-2.2-2-5-3.3-7.9-4
+			c-0.2-0.6-0.6-1.9-0.8-2.5c0.6-1.9,1.2-3.8,1.9-5.7c-3.1-0.8-5.6,0.9-8,2.6C769.4,481,771.5,477.5,775,475.4z"/>
+		<path class="st2" d="M845.3,476.4l0.8-0.5c9.1-0.4,18.2-0.5,27.3-0.5c-0.1,4.8-0.8,9.5-0.6,14.3c-5.6-0.1-11.3-0.2-16.7,1.5
+			c-3.5,1.1-6.4,3.4-9.3,5.6c-0.7,2.2-1.5,4.3-2.2,6.5c-1.6,0.1-4.1,2-4.9-0.3c0.1-2.3,1.6-4.2,2.8-6c-1.5-0.6-2.9-1.3-4.4-1.6
+			c-1.9,0-2.4,2.2-3.3,3.4c-0.4,2.3-2.7,5.4,0.3,6.8c2.5,2.1,5,4.3,7.4,6.6c0,1.7,0,3.3-0.1,5c-1,4.9-0.7,10-0.8,15
+			c-2,1-4.1,1.9-5.4,3.8c-1.5,1.8-1.5,4.3-1.7,6.6c2.3-0.2,4.6-0.5,6.9-0.7c-0.9,7.2,0.2,14.4-0.2,21.6c-1.6-3.5-2.9-7.1-5-10.4
+			c-0.9-1.2-1.8-2.3-2.7-3.4c-1.7-2.8-4.5-4.5-7.8-5c-1.2-1-2.4-1.9-3.6-2.9c0.9-1.8,1.8-3.5,2.8-5.3c-2-0.9-4.5-1.6-6.1,0.3
+			c-1.2,2.3,0.9,4.4,2.2,6.2c-1,1.1-2,2.2-3,3.3c-0.3,1-0.7,2-1,2.9c-1.5-1.2-2.3-2.9-3-4.7c-0.8-0.4-1.6-0.8-2.4-1.1
+			c-2,0.7-1.9,3-2.2,4.7c2.1,0.2,4.2,0.3,6.3,0.5c-0.4,1.2-0.9,2.4-1.4,3.6c-0.8,0.6-1.6,1.3-2.4,1.9c-2.8-0.3-5.6-0.6-8.4-0.9
+			c0.1,2.5,0.2,5,0.5,7.6c-1.3-0.1-2.7-0.2-4-0.3c-1.5,1.3-2.9,2.7-4.4,4c-1.3-0.2-2.7-0.5-4-0.7c-0.2-15,0.3-30.1-0.2-45.1
+			c2.3,1,4.9,3.2,7.5,1.6c-1.6-2.9-3.5-5.6-6.2-7.7c-0.3-1.9-0.6-3.9-0.9-5.8c0.3-0.5,1-1.4,1.3-1.9c0.6-0.2,1.7-0.7,2.2-0.9
+			c0.7-1.3,1.3-2.6,2-3.9c6.4,3.6,11.2,9.5,17.1,13.8c-1.2,1.4-2.6,2.7-4.2,3.7c-4-2.8-6.5-7.5-11.3-9.1c0,6.5,8.2,8.4,9,14.7
+			c-1.6,1.1-3.1,2.2-4.7,3.3c1,0.9,2,1.8,3,2.6c1.3,1,2.5,2.4,4.2,2.7c1.1-3.3,2.2-6.6,3.9-9.7c1-0.4,1.9-0.8,2.9-1.3
+			c0.5-0.9,1.1-1.7,1.7-2.5c1.9-0.1,3.8-0.6,5.5-1.4c-2.5-0.6-5.2-0.9-7.7-1.9c-1.2-1.6-1-3.8-1.5-5.6c-1.5-1.2-2.9-2.4-4.4-3.5
+			c2.8-0.3,5.7-0.3,8.5-1c2.3-1.5,1-4.5,0.9-6.7c-1.8-0.1-3.5-0.2-5.2-0.4c-0.5-0.9-0.8-1.9-1-2.9c3.6-0.7,7.1,0.2,10.2,2.2
+			c2.3-1.7,5.2-3,6.6-5.6c1.4-2.8,3.6-5,5.7-7.1C839.2,481.8,842.5,479.3,845.3,476.4 M848.4,479.1c0,1.2-0.1,2.4-0.1,3.7
+			c1.6-0.2,3.2-0.3,4.8-0.7c0.7-1.3,1.2-3.3,0-4.4C851.3,476.8,849.8,478.3,848.4,479.1 M826.8,503.1c-0.7,1.2-0.9,2.8-2,3.8
+			c-1.4,0.6-3,0.6-4.4,0.9c0.1,1.2-0.4,2.5,0.3,3.6c1.2,1.4,3.2,1.2,4.9,1.4c1.2-1.2,2.3-3.2,4.4-2.4c1.6-0.2,4.4,1.9,4.9-0.4
+			C833.7,506.4,830.2,504.2,826.8,503.1 M827.7,515c1.2,1.6,3.5,1.7,5.3,1.8c2.2-0.2,0.9-2.7,1-4C831.8,513.3,829.4,513.4,827.7,515
+			 M794.7,528.6c-0.9,1.3-1.5,2.8-1.4,4.4c-0.3,3.8,4.3,4.9,6.8,6.5c1.6-1.9-0.4-3.9-1.4-5.5c-0.1-1.9-0.1-3.8-0.2-5.7
+			C797.3,528.4,796,528.3,794.7,528.6 M817,530.1c-2.4,1.2,1.5,5.9,2.7,2.8C821.4,530.8,819,528.5,817,530.1 M806.2,536
+			c0,1.6,0,3.2,0.1,4.8c0.6,0,1.9-0.1,2.5-0.1c0.4-1.5,0.8-3.1,1.2-4.7C808.7,536,807.5,536,806.2,536 M794.8,552.7
+			c-0.3,1-0.5,2.1-0.7,3.2c0.7,0,2.2,0.1,2.9,0.2c2-0.1,1.4-2.3,1.8-3.7C797.4,552.4,796,552.4,794.8,552.7z"/>
+		<path class="st2" d="M814.1,476.4c2.1,1.1,3.3,3.2,4.8,5c0.6,0.5,1.1,1,1.7,1.4c1-0.6,2.1-1.2,3.1-1.8c-0.2,1.4-0.4,2.9-0.7,4.3
+			c-0.2,0.3-0.6,0.9-0.9,1.2c-2.2,0.1-4.5,0.1-6.7,0.2c-0.8-2.6-1.7-5.2-2.8-7.7C813.1,478.4,813.8,477,814.1,476.4z"/>
+		<path class="st2" d="M831.8,476.6c2.2,0,4.5,0,6.7,0c0,1.7,0.1,3.3,0.2,5c-1.5,0.3-3,0.6-4.5,0.8
+			C833,480.7,832.5,478.6,831.8,476.6z"/>
+		<path class="st2" d="M661.4,482.4c1,0.1,2.9,0.3,3.9,0.5c0,4,0.2,8.1,0.7,12.1c-2.1,1.4-3.3,3.7-3.9,6.1c2.2-1.3,5.1-2.6,5.4-5.6
+			c0.9-2.5-0.7-4.8-1.8-6.9c1.1-1.6,2.4-3.1,3.9-4.4c1.1,0.9,2.4,1.5,3.3,2.7c-0.2,2.3-0.7,4.6-1,7c-1.2,1-2.3,2-3.5,3
+			c1.9,0.9,3.9,1.8,5.7,2.8c0.2,0.9,0.5,1.7,0.8,2.6c-0.3,1.9-0.6,3.7-0.9,5.6c3.5-0.7,6.9-1.7,10.1-2.9c1.1,0.6,2.3,1.1,3.4,1.7
+			c0-1.6,0.1-3.2,0.2-4.9c-1.3-1.1-3.5-1.7-3-3.8c1.1-0.6,2.2-1.2,3.4-1.7c3.1,2.7,6,5.6,9.2,8.2c5,4.1,9.1,9.2,13.3,14.2
+			c-2.5,2-4.3,4.7-4,8.1c1.3,0.2,2.7,0.4,4,0.6c0.3,2.6,0.6,5.2,0.9,7.9c-0.7-0.1-2.2-0.2-2.9-0.3c-0.4-1.8,0.3-4.3-1.7-5.1
+			c-3-1.7-6.5,0-9,2c-1.5,1-3.3,3-1.8,4.8c1.1,2.1,3.6,2.6,5.8,2.8c0.6-1.5,1.2-2.9,1.9-4.3c1.1,0.1,3.3,0.2,4.4,0.2
+			c-0.8,3.4-3.2,5.9-6,7.8c-0.4,1.9-0.6,3.7-0.9,5.6c1-0.6,2.1-1.2,3.1-1.9c0.4-0.3,1.3-0.8,1.8-1c1.4-2.9,2.7-6.1,6-7.2
+			c2.2-1.1,4.5-2.2,6.7-3.3c0.4-1,0.7-2,1.1-3.1c3.8,4.8,5.8,10.6,8.7,15.9c-0.3,0.3-1,0.9-1.3,1.2c0.4-0.1,1.3-0.2,1.7-0.3
+			c2.5,5.9,3.9,12.2,6.4,18.1c0.9,3.5,1.7,7,2.5,10.5c-1.1,0.2-2.1,0.4-3.2,0.6c-0.9,1.7-1.9,3.4-3,5c-0.5,1.6-0.9,3.2-1.2,4.9
+			c2.7-1.7,4.8-4.2,6.6-6.8c0.3,1.4,0.7,2.8,1,4.3c-0.6,0.5-1.8,1.4-2.5,1.8c1.1,0.6,2.1,1.2,3.2,1.7c0,0.7-0.1,2.1-0.1,2.8
+			c-1.4-0.2-2.8-0.4-4.2-0.6c-0.8-1.1-1.6-2.1-2.5-3.1c0.2,1.5,0.4,3,0.6,4.5c-1.3,0.3-2.5,0.6-3.8,0.9c-0.9,1.1-1.7,2.3-2.5,3.5
+			c0.4,1.4,0.9,2.8,1.2,4.3c-1.4,1.5-3.1,3.4-5.4,2.8c-4.3-0.6-8.8-0.5-12.9,0.9c-1.7,0.9-2.7,2.8-3.9,4.2c-2,2.8-4.9,4.8-6.2,8
+			c-5.4,2.9-7,9.4-6.7,15.1c0.7-0.3,2.2-0.9,3-1.2c1.2-3.4,1.9-7,3-10.5c2.7,0.1,6.3,1.6,7.6-1.6c-1.6,0.5-3.2,1.1-4.9,1.2
+			c0.1-3.4,3.3-5.8,6.4-6.3c0.2,0.9,0.5,2.7,0.6,3.6c1.1,0.1,2.3,0.2,3.5,0.4c-1.2,1.8-2.8,3.6-3.3,5.8c0.3,1.8,0.9,3.5,1.4,5.2
+			c-2.4-0.8-4.7-1.7-7-2.7c-3.8,0.2-2.3,4.4-2.4,7c1.7-0.1,3.4-0.3,5.1-0.5c0.2,0.6,0.5,1.3,0.8,1.9c3.7,1.3,3.6,5.3,3.8,8.6
+			c-0.6-0.1-1.7-0.3-2.3-0.5c-0.5,0-1.5,0-1.9,0c-3.2-3.9-8.6-3.4-12.7-5.4c0.5-1,1.1-2,1.6-3c-1.4-0.9-2.8-1.9-4.2-2.8
+			c0.1,1.4,0.2,2.8,0.2,4.3c-1.1-0.5-2.3-1-3.3-1.6c-0.5-4-0.7-8-1-11.9c0.5-7.9,1.5-16-0.4-23.8l-0.2-1.1
+			c-0.7-3.6-0.7-7.3-0.6-10.9c0.4-1.3,0.9-2.6,1.3-3.8c1.7,0.8,3.4,1.6,5,2.4c-0.3-1.1-0.7-2.3-1-3.4c1.1-1.5,2.1-3,3.2-4.5
+			c-0.9-1.6-2.3-3.2-1.5-5.1c1.3,0.8,2.6,1.7,3.9,2.6c0.6,2.8,1.7,5.3,2.8,7.9c4.8-2.2,6.8-7.6,11.5-9.9c0.6,0.7,1.2,1.4,1.9,2.2
+			c-0.2,1.3-0.4,2.5-0.5,3.8c0.9,0.1,2.6,0.2,3.5,0.2c0.3-4.3-0.8-8.6-1-12.9c1.4-2,4.7-3.5,3.7-6.4c-1.7-1.5-3.9-2.2-5.8-3.5
+			c-1.8-1.8-2.8-4.3-4-6.5c-2.8,0.6-4.9,2.4-7,4.2c0-1.1,0-2.2,0-3.2c-1.1-0.2-2.1-0.5-3.1-0.7c0,1.5,0.2,3.1,0.3,4.6
+			c-1.3,0.6-2.7,1.2-3.9,2c-1,2-1,4.2-1.3,6.4c-1.6,0.2-3.2,0.5-4.8,0.8c0.8,1.7,3.7,4.2,0.4,5c-2.4-0.6-4.7-1.4-7.1-1.8
+			c0.1-0.5,0.2-1.5,0.3-2c1.7-0.9,3.6-1.7,5.1-3c0.6-1.6,0.7-3.4,1-5.1c0.7,2,1.7,3.9,4.2,3.4c-0.4-3-0.5-6-1.3-8.8
+			c-1.6-1.4-3.6,0.4-5.3,0.8c-0.7-0.5-1.5-1-2.2-1.5c-1.6,0.5-3.3,1.1-4.9,1.6c1.8,1.1,3.8,2.3,3,4.7c-0.7,0.2-2.1,0.7-2.8,1
+			c-0.6-2.5-1.1-5-1.7-7.5c1-0.5,2-1.1,3-1.6c0.2-0.4,0.7-1.2,1-1.6c1.2-0.6,2.4-1.2,3.6-1.7c-0.3-0.5-1-1.6-1.3-2.1
+			c-0.3-0.4-0.8-1.3-1.1-1.7c0.2-1.2,0.4-2.4,0.6-3.5c0.9,0.1,1.9,0.3,2.8,0.5c-0.2-1-0.4-2-0.6-2.9c1.3,0,2.6,0,3.9,0
+			c0.4,0,1.2,0,1.5,0c0.5-0.9,1-1.7,1.5-2.6c1-1.7,1.5-3.6,1.5-5.6c1.6-1.1,3.3-2.1,4.9-3.1c-1-1.7-2.1-3.3-3.6-4.6
+			c-1.7-0.4-3.4-0.8-5.1-1.1l-0.8-0.2c-0.2,2.2-0.5,4.5-0.7,6.8c-1.9-0.2-3.8-0.3-5.6-0.7c-1.1-0.3-2.1-0.7-3.2-1.1
+			c-0.4-0.3-1.2-0.9-1.6-1.2c-0.8-0.6-1.5-1.2-2.3-1.7c-1.2,1.3-2.2,2.9-3.1,4.5c-0.6,0.3-1.9,0.8-2.5,1c-3.4-3.7-4.5-8.7-6.7-13
+			c-0.8,0.1-1.6,0.1-2.4,0.2c-3.1-0.3-6.2-0.7-9.2-0.9c-5.4-5-11.2-9.5-17.7-13.1c0.5-2.2,1-4.3,1.4-6.5c1.8-1.4,3.7-2.6,5.6-3.9
+			c0.6,1.9,1.2,3.9,1.7,5.8c0.3-1,0.7-2,1-2.9c4-0.6,6.6-4,10.5-4.8c0.3,1.2,0.6,2.4,0.8,3.6c-0.9,1.4-2.1,2.7-3.3,4
+			c-0.9-0.4-1.8-0.8-2.7-1.2c-3,1.6-6,3.4-8.6,5.6c1.7,0.6,3.4,1.2,5.1,1.9c2.7-3,6.7-3.4,10.4-3.9c0.4,1.1,0.9,2.2,1.4,3.4
+			c0.5,0,1.6,0,2.1,0c-0.1-3.4-0.4-6.9,1.3-9.9c0.1-0.3,0.3-0.8,0.4-1C661.3,487.3,661.2,484.9,661.4,482.4 M649.9,503
+			c0.5,1.7,0.9,3.9,3,4.4c2.3-0.9,2-4.2-0.1-5.1C651.8,502.5,650.8,502.7,649.9,503 M664.6,507.6c-0.3,1.4-0.4,2.8-0.5,4.2
+			c1.1-0.1,2.3-0.2,3.5-0.4c0.6-1.8,0.6-3.7,0.2-5.6C666.7,506.5,665.4,506.7,664.6,507.6 M693.9,512.3c-0.3-2.2-0.7-4.4-1.2-6.5
+			C688.8,506.5,691.1,511.6,693.9,512.3 M677.8,511.1c-0.2,1.5-0.4,4.4,2,3.7c2.7-1.5,4.6-4.1,6.2-6.7
+			C683.3,509.3,680.7,510.5,677.8,511.1 M662.2,512.7c0.5-1.1,2.4-4.5-0.4-3.9C658.5,508.2,660.4,512,662.2,512.7 M670.1,511.2
+			c-1.2,0.6-1.3,2,0.2,2.3c1.6,0.8,3.3,2.1,5.2,2C678,512.6,672.6,509.9,670.1,511.2 M688.2,513c0,0.8-0.1,2.3-0.1,3.1
+			c1.2-0.1,2.2-0.3,3.3-0.8C692.8,513.5,689.2,513.7,688.2,513 M669.8,517.7c-0.2,2.4,0.9,4.6,3.5,4.8
+			C673.4,520.1,672.7,517.7,669.8,517.7 M691.2,542c-0.4,1.8-0.8,3.7-1.1,5.5c2.5,0.3,5,0.8,7.5,1.1c-0.3-1.4,0.1-3.2-1.1-4.2
+			C695,543.2,693,542.7,691.2,542 M713.8,552.1c0.7,1.8,1.1,4.1,3.4,4.5c0.4-1.5,0.8-3,1.1-4.5c0.5,2.3,1.2,5,3.7,6
+			c1.2,0.5,3.9,1.4,2.9-0.9c-1.8-2.5-3.4-5-4.2-8c-1.3,0.3-2.5,0.6-3.8,0.9c-0.5-1.3-1.5-2.9-3.1-2.7
+			C712.1,548.6,713.4,550.5,713.8,552.1 M724.5,566.1c0.7-2,2.2-4,1.7-6.2C722.4,559,720.3,564.9,724.5,566.1 M722.2,568.2
+			c-1.5,0.3-1.3,2.2-0.1,2.7c1.5,1.3,3.7,0,3.2-2C724.4,567.7,723.3,567.5,722.2,568.2 M728.4,569c1.3,1.9,3.3,3.1,5.7,3.4
+			c0-0.8-0.1-2.5-0.1-3.3C732.1,568.7,729.6,566.6,728.4,569 M717.9,582.9c1.6,0.1,4.2-0.5,2.9-2.6
+			C718.7,579.1,717.6,581,717.9,582.9 M706.7,583.2c-0.7,2.6,1,4.8,3.7,4.7c0.5-2,1.2-4,2.3-5.7
+			C710.7,582.6,708.7,582.9,706.7,583.2 M716.7,585.4c-1.1,1.4-2.1,2.8-3.2,4.1c1.1,1.3,2.6,2.5,2.7,4.4c-0.5,1.4-1.9,2.7-1.5,4.3
+			c1.6,0.6,3.2,0.2,4.8-0.2c-0.1-1.7-0.2-3.4-0.2-5.1c-0.8-1-1.6-2-2.4-3c0.9-1.5,1.7-3,2.3-4.7
+			C718.4,585.3,717.3,585.4,716.7,585.4 M724.2,587.1c0.4,1.4,0.8,2.7,1.2,4.1c1-1.1,1.4-2.6,1.6-4.1
+			C726.3,587.2,724.9,587.1,724.2,587.1 M707,591.3c0.7,1.8,1.7,3.4,3.2,4.7c0.6,2.2,1,4.5,1.4,6.7c0.6-0.1,1.8-0.2,2.4-0.2
+			c-0.5-1-1-1.9-1.4-2.9c0.2-2.9-0.6-5.7-1.8-8.4C709.5,591.2,708.2,591.3,707,591.3 M693,593.5c0.8,1.5,2.3,2.6,3.7,3.5
+			c-0.8,1-1.5,2-2.3,3c3.2,2.9,3.9,7.5,6.4,10.9c0.9-1,2.5-2.1,2-3.7c-1.1-1.5-2.5-2.9-3.7-4.3c-0.6-0.2-1.9-0.6-2.5-0.8
+			c0.4-1.1,0.8-2.2,1.2-3.2c-0.4-1.8-0.8-3.7-1.1-5.5C695.3,593.4,694.1,593.4,693,593.5 M687.7,593.5c-0.2,4,0.7,8.2,4.1,10.7
+			c-0.2-1.7-0.4-3.3-0.6-4.9c0.4-0.3,1.2-0.8,1.6-1.1C691.3,596.2,690.6,593.1,687.7,593.5 M703.5,597.1c-0.4,1.7-0.8,3.4-1.2,5.1
+			c2.1,0.7,4.3,0.7,6.4,0.6c0-1.5-0.1-3-0.1-4.4C706.9,597.9,705.2,597.5,703.5,597.1 M690.3,607.3c0.7,3.7-0.7,7.3-0.7,11
+			c2.2-0.4,4.3-0.9,6.5-1.3c-0.7-1-1.4-1.9-2-2.9c1.5-2,1.3-4.5,0.7-6.8C693.3,607.2,691.8,607.3,690.3,607.3 M696.3,635.3
+			c-0.2,1.4,0.7,4,2.4,2.5c0.1-1.4,0.1-2.8,0.1-4.2C697.9,634.1,697.1,634.6,696.3,635.3z"/>
+		<path class="st2" d="M800.8,497.3c3.3-2.9,5.6-7.6,10.5-7.9c0.3,1.3,1.6,3.1,0.2,4.2c-2,2-4.2,3.8-6.6,5.2
+			C803.3,499.5,802.1,498.1,800.8,497.3z"/>
+		<path class="st2" d="M674.5,494.4c1.5-0.9,2.9-1.9,4.3-2.9c0.8,0.2,2.4,0.7,3.2,1c0.8,0.4,1.6,0.8,2.4,1.2c-1.5,2-3.2,4-5.3,5.5
+			c-0.3,0.1-0.8,0.3-1.1,0.4c-0.3-0.5-0.9-1.5-1.2-1.9C676.1,496.6,675.3,495.5,674.5,494.4z"/>
+		<path class="st2" d="M1193.9,501.7c1.2,0.4,2.5,0.9,3.7,1.3c-0.6,1.2-1.1,2.5-1.7,3.8c-1.2,2.4-3.6,2.5-5.8,1.7
+			c0.6-1.4,1.2-2.8,2-4.1C1192.7,503.4,1193.3,502.6,1193.9,501.7z"/>
+		<path class="st2" d="M515.6,531.6c3-1,3.5,3.2,4.1,5.1C517,536.9,515.2,534,515.6,531.6z"/>
+		<path class="st2" d="M395.5,535.2c0.5,0,1.4-0.1,1.8-0.1c0,1.8-0.1,3.5-0.2,5.3c-0.4,0.5-1.2,1.5-1.6,2c-0.6-1.8-1.1-3.7-1.6-5.5
+			C394.3,536.5,395.1,535.6,395.5,535.2z"/>
+		<path class="st2" d="M507.8,537.9c2.7-1.7,4.6,1.4,6,3.3c-1.2,1.7-3.4,1.2-5.2,1.4C508.2,541,506.6,539.3,507.8,537.9z"/>
+		<path class="st2" d="M0,542.3c0.5-0.3,1.6-1,2.1-1.3c1.3,0.3,2.6,0.7,3.9,1c0.8,0.8,1.5,1.7,2.3,2.5c-1.5,3.3-5.1,3.5-8.3,3.7
+			V542.3z"/>
+		<path class="st2" d="M468.6,544.3c1.2,0.2,2.3,0.4,3.5,0.6c0.7,1.1,1.4,2.1,2.1,3.1c-0.9,0.8-1.8,1.6-2.7,2.4
+			c-0.2,1.4-0.5,2.8-0.7,4.2c-2,0-4,0.1-6,0.2c0.9,1.3,1.7,2.6,2.6,3.9c-1.5,0.3-2.9,0.6-4.4,0.8c-1.5-2.6-0.4-5.4,0.7-7.8
+			c1.3-0.2,2.6-0.5,3.8-1.1C469.4,549.1,468.6,546.4,468.6,544.3z"/>
+		<path class="st2" d="M506.5,543.7c2.4,1.3,5.1,2.6,6.8,5c-1.1,0.5-2.2,1-3.3,1.6C508.5,548.2,507.2,546.1,506.5,543.7z"/>
+		<path class="st2" d="M822.6,548.3c2.8-0.2,5.7,0,7.4,2.6c1.1,1.4,2.1,2.8,3.1,4.2c1.3,2.1,3.5,4.4,2.2,7c-1,1.6-2.4,2.7-3.7,4
+			c1,2.2,1.7,4.6,1.7,7c-2.1-0.2-4.1-0.7-5.9-1.7c0.6-1.6,1.2-3.1,1.8-4.7c-2.4-1.6-4.7-3.5-7.4-4.5c-2.6,0.6-5,1.9-7.7,1.8
+			c-1.6,0.3-3.6-0.4-4.8,1.1c-2.5,2.7-4.3,5.8-6.3,8.8c0.8,1.5,1.6,3.1,2.1,4.8c-2.8,1.6-4.2-2-4.9-4.1c-1-2.1-0.5-4.3,0.5-6.2
+			c1.1-0.8,2.3-1.5,3.5-2.2c2.6-1.4,5.2-3.2,6.4-6.1C815.5,557.2,818.7,552.4,822.6,548.3 M822.3,555.1c-1,0.6-3.7,1.2-2.4,2.8
+			c0.6,2.6,3.6,0.8,4.9-0.1C826.3,556,824.1,553.5,822.3,555.1z"/>
+		<path class="st2" d="M389,550c4.1,0.6,4.6,5.3,4.5,8.6c-1.8-0.4-3.6-0.7-5.4-1.1C387.9,555,388.2,552.4,389,550z"/>
+		<path class="st2" d="M490.8,554.9c-1.6-3.9,4.2-3.8,6-1.7c0.3,0.6,0.9,1.7,1.2,2.2c1.4,0.3,3.2,0.1,4,1.6
+			c-1.4,0.8-2.7,1.6-4.1,2.5C495.9,557.5,493.3,556.2,490.8,554.9z"/>
+		<path class="st2" d="M503.9,556.8c0.5-0.1,1.6-0.4,2.1-0.5c0.3,0.4,0.9,1.1,1.3,1.5c-0.5,3.1,1,5.6,3.1,7.7
+			c-0.2,0.3-0.7,1-0.9,1.4c0.5,2.2,0.7,4.5,0.6,6.8c-1-0.4-1.9-0.8-2.9-1.2c-1,0.6-2.1,1.3-3.1,2c-1.2-1.2-2.4-2.3-3.5-3.5
+			c-0.5-0.6-1.5-2-1.9-2.6c-1.9-0.2-3.8-0.4-5.6-0.7c-0.6,0.3-1.3,0.6-1.9,0.9c-0.9-1-1.9-1.9-2.8-2.9c1.9-1.4,3.8-2.8,5.7-4.2
+			c1.4,0.6,2.7,1.2,4.1,1.8c0.9-0.3,1.9-0.5,2.9-0.8c0.3,3.4,2.3,6.2,5,8.3c0.2-0.4,0.6-1.1,0.8-1.4c-1.1-1.2-2.2-2.3-3-3.6
+			C504.4,562.9,504.9,559.8,503.9,556.8z"/>
+		<path class="st2" d="M1702.7,557.8c2.4,0.8,4.8,1.8,6.5,3.8c-2.2,1.4-4.4,2.8-6.5,4.4C1702.8,563.3,1702.7,560.5,1702.7,557.8z"/>
+		<path class="st2" d="M1465,565.7c0.3-1.9,0.1-5.5,3-5.1c4.3,4,5.3,10.7,10.5,14.1c0.1,0.6,0.3,1.7,0.4,2.3
+			c-4.1,10.8-8.3,21.5-12.6,32.1c-0.8,0.6-1.5,1.2-2.3,1.8c-2.3-2.1-4.6-4.3-6.7-6.5c-1.8,1-3.5,2-5.2,3.1c-0.7,0-2.1,0.1-2.8,0.2
+			c0.2,0.6,0.5,1.2,0.8,1.8c1-0.5,2-0.9,3-1.4c1.9,1.1,3.7,2.5,3.5,4.9c-0.7,0.2-2.2,0.7-2.9,0.9c-2.9,1.2-2.1,4.7-2.6,7.2
+			c0.2,2.2-1.9,3.2-3.2,4.4c-0.8-3-2.1-5.9-4.8-7.6c-1.5,2,0.6,4.2,1.1,6.1c-0.7,1-1.4,2-2.1,3c0.4,0.5,1.3,1.4,1.8,1.8
+			c-4.4-0.1-10.1,1.2-12.5-3.6c5.6-11.8,10.2-24.1,15.3-36.1c3.3,3.1,7.9,2.6,12,2.4c-0.3-2.7,1.3-6.7-1.9-8.3
+			c-2.4-2.2-5.4,2.1-7.6,0.1c2.6-7.2,5.9-14.1,8.6-21.2C1460.3,562.9,1462.8,564.1,1465,565.7 M1465.6,592.2
+			c-0.1,2.1-0.2,4.7,1.7,5.9c0.5-2.5,1.4-4.8,2.7-7C1468.5,591.5,1466.3,590.6,1465.6,592.2 M1449.3,593.2c0,0.7-0.1,1.9-0.1,2.6
+			c1.2,0.9,4.1,0.1,3.1-1.8C1451.6,592.3,1450.6,592,1449.3,593.2 M1459.9,598.6c0.7,0.1,2.2,0.2,2.9,0.2c0.1-0.8,0.3-2.3,0.4-3.1
+			C1461.3,595.6,1460.5,597,1459.9,598.6z"/>
+		<path class="st2" d="M1543.7,561.7c2.2-1.4,4.2,1.2,5.2,2.9c-1.7,1.9-3.7,3.5-6.4,3C1542.3,565.6,1541.5,562.9,1543.7,561.7z"/>
+		<path class="st2" d="M373.2,564.9c-0.7-2.1,1.8-2.5,3.3-2.9c0.4,1.6,0.8,3.2,1.2,4.8C376.2,566.5,373.6,567,373.2,564.9z"/>
+		<path class="st2" d="M466,564.6c1.5,0.5,2.9,1,4.3,1.6c0.3,2.2,0.3,5,2.9,5.9c0.2-1.7,0.2-3.4,0.2-5.1c1.6,1.4,3.2,2.7,4.8,4.2
+			c0.2,0.4,0.5,1.3,0.7,1.7c-1.4,2.8-3.1,5.5-4.7,8.1c-0.6-1.4-1.3-2.8-1.9-4.2c1.3-0.8,2.6-1.6,3.9-2.4c-1.2-0.2-2.4-0.4-3.5-0.6
+			c-1.3-0.5-2.6-1-3.8-1.6C467.6,569.8,466.7,567.2,466,564.6z"/>
+		<path class="st2" d="M683.3,568.8c3.5,2.3,5,6.4,7.5,9.7c-1.5,0.7-3,1.4-4.6,2.1c-1-2.4-2.2-4.8-3.5-7c-0.1-0.5-0.3-1.6-0.4-2.1
+			C682.6,570.9,683.1,569.5,683.3,568.8z"/>
+		<path class="st2" d="M461.1,570c1,0.9,2,1.9,3,2.8c-1.4,0.4-2.8,0.8-4.3,1.2C460.1,572.6,460.5,571.3,461.1,570z"/>
+		<path class="st2" d="M817.3,571.4c1.9-2.3,4.5,2.2,2.4,3.3C817.8,577,815.4,572.3,817.3,571.4z"/>
+		<path class="st2" d="M1533.9,573c1.2-0.8,2.5-1.4,3.8-2c0.4,2.7,1,5.4,2.6,7.7c-1.2,1.9-2.7,3.6-3.9,5.5c-0.8,2.3,0.9,4.5,1.7,6.6
+			c1.3-2.2,2.3-4.9,4.9-5.7c3.2-0.7,6.6,1.3,9.7-0.1c3.5-1.4,3.6-5.7,5.1-8.7c3.4,9.5,6.4,19,9.9,28.5c-0.2,0.6-0.6,1.8-0.7,2.4
+			c-4.1,0-8,2.9-12,1.3c1.8-2.4,5.2-4.1,5.3-7.3c-1.5-1.1-3.1-2-4.7-2.8c-0.9-1.8-1.7-3.6-2.5-5.4c-1,0.2-2,0.5-3,0.8
+			c-0.5-1.2-1-2.5-1.5-3.6c-0.4-0.2-1.3-0.5-1.8-0.6c-2,1.7-3.9,3.6-5.8,5.4c-2.5-1-5-2-7.5-2.8c-2.2-0.5-4.4-0.8-6.6-1
+			c-0.8-1.4-2.3-2.8-1.8-4.6c2.5-1.8,5.6-2.4,7.9-4.3C1535.4,579.4,1533.2,575.9,1533.9,573 M1529.9,589c1.5-0.2,3.4-0.1,3.6-2.2
+			C1531.7,585.1,1529.7,586.9,1529.9,589z"/>
+		<path class="st2" d="M501,574.8c1,1,1.9,2.1,2.8,3.2c0.4,0.4,1,1.1,1.4,1.5c0.6,0.6,1.2,1.2,1.9,1.7c0.2,0.2,0.7,0.7,1,0.9
+			c-0.2,1.2-0.5,2.4-0.8,3.6c-0.6-0.5-1.8-1.4-2.4-1.8C501.6,582.1,500.8,578.4,501,574.8z"/>
+		<path class="st2" d="M353.2,576.3c1.5,0.1,3.1-0.3,4.5,0.2c0.9,1.2,0.9,2.8,1.2,4.3c-2,0-3.9,0-5.9,0
+			C353.1,579.3,353.1,577.8,353.2,576.3z"/>
+		<path class="st2" d="M481.4,576.9c0.2,0.4,0.5,1.3,0.6,1.7c0.2,0.6,0.6,1.8,0.8,2.4c0.5,1.6-0.5,3.3-0.8,4.9
+			c-0.6-0.1-1.9-0.4-2.5-0.6C478.4,582.3,478.6,579,481.4,576.9z"/>
+		<path class="st2" d="M818,578.5c0.8,2.2-0.4,4.3-1.3,6.3c4.4,3.8,7.8,8.8,9.1,14.5c1.8,0.6,3.6,1.3,5.4,1.9
+			c3.2-0.7,7.1-1.8,9.8,0.7c-1.2,3.4-4.3,4.8-7.7,5.1c0,1.9,0.1,5,2.8,4.7c2.9,0.8,3.6-2.4,4.8-4.2c3.8,0.8,7.6,1.3,11.5,1.2
+			c-1.1-1.7-2.9-2.6-4.7-3.4c-0.5-1.7-1.2-3.3-1.8-4.9c1.3-1.7,2.5-4.3,5.1-3.8c4.6,0.5,9.6-0.9,13.8,1.5c5-2.7,10.9-1.1,16.3-1.6
+			c3.2-0.3,6.5,0.1,9.1,2.1c0.6-0.7,1.2-1.4,1.8-2.1c6.7-0.1,13.4-0.1,20.2,0c0.6,2.1,1.1,4.2,1.7,6.3c1,0.7,1.9,1.4,2.9,2.1
+			c-2,0.5-4,1-6,1.5c2,2.2,4.8,2.8,7.6,3.2c1.2,2.1,2.5,4.3,3.8,6.4c-3,0-5.9,0-8.9-0.1c-1.7-1.3-3.1-3.2-5.2-3.5
+			c-0.8,1.1-1.5,2.4-2.2,3.6c-7.1-0.3-14.8,1.5-21.5-1.6c-0.8,0.5-1.6,1.1-2.4,1.7c-13.5-0.2-27,0-40.5,0v0.6c0,2.7,0,5.4,0.1,8.1
+			c-0.6,0-1.9,0.1-2.6,0.2c0.8,0.1,1.7,0.2,2.6,0.4c0.2,23.8-0.3,47.5,0.2,71.3c0,0.5,0,1.5,0,2c-0.9-0.8-1.7-1.5-2.5-2.3
+			c-2.8,0.6-6.2,0.6-7.5,3.8c2.9,0.8,6.1,1.8,9,0.3c0.6,3.1,1.5,6.1,2.4,9.1c1.1,4.2,2.3,8.5,4.9,12c1.7,1.9,3.9,3.1,5.8,4.7
+			c0.8,0.7,1.7,1.4,2.5,2.1c-3.3,2.6,1,5.3,2.6,7.5c2.8-1.7,4.9-4.1,5.5-7.4c1.3,0.1,2.6,0.1,3.9,0.1c1,1.4,2,2.7,3,4.1
+			c-0.4,1-0.8,2.1-1.2,3.1c1.7,2,2.2,4.4,1.2,6.8c-5.9,0.3-11.8-0.6-17.8-0.9c-1.2-1-2-3-3.8-3.2c-2,0.6-3.6,2.3-5.8,2.4
+			c-3.2,0.2-6.5,0.2-9.7,0.5c-2.2-0.2-4.3-0.2-6.4-0.5c-1-1.7-0.4-3.8-0.5-5.6c-1.5,0.6-3,1.2-4.5,1.8c-0.3,1.2-0.6,2.4-0.9,3.6
+			c-5.6,0.3-11.3,0.3-17,0c0.7-2.8,2.5-5,4.8-6.6c2.5-1.7,2.4-5,2.7-7.7c0.5-4.9,7.9-5.7,7-11c-1.6-2.6-4.2-4.2-6.8-5.8
+			c-4.3-2.1-3.8-8.3-2.5-12c2.5-0.5,5-0.4,7.5-0.4c0-0.6-0.1-1.7-0.1-2.2c-3.3-0.7-6.3-2.9-9.6-3.3c-3.8,1-6.3,4.3-9.4,6.5
+			c-0.4,1.6-0.9,3.2-1.3,4.8c-1.7,0.6-3.4,1.3-5.1,2c-0.2-3-0.5-5.9-0.8-8.9c0-22.1,0.1-44.2,0-66.3c2.5-1.6,5.3-3.2,7-5.7
+			c1-2.3,0.4-4.9,0.4-7.3c1.9-3.7,6.2-4,9.7-4.9c1.8-2.3,2.8-5.1,4.4-7.5c1.3-1.6,3.2-2.5,4.6-3.9c-1.2-1.8-2.8-3.4-4.2-5
+			c-1.6,3.1-3.5,6-5.8,8.5c-1.5-0.2-3-0.4-4.4-0.6c-0.1,0.3-0.3,1-0.4,1.4c-0.2,0.7-0.6,2.1-0.7,2.8c-0.9,0.9-1.8,1.8-2.7,2.7
+			c-1.2,0.6-2.3,1.3-3.5,1.9c-0.6-0.8-1.2-1.6-1.7-2.3c1.2-0.6,2.4-1.2,3.6-1.8c0.1-0.7,0.4-2,0.5-2.6c1-4.8,6.5-6.1,8.7-10.2
+			c0.9-4,0.8-8.3,2.4-12.2c1.3-0.4,2.6-0.9,3.9-1.4C815,580.4,816.5,579.4,818,578.5 M815.4,591.3c-1.1,2,2.2,3.8,3.6,4.9
+			C821.3,595,817.8,588.5,815.4,591.3 M885.3,607.2c3.4,2.2,7.7-1.3,9.1-4.4C890.4,601.4,887.2,604.2,885.3,607.2 M874.4,605.1
+			c-0.1,1.2-0.2,2.3-0.3,3.5c-0.9,0.8-1.6,1.8-2.1,2.9c0.6,0,1.6,0,2.2,0c0.3-4.1,5.4,0.8,6.3-2.6
+			C879.9,606.1,876.6,606,874.4,605.1 M899.7,605c1,1.1,2.1,2.2,3.2,3.3c0.6-0.4,1.8-1.2,2.4-1.7C904.1,604.6,901.9,604.4,899.7,605
+			 M814.1,616c2.4,1.4,4.4,3.2,6.7,4.8c1.3-2.4,2.8-4.7,4.6-6.6c-1.5-1.3-3-2.7-4.5-4C818.2,611.6,815.9,613.6,814.1,616
+			 M831.8,617.3c0.4,1.4,1.4,2.5,2.9,2.7c0-0.7,0.1-2.1,0.1-2.8C834.1,617.3,832.6,617.3,831.8,617.3 M802.5,620.7
+			c0.2,1.5,0.5,3,0.8,4.4c-0.7,1-1.4,1.9-2.1,2.9c1.8,1.5,4,2.9,4.4,5.4c1,3.3-3.3,4.4-5.3,5.9c0.3,0.7,0.6,1.5,1,2.2
+			c0.9-0.1,1.8-0.2,2.7-0.2c-0.6,2-1.2,4.1-1.8,6.1c-1.6,2.4-5,5-2.6,8.1c1.2,2.6,3,0.1,3.3-1.5c1.3-5,5.4-8.5,7.8-12.9
+			c4.2-4.9,3.4-12.4,1.2-18.1c-1.3,0.5-2.5,1.1-3.6,1.8c-0.2-1.5-0.5-3-0.7-4.4C805.7,619.6,804.1,619.8,802.5,620.7 M794,632
+			c-0.5,1.6-0.2,3.3,0,5c3.2-1.3,6.6-2.3,9.8-3.4c0-0.4,0.1-1.2,0.1-1.6C800.7,631.8,797.2,630.9,794,632 M833.2,633.1
+			c-1.5,1.7,0.8,4.5,2.6,2.7C838.3,634.5,835,631.4,833.2,633.1 M820.2,650.1c0,1.2,0,2.3,0,3.5c0.7,0,2,0,2.7,0
+			c0.7-1.5,1.4-3,2.1-4.5C823.4,649.5,821.8,649.8,820.2,650.1 M809.2,650.4c0.2,2-1,6.5,2.3,6.2c2.7-1.4,1.6-4.9,0.8-7.2
+			C811.6,649.6,810,650.1,809.2,650.4 M815.3,659.6c1.8,1.6,4-0.5,5.8-1c-1.3-0.9-2.7-1.8-4.2-2.5
+			C815.4,656.1,814,658.4,815.3,659.6 M795.4,659.3c-0.2,1.2-0.3,2.4-0.3,3.6c1.3,0,2.5,0,3.8,0c0-1.3-0.1-2.6-0.1-4
+			C797.6,658.9,796.5,659,795.4,659.3 M817.3,666.3c-1.8,0.2-3,1.7-2.1,3.5c1.2,0.5,2.5,0.6,3.8,0
+			C819.3,668.3,819,666.5,817.3,666.3 M797.1,678.9c-1.5,2-1.5,4.4-0.7,6.7c1.1,0,2.2-0.1,3.3-0.1c0.3-1.2,0.5-2.4,0.8-3.6
+			C800.1,680.2,798.2,679.8,797.1,678.9 M836.5,679.2c-0.5,0.9-0.9,1.8-1.3,2.7c1.2,1.3,4.3,2.9,4.5,0
+			C840.3,679.7,838.1,679.2,836.5,679.2 M822.3,687.4c-1.3,1.5-0.3,3.4,0.4,5c2.7,1.5,3.9-2.5,3.9-4.5
+			C825.7,686.1,823.7,686.4,822.3,687.4 M828.1,708.4c0.6,1.9,1.5,3.7,3.4,4.7c0.5-1.6,1.2-3.2,1-4.9
+			C831.5,706.6,829.5,708.1,828.1,708.4 M834.6,717c-0.3,2,1.3,3.4,2.3,4.9c2.3-1.7,2.9-4.2,2-6.8C837.4,715.4,835.2,715,834.6,717
+			 M829,729.1c0.7,0.7,1.3,1.5,2,2.2c2.8-2.1,7.9-5.3,4.2-9.1C832.8,724.3,831.2,726.9,829,729.1 M855.9,734.9
+			c0,1.3,0.2,2.5,0.4,3.8c0.2,1.1,2.7,1.9,2.7,0.2C860.2,736.6,857.6,735.6,855.9,734.9z"/>
+		<path class="st2" d="M1731.2,581.2c0.4-0.4,1.3-1.3,1.8-1.7v8c-1.5-1.1-3-2.1-4.4-3.2c0.3-0.4,0.9-1.1,1.2-1.5
+			C1730.2,582.4,1730.9,581.6,1731.2,581.2z"/>
+		<path class="st2" d="M22.4,582.5c2.2-0.7,4.5-0.9,6.8-1.3c0.1,4.2,0.9,8.5-0.8,12.5c-2.6-0.4-5.2-0.6-7.6-1.5
+			C19.9,589,19.8,584.8,22.4,582.5z"/>
+		<path class="st2" d="M825.5,583.7c1.1-1.6,2.5-2.8,4.4-3.5c1.2,1.8,2.6,3.5,3.9,5.2c-1.2,1.8-2.6,3.6-2.3,5.9
+			c1.9-0.8,3.2-2.5,4.3-4.2c-0.2,2.6-0.5,5.1-1.3,7.6c-0.5,0-1.4-0.1-1.9-0.1C830.8,590.7,828.2,587.2,825.5,583.7z"/>
+		<path class="st2" d="M478,588.2c2.2,0.8,4.2-0.4,6-1.6c0.3,0.5,0.9,1.5,1.2,2.1c-0.2,1.2-0.3,2.5-0.5,3.8c-3.6,1.5-9,1.1-10.4,5.6
+			c1.4-0.1,2.9-0.2,4.4-0.4c0.2,0.3,0.6,0.8,0.8,1c0.8,1,1.6,2,2.4,3c-0.5,0.3-1.6,1-2.2,1.4c-0.5,0.3-1.4,0.9-1.9,1.2
+			c1.2,0.8,2.3,1.6,3.5,2.4c0.5,1.2,1,2.4,1.4,3.7c0.4-1.5,0.8-3.1,1.1-4.7c1.2,0.9,2.4,1.8,3.6,2.8c1,0,2,0,3,0
+			c0.8,0.5,1.6,0.9,2.5,1.4c1.2,0.7,2.5,1.2,3.8,1.8c-0.2,1.7,0,3.6-1.4,4.8c-0.3-0.2-0.9-0.5-1.3-0.7c-0.3,0-0.9,0.1-1.2,0.2
+			c-0.7,0.1-2.1,0.2-2.7,0.3c-0.4-1.2-0.7-2.4-1.1-3.6c-2.1-0.3-4.2-0.7-6.2-1c-0.7,1.7-1.9,3.4-2,5.3c2.3,1.7,4.9,2.9,7.2,4.8
+			c0,0.5,0.1,1.5,0.2,2c-0.4,0.9-0.9,1.8-1.3,2.8c-0.5-0.1-1.6-0.2-2.1-0.3c-0.2-1-0.5-1.9-0.7-2.9c-3-1.9-5.8-4.5-6.6-8.1
+			c0.4-0.8,0.9-1.5,1.3-2.2c1.3-1.2-0.3-2.5-0.8-3.6c-1.4-1.9-1.7-4.2-2.3-6.5c-1.2,0.5-2.4,1-3.7,1.5c-1.4-0.2-2.9-0.5-4.3-0.6
+			c0.5,1.8,1.9,3.1,3,4.5c-0.8,0.8-1.6,1.7-2.4,2.6c0,0.5,0.1,1.6,0.1,2.2l0,0.1c0.5,0.3,1.6,1,2.1,1.3c0.6,2.2,1.1,4.4,1.7,6.7
+			c1.6-0.1,3.3-0.2,4.9-0.3c0.5,1.4,1,2.7,1.5,4.1c-1.2,0.7-2.4,1.4-3.5,2.1c-2-1.3-4.1-2.6-6-4c-0.3-3.5-2.5-6.2-4.5-8.9
+			c-0.8,1-1.6,2-2.4,3c-1.7,0.2-3.4,0.3-5,0.5c0.9-1.8,2-3.6,3.3-5.3c1.4-1.6,2.1-3.7,1.7-5.9c-1.4,0.4-2.7,1-4,1.7
+			c-0.5-1.2-1-2.5-1.5-3.7c-1.5-0.7-3-1.4-4.4-2.1c0.4-1.5,0.8-3,1.2-4.6c1.4-0.8,3-1.1,4.6-1.2c0.6-0.9,1.2-1.8,1.7-2.6
+			c1,1,2,2.1,3,3.1c-0.1-1.5-0.3-2.9-0.4-4.4c2.2-0.7,4.4-1.4,6.4-2.7c0.1,0.4,0.2,1.2,0.2,1.6c-0.7,1.8-1.4,3.5-2.2,5.2
+			c1.7-0.3,3.4-0.6,5-1.2c2-0.7,2.1-3.2,2.8-4.9C475.6,589.9,476.8,589,478,588.2 M464.6,598.1c-1.2,1.6-2.4,3.1-3.6,4.7
+			c1.9-0.1,3.8-0.2,5.7-0.4C466.9,600.6,466.3,599,464.6,598.1 M464,605.2c-0.6,1.5-0.8,3.4,1,4.1c1.4-0.9,1.3-2.9,2-4.3
+			C466.2,605,464.7,605.1,464,605.2z"/>
+		<path class="st2" d="M495.9,588.8c2-0.3,4.2-0.9,5.6,0.9c-2.1,0.4-4.3,0.8-6.4,1.2C495.4,590.3,495.7,589.3,495.9,588.8z"/>
+		<path class="st2" d="M1730.8,588.8c0.6,0,1.7,0.1,2.2,0.1v5.8C1731.6,593,1729.4,591.3,1730.8,588.8z"/>
+		<path class="st2" d="M799.2,596c-1-2.5,0-4.8,1.5-6.8c0.8,0.4,2.3,1.3,3,1.8C802.9,593.2,802.2,596.1,799.2,596z"/>
+		<path class="st2" d="M10.9,592.7c1.5-1.7,3.7-2.1,5.9-2.2c1.7,2.7,2.5,6.2,5,8.4c1.4,0.8,2.8,1.6,4.2,2.4
+			c-0.7,0.9-1.4,1.8-2.1,2.6c-1.7,1.8-3.4,4.2-6,4.7c-2.2-1-0.7-3.1-0.6-4.8c0.6-2.2-1-4.2-1.5-6.2l-0.2-0.7
+			c-0.1-0.3-0.3-0.9-0.4-1.2C13.9,594.6,12.4,593.7,10.9,592.7z"/>
+		<path class="st2" d="M2.5,600.7c-0.4-3.1,0.1-6.4,1.1-9.3c2.8,0.1,5.6,0.8,8.1,2.1c-0.7,3,0.4,7.5-3.2,8.9
+			C6.6,603.7,3.2,603.1,2.5,600.7z"/>
+		<path class="st2" d="M391.5,598.8c-0.4-4.2,3.8-5.8,6.9-7.3c-0.4,8.8,1.2,17.6,0.4,26.5c0.9,6.9,0.6,13.8,0.7,20.7
+			c-0.5,4.6-0.5,9.2-0.3,13.8c-1.5-0.1-3-0.2-4.5-0.2c0.4,1.5,1,3,1.7,4.5c1.3-0.6,2.7-1.1,4.1-1.7c0.5,11.7-0.5,23.5,1.7,35
+			c0.2,6.2,0,12.5,1.7,18.6c-2.3,0.4-4.6,0.9-7,1.3c0.4-1.3,0.9-2.6,1.3-3.9c-0.6-1.4-1.1-2.7-1.7-4c0.5-0.9,1-1.8,1.5-2.6
+			c0.4-0.7,1.2-2,1.6-2.7c-1.6-1.6-3.3-3.1-5.1-4.5c0.2,1.3,0.5,2.5,0.7,3.8c-0.8,0.7-1.5,1.4-2.2,2.1c-2,0.5-4.6,0.3-5.6,2.5
+			c-1.1,2.4-0.8,5.2-2,7.6c-1.1-1.2-2.1-2.3-3.1-3.4c-0.5-0.1-1.5-0.2-2-0.3c1.8,4,3,8.4,6.2,11.6c-0.7-3-0.5-6.1,1.3-8.7
+			c2.8,2.3,5.3,6.4,9.5,5.1c1.5,0.8,3,1.6,4.5,2.4c1-1.1,1.9-2.2,2.9-3.2c0.7,2.9,1.7,5.7,3.2,8.3c5.8,7.3,16.1,7.6,24.6,7.9
+			c0.1,2,0.2,4,0.2,6c-0.1,3.1,0.4,6.3-0.5,9.4c-2.9-0.1-5.9-0.5-8.8-0.6c-9.2-1.9-18.8-0.9-28.1-1.6c-2.3-0.3-4.6-0.7-6.9-1.1
+			c-0.2-0.7-0.7-2.2-1-3c-0.9,1.1-1.7,2.1-2.6,3.2c-1.4-0.1-2.8-0.2-4.2-0.2c-0.4-1.4-0.7-2.8-1.1-4.1c-0.7,1.4-1.4,2.8-2.1,4.3
+			c-1.5,0-3,0-4.4,0c1.7-2.1,3.6-4.1,5.2-6.2c-0.3-2.5-1.9-4.6-3.5-6.5c-1.2-0.1-2.3,0.4-3.5,0.6c0.4,1.8,1.1,3.5,1.1,5.4
+			c-0.5,3-3.7,3.8-5.9,5c0.2,0.9,0.4,1.8,0.6,2.7c-1.5,0-3,0.1-4.5,0.2c0.5-3.2-0.2-6.3-1.2-9.3c-2-1.6-3.7-3.9-6.3-4.6
+			c-0.3,0.3-1,1-1.3,1.4c1.9,4.2,1.7,9.4,5.4,12.6c-5.5-0.2-11,0.1-16.5,0.1c-2.9-2.6-7-2.7-10.4-4.4c2.9-1.8,6.2-2.9,9.3-4.2
+			c2-2.7-0.5-5.1-1.8-7.4l0-0.4c2-0.6,4.2-1.4,5.5-3.1c2.9-3.4,4.5-7.7,5.4-12c2,0.5,3.9,1.1,5.9,1.6c0.3,2-0.3,4.7,1.9,5.8
+			c1.4,0.2,2.9,0.3,4.4,0.5c0.7,0.1,2,0.4,2.7,0.5c0.8,1.6,1.5,3.2,2.3,4.8c2.1-1.9,4.3-3.8,6.4-5.7c-2.9-1.1-6-1-9-1.6
+			c-1-0.4-2-0.9-3.1-1.3c-0.6-1.3-1.2-2.5-1.8-3.8c1.5-1.8,4.4-3,4.5-5.5c-1.4-2.4-3.9-3.7-6.2-5.1c0.8-1.6,1.5-3.1,2.3-4.6
+			c1,0.1,2.9,0.4,3.9,0.5c0.5,0.7,1,1.3,1.5,2c0.3,2.8,0.6,5.8,2.2,8.3c0.5,0.9,1.1,1.8,1.7,2.7c2.6,0.8,5.2,1.7,7.7,2.8
+			c0-2.2,0.1-4.3,0.1-6.4c-1.6-0.1-3.2-0.2-4.8-0.2c-0.8-1-1.6-2-2.4-2.9c-0.2-2.3-0.3-4.6-0.4-6.8c-3.1-2.2-6.1-4.5-9.1-6.7
+			c-0.3,1.4-0.6,2.8-0.9,4.2l0.1,0.8c-3.4,2-5.9,5.1-8.2,8.3c-0.3,1.7-0.6,3.4-1,5.1c0.3-4.3,0.2-8.6,0.1-12.9l1.2,0
+			c0.4,0,1.3-0.1,1.8-0.1c-0.1-2.3-0.5-4.7-0.1-7c1.3-1.8,2.9-3.3,4.3-4.9c-0.5-0.4-1.6-1.3-2.2-1.7c-1.4,0.8-2.9,1.7-4.3,2.5
+			c-0.1-6.4-0.7-12.8,0.8-19.1c-1.5-7.4-1-15-0.4-22.5c1,1.5,2,3,3,4.5c1.4,0.1,2.8,0.3,4.2,0.4c0.3,0.8,0.6,1.6,1,2.4
+			c0.9,0.9,1.7,1.8,2.7,2.6c0.4,0.1,1.3,0.4,1.7,0.6c0.7-0.5,1.4-1.1,2.1-1.6c0.5,0.5,1,1,1.5,1.5c-0.9,1.5-2.4,3.1-1.7,5
+			c1.1,2.4,4.2,2.6,6.3,3.5c0.2,0.2,0.7,0.5,1,0.6c1.8,1.5,3.5,3.2,5.3,4.7c2.1,0.8,4.4,0.7,6.6,0.7c-0.2-1.8-0.5-3.7-1.9-5.1
+			c-0.7-0.4-1.5-0.8-2.2-1.1c-0.3-1.8-0.5-3.6-0.8-5.5c-2.4-0.1-4.8-0.2-7.1-0.3c1-0.9,2-1.8,3-2.7c1.8-1.5,3.6-2.8,5.4-4.3
+			c1.3-1.1,2.6-2.2,3.9-3.3c1.5,0.9,3,2.6,4.8,1.3c-0.6-4.2-5.1-6.2-7.9-9c-4.8,1.1-5.4,6.3-6.4,10.3c-1.6-0.5-3.8-0.2-4.5-2
+			c-0.8-2.1-0.5-4.4-0.8-6.6c-2.5,2.2-3.8,5.5-6,8c-0.1-2-0.2-3.9-0.2-5.9c1.2-0.6,2.6-1.1,3.8-1.9c0.9-1.6,0.1-3.3-0.7-4.7
+			c-0.6-1.1-1.3-2.1-2-3.2c4.2-1.3,6.4-5.1,8.8-8.4c3.1-2.6,5.8-5.6,7.8-9.2c3.7,0.6,7.4,1.1,11.1,1.2c-0.3-3.6-3.9-3.7-6.4-4.9
+			c-1.9-1.3-2.5-3.9-2-6c1.4-0.7,2.9-1.2,4.4-1.8c1.2,1.2,2.4,2.6,4,3.3c1.7-0.9,1.8-2.9,2.1-4.6C394.5,600,393,599.4,391.5,598.8
+			 M390.7,628.6c-1.5,2.9-5,4.5-5.4,8c2.9,0.2,5.7-0.7,7.1-3.4c1.7-2.9,5.9-5.4,4.8-9.2C394.4,624.4,392,626.1,390.7,628.6
+			 M379.2,632.6c1.8,0,3.6,0,5.4-0.1c-0.1-1.8,1.8-4.7-0.5-5.5C381.3,627.2,379.1,629.9,379.2,632.6 M356,654.5
+			c0.6,0.8,1.2,1.6,1.9,2.5c-1.8,1.5-3.9,3-3,5.7c1.3,0.7,3.5,0.5,3.8,2.3c-0.6,1.6-1.6,3-2.4,4.5c1.3,0.2,2.8,1.1,3.8-0.2
+			c1.3-3.2,2.4-6.8,2.1-10.3c-1.3-2.1-3.1-3.9-4.3-6.1C357.3,653.4,356.7,653.9,356,654.5 M388.1,657.2c0.3,1.2,0,3.6,1.9,3.5
+			c2.1,0.4,1.8-2.4,2.1-3.6C390.7,657.1,389.4,657.1,388.1,657.2 M369.2,661.2c-0.8,1-0.8,2.2-1.1,3.4c1,0.4,2,0.9,2.9,1.3
+			c0.4-1,0.8-2,1.2-3C371.8,661.6,370.5,661.2,369.2,661.2 M365.6,669.2c-0.2,3.6-2.5,6.2-5.2,8.3c-0.2,2.9,3.5,4,5.5,5.4
+			c0.5-1.9,1-3.7,1.4-5.5c1.8-0.7,3.7-1.4,5.6-2.1C371.8,672.1,369.2,669.3,365.6,669.2 M377,676.9c0.8,0,2.5,0,3.3,0.1
+			c0-2.6-0.1-5.3-0.5-7.9C378.1,671.4,376.4,673.9,377,676.9 M395.4,669.4c0,1.2-0.1,2.3-0.1,3.5c3.2,1.1,5.3-2.2,3.1-4.7
+			C397.6,668.5,396.1,669.1,395.4,669.4 M368.5,687.5c-1.4,0.9-0.1,2.7-0.1,4c2.1,0.4,4.2,0.6,6.4,0.3c0.3-2.4,1.7-5,0.8-7.4
+			C372.7,683.4,370.5,686,368.5,687.5 M379.3,692.3c-2.6,1.7-0.8,5.1-0.8,7.6c1.1-1.3,2.5-2.4,3.3-4
+			C382.3,694.3,381.4,691.5,379.3,692.3 M379.3,719.2c-1.7,0.3-3.4,0.6-5.1,1c0.2,2,0.9,4,2.5,5.3c4,3.1,9.5,2.3,14.2,3.1
+			c-0.4-1.2-0.9-2.4-1.3-3.6c-1.6,0.4-3.3,0.9-4.9,1.3c-1.1-1.2-2.2-2.3-3.2-3.5c0.8-1.1,1.6-2.1,2.4-3.1c-0.1-0.7-0.1-2.2-0.2-2.9
+			C382.2,717.7,380.7,718.4,379.3,719.2 M395.4,727.4c-1,0.5-1.3,1.2-1,2.2c3.2,1.8,7,1.6,10.5,2.6c2,2.1,2.2,6.1,6,5.9
+			c0.6-3-1.1-5-3.7-6.1c0.7-1.4,2.5-3.3,0.6-4.6c-2.1-0.6-3.7,1.4-5.7,1.8C399.8,728.7,397.6,727.7,395.4,727.4 M347.3,733.4
+			c-1.5,1.4-0.6,4.4,1.7,4C353.1,737.8,349.2,731.6,347.3,733.4z"/>
+		<path class="st2" d="M1528.9,592.4c1.3,1.2,2.6,2.3,3.8,3.5c3.4,3.8,5.5,8.4,7.3,13.1c2.3,2.8,4.7,5.6,4.7,9.5
+			c3.2,0.7,6.3,1.5,9.4,2.6c0.2,1.2,0.5,2.5,0.8,3.7c2.1-2.3,2.8-5.3,3.7-8.1c2.4-2,5.2,0.2,7.7,1c-0.1-2.5-0.4-5-0.4-7.5
+			c1-0.6,2.1-1.1,3.2-1.6c1,3.2,2,6.3,3.3,9.4c-1.7,2.5-3.2,5.1-4.4,7.8c1-0.3,2-0.5,3-0.8c0.6-1,1.3-2.1,2-3.1
+			c0.4,1.5,0.9,3,1.3,4.6c-1.4,1-2.5,2.3-3.1,3.9c1.7-0.2,3.5-0.5,5.2-0.7c0.5,1.8,1.1,3.5,1.7,5.2c-1.3,3.9,2.6,7.1,1.8,10.8
+			c-2.8,1.8-5.6,4.2-8.9,4.9c-0.5-0.5-1.5-1.4-2-1.9c-1,0.2-2,0.4-3,0.7c-0.6-0.8-1.2-1.6-1.8-2.4c-3-0.5-5.8-1.3-8.6-2.3
+			c-1-2-2-4-3-6c-2.6,0.6-5.2,1.3-7.8,1.9c-2.8-1.7-5.6-3.3-8.5-4.7c1.1,2.6,2.4,5.2,2.9,8.1c-3.4,0-6.7-0.6-9.2-3.1
+			c0.6-0.5,1.7-1.5,2.2-1.9c-0.3-0.8-0.5-1.7-0.7-2.5c0.4-0.2,1.3-0.8,1.7-1c0.4-2.6,1.2-5.2,2.4-7.5c-0.8-0.8-1.7-1.6-2.5-2.3
+			c-0.3-0.3-1-0.9-1.4-1.2c-1.4,0.5-2.8,1-4.1,1.5c-0.5-1.1-0.9-2.2-1.4-3.2c-1.4,0.4-2.8,0.9-4.2,1.4c-1.4-1-3-1.8-4.5-2.5
+			c2.1,0,4.1,0.1,6.2,0.1c-0.3-0.8-0.6-1.5-0.9-2.2c-2.7-6.3-4.8-12.8-6.7-19.4C1520.5,597.5,1527,597.8,1528.9,592.4 M1529.2,597.9
+			c0.4,1,0.8,2.1,1.2,3.2c1.2-0.4,2.4-0.8,2.9-2.1C1532.2,597.7,1530.6,598,1529.2,597.9 M1531.2,607.8c1.5,0,2-1.7,2.9-2.7
+			c-0.8,0-2.3-0.2-3.1-0.2C1529.7,605.3,1530.1,607.2,1531.2,607.8 M1534.8,620c1.8,2.8,3.7-1.1,4.9-2.5
+			C1537.6,616.4,1535.3,617.8,1534.8,620 M1538.2,621.1c0,0.6,0.1,1.9,0.1,2.6c1.1,0,2.3,0,3.4,0c0.2-0.8,0.5-2.3,0.7-3.1
+			C1541,620.7,1539.6,620.9,1538.2,621.1 M1544.2,624.2c-2.4,2.4,3.9,3.2,3.8,0.7C1549,623,1544.9,623.3,1544.2,624.2 M1562.5,624.3
+			c0.2,1.9,0.1,4.4,2.7,4.3C1568.4,626.8,1564.5,624.7,1562.5,624.3 M1548.6,628.5c0,0.2-0.1,0.6-0.1,0.8c0.6,0,1.7,0.1,2.3,0.1
+			c0.2,1.7-0.2,3.2-1.3,4.3c1.3-0.2,2.6-0.4,3.9-0.6c0.4,0.4,1.2,1.2,1.6,1.6c-0.5-1.5-0.9-2.9-1.6-4.3
+			C1551.9,629.3,1550.2,629,1548.6,628.5 M1558.4,638c1.4,1.8,2.7,3.9,4.6,5.3c2.7,0.9,4.3-2.4,5.5-4.3c-0.3-2.7-1.6-5.2-2.2-7.9
+			C1562,630.7,1561.1,635.8,1558.4,638 M1570,637.1c0.6,0.4,1.8,1.2,2.3,1.6c2.5,0.2,1.7-2.9,2.1-4.4
+			C1572.4,634.3,1571,635.5,1570,637.1 M1571.1,643.2c2,1.4,5.3,1.8,5.5-1.5C1574.6,641.3,1572.2,640.9,1571.1,643.2z"/>
+		<path class="st2" d="M736.2,596.3c1,0.3,2.1,0.6,3,1c0.4,2.9,0.8,5.8,0.8,8.7c0.3,2.4-2.6,2.7-4.1,3.8c-0.3,0.2-1,0.6-1.3,0.8
+			c-0.9,1.4-1.6,2.9-2.7,4.2c-1.6,1.1-3.6,0.6-5.4,0.8c0-1,0-1.9,0-2.9c1.3-0.9,2.5-1.9,3.8-2.8l1-0.3c-0.2-0.9-0.4-1.8-0.6-2.6
+			C733,603.7,735.1,600.2,736.2,596.3z"/>
+		<path class="st2" d="M1702.8,597.6c1.8-0.1,3.8-0.4,5.2,1.1c-1.4,1-2.8,2-4.3,3l-1,0.1C1702.7,600.7,1702.8,598.6,1702.8,597.6z"
+			/>
+		<path class="st2" d="M0,611.3c1.5-1.1,3-2.3,4.7-2.8c3,0.8,5.4,3.3,5.3,6.5c-0.7,0.8-1.5,1.5-2.2,2.3c-1.3-1-2.6-1.9-3.9-2.9
+			c-1.3,0.2-2.6,0.5-3.9,0.8V611.3z"/>
+		<path class="st2" d="M133.8,607.2c3.3,4.4,4.1,10.5,9,13.7c-0.5,0.6-1.4,1.7-1.9,2.3c-0.2,0.3-0.8,1-1,1.3
+			c1.2,2.3,3.6,3.5,5.4,5.3c0.4,2.1-0.1,4.3,0.7,6.3c2.7,2.8,6.8,2.2,10.3,1.7c-0.2,4.1-0.4,8.2-0.5,12.3c-1.6-0.3-3.3-0.5-4.9-0.8
+			c-0.5-1.6-1-3.2-1.5-4.9c-2.4-0.1-4.8-0.2-6.8,1.4c-0.9,1.2-1.7,2.3-2.5,3.5c3,1.6,7.4,2.3,8.2,6.3c-0.9,0.2-2.9,0.7-3.8,0.9
+			c-1.2-0.1-2.3-0.1-3.5-0.2c-0.5-1.4-1-2.7-1.6-4c-0.5,0-1.4,0.1-1.9,0.1c-1.4,2.1-3.1,4.3-5.9,4.3c0.1-3.5,0.2-7,0.3-10.6
+			c1.5,0.8,3,1.6,4.6,2.4c-0.6-2.8-1.6-5.6-2.9-8.2c2.5-2.2,5.7-3.1,8.6-4.3c-1.3-1.2-2.1-3.4-4.1-3.5c-1.7,0.2-3.4,0.7-5.1,1.1
+			c0-3,0.1-6,0.4-9c1.4-0.5,2.8-0.9,4.1-1.4c0.7-2.6-1.5-4.9-2.5-7.2C133.1,613.4,133.8,610.2,133.8,607.2z"/>
+		<path class="st2" d="M23.3,615.8c1.7-2.4,4.1-1.3,6.2,0c-0.1,2.9-0.2,5.8-0.4,8.7C26.4,622.1,24.9,618.8,23.3,615.8z"/>
+		<path class="st2" d="M16,622.9c0.9-2.8,1.1-5.7,1.6-8.6c2.2,3.2,6,6.6,3.8,10.8c-1.4,0.7-2.7,1.5-4,2.3c-0.8-0.1-2.5-0.3-3.3-0.4
+			c0.4-0.9,0.9-1.8,1.3-2.7C15.5,623.9,15.8,623.2,16,622.9z"/>
+		<path class="st2" d="M499,615.6c2.8,0.2,5.5,0.3,8.3,0.4c0,0.7,0,2,0,2.7c0.3,3.2-0.2,6.7-3.5,8.2c-1.8,1.2-3.8,2.2-5.7,3.2
+			c0.2-1.4,0.4-2.9,0.6-4.3c0.9-0.1,2.6-0.2,3.4-0.3c0.4-2.5,0.3-5.2-2.5-6.2C499.5,618.1,499.3,616.8,499,615.6z"/>
+		<path class="st2" d="M1718.3,621.7c2.1-1.6,4.4-3.3,7.2-2.5c-0.5,2.4-0.9,4.9-1.2,7.3c0.9,0.5,1.8,1.1,2.7,1.6
+			c0.2,0.7,0.6,2.1,0.8,2.8c1.6-0.4,3.5-0.4,4.6-1.9c-1.1-1.3-2.8-1.7-4.3-2.3c-0.9-2.4-1.7-4.7-2.5-7.1c1.8-0.4,3.6-0.7,5.4-1.1
+			c0.3,2.2,0.4,4.6,2.1,6.4v14.9c-2.2-2.1-4.2-4.4-5.7-7c-2.6,0.3-4.7,1.7-6.6,3.3c-0.9-0.7-1.9-1.3-2.8-1.9c-0.7,1.4-1.4,2.9-2,4.4
+			c-1.4,2.8,0.6,5.2,2.2,7.3c0.5-0.1,1.6-0.4,2.1-0.5c0.5-0.1,1.4-0.3,1.8-0.5c-0.1,2.2-0.6,4.4-0.9,6.6c1.1,0.8,2.2,1.6,3.3,2.5
+			c-0.9,1.2-1.7,2.4-2.5,3.7c1.7,0,3.5,0,5.2-0.1c0.1-0.6,0.4-1.8,0.5-2.4c1.1-1.2,2.3-2.5,3.4-3.7c0.5-0.6,1.4-1.7,1.9-2.3v5.8
+			c-1.6,1.8-3.2,3.7-4.7,5.6c-2.3,0.1-4.7,0.1-7,0.1c-0.6-2.5-1.1-5-1.8-7.5l-1.2-0.9c-1.5-1.3-2.6-3-4.3-4.1c-1.4,0.3-2.7,1-4,1.5
+			c1.2,0.8,2.5,1.7,3.7,2.6c0.1,0.5,0.1,1.6,0.2,2.1c-2,0.4-4,0.8-5.9,1.2c-1.7-1.2-3.4-2.2-5.1-3.2c0-4,0-8.1,0.1-12.1
+			c1.6,1.3,3.3,2.6,4.8,4.1c1.1,1,2.2,2.8,4,2.3c1.1-0.9,1.6-2.4,2.3-3.6c-0.9-0.6-1.7-1.2-2.6-1.8c0.3-1.6,0.6-3.2,0.9-4.8
+			c-1.4-1.8-2.7-3.7-4-5.5c1.9-1.6,3.8-3.4,5-5.7c-1.9,0.3-3.8,0.7-5.7,1.1c0-1.6,0-3.3,0.1-4.9c1-0.3,2.1-0.5,3.2-0.8
+			c1.5,0.9,3,1.8,4.4,2.8c2.2,1.9,3.3,5.3,6.6,5.6c-0.2-1.7,0-3.7-1.7-4.7C1719.6,623.7,1718.7,622.4,1718.3,621.7 M1711.2,631.2
+			c1.2,0.9,2.4,1.6,3.9,2.1c-0.3-1.5,0.9-4.1-1.1-4.6C1713,629.5,1712.1,630.3,1711.2,631.2z"/>
+		<path class="st2" d="M0,622c0.8-1,1.6-1.9,2.3-2.9c2,1.7,4.5,3.1,6,5.3c0.8,2.9,1.4,6,1,9.1c-0.9,2.2-3.9,2.3-6,2.2
+			c-2.1-0.8-1.8-3.3-2.3-5.1c1.4-0.1,2.9-0.3,4.3-0.4c-0.2-1.7-0.5-3.4-0.7-5.1c-1.5-0.7-3.1-1.4-4.7-2V622z"/>
+		<path class="st2" d="M729.4,624.6c0.5-1.4,1-2.9,1.4-4.3c1.8,2.1,3.4,4.4,3.2,7.3c-3.5,2.8-8,4.5-10.5,8.2
+			c-0.5,1.2-0.8,2.5-1.1,3.8c-2.9,2.1-6.1,3.6-9.8,3.8c-0.3-1.7-1.4-3.5-0.8-5.3c1.9-1.8,4-3.5,5.5-5.8c-0.8-1.4-1.7-2.7-2.5-4.1
+			c2.4-1.5,4.9-2.6,7.4-3.9C724.6,624.5,727,624.9,729.4,624.6 M723.1,626.4c-1.5,1.3,0.9,3.6,2.2,2.2
+			C726.8,627.2,724.5,625.1,723.1,626.4 M718.7,627.4c-1.1,3.4,2.5,4.5,5.1,4C722.5,629.6,721,627.8,718.7,627.4z"/>
+		<path class="st2" d="M151.9,622.7c1.7-0.2,5-2,5,1c-0.3,1.2-0.6,2.4-1,3.6c-2.7,0.4-5.3,1.4-8,2c-0.3-0.3-0.9-1-1.2-1.3
+			C145.8,624.5,149.6,623.7,151.9,622.7z"/>
+		<path class="st2" d="M1466.3,622c2.4-0.3,4.9-0.3,7.4-0.5c-0.6,2.2-1.2,5,0.9,6.7c2.1,2.6,6.7,3.9,6.6,7.8
+			c-1.5,2.9-5.6,2.4-8.2,1.5c-5.3-2.5-10.6-5.2-14.9-9.1c2.1-0.6,4.2-1,6.2-1.9C1465.2,625,1465.7,623.5,1466.3,622z"/>
+		<path class="st2" d="M482.2,627c0.5-0.1,1.3-0.4,1.8-0.6c-0.2,0.6-0.5,1.7-0.6,2.2c-0.6,1.4-1.4,2.7-2.2,4.1
+			c-1.9-0.9-3.7-2.1-5.1-3.7c1.5-0.3,3-0.6,4.4-0.8C481,628,481.8,627.3,482.2,627z"/>
+		<path class="st2" d="M1702.8,626.3c2.5,0.1,4.9,0.8,6.5,2.8c-2.1,1.2-4.3,2.1-6.5,2.7C1702.7,630,1702.7,628.2,1702.8,626.3z"/>
+		<path class="st2" d="M151.6,630.6c1.7-1,3.7-0.2,5.6-0.1c-0.1,0.9-0.3,2.6-0.4,3.5c-1.7,1-3.5,1.9-5.2,2.9
+			C151.3,634.8,150.4,632.5,151.6,630.6z"/>
+		<path class="st2" d="M711.4,631c1.5-0.1,3,0,2.4,2c-0.8,1.8-3,2-4.6,2.4C709.9,633.9,710.7,632.5,711.4,631z"/>
+		<path class="st2" d="M1485.8,632.4c1.3-0.7,2.6-2,4.2-1.8c2.2,0.4,4,1.7,6.1,2.4c1.4-0.3,2.2-1.8,3.4-2.6c1.2,0.9,2.4,1.7,3.7,2.6
+			c-0.1,1.5-0.3,3-0.4,4.4c1.5-1.3,2.9-2.6,4.4-3.9c0.8,0.9,1.7,1.8,2.6,2.7c2-0.4,4.1-0.7,6,0.3c0.2,0.7,0.6,2.1,0.8,2.8
+			c1.2,0.3,2.4,0.1,3.6,0.2c0.1,0.7,0.3,2.2,0.4,2.9c-7.4,0-14.8-0.1-22.2,0c-0.9-2-1.4-4.4-3-6c-1.5-0.9-3.2-1.3-4.7-1.9
+			c-0.1-0.4-0.3-1.1-0.4-1.4C1488.8,633,1487.2,632.7,1485.8,632.4z"/>
+		<path class="st2" d="M1702.7,636c1.4-1.6,3-3.1,4.7-4.3c0.7,1.8,1.5,3.6,2.2,5.5c-1.7,0.2-3.3,0.3-4.9,0.5
+			c-0.7,0.8-1.3,1.7-1.9,2.5C1702.8,638.8,1702.7,637.4,1702.7,636z"/>
+		<path class="st2" d="M357,633.2c1.4,0.2,2.7,0.4,4.1,0.6c0.2,0.5,0.7,1.6,0.9,2.1c0.2,0.9,0.4,1.8,0.6,2.6c-2.3,0.4-4.6,1.3-7,0.8
+			C354.4,637.2,355.7,635,357,633.2z"/>
+		<path class="st2" d="M482.4,633.5c2,1.2,2.5,3.5,3.2,5.6c1.2,0.2,2.5,0.4,3.7,0.7c0.8,2.9,0.8,6.3,3.3,8.4
+			c0.4-0.7,1.3-2.1,1.7-2.8l1.1,0.2c4.4,2.5,4.8,7.7,5.6,12.1c-1.3-0.7-2.5-1.5-3.9-2.1c-3.1-0.6-6.5,0.7-9.2-1.3
+			c2.6-0.8,5.2-1.5,7.8-2.1c-0.2-0.8-0.5-2.3-0.7-3.1c-1.1,0.1-2.1,0.1-3.2,0.2c-1.2-1-2.1-2.5-3.6-2.7c-1.8,0-3.6,0.4-5.4,0.7
+			c-0.2-0.5-0.6-1.6-0.8-2.1c0.8,0,2.2,0.1,3,0.2c-0.1-0.4-0.5-1.2-0.6-1.6c-0.6-0.2-1.8-0.6-2.4-0.8
+			C481.9,639.9,482,636.7,482.4,633.5z"/>
+		<path class="st2" d="M1448.8,643c1.4-3.7,3.1-8.5,7.6-9.2c0.5,1.5,0.9,3,1.5,4.5c2,1.2,4.4,1.2,6.6,1.7c-0.1,0.7-0.3,2-0.5,2.6
+			c-3.2,0-6.3-0.2-9.4,0C1452.7,642.9,1450.8,643.1,1448.8,643z"/>
+		<path class="st2" d="M1421,650.9c2.2-5.5,4.6-11,6.8-16.5c0.4,0.5,1.3,1.3,1.7,1.8c2.7,0.8,5.2,2.2,7.3,4.1
+			c-1.3,1.7-2.7,3.3-4.1,4.9c0.2,0.7,0.8,2.1,1,2.8c1.7-0.5,3.3-1.1,4.9-1.8c-0.1-2.2,0-4.4,0.2-6.5c2,3.4,6.2,6.4,5.5,10.8
+			c-0.7,1.9-1.1,3.8-1.5,5.7c-2.3,1.6-4.8,2.9-7.7,2.3c0.3-1.1,0.7-2.3,1-3.4c-2.5-1.8-5-3.6-7.7-5.1c-0.4,1.4-0.7,2.7-1.1,4.1
+			c3.2,1.6,1.9,4.9,1.2,7.7c2.3,4.1,0,8.5-1.6,12.3c1.8-0.5,3.5-1,5.3-1.5c0.8-1.4,1.6-2.7,2.4-4.1c2.2,0.5,4.5,1,6.7,1.5l0-0.8
+			c0.5-2.9,2.2-5.4,3.8-7.9c0.3,0.5,0.8,1.4,1.1,1.9c-3.5,8.5-6.7,17.1-9.8,25.8c-1.6-0.5-3.1-1-4.6-1.5c-0.6,2.3-1.1,4.5-1.7,6.8
+			c1,0.5,2.1,1.1,3.2,1.7c-1.2,3.3-3,6.5-3,10.1c0,3.9-0.2,7.7-1.1,11.5c0.6,0.2,1.8,0.6,2.4,0.8c1.1,2,2.4,3.8,4,5.4
+			c0.8,0.5,1.6,0.9,2.5,1.3c0,0.8,0.1,2.3,0.2,3c0.7-0.6,1.5-1.2,2.2-1.8c1.3,0.3,2.8,0.7,4.2,1c-1.8,2.2,1,3.5,2.3,5
+			c-0.5,1.6-1.4,2.8-2.8,3.6c-1.4-0.8-2.8-1.6-4.3-2.3c0.8,2.4,1.7,4.8,2.5,7.2c-1,0.1-2.9,0.3-3.8,0.3c-3.6,0-7-0.8-10.1-2.5
+			c-1.2,0.7-2.2,1.7-3.2,2.6c-8.9-0.2-17.7,0.2-26.6-0.2c0.2-0.6,0.7-1.7,0.9-2.3c2.8-0.5,5.7-1.1,8.5-1.8c2.1-0.5,4.2-0.9,6.3-1.4
+			c1.7,0.7,3.8,2.5,5.1,0.2c-0.9-1.5-2-3.1-3.7-3.9c-2.3,0.7-4.5,1.9-6.7,2.9c-0.9-1.1-1.8-2.2-2.6-3.3c0.1-0.3,0.4-0.8,0.5-1.1
+			c0.8-0.1,2.6-0.4,3.4-0.5c-0.1-0.8-0.3-2.4-0.3-3.2c-0.7,0.2-2.2,0.6-2.9,0.8c0.6-0.9,0.4-3.6,2.2-3c1.5,0.2,3,0.7,4.6,1.1
+			c0.4-1.3,0.9-2.6,1.4-3.9c0.8,1.5,1.5,3.1,2.3,4.7c2.3,0.2,4.7,0.2,7,0.9c2.1,1.1,3.3,3.4,4.7,5.2c1,0.3,2,0.7,3.1,1
+			c0.7,2,1.4,4,2.1,5.9c0.4,0.1,1.1,0.2,1.4,0.3c0.3-1.5,0.6-3,1-4.5c-3.5-2.3-5.4-6.2-8.1-9.3c-2.2-2-1.4-5.2-1.6-7.8
+			c-3.2-1.6-6.8-3.2-10.4-2.3c-1.8,0.7-3.2,1.9-4.7,3c-0.1-1.3-0.2-2.6-0.3-3.9c-0.5-0.2-1.3-0.6-1.8-0.8c-1.3,2.3-3,4.3-6,4.2
+			c-0.1-2.4,0-4.7,0-7c2.4-1.6,4.4-5.2,2-7.6c-2.4,1.3-4.8,2.8-7.3,3.8c-0.3,1.3-0.6,2.7-0.8,4c-0.4-0.3-1.2-1-1.6-1.3
+			c-0.4-1-0.7-2.1-1-3.1c1.6-2.7,3.1-5.5,4.3-8.4c0.8,1.6,1,4.1,3.5,3.7c0.2-2.2-0.2-4.3-0.5-6.4c4.8-0.1,9.7,0.4,14.4-0.8
+			c1.4-2.4,1.2-5.3,1.5-8c-0.3,0.4-0.9,1.2-1.2,1.7c-2.5-4.9-2.5-10.8-5.7-15.4c0.5-3.6,2.9-7.1,4.2-10.6c1.7,1.3,3,3,4,4.9
+			c1.2-0.8,2.5-1.3,3.4-2.5c-0.6-1.4-1.9-2.6-2-4.1c0.6-2,1.7-3.9,2.6-5.8c-1.1-0.8-2.2-1.6-3.3-2.5
+			C1420.8,652.4,1420.9,651.4,1421,650.9 M1426.4,677.8c-1,1.6-3,3.1-2.5,5.2c1.7,2,4.2,2.9,6.5,4.2
+			C1430.7,683.6,1427.7,680.9,1426.4,677.8 M1422.2,702c-0.2,0.3-0.7,0.9-1,1.2C1422.2,706.6,1426,701.3,1422.2,702z"/>
+		<path class="st2" d="M460.5,636.2c0.6,0,1.8,0,2.4-0.1c0.6,1,1.2,1.9,1.9,2.9c0.4,0.4,1.1,1.3,1.5,1.8c1.5-0.7,3.1-1.4,4.6-2.1
+			c1.4-0.7,2.9-1.3,4.3-2c0.7,0.4,2.1,1.3,2.8,1.7c-0.6,1.2-1.2,2.5-1.9,3.7c-4.8,0.6-9.7,1.2-14.5,0
+			C460.9,640.1,460.7,638.1,460.5,636.2z"/>
+		<path class="st2" d="M1137.7,637.2c1.7,1.2,3.5,2.3,4.9,3.8c-1.3,2.1-5.7,3-4.6,5.9c2.8,0.2,5.4-1.8,8.1-2.6
+			c0.4-2.5,2.9-5.7,5.7-4c0.9,4.3,0.6,8.9,0,13.2c1.3,0.1,2.5,0.3,3.8,0.4c-0.4,1.8-0.8,3.5-0.8,5.4c1.3,0.5,2.6,1,4,1.4
+			c-1.2,3-2.4,6-3.5,9c-1.4-0.7-2.8-1.3-4.2-2c0.9-0.7,1.7-1.3,2.6-2c-0.5-0.7-1-1.3-1.5-2c-0.4-1.1-0.7-2.1-1.1-3.2
+			c-0.7-0.4-1.3-0.7-1.9-1c-1.8,0.6-3.5,1.1-5.4,1.3c0.4-1.3,1-2.5,1.3-3.7c0.8-3.5,1.4-7.1,2.8-10.5c-1.2,0-2.4,0-3.5-0.1
+			c0.5,1.5,0.9,3.1,1.4,4.6c-1.1,0.7-2.1,1.3-3.2,2c-0.4,1.6-0.9,3.2-1.4,4.7c-2.4-0.2-2.3-3.5-3.2-5.2c-0.1-1.1-0.2-2.2-0.2-3.3
+			c-0.6-0.2-1.9-0.6-2.5-0.8c-0.2-0.6-0.6-1.8-0.7-2.4C1135.4,643,1136.9,640.2,1137.7,637.2z"/>
+		<path class="st2" d="M17.5,639c2.9,3.2,5.3,6.8,8.3,9.8c-0.4,0.2-1.3,0.6-1.7,0.8c-1.5-0.5-3-1-4.4-1.5c-1-0.3-1.9-0.7-2.8-1
+			C17.1,644.3,17.3,641.6,17.5,639z"/>
+		<path class="st2" d="M691.2,643.1c1.8-0.8,3.7-1.4,5.5-2c1.1,1.6,2.2,3.2,3.4,4.9c0.6-1.5,1.3-3.1,2-4.6c1.3,1.5,2.7,3,4,4.5
+			c1.3-0.2,2.6-0.3,3.9-0.5c0.2,0.5,0.7,1.4,1,1.8c0.4,0.9,0.7,1.9,1.1,2.8c0.7,0.1,2.1,0.5,2.8,0.6c-3.8,0.5-6.2,3.4-8.4,6.3
+			c0.4,2.1,0.8,4.2,1.1,6.3c-3.5-0.4-6.6,0.8-8.5,3.8c-1.8,0.5-3.5,1-5.2,1.6c-1.5,0.7-2.9,1.7-4.2,2.8c1.2,1.7,3,3.3,3.3,5.4
+			c-0.7,2.3-3.4,2.3-5.1,1.3c-3-1.2-3.2-4.8-4.2-7.4c-1.3,0.3-2.7,0.6-4,1.1c-1.8,1.5-2.4,4-3.4,6.1c-0.7-1.1-1.5-2.2-2.2-3.3
+			c2.1-5,4.1-10.2,5.5-15.5c0.7-0.2,2-0.7,2.6-1c-0.2-1.3-0.3-2.7-0.4-4c2-0.5,4-1.1,6-1.6c2.2,3.5,5.5,8.3,10.3,7.3
+			c-0.7-2.9-4.1-3.6-6.2-5.1c-0.2-1.5-0.3-2.9-0.4-4.3c-1.8-0.1-3.7-0.3-5.5-0.4c0.3-1.2,0.5-2.4,0.8-3.5
+			C688.2,645.3,689.7,644.2,691.2,643.1 M702.3,645.9c0.1,1.1,0.3,2.1,0.5,3.2c-1,2.8-2.8,5.6-1.8,8.6c1.3,0,2.6-0.1,3.9-0.1
+			c-0.5-1.5-1.8-3-0.9-4.6C705.1,650.6,704.2,647.7,702.3,645.9 M695.2,647.1c-2.3,1.3,0,4,0.6,5.7c0.8-1.1,2.5-2,1.9-3.6
+			C697.6,648.2,696.6,645.5,695.2,647.1 M685.1,662.2c0.3,1.1,0,2.9,1.4,3.4c1.2,0.9,4.4,1.8,4.2-0.6
+			C690.3,662.7,686.9,662.5,685.1,662.2z"/>
+		<path class="st2" d="M0,645.9c1.1-0.6,2.2-1.3,3.3-1.8c0.8,1.3,1.6,2.7,2.4,4.1c-1.9,0-3.8-0.1-5.7-0.1V645.9z"/>
+		<path class="st2" d="M472.1,645.7c1.6-0.2,3.3-0.3,5-0.5c0.6,0,1.8-0.1,2.3-0.1c-0.9,1.7-1.9,3.4-3.5,4.6
+			c-0.4,0.3-1.1,0.8-1.4,1.1c0,1.7,0,3.3,0,5c-0.6,0.7-1.2,1.5-1.8,2.2c-0.2-1.8-0.4-3.6-0.5-5.3c-0.6-0.4-1.7-1.2-2.2-1.6
+			c-1.5,1.7-2.9,3.3-4.5,4.9c4.8,0.2,7.4,4.8,7.1,9.2c-0.6,0.1-1.8,0.3-2.4,0.4c-0.4-1-0.7-2.1-1.1-3.1l-0.2-0.9
+			c-0.3-1.4-0.6-2.7-0.8-4c-1,0-2.8-0.1-3.8-0.1c0.1,1.9,0.2,3.8,0.3,5.7c-1,0.9-1.9,1.8-2.9,2.8c-0.7-3.5-2.3-6.6-3.4-9.9
+			c0.5-2.4,1.5-4.6,2.7-6.7c0.4,0.1,1.3,0.2,1.7,0.3c0.4,0.5,1.1,1.4,1.5,1.9c0.3-0.1,0.8-0.2,1.1-0.3
+			C468.9,651.2,471,648.7,472.1,645.7z"/>
+		<path class="st2" d="M1155,647.2c1.8,1.2,3.7,2.3,5.7,3.3c-0.9,2.2,0.1,6.6-3.3,6.3c0-1.8,0-3.7,0-5.5c-1.2-0.5-2.3-0.9-3.4-1.4
+			C1154.4,649,1154.7,648,1155,647.2z"/>
+		<path class="st2" d="M1533.1,646.5c2.7,0,5.4,1.2,6.6,3.8c-0.5,3.3-2.1,6.4-2.1,9.8c-0.5,0.3-1.4,0.9-1.9,1.2
+			c-0.9-3.4-2.1-6.6-3-9.9C1532.8,649.7,1532.9,648.1,1533.1,646.5z"/>
+		<path class="st2" d="M1725.2,648.1c1.5,0,3.1,0,4.7,0c-0.3,1.1-0.5,2.2-0.7,3.3c-0.5,0-1.5-0.1-2.1-0.1c-0.5-0.1-1.4-0.2-1.8-0.3
+			C1725.2,650.3,1725.2,648.8,1725.2,648.1z"/>
+		<path class="st2" d="M4,650.8c1.4-1.1,3.2-2,4.9-0.8c2.3,0.6,1.7,3.5,2.2,5.2c-2.2-0.9-4.4-1.9-6.3-3.2L4,650.8z"/>
+		<path class="st2" d="M477.6,651.5c2.5-0.9,5-0.5,7.5,0l1,0.1c0.5,2.1,1.1,4.2,1.5,6.4c0,2.1-0.2,4.3-0.3,6.4
+			c-0.9,0.2-1.8,0.4-2.7,0.5c-0.5-1.2-1-2.5-1.4-3.7c-0.8,0.4-2.5,1.2-3.3,1.5l-0.8-0.7C477,659,477.3,655.1,477.6,651.5
+			 M480.1,655.3c-2,0.9,0,4.1,2.1,3C485.4,658.4,482.3,653.5,480.1,655.3z"/>
+		<path class="st2" d="M1562.4,650.3c3.6-1,6,2.2,8.2,4.5c0.5,0.4,1.4,1.3,1.9,1.7c-1.1,0.4-2.1,0.9-3.2,1.2
+			c-1.4-1.2-2.5-2.7-3.7-4.1c-2.5,3.1-0.1,6.3,1.9,8.9c-0.1,0.2-0.4,0.5-0.6,0.7c-1.7,0.1-3.5-0.1-5,0.8c0.2,1.7,0.6,3.4,1.1,5.1
+			c2.5-0.7,4.8-2,6.3-4.2c2,0.9,4,1.7,5.9,2.9c0,2-0.5,4-0.7,6c5.1-0.9,9.1-4.4,13.5-6.9c0.3,1.7,1.8,3.8,0.2,5.3
+			c-2.9,2.8-9,3-8.7,8.2c1.8-0.3,3.6-0.6,5.4-0.9c0.8,2.9,1.9,5.7,3.3,8.3c1-0.9,2-1.8,3-2.7c1.7,0.7,3.5,1.3,5.2,1.9
+			c0.4,1.2,0.8,2.4,1.2,3.6c0.8,2.8,2.3,5.3,3,8.1c0.1,0.5,0.2,1.6,0.3,2.2c-0.7-1.1-1.3-2.1-1.9-3.2c-0.4,0.6-1.3,1.8-1.7,2.4
+			c-1.3-0.3-2.5-0.5-3.7-0.8c-0.9,1-1.7,2.1-2.6,3.1c-2.9-0.6-5.8-1.2-8.7-0.8c0.8-1.3,1.5-2.5,2.3-3.8c-2.6-0.5-5.2-1-7.7-1.5
+			c-0.2,1-0.4,2-0.6,2.9c1.6,0,3.2,0.1,4.9,0.2c-1.3,2.8-3.7,4.9-5.8,7c-1.1,0.2-2.2,0.3-3.3,0.5c0.1,3.6,0.1,7.5,2.4,10.6
+			c-0.9,0.6-1.8,1.2-2.6,1.8c-2.4-1.4-2.7-4.6-3.7-7c0.7-1.3,1.9-2.6,0.9-4.1c-2.9-1.9-7.4-2.8-8.1-6.7c-0.4-0.2-1.3-0.6-1.7-0.8
+			c0.4-0.7,0.8-1.3,1.3-2c-0.2-1.2-0.4-2.3-0.6-3.5c-0.1-0.7-0.2-2-0.3-2.7c-1.9-0.8-3.9-1.5-5.8-2.2c-0.5,1.7-0.9,3.5-1.5,5.1
+			c-1.2,1.8-2.5,3.5-3.8,5.2c-0.5-0.3-1.4-0.9-1.9-1.2c-1.8-9.4-4.3-18.6-7.7-27.5c0.7-0.9,1.3-1.8,2-2.6c-1.3-3.3,0.4-6,2.4-8.5
+			c-1.3-1.4-2.8-2.6-4.2-3.8c1.1-0.7,2.3-1.5,3.4-2.2c-0.6-1.5-1.1-3.1-1.6-4.6c1.6,0.4,4-0.2,4.8,1.7c0.6,3.6,0.4,7.3,1.1,10.9
+			c-1,1.2-1.9,2.5-2.8,3.7c2.9-0.2,5.8-0.6,8.7-1c0.7,0.3,2,0.9,2.6,1.2c-0.5,1.5-0.9,3-1.4,4.5c1.8,0,3.7,0,5.5,0
+			c-1.6-2.7-2.5-5.7-2.3-8.8c-1.3-0.3-2.6-0.7-3.8-1c2-1.6,4.3-2.8,6.8-3.6C1560.8,655.5,1560.3,652.3,1562.4,650.3 M1546.4,669.5
+			c0,1,0,2,0,3c1.1,0.1,2.2,0.2,3.3,0.3c-0.1-1.1-0.2-2.3-0.2-3.4C1548.5,669.4,1547.4,669.5,1546.4,669.5 M1568.2,675.6
+			c1.6-1.8,2.6-6.9-1.2-6C1564.5,671.5,1566.3,674.1,1568.2,675.6 M1563.5,681.3c2.6,3.2,8.1,0.2,8.7-3.3
+			C1568.8,677.4,1566.3,679.9,1563.5,681.3 M1550.2,682.3c-1,1-2,1.9-3,2.9c1.4,0.5,2.8,1,4.3,1.5c0.3,0.4,0.9,1.2,1.2,1.6
+			c2.3,0.2,4.7,0.2,7,0.3c1.1-2,2.2-4,3-6.2c-2.9,1.5-6.1,2.4-9.3,2.6c0.2-1.6,0.8-3.7-0.6-4.9
+			C1551.2,679.6,1550.9,681.2,1550.2,682.3 M1576.8,685.9c-0.1,1.9-2.1,2.6-3.3,3.7c0,0.7,0,1.5,0.1,2.2c-1.2,0.9-2.4,1.8-3.6,2.8
+			c-0.4-0.6-1.2-1.7-1.6-2.3c-0.5,0-1.6,0-2.2,0c-0.4,1.4-0.8,2.9-1.2,4.4c1.4-0.5,2.9-1,4.4-1.4c1.1,1.1,2.2,3.1,4.1,2.3
+			c1.6-1.5,0.9-3.8,1.2-5.7c1.3-1,2.7-2,3.8-3.2c0-2.6-0.2-5.2,0-7.8C1576.5,681.8,1577.2,684.1,1576.8,685.9 M1565,689.9
+			c1.3-1.2,4.1-1.8,4.1-3.8C1566.2,684.9,1564.9,687.5,1565,689.9 M1583.9,694.5c0.9-0.1,1.8-0.2,2.7-0.4c0.8,0.8,1.6,1.6,2.5,2.5
+			c1.4-1.7,1.8-3.6,0.6-5.5C1587.5,691.7,1585.6,693,1583.9,694.5z"/>
+		<path class="st2" d="M503.1,652.2c2.4-1.6,3.2,1.6,4.5,2.9c-1.2,0.8-2.4,1.5-3.7,2.3C503.6,655.6,503.1,653.9,503.1,652.2z"/>
+		<path class="st2" d="M25.7,653.8c1-0.3,2.1-0.5,3.1-0.7c0.3,2.3,1,4.7,0.3,7c-1,1.2-2.7-0.3-4-0.3
+			C25.3,657.8,25.1,655.7,25.7,653.8z"/>
+		<path class="st2" d="M1702.8,655.8c1.9,1.6,3.9,3.1,6,4.4c0.6,0,1.8-0.1,2.4-0.1c0.7,0,2-0.1,2.7-0.2c0.2,0.6,0.7,1.7,0.9,2.3
+			c0.2,0.5,0.6,1.6,0.8,2.2c1.3,0.4,2.6,0.8,4,1.2c0.4,1.3,0.7,2.6,1.1,4c3.9,0.5,8,0.5,11.9-0.6l0.4-0.1v7.9
+			c-0.4-0.2-1.1-0.6-1.5-0.8c-2.4-1.2-4.8-2.8-7.5-3.2c-3,0.7-5.6,2.4-8.7,2.8c-0.8-1.2-1.6-2.3-2.6-3.4c-3.3-0.7-6.7-0.7-10-1.1
+			c0-1.8,0.1-3.6,0.2-5.4c2.1,0,4.1-0.1,6.2,0c0.1,0.6,0.4,1.9,0.5,2.5c2.3,0.8,4.3,2.1,5.9,3.9c1.2-0.6,2.5-1.1,3.8-1.7
+			c-3.6-2-7.9-3.5-9.3-7.8c-2.4-0.2-4.7-0.4-7-0.6C1702.9,659.8,1702.8,657.8,1702.8,655.8z"/>
+		<path class="st2" d="M134.3,661.7c0.4-1.8,0.8-3.7,1.3-5.5c0.7,0.4,2,1,2.7,1.4c1.6,3.8,5,6.6,8.8,8.1c1.2-0.8,2.4-1.8,3.5-2.7
+			c1.7,0.5,3.5,1,5.1,1.9c1.1,3.4-3.2,3.6-5.4,4.5c-5,0.5-10.4-2.3-15,0.7c-2.5,2.8-1.5,6.9-1.7,10.4c-1.2,0.9-2.5,1.8-3.7,2.7
+			c0.4-7.2,1.2-14.5,1.3-21.8C132.1,661.5,133.2,661.6,134.3,661.7z"/>
+		<path class="st2" d="M1130.2,656c1,1.9,1.8,3.9,2.4,6c-1.9,1.7-4,3.5-4.1,6.2c0.5,1.1,1,2.2,1.6,3.2c1.1-1.3,2.3-2.7,3.2-4.2
+			c0.5-1,0.9-2.1,1.4-3.1c1.8,1.8,2.6,4.2,3.5,6.5c1.2,0.3,2.5,0.6,3.8,0.8c0.6,0.6,1.3,1.2,1.9,1.9c0.7,0.8,1.3,1.6,2,2.4
+			c-0.5,0.1-1.5,0.3-2,0.4c-0.4,0.1-1.3,0.2-1.7,0.3c0.3,2.1,0.6,4.1,1,6.2c1,0,2,0,3,0c-1,1.9-2,3.8-3,5.8
+			c-1.5-1.7-2.4-3.9-2.9-6.1c-1-0.3-1.9-0.6-2.9-0.9c-2-0.6-4.1-0.9-6.1-1.6c0.7-2.3,1.6-4.5,2.3-6.8c-3.2,0.2-6.4,0.5-9.6,0.8
+			c0-0.7,0.1-2.1,0.2-2.9C1125.8,665.8,1128,660.9,1130.2,656z"/>
+		<path class="st2" d="M505.9,658c1,1,2.1,2.1,3.1,3.1c-1.7,2.1-4.1,4.1-4.6,6.9c0.2,2.5,1,4.8,1.6,7.2c-1.9-1-3.8-2-5.8-2.9
+			c0.2-1.3,0.5-2.6,0.7-3.8c0.1-0.6,0.4-1.7,0.5-2.3c-0.2-0.6-0.5-1.9-0.7-2.5c-0.3-1.1-0.6-2.1-0.8-3.2c1.1,0.7,2.2,1.4,3.4,2.2
+			c0.2-0.4,0.7-1.1,0.9-1.5C504.9,660,505.4,659,505.9,658z"/>
+		<path class="st2" d="M493.2,659c1.3,0.3,2.7,0.5,4.1,0.9c2,0.9,0.8,3.5,1,5.1c-0.1,0.6-0.4,1.7-0.6,2.3c-0.3,0.8-0.6,1.6-1,2.4
+			c-1-0.3-1.9-0.6-2.8-0.9c-1.6-0.9-3.2-1.9-4.9-2.9c0.9-1.5,1.8-3,2.7-4.5c1.1,1.7,2.3,3.9,4.7,4
+			C496.4,662.8,494.5,660.9,493.2,659z"/>
+		<path class="st2" d="M1133.2,661c2-2.5,4.5-1.3,6.7,0c0.4,1,0.8,2,1.3,3c-0.3,0.2-1.1,0.8-1.4,1
+			C1137.5,664,1135.2,662.6,1133.2,661z"/>
+		<path class="st2" d="M1286,661.3c0.5-0.5,1.6-1.4,2.2-1.9c1.7,1.3,3.4,2.7,5,4.3c0.6,0.8,1.3,1.5,1.9,2.3
+			c-0.5,1.2-0.9,2.5-1.4,3.8c-0.4,0.3-1.3,1-1.7,1.3c0.2-1.3,0.3-2.5,0.5-3.8c-1.8-0.5-3.6-1.1-5.4-1.6
+			C1286.7,664.2,1286.3,662.8,1286,661.3z"/>
+		<path class="st2" d="M1538.1,661c1.1-0.5,2.3-1,3.5-1.5c0.1,2.5-2,4-3.7,5.4C1537.4,663.9,1536.3,661.6,1538.1,661z"/>
+		<path class="st2" d="M1020,662.8c0.6-0.4,1.8-1.1,2.4-1.4c0,2.5,0,5.1,0,7.6c-1.6,0.9-3.2,1.7-4.7,2.6c-1.1-2-2-4-2.7-6.1
+			C1016.6,664.7,1018.4,663.8,1020,662.8z"/>
+		<path class="st2" d="M7.6,666.4c1.3-0.2,2.6-0.5,3.9-0.7c0.1,0.2,0.4,0.7,0.6,1c0.3,2.2,0.5,4.4,0.7,6.6c-2.9,0.2-5.6,0.8-8.2,2
+			c-0.4-1-0.8-2-1.2-3c0.4-0.2,1.3-0.8,1.7-1C7.6,670.8,7.5,668.4,7.6,666.4z"/>
+		<path class="st2" d="M705.1,670.8c1.3,0,2.5-0.1,3.8-0.1c-0.1,1-0.3,2-0.4,3c-0.7,0.6-1.4,1.1-2.1,1.7c-1.4,1-3,1.9-4.6,2.5
+			c-0.9-2,0.3-3.9,1.2-5.6C703.6,671.7,704.3,671.2,705.1,670.8z"/>
+		<path class="st2" d="M1149.7,670.8c1.3,0.8,2.7,1.7,4.1,2.6c-0.9,2.3-1.8,4.7-2.5,7.1l-0.7,0c-0.5-0.2-1.5-0.5-2-0.7
+			C1149.2,676.8,1149.7,673.8,1149.7,670.8z"/>
+		<path class="st2" d="M1015.6,681.2c-1.6-4.1,2.6-6.5,5-9.1c0.7,2.6,1,5.3,0.7,8c-0.2,0.3-0.6,0.9-0.8,1.2
+			C1018.8,681.3,1017.2,681.3,1015.6,681.2z"/>
+		<path class="st2" d="M1702.7,673.6c2.9-0.5,5.8,0.1,8.3,1.5c-1.8,0.7-3.5,1.4-5.3,2.2c-1.7,1.2-2.9,2.9-2.3,5
+			c1.5-0.4,3.1-0.7,4.7-1c0.7,0,2-0.1,2.6-0.1c-0.4,2-0.8,4.1-1.2,6.1c-0.7,0.3-2,0.9-2.7,1.2c-0.8-2.1-1.4-4.2-1.9-6.3
+			c-0.5,1.3-1,2.6-1.5,3.9C1703.2,682,1702.7,677.8,1702.7,673.6z"/>
+		<path class="st2" d="M17.9,674.7c2.6-0.8,5.3-1.1,8-0.8c1.3,0.9,2.5,1.7,3.5,2.9c0.1,1.5,0,3-0.2,4.5
+			C25.1,679.8,21.3,677.6,17.9,674.7z"/>
+		<path class="st2" d="M142.1,674.2c3.2,1.2,6.6,2.1,10,1.2c1.3,0.7,2.6,1.4,4,2.1c-0.4,1.5-0.6,2.9-0.8,4.4
+			c-3.5-1.5-7.2-0.7-10.8-0.4C141.5,680.3,142.3,676.7,142.1,674.2z"/>
+		<path class="st2" d="M489.1,674.5c0.4-0.3,1.1-0.9,1.5-1.2c1.2,1.8,2.5,3.6,3.8,5.4c0.2,1.8,0.5,3.6,0.8,5.3
+			c1.2,0.5,2.5,1,3.6,1.7c-0.6,1.4-1.4,2.8-2.2,4.2c0.3,0.6,1,1.8,1.3,2.4l0.4,0.8c-0.3,0.2-0.9,0.7-1.2,0.9
+			c-1.9,1.3-3.8,2.7-5.7,4.1c0.1-1.8,0.3-3.7,0.4-5.5c-3.3-0.3-6.5-1.1-9.4-2.8c0.1-1.7,0.2-3.3,0.4-5c0.9-1.3,1.8-2.5,2.8-3.7
+			c0.2-0.2,0.5-0.6,0.7-0.9c-0.7-1.8-1.4-3.7-1-5.7c1.2,1.1,2.4,2.2,3.6,3.3C489,677.2,489.1,675.4,489.1,674.5 M485.5,685.9
+			c0.8,1.3,1,3.4,2.7,3.8c1.5,0.6,2.7-0.9,3.5-1.9C490.1,686.3,487.6,686.4,485.5,685.9z"/>
+		<path class="st2" d="M236.9,680.3c5.2,1,9.9-1.3,13.8-4.5c-0.8,2.8-1.1,5.6-0.8,8.5c-0.2,0.3-0.5,0.9-0.7,1.2
+			c-3,2.6-4.5,6.7-8.2,8.4c-3.1,1.5-6.1,3.3-8.4,5.9c-0.4,0.1-1.2,0.3-1.6,0.4c-0.5-1.1-0.9-2.2-1.4-3.2c2.4-1.3,4.2-3.5,5.4-5.9
+			c1.4-0.7,2.8-1.3,4.2-2.1C238.8,686,237.7,683.2,236.9,680.3z"/>
+		<path class="st2" d="M1588.6,683c0.1-3,1-6,3.4-8c0.5,1.3,1,2.6,1.5,3.8c-0.3,2-0.8,3.9-1.7,5.7
+			C1590.6,684.2,1589.5,683.7,1588.6,683z"/>
+		<path class="st2" d="M223.5,684.2c0.2-4.1,4.8-4.1,7.7-4.9c0.4,1.3,0.8,2.5,1.3,3.8c-2.4,2.3-5.2,4.4-5.7,7.9
+			C225.7,688.6,224.6,686.4,223.5,684.2z"/>
+		<path class="st2" d="M501.3,680.2c0.8,0.4,1.5,0.7,2.3,1.1c0.4,0.4,1.1,1.2,1.5,1.7c1.9,2.6,4.5,4.6,7.2,6.3c-1.2,1-2.4,2-3.6,3
+			c-1.2-1.6-2.4-3.2-3.7-4.7c0.7,3.7,2.3,7.4,1.9,11.3c-0.8,0.1-2.5,0.3-3.3,0.4c-2.8,0.3-5.5,0.7-8.3,0.9c0.7-2.2,2.8-3.3,4.6-4.5
+			c0.9-0.7,1.7-1.4,2.6-2c-0.6-1.2-1.3-2.3-2-3.5c0.6-1.1,1.2-2.2,1.9-3.3C501.5,684.7,501.1,682.5,501.3,680.2z"/>
+		<path class="st2" d="M669.5,692.4c2.7-4.9,6.7-8.9,10.7-12.8c1.9,0.5,6.8,0.7,5.4,3.7c-2.6,1.1-5.8,1.6-6.8,4.6
+			c-1.3,2-2.6,4-4.1,5.9c-1,1.3-2.5,2.1-3.8,2.9C670.4,695.3,668.9,693.9,669.5,692.4z"/>
+		<path class="st2" d="M1713.5,685.7c2.2-2.1,4.7-4,7.2-5.6c0,1.6,0,3.2,0.1,4.8c-0.9,0.8-1.8,1.5-2.7,2.3c0.8,0.3,2.3,1,3.1,1.4
+			c0,0.5-0.1,1.6-0.2,2.2C1718.2,689.5,1715.7,687.7,1713.5,685.7z"/>
+		<path class="st2" d="M1407.8,681.3c0.2,0,0.5,0,0.7,0c-0.1,0.6-0.2,1.9-0.2,2.6c0.8-0.2,2.4-0.6,3.1-0.8c0,1.6,0.1,3.2,0.2,4.8
+			c-0.1,0.3-0.4,1-0.5,1.3c-1.9-0.6-3.7-1.3-5.4-2.4C1406.5,684.9,1407.2,683.1,1407.8,681.3z"/>
+		<path class="st2" d="M1729,683c1.3-0.4,2.7-0.7,4-1.1v3.7l-0.8,0.3c-1.5,2.2-3,4.4-5.2,5.9c0-0.6,0.1-1.9,0.1-2.5
+			c0.4-0.5,1.1-1.4,1.5-1.9C1728.7,685.9,1728.8,684.5,1729,683z"/>
+		<path class="st2" d="M136.4,682.6c0.9,0.8,1.7,1.5,2.5,2.4c1.4,1.4-0.3,3.1-0.7,4.5c-0.3,0.5-1,1.4-1.3,1.9
+			c-0.4,0.7-0.9,1.5-1.3,2.2c-0.5,0.2-1.6,0.8-2.1,1c-0.2,1.2-0.5,2.4-0.7,3.7c-0.2,0.8-0.3,1.6-0.4,2.4c-0.8,1-1.6,2-2.5,3
+			c-0.9-1.4-1.8-2.8-2.7-4.2c0.2-1.8,0.3-3.5,0.5-5.2C131.2,690.8,132,685.4,136.4,682.6z"/>
+		<path class="st2" d="M707,683.3c1.2,0,2.4,0.1,3.7,0.2c0.8,0.8,1.5,1.7,2.3,2.5c0.2,0.2,0.6,0.7,0.8,0.9c0,0.8-0.1,2.3-0.1,3.1
+			c-1.5-0.1-3-0.1-4.5-0.3C707.6,688,707.6,685.4,707,683.3z"/>
+		<path class="st2" d="M996.2,689.3c0.9-1.9,1.8-3.8,2.8-5.6c1.2,3.1,2.5,6.2,4.1,9.1c0.6,0,1.8-0.1,2.4-0.1
+			c0.3-0.5,0.8-1.4,1.1-1.9c-0.5-0.9-0.9-1.9-1.4-2.8c0.3-0.2,1-0.6,1.4-0.8c1.6-1.1,3.4-1.5,5.3-1.4c0.8,0.6,1.6,1.3,2.3,2
+			c-1.4,2.1-2.3,4.7-4.4,6.2c-1.7,0.3-3.5,0.5-5.2,0.7c4.9,3.5,10.9,7.4,17.1,5.5c-0.5,5.8,2.3,11.3,2.4,17.1
+			c-1.3,0.1-2.7,0.2-4,0.4c0.3-2,0.6-3.9,0.9-5.9c-0.3-0.4-0.8-1.3-1.1-1.7c-1.3-2.1-3.2-5.1-6.1-4.2c-2.3,0.9-4.5,2.2-6.8,3.2
+			c0.6-1.4,1.1-2.8,1.8-4.2c-3.1-0.2-6.2-0.6-9.3-0.8c-1.2-0.1-2.3,0-3.5,0.3c-0.6-0.3-1.9-1-2.5-1.3c-0.1-0.4-0.4-1.3-0.5-1.8
+			c0.4-0.1,1.2-0.3,1.7-0.4c2.6-0.1,5.2,0.1,7.8,0.6c-1.6-2.5-4.4-5.4-2.7-8.5c0.4-0.6,1.2-1.9,1.6-2.5
+			C999.8,690,998,689.7,996.2,689.3 M1010.3,700.3c-2.5,0.7-0.8,4.3,1.4,3.4C1014.1,703.1,1012.4,699,1010.3,700.3z"/>
+		<path class="st2" d="M24.2,693c-1-2.8-3.5-7.2,0.8-8.6c1.5,1.5,3.6,3.2,2.9,5.6C27.5,691.8,25.5,692.2,24.2,693z"/>
+		<path class="st2" d="M150.2,684.9c1.6,0.6,3.3,1.2,4.9,1.9c-0.1,1.9-0.2,3.9-0.4,5.8c-1.5,1.5-3.9,2.9-3.3,5.4
+			c0.7,1.9,3,2.7,3.7,4.7c0.7,1.9,1.1,3.9,1.6,5.9c-0.7,2.2-1.6,4.3-2.7,6.4c-2.2-2.4-2.1-5.4-1.8-8.4c-2.6-2.1-5.2-4.3-6.9-7.3
+			c0.5-1.7,0.9-3.5,1.1-5.2c-1.5,0.9-3,1.9-4.5,2.8c-0.8-0.8-1.7-1.6-2.5-2.4c0.7-1.2,1.4-2.3,2.2-3.5c3.3,0,7,0.6,9.9-1.6
+			C151.1,688,150.7,686.4,150.2,684.9z"/>
+		<path class="st2" d="M684.5,692.4c2.7-3.9,7.5-5.8,12.2-5c-0.2,0.9-0.4,1.7-0.6,2.6c-1,0.2-2,0.5-3,0.9c-2.3,2.3-4.5,4.8-7.9,5.4
+			C685,694.9,684.3,693.7,684.5,692.4z"/>
+		<path class="st2" d="M1120.8,691.3c1.8-1.9,3.5-4.3,6.2-4.7c0.2,0.5,0.7,1.6,0.9,2.1c0.2,0.5,0.5,1.6,0.6,2.2
+			c1,0.2,2.1,0.3,3.1,0.5c0,0.6-0.1,1.7-0.2,2.3C1128.1,692.5,1124.2,693,1120.8,691.3z"/>
+		<path class="st2" d="M1299.4,691c1.1-1.6,2.3-3.2,3.7-4.5c0.2,2.4,0.4,4.7,0.3,7.1l-1.3-0.2C1301.2,692.5,1300.3,691.8,1299.4,691
+			z"/>
+		<path class="st2" d="M1304.4,692.5c0.7-2.1,1.8-4,3.2-5.8c1.2,3.7,2.8,7.3,4.2,10.9c0.4,1.2,0.8,2.4,1.3,3.7
+			c-3.2,1.9-6.9,1.9-10.4,1.1c-0.7,1.2-1.4,2.4-2.1,3.5c-1.7-0.6-3.3-1.2-5-1.8c0.2,2.5,0.5,5,0.9,7.5c0.5-0.4,1.1-0.8,1.6-1.1
+			c1.2,0,2.3,0,3.6,0l0.5-0.6c0.4-0.4,1.1-1.3,1.4-1.8c0.9,0.3,1.8,0.5,2.6,0.8c-0.3,0.6-0.9,1.7-1.2,2.3c-0.1,0.2-0.4,0.7-0.5,0.9
+			c-0.2,1-0.2,1.9-0.3,2.9c1.4,0.6,2.8,1.2,4.1,1.8c-0.7,0.5-1.3,1-1.9,1.5c-1.3-0.2-2.6-0.4-3.9-0.5c0.9,1.4,1.8,2.7,2.8,4
+			c0.9,1,1.8,2.1,2.8,3.1c-0.2,0.5-0.6,1.5-0.8,2.1c0.6,0.3,1.2,0.5,1.8,0.8c0.2-2,0.5-4,1.1-5.8c-0.1-0.7-0.2-2-0.2-2.6
+			c1.8,0.3,3.6,0.7,5.4,1c-1.5,1.5-2.8,3.2-3.1,5.4c4.8-0.9,6.3-5.9,8.4-9.6c1.1,1,2.3,2.1,3.5,3.1c-0.5,0.8-1,1.6-1.5,2.4
+			c-0.5,0.7-0.9,1.5-1.3,2.2c-3.2,3-7.7,4.6-9.7,8.6c-1.5-1-2.8-2.6-4.7-2.9c-2.4,1-4.5,2.4-6.8,3.6c0.1,1.3,0.7,2.5,1.6,3.4
+			c2.1-1.1,3.9-3.1,6.5-3.1c0.7,3.3-3,4.9-4.6,7.3c-1.1,0-2.2-0.1-3.2-0.1c0-0.7,0-2.2-0.1-2.9c-0.6-0.4-1.8-1.2-2.5-1.7
+			c-1.3-0.2-2.7-0.4-4-0.5c1.9-0.5,4.7-0.2,5.4-2.6c0.1-1.8-1.3-3.1-2-4.6c1.1-2,2.4-3.9,3.8-5.7c0.2-2.6,0.6-5.5-1.9-7.2
+			c-0.5-0.3-1.5-0.9-2-1.2c-0.5,0.4-1.4,1.2-1.9,1.5c-1.9,0.8-3.9,1.3-5.8,1.9c-0.3-1.1-0.6-2.2-0.9-3.3c-0.3-0.1-1-0.4-1.4-0.5
+			c-3.4-1.6-7.2-4.4-6.9-8.6c0.9-1.3,2.2-2.4,3.3-3.5c-0.2,2.4-0.5,4.9-0.6,7.3c0.9,0.1,1.9,0.3,2.9,0.5c1.6-2.5,3.4-4.8,5.4-7
+			c1.2,0,2.4,0,3.7,0.1c0.2-0.4,0.6-1.1,0.9-1.5c0.2-0.6,0.5-1.8,0.7-2.3c2-0.8,4.1-1.6,6.2-2.4c1.3,0.9,2.7,1.9,4.1,2.8
+			c-0.1-0.5-0.2-1.5-0.3-2C1306.7,695.3,1305.5,693.9,1304.4,692.5 M1288.5,710.2c0.7,0.3,1.9,1,2.6,1.3c1.7-1.4-0.3-3.3-1.1-4.5
+			C1289.6,707.7,1288.9,709.4,1288.5,710.2z"/>
+		<path class="st2" d="M248.5,691.5c2-0.7,4.1-0.9,6.2-0.9c-0.8,1.4-1.5,2.8-2.3,4.1C250.6,694.4,249.8,692.5,248.5,691.5z"/>
+		<path class="st2" d="M1702.6,691.3c2.2,0.2,4.5,0.2,6.8,0.3c0.5,0.4,1.6,1.3,2.1,1.7c0.6,0.6,1.3,1.2,2,1.8
+			c1.6,0.2,3.2-0.1,4.7-0.9c2.4-0.2,4.8-0.3,7.3-0.4c0,1.5,0,3,0,4.5c-2.1,0.4-4.3,0.8-6.4,1.1c-1,0.2-2,0.4-3,0.6
+			c-1.5,0.3-2.9,0.6-4.4,0.8c-0.8-1.1-1.7-2.2-2.5-3.2c-1.6,0.5-3.2,1.3-4.7,2c-0.3-0.5-0.8-1.4-1.1-1.8
+			C1702.9,695.7,1702.7,693.5,1702.6,691.3z"/>
+		<path class="st2" d="M522.9,693.5c0.3-0.2,1-0.5,1.4-0.7c0.8,0.4,2.4,1.1,3.2,1.5c-0.2,2.2-0.2,4.4-0.6,6.6
+			c-0.4-0.1-1.2-0.4-1.6-0.5c-0.3-0.1-1-0.3-1.4-0.4c-0.3-2.1-0.6-4.1-1.1-6.2L522.9,693.5z"/>
+		<path class="st2" d="M706.4,695.3c1.7-2,5.5-3,7.2-0.5c-2.4,3.2-5,6.2-7.5,9.3c-3-1.8-6.4-3-9.8-3.6c-2.5-0.8-3-3.1-2.7-5.4
+			c1.4-0.5,2.8-1,4.2-1.5c1.2,0.3,2.3,0.7,3.5,1.1c0.6,1.7,1.1,3.5,2,5.1c1,0.2,2.1,0.4,3.1,0.6
+			C706.4,698.7,705.7,696.9,706.4,695.3z"/>
+		<path class="st2" d="M480.5,693.6l1.3,0.1c1.2,0.3,2.4,0.7,3.6,1.1c0.4,1.1,0.9,2.1,1.5,3.1c0.6,1.1,1.3,2.2,1.9,3.2
+			c-1.6,0.4-3.3,0.7-4.9,1.1c-0.6-1.2-1.2-2.4-1.7-3.5c-0.4-0.4-1.2-1.3-1.6-1.8C480.5,696.2,480.5,694.5,480.5,693.6z"/>
+		<path class="st2" d="M1113.6,693.6c0.9,0,2.6,0,3.4,0c0.7,0.9,1.5,1.9,2.3,2.8c0.7,0.1,2.1,0.3,2.8,0.5c0.4,2.5,0.7,5,1,7.5
+			c-1.7,0.7-3.4,1.4-5.1,2.1c-0.6-1.4-1.3-2.7-1.9-4c-1.4-0.1-2.5,0.4-3.2,1.5c-0.9,4.5-3.8,8-7.1,11c-0.4-0.3-1.1-0.8-1.4-1
+			c0.2-1,0.5-2,0.8-2.9C1107.8,705.1,1111.2,699.6,1113.6,693.6z"/>
+		<path class="st2" d="M238.1,702.7c1.6-3.1,3.8-5.9,6.9-7.5c0.5,0.2,1.6,0.5,2.1,0.7c1.4,1.2,2.9,2.5,4.1,3.9
+			c1.9,2.1,1.6,5.2,2,7.9c1.3,0.2,2.6,0.4,3.9,0.5c0.5-1.3,1.1-2.5,1.6-3.8c0.5-0.1,1.5-0.2,2-0.3c0.4,0.9,0.9,1.8,1.3,2.8
+			c-1.1,0.8-2.3,1.6-3.4,2.4c-1.4,4-3.8,7.6-5.4,11.6c-2-2.5-3.7-5.2-5.7-7.6c-2.2-1.9-5.1-2.8-7.7-3.9c-0.7,1.7-1.4,3.3-2.1,5
+			c-1.1-2.6-2.3-5.1-3.7-7.6C235.5,705.5,236.8,704.1,238.1,702.7 M244.2,700c-0.4,2.2-2,5.5,1.1,6.6c2.8,0.8,2.3-2.9,2.1-4.6
+			C247.6,700.1,245.4,700.5,244.2,700z"/>
+		<path class="st2" d="M517.6,697.5c0.6-0.7,1.2-1.4,1.7-2c1.1,1.3,2.2,2.8,3.3,4.1c-0.8,0.8-1.6,1.8-2.4,2.6
+			c-0.6,0.5-1.9,1.4-2.5,1.9c0,2.3-1.5,5.4,1.1,6.7c-0.2,0.2-0.7,0.7-0.9,1c-2.4,3.4-2.3,8-6,10.5c-0.8,0.8-1.6,1.7-2.4,2.6
+			c-3.8-2.5-7.4-5.2-10.9-8.1c0.2-0.4,0.7-1.1,0.9-1.4c2.3-0.9,4.4-2.1,6.8-2.8c2.3,0,4.5,0.7,6.8,1.1c0.8-1.5,1.7-3,2.2-4.7
+			c0.5-1.7-1.2-2.8-2.1-4c-0.8,1.2-1.6,2.3-2.4,3.5c-0.6-0.2-1.8-0.5-2.4-0.7c-1.1-0.7-2.1-1.5-3.2-2.2c1.4-2.6,2.4-5.3,3.4-8
+			c0.8,1.4,1.5,2.9,2.2,4.3c0.6-0.4,1.3-0.8,2-1.3C514.6,699.7,516.1,698.7,517.6,697.5z"/>
+		<path class="st2" d="M1725.5,696.2c2.5,0,5,0.1,7.5,0.1v7.2l-0.8,0.6C1729.6,701.8,1726.5,699.7,1725.5,696.2z"/>
+		<path class="st2" d="M1138.7,697c2.1,0.4,4.1,1,6.1,1.7c-0.2,0.6-0.6,1.7-0.7,2.3c-1.2,0.3-2.3,0.7-3.4,1
+			C1140,700.4,1139.3,698.7,1138.7,697z"/>
+		<path class="st2" d="M681.9,699.6c0.9,0.1,1.8,0.2,2.8,0.3c-0.1,1.5-0.2,3.1-0.4,4.6c-0.8-0.3-2.3-0.8-3.1-1.1
+			C681.4,702.1,681.7,700.9,681.9,699.6z"/>
+		<path class="st2" d="M1126.3,702.3c1.5-0.7,2.9-1.8,4.6-1.9c1.4,0.6,2.7,1.4,4,2.2c-0.8,1.2-0.8,3.4-2.7,3.3
+			C1130.2,704.7,1128.3,703.4,1126.3,702.3z"/>
+		<path class="st2" d="M490.8,702.1c1.2-0.3,2.4-0.7,3.7-1c0.3,0.6,1,1.7,1.3,2.3l0.5,0c1.6,0,3.1,0,4.7,0c0.5,0,1.6-0.1,2.1-0.1
+			c-2.1,2.8-3.9,5.9-5.8,8.8c-0.9,0-2.7,0.1-3.5,0.2c-0.5-0.4-1.4-1.3-1.9-1.8c0.1-0.7,0.2-2,0.3-2.7c1.1-0.2,2.1-0.5,3.2-0.7
+			c0.1-0.3,0.4-1,0.5-1.3C493.7,705.3,491.8,704.1,490.8,702.1z"/>
+		<path class="st2" d="M263.5,701.8c1.1,0.1,2.3,0.2,3.4,0.3c0.1,1.7,0.2,3.3,0.4,5c-0.8,0.8-1.7,1.6-2.6,2.3
+			C263,707.2,263.4,704.4,263.5,701.8z"/>
+		<path class="st2" d="M688.7,702.7c3-0.6,6.8,1.4,8.2,4.1c-0.5,0.9-1,1.9-1.5,2.9c-1.1,0-2.3,0-3.4,0
+			C688.7,709.6,688.1,705.3,688.7,702.7z"/>
+		<path class="st2" d="M1551.2,702.3c1.7-1.6,4.5,0.2,6.4,0.9c0.3,2.5-2.8,2.4-4.4,1.6C1552.3,704.5,1549.3,703.6,1551.2,702.3z"/>
+		<path class="st2" d="M1589.6,708.3c2.4-2.2,5-4.3,6.9-7c1.1,0.9,2.2,1.8,3.3,2.7C1598.5,708.2,1593.4,708.8,1589.6,708.3z"/>
+		<path class="st2" d="M1716.6,708.1c-1.4-2-1.5-4.1-0.1-6.2c1-0.1,2.9-0.3,3.8-0.4c1,1.8,2.1,3.5,3.2,5.3c-0.9,0.7-1.7,1.4-2.5,2
+			c-2.2,1.2-2.8,3.5-3.1,5.8l-0.9,1.5c-0.9-1.3-1.7-2.7-2.5-4c0-0.4,0.1-1.2,0.1-1.7C1715.3,709.6,1715.9,708.8,1716.6,708.1z"/>
+		<path class="st2" d="M271.8,705.8c2.6-1.2,5.3-3,8.2-2c-2.4,5.1-4.7,10.2-6.6,15.4c-0.6-0.2-1.7-0.5-2.2-0.7
+			c-0.7-0.8-1.3-1.6-2-2.4C270.4,712.8,271.2,709.3,271.8,705.8z"/>
+		<path class="st2" d="M1726.4,703.5c0.9,0,1.8,0,2.8,0c0.1,0.6,0.4,1.9,0.5,2.5c0.3,1.7,0.7,3.3,1.1,5c-0.8,0.1-2.3,0.2-3.1,0.3
+			C1726.2,709,1726.3,706.2,1726.4,703.5z"/>
+		<path class="st2" d="M655.5,706.4c0.8-2.2,3.1-2,5-1.9c0.2,2-0.2,3.9-1.7,5.3C657.7,708.8,654.7,708.4,655.5,706.4z"/>
+		<path class="st2" d="M1578.4,712.7c0.9-3.2,1.1-7,3.6-9.4c1.5,0,3,0.6,4.2,1.6c-0.2,3.4-0.5,6.7-1,10.1c-0.5,0.3-1.4,0.8-1.9,1.1
+			c0.2,2.2,2.3,3,4,3.9c0.1-0.8,0.4-2.4,0.5-3.2c1.3-1.3,2.6-2.7,4-4c0.1,2,0.2,4,0.3,6c-0.7,1-1.4,1.9-2.1,2.9
+			c1.8,1.7,3.7,3.7,6.3,4c0.2-1.1,0.3-2.2,0.5-3.3c-1.4,0.1-2.8,0.3-4.2,0.3c1.1-2.3,2.8-4.2,4.2-6.3l0.2-1.3
+			c-0.6-1.4-1.2-2.8-1.7-4.2c0.4-0.9,0.8-1.8,1.3-2.7c0.6,0.4,1.7,1.2,2.2,1.6l0.4,0.8c0.6,3,0.5,6.3,2,9c1.4,2.5,4.5,1.8,6.8,1.8
+			c0.9,0.7,1.8,1.5,2.8,2.2c-0.6,1.2-1.2,2.4-1.8,3.6c-2.1-0.4-4.1-0.7-6.2-1.1c-0.6,1.7-1.1,3.5-1.5,5.3c-0.5,0.3-1.5,0.8-2,1
+			c-0.1,1.4-0.1,2.7-0.1,4.1c1.4,0.4,2.8,0.8,4.3,1.2c0.5-1.5,1-3,1.5-4.5c1.4,0.2,3.3-0.3,4,1.4c-0.2,1.3-0.4,2.6-0.7,4
+			c2.8-0.3,5.6-0.8,8.4-0.9c2.9,1.3,5.6,3.1,8.4,4.5c-6.5,0.5-12.8-1.2-19.3-1c-5.9,0-11.8-0.2-17.7-0.1c-0.7-1.6-1.2-3.2-1.9-4.8
+			c-0.6,0.4-1.8,1.1-2.4,1.5c-0.1,0.8-0.2,2.5-0.3,3.4c-3.7,0-7.4-0.1-11.1,0c2.1-1.4,4.2-2.9,5.7-4.9c-0.1-2.8-3-4.5-4.6-6.5
+			c-3.4,2.9-2,7.7-3.3,11.5c-0.6,0-1.8,0-2.4,0c-0.2-0.7-0.6-2.1-0.8-2.8c-2.5-0.2-5-0.7-6.9-2.3l1.4-1.1c-0.7-1.6-1.8-3-3.6-3.4
+			l-0.6,0.4c-0.2,1.4-0.4,2.9-0.6,4.3c-1.6-0.2-3.4,0.2-4.8-0.6c-1.2-1.4-2.1-3.1-3.3-4.5c-1.5-0.2-3-0.1-4.5,0
+			c-1.3-1.8-2.7-3.6-4.2-5.2c1.8-1.2,4.1-2,5.3-3.9c0.7-0.9,1.3-1.9,2.1-2.9c2.1-1.9,3.2-4.6,4.3-7.1c2,1,2.4,4.1,4.1,5.8
+			c1.9,0.3,3.2-1.2,4.3-2.5c-1.4-0.3-2.8-0.6-4.2-0.9c1.3-2.5,2.5-5,3.7-7.6c1.6-0.1,3.2-0.2,4.9-0.3c-0.4,2.3-1.9,4.2-3.7,5.6
+			c0.1,0.4,0.4,1.2,0.6,1.6c0.7,2.5,2.4,4.6,4.3,6.3c-1.7,3.3-3.9,6.4-7.4,8.1c2.2,1.9,4.8,3.2,7.5,4.3c1-0.9,1.9-1.8,2.9-2.7
+			c0.8-0.8,1.7-1.5,2.5-2.3c0-0.6,0.1-1.9,0.1-2.5c-1.5,0.8-3,1.6-4.4,2.5c-1.2,1-2.3,2.1-3.5,3.1c-0.9-0.7-1.8-1.5-2.5-2.3
+			c2.6-1.8,5.6-3.2,7.5-5.9c1.1,0.2,2.2,0.3,3.4,0.5c0.7-1.4,1.3-2.8,2-4.1c1.4-0.2,2.9-0.4,4.4-0.5c0.1-1,0.3-1.9,0.4-2.9
+			c-1.8,0-3.6,0-5.3,0c0-1.8,0-3.5,0-5.2C1575.2,711,1576.8,711.9,1578.4,712.7 M1553.2,720.1c-0.5,2.6,2.2,4.1,3.7,5.7
+			c0.6-1,1.3-2,1.9-3C1557,721.7,1555.4,720.1,1553.2,720.1 M1577.3,721.5c-0.2,2.5,0.3,5,1.1,7.4c2-0.5,4.8-0.7,5.4-3.1
+			c-0.7-0.3-2-0.9-2.6-1.2c-0.5-1.2-0.9-2.3-1.4-3.4C1579.2,721.3,1578,721.4,1577.3,721.5 M1546.4,722.4c0.3,2.1,2.1,5.7,4.6,4.8
+			C1552.2,724.7,1548.4,723,1546.4,722.4 M1551.5,732c0.6,1.8,2.6,2.7,4.3,1.8c0.3-2.2-0.2-4.4-0.6-6.6
+			C1553.9,728.7,1551.7,729.8,1551.5,732 M1586.2,733.3c-1.8,0.5-1.1,3.6,0.8,2.9C1588.9,735.8,1588.1,732.6,1586.2,733.3
+			 M1580.8,737c0.4,3.1,2.9,0.2,3.9-0.9C1583.5,733.5,1580.5,734.1,1580.8,737z"/>
+		<path class="st2" d="M125.2,710.8c0.2-1.9,0.5-3.8,0.8-5.6c1.6,0.5,3.2,1,4.9,1.5c-1.1,2.3-2.3,4.5-3.7,6.7
+			C126.5,712.5,125.9,711.7,125.2,710.8z"/>
+		<path class="st2" d="M136.7,705.7c3.6,1.5,8.7,2.4,10.1,6.6c1.1,1.7-0.3,3-2,3.2c-1.2-1.2-2.2-2.6-3.4-3.9c-1.5-0.5-3.2-0.7-4.7-1
+			C136.8,709,136.8,707.3,136.7,705.7z"/>
+		<path class="st2" d="M1602.9,709c0.5-0.7,1-1.4,1.6-2c1.2,2,2.5,3.9,3.4,6c0.1,0.8,0.3,2.3,0.3,3.1c-1.6,0.3-3.2,0.7-4.8,1
+			C1603.4,714.4,1603.2,711.7,1602.9,709z"/>
+		<path class="st2" d="M671.3,708.4c1.4-0.3,2.9,0.1,4.3,0.4c-0.9,2.5-1.1,5.1-1,7.7c-1.9,0.4-3.8,0.9-5.8,1.3
+			C667.4,714.5,669.2,711,671.3,708.4z"/>
+		<path class="st2" d="M979.4,710.4c2.2-0.7,4.5-1.3,6.7-2c0.3,0.4,0.9,1.2,1.2,1.6c-1.8,4.2-4.7,8-8.2,10.9
+			c-1.4,0.3-2.8,0.5-4.3,0.7c-0.6,2.1-1.3,4.2-2.2,6.2c-1.5-0.6-2.9-1.1-4.4-1.7c-1.3-1-2.5-2.2-3.7-3.3c0.7-0.8,1.5-1.6,2.2-2.3
+			c2-0.1,4.1-0.1,6.2-0.2c0.8-2.6,2.5-4.8,4.5-6.7C978,712.5,978.7,711.4,979.4,710.4z"/>
+		<path class="st2" d="M12.4,709.5c0.5-0.3,1.5-0.8,2-1c0.8,0.6,1.5,1.2,2.1,1.9c0.2,1.3-0.8,2.5-1.2,3.7c-1.1-0.4-2.2-0.7-3.3-1.1
+			C12.1,711.8,12.2,710.7,12.4,709.5z"/>
+		<path class="st2" d="M544.1,709.7c0.3-0.2,0.9-0.5,1.2-0.7c2,1.7,4.2,3.3,6.3,4.9c0.3,4.5-3.4,7.7-5.5,11.3
+			c0.8,3.1,2.6,5.9,4.9,8.2c3.5-0.1,2.7-4,2.9-6.4c-0.2-3.5,3.2-5.5,5.3-7.8c10.3,5.7,21.7,9.2,33.4,10.1c0.7,0.3,1.3,0.6,2,0.9
+			c-0.1,1.5-0.1,3-0.1,4.5c0.3,0.8,0.6,1.5,1,2.3c-2,3.4-4.8,6.3-8.5,7.8c-0.2,0.6-0.6,1.8-0.8,2.4c-2.5,3.6-7.3,1.8-10.9,1.6
+			c-9-0.9-17.7-3.7-26.6-5c-6-1.9-11.8-4.2-17.6-6.6c-0.2-0.5-0.8-1.6-1-2.1c1.3-2.4,2.6-4.8,4.3-7c0.8-0.9,1.6-1.8,2.5-2.7
+			c-0.4-1.5-0.8-3-1.2-4.5C539.1,717.7,542.6,714.3,544.1,709.7 M570.2,726.4c-1,1-0.8,3.2,0.8,3.5
+			C572.9,729.7,572.2,725.5,570.2,726.4 M540.2,733.7c1.2,0,2.4,0,3.7-0.1c-0.5-1.3,0.2-4.3-1.9-4.2
+			C539.7,729.3,540.6,732.2,540.2,733.7 M546.3,734.3c0,1.1,0.1,2.3,0.1,3.4c1-0.1,2-0.2,3-0.3c0.1-1,0.2-2.1,0.3-3.1
+			C548.6,734.3,547.4,734.3,546.3,734.3 M579.5,737.5c0.2,1.3-0.6,3.1,0.9,3.9c1.7,0.5,3.5-0.2,5.1-0.8c0-1.1,0-2.2,0-3.2
+			C583.5,737.4,581.5,737.5,579.5,737.5 M567.1,741.1c0.3,1.2,0.1,2.7,1.2,3.5c1.1,0.1,3.8,0.3,3.4-1.6
+			C571.5,740.8,568.6,741.5,567.1,741.1z"/>
+		<path class="st2" d="M684.2,710.4c1.2-0.4,2.4-0.8,3.6-1.2c-0.3,1.8,0.4,4.1-1,5.5C684.1,715.1,684.2,712.1,684.2,710.4z"/>
+		<path class="st2" d="M790.8,711.7c1.7-2.1,4.5-2.6,6.9-3.5c-0.1,1.9-0.2,3.8-0.3,5.7c1.9-0.6,3.7-1.3,5.6-1.8
+			c2.8,0.6,5.7,0.5,8.1-1.2c1.3,1.8,2.7,3.5,4,5.3c-1.4,1-2.8,2-4.3,2.7c-2.8-0.6-5-2.9-7.8-3.5c-2,0.2-4,1.5-4.7,3.5
+			c1,1.2,2.2,2.2,3.3,3.3c-1.7,2-3.5,4-3.4,6.8c2.1,0.6,4.1,1.2,6.2,1.8c-0.1,0.8-0.2,2.3-0.3,3c-2,1.7-3,4.3-3.8,6.8
+			c-5.3,0.5-10.7,0-16,0.3c1-1.7,1.9-3.3,3-4.9c1.1,1.1,2.3,2.3,3.4,3.5c1.1-0.8,2.2-1.6,3.3-2.5c0.3-1.6,0.4-3.3,0.5-4.9
+			c-4,0.9-8.1,1.9-11.5,4.2c-1.3,1.4-1.8,3.2-2.6,4.9c-6.4,0.9-13,0.5-19.4,1.9c0.1-5.1-0.2-10.3,0.2-15.4
+			c8.4,0.3,18.2,0.4,24.5-6.2C788.5,718.7,789.2,714.9,790.8,711.7 M773.4,734.5c-2.4,0.5-0.8,5.9,1.5,3.5
+			C777.8,736.9,776.2,733.3,773.4,734.5z"/>
+		<path class="st2" d="M1133.6,711.8c2.9-0.3,6.1-0.5,8.3-2.5c-0.1,1.4,0,2.8,0,4.2c-2.6,0.2-5.2,0.5-7.8,1c0.4,1.8,1.4,3.2,2.6,4.6
+			c0.6-0.6,1.9-1.8,2.5-2.3c0.9,0.6,1.8,1.2,2.7,1.8c0.7,0.5,1.4,1,2.1,1.5c0.7,1,1.4,2,2.2,3c0.2,0.3,0.5,1,0.7,1.4
+			c1.5,0.5,3,1,4.5,1.6c-1.3,1.1-2.5,2.2-3.8,3.3c1.4,1.1,2.8,2.1,4.2,3.2c-0.3,3-0.7,6-1.1,9c-2.9-3.8-5.1-8.1-6.6-12.6
+			c-1.1-3.1-4.7-0.3-6.5,0.7c-1.3,1-2.5,2.1-3.8,3.2c-0.9-0.2-1.8-0.4-2.7-0.6c-2.4,1.2-5,1.6-7.6,1.9c-0.7-2.8-1.2-5.7-2.2-8.4
+			c-1.1-1.9-2.8-3.2-4.4-4.7c2.2-0.4,4.5-0.9,6.2-2.5c1.6-1.2,1.3-3.6,1.9-5.3c1.1-0.1,2.2-0.1,3.4-0.2c-0.3,0.4-0.8,1.2-1.1,1.6
+			c0.6,0.4,1.7,1.3,2.3,1.7c-0.6,1.5-1.1,3-1.6,4.6c1.4-0.1,3.2,0,4-1.6C1132.7,716.6,1132.7,714.1,1133.6,711.8 M1132,724
+			c1.5,1.8,3.6-0.2,4.9-1.1c-1.3-0.7-2.3-2.3-3.9-2.1C1131.3,721.4,1130.9,722.5,1132,724 M1139,725c1.3,2.7,3.2-1.4,3.9-2.6
+			C1141.1,721.8,1137.4,722.3,1139,725z"/>
+		<path class="st2" d="M27.5,710.3c0.4,0,1.3,0.1,1.8,0.1c0,1.7-0.1,3.3-0.2,5c-3.3-0.6-6.7-1-10-1.5
+			C21.4,711.9,24.5,711,27.5,710.3z"/>
+		<path class="st2" d="M650.1,709.8c1.7,0.2,3.4,0.4,5.1,0.7c-1,4.8-6.7,5.8-8.8,9.9c-3.9-0.6-6.2,2.9-9.1,4.9
+			c0.3-2.7,1-5.4,2.7-7.6C643.3,715.1,646.8,712.6,650.1,709.8z"/>
+		<path class="st2" d="M1702.9,712.8c2.9-2.3,8-3.8,10.5-0.2c-1.6-0.1-3.1-0.1-4.7-0.2c-0.6,1.5-1.1,3.1-1.7,4.6
+			c-1.5,0.3-2.9,0.7-4.3,1C1702.8,716.3,1702.8,714.5,1702.9,712.8z"/>
+		<path class="st2" d="M1269.1,713.9c1.6-1,3.2-2,4.6-3.2c0.4,0.4,1.3,1.3,1.7,1.7c0.2,0.3,0.5,0.8,0.7,1.1c-1.6,1.5-3.3,3-5,4.5
+			c-0.8,0-2.4-0.1-3.2-0.1l-1.3-0.6c-0.5-0.2-1.5-0.7-2-0.9c-0.5,1.2-1,2.4-1.4,3.6c0.8,1.5,2.2,2.5,3.4,3.6
+			c-0.4,1.3-0.8,2.7-1.2,4.1c-1.6,1.7-3.2,6.5,0.2,6.6c1.6-1.6,3.1-3.4,4.6-5c0.7,1.2,1.4,2.3,2.2,3.5c0.4,0.6,1.2,1.8,1.6,2.4
+			c-2,2-3.9,4-5.6,6.3c-3.7,0.1-7.3,0.1-11,0.2l-0.2-1.4c0-0.4-0.1-1.1-0.2-1.4c0.3-0.7,0.8-2.2,1-2.9c1.8,1.3,3.4,2.8,5.2,4.2
+			c-1.2-4.8-1.8-9.8-2.2-14.7c0-0.5-0.1-1.3-0.2-1.8c0-0.5-0.1-1.5-0.2-2.1c-0.9-0.3-1.8-0.5-2.7-0.8c0.4-1.2,1-2.3,1.4-3.5
+			c0.6-1.7,1-3.5,1.4-5.2C1263.7,712.4,1266.5,712.9,1269.1,713.9z"/>
+		<path class="st2" d="M128.7,717.9c1.1-1.3,2.3-2.5,3.9-3.2c-0.1,1.7-0.4,3.4-0.3,5.1c1.4,2.2,3.5,3.8,5.5,5.4
+			c3.9-2.4,8,0.8,9.9,4.2c0.9,2.3,1.5,4.7,2.2,7c-3,0-5.6-1.6-8.1-3c-0.1-1.9,0.1-4-1.3-5.4c-1.6,2.9-4.1,4.9-7.6,4.8
+			c-0.7,2.1-1.6,4.1-2.8,6c-2.2-2.4-4.2-5-6.1-7.7c0.3-0.5,0.9-1.4,1.2-1.9c2.1,0.9,4.4,1.6,6.7,1.8
+			C132.7,726.2,130.8,721.9,128.7,717.9z"/>
+		<path class="st2" d="M1091.5,724.9c4.7-2.2,7.9-6.4,10.7-10.7c1.7,1.7,3.3,3.6,5,5.2c2,0.6,4.1,0.8,6.1,1.3c0.6,1.6,0.1,3.2,0,4.8
+			c-2.3-0.6-4.5-1.3-6.6-2.3c-1.4,0.6-2.8,1.2-4.1,1.8c-0.2,1.3-0.4,2.6-0.6,3.9c-2-1.2-4-2.5-6-3.7c1.2,2.2,2.5,4.5,3.9,6.6
+			c2.3,0.7,4.6,1.5,6.9,2.2c-0.2,1.6-0.5,3.2-0.8,4.9c-2.5,2.8-4.6-1.4-4.9-3.7c-0.6-0.4-1.1-0.8-1.6-1.2c-0.2,2.3-0.5,4.7-0.7,7.1
+			c-1.3-0.2-2.7-0.3-4-0.4c-0.3-1.3-0.5-2.6-0.8-3.9c-0.1-0.5-0.4-1.4-0.5-1.8c-0.4-1.1-0.7-2.2-1.1-3.3c0.4-1,0.9-2,1.4-2.9
+			C1093,727.6,1092.2,726.2,1091.5,724.9z"/>
+		<path class="st2" d="M239.2,717.6c0.5-0.5,1.4-1.5,1.9-2c0.4,0.3,1.3,0.9,1.7,1.2c2.1,1.6,4.3,3.3,5.8,5.6c0.4,1.9-2,2.8-2.9,4.2
+			c2.4,0.4,5.1,1.1,7.3-0.3c0.9-0.8,1.9-1.6,2.8-2.4c1.8-1.6,3.9-3,6.1-4c-0.6,5-1.4,9.9-2,14.9c-1-0.6-2-1.2-3-1.8
+			c-0.2-0.6-0.5-1.8-0.6-2.5c-1.1-0.1-2.2-0.3-3.3-0.4c-0.8,2.4-1.1,5.7-4.4,5.5c0-1.7,0.3-3.4,0-5.1c-0.6-1.8-2.8-1.9-4.2-2.5
+			c-1-1.9-1.7-4-2.1-6.1C241.1,720.5,240.1,719.1,239.2,717.6z"/>
+		<path class="st2" d="M1002.3,717.8c1.1-0.6,2.2-1.4,3.5-1.6c1.7,0.8,3,2.3,4.3,3.7c0.9,1,1.8,2.1,2.9,2.9c2.5,0,4.7-1.6,7.1-2.4
+			c0.8,2.1,1.3,4.2,2,6.4c1.2,1.5,2.6,3,3.8,4.6c1.1,2,1.9,4,2.8,6c-1.9-0.4-4.1-0.2-5.5-1.7c-2.4-2.4-3.4-5.8-5.9-8
+			c-2.3-0.5-4.6-0.2-6.9-0.2c0.2,2.4,0.2,4.8,0.3,7.2c0,0.6,0.1,1.7,0.2,2.3c0.3,0.6,0.8,1.9,1.1,2.5c-0.9,0.2-1.8,0.4-2.8,0.5
+			c-1.4-2.2-1.5-5.1-2.8-7.4c-1.3-0.2-2.7-0.2-4.1-0.3c-0.3-1.8-0.7-3.5-1-5.2c-2.2,0-4.5,0.3-6.7,0.8c-0.2-0.8-0.3-1.7-0.5-2.5
+			c1.5-1.3,4.6-2.5,2.4-4.7l-0.3-0.6c-0.3-1.1-0.6-2.1-0.9-3.2c1,0.4,2,0.9,3,1.3c0.3,2,0.4,4.1,1,6.1c0.4,2.1,3,1.9,4.5,2.6
+			C1004.4,723.9,1003.6,720.8,1002.3,717.8z"/>
+		<path class="st2" d="M145.3,721.8c-0.8-2.1,1.9-2.5,3.1-3.6c0.7,0.9,1.4,1.8,2.2,2.7c-0.4,1.2-0.9,2.5-1.3,3.7
+			C147.9,723.8,146,723.4,145.3,721.8z"/>
+		<path class="st2" d="M1395.6,719.2c2.9,0.9,6,1.8,9,0.8c0.9,2.1,1.8,4.2,2.5,6.5c-1.8,0.3-3.7,1.3-5.2,0c0.3-1.4-1-4.2-2.4-2.2
+			c-0.2,0.5-0.5,1.4-0.7,1.8C1395.7,725,1395.7,721.8,1395.6,719.2z"/>
+		<path class="st2" d="M653.7,721.2c2.7-0.3,5.3-0.6,8-0.9c0.6,2,1.1,4.1,2,6.1c1.4,1.8,4,0.8,5.7,0c0.6-1.4,0.9-3,1.4-4.4
+			c3.3,0.2,5.4,2.9,7.5,5.2c-3.4,1.9-6.8,3.9-10.2,5.9c-2.3-1.4-4.3-3.2-6.4-4.8c-2.1-1.1-4.5-1.3-6.6-2.4
+			C654,724.6,654.2,722.8,653.7,721.2z"/>
+		<path class="st2" d="M158.7,730.2c-2-3.3-2.4-8,1.5-10c1.2,2.6,1.5,5.4,2.7,8c1.6,1.1,3.4,1.9,4.9,3.2c0,1.7-0.6,3.5-2,4.5
+			c-1.8,0.6-3.9,0.2-5.8,0.5c-1.2,1-2.1,2.2-3.1,3.4c-1.3-2.5-3.2-4.8-3.8-7.6c0-2.7,3.2-0.6,4.7-0.5
+			C158.1,731.2,158.5,730.5,158.7,730.2z"/>
+		<path class="st2" d="M265.1,725.6c1-1.8,1.9-3.6,2.9-5.3c1.3,0.9,2.5,1.9,3.8,2.9c-2.6,5.2-4.9,10.7-7.4,16
+			C262.6,734.7,265.2,730.1,265.1,725.6z"/>
+		<path class="st2" d="M985.7,724.6c1.5-0.8,2.6-2.1,3.8-3.3c1,0.9,1.9,1.9,2.9,2.8c-1.1,3.2-3,6.3-6.7,6.8
+			c-0.2,1.2-0.5,2.5-0.7,3.7c-1.2-0.1-2.4-0.3-3.5-0.4c-0.7,1.6-1.5,3.1-2.3,4.6c-1.1-1-2.1-2-3.1-3.1c0.5-1.2,1.1-2.5,1.6-3.7
+			c-2-0.8-4.5-1.6-4.4-4.2c1.8-1.2,3.7-2.4,5.5-3.6C981.1,724.6,983.4,725.3,985.7,724.6z"/>
+		<path class="st2" d="M1731,723.2c0.6-1,1.3-2,2-3v6.8C1732.2,726,1729.6,724.8,1731,723.2z"/>
+		<path class="st2" d="M6.2,724.3c1.6-2.2,4.1-0.4,5.2,1.3c1.1-1,2.2-2.1,3.5-3c1.7-0.5,2.5,1.3,3.3,2.3c-2.4,3.6-6.6,4.1-10.6,4.6
+			C6.5,728.1,4.1,725.9,6.2,724.3z"/>
+		<path class="st2" d="M1719,722.8c0.8,0,2.3-0.1,3.1-0.1c1.3,2.1,2.7,4.3,4,6.4c-1,0.3-2,0.6-3,0.9c-0.9-1.2-1.6-2.5-2.2-3.8
+			c-1.9,0.8-3.8,1.7-5.5,2.8c-0.1-1.4,0.4-2.8,1.4-3.8C1717.5,724.6,1718.3,723.7,1719,722.8z"/>
+		<path class="st2" d="M1027.3,724.5c1.1-0.2,2.2-0.4,3.4-0.5c1.7,1,3.4,1.8,5.2,2.5c0.6,1.1,1.3,2.3,1.9,3.5
+			c-1.6,0.5-3.2,0.9-4.8,1.4c-0.8-0.6-1.6-1.2-2.3-1.9c-1.1-0.9-2.1-1.9-3.1-2.8C1027.5,726.1,1027.4,725,1027.3,724.5z"/>
+		<path class="st2" d="M1615.3,723.8c1.1,0.3,2.2,0.6,3.3,0.9l0.6,0.1c-0.4,0.6-1.1,1.7-1.4,2.2c0.6,2,1.1,4,2,5.9l1,1.3l-0.5,0.9
+			c-0.8,1.1-1.6,3-3.3,2.3c-3.2-0.3-5.8-2.2-7.4-4.9c-1.8-0.1-3.7-0.1-5.5-0.2c0.1-3.5,3.7-2.8,6.2-2.9c0.6,0.2,1.8,0.7,2.4,0.9
+			c0.5,1,1.1,2.1,1.6,3.1c0.6,0,1.9,0,2.5,0c-0.1-0.5-0.3-1.5-0.4-1.9c-1.5-1.8-3-3.6-4.3-5.5
+			C1613.2,725.4,1614.2,724.6,1615.3,723.8z"/>
+		<path class="st2" d="M21.2,725.2c2.1,1.3,4.5,2.3,6.1,4.2c2.7,4.2,2.3,9.5,1.3,14.2c-0.4-0.4-1.2-1.1-1.6-1.5
+			c-0.7-2.8-0.7-5.8-1.7-8.5c-1.2-1.1-2.6-2-3.9-2.9C21.3,728.9,21.3,727,21.2,725.2z"/>
+		<path class="st2" d="M954.5,727.7c3-0.8,5.9-2,8.7-3.5c0.2,2.1,1.9,4.7,0.3,6.6c-1.2-0.8-2.3-1.7-3.5-2.4c-1.7,0.6-3.3,1.6-4.4,3
+			c-0.2,1.7-0.1,3.4-0.2,5.1c-0.8,2.2-2.8,3.6-4.8,4.6c-0.5-2.6-0.7-5.3-0.4-7.9C951.8,731.6,953.2,729.7,954.5,727.7z"/>
+		<path class="st2" d="M1380.2,725.5c1.5,0.5,3.1,1.1,4.6,1.7l-0.8,0.5c-2.5,1.5-4.8,3.2-7,5.2c1.2,0.6,2.4,1.2,3.6,1.9
+			c0.3,2,0.5,4,0.8,6.1c-4.3-0.5-8.5,0.5-12.6,1.6c0.5-1.7,1.1-3.4,1.6-5c-3.2-0.7-3.7,3.2-5.1,5.2c-0.8-3.5-0.1-7.1,0.8-10.6
+			c-0.4-1-0.8-2-1.2-3c2.1-0.3,4.3-0.5,6.4-0.8c0.5,1.1,1,2.2,1.5,3.3c0.6-0.2,1.9-0.7,2.5-1c0.2-1.2,0.4-2.4,0.7-3.6
+			c0.2,0.9,0.8,2.7,1,3.5C1378.2,728.9,1379.3,727.2,1380.2,725.5 M1367.5,731.3c0.4,1.4-0.5,4.4,1.7,4.5c2.1,0.5,3.1-2.4,1.8-3.8
+			C1370.1,731.8,1368.3,731.5,1367.5,731.3 M1372.8,739.7c3.2,0,2.4-3.8,2.4-5.9C1373,734.6,1369.2,738,1372.8,739.7z"/>
+		<path class="st2" d="M1709.5,726.5c0.2,0,0.7,0.1,0.9,0.1c0.3,0.6,0.9,1.7,1.3,2.2c-1.3,1.6-2.6,3.3-3.8,5
+			c-1.2,1.7-2.4,3.4-3.8,4.8l-1.2,0.2c0.2-4.2-0.1-8.3-0.2-12.5c1,0.8,2,1.6,3,2.5l0.7,0.7c0.4,0,1.3-0.1,1.7-0.1l0.5-0.2
+			C1708.9,728.4,1709.2,727.5,1709.5,726.5z"/>
+		<path class="st2" d="M169.5,727.2c0.9-0.1,2.7-0.4,3.6-0.5c1.9,0.4,3.9,0.8,5.8,1c0.5,2.7,1.3,5.4,3.1,7.6
+			c1.1-1.1,2.1-2.2,3.2-3.3c-0.1,2.8-0.1,5.6-0.1,8.5c-1.5-0.1-3-0.3-4.5-0.3c-2,0-4,0-5.9,0c-0.1-4.1,4.4-6.9,3.1-11
+			c-2.2,0.2-4.2,1.3-6.2,2.2C170.9,730,170.2,728.6,169.5,727.2z"/>
+		<path class="st2" d="M649.1,727.1c2.2-0.1,3.9,1.5,5.7,2.6c0.4,0.3,1.3,0.9,1.7,1.2c-0.2,2,0.8,5.2-1.6,6.1
+			c-2,1.1-3.2-1.4-4.4-2.6C649,732.4,646.5,729.3,649.1,727.1z"/>
+		<path class="st2" d="M1104.5,728.7c1.5-0.4,3.2-2.3,4.7-1c2.3,2.2,3.9,5,5.7,7.6c-1.4,0.1-2.8,0-4.2-0.3
+			C1108.6,733,1106.5,730.8,1104.5,728.7z"/>
+		<path class="st2" d="M1317.6,729.5c1.2-1.3,2.6-2.2,4.4-2.4c1.5,3.5,4.4,5.9,7.5,8c1.1,1.2,2.1,2.6,3.2,3.9
+			c-0.6,0.8-1.2,1.6-1.8,2.4c-1-1.4-2-2.9-2.8-4.5c-3,0.5-6.2,0.9-7.9,3.7l-0.3,0.3c-1.1-1.6-2.2-3.1-3.9-3.8
+			c-0.3,1.3-0.5,2.7-0.8,4c-2.4,0-4.8,0-7.1-0.1c1.4-5.1,7-5.5,11.2-6.9C1320.1,732.5,1318,731,1317.6,729.5z"/>
+		<path class="st2" d="M1329.7,728.4c1.1-0.7,2.2-1.4,3.3-2.1c0.6,1.3,1.2,2.6,1.8,3.9c0.2,0.4,0.5,1.1,0.7,1.5
+			c-0.8,0.6-1.6,1.3-2.3,1.9C1331.8,732.1,1330.6,730.3,1329.7,728.4z"/>
+		<path class="st2" d="M1522.3,728.3c5.7-1.3,11.7,0.2,17.2-1.9c0.3,1.8,0.7,3.6,1,5.5c-0.3,0.2-1,0.5-1.4,0.7
+			c-0.4,0.2-1.3,0.7-1.8,0.9c-0.6,3.4-1.9,6.6-4.2,9.2c-3.6,0.1-7.2,0.2-10.7-0.3C1522.3,737.6,1522.3,733,1522.3,728.3
+			 M1526.6,733.1c1.4,0.1,2.8,0.2,4.2,0.3c-1,0.8-2.3,1.4-2.8,2.6c0.2,1.4,1.2,2.5,1.9,3.7c1.4-2.2,2.8-4.5,4.1-6.7
+			c-1-0.8-1.9-1.5-2.8-2.3c-0.6-1.5-1.6-1.8-3.1-0.9C1527.1,730.5,1526.5,731.6,1526.6,733.1z"/>
+		<path class="st2" d="M609.9,728.8c2.6-0.4,5.1-1.1,7.7-1.6c1.2,0.4,2.5,0.9,3.7,1.4c-1.9,2.2-3.1,4.8-3.5,7.6
+			c-1.2,2.9-4,0.6-5.1-1.1c-1.2-1.7-2.2-3.4-3.2-5.2L609.9,728.8z"/>
+		<path class="st2" d="M1081.3,728c0.8,0,2.6,0,3.4,0c0.3,0.2,0.9,0.7,1.2,0.9c0.9,1.2,1.8,2.4,2.7,3.6c-0.6,1-1.1,2.1-1.7,3.1
+			c-0.8-0.8-1.7-1.5-2.5-2.2C1082.7,732.1,1081.1,730.4,1081.3,728z"/>
+		<path class="st2" d="M1233.6,728.6c3.7-0.5,7.6-0.6,11.3-1.2c-0.4,1.5-0.7,3-1.1,4.5c-0.9,1.5,0.9,3.4,2.5,2.7
+			c0,2.5-2.1,4-3.6,5.7c-2-2.3-2.8-5.3-4.2-8c-1.4-1.2-3.5-1.1-5.2-1.6C1233.4,730.2,1233.6,729.2,1233.6,728.6z"/>
+		<path class="st2" d="M1279.4,736.4c1.8-2.8,3.2-6,5.3-8.7c0.1,3.1,0.3,6.2,0.9,9.2c1.7-3.3,4.5-5.8,8.3-5.8
+			c-1.2,2-2.5,4.1-3.8,6.1c1.3,0.3,2.7,0.6,4,1c0.9,0.8,1.8,1.6,2.7,2.4c-0.8,0-2.5,0.1-3.3,0.1c-7.7,0.8-15.4,0.6-23,0.7
+			C1273.6,740.1,1277.1,739,1279.4,736.4z"/>
+		<path class="st2" d="M0,728.7c0.6,0.7,1.2,1.4,1.9,2.1l0.9,1C2,733.6,1,735.3,0,737V728.7z"/>
+		<path class="st2" d="M322.3,728.4l0.7,0c1.3,0.4,2.6,0.9,3.9,1.4c-0.8,1.4-1.6,2.8-2.4,4.2c1.4,2,2.6,4,3.4,6.3
+			c0.1,0.4,0.4,1.1,0.6,1.5c1.3,0.3,2.6,0.5,3.9,0.7l-0.8,0.1c-3,0-6,0.3-8.9,0.8c-0.1-0.2-0.3-0.7-0.4-1
+			C322.4,737.7,322.4,733,322.3,728.4z"/>
+		<path class="st2" d="M1047.8,728.7c1.6,0,3.2,0,4.8,0c-0.3,4.7-4.3,8.8-1.9,13.4c-1.2,0-2.4,0.1-3.6,0.2c-0.4-0.5-1.2-1.4-1.7-1.8
+			c-0.2,0.1-0.8,0.4-1,0.5c-0.9,0.2-2.7,0.5-3.6,0.6c-2.3-3.4-2.9-7.7-1.4-11.6c1.7,1,3.5,2,5.2,3.1c1,0.6,2.1,1.3,3.1,2
+			C1048,732.9,1048,730.8,1047.8,728.7z"/>
+		<path class="st2" d="M1075.8,728.8c0.7,0.2,2.1,0.7,2.8,0.9c0.3,1.5,0.5,2.9,0.7,4.4c-0.5,1.5-2,2.3-3,3.4
+			C1075.8,734.7,1075.7,731.7,1075.8,728.8z"/>
+		<path class="st2" d="M1250.3,729.1c2.8,0,5.4,0.9,6.9,3.5c0.1,1,0.2,2,0.3,3.1c-0.8-0.2-2.3-0.8-3.1-1c-1.5-0.5-2.9-1.2-4.3-1.7
+			C1250.1,731.6,1250.2,730.3,1250.3,729.1z"/>
+		<path class="st2" d="M1457.6,729l1-0.5c0.2,3.7,0.2,7.5,0,11.2c-2.9,1.6-6.1,3-9.6,2.5c-0.2-1.5-0.5-2.9-0.7-4.4
+			c0.9-0.6,1.8-1.1,2.7-1.6c-0.7-1.6-1.5-3.3-2.2-4.9c1.8-0.1,3.6-0.2,5.4-0.2c0,1.2,0,2.5,0,3.7
+			C1456.1,733.2,1456.7,731,1457.6,729z"/>
+		<path class="st2" d="M1625.9,737.2c-4.6-1.9-1.1-7.7,2.5-8.4c0.4,1.4,0.7,2.8,1.1,4.3C1628.3,734.5,1627.1,735.9,1625.9,737.2z"/>
+		<path class="st2" d="M99.6,729.6c1.3,0.4,2.7,0.8,4,1.2c1,4.1-1,7.8-3,11.1l-1,0.2C99.3,737.9,99.3,733.7,99.6,729.6z"/>
+		<path class="st2" d="M1380.7,731.9c3.9-0.6,7.9-1.1,11.8-2c1.5,2,1.8,5-0.3,6.8c-2.8,0.2-1.8-3.2-2.4-4.9
+			c-0.8,0.1-2.4,0.3-3.2,0.4c-0.2,1.6,0.9,2.8,1.6,4.1c0.4,1.2-0.1,3.3,1.6,3.5c1.2-1,2.3-2.3,3.5-3.5c0.7,1.6,1.3,3.2,2,4.7
+			c-2,0.2-4,0.3-6,0.4c-1.7-0.2-3.4-0.3-5-0.5c0.4-1.5,1.5-3,1.2-4.6C1384.1,734.7,1382.3,733.4,1380.7,731.9z"/>
+		<path class="st2" d="M1725.6,731.5c2.5-0.7,4.9-1.3,7.4-2.1v5c-2.3,0.5-4.6,0.7-6.9,0.9c-1.3,1.2-2.6,2.3-4.3,2.8
+			c-0.2-0.7-0.5-2-0.7-2.6l1-0.1c0.6-0.1,1.9-0.3,2.5-0.4C1724.9,733.8,1725.2,732.6,1725.6,731.5z"/>
+		<path class="st2" d="M967.6,731.4c0.5-0.2,1.6-0.6,2.2-0.8c0.9,0,2.6,0.1,3.5,0.1c0,2.2,0,4.4-0.1,6.7c-2.8-0.2-5.8-0.5-7.4-3.2
+			C966.4,733.3,967,732.3,967.6,731.4z"/>
+		<path class="st2" d="M941.8,736.3c0.3-1.5-0.8-4.2,1.2-4.9c1.8,0.2,3.1,1.9,3.5,3.6C945.8,737,943.4,736.2,941.8,736.3z"/>
+		<path class="st2" d="M138.9,733.1c0.6,0.2,1.7,0.6,2.2,0.8c0.1,2.2,0.3,4.3,0.4,6.5c-1.6-0.3-3.1-0.7-4.7-1c0-0.6,0.1-1.7,0.2-2.3
+			C137.7,735.7,138.3,734.4,138.9,733.1z"/>
+		<path class="st2" d="M1340.1,733.8c0.5-0.2,1.5-0.6,2.1-0.8c1,1.8,1.7,3.7,1.7,5.8c-0.6,0-1.9,0.1-2.6,0.2
+			c-1.6,1.1-3.1,2.3-4.7,3.4c0.3-1.5,0.7-3.1,1-4.6c1.3-0.5,2.7-1,4.1-1.4C1341.3,735.7,1340.5,734.5,1340.1,733.8z"/>
+		<path class="st2" d="M14.4,737.3c1.1-2.8,4.6-1.9,7-2.1c0.2,2.8,1,5.6,2.9,7.8c-0.3,1.1-0.6,2.1-1,3.2c-0.8,0.1-1.6,0.2-2.4,0.3
+			c-0.4-1.4-0.8-2.8-1.3-4.2c-0.5,0-1.5,0-1.9,0c-0.4,0-1.2,0-1.6,0l-0.6-0.6C15,740.3,14.4,738.9,14.4,737.3z"/>
+		<path class="st2" d="M603.7,735.8c1.6-2.6,5.8-0.6,5.7,2.2c0.6,1.7-1.6,2.3-2.4,3.4C605.7,739.6,604.5,737.8,603.7,735.8z"/>
+		<path class="st2" d="M998.8,737.9c1-0.6,1.9-1.8,3.2-1.8c2.4-0.6,2.3,2.4,3.1,3.9c-3.7,0.4-7.5,0.4-11.2-0.3
+			C995.3,738.6,997.1,738.3,998.8,737.9z"/>
+		<path class="st2" d="M250.2,741.6c0.8-1.6,1.7-3.2,2.6-4.8c0.6,0.3,1.9,1,2.6,1.3c0.4,1.4,0.8,2.7,1.2,4.1c-2,0.1-4,0.2-5.9,0.4
+			L250.2,741.6z"/>
+		<path class="st2" d="M1115.9,739.5c1.3-1,2.5-2.1,3.8-3.1c1.1,0.8,2.2,1.7,3.3,2.5c0.2,0.6,0.7,1.8,0.9,2.4c-2,0-4.1,0-6.1-0.1
+			C1117.3,740.8,1116.3,739.9,1115.9,739.5z"/>
+		<path class="st2" d="M1719.2,741.5c-0.3-1.6-0.5-3.2-0.7-4.8c0.9,1.9,1.9,3.8,2.6,5.8l0.3,0.9c0.3,1.5,1.2,2.3,2.8,2.5
+			c1.2-2.1,1.2-4.6,1.5-6.9c1.7,1.9,3,4.6,5.8,5c0.4-1.8,0.9-3.6,1.3-5.5v6.5c-1,0.9-2,1.9-3.1,2.5c-1.4-0.2-2.7-0.6-4-0.9
+			c-0.8,0.9-1.6,1.8-2.3,2.7c-1.7-1.6-3-3.6-3.9-5.7C1719.5,743.1,1719.3,742,1719.2,741.5z"/>
+		<path class="st2" d="M1708.5,742.4c1.3-1.9,3.7-5.4,5.9-2.4c0.1,2.1-1.7,3.3-3,4.7c-0.2,1.3-0.4,2.6-0.6,3.9
+			c-2.7-0.3-5.4-0.8-8.1-1.4c0-2,0-3.9,0.1-5.9C1704.5,742.2,1706.4,742.7,1708.5,742.4z"/>
+		<path class="st2" d="M598.4,741.8c3.7-0.4,7.3,0.2,10.7,1.8c1.3-0.6,2.5-1.2,3.8-1.8c0.4,0.5,1.1,1.4,1.5,1.9
+			c1.6-0.2,3.3-0.3,4.9-0.4c0.2,1.3,0.3,2.7,0.5,4c-6.7,0.8-13.5,1.6-20.2,1.9C599.6,746.7,599.2,744.2,598.4,741.8z"/>
+		<path class="st2" d="M21.5,755.7c0.8-4.1,4.8-5.7,8.1-7.4c-1.5,3.5-3.3,6.9-4.4,10.6c-1-0.7-2.1-1.3-3.1-2L21.5,755.7z"/>
+		<path class="st2" d="M3.6,749.2c1.6,0.2,3.2,0.4,4.8,0.6c0.5,0.4,1.5,1.1,2,1.4c5.7,4,3.2,11.7,2.8,17.5c-1.6-0.5-3.2-1-4.9-1.4
+			c0.9-1.2,1.8-2.3,2.6-3.4c-0.2-3.3-0.3-6.9-2.8-9.4C6.3,753.1,4.4,751.6,3.6,749.2z"/>
+		<path class="st2" d="M1715.6,750.7c0.4-0.2,1.1-0.7,1.5-1c1.5,0.4,4.6,0,4.5,2.4c0.6,2.6-3.1,2.4-4.8,2.5
+			c-0.4-0.2-1.1-0.6-1.4-0.8C1715.4,752.7,1715.4,751.7,1715.6,750.7z"/>
+		<path class="st2" d="M0,751.4c4.5,1.7,2.8,7.2,3.2,11c-0.8,1.3-2.2,2.1-3.2,3.1V751.4z"/>
+		<path class="st2" d="M1708.7,761.2c2.1,0.9,3.1,2.9,3.5,5l0.4,1c1.4-0.1,2.8-0.2,4.2-0.4c-0.2,1.4-0.2,2.7-0.2,4.1
+			c0.4,0.1,1.3,0.4,1.7,0.6c0,1.8,0,3.6-0.3,5.4c-1.8,0.9-2.7-1.2-3.6-2.2c-1.4-2.1-2.4-4.3-3.5-6.5c-0.8-0.8-1.5-1.5-2.3-2.3
+			C1708.6,764.3,1708.6,762.8,1708.7,761.2z"/>
+		<path class="st2" d="M20.3,770.6c-0.4-1.9-1.5-4.1,0.2-5.6c1.6,1.6,3.4,3.3,3.5,5.7C22.8,770.6,21.5,770.6,20.3,770.6z"/>
+		<path class="st2" d="M3.3,770.6c1.2,2.9,0.6,6,0.2,9c1.6,0.1,3.2,0.1,4.8,0.2c0.2-1.7,0.4-3.5,0.6-5.2c1.4-0.1,2.7-0.1,4.1-0.2
+			c-0.7,2.1-1.4,4.3-2.1,6.4c-1.8,1-4.4,1.9-4.5,4.3c0.4,3.3,2.7,6.4,1.8,9.9c-0.6,2.4-1,5.3-3.2,6.8c-2.8-1.5-3.6-4.9-5.1-7.5V786
+			c1.4-1.6,2.6-3.4,3.4-5.4C-0.1,777.9,1.6,773.7,3.3,770.6z"/>
+		<path class="st2" d="M21.4,780.5c-1.4-2.6,1.4-4.1,3.2-5.2c1.2,2,2.7,3.7,4.7,4.8c-0.1,1.2-0.2,2.4-0.3,3.6
+			C26.4,782.9,23.5,782.3,21.4,780.5z"/>
+		<path class="st2" d="M1707.8,785.9c0.6-0.2,1.8-0.6,2.4-0.8c1.7,1.5,2.9,3.4,2.1,5.7c-0.9-0.5-1.7-1-2.5-1.4
+			c-2.2,1.1-4.7,1.2-7.1,0.8C1702.4,787,1705.3,786.5,1707.8,785.9z"/>
+		<path class="st2" d="M1708.4,797.9c0.4-1.8,1-3.5,1.9-5.1c0.7,1,1.4,2.1,2.2,3.2c1.4,1.6,3,3,4.7,4.4c0.4,3.4,0,6.8-0.5,10.2
+			c2.3-1,4.7-2.3,7.3-2.2l-0.2,1.7c-0.9,0.7-1.9,1.4-2.9,2c-1.4,0.2-2.8,0.4-4.1,0.7c-2.2,0.5-3.1,2.6-4,4.4c2.1,0,4.2-0.1,6.3-0.2
+			c0.6,0.5,1.2,1,1.9,1.6c-1,0.3-2.1,0.7-3,1.2c-0.3,0.3-1,1-1.4,1.4c-0.6,0.3-1.7,1-2.2,1.3c-0.3-0.4-1-1.1-1.3-1.5
+			c-0.3-0.8-0.5-1.7-0.8-2.5c-1.8-1.9-2.9-4.3-4-6.6c-0.6-1-1.2-1.9-1.9-2.9c-0.1-0.4-0.2-1.1-0.3-1.5c0.3,0.1,0.9,0.2,1.2,0.2
+			c2.1,0.5,4.3,0.8,6.5,1.2c-0.9,1-1.7,2.1-2.5,3.2c1,0.2,2,0.3,3.1,0.5c0.3-3.5,1.4-7,0.3-10.5c-1,0.9-1.9,2-2.9,2.9
+			c-0.4,0.2-1.1,0.6-1.5,0.9c-0.5-0.3-1.5-1-1.9-1.4c0.2-0.3,0.7-0.9,0.9-1.2c0.9-1.2,1.8-2.3,2.7-3.5
+			C1710.7,799.2,1709.6,798.6,1708.4,797.9z"/>
+		<path class="st2" d="M4.7,812c0.9-2,2.7-3.4,4.4-4.7c1.9,2.1,1.5,5,1.3,7.6c0.8,1.3,1.6,2.6,2.4,3.9c-2,1.2-3.8,2.7-5.7,4
+			c-1.6-0.5-2.6-1.8-3.8-2.9c1.5-0.8,3.1-1.5,4.7-2.2C6.6,816,4.2,814.5,4.7,812z"/>
+		<path class="st2" d="M1725.4,812.6c2.5-0.1,5-0.3,7.6-0.5v8.1c-0.9,0.3-1.7,0.6-2.6,0.9c0-0.9,0.1-2.6,0.1-3.5
+			c-2.3-1-4.8-1.1-7.2-1C1724,815.3,1724.7,813.9,1725.4,812.6z"/>
+		<path class="st2" d="M1702.9,821c0.5-2.2,1.1-4.4,1.8-6.5l1.4,0.8c0.5,3.6,0.1,7.2-0.6,10.7c-0.2,0.5-0.6,1.3-0.7,1.8
+			c-0.5-0.5-1.5-1.3-2-1.8c-0.1-1.2-0.1-2.3-0.2-3.4c-1.7-0.4-3.4-0.7-5.1-1C1699.3,821.3,1701.1,821.1,1702.9,821z"/>
+		<path class="st2" d="M71.2,821.1c2.1-0.1,4.1-0.1,6.2-0.1c-0.2,2.2-0.8,4.7,0.5,6.8c1.2,1.8,3.1,3,4.8,4.3
+			c-0.8,1.5-1.5,3.1-2.2,4.7c-1.6-0.6-3.1-1.2-4.7-1.8c-0.2-1.4-0.4-2.7-0.7-4c-2.6-0.7-5.2-1.6-7.6-3
+			C68.8,825.8,70,823.5,71.2,821.1z"/>
+		<path class="st2" d="M92.8,821c2,0,4,0,6.1,0c0.9,1.1,1.7,2.1,2.6,3.2c-0.1,0.4-0.2,1.1-0.2,1.4c-1.2,0.3-2.5,0.6-3.7,0.9
+			c0,1.3-0.1,2.6-0.1,3.8c0.3,0.2,1,0.7,1.3,0.9c0.8,0.7,1.6,1.3,2.4,2c-1.8,0.4-3.7,0.7-5.5,1.1c-1.9-3.5-4.5-6.5-8-8.4
+			c0.3-0.5,1-1.5,1.4-2.1c1.2,0.3,2.3,0.5,3.5,0.8C92.7,823.5,92.8,822.2,92.8,821z"/>
+		<path class="st2" d="M117.1,821.2c1.1-0.1,2.2-0.1,3.3-0.1c-0.1,1.8-1.1,4.1,1.1,5c0.6,0.3,1.8,0.8,2.4,1c0.3,0.2,1,0.6,1.3,0.8
+			c-0.3,1.9-0.7,3.9-1,5.8c-2.4-0.6-5.1-1-6.6-3.1C116,827.7,116.9,824.3,117.1,821.2z"/>
+		<path class="st2" d="M152.1,820.8c1.8,0,3.7,0,5.5,0c-1.2,2-2.2,4.2-2.3,6.6c4.1,1.8,5.1-4.1,3.2-6.6c3.7,0,7.4,0,11.1,0
+			c-0.1,0.9-0.3,2.6-0.4,3.5c1.8,2,4.1,3.5,6.9,3.9c0.7-3-1.2-5.3-3.1-7.4c5.1,0.1,10.1-0.1,15.2,0.2c-0.7,1.3-1.5,2.6-2.2,3.9
+			c-1.2-0.8-2.4-1.6-3.6-2.4c-1.1,2-2.1,4.2-2.5,6.5c-0.1,0.8-0.4,2.3-0.5,3.1c0.9,1.2,1.8,2.4,2.7,3.7c0.3,1.4,0.5,2.9,0.8,4.3
+			c-2.1,1-4,0.2-5.8-1c-0.6-1.9-1.3-3.7-1.9-5.5c-2.9-0.9-5.9-1.1-8.9-1c-0.5-1.4-0.9-2.8-1.4-4.2c-2.9,3.6-7.4,3.4-11.5,4.2
+			c0.9,2,2.8,4,2.1,6.4c-2,3.1-5.1,5.3-7.8,7.7c-0.2,1.4-0.4,2.8-0.6,4.3h-6.2c-0.2-0.4-0.5-1.1-0.7-1.5c-1.4-1.9-1.9-4.2-1.8-6.5
+			c1.7-2.1,4.2-3.1,6.6-4.1c-0.9-2.4-1.7-4.8-2.6-7.1c1.8-0.5,3.6-0.8,5.3-1.5C149.4,827.4,150.6,824,152.1,820.8z"/>
+		<path class="st2" d="M192.8,821.1c0.8,0,2.4-0.1,3.2-0.2c0.6,3.3,1.2,6.8,0,10.1c-1.7,5-1.2,10.3-1.7,15.4c-2.3-1-4.7-2-7.1-2.9
+			c0.3-2.8,1.8-5.9,0.2-8.4c-2.3-1.3-3.8-3.3-3-6c2,0.7,4,1.3,6,1.9C191.1,827.7,191.8,824.4,192.8,821.1z"/>
+		<path class="st2" d="M206.1,820.7c3.8,0.1,7.6,0.1,11.3,0c0.2,4.5-0.5,9.1-3.4,12.7c2.3,0.8,4.6,1.5,6.9,2.3
+			c0.2-0.5,0.7-1.5,0.9-2c0.6-1.4,1.2-2.7,1.8-4.1c1.3-0.4,2.6-0.9,4-1.3c0-1.1-0.1-2.2-0.1-3.3c-1.4,0.4-2.7,0.8-4.1,1.2
+			c-1.2,0.1-2.5,0.2-3.7,0.3c0-1.9,0-3.9,0.1-5.8c5.4,0,10.8,0.7,16.2,0c-0.3,1.3-0.5,2.7-0.7,4c2.5,0.3,4.9,0.7,7.4,1.2
+			c0,1,0,2.1,0,3.2c-3.1,0.5-5.1,2.6-6.4,5.3c-0.5,0-1.5,0-2,0c-1.6-0.6-3.2-1.1-4.8-1.5c-0.1,1.1-0.2,2.2-0.2,3.4
+			c1.2,0.1,2.4,0.2,3.6,0.4c2.7,0.6,5.3,1.7,8.1,2.2c2.9-0.6,5.7-1.6,8.7-2.1c0.2,2.1,0.3,4.3,0.5,6.4c1.5-0.1,3.9,0.9,4.2-1.3
+			c0-2.4-2-4.1-2.9-6.2c0.1-2.9,1.8-5.8,0.4-8.5c-0.5-1.7-2.5-1.9-3.8-2.7c-1.8-0.6-2.7-2.4-3.8-3.8c5.3,0.1,10.6,0,16,0
+			c-1.7,1.2-4.2,2-4.7,4.2c0.7,2.4,1.9,4.8,3.6,6.7c1.8,0.5,3-0.8,3.9-2.1c-1.2-1.2-2.3-2.4-3.3-3.7c0.8-1.4,2.4-2,3.8-2.8
+			c-0.1-0.8-0.3-1.6-0.4-2.3c6.2,0.1,12.5-0.1,18.7,0.2c-0.8,0.6-1.6,1.3-2.5,2c-2.3,1.2-4.6,2.4-7.1,3.3c-2.3-0.1-4.5-1.2-6.9-1.1
+			c-0.6,0.8-1.2,1.6-1.7,2.4c2.5,0.3,5.2,0.2,7.7,1.1c0.5,1.5,1,3.9-0.7,4.8c-2.6,1.4-5.6,1.6-8.4,2.2c1.2,3,1.4,6.3,1.3,9.5
+			c-2.3,0.5-4.9,0.2-6.9,1.4c-0.8,1.4-1.3,2.9-2,4.3h-7c0-2.4,0.1-4.8-0.3-7.2c-2-1.7-5.5-2.1-6.9,0.6c-0.4,3.1,3.2,4.7,5.1,6.6
+			h-8.2c0.4-1.3,0.8-2.5,1.2-3.8c-2-1.7-3.4-4.5-6-5.3c-0.4,1.4-0.6,2.9-0.9,4.3c-1.8,0.7-4.2,1.1-4.6,3.4l-0.6,1.3h-18.2
+			c2.2-4.4,5.9-7.6,9.7-10.6c-1.8-1-3.6-2-5.4-3c-2,2.2-4,4.5-6.2,6.6c-0.5,0.4-1.4,1.2-1.8,1.7c-0.4,0.3-1.2,1-1.6,1.4
+			c-0.3,1.3-0.6,2.6-1,4h-7.1c1.6-0.7,3.4-1.3,4.6-2.7c1.1-2.7,1.2-5.7,2.7-8.3c2.1-1.5,4.1-3,6.1-4.5c-1.4-3.3-2.7-6.6-4.1-9.9
+			c1.9,0.1,3.9,0.5,5.8-0.4C208.9,823.4,207.5,822,206.1,820.7z"/>
+		<path class="st2" d="M298.9,820.8c1.2,0,2.4,0,3.6,0c1.4,2.1,3.3,4,5.4,5.5c-1.3,0.9-2.6,3-4.4,2.1
+			C300.4,827.1,299.9,823.5,298.9,820.8z"/>
+		<path class="st2" d="M308.9,820.8c2.4,0,4.8,0,7.2,0c-0.5,0.7-1.1,1.5-1.6,2.2c-1.3,1-2.7,2-4.1,3
+			C309.9,824.3,309.4,822.5,308.9,820.8z"/>
+		<path class="st2" d="M322.6,820.9c3-0.1,6-0.1,9.1-0.1c-0.3,1.7-0.6,3.5-0.7,5.2c0.9,1.7,2.3,3,3.5,4.5c0,1.3,0,2.6,0.1,3.9
+			c3.1,1.8,6.2,3.5,9.6,4.9c-0.3-1.5,0.1-3.2-0.8-4.5c-1.4-0.8-2.9-1.3-4.3-2c-1.4-3-1.4-6.4-1.9-9.6c1.3,0.2,2.5,0.4,3.8,0.7
+			c0.5-1.1,0.9-2.1,1.4-3.1c2.6,0,5.3,0,7.9,0c-1.3,1.5-2.7,3-3.7,4.8c0.2,2.3,1.2,4.4,1.9,6.6c2.2-0.1,4.4-0.3,6.6-0.8
+			c-0.5-2-1.1-4-2.1-5.8c0.2-1.6,0.4-3.2,0.6-4.7c6.3,0,12.6,0,18.9,0c-1.1,1.4-2.3,2.9-3.4,4.3c0.5,0.6,1,1.1,1.5,1.7
+			c1.2,0.7,2.4,1.4,3.6,2.1c0.2-0.8,0.6-2.4,0.8-3.2c2-0.9,4.2-1.1,6.4-1.6c0.1-1.1,0.1-2.2,0.2-3.3c6.6,0,13.2,0,19.7,0
+			c-5.9,3.5-11,8.3-16.7,12.1c1.4,2,4.1,2.2,6.1,3.4c0.5,2-0.5,3.9-1.1,5.7c-1.1-0.4-2.2-0.7-3.3-1.1c-1.6-0.5-3.2-1.1-4.9-1.6
+			c0-3.2,0.2-6.3-0.1-9.5c-1.7-1.3-4-1.7-5.8-0.5c-1.2,3.1-0.1,6.5,0.2,9.7c-0.1,2,1.7,3,3,4.2c0.6,0.7,1.2,1.3,1.8,2
+			c1.7-0.1,3.4-0.2,5.1-0.2c0.2,0.4,0.7,1.1,0.9,1.5c-1.7,0.5-3.4,1-5.2,1.5c0.6,1,1.3,2,2,2.9h-4c-1.3-1.3-2.4-2.9-4.2-3.7
+			c-1.1,1-1.5,2.2-1.4,3.7h-13.2c0.1-0.8,0.2-2.3,0.3-3.1c1-0.8,2-1.6,3-2.4c-0.2-2.7,0.9-6.5-2.1-8.1c-1.9-0.5-3.4,1.2-4.9,2.1
+			c-1.5-0.1-3-0.2-4.6-0.2c0.8,3.7,5.1,4.1,8.1,5.4c-2,2-3.8,4.1-5.6,6.3h-8.3c2.1-1,4.2-2.1,6.3-3.1c-1.1-2.1-2.2-4.2-3.4-6.2
+			c-2.7,1.8-5.4,3.6-7.9,5.5c-1.5-1.6-2.9-3.3-4.2-5c-1.3,3.1,1.2,6,2.3,8.8h-5.1c-1.1-1.1-2.1-2.2-3.1-3.2c0.1-3.9,2-9.6-2.9-11.1
+			c-0.4-2.7-1.1-5.4-3.3-7.2c-1.8,2.2-3.4,4.5-4.9,6.9c-0.5-0.4-1.6-1-2.1-1.4c-0.4-3.1-0.8-6.2-1.4-9.3c0.3-0.7,1-2,1.4-2.7
+			c1,0.7,2,1.5,3,2.2c0.6,0.8,1.2,1.5,1.8,2.3c0.8-0.3,2.5-0.8,3.4-1.1C325,824.5,323.8,822.7,322.6,820.9 M360.4,825.4
+			c0,1.1,0,2.2,0,3.4c1.6,0.6,3.1,1.2,4.8,1.7c2-1,1.3-3.2,1.4-5C364.5,825.4,362.4,825.4,360.4,825.4z"/>
+		<path class="st2" d="M404.3,820.8c196.8,0.1,393.5,0,590.3,0c0.6,2.7,2.2,4.8,5,5.4c0.1-1.8,0.2-3.6,0.4-5.4c2.2,0,4.4,0,6.7,0
+			c1.1,0.9,1.9,2.8,3.6,2.9c2,0.3,2.9-1.8,4.2-2.9c5.9,0,11.9,0,17.8,0c-2.6,1.8-5.2,3.6-7.7,5.5c1,0.7,1.9,2.6,3.4,2.1
+			c2.4-1.4,4.5-3.3,7.3-3.8c1.9,2,0.1,5.1,0.1,7.6c1.5-0.6,3.7-0.7,4.3-2.5c0.8-2.2-1.8-3.5-3-4.9c1.1-1.3,2.3-2.7,3.5-4
+			c20,0.2,40-0.2,60,0.2c0.1,0.6,0.4,1.8,0.6,2.4c0.9,0.6,1.7,1.3,2.6,2c-1.6,3.8-4.7,6.6-6.4,10.3c2.2,1.1,4.4,2.2,6.5,3.3
+			c-0.8-4-1.4-8.2-0.7-12.3c1.3,0.2,2.7,0.4,4.1,0.7c2-2.1,4-4.2,5.8-6.5c9.8,0.1,19.7-0.1,29.5,0.1c-0.1,0.9-0.2,1.8-0.3,2.7
+			c0.6,1.7,2.2,3.4,1.1,5.2c-1.2,3.1-4.4,4.7-7,6.6c-1.9,0.8-1.4,3.1-1.7,4.8c0.9,2.6,2.1,5,3.4,7.5c0.4,0,1.1,0.1,1.5,0.2
+			c0.5-1.5,1.1-3,1.7-4.4c4.5-0.7,3.2,4.8,3.3,7.6h-17.5c-0.6-1.1-1.2-2.1-1.8-3.2c-1.9,0.3-3.1,2-4.5,3.2h-17.6
+			c-1.3-1.6-2.8-3.1-4.3-4.5c-0.3-1.7-0.6-3.3-0.8-5c-1.1,0.2-2.2,0.5-3.2,0.9c-0.9,1.3-0.6,3-0.8,4.4c0,1.4,0,2.8,0,4.2h-50.7
+			c1.5-2.6-3.4-2.6-1.8,0H762.6c-0.7-1.6-1.1-3.2-1.9-4.6c-2.9-1.3-6.4-1.8-9.5-1.1c-2.3,0.9-2.2,3.7-2.7,5.7H496.6
+			c0.4-1.4,0.7-2.8,1-4.2c-1.5-0.2-3.1-0.3-4.6-0.4c-0.2,1.6-0.3,3.1-0.4,4.7h-1.9c-1.1-1.2-1.1-4.9-3.3-3.6
+			c-1.2,0.8-1.4,2.4-2.1,3.6h-62.4c-0.3-0.5-0.8-1.4-1.1-1.8c3-1.6,6.6-3,7.9-6.5c0.8-1.5-0.8-2.9-1.3-4.2
+			c-3.6,2.6-6.8,5.8-10.4,8.4c-1.9,0.4-3.9,0.4-5.8,0.4c-1.2-1.7-1.5-4.9-4.2-4.6c-1.7-0.1-3.3,0-5,0c0.1,1.6,0.2,3.2,0.3,4.8
+			c1.6,0.4,3.2,0.8,4.8,1.1c0.3,0.6,1,1.7,1.3,2.2h-9.7c-1.4-3.7,0.8-7.4,3.3-9.9c1.7-1.4,4.1-1.2,6.1-1.8c-0.5-1.6-1.1-3.1-1.6-4.7
+			c-3.7,2.4-7.6,4.9-10.4,8.3c-0.6,2.8-0.8,5.9-3,8.1h-5.4c2.4-3.7,3.6-7.9,5.9-11.5c2.5-2,5.6-2.9,8.3-4.3c-1.1-2.1-2.2-4.1-3.6-6
+			c0.7-0.5,1.4-0.9,2.1-1.3c0.1-1,0.1-2.1,0.2-3.1c1.1-0.1,2.3-0.2,3.4-0.2C404.8,823.2,404.5,822,404.3,820.8 M440.8,822.2
+			c2.2,1.8,4.8,3.1,7.1,4.7c2-0.9,4.1-1.7,6.1-2.5c-0.5-0.7-0.9-1.3-1.4-2C448.8,821.2,444.7,821.5,440.8,822.2 M938.2,823.4
+			c1.6,0.4,3.1,1,4.4,2c1,0.1,2,0.1,3,0.2c0.4-1.2,0.8-2.3,1.2-3.4C943.9,822.4,941,822.9,938.2,823.4 M1120.2,823.2
+			c-2.8,1.9-0.4,6.1,2.5,5.7C1125.6,827,1122.2,824,1120.2,823.2 M1130.5,829c2.7,3.7,6.1,0,8.4-2.1c-0.3-0.4-0.8-1.3-1-1.7
+			C1135.2,826.1,1132.6,827.1,1130.5,829 M466.3,826.3c1.5,3.9-0.7,8,1.2,11.8c-0.8,1-1.6,1.9-2.4,2.9c0.4,0.1,1.1,0.4,1.4,0.5
+			c2.9-4.2,5-9,5-14.2C470.4,825.6,468,826.6,466.3,826.3 M1000,826.8c0.2,1.5-0.1,3.2,0.7,4.5c2.3,1.1,4.9,1.4,7.4,1.4
+			c1.5,0.4,3.5,0.3,4.2,2c1.2,2.5,4.1,4.5,7,3.7c2.1-0.7,2.1-3.2,2.6-5c-2.6,0-5.2-0.1-7.7-0.1c-0.8-1-1.2-2.2-2.2-2.9
+			c-1.7-0.2-3.3-0.2-5-0.2c-0.8,0.1-1.7,0.2-2.5,0.3C1003.3,828.8,1002,827.2,1000,826.8 M1109,828.2c0.3,2.8,2.9,4.1,4.9,5.7
+			c0-2.3-0.1-4.6-0.2-6.9C1112.1,827.5,1110.5,827.8,1109,828.2 M730.2,828.2c-1.6,2,1.5,5.1,3.1,2.8
+			C733.8,829,731.9,828,730.2,828.2 M937.5,828.4c-0.6,2-0.8,4.1-1.2,6.2c1,0.8,2,1.6,3,2.5c0.1,1.9,0.1,3.8,0.2,5.7
+			c0.3,0.3,0.8,0.8,1.1,1.1c0.2-4.1-1.8-7.8-1.3-11.9C939.3,830.7,939.4,827.8,937.5,828.4 M434.4,832.9c0,2.1,2.1,3,3.6,4.1
+			c0.5-2.4,1-4.9,0.3-7.3C436.4,828.5,434,830.8,434.4,832.9 M489.8,828.7c-1.6,2.2,0.8,5.4,3.3,4.8
+			C495.2,831.3,492.8,827.1,489.8,828.7 M1079.2,829.5c-2.4,0.5-3,3.2-4,5.1c2.4-0.4,5-0.6,7.4-0.1c0-1.4,0-2.8,0.1-4.2
+			C1081.5,830,1080.3,829.6,1079.2,829.5 M1053.1,830.2c-0.4,2-0.6,4.3,0.6,6.1c2.6,0.4,5.3,0.5,8,0.4c1.8-1.2,2-3.5,2.2-5.4
+			C1060.3,831.2,1056.7,831,1053.1,830.2 M747.2,831.2c0.4,1,0.3,2.4,1.1,3.2c1.5,0.1,4.3,0.8,4.3-1.5
+			C752.3,830.5,748.9,831.6,747.2,831.2 M450.3,833.2c0,0.6,0,1.9,0,2.5c1.5,0.1,3,0.2,4.5,0.3c0-0.7,0-2.2,0-2.9
+			C453.2,833.1,451.8,833.2,450.3,833.2 M421.5,835.4c-1,1.1-1.9,2.3-2.6,3.7c1,2.5,3.8,0.7,4-1.3
+			C423.8,836.8,422.8,833.6,421.5,835.4 M771.9,839.8c2-0.1,3.9-0.4,5.8-1c0-0.7,0.1-2.1,0.1-2.8C775,835.6,772.8,837.1,771.9,839.8
+			 M984.3,836.3c-1.4,1.6-0.7,4.7,1.8,4.2C988.3,838.8,987.4,833.8,984.3,836.3 M1116.5,836.3c0,1.1,0,2.2,0,3.3
+			c1.7-0.1,3.4,0,5.1-0.3c0.7-0.7,1.4-1.6,0.5-2.4C1120.4,835.9,1118.3,836.5,1116.5,836.3 M437,841.5c-1.9-0.2-2.5,1.3-2.9,2.9
+			c0.4,0.1,1.1,0.2,1.5,0.3c1.3,0.8,2.7,1,4.2,1.2c0.8-2.9,1.5-5.8,2.1-8.7C439,837,438.1,839.5,437,841.5 M515.2,837.1
+			c-0.2,2.1,1.7,3.5,2.7,5c1.1-1.6,1.4-3.5,1.2-5.4C517.8,836.6,516.4,836.7,515.2,837.1 M1034.2,838.2c-1.4,1,0.1,3.6,1.6,2.5
+			C1037.1,839.7,1035.6,837,1034.2,838.2 M490.1,840.1c0.5,1.3,0.1,3.6,2,3.7c1.3,0.3,2.4-0.7,2.7-1.9
+			C494.3,839.8,491.8,840.3,490.1,840.1 M1110.1,840.2c0.5,2.4,1.7,4.5,2.4,6.9c2,0,4.9,0.7,5.6-2
+			C1116.4,842.6,1113.5,838.6,1110.1,840.2 M455.4,842.4c-0.5,2.7,2.6,3.4,4.4,4.5c1.6-1.4,2.3-3.3,1.8-5.5
+			C459.6,841.7,456.6,840.1,455.4,842.4 M1022.2,845.7c1.6,0,3.3-0.1,4.8-0.8c-0.4-1.7-0.6-4.3-3-3.7
+			C1021.7,841.3,1022.2,844.1,1022.2,845.7 M1058.5,840.8c1.1,2,3,4.8,5.7,4.4C1064.6,842.4,1061.1,840.1,1058.5,840.8 M1080,841
+			c-1.2,1.2-0.2,2.9-0.1,4.4c1.9,0.1,3.6-0.9,4.7-2.4C1083.3,841.8,1082,839.8,1080,841 M551.5,842.5c-0.7,1.2-0.2,3.4,1.5,3.2
+			c1.9,0.5,2.4-1.4,3.1-2.7C554.7,842.7,553.1,841.9,551.5,842.5 M1067.3,841.9c-1.7,1.9-2.8,4.2-3.3,6.8c1.8-0.3,4.2,0.6,5.7-0.9
+			C1069.7,845.5,1068.6,843.6,1067.3,841.9 M472.3,844.4c-2.6,2.3,3.7,4.6,3.9,1.5C477,843.6,473.4,842.8,472.3,844.4 M877.2,845.1
+			c-1,2.8,6.4,4.7,6.1,0.9C882.4,843.7,879,844.5,877.2,845.1 M1028.2,845.3c-1.7,0.2-2,3.3-0.2,3.6
+			C1029.6,848.7,1030,845.6,1028.2,845.3z"/>
+		<path class="st2" d="M1142.5,820.8c3.2,0,6.3-0.1,9.5-0.1c0.6,0.7,1.3,1.4,1.9,2.1c-2.7,0.6-5.4,1.3-8.1,1.5
+			C1144.6,823.3,1143.6,822,1142.5,820.8z"/>
+		<path class="st2" d="M1198.1,820.8c0.8,0,2.3,0,3.1,0c-0.7,1.1-1.3,2.1-1.9,3.2c0.1,0.5,0.4,1.6,0.5,2.1c-1.4,2.1-2.7,4.3-4.1,6.4
+			c-1.6-2.7-3.2-5.4-4.2-8.4c1.4-0.1,2.9-0.1,4.4-0.1C1196.7,823,1197.4,821.9,1198.1,820.8z"/>
+		<path class="st2" d="M1204.3,820.7c1.2,0,2.4,0,3.6,0c0.2,1.3,0.4,2.5,0.6,3.8c1.8,1.9,3.6,3.8,5.2,5.8c-0.4,0.7-1.3,2.2-1.8,2.9
+			c-1.5-1.2-3-2.6-4.7-3.5c-2-0.2-4.1,0.2-6.1,0.5c0.3-1.1,0.7-2.2,1-3.2c-0.3-0.8-0.5-1.6-0.8-2.4c1-0.4,2.1-0.7,3.1-1.1
+			C1204.5,822.6,1204.4,821.7,1204.3,820.7z"/>
+		<path class="st2" d="M1236.6,820.8c3,0,5.9,0.1,8.9,0.2c0,0.4,0,1.3,0,1.7c-1.2,2.4-3.8,2.7-6,3.2
+			C1238.5,824.2,1237.5,822.5,1236.6,820.8z"/>
+		<path class="st2" d="M1260.2,821.3c2.2-0.3,4.4-0.5,6.7-0.7c-0.9,2-1.8,4-2.5,6.1c-1.2-0.8-2.5-1.6-3.6-2.5
+			C1260.7,823.5,1260.4,822,1260.2,821.3z"/>
+		<path class="st2" d="M1270.8,821.1c3.9-0.6,8-0.4,11.8,1.1c-1,0.1-2.9,0.2-3.9,0.3c-0.1,0.6-0.4,1.7-0.5,2.3
+			c-0.7,2-2.3,3.4-3.9,4.8c0.1,0.5,0.4,1.6,0.6,2.1l-0.3,0.3c-0.4,0.3-1.1,0.9-1.5,1.2c-0.4-0.3-1.1-1-1.4-1.4
+			c-0.3-0.6-0.8-1.9-1-2.5c-1.1-1.3-2.4-2.6-2.4-4.4c1.9,1,3.5,2.5,5.2,3.8C1275.5,826,1272,823.4,1270.8,821.1z"/>
+		<path class="st2" d="M1284.1,820.9c2.9-0.1,5.8-0.2,8.7,0c1.4,1.9,2.9,3.8,4.3,5.7c-0.6,0.3-1.8,1-2.3,1.4
+			c0.7,0.8,1.4,1.5,2.2,2.3c-0.3,0.4-0.8,1.3-1.1,1.8c-0.6,0.1-1.9,0.4-2.5,0.6c1.1,1.8,2.4,3.6,2.4,5.7c-1.5-0.1-3-0.2-4.5-0.2
+			c0.2-1.3,0.4-2.6,0.7-3.8l0.5-0.7c-1.5,0-2.9,0-4.4,0c-0.3-0.5-1-1.4-1.3-1.8c1.8-1.8,5-3.1,4.3-6.1c-2-0.4-4-0.8-6-1.2
+			C1284.8,823.3,1284.5,822.1,1284.1,820.9z"/>
+		<path class="st2" d="M1299.6,821.1c1.6,0,3.2-0.1,4.9-0.1c-0.7,2.4-2.4,3.9-4.9,3.6C1299.6,823.5,1299.6,822.3,1299.6,821.1z"/>
+		<path class="st2" d="M1308.4,820.9c0.7,0,2.2-0.1,2.9-0.1c0.3,1.4,0.6,2.8,0.8,4.3c-0.9,1.2-2.1,2-3.3,2.9
+			c-0.6,0.2-1.8,0.6-2.4,0.8c-0.1-0.8-0.3-2.3-0.4-3C1306.8,824.1,1307.6,822.5,1308.4,820.9z"/>
+		<path class="st2" d="M1325.4,820.8c1.1,0,2.3,0.1,3.5,0.2l0.2,0.2c-0.7,0.5-2.1,1.4-2.8,1.9c-0.8,1.1-1.5,2.3-2.2,3.5
+			c-2.3,0.2-4.6,0.5-6.9,0.3c0-0.4,0.1-1.1,0.2-1.5C1319.9,823.6,1322.8,822.4,1325.4,820.8z"/>
+		<path class="st2" d="M1343.4,821.1c1.5,0.1,3.1,0.1,4.7,0.1c0.4,1.1,0.8,2.3,1.3,3.4c1.5,0.6,3.1,1,4.6,1.4
+			c-0.7,1.3-1.7,2.3-2.7,3.3c-1-0.7-1.8-1.4-2.8-2.1c-0.1,1.1-0.2,2.1-0.2,3.2c-1.7,0.2-3.7-0.2-4.9,1.3c1.1,1.7,2.6,3.1,4.1,4.5
+			c0-1.3,0.1-2.5,0.2-3.8c2.4-0.2,5-0.4,7.2-1.8c3.3-1.8,1.5-6.4,2.1-9.4c1.5-0.1,3-0.1,4.5-0.1c0.1,1.1,0.2,2.1,0.4,3.2
+			c1.1-0.8,1.7-1.9,2.2-3.1c3.5-0.5,7.1-0.5,10.7-0.4c1.3,0.9,2.6,1.8,3.9,2.8c-1,0.9-1.9,1.8-2.9,2.7c-1.2,0-2.3,0-3.4,0.1
+			c0.1,0.4,0.2,1.2,0.2,1.5c1,0.7,2.8,0.9,2.9,2.4c0.4,2.7-0.6,5.3-1.4,7.9c-1.1,3.2-1.7,6.5-2.8,9.7l-0.9,1.2
+			c-0.4,0.2-1.1,0.6-1.5,0.8c-0.9-0.8-1.8-1.7-2.7-2.5c0.2-1.1,0.4-2.1,0.7-3.2c-0.8,0-2.3,0.1-3.1,0.1c0.3,2.3,0.6,4.5,1.1,6.8
+			h-2.5c-0.8-1.4-1.4-2.8-2.1-4.3c-0.6,1.4-1.2,2.9-1.8,4.3h-3.4c1.3-2.3,2.5-4.8,3.7-7.1c1.4-0.1,2.8-0.2,4.2-0.3
+			c0.6-1.1,1.3-2.2,2-3.3c0.7,0.7,2.1,2,2.8,2.6c0.3,0.3,1,1,1.4,1.3c0.7-3.8,1.2-7.7,2.3-11.3c-4.6,0.3-4.6,6-8.6,7.4
+			c-0.6,0.2-2,0.6-2.6,0.8c-0.4,0.2-1.2,0.7-1.6,1c-2.4,0.3-4.7,0.6-7.1,1c-0.4-0.2-1.1-0.7-1.5-0.9c-1.3-0.8-2.8-1.4-4.3-1.7
+			l-0.8,0.9c-0.2,1.8-0.2,3.7-0.2,5.5c0.5,0.2,1.5,0.6,2,0.8c1.4-0.8,2.8-1.7,4.2-2.5c1.5,1.7,2.8,3.6,2.2,5.9h-10
+			c-1.1-1.3-2.2-2.7-3.3-4c1-1.4,2-2.8,3-4.1c0.1-0.8,0.4-2.4,0.6-3.2c0.3-1.3,0.6-2.5,0.9-3.8c-0.7-0.4-2-1.2-2.7-1.5
+			c-1.4,0.5-2.8,1-4.2,1.5c-0.1-0.3-0.4-1-0.6-1.3c3.4-2.4,7.7-4.8,8.8-9.1c-0.6-0.3-1.8-1-2.5-1.3
+			C1343.5,823.2,1343.4,822.1,1343.4,821.1 M1367.3,826.7c-0.7,2-2,4.4-0.3,6.2C1370.1,832.1,1369.2,828.3,1367.3,826.7 M1359.3,830
+			c-0.4,3.2-4.2,6.6-1.5,9.5c2.5,0.2,2.1-3.2,2.8-4.7c0.1-1.9,1.9-5-0.8-5.7L1359.3,830 M1348.1,838.2c1.7,0.5,3.4,1.2,5.1,1.9
+			c3.3-0.3,0.1-3.8-1-5C1350.8,836.1,1349.5,837.2,1348.1,838.2z"/>
+		<path class="st2" d="M1378.8,820.9c4.6,0,9.2-0.1,13.9-0.1c0.1,2,0.2,4.1,0.3,6.1c0.1-2,0.2-4.1,0.3-6.1c4.5,0,9,0,13.5,0
+			c0,1.2,0,2.4,0,3.6c0.6,0.4,1.1,0.8,1.8,1.3c-0.4-0.3-1-0.9-1.4-1.2c0-0.9,0-2.8,0-3.7c19.4,0,38.7,0.1,58.1,0
+			c0.5,2.1,1,4.2,1.5,6.3c1.5-1.1,2.9-2.1,4.4-3.2c-0.8-1-1.5-2.1-2.3-3.1c5.1,0.2,10.3,0.7,15.4-0.2c-0.6,1.3-1.2,2.6-1.8,3.9
+			l2.6-1c0.1,1.5,0.2,3,0.3,4.5c0.1-2.4,0.2-4.7,0.3-7.1c2.2,0,4.5,0,6.8,0c2.5,2.1,5.3,4.3,8.8,3.8c1.1,0,2.2,0.1,3.3,0.1
+			c0.1-1.3,0.2-2.7,0.3-4c8.3,0,16.7,0,25.1,0c0.2,0.6,0.7,1.7,0.9,2.3c-1,0.7-2,1.5-2.9,2.2c0.2,1.7,0.4,3.4,0.6,5.1
+			c-1.6,0.7-3.1,1.4-4.6,2.2c-0.8,1.4-1.6,4,1,3.9c0.4-0.3,1.2-1.1,1.7-1.4c0.9-1,1.7-2.1,2.6-3.2c1.6,0.7,3.2,1.5,4.8,2.2
+			c-0.1,2.9-3.1,3.8-5,5.3c2.8,0.6,5.6,1.2,8.4,1.7c-0.8,1.5-1.8,2.8-3,4c-1.6,1.5-3.1,3.1-4.5,4.8c1.5-0.7,3.1-1.5,4.6-2.2
+			c1,1.1,2,2.3,3.1,3.5h-12.4c0.4-1,0.8-2,1.2-3c-1.4-0.1-2.7-0.1-4-0.2c-0.1,0.8-0.4,2.4-0.6,3.2h-3.6c-0.6-0.8-1.2-1.5-1.8-2.3
+			c-2.7,0.6-5.5,0.6-7.8,2.3h-2.9c-1.8-1.4-3.5-2.8-5.3-4.1c-0.5-0.1-1.5-0.3-2.1-0.3c-1.3-1.2-2.6-2.5-3.9-3.7
+			c-0.2-2.5,0.3-5.2-0.6-7.5c-1.5-0.6-3.1-0.5-4.6-0.7c-0.3,1.9-0.6,3.7-0.9,5.6c-0.8-0.8-1.6-1.7-2.3-2.5c-0.3-0.4-0.9-1.2-1.2-1.6
+			c1.2-1.2,2.5-2.5,3.4-3.9c-2.9-2.5-6.2,0.6-8.9,1.9c0.3,0.9,0.6,1.7,0.9,2.6c3.3,1.4,3.3,4.8,3.2,7.9c0.4-0.1,1.2-0.4,1.5-0.6
+			c0.6,0,1.9-0.1,2.6-0.1c1.8,0.6,3.5,1.2,5.3,1.9c-1.1,1.5-2.3,3-3.3,4.5l-0.3,0.7h-4.9c0.6-1,1.2-2,1.7-3
+			c-2.3-0.3-4.5-0.7-6.8-0.9c0.2,1.3,0.5,2.6,0.8,3.9h-30.5l0.4-1c1.3-3.3,2.9-6.5,5-9.4c3.1,2.8,6.2,6,10.5,6.6
+			c-0.3-1.2-0.7-2.3-1.2-3.4c-1.8-0.8-3.7-1.2-5.5-1.7c-1.6-2-3-4.2-5.1-5.7c-2-0.8-4.3-1.1-6.4-1.6c0,0.7,0,2,0,2.7
+			c2.5-0.3,4.9,0.2,6.5,2.2c-1.6,2.3-3.4,4.4-5.2,6.6c-0.8,1.5-1.3,3.1-1.9,4.6h-16.1c-0.1-0.8-0.4-2.4-0.6-3.2
+			c-1.6,1.1-3.1,2.1-4.7,3.2h-0.9c0.9-2,1.3-4.3,2.7-6c1.9-0.8,3.9-1,5.9-1.3c0.5,0.4,1.4,1.3,1.9,1.7c2.8-1.8,5.8-3.2,8.6-5.1
+			c0.1-0.5,0.3-1.5,0.4-1.9c-3.4-0.7-6.5,1.2-9.5,2.3c-1.6-2.4-2.1-5.2-1.1-8c0.7-1.4-0.9-2.1-1.6-3c-0.1,2.4,0.1,4.8-0.3,7.2
+			c-0.6,2.1-2.5,3.4-4.2,4.6c-1.6,0.8-3.2,1.4-4.7,2.1c-0.6,2-1.2,3.9-1.8,5.9c-2.2,0.3-4.3,0.8-6.3,1.4h-6.4
+			c-1.9-1.4-3.9-2.7-6.1-3.5c0.3,1.2,0.7,2.3,1.2,3.5h-27.4c-0.1-1.2-0.2-2.4-0.2-3.6c0.7-2.5,2-4.8,3.1-7.1
+			c1.1-4.4,2.2-8.7,3.2-13.1c0.3-1.6,0.8-3.1,1-4.7C1381.3,821.9,1380,821.3,1378.8,820.9 M1399.1,822.1c-0.3,2.7-0.4,5.4-0.2,8.1
+			c0.8-0.7,1.6-1.3,2.5-2c-0.3-0.9-0.6-1.8-0.8-2.8c0.6-1.2,1.2-2.3,1.8-3.4C1401.6,822,1400,822.1,1399.1,822.1 M1430,821.9
+			c-1.8,1.8,0.9,3.9,2.7,3.8c1.3-0.9,1-2.5,1.4-3.8C1432.7,821.9,1431.3,821.9,1430,821.9 M1451,822.9c1.5,2.1,2.3,5.1,4.8,6.1
+			C1458.5,826.4,1454.3,820.5,1451,822.9 M1421.2,826.9c1.7,0,4,0.3,4.5-2c-1.3-0.8-2.6-1.3-4-1.6
+			C1421.5,824.5,1421.3,825.7,1421.2,826.9 M1435.4,824.4l-0.7,0.4c0.1,3.3,5.8,2.5,4.2-0.6C1437.6,823.8,1436.5,823.9,1435.4,824.4
+			 M1447.2,824.3c0.3,1.8,0.7,3.7,1,5.5c0.5-0.8,1-1.6,1.5-2.3c-0.1-0.7-0.4-2.2-0.5-2.9C1448.8,824.5,1447.8,824.4,1447.2,824.3
+			 M1472.8,824.1c0.7,1.7,2.2,2.8,3.6,4c-0.4,2.2-3.1,3.5-3.2,5.8c-0.3,1.5,0.3,3.3-0.6,4.6c-2,1.1-4.1,1.7-6.1,2.6
+			c0.5,0.9,1.1,1.8,1.8,2.6c-0.1,0.9-0.2,2.7-0.3,3.6c2.2,0.2,3.7-1.6,5.2-2.9c1.4,0.6,2.8,1.3,4.2,1.9c0.9-1.5,1.9-2.9,2.6-4.5
+			c-0.3-1.2-0.6-3.3-2.2-2.5c-1.1,1.9-2.3,3.8-4.4,4.8c-0.8-0.8-1.6-1.7-2.3-2.5c1-1.2,2.1-2.3,3.4-3.2c0.3-1.3,0.6-2.7,1-4
+			c1.2-0.5,2.5-1,3.7-1.5c-0.6-1.2-1.2-2.3-1.8-3.4c0.7-0.2,2.2-0.6,2.9-0.9C1480.3,824.6,1475.8,824,1472.8,824.1 M1518,827.2
+			c-0.5,0.3-1.4,1-1.8,1.4c-0.5,2.5,1.5,3.1,3.6,2.4c-0.2-1-0.5-2.1-0.7-3.1c1.1-0.8,4.5-1.8,2.6-3.5
+			C1519.4,822.6,1518.2,825.2,1518,827.2 M1385.3,833.6c2.8,0.6,3-2.4,3.6-4.2C1387.6,830.6,1382.7,831.2,1385.3,833.6
+			 M1392.3,830.8c1.2,0.4,2.5,0.5,3.8,0.2c0.4-2.3-2.2-2.1-3.6-2.7C1392.5,828.9,1392.4,830.2,1392.3,830.8 M1441,829.2
+			c-0.3,1.9-0.4,3.9-0.5,5.9c1.8-0.5,3.7-1,5.5-1.5C1444.9,831.5,1442.9,830.3,1441,829.2 M1465.6,835.1c0.9,1.1,2.7,1.4,3.9,0.5
+			c0.2-2.2,0.1-4.4,0.2-6.6C1467.3,830.1,1465.8,832.5,1465.6,835.1 M1490.7,832.6l1.9-0.7c0,0.4,0,1.2,0,1.6c0.8-0.6,1.6-1.3,2.4-2
+			l0.7-0.1c0-0.7-0.1-2-0.1-2.6C1493.5,829.5,1492.2,831.2,1490.7,832.6 M1410,839.1c0.3-1.5,0.5-3.1,0.8-4.6c-1-0.5-2-1-3-1.5
+			c-0.1-0.8-0.4-2.3-0.6-3C1404.8,833.1,1407,837.2,1410,839.1 M1422,831.2c0.2,2.8,2,4.9,4.5,6c-0.3-2.4-0.6-4.8-0.8-7.2
+			C1424.5,830.4,1423.2,830.8,1422,831.2 M1502.9,830.9c-1.3,2.3,2.2,4.4,3.7,2.2C1506.7,830.9,1504.6,830.7,1502.9,830.9
+			 M1510,830.9c-1.5,2.4,1.1,3.1,3,3.3c0-0.8,0-2.5,0-3.4C1512.2,830.9,1510.7,830.9,1510,830.9 M1436.1,833.4
+			c-1.5,1,0.1,3.5,1.6,2.4C1439.2,834.7,1437.5,832.2,1436.1,833.4 M1497.5,834.3c0.4,1.2-0.8,4.7,1.5,4.4c1.6,0.1,2.5-1.4,2.5-2.9
+			C1500.5,834.7,1499.2,834.1,1497.5,834.3 M1518.4,839.5c-1.7,1.5-3.6,6.6,0.4,5.6c1.2-3.3,3.2-7,1-10.4
+			C1518.3,836,1518.4,837.8,1518.4,839.5 M1395.8,836.1c-1.4,2.7,2.1,2.9,3.7,3.8c0.3-1.6,0.4-3.2,0.1-4.8
+			C1398.6,835.3,1396.7,835.8,1395.8,836.1 M1387.4,838.3c-1.6,1.2-3.3,2.5-4.9,3.7c0.1,0.8,0.4,2.4,0.5,3.2c2.3-1.8,4.3-3.8,6.1-6
+			C1388.7,838.9,1387.8,838.5,1387.4,838.3 M1414.9,839.2c1.5,1.3,3.2,2.5,5.2,3.2c-0.6-1.8-1.2-3.5-1.9-5.1
+			C1417.1,837.8,1416,838.5,1414.9,839.2 M1421.5,838.9c-0.1,2,1.5,1.9,3,1.7c0.1-0.7,0.2-2.1,0.3-2.7
+			C1423.5,837.8,1422.4,838.2,1421.5,838.9 M1500.3,841.1c0,1.3,0,2.5,0.1,3.8c2,0.5,4.1,0.7,6.2,0.8c0-0.6,0.1-1.8,0.1-2.5
+			C1504.7,842.4,1502.6,841.7,1500.3,841.1 M1508.6,843.1c1.5,1.8,3,3.9,5.6,4.1c-0.6-2.4-1.7-4.7-3.1-6.7
+			C1510.2,841.3,1509.4,842.2,1508.6,843.1 M1404.6,843.2c-1.1,1.5,1.5,2.9,2.6,1.6C1408.3,843.2,1405.6,841.8,1404.6,843.2
+			 M1436,848.8c2.2-0.4,4.4-0.9,6.7-1.3c0-0.5-0.1-1.6-0.1-2.2C1439.8,843.6,1437.7,847,1436,848.8z"/>
+		<path class="st2" d="M1532.8,820.8c6.9,0,13.8,0,20.7,0c0.1,1.1-0.4,2.5,0.3,3.4c2.7,1.5,5.8,0.3,8.6-0.1c0.1,0.4,0.2,1.3,0.2,1.7
+			l-0.5,0.2c-4.1,0.6-8.5,2.5-12.5,0.5c-2.2-0.9-3.9-2.5-5.5-4.1c-1.8-0.1-3.3,0.9-4.6,2c-0.6-0.2-1.7-0.5-2.3-0.7
+			C1535.8,822.7,1534.3,821.7,1532.8,820.8z"/>
+		<path class="st2" d="M1584.4,821.1c5.8-0.4,11.7-0.6,17.4,0.4c-0.7,0.3-2.1,0.9-2.7,1.2c1.6,1.9,3.4,3.5,5.4,4.9
+			c-0.2,0.9-0.7,2.7-0.9,3.6c-1-0.8-1.9-1.7-2.8-2.5c-1.3-1.2-2.7-2.4-4-3.6c-1,0-2,0.1-3,0.1c-2-2.3-4.9-2.9-7.8-3.2
+			C1585.6,821.8,1584.8,821.3,1584.4,821.1z"/>
+		<path class="st2" d="M1609.4,821c2.4,0.1,4.9,0.5,7.3,1.2c0,1.2,0,2.4,0,3.6c0.3,0.4,1.1,1.1,1.4,1.5c-0.2,0.6-0.7,1.9-0.9,2.5
+			c-1.9-1.4-3.3-3.4-5-5C1611,823.7,1610.1,822.3,1609.4,821z"/>
+		<path class="st2" d="M41.8,822.8c1.9-1.1,4.2-0.2,6,0.7c-1.4,3.5-5.9,3.1-9,3.4c-0.1,2-0.1,4.1-0.2,6.1c-1.8-0.6-3.6-1.3-5.4-1.6
+			c-1.9,0.5-3.2,2.1-4.7,3.2c-1.7-0.3-3.5-0.6-5.2-1c0-1.4,0-2.8,0.1-4.1c2.3-0.1,4.8,0.1,7-1.2c2.3-1.4,5.1-1,7.7-1.4
+			C39.4,825.6,40.2,823.8,41.8,822.8z"/>
+		<path class="st2" d="M1663.2,823.9c0.6-0.9,1.2-1.8,1.8-2.6c0.8,0.3,2.3,0.8,3.1,1.1c-0.5,1.1-0.9,2.3-1.4,3.4
+			c-1.1,1.7-2.3,3.3-3.2,5.1c0.7,1.7,1.6,3.3,2.5,4.9c1.5-0.1,3-0.2,4.6-0.3c1.2,1.5,2.4,2.9,3.7,4.3c-0.2,0.5-0.3,1-0.4,1.6
+			c-0.3,1.3-0.5,2.7-0.6,4.1c-0.6,0.4-1.7,1.1-2.2,1.5c-1.3-1.5-2.4-3.2-3.6-4.8c-1.1-0.5-2.1-1-3.2-1.4c0.5-1.4,0.9-2.9,1.4-4.3
+			c-1.2-0.9-2.3-1.7-3.4-2.6c-0.4-0.3-1.3-1-1.8-1.3c-0.2-1.2-0.3-2.5-0.4-3.7l0.7,0c0.6,0,1.9,0.1,2.5,0.1
+			C1663.3,827.5,1663.2,825.7,1663.2,823.9z"/>
+		<path class="st2" d="M1165.2,823.8c0.6,0,1.8-0.1,2.5-0.1c1.9,1.4,3.8,2.8,5.8,4.2c-1.9,2-3.7,4.1-4.6,6.8c2.5,0,5,0,7.6-0.1
+			c0.1-1.6,0.1-3.3,0.3-4.9l1.1-1.3c0.7,1.1,1.4,2.2,2.1,3.3c2.1,0.6,4.9,0.2,6.2,2.4c0.5,2.5-2,3.8-3.3,5.4l-1.1,0
+			c-1.1,0.4-2.1,0.9-3.2,1.4c-1-1.4-1.9-2.7-2.8-4c-0.8,1.3-1.5,2.6-2.2,3.9c-0.2,1.3-0.3,2.7-0.2,4.1c1.1,1.2,2.8,0.5,4.1,0.3
+			c1.2-0.7,2.3-1.4,3.5-2c1.9,0.5,3.6,1.5,5.4,2.4c1.2-1.5,2.5-3.1,3.7-4.6c1.2,0.1,2.4,0.4,3.6,0.1c1.5-1.4,2.8-3.2,4.1-4.8
+			c1.2,1.1,2.5,2.1,3.8,3.2c0,1.3,0,2.6-0.1,4c-1.5,1.1-3,2.2-4.3,3.5c-0.1,2.1,2.3,3,3.7,4.1h-11c1.4-2.1,5.3-3.7,4.4-6.5
+			c-2.8-0.4-5.3,1.4-7.8,2.3c-0.2,1.4-0.4,2.8-0.6,4.2h-8.3c-2.1-1-4.3-1.8-6.5-2.5c-1.5-1.5-2.6-3.5-4.7-4.3
+			c-1.2,2.2-1.9,4.5-2.9,6.8h-17.3c0.8-2.2,1.4-4.4,2.3-6.5c1.9-0.4,3.6,0.8,5.3,1.3c1.4-1,2.9-2,4.3-2.9c2,0.1,3.9,0.2,5.9,0.2
+			c0.3-0.1,1.1-0.3,1.4-0.4c0.4-1.7,0.7-3.4,1-5.1c-2.7-0.6-5.5-1-8.2-1.3c-2-2.2-4.2-4.3-7-5.4c0,1.9,0,3.9,0,5.8
+			c-1.7-0.3-3.6-1.8-5.2-0.5c-2.1,1.4-3.7,3.4-5.3,5.2c-0.7-0.8-1.4-1.7-2.1-2.5l-0.1-0.9c3.1-3,6.8-5.4,9.8-8.6
+			c1.3-1.2,2.5-2.9,4.5-2.9c4.2,1.9,7.1,6.2,12,6.4c-0.4-1.8-0.8-3.6-1.2-5.4c0.4-1,0.8-2,1.2-3C1165,824.3,1165.1,824,1165.2,823.8
+			z"/>
+		<path class="st2" d="M1225.5,823.4c1.8,0.2,3.7,0.3,5.5,0.4c0.9,1.7,1.4,3.9,3.3,4.9c2.2,0.7,4.6,1,6.8,1.8
+			c-0.4,1.1-0.8,2.3-1.2,3.5c-1.7,0.4-3.3,1-4.9,1.7c-0.1,0.5-0.4,1.5-0.6,2c-0.6,0.7-1.2,1.4-1.7,2.2c-0.3-4.1-1.8-8-3.5-11.6
+			c-0.7,0.6-2,1.7-2.7,2.2c-0.4,1.1-0.7,2.3-1,3.4c-1.1-0.1-2.2-0.2-3.2-0.3c-1.4,3.2-2.5,6.5-3.3,9.8c2.8-0.3,4.2-2.7,5.8-4.6
+			c0.2,3-0.9,5.8-2.8,8c-4.4-1-9.1,0.4-11.6,4.3h-5.3c0.5-0.8,1.1-1.5,1.6-2.2c-0.2-1.3-0.5-2.6-0.6-3.8c2.8-3.3,5.4-6.8,8.1-10.2
+			c0.3-0.3,1-0.8,1.4-1.1c0.2-1.1,0.5-2.2,0.8-3.2c0.4,0.1,1.3,0.4,1.7,0.5c1.5,0.4,3.1,1,4.8,0.6
+			C1224.2,829.1,1224.6,826.1,1225.5,823.4 M1216,842.2c3.2-0.3,1.9-3.3,1-5.2C1216,838.5,1215.9,840.4,1216,842.2z"/>
+		<path class="st2" d="M1690.1,825.8c2.2-0.8,4.4-1.3,6.7-1.6c-0.1,0.8-0.3,2.3-0.4,3.1c-0.8,0.7-1.7,1.5-2.4,2.2
+			c-0.5,0.4-1.4,1.2-1.9,1.5C1690.9,829.5,1690,827.8,1690.1,825.8z"/>
+		<path class="st2" d="M1711,824c2.5,0.1,5.3,1.5,5,4.5c-1.3,0.4-2.6,0.7-3.8,1.1C1711.6,827.8,1711.2,825.9,1711,824z"/>
+		<path class="st2" d="M1725.3,829.5c1.1-1.9,2-3.9,2.9-5.9c0.1,1.3,0.2,2.6,0.3,3.9c1.4-0.1,2.9-0.3,4.4-0.4v8.5l-0.1-0.9
+			c-0.6-1.4,0.1-3.8-1.7-4.3c-3-0.9-3.2,2.7-4.2,4.6c-1-0.4-1.9-0.8-2.9-1.2c-0.4-0.5-1.1-1.6-1.4-2.2
+			C1723.6,831.1,1724.5,830.3,1725.3,829.5z"/>
+		<path class="st2" d="M1282.4,824.4l1.1-0.2c0.7,0.9,1.4,1.9,2.1,2.9c0.1,0.7,0.3,2,0.4,2.7c-2.6,0.3-4.9-0.1-5.8-2.9
+			C1280.9,826,1281.6,825.2,1282.4,824.4z"/>
+		<path class="st2" d="M1533.1,825.2c0.3,0.1,0.9,0.4,1.2,0.5c3.5,1.4,6.7,3.4,10.2,4.8c2.8-0.4,5.3-1.8,8-2.5
+			c0.7,1.4,1.4,2.9,2.1,4.3c-1.1,0.7-2.2,1.4-3.2,2.2c0,0.6,0,1.7,0,2.3c0.9,0.3,1.9,0.6,2.9,1c0.6-0.9,1.2-1.7,1.8-2.5
+			c4-1.8,8.3-2.9,12.7-3.1c-1.2,1.3-2.5,2.6-3.6,4c-0.7,0.1-2.1,0.2-2.8,0.3c-1.5,1.1-3,2.2-4.5,3.3c-0.2,1.7-0.3,3.4-0.4,5.2
+			c1.8-0.2,3.8,0.1,5.5-1c1.6-0.8,3.1-2.5,5.1-1.7c0.2,0.7,0.5,2.1,0.6,2.8c-1.4,0.2-2.8,0.4-4.1,0.7c-0.5,1.8-1,3.6-1.4,5.4h-15.8
+			c-0.5-1.1-0.9-2.2-1.4-3.2c-0.8,0-2.4,0.1-3.3,0.1c0.4,1,0.8,2.1,1.2,3.1h-6.2c2.1-2.4,4.4-4.7,6.5-7.3c-0.1-2.4-3.2-0.6-4.6-1
+			c0-0.4,0-1.3,0.1-1.7c1.2-1,2.4-2,3.7-3c0.3,0.7,1,2,1.4,2.7c1.2-0.1,2.5-0.2,3.8-0.3c-0.1-1.7-0.2-3.4-0.3-5
+			c-1.1,0.9-2.2,1.9-3.3,2.8c-0.8-1.3-1.6-2.6-2.3-3.9c-0.4,0.4-1.2,1.3-1.6,1.8c-1,1.1-1.9,2.2-2.7,3.4c-0.8-0.8-1.6-1.6-2.3-2.4
+			c0.8-1.6,1.8-3.2,2.3-5c-0.6-0.9-1.2-1.9-1.8-2.7c-0.7,0.5-2.2,1.4-2.9,1.8c-0.1-0.4-0.1-1.2-0.2-1.6c0-0.7-0.1-2.1-0.2-2.8
+			C1533.2,826.4,1533.1,825.6,1533.1,825.2 M1549.8,846.8c1.7,0.5,3.3,1,5.1,1.2c1.2-1,2.5-2.4,0.2-3.1
+			C1553,844.3,1550.8,844.9,1549.8,846.8z"/>
+		<path class="st2" d="M1631.7,835.1c-2.7-3-0.9-7.7,2.3-9.2c1.7,0,3.4,0.4,5.1,0.8c-1.5,1.4-3.7,1.6-5.6,2.2
+			c-0.4,1.7-0.7,3.5-1,5.2c2.4,0.1,4.8,0.2,7.2,0.2c-1.1,0.6-2.2,1.1-3.2,1.7c-0.4,0.2-1.3,0.7-1.8,1c1.4,1.3,2.8,2.5,4.3,3.7
+			c2.7,0.3,5.3-0.7,7.8-1.8c0.6,0.5,1.3,1.1,2,1.6c1.7,0.1,3.4,0.1,5,0.5c-0.2,0.6-0.5,1.8-0.6,2.4c-3.2,0.2-6.4,0.2-9.6,0.2
+			c-1.6,2.2-3.6,4.4-3.3,7.3h-5.6c1.6-1.6,2.8-3.5,3.9-5.5c-1.1,0-2.1,0-3.1,0c-0.6-2.2,1-6.9-2.7-5.8c-0.7,2.4-0.9,4.9-1.2,7.4
+			c-0.9,0.3-1.8,0.5-2.7,0.8c-0.1-3.2,0-6.6,2.3-9.1C1631.4,837.5,1631.5,836.3,1631.7,835.1z"/>
+		<path class="st2" d="M60.3,827.2c1.7,0.1,3.6-0.1,4.6,1.5c-0.1,0.5-0.3,1.5-0.5,2l-0.2,0.8l-0.6,0c-0.6,0-1.8,0-2.3,0
+			C61,830.2,60.7,828.7,60.3,827.2z"/>
+		<path class="st2" d="M51.6,828.1c2-0.5,4.2-0.5,6.2,0.3c-0.3,2.5-3.5,2.7-4.6,4.7c-1.3,2.5-1.5,5.3-2.5,7.9
+			C50.2,836.7,50.7,832.4,51.6,828.1z"/>
+		<path class="st2" d="M1573.3,828c0.9,2,1.9,3.9,2.8,5.9c-0.7,0.7-1.4,1.4-2.1,2.1c-1.4,1.4-2.4,3.2-3.4,4.9c-2.2-1.1-2-3.2-0.9-5
+			l0.3-0.8C1571.2,832.7,1572.3,830.3,1573.3,828z"/>
+		<path class="st2" d="M1578.1,836.4c1.5-4.3,5.1-9,10.2-8.1c0.5,0.2,1.5,0.5,1.9,0.6c0.3,0.1,0.9,0.3,1.2,0.4
+			c0.3,1.7,0.6,3.5,0.9,5.2c1.1-0.3,3.2-0.9,4.3-1.1c0.6,1.8,0.9,3.6,0.6,5.5c-1,0.7-2.1,1.5-3.1,2.3c-0.2,0.2-0.6,0.5-0.8,0.6
+			c-2-2.5-4.4-4.7-7.4-5.9C1583.4,834.7,1580.6,836.1,1578.1,836.4z"/>
+		<path class="st2" d="M1326.5,832.7c0.4-1.4,0.9-2.8,1.4-4.2c0.7,0.2,2,0.5,2.7,0.7c0.1,1.3,0.1,2.6,0.2,4c1.1,0.6,2.2,1.2,3.3,1.9
+			c0.9,1.5,1.9,2.9,2.8,4.5l0.2,0.5c-0.2,2-0.4,4-0.6,6c-2.4,1.2-4.8,2.2-7.3,2.9c0.2,0.7,0.3,1.5,0.5,2.2h-4.7
+			c-0.6-0.7-1.1-1.4-1.7-2.1c1.2-3.2,2-6.7,2.4-10.1c-1.3-1-2.6-2-3.8-3C1323.5,834.8,1325,833.7,1326.5,832.7 M1328.3,841.9
+			c0.9,1.4,2.2,2.4,3.8,3c0.8-1.5,1.7-3,2.5-4.5C1332.5,840.5,1330.3,841.1,1328.3,841.9z"/>
+		<path class="st2" d="M277.3,830.7c5.3,0.8,10.7,1.1,16.1,1c0.1,1.7,0.6,4.4-1.7,4.9c-3.3,0.1-6.7-0.2-10,0c-0.5-0.4-1-0.8-1.5-1.2
+			C278.9,834.1,277.8,832.6,277.3,830.7z"/>
+		<path class="st2" d="M1605.5,832.8c0.6-0.8,1.3-1.7,1.9-2.5c2.1,1.7,4.1,3.7,6.7,4.7c2.9,0.1,5.7-0.5,8.5-0.9
+			c-0.1,0.5-0.2,1.4-0.3,1.8c-0.2,1-0.4,2-0.6,3c-0.7-1.2-1.4-2.4-2.1-3.5c-1.2,0.1-2.3,0.3-3.4,0.5c0.8,1.8,1.6,3.7,2.4,5.5
+			c1.8,0.2,3.6,0.5,5.4,0.7c0.6-1.2,1.2-2.3,1.9-3.5c1,0.9,1.9,1.9,2.9,2.9c-0.3,0.5-0.8,1.5-1,2c1.5,3.7-1.9,6-4.8,7.3h-2.5
+			c0.1-1.5,0.2-3.1,0.4-4.6c-1.5,0.5-3,1-4.4,1.6c-1-0.6-2-1.1-3-1.7c0.9-1.1,1.8-2.2,2.7-3.3c0.6-1.9-1-3-2.3-4.1
+			c-1.8-1.4-3.6-2.7-5.4-4C1607.4,834.2,1606.4,833.5,1605.5,832.8z"/>
+		<path class="st2" d="M1692.5,834.1c0.3-1.1,0.6-2.2,1-3.2c1.6,1.1,3.1,3.2,5.3,2.3c0.6-0.2,1.7-0.5,2.3-0.7
+			c-0.6,1.1-1.2,2.2-1.8,3.2c-0.4,0.5-1.2,1.6-1.6,2.1c-0.5-0.3-1.4-1-1.9-1.3C1694.8,835.8,1693.6,834.9,1692.5,834.1z"/>
+		<path class="st2" d="M1314.1,838c1.1-2,2-4.1,3-6.1c1.3,2.3,3,4.7,2.5,7.5C1317.7,838.9,1315.9,838.4,1314.1,838z"/>
+		<path class="st2" d="M1710.5,834.5c3.6-0.3,7.3-0.3,10.9-0.3c-2.1,1.2-4.2,2.3-6.2,3.5c-0.6,0.1-1.7,0.4-2.2,0.5
+			C1712,837.1,1711.2,835.8,1710.5,834.5z"/>
+		<path class="st2" d="M270.2,837.2c0.7-1.9,2.8-2,4.5-2.3c0.9,0.8,1.8,1.7,2.7,2.5c1.1,0.4,2.2,0.7,3.4,1c0.5,2.5,2.5,5.6-0.3,7.4
+			c-0.9-1.5-1.7-3-2.8-4.3c-1.2,0.1-2.5,0.2-3.7,0.4c0.2,2.5,0.7,5.1,1.9,7.4c-0.2,0.4-0.8,1.3-1,1.7h-5.9
+			C268.6,846.4,268.3,841.5,270.2,837.2z"/>
+		<path class="st2" d="M1688.3,842.1c0.5-2.5,1.3-5.1,2.9-7.1c0.6,2.3,1,4.7,1.3,7c1.6-0.4,3.2-0.8,4.8-1.1c0.4,0,1.3-0.2,1.8-0.2
+			c1,0.2,2.1,0.5,3.2,0.8c-1.1,1.9-1.1,4-1.3,6.1c-1.3-0.7-2.6-1.5-3.9-2c-1.4,0.6-2.7,1.4-4,2.2c0.3,0.8,0.8,2.4,1,3.2h-6.1
+			c1.4-1.3,2.6-2.8,4-4.2c-1.2-0.8-2.3-1.6-3.5-2.4c-0.8,1.6-0.5,4.6-2.8,5c-1.5,0-3-0.4-4.4-0.6c0.3-0.9,0.7-1.8,1-2.8
+			c0.1-1.4-0.2-2.7-0.5-4c0.1-0.6,0.3-1.7,0.5-2.2C1684.5,839.4,1686.4,841.1,1688.3,842.1z"/>
+		<path class="st2" d="M1702.8,836.2c0.7,0.4,1.4,0.9,2.1,1.3l0.8,0.5c0.6,0.3,1.8,1,2.3,1.4c1.1,0.4,2.2,0.7,3.4,0.9l1.3,0.1
+			c2,0.2,4.1,0.4,6.2,0.8c0.7,2.2,2,4.2,3.7,5.8c1.7-0.7,3.5-1.4,5.2-2.1c0.3,0.6,0.9,1.8,1.2,2.5c-0.8,0.8-1.5,1.7-2.2,2.6
+			c-3.3-1.4-5.8-4.1-8.4-6.4c-0.3,0-1-0.1-1.3-0.1c-2.7-0.1-5.5,0.2-8.2-0.3c-2.1-0.9-3.9-2.2-5.7-3.5
+			C1703.1,838.5,1702.9,837.4,1702.8,836.2z"/>
+		<path class="st2" d="M56.7,837.8c1.9-0.2,4-1.6,5.8-0.3c1.8,2.1,1.3,6-1.5,7.1c-3.2,0.2-4.1-3.5-4.8-5.9L56.7,837.8z"/>
+		<path class="st2" d="M1599.7,836.1c2.6,1.6,4.6,3.8,6.5,6.2c1.7-0.6,3.5-1.2,5.3-1.8c-0.1,1.4,0.7,3.2-0.4,4.4
+			c-2.2,2-4.7,3.7-6.6,6.1h-2.8c-0.9-1.7-1.1-4.4-3.5-4.4c-1.4,1.1-1.4,2.9-1.7,4.4h-2.7c-0.5-2.2-0.9-4.3-1.1-6.5
+			c2.1-0.3,4.3-0.7,6.5-0.9c0.4-0.4,1.1-1.2,1.5-1.6c-0.1-0.5-0.2-1.5-0.3-2C1600.1,839,1599.8,837.1,1599.7,836.1z"/>
+		<path class="st2" d="M160,841.2c1.6-2.3,4.2-3.8,7-3c3.3,0.1,3.3,4,3.7,6.4C166.9,844.7,163.1,843.3,160,841.2z"/>
+		<path class="st2" d="M1576,842.3c1.7-1.5,2.7-4.9,5.3-4.6c-0.3,1.8-0.7,3.6-1,5.5c2.2,0,3.8-1.4,5-3.1c0.8,0.6,1.6,1.2,2.4,1.8
+			c1.2,0.9,2.3,2.1,2.1,3.8c-0.6,0.2-1.7,0.6-2.3,0.8c-0.2,0.6-0.7,1.8-1,2.4c-3.1-0.3-6.2-0.7-9.3-0.6c-0.5,0.7-1.4,2-1.8,2.7h-3.7
+			c0-0.8,0-2.3,0-3.1c-2.1,1.1-4.3,2.8-6.8,1.6c1.6-1.9,3.1-3.8,4.8-5.5c0.5-0.5,1.5-1.5,2-2c1.2,0.8,2.5,1.7,3.8,2.5
+			C1575.7,843.9,1575.9,842.8,1576,842.3z"/>
+		<path class="st2" d="M279.1,851c3.9-3.5,6.3-8.1,8.7-12.6c1.1,0.6,2.2,1.2,3.3,1.9c1.5-0.4,2.9-1.1,4.5-0.9c1.2,0.9,1.3,2.6,2,3.9
+			c-1.1,0.6-2.2,1.3-3.4,1.9c-1.4,0.2-2.9,0.2-4.3,0.2c-0.2,0.3-0.6,1-0.8,1.3c-1,1.5-2,2.9-3.1,4.3H279.1z"/>
+		<path class="st2" d="M316.3,843.2c2.6-1.4,4.8-3.9,7.7-4.5c3-0.6,2.7,5.3,0.2,5.5c-4.5,0.6-8.7,2.9-13.2,2.5
+			c-2.5-0.2-2.1-4.1-0.2-4.9C312.7,840.6,314.6,842.3,316.3,843.2z"/>
+		<path class="st2" d="M1300.7,843.3c0.8-1.6,1.7-3.1,2.5-4.7c0.8,1.3,2.2,2.6,1.8,4.3c0,2.4-3,2.5-4.6,3.5
+			C1300.6,845.7,1300.7,844.1,1300.7,843.3z"/>
+		<path class="st2" d="M98.9,851c0.4-3.8-2.5-7.4-1-11c2.9,3.5,4.9,7.7,8.1,11H98.9z"/>
+		<path class="st2" d="M299.2,843.9c0.8-1.1,1.6-2.1,2.5-3.2c0.7,2,1.4,3.9,2.2,5.9c1.7,1.7,3.6,3.1,5.6,4.4h-9
+			c-0.3-1.4-0.5-2.7-0.8-4.1C299.6,846.2,299.4,844.7,299.2,843.9z"/>
+		<path class="st2" d="M117.4,844.4c0.4-0.1,1.1-0.2,1.5-0.3c1.3,0.2,2.6,0.5,3.9,0.8c1.9,1.2,3.8,2.5,5.7,3.9
+			c1.6-1.1,3.3-2.2,4.9-3.3c1.2,0.7,2.5,1.4,3.7,2.1c-0.2,0.8-0.7,2.5-1,3.4h-13.3c-0.4-0.5-1.3-1.7-1.8-2.2
+			c-1.3-0.3-2.5-0.5-3.8-0.8l-0.5-1C116.9,846.4,117.2,845,117.4,844.4z"/>
+		<path class="st2" d="M1312.7,851c1.6-2.3,3.2-4.7,4.9-7c0.1,1.2,0.3,2.4,0.5,3.7c0.3,0.4,0.9,1.3,1.2,1.7c0.3,0.4,0.9,1.2,1.2,1.7
+			H1312.7z"/>
+		<path class="st2" d="M1230.4,845.9c1.4,0.4,2.9,0.7,4.2,1.3c-0.5,1.2-1.1,2.5-1.7,3.7h-3.9C1229.5,849.3,1230,847.6,1230.4,845.9z
+			"/>
+		<path class="st2" d="M1712,848.3c1.3-0.9,2.5-1.8,3.9-2.7c0.6,0,1.8,0,2.4,0c0.4,1.8,0.8,3.6,1.5,5.4h-5.6
+			C1713.4,850.1,1712.7,849.2,1712,848.3z"/>
+		<path class="st2" d="M321.6,851c1.8-1.5,3.6-3,5.5-4.2c0.3,1.4,0.6,2.8,0.9,4.2H321.6z"/>
+		<path class="st2" d="M1334.2,851c0.6-1.3,1.1-2.6,1.7-3.9c1.7,0.9,3.7,1.7,4,3.9H1334.2z"/>
+	</g>
+	<g id="_x23_9eafc2ff">
+		<path class="st5" d="M325.2,0h10.1c-0.5,0.4-1.4,1.1-1.9,1.4c0,1.2-0.1,2.3-0.1,3.5c-3.1-1.3-6.2-2.4-9.4-3.3
+			C324.2,1.2,324.9,0.4,325.2,0z"/>
+		<path class="st5" d="M420.2,0h3c0.1,1,0.4,1.9,1.1,2.7c1.5,0.7,2.1-1.7,1.3-2.7h2.8c-1.5,2.3-2.9,4.8-4.2,7.2
+			c3.6-0.3,7.1,0.3,10.5,1.3c1.5-2.1,2.8-4.3,3.6-6.8c-2.5,1-3.6,3.6-5,5.8c-1.4-1.5-2.7-3.1-4.1-4.6c1.5-0.2,3-0.4,4.5-0.5
+			c0.9-0.8,1.8-1.6,2.7-2.4h7.6c0.4,1.2,0.8,2.4,1.2,3.6c-1.9-0.8-3.9-1.4-6-1.8c0.4,1,0.9,2,1.4,3c-1.8,2.5-4,4.8-6.7,6.3
+			c1.9,1.2,3.7,2.4,5.7,3.4c0.3,0.1,0.9,0.4,1.2,0.6c1.4,0.5,2.9,1,4.4,1.3c1.1-0.9,1.5-2.2,1.1-3.7c1.6,3.1-0.7,6.3-1.4,9.3
+			c-1.6-0.8-3.1-1.6-4.7-2.3c-0.5-1.5-1.1-2.9-1.6-4.4c-2.1,0.1-4.1,0.3-6.1,0.2c-0.1-0.5-0.2-1.6-0.2-2.2c0.2-1.4,0.5-2.9,0.8-4.3
+			c-3.3-0.3-6.6-0.3-9.9-0.2c0.1-1.4,0.3-2.8,0.4-4.2C422.4,3,421.3,1.5,420.2,0z"/>
+		<path class="st5" d="M534.8,0h6.8c-2.3,1-4.7,2-7.1,2.8C534.6,1.9,534.7,0.9,534.8,0z"/>
+		<path class="st5" d="M662.9,0h4.6c-0.3,0.8-0.8,2.5-1,3.3C665.2,2.2,664.1,1.1,662.9,0z"/>
+		<path class="st5" d="M1177.8,0h7.7c-2.2,1.7-4.7,2.9-7.5,2.9C1178,2.2,1177.9,0.7,1177.8,0z"/>
+		<path class="st5" d="M1225.4,0h7.4c0.4,0.6,1.2,1.8,1.6,2.4c-1.2,0.7-2.3,1.4-3.5,2c-1.8-0.9,0-2.2,0.6-3.3
+			c-1.8,0.2-3.5,0.4-5.2,0.6C1226.1,1.2,1225.6,0.4,1225.4,0z"/>
+		<path class="st5" d="M1312.3,0h5.3c-0.2,1.2-0.4,2.4-0.5,3.6C1315.3,2.6,1313.7,1.4,1312.3,0z"/>
+		<path class="st5" d="M1375.4,0h7.4c0.7,2.3,1.3,4.7,1.8,7c-1.5,0.8-3,1.5-4.5,2.3c0.3,0.5,0.8,1.5,1.1,2c-1.7-0.1-3.5,0.2-5.1-0.4
+			c-0.3-0.8-0.9-2.3-1.2-3.1c1-0.6,2.1-1.2,3.2-1.8c1.3-0.2,2.5-0.4,3.8-0.6c-1.2-1.4-2.4-2.7-3.5-4.1c-0.8,0.6-1.6,1.1-2.4,1.7
+			C1376,2.2,1375.6,0.8,1375.4,0z"/>
+		<path class="st5" d="M1408.1,0h4.7c0.6,1,1.8,2.3,3.1,1.6c0,1.8,0,3.7,0,5.5c-0.2,0.4-0.6,1.1-0.8,1.5l-1.3,0.3
+			C1411.9,6,1410.4,2.7,1408.1,0z"/>
+		<path class="st5" d="M498.8,5.1c-0.4-2.8,2.1-3.5,4.2-4.1c0,0.8-0.1,2.2-0.1,3C501.6,4.4,500.2,4.7,498.8,5.1z"/>
+		<path class="st5" d="M577.7,2.7c1.1-0.6,2.3-1.3,3.5-1.9c0.7,2.9-0.7,5.5-2.8,7.3C578.2,6.3,578,4.5,577.7,2.7z"/>
+		<path class="st5" d="M1251,2.6c3,0,5.8,1.6,8.9,0.5c0.9,1.2,1.6,2.5,2.4,3.9c-1.6,1.3-3.1,2.8-4.8,4.1c-2.4,0.4-4.8,0.4-7.2,0.6
+			c-1.2,3.1,2.2,3.4,4.3,4c1.3,1.4,4.1,0.7,3.3-1.5l-0.1-1.1c1,0.8,2.1,1.6,3.2,2.4c-2.7,1.6-5.1,3.8-6.6,6.6
+			c-1.4-1.5-1.5-3.5-1.8-5.4c-1.4-0.8-3.1-1.1-3.9-2.6c-0.6-3.8,4.6-4.5,4.6-8.1C1252.7,4.7,1251.8,3.7,1251,2.6 M1254.3,6.3
+			c0,1.2,0,2.4,0,3.6c2.9,0,4.4-2.3,5.7-4.5C1258.1,5.4,1256.1,5.7,1254.3,6.3z"/>
+		<path class="st5" d="M1302.8,3.2c2.5-0.5,5-1.1,7.5-1.6c0.3,1.2,0.6,2.5,0.9,3.7c-1.4-0.3-2.8-0.6-4.1-0.9
+			C1305.3,5.3,1303.6,5.2,1302.8,3.2z"/>
+		<path class="st5" d="M1184.7,5.7c1.2-1,2.2-2.6,4-2.5c1.8,2.4-0.9,4.7-3.1,5.3c-1.9,0.4-3.9,0.5-5.9,0.7c0-1.5-0.1-3.1-0.1-4.6
+			C1181.3,4.9,1183,5.3,1184.7,5.7z"/>
+		<path class="st5" d="M448.3,4.2c1.9-0.7,2.5,2.3,0.7,2.7C447.2,7.3,446.5,4.5,448.3,4.2z"/>
+		<path class="st5" d="M1115.2,4.2c2.3-1.3,3.2,4.4,0.8,4.1C1113.5,9.1,1113,4.7,1115.2,4.2z"/>
+		<path class="st5" d="M465.2,5.8c0.9,1.7,1.8,3.4,2.7,5.1c-0.9,0.4-1.8,0.8-2.7,1.2c-0.7-1.1-1.4-2.2-1.9-3.4
+			C463.6,7.6,464.6,6.8,465.2,5.8z"/>
+		<path class="st5" d="M1124.8,5.7c1.6,0.2,4.1-0.1,3.5,2.3c-0.1,1.6-1.3,3.6-3.2,3C1124.5,9.3,1124.8,7.5,1124.8,5.7z"/>
+		<path class="st5" d="M1305.3,7c1.1,1.4,2.1,2.8,3.1,4.2c-1.6,0-3.1,0-4.6,0C1304.2,9.8,1304.8,8.4,1305.3,7z"/>
+		<path class="st5" d="M469.3,15.7c0.5-2.6-1.7-6.1,0.7-7.9c1.3,0.7,2.9,1.5,3.2,3.1c-0.2,1.2-0.5,2.5-0.8,3.7
+			c1.8,1.6,3.4,3.4,4.9,5.3c-1.8-0.1-3.5-0.3-5.3-0.4c0.2-0.8,0.5-1.6,0.7-2.4C471.5,16.6,470.4,16.2,469.3,15.7z"/>
+		<path class="st5" d="M1292.7,12.9c0.4-2.5,2.7-3.5,4.5-4.8c0.3,2,0.6,4.1,0.9,6.1l0.1,0.5c-0.8,2.5-1.1,5.1-1.2,7.7
+			c-1.2-0.3-2.4-0.7-3.6-1.1c0.3-0.7,0.9-2,1.2-2.7c-1.6-1.3-2.9-2.8-4-4.6c1.4-0.2,2.8-0.3,4.3-0.5
+			C1294.3,13.4,1293.2,13.1,1292.7,12.9z"/>
+		<path class="st5" d="M316.6,11.8c-0.1-1.3,0.3-2.2,1.4-2.9C320.1,9.7,318.5,12.5,316.6,11.8z"/>
+		<path class="st5" d="M754.4,9.3c1.3-1.3,3.8,0.8,2.5,2.2C755.7,12.6,753.2,10.7,754.4,9.3z"/>
+		<path class="st5" d="M1168.2,10.1c2.8,0.7,2.2,4.4-0.2,5.3C1165.9,14.1,1166.3,11.3,1168.2,10.1z"/>
+		<path class="st5" d="M613.2,12.3c1.8-0.6,2.3,2.3,0.6,2.7C611.9,15.7,611.4,12.6,613.2,12.3z"/>
+		<path class="st5" d="M1209.8,11.8c2.4-1,6.5,2.3,4.2,4.4C1211.7,16.7,1211,13.2,1209.8,11.8z"/>
+		<path class="st5" d="M1132.2,13.3c2.6-0.5,3,5.7-0.1,4.9C1129.8,18.3,1130.2,13.8,1132.2,13.3z"/>
+		<path class="st5" d="M1215.3,15.9c0.9-1.2,1.7-2.4,2.6-3.6c1.6,2.9,3.5,5.6,5.7,8.1c1,0.8,0.8,2.2,0.9,3.3
+			c-2.2-0.7-4.4-1.6-6.5-2.7c0.1-0.9,0.3-1.9,0.5-2.8C1217.5,17.5,1216.4,16.7,1215.3,15.9z"/>
+		<path class="st5" d="M967.3,14.2c1.6-1.3,1.9,1.9,2.2,2.9C967.7,20.2,963.9,15.3,967.3,14.2z"/>
+		<path class="st5" d="M1280.9,14c4.4-1.7,4.7,3.8,4.5,6.8c-1.6,1.3-3.1,2.7-4.5,4.2c-3-2-5.8-4.3-7.3-7.6c1.3-0.7,2.7-1.3,4.1-2
+			c0.2,0.8,0.7,2.4,0.9,3.2c1.8,0,3.5,0,5.3-0.1C1282.9,17.2,1281.8,15.7,1280.9,14z"/>
+		<path class="st5" d="M463,15.5c1.6-0.3,3.2-0.4,4.8-0.3c0.2,0.8,0.6,2.2,0.8,3C466.4,18.7,461.9,19,463,15.5z"/>
+		<path class="st5" d="M679.1,16.3c1.2,1.1,2.2,2.4,3,3.8c0.6,0.3,1.3,0.6,2,1c-0.5,1.4-1,2.8-1.5,4.1c-0.5,0-1.4,0.1-1.9,0.1
+			C680,22.3,679.3,19.3,679.1,16.3z"/>
+		<path class="st5" d="M1352.9,17.9c1.9-0.7,4.8,0.9,4.1,3.2C1354.9,22.4,1352.1,20.3,1352.9,17.9z"/>
+		<path class="st5" d="M461.6,22.7c-0.5-1.4-1.9-3.3,0.4-3.9c1.9-0.4,3.9,1.1,3.1,3.1C464.3,22.1,462.5,22.5,461.6,22.7z"/>
+		<path class="st5" d="M590.5,20.9c1.5,0.3,4.9-1.8,4.8,1c-1.1,1-2.4,1.9-3.6,2.8C591.2,23.5,590.8,22.2,590.5,20.9z"/>
+		<path class="st5" d="M1160.9,20.5c3.3-0.3,6.3,1.4,7.8,4.4c-1.9-0.1-3.7-0.1-5.6,0C1162.3,23.4,1161.6,22,1160.9,20.5z"/>
+		<path class="st5" d="M1197.5,22.4c3.9-2.1,8.4-3.4,12.5-0.9c0.6-0.1,1.7-0.3,2.3-0.4c0.2,1,0.4,2,0.7,2.9c0.4-0.4,1.2-1.2,1.6-1.5
+			c0.1,0.7,0.2,2.1,0.3,2.8c-1.1-0.1-2.3-0.1-3.4-0.2c-3.4-0.8-7.4-3.2-10.4-0.3c-1.4,0.1-2.8,0.2-4.2,0.2
+			C1197,24.3,1197.3,23,1197.5,22.4z"/>
+		<path class="st5" d="M1259.8,25c-0.1-1.8-0.2-3.6-0.2-5.5c2.3,1.3,4.3,3.1,6.2,5.1C1263.8,24.7,1261.8,24.9,1259.8,25z"/>
+		<path class="st5" d="M1340.6,20.1c1.7-0.5,3.5,3.2,1.5,3.8C1340.7,23.5,1339.9,21.4,1340.6,20.1z"/>
+		<path class="st5" d="M647,21c1.2-0.2,4.6-1.2,4.3,1.1C652.1,25.5,645.6,23.2,647,21z"/>
+		<path class="st5" d="M1187.2,21.1c2,0.4,4,0.8,6,1.2c-0.1,0.7-0.2,2.1-0.3,2.8c-1.7,0.1-3.4,0.1-5.1,0.2
+			C1187.6,23.9,1187.4,22.5,1187.2,21.1z"/>
+		<path class="st5" d="M640.8,25.1c1.4-1.6,3-3,5.1-3.7c0.1,0.9,0.2,2.8,0.2,3.7C644.3,25,642.5,25,640.8,25.1z"/>
+		<path class="st5" d="M335.9,40c-0.2-2.4,2.5-0.8,3.6-0.4c-0.6,1.2-1.2,2.5-1.8,3.7C337.1,42.2,335.3,41.5,335.9,40z"/>
+		<path class="st5" d="M329.4,41.5c2.5,0.6,4.5,2.1,5.8,4.3c-1.2-0.2-2.9-2.1-3.8-0.6c-1.5,0.9,0.4,2.6,0.5,3.9
+			c-0.7,0-2,0.1-2.7,0.1c0.4,2.1,0.9,4.2,1.3,6.4c-2.3,0.8-4.7,1.3-7.1,1.9c0.7,2.4,1.1,4.9,1.5,7.4c0.3,0.2,0.9,0.5,1.2,0.6
+			c-1.4,1.3-2.8,2.5-4.2,3.7c-1.3-0.3-2.5-0.7-3.8-1c0.3,1.5,0.5,3.1,0.8,4.6c-0.6,0.4-1.7,1.2-2.3,1.6c0.1-4,0-8,0-12.1
+			c1.1-0.3,2.3-0.7,3.4-1.1c0.3,0.7,0.8,2.1,1,2.8c1-0.9,1.9-1.8,2.9-2.8c-0.7-0.4-2.2-1.3-2.9-1.7c0.2-0.4,0.7-1.1,0.9-1.4
+			c-1.2-0.3-2.5-0.5-3.8-0.8c1.7-0.7,3.5-1.2,5.3-1.5c1.6-0.2,3.3-0.4,4.9-0.7c-1.9-3.6-4.3-7.4-8.9-7.4c0.8-1.5,1.7-3.1,3.6-3.3
+			c1.2,0.7,2.2,1.6,3.4,2.4c0-1.1,0.1-2.2,0.1-3.4c1.1,0.4,2.2,0.8,3.3,1.1C329.6,43.5,329.5,42.5,329.4,41.5z"/>
+		<path class="st5" d="M1390.1,42.2c0.6,0.2,1.9,0.6,2.6,0.8c0.5,0.1,1.5,0.4,1.9,0.6c-0.1,1.3-0.2,2.6-0.1,3.8
+			c1.8,2.1,4.1,3.8,6.1,5.7c-1.2,0.5-2.3,1-3.4,1.5c0.5,1.1,1,2.2,1.5,3.3c-1.6,0.5-3.1,0.9-4.7,1.4c-0.3-0.6-0.9-1.8-1.2-2.5
+			c1.5-1.8,3-3.5,4.6-5.3c-1.6-0.8-3.2-1.5-4.9-2.2c-0.5,0.5-1.5,1.4-2,1.8c0-1.5,0-3.1,0-4.6c0.6-0.1,1.8-0.2,2.4-0.3
+			C1391.1,45.6,1390.2,44.2,1390.1,42.2z"/>
+		<path class="st5" d="M1396,61.6c1.4,1.2,3.8,3.6,1,4.8C1394.6,65.6,1394.9,63.5,1396,61.6z"/>
+		<path class="st5" d="M1390.5,66.9c0.6-0.2,1.9-0.6,2.5-0.8c0.7,3.6,1.3,7.2,1.8,10.9c-1.4-0.3-2.9-0.6-4.3-0.8
+			C1390.5,73.1,1390.4,70,1390.5,66.9z"/>
+		<path class="st5" d="M337.3,78.1c1.6-1.5,3.1-3.1,4.6-4.7c0,1.9,0,3.8,0,5.8c-0.5,0.4-1.5,1.2-2,1.7
+			C339.1,79.9,338.2,79,337.3,78.1z"/>
+		<path class="st5" d="M897.6,76.7c2.4-0.1,4.9-0.1,7.3,0c-1.1,1.8-2.2,3.5-3.3,5.3C900.2,80.3,898.8,78.5,897.6,76.7z"/>
+		<path class="st5" d="M950.3,76.7c0.7,0,2.1,0,2.7,0c-1.7,2.7-4.2,5.5-3.9,8.9c1.6,0.4,3.3,0.7,5,1c-0.2,1.6-0.3,3.2-0.8,4.7
+			c-1.1,1.3-2.5,2.2-3.8,3.3c-2.4,2.3-1,5.3-0.2,7.9c0.9,2,0.1,4.1-0.3,6.1c0.9-0.9,1.8-1.7,2.8-2.5c2.6,0.4,4.9,1.7,7.2,2.8
+			c-1.3,2.8-4,3-6.7,2.6c-0.4,0.4-1.3,1.2-1.7,1.5c-1.9-2.1-3.6-4.3-5.2-6.6c-3.1-0.9-6.1-2-9.1-3.3c1.7-3.3,3.4-6.5,5.1-9.8
+			c1.4-0.3,2.8-0.6,4.2-0.9c0.4-2.1,0.7-4.2,1.1-6.3c-2.2-0.4-4.4-0.8-6.6-1.2c-0.8,1.2-1.7,2.3-2.4,3.5c0-1.5,0.1-2.9,0.2-4.4
+			c3-1,6.2,0,9.2,0.2C948.4,81.8,949.4,79.3,950.3,76.7 M949,92.9c1.8-0.4,2.8-2,4.1-3.2c-1.2-0.9-2.4-2.6-4-1.7
+			C946.6,88.3,946.5,92.8,949,92.9z"/>
+		<path class="st5" d="M963.9,76.7c2.9,0,5.8-0.1,8.8-0.1c-0.1,1.3-0.2,2.7-0.3,4c2.1,0.1,4.3,0.8,6.4,0c1.8-0.5,2.2-2.6,3.1-4
+			c2.6-0.1,5.2,0,7.8,0c-0.6,3.5-1.4,7-3.1,10.2c0.2,0.1,0.5,0.2,0.7,0.3c2.7,1.2,6.5,2.6,8.3-0.9l0.5,0l0,0.7
+			c-1.5,2.8-2.8,5.9-1.1,9c1.9-1.3,3.8-2.6,5.7-3.9c0.1,0.5,0.3,1.6,0.4,2.2c-0.6,0.8-1.2,1.7-1.7,2.5c-0.3,0.4-0.8,1.1-1,1.4
+			c-1.9,1.1-3.9,2-5.8,2.9c-4,1.9-7.5,4.7-11.4,6.9c1-4,2.2-8,3.4-12c-3.3-2.5-6.7-5-10.1-7.4c0.7-1.6,1.2-3.9,3.5-3.7
+			c2.2-0.6,3.4,1.1,4.1,2.9c0.5,0.1,1.5,0.2,2,0.2c0.1-2.5-0.1-5-0.5-7.5c-3.9,1.3-8,1.7-12.1,1.9c0,1.5,0.2,3.1,0.4,4.6
+			c0.1,0.8,0.3,2.3,0.4,3.1C969.9,85.5,969.6,79,963.9,76.7 M985.2,78.5c-0.4,1.4,0.1,1.9,1.5,1.5C987,78.5,986.5,78,985.2,78.5z"/>
+		<path class="st5" d="M877.1,91c1.4-0.1,2.4,1.1,3.4,1.9c-0.8,0.9-1.7,1.8-2.5,2.7C876.2,94.7,876.4,92.6,877.1,91z"/>
+		<path class="st5" d="M1073.6,102.3c-0.5-2.6-0.3-5.3,0.2-7.9c3.2,1.1,1.2,5.2,1.7,7.8c0.9,1.1,3.6,1.9,2.7,3.7
+			C1075.5,107.7,1074.3,104.2,1073.6,102.3z"/>
+		<path class="st5" d="M997.5,105.3c1.2-0.9,2.5-1.7,3.7-2.6c0.8,2.1,1.5,4.2,2.2,6.3C1001.3,108,999.3,106.8,997.5,105.3z"/>
+		<path class="st5" d="M1409.2,112.6c1.2-0.9,3.4,0.9,2.5,2.2C1410.4,115.8,1408.2,113.9,1409.2,112.6z"/>
+		<path class="st5" d="M1089.1,113.6c0.9-0.1,2.8-0.2,3.7-0.3c-0.5,1.7-1.1,3.4-1.6,5.1c-0.4,0.1-1.2,0.3-1.6,0.4l-1.6,0.1
+			C1088.2,117.2,1088.4,115.3,1089.1,113.6z"/>
+		<path class="st5" d="M624.4,118.8c1.5-1.3,3.1-2.6,4.7-3.8c1.8,1.2,3.6,2.5,5.3,3.8C631.1,118.8,627.7,118.8,624.4,118.8z"/>
+		<path class="st5" d="M337.3,146.7c1.4-2.3,2.7-4.8,4.7-6.6c0,2.3,0,4.5,0,6.8c-0.5-0.2-1.6-0.6-2.1-0.8c-1.3,2.1-2.6,4.3-4.8,5.6
+			c-0.1-2.2-0.1-4.3,0.1-6.5C335.8,145.7,336.5,146.2,337.3,146.7z"/>
+		<path class="st5" d="M333.3,152.2c0.4-0.1,1.3-0.2,1.7-0.3c1.8,2.8-1.8,4.3-4,3.1C330,153.3,332,152.5,333.3,152.2z"/>
+		<path class="st5" d="M1405.9,156.6c1-0.7,2-1.3,3-1.9c1.1,0.6,2.3,1.3,3.5,1.9c-0.7,0-2.2-0.1-2.9-0.1c0,0.8,0.1,2.5,0.1,3.4
+			c0.1,2.1,0.3,4.2,0.6,6.3c1.2-0.4,2.5-0.8,3.8-1.3c-0.8-1.7-1.6-3.5-3-4.8c0.5,0,1.5-0.1,2-0.1c0.2-0.7,0.5-2.2,0.6-3
+			c0.8-0.3,1.6-0.7,2.4-1c0,1.7,0,3.5,0,5.2c-2.6-1.4-2.6,3.4,0,1.8c0,1.1,0,2.3,0,3.4c-2.5-0.1-5,0.6-5.4,3.4
+			c-1-0.9-1.9-1.8-2.8-2.7l-0.2,1c-1.8-1.3-3.7-2.6-5.6-3.7c-0.2,0.7-0.4,2.1-0.6,2.8c-0.2-1.1-0.3-2.1-0.3-3.2
+			c1.5-0.2,3-0.1,4.5,0.3c0.7,0.2,2,0.7,2.7,1c0.8-2.7,0.1-5.6-0.2-8.4C1407.5,156.9,1406.4,156.7,1405.9,156.6z"/>
+		<path class="st5" d="M1390.3,166.7c0.8-0.1,2.4-0.2,3.2-0.3c0.4,0.6,1.3,1.8,1.7,2.4c-0.8,1.3-1.6,2.6-2.4,3.8c1-0.4,2-0.8,3-1.3
+			c0.7,1.2,1.4,2.3,2.1,3.5c-1,0.2-1.9,0.4-2.9,0.7c-1.4-0.6-2.8-1.3-4.2-1.9c0.1-0.4,0.2-1.2,0.3-1.6
+			C1390.8,170.2,1390.5,168.5,1390.3,166.7z"/>
+		<path class="st5" d="M1067.3,180.6c0.9,0,2.6,0,3.4,0c0.2,1.1,0.5,2.2,0.7,3.4c1.7,1.4,3.2,3.1,4.4,5c3.3-0.4,2.7-4.3,3.5-6.7
+			c-0.4-0.4-1.1-1.2-1.5-1.6c1.7,0,3.4-0.1,5.2-0.1c-1.2,1.5-2.4,3.1-3.5,4.6c1.6,0.6,3.6,2.1,5.3,0.7c1.6-1.4,2.4-3.3,3.6-5
+			c0.4-0.1,1.3-0.3,1.7-0.4c-1.7,3.7-3.9,7.5-8,9.1c0.2,0.7,0.5,1.4,0.8,2.1c3.5-1.5,7.6-1.6,10.7-4.1c1.4-0.1,2.9-0.1,4.3-0.2
+			c0.2,0.5,0.6,1.5,0.8,2c1.2,0.4,2.4,0.8,3.6,1.2c-3.6,1-8.5-0.6-10.8,3.1c-0.6-0.7-1.1-1.4-1.6-2.1c-2.2-0.1-4.4,0.5-6.3,1.5
+			c-0.5-0.1-1.5-0.3-2-0.4c-0.3-1.2-0.5-2.3-0.7-3.5c-0.9,1.2-1.8,2.6-2.9,3.6c-1.9,0.1-3.7,0-5.5-0.1c0.3-2.1,0.6-4.2,1-6.2
+			c-1.6-0.1-3.1-0.2-4.7-0.2C1068.1,184.3,1067.7,182.4,1067.3,180.6z"/>
+		<path class="st5" d="M320.8,193c0.4-2.7,2.9-4.3,5.2-5.2c2-0.5,2.7,0.2,2,2.2c-1.2,0.2-2.5,0.3-3.7,0.4c-0.1,0.7-0.4,2.2-0.5,2.9
+			C323.1,193.3,321.5,193.1,320.8,193z"/>
+		<path class="st5" d="M1098.4,197.3c1.6-0.4,3.2-0.2,4.8-0.1c-0.8,1.2-1.6,2.4-2.4,3.6c-1,0.9-2,1.7-3,2.5
+			C1097.8,201.3,1097.5,199.2,1098.4,197.3z"/>
+		<path class="st5" d="M317.8,205c0-1.3-0.9-4.2,1.1-4.4c2.1,1,1.9,3.8,2.7,5.7c1.2,1.4,5.6,3.4,2.3,5
+			C320.9,210.8,319.5,207.3,317.8,205z"/>
+		<path class="st5" d="M321.4,215.1c1.4-1.2,1.7,1.8,2.3,2.6c0.8,2.1,2.4,3.6,3.5,5.5c0.6,2.2-2.7,1.1-3.5,0.3
+			C321.8,221.1,321.5,217.9,321.4,215.1z"/>
+		<path class="st5" d="M488.3,221.6c2.1-1.3,4.2-2.6,6.3-3.9c0.6,1.6,1.2,3.1,1.8,4.6c-0.8-0.8-1.6-1.6-2.4-2.4
+			c-1.9,1.2-3.9,2.4-5.4,4.1c2,3.5,6.5,1.3,9.7,1.6c1.1,0,2.3,0.1,3.4,0.1c-1.6,4.1-2.9,8.6-1.4,12.9c-1.8,0.9-3.6,1.8-5.4,2.7
+			c1,0.6,1.9,1.1,2.9,1.7c-0.5,0.4-1.6,1.2-2.1,1.6c-0.7-1.2-1.7-2.2-1.9-3.6c1.1-1.8,3.5-2.3,5.2-3.4c-1.1-1.7-2.2-3.5-3.4-5.2
+			c1.2,0.1,2.3,0.1,3.5,0.2c-0.3-1.7-0.4-5.1-3-4.2c-1.6,1.6-2.5,3.9-4.5,5.1c-2.6,1.5-5.2,3.1-8.1,4.1c-0.9-1.1-1.6-2.2-2.6-3.2
+			c-2.1-0.5-4.3-0.5-6.4-0.7c-0.9,0.9-1.9,1.8-2.8,2.6c0.2-1,0.4-2,0.6-3.1c-1.4-0.5-2.8-1.1-4.1-1.6c0.5-2.1,1.1-4.2,1.7-6.3
+			c1.8,0.4,3.5,0.9,5.3,1.2c1.7-1.6,0.3-4,0.2-6c0.7-0.5,1.4-1,2.2-1.5c-0.1,2.5-0.7,5.2,0.1,7.6c2.1,2,4.9,3,7.4,4.4
+			C486.4,227.9,487.5,224.8,488.3,221.6 M474.3,229.9c0.1,4.3,5,3,7.7,2.5c0.8,1.3,0.9,4,3,3.8c0.9-1.2,1.7-2.4,2.5-3.7
+			c2.3,0.2,4.5-0.2,5.6-2.4c-1.7-0.6-3.4-1.2-5-1.7c-1.1,1.6-2.4,4.1-4.7,3.1C480.8,230,476.9,226.4,474.3,229.9z"/>
+		<path class="st5" d="M325.2,230.2c1,0.1,1.5,0.7,1.4,1.7c-0.8,2.2-2.3,4.2-3.8,6.1c-0.3-0.2-0.9-0.6-1.1-0.8
+			C322.5,234.6,323.6,232.2,325.2,230.2z"/>
+		<path class="st5" d="M12.8,234c0.9,0,2.6,0,3.4,0c-0.1,0.8-0.2,2.4-0.3,3.2c-1.3-0.1-2.6-0.1-4-0.1C12.3,236,12.6,235,12.8,234z"
+			/>
+		<path class="st5" d="M29.5,234c0.2,0,0.7,0,0.9,0c0.1,1.1,0,2.3,0.5,3.4c1.5,0.1,2.9-0.5,4.3-1c0,0.5-0.1,1.4-0.1,1.9
+			c-3.2-0.4-5.6,1.4-7.4,3.9c-1.2-1.6-3.3-2.9-3-5.1C26.1,235.9,27.8,234.9,29.5,234z"/>
+		<path class="st5" d="M1479.1,234c0.4,0,1.3,0,1.7,0C1480.2,235.6,1479.6,235.6,1479.1,234z"/>
+		<path class="st5" d="M1565,235c2.8-1.1,2.2,2.3,2.3,4c0.1,1.5-0.5,2.8-2,3.3C1565.2,239.9,1564.9,237.4,1565,235z"/>
+		<path class="st5" d="M1706.1,235c2.5,0.7,5.1,1.2,7.3,2.7c1,1.3,1.4,3.9-0.3,4.7c-1.3-1.5-2.1-3.2-3-4.9c-1.3,0.2-2.5,0.5-3.8,0.5
+			C1706.2,237.2,1706.1,235.7,1706.1,235z"/>
+		<path class="st5" d="M19.1,244c3.2-2.1,4.5,3.4,1.8,4.3C18.4,248.5,18.9,245.6,19.1,244z"/>
+		<path class="st5" d="M1514.7,250c0.1-1.6,0-3.3,1.3-4.4c1.7,1.3,2.2,3.4,2.3,5.4C1517.1,250.7,1515.8,250.3,1514.7,250z"/>
+		<path class="st5" d="M1692.7,246.5c2.3,0.7,4.7,2.1,4.8,4.8C1694.9,251,1691.7,249.8,1692.7,246.5z"/>
+		<path class="st5" d="M1701.6,246.6c4.4-0.3,4.4,5.5,5.6,8.5C1703.3,254.2,1701.9,250.3,1701.6,246.6z"/>
+		<path class="st5" d="M1391.8,247.8c1.3,0.8,5.5,0.5,3.8,3C1393.6,253,1391.2,250.1,1391.8,247.8z"/>
+		<path class="st5" d="M1128.6,250.1c3.3,2.8,7.5,5.6,7.6,10.4c-1.2,0-2.4,0.1-3.6,0c-0.8-1.2-1.4-2.6-2-3.8
+			c-2.1,0.1-4.1,0.2-6.2,0.3c-0.2-0.2-0.6-0.8-0.9-1c2.5-0.2,5-0.3,7.5-0.4C1130.2,253.6,1129.4,251.9,1128.6,250.1z"/>
+		<path class="st5" d="M469.4,260.8c-1.4-4.2,2.4-6.5,4.8-9.3c2.4,2.6,0.3,5.9-1.5,8.2C472,260.8,470.5,260.5,469.4,260.8z"/>
+		<path class="st5" d="M1485.4,251.6c1.5,0,3.1,0.1,4.7,0.3c1.2,0.9,0.1,2.6,0.3,3.8C1488.2,254.9,1485.3,254.5,1485.4,251.6z"/>
+		<path class="st5" d="M1711.8,251.9c2.1,0.1,5.4-0.5,6.3,2.1C1716.4,256.8,1713.4,253.2,1711.8,251.9z"/>
+		<path class="st5" d="M46.9,256.2c1.3-1.7,2.8-3.8,5.3-3.4c-0.8,0.9-1.6,1.7-2.3,2.6c1.5,1.6,3.5,0.5,5.2,0.4
+			c1.7,0.5,2,2.4,2.1,3.9c-1.9,0.4-3.8,0.8-5.7,1.2c-0.2-0.6-0.5-1.9-0.7-2.6C49.3,257.8,46.9,258.2,46.9,256.2z"/>
+		<path class="st5" d="M1606.1,253.9c0.8,0,2.4-0.1,3.2-0.2c-0.5,1.4-0.9,2.8-1.3,4.2c-0.5-0.2-1.6-0.7-2.1-0.9
+			C1605.8,256.2,1606,254.7,1606.1,253.9z"/>
+		<path class="st5" d="M191.6,256.8c1.3-0.6,3-2.3,4.3-0.7c0.1,1.2,0.1,2.5,0.1,3.8c-1.2,0-2.5,0-3.7,0.1
+			C192.1,259.1,191.7,257.6,191.6,256.8z"/>
+		<path class="st5" d="M1656.7,257c2.7-0.1,5.5-0.2,7.9-1.5c1.9,1,4.7,1.1,5.7,3.3c-1.4-0.1-2.8-0.2-4.2-0.4
+			C1663.3,260.8,1658.1,260.7,1656.7,257z"/>
+		<path class="st5" d="M1248.4,263.1c2.3,1.1,4.8,1.7,7.4,2c0.3,1.4,0.6,2.8,0.8,4.2c-0.1,1.3-0.2,2.5-0.3,3.8
+			c-1.9-1.2-3.8-2.4-5.6-3.6c0-0.6,0.1-2,0.1-2.6c-1,0.4-2,0.7-3,1.1C1248.1,266.4,1248.2,264.8,1248.4,263.1z"/>
+		<path class="st5" d="M1089.1,266.1c1.7-0.9,4,1.7,2.3,3.2C1089.6,272,1086.7,267.6,1089.1,266.1z"/>
+		<path class="st5" d="M1076.9,272.1c0.1-2.6,1.9-6.6,5.1-5.1C1082.6,270,1079.8,272.4,1076.9,272.1z"/>
+		<path class="st5" d="M1721.4,266.8c1.5,0.1,2.9,0.1,4.5,0.4c0.9,2.1-1.1,4.4-0.3,6.5c0.8,2.3,1.9,4.6,1.4,7.1c-0.5,0-1.5,0-2,0
+			C1724,276.1,1722.7,271.4,1721.4,266.8z"/>
+		<path class="st5" d="M670.8,271.9c0.8-1.3,2.7-4,4-1.6c1.4,0.8-0.2,3.6-1.7,2.8C672.5,272.8,671.3,272.2,670.8,271.9z"/>
+		<path class="st5" d="M896.1,270.2c0.8-0.2,2.5-0.5,3.3-0.6c0,1.1,0.5,2.4-0.6,3.2C897.4,272.5,895.4,272.2,896.1,270.2z"/>
+		<path class="st5" d="M0,282c1.2-1.1,2.5-2.1,4-2.9c1,0.5,1.9,1,2.8,1.6c-2.5,1.4-5.2,2.8-6.7,5.3V282z"/>
+		<path class="st5" d="M800.7,282.6c1.5-1.4,3-2.7,4.5-4.1c1.5,0.7,3,1.3,4.3,2.4c0,1.4-0.3,2.8-0.7,4.1c-0.5-1.5-0.9-3.1-1.7-4.6
+			c-3.2,0.5-5.7,3.1-8.8,4.2c-2.3,0.5-2.6,4.1-0.4,5c1.6,0,3-0.9,4.4-1.6c-1,3.7-5.2,3.6-8.2,4.5c-1.9-1-3.8-2.1-5.9-2.5
+			c-1.6,0.9-3,2.1-4.5,3.2c-0.7-0.9-1.4-1.8-2-2.6c6.2-0.9,11.4-4.8,16.5-8.3l0.3,0C798.9,282.4,800.1,282.5,800.7,282.6z"/>
+		<path class="st5" d="M1236.6,280.4c0.9,0.9,2.1,1.7,2.9,2.8c0.3,3,0.2,6.1,0.4,9.1c-1.1-0.4-2.2-0.7-3.3-1.1
+			C1236.5,287.6,1236.6,284,1236.6,280.4z"/>
+		<path class="st5" d="M648.1,287c2.2-1.9,4.6,1.9,2.2,3.3C648.1,292.5,645.7,288.4,648.1,287z"/>
+		<path class="st5" d="M1170.8,297.1c1-2.5,2.9-5.8,6.2-4.1c0.5,2.1-2.8,3.3-4.1,4.7C1172.4,297.5,1171.4,297.2,1170.8,297.1z"/>
+		<path class="st5" d="M1705.5,296.2c2.3-0.5,4.6-1,6.9-1.6c0.5,1.4,1.1,2.9,0.6,4.4C1710.4,299.1,1706.9,298.7,1705.5,296.2z"/>
+		<path class="st5" d="M488,303.5c1.6,0.1,3,0.8,4.4,1.6c-1.1,1.2-2.2,2.3-3.3,3.4c-0.8-0.8-1.6-1.6-2.3-2.4
+			C487,305.5,487.7,304.1,488,303.5z"/>
+		<path class="st5" d="M1247.7,306.6c1.5-2.5,4.5-0.6,6.6,0c-2.1,0.2-4.2,0.5-6.2,0.8c0.5,3.1,2,5.9,3.9,8.4
+			c1.3-0.5,2.5-1.1,3.8-1.6c-0.1,2.5-0.1,5-0.1,7.5c-0.1,0.5-0.3,1.7-0.4,2.2c-2-0.8-4.1-1.1-6.2-1.4c0.8-2.2,2.2-4.9,0.7-7.2
+			C1248.5,312.6,1245.6,309.5,1247.7,306.6z"/>
+		<path class="st5" d="M1169.3,309.1c0.4-0.6,1.3-1.9,1.7-2.5c1.8,0.9,3.9,1.5,5.2,3.1c1.4,2-0.5,4.2-1.2,6.1
+			C1173.2,313.5,1171.3,311.2,1169.3,309.1z"/>
+		<path class="st5" d="M481.9,311c0.5-1.5,2-2.2,3.2-3.1c0,2.3-0.4,4.5-1.2,6.6C483,313.4,481.6,312.4,481.9,311z"/>
+		<path class="st5" d="M1702.8,309.2c2.8,1.4,3.5,4.4,2.6,7.2c-0.7-0.3-2-1-2.7-1.3C1702.7,313.1,1702.8,311.1,1702.8,309.2z"/>
+		<path class="st5" d="M1720.2,316.2c1.5-1.2,2.9,1.5,1.6,2.4C1720.3,319.9,1718.8,317.2,1720.2,316.2z"/>
+		<path class="st5" d="M1729.7,315.8c1.1,0.3,2.2,0.7,3.3,1.1v8.7C1731.4,322.5,1729.9,319.3,1729.7,315.8z"/>
+		<path class="st5" d="M475.3,332.3c2.4-1.5,2.9,4.1,0.6,4.1C473.5,336.7,473,332.8,475.3,332.3z"/>
+		<path class="st5" d="M1725.4,335.2c2.1,0.1,4.3,0.3,5.7,2c-1.4-0.6-2.5-0.3-3.2,0.8c0.7,1.2,1.7,1.5,3.2,0.8
+			c-1.9,2.1-5.1,0.2-7.5,0.5c-1.4-1.2-4.5-1.2-4.6-3.2c1.4,0.2,2.8,0.5,4.2,0.8C1723.9,336.4,1724.6,335.8,1725.4,335.2z"/>
+		<path class="st5" d="M1715.8,340c1.8-0.2,4.6-0.8,4.6,1.9C1719.2,345.3,1716.8,341.5,1715.8,340z"/>
+		<path class="st5" d="M1070.6,371.2c4.1-9.6,2.3-20.3,3.5-30.4c0.8,0.1,2.4,0.2,3.2,0.3c-0.8,1.6-1.7,3.1-1.9,4.9
+			c-0.8,6.1-1.7,12.2-1.3,18.4c2.6-0.6,5.2-1.5,7.7-2.5c-0.5,2.5-1.8,4.6-3.6,6.4c-0.9-0.2-1.8-0.4-2.7-0.5
+			C1073.9,369,1072.4,370.3,1070.6,371.2z"/>
+		<path class="st5" d="M1709.1,341c1.8-0.4,3.8,1.3,3.1,3.2C1710.1,345.2,1706.8,343,1709.1,341z"/>
+		<path class="st5" d="M9.1,346.1c3.3-2.7,8.1-0.4,10.2,2.8c-0.3,0.5-1,1.4-1.4,1.8c-1.6-0.5-3.3-1-5-1.3c0.3-0.9,0.5-1.7,0.8-2.6
+			c-3,0.2-5.8,1.4-8.1,3.4c1.1,0.8,2.2,1.7,3.5,2.3c1.1-0.3,2.2-0.8,3.2-1.2c-1.2,4.3-6.9,2.4-8.8-0.3
+			C4.2,348.5,7.2,347.6,9.1,346.1z"/>
+		<path class="st5" d="M1205.9,351.9c0.2-0.5,0.7-1.4,0.9-1.9c0.7,0.1,2.1,0.3,2.8,0.3c0.7,0.1,1.9,0.2,2.6,0.3
+			c-0.9,1.7-2,3.4-3.1,5C1208,354.4,1206.9,353.1,1205.9,351.9z"/>
+		<path class="st5" d="M1723.4,352.3c2-1,3,3.2,0.9,3.4C1722.8,355.5,1722.3,353.3,1723.4,352.3z"/>
+		<path class="st5" d="M0,360.1c0.6-0.4,1.8-1.4,2.4-1.8c0.8,1.5,1.9,3,2,4.8c-0.7,1.6-3,1-4.4,1.6V360.1z"/>
+		<path class="st5" d="M11.3,358.9c1.8,1.1,2.6,3,1.6,5c-1.4,0.4-2.3-0.7-3.1-1.6C10.3,361.1,10.8,360,11.3,358.9z"/>
+		<path class="st5" d="M514.4,368.3c2.2-2.2,5.4-1.1,6.5,1.7l-1.3-0.5c-0.7-0.3-2.2-0.8-3-1.1c-0.7,0.9-1.5,1.8-2,2.8
+			c0.2,1.9,0.9,3.8,1,5.7c-0.7,2.4-2.2,4.4-3.4,6.6c0.7,0.2,2.2,0.6,3,0.9c2.8-2.2,4.1-5.6,5.3-8.8c1.4-0.1,2.9-0.2,4.4-0.1
+			c1.4,2.3,1.2,5.4,3.1,7.5c-1.2,1.8-2.4,3.5-3.8,5.2c0.4-1.6,0.9-3.2,0.5-4.8c-3.7-1-5.8,2-6.9,5.1c-2.6-1.1-5.2-2.4-7.8-3.6
+			c1.5-2.7,3.4-5.2,4.3-8.2C513.8,373.8,511.8,370.6,514.4,368.3 M522.4,376.3c-2.1,1.1-2.2,3.5-2.3,5.5c1.2,0,2.3-0.1,3.5-0.3
+			C525.9,380.3,525.3,375.9,522.4,376.3z"/>
+		<path class="st5" d="M910.3,367.3c1.5-0.1,2,1.6,1.9,2.8c-0.9,1-2.3,1.4-3.4,2.1C909,370.5,907.9,367.7,910.3,367.3z"/>
+		<path class="st5" d="M1727.8,372.5c1.7-0.7,3.4-1.3,5.2-2v3.4C1731.3,373.5,1729.5,373,1727.8,372.5z"/>
+		<path class="st5" d="M1239,374.2c2.2-0.8,4.6-1.1,7-1c-1.8,1.5-3.5,3-5,4.6C1239.6,377,1239.2,375.6,1239,374.2z"/>
+		<path class="st5" d="M1099.2,376.1c1.2,0.1,2,1.2,2.8,1.9c1.4,0.7,3.5,1,3.4,3.1c-2.1,2.1-5-0.2-7-1.4
+			C1096.7,378.8,1098.4,377,1099.2,376.1z"/>
+		<path class="st5" d="M983.6,379c2-1.5,4.2-0.6,4.5,1.9C986.2,381.2,984.5,380.9,983.6,379z"/>
+		<path class="st5" d="M942.2,379.2c1.6-1.1,2.8,1.3,1.3,2.2c-1.1,1.2-4.9,1.2-3.4-1.2C940.6,379.9,941.6,379.5,942.2,379.2z"/>
+		<path class="st5" d="M955.9,383.1c0.5-0.3,1.4-0.8,1.9-1.1c0.8,1.4,1.6,2.8,2.4,4.2C957.8,386.8,956.5,385.1,955.9,383.1z"/>
+		<path class="st5" d="M983.2,382.2c1.5-1.2,2.9,1.5,1.5,2.5C983.2,385.9,981.8,383.1,983.2,382.2z"/>
+		<path class="st5" d="M1011.8,387.6c1.6-0.3,3.3-0.5,5-0.4c0.6,0.9,1.2,1.8,1.7,2.8c-3.1,0.2-6.3,0.4-9.2-0.8
+			C1009.9,388.8,1011.2,388,1011.8,387.6z"/>
+		<path class="st5" d="M9.1,408.9c1.2,0.4,2.4,0.9,3.6,1.3c0,1.4,0,2.8,0,4.2c-1.7-0.7-3.4-1.4-5.1-2.1C8.1,411.1,8.6,410,9.1,408.9
+			z"/>
+		<path class="st5" d="M0,436.8c1.4,1.5,3,2.8,4.2,4.4c0.5,1.4-0.7,2.7-1,4.1c-1.1-0.8-2.2-1.5-3.2-2.3V436.8z"/>
+		<path class="st5" d="M14.1,439.2c1.8-0.3,3.4-1.5,5.1-2.2c0.6,1.9,1.8,3.8,1,5.8c-2.6,1.8-5.4,3.5-5.1,7.1
+			c4.7-0.5,9.3-2.2,14.2-1.9c-1.4,2.2-3,4.2-3.6,6.8c1.1-0.1,2.2-0.2,3.4-0.3c0,0.2,0,0.7,0,0.9c-1.5,2-2.8,4-3.9,6.2
+			c-1.5,0.1-3,0.2-4.6,0.3c1.1-3.8,4.7-6.7,4.1-10.9c-1.3,0.5-2.7,1-4,1.6c-1.5-1.3-4.1-2.6-5.8-0.8c-1.2,2.7-1.6,5.6-2.2,8.4
+			c-0.2-0.3-0.6-1-0.8-1.3c0.2-2,0.6-4,0.9-6c1.3-5.1-4.4-8.2-4.9-13C9,437.4,12.1,439.2,14.1,439.2 M14.1,441.3
+			c-1.4-0.4-2.7-0.8-4.1-1.2c0.1,2.8,1.2,5.3,3.6,6.9c0.8-1,1.5-2.1,2.2-3.1c1.3-0.9,3.5-1.1,3.6-2.9
+			C19.1,437.4,15.8,440.6,14.1,441.3z"/>
+		<path class="st5" d="M1715.8,446.2c2,1,5.7,1,5.6,4C1718.5,451.2,1716.5,448.7,1715.8,446.2z"/>
+		<path class="st5" d="M1704.1,463c-2.1-3.9,2.6-3.6,5.1-2.9C1707.7,461.4,1706.1,462.8,1704.1,463z"/>
+		<path class="st5" d="M1,467.3c3.4-0.2,6.9-0.8,9.8-2.6c2.1,3.8,6.6,4.5,10.5,5.1c0.4-0.5,1.1-1.5,1.4-2c0.2,0.8,0.6,2.5,0.7,3.3
+			c1.6-1,3.2-2,4.8-3c-0.4,1.6-0.9,3.2-1.5,4.8c-4.6-0.5-9.3-2.1-14-0.8c-2.6-1.1-5.3-2.3-7.8-0.2C3.5,470.5,2.2,469,1,467.3z"/>
+		<path class="st5" d="M1733,472.5c-3,0.9-2.5-3.3,0-3.5V472.5z"/>
+		<path class="st5" d="M612.5,475.9c2.4-2.3,6.7-2.3,7.6-6.2c0.9,3.8,2.9,7.3,5,10.6c2.6-2.4,2.4-5.8,2.3-9c0.5,0,1.4,0.1,1.9,0.2
+			c-0.1,3.6-1.2,7.1-3,10.2c-1.3-0.3-2.7-0.6-4-0.9c-1.1,0.6-2.3,1.2-3.4,1.8C616.8,480.3,614.5,478.2,612.5,475.9z"/>
+		<path class="st5" d="M639.9,473.1c6.9,1.4,13.8,3.7,20,7.1c-5.1,1.5-9.5-1.8-14-3.7c-0.5,1.6-1,3.2-1.5,4.8
+			c-0.9-1.1-1.8-2.1-2.6-3.2c0.6-1,1.2-1.9,1.8-2.9C642.3,474.5,641.1,473.8,639.9,473.1z"/>
+		<path class="st5" d="M1724.3,474.1c0.4-0.3,1.1-0.9,1.5-1.2c1.7,4.2,0.8,8.7,0.3,13.1c-0.5,2.2-2.8,0-2.9-1.2
+			C1723,481.2,1724.4,477.8,1724.3,474.1z"/>
+		<path class="st5" d="M155,476c6-0.6,12-0.4,18-0.7c-5.7,2.4-12,1.8-18,1.6c-5.1-0.2-10.1,0.4-15,1.5c-1.5,2.8-4.2,6.8-7.8,5.5
+			c-3.2-2.6,1.8-4.9,3.7-6.6c-3.8-0.3-7.5-0.4-11.3-0.4c-0.2,0.8-0.5,2.5-0.6,3.3c-0.7,0-2.2-0.1-2.9-0.1c0.2-1.1,0.3-2.1,0.5-3.2
+			c-2.9-0.1-5.8-0.2-8.6-0.3c1.4-0.4,2.8-0.7,4.2-1C129.7,476.3,142.4,477,155,476z"/>
+		<path class="st5" d="M761.5,489.4c-0.1-4.9-0.3-9.9,0-14.8c2.3,0.1,4.7,0.1,7,0.2c0.1,0.9,0.2,1.9,0.3,2.8c-1.5,0.7-2.9,1.3-4.4,2
+			c0.5,1.9,1,3.7,1.4,5.6c2.9,1.5,6.1,2.5,9.3,3c0.2,0.6,0.6,1.9,0.8,2.5C771.2,489.7,766.3,489.8,761.5,489.4z"/>
+		<path class="st5" d="M173.3,481.2c1.2-0.8,2.1-2.2,3.7-2.4c2.1,0.2,1.1,2.9,1.4,4.3C176.6,482.6,174.9,481.9,173.3,481.2z"/>
+		<path class="st5" d="M378.8,483.7c-0.3-3.4,3.5-4.8,6.3-5c2.1,1.5-0.9,3.2-1.6,4.7C381.9,483.5,380.3,483.6,378.8,483.7z"/>
+		<path class="st5" d="M150.8,487c1.1-2.7,2.5-6.7,6.1-6.1c-0.3,1.7-0.6,3.4-0.9,5.1c1.3,1.2,2.9,2.3,2.9,4.3
+			c-1.8-1.3-3.5-2.6-5.1-4c-0.2,2.1-0.4,4.2-1.1,6.1C152,490.6,151.2,488.9,150.8,487z"/>
+		<path class="st5" d="M648,482c1.8-0.4,3.7-0.6,5.6-0.8c0,1.3-0.1,2.6-0.1,3.9c-3.7,1.7-7.7,3-11.9,2.5c-0.1,0.4-0.3,1.2-0.5,1.6
+			c-1.9,1.2-3.8,2.5-5.6,3.9c-0.4,2.2-0.9,4.3-1.4,6.5c-2.9-1.5-5.9-2.9-8.9-4.2c1.6-2.7,3.2-5.3,4.9-7.9c-0.1-1-0.2-2-0.3-3.1
+			c1.9-1,3.7-2,5.4-3.4c0.3,5.3-5.3,8.4-6.2,13.5c1.5-0.1,3.4,0.2,4.3-1.3c2.1-2.8,3.9-5.9,7.2-7.3c-0.4-1.4-0.8-2.8-1.3-4.2
+			c1.7,1.7,3.1,4.6,5.8,4.8c2.9-0.5,5.5-2,8.1-3.1C651.5,482.8,649.7,482.3,648,482z"/>
+		<path class="st5" d="M805.1,482c1.4-0.2,3.7-0.7,4.3,1c-1,2.2-3.6,2.2-5.6,2.9C804,484.6,803.6,482.8,805.1,482z"/>
+		<path class="st5" d="M1521.1,489.2c1.1-1.8,1.7-5.2,4.5-3.6c-2.2,0.6-3,2.8-3.6,4.8c2.5,0.6,5.1,0.9,7.7,0.9l0,0.2
+			c-4.6,0.8-8.9,2.7-12.3,5.9c-0.4-1.6-0.8-3.2-1.2-4.8C1517.9,491.6,1520.3,491.2,1521.1,489.2z"/>
+		<path class="st5" d="M375.9,497.9c-0.8-1.8,1.7-1.7,2.8-2c1.3,2.6,3.2,4.6,6,5.6c1.6,0.4,1.8,2.2,2.4,3.5c1.4,1.2,2.9,2.4,4.2,3.6
+			c-1.2,0.4-2.3,0.8-3.5,1.1c-1.5,0.1-2,0.9-1.7,2.2c-1.2-0.1-2.3-0.2-3.5-0.3c-1.8-4.4-6.9-0.9-9.8-3.2c-2.2-2.8,2.7-3.8,3.8-5.7
+			C376.4,501,376.1,499.5,375.9,497.9 M373.3,507.1c3.9,3.9,8.5-1.4,11.8-3.6c-1.4-1.3-3.1-2.4-5.1-2
+			C377.5,503.1,375.5,505.2,373.3,507.1z"/>
+		<path class="st5" d="M136.1,497.1c2,1.5,6.2,1.7,5.8,4.8c-2.3,0.8-4.7,0.2-6.8-0.8C135.4,499.8,135.8,498.4,136.1,497.1z"/>
+		<path class="st5" d="M1505.6,504.6c-0.4-2.8-0.6-5.9,1.9-7.8c2,1.7,5.7,1.2,6.7,4c-1.8,0.3-3.7,0.4-5.5,0.9
+			c-2.1,3.1-2.8,7.1-5.6,9.7c-0.9-0.8-1.9-1.7-2.8-2.5C1502.1,507.5,1503.8,506,1505.6,504.6z"/>
+		<path class="st5" d="M177.4,499.7c2.6-1.5,5.3-0.4,7.4,1.3c-1.2,0.7-2.4,1.5-3.8,1.9C179.3,502.6,178.5,500.8,177.4,499.7z"/>
+		<path class="st5" d="M155.5,507.1c0.8-0.8,1.7-1.6,2.5-2.4c1.4,0,2.2,1.3,3.2,2C159.6,508.8,157.3,509,155.5,507.1z"/>
+		<path class="st5" d="M979.3,505.4c1.1-1.4,2.8,1,3.6,1.8C985,511.5,977.1,507.2,979.3,505.4z"/>
+		<path class="st5" d="M693.9,512.3c-2.8-0.7-5.1-5.8-1.2-6.5C693.2,507.9,693.7,510.1,693.9,512.3z"/>
+		<path class="st5" d="M978.5,514.3c2.5-2,4.3-5.2,8-4.7c0.2,4.2,0.7,8.3,1.6,12.4c0.1,1.1,0.9,2.8-0.6,3.3c-3.2,1.1-6,2.8-8.7,4.9
+			c-3.1,0.4-1.7-4-2-5.8c0.3-2.6,1.3-5.3,0.7-7.9c-1.8-0.5-3.6-0.7-5.4-1.1l0-0.3C974.3,514.8,976.5,515.1,978.5,514.3 M980.7,514.9
+			c0,4-0.1,8-1.7,11.8c2.7-1.8,6.8-0.2,8.6-3.4c-0.9-1.1-1.8-2.2-2.7-3.3c0.2-2,0.9-4.1,0.4-6.2
+			C983.9,512.1,980.8,512.3,980.7,514.9z"/>
+		<path class="st5" d="M651.8,512.7c3.1,0.2,6.2,0.6,9.2,0.9c-1.1,0.8-2.3,1.5-3.4,2.4c1.5,1.9,3.7,3,5.9,3.8
+			c-1.3,0.9-1.6,2.2-0.8,3.6c0.6,0.6,1.2,1.2,1.8,1.8c-0.2,0.6-0.5,1.9-0.7,2.5c-2.8-4.6-6.7-8.4-9.7-12.9
+			C653.4,514.1,652.6,513.4,651.8,512.7z"/>
+		<path class="st5" d="M374.7,519.5c3.7-1,5.6-5.8,9.7-5.1c-0.8,0.9-1.5,1.9-2.2,2.9c0.5,0.3,1.4,0.9,1.8,1.2c-2.9,0.7-5,2.5-6.5,5
+			C376.1,522.4,375.1,521.1,374.7,519.5z"/>
+		<path class="st5" d="M16.5,516.1c2.5,1.5,5.3,2.8,8.3,2.2l-0.2,0.5c-0.7,1.7-1.2,3.4-1.7,5.1c1.9-0.1,3.7-0.1,5.6-0.2
+			c0.1,0.4,0.5,1.1,0.6,1.4c-2.2,0.2-4.5,0.4-6.7,0.5c-1.5-1.3-2.9-2.6-4.6-3.6c-1.6,1.4-1.9,3.5-2.8,5.3c-0.5-0.8-0.9-1.5-1.3-2.3
+			C14.6,522,15.8,519.1,16.5,516.1z"/>
+		<path class="st5" d="M1707.9,520.5c0.9-2,2.3-3.7,4.1-5c-0.3,3.2-0.8,6.4-0.7,9.6c-0.1,2.3,2.1,3.5,3.4,5c0.3,1.7,0.5,3.5,0.9,5.1
+			c2.5,0.9,5.3,0.9,7.9,1.1l0.1,0c-1.2,1-2.1,2.3-2.5,3.9c1.1-0.1,3.2-0.2,4.2-0.3c-0.8,0.6-1.5,1.2-2.3,1.8
+			c0.5,0.1,1.4,0.4,1.8,0.5c-1,0.8-2,1.6-2.9,2.4c-1.6-0.8-3.2-1.7-5-2c-0.5,0.9-0.9,1.7-1.3,2.6c2.2,0.5,4.4,0.9,6.7,1.3
+			c-1.9,0.3-3.8,0.8-5.7,0.8c-2.4-0.1-5-1.7-6.9,0.4c-0.9-2.3-3.7-5.1-1.4-7.5c0.7-0.3,2-1,2.7-1.3c0,1.8,0.1,3.7,0.2,5.5
+			c1.5-1.1,2.9-2.3,4.4-3.4c1.3,0.2,2.6,0.4,3.9,0.4c0.6-1,1-2.1,1.5-3.1c-2.6-0.6-5.3-0.9-7.7-2.1c-1.6-1.4-2.6-3.3-3.8-5.1
+			c-1.1,0.3-2.2,0.6-3.3,0.9c-0.8-3.7-1.3-7.4-1.6-11.1c0.6-0.2,1.7-0.4,2.3-0.6c-0.5,0.6-1.5,1.8-1.9,2.4c1.3,1.4,2.7,2.7,4.1,4.1
+			c1.2-2.2,1-4.6,0.5-6.9C1709.3,520.3,1708.4,520.4,1707.9,520.5z"/>
+		<path class="st5" d="M1230.6,520.2c0.8-1.2,1.5-2.4,2.3-3.6c1.2,1.5,3.9,2.8,2.8,5.2C1233.7,523,1232,521.6,1230.6,520.2z"/>
+		<path class="st5" d="M1240.9,516.8c2.8,1.8,5.7,4.1,9.2,2.4c0.4,1.2,0.8,2.4,1.2,3.7c-2,1.3-4,2.6-6,3.9
+			C1244.3,523.1,1239.7,521,1240.9,516.8z"/>
+		<path class="st5" d="M368.6,518.7c1.5-1.6,2.9,0.5,4.1,1.4c-0.9,0.8-1.8,1.5-2.7,2.2C368.4,521.9,367.1,519.9,368.6,518.7z"/>
+		<path class="st5" d="M483,519.7c0.8-0.7,1.7-1.5,2.5-2.2c-0.1,3.5,0.2,7.1-0.9,10.4c0.7,0.2,1.4,0.5,2.2,0.7
+			c1.4-1.1,2.5-2.6,4.3-3c1.8,0,1.8,2.2,2.5,3.3c1,2.4,3.5,3.5,5.5,4.9c0.4-0.5,1.2-1.4,1.6-1.9c0,0.5,0,1.7,0,2.2
+			c0.7,0.5,2.1,1.5,2.8,2c0.1-2.2,0.1-4.4,0-6.6l0.6,0.2c1.4,1.7,2.5,3.7,3.5,5.7c-0.6,0.1-1.8,0.2-2.4,0.2
+			c-0.6,2.6-1.3,5.2-2.6,7.5c-0.1-2-0.2-4-0.3-6c-0.5,0.1-1.5,0.3-2,0.5c-0.6-0.6-1.1-1.2-1.7-1.7c-1.9-2.2-4.3-4-7.1-4.8
+			c0.2-1.5,0.8-3,0.6-4.4c-2.9,1.2-5.4,3.7-8.7,4.2c0.1,1.4,0,2.8,0.6,4.1c2.1,1.8,4.4,3.4,6.7,4.9c-0.3,0.6-0.9,1.7-1.2,2.3
+			c-0.2-0.5-0.6-1.5-0.8-2.1c-2.2-0.2-4.4-0.2-6.6-0.3c-0.1-0.7-0.3-2-0.4-2.7c-0.7,0.4-1.3,0.9-2,1.3c-0.2,0.6-0.6,1.9-0.8,2.5
+			c-0.7,0.1-2.1,0.4-2.8,0.6c0,1.1,0,2.2,0.1,3.3c-0.7-1.1-1.5-2.2-2.2-3.3c-1.4,0-2.7-0.1-4.1-0.1c0.7,1.2,1.3,2.4,2.1,3.6
+			c-1.2-0.2-2.3-0.4-3.5-0.6c0,2.1,0.8,4.7-1,6.3c-0.6,0-1.8,0.1-2.5,0.2c0.2-5.8,4.8-9.9,6.7-15c1.9,0.9,3.7,3.5,6,2.2
+			c1.5-0.7,2.8-1.7,4.2-2.6c-1.2-1.5-2.4-3-3.6-4.6c-0.3,1.8-0.6,3.5-0.9,5.3c-1-1.6-2.1-3.2-3.1-4.9c0.9-1.2,1.7-2.4,2.6-3.5
+			c2.3-1.5,5.7-0.5,7.5-2.7C484.4,523.2,483.6,521.4,483,519.7z"/>
+		<path class="st5" d="M669.8,517.7c2.9,0,3.7,2.4,3.5,4.8C670.7,522.3,669.6,520.1,669.8,517.7z"/>
+		<path class="st5" d="M689.2,519l0.8,0.2c0,2.9,0.4,5.8,1.8,8.3c-1.6,1.3-3.5,1.9-5.4,2.4c0,1.4-0.1,2.9,0,4.4
+			c0.2,0.2,0.7,0.5,1,0.7c0.5,0.3,1.5,0.9,2,1.2c-1.3,0-2.6,0-3.9,0c0.2,1,0.4,1.9,0.6,2.9c-0.9-0.2-1.9-0.3-2.8-0.5
+			c-0.2,1.2-0.4,2.3-0.6,3.5c0.3,0.4,0.8,1.3,1.1,1.7c-3.6-0.4-6.1,2.5-8.9,4.1c-0.9-2-1.8-4.1-2.7-6.1c1-3.4,1.4-7.2-0.7-10.3
+			l-0.4-0.8c-0.3-1.5-0.5-2.9-0.7-4.3c0.6-0.3,1.9-0.8,2.5-1c1.1,0.9,2.2,1.9,3.4,2.9c0.7-1.9,1.4-3.7,2.1-5.6
+			c0.4,0.3,1.2,0.9,1.6,1.2c1.2,2.7,0.9,5.6-1.4,7.7c2-0.5,4-1,6-1.4c0.1-0.8,0.2-1.6,0.3-2.4c-0.7-0.1-2.1-0.4-2.8-0.5
+			c0.3-0.6,0.8-1.7,1.1-2.2c1.8,0.4,3.7,0.6,5.6,0.7C688.7,523.5,689,521.2,689.2,519 M682,535.1c-0.5,1.6,0,2.2,1.7,1.8
+			C684.1,535.2,683.6,534.6,682,535.1 M676.2,541.3c-1.2,1.4,1.4,2.6,2.2,1.2C679.6,541.1,677,540,676.2,541.3z"/>
+		<path class="st5" d="M710.6,518.9c1.5,2,3,3.9,4.5,5.9c-1.1,2-2.3,4-3,6.3c1.5,1.4,3.2,2.5,4.8,3.8c0.7-1.2,1.5-2.5,2.2-3.7
+			c0.2,0.3,0.6,1,0.8,1.3c-0.3,1-0.7,2.1-1.1,3.1c-2.2,1.1-4.5,2.2-6.7,3.3c0.2-0.5,0.6-1.5,0.8-2c-0.5-0.5-1-1-1.4-1.5
+			c-0.3-2.6-0.6-5.3-0.9-7.9c-1.3-0.2-2.7-0.4-4-0.6C706.3,523.6,708,520.9,710.6,518.9z"/>
+		<path class="st5" d="M366.3,522.3c3.3-1.7,1.1,4.8-0.6,1.6C365.9,523.5,366.1,522.7,366.3,522.3z"/>
+		<path class="st5" d="M379.3,525.3c2.7-0.3,5.6,0,7.9-1.8c-0.8,2.5-1,5.2-1,7.9c1.5-0.9,2.9-2.1,4.2-3.3c1-0.9,2.1-1.8,3.2-2.7
+			c0.5,0.5,1.5,1.6,2,2.1c-0.6-0.1-1.8-0.2-2.4-0.3c-0.5,1.4-0.9,2.8-1.5,4.1c-0.5,1.1-1,2.2-1.6,3.3c-0.2,0.4-0.7,1.1-0.9,1.4
+			c-4.5,1-7,5-10.1,8.1c-1.1,1-2.2,2-3.3,2.9c-1.1-3,0.6-5.3,2.7-7.2c-0.5-1.7-1-3.4-1.5-5c-2.5,2.7-4.2,6-6.5,8.8
+			c-1.3,1.5-2.3,3.4-2.2,5.4c1.3,2,3.6,0.7,5.5,0.5c0.3,0.3,1,0.8,1.3,1.1c0.2,1.8,0.4,3.6,0.7,5.4c0.2,1.5,0.6,2.9,0.9,4.4
+			c2.9-0.3,5.9-0.5,8.8-0.5c0,2.1,0.1,4.2,0.2,6.2c-1.2,0.3-2.4,0.7-3.5,1c0,0.9,0.1,1.7,0.1,2.6c-1.1-0.8-2.2-1.5-3.3-2.3
+			c-1.2,0.8-2.5,1.6-3.8,2.5c0.8,2.2,2.3,4.4,2.3,6.8c-1,2-2.3,3.9-3.4,5.8c-1.1,0-2.2,0-3.2,0c0.7-2.5,2.7-4.1,4.6-5.6
+			c-1.4-1.1-2.7-2.2-4.1-3.4c0.1-4.5,0.3-9-0.8-13.4c-1.9,1.3-3.7,2.6-5.5,4c1.1,1,2.3,2,3.4,2.9c-0.1,3.8-0.1,7.5,0,11.3
+			c-1.5,0.2-3.1,0.4-4.6,0.6c-0.6-0.6-1.2-1.2-1.8-1.8c0.6-1.2,1.1-2.3,1.7-3.5c-1.9-0.2-3.8-0.2-5.7-0.1c0.8,2.5,1.3,5.1,1.7,7.8
+			c-0.9,0.3-1.9,0.7-2.8,1.1c-1.7,1.8-3.2,3.7-4.7,5.7c-0.9-4.2-0.6-8.5,0-12.7c2.1-0.9,4.1-2.1,5.2-4.2c2.4,0.4,4.8,0.5,7.2,1
+			c0.4,1.8,0.6,3.7,0.8,5.6c0.2-0.3,0.7-0.9,1-1.2c0.2-3.1,0.6-6.3,0.1-9.4c-1.1-1.6-3.2-1.7-4.9-2c0-1.6,0.5-3.4-0.6-4.8
+			c-1.5,0.3-2.9,0.8-4.3,1.3c2.8-2.7,4.7-6.1,7.4-8.9c1.7,2.8,0,5.7-1.1,8.4c3.6,1.1,6.6-1.8,9.3-3.9c1.9-1.3,1.1-3.8,1.1-5.7
+			c-1.8-0.2-3.7-0.3-5.4-0.9c-2.2-1.2-1.2-4.1-0.3-5.8c3.4-4.5,6.4-9.4,10.8-13c0.1,0.5,0.4,1.4,0.5,1.8c1.7,0.7,3.5,1.2,5.3,1.9
+			c0.7-3.2,0.9-8.3-2.5-10c-2.8,0.1-2.3,3.6-3.1,5.5C378.7,529.3,377.8,527,379.3,525.3 M373.2,564.9c0.4,2.2,3,1.6,4.6,2
+			c-0.4-1.6-0.8-3.2-1.2-4.8C375.1,562.4,372.6,562.8,373.2,564.9 M353.2,576.3c-0.1,1.5-0.1,3-0.1,4.5c1.9,0,3.9,0,5.9,0
+			c-0.3-1.4-0.4-3-1.2-4.3C356.2,575.9,354.6,576.3,353.2,576.3z"/>
+		<path class="st5" d="M515.4,526.1c1.2-1,2.4-1.9,3.6-2.8c1.4,1.9,2.8,3.9,4.1,5.9C520.2,529.5,517.1,528.9,515.4,526.1z"/>
+		<path class="st5" d="M1510.1,532.1c1-1.3,2.3-0.5,3.1,0.5c-0.4,1.8-0.4,3.6-0.3,5.5c-0.7,0-2.1,0-2.8,0
+			C1510.1,536.1,1510,534.1,1510.1,532.1z"/>
+		<path class="st5" d="M139,532c3.4,0,4.6,4.3,4.8,7l-0.9,0.2C141.4,537.1,139.5,534.7,139,532z"/>
+		<path class="st5" d="M146.1,532.3c1.4-1.2,2.6,1.4,1.3,2.2C146.1,535.7,144.9,533.1,146.1,532.3z"/>
+		<path class="st5" d="M1485.3,532.3c1.2-0.6,2.6,0,3.6,0.8c-0.5,2.5-4.1,3.1-5.4,0.9C1484,533.6,1484.9,532.7,1485.3,532.3z"/>
+		<path class="st5" d="M1531.2,539c1.8-2.2,3.4-4.5,5.8-6.2c0.3,0.2,1,0.8,1.3,1c-1.5,4-4,7.8-4.1,12.2c-0.1,2.2-0.6,5.8,2.6,5.6
+			c3.6-0.6,1.4-4.5,1-6.8c1.9-2.7,4.8-4.1,8.2-4c1.3,3.9,2.5,7.9,3.9,11.9c-0.6,0.5-1.7,1.6-2.3,2.2c-1.5-0.3-2.9-0.5-4.3-0.8
+			c0.1-3.8,0.2-7.5,0.5-11.3c-5.1,0.2-2.3,6.4-4.6,9.4c-2.1,1.3-4.5,0.2-6.6-0.7c0.1-3.3,0.8-7-1.2-9.9c-0.8,2.2-1.5,4.4-1.9,6.7
+			c-0.6-2.8-1.5-5.4-2.1-8.1C1528.4,539.4,1529.8,539.3,1531.2,539z"/>
+		<path class="st5" d="M0,537.8c3.6-0.9,7.2-2.1,10.8-2.8c0.4,3.5-0.6,7,1,10.3C9.2,548,7,551,4.6,553.8c-1.5,0.6-3.1,0.5-4.6,0.8
+			v-6.5c3.2-0.2,6.8-0.3,8.3-3.7c-0.8-0.8-1.5-1.7-2.3-2.5c2.9-0.3,3.6-3,4-5.4c-2.5,0.8-5,1.5-7.6,2.2c-0.1,0.6-0.3,1.7-0.4,2.3
+			c-0.5,0.3-1.6,1-2.1,1.3V537.8 M3,553.7c1.5-0.8,2.8-2.1,2.7-4c-1.3-0.7-2.7-1.3-4.2-1.6C1.3,550.1,0.2,553,3,553.7z"/>
+		<path class="st5" d="M1189.3,537.3c2.3-2.1,5.4,2.3,3.1,4.1C1189.9,543.2,1188.4,539.1,1189.3,537.3z"/>
+		<path class="st5" d="M1231.3,537.2c2.2-1.4,2.9,4.2,0.6,3.8C1229.3,541.8,1229.3,537.8,1231.3,537.2z"/>
+		<path class="st5" d="M136.8,538.5c0.5,1.8,1.1,3.5,1.6,5.3c1.3-0.2,2.5-0.3,3.8-0.4c0.3-1.2,0.6-2.4,1-3.6c1.7,0,3.3-0.1,5,0
+			l0.1,0.9c-0.9,0-2.7,0-3.6,0c0,1.3,0,2.7,0,4c-0.5,0.5-1,1-1.5,1.5c0.9,1.6,1.6,3.2,2.3,4.9c-2.8-2.1-5.7-4.2-9-5.6
+			C136.5,543.2,136.6,540.9,136.8,538.5z"/>
+		<path class="st5" d="M166.1,541.3c2.8,1.6,6.1,1.7,9.3,2c-1.8,0.3-3.5,0.7-5.3,1.2c0.2,1.4,0.9,2.6,1.6,3.8
+			c-2.1-1.1-4.2-2.1-6.3-3.1C165.7,543.9,165.9,542.6,166.1,541.3z"/>
+		<path class="st5" d="M513.4,546.3c1.4-2.1,2.5-4.9,5.2-5.6c0.2,1.5,0.4,3,0.7,4.4c-0.4,0.3-1.1,0.8-1.4,1.1
+			C516.4,546.3,514.9,546.3,513.4,546.3z"/>
+		<path class="st5" d="M1235.1,545.2c1.8-0.6,2.2,2.3,0.6,2.7C1233.9,548.6,1233.3,545.5,1235.1,545.2z"/>
+		<path class="st5" d="M187.1,548c1.9,0.4,5.6-0.1,5,2.9c0.5,3-3.4,4.1-3.7,0.7c-0.6-0.2-1.2-0.3-1.8-0.5
+			C186.7,550.4,187,548.8,187.1,548z"/>
+		<path class="st5" d="M145.5,552.1c0.4-2.2,3.3-1.3,4.8-1.2c0.3,1.7-1.1,2.7-2.3,3.6C147.1,553.7,146.3,552.9,145.5,552.1z"/>
+		<path class="st5" d="M380.1,553.8c0.9-0.7,1.9-1.3,2.9-1.9c1,0.6,1.9,1.2,2.8,2c-0.9,0.8-1.9,1.7-2.8,2.6
+			C382,555.6,381.1,554.7,380.1,553.8z"/>
+		<path class="st5" d="M509.7,557.6c1.5-1,3.1-1.9,4.8-2.4c-0.7,3.7-1.8,7.4-4.2,10.4c-2.1-2.1-3.6-4.6-3.1-7.7
+			C507.9,557.8,509.1,557.7,509.7,557.6z"/>
+		<path class="st5" d="M822.3,555.1c1.9-1.7,4,0.9,2.5,2.7c-1.4,0.9-4.3,2.8-4.9,0.1C818.6,556.4,821.3,555.8,822.3,555.1z"/>
+		<path class="st5" d="M488,563.5c-1.9-1.3,0-5.1,2.4-3.8C490.8,561.7,490.9,564.6,488,563.5z"/>
+		<path class="st5" d="M459.5,561.5c1.6-0.2,3.2-0.5,4.8-0.6c-0.1,2.7-2.8,3.6-4.7,4.8C459.6,564.7,459.5,562.5,459.5,561.5z"/>
+		<path class="st5" d="M1726.1,560.9c2.3,0,4.6-0.1,6.9-0.1v2.6c-2.1-0.8-4.3-1.4-6.5-2c0.5,1.8,0.9,3.8,1.7,5.5
+			c1.4,0.9,3.2,0.3,4.8,0.3v0.4c-3,1.2-5.4,3.5-7.8,5.7c-0.3-0.6-1-1.9-1.4-2.5c0.2-0.8,0.5-2.4,0.7-3.1c-0.9,0.1-2.8,0.3-3.7,0.4
+			c1.6-0.8,3.2-1.5,4.9-2.2C1725.8,564.1,1725.9,562.5,1726.1,560.9z"/>
+		<path class="st5" d="M464.4,567.4c0.5-0.9,1-1.9,1.5-2.8c0.7,2.7,1.7,5.2,2.7,7.8c1.2,0.5,2.5,1,3.8,1.6c-0.8,0.1-2.3,0.2-3.1,0.3
+			c-0.6,2.2-1.1,4.4-1.7,6.6c-0.5,0.2-1.6,0.5-2.1,0.7c0.2,2.9-1.4,5.5-2.6,8c0.5,0.3,1.5,0.8,2,1.1c1-0.8,2-1.5,3-2.2l1.1,1.2
+			l-0.5,0.5c-1.9,1.3-4.2,2-6.4,2.7c0.1,1.5,0.3,2.9,0.4,4.4c-1-1-2-2.1-3-3.1c-0.6,0.9-1.2,1.8-1.7,2.6c-1.6,0.1-3.2,0.4-4.6,1.2
+			c-0.2-1-0.3-2-0.4-3.1c1-1.4,2.9-1.2,4.4-1.5c0.4-0.8,0.8-1.5,1.2-2.2c1,0,2.1,0,3.1,0c-1-1.5-2.1-3-3.2-4.3
+			c0-5.1-1.9-10.3-0.3-15.2c0.6-2.3,3.4-2.6,5.2-3.6C463.7,567.7,464.2,567.5,464.4,567.4 M461.1,570c-0.6,1.3-1,2.7-1.3,4.1
+			c1.4-0.4,2.8-0.8,4.3-1.2C463.1,571.8,462.1,570.9,461.1,570 M460.4,575.2c-1.2,1.4,1.4,3.1,2.4,1.7
+			C463.9,575.4,461.4,573.8,460.4,575.2z"/>
+		<path class="st5" d="M1548.8,566c2.4-0.6,3.7,1,4.3,3.1C1550.8,569.5,1549.2,568.2,1548.8,566z"/>
+		<path class="st5" d="M16.5,574.8c-2.1-3-0.1-6.1,2.2-8.2c3.1,3.2,6.4,6.4,8.4,10.4c-3.2-1.7-5.5-4.5-8.3-6.5
+			C18,571.9,17.2,573.3,16.5,574.8z"/>
+		<path class="st5" d="M722.2,568.2c1.2-0.8,2.2-0.5,3.1,0.8c0.5,1.9-1.7,3.3-3.2,2C720.9,570.4,720.6,568.5,722.2,568.2z"/>
+		<path class="st5" d="M834,573.2c0.6,0.4,1.1,0.8,1.7,1.1c0.7-0.1,1.9-0.4,2.6-0.5c0.4,2.6-1.6,4.3-3.4,5.8
+			c-0.7-0.8-1.4-1.7-2.1-2.6C833.1,575.7,833.6,574.4,834,573.2z"/>
+		<path class="st5" d="M977.8,574c0.8-1.4,1.7-1.4,2.7,0c-0.1,1.5-0.2,2.9-0.5,4.4C978.5,577.3,976.8,575.9,977.8,574z"/>
+		<path class="st5" d="M194.8,580.3c3,0.7,5.2-3.3,8.1-1.3c-0.7,3.6-0.8,7.2-0.6,10.8c0.2-0.4,0.7-1.2,1-1.6
+			c1.5,1.2,3.5,1.4,5.3,1.7c0-1.3,0.1-2.6,0.1-3.9c2.9,2.3,1.2,6.9,2.4,10.2c-2.9,0.8-3.9-1.8-4.8-4c-1.4,1-1.8,2.8-2.8,4.1
+			c-2,1-4.3,1-6.4,1.5c0.9-1.9,1.6-3.9,2.1-5.9c-2.6,0.6-5.3,2.7-7.9,2c-0.6-2.8,0.7-6.6,3.4-8.2c1-0.5,1.4-1.3,1.2-2.3
+			c-3.9-0.5-6.9,3-10.8,2.7c-0.7-1.4-0.3-2.5,1-3.2C188.6,581.2,191.6,579.8,194.8,580.3 M199.3,581c-0.9,2.4-1.7,5-4.2,6.2
+			c-2,0.8-1.7,3-1.9,4.8C198.6,592,202.9,585.6,199.3,581 M200.4,591.3c-1,1.6-0.5,5.3,2,4.1C205.2,594,203,589.2,200.4,591.3z"/>
+		<path class="st5" d="M1173.9,586.2c-2.9-0.9-6.5-4-4.5-7.2c0.2,0.7,0.7,2,1,2.7c1.5,0.1,3.1,0.1,4.7,0.2
+			C1174.6,583.3,1174.3,584.8,1173.9,586.2z"/>
+		<path class="st5" d="M373.5,586.3c2.4-3.3,7.2-2.8,9.3-6.4c-1.7,3.2-3.1,6.6-4.9,9.8c-1.6,1.7-3.1,0.1-4.4-1
+			C373.4,588.1,373.5,586.9,373.5,586.3z"/>
+		<path class="st5" d="M1160.1,583.7c2-0.4,4-0.8,6-1.2c1.8,2.6,3.2,5.5,3.1,8.8c-2.6-0.3-4.8-1.5-6.6-3.3l-0.8-0.8
+			c0.6-0.8,1.2-1.6,1.8-2.4C1162.4,584.4,1161.3,584,1160.1,583.7z"/>
+		<path class="st5" d="M1513.1,584.6c1.2,1,2.3,2.1,3.5,3.1c-0.4,1.1-0.8,2.2-1.2,3.4c2.3,1.3,4.4,2.8,6.3,4.6
+			c1.7-0.3,3.3-0.7,5-1.1c0.1-1.2,0.2-2.4,0.3-3.6c2.2,0.2,4.4,0.5,6.6,1l-0.2,1.1c-0.2,1-0.5,1.9-0.7,2.8c-1.2-1.2-2.6-2.3-3.8-3.5
+			c-1.9,5.4-8.4,5.2-12.7,7.5c-1.2-3.9-2.5-7.7-3.7-11.6C1512.6,587.4,1513,585.5,1513.1,584.6z"/>
+		<path class="st5" d="M1702.7,585.3c1.9,0.5,3.8,1,5.6,1.7c-1.8,0.7-3.7,1.2-5.5,1.6C1702.8,587.7,1702.7,586.1,1702.7,585.3z"/>
+		<path class="st5" d="M150.4,589.8c1.7-1.9,3.9-0.9,5.9-0.3c0.4-0.3,1.2-0.9,1.6-1.2c0.8,2.3,1,4.8,0.8,7.2
+			C155.4,594.4,152.7,592.3,150.4,589.8z"/>
+		<path class="st5" d="M485.1,588.7c0.2,0.3,0.6,1,0.8,1.3c0.7,2.9,1.1,5.8,1.5,8.7c-0.6,0.4-1.9,1.1-2.6,1.5
+			c-1-1.3-1.9-2.5-2.9-3.8c-0.8,0.8-1.6,1.6-2.4,2.4c-0.2-0.3-0.6-0.8-0.8-1c-1.5,0.1-2.9,0.2-4.4,0.4c1.4-4.5,6.7-4.1,10.4-5.6
+			C484.8,591.2,485,589.9,485.1,588.7z"/>
+		<path class="st5" d="M471.2,594c1.1-1,2.2-2.1,3.4-3.1c-0.7,1.7-0.8,4.2-2.8,4.9c-1.6,0.5-3.3,0.8-5,1.2c0.7-1.8,1.5-3.5,2.2-5.2
+			C469.7,592.5,470.4,593.2,471.2,594z"/>
+		<path class="st5" d="M815.4,591.3c2.4-2.8,5.9,3.6,3.6,4.9C817.5,595.1,814.3,593.3,815.4,591.3z"/>
+		<path class="st5" d="M1702.7,591.5c1.2-0.4,2.4-0.8,3.6-1.1c0.5,0.4,1.4,1.2,1.9,1.6c-1.4,1.7-3.3,2.9-5.3,3.8
+			C1702.8,594.6,1702.7,592.5,1702.7,591.5z"/>
+		<path class="st5" d="M364.4,592.5c1.5-0.5,2.1,1.3,3,2.1c-3.3,3.8-6.8,7.9-12,8.9c-0.8,2.6-1,5.4-2.1,7.9
+			c-0.7-1.2-1.3-2.4-1.9-3.6c0-1.8,0-3.6,0-5.3c1.1,0,2.2,0,3.4,0c1.1-3.4,3.9-5.6,6.5-7.7C362.2,593.9,363.2,593,364.4,592.5z"/>
+		<path class="st5" d="M1176.3,594.2c0.1-2.3,2.7-2.4,4.4-2.3c-0.1,1.3-0.2,2.5-0.3,3.8C1179,596.3,1176.1,596.5,1176.3,594.2z"/>
+		<path class="st5" d="M496.3,595.8c0.5-0.6,1.4-1.9,1.9-2.5c1.7,0.8,3.4,1.7,5,2.7c-1.2,0.8-2.5,1.6-3.7,2.4
+			c-0.1,1.4-0.2,2.7-0.3,4.1c2.3-1.2,4.7-3.9,7.5-2.6c-1.1,3.1-3.4,5.5-5.7,7.7c-0.9-0.8-1.9-1.6-2.8-2.4c-0.5-0.5-1.6-1.3-2.2-1.8
+			l-1.4,0.3c-1,1.5-1.8,3.1-2.2,4.9l0.6,1.4c-0.8-0.5-1.7-0.9-2.5-1.4c-1,0-2,0-3,0c-1.2-0.9-2.4-1.9-3.6-2.8
+			c-0.4,1.5-0.7,3.1-1.1,4.7c-0.5-1.2-1-2.5-1.4-3.7c-1.2-0.8-2.3-1.6-3.5-2.4c0.5-0.3,1.4-0.9,1.9-1.2c0.3,0.5,0.9,1.4,1.1,1.9
+			c3.6-0.7,7.5-0.8,10.9-2.4c2-0.9,2.4-3.3,3.2-5.1C495.4,597,495.8,596.4,496.3,595.8z"/>
+		<path class="st5" d="M234.5,595.9c1.3,2.7,2.6,5.4,4,8c-2,3.1-4.7,5.6-7,8.5c0,1.4,0.4,2.7,0.6,4.1c1.3,0.2,2.7,0.3,4,0.5
+			c-2.2,2.2-5.4,0.2-8.1,0.1c0.2-0.6,0.5-1.7,0.7-2.2c-0.8-0.7-1.5-1.3-2.3-2c4.4,0.3,5.6-4.5,4.6-8c0.4-1,0.9-1.9,1.4-2.9
+			c-0.4-1.5-0.9-3-1.3-4.4C232.3,597.1,233.4,596.5,234.5,595.9z"/>
+		<path class="st5" d="M932.6,597.1c1.4,1.1,2.7,2.4,4,3.7c-0.1,1.3-0.1,2.7-0.1,4c3,0.6,6,1.3,8.9,1.9c2-3.3,3-7,4.4-10.6
+			c1.5,4.4-1.4,8-3.7,11.4c-4.4,0.2-8.7-0.5-12.4-2.9c-1,0.9-2,1.8-3,2.7C929.7,603.7,932.8,600.7,932.6,597.1z"/>
+		<path class="st5" d="M977,599.2c1.5-1.4,3.2,0.4,4.2,1.5c-0.6,0.4-1.8,1.2-2.4,1.7C978.2,601.4,975.9,600.6,977,599.2z"/>
+		<path class="st5" d="M1257.2,605.2c0.4-1.7,0.9-3.9,2.9-4.2c1.3,0.9,2.2,2.3,3.3,3.5c1.7,0.5,3.7,0.8,4.6,2.7
+			c-2.7,1.4-7,3.3-8.5-0.6c-0.5,1.5-0.9,2.9-1.3,4.4c-3.7-0.3-7.4,0.5-10.4,2.8c-1.7-2.5-0.1-4.9,2.4-5.9c0.1,0.5,0.3,1.5,0.4,2
+			c2.4-0.1,4.8-0.3,7.2-0.7c-0.2-1.2-0.3-2.3-0.5-3.5L1257.2,605.2z"/>
+		<path class="st5" d="M452.1,602l0.1,0.4c1.5,0.8,3,1.4,4.4,2.1c0.5,1.2,1,2.5,1.5,3.7c1.3-0.7,2.6-1.3,4-1.7
+			c0.3,2.2-0.3,4.2-1.7,5.9c-0.8-0.9-1.7-1.7-2.5-2.5c-0.5-1.6-1.3-2.9-3.2-2.6c0.1,1.2,0.2,2.5,0.4,3.8c-0.4,2.4-0.7,4.9-0.9,7.3
+			c-0.6,0.1-1.7,0.2-2.3,0.3C451.7,613.2,452,607.6,452.1,602z"/>
+		<path class="st5" d="M1230.1,608.2c-1.3-2.4,1.4-5.7,3.7-4.1c-0.9,2-3.4,3.8-2.1,6.1c0.6,2.6,3.6,2.7,5.5,3.8
+			c-0.7,1.1-1.8,1.9-2.8,2.7c0.9,2.9,0.8,5.9-0.5,8.7c-0.9-1-1.8-2.1-2.6-3.1c-0.3,1.4-0.5,2.8-0.8,4.2c2.8,3.5,7,1,10.7,1.4
+			c-0.4,1-0.8,2-1.3,3c-2.2,0.5-4.5,0.3-6.7,0.3c-0.7,1-1.4,2-2.1,3c-2.7-0.4-5.4-0.7-8-1.3c-1.6-1.4-2.4-3.6-3.6-5.4
+			c-1.1-0.5-2.1-1-3.1-1.6c2-2.3,5.5,0,6.1,2.4c0.4,1,0.8,1.9,1.3,2.9c2.4,0.5,4.7,1,7.1,1.5c-0.4-2.1-0.9-4.4-2.7-5.8
+			c-1.2-0.7-2.4-1.2-3.6-1.8c1-0.9,2-1.8,3-2.6c-0.5-0.5-1-0.9-1.5-1.3c2.9,0,5.8,0.1,8.7,0.1C1233.2,617,1231.4,612.7,1230.1,608.2
+			z"/>
+		<path class="st5" d="M899.7,605c2.1-0.7,4.4-0.5,5.6,1.7c-0.6,0.4-1.8,1.2-2.4,1.7C901.8,607.3,900.8,606.2,899.7,605z"/>
+		<path class="st5" d="M916.8,605c1.3,1.1,2.6,2.4,3.8,3.6c0.5-0.4,1.5-1.2,2-1.5c1.2,0.5,2.4,0.9,3.6,1.4c-1.1,1-2.2,1.9-3.2,2.9
+			c0.2,1.7,1,3.2,1.7,4.7c-0.6,0-1.9,0-2.5,0c-1.3-2.1-2.5-4.2-3.8-6.4c-2.8-0.4-5.6-1-7.6-3.2C912.8,606,914.8,605.5,916.8,605z"/>
+		<path class="st5" d="M734.6,610.6c0.3-0.2,1-0.6,1.3-0.8c-1.3,3.6-2.3,7.3-3,11c1.4,0.2,2.8,0.5,4.2,0.7c-0.6,1.8-1.3,3.6-1.9,5.4
+			c1.5,1.8,2.8,3.9,3.3,6.2l-0.1,0.5c-2.9,1.3-4.1,4-4.3,7c-1-0.1-1.9-0.2-2.9-0.4c-0.2-2.9,1.2-5.3,2.8-7.6c1.1-1.5-1-2.5-1.8-3.5
+			c-1.8,3.6-5.6,4.9-9,6.5c2.6-3.8,7.1-5.4,10.5-8.2c0.2-2.9-1.3-5.2-3.2-7.3c-0.5,1.5-0.9,2.9-1.4,4.3c-2.4,0.4-4.8-0.1-7.2-0.3
+			c1-0.5,1.9-1,2.9-1.5c1-1.5,2-3.1,2.9-4.6c-1.3-1.2-2.5-2.5-3.6-3.8c0.5-0.4,1.6-1.2,2.1-1.6c0,1,0,1.9,0,2.9
+			c1.8-0.2,3.8,0.2,5.4-0.8C733,613.5,733.7,612,734.6,610.6z"/>
+		<path class="st5" d="M937.8,610.9c1-2.3,4.4,0.2,6.3,0.3c-0.2,1.1-0.4,2.3-0.6,3.4C941.4,613.7,939.6,612.3,937.8,610.9z"/>
+		<path class="st5" d="M1149.2,610.2c1.9,1.6,4.1,2.8,6.4,4.1c-2.9,1.4-6,2.4-9.1,3.2C1147,614.9,1148,612.5,1149.2,610.2z"/>
+		<path class="st5" d="M1008.2,614.8c-1.4-1.6,0.6-2.9,1.5-3.9c1.2,1.3,2.4,2.7,3.5,4.1C1011.7,615.6,1009.3,616.9,1008.2,614.8z"/>
+		<path class="st5" d="M1157,618c0.6-2.1,1.9-3.9,3-5.8c1,1.4,2,2.7,2.9,4.1c-1.4,0-2.8-0.1-4.3-0.1c0,1.6,0.1,4,2.3,4.1
+			c2.2,0.9,2.5-2.1,2.8-3.5c1.1,0.9,2.3,1.7,3.1,3c-1.1,1-2.3,1.9-3.4,2.7c1,1.3,2.6,2.4,2.4,4.3c-1.7,0.9-3.8,0.5-5-0.9
+			c-0.5-1.4-0.4-2.8-0.5-4.3C1159.1,620.7,1157.2,619.9,1157,618z"/>
+		<path class="st5" d="M212.8,615.9c1.4,0.3,3.7-0.6,4.4,1.2c0.4,1.8,0,4.5-2.2,4.8C212.2,621.2,212.8,618.1,212.8,615.9z"/>
+		<path class="st5" d="M457.2,617.8c1.7-0.2,3.4-0.3,5-0.5c1,4.5,0.7,9.1-0.1,13.6c-1.1-0.2-2.2-0.3-3.3-0.4c-2-1.3-4.1-2.3-6.3-3.1
+			c0.5-1.9,0-4.8,2.2-5.7c2.1-0.5,4.4-0.2,6.5-0.2C459.9,620.1,458.5,618.9,457.2,617.8z"/>
+		<path class="st5" d="M1534.8,620c0.5-2.2,2.8-3.7,4.9-2.5C1538.5,618.9,1536.6,622.9,1534.8,620z"/>
+		<path class="st5" d="M490.3,620.7c1-0.1,3-0.3,4-0.4c0.9,1.7,1.7,3.4,2.4,5.2C493.6,625.4,490.7,624.1,490.3,620.7z"/>
+		<path class="st5" d="M1506.8,621.1c3.6,0.2,7.2,0.2,10.7,0.3c1.5,0.7,3.1,1.5,4.5,2.5c1,1.4,2.4,2.4,4.2,2.9c0-1.1,0-3.2,0-4.3
+			c0.4,1.1,0.9,2.1,1.4,3.2c1.4-0.5,2.7-1,4.1-1.5c0.3,0.3,1,0.9,1.4,1.2c-4.9,0.8-8.4,4.7-12.9,6.6c0.2-2.7,0.3-5.4,0.6-8.1
+			c-4.2-0.6-8.4-0.6-12.6-0.4C1507.8,622.8,1507.3,621.9,1506.8,621.1z"/>
+		<path class="st5" d="M225.4,625.1c2.1-1.4,5.2-3.1,7.2-0.7c2.7,2.1,0.4,5.3-0.4,7.8c3.1-0.7,5.9-2.2,9-3c2.9-0.4,4.9,2.3,6.8,4
+			c-2,1.6-4.6,2-7,2.2c1.2-1.3,2.6-2.3,4-3.4c-3.3-1.9-7.8-1.3-9.6,2.3c-1.6,1.9,0.5,3.7,1.6,5.2c-1,1-2.9,1.7-2.5,3.4
+			c0.4,1.4,1.1,2.7,1.8,4c0.4-0.4,1.3-1.2,1.7-1.5c0,0.8,0,2.3,0.1,3c1.1,0.2,2.2,0.2,3.3,0.3c-0.2,0.4-0.7,1.3-0.9,1.7
+			c-2.8,0-5.7,0.3-7.5,2.7c2,0.8,4.1,1.6,6.1,2.5c0.6-1.5,1.1-3.1,1.7-4.6c4.8,0.8,5.6,6.1,6.5,10.1c-0.5,2.3-2.1,4-3.3,5.9
+			c-1.5-0.9-3-1.8-4.5-2.7c-0.8,2.9-1.2,5.8-1.5,8.8c2.4-0.1,5,0.1,7.3-0.9c2.4-0.9,4.9-2.9,7.6-1.8c2.4,0.5,3.7,2.8,4.6,4.9
+			c-2.6-2-5.6-4.5-8.9-2.5c2.1,2.1,4.2,4.1,6.1,6.3c-0.5,2.7-1.2,6.2,1.4,8c2,0.7,4.2,0.9,6.3,1.4c0.3,0.3,0.9,1,1.1,1.4
+			c-2.9-1.3-6,0-8.8,0.9c-2.1,0-4.2,0.2-6.2,0.9c-0.6,0.2-1.9,0.6-2.6,0.8c0.4,1.2,0.8,2.4,1.2,3.6c-0.5-0.2-1.6-0.5-2.1-0.7
+			c-3.1,1.7-5.3,4.4-6.9,7.5c-0.5-1.1-1-2.3-1.5-3.4c-1.4,0.1-2.7,0.3-4.1,0.5c2.4-2.5,5.3-4.4,8.4-5.9c3.7-1.7,5.2-5.8,8.2-8.4
+			c0,0.9,0,2.8,0.1,3.7c1.8-0.2,3.6-0.5,5.4-0.7c-0.9-2.2-1.8-4.4-2.7-6.6c-0.7,0.8-1.4,1.6-2,2.4c-0.4-2.9-0.1-5.8,0.8-8.5
+			c-3.9,3.3-8.6,5.6-13.8,4.5c0.8,2.8,1.9,5.6,2.3,8.6c-1.3,0.8-2.8,1.5-4.2,2.1c-1.2,2.5-2.9,4.6-5.4,5.9c-1-2-1.9-4.1-2.9-6.1
+			c0.5-3.5,3.4-5.6,5.7-7.9c1.3,1.4,2.7,2.6,4.1,3.9c-0.4-2.8-0.4-5.7-0.2-8.5c2.5,0,5.2,0.6,7.6-0.2c1.5-0.9,2.5-2.3,3.7-3.5
+			c-3.3-1.2-6.8-0.3-10.2-0.3c-1.5-0.4-1.2-2.1-1.4-3.3c0.8-3,1.6-6.1,2.3-9.1c-1-2.1-2-4.1-3-6.2c-1.3,0.8-2.6,1.6-3.8,2.6
+			c1.2,2.3,2.9,5.1,1.6,7.8c-3.7,1.8-7.9,2.6-12,2.4c-2.9-0.6-3.5-4-4.1-6.4c-1.1,0.2-2.2,0.5-3.3,0.7c-0.2-0.5-0.6-1.3-0.9-1.8
+			c2.4-0.7,4.9-1.2,7.4-1.6c-0.2,2-0.7,4.1-0.6,6.2c0.3,1,1.5,2.1,2.6,1.5c3.2-0.9,6.3-2.3,9.5-3.2c-0.5-2.6-0.7-5.3-0.6-7.9
+			c-1.7,0-3.4,0.1-5,0.1c0.2-0.6,0.5-1.7,0.7-2.2c-1-1-2-1.9-3.1-2.9c0.3-1.1,0.6-2.2,0.9-3.2c-2,0.1-3.9,0.2-5.9,0.3
+			c0.1,3.5,3.2,5.6,5.5,7.7c-3.2-0.7-6.1-2.9-7.3-6c0.5-3.8,5.2-3.4,8.1-3.7c2.7-0.1,1.5,3.1,1.5,4.8c0.5-0.1,1.5-0.3,2-0.4
+			c1.2-3.2,2.8-6.3,3.2-9.7c-1.3-2.6-4-4.4-4.4-7.4c3.3-1.3,4.2-4.7,4.2-8C229.6,625.5,227.5,625.3,225.4,625.1 M232.2,645.4
+			c-1.9,1.1-1.3,3.9-1.2,5.7c1.2-0.4,2.5-0.8,3.7-1.4C235.3,648,234.2,645.4,232.2,645.4 M241.4,659.3c-0.2,1.5-0.3,3.1-0.3,4.6
+			c1.9-0.1,4.7-0.5,4.7-3C245.9,658.5,242.8,659.5,241.4,659.3z"/>
+		<path class="st5" d="M488.2,623.8c2.3,1.1,4.3,2.6,6,4.5c1.5-0.8,3-1.7,4.6-2.4c-0.2,1.4-0.4,2.8-0.6,4.3c1.9-1,3.9-2,5.7-3.2
+			c-1.1,1.2-1.8,2.6-1.2,4.3c2.3,1,3.4-1.3,4.8-2.7c0.2,2,0.5,4,0.7,6.1c-0.7,0.8-1.4,1.5-2.1,2.3c-0.9,1.1-1.7,2.3-2.5,3.4
+			c-1.8,1.7-4,2.8-6.1,4c-0.4-1.4-0.9-2.8-1.3-4.1c1.3-0.8,2.7-1.6,4-2.3c-0.2-2.3-0.4-4.6-0.6-6.9c-1.1,0.1-2.3,0.3-3.4,0.5
+			c0.4,1.6,0.9,3.2,1.3,4.8c-0.8,0.1-1.6,0.1-2.4,0.1c-2.8-2.3-4-5.9-5-9.3c-2.3,0.4-4.6,1-6.8,1.5c0.1-0.6,0.5-1.7,0.6-2.2
+			c0.2,0,0.6-0.2,0.8-0.2c0.5,0.1,1.6,0.2,2.1,0.3C487.4,625.6,487.8,624.7,488.2,623.8z"/>
+		<path class="st5" d="M1175.6,624.6c1.1-0.5,2.7-1,3.1,0.6c-0.5,1.6-1.4,3-2.2,4.4c0.6,0.9,1.3,1.7,2,2.6c-0.9,2.2-4.3,4.1-5.6,1.3
+			c0.4-0.2,1.3-0.7,1.7-1c-1.5-0.5-2.8-1.2-4-2.1c0.7-0.2,2.1-0.7,2.7-0.9C1174.1,627.8,1173.6,625.2,1175.6,624.6z"/>
+		<path class="st5" d="M1202.2,624c3.6-0.2,1.3,3.5,1.3,5.6c0.6,2.2,2.4,3.7,3.7,5.5c-2.1,1.9-3.8,5.3-7.1,5
+			c-0.2-1.2-0.4-2.3-0.6-3.5c-0.3-0.4-1-1.1-1.3-1.4c0.7-0.1,2-0.3,2.7-0.3C1200.3,631.1,1202,627.7,1202.2,624z"/>
+		<path class="st5" d="M1248.4,629.6c-1.7-1.8-0.5-4.5,0.5-6.4c1.6,1.6,2.8,3.6,3.1,5.9C1251.7,631.1,1249.4,630.2,1248.4,629.6z"/>
+		<path class="st5" d="M1544.2,624.2c0.7-0.9,4.8-1.2,3.8,0.7C1548.2,627.4,1541.8,626.6,1544.2,624.2z"/>
+		<path class="st5" d="M718.7,627.4c2.3,0.4,3.8,2.2,5.1,4C721.1,632,717.6,630.9,718.7,627.4z"/>
+		<path class="st5" d="M1711.2,631.2c0.9-0.9,1.8-1.7,2.7-2.5c2,0.5,0.9,3.2,1.1,4.6C1713.7,632.8,1712.4,632.1,1711.2,631.2z"/>
+		<path class="st5" d="M356.4,629.9c1.8,1.1,3.6,2.1,4.8,3.9c-1.4-0.2-2.7-0.4-4.1-0.6c-1.3,1.8-2.7,4-1.4,6.2
+			c2.3,0.4,4.7-0.4,7-0.8c-0.2-0.9-0.4-1.8-0.6-2.6c1.6,1.4,3.6,2.3,5.6,3.1c0.2-1.7,0.4-3.3,0.6-5c0.8,1.4,1.6,3.1,0.7,4.7
+			c-1.2,0.7-2.5,1.3-3.8,1.9c0,2,0.1,3.9,0.2,5.9c2.2-2.6,3.5-5.8,6-8c0.2,2.2,0,4.5,0.8,6.6c0.7,1.8,3,1.6,4.5,2
+			c1-4,1.7-9.2,6.4-10.3c-1.3,1.7-2.6,3.4-3.9,5c2.4,0.6,5,1.2,7,2.7c-1.3,1.1-2.6,2.2-3.9,3.3c-0.2-0.8-0.5-2.4-0.7-3.1
+			c-2.8,1.6-5.6,3.1-8.4,4.7c0,0.6,0,1.9,0,2.5c1.2,0.1,2.4,0.1,3.7,0.2c-1,0.8-2,1.8-3,2.7c2.4,0.1,4.7,0.2,7.1,0.3
+			c0.3,1.8,0.5,3.6,0.8,5.5c0.7,0.3,1.5,0.7,2.2,1.1c-2.1,0.8-3.9,2.2-4.7,4.4c-1.8-1.6-3.4-3.2-5.3-4.7c1.5,0.1,3.5,1,4.7-0.4
+			c1.4-1,1.3-2.8,1.7-4.3c-4.1,0.3-7.8-1.7-11.7-2c-1,3.1,2.6,4.3,4.4,6c-2.2-1-5.2-1.1-6.3-3.5c-0.6-1.9,0.9-3.5,1.7-5
+			c-0.5-0.5-1-1-1.5-1.5c-0.7,0.5-1.4,1-2.1,1.6c-0.4-0.1-1.3-0.4-1.7-0.6c0.8-0.8,1.6-1.6,2.4-2.5c0.2-1.7-1.2-2.7-2.5-3.4
+			c-1.3,0.7-1.9,2.1-2.6,3.3c-0.4-0.8-0.7-1.6-1-2.4c-1.4-0.1-2.8-0.3-4.2-0.4c-1-1.5-2-3-3-4.5
+			C353.2,637.5,354.8,633.7,356.4,629.9 M354.6,640.5c0,0.9,0,2.6,0,3.5c0.6,0.4,1.9,1.2,2.5,1.6c1.1-1.2,2.2-2.3,3-3.7
+			C359.2,639.7,356.5,640.8,354.6,640.5z"/>
+		<path class="st5" d="M794,632c3.2-1.2,6.7-0.2,10,0c0,0.4-0.1,1.2-0.1,1.6c-3.3,1.1-6.6,2.1-9.8,3.4
+			C793.9,635.4,793.5,633.7,794,632z"/>
+		<path class="st5" d="M244.1,638.7c2.9-1.5,5.9-3,7.9-5.7c1.6,3.3,3.2,6.6,4.5,10c-1.4-1.5-2.9-2.8-4.5-4.1c-0.5,2-1,4.1-0.8,6.3
+			c-0.6-0.2-1.8-0.8-2.4-1c-0.2-1.5-0.3-3-0.5-4.5C246.9,639.3,245.5,639,244.1,638.7z"/>
+		<path class="st5" d="M454.4,635.5c0.9-1.2,2.3-2,3.6-2.9c1.5,0.9,2.9,1.8,4.4,2.7l0.5,0.8c-0.6,0-1.8,0-2.4,0.1c0.2,2,0.4,4,1,5.8
+			c-1.1,0-2.7-0.4-3,1.2c0.1,2.1,0.8,4.2,1.2,6.3c-1.5-0.5-2.9-1.2-3.8-2.5C455.1,643.2,454.5,639.3,454.4,635.5z"/>
+		<path class="st5" d="M833.2,633.1c1.8-1.7,5.1,1.4,2.6,2.7C834,637.6,831.7,634.8,833.2,633.1z"/>
+		<path class="st5" d="M1193.1,633.1c1.8-1.7,4.6,0.9,2.7,2.8C1194.2,637.8,1191.4,634.9,1193.1,633.1z"/>
+		<path class="st5" d="M1727.3,632.7c1.4,2.7,3.5,4.9,5.7,7v0.9c-2.7-0.1-5.3-0.2-8-0.1c-2.3-0.5-4.3,1.3-3,3.6l0.1,0.7
+			c-0.5,0.1-1.4,0.3-1.8,0.5c-0.6-2.8-1.5-5.6-4.3-6.8c0.6-1.5,1.3-2.9,2-4.4c0.9,0.6,1.8,1.3,2.8,1.9c0.5,0.5,1.5,1.4,2,1.9
+			C1724.5,636.5,1726.1,634.8,1727.3,632.7z"/>
+		<path class="st5" d="M988.4,644.9c0.6-2.6,1.7-5.1,2.4-7.6c0.1,4.9,4.1,8.3,8,10.5c-2.6,0.4-4.9,1.7-6.9,3.2
+			C990.6,649,989.2,647.1,988.4,644.9z"/>
+		<path class="st5" d="M131.9,646.2c0.1-2,0.6-4,1.6-5.8c1.4,2.6,2.4,5.3,2.9,8.2C134.9,647.8,133.4,647,131.9,646.2z"/>
+		<path class="st5" d="M727.8,641.7c1.2,2.1,2.1,4.2,3,6.5c-1.7,0.9-3.4,1.2-5.1,0.4c-0.3-0.7-0.8-2-1-2.7c0.6-0.3,1.7-1,2.2-1.3
+			C727,643.9,727.5,642.4,727.8,641.7z"/>
+		<path class="st5" d="M149.4,644.4c0.5,1.6,1,3.2,1.5,4.9c1.6,0.2,3.3,0.5,4.9,0.8c0,2.9,0.2,5.8,0.4,8.7c-4-0.2-8.2,0-11.7-2.2
+			c0.9-0.2,2.9-0.7,3.8-0.9c-0.8-4-5.2-4.6-8.2-6.3c0.8-1.2,1.6-2.4,2.5-3.5c0,1.1,0,2.3,0.1,3.5c1.6,1.4,3.7,0.8,5.6,0.4
+			C148.7,647.9,149,646.1,149.4,644.4 M150.3,651.3c0.3,1.3-0.7,4.6,1.7,4.2c2.5,0.5,2.9-2.2,2.7-4
+			C153.2,651.4,151.8,651.4,150.3,651.3z"/>
+		<path class="st5" d="M1276.9,644.8c0.8,0.1,2.3,0.2,3.1,0.2c0.2,2.8,0,6,2.3,8c-1.1-0.3-2.2-0.6-3.3-0.8c-0.6,1-1.1,2-1.6,3
+			c-0.2-2.5-0.1-4.9-0.2-7.4c2.6,1.2,2.3-3.2-0.1-1.8L1276.9,644.8z"/>
+		<path class="st5" d="M1130.2,656c1.2-3.4,2.6-6.8,4.2-10.1c0.2,0.6,0.5,1.8,0.7,2.4c0.6,0.2,1.9,0.6,2.5,0.8
+			c0,1.1,0.1,2.2,0.2,3.3c-2.6,2.3-6.5,4.6-4.7,8.6c2,1.6,4.3,2.9,6.6,4c-0.5,1-0.8,2-1.1,3c1,1.2,2.2,2.3,3.3,3.4
+			c-1.3-0.2-2.6-0.5-3.8-0.8c-0.9-2.3-1.7-4.7-3.5-6.5c-0.5,1-0.9,2.1-1.4,3.1c-0.3-0.7-1-2-1.3-2.6c-1.2,1.2-2.3,2.4-3.5,3.6
+			c0.1-2.8,2.1-4.6,4.1-6.2C1132,659.9,1131.2,657.9,1130.2,656z"/>
+		<path class="st5" d="M695.2,647.1c1.3-1.7,2.4,1,2.5,2.1c0.6,1.6-1.1,2.5-1.9,3.6C695.2,651.2,693,648.4,695.2,647.1z"/>
+		<path class="st5" d="M1249.8,649.5c1.4-0.5,2.8-1,4.2-1.5c0.1,3.2,0.2,6.4,0.3,9.6c-2,0.5-4.1,0.9-6,1.7
+			c-0.4,5.6,3.8,10.1,5.3,15.3c1.3,0,2.7-0.1,4.1-0.1c-0.3,0.7-0.9,2-1.2,2.7c2.4,1.3,4.8,2.7,7.4,3.6c1.7-1.5-0.9-3.5-1.3-5.1
+			c1.8,0.5,5-0.2,5.3,2.4c0.8,3.8-2.8,6.2-5.6,7.9c-1.2,0.3-2.3,0.7-3.5,1.1c0.7,1,1.5,2,2.2,3c1.1-0.9,2.2-1.9,3.3-2.8
+			c1.6-0.3,3.1-0.9,4.6-1.4c0.5,1.7,1.9,3.9,0.3,5.5c-1.4,1.9-3.3-0.2-4.9-0.7c-2.2-0.1-4.3-0.4-6.3-1c-0.3,0.2-1.1,0.6-1.4,0.8
+			l-0.7,0.4c-0.5-4.6-2.5-8.8-3.8-13.3c-2.2-7.8-4.9-15.5-7.3-23.3c0.6-1.3,1.2-2.6,1.9-3.8c0.5-0.2,1.5-0.6,2.1-0.8
+			c-0.7,1.3-2.4,2.9-0.8,4.2c2-0.3,3.5-1.8,5-3.1C1252.2,650.6,1250.6,649.9,1249.8,649.5z"/>
+		<path class="st5" d="M1574.4,654.7c0.1-4.3,4.7-5.7,7.8-7.4c0.9,2.4,1.8,4.7,2.6,7.1c-0.1,1-0.4,2.9-0.5,3.9
+			c-1.9,0.3-4.2,2.1-5.8,0.3C1577.1,657.4,1575.7,656,1574.4,654.7z"/>
+		<path class="st5" d="M1290.8,652.2c1.2-0.8,2.5-1.3,3.8-1.8c2.1,6.2,4.3,12.3,6.3,18.6c-0.1,0.7-0.2,2.1-0.3,2.8
+			c-0.2,0.1-0.8,0.4-1,0.5c-0.7-1-1.3-2-2.1-2.9c-1.3-0.5-2.6,0.3-3.9,0.5c0.4-1.3,0.9-2.5,1.4-3.8c-0.7-0.8-1.3-1.5-1.9-2.3
+			c0.7-0.1,1.9-0.2,2.6-0.3c-0.1-0.5-0.1-1.4-0.2-1.8C1293.4,658.8,1289.4,656.1,1290.8,652.2z"/>
+		<path class="st5" d="M510.4,652.6c0.5-0.4,1.4-1.2,1.9-1.6c1.1,3.6,2.2,7.3,3.5,11c-1.5,3.1-4.5,4.8-7.6,6c0.1-0.5,0.2-1.5,0.3-2
+			c1.4-1.2,2.7-2.5,3-4.3c-0.6-0.1-1.8-0.4-2.4-0.5c-1-1.1-2.1-2.1-3.1-3.1c-0.5,1-1.1,2-1.6,3.1c-0.1-1.2-0.2-2.4-0.4-3.6
+			c1.2-0.8,2.5-1.5,3.7-2.3C508.6,654.3,509.5,653.4,510.4,652.6z"/>
+		<path class="st5" d="M356,654.5c0.6-0.6,1.3-1.1,2-1.6c1.2,2.2,3,3.9,4.3,6.1c0.3,3.5-0.8,7.1-2.1,10.3c-1,1.3-2.6,0.4-3.8,0.2
+			c0.8-1.5,1.7-2.9,2.4-4.5c-0.4-1.8-2.6-1.6-3.8-2.3c-0.9-2.6,1.2-4.2,3-5.7C357.3,656.1,356.6,655.3,356,654.5z"/>
+		<path class="st5" d="M18.3,655.3c0.3-0.3,0.8-1,1.1-1.3c0.1,2.6,0.4,5.4,3,6.8c0.2,0.2,0.7,0.6,0.9,0.8c0,1.8,0.1,3.7,0.2,5.5
+			c1.8-1.3,3.6-2.6,5.4-3.8c0.2,1.6,0.4,3.2,0.5,4.7c-2.2,0.8-4.3,1.6-6.4,2.4c-1-1.7-2-3.5-3-5.2C17.8,662.5,18.2,658.7,18.3,655.3
+			z"/>
+		<path class="st5" d="M251.6,653.3c3.6,1,6.7,3.7,10.6,3.3h0.4c0.9,2.3,1.9,4.6,3.1,6.8c-1.1,0.1-2.2,0.1-3.4,0.2
+			c0.1,2,0.2,3.9,0.3,5.9c1.9,0.1,3.9,0.2,5.8,0.3l-0.4,1.7c-2.3-0.2-4.6-0.4-6.9-0.6c-0.2-2.7-0.7-5.5-1.7-8c-2-0.4-4.1-0.7-6-1.3
+			C252,659,251.9,656.1,251.6,653.3 M254.4,660.5c1.2,1.7,3.7,0.6,5.4,0.3c-0.1-0.6-0.2-1.8-0.3-2.4c-1.6-0.8-3.2-1.6-4.9-2.4
+			C253.7,657.4,253,659.3,254.4,660.5z"/>
+		<path class="st5" d="M815.3,659.6c-1.4-1.1,0.1-3.5,1.6-3.5c1.5,0.6,2.8,1.6,4.2,2.5C819.3,659.1,817.1,661.2,815.3,659.6z"/>
+		<path class="st5" d="M1728.3,660.5c1.5-2,3.1-3.8,4.7-5.6v14.1l-0.4,0.1c-0.5-0.4-1.5-1.1-1.9-1.5c-0.7-0.1-2-0.2-2.6-0.3
+			c-1.4-0.2-2.9-0.3-4.3-0.4c-0.1-0.5-0.3-1.6-0.4-2.1c3.1-0.1,6.1-0.2,9.2-0.4c-0.5-1.4-0.9-2.7-1.3-4.1
+			C1730.4,660.3,1729,660.4,1728.3,660.5z"/>
+		<path class="st5" d="M715.2,657.4c0.7,0,1.9-0.2,2.6-0.2c0.4,1.8,0.7,3.6,0.9,5.4c-1-0.3-2.9,0.5-3.2-1
+			C715.2,660.2,715.2,658.8,715.2,657.4z"/>
+		<path class="st5" d="M4,657.6c1.6,2.1,3.1,4.3,4.8,6.3c0.5,0.2,1.6,0.7,2.1,0.9l0.6,1c-1.3,0.2-2.6,0.4-3.9,0.7
+			c-0.1,2,0,4.4-2.5,4.9c0.2-1.2,0.4-2.5,0.6-3.7c-1-1.2-2.5-2.1-3-3.6C2.4,661.8,3.4,659.7,4,657.6z"/>
+		<path class="st5" d="M722.9,658.5c2.3,0.4,4.6,1.1,6.9,1.8c-0.2,2.4-0.6,4.8-1,7.3c-0.5,1.3-1,2.6-1.5,3.9
+			c-1.1-0.9-2.1-1.8-3.2-2.7C723.6,665.3,722.6,662,722.9,658.5z"/>
+		<path class="st5" d="M1143.7,660.7c1.8-0.2,3.6-0.7,5.4-1.3c0.6,0.3,1.2,0.6,1.9,1c-2.8,0.8-2.6,3.4-2.6,5.8
+			c-2.8,0.4-3.9-1.7-4.7-4c-0.8,0.6-1.7,1.2-2.5,1.8c-0.4-1-0.9-2-1.3-3C1141.2,660.9,1142.4,660.8,1143.7,660.7z"/>
+		<path class="st5" d="M1146.2,672.2c1.8-3,3.8-5.8,5.9-8.6c0.5,0.7,1,1.3,1.5,2c-0.9,0.7-1.8,1.3-2.6,2c1.4,0.7,2.8,1.3,4.2,2
+			c-0.5,1.2-1,2.5-1.4,3.8c-1.4-0.9-2.7-1.7-4.1-2.6c-0.1,3-0.6,6-1.2,8.9c0.5,0.2,1.5,0.5,2,0.7c-0.5,0.6-1.4,1.9-1.9,2.6
+			c-1.7-2.2-3.2-4.5-4.8-6.8c0.5-0.1,1.5-0.3,2-0.4c-0.7-0.8-1.3-1.6-2-2.4C1144.5,673.1,1145.6,672.5,1146.2,672.2z"/>
+		<path class="st5" d="M0,666.3c2.7,0.9,2.2,4.2,0,5.4V666.3z"/>
+		<path class="st5" d="M470.5,670.6c0.9-2.6,3-4,5.7-4.5c-0.4,1.7-0.7,3.3-1.2,5c-0.2,0.3-0.6,1-0.9,1.4c2.2,3.8,6.1,6.1,9.9,8.1
+			c-1.1,0.6-2.2,1.3-3.2,1.9c-1.3-1-2.9-1.6-4.5-1.7c0.1,0.7,0.3,2.2,0.4,2.9c0.2,1.7,0.6,3.5,0.9,5.2c1,0.2,2.1,0.4,3.2,0.6
+			c-0.1,0.5-0.4,1.4-0.5,1.9c-0.3,1.3-0.7,2.6-1,3.9c-1.6-1.2-3-2.6-4-4.4c-2.3-4.1-5-7.9-7.5-11.8l-0.7-1.6c0.9,0,2.8,0.1,3.7,0.2
+			c0.4-1.5,0.7-2.9,1.1-4.3c-1,0.9-2,1.8-2.9,2.6c-0.8-0.9-1.6-1.8-2.3-2.7c-0.1-0.6-0.3-1.7-0.4-2.3
+			C467.6,670.8,469,670.7,470.5,670.6 M473.4,676.4c0,0.7,0,2.2,0.1,2.9c-0.4,0.9-0.7,1.7-1.1,2.6c1.4-1.6,2.8-3.2,3.5-5.2
+			C475.3,676.5,474.1,676.4,473.4,676.4z"/>
+		<path class="st5" d="M817.3,666.3c1.8,0.2,2,2,1.6,3.5c-1.3,0.5-2.5,0.5-3.8,0C814.2,668,815.5,666.5,817.3,666.3z"/>
+		<path class="st5" d="M12.1,666.7c0.9,1.5,2,3,3,4.4c-0.2,2.9-0.2,5.8-0.5,8.7c-3.2-1.8-6.7-2.9-10-4.5c2.6-1.2,5.4-1.8,8.2-2
+			C12.5,671.1,12.3,668.9,12.1,666.7z"/>
+		<path class="st5" d="M497.7,667.3c1.1,0.4,2.2,0.7,3.4,1.1c-0.3,1.3-0.5,2.5-0.7,3.8c-1.2,3.1,1.5,4.2,3.9,4.9
+			c-0.2,1.4-0.4,2.8-0.6,4.2c-0.8-0.4-1.5-0.8-2.3-1.1c-1.9-2.2-4.1-4.1-6.8-5.3c0,1-0.1,2.9-0.1,3.8c-1.3-1.8-2.6-3.6-3.8-5.4
+			c0.9-0.4,1.9-0.8,2.8-1.2c0.1-1.1,0.3-2.3,0.4-3.4c0.9,0.3,1.8,0.7,2.8,0.9C497,668.9,497.4,668.1,497.7,667.3z"/>
+		<path class="st5" d="M135.1,670c4.6-3,10-0.3,15-0.7c-1.5,1.2-2.8,2.6-4.2,4c2.3,1,4.8,0.8,7.2,0.7c0.2,0.1,0.8,0.4,1,0.6
+			c0.4,0.7,1.4,2.1,1.8,2.8c-1.3-0.7-2.6-1.4-4-2.1c-3.4,1-6.8,0-10-1.2c0.3,2.5-0.6,6.1,2.4,7.3c3.6-0.3,7.3-1.1,10.8,0.4
+			c-0.1,1.6-0.1,3.3-0.2,4.9c-1.6-0.6-3.3-1.3-4.9-1.9c0.4,1.5,0.9,3,1.4,4.6c-2.9,2.2-6.5,1.5-9.9,1.6c0.2-0.4,0.7-1.1,1-1.5
+			c2.6,0.1,5.2,0.1,7.8-0.6c-2.1-1.9-4.4-3.9-7.4-3.8c-1.8,1.2-3.4,2.8-4.9,4.3c0.5-1.4,2.1-3.1,0.7-4.5c-0.8-0.9-1.6-1.6-2.5-2.4
+			c-0.1-1.1-0.1-2.2-0.2-3.2c1.3,0.1,2.6,0.1,3.9,0.2c0.5-2.6,0.6-5.4-1.2-7.5c-3.9,0.8-3.2,5.7-5.4,8.3
+			C133.6,677,132.6,672.8,135.1,670z"/>
+		<path class="st5" d="M377,676.9c-0.6-3,1.1-5.6,2.8-7.8c0.4,2.6,0.5,5.2,0.5,7.9C379.4,677,377.8,676.9,377,676.9z"/>
+		<path class="st5" d="M513,669.2c1.2,0.5,1.7,1.8,2.6,2.6c1,0.3,2.1,0.6,3.2,0.8c-0.4,1.8-0.7,3.5-1.1,5.3c1.4,0.4,3.8-0.7,4.5,1.1
+			c-1.2,4.3-5,7.3-7.7,10.7c-0.5-1.4-0.9-2.7-1.3-4.1c1.4-1.2,2.8-2.3,4.2-3.5c-3,0.4-5.7,1.6-8.5,2.6c-1-1.5,1-3,1.5-4.4
+			c0.1-1.3,0.1-2.6,0.2-4c1.9,0,3.7,0,5.6,0c-1.1-1-2.2-2-3.3-2.9c-1.2-0.4-2.4-0.8-3.6-1.1c0.5-0.2,1.7-0.5,2.2-0.7
+			C511.8,671.1,512.6,669.8,513,669.2z"/>
+		<path class="st5" d="M1121.8,675c0.7-1.4,1.5-2.8,2.3-4.1c0,0.7-0.1,2.2-0.2,2.9c3.2-0.3,6.4-0.6,9.6-0.8
+			c-0.7,2.3-1.5,4.5-2.3,6.8c2,0.6,4.1,1,6.1,1.6c-0.4,0.4-1.3,1.3-1.7,1.7c0.3,1.8,0.7,3.5,1.3,5.2c-0.7,0.4-1.9,1.3-2.6,1.7
+			c-0.5,1.4-0.9,2.8-1.3,4.2c-2.5,1.4-5.1,2.9-7,5.1c1.4-0.2,2.7-0.4,4.1-0.6c1.2,0.4,2.4,0.7,3.6,1.1c1.4-1.4,3-2.6,5.1-2.8
+			c0.6,1.7,1.3,3.4,2,5c-0.7,0.9-1.3,1.9-1.9,2.9c-0.7,0.3-2.1,0.9-2.8,1.2c0.6,1.1,1.2,2.1,1.9,3.1c1.3-0.1,2.7-0.4,4.1-0.6
+			l-0.1,0.7c-2.3,2.1-5.4,2.2-8.3,2.5c0.4-1,0.8-1.9,1.2-2.9c-1.1-0.2-2.2-0.4-3.3-0.4c-1.2,1.3-2.1,2.8-3.1,4.2
+			c-1.1,0.1-2.3,0.1-3.4,0.2c0.6-1.1,1.2-2.1,1.9-3.2c1-1.5,2.4-3.6,0.7-5.2c-1.5-0.1-3-0.1-4.4-0.1c-0.4-2.5-0.6-5-1-7.5
+			c-0.7-2.3-1.9-4.4-2.9-6.6c1.2-1.4,3.8-2,3.7-4.2c-1.8-0.4-3.7-0.7-5.5-1c0.5-1.3,1.2-2.5,1.7-3.8c2.1,0,4.1-0.1,6.2-0.3
+			C1124.8,678.7,1123.1,676.9,1121.8,675 M1125.1,675.1c1.3,1.9,2.2,4.6,4.8,5c0-2-0.1-3.9-0.1-5.9
+			C1128.2,674.5,1126.7,674.8,1125.1,675.1 M1125.9,684c0.4,0.9,0.7,1.8,1.1,2.7c-2.8,0.4-4.4,2.8-6.2,4.7c3.3,1.7,7.2,1.2,10.7,2.5
+			c0-0.6,0.1-1.7,0.2-2.3c-1.1-0.2-2.1-0.3-3.1-0.5c-0.2-0.5-0.5-1.6-0.6-2.2c0.7,1.5,2.4,2.7,3.7,1
+			C1132.6,686.6,1128.9,683.8,1125.9,684 M1136.2,699c-0.6,1.6,0,2.1,1.7,1.7C1138.4,699,1137.9,698.5,1136.2,699 M1126.3,702.3
+			c2,1.1,3.9,2.4,5.9,3.6c1.8,0.1,1.9-2.1,2.7-3.3c-1.3-0.8-2.6-1.6-4-2.2C1129.2,700.5,1127.8,701.6,1126.3,702.3z"/>
+		<path class="st5" d="M719.2,672.6c1.2,0.5,2.4,1,3.6,1.5c0.4-0.1,1.3-0.4,1.7-0.6c0.1,0.6,0.4,1.9,0.5,2.6
+			c-2,3.7-4.1,7.3-6.3,10.9c-0.6-2.7,0.3-5.4,1.4-7.8c-1.1-1.8-2.2-3.6-3.2-5.4C717.6,673.4,718.7,672.9,719.2,672.6z"/>
+		<path class="st5" d="M1006.5,676.5c1.2-0.5,2.5-1.2,3.9-1c0.7,2,0.3,4.1-0.7,6c-1.2,0-2.5,0.1-3.7,0.1
+			C1005.8,680,1006.1,678.2,1006.5,676.5z"/>
+		<path class="st5" d="M1271.7,686.5c-2.6-3.6,0.6-7.6,2.4-10.8c0.5,0.3,1.5,1,2,1.3c-1.6-0.1-2.3,0.5-2.3,2c0.7,2,3,0.2,2.7-1.3
+			c0.6,1.2,1.2,2.5,1.8,3.8c-1.2,0.4-2.4,0.8-3.6,1.2c0.3,1.7,0.6,3.5,0.9,5.2c1-0.7,1.9-1.3,2.9-1.9c-0.2,1.1-0.4,2.3-0.5,3.4
+			c1.5-1.2,3-2.3,4.5-3.5c0-1.7,0-3.4,0.1-5.1c0.6,1.2,1.2,2.3,1.8,3.5c0.5-0.4,1.5-1.3,2-1.7c0,0.4,0.1,1.3,0.1,1.7
+			c-2.7,3-2.9,7.1-4.3,10.7c0-2.4-0.1-4.8-0.1-7.2c-0.3,0.2-1,0.8-1.4,1c-0.1,1.9-0.3,3.8-1.3,5.4c-1.6,1.9-1.4,4.2-0.3,6.2
+			c-1.1,0.8-2.1,1.5-3.2,2.3c0.2,0.7,0.5,2.2,0.6,3c-0.9,1.2-1.7,2.4-2.4,3.6c-1.3-0.9-2.7-1.7-3.9-2.6l-0.5-0.9
+			c2-2.6,2.8-5.8,3.2-9c-1.6-0.6-2.5-1.9-3.2-3.4c2-0.9,4-1.9,5.9-2.8c-0.8-2.1-1.5-4.4-2-6.6C1273,684.9,1272.1,686,1271.7,686.5z"
+			/>
+		<path class="st5" d="M0,679.6c1.6-0.8,3.3-1.4,4.9-2.1c0.4,0.6,1.2,1.9,1.6,2.5c-1.7,2.1-4.3,1.4-6.6,1.2V679.6z"/>
+		<path class="st5" d="M1563.5,681.3c2.8-1.4,5.3-3.9,8.7-3.3C1571.6,681.5,1566.1,684.5,1563.5,681.3z"/>
+		<path class="st5" d="M1550.2,682.3c0.6-1,1-2.7,2.6-2.2c1.4,1.2,0.8,3.2,0.6,4.9c-0.2,1.1-0.4,2.2-0.6,3.3
+			c-0.3-0.4-0.9-1.2-1.2-1.6c-1.5-0.5-2.9-1-4.3-1.5C1548.2,684.2,1549.2,683.2,1550.2,682.3z"/>
+		<path class="st5" d="M351.8,683.1c1.4-0.8,2.9-1.7,4.3-2.5c0.6,0.4,1.7,1.2,2.2,1.7c-1.5,1.6-3,3.1-4.3,4.9c-0.4,2.3,0,4.7,0.1,7
+			c-0.4,0-1.3,0-1.8,0.1C352.3,690.5,352,686.8,351.8,683.1z"/>
+		<path class="st5" d="M13.9,681.4c0.6,0.4,2,1.2,2.6,1.6c-0.4,1.6,0.2,3.7-1.3,4.9c-1.3-0.6-2.6-1.2-3.8-1.9
+			C12.2,684.5,13.1,683,13.9,681.4z"/>
+		<path class="st5" d="M972.9,683.1c1,0.3,2.1,0.7,3.2,1c0.4,3.5-1.7,6.4-2.9,9.5C972.5,690.1,972.5,686.5,972.9,683.1z"/>
+		<path class="st5" d="M521.2,686.1c1.3-1.1,3-1.5,4.6-1.6c0.7,1.3,1.5,2.6,2.5,3.8c-1.3,1.5-2.6,3.1-4.1,4.4
+			c-0.3,0.2-1,0.5-1.4,0.7c0.3-1,0.6-1.9,0.8-2.9c-0.4-0.3-1.2-1-1.6-1.3c-0.3-0.3-1-0.8-1.4-1.1
+			C520.8,687.7,521.1,686.6,521.2,686.1z"/>
+		<path class="st5" d="M352.1,702c2.3-3.2,4.8-6.3,8.2-8.3c0.1,0.5,0.3,1.4,0.4,1.9c-0.8,1.5-1.5,3.1-2.3,4.6
+			c2.3,1.4,4.9,2.6,6.2,5.1c-0.1,2.5-3,3.8-4.5,5.5c0.6,1.3,1.2,2.5,1.8,3.8c-1.1-0.5-2.3-0.9-3.4-1.4c-0.1,1.4-0.2,2.7-0.3,4.1
+			c-2.2-1.1-1.6-3.8-1.9-5.8c-2-0.6-3.9-1.1-5.9-1.6c0.1-0.7,0.4-2.1,0.6-2.8C351.5,705.4,351.8,703.7,352.1,702 M353.3,709.6
+			c4,2.1,6.6-2.2,9.1-4.6c-0.8-0.9-1.6-1.9-2.5-2.7C356.6,703.1,352.9,705.8,353.3,709.6z"/>
+		<path class="st5" d="M1257.7,694.6c1.7-0.2,3.4-0.7,5.1-0.5c0.8,0.9,1.5,1.9,2.2,2.9c-1.7-1.1-3.2,2-0.8,2c0.3-0.3,1-0.9,1.3-1.2
+			c0.2-0.5,0.6-1.4,0.8-1.8c0.8,0.3,1.7,0.5,2.6,0.8c-0.1,2.1-0.1,4.3-0.2,6.5c-1.1-0.3-2.2-0.6-3.3-0.9c-1.1,2.1-2.4,4.2-4.2,5.7
+			l-0.9-0.2C1259.6,703.3,1258.8,699,1257.7,694.6z"/>
+		<path class="st5" d="M1703.2,697.8c0.3,0.5,0.9,1.4,1.1,1.8c1.5-0.7,3-1.5,4.7-2c0.9,1,1.7,2.1,2.5,3.2c1.4-0.3,2.9-0.6,4.4-0.8
+			c0.1,0.5,0.4,1.5,0.5,2c-1.4,2-1.2,4.2,0.1,6.2c-0.7,0.8-1.3,1.5-1.9,2.3c0-0.5,0.1-1.4,0.1-1.9c-4.1,0.3-7.8-1.6-11.7-2.2
+			c0-1.9,0-3.9,0.1-5.8C1703.2,699.8,1703.2,698.5,1703.2,697.8 M1704.3,700.8c-0.2,1.8,0.7,3.4,1.7,4.9c2.4-1.2,3.4-3.4,3.3-6
+			C1707.7,700,1706,700.4,1704.3,700.8 M1710.2,702.2c-2.7,2.8,5.1,4.2,4.4,0.8C1715,700.8,1711.3,701.4,1710.2,702.2z"/>
+		<path class="st5" d="M0,700.1l0.7-0.2c2.2,0.9,1.4,3.6-0.7,4V700.1z"/>
+		<path class="st5" d="M22.8,703.4c1-2,2.5-3.5,4.9-3.4c-0.1,1-0.3,2.1-0.4,3.2c-1,0.2-2.1,0.5-3.2,0.7c-1.6,1.4-2.9,3.7-5.2,3.5
+			c-1.7-1-2.9-2.5-4.3-3.9c-0.9,0.9-1.8,1.8-2.6,2.7c0.5,0.6,1.1,1.2,1.7,1.7l0.6,0.5c-0.5,0.3-1.5,0.8-2,1
+			c-0.2,1.2-0.3,2.3-0.4,3.5c-1.9-3.2-5-5.2-7.9-7.3c0.6-0.5,1.1-1,1.7-1.4C10.4,699.8,17.4,701.8,22.8,703.4z"/>
+		<path class="st5" d="M522.7,699.6c0.3,0.1,0.9,0.3,1.2,0.4c0.3,0.1,1,0.3,1.4,0.4c-0.4,0.2-1.2,0.7-1.6,1c-0.4,1.8-0.7,3.6-1,5.4
+			c1.9,1.6,3.5,3.6,4.6,6c-0.2,1.4-0.4,2.9-0.6,4.3c-4.8,2.7-7.1,8-10,12.4c-2.4-1.6-4.7-3.2-7.1-4.7c0.8-0.9,1.6-1.7,2.4-2.6
+			c0.3,0.7,0.8,2,1.1,2.7c5.8-1.7,8.8-7.9,8.7-13.5c-1,0.1-2.8,0.3-3.8,0.4c0.2-0.2,0.7-0.7,0.9-1c0.4-0.4,1.2-1.2,1.6-1.5
+			c0.3-2.3,0.2-4.7-0.1-7.1C521.1,701.3,521.8,700.4,522.7,699.6z"/>
+		<path class="st5" d="M999.6,704.1c3.1,0.2,6.2,0.6,9.3,0.8c-0.6,1.4-1.2,2.8-1.8,4.2c2.3-1,4.5-2.3,6.8-3.2c3-0.9,4.8,2.2,6.1,4.2
+			c-2.2-1.1-4.4-2.3-6.6-3.5c-0.7,1.1-1.9,2-2,3.4c1.7,1.3,3.6,2.3,5.2,3.8c-0.6,1.1-1.4,2.2-2.1,3.3c-1.7,0.6-3.6,1-4.4,2.8
+			c-1.3-1.4-2.5-2.9-4.3-3.7c-1.3,0.2-2.4,1-3.5,1.6c1.2,2.9,2.1,6,1.6,9.2c-1.6-0.7-4.1-0.5-4.5-2.6c-0.6-2-0.7-4.1-1-6.1
+			c-1-0.5-2-0.9-3-1.3c0.3,1.1,0.5,2.1,0.9,3.2c-1.6-1.9-5.1-3.1-4.9-5.9c1.8-3.1,5.2-5.2,8.6-6.1c1,3.2,3.2,5.5,6.6,5.8
+			c1.2,1.2,2.5,2.4,3.8,3.7c-0.2-2,0.8-4.5-0.9-6c-2.2-2.4-4.4-4.8-7.6-5.7C1001.1,705.3,1000.4,704.7,999.6,704.1 M996.1,715.1
+			c1.3,0.9,2.6,1.8,3.9,2.8c0.9-1,1.8-2,2.8-3c-0.9-1-1.8-1.9-2.6-2.8C998.7,713,997.4,714,996.1,715.1z"/>
+		<path class="st5" d="M1116,709.2c2.1-0.3,4.1-0.8,6.1-1.7c-1.8,2.8-3,6-2.8,9.4c-1.9-0.8-3.8-1.6-5.7-2.3
+			c-0.5,0.6-1.4,1.7-1.9,2.2c-0.2-0.5-0.6-1.5-0.8-1.9c1.4-1.6,3-3,4.4-4.6C1115.3,710,1115.8,709.5,1116,709.2 M1116.3,710.3
+			c-1.5,1.3,0.8,3.7,2.1,2.2C1119.9,711.2,1117.6,708.9,1116.3,710.3z"/>
+		<path class="st5" d="M1384.3,722.2c4.4-4.5,8.1-9.8,11.3-15.2c0.3,1,0.6,2.1,1,3.1c0.4,0.3,1.2,1,1.6,1.3c0.4,0.3,1.1,0.9,1.5,1.2
+			c1-0.2,2-0.4,3-0.5c0.4-0.2,1.2-0.6,1.6-0.8c-0.1,2.3-0.1,4.7,0,7c0.1,0.4,0.2,1.3,0.3,1.7c-3,1-6.1,0.1-9-0.8
+			c1.4-0.5,2.8-1,4.3-1.5c-0.2-0.5-0.4-1.6-0.6-2.1c-0.5-0.1-1.6-0.1-2.1-0.2c-1.6,1.2-3.2,2.4-5,3.4c-2.5,0.1-3.3,2.3-4,4.4
+			C1386.9,722.9,1385.6,722.6,1384.3,722.2z"/>
+		<path class="st5" d="M1309.9,712.9c1.1-0.8,2.3-1.5,3.4-2.3l0.6-0.4c1.4,0.2,2.7,0.3,4.1,0.4c1.1,1.7,2.1,3.5,2.8,5.4
+			c-2.1,3.8-3.6,8.7-8.4,9.6c0.3-2.2,1.7-3.9,3.1-5.4c-1.8-0.3-3.6-0.7-5.4-1c-2,0-3.6,1-4.8,2.5c-1-1.3-1.9-2.7-2.8-4
+			c1.3,0.2,2.6,0.3,3.9,0.5c0.6-0.5,1.3-1,1.9-1.5c0.8,0.3,1.5,0.7,2.3,1C1310.5,716.2,1310.2,714.6,1309.9,712.9 M1313.8,719.3
+			c2.8,1,5.2-0.8,4.7-3.9C1315.8,714.8,1314.4,717,1313.8,719.3z"/>
+		<path class="st5" d="M1706.8,721c2.5-3.1,6.8-4.9,7.7-9c0.8,1.4,1.6,2.7,2.5,4c-0.4,0.5-0.7,1-1,1.5c2.3,0.2,4.7,0.2,7.1-0.2
+			c-1-1.7-5.2-3.2-2.9-5.3c0.4-0.2,1.1-0.6,1.5-0.8c4.6,0.7,2.5,5.8,2.4,8.9c-1.3,0.1-2.6,0.2-3.8,0.3l-1,0.1
+			c-1.7-0.1-3.3-0.3-4.9-0.5c-0.4,1.2-0.8,2.5-1.2,3.8c-0.9,0.9-1.8,1.8-2.7,2.6c-0.2,0-0.7-0.1-0.9-0.1c-0.3,1-0.6,1.9-0.9,2.9
+			l-0.5,0.2c0-0.6,0.1-2,0.1-2.6c0.1-1,0.3-2,0.5-3C1708,723,1707.4,722,1706.8,721z"/>
+		<path class="st5" d="M0,712.6c1.1,0.4,2.1,0.8,3.2,1.1c0.5,0.9,1,1.8,1.5,2.8c-1.6,0.1-3.1,0.3-4.7,0.4V712.6z"/>
+		<path class="st5" d="M1278.1,713.8c2.2,1.5,3.2,3.9,3.9,6.4c-2.6-0.8-5-1.8-7.4-3c0.8-0.8,1.5-1.5,2.3-2.3
+			C1277.2,714.7,1277.8,714.1,1278.1,713.8z"/>
+		<path class="st5" d="M1726.5,723.6c-0.2-3.5,2-6.2,4.2-8.7c0.6,0,1.7-0.1,2.3-0.2v2.5C1730.6,719.2,1728.3,721.2,1726.5,723.6z"/>
+		<path class="st5" d="M1287.4,722.5c3-0.7,5.8-1.9,8.5-3.4c-0.4,0.7-0.7,1.4-1,2.1c-0.8,1.6-1.6,3.3-2.1,5
+			c-0.1,0.4-0.3,1.2-0.4,1.6C1291,725.7,1289.3,724,1287.4,722.5z"/>
+		<path class="st5" d="M1619.2,724.8c1.7,1.1,4.7,1,5.6,3c-1.3,0.9-2.7,1.5-4.2,2.1c-0.3,1-0.6,2-0.9,3c-0.9-1.9-1.4-3.9-2-5.9
+			C1618.1,726.5,1618.8,725.4,1619.2,724.8z"/>
+		<path class="st5" d="M371.2,727.9c1.1-0.2,2.3-0.7,3.5-0.6c1.6,1.9,3.2,4,3.5,6.5c-1.6,2.2-3.5,4.1-5.2,6.2c1.5,0,2.9,0,4.4,0
+			c0.7-1.5,1.4-2.9,2.1-4.3c0.4,1.4,0.7,2.8,1.1,4.1c1.4,0.1,2.8,0.1,4.2,0.2c0.8-1.1,1.7-2.2,2.6-3.2c0.2,0.7,0.7,2.2,1,3
+			c2.3,0.3,4.6,0.7,6.9,1.1c-9.4,0.1-18.9-0.4-28.3,0c-0.2-0.9-0.4-1.8-0.6-2.7c2.3-1.2,5.5-2,5.9-5
+			C372.3,731.4,371.6,729.7,371.2,727.9z"/>
+		<path class="st5" d="M853.9,726.2c1.3,0.2,2.6,0.5,3.9,0.8c2.2,0.5,4.5,1,6.8,1.3c-0.6,3.3-2.7,5.7-5.5,7.4
+			c-1.6-2.1-6-4.8-2.6-7.5C855.6,727.6,854.8,726.9,853.9,726.2z"/>
+		<path class="st5" d="M1453,727.2c0.2,1.8,1.7,3.1,3.5,2.1l1.1-0.4c-0.8,2-1.5,4.2-3.2,5.7c0-1.2,0-2.5,0-3.7
+			c-1.8,0.1-3.7,0.2-5.4,0.2c0.7,1.6,1.4,3.3,2.2,4.9c-0.9,0.5-1.8,1.1-2.7,1.6c0.2,1.4,0.4,2.9,0.7,4.4c-1.4-0.1-2.8-0.2-4.1-0.3
+			c0-0.7,0-2.1,0-2.8c0-1.1-0.2-2.1-0.6-3.1c1.4-0.8,2.3-2.1,2.8-3.6c-1.2-1.5-4-2.8-2.3-5c0.5,0.5,1.4,1.6,1.9,2.1
+			C1449,729.3,1452.8,730.5,1453,727.2z"/>
+		<path class="st5" d="M179,727.7c2.2-0.1,4.3-0.1,6.5-0.1c-0.1,1.5-0.1,2.9-0.2,4.4c-1.1,1.1-2.1,2.2-3.2,3.3
+			C180.3,733.1,179.4,730.4,179,727.7z"/>
+		<path class="st5" d="M1115.2,728.3c0.7-0.2,2.2-0.7,2.9-0.9c-0.3,1.6,1.3,6.4-1.8,4.5C1116,730.9,1115.5,729.2,1115.2,728.3z"/>
+		<path class="st5" d="M1159.9,735.8c-2.5-2-5.4-4.5-4.4-8.1c0.7,0,2-0.1,2.6-0.2c2.9-0.1,5.8,0,8.7,0.1c-0.1,0.7-0.4,2.1-0.5,2.8
+			c0,0.3-0.1,0.8-0.1,1.1c-1.2,0.6-2.3,1.3-3.5,2c1.8,2.9-0.6,5.7-1.9,8.3c-0.4,0-1.2-0.1-1.6-0.2c-1.7-0.4-3.3-0.8-4.9-1.2
+			c0-0.4,0.1-1.3,0.1-1.8C1156.2,737.7,1158,736.8,1159.9,735.8z"/>
+		<path class="st5" d="M598.7,729.8c1.6,0,3.2,0,4.8,0.1c-0.2,2.8-1.8,4.5-4.5,4.8C598.8,733,598.8,731.4,598.7,729.8z"/>
+		<path class="st5" d="M1526.6,733.1c-0.1-1.4,0.4-2.5,1.5-3.3c-0.8,2.2,2.3,2.8,3.1,0.9c0.9,0.8,1.9,1.5,2.8,2.3
+			c-1.3,2.3-2.6,4.6-4.1,6.7c-0.7-1.2-1.7-2.3-1.9-3.7c0.5-1.2,1.8-1.8,2.8-2.6C1529.4,733.3,1528,733.2,1526.6,733.1z"/>
+		<path class="st5" d="M2.8,731.9c1.7,3.5,0.7,7.5,0.3,11.3c-1,0.1-2.1,0.2-3.1,0.3V737C1,735.3,2,733.6,2.8,731.9z"/>
+		<path class="st5" d="M1406.3,733c0.1-0.3,0.4-0.9,0.5-1.2c0.8,1.1,1.7,2.2,2.6,3.3c2.2-1,4.4-2.2,6.7-2.9c1.6,0.8,2.7,2.3,3.7,3.9
+			c-1.3,2.3-3.4,0.5-5.1-0.2c-2.1,0.4-4.2,0.9-6.3,1.4C1407.6,735.8,1406.9,734.4,1406.3,733z"/>
+		<path class="st5" d="M332.4,734.4c2.7-1.6,6-1.4,9-1.6c-3.1,1.4-6.4,2.4-9.3,4.2c3.4,1.7,7.5,1.8,10.4,4.4
+			c-3.4,0-6.8,0.4-10.2,1.1c-1.3-0.2-2.6-0.4-3.9-0.7c-0.1-0.4-0.4-1.1-0.6-1.5c1.2,0.1,2.4,0.2,3.6,0.3
+			C331.7,738.6,331,736.1,332.4,734.4z"/>
+		<path class="st5" d="M347.3,733.4c2-1.8,5.9,4.5,1.7,4C346.6,737.8,345.8,734.8,347.3,733.4z"/>
+		<path class="st5" d="M1537.3,733.5c0.4-0.2,1.3-0.7,1.8-0.9c-0.5,1-0.9,2-1.3,3c1.4,1.6,2.6,3.4,2.8,5.6l0,1
+			c-2.5,0.3-4.9,0.4-7.4,0.5C1535.4,740.1,1536.8,736.9,1537.3,733.5z"/>
+		<path class="st5" d="M1337.4,735.1c0.8-0.5,1.7-0.9,2.7-1.2c0.4,0.6,1.2,1.8,1.6,2.5c-1.4,0.5-2.8,1-4.1,1.4
+			c-0.4,1.5-0.7,3.1-1,4.6c1.6-1.1,3.1-2.3,4.7-3.4c0.6,0,1.9-0.1,2.6-0.2c0.1,0.6,0.2,1.8,0.2,2.4c-3,1.2-6.2,2.1-9.5,2.5
+			c0.1-1.6,0-3.2-0.2-4.7c-0.8,1.1-1.7,2.3-2.5,3.4c-2.9,0-5.7,0-8.6,0.1c0-0.7,0-2.1,0-2.8c-0.8,0.3-2.4,0.8-3.2,1.1
+			c1.7-2.8,4.9-3.2,7.9-3.7c0.8,1.6,1.8,3.1,2.8,4.5c0.6-0.8,1.2-1.6,1.8-2.4c-1-1.3-2.1-2.6-3.2-3.9c2,1.1,4.5,3.3,6.5,1.1
+			C1336.3,736,1337,735.4,1337.4,735.1z"/>
+		<path class="st5" d="M1711,734c1.4-0.5,2.4-0.1,3,1.1c-0.6,1.4-1.5,1.6-2.8,0.8C1711.2,735.4,1711.1,734.4,1711,734z"/>
+		<path class="st5" d="M855.9,734.9c1.7,0.7,4.3,1.6,3.1,4c0,1.6-2.5,0.8-2.7-0.2C856.1,737.4,855.9,736.2,855.9,734.9z"/>
+		<path class="st5" d="M115.9,738.9c1.2-1.3,2.4-2.5,3.7-3.6c0.3,2,0.7,4,1,6c-2,0-4.1,0-6.1,0C114.8,740.7,115.5,739.5,115.9,738.9
+			z"/>
+		<path class="st5" d="M0,750.1c2-3.2,5.9-2.4,8.4-0.2c-1.6-0.3-3.2-0.5-4.8-0.6c0.8,2.4,2.7,3.9,4.6,5.4c-0.7,0.1-2.1,0.2-2.8,0.2
+			l-0.9,0.4c-0.4,2.4-0.7,4.8-1.2,7.2c-0.4-3.8,1.3-9.3-3.2-11V750.1z"/>
+		<path class="st5" d="M1709.4,751.9c0.3-0.8,0.6-1.6,1-2.5c1.1,0.8,2.2,1.6,3.3,2.4c-0.4,0.6-1.2,1.8-1.5,2.3c2.3,3.9,7,3.3,10.9,4
+			c1.7-0.7,3.3-1.4,5-2.1l0.3-0.9c0.9-1.9,2.7-2,4.6-1.6v4.8c-3.9-2.5-7.8,1.5-11.8,1.9c-2-0.3-4-0.6-5.9-0.7
+			c-1.3-0.1-2.6-0.2-3.9-0.4C1710.8,756.8,1710.2,754.3,1709.4,751.9z"/>
+		<path class="st5" d="M1702.7,758.6c1.1,1.1,2.2,2.2,3.3,3.3c-0.3,0.7-0.8,2-1.1,2.6c-0.5,0-1.6,0.1-2.2,0.1
+			C1702.7,762.6,1702.7,760.6,1702.7,758.6z"/>
+		<path class="st5" d="M1723.8,765.3c1.8-2.6,4.7-4.1,7.6-5.4c0.5,1.4-0.9,4.9,1.7,4.5v14.1c-0.3-0.5-1-1.5-1.4-2
+			c-0.4-3.9-0.5-7.9-1.1-11.8c-0.9,0.9-1.8,1.9-2.7,2.9c-0.9-0.4-1.8-0.9-2.6-1.3c-1.3,0.9-2.5,1.8-3.7,2.7
+			c-0.8-0.8-1.6-1.7-2.4-2.5c-0.6,0.1-1.8,0.2-2.3,0.3c-1.4,0.2-2.8,0.3-4.2,0.4l-0.4-1l0.8,0.1c0.5,0,1.4,0.1,1.9,0.1
+			c0.9-1.1,1.8-2.2,2.7-3.3C1719.7,763.8,1721.8,764.5,1723.8,765.3z"/>
+		<path class="st5" d="M18.9,761.8c4.7,2.9,7.3,7.8,9.6,12.6c-0.2,0.9-0.4,1.8-0.6,2.7c0.5,0.3,1.5,0.9,2,1.2c0,2.3-0.1,4.5,0,6.8
+			c-4.4-0.8-9.1,0-13.4-1.8c0.5-1.6,1.1-3.2,1.2-4.8c-0.8-0.7-1.7-1.2-2.8-1.4c-1.7,0.7-2.8,2.4-4,3.8c0.7-2.2,1.4-4.3,2.1-6.4
+			c1.4-0.2,3.2-0.1,3.8-1.6C18.4,769.3,18.1,765.4,18.9,761.8 M20.3,770.6c1.2,0,2.5,0,3.7,0.1c-0.2-2.4-1.9-4.1-3.5-5.7
+			C18.8,766.5,19.9,768.7,20.3,770.6 M21.4,780.5c2.1,1.9,5,2.4,7.6,3.2c0.1-1.2,0.2-2.4,0.3-3.6c-2-1.2-3.6-2.9-4.7-4.8
+			C22.8,776.4,20,777.8,21.4,780.5z"/>
+		<path class="st5" d="M1704.4,776.1c1-1.5,3.4,0.3,2.4,1.8C1705.7,779.3,1703.3,777.5,1704.4,776.1z"/>
+		<path class="st5" d="M20.2,790.3c3.2,0.4,6.5,1,9.7,1.6c0,0.6,0,1.7-0.1,2.3c-2.6,0.5-5.2,1.2-7.8,0.9
+			C19.8,794.5,20.6,791.9,20.2,790.3z"/>
+		<path class="st5" d="M1702.7,794.3c0.5-0.2,1.6-0.6,2.2-0.8c0.3,1.2,0.1,2.3-0.5,3.4c-0.4,0.1-1.2,0.2-1.6,0.2
+			C1702.8,796.4,1702.8,795,1702.7,794.3z"/>
+		<path class="st5" d="M1726.7,805.8c1.5-0.3,3-0.3,4.6-0.4c0.4,0.7,1.1,2,1.4,2.7c-1.4,2.4-4.1,1-6.1,0.5
+			C1726.5,807.6,1726.6,806.7,1726.7,805.8z"/>
+		<path class="st5" d="M25,817.2c-2.7-0.9-1.2-4.7,1-5.1c0.9,0.5,1.8,1.1,2.6,1.8C27.6,815,27,817.9,25,817.2z"/>
+		<path class="st5" d="M39.8,821.3c2.9-0.1,5.8-0.1,8.6-0.2c0.5,1.5,1.1,2.9,1.6,4.4c-3.1,1.5-6.5,2.1-9.9,2.6
+			c-0.2,0.4-0.6,1.1-0.9,1.5c0.5,1,1.1,2,1.6,3.1c0.9,1.9,2.4,4,1.7,6.2c-1.3,2.3-3.1,4.2-4.6,6.3c1.5,1.2,2.9,2.3,4.4,3.5
+			c0.3,0.6,0.8,1.8,1.1,2.3H34c1.7-1.2,3.3-2.5,4.9-3.8c-1.7-2-3.5-3.9-4.6-6.3c1-1.5,3-1.8,4.6-2.5c0.2-2.6-1.3-4.4-3.8-5.2
+			c-0.5-0.2-1.5-0.7-2-1c-1.1,1.2-2.2,2.4-3.4,3.6c0.3,1,0.7,2,1,3.1c-2.3-2.7-5.6-4.1-9.1-4.7c0.1-0.9,0.1-1.7,0.2-2.6
+			c1.8-3.6-2.4-7.6,1-10.4l1.1,0.7c0.7,0.6,1.3,1.1,2,1.8c0,1.7-2,5,1,4.9c3.4-1.4,6.8-2.4,10.3-3.4C38.8,824.7,39,822.6,39.8,821.3
+			 M41.8,822.8c-1.5,1-2.4,2.8-3.7,4.1c-2.6,0.4-5.4,0-7.7,1.4c-2.1,1.2-4.6,1-7,1.2c0,1.4-0.1,2.7-0.1,4.1c1.7,0.3,3.5,0.6,5.2,1
+			c1.5-1.1,2.8-2.8,4.7-3.2c1.8,0.3,3.6,1,5.4,1.6c0.1-2,0.1-4.1,0.2-6.1c3.1-0.2,7.6,0.1,9-3.4C46,822.6,43.7,821.7,41.8,822.8z"/>
+		<path class="st5" d="M108.3,821.1c1.9,0,3.7,0,5.6,0c-1.1,1.2-1.8,3.4-3.8,3.1C109.3,823.2,108.7,822.2,108.3,821.1z"/>
+		<path class="st5" d="M134.7,820.8c2.5-0.1,5-0.1,7.5-0.1c1.4,5-2.9,9.5-7.6,10.2c-0.2-0.8-0.7-2.3-0.9-3.1
+			c1.6-1.2,3.2-2.4,4.8-3.7c-0.2-0.2-0.6-0.6-0.8-0.8C136.7,822.5,135.7,821.7,134.7,820.8z"/>
+		<path class="st5" d="M200,820.7c2,0,4.1,0,6.2,0c1.4,1.3,2.8,2.7,3.7,4.4c-1.8,0.9-3.8,0.5-5.8,0.4c1.4,3.3,2.7,6.6,4.1,9.9
+			c-2,1.6-4.1,3.1-6.1,4.5c0-2-0.2-3.9-0.4-5.8c1.4-0.7,2.9-1.4,4.3-2.1c-0.5-0.8-1-1.6-1.6-2.4c-0.4-0.4-1.1-1.1-1.5-1.5
+			c0.2-1.4,0.3-2.8,0.3-4.2C202.3,822.7,201.1,821.7,200,820.7z"/>
+		<path class="st5" d="M236,820.8c0.6,0,1.8-0.1,2.4-0.2c0,0.7,0.1,2.1,0.1,2.8c1.7,0.4,3.3,0.8,5,1.2c-0.1-1.3-0.2-2.6-0.3-3.9
+			c0.3,0,0.8,0.1,1.1,0.1c1.1,1.4,1.9,3.2,3.8,3.8c1.3,0.8,3.3,1,3.8,2.7c1.4,2.8-0.3,5.7-0.4,8.5c0.9,2.1,2.9,3.8,2.9,6.2
+			c-0.3,2.2-2.7,1.2-4.2,1.3c-0.2-2.2-0.3-4.3-0.5-6.4c-2.9,0.5-5.8,1.5-8.7,2.1c-2.8-0.4-5.4-1.6-8.1-2.2c0.4-0.6,1.1-1.7,1.4-2.3
+			c0.5,0,1.5,0,2,0c1.3-2.7,3.3-4.9,6.4-5.3c0-1.1,0-2.1,0-3.2c-2.4-0.5-4.9-0.8-7.4-1.2C235.5,823.5,235.8,822.1,236,820.8
+			 M244.8,826.5c0.7,1.4,2,2.8,1.9,4.4c0.2,1.5-0.8,3.8,1.3,4.3c2.2,0.2,3-2.7,3.4-4.4C251.9,827.5,247.8,824.8,244.8,826.5z"/>
+		<path class="st5" d="M287,820.9c2.5-0.1,5-0.1,7.5-0.1c-1.1,0.8-2.3,1.7-3.5,2.4C289,824,288.1,821.9,287,820.9z"/>
+		<path class="st5" d="M331.6,820.8c3.6,0,7.1,0,10.7,0c-0.5,1-0.9,2-1.4,3.1c-1.3-0.2-2.5-0.4-3.8-0.7c0.5,3.2,0.5,6.6,1.9,9.6
+			c1.4,0.7,2.9,1.2,4.3,2c0.9,1.2,0.5,3,0.8,4.5c-3.3-1.4-6.5-3.1-9.6-4.9c0-1.3,0-2.6-0.1-3.9c-1.2-1.5-2.6-2.8-3.5-4.5
+			C331,824.2,331.4,822.5,331.6,820.8z"/>
+		<path class="st5" d="M401.2,820.8c0.8,0,2.3,0,3.1,0c0.2,1.2,0.5,2.5,0.8,3.7c-1.2,0.1-2.3,0.2-3.4,0.2c-0.1,1-0.1,2.1-0.2,3.1
+			c-0.7,0.4-1.4,0.9-2.1,1.3c1.4,1.9,2.5,3.9,3.6,6c-2.8,1.5-5.9,2.4-8.3,4.3c-2.3,3.7-3.6,7.9-5.9,11.5h-0.1
+			c-0.7-1.5-1.4-3-2.2-4.5c-0.2-0.4-0.7-1.1-0.9-1.5c-1.7,0-3.4,0.1-5.1,0.2c-0.6-0.7-1.2-1.4-1.8-2c2.8,0.2,5.5,0.4,8.3,0.5
+			c-0.2-1-0.4-1.9-0.7-2.8c1.1,0.4,2.2,0.7,3.3,1.1c0.6-1.8,1.6-3.8,1.1-5.7c-2-1.3-4.7-1.4-6.1-3.4
+			C390.2,829.1,395.2,824.3,401.2,820.8 M388.4,832.3c1.2,1,2.6,1.4,4.2,1.4c0.4,1,0.8,2,1.2,3c1.7-0.2,3.4-0.3,5.1-0.9
+			c0.9-0.4,2.9-1.2,1.9-2.5c-0.7-1.3-2.2-1.9-3.2-2.8c-0.2-1.2-0.5-2.4-0.7-3.6C393.4,827.6,390.9,830.1,388.4,832.3z"/>
+		<path class="st5" d="M1184.6,821.2c0.7-0.1,2.1-0.4,2.8-0.6c0,0.5,0,1.5,0,2c-1.8,1.3-3.5,2.7-5.2,4.1c-0.8-0.8-1.8-1.5-2.3-2.6
+			c0.9-0.9,2.3-0.9,3.5-1.3C1183.7,822.3,1184.3,821.5,1184.6,821.2z"/>
+		<path class="st5" d="M1530.1,820.8c0.7,0,2.1,0,2.8,0c1.5,0.9,3,1.9,4.5,2.8c-1,0.7-2.1,1.4-3,2.1c-0.3-0.1-0.9-0.4-1.2-0.5
+			c0,0.4,0.1,1.1,0.1,1.5c-1.3-0.5-2.6-1-3.9-1.5c0,1.6,0.2,3.1,0.9,4.6c1-0.1,2.1-0.1,3.2-0.2c0,0.4,0.1,1.2,0.2,1.6
+			c0.1,0.7,0.3,2.1,0.4,2.9c-1.6-0.8-3.2-1.5-4.8-2.2c-0.9,1.1-1.7,2.2-2.6,3.2c-0.3-1.4-1.2-2.2-2.6-2.5c1.5-0.8,3.1-1.5,4.6-2.2
+			c-0.2-1.7-0.4-3.4-0.6-5.1c0.9-0.8,1.9-1.5,2.9-2.2C1530.7,822.5,1530.3,821.3,1530.1,820.8z"/>
+		<path class="st5" d="M1564.4,820.8c5.5,0,11-0.1,16.5,0.2c-2.1,2.3-5.2,1.2-7.8,1.5c-2.9,0.3-5.9,1.5-8.6-0.3L1564.4,820.8z"/>
+		<path class="st5" d="M1623.2,821c0.7,0,2,0,2.7-0.1c1.3,0.5,2.6,1.1,3.9,1.8c-0.1,2-0.2,3.9-0.3,5.9c-1.8,0-3.5,0-5.3,0
+			c2.1,1.7,3.1,4,2.2,6.7c-2.5-2.1-4.6-4.5-6.6-7C1621.6,826.2,1622.5,823.5,1623.2,821z"/>
+		<path class="st5" d="M1634.4,820.7c1.8,0.1,3.7,0.2,5.6,0.3c-1.2,1.4-2.3,5.8-4.7,3.8C1634.5,823.5,1634.2,822.1,1634.4,820.7z"/>
+		<path class="st5" d="M1679.7,821.1c1.7,0,3.4,0,5.1,0c1.2,2.4,2.2,4.8,2.7,7.5c-0.8,1.4-1.7,2.8-2.1,4.4c0.5,2,1.4,3.8,2.2,5.7
+			c-2.8,0.6-3.9-1.6-4.8-3.9c-0.1-0.4-0.3-1.2-0.4-1.6c-2.2,0.6-4.3,1.1-6.5,1.6c-1.2,0-2.4,0-3.6,0c-0.2-0.7-0.5-2.2-0.6-2.9
+			c0.8-0.5,1.7-1.1,2.5-1.6c2.3,0.6,4.8,1.4,7,0c2.7-1.5,2-4.8,2.2-7.3C1682.2,822.4,1680.9,821.7,1679.7,821.1z"/>
+		<path class="st5" d="M440.8,822.2c3.9-0.6,8-1,11.9,0.2c0.5,0.6,0.9,1.3,1.4,2c-2.1,0.8-4.1,1.6-6.1,2.5
+			C445.6,825.2,443,824,440.8,822.2z"/>
+		<path class="st5" d="M1399.1,822.1c0.8,0,2.5,0,3.3-0.1c-0.6,1.1-1.2,2.3-1.8,3.4c0.3,0.9,0.5,1.8,0.8,2.8c-0.8,0.7-1.7,1.3-2.5,2
+			C1398.8,827.5,1398.8,824.8,1399.1,822.1z"/>
+		<path class="st5" d="M272.3,826.2c2.5-0.9,4.8-2.1,7.1-3.3c-2.5,2.8-7.4,4.8-6.8,9.2c0.6,1,1.3,1.9,2.1,2.8
+			c-1.7,0.4-3.8,0.4-4.5,2.3c-1.9,4.3-1.6,9.2-1.3,13.8h-8.6c2.1-0.6,4.2-1.2,6.4-1.8c0.8-3.8,1.4-7.8,0.9-11.7
+			c-1.1-0.6-2.8-0.1-2.5,1.4c-0.3,2.1-0.3,4.4-1.4,6.3c0.1-3.2-0.1-6.5-1.3-9.5c2.8-0.7,5.8-0.9,8.4-2.2c1.7-1,1.2-3.3,0.7-4.8
+			c-2.4-0.9-5.1-0.8-7.7-1.1c0.5-0.8,1.1-1.6,1.7-2.4C267.8,825,270,826.1,272.3,826.2z"/>
+		<path class="st5" d="M1120.2,823.2c2,0.9,5.4,3.9,2.5,5.7C1119.8,829.3,1117.4,825,1120.2,823.2z"/>
+		<path class="st5" d="M1655.3,823c1.4,0.9,2.8,1.9,4.2,3c-0.5,0.9-1.3,1.7-2.2,2.3c-0.8-0.7-1.7-1.5-2.4-2.3
+			C1655,825.3,1655.2,823.8,1655.3,823z"/>
+		<path class="st5" d="M1256,826c2.1-0.4,4.2,0,5.4,2C1259.4,830.7,1256.6,828.4,1256,826z"/>
+		<path class="st5" d="M1300.7,826.1c1.2,0.4,2.4,0.9,3.6,1.3c0.4-0.4,1.3-1.3,1.8-1.7c0.1,0.8,0.3,2.3,0.4,3
+			c-1.1,0.7-2.1,1.4-3.2,2.1c0.4,0.2,0.9,0.3,1.4,0.5c1.5-0.3,3-0.6,4.6-0.9c0.1,1.5,0.3,3.1,0.4,4.7c1.1,1.5,2.3,3.1,0.9,4.9
+			c-3-1.9-6.1-4-7.7-7.3C1302,830.5,1301.3,828.3,1300.7,826.1z"/>
+		<path class="st5" d="M1607.9,827.1c0.6-1.2,1.7-1.5,3.2-1.1l0.2,0.8C1610.9,828.3,1608.1,829,1607.9,827.1z"/>
+		<path class="st5" d="M1000,826.8c2,0.4,3.3,2,4.5,3.6c0.8-0.1,1.7-0.2,2.5-0.3c0.4,0.8,0.8,1.7,1.1,2.5c-2.5,0-5.1-0.3-7.4-1.4
+			C999.8,830,1000.1,828.2,1000,826.8z"/>
+		<path class="st5" d="M730.2,828.2c1.8-0.3,3.7,0.8,3.1,2.8C731.7,833.4,728.6,830.3,730.2,828.2z"/>
+		<path class="st5" d="M1245.8,828.7c0.5-0.2,1.1-0.5,1.7-0.7c0.6,1.4,1.2,2.9,1.8,4.3c-3.1,0.7-6.3,1.1-9.4,1.5
+			c0.4-1.2,0.8-2.4,1.2-3.5C1242.8,830,1244.3,829.4,1245.8,828.7z"/>
+		<path class="st5" d="M98.8,831.2c1.4-0.3,2.8-0.5,4.2-0.8c0.9,0.5,1.9,1.1,2.9,1.7c1.2-0.6,2.5-1.3,3.8-1.7
+			c3.4,4.3,6.1,9.2,9.3,13.7c-0.4,0.1-1.1,0.2-1.5,0.3c-0.2,0.7-0.5,2-0.6,2.7c-0.9-1.3-1.9-2.6-2.9-3.9c-0.9,1.9-1.5,3.9-1.8,6
+			c-0.1,0.5-0.2,1.4-0.3,1.8h-3.7c0.8-3.4,1.4-6.9,1.7-10.4c-1.7-0.4-3.4-0.8-5.2-1.1c-0.4-1.3-0.8-2.6-1.4-3.9
+			c-2.4-0.8-5.5,0.9-7.5-1.2c1.8-0.4,3.7-0.7,5.5-1.1C100.4,832.6,99.6,831.9,98.8,831.2z"/>
+		<path class="st5" d="M1651.4,834.6c0.7-1.5,1.4-3,2.1-4.5c0.4,0.5,1.2,1.5,1.6,1.9c0.1,2.2,0.2,4.3,0.3,6.5
+			c-2.2-0.4-4.5-0.7-6.7-1.1c-0.3-1.1-0.6-2.1-0.9-3.1C1648.7,834.4,1650.5,834.5,1651.4,834.6z"/>
+		<path class="st5" d="M1203.3,832.8c1.1-0.5,2.1-1.4,3.4-1.3c0.6,0.7,1.3,1.4,1.9,2.2c-0.4,0.5-1.3,1.4-1.7,1.9
+			c-0.6,0.7-1.2,1.4-1.8,2.2c-1.4-1.2-2.8-2.5-4.1-3.7C1201.6,833.7,1202.7,833.1,1203.3,832.8z"/>
+		<path class="st5" d="M1502.9,830.9c1.7-0.1,3.7,0,3.7,2.2C1505.2,835.3,1501.6,833.2,1502.9,830.9z"/>
+		<path class="st5" d="M1510,830.9c0.8,0,2.2-0.1,3-0.1c0,0.9,0,2.6,0,3.4C1511,834.1,1508.4,833.4,1510,830.9z"/>
+		<path class="st5" d="M1254.2,832c0.9,1.6,0.9,4.4,3.3,4.3c0.3,2.2,0.7,4.4,1.1,6.6c-1-0.3-1.9-0.7-2.9-1c-0.1,3.1-0.9,6.6,1.5,9.1
+			h-19.8l0.2-1.2c0.2-1.2,0.3-2.4,0.5-3.6l0.2-0.9c0.5-0.9,1-1.8,1.5-2.6c1.2-0.3,2.5-0.5,3.8-0.8c0.6-2.8,2.2-7.8,6-6.1
+			c1.1,0.3,2.2,0.7,3.4,1C1253.3,835.2,1253.8,833.6,1254.2,832 M1241.9,849c3.8,0.9,7-2.2,10.6-3c0.4-2.4-0.7-4.2-2.4-5.6
+			c-0.7-0.5-1.3-0.9-1.9-1.3C1245.7,842,1241.3,844.7,1241.9,849z"/>
+		<path class="st5" d="M1273,833.2c0.4-0.3,1.1-0.9,1.5-1.2c0.4,1.2,0.8,2.3,1.3,3.5c0.9,0.1,1.8,0.2,2.7,0.3
+			c0.5-1.1,1.1-2.1,1.7-3.1c1.2,0.8,2.5,1.7,3.8,2.6c-0.4,1.1-0.8,2.2-1.2,3.3c-0.4-0.1-1.3-0.5-1.7-0.6c-0.4-0.2-1.2-0.4-1.6-0.6
+			c-2.6,2.6-6.2,2.5-9.6,2.5c-0.1,2.2-0.3,4.4-0.4,6.6c-2,0.4-3.9,0.8-5.8,1.2c1.2-0.6,2.4-1.3,3.6-1.9c-0.6-1.1-1.1-2.1-1.7-3.2
+			c-0.7-2.3,1.3-3.7,2.9-4.9c0.5-0.4,1-0.8,1.5-1.2c1.8,2.2,4.1,0.6,5.1-1.4C1274.6,834.6,1273.5,833.7,1273,833.2z"/>
+		<path class="st5" d="M89.8,846.2c-2.6-4-5.8-8.9-3.3-13.7c1,0.3,3.1,0.8,4.1,1.1c-2,2.8-2.4,7,0.7,9.3c1.5,1.2,3.1,2.6,3.2,4.7
+			C92.9,847.3,90.7,847.9,89.8,846.2z"/>
+		<path class="st5" d="M1260.8,832.8c1.3,0.1,2.6,0.3,3.9,0.5c0.1,0.2,0.2,0.6,0.3,0.8c-0.4,2.2-1.2,4.3-2,6.4
+			c-0.7-0.8-1.4-1.7-2-2.5C1260.9,836.3,1260.8,834.5,1260.8,832.8z"/>
+		<path class="st5" d="M187.4,835.1c1.6,2.6,0.1,5.7-0.2,8.4c2.4,0.9,4.7,1.9,7.1,2.9c-1.6,1-3.5,1-5.3,1.1c0,1.1-0.1,2.3-0.1,3.4
+			h-5.6c0.9-2.2,0.9-4.6,0.1-6.8c-2.1,1.6-4.1,3.2-6.2,4.9c0.2-2.7,0.5-5.5,0.3-8.2c-0.1-0.4-0.4-1.3-0.6-1.8c1.8,1.2,3.7,1.9,5.8,1
+			c-0.2-1.4-0.5-2.9-0.8-4.3c1,1.4,2.1,2.7,3.4,3.9C187.1,839,186.7,836.6,187.4,835.1z"/>
+		<path class="st5" d="M421.5,835.4c1.3-1.8,2.4,1.4,1.4,2.4c-0.2,2-3,3.8-4,1.3C419.5,837.7,420.4,836.5,421.5,835.4z"/>
+		<path class="st5" d="M1289.8,838.8c0.2-1.7,1.1-3.2,2.2-4.5c-0.2,1.3-0.5,2.5-0.7,3.8c1.5,0.1,3,0.2,4.5,0.2c-1,4,0,8,3,10.8
+			c-1,0.6-2,1.2-3,1.8h-5.2c1.8-1.5,3.4-3.1,5.2-4.6c-2.7-2.2-5.3-0.1-7.6,1.5c0.6,1,1.1,2.1,1.7,3.2h-4.8c1.7-2,2.9-4.4,0.9-6.6
+			c-0.4-0.9-0.8-1.8-1.2-2.7c0.5,0,1.5,0,2,0c1.1,0,2.2-0.1,3.4-0.1C1290.1,840.8,1289.9,839.4,1289.8,838.8z"/>
+		<path class="st5" d="M1489.1,834.6c1.5,0.2,3.1,0.1,4.6,0.7c0.9,2.4,0.5,5,0.6,7.5c1.3,1.2,2.6,2.5,3.9,3.7
+			c-1.5,0.4-2.9,0.9-4.3,1.4c2.1,1.4,4.6,2.2,7.1,1.4c-0.2-0.6-0.6-1.9-0.8-2.5c1.8,1.2,3.5,2.7,5.3,4.1h-13.7
+			c-0.5-1.5-1.4-1.8-2.5-0.7c1.1-1.5,2.2-3,3.3-4.5c-1.8-0.6-3.5-1.3-5.3-1.9c1,0,3,0.1,3.9,0.1c-1-1.3-2.1-2.6-3.2-3.8
+			C1488.5,838.3,1488.8,836.5,1489.1,834.6 M1490.5,836.3c-1.3,1.4,0.8,3.4,2.2,2.2C1494.3,837.2,1491.7,834.8,1490.5,836.3z"/>
+		<path class="st5" d="M129.4,839.3c1.5-1.1,3-2.4,4.7-3.2c2.1,0.1,1.1,2.2,0.9,3.6c-0.6,1.9-1.1,3.9-1.6,5.9
+			c-1.6,1.1-3.3,2.2-4.9,3.3c-1.9-1.3-3.8-2.6-5.7-3.9c2.1,0.4,4.3,0.8,6.4,1.1C129.3,843.8,129.4,841.5,129.4,839.3z"/>
+		<path class="st5" d="M984.3,836.3c3.1-2.5,4,2.5,1.8,4.2C983.6,841,982.8,837.9,984.3,836.3z"/>
+		<path class="st5" d="M1538.2,839.5c0.8-1.2,1.8-2.3,2.7-3.4c0.8,0.6,1.5,1.3,2.3,2c-1.2,1-2.5,2-3.7,3c0,0.4,0,1.3-0.1,1.7
+			c-0.1,1.5-0.2,3-0.3,4.5c-0.8,0.1-2.5,0.2-3.3,0.2c-0.4-0.6-1.2-1.9-1.7-2.5c1.2-1.2,2.2-2.5,3-4
+			C1537.6,840.6,1538,839.9,1538.2,839.5z"/>
+		<path class="st5" d="M515.2,837.1c1.3-0.4,2.6-0.5,4-0.3c0.1,1.9-0.1,3.8-1.2,5.4C516.8,840.6,514.9,839.2,515.2,837.1z"/>
+		<path class="st5" d="M1387.4,838.3c0.4,0.2,1.3,0.6,1.8,0.8c-1.8,2.2-3.8,4.3-6.1,6c-0.1-0.8-0.4-2.4-0.5-3.2
+			C1384.1,840.8,1385.8,839.5,1387.4,838.3z"/>
+		<path class="st5" d="M1414.9,839.2c1.1-0.7,2.2-1.3,3.3-2c0.7,1.7,1.3,3.4,1.9,5.1C1418.1,841.7,1416.4,840.5,1414.9,839.2z"/>
+		<path class="st5" d="M1564,838.3l0.7-0.6c1.6-0.2,3.5,0.3,3.2,2.3C1567.4,843.6,1559.7,840.6,1564,838.3z"/>
+		<path class="st5" d="M1660.6,837.7c-0.4,2.8-1.1,5.5-1.9,8.2c-0.8-0.6-1.5-1.1-2.3-1.6c0-0.5,0.1-1.6,0.2-2.1
+			c0.1-0.8,0.2-2.3,0.3-3C1658.1,838.6,1659.3,838.1,1660.6,837.7z"/>
+		<path class="st5" d="M1110.1,840.2c3.4-1.6,6.3,2.5,8,4.9c-0.7,2.6-3.6,2-5.6,2C1111.9,844.7,1110.6,842.5,1110.1,840.2z"/>
+		<path class="st5" d="M1058.5,840.8c2.6-0.7,6.1,1.6,5.7,4.4C1061.5,845.6,1059.6,842.8,1058.5,840.8z"/>
+		<path class="st5" d="M1080,841c2-1.2,3.3,0.8,4.6,2c-1.1,1.5-2.8,2.5-4.7,2.4C1079.8,843.9,1078.8,842.2,1080,841z"/>
+		<path class="st5" d="M1508.6,843.1c0.8-0.9,1.6-1.7,2.5-2.6c1.5,2,2.5,4.3,3.1,6.7C1511.6,847,1510.1,844.9,1508.6,843.1z"/>
+		<path class="st5" d="M71.5,844.7c3-0.1,6.1-0.7,8.7-2.2c0.5,0,1.5,0.1,2,0.1c0.2,0.9,0.3,1.8,0.5,2.7c-4.1,0.8-8.2,1.2-12.2,2.3
+			c-0.4,1.1-0.8,2.2-1.1,3.4h-5.4c0.2-1.4,0.4-2.8,0.8-4.2C66.7,845.3,69.3,845.2,71.5,844.7z"/>
+		<path class="st5" d="M232.4,842c2.6,0.7,4.1,3.5,6,5.3c-0.4,1.2-0.8,2.5-1.2,3.8h-0.4c-0.3-1.3-0.6-2.5-0.9-3.8
+			c-2.9,1-6.1,1.3-9,2.5c0.4-2.3,2.7-2.7,4.6-3.4C231.7,844.8,232,843.4,232.4,842z"/>
+		<path class="st5" d="M341.4,847.2c2.6-1.9,5.2-3.8,7.9-5.5c1.2,2,2.3,4.1,3.4,6.2c-2.1,1-4.2,2.1-6.3,3.1h-2.5
+			C343.1,849.7,342.4,848.3,341.4,847.2z"/>
+		<path class="st5" d="M1094.4,842.4c1-0.4,2.1-0.7,3.2-0.9c0.2,1.6,0.5,3.3,0.8,5c1.5,1.4,2.9,2.9,4.3,4.5h-7.2
+			c0.2-0.7,0.5-2.2,0.7-3c-0.6-0.3-1.9-0.9-2.6-1.2C1093.8,845.4,1093.5,843.7,1094.4,842.4z"/>
+		<path class="st5" d="M1676.3,842.7c0.3,0.2,1,0.5,1.3,0.7c1.5,0.8,3.1,1.7,4.6,2.6c-0.3,0.9-0.7,1.8-1,2.8
+			c1.4,0.2,2.9,0.6,4.4,0.6c2.3-0.3,2-3.4,2.8-5c1.1,0.8,2.3,1.6,3.5,2.4c-1.3,1.4-2.6,2.8-4,4.2h-13.8l-0.9-1
+			c-0.8-0.9-1.5-1.9-2.3-2.8c0.5-0.4,1.6-1.1,2.2-1.5c1.6,1.5,2.8,3.2,3.9,5c0.9-0.9,1.8-1.8,2.8-2.7c-1.3-0.5-2.6-1-3.8-1.6
+			C1676.2,845.2,1676.2,843.9,1676.3,842.7z"/>
+		<path class="st5" d="M1703.7,845.1c-0.3-4.2,4-0.1,4.5,1.8C1706.8,846.6,1703.3,847.5,1703.7,845.1z"/>
+		<path class="st5" d="M472.3,844.4c1.1-1.5,4.8-0.8,3.9,1.5C476,849,469.7,846.7,472.3,844.4z"/>
+		<path class="st5" d="M290,845.4c1.4-0.1,2.9-0.1,4.3-0.2c0.9,1.6,1.9,3.3,2.8,4.9c0.9-1.1,1.7-2.1,2.6-3.2
+			c0.2,1.4,0.5,2.7,0.8,4.1h-8.7c-0.1-1.2-0.1-2.4-0.1-3.7c-0.6-0.2-1.9-0.5-2.5-0.7C289.4,846.3,289.8,845.7,290,845.4z"/>
+		<path class="st5" d="M751.2,845.3c3.1-0.8,6.6-0.3,9.5,1.1c0.8,1.5,1.3,3.1,1.9,4.6h-14.2C749,849,748.9,846.2,751.2,845.3
+			 M749.8,849c3.5,0.4,7,0.6,10.5,0.6C758.9,845.3,751.6,844.7,749.8,849z"/>
+		<path class="st5" d="M877.2,845.1c1.8-0.7,5.2-1.4,6.1,0.9C883.6,849.9,876.1,848,877.2,845.1z"/>
+		<path class="st5" d="M1028.2,845.3c1.8,0.2,1.4,3.4-0.2,3.6C1026.2,848.7,1026.5,845.5,1028.2,845.3z"/>
+		<path class="st5" d="M1549.8,846.8c1.1-1.9,3.2-2.4,5.3-1.9c2.3,0.6,1,2-0.2,3.1C1553.1,847.7,1551.4,847.2,1549.8,846.8z"/>
+		<path class="st5" d="M1210.4,851c2.5-3.9,7.2-5.3,11.6-4.3c-0.8,0.7-1.6,1.4-2.3,2.2c-0.3,0.5-0.8,1.6-1.1,2.1H1210.4z"/>
+		<path class="st5" d="M1587.5,846.4c0.6-0.2,1.7-0.6,2.3-0.8c0,1.8-0.1,3.6,0,5.3h-9c-1.2-0.9-2.4-1.8-3.5-2.7
+			c3.1-0.1,6.2,0.2,9.3,0.6C1586.8,848.3,1587.3,847,1587.5,846.4z"/>
+		<path class="st5" d="M1651.9,848c0.5-1.2,1.9-1.4,2.9-1.8c0,0.9,0,2.8,0,3.7c-0.5,0-1.4,0-1.9,0
+			C1652.6,849.4,1652.1,848.4,1651.9,848z"/>
+		<path class="st5" d="M1661.9,848.8c1.1-1.3,2.5-2.4,4.1-3.1c-0.1,1.4-0.2,2.9-0.3,4.3C1664.4,849.6,1663.2,849.2,1661.9,848.8z"/>
+		<path class="st5" d="M152.4,847.5c0.4-0.3,1.1-0.9,1.5-1.2l1.1,0.6c0.3,1.4,0.6,2.7,1,4.1h-3l-0.9-1
+			C152.1,849.4,152.3,848.1,152.4,847.5z"/>
+		<path class="st5" d="M487.4,847.4c2.2-1.3,2.2,2.4,3.3,3.6h-5.3C486,849.8,486.2,848.2,487.4,847.4z"/>
+		<path class="st5" d="M1608.4,851c1.8-1.5,3.5-3,5-4.7c1,0.6,2,1.1,3,1.7c0.5,1,1.1,2,1.6,3H1608.4z"/>
+		<path class="st5" d="M1731.4,846.9l1-0.2l0.6,0.7v2.7C1731.2,850.7,1730.1,848,1731.4,846.9z"/>
+		<path class="st5" d="M80.2,851c1.3-1.5,2.6-3.4,4.8-3.5c0.4,1.1,0.8,2.3,1.1,3.5H80.2z"/>
+		<path class="st5" d="M158.1,851c1.7-1,3.6-1.9,5.4-2.7c0.6,0.9,1.2,1.8,1.8,2.7H158.1z"/>
+		<path class="st5" d="M1120.4,851c1.4-1.2,2.6-2.9,4.5-3.2c0.6,1,1.2,2.1,1.8,3.2H1120.4z"/>
+		<path class="st5" d="M1401.7,847.5c2.2,0.8,4.2,2.1,6.1,3.5h-4.9C1402.4,849.8,1402.1,848.7,1401.7,847.5z"/>
+		<path class="st5" d="M1425.2,851c1.6-1,3.1-2.1,4.7-3.2c0.1,0.8,0.4,2.4,0.6,3.2H1425.2z"/>
+		<path class="st5" d="M1522.2,847.8c1.3,0,2.7,0.1,4,0.2c-0.4,1-0.8,2-1.2,3h-3.4C1521.8,850.2,1522.1,848.6,1522.2,847.8z"/>
+	</g>
+	<g id="_x23_8a9eb6ff">
+		<path class="st6" d="M349.8,0h9.6c-0.6,0.2-1.9,0.5-2.5,0.6c-0.7,0.2-2.2,0.4-2.9,0.6c-0.3,0.5-0.8,1.6-1.1,2.2
+			c1.6,0,3.1,0,4.7-0.2c0.1,0.3,0.2,0.9,0.3,1.2c-1.4,0.6-2.6,1.4-3.8,2.3c0.7,0.5,2.2,1.4,2.9,1.8c-0.8,1.7,0.6,3,1.5,4.3
+			c1.2-0.6,2.4-1.1,3.6-1.5c2.2-0.1,3.6,3.3,5.9,1.9c1.6-0.9,2.8-2.3,4.1-3.6c-2.4-0.1-4.6,1-6.8,1.8c0-0.8,0-2.3,0-3
+			c2.6-0.4,4.8-1.6,5.8-4.2c-0.7-0.9-1.4-1.9-2.1-2.8c2.7,0.8,5.4,1,8.2,1c-0.3-0.6-0.9-1.8-1.1-2.4h8.6c-1.7,0.7-3.3,1.5-5,2.2
+			c0.3,1.5,0.6,3.1,0.8,4.6l-0.4,0.2c-0.5-1.7-0.9-3.7-3-3.9c0,0.8-0.1,2.3-0.1,3c-0.7-1.2-1.5-2.4-2.2-3.6
+			c-0.5,2.8-0.3,5.6,0.1,8.3c-2,2.2-3.6,4.7-5.1,7.3c-2.2-0.2-4.3-0.5-6.5-0.6c0.1-0.5,0.4-1.5,0.5-1.9c-1.7-0.1-3.4,0-5,0
+			c0.1-0.3,0.3-0.9,0.4-1.2c-2.7,0.4-5.5,1-7.8,2.5c-0.3-0.2-0.9-0.5-1.1-0.7c-0.8,0.1-2.4,0.3-3.2,0.4c-0.1-0.4-0.4-1.2-0.5-1.5
+			c2.8-0.4,5.6-0.9,8.4-1.5c0-2.6,0-5.4-2-7.4c-1.1,0.6-1.9,1.6-2.8,2.4c-0.9-0.8-1.6-1.6-2.5-2.4c0.5-0.6,1.1-1.1,1.6-1.7
+			C349.3,2.9,349.6,1.5,349.8,0 M367.3,14.3c-3.3,1.4,1.9,4.4,2.5,1.5C370.9,14.2,368.5,13.2,367.3,14.3z"/>
+		<path class="st6" d="M391.2,0h3.1c1.5,0.9,2.6,2.8,4.5,2.8c1.4-0.7,2.5-1.8,3.8-2.8h0.7c1.4,1.6,3.2,2.5,5.3,1.8
+			c-0.8,1.1-1.5,2.2-2.2,3.4c0.9,0,2.8,0,3.7,0c-1.8,0.9-3.1,2.2-4.5,3.6c0.9-1.1,0.1-3.1-1.5-2.6c-1.6,0.4-1.1,2.4,0,3.1
+			c-0.7-0.1-2-0.3-2.7-0.4c-0.2-0.6-0.7-1.9-0.9-2.6c-1.7,0.4-3.3,0.8-5,1.2c1.8,3.5,6.2,2.7,9.5,3.4c2.3,0.1,4.2,1.6,6,2.9
+			c-2.6,2.4-6.2,2.5-9.5,3.2l1.1-1.6c-2.5-0.8-4.4,0.4-5.5,2.8l-0.2,0.3c-0.7-2.5-2.9-4.1-4.6-5.8c0.9-2.4,1.6-4.8,2.3-7.3
+			c0.1-0.6,0.5-1.7,0.6-2.3C394,2.1,392.6,1,391.2,0 M396.4,4.3c-1.3,2.2,3.1,2.6,3.3,0.5C399.6,3.2,397.2,3.3,396.4,4.3
+			 M395.1,12.8c1.9,1.9,4.5-0.5,6.3-1.6C399.2,10.2,395.8,9.9,395.1,12.8 M405.2,13.1c-1.1,1.5,1.5,3,2.5,1.7
+			C408.9,13.3,406.3,11.8,405.2,13.1z"/>
+		<path class="st6" d="M448.2,0h3.7c0.8,1,1.6,2,2.4,3.1C452.1,2.3,450.1,1.2,448.2,0z"/>
+		<path class="st6" d="M465.1,0h9.5c-1.8,1-3.4,2.7-5.5,3C467.6,2.2,466.4,1,465.1,0z"/>
+		<path class="st6" d="M634,0h2.7C638,3,632.6,3,634,0z"/>
+		<path class="st6" d="M1197.9,0h12.7c-0.3,0.4-1,1.1-1.3,1.4c-0.6-0.2-1.8-0.6-2.4-0.8c-1.5,1.8-2.9,3.7-4.7,5.2
+			C1200.5,4,1199.2,2,1197.9,0z"/>
+		<path class="st6" d="M1297.2,0h4.7C1300.9,1.8,1297.9,2.3,1297.2,0z"/>
+		<path class="st6" d="M1320.3,0h2.6c-0.5,2.8-0.5,5.6-0.4,8.4c-0.4,0.4-1.3,1.2-1.8,1.6c1.3,1.3,2.6,2.7,3.9,4
+			c-1.6,0.5-3.2,0.9-4.8,1.4c-0.9-1.7-1.7-3.4-2.6-5.1c1-0.8,2-1.7,3-2.5C1320.3,5.3,1320.3,2.7,1320.3,0z"/>
+		<path class="st6" d="M1340.5,0h2.8c0.5,2.4,3.6,1.7,4.6,0h11.4c-1.2,0.6-2.4,1.3-3.6,2c0,0.9-0.1,2.7-0.1,3.7
+			c-0.6-1.6-1.1-3.2-1.8-4.8c-0.7,0.2-2.1,0.7-2.8,0.9c1,1.5,2,3,3,4.5c-0.9,0.6-1.9,1.3-2.8,1.9c-0.6-0.9-1.2-1.8-1.7-2.7
+			c-1.1,0.5-2.2,0.9-3.3,1.4c-1-1.3-2-2.5-3-3.8c-2.1,1.2-4.3,1.7-6.6,0.8C1337.9,2.5,1339.2,1.2,1340.5,0z"/>
+		<path class="st6" d="M557,1.4c0.7-0.1,2.2-0.2,3-0.3c0.3,0.9,0.7,1.9,1,2.8c-0.5,0.3-1.6,0.9-2.2,1.2C556.5,5.6,557.3,2.7,557,1.4
+			z"/>
+		<path class="st6" d="M611.3,1.2c1.2-0.5,2.1-0.3,2.9,0.7c-0.6,1.3-2.3,2.9-3.4,1C610.9,2.5,611.1,1.7,611.3,1.2z"/>
+		<path class="st6" d="M1241.5,3.1c1.6-0.8,3.2-1.5,4.8-2.2c0.1,0.5,0.3,1.4,0.4,1.9c1.3,1.3,3,2.3,3.5,4.2
+			c-2.4,2.7-5.8,4.3-8.5,6.6c1.8,0.2,3.6,0.4,5.4,0.6c-2.1,2.7-3.5,5.9-4.5,9.2c-1.7,0.4-3.4,0.8-5.1,1.1c-2.8-0.1-5.5,0.1-8.2,0.4
+			c0.1-1.1,0.2-2.2,0.3-3.4c-2.6-1.4-5-3.3-4.6-6.6c1.9,0.7,3.9,1.4,5.6,2.5c1.4,1.7,1.8,3.9,2.8,5.9c1.6-1.3,1.8-3.3,2-5.3
+			c0.4,0.5,0.8,1.1,1.2,1.6c0.4-1.8,0.8-3.5,1.1-5.3c-0.6-0.2-1.9-0.6-2.5-0.7c0.1-1.6,0.1-3.2,0.1-4.8c1.8-1.8,4-2.7,6.4-3.3
+			C1241.7,4.8,1241.6,3.9,1241.5,3.1z"/>
+		<path class="st6" d="M804.3,2.3c1.6-0.4,2.2,0.1,1.6,1.7C804.2,4.5,803.7,3.9,804.3,2.3z"/>
+		<path class="st6" d="M363.1,3.3c1.8-0.6,2.3,2.2,0.6,2.6C361.8,6.8,361.2,3.6,363.1,3.3z"/>
+		<path class="st6" d="M490.4,6.3c1.5-1,3-2,4.5-3c-0.5,3.7-1.5,7.3-2.6,10.8C490.1,12.1,490.5,8.9,490.4,6.3z"/>
+		<path class="st6" d="M503.3,7.3c1.5-1.7,1.8-5.4,4.8-4.6c1.7,0.8,3.2,1.8,4.8,2.7c-0.4,1-0.8,2.1-1.2,3.1
+			c-0.6,0.1-1.6,0.2-2.2,0.3c0.2-1.3,0.5-2.7,0.7-4.1c-3.1,1.1-5.6,3.4-7.4,6.1c-1,1.6-3.2,0.7-4.7,0.6C499,9.4,502.3,9.5,503.3,7.3
+			z"/>
+		<path class="st6" d="M628.6,3.9c2.8,0.7,1.8,4.1,2.3,6.2c-1.2-0.1-2.5-0.2-3.7-0.4C627.7,7.8,628.1,5.9,628.6,3.9z"/>
+		<path class="st6" d="M587.1,12.1c0.7-2.1,0.7-4.7,2.7-6c1.8,1.8,0.1,4.6,0,6.8C588.9,12.6,588,12.4,587.1,12.1z"/>
+		<path class="st6" d="M1226.2,9c0.7-1.9,3.8-3.9,5.4-1.7c1.9,2.2,0.2,5-0.6,7.3C1229.2,13,1226.9,11.5,1226.2,9z"/>
+		<path class="st6" d="M341.1,7.5c0.8,0,1.7,0.1,2.5,0.2c0.5,0.2,1.6,0.5,2.2,0.6c-0.6,0.8-1.1,1.6-1.7,2.3c-2.5-1-5.2-1.7-7.9-1.1
+			c0.1,0.5,0.4,1.6,0.5,2.2c-1.5,0.2-2.9,0.6-4.3,0.9c1.1,0.9,2.3,1.8,3.5,2.6c-2.1,1.2-3.8,3-4.6,5.4l-0.4-0.1
+			c-0.1-1.3-0.2-2.6-0.3-3.8c-1.4,0.2-2.7,0.4-4.1,0.6c0.4-2.4,0.8-4.9,1.3-7.3c0.7,1,1.4,2.1,2,3.1c1.6-0.8,3.2-1.7,4.9-2.5
+			c-0.6-0.5-1.1-1-1.7-1.4c1.3-0.3,2.5-0.6,3.8-0.9c0.5-0.1,1.4-0.3,1.9-0.3C339.3,7.8,340.5,7.6,341.1,7.5z"/>
+		<path class="st6" d="M1265.5,7.2c0.1,0.2,0.4,0.7,0.5,0.9c-0.2,1.6-0.6,3.1-0.9,4.6c0.2-0.1,0.7-0.4,1-0.5
+			c1.7,1.5,3.7,2.5,5.7,3.4c-2.8,1.4-6,1.4-8.5-0.7c0.3-0.9,0.5-1.8,0.8-2.7c-1.4-0.5-4,0.1-3.6-2.1C1262.3,9.1,1265,9.6,1265.5,7.2
+			z"/>
+		<path class="st6" d="M476.1,11c0.2-1.9,2.3-2.4,3.8-3.1c-0.4,2.6-0.2,5.8-2.8,7.2C476.6,13.8,476.2,12.4,476.1,11z"/>
+		<path class="st6" d="M384.3,15.3c2.7-2.1,2.9-7,7.1-6.9c-1.5,1.6-2.9,3.1-4.4,4.7c0.7,0.3,2.2,1,2.9,1.3c-1.1,2.1-2.2,4.3-3.3,6.4
+			c0.2,0.2,0.5,0.5,0.7,0.7c0.5,0.5,1.5,1.4,2,1.9c0.4-0.1,1.3-0.2,1.8-0.2c-0.9,0.8-1.7,1.7-2.5,2.5c-4.4,0.2-8.8-0.9-13.2-0.5
+			c-0.8-2.3-1.6-4.5-2-6.9c2.3-0.1,4.1,1.5,6,2.5C380.5,18.5,382.3,16.8,384.3,15.3 M380.2,21.2c1.8,0.8,3.7,1.4,5.7,1.8
+			c-0.5-0.9-1.1-1.9-1.6-2.8c1.7-1.2,3.7-2.4,3.1-4.9C384.5,16.4,382,18.5,380.2,21.2z"/>
+		<path class="st6" d="M584.1,8.6c2.8,0.8,2.4,4.2,3.1,6.4c-1.4,0.3-2.8,0.6-4.1,0.8c0.4-1.1,0.9-2.2,1.3-3.4
+			C584.3,11.2,584.2,9.9,584.1,8.6z"/>
+		<path class="st6" d="M619.9,13c-0.2-2.2,1.1-3.5,3.1-4.1c0.8,1.6,1.5,3.2,2,4.9C623.3,13.5,621.6,13.2,619.9,13z"/>
+		<path class="st6" d="M1341.4,10.4c3.5-1.2,6.2,2.6,8.8,4.4c1.2,0.6-0.2,2.7-1.2,2c-3.2-1.2-6.3-3.2-8.4-5.9L1341.4,10.4z"/>
+		<path class="st6" d="M793.2,12.4c1.3-1.4,3.6,0.8,2.2,2.1C794.1,16,791.7,13.7,793.2,12.4z"/>
+		<path class="st6" d="M1373.5,13.2c1.4,0.8,2.9,1.5,4.4,2.2c0.2,1,0.5,2,0.7,3c-0.2,1.2-0.4,2.4-0.7,3.5c2-0.1,4-0.2,6.1-0.4
+			c1.4,1.3,2.9,2.6,4.3,3.9c-1.8,0-3.5-0.1-5.2-0.1c-1.1-0.8-2.1-1.7-3.2-2.5c-0.2,0.6-0.6,1.9-0.8,2.5l-0.7-0.4
+			c-0.4-0.3-1.3-0.9-1.7-1.2c-3.8,0.3-7.6-0.4-10.6-2.7c2.5,1.7,4.2-2.5,0.8-2.1C1370.1,18.3,1372.4,16.2,1373.5,13.2 M1373.6,16.5
+			c-0.8,2.1-1,4.2-1.4,6.4c0.7,0,2.1,0.1,2.7,0.2C1375.3,21.1,1377.2,15.8,1373.6,16.5z"/>
+		<path class="st6" d="M1288.2,14.1c1.6-0.5,2.1,0.1,1.6,1.8C1288.2,16.3,1287.7,15.8,1288.2,14.1z"/>
+		<path class="st6" d="M519.2,16c2.7-1.2,2.7,4.6-0.2,3C517.1,19.2,518.4,16.6,519.2,16z"/>
+		<path class="st6" d="M421.7,22.3c0.9-1.8,1.8-3.5,2.8-5.2c1.9,2.6,3.8,5.3,5.6,8c-0.6,0-1.8-0.1-2.4-0.1
+			C426,23.6,423.9,22.8,421.7,22.3z"/>
+		<path class="st6" d="M1249.8,17c1.3,1.4,2.2,3,1.8,4.9c-0.5-0.7-1.3-2.1-1.8-2.8c-1,1.5-2,3-2.9,4.5c0.8,0.1,2.4,0.4,3.3,0.6
+			l-0.5,0.7c-1.7,0.1-3.4,0.1-5.1,0.2C1246.2,22.3,1247.9,19.6,1249.8,17z"/>
+		<path class="st6" d="M618,22c-2.9,1-5-3.1-2.1-4.5C618.8,17.1,618.2,20.1,618,22z"/>
+		<path class="st6" d="M788.1,18.2c1.8-0.5,2.5,2.6,0.7,3C786.8,21.9,786.1,18.6,788.1,18.2z"/>
+		<path class="st6" d="M1344.3,18.6c2-0.3,4-0.4,6-0.5c0.2,2.4,0.7,4.8,1.3,7.1c-0.5,0-1.6,0-2.2-0.1
+			C1347.8,22.9,1346,20.8,1344.3,18.6z"/>
+		<path class="st6" d="M543.1,20.3c1.8-1,4.3-0.9,5.3,1.1c0.9,1.4-0.5,2.3-1.3,3.2C545.8,23.2,544.4,21.8,543.1,20.3z"/>
+		<path class="st6" d="M608.4,19.2c1.3-1.5,3.7,0.9,2.1,2.2C609.2,22.8,607.1,20.5,608.4,19.2z"/>
+		<path class="st6" d="M1307.3,19.3c1.5,0.2,3.8,2.7,1.4,3.4C1306.6,23.5,1305,20.2,1307.3,19.3z"/>
+		<path class="st6" d="M434,19.7c2,0.9,6.4,1.1,5.2,4.4c-2.3,0.7-4.1-1.2-6-2.1C433.3,21.4,433.8,20.3,434,19.7z"/>
+		<path class="st6" d="M1411.2,21.8c1.6-0.4,3.3-1,4.9-1.7c-0.1,4.2-0.1,8.4-0.1,12.6c-0.6,1.6-1.2,3.1-1.8,4.7
+			c-3.7-0.8-7.4-1.4-11-2.6c-2.5-0.7-3.7-3.3-5.3-5.1c0.8-0.1,2.5-0.2,3.3-0.2c-1.2-1.3-2.4-2.5-3.6-3.7c0.6-0.5,1.9-1.5,2.5-2
+			c0.2,0.6,0.6,1.8,0.8,2.4c2.2-1.2,4.4-2.4,6.8-3.4c-0.2,1.9-0.3,3.8-0.4,5.7c1.3,0.2,2.6,0.5,3.9,0.7c-0.2,0.2-0.7,0.7-0.9,1
+			c-2.8,0.2-5.5,0.5-8.2,1.1c0.1,0.5,0.3,1.4,0.4,1.9c2.3,0.4,4.5,0.8,6.8,1.3c0.4-1.3,0.9-2.6,1.4-3.9c0.8,0,2.5-0.2,3.3-0.2
+			c-0.6-1-1.2-1.9-1.7-2.9C1413,25.5,1412.4,23.5,1411.2,21.8 M1411.6,34.1c-1.1,1.3,1.2,2.8,2.1,1.5
+			C1414.8,34.3,1412.5,32.7,1411.6,34.1z"/>
+		<path class="st6" d="M321.2,27.6c0.5-1.7,0.5-3.7,1.8-5.1c3.5,0,2.1,4.4,2.6,6.7c0.5,0,1.6,0,2.1,0c1.2,1.7,2.4,4.5,4.9,4.5
+			c1.5-1.5-0.1-3-1-4.3c2.1,0.2,2.5-2,3.3-3.4c1.4,2.3,2.9,4.6,4.4,6.9c2.1-0.5,2.2-2.5,1.7-4.3c-1.5-1.1-2.8-2.3-4.1-3.5
+			c1.8,0.4,3.5,1,5.3,1.6c-0.3,4.1,0.1,8.3,0,12.4c-1.5-1.3-3-2.5-4.6-3.8c-0.2-1.7-0.5-3.4-0.7-5c-0.6,0-1.8-0.1-2.4-0.1
+			c-0.6,2.5-1.2,4.9-1.8,7.3c-3.2,1-5.5,3.4-7.9,5.6c-1-1.1-2.1-2.3-3.1-3.4c2.5,0,5.4-1.5,4.6-4.5c-2.5-0.9-4.4,1.2-6.4,2.5
+			c-1.1-0.2-2.2-0.4-3.3-0.5c1-2.1,2.4-3.9,4.1-5.5c1.8,1.3,3.9,2.1,6.1,2.4c0-1.2-0.1-2.3-0.1-3.5c-1.4,0-2.8,0-4.2,0
+			c-1.6-0.6-3.6-0.8-5-1.9l-0.1-0.5C318.5,27.9,319.9,27.7,321.2,27.6z"/>
+		<path class="st6" d="M1400.4,38.4c3.2-1,5.5,2.1,8.4,2.8c2.4,0,4.8-0.4,7.2-0.6c-0.1,1.9-0.1,3.8,0,5.7c-0.7-0.1-2-0.3-2.6-0.4
+			c-0.2-0.6-0.4-1.8-0.6-2.4c-2.7,0.3-5.5,0.5-8.2,0.6c-0.5,1.8-0.9,3.6-1.3,5.5c-2.1-3-4.9-5.6-8.6-6c-0.5-0.1-1.5-0.4-1.9-0.6
+			c0-0.4-0.1-1.2-0.1-1.6c0.9,0.5,1.9,1,2.9,1.5c0.1-0.6,0.2-1.8,0.3-2.4c2.4,0.6,4.8,1.4,7.2,2.1
+			C1402.1,41.2,1401.2,39.8,1400.4,38.4z"/>
+		<path class="st6" d="M1404.8,50c1.8-2,3.9-3.7,6.2-5c0,1.1,1.1,2.4,0.3,3.4C1409.6,49.8,1407.2,51.2,1404.8,50z"/>
+		<path class="st6" d="M1408.7,53.3c0.9,0,2.8-0.1,3.8-0.1c-0.2,1.1-0.4,2.2-0.5,3.3c1.3-0.7,2.6-1.3,4-2c0,2.7-0.1,5.5,0,8.2
+			c-2-1-4.2-1.8-6.4-2.2c0.7-0.6,1.5-1.2,2.2-1.8c-0.5-1.3-1.6-2.3-2.4-3.3C1409.2,54.9,1408.9,53.8,1408.7,53.3z"/>
+		<path class="st6" d="M1403.2,68.4c-0.7-1.8-3.4-5,0.1-5.4c0.7,2.5,1.3,5.3,4.5,5.6c0.2-1.6,0.5-3.2,0.7-4.7
+			c2.6,0.2,5.3,0.9,7.5,2.4c0,0.4,0,1.1,0,1.5c-1.7,0.1-3.3,0.2-4.9,0.2c-0.8,0.9-1.7,1.7-2.5,2.6c-2-0.2-4.1-0.5-6.1-0.6
+			c1.2,2.6,4.4,2.6,6.8,3.3c-2,0-4.1,0.1-6.1,0.1c1,0.4,2,0.9,3.1,1.3c-3.5,0.5-7.1,1-10.6,0.2C1396.5,71.2,1400.5,70.2,1403.2,68.4
+			z"/>
+		<path class="st6" d="M321.5,75.8c0.9-2.2,1.9-4.6,4.7-4.6c0,2.2-0.7,4.5,0,6.6c1,2,3.1,0.2,4.6-0.1c1,0.5,2.1,0.9,3.1,1.4
+			c-0.9,0.7-1.8,1.4-2.7,2c1.9,2.4,4.6,1.5,6.9,0.5c1.3,0.4,2.6,0.8,4,1.3l0,0.9c-0.9,2-2.5,3.4-4.4,4.6c0-0.8,0.1-2.3,0.2-3.1
+			c-1.7,0-3.4,0-5.1-0.1c-1.7-2.4-3.8-4.4-6.2-6.2c-0.7,1.4-1.4,2.8-2.1,4.3c-0.5-0.8-0.9-1.6-1.4-2.3c0.5-1.3,1-2.6,1.5-3.9
+			C323.6,76.7,322.5,76.2,321.5,75.8z"/>
+		<path class="st6" d="M671.5,76.7c0.7,0,2.2,0,2.9,0c1.3,3.3,0.4,6.7,0.3,10.1c0.3,3.7,1.3,7.2,1.7,10.9c-3-0.1-6-0.2-9-0.1
+			c0.2,2.4,1,4.9,0.5,7.3c-1.4,2.5-4.7,2.8-7.2,3.8c-0.4,3.2-0.1,6.9-2.8,9.2c-2.3,1-4.7,0-6.9-0.8c0.6-2.1,1.7-4.2,1.6-6.5
+			c-2-2.2-4.5-3.9-6.7-5.8c-0.7,0-2,0-2.7,0c1.4-0.9,3-1.7,4.4-2.5c1.8,0.2,4.5,2.2,5.4-0.3c0.9-2.8-0.9-5.5-2.1-7.9
+			c-1.7,0.4-3.5,0.8-5.2,1.3c-1-1.3-2.1-2.7-3.1-4c-3.2-0.6-8,0-9-4c-1.4-2.7,2.3-4,4.4-3.7c3.2,1.3,5.2,4.4,8.4,5.7
+			c2.6,0.8,5.5,0.4,8.2,0.3c1.1-1.4,2.1-2.9,3.4-4.2c1.8,0.2,3.5,0.8,5.3,1.2c2.4-1.4,4.9-2.6,7.1-4.4
+			C671.4,80.7,671.1,78.5,671.5,76.7z"/>
+		<path class="st6" d="M704.8,76.7c2.5,0,4.9-0.1,7.4-0.1c0.5,3.7-2.1,6.6-3.2,9.8c-2.1,5.5-8,7.7-11.9,11.6c-1-1.6-1.6-3.4-1.9-5.3
+			c1.4-0.8,2.8-1.6,4.2-2.4c-0.5-1.8-0.9-3.5-1.4-5.3c2,0.4,4,0.8,6,1.2c1.9-2,3.9-3.9,5.9-5.7C708.2,79.2,706.6,77.8,704.8,76.7z"
+			/>
+		<path class="st6" d="M848.6,76.7c2.8-0.1,5.5-0.1,8.3,0c-0.2,1.1-0.4,2.1-0.6,3.2c0.8,1.5,1.6,3,2.4,4.5c-1.1,0.5-2.2,1-3.4,1.3
+			C852.2,83.3,850.2,80.1,848.6,76.7z"/>
+		<path class="st6" d="M867.7,76.7c1.9-0.1,3.7-0.1,5.6-0.3c-2.3,2.6-4,5.7-4.5,9.2c2.3-1.4,4.5-3.1,7.2-3.6
+			c1.5,3.5-2.4,5.6-4.2,7.9c0.9,2.4,2.1,4.7,2.6,7.2c-0.4,1.8-1.5,3.5-2.3,5.2c-4.1-1.2-8.2-2.6-11.9-4.8c3.1-3.3,3.9-7.9,6-11.8
+			c1.6,3.9,1.5,8.8,4.6,11.9l0.8-0.5c-1-4.5-2.9-8.8-4.1-13.2c-1.8,0.3-3.6,1-5,2.3c-0.2-0.6-0.5-1.8-0.6-2.3
+			C864.5,81.9,866.8,79.8,867.7,76.7z"/>
+		<path class="st6" d="M873.7,76.8c2.8-0.3,5.7-0.3,8.5-0.2c0.3,1.8,0.5,3.5,0.8,5.3c-1.5,0.3-3.1,0.6-4.6,0.9
+			C876.9,80.7,875.4,78.7,873.7,76.8z"/>
+		<path class="st6" d="M910.2,76.6c4.8,0,9.5,0,14.3,0.1c2.5,4.3,7.3,5.8,12,5.9c-1.5-2-3.1-4-4.7-5.9c6.1,0,12.3,0,18.4,0
+			c-0.9,2.6-1.9,5.2-3,7.7c-3-0.2-6.3-1.2-9.2-0.2c-0.1,1.5-0.2,2.9-0.2,4.4c-0.7,1.3-1.5,2.5-2.2,3.8c-1.6-2.6-2.1-6.5-5.3-7.7
+			c-4.2-1.7-7.8-4.4-11.7-6.5c-0.5,2.2-1.1,4.3-1.6,6.5c-2.2,0-4.3,0-6.5-0.1C910.5,81.9,910.3,79.3,910.2,76.6z"/>
+		<path class="st6" d="M1003.3,76.7c1.7-0.2,3.3-0.1,5-0.1c-0.4,2.6-1,5.2-0.8,7.8c0.8,1.1,1.8,1.9,2.8,2.8c-2.9,2.5-6.1,4.7-9.2,7
+			c-0.1-0.5-0.3-1.6-0.4-2.2c-1.9,1.3-3.8,2.6-5.7,3.9c-1.8-3.1-0.5-6.1,1.1-9c0.2-0.2,0.7-0.7,0.9-0.9c1.7,0.4,3.4,0.5,5.2,0.7
+			c-1-2.8-2.8-5-4.8-7.1C999.2,78.6,1001.2,77.5,1003.3,76.7z"/>
+		<path class="st6" d="M1016.2,76.7c0.8,0,2.2-0.1,3-0.1c-1.6,3.2-3,6.8-6.4,8.6c-0.5-1.8-1.3-3.5-1.2-5.3
+			C1012.8,78.5,1014.5,77.6,1016.2,76.7z"/>
+		<path class="st6" d="M1021.1,76.7c19.2-0.1,38.5,0,57.7,0c-0.4,2.5-1.4,5-1.1,7.6c0.9,1.5,2.9,3.3,4.7,2.2
+			c2.3-0.9,1.5-3.9,2.1-5.8c1.1-0.2,2.2-0.5,3.3-0.8c-0.6-1.1-1.3-2.1-1.9-3.2c6.8,0,13.6-0.1,20.5,0c1.1,1.4,2.9,2.5,3.4,4.3
+			c-0.7,2.8-3.3,4.9-3.2,8c-0.4-1.6-0.8-3.2-1.1-4.9c-1.3,0.2-2.5,0.4-3.8,0.7c-2.1,4.3-3.4,9-3.7,13.7c2.9-3.7,3.4-8.5,5.3-12.7
+			c2.4,3.8,2.4,8.8,5.7,12c-0.3-1.4-0.5-2.8-0.9-4.2c1.2-1,2.5-1.9,3.8-2.9c-0.4-0.4-1.3-1.1-1.7-1.5c3-2.2,5.5-6.1,9.7-5.8
+			c0.8-2.2,1.6-4.4,2.3-6.6c3.1,0,6.1,0,9.2,0c0,1.6-0.1,3.1-0.1,4.7c-3.7,0.6-7.2,2.6-9,6c-0.7,1.9-0.8,3.9-1.1,5.9
+			c-3.4,0.6-7.4,0.8-9.2,4.3c-1.6,0.2-3.2,0.4-4.9,0.5c-0.3,0.9-0.6,1.8-0.9,2.8c-0.2-0.6-0.6-1.9-0.8-2.5c-2.5,1.5-5.3,2.7-7.6,4.5
+			c-0.3,3.1-1,6.1-3.3,8.3c0.6-1.8,1.1-3.7,1.7-5.5c-3.6-3.2-7.7-5.8-11.6-8.5c-0.5,0.1-1.5,0.4-2,0.6c-0.1,0.4-0.2,1.2-0.3,1.6
+			c3.1,3.1,7.2,5,10.3,8c1.8,1.6,0.3,4,0.1,5.9c-0.9,0.1-2.8,0.2-3.7,0.3c-0.5,0-1,0.1-1.5,0.1c0,1.3,0,2.6,0.1,3.8
+			c-0.8-2-1.4-4-2.5-5.9c-1.6-1.6-3.9-2.4-5.5-4.1c-2.1-4.5-0.1-10.6-4-14.3c-0.8-0.9-1.7-1.8-2.6-2.6c-1.2,3.3-2.3,6.8-2,10.4
+			c0.3,2.4,1.5,4.6,2.3,6.8c-1.5,0.7-3.4,0.8-4.6,2c-1.2,2.7-1.7,5.6-2.6,8.4c7.3,0.3,14.6-0.4,21.8,0.4c-18.3,0.5-36.7,0.1-55,0.2
+			c-51.4,0.1-102.8,0.1-154.1,0.1l-0.3-0.7c11.8,0.1,23.7,0,35.5-0.1c0.4-1.3,0.6-2.6,0.9-4c1.4,0.5,2.8,0.9,4.3,1.3
+			c0.1,0.8,0.2,1.7,0.3,2.5c10.8,0.4,21.7,0,32.5,0.2c2.4,0.1,4.7-0.5,6.9-1.3c-2.8-1.3-5.8-2.1-8.3-3.9c0.4-0.4,1.3-1.2,1.7-1.5
+			c2.7,0.4,5.4,0.2,6.7-2.6c-2.3-1.1-4.6-2.4-7.2-2.8c-1,0.7-1.9,1.6-2.8,2.5c0.4-2,1.2-4.2,0.3-6.1c-0.9-2.6-2.3-5.6,0.2-7.9
+			c1.3,2.2,1.3,7.1,4.9,6c0.3-2.8-0.5-6.2,2.3-7.9c2.7-2.9,6.5-0.2,9.3,1.1c1.2-1.6,2.7-2.8,4.7-2.9c0.2,0.8,0.6,2.5,0.8,3.4
+			c-1.6,1.1-3.1,2.5-4.9,3.1c-2.2,0.1-4.3-0.5-6.5-0.5c-1.9,0.9-4.1,2.8-3.1,5.1c1,4,4.9,6.3,8.9,6.4c0.2-1.5,0.4-3,0.6-4.5
+			c2.9,0.4,4.7-1.5,6.2-3.7c2.2,2.6,5,5.6,3.7,9.4c-1.4,0.1-2.7,0.2-4,0.2c1.6,2.5,2.2,5.3,3,8.1c3.4,2.2,6.5-2.3,10-0.9
+			c5.7,1.9,11.9,1.8,17.8,1.1c2,0,2.7-2.2,3.8-3.5c1.8-0.3,3.7-0.7,5.5-1c0-1.6,0.1-3.3,0.2-4.9c0.6-0.3,1.9-0.9,2.5-1.2
+			c0.9,0.6,1.8,1.2,2.7,1.9c1.2,2.9-0.7,5.8-1.5,8.5c3.2,0.2,6.4,0.5,9.6,0.5c4.8,0.3,8.3-3.9,12.9-4.4c4.7-1.3,7.4,5.3,12.1,4.3
+			c2.2-1.1,3.3-3.5,4.7-5.3c0,0.7-0.1,2.1-0.1,2.8c-0.6,0.8-1.3,1.7-1.9,2.5c2.5,0,5-0.1,7.6-0.2c-0.3-3.7-2-7.3-1.1-11.1
+			c1,0.7,2,1.4,3,2.1c0.9-0.8,1.7-1.5,2.6-2.3c-1.7-0.5-3.4-1-5.1-1.5c-0.3-0.7-0.8-2-1.1-2.7c-1.4,1.6-2.7,3.2-4.1,4.8
+			c-4.3-2.2-8.7-4.8-10.9-9.3c-1.1-1.5,0.7-2.8,1.2-4.2c1.8,1.2,3.4,3.3,5.8,2.5c-1-1-2-2-3-2.9c-0.2-2.6-0.7-5.1-1.4-7.6
+			c-1.6,1.7-3.2,3.5-4.7,5.2c-2.6-2.6-4.7-6.2-8.6-6.8c-2.3,1.3-1.8,4.3-3.1,6.3c-0.8,0.9-1.8,1.7-2.6,2.6c-0.2,0.5-0.6,1.6-0.8,2.1
+			c-1.2-0.3-2.5-0.6-3.7-0.8c-4,3-6.7,7.3-10.1,10.9c-2.9-0.2-3.8-3.9-6.2-5.2c-1.8,0.2-3.5,1-5.2,1.6c-0.4-1.2-0.7-2.5-0.8-3.8
+			c3.1-2.6,6.7-4.5,9.8-6.9c0.2-1.1,0.3-2.2,0.5-3.4c3.7,1.1,6.6,3.5,9.2,6.2c-0.7-2.6-2.3-5.1-1.9-7.8c1.3-0.7,2.8-1.2,4.2-1.8
+			C1022.7,81.9,1022,79.2,1021.1,76.7 M1075.4,78.4c-1,1-0.5,3.1,1,3.3C1078.5,81.5,1077.3,77.2,1075.4,78.4 M1085.1,81.3
+			c-0.2,1.3-0.3,2.6-0.3,3.9c2-0.1,2.4-2,3-3.6C1087.1,81.6,1085.8,81.4,1085.1,81.3 M1049.8,92.2c0.6,0.2,1.8,0.6,2.4,0.7
+			c0.4-2,0.7-4.2-1.2-5.6C1049.2,88.1,1050.3,90.7,1049.8,92.2 M963.4,112.3c0.4,1.2,1.9,2.6,0.2,3.6c-0.8-0.9-1.6-1.8-2.3-2.7
+			c-0.7,1.4-1.4,2.8-2.1,4.1c2.7,1.6,5.9,1,8.8,0.8c0.3-2.8,0-5.5-1.3-8C965.7,110.8,964.6,111.6,963.4,112.3z"/>
+		<path class="st6" d="M817.1,78c4.2,1.5,6.5,5.6,7,9.8c-0.6,0-2-0.1-2.6-0.1C820.7,84.2,817.8,81.6,817.1,78z"/>
+		<path class="st6" d="M1398.4,78.4c2.1,0,3.8,1.3,5.6,2.3c0.6,0.4,1.3,0.8,1.9,1.2c-0.4,0.4-1.3,1.1-1.8,1.5
+			c0.9,0.9,1.7,1.9,2.7,2.8c-0.8,0.4-1.6,0.8-2.4,1.2c-0.2,1.5-0.3,3-0.5,4.6c-0.5-0.2-1.6-0.7-2.1-0.9c0.3,2.1,0.7,4.2,1.1,6.3
+			c-2.4,0.1-4.7,0.1-7,0.2c1.9,1.7,4.3,2.5,6.6,3.4c1.1,2.6-2.4,3.2-4.2,3.8c0.1,0.3,0.2,0.9,0.2,1.2c-0.3,0.6-0.8,1.8-1.1,2.4
+			c-0.7,0.1-2.1,0.1-2.8,0.2c0.2-0.7,0.5-1.3,0.8-2l-0.3-0.2c0.3-0.6,1-1.7,1.3-2.2c-0.9-0.7-1.8-1.3-2.7-2c0.6-0.9,1.2-1.8,1.8-2.7
+			c-0.2-0.6-0.6-1.7-0.8-2.3c0.8-0.7,1.7-1.4,2.5-2c0.6-0.4,1.7-1.1,2.3-1.5c1-2.2,2-4.3,2.7-6.6c0.1-2-2.2-2.5-3.5-3.4
+			c-0.9,2.8-2,5.6-2.7,8.4c-0.7-1.9-1.3-3.8-1.9-5.7C1395,83.4,1395.4,79.9,1398.4,78.4z"/>
+		<path class="st6" d="M959.1,80.2c1.8,1.2,5,1.7,5.7,3.9c-0.9,3.5-4.8,2.9-7.5,2.1C957.8,84.1,958.4,82.1,959.1,80.2z"/>
+		<path class="st6" d="M618.3,81.5c1.9-0.8,2.7,3.3,0.7,3.6C617.4,84.8,617.3,82.5,618.3,81.5z"/>
+		<path class="st6" d="M722.9,82.5c4.1-0.1,8.2-0.5,12.3-1.2c-1.1,1.9-2.4,3.7-3.7,5.4c1.2,0.2,2.4,0.2,3.7,0.1c0.3,0,1-0.1,1.4-0.1
+			l-0.3,0.6c-1,0.3-2,0.7-3,1c0.1,1.8,0.2,3.7,0.2,5.5c6.5,0,9.8,6.3,14.6,9.6c0.3-0.7,1-2,1.3-2.6c0.8,2.5,1.7,5,2.5,7.5
+			c-4-2.2-7.6-4.8-11.3-7.4c0-0.4-0.1-1.1-0.2-1.5c-2.3-0.8-4.6-1.6-6.6-3.1c-1.9-1.5-3.7-3.1-5.5-4.6c0.1-0.5,0.4-1.5,0.5-2
+			C726.5,87.8,724.3,85.4,722.9,82.5z"/>
+		<path class="st6" d="M971.5,82.6c4.1-0.3,8.2-0.6,12.1-1.9c0.4,2.5,0.5,5,0.5,7.5c-0.5-0.1-1.5-0.2-2-0.2
+			c-0.7-1.7-1.9-3.5-4.1-2.9c-2.3-0.2-2.8,2-3.5,3.7c-0.8-0.5-1.7-1-2.6-1.5C971.7,85.6,971.5,84.1,971.5,82.6z"/>
+		<path class="st6" d="M812,88c-0.5-2,0-3.9,0.9-5.7c2.6,2.5,0.4,7.5,4,9c1.8,0.2,3.5-0.6,5.2-1c0.1,1.3,0.2,2.6,0.4,4
+			c-3.6-0.6-6.5,3-9.9,1.9C812.1,93.6,812.6,90.7,812,88z"/>
+		<path class="st6" d="M626.7,85.9c0.6-2.3,3.3-1.6,5.1-1.9c1,4.6,2.5,9.1,3.7,13.7c-0.5-0.2-1.6-0.6-2.2-0.8
+			c-1.7-3.5-2.5-7.3-3.7-11c-1.5,3.9-3,7.9-4.6,11.8c-3.5-0.1-7.1-0.1-10.6,0c1.6-0.9,3-2,4.7-2.5c1.5-0.1,2.1,1.7,3.2,2.4
+			C624.7,94.1,625.2,89.8,626.7,85.9z"/>
+		<path class="st6" d="M825.8,89c3.1-1.4,5.8-3.6,9-4.6c3.8,0.4,3.8,5.4,6.5,7.4c3.1,1.8,7,1.2,10.2,2.8c2.3,1.3,0.4,3.9,0.1,5.8
+			c-1.7-1.3-3.5-2.5-5.3-3.6c0,0.8-0.1,2.5-0.1,3.3c-0.6-1-1.2-1.9-1.8-2.9c-1,0.8-2,1.6-2.9,2.3c-1.3-0.7-2.6-1.4-3.8-2.1
+			c-0.6,1.1-1.2,2.1-1.8,3.2c1.8,1.6,4.2,2.8,5.2,5.1c0,1.2-0.3,2.3-0.5,3.5c0.3,0.7,0.6,1.3,0.9,2c-2.3-1.8-2.4,2.6,0,2.1
+			c0.8,0.6,1.8,2.7,3,1.4c1.6-1.1,3.1-2.4,4.6-3.6c0.6,1.6,1.2,3.3,1.8,4.9c0.8,0.1,2.4,0.3,3.2,0.4c-0.3,0.9-0.6,1.7-0.8,2.6
+			c-10.5-0.3-20.9,0.2-31.4-0.1c0.5-1.9,0.9-4,1.8-5.8c2.8-1.2,5.7-2.6,6.5-5.9c-2.9-2.1-7.4-3.3-8.1-7.2c1.1-3.2,4.8-4.2,7.8-4.9
+			c2.5-0.7,5.6,1.2,7.5-1c0.1-1.8-1.2-3.2-2.2-4.6c-3.1,2-6.7,2.6-10.2,1.4C825.3,90.4,825.6,89.5,825.8,89 M826.8,118
+			c2.8,0.3,5.7,0.4,8.5,0.5c1.4-2.2,0.5-4.6-1.1-6.4C832,114.3,828.1,114.8,826.8,118z"/>
+		<path class="st6" d="M803.8,88.7c1.6-0.5,3.4-0.4,5.1-0.4c-0.1,3.3-2.8,5.4-5.5,6.8C803.5,92.9,803,90.7,803.8,88.7z"/>
+		<path class="st6" d="M949,92.9c-2.5-0.1-2.4-4.7,0.1-4.9c1.7-0.9,2.9,0.8,4,1.7C951.9,90.9,950.8,92.5,949,92.9z"/>
+		<path class="st6" d="M742.9,92.8c0.9-1.2,1.4-3,3-3.5c2.4,0.7,4.6,1.9,6.8,2.9c-1.6,1.1-3.3,2.1-4.9,3
+			C746.2,94.4,744.5,93.6,742.9,92.8z"/>
+		<path class="st6" d="M919.5,92.6c0.5-0.9,1-1.8,1.5-2.7c-0.3,1.5,0.3,2.1,1.9,1.9c-0.8,0.7-1.6,1.4-2.3,2.1
+			c1.2,0.7,2.4,1.5,3.6,2.2c-2.3,0.4-4.6,1-6.8,1.7c0-1.2,0-2.4,0-3.6C918.1,93.7,918.8,93.2,919.5,92.6z"/>
+		<path class="st6" d="M723,92.7c2.5,1.6,5,3.3,7.4,5c-2.3-0.1-4.5-0.1-6.8-0.1C723.4,96,723.2,94.3,723,92.7z"/>
+		<path class="st6" d="M792.5,96.7c1.3-1.4,3.4-3.2,5.2-1.4c2.8,2.9,7.3,2.6,10,5.7c-2.9,4.1-8.5,1.3-12.2,4.5
+			C793.4,103,793.4,99.6,792.5,96.7z"/>
+		<path class="st6" d="M1406.2,96.1c-0.2-2.4,3.2-1.3,4.4-0.5c1.8,1.9,2,4.8,2.9,7.2c0.6,0.1,1.9,0.4,2.6,0.5c0,1.6,0,3.1-0.1,4.7
+			c-1,1.4-2.1,2.7-3.1,4.1c-1.9-1.2-3.4-3.3-5.8-3.3c-0.7,1.6-1.2,3.2-1.7,4.9c2.1,1.4,4,3,5.8,4.8c-2.8-0.3-5.6-0.7-8.3-1.2
+			c0.9-0.1,2.7-0.2,3.7-0.3c-1.2-1.3-2.5-2.6-3.7-3.9c-0.2-0.7-0.4-1.4-0.5-2c1.8-1.8,3.5-3.6,5.4-5.4c-0.8-1.5-2.1-2.9-1.6-4.7
+			c2.1,0.7,2.9,3.2,4.9,4.2c1.1-1.6,0.3-3.7,0.2-5.5C1409.4,98.9,1405.9,98.8,1406.2,96.1z"/>
+		<path class="st6" d="M755.6,96.6c4,0,8.8,1.4,10.5,5.3c1,1.9,2.9,3.1,4.6,4.3c4.1,2.4,5.9,7,9,10.4c-0.4,0.3-1.2,0.9-1.6,1.2
+			c3.5-0.3,6.9-0.1,10.3,0.9c-27.5,0.5-55,0-82.5,0.4c-4.4,0.1-8.9-0.1-13.3-0.3c12-1,24,0,36.1-0.5c-0.2-1.9-0.4-3.9-0.7-5.8
+			c2.5,0.6,4.8-0.4,6.6-2.3c-0.2,1.7-0.4,3.5-0.3,5.2c1.2,1.2,2.7,2.1,4.4,2.4c5.4,1,11,0.7,16.5,0.2c-2.8-2-6-3.7-7.6-6.8
+			c1.3,0.8,2.6,1.7,4.2,2.1c1.9,0,1.9-2,2.3-3.4c1.2-0.2,2.4-0.4,3.6-0.4c2.4,1,4.4,3.8,7.2,2.8c1.6-0.4,2.5-2.2,1.7-3.7
+			c-1.3-5.1-6.8-6.7-11.3-7.4C755.4,99.6,755.5,98.1,755.6,96.6 M760.8,117.8c2.8,0.2,6.6,1.7,8.7-0.8
+			C768.5,112.3,763.1,116.2,760.8,117.8z"/>
+		<path class="st6" d="M884.7,96.9c0.5-0.4,1.1-0.8,1.7-1.1c-0.2,2-0.4,4.1-0.6,6.1c1.4,0.2,2.8,0.4,4.2,0.6c-0.4,1.7,0.4,4-1.2,5.1
+			c-3.5,0.8-7-0.4-10.2-1.8C881.4,103.6,886.7,101.4,884.7,96.9z"/>
+		<path class="st6" d="M999.4,96.8c0.5,2,1.1,4,1.8,5.9c-1.2,0.8-2.5,1.7-3.7,2.6c-1.7-1.4-3.3-2.8-5-4.2c2-0.9,3.9-1.8,5.8-2.9
+			C998.6,97.8,999.2,97.1,999.4,96.8z"/>
+		<path class="st6" d="M684.9,102c-1.2-2,1-3.4,2-4.8c2.7,1.6,5.3,3.2,8,4.9c2.7,1.4,2.9,5.8,6.2,6.3c1.2,0.5,4.2,0.5,3.2,2.6
+			c-1.5,4.2-6.4,3.5-9.9,3.5c-1.8,1.7-3.6,4.2-6.5,3.8c-3-0.1-7.1,0.7-8.8-2.5c-0.8-1.5-3.8-4.1-1.1-5.1c3.3,0.3,6.5,1,9.9,1.1
+			C688,108.2,686.3,105.1,684.9,102z"/>
+		<path class="st6" d="M731.3,98.3c0.4,0.2,1.3,0.7,1.7,1c-0.9,2.7-1.4,5.5-1.5,8.4c-0.4,0.3-0.8,0.7-1.2,1c0-1.4-0.1-2.8-0.1-4.2
+			c-0.9,1.3-1.7,2.5-2.5,3.8c-0.4-1.5-0.9-3-1.4-4.5C729.2,103.3,730.6,100.9,731.3,98.3z"/>
+		<path class="st6" d="M603.3,99c2-0.8,2.8,2.6,0.8,2.9C602.2,102.5,601.5,99.5,603.3,99z"/>
+		<path class="st6" d="M1031,98.5c0.6,0.3,1.8,0.9,2.5,1.1c1.3,1.4-0.3,3.2-0.5,4.7C1030.8,103.1,1031.1,100.6,1031,98.5z"/>
+		<path class="st6" d="M336,106.9c2.5-2,4-4.8,5.9-7.4c0.1,3.2,0.1,6.5,0,9.7c-0.4-1.1-0.8-2.1-1.2-3.2
+			C339.1,106.3,337.5,106.6,336,106.9z"/>
+		<path class="st6" d="M925.9,104.2c2.4-2.2,5.7-2.2,8.8-1.9c0,0.5,0,1.6,0,2.1c-3,0.7-6,1.8-8.1,4.1c-1.4,1.8-3.7,0.3-5.5,0.2
+			c-2.3-0.9-4.2,0.7-6,1.9C915.3,105.3,921.1,101.8,925.9,104.2z"/>
+		<path class="st6" d="M1023.4,103.2c1.3,0.1,4-0.3,4,1.7C1027.1,108.1,1020.6,105.8,1023.4,103.2z"/>
+		<path class="st6" d="M1017.1,104.1c2.1,0,4.6,1,3.6,3.6c-0.7,0.2-2,0.5-2.7,0.7C1017.7,106.9,1017.4,105.5,1017.1,104.1z"/>
+		<path class="st6" d="M710,105.1c2.4-0.2,5.1-0.9,7.3,0.6c1.3,1.2,1,3.2-0.6,3.9C713.7,109.7,709.5,109,710,105.1z"/>
+		<path class="st6" d="M899.2,107.9c0.7-1.1,1-2.8,2.7-3c3,0.9,5.5,2.8,7.6,5.1c-1.2,1.2-2.3,2.3-3.5,3.5
+			C903.9,111.5,901.7,109.6,899.2,107.9z"/>
+		<path class="st6" d="M983.1,111.8c3.1-2.2,5.8-4.8,8.7-7.2c2,1.6,4,3.3,6.1,4.9c-1.7,2.3-3.4,4.6-5,6.9
+			C989.6,114.8,986.9,111.7,983.1,111.8z"/>
+		<path class="st6" d="M861.9,113.2c-0.6-3.9,2.7-6.4,6.1-7.4c2.5,2.7,3.3,6.4,5.1,9.5c-2.3-1.4-4.6-3-7.1-4.1
+			C864.6,111.6,863.2,112.4,861.9,113.2z"/>
+		<path class="st6" d="M800.4,109.5c2.1-0.4,4.2,0.5,6.2,1c0.4,1.2,0.8,2.4,1.2,3.6c-2.3,1.1-4.7,0.4-6.9-0.2c-0.8,1-1.6,2-2.4,3.1
+			c-2.3,0.1-3.5-1.2-3.4-3.5C796.8,112,798.3,110.3,800.4,109.5z"/>
+		<path class="st6" d="M1050.5,108.9c0.9,1.4,1.5,3.1,1.2,4.8c-1.1,1.3-3.1,0.7-4.6,1C1047.3,112.3,1048.4,110.2,1050.5,108.9z"/>
+		<path class="st6" d="M1072.9,113.1c-1.4-3.3,3.2-3,5.3-3.8c0.8,0.8,1.6,1.5,2.5,2.3C1078,111.8,1075.5,113.6,1072.9,113.1z"/>
+		<path class="st6" d="M932.6,114c-0.8-2.1,1.3-3.3,2.5-4.7c1.5,1.5,3.5,3.5,2.3,5.8C936.6,117.7,932.5,116.3,932.6,114z"/>
+		<path class="st6" d="M860.5,118.9c1.8-1.4,3.6-2.9,5.4-4.3c1.9,1.3,3.8,2.8,5.6,4.3C867.9,119,864.2,118.9,860.5,118.9z"/>
+		<path class="st6" d="M328.4,143.1c0.2,0.2,0.6,0.7,0.8,0.9c1.1,0.6,3.2,0.4,3.3,2.1c-0.1,1.7-0.6,3.4-0.9,5.1
+			c-3.1-0.5-4-3.7-5.2-6.1C327,144.4,327.7,143.8,328.4,143.1z"/>
+		<path class="st6" d="M334,161.4c2.9-1.3,2.6-4.9,3.9-7.3c1.4,0,2.7,0.1,4.1,0.2v1.3c-0.9,0.1-2.5,0.3-3.4,0.4
+			c0.3,2.5,0.7,5,1.2,7.5c-2.6,0.3-5.2,0.6-7.7,1c-1,1.6-1.7,3.8-3.9,3.8c0.4-1.8,0.7-3.7,1.1-5.5c-0.9-0.6-1.7-1.1-2.5-1.7
+			l-0.1-0.4c1.3-0.1,2.6-0.2,3.9-0.3c0-0.2,0-0.7,0-0.9C331.6,160.3,332.8,160.9,334,161.4z"/>
+		<path class="st6" d="M1410.6,176.8c0.8,1,1.7,2,2.6,3.1c0.7,0.1,2.1,0.4,2.8,0.5c0.1,3.1,0,6.3,0,9.4c-2-1.1-3.7-2.8-5-4.7
+			c-1.2,0.4-2.3,0.8-3.4,1.2c-0.1-2.7-0.1-5.4-0.1-8c1.1,0.2,2.2,0.3,3.3,0.5C1410.7,178.2,1410.7,177.2,1410.6,176.8z"/>
+		<path class="st6" d="M324.8,182.8c0.1-1.9,0.4-3.8,2-5c0.8,1.6,1.2,3.3,1.2,5C327.3,182.7,325.6,182.8,324.8,182.8z"/>
+		<path class="st6" d="M533.6,178.7c2.3-0.2,4.5-0.5,6.8-1.1c-2.2,2.9-3.8,7.6-8,7.6c0.5-2,0.9-4,1.2-6.1L533.6,178.7z"/>
+		<path class="st6" d="M1400.2,179.4c1,0.4,3.2-0.6,3.6,0.8c1,1.6-1,3.1-2.4,2.5C1400.8,181.6,1400.5,180.5,1400.2,179.4z"/>
+		<path class="st6" d="M865.4,179.8c5.2-0.5,10.4,0.2,15.6,0.7c-2.1,1.8-3.4,4.1-3.9,6.8c-1.2,1.4-2.4,2.7-3.5,4.1
+			c-3.4,0-6.7,0.1-10-0.3c2.7-0.7,5.5-1.2,8.1-2.4c2.9-1.6,4.5-4.6,6.2-7.3c-3.5-0.3-7-0.3-10.4-0.5
+			C866.9,180.6,865.9,180.1,865.4,179.8z"/>
+		<path class="st6" d="M1211.7,179.3c3.7,2.4,7.8,4.5,12.2,5c1.1-0.8,2.2-1.6,3.4-2.4c-1,2.2-2.4,4.1-4.1,5.8
+			c-1.9-0.9-3.8-1.7-5.8-2.6c-0.9,1.2-1.8,2.5-2.7,3.7c-1-0.2-2-0.5-3-0.7C1212,185.2,1211.8,182.2,1211.7,179.3z"/>
+		<path class="st6" d="M887.5,180.6c2,0,4,0,6,0.2c-2.3,0.9-4.6,1.9-6.6,3.3c-1,2,0,4.1,0.7,6c1.2-1.5,2.5-2.9,3.7-4.4
+			c4.5,0.1,8.9-1.3,12.8-3.6c-2.6,3.6-6.8,5-10.5,6.9c0.8,5.3,5.4,8.9,9.5,11.9c2,1.3,2.9,3.7,3,6c-1.9,1.9-4.6,2.5-7.2,2.8
+			c-4,0.5-7.4-1.9-10.7-3.7c1.5-2.2,3.1-4.3,4.7-6.4c-1.6-1.8-3.3-3.4-5.2-4.9c-0.9,1.7-1.8,3.5-2.6,5.3c-0.7-1.3-1.5-2.6-2.3-3.9
+			c1.2-1.8,2.4-3.6,3.6-5.3c-1.9-1.1-3.7-2.1-5.6-3.2C883.1,185.3,885.3,183,887.5,180.6 M890.3,194.6c1.5,2,4.3,3.5,4.1,6.4
+			c-0.7,1.8-3.5,4.1-1.2,5.8c2.9,3.2,7.5,1.8,10.7-0.1c0.1-4.9-5.1-6.5-7.7-9.9c-1.8-2.1-2.8-4.8-5.2-6.2
+			C889.3,191.2,888.9,193.4,890.3,194.6z"/>
+		<path class="st6" d="M1059.6,180.4c1.2-0.1,2.5-0.2,3.8-0.1c-0.2,1.3,1,3.6-0.8,4.2c-2.5,0.8-5.4,2.9-8.1,1.6
+			C1055.8,183.8,1057.7,182,1059.6,180.4z"/>
+		<path class="st6" d="M1246.8,180.9c2.8,0,5.7,0,8.5,0c-0.5,1.6-0.7,3.3-1.5,4.8c-1.8-0.1-3.6-0.5-5.4-0.8
+			c-1.6,2.6-0.7,5.3,0.8,7.6c2.9-0.9,6-0.8,9-1.3c4.4-1.4,3.6-8.8,8.7-8.7c3.6-0.6,6.8,1,9.5,3.3c-3.4-1-6.9-2.3-10.4-2.1
+			c-1.9,2-2.9,4.6-4.2,7c1,1.1,2,2.1,3,3.2c-3.5,3.1-6.2,7.3-6.4,12.1c-1.7-0.6-3.4-1.5-5.3-1.7c-3.1,0.2-5.9,1.6-8.7,2.8
+			c1.4,0.8,2.9,1.6,4.5,2.3c-1.5,0.5-3,1.1-4.5,1.3c-1.1-1.6-1.9-3.4-2.8-5.1c-1.5,1.5-2.3,3.4-2.7,5.4c-1.5-2.1-1.5-4.6-1.7-7
+			c0.1-1.3-3.1-2.5-2.5-0.1l-0.3,1.1c-1.1-2.6-2.5-5.1-4.1-7.4c4.2-5.3,11.1-6.9,16.1-11.2C1246.7,184.7,1246.7,182.8,1246.8,180.9
+			 M1237,194c0.8,1.8,1.4,4.2,3.9,4c3.4,0.8,4.6-3.1,6.2-5.2c-1.3-0.8-2.7-1.6-4-2.3C1241.2,191.9,1239.1,193,1237,194
+			 M1254.9,192.9c-1,1.7-0.1,3.2,1.7,3.6c2,0.9,3.3-1.7,3.3-3.4C1258.5,192.1,1256.5,192.7,1254.9,192.9 M1249.4,196.6
+			c-1.1,1.6-3,2.1-4.3,3.4c-0.4,1.3-0.6,2.7-0.9,4.1c4.3,0.3,8.5-1.1,12.8-1.2c0.6-3.1-2.1-6.3-4.4-8.4
+			C1251,194.1,1250.2,195.7,1249.4,196.6 M1234.8,199.3c1,2.5,3.7,3.5,6.2,3.9c1.7,0,3.5-1.8,2.2-3.4
+			C1240.7,198.4,1237.6,199.3,1234.8,199.3z"/>
+		<path class="st6" d="M992.6,183c1.1-0.7,2.3-1.2,3.7-1.5c0.3,1,0.3,1.9,0.2,2.9C995,185.2,992.6,185.2,992.6,183z"/>
+		<path class="st6" d="M1257.3,184.8c1.5-0.5,3.2-1.9,4.7-0.7c1.3,1.6-1.3,2.6-2.1,3.6C1259.1,186.8,1258.2,185.8,1257.3,184.8z"/>
+		<path class="st6" d="M1068.6,186.1c1.5,0.1,3.1,0.1,4.7,0.2c-0.4,2.1-0.7,4.2-1,6.2c1.8,0.1,3.7,0.2,5.5,0.1
+			c1.2-1.1,2-2.4,2.9-3.6c0.2,1.2,0.5,2.4,0.7,3.5c0.5,0.1,1.5,0.3,2,0.4c0.3,2.3,0.5,4.7,0.8,7c3.2-0.6,6.3-1.3,9.4-2.1
+			c-0.5-1.1-1.1-2.3-1.6-3.4c1,0.9,2.1,1.7,3.1,2.7c-0.1,2.1-2.9,2.2-4.4,3c-3.2,0.8-5.4,3.3-8,5.1c-3.4-3.1,2.1-8.9-2.9-11
+			c-1,1-1.9,2.1-2.8,3.1c-1.2,1.1-4.7,1.2-3.7,3.3c0.6,3.8,6.7,4.6,5.7,8.7c-2.6,0.3-3.8-2.1-5-3.9c0,0.9,0,1.8,0,2.7l-0.7,1.5
+			c-0.7-4.2-1.5-8.6-4.2-12c-4.2-6.6-13.1-5.4-19.9-6.4c5.2-0.9,10.3,0.6,15.5,1C1067.7,191.4,1068.6,188.6,1068.6,186.1z"/>
+		<path class="st6" d="M1407.1,186.9c1,0.9,3,1.4,2.9,3c-1,0.5-2,0.9-2.9,1.2C1407,189.8,1407,188.3,1407.1,186.9z"/>
+		<path class="st6" d="M913.9,188.6c2.8,1.6,4.8,4.2,7.2,6.4c4.5-0.9,8.3-3.7,12-6.2c3.4,1.4,6.3,3.7,9.4,5.6c-3.5,0-7,0-10.4,1
+			c-1.4-0.6-2.8-1.2-4.1-1.8c-2.5,1.1-4.9,2.2-7.3,3.4c1.9,0.8,3.9,1.5,5.6,2.7c0.4,1.2,0.6,2.5,0.8,3.8c-1.5,2.1-2.7,4.3-4.4,6.2
+			c-2.3,1-5.9-1.7-4-4.1c1.5-2.6,5-2.8,7.5-4c-1.1-0.8-1.9-2-3.3-2.2c-2.4,0.1-4.4,1.8-6.8,1.9c-2.2-0.1-4.2-1-6-2.2
+			c3.4,0.1,7.3-1.2,7.7-5.1c-0.9-1.5-2-2.8-3-4.2L913.9,188.6 M920.3,205.3c-2.1,1.6,1.1,4.8,2.6,2.5
+			C924.7,206.2,922,203.4,920.3,205.3z"/>
+		<path class="st6" d="M998.3,190.3c0.6,0,1.9,0.1,2.6,0.1c0.3,1.1,0.6,2.2,0.9,3.3c-1,0.8-2.3,0.9-3.4,1.2
+			C998.3,193.4,998.3,191.8,998.3,190.3z"/>
+		<path class="st6" d="M1395.4,193.3c0.9-0.8,1.8-1.6,2.7-2.5c1.5,2.4,3.1,4.8,4.8,7.1c0.9-0.7,1.8-1.4,2.7-2.1
+			c0.4,0.4,1.2,1.2,1.6,1.7c-1.3,0.9-2.5,1.8-3.7,2.7c2,1.4,4,2.8,6,4.2c-1.9,1.9-4.2,0.5-6.1-0.4c-0.4,2.7-0.8,5.5-1.2,8.2
+			c1-1.7,2-3.5,3-5.2c1.9,3.1,0.1,6.6-1.6,9.3c-0.1-0.8-0.2-2.4-0.3-3.1c-1.3,0.5-2.5,1.1-3.7,1.6c-1.3-3.5-5.2-2.6-7.7-4.4
+			c1.2-1.4,2.9-2.1,4.6-2.9c0-1,0-2,0-2.9c1.2-0.3,2.5-0.6,3.7-0.9c-2.6-1.3-4.8-3.2-6-5.9c1.2-0.5,2.4-1,3.6-1.4
+			C1396.9,195.2,1396.2,194.3,1395.4,193.3 M1397.2,205c0.4,1,0.9,2,1.3,2.9c-0.4,0.6-1.2,1.8-1.6,2.4c1.2,0.6,2.4,1.1,3.7,1.6
+			C1402,209.1,1401.4,204.2,1397.2,205z"/>
+		<path class="st6" d="M1017,203.9c0.2-2,0.5-4.1,0.6-6.1c0.2,2.6,0.5,5.2,0.7,7.8c-5.5,0.5-7.6,6.8-13.1,7.3c2.3,2,5.2,3.5,6.5,6.4
+			c0.2,3.9-1,7.7-1.1,11.6c-1.2,0.2-2.5,0.5-3.7,0.7c-0.1-0.9-0.3-2.7-0.5-3.6c0.5,0.1,1.4,0.4,1.9,0.6c0.4-2.8,1.4-5.5,2.1-8.3
+			c-0.7-3.4-4.2-5.2-7.4-5.7c-1-2.3-2.1-4.5-3.3-6.6c0.9-0.4,1.9-0.7,2.8-1.1c1.6,1.5,3.5,3.8,6,2.7
+			C1011.5,207.9,1014,205.5,1017,203.9z"/>
+		<path class="st6" d="M842.6,200.2c1.1,2.1,2.4,4.2,3.7,6.2c-0.6,0-1.8,0-2.3,0c-0.1,1.1-0.2,2.2-0.2,3.3c1,1.1,2.2,2.1,2.9,3.4
+			c0.6,1.8-1.4,2.5-2.4,3.5c-1.9-2.3-3.7-5.2-7.1-5.3c-0.9,1.3-1.8,2.6-2.8,3.9c-2.2,0.9-5.2,1.3-6.2,3.8c-0.9,1.4-0.6,3.2-0.6,4.8
+			c3.8-1,7.9-2.9,11.8-1.2c1.4,3.5-2.9,5.6-5.2,7.3c-2.9-0.8-6-2.1-9-1c-1.9,0.7-4.7,0.8-5.4,3c-0.2,2,0.4,4,0.8,6
+			c-1.7,3-3.4,6-4.2,9.3c0-1.6-0.1-3.2-0.5-4.8c-1-0.1-2-0.2-3-0.3c0-2.2,0.1-4.5,0.2-6.7c1.7,1.4,3.3,2.9,4.8,4.5
+			c1.8-2.8,0.4-6.1-0.2-9c-2,0.6-3.9,1.2-5.9,1.8c-0.2-2-0.4-4-0.6-6c0.8,1.4,1.6,2.9,2.4,4.3c2.1-1.3,4.5-2.6,5-5.3
+			c1.2-5.2,3.9-9.9,5.8-14.8c-1.2-1.9-3-3.3-3.9-5.4c-0.6-1.2,0.5-2.2,1.6-2.4c2.9-0.9,5.8-1.7,8.8-2.6c0.4,0.2,1.1,0.6,1.5,0.8
+			c-3.1,1.2-6.4,1.9-9.3,3.7c0.7,2.3,2.4,4.1,3.5,6.2c-0.7,5.7-6.8,9.8-5.8,15.9c1.3,0.8,2.9,0.2,4.4,0.2c0.4-3.2,0-6.8,2-9.4
+			c1.6-2.5,4.6-3.2,7.1-4.3c-2.2-2.4-4.9-4.7-5.2-8.2c2-0.1,4-0.2,6-0.2c-0.1-0.6-0.4-2-0.6-2.6c1.9,0.6,4,1.1,6,0.8
+			C841.3,202.4,841.9,201.3,842.6,200.2 M835.4,204.7c0.8,1.8,0.8,5.2,3.6,4.8c2.9,0.5,3.5-2.8,3.4-5
+			C840.1,204.6,837.7,204.6,835.4,204.7 M830.3,224.2c0,1.2,0,2.5-0.1,3.7c3.1-0.3,7-0.6,8.5-3.9C836.1,222.2,833,223.2,830.3,224.2
+			z"/>
+		<path class="st6" d="M339,205.4c1,0.3,2,0.5,3,0.8c0,2.4,0,4.8,0,7.2c-2.1-1.2-4-2.6-5.9-4.2C337.1,208,338.1,206.7,339,205.4z"/>
+		<path class="st6" d="M742.3,209.6c1.2-0.3,2.8-0.6,3.9,0.2c1.3,1.7,0,4.5-2.3,4.1C741.8,214.4,740.1,210.3,742.3,209.6z"/>
+		<path class="st6" d="M1101.7,209.5c3.3-0.4,6.7-0.3,10,0.1c-0.3,1.9-0.2,4.1-1.5,5.7c-2,2.4-4.9,3.8-7,6c-0.6,2.5-0.3,5.2-1.8,7.4
+			c-1.3-1.7-2.5-3.4-3.8-5.1c0.4,0,1.3-0.1,1.8-0.1c0.3-1,0.7-2,1-2.9c3.7-2.5,9.2-4.1,9.5-9.3c-2.2-0.5-4.5-0.9-6.7-1.2
+			c0.2,1.7,0.4,3.4,0.6,5.1c-3.7,0.3-7.7,0.2-10.8,2.6c-0.2-0.3-0.7-0.9-1-1.1c-0.6,1.5-1.2,3-1.9,4.5c-0.3-1.7-1.8-4.2,0.6-5.1
+			c3.2-1.2,6.7-1.4,10.1-2C1101.2,212.4,1101.5,210.9,1101.7,209.5z"/>
+		<path class="st6" d="M480,209.9l0.5,0.5c0.4,0.4,1.2,1.1,1.6,1.4c1.9,0.6,3.8,1.3,5.7,2c-2.1,3-5.9,2.2-8.7,3.9
+			c0.3-2.3,0.6-4.6,0.8-6.9L480,209.9z"/>
+		<path class="st6" d="M1406.9,214.1c0.5-1.5,0.6-4.8,3-3.1C1411.7,213.5,1409.3,214.9,1406.9,214.1z"/>
+		<path class="st6" d="M618.2,213.3c0.6,0,1.9,0,2.5,0c0,1.5,0,2.9-0.1,4.4c-0.6,0-1.9,0.1-2.5,0.1
+			C618.2,216.3,618.2,214.8,618.2,213.3z"/>
+		<path class="st6" d="M917.9,216.6c3.4-0.4,8.2,0.5,9.5-3.8c0,5.3,0.1,10.6-0.1,15.9c-1.9-1.7-3-4.1-4-6.4
+			c-1.1,0.2-2.3,0.4-3.4,0.6c0.4-0.9,0.7-1.9,1.1-2.8C920,218.9,918.9,217.8,917.9,216.6z"/>
+		<path class="st6" d="M1411.8,218c-0.2-2.2,2.8-2.2,4.2-3c0,1.5,0,3.1,0,4.6C1414.4,219.3,1412.2,220,1411.8,218z"/>
+		<path class="st6" d="M336.4,216.3c1.7-2,4,2,2.9,3.8C338,223.9,334,218,336.4,216.3z"/>
+		<path class="st6" d="M637.7,216.7c1.1-0.2,2.2-0.4,3.3-0.6c-0.2,1.4-0.3,2.8-0.6,4.2c-1,0.3-2,0.5-3.1,0.7
+			C637.3,219.6,637.4,218.1,637.7,216.7z"/>
+		<path class="st6" d="M1394.4,218.3c0.8,0.2,1.7,0.3,2.6,0.6c1.8,0.5,3.6,1.1,5.3,1.7c0.3,0.4,0.9,1.3,1.2,1.8
+			c0.7,0.2,2.1,0.7,2.8,0.9c-0.1,0.6-0.3,1.9-0.4,2.6c-1.6-0.5-3.2-1-4.9-1.6c-0.6,0.9-1.1,1.7-1.6,2.6c2,1.2,4,2.4,6.1,3.6
+			c-0.7-0.1-2-0.4-2.7-0.6c0,0.5-0.1,1.5-0.2,2c-0.6-0.7-1.3-1.4-1.9-2c-0.8,0.4-1.7,0.9-2.5,1.4c-1.2-3.9,1.2-7,3.3-9.9
+			c-3.7-0.8-6,2.2-8.4,4.5c0.8,1.3,1.6,2.5,2.3,3.9c-0.5,1.6-2.2,2-3.4,2.6c-0.2-1.4-0.4-2.9-0.7-4.3c-0.2,0.3-0.6,1-0.8,1.3
+			c0-2.6-0.1-5.2-0.1-7.8C1392.1,220.8,1393.5,219.8,1394.4,218.3z"/>
+		<path class="st6" d="M1408.2,219.4c1.9,0.2,3.8,3.4,3.5,5.4C1409,225.4,1404.5,221.3,1408.2,219.4z"/>
+		<path class="st6" d="M1084.7,229.3c-0.3-1.9-1.4-5.8,1.4-5.9c2.9-0.6,3.2,3.3,4.1,5.2c0.4,0,1.2,0,1.6-0.1c0,1.5,0,3,0,4.4
+			c-0.9-1-1.8-2-2.7-3C1087.7,229.8,1086.1,229.7,1084.7,229.3z"/>
+		<path class="st6" d="M332.6,228.9c1.4,2,2.6,4.5,5.3,4.7c1.4,0.2,4.2,2.3,2.3,3.6c-2.4-0.4-4.8-1-7.1-1.3
+			C332.8,233.5,332.6,231.2,332.6,228.9z"/>
+		<path class="st6" d="M655.4,229.5c3.1-0.8,6.9,2.1,5.5,5.5c-0.6,2.3-3.3,1.4-4.9,1.7c-2.9-0.3-5,2.2-7.8,2.2
+			c-0.2-1.1,0.1-2,0.9-2.7C651.1,233.9,653,231.5,655.4,229.5 M653,234.4c2,0.3,4.2,1.5,6.3,1c1.4-1.6,0-4.7-2.3-4.1
+			C654.9,230.8,654,232.9,653,234.4z"/>
+		<path class="st6" d="M1249.1,230c1.4-0.6,2.9-0.8,4.5-0.7c0.1,1.6,0.1,3.1,0.2,4.7C1251,234.6,1250,232.1,1249.1,230z"/>
+		<path class="st6" d="M843.7,241c2.1-4.1,4.4-8,7.4-11.4c-3.4,7.9-7.1,16-13.7,21.8c-0.8,2.7-1.7,5.3-2.9,7.8
+			c-1.7,0.5-3.3,1.1-5,1.6c0.3,2.2,0.6,4.4,0.9,6.5c-2.5,1.2-4.1,3.4-5.4,5.7c-1.5,0.6-3.1,1.2-4.5,1.9c0.4,1.1,0.9,2.2,1.5,3.3
+			c2-0.9,3.9-1.8,5.9-2.7c0.8,1.6,1.6,3.1,2.4,4.6c0.9-3.4,1.5-7.5,5.5-8.7c0.7-3.6,4.9-6.7,3.1-10.5c3.7-2.4,4.6-7.2,8.2-9.8
+			c2.4-1.5,2.7-4.5,3.5-7c0.3,0.8,0.9,2.4,1.2,3.2c-0.3,1.5-0.6,2.9-1,4.4c-1.8,0.7-4,0.9-5.1,2.7c-3.2,3.6-3.7,8.7-6.3,12.7
+			c-1.6,2.3-1.6,5.6,0.4,7.8c-3.2,3.6-5.9,7.6-9.6,10.7c-0.5-1.8-1-3.5-1.5-5.2c-1.3-0.7-2.6-1.3-3.8-2c-0.8,0.8-1.5,1.7-2.3,2.5
+			c0.4,1.1,0.8,2.3,1.2,3.5c-2.2,0.8-4.7,1.3-6.6,2.7c-1.4,2.2-1.6,5.4-4,6.8c-2.4,1.5-5,3-6.2,5.6c-10.2,4.3-21.6,5.8-32.6,4.7
+			c-0.1-4.2-0.6-8.4,0.2-12.5c0.2,2.3,0.4,4.7,0.6,7c2.2-1.6,5.1-3.8,7.3-1c-1.6,1.8-3.2,3.6-4.8,5.5c6.8,0.9,13.6-0.3,20.2-1.6
+			c0.8-1.4,1.6-2.8,2.4-4.2c1.1,1,2.3,2,3.5,3c1.3-1.6,2.3-3.4,3.6-5.1c1.5-1.3,3.3-2,4.8-3.2c1.9-2.1,2.9-5,5.1-6.9
+			c1.1-1.1,2.6-2,3.4-3.4c-0.1-2.5-1.1-5.1-0.7-7.6c3.9-2.6,8.2-5.9,8.9-10.8c-0.6-1-1.8-2.5-3.1-1.8c-2.9,1-3.4,4.2-4.7,6.6
+			c0.1-2.3,0-4.8,1.7-6.5c3.1-3.7,5.5-7.9,8.5-11.8c-1.2,3-2.1,6.1-3.1,9.2c2-0.3,4.6-0.2,5.8-2.3c1.6-2.8,2.4-6,4.6-8.4
+			c1.2-1.1,1-2.6,0.9-4c-1.1,0.2-2.2,0.4-3.3,0.7c1.6-2.5,2.3-5.4,2.3-8.3c-1.8,1-3.8,1.8-5.2,3.4c-1,1.6-1.3,3.6-1.9,5.3
+			c-2-0.1-4.1-0.3-6.1-0.1c-2.8,2.4-5.4,5-8,7.6c-1,2.5-1.2,5.2-1.6,7.9c1.5,2.8,1.4,5.9,0.5,8.8c-2,0.3-4,0.7-6,1
+			c0.5,1.9,1.6,3.5,2.9,4.9c1.1-1.3,2.2-2.5,3.4-3.7c-0.6,3-2.2,5.7-5.4,6.5c-0.9-2.7-2.2-5.2-3.8-7.5c0.1-0.2,0.3-0.7,0.4-0.9
+			c2.5-0.5,5-0.8,7.5-1.2c0.3-2.7-0.4-5.3-1.7-7.6c1.6-3.2,2.3-6.7,0.7-10.1c-0.8,0.7-1.7,1.4-2.5,2.1c0-0.7,0.1-2.2,0.1-2.9
+			c1.4-0.5,2.9-1.1,4.3-1.6c0.7,0.5,1.4,1.1,2.1,1.7c2.5-2.5,4.7-5.5,7.9-7.1c5-2.7,9.9-6,13-10.9c0.3-1.4,2.8-2.4,3.3-0.6
+			c1.7,2.8-1.6,4.6-3.3,6.2C839.9,239.8,841.5,240.8,843.7,241z"/>
+		<path class="st6" d="M1153.8,241.3c0.3-3-1.2-6.5,0.8-9.1c0.3,0.5,0.8,1.4,1,1.9c-0.1,2.5-0.5,5-0.2,7.5c1.7,2,4.2,3.1,6.3,4.7
+			c2,1,0.8,3.7-0.3,5c-1.7,1-3.7,0.4-5.6,0.4c-0.1-3.4-1.4-7.3-4.8-8.5c-2.3,0.2-4.2,1.7-6.2,2.7c-1.6-0.5-3.1-1-4.7-1.6
+			c-0.6,1.1-1.2,2.2-1.9,3.4c1,1.4,2,2.9,3,4.3c-0.9,2.4-2.3,4.9-1.8,7.5c0.2,2.8,2.8,4.5,4.6,6.3c-1.3-0.2-2.5-0.4-3.7-0.6
+			c-0.2,0.7-0.4,2.1-0.6,2.8c-1-1.1-1.9-2.2-2.8-3.3c-1.2,1-2.3,1.9-3.4,2.9c-0.2-0.3-0.8-0.9-1-1.2c2.1-2,5.9-3.1,5.8-6.6
+			c0.2-3,0.7-6.1,0.1-9.1c-1.4-1.3-3-2.4-4.5-3.5c2.3-1.6,4.5-3.2,6.6-5c1.2,0.8,2.5,1.5,3.7,2.2
+			C1147.1,243,1150.4,242,1153.8,241.3 M1156.1,245c0.5,2.1,0.1,5.5,2.9,5.9c1.3-0.4,2.6-1.4,2.5-2.9
+			C1160.4,246,1158.1,245.6,1156.1,245z"/>
+		<path class="st6" d="M76.5,234c1.7,0,3.4,0,5.1,0c-0.7,1.2-1,2.8-2.5,3.3C78.2,236.3,77.3,235.1,76.5,234z"/>
+		<path class="st6" d="M1240.6,234.6c1.3-0.4,2.8-1.3,4-0.2c2,2.5,3.8,5.3,5.3,8.1c-3-0.4-7.1,1.3-9.1-1.7c1.6-0.2,3.3-0.5,4.9-0.7
+			c-0.5-1.4-1-2.9-1.5-4.3C1243,235.4,1241.8,235,1240.6,234.6z"/>
+		<path class="st6" d="M1431.1,234l0.3,0c2.2,1,4.4,1.9,6.7,2.8c0.5,0.9,0.9,1.8,1.4,2.7c0.5,0.3,1.6,0.8,2.1,1.1
+			c0,2.2-0.1,4.4-0.1,6.7c-0.7-1.7-1.3-3.4-1.9-5.2c-1.6-1.2-3.2-2.4-4.9-3.6c-0.5,1.1-0.9,2.2-1.4,3.2c-0.7-0.4-1.4-0.8-2-1.1
+			C1431.3,238.4,1431.2,236.2,1431.1,234z"/>
+		<path class="st6" d="M1514.2,234c0.7,0,2,0,2.6,0c0.8,1.4,1.5,2.7,2.3,4.1c-1.1,0.4-2.2,0.9-3.3,1.3c-1.2,1.3-2.4,2.5-3.5,3.8
+			c-0.3,1.2-0.5,2.3-0.8,3.5c-1.8,0.4-3.5,0.9-5.3,0.9c-2-1.6-3.8-3.8-6.7-3.5c-0.4,1.9-0.7,3.8-1.1,5.8c-2.1-1.6-4.4-2.7-6.9-3.5
+			c-0.2-0.6-0.6-1.9-0.8-2.5c0.8,0.8,1.6,1.6,2.4,2.4c1.3-0.2,2.5-0.3,3.8-0.4c-0.2-0.4-0.7-1.1-0.9-1.5c1.2-1,2.4-2.1,3.6-3.1
+			c1,0.6,2,1.2,3,1.8c-0.6-1.5-1.1-3-1.7-4.4c2,2.1,4.1,4.1,6.2,6.2c0.4-0.3,1.2-0.8,1.5-1.1c-0.4,1.6,2,3.3,2.6,1.1
+			c0.1-1.5-0.5-2.1-2-1.8c1.1-1.4,2.4-2.7,3.7-4c-0.8-1.1-1.6-2.2-2.3-3.3C1511.7,235.2,1512.9,234.6,1514.2,234z"/>
+		<path class="st6" d="M1525.9,234c0.6,0,1.8,0,2.4,0c0.1,3.5-0.1,7.2-3.4,9.1c0.4,1.2,0.8,2.5,1.3,3.7c1-0.8,2.1-1.6,3.2-2.5
+			c1.5,1.8,3,3.6,4.4,5.4c-0.4,0.2-1.3,0.6-1.8,0.9c-2.4-2.8-5.9-2.8-9.2-1.8c-0.3,1.4-0.5,2.7-0.8,4.1c2.4,0.4,5.2-0.2,7.3,1.2
+			c0.1,0.8,0.4,2.3,0.5,3c-2.2-1-4.4-3.6-6.9-1.8c1,1.1,2,2.2,3.1,3.3c-3.1,0-4.3-3-6-4.9c-0.3-3.7,1.3-7.1,1.9-10.7
+			c0.6-0.7,1.3-1.4,1.9-2.1C1524.7,238.6,1525.2,236.3,1525.9,234 M1523.1,245.2c-1.4,1,0.2,3.6,1.7,2.5
+			C1526.1,246.7,1524.6,244.1,1523.1,245.2z"/>
+		<path class="st6" d="M1716.8,234c0.9,0,2.8,0,3.7,0c-0.8,1.8-1.8,3.6-2.9,5.2C1717.2,237.5,1717,235.8,1716.8,234z"/>
+		<path class="st6" d="M1689.2,235.2c1.2-0.4,2.2-0.2,3.2,0.5c0.2,2-0.7,2.8-2.5,2.6C1689.2,237.4,1688.9,236.4,1689.2,235.2z"/>
+		<path class="st6" d="M1409.5,237.1c0.9-1.2,3.4,0,2.4,1.4C1410.9,239.7,1408.4,238.5,1409.5,237.1z"/>
+		<path class="st6" d="M1530.2,237.5c1.4-1.1,3.4,1.1,2.3,2.4C1531.1,241.2,1528.7,238.8,1530.2,237.5z"/>
+		<path class="st6" d="M0,240c3.4-1.2,6.9-1.8,10.5-1.7c0.8,1.8,1.6,3.6,2.4,5.5c-0.5-0.2-1.5-0.5-2-0.6c-1.4-1.7-2.3-4.5-4.9-4.6
+			c-2.8,0.7-1.9,4.4-2.7,6.6c-1.1-0.7-2.2-1.5-3.2-2.2V240z"/>
+		<path class="st6" d="M1112.5,239.2c1.4,0,2.9,0,4.4,0.1c1.5,1,2.7,2.4,4.2,3.5c3.2,0.1,6.6-3.1,9.4-1c-0.3,2.8-1.2,5.5-2,8.2
+			c-1.5-2-0.5-4.4,0-6.5c-5-1.4-8,2.9-9.9,6.8c-0.9-1.1-1.8-2.2-2.8-3.3c0.9-1.3,3.5-2.4,2.4-4.3c-0.9-2.6-5.1-2.3-5.8,0.2
+			c-0.2-0.2-0.5-0.7-0.7-0.9C1112,241.3,1112.3,239.9,1112.5,239.2z"/>
+		<path class="st6" d="M1676.3,239.1c1.2,0.2,3.2-0.2,2.8,1.7c-1.2,1.4-2.6,2.7-3.9,4.1C1673.8,243,1675.9,240.9,1676.3,239.1z"/>
+		<path class="st6" d="M336.5,240.2c1.4-1.1,2.7,1.4,1.4,2.3C336.5,243.5,335.3,241.1,336.5,240.2z"/>
+		<path class="st6" d="M1418.4,240.2c0.4,0.1,1.3,0.4,1.7,0.6c0.6,1.1,1.3,2.3,1.9,3.4c2.2-0.6,4.3-1.1,6.5-1.7
+			c0.1,1.2,0.2,2.4,0.4,3.5c1.7-0.3,3.4-0.6,5.1-1c0.3,0.3,0.9,1,1.2,1.4c-0.6,0.2-1.8,0.5-2.5,0.7c-0.5,2,1.1,3.4,2.2,4.8
+			c-0.3,0-0.8,0-1.1,0c-2.7-1.7-5-4-7.2-6.2c-1.3,0.7-2.5,1.4-3.8,2.1c0,1.7,1.3,3.7-0.2,5.1c-2.2-1-4.3-2.3-6.4-3.4
+			c0-0.7-0.1-1.4-0.1-2.1C1419.9,246.9,1418.1,242.6,1418.4,240.2z"/>
+		<path class="st6" d="M50.8,250.2c-0.3-2.8-0.7-6.6,1.9-8.5c-0.2,1.8-0.5,3.5-0.9,5.2c1.6,0.4,3.2,0.9,4.8,1.3
+			c-0.4,0.8-0.8,1.6-1.2,2.4C53.9,250.7,52.2,250.9,50.8,250.2z"/>
+		<path class="st6" d="M1412,246.1c0.2-1.8,1-3.6,2.9-4C1417.3,244.1,1413.8,245.7,1412,246.1z"/>
+		<path class="st6" d="M654.3,243.3c1.2-0.2,2.5-0.3,3.8-0.3c-0.4,1.5-0.1,3.8-2.1,4C653.8,247.6,653.2,244.7,654.3,243.3z"/>
+		<path class="st6" d="M1726.3,244.4c2-0.4,2.8,3.3,0.8,4C1725.1,248.6,1724.7,244.8,1726.3,244.4z"/>
+		<path class="st6" d="M890.3,246.1c1.8-0.1,5-0.5,5.4,2c-0.6,2.7-3.6,1.2-5.4,0.9C890.3,248.2,890.3,246.8,890.3,246.1z"/>
+		<path class="st6" d="M1443.2,251.4c2-1.4,3.9-3.1,5.7-4.7c2.3,0.3,1.5,3.2,1.8,4.8c-0.7,0.1-2.1,0.3-2.9,0.4c-0.9,1-1.8,2-2.7,3
+			C1444.6,253.7,1443.9,252.5,1443.2,251.4z"/>
+		<path class="st6" d="M324.3,249.3c1.4-0.9,4.2-1.3,4.7,0.8C329.7,253.7,320.5,251.6,324.3,249.3z"/>
+		<path class="st6" d="M456.8,249.9l0.4,0.9c-0.3,4-1.8,7.7-2.8,11.6c-0.6,2.2,0.9,4.3,1.1,6.5c-0.8,2.1-1.9,4.2-2.8,6.3
+			c3.7-3.8,9.5-7,9.6-13c-2,0.6-4,1.2-5.9,1.8c0.1-1.9-0.4-4.1,0.6-5.9c1.9-1.3,4.3-2.1,5.9-4c2.4,4,4.4,8.5,8.4,11.3
+			c-2.5,2.9-3.9,6.5-5.7,9.9c-0.4,0.2-1.2,0.7-1.6,0.9c1-2.8,2.2-5.6,3.5-8.3c-0.9-1.3-1.9-2.6-2.8-3.9c-3.8,5-7.2,10.7-12.9,13.7
+			C452.2,268.1,453.8,258.8,456.8,249.9z"/>
+		<path class="st6" d="M1149.3,250.3c2.5-1.9,3.7,1.6,2.5,3.5C1149.8,254.4,1148.1,252,1149.3,250.3z"/>
+		<path class="st6" d="M302.2,251.2c1.6-0.6,2.2,0,1.7,1.6C302.3,253.4,301.7,252.9,302.2,251.2z"/>
+		<path class="st6" d="M62.4,260c-1-2.7-3.3-7.5,1.2-7.9C64.3,254.8,65.7,258.3,62.4,260z"/>
+		<path class="st6" d="M1402.2,254.5c1.9-0.5,3.8-1.2,5.5-2.2c0.5,2.3,1,4.7,1.7,7c-1.3-0.2-2.5-0.4-3.8-0.6c-0.4-0.5-1.3-1.5-1.8-2
+			c-0.2,1.1-0.4,2.2-0.6,3.2c-1.8,0.9-3.5,2-5,3.4c-2.6,0-5.1,0-7.7,0c0-0.5-0.1-1.6-0.1-2.2c3-0.2,6.6,0,8.5-3
+			c1,0.2,2.1,0.4,3.2,0.6C1402.1,257.3,1402.2,255.9,1402.2,254.5z"/>
+		<path class="st6" d="M1515,253.1l0.4-0.2c0.2,1.4,0.5,2.9,0.8,4.3c1.1-0.3,2.2-0.6,3.4-1c-0.2,0.5-0.5,1.6-0.6,2.2
+			c-0.7,0.7-1.3,1.5-1.9,2.2c1,0.5,2,1,3,1.4c-1.5,0.5-2.9,1-4.3,1.4c-4.6,0.6-9.2,0.5-13.8-0.2c1.7-1.8,4-0.5,5.9-0.2
+			c2.3-1.1,4.6-2.2,6.5-4c-0.9-0.9-2-1.4-3.3-1.6c1.2-0.4,2.3-0.8,3.6-1.2C1514.7,255.2,1514.8,254.2,1515,253.1z"/>
+		<path class="st6" d="M1591.4,255.6c2.2-1.1,3.3,0.7,3.1,2.8C1592.6,260.2,1592.3,256.7,1591.4,255.6z"/>
+		<path class="st6" d="M95.3,256.2c1.5-1.3,2.9,1.5,1.5,2.4C95.2,259.8,93.8,257.1,95.3,256.2z"/>
+		<path class="st6" d="M743.7,262.6c3.2-2.3,6.1-5,9.7-6.7c-1.9,2.4-5,4-5.8,7.1c0.9,2.8,4.4,1.2,6.6,1.4c-1.1,1.4-2.1,3-3.6,4.1
+			c-2.6,0.8-4.9-1.1-7.2-1.9c-0.6,1.1-1.5,2.1-1.6,3.3c0.8,1.8,2.1,3.4,3.9,4.4c1.7,0.5,3.5,0.1,5.3,0.2c-0.3,2.1-0.6,4.9-3.3,5.2
+			c-3.3,0-6.1-2.2-9-3.7c-0.1-2-0.2-4-0.2-6c-5.2,0.3-7.8,5.4-10,9.4c-1,1.4,0.3,2.6,1,3.7c1.8-1.2,3.5-4.1,6-2.6
+			c0.7,2.5-1.5,4.3-2.8,6.1c-3.8,4-7.7,8-11.9,11.6c2.9-5.2,8.2-8.4,11.2-13.5c-1.5-0.1-3.1-1-4.6-0.4c-1.9,1.5-3,3.9-5,5.1
+			c-1.6,0.8-2.8-0.8-3.8-1.8c1.5-0.1,3.1,0,4.6-0.3c0.7-1.2,1.2-2.4,1.8-3.6c-1.8-0.2-3.6-0.4-5.3-0.6c1.5-0.9,3-1.7,4.5-2.6
+			c4.2-2.3,6.4-6.8,9.1-10.6c-1.5-0.1-3-0.2-4.5-0.3c1.8-1.3,3.6-2.4,5.3-3.7c-0.4,1.2-0.8,2.5-1.1,3.7c2.1-0.3,4.2-0.6,6.4-1
+			c-0.4-2-0.6-4.1-0.4-6.1C740.5,262.5,742.1,262.8,743.7,262.6z"/>
+		<path class="st6" d="M1153.7,259.1c4.7-1,9.4-1.5,14.2-2.2c2.5,1.4,5.1,2.6,8,3.2c0.1-0.5,0.3-1.5,0.4-2c1.8,1.7,3.5,3.6,5,5.6
+			c-1.1,0.8-2.1,1.6-3.1,2.4c-1.4-0.7-2.8-1.4-4.2-2c-1.5,0.9-1.5,3-2.3,4.5c-0.3,0.2-0.9,0.6-1.2,0.8c0.2-1.5,0.5-3,0.8-4.6
+			c-1.9,0.4-3.9,0.4-5.5,1.4c-0.1,1-0.1,2-0.1,3c-0.2-0.2-0.7-0.5-0.9-0.7c-0.4-1.6-0.7-3.3-1.2-4.9c-1.3-0.6-2.7-0.9-4-1.3
+			c0.2,1.6,0.5,3.1,0.6,4.7c-2.4,1.1-5.1,0.7-7.6,0.8c0.1-1.1,0.3-2.1,0.4-3.2c-2.2-0.6-4.8-1.2-4.9-4c0.5-0.2,1.6-0.5,2.1-0.6
+			c-0.2,0.6-0.6,1.7-0.8,2.3c3.1,0.7,6-0.2,8.8-1.6C1156.6,260.2,1155.1,259.6,1153.7,259.1z"/>
+		<path class="st6" d="M63.9,261.6c2.4-1.6,5.8-5,8.3-1.7c-1.2,1.2-2.2,2.9-4,3.2C66.5,263.6,65.2,262.3,63.9,261.6z"/>
+		<path class="st6" d="M1703.4,260.4c2.2,0.4,4.5,0.7,6.7,1c0.2,0.9,0.3,1.8,0.5,2.8c-1.6,0.4-3.2,0.3-4.7,0.3
+			c-0.6,2.2-1,4.5-1.2,6.8c0.6-0.6,1.3-1.2,2-1.8c-0.8,4.1,0.9,8.1,2.2,11.9c-1.2-0.2-2.3-0.5-3.3-0.8c-1.2-3.3-1.8-6.7-2.7-10.1
+			c-0.1-2.1,0-4.2,0.3-6.2c0.4,0,1.2,0.1,1.5,0.2C1704.2,263,1703.8,261.7,1703.4,260.4z"/>
+		<path class="st6" d="M29.3,325.9c0.4-20.7-0.4-41.5,0.4-62.2c0.4,40.5,0,81.1,0.2,121.7c-0.7,0.1-2.2,0.4-3,0.5
+			c1,0.3,2,0.5,2.9,0.8c0,3.7,0,7.4,0,11.2c-2.2,2.5-4.6,5-5.8,8.2c0.2,2,2.5,1.9,3.9,2.5c-0.1,0.4-0.4,1.2-0.5,1.6
+			c-2.1-1.1-4-2.4-5.7-4c1.5-2,3.3-3.9,4.1-6.2c-1-2.7-2.4-5.2-2.4-8.2c-1.2-0.3-2.4-0.7-3.5-1c-0.1,0.8-0.2,2.2-0.2,3
+			c-1-0.3-1.9-0.6-2.9-0.9c0.8-0.6,1.5-1.2,2.2-1.9c0-1.6-1.1-3.4,0.2-4.7c2.1-3.2,6.4-1.2,9.4-2.7c0.9-1.2,0.5-2.9,0.7-4.3
+			c-1-0.9-2.1-1.7-3.1-2.6c2.2-1.9,3.6-4.2,2.9-7.2c-2.8,0.7-4.3,3-5.6,5.4c-0.3-1.2-0.7-2.4-1-3.6c2.3-1.6,4.6-3.2,6.8-4.9
+			c-1.9-4.8,0.5-9.8-0.2-14.8c-1.7,0.3-3.4,0.6-5.1,1c0.4-1.4,0.7-2.7,1.1-4.1c1.4-0.2,2.8-0.4,4.1-0.6c-0.1-2.7,0.2-5.6-1.5-7.8
+			c-2.1-0.6-4.2-0.6-6.4-0.7c-0.4-0.8-0.9-1.6-1.3-2.4c3,0.2,5.9,0.5,8.9,0.9c-0.1-2.3-0.2-4.6-0.2-7c-0.7-1-1.3-2-2-3
+			C27.7,327.3,28.5,326.6,29.3,325.9 M24.9,387.1c-1.2,4,1.8,7.3,4.1,10.2c0.5-3.1,0.5-6.2,0.3-9.3
+			C27.8,387.7,26.4,387.4,24.9,387.1z"/>
+		<path class="st6" d="M1145.7,275c0.2-5.2,6.8-6.5,10.6-4c-1.7,0.1-3.3,0.2-5,0.2c0.5,1.1,0.9,2.3,1.4,3.4
+			c-0.9,1.7-2.1,3.2-2.4,5.1c1.2,2.1,2.9,3.7,4.5,5.5c-1.6,0.5-3.3,0.9-4.9,1.4c-1.4-1.7-2.7-3.4-4.2-5c2.6-1.9,4.2-4.6,5.4-7.6
+			C1149.4,274.5,1147.5,274.8,1145.7,275z"/>
+		<path class="st6" d="M0,271.9c0.8,0,2.2,0.1,3,0.2c0.3,0.9,0.7,1.8,1,2.6c-1.3,0.2-2.6,0.5-4,0.7V271.9z"/>
+		<path class="st6" d="M1237.6,272.8c1.5-0.1,3-0.1,4.5-0.2c0.7,1.6,1.3,3.2,2.3,4.6c2.9,0.4,5.9,0.2,8.8,0.3
+			c0.4,1.1,0.8,2.1,1.1,3.2c0.5-0.2,1.5-0.5,2-0.6c0,3,0,5.9-0.1,8.9c-5.3-1-10.4,0.9-15.4,2.1c3.7,2.3,8.2,0.7,12.1,1.9
+			c-2.8,0.2-5.8,0.5-7.9,2.6c-1.5,1-2.6,2.2-3,4c2.1-0.2,7.1,0.9,6.5-2.7c1.6,0.5,3,1.3,3.9,2.7c-3.3,0.8-6.7,1.4-10,2
+			c0.2,5.2,1.4,10.6-0.4,15.6c-1.5-0.3-3-0.7-4.4-1c-0.1-8.4-1-16.7-0.9-25c1.1,0.4,2.2,0.7,3.3,1.1c-0.2-3-0.1-6.1-0.4-9.1
+			c-0.9-1.1-2-1.9-2.9-2.8c0-0.5,0-1.4,0-1.9c3.3,1.4,4.6,4.7,6.5,7.4c1.2-0.4,2.4-0.9,3.7-1.4c-0.4-1-0.7-1.9-1-2.9
+			c0.7-0.9,1.3-1.8,2.1-2.7c-1.6-0.2-3.2-0.5-4.8-0.7c-0.4-1-0.8-1.9-1.1-2.9C1240.3,274.6,1238.8,274,1237.6,272.8 M1247.3,282.5
+			c1.8,2.8,4.8,4.1,7.7,5.3c0-1.4,0-2.9,0-4.3c-1.9-0.9-3.8-1.9-5.5-3.1C1248.8,281.1,1248.1,281.8,1247.3,282.5z"/>
+		<path class="st6" d="M897.1,276.1c1.5-0.7,4-0.1,3.6,1.9c0.1,1.8-2.5,1.4-3.7,1.9C896.8,278.7,896.8,277.4,897.1,276.1z"/>
+		<path class="st6" d="M975.3,278.9c2.2,1.5,2,3.9,1.5,6.3C974.8,283.6,974.6,281.2,975.3,278.9z"/>
+		<path class="st6" d="M668.3,280.9c0.7,0,2,0.1,2.7,0.1c2.3,0.3,1.6,3,1.8,4.7c-1.4,0-2.8,0-4.2,0
+			C668.4,284.1,668.3,282.5,668.3,280.9z"/>
+		<path class="st6" d="M481.1,288c0.4-1.2-0.9-3.9,0.9-4.1c2.4-1.2,2.6,1.5,2,3.1C483,287.4,482.1,287.7,481.1,288z"/>
+		<path class="st6" d="M1729.2,291.2c2.2-2.2,3.6,6.7-0.1,4.7C1728.9,294.4,1727.9,292.4,1729.2,291.2z"/>
+		<path class="st6" d="M1156.1,291.5c2.4,0.9,5.3,1.8,5.8,4.7c-1,0-2.9,0-3.8,0c-0.7-0.8-1.3-1.5-2-2.3
+			C1156.1,293.4,1156.1,292.1,1156.1,291.5z"/>
+		<path class="st6" d="M1202.5,298.1c1-1.9,2-3.8,3-5.6c2.2,2.5,4.3,5,6.4,7.6c-1.5,0.1-2.9,0.2-4.3,0.4c-2.1,2.4-4.6,4.3-7.1,6.2
+			c-2.2,1.6-2.6,4.5-4.1,6.6c-1.8,0.7-3.7,1.1-5.4,1.8c-0.8,1-0.7,2.4-1.1,3.6c0.6,0.3,1.7,1,2.3,1.4c1.4-1.4,2.9-2.9,4.4-4.2
+			c-0.3,1.4,0.1,3.4-1.5,4.2c-1.9,0.7-4,0.7-6,1c-0.5,1.2-0.9,2.5-1.3,3.7c2.8,3.1,3.8,7.4,6.2,10.9c-0.4,0.1-1.2,0.3-1.6,0.4
+			c-3.1-3.5-6-7.1-9.1-10.7c1.2-1.2,3.3-2,3.5-3.9c-2.1-1.8-4.5-0.4-6.6,0.4c-0.5-0.5-1.4-1.6-1.9-2.1c3.4-0.3,6.9-0.2,10.3,0
+			c0.3-2,0.6-4.1,0.9-6.1c2-0.3,4.1-0.6,6.1-0.9c0.7-2.2,1.5-4.4,2.2-6.6c2.4-1.2,4.7-2.5,6.9-3.9
+			C1203.9,300.8,1203.2,299.4,1202.5,298.1z"/>
+		<path class="st6" d="M487.3,295.4c1.1-0.4,2.2-0.9,3.4-1.3c1,3,1.5,6.2,0,9.1C489,300.9,488.3,298,487.3,295.4z"/>
+		<path class="st6" d="M1174.2,302.6c2.5-1.9,4-4.6,5.7-7.1c-0.3,1.5-0.5,3.1-0.7,4.6c1.8-0.1,3.8,0.2,5.5-0.6
+			c1.8-0.5,0.6-2.5,0.7-3.8c0.6,0.2,1.8,0.5,2.5,0.7c-0.1,1-0.2,2-0.3,3c-2,1.1-4.3,1.5-6.2,2.8c-0.7,1.3-0.7,2.8-0.9,4.2
+			C1177.8,306.2,1176.1,304.1,1174.2,302.6z"/>
+		<path class="st6" d="M11.3,298.4c1.9-0.5,2.8,1.6,4,2.6c-1.5,1.5-3.3,2.5-5.3,3C10.3,302.1,9.7,299.7,11.3,298.4z"/>
+		<path class="st6" d="M1089,305.5c0.8-0.9,1.6-1.8,2.4-2.6c-0.8,2.4-2.5,5-1.4,7.6l-0.2,0.2c-2.4-0.5-5-1.2-6.7-3.1
+			C1083.3,304.3,1086.7,304.1,1089,305.5z"/>
+		<path class="st6" d="M1704.2,306.3c1.5-1.2,2.9,1.5,1.5,2.4C1704.1,310,1702.7,307.2,1704.2,306.3z"/>
+		<path class="st6" d="M1.2,309.3c1.6-1.1,3.7-0.9,5.3,0.2c1.4,2.9,3,5.9,3.4,9.2c-0.5,0-1.6-0.1-2.1-0.1
+			C6.5,314.9,3.8,312,1.2,309.3z"/>
+		<path class="st6" d="M1204.5,311c-0.1-3.7,5.3-4.1,7.7-2.5c2.9,1.5,6,5.8,9.5,3.1c1.6,1.9,3.2,3.8,4.6,5.9c-0.9,0-1.7,0.1-2.6,0.1
+			c-1.9-4.5-7.4-3.9-10.8-6.8c-2-1.8-5.3-2.2-6.8,0.4c0,2.7,1,5.2,1.8,7.8c1.3-0.9,2.6-1.8,4-2.6c2.1,0.9,4.3,1.8,6.4,2.6
+			c0.5,2.6,2.7,6.3-0.2,8.2c-1.3,0.9-3,1.9-4.5,1c-3.2-1.5-6.6-2.4-9.9-3.6c-0.2-0.3-0.6-1-0.8-1.3c1.4-0.1,2.9-0.2,4.4-0.2
+			C1206.8,318.9,1205.1,315.1,1204.5,311 M1209.8,321.9c1,1.7,2.3,3.1,3.5,4.6c1.1,0,2.3,0.1,3.5,0.1c2-3.1,0.3-7.5-3.5-8
+			C1211.1,317.5,1209.4,319.9,1209.8,321.9z"/>
+		<path class="st6" d="M663.1,318.4c1.8-3.4,5.1-5.6,9-5.1c-0.6,2-1.9,3.7-3.4,5.2c-0.7,0.7-1.4,1.4-2.1,2.1c-0.5,0-1.6,0.1-2.2,0.1
+			C663.9,319.9,663.5,319.1,663.1,318.4z"/>
+		<path class="st6" d="M1709.5,320.2c1.9-1,3.9-1.9,5.9-2.8c0.2,1.4,0.2,2.8,0.2,4.2C1713.5,321.4,1711.4,321,1709.5,320.2z"/>
+		<path class="st6" d="M631.4,323.7c2.5-0.8,5-1.3,7.6-0.9c-0.7,2-1.2,4.1-2.5,5.8c-1.5,1.1-3.6,0.9-5.3,1.5
+			c0.2,2.4,1.5,4.5,3.8,5.4c2.3-1.5,3-4.7,4.8-6.9c0.9,1.2,1.7,2.4,2.6,3.7c-1,1.7-1.9,3.5-2.8,5.3c-1.2-0.2-2.3-0.5-3.5-0.8
+			c-0.4,2.8-1.3,5.6-4.5,6c1.1-1.2,2.3-2.5,3-4c0.2-1.9-1.8-2.8-3-3.9c-1.9,2.8-4,5.5-7,7.2c0.8-2.1,1.5-4.2,2.2-6.3
+			C628.5,331.9,630.5,328,631.4,323.7z"/>
+		<path class="st6" d="M1195.2,323.2c1.2,0.2,2.7,0,3.9,0.7c1.8,2.5,1.9,5.9,0.7,8.7c-0.5,0-1.5,0-2,0
+			C1196.4,329.6,1195.3,326.5,1195.2,323.2z"/>
+		<path class="st6" d="M1249,322.5c2.1,0.2,4.2,0.5,6.2,1.4c-0.1,0.5-0.3,1.4-0.4,1.9c-1-0.7-2.1-1.5-3.1-2.2
+			c-1.4,1-3.1,1.7-3.8,3.4c-1.8,3.8-3.8,7.5-6.2,10.9c2.4,2,3,5,3.6,7.9c1.3,2.2,4.2,1.8,6.4,2c0,0.5-0.1,1.6-0.1,2.1
+			c-1.3-0.4-2.6-0.8-3.8-1.2c-1.1,1.2-2.2,2.3-3.3,3.5c-0.9-0.7-1.7-1.4-2.6-2c1.1-0.3,2.3-0.6,3.4-0.9c-1.6-3.1-1.6-7.1-4.7-9.2
+			c-0.2,1.4-0.4,2.8-0.6,4.1c-0.8,0.9-1.6,1.8-2.4,2.7c-1.1-0.8-2.3-1.7-3.4-2.5c-0.7,1.2-1.3,2.4-1.9,3.6c-1.8-0.2-3.8,0-5.5-0.8
+			c-1.5-1.8-2.1-4.1-3-6.2c4.2-0.6,8.4-0.6,12.7-1.1c-1.6-1.6-3.4-3-4.7-4.8c0.2-2.4,1.7-4.2,3.7-5.4c0.4,0.4,1.2,1.1,1.6,1.4
+			c-0.7,0.2-2,0.5-2.7,0.7c-0.4,1.2-0.7,2.4-1.1,3.6c0.8,0.6,1.8,1.2,2.6,1.7c0.8-1.1,1.7-2.1,2.6-3.2c1.1,0.7,2.3,1.3,3.4,2
+			c0.5-2.1,0.6-4.2-1.3-5.7c-1.9-1.4,0.2-2.8,1.6-3.4c0.6,1.4,1.1,2.9,1.7,4.3C1245.6,328.1,1247.3,325.3,1249,322.5 M1227.3,341.3
+			c-0.1,1.5-0.1,2.9-0.2,4.4c1.2,0.4,2.5,0.7,3.8,1.1c1-1.4,2-2.9,3-4.3C1232,341,1229.6,341.2,1227.3,341.3 M1236.3,342.2
+			c-1.2,1.5,1.5,2.9,2.5,1.6C1239.9,342.3,1237.2,340.8,1236.3,342.2z"/>
+		<path class="st6" d="M648.6,330.4c2-3,5.6-4.3,8.6-6.2c0.6,0.1,1.9,0.3,2.5,0.4c-0.6,1.5-1.3,3-2,4.5c-2.2,5.2-8.2,6.5-11.1,11.1
+			c-1.4-0.5-2.8-1-4.1-1.6C644.7,336,646.7,333.2,648.6,330.4 M651.7,328.7c-1.2,1.4-1.7,3.3-2.5,5c1.3-0.1,2.7,0.1,3.9-0.4
+			c1.5-1.2,2-3.2,2.8-4.9C654.6,328.4,653.1,328.3,651.7,328.7z"/>
+		<path class="st6" d="M5.1,336.6c-0.4-3.3,1.8-8.4,5.8-7.4c2.6,2.3,2,6.4,2.9,9.6C11.1,337.4,8.1,336.6,5.1,336.6 M9.3,330.4
+			c-2.1,0.4-2.8,4.4-0.2,4.8C12.3,336.1,12.6,329.6,9.3,330.4z"/>
+		<path class="st6" d="M488.1,333.7c-1-1.7,0.6-2.8,1.7-3.9c0.4,1.4,0.8,2.7,1.1,4.1C490.3,333.9,488.9,333.8,488.1,333.7z"/>
+		<path class="st6" d="M1254.3,332c1.3,1.2,1.9,4.4-0.2,4.9C1251.8,336.2,1253,333.2,1254.3,332z"/>
+		<path class="st6" d="M1713.2,332.1c1.9-0.7,3,2.5,0.9,2.9C1712.3,335.5,1711.3,332.6,1713.2,332.1z"/>
+		<path class="st6" d="M1205.6,337.8c1.7-1.5,2.7-4.4,5.3-4.4c2.3-0.1,4.9-0.5,6.9,0.9c0.1,3.4-5.3,5.3-3.9,8.6
+			c2.7,0.4,5.4,0.4,8.1,0.4c0.4,2.1,0.2,4.2-0.2,6.2c1.8,1.3,3.8,2.5,5.9,3.5c0.7,4-3.2,6.1-6.4,7.1c0.1-2.9,3-7.3-0.6-8.9
+			c-2.7-1.4-5.9-0.9-8.5,0.4c1.6,1.1,3.3,2.1,4.8,3.4c0.2,2.5-1.5,4.4-2.7,6.4c-1.7-1.9-3.4-3.9-5-5.9c1.1-1.6,2.1-3.3,3.1-5
+			c-0.6-0.1-1.9-0.2-2.6-0.3c0.5-1.7,1.1-3.5,1.6-5.2c-2.3-0.3-4.6-0.4-6.8,0.3c0.8,1.5,1.6,3.1,2.5,4.5c-0.2,0.5-0.7,1.4-0.9,1.9
+			c-2.1-2.4-4.2-4.8-6.2-7.2c1.4-2.2,3.1-4.3,5.1-6c0.1,1.4,0.3,2.8,0.5,4.2c2.1,0.6,5.2,1.1,6.3-1.3c0.8-1.9,1.9-4.1,0.8-6.1
+			C1209.9,335.4,1207.8,337,1205.6,337.8 M1213.2,345.1c0,0.7,0,2.1,0,2.8c2.2,0.7,5.4,1.7,6.7-0.9
+			C1220.2,343,1215.5,344.1,1213.2,345.1z"/>
+		<path class="st6" d="M478.7,336.5c3.1-2,5,1.9,5,4.6c0.5,1.8-1.3,2.7-2.3,3.9C480.9,342,480.1,339.2,478.7,336.5z"/>
+		<path class="st6" d="M0,338.1c1.1-0.3,2.2-0.6,3.3-0.8c0.3,1.4,0.5,2.7,0.8,4.1c-1.6,1.9-3.1,3.9-4.1,6.2V338.1z"/>
+		<path class="st6" d="M465.5,337.2c0.9-1,3.2-0.7,3.3,0.8C468.6,340.2,464.4,339.1,465.5,337.2z"/>
+		<path class="st6" d="M1717,344.4c0.7,0,2-0.1,2.7-0.2c0,1.3,0,2.6,0.1,3.9C1717.7,347.8,1717.2,346.1,1717,344.4z"/>
+		<path class="st6" d="M1235.2,351.9c1.5-1.1,3.2-1.8,4.9-2.3c0.1,0.8,0.4,2.3,0.6,3c1.4,1,2.7,2.1,4,3.3c-1.6,0.3-3.1,0.7-4.7,1
+			C1238.2,355.3,1236.6,353.6,1235.2,351.9z"/>
+		<path class="st6" d="M1082.1,352.1c0.7,0.1,2,0.3,2.6,0.4c-0.2,1.4,0.5,3.6-1.7,3.4C1081.9,354.9,1082.2,353.4,1082.1,352.1z"/>
+		<path class="st6" d="M1244.5,352.8c2.1,0.6,4.3,1.2,6.4,1.9c1.5-0.7,3-1.5,4.5-2.2c0,2,0,4,0,6c-3.2-0.2-5.9-1.9-8.5-3.6
+			c0.6,2,1.3,3.9,2,5.8c2.1,0,4.3,0.1,6.4,0.1v1.1c-2.7,0.2-5.4,0.5-8.2,0.8C1246.1,359.5,1245.2,356.2,1244.5,352.8z"/>
+		<path class="st6" d="M1075.6,355.6c0.5-0.1,1.6-0.3,2.1-0.4c0.4,1.6,1.4,3.4,0.6,5c-1,0.3-2,0.5-3,0.8
+			C1075.3,359.2,1075.4,357.4,1075.6,355.6z"/>
+		<path class="st6" d="M1718.3,355.3c1.4-2.1,3.9,0.7,3.7,2.5C1720.6,359.7,1717.1,356.8,1718.3,355.3z"/>
+		<path class="st6" d="M726.2,362.7c-0.6-2.6,2.7-2.7,4.4-2.3c1.1,0.7,0.8,2.1,1,3.2C729.8,363.6,727.9,363.8,726.2,362.7z"/>
+		<path class="st6" d="M754,362.5c1.4-0.1,2.9-0.2,4.3-0.3c-0.6,1.1-1.3,2.1-2,3.2c0.5,5.3-1.6,10.3-4.6,14.5
+			c-2.1,1.4-5,1.3-6.8,3.1c-2.1,1.7-3.7,4.5-6.8,4.2c-2.4-1.1-5.6-1.9-6.2-4.9c2.3,1.4,4.6,3.2,7.4,3.3c1,0.1,1.7-0.4,2-1.5
+			c-0.9-2.2-2.1-4.3-3.2-6.4c1.3-0.3,2.7-0.6,4-0.8c2.5,1,4.7,4.3,7.6,2.9c2.1-2.7,3.8-5.8,5.3-8.9C755.1,368,754.4,365.2,754,362.5
+			z"/>
+		<path class="st6" d="M919.2,364.1c2.4-0.6,4.8-2.3,7.4-1.5c-0.6,0.5-1.8,1.4-2.4,1.9c-0.2,0.6-0.6,1.7-0.8,2.3c-1.1,0-2.2,0-3.2,0
+			C919.9,365.9,919.6,365,919.2,364.1z"/>
+		<path class="st6" d="M12.2,370c0.2-2.2,1-4.2,2.2-6c0.6,1.3,1.2,2.7,1.7,4.1c1.1-0.1,2.1-0.2,3.2-0.3c-1.9,1.6-4.2,2.8-6.5,3.7
+			c0.6,3.2,1.8,6.3,3.7,8.9c-1.9,3.2-2.9,8.9-7.7,8.7c-3.1-0.5-5.5-3.6-8.9-2.6V382c3.7,1.7,7.9,3.4,11.9,2c1.2-1.2,2.1-2.7,3-4.1
+			c-2-1.6-4.2-3.7-7-3.3c-2.4-0.2-4,1.9-5.8,3.1c0-1.5,0.1-3,0.1-4.4C5.2,372.7,8.6,371,12.2,370 M5.9,385.1
+			c0.3,2.5,2.6,3.5,4.9,2.9c0-0.7-0.1-2.1-0.1-2.8C9.1,385.2,7.5,385.1,5.9,385.1z"/>
+		<path class="st6" d="M1090.1,364.2c1.4,0.5,2.8,1,4.2,1.7c0.7,1.2,0.4,2.9-0.5,4c-0.8-0.4-1.6-0.9-2.4-1.3
+			c-1.4,0.8-2.9,1.5-4.3,2.3C1087.2,368.3,1088.4,366,1090.1,364.2z"/>
+		<path class="st6" d="M1707,364.9c1.2-0.4,2.7-1,3.8,0.1c0.8,1.6-1.1,3.2-2.6,2.8C1707.7,366.9,1707.3,365.9,1707,364.9z"/>
+		<path class="st6" d="M1727.1,365.1c2.4-1.4,3.6,0.9,3.9,2.9C1729,368.1,1725.6,368.1,1727.1,365.1z"/>
+		<path class="st6" d="M999.2,370.3c0.6-0.3,1.7-0.8,2.2-1.1c0.5,0.2,1.5,0.6,2,0.7c2.2-0.3,4.3-1,6.5-1.1c3.8,1.6,3,6.8,6,9.2
+			c3.3,2.9,7.9,0.5,11.7,1c-3.5,1.5-7.1,2.8-11,2.6c-0.9,0.9-1.8,1.7-2.7,2.6c-0.1-1.3-0.2-2.7-0.3-4c-4.1-1.5-8.4-2.3-12.7-3.3
+			c-3.2-0.6-5.2-3.5-8.2-4.7l1.5-0.7c2.3,0.9,3.9,2.9,6.1,3.9c3.1,1,6.4,1.8,9.8,1.7c2.2-0.8,2.9-3.9,1.2-5.5
+			c-1.4-2.1-3.8-0.7-5.7-0.5C1003.3,372,1001.2,370.9,999.2,370.3z"/>
+		<path class="st6" d="M1234.2,373.6c3.9,0.2,7.6-1.4,10.9-3.3c1.9,0.9,3.8,1.7,5.7,2.6c1.5-1.2,3.1-2.4,4.7-3.6c0,2.1,0,4.2,0,6.3
+			c-1.5,1.1-3.1,2.2-4.2,3.7c0.3,3.8,2.2,7.3,2.5,11.1c-1.9-2.5-3-5.5-3.9-8.5c-0.9-0.5-1.8-1-2.7-1.5c-0.6,0.3-1.7,1-2.3,1.3
+			c1.4,3.9,3.8,7.6,2.8,11.9c-2.7,0-5.3-0.1-8-0.1c-1.7-1.9-3.4-3.9-5-5.9c0.3-0.4,1-1.3,1.4-1.8c-1.3-3.6-0.1-7.3,0.5-10.8
+			c-3.7,0.5-5.6,3.7-6.3,7.1c-0.6-0.8-1.2-1.6-1.8-2.3C1230.3,377.5,1232.1,375.5,1234.2,373.6 M1239,374.2c0.2,1.4,0.6,2.9,1.9,3.7
+			c1.6-1.6,3.3-3.2,5-4.6C1243.6,373.1,1241.2,373.4,1239,374.2 M1241,378.6c-1.1-0.1-2.2-0.2-3.3-0.4c-0.4,1.3-0.9,2.6-1.2,3.9
+			c1.5,2.4,3.1,6,6.5,5.3c2.3-1.5-0.6-4.5,1.4-6.3c0.7-1.2,3.1-2,2-3.6C1244.6,376,1243,379,1241,378.6z"/>
+		<path class="st6" d="M728.9,370.7c2.4,1.3,2.5,4.1,2.9,6.4C729,376.3,728.7,373.2,728.9,370.7z"/>
+		<path class="st6" d="M910.2,378c1.7-0.9,3.4-1.8,5.1-2.8c1.8,0.9,2.6,2.7,2.7,4.7C915.2,381.3,912.5,379.4,910.2,378z"/>
+		<path class="st6" d="M950,375c1.5,0.3,3.7-0.4,4.8,1.1c1.2,1.1,2,3.5,4.1,3.1c1.2-1.2,2.3-2.6,3.5-3.9l0.6-0.5
+			c4.6-0.3,9.3,0,14-0.1c-0.3,0.6-0.9,1.8-1.2,2.4c1.4,1.4,2.9,2.8,4.3,4.1c-0.5,1-0.9,2-1.4,3c-1-1.1-1.9-2.2-2.8-3.4
+			c-0.8-0.6-1.5-1.2-2.2-1.7c-0.1-1.1-0.2-2.2-0.2-3.2c-3.4-0.1-6.9-0.4-10.3,0.3c-2.4,1.3,1.5,6.6-2,5.7
+			C956.4,381.5,954,376.8,950,375z"/>
+		<path class="st6" d="M700.8,379.5c3.1-0.7,6.3-1.3,9.4-2c-0.9,1.4-1.7,3-2.5,4.5c0.3,0.5,1,1.5,1.3,2.1c-1.7-0.5-3.3-1-5-1.5
+			c0.7,1.5,1.2,3,2.1,4.4c1.5,0.5,3.1,0.7,4.7,1c-0.2-1.2-0.4-2.4-0.6-3.6c0.4,0.1,1.1,0.3,1.4,0.4c0.3,1.4,0.5,2.8,0.8,4.3
+			c1.1,0,2.1,0.1,3.2,0.1c-0.1-0.6-0.4-1.7-0.5-2.2c0.5-0.1,1.7-0.3,2.2-0.4c0.4-2,0.8-3.9,1.1-5.9c1.4,1.6,3.3,3,3.8,5.3
+			c-1.3-0.5-2.5-1.1-3.8-1.7c0.7,1.5,1.3,3.1,2,4.6c-0.9,0.4-1.8,0.7-2.6,1.1c-4,0.5-8,0.5-12,0.5c-4.1,0-8.1,1-12.1,0.9
+			c0-2.8-0.1-5.7-0.2-8.5c0.8,0.1,2.4,0.3,3.2,0.4c-0.8,2.3-1.6,4.7-2.3,7c2.5-0.4,6.4,0.8,7.5-2.3c1.2-1.8,0.5-4,0.3-6
+			c0.5-0.8,1-1.5,1.5-2.3C703.1,379.8,701.6,379.6,700.8,379.5z"/>
+		<path class="st6" d="M895.9,380.4c2.1-1.7,6-1.2,6.8,1.6C901.6,385.7,897.6,381.8,895.9,380.4z"/>
+		<path class="st6" d="M1052.2,379.1c2.3-0.3,4.6-0.5,6.9-0.5c-0.6,2-1.2,4-1.8,5.9c-0.9,0-1.8-0.1-2.8-0.1c0-1.5,0-3,0-4.5
+			c-0.8-0.2-2.3-0.5-3.1-0.7L1052.2,379.1z"/>
+		<path class="st6" d="M1092,379c2.6-1.4,3.5,2.5,1.8,3.8C1091.8,382.5,1091.3,380.7,1092,379z"/>
+		<path class="st6" d="M999.9,390.5c2.5-2.6,4.2-5.8,5.7-9.1c1.2,0.9,2.4,1.7,3.7,2.6c-0.9,0.1-2.7,0.3-3.5,0.4
+			c0.6,2,1.7,3.8,3.5,4.9c2.9,1.2,6.1,1.1,9.2,0.8c-0.5-1-1.1-1.9-1.7-2.8c-1.7-0.1-3.4,0.1-5,0.4c4.5-2.1,9.2-6.2,14.5-4.1
+			c-1.9,0.4-3.9,0.7-5.8,1.2c-0.7,2.1,0,4.4,0.2,6.5C1013.8,391.3,1006.8,390.4,999.9,390.5z"/>
+		<path class="st6" d="M582.2,387.1c1.9-1.1,3.3-4.9,5.9-3.2c2.1,0.8,1.1,3.1,1,4.8c-1.4-0.4-2.9-0.9-4.3-1.3
+			c-0.6,0.8-1.2,1.7-1.8,2.6c0.8,0.5,1.6,1,2.5,1.6c0.1,1.1,0.2,2.2,0.4,3.3c-2.9,0.5-5.8,0.8-8.6,1.2c-0.5,0-1.4,0.1-1.9,0.1
+			C577.1,392.8,578.9,389.2,582.2,387.1z"/>
+		<path class="st6" d="M773.9,390.3c1-2.1,2.1-4.1,3.2-6.2c2,1.6,2.5,4.2,2.7,6.7C777.9,390.6,775.9,390.4,773.9,390.3z"/>
+		<path class="st6" d="M1.7,391.7c1.5-0.9,3.3-1.5,4.5,0.2c0.3,2.3-1.8,2.8-3.6,2.9C2.4,394,1.9,392.5,1.7,391.7z"/>
+		<path class="st6" d="M0,397.8c4.1-0.7,8,0.8,11.7,2.4c0,0.6,0.1,1.9,0.1,2.5c-0.8-0.4-1.6-0.9-2.4-1.3c-2-1-4.1-1.7-6.2-2.4
+			c0.4,2.5,1,5.1,2.2,7.4c-0.7,0.2-1.4,0.5-2.1,0.7c-0.3-1.7-0.6-3.5-0.9-5.2c-0.6-0.4-1.8-1.1-2.3-1.4V397.8z"/>
+		<path class="st6" d="M28.3,404.4c0.4,0.1,1.2,0.3,1.6,0.5c-0.1,20.7-0.1,41.4-0.1,62.1c-0.1,4.1,0.8,8.6-1.5,12.3
+			c0.5,0.9,1,1.8,1.5,2.8c-0.5,15,0.4,30-0.1,45c0,13.5,0.4,27-0.1,40.4c-0.1,0.8-0.1,2.2-0.2,3c-1-1.4-2.6-2.6-2.5-4.5
+			c0.5-2.8,2.6-5.1,2.4-8c-0.9-2.1-2.6-3.7-4-5.4c-0.7,0.2-2.2,0.7-2.9,1l-0.7,0.2c-0.1-1.2-0.1-2.3-0.2-3.4
+			c-1.4-0.7-2.8-1.5-4.3-2.2c-0.2,0.4-0.6,1.2-0.9,1.6c1.7,3.1,2.1,6.5,0.5,9.7c-0.9-1.3-1.9-2.7-2.8-4.1c-0.5,0-1.6-0.1-2.2-0.1
+			c0.6,1.2,0.8,2.8,2,3.8c2.7,0.9,5.6,0.4,8.4,0.4c0.2-1.3,0.5-2.6,0.7-3.9c0.5,2,0.7,4,0.9,6c-3.6,0-7.3,0.5-10.7-0.8
+			c-2.2-0.8-3.7-3.1-3.8-5.4c1.4-1.4,3.3-2.2,5-3.2c0.5-1.5,0.9-3,1.4-4.5c0.5-0.1,1.6-0.3,2.1-0.4c2.6,1.3,5.5,1.9,8.4,1.7
+			c0.9,0.6,1.8,1.3,2.7,1.9c0.1-1.3,0.3-2.5,0.4-3.8c-2.2-0.5-4.6-0.8-6.7-1.8c-2.8-1.6-4.3-4.6-6-7.2c1.2-0.6,2.4-1.1,3.6-1.7
+			c1,1,1.8,2.3,3.1,3c1.7,0.2,3.5,0.1,5.2,0.1c0.2-2.1,0.3-4.3,0.5-6.4c-1.2-0.4-2.3-0.8-3.5-1.1c-0.2-2.9,1.5-5,3.6-6.7
+			c-0.1-0.3-0.5-1.1-0.6-1.4c-0.4-1.3-0.7-2.7-1-4c-0.7-0.2-2.1-0.7-2.9-1l0.2-0.5c1.4-0.1,2.8-0.2,4.2-0.4c0.4-4.5,0.4-9-0.2-13.4
+			c-1.5,1.4-3,2.8-4.4,4.2c-1.1-1.1-2.2-2.1-3.4-3.1c0.4-1.2,0.7-2.4,1.1-3.6c-0.8,0-2.4-0.1-3.2-0.1c-1.7,0.4-3.2,1.4-5,1.2
+			c-2.3-1.1-4.2-2.8-6.6-3.7c-1.9-0.3-3.8-0.1-5.8-0.3c-0.1-2.6,2.1-4.8,1.9-7.5c-0.4-5.3,5.1-8.1,7.8-11.9
+			c-0.2-1.9-1.2-4.4,0.7-5.8c2.3-0.2,4.7,0.4,6.8,1.2c1.1,0.4,3,1.3,2.4,2.8c-1.5,3-4.8,4.1-7.4,5.8c-1-0.6-1.9-2-3.3-1.4
+			c-2.3,2.6-4.3,5.5-6.7,8.1c0.6,0.6,1.7,1.6,2.3,2.2c3-2.1,5-5,7-7.9c-0.6,4.2-3.6,7.1-6.6,9.8c4.5,1.2,9.7-0.3,13.3,3.4
+			c1.1-1.1,2.3-2.2,3.4-3.3c1.6,3.1,3.2,6.2,5.6,8.7c-0.5-3.4-1.7-6.9-0.9-10.3c0.6-3.2,1.1-6.4,1.2-9.6c-0.9-1.1-1.8-2.1-2.5-3.3
+			c0.1-2.5,2.4-4.5,2.6-7c0.4-5.9,0.1-11.8-0.3-17.6c0-0.2,0-0.7,0-0.9c-1.1,0.1-2.3,0.2-3.4,0.3c0.5-2.6,2.2-4.7,3.6-6.8
+			c0.1-5.7,0.3-11.4,0.1-17c0.3-2.1-1.6-3.2-2.9-4.5c-0.1-0.5-0.2-1.5-0.3-1.9c0.7-0.2,2.2-0.6,2.9-0.8c0.4-5.7,0.6-11.5-0.5-17.1
+			C28.5,406,28.4,405,28.3,404.4 M12,476.2c0.9,1.7,1.2,5.1,3.9,4.4c2.3,0.1,2.9-2.3,3.1-4.1C16.7,476.1,14.3,475.7,12,476.2
+			 M12.3,499c1,1.1,1.9,2.9,3.7,2.6c2.1-1.1,1.9-3.9,0-5.1C14.3,496.1,13.3,497.8,12.3,499 M21,500.9c1,0.3,1.9,0.5,2.9,0.8
+			c1.6-1.2-0.1-3.3-0.1-4.9C21.7,497.2,21.2,499.1,21,500.9 M21.8,542.9c1.6,1.2,3.2,2.7,5.4,2.6c2.7-0.9,1.1-3.7,0.2-5.4
+			C25.3,540.7,23.4,541.5,21.8,542.9z"/>
+		<path class="st6" d="M1708.3,420.1c1.5-1.2,2.9,1.5,1.5,2.5C1708.3,423.8,1706.9,421.1,1708.3,420.1z"/>
+		<path class="st6" d="M1729.3,427.2c1.6-0.5,2.2,0.1,1.6,1.7C1729.2,429.4,1728.7,428.9,1729.3,427.2z"/>
+		<path class="st6" d="M2.6,448c0.5-1.4,2.1-1.6,3.3-2.2c-0.1,1.4,1.2,3.9-0.8,4.5C3.3,450.5,2.5,449.7,2.6,448z"/>
+		<path class="st6" d="M14.9,451.8c1.7-1.8,4.2-0.6,5.8,0.8c-1.3,0.8-2.6,1.6-3.9,2.5c0.3,1.9,0.6,3.8,0.9,5.7
+			c-1.7-0.1-3.3-0.3-4.9-0.5C13.3,457.4,13.6,454.5,14.9,451.8z"/>
+		<path class="st6" d="M1714.9,457c-0.2-1.3-0.9-3.6,1-4c2.3,0,5.6-0.1,6.1,2.8c-1-0.3-2-0.6-3-0.9
+			C1717.7,455.6,1716.7,457.9,1714.9,457z"/>
+		<path class="st6" d="M1231.2,468.2c0.5-0.3,1.4-0.8,1.9-1.1c0.6,1.4,1.2,2.9,1.8,4.3c-1.1,0.1-2.2,0.2-3.3,0.4c0,2,0.4,4,0.4,6.1
+			c-3.2,1.7-8.2,1-9.8,5c-0.4,2.6,3.4,2.8,5.1,4c0.8,2.3,1.3,4.7,1.6,7.2c-3.2-2.1-6.3-4.3-9.6-6.1c0.8,2.8,1.2,5.6,1.2,8.5
+			c1.2,0.8,2.5,1.5,3.6,2.5c-0.2,1.1-0.7,2.2-1.5,2.9c-0.3-1.3-0.5-2.6-0.8-3.9c-1.9,2.3-4.3,3.8-6.8,5.3c-2.4,2-4.3,4.7-7.3,6
+			c0.8-1.2,1.6-2.4,2.5-3.6c-2.6-1.1-5.7-2-8.4-0.7c-1.5,2.3-1.1,5.6-3.4,7.6c-3,3.4-7.8,3.5-11.4,5.9c0.2-0.7,0.7-2,0.9-2.7
+			c2.9-1.6,6.6-1.1,9.1-3.6c1.7-1.3,3.1-3.3,2.6-5.6c-1.2-0.5-2.4-0.1-3.6,0.3c0.6-1.2,1.1-2.5,1.7-3.8c-1.3-0.4-2.5-0.9-3.7-1.3
+			c0.5-0.2,1.5-0.6,2-0.8c5.2,1.1,10.7,3,16,1.2c0.8-1,1.5-2.2,2.2-3.3c1.4-0.6,4.3-0.3,3.6-2.7c-3.9-1.7-7.8,0.6-11.4,1.8
+			c0-0.7,0.1-2.1,0.1-2.9c1.5-0.1,3.1-0.2,4.6-0.4c0.3-1,0.5-2,0.8-3c1.4-0.2,2.7-0.4,4.2-0.7c0.3-1.3,0.6-2.5,0.9-3.8
+			c2.5-2,4-4.9,6-7.4c2-1.8,4.9-2,7.3-2.9C1229.6,474,1229.3,470.8,1231.2,468.2z"/>
+		<path class="st6" d="M1716.9,473c0.2-1.2,0.5-2.4,0.8-3.6c1.3,1.2,4.8,2,3.1,4.4C1719.4,473.6,1718.1,473.3,1716.9,473z"/>
+		<path class="st6" d="M407.2,476.6c6.8,0,13.4-2,20.2-1.6c-3.4,0.9-6.8,1.7-10.2,2.1c2.3,3.7,5.2,6.8,8.4,9.8
+			c-1.2,0.7-2.4,1.4-3.5,2.1c2.8,0.2,5.5,0.3,8.3,0.3c0-1.7,0.1-3.5-0.1-5.2c-0.5-1.9-2.6-3-2.9-5c0.3-2,2.9-1.9,4.2-2.8
+			c-0.4,4.6-0.2,9.1-0.3,13.7c-4.3,0.3-8.5,0.3-12.8,0.5c0-1.6,0-3.1-0.1-4.7c-1.9,0.2-3.8,0.5-5.7,0.7c-0.6-3-0.6-6.5-3.5-8.3
+			c-1.6,1.8-2.3,5.3-5.2,5.2c-1.9-1-1.8-3.5-2.6-5.2c-2.5,0-4.9,0.1-7.4,0.1c1.7,2.1,3.3,4.3,4.3,6.9c-3.5-0.1-8.3-3.9-5.6-7.5
+			C397.4,476.2,402.4,477.6,407.2,476.6 M412.7,477.4c-0.3,2.8-0.3,5.8,2.3,7.5c0.9-0.9,1.7-1.8,2.5-2.8
+			C417.8,479.3,414.7,478.2,412.7,477.4z"/>
+		<path class="st6" d="M560.5,475.4c2.3-1.2,2.4,3.3,0.3,3.3C559.2,478.4,559.5,476.1,560.5,475.4z"/>
+		<path class="st6" d="M812.3,477.4c0.5-0.2,1.4-0.8,1.8-1c-0.3,0.6-1,2-1.3,2.6c1.1,2.5,2,5.1,2.8,7.7c2.2-0.1,4.5-0.2,6.7-0.2
+			c-0.5,0.6-1,1.3-1.5,2c-1.6,0.1-3.3-0.1-4.9,0.5c-1.8,0.9-1.6,3.2-2.2,4.8c3.5-0.5,7.2-0.8,9.9,1.9c2.4-1.4,4.6-3.2,6.2-5.5
+			c-1.1-0.9-2.2-1.7-3.4-2.6c-0.1-0.9-0.2-1.9-0.2-2.8c1.7-0.8,4-0.8,5.1-2.5c0.4-1.4,0.3-2.9,0.4-4.3c-4.5-0.1-6.2,4.2-8.5,7.2
+			c0.2-1.4,0.4-2.9,0.7-4.3c-1.1,0.6-2.1,1.2-3.1,1.8c-0.6-0.5-1.2-1-1.7-1.4c2.4-1.4,4.5-3.3,7.1-4.5c1.9-0.3,3.9-0.2,5.8-0.3
+			c0.7,2,1.2,4,2.4,5.8c0.7,0.8,1.4,1.6,2.1,2.3c-2.1,2.2-4.3,4.4-5.7,7.1c-1.4,2.7-4.2,4-6.6,5.6c-3-2.1-6.5-3-10.2-2.2
+			c0.2,1,0.6,1.9,1,2.9c1.7,0.2,3.5,0.3,5.2,0.4c0.2,2.2,1.4,5.2-0.9,6.7c-2.8,0.7-5.6,0.7-8.5,1c1.5,1.2,2.9,2.3,4.4,3.5
+			c0.5,1.9,0.3,4,1.5,5.6c2.4,1,5.1,1.2,7.7,1.9c-1.8,0.8-3.6,1.2-5.5,1.4c-0.6,0.8-1.1,1.7-1.7,2.5c-1,0.4-1.9,0.8-2.9,1.3
+			c-1.8,3-2.9,6.3-3.9,9.7c-1.7-0.3-2.9-1.6-4.2-2.7c4.3-1.5,6.3-5.6,7.7-9.5c-1.2-0.7-2.4-1.3-3.5-2c1.6-1,3-2.2,4.2-3.7
+			c-5.9-4.4-10.7-10.2-17.1-13.8c-0.7,1.3-1.4,2.6-2,3.9c-0.6,0.2-1.7,0.7-2.2,0.9c1.4-1.8,2.8-3.9,0.4-5.6c1.7-1.9,4.4-3.7,4.2-6.5
+			c-1.3-2.3-3.2-4.1-4.5-6.4c2.5-3.5,7-4.9,10.2-7.6c-0.1,0.7-0.2,2-0.3,2.7c1.7-0.8,3.4-1.6,5.2-2.4c0.9,1.4,2.5,2.7,1.8,4.6
+			c-1.3,1.2-3,2-4.5,2.9c-0.2,1.1-0.3,2.2-0.5,3.3c3.4-1.2,6.6-3.1,8.8-5.9c-0.9-1.4-1.8-2.8-2.6-4.2
+			C811.6,479.3,812,478,812.3,477.4 M794.6,486.9c0.8,1,1.7,2,2.6,3.1c2.5-2,5.9-4.3,4.9-8C799.3,483.2,796.8,484.9,794.6,486.9
+			 M805.1,482c-1.5,0.8-1.1,2.5-1.3,3.9c2-0.7,4.6-0.8,5.6-2.9C808.8,481.3,806.5,481.8,805.1,482 M800.8,497.3
+			c1.2,0.8,2.4,2.2,4.1,1.6c2.4-1.4,4.6-3.2,6.6-5.2c1.4-1.2,0.1-2.9-0.2-4.2C806.4,489.7,804.1,494.3,800.8,497.3 M804.1,501.1
+			c0.5,2.6,2.1,5,4.5,6.1c0.2-4.2,2.8-7.4,4.3-11.1c-0.4-0.1-1.3-0.3-1.7-0.5C808.8,497.4,806.4,499.2,804.1,501.1 M811.9,503.9
+			c2.3,1.1,4.7,0.7,7-0.1c0-1.3,0-2.6,0-3.9C815.9,499,813.4,501.7,811.9,503.9z"/>
+		<path class="st6" d="M941.5,489.2c2.4-4.1,5.3-7.9,6.2-12.7c1.4,0.2,2.8,0.4,4.1,0.6c-0.2,2.1,0.3,4.6-1.4,6.1
+			C947.9,486,945.9,490.2,941.5,489.2z"/>
+		<path class="st6" d="M0,478.3c3-1.6,3,3.9,0,2.7V478.3z"/>
+		<path class="st6" d="M1729,484.3c1-2.2,2.4-4.2,4-6.1v4.9C1731.7,483.5,1730.3,483.9,1729,484.3z"/>
+		<path class="st6" d="M111.1,480.9c2.6-0.8,5.3-0.7,7.9-0.7c-1.3,3.3-4.9,4.5-7.8,6.2c2.2,2,5.1,1.9,7.9,1.6
+			c0.7,1.1,1.4,2.2,2.1,3.4c-4.8-1.2-9.8-0.9-14.7-1.4C107.9,486.8,109.4,483.8,111.1,480.9z"/>
+		<path class="st6" d="M564.2,484.9c-1.5-1.4,0.9-4.3,2.2-2.4c0.3,0.7,1,2.2,1.4,3C566.7,485.3,564.8,486.3,564.2,484.9z"/>
+		<path class="st6" d="M961.8,482.2c1.8,0,4.7-1.1,5.7,1.1c0.2,1.4,0.4,3.5-1.5,3.5C963.7,486.4,962.7,484.1,961.8,482.2z"/>
+		<path class="st6" d="M1230.9,482c3.1-0.1,7.5,3.2,5.1,6.3C1232.5,488.7,1231.3,484.9,1230.9,482z"/>
+		<path class="st6" d="M356.1,486c2.8,0,4.7,2.1,3.8,4.9c-1.1-0.2-2.1-0.4-3.2-0.6C356,489,356.2,487.4,356.1,486z"/>
+		<path class="st6" d="M672.9,487l1.3,0.2c-0.3,2.2-0.7,4.4-1,6.5c0.3,0.2,1,0.5,1.4,0.6c0.8,1,1.6,2.1,2.3,3.3
+			c-0.6,0.2-1.9,0.5-2.5,0.6c-0.1,0.4-0.2,1.1-0.3,1.4c-1.9-1-3.8-1.9-5.7-2.8c1.2-1,2.3-2,3.5-3C672.2,491.6,672.6,489.3,672.9,487
+			z"/>
+		<path class="st6" d="M978.5,489.3c1.3,0,2.6,0,4,0c0.4,1.9-0.2,4.3,1.5,5.6c1.5,1.5,3.8,0.5,5.7,0.6c0.2,1.7,0.2,3.9-2,4.1
+			c-4.3,0.5-6.4-4.1-7.5-7.6c-1,0.2-1.9,0.4-2.8,0.6C977.8,491.5,978.2,490.4,978.5,489.3z"/>
+		<path class="st6" d="M1195.9,492.9c0.4-1.2,0.8-2.4,1.3-3.6c1.3,0.9,2.6,1.7,3.9,2.6c-1.7,1.6-3.4,3.2-5.2,4.6
+			C1195.9,495.6,1195.9,493.8,1195.9,492.9z"/>
+		<path class="st6" d="M356.3,497.5c-1.4-1.6,0.8-3.2,2.3-2.8c2.3,0.2,4.6,0.5,6.8,1.1c1.5,2.2,0,4.9-0.3,7.3
+			c1.8-0.2,3.5-0.5,5.3-0.4c1.3,1.9-1.2,3-2.2,4.2c-2.1-3-6-3.3-9.2-4.3c1.3-0.6,2.6-1.2,3.9-1.8C361.7,498,358.8,497.9,356.3,497.5
+			z"/>
+		<path class="st6" d="M160.8,496c2.7-1.6,5,1,7.3,2c2.6,0.6,5.5-2,8-0.3c1.4,0.9,0.3,2.9-1.2,2.7c-3,0.2-5.9,0.9-8.9,1.4
+			C163.6,500.8,162.1,498.3,160.8,496z"/>
+		<path class="st6" d="M834.7,498.9c0.9-1.3,1.5-3.4,3.3-3.4c1.5,0.3,2.9,1,4.4,1.6c-1.2,1.8-2.6,3.7-2.8,6c0.8,2.3,3.3,0.5,4.9,0.3
+			c-0.1,0.4-0.4,1.2-0.5,1.6c-1.3,0.7-2.5,1.3-3.8,1.9c0.9,1.7,1.7,3.5,2.1,5.4c-2.4-2.3-4.9-4.5-7.4-6.6c3.3-1.2,4.6-4.8,4.6-8.1
+			C837.8,496.5,836.2,498.3,834.7,498.9z"/>
+		<path class="st6" d="M518,497.1c2.6-1.6,4.8,0.7,6.5,2.5c1.4,1.8-1.2,3.3-2,4.8c0,1.7,0.7,4.1-1.4,4.8c-1.4,1-2.6-0.2-3.6-1
+			c1-2.4,2-4.7,3.1-7C519.7,499.8,518.8,498.5,518,497.1z"/>
+		<path class="st6" d="M1498.9,498.7c1.4,0.1,4.1,0.1,3.8,2.2c0.1,2-1.8,3-3.3,4C1499.3,502.9,1499.1,500.8,1498.9,498.7z"/>
+		<path class="st6" d="M1532.2,498.9c1.5,3.9,2.7,7.9,3.9,12c-0.1,0.4-0.2,1.3-0.3,1.7c-1.4-1-2.9-2-4.2-3.2
+			c-0.1-1.6,0.8-3.1,1.4-4.6c-0.9-0.7-1.8-1.4-2.6-2.1C1530.9,501.5,1531.5,500.2,1532.2,498.9z"/>
+		<path class="st6" d="M1227.1,502.9c-0.5-2.6,1.9-3.4,4-2.9C1230.1,501.5,1229.4,504.3,1227.1,502.9z"/>
+		<path class="st6" d="M393.2,500.8c0.7,0.7,1.5,1.4,2.1,2.2c0,2.4-3.7,3.4-4.6,1C391.5,502.9,392.4,501.8,393.2,500.8z"/>
+		<path class="st6" d="M527.1,502.1c1.2-0.6,2.5-0.8,3.9-1c-0.1,0.5-0.4,1.4-0.5,1.8c-0.9,1.8,0.3,5.4-2.5,5.6
+			C525.7,507.5,524.7,503.5,527.1,502.1z"/>
+		<path class="st6" d="M538,501.4c1.2,0,2.4,0.1,3.6,0.1c1.6,2.5,0.3,5.1-0.7,7.5c2.9-2.3,5.9-5.1,9.9-4.5c-3.8,2.4-7,5.6-10.1,8.8
+			c-1.6-1.7-3.4-3.2-4.5-5.2C536.8,505.8,537.6,503.6,538,501.4z"/>
+		<path class="st6" d="M649.9,503c1-0.3,1.9-0.5,2.9-0.7c2.1,0.9,2.5,4.2,0.1,5.1C650.8,506.9,650.4,504.7,649.9,503z"/>
+		<path class="st6" d="M1726.9,501.9c2.1,0.5,4.1,1.1,6.1,1.9v8.3c-1.2,0.3-2.3,0.6-3.4,0.9c-0.7-1.4,0.3-2.8,0.5-4.2
+			C1729,506.6,1727.9,504.3,1726.9,501.9z"/>
+		<path class="st6" d="M1217.4,508.5c0.8-1.9,1.5-3.9,3.3-5.1c0,0.4,0.1,1.3,0.1,1.7c4.4,0.2,8.8,0.6,13,1.6c0,0.4,0,1.2,0,1.6
+			c-0.4,0.1-1.2,0.2-1.6,0.2c-1.2,0.7-2.3,3-3.8,1.8c-1.6-1.1-3-2.5-4.6-3.5c-1.7-0.3-3.3-0.2-4.9-0.3c0.6,2,1.3,3.9,2,5.8
+			c1.3,0.3,2.6,0.6,4,0.9c-1.5,1.1-2.9,2.3-4.4,3.4c-0.2-0.7-0.5-2-0.7-2.6c-1,0.2-2,0.4-3,0.7c0.9-1.2,1.8-2.4,2.7-3.6
+			C1218.8,510.3,1218.1,509.4,1217.4,508.5z"/>
+		<path class="st6" d="M142.4,508.8c-0.8-2.2,0.6-5.6,3.4-4.5c2.5-0.1,1.7,2.9,2,4.5C146.1,509,143.6,510.8,142.4,508.8z"/>
+		<path class="st6" d="M1516.2,505.2c0.5,0,1.5,0.1,2,0.1c0.8,1.6,1.7,3.3,2.6,4.9c-0.8,0.7-1.6,1.4-2.4,2.1
+			c0.1,0.8,0.2,1.6,0.3,2.4c-0.6,0-1.7-0.1-2.2-0.1C1516.4,511.5,1516.3,508.4,1516.2,505.2z"/>
+		<path class="st6" d="M0,509.3c3.7-0.4,7.3-1.3,10.9-2.3c-2.3,1.9-4.4,4.2-5.8,6.9c-1.8-0.4-3.5-0.9-5.1-1.8V509.3z"/>
+		<path class="st6" d="M12.4,511.3c1.4-1.8,3.7-3.3,6.1-2.8c0.6,2.5-2,4.3-3.1,6.3C14.2,513.9,11.6,513.3,12.4,511.3z"/>
+		<path class="st6" d="M495.5,508.1c1.5,0.8,3.1,1.6,4.6,2.4c0.4,3.1,2.6,4.8,5.6,5.4c-0.3,1.6-0.7,3.3-1,4.9
+			c1.4-0.8,2.7-1.7,4.2-2.2c1.7-0.2,2.6,2.6,1.2,3.5c-2.9,1.8-6.4,2.3-9.8,2.8c0.1-1.5,0.2-3.1,0.3-4.6c-0.9-0.8-1.9-1.7-2.8-2.5
+			c0.5-0.3,1.4-1,1.8-1.3C499.7,513.1,497.2,510.7,495.5,508.1z"/>
+		<path class="st6" d="M677.8,511.1c2.9-0.6,5.5-1.9,8.2-3.1c-1.5,2.6-3.5,5.2-6.2,6.7C677.3,515.6,677.6,512.7,677.8,511.1z"/>
+		<path class="st6" d="M662.2,512.7c-1.8-0.7-3.7-4.5-0.4-3.9C664.7,508.3,662.8,511.6,662.2,512.7z"/>
+		<path class="st6" d="M514.1,517.5c3.7-0.6,6.6-2.9,8.4-6.2c1.8,0.8,3.8,1.2,5.8,1.1c-2.2,0.7-4.3,1.6-6.4,2.5
+			c-1.7,0.5-1.4,2.5-1.9,3.8c2-0.5,4-1,6-1.6c2,0.7,4.1,1.1,6.2,1.6c0.4,0.6,1.1,1.9,1.4,2.5c-1,1.3-2.1,2.7-3.1,4.1
+			c-0.5-0.9-1-1.8-1.5-2.6c1.1-0.8,2.2-1.7,3.2-2.5c-6.2-1.6-12.8-1.3-19,0.2c-2-2.1-3.4-4.8-4.7-7.3c1.1,0.2,2.2,0.5,3.3,0.8
+			C512.7,515.1,513.4,516.3,514.1,517.5z"/>
+		<path class="st6" d="M670.1,511.2c2.5-1.4,7.9,1.4,5.4,4.3c-1.9,0.1-3.5-1.2-5.2-2C668.8,513.3,668.8,511.8,670.1,511.2z"/>
+		<path class="st6" d="M187.6,512.1c4.1-0.8,4.2,5.1,1.1,6.5c-1.3-0.2-2.4-1.1-3.5-1.8C186.7,515.6,187.3,513.9,187.6,512.1z"/>
+		<path class="st6" d="M390.3,517.6c0.9-1.8,1.7-3.7,2.6-5.4c0.1,0.6,0.3,1.8,0.4,2.4c1.3,0.2,2.6,0.3,3.9,0.5
+			c-0.1,6.7,0.1,13.4,0.1,20.1c-0.5,0-1.4,0.1-1.8,0.1c-0.2-0.8-0.6-2.4-0.8-3.2c-0.7-0.2-2.2-0.5-2.9-0.7c0.5-1.4,1-2.7,1.5-4.1
+			c0.6,0.1,1.8,0.2,2.4,0.3l0.5,0.1c0.1-3.7,0-7.3-0.1-10.9c-2.4,1.1-4.3,3-5.6,5.4c-2.2-1.1-4.3-2.3-6.3-3.6
+			c-0.5-0.3-1.4-0.9-1.8-1.2c0.7-0.9,1.5-1.9,2.2-2.9C386.4,515.4,388.4,516.5,390.3,517.6z"/>
+		<path class="st6" d="M688.2,513c1,0.7,4.6,0.5,3.2,2.3c-1,0.4-2.1,0.7-3.3,0.8C688.2,515.3,688.2,513.8,688.2,513z"/>
+		<path class="st6" d="M827.7,515c1.7-1.6,4.2-1.7,6.4-2.2c-0.2,1.3,1.1,3.8-1,4C831.2,516.8,828.9,516.6,827.7,515z"/>
+		<path class="st6" d="M7.3,517.3c3.2-0.3,2.5,3.3,2.4,5.4c-0.6,0-1.9,0-2.5,0.1C6.8,521,5.4,518.5,7.3,517.3z"/>
+		<path class="st6" d="M695.1,520.3c1.5,1.3,2.6,2.9,3.6,4.6c-1.7,1-3.3,2.1-4.9,3.1c-0.3-1.6-0.6-3.3-0.9-4.9
+			C693.6,522.1,694.4,521.2,695.1,520.3z"/>
+		<path class="st6" d="M1190.3,520c2.6,1.8,5.4,3.3,8.2,4.7c1.3,1.8,0.1,4.4,0.1,6.5c-1.9-0.2-2.5-2.1-3.4-3.5
+			c-1.8-1.2-4.1-1.3-6.1-2C1189.3,523.8,1189.7,521.8,1190.3,520z"/>
+		<path class="st6" d="M1532.2,529.2c-1.3-3.2-3-6.6-1.4-9.9c1.3,2.9,3.5,5.2,5.4,7.7C1536,529,1533.8,528.7,1532.2,529.2z"/>
+		<path class="st6" d="M148.1,520.9c0.8,0,2.3,0,3,0c1.3,2.1-1.5,2.8-2.9,3.2C148.1,523.3,148.1,521.7,148.1,520.9z"/>
+		<path class="st6" d="M138.1,524.1c0.2-2.9,3.3-1.2,4.8-0.4c0.4-0.3,1.1-0.9,1.4-1.2c1.8,1.5,4.1,2.6,5.5,4.6
+			c0.3,2-1.7,2.6-3.3,2.7c-0.8-1.4-1.5-2.8-2.3-4.2C142.2,526.3,137.8,527.9,138.1,524.1z"/>
+		<path class="st6" d="M1513.1,521.9c3.5,0.5,5.8,3.4,8.9,4.9c0.8-1.7,1.7-3.3,2.7-4.9c0.2,0.5,0.7,1.6,0.9,2.1
+			c-1.4,2.8-2.4,6-4.5,8.3c-2.2,0.2-5.1,0.1-6.1-2.2C1513.5,527.6,1512.9,524.8,1513.1,521.9 M1515.1,524.9c0.4,1.8,0.4,3.8,1.7,5.4
+			c1.3,1.2,3.7,1.6,4.8-0.2C1520.7,527.1,1517.8,525.5,1515.1,524.9z"/>
+		<path class="st6" d="M510.4,529c-2.4-1.8,0.1-6.8,2.8-6.2C513,525.1,511.3,527,510.4,529z"/>
+		<path class="st6" d="M1230.3,526.3c3.1-2.2,3.8,4,0.8,4.6C1230,529.7,1229.3,527.8,1230.3,526.3z"/>
+		<path class="st6" d="M184.8,530.3c1-2.1,3.2-0.3,4.6,0.2c2-1,4.2-1.8,6.5-1.3c-0.3,1.3-0.5,2.6-0.8,3.9c0.5,1,1.1,2,1.6,3
+			c-0.2,0.4-0.6,1.3-0.9,1.7c-3.4-1.6-6.9-3.3-10.7-4c0.7-1.1,1.4-2.2,2.1-3.4C186.7,530.3,185.4,530.3,184.8,530.3z"/>
+		<path class="st6" d="M170.4,533c-0.3-1.3,0.7-2.2,1.4-3c3.2,2.5,5.6,5.9,8,9.2c2.1,3,6.1,1.2,9,1c-0.8,2-1.2,4.4-2.9,5.8
+			c-2.4,0.8-5.5,0.3-7.5-1.4c-1.3-2.5-1.6-5.4-2.9-8C173.7,535.6,169.9,536.1,170.4,533 M179.2,541.4c-1.1,3.7,5.2,5.8,6.6,2.5
+			C185.1,541,181.3,541.7,179.2,541.4z"/>
+		<path class="st6" d="M817,530.1c2-1.6,4.3,0.7,2.7,2.8C818.5,535.9,814.7,531.3,817,530.1z"/>
+		<path class="st6" d="M1497.4,532.3c2.5-0.8,5-1.5,7.6-2.2c-1.6,3.2-3.9,5.8-6.5,8.2C1498,536.2,1497.6,534.3,1497.4,532.3z"/>
+		<path class="st6" d="M992.4,532.3c1.2-0.1,2.4,0.4,3.6,0.7c-0.9,2.1-2.2,4-4.7,4C991.5,535.5,990.5,533.2,992.4,532.3z"/>
+		<path class="st6" d="M1702.7,533c0.7,0.1,2,0.3,2.7,0.4c0.3,1.1,0.6,2.2,0.9,3.3c0.3,0,0.8,0,1.1,0c-1.3,3-1.3,6.4-1.6,9.6
+			c-1-2.8,0.6-7.3-3.1-8.1C1702.7,536.5,1702.7,534.8,1702.7,533z"/>
+		<path class="st6" d="M390.2,534.6c0.2,1.2,0.4,2.3,0.6,3.5c-1.7,0.7-3.3,1.4-5,2.1c0.7,1.2,1.5,2.4,2,3.8c0.4,2.5-2.6,3.4-4.1,4.7
+			c-1.4-1.6-2.9-3.1-4.4-4.6c3.1-3,5.6-7.1,10.1-8.1C389.5,535.7,390,535,390.2,534.6z"/>
+		<path class="st6" d="M806.2,536c1.3,0,2.5,0,3.8,0c-0.4,1.5-0.8,3.1-1.2,4.7c-0.6,0-1.9,0.1-2.5,0.1
+			C806.2,539.2,806.2,537.6,806.2,536z"/>
+		<path class="st6" d="M151.3,537.4c1.6-0.2,4.4-0.7,4.5,1.7c-0.7,2-3.1,2.2-4.7,3C151.2,540.6,149.5,538.3,151.3,537.4z"/>
+		<path class="st6" d="M158.4,537.3c1.3-1.3,3.6,1,2.3,2.3C159.4,541,157.1,538.7,158.4,537.3z"/>
+		<path class="st6" d="M203.6,542.8c1.6,2.3,3,4.8,4.6,7.1c1.5-0.3,2-2.1,2.9-3.2l0.3-0.4c1.4,3.9,3.4,7.6,5.1,11.4l-0.2,0.2
+			c-2.1,1.5-4,3.3-5.8,5.2c-0.1-3.4,0.1-6.8-0.4-10.1c-0.4-2.7-3.5-2.2-5.5-2.6C204.2,547.8,203.9,545.3,203.6,542.8z"/>
+		<path class="st6" d="M1514.4,544.1c1.7,0.5,3.4,1,5.1,1.5c0,1.4,0.1,2.7,0.2,4.1c-1-0.1-2-0.2-2.9-0.3
+			C1516,547.7,1515.2,545.9,1514.4,544.1z"/>
+		<path class="st6" d="M825.7,544.7c3.3,0.4,6,2.2,7.8,5c-1.1-0.5-2.2-1-3.3-1.5c0,0.7-0.2,2-0.2,2.7c-1.7-2.5-4.6-2.8-7.4-2.6
+			C823.6,547.1,824.6,545.9,825.7,544.7z"/>
+		<path class="st6" d="M716.9,550.1c1.2-0.3,2.5-0.6,3.8-0.9c0.8,3,2.4,5.5,4.2,8c0.9,2.4-1.8,1.4-2.9,0.9c-2.4-1-3.1-3.7-3.7-6
+			c-0.4,1.5-0.8,3-1.1,4.5C717.2,554.4,717.1,552.2,716.9,550.1z"/>
+		<path class="st6" d="M1712.8,548.9c0.8,0.1,2.5,0.3,3.3,0.4c-0.1,2.4-1.7,3.8-4,3.8C1712.3,551.7,1712.5,550.3,1712.8,548.9z"/>
+		<path class="st6" d="M698.3,550.3c1,0.2,2.1,0.4,3.1,0.7c0,1.1,0,2.1,0,3.2c2.1-1.7,4.2-3.6,7-4.2c1.2,2.2,2.2,4.7,4,6.5
+			c1.8,1.3,4,2.1,5.8,3.5c1,2.9-2.3,4.4-3.7,6.4c0.1,4.3,1.2,8.6,1,12.9c-0.9-0.1-2.6-0.2-3.5-0.2c0.2-1.3,0.3-2.5,0.5-3.8
+			c-0.6-0.7-1.3-1.5-1.9-2.2c-4.7,2.3-6.7,7.7-11.5,9.9c-1.2-2.5-2.2-5.1-2.8-7.9c-1.3-0.9-2.6-1.8-3.9-2.6
+			c-0.8,1.9,0.6,3.5,1.5,5.1c-1,1.5-2.1,3-3.2,4.5c0.3,1.1,0.7,2.2,1,3.4c-1.7-0.8-3.3-1.6-5-2.4c-0.5,1.3-0.9,2.6-1.3,3.8
+			c-0.2,0.7-0.5,1.3-0.7,2c-0.3-5.1-1.1-10.2-2-15.3c1.4,2.2,2.5,4.6,3.5,7c1.5-0.7,3-1.4,4.6-2.1c-2.4-3.3-4-7.3-7.5-9.7
+			c-0.2,0.7-0.8,2.1-1,2.8c-0.5-2.1-1.1-4.2-1.7-6.3c0.3-0.6,0.9-1.7,1.2-2.2c0.5,0,1.5,0.1,2,0.1c1.2-0.3,2-1.1,2.5-2.2
+			c-2.4-0.9-5.5-0.2-7.3-2.4c0.7-0.2,2.1-0.7,2.8-1c0.8-2.5-1.2-3.6-3-4.7c1.6-0.5,3.2-1,4.9-1.6c0.7,0.5,1.4,1,2.2,1.5
+			c1.7-0.4,3.6-2.3,5.3-0.8c0.8,2.9,0.9,5.9,1.3,8.8c-2.5,0.5-3.5-1.4-4.2-3.4c-0.3,1.7-0.5,3.4-1,5.1c-1.5,1.3-3.3,2.1-5.1,3
+			c-0.1,0.5-0.2,1.5-0.3,2c2.4,0.4,4.7,1.1,7.1,1.8c3.3-0.8,0.4-3.3-0.4-5c1.6-0.3,3.2-0.5,4.8-0.8c0.4-2.1,0.4-4.4,1.3-6.4
+			c1.2-0.8,2.6-1.4,3.9-2C698.5,553.3,698.3,551.8,698.3,550.3 M696,557.9c-1.2,4.1-1.7,9.1-5.2,11.9c-0.7,1-3.1,1.8-1.8,3.3
+			c2.6-0.2,4.8-3,7.7-1.5c3,1.1,1.8,4.5,1.9,7c1.6,0,3.3,0.1,4.9-0.2c1.6-1.5,2.4-3.6,3.7-5.3c1.4-2.3,4.2-3.2,5.4-5.6
+			c1.4-2.5,3.3-4.6,5.2-6.6c-3.1-1.9-6.9-1-10.3-1.3c-0.1-2.1,0.7-4,1.7-5.8c-1-0.3-1.9-0.5-2.9-0.6
+			C702.7,554.7,699.4,556.4,696,557.9 M687.2,581.2c-0.5,1.6,0,2.2,1.7,1.7C689.4,581.2,688.9,580.7,687.2,581.2z"/>
+		<path class="st6" d="M178.4,551.4c3.7,0.3,7.1,2.1,10.2,4.1c1.7,1,0.8,3.4,1.2,5c-1.6-1.1-2.5-2.8-3.3-4.4
+			c-1.2,0.8-2.5,1.6-3.7,2.4c2,1.1,4,2.2,6,3.3c-0.4,0.6-0.8,1.3-1.2,2c2.4,2.6,4.7,6,8.5,6.2c2.2,0.2,5.6-0.2,6-2.9
+			c0.7-3.2,1.5-7.6-1.9-9.5c-2.8,1.5-4.3,4.8-7.4,5.9c0.6-1.6,1.1-3.2,2.3-4.5c2.6-3.4,7.4-2.4,11.1-3.6c0.3,0.8,0.6,1.6,0.9,2.4
+			c-1.2,1.6-3.9,2.9-3.1,5.2c1.4,3.2,4.4,5.8,3.8,9.6c-4.3-0.1-8.7,0.5-13,0.6c-3.1-0.5-6-2.1-9.2-2.3c-3.1-0.2-6.2,0-9.3,0.1
+			c0.4,3.9,0.4,7.9,0.3,11.8c-1.4-2.8-2.6-5.7-3.2-8.8c-1-1.6-1.9-3.2-2.9-4.8c0.3-0.7,1-2.1,1.3-2.8c-2.2-1.5-3.8-3.6-4.6-6.1
+			c2.1,1.3,4.3,2.5,6.4,3.7C175,559.7,175.2,554.8,178.4,551.4 M176.9,556.1c-1.3,2,1.3,3.8,3.2,3.2c1.5-1.2,1.3-3.2,1.7-4.8
+			C180,554.5,177.4,553.7,176.9,556.1 M176.2,563.7c0.6,2.2,1.7,4.3,3.1,6.1c1.4-0.3,3.1,0,4.2-1.1c0.2-2.4-1.4-4.3-2.8-6.2
+			C179.3,562.9,177.8,563.3,176.2,563.7z"/>
+		<path class="st6" d="M1461.5,551.8l0.5,0.4c2.6,2.2,4.4,5.1,6.2,8c0.6-0.7,1.2-1.4,1.9-2c-0.6-1.3-1.2-2.7-1.8-4
+			c0.6-0.7,1.3-1.3,2-2c0.3,0.2,0.9,0.7,1.3,0.9c0.2,1.6,0.3,3.2,0.7,4.7c1.5,0.7,2.9-1.2,4.2-1.7c-1.5,1.9-3.2,3.7-4.4,5.8
+			c0.5,4.6,4,7.9,8.3,9.2c-0.1,0.8-0.2,2.2-0.2,3c-0.4,1-0.8,1.9-1.1,2.9c-0.1-0.6-0.3-1.7-0.4-2.3c-5.2-3.4-6.2-10.1-10.5-14.1
+			c-2.9-0.3-2.7,3.2-3,5.1c-2.2-1.6-4.7-2.8-7.3-3.5l0.6-0.1c2.2-0.3,4.5-0.7,6.8-1.1C1463.4,558.1,1461.7,555.2,1461.5,551.8z"/>
+		<path class="st6" d="M1702.7,551.7c3.2,0.2,6.8,0.8,8.7,3.6c0,1.8-0.4,3.5-0.6,5.3c2-0.6,4-1.2,6-1.7c0,1.3,0,2.6,0,3.9
+			c-2.5,0.1-4.9,0.2-7.3,0.3c-1.5,2.7-4,4.4-6.9,5.2c0-0.6,0-1.7,0-2.3c2.1-1.6,4.3-3,6.5-4.4c-1.7-1.9-4.1-2.9-6.5-3.8
+			C1702.7,555.8,1702.7,553.7,1702.7,551.7 M1704.3,554.2c-1.4,0.9-0.1,3.8,1.5,2.6C1707.1,555.8,1705.8,553,1704.3,554.2z"/>
+		<path class="st6" d="M803.4,553.4c2.8,0.3,5.6,0.6,8.4,0.9c-2.7,2.4-6.5,4.7-6,8.8c1.6-0.9,3.2-1.9,4.8-2.9
+			c-1.2,2.9-3.8,4.7-6.4,6.1c0.2-1,0.4-2.1,0.7-3.2c-1.5-0.3-3-0.7-4.5-1c-2.3,2.6-5.3,4.6-8.7,5.3c0-0.8,0-2.5,0-3.4
+			c1.3,0.2,2.6,0.4,4,0.7c1.4-1.3,2.9-2.7,4.4-4c1.3,0.1,2.7,0.2,4,0.3C803.7,558.5,803.5,556,803.4,553.4z"/>
+		<path class="st6" d="M836.1,553.1c2,3.3,3.4,6.9,5,10.4c0,3,0,6-0.3,9c-3-3.8-2.1-8.9-2.9-13.4c-1.2,4.1-2.6,8.1-3.8,12.3
+			c1.8,0.5,3.6,1,5.4,1.6c-0.3,2,0.1,4.4-1.5,6c-1.5,1.9-4,1.3-6,1.5c-0.1-2.1-0.2-4.1-0.3-6.1c-1.6-0.1-3.2-0.1-4.8-0.1
+			c-0.1-2.3-0.2-4.7-0.2-7c-1.7-1.3-3.4-2.5-5.2-3.8c1.2,4,1.1,8.2,1,12.3c-0.9,0.7-1.9,1.5-2.8,2.2c-0.1,1.8-0.1,3.6-0.1,5.4
+			c4.1,3.9,5.5,9.6,7.5,14.7c1.7,0.3,3.4,0.7,5,1.1c2.2-0.6,4.4-1.4,6.5-2.2c0-3.4-0.8-7.4,2.2-9.8c0.3,2.9,0.5,5.8,0.4,8.7
+			c2,1.8,0.7,4-0.3,5.9c-2.7-2.5-6.6-1.3-9.8-0.7c-1.8-0.6-3.6-1.3-5.4-1.9c-1.2-5.8-4.7-10.7-9.1-14.5c0.9-2,2.1-4.1,1.3-6.3
+			c-1.5,1-3,2-4.6,2.9c0.8-1.7,2-3.2,2.2-5.1c-0.3-2.1-1.3-4.1-2.1-6.1c1.6-0.9,3.2-1.7,4.9-2.6c-2.5-0.9-5-1.6-7.5-2.2
+			c-2.2,2.9-6.1,5.8-5,9.9c0.8,3.6,0,7.2-1,10.6c-2.8-2-3.8-5.5-5.5-8.4c-1-2.9-2.5-7.4,1.3-8.9c-1,1.9-1.5,4.2-0.5,6.2
+			c0.7,2.1,2,5.6,4.9,4.1c-0.5-1.7-1.3-3.2-2.1-4.8c2-3,3.8-6.2,6.3-8.8c1.1-1.5,3.2-0.8,4.8-1.1c2.7,0.1,5.1-1.2,7.7-1.8
+			c2.7,1.1,5,2.9,7.4,4.5c-0.6,1.6-1.2,3.1-1.8,4.7c1.8,1,3.9,1.4,5.9,1.7c0-2.5-0.6-4.8-1.7-7c1.3-1.3,2.7-2.5,3.7-4
+			c1.2-2.6-0.9-5-2.2-7c0.9,0.2,1.7,0.4,2.6,0.7C835.8,555.1,836,553.8,836.1,553.1 M817.3,571.4c-1.9,0.9,0.5,5.6,2.4,3.3
+			C821.8,573.6,819.2,569.1,817.3,571.4 M834,573.2c-0.5,1.3-0.9,2.5-1.2,3.8c0.6,0.9,1.3,1.8,2.1,2.6c1.8-1.5,3.9-3.1,3.4-5.8
+			c-0.6,0.1-1.9,0.4-2.6,0.5C835.1,573.9,834.6,573.5,834,573.2z"/>
+		<path class="st6" d="M327.7,557.4c1.9-0.2,4.2-0.1,4.8,2.2c0.8,1.4-0.8,2.4-1.5,3.3c-2.4,2.1-4.6,4.9-8,5c0.2-2.4,2.2-3.7,3.6-5.4
+			C327.3,561,327.4,559.1,327.7,557.4z"/>
+		<path class="st6" d="M1180.2,558.3c0.6,0.1,1.9,0.2,2.5,0.3c0,1.7,0.3,5.9-2.4,5C1178.4,562.5,1180.1,559.9,1180.2,558.3z"/>
+		<path class="st6" d="M0,561.8c2-0.7,4-1.2,5.9-1.8c-1.9,2.8-3.4,5.9-4.7,9.1c-0.3,0-0.9-0.1-1.3-0.2V561.8z"/>
+		<path class="st6" d="M724.5,566.1c-4.2-1.2-2-7.1,1.7-6.2C726.7,562.2,725.1,564.1,724.5,566.1z"/>
+		<path class="st6" d="M1539.6,567.5c1.1-2.8,1.4-7.5,5.4-7.4c3.8,0.7,6.3,4.5,8.8,7.3c1.1,3-2.2,3.5-4.3,3.4
+			c-0.6-0.9-1.2-1.7-1.8-2.5c-2.1,0.9-5.4,0.9-5.9,3.6c-0.4,3.6-0.2,7.2-0.9,10.8c3.8-0.4,7.5,0.5,11.2,0.6c3.5-0.2,3.3-4.1,3.8-6.7
+			c0.5-0.3,1.4-0.8,1.9-1l0.2,0.6c-1.4,3-1.6,7.3-5.1,8.7c-3.1,1.4-6.5-0.5-9.7,0.1c-2.6,0.8-3.7,3.6-4.9,5.7
+			c-0.8-2.1-2.6-4.3-1.7-6.6c1.2-1.9,2.6-3.6,3.9-5.5c-1.6-2.3-2.2-5-2.6-7.7c-1.3,0.6-2.6,1.2-3.8,2c-0.8,3,1.4,6.4-0.8,9
+			c-2.4,1.9-5.5,2.6-7.9,4.3c-0.4,1.8,1,3.2,1.8,4.6c-0.1,1.2-0.2,2.4-0.3,3.6c-1.1-3.1-4.6-6.3-3-9.8c2.5-2,6.1-1.7,8.5-3.7
+			c1.3-2.9-0.4-6.4,0.6-9.3C1534.8,569.9,1537.4,569.1,1539.6,567.5 M1543.7,561.7c-2.2,1.2-1.4,3.9-1.3,5.9c2.7,0.5,4.7-1.2,6.4-3
+			C1547.9,562.9,1545.9,560.3,1543.7,561.7 M1548.8,566c0.4,2.2,2,3.5,4.3,3.1C1552.5,567,1551.2,565.4,1548.8,566z"/>
+		<path class="st6" d="M1232,576.1c-1-4.3-1.5-9.3,1.2-13.2c0.8,2.6,1.9,5.2,2.4,7.9C1235.5,573.2,1233.4,574.6,1232,576.1z"/>
+		<path class="st6" d="M219,563.5c1.2,2.1,2.3,4.2,3.1,6.5c-1.4-0.3-2.9-0.5-4.3-0.9C216.6,567.2,218.5,565.3,219,563.5z"/>
+		<path class="st6" d="M214.2,565.2c1.7,0,1.2,2.8-0.2,2.8C212.4,568,212.8,565.3,214.2,565.2z"/>
+		<path class="st6" d="M728.4,569c1.2-2.4,3.7-0.3,5.5,0c0,0.8,0.1,2.5,0.1,3.3C731.7,572.1,729.7,570.9,728.4,569z"/>
+		<path class="st6" d="M986.5,571.3c2-1.4,5.4-3.8,7.3-1c-0.4,2.5-2.3,4.6-3.4,6.9c1.7,1.4,3.8,2,6,2.5c0.6,1.6,0.6,3.7,1.9,5
+			c1.5,0.5,3.2,0.7,4.8,1.2c4.6,4,3.4,13.5-3,15c-2.8,1-5.7-0.4-8.6-0.7c-0.3,0.3-0.8,0.9-1.1,1.2c1.3,0.3,2.5,0.7,3.8,1
+			c-1.5,0.4-3,0.7-4.4,1.3c-0.4,1.9-0.5,3.9-0.7,5.8c1.8-1.1,3.5-2.3,5.3-3.4c0.3-0.6,0.8-1.7,1-2.3c0.8,3.3,3.1,5.9,5.3,8.4
+			c-3.3,2.5-6-1.1-8.2-3.2c-1.8,2.1-3.3,4.4-5,6.6c-0.8,1.3-3.5,1.2-3.7-0.7c-0.8-2.5,2.3-3,3.7-4.4c0.5-3,0-6.1-0.1-9.1
+			c-1.3-1-3.4-1.6-3.7-3.5c-0.5-1.8,0.6-3.3,1.2-4.9c1.5,0.2,3.1,0.4,4.6,0.6c2.1-1.7,4.1-3.5,5.7-5.8c-3.1-1.3-6.5-1.3-9.6-2.6
+			c-1.7-1.5,0.2-3.4,0.7-5C987.9,577.6,988.9,573.8,986.5,571.3 M989.3,579.2c-1.2,1-1.7,2.6-2.6,3.9c2.6,2,5.9,3,9.1,1.8
+			c0.1-1.2,0-2.4-0.1-3.6C993.7,580.2,991.5,579.3,989.3,579.2 M996.2,591.3c-3.3,2.2-6.8,3.9-10.8,4c-1.7,1.6-0.2,4.4,2,4.4
+			c3.3-0.3,6.5-0.8,9.8,0c2.9,0.8,6.8-1.2,6.3-4.6c-0.1-2.7,0.8-6.3-1.5-8.3C998.6,585.5,997,588.6,996.2,591.3z"/>
+		<path class="st6" d="M1011.9,570.2c3.7-0.1,7.6,0.8,9.9,3.9c-1.5,1.4-3.5,2.1-5.5,1.4C1014.3,574.3,1012.9,572.3,1011.9,570.2z"/>
+		<path class="st6" d="M154.6,571.2c1.5,0.7,3,1.5,4.5,2.2c0.1,2.5,0.1,5,0.1,7.5c-3.1-0.5-6.1-1.2-9.2-1.3
+			c-2.9,1.2,0.1,3.7,0.8,5.6c-0.9,0.5-1.9,0.9-2.8,1.4c-1.6,2.9-4.2,4.8-7,6.5c-1-0.8-1.9-1.5-2.9-2.3c2.7-2.6,5.9-4.4,9.4-5.5
+			c0.2-0.5,0.7-1.6,0.9-2.2c-2.5-1.5-4.9-5.2-2.1-7.6c2.8-0.3,5.5,0.1,8.3-0.2C154.7,574,154.7,572.6,154.6,571.2z"/>
+		<path class="st6" d="M500.5,571c1.1,1.2,2.3,2.4,3.5,3.5c1-0.7,2.1-1.3,3.1-2c1,0.4,1.9,0.8,2.9,1.2c-0.7,2.6-1.7,5.1-2.9,7.5
+			c-0.6-0.6-1.3-1.2-1.9-1.7c0.5-1.1,1-2.3,1.4-3.5c-0.9-0.6-1.9-1.1-2.8-1.6c0,0.9,0,2.7,0.1,3.6c-0.9-1.1-1.9-2.2-2.8-3.2
+			c-0.2,3.6,0.6,7.2,4,9.2l-0.8-0.6c-2.6,0.2-4.1,2.8-2,4.8c0.9,1.4,1.8,2.8,2.6,4.3c-2-0.5-3.9-1-5.9-1.5c-1.6,0.5-3.2,1-4.8,1.6
+			c-0.8-1.6-1.8-2.1-2.9-1.3c-0.8,0.6-1.5,1.1-2.3,1.7c-0.1-0.5-0.2-1.5-0.3-1.9c0.6-1.4,1.3-2.9,2-4.3c-2.1-1.2-4.2-2.2-6.5-3
+			c-0.1,0.7-0.2,2.2-0.2,2.9c-1.8,1.2-3.8,2.4-6,1.6c0.1-2.4,0.2-5.2-2.3-6.3c-1,2-1.9,4-2.9,6c-0.3-0.2-0.9-0.5-1.2-0.7
+			c-1.4-0.8-2.8-1.6-4.2-2.4c0.4-0.9,0.8-1.9,1.1-2.8l2,0.6c0.3,0.1,0.8,0.3,1.1,0.4c0.2-2,0.3-4,0.6-5.9c0.6,1.4,1.3,2.8,1.9,4.2
+			c1.6-2.7,3.3-5.3,4.7-8.1c3.7,2.4,8,3.6,12.2,4.8c0.6-0.6,1.3-1.1,2-1.7c1-0.4,2.1-0.8,3.1-1.3c0.5-0.8,1-1.7,1.4-2.5
+			C498.2,571.9,499.7,571.3,500.5,571 M481.4,576.9c-2.8,2.1-3,5.4-1.9,8.5c0.6,0.1,1.9,0.4,2.5,0.6c0.3-1.6,1.3-3.3,0.8-4.9
+			c0.6,0.2,1.7,0.5,2.2,0.7c0.2-1.2,0.1-2.5-0.3-3.6c-0.9,0.1-1.8,0.3-2.7,0.5C481.9,578.2,481.5,577.4,481.4,576.9 M495.9,588.8
+			c-0.2,0.5-0.6,1.6-0.8,2.1c2.1-0.4,4.2-0.8,6.4-1.2C500.1,587.8,497.9,588.5,495.9,588.8z"/>
+		<path class="st6" d="M223.6,573c1.8,3.5,4.1,7,4,11.1c1,0.8,2,1.7,2.6,2.9c-1.6-0.5-3.1-1-4.7-1.5c0.1-2.1,0.3-4.2,0.5-6.3
+			c-2,0.3-4.1,0.5-6.1,0.8C220.1,577,221.7,574.8,223.6,573z"/>
+		<path class="st6" d="M1260,573.2c1.6,0,3.2,0,4.8,0c-0.1,1.1-0.1,2.3-0.1,3.4c-0.8,0.4-1.7,0.8-2.5,1.2
+			C1261,576.5,1260.3,575,1260,573.2z"/>
+		<path class="st6" d="M1522,574.1c2-0.7,4.3-1.3,6.3-0.3c0.7,1.7,0.1,3.4-0.6,5C1525.8,577.2,1523.9,575.6,1522,574.1z"/>
+		<path class="st6" d="M209.2,575.3c1.5,0,3.1,0,4.6,0.2c1.3,0.6,1.6,2.2,2.3,3.3c-2.2,0-4.5,0-6.7,0
+			C209.3,577.6,209.2,576.4,209.2,575.3z"/>
+		<path class="st6" d="M393.6,576.5c2.1-0.7,3.3,1.3,4.7,2.4c0,4.2,0.1,8.4,0.1,12.6c-3.1,1.5-7.2,3.1-6.9,7.3
+			c1.5,0.6,3,1.2,4.5,1.8c-0.4,1.7-0.4,3.7-2.1,4.6c-1.6-0.7-2.8-2.1-4-3.3c-1.5,0.5-3,1-4.4,1.8c-0.5,2.1,0.1,4.7,2,6
+			c2.6,1.2,6.1,1.2,6.4,4.9c-3.7-0.1-7.4-0.6-11.1-1.2c-1.9,3.6-4.7,6.6-7.8,9.2c0.3-4.6,5.2-6.5,7-10.5c1-0.4,2.1-0.9,3.1-1.3
+			c-0.6-2.3-1.3-4.6-2-6.9c-3.2,3.3-6.4,7.9-11.5,8c0-2,0-3.9,0-5.8c3.6-0.5,7.5-1.4,10-4.3c0.7-2,1.1-4,1.8-5.9
+			c1,1.3,2,2.6,3.1,3.9c1.2-0.3,2.4-0.7,3.6-1c-0.9-2.6-2.8-5.3-1.5-8.1c2-0.3,3.7,1.2,5.6,1.8c1.1-1.3,2.2-2.8,2.5-4.5
+			C395.3,584.1,391.9,580.7,393.6,576.5z"/>
+		<path class="st6" d="M734.7,578.6c1.1-0.2,2.1-0.4,3.2-0.6c0.8,3.6,1.4,7.2,1.9,10.8l-0.8,0.7c-1.1-0.6-2.2-1.1-3.2-1.7
+			c0.6-0.5,1.8-1.4,2.5-1.8c-0.4-1.4-0.7-2.8-1-4.3c-1.8,2.6-3.9,5.1-6.6,6.8c0.3-1.6,0.7-3.3,1.2-4.9
+			C732.8,581.9,733.8,580.2,734.7,578.6z"/>
+		<path class="st6" d="M717.9,582.9c-0.3-1.9,0.8-3.8,2.9-2.6C722.1,582.4,719.5,583,717.9,582.9z"/>
+		<path class="st6" d="M706.7,583.2c2-0.3,4-0.6,6-1c-1.1,1.8-1.9,3.7-2.3,5.7C707.6,588,705.9,585.8,706.7,583.2z"/>
+		<path class="st6" d="M0,586.9c0.8-0.3,1.5-0.7,2.3-1c0.6,1,1.3,2,2,3c1.5,1.3,3.5,0.3,5.1-0.3c2.2,1.5,4.9,1.6,7.5,2
+			c-2.2,0.1-4.4,0.5-5.9,2.2c1.4,0.9,2.9,1.8,4.3,2.9c0.1,0.3,0.3,0.9,0.4,1.2c-0.9-0.1-1.8-0.3-2.7-0.4c-0.3,1.3-0.6,2.5-0.8,3.8
+			c0.4,0.9,0.9,1.8,1.4,2.8c-3.3,0.4-6.6,1.1-9.9,2c-1.9-2.1-3.2-4.5-3.8-7.3V586.9 M2.5,600.7c0.7,2.3,4.1,3,5.9,1.7
+			c3.6-1.4,2.6-5.9,3.2-8.9c-2.5-1.4-5.2-2-8.1-2.1C2.6,594.4,2.1,597.6,2.5,600.7z"/>
+		<path class="st6" d="M791.6,586.8c0.7-0.1,2-0.4,2.7-0.6c0.4,2.8,0.5,5.6,0.4,8.3c-0.8,0.1-2.4,0.5-3.1,0.6
+			C791.6,592.4,791.7,589.6,791.6,586.8z"/>
+		<path class="st6" d="M1240.1,589.8c-1.1-2.1,2.7-2.7,4-3.7C1244.1,588.4,1242.6,590.5,1240.1,589.8z"/>
+		<path class="st6" d="M1723.2,590.5c0.4-1.4,0.9-2.7,1.4-4c1.3,2.1,3.9,2.2,6.1,2.4c-1.4,2.4,0.8,4.2,2.2,5.9v1.9
+			c-2.1,0.1-4.2-0.5-6-1.5c0.9-1,1.8-2,2.6-3.1c-1.5-1.2-3.4-0.6-5.1-0.6C1724.1,591.2,1723.5,590.7,1723.2,590.5z"/>
+		<path class="st6" d="M453.6,586.5c0.8,0,2.3,0,3.1-0.1c-1,2-0.4,5.4-2.7,6.5c-1.2-1.2-0.4-3.7-0.6-5.3L453.6,586.5z"/>
+		<path class="st6" d="M724.2,587.1c0.7,0,2.1,0,2.8,0c-0.2,1.5-0.6,3-1.6,4.1C725,589.9,724.6,588.5,724.2,587.1z"/>
+		<path class="st6" d="M1177,587.2c1.3,0,2.6,0,3.9,0c-0.1,1.3-0.1,2.6-0.2,3.9C1178.4,590.9,1177,589.5,1177,587.2z"/>
+		<path class="st6" d="M732.2,588.5c0.8,1,1.6,2.1,2.5,3.1c1.4,0.2,2.8,0.4,4.2,0.6c0,0.3,0,0.9,0,1.2c-1.7,0.1-3.6-0.5-5.1,0.3
+			c-2,3.1-2.8,7-5.6,9.5c-3.1,2.8-6.6,5.1-10.2,7.2c-2.3-0.4-3.3-3.3-5.1-4.6c-2.7-0.1-5.1,1.8-6.2,4.2c-0.1,1.5,1.3,2.5,1.9,3.7
+			c1.9-0.6,3.8-1.1,5.7-1.6c0,1.6-0.1,3.1-0.1,4.7c0.3,0.5,1,1.4,1.3,1.8c-0.7,2-1.3,4-2,6c-1.1-0.1-2.2-0.2-3.3-0.2
+			c0.2,0.7,0.4,1.4,0.6,2.2c0.2,0.9,0.6,2.8,0.9,3.8c0.9-0.8,1.9-1.5,2.7-2.4l0.5,0.2c0.8,1.4,1.6,2.7,2.5,4.1
+			c-1.4,2.3-3.5,3.9-5.5,5.8c-0.6,1.8,0.5,3.6,0.8,5.3c-0.2,0-0.8,0.1-1,0.2c-0.2,1.2-0.4,2.5-0.5,3.8c-0.2-0.5-0.7-1.4-1-1.8
+			c-1.3,0.2-2.6,0.3-3.9,0.5c-1.3-1.5-2.7-3-4-4.5c-0.7,1.5-1.3,3-2,4.6c-1.1-1.6-2.2-3.2-3.4-4.9c-1.9,0.6-3.7,1.2-5.5,2
+			c-1.6-0.4-3.2-0.8-4.8-1.2c1.1-1.4,2.2-2.8,3.3-4.2c-1.4-0.9-2.8-1.7-4.2-2.6c0-4.1,0.4-8.3,1-12.3c0.4,4,0.6,7.9,1,11.9
+			c1,0.6,2.2,1.1,3.3,1.6c-0.1-1.5-0.2-2.9-0.2-4.3c1.4,0.9,2.8,1.9,4.2,2.8c-0.5,1-1.1,2-1.6,3c4.2,2,9.6,1.6,12.7,5.4
+			c-0.8,2.6,3.4,2.5,1.9,0c0.6,0.1,1.7,0.3,2.3,0.5c-0.2-3.3,0-7.3-3.8-8.6c-0.3-0.7-0.5-1.3-0.8-1.9c-0.9-2.2-1.7-4.4-2.7-6.5
+			c2.3,1,4.6,1.9,7,2.7c-0.5-1.7-1.2-3.5-1.4-5.2c0.5-2.2,2.1-3.9,3.3-5.8c-1.2-0.1-2.3-0.3-3.5-0.4c-0.1-0.9-0.5-2.7-0.6-3.6
+			c-3.1,0.5-6.3,3-6.4,6.3c1.7-0.1,3.3-0.7,4.9-1.2c-1.3,3.2-5,1.8-7.6,1.6c-1.2,3.5-1.8,7-3,10.5c-0.7,0.3-2.2,0.9-3,1.2
+			c-0.3-5.7,1.3-12.2,6.7-15.1c1.4-3.2,4.3-5.3,6.2-8c1.2-1.5,2.1-3.3,3.9-4.2c4.1-1.4,8.6-1.5,12.9-0.9c2.3,0.6,4-1.3,5.4-2.8
+			c-0.3-1.5-0.8-2.9-1.2-4.3c0.8-1.2,1.7-2.3,2.5-3.5c1.2-0.3,2.5-0.6,3.8-0.9C732.6,591.5,732.4,590,732.2,588.5 M707,629.6
+			c0,1.4,0.1,2.9,0.1,4.3c1-0.3,2-0.7,3-1C710.4,630.5,709.2,629.5,707,629.6 M711.4,631c-0.8,1.5-1.5,2.9-2.3,4.4
+			c1.7-0.4,3.8-0.6,4.6-2.4C714.5,631,713,631,711.4,631z"/>
+		<path class="st6" d="M311.2,597.3c0.6-2.6-0.6-5.4,0.8-7.7c2.9-0.1,3.6,3.5,2,5.4c-1.8,2.2-4.2,3.9-5.6,6.4
+			c-1.2-1.4-2.6-2.8-4.2-3.9c-0.2,2.4-0.7,4.9-0.3,7.4c0.8,2.9,3,5.2,3.9,8.1c-0.1,1.6-0.5,3.2-0.9,4.8c-0.7,0-1.9,0-2.6,0.1
+			c0.6-4.2-0.6-8.3-2-12.1c-0.7-0.3-2-0.8-2.7-1.1c2.3-3.3,2.7-7.6,4.8-11C306.6,594.9,308.8,596.3,311.2,597.3z"/>
+		<path class="st6" d="M1465.6,592.2c0.7-1.7,3-0.7,4.4-1.1c-1.2,2.2-2.1,4.5-2.7,7C1465.3,596.9,1465.4,594.3,1465.6,592.2z"/>
+		<path class="st6" d="M1248.1,595.8c0.4-1.2,0.2-3.5,2-3.4c1.8-0.7,3.5,1.3,2.3,2.9C1250.9,595.7,1249.5,595.7,1248.1,595.8z"/>
+		<path class="st6" d="M1166,598.7c0-3.1,2.7-5.4,5.7-5.5c2.1,1.5,0,4-1.1,5.4C1169,598.8,1167.5,598.7,1166,598.7z"/>
+		<path class="st6" d="M135.2,593.7c1.4,1.6,2.4,3.4,2.9,5.5c-1.1,0.5-2.2,0.9-3.3,1.4c1.4,2.5,2.5,5.2,3.9,7.8
+			c1.4,2.8,4.4,4.3,6.5,6.5c0.6,2.4,0.5,4.8,0.7,7.2c1-0.6,2.1-1.2,3.1-1.8c0.1,0.7,0.4,2,0.6,2.6c0.6,0,1.9-0.1,2.5-0.2
+			c-2.3,1-6.2,1.8-5.2,5.3c0.3,0.3,0.9,1,1.2,1.3c2.7-0.6,5.3-1.6,8-2c0.3-1.2,0.7-2.4,1-3.6c0.2,2.2,0.3,4.5,0.2,6.7
+			c-1.8-0.1-3.9-0.9-5.6,0.1c-1.2,1.9-0.2,4.2-0.1,6.3c1.7-1,3.5-1.9,5.2-2.9c-0.2,1.3-0.3,2.5-0.4,3.8c-3.4,0.5-7.6,1.1-10.3-1.7
+			c-0.7-2-0.3-4.2-0.7-6.3c-1.8-1.8-4.2-3-5.4-5.3c0.2-0.3,0.8-1,1-1.3c0.9,1.3,1.8,2.5,2.7,3.8c1-1.5,2-3.2,1.1-5
+			c-0.5-0.3-1.4-0.8-1.9-1.1c-4.9-3.2-5.7-9.3-9-13.7c-0.1-3.5-0.4-7.2,1.6-10.4C135.3,595.8,135.2,594.7,135.2,593.7 M143.9,617.9
+			c0.5-2.6-1.4-4.9-4.1-4.4C138,616.4,141.4,618.1,143.9,617.9 M147.5,631.4c-0.3,0.5-0.9,1.4-1.2,1.9c0.4,0.8,0.7,1.5,1.1,2.3
+			c0.6,0,1.8,0.1,2.3,0.1c0-1.5-0.1-3-0.1-4.4C149.1,631.3,148.1,631.4,147.5,631.4z"/>
+		<path class="st6" d="M687.7,593.5c2.9-0.4,3.7,2.8,5,4.7c-0.4,0.3-1.2,0.8-1.6,1.1c0.2,1.6,0.5,3.3,0.6,4.9
+			C688.4,601.6,687.5,597.4,687.7,593.5z"/>
+		<path class="st6" d="M145,597c1.4-1.3,4.3-2.7,5.6-0.6c0.9,3.4-2.5,5.4-4.7,7.3c0.7,0.2,2.2,0.7,3,0.9c0.2,2.3-0.5,4.6-3.3,4.4
+			c-0.2-0.7-0.7-1.9-0.9-2.6c-1.8-1.2-4.3-2.1-5.3-4.3c-0.1-2.1,2.5-2.7,4.1-2.9c-0.8,1.1-1.6,2.2-2.4,3.3c0.5,0.3,1.4,1,1.9,1.3
+			c2.4-1.7,5.4-3.2,6.3-6.3C147.8,597.3,146.4,597.2,145,597z"/>
+		<path class="st6" d="M807.8,603.7c2.3-2.6,4.2-5.5,5.8-8.5c1.5,1.6,3,3.2,4.2,5c-1.4,1.4-3.3,2.4-4.6,3.9
+			c-1.6,2.4-2.6,5.2-4.4,7.5c0-3.6,2.6-6.4,2.8-9.9c-1.3,1.3-2.5,2.6-3.6,3.9c-1.7-0.4-3.4-0.7-5.1-1.1c0.1-0.3,0.3-1,0.4-1.4
+			C804.8,603.2,806.3,603.4,807.8,603.7z"/>
+		<path class="st6" d="M937.9,595.5c1.5,0,2.9,0.1,4.4,0.1c0.4,1.3,0.9,2.5,1.3,3.8c-2.5,0.1-4.9-0.2-7.1-1.2
+			C936.8,597.6,937.5,596.2,937.9,595.5z"/>
+		<path class="st6" d="M1459.9,598.6c0.5-1.5,1.3-3,3.2-2.9c-0.1,0.8-0.3,2.3-0.4,3.1C1462.1,598.8,1460.7,598.7,1459.9,598.6z"/>
+		<path class="st6" d="M703.5,597.1c1.7,0.4,3.4,0.8,5.1,1.2c0,1.5,0,2.9,0.1,4.4c-2.2,0.1-4.4,0.1-6.4-0.6
+			C702.7,600.5,703.1,598.8,703.5,597.1z"/>
+		<path class="st6" d="M27,598.6c0.6,0,1.7-0.1,2.2-0.2c0.2,2.7-0.1,5.4-0.7,8.1l-0.7-2c-0.1-0.3-0.3-0.9-0.4-1.2
+			c-1.1,0.2-2.3,0.4-3.4,0.6c0.7-0.9,1.4-1.8,2.1-2.6c-1.4-0.8-2.8-1.6-4.2-2.4l0.7,0C24,598.8,25.5,598.7,27,598.6z"/>
+		<path class="st6" d="M202.6,598.5c0.9-0.1,1.8-0.1,2.7-0.2c0.6,1.5,1.2,3,1.8,4.4c1.3,0.4,2.6,0.9,3.9,1.4c-1,1.6-2.3,3.2-4.3,3.3
+			c-1.1-0.5-2.1-1.3-3.2-1.9c-0.9,5.1,0.7,10.1,1.4,15.1c-1.1-0.1-2.3-0.2-3.4-0.3c-2.7-2.4-5.6-4.5-8.4-6.8c1.4-1,2.9-1.9,4.3-2.8
+			c-0.3,1.4-0.8,2.7-1.2,4.1c1.5,0.7,3.1,1.4,4.6,2c0.8-3.8,1-7.7,0.9-11.5c-1.4-0.3-2.7-0.5-4.1-0.8c1.4-0.3,2.8-0.6,4.2-0.9
+			C202.1,602,202.4,600.3,202.6,598.5z"/>
+		<path class="st6" d="M464.6,598.1c1.7,0.9,2.3,2.5,2.1,4.4c-1.9,0.1-3.8,0.2-5.7,0.4C462.2,601.3,463.4,599.7,464.6,598.1z"/>
+		<path class="st6" d="M1529.2,597.9c1.4,0.1,3-0.2,4.1,1c-0.4,1.3-1.7,1.7-2.9,2.1C1529.9,600,1529.5,599,1529.2,597.9z"/>
+		<path class="st6" d="M152.4,600.7c2.1-0.5,4.1-1.1,6.2-1.7c0,1.2-0.1,2.5-0.1,3.7c-0.6,0.4-1.8,1.2-2.4,1.5
+			c0.2,1.1,0.3,2.3,0.5,3.4c-1.5,0-3,0-4.6,0C151.3,605.3,151.5,602.9,152.4,600.7z"/>
+		<path class="st6" d="M1171.3,600.2c0.7,0,2,0,2.7,0.1c0,1.3,0.1,2.5,0.1,3.8c-0.7,0.1-2.1,0.3-2.8,0.4c-0.6,0.8-1.1,1.6-1.6,2.5
+			c-1.7-0.2-4-0.4-3.5-2.7c1.4-0.8,3-0.9,4.6-1.3C1170.8,602.2,1171.2,600.9,1171.3,600.2z"/>
+		<path class="st6" d="M840.9,607.5c1.4-2.5,3.2-4.7,4.9-7.1c0.6,1.6,1.3,3.2,1.8,4.9c1.8,0.8,3.6,1.7,4.7,3.4
+			C848.5,608.8,844.7,608.3,840.9,607.5z"/>
+		<path class="st6" d="M472,604.6c1.2-0.5,2.4-1,3.7-1.5c0.5,2.2,0.9,4.5,2.3,6.5c-1.4,0-2.8,0.1-4.2,0.1c-0.6-0.8-1.2-1.5-1.8-2.3
+			c-0.3,0.3-0.9,0.9-1.2,1.2c-1.1-1.4-2.5-2.7-3-4.5C469.2,604.1,470.6,604.3,472,604.6z"/>
+		<path class="st6" d="M464,605.2c0.7-0.1,2.2-0.2,3-0.2c-0.6,1.4-0.5,3.4-2,4.3C463.2,608.5,463.4,606.6,464,605.2z"/>
+		<path class="st6" d="M791.6,606.9c2.2-0.6,4.5-1.2,6.7-1.8c-0.1,0.6-0.4,1.9-0.5,2.6c-1.2,0.6-2.4,1.2-3.6,1.8
+			c0.6,0.8,1.1,1.5,1.7,2.3c1.2-0.6,2.3-1.3,3.5-1.9c-1.2,1.7-2.5,3.3-3.8,4.8c0.1,1.9,0.2,3.8,0.4,5.7c-1.1,0-2.2,0-3.3,0
+			c1.3,1.4,2.8,2.7,4.4,3.8c0.7-2.6,1.3-5.2,2-7.8c0,2.4,0.6,5-0.4,7.3c-1.7,2.5-4.5,4.1-7,5.7C791.4,622,791.8,614.4,791.6,606.9z"
+			/>
+		<path class="st6" d="M1531.2,607.8c-1-0.5-1.5-2.4-0.2-2.9c0.8,0.1,2.3,0.2,3.1,0.2C1533.2,606,1532.7,607.8,1531.2,607.8z"/>
+		<path class="st6" d="M690.3,607.3c1.5,0,2.9,0,4.4,0c0.6,2.3,0.8,4.8-0.7,6.8c0.7,1,1.3,1.9,2,2.9c-2.2,0.5-4.3,0.9-6.5,1.3
+			C689.7,614.6,691,611,690.3,607.3 M691.2,614.2c-0.5,1.6,0,2.2,1.6,1.7C693.3,614.3,692.8,613.7,691.2,614.2z"/>
+		<path class="st6" d="M212.2,608.2c1.5,0,3,0.1,4.5,0.1c0,0.6-0.1,1.8-0.1,2.4c-1.4,0-2.9,0-4.3,0
+			C212.3,610.1,212.3,608.9,212.2,608.2z"/>
+		<path class="st6" d="M1270.1,608.1c0.8-0.2,2.4-0.6,3.2-0.8c1,1.7,1.9,3.5,2.7,5.4c1.6-1.1,3.1-2.1,4.7-3.1
+			c1.3,3.4,2.5,6.8,3.6,10.2c-0.4,0.1-1.3,0.3-1.7,0.4c-0.8-1.2-1.6-2.4-2.4-3.6c-0.6,0.3-1.8,1-2.5,1.4c0-0.5-0.1-1.4-0.1-1.8
+			c-2.8,2.4-5.5,5-8.8,6.6c-2.2-1-3-3.9-4.4-5.8c2-0.9,3.9-1.7,5.9-2.6C1270.3,612.3,1270.2,610.2,1270.1,608.1 M1268.4,616.4
+			c-0.1,1.5-0.2,3.1-0.3,4.6c2.5-0.8,4.7-2.2,6.4-4.2C1272.5,616.2,1270.4,616.2,1268.4,616.4z"/>
+		<path class="st6" d="M492.4,608.6c5.1-0.3,9.9,3.3,15,1.4c0,0.9,0,2.7,0,3.6c-1.4,0.2-2.8,0.4-4.2,0.6c1.4,0,2.8,0,4.3,0l0,1.7
+			c-2.8-0.1-5.5-0.2-8.3-0.4c0.2,1.2,0.5,2.5,0.8,3.7c-1.5-0.9-2.9-1.9-4.4-2.8c1.4-1.3,1.2-3.1,1.4-4.8c-1.3-0.6-2.6-1.1-3.8-1.8
+			L492.4,608.6z"/>
+		<path class="st6" d="M929.3,608.8c3.2,2,5.3,5.5,8.8,7.1c5.6,0.6,11.2,0,16.8,0.1c-2.3-1.8-4.5-3.7-5.8-6.2
+			c3.2-0.1,6.4,0.3,9.5,1.2c-0.8,1.7-1.5,3.5-2.2,5.2c3.3,0.1,6.7,0.1,10-0.3c1-1.1,1.5-3.3,3.4-3.1c1.8,1.4,3.7,3.1,4.7,5.3
+			c-0.6,2.4-1.6,4.7-2.1,7.2c0-2.9,0-5.7,0.1-8.6c-30.5,1.1-61,0.5-91.5,0.6c-13.2-0.2-26.4,0.4-39.5-0.5v-0.6c13.5,0,27-0.2,40.5,0
+			c0.8-0.6,1.6-1.1,2.4-1.7c6.8,3,14.4,1.2,21.5,1.6c0.7-1.2,1.4-2.4,2.2-3.6c2.2,0.4,3.6,2.2,5.2,3.5c2.9,0.1,5.9,0.1,8.9,0.1
+			c0.6,0,1.9,0,2.5,0c1.8,0,3.7-0.1,5.6-0.1c-1.2-0.7-2.4-1.4-3.6-2.1C927.6,612.2,928.4,610.5,929.3,608.8z"/>
+		<path class="st6" d="M15.7,613.8c2.2-1.2,4.5-2.1,6.4-3.7c1.7,1,3.4,1.9,5.1,2.8c0.9,0.4,1.7,0.9,2.6,1.3c0.2,8-0.2,15.9-0.3,23.8
+			c-0.6,0.5-1.7,1.5-2.3,2c-0.5-0.4-1.5-1.2-2-1.6c-0.9-3.5-1-7.1-2.7-10.4c1.4-0.8,2.8-1.6,4-2.5c0.2-1.8-1.1-3.2-1.9-4.7
+			c-0.7,1.2-1.4,2.4-2.2,3.5c-0.3,0.2-0.8,0.5-1,0.6c2.1-4.2-1.7-7.6-3.8-10.8c-0.5,2.8-0.7,5.8-1.6,8.6l-0.1-0.8
+			c-0.2-1.3-0.5-2.6-0.8-4C15.1,616.8,14,614.7,15.7,613.8 M23.3,615.8c1.6,3.1,3,6.4,5.8,8.7c0.2-2.9,0.3-5.8,0.4-8.7
+			C27.5,614.5,25.1,613.4,23.3,615.8z"/>
+		<path class="st6" d="M471.5,610.3c2.6,0,4.9,1.8,7.3,2.8c-0.5,0.7-1,1.5-1.3,2.2c0.8,3.6,3.6,6.2,6.6,8.1c-1.2,0-2.5,0.1-3.7,0.2
+			c0.1,0.9,0.2,1.8,0.3,2.8c0.4,0.2,1.1,0.5,1.5,0.7c-0.4,0.3-1.3,1-1.7,1.3c-1.5,0.3-3,0.5-4.4,0.8c1.4,1.6,3.2,2.7,5.1,3.7
+			c0.8-1.3,1.5-2.7,2.2-4.1c0.8,1.9,1.7,3.8,2.3,5.7c0.1,1,0.2,3,0.3,4c1.2-0.4,2.3-0.8,3.5-1.2c0.6-0.2,1.8-0.4,2.4-0.6
+			c1.5,1.2,3,2.5,4.5,3.7c0.4,1.4,0.9,2.7,1.3,4.1c0.1,0.4,0.4,1.1,0.5,1.5c0.8,1.3,2.1,3.7,3.9,2.1c2.7-1.9,6-2.5,9.2-2.5
+			c0.2,1.6,0.4,3.2,0.6,4.9c-0.8,0.1-2.3,0.2-3.1,0.3c-0.1,0.5-0.4,1.5-0.5,2c0.6,0,1.7-0.1,2.2-0.1c-0.9,0.8-1.8,1.7-2.8,2.5
+			c-1.3-1.4-2.1-4.6-4.5-2.9c0,1.8,0.5,3.5,0.8,5.2c0.2,1.2,0.3,2.4,0.4,3.6c-0.2,0.4-0.7,1.1-0.9,1.5c-1.1-0.7-2.2-1.4-3.4-2.2
+			c0.3,1.1,0.5,2.1,0.8,3.2c-0.9,0.5-1.8,0.9-2.6,1.4c-0.2-1.7,1-4.2-1-5.1c-1.3-0.4-2.7-0.6-4.1-0.9c1.3,2,3.2,3.8,3.2,6.4
+			c-2.4-0.1-3.5-2.3-4.7-4c-0.5-1.3-0.9-2.6-1.3-3.9c-1,0.2-1.9,0.3-2.8,0.5c-0.4-2.2-0.9-4.3-1.5-6.4c1.2,0,2.3-0.1,3.5-0.1
+			c-0.1-1.1-0.2-2.2-0.3-3.3c-2.1,0.5-4.2,1-6.3,1.6c0.7,0.6,1.4,1.1,2.1,1.8c-2.5-0.5-5.1-0.9-7.5,0c0.3-0.5,0.9-1.5,1.2-2
+			c-0.7,0.1-2.2,0.2-2.9,0.2c1.6-1.2,2.6-2.9,3.5-4.6c0.8,0,1.5,0.1,2.3,0.2c0.2,0.5,0.6,1.6,0.8,2.1c1.8-0.3,3.6-0.8,5.4-0.7
+			c1.6,0.3,2.5,1.8,3.6,2.7c-0.1,0.7-0.4,2.1-0.5,2.8c1.5,0,3,0.1,4.5,0.1c-2.6,0.6-5.2,1.3-7.8,2.1c2.7,2,6.2,0.7,9.2,1.3
+			c1.3,0.5,2.6,1.3,3.9,2.1c-0.8-4.4-1.2-9.6-5.6-12.1c0.1-1.2,0.2-2.3,0.3-3.4c-1.3-0.6-2.8-2.6-4-0.7c0.2,1.2,0.5,2.4,0.9,3.6
+			c0.4,0.1,1.3,0.3,1.7,0.4c-0.4,0.7-1.3,2.1-1.7,2.8c-2.5-2.2-2.5-5.5-3.3-8.4c-1.2-0.3-2.4-0.5-3.7-0.7c-0.7-2.1-1.2-4.4-3.2-5.6
+			c-0.4,3.2-0.5,6.4-0.6,9.6l-0.9-0.3c-0.3-3.3-0.4-6.6-0.7-9.9c-0.8,1.8-1.5,3.6-2.3,5.4c-0.7-0.4-2.1-1.2-2.8-1.7
+			c-1.4,0.7-2.8,1.4-4.3,2c-0.1-0.9-0.3-1.8-0.4-2.7c-0.3-2-0.7-3.9-1.1-5.9l1.2,0.2c1.7,1.4,3.5,1.5,5.3,0.1
+			c-1.6-1.8-3.2-3.6-5.1-5c-1.4,0.6-2.6,1.4-3.9,2.1c-0.1-1.2-0.2-2.4-0.1-3.6c0.3-0.4,1-1.2,1.3-1.5l1,0.9c2,1.4,4,2.7,6,4
+			c1.2-0.7,2.3-1.4,3.5-2.1c-0.5-1.4-1-2.8-1.5-4.1c-1.6,0.1-3.3,0.2-4.9,0.3c-0.5-2.2-1.1-4.5-1.7-6.7c-0.5-0.3-1.6-1-2.1-1.3
+			l0-0.1C469.4,612.2,470.4,611.2,471.5,610.3 M472.1,614.1c0.3,1.5-0.2,3.5,1.4,4.3c1.1,0.2,2.2,0.3,3.3,0.4
+			C476.8,616.1,475,613.9,472.1,614.1 M474.3,633.3c-1.5,1.3,0.8,3.7,2.2,2.2C477.8,634.2,475.6,631.9,474.3,633.3z"/>
+		<path class="st6" d="M1018.1,614.7c1.4-1.1,2.8-2.1,4.2-3.1c0.1,13.4,0.1,26.8,0.1,40.1c-0.7,2-1.1,4.5-2.9,5.9
+			c-1.8,1.5-3.6,2.9-4.7,5c1.7,0.1,3.5,0.2,5.2,0.2c-1.7,1-3.4,1.8-5.1,2.7c0.7,2.1,1.7,4.2,2.7,6.1c1.6-0.9,3.1-1.8,4.7-2.6
+			c0,3.2,0.1,6.4-0.1,9.5c-0.3,0.4-0.8,1.2-1.1,1.6c0.4-2.7,0.1-5.4-0.7-8c-2.4,2.5-6.5,5-5,9.1c1.6,0.1,3.2,0.1,4.8,0.2
+			c-0.3,1.6-0.5,3.2-0.7,4.8c-2.9,1.2-5.1,3.4-6.6,6.1c1.8,0.4,3.8,0.2,5.2,1.6c-0.5,1.9-1.3,3.7-2,5.5c2,0.2,3.9-0.2,5.7-0.9
+			c0,0.4-0.1,1.3-0.2,1.7c-6.2,1.9-12.3-2.1-17.1-5.5c1.7-0.2,3.5-0.4,5.2-0.7c2.1-1.5,3-4.1,4.4-6.2c-0.8-0.7-1.6-1.3-2.3-2
+			c3.2-5.5,2.8-12.2,2.2-18.3c-1.3,0.5-2.6,1-3.9,1.5c1.8-2.3,3.6-4.8,4.4-7.7c-2.5-1.5-4.9-3.4-7.6-4.6c-2.7,1.3-5.3,2.9-8.4,2.5
+			c-0.1-3.2,1.2-6,4.3-7.3c-1.2-1.5-2.5-3.1-4.2-4.2c-4-2.2-8-5.5-8-10.5c4.3,1.7,7.5,5.5,11.9,7c2.8,1.2,6-0.5,8.9,0.2
+			c1.1,0.9,1.7,2.3,2.3,3.6c-2.5,1-5.2-2.5-7.3-0.2c0.5,2.8,1.9,5.4,4.2,7.2c0.8-0.6,1.6-1.2,2.4-1.8c0.9,1.8,1.8,3.6,2.8,5.4
+			c1.5-1.2,3.1-2.3,4.4-3.7c-0.5-1.3-1.1-2.4-1.7-3.6c4.3-2.2,2.5-7.4,2.7-11.3c-0.5-6,1.6-12.7-1.8-18.1c0.7-1.6,1.4-3.1,2.2-4.7
+			C1020.5,616.3,1019.3,615.5,1018.1,614.7z"/>
+		<path class="st6" d="M1716.8,616.2c0.5-1.9,1.4-3.7,3.4-4.5C1720.8,614.4,1719.7,616.7,1716.8,616.2z"/>
+		<path class="st6" d="M0,615.2c1.3-0.3,2.6-0.5,3.9-0.8c1.3,1,2.6,1.9,3.9,2.9c0.7-0.8,1.5-1.5,2.2-2.3c0.4,3.3,1.1,6.6,2,9.8
+			c1.1-0.2,2.2-0.3,3.3-0.5c-0.4,0.9-0.9,1.8-1.3,2.7c0.8,0.1,2.5,0.3,3.3,0.4c-0.6,1-1.1,2.1-1.7,3.1c-1.1-0.3-2.1-0.6-3.2-0.9
+			c-0.9,1.8-1.9,3.7-2.8,5.5l-1.1,0.3c-1.5,0.8-2.8,2-3.9,3.3c2.4,0.8,4.8,1.5,7.2,2.3c-0.6,2.2-1.1,4.4-1.7,6.6
+			c2.7,2.8,5.4,8.6,1.2,11.3c-2.4-2.1-5.1-4-6.6-6.9c2,1.3,4.2,2.3,6.3,3.2c-0.6-1.8,0.1-4.7-2.2-5.2c-1.7-1.2-3.5-0.3-4.9,0.8
+			l0,0.2c-0.2-0.3-0.5-0.9-0.7-1.2c-1.1-0.4-2.2-0.7-3.3-1V648c1.9,0,3.8,0,5.7,0.1c-0.8-1.4-1.6-2.7-2.4-4.1
+			c-1.1,0.6-2.2,1.2-3.3,1.8v-17c1.9-0.9,3.7-2,4.7-3.9c0.2,1.7,0.4,3.4,0.7,5.1c-1.4,0.1-2.9,0.2-4.3,0.4c0.4,1.8,0.2,4.3,2.3,5.1
+			c2.1,0.1,5.1,0,6-2.2c0.4-3-0.2-6.2-1-9.1c-1.5-2.2-3.9-3.6-6-5.3c0.5-0.7,0.9-1.5,1.4-2.2c-1.2-0.3-2.5-0.6-3.7-0.8V615.2
+			 M5,618.2c0.7,1.5,1.6,2.9,2.8,4c0.3-1.3,0.7-2.6,1-3.9C7.6,618.2,6.3,618.2,5,618.2z"/>
+		<path class="st6" d="M311.8,614.3c0.6,0.1,1.9,0.2,2.5,0.3c1.6,1.5,3.7,2.4,5.9,3c-1.2,2.5-2.4,5.1-3.5,7.6
+			C316.6,620.9,313.2,618.1,311.8,614.3z"/>
+		<path class="st6" d="M1451.1,621c0.5-2.5-0.3-6,2.6-7.2c-0.9,3-1,6.2-1.5,9.3c-2,2.1-4.4,3.8-6,6.3c3.2-0.2,6.4,0.4,9.2,2.2
+			c0.5-1.6,1-3.3,1.5-4.9c3.8-0.1,7.1-1.8,9.4-4.8c-0.6,1.5-1.1,3-1.9,4.5c-2,0.9-4.1,1.4-6.2,1.9c4.3,4,9.6,6.7,14.9,9.1
+			c2.6,0.8,6.7,1.3,8.2-1.5c0-3.9-4.5-5.1-6.6-7.8c-2.1-1.7-1.5-4.5-0.9-6.7c1.3,3.3,1.9,8.3,6.2,8.8c4.1,0,8-1.4,12-2.2
+			c-1.2-1.6-2.9-3.2-2.2-5.5c1.2,1.2,2.4,2.4,3.7,3.7c2.7-0.2,5.2,0.8,7,2.9c0.9,0.9,1.9,1.7,2.7,2.7c0,0.3,0,0.9-0.1,1.2
+			c-1.2-0.9-2.4-1.7-3.7-2.6c-1.1,0.8-2,2.2-3.4,2.6c-2.1-0.7-4-2-6.1-2.4c-1.6-0.2-2.9,1.1-4.2,1.8c1.5,0.3,3,0.6,4.5,0.9
+			c0.1,0.3,0.3,1,0.4,1.4c1.6,0.6,3.3,1,4.7,1.9c1.6,1.6,2.1,4,3,6l-1.5,0c-0.9-1.8-1.7-3.6-2.4-5.4c-3.2-0.4-6.4-0.7-9.6-1
+			c-0.3,1-0.5,2-0.8,3.1c-3.2,0.5-6.5,1.7-9.7,1c-5.4-2.4-9.7-6.9-15.7-8c0.3,1.6,0.7,3.3,1.1,4.9c1.7,0.1,3.4,0.2,5.2,0.3
+			c0.3,1.6,0.5,3.3,0.4,5l-1.3,0c0.1-0.7,0.3-2,0.5-2.6c-2.2-0.5-4.7-0.5-6.6-1.7c-0.6-1.4-1-3-1.5-4.5c-4.5,0.7-6.2,5.5-7.6,9.2
+			c1.9,0.1,3.9-0.2,5.8-0.4c-2.6,3.1-3,7.2-4.4,10.9c-0.5,0.1-1.4,0.2-1.9,0.3c-0.4-1.5-0.7-2.9-1.1-4.4c-0.7,0.2-2.2,0.7-2.9,0.9
+			c0.7-4.4-3.5-7.4-5.5-10.8c-0.2,2.2-0.3,4.3-0.2,6.5c-1.6,0.7-3.3,1.3-4.9,1.8c-0.3-0.7-0.8-2.1-1-2.8c1.4-1.6,2.8-3.2,4.1-4.9
+			c0.9-1.4,1.8-2.8,2.7-4.2c1.2,0.5,2.8,0.5,3.6,1.7c0.2,2-0.8,4.2,0.9,5.8c4.5,0.6,4.8-4.9,6.7-7.8c-1-0.6-1.9-1.1-2.9-1.7
+			c-0.5-0.9-0.9-1.7-1.3-2.6c-3.8-0.6-7.9-1.7-11.5,0.3c-2.5,1.7-3.5-2-4.2-3.7c0.2-1,0.4-1.9,0.6-2.9c2.4,4.8,8.2,3.5,12.5,3.6
+			c-0.5-0.5-1.3-1.4-1.8-1.8c0.7-1,1.4-2,2.1-3c-0.5-2-2.5-4.2-1.1-6.1c2.7,1.7,4,4.6,4.8,7.6C1449.2,624.2,1451.3,623.2,1451.1,621
+			z"/>
+		<path class="st6" d="M831.8,617.3c0.7,0,2.2,0,3-0.1c0,0.7-0.1,2.1-0.1,2.8C833.2,619.8,832.3,618.8,831.8,617.3z"/>
+		<path class="st6" d="M1152.2,618.3c1.2,0,2.4,0,3.7,0c0,2.2-1.3,3.8-3.7,3.6C1152.3,620.7,1152.2,619.5,1152.2,618.3z"/>
+		<path class="st6" d="M802.5,620.7c1.6-0.9,3.2-1,4.9-0.3c0.2,1.5,0.5,3,0.7,4.4c1.2-0.7,2.4-1.3,3.6-1.8c2.2,5.7,3,13.2-1.2,18.1
+			c0.1-1.2,0.2-2.5,0.2-3.7c-3.9,2.4-6.3,6.3-8.6,10c0.5-2.1,1.1-4.1,1.8-6.1c-0.9,0.1-1.8,0.1-2.7,0.2c-0.3-0.8-0.6-1.5-1-2.2
+			c2-1.5,6.3-2.6,5.3-5.9c-0.4-2.5-2.6-3.9-4.4-5.4c0.7-1,1.4-1.9,2.1-2.9C803,623.6,802.7,622.1,802.5,620.7 M805.8,627.7
+			c-0.7,2.2-0.1,5,2.3,5.8C811.1,632.2,809.3,625.8,805.8,627.7z"/>
+		<path class="st6" d="M991.8,620.8c3-1.5,6.2,1.2,8.4,3.1c1.4,1.8,0,4.2-2.3,3.8c-0.6-1.5-1-3.2-2-4.5c-1,0.1-1.9,0.2-2.9,0.3
+			C992.2,622.7,990.4,622,991.8,620.8z"/>
+		<path class="st6" d="M203.4,625.9c-0.4-2,2.3-2.5,3.4-3.7c0.2,0.3,0.5,0.9,0.6,1.2c-0.6,0.8-1.2,1.6-1.9,2.5
+			c3.1,2.5,3.8,6.4,2.4,10.1C203.9,634.4,203.9,629.6,203.4,625.9z"/>
+		<path class="st6" d="M1153.2,623c1.6,0.4,3.2,0.8,4.8,1.3c-0.1,1.8-0.9,3.7-2.9,4c-0.8,0.2-2.3,0.6-3,0.9c0.3-0.4,1-1.2,1.4-1.5
+			C1153.4,626,1153.3,624.5,1153.2,623z"/>
+		<path class="st6" d="M1210.9,623c1.3,1.1,2.6,2.4,2.8,4.2c-0.3,2-1.5,3.7-2.3,5.5c-1.1,0-2.2,0.1-3.2,0.1
+			C1207.9,629.2,1208.8,625.8,1210.9,623z"/>
+		<path class="st6" d="M304.3,629.6c-0.5-1.5-0.8-4.7,1.6-4.3c2.3,0,1.9,2.7,1.8,4.2C306.6,629.5,305.5,629.6,304.3,629.6z"/>
+		<path class="st6" d="M723.1,626.4c1.3-1.3,3.7,0.8,2.2,2.2C724,629.9,721.6,627.7,723.1,626.4z"/>
+		<path class="st6" d="M379.2,632.6c0-2.7,2.1-5.4,4.9-5.6c2.3,0.9,0.4,3.7,0.5,5.5C382.7,632.6,380.9,632.6,379.2,632.6z"/>
+		<path class="st6" d="M1264.8,635c4.6-0.6,7.6-4.1,11.6-6c-0.1,0.8-0.2,2.2-0.2,3c-1.5,0.4-3,0.9-4.4,1.3c0.8,0.9,1.5,1.8,2.4,2.6
+			c1.6-0.2,2.3-1.9,3.2-3c2.1-0.3,4.3-0.5,6.4-0.8c-0.7,4.1-2.3,7.8-4.6,11.2c-1.5,0.3-3,0.7-4.5,1c1.8-1.6,5.3-2.4,4.5-5.5
+			c-0.6-2.3,1.3-3.6,2.8-4.9c-1.3-0.1-2.5-0.1-3.8-0.2c-0.9,1.2-1.3,3-2.7,3.7c-2.6-0.1-5.8-2.5-7.9,0c-1.4,1.9,0.3,3.9,1.2,5.6
+			c-1.5,2.1-3.5,3.8-6.2,3.9c0-0.7,0.1-2.1,0.1-2.8c-0.9,0.2-1.8,0.3-2.7,0.5c-0.9-2.5-1.3-5.8,1.7-7c0.1,1.8,0.2,3.6,0.3,5.4
+			c0.8,0,2.4-0.1,3.2-0.1C1264.5,640.5,1263.1,637.5,1264.8,635z"/>
+		<path class="st6" d="M984.3,632.2c1.5,0.2,3.5-0.2,3.9,1.8c0.9,1.7-1.9,3.5-3.3,2.3C983.2,635.7,984.4,633.5,984.3,632.2z"/>
+		<path class="st6" d="M1158.8,634c0.6-0.7,1.2-1.3,1.9-2c0.1,0.6,0.2,1.7,0.2,2.3c1.4-0.6,2.7-1.2,4.1-1.8c1.2,0.7,2.7,0.9,3.6,2
+			c-2.2,2.5-4.8,4.8-5.8,8.2c4-0.5,8-1.1,12-1.9c3-0.8,6,0.7,9.1,0.5c2.1-0.8,3.9-2,5.9-3.2c0.3,0.8,0.5,1.7,0.8,2.5
+			c2.2-0.2,4.4-0.3,6.6,0.1c6.8,1.2,13.8,0.4,20.7,0.6c5.5-0.2,11.5,1.1,16.6-1.6c2.2-1.2,4.7,0.1,6.9,0.6c0.6,1.3,1.2,2.5,1.8,3.8
+			c2-0.5,4-1.2,5.8-2.5c-0.7-1.5-1.3-3-1.9-4.5c1.2,0.3,2.6,0.5,3.9,0.2c-0.2,1.1-0.4,2.2-0.6,3.4c1.6,1.2,6.2,1.2,5.1,3.9
+			c-3,1.7-7.1-0.4-10,1.9c-1.2,1.6-1,3.8-1.3,5.7c-1.1-3.2-2.1-6.4-3.1-9.6c-16,0-32.1,0-48.1,0c-9,0.3-18-0.7-26.9,0.3
+			c-3.8,5.2-4.6,11.9-7.4,17.7c-1.4-0.5-2.7-0.9-4-1.4c0-1.8,0.5-3.6,0.8-5.4c-1.3-0.1-2.5-0.3-3.8-0.4c0.6-4.4,0.9-8.9,0-13.2
+			c-2.8-1.7-5.2,1.5-5.7,4c-2.7,0.8-5.3,2.9-8.1,2.6c-1.1-2.9,3.3-3.8,4.6-5.9c-1.5-1.5-3.2-2.6-4.9-3.8l0.5,0
+			c3.2,0.3,6.4,0.7,9.6,1.2c-0.6-1.4-1.2-2.9-1.8-4.3c1.1,0.4,2.3,0.8,3.4,1.2c1.7-0.4,3.4-0.9,5.1-1.3c0.1,3.5,0.5,7.1,1.1,10.6
+			c0.7,0,1.9,0.2,2.6,0.2c0.4,0.9,0.8,1.9,1.2,2.8c1.4-3.1,4.4-7.6,0.5-10.3c1.6-0.2,3.1-0.6,4.6-0.9
+			C1163.1,634.9,1160.8,634.6,1158.8,634 M1155,647.2c-0.3,0.9-0.7,1.8-1,2.7c1.1,0.5,2.2,0.9,3.4,1.4c0,1.8,0,3.7,0,5.5
+			c3.4,0.3,2.4-4.2,3.3-6.3C1158.8,649.5,1156.8,648.4,1155,647.2z"/>
+		<path class="st6" d="M696.3,635.3c0.7-0.7,1.6-1.2,2.5-1.7c0,1.4,0,2.8-0.1,4.2C697,639.3,696.1,636.7,696.3,635.3z"/>
+		<path class="st6" d="M14.1,637.3c2-1.5,4.4-1,6.1,0.6c0.2,0.5,0.7,1.5,0.9,2.1c1.7,3.2,4.3,8.7,8.8,6.3
+			c-0.2,7.9-0.1,15.8-0.1,23.7c-1.6,0.3-3.3,0.6-4.9,0.9c0.3,1,0.6,2,0.9,3c-2.7-0.3-5.4,0-8,0.8c3.4,2.9,7.2,5.1,11.4,6.6
+			c-1.1,0.5-2.1,1.1-3.2,1.6c1.8,2.6,4.5,5.7,2.8,9.1c-1.8,2.4-4.2,4.3-6.2,6.5c-1.1-0.4-2.1-0.8-3.1-1.3c-0.7-2.2,1.8-4.1,1.9-6.3
+			c0-3.8-0.6-7.7,0.7-11.4c-1.4-0.9-2.7-2-4.4-2.1c-3.1,3.5,0.4,8.1,0.6,12c-1.9,1.8-4,3.4-6,5.2c-1.1-1.9,0.1-3.7,0.9-5.4
+			c-0.6-1.1-1.3-2.1-1.9-3.1c1.3,0.6,2.5,1.3,3.8,1.9c1.4-1.2,0.9-3.3,1.3-4.9c-0.7-0.4-2-1.2-2.6-1.6c0.1-0.4,0.5-1.2,0.6-1.6
+			c0.3-2.9,0.4-5.8,0.5-8.7c1.7,0.2,3.3,0.5,4.9,0.8c0-2.2,0.1-4.4,0-6.6c1,1.7,2,3.4,3,5.2c2.1-0.8,4.3-1.7,6.4-2.4
+			c-0.2-1.6-0.4-3.2-0.5-4.7c-1.8,1.2-3.6,2.5-5.4,3.8c-0.2-1.8-0.2-3.7-0.2-5.5c-0.2-0.2-0.7-0.6-0.9-0.8c4.7-3.9-0.4-9.1-2.7-12.8
+			c1.5,0.5,2.9,1,4.4,1.5c0.4-0.2,1.3-0.6,1.7-0.8c-3-3.1-5.4-6.7-8.3-9.8c-0.2,2.7-0.5,5.4-0.7,8C16.2,643.7,15.7,640.3,14.1,637.3
+			 M25.7,653.8c-0.7,1.9-0.5,4-0.6,6c1.3,0,3,1.5,4,0.3c0.7-2.3,0-4.7-0.3-7C27.8,653.3,26.8,653.5,25.7,653.8 M24.2,693
+			c1.3-0.8,3.4-1.3,3.7-3c0.8-2.4-1.4-4.1-2.9-5.6C20.7,685.8,23.1,690.2,24.2,693z"/>
+		<path class="st6" d="M1254.3,636.4c2.4-0.5,2.6,4.2-0.2,4C1251.6,640.1,1252.7,637,1254.3,636.4z"/>
+		<path class="st6" d="M283.7,638.2l0.3,0.4c1.2,2.1,2.6,4.1,3.4,6.5c0.4,2.4,0.2,4.9,0.2,7.4c2.1,1,3.6,2.8,4.4,5
+			c-2.9,1.5-5.3,3.8-7.2,6.5c-1.4,2.2-4.1,2.5-6.4,3.1c-0.5-2.9-0.8-5.9-0.8-8.8c1.4-1,3.3-1.6,4.2-3.1c-0.5-1.3-1.2-2.5-1.8-3.7
+			c-0.5,0.1-1.5,0.4-1.9,0.5C279.2,647,282.7,643.1,283.7,638.2 M284,648.2c-0.7,0.1-2.1,0.3-2.7,0.4c0.1,1,0.2,2,0.4,3.1
+			c3.5,1.1,5-2.7,4.6-5.6C285.5,646.7,284.8,647.4,284,648.2 M278.5,658.8c0.8,2-0.2,5.7,2.5,6.2c3.6-1.9,5.5-5.8,8.1-8.7
+			C285.3,655.7,281.9,657.7,278.5,658.8z"/>
+		<path class="st6" d="M297.3,640.3c1.2,0,2.4,0,3.6,0c0.1,2.4-1.2,3.7-3.6,3.6C297.3,642.7,297.3,641.5,297.3,640.3z"/>
+		<path class="st6" d="M1013.8,641.8c1.1-1,2.2-2.9,3.9-1.5c0,0.6,0,1.8,0,2.4C1016.2,643.7,1015,642.6,1013.8,641.8z"/>
+		<path class="st6" d="M1725,640.5c2.7-0.1,5.3,0,8,0.1v8.4c-0.5,0.6-1.4,1.7-1.9,2.3c-0.5,0-1.5,0.1-1.9,0.1
+			c0.2-1.1,0.4-2.2,0.7-3.3c-1.6,0-3.2,0-4.7,0c0,0.7,0.1,2.2,0.1,2.9c0.5,0.1,1.4,0.3,1.8,0.3c-0.9,0.8-1.8,1.6-2.6,2.5
+			c-1.1-0.8-2.3-1.7-3.3-2.5c0.3-2.2,0.8-4.4,0.9-6.6l-0.1-0.7c1.6,0.1,3.2,0.2,4.8,0.4C1726.2,643.1,1725.6,641.8,1725,640.5
+			 M1726.5,645.1c0.6,1.5,2.3,1.8,3.7,2.4c0.6-1.6,1.2-3.2,1.8-4.8C1730,643.2,1728,643.7,1726.5,645.1z"/>
+		<path class="st6" d="M289.6,643.5c2.4,1.4,5,2.5,7,4.5c0.4,2.5-3.2,1.2-4.6,1.4C289.2,648.9,289.5,645.6,289.6,643.5z"/>
+		<path class="st6" d="M683.6,644.1c1.1,0.8,2.2,1.7,3.3,2.6c-0.3,1.2-0.6,2.3-0.8,3.5c1.8,0.1,3.7,0.3,5.5,0.4
+			c0.1,1.4,0.3,2.9,0.4,4.3c2.1,1.5,5.5,2.2,6.2,5.1c-4.7,1-8.1-3.8-10.3-7.3c-2,0.5-4,1.1-6,1.6c0.1,1.3,0.3,2.7,0.4,4
+			c-0.7,0.2-2,0.7-2.6,1C680.9,654.2,682.2,649.1,683.6,644.1z"/>
+		<path class="st6" d="M702.3,645.9c1.9,1.9,2.8,4.7,1.7,7.2c-0.8,1.6,0.4,3.1,0.9,4.6c-1.3,0-2.6,0-3.9,0.1c-1.1-3,0.8-5.9,1.8-8.6
+			C702.6,648,702.4,646.9,702.3,645.9z"/>
+		<path class="st6" d="M820.2,650.1c1.6-0.3,3.2-0.6,4.8-0.9c-0.7,1.5-1.4,3-2.1,4.5c-0.7,0-2,0-2.7,0
+			C820.2,652.5,820.2,651.3,820.2,650.1z"/>
+		<path class="st6" d="M1262.2,651.1c3,0.5,6,0.8,8.9,1.7c0.9,2,1.5,4.3,3.1,5.9c-0.4,2.3,0.6,3.9,2.8,4.8c0.9-0.7,1.8-1.4,2.7-2
+			c0.5,0.2,1.5,0.8,1.9,1c-1.7,1.3-2.9,3-3.8,5c-2-0.4-4.1-1-5.8,0.4c-1.5,0.7-3.4,2.7-4.7,0.8c0.1-1.6,1.8-2,2.8-3
+			c-0.2-1.1-0.4-2.2-0.5-3.2c1.2,0.9,2.3,1.9,3.4,2.9c0.5,0.1,1.6,0.2,2.1,0.3c-1.2-2.4-2.4-4.7-3.6-7c-0.4-0.2-1.3-0.6-1.8-0.8
+			c-0.8-1.1-1.5-2.3-2.4-3.3c-1.5-0.6-3.2-0.1-4.8-0.1C1262.4,653.4,1262.3,652.2,1262.2,651.1z"/>
+		<path class="st6" d="M1567.6,662.6c-2-2.6-4.4-5.8-1.9-8.9c1.2,1.4,2.3,2.8,3.7,4.1c1.1-0.3,2.1-0.8,3.2-1.2
+			c0.1,0.1,0.4,0.4,0.5,0.5c-0.1,2.6-0.9,5.3-0.2,7.9c1.5,0.5,3.1,0.7,4.7,0.9c-0.1,1.8-0.2,3.7-0.3,5.6c4.1-1.5,7.6-4.1,10.8-7
+			c1.4,3.5,2.7,7.1,3.9,10.7c-2.3,2-3.3,5-3.4,8c0.9,0.7,2,1.2,3.2,1.6l-0.6,0.5c-1,0.9-2,1.8-3,2.7c-1.4-2.6-2.5-5.5-3.3-8.3
+			c-1.8,0.3-3.6,0.6-5.4,0.9c-0.4-5.2,5.8-5.4,8.7-8.2c1.7-1.5,0.2-3.6-0.2-5.3c-4.4,2.5-8.4,6-13.5,6.9c0.2-2,0.7-4,0.7-6
+			c-1.8-1.2-3.9-2-5.9-2.9c-1.5,2.2-3.8,3.5-6.3,4.2c-0.5-1.7-0.9-3.4-1.1-5.1c1.5-0.9,3.3-0.7,5-0.8
+			C1567.1,663.1,1567.4,662.8,1567.6,662.6 M1564.2,665.3c-1.2,1.6,1.6,2.8,2.5,1.4C1567.9,665.1,1565,663.9,1564.2,665.3z"/>
+		<path class="st6" d="M1707.9,655.5c1.9-0.4,3.9-0.8,5.9-1.2c1.1,1.2,2.5,2.2,3.9,3.1c-1,1.6-2,3.2-2.9,4.8
+			c-0.2-0.6-0.7-1.7-0.9-2.3c-0.7,0-2,0.1-2.7,0.2c0.1-0.5,0.2-1.4,0.3-1.8C1710.2,657.3,1709.1,656.4,1707.9,655.5z"/>
+		<path class="st6" d="M388.1,657.2c1.3,0,2.7-0.1,4-0.1c-0.4,1.3,0,4-2.1,3.6C388.1,660.7,388.4,658.4,388.1,657.2z"/>
+		<path class="st6" d="M795.4,659.3c1.1-0.3,2.2-0.4,3.4-0.3c0,1.3,0.1,2.6,0.1,4c-1.3,0-2.5,0-3.8,0
+			C795.1,661.7,795.2,660.5,795.4,659.3z"/>
+		<path class="st6" d="M1283.4,664.7c-0.7-2.7,1.7-4.7,3-6.7c0.4,0.3,1.3,1,1.8,1.4c-0.5,0.5-1.6,1.4-2.2,1.9
+			c0.3,1.4,0.7,2.9,1.1,4.3c1.8,0.5,3.6,1.1,5.4,1.6c-0.2,1.3-0.3,2.5-0.5,3.8c0.4-0.3,1.3-1,1.7-1.3c0.2,0.6,0.6,1.9,0.8,2.5
+			c-1.8,0.4-3.6,1-5.5,1.2c-2.8-0.3-5.2-2.1-8-1.9c-1.4,1-2.6,2.3-3.9,3.4c0.3-2.3,0.9-4.5,1.8-6.6c2.5,0,5,0,7.6-0.1
+			C1285.4,667.1,1284.3,666,1283.4,664.7 M1285.1,670.5c1.3,0.8,2.5,1.7,3.9,2.2c2.2-0.3,2-3.5,1.2-5
+			C1288.1,666.6,1286.7,669.6,1285.1,670.5z"/>
+		<path class="st6" d="M1253.8,662.3c1.4-1.1,2.9-2.6,4.8-2c1.7,0.9,2.6,2.7,3.5,4.3C1259.2,664.5,1256.1,664.3,1253.8,662.3z"/>
+		<path class="st6" d="M369.2,661.2c1.3,0,2.6,0.3,3,1.7c-0.4,1-0.8,2-1.2,3c-1-0.5-2-0.9-2.9-1.3
+			C368.4,663.5,368.4,662.2,369.2,661.2z"/>
+		<path class="st6" d="M704,670.1c2.2-1.3,4.4-2.8,6.5-4.2c1.9,2,0.5,4.3-0.5,6.3c2.3,4.3,0.8,9.5,3,13.8c-0.8-0.8-1.6-1.7-2.3-2.5
+			c-1.2-0.1-2.5-0.1-3.7-0.2c0.6,2.1,0.6,4.7,2.2,6.4c1.5,0.2,3,0.2,4.5,0.3c0-0.8,0.1-2.3,0.1-3.1c1.4,0.5,2.7,1.2,3.9,2
+			c-1.3,2.1-2.7,4-4.1,6c-1.8-2.5-5.5-1.5-7.2,0.5c-0.6,1.6,0,3.3,0,5c-1.1-0.2-2.1-0.4-3.1-0.6c-1-1.6-1.4-3.4-2-5.1
+			c-1.2-0.4-2.3-0.7-3.5-1.1c2.6-1,5.2-2,7.5-3.6c0.2-2.2,0.1-4.5,0.2-6.7c1.1-1.4,2.6-2.5,3.2-4.3c-0.3-1.5-1.5-2.5-2.2-3.7
+			c0.7-0.5,1.4-1.1,2.1-1.7c0.1-1,0.3-2,0.4-3c-1.3,0-2.5,0-3.8,0.1c-0.7,0.4-1.5,0.9-2.2,1.4C703.2,671.6,703.7,670.6,704,670.1z"
+			/>
+		<path class="st6" d="M485.6,667.2c1.5,0.5,2.9,1,4.4,1.5c-0.6,1.5-1.2,3.1-1.8,4.7c-1.4-0.7-2.8-1.4-4.2-2
+			C484.5,670,485.1,668.6,485.6,667.2z"/>
+		<path class="st6" d="M978.2,676c1.2-3.8,4.4-6.8,7.9-8.6c1.7,3.2,2,6.9,3.1,10.3c3.4,0.9,6.8,1.5,10,2.9c-1.8,1.3-3.7,2.3-5.6,3.4
+			c-1.6,2.9-4.4,4.6-7,6.4c-0.3,1.3-0.4,2.7-0.5,4.1c1.9,0,3.8,0.1,5.8,0.1c-0.1,1.7-0.1,3.4-0.2,5.2c1.1-0.7,2.3-1.4,3.4-2.1
+			c-0.1,0.8-0.3,2.5-0.4,3.3c-0.4,0.1-1.2,0.3-1.7,0.4c0.1,0.4,0.4,1.3,0.5,1.8c0.6,0.3,1.8,0.9,2.5,1.3c-1.1,0.6-2.1,1.2-3.2,1.8
+			c-1.4-0.9-2.5-2.4-4.2-2.7c-1.8,2.1-0.4,4.7-0.4,7c-0.5,2-1.4,4-2.2,5.9c2.5,2,4.9,4.1,7.2,6.3c1.1-0.6,2.1-1.3,3.2-1.9
+			c2.2,2.2-0.9,3.3-2.4,4.7c0.2,0.8,0.3,1.7,0.5,2.5c2.2-0.5,4.4-0.8,6.7-0.8c0.3,1.7,0.6,3.5,1,5.2c1.3,0.1,2.7,0.1,4.1,0.3
+			c1.3,2.3,1.4,5.2,2.8,7.4c0.9-0.1,1.8-0.3,2.8-0.5c0.7-0.3,2.2-0.9,2.9-1.2c-0.2-1.6-0.4-3.2-0.7-4.8c-1.3-0.2-2.4,0.7-3.5,1.2
+			c-0.1-2.4-0.1-4.8-0.3-7.2c2.3,0,4.6-0.3,6.9,0.2c2.5,2.2,3.5,5.6,5.9,8c1.4,1.5,3.7,1.3,5.5,1.7c-0.9-2-1.8-4.1-2.8-6
+			c1.6-0.7,3.2-1.3,4.7-2c0.8,0.6,1.5,1.2,2.3,1.9c1.6-0.5,3.2-0.9,4.8-1.4c-0.6-1.2-1.3-2.3-1.9-3.5c0.9,0.3,1.9,0.7,2.8,1.1
+			c2.3,1.3,4.3,3.2,5.8,5.5c-1.7-1-3.5-2.1-5.2-3.1c-1.5,3.9-0.9,8.2,1.4,11.6c0.9-0.1,2.7-0.5,3.6-0.6c-1.6,0.9-3.4,1.6-5.3,1.3
+			c-5.9-0.6-11.9-1.3-17.9-1.2c0.2-1.4,0.4-2.7,0.6-4.1c-3.2,0.2-5.7,2.2-7.9,4.4c-12.3-0.1-24.5-0.1-36.8,0.1
+			c-0.1-0.8-0.3-2.4-0.5-3.2c-3.1-0.2-6.2-0.4-9.3-0.4c0.1,1.1,0.2,2.2,0.4,3.2c-2,0-3.9,0-5.9,0c0.9-1.2,1.9-2.3,2.8-3.5
+			c-0.8-1.9-3.5-4.1-5.6-2.8c-1.2,0.5-2.4,1.1-3.5,1.6c0-1.7-0.1-3.4,0.2-5.1c1.1-1.5,2.7-2.5,4.4-3c1.2,0.7,2.3,1.6,3.5,2.4
+			c1.6-1.9,0-4.5-0.3-6.6l-0.1-0.5c0.3-0.2,1-0.6,1.4-0.9c1.2,1.1,2.4,2.2,3.7,3.3c-1-0.3-2.1-0.6-3.1-0.9c0.1,2.4,0.2,5,2.6,6.2
+			c-0.6,0.9-1.2,1.9-1.8,2.8c1.6,2.7,4.6,3,7.4,3.2c0-2.2,0-4.5,0.1-6.7c-0.9,0-2.6-0.1-3.5-0.1c0.9-0.4,1.8-0.7,2.8-1.1
+			c0-0.6-0.1-1.2-0.1-1.8c0.9-2,1.6-4.1,2.2-6.2c1.4-0.2,2.8-0.3,4.3-0.7c3.6-2.9,6.4-6.7,8.2-10.9c-0.3-0.4-0.9-1.2-1.2-1.6
+			c-2.2,0.7-4.5,1.3-6.7,2c-0.7,1.1-1.4,2.2-2.1,3.2c-0.6-1.3-1.1-2.5-1.6-3.8c2.6-0.3,3.8-2,3.8-4.6c0.8,1.3,1.6,2.7,2.5,3.9
+			c2.2-1.1,1.6-4,2.2-6c0.3,0.5,1,1.4,1.3,1.9c1.8-1.6,3.5-3.3,5.3-4.9c-0.3-2-1.1-3.8-2.6-5c-0.4,1.1-0.7,2.1-1,3.2
+			c-0.3,0.1-0.9,0.4-1.2,0.5c-0.6-2.7-2-5-3.7-7.1c1.5-1.2,3-2.3,4.5-3.5c-0.8-1.6-1.6-3.2-2.4-4.9c-0.9-0.3-1.9-0.6-2.8-0.8
+			C980.2,680.3,978.6,678.4,978.2,676 M980.6,675.1c1.6,1.9,3.3,3.7,5.6,4.9c1.2-3.2,2-8.3-1.2-10.5
+			C982.4,670,981.9,673.1,980.6,675.1 M981.2,723.7c2,0.1,4-0.2,5.9-0.8c-0.5-2.2-2.4-3.4-4.2-4.4C981.7,720,981,721.7,981.2,723.7
+			 M985.7,724.6c-2.3,0.7-4.6,0-6.9-0.3c-1.8,1.2-3.7,2.4-5.5,3.6c-0.1,2.7,2.3,3.5,4.4,4.2c-0.6,1.2-1.1,2.5-1.6,3.7
+			c1,1,2.1,2,3.1,3.1c0.8-1.5,1.6-3,2.3-4.6c1.2,0.1,2.3,0.2,3.5,0.4c0.2-1.3,0.4-2.5,0.7-3.7c3.7-0.5,5.6-3.5,6.7-6.8
+			c-1-1-1.9-1.9-2.9-2.8C988.3,722.5,987.2,723.8,985.7,724.6 M996,730.4c-3.6-2.4-8.4,0.3-9.1,4.3c1.7-0.8,3.9-1.9,5.5-0.1
+			c1.4,1.8,3.6,4.1,5.7,1.6c0.3-2.9,4.1-6.2,1.1-8.7C998.1,728.4,997.1,729.4,996,730.4 M1028.5,732.4c0,0.5,0.1,1.6,0.1,2.1
+			c2.2,1.5,5.1,3.4,7.2,0.5C1033.8,733.1,1031.3,732.1,1028.5,732.4 M998.8,737.9c-1.7,0.4-3.5,0.7-4.9,1.8
+			c3.7,0.7,7.5,0.7,11.2,0.3c-0.8-1.5-0.7-4.5-3.1-3.9C1000.7,736.2,999.8,737.3,998.8,737.9z"/>
+		<path class="st6" d="M365.6,669.2c3.6,0.1,6.2,2.9,7.3,6.1c-1.9,0.7-3.7,1.4-5.6,2.1c-0.5,1.8-1,3.7-1.4,5.5
+			c-2-1.4-5.7-2.6-5.5-5.4C363.1,675.3,365.4,672.8,365.6,669.2z"/>
+		<path class="st6" d="M689.8,671.6c1.3-1,2.7-2.1,4.2-2.8c-0.7,1-1.3,2-2,3.1c1.6,2.3,4.2,4.9,2.8,8c-2,2.1-4.5,3.6-6.6,5.4
+			c3,1.2,6.1,0.3,9.2,0.4c1.8,0.3,2.1,2.3,2.8,3.7c-1.3,0.2-2.7,0.3-4,0.5c0.2-0.9,0.4-1.7,0.6-2.6c-4.7-0.8-9.4,1.1-12.2,5
+			c-0.3,1.3,0.5,2.5,0.7,3.8c3.4-0.6,5.6-3.1,7.9-5.4c-0.5,1.2-1,2.5-1.6,3.7c-2,2.1-5.1,2.9-6.8,5.4c-0.9-0.1-1.8-0.2-2.8-0.3
+			c-0.2,1.3-0.5,2.5-0.7,3.8c0.8,0.3,2.3,0.8,3.1,1.1c-6.7-0.5-13.4-1.1-19.5-4.1c-1-1.4-1.9-2.9-2.9-4.3c1.3-1.7,2.6-3.3,3.9-5
+			c4.6-1.4,7.4-5.4,9.8-9.3c-0.4-2-1.2-3.8-1.8-5.7c0.2-0.3,0.4-1,0.6-1.4c0.7,1.1,1.4,2.2,2.2,3.3c1-2.1,1.5-4.6,3.4-6.1
+			c1.3-0.5,2.6-0.8,4-1.1c1,2.6,1.2,6.2,4.2,7.4c1.8,1,4.5,1.1,5.1-1.3C692.7,674.8,691,673.3,689.8,671.6 M679.1,677.8
+			c1.5,0.3,3.1,0.7,4.6,1.1c-0.1-2.2-0.1-4.4-0.2-6.6C680.3,672.1,678.6,674.9,679.1,677.8 M669.5,692.4c-0.6,1.5,0.9,2.9,1.4,4.3
+			c1.4-0.8,2.8-1.6,3.8-2.9c0,0.9,0.1,2.6,0.2,3.5c2.9,0.1,5.8,0.4,8.7,0.2c0.2-2.1,0-4.1-0.1-6.2c1.5-1.2,2.9-2.4,4.3-3.6
+			c-2.7-1.9-6.4-2-8.9,0.2c1.1-3,4.2-3.5,6.8-4.6c1.4-3-3.5-3.2-5.4-3.7C676.1,683.5,672.2,687.5,669.5,692.4z"/>
+		<path class="st6" d="M270.6,672.5c2.9-0.9,6.1-1.1,8.7-2.9c1.7,0.7,3.3,1.5,5,2.3c-1.3,1.8-2.8,3.5-3.6,5.6
+			c-0.5,2.1-0.4,4.2-1,6.3c-1.3,2.3-3,4.3-3.3,7c2.3,1.8,4.5,3.7,6.8,5.7c-1,2.5-2,4.9-3.2,7.3c-3-1-5.6,0.8-8.2,2
+			c-0.6,3.5-1.4,7-2.6,10.4c0.6,0.8,1.3,1.6,2,2.4c-1.3-0.4-2.5-0.8-3.7-1.3c1.2-5,4.3-10.3,1.9-15.4c-0.7,1.7-1.4,3.5-2.1,5.3
+			c-0.1-1.7-0.2-3.4-0.4-5c-1.1-0.1-2.3-0.2-3.4-0.3c-0.1,2.6-0.5,5.4,1.2,7.7c-1.6,0.5-3.2,0.8-4.7,1.2c-1.4,3.6-3,7.1-4.2,10.8
+			c2.1-1.2,4.3-2.3,6.4-3.5c-0.1-1.4-0.3-2.8-0.4-4.2c0.4-0.5,1-1.4,1.4-1.8c0.5,0.2,1.4,0.7,1.9,1c-1,6.6-2.8,13-3.7,19.6
+			c0.2,0,0.7,0.1,0.9,0.1c0.4-2.6,1.2-5.1,2.8-7.2c0.1,4.5-2.5,9.1-0.7,13.5c-0.3,0.8-0.7,1.6-1,2.4c-1.9-3.1-5.5-5-6.7-8.6
+			c1,0.6,2,1.2,3,1.8c0.6-5,1.4-10,2-14.9c-2.2,1.1-4.3,2.4-6.1,4c-2.3-1.7-4.7-3.3-7.2-4.9c0.9,2,1.7,4,2.5,6.1
+			c0.5,0.3,1.4,0.9,1.9,1.2c-2.2,1.5-4.9,0.7-7.3,0.3c0.9-1.4,3.3-2.2,2.9-4.2c-1.4-2.3-3.7-4-5.8-5.6c1.5-0.1,2.9-0.2,4.4-0.4
+			c-0.7-2-2.1-3.4-4.2-3.8c-0.6,0.9-1.2,1.9-1.8,2.9c-0.5,0.5-1.4,1.5-1.9,2c-0.5-1-1-2.1-1.4-3.1c0.7-1.7,1.4-3.3,2.1-5
+			c2.6,1.2,5.5,2,7.7,3.9c2.1,2.4,3.7,5.1,5.7,7.6c1.5-4,4-7.6,5.4-11.6c1.1-0.8,2.2-1.6,3.4-2.4c-0.4-0.9-0.9-1.9-1.3-2.8
+			c-0.5,0.1-1.5,0.2-2,0.3c-0.5,1.2-1.1,2.5-1.6,3.8c-1.3-0.2-2.6-0.4-3.9-0.5c-0.4-2.7-0.1-5.8-2-7.9c-1.2-1.5-2.7-2.7-4.1-3.9
+			c-0.4-1.2-0.8-2.4-1.2-3.6c0.7-0.2,1.9-0.6,2.6-0.8c1.3,1,2.1,2.9,3.9,3.2c0.9-1.3,1.6-2.7,2.3-4.1c2.8-0.9,5.8-2.1,8.8-0.9
+			c2.5,2.9,2,7.8,6,9.5c0.5-3.5,1-7,1.1-10.6c-2.3-0.8-6.7-0.3-6.6-3.7c-0.2-3.1,3.5-4.3,4.2-7.1C269,676.1,268.9,673.8,270.6,672.5
+			 M277,673c-1.8,1-4.1,0.2-5.8,1.3c-1.1,1.4-0.5,3.5-0.7,5.2c-1.6,1.1-3.3,2.1-4.8,3.5c-0.7,1.3-0.6,3.1,1.1,3.5
+			c3.4-0.5,7-0.8,9.9-2.6c1.9-0.8,1.3-3.2,1.7-4.8c0.1-2.3,1.9-4,2.8-6C280.6,670.3,278.5,672.3,277,673 M256.3,691.3
+			c-1.6,2.2-2.9,4.8-3.2,7.5c0.4,2.5,3,5.8,5.8,4c2.4-1.7,5.2-2.9,8.2-3.2c-1.9-2.4-4.8-3.5-7.2-5.2c0.8-0.2,2.4-0.7,3.2-0.9
+			c-0.4-1-0.5-2.3-1.5-3C259.8,690.2,257.9,690.4,256.3,691.3 M271.3,693.3c-0.4,2,0,4.2,0,6.3c0.4,0,1.2-0.1,1.6-0.1
+			c0.2,1.1,0.4,2.3,0.6,3.4c0.5,0,1.5-0.1,2-0.1c0.5-1.5,0.6-3.2,1.9-4.2c0.9-1,3-2.1,1.8-3.7C277.4,692.8,273.4,690.3,271.3,693.3z
+			"/>
+		<path class="st6" d="M480,674.7c-2.2-2.3,2-3.3,3.2-4.6c0.1,0.8,0.4,2.5,0.5,3.4c1.1-0.1,2.3-0.1,3.4-0.1c0.5,0.3,1.5,0.9,2,1.2
+			c-0.1,0.9-0.1,2.6-0.2,3.5c-1.2-1.1-2.4-2.3-3.6-3.3c-0.4,2,0.3,3.8,1,5.7c-0.2,0.2-0.5,0.6-0.7,0.9
+			C484.4,678.5,482.2,676.6,480,674.7z"/>
+		<path class="st6" d="M1409.3,678c0.8-1.5,1.7-3.1,2.6-4.5c3.2,4.5,3.2,10.5,5.7,15.4c0.3-0.4,0.9-1.2,1.2-1.7
+			c-0.3,2.7-0.1,5.6-1.5,8c-4.7,1.2-9.6,0.7-14.4,0.8c0.3,2.1,0.7,4.3,0.5,6.4c-2.4,0.4-2.7-2.1-3.5-3.7c0.8-1.6,1.5-3.2,2.3-4.8
+			c4.9,0.4,9.7,1,14.6,0.3c-0.7-1.9-1.5-3.7-2.4-5.5c0.4-1.3,0.8-2.5,1.2-3.8c-0.7-0.6-1.4-1.2-2.2-1.8c-0.6,1.6-1.2,3.2-1.8,4.9
+			c-0.1-1.6-0.2-3.2-0.2-4.8c0-1.3,0-2.5,0.1-3.8C1411,679,1409.8,678.3,1409.3,678z"/>
+		<path class="st6" d="M1288.3,676.2c2.6,1.4,5.7,2.8,6.8,5.8c0.6,2.5,1.2,6.3-2.2,6.9c-0.3-1.2-0.5-2.4-0.8-3.6
+			c-1.2,0.6-2.3,1.3-3.7,1.4c0.1-1.8,1-3.3,1.6-4.9c-1.1-1.9-2.6,0.6-3.8,1.2c-0.5,0.4-1.5,1.3-2,1.7c-0.6-1.2-1.2-2.4-1.8-3.5
+			C1284.4,679.3,1286.4,677.8,1288.3,676.2z"/>
+		<path class="st6" d="M1576.8,685.9c0.4-1.7-0.3-4.1,1.7-5c-0.2,2.6,0,5.2,0,7.8c-1.2,1.2-2.5,2.2-3.8,3.2
+			c-0.3,1.9,0.4,4.2-1.2,5.7c-1.9,0.7-3-1.2-4.1-2.3c-1.5,0.5-2.9,0.9-4.4,1.4c0.4-1.5,0.8-2.9,1.2-4.4c0.5,0,1.6,0,2.2,0
+			c0.4,0.6,1.2,1.7,1.6,2.3c1.2-0.9,2.4-1.9,3.6-2.8c-0.1-0.7-0.1-1.5-0.1-2.2C1574.7,688.5,1576.7,687.8,1576.8,685.9z"/>
+		<path class="st6" d="M991.2,694.2c1.2-4.5,4.7-7.8,6.7-11.9c3.8-0.3,6.5,2.3,8.8,4.9c-0.3,0.2-1,0.6-1.4,0.8
+			c0.5,0.9,0.9,1.9,1.4,2.8c-0.3,0.5-0.8,1.4-1.1,1.9c-0.6,0-1.8,0.1-2.4,0.1c-1.6-3-2.9-6-4.1-9.1c-1,1.9-1.9,3.7-2.8,5.6
+			c1.8,0.3,3.5,0.7,5.3,1.2c-0.4,0.6-1.2,1.9-1.6,2.5c-0.2-0.4-0.5-1.3-0.7-1.7C996.6,692.4,994,693.4,991.2,694.2z"/>
+		<path class="st6" d="M1405.3,686.4l0.5,0.3c1.6,1.1,3.5,1.8,5.4,2.4l-0.4,0.8c-0.3,0.5-0.9,1.4-1.2,1.9c-1.9-0.2-3.8-0.5-5.7-1.1
+			C1404.4,689.2,1404.9,687.8,1405.3,686.4z"/>
+		<path class="st6" d="M1565,689.9c-0.1-2.4,1.2-5,4.1-3.8C1569.1,688.1,1566.3,688.7,1565,689.9z"/>
+		<path class="st6" d="M1280.6,689.1c0.3-0.2,1-0.8,1.4-1c0.1,2.4,0.2,4.8,0.1,7.2c-0.1,0.4-0.3,1.1-0.4,1.4c1,0.1,2,0.3,3.1,0.4
+			c0.2,1.2,0.5,2.4,0.7,3.6c0.7,0,1.9,0.1,2.6,0.1c-1.5-3.4-2.4-7.4,0.3-10.6c0.9-2.1,3-1.3,4.6-0.7c-0.1,1.8-0.1,3.5-0.1,5.3
+			c0.6-0.3,1.7-0.8,2.3-1c-0.6,2.4-1.2,4.8-1.9,7.3c0.7,0,2,0.1,2.7,0.1c-0.2,0.4-0.6,1.1-0.9,1.5c-1.2,0-2.5-0.1-3.7-0.1
+			c-0.4-0.5-1.1-1.4-1.5-1.9c-3.8,1.3-5.4,5-6.8,8.5c0.2-2.5,0.5-4.9,0.6-7.3c-1.2,1.1-2.4,2.2-3.3,3.5c-0.2,4.2,3.6,6.9,6.9,8.6
+			c-2.1-0.5-4.2-0.8-6.3-1.2c1.6,3.3,2.1,7.2-0.1,10.4c0.2,1.2,0.4,2.4,0.6,3.6c-1.5,0.4-3.1,0.7-4.6,1.1c0.5-1.6,1.1-3.2,1.6-4.8
+			c-0.4-0.6-0.8-1.3-1.2-1.9c-0.8-0.8-1.9-3.9-3.4-2.1c-0.8,0.5-1.5,1-2.3,1.6c-1.3-1-2.7-1.9-4-2.8c0.8,0,2.4,0.1,3.2,0.1
+			c1.7-1.5,3.4-2.9,5-4.5c0.2,0.4,0.6,1.1,0.9,1.5c-0.8,0.8-1.6,1.5-2.3,2.3c2.4,1.1,4.9,2.2,7.4,3c-0.6-2.5-1.7-5-3.9-6.4
+			c-0.5-0.4-1.5-1.3-2-1.7c1.2-3,2.5-6,3.9-9c2-1.2,3.9-2.6,4.6-5c-1.3-0.2-2.7-0.4-4-0.5c-0.5-1-0.9-2.1-1.3-3.1
+			C1280.2,692.8,1280.4,690.9,1280.6,689.1 M1287.5,696.5c0.8,0.7,1.7,1.3,2.6,1.9c2.1-2.1,1-4.8-1.1-6.3
+			C1288.4,693.4,1286.7,694.8,1287.5,696.5z"/>
+		<path class="st6" d="M361,688.7c3.1,2.2,6.1,4.5,9.1,6.7c0.1,2.3,0.2,4.5,0.4,6.8c-0.8-1-1.5-1.9-2.2-2.9c0,2.3,0,4.6-0.1,6.9
+			c-1.6-2.5-1.9-5.4-2.2-8.3c-0.5-0.7-1-1.3-1.5-2c0.2-2-0.8-3.7-2.2-5c-0.7,0.6-1.4,1.3-2.1,2C360.4,691.5,360.7,690.1,361,688.7z"
+			/>
+		<path class="st6" d="M1554,690.5c1.9,0.8,3.8,1.5,5.8,2.2c-1.6,0.3-3.2,0.6-4.8,0.8c1.7,0.6,3.4,1.2,5.1,1.8
+			c0.2,1.2,0.4,2.3,0.6,3.5c-0.5,0.6-0.9,1.3-1.3,2c0.4,0.2,1.3,0.6,1.7,0.8c0.7,3.9,5.2,4.8,8.1,6.7c-2.5,0.1-4.2,2-5.8,3.6
+			c-0.7,0.7-1.3,1.3-2,2c-0.1-0.4-0.4-1.2-0.6-1.6c1.8-1.5,3.3-3.3,3.7-5.6c-1.7,0.1-3.3,0.2-4.9,0.3c-1.1,2.6-2.4,5.1-3.7,7.6
+			c1.4,0.3,2.8,0.6,4.2,0.9c-1.1,1.3-2.4,2.8-4.3,2.5c-1.7-1.7-2.1-4.8-4.1-5.8c-1.1,2.6-2.2,5.2-4.3,7.1c1.4-6.6,0.3-13.2-0.8-19.8
+			c0.5,0.3,1.4,0.9,1.9,1.2c0.2,0.1,0.7,0.4,1,0.6c2,0,3.9-0.2,6-0.4c-1-1.8-2.1-3.6-3.1-5.4C1553.1,694,1553.5,692.2,1554,690.5
+			 M1551.2,702.3c-1.9,1.3,1,2.2,2.1,2.5c1.6,0.7,4.7,0.9,4.4-1.6C1555.8,702.4,1552.9,700.7,1551.2,702.3 M1552.8,708.2
+			c1.5,1.5,3.7,2.2,5.6,1C1557.1,707,1554.8,707.2,1552.8,708.2z"/>
+		<path class="st6" d="M135.6,693.7c0.4-0.8,0.9-1.5,1.3-2.2c0.9,1.1,1.7,2.1,2.7,3.1c0.8,0.8,1.6,1.6,2.5,2.4c1.5-1,3-1.9,4.5-2.8
+			c-0.3,1.8-0.6,3.5-1.1,5.2c1.6,3,4.3,5.2,6.9,7.3c-0.3,3-0.4,6,1.8,8.4c1.1-2.1,2-4.2,2.7-6.4l0.2,0.7c1.1,4.1,2.6,8.2,5.3,11.4
+			c1.2,1.4,2.8,2.3,4.3,3.3c-1.2,0.8-2.4,1.6-3.6,2.4c1.3,0.9,2.5,1.7,3.8,2.6c0.9-0.7,1.9-1.3,2.8-1.9c0.7,1.4,1.4,2.8,2.1,4.2
+			c2-0.9,4-2,6.2-2.2c1.3,4.1-3.2,7-3.1,11c2,0,3.9,0,5.9,0c-1.8,0.5-3.7,1.7-5.6,1.1c-1.6-0.6-2.7-1.8-4-2.8
+			c-3.6,0.3-7.2-0.5-10.7-1.4c0.2,1.4,0.5,2.8,0.8,4.3c-1.6,0-3.2,0-4.8-0.2c-1.1-1.7-1.9-3.5-2.8-5.3c-2.5,1.7-5,3.5-7.5,5.1
+			c-2.8,0.2-5.7,0.2-8.5,0l-0.4-0.7l0-0.8c1.6,0.3,3.1,0.7,4.7,1c-0.1-2.2-0.3-4.3-0.4-6.5c-0.6-0.2-1.7-0.6-2.2-0.8
+			c-0.6,1.3-1.2,2.6-1.8,4c-0.5-1.5-1.1-2.9-1.7-4.4c-1,1.6-1.9,3.2-2.4,5c-0.3,1.1-0.7,2.3-1.1,3.4c-2.1,0.3-4.2,0.1-6.3,0.1
+			c1-2.8,0.8-5.5-1.7-7.4c-1.7,2.1-1.8,4.8-1.6,7.4c-0.4,0-1.3,0-1.7,0c-0.3-2-0.6-4-1-6c-1.2,1.2-2.5,2.3-3.7,3.6
+			c0.7-2.2,1.2-4.5,1.1-6.8c-3.9-1.7-5.1,3.2-6.1,5.8c-1.2,0.2-2.3,0.5-3.5,0.7c-0.5,0.9-1,1.7-1.4,2.6c-1.8,0.2-3.6,0.4-5.3,0.7
+			c2-3.4,4-7.1,3-11.1c-1.3-0.4-2.7-0.8-4-1.2c4.2-1.4,8.5-1.8,12.9-2.1c0.4-0.4,1.2-1.1,1.5-1.5c2.4-2.1,5.5-3.7,6.9-6.7l0.6-0.8
+			c0.7,0.3,2,0.8,2.7,1.1c-2.6,3.4-5.1,6.9-6.6,11c4,0.5,6.9-2.1,9.5-4.6c0.8,1.1,1.7,2.2,2.8,3.2c2.4-2.8-0.4-5.9-1.4-8.6
+			c-1.2-2.2-1.2-4.7-1.2-7c1.4-2.1,2.6-4.4,3.7-6.7c-1.6-0.5-3.2-1-4.9-1.5c0.4-1.9,0.8-3.7,1.1-5.6c0.9,1.4,1.8,2.8,2.7,4.2
+			c0.8-1,1.7-2,2.5-3c0.1,0.7,0.3,2.1,0.4,2.8c1.3-0.1,2.6-0.1,3.8-0.2c1.6-1.4,2.9-3.1,4.2-4.8c-2.7-0.1-5.3-0.2-8-0.2
+			c0.2-1.2,0.5-2.5,0.7-3.7C134,694.4,135,693.9,135.6,693.7 M142.3,705.4c1.1,0.1,2.3,0.3,3.4,0.5c1.3-2.4,0.2-4.3-1.9-5.7
+			C142.8,701.7,142.6,703.6,142.3,705.4 M130,713.8c1.5-0.4,3-0.9,4.6-1.3c-0.5,3-2.5,6.9,0.9,9c2.1,2.8,5.5,1,7.7-0.6
+			c0.1-2.8-1.4-5.5-2.1-8.2c-2.1-0.2-4.2-0.3-6.3-0.4c0.6-2,1.1-4.2,0.2-6.2C132.1,707.5,129.3,710.3,130,713.8 M136.7,705.7
+			c0,1.6,0,3.3,0,5c1.6,0.3,3.2,0.5,4.7,1c1.2,1.2,2.2,2.6,3.4,3.9c1.7-0.2,3.1-1.6,2-3.2C145.4,708,140.4,707.2,136.7,705.7
+			 M148.4,718.2c-1.1,1-3.8,1.5-3.1,3.6c0.7,1.6,2.6,2,3.9,2.9c0.4-1.2,0.9-2.5,1.3-3.7c1.1,1.3,2.4,2.6,3.6,3.9
+			c1.1-2.3,2.3-4.6,3-7c-0.6-1.8-3.3-0.8-4.8-1.2c-0.8-1.1-1.6-2.2-2.5-3.3C148.9,714.7,146.8,716.4,148.4,718.2 M128.7,717.9
+			c2.1,4,4,8.3,3.1,13c-2.3-0.2-4.6-0.9-6.7-1.8c-0.3,0.5-0.9,1.4-1.2,1.9c1.9,2.7,3.9,5.3,6.1,7.7c1.2-1.9,2.1-3.9,2.8-6
+			c3.5,0.1,6-1.9,7.6-4.8c1.4,1.5,1.2,3.5,1.3,5.4c2.5,1.5,5.1,3,8.1,3c-0.7-2.3-1.3-4.7-2.2-7c-1.9-3.4-6-6.5-9.9-4.2
+			c-2-1.7-4.1-3.2-5.5-5.4c-0.1-1.7,0.2-3.4,0.3-5.1C131,715.4,129.8,716.6,128.7,717.9 M158.7,730.2c-0.2,0.3-0.6,1-0.9,1.3
+			c-1.5-0.1-4.7-2.1-4.7,0.5c0.6,2.8,2.6,5.1,3.8,7.6c1-1.2,1.9-2.4,3.1-3.4c1.9-0.3,3.9,0.2,5.8-0.5c1.4-1,2-2.9,2-4.5
+			c-1.5-1.2-3.3-2-4.9-3.2c-1.2-2.5-1.5-5.4-2.7-8C156.4,722.2,156.8,726.9,158.7,730.2 M105.3,731.2c0.1,1.5,0.2,2.9,0.3,4.4
+			c2.5,0.4,3.7-1.9,4.2-4C108.2,731.5,106.8,731.3,105.3,731.2z"/>
+		<path class="st6" d="M0,692.3c2.2,0.1,4.5,0.1,6.8,0.2c0,0.5,0,1.6-0.1,2.1c-2.2,0.4-4.5,0.8-6.7,1.3V692.3z"/>
+		<path class="st6" d="M379.3,692.3c2.2-0.9,3,2,2.5,3.6c-0.7,1.6-2.1,2.7-3.3,4C378.4,697.4,376.7,694,379.3,692.3z"/>
+		<path class="st6" d="M527.5,694.3l0.1-0.4c0.4,2.5,3.2,2,3.9,0l0.8-0.2c0.8,1.2,1.5,2.3,2.3,3.5c-1.9,2.7-5,5-4.5,8.6
+			c-1.7,0-3.4,0-5.1,0c0.6-1.6,1.2-3.3,1.8-5C527.2,698.7,527.3,696.5,527.5,694.3z"/>
+		<path class="st6" d="M393,698c0.8-0.7,1.5-1.4,2.2-2.1c0.1,0.7,0.2,2,0.3,2.7c0.6,0.2,1.9,0.5,2.5,0.7c-0.5,0.9-1,1.7-1.5,2.6
+			c0.5,1.3,1.1,2.7,1.7,4c-0.4,1.3-0.9,2.6-1.3,3.9c2.3-0.4,4.6-0.9,7-1.3c0.2,1,0.4,1.9,0.7,2.9c-1,1.1-1.9,2.2-2.9,3.2
+			c-1.5-0.8-3-1.6-4.5-2.4c-4.2,1.3-6.7-2.8-9.5-5.1c-1.8,2.6-2,5.7-1.3,8.7c-3.2-3.2-4.4-7.6-6.2-11.6c0.5,0.1,1.5,0.2,2,0.3
+			c1,1.1,2.1,2.3,3.1,3.4c1.3-2.4,1-5.2,2-7.6C388.5,698.3,391.1,698.5,393,698z"/>
+		<path class="st6" d="M244.2,700c1.1,0.5,3.4,0.1,3.3,1.9c0.2,1.7,0.7,5.5-2.1,4.6C242.3,705.6,243.9,702.2,244.2,700z"/>
+		<path class="st6" d="M688.3,700.3c3,0.5,5.5,2.3,8.3,3.2c-0.1-0.7-0.3-2.2-0.4-3c3.5,0.6,6.8,1.8,9.8,3.6
+			c-0.2,0.2-0.6,0.7-0.8,0.9c-2.1-0.5-4.2-1.1-6.3-1.6c-0.6,2.7-1.2,5.5-1.7,8.2c-2.5-0.1-5.3-1-7.7-0.2c-1.8,2.7-1.7,5.9-1.6,9
+			c-3.1,2.4-6.1,4.9-9.6,6.7c-2.1-2.3-4.2-5-7.5-5.2c-0.4,1.5-0.8,3-1.4,4.4c-1.7,0.8-4.4,1.7-5.7,0c-0.9-1.9-1.4-4-2-6.1
+			c-2.7,0.3-5.4,0.6-8,0.9c0.4,1.5,0.3,3.4,1.4,4.6c2.1,1.1,4.5,1.3,6.6,2.4c2.1,1.6,4.1,3.5,6.4,4.8l-0.6,0.3
+			c-4.4-0.8-7.1-5.1-11.6-5.9c-0.3,0.6-1,1.7-1.3,2.2c-1.8-1.1-3.4-2.7-5.7-2.6c-2.6,2.2-0.2,5.3,1.4,7.3c1.1,1.2,2.3,3.7,4.4,2.6
+			c2.5-0.9,1.4-4.1,1.6-6.1c0.4,0.3,1.3,0.9,1.7,1.2c-0.2,1.6-0.5,3.3-0.7,5c0.4,0,1.2-0.1,1.6-0.1c-1.8,0.8-3.5,1.7-5.3,2.5
+			c-1.8-1.2-3.3-2.6-4.8-4.1c-1.6,0.7-3.4,3.5-5.1,1.7c-1-2.3,1.2-4,2.1-5.9c1.7-2.5,3-6.8-0.3-8.6c-2.8-1.7-4.6,2.2-6.7,3.5
+			c-2.5,2.7-6.3,0.4-9.4,1.7c-3.4,1.3-7.1,2.5-9.5,5.4c-0.8,1.1-1.5,2.2-2.3,3.3c0.4-2.9,1.6-5.5,3.5-7.6c-1.2-0.5-2.5-0.9-3.7-1.4
+			c7.7-2.4,15.8-4.5,22.3-9.6c-1.7,2.2-2.4,4.9-2.7,7.6c2.9-2,5.2-5.4,9.1-4.9c2.2-4.1,7.8-5.1,8.8-9.9c-1.7-0.2-3.4-0.5-5.1-0.7
+			c2.5-2.2,4.8-4.5,6.9-7c1.8-0.2,3.6-0.5,5.5-0.7c-0.4,2.4-0.6,4.8-1.3,7.1c-1.2,1.2-3.1,1.5-4.7,2.2c-1,2.3-2,4.6-3,6.9
+			c1.5,1.2,3.3,1.3,5.2,1.1c-0.3-1.5-1.4-3.1-0.9-4.7c2.1-1,4,0.9,5.9,1.6c0.2,3.5,0.7,6.9,2,10.2c0.8-0.3,2.3-0.8,3.1-1
+			c-0.2-3.5-1.6-6.8-2.2-10.2c0.5-2.7,1.5-5.3,3.3-7.4c2.5-2.8,6.2-0.2,9.1,0.4c-0.9,1.5-2,2.9-2.5,4.6c0.2,2,0.9,4,1.5,6
+			c-0.8,1.2-1.6,2.4-2.3,3.6c1.5,0.7,3.4,3.1,4.6,0.9c1.1-4.8,2.4-9.6,2.3-14.6c1.6-0.4,3.3-0.8,4.9-1.3
+			C687.7,705.1,686.5,702.1,688.3,700.3 M688.7,702.7c-0.6,2.5,0,6.9,3.4,7c1.1,0,2.2,0,3.4,0c0.5-1,1-1.9,1.5-2.9
+			C695.5,704.1,691.6,702.1,688.7,702.7 M655.5,706.4c-0.8,2,2.1,2.4,3.3,3.4c1.5-1.4,1.9-3.3,1.7-5.3
+			C658.7,704.4,656.3,704.2,655.5,706.4 M671.3,708.4c-2.2,2.5-3.9,6.1-2.4,9.4c1.9-0.4,3.8-0.9,5.8-1.3c-0.1-2.6,0.1-5.2,1-7.7
+			C674.2,708.5,672.8,708.1,671.3,708.4 M684.2,710.4c0.1,1.7-0.1,4.7,2.5,4.3c1.5-1.4,0.8-3.7,1-5.5
+			C686.5,709.6,685.3,710,684.2,710.4z"/>
+		<path class="st6" d="M1010.3,700.3c2.1-1.3,3.9,2.8,1.4,3.4C1009.5,704.6,1007.8,701.1,1010.3,700.3z"/>
+		<path class="st6" d="M1265.3,702.3c1.1,0.3,2.2,0.6,3.3,0.9c-0.2,2.2-0.9,4.3-1.8,6.3c-1.9-0.6-3.8-1.2-5.8-1.6
+			C1262.9,706.5,1264.2,704.4,1265.3,702.3z"/>
+		<path class="st6" d="M1116.1,702.4c0.7,1.3,1.3,2.7,1.9,4c1.7-0.7,3.4-1.4,5.1-2.1c0.1,1.7,0.3,3.4,0.4,5.1
+			c1.1,0.1,2.2,0.1,3.3,0.2c-0.7,1-1.3,2.1-1.9,3.2c-0.6,1.8-0.2,4.1-1.9,5.3c-1.7,1.6-4,2.2-6.2,2.5c1.5,1.5,3.3,2.8,4.4,4.7
+			c1,2.7,1.5,5.6,2.2,8.4c2.6-0.2,5.2-0.7,7.6-1.9c0.9,0.2,1.8,0.4,2.7,0.6c1.2-1.1,2.5-2.1,3.8-3.2l0.4,0.4c-0.2,0.6-0.8,1.8-1,2.4
+			c-2,1.8-4.4,3.1-6.7,4.4c0.7,0.7,1.3,1.3,2,2c2.2-1,4.4-2.5,7-2c0.1,1.5,0.1,3,0.2,4.5c-1.3,0.1-2.6,0.1-3.8,0.2
+			c-1.7-1.5-3.9-2.1-6-2.7c-1.1-2.8-4.1-3.1-6.7-3.5c0,1.2,0,2.5,0,3.8c-1.1-0.9-2.2-1.7-3.3-2.5c-0.7-1.4-1.6-2.7-2.5-3.9
+			c-0.8,1-1.5,1.9-2.3,2.8c-1.8-2.6-3.4-5.4-5.7-7.6c-1.5-1.3-3.2,0.6-4.7,1c2,2.1,4.1,4.3,6.2,6.4c-1.7,1.1-3.1,2.6-4.6,4
+			c0.3-1.6,0.5-3.2,0.8-4.9c-2.3-0.8-4.6-1.6-6.9-2.2c-1.4-2.2-2.7-4.4-3.9-6.6c2,1.2,4,2.5,6,3.7c0.2-1.3,0.4-2.6,0.6-3.9
+			c1.4-0.6,2.7-1.2,4.1-1.8c2.1,1,4.3,1.7,6.6,2.3c0.1-1.6,0.5-3.3,0-4.8c-2-0.5-4.1-0.8-6.1-1.3c-1.8-1.7-3.3-3.6-5-5.2
+			c0.9-1.1,1.9-2.2,3-3.2c-0.3,1-0.5,2-0.8,2.9c0.4,0.3,1.1,0.8,1.4,1c3.3-3,6.2-6.5,7.1-11c-0.1,2.3,0.1,4.5,0.2,6.8
+			c0.5-0.1,1.5-0.3,2-0.4c-1.4,1.6-3,3-4.4,4.6c-0.9-0.2-1.7-0.4-2.5-0.6c-0.4,1.5-0.7,2.9-1,4.4c3,0.1,6.1-0.1,9.2-0.6
+			c-1.6-0.3-3.3-0.5-4.8-1.3c0.5-0.6,1.4-1.7,1.9-2.2c1.9,0.8,3.8,1.5,5.7,2.3c-0.2-3.4,1-6.6,2.8-9.4c-1.9,0.9-4,1.4-6.1,1.7
+			C1116.1,707,1116.1,704.7,1116.1,702.4 M1115.3,723.4c-0.8,1.8-1.5,3.6-2.2,5.4c0.5-0.1,1.6-0.4,2.1-0.5c0.3,0.9,0.8,2.7,1,3.5
+			c3.2,1.9,1.6-2.8,1.8-4.5c0.8-0.3,1.7-0.7,2.6-1c-1.1-0.9-2.1-1.9-3.1-2.8C1117,723.5,1115.9,723.4,1115.3,723.4 M1121.2,733.9
+			c1-1.9,0.3-3.9-1.1-5.3C1117,729.8,1119.6,732.5,1121.2,733.9z"/>
+		<path class="st6" d="M372.9,705.2c1.6,0.1,3.2,0.1,4.8,0.2c0,2.1-0.1,4.3-0.1,6.4c-2.5-1.1-5.1-2-7.7-2.8c0.5-0.2,1.7-0.7,2.2-1
+			C372.4,707.1,372.7,706.2,372.9,705.2z"/>
+		<path class="st6" d="M537.5,706.6c1.3-0.5,2.2,1,3.2,1.5c-1.8,2.2-3.1,6.4-6.7,5.4c-1.1,0.1-1.3-1.3-1.9-1.9
+			C534.2,710.3,535.8,708.4,537.5,706.6z"/>
+		<path class="st6" d="M13.8,708c4.4,1.3,9.1,1.9,13.7,2.3c-3,0.7-6,1.6-8.4,3.7c3.3,0.5,6.7,0.9,10,1.5c-0.1,0.3-0.4,1-0.5,1.3
+			c-3.2-0.1-6.4-0.6-9.6-0.6c-2.1-0.1-2.9,3.2-1.5,4.4c3.3,3.1,7.4,5.3,11.5,7.2c0.3,1.5,0.7,2.9,1,4.4c0.1,6.3,0.2,12.6,0.1,18.9
+			c0.1,1.8-1.2,3.2-2.1,4.6c-0.1,0.4-0.3,1.3-0.5,1.7c0.6,0.1,2,0.3,2.6,0.4c0,2.6,0,5.2-0.2,7.9c-2.6-2.8-6-5-7.6-8.7
+			c1,0.7,2.1,1.3,3.1,2c1.1-3.7,2.9-7.1,4.4-10.6c-3.3,1.8-7.3,3.3-8.1,7.4c-2.1-0.3-4.2-0.5-6.3-0.7c0.6,4.7,0.2,9.5-2,13.8
+			c0.4-5.8,3-13.5-2.8-17.5c0.8-0.4,1.5-0.8,2.3-1.2c1.6-0.9,3.1-1.9,4.7-2.9c0.1-1.6,0.2-3.2,0.3-4.9c0.5,0,1.5,0,1.9,0
+			c0.5,1.4,0.9,2.8,1.3,4.2c0.8-0.1,1.6-0.2,2.4-0.3c-0.3,0.9-0.6,1.8-0.9,2.7c1.4-0.1,2.9,0,4.2-0.4c1.4-1.2,1.6-3.2,2-4.9
+			c1-4.7,1.4-10-1.3-14.2c-1.6-1.9-4-2.9-6.1-4.2c0.1,1.8,0.1,3.6,0.2,5.5c1.3,0.9,2.7,1.8,3.9,2.9c1,2.7,1,5.7,1.7,8.5
+			c-0.9,0.3-1.9,0.6-2.8,0.9c-1.8-2.2-2.6-5-2.9-7.8c-2.4,0.2-5.9-0.7-7,2.1c0.1,1.5,0.6,3,1.1,4.4c-0.9-1.2-2.8-2.1-2.8-3.7
+			c-0.6-3.9,4.6-3.7,7.1-4.8c0-2.1-0.1-4.1-0.1-6.2c-3.8,1.5-7.4,4.1-11.6,4.3c-1.7-1.1-3.2-2.5-4.7-3.7c0.8-1.6,1.3-3.3,2.6-4.6
+			c1.9-0.6,3.9-0.8,5.8-1.3c2.8-2.2,1.1-5.9,0.3-8.7c1.1,0.3,2.2,0.7,3.3,1.1c0.4-1.2,1.4-2.4,1.2-3.7c-0.7-0.7-1.4-1.3-2.1-1.9
+			L13.8,708 M6.2,724.3c-2.1,1.6,0.2,3.8,1.4,5.2c4-0.5,8.2-1,10.6-4.6c-0.9-1-1.7-2.8-3.3-2.3c-1.2,0.9-2.3,1.9-3.5,3
+			C10.4,723.9,7.8,722.1,6.2,724.3z"/>
+		<path class="st6" d="M1600.9,712.7c0.6-1.3,1.2-2.5,1.9-3.8c0.4,2.7,0.6,5.4,0.5,8.1c1.6-0.4,3.2-0.7,4.8-1
+			c-0.1-0.8-0.2-2.3-0.3-3.1c3.4,4.1,6.7,8.2,10.7,11.7c-1.1-0.3-2.2-0.6-3.3-0.9c-2.1-1-4-2.2-6-3.4c-0.3,0.3-1,1-1.3,1.3
+			c-2.4,0-5.4,0.6-6.8-1.8c-1.5-2.8-1.3-6.1-2-9C1599.6,711.3,1600.5,712.3,1600.9,712.7z"/>
+		<path class="st6" d="M551.6,713.8c0.5,0.4,1.4,1.1,1.8,1.5c-0.9,1.7-1.8,3.4-2.6,5.1c0.9,0.7,1.8,1.4,2.7,2.1
+			c1.4-1.5,2.8-3.1,4.9-3.8l0.8,0.4c-2.1,2.3-5.5,4.3-5.3,7.8c-0.2,2.4,0.6,6.3-2.9,6.4c-2.2-2.3-4.1-5.1-4.9-8.2
+			C548.2,721.5,551.9,718.4,551.6,713.8 M548.1,724.1c0.4,2.3,0.8,4.7,2.3,6.6c0.4,1,1.1,1.2,2,0.7C554,728.4,552,723.5,548.1,724.1
+			z"/>
+		<path class="st6" d="M379.3,719.2c1.4-0.8,2.9-1.6,4.4-2.3c0,0.7,0.1,2.2,0.2,2.9c-0.8,1-1.6,2.1-2.4,3.1c1,1.2,2.1,2.3,3.2,3.5
+			c1.6-0.5,3.2-0.9,4.9-1.3c0.4,1.2,0.9,2.4,1.3,3.6c-4.8-0.8-10.2,0-14.2-3.1c3,0.1,4-2.1,3.8-4.7c-2.1-0.2-4.2-0.4-6.4-0.6
+			C375.9,719.9,377.6,719.5,379.3,719.2z"/>
+		<path class="st6" d="M1263.2,720c0.4-1.2,0.9-2.4,1.4-3.6c0.5,0.2,1.5,0.6,2,0.9c-2.3,3.1,1.4,4.9,3.1,7c1.2,1.8,2.2,3.8,3.6,5.5
+			c-0.1,0.3-0.2,1-0.3,1.3c-0.1,0.5-0.4,1.3-0.5,1.8c-0.8-1.2-1.5-2.3-2.2-3.5c-1.6,1.6-3.1,3.4-4.6,5c-3.4-0.1-1.8-4.9-0.2-6.6
+			c0.2,2.2,3.4,2.9,3.9,0.6c1.1-2.1-1.6-3.3-2.7-4.6C1265.4,722.5,1264,721.5,1263.2,720z"/>
+		<path class="st6" d="M1255.9,723.1c0.7-0.7,1.4-1.5,2.2-2.2c0.9,0.2,1.8,0.5,2.7,0.8c0,0.5,0.1,1.5,0.2,2.1
+			c-0.4-0.1-1.4-0.2-1.8-0.3c-0.3,0.4-1,1.3-1.3,1.7c0.8,0.7,1.6,1.4,2.4,2.1c-1,1.8-2.1,3.5-3.1,5.3c-1.4-2.6-4.1-3.5-6.9-3.5
+			c-0.1,1.3-0.2,2.5-0.2,3.8c1.4,0.6,2.9,1.2,4.3,1.7c0.7,1.5,1.7,3,2.7,4.3c0,0.4,0.1,1.1,0.2,1.4c-1,0.7-2.1,1.3-3.2,1.9
+			c-2.1,0.2-4.2-0.9-6.2-0.3c-4.7,1-9.5,1.2-14.3,1.4c-0.1-4.2,0.1-8.4-0.2-12.6c1.7,0.5,3.7,0.5,5.2,1.6c1.3,2.7,2.2,5.6,4.2,8
+			c1.5-1.7,3.6-3.2,3.6-5.7c0.6-1.5-1-3.3-2.5-2.7c0.3-1.5,0.7-3,1.1-4.5c2.5,0,4.9,0,7.4-0.1
+			C1253.4,725.9,1254.6,724.4,1255.9,723.1z"/>
+		<path class="st6" d="M1546.4,722.4c1.9,0.6,5.7,2.2,4.6,4.8C1548.5,728.1,1546.7,724.5,1546.4,722.4z"/>
+		<path class="st6" d="M1091.2,725.2l0.2-0.4c0.8,1.3,1.5,2.7,2.3,4.1c-0.5,1-0.9,1.9-1.4,2.9c0.4,1.1,0.7,2.1,1.1,3.3
+			c-1.1-0.7-2.2-1.4-3.3-2c-0.4,0.5-1.2,1.5-1.6,2.1c0.9,1.2,1.7,2.5,2.6,3.8c0.9-0.7,1.8-1.3,2.7-2c0.3,1.3,0.5,2.6,0.8,3.9
+			c-2.7,0.3-5.3,0.6-7.9,0.8c-0.5-2.6-1.1-5.3-1.9-7.8l-0.4-0.5c0.8,0.7,1.6,1.5,2.5,2.2c0.5-1.1,1.1-2.1,1.7-3.1
+			c-0.9-1.2-1.8-2.4-2.7-3.6c0.5,0.2,1.6,0.8,2.1,1C1089.1,728.4,1090.1,726.8,1091.2,725.2z"/>
+		<path class="st6" d="M570.2,726.4c2-1,2.7,3.2,0.8,3.5C569.4,729.7,569.2,727.4,570.2,726.4z"/>
+		<path class="st6" d="M395.4,727.4c2.3,0.3,4.4,1.3,6.7,1.7c2-0.4,3.6-2.3,5.7-1.8c1.9,1.3,0,3.2-0.6,4.6c2.6,1.2,4.3,3.1,3.7,6.1
+			c-3.8,0.3-4-3.8-6-5.9c-3.5-1-7.3-0.8-10.5-2.6C394.1,728.6,394.4,727.8,395.4,727.4z"/>
+		<path class="st6" d="M940.6,727.7c4.6-0.1,9.2-0.2,13.8-0.1c-1.2,2-2.6,3.9-4.3,5.5c-0.8-0.3-1.6-0.6-2.4-0.9
+			c-0.6,4.2-2,9.4-6.9,10.3C940.7,737.6,940.6,732.7,940.6,727.7 M941.8,736.3c1.6-0.2,3.9,0.6,4.7-1.3c-0.4-1.7-1.7-3.4-3.5-3.6
+			C941,732.1,942.2,734.8,941.8,736.3z"/>
+		<path class="st6" d="M1551.5,732c0.1-2.2,2.4-3.3,3.7-4.7c0.4,2.2,0.9,4.3,0.6,6.6C1554.2,734.7,1552.1,733.8,1551.5,732z"/>
+		<path class="st6" d="M868.5,728.5c1.5,0,3.1,0,4.6,0c-0.1,4.6-0.1,9.2-0.2,13.8c-0.4,0.1-1.1,0.2-1.5,0.3c1.1-2.5,0.5-4.8-1.2-6.8
+			c0.4-1,0.8-2.1,1.2-3.1C870.4,731.2,869.4,729.8,868.5,728.5z"/>
+		<path class="st6" d="M1167.9,730.6c0.9-0.5,1.8-1.1,2.7-1.6c0.2,4.7,0,9.4,0,14.1c-2,0.1-4,0.1-6,0.1c0.1-1.4,0.3-2.8,0.5-4.1
+			c-0.2-0.7-0.7-2-0.9-2.7c1.1-0.1,2.3-0.1,3.5-0.2c0.1-1,0.1-1.9,0.3-2.8c-0.4-0.4-1.2-1.3-1.6-1.8c0-0.3,0.1-0.8,0.1-1.1
+			C1166.7,730.5,1167.5,730.5,1167.9,730.6z"/>
+		<path class="st6" d="M597.9,731.8c0.2-0.5,0.6-1.5,0.8-2c0.1,1.6,0.2,3.3,0.2,4.9c2.8-0.3,4.4-2,4.5-4.8c0.6,1.3,1.1,2.6,1.7,3.9
+			c1-0.2,2-0.4,3.1-0.6c0.4-1.1,0.9-2.3,1.3-3.4c1,1.8,2,3.5,3.2,5.2c-0.7,0.1-2.1,0.2-2.8,0.3c0.7,2.3,1.5,4.6,2.9,6.5
+			c-1.3,0.6-2.5,1.2-3.8,1.8c-3.3-1.5-7-2.2-10.7-1.8c0.8,2.4,1.2,4.9,1.1,7.4c-2.6,0-5.2-0.2-7.7-0.5c1.9-1,3.8-1.9,5.8-2.8
+			c-0.2-1.5-0.5-3-0.7-4.5c2.3-0.5,4.7-0.9,7.1-1.3c-0.4-2.2-1.2-4.9-3.9-4.9c-3.5,1.6-5.1,5.4-7.8,7.8c-1.9,1.5-4.1,2.6-6.1,4.1
+			c0.2-0.6,0.6-1.8,0.8-2.4c3.7-1.5,6.5-4.4,8.5-7.8c-0.3-0.8-0.7-1.5-1-2.3c1,0,2,0,3,0C597.6,734,597.8,732.5,597.9,731.8
+			 M603.7,735.8c0.9,2,2.1,3.8,3.3,5.5c0.8-1,3-1.7,2.4-3.4C609.5,735.2,605.3,733.3,603.7,735.8z"/>
+		<path class="st6" d="M783.3,736.3c3.4-2.3,7.5-3.3,11.5-4.2c-0.1,1.6-0.2,3.3-0.5,4.9c-0.2-0.8-0.7-2.3-0.9-3
+			c-2,0.4-4.1,0.9-5.8,2c-1.1,1.6-2.1,3.2-3,4.9c-1.3,0.1-2.5,0.2-3.8,0.3C781.5,739.5,782,737.7,783.3,736.3z"/>
+		<path class="st6" d="M1586.2,733.3c1.9-0.7,2.7,2.5,0.8,2.9C1585.1,736.9,1584.3,733.8,1586.2,733.3z"/>
+		<path class="st6" d="M1580.8,737c-0.3-2.9,2.8-3.4,3.9-0.9C1583.7,737.2,1581.2,740.1,1580.8,737z"/>
+		<path class="st6" d="M1584.1,738c0.6-0.4,1.8-1.1,2.4-1.5c0.6,1.6,1.2,3.2,1.9,4.8c-1.5,0-3.1,0-4.6,0
+			C1583.9,740.5,1584,738.8,1584.1,738z"/>
+		<path class="st6" d="M633.1,738.2c2.7,0,5.4,0,8.1,0.2c-1.2,2.1-2.6,4.4-5.2,4.8C633.4,743.1,633.5,740,633.1,738.2z"/>
+		<path class="st6" d="M844.1,740.7c2.2-0.1,3.8-1.8,5.8-2.4c1.8,0.2,2.5,2.2,3.8,3.2c-4.7-0.2-9.4-0.1-14.1,0.3
+			c-1.3-0.1-2.6-0.3-3.9-0.4l-1.3-0.2C837.6,740.9,840.8,740.9,844.1,740.7z"/>
+		<path class="st6" d="M567.1,741.1c1.5,0.4,4.4-0.3,4.5,2c0.4,1.9-2.2,1.7-3.4,1.6C567.2,743.8,567.4,742.3,567.1,741.1z"/>
+		<path class="st6" d="M1702.7,754.6c0.8,0.1,2.4,0.2,3.2,0.2c0.5,0.2,1.6,0.5,2.2,0.7c-0.2,0.8-0.6,2.5-0.8,3.3c-0.5,1-0.9,2-1.3,3
+			c-1.1-1.1-2.2-2.2-3.3-3.3C1702.7,757.3,1702.7,755.9,1702.7,754.6z"/>
+		<path class="st6" d="M1708.7,772.2c1.4-1.2,2.5,1.5,1.3,2.3C1708.5,775.6,1707.4,773,1708.7,772.2z"/>
+		<path class="st6" d="M1718.2,771.5c0.4,0.1,1.2,0.3,1.6,0.5c-0.2,2-0.3,4.1-0.5,6.1c-1.7-0.1-3.3-0.1-5-0.2
+			c-1.9,2.2-4,4.1-6.3,5.9c-1.7-0.9-3.4-1.9-5-2.8c2.1-1.1,4.3-1.6,6.7-1.8c0.4-1,0.9-2.1,1.3-3.1c1.1-0.5,2.2-0.9,3.4-1.4
+			c0.9,1,1.8,3.2,3.6,2.2C1718.2,775.1,1718.2,773.3,1718.2,771.5z"/>
+		<path class="st6" d="M1721.5,801.8c0.5-0.6,1.4-1.9,1.8-2.5c1.6,2.8,0.4,6.9-3.2,7C1720.6,804.8,1721,803.3,1721.5,801.8z"/>
+		<path class="st6" d="M1708.2,811.8c1.1,2.4,2.2,4.7,4,6.6c0.2,0.8,0.5,1.6,0.8,2.5c0.3,0.4,1,1.1,1.3,1.5c1.1,1.4,2.4,2.8,2.9,4.6
+			c-0.2,1.9-1.8,3.2-3,4.5c1.2,0.6,2.4,1.1,3.7,1.7c1.6-0.5,3.2-1,4.8-1.5c0.4,0.5,1.1,1.6,1.4,2.2c-0.5,0.1-1.5,0.2-2,0.3
+			c1.7,2.4,2.4,5.2,1.6,8.2c-1.2-1.2-2.3-2.6-2.6-4.3l-0.1-1.4c-1.7,0.3-3.4,0.6-5.1,0.9c-0.2,0-0.5,0.1-0.7,0.1
+			c2-1.3,4.2-2.3,6.2-3.5c-3.7-0.1-7.3,0-10.9,0.3c0.7,1.3,1.5,2.6,2.5,3.8c-0.4,0.5-1.1,1.6-1.5,2.1c-1.2-0.3-2.3-0.6-3.4-0.9
+			c0.6,0,1.8-0.2,2.3-0.2c-0.1-4.5,0.4-9-0.2-13.5c0-1.4,0.1-2.8,0.1-4.2c-2.9-0.7-3.6,2.6-4.8,4.5c0.7-3.5,1.1-7.1,0.6-10.7
+			c0.5,0,1.6,0.1,2.1,0.1C1708.2,814.5,1708.2,812.7,1708.2,811.8 M1711,824c0.2,1.9,0.6,3.8,1.2,5.6c1.2-0.4,2.5-0.8,3.8-1.1
+			C1716.2,825.5,1713.5,824.1,1711,824z"/>
+		<path class="st6" d="M31.9,823.7c-2-0.8-4.2-2.1-2.8-4.5l0.9,1.5c0.9,0.1,2.7,0.4,3.6,0.6C33.2,821.9,32.3,823.1,31.9,823.7z"/>
+		<path class="st6" d="M113.8,821.1c4.9-0.3,9.8-0.6,14.6,0c-1.8,0.8-3.7,1.5-5.6,2.1c-0.5,1-1,2-1.5,3c-2.2-0.9-1.2-3.2-1.1-5
+			c-1.1,0-2.2,0.1-3.3,0.1c-0.2,3.1-1,6.5,0.5,9.4c1.5,2.1,4.3,2.5,6.6,3.1c0.3-1.9,0.6-3.9,1-5.8c0.7,3.7,0.5,7.6-0.1,11.3
+			c-0.8,1.1-1.6,2.2-2.4,3.4c-1.4-1.8-1.3-4-0.9-6.1c0.1-0.4,0.2-1.2,0.3-1.6c-2-1.1-4.2-1.8-6.1-3.1c-1.4-1.9-1.9-4.3-2.7-6.5
+			c-1.5,0-3.1,0-4.6,0c-1.7-0.2-3.3-0.6-4.9-1.2c-0.9,0.5-1.8,1-2.7,1.4c0.1-0.4,0.2-1.1,0.2-1.4c-0.9-1.1-1.7-2.1-2.6-3.2
+			c3.1,0,6.2,0,9.3,0.1c0.4,1.1,1,2.1,1.8,3C112.1,824.5,112.8,822.3,113.8,821.1z"/>
+		<path class="st6" d="M51.3,820.9c2.6-0.2,5.3-0.2,7.9,0.1c-0.3,0.5-1,1.7-1.3,2.2C55.7,822.7,53.5,821.9,51.3,820.9z"/>
+		<path class="st6" d="M84.3,821.1c2.8,0,5.7-0.1,8.5-0.1c-0.1,1.2-0.2,2.4-0.2,3.7c-1.2-0.3-2.3-0.6-3.5-0.8
+			c-0.4,0.5-1,1.6-1.4,2.1C86.5,824.4,85.4,822.7,84.3,821.1z"/>
+		<path class="st6" d="M217.4,820.8c0.6,0,1.8,0,2.4,0c0,1.9-0.1,3.8-0.1,5.8c1.2-0.1,2.5-0.2,3.7-0.3c-0.4,0.5-1.1,1.5-1.5,2
+			c-1.2,0.1-2.3,0.2-3.5,0.3c-0.4,1.6-0.8,3.2-1.1,4.8c1.5,0.1,3,0.2,4.5,0.4c-0.2,0.5-0.7,1.5-0.9,2c-2.3-0.8-4.6-1.5-6.9-2.3
+			C217,829.9,217.6,825.3,217.4,820.8z"/>
+		<path class="st6" d="M260.3,820.8c0.7,0,2.1,0,2.9,0c0.1,0.8,0.3,1.5,0.4,2.3c-1.3,0.8-2.9,1.4-3.8,2.8c1,1.3,2.2,2.5,3.3,3.7
+			c-1,1.2-2.2,2.6-3.9,2.1c-1.7-1.9-2.9-4.3-3.6-6.7C256.1,822.8,258.6,822,260.3,820.8z"/>
+		<path class="st6" d="M286.8,820.9l0.2,0c1.1,1.1,2,3.2,4,2.3c1.2-0.7,2.4-1.6,3.5-2.4c1.5,0,3,0,4.4,0c1,2.8,1.5,6.3,4.6,7.6
+			c1.8,1,3.1-1.1,4.4-2.1c-2.1-1.5-3.9-3.3-5.4-5.5c2.1,0,4.3,0,6.4,0c0.5,1.8,1,3.5,1.5,5.3c1.4-1,2.8-2,4.1-3
+			c-0.9,2.6-2.2,5.1-3.9,7.3c0.1,0.9,0.2,1.8,0.4,2.7c-0.9,1.3-1.8,2.6-2.5,4c0.2,1.2,0.9,2.3,1.4,3.5c2.1-2.1,4.4-4.3,5.2-7.3
+			c0.6-2.5,0.8-5.1,1.5-7.5c0.5,3.1,1,6.2,1.4,9.3c0.5,0.3,1.6,1,2.1,1.4c1.5-2.4,3.1-4.7,4.9-6.9c2.2,1.8,2.9,4.5,3.3,7.2
+			c4.9,1.6,3,7.3,2.9,11.1c1,1.1,2,2.2,3.1,3.2h-6.2c-0.3-1.4-0.6-2.8-0.9-4.2c-2,1.2-3.8,2.7-5.5,4.2h-12.2c-2-1.3-3.9-2.7-5.6-4.4
+			c1.1-0.1,2.2-0.2,3.4-0.4c0.4-1.3,0.6-2.7,0.8-4c-1.3-0.1-2.6-0.2-3.8-0.3c-0.1,1.5-0.2,3.1-0.3,4.7c-0.8-2-1.5-3.9-2.2-5.9
+			c-0.8,1.1-1.6,2.1-2.5,3.2c-0.5-0.2-1-0.4-1.5-0.6c-0.7-1.3-0.7-3.1-2-3.9c-1.5-0.2-3,0.5-4.5,0.9c-1.1-0.6-2.2-1.3-3.3-1.9
+			c-2.4,4.5-4.9,9.2-8.7,12.6h-4.3c0.3-0.4,0.8-1.3,1-1.7c-1.1-2.3-1.7-4.8-1.9-7.4c1.2-0.2,2.5-0.4,3.7-0.4
+			c1.1,1.3,1.9,2.9,2.8,4.3c2.8-1.8,0.8-5,0.3-7.4c-1.1-0.3-2.3-0.7-3.4-1c1-0.7,2-1.3,2.9-1.9c0.5,0.4,1,0.8,1.5,1.2
+			c3.3-0.2,6.7,0.1,10,0c2.3-0.5,1.8-3.2,1.7-4.9c-5.4,0.1-10.8-0.2-16.1-1c0.2-0.5,0.5-1.3,0.7-1.8c2.5,0.3,5.1,1.7,7.6,0.6
+			C287.1,826.9,286.5,823.7,286.8,820.9 M295.2,822.3c-2.1,1.6,0.2,5.5,2.7,4.4C300.9,825.6,297.6,819.7,295.2,822.3 M299,827.9
+			c0.9,2.3,1.8,4.8,3.3,6.8c1,0,2.1-0.1,3.2-0.2c0-1.3,0.1-2.5,0.1-3.8C303.4,829.7,301.2,828.7,299,827.9 M316.3,843.2
+			c-1.6-0.9-3.6-2.6-5.5-1.4c-1.9,0.9-2.2,4.8,0.2,4.9c4.6,0.4,8.8-1.9,13.2-2.5c2.5-0.2,2.8-6-0.2-5.5
+			C321.1,839.2,318.9,841.8,316.3,843.2z"/>
+		<path class="st6" d="M372.4,820.8c3,0,6,0,9,0c-0.1,1.1-0.1,2.2-0.2,3.3c-2.2,0.4-4.4,0.7-6.4,1.6c0.2-0.8,0.4-1.7,0.6-2.5
+			c-0.4-0.3-1.2-0.8-1.7-1.1c-1.5,1.2-2.8,2.7-3.3,4.7c-0.5-0.6-1-1.1-1.5-1.7C370.1,823.7,371.3,822.2,372.4,820.8z"/>
+		<path class="st6" d="M994.6,820.8c1.8,0,3.5,0,5.3,0c-0.1,1.8-0.2,3.6-0.4,5.4C996.8,825.6,995.2,823.5,994.6,820.8z"/>
+		<path class="st6" d="M1006.6,820.8c2.6,0,5.2,0,7.8,0c-1.3,1-2.3,3.2-4.2,2.9C1008.5,823.6,1007.7,821.8,1006.6,820.8z"/>
+		<path class="st6" d="M1032.2,820.8c2.6,0,5.2,0,7.9,0c-1.2,1.3-2.3,2.7-3.5,4c1.2,1.4,3.8,2.6,3,4.9c-0.6,1.9-2.8,1.9-4.3,2.5
+			c0-2.5,1.8-5.5-0.1-7.6c-2.8,0.5-4.9,2.4-7.3,3.8c-1.5,0.5-2.3-1.4-3.4-2.1C1027,824.4,1029.6,822.5,1032.2,820.8z"/>
+		<path class="st6" d="M1100,821c4.2,0.2,8.3-0.2,12.5-0.2c-1.8,2.3-3.8,4.4-5.8,6.5c-1.4-0.2-2.7-0.5-4.1-0.7
+			c-0.6,4.1-0.1,8.2,0.7,12.3c-2.2-1.1-4.4-2.2-6.5-3.3c1.7-3.7,4.8-6.5,6.4-10.3c-0.9-0.7-1.8-1.3-2.6-2
+			C1100.5,822.8,1100.2,821.5,1100,821z"/>
+		<path class="st6" d="M1142,820.8l0.5,0c1.1,1.2,2.1,2.4,3.4,3.5c2.7-0.2,5.4-0.9,8.1-1.5c-0.7-0.7-1.3-1.4-1.9-2.1
+			c3.2,0,6.5,0,9.8,0.1c-0.2,1.3-0.3,2.6-0.4,3.9c1.2-0.1,2.4-0.1,3.6-0.1c-0.4,1-0.8,2-1.2,3c0.4,1.8,0.9,3.6,1.2,5.4
+			c-4.9-0.3-7.8-4.6-12-6.4c-2,0-3.2,1.7-4.5,2.9c-3,3.2-6.6,5.5-9.8,8.6c-0.1-0.7-0.2-2.1-0.3-2.8c-0.6,0-1.9,0.1-2.5,0.1
+			c2.5-1.9,5.8-3.4,7-6.6c1.1-1.9-0.5-3.6-1.1-5.2C1141.8,822.6,1141.9,821.7,1142,820.8 M1144.4,826.2c-0.9,1.6-1.7,4.1-0.2,5.6
+			c2.2-0.6,3.3-2.9,4-4.9C1147.5,825.5,1145.5,825.4,1144.4,826.2z"/>
+		<path class="st6" d="M1165.5,820.7c1.4,0,2.7-0.1,4.1,0c0.3,1.6,0,3.6,1.3,4.9c2.1-0.8,3.5-2.7,4.6-4.5c3,0.2,6.1,0.3,9.1,0.1
+			c-0.3,0.4-0.9,1.2-1.2,1.6c-1.2,0.4-2.5,0.5-3.5,1.3c0.5,1.1,1.4,1.8,2.3,2.6c1.7-1.5,3.4-2.8,5.2-4.1c0,0.8,0,2.3,0,3.1
+			c0.9,0,1.8,0,2.7,0c0.8-1.7,1.7-3.3,2.6-5c1.8,0,3.6,0.1,5.5,0.1c-0.8,1.1-1.5,2.2-2.2,3.3c-1.5,0-2.9,0.1-4.4,0.1
+			c1,3,2.6,5.7,4.2,8.4c0.7,1.2,1.4,2.5,2.2,3.7c-1.4,1.6-2.6,3.3-4.1,4.8c-1.2,0.2-2.5-0.1-3.6-0.1c-1.2,1.5-2.5,3-3.7,4.6
+			c-1.8-0.9-3.4-2-5.4-2.4c-1.2,0.6-2.4,1.3-3.5,2c-0.1-1.6-0.3-3.3-0.4-4.9c-1.2,0.2-2.4,0.3-3.5,0.5c0.7-1.3,1.4-2.6,2.2-3.9
+			c0.9,1.3,1.9,2.7,2.8,4c1-0.5,2.1-1,3.2-1.4c-0.1,0.7-0.3,1.4-0.4,2.1c1.6,0.7,3.2,1.4,4.9,2.1c0.6-1.4,1.1-2.8,1.7-4.1
+			c-1.7-0.1-3.5-0.1-5.2-0.1c1.3-1.6,3.8-2.9,3.3-5.4c-1.3-2.1-4.2-1.8-6.2-2.4c-0.7-1.1-1.5-2.2-2.1-3.3c1.8-1.6,1.9-4.1,1.1-6.2
+			c-2.1-1-2.6,1.9-3.3,3.3c-0.7,1.5,0.5,2.9,1.1,4.2c-0.2,1.6-0.2,3.2-0.3,4.9c-2.5,0.1-5.1,0.1-7.6,0.1c0.9-2.6,2.7-4.8,4.6-6.8
+			c-2-1.4-3.9-2.8-5.8-4.2c-0.6,0-1.8,0.1-2.5,0.1C1165.3,823,1165.4,821.5,1165.5,820.7 M1181.7,827.8c0,0.5,0,1.6,0,2.1
+			c2.5,1,5.1,1.8,7.1,3.8c1.8-0.7,2.3-2.5,3.1-4.1C1188.2,830.1,1185.2,827.4,1181.7,827.8z"/>
+		<path class="st6" d="M1207.9,820.7c2.5-0.1,5,0.6,7.3,1.7c0.5-0.6,1.1-1.1,1.7-1.7c1.9,0.1,3.8,0.2,5.7,0.2
+			c-0.3,1.3-0.6,2.5-0.9,3.8c-1.2,1.2-3.1,0.9-4.6,1.1c0.2,1.7,0.5,3.4,0.8,5.1c-0.4-0.1-1.3-0.4-1.7-0.5c-0.3,1.1-0.5,2.1-0.8,3.2
+			c-0.5-1.1-1.1-2.2-1.7-3.2c-1.6-2.1-3.4-4-5.2-5.8C1208.3,823.2,1208.1,822,1207.9,820.7z"/>
+		<path class="st6" d="M1249.4,821c3.5-0.2,6.9-0.2,10.4-0.2c-0.3,0.5-0.9,1.4-1.2,1.9c-1.7,1.1-3.7,1.7-5.7,1.9
+			C1251.8,823.3,1250.6,822.1,1249.4,821z"/>
+		<path class="st6" d="M1351,820.9c0.7,0.1,2,0.3,2.6,0.3c0.1,0.4,0.3,1.2,0.4,1.6C1352.7,824.8,1350.2,822.8,1351,820.9z"/>
+		<path class="st6" d="M1374.7,820.8c1.4,0,2.8,0,4.1,0c1.2,0.5,2.4,1,3.6,1.7c-0.2,1.6-0.6,3.1-1,4.7l-0.8-0.5
+			c-0.8-0.4-2.3-1.3-3.1-1.7c-0.4,1.6-0.7,3.2-0.8,4.8c-0.1,4.7-1.8,9.2-2.9,13.7c1.5-1,2.9-2.1,4.4-3.2c-1.1,2.3-2.4,4.6-3.1,7.1
+			c-1.3,0.1-2.6,0.3-3.8,0.5c1-3.2,1.7-6.5,2.8-9.7c0.8-2.6,1.8-5.2,1.4-7.9c-0.1-1.5-1.9-1.8-2.9-2.4c-0.1-0.4-0.2-1.2-0.2-1.5
+			c1.1,0,2.3-0.1,3.4-0.1c0.9-0.9,1.9-1.8,2.9-2.7C1377.3,822.7,1376,821.8,1374.7,820.8z"/>
+		<path class="st6" d="M1499,820.7c2,0,4,0,6,0c-0.1,1.3-0.2,2.6-0.3,4c-1.1,0-2.2-0.1-3.3-0.1C1500.6,823.3,1499.8,822,1499,820.7z
+			"/>
+		<path class="st6" d="M1553.5,820.8c2.8,0,5.6,0,8.5,0c0.1,0.8,0.3,2.5,0.4,3.3c-2.8,0.5-5.9,1.6-8.6,0.1
+			C1553.1,823.2,1553.6,821.9,1553.5,820.8 M1554,823c1.6,0.9,3.4,0.9,5.2,0.9C1558.8,821.2,1555.6,821.5,1554,823z"/>
+		<path class="st6" d="M1648.1,820.7c3.5,0.1,7.1,0.1,10.7,0c-0.6,0.8-1.6,1.5-1.5,2.7c1.2,0.9,2.5,1.6,3.8,2.5
+			c0.5-0.5,1.6-1.4,2.1-1.9c0.1,1.8,0.1,3.5,0.1,5.3c-0.6,0-1.9-0.1-2.5-0.1c1.2-0.8,1.4-1.9,0.8-3c-1.7-0.9-1.9,1.9-1.5,3
+			c0.1,1.2,0.3,2.4,0.4,3.7c-1.2,0.8-2.5,1.6-3.7,2.4c0.7-1.8,1.5-3.6,2.3-5.4c-0.7-0.5-1.3-0.9-2-1.4c0.9-0.6,1.6-1.4,2.2-2.3
+			c-1.3-1.1-2.8-2-4.2-3c-0.1,0.8-0.3,2.3-0.4,3C1652.5,824.3,1648.5,824.2,1648.1,820.7z"/>
+		<path class="st6" d="M1670,821.1c1.8-0.1,6.2-0.9,4.5,2.3C1672.5,825.2,1671.2,822.3,1670,821.1z"/>
+		<path class="st6" d="M1430,821.9c1.3-0.1,2.7-0.1,4.1,0c-0.3,1.3-0.1,3-1.4,3.8C1430.8,825.8,1428.2,823.7,1430,821.9z"/>
+		<path class="st6" d="M1451,822.9c3.2-2.4,7.5,3.5,4.8,6.1C1453.3,828,1452.5,825,1451,822.9z"/>
+		<path class="st6" d="M1435.4,824.4c1.1-0.6,2.2-0.6,3.5-0.2c1.6,3.1-4.1,3.9-4.2,0.6L1435.4,824.4z"/>
+		<path class="st6" d="M1472.8,824.1c3.1-0.1,7.6,0.5,7.2,4.6c-0.7,0.2-2.1,0.6-2.9,0.9c0.6,1.1,1.2,2.3,1.8,3.4
+			c-1.2,0.5-2.5,1-3.7,1.5c-0.3,1.3-0.6,2.6-1,4c-1.3,0.9-2.4,2-3.4,3.2c0.8,0.8,1.6,1.6,2.3,2.5c2-1,3.3-2.8,4.4-4.8
+			c1.7-0.8,2,1.4,2.2,2.5c-0.7,1.6-1.7,3-2.6,4.5c-1.4-0.7-2.8-1.3-4.2-1.9c-1.5,1.3-2.9,3.1-5.2,2.9c0.1-0.9,0.2-2.7,0.3-3.6
+			c-0.6-0.9-1.2-1.8-1.8-2.6c2-1,4.2-1.6,6.1-2.6c0.9-1.3,0.2-3.1,0.6-4.6c0.1-2.3,2.8-3.6,3.2-5.8
+			C1475,826.9,1473.4,825.8,1472.8,824.1z"/>
+		<path class="st6" d="M1130.5,829c2.1-1.9,4.7-3,7.3-3.8c0.3,0.4,0.8,1.3,1,1.7C1136.6,829,1133.2,832.7,1130.5,829z"/>
+		<path class="st6" d="M466.3,826.3c1.7,0.3,4.1-0.7,5.1,1.1c0,5.2-2,10-5,14.2c-0.4-0.1-1.1-0.4-1.4-0.5c0.8-1,1.6-2,2.4-2.9
+			C465.6,834.3,467.9,830.1,466.3,826.3z"/>
+		<path class="st6" d="M1109,828.2c1.6-0.4,3.1-0.8,4.7-1.2c0.1,2.3,0.2,4.6,0.2,6.9C1111.9,832.4,1109.2,831,1109,828.2z"/>
+		<path class="st6" d="M1367.3,826.7c1.9,1.6,2.8,5.4-0.3,6.2C1365.4,831.1,1366.6,828.7,1367.3,826.7z"/>
+		<path class="st6" d="M489.8,828.7c3-1.6,5.4,2.6,3.3,4.8C490.6,834.1,488.1,830.9,489.8,828.7z"/>
+		<path class="st6" d="M1392.3,830.8c0.1-0.6,0.2-1.9,0.2-2.5c1.4,0.6,4,0.5,3.6,2.7C1394.8,831.3,1393.6,831.2,1392.3,830.8z"/>
+		<path class="st6" d="M1465.6,835.1c0.2-2.6,1.7-5,4-6.2c0,2.2,0.1,4.4-0.2,6.6C1468.3,836.4,1466.4,836.2,1465.6,835.1z"/>
+		<path class="st6" d="M1687.5,828.6c0.3,0.4,1,1.1,1.3,1.5c-0.7,1.8-1.3,3.7-1.5,5.7c2.8,0.2,4.7-2,4.8-4.7
+			c0.5-0.4,1.4-1.1,1.9-1.5l-0.5,1.4c-0.4,1.1-0.7,2.2-1,3.2c1.1,0.8,2.3,1.7,3.5,2.5c-0.7,0.2-2,0.6-2.7,0.8c0,0.5,0.1,1.5,0.1,2
+			c1.2,0.5,2.5,1,3.8,1.5c-1.6,0.3-3.2,0.7-4.8,1.1c-0.3-2.4-0.7-4.7-1.3-7c-1.6,2.1-2.4,4.6-2.9,7.1c-1.9-1-3.8-2.7-6.2-2.3
+			c-0.1,0.6-0.3,1.7-0.5,2.2c-0.4-0.3-1.3-1-1.7-1.4c-0.8-0.5-1.7-0.9-2.5-1.4c0.1-0.3,0.3-1,0.5-1.3c1.5-0.2,3.1-0.4,4.7-0.7
+			c0-0.6,0.1-1.9,0.2-2.5c0.8,2.2,1.9,4.5,4.8,3.9c-0.8-1.9-1.8-3.7-2.2-5.7C1685.7,831.4,1686.7,830,1687.5,828.6z"/>
+		<path class="st6" d="M1698.8,833.2c-0.7-1.6-2.7-3.3-1.1-5c2.1,0.5,3.5,2.2,4.8,3.8c0.7-0.8,1.3-1.5,2-2.3c0.4,0.3,1.2,1,1.6,1.4
+			c-0.5,2.1-1,4.3-1.2,6.5c-0.7-0.5-1.4-0.9-2.1-1.3c0.1,1.1,0.3,2.3,0.5,3.5c-0.3,0.5-0.8,1.3-1,1.8c-1.1-0.3-2.1-0.5-3.2-0.8
+			c1-1.7,3.3-4,0.3-4.9c0.6-1.1,1.2-2.2,1.8-3.2C1700.6,832.7,1699.4,833,1698.8,833.2z"/>
+		<path class="st6" d="M1053.1,830.2c3.6,0.8,7.2,1.1,10.8,1.1c-0.3,1.9-0.4,4.2-2.2,5.4c-2.7,0.1-5.3,0-8-0.4
+			C1052.5,834.4,1052.7,832.2,1053.1,830.2z"/>
+		<path class="st6" d="M1225.5,833.7c0.3-1.2,0.6-2.3,1-3.4c0.6,1.3,1.3,2.6,1.9,3.9c-1.1,1-3.4,1.4-3.3,3.2
+			c1.1,0.5,2.2,0.9,3.4,1.3c0.2,0.6,0.5,1.8,0.6,2.4c-2.2,1.7-5,3-5.7,5.9c2.1,3.4,5.2-0.2,6.8-2.2c1.7-0.5,3.4-0.9,5.2-1.3
+			c0,1.1,0.1,2.2,0.2,3.3c0.8-0.2,1.6-0.4,2.4-0.6c-0.2,1.2-0.4,2.4-0.5,3.6c-0.9-0.9-1.9-1.7-2.9-2.5c-1.3-0.6-2.8-1-4.2-1.3
+			c-0.5,1.7-0.9,3.4-1.4,5.1h-10.5c0.3-0.5,0.8-1.6,1.1-2.1c0.8-0.7,1.5-1.4,2.3-2.2c1.9-2.2,3-5,2.8-8c-1.7,1.9-3.1,4.3-5.8,4.6
+			c0.8-3.4,2-6.7,3.3-9.8C1223.3,833.5,1224.4,833.6,1225.5,833.7z"/>
+		<path class="st6" d="M1422,831.2c1.2-0.4,2.5-0.8,3.7-1.2c0.3,2.4,0.6,4.8,0.8,7.2C1424,836.1,1422.3,834,1422,831.2z"/>
+		<path class="st6" d="M1151.5,830.9c2.8,1.1,5,3.2,7,5.4c2.8,0.3,5.5,0.8,8.2,1.3c-0.3,1.7-0.6,3.4-1,5.1c-0.3,0.1-1.1,0.3-1.4,0.4
+			c0.1-1.4,0.2-2.9,0.3-4.3c-3.7-0.3-7.2-1.5-10.3-3.6c-0.8,1.6-1.5,3.2-2.3,4.8c-1.4-0.9-2.7-1.9-4.1-2.6c-2.2-0.2-3.5,1.9-3.7,3.8
+			c3.1,0.3,6.1,1,8.9,2.4c1.7-0.3,3.5-0.7,5.2-0.7c-1.4,1-2.9,2-4.3,2.9c-1.8-0.5-3.5-1.6-5.3-1.3c-0.9,2.1-1.5,4.4-2.3,6.5h-2.3
+			c0-2.8,1.2-8.3-3.3-7.6c-0.7,1.4-1.2,2.9-1.7,4.4c-0.4,0-1.1-0.1-1.5-0.2c-1.3-2.4-2.5-4.9-3.4-7.5c1.1,0.1,2.1,0.2,3.2,0.4
+			c0.4-0.4,1-1.2,1.4-1.6c0.7,0.8,1.4,1.7,2.1,2.5c1.7-1.8,3.2-3.8,5.3-5.2c1.6-1.2,3.5,0.2,5.2,0.5
+			C1151.5,834.8,1151.5,832.8,1151.5,830.9z"/>
+		<path class="st6" d="M1479.2,834.1c2.7-1.3,6-4.4,8.9-1.9c-0.9,1.5-2.2,2.7-3.4,3.9c0.3,0.4,0.9,1.2,1.2,1.6
+			c-0.6,0.3-1.7,0.9-2.3,1.2c0.4,1.7,0.8,3.4,1.3,5.1c-0.4,0.1-1.2,0.4-1.5,0.6c0.1-3.1,0.1-6.5-3.2-7.9
+			C1479.8,835.8,1479.5,834.9,1479.2,834.1z"/>
+		<path class="st6" d="M450.3,833.2c1.5,0,3,0,4.5,0c0,0.7,0,2.2,0,2.9c-1.5-0.1-3-0.2-4.5-0.3C450.3,835.1,450.3,833.8,450.3,833.2
+			z"/>
+		<path class="st6" d="M1436.1,833.4c1.4-1.2,3.1,1.3,1.6,2.4C1436.2,836.9,1434.6,834.3,1436.1,833.4z"/>
+		<path class="st6" d="M397,842.9c2.9-3.4,6.7-5.9,10.4-8.3c0.6,1.5,1.1,3.1,1.6,4.7c-2,0.5-4.4,0.4-6.1,1.8
+			c-2.6,2.5-4.7,6.2-3.3,9.9h-5.6C396.3,848.8,396.4,845.8,397,842.9z"/>
+		<path class="st6" d="M1447.2,834.9c2.1,0.4,4.4,0.7,6.4,1.6c2.1,1.5,3.5,3.7,5.1,5.7c1.8,0.5,3.8,0.8,5.5,1.7
+			c0.5,1.1,0.9,2.2,1.2,3.4c-4.3-0.7-7.4-3.8-10.5-6.6c-2.1,2.9-3.7,6-5,9.4c-0.2-1.3-0.7-2.5-1.3-3.6c1.8-2.2,3.6-4.3,5.2-6.6
+			c-1.7-2-4.1-2.5-6.5-2.2C1447.2,836.9,1447.2,835.6,1447.2,834.9z"/>
+		<path class="st6" d="M1518.4,839.5c0-1.7,0-3.5,1.4-4.7c2.2,3.3,0.2,7.1-1,10.4C1514.8,846.2,1516.7,841,1518.4,839.5z"/>
+		<path class="st6" d="M1616.2,836c1.1-0.2,2.3-0.4,3.4-0.5c0.8,1.1,1.4,2.3,2.1,3.5c0.2-1,0.4-2,0.6-3c1.1,0.9,2.3,1.8,3.5,2.8
+			c-0.7,1.1-1.3,2.3-1.9,3.5c-1.8-0.3-3.6-0.5-5.4-0.7C1617.8,839.7,1617,837.9,1616.2,836z"/>
+		<path class="st6" d="M771.9,839.8c0.9-2.7,3.1-4.1,5.9-3.8c0,0.7-0.1,2.1-0.1,2.8C775.8,839.4,773.9,839.7,771.9,839.8z"/>
+		<path class="st6" d="M356.7,839.5c1.5-0.8,3-2.6,4.9-2.1c3,1.6,1.9,5.4,2.1,8.1c-1,0.8-2,1.6-3,2.4c-0.1,0.8-0.2,2.3-0.3,3.1h-5.8
+			c1.8-2.2,3.6-4.3,5.6-6.3c-2.9-1.4-7.2-1.7-8.1-5.4C353.7,839.3,355.2,839.4,356.7,839.5z"/>
+		<path class="st6" d="M1300.4,836.9c2.1,0.6,4.6,0.9,6.2,2.6c0.1,1.2-0.2,2.4-0.3,3.7c-0.2,1-0.5,2.1-0.6,3.1
+			c0,1.5,0.1,3.1,0.2,4.7h-6.7c1.6-1.1,3.1-2.2,4.6-3.4c-1.1-0.4-2.2-0.8-3.2-1.2c1.5-1,4.6-1.1,4.6-3.5c0.4-1.7-1-3-1.8-4.3
+			c-0.9,1.5-1.8,3.1-2.5,4.7C1300.7,841.2,1300.5,839,1300.4,836.9z"/>
+		<path class="st6" d="M1034.2,838.2c1.5-1.1,3,1.5,1.6,2.5C1034.2,841.8,1032.7,839.1,1034.2,838.2z"/>
+		<path class="st6" d="M1216,842.2c-0.1-1.8-0.1-3.6,1-5.2C1217.9,838.9,1219.2,841.9,1216,842.2z"/>
+		<path class="st6" d="M1310.6,846.2c-1-3.5,1.2-6,3.5-8.2c1.8,0.5,3.6,0.9,5.5,1.4c-1.5,1.2-3,2.2-4.5,3.4c1.4-0.4,2.8-0.8,4.3-1.2
+			c0,0.9,0,2.8,0,3.7c0,0.8-0.1,2.3-0.1,3.1l0,1c-0.3-0.4-0.9-1.3-1.2-1.7c-0.2-1.2-0.4-2.5-0.5-3.7c-1.7,2.3-3.3,4.7-4.9,7h-0.8
+			C1311.4,849.4,1311,847.8,1310.6,846.2z"/>
+		<path class="st6" d="M1728.2,838.4c1.6,0.1,3.2,0.2,4.8,0.4v8.6l-0.6-0.7c0-0.7-0.1-2-0.2-2.7
+			C1729.8,843,1728.1,841.2,1728.2,838.4z"/>
+		<path class="st6" d="M418,847c3.6-2.6,6.8-5.8,10.4-8.4c0.5,1.3,2.1,2.7,1.3,4.2c-1.3,3.4-4.9,4.9-7.9,6.5
+			c0.3,0.5,0.8,1.4,1.1,1.8h-8.4c-0.4-0.6-1.1-1.9-1.4-2.5c-0.8,0-1.6-0.1-2.5-0.1c-0.2,0.6-0.5,2-0.6,2.6h-0.6
+			c-0.3-0.5-1-1.7-1.3-2.2c-1.6-0.4-3.2-0.8-4.8-1.1c-0.1-1.6-0.2-3.2-0.3-4.8c1.7-0.1,3.3-0.2,5,0c2.6-0.3,3,2.9,4.2,4.6
+			C414.1,847.3,416.1,847.4,418,847 M405,847.3c1.8,0.5,5.2,0.2,4.7-2.5c-1.4-1.2-3.4-1.1-5.1-1.4
+			C404.5,844.7,403.7,846.3,405,847.3z"/>
+		<path class="st6" d="M490.1,840.1c1.7,0.1,4.2-0.4,4.7,1.8c-0.3,1.2-1.4,2.2-2.7,1.9C490.2,843.7,490.6,841.5,490.1,840.1z"/>
+		<path class="st6" d="M1337.1,839.9c0.4,1,0.8,2,1.2,3.1c1.8-1.1,3.6-2.2,5.5-3.2c-0.1,0.8-0.4,2.4-0.6,3.2c-1,1.4-2,2.7-3,4.1
+			c-1.1-0.9-2.3-1.8-3.8-1.2C1336.7,843.9,1336.9,841.9,1337.1,839.9z"/>
+		<path class="st6" d="M1632.9,839.7c3.7-1.1,2.1,3.6,2.7,5.8c1,0,2.1,0,3.1,0c-1.1,2-2.2,3.9-3.9,5.5h-6.8c2.3-0.8,5.1-1,7.1-2.6
+			c-0.3-0.5-0.8-1.6-1-2.1c-0.6,0.2-1.8,0.6-2.4,0.8C1632,844.6,1632.2,842.1,1632.9,839.7z"/>
+		<path class="st6" d="M177.6,840.9c0.2,2.7-0.1,5.5-0.3,8.2c2-1.7,4.1-3.3,6.2-4.9c0.8,2.2,0.8,4.6-0.1,6.8H174
+			C174.3,847.3,175.8,844,177.6,840.9z"/>
+		<path class="st6" d="M455.4,842.4c1.2-2.2,4.2-0.7,6.2-0.9c0.5,2.1-0.2,4-1.8,5.5C458,845.8,454.9,845,455.4,842.4z"/>
+		<path class="st6" d="M1022.2,845.7c-0.1-1.6-0.6-4.4,1.8-4.5c2.4-0.6,2.7,2,3,3.7C1025.6,845.6,1023.9,845.7,1022.2,845.7z"/>
+		<path class="st6" d="M1422.3,843.7c1.6-0.7,3.2-1.4,4.7-2.1c0.2,0.4,0.6,1.1,0.8,1.5c1.3-0.1,2.7-0.2,4-0.2
+			c0.3,0.2,0.8,0.6,1.1,0.9c-2,0.3-4.1,0.5-5.9,1.3c-1.4,1.7-1.8,4-2.7,6h-10.1c2.1-0.6,4.2-1.1,6.3-1.4
+			C1421.1,847.6,1421.7,845.6,1422.3,843.7 M1422.4,847.2c-1.4,0.9-0.3,3.7,1.3,2.4C1425.2,848.8,1424,845.9,1422.4,847.2z"/>
+		<path class="st6" d="M1653.9,841c0.6,0.5,1.3,0.9,2,1.4c0.2-0.1,0.5-0.2,0.6-0.3c0,0.5-0.1,1.6-0.2,2.1c-3.1,0.3-6.2,0.6-9.3,0.9
+			c0,2,0,3.9,0,5.9h-6.8c-0.2-2.9,1.7-5.2,3.3-7.3c3.2,0,6.4-0.1,9.6-0.2C1653.5,842.8,1653.8,841.6,1653.9,841z"/>
+		<path class="st6" d="M240.4,844.4c1.4-2.7,4.9-2.3,6.9-0.6c0.4,2.3,0.3,4.8,0.3,7.2h-2.2C243.6,849.1,240,847.5,240.4,844.4z"/>
+		<path class="st6" d="M551.5,842.5c1.5-0.6,3.1,0.1,4.6,0.5c-0.6,1.3-1.2,3.3-3.1,2.7C551.3,845.9,550.8,843.8,551.5,842.5z"/>
+		<path class="st6" d="M1067.3,841.9c1.3,1.7,2.4,3.7,2.4,5.9c-1.5,1.5-3.8,0.6-5.7,0.9C1064.5,846.1,1065.6,843.8,1067.3,841.9z"/>
+		<path class="st6" d="M1273.9,843.2c1.5,0.2,3,0.3,4.5,0.6c0.5,0.4,1.4,1.3,1.9,1.7c-1.7,0.7-3.6,1.6-5.4,0.8
+			C1274.5,845.3,1274.2,844.2,1273.9,843.2z"/>
+		<path class="st6" d="M2.1,847.7c-0.5-3.8,4.2-4.7,6.8-2.8c-0.4,0.9-0.8,1.9-1.2,2.9C5.8,847.8,3.9,847.7,2.1,847.7z"/>
+		<path class="st6" d="M1166.6,844.2c2,0.8,3.2,2.8,4.7,4.3c2.2,0.7,4.4,1.5,6.5,2.5h-14C1164.6,848.7,1165.4,846.4,1166.6,844.2z"
+			/>
+		<path class="st6" d="M1363.9,844.2c0.8,0,2.3-0.1,3.1-0.1c-0.2,1-0.5,2.1-0.7,3.2c0.9,0.8,1.8,1.7,2.7,2.5
+			c0.4-0.2,1.1-0.6,1.5-0.8c0.4,0.5,1.2,1.5,1.7,1.9h-7.1C1364.6,848.8,1364.2,846.5,1363.9,844.2z"/>
+		<path class="st6" d="M1436,848.8c1.7-1.8,3.7-5.1,6.6-3.6c0,0.6,0,1.7,0.1,2.2C1440.5,847.9,1438.2,848.3,1436,848.8z"/>
+		<path class="st6" d="M381.2,848.1c1.7-0.5,3.4-1,5.2-1.5c0.8,1.5,1.5,2.9,2.2,4.5h-5.4C382.5,850,381.9,849,381.2,848.1z"/>
+		<path class="st6" d="M1360.5,846.7c0.7,1.4,1.3,2.9,2.1,4.3h-3.9C1359.3,849.6,1359.9,848.1,1360.5,846.7z"/>
+		<path class="st6" d="M1542.6,847.9c0.8,0,2.4-0.1,3.3-0.1c0.4,1.1,0.9,2.2,1.4,3.2h-3.4C1543.4,850,1543,848.9,1542.6,847.9z"/>
+		<path class="st6" d="M137.7,851c-1.4-1.4,1.2-2.7,2.3-1.5c0.2,0.4,0.5,1.1,0.7,1.5H137.7z"/>
+	</g>
+	<g id="_x23_6d7e92ff">
+		<path class="st7" d="M423.2,0h2.4c0.8,0.9,0.2,3.4-1.3,2.7C423.6,1.9,423.2,1,423.2,0z"/>
+		<path class="st7" d="M1260.4,0h12c-3.4,0.9-6.9,1.7-10.4,2.2C1261.6,1.7,1260.8,0.6,1260.4,0z"/>
+		<path class="st7" d="M1359.3,0h2.7c-0.2,1.1-0.4,2.2-0.6,3.4c-1.9,0.8-3.8,1.6-5.7,2.2c0-0.9,0.1-2.7,0.1-3.7
+			C1356.9,1.3,1358.1,0.6,1359.3,0z"/>
+		<path class="st7" d="M1412.8,0h2.7c0.1,0.4,0.3,1.2,0.4,1.6C1414.6,2.3,1413.5,1,1412.8,0z"/>
+		<path class="st7" d="M354,1.2c0.7-0.1,2.2-0.4,2.9-0.6c0.2,0.6,0.5,1.9,0.6,2.6c-1.6,0.2-3.1,0.2-4.7,0.2
+			C353.2,2.9,353.7,1.8,354,1.2z"/>
+		<path class="st7" d="M386.2,1.3c0.8,0.4,1.6,0.7,2.5,1c-0.7,1.5-1.4,2.9-2.1,4.4c-0.6,0-1.9,0-2.5,0
+			C384.2,4.7,384.8,2.8,386.2,1.3z"/>
+		<path class="st7" d="M1288.6,5.7c-0.1-1.4-0.1-2.8-0.1-4.2c0.9,0.7,1.8,1.5,2.8,2.2c0.4,1.3,0.9,2.7,1.3,4
+			C1291.2,7,1289.9,6.3,1288.6,5.7z"/>
+		<path class="st7" d="M439.3,1.8c2,0.4,4.1,0.9,6,1.8c-0.6,1.3-1.2,2.7-1.7,4.1c-0.4,0-1.2,0-1.6,0c-0.3-0.7-1-2.1-1.3-2.8
+			C440.2,3.8,439.7,2.8,439.3,1.8z"/>
+		<path class="st7" d="M1388.4,2.9c2.5,0.9,4.8,2.2,6.7,4.1c0.7,0.9,1.4,1.8,2.1,2.8c-0.6,0.1-1.8,0.4-2.5,0.5
+			c-1.1-0.9-2.1-1.8-3.1-2.8l-0.4-0.3c-1-0.4-1.9-0.8-2.9-1.1C1388.3,5.1,1388.3,4,1388.4,2.9z"/>
+		<path class="st7" d="M376.9,3.2c2.1,0.2,2.5,2.2,3,3.9c-0.5,0.2-1.6,0.7-2.1,0.9c-0.3-0.4-0.8-1.3-1-1.8
+			C376.8,5.4,376.9,3.9,376.9,3.2z"/>
+		<path class="st7" d="M396.4,4.3c0.8-1,3.2-1.1,3.3,0.5C399.5,6.9,395.1,6.6,396.4,4.3z"/>
+		<path class="st7" d="M1372.6,4c1.9,0.6,3.8,1.3,5.7,2c-1.1,0.6-2.2,1.2-3.2,1.8c0.3,0.8,0.9,2.3,1.2,3.1c1.6,0.6,3.4,0.3,5.1,0.4
+			c1.2,1.3,2.6,2.5,4.1,3.6c0.2,0.2,0.8,0.6,1,0.8c0.5-1.7,0.8-3.4,1.4-5.1c0.3-0.3,0.9-0.9,1.2-1.2c3,3.6-0.8,6.9-2,10.3
+			c-2.8-0.4-5.5-0.9-8.3-1.3c-0.2-1-0.5-2-0.7-3c-1.5-0.7-3-1.4-4.4-2.2c-0.7-1-1.2-2.1-1.8-3.2C1372.2,8,1372.4,6,1372.6,4
+			 M1383.2,15.1c-0.1,0.8-0.1,2.3-0.2,3.1c1.6,1.1,3.2,0.7,4.2-0.9C1385.8,16.5,1384.5,15.8,1383.2,15.1z"/>
+		<path class="st7" d="M317.9,5.7c1.1,0,2.2-0.1,3.4-0.2c0.3,1,0.5,2.1,0.8,3.1c1.8,0.3,3.6,0.5,5.4,0.9l0.4,0.5
+			c-0.4,2.4-0.9,4.9-1.3,7.3c1.3-0.2,2.7-0.4,4.1-0.6c0.1,1.3,0.2,2.6,0.3,3.8l0.4,0.1c1.6,0.3,3.2,0.6,4.9,0.9
+			c-1,0.8-2,1.9-3.2,2.3c-1.5,0-2.6-1.3-3.9-1.9c0.3-1.3,0.6-2.5,0.9-3.8c-1.5-0.1-3-0.2-4.6-0.2c0.9,1.2,1.7,2.4,2.6,3.6
+			c-3.6-0.4-3.2-4.7-4.3-7.3c1.1-0.5,2.2-1.1,3.3-1.6c-0.9-0.1-1.7-0.1-2.6-0.1c-2.4,1.4-5,2.5-7.7,3.2c0-1,0-2.9-0.1-3.9
+			c1.9,0.7,3.5-2.1,1.4-2.9C319.7,7.8,320.6,6,317.9,5.7z"/>
+		<path class="st7" d="M354,6.7c1.2-0.9,2.4-1.7,3.8-2.3c-0.3,1.4-0.6,2.8-0.9,4.1C356.2,8.1,354.8,7.2,354,6.7z"/>
+		<path class="st7" d="M331.1,7.5c1.9-1.8,4-0.8,5.7,0.7c-1.3,0.3-2.5,0.6-3.8,0.9C332.6,8.7,331.6,7.9,331.1,7.5z"/>
+		<path class="st7" d="M600.2,7c1.7-0.5,2.2,0,1.7,1.6C600.2,9.2,599.6,8.6,600.2,7z"/>
+		<path class="st7" d="M421,8.9c0.5,0,1.6,0,2.2,0c3.3-0.2,6.6-0.1,9.9,0.2c-0.3,1.4-0.6,2.9-0.8,4.3c-1-3.3-3.4-1-5.2,0.1
+			c1.5,1.5,2.6,3.3,3.1,5.4c-0.6,0-1.7-0.1-2.3-0.1c-0.4-1.6-0.4-3.6-2.2-4.4c0.4-0.8,0.8-1.6,1.2-2.4C424.9,10.8,422.9,9.9,421,8.9
+			z"/>
+		<path class="st7" d="M1404.3,12.1c0.8-0.3,1.5-0.6,2.3-0.9c1.5,2.4,3,5,5.3,6.7c2.3-0.3,1.2-3,1.5-4.5c0.8-0.5,1.7-1,2.5-1.5
+			c0,2.8,0.1,5.5,0.1,8.3c-1.6,0.7-3.2,1.2-4.9,1.7l-1.3,0.4c-0.5,0.2-1.6,0.5-2.1,0.6c-2.4,0.9-4.6,2.1-6.8,3.4
+			c-0.2-0.6-0.6-1.8-0.8-2.4c-0.8-1.7-2.2-3-3.4-4.3c0.1-0.4,0.2-1.2,0.3-1.6c4-2.5,7.4,3.2,11.7,2.4c-0.8-2-2.5-3.2-4.3-4.1
+			C1404.3,14.8,1404.3,13.4,1404.3,12.1z"/>
+		<path class="st7" d="M332.4,12.7c1.4-0.3,2.8-0.7,4.3-0.9c2.3,0.9,4.5,2,6.8,2.9c0,1.1,0.1,2.1,0.1,3.2c-2.6-0.7-5.2-1.5-7.7-2.6
+			C334.7,14.4,333.5,13.5,332.4,12.7z"/>
+		<path class="st7" d="M405.2,13.1c1-1.3,3.7,0.2,2.5,1.7C406.7,16.1,404.1,14.6,405.2,13.1z"/>
+		<path class="st7" d="M479.7,19.5c-0.9-2.3-0.2-5.1,2.9-3.4c-0.2,0.6-0.7,1.9-0.9,2.6C481.2,18.9,480.2,19.3,479.7,19.5z"/>
+		<path class="st7" d="M1373.6,16.5c3.6-0.7,1.8,4.6,1.3,6.5c-0.7,0-2.1-0.1-2.7-0.2C1372.5,20.7,1372.8,18.5,1373.6,16.5z"/>
+		<path class="st7" d="M397.2,18.2c1.6,0.2,3.1-0.1,4.4-1.1c-0.2,4.2,4.3,1.5,6.5,1.2c-1.3,1.7-2.6,3.5-4,5.2
+			c-1.7,0.2-3.3,0.4-4.9,0.6c-0.7-1.5-1.4-3-2.1-4.5l0-0.1l0-1L397.2,18.2z"/>
+		<path class="st7" d="M1365.7,20.2c0.3-0.3,0.9-1,1.2-1.3c3.4-0.4,1.7,3.8-0.8,2.1L1365.7,20.2z"/>
+		<path class="st7" d="M1246.9,23.6c1-1.5,1.9-3,2.9-4.5c0.4,0.7,1.3,2.1,1.8,2.8c-0.4,0.6-1.1,1.7-1.4,2.3
+			C1249.3,24.1,1247.7,23.8,1246.9,23.6z"/>
+		<path class="st7" d="M1412.4,49c1.2,0.5,2.4,0.9,3.6,1.4c0,1.4,0,2.7,0,4.1c-1.4,0.7-2.7,1.4-4,2c0.1-1.1,0.3-2.2,0.5-3.3
+			c0.2-0.6,0.5-1.7,0.7-2.3C1413.1,50.5,1412.7,49.5,1412.4,49z"/>
+		<path class="st7" d="M316.5,55.1c1.5-1,2.8-2.4,4.5-2.8c1.7,0,1.6,2.3,2.4,3.4c-1.8,0.2-3.6,0.8-5.3,1.5c-0.4,0.2-1.2,0.5-1.6,0.6
+			C316.5,57.2,316.5,55.8,316.5,55.1z"/>
+		<path class="st7" d="M1401.4,56.5c0.2-1.2,0.5-2.5,0.7-3.7c-0.1,0.8-0.3,2.3-0.4,3c2.3-0.8,4.6-1.8,7-2.5c0.2,0.5,0.5,1.6,0.6,2.1
+			c-1.7,1.1-3.4,2.1-5,3.2C1403.3,57.9,1402.4,57.2,1401.4,56.5z"/>
+		<path class="st7" d="M336.1,67c1.5-1.5,3.2-3.7,5.2-1.7c-1.1,1.7-2.2,3.4-3.5,4.9C335.5,71,335.5,68.5,336.1,67z"/>
+		<path class="st7" d="M333.8,79.1c2.1-3.1,4.3-6.4,8.2-7.3c0,0.4,0,1.2,0,1.6c-1.5,1.6-3.1,3.1-4.6,4.7c0.9,0.9,1.8,1.8,2.6,2.8
+			c0.5-0.4,1.5-1.2,2-1.7c0,1.3,0,2.5,0,3.8c-1.3-0.4-2.6-0.9-4-1.3c-2.4,1-5.1,1.9-6.9-0.5C332,80.5,332.9,79.8,333.8,79.1z"/>
+		<path class="st7" d="M1403.2,73.3c2-0.1,4-0.1,6.1-0.1c0.6,0.1,1.8,0.3,2.4,0.5c-0.8,1.2-1.5,2.3-2.2,3.5c0.5,1,1,2.1,1.6,3.1
+			c-1.7,0.5-3.5,1-5.1,1.6c-0.6-0.4-1.3-0.8-1.9-1.2c0.9-0.6,1.9-1.3,2.8-2c0-1.4-0.2-2.8-0.5-4.1
+			C1405.3,74.2,1404.3,73.8,1403.2,73.3z"/>
+		<path class="st7" d="M1075.4,78.4c2-1.2,3.1,3.1,1,3.3C1074.9,81.5,1074.3,79.4,1075.4,78.4z"/>
+		<path class="st7" d="M323.1,81c0.5,0.8,0.9,1.6,1.4,2.3c-0.1,0.2-0.3,0.6-0.4,0.8c-2.3,2.2-4.7,4.3-7.6,5.7c0-0.7,0-2.2,0-3
+			c1.2-1.3,2.4-2.7,3.5-4.2C321,82.1,322.1,81.6,323.1,81z"/>
+		<path class="st7" d="M1085.1,81.3c0.7,0.1,2,0.2,2.7,0.3c-0.6,1.6-1,3.5-3,3.6C1084.8,83.9,1084.9,82.6,1085.1,81.3z"/>
+		<path class="st7" d="M862.6,86.1c1.4-1.2,3.2-1.9,5-2.3c1.2,4.5,3.1,8.7,4.1,13.2l-0.8,0.5c-3.1-3.1-3-8-4.6-11.9
+			c-2.1,3.9-2.9,8.5-6,11.8C861,93.7,862.7,90.1,862.6,86.1z"/>
+		<path class="st7" d="M1101.8,84.7c1.2-0.3,2.5-0.5,3.8-0.7c0.4,1.6,0.7,3.3,1.1,4.9c0.4,1.5,1,3.1,1.5,4.6
+			c0.4,1.4,0.6,2.8,0.9,4.2c-3.3-3.2-3.3-8.2-5.7-12c-1.8,4.2-2.4,9-5.3,12.7C1098.4,93.7,1099.7,89,1101.8,84.7z"/>
+		<path class="st7" d="M332.8,85.3c1.7,0.1,3.4,0.1,5.1,0.1c-0.1,0.8-0.1,2.3-0.2,3.1c-0.1,1-0.2,1.9-0.3,2.9
+			c0.6,0.1,1.7,0.3,2.3,0.5c-0.6,2-1.1,4-1.7,6c-0.1,0.3-0.4,0.8-0.6,1c-0.4-2.7-1-5.4-2.1-7.9c-1.1-1.4-2.4-3-4.3-2.6
+			c-2,0.7-2.7,3.5-4.9,4c-1.8,0.6-3.5-0.4-5.1-1C324.3,88.3,328.5,86.6,332.8,85.3z"/>
+		<path class="st7" d="M720.8,87.9c2.9-1.3,5.2,2.8,7.6,3.9c1.9,1.5,3.7,3.1,5.5,4.6c-0.2,0.7-0.7,2.1-0.9,2.8
+			c-0.4-0.2-1.3-0.7-1.7-1l-1-0.5c-2.5-1.7-4.9-3.4-7.4-5C721.7,91.4,720.5,89.8,720.8,87.9z"/>
+		<path class="st7" d="M752.7,92.2c2.5-1.8,5-3.7,7.5-5.5c0.1,1.4,0.2,2.8,0.2,4.2c-3.1,2.9-6.9,4.9-10.2,7.6
+			c1.3,3.7,2.7,7.4,4,11.2c-0.4,1.4-0.4,3.4-2.3,3.4c-1.5-0.4-2.8-1.3-4.2-2.1c-2-2.3-4.5-4.1-7-5.8c-2,1.6-4.1,3.2-6,4.8
+			c-1.8,1.8-4.1,2.8-6.6,2.3c-0.2-1.3-0.3-2.7-0.5-4c0.8-1.3,1.7-2.6,2.5-3.8c0,1.4,0.1,2.8,0.1,4.2c0.4-0.3,0.8-0.7,1.2-1
+			c3-2.3,6.1-4.4,9.1-6.7c3.7,2.6,7.3,5.2,11.3,7.4c-0.8-2.5-1.7-5-2.5-7.5c-0.5-1.9-1.1-3.7-1.6-5.6
+			C749.4,94.3,751.1,93.3,752.7,92.2z"/>
+		<path class="st7" d="M921,89.9c1.7-0.4,2.3,0.2,1.9,1.9C921.3,92.1,920.7,91.4,921,89.9z"/>
+		<path class="st7" d="M609.5,96.4c4.5,2.7,8.8,5.9,12.9,9.3c-1.5,4.2-2.9,8.4-4.2,12.6c3.8-2.5,7.4-5.2,10.9-7.9
+			c3.7,2.5,7.3,5.3,11,7.8c-1.1-4.3-3.1-8.4-3.8-12.8c3.8-3.4,8.1-6.2,12.5-8.9c0.2,2,0.2,4.2-1.3,5.8c-1.5,0.8-3,1.6-4.4,2.5
+			c-1.5,1-2.9,2.2-4.3,3.3c1,3.6,2.1,7.2,3.2,10.8c-2.6,0-5.1-0.1-7.7,0c-1.8-1.3-3.5-2.6-5.3-3.8c-1.6,1.3-3.1,2.5-4.7,3.8
+			c-4.2,0-8.4,0.1-12.6,0c1.6-0.3,3.2-0.8,4.7-1.2c1.2-3,2.6-6,3.1-9.3c-2.9-3.3-7.6-4.6-10-8.2C609.6,99.1,609.5,97.3,609.5,96.4z"
+			/>
+		<path class="st7" d="M1110.3,105.7c3.7-3.7,8.1-6.4,12.6-9c0.1,1.4,0.3,2.8,0.4,4.2c-3.5,2.3-7,4.7-10.3,7.2
+			c1.1,3.6,2.2,7.1,3.2,10.7c-2.5,0-5.1,0-7.6,0c-1.8-1.3-3.4-2.9-5.5-3.5c-1.7,0.9-3.2,2.2-4.7,3.5c-2.9,0-5.9,0-8.8,0.1
+			c0.4-0.1,1.2-0.3,1.6-0.4l0.7-0.3c4.4-1.8,7.8-5.3,11.9-7.7c3.4,2.8,6.9,5.4,10.6,7.8C1113.1,114.1,1111.7,109.9,1110.3,105.7z"/>
+		<path class="st7" d="M320.6,107c1.7-1.8,3.4-3.6,5.1-5.4c0.5,1.2,1.1,2.5,1.7,3.7c-1.4,2-3.1,4-5.5,4.7
+			C321.5,109.3,320.9,107.8,320.6,107z"/>
+		<path class="st7" d="M1393.4,151c1,0.7,2.1,1.5,3.1,2.2c0.3,2.3,0.1,4.9,1.6,6.8c1.2,2.1,3.6,0,2.7-1.8c-0.5-0.4-1.4-1.3-1.9-1.7
+			c0.1-0.6,0.3-1.8,0.5-2.3c0.5,0,1.7,0.1,2.2,0.1c0.2,2.4,0.1,4.9-0.1,7.4c-2.6,1.6-5.3,3.2-8,4.6c-0.8,0.1-2.4,0.2-3.2,0.3
+			l0.5-1.1c1-0.3,2-0.6,3-0.8c-1,0-2.1,0-3.1,0l-0.1-1.4c2.1-0.4,4.3-0.8,6.4-1.2C1394.8,158.9,1393,155.1,1393.4,151z"/>
+		<path class="st7" d="M325.3,153.8c0.8-0.3,1.7-0.6,2.5-0.9c0.6,2.3,1.5,4.6,2.7,6.7c0,0.2,0,0.7,0,0.9c-1.3,0.1-2.6,0.2-3.9,0.3
+			C326.4,158.4,325.9,156.1,325.3,153.8z"/>
+		<path class="st7" d="M1416,163c-2.6,1.5-2.7-3.2,0-1.8C1416,161.6,1416,162.5,1416,163z"/>
+		<path class="st7" d="M1410.6,169.8c0.4-2.8,2.9-3.5,5.4-3.4c0,1.4,0,2.9,0,4.4C1414.2,170.5,1412.3,170.3,1410.6,169.8z"/>
+		<path class="st7" d="M573.1,174.2c5.7,0.4,11.7,0.2,17.2,1.9c-0.9,0-2.6,0.1-3.5,0.1c-3.4,0.3-6.8,0.4-10.3,0.4
+			c1.5,1.1,3,2.2,4.6,3.2c-1.2,0.7-2.3,2.4-3.9,1.8c-3.2-0.7-3.3-4.5-4.2-7.1L573.1,174.2z"/>
+		<path class="st7" d="M556.4,179.4c2.8-1.4,4.7-4.4,8-4.8c-2.6,5.5-7.5,9.9-8.4,16.2c0.5,0.2,1.7,0.6,2.2,0.8
+			c-2.7,0.4-5.4,0.8-8.1,1.3c1-2,2-3.9,2.9-5.9C554.1,184.5,555,181.9,556.4,179.4z"/>
+		<path class="st7" d="M1211.2,179.1c4,0.2,7.8,1.1,11.8,1.3c13.8,0,27.6-0.2,41.3,0.1c-3,0.2-6,0.3-9,0.3c-2.8,0-5.7,0-8.5,0
+			c-0.1,1.9-0.1,3.8-0.4,5.7c-5,4.3-11.9,5.9-16.1,11.2c-1.7-1.7-3.6-3.1-5.6-4.3c0.3-1.2,0.7-2.3,1-3.5c3.3-1.3,5.6-4.1,8.6-5.8
+			c2.9-0.9,6.2-0.5,8.9-2.3c-5.1-0.8-10.8-2.3-15.8,0c-1.2,0.8-2.3,1.6-3.4,2.4c-4.5-0.5-8.5-2.5-12.2-5c0.1,2.9,0.3,5.9,0.1,8.9
+			c-0.1,0.8-0.3,2.4-0.4,3.2c-0.2-1.9-0.3-3.7-0.3-5.6C1211.1,183.5,1211.2,181.3,1211.2,179.1z"/>
+		<path class="st7" d="M586.8,183.1c2.9-3.7,7.5-4.2,11.9-3.7c0.4,2.6-1.2,5.2-3.6,6.1C592.1,185.9,588.9,185.5,586.8,183.1z"/>
+		<path class="st7" d="M881,180.5c2.1,0.1,4.3,0.1,6.5,0.1c-2.2,2.3-4.4,4.7-6.5,7c1.9,1.1,3.7,2.2,5.6,3.2
+			c-1.2,1.8-2.4,3.6-3.6,5.3c-2.6-2.4-5.8-4.2-9.4-4.8c1.2-1.4,2.3-2.7,3.5-4.1C877.6,184.6,878.9,182.3,881,180.5z"/>
+		<path class="st7" d="M893.5,180.8c3.9-0.4,7.9,0.1,11.9,0c-0.3,0.3-0.9,1-1.2,1.3c-3.9,2.3-8.3,3.6-12.8,3.6
+			c-1.2,1.5-2.5,3-3.7,4.4c-0.7-1.9-1.7-4-0.7-6C888.9,182.7,891.2,181.7,893.5,180.8z"/>
+		<path class="st7" d="M1083.1,180.6c1.8,0.1,3.6,0.2,5.4,0.3c-1.2,1.6-2.1,3.6-3.6,5c-1.7,1.4-3.7-0.1-5.3-0.7
+			C1080.7,183.6,1081.9,182.1,1083.1,180.6z"/>
+		<path class="st7" d="M816.7,182.1c2.7,0.4,5.2,1.2,7.6,2.5c-1.6,0.3-3.1,0.8-4.7,0.8C818.5,184.4,817.6,183.2,816.7,182.1z"/>
+		<path class="st7" d="M543.5,183.2c0.6,0,1.8,0.1,2.4,0.1c1.4,4,0.3,7.9-1.4,11.6c-1.5,0.6-3,1.1-4.5,1.7
+			C539.7,191.6,543.5,188,543.5,183.2z"/>
+		<path class="st7" d="M947.1,183.1c2.8,0.1,6.4-0.5,8.4,1.8C955.7,190.5,945.1,188.4,947.1,183.1z"/>
+		<path class="st7" d="M1102.3,183.4c1.3,0.8,2.5,1.9,3.7,3c-1.5,2.6-4.3,2.8-6.9,1.7C1100.1,186.5,1101.1,184.9,1102.3,183.4z"/>
+		<path class="st7" d="M1261.7,190.8c1.3-2.4,2.3-5,4.2-7c3.6-0.2,7,1.1,10.4,2.1c1.1,0.8,2.2,1.6,3.3,2.4c0.2,0.6,0.6,1.7,0.8,2.3
+			c-5.2,1.4-11,0.4-15.8,3.5C1263.7,192.9,1262.7,191.9,1261.7,190.8z"/>
+		<path class="st7" d="M911,189.5c1.2,0.1,2.5,0.2,3.7,0.3c1,1.4,2.1,2.8,3,4.2c-0.4,4-4.3,5.2-7.7,5.1c-2.1-1.4-4.2-2.8-6.3-4.1
+			c-0.1-0.6-0.2-1.8-0.3-2.3c3.2,0.3,6.2,2.9,9.5,2.1C912.6,193,911.8,191.2,911,189.5z"/>
+		<path class="st7" d="M1118.4,189.4c1.4,1.8,2.9,3.6,4.4,5.3c-1.6,0.6-3.2,1.2-4.7,1.8c-3.6-2.4-8.3-0.1-11.5-3
+			C1110.5,192.8,1117.6,195.1,1118.4,189.4z"/>
+		<path class="st7" d="M890.3,194.6c-1.4-1.2-1-3.4,0.7-4c2.4,1.4,3.4,4.1,5.2,6.2c2.5,3.4,7.7,4.9,7.7,9.9
+			c-3.2,1.9-7.8,3.3-10.7,0.1c-2.3-1.7,0.5-4,1.2-5.8C894.7,198.1,891.8,196.6,890.3,194.6z"/>
+		<path class="st7" d="M1083.5,192.9c2-1,4.1-1.5,6.3-1.5c0.5,0.7,1.1,1.4,1.6,2.1l0.7,0.8c0.5,1.1,1.1,2.3,1.6,3.4
+			c-3.1,0.8-6.3,1.5-9.4,2.1C1084.1,197.6,1083.8,195.3,1083.5,192.9z"/>
+		<path class="st7" d="M1254.9,192.9c1.6-0.2,3.6-0.8,5.1,0.2c0,1.7-1.4,4.2-3.3,3.4C1254.8,196.1,1253.9,194.6,1254.9,192.9z"/>
+		<path class="st7" d="M920.6,197c2.4-1.2,4.9-2.4,7.3-3.4c1.4,0.6,2.7,1.2,4.1,1.8c-5.1,2.6-4,9.1-4.7,13.8
+			c-0.1-1.9-0.2-3.8-0.3-5.7c-0.2-1.3-0.4-2.6-0.8-3.8C924.5,198.5,922.5,197.9,920.6,197z"/>
+		<path class="st7" d="M1405.6,195.8c0.5-0.4,1.4-1.1,1.9-1.5c2.7,1.3,4.8,3.5,7,5.4c0,0.5-0.1,1.6-0.2,2.1
+			c-2.8-0.7-5.3-2.3-7.2-4.4C1406.8,197.1,1406,196.2,1405.6,195.8z"/>
+		<path class="st7" d="M1124.5,197c1.3,1.7,2.7,3.3,4.1,4.9c-0.3,0.1-1,0.3-1.4,0.4c-2,0.5-4,1-6,1.5
+			C1122.3,201.6,1123.4,199.3,1124.5,197z"/>
+		<path class="st7" d="M1234.8,199.3c2.8-0.1,5.8-0.9,8.4,0.4c1.3,1.6-0.6,3.4-2.2,3.4C1238.5,202.8,1235.8,201.9,1234.8,199.3z"/>
+		<path class="st7" d="M492.5,204.1c0.1-2.7,2.9-1.1,4.4-0.8c-0.4,1.1-0.8,2.3-1.2,3.4C493.9,206.6,491.8,206.4,492.5,204.1z"/>
+		<path class="st7" d="M643,201.6c3.5,3.1,6.5,6.6,9.8,9.9c-3.3,1.8-7.4,3.5-8.7,7.4c-1,2.6-2.7,4.8-4.8,6.5c-2.2,0-4.4-0.2-6.6,0.4
+			c-1.9,0.4-2,2.7-2.8,4.1c-0.8,2-3,2.8-4.5,4c-1.4-3-3-6-4.7-8.9c0.6-0.2,1.7-0.5,2.2-0.7c1.1,0.6,2.1,1.2,3.2,1.9
+			c1.7-2,3.3-4.1,4.9-6.1c-1-0.8-1.9-1.7-2.8-2.5c0.2-2.1,0.5-4.2,0.8-6.3c2,0,4,0.1,5.9-0.2c0.9-1.1,1.2-2.6,1.8-3.9
+			c2.9,2.7,6.4,6.4,10.8,4.3C645.1,208.7,642.9,205.5,643,201.6 M637.7,216.7c-0.3,1.4-0.3,2.9-0.4,4.3c1-0.2,2.1-0.4,3.1-0.7
+			c0.3-1.4,0.4-2.8,0.6-4.2C639.8,216.2,638.7,216.5,637.7,216.7z"/>
+		<path class="st7" d="M823,205.1c2.9-1.7,6.2-2.5,9.3-3.7c0.5,0.3,1.6,0.9,2.1,1.2c0.1,0.6,0.4,2,0.6,2.6c-2,0.1-4,0.2-6,0.2
+			c0.3,3.5,3,5.8,5.2,8.2c-2.5,1.1-5.5,1.8-7.1,4.3c-2,2.7-1.6,6.3-2,9.4c-1.5,0-3,0.5-4.4-0.2c-1-6,5.2-10.1,5.8-15.9
+			C825.4,209.2,823.8,207.4,823,205.1z"/>
+		<path class="st7" d="M1100.9,206.4c2.9-1,5.8-2,8.6-3.1c2.9,2.2,6.2,4,9.3,5.8c-1.3,4.4-5.7,6.9-6.7,11.4
+			c-0.5,1.8-1.9,4.8,0.8,5.6c3,2,5.7-0.7,7.9-2.6c0.9,1,1.8,2,2.6,3c3.7-2.2,7.1-4.8,9.4-8.5c-1.8-2-4.2-3.7-5.4-6.2
+			c-0.3-2.8,2.6-4.5,4.1-6.5c7.4,9.2,14.9,18.4,23,26.9c-2,2.6-0.5,6.1-0.8,9.1c-3.4,0.7-6.7,1.7-9.7,3.3c-1.2-0.8-2.5-1.5-3.7-2.2
+			c-2.1,1.8-4.3,3.4-6.6,5c1.5,1.1,3.2,2.1,4.5,3.5c0.6,3,0.2,6.1-0.1,9.1c0.2,3.5-3.7,4.6-5.8,6.6c-0.6-0.7-1.3-1.4-1.9-2.1
+			c2-1.1,4.5-1.8,5.6-4c-0.1-4.8-4.3-7.6-7.6-10.4c0.8-2.7,1.6-5.4,2-8.2c-2.9-2.1-6.3,1.1-9.4,1c-1.5-1.1-2.7-2.5-4.2-3.5
+			c-1.5-0.2-2.9-0.1-4.4-0.1c-0.2,0.7-0.6,2.1-0.8,2.7c-3.4-4.4-7-8.8-10.3-13.3c1.5-2.2,1.2-4.9,1.8-7.4c2.1-2.2,5-3.6,7-6
+			c1.3-1.6,1.2-3.8,1.5-5.7c-3.3-0.4-6.7-0.5-10-0.1c-0.3,1.5-0.6,2.9-0.8,4.4c-3.4,0.6-6.9,0.9-10.1,2c-2.3,1-0.9,3.4-0.6,5.1
+			c0.6-1.5,1.2-3,1.9-4.5c0.2,0.3,0.7,0.9,1,1.1l0.9,1.1l-1.6-0.5c0.1,6.2,0.8,12.3,1,18.5c-2.1-1.2-4.4-1.4-6.4,0.2
+			c-3.4,2.6-8,0.8-11.6,2.4c-0.6,2.1-0.7,4.2-0.9,6.4c3.3,0.1,6.6-0.6,9.6-1.8c2.1-1.1,4.4-0.1,6.6,0.3c-0.2,1.6-0.3,3.2-0.6,4.9
+			c-4.8,0.7-9.7,1.1-14.5,1.6c-0.5,1.8-1,3.7-1.3,5.6c-0.3-8.8-0.5-17.5-0.1-26.3c0.4-6.8-0.8-13.6-0.7-20.4l0.7-1.5
+			c0.3,3.5,0,7.1,0.9,10.6c0.6,2.4,3,4.4,5.6,3.9c2.2,0.1,2.3-2.8,3.2-4.2c-1.6,0-3.3,0.1-4.9,0.1c0.9-3,1.5-6.3,3.6-8.6
+			C1088.5,206.6,1095.7,210.9,1100.9,206.4 M1084.7,229.3c1.5,0.4,3,0.5,4.5,0.6c0.9,1,1.8,2,2.7,3c0-1.5,0-3,0-4.4
+			c-0.4,0-1.2,0.1-1.6,0.1c-0.9-1.9-1.2-5.8-4.1-5.2C1083.3,223.6,1084.4,227.4,1084.7,229.3 M1129.7,229.3c2.4,2.2,5.9,2.8,8.6,4.5
+			c0.6,1.5,0.9,3.2,1.3,4.9c1.4-0.1,2.8-0.3,4.3-0.4c1.6,0.5,4.4,2,5.2-0.3c0.1-2.9-2.8-2.8-4.9-2.5c-0.9-1.2-2-2.4-2.7-3.8
+			c-0.2-2,1.1-4.2-0.2-6c-3.3-1-7-1.2-10.4-0.5C1129.1,225.4,1128.3,227.9,1129.7,229.3 M1079.5,227.6c-1.6,1.3-2.9,2.8-4.2,4.3
+			c0.2,1.4,0.3,2.9,0.5,4.3c2.6-1.1,4.8-2.9,6.9-4.8C1082.4,229.8,1081.7,227.1,1079.5,227.6z"/>
+		<path class="st7" d="M1411.5,203.2c1.5,0.6,3,1.3,4.5,1.9c0,1.4,0,2.8,0,4.2c-1.1-0.4-2.1-0.8-3.2-1.2
+			C1412.3,206.5,1411.9,204.9,1411.5,203.2z"/>
+		<path class="st7" d="M1244.4,207.2c2.8-1.2,5.6-2.6,8.7-2.8c1.8,0.2,3.5,1,5.3,1.7c-0.3,5.6-0.7,11.1-1,16.6
+			c-2.4-0.1-4.9-0.3-7.3,0c-1.9,1.7-3.1,4-4.9,5.9c-0.4-0.4-1.1-1.3-1.5-1.7c0-3.3,0.8-6.6,1-9.9c4.3-0.9,8.4,0.8,12.5,1.8
+			c-0.1-2.2,0.2-4.4-0.4-6.6c-1.5-2.8-5.1-4.7-8-2.7C1247.3,208.8,1245.8,208,1244.4,207.2z"/>
+		<path class="st7" d="M835.4,204.7c2.3-0.1,4.7-0.1,7.1-0.1c0.1,2.2-0.5,5.5-3.4,5C836.2,209.9,836.2,206.5,835.4,204.7z"/>
+		<path class="st7" d="M920.3,205.3c1.7-1.9,4.5,0.9,2.6,2.5C921.4,210.1,918.1,207,920.3,205.3z"/>
+		<path class="st7" d="M1005.2,212.9c5.5-0.5,7.7-6.8,13.1-7.3c0.2,3.1,0.4,6.3,0.8,9.4c0,0.1-0.1,0.4-0.1,0.5
+			c-1.1-1.2-2.4-2.2-3.8-2.9c0,2,0,4,0.1,5.9c1.2,0.3,2.3,0.5,3.5,0.8c0.4,0.9,0.7,1.9,1.1,2.8c0.6,2.8,0.9,5.6,1.3,8.4l-0.7,0.1
+			c-0.3-1.8-0.5-3.6-0.8-5.3c-0.5,0.1-1.5,0.2-2,0.3c-0.9,1.9-1.8,3.9-2.6,5.8c-2.7,0.4-5.4,0.3-8.2,0.2c1.2-0.2,2.4-0.5,3.7-0.7
+			c0.1-3.9,1.3-7.7,1.1-11.6C1010.4,216.4,1007.5,214.9,1005.2,212.9z"/>
+		<path class="st7" d="M506.4,213.4c1-1.3,4.2-0.6,3.4,1.4C509.1,217.4,503.8,215.6,506.4,213.4z"/>
+		<path class="st7" d="M1399.5,214.7c1.2-0.5,2.4-1.1,3.7-1.6c0.1,0.8,0.2,2.4,0.3,3.1c-2.2,0.9-4.4,1.7-6.6,2.6
+			c-0.9-0.2-1.8-0.4-2.6-0.6c-0.5-0.9-1-1.9-1.4-2.8C1395.2,215.8,1397.5,216,1399.5,214.7z"/>
+		<path class="st7" d="M488.6,224c1.5-1.7,3.5-2.9,5.4-4.1c0.8,0.8,1.6,1.6,2.4,2.4c0.6,1.1,1.2,2.2,1.9,3.3
+			C495.1,225.4,490.6,227.5,488.6,224z"/>
+		<path class="st7" d="M507.5,221.2c1.4,0.2,2.7,0.4,4.1,0.7c-4.1,6.1-7.1,12.8-9.7,19.6c-1.4,0.2-2.8,0.7-4,1.6
+			c-1-0.6-1.9-1.1-2.9-1.7c1.8-0.9,3.6-1.8,5.4-2.7c-1.5-4.3-0.2-8.8,1.4-12.9c1.5-0.3,3-0.8,4.5-1.2
+			C506.6,223.4,507.1,222.3,507.5,221.2z"/>
+		<path class="st7" d="M756.2,220.1c0.7,2.3,1.3,4.6,1.6,6.9c0.7,7.2-0.4,14.4-0.2,21.6c-0.3,0-0.9,0-1.2,0
+			c-0.7,2.5-1.2,5.4-3.2,7.2c-3.6,1.7-6.5,4.4-9.7,6.7c-1.6,0.1-3.2-0.1-4.7-0.2c-0.2,2.1,0.1,4.1,0.4,6.1c-2.1,0.3-4.2,0.7-6.4,1
+			c0.3-1.3,0.7-2.5,1.1-3.7c1.7-3.5,3-7.4,1.4-11.2c1.8-2.2,3.8-4.2,6-6c0.5,2.1,1,4.2,1.3,6.4c2.2-1,4.8-1.8,6.4-3.8
+			c2.9-3.4,3.7-8,6.5-11.5c2.4-2.7,1.7-6.6,1.8-9.9c-3.1,2.1-7,3.2-9.3,6.2c-0.4,2.5,0.3,5.2,0.3,7.7c-2.4-0.4-4.9-1.6-7.4-1
+			c-2.7,2.4-4.8,5.3-7.5,7.6c-2.4,1.8-2.8,4.9-3.3,7.6c-1.4,0.2-2.7,0.4-4.1,0.7c-3.1,0.3-5.8,2.4-6.9,5.3c-0.6,2.9-0.4,5.9-0.3,8.9
+			c0.1,1.7,0.2,3.5,0.3,5.2c2.9-3.2,6-6.2,9.6-8.6c1.5,0.1,3,0.2,4.5,0.3c-2.6,3.8-4.9,8.3-9.1,10.6c-1.5,0.9-3,1.7-4.5,2.6
+			c-0.5,1.5-0.8,3-1.1,4.5c0.9,1.1,2.1,2.6,3.8,1.8c2.1-1.2,3.2-3.6,5-5.1c1.5-0.6,3.1,0.3,4.6,0.4c-3,5.1-8.3,8.3-11.2,13.5
+			c-1.3,1.7-2.2,3.7-2.1,5.8c0.1,16.9,0,33.7,0,50.5l-0.8,0.9c0.8-17.5,0.1-35,0.4-52.4c0.4-14.6-0.4-29.2,0.1-43.8
+			c3.4-2.6,6.7-5.2,9.4-8.5c1.9-2.5,4.6-4.2,7.3-5.8c0.6-2.3,1.2-4.6,1.8-7c0.5-0.3,1.1-0.5,1.6-0.8c0.5-1.1,0.9-2.2,1.4-3.3
+			c6.1-1,11.1-5,15.4-9.2C755.6,223.2,755.9,221.6,756.2,220.1z"/>
+		<path class="st7" d="M851.1,220.8c1.9,5.6,1.3,11.5,1.4,17.3c0,3.1-0.1,6.2-0.8,9.3c-0.3-0.8-0.9-2.4-1.2-3.2
+			c-0.8,2.5-1.1,5.5-3.5,7c-3.6,2.6-4.5,7.4-8.2,9.8c1.7,3.9-2.4,6.9-3.1,10.5c-4,1.2-4.5,5.2-5.5,8.7c-0.8-1.6-1.6-3.1-2.4-4.6
+			c-2,0.9-3.9,1.8-5.9,2.7c-0.5-1.1-1-2.2-1.5-3.3c1.5-0.7,3-1.3,4.5-1.9c1.3-2.3,3-4.5,5.4-5.7c-0.3-2.2-0.6-4.4-0.9-6.5
+			c1.6-0.5,3.3-1.1,5-1.6c1.2-2.5,2.2-5.1,2.9-7.8c6.6-5.8,10.4-13.9,13.7-21.8C851.8,226.7,851.2,223.7,851.1,220.8z"/>
+		<path class="st7" d="M919.9,222.9c1.1-0.2,2.2-0.4,3.4-0.6c1,2.3,2.1,4.7,4,6.4c0,3.2,0,6.3,0,9.5c-0.5-0.4-1.5-1.3-2-1.8
+			c-1.6,1.3-3.2,2.6-4.7,4c-0.2,4,0.8,8.7-2.1,12c-2.5,3.3-7.6,4.2-11,2.2c-3-2.7,1.4-5.2,3.1-7.1c-0.7-2.1-1.3-4.2-2-6.3
+			c0.9-2.3,2.8-4.8,1.7-7.4c-1.8-2.1-3.7-4-5.1-6.4c0.7-0.7,1.4-1.4,2.2-2.1c0.4,0.1,1.2,0.4,1.6,0.5c1.1,2.9,2.7,5.9,6.2,5.9
+			C915.7,228.4,917.2,225.1,919.9,222.9z"/>
+		<path class="st7" d="M1393.3,225.9c2.3-2.3,4.7-5.3,8.4-4.5c-2.2,2.9-4.6,6-3.3,9.9c-1.2,1.9-3.1,3-5.1,3.9
+			c-0.9-0.8-1.8-1.6-2.7-2.4c0-1.1,0.1-2.3,0.2-3.4c0.2-0.3,0.6-1,0.8-1.3c0.2,1.4,0.4,2.9,0.7,4.3c1.3-0.6,3-1.1,3.4-2.6
+			C1394.9,228.4,1394.1,227.1,1393.3,225.9z"/>
+		<path class="st7" d="M830.3,224.2c2.7-0.9,5.8-2,8.4-0.2c-1.5,3.3-5.3,3.6-8.5,3.9C830.3,226.6,830.3,225.4,830.3,224.2z"/>
+		<path class="st7" d="M653,234.4c1-1.4,1.8-3.6,4-3.2c2.3-0.6,3.7,2.5,2.3,4.1C657.2,235.8,655.1,234.7,653,234.4z"/>
+		<path class="st7" d="M811.8,232.8c2-0.6,3.9-1.2,5.9-1.8c0.5,2.9,1.9,6.2,0.2,9c-1.5-1.6-3.2-3.1-4.8-4.5
+			c-0.1,2.2-0.2,4.5-0.2,6.7c1,0.1,2,0.1,3,0.3c0.5,1.5,0.5,3.2,0.5,4.8l-0.2,1.2c-1.4,0.5-2.9,1.1-4.3,1.6
+			C811.9,244.4,812.3,238.6,811.8,232.8z"/>
+		<path class="st7" d="M1474.6,234.1c1.5,0,3,0,4.5-0.1c0.6,1.6,1.1,1.6,1.7,0c3.5,0.1,7,0,10.6,0c-0.7,0.7-1.5,1.4-2.2,2
+			c-3,3.2-7.7,0.4-11.5,1.7C1476.6,236.5,1475.6,235.3,1474.6,234.1z"/>
+		<path class="st7" d="M1494.2,234c0.5,0,1.3,0,1.8,0c1.3,1,2.7,2.1,4,3.1c0.2,0.4,0.6,1.2,0.9,1.6c0.6,1.5,1.1,3,1.7,4.4
+			c-1-0.6-2-1.2-3-1.8c-1.7-0.9-3.4-1.6-5.1-2.2c0.5-1.1,0.9-2.1,1.4-3.2C1495.4,235.4,1494.6,234.5,1494.2,234z"/>
+		<path class="st7" d="M1240.4,240.9c0-2.1,0.1-4.2,0.2-6.4c1.2,0.4,2.5,0.8,3.7,1.2c0.5,1.4,1,2.9,1.5,4.3
+			c-1.6,0.2-3.3,0.5-4.9,0.7L1240.4,240.9z"/>
+		<path class="st7" d="M833.2,240.1c1.4-1.6,3.4-2.4,5.2-3.4c0,2.9-0.7,5.8-2.3,8.3c-1.6,1.7-3.4,3.1-4.9,4.9
+			c-2.9,3.9-5.4,8.1-8.5,11.8c-1.7,1.8-1.6,4.2-1.7,6.5c-1.6,1.1-3.4,2.1-4.7,3.6c-1.2,1.2-2.3,2.5-3.4,3.7c-1.3-1.4-2.4-3-2.9-4.9
+			c2-0.4,4-0.7,6-1c0.9-2.9,1-6-0.5-8.8c0.4-2.6,0.6-5.4,1.6-7.9c2.6-2.6,5.3-5.2,8-7.6c2-0.2,4.1,0,6.1,0.1
+			C831.8,243.7,832.2,241.8,833.2,240.1z"/>
+		<path class="st7" d="M1481.7,239c4.3,0.4,8.4,1.9,12.7,2.8c0.5,0.9,1.1,1.7,1.7,2.6c0.2,0.4,0.7,1.1,0.9,1.5
+			c-1.3,0.1-2.6,0.3-3.8,0.4c-0.8-0.8-1.6-1.6-2.4-2.4c-1.6-2.7-4.1-0.4-5.9,0.7c0.3,0.5,0.8,1.5,1.1,2.1c-3.5-0.2-2.5,4-3.2,6.3
+			c0.5,0.2,1.6,0.6,2.2,0.8c0.1-0.5,0.4-1.6,0.5-2.2c-0.1,2.9,2.8,3.3,5,4.1c-0.1,0.3-0.3,1-0.4,1.3c-0.5,0.4-1.5,1.2-2.1,1.7
+			c-1.8-1.7-3.9-3.2-5.3-5.2c-1-2.3-1.5-4.8-2.2-7.1c0.6-0.2,1.7-0.6,2.3-0.8C1482.3,243.4,1482,241.2,1481.7,239z"/>
+		<path class="st7" d="M470,245.1c1-2,2.5-3.7,4.1-5.3c2.6,3,2.3,7,2.7,10.7c2.7-1,3.9-4.9,7.5-4c-1.9,2.9-4.6,5.7-3.8,9.4
+			c1.7,0.9,4.8,0.7,5.1,3.1c0.8,3.6-2.4,6.1-4.7,8.2c-3.6-2,0-6.5-3.6-8.3c-2.1,2-4.1,4.1-6,6.4c-4-2.7-6-7.3-8.4-11.3
+			C464.6,250.6,468.2,248.6,470,245.1 M469.4,260.8c1.1-0.3,2.6,0,3.3-1.1c1.8-2.3,3.9-5.5,1.5-8.2
+			C471.9,254.3,468,256.6,469.4,260.8z"/>
+		<path class="st7" d="M1533.4,244.1c-1-2.8,2.7-2.4,4.3-2.8c0.2,2.1-0.3,4.2-1.6,5.9C1534.9,246.3,1534,245.3,1533.4,244.1z"/>
+		<path class="st7" d="M1156.1,245c2,0.5,4.3,1,5.5,2.9c0,1.5-1.2,2.6-2.5,2.9C1156.2,250.6,1156.6,247.1,1156.1,245z"/>
+		<path class="st7" d="M1249.1,245.9c1.1-0.3,2.3-0.6,3.4-0.8c0.9,1.5,1.8,3,2.7,4.5c0.4-0.1,1.2-0.3,1.6-0.4
+			c-0.2,6.7,0.2,13.4-0.2,20.1c-0.2-1.4-0.5-2.8-0.8-4.2c-0.4-1.1-0.9-2.3-1.3-3.4c0.2-2.6,2.7-5,1.4-7.6c-1.9-2.5-4.9-3.6-7.5-5.3
+			C1248.6,247.9,1248.8,246.9,1249.1,245.9z"/>
+		<path class="st7" d="M1523.1,245.2c1.5-1.2,3,1.5,1.7,2.5C1523.3,248.8,1521.8,246.2,1523.1,245.2z"/>
+		<path class="st7" d="M1407.7,252.3c2.6-2,5.2-4.4,8.5-5.1c0,0.7,0.1,1.4,0.1,2.1c-1.6,1.2-3.2,2.4-4.9,3.6c0,0.7,0.1,1.5,0.2,2.2
+			c0,1.6,1.1,2.9,2,4.2c-0.5,0.1-1.5,0.2-2,0.2c-0.5,0.1-1.4,0.2-1.9,0.3c-0.1-0.1-0.2-0.4-0.3-0.6
+			C1408.7,256.9,1408.2,254.6,1407.7,252.3z"/>
+		<path class="st7" d="M1432.8,247.1c0.6-0.2,1.8-0.5,2.5-0.7c2.3,1.4,1.2,3.9-0.2,5.5C1433.9,250.4,1432.2,249.1,1432.8,247.1z"/>
+		<path class="st7" d="M1685.2,249.1c2.9-2.1,3.5,1.5,3.6,3.7C1686.7,252.7,1684.7,251.7,1685.2,249.1z"/>
+		<path class="st7" d="M1499.1,255.6c1.4-2.4,3.1-5.3,6.5-4.3c0.3,0.7,0.7,1.4,1.1,2.2C1504.1,254.2,1501.6,254.9,1499.1,255.6z"/>
+		<path class="st7" d="M1507.5,255.9c2.5-1,5-1.9,7.5-2.8c-0.2,1.1-0.3,2.1-0.3,3.2c-1.2,0.4-2.4,0.8-3.6,1.2c-1,0.4-2,0.8-2.9,1.2
+			C1508,258,1507.7,256.6,1507.5,255.9z"/>
+		<path class="st7" d="M1470.6,254.1c2.3,0.6,4.6,1.2,6.9,1.8c-0.1,0.5-0.2,1.6-0.2,2.1c0.3,2.6-2.7,1.1-3.8,0.4
+			C1471.7,257.8,1471.1,255.9,1470.6,254.1z"/>
+		<path class="st7" d="M1398.9,258.1c-1.1-2.6,1.1-3.4,3.3-3.6c0,1.4-0.1,2.8-0.1,4.2C1401,258.5,1400,258.3,1398.9,258.1z"/>
+		<path class="st7" d="M1494.4,256.7c1.3,1.1,2.7,2.2,4.1,3.2c0.2,0.6,0.7,1.9,0.9,2.5l0,1.2c0.7-0.1,1.9-0.2,2.6-0.3
+			c-7.9,1.6-15.9,0-23.9,0.5l0.1-0.6c0.2-1.7,0.5-3.4,0.8-5c4.5,3.6,10.2,6.4,16.1,5c-1.1-1.2-2.4-1.7-3.9-2.1
+			C1492.3,259.7,1493.3,258.2,1494.4,256.7z"/>
+		<path class="st7" d="M1150,260c1.2-0.3,2.5-0.7,3.7-0.9c1.4,0.5,2.9,1.1,4.3,1.7c-2.7,1.3-5.7,2.3-8.8,1.6
+			C1149.4,261.7,1149.8,260.6,1150,260z"/>
+		<path class="st7" d="M1426.1,259.4c1.8-0.6,2.7,2.5,0.7,2.8C1424.8,262.8,1423.9,259.6,1426.1,259.4z"/>
+		<path class="st7" d="M451.8,277.5c5.7-3,9.1-8.7,12.9-13.7c0.9,1.3,1.8,2.6,2.8,3.9c-1.3,2.7-2.4,5.5-3.5,8.3
+			c-4.5,2.4-7.2,7.3-12.3,8.9C451.7,282.5,451.7,280,451.8,277.5z"/>
+		<path class="st7" d="M1140.4,265.3c1.2,0.2,2.4,0.4,3.7,0.6c0.8,0.9,1.8,2,1.3,3.4c-1.5,0.3-2.9,0.3-4.4,0.2
+			c-0.3-0.3-0.9-1-1.2-1.3C1139.9,267.4,1140.2,266,1140.4,265.3z"/>
+		<path class="st7" d="M1151.3,271.3c1.7-0.1,3.3-0.2,5-0.2c1.5,0.6,3.8,0.2,4.4,2.1c1.2,2.3,2.2,5.1,4.9,6.2
+			c2.9,1.9,6.3,0.1,9.4,0.1c3.1-0.4,4.5,4.1,7.5,3.3c2.4-0.1,2.6-2.9,3.5-4.6c2.6,0,4.9,1.2,6.8,2.8c-1,0.9-2,1.8-3,2.7
+			c-0.7,0-2.1,0.1-2.8,0.2c-0.8,1.1-1.6,2.3-2.4,3.4c-1.2-0.2-2.5-0.3-3.7-0.5c-1.3-0.9-2.5-1.9-3.9-2.5c-2.9,1.6-5.9,4.1-9.3,2.2
+			c-0.4-1-0.8-2-1.1-3.1c-3.4-1.4-6.7-3.2-10.2-4.7c-0.2,0.8-0.7,2.3-1,3.1c2.6,2.2,5.4,4.3,7.5,7c2.4,3.7,3,8.3,3.6,12.6
+			c2.5-0.1,5.4-0.7,7.6,1c1.9,1.5,3.6,3.6,6.1,3.9c0.7-0.2,2-0.5,2.7-0.6c0.9,0.3,1.9,0.7,2.9,1c4.2-0.7,9.8-0.8,11.8-5.3
+			c2.1-2.7,0.9-6,0.5-9c2.2-0.4,4.5-0.8,6.8-1.3c0.2,0.2,0.6,0.7,0.8,0.9l-0.2,0.4c-1.1,1.9-2.1,3.7-3,5.6c0.7,1.3,1.4,2.6,2.2,4
+			c-2.2,1.4-4.5,2.7-6.9,3.9c-0.8,2.2-1.5,4.4-2.2,6.6c-2,0.3-4.1,0.6-6.1,0.9c-0.3,2-0.6,4.1-0.9,6.1c-3.4-0.3-6.9-0.3-10.3,0
+			c-1.1-1.3-2.2-2.6-3.2-3.9c0.7-1.9,2.6-4.1,1.2-6.1c-1.4-1.6-3.5-2.2-5.2-3.1c-0.4,0.6-1.3,1.8-1.7,2.5
+			c-3.8-4.2-7.4-8.6-11.3-12.8c1,0,2.9,0,3.8,0c-0.5-3-3.4-3.8-5.8-4.7c0,0.6,0,1.9,0,2.5c-2.1-2.4-4.1-4.8-6.1-7.2
+			c1.6-0.5,3.2-0.9,4.9-1.4c-1.5-1.8-3.3-3.5-4.5-5.5c0.3-1.9,1.5-3.4,2.4-5.1C1152.3,273.6,1151.8,272.5,1151.3,271.3z"/>
+		<path class="st7" d="M1236.6,271.9c0.2,0.2,0.8,0.7,1,0.9c1.2,1.2,2.7,1.9,4.2,2.6c0.4,1,0.8,1.9,1.1,2.9c1.6,0.2,3.2,0.5,4.8,0.7
+			c-0.7,0.9-1.4,1.8-2.1,2.7c0.3,1,0.7,1.9,1,2.9c-1.2,0.5-2.4,1-3.7,1.4c-1.9-2.7-3.2-6.1-6.5-7.4
+			C1236.6,276.3,1236.6,274.1,1236.6,271.9z"/>
+		<path class="st7" d="M469.7,273.7c1.6-0.8,2.9,0.5,4.1,1.4c-0.5,1.1-1,2.2-1.5,3.2c-1,0.1-1.9,0.2-2.9,0.4
+			C469.4,277,469.4,275.3,469.7,273.7z"/>
+		<path class="st7" d="M822.5,280.9c0.8-0.8,1.5-1.7,2.3-2.5c1.3,0.7,2.5,1.3,3.8,2c0.5,1.8,1,3.5,1.5,5.2
+			c-6.9,5.9-14.8,10.7-23.3,13.8c1.3-2.7,3.8-4.1,6.2-5.6c2.4-1.4,2.6-4.6,4-6.8c2-1.4,4.4-1.9,6.6-2.7
+			C823.3,283.2,822.9,282,822.5,280.9z"/>
+		<path class="st7" d="M1094.6,278.7c1,9.3,0.5,18.7,0.6,28l-0.9-0.4c-2.1,0.4-2.9,2.7-4.2,4.1c-1.2-2.6,0.6-5.2,1.4-7.6
+			C1095.3,295.4,1093.9,286.8,1094.6,278.7z"/>
+		<path class="st7" d="M798.3,284.6c3.1-1.1,5.5-3.6,8.8-4.2c0.8,1.4,1.2,3,1.7,4.6c-2.3,0.6-5,0.8-6.4,3c-1.4,0.7-2.8,1.5-4.4,1.6
+			C795.7,288.6,796,285.1,798.3,284.6z"/>
+		<path class="st7" d="M1240.8,291.1c5-1.2,10.2-3.1,15.4-2.1c-0.1,2.1-0.2,4.1-0.2,6.2c-1-0.7-2-1.5-3.1-2.2
+			C1249,291.8,1244.5,293.4,1240.8,291.1z"/>
+		<path class="st7" d="M1079.7,291.8c3.4-0.2,6.7-1.3,10.1-1.5c-0.5,2.8-1.7,5.4-2.8,8c-4,0.5-7.9,1.1-11.9,1.6
+			C1074.4,296.1,1077.2,293.9,1079.7,291.8z"/>
+		<path class="st7" d="M675.5,293.4c0.7-0.1,2-0.3,2.7-0.3c-1,11.3-2.7,22.6-6.8,33.2c0-1.5,0-3,0-4.5c-0.9-1.1-1.8-2.2-2.7-3.4
+			c1.5-1.5,2.8-3.2,3.4-5.2c-3.9-0.4-7.2,1.8-9,5.1c-1.5,2.3-3.5,4.3-5.9,5.8c-2.9,1.9-6.5,3.2-8.6,6.2c-1.9,2.8-3.9,5.7-6.1,8.2
+			c-3.8,3.7-8.3,6.7-11.4,11.1c-1.4,2.5-4,3.5-6.6,4.2c0-1.9,0-3.8,0-5.7c2.3-2,4.6-3.9,7.2-5.4c3.2-0.4,4.2-3.2,4.5-6
+			c1.1,0.2,2.3,0.5,3.5,0.8c0.9-1.8,1.8-3.6,2.8-5.3c3.2-4.6,7.1-8.7,11.8-11.8c4.3-2.7,7.2-7,11-10.4c3.4-3.3,7.5-6,10.2-10
+			C675.7,297.9,675.5,295.7,675.5,293.4z"/>
+		<path class="st7" d="M1179.9,295.5c1.8,0,3.6,0.1,5.4,0.3c-0.1,1.3,1.1,3.3-0.7,3.8c-1.7,0.8-3.7,0.4-5.5,0.6
+			C1179.4,298.6,1179.7,297.1,1179.9,295.5z"/>
+		<path class="st7" d="M1242,299.5c0.4-1.7,1.6-3,3-4c0.9,0.3,2.6,0.9,3.4,1.3C1249.1,300.5,1244.2,299.4,1242,299.5z"/>
+		<path class="st7" d="M648,306.6c2.2-5.2,7.4-9,12.8-10.2c-0.6,3.4-3,5.9-5.5,8.1C653.3,306.3,650.7,306.8,648,306.6z"/>
+		<path class="st7" d="M1248,307.4c2.1-0.3,4.1-0.6,6.2-0.8c0.4,0.1,1.3,0.4,1.7,0.6c-0.1,2.3-0.2,4.7-0.2,7
+			c-1.3,0.5-2.6,1.1-3.8,1.6C1250,313.3,1248.6,310.5,1248,307.4z"/>
+		<path class="st7" d="M1206.2,311.2c1.5-2.6,4.9-2.2,6.8-0.4c3.3,2.9,8.9,2.2,10.8,6.8c0.8-0.1,1.7-0.1,2.6-0.1l0.2,0
+			c1.7,2.3,3.5,4.5,5.2,6.8c1.3,1.8,2.6,3.6,4,5.2c-1.9,1.2-3.5,3.1-3.7,5.4c1.3,1.9,3,3.3,4.7,4.8c-4.2,0.6-8.5,0.5-12.7,1.1
+			c0.9,2.1,1.4,4.4,3,6.2c1.7,0.8,3.6,0.6,5.5,0.8c0.6-1.2,1.3-2.4,1.9-3.6c1.1,0.8,2.3,1.6,3.4,2.5c1.4,1.1,2.8,2.2,4.2,3.4
+			c0.8,0.7,1.7,1.3,2.6,2c1.1-1.2,2.2-2.3,3.3-3.5c1.2,0.4,2.5,0.8,3.8,1.2c0-0.5,0.1-1.6,0.1-2.1c-2.2-0.2-5.1,0.3-6.4-2
+			c-0.6-2.9-1.2-5.9-3.6-7.9c2.4-3.5,4.4-7.1,6.2-10.9c0.7-1.6,2.4-2.4,3.8-3.4c1,0.7,2,1.5,3.1,2.2c0.1-0.5,0.3-1.4,0.4-1.9
+			c0.1-0.6,0.3-1.7,0.4-2.2c0.3,10.3-0.2,20.6-0.3,30.9c-1.5,0.7-3,1.4-4.5,2.2c-2.2-0.6-4.3-1.3-6.4-1.9c0.7,3.4,1.7,6.7,2.7,9.9
+			c2.7-0.3,5.4-0.5,8.2-0.8c0,2.5,0.1,4.9,0.2,7.4c-1.6,1.2-3.2,2.4-4.7,3.6c-1.9-0.9-3.8-1.7-5.7-2.6c-3.4,1.9-7,3.5-10.9,3.3
+			c-2.1,1.8-3.9,3.9-5.5,6.1c-4.9-6.1-9.6-12.3-14.6-18.2c1.2-2,3-3.9,2.7-6.4c-1.5-1.3-3.2-2.3-4.8-3.4c2.6-1.3,5.8-1.8,8.5-0.4
+			c3.6,1.6,0.7,6,0.6,8.9c3.2-0.9,7.1-3.1,6.4-7.1c-2.1-1-4-2.2-5.9-3.5c0.5-2.1,0.6-4.2,0.2-6.2c-2.7,0-5.4,0-8.1-0.4
+			c-1.4-3.3,4-5.2,3.9-8.6c-2-1.4-4.6-1-6.9-0.9c-2.6,0-3.6,2.9-5.3,4.4c-0.2,0.2-0.7,0.7-0.9,0.9c-2,1.7-3.7,3.8-5.1,6
+			c-2.4-2.9-4.8-5.8-7.3-8.7c0.4-0.1,1.2-0.3,1.6-0.4c-2.3-3.5-3.3-7.7-6.2-10.9c0.4-1.2,0.9-2.5,1.3-3.7c2-0.3,4.1-0.3,6-1
+			c1.6-0.8,1.2-2.8,1.5-4.2c0.5-0.3,1-0.6,1.6-0.9c1.6,2.8,3.1,5.5,4.8,8.2c0.2,0.3,0.6,1,0.8,1.3c3.3,1.2,6.7,2.2,9.9,3.6
+			c1.5,0.9,3.3-0.1,4.5-1c3-1.9,0.7-5.6,0.2-8.2c-2.2-0.9-4.3-1.7-6.4-2.6c-1.3,0.9-2.7,1.7-4,2.6
+			C1207.2,316.4,1206.2,313.9,1206.2,311.2 M1195.2,323.2c0.1,3.3,1.2,6.4,2.5,9.4c0.5,0,1.5,0,2,0c1.2-2.8,1.1-6.1-0.7-8.7
+			C1197.8,323.3,1196.4,323.5,1195.2,323.2 M1223.9,330.9c-1.5,1.8,0.2,4.4,1.7,5.7c1.7,0.3,4.5,0.9,4.9-1.5
+			C1229.3,332.7,1226.7,329.4,1223.9,330.9 M1254.3,332c-1.3,1.2-2.5,4.2-0.2,4.9C1256.2,336.4,1255.6,333.2,1254.3,332
+			 M1235.2,351.9c1.4,1.8,3,3.5,4.8,5c1.6-0.3,3.1-0.7,4.7-1c-1.3-1.2-2.6-2.3-4-3.3c-0.1-0.8-0.4-2.3-0.6-3
+			C1238.3,350,1236.7,350.8,1235.2,351.9 M1240.7,362.6c-1.7,0.7-1.2,2.7-1.6,4.2c2.2,0.7,4.5,0.4,6.8-0.1
+			C1246.2,363.7,1243.2,362.3,1240.7,362.6z"/>
+		<path class="st7" d="M889.4,313.9c1.7-2,3.5-4.1,6-4.9c0.1,1.5,0.4,3.1,0.2,4.7c-0.9,1.3-2.3,2-3.5,3
+			C891.2,315.7,890.3,314.8,889.4,313.9z"/>
+		<path class="st7" d="M632.5,318.1c2.8-2.5,6.3-4,10.2-3.3c-0.1,1.2-0.2,2.4-0.2,3.6c0.5,0.3,1.6,0.9,2.1,1.2
+			c-0.1,1.9-0.2,3.7-0.3,5.6c-1.5,1.2-3,2.2-4.4,3.4c-1.7,2.2-2.4,5.3-4.8,6.9c-2.3-0.9-3.6-3-3.8-5.4c1.7-0.6,3.8-0.4,5.3-1.5
+			c1.2-1.7,1.7-3.9,2.5-5.8c-2.6-0.4-5.1,0.2-7.6,0.9C631.8,321.9,632.2,320,632.5,318.1z"/>
+		<path class="st7" d="M1237.5,316.2c1.5,0.3,2.9,0.7,4.4,1c0.5,0.5,1.5,1.5,1.9,2c-1.2,2.4-3.4,3.6-6.1,3.4
+			C1237.5,320.5,1237.4,318.4,1237.5,316.2z"/>
+		<path class="st7" d="M1093.4,321.3c0.5-0.4,1.4-1.2,1.9-1.6c0,5.4,0.1,10.7,0.3,16.1c-1.8,0.5-3.5,1-5.3,1.6
+			c-1.7-2.2-3.7-4.2-5-6.6c-0.9-3.1,3-3.9,4.9-5.4c1.3,0.5,2.6,1.1,3.9,1.6C1093.8,325.2,1093.6,323.2,1093.4,321.3z"/>
+		<path class="st7" d="M662.7,322.6c1.5-1.4,3.6-0.6,5.4-0.8c-0.4,2-0.8,4.1-1.1,6.1c-1.1,0.3-2.3,0.5-3.4,0.8
+			c-0.5,2,0.2,5.1-2.4,5.8c-3,1.4-6.3,2.7-8.3,5.6c-2.3,2.5-4.5,5.2-7.5,6.9c-1.8-0.6-3.5-1.2-5.2-1.8c1.8-2,4.1-3.6,6.4-5
+			c3-4.6,8.9-5.9,11.1-11.1c1.1-0.9,2.3-1.8,3.5-2.6C661.6,325.1,662,323.8,662.7,322.6z"/>
+		<path class="st7" d="M660.7,335.6c1.5-1.3,3.6-1,5.4-1.1c-0.6,1.2-1.2,2.4-1.7,3.6c0.2,0.6,0.6,1.9,0.8,2.5
+			c-0.7,1.3-1.5,2.5-2.2,3.8c-0.1-0.5-0.2-1.6-0.2-2.1c-3.6,4.8-10.5,8.6-9.1,15.5c-0.8,0.9-1.5,1.9-2.3,2.8c-1.8-1.8-4.6-1.5-6.9-1
+			c-3.4,1.8-5.8,5-8.5,7.7c-0.6-0.4-1.9-1.1-2.5-1.5c3-5.1,7.5-9.4,12.7-12.3c2.7-1.6,4.2-4.5,5.6-7.2c1-2.2,3.6-2.6,5.6-3.6
+			C659.5,341.1,659.5,338,660.7,335.6z"/>
+		<path class="st7" d="M1236.3,342.2c0.9-1.4,3.6,0.1,2.5,1.6C1237.8,345.2,1235.1,343.7,1236.3,342.2z"/>
+		<path class="st7" d="M474.7,345.6c0.5-0.9,1.1-1.8,1.6-2.7c0.3,3.2,0.8,6.3,1.4,9.5c-1.7,0.6-3.4,1.2-5.1,1.8
+			c-0.9-1.1-1.7-2.2-2.5-3.4C471.6,349,473.1,347.3,474.7,345.6z"/>
+		<path class="st7" d="M909.3,344.2c1.2-2,4.3-0.2,3.1,1.7c-1.4,2.3-4.2,6.5-7.1,3.6C904.7,346.9,907.6,345.6,909.3,344.2z"/>
+		<path class="st7" d="M1204.2,345.5c2.2-0.7,4.5-0.6,6.8-0.3c-0.5,1.7-1,3.5-1.6,5.2c-0.7-0.1-2.1-0.2-2.8-0.3
+			C1205.8,348.6,1205,347,1204.2,345.5z"/>
+		<path class="st7" d="M612.6,362.1c4.2-2,6-7.7,11-8.1c-0.1,2-0.2,4.1-0.3,6.1c3.6-0.1,6-2.8,7.9-5.6c1,0.1,2.1,0.1,3.1,0.3
+			c0.4,1.3,0.5,2.6,0.8,4c-2.9,1.2-5.4,3-7.2,5.5c-1.7,1.4-3.7,2.5-4.7,4.6c-3,5.7-8.8,9-13.9,12.6c-2.5,2.1-5.2,5.2-3.6,8.6
+			c-2.5,0.9-4.9,1.7-7.5,2.1c-1,0-2.9,0-3.8,0c2.4-3.2,5.5-5.8,8.5-8.4c2.9-2.4,3.7-6.2,5.7-9.2c2.1-1.3,4.8-1.6,6.8-3.1
+			c2.2-2.4,3.5-5.4,4.7-8.4c-3.5,0.7-6.3,2.9-9.4,4.5c-2.1,1.2-4.5,0.6-6.7,0.3c2.9-2.3,5.6-4.8,8.1-7.6
+			C612.1,360.7,612.4,361.6,612.6,362.1z"/>
+		<path class="st7" d="M758.4,359.8c0.5,4,1.2,7.9,2.5,11.7c-0.2,2.5,0.2,5.7-2.3,7.2c-3.9,2.9-7.3,6.5-10,10.5
+			c4.5,1.1,8.5-1.1,12.4-3c0.5,1.2,1,2.3,1.6,3.5c3.8,0.4,7.5,0.6,11.3,0.7c2,0.1,4,0.3,6,0.5l1.3,0.1c0.3-3.6,0.3-7.3,0.2-10.9
+			c-2.9-0.1-5.8-0.3-8.7-0.8c3.1-0.4,6.3-0.3,9.4,0c0.2,4.1,0,8.2,0,12.3c-15.8-0.7-31.6-1.9-47.4-1.8l0.9-0.7
+			c0.8-0.6,1.6-1.2,2.5-1.9c3,0.3,4.7-2.5,6.8-4.2c1.9-1.8,4.8-1.6,6.8-3.1c3-4.2,5.1-9.2,4.6-14.5c0.7-1.1,1.4-2.1,2-3.2
+			C758.4,361.5,758.4,360.4,758.4,359.8z"/>
+		<path class="st7" d="M1018.2,366.2c1.9-2,3.8-4.6,6.9-4.3c-0.4,3.3-2.9,6.7-6.5,6.8C1018.5,368.1,1018.3,366.9,1018.2,366.2z"/>
+		<path class="st7" d="M1717.6,365.1c1.6,1.9,3.1,4,3.3,6.6c-0.7,0-2.1,0.1-2.8,0.2C1717.8,369.6,1717.6,367.3,1717.6,365.1z"/>
+		<path class="st7" d="M514.6,371.2c0.5-1,1.3-1.9,2-2.8c0.7,0.3,2.2,0.8,3,1.1c0.3,2,0.7,4,0.9,6.1c-1.2,3.2-2.5,6.6-5.3,8.8
+			c-0.7-0.2-2.2-0.6-3-0.9c1.2-2.2,2.7-4.2,3.4-6.6C515.5,375,514.8,373.1,514.6,371.2z"/>
+		<path class="st7" d="M530.8,368.9c1.9,1.3,4,2.6,6,3.8c-0.4,0.2-1.1,0.5-1.5,0.7c-4,1.1-5.6,5.1-8.1,8c-0.1-1.4-0.2-2.7-0.4-4.1
+			c0.9-0.7,1.8-1.4,2.8-2.1c0.1-0.5,0.3-1.6,0.4-2.2C530.3,371.6,530.6,370.2,530.8,368.9z"/>
+		<path class="st7" d="M994.2,371.6c1.6-0.5,3.2-1.3,4.9-1.3c2,0.6,4.1,1.7,6.3,1c1.9-0.2,4.4-1.6,5.7,0.5c1.8,1.6,1,4.7-1.2,5.5
+			c-3.3,0.1-6.7-0.6-9.8-1.7C998.1,374.5,996.5,372.5,994.2,371.6z"/>
+		<path class="st7" d="M942,374.1c6.8-0.2,13.5,1,20.3,1.2c-1.2,1.3-2.3,2.7-3.5,3.9c-2.1,0.4-2.8-1.9-4.1-3.1
+			c-1.1-1.5-3.3-0.8-4.8-1.1C947.3,374.9,944.6,374.8,942,374.1z"/>
+		<path class="st7" d="M1063.5,377.4c1.9-1,3.8-2.1,5.6-3.3c0.5,2.8,0.8,5.7-1.7,7.6C1066.1,380.2,1064.8,378.8,1063.5,377.4z"/>
+		<path class="st7" d="M1088.5,375.5c0.5,0,1.6-0.1,2.2-0.1c0,0.5,0,1.5,0,2c-2.2,1.5-4.7,2.3-7.3,1.4c-0.7,1.5-1.4,3.2-3.4,2.8
+			c-1.9-0.7-1.4-2.7-1.5-4.3c2.7-0.1,5.3,0.8,7.8,1.6C1086.9,377.7,1087.7,376.6,1088.5,375.5z"/>
+		<path class="st7" d="M1251.3,379.3c1.1-1.5,2.7-2.5,4.2-3.7c-0.1,5.6-0.2,11.3-0.3,17c-0.4-0.5-1.1-1.7-1.4-2.2
+			C1253.5,386.6,1251.6,383.1,1251.3,379.3z"/>
+		<path class="st7" d="M1241,378.6c2,0.5,3.6-2.5,5.4-1c1.1,1.6-1.4,2.4-2,3.6c-2,1.8,0.9,4.8-1.4,6.3c-3.5,0.7-5.1-3-6.5-5.3
+			c0.4-1.3,0.8-2.6,1.2-3.9C1238.8,378.3,1239.9,378.5,1241,378.6z"/>
+		<path class="st7" d="M715.1,386.9c-0.9-2.9-0.9-8.7,3.2-8.6c0.1,0.6,0.2,1.7,0.2,2.3c-0.4,2-0.8,3.9-1.1,5.9
+			C716.8,386.6,715.7,386.8,715.1,386.9z"/>
+		<path class="st7" d="M1027.6,379.1l0.7-0.1c-0.5,2.8-1,5.6-1.8,8.3c0-1-0.1-2.9-0.2-3.8c-5.3-2.1-10,2-14.5,4.1
+			c-0.6,0.4-1.9,1.2-2.5,1.6c-1.8-1.1-2.9-2.9-3.5-4.9c0.9-0.1,2.7-0.3,3.5-0.4c1.5,0.1,3,0.3,4.6,0.4c0.9-0.8,1.8-1.7,2.7-2.6
+			C1020.4,381.9,1024.1,380.6,1027.6,379.1z"/>
+		<path class="st7" d="M540.2,387.8c0.1-2.7-0.7-6.6,2.8-7.6c1,0.6,1.8,1.4,2.5,2.3C545.6,385.6,543.6,388.5,540.2,387.8z"/>
+		<path class="st7" d="M704,382.5c1.7,0.5,3.3,1,5,1.5l1.2,0.3c0.2,1.2,0.4,2.4,0.6,3.6c-1.6-0.3-3.2-0.5-4.7-1
+			C705.2,385.5,704.6,384,704,382.5z"/>
+		<path class="st7" d="M517.8,388.4c1.1-3,3.2-6.1,6.9-5.1c0.4,1.6-0.1,3.3-0.5,4.8c-0.4,0.5-1.3,1.5-1.7,2
+			C520.9,389.6,519.3,389,517.8,388.4z"/>
+		<path class="st7" d="M564.6,386.6c1.1-0.2,2.2-0.5,3.3-0.6c0,2.5-1.3,4.5-3.7,5.1C564.2,389.6,563.9,388,564.6,386.6z"/>
+		<path class="st7" d="M3.2,399.1c2.1,0.7,4.2,1.4,6.2,2.4c-1.3,1.7-2.5,3.4-4,5C4.2,404.2,3.6,401.6,3.2,399.1z"/>
+		<path class="st7" d="M14.1,441.3c1.7-0.7,5-3.8,5.4-0.3c-0.2,1.8-2.4,2.1-3.6,2.9c-0.8,1-1.5,2.1-2.2,3.1
+			c-2.4-1.6-3.5-4.1-3.6-6.9C11.4,440.5,12.7,440.9,14.1,441.3z"/>
+		<path class="st7" d="M1220.3,472.5c3.7-1.3,7.3-2.9,11-4.3c-2,2.6-1.7,5.8-1,8.8c-2.5,0.9-5.3,1.1-7.3,2.9c-2,2.4-3.5,5.4-6,7.4
+			c-0.3,1.3-0.6,2.5-0.9,3.8c-1.4,0.2-2.8,0.4-4.2,0.7c-0.3,1-0.6,2-0.8,3c-1.6,0.1-3.1,0.2-4.6,0.4c0,0.7-0.1,2.1-0.1,2.9
+			c3.7-1.1,7.5-3.5,11.4-1.8c0.7,2.4-2.2,2-3.6,2.7c-0.7,1.1-1.4,2.2-2.2,3.3c-5.3,1.8-10.8-0.1-16-1.2c-0.5,0.2-1.5,0.6-2,0.8
+			c-0.6,0.8-1.2,1.7-1.8,2.6c1.1-3.8,2.5-7.6,3.7-11.4c0,0.9,0,2.7,0,3.6c1.8-1.4,3.6-3,5.2-4.6c-1.3-0.9-2.6-1.8-3.9-2.6
+			c0.9-2.5,1.8-5,2.7-7.6c0.4-0.2,1.1-0.7,1.5-1c0.5,2.9-0.2,6.9,2.6,8.6c6-3.2,11.8-7.2,16.8-11.8c1.6-1.1,0.5-3.2-0.2-4.5
+			C1220.5,473,1220.4,472.7,1220.3,472.5z"/>
+		<path class="st7" d="M620.3,469.2c5.3,1.5,11.2,0.1,16,3c-2.3-0.3-4.6-0.6-6.9-0.8c-0.5,0-1.4-0.1-1.9-0.2c0.1,3.2,0.3,6.7-2.3,9
+			c-2.2-3.3-4.2-6.7-5-10.6L620.3,469.2z"/>
+		<path class="st7" d="M636.2,475.3c1.4-1.6,4-0.5,3.4,1.8C639.1,479.4,633.3,476.9,636.2,475.3z"/>
+		<path class="st7" d="M768.4,474.7c2.2,0.3,4.4,0.5,6.6,0.7c-3.5,2.1-5.6,5.6-6,9.6c2.4-1.7,4.9-3.4,8-2.6
+			c-0.6,1.9-1.2,3.8-1.9,5.7c-3.3-0.5-6.4-1.5-9.3-3c-0.5-1.9-1-3.7-1.4-5.6c1.5-0.7,2.9-1.4,4.4-2
+			C768.6,476.6,768.5,475.6,768.4,474.7z"/>
+		<path class="st7" d="M940.6,475.9c0.3-0.2,1-0.7,1.3-0.9c6.4,0.8,12.9,0,19.3,1.2c-1.6,5.1-7,8.3-7.2,13.9
+			c-4.3-0.6-8.6-0.4-12.9-0.3C941.8,485.1,940.5,480.5,940.6,475.9 M941.5,489.2c4.4,1,6.4-3.2,8.9-5.9c1.8-1.5,1.2-4.1,1.4-6.1
+			c-1.4-0.2-2.8-0.4-4.1-0.6C946.9,481.4,943.9,485.1,941.5,489.2z"/>
+		<path class="st7" d="M778.9,475.4c1.4,0.3,2.8,0.6,4.1,0.9c6.2-1.6,12.7,0.2,19-0.2c14.4,1,28.8-1.2,43.3,0.2
+			c-2.8,3-6.1,5.5-9,8.4c-0.7-0.8-1.4-1.5-2.1-2.3c1.5-0.2,3-0.5,4.5-0.8c-0.1-1.7-0.1-3.3-0.2-5c-2.2,0-4.5,0-6.7,0
+			c-2,0-3.9-0.1-5.8,0.3c-2.5,1.2-4.7,3-7.1,4.5c-1.5-1.8-2.8-3.9-4.8-5c-0.5,0.2-1.4,0.8-1.8,1c-0.2,0.6-0.7,1.9-1,2.6
+			c0.9,1.4,1.8,2.8,2.6,4.2c-2.3,2.9-5.4,4.7-8.8,5.9c0.1-1.1,0.3-2.2,0.5-3.3c1.5-0.9,3.2-1.6,4.5-2.9c0.7-1.9-1-3.2-1.8-4.6
+			c-1.7,0.8-3.4,1.6-5.2,2.4c0.1-0.7,0.2-2,0.3-2.7c0.1-0.6,0.2-1.8,0.3-2.3c-3.6-0.5-6.9,0.8-9.8,2.9c-0.6-1.1-1.2-2.1-1.7-3.1
+			c-2,0-4,0-6,0c0.8,3.1,3.2,5.3,5.7,7c-2.3-0.2-4.7-0.1-7-0.6C782.3,481,780.8,478,778.9,475.4z"/>
+		<path class="st7" d="M371.7,477.7c1.3-0.2,2.6-0.5,3.9-0.8c-0.3,1.7-0.6,3.5-0.9,5.2c0.3,0.6,0.8,1.8,1.1,2.4c1-0.3,2-0.6,3-0.8
+			c1.6-0.2,3.2-0.2,4.7-0.3c1.7,1.3,3.6,2.5,5.5,3.6c1.1,2.5,2.4,4.9,2.8,7.7c-1.9-0.1-3.4-1.1-4.8-2.2c-1.3,0.7-2.7,1.4-4,2.1
+			c-2.2-1.7-4.7-3.1-7.3-4.1c-0.3-1.9,0.3-4.4-1.5-5.6c-2.4-0.4-4.9,0-7.3-0.4c-1.9-3.2,2.4-3,4.3-3.4
+			C371.3,479.9,371.5,478.8,371.7,477.7z"/>
+		<path class="st7" d="M644.4,481.3c0.5-1.6,1-3.2,1.5-4.8c4.5,1.9,8.9,5.1,14,3.7c1.5,0,2.8,0.8,4.2,1.2c-0.7,0.2-2,0.7-2.7,1
+			c-0.2,2.4-0.1,4.9-0.1,7.4c-0.1,0.3-0.3,0.8-0.4,1c-1.3-1.2-2.7-2.5-4-3.7c-0.8,0.1-1.6,0.1-2.5,0.2c-3.9,0.7-6.6,4.2-10.5,4.8
+			c-0.4,1-0.7,2-1,2.9c-0.6-1.9-1.2-3.9-1.7-5.8c0.1-0.4,0.3-1.2,0.5-1.6c4.2,0.5,8.1-0.8,11.9-2.5c0-1.3,0.1-2.6,0.1-3.9
+			c-1.9,0.1-3.8,0.3-5.6,0.8C646.7,482.5,645.4,482.1,644.4,481.3z"/>
+		<path class="st7" d="M412.7,477.4c2.1,0.8,5.2,1.9,4.8,4.7c-0.8,1-1.6,1.9-2.5,2.8C412.4,483.1,412.3,480.1,412.7,477.4z"/>
+		<path class="st7" d="M823.2,485.3c2.3-3,4-7.4,8.5-7.2c-0.1,1.4,0,2.9-0.4,4.3c-1.1,1.7-3.4,1.7-5.1,2.5c0.1,0.9,0.1,1.9,0.2,2.8
+			c1.1,0.9,2.2,1.7,3.4,2.6c-1.6,2.3-3.7,4.1-6.2,5.5c-2.7-2.7-6.4-2.4-9.9-1.9c0.6-1.6,0.4-3.9,2.2-4.8c1.5-0.6,3.2-0.4,4.9-0.5
+			c0.5-0.7,1-1.3,1.5-2C822.5,486.2,823,485.6,823.2,485.3z"/>
+		<path class="st7" d="M848.4,479.1c1.4-0.9,2.9-2.3,4.7-1.4c1.2,1.1,0.7,3.1,0,4.4c-1.6,0.4-3.2,0.5-4.8,0.7
+			C848.3,481.6,848.3,480.4,848.4,479.1z"/>
+		<path class="st7" d="M536.1,481.3c1.6-1.6,4-1.8,6.1-2.5c-2,4.3-5.4,7.7-8.7,11c0.1,1.7,0.2,3.4,0.3,5c-1-0.5-2.1-1-3.1-1.5
+			c-0.4-2.1-0.7-4.2-1.1-6.3C531.9,485.3,534,483.4,536.1,481.3z"/>
+		<path class="st7" d="M1014,482.6c2.2-0.7,4.4-1.1,6.7-1.4c0,1.5,0,3,0,4.6C1017.8,486.2,1015.5,485,1014,482.6z"/>
+		<path class="st7" d="M10.5,482.4c1.3-0.5,2.3,0.8,3.3,1.4l-0.6,0.9c-2,2.9-4,5.9-7,7.9c-0.6-0.5-1.7-1.6-2.3-2.2
+			C6.2,487.8,8.2,485,10.5,482.4z"/>
+		<path class="st7" d="M794.6,486.9c2.3-2,4.8-3.7,7.5-5c1,3.8-2.4,6-4.9,8C796.3,489,795.4,487.9,794.6,486.9z"/>
+		<path class="st7" d="M997.7,493.7c0.3-4,0-9.8,5-10.8c-0.4,2.9-2.2,6.1-0.6,8.9c1.8,2.9,6.9-1.4,7.7,2.1c-1.5,3.1-5.4,4.5-8.4,5.8
+			C999.5,498.3,998.1,496,997.7,493.7z"/>
+		<path class="st7" d="M1024.5,490.9c-0.8-2.4,0.3-4.7,1.4-6.7c1.1,1.6,1.6,3.8,3.4,4.8c3.3,1,6.8,0.3,10.2,0.2
+			c4.4,0.1,8.8,0,13.2,0.4c-4.5,0.5-9.1,0.5-13.6,0.9c-4.2,0.3-8,2.7-10.7,5.8C1027.2,494.4,1025.7,492.8,1024.5,490.9z"/>
+		<path class="st7" d="M153.8,486.2c1.7,1.4,3.4,2.7,5.1,4c-0.2,1.3-0.3,2.7-0.4,4c-3.4,0.5-6.1,2.6-8.7,4.6c-0.1-1-0.2-2-0.4-3
+			c1.2-1,2.6-1.9,3.3-3.4C153.4,490.4,153.6,488.3,153.8,486.2z"/>
+		<path class="st7" d="M674.2,487.2c2.6,1.7,5.8,2.8,7.9,5.3c-0.8-0.2-2.4-0.7-3.2-1c-1.4,1-2.9,2-4.3,2.9c-0.3-0.2-1-0.5-1.4-0.6
+			C673.5,491.6,673.8,489.4,674.2,487.2z"/>
+		<path class="st7" d="M395.7,489.2c2.1,0.7,4.1,1.9,6.4,2.1c1.7-0.5,3.3-1.2,4.9-1.9c2.1,0.7,4.1,1.5,6.2,2
+			c-5.7,1.1-10.9,4.7-13.5,10c-1.4-1.2-2.8-2.3-4-3.6C396.1,495,396.6,492,395.7,489.2z"/>
+		<path class="st7" d="M655.3,493.2c1.2,0,2.3,0.1,3.5,0.1c0,0.6,0.1,1.9,0.1,2.5c-1.2,0-2.4-0.1-3.6-0.1
+			C655.3,495.1,655.3,493.8,655.3,493.2z"/>
+		<path class="st7" d="M965.9,496.8c2.5-0.7,4.8-1.9,7-3.4c1.6,3,3,6.2,4,9.5c-2.4-2.3-5.1-4.3-8.1-5.6c-0.1,0.8-0.3,2.3-0.4,3.1
+			C967.5,499.2,966.7,498,965.9,496.8z"/>
+		<path class="st7" d="M1720.2,493.3c1.3,0.2,2.7,0.1,3.9,0.6c1,3.3,0,6.9-0.7,10.1c-1-1.9-1.1-4-1.2-6
+			C1721.4,496.5,1720.7,495,1720.2,493.3z"/>
+		<path class="st7" d="M804.1,501.1c2.3-1.9,4.7-3.7,7-5.4c0.4,0.1,1.3,0.3,1.7,0.5c-1.5,3.7-4.1,6.9-4.3,11.1
+			C806.2,506,804.6,503.6,804.1,501.1z"/>
+		<path class="st7" d="M21,500.9c0.2-1.9,0.7-3.8,2.8-4.1c0,1.5,1.7,3.7,0.1,4.9C22.9,501.5,22,501.2,21,500.9z"/>
+		<path class="st7" d="M834.7,498.9c1.6-0.6,3.1-2.4,4.9-1.3c0,3.3-1.2,6.9-4.6,8.1C832,504.2,834.3,501.1,834.7,498.9z"/>
+		<path class="st7" d="M674.3,498.3c0.6-0.2,1.9-0.5,2.5-0.6c0.3,0.5,0.9,1.4,1.2,1.9c0.3-0.1,0.8-0.3,1.1-0.4
+			c2-0.8,5.3-1.3,5.1,1.9c-1.3,1-2.8,1.7-4.3,2.4c0.5,0.3,1.5,1,1.9,1.3c-2,0.4-4,0.7-6,1.1c-0.4-1.2-0.7-2.4-1-3.5
+			c-0.3-0.9-0.5-1.8-0.8-2.6C674.1,499.4,674.2,498.7,674.3,498.3z"/>
+		<path class="st7" d="M500.2,502.3c1.7-1.3,3.3-2.8,5.3-3.6c1.2,1.2,3.2,2.2,3,4.3c-0.6,2.3-2.4,4-3.8,5.9
+			c-1.7-1.8-3.2-3.9-4.3-6.1L500.2,502.3z"/>
+		<path class="st7" d="M531.3,500c1.9,0.1,4,0.8,3.1,3.2c-1-0.1-3-0.3-4-0.4c0.1-0.4,0.4-1.3,0.5-1.8L531.3,500z"/>
+		<path class="st7" d="M793.5,499.6c2.4,1.7,0.9,3.8-0.4,5.6c-0.3,0.5-1,1.4-1.3,1.9c0.3,1.9,0.6,3.9,0.9,5.8c2.6,2,4.5,4.8,6.2,7.7
+			c-2.6,1.6-5.1-0.7-7.5-1.6c-0.7-6.1-0.8-12.4-3.3-18.2c0.5,0.5,1.5,1.6,1.9,2.1C791.1,501.8,792.3,500.7,793.5,499.6z"/>
+		<path class="st7" d="M811.9,503.9c1.5-2.2,4.1-4.9,7-4c0,1.3,0,2.6,0,3.9C816.6,504.6,814.1,505,811.9,503.9z"/>
+		<path class="st7" d="M19,501.9c0.8,0,2.4,0.1,3.2,0.1c-0.4,1.2-0.7,2.4-1.1,3.6c-0.4-0.3-1.3-1.1-1.8-1.4
+			C19.2,503.6,19,502.5,19,501.9z"/>
+		<path class="st7" d="M348.5,512.7c4.2-2.5,7.8-6.2,10.6-10.3c3.2,1.1,7.1,1.3,9.2,4.3c-0.5,1-1,1.9-1.4,2.9
+			c-4.7-0.8-9.4,0.1-13.1,3.2c-0.2,1.8,0.3,3.8-0.6,5.5c-1.5,0.2-3.6,0.8-4.6-0.8C347.1,516.1,348,514.3,348.5,512.7z"/>
+		<path class="st7" d="M393,512.2c2.3-2.5,4.7-5.1,5.8-8.4c-0.8,3.7-1.4,7.5-1.5,11.3c-1.3-0.2-2.6-0.3-3.9-0.5
+			C393.3,513.9,393.1,512.8,393,512.2z"/>
+		<path class="st7" d="M490.2,511.8c2.6-2.3,4.7-5.2,7.7-7c-0.8,1.1-1.6,2.2-2.3,3.3c1.6,2.6,4.1,5,4.3,8.3c-0.5,0.3-1.4,1-1.8,1.3
+			c-1.7-1.5-3.2-3.3-4.7-5C492.2,512.4,491.2,512.1,490.2,511.8z"/>
+		<path class="st7" d="M1196,506.8c1.1-0.4,2.4-0.8,3.6-0.3c0.5,2.3-0.8,4.2-2.6,5.6c-2.4,2.4-6.2,2-9.1,3.6
+			c0.6-2.4,1.4-4.8,2.2-7.2C1192.4,509.2,1194.8,509.2,1196,506.8z"/>
+		<path class="st7" d="M1208.5,510.3c2.8-1.1,5.8-1.9,8.9-1.8c0.7,0.9,1.4,1.8,2.1,2.8c-0.9,1.2-1.8,2.4-2.7,3.6
+			c-0.4,0.5-1.1,1.5-1.5,2c-2.6-0.4-5.3-1.2-6.8-3.4C1208.6,512.4,1208.6,511.3,1208.5,510.3z"/>
+		<path class="st7" d="M798.9,508.7c4.8,1.6,7.3,6.3,11.3,9.1c1.2,0.7,2.3,1.3,3.5,2c-1.4,4-3.4,8.1-7.7,9.5c-1-0.9-2-1.8-3-2.6
+			c1.6-1.1,3.1-2.2,4.7-3.3C807.1,517.2,798.9,515.2,798.9,508.7z"/>
+		<path class="st7" d="M386,511.9c-0.3-1.4,0.3-2.1,1.7-2.2C388.3,511.5,387.7,512.2,386,511.9z"/>
+		<path class="st7" d="M661.1,513.6c0.8-0.1,1.6-0.2,2.4-0.2c2.2,4.3,3.3,9.4,6.7,13c0.2,1.4,0.4,2.9,0.7,4.3c-2-1-4.1-1.4-6.3-1.6
+			c-0.2-0.4-0.6-1.1-0.9-1.5c0.2-0.6,0.5-1.9,0.7-2.5c-0.6-0.6-1.2-1.2-1.8-1.8c1-0.1,2.9-0.3,3.8-0.4c-0.7-1.3-1.3-2.9-3-3.2
+			c-2.2-0.8-4.4-1.9-5.9-3.8C658.8,515.2,660,514.4,661.1,513.6z"/>
+		<path class="st7" d="M980.7,514.9c0.1-2.6,3.2-2.8,4.6-1c0.5,2-0.1,4.1-0.4,6.2c0.9,1.1,1.8,2.2,2.7,3.3c-1.8,3.1-5.9,1.5-8.6,3.4
+			C980.6,523,980.7,518.9,980.7,514.9z"/>
+		<path class="st7" d="M1498,517c2.5-2.5,5.6-4.6,9.2-4.7c0.4,3,1.5,5.9,2.3,8.8c-0.5,0.9-1,1.7-1.6,2.6c-1.2-0.1-2.3-0.1-3.4-0.1
+			c-0.1-0.7-0.2-2-0.2-2.6C1501.9,520,1499.6,519,1498,517z"/>
+		<path class="st7" d="M520.1,518.8c0.4-1.3,0.1-3.3,1.9-3.8c0.6,0.1,1.9,0.2,2.6,0.2c0.4,0.5,1.2,1.5,1.6,2
+			C524.1,517.8,522.1,518.3,520.1,518.8z"/>
+		<path class="st7" d="M477,527.7c1.9-2.8,3.9-5.5,6.1-8.1c0.6,1.8,1.4,3.5,1.5,5.4C482.7,527.2,479.3,526.2,477,527.7z"/>
+		<path class="st7" d="M672.7,525.4c0.9-1.5,1.8-3.1,3.1-4.5c0.8,0.5,1.6,1.1,2.3,1.7c-0.7,1.8-1.4,3.7-2.1,5.6
+			C675,527.3,673.8,526.4,672.7,525.4z"/>
+		<path class="st7" d="M1203.3,522.3c1,0.1,2,0.2,3.1,0.2c0.1,1.8,0.3,3.6,0.4,5.4c-0.6,2.3-1.4,4.4-2.3,6.6c-0.2-2,0.3-3.9,1-5.7
+			C1203.5,527.2,1202.9,524.8,1203.3,522.3z"/>
+		<path class="st7" d="M679.7,523.9c1,0.4,2.1,0.8,3.2,1.1c-0.3,0.6-0.8,1.7-1.1,2.2c0.7,0.1,2.1,0.4,2.8,0.5
+			c-0.1,0.8-0.2,1.6-0.3,2.4c-2,0.4-4,0.9-6,1.4C680.6,529.5,681,526.6,679.7,523.9z"/>
+		<path class="st7" d="M1515.1,524.9c2.8,0.6,5.6,2.2,6.4,5.2c-1.1,1.8-3.5,1.4-4.8,0.2C1515.5,528.7,1515.4,526.7,1515.1,524.9z"/>
+		<path class="st7" d="M343,530.8c1.2-1.3,2.2-3.1,4-3.7c1.9,0,3.8,0.3,5.6,0.6c0.8,2.7-1,5.1-3.4,6
+			C346.9,533.2,345,531.9,343,530.8z"/>
+		<path class="st7" d="M483.3,530.9c3.3-0.5,5.8-3,8.7-4.2c0.2,1.5-0.4,3-0.6,4.4c2.9,0.8,5.2,2.6,7.1,4.8c-1.2,0.8-2.5,1.6-3.7,2.4
+			c-1.7-1.3-3.3-2.6-5.2-3.6c-1.9-0.9-3.9,0-5.8,0.3C483.3,533.7,483.4,532.3,483.3,530.9z"/>
+		<path class="st7" d="M794.7,528.6c1.3-0.3,2.6-0.2,3.9-0.3c0,1.9,0.1,3.8,0.2,5.7c1,1.6,3,3.6,1.4,5.5c-2.6-1.7-7.1-2.7-6.8-6.5
+			C793.2,531.4,793.8,529.8,794.7,528.6z"/>
+		<path class="st7" d="M687.4,534.9c1.2-2.2,2.8-4.2,5.2-5.3c0,1.3-0.1,2.6-0.2,3.9c-0.5,0.9-0.9,1.8-1.5,2.6c-0.4,0-1.2,0-1.5,0
+			C688.9,535.8,687.9,535.2,687.4,534.9z"/>
+		<path class="st7" d="M697.9,532c2.4-2,5.9-3.7,9-2c2.1,0.8,1.3,3.4,1.7,5.1c0.7,0.1,2.1,0.2,2.9,0.3c0.5,0.5,1,1,1.4,1.5
+			c-0.2,0.5-0.6,1.5-0.8,2c-3.3,1.1-4.6,4.3-6,7.2c-0.4,0.3-1.3,0.8-1.8,1c-0.7-1.3-1.4-2.6-2.3-3.8c2.8-1.9,5.2-4.4,6-7.8
+			c-1.1,0-3.3-0.2-4.4-0.2c-0.6,1.4-1.3,2.9-1.9,4.3c-2.2-0.2-4.7-0.6-5.8-2.8C694.6,535,696.4,533,697.9,532z"/>
+		<path class="st7" d="M390.2,534.6c0.5-1.1,1.1-2.2,1.6-3.3c0.7,0.2,2.2,0.5,2.9,0.7c0.2,0.8,0.6,2.4,0.8,3.2
+			c-0.4,0.4-1.2,1.3-1.7,1.7c-1.6,3.1-1.6,6.6-2.3,9.9c-1.1,1.5-2.8,2.3-4.1,3.6c-0.8,2.7-0.8,5.5-1.1,8.3c-2.1-0.3-4.2-0.7-6.4-1.1
+			c1.7-0.4,3.5-0.7,5.2-1.3c2.4-1.7,0.4-5.9-2.3-5.3c-3.1-0.1-3.4,3.4-4.5,5.5c-0.9-0.2-1.8-0.3-2.6-0.4c-0.3-1.8-0.5-3.6-0.7-5.4
+			c-0.3-0.3-1-0.8-1.3-1.1c-1.9,0.2-4.1,1.4-5.5-0.5c-0.1-2.1,0.9-3.9,2.2-5.4c2.3-2.9,4.1-6.1,6.5-8.8c0.5,1.7,1,3.3,1.5,5
+			c-2.1,1.9-3.9,4.3-2.7,7.2c1.1-1,2.2-1.9,3.3-2.9c1.5,1.5,3,3,4.4,4.6c1.6-1.3,4.5-2.2,4.1-4.7c-0.4-1.4-1.3-2.5-2-3.8
+			c1.7-0.7,3.3-1.4,5-2.1C390.6,537,390.4,535.8,390.2,534.6z"/>
+		<path class="st7" d="M836.1,536c1.3-1.8,3.5-2.8,5.4-3.8c0.2,12.2,0.3,24.5,0.6,36.8c-0.9,8.4-0.3,16.9-0.5,25.3
+			c0.2,0.4,0.5,1.1,0.6,1.5c1.5,0.9,3.3,0.4,4.9,0.3c2.2-0.3,4.5-0.6,6.8-0.6c28,0.2,55.9,0,83.9,0.2c-0.4,0.7-1.1,2.1-1.4,2.8
+			c2.3,0.9,4.7,1.3,7.1,1.2c-0.4-1.3-0.9-2.6-1.3-3.8c2.5,0,5,0,7.6,0l0,0.4c-1.4,3.6-2.4,7.3-4.4,10.6c-3-0.7-6-1.3-8.9-1.9
+			c0-1.3,0.1-2.7,0.1-4c-1.3-1.3-2.6-2.5-4-3.7c-4.4,0.7-8.7-0.5-13.1-0.7c0,1.8,0.1,3.6,0.2,5.4c1.2,1.6,2.1,3.4,2.8,5.3
+			c-0.5,0.4-1.5,1.2-2,1.5c-1.3-1.2-2.5-2.5-3.8-3.6c-1-0.7-1.9-1.4-2.9-2.1c-0.6-2.1-1.2-4.2-1.7-6.3c-6.7-0.1-13.4-0.1-20.2,0
+			c-0.6,0.7-1.2,1.4-1.8,2.1c-2.6-2-5.9-2.4-9.1-2.1c-5.5,0.4-11.3-1.2-16.3,1.6c-4.1-2.5-9.2-1-13.8-1.5c-2.6-0.4-3.8,2.1-5.1,3.8
+			c-1.7,2.3-3.5,4.6-4.9,7.1c-1.2,1.8-1.9,5-4.8,4.2c-2.7,0.3-2.8-2.8-2.8-4.7c3.3-0.3,6.5-1.7,7.7-5.1c1.1-1.9,2.3-4.1,0.3-5.9
+			c0-2.9-0.1-5.8-0.4-8.7c-3.1,2.4-2.3,6.4-2.2,9.8c-2.1,0.9-4.3,1.6-6.5,2.2c-1.7-0.4-3.4-0.8-5-1.1c-2-5.1-3.4-10.8-7.5-14.7
+			c0-1.8,0.1-3.6,0.1-5.4c0.9-0.8,1.8-1.5,2.8-2.2c0.1-4.1,0.2-8.3-1-12.3c1.7,1.2,3.5,2.5,5.2,3.8c0,2.3,0.1,4.6,0.2,7
+			c1.6,0,3.2,0.1,4.8,0.1c0.1,2,0.2,4.1,0.3,6.1c2-0.2,4.6,0.3,6-1.5c1.6-1.6,1.2-4,1.5-6c-1.8-0.5-3.6-1-5.4-1.6
+			c1.2-4.1,2.6-8.1,3.8-12.3c0.8,4.5-0.1,9.6,2.9,13.4c0.3-3,0.4-6,0.3-9c0.4-7.2-0.7-14.4,0.2-21.6c-2.3,0.2-4.6,0.5-6.9,0.7
+			C834.6,540.3,834.6,537.8,836.1,536 M825.5,583.7c2.7,3.4,5.3,7,7.2,10.9c0.5,0,1.4,0.1,1.9,0.1c0.7-2.5,1.1-5,1.3-7.6
+			c-1.2,1.6-2.4,3.4-4.3,4.2c-0.3-2.3,1.1-4.1,2.3-5.9c-1.4-1.7-2.7-3.4-3.9-5.2C828.1,580.9,826.7,582.2,825.5,583.7z"/>
+		<path class="st7" d="M682,535.1c1.6-0.5,2.1,0.1,1.7,1.8C682,537.3,681.5,536.7,682,535.1z"/>
+		<path class="st7" d="M2.5,538.7c2.5-0.6,5.1-1.3,7.6-2.2c-0.4,2.4-1.1,5.1-4,5.4c-1.3-0.3-2.6-0.6-3.9-1
+			C2.2,540.4,2.4,539.3,2.5,538.7z"/>
+		<path class="st7" d="M818.7,536.8c1.7-1.9,4.1-1.2,6.1-0.3c-0.9,1.8-1.8,3.5-2.8,5.3c1.2,1,2.4,2,3.6,2.9c-1,1.2-2,2.4-3.1,3.6
+			c-3.8,4.1-7.1,8.9-12,11.9c-1.6,1-3.2,1.9-4.8,2.9c-0.5-4.1,3.3-6.4,6-8.8c0.8-0.6,1.6-1.3,2.4-1.9c2.1-1.5,4-3.3,5.8-5.3
+			c0.7-0.7,1.5-1.3,2.2-2c-0.4-0.7-0.9-1.4-1.4-2C819.6,541.3,817.5,539.2,818.7,536.8z"/>
+		<path class="st7" d="M500.3,537.7c0.5-0.1,1.5-0.3,2-0.5c0.1,2,0.2,4,0.3,6c-1.2,0.8-2.4,1.6-3.6,2.3c-2.4,0-4.6-0.9-6.8-1.6
+			c0-0.6,0-1.9,0-2.5c1.5,0,2.9,0.2,4.4,0C498.2,540.5,499.1,539,500.3,537.7z"/>
+		<path class="st7" d="M144.7,540.8c0.9,0,2.7,0,3.6,0c0,2.2-2,3.1-3.6,4.1C144.7,543.5,144.7,542.1,144.7,540.8z"/>
+		<path class="st7" d="M352.3,540.5c0.6,0.2,1.7,0.5,2.3,0.7c0.2,9.3-1.7,18.5-1.8,27.8c1.6,0.8,3.2,1.6,4.8,2.3
+			c-1.1,2.1-3.1,3.3-5.2,4.2c-0.6,4.2-0.9,8.5,0,12.7c1.5-2,3-3.9,4.7-5.7c2.1,1.1,3.4,3.2,3.6,5.5c-2.1,0.9-5.7,1-5.5,4
+			c-0.1,2.4,3.4,0.8,4.8,1.1c0.3,0.4,0.9,1.2,1.2,1.5c-2.6,2.2-5.4,4.4-6.5,7.7c-1.1,0-2.3,0-3.4,0c0.4-10.2-0.9-20.4,0.4-30.5
+			c1-7.9,0.2-16,1.5-23.9c0.1-2.4,1.3-5.5-1.1-7.3L352.3,540.5z"/>
+		<path class="st7" d="M395.5,542.4c0.4-0.5,1.2-1.5,1.6-2c-0.2,12.9,1.3,25.7,1.2,38.5c-1.4-1.2-2.6-3.2-4.7-2.4
+			c-1.7,4.1,1.7,7.5,3,11.2c-0.2,1.8-1.3,3.2-2.5,4.5c-1.9-0.5-3.6-2-5.6-1.8c-1.3,2.8,0.6,5.5,1.5,8.1c-1.2,0.3-2.4,0.7-3.6,1
+			c-1-1.3-2-2.6-3.1-3.9c-0.6,2-1.1,4-1.8,5.9c-2.5,2.8-6.4,3.8-10,4.3c0,1.9,0,3.9,0,5.8c5.2-0.1,8.3-4.6,11.5-8
+			c0.7,2.3,1.4,4.6,2,6.9c-1,0.4-2.1,0.8-3.1,1.3c-1.7,4-6.7,5.9-7,10.5c-2.4,3.3-4.6,7.1-8.8,8.4c0.7,1,1.3,2.1,2,3.2
+			c-0.2,1.7-0.4,3.3-0.6,5c-2-0.8-4-1.7-5.6-3.1c-0.2-0.5-0.7-1.6-0.9-2.1c-1.1-1.8-3-2.9-4.8-3.9c-1.6,3.8-3.2,7.6-4.1,11.7
+			c-0.6,7.5-1.1,15.1,0.4,22.5c-1.4,6.3-0.9,12.7-0.8,19.1c0.2,3.7,0.5,7.4,0.5,11.1l-1.2,0c-0.8-9.4,0.3-18.8-0.1-28.3
+			c0-19.4,0.5-38.8,0.3-58.2c0.6,1.2,1.2,2.4,1.9,3.6c1.1-2.5,1.4-5.3,2.1-7.9c5.2-1,8.7-5.1,12-8.9c0.1-0.2,0.3-0.5,0.4-0.6
+			c-0.1-2.9-0.2-5.9-1-8.7c-1-2-3.7-2.1-5.5-3c0-1-0.1-1.9-0.1-2.9c0.7-0.1,2.1-0.3,2.8-0.4c1.5-0.2,3-0.4,4.6-0.6
+			c-0.1-3.8-0.1-7.5,0-11.3c-1.1-1-2.3-2-3.4-2.9c1.8-1.3,3.7-2.7,5.5-4c1,4.4,0.8,8.9,0.8,13.4c1.4,1.1,2.7,2.2,4.1,3.4
+			c-1.9,1.5-3.9,3.1-4.6,5.6c1.1,0,2.1,0,3.2,0c1.1-2,2.4-3.8,3.4-5.8c0.1-2.4-1.5-4.6-2.3-6.8c1.2-0.8,2.5-1.6,3.8-2.5
+			c1.1,0.8,2.2,1.5,3.3,2.3c0-0.9-0.1-1.8-0.1-2.6c1.2-0.3,2.3-0.6,3.5-1c1.4-1.6,2.2-3.5,3.1-5.4c2.6-0.6,5.1-1.4,7.6-2.4
+			c-0.7-1.8-1.4-3.5-2.1-5.2c0.7-1.4,1.4-2.7,1.9-4.1c-0.1-1.6-1-3.1-1.6-4.5C394.9,543.8,395.2,543.1,395.5,542.4 M373.5,586.3
+			c0,0.6,0,1.8,0,2.4c1.3,1.1,2.8,2.7,4.4,1c1.8-3.2,3.2-6.6,4.9-9.8C380.6,583.6,375.9,583.1,373.5,586.3 M354.3,618.8
+			c1.7,2.3,6.5,1.7,7.1-1.4c1.1-1.7,0-3.4-1.1-4.7C358,614.4,354.9,615.8,354.3,618.8z"/>
+		<path class="st7" d="M676.2,541.3c0.8-1.3,3.4-0.2,2.2,1.2C677.6,543.9,675,542.7,676.2,541.3z"/>
+		<path class="st7" d="M1214,547.4c2.7-1.8,4.5-6.4,8.3-4.8c5.4,1.5,6.1,7.8,7.3,12.4c0.5,4.5-5.5,3.4-8,5.5
+			c-1.4-0.9-2.8-1.9-4.2-2.9C1217.3,553.9,1216,550.5,1214,547.4z"/>
+		<path class="st7" d="M1531.3,541.5c2,2.9,1.3,6.6,1.2,9.9c2,0.9,4.4,1.9,6.6,0.7c2.2-2.9-0.5-9.1,4.6-9.4
+			c-0.2,3.8-0.4,7.5-0.5,11.3c1.4,0.3,2.9,0.5,4.3,0.8c0.6-0.5,1.7-1.6,2.3-2.2c3,7.5,5.2,15.3,7.9,22.9c-0.5,0.2-1.4,0.8-1.9,1
+			c-0.5,2.5-0.3,6.5-3.8,6.7c-3.8-0.2-7.5-1-11.2-0.6c0.7-3.5,0.5-7.2,0.9-10.8c0.5-2.8,3.8-2.8,5.9-3.6c0.6,0.8,1.2,1.7,1.8,2.5
+			c2.1,0.1,5.4-0.5,4.3-3.4c-2.4-2.8-4.9-6.6-8.8-7.3c-4-0.1-4.3,4.7-5.4,7.4c-2.1,1.6-4.8,2.4-6.8,4.2c-1,3,0.7,6.4-0.6,9.3
+			c-2.4,2-6,1.7-8.5,3.7c-1.6,3.5,1.9,6.7,3,9.8c-1.7,0.4-3.3,0.8-5,1.1c-1.9-1.8-4-3.3-6.3-4.6c0.4-1.1,0.7-2.2,1.2-3.4
+			c-1.2-1-2.3-2.1-3.5-3.1c-0.2,0.9-0.5,2.8-0.7,3.7c-0.6-2-1.2-3.9-1.8-5.9c2.6,0.9,6.5,2.5,8.3-0.7c2-2.7-1.4-4.8-2.8-6.8
+			c-1.6-1.3-1.5-3.5-1.7-5.4c5-1.4,10.1,0,15.1-0.9c0.4-1.6,0.8-3.2,1.2-4.9c-1.4-1.1-2.8-2.2-4.2-3.3c-0.1-1-0.1-2.1-0.1-3.1
+			c1-0.9,2.1-1.8,3-2.9c0.3-2.1,0-4.3,0-6.4C1529.8,545.9,1530.5,543.7,1531.3,541.5 M1522,574.1c1.9,1.6,3.8,3.1,5.8,4.6
+			c0.7-1.5,1.3-3.3,0.6-5C1526.3,572.8,1524,573.3,1522,574.1z"/>
+		<path class="st7" d="M674.8,547.9c2.9-1.6,5.4-4.5,8.9-4.1c0.3,0.5,1,1.6,1.3,2.1c-1.2,0.6-2.4,1.2-3.6,1.7
+			c-0.2,0.4-0.7,1.2-1,1.6c-1,0.5-2,1.1-3,1.6c0.5,2.5,1.1,5,1.7,7.5c1.7,2.2,4.9,1.5,7.3,2.4c-0.5,1.2-1.3,1.9-2.5,2.2
+			c1.5-2.5-2.5-2.7-2-0.1c-0.3,0.5-0.9,1.7-1.2,2.2C678.8,559.4,676.9,553.7,674.8,547.9z"/>
+		<path class="st7" d="M519.3,545.2l0.5-0.4c-5.7,12.7-8.9,26.5-11.1,40.2c-2,8.2-0.9,16.7-1.2,25c-5.1,1.9-9.9-1.7-15-1.4
+			c0.4-1.8,1.2-3.4,2.2-4.9c0.1,1.5,0.2,3,0.3,4.4c0.8,0,2.5,0.1,3.4,0.2c0-0.8,0-2.4,0-3.1c0.9,0.8,1.9,1.6,2.8,2.4
+			c2.3-2.2,4.6-4.6,5.7-7.7c-2.8-1.3-5.2,1.4-7.5,2.6c0.1-1.4,0.2-2.8,0.3-4.1c1.2-0.8,2.5-1.6,3.7-2.4c-1.6-1-3.3-1.9-5-2.7
+			c-0.5,0.6-1.4,1.9-1.9,2.5l0,0c-0.7-1.1-1.4-2.2-2.1-3.4c1.6-0.5,3.2-1,4.8-1.6c2,0.5,3.9,1,5.9,1.5c-0.9-1.5-1.7-2.9-2.6-4.3
+			c0.4-0.1,1.3-0.3,1.7-0.4c0.1-1.4,0.2-2.9,0.3-4.3l0.8,0.6c0.6,0.5,1.8,1.4,2.4,1.8c0.3-1.2,0.5-2.4,0.8-3.6
+			c-0.2-0.2-0.7-0.7-1-0.9c1.2-2.4,2.2-4.9,2.9-7.5c0.2-2.3-0.1-4.6-0.6-6.8c0.2-0.3,0.7-1,0.9-1.4c2.3-3,3.5-6.7,4.2-10.4
+			c-1.7,0.6-3.3,1.4-4.8,2.4c-0.6,0.1-1.8,0.2-2.4,0.3c-0.3-0.4-1-1.1-1.3-1.5c-0.5,0.1-1.6,0.4-2.1,0.5c-0.5-0.3-1.6-0.8-2.1-1
+			c3.8-3,8.7-3.6,13.3-3.2c0.3-0.4,0.8-1.1,1-1.4c-0.7-0.2-2.1-0.6-2.8-0.7c1.5-1.5,3-3,4.6-4.3C518.2,546,518.9,545.4,519.3,545.2
+			 M508.3,554.1c-1.9,0.4-1.1,3.4,0.7,2.9C511.1,556.7,510.2,553.4,508.3,554.1z"/>
+		<path class="st7" d="M17.3,548.2c1.4,0.7,2.9,1.4,4.3,2.2c0.1,1.1,0.1,2.3,0.2,3.4c-0.7,0.2-2,0.6-2.6,0.8c0,1.3-0.1,2.6-0.1,4
+			c0.8,0.2,2.4,0.7,3.3,1c-2.8,0-5.7,0.5-8.4-0.4c-1.1-0.9-1.3-2.5-2-3.8c0.5,0,1.6,0.1,2.2,0.1c0.9,1.4,1.8,2.7,2.8,4.1
+			c1.6-3.2,1.2-6.6-0.5-9.7C16.6,549.4,17,548.6,17.3,548.2z"/>
+		<path class="st7" d="M497.4,548.9c1.4,0.3,2.8,0.7,4.2,1c-1,1.9-1.8,4.1-3.6,5.5c-0.3-0.5-0.9-1.7-1.2-2.2
+			C497,551.8,497.1,550.3,497.4,548.9z"/>
+		<path class="st7" d="M1483.9,560.6c1.3-3.7,2.6-7.4,4.5-10.8c-0.8,3.8-1.9,7.6-3.5,11.1c-2,4.3-3.2,8.9-4.8,13.3
+			c0.1-0.8,0.2-2.2,0.2-3c-4.3-1.3-7.7-4.6-8.3-9.2c1.3-2.1,3-3.9,4.4-5.8c1.2-1.8,2.9-3.1,4.9-4
+			C1481.7,555,1480.8,558.8,1483.9,560.6z"/>
+		<path class="st7" d="M1458.3,562.1c1.2-3.4,2.4-6.8,3.2-10.3c0.2,3.4,2,6.3,3.6,9.2C1462.8,561.4,1460.5,561.7,1458.3,562.1z"/>
+		<path class="st7" d="M696,557.9c3.4-1.5,6.7-3.2,10.1-4.8c1,0.1,2,0.3,2.9,0.6c-1,1.8-1.8,3.7-1.7,5.8c3.4,0.2,7.2-0.6,10.3,1.3
+			c-2,2-3.9,4.1-5.2,6.6c-1.2,2.4-4,3.4-5.4,5.6c-1.3,1.7-2,3.9-3.7,5.3c-1.6,0.3-3.3,0.2-4.9,0.2c0-2.4,1.1-5.9-1.9-7
+			c-2.8-1.4-5.1,1.4-7.7,1.5c-1.4-1.5,1-2.3,1.8-3.3C694.3,566.9,694.8,562,696,557.9 M705.2,567.2c-0.6,1.6,0,2.2,1.6,1.7
+			C707.4,567.2,706.8,566.6,705.2,567.2z"/>
+		<path class="st7" d="M1704.3,554.2c1.5-1.2,2.8,1.6,1.5,2.6C1704.2,558,1702.9,555.1,1704.3,554.2z"/>
+		<path class="st7" d="M1714.7,553.8c1.4-0.4,3.4,0.3,3,2.1c0.5,1.5-2.8,1.5-2.8,0.1C1714.8,555.5,1714.8,554.4,1714.7,553.8z"/>
+		<path class="st7" d="M137.8,555.5c4.1-1.6,5.3,6.2,1.2,6.1C135.7,561.7,135.9,557.2,137.8,555.5z"/>
+		<path class="st7" d="M465.8,561.4c1.8-2.3,4.2-3.9,7-4.7c2.9,2.3,5.1,5.3,7,8.5c1.7,3,5.6,2.3,8.6,2.4c0.2,0.7,0.5,2,0.6,2.6
+			c-3.2-0.6-6.4,0.3-9.6-0.5c0,0.5,0,1.4,0,1.9c2.1-0.4,4.3-0.9,6.4-1.3c-0.8,1.2-1.5,2.5-2.3,3.8c0.6,0.2,1.3,0.5,1.9,0.7
+			c0-0.9,0.1-2.8,0.1-3.8c3.1,0.5,5.2,2.9,7.4,5c-0.7,0.6-1.3,1.1-2,1.7c-4.2-1.2-8.5-2.4-12.2-4.8c-0.2-0.4-0.5-1.3-0.7-1.7
+			c-0.9-2-1.7-4.3-3.9-5.2C471.2,564.8,468.1,563.8,465.8,561.4z"/>
+		<path class="st7" d="M176.2,563.7c1.5-0.4,3.1-0.8,4.6-1.2c1.3,1.8,2.9,3.7,2.8,6.2c-1.1,1.2-2.8,0.8-4.2,1.1
+			C177.9,568,176.8,565.9,176.2,563.7z"/>
+		<path class="st7" d="M800.4,562.2c1.5,0.3,3,0.7,4.5,1c-0.2,1.1-0.5,2.1-0.7,3.2c-1.2,0.7-2.4,1.4-3.5,2.2c-3.8,1.5-2.3,6-1.3,8.9
+			c1.7,2.9,2.7,6.4,5.5,8.4c1-3.5,1.8-7,1-10.6c-1-4.1,2.9-7,5-9.9c2.5,0.6,5,1.3,7.5,2.2c-1.6,0.9-3.2,1.7-4.9,2.6
+			c0.8,2,1.8,3.9,2.1,6.1c-0.2,1.9-1.4,3.4-2.2,5.1c-1.3,0.5-2.6,0.9-3.9,1.4c-1.6,3.9-1.6,8.2-2.4,12.2c-2.1,4-7.7,5.4-8.7,10.2
+			c-2.2,0.6-4.5,1.2-6.7,1.8c-0.1-3.9-0.1-7.8,0-11.8c0.8-0.1,2.4-0.5,3.1-0.6c0.1-2.8,0-5.6-0.4-8.3c-0.7,0.2-2,0.5-2.7,0.6
+			c-0.1-6.5,0-12.9,0-19.4C795.1,566.7,798,564.7,800.4,562.2 M799.2,596c3,0.1,3.7-2.7,4.5-5c-0.8-0.5-2.3-1.3-3-1.8
+			C799.2,591.2,798.2,593.5,799.2,596z"/>
+		<path class="st7" d="M1726.5,561.4c2.2,0.6,4.4,1.2,6.5,2v3.8c-1.6,0-3.4,0.6-4.8-0.3C1727.4,565.1,1726.9,563.2,1726.5,561.4z"/>
+		<path class="st7" d="M1505.5,565c2,0.7,5.4,0.4,6.1,3.1c0.8,3.6-1.7,6.8-2.3,10.2C1507.6,574,1506.8,569.4,1505.5,565z"/>
+		<path class="st7" d="M497.4,572.2c0-1.3,0.3-2.7,1.1-3.8c0.5,0.6,1.5,2,1.9,2.6C499.7,571.3,498.2,571.9,497.4,572.2z"/>
+		<path class="st7" d="M316.5,573.6c1.2-1.4,3-2.2,4.6-3.2c0.7,0.3,2,1,2.6,1.4c0.6,4.3-4.2,6.7-7.9,6.9
+			C313,577.4,315.3,575.2,316.5,573.6z"/>
+		<path class="st7" d="M469.4,574.2c0.8-0.1,2.3-0.2,3.1-0.3c1.2,0.2,2.4,0.4,3.5,0.6c-1.3,0.8-2.6,1.5-3.9,2.4
+			c-0.3,2-0.5,3.9-0.6,5.9c-0.3-0.1-0.8-0.3-1.1-0.4c1.4-1.7,0.6-3.5-0.8-4.8c-0.4,1.4-0.7,2.8-1.1,4.2c-0.4,1-0.7,1.9-1.1,2.8
+			c-0.2,0.5-0.7,1.5-0.9,2c0.5,0.6,1.1,1.2,1.6,1.8c-1,0.7-2,1.5-3,2.2c-0.5-0.3-1.5-0.8-2-1.1c1.2-2.5,2.8-5.1,2.6-8
+			c0.5-0.2,1.6-0.5,2.1-0.7C468.3,578.7,468.8,576.5,469.4,574.2z"/>
+		<path class="st7" d="M460.4,575.2c1-1.5,3.5,0.2,2.4,1.7C461.7,578.3,459.2,576.7,460.4,575.2z"/>
+		<path class="st7" d="M503.8,574.5c1,0.5,1.9,1,2.8,1.6c-0.4,1.2-0.9,2.3-1.4,3.5c-0.4-0.4-1-1.1-1.4-1.5
+			C503.9,577.1,503.8,575.3,503.8,574.5z"/>
+		<path class="st7" d="M1238.2,575c1.8,0.1,4.3,0.5,2.9,3c-0.8,0.1-2.5,0.2-3.4,0.3C1237.8,577.5,1238,575.9,1238.2,575z"/>
+		<path class="st7" d="M323.4,579.6c1.7-0.1,3.4-0.2,5.1-0.4c-0.7,5,4.3,10,0.2,14.4c-4,1.3-3.1-3.6-2.1-5.8
+			C324.1,585.8,322.7,582.9,323.4,579.6z"/>
+		<path class="st7" d="M989.3,579.2c2.3,0.1,4.5,1,6.4,2.1c0.1,1.2,0.2,2.4,0.1,3.6c-3.2,1.2-6.5,0.3-9.1-1.8
+			C987.5,581.8,988.1,580.3,989.3,579.2z"/>
+		<path class="st7" d="M0,581.5c2-0.5,3.9,0,5.2,1.6c-1,0.9-1.9,1.9-3,2.8c-0.8,0.4-1.5,0.7-2.3,1V581.5z"/>
+		<path class="st7" d="M199.3,581c3.6,4.7-0.7,11.1-6.1,11c0.3-1.8-0.1-4,1.9-4.8C197.6,586,198.4,583.3,199.3,581z"/>
+		<path class="st7" d="M687.2,581.2c1.6-0.5,2.2,0.1,1.7,1.7C687.3,583.4,686.7,582.8,687.2,581.2z"/>
+		<path class="st7" d="M1448.7,583.1l0.4,0.3c2.2,2,5.2-2.3,7.6-0.1c3.1,1.5,1.5,5.5,1.9,8.3c-4.2,0.2-8.7,0.7-12-2.4
+			C1447.2,587.1,1447.9,585.1,1448.7,583.1z"/>
+		<path class="st7" d="M206.2,584.4c0.8,0.5,1.7,1,2.5,1.6c-0.1,1.3-0.1,2.6-0.1,3.9c-1.8-0.3-3.8-0.5-5.3-1.7
+			C203,586.2,205,585.5,206.2,584.4z"/>
+		<path class="st7" d="M484.2,583.7c2.2,0.8,4.4,1.7,6.5,3c-0.7,1.4-1.4,2.8-2,4.3c-0.2,0.5-0.7,1.4-0.9,1.9c-0.6-1-1.2-1.9-1.8-2.8
+			c-0.2-0.3-0.6-1-0.8-1.3c-0.3-0.5-0.9-1.5-1.2-2.1C484,585.9,484.1,584.4,484.2,583.7z"/>
+		<path class="st7" d="M1724.6,586.4c0.8-1.1,1.5-2.2,2.4-3.3c0.4,0.3,1.2,0.9,1.6,1.2c1.5,1.1,3,2.1,4.4,3.2v1.5
+			c-0.6,0-1.7-0.1-2.2-0.1C1728.5,588.6,1726,588.5,1724.6,586.4z"/>
+		<path class="st7" d="M996.2,591.3c0.8-2.7,2.4-5.8,5.8-4.6c2.3,2,1.4,5.5,1.5,8.3c0.5,3.5-3.4,5.4-6.3,4.6c-3.2-0.8-6.5-0.3-9.8,0
+			c-2.2,0-3.6-2.7-2-4.4C989.4,595.2,993,593.4,996.2,591.3z"/>
+		<path class="st7" d="M739,589.4l0.8-0.7c0.5,3.1,0.7,6.3,0.8,9.5c-0.3-0.2-1-0.7-1.4-0.9c-1-0.5-2-0.8-3-1
+			c-1,3.9-3.2,7.4-5.4,10.8c0.2,0.9,0.4,1.7,0.6,2.6l-1,0.3c-2.4,0.7-5.3,1.1-6.6,3.5c-1.2,1.2-1.7,3.7-3.8,3.4
+			c-2,0.1-3.9,0-5.9-0.1c0-1.6,0.1-3.1,0.1-4.7c-1.9,0.5-3.8,1-5.7,1.6c-0.6-1.2-2-2.2-1.9-3.7c1.1-2.4,3.4-4.3,6.2-4.2
+			c1.8,1.3,2.9,4.2,5.1,4.6c3.6-2,7.1-4.4,10.2-7.2c2.9-2.5,3.6-6.5,5.6-9.5c1.5-0.8,3.4-0.2,5.1-0.3c0-0.3,0-0.9,0-1.2
+			C739,591.5,739,590.1,739,589.4z"/>
+		<path class="st7" d="M1541.2,594.7c1.9-1.9,3.7-3.7,5.8-5.4c0.4,0.1,1.3,0.4,1.8,0.6c-1.1,3-2.6,5.8-4.4,8.5
+			c0.9,0.6,1.8,1.2,2.8,1.8c1.8-0.7,2.9-2.5,4.3-3.8c0.8,0.3,1.5,0.6,2.3,0.9c-0.3,1.5-0.6,3-0.9,4.6c0.5,0.8,1.1,1.6,1.6,2.5
+			c-0.3,1.4-0.7,2.7-0.9,4.1c2.6,2.3,6.1,1.8,9.3,1.8c0.3,1.1,0.6,2.3,1,3.4c-3.8,0.7-7.1,2.7-9.2,6c-2.6-0.7-5.3-1.4-7.9-2.1
+			c-0.9-3.9-3.4-7-6.2-9.8c1-6.2-5.5-9.4-7.2-14.8l0.2-1.1C1536.2,592.7,1538.7,593.7,1541.2,594.7z"/>
+		<path class="st7" d="M1715.4,593c0-2.9,3.3-3.6,5.3-4.6c0.6,0.5,1.9,1.5,2.5,2c0.3,0.2,0.9,0.7,1.2,1c1.7-0.1,3.6-0.6,5.1,0.6
+			c-0.8,1.1-1.6,2.2-2.6,3.1c-3.2,3.5-7.7,4.9-12.2,5.6c-0.6-1.5-1.3-3-1.9-4.5c1.7,0.5,3.3,1.2,5.1,1.5c1.9-0.6,3.5-1.9,5.3-2.9
+			c-0.7-1-1.3-2-1.9-3C1719.6,593.2,1717,596.5,1715.4,593z"/>
+		<path class="st7" d="M1708.4,590.6c1.1,1.5,2.2,3,3.2,4.6c-0.5,1.5-1.3,3-2,4.4C1706.8,597.3,1707.4,593.7,1708.4,590.6z"/>
+		<path class="st7" d="M1266.8,599.1c-0.7-1.7-0.6-5.2,2-4.6c2.2,1,3.7,3.1,5.8,4.4c0,0.5,0.1,1.4,0.1,1.9
+			C1272.1,600.2,1269.4,599.8,1266.8,599.1z"/>
+		<path class="st7" d="M145,597c1.4,0.2,2.8,0.3,4.2,0.5c-0.9,3.1-3.8,4.5-6.3,6.3c-0.5-0.3-1.4-1-1.9-1.3c0.8-1.1,1.6-2.2,2.4-3.3
+			C143.9,598.4,144.5,597.7,145,597z"/>
+		<path class="st7" d="M487.4,598.7c1.7-1,5.1-2.6,5.6,0.4c-0.4,3.8-5.8,3.4-8.7,3.9c0.2-0.9,0.3-1.9,0.5-2.8
+			C485.5,599.8,486.8,599,487.4,598.7z"/>
+		<path class="st7" d="M1242.1,598c0.8-0.2,2.4-0.6,3.2-0.8c0.7,2.1,0.5,4.7-1.1,6.5C1241.1,604,1238.9,599.8,1242.1,598z"/>
+		<path class="st7" d="M686.2,599c1.8,7.8,0.9,15.9,0.4,23.8c-0.6,4.1-1,8.2-1,12.3c1.4,0.8,2.8,1.7,4.2,2.6
+			c-1.1,1.4-2.2,2.8-3.3,4.2c1.6,0.4,3.2,0.8,4.8,1.2c-1.5,1-3,2.2-4.2,3.5c-1.1-0.8-2.2-1.7-3.3-2.6
+			C685.3,629.1,686.2,614,686.2,599z"/>
+		<path class="st7" d="M952.1,601c2.5-1,3.6,3.7,0.8,3.3C950.7,604.6,950.9,602,952.1,601z"/>
+		<path class="st7" d="M808,605.5c1.2-1.3,2.4-2.7,3.6-3.9c-0.3,3.5-2.9,6.3-2.8,9.9c-3.6,0.9-7.8,1.3-9.7,4.9
+			c-0.7,2.6-1.3,5.2-2,7.8c-1.6-1.1-3.1-2.4-4.4-3.8c1.1,0,2.2,0,3.3,0c-0.1-1.9-0.3-3.8-0.4-5.7c1.4-1.5,2.7-3.1,3.8-4.8
+			c0.9-0.9,1.8-1.8,2.7-2.7c0.2-0.7,0.6-2.1,0.7-2.8C804.6,604.8,806.3,605.2,808,605.5z"/>
+		<path class="st7" d="M1720.6,602.5c1.3-1,2.8,1,2.1,2.2c-1.5,2-3.4,4.7-6.2,3.7C1715.8,605.6,1718.8,604.1,1720.6,602.5z"/>
+		<path class="st7" d="M989.7,603.7c1.4-0.6,2.9-1,4.4-1.3c0.3,0.4,1,1.1,1.3,1.5c-0.3,0.6-0.8,1.7-1,2.3c-1.8,1.1-3.6,2.2-5.3,3.4
+			C989.2,607.6,989.3,605.6,989.7,603.7z"/>
+		<path class="st7" d="M7.1,607.4c1.6-1.4,3.1-3.7,5.6-3.1c1.5,1.6,2.2,3.9,2.4,6c-0.3,2.1-1.5,4-2.4,5.9c0.3,0.5,1,1.6,1.4,2.1
+			c-0.5,0.1-1.6,0.4-2.1,0.5c-0.3-2.6-0.5-5.2-1.3-7.7C9.9,609.6,8.4,608.6,7.1,607.4z"/>
+		<path class="st7" d="M238.5,604c1.5,2.9,2.8,5.9,3.9,9c-1.7-1.6-3.8-2.7-6.1-2.9c-0.1,2.3-0.1,4.7-0.1,7c-1.3-0.2-2.7-0.4-4-0.5
+			c-0.2-1.4-0.6-2.7-0.6-4.1C233.8,609.6,236.5,607.1,238.5,604z"/>
+		<path class="st7" d="M1452.1,607.4c1.7-1,3.5-2.1,5.2-3.1c2.2,2.3,4.4,4.4,6.7,6.5c0.7-0.6,1.5-1.2,2.3-1.8
+			c-1.5,4.2-3.4,8.2-5,12.4c3.9-0.3,7.7-0.8,11.6-0.6c11.3,0.1,22.6-0.7,33.9,0.2c0.5,0.8,0.9,1.7,1.4,2.5c4.2-0.3,8.4-0.2,12.6,0.4
+			c-0.2,2.7-0.4,5.4-0.6,8.1c4.5-1.9,8-5.8,12.9-6.6c0.1,1.2,0.3,2.4,0.4,3.6c-1,0.6-1.9,1.2-2.8,1.8c-0.6,2.2-0.4,4.6-0.6,6.9
+			c-0.8,0.3-2.2,1-3,1.3c0.7,1.1,1.4,2.2,2.1,3.3c-1.5-0.1-2.9-0.1-4.4-0.2c-1.5,0.2-3,0.3-4.5,0.4c-0.1-0.7-0.3-2.2-0.4-2.9
+			c-1.2,0-2.5,0.1-3.6-0.2c-0.2-0.7-0.6-2.1-0.8-2.8c0.8,0,2.5-0.1,3.4-0.1c-1.9-4.3-4.6-8.9-9.5-10.1c-3.5-1.5-6,2.1-9.2,2.8
+			c-1.8-2.1-4.3-3.1-7-2.9c-1.2-1.2-2.4-2.5-3.7-3.7c-0.6,2.2,1,3.8,2.2,5.5c-4,0.8-7.9,2.1-12,2.2c-4.4-0.5-4.9-5.5-6.2-8.8
+			c-2.5,0.1-5,0.2-7.4,0.5c-2.3,3-5.6,4.7-9.4,4.8c-0.5,1.6-1,3.2-1.5,4.9c-2.8-1.8-6-2.4-9.2-2.2c1.6-2.5,3.9-4.2,6-6.3
+			c0.5-3.1,0.6-6.3,1.5-9.3c0.7-0.2,2.2-0.7,2.9-0.9c0.2-2.4-1.6-3.9-3.5-4.9c-1,0.4-2,0.9-3,1.4c-0.3-0.6-0.5-1.2-0.8-1.8
+			C1450,607.6,1451.4,607.5,1452.1,607.4z"/>
+		<path class="st7" d="M22.8,607.8c1.5-1.4,3.2-2.5,5.1-3.3l0.7,2c0.4,0.8,0.7,1.7,1.2,2.5c0.1,1.7,0.1,3.5,0.1,5.2
+			c-0.9-0.4-1.8-0.9-2.6-1.3C25.6,611.3,24.2,609.5,22.8,607.8z"/>
+		<path class="st7" d="M197.4,610.8c-0.3-2.1-1-4.2,0.2-6.2c1.4,0.2,2.7,0.5,4.1,0.8c0.1,3.9-0.1,7.8-0.9,11.5
+			c-1.6-0.7-3.1-1.4-4.6-2C196.6,613.5,197.1,612.2,197.4,610.8 M198.1,609.9c2.7,1,4.9-2.9,1.9-4
+			C197.5,605,197.7,608.5,198.1,609.9z"/>
+		<path class="st7" d="M1253.6,606c1.2-0.2,2.4-0.3,3.6-0.5c0.2,1.2,0.3,2.3,0.5,3.5c-2.4,0.4-4.8,0.7-7.2,0.7
+			c-0.1-0.5-0.3-1.5-0.4-2C1250.7,606.4,1252.2,606.2,1253.6,606z"/>
+		<path class="st7" d="M976.8,606.8c1.3-0.3,2.6-0.5,3.9-0.7c0,1.8,0,3.7,0,5.5c-1.1,0-2.2-0.1-3.2-0.1
+			C977.1,610,976.2,608.4,976.8,606.8z"/>
+		<path class="st7" d="M737.1,611c0.9,0,2.6-0.1,3.5-0.2c0,3.5-0.5,7-1,10.5c-1.3-1.1-2.7-2.2-3.9-3.4
+			C735.8,615.6,736.5,613.3,737.1,611z"/>
+		<path class="st7" d="M814.1,616c1.8-2.5,4.1-4.4,6.8-5.9c1.5,1.3,3,2.7,4.5,4c-1.9,2-3.3,4.3-4.6,6.6
+			C818.5,619.3,816.5,617.4,814.1,616z"/>
+		<path class="st7" d="M143.9,617.9c-2.5,0.2-6-1.5-4.1-4.4C142.5,613,144.4,615.3,143.9,617.9z"/>
+		<path class="st7" d="M288.8,626.7c2.1-4.1,3.9-8.4,5.8-12.6c0.6,1.4,1.2,2.8,1.9,4.2c-1.4,3.2-2.2,6.6-2.1,10.1
+			c-0.6,0.2-1.8,0.5-2.4,0.6c-0.5-0.9-0.9-1.8-1.4-2.6C290.1,626.5,289.3,626.6,288.8,626.7z"/>
+		<path class="st7" d="M464.6,614.3c2,2.7,4.2,5.4,4.5,8.9l-1-0.9c-0.7-1.7-1.8-3.1-3.2-4.3c-0.1,1.9-0.2,3.8-0.3,5.6
+			c0.5,0.1,1.6,0.2,2.2,0.2c0,1.2,0,2.4,0.1,3.6c1.3-0.7,2.5-1.5,3.9-2.1c1.9,1.4,3.5,3.2,5.1,5c-1.7,1.4-3.6,1.2-5.3-0.1
+			c-0.2-0.5-0.6-1.6-0.8-2.2c-1.8-0.4-3.6-0.7-5.5-0.9c-0.4,1.4-0.8,2.7-1.2,4.1c1.2-0.5,2.5-1,3.8-1.5c0.7,0.1,1.9,0.2,2.6,0.3
+			c0.4,1.9,0.8,3.9,1.1,5.9c-1.8-0.2-3.7-0.5-5.5-0.7c-0.1,1.3-0.1,2.5-0.2,3.8c-0.7-0.9-1.3-1.9-1.9-2.9l-0.5-0.8
+			c-1.4-1-2.9-1.9-4.4-2.7c-1.2,0.9-2.7,1.6-3.6,2.9c-0.2,0.3-0.7,1-0.9,1.3c-0.2-3.2-0.5-6.4-1-9.6c2.2,0.9,4.3,1.9,6.3,3.1
+			c1.1,0.2,2.2,0.3,3.3,0.4c0.9-4.5,1.1-9.1,0.1-13.6C463,616.2,463.8,615.3,464.6,614.3z"/>
+		<path class="st7" d="M691.2,614.2c1.6-0.5,2.2,0.1,1.6,1.7C691.2,616.4,690.6,615.8,691.2,614.2z"/>
+		<path class="st7" d="M493,616c0.3,0,0.9-0.1,1.2-0.2c0.3,0.2,0.9,0.5,1.3,0.7c1.5,0.9,2.9,1.9,4.4,2.8c2.8,0.9,2.9,3.7,2.5,6.2
+			c-0.9,0.1-2.6,0.3-3.4,0.3c-1.6,0.7-3.1,1.6-4.6,2.4c-1.7-1.9-3.7-3.4-6-4.5c0-0.5-0.1-1.5-0.2-2C486.7,618.3,490.8,617.4,493,616
+			 M490.3,620.7c0.4,3.4,3.3,4.7,6.4,4.8c-0.7-1.8-1.5-3.5-2.4-5.2C493.3,620.4,491.3,620.6,490.3,620.7z"/>
+		<path class="st7" d="M244,616.6l0.3-0.6c1,2.2,2,4.3,2.9,6.5c-2,0.3-3.9,0.7-5.9,1C241.7,621.1,242.9,618.8,244,616.6z"/>
+		<path class="st7" d="M1268.4,616.4c2-0.2,4.1-0.2,6.1,0.4c-1.7,2-3.9,3.4-6.4,4.2C1268.2,619.5,1268.3,618,1268.4,616.4z"/>
+		<path class="st7" d="M1277.7,618c0.6-0.4,1.8-1,2.5-1.4c0.8,1.2,1.6,2.4,2.4,3.6c-1.4,0.9-2.8,1.9-4.2,2.8
+			C1278.1,621.3,1277.9,619.7,1277.7,618z"/>
+		<path class="st7" d="M507.4,618.7c0.5,9,2.2,17.9,3.8,26.8c-3.3-0.1-6.5,0.6-9.2,2.5c-1.7,1.6-3.1-0.8-3.9-2.1
+			c1.4,0.5,2.4,0.1,2.9-1.1c-0.9-1.2-2.1-1.4-3.5-0.4c2.1-1.2,4.4-2.3,6.1-4c0.5,1.2,1,2.4,1.6,3.6c2.2-1.6,1.9-4.9,2.7-7.3
+			c-0.4,0.1-1.3,0.2-1.8,0.2c0.7-0.8,1.4-1.6,2.1-2.3c-0.2-2-0.5-4-0.7-6.1c-1.4,1.3-2.5,3.7-4.8,2.7c-0.6-1.7,0.1-3.1,1.2-4.3
+			C507.2,625.4,507.7,622,507.4,618.7z"/>
+		<path class="st7" d="M24.6,620.9c0.8,1.5,2.2,2.9,1.9,4.7c-1.3,1-2.7,1.7-4,2.5c1.7,3.2,1.8,6.9,2.7,10.4c0.5,0.4,1.5,1.2,2,1.6
+			c-0.8,1.2-2.4,2.5-1.6,4.2c1,1.5,2.9,0.9,4.4,1.1l-0.1,0.8c-4.5,2.5-7.1-3-8.8-6.3c4.2-3,2-8.6-0.1-12.2c-0.9-1.9-2.7,0.3-3.3,1.3
+			c0,3.1,1.7,5.9,2.5,8.8c-1.8-1.6-4.1-2-6.1-0.6c1.6,3,2.1,6.4,2.8,9.7c0.9,0.4,1.9,0.7,2.8,1c2.3,3.7,7.3,8.9,2.7,12.8
+			c-2.6-1.4-2.9-4.2-3-6.8c-0.3,0.3-0.8,1-1.1,1.3c0,3.4-0.5,7.1,1.7,10c0,2.2,0,4.4,0,6.6c-1.6-0.3-3.3-0.5-4.9-0.8
+			c-1-1.5-2-2.9-3-4.4c-0.1-0.2-0.4-0.7-0.6-1l-0.6-1c3.3,0.8,4.5,4.6,7.9,5.3c-0.2-2.7-1.4-5-3.1-7.1c-0.1-1.6-0.1-3.2-0.2-4.9
+			c-2.6,1.4-6,2.5-6.7,5.8c-1.7-2-3.2-4.2-4.8-6.3c-0.6,2.1-1.6,4.2-1.4,6.4c0.5,1.5,2,2.4,3,3.6c-0.2,1.2-0.3,2.4-0.6,3.7
+			c-0.4,0.3-1.3,0.8-1.7,1c0.4,1,0.7,2,1.2,3c3.3,1.7,6.8,2.7,10,4.5c-0.1,0.4-0.5,1.2-0.6,1.6c-0.8,1.6-1.6,3.1-2.5,4.7
+			c0.6,1,1.3,2.1,1.9,3.1c-0.8,1.7-2,3.5-0.9,5.4c2-1.7,4.1-3.3,6-5.2c-0.2-3.9-3.7-8.5-0.6-12c1.7,0.1,3.1,1.1,4.4,2.1
+			c-1.3,3.7-0.7,7.6-0.7,11.4c-0.1,2.2-2.6,4-1.9,6.3c1,0.5,2.1,0.9,3.1,1.3c2-2.2,4.4-4.2,6.2-6.5c1.7-3.4-1-6.5-2.8-9.1
+			c1.1-0.5,2.1-1,3.2-1.6c0.2-1.5,0.2-3,0.2-4.5c-1-1.2-2.3-2-3.5-2.9c-0.3-1-0.6-2-0.9-3c1.6-0.3,3.2-0.6,4.9-0.9
+			c0.1,10.4,0.3,20.7-0.2,31.1c0.6,10.4,0.1,20.8,0.1,31.1c-0.3-1.5-0.6-3-1-4.4c-4.1-1.9-8.1-4.1-11.5-7.2
+			c-1.4-1.3-0.6-4.5,1.5-4.4c3.2,0,6.4,0.5,9.6,0.6c0.1-0.3,0.4-1,0.5-1.3c0.1-1.7,0.2-3.4,0.2-5c-0.4,0-1.3-0.1-1.8-0.1
+			c-4.6-0.4-9.2-1-13.7-2.3c-0.6-0.5-1.2-1.1-1.7-1.7c0.8-1,1.7-1.8,2.6-2.7c1.3,1.4,2.6,2.9,4.3,3.9c2.4,0.2,3.7-2.1,5.2-3.5
+			c1.1-0.2,2.1-0.5,3.2-0.7c0.1-1.1,0.3-2.1,0.4-3.2c-2.4-0.1-3.9,1.4-4.9,3.4c-5.5-1.6-12.4-3.7-17.1,0.9c-0.5-0.2-1.5-0.6-2.1-0.7
+			c-0.1-0.3-0.4-1-0.5-1.3c0.8,0,1.5,0.1,2.3,0.2c0.4-0.3,1.2-1,1.6-1.3c0.4-0.4,1.3-1.1,1.7-1.4c1.7,0.3,3.3,0.6,5,0.9
+			c-0.3-1.4,0.3-3.4-1.4-4c-2.9-1.8-6.3-0.3-9.4-0.2c-0.4,0-1.2,0.1-1.6,0.1c0.3,1,0.7,2,1,3L0.7,700L0,700.1v-4.2
+			c2.2-0.5,4.5-0.9,6.7-1.3c0-0.5,0-1.6,0.1-2.1c-2.2,0-4.5-0.1-6.8-0.2v-6.5c4.1-1.3,8.3-1.9,12.5-2.8c-0.7-1.4-0.6-3.7-2.5-4
+			c-1.2-0.8-2.4,0.5-3.4,1c-0.4-0.6-1.2-1.9-1.6-2.5c-1.7,0.7-3.3,1.3-4.9,2.1v-7.9c2.2-1.2,2.7-4.5,0-5.4v-0.7c2-2.9,2.2-6.4,0-9.2
+			v-3.5c1,0.7,2,1.4,3,2.2c0.3-1.3,0.7-2.6,1-3.9l0-0.2l0.8,1.2c1.5,2.9,4.3,4.7,6.6,6.9c4.2-2.7,1.5-8.5-1.2-11.3
+			c0.5-2.2,1.1-4.4,1.7-6.6c-2.4-0.8-4.8-1.5-7.2-2.3c1.2-1.3,2.4-2.5,3.9-3.3c-0.3,1.3-0.7,2.5-1,3.8c2,0,3.9,0,5.8,0.1
+			c-0.1-0.8-0.4-2.5-0.6-3.4c-1-0.4-2.1-0.6-3.1-0.8c0.9-1.8,1.9-3.7,2.8-5.5c1.1,0.3,2.1,0.6,3.2,0.9c0.6-1.1,1.1-2.1,1.7-3.1
+			c1.3-0.8,2.7-1.5,4-2.3c0.3-0.1,0.8-0.5,1-0.6C23.2,623.3,23.9,622.1,24.6,620.9 M11.6,646.1c1.6,2.1,2.5,4.6,4.3,6.5
+			c0.5-0.2,1.5-0.5,2-0.7c1.8-2-1.2-3-2.3-4.3c-0.4-2.2-0.3-4.5-0.7-6.7C11.8,639.5,12.6,644.3,11.6,646.1 M2,685.8
+			c-0.2,0.5-0.7,1.6-0.9,2.2c1.7,0.8,3.3,1.5,5.1,2.1c0-0.8,0.1-2.4,0.2-3.2C5.5,685.2,3.5,685.9,2,685.8 M19.2,717.1
+			c-2.7,1.3-0.3,4.3,1.9,4.5C23.7,720.3,21.5,715.9,19.2,717.1 M23.5,722.6c0.8,1.6,2.5,1.9,4.1,2.3c0-2.3,0-4.6-0.1-6.9
+			C25.8,719,23.5,720.3,23.5,722.6z"/>
+		<path class="st7" d="M1715.3,621.2c0.4,0.1,1.3,0.2,1.7,0.2c0.4,0.5,1.1,1.4,1.5,1.9c0.4,0.3,1.1,0.8,1.5,1.1c1.7,1,1.5,3,1.7,4.7
+			c-3.3-0.3-4.4-3.7-6.6-5.6C1715.2,622.9,1715.3,621.8,1715.3,621.2z"/>
+		<path class="st7" d="M1522.1,623.9c1.4-0.5,2.8-1,4.2-1.4c0,1.1,0,3.2,0,4.3C1524.5,626.3,1523.1,625.3,1522.1,623.9z"/>
+		<path class="st7" d="M225.4,625.1c2.1,0.2,4.2,0.4,6.3,0.6c0,3.2-0.9,6.6-4.2,8C226.5,630.8,225.5,628,225.4,625.1z"/>
+		<path class="st7" d="M483.4,628.7c2.3-0.6,4.5-1.1,6.8-1.5c1,3.4,2.2,7,5,9.3c0.8,0,1.6-0.1,2.4-0.1c-0.4-1.6-0.9-3.2-1.3-4.8
+			c1.1-0.2,2.3-0.3,3.4-0.5c0.2,2.3,0.4,4.6,0.6,6.9c-1.4,0.8-2.7,1.5-4,2.3c-1.5-1.2-3-2.4-4.5-3.7c-0.6,0.2-1.8,0.4-2.4,0.6
+			c-0.1-0.6-0.4-1.7-0.6-2.3c-0.8-0.1-2.4-0.4-3.2-0.5C485.1,632.5,484.2,630.6,483.4,628.7z"/>
+		<path class="st7" d="M805.8,627.7c3.6-1.9,5.3,4.5,2.3,5.8C805.7,632.7,805.1,629.9,805.8,627.7z"/>
+		<path class="st7" d="M1276.4,628.1c2.4-0.6,4.8-0.2,7.1,0.3c0.1,1.2,0.2,2.5,0.3,3.7c-2.2,0.2-4.3,0.5-6.4,0.8
+			c-1,1.1-1.6,2.8-3.2,3c-0.9-0.8-1.7-1.8-2.4-2.6c1.5-0.5,2.9-0.9,4.4-1.3c0-0.8,0.2-2.2,0.2-3L1276.4,628.1 M1278,628.8
+			c-0.2,0.6-0.6,1.7-0.8,2.2c1.9,1.3,4.3,1.8,6-0.1C1282.2,628.9,1280.1,628.6,1278,628.8z"/>
+		<path class="st7" d="M1427.8,634.4c1-2.1,1.9-4.1,2.9-6.2c0.7,1.7,1.8,5.4,4.2,3.7c3.6-2,7.7-0.9,11.5-0.3
+			c0.4,0.8,0.9,1.7,1.3,2.6c0.9,0.6,1.9,1.1,2.9,1.7c-1.9,2.8-2.2,8.4-6.7,7.8c-1.7-1.6-0.6-3.9-0.9-5.8c-0.8-1.2-2.4-1.2-3.6-1.7
+			c-0.9,1.4-1.7,2.8-2.7,4.2c-2.1-1.9-4.6-3.3-7.3-4.1C1429.1,635.7,1428.2,634.8,1427.8,634.4z"/>
+		<path class="st7" d="M214.1,631c2.1-2.1,4.9-3.2,7.7-1.6c-0.3,1.4,0.7,4.3-1.6,4.1C217.7,634,215.8,632.3,214.1,631z"/>
+		<path class="st7" d="M707,629.6c2.3-0.1,3.5,0.9,3.1,3.3c-1,0.3-2,0.7-3,1C707,632.5,707,631,707,629.6z"/>
+		<path class="st7" d="M723.4,635.8c3.4-1.6,7.2-2.9,9-6.5c0.8,1,2.8,2,1.8,3.5c-1.6,2.3-3,4.7-2.8,7.6c0.9,0.1,1.9,0.2,2.9,0.4
+			c0.1-3,1.3-5.8,4.3-7c-2.2,11.5-4.9,23.1-9.7,33.9c0.3-2.4,0.7-4.8,1-7.3c-0.1-0.4-0.3-1.2-0.4-1.6c-2.4-1.1-4.9-1.9-7.5-2.6
+			c-0.6,1.1-1.2,2.2-1.8,3.4c-1.2-2.6-3.3-4-6.2-3.6c0.1,2.3-0.3,4.6,0.5,6.8c0.9,1.2,2,2.1,3.1,3.2c-0.6,1.3-1.2,2.7-1.8,4
+			c2.8-0.4,5.6-0.8,8.4-1.2c1.1,0.9,2.1,1.8,3.2,2.7c-0.7,1.6-1.4,3.1-2.2,4.7c-0.1-0.6-0.4-1.9-0.5-2.6c-0.4,0.1-1.3,0.4-1.7,0.6
+			c-1.2-0.5-2.4-1-3.6-1.5c-0.5,0.3-1.6,0.8-2.2,1.1c1,1.8,2.1,3.6,3.2,5.4c-1.1,2.5-2,5.1-1.4,7.8c-0.4,0.6-0.8,1.3-1.2,1.9
+			c-1.2-0.8-2.6-1.4-3.9-2c-0.2-0.2-0.6-0.7-0.8-0.9c-2.2-4.3-0.7-9.5-3-13.8c1-2,2.5-4.3,0.5-6.3c-2.1,1.5-4.3,2.9-6.5,4.2
+			c-0.3,0.5-0.8,1.5-1.1,2.1c-0.9,1.7-2.1,3.6-1.2,5.6c1.6-0.6,3.2-1.4,4.6-2.5c0.8,1.2,1.9,2.3,2.2,3.7c-0.5,1.7-2.1,2.9-3.2,4.3
+			c0,2.2,0.1,4.5-0.2,6.7c-2.2,1.6-4.9,2.6-7.5,3.6c-1.4,0.5-2.8,1-4.2,1.5c-0.3,2.3,0.2,4.6,2.7,5.4c0.1,0.7,0.3,2.2,0.4,3
+			c-2.8-1-5.4-2.7-8.3-3.2c-1.8,1.8-0.6,4.8-1,7.2c-1.6,0.4-3.3,0.8-4.9,1.3c0.1,5-1.2,9.8-2.3,14.6c-1.2,2.2-3.2-0.2-4.6-0.9
+			c0.8-1.2,1.5-2.4,2.3-3.6c-0.6-2-1.3-3.9-1.5-6c0.5-1.7,1.6-3.1,2.5-4.6c-2.9-0.7-6.6-3.2-9.1-0.4c-1.7,2.1-2.8,4.7-3.3,7.4
+			c0.6,3.4,2,6.7,2.2,10.2c-0.8,0.2-2.3,0.8-3.1,1c-1.2-3.3-1.7-6.8-2-10.2c-1.9-0.6-3.9-2.5-5.9-1.6c-0.5,1.6,0.6,3.2,0.9,4.7
+			c-1.8,0.2-3.7,0.1-5.2-1.1c1-2.3,2-4.6,3-6.9c1.5-0.7,3.4-1,4.7-2.2c0.7-2.3,0.9-4.8,1.3-7.1c-1.8,0.2-3.6,0.4-5.5,0.7
+			c1.7-2.2,3.2-4.5,4.9-6.7c1,1.4,1.9,2.9,2.9,4.3c6.1,3,12.8,3.6,19.5,4.1c0.2-1.5,0.2-3.1,0.4-4.6c1.7-2.5,4.8-3.3,6.8-5.4
+			c0.7-1.2,1.1-2.5,1.6-3.7c1-0.3,2-0.6,3-0.9c1.3-0.2,2.7-0.4,4-0.5c-0.6-1.4-0.9-3.4-2.8-3.7c-3.1-0.1-6.2,0.7-9.2-0.4
+			c2.2-1.9,4.7-3.3,6.6-5.4c1.5-3-1.2-5.6-2.8-8c0.7-1,1.3-2.1,2-3.1c1.7-0.6,3.5-1.1,5.2-1.6c1.9-3,5-4.2,8.5-3.8
+			c-0.3-2.1-0.7-4.2-1.1-6.3c2.2-2.9,4.6-5.8,8.4-6.3c-0.7-0.2-2.1-0.5-2.8-0.6c-0.4-1-0.7-1.9-1.1-2.8c0.1-1.3,0.3-2.5,0.5-3.8
+			c0.3,0,0.8-0.1,1-0.2c3.6-0.1,6.9-1.7,9.8-3.8C722.6,638.3,722.9,637,723.4,635.8 M727.8,641.7c-0.2,0.7-0.7,2.2-1,2.9
+			c-0.6,0.3-1.7,1-2.2,1.3c0.3,0.7,0.8,2,1,2.7c1.7,0.8,3.5,0.5,5.1-0.4C729.9,646,729,643.8,727.8,641.7 M713.2,644.1
+			c-1.2,1.4,1.4,2.5,2.3,1.3C716.6,644,714,642.9,713.2,644.1 M717.2,647.2c-0.5,1.6,0,2.2,1.7,1.7
+			C719.4,647.2,718.8,646.6,717.2,647.2 M700.2,683c0,0.7-0.1,2.1-0.1,2.8c1.3-0.1,2.7-0.1,4-0.2C703.6,683.8,702,683.2,700.2,683z"
+			/>
+		<path class="st7" d="M147.5,631.4c0.5,0,1.6-0.1,2.2-0.1c0,1.5,0.1,3,0.1,4.4c-0.6,0-1.8-0.1-2.3-0.1c-0.4-0.8-0.7-1.5-1.1-2.3
+			C146.6,632.9,147.2,631.9,147.5,631.4z"/>
+		<path class="st7" d="M1558.4,638c2.7-2.3,3.6-7.4,7.9-6.9c0.5,2.7,1.9,5.2,2.2,7.9c-1.2,1.9-2.8,5.2-5.5,4.3
+			C1561,641.9,1559.8,639.9,1558.4,638z"/>
+		<path class="st7" d="M474.3,633.3c1.3-1.4,3.5,0.9,2.2,2.2C475.1,637,472.8,634.6,474.3,633.3z"/>
+		<path class="st7" d="M998.8,633.8c2-0.8,4.2-0.4,6.2-0.4c-0.5,1.6-1.3,3-2.2,4.3c-1.3-0.2-2.6-0.2-3.9-0.5
+			C998,636.3,998.4,634.8,998.8,633.8z"/>
+		<path class="st7" d="M1458.7,632.3c6,1.1,10.3,5.6,15.7,8c3.2,0.7,6.5-0.5,9.7-1c0.2-1,0.5-2.1,0.8-3.1c3.2,0.3,6.4,0.6,9.6,1
+			c0.8,1.8,1.5,3.6,2.4,5.4c-10.5-0.1-21,0-31.5-0.1c0.1-1.7-0.2-3.3-0.4-5c-1.7-0.1-3.5-0.2-5.2-0.3
+			C1459.4,635.6,1459,633.9,1458.7,632.3z"/>
+		<path class="st7" d="M1247.2,637.2c0.8-1.2,1.7-2.4,2.8-3.4c1.4,0.7,1.8,1.9,1.1,3.5C1249.7,637.7,1248.4,637.6,1247.2,637.2z"/>
+		<path class="st7" d="M288,639.2c-2-0.7-1.7-3.6,0.2-4.3c0.7,0,2.2,0.1,2.9,0.1C290.5,636.7,290,638.7,288,639.2z"/>
+		<path class="st7" d="M1570,637.1c1-1.6,2.4-2.9,4.5-2.9c-0.5,1.5,0.4,4.7-2.1,4.4C1571.8,638.3,1570.6,637.5,1570,637.1z"/>
+		<path class="st7" d="M383,636.8c2.7,2.8,7.3,4.8,7.9,9c-1.8,1.3-3.3-0.4-4.8-1.3c-2.1-1.5-4.6-2.1-7-2.7
+			C380.4,640.2,381.7,638.5,383,636.8z"/>
+		<path class="st7" d="M802.1,647.4c2.3-3.8,4.7-7.6,8.6-10c-0.1,1.2-0.1,2.5-0.2,3.7c-2.4,4.4-6.5,7.9-7.8,12.9
+			c-0.3,1.6-2.1,4.1-3.3,1.5C797.2,652.5,800.5,649.8,802.1,647.4z"/>
+		<path class="st7" d="M1158.2,644.8c0.5-2.5,1-5,1.8-7.5c3.9,2.6,0.9,7.1-0.5,10.3C1159,646.7,1158.6,645.7,1158.2,644.8z"/>
+		<path class="st7" d="M1707.2,638.3c1,0,2.1,0,3.2,0c0.3,1,0.7,2,1,2.9c0.8,0.6,1.7,1.2,2.6,1.8c-0.8,1.2-1.2,2.7-2.3,3.6
+			c-1.8,0.5-2.8-1.3-4-2.3C1707.4,642.4,1707.3,640.3,1707.2,638.3 M1708.3,639.3c-1.3,0.9-0.1,3.8,1.5,2.6
+			C1711,640.9,1709.8,638.1,1708.3,639.3z"/>
+		<path class="st7" d="M1715.9,638.5c2.8,1.2,3.8,4,4.3,6.8c-0.5,0.1-1.6,0.4-2.1,0.5C1716.5,643.7,1714.5,641.3,1715.9,638.5z"/>
+		<path class="st7" d="M1541,640.1c2,1.1,4,2.1,6.1,3.2c1.3-1.1,2.5-2.2,3.9-3c2.7,0.4,2.4,4.1,4.2,5.5c1.7,0.9,3.6,1.2,5.5,1.7
+			c-0.7,3.2-1.3,6.5-1.2,9.8c-3.9,0.4-6.8,3-8.6,6.3c-2.2-1.4-4.1-3.9-3.4-6.6c0-2.1,1.4-4.6-0.2-6.4c-1.4-2-4.1-1.6-6.1-2.1
+			C1541.4,645.7,1541.3,642.9,1541,640.1z"/>
+		<path class="st7" d="M1287.8,647.6c2.9-0.8,3.1-4.3,3.8-6.7c1,3.1,2,6.3,3.1,9.4c-1.3,0.6-2.6,1.1-3.8,1.8
+			c-1.4,3.9,2.6,6.7,4.6,9.5c0.1,0.5,0.1,1.4,0.2,1.8c-0.6,0.1-1.9,0.2-2.6,0.3c-1.5-1.6-3.2-3-5-4.3c-0.4-0.3-1.3-1-1.8-1.4
+			c-0.3-0.2-0.9-0.7-1.2-0.9c0.2-1.7,0.5-3.5,0.7-5.2c-1.5-0.8-2.9-1.5-4.4-2.2c0-1.1,0-2.2,0-3.4
+			C1283.6,646.8,1285.6,647.5,1287.8,647.6 M1286.3,655.2c-1.6,2.4,1.8,2.5,3.4,2.2C1289,656,1288.2,654,1286.3,655.2z"/>
+		<path class="st7" d="M1571.1,643.2c1.1-2.3,3.5-1.9,5.5-1.5C1576.5,645,1573.1,644.6,1571.1,643.2z"/>
+		<path class="st7" d="M459.8,643.1c2.2,0.6,4.3,1.2,6.5,1.8c0.8,0.8,1.7,1.8,2.8,2.3c-1.2,1.4-2.5,2.7-3.7,4.1
+			c-0.3,0.1-0.8,0.2-1.1,0.3c-0.4-0.5-1.1-1.4-1.5-1.9C461.2,647.8,459.9,645.7,459.8,643.1z"/>
+		<path class="st7" d="M1260.1,644.8c0.9-0.2,1.8-0.3,2.7-0.5c0,0.7-0.1,2.1-0.1,2.8c0.2,1.8-2.4,1.3-3.5,1.8
+			C1259.4,647.5,1259.7,646.2,1260.1,644.8z"/>
+		<path class="st7" d="M1144.2,646.4c1.2,0,2.3,0,3.5,0.1c-1.3,3.4-1.9,7-2.8,10.5c-1.5-0.9-2.2-2.4-2.5-4c1-0.7,2.1-1.3,3.2-2
+			C1145.2,649.5,1144.7,647.9,1144.2,646.4z"/>
+		<path class="st7" d="M1277,646.1c2.5-1.5,2.7,3,0.1,1.8C1277.1,647.4,1277.1,646.5,1277,646.1z"/>
+		<path class="st7" d="M491.6,649.5c1.1-0.1,2.1-0.1,3.2-0.2c0.2,0.8,0.5,2.3,0.7,3.1c-1.5,0-3-0.1-4.5-0.1
+			C491.2,651.5,491.5,650.2,491.6,649.5z"/>
+		<path class="st7" d="M981.8,653c0.9-2.2,2.9-3.5,4.5-5.1c3.1,4.3-1.3,9.4,1.6,13.9c3-1.9,5.9-5.6,9.8-3.4c0,0.5,0.1,1.4,0.1,1.9
+			c-3.1,0.6-4.2,3.4-5.5,5.8c-1.1,0.3-2.2,0.5-3.3,0.7c-0.8-1.4-1.6-2.8-2.4-4.1c-0.7-0.3-2-0.8-2.7-1.1c-3.3,2.5-6.5,5.6-10.8,6.2
+			c-0.2-2-0.5-4-0.6-6c-0.1-2.2-0.1-4.4,0-6.6c1.3-1.1,2.7-2.1,4.1-3.2c0.8,2.5,1.5,5,2.2,7.6c1,0,1.9-0.1,2.9-0.1
+			C981.5,657.3,981.3,655.2,981.8,653z"/>
+		<path class="st7" d="M1444.4,650.4c0.7-0.2,2.2-0.7,2.9-0.9c0.3,1.5,0.7,2.9,1.1,4.4c0.5-0.1,1.4-0.2,1.9-0.3
+			c-1.2,3.3-2.5,6.5-3.8,9.7c-0.3-0.5-0.8-1.4-1.1-1.9c-1.6,2.4-3.4,4.9-3.8,7.9c-4.7-1.7-9.9-3.4-12.2-8.3c2.6-1.9,5.5-0.5,8.3-0.2
+			c2.2-0.6,5-1.8,5.3-4.5C1443.3,654.2,1443.7,652.2,1444.4,650.4z"/>
+		<path class="st7" d="M1416,662.9c1.5-4,3.1-8.1,4.9-12c-0.1,0.5-0.2,1.5-0.3,2.1c1.1,0.8,2.2,1.6,3.3,2.5c-0.9,1.9-2,3.7-2.6,5.8
+			c0.1,1.5,1.4,2.7,2,4.1c-0.9,1.1-2.2,1.7-3.4,2.5C1419,665.9,1417.7,664.2,1416,662.9z"/>
+		<path class="st7" d="M465.6,656.1c1.5-1.6,3-3.3,4.5-4.9c0.6,0.4,1.7,1.2,2.2,1.6c0.1,1.8,0.3,3.5,0.5,5.3
+			c0.6-0.8,1.2-1.5,1.8-2.2c1.1-1.4,2.2-2.8,3.1-4.4c-0.3,3.6-0.6,7.5,1.5,10.6c-1-0.8-2.1-1.5-3.2-2.3c0.3,3.4,0.9,6.9,1.6,10.2
+			c-0.6,0.2-2,0.7-2.6,0.9c0.5-1.6,0.8-3.3,1.2-5c-2.6,0.5-4.7,1.9-5.7,4.5c-1.4,0.1-2.9,0.2-4.3,0.4c-0.1-0.4-0.2-1.2-0.2-1.6
+			c0.6-0.2,2-0.5,2.6-0.7c0.1-1,0.2-1.9,0.3-2.8c0.1-1,0.3-2.1,0.5-3.1c0.3,1,0.7,2.1,1.1,3.1c0.6-0.1,1.8-0.3,2.4-0.4
+			C473,660.9,470.4,656.3,465.6,656.1z"/>
+		<path class="st7" d="M1019.5,657.5c1.8-1.4,2.2-3.8,2.9-5.9c0,3.2,0,6.5,0,9.7c-0.6,0.3-1.8,1-2.4,1.4c-1.8,0-3.5-0.1-5.2-0.2
+			C1015.9,660.5,1017.7,659,1019.5,657.5z"/>
+		<path class="st7" d="M1570.7,654.8c0.4-0.6,1.1-1.9,1.4-2.6c0.7,0.8,1.5,1.6,2.3,2.4c1.3,1.3,2.7,2.7,4.2,3.9
+			c1.6,1.8,3.8,0,5.8-0.3c0.1-1,0.4-2.9,0.5-3.9c1.3,3.3,2.2,6.7,3.2,10c-3.2,2.9-6.7,5.6-10.8,7c0.1-1.9,0.2-3.7,0.3-5.6
+			c-1.6-0.2-3.2-0.4-4.7-0.9c-0.7-2.6,0.1-5.3,0.2-7.9c-0.1-0.1-0.4-0.4-0.5-0.5C1572.1,656.1,1571.1,655.3,1570.7,654.8z"/>
+		<path class="st7" d="M1702.8,652.3c1.7,1,3.5,2,5.1,3.2c1.2,0.9,2.4,1.8,3.6,2.8c-0.1,0.5-0.2,1.4-0.3,1.8c-0.6,0-1.8,0.1-2.4,0.1
+			c-2.1-1.3-4.1-2.9-6-4.4C1702.8,654.9,1702.8,653.2,1702.8,652.3z"/>
+		<path class="st7" d="M368.6,654.6c4,0.3,7.7,2.3,11.7,2c-0.4,1.5-0.3,3.3-1.7,4.3c-1.2,1.3-3.2,0.5-4.7,0.4
+			c-0.2-0.2-0.7-0.5-1-0.6C371.2,658.9,367.6,657.7,368.6,654.6z"/>
+		<path class="st7" d="M480.1,655.3c2.2-1.8,5.3,3,2.1,3C480.1,659.4,478.1,656.3,480.1,655.3z"/>
+		<path class="st7" d="M231.6,658.3c1.2-1,2.5-1.8,3.8-2.6c1,2.1,2,4.1,3,6.2c-0.7,3-1.5,6.1-2.3,9.1c-3.2,1.2-6.2,3.1-6.6,6.9
+			c-2.1,0.8-4.3,1.6-6.5,2.4c0,0.7-0.1,2-0.1,2.7c-3.4-6.6-6-13.5-9.2-20.1c1.1-0.2,2.2-0.5,3.3-0.7c0.6,2.4,1.2,5.8,4.1,6.4
+			c4.1,0.1,8.3-0.7,12-2.4C234.4,663.5,232.8,660.7,231.6,658.3z"/>
+		<path class="st7" d="M278.5,658.8c3.5-1.1,6.9-3.1,10.7-2.6c-2.7,2.9-4.5,6.9-8.1,8.7C278.3,664.5,279.3,660.8,278.5,658.8z"/>
+		<path class="st7" d="M1269.7,657.9c0.4,0.2,1.3,0.6,1.8,0.8c1.3,2.3,2.5,4.6,3.6,7c-0.5-0.1-1.6-0.2-2.1-0.3c-1.1-1-2.3-2-3.4-2.9
+			c-0.8-0.6-1.6-1.2-2.4-1.8C1267.9,659.7,1268.8,658.8,1269.7,657.9z"/>
+		<path class="st7" d="M1703,661.9c2.3,0.2,4.7,0.4,7,0.6c1.4,4.3,5.7,5.8,9.3,7.8c-1.3,0.6-2.6,1.1-3.8,1.7
+			c-1.6-1.8-3.6-3.1-5.9-3.9c-0.1-0.6-0.4-1.9-0.5-2.5c-2.1-0.1-4.2,0-6.2,0C1702.9,664.3,1703,663.1,1703,661.9 M1707.4,663.1
+			c-0.9,1.3,1.3,2.8,2.3,1.7C1710.7,663.4,1708.4,661.9,1707.4,663.1z"/>
+		<path class="st7" d="M1000.6,665.6c1.4-1,3.2-1,4.8-1.5c0.5,1.9,1,3.8,1.6,5.7c1.1-0.3,2.3-0.5,3.4-0.8c1.3-0.5,2.6-1,3.9-1.5
+			c0.5,6.1,1,12.8-2.2,18.3c-1.9-0.1-3.7,0.4-5.3,1.4c-2.3-2.6-5-5.2-8.8-4.9c-2,4.1-5.5,7.4-6.7,11.9c2.7-0.8,5.3-1.8,8-2.9
+			c0.2,0.4,0.5,1.3,0.7,1.7c-1.7,3.1,1.1,6,2.7,8.5c-2.6-0.4-5.2-0.7-7.8-0.6c0.1-0.8,0.3-2.4,0.4-3.3c-1.2,0.7-2.3,1.4-3.4,2.1
+			c0.1-1.7,0.1-3.5,0.2-5.2c-1.9,0-3.9-0.1-5.8-0.1c0.1-1.4,0.2-2.8,0.5-4.1c2.6-1.8,5.4-3.6,7-6.4c1.9-1.1,3.9-2.1,5.6-3.4
+			c2-1.6,3.8-3.6,5.6-5.4c-2.5-1.3-4.2-3.7-5.9-5.8C999.5,668.1,999.7,666.7,1000.6,665.6 M1006.5,676.5c-0.4,1.7-0.7,3.4-0.4,5.2
+			c1.2,0,2.4-0.1,3.7-0.1c0.9-1.9,1.3-4,0.7-6C1008.9,675.3,1007.7,676.1,1006.5,676.5z"/>
+		<path class="st7" d="M1564.2,665.3c0.9-1.4,3.7-0.2,2.5,1.4C1565.8,668.1,1562.9,666.8,1564.2,665.3z"/>
+		<path class="st7" d="M1285.1,670.5c1.6-0.9,3-4,5.1-2.8c0.8,1.5,1.1,4.7-1.2,5C1287.6,672.3,1286.4,671.3,1285.1,670.5z"/>
+		<path class="st7" d="M395.4,669.4c0.8-0.3,2.2-0.9,3-1.2c2.2,2.5,0.1,5.8-3.1,4.7C395.3,671.7,395.3,670.6,395.4,669.4z"/>
+		<path class="st7" d="M980.6,675.1c1.2-2,1.8-5.1,4.4-5.6c3.2,2.2,2.4,7.3,1.2,10.5C984,678.8,982.2,677,980.6,675.1z"/>
+		<path class="st7" d="M277,673c1.5-0.6,3.5-2.6,4.3,0c-0.9,2-2.6,3.7-2.8,6c-0.4,1.6,0.2,4-1.7,4.8c-3,1.8-6.6,2.1-9.9,2.6
+			c-1.8-0.3-1.9-2.2-1.1-3.5c1.4-1.4,3.1-2.4,4.8-3.5c0.2-1.7-0.4-3.8,0.7-5.2C273,673.2,275.2,673.9,277,673z"/>
+		<path class="st7" d="M679.1,677.8c-0.5-2.9,1.2-5.8,4.4-5.5c0.1,2.2,0.2,4.4,0.2,6.6C682.2,678.5,680.6,678.2,679.1,677.8z"/>
+		<path class="st7" d="M1257.7,674.5c1.7,0,3.4,0.5,5,1.2c0.4,1.6,3,3.6,1.3,5.1c-2.6-0.9-5-2.3-7.4-3.6
+			C1256.8,676.5,1257.4,675.2,1257.7,674.5z"/>
+		<path class="st7" d="M671.9,680c0.6-1.3,1.2-2.6,1.8-3.9c0.6,1.9,1.4,3.7,1.8,5.7c-2.4,3.9-5.2,7.9-9.8,9.3
+			C668.2,687.6,670.2,683.9,671.9,680z"/>
+		<path class="st7" d="M1142.2,676.4c0.4-0.1,1.3-0.2,1.7-0.3c1.5,2.3,3.1,4.6,4.8,6.8c0.5-0.6,1.4-1.9,1.9-2.6l0.7,0
+			c-2,6.2-4.9,12-6.5,18.3c-2-0.7-4-1.3-6.1-1.7c-2,0.2-3.7,1.4-5.1,2.8c-1.2-0.4-2.4-0.7-3.6-1.1c-1.4,0.2-2.8,0.4-4.1,0.6
+			c1.9-2.2,4.5-3.7,7-5.1c0.4-1.4,0.8-2.8,1.3-4.2c1,2,1.4,4.9,3.7,6c0.9-0.5,1.8-1,2.6-1.6c-1-2.2-2.5-4-3.7-6
+			c-0.5-1.7-0.9-3.5-1.3-5.2c0.4-0.4,1.3-1.3,1.7-1.7c1,0.3,1.9,0.6,2.9,0.9c0.5,2.2,1.3,4.4,2.9,6.1c1-1.9,2-3.8,3-5.8
+			c-1,0-2,0-3,0C1142.8,680.6,1142.5,678.5,1142.2,676.4z"/>
+		<path class="st7" d="M1022.3,678.6c0.1,13.6-0.2,27.8,4.3,40.8c1,1.8,2.6,3.1,4.1,4.5c-1.1,0.2-2.3,0.3-3.4,0.5
+			c0,0.5,0.1,1.6,0.2,2.2c1,0.9,2.1,1.9,3.1,2.8c-1.6,0.7-3.2,1.3-4.7,2c-1.2-1.6-2.6-3-3.8-4.6c-0.1-3.3,0.7-6.5,2.1-9.5
+			c-0.1-5.8-2.9-11.2-2.4-17.1c0-0.4,0.1-1.3,0.2-1.7c-1.8,0.7-3.8,1.2-5.7,0.9c0.7-1.8,1.5-3.6,2-5.5c-1.4-1.4-3.4-1.2-5.2-1.6
+			c1.5-2.7,3.7-4.9,6.6-6.1c0.2-1.6,0.5-3.2,0.7-4.8c0.2-0.3,0.6-0.9,0.8-1.2C1021.5,679.8,1022,679,1022.3,678.6 M1021.8,696.2
+			c0.1-2,1.4-5.2-0.9-6.4C1018.2,691.3,1020.6,694.4,1021.8,696.2z"/>
+		<path class="st7" d="M1593.4,678.9c1.1,2.7,2.2,5.4,3,8.1c-1.8-0.6-3.5-1.3-5.2-1.9l0.6-0.5
+			C1592.6,682.8,1593.2,680.9,1593.4,678.9z"/>
+		<path class="st7" d="M249.9,684.3c0.7-0.8,1.3-1.6,2-2.4c0.9,2.2,1.8,4.4,2.7,6.6c-1.8,0.2-3.6,0.5-5.4,0.7c0-0.9,0-2.8-0.1-3.7
+			C249.4,685.2,249.7,684.6,249.9,684.3z"/>
+		<path class="st7" d="M1553.4,684.9c3.3-0.2,6.4-1.1,9.3-2.6c-0.8,2.2-1.8,4.2-3,6.2c-2.3-0.1-4.7-0.1-7-0.3
+			C1553,687.1,1553.2,686,1553.4,684.9z"/>
+		<path class="st7" d="M1413.4,683c0.7,0.6,1.4,1.2,2.2,1.8c-0.4,1.2-0.8,2.5-1.2,3.8c0.9,1.8,1.7,3.6,2.4,5.5
+			c-4.9,0.6-9.7,0-14.6-0.3c0.4-1.1,0.8-2.3,1.2-3.4l0.5,0.2c1.8,0.6,3.7,0.9,5.7,1.1c0.3-0.5,0.9-1.4,1.2-1.9
+			c0.3,1.9,3.7,0.9,2.3-0.8c-0.5,0-1.4,0-1.8,0c0.1-0.3,0.4-1,0.5-1.3C1412.3,686.3,1412.8,684.6,1413.4,683z"/>
+		<path class="st7" d="M1125.9,684c3-0.2,6.7,2.7,5.7,5.8c-1.3,1.7-3,0.5-3.7-1c-0.2-0.5-0.7-1.6-0.9-2.1
+			C1126.7,685.8,1126.3,684.9,1125.9,684z"/>
+		<path class="st7" d="M678.8,687.9c2.5-2.2,6.2-2.2,8.9-0.2c-1.4,1.2-2.9,2.4-4.3,3.6c0.1,2,0.3,4.1,0.1,6.2
+			c-2.9,0.2-5.8-0.1-8.7-0.2c0-0.9-0.1-2.6-0.2-3.5C676.1,691.9,677.4,689.9,678.8,687.9z"/>
+		<path class="st7" d="M528.3,688.4c1.4,1.7,2.7,3.5,4,5.3l-0.8,0.2c-1.1-0.5-3.2-1.7-3.9,0l-0.1,0.4c-0.8-0.4-2.4-1.1-3.2-1.5
+			C525.7,691.4,527,689.9,528.3,688.4z"/>
+		<path class="st7" d="M360.2,693c0.7-0.7,1.4-1.3,2.1-2c1.4,1.3,2.4,3,2.2,5c-1-0.1-2.9-0.4-3.9-0.5c-0.1-0.5-0.3-1.4-0.4-1.9
+			L360.2,693z"/>
+		<path class="st7" d="M1255.9,691l0.7-0.4c0.3,1.3,0.7,2.7,1,4c1.1,4.3,1.9,8.7,2.5,13.2l0.9,0.2c1.9,0.4,3.8,1,5.8,1.6
+			c0.8,1.1,1.6,2.1,2.4,3.2c1.7-1.7,1.9-3.7,0.7-5.7c1.2,1,2.6,1.8,3.9,2.6c-0.1,0.3-0.2,0.8-0.2,1c-1.4,1.2-3,2.2-4.6,3.2
+			c-2.7-1-5.4-1.5-8.3-1.7c-0.4,1.8-0.8,3.5-1.4,5.2C1260.1,708.5,1257.7,699.7,1255.9,691z"/>
+		<path class="st7" d="M1713.4,695.1c1-3,3.9-5.2,7-3.6c-0.8,0.9-1.6,1.8-2.4,2.7C1716.7,695,1715,695.3,1713.4,695.1z"/>
+		<path class="st7" d="M1725.8,694c1.2-2.8,4.7-2.5,7.2-2.2v2.1c-0.8,0-1.5,0-2.3,0C1729.2,694.7,1726.9,696.2,1725.8,694z"/>
+		<path class="st7" d="M253.1,698.9c0.3-2.8,1.6-5.3,3.2-7.5c0.1,1.1,0.2,2.1,0.3,3.2c1.1,0,2.1-0.1,3.2-0.2
+			c2.4,1.7,5.4,2.8,7.2,5.2c-3,0.4-5.7,1.5-8.2,3.2C256.2,704.7,253.5,701.3,253.1,698.9z"/>
+		<path class="st7" d="M271.3,693.3c2.1-2.9,6.1-0.5,8,1.5c1.2,1.6-0.9,2.7-1.8,3.7c-1.4,1-1.4,2.8-1.9,4.2c-0.5,0-1.5,0.1-2,0.1
+			c-0.2-1.2-0.4-2.3-0.6-3.4c-0.4,0-1.2,0.1-1.6,0.1C271.2,697.5,270.8,695.3,271.3,693.3 M273.2,693.3c-2.6,0.6-1.2,3.6,0.7,4
+			c1.5,0.7,3.3,0,4.3-1.3C277.6,694.1,275.1,692.9,273.2,693.3z"/>
+		<path class="st7" d="M394.6,692.1c1.8,1.4,3.5,2.9,5.1,4.5c-0.4,0.7-1.2,2-1.6,2.7c-0.6-0.2-1.9-0.5-2.5-0.7
+			c-0.1-0.7-0.2-2-0.3-2.7C395.1,694.6,394.9,693.4,394.6,692.1z"/>
+		<path class="st7" d="M1287.5,696.5c-0.8-1.6,0.9-3.1,1.5-4.5c2.1,1.6,3.2,4.3,1.1,6.3C1289.2,697.8,1288.3,697.1,1287.5,696.5z"/>
+		<path class="st7" d="M1295.1,693.8c0.2-0.1,0.8-0.3,1-0.4c2-0.1,4-0.2,6-0.1l1.3,0.2c1.1,1.2,2.2,2.4,3.2,3.7
+			c0.1,0.5,0.2,1.5,0.3,2c-1.4-0.9-2.7-1.8-4.1-2.8c-2.1,0.8-4.1,1.6-6.2,2.4c0.3-1.5,0.6-3,0.9-4.4
+			C1296.9,694.3,1295.7,694,1295.1,693.8z"/>
+		<path class="st7" d="M799,699.5c2.5-2.5,5.5-4.5,8.8-5.5c-0.5,5.6,1.2,11.2,0.1,16.7c-2.2-1.7-4.8-2.8-7.5-2
+			c1.3-2,2.2-4.2,2.7-6.5C801.7,701.3,800.3,700.4,799,699.5z"/>
+		<path class="st7" d="M1278.9,700.7c-1.1-2.1-1.3-4.4,0.3-6.2c0.4,1,0.9,2,1.3,3.1c1.3,0.1,2.6,0.3,4,0.5c-0.6,2.4-2.6,3.8-4.6,5
+			C1279.7,702.5,1279.2,701.3,1278.9,700.7z"/>
+		<path class="st7" d="M534.6,697.2c3.2,4.3,7.3,7.6,10.7,11.8c-0.3,0.2-0.9,0.6-1.2,0.7c-1.5,4.6-5,8-8.6,11c0.4,1.5,0.8,3,1.2,4.5
+			c-0.8,0.9-1.7,1.8-2.5,2.7c-0.7-0.4-2.2-1.2-3-1.6c-0.3-2.1,0.3-4.2,0.3-6.2c-1.1-2.6-3-4.8-4.3-7.4c-1-2.4-2.6-4.3-4.6-6
+			c0.3-1.8,0.6-3.6,1-5.4c0.4-0.2,1.2-0.7,1.6-1c0.4,0.1,1.2,0.4,1.6,0.5c-0.5,1.7-1.2,3.3-1.8,5c1.7,0,3.4,0,5.1,0
+			C529.6,702.1,532.8,699.9,534.6,697.2 M537.5,706.6c-1.7,1.8-3.3,3.7-5.4,5c0.6,0.6,0.8,2,1.9,1.9c3.6,0.9,5-3.2,6.7-5.4
+			C539.7,707.6,538.9,706.1,537.5,706.6z"/>
+		<path class="st7" d="M368.4,699.4c0.7,1,1.4,1.9,2.2,2.9c0.8,1,1.6,2,2.4,2.9c-0.3,0.9-0.5,1.9-0.8,2.9c-0.6,0.2-1.7,0.7-2.2,1
+			c-0.6-0.9-1.2-1.8-1.7-2.7C368.3,704,368.4,701.7,368.4,699.4z"/>
+		<path class="st7" d="M1704.3,700.8c1.6-0.4,3.3-0.8,5-1.1c0.1,2.6-1,4.8-3.3,6C1705,704.2,1704.2,702.7,1704.3,700.8z"/>
+		<path class="st7" d="M1722.5,700.4c0.7-1.6,3,0.2,2.6,1.6c0,0.8-0.1,2.4-0.1,3.2C1723.7,703.9,1720.5,702.5,1722.5,700.4z"/>
+		<path class="st7" d="M142.3,705.4c0.3-1.8,0.6-3.7,1.6-5.2c2.1,1.4,3.2,3.3,1.9,5.7C144.6,705.7,143.4,705.5,142.3,705.4z"/>
+		<path class="st7" d="M1140.7,702.1c1.1-0.4,2.3-0.7,3.4-1c-0.5,1.4-1.1,2.8-1.7,4.2c0.3,4.9,0.1,10,1.6,14.7
+			c-0.7-0.5-1.4-1-2.1-1.5c0-1.7,0-3.3,0-5c0-1.4-0.1-2.8,0-4.2l0.1-0.7c-1.4,0.2-2.7,0.5-4.1,0.6c-0.7-1-1.3-2.1-1.9-3.1
+			c0.7-0.3,2.1-0.9,2.8-1.2C1139.4,704,1140,703,1140.7,702.1z"/>
+		<path class="st7" d="M269.4,701.9c2.4,5.1-0.7,10.4-1.9,15.4c1.2,0.5,2.4,1,3.7,1.3c0.6,0.2,1.7,0.5,2.2,0.7
+			c-0.5,1.3-1,2.6-1.6,3.9c-1.3-1-2.6-1.9-3.8-2.9c-0.9,1.8-1.9,3.6-2.9,5.3c-1.6,2.1-2.4,4.6-2.8,7.2c-0.2,0-0.7-0.1-0.9-0.1
+			c0.8-6.6,2.7-13,3.7-19.6c-0.5-0.2-1.4-0.7-1.9-1c-0.4,0.5-1,1.4-1.4,1.8c0.1,1.4,0.3,2.8,0.4,4.2c-2.1,1.1-4.3,2.3-6.4,3.5
+			c1.2-3.7,2.7-7.2,4.2-10.8c1.6-0.4,3.2-0.8,4.7-1.2c0.9-0.7,1.7-1.5,2.6-2.3C268,705.4,268.7,703.7,269.4,701.9z"/>
+		<path class="st7" d="M353.3,709.6c-0.4-3.8,3.3-6.5,6.6-7.3c0.9,0.8,1.7,1.8,2.5,2.7C359.9,707.4,357.3,711.7,353.3,709.6z"/>
+		<path class="st7" d="M1710.2,702.2c1.1-0.9,4.8-1.4,4.4,0.8C1715.3,706.4,1707.5,705,1710.2,702.2z"/>
+		<path class="st7" d="M988.7,703.5c1.7,0.2,2.9,1.8,4.2,2.7c1-0.6,2.1-1.2,3.2-1.8c1.1-0.3,2.3-0.4,3.5-0.3
+			c0.7,0.6,1.5,1.2,2.2,1.8c3.2,0.9,5.4,3.3,7.6,5.7c1.7,1.5,0.6,4,0.9,6c-1.3-1.2-2.5-2.4-3.8-3.7c-3.4-0.3-5.6-2.6-6.6-5.8
+			c-3.4,1-6.8,3-8.6,6.1c-0.2,2.8,3.3,4,4.9,5.9l0.3,0.6c-1.1,0.6-2.2,1.3-3.2,1.9c-2.3-2.2-4.7-4.3-7.2-6.3c0.8-2,1.7-3.9,2.2-5.9
+			C988.3,708.2,987,705.6,988.7,703.5z"/>
+		<path class="st7" d="M1112.9,703.9c0.7-1.1,1.8-1.6,3.2-1.5c0,2.3,0,4.5-0.2,6.8c-0.2,0.3-0.7,0.8-0.9,1c-0.5,0.1-1.5,0.3-2,0.4
+			C1113,708.4,1112.9,706.2,1112.9,703.9z"/>
+		<path class="st7" d="M699,703.4c2.1,0.5,4.2,1.1,6.3,1.6c-5.1,5.9-11,11.1-17.4,15.4c-0.1-3.1-0.2-6.3,1.6-9
+			c2.5-0.8,5.2,0.1,7.7,0.2C697.8,708.9,698.4,706.2,699,703.4z"/>
+		<path class="st7" d="M1295.6,704.2c1.6,0.6,3.3,1.2,5,1.8c0.6,1.3,1.1,2.6,1.7,3.9l-0.5,0.6c-1.2,0-2.4,0-3.6,0
+			c-0.6,0.4-1.1,0.7-1.6,1.1C1296.1,709.2,1295.8,706.7,1295.6,704.2z"/>
+		<path class="st7" d="M1729.8,706c0.8-0.7,1.6-1.3,2.5-2l0.8-0.6v11.3c-0.6,0-1.7,0.1-2.3,0.2c0.3-0.4,0.8-1.2,1.1-1.7
+			c-1.7-0.7-3.4-1.3-5-2l0.9,0.1c0.8-0.1,2.3-0.2,3.1-0.3C1730.5,709.4,1730.1,707.7,1729.8,706z"/>
+		<path class="st7" d="M130,713.8c-0.7-3.5,2.2-6.3,5-7.9c0.9,2,0.4,4.2-0.2,6.2c2.1,0.1,4.2,0.3,6.3,0.4c0.7,2.7,2.2,5.4,2.1,8.2
+			c-2.2,1.6-5.6,3.5-7.7,0.6c-3.4-2.1-1.4-6-0.9-9C133,712.9,131.5,713.4,130,713.8 M134.4,719.5c2.2-0.1,4.4-0.4,6.5-1.1
+			c-0.5-1.6-0.3-3.8-1.8-4.9C135.7,712.9,134.4,716.8,134.4,719.5z"/>
+		<path class="st7" d="M511,708.5c0.8-1.2,1.6-2.4,2.4-3.5c0.8,1.2,2.6,2.3,2.1,4c-0.5,1.7-1.4,3.1-2.2,4.7
+			c-2.3-0.4-4.5-1.1-6.8-1.1c-2.4,0.6-4.6,1.8-6.8,2.8c0.1-1.5,0-3,0.3-4.5c1.8-1.6,4.2-2.2,6.3-3.3c0.6,0.1,1.7,0.2,2.3,0.3
+			C509.1,708,510.4,708.3,511,708.5z"/>
+		<path class="st7" d="M1592.9,708.9c1.4-0.2,2.2,0.5,2.4,2.2c0.5,1.4,1.1,2.8,1.7,4.2l-0.2,1.3
+			C1593.6,715.5,1592,712.1,1592.9,708.9z"/>
+		<path class="st7" d="M975.6,709.8c0.5,1.3,1.1,2.5,1.6,3.8c-1.9,1.9-3.6,4.1-4.5,6.7c-2.1,0.1-4.1,0.1-6.2,0.2
+			c0.2-0.3,0.5-1,0.6-1.4c1.3-2.8,2.3-5.7,3.2-8.6c0.3,0.9,0.8,2.7,1.1,3.6C972.9,712.7,974.2,711.2,975.6,709.8z"/>
+		<path class="st7" d="M517.9,711.8c0.9-0.1,2.8-0.3,3.8-0.4c0,5.7-2.9,11.8-8.7,13.5c-0.3-0.7-0.8-2-1.1-2.7
+			C515.6,719.8,515.5,715.1,517.9,711.8z"/>
+		<path class="st7" d="M996.1,715.1c1.3-1.1,2.7-2.1,4-3.1c0.9,0.9,1.8,1.9,2.6,2.8c-0.9,1-1.9,2-2.8,3
+			C998.6,716.9,997.3,716,996.1,715.1z"/>
+		<path class="st7" d="M148.4,718.2c-1.6-1.8,0.5-3.5,1.5-4.9c0.8,1.1,1.6,2.2,2.5,3.3c1.5,0.5,4.2-0.5,4.8,1.2
+			c-0.7,2.4-1.9,4.7-3,7c-1.2-1.3-2.4-2.6-3.6-3.9C149.8,720,149.1,719.1,148.4,718.2z"/>
+		<path class="st7" d="M1313.8,719.3c0.6-2.3,1.9-4.4,4.7-3.9C1319,718.5,1316.6,720.2,1313.8,719.3z"/>
+		<path class="st7" d="M1416.2,717.4c3.1-0.1,6.2,0.3,9.2,1.2c1.9,3.5-2.3,8.1-6.1,7c-1.2-2.5-3.4-4.7-4.1-7.3
+			C1415.5,718,1416,717.6,1416.2,717.4z"/>
+		<path class="st7" d="M248.5,719c2.4,1.5,4.9,3.1,7.2,4.9c-0.9,0.8-1.8,1.6-2.8,2.4c-0.5-0.3-1.4-0.9-1.9-1.2
+			C250.2,723.1,249.4,721,248.5,719z"/>
+		<path class="st7" d="M805.3,720.2c1.8-2.2,4.6,0,6.4,1.2c0.5,1.5,0.7,3.2,0.9,4.8c-0.3,2.7-0.2,6-2.7,7.7
+			c-2.3,1.6-4.2,3.8-4.8,6.6c5.6,0.2,11.3,0.3,17,0c0.3-1.2,0.6-2.4,0.9-3.6c1.5-0.6,3-1.2,4.5-1.8c0.2,1.8-0.4,3.9,0.5,5.6
+			c2.1,0.3,4.3,0.3,6.4,0.5l1.3,0.2c-12.2,0.3-24.5,0.1-36.7,0.2c-12.6,0.2-25.1,1.9-37.6,1.5c6.4-1.4,12.9-1,19.4-1.9
+			c1.2-0.1,2.5-0.2,3.8-0.3c5.3-0.3,10.7,0.2,16-0.3c0.8-2.5,1.8-5,3.8-6.8c2-1.9,4.1-3.5,6.2-5.2c-2.1-2-4.8-3-7.4-3.8
+			C803.7,723.3,804.3,721.6,805.3,720.2z"/>
+		<path class="st7" d="M981.2,723.7c-0.2-1.9,0.5-3.6,1.6-5.2c1.8,1,3.8,2.2,4.2,4.4C985.2,723.5,983.2,723.7,981.2,723.7z"/>
+		<path class="st7" d="M1305.4,721.8c1.2-1.5,2.8-2.5,4.8-2.5c0,0.7,0.2,2,0.2,2.6c-0.6,1.9-1,3.9-1.1,5.8c-0.6-0.3-1.2-0.5-1.8-0.8
+			c0.2-0.5,0.6-1.5,0.8-2.1C1307.3,723.9,1306.3,722.9,1305.4,721.8z"/>
+		<path class="st7" d="M117.6,730.5c1.5-4,4-7.6,6.6-11c1.2,0.5,2.4,1,3.7,1.4c-0.5,0.7-1,1.5-1.5,2.2c0.2,0.9,0.5,1.8,0.8,2.7
+			C124.4,728.3,121.5,731,117.6,730.5z"/>
+		<path class="st7" d="M1553.2,720.1c2.2,0.1,3.8,1.6,5.6,2.7c-0.7,1-1.3,2-1.9,3C1555.3,724.1,1552.6,722.7,1553.2,720.1z"/>
+		<path class="st7" d="M1609.3,720.4c1.9,1.2,3.9,2.4,6,3.4c-1.1,0.8-2.1,1.6-3.2,2.4c1.3,1.9,2.7,3.7,4.3,5.5
+			c0.1,0.5,0.3,1.5,0.4,1.9c-0.6,0-1.9,0-2.5,0c-0.6-1-1.1-2.1-1.6-3.1c-0.6-0.2-1.8-0.7-2.4-0.9c-0.5-0.2-1.4-0.6-1.8-0.7
+			c0.2-0.3,0.4-0.9,0.6-1.2c0.6-1.2,1.2-2.4,1.8-3.6c-1-0.7-1.9-1.5-2.8-2.2C1608.3,721.4,1609,720.7,1609.3,720.4z"/>
+		<path class="st7" d="M376.7,725.6c-1.6-1.3-2.4-3.3-2.5-5.3c2.1,0.2,4.2,0.4,6.4,0.6C380.7,723.5,379.7,725.7,376.7,725.6z"/>
+		<path class="st7" d="M639,725.9c2.1-1.3,3.9-5.2,6.7-3.5c3.3,1.8,2,6.1,0.3,8.6c-0.9,1.9-3.1,3.6-2.1,5.9c1.7,1.8,3.5-1,5.1-1.7
+			c1.4,1.6,3,3,4.8,4.1c-16.4,5.7-33.5,9.6-50.8,10.7c-7,0.6-14-0.8-21-0.3c-8.6,0.5-17.1-1.5-25.5-3.4c-2.8-0.6-5.4-1.6-8-2.7
+			c8.9,1.4,17.6,4.2,26.6,5c3.6,0.2,8.4,2,10.9-1.6c1.9-1.5,4.1-2.6,6.1-4.1c2.7-2.5,4.3-6.2,7.8-7.8c2.7,0,3.5,2.7,3.9,4.9
+			c-2.4,0.3-4.8,0.8-7.1,1.3c0.2,1.5,0.5,3,0.7,4.5c-2,0.9-3.9,1.8-5.8,2.8c2.6,0.2,5.1,0.5,7.7,0.5c6.8-0.3,13.5-1.1,20.2-1.9
+			c1.2-1.8,2.2-3.6,3.3-5.5c1.8-1,5.1-1.1,5.1-3.8c0.2-1.4,0-3.9-2-3.7c-2.2,1.3-4.3,2.9-6.6,4.1c0.2-1.9,0.4-3.7,0.7-5.5
+			c2.4-2.9,6.1-4.1,9.5-5.4C632.6,726.3,636.5,728.6,639,725.9 M633.1,738.2c0.4,1.8,0.3,4.9,2.9,5c2.6-0.3,4-2.7,5.2-4.8
+			C638.5,738.2,635.8,738.2,633.1,738.2z"/>
+		<path class="st7" d="M1364.1,727.5c7.1,0.6,14-1.4,19.8-5.4l0.3,0.1c1.3,0.3,2.6,0.7,4,1c1.5,0.3,3.2,0.3,4.7,0
+			c0.7,2.2,1.5,4.3,2.3,6.4c0.8,0.2,2.5,0.5,3.3,0.6c-0.2-0.5-0.6-1.5-0.8-2c3.2,0,6.5,0.4,9.6-0.7c0.7-0.2,2.2-0.6,2.9-0.8
+			c0.1,0.8,0.2,2.4,0.3,3.2c-0.9,0.1-2.6,0.4-3.4,0.5c-0.1,0.3-0.4,0.8-0.5,1.1c-0.1,0.3-0.4,0.9-0.5,1.2c0.6,1.4,1.3,2.8,2.1,4.2
+			c-2.8,0.6-5.7,1.3-8.5,1.8c-0.2,0.6-0.7,1.7-0.9,2.3c-0.5,0-1.5-0.1-2-0.2c-0.4,0-1.3,0.1-1.7,0.2c-0.7-1.6-1.3-3.2-2-4.7
+			c-1.1,1.2-2.2,2.4-3.5,3.5c-1.7-0.2-1.2-2.3-1.6-3.5c-0.7-1.3-1.7-2.6-1.6-4.1c0.8-0.1,2.4-0.3,3.2-0.4c0.6,1.7-0.4,5,2.4,4.9
+			c2-1.8,1.7-4.8,0.3-6.8c-0.1-0.7-0.4-2.1-0.6-2.9c-2.4,2.3-5.5,3.3-8.8,2.9c0.2-0.6,0.7-1.7,1-2.3l0.8-0.5
+			c-1.6-0.6-3.1-1.1-4.6-1.7c-0.9,1.7-1.9,3.4-3.1,5c-0.3-0.9-0.8-2.7-1-3.5c-0.2,1.2-0.5,2.4-0.7,3.6c-0.6,0.2-1.9,0.7-2.5,1
+			c-0.5-1.1-1-2.2-1.5-3.3c-2.2,0.2-4.3,0.5-6.4,0.8c0.4,1,0.8,2,1.2,3c-0.8,3.5-1.6,7-0.8,10.6c1.4-2,1.9-5.8,5.1-5.2
+			c-0.6,1.7-1.1,3.4-1.6,5c4.1-1.1,8.3-2.1,12.6-1.6c0.7,0.1,2.1,0.2,2.8,0.2c1.7,0.1,3.3,0.3,5,0.5c-8.3,1.3-16.7,0.9-25,2.2
+			c-0.3-2.3-0.3-4.5-0.1-6.8c-0.3-1-0.6-2-0.8-3C1363.5,731.8,1363.8,729.6,1364.1,727.5 M1398.4,730.7c-1.1,1.8-2.2,3.6-3.2,5.5
+			C1398.6,737.5,1401.3,732.9,1398.4,730.7z"/>
+		<path class="st7" d="M548.1,724.1c3.9-0.6,5.9,4.3,4.3,7.3c-0.9,0.5-1.6,0.3-2-0.7C548.9,728.8,548.5,726.4,548.1,724.1z"/>
+		<path class="st7" d="M1271.5,724.8c1.3-1.2,3.1-0.7,4.8-0.8c-0.3,1.8-1,3.5-2.2,4.9C1273,727.7,1271.4,726.6,1271.5,724.8z"/>
+		<path class="st7" d="M1399.4,724.2c1.5-2,2.7,0.8,2.4,2.2c-1.1,0-2.3,0.3-3.1-0.4C1398.9,725.6,1399.2,724.7,1399.4,724.2z"/>
+		<path class="st7" d="M330.8,729.6c2.6-2,5.7-3.5,8.8-4.6l0,0.4c0,0.4,0.1,1.2,0.1,1.6c0.3,1.4,0.7,2.8,1,4.2
+			c-2.6,0.3-4.5-1.5-6.1-3.3c-1,1.6-2,3.2-3.1,4.8c-1-0.1-1.9-0.2-2.8-0.4c-0.3-1.5-0.5-3-0.8-4.5c-1.6,0.2-3.3,0.3-5,0.5l-0.7,0
+			c0-0.2,0.1-0.7,0.1-1c2.3,0,4.6-0.1,6.9,0C329.7,727.9,330.5,729,330.8,729.6z"/>
+		<path class="st7" d="M1075.3,727.5c5.4,0.4,10.7-1,16-2.3c-1.1,1.5-2.2,3.1-3.2,4.7c-0.5-0.3-1.6-0.8-2.1-1
+			c-0.3-0.2-0.9-0.7-1.2-0.9c-0.8,0-2.6,0-3.4,0c-1.9,0.2-3.7,0.5-5.5,0.9c-0.1,2.9,0.1,5.8,0.5,8.7c0.2,1.5,0.4,3.1,0.7,4.6
+			c1.3,0,2.6,0,3.9,0.1c-0.9-1.1-1.9-2.1-2.7-3.3c1.1-2.8,4.3-3.7,6.8-5c0.9,2.5,1.4,5.2,1.9,7.8c2.6-0.2,5.3-0.6,7.9-0.8
+			c1.3,0.1,2.6,0.2,4,0.4l1.7,0.2c-6.4,1.3-13,0.7-19.5,1.6c-1.7,0.1-3.4,0.5-5,0.1c-0.4-0.9-0.7-1.8-0.9-2.6
+			C1075.1,736.2,1074.2,731.8,1075.3,727.5z"/>
+		<path class="st7" d="M98.7,727.6c5.2,0,10.3-0.6,15.4-1.6c-0.4,0.4-1.2,1.1-1.5,1.5c-4.3,0.4-8.7,0.7-12.9,2.1
+			c-0.3,4.2-0.3,8.3,0,12.5l1-0.2c1.8-0.3,3.5-0.5,5.3-0.7c0.5-0.9,1-1.7,1.4-2.6c1.2-0.2,2.3-0.5,3.5-0.7c1-2.7,2.2-7.5,6.1-5.8
+			c0.2,2.3-0.3,4.6-1.1,6.8c-0.4,0.6-1.1,1.8-1.4,2.4c2,0,4.1,0,6.1,0c0.4,0,1.3,0,1.7,0l0,1.1c-7.9,0.3-15.8,0.2-23.7,0.4
+			c-0.1-3-0.2-5.9-0.2-8.9C98.4,731.7,98.5,729.7,98.7,727.6z"/>
+		<path class="st7" d="M1151.4,725.9l0.3-0.3c2.1,0.7,4.2,1.3,6.4,2c-0.6,0-2,0.1-2.6,0.2c-1.1,3.6,1.9,6.1,4.4,8.1
+			c-1.8,0.9-3.6,1.9-5.4,2.8c0,0.4-0.1,1.3-0.1,1.8c1.6,0.4,3.3,0.9,4.9,1.2c-3.5-0.1-7.1,0.2-10.6,0.3c-2.3-0.3-4.5-0.8-6.8-1.3
+			c-0.8,0.2-1.7,0.3-2.5,0.5c0-1.5,0-3-0.2-4.5c-2.5-0.6-4.8,1-7,2c-0.7-0.7-1.4-1.3-2-2c2.3-1.3,4.7-2.6,6.7-4.4
+			c0,0.9-0.1,2.6-0.2,3.4c1.8-0.3,4.1-0.5,4.7-2.7c-1-1.2-2.3-2.1-3.5-3.1l-0.4-0.4c1.8-1,5.3-3.8,6.5-0.7c1.6,4.5,3.7,8.8,6.6,12.6
+			c0.5-3,0.8-6,1.1-9c-1.4-1.1-2.8-2.1-4.2-3.2C1148.9,728.1,1150.1,727,1151.4,725.9z"/>
+		<path class="st7" d="M1456.3,727.3c1.1,0.1,2.2,0.2,3.2,0.2c0.6,4.6,0.2,9.2,0.3,13.8c-0.1,0.3-0.2,0.9-0.3,1.2
+			c-11.4,0.6-22.7-0.5-34-1.3c1-0.9,2-1.9,3.2-2.6c3.1,1.7,6.5,2.5,10.1,2.5c2,0.2,4.1,0.4,6.1,0.6c1.3,0.1,2.7,0.2,4.1,0.3
+			c3.4,0.6,6.6-0.8,9.6-2.5c0.2-3.7,0.2-7.5,0-11.2l-1,0.5l-1.1,0.4C1456.4,728.9,1456.3,727.8,1456.3,727.3z"/>
+		<path class="st7" d="M1715.3,729.2c1.7-1.1,3.6-2,5.5-2.8c0.1,0.8,0.3,2.5,0.4,3.4c-0.7,0.2-2.1,0.5-2.8,0.7
+			c-1.5,0.9-3,1.7-4.7,2.2C1714.2,731.4,1714.8,730.3,1715.3,729.2z"/>
+		<path class="st7" d="M185.5,727.6c1.9,5,0,10.5,0.5,15.7c-10.6-0.6-21.2-0.9-31.9-1.6c-0.4-0.8-0.8-1.5-1.2-2.2
+			c-2.3,0.8-4.7,1.4-7.1,1.5c2.6-1.6,5-3.4,7.5-5.1c0.9,1.8,1.7,3.6,2.8,5.3c1.6,0.2,3.2,0.2,4.8,0.2c-0.2-1.4-0.5-2.9-0.8-4.3
+			c3.5,1,7.1,1.7,10.7,1.4c1.3,1,2.5,2.2,4,2.8c2,0.6,3.8-0.6,5.6-1.1c1.5,0,3,0.1,4.5,0.3c0-2.8,0.1-5.6,0.1-8.5
+			C185.3,730.5,185.4,729,185.5,727.6z"/>
+		<path class="st7" d="M654.8,729.7c0.3-0.6,1-1.7,1.3-2.2c4.5,0.8,7.2,5.1,11.6,5.9c-2.8,1.3-5.6,2.5-8.6,3.5
+			c-0.4,0-1.2,0.1-1.6,0.1c0.2-1.7,0.5-3.3,0.7-5c-0.4-0.3-1.3-0.9-1.7-1.2C656.1,730.6,655.2,730,654.8,729.7z"/>
+		<path class="st7" d="M996,730.4c1.1-1,2.1-2,3.2-2.9c3,2.5-0.8,5.8-1.1,8.7c-2.1,2.4-4.3,0.2-5.7-1.6c-1.5-1.8-3.8-0.6-5.5,0.1
+			C987.6,730.7,992.5,728,996,730.4z"/>
+		<path class="st7" d="M1038.8,727.6c4.7,0.2,9.7-0.7,14.2,0.5c1.1,4.9-1.4,10.1,0.1,15.2c-13.1-0.2-26.2-0.9-39.3-1.8
+			c2.2-2.2,4.7-4.2,7.9-4.4c-0.2,1.3-0.4,2.7-0.6,4.1c6-0.1,11.9,0.6,17.9,1.2c1.9,0.3,3.7-0.4,5.3-1.3c0.2-0.1,0.8-0.3,1-0.5
+			c0.4,0.5,1.2,1.4,1.7,1.8c1.2-0.1,2.4-0.1,3.6-0.2c-2.4-4.7,1.7-8.8,1.9-13.4c-1.6,0-3.2,0-4.8,0c0.2,2.1,0.3,4.2-0.2,6.3
+			c-1-0.7-2.1-1.3-3.1-2C1043.1,730.7,1041.1,728.9,1038.8,727.6z"/>
+		<path class="st7" d="M1632.5,727.7c1,1.7,1.1,3.7,0.8,5.7c-0.2,1.2-0.3,2.5-0.5,3.7c-0.9-2.4-2.1-4.7-3.4-7
+			C1630.4,729.3,1631.5,728.5,1632.5,727.7z"/>
+		<path class="st7" d="M592.6,729.2c5.7-1,11.5,0.2,17.3-0.4l-0.3,1c-0.4,1.1-0.9,2.3-1.3,3.4c-1,0.2-2,0.4-3.1,0.6
+			c-0.6-1.3-1.2-2.6-1.7-3.9c-1.6-0.1-3.2-0.1-4.8-0.1c-0.2,0.5-0.6,1.5-0.8,2c-1.1-0.6-2.2-1.1-3.3-1.7
+			C593.9,729.8,593.2,729.5,592.6,729.2z"/>
+		<path class="st7" d="M1121.2,733.9c-1.6-1.3-4.2-4-1.1-5.3C1121.5,729.9,1122.2,732,1121.2,733.9z"/>
+		<path class="st7" d="M524.2,734c1-1.5,1.9-3,2.9-4.5c0.8,0.1,2.3,0.4,3.1,0.5c-0.6,2-1.2,4-1.8,6C527,735.3,525.5,734.7,524.2,734
+			z"/>
+		<path class="st7" d="M1528.1,729.8c1.4-0.9,2.4-0.5,3.1,0.9C1530.4,732.7,1527.3,732,1528.1,729.8z"/>
+		<path class="st7" d="M253.2,731.6c0.7-0.3,2.2-0.8,2.9-1.1c0.1,0.6,0.5,1.8,0.6,2.5c1.2,3.6,4.8,5.4,6.7,8.6
+			c-0.2,0.4-0.5,1.2-0.7,1.7c-4,0.1-8.3,0.9-12.1-0.6c2-0.2,4-0.3,5.9-0.4c-0.4-1.4-0.8-2.7-1.2-4.1
+			C254.7,735.9,253.9,733.8,253.2,731.6z"/>
+		<path class="st7" d="M1570.6,741.4c1.3-3.8-0.2-8.6,3.3-11.5c1.6,2,4.5,3.7,4.6,6.5c-1.5,2-3.6,3.5-5.7,4.9
+			C1572.2,741.4,1571.1,741.4,1570.6,741.4z"/>
+		<path class="st7" d="M1711.5,737c4.4,0.4,7.2-3.3,10-6.1c-0.1,0.5-0.4,1.6-0.5,2.1c0.2,0.5,0.7,1.5,0.9,1.9l0.2,0.3l-1,0.1
+			c0.2,0.6,0.5,1.9,0.7,2.6c1.7-0.5,3-1.5,4.3-2.8c3.5,1.5,4.5,5.4,5.6,8.7c-2.8-0.4-4.2-3.1-5.8-5c-0.3,2.3-0.3,4.8-1.5,6.9
+			c-1.6-0.2-2.5-1-2.8-2.5c0.7,0.1,2.1,0.3,2.8,0.4c-0.3-2,0.3-4.6-2.1-5.3c-0.3,1-0.8,3-1,4.1c-0.7-2-1.7-3.9-2.6-5.8
+			c0.2,1.6,0.4,3.2,0.7,4.8c-1-0.1-1.9-0.2-2.9-0.3c-1.9,2.4-3.6,5-5.6,7.3c0.2-1.3,0.4-2.6,0.6-3.9c1.3-1.3,3-2.6,3-4.7
+			c-2.2-3-4.6,0.5-5.9,2.4c-0.1-1.3-0.1-2.5-0.2-3.8c-1.4-0.2-2.8-0.1-4.1,0c1.4-1.5,2.7-3.1,3.8-4.8c0.5-0.3,1.6-0.9,2.1-1.2
+			c0.2,0.3,0.7,1,1,1.4c0.1,0.5,0.2,1.4,0.2,1.8L1711.5,737z"/>
+		<path class="st7" d="M1558.3,731.8c1.8,0.3,2.9,1.8,3.6,3.4l-1.4,1.1c-0.3,0.2-0.8,0.7-1.1,0.9c1.2,1.5,2.6,2.9,3.9,4.3
+			c-2.3,0-4.6,0-6.9,0c0-1.1-0.1-2.2-0.1-3.3c0.7-0.7,1.3-1.4,2-2.1C1558.3,734.7,1558.3,733.3,1558.3,731.8z"/>
+		<path class="st7" d="M135.4,732.7c0.6,1.4,1.2,2.9,1.7,4.4c-0.1,0.6-0.1,1.7-0.2,2.3l0,0.8c-0.3-0.6-0.9-1.7-1.1-2.2
+			c-0.7-0.1-2.1-0.2-2.8-0.2C133.5,735.9,134.5,734.2,135.4,732.7z"/>
+		<path class="st7" d="M1010.7,734.8c1.1-0.5,2.2-1.4,3.5-1.2c0.3,1.6,0.5,3.2,0.7,4.8c-0.7,0.3-2.2,0.9-2.9,1.2
+			c-0.3-0.6-0.8-1.9-1.1-2.5C1010.8,736.5,1010.8,735.3,1010.7,734.8z"/>
+		<path class="st7" d="M1090.2,733.1c1.1,0.7,2.2,1.3,3.3,2c0.1,0.4,0.4,1.4,0.5,1.8c-0.9,0.7-1.8,1.3-2.7,2
+			c-0.9-1.3-1.8-2.5-2.6-3.8C1089,734.7,1089.8,733.7,1090.2,733.1z"/>
+		<path class="st7" d="M1544.3,734.8c0.5-0.6,0.9-1.1,1.4-1.7c0.7,1.3,1.5,2.6,2.3,3.9c-0.2,0.5-0.3,1-0.5,1.6
+			c1.9,0.3,3.7,0.5,5.6,0.8c0.1,0.5,0.3,1.6,0.4,2.1c-4.4,0-8.8,0-13.1,0.7l0-1c0.1-2.3,0.4-4.7,0.6-7l0-0.3
+			c0.3,1.2,0.7,2.5,1.2,3.7c1.2,0.5,2.6,0.9,4,1C1545.7,737.3,1545.1,736,1544.3,734.8z"/>
+		<path class="st7" d="M787.5,736c1.8-1.1,3.8-1.6,5.8-2c0.2,0.8,0.7,2.3,0.9,3c-1.1,0.8-2.2,1.7-3.3,2.5
+			C789.8,738.4,788.6,737.2,787.5,736z"/>
+		<path class="st7" d="M1372.8,739.7c-3.7-1.7,0.1-5.1,2.4-5.9C1375.3,735.9,1376,739.7,1372.8,739.7z"/>
+		<path class="st7" d="M1122.9,735.1c2.6,0.4,5.5,0.7,6.7,3.5c2.1,0.6,4.3,1.2,6,2.7c-3.9,0.1-7.8,0-11.8,0
+			c-0.2-0.6-0.6-1.8-0.9-2.4C1122.9,737.6,1122.9,736.4,1122.9,735.1z"/>
+		<path class="st7" d="M1254.4,734.6c0.8,0.3,2.3,0.8,3.1,1c0.2,0.1,0.5,0.2,0.7,0.3c-0.3,0.7-0.8,2.2-1,2.9
+			C1256.1,737.6,1255.1,736.2,1254.4,734.6z"/>
+		<path class="st7" d="M579.5,737.5c2,0,4-0.1,6-0.1c0,1.1,0,2.1,0,3.2c-1.6,0.5-3.4,1.3-5.1,0.8C579,740.6,579.7,738.8,579.5,737.5
+			z"/>
+		<path class="st7" d="M1294.2,738.2c1.3-0.7,2.6-1.4,3.9-2.1c0.6,0.4,1.8,1.2,2.5,1.7c0,0.7,0,2.2,0.1,2.9c1,0,2.1,0.1,3.2,0.1
+			c1.4,0,2.8,0.1,4.3,0.2c2.3,0.1,4.7,0.1,7.1,0.1c0.2-1.3,0.5-2.7,0.8-4c1.7,0.8,2.9,2.3,3.9,3.8l0.3-0.3c0.8-0.3,2.4-0.8,3.2-1.1
+			c0,0.7,0,2.1,0,2.8c-2.3,0.1-4.4-0.6-6.3-1.7c-0.3,0.3-1,0.9-1.3,1.2c-7.4-0.8-15,0.7-22.2-1.2c0.8,0,2.5-0.1,3.3-0.1
+			C1295.9,739.8,1295,739,1294.2,738.2z"/>
+		<path class="st7" d="M1106.8,741.3c2.1-1.3,4-2.8,6.2-3.8c1.1,0.3,1.9,1.2,2.8,1.9c0.5,0.5,1.4,1.4,1.9,1.8
+			C1114.1,741.3,1110.5,741.4,1106.8,741.3z"/>
+		<path class="st7" d="M1719.6,743.6c0.9,2.1,2.2,4.1,3.9,5.7c0.8-0.9,1.5-1.8,2.3-2.7c1.3,0.3,2.6,0.7,4,0.9
+			c1.2-0.6,2.1-1.6,3.1-2.5v4.7c-1.4,0-2.8-0.1-4.2-0.1c0,0.7,0,2.2,0,2.9c1.4-0.1,2.8-0.3,4.2-0.5v1.6c-1.8-0.4-3.7-0.3-4.6,1.6
+			c0-0.7,0-2.1,0-2.7c-2.5-0.1-4.6,1.3-6.6,2.6c-1.6,1.2-3.5,0.1-5-0.5c1.6,0,5.4,0.2,4.8-2.5c0.2-2.4-3-1.9-4.5-2.4
+			c0.9-0.6,1.9-1.2,2.9-1.8C1719.8,746.5,1719.7,745,1719.6,743.6z"/>
+		<path class="st7" d="M1702.7,747.2c2.6,0.6,5.3,1.1,8.1,1.4c-0.1,0.2-0.3,0.7-0.4,0.9c-0.3,0.8-0.7,1.6-1,2.5
+			c0.8,2.4,1.4,4.9,2,7.3c1.3,0.2,2.6,0.3,3.9,0.4c-1,0.5-1.9,1-2.9,1.5c0.2,1.7,0.4,3.5,0.6,5.2l-0.8-0.1c-0.4-2.2-1.4-4.1-3.5-5
+			c-0.1,1.5-0.1,3.1-0.1,4.6c0.8,0.7,1.5,1.5,2.3,2.3c-2,0.6-4.1,1.1-6.1,1.6c-0.7,1.3-1.3,2.6-1.9,3.9c-0.1-2.5-0.1-5-0.2-7.4
+			c1.5,0,3,0,4.6,0.1c0.1-0.5,0.3-1.5,0.4-1.9c-0.7,0-2.1,0.1-2.8,0.1c0.3-0.7,0.8-2,1.1-2.6c0.4-1,0.8-2,1.3-3c1,0.2,2,0.4,3.1,0.6
+			c-0.1-1.5-0.3-3.1-0.4-4.6c-0.5,0.2-1.5,0.5-1.9,0.6c-0.5-0.2-1.6-0.5-2.2-0.7c0.2-0.4,0.6-1.1,0.8-1.4c-1.3-0.1-2.7-0.2-4-0.2
+			C1702.7,751.2,1702.6,749.2,1702.7,747.2z"/>
+		<path class="st7" d="M15.2,755c2.1,0.2,4.2,0.4,6.3,0.7l0.6,1.2c1.6,3.6,5,5.8,7.6,8.7c-0.5,4.2,0.1,8.5,0.1,12.8
+			c-0.5-0.3-1.5-0.9-2-1.2c0.2-0.9,0.4-1.8,0.6-2.7c-2.3-4.9-4.9-9.7-9.6-12.6c-0.7,3.7-0.5,7.6-2,11c-0.6,1.6-2.4,1.4-3.8,1.6
+			c-1.4,0.1-2.7,0.1-4.1,0.2c0.1-0.3,0.3-1,0.3-1.3c1.8-0.2,3.7-0.2,5.5-0.5c1.9-1.1,1.2-3.6,1.4-5.3c-1.1,0.5-2.1,1.1-3.2,1.6
+			l0.1-0.2C15.4,764.5,15.8,759.7,15.2,755 M16.3,756.4c0.1,1.4,0.3,2.8,0.4,4.2c1.3-0.3,2.6-0.7,3.9-1c-0.1-1-0.2-1.9-0.3-2.8
+			C18.9,756.6,17.6,756.5,16.3,756.4z"/>
+		<path class="st7" d="M19.3,798.2c0.3-0.2,1-0.5,1.3-0.7c-0.4,2.2-0.9,4.4-1.3,6.6c-1.6,1.1-3.5,1.9-4.7,3.5
+			c-1.1,2-1.4,4.3-1.9,6.5c0.5,0.2,1.5,0.5,1.9,0.7c0.8-1.4,1.6-3,2.7-4.2c3.5-0.5,7.1-0.2,10.6-0.3c1.1,2.8,1.6,5.8,1.2,8.8
+			c-1.4,2.4,0.8,3.7,2.8,4.5c0.4-0.6,1.3-1.8,1.7-2.4c0.2,1.1,0.5,2.2,0.7,3.4c1.9-0.5,3.3-1.8,4.4-3.3l1-0.1
+			c-0.8,1.3-0.9,3.4-2.6,3.8c-3.5,1-7,2-10.3,3.4c-3,0-0.9-3.2-1-4.9c-0.7-0.6-1.3-1.2-2-1.8c0.8,0,2.3-0.1,3-0.1
+			c0-1.2,0-2.4,0.1-3.5c-1.5,0-2.9,0-4.4,0c-0.2,0.6-0.6,1.8-0.8,2.4c-0.4-2.5-0.4-5-0.8-7.5c-0.1-1.3-0.8-2-2.1-2.1
+			c-2.1,1.6-2.6,4.4-3.7,6.6c-1.2-1-2.4-2.1-3.7-3.1c0.1-2.3,0.1-4.6,0.1-7c-1.4-0.7-2.9-1.5-4.3-2.2c0-0.3,0.1-0.8,0.2-1.1
+			c1.3,0.3,2.6,1.3,3.9,0.5c0.5-1.6,0.9-3.3,1.3-4.9l0.4-0.2c0,2.1,0.1,4.2,0.2,6.3C16.4,804.3,18.2,801.4,19.3,798.2 M25,817.2
+			c2,0.8,2.6-2.2,3.6-3.2c-0.8-0.7-1.7-1.3-2.6-1.8C23.8,812.5,22.3,816.2,25,817.2z"/>
+		<path class="st7" d="M1703.1,806.9c1.1,0.7,2.2,1.3,3.3,2c0.6,0.9,1.2,1.9,1.9,2.9c-0.7,0.1-2.1,0.4-2.8,0.5
+			c-0.2,0.5-0.5,1.6-0.7,2.1c-0.7,2.1-1.3,4.3-1.8,6.5c-1.8,0.2-3.6,0.4-5.3,0.6c1.7,0.3,3.4,0.7,5.1,1c0,1.1,0.1,2.2,0.2,3.4
+			c0.5,0.4,1.5,1.3,2,1.8c1.3,1.1,2.6,2.2,4,3.3c0.4-1.8,0.9-3.6,1.4-5.4c0.6,4.5,0.1,9,0.2,13.5c-0.6,0.1-1.8,0.2-2.3,0.2
+			c0.5-2.1,0.8-4.2,0.9-6.4c-1.1,0.3-2.2,0.5-3.3,0.8c0,1.4,0,2.8,0,4.2l-0.8-0.5c0.3-2.2,0.7-4.3,1.2-6.5c-0.4-0.3-1.2-1-1.6-1.4
+			c-1.4-1.2-2.7-2.4-4-3.7c0.3-1,0.6-2,0.9-3c-1.6,0.2-3.3,0.1-4.7,1.2c-2.3,0.3-4.5,0.8-6.7,1.6c0.7-1.7,1.5-3.3,2.3-4.9
+			c3.3-0.2,6.7-0.3,10-0.4c0.2-3.4,0.4-6.9,0.6-10.3c0-0.6,0-1.8,0-2.4L1703.1,806.9z"/>
+		<path class="st7" d="M0,810.1c2.4,2.1,4.1,4.9,5.1,7.9c-1.9-0.3-4-0.7-5.1-2.4V810.1z"/>
+		<path class="st7" d="M64.9,821.1c5-0.7,10-0.5,14.9-0.4c-1.7,2.9-1.1,6,0.7,8.6c1.8-0.5,3.5-1.1,5.3-1.6c0.2,1.4,0.5,2.8,0.7,4.3
+			c2,0,4-0.3,5.6-1.6c-0.5,1-1.1,2.1-1.6,3.1c-1-0.3-3.1-0.8-4.1-1.1c-2.4,4.8,0.7,9.8,3.3,13.7c0.9,1.7,3.1,1.1,4.7,1.4
+			c0.4,1.2,0.9,2.2,1.4,3.4l0.1,0.1h-4.4c-0.8-1.1-1.5-2.1-2.4-3.1c-1.2,0.7-1.8,1.9-2.4,3.1h-0.5c-0.3-1.2-0.7-2.3-1.1-3.5
+			c-2.2,0-3.5,1.9-4.8,3.5h-1.5c0-0.7-0.1-2-0.1-2.7c-2.7,0.1-5.6,0-7,2.7h-2c0.3-1.2,0.6-2.3,1.1-3.4c4-1.2,8.2-1.5,12.2-2.3
+			c-0.2-0.9-0.3-1.8-0.5-2.7c-0.5,0-1.5-0.1-2-0.1c-2.7,1.5-5.7,2.1-8.7,2.2c-2.2-0.1-4.4-0.4-6.6-0.5c-0.1-3.5-0.5-7.1-2.1-10.3
+			c0.2-0.6,0.6-1.7,0.8-2.2l0.6,0c-0.3,3.1,1.2,5.7,4.4,6.3c-1.3,1-2.6,2.1-3.8,3.2c2.7,3.5,7.4,1.4,10.9,0.6
+			c1.9-0.2,1.4-2.2,1.7-3.6c-1.9-0.5-3.8-1-5.6-1.5c-0.3-3.2-2.1-5.7-4.6-7.5c-0.7,0.4-2.1,1.2-2.8,1.6c0.1-0.5,0.4-1.5,0.5-2
+			c0.9-0.3,1.7-0.5,2.6-0.7c2.4,1.3,5,2.3,7.6,3c0.2,1.3,0.4,2.7,0.7,4c1.6,0.6,3.1,1.2,4.7,1.8c0.8-1.5,1.5-3.1,2.2-4.7
+			c-1.7-1.4-3.5-2.5-4.8-4.3c-1.3-2-0.6-4.5-0.5-6.8c-2.1,0-4.2-0.1-6.2,0.1c-1.8,1.6-3.7,3.2-5.9,4.3
+			C65.2,824,65.1,822.5,64.9,821.1z"/>
+		<path class="st7" d="M48.4,821.1c1-0.1,2-0.1,2.9-0.2c2.1,1,4.4,1.7,6.6,2.3c0.3-0.6,1-1.7,1.3-2.2l0.4,0c0.7,0,2,0.1,2.6,0.1
+			c0.6,0,1.7,0,2.3,0c-2,2.1-3.7,4.8-6.6,5.7c-2.4,0.3-4.9,0.2-7.4,0.5c-1.4,4.3-1,8.9-2.1,13.3c-1,3.4-0.5,6.9-0.2,10.4h-0.9
+			c-0.7-2.8-1-5.7-2-8.4c-0.9-1.7-2.7-1-4-0.2c-2.1,3.2,2.7,5.5,3.3,8.6h-1.4c-0.3-0.6-0.8-1.8-1.1-2.3c-1.5-1.2-2.9-2.4-4.4-3.5
+			c1.5-2.1,3.4-4,4.6-6.3c0.7-2.2-0.8-4.3-1.7-6.2c3.5,1.1,3.5,5,5.1,7.6c1.8,0.9,2.3-2,2.4-3.2c0.2-2.3,0.2-4.7-0.1-7
+			c-2.9-1.3-6.1-1.1-9.1-0.4c0.2-0.4,0.6-1.1,0.9-1.5c3.4-0.5,6.8-1.1,9.9-2.6C49.5,824,49,822.5,48.4,821.1 M51.8,823
+			c0,0.8,0,2.4,0,3.2c2.1-0.2,5.9,1.5,6.8-1.1C57.1,822.9,54,823.6,51.8,823z"/>
+		<path class="st7" d="M169.6,820.8c0.8,0,2.6,0,3.4,0c1.8,2.1,3.8,4.4,3.1,7.4c-2.7-0.4-5-1.9-6.9-3.9
+			C169.3,823.4,169.5,821.6,169.6,820.8z"/>
+		<path class="st7" d="M281.8,821l1.1,0c-1.2,1.9-2.5,3.7-3.7,5.6c1.4,0.6,2.9,1,4.4,1.5c0.5-2.3,1-4.6,1.6-6.8
+			c0.4-0.1,1.1-0.3,1.5-0.4c-0.2,2.9,0.4,6-1.1,8.6c-2.4,1.2-5.1-0.2-7.6-0.6c-0.2,0.4-0.5,1.3-0.7,1.8c0.4,1.9,1.6,3.4,2.9,4.7
+			c-1,0.7-1.9,1.3-2.9,1.9c-0.9-0.8-1.8-1.6-2.7-2.5c-0.8-0.9-1.5-1.8-2.1-2.8c-0.6-4.4,4.3-6.4,6.8-9.2
+			C280.2,822.2,281,821.6,281.8,821z"/>
+		<path class="st7" d="M316.1,820.8c0.5,0,1.4,0,1.9,0c1.2,1.3,2.1,2.8,2.9,4.4c-1-0.8-2-1.5-3-2.2c-0.3,0.7-1,2-1.4,2.7
+			c-0.7,2.5-0.8,5.1-1.5,7.5c-0.9,3-3.1,5.2-5.2,7.3c-0.5-1.2-1.2-2.2-1.4-3.5c0.7-1.4,1.6-2.7,2.5-4c-0.1-0.9-0.2-1.8-0.4-2.7
+			c1.8-2.2,3-4.7,3.9-7.3C315.1,822.3,315.6,821.5,316.1,820.8z"/>
+		<path class="st7" d="M1222.6,820.9c1.5,0,2.9,0,4.4,0c2.3,1.4,4.8,1.7,7-0.1c-0.1,0.7-0.4,2.2-0.5,2.9c-0.6,0-1.8,0-2.4,0
+			c-1.9-0.1-3.7-0.2-5.5-0.4c-0.9,2.7-1.3,5.7-2.8,8.2c-1.6,0.4-3.2-0.2-4.8-0.6c-0.3-1.7-0.6-3.4-0.8-5.1c1.5-0.2,3.4,0.2,4.6-1.1
+			C1222,823.5,1222.3,822.2,1222.6,820.9 M1218.6,829.1c0.9,0.8,1.8,2.5,3.3,1.9c1.1-1,1.6-2.6,1.2-4
+			C1221.6,824.7,1219.9,828.2,1218.6,829.1z"/>
+		<path class="st7" d="M1620.3,821c1,0,1.9,0,2.9-0.1c-0.7,2.6-1.6,5.2-3.4,7.2c-1.2,1.4-2.5,2.7-3.8,4c-0.5-0.9-1-1.9-1.5-2.8
+			c-0.8,0.4-1.5,0.8-2.3,1.2c-0.3-0.5-1-1.4-1.3-1.8l0.7-0.3c-0.1-0.4-0.3-1.3-0.4-1.7l-0.2-0.8c0.3-0.3,0.8-0.9,1.1-1.2
+			c1.8,1.6,3.1,3.6,5,5c0.2-0.6,0.7-1.9,0.9-2.5C1618.8,825.1,1619.5,823,1620.3,821z"/>
+		<path class="st7" d="M295.2,822.3c2.4-2.6,5.7,3.3,2.7,4.4C295.4,827.8,293,823.9,295.2,822.3z"/>
+		<path class="st7" d="M370.5,826.8c0.5-2,1.8-3.5,3.3-4.7c0.4,0.3,1.2,0.8,1.7,1.1c-0.2,0.8-0.4,1.6-0.6,2.5
+			c-0.2,0.8-0.6,2.4-0.8,3.2C372.9,828.2,371.7,827.5,370.5,826.8z"/>
+		<path class="st7" d="M1421.2,826.9c0.1-1.2,0.3-2.4,0.5-3.6c1.4,0.3,2.8,0.8,4,1.6C1425.2,827.2,1422.9,826.9,1421.2,826.9z"/>
+		<path class="st7" d="M360.4,825.4c2.1,0,4.1,0,6.2,0c-0.1,1.8,0.6,4-1.4,5c-1.6-0.5-3.2-1.1-4.8-1.7
+			C360.4,827.7,360.4,826.5,360.4,825.4z"/>
+		<path class="st7" d="M5.3,829.4c2.9-0.6,5.7-1.5,7.9-3.6c1.2,0.5,2.5,1.1,3.7,1.6c1.2-0.4,2.3-0.7,3.6-1c0.6,1.7,0.9,3.4,1.3,5.1
+			c-0.1,0.8-0.2,1.7-0.2,2.6c3.5,0.6,6.8,2,9.1,4.7c-0.3-1-0.7-2.1-1-3.1c1.1-1.2,2.2-2.4,3.4-3.6c0.5,0.2,1.5,0.7,2,1
+			c-1.1,1-2.3,2.1-3.4,3.2c2,1.9,4.6,2.2,7.2,2c-1.5,0.7-3.5,1-4.6,2.5c1.1,2.4,2.9,4.3,4.6,6.3c-1.6,1.3-3.2,2.6-4.9,3.8H21
+			c0.6-0.9,1.1-1.8,1.6-2.8c-0.3-0.5-0.8-1.4-1.1-1.8c-3.1-0.1-6.3-0.1-9.4-0.1c0.2,0.4,0.5,1.2,0.7,1.6c2.1,0.9,4.2,2,6.2,3.1H0
+			v-3.8c1-2.7,3.5-3.9,5.9-5.1c-0.9-0.7-1.8-1.3-2.7-2c1.2-0.1,2.5-0.2,3.7-0.3c0.4-2.9-2.8-3.7-4.6-5.1
+			C3.2,832.9,3.7,830.8,5.3,829.4 M13.1,827.2c-1.6,1.2-2.9,3.1-5.1,3.4c-2.2,0.2-3.5,2-4.8,3.6c4.2,3.4,8.8-0.2,11.8-3.3
+			C16.2,829.6,15,826.7,13.1,827.2 M8.5,837.9c-0.9,3.1,1.9,5,4.7,4.7c0.2-1.3,0.4-2.6,0.5-3.9c1.3-0.1,2.5-0.2,3.8-0.2
+			c2,1.9,4.1,5.3,7.1,3.2c0.1,0.6,0.2,1.9,0.3,2.5c2.7,1.1,5.6,1.5,8.6,1.3c-0.3-1.5,0.7-3.9-1.5-4.3c-2.7-0.8-4.6-2.8-6.5-4.6
+			C19.9,835.2,13.1,833.2,8.5,837.9 M2.1,847.7c1.8,0,3.7,0.1,5.5,0.1c0.4-1,0.8-1.9,1.2-2.9C6.3,843,1.6,843.9,2.1,847.7z"/>
+		<path class="st7" d="M179.9,829c1.2-1.2,2.4-2.2,3.8-3.3c-0.2,2.4-0.4,4.8-0.8,7.2c-1.2-0.3-2.3-0.6-3.5-0.9
+			C179.5,831.3,179.8,829.8,179.9,829z"/>
+		<path class="st7" d="M1529.3,825.2c1.3,0.5,2.6,1,3.9,1.5c0,0.7,0.1,2.1,0.2,2.8c-1.1,0.1-2.1,0.2-3.2,0.2
+			C1529.5,828.3,1529.2,826.8,1529.3,825.2z"/>
+		<path class="st7" d="M1672.2,827.3c2.2-0.4,4.5-0.7,6.8-1.1c-0.6,1.3-1.1,2.5-1.7,3.8c1.3,0.1,2.6,0.2,4,0.2c-2.2,1.4-4.7,0.6-7,0
+			C1673.6,829.3,1672.9,828.3,1672.2,827.3z"/>
+		<path class="st7" d="M1240.2,826.7c2.1,0.1,4.2,0.4,5.6,2c-1.5,0.7-3.1,1.3-4.7,1.7C1240.8,829.2,1240.5,827.9,1240.2,826.7z"/>
+		<path class="st7" d="M1380.6,826.7l0.8,0.5c-1,4.4-2.1,8.8-3.2,13.1c-1.4,1.1-2.9,2.2-4.4,3.2c1.1-4.5,2.8-9,2.9-13.7
+			c0.5,0.6,1.5,1.9,1.9,2.5C1379.8,830.7,1380.3,828.7,1380.6,826.7z"/>
+		<path class="st7" d="M299,827.9c2.2,0.8,4.4,1.8,6.6,2.8c0,1.2-0.1,2.5-0.1,3.8c-1.1,0.1-2.1,0.1-3.2,0.2
+			C300.7,832.6,299.9,830.2,299,827.9z"/>
+		<path class="st7" d="M1554.3,829.1c1.1-0.6,2.3-2.5,3.6-1.1c0.1,0.9,0.2,2.6,0.3,3.5c-1.2,0.1-2.5,0.1-3.7,0.2
+			C1554.5,831,1554.4,829.7,1554.3,829.1z"/>
+		<path class="st7" d="M1431.6,829.8c0.8,0.9,2.3,1.6,1.6,3c-1,2.8-0.5,5.5,1.1,8c3-1.1,6.1-3,9.5-2.3c-0.1,0.5-0.3,1.5-0.4,1.9
+			c-2.8,1.9-5.8,3.3-8.6,5.1c-0.5-0.4-1.4-1.3-1.9-1.7c-0.3-0.2-0.8-0.7-1.1-0.9c-1.4,0-2.7,0.1-4,0.2c-0.2-0.4-0.6-1.1-0.8-1.5
+			c1.7-1.2,3.6-2.5,4.2-4.6C1431.7,834.6,1431.5,832.1,1431.6,829.8z"/>
+		<path class="st7" d="M1727,835.1c1.1-1.9,1.2-5.5,4.2-4.6c1.8,0.5,1.1,2.9,1.7,4.3c-1.1-1.2-2.4-2.4-3.6-3.5c-0.4,1.6-0.7,3.3-1,5
+			c-1.4,0.6-2.7,1.2-4.1,1.8c0.7,2.5,2.1,4.7,3.6,6.8c-1.8,0.7-3.5,1.4-5.2,2.1c-1.7-1.7-3.1-3.6-3.7-5.8c-2.1-0.3-4.1-0.6-6.2-0.8
+			c2.9-0.1,6.5,0.5,8.3-2.3c0.3,1.7,1.4,3.1,2.6,4.3c0.8-3,0.1-5.8-1.6-8.2c0.5-0.1,1.5-0.2,2-0.3C1725,834.3,1726,834.7,1727,835.1
+			z"/>
+		<path class="st7" d="M1639.6,836.3c0.9-1.5,1.6-3.1,2.4-4.7c0.7,1.4,1.5,2.9,2.4,4.2c0.9-0.2,1.4-0.8,1.5-1.8c0.5,0,1.5,0.1,2,0.2
+			c0.3,1,0.6,2.1,0.9,3.1c2.2,0.4,4.4,0.7,6.7,1.1c-0.1-2.2-0.2-4.3-0.3-6.5c0.6,1.9,1,3.8,1.5,5.8c1.3-0.1,2.6-0.1,3.9-0.1
+			c-1.3,0.5-2.5,0.9-3.8,1.4c-0.1,0.8-0.2,2.3-0.3,3c-0.1,0.1-0.5,0.2-0.6,0.3c-0.7-0.5-1.4-0.9-2-1.4c-1.7-0.3-3.4-0.4-5-0.5
+			c-0.7-0.6-1.4-1.1-2-1.6c-2.5,1.1-5.1,2.1-7.8,1.8c2.4-0.4,4.4-1.5,4.9-4C1642.5,836.6,1641,836.5,1639.6,836.3z"/>
+		<path class="st7" d="M229.5,833.1c1.6,0.3,3.2,0.8,4.8,1.5c-0.4,0.6-1.1,1.7-1.4,2.3c-1.2-0.1-2.4-0.3-3.6-0.4
+			C229.4,835.3,229.4,834.2,229.5,833.1z"/>
+		<path class="st7" d="M1524,832.5c1.4,0.2,2.3,1.1,2.6,2.5c-0.4,0.4-1.2,1.1-1.7,1.4C1522.4,836.5,1523.2,833.9,1524,832.5z"/>
+		<path class="st7" d="M1237.5,841.2c0.9-2.1,1.6-4.3,2.1-6.5c-0.1,2.1,0.3,4.2,0.9,6.2c0.9-0.9,1.9-1.9,2.8-2.9
+			c-0.2,0.7-0.5,2-0.7,2.7c-1.4,0.3-2.7,0.7-4,1c-0.2,1.2-0.3,2.4-0.4,3.6l-0.2,0.9c-0.8,0.2-1.6,0.4-2.4,0.6
+			c-0.1-1.1-0.2-2.2-0.2-3.3c-1.7,0.4-3.4,0.9-5.2,1.3c-1.6,2-4.6,5.6-6.8,2.2c0.7-2.9,3.5-4.3,5.7-5.9c2-0.3,3.9-0.5,5.9-1
+			c0.6-0.2,1.7-0.5,2.2-0.7C1237.4,839.9,1237.5,840.8,1237.5,841.2z"/>
+		<path class="st7" d="M1337.8,836c1.4-0.5,2.8-1,4.2-1.5c0.7,0.4,2,1.2,2.7,1.5c-0.3,1.2-0.6,2.5-0.9,3.8c-1.9,1-3.7,2.1-5.5,3.2
+			c-0.4-1-0.8-2.1-1.2-3.1l-0.2-0.5c0.4-0.4,1.3-1.2,1.8-1.6C1338.4,837.3,1338.1,836.4,1337.8,836z"/>
+		<path class="st7" d="M1497.5,834.3c1.6-0.2,2.9,0.3,4,1.5c0,1.4-0.9,3-2.5,2.9C1496.7,839,1497.9,835.5,1497.5,834.3z"/>
+		<path class="st7" d="M1116.5,836.3c1.8,0.2,3.9-0.4,5.5,0.6c1,0.8,0.2,1.7-0.5,2.4c-1.7,0.2-3.4,0.2-5.1,0.3
+			C1116.5,838.5,1116.5,837.4,1116.5,836.3z"/>
+		<path class="st7" d="M1257.4,836.3c0.6,0.1,1.8,0.3,2.4,0.3c0.3,0.4,0.8,1.1,1.1,1.4c0.6,0.8,1.3,1.7,2,2.5c-1.2,1-2.4,1.9-3.6,3
+			c-0.8,0.5-1.6,1-2.4,1.6c0.5,2,1,3.9,1.5,5.9h-1.3c-2.4-2.5-1.5-6-1.5-9.1c0.9,0.3,1.9,0.6,2.9,1
+			C1258.1,840.7,1257.7,838.5,1257.4,836.3z"/>
+		<path class="st7" d="M1395.8,836.1c0.9-0.2,2.9-0.8,3.8-1c0.3,1.6,0.2,3.2-0.1,4.8C1397.9,839,1394.4,838.8,1395.8,836.1z"/>
+		<path class="st7" d="M212.4,837.4c1.8,0.9,3.6,1.9,5.4,3c-3.8,3-7.4,6.2-9.7,10.6h-6.2c0.3-1.3,0.6-2.7,1-4c0.4-0.3,1.2-1,1.6-1.4
+			c0.4,0.7,1.3,2.1,1.8,2.9c2.7-0.6,4-2.9,4.8-5.3c-1.6,0.2-3.2,0.5-4.8,0.8C208.4,841.9,210.4,839.6,212.4,837.4z"/>
+		<path class="st7" d="M264.9,838.9c-0.3-1.6,1.5-2,2.5-1.4c0.6,3.9-0.1,7.9-0.9,11.7c-2.1,0.6-4.2,1.2-6.4,1.8h-5.6
+			c0.6-1.5,1.2-3,2-4.3c2.1-1.2,4.6-1,6.9-1.4C264.6,843.3,264.6,841,264.9,838.9z"/>
+		<path class="st7" d="M1279.4,837.3c0.4,0.1,1.2,0.4,1.6,0.6c-0.6,1.3-1.2,2.6-1.7,3.9c-0.2,0.5-0.7,1.5-0.9,2
+			c-1.5-0.3-3-0.4-4.5-0.6c0.3,1,0.6,2.1,1,3.1c1.8,0.9,3.7-0.1,5.4-0.8c1.1,1,2.4,2,3.8,2.8c2.1-0.5,1.1-2.9,1.4-4.5l0.6,0.5
+			c2,2.2,0.8,4.7-0.9,6.6h-3.1c0.3-0.5,0.8-1.6,1.1-2.2c-1.1-0.4-2.1-0.7-3.2-1c-1.2,0.7-1.9,2.1-2.8,3.1h-4.9
+			c0.8-1.4,2.2-2.8,1.2-4.5c-2.7-0.6-5.1,1.8-7.6,2.5c-0.2,0.5-0.7,1.5-0.9,2h-5c-0.8-1.6-1.3-3.3-1.8-5.1c1,0.4,2.2,1,3.2,1.4
+			c1.4-1.1,2.7-2.2,4.2-3.2c0-0.4,0-1.2-0.1-1.6c0.5,1.1,1.1,2.1,1.7,3.2c-1.2,0.6-2.4,1.3-3.6,1.9c1.9-0.4,3.9-0.8,5.8-1.2
+			c0.1-2.2,0.2-4.4,0.4-6.6C1273.2,839.8,1276.8,839.9,1279.4,837.3z"/>
+		<path class="st7" d="M1157.1,839.3c2.2,0.2,5.8-1.3,6.8,1.4C1161.7,843.7,1158.5,841.9,1157.1,839.3z"/>
+		<path class="st7" d="M1203.5,839.5c1.6-1.5,2.9,0.5,4.2,1.4c-1,1.1-2.1,2.2-3.1,3.2C1203.1,843,1201.9,841.1,1203.5,839.5z"/>
+		<path class="st7" d="M1365.3,840.2c1.3-0.9,2.8-1.4,4.3-1.8c-0.5,1.5-1,3-1.5,4.5C1367.3,842.2,1366,840.9,1365.3,840.2z"/>
+		<path class="st7" d="M1588.3,838.4c2.1,1.4,4.1,3.3,4.2,6.1c0.3,2.2,0.6,4.4,1.1,6.5h-3.9c-0.1-1.8,0-3.6,0-5.3
+			c0.2-1.7-0.8-2.9-2.1-3.8C1587.9,841,1588.2,839.3,1588.3,838.4z"/>
+		<path class="st7" d="M1173.6,840.6c1.2-0.2,2.3-0.3,3.5-0.5c0.1,1.6,0.3,3.2,0.4,4.9c-1.4,0.2-3.1,0.9-4.1-0.3
+			C1173.3,843.3,1173.4,842,1173.6,840.6z"/>
+		<path class="st7" d="M1703.3,839.7c1.8,1.2,3.6,2.6,5.7,3.5c2.7,0.5,5.4,0.2,8.2,0.3c0.1,0.3,0.2,0.9,0.2,1.2
+			c-0.4,0.2-1.1,0.8-1.5,1c-1.3,0.9-2.6,1.8-3.9,2.7c0.7,0.9,1.4,1.8,2.2,2.7h-12c0.1-2.6-4.2-2.8-2.8,0h-5.4
+			c-0.2-0.8-0.8-2.4-1-3.2c1.3-0.8,2.6-1.6,4-2.2c1.3,0.5,2.6,1.3,3.9,2c0.1-2.1,0.2-4.3,1.3-6.1
+			C1702.5,841,1703,840.2,1703.3,839.7 M1703.7,845.1c-0.3,2.4,3.1,1.5,4.5,1.8C1707.7,845,1703.4,840.9,1703.7,845.1 M1703.4,847.7
+			c-0.6,4.2,4.9,3.4,5.3,0.1C1706.9,847.7,1705.2,847.7,1703.4,847.7z"/>
+		<path class="st7" d="M304.2,841.9c1.3,0.1,2.5,0.2,3.8,0.3c-0.2,1.3-0.5,2.7-0.8,4c-1.1,0.2-2.2,0.2-3.4,0.4
+			C304,845,304.1,843.5,304.2,841.9z"/>
+		<path class="st7" d="M1539.5,842.7c1.4,0.4,4.5-1.4,4.6,1c-2,2.5-4.3,4.9-6.5,7.3h-0.2c-1-1.2-2-2.3-3.1-3.5
+			c-1.5,0.8-3.1,1.5-4.6,2.2c1.4-1.7,2.9-3.3,4.5-4.8c0.4,0.6,1.2,1.9,1.7,2.5c0.8,0,2.5-0.2,3.3-0.2
+			C1539.3,845.8,1539.5,844.2,1539.5,842.7z"/>
+		<path class="st7" d="M1288.2,847.8c2.3-1.6,4.9-3.6,7.6-1.5c-1.7,1.5-3.4,3.1-5.2,4.6h-0.7
+			C1289.3,849.9,1288.7,848.9,1288.2,847.8z"/>
+		<path class="st7" d="M1093.7,846.8c0.7,0.3,1.9,0.9,2.6,1.2c-0.2,0.7-0.5,2.2-0.7,3h-1.9C1093.6,849.6,1093.6,848.2,1093.7,846.8z
+			"/>
+		<path class="st7" d="M1305.7,846.3c2.2,0.9,3.7,2.7,5,4.7h-4.8C1305.8,849.4,1305.7,847.9,1305.7,846.3z"/>
+		<path class="st7" d="M1422.4,847.2c1.6-1.3,2.8,1.6,1.3,2.4C1422.1,850.9,1421,848.1,1422.4,847.2z"/>
+		<path class="st7" d="M1666.8,846.4c2.2,1,4.5,2.1,6.5,3.6l0.9,1h-7.4C1666.8,849.5,1666.8,847.9,1666.8,846.4z"/>
+		<path class="st7" d="M373.6,851c-0.2-1.5,0.3-2.7,1.4-3.7c1.8,0.8,2.9,2.3,4.2,3.7H373.6z"/>
+		<path class="st7" d="M1234.6,847.3c1,0.8,2,1.6,2.9,2.5l-0.2,1.2h-4.4C1233.5,849.8,1234.1,848.5,1234.6,847.3z"/>
+		<path class="st7" d="M1575.5,851c0.5-0.7,1.4-2,1.8-2.7c1.2,0.9,2.3,1.8,3.5,2.7H1575.5z"/>
+		<path class="st7" d="M1489.4,850.3c1.2-1.1,2-0.8,2.5,0.7h-2.8L1489.4,850.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/misc/setup/MacOSX/SLA-dmg.sh b/misc/setup/MacOSX/SLA-dmg.sh
deleted file mode 100644
index af268f32..00000000
--- a/misc/setup/MacOSX/SLA-dmg.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# This script appends the text from Q3A_EULA.txt to a .dmg as a SLA resource
-#
-# usage is './SLA-dmg.sh /path/to/Q3A_EULA.txt /path/to/ioquake3.dmg'
-#
-
-if [ "x$1" = "x" ] || [ "x$2" = "x" ]; then
-	echo "usage: ./SLA-dmg.sh /path/to/Q3A_EULA.txt /path/to/ioquake3.dmg"
-	exit 1;
-fi
-
-if [ ! -r $1 ]; then
-	echo "$1 is not a readable Q3A_EULA.txt file"
-	exit 1;
-fi
-if [ ! -w $2 ]; then
-	echo "$2 is not writable .dmg file"
-	exit 1;
-fi
-touch tmp.r
-if [ ! -w tmp.r ]; then
-	echo "Could not create temporary file tmp.r for writing"
-	exit 1;
-fi
-
-echo "  
-data 'LPic' (5000) {
-    \$\"0002 0011 0003 0001 0000 0000 0002 0000\"
-    \$\"0008 0003 0000 0001 0004 0000 0004 0005\"
-    \$\"0000 000E 0006 0001 0005 0007 0000 0007\"
-    \$\"0008 0000 0047 0009 0000 0034 000A 0001\"
-    \$\"0035 000B 0001 0020 000C 0000 0011 000D\"
-    \$\"0000 005B 0004 0000 0033 000F 0001 000C\"
-    \$\"0010 0000 000B 000E 0000\"
-};
-
-data 'TEXT' (5002, \"English\") {
-" > tmp.r
-
-sed -e 's/"/\\"/g' -e 's/\(.*\)$/"\1\\n"/g' $1 >> tmp.r
-
-echo "
-};
-
-resource 'STR#' (5002, \"English\") {
-    {   
-        \"English\",
-        \"Agree\",
-        \"Disagree\",
-        \"Print\",
-        \"Save...\",
-        \"IMPORTANT - Read this License Agreement carefully before clicking on \"
-        \"the \\\"Agree\\\" button.  By clicking on the \\\"Agree\\\" button, you agree \"
-        \"to be bound by the terms of the License Agreement.\",
-        \"Software License Agreement\",
-        \"This text cannot be saved. This disk may be full or locked, or the \"
-	\"file may be locked.\",
-        \"Unable to print. Make sure you have selected a printer.\"
-    }
-};
-" >> tmp.r
-
-hdiutil convert -format UDCO -o tmp.dmg $2 || exit 1
-hdiutil unflatten tmp.dmg || exit 1
-/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r tmp.r -a -o tmp.dmg \
-	|| exit 1
-hdiutil flatten tmp.dmg || exit 1
-hdiutil internet-enable -yes tmp.dmg || exit 1
-mv tmp.dmg $2 || (echo "Could not copy tmp.dmg to $2" && exit 1)
-rm tmp.dmg
-rm tmp.r
-echo "SLA $1 successfully added to $2"
diff --git a/misc/setup/Makefile b/misc/setup/Makefile
deleted file mode 100644
index 286831c7..00000000
--- a/misc/setup/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-VERSION=1.34
-RELEASE=svn
-
-all:
-	VERSION=$(VERSION) RELEASE=$(RELEASE) ./doit
-
-sign:
-	for i in *.run; do \
-		gpg -bao $$i.asc $$i; \
-	done
-
-clean:
-	rm -rf *.run image
-
-.PHONY: all sign clean
diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh
deleted file mode 100644
index 6b64201f..00000000
--- a/misc/setup/Solaris_pkg.sh
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-
-# Source directory
-MOUNT_DIR="../.."
-
-# Solaris stuff
-PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-if [ "X`uname -m`" = "Xi86pc" ]; then
-	ARCH=i386
-else
-	ARCH=sparc
-fi
-
-# Packages
-PKG_SOLARIS_NAME=ioquake3
-PKG_DATA_NAME=ioquake3d
-BUILD_DATE="`/usr/bin/date '+%Y%m%d%H%M%S'`"
-SVNVERSION=/usr/local/bin/svnversion
-if [ -x /usr/local/bin/svnversion ]; then
-	SVN_BANNER=`/usr/local/bin/svnversion ${MOUNT_DIR}|sed -e 's/S$//' -e 's/M$//' `
-	BUILD_VERSION="1.34-r${SVN_BANNER}"
-else
-	BUILD_VERSION="1.34-rSVN"
-fi
-PKG_VERSION="`date '+%Y%m%d%H%M'`"
-PKG_MAINT_ID="quake@cojot.name"
-SOLARIS_PKGFILE="${PKG_SOLARIS_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
-DATA_PKGFILE="${PKG_DATA_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
-
-# build directories
-BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}"
-PKG_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_SOLARIS_NAME}"
-PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}"
-PKG_DATA_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_DATA_NAME}"
-PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/quake3"
-
-# Tools
-RM="/usr/bin/rm"
-TOUCH="/usr/bin/touch"
-SED="/usr/bin/sed"
-CAT="/usr/bin/cat"
-NAWK="/usr/bin/nawk"
-MKDIR="gmkdir -v -p"
-INSTALL_BIN="ginstall -D -m 755"
-INSTALL_DATA="ginstall -D -m 644"
-PKGPROTO="/usr/bin/pkgproto"
-PKGMK="/usr/bin/pkgmk"
-PKGTRANS="/usr/bin/pkgtrans"
-
-#############################################################################
-# SOLARIS PACKAGE
-#############################################################################
-
-if [ -d ${BUILD_DIR} ]; then
-	if [ ! -d ${BUILD_DIR}/pkg ]; then
-		${MKDIR} ${BUILD_DIR}/pkg
-	fi
-	echo "Building ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}"
-        ${RM} -f ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}
-        ${TOUCH} ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE}
-        ${SED} -e "/VERSION=/s/.*/VERSION=${BUILD_VERSION}-${PKG_VERSION}/" \
-                < ${PKG_SRC_DIR}/pkginfo.template \
-                > ${PKG_SRC_DIR}/pkginfo
-        ${CAT} ${PKG_SRC_DIR}/prototype.template > ${PKG_SRC_DIR}/prototype
-
-	${INSTALL_DATA} ${MOUNT_DIR}/COPYING.txt ${PKG_SRC_DIR}/copyright
-	for EXEC_READ in README id-readme.txt
-	do
-		if [ -f ${MOUNT_DIR}/${EXEC_READ} ]; then
-			${INSTALL_DATA} ${MOUNT_DIR}/${EXEC_READ} ${PKG_BUILD_DIR}/${EXEC_READ}
-		fi
-	done
-
-	for EXEC_BIN in ioq3ded ioquake3-smp ioquake3
-	do
-		if [ -f ${BUILD_DIR}/${EXEC_BIN}.${ARCH} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/${EXEC_BIN}.${ARCH} ${PKG_BUILD_DIR}/${EXEC_BIN}.${ARCH}
-		fi
-	done
-
-	for EXEC_SH in ioq3ded.sh ioquake3.sh
-	do
-		if [ -f ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ]; then
-        		${INSTALL_BIN} ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH}
-		fi
-	done
-
-	for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so
-	do
-		if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO} ${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
-		fi
-		if [ -f ${BUILD_DIR}/missionpack/${EXEC_SO} ]; then
-        		${INSTALL_BIN} ${BUILD_DIR}/missionpack/${EXEC_SO} ${PKG_BUILD_DIR}/missionpack/${EXEC_SO}
-		fi
-	done
-
-        ${PKGPROTO} ${PKG_BUILD_DIR}=quake3 | \
-                ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_SRC_DIR}/prototype
-        ${PKGMK} -o -p "${PKG_MAINT_ID}${BUILD_DATE}" \
-                -b ${PKG_SRC_DIR} -f ${PKG_SRC_DIR}/prototype \
-                -d /tmp -a ${ARCH} owner=root group=bin mode=0755
-        ${PKGTRANS} -s /tmp ${BUILD_DIR}/pkg/${SOLARIS_PKGFILE} ${PKG_SOLARIS_NAME}
-
-	echo "Building ${BUILD_DIR}/pkg/${DATA_PKGFILE}"
-        ${RM} -f ${BUILD_DIR}/pkg/${DATA_PKGFILE}
-        ${TOUCH} ${BUILD_DIR}/pkg/${DATA_PKGFILE}
-        ${SED} -e "/VERSION=/s/.*/VERSION=${BUILD_VERSION}.${PKG_VERSION}/" \
-                < ${PKG_DATA_SRC_DIR}/pkginfo.template \
-                > ${PKG_DATA_SRC_DIR}/pkginfo
-        ${CAT} ${PKG_DATA_SRC_DIR}/prototype.template > ${PKG_DATA_SRC_DIR}/prototype
-
-	if [ -d ${MOUNT_DIR}/../webspace/include ]; then
-		EULA_DIR=${MOUNT_DIR}/../webspace/include
-	else
-		if [ -d ${MOUNT_DIR}/../../webspace/include ]; then
-			EULA_DIR=${MOUNT_DIR}/../../webspace/include
-		fi
-	fi
-	if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then
-		${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
-	fi
-
-        ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \
-                ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_DATA_SRC_DIR}/prototype
-        ${PKGMK} -o -p "${PKG_MAINT_ID}${BUILD_DATE}" \
-                -b ${PKG_DATA_SRC_DIR} -f ${PKG_DATA_SRC_DIR}/prototype \
-                -d /tmp -a ${ARCH} owner=root group=bin mode=0755
-        ${PKGTRANS} -s /tmp ${BUILD_DIR}/pkg/${DATA_PKGFILE} ${PKG_DATA_NAME}
-else
-	echo "Directory ${BUILD_DIR} not found!"
-	exit 1
-fi
-
-
diff --git a/misc/setup/doit b/misc/setup/doit
deleted file mode 100644
index 834cff90..00000000
--- a/misc/setup/doit
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-: ${MAKESELF:=/usr/share/loki-setup/makeself}
-: ${SETUPIMAGE:=/usr/share/loki-setup/image}
-
-: ${VERSION:=0.0_`date +%Y%m%d%H%M`}
-: ${RELEASE:=0}
-
-set -e
-set -x
-
-shopt -s nullglob
-
-rm -rf image
-mkdir image
-
-### loki-setup files
-cp -a $SETUPIMAGE/{setup.data,setup.sh} image/
-
-### splash
-rm -f image/setup.data/splash.xpm
-[ -e splash.xpm ] && cp splash.xpm image/setup.data/splash.xpm
-rm -f image/quake3.png
-cp ../quake3.png image/quake3.png
-
-### binaries
-topdir="../.."
-
-echo "changequote(\`[', \`]')dnl" > defines.m4
-echo "define(VERSION,$VERSION)dnl" >> defines.m4
-
-copystartscript()
-{
-	local arch="$1"
-	mkdir -p image/bin/Linux/$arch
-	if [ "$arch" = x86_64 ]; then
-		ln -s x86_64 image/bin/Linux/amd64
-	fi
-	install -m 755 ioquake3.sh image/bin/Linux/$arch/ioquake3
-	install -m 755 ioq3demo.sh image/bin/Linux/$arch/ioq3demo
-}
-
-archs=()
-for arch in $topdir/build/release-*; do
-	arch=${arch##*-}
-	case "$arch" in
-		i386) echo "define(HAVE_I386,yes)dnl" >> defines.m4
-			copystartscript x86
-		;;
-		x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
-			copystartscript $arch
-		;;
-		ppc) echo "define(HAVE_PPC,yes)dnl" >> defines.m4
-			copystartscript $arch
-		;;
-		*)
-			echo "architecture $arch unsupported"
-			continue;
-		;;
-	esac
-	archs[${#archs[@]}]=$arch
-done
-
-for arch in "${archs[@]}"; do
-	dst=image/tmp
-	mkdir $dst
-	mkdir $dst/baseq3 $dst/demoq3 $dst/missionpack
-	install -m 755 $topdir/build/release-linux-$arch/ioquake3.$arch $dst/ioquake3.$arch
-	install -m 755 $topdir/build/release-linux-$arch/ioq3ded.$arch $dst/ioq3ded.$arch
-	install -m 644 $topdir/build/release-linux-$arch/baseq3/*.so $dst/baseq3
-	install -m 644 $topdir/build/release-linux-$arch/missionpack/*.so $dst/missionpack
-	for i in cgame qagame ui; do
-		ln -s ../baseq3/$i$arch.so $dst/demoq3
-	done
-
-	tar --owner=root --group=root -C $dst -cf ./image/ioquake3.$arch.tar .
-	rm -rf ./image/tmp
-done
-
-# patch pk3 files
-if [ -e ./idpatchpk3s.tar -a -e ./idtapatchpk3s.tar ]; then
-	install -m 644 ./idpatchpk3s.tar image/idpatchpk3s.tar
-	install -m 644 ./idtapatchpk3s.tar image/idtapatchpk3s.tar
-	install -m 644 ./id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
-	echo "define(HAVE_PATCHPK3,yes)dnl" >> defines.m4
-elif [ -e quake3-latest-pk3s.zip ]; then
-	unzip quake3-latest-pk3s.zip
-	chmod 644 quake3-latest-pk3s/*/*.pk3
-	tar -C quake3-latest-pk3s/baseq3 -cf image/idpatchpk3s.tar .
-	tar -C quake3-latest-pk3s/missionpack -cf image/idtapatchpk3s.tar .
-	rm -r quake3-latest-pk3s
-	install -m 644 id_patch_pk3s_Q3A_EULA.txt image/id_patch_pk3s_Q3A_EULA.txt
-	echo "define(HAVE_PATCHPK3,yes)dnl" >> defines.m4
-fi
-
-### uninstall script
-install -m 755 ./preuninstall.sh image/preuninstall.sh
-
-
-### README, COPYING and EULA
-install -m 644 $topdir/README image/README
-install -m 644 $topdir/COPYING.txt image/COPYING
-
-# create setup.xml
-m4 defines.m4 setup.xml.in > image/setup.data/setup.xml
-
-### makeself installer
-ARCH=
-if [ "${#archs[@]}" -eq 1 ]; then
-	ARCH=.$arch
-fi
-$MAKESELF/makeself.sh image ioquake3-$VERSION-$RELEASE$ARCH.run "ioquake3 $VERSION-$RELEASE" ./setup.sh
diff --git a/misc/setup/ioq3demo.sh b/misc/setup/ioq3demo.sh
deleted file mode 100644
index 05df7ff8..00000000
--- a/misc/setup/ioq3demo.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-readlink() {
-    local path=$1 ll
-    
-    if [ -L "$path" ]; then 
-        ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-        echo "${ll/* -> }"
-    else    
-        return 1
-    fi
-}
-
-script=$0
-count=0
-while [ -L "$script" ]  
-do
-    script=$(readlink "$script")
-    count=`expr $count + 1`
-    if [ $count -gt 100 ]   
-    then    
-        echo "Too many symbolic links"
-        exit 1
-    fi
-done
-cd "`dirname $script`"
-
-
-lib=lib
-test -e lib64 && lib=lib64
-
-if test "x$LD_LIBRARY_PATH" = x; then
-	LD_LIBRARY_PATH="`pwd`/$lib"
-else
-	LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH"
-fi
-export LD_LIBRARY_PATH
-
-archs=`uname -m`
-case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
-	ppc64) archs="ppc64 ppc" ;;
-esac
-
-for arch in $archs; do
-	test -x ./ioquake3.$arch || continue
-	exec ./ioquake3.$arch +set sv_pure 0 +set vm_cgame 0 +set vm_game 0 +set vm_ui 0 +set fs_game demoq3 "$@"
-done
-echo "could not execute ioquake3" >&2
diff --git a/misc/setup/ioquake3.SlackBuild b/misc/setup/ioquake3.SlackBuild
deleted file mode 100644
index af261b72..00000000
--- a/misc/setup/ioquake3.SlackBuild
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-CWD=`pwd`
-BASE=$CWD/../..
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
-
-# clean, update
-make -C $BASE clean || exit 1
-svn up $BASE || exit 1
-
-# extract version info
-VERSION=`grep "\#define *PRODUCT_VERSION" $BASE/code/qcommon/q_shared.h | \
-  sed -e 's/[^"]*"\(.*\)"/\1/'`
-
-SVN_REV=`LANG=C svnversion $BASE`
-if [ ! "$SVN_REV" = "" ]; then
-  VERSION=${VERSION}_SVN${SVN_REV}
-fi
-
-PKG_VERSION=$VERSION
-
-ARCH=${ARCH:-i586}
-
-BUILD=${BUILD:-1_io}
-
-APP=ioquake3
-
-PKG=$TMP/package-$APP
-
-rm -rf $PKG
-mkdir -p $PKG
-
-# build
-make -C $BASE release copyfiles COPYDIR="$PKG"/usr/games/$APP|| exit 1
-
-# copy additional files
-cp $BASE/BUGS $BASE/COPYING.txt $BASE/ChangeLog $BASE/README $PKG/usr/games/$APP/
-cat $CWD/$APP.SlackBuild > $PKG/usr/games/$APP/$APP.SlackBuild
-
-mkdir -p $PKG/usr/share/$APP/icons
-cp $BASE/misc/quake3.png $PKG/usr/share/$APP/icons/ioquake3.png
-
-mkdir -p $PKG/usr/bin
-cat >> $PKG/usr/bin/ioquake3 << EOF
-#!/bin/sh
-cd /usr/games/$APP/
-./ioquake3.i386 \$*
-exit \$? 
-EOF
-chmod 754 $PKG/usr/bin/ioquake3
-
-mkdir -p $PKG/usr/bin
-cat >> $PKG/usr/bin/ioq3ded << EOF
-#!/bin/sh
-cd /usr/games/$APP/
-./ioq3ded.i386 \$*
-exit \$? 
-EOF
-chmod 754 $PKG/usr/bin/ioq3ded
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cat >> $PKG/install/doinst.sh << EOF
-chmod 754 /usr/games/$APP/*.i386
-chmod 754 /usr/bin/ioquake3 /usr/bin/ioq3ded
-EOF
-chmod +x $PKG/install/doinst.sh
-
-pushd $PKG
-chown -R root:root install/ || exit 1
-chown -R root:games usr/ || exit 1
-/sbin/makepkg -l y -c n $TMP/$APP-$VERSION-$ARCH-$BUILD.tgz
-popd
-
diff --git a/misc/setup/ioquake3.sh b/misc/setup/ioquake3.sh
deleted file mode 100644
index fbef5676..00000000
--- a/misc/setup/ioquake3.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-readlink() {
-    local path=$1 ll
-    
-    if [ -L "$path" ]; then 
-        ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-        echo "${ll##* -> }"
-    else    
-        return 1
-    fi
-}
-
-script=$0
-count=0
-while [ -L "$script" ]  
-do
-    script=$(readlink "$script")
-    count=`expr $count + 1`
-    if [ $count -gt 100 ]   
-    then    
-        echo "Too many symbolic links"
-        exit 1
-    fi
-done
-cd "`dirname $script`"
-
-
-lib=lib
-test -e lib64 && lib=lib64
-
-if test "x$LD_LIBRARY_PATH" = x; then
-	LD_LIBRARY_PATH="`pwd`/$lib"
-else
-	LD_LIBRARY_PATH="`pwd`/$lib:$LD_LIBRARY_PATH"
-fi
-export LD_LIBRARY_PATH
-
-archs=`uname -m`
-case "$archs" in
-	i?86) archs=i386 ;;
-	x86_64) archs="x86_64 i386" ;;
-	ppc64) archs="ppc64 ppc" ;;
-esac
-
-for arch in $archs; do
-	test -x ./ioquake3.$arch || continue
-	exec ./ioquake3.$arch "$@"
-done
-echo "could not execute ioquake3" >&2
diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
deleted file mode 100644
index 5f2d7e50..00000000
--- a/misc/setup/pkg/ioq3ded.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $
-# Needed to make symlinks/shortcuts work.
-# the binaries must run with correct working directory
-
-IOQ3_DIR=/usr/local/share/games/quake3
-
-COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
-
-EXEC_REL=release
-
-# EXEC_BIN=ioquake3.${COMPILE_ARCH}
-# EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
-EXEC_BIN=ioq3ded.${COMPILE_ARCH}
-
-EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
-
-EXEC_DIR_LIST="${IOQ3_DIR}"
-
-for d in ${EXEC_DIR_LIST}
-do
-	if [ -d $d ]; then
-		EXEC_DIR=${d}
-		break
-	fi
-done
-
-if [ "X${EXEC_DIR}" != "X" ]; then
-	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
-		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
-	fi
-	cd ${IOQ3_DIR} && \
-	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
-	exit $? 
-else
-	echo "No ioq3 binaries found!"
-	exit 1
-fi
-  
-
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
deleted file mode 100644
index b2fe7856..00000000
--- a/misc/setup/pkg/ioquake3.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Rev: $Id: ioquake3.sh,v 1.11 2006/01/18 13:47:42 raistlin Exp raistlin $
-# Needed to make symlinks/shortcuts work.
-# the binaries must run with correct working directory
-
-IOQ3_DIR=/usr/local/share/games/quake3
-
-COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
-COMPILE_ARCH=`uname -p | sed -e s/i.86/i386/`
-
-EXEC_REL=release
-
-EXEC_BIN=ioquake3.${COMPILE_ARCH}
-# EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
-# EXEC_BIN=ioq3ded.${COMPILE_ARCH}
-
-EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
-
-EXEC_DIR_LIST="${IOQ3_DIR}"
-
-for d in ${EXEC_DIR_LIST}
-do
-	if [ -d $d ]; then
-		EXEC_DIR=${d}
-		break
-	fi
-done
-
-if [ "X${EXEC_DIR}" != "X" ]; then
-	if [ ! -x  ${EXEC_DIR}/${EXEC_BIN} ]; then
-		echo "Executable ${EXEC_DIR}/${EXEC_BIN} not found!" ; exit 1
-	fi
-	cd ${IOQ3_DIR} && \
-	${EXEC_DIR}/${EXEC_BIN} ${EXEC_FLAGS} $*
-	exit $? 
-else
-	echo "No ioq3 binaries found!"
-	exit 1
-fi
-  
-
diff --git a/misc/setup/pkg/ioquake3/depend b/misc/setup/pkg/ioquake3/depend
deleted file mode 100644
index 11170caf..00000000
--- a/misc/setup/pkg/ioquake3/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-P SUNWxilrl XIL Runtime Environment
-P SFWsdl SDL - Simple DirectMedia Layer library
-P ioquake3d Icculus.Org Quake3 game data files for Solaris 10 (X11,GLX,SDL)
diff --git a/misc/setup/pkg/ioquake3/pkginfo.template b/misc/setup/pkg/ioquake3/pkginfo.template
deleted file mode 100644
index 34d5b1ff..00000000
--- a/misc/setup/pkg/ioquake3/pkginfo.template
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASSES=none
-BASEDIR=/usr/local/share/games
-TZ=PST
-PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
-PKG=ioquake3
-NAME=ioquake3 1.34 for Solaris 10 (X11,GLX,SDL)
-VERSION=
-CATEGORY=application,graphics,opengl
-DESC=Icculus.Org Quake3 1.34 for Solaris 10 (http://www.ioquake3.org/)
-VENDOR=http://www.ioquake3.org/
-EMAIL=quake@cojot.name
-PKGSAV=/var/sadm/pkg/ioquake3/save
diff --git a/misc/setup/pkg/ioquake3/postinstall b/misc/setup/pkg/ioquake3/postinstall
deleted file mode 100644
index 2775d5ee..00000000
--- a/misc/setup/pkg/ioquake3/postinstall
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postinstall,v 1.3 2006/01/21 12:54:52 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR/quake3
-dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
-
-if [ -d ${dest_dir} ]; then
-	for inst_script in ioq3ded.sh ioquake3.sh
-	do
-		dest_script=${dest_dir}/${inst_script}
-		if [ ! -h ${dest_script} ]; then
-			ln -s ${quake3_dir}/${inst_script} ${dest_script}
-		fi
-	done
-fi
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/postremove b/misc/setup/pkg/ioquake3/postremove
deleted file mode 100644
index 37690f61..00000000
--- a/misc/setup/pkg/ioquake3/postremove
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# @(#)postremove	$Id: postremove,v 1.3 2006/01/21 12:54:52 coyote Exp $
-#
-# postremove script for quake3
-
-quake3_dir=$BASEDIR
-dest_dir=${PKG_INSTALL_ROOT}/usr/local/bin
-
-if [ -d ${dest_dir} ]; then
-	for inst_script in ioq3ded.sh ioquake3.sh
-	do
-		dest_script=${dest_dir}/${inst_script}
-		if [ -h ${dest_script} ]; then
-			rm -f ${dest_script}
-		fi
-	done
-fi
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/preinstall b/misc/setup/pkg/ioquake3/preinstall
deleted file mode 100644
index ad126a11..00000000
--- a/misc/setup/pkg/ioquake3/preinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/preremove b/misc/setup/pkg/ioquake3/preremove
deleted file mode 100644
index 3f316f3c..00000000
--- a/misc/setup/pkg/ioquake3/preremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3/prototype.template b/misc/setup/pkg/ioquake3/prototype.template
deleted file mode 100644
index f23af773..00000000
--- a/misc/setup/pkg/ioquake3/prototype.template
+++ /dev/null
@@ -1,8 +0,0 @@
-!default 0755 root bin
-i pkginfo
-i copyright
-i depend
-i postinstall
-i postremove
-i preinstall
-i preremove
diff --git a/misc/setup/pkg/ioquake3/space b/misc/setup/pkg/ioquake3/space
deleted file mode 100644
index 95b72949..00000000
--- a/misc/setup/pkg/ioquake3/space
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share 20000 15
diff --git a/misc/setup/pkg/ioquake3d/depend b/misc/setup/pkg/ioquake3d/depend
deleted file mode 100644
index b55ff884..00000000
--- a/misc/setup/pkg/ioquake3d/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-P SUNWxilrl XIL Runtime Environment
-P SFWsdl SDL - Simple DirectMedia Layer library
diff --git a/misc/setup/pkg/ioquake3d/pkginfo.template b/misc/setup/pkg/ioquake3d/pkginfo.template
deleted file mode 100644
index a351c4de..00000000
--- a/misc/setup/pkg/ioquake3d/pkginfo.template
+++ /dev/null
@@ -1,12 +0,0 @@
-CLASSES=none
-BASEDIR=/usr/local/share/games
-TZ=PST
-PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
-PKG=ioquake3d
-NAME=ioquake3 game data files for Solaris 10 (X11,GLX,SDL)
-VERSION=
-CATEGORY=application,graphics,opengl
-DESC=ioquake3 game data files for Solaris 10 (http://www.ioquake3.org/)
-VENDOR=http://www.ioquake3.org/
-EMAIL=quake@cojot.name
-PKGSAV=/var/sadm/pkg/ioquake3d/save
diff --git a/misc/setup/pkg/ioquake3d/postinstall b/misc/setup/pkg/ioquake3d/postinstall
deleted file mode 100644
index f116fc3d..00000000
--- a/misc/setup/pkg/ioquake3d/postinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/postremove b/misc/setup/pkg/ioquake3d/postremove
deleted file mode 100644
index 7614348d..00000000
--- a/misc/setup/pkg/ioquake3d/postremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: postremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/preinstall b/misc/setup/pkg/ioquake3d/preinstall
deleted file mode 100644
index ad126a11..00000000
--- a/misc/setup/pkg/ioquake3d/preinstall
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preinstall,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/preremove b/misc/setup/pkg/ioquake3d/preremove
deleted file mode 100644
index 3f316f3c..00000000
--- a/misc/setup/pkg/ioquake3d/preremove
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# @(#)postinstall	$Id: preremove,v 1.2 2006/01/25 13:22:56 coyote Exp $
-#
-# postinstall script for quake3
-
-quake3_dir=$BASEDIR
-
-exit 0
-
diff --git a/misc/setup/pkg/ioquake3d/prototype.template b/misc/setup/pkg/ioquake3d/prototype.template
deleted file mode 100644
index 26bd06a1..00000000
--- a/misc/setup/pkg/ioquake3d/prototype.template
+++ /dev/null
@@ -1,7 +0,0 @@
-!default 0755 root bin
-i pkginfo
-i depend
-i postinstall
-i postremove
-i preinstall
-i preremove
diff --git a/misc/setup/pkg/ioquake3d/space b/misc/setup/pkg/ioquake3d/space
deleted file mode 100644
index a8d224c3..00000000
--- a/misc/setup/pkg/ioquake3d/space
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/share 50000 100
diff --git a/misc/setup/preuninstall.sh b/misc/setup/preuninstall.sh
deleted file mode 100644
index 49e80564..00000000
--- a/misc/setup/preuninstall.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rmdir --ignore-fail-on-non-empty demoq3 missionpack >& /dev/null
diff --git a/misc/setup/setup.xml.in b/misc/setup/setup.xml.in
deleted file mode 100644
index 65dd1b9d..00000000
--- a/misc/setup/setup.xml.in
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<install product="ioquake3"
-	desc="ioquake3"
-	version="VERSION"
-	update_url="http://www.ioquake3.org/updates.txt"
-	promptbinaries="yes"
-	reinstall="yes"
-	nopromptoverwrite="yes"
-	preuninstall="preuninstall.sh">
-  <readme>
-    README
-  </readme>
-
-  <component name="Default" version="VERSION" default="yes">
-ifelse(HAVE_X86_64,yes,dnl
-    <option install="true" arch="x86_64">
-     ioq3 x86_64 binaries
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     <files>
-       ioquake3.x86_64.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-ifelse(HAVE_I386,yes,dnl
-    <option install="true" if="|(x86,x86_64)">
-     ioq3 x86 (32 bit) binaries
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     <files>
-       ioquake3.i386.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-ifelse(HAVE_PPC,yes,dnl
-    <option install="true">
-     <binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
-     ioq3 ppc binaries
-     <files>
-       ioquake3.ppc.tar
-     </files>
-     <help>you need the binaries to play the game</help>
-    </option>
-)dnl
-    <option install="true" show="false">
-      shared data
-      <files>
-	quake3.png
-	COPYING
-      </files>
-    </option>
-  </component>
-ifelse(HAVE_PATCHPK3,yes,dnl
-
-  <component name="Quake III Arena" version="VERSION">
-    <eula>
-      id_patch_pk3s_Q3A_EULA.txt
-    </eula>
-
-   <option install="true">
-     Quake III Arena Point Release 1.32 data files
-     <files path="baseq3">
-       idpatchpk3s.tar
-     </files>
-   </option>
-
-   <option>
-     <help>
-       If you don't select this you need to copy pak0.pk3 to the baseq3 directory manually.
-     </help>
-     Quake III Arena CDROM data
-     <files cdromid="CD 1" path="baseq3"
-       md5sum="1197ca3df1e65f3c380f8abc10ca43bf"
-       size="458M" mode="0664">
-       Quake3/baseq3/pak0.pk3
-     </files>
-   </option>
-  </component>
-
-  <component name="Quake III Team Arena" version="VERSION">
-    <eula>
-      id_patch_pk3s_Q3A_EULA.txt
-    </eula>
-
-   <option install="true">
-     Quake III Team Arena Point Release 1.32 data files
-     <files path="missionpack">
-       idtapatchpk3s.tar
-     </files>
-   </option>
-   <option>
-     <help>
-       If you don't select this you need to copy the TA pak0.pk3 to the missionpack directory manually.
-     </help>
-     Quake III Team Arena CDROM data
-     <files cdromid="CD 2" path="missionpack" size="336M"
-       md5sum="e8ba9e3bf06210930bc0e7fdbcdd01c2" mode="0644">
-       Setup/missionpack/pak0.pk3
-     </files>
-   </option>
-  </component>
-
-  <cdrom id="CD 1" name="Quake 3 Arena installation CD">
-    Quake3/baseq3/pak0.pk3
-  </cdrom>
-  <cdrom id="CD 2" name="Quake 3 Team Arena installation CD">
-    Setup/missionpack/pak0.pk3
-  </cdrom>
-)dnl
-
-</install>
diff --git a/misc/setup/slack-desc b/misc/setup/slack-desc
deleted file mode 100644
index c88b4bcb..00000000
--- a/misc/setup/slack-desc
+++ /dev/null
@@ -1,12 +0,0 @@
-        |-----handy-ruler------------------------------------------------------|
-ioquake3: ioquake 3 - An open source Quake 3 distribution
-ioquake3: 
-ioquake3: ioquake3 aims to build upon id Software's Quake 3 source code release.
-ioquake3: The source code was released on August 20, 2005 under the GPL. Since
-ioquake3: then code has been cleaned up, bugs have been fixed and features been
-ioquake3: added.
-ioquake3: The permanent goal is to create THE open source Quake 3 distribution
-ioquake3: upon which people base their games and projects.
-ioquake3: 
-ioquake3: http://ioquake3.org/
-ioquake3:  
diff --git a/misc/setup/splash.xpm b/misc/setup/splash.xpm
deleted file mode 100644
index 27677676..00000000
--- a/misc/setup/splash.xpm
+++ /dev/null
@@ -1,2289 +0,0 @@
-/* XPM */
-static char * splash_xpm[] = {
-"296 296 1990 2",
-"  	c #999999",
-". 	c #989797",
-"+ 	c #999898",
-"@ 	c #938B8B",
-"# 	c #979494",
-"$ 	c #8D7D7D",
-"% 	c #958F8F",
-"& 	c #887070",
-"* 	c #928989",
-"= 	c #846666",
-"- 	c #8F7F7F",
-"; 	c #815C5C",
-"> 	c #8B7676",
-", 	c #7D5353",
-"' 	c #876C6C",
-") 	c #7A4949",
-"! 	c #846262",
-"~ 	c #764040",
-"{ 	c #805959",
-"] 	c #733636",
-"^ 	c #7D4F4F",
-"/ 	c #702C2C",
-"( 	c #794646",
-"_ 	c #6C2323",
-": 	c #763C3C",
-"< 	c #691919",
-"[ 	c #733232",
-"} 	c #979595",
-"| 	c #671313",
-"1 	c #6F2929",
-"2 	c #969090",
-"3 	c #660E0E",
-"4 	c #6C1F1F",
-"5 	c #948B8B",
-"6 	c #650A0A",
-"7 	c #691616",
-"8 	c #928686",
-"9 	c #640505",
-"0 	c #660C0C",
-"a 	c #918181",
-"b 	c #630101",
-"c 	c #640303",
-"d 	c #8D7878",
-"e 	c #630000",
-"f 	c #969292",
-"g 	c #8A6E6E",
-"h 	c #640000",
-"i 	c #938888",
-"j 	c #876565",
-"k 	c #907F7F",
-"l 	c #845B5B",
-"m 	c #650000",
-"n 	c #8D7575",
-"o 	c #815252",
-"p 	c #8A6B6B",
-"q 	c #7E4848",
-"r 	c #660000",
-"s 	c #876262",
-"t 	c #7B3E3E",
-"u 	c #670000",
-"v 	c #845858",
-"w 	c #783535",
-"x 	c #814F4F",
-"y 	c #762B2B",
-"z 	c #680000",
-"A 	c #7E4545",
-"B 	c #732222",
-"C 	c #7B3B3B",
-"D 	c #989696",
-"E 	c #711A1A",
-"F 	c #690000",
-"G 	c #793232",
-"H 	c #701313",
-"I 	c #6A0000",
-"J 	c #762828",
-"K 	c #979191",
-"L 	c #6E0C0C",
-"M 	c #731F1F",
-"N 	c #968F8F",
-"O 	c #6C0505",
-"P 	c #6B0000",
-"Q 	c #711515",
-"R 	c #948A8A",
-"S 	c #6F0D0D",
-"T 	c #928080",
-"U 	c #6C0000",
-"V 	c #6F0909",
-"W 	c #8F7777",
-"X 	c #6E0707",
-"Y 	c #958A8A",
-"Z 	c #8C6D6D",
-"` 	c #6D0000",
-" .	c #6E0404",
-"..	c #938383",
-"+.	c #8A6464",
-"@.	c #6E0202",
-"#.	c #917C7C",
-"$.	c #875A5A",
-"%.	c #6E0000",
-"&.	c #8F7474",
-"*.	c #855050",
-"=.	c #6F0000",
-"-.	c #8C6B6B",
-";.	c #824646",
-">.	c #8A6161",
-",.	c #803D3D",
-"'.	c #700000",
-").	c #875757",
-"!.	c #7E3333",
-"~.	c #854D4D",
-"{.	c #7C2929",
-"].	c #710000",
-"^.	c #834444",
-"/.	c #792020",
-"(.	c #803A3A",
-"_.	c #781616",
-":.	c #720000",
-"<.	c #7E3131",
-"[.	c #760D0D",
-"}.	c #730000",
-"|.	c #7D2727",
-"1.	c #740303",
-"2.	c #7A1D1D",
-"3.	c #979292",
-"4.	c #740000",
-"5.	c #791616",
-"6.	c #999797",
-"7.	c #958989",
-"8.	c #781111",
-"9.	c #937F7F",
-"0.	c #750000",
-"a.	c #780C0C",
-"b.	c #968E8E",
-"c.	c #917676",
-"d.	c #770707",
-"e.	c #8F6B6B",
-"f.	c #760000",
-"g.	c #770202",
-"h.	c #948484",
-"i.	c #8D6262",
-"j.	c #770000",
-"k.	c #937D7D",
-"l.	c #8B5858",
-"m.	c #917373",
-"n.	c #894F4F",
-"o.	c #780000",
-"p.	c #8F6A6A",
-"q.	c #874545",
-"r.	c #8D6060",
-"s.	c #853B3B",
-"t.	c #790000",
-"u.	c #8B5656",
-"v.	c #843232",
-"w.	c #7A0000",
-"x.	c #8A4D4D",
-"y.	c #822828",
-"z.	c #884343",
-"A.	c #811F1F",
-"B.	c #7B0000",
-"C.	c #863A3A",
-"D.	c #7F1515",
-"E.	c #843030",
-"F.	c #7E0D0D",
-"G.	c #7C0000",
-"H.	c #832626",
-"I.	c #989191",
-"J.	c #7E0909",
-"K.	c #821F1F",
-"L.	c #968A8A",
-"M.	c #7E0707",
-"N.	c #7D0000",
-"O.	c #811717",
-"P.	c #989595",
-"Q.	c #958383",
-"R.	c #7E0404",
-"S.	c #801010",
-"T.	c #989292",
-"U.	c #947C7C",
-"V.	c #7E0202",
-"W.	c #7E0000",
-"X.	c #7F0808",
-"Y.	c #979090",
-"Z.	c #937474",
-"`.	c #7F0000",
-" +	c #7F0202",
-".+	c #978E8E",
-"++	c #916A6A",
-"@+	c #968585",
-"#+	c #906161",
-"$+	c #800000",
-"%+	c #8E5757",
-"&+	c #937373",
-"*+	c #8D4D4D",
-"=+	c #810000",
-"-+	c #916969",
-";+	c #8C4444",
-">+	c #905F5F",
-",+	c #8B3A3A",
-"'+	c #820000",
-")+	c #8F5555",
-"!+	c #8A3131",
-"~+	c #830000",
-"{+	c #8E4C4C",
-"]+	c #892727",
-"^+	c #8D4343",
-"/+	c #881D1D",
-"(+	c #840000",
-"_+	c #8C3838",
-":+	c #871616",
-"<+	c #8A2F2F",
-"[+	c #871111",
-"}+	c #850000",
-"|+	c #8A2525",
-"1+	c #988E8E",
-"2+	c #870C0C",
-"3+	c #891C1C",
-"4+	c #978989",
-"5+	c #870707",
-"6+	c #860000",
-"7+	c #881212",
-"8+	c #968383",
-"9+	c #870202",
-"0+	c #870000",
-"a+	c #880808",
-"b+	c #967C7C",
-"c+	c #870101",
-"d+	c #957373",
-"e+	c #880000",
-"f+	c #946969",
-"g+	c #978585",
-"h+	c #935F5F",
-"i+	c #890000",
-"j+	c #967B7B",
-"k+	c #925656",
-"l+	c #8A0000",
-"m+	c #957171",
-"n+	c #914C4C",
-"o+	c #946868",
-"p+	c #9F9191",
-"q+	c #AB7E7E",
-"r+	c #BD6262",
-"s+	c #CF4848",
-"t+	c #DB3636",
-"u+	c #E72525",
-"v+	c #EB1F1F",
-"w+	c #E12C2C",
-"x+	c #CD4B4B",
-"y+	c #B76C6C",
-"z+	c #9E9191",
-"A+	c #914343",
-"B+	c #8B0000",
-"C+	c #945E5E",
-"D+	c #AA7F7F",
-"E+	c #C15C5C",
-"F+	c #D83A3A",
-"G+	c #E82222",
-"H+	c #E91F1F",
-"I+	c #E02D2D",
-"J+	c #D43F3F",
-"K+	c #C55555",
-"L+	c #B47070",
-"M+	c #A38989",
-"N+	c #9B9595",
-"O+	c #9D9292",
-"P+	c #B17474",
-"Q+	c #CB4D4D",
-"R+	c #E32828",
-"S+	c #F70B0B",
-"T+	c #FE0000",
-"U+	c #FC0202",
-"V+	c #EE1919",
-"W+	c #D34141",
-"X+	c #B76B6B",
-"Y+	c #903939",
-"Z+	c #935555",
-"`+	c #9D9494",
-" @	c #AD7B7B",
-".@	c #C45757",
-"+@	c #E12B2B",
-"@@	c #F60A0A",
-"#@	c #FD0000",
-"$@	c #FB0202",
-"%@	c #ED1919",
-"&@	c #D63B3B",
-"*@	c #BD6161",
-"=@	c #A58686",
-"-@	c #B46F6F",
-";@	c #D63C3C",
-">@	c #F11313",
-",@	c #FD0101",
-"'@	c #EE1717",
-")@	c #CE4949",
-"!@	c #AC7C7C",
-"~@	c #902F2F",
-"{@	c #8C0000",
-"]@	c #924B4B",
-"^@	c #A28B8B",
-"/@	c #BC6363",
-"(@	c #DE2E2E",
-"_@	c #F80707",
-":@	c #FC0000",
-"<@	c #F70707",
-"[@	c #E32525",
-"}@	c #C45656",
-"|@	c #A58787",
-"1@	c #CB4C4C",
-"2@	c #EE1515",
-"3@	c #FB0101",
-"4@	c #DD2F2F",
-"5@	c #B37070",
-"6@	c #9C9494",
-"7@	c #8F2626",
-"8@	c #924141",
-"9@	c #C94E4E",
-"0@	c #F11010",
-"a@	c #FB0000",
-"b@	c #B86969",
-"c@	c #9A9898",
-"d@	c #AB7D7D",
-"e@	c #D73838",
-"f@	c #F90404",
-"g@	c #F80505",
-"h@	c #D53B3B",
-"i@	c #A78383",
-"j@	c #8F1E1E",
-"k@	c #8D0000",
-"l@	c #913838",
-"m@	c #9C9595",
-"n@	c #BC6161",
-"o@	c #EB1717",
-"p@	c #FA0000",
-"q@	c #EB1818",
-"r@	c #BE5E5E",
-"s@	c #A88181",
-"t@	c #D83636",
-"u@	c #F80303",
-"v@	c #F90101",
-"w@	c #DB3131",
-"x@	c #999595",
-"y@	c #8F1717",
-"z@	c #912E2E",
-"A@	c #9D9393",
-"B@	c #C35656",
-"C@	c #EF1010",
-"D@	c #F90000",
-"E@	c #ED1414",
-"F@	c #BD5F5F",
-"G@	c #9F9090",
-"H@	c #CD4646",
-"I@	c #F40808",
-"J@	c #EE1111",
-"K@	c #B96666",
-"L@	c #999292",
-"M@	c #8F1010",
-"N@	c #8E0000",
-"O@	c #912525",
-"P@	c #D73535",
-"Q@	c #F70101",
-"R@	c #F80000",
-"S@	c #E32222",
-"T@	c #B17272",
-"U@	c #EA1717",
-"V@	c #D93232",
-"W@	c #989090",
-"X@	c #900808",
-"Y@	c #8F0000",
-"Z@	c #911B1B",
-"`@	c #9A9797",
-" #	c #BA6464",
-".#	c #F10A0A",
-"+#	c #F70000",
-"@#	c #F40404",
-"##	c #CE4343",
-"$#	c #CD4444",
-"%#	c #F70202",
-"&#	c #C55252",
-"*#	c #988D8D",
-"=#	c #8F0101",
-"-#	c #901111",
-";#	c #A78282",
-">#	c #E61A1A",
-",#	c #F60000",
-"'#	c #E91616",
-")#	c #AC7A7A",
-"!#	c #A18B8B",
-"~#	c #DD2929",
-"{#	c #F40505",
-"]#	c #BD5E5E",
-"^#	c #988585",
-"/#	c #900000",
-"(#	c #910B0B",
-"_#	c #999696",
-":#	c #A28A8A",
-"<#	c #E02222",
-"[#	c #F50000",
-"}#	c #F00909",
-"|#	c #B96363",
-"1#	c #A88080",
-"2#	c #E71818",
-"3#	c #F40303",
-"4#	c #BD5D5D",
-"5#	c #977B7B",
-"6#	c #988F8F",
-"7#	c #A18C8C",
-"8#	c #E31D1D",
-"9#	c #F40000",
-"0#	c #F20303",
-"a#	c #C74C4C",
-"b#	c #E91414",
-"c#	c #F50101",
-"d#	c #C84B4B",
-"e#	c #977171",
-"f#	c #910000",
-"g#	c #910606",
-"h#	c #988888",
-"i#	c #A48787",
-"j#	c #EC0D0D",
-"k#	c #F30101",
-"l#	c #A68383",
-"m#	c #E91313",
-"n#	c #DB2B2B",
-"o#	c #9B9696",
-"p#	c #966868",
-"q#	c #910404",
-"r#	c #988080",
-"s#	c #B26F6F",
-"t#	c #F10303",
-"u#	c #F30000",
-"v#	c #C44F4F",
-"w#	c #E11F1F",
-"x#	c #EF0707",
-"y#	c #A58585",
-"z#	c #965E5E",
-"A#	c #920000",
-"B#	c #920101",
-"C#	c #987979",
-"D#	c #CE3E3E",
-"E#	c #F20000",
-"F#	c #F10202",
-"G#	c #B76565",
-"H#	c #CE3D3D",
-"I#	c #C64C4C",
-"J#	c #965555",
-"K#	c #930000",
-"L#	c #A28989",
-"M#	c #EA0D0D",
-"N#	c #F10000",
-"O#	c #A87F7F",
-"P#	c #B66767",
-"Q#	c #F00202",
-"R#	c #EA0C0C",
-"S#	c #A08C8C",
-"T#	c #964B4B",
-"U#	c #976767",
-"V#	c #C74949",
-"W#	c #F00000",
-"X#	c #DC2323",
-"Y#	c #E31717",
-"Z#	c #CB4141",
-"`#	c #964141",
-" $	c #940000",
-".$	c #975D5D",
-"+$	c #A48585",
-"@$	c #EC0606",
-"#$	c #EF0000",
-"$$	c #BA5E5E",
-"%$	c #C25050",
-"&$	c #EE0202",
-"*$	c #AC7777",
-"=$	c #963838",
-"-$	c #975353",
-";$	c #D72929",
-">$	c #EE0000",
-",$	c #E51010",
-"'$	c #9E8F8F",
-")$	c #E41212",
-"!$	c #962E2E",
-"~$	c #950000",
-"{$	c #974A4A",
-"]$	c #BE5555",
-"^$	c #ED0000",
-"/$	c #B86060",
-"($	c #D23131",
-"_$	c #962424",
-":$	c #974040",
-"<$	c #A97B7B",
-"[$	c #EC0000",
-"}$	c #DF1919",
-"|$	c #D62929",
-"1$	c #C34C4C",
-"2$	c #971A1A",
-"3$	c #960000",
-"4$	c #973737",
-"5$	c #EA0202",
-"6$	c #EB0000",
-"7$	c #AB7777",
-"8$	c #E90404",
-"9$	c #B76161",
-"0$	c #971111",
-"a$	c #970000",
-"b$	c #982D2D",
-"c$	c #E11111",
-"d$	c #EA0000",
-"e$	c #C14D4D",
-"f$	c #AD7373",
-"g$	c #B16B6B",
-"h$	c #970707",
-"i$	c #972323",
-"j$	c #DA1C1C",
-"k$	c #E90000",
-"l$	c #D42929",
-"m$	c #BC5656",
-"n$	c #AE7272",
-"o$	c #980101",
-"p$	c #980000",
-"q$	c #981A1A",
-"r$	c #D72323",
-"s$	c #DF1313",
-"t$	c #C64343",
-"u$	c #B46666",
-"v$	c #998D8D",
-"w$	c #981414",
-"x$	c #DC1717",
-"y$	c #E80000",
-"z$	c #E40808",
-"A$	c #A18A8A",
-"B$	c #CC3636",
-"C$	c #C93D3D",
-"D$	c #998383",
-"E$	c #990000",
-"F$	c #990F0F",
-"G$	c #999191",
-"H$	c #A38585",
-"I$	c #E70101",
-"J$	c #E70000",
-"K$	c #E60202",
-"L$	c #A48383",
-"M$	c #CE3232",
-"N$	c #E20A0A",
-"O$	c #997A7A",
-"P$	c #9A0000",
-"Q$	c #9A0A0A",
-"R$	c #998C8C",
-"S$	c #C73E3E",
-"T$	c #E60000",
-"U$	c #A58181",
-"V$	c #CB3535",
-"W$	c #D12929",
-"X$	c #997070",
-"Y$	c #9A0505",
-"Z$	c #998787",
-"`$	c #AF6B6B",
-" %	c #E30404",
-".%	c #E50000",
-"+%	c #E40202",
-"@%	c #C34444",
-"#%	c #E30000",
-"$%	c #B23434",
-"%%	c #6A6A6A",
-"&%	c #626262",
-"*%	c #717171",
-"=%	c #8F8F8F",
-"-%	c #9A6767",
-";%	c #9B0000",
-">%	c #9B0101",
-",%	c #998282",
-"'%	c #AC7171",
-")%	c #DF0A0A",
-"!%	c #E40000",
-"~%	c #E00909",
-"{%	c #A08B8B",
-"]%	c #B46262",
-"^%	c #BF0000",
-"/%	c #450000",
-"(%	c #050000",
-"_%	c #000000",
-":%	c #0A0A0A",
-"<%	c #494949",
-"[%	c #929292",
-"}%	c #9A5D5D",
-"|%	c #997979",
-"1%	c #B75A5A",
-"2%	c #E00707",
-"3%	c #D61B1B",
-"4%	c #9F8C8C",
-"5%	c #E20303",
-"6%	c #AF0000",
-"7%	c #120000",
-"8%	c #272727",
-"9%	c #9A5353",
-"0%	c #9C0000",
-"a%	c #9A7070",
-"b%	c #C73A3A",
-"c%	c #E10101",
-"d%	c #E20000",
-"e%	c #C14545",
-"f%	c #CB3131",
-"g%	c #D90000",
-"h%	c #1B0000",
-"i%	c #3D3D3D",
-"j%	c #989898",
-"k%	c #9B4A4A",
-"l%	c #9A6666",
-"m%	c #919191",
-"n%	c #868686",
-"o%	c #8E8E8E",
-"p%	c #878585",
-"q%	c #9F5858",
-"r%	c #D40E0E",
-"s%	c #E10000",
-"t%	c #DF0404",
-"u%	c #A77C7C",
-"v%	c #A87979",
-"w%	c #E10303",
-"x%	c #040404",
-"y%	c #858585",
-"z%	c #9B4040",
-"A%	c #9D0000",
-"B%	c #9B5C5C",
-"C%	c #575757",
-"D%	c #434343",
-"E%	c #7A7A7A",
-"F%	c #373737",
-"G%	c #0B0B0B",
-"H%	c #010000",
-"I%	c #250000",
-"J%	c #CE0000",
-"K%	c #E00000",
-"L%	c #C93232",
-"M%	c #C43D3D",
-"N%	c #480000",
-"O%	c #742F2F",
-"P%	c #A77A7A",
-"Q%	c #9C3636",
-"R%	c #9B5353",
-"S%	c #949494",
-"T%	c #454545",
-"U%	c #030303",
-"V%	c #170000",
-"W%	c #DF0000",
-"X%	c #DB0808",
-"Y%	c #A38383",
-"Z%	c #D51919",
-"`%	c #360000",
-" &	c #DF0303",
-".&	c #D02323",
-"+&	c #B45E5E",
-"@&	c #9D9191",
-"#&	c #9D2C2C",
-"$&	c #9E0000",
-"%&	c #9C4949",
-"&&	c #979797",
-"*&	c #3A3A3A",
-"=&	c #080000",
-"-&	c #DE0000",
-";&	c #DD0101",
-">&	c #B55B5B",
-",&	c #A57F7F",
-"'&	c #D90D0D",
-")&	c #4A0000",
-"!&	c #DA0C0C",
-"~&	c #C53838",
-"{&	c #AD6D6D",
-"]&	c #9E2323",
-"^&	c #9F0000",
-"/&	c #9D4040",
-"(&	c #5E5E5E",
-"_&	c #010101",
-":&	c #0F0000",
-"<&	c #C90000",
-"[&	c #BF4444",
-"}&	c #AA7474",
-"|&	c #DB0606",
-"1&	c #090000",
-"2&	c #C60000",
-"3&	c #D80D0D",
-"4&	c #C33C3C",
-"5&	c #AE6B6B",
-"6&	c #9D8F8F",
-"7&	c #9E1919",
-"8&	c #9D3636",
-"9&	c #959595",
-"0&	c #0F0F0F",
-"a&	c #5E0000",
-"b&	c #DD0000",
-"c&	c #C63434",
-"d&	c #AB7070",
-"e&	c #D70D0D",
-"f&	c #D70000",
-"g&	c #DC0000",
-"h&	c #D80B0B",
-"i&	c #C83030",
-"j&	c #B35D5D",
-"k&	c #9A9696",
-"l&	c #9F1010",
-"m&	c #A00000",
-"n&	c #9E2C2C",
-"o&	c #040000",
-"p&	c #1C0000",
-"q&	c #130000",
-"r&	c #180000",
-"s&	c #D50000",
-"t&	c #C33838",
-"u&	c #9C9393",
-"v&	c #D41313",
-"w&	c #B70000",
-"x&	c #1D0000",
-"y&	c #D30000",
-"z&	c #DA0404",
-"A&	c #D01A1A",
-"B&	c #C04040",
-"C&	c #AE6969",
-"D&	c #A08989",
-"E&	c #A00A0A",
-"F&	c #9B9494",
-"G&	c #A67A7A",
-"H&	c #B65555",
-"I&	c #681E1E",
-"J&	c #A80000",
-"K&	c #D00000",
-"L&	c #D60000",
-"M&	c #CC0000",
-"N&	c #B80000",
-"O&	c #DA0101",
-"P&	c #BD4444",
-"Q&	c #A18686",
-"R&	c #CB2626",
-"S&	c #DB0000",
-"T&	c #580000",
-"U&	c #1A0000",
-"V&	c #D80707",
-"W&	c #C13D3D",
-"X&	c #B16161",
-"Y&	c #A28484",
-"Z&	c #9A8E8E",
-"`&	c #A10808",
-" *	c #A10000",
-".*	c #A01C1C",
-"+*	c #9C9292",
-"@*	c #AA7171",
-"#*	c #B94F4F",
-"$*	c #C82B2B",
-"%*	c #D50D0D",
-"&*	c #D90202",
-"**	c #DA0000",
-"=*	c #610000",
-"-*	c #A40707",
-";*	c #B35C5C",
-">*	c #BB4B4B",
-",*	c #D80404",
-"'*	c #D40000",
-")*	c #AD0000",
-"!*	c #D40F0F",
-"~*	c #C53232",
-"{*	c #A77979",
-"]*	c #9A8686",
-"^*	c #A10505",
-"/*	c #A01414",
-"(*	c #999494",
-"_*	c #A08787",
-":*	c #AE6666",
-"<*	c #BD4343",
-"[*	c #CC2020",
-"}*	c #D80202",
-"|*	c #5C0000",
-"1*	c #786969",
-"2*	c #A97272",
-"3*	c #CD1C1C",
-"4*	c #D40B0B",
-"5*	c #CB2222",
-"6*	c #BF3E3E",
-"7*	c #9B7F7F",
-"8*	c #A20303",
-"9*	c #A20000",
-"0*	c #A10D0D",
-"a*	c #9B9393",
-"b*	c #AD6A6A",
-"c*	c #B94C4C",
-"d*	c #C42F2F",
-"e*	c #CF1616",
-"f*	c #D70202",
-"g*	c #D80000",
-"h*	c #5F0000",
-"i*	c #060000",
-"j*	c #260000",
-"k*	c #737373",
-"l*	c #747474",
-"m*	c #5D5D5D",
-"n*	c #605656",
-"o*	c #791A1A",
-"p*	c #B60000",
-"q*	c #D80101",
-"r*	c #D40A0A",
-"s*	c #C13838",
-"t*	c #B55656",
-"u*	c #9F8989",
-"v*	c #9B7878",
-"w*	c #A30101",
-"x*	c #A30000",
-"y*	c #A30606",
-"z*	c #9A8F8F",
-"A*	c #A47E7E",
-"B*	c #AE6464",
-"C*	c #BB4646",
-"D*	c #C62929",
-"E*	c #D01212",
-"F*	c #D60404",
-"G*	c #C70000",
-"H*	c #BC0000",
-"I*	c #3B3B3B",
-"J*	c #C00000",
-"K*	c #3C0000",
-"L*	c #200000",
-"M*	c #100000",
-"N*	c #240000",
-"O*	c #4C0000",
-"P*	c #D10000",
-"Q*	c #D70101",
-"R*	c #D40707",
-"S*	c #CF1313",
-"T*	c #C52C2C",
-"U*	c #BB4545",
-"V*	c #B15E5E",
-"W*	c #A77777",
-"X*	c #9C6F6F",
-"Y*	c #9A8B8B",
-"Z*	c #A28383",
-"`*	c #AC6A6A",
-" =	c #B65151",
-".=	c #C03838",
-"+=	c #CA1F1F",
-"@=	c #D20B0B",
-"#=	c #D50303",
-"$=	c #CB0000",
-"%=	c #620000",
-"&=	c #070000",
-"*=	c #D01010",
-"==	c #BB4343",
-"-=	c #B25B5B",
-";=	c #A87474",
-">=	c #9F8A8A",
-",=	c #7C7C7C",
-"'=	c #6E6E6E",
-")=	c #6D6D6D",
-"!=	c #767676",
-"~=	c #888888",
-"{=	c #969696",
-"]=	c #707070",
-"^=	c #757575",
-"/=	c #9D6565",
-"(=	c #A40000",
-"_=	c #6D5D5D",
-":=	c #909090",
-"<=	c #A37F7F",
-"[=	c #AD6767",
-"}=	c #B54E4E",
-"|=	c #B13535",
-"1=	c #970505",
-"2=	c #A70000",
-"3=	c #C10000",
-"4=	c #D00D0D",
-"5=	c #1D1717",
-"6=	c #BB0000",
-"7=	c #2F0000",
-"8=	c #020000",
-"9=	c #560000",
-"0=	c #CD0000",
-"a=	c #D50101",
-"b=	c #CF0E0E",
-"c=	c #9F1F1F",
-"d=	c #3A2525",
-"e=	c #020202",
-"f=	c #1F1F1F",
-"g=	c #5F5F5F",
-"h=	c #8D8D8D",
-"i=	c #727272",
-"j=	c #1C1C1C",
-"k=	c #9D5B5B",
-"l=	c #090909",
-"m=	c #313131",
-"n=	c #797979",
-"o=	c #323232",
-"p=	c #9A9595",
-"q=	c #9E8B8B",
-"r=	c #A37E7E",
-"s=	c #AC6969",
-"t=	c #B45353",
-"u=	c #BC3E3E",
-"v=	c #C42828",
-"w=	c #CB1616",
-"x=	c #D10707",
-"y=	c #3F0000",
-"z=	c #0B0000",
-"A=	c #350000",
-"B=	c #B74C4C",
-"C=	c #1B1B1B",
-"D=	c #3C3C3C",
-"E=	c #673D3D",
-"F=	c #C32F2F",
-"G=	c #D40202",
-"H=	c #2B0000",
-"I=	c #4E0000",
-"J=	c #2B2B2B",
-"K=	c #8B8B8B",
-"L=	c #9F5252",
-"M=	c #A50000",
-"N=	c #515151",
-"O=	c #444444",
-"P=	c #020101",
-"Q=	c #8B4C4C",
-"R=	c #B64F4F",
-"S=	c #BD3B3B",
-"T=	c #C52626",
-"U=	c #CC1414",
-"V=	c #D00A0A",
-"W=	c #D40101",
-"X=	c #CF0000",
-"Y=	c #CC1313",
-"Z=	c #B45252",
-"`=	c #9E8C8C",
-" -	c #5B5B5B",
-".-	c #A47C7C",
-"+-	c #BC3D3D",
-"@-	c #500000",
-"#-	c #222121",
-"$-	c #948686",
-"%-	c #9F4848",
-"&-	c #A18383",
-"*-	c #5B4F4F",
-"=-	c #2C0000",
-"--	c #C80000",
-";-	c #D20000",
-">-	c #420000",
-",-	c #C71E1E",
-"'-	c #AF5F5F",
-")-	c #9C9191",
-"!-	c #9D8E8E",
-"~-	c #B35555",
-"{-	c #CA1717",
-"]-	c #D30101",
-"^-	c #B50000",
-"/-	c #5B0000",
-"(-	c #D00505",
-"_-	c #CB1515",
-":-	c #C42626",
-"<-	c #BE3737",
-"[-	c #B74848",
-"}-	c #B15959",
-"|-	c #AB6A6A",
-"1-	c #A57979",
-"2-	c #9F8888",
-"3-	c #9C9090",
-"4-	c #8F8888",
-"5-	c #A13E3E",
-"6-	c #A60000",
-"7-	c #777777",
-"8-	c #493030",
-"9-	c #AE6161",
-"0-	c #B45050",
-"a-	c #BB3F3F",
-"b-	c #C12E2E",
-"c-	c #C71D1D",
-"d-	c #CE0C0C",
-"e-	c #D20101",
-"f-	c #030000",
-"g-	c #BE0000",
-"h-	c #CF0808",
-"i-	c #BE3535",
-"j-	c #A67676",
-"k-	c #A87070",
-"l-	c #BD3737",
-"m-	c #550505",
-"n-	c #BA0000",
-"o-	c #BB1111",
-"p-	c #0F0202",
-"q-	c #A67474",
-"r-	c #A28181",
-"s-	c #A23535",
-"t-	c #0D0000",
-"u-	c #2F2F2F",
-"v-	c #A08585",
-"w-	c #A47A7A",
-"x-	c #A96D6D",
-"y-	c #AD6161",
-"z-	c #B25353",
-"A-	c #B84343",
-"B-	c #6B1F1F",
-"C-	c #0E0000",
-"D-	c #AB0000",
-"E-	c #D00202",
-"F-	c #C61D1D",
-"G-	c #B25555",
-"H-	c #141414",
-"I-	c #161414",
-"J-	c #440000",
-"K-	c #CA0000",
-"L-	c #1E0000",
-"M-	c #340000",
-"N-	c #470000",
-"O-	c #380000",
-"P-	c #D10101",
-"Q-	c #CF0707",
-"R-	c #CC0D0D",
-"S-	c #CA1414",
-"T-	c #C12B2B",
-"U-	c #BD3838",
-"V-	c #B74545",
-"W-	c #B35252",
-"X-	c #AE5F5F",
-"Y-	c #A96C6C",
-"Z-	c #A57878",
-"`-	c #795F5F",
-" ;	c #A32B2B",
-".;	c #390000",
-"+;	c #371818",
-"@;	c #353535",
-"#;	c #363131",
-"$;	c #392828",
-"%;	c #311515",
-"&;	c #080202",
-"*;	c #090505",
-"=;	c #B32222",
-"-;	c #C81717",
-";;	c #CA1010",
-">;	c #CC0A0A",
-",;	c #CF0303",
-"';	c #5A0000",
-");	c #0A0000",
-"!;	c #C40000",
-"~;	c #2A0000",
-"{;	c #BA3E3E",
-"];	c #A57777",
-"^;	c #7D7D7D",
-"/;	c #050505",
-"(;	c #7B7B7B",
-"_;	c #3E3E3E",
-":;	c #570000",
-"<;	c #D00101",
-"[;	c #9A0202",
-"};	c #A52222",
-"|;	c #A23E3E",
-"1;	c #C41F1F",
-"2;	c #CC0808",
-"3;	c #CD0505",
-"4;	c #9C0101",
-"5;	c #C30000",
-"6;	c #B90000",
-"7;	c #160000",
-"8;	c #BC3737",
-"9;	c #505050",
-"0;	c #404040",
-"a;	c #0E0E0E",
-"b;	c #070707",
-"c;	c #4D0000",
-"d;	c #B10000",
-"e;	c #5D0000",
-"f;	c #A61919",
-"g;	c #A33535",
-"h;	c #C41C1C",
-"i;	c #210000",
-"j;	c #CE0101",
-"k;	c #CA0D0D",
-"l;	c #BC3535",
-"m;	c #AB6565",
-"n;	c #8A8A8A",
-"o;	c #0B0707",
-"p;	c #AC4F4F",
-"q;	c #C22323",
-"r;	c #CC0707",
-"s;	c #1F0000",
-"t;	c #430000",
-"u;	c #9A9494",
-"v;	c #A71313",
-"w;	c #A90000",
-"x;	c #A42B2B",
-"y;	c #C22020",
-"z;	c #590000",
-"A;	c #540000",
-"B;	c #3A0000",
-"C;	c #600000",
-"D;	c #CD0101",
-"E;	c #C71313",
-"F;	c #B93B3B",
-"G;	c #A86C6C",
-"H;	c #9F8787",
-"I;	c #AD5F5F",
-"J;	c #BC3333",
-"K;	c #C90D0D",
-"L;	c #AE0000",
-"M;	c #BD0000",
-"N;	c #A80E0E",
-"O;	c #AA0000",
-"P;	c #A62222",
-"Q;	c #BF2626",
-"R;	c #C50000",
-"S;	c #3B0000",
-"T;	c #CB0303",
-"U;	c #C21F1F",
-"V;	c #B34A4A",
-"W;	c #A57676",
-"X;	c #9B9292",
-"Y;	c #282828",
-"Z;	c #3F3F3F",
-"`;	c #A67272",
-" >	c #B54848",
-".>	c #C12020",
-"+>	c #9D0202",
-"@>	c #9B8B8B",
-"#>	c #A90A0A",
-"$>	c #A71818",
-"%>	c #BC2E2E",
-"&>	c #4F3232",
-"*>	c #9F8686",
-"=>	c #777171",
-"->	c #9B8686",
-";>	c #AB0404",
-">>	c #A90E0E",
-",>	c #BA3535",
-"'>	c #CA0101",
-")>	c #5C0303",
-"!>	c #484848",
-"~>	c #AC0000",
-"{>	c #9C8080",
-"]>	c #AB0101",
-"^>	c #510000",
-"/>	c #510404",
-"(>	c #571C1C",
-"_>	c #150000",
-":>	c #C60A0A",
-"<>	c #BE2323",
-"[>	c #B24A4A",
-"}>	c #A57272",
-"|>	c #494040",
-"1>	c #101010",
-"2>	c #1A0606",
-"3>	c #C21A1A",
-"4>	c #C90303",
-"5>	c #9D7979",
-"6>	c #4B0000",
-"7>	c #0C0000",
-"8>	c #C50D0D",
-"9>	c #BC2A2A",
-"0>	c #B14D4D",
-"a>	c #A67171",
-"b>	c #464646",
-"c>	c #151515",
-"d>	c #9E8989",
-"e>	c #A86969",
-"f>	c #B44444",
-"g>	c #BF2121",
-"h>	c #C70404",
-"i>	c #9C7F7F",
-"j>	c #BF0E0E",
-"k>	c #590101",
-"l>	c #2D0101",
-"m>	c #260D0D",
-"n>	c #231919",
-"o>	c #212020",
-"p>	c #202020",
-"q>	c #414141",
-"r>	c #A47474",
-"s>	c #AF5252",
-"t>	c #9C2E2E",
-"u>	c #410000",
-"v>	c #9C8585",
-"w>	c #AC0404",
-"x>	c #302020",
-"y>	c #9F8585",
-"z>	c #5C5B5B",
-"A>	c #828282",
-"B>	c #1D0202",
-"C>	c #C60404",
-"D>	c #9B8A8A",
-"E>	c #AC0808",
-"F>	c #190000",
-"G>	c #C60101",
-"H>	c #C30B0B",
-"I>	c #BD1F1F",
-"J>	c #812828",
-"K>	c #2C2C2C",
-"L>	c #171616",
-"M>	c #9F8383",
-"N>	c #A76868",
-"O>	c #B04B4B",
-"P>	c #B82E2E",
-"Q>	c #C01616",
-"R>	c #C50303",
-"S>	c #AC0D0D",
-"T>	c #C20C0C",
-"U>	c #BB2222",
-"V>	c #B43D3D",
-"W>	c #AB5959",
-"X>	c #A27878",
-"Y>	c #9D8C8C",
-"Z>	c #363636",
-"`>	c #424242",
-" ,	c #171717",
-".,	c #9D8B8B",
-"+,	c #A47171",
-"@,	c #AC5555",
-"#,	c #B53838",
-"$,	c #BD1C1C",
-"%,	c #C40404",
-"&,	c #AC1313",
-"*,	c #2E0000",
-"=,	c #631515",
-"-,	c #595959",
-";,	c #613C3C",
-">,	c #140000",
-",,	c #C00E0E",
-"',	c #B82B2B",
-"),	c #B04747",
-"!,	c #A86464",
-"~,	c #A08080",
-"{,	c #9B9191",
-"],	c #4A4A4A",
-"^,	c #A07F7F",
-"/,	c #683030",
-"(,	c #400000",
-"_,	c #B40000",
-":,	c #AC1717",
-"<,	c #A92C2C",
-"[,	c #A56D6D",
-"},	c #550000",
-"|,	c #9C0707",
-"1,	c #B92323",
-"2,	c #B23D3D",
-"3,	c #AB5858",
-"4,	c #A47272",
-"5,	c #121212",
-"6,	c #5C5C5C",
-"7,	c #3A1616",
-"8,	c #B53333",
-"9,	c #BB1D1D",
-"0,	c #C20404",
-"a,	c #AB2020",
-"b,	c #B00000",
-"c,	c #A83636",
-"d,	c #A37474",
-"e,	c #C20000",
-"f,	c #230000",
-"g,	c #700101",
-"h,	c #050101",
-"i,	c #7F7F7F",
-"j,	c #7E7E7E",
-"k,	c #9B9090",
-"l,	c #9F8484",
-"m,	c #A47070",
-"n,	c #AA5959",
-"o,	c #B04343",
-"p,	c #B62C2C",
-"q,	c #BC1818",
-"r,	c #B10707",
-"s,	c #AA2A2A",
-"t,	c #A64040",
-"u,	c #A17B7B",
-"v,	c #4B2525",
-"w,	c #A76565",
-"x,	c #A07C7C",
-"y,	c #5A5757",
-"z,	c #8F8585",
-"A,	c #0C0B0B",
-"B,	c #A93434",
-"C,	c #A64949",
-"D,	c #9F8181",
-"E,	c #C00101",
-"F,	c #B81F1F",
-"G,	c #B23838",
-"H,	c #AD4D4D",
-"I,	c #603535",
-"J,	c #0C0C0C",
-"K,	c #898989",
-"L,	c #585858",
-"M,	c #656565",
-"N,	c #A73D3D",
-"O,	c #A45353",
-"P,	c #9E8585",
-"Q,	c #BF0404",
-"R,	c #9F8080",
-"S,	c #838383",
-"T,	c #A64747",
-"U,	c #B20000",
-"V,	c #A35D5D",
-"W,	c #9D8989",
-"X,	c #BD0707",
-"Y,	c #939393",
-"Z,	c #161616",
-"`,	c #A55050",
-" '	c #B30000",
-".'	c #A26666",
-"+'	c #9C8C8C",
-"@'	c #BB0B0B",
-"#'	c #BA0F0F",
-"$'	c #2D2D2D",
-"%'	c #212121",
-"&'	c #555555",
-"*'	c #A45A5A",
-"='	c #A07070",
-"-'	c #9B8F8F",
-";'	c #BA0E0E",
-">'	c #B81717",
-",'	c #606060",
-"''	c #262626",
-")'	c #343434",
-"!'	c #292929",
-"~'	c #A26464",
-"{'	c #320000",
-"]'	c #9F7A7A",
-"^'	c #9A9393",
-"/'	c #B81111",
-"('	c #B42525",
-"_'	c #616161",
-":'	c #080808",
-"<'	c #1D1D1D",
-"['	c #686868",
-"}'	c #333333",
-"|'	c #A16E6E",
-"1'	c #715D5D",
-"2'	c #6E6B6B",
-"3'	c #820F0F",
-"4'	c #B03434",
-"5'	c #6F6F6F",
-"6'	c #878787",
-"7'	c #676767",
-"8'	c #131313",
-"9'	c #111111",
-"0'	c #9F7777",
-"a'	c #B50101",
-"b'	c #220000",
-"c'	c #AC4343",
-"d'	c #222222",
-"e'	c #808080",
-"f'	c #9E7E7E",
-"g'	c #B40303",
-"h'	c #3D0000",
-"i'	c #A85252",
-"j'	c #646464",
-"k'	c #565656",
-"l'	c #666666",
-"m'	c #4C4C4C",
-"n'	c #9D8585",
-"o'	c #B50505",
-"p'	c #300000",
-"q'	c #A46161",
-"r'	c #8C8C8C",
-"s'	c #0D0D0D",
-"t'	c #787878",
-"u'	c #9B8C8C",
-"v'	c #B50808",
-"w'	c #280000",
-"x'	c #A17070",
-"y'	c #1A1A1A",
-"z'	c #4D4D4D",
-"A'	c #4F4F4F",
-"B'	c #B50A0A",
-"C'	c #330000",
-"D'	c #520000",
-"E'	c #B60202",
-"F'	c #9E7D7D",
-"G'	c #060606",
-"H'	c #818181",
-"I'	c #2E2E2E",
-"J'	c #181818",
-"K'	c #232323",
-"L'	c #636363",
-"M'	c #2A2A2A",
-"N'	c #6B6B6B",
-"O'	c #4D2020",
-"P'	c #3E0000",
-"Q'	c #353030",
-"R'	c #B50E0E",
-"S'	c #3B0D0D",
-"T'	c #B40606",
-"U'	c #9C8888",
-"V'	c #696969",
-"W'	c #525252",
-"X'	c #A74E4E",
-"Y'	c #B40404",
-"Z'	c #B31818",
-"`'	c #AF2E2E",
-" )	c #A94444",
-".)	c #B30A0A",
-"+)	c #A35E5E",
-"@)	c #B20A0A",
-"#)	c #9A9191",
-"$)	c #B22222",
-"%)	c #AD3838",
-"&)	c #A74B4B",
-"*)	c #B11414",
-"=)	c #A16C6C",
-"-)	c #B00F0F",
-";)	c #9A9292",
-">)	c #B12B2B",
-",)	c #AC4141",
-"')	c #A55252",
-"))	c #AD2323",
-"!)	c #9E7C7C",
-"~)	c #AF1414",
-"{)	c #AF3535",
-"])	c #AA4B4B",
-"^)	c #A35959",
-"/)	c #AA3232",
-"()	c #B20101",
-"_)	c #AE1919",
-":)	c #AD3F3F",
-"<)	c #A85555",
-"[)	c #A26060",
-"})	c #A74141",
-"|)	c #AF0A0A",
-"1)	c #AC1F1F",
-"2)	c #AB4949",
-"3)	c #A65E5E",
-"4)	c #A16767",
-"5)	c #A45050",
-"6)	c #AD1414",
-"7)	c #AB2424",
-"8)	c #A95252",
-"9)	c #A46868",
-"0)	c #9F6E6E",
-"a)	c #A15F5F",
-"b)	c #AA2020",
-"c)	c #A92B2B",
-"d)	c #A75C5C",
-"e)	c #A27171",
-"f)	c #9E7474",
-"g)	c #A82E2E",
-"h)	c #A73232",
-"i)	c #A56565",
-"j)	c #9D7A7A",
-"k)	c #AD0202",
-"l)	c #9D7D7D",
-"m)	c #A53D3D",
-"n)	c #A63939",
-"o)	c #A36F6F",
-"p)	c #BD0202",
-"q)	c #9E8383",
-"r)	c #AC0303",
-"s)	c #A34C4C",
-"t)	c #A44040",
-"u)	c #A17979",
-"v)	c #BC0707",
-"w)	c #9D8888",
-"x)	c #9B8585",
-"y)	c #AA0505",
-"z)	c #A05B5B",
-"A)	c #A34747",
-"B)	c #9F8282",
-"C)	c #BC0B0B",
-"D)	c #9C8D8D",
-"E)	c #A90707",
-"F)	c #A81212",
-"G)	c #9E6B6B",
-"H)	c #A14E4E",
-"I)	c #BB1010",
-"J)	c #A90808",
-"K)	c #A62121",
-"L)	c #9C7A7A",
-"M)	c #A05555",
-"N)	c #BB1515",
-"O)	c #A80A0A",
-"P)	c #A43030",
-"Q)	c #A80404",
-"R)	c #9F5C5C",
-"S)	c #BE0606",
-"T)	c #B91C1C",
-"U)	c #A70D0D",
-"V)	c #A23F3F",
-"W)	c #9A8C8C",
-"X)	c #A60B0B",
-"Y)	c #9E6363",
-"Z)	c #BD1010",
-"`)	c #B72626",
-" !	c #A51414",
-".!	c #A04E4E",
-"+!	c #A51313",
-"@!	c #9D6A6A",
-"#!	c #BA1A1A",
-"$!	c #B43030",
-"%!	c #A41B1B",
-"&!	c #9E5E5E",
-"*!	c #A41D1D",
-"=!	c #9C7171",
-"-!	c #B33A3A",
-";!	c #A22222",
-">!	c #9C6D6D",
-",!	c #A22C2C",
-"'!	c #9C7878",
-")!	c #B72C2C",
-"!!	c #B14343",
-"~!	c #A12929",
-"{!	c #9B7C7C",
-"]!	c #A03B3B",
-"^!	c #B43737",
-"/!	c #AE4D4D",
-"(!	c #A03030",
-"_!	c #9A8A8A",
-":!	c #9E4B4B",
-"<!	c #A30202",
-"[!	c #9A8484",
-"}!	c #B24040",
-"|!	c #AC5656",
-"1!	c #9F3737",
-"2!	c #A10A0A",
-"3!	c #9D5A5A",
-"4!	c #A20606",
-"5!	c #9A8888",
-"6!	c #AF4A4A",
-"7!	c #A96060",
-"8!	c #9E3E3E",
-"9!	c #A01515",
-"0!	c #9C6969",
-"a!	c #AD5353",
-"b!	c #A76A6A",
-"c!	c #9D4545",
-"d!	c #9F2020",
-"e!	c #9B7777",
-"f!	c #A00101",
-"g!	c #9F0D0D",
-"h!	c #998E8E",
-"i!	c #AA5D5D",
-"j!	c #A47373",
-"k!	c #9C4C4C",
-"l!	c #9D2E2E",
-"m!	c #9A8383",
-"n!	c #9F0404",
-"o!	c #9E1010",
-"p!	c #A86767",
-"q!	c #C50202",
-"r!	c #A27C7C",
-"s!	c #9C5353",
-"t!	c #9D3E3E",
-"u!	c #9E0808",
-"v!	c #9D1414",
-"w!	c #A57070",
-"x!	c #A08383",
-"y!	c #9B5A5A",
-"z!	c #9B4D4D",
-"A!	c #9D0E0E",
-"B!	c #9C1818",
-"C!	c #A27A7A",
-"D!	c #C50707",
-"E!	c #9E8A8A",
-"F!	c #9A6161",
-"G!	c #9B1C1C",
-"H!	c #9B1E1E",
-"I!	c #C50909",
-"J!	c #9A6868",
-"K!	c #9A6B6B",
-"L!	c #9B2B2B",
-"M!	c #9B2525",
-"N!	c #C80101",
-"O!	c #C40C0C",
-"P!	c #9A6F6F",
-"Q!	c #9A3A3A",
-"R!	c #9A2C2C",
-"S!	c #9C8F8F",
-"T!	c #C70707",
-"U!	c #C31414",
-"V!	c #997676",
-"W!	c #9A0404",
-"X!	c #998585",
-"Y!	c #9A4949",
-"Z!	c #9A3333",
-"`!	c #C50E0E",
-" ~	c #C01E1E",
-".~	c #997D7D",
-"+~	c #990B0B",
-"@~	c #995858",
-"#~	c #993A3A",
-"$~	c #C31616",
-"%~	c #BD2828",
-"&~	c #998484",
-"*~	c #981313",
-"=~	c #996767",
-"-~	c #984141",
-";~	c #C21D1D",
-">~	c #BB3232",
-",~	c #998B8B",
-"'~	c #971E1E",
-")~	c #984848",
-"!~	c #BF2525",
-"~~	c #B83B3B",
-"{~	c #972D2D",
-"]~	c #984F4F",
-"^~	c #BD2E2E",
-"/~	c #B54545",
-"(~	c #950101",
-"_~	c #973C3C",
-":~	c #975656",
-"<~	c #B93838",
-"[~	c #B24F4F",
-"}~	c #940707",
-"|~	c #940B0B",
-"1~	c #B74141",
-"2~	c #AF5858",
-"3~	c #940E0E",
-"4~	c #975A5A",
-"5~	c #941A1A",
-"6~	c #976464",
-"7~	c #B44B4B",
-"8~	c #AC6262",
-"9~	c #941515",
-"0~	c #976969",
-"a~	c #942929",
-"b~	c #976B6B",
-"c~	c #B15555",
-"d~	c #A96B6B",
-"e~	c #931C1C",
-"f~	c #977777",
-"g~	c #943838",
-"h~	c #977272",
-"i~	c #AD5E5E",
-"j~	c #A67575",
-"k~	c #932323",
-"l~	c #988383",
-"m~	c #954747",
-"n~	c #910101",
-"o~	c #977979",
-"p~	c #AA6868",
-"q~	c #A27F7F",
-"r~	c #922A2A",
-"s~	c #955656",
-"t~	c #900202",
-"u~	c #977D7D",
-"v~	c #A77171",
-"w~	c #923131",
-"x~	c #900E0E",
-"y~	c #966565",
-"z~	c #8F0404",
-"A~	c #A47B7B",
-"B~	c #923838",
-"C~	c #901C1C",
-"D~	c #967474",
-"E~	c #8E0606",
-"F~	c #D00303",
-"G~	c #923F3F",
-"H~	c #902B2B",
-"I~	c #978484",
-"J~	c #8E0808",
-"K~	c #924646",
-"L~	c #913A3A",
-"M~	c #8C0404",
-"N~	c #8D0A0A",
-"O~	c #9D8D8D",
-"P~	c #CE0B0B",
-"Q~	c #CA1616",
-"R~	c #924D4D",
-"S~	c #924949",
-"T~	c #8C1010",
-"U~	c #8C0B0B",
-"V~	c #CD1010",
-"W~	c #C72020",
-"X~	c #925454",
-"Y~	c #935858",
-"Z~	c #8D1B1B",
-"`~	c #8C1111",
-" {	c #C32929",
-".{	c #925B5B",
-"+{	c #946767",
-"@{	c #8D2828",
-"#{	c #8C1919",
-"${	c #C91C1C",
-"%{	c #C03434",
-"&{	c #936262",
-"*{	c #957777",
-"={	c #8E3737",
-"-{	c #8B1F1F",
-";{	c #978686",
-">{	c #8F4646",
-",{	c #8C2626",
-"'{	c #C22F2F",
-"){	c #B94747",
-"!{	c #947070",
-"~{	c #989494",
-"{{	c #915555",
-"]{	c #8C2D2D",
-"^{	c #BF3939",
-"/{	c #B55050",
-"({	c #870B0B",
-"_{	c #926464",
-":{	c #8C3434",
-"<{	c #B25A5A",
-"[{	c #957E7E",
-"}{	c #881A1A",
-"|{	c #947373",
-"1{	c #8D3B3B",
-"2{	c #B84C4C",
-"3{	c #AF6464",
-"4{	c #8A2929",
-"5{	c #968181",
-"6{	c #840101",
-"7{	c #8D4242",
-"8{	c #B45656",
-"9{	c #AB6D6D",
-"0{	c #978C8C",
-"a{	c #8B3838",
-"b{	c #840808",
-"c{	c #8E4949",
-"d{	c #B15F5F",
-"e{	c #978F8F",
-"f{	c #830404",
-"g{	c #8D4747",
-"h{	c #841010",
-"i{	c #8E5050",
-"j{	c #A38181",
-"k{	c #830A0A",
-"l{	c #8F5757",
-"m{	c #851818",
-"n{	c #8F5858",
-"o{	c #A97373",
-"p{	c #916666",
-"q{	c #862626",
-"r{	c #8F5E5E",
-"s{	c #A67B7B",
-"t{	c #D70505",
-"u{	c #821414",
-"v{	c #937575",
-"w{	c #883535",
-"x{	c #906565",
-"y{	c #A38282",
-"z{	c #D50C0C",
-"A{	c #821919",
-"B{	c #958484",
-"C{	c #8A4444",
-"D{	c #916C6C",
-"E{	c #D21414",
-"F{	c #831F1F",
-"G{	c #7F0505",
-"H{	c #8C5353",
-"I{	c #927373",
-"J{	c #D70909",
-"K{	c #CF1B1B",
-"L{	c #842424",
-"M{	c #8F6262",
-"N{	c #937A7A",
-"O{	c #D70C0C",
-"P{	c #CD2222",
-"Q{	c #842B2B",
-"R{	c #811B1B",
-"S{	c #917171",
-"T{	c #948181",
-"U{	c #D31414",
-"V{	c #C92B2B",
-"W{	c #853232",
-"X{	c #832828",
-"Y{	c #947E7E",
-"Z{	c #7C0303",
-"`{	c #968888",
-" ]	c #D01D1D",
-".]	c #C53535",
-"+]	c #863939",
-"@]	c #853737",
-"#]	c #968989",
-"$]	c #7B0707",
-"%]	c #CC2727",
-"&]	c #C13F3F",
-"*]	c #864040",
-"=]	c #884646",
-"-]	c #7B0A0A",
-";]	c #C83131",
-">]	c #BD4949",
-",]	c #874747",
-"']	c #8A5555",
-")]	c #7C1414",
-"!]	c #790404",
-"~]	c #C43A3A",
-"{]	c #B95252",
-"]]	c #884E4E",
-"^]	c #8D6464",
-"/]	c #7F2424",
-"(]	c #7A0B0B",
-"_]	c #C04444",
-":]	c #B55C5C",
-"<]	c #895555",
-"[]	c #907373",
-"}]	c #823333",
-"|]	c #7A1313",
-"1]	c #BC4E4E",
-"2]	c #B16565",
-"3]	c #8B5C5C",
-"4]	c #750101",
-"5]	c #938181",
-"6]	c #854242",
-"7]	c #7B1919",
-"8]	c #B85757",
-"9]	c #AC6F6F",
-"0]	c #8C6363",
-"a]	c #760808",
-"b]	c #885151",
-"c]	c #7C2020",
-"d]	c #B46161",
-"e]	c #8D6A6A",
-"f]	c #771010",
-"g]	c #8B6161",
-"h]	c #7D2828",
-"i]	c #E00101",
-"j]	c #A48282",
-"k]	c #8F7171",
-"l]	c #791818",
-"m]	c #8E7070",
-"n]	c #7E2E2E",
-"o]	c #DF0505",
-"p]	c #A28787",
-"q]	c #917878",
-"r]	c #7C2626",
-"s]	c #927F7F",
-"t]	c #7F3535",
-"u]	c #A67E7E",
-"v]	c #DE0A0A",
-"w]	c #803C3C",
-"x]	c #A18888",
-"y]	c #DC0F0F",
-"z]	c #938484",
-"A]	c #710202",
-"B]	c #824444",
-"C]	c #710505",
-"D]	c #824343",
-"E]	c #DA1414",
-"F]	c #948787",
-"G]	c #710606",
-"H]	c #865353",
-"I]	c #741313",
-"J]	c #834A4A",
-"K]	c #E30202",
-"L]	c #D71A1A",
-"M]	c #958B8B",
-"N]	c #710A0A",
-"O]	c #8A6262",
-"P]	c #782222",
-"Q]	c #855252",
-"R]	c #DF0B0B",
-"S]	c #D32323",
-"T]	c #710D0D",
-"U]	c #8E7171",
-"V]	c #7B3131",
-"W]	c #865858",
-"X]	c #DB1515",
-"Y]	c #CF2D2D",
-"Z]	c #711010",
-"`]	c #6D0303",
-" ^	c #917E7E",
-".^	c #7F4141",
-"+^	c #885F5F",
-"@^	c #D71F1F",
-"#^	c #CA3737",
-"$^	c #711414",
-"%^	c #6D0707",
-"&^	c #948989",
-"*^	c #835050",
-"=^	c #8A6767",
-"-^	c #D32828",
-";^	c #C64141",
-">^	c #711717",
-",^	c #6D0B0B",
-"'^	c #875F5F",
-")^	c #C14A4A",
-"!^	c #721E1E",
-"~^	c #701515",
-"{^	c #8B6E6E",
-"]^	c #8E7474",
-"^^	c #C93B3B",
-"/^	c #BD5454",
-"(^	c #742525",
-"_^	c #742424",
-":^	c #907D7D",
-"<^	c #907C7C",
-"[^	c #C44646",
-"}^	c #B85E5E",
-"|^	c #762C2C",
-"1^	c #793434",
-"2^	c #670101",
-"3^	c #928282",
-"4^	c #C04F4F",
-"5^	c #B36767",
-"6^	c #783333",
-"7^	c #7D4343",
-"8^	c #969191",
-"9^	c #690A0A",
-"0^	c #BB5959",
-"a^	c #AE7171",
-"b^	c #793A3A",
-"c^	c #6C1616",
-"d^	c #660202",
-"e^	c #958E8E",
-"f^	c #B66262",
-"g^	c #E90101",
-"h^	c #AA7979",
-"i^	c #7B4141",
-"j^	c #866161",
-"k^	c #702222",
-"l^	c #680808",
-"m^	c #B16C6C",
-"n^	c #A68080",
-"o^	c #7D4848",
-"p^	c #8B7070",
-"q^	c #680D0D",
-"r^	c #AC7676",
-"s^	c #E80606",
-"t^	c #A28888",
-"u^	c #7F4F4F",
-"v^	c #793F3F",
-"w^	c #691212",
-"x^	c #979393",
-"y^	c #A77F7F",
-"z^	c #E70808",
-"A^	c #9F8F8F",
-"B^	c #815656",
-"C^	c #7E4E4E",
-"D^	c #6A1717",
-"E^	c #E60B0B",
-"F^	c #835D5D",
-"G^	c #630505",
-"H^	c #6C1D1D",
-"I^	c #EB0404",
-"J^	c #E31212",
-"K^	c #856464",
-"L^	c #886C6C",
-"M^	c #6D2222",
-"N^	c #E70B0B",
-"O^	c #DE1C1C",
-"P^	c #886B6B",
-"Q^	c #6C2222",
-"R^	c #8E7B7B",
-"S^	c #6E2828",
-"T^	c #E41313",
-"U^	c #D92525",
-"V^	c #8A7272",
-"W^	c #713232",
-"X^	c #723434",
-"Y^	c #E01A1A",
-"Z^	c #D52F2F",
-"`^	c #8C7878",
-" /	c #774141",
-"./	c #774343",
-"+/	c #DC2121",
-"@/	c #CF3939",
-"#/	c #8E7D7D",
-"$/	c #7C5151",
-"%/	c #D82A2A",
-"&/	c #CA4242",
-"*/	c #908383",
-"=/	c #846464",
-"-/	c #836363",
-";/	c #D33434",
-">/	c #C54C4C",
-",/	c #928888",
-"'/	c #8A7474",
-")/	c #8C7979",
-"!/	c #C05656",
-"~/	c #948D8D",
-"{/	c #918585",
-"]/	c #C84747",
-"^/	c #BA5F5F",
-"//	c #C35050",
-"(/	c #B56969",
-"_/	c #BE5A5A",
-":/	c #B07373",
-"</	c #B86464",
-"[/	c #AA7C7C",
-"}/	c #B36D6D",
-"|/	c #A48686",
-"1/	c #AD7777",
-"2/	c #F40101",
-"3/	c #F30404",
-"4/	c #F00A0A",
-"5/	c #F10909",
-"6/	c #EA1414",
-"7/	c #EF0E0E",
-"8/	c #E51D1D",
-"9/	c #EC1313",
-"0/	c #DF2727",
-"a/	c #E91818",
-"b/	c #DA3131",
-"c/	c #D43A3A",
-"d/	c #DE2B2B",
-"e/	c #CE4444",
-"f/	c #D93535",
-"g/	c #C94D4D",
-"h/	c #D23E3E",
-"i/	c #C35757",
-"j/	c #CD4848",
-"k/	c #C75252",
-"l/	c #C15B5B",
-"m/	c #B07474",
-"n/	c #BB6565",
-"o/	c #AA7E7E",
-"p/	c #B56E6E",
-"q/	c #A48888",
-"r/	c #A08F8F",
-"s/	c #9B9797",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            . +                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            @ #                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            $ %                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            & *                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            = -                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ; >                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            , '                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ) !                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ~ {                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            ] ^                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            / (                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                            _ :                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          + < [                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          } | 1                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          2 3 4                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          5 6 7                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          8 9 0                                                                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                                                                          a b c +                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          d e e f                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          g h h i                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          j h h k                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          l m m n                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          o m m p                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          q r r s                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          t u u v                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          w u u x                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                          y z z A                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        + B z z C                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        D E F F G                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        # H I I J                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        K L I I M                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        N O P P Q                                                                                                                                                                                                                                                                                               ",
-"                                                                                                                                                                                                                                                                                                        R P P P S +                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        T U U U V K                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        W U U U X Y                                                                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                                                                        Z ` ` `  ...                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        +.` ` ` @.#.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        $.%.%.%.%.&.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        *.=.=.=.=.-.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        ;.=.=.=.=.>.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        ,.'.'.'.'.).                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        !.'.'.'.'.~.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        {.].].].].^.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        /.].].].].(.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        _.:.:.:.:.<.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        [.}.}.}.}.|.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                        1.}.}.}.}.2.                                                                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                                                                      3.4.4.4.4.4.5.6.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      7.4.4.4.4.4.8.3.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      9.0.0.0.0.0.a.b.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      c.0.0.0.0.0.d.7.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      e.f.f.f.f.f.g.h.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      i.j.j.j.j.j.j.k.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      l.j.j.j.j.j.j.m.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      n.o.o.o.o.o.o.p.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      q.o.o.o.o.o.o.r.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      s.t.t.t.t.t.t.u.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      v.w.w.w.w.w.w.x.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      y.w.w.w.w.w.w.z.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      A.B.B.B.B.B.B.C.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                      D.B.B.B.B.B.B.E.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                    + F.G.G.G.G.G.G.H.                                                                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                                                                    I.J.G.G.G.G.G.G.K.6.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    L.M.N.N.N.N.N.N.O.P.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    Q.R.N.N.N.N.N.N.S.T.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    U.V.W.W.W.W.W.W.X.Y.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    Z.`.`.`.`.`.`.`. +.+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ++`.`.`.`.`.`.`.`.@+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    #+$+$+$+$+$+$+$+$+U.                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    %+$+$+$+$+$+$+$+$+&+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    *+=+=+=+=+=+=+=+=+-+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ;+=+=+=+=+=+=+=+=+>+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ,+'+'+'+'+'+'+'+'+)+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    !+~+~+~+~+~+~+~+~+{+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    ]+~+~+~+~+~+~+~+~+^+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                    /+(+(+(+(+(+(+(+(+_+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  6.:+(+(+(+(+(+(+(+(+<+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  T.[+}+}+}+}+}+}+}+}+|+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  1+2+}+}+}+}+}+}+}+}+3+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  4+5+6+6+6+6+6+6+6+6+7+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  8+9+0+0+0+0+0+0+0+0+a+                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                  b+0+0+0+0+0+0+0+0+0+c+6.                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  d+e+e+e+e+e+e+e+e+e+e+1+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  f+e+e+e+e+e+e+e+e+e+e+g+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  h+i+i+i+i+i+i+i+i+i+i+j+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  k+l+l+l+l+l+l+l+l+l+l+m+                                                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                                                  n+l+l+l+l+l+l+l+l+l+l+o+                                                                                                                                                                                                                                                                                      ",
-"                                                                          + p+q+r+s+t+u+v+w+x+y+z+                                                                                                                                                                                                A+B+B+B+B+B+B+B+B+B+B+C+                                                                                                                                                                                              + D+E+F+G+H+I+J+K+L+M+N+                                                                ",
-"                                                                    O+P+Q+R+S+T+U+V+W+X+M+                                                                                                                                                                                                        Y+B+B+B+B+B+B+B+B+B+B+Z+                                                                                                                                                                                                      `+ @.@+@@@#@$@%@&@*@=@+                                                         ",
-"                                                              N+-@;@>@,@#@,@'@)@!@N+                                                                                                                                                                                                              ~@{@{@{@{@{@{@{@{@{@{@]@                                                                                                                                                                                                              ^@/@(@_@:@:@<@[@}@|@                                                    ",
-"                                                          |@1@2@3@:@:@3@4@5@6@                                                                                                                                                                                                                    7@{@{@{@{@{@{@{@{@{@{@8@                                                                                                                                                                                                                  + M+9@0@a@a@a@<@4@b@+                                               ",
-"                                                    c@d@e@f@a@a@a@g@h@i@                                                                                                                                                                                                                        6.j@k@k@k@k@k@k@k@k@k@k@l@                                                                                                                                                                                                                        m@n@o@p@p@p@p@q@r@z+                                          ",
-"                                                  s@t@u@p@p@p@v@w@d@                                                                                                                                                                                                                            x@y@k@k@k@k@k@k@k@k@k@k@z@                                                                                                                                                                                                                            A@B@C@D@D@D@D@E@F@m@                                      ",
-"                                              G@H@I@D@D@D@D@J@K@+                                                                                                                                                                                                                               L@M@N@N@N@N@N@N@N@N@N@N@O@                                                                                                                                                                                                                                M+P@Q@R@R@R@R@S@T@                                    ",
-"                                            T@U@R@R@R@R@R@V@M+                                                                                                                                                                                                                                  W@X@Y@Y@Y@Y@Y@Y@Y@Y@Y@Y@Z@                                                                                                                                                                                                                                  `@ #.#+#+#+#+#@###O+                                ",
-"                                        6@$#%#R@R@R@R@%#&#c@                                                                                                                                                                                                                                    *#=#Y@Y@Y@Y@Y@Y@Y@Y@Y@Y@-#                                                                                                                                                                                                                                      ;#>#,#,#,#,#,#'#)#                              ",
-"                                      !#~#+#+#+#+#+#{#]#                                                                                                                                                                                                                                        ^#/#/#/#/#/#/#/#/#/#/#/#(#_#                                                                                                                                                                                                                                      :#<#[#[#[#[#[#}#|#c@                          ",
-"                                    1#2#,#,#,#,#,#3#4#+                                                                                                                                                                                                                                         5#/#/#/#/#/#/#/#/#/#/#/#X@6#                                                                                                                                                                                                                                        7#8#9#9#9#9#9#0#a#c@                        ",
-"                                  ;#b#[#[#[#[#[#c#d#+                                                                                                                                                                                                                                           e#f#f#f#f#f#f#f#f#f#f#f#g#h#                                                                                                                                                                                                                                          i#j#9#9#9#9#9#k#a#                        ",
-"                                l#m#9#9#9#9#9#9#n#o#                                                                                                                                                                                                                                            p#f#f#f#f#f#f#f#f#f#f#f#q#r#                                                                                                                                                                                                                                            s#t#u#u#u#u#u#u#v#+                     ",
-"                              O+w#u#u#u#u#u#u#x#y#                                                                                                                                                                                                                                              z#A#A#A#A#A#A#A#A#A#A#A#B#C#                                                                                                                                                                                                                                            + D#E#E#E#E#E#E#F#G#                    ",
-"                            c@H#E#E#E#E#E#E#E#I#                                                                                                                                                                                                                                                J#K#K#K#K#K#K#K#K#K#K#K#K#e#                                                                                                                                                                                                                                              L#M#N#N#N#N#N#N#M#O#                  ",
-"                            P#Q#N#N#N#N#N#N#R#S#                                                                                                                                                                                                                                                T#K#K#K#K#K#K#K#K#K#K#K#K#U#                                                                                                                                                                                                                                                V#W#W#W#W#W#W#W#X#N+                ",
-"                          z+Y#W#W#W#W#W#W#W#Z#                                                                                                                                                                                                                                                  `# $ $ $ $ $ $ $ $ $ $ $ $.$                                                                                                                                                                                                                                                +$@$#$#$#$#$#$#$#$$$                ",
-"                          %$#$#$#$#$#$#$#$&$*$                                                                                                                                                                                                                                                  =$ $ $ $ $ $ $ $ $ $ $ $ $-$                                                                                                                                                                                                                                                  ;$>$>$>$>$>$>$>$,$z+              ",
-"                        '$,$>$>$>$>$>$>$>$)$O+                                                                                                                                                                                                                                                  !$~$~$~$~$~$~$~$~$~$~$~$~${$                                                                                                                                                                                                                                                  ]$^$^$^$^$^$^$^$^$]$              ",
-"                        /$^$^$^$^$^$^$^$^$($                                                                                                                                                                                                                                                    _$~$~$~$~$~$~$~$~$~$~$~$~$:$                                                                                                                                                                                                                                                  <$[$[$[$[$[$[$[$[$}$`@            ",
-"                        |$^$^$^$^$^$^$^$^$1$                                                                                                                                                                                                                                                    2$3$3$3$3$3$3$3$3$3$3$3$3$4$                                                                                                                                                                                                                                                  6@5$6$6$6$6$6$6$6$5$7$            ",
-"                      O+8$[$[$[$[$[$[$[$[$9$                                                                                                                                                                                                                                                    0$a$a$a$a$a$a$a$a$a$a$a$a$b$                                                                                                                                                                                                                                                    c$d$d$d$d$d$d$d$d$e$            ",
-"                      f$6$6$6$6$6$6$6$6$6$g$                                                                                                                                                                                                                                                    h$a$a$a$a$a$a$a$a$a$a$a$a$i$                                                                                                                                                                                                                                                    j$k$k$k$k$k$k$k$k$l$            ",
-"                      m$d$d$d$d$d$d$d$d$d$n$                                                                                                                                                                                                                                                  6.o$p$p$p$p$p$p$p$p$p$p$p$p$q$                                                                                                                                                                                                                                                    r$k$k$k$k$k$k$k$k$s$6@          ",
-"                      t$k$k$k$k$k$k$k$k$k$u$                                                                                                                                                                                                                                                  v$p$p$p$p$p$p$p$p$p$p$p$p$p$w$x@                                                                                                                                                                                                                                                  x$y$y$y$y$y$y$y$y$z$A$          ",
-"                      B$y$y$y$y$y$y$y$y$y$C$                                                                                                                                                                                                                                                  D$E$E$E$E$E$E$E$E$E$E$E$E$E$F$G$                                                                                                                                                                                                                                                H$I$J$J$J$J$J$J$J$J$K$L$          ",
-"                      M$J$J$J$J$J$J$J$J$J$N$L$                                                                                                                                                                                                                                                O$P$P$P$P$P$P$P$P$P$P$P$P$P$Q$R$                                                                                                                                                                                                                                                S$T$T$T$T$T$T$T$T$T$T$U$          ",
-"                      V$T$T$T$T$T$T$T$T$T$T$W$N+                                                                                                                                                                                                                                              X$P$P$P$P$P$P$P$P$P$P$P$P$P$Y$Z$                                                                                                                                                                                                                                              `$ %.%.%.%.%.%.%.%.%.%+%L$          ",
-"                      @%.%.%.%.%.%.%.%.%.%.%#%$%%%&%*%=%                                                                                                                                                                                                                                      -%;%;%;%;%;%;%;%;%;%;%;%;%;%>%,%                                                                                                                                                                                                                                            '%)%!%!%!%!%!%!%!%!%!%!%~%{%          ",
-"                      ]%!%!%!%!%!%!%!%!%!%^%/%(%_%_%_%:%<%[%                                                                                                                                                                                                                                  }%;%;%;%;%;%;%;%;%;%;%;%;%;%;%|%                                                                                                                                                                                                                                        c@1%2%#%#%#%#%#%#%#%#%#%#%#%3%`@          ",
-"                      4%5%#%#%#%#%#%#%#%6%7%_%_%_%_%_%_%_%8%=%                                                                                                                                                                                                                                9%0%0%0%0%0%0%0%0%0%0%0%0%0%0%a%                                                                                                                                                                                                                                      {%b%c%d%d%d%d%d%d%d%d%d%d%d%d%e%            ",
-"                        f%d%d%d%d%d%d%g%h%_%_%_%_%_%_%_%_%_%i%j%                                                                                                                                                                                                                              k%0%0%0%0%0%0%0%0%0%0%0%0%0%0%l%                                                    m%n%n%n%n%n%o%                                                                                                                                            =%n%n%n%n%n%n%n%n%n%p%q%r%s%s%s%s%s%s%s%s%s%s%s%s%s%t%u%            ",
-"                        v%w%d%d%d%d%d%~+_%_%_%_%_%_%_%_%_%_%x%y%                                                                                                                                                                                                                              z%A%A%A%A%A%A%A%A%A%A%A%A%A%A%B%                                                    C%_%_%_%_%_%D%                                                                                                                                    j%E%F%G%_%_%_%_%_%_%_%_%_%_%_%_%H%I%}.J%K%K%K%K%K%K%K%K%K%K%L%              ",
-"                        + M%s%s%s%s%s%N%_%_%_%_%_%_%_%_%_%_%_%O%P%`@                                                                                                                                                                                                                          Q%A%A%A%A%A%A%A%A%A%A%A%A%A%A%R%                                                    C%_%_%_%_%_%D%                                                                                                                                  S%T%U%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%V%A%W%W%W%W%W%W%W%W%X%Y%              ",
-"                          4%Z%K%K%K%K%`%_%_%_%_%_%_%_%_%_%_%_%f. &.&+&@&                                                                                                                                                                                                                      #&$&$&$&$&$&$&$&$&$&$&$&$&$&$&%&                                                    C%_%_%_%_%_%D%                                                                                                                                &&*&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=&P$-&-&-&-&-&-&;&>&                ",
-"                            ,&'&W%W%W%)&_%_%_%_%_%_%_%_%_%_%_%B+W%W%W%!&~&{&N+                                                                                                                                                                                                                ]&^&^&^&^&^&^&^&^&^&^&^&^&^&^&/&                                                    C%_%_%_%_%_%D%                                                                                                                                (&_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:&<&-&-&-&-&-&[&`@                ",
-"                              }&|&-&-&l+_%_%_%_%_%_%_%_%_%_%1&2&-&-&-&-&-&-&3&4&5&6&+                                                                                                                                                                                                         7&^&^&^&^&^&^&^&^&^&^&^&^&^&^&8&                                                    C%_%_%_%_%_%D%                                                                                                                              9&0&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%a&b&b&b&b&c&N+                  ",
-"                                d&e&b&f&I%_%_%_%_%_%_%_%_%_%r g&b&b&b&b&b&b&b&b&b&h&i&j&Y%k&                                                                                                                                                                                                  l&m&m&m&m&m&m&m&m&m&m&m&m&m&m&n&                                                    C%_%_%_%_%_%D%                                                                                                                              *%_%_%_%_%_%_%o&V%p&p&p&p&p&p&p&p&p&q&H%_%_%_%_%_%r&s&g&g&t&u&                    ",
-"                                  P%v&g&w&x&_%_%_%_%_%_%H%)&y&g&g&g&g&g&g&g&g&g&g&g&g&g&z&A&B&C&D&                                                                                                                                                                                          x@E&m&m&m&m&m&m&m&m&m&m&m&m&m&m&]&+                                                   C%_%_%_%_%_%D%                                                                                                                        F&G&H&I&_%_%_%_%_%r&J&K&L&L&L&L&L&L&L&L&s&M&}.H%_%_%_%_%(%N&O&P&k&                      ",
-"                                    Q&R&S&2&T&1&_%_%_%U&'+f&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&S&V&A&W&X&Y&+                                                                                                                                                                                 Z&`& * * * * * * * * * * * * * *.*6.                                                  C%_%_%_%_%_%D%                                                                                                                +*@*#*$*%*&***=*_%_%_%_%_%z ************************s&q&_%_%_%_%H%-*;*`@                        ",
-"                                      `@>*,***'*)* *N&g%**************************************************!*~*H&{*@&c@                                                                                                                                                                      ]*^* * * * * * * * * * * * * * */*(*                                                  C%_%_%_%_%_%D%                                                                                                      N+_*:*<*[*}*g%g%g%g%g%g%|*_%_%_%_%_%N.g%g%g%g%g%g%g%g%g%g%g%g%g%I%_%_%_%_%_%1*                            ",
-"                                          2*3*g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%g%4*5*6*;*{*4%c@                                                                                                                                                            7*8*9*9*9*9*9*9*9*9*9*9*9*9*9*9*0*L@                                                  C%_%_%_%_%_%D%                                                                                            a*Y&b*c*d*e*f*g*g*g*g*g*g*g*g*g*g*h*i*i*i*i*i*`.g*g*g*g*g*g*g*g*g*g*g*g*g*j*_%_%_%_%_%k*                            ",
-"                                        l*m*n*o*(+(+(+(+(+(+p*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*g*L&y&y&y&y&y&y&y&y&y&y&f&g*q*r*3*s*t*2*u*+                                                                                                                                                   v*w*x*x*x*x*x*x*x*x*x*x*x*x*x*x*y*z*                                                  C%_%_%_%_%_%D%                                                                                  a*A*B*C*D*E*F*f&f&f&f&f&f&f&f&f&f&f&f&f&f&f&G*H*H*H*H*H*M&f&f&f&f&f&f&f&f&f&f&f&f&f&j*_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%=+f&f&f&f&f&f&f&f&f&f&f&f&f&J*j.K*L*M*:&:&:&:&:&:&:&:&:&:&q&N*O*B+P*f&f&Q*R*S*T*U*V*W*6&                                                                                                                                        X*x*x*x*x*x*x*x*x*x*x*x*x*x*x*x*w*Y*                                                  C%_%_%_%_%_%D%                                                                      `@Z*`* =.=+=@=#=L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&L&I%_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%$+f&f&f&f&f&f&f&f&f&f&f&$=%=&=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%r&i+'*f&f&f&f&f&f&f&Q**=D*==-=;=>=+*`@j%=%,='=)=)=)=)=)=)=)=)=)=)=!=~={=                            9&]=)=)=)=)=)=                          o%)=)=)=)=)=^=    /=(=(=(=(=(=(=(=(=(=(=(=;%w.0.0.0._=)=)=)=)=)=)=)='=,=o%j%                            C%_%_%_%_%_%D%                    m%'=)=)=)=)=)=:=                    N+6&<=[=}=|=.*1=p$p$p$p$p$p$p$p$p$p$2=3=y&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&s&4= =5=_%_%_%_%_%k*                            ",
-"                                        I*_%_%_%_%_%_%_%_%_%$+L&L&L&L&L&L&L&L&L&L&6=7=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%8=9=0=L&L&L&L&L&L&L&s&s&s&s&s&a=b=c=d=:%_%_%_%_%_%_%_%_%_%_%_%_%_%e=f=g=9&                        h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    k=(=(=(=(=(=(=(=(=(=(=$&I%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l=m=n=                          C%_%_%_%_%_%D%                  S%o=_%_%_%_%_%_&E%      p=q=r=s=t=u=v=w=x='*x*y=z=_%_%_%_%_%_%_%_%_%_%_%_%_%(%A=A#K&'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*'*b=B=q=  C=_%_%_%_%_%k*                            ",
-"                                        D=_%_%_%_%_%_%_%_%_%E=F=G=s&s&s&s&s&s&s&2&H=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%I=K&s&s&s&s&s&s&s&'*'*'*'*'*j.&=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%J=K=                      h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    L=M=M=M=M=M=M=M=M=M=M==+H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%x%N=&&                      C%_%_%_%_%_%D%                j%O=_&_%_%_%_%_%P=Q=R=S=T=U=V=W='*'*'*'*'*X=u (%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%8=O*<&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&y&Y=Z=`=      C=_%_%_%_%_%k*                            ",
-"                                        D=_%_%_%_%_%_%_%_%_% -+ .-+-x='*'*'*'*'*@-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%H%4.'*'*'*'*'*'*y&y&y&y&y&`.8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%#-$-+                   h=G%_%_%_%_%_&                          i=_%_%_%_%_%j=    %-M=M=M=M=M=M=M=M=M=M='._%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_&N=                      C%_%_%_%_%_%D%            F&&-*-_&_%_%_%_%_%_%=---y&y&y&y&y&y&y&y&y&y&;-u H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%>-P*;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-,-'-)-          C=_%_%_%_%_%k*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -      !-~-{-]-y&2=H%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%z=3=y&y&y&y&y&y&y&y&y&^-1&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/-(-_-:-<-[-}-|-1-2-3-4-G%_%_%_%_%_&                          i=_%_%_%_%_%j=    5-6-6-6-6-6-6-6-6-6-6-t._%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%x%7-                    C%_%_%_%_%_%8-9-0-a-b-c-d-e-A#f-_%_%_%_%_%_%p&g-;-;-;-;-;-;-;-;-;-;-;-m&8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o.;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-;-h-i-j-+               C=_%_%_%_%_%k*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -          p=k-l-m-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%G.;-;-;-;-;-;-;-;-;-T&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=&n-;-;-;-;-;-;-;-;-h-o-p-_%_%_%_%_&q-r-2-6&p=                i=_%_%_%_%_%j=    s-2=2=2=2=2=2=2=2=2=2=a$t-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%u-j%+ +*q=v-w-x-y-z-A-B-_%_%_%_%_%/-P*P*P*P*P*P*M=C-_%_%_%_%_%_%7%D-P*P*P*P*P*P*P*P*P*P*P*P*K*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%r&--P*P*P*P*P*P*P*P*P*P*P*P*P*P*P*E-F-G-u*                    H-_%_%_%_%_%l*                            ",
-"                                        i%_%_%_%_%_%_%_%_%_% -                I-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%J-P*P*P*P*P*P*P*P*K-L-_%_%_%_%_%(%M-N-N%N%N%N%N%N%N%N%O-1&_%_%_%_%_%_%N.P*P*P*P*P*P*P*P*P*J*M*_%_%_%_%H%P*P-Q-R-S-F-T-U-V-W-X-Y-Z-`-_%_%_%_%_%j=     ;2=2=2=2=2=2=2=2=2=2=2=B.y=.;.;.;+;@;@;@;@;@;#;$;%;&;_%_%_%_%_%*;=;-;;;>;,;K&K&K&K&K&f._%_%_%_%_%';K&K&K&K&K&^-h%_%_%_%_%_%_%);p$K&K&K&K&K&K&K&K&K&K&K&K&!;(%_%_%_%_%_%H%~;N-N-N-N-N-N-N-N-N-y=q&_%_%_%_%_%H%E$K&K&K&K&K&K&K&K&K&K&K&K&K&;;{;];k&                      ^;/;_%_%_%_%e=(;                            ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              [%:%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%=-K&K&K&K&K&K&K&K&n-);_%_%_%_%_%N@X=K&K&K&K&K&K&K&K&K&X=x*t-_%_%_%_%_%:;K&K&K&K&K&K&K&K&K&J*M*_%_%_%_%H%K&K&K&K&K&K&K&K&K&K&K&K&<;[;_%_%_%_%_%j=    };J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&|;        p=1;2;3;4;o&_%_%_%_%_%(=X=X=X=X=X=X=X=X=X=f._%_%_%_%_%';X=X=X=X=5;H=_%_%_%_%_%_%f-~+X=X=X=X=X=X=X=X=X=X=X=X=X=6-_%_%_%_%_%H%].M&X=X=X=X=X=X=X=X=X=X=6;7;_%_%_%_%_%4.X=X=X=X=X=X=X=X=X=X=2;8;Y-+*          n%9;9;9;9;9;9;9;0;a;_%_%_%_%_%l==%                            ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              K=b;_%_%_%_%_%_%_%_%i*m %.%.%.%.%.%.%.%.c;_%_%_%_%_%_%_%_%_%x&X=X=X=X=X=X=X=X=d;H%_%_%_%_%M*X=X=X=X=X=X=X=X=X=X=X=X=X=e;_%_%_%_%_%/%X=X=X=X=X=X=X=X=X=^%M*_%_%_%_%H%X=X=X=X=X=X=X=X=X=X=X=X=X=P$_%_%_%_%_%j=  + f;J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&J&g;        `@h;J%J%$=N*_%_%_%_%_%A#J%J%J%J%J%J%J%J%J%0._%_%_%_%_%';J%J%J%K-K*_%_%_%_%_%_%H%` J%J%J%J%J%J%J%J%J%J%J%J%J%J% $_%_%_%_%_%i;K-J%J%J%J%J%J%J%J%J%J%J%J%@-_%_%_%_%_%%=J%J%J%J%J%J%j;k;l;m;a*                *%_%_%_%_%_%_%_%_%_%_%_%_%_%_%m=                              ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%o;p;q;r;J%J%J%J%J%J%^&_%_%_%_%_%_%_%_%_%p&J%J%J%J%J%J%J%J%6%H%_%_%_%_%s;J%J%J%J%J%J%J%J%J%J%J%J%J%B._%_%_%_%_%t;J%J%J%J%J%J%J%J%J%g-:&_%_%_%_%H%J%J%J%J%J%J%J%J%J%J%J%J%J%E$_%_%_%_%_%j=  u;v;w;w;w;w;w;w;w;w;w;w;w;w;w;w;w;w;x;        + y;0=0=0=7=_%_%_%_%_%/#0=0=0=0=0=0=0=0=0=0._%_%_%_%_%z;0=0=$=T&_%_%_%_%_%_%_%A;M&0=0=0=0=0=0=0=0=0=0=0=0=0=0=A#_%_%_%_%_%B;0=0=0=0=0=0=0=0=0=0=0=0=0=a&_%_%_%_%_%C;0=0=0=D;E;F;G;)-                      *%_%_%_%_%_%_%_%_%_%_%_%_%_%e=n=                              ",
-"                                        _;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%+ H;I;J;K;0=0=0=$&_%_%_%_%_%_%_%_%_%p&0=0=0=0=0=0=0=0=L;H%_%_%_%_%s;0=0=0=0=0=0=0=0=0=0=0=0=0=B._%_%_%_%_%t;0=0=0=0=0=0=0=0=0=M;:&_%_%_%_%H%0=0=0=0=0=0=0=0=0=0=0=0=0=E$_%_%_%_%_%j=  z*N;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;P;          Q;M&M&M&7=_%_%_%_%_%Y@M&M&M&M&M&M&M&M&M&4._%_%_%_%_%z;M&M&].8=_%_%_%_%_%_%y=R;M&M&M&M&M&M&M&M&M&M&M&M&M&M&M&A#_%_%_%_%_%S;M&M&M&M&M&M&M&M&M&M&M&M&M&a&_%_%_%_%_%C;T;U;V;W;X;                            *%_%_%_%_%_%_%_%_%_%_%_%_%_%Y;                                ",
-"                                        Z;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%        )-`; >.>+>_%_%_%_%_%_%_%_%_%p&M&M&M&M&M&M&M&M&)*H%_%_%_%_%L-M&M&M&M&M&M&M&M&M&M&M&M&M&B._%_%_%_%_%t;M&M&M&M&M&M&M&M&M&H*:&_%_%_%_%H%M&M&M&M&M&M&M&M&M&M&M&M&M&p$_%_%_%_%_%j=  @>#>O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;O;$>          %>$=$=$=7=_%_%_%_%_%N@$=$=$=$=$=$=$=$=$=4._%_%_%_%_%T&$=l+i*_%_%_%_%_%_%H=M;$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=f#_%_%_%_%_%S;$=$=$=$=$=$=$=$=$=$=$=$=$=e;_%_%_%_%_%&>*>`@                                  *%_%_%_%_%_%_%_%_%_%_%_%_%_%e=n=                              ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                =>_%_%_%_%_%_%_%_%_%p&M&M&M&M&M&$=$=$=)*H%_%_%_%_%L-$=$=$=$=$=$=$=$=$=$=$=$=$=w._%_%_%_%_%t;$=$=$=$=$=$=$=$=$=6=:&_%_%_%_%H%$=$=$=$=$=$=$=$=$=$=$=$=$=a$_%_%_%_%_%j=  ->;>D-D-D-D-D-D-D-D-D-D-D-D-D-D-D-D->>          ,>$=$=$=7=_%_%_%_%_%N@$=$=$=$=$=$=$=$=$=}._%_%_%_%_%T&$&z=_%_%_%_%_%_%p&^-$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=$=/#_%_%_%_%_%S;K-K-K-K-K-K-K-K-K-K-K-K-'>)>_%_%_%_%_%!>                                      *%_%_%_%_%_%_%_%_%_%_%_%_%_%_%u-                              ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%p&$=$=$=$=$=K-K-K-~>H%_%_%_%_%L-K-K-K-K-K-K-K-K-K-K-K-K-K-w._%_%_%_%_%>-K-K-K-K-K-K-K-K-K-n-:&_%_%_%_%H%K-K-K-K-K-K-K-K-K-K-K-K-K-a$_%_%_%_%_%j=  {>]>D-D-D-D-D-D-D-D-D-D-D-0%4.|*^>^>/>!>!>!>!>!>(>C;=*'.p&_%_%_%_%_%k@K-K-K-K-K-K-K-K-K-:._%_%_%_%_%y=_>_%_%_%_%_%_%:&6-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-K-Y@_%_%_%_%_%S;<&<&<&<&<&<&<&<&<&:><>[>}>|>_%_%_%_%_%!>                                      n%N=N=N=N=N=N=9;0;1>_%_%_%_%_%l=o%                            ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%2>3>4>K-K-K-K-<&<&D-H%_%_%_%_%L-<&<&<&<&<&<&<&<&<&<&<&<&<&t._%_%_%_%_%>-<&<&<&<&<&<&<&<&<&n-:&_%_%_%_%H%<&<&<&<&<&<&<&<&<&<&<&<&<&3$_%_%_%_%_%j=  5>~>~>~>~>~>~>~>~>~>~>$&6>7>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%{@<&<&<&<&<&<&<&<&<&:._%_%_%_%_%H%_%_%_%_%_%_%=&A#<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&<&Y@_%_%_%_%_%B;----------8>9>0>a>q=      b>_%_%_%_%_%!>                                                        ,=/;_%_%_%_%e=,=                            ",
-"                                        0;_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>p=d>e>f>g>h>----O;H%_%_%_%_%L---------------------------t._%_%_%_%_%>-------------------6;:&_%_%_%_%H%--------------------------~$_%_%_%_%_%j=  i>~>~>~>~>~>~>~>~>~> $h%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%{@------------------]._%_%_%_%_%_%_%_%_%_%_%f-N.G*--------------------------------------N@_%_%_%_%_%B;G*j>k>l>m>n>o>p>p>p>p>p>p>0&_%_%_%_%_%!>                                                          H-_%_%_%_%_%l*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>          a*r>s>t>_%_%_%_%_%L---------------------------o._%_%_%_%_%u>------------------N&:&_%_%_%_%H%--------------------------~$_%_%_%_%_%j=  v>w>)*)*)*)*)*)*)*^&h%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%B+G*G*G*G*G*G*G*G*G*]._%_%_%_%_%_%_%_%_%_%_%z;G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*G*k@_%_%_%_%_%x>y>z>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_%B>C>G*G*G*G*G*G*G*G*G*G*G*G*o._%_%_%_%_%u>G*G*G*G*G*G*G*G*G*w&:&_%_%_%_%H%G*G*G*G*G*G*G*G*G*G*G*G*G* $_%_%_%_%_%j=  D>E>)*)*)*)*)*)*)*6>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l+2&2&2&2&2&2&2&2&2&'._%_%_%_%_%_%_%_%_%_%_%F>x*2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&2&G>H>I>J>_%_%_%_%_%K>  I*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        q>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_%L>M>N>O>P>Q>R>2&2&2&2&2&2&2&j._%_%_%_%_%u>2&2&2&2&2&2&2&2&2&p*:&_%_%_%_%H%2&2&2&2&2&2&2&2&2&2&2&2&2&K#_%_%_%_%_%j=  z*S>L;L;L;L;L;L;$&7>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l+R;R;R;R;R;R;R;R;R;'._%_%_%_%_%_%_%_%_%_%_%_%V%9*R;R;R;R;R;R;R;R;R;R;R;R;T>U>V>W>X>Y>+ )=_%_%_%_%_%K>  Z>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        `>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,        u;.,+,@,#,$,%,R;R;f._%_%_%_%_%u>R;R;R;R;R;R;R;R;R;^-:&_%_%_%_%H%R;R;R;R;R;R;R;R;R;R;R;R;R;K#_%_%_%_%_%j=  u;&,6%6%6%6%6%6%o._%_%_%_%_%_%*,|*r =,-,-,-,-,-,;,:.|*7>_%_%_%_%_%_%i+!;!;!;!;!;!;!;!;!;=._%_%_%_%_%_%_%_%_%_%_%_%_%>,x*!;!;!;!;!;!;,,',),!,~,{,+           )=_%_%_%_%_%K>  ],_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%!>                                                          C=_%_%_%_%_%k*                            ",
-"                                        `>_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                    p=^,!,/,_%_%_%_%_%(,!;!;!;!;!;!;!;!;!;_,:&_%_%_%_%H%!;!;!;!;!;!;!;!;!;!;!;!;!;A#_%_%_%_%_%j=  + :,6%6%6%6%6%6%C;_%_%_%_%_%~;6%6%6%<,          [,5;5;p$o&_%_%_%_%_%i+5;5;5;5;5;5;5;5;5;=._%_%_%_%_%},'.f-_%_%_%_%_%_%q&|,1,2,3,4,Y>                        )=_%_%_%_%_%K>  n%5,U%U%U%U%U%U%U%U%U%U%U%U%U%U%U%U%<%                                                          C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%7,8,9,j>0,5;5;5;5;5;_,:&_%_%_%_%H%5;5;5;5;5;5;5;5;5;5;5;5;5;f#_%_%_%_%_%j=    a,b,b,b,b,b,b,},_%_%_%_%_%9=b,b,b,c,          d,e,e,^%f,_%_%_%_%_%e+e,e,e,e,e,e,e,e,e,%._%_%_%_%_%A;3=g,h,_%_%_%_%_%_%1>n=                                )=_%_%_%_%_%K>    m%i,j,j,j,j,j,j,j,j,j,j,j,j,j,j,j,K=                                                          C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=  + k,l,m,n,o,p,q,r,C-_%_%_%_%H%e,e,e,e,e,e,e,e,e,e,e,e,e,f#_%_%_%_%_%j=    s,b,b,b,b,b,b,},_%_%_%_%_%|*b,b,b,t,          u,3=3=3==-_%_%_%_%_%0+3=3=3=3=3=3=3=3=3=%._%_%_%_%_%v,w,x,y,U%_%_%_%_%_%_%a;n=                              )=_%_%_%_%_%K>                                                                                                  C=_%_%_%_%_%k*                            ",
-"                                        D%_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                p=z,A,_%_%_%_%H%3=3=3=3=3=3=3=3=3=3=3=3=3=/#_%_%_%_%_%j=    B,d;d;d;d;d;d;},_%_%_%_%_%|*d;d;d;C,          D,E,J*J*=-_%_%_%_%_%0+J*J*J*J*J*J*F,G,H,I,_%_%_%_%_%D%    j% -_&_%_%_%_%_%_%J,E%                            )=_%_%_%_%_%K>                                                            K,&%L,M,=%                            C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%J*J*J*J*J*J*J*J*J*J*J*J*J*Y@_%_%_%_%_%j=    N,d;d;d;d;d;d;},_%_%_%_%_%e;d;d;d;O,          P,Q,J*J*=-_%_%_%_%_%6+J*J*J*J*J*E,R,    C%_%_%_%_%_%D%        6,x%_%_%_%_%_%_%G%!=                          )=_%_%_%_%_%K>                                                          l*x%_%_%_%G%S,                          C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_% -              n;b;_%_%_%_%_%_%_%_%:%S%                !=_%_%_%_%_%_%_%_%_%c>                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%^%^%^%^%^%^%^%^%^%^%^%^%^%N@_%_%_%_%_%j=    T,U,U,U,U,U,U,9=_%_%_%_%_%e;U,U,U,V,          W,X,^%g-=-_%_%_%_%_%}+^%^%^%^%^%X,W,    C%_%_%_%_%_%D%        j%6,x%_%_%_%_%_%_%J,l*                        )=_%_%_%_%_%K>                                                          T%_%_%_%_%_%6,                          C=_%_%_%_%_%k*                            ",
-"                                        O=_%_%_%_%_%_%_%_%_%m=Y,            K=b;_%_%_%_%_%_%_%_%e=D=b>b>b>b>b>b>b>b>m=_%_%_%_%_%_%_%_%_%Z,                A>_&_%_%_%_% ,                          6,_%_%_%_%_%o=                  h=G%_%_%_%_%H%g-g-g-g-g-g-g-g-g-g-g-g-g-N@_%_%_%_%_%j=    `, ' ' ' ' ' '9=_%_%_%_%_%e; ' ' '.'          +'@'g-g-=-_%_%_%_%_%}+g-g-g-g-g-#'k,    C%_%_%_%_%_%D%          j%(&x%_%_%_%_%_%_%G%k*                      )=_%_%_%_%_%K>                                                          q>_%_%_%_%_%L,                          C=_%_%_%_%_%k*                            ",
-"                                        T%_%_%_%_%_%_%_%_%_%_%$'Y,          S%:%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%%'                A>_&_%_%_%_%H-                          &'_%_%_%_%_%o=                  h=G%_%_%_%_%H%n-M;M;M;M;M;M;M;M;M;M;M;M;k@_%_%_%_%_%j=    *' ' ' ' ' ' '9=_%_%_%_%_%T& ' ' '='          -';'M;6;L*_%_%_%_%_%(+M;M;M;M;M;>'6.    C%_%_%_%_%_%D%            j%,'e=_%_%_%_%_%_%l=l*                    )=_%_%_%_%_%Y;                                                          q>_%_%_%_%_%&'                          H-_%_%_%_%_%k*                            ",
-"                                        T%_%_%_%_%_%_%_%_%_%_%_%''=%           ,_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%)'                n%/;_%_%_%_%e=n;                      9&!'_%_%_%_%_%o=                  m%1>_%_%_%_%_%A#M;M;M;M;M;M;M;M;M;M;M;M;k@_%_%_%_%_%j=    ~'_,_,_,_,_,_,C;_%_%_%_%_%{' '_,_,]'          ^'/'H*l+8=_%_%_%_%_%N@H*H*H*H*H*('      C%_%_%_%_%_%D%                _'x%_%_%_%_%_%_%:']=                  ^=_%_%_%_%_%1>=%                                                        <%_%_%_%_%_%@;j%                      n=x%_%_%_%_%e=E%                            ",
-"                                        b>_%_%_%_%_%_%_%_%_%_%_%_%_;          `>_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%g=                =%a;_%_%_%_%_%<'6,)='='='='='='='='=['}'_&_%_%_%_%_%o=                  j%j=_%_%_%_%_%F>P }+6+6+6+6+6+6+6+6+6+6+h _%_%_%_%_%j=    |'_,_,_,_,_,_,f._%_%_%_%_%_%N%t.=+1''='='='='=2'3'm t-_%_%_%_%_%8=x*6=6=6=6=6=4'      C%_%_%_%_%_%D%                j%_'/;_%_%_%_%_%_%:%5'                6'_%_%_%_%_%_%!'&%'='='='='='='='='='='='='='='='=5'S%                  6,_%_%_%_%_%U%_;7''='='='='='='='=)=-,8'_%_%_%_%_%b;K,                            ",
-"                                        k*:'_%_%_%_%_%_%_%_%_%_%_%9'[%        n=_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%G%o%                  u-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                    T%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    0'a'^-^-^-^-^-^&=&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%b'p*n-n-n-n-n-c'      C%_%_%_%_%_%D%                  j%&%/;_%_%_%_%_%_%J=                   ,_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/;n%                  n%_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%d'j%                            ",
-"                                          %%/;_%_%_%_%_%_%_%_%_%_%9'Y,          @;_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%L,                    '=e=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                    e'/;_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    f'g'^-^-^-^-^-_,h'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%%.6;6;6;6;6;6;i'      C%_%_%_%_%_%D%                      j'e=_%_%_%_%_%!'                  k'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%/;n%                    u-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j'                              ",
-"                                            l'/;_%_%_%_%_%_%_%_%_%m=            o%C=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_&I*&&                    j%F%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                      m'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    n'o'p*p*p*p*p*p*0%M*_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%p'U,N&N&N&N&N&N&q'      C%_%_%_%_%_%D%                        M,/;_%_%_%_%!'                  Y,%'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:'r'                    A>s'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%$'j%                              ",
-"                                              ,'U%_%_%_%_%_%_%_%b;t'              y%d'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%e=0;S%                        [%J=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                      &&I*_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    u'v'w&w&w&w&w&w&w&6+t-_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%w'M=w&w&w&w&w&w&w&x'      C%_%_%_%_%_%D%                          M,b;_%_%_%!'                    y%y'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%<'j%                      5's'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%''o%                                ",
-"                                                M,:%_%_%_%_%_%x%,'                  m%z'G%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%y'7'j%                            S%A'G%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%o=                        && -9'_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%j=    u;B'w&w&w&w&w&w&w&w&3$C'8=_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%1&D')*p*p*p*p*p*p*p*E'F'      C%_%_%_%_%_%D%                            M,G'_%_%!'                      r'i%x%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%:%k*                          i,K>_&_%_%_%_%_%_%_%_%_%_%_%_%_%_%_%l=<%m%                                  ",
-"                                                  H'I'_&_%_%J'*%                        K=,'F%K'Z,8'8'8'8'8'8'8'8'8'8'J'''`>'=S%                                    r'L'O=@;)')')')')')')')')')'I*M'_%_%_%_%_%o=                            :=N'O'>-P'P'P'P'P'P'P'P'P'P'P'P'h'Q')')')'b>      R'N&N&N&N&N&N&N&N&N&^-3$e )&P'S')')')')')')')'7,y=I=].x*^-^-^-^-^-^-^-^-^-T'U'      )=)')')')')','                              V')')'A'                        j%n%-,q>@;)')')')')')')')')')'F%I*0;m'_'K,                              &&^;W'i%)')')')')')')')')')'Z>D%g=K=                                      ",
-"                                                      ~='=,=j%                                                                                                                                    6,_%_%_%_%_%o=                                X'^-^-^-^-^-^-^-^-^-^-^-^-^-Y'-'              Z'N&N&N&N&N&N&N&N&N&N&N&N&N&N&`'               )^-^-^-^-^-^-^-^-^-^-^-^-^-.)u;                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                +)_,_,_,_,_,_,_,_,_,_,_,_,_,@)#)              $)6;6;6;6;6;6;6;6;6;6;6;6;6;6;%)              &)_,_,_,_,_,_,_,_,_,_,_,_,_,*)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                =) ' ' ' ' ' ' ' ' ' ' ' ' '-);)              >)n-n-n-n-n-n-n-n-n-n-n-n-n-n-,)              ') ' ' ' ' ' ' ' ' ' ' ' ' '))                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                !)U,U,U,U,U,U,U,U,U,U,U,U,U,~)u;              {)n-n-n-n-n-n-n-n-n-n-n-n-n-n-])              ^)U,U,U,U,U,U,U,U,U,U,U,U,U,/)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                D>()U,U,U,U,U,U,U,U,U,U,U,U,_)_#              :)6=6=6=6=6=6=6=6=6=6=6=6=6=6=<)              [)d;d;d;d;d;d;d;d;d;d;d;d;d;})                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                #)|)d;d;d;d;d;d;d;d;d;d;d;d;1)6.              2)6=6=6=6=6=6=6=6=6=6=6=6=6=6=3)              4)b,b,b,b,b,b,b,b,b,b,b,b,b,5)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                u;6)b,b,b,b,b,b,b,b,b,b,b,b,7)                8)H*H*H*H*H*H*H*H*H*H*H*H*H*H*9)              0)6%6%6%6%6%6%6%6%6%6%6%6%6%a)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                + b)6%6%6%6%6%6%6%6%6%6%6%6%c)                d)H*H*H*H*H*H*H*H*H*H*H*H*H*H*e)              f)L;L;L;L;L;L;L;L;L;L;L;L;L;0)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  g)L;L;L;L;L;L;L;L;L;L;L;L;h)                i)M;M;M;M;M;M;M;M;M;M;M;M;M;M;x,              j)k))*)*)*)*)*)*)*)*)*)*)*)*l)                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  m))*)*)*)*)*)*)*)*)*)*)*)*n)                o)M;M;M;M;M;M;M;M;M;M;M;M;M;p)q)              {>r)~>~>~>~>~>~>~>~>~>~>~>~>u'                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  s)~>~>~>~>~>~>~>~>~>~>~>~>t)                u)g-g-g-g-g-g-g-g-g-g-g-g-g-v)w)              x)y)D-D-D-D-D-D-D-D-D-D-D-;>+                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                  6,_%_%_%_%_%o=                                  z)D-D-D-D-D-D-D-D-D-D-D-D-A)                B)^%^%^%^%^%^%^%^%^%^%^%^%^%C)D)              D>E)O;O;O;O;O;O;O;O;O;O;O;F)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                  i,L,L,L,L,L,)=                                  G)O;O;O;O;O;O;O;O;O;O;O;O;H)                +'^%^%^%^%^%^%^%^%^%^%^%^%^%I)X;              z*J)O;O;O;O;O;O;O;O;O;O;O;K)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  L)w;w;w;w;w;w;w;w;w;w;w;w;M)                p=J*J*J*J*J*J*J*J*J*J*J*J*J*N)`@              x@O)w;w;w;w;w;w;w;w;w;w;w;P)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  x)Q)J&J&J&J&J&J&J&J&J&J&J&R)                  S)J*J*J*J*J*J*J*J*J*J*J*J*T)                + U)J&J&J&J&J&J&J&J&J&J&J&V)                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  W)X)2=2=2=2=2=2=2=2=2=2=2=Y)                  Z)3=3=3=3=3=3=3=3=3=3=3=3=`)                   !2=2=2=2=2=2=2=2=2=2=2=.!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                  (*+!2=2=2=2=2=2=2=2=2=2=2=@!                  #!3=3=3=3=3=3=3=3=3=3=3=3=$!                  %!6-6-6-6-6-6-6-6-6-6-6-&!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    *!6-6-6-6-6-6-6-6-6-6-6-=!                  1,e,e,e,e,e,e,e,e,e,e,e,e,-!                  ;!M=M=M=M=M=M=M=M=M=M=M=>!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    ,!M=M=M=M=M=M=M=M=M=M=M='!                  )!5;5;5;5;5;5;5;5;5;5;5;5;!!                  ~!(=(=(=(=(=(=(=(=(=(=(={!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    ]!(=(=(=(=(=(=(=(=(=(=(=7*                  ^!5;5;5;5;5;5;5;5;5;5;5;5;/!                  (!x*x*x*x*x*x*x*x*x*x*w*_!                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    :!x*x*x*x*x*x*x*x*x*x*<![!                  }!!;!;!;!;!;!;!;!;!;!;!;!;|!                  1!9*9*9*9*9*9*9*9*9*9*2!G$                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    3!9*9*9*9*9*9*9*9*9*9*4!5!                  6!!;!;!;!;!;!;!;!;!;!;!;!;7!                  8! * * * * * * * * * *9!(*                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                    0! * * * * * * * * * *E&Y*                  a!R;R;R;R;R;R;R;R;R;R;R;R;b!                  c!m&m&m&m&m&m&m&m&m&m&d!+                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                    e!f!m&m&m&m&m&m&m&m&m&g!h!                  i!R;R;R;R;R;R;R;R;R;R;R;R;j!                  k!^&^&^&^&^&^&^&^&^&^&l!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    m!n!^&^&^&^&^&^&^&^&^&o!L@                  p!2&2&2&2&2&2&2&2&2&2&2&q!r!                  s!^&^&^&^&^&^&^&^&^&^&t!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    h!u!$&$&$&$&$&$&$&$&$&v!x@                  w!G*G*G*G*G*G*G*G*G*G*G*C>x!                  y!$&$&$&$&$&$&$&$&$&$&z!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                    + A!A%A%A%A%A%A%A%A%A%B!+                   C!G*G*G*G*G*G*G*G*G*G*G*D!E!                  F!A%A%A%A%A%A%A%A%A%A%B%                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      G!0%0%0%0%0%0%0%0%0%H!                    x!----------------------I!{,                  J!0%0%0%0%0%0%0%0%0%0%K!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      L!0%0%0%0%0%0%0%0%0%M!                    Y>N!--------------------O!+                   P!;%;%;%;%;%;%;%;%;%;%O$                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      Q!;%;%;%;%;%;%;%;%;%R!                    S!T!<&<&<&<&<&<&<&<&<&<&U!                    V!P$P$P$P$P$P$P$P$P$W!X!                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      Y!P$P$P$P$P$P$P$P$P$Z!                    X;`!K-K-K-K-K-K-K-K-K-K- ~                    .~E$E$E$E$E$E$E$E$E$+~v$                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      @~E$E$E$E$E$E$E$E$E$#~                    F&$~K-K-K-K-K-K-K-K-K-K-%~                    &~p$p$p$p$p$p$p$p$p$*~(*                                                                                                                                                                                                                                          ",
-"                                                                                                                                                                                                                                                      =~p$p$p$p$p$p$p$p$p$-~                    `@;~$=$=$=$=$=$=$=$=$=$=>~                    ,~a$a$a$a$a$a$a$a$a$'~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      V!a$a$a$a$a$a$a$a$a$)~                      !~$=$=$=$=$=$=$=$=$=$=~~                    L@3$3$3$3$3$3$3$3$3${~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      X!3$3$3$3$3$3$3$3$3$]~                      ^~M&M&M&M&M&M&M&M&M&M&/~                    + (~~$~$~$~$~$~$~$~$_~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                      (*(~~$~$~$~$~$~$~$~$:~                      <~M&M&M&M&M&M&M&M&M&M&[~                      }~ $ $ $ $ $ $ $ $T#                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        |~ $ $ $ $ $ $ $ $.$                      1~0=0=0=0=0=0=0=0=0=0=2~                      3~ $ $ $ $ $ $ $ $4~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        5~K#K#K#K#K#K#K#K#6~                      7~0=0=0=0=0=0=0=0=0=0=8~                      9~K#K#K#K#K#K#K#K#0~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        a~A#A#A#A#A#A#A#A#b~                      c~J%J%J%J%J%J%J%J%J%J%d~                      e~A#A#A#A#A#A#A#B#f~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        g~f#f#f#f#f#f#f#f#h~                      i~X=X=X=X=X=X=X=X=X=X=j~                      k~f#f#f#f#f#f#f#q#l~                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        m~f#f#f#f#f#f#f#n~o~                      p~X=X=X=X=X=X=X=X=X=X=q~                      r~/#/#/#/#/#/#/#X@1+                                                                                                                                                                                                                                            ",
-"                                                                                                                                                                                                                                                        s~/#/#/#/#/#/#/#t~u~                      v~K&K&K&K&K&K&K&K&K&K&u*                      w~Y@Y@Y@Y@Y@Y@Y@x~+                                                                                                                                                                                                                                             ",
-"                                                                                                                                                                                                                                                        y~Y@Y@Y@Y@Y@Y@Y@z~l~                      A~K&K&K&K&K&K&K&K&K&K&X;                      B~N@N@N@N@N@N@N@C~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        D~N@N@N@N@N@N@N@E~h#                      &-E-P*P*P*P*P*P*P*P*F~                        G~k@k@k@k@k@k@k@H~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        I~k@k@k@k@k@k@k@J~1+                      2-Q-P*P*P*P*P*P*P*P*R-                        K~{@{@{@{@{@{@{@L~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        6#M~{@{@{@{@{@{@N~T.                      O~P~;-;-;-;-;-;-;-;-Q~                        R~B+B+B+B+B+B+B+S~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        T.T~B+B+B+B+B+B+U~+                       +*V~y&y&y&y&y&y&y&y&W~                        X~l+l+l+l+l+l+l+Y~                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                        _#Z~l+l+l+l+l+l+`~                        `@_-y&y&y&y&y&y&y&y& {                        .{i+i+i+i+i+i+i++{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          @{i+i+i+i+i+i+#{                          ${'*'*'*'*'*'*'*'*%{                        &{i+i+i+i+i+i+i+*{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          ={e+e+e+e+e+e+-{                          T='*'*'*'*'*'*'*'*+-                        f+e+e+e+e+e+e+e+;{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          >{0+0+0+0+0+0+,{                          '{s&s&s&s&s&s&s&s&){                        !{0+0+0+0+0+0+c+~{                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                          {{6+6+6+6+6+6+]{                          ^{s&s&s&s&s&s&s&s&/{                        *{6+6+6+6+6+6+({                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          _{6+6+6+6+6+6+:{                          ==L&L&L&L&L&L&L&L&<{                        [{}+}+}+}+}+}+}{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          |{}+}+}+}+}+}+1{                          2{f&f&f&f&f&f&f&f&3{                        @+(+(+(+(+(+(+4{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          5{6{(+(+(+(+(+7{                          8{f&f&f&f&f&f&f&f&9{                        0{~+~+~+~+~+~+a{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          4+b{~+~+~+~+~+c{                          d{g*g*g*g*g*g*g*g*W*                        e{f{'+'+'+'+'+g{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          I.h{'+'+'+'+'+i{                          b*g*g*g*g*g*g*g*g*j{                        I.k{=+=+=+=+=+l{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                          + m{=+=+=+=+=+n{                          o{g%g%g%g%g%g%g%g%>=                        T.3'$+$+$+$+$+p{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            q{$+$+$+$+$+r{                          s{&*************t{6&                        ~{u{`.`.`.`.`.v{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            w{`.`.`.`.`.x{                          y{,*************z{)-                        P.A{W.W.W.W.W.B{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            C{W.W.W.W.W.D{                          D&V&S&S&S&S&S&S&E{F&                        6.F{W.W.W.W.G{e{                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            H{N.N.N.N.N.I{                          @&J{S&S&S&S&S&S&K{k&                          L{N.N.N.N.S.T.                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                            M{G.G.G.G.G.N{                          `@O{g&g&g&g&g&g&P{+                           Q{G.G.G.G.R{D                                                                                                                                                                                                                                                 ",
-"                                                                                                                                                                                                                                                            S{B.B.B.B.B.T{                            U{g&g&g&g&g&g&V{                            W{B.B.B.B.X{                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            Y{Z{B.B.B.B.`{                             ]b&b&b&b&b&b&.]                            +]w.w.w.w.@]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            #]$]w.w.w.w.e{                            %]b&b&b&b&b&b&&]                            *]t.t.t.t.=]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                            ~{-]t.t.t.t.D                             ;]-&-&-&-&-&-&>]                            ,]o.o.o.o.']                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              )]o.o.o.!]                              ~]W%W%W%W%W%W%{]                            ]]j.j.j.j.^]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              /]j.j.j.(]                              _]W%W%W%W%W%W%:]                            <]f.f.f.f.[]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              }]f.f.f.|]                              1]K%K%K%K%K%K%2]                            3]0.0.0.4]5]                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              6]0.0.0.7]                              8]K%K%K%K%K%K%9]                            0]4.4.4.a]7.                                                                                                                                                                                                                                                  ",
-"                                                                                                                                                                                                                                                              b]4.4.4.c]                              d]s%s%s%s%s%s%v%                            e]}.}.}.f]K                                                                                                                                                                                                                                                   ",
-"                                                                                                                                                                                                                                                              g]}.}.}.h]                              `$s%s%s%s%s%i]j]                            k]}.}.}.l]+                                                                                                                                                                                                                                                   ",
-"                                                                                                                                                                                                                                                              m]:.:.:.n]                              }&d%d%d%d%d%o]p]                            q]:.:.:.r]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              s]].].].t]                              u]#%#%#%#%#%v]4%                            s]].].].t]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              b.'.'.'.w]                              x]#%#%#%#%#%y]@&                            z]A]'.'.B]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                              + C]'.'.D]                              @&!%!%!%!%!%E]N+                            F]G]=.=.H]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                I]=.=.J]                              + K]!%!%!%!%L]                              M]N]%.%.O]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                P]%.%.Q]                                R].%.%.%.%S]                              b.T]` ` U]                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                V]` ` W]                                X]T$T$T$T$Y]                              3.Z]U `] ^                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                .^U U +^                                @^T$T$T$T$#^                              P.$^P %^&^                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                *^P P =^                                -^J$J$J$J$;^                              + >^I ,^~{                                                                                                                                                                                                                                                    ",
-"                                                                                                                                                                                                                                                                '^I I Z                                 M$J$J$J$J$)^                                !^F ~^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                {^F F ]^                                ^^y$y$y$y$/^                                (^z _^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                :^z z <^                                [^y$y$y$y$}^                                |^z 1^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                5 2^u 3^                                4^k$k$k$k$5^                                6^u 7^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                8^9^r &^                                0^d$d$d$d$a^                                b^r o                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                # c^d^e^                                f^d$d$d$g^h^                                i^m j^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                + k^l^2                                 m^6$6$6$8$n^                                o^h p^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                  O%q^3.                                r^6$6$6$s^t^                                u^e k                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                  v^w^x^                                y^[$[$[$z^A^                                B^%=e^                                                                                                                                                                                                                                                      ",
-"                                                                                                                                                                                                                                                                  C^D^}                                 L#[$[$[$E^o#                                F^G^+                                                                                                                                                                                                                                                       ",
-"                                                                                                                                                                                                                                                                  F^H^.                                 A^I^^$^$J^                                  K^|                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                  L^M^+                                 @&N^^$^$O^                                  P^Q^                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  R^S^                                  6@T^>$>$U^                                  V^W^                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  8 X^                                  o#Y^#$#$Z^                                  `^ /                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                  e^./                                  + +/#$#$@/                                  #/,                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                  } $/                                    %/W#W#&/                                  */=/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    -/                                    ;/W#W#>/                                  ,/'/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    )/                                    H#N#N#!/                                  ~/{/                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                    %                                     ]/N#N#^/                                  # }                                                                                                                                                                                                                                                         ",
-"                                                                                                                                                                                                                                                                                                          //E#E#(/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          _/u#u#:/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          </u#u#[/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          }/9#9#|/                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          1/9#9#A^                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          1#c#2/c@                                                                                                                                                                                                                                                                                              ",
-"                                                                                                                                                                                                                                                                                                          =@3/4/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          ^@5/6/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          A^7/8/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          6@9/0/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                          + a/b/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            S@c/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            d/e/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            f/g/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            h/i/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            j/n@                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            k/X+                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            l/m/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            n/o/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            p/q/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                             @r/                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            M+`+                                                                                                                                                                                                                                                                                                ",
-"                                                                                                                                                                                                                                                                                                            s/+                                                                                                                                                                                                                                                                                                 "};